recreated tag OOO_BUILD_3_2_98_1 which had these commits:

commit 1ff6692a10dc652c305bcb490889079c14a28197 (tag: refs/tags/OOO_BUILD_3_2_98_1) Author: Petr Mladek <pmladek@walk.suse.cz> Date: Wed Sep 15 19:03:27 2010 +0200 Release ooo-build-3.2.98.1, tag OOO_BUILD_3_2_98_1 (3.3-alpha1) commit 0d5aa08642520d2818e490fcf1b56fb7506b5fd1 Author: Cédric Bosdonnat <cedricbosdo@openoffice.org> Date: Tue Sep 14 17:21:03 2010 +0200 cjk-default-compatibility.diff: Don't expand spaces with manual breaks i#54320 unotools/inc/unotools/compatibility.hxx | 2 + unotools/source/config/compatibility.cxx | 40 ++++++++++++++++++++++++++++++ 2 files changed, 42 insertions(+), 0 deletions(-) commit 5632c7456144b13f586a6b2a5708901768ef4e51 Author: Cédric Bosdonnat <cedricbosdo@openoffice.org> Date: Tue Sep 14 15:56:15 2010 +0200 fields-enable.diff: Activate fields changes unotools/source/config/fltrcfg.cxx | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) commit 202340c5a166188adf961168816966136d907b5a Author: Cédric Bosdonnat <cedricbosdo@openoffice.org> Date: Tue Sep 14 15:33:59 2010 +0200 metric-field-limits.diff: maximum values were wrong when changing unit vcl/inc/vcl/field.hxx | 4 +++- vcl/source/control/field.cxx | 15 +++++++++++++++ 2 files changed, 18 insertions(+), 1 deletions(-) commit e530d77937c1b21db1d0f4e7406343899c465ea3 Author: Florian Reuter <freuter@novell.com> Date: Tue Sep 14 15:03:19 2010 +0200 svtools-svrtf-token-ignore-case.diff: n#417814 svtools/source/svrtf/rtfkeywd.cxx | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) commit fe8cc3e5e63a98b863056c68f92f4bc967c7f3b9 Author: Jan Holesovsky <kendy@suse.cz> Date: Tue Sep 14 11:47:36 2010 +0200 toolbar-decorations-vcl.diff: Improved toolbar popups. tools/inc/tools/wintypes.hxx | 2 + vcl/inc/vcl/brdwin.hxx | 3 +- vcl/inc/vcl/floatwin.hxx | 3 +- vcl/source/app/settings.cxx | 2 +- vcl/source/window/brdwin.cxx | 46 ++++++++++++++++++++++++------ vcl/source/window/floatwin.cxx | 8 ++++- vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx | 6 ++- vcl/unx/kde/salnativewidgets-kde.cxx | 9 ++++-- vcl/unx/kde4/KDESalFrame.cxx | 15 +++++---- 9 files changed, 68 insertions(+), 26 deletions(-) commit e95610564f098bfb5bb5942d8ae05290d423f28c Author: Jan Holesovsky <kendy@suse.cz> Date: Tue Sep 14 11:46:59 2010 +0200 toolbar-decorations-rsc.diff: Improved toolbar popups. rsc/inc/rscdb.hxx | 1 + rsc/inc/vclrsc.hxx | 5 +++++ rsc/source/parser/rscicpx.cxx | 1 + rsc/source/parser/rscinit.cxx | 2 ++ 4 files changed, 9 insertions(+), 0 deletions(-) commit dfc0ee2aea3d17792513db8d12154b1d0087e585 Author: Florian Reuter <freuter@novell.com> Date: Tue Sep 14 11:34:48 2010 +0200 vcl-bitmap2-negative-height.diff: Load bitmaps even when height is negative n#228839 vcl/source/gdi/bitmap2.cxx | 18 ++++++++++++------ 1 files changed, 12 insertions(+), 6 deletions(-) commit 79ceee2d88d777bf4872ca4b9f4a669b0dab9530 Author: Jan Holesovsky <kendy@suse.cz> Date: Tue Sep 14 11:25:20 2010 +0200 vcl-better-fallback.diff: Try all when some of the plugins are not available i#50857 vcl/unx/source/plugadapt/salplug.cxx | 8 +++++--- 1 files changed, 5 insertions(+), 3 deletions(-) commit 09078e71ad7b0f271fe39cd4a53528fbf8fecaff Author: Tor Lillqvist <tlillqvist@novell.com> Date: Tue Sep 14 13:27:42 2010 +0200 accept-underscores-in-hostnames.diff: Accept underscores in hostnames n#182422 tools/source/fsys/urlobj.cxx | 24 ++++++++++++------------ 1 files changed, 12 insertions(+), 12 deletions(-) commit 194ef7b36700ebd9200c3be6746407743ab0f2c5 Author: Thorsten Behrens <tbehrens@novell.com> Date: Tue Sep 14 13:12:18 2010 +0200 win32-vs2005-compat.diff: Fix build with Visual Studio 2005 vos/inc/vos/object.hxx | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) commit 2c6930268e023ab0d74543168d754701fcce8112 Author: Thorsten Behrens <tbehrens@novell.com> Date: Tue Sep 14 12:58:20 2010 +0200 win32-force-version-fix.diff: force WINVER when using non-std win api canvas/source/cairo/cairo_win32_cairo.cxx | 2 ++ i18npool/source/isolang/inwnt.cxx | 2 ++ vcl/win/source/gdi/salprn.cxx | 2 ++ 3 files changed, 6 insertions(+), 0 deletions(-) commit b3593ab95757d5caee760d9dcc6faae2f593627b Author: Tor Lillqvist <tlillqvist@novell.com> Date: Tue Sep 14 12:10:19 2010 +0200 win32-dxsdk-200908.diff: Build also against DirectX SDK August 2009. canvas/source/directx/dx_winstuff.hxx | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) commit 193232ca21162235981610c9af88e635e404f76d 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 svtools/source/control/ruler.cxx | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) commit 9ff34bff63efe1d3f034feaec59d7e9ee5adf83b Author: Amelia Wang <amwang@novell.com> Date: Mon Sep 13 14:42:43 2010 +0200 cjk-character-units-rulers-sync-with-pggrid-fix.diff: svtools/inc/ruler.hxx | 2 ++ svtools/source/control/ruler.cxx | 12 ++++++++++-- 2 files changed, 12 insertions(+), 2 deletions(-) commit 80c912a380b819bc994e31b62ef81b4b0309bb17 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' rsc/inc/vclrsc.hxx | 2 +- rsc/source/parser/rscibas.cxx | 3 +++ svl/inc/svl/poolitem.hxx | 2 +- svtools/source/control/ruler.cxx | 8 ++++++-- tools/inc/tools/fldunit.hxx | 2 +- vcl/source/control/field.cxx | 34 +++++++++++++++++++++------------- vcl/source/src/units.src | 3 +++ 7 files changed, 36 insertions(+), 18 deletions(-) commit 6c0d47b27adc0e5f23dae84ef954b56636a68cb5 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' svtools/inc/ruler.hxx | 7 ++++++ svtools/source/control/ruler.cxx | 42 +++++++++++++++++++++++++++++++++++-- svtools/source/misc/unitconv.cxx | 3 ++ 3 files changed, 49 insertions(+), 3 deletions(-) commit 7f328a480a4522e45cbb5209136254dd80fdab4f Merge: 1b9832b 4bf68ac Author: Jan Holesovsky <kendy@suse.cz> Date: Wed Sep 8 11:34:12 2010 +0200 Merge commit 'ooo/OOO330_m7' commit 1b9832bae32bd13cbb94383c5937cd8a9a0192c3 Merge: eaeb786 06d2710 Author: Jan Holesovsky <kendy@suse.cz> Date: Tue Sep 7 09:33:08 2010 +0200 Merge commit 'ooo/OOO330_m6' commit 4bf68acd0615ec6b49945753104831bee9366df0 (tag: refs/tags/ooo/OOO330_m7) Merge: 1f6f539 b0ffb9a Author: Kurt Zenker <kz@openoffice.org> Date: Fri Sep 3 14:39:55 2010 +0200 CWS-TOOLING: integrate CWS fs33a commit b0ffb9a5006331750d8997020061f104ab7fb10c Author: Frank Schoenheit [fs] <frank.schoenheit@oracle.com> Date: Fri Sep 3 14:50:14 2010 +0200 fs33a: revert the original fix for HideInactiveSelection support in the tree list box, causing too much regressions. Fix it by using SetWindowBits instead of SetStyle svtools/source/contnr/svtreebx.cxx | 14 -------------- svtools/source/uno/treecontrolpeer.cxx | 6 +++--- 2 files changed, 3 insertions(+), 17 deletions(-) commit de2b714c3af13c57358fe3a1f38d1e5ad7a164e8 Author: Frank Schoenheit [fs] <frank.schoenheit@oracle.com> Date: Wed Sep 1 12:27:38 2010 +0200 fs33a: +i114247# sync WindowBits and Style svtools/source/contnr/svtreebx.cxx | 12 +++++++++++- 1 files changed, 11 insertions(+), 1 deletions(-) commit 1f6f539f3fa9add2db31059479f34409c7343628 Merge: 6a6bf7a 65913d3 Author: Kurt Zenker <kz@openoffice.org> Date: Tue Aug 31 15:10:03 2010 +0200 CWS-TOOLING: integrate CWS impress197 commit 6a6bf7a0befd6216e847e557ceb80aec6639d15b Author: Kurt Zenker <kz@openoffice.org> Date: Tue Aug 31 12:21:23 2010 +0200 masterfix: #i114215# builderror in canvas/source/vcl fixed canvas/source/vcl/canvashelper_texturefill.cxx | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) commit d4f79cfa71f641845ef3c0f51a47f4d1d9953ead Author: Kurt Zenker <kz@openoffice.org> Date: Mon Aug 30 20:20:51 2010 +0200 masterfix: #i114025# WaE fixes vcl/source/gdi/gdimtf.cxx | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) commit 06d271053f9a8bb44e209f0c1569f181fe838a41 (tag: refs/tags/ooo/OOO330_m6) Author: obo <obo@openoffice.org> Date: Fri Aug 27 11:31:33 2010 +0200 masterfix OOO330: #i10000# unknown -B option for Python (Windows) l10ntools/scripts/xhtex | 9 ++++++++- l10ntools/scripts/xtxex | 8 ++++++++ 2 files changed, 16 insertions(+), 1 deletions(-) commit 8ee844e7949ab8fa8b98b20b16b59c1fd87f4539 Merge: 0d77427 52cc37f Author: Ivo Hinkelmann <ihi@openoffice.org> Date: Thu Aug 26 13:20:55 2010 +0200 CWS-TOOLING: integrate CWS ooo33gsl07 commit 0d77427a63dd2c4cec551a26a8e1039bcf9daaa2 Author: Ivo Hinkelmann <ihi@openoffice.org> Date: Thu Aug 26 13:17:12 2010 +0200 masterfix: #i10000# modify extract date and dummy fields for string database l10ntools/java/jpropex/java/JPropEx.java | 7 +++++-- l10ntools/scripts/tool/sdf.py | 9 +++++++-- 2 files changed, 12 insertions(+), 4 deletions(-) commit 24d67300bfbfb9e0b21d7fe9661203bee5486a0a Merge: 7dead72 ad3a06b Author: Ivo Hinkelmann <ihi@openoffice.org> Date: Thu Aug 26 13:07:19 2010 +0200 CWS-TOOLING: integrate CWS fwk152 commit 7dead7277caad9323d8ca703ec58f356ae20e0fd Author: Ivo Hinkelmann <ihi@openoffice.org> Date: Wed Aug 25 19:09:27 2010 +0200 #i10000# set dummy fields to 0 for string DB l10ntools/scripts/tool/sdf.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) commit b7b56d2ab9270e70a04c68cae8f048831c00579d Author: Ivo Hinkelmann <ihi@openoffice.org> Date: Wed Aug 25 16:36:33 2010 +0200 #i10000# removed obsolete switch l10ntools/scripts/localize.pl | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) commit 05e0725b9617c3bb1cb03f0df0141db4c4c2f16c Merge: fc52053 e2060d4 Author: Frank Schoenheit [fs] <frank.schoenheit@oracle.com> Date: Wed Aug 25 16:07:39 2010 +0200 fs33a: merge after pulling OOO330.m5's changes commit 9d61d166812c88dae5f6ecf953f6a6e543d8f734 Merge: c1d27f1 f92fa87 Author: Ivo Hinkelmann <ihi@openoffice.org> Date: Wed Aug 25 14:42:57 2010 +0200 CWS-TOOLING: integrate CWS ext004 commit c1d27f1fad023c97dea944edb147b47d5297d6dd Merge: 7141fb6 cddb741 Author: Ivo Hinkelmann <ihi@openoffice.org> Date: Wed Aug 25 14:29:06 2010 +0200 CWS-TOOLING: integrate CWS ooo33gsl06 commit 7141fb62d8d2f1a682d160d48764527fbda263fe Merge: 4c6e315 148e515 Author: Ivo Hinkelmann <ihi@openoffice.org> Date: Wed Aug 25 14:19:19 2010 +0200 CWS-TOOLING: integrate CWS sw33bf08 commit 4c6e3156a6d04b7d44ca56b57dc9d74b38bf2b7b Merge: e2060d4 121b879 Author: Ivo Hinkelmann <ihi@openoffice.org> Date: Wed Aug 25 12:49:35 2010 +0200 CWS-TOOLING: integrate CWS mib18 commit 52cc37ff83da8356c6d3f65b9d04e015c1e55d6c Author: Philipp Lohmann [pl] <Philipp.Lohmann@Oracle.COM> Date: Tue Aug 24 14:49:48 2010 +0200 ooo33gsl07: #i110881# fix fullscreen mode with compiz and metacity ... again vcl/unx/gtk/window/gtkframe.cxx | 64 +++++++++++++++++++++++++-------- vcl/unx/inc/plugins/gtk/gtkframe.hxx | 4 ++ 2 files changed, 52 insertions(+), 16 deletions(-) commit ec404a1834a06a0b066a384d40944efecd667421 Author: Philipp Lohmann [pl] <Philipp.Lohmann@Oracle.COM> Date: Mon Aug 23 16:32:34 2010 +0200 ooo33gsl07: #i113253# use paper bin from user setup when appropriate vcl/source/gdi/print3.cxx | 22 ++++++++++++++++++---- 1 files changed, 18 insertions(+), 4 deletions(-) commit fc52053c256f492bc92886c140a17b7a6635b043 Author: Frank Schoenheit [fs] <frank.schoenheit@oracle.com> Date: Mon Aug 23 15:18:37 2010 +0200 fs33a: expose the WB_HIDESELECTION but of the tree control at its UNO API svtools/inc/svtools/svtreebx.hxx | 1 + svtools/source/contnr/svtreebx.cxx | 9 +++++++++ svtools/source/uno/treecontrolpeer.cxx | 18 ++++++++++++++++++ toolkit/source/controls/tree/treecontrol.cxx | 1 + 4 files changed, 29 insertions(+), 0 deletions(-) commit 75afc968ed3ae41a2d8a9ea996cbff75fdf9a68c Author: Philipp Lohmann [pl] <Philipp.Lohmann@Oracle.COM> Date: Mon Aug 23 14:38:35 2010 +0200 ooo33gsl07: #i110881# workaround compiz (mwm hints should have no effect whatsoever on fullscreen) vcl/unx/source/app/wmadaptor.cxx | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) commit b1de5dcd138d4c1892f24eed96faf4e8bdce9635 Author: Philipp Lohmann [pl] <Philipp.Lohmann@Oracle.COM> Date: Fri Aug 20 19:47:14 2010 +0200 ooo33gsl07: #i113898# catch a NULL ptr vcl/unx/gtk/a11y/atkutil.cxx | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) commit f92fa871502a8adc1345ff6cdc8e42f9588ea4de Author: Ivo Hinkelmann <ihi@openoffice.org> Date: Fri Aug 20 16:30:57 2010 +0200 ext004: just copy en-US file without modifications l10ntools/scripts/tool/xtxex.py | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) commit e2060d42d0267729888d68448e668a7f9df83c3b Author: Release Engineering <releng@openoffice.org> Date: Fri Aug 20 13:13:16 2010 +0200 #i10000# supress bytecode generation l10ntools/scripts/xhtex | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) commit d6559d76b04c867fba04c1399fa746dff23b2f18 Author: Release Engineering <releng@openoffice.org> Date: Fri Aug 20 13:12:52 2010 +0200 #i10000# supress bytecode generation l10ntools/scripts/xtxex | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) commit 874476f2c3865a51561c40d9612ae60baf09fa9f Author: Frank Schoenheit [fs] <frank.schoenheit@oracle.com> Date: Thu Aug 19 17:46:08 2010 +0200 fs33a: #i113988# properly retrieve standard images svtools/source/graphic/provider.cxx | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) commit cddb741a6e756148bf1a6641aaa63b51d0ff7b55 Merge: d0fa316 d551942 Author: Herbert Duerr [hdu] <duerr@sun.com> Date: Thu Aug 19 14:31:35 2010 +0200 fast-forward merging of heads commit d551942e83dc6d401208445e50fa9fedfe6ee2d9 Author: Christian Lippka <christian.lippka@sun.com> Date: Wed Aug 18 17:59:09 2010 +0200 #i113857# disable right mouse button to trigger a range selection vcl/source/window/seleng.cxx | 19 +++++++++++++++---- 1 files changed, 15 insertions(+), 4 deletions(-) commit 5eb8c5eee80e82dcf8e7369463940ecab8d2d6c3 (tag: refs/tags/ooo/OOO330_m5) Merge: 3f59a6a 6c56d7b Author: Kurt Zenker <kz@openoffice.org> Date: Wed Aug 18 16:59:10 2010 +0200 CWS-TOOLING: integrate CWS txtl10n commit 3f59a6af5940320b20e7ba86de74c75aaa379f72 Merge: e2ac629 e3e2a2c Author: Kurt Zenker <kz@openoffice.org> Date: Wed Aug 18 14:15:04 2010 +0200 CWS-TOOLING: integrate CWS graphite04 commit e2ac629a815044ecb7f5e53dab5436c9792c6a6a Merge: 92d15b0 44417ff Author: Kurt Zenker <kz@openoffice.org> Date: Wed Aug 18 13:23:34 2010 +0200 CWS-TOOLING: integrate CWS ooo33gsl05 commit 92d15b0246d60a89a84970557cb04db98d2436c2 Merge: 0b1999e cc4d2e8 Author: Kurt Zenker <kz@openoffice.org> Date: Wed Aug 18 12:43:13 2010 +0200 CWS-TOOLING: integrate CWS mav56 commit 0b1999e55938fc466d6ab8c543857629273fad7c Merge: c8dc8eb 8fc80ea Author: Kurt Zenker <kz@openoffice.org> Date: Wed Aug 18 12:39:06 2010 +0200 CWS-TOOLING: integrate CWS fwk151 commit c8dc8eb8f62944c76f0c0ad9a5e7fba432742e94 Merge: d0fa316 bb902b6 Author: Kurt Zenker <kz@openoffice.org> Date: Wed Aug 18 12:00:05 2010 +0200 CWS-TOOLING: integrate CWS jl154 commit 148e51518f3876d02987548b1a5a53fd62808225 Author: Thomas Lange [tl] <tl@openoffice.org> Date: Tue Aug 17 16:46:36 2010 +0200 cws sw33bf08: #i113584#, #i113587# transliteration fixed .../source/transliteration/transliterationImpl.cxx | 1 - .../transliteration/transliteration_body.cxx | 275 +++++++++----------- 2 files changed, 117 insertions(+), 159 deletions(-) commit 6a421e2af3e030074ac25e29dd14e491e3aac21b Merge: e95d209 d0fa316 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 121b87931236e1f71623ad39f8edf9c88775fa77 Merge: c0d5723 d0fa316 Author: Daniel Rentz <dr@openoffice.org> Date: Fri Aug 13 11:29:46 2010 +0200 mib18: rebase to OOO330m4 commit 44417ffdf0f2380173eea808d00cafa047b9ecdc Author: Philipp Lohmann [pl] <Philipp.Lohmann@Oracle.COM> Date: Fri Aug 13 11:25:17 2010 +0200 ooo33gsl05: fix a typo vcl/inc/vcl/gdimtf.hxx | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) commit ce185aaab5a56e3fd00c0065e16dd79de5bc8abd Author: Herbert Duerr [hdu] <duerr@sun.com> Date: Fri Aug 13 09:07:29 2010 +0200 #i113776# avoid default adaptive subdivision for now basegfx/source/polygon/b2dtrapezoid.cxx | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) commit bb902b67cf279b8b185200a9d83d7ba160ebfffb Merge: 235a440 fff4be8 Author: Joerg Skottke [jsk] <jsk@openoffice.org> Date: Fri Aug 13 07:28:35 2010 +0200 jl154: Local merge commit ad0a5ff9fa25c1f14677e92d6897c4301aac14c1 Merge: 4a1daa7 d0fa316 Author: Philipp Lohmann [pl] <Philipp.Lohmann@Oracle.COM> Date: Thu Aug 12 16:23:40 2010 +0200 merge with OOO330m4 commit 4a1daa71ee512b8f2b4624c9a680f681d34317f5 Author: Philipp Lohmann [pl] <Philipp.Lohmann@Oracle.COM> Date: Thu Aug 12 16:01:40 2010 +0200 ooo33gsl05: #i113025# fix GDIMetaFile handlng of MapMode MAP_PIXEL vcl/inc/vcl/gdimtf.hxx | 2 + vcl/source/gdi/gdimtf.cxx | 45 +++++++++++++++++++++++++++++++++++++++++++- vcl/source/gdi/metaact.cxx | 2 +- vcl/source/gdi/print3.cxx | 6 ++-- 4 files changed, 50 insertions(+), 5 deletions(-) commit 3cef44dceef901fee54734075d78165a8c88113c Author: Philipp Lohmann [pl] <Philipp.Lohmann@Oracle.COM> Date: Thu Aug 12 13:32:56 2010 +0200 ooo33gsl05: #i113821# ensure last page renders when aborting job vcl/inc/vcl/print.hxx | 1 + vcl/source/gdi/print3.cxx | 32 +++++++++++++++++++++++--------- 2 files changed, 24 insertions(+), 9 deletions(-) commit 881771a0b46600ce7fc537f8697e17d5187cc04c Merge: 590cbc8 a728239 Author: Philipp Lohmann [pl] <Philipp.Lohmann@Oracle.COM> Date: Thu Aug 12 13:10:39 2010 +0200 merge with ooo33gsl04 commit fff4be8b2ea3f89b77d65e8cb13389ff4466980a Merge: 590cbc8 235a440 Author: Joerg Skottke [jsk] <jsk@openoffice.org> Date: Wed Aug 11 08:57:13 2010 +0200 jl154: Local merge commit e95d2093942bd783336c08249f0cc8ebd29bdb2b Merge: 67ceba0 590cbc8 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 67ceba07198128db6b42cdfd3a8c878a2af4fdee Merge: 19e6551 a90fcce Author: Frank Schoenheit [fs] <frank.schoenheit@oracle.com> Date: Tue Aug 10 14:21:53 2010 +0200 merging in latest changes from CWS unoawt2 commit cc4d2e80d521077ccd0fb730a89f812b570d2fe6 Author: Mikhail Voytenko <mav@openoffice.org> Date: Tue Aug 10 11:05:20 2010 +0200 mav56: #163253# tread invalid path segments correctly comphelper/inc/comphelper/storagehelper.hxx | 2 + comphelper/source/misc/storagehelper.cxx | 31 +++++++++++++++++++++++++++ 2 files changed, 33 insertions(+), 0 deletions(-) commit 65913d33daa99c701d289698201ba7884d475748 Author: sj <sj@openoffice.org> Date: Mon Aug 9 14:11:58 2010 +0200 impress197: #163250# fixed string handling, improved polygon splitting tools/source/generic/poly.cxx | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) commit e3e2a2ca3ed94c8088a2102c7b44ea5ef22d1d53 Author: Herbert Duerr [hdu] <duerr@sun.com> Date: Mon Aug 9 12:27:56 2010 +0200 #i113731# fix compile warning on an pre-4.0-release gcc version vcl/source/glyphs/graphite_layout.cxx | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) commit ad3a06b88f0256ed3ed270074132ba51956d95f5 Author: Mikhail Voytenko <mav@openoffice.org> Date: Mon Aug 9 10:47:38 2010 +0200 fwk152: #i108004# check the URLs correctly unotools/inc/unotools/ucbhelper.hxx | 1 + unotools/source/ucbhelper/ucbhelper.cxx | 49 +++++++++++++++++++++++++++++++ 2 files changed, 50 insertions(+), 0 deletions(-) commit c0d572366b519adde7e105174cec1944b243ba00 Author: Mikhail Voytenko <mav@openoffice.org> Date: Wed Aug 4 12:21:22 2010 +0200 mib18: #163185# avoid crash when document is closed and a modal dialog is active toolkit/source/awt/vclxwindows.cxx | 10 +++++++++- toolkit/source/helper/unowrapper.cxx | 15 ++++++++++----- 2 files changed, 19 insertions(+), 6 deletions(-) commit 4da3b8789f65c01ee8b1aa610e6d7fe372e983b7 Author: Michael Stahl <mst@openoffice.org> Date: Tue Aug 3 18:06:21 2010 +0200 sw33bf08: #i113623#: stgio.cxx: fix operator delete mismatch sot/source/sdstor/stgio.cxx | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) commit 235a4402d956c52a2f8e8f6bed82ab7eff9170fe Merge: 977745f c3e26f8 Author: Joachim Lingner <jl@openoffice.org> Date: Mon Aug 2 15:39:29 2010 +0200 jl154 merging with OOO330m2 commit 866fd517608220b892d215d12f1ea28e0a2f8ebc Author: Herbert Duerr [hdu] <duerr@sun.com> Date: Mon Aug 2 09:02:35 2010 +0200 #i113563# fix compile with system-graphite (thanks cmc) vcl/source/glyphs/graphite_layout.cxx | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) commit da5fd52c6a206565fd671a5e0e03511b1519c926 Author: Herbert Duerr [hdu] <duerr@sun.com> Date: Wed Jul 28 14:49:14 2010 +0200 #i113301# avoid problems with hyphenation within graphite ligature (thanks kstribley) vcl/source/glyphs/graphite_layout.cxx | 67 +++++++++++++++++++++++++++----- vcl/win/source/gdi/winlayout.cxx | 5 ++ 2 files changed, 61 insertions(+), 11 deletions(-) commit 8fc80ea840ec20632b3055ab72350b7bff6a3fde Author: Carsten Driesner <cd@openoffice.org> Date: Tue Jul 27 18:11:00 2010 +0200 fwk151: Fixed problems that configuration changes notifications were not correctly sent/processed unotools/inc/unotools/configpathes.hxx | 6 +++++- unotools/source/config/configpathes.cxx | 11 ++++++++--- 2 files changed, 13 insertions(+), 4 deletions(-) commit 2f0d8a0ab77dca9d133dd30d7aa197f9fd023eae Merge: 0df00c1 c3e26f8 Author: Daniel Rentz <dr@openoffice.org> Date: Tue Jul 27 18:05:46 2010 +0200 mib17: rebase to OOO330_m2 commit 0df00c17e14d1e01dbb483fa330591ba8c3a3229 Merge: 6e44518 476fcc6 Author: Daniel Rentz <dr@openoffice.org> Date: Tue Jul 27 17:12:01 2010 +0200 mib17: rebase to DEV300_m84 commit 6c56d7b2470c3a0e3e1ce65d0608369c493e0f4b Merge: aed54d0 c3e26f8 Author: Ivo Hinkelmann <ihi@openoffice.org> Date: Tue Jul 27 16:50:00 2010 +0200 merged OOO330 m2 commit aed54d08061d13bf20c60e024dddc8692576706a Author: Ivo Hinkelmann <ihi@openoffice.org> Date: Thu Jul 22 17:53:11 2010 +0200 txtl10n: cleanup / remove all -QQ and quiet parts l10ntools/inc/lngmerge.hxx | 2 +- l10ntools/source/cfglex.l | 1 - l10ntools/source/cfgmerge.cxx | 9 --------- l10ntools/source/export.cxx | 11 ----------- l10ntools/source/helpex.cxx | 8 +------- l10ntools/source/lngex.cxx | 10 +--------- l10ntools/source/lngmerge.cxx | 5 ++--- l10ntools/source/localize.cxx | 38 +++++++++----------------------------- l10ntools/source/xrmmerge.cxx | 9 --------- 9 files changed, 14 insertions(+), 79 deletions(-) commit 57fecfc6087e45bebe215610dc428c8b2df42ddb Author: Ivo Hinkelmann <ihi@openoffice.org> Date: Thu Jul 22 17:13:19 2010 +0200 txtl10n: #i113008# #i113125# cleanup / removed unused lines l10ntools/scripts/xhtex | 8 -------- l10ntools/scripts/xtxex | 8 -------- 2 files changed, 0 insertions(+), 16 deletions(-) commit a981050e5d79f9544115feb8d4d2803630ebb954 Author: Ivo Hinkelmann <ihi@openoffice.org> Date: Thu Jul 22 15:13:04 2010 +0200 txtl10n: removed obsolete dir transex3/java/jpropex/build.xml | 169 --------- transex3/java/jpropex/java/JPropEx.java | 400 ---------------------- transex3/java/jpropex/java/Main.java | 38 -- transex3/java/jpropex/java/NoLocalizeFilter.java | 55 --- transex3/java/jpropex/java/OrderedHashMap.java | 96 ------ transex3/java/jpropex/java/SdfData.java | 108 ------ transex3/java/jpropex/java/SdfEntity.java | 254 -------------- transex3/java/jpropex/jpropex | 10 - transex3/java/jpropex/jpropex.MF | 1 - transex3/java/jpropex/makefile.mk | 36 -- 10 files changed, 0 insertions(+), 1167 deletions(-) commit b790123f00389348a627d0720c62489fbe9deacc Author: Ivo Hinkelmann <ihi@openoffice.org> Date: Thu Jul 22 09:48:43 2010 +0200 txtl10n: #i113008# #i113125# don't die by empty sdf file l10ntools/java/jpropex/java/SdfEntity.java | 39 ++++++++++++--------------- 1 files changed, 17 insertions(+), 22 deletions(-) commit 52488dc18e74dbcb2007d9beb362a81b1ed95aea Author: Ivo Hinkelmann <ihi@openoffice.org> Date: Wed Jul 21 19:07:24 2010 +0200 txtl10n: #i113008# #i113125# don't die by empty sdf file l10ntools/java/jpropex/java/SdfEntity.java | 41 ++++++++++++++++----------- 1 files changed, 24 insertions(+), 17 deletions(-) commit 2b8063c2d254a5bc479cfb5977524c5ec6ae386c Author: Ivo Hinkelmann <ihi@openoffice.org> Date: Tue Jul 20 13:11:02 2010 +0200 txtl10n: #i113008# #i113125# rename .xht to .tree l10ntools/source/localize.cxx | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) commit 977745fd68d0af57f5e952fab5ab2ac97bc299b5 Merge: 5cffce3 ae63ab3 Author: Joachim Lingner <jl@openoffice.org> Date: Fri Jul 16 15:45:18 2010 +0200 jl154 merging with OOO300_m1 commit f1f79409592755ff1d128b1e524531a385c37d82 Author: Ivo Hinkelmann <ihi@openoffice.org> Date: Wed Jul 14 17:46:14 2010 +0200 txtl10n: #i113008# #i113125# skip on empty string l10ntools/scripts/tool/xtxex.py | 12 ++++++++---- 1 files changed, 8 insertions(+), 4 deletions(-) commit d3bf2074b6592f951b0ee0d2f9e0025ea3796cf6 Author: Ivo Hinkelmann <ihi@openoffice.org> Date: Wed Jul 14 17:39:22 2010 +0200 txtl10n: #i113008# #i113125# skip on empty string l10ntools/scripts/tool/xhtex.py | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) commit b421b9f1273771be01b8f3e2f68c4fbb45dbab1d Author: Ivo Hinkelmann <ihi@openoffice.org> Date: Wed Jul 14 17:08:59 2010 +0200 txtl10n: #i113008# #i113125# cleanup l10ntools/scripts/tool/pseudo.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) commit ea8f71e491b9c9952660c2cf17ae23c301c85461 Author: Ivo Hinkelmann <ihi@openoffice.org> Date: Wed Jul 14 17:06:23 2010 +0200 txtl10n: #i113008# #i113125# cleanup l10ntools/scripts/tool/l10ntool.py | 3 +-- l10ntools/scripts/tool/xhtex.py | 8 ++++---- l10ntools/scripts/tool/xtxex.py | 8 ++++---- 3 files changed, 9 insertions(+), 10 deletions(-) commit cf25bd558226fdbb189c522d91baa779bed4e307 Author: Ivo Hinkelmann <ihi@openoffice.org> Date: Wed Jul 14 17:00:39 2010 +0200 txtl10n: #i113008# #i113125# Python 2.3.x compatible l10ntools/prj/d.lst | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) commit 6b719dd847ae6ac148f2f20f56d4bffaf5a6dd86 Author: Ivo Hinkelmann <ihi@openoffice.org> Date: Wed Jul 14 16:59:49 2010 +0200 txtl10n: #i113008# #i113125# Python 2.3.x compatible l10ntools/scripts/tool/l10ntool.py | 20 +++- l10ntools/scripts/tool/pseudo.py | 184 ++++++++++++++++++++++++++++++++++++ l10ntools/scripts/tool/sdf.py | 65 +------------ l10ntools/scripts/tool/xhtex.py | 1 + 4 files changed, 202 insertions(+), 68 deletions(-) commit 4455cba6763a7502c29b0766d81852adc9a5fc88 Author: Ivo Hinkelmann <ihi@openoffice.org> Date: Tue Jul 13 18:00:06 2010 +0200 txtl10n: #i113008# #i113125# Support of help tree files and single txt files in the L10N process l10ntools/scripts/const.py | 39 ------- l10ntools/scripts/l10ntool.py | 188 -------------------------------- l10ntools/scripts/sdf.py | 238 ----------------------------------------- l10ntools/scripts/xhtex | 47 ++++++++ l10ntools/scripts/xtxex.py | 107 ------------------ 5 files changed, 47 insertions(+), 572 deletions(-) commit e50721477707032c3e647b9ce5c536e014f2e253 Author: Ivo Hinkelmann <ihi@openoffice.org> Date: Tue Jul 13 17:58:25 2010 +0200 txtl10n: #i113008# #i113125# Support of help tree files and single txt files in the L10N process l10ntools/scripts/tool/const.py | 39 ++++++ l10ntools/scripts/tool/l10ntool.py | 204 ++++++++++++++++++++++++++++++++ l10ntools/scripts/tool/sdf.py | 224 ++++++++++++++++++++++++++++++++++++ l10ntools/scripts/tool/xhtex.py | 133 +++++++++++++++++++++ l10ntools/scripts/tool/xtxex.py | 89 ++++++++++++++ 5 files changed, 689 insertions(+), 0 deletions(-) commit 1211f7ca6c60882421e02f9489c9b4e7d706a44c Author: Ivo Hinkelmann <ihi@openoffice.org> Date: Tue Jul 13 17:56:32 2010 +0200 txtl10n: #i113008# #i113125# Support of help tree files and single txt files in the L10N process l10ntools/prj/d.lst | 10 ++++++---- 1 files changed, 6 insertions(+), 4 deletions(-) commit e3c277fb2371dda6c5defa931d54275767e96a7a Author: Ivo Hinkelmann <ihi@openoffice.org> Date: Tue Jul 13 17:42:44 2010 +0200 txtl10n: #113125# Support of help tree files in the L10N process l10ntools/source/localize.cxx | 4 +--- 1 files changed, 1 insertions(+), 3 deletions(-) commit 7aa4356766adb50238c1a0f626abeec888c4cd83 Author: Ivo Hinkelmann <ihi@openoffice.org> Date: Mon Jul 12 15:31:50 2010 +0200 txtl10n: #i113008# add support for xtx files (single text files) l10ntools/scripts/l10ntool.py | 4 ++-- l10ntools/scripts/sdf.py | 2 -- l10ntools/scripts/xtxex.py | 29 ++++++++++++++++++++++------- 3 files changed, 24 insertions(+), 11 deletions(-) commit dcc8cf442b3a1a7dd324369973bcdf6545ecd7f1 Author: Ivo Hinkelmann <ihi@openoffice.org> Date: Wed Jul 7 15:36:02 2010 +0200 l10ntxt: #i113008# add support for xtx files (single text files) l10ntools/prj/d.lst | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) commit 070c78d5022a960d001f5d9c76edcd7eec4ce334 Author: Ivo Hinkelmann <ihi@openoffice.org> Date: Wed Jul 7 15:35:17 2010 +0200 l10ntxt: #i113008# add support for xtx files (single text files) l10ntools/scripts/const.py | 39 +++++++ l10ntools/scripts/l10ntool.py | 188 ++++++++++++++++++++++++++++++++ l10ntools/scripts/sdf.py | 240 +++++++++++++++++++++++++++++++++++++++++ l10ntools/scripts/xtxex | 47 ++++++++ l10ntools/scripts/xtxex.py | 92 ++++++++++++++++ 5 files changed, 606 insertions(+), 0 deletions(-) commit 2a17cfbbea42287dda8161db3e21efd5537afda9 Author: Ivo Hinkelmann <ihi@openoffice.org> Date: Wed Jul 7 15:30:32 2010 +0200 txtl10n: remove some noisy output / code cleanup l10ntools/source/cfglex.l | 16 +--------------- l10ntools/source/cfgmerge.cxx | 6 ++---- l10ntools/source/export.cxx | 1 - l10ntools/source/helpmerge.cxx | 11 ----------- l10ntools/source/lngex.cxx | 10 ---------- l10ntools/source/srclex.l | 6 ------ l10ntools/source/xrmlex.l | 5 ----- l10ntools/source/xrmmerge.cxx | 2 -- 8 files changed, 3 insertions(+), 54 deletions(-) commit 2860220263e5eaa63f1652b66e3e9146d1d64185 Author: Ivo Hinkelmann <ihi@openoffice.org> Date: Wed Jul 7 15:29:56 2010 +0200 txtl10n: #i113008# add support for xtx files l10ntools/source/localize.cxx | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) commit 19e65515b76e2eb7795dda8a6e0c36b17f5e6b86 Merge: dfa29f1 8d265da 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 a90fcced2402207e54ceda937736e094d2e67734 Author: Ocke Janssen [oj] <Ocke.Janssen@sun.com> Date: Thu Jul 1 15:52:47 2010 +0200 unoawt2: do not inline methods of exported classes toolkit/inc/toolkit/controls/unocontrols.hxx | 16 ++++++++++++---- toolkit/source/controls/unocontrols.cxx | 18 ++++++++++++++++++ 2 files changed, 30 insertions(+), 4 deletions(-) commit 5cffce31910b85b6938275193ff9165fb8f944d0 Author: sb <sb@openoffice.org> Date: Thu Jul 1 13:01:22 2010 +0200 jl154: #i112673# ensure that client-facing PID remains the same across internal OOo restart on Mac OS X comphelper/source/misc/officerestartmanager.cxx | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) commit 573f844a558e1d14102c7dcf00668737e82e85fb Author: Ocke Janssen [oj] <Ocke.Janssen@sun.com> Date: Thu Jul 1 11:50:54 2010 +0200 unoawt2: add XItemList to combobox as well, the sma eas for listbox toolkit/inc/toolkit/awt/vclxwindows.hxx | 24 ++-- toolkit/inc/toolkit/controls/unocontrols.hxx | 41 ++++- toolkit/source/awt/vclxwindows.cxx | 128 +++++++++++++--- toolkit/source/controls/unocontrols.cxx | 209 ++++++++++++++++++++++---- 4 files changed, 331 insertions(+), 71 deletions(-) commit c2fe85a25059e99e02c5e54cf1fe4c09041cd9b3 Author: Ocke Janssen [oj] <Ocke.Janssen@sun.com> Date: Thu Jul 1 11:46:35 2010 +0200 unoawt2: add missing GetEntryImage, same as listbox vcl/inc/vcl/combobox.hxx | 1 + vcl/source/control/combobox.cxx | 8 ++++++++ 2 files changed, 9 insertions(+), 0 deletions(-) commit 11c334fc51976347b71226f202c2d1201cdded97 Merge: d3021db 476fcc6 Author: Joachim Lingner <jl@openoffice.org> Date: Wed Jun 30 17:12:59 2010 +0200 jl154 merge with DEV300_m84 commit 8d265da55b6df02eed18a7c2eceec0094c2e8f87 Merge: c9bb3e5 4a52d01 Author: Frank Schoenheit [fs] <frank.schoenheit@sun.com> Date: Sun Jun 20 00:48:29 2010 +0200 Automated merge with ssh://hg@hg.services.openoffice.org/cws/unoawt2 commit 6e44518b3394218d9415833349c1d0801fe76c5e Merge: d0da065 b5b4748 Author: Mikhail Voytenko <mav@openoffice.org> Date: Fri Jun 18 14:32:18 2010 +0200 rebase to m83 commit 4a52d01c262a2c5c0f340b60263bb56574d3e125 Merge: a96adff 86da1c9 Author: Frank Schoenheit [fs] <frank.schoenheit@sun.com> Date: Thu Jun 17 23:37:32 2010 +0200 fs33a: merged CWS unoawt2, implicit rebase to m83 commit a96adff9b7381a5df558f948f49acfd7570b93ce Merge: f8df342 1b4b349 Author: Frank Schoenheit [fs] <frank.schoenheit@sun.com> Date: Thu Jun 17 11:47:25 2010 +0200 fs33a: merge after pulling latest changes from DEV300 (m81) commit f8df342df34322c089f504925fe1527143f6b2a3 Merge: 5920212 73c74cf Author: Frank Schoenheit [fs] <frank.schoenheit@sun.com> Date: Wed Jun 16 15:55:22 2010 +0200 Automated merge with ssh://hg@hg.services.openoffice.org/cws/fs33a commit 73c74cf29420448e0b68634e45f2e3b19019fdf0 Author: Frank Schoenheit [fs] <frank.schoenheit@sun.com> Date: Wed Jun 16 14:30:30 2010 +0200 fs33a: fixed VCLXFixedText::calcAdjustedSize to respect the given size toolkit/source/awt/vclxwindows.cxx | 13 ++++++------- 1 files changed, 6 insertions(+), 7 deletions(-) commit 5920212c7e74cf50089974e1ded7f87757387720 Author: Frank Schoenheit [fs] <frank.schoenheit@sun.com> Date: Wed Jun 16 09:53:37 2010 +0200 fs33a: fixed supportsService toolkit/source/controls/unocontrol.cxx | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) commit bad03a3adc15827cf7879c30f7d97d906bcb2b47 Author: Frank Schoenheit [fs] <frank.schoenheit@sun.com> Date: Sun May 2 13:19:38 2010 +0200 fs33a: compile errors on unxlngi6.pro / unxmacxi.pro toolkit/source/awt/vclxwindows.cxx | 2 +- toolkit/source/controls/unocontrols.cxx | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) commit 41bf2eaaae12bdf7ee318599a7c34a751b7b7f07 Author: Frank Schoenheit [fs] <frank.schoenheit@sun.com> Date: Thu Apr 29 15:29:46 2010 +0200 fs33a: #i111238# [s|g]etUserData -> [s|g]etItemData toolkit/inc/toolkit/controls/unocontrols.hxx | 4 ++-- toolkit/source/controls/unocontrols.cxx | 14 +++++++------- 2 files changed, 9 insertions(+), 9 deletions(-) commit cf2b1f10c0e7bbd9db8fe1b265a614ebb8b983ff Author: Frank Schoenheit [fs] <frank.schoenheit@sun.com> Date: Thu Apr 29 14:10:03 2010 +0200 fs33a: #i111238# now with UserData support toolkit/inc/toolkit/controls/unocontrols.hxx | 2 + toolkit/source/controls/unocontrols.cxx | 84 ++++++++++++++++++++------ 2 files changed, 67 insertions(+), 19 deletions(-) commit 57e2a2c59a923fbf6efaeb17adec076a7264e33d Author: Frank Schoenheit [fs] <frank.schoenheit@sun.com> Date: Thu Apr 29 10:05:04 2010 +0200 fs33a: #i111238# add support for images to AWT's ListBoxControl/Model toolkit/inc/toolkit/awt/vclxwindows.hxx | 31 +- toolkit/inc/toolkit/controls/roadmapcontrol.hxx | 6 - toolkit/inc/toolkit/controls/unocontrol.hxx | 2 +- toolkit/inc/toolkit/controls/unocontrolmodel.hxx | 1 - toolkit/inc/toolkit/controls/unocontrols.hxx | 123 ++++-- toolkit/source/awt/vclxwindows.cxx | 136 +++++- toolkit/source/controls/unocontrolmodel.cxx | 21 +- toolkit/source/controls/unocontrols.cxx | 558 ++++++++++++++++++++-- vcl/inc/vcl/lstbox.hxx | 1 + vcl/source/control/lstbox.cxx | 9 + 10 files changed, 759 insertions(+), 129 deletions(-)
author: Bjoern Michaelsen <bjoern.michaelsen@canonical.com> 2011-08-23 15:16:52 +0200
committer: Bjoern Michaelsen <bjoern.michaelsen@canonical.com> 2011-08-23 15:16:52 +0200
commit: bc7a04d7fec4005b3ae81f7dc3f5002b62d279d2 (patch)
tree: a7e85124431055d833e74ff2a4b4aa284a9a16ea
parent: d36d42903c67d2fc1c66bb37f1e88119218357d4 (diff)
3731 files changed, 87761 insertions, 87331 deletions
diff --git a/basebmp/inc/basebmp/accessor.hxx b/basebmp/inc/basebmp/accessor.hxx
index b98f05e78f6c..dc86f44056cb 100644
--- a/basebmp/inc/basebmp/accessor.hxx
+++ b/basebmp/inc/basebmp/accessor.hxx
@@ -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
@@ -47,7 +47,7 @@ public:
 
     template< class Iterator >
     value_type operator()(Iterator const& i) const
-    {
+    { 
         return *i;
     }
 
@@ -61,7 +61,7 @@ public:
 
     template< typename V, class Iterator >
     void set(V const& value, Iterator const& i) const
-    {
+    { 
         *i = vigra::detail::RequiresExplicitCast<value_type>::cast(value);
     }
 
@@ -88,8 +88,8 @@ public:
 
     template< class Iterator >
     value_type operator()(Iterator const& i) const
-    {
-        return i.get();
+    { 
+        return i.get(); 
     }
 
     template< class Iterator, class Difference >
@@ -102,14 +102,14 @@ public:
 
     template< typename V, class Iterator >
     void set(V const& value, Iterator const& i) const
-    {
+    { 
         i.set( vigra::detail::RequiresExplicitCast<value_type>::cast(value) );
     }
 
     template< typename V, class Iterator, class Difference >
     void set(V const& value, Iterator const& i, Difference const& diff) const
     {
-        i.set( vigra::detail::RequiresExplicitCast<value_type>::cast(value),
+        i.set( vigra::detail::RequiresExplicitCast<value_type>::cast(value), 
                diff );
     }
 };
diff --git a/basebmp/inc/basebmp/accessoradapters.hxx b/basebmp/inc/basebmp/accessoradapters.hxx
index 40b4faed4bae..d45544cc1869 100644
--- a/basebmp/inc/basebmp/accessoradapters.hxx
+++ b/basebmp/inc/basebmp/accessoradapters.hxx
@@ -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
@@ -39,7 +39,7 @@ namespace basebmp
     @tpl WrappedAccessor
     Wrapped type must provide the usual get and set accessor methods,
     with the usual signatures (see StandardAccessor for a conforming
-    example).
+    example). 
 
     @tpl GetterFunctor
     An Adaptable Unary Function (i.e. providing result_type and
@@ -49,8 +49,8 @@ namespace basebmp
     An Adaptable Unary Function (i.e. providing result_type and
     argument_type typedefs)
  */
-template< class WrappedAccessor,
-          typename GetterFunctor,
+template< class WrappedAccessor, 
+          typename GetterFunctor, 
           typename SetterFunctor > class UnaryFunctionAccessorAdapter
 {
 public:
@@ -74,12 +74,12 @@ public:
         maAccessor(),
         maGetterFunctor(),
         maSetterFunctor()
-    {}
+    {}    
 
-    template< class A > explicit
+    template< class A > explicit 
     UnaryFunctionAccessorAdapter( UnaryFunctionAccessorAdapter< A,
                                                                 GetterFunctor,
-                                                                SetterFunctor > const& rSrc ) :
+                                                                SetterFunctor > const& rSrc ) : 
         maAccessor( rSrc.maAccessor ),
         maGetterFunctor( rSrc.maGetterFunctor ),
         maSetterFunctor( rSrc.maSetterFunctor )
@@ -90,7 +90,7 @@ public:
         maGetterFunctor(),
         maSetterFunctor()
     {}
-
+    
     template< class T > UnaryFunctionAccessorAdapter( T             accessor,
                                                       GetterFunctor getterFunctor,
                                                       SetterFunctor setterFunctor) :
@@ -98,7 +98,7 @@ public:
         maGetterFunctor( getterFunctor ),
         maSetterFunctor( setterFunctor )
     {}
-
+    
     // -------------------------------------------------------
 
     WrappedAccessor const& getWrappedAccessor() const { return maAccessor; }
@@ -107,11 +107,11 @@ public:
     // -------------------------------------------------------
 
     value_type getter(typename GetterFunctor::argument_type v) const
-    {
+    { 
         return maGetterFunctor(v);
     }
     typename SetterFunctor::result_type setter(argument_type v) const
-    {
+    { 
         return maSetterFunctor(v);
     }
 
@@ -119,7 +119,7 @@ public:
 
     template< class Iterator >
     value_type operator()(Iterator const& i) const
-    {
+    { 
         return maGetterFunctor( maAccessor(i) );
     }
 
@@ -133,8 +133,8 @@ public:
 
     template< typename V, class Iterator >
     void set(V const& value, Iterator const& i) const
-    {
-        maAccessor.set(
+    { 
+        maAccessor.set( 
             maSetterFunctor(
                 vigra::detail::RequiresExplicitCast<argument_type>::cast(value) ),
             i );
@@ -143,7 +143,7 @@ public:
     template< typename V, class Iterator, class Difference >
     void set(V const& value, Iterator const& i, Difference const& diff) const
     {
-        maAccessor.set(
+        maAccessor.set( 
             maSetterFunctor(
                 vigra::detail::RequiresExplicitCast<argument_type>::cast(value) ),
             i,
@@ -168,7 +168,7 @@ public:
     An adaptable binary function (i.e. providing nested typedefs for
     result_type and first and second argument type)
  */
-template< class WrappedAccessor,
+template< class WrappedAccessor, 
           typename SetterFunctor > class BinarySetterFunctionAccessorAdapter
 {
 public:
@@ -188,12 +188,12 @@ public:
     BinarySetterFunctionAccessorAdapter() :
         maAccessor(),
         maFunctor()
-    {}
+    {}    
 
-    template< class A > explicit
-    BinarySetterFunctionAccessorAdapter(
+    template< class A > explicit 
+    BinarySetterFunctionAccessorAdapter( 
         BinarySetterFunctionAccessorAdapter< A,
-                                             SetterFunctor > const& rSrc ) :
+                                             SetterFunctor > const& rSrc ) : 
         maAccessor( rSrc.maAccessor ),
         maFunctor( rSrc.maFunctor )
     {}
@@ -202,13 +202,13 @@ public:
         maAccessor( accessor ),
         maFunctor()
     {}
-
+    
     template< class T > BinarySetterFunctionAccessorAdapter( T             accessor,
                                                              SetterFunctor functor ) :
         maAccessor( accessor ),
         maFunctor( functor )
     {}
-
+    
     // -------------------------------------------------------
 
     WrappedAccessor const& getWrappedAccessor() const { return maAccessor; }
@@ -216,10 +216,10 @@ public:
 
     // -------------------------------------------------------
 
-    typename SetterFunctor::result_type setter(
+    typename SetterFunctor::result_type setter( 
         typename SetterFunctor::first_argument_type v1,
         argument_type                               v2 ) const
-    {
+    { 
         return maSetterFunctor(v1,v2);
     }
 
@@ -227,7 +227,7 @@ public:
 
     template< class Iterator >
     value_type operator()(Iterator const& i) const
-    {
+    { 
         return maAccessor(i);
     }
 
@@ -241,9 +241,9 @@ public:
 
     template< typename V, class Iterator >
     void set(V const& value, Iterator const& i) const
-    {
-        maAccessor.set(
-            maFunctor(maAccessor(i),
+    { 
+        maAccessor.set( 
+            maFunctor(maAccessor(i), 
                       vigra::detail::RequiresExplicitCast<argument_type>::cast(value)),
             i );
     }
@@ -252,7 +252,7 @@ public:
     void set(V const& value, Iterator const& i, Difference const& diff) const
     {
         maAccessor.set(
-            maFunctor(maAccessor(i,diff),
+            maFunctor(maAccessor(i,diff), 
                       vigra::detail::RequiresExplicitCast<argument_type>::cast(value)),
             i,
             diff );
@@ -283,8 +283,8 @@ public:
     An adaptable ternary function (i.e. providing nested typedefs for
     result_type and first, second and third argument type)
  */
-template< class WrappedAccessor1,
-          class WrappedAccessor2,
+template< class WrappedAccessor1, 
+          class WrappedAccessor2, 
           typename Functor > class TernarySetterFunctionAccessorAdapter
 {
 public:
@@ -315,16 +315,16 @@ public:
     {}
 
     template< class A1, class A2 > explicit
-    TernarySetterFunctionAccessorAdapter(
+    TernarySetterFunctionAccessorAdapter( 
         TernarySetterFunctionAccessorAdapter< A1,
                                               A2,
-                                              Functor > const& rSrc ) :
+                                              Functor > const& rSrc ) : 
         ma1stAccessor( rSrc.ma1stAccessor ),
         ma2ndAccessor( rSrc.ma2ndAccessor ),
         maFunctor( rSrc.maFunctor )
     {}
 
-    template< class T1, class T2 >
+    template< class T1, class T2 > 
     TernarySetterFunctionAccessorAdapter( T1 accessor1,
                                           T2 accessor2 ) :
         ma1stAccessor( accessor1 ),
@@ -332,7 +332,7 @@ public:
         maFunctor()
     {}
 
-    template< class T1, class T2 >
+    template< class T1, class T2 > 
     TernarySetterFunctionAccessorAdapter( T1      accessor1,
                                           T2      accessor2,
                                           Functor func ) :
@@ -340,7 +340,7 @@ public:
         ma2ndAccessor( accessor2 ),
         maFunctor( func )
     {}
-
+    
     // -------------------------------------------------------
 
     WrappedAccessor1 const& get1stWrappedAccessor() const { return ma1stAccessor; }
@@ -351,11 +351,11 @@ public:
 
     // -------------------------------------------------------
 
-    typename Functor::result_type setter(
+    typename Functor::result_type setter( 
         typename Functor::first_argument_type  v1,
         typename Functor::second_argument_type v2,
         argument_type                          v3 ) const
-    {
+    { 
         return maSetterFunctor(v1,v2,v3);
     }
 
@@ -363,7 +363,7 @@ public:
 
     template< class Iterator >
     value_type operator()(Iterator const& i) const
-    {
+    { 
         return ma1stAccessor(i.first());
     }
 
@@ -377,9 +377,9 @@ public:
 
     template< typename V, class Iterator >
     void set(V const& value, Iterator const& i) const
-    {
+    { 
         ma1stAccessor.set(
-            maFunctor(ma1stAccessor(i.first()),
+            maFunctor(ma1stAccessor(i.first()), 
                       ma2ndAccessor(i.second()),
                       vigra::detail::RequiresExplicitCast<argument_type>::cast(value)),
             i.first() );
@@ -389,7 +389,7 @@ public:
     void set(V const& value, Iterator const& i, Difference const& diff) const
     {
         ma1stAccessor.set(
-            maFunctor(ma1stAccessor(i.first(), diff),
+            maFunctor(ma1stAccessor(i.first(), diff), 
                       ma2ndAccessor(i.second(),diff),
                       vigra::detail::RequiresExplicitCast<argument_type>::cast(value)),
             i.first(),
@@ -397,7 +397,7 @@ public:
     }
 
 };
-
+   
 //-----------------------------------------------------------------------------
 
 /** Access two distinct images simultaneously
@@ -420,7 +420,7 @@ public:
     example). Furthermore, the type must provide a nested typedef
     value_type.
  */
-template< class WrappedAccessor1,
+template< class WrappedAccessor1, 
           class WrappedAccessor2 > class JoinImageAccessorAdapter
 {
 public:
@@ -451,14 +451,14 @@ public:
     {}
 
     template< class A1, class A2 > explicit
-    JoinImageAccessorAdapter(
+    JoinImageAccessorAdapter( 
         JoinImageAccessorAdapter< A1,
-                                  A2 > const& rSrc ) :
+                                  A2 > const& rSrc ) : 
         ma1stAccessor( rSrc.ma1stAccessor ),
         ma2ndAccessor( rSrc.ma2ndAccessor )
     {}
 
-    template< class T1, class T2 >
+    template< class T1, class T2 > 
     JoinImageAccessorAdapter( T1 accessor1,
                               T2 accessor2 ) :
         ma1stAccessor( accessor1 ),
@@ -477,7 +477,7 @@ public:
 
     template< class Iterator >
     value_type operator()(Iterator const& i) const
-    {
+    { 
         return std::make_pair(ma1stAccessor(i.first()),
                               ma2ndAccessor(i.second()));
     }
@@ -493,12 +493,12 @@ public:
 
     template< typename V, class Iterator >
     void set(V const& value, Iterator const& i) const
-    {
-        ma1stAccessor.set(
+    { 
+        ma1stAccessor.set( 
             vigra::detail::RequiresExplicitCast<typename WrappedAccessor1::value_type>::cast(
                 value.first),
             i.first() );
-        ma2ndAccessor.set(
+        ma2ndAccessor.set( 
             vigra::detail::RequiresExplicitCast<typename WrappedAccessor2::value_type>::cast(
                 value.second),
             i.second() );
@@ -507,19 +507,19 @@ public:
     template< typename V, class Iterator, class Difference >
     void set(V const& value, Iterator const& i, Difference const& diff) const
     {
-        ma1stAccessor.set(
+        ma1stAccessor.set( 
             vigra::detail::RequiresExplicitCast<typename WrappedAccessor1::value_type>::cast(
                 value.first),
             i.first(),
             diff );
-        ma2ndAccessor.set(
+        ma2ndAccessor.set( 
             vigra::detail::RequiresExplicitCast<typename WrappedAccessor2::value_type>::cast(
                 value.second),
             i.second(),
             diff );
     }
 
-};
+};   
 
 } // namespace basebmp
 
diff --git a/basebmp/inc/basebmp/accessorfunctors.hxx b/basebmp/inc/basebmp/accessorfunctors.hxx
index fdb9b75aa64f..e0ce7df801a5 100644
--- a/basebmp/inc/basebmp/accessorfunctors.hxx
+++ b/basebmp/inc/basebmp/accessorfunctors.hxx
@@ -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
@@ -49,7 +49,7 @@ template< typename T > struct XorFunctor : public std::binary_function<T,T,T>
 //-----------------------------------------------------------------------------
 
 /// Base class, passing on the arg types
-template< typename T, typename M > struct MaskFunctorBase :
+template< typename T, typename M > struct MaskFunctorBase : 
         public TernaryFunctorBase<T,M,T,T> {};
 
 
@@ -60,8 +60,8 @@ template< typename T, typename M > struct MaskFunctorBase :
     transparency, i.e. the original value will display. And vice
     versa.
  */
-template< typename T,
-          typename M,
+template< typename T, 
+          typename M, 
           bool     polarity > struct GenericOutputMaskFunctor : public MaskFunctorBase<T,M>
 {
     /// Ternary mask operation - selects v1 for !m == polarity, v2 otherwise
@@ -74,14 +74,14 @@ template< typename T,
 /** Let a mask bit decide between two values (specialization for
     integer mask types)
  */
-template< typename T,
+template< typename T, 
           typename M,
           bool     polarity > struct IntegerOutputMaskFunctor;
-template< typename T,
+template< typename T, 
           typename M > struct IntegerOutputMaskFunctor<T,M,true> : public MaskFunctorBase<T,M>
 {
     /** Mask v with state of m
-
+        
         @return v2, if m != 0, v1 otherwise.
      */
     T operator()( T v1, M m, T v2 ) const
@@ -93,11 +93,11 @@ template< typename T,
         return v1*(M)(1-mask) + v2*mask;
     }
 };
-template< typename T,
+template< typename T, 
           typename M > struct IntegerOutputMaskFunctor<T,M,false> : public MaskFunctorBase<T,M>
 {
     /** Mask v with state of m
-
+        
         @return v2, if m != 0, v1 otherwise.
      */
     T operator()( T v1, M m, T v2 ) const
@@ -114,7 +114,7 @@ template< typename T,
     binary-valued mask types)
  */
 template< typename T, typename M, bool polarity > struct FastIntegerOutputMaskFunctor;
-template< typename T, typename M > struct FastIntegerOutputMaskFunctor<T,M,true> :
+template< typename T, typename M > struct FastIntegerOutputMaskFunctor<T,M,true> : 
    public MaskFunctorBase<T,M>
 {
     /// Specialization, only valid if mask can only attain 0 or 1
@@ -125,7 +125,7 @@ template< typename T, typename M > struct FastIntegerOutputMaskFunctor<T,M,true>
         return v1*(M)(1-m) + v2*m;
     }
 };
-template< typename T, typename M > struct FastIntegerOutputMaskFunctor<T,M,false> :
+template< typename T, typename M > struct FastIntegerOutputMaskFunctor<T,M,false> : 
    public MaskFunctorBase<T,M>
 {
     /// Specialization, only valid if mask can only attain 0 or 1
@@ -166,14 +166,14 @@ private:
 public:
     BinaryFunctorSplittingWrapper() : maFunctor() {}
 
-    template< class A > explicit
-    BinaryFunctorSplittingWrapper(
+    template< class A > explicit 
+    BinaryFunctorSplittingWrapper( 
         BinaryFunctorSplittingWrapper<A> const& src ) : maFunctor(src.maFunctor) {}
 
-    template< class F > explicit
+    template< class F > explicit 
     BinaryFunctorSplittingWrapper( F const& func ) : maFunctor(func) {}
 
-    typename Functor::result_type operator()(
+    typename Functor::result_type operator()( 
         typename Functor::first_argument_type                      v1,
         std::pair< typename Functor::third_argument_type,
                    typename Functor::second_argument_type > const& v2 ) const
diff --git a/basebmp/inc/basebmp/accessortraits.hxx b/basebmp/inc/basebmp/accessortraits.hxx
index 0cb0d1f8d37d..ea586868caaf 100644
--- a/basebmp/inc/basebmp/accessortraits.hxx
+++ b/basebmp/inc/basebmp/accessortraits.hxx
@@ -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
@@ -60,13 +60,13 @@ template< typename T, typename M, bool polarity > struct outputMaskFunctorSelect
     Specialize this metafunction for your case, and pass FastMask to
     the outputMaskFunctorSelector.
  */
-template< class Accessor,
-          class MaskAccessor,
+template< class Accessor, 
+          class MaskAccessor, 
           class Iterator,
           class MaskIterator,
           bool  polarity > struct maskedAccessorSelector
 {
-    typedef TernarySetterFunctionAccessorAdapter<
+    typedef TernarySetterFunctionAccessorAdapter< 
         Accessor,
         MaskAccessor,
         typename outputMaskFunctorSelector<
@@ -96,7 +96,7 @@ template< class Accessor > struct AccessorTraits
     typedef Accessor                                raw_accessor;
 
     /// Retrieve wrapped accessor for XOR setter access
-    typedef BinarySetterFunctionAccessorAdapter<
+    typedef BinarySetterFunctionAccessorAdapter< 
         Accessor,
         XorFunctor< value_type > >                  xor_accessor;
 
@@ -112,7 +112,7 @@ template< class Accessor > struct AccessorTraits
         partial specializations that take an optimized functor for
         certain mask accessors.
      */
-    template< class MaskAccessor,
+    template< class MaskAccessor, 
               class Iterator,
               class MaskIterator,
               bool  polarity > struct               masked_accessor :
diff --git a/basebmp/inc/basebmp/bitmapdevice.hxx b/basebmp/inc/basebmp/bitmapdevice.hxx
index b1c513444fe6..08f179004017 100644
--- a/basebmp/inc/basebmp/bitmapdevice.hxx
+++ b/basebmp/inc/basebmp/bitmapdevice.hxx
@@ -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
@@ -59,7 +59,7 @@ typedef boost::shared_ptr< const std::vector<Color> >   PaletteMemorySharedVecto
 
 struct ImplBitmapDevice;
 
-/** Definition of BitmapDevice interface
+/** Definition of BitmapDevice interface 
 
     Use the createBitmapDevice() factory method to create instances.
 
@@ -143,7 +143,7 @@ public:
         Draw mode to use when changing the pixel value
      */
     void setPixel( const basegfx::B2IPoint& rPt,
-                   Color                    pixelColor,
+                   Color                    pixelColor, 
                    DrawMode                 drawMode );
 
     /** Set given pixel to specified color
@@ -161,9 +161,9 @@ public:
         Clip mask to use. If the clip mask is 1 at the given pixel
         position, no change will take place.
      */
-    void setPixel( const basegfx::B2IPoint&     rPt,
-                   Color                        pixelColor,
-                   DrawMode                     drawMode,
+    void setPixel( const basegfx::B2IPoint&     rPt, 
+                   Color                        pixelColor, 
+                   DrawMode                     drawMode, 
                    const BitmapDeviceSharedPtr& rClip );
 
     /** Get color value at given pixel
@@ -183,7 +183,7 @@ public:
         @param rPt1
         Start point of the line
 
-        @param rPt2
+        @param rPt2 
         End point of the line. If the analytical line from rP1 to rPt2
         (with the actual pixel positions assumed to be the center of
         the pixel) is exactly in the middle between two pixel, this
@@ -195,9 +195,9 @@ public:
         @param drawMode
         Draw mode to use when changing the pixel value
      */
-    void drawLine( const basegfx::B2IPoint& rPt1,
-                   const basegfx::B2IPoint& rPt2,
-                   Color                    lineColor,
+    void drawLine( const basegfx::B2IPoint& rPt1, 
+                   const basegfx::B2IPoint& rPt2, 
+                   Color                    lineColor, 
                    DrawMode                 drawMode );
 
     /** Draw a line
@@ -205,7 +205,7 @@ public:
         @param rPt1
         Start point of the line
 
-        @param rPt2
+        @param rPt2 
         End point of the line. If the analytical line from rP1 to rPt2
         (with the actual pixel positions assumed to be the center of
         the pixel) is exactly in the middle between two pixel, this
@@ -221,10 +221,10 @@ public:
         Clip mask to use. Pixel where the corresponding clip mask
         pixel is 1 will not be modified.
      */
-    void drawLine( const basegfx::B2IPoint&     rPt1,
-                   const basegfx::B2IPoint&     rPt2,
-                   Color                        lineColor,
-                   DrawMode                     drawMode,
+    void drawLine( const basegfx::B2IPoint&     rPt1, 
+                   const basegfx::B2IPoint&     rPt2, 
+                   Color                        lineColor, 
+                   DrawMode                     drawMode, 
                    const BitmapDeviceSharedPtr& rClip );
 
     /** Draw a polygon
@@ -240,8 +240,8 @@ public:
         @param drawMode
         Draw mode to use when changing pixel values
      */
-    void drawPolygon( const basegfx::B2DPolygon& rPoly,
-                      Color                      lineColor,
+    void drawPolygon( const basegfx::B2DPolygon& rPoly, 
+                      Color                      lineColor, 
                       DrawMode                   drawMode );
 
     /** Draw a polygon
@@ -261,9 +261,9 @@ public:
         Clip mask to use. Pixel where the corresponding clip mask
         pixel is 1 will not be modified.
      */
-    void drawPolygon( const basegfx::B2DPolygon&   rPoly,
-                      Color                        lineColor,
-                      DrawMode                     drawMode,
+    void drawPolygon( const basegfx::B2DPolygon&   rPoly, 
+                      Color                        lineColor, 
+                      DrawMode                     drawMode, 
                       const BitmapDeviceSharedPtr& rClip );
 
     /** Fill a poly-polygon
@@ -284,8 +284,8 @@ public:
         @param drawMode
         Draw mode to use when changing pixel values
      */
-    void fillPolyPolygon( const basegfx::B2DPolyPolygon& rPoly,
-                          Color                          fillColor,
+    void fillPolyPolygon( const basegfx::B2DPolyPolygon& rPoly, 
+                          Color                          fillColor, 
                           DrawMode                       drawMode );
 
     /** Fill a poly-polygon
@@ -310,9 +310,9 @@ public:
         Clip mask to use. Pixel where the corresponding clip mask
         pixel is 1 will not be modified.
      */
-    void fillPolyPolygon( const basegfx::B2DPolyPolygon& rPoly,
-                          Color                          fillColor,
-                          DrawMode                       drawMode,
+    void fillPolyPolygon( const basegfx::B2DPolyPolygon& rPoly, 
+                          Color                          fillColor, 
+                          DrawMode                       drawMode, 
                           const BitmapDeviceSharedPtr&   rClip );
 
     /** Draw another bitmap into this device
@@ -341,7 +341,7 @@ public:
      */
     void drawBitmap( const BitmapDeviceSharedPtr& rSrcBitmap,
                      const basegfx::B2IRange&     rSrcRect,
-                     const basegfx::B2IRange&     rDstRect,
+                     const basegfx::B2IRange&     rDstRect, 
                      DrawMode                     drawMode );
 
     /** Draw another bitmap into this device
@@ -374,8 +374,8 @@ public:
      */
     void drawBitmap( const BitmapDeviceSharedPtr& rSrcBitmap,
                      const basegfx::B2IRange&     rSrcRect,
-                     const basegfx::B2IRange&     rDstRect,
-                     DrawMode                     drawMode,
+                     const basegfx::B2IRange&     rDstRect, 
+                     DrawMode                     drawMode, 
                      const BitmapDeviceSharedPtr& rClip );
 
     /** Draw a color with an alpha-modulation bitmap into this device
@@ -444,9 +444,9 @@ public:
     void drawMaskedColor( Color                        aSrcColor,
                           const BitmapDeviceSharedPtr& rAlphaMask,
                           const basegfx::B2IRange&     rSrcRect,
-                          const basegfx::B2IPoint&     rDstPoint,
+                          const basegfx::B2IPoint&     rDstPoint, 
                           const BitmapDeviceSharedPtr& rClip );
-
+ 
     /** Draw another bitmap through a mask into this device
 
         This method renders a source bitmap into this device, much
@@ -485,7 +485,7 @@ public:
     void drawMaskedBitmap( const BitmapDeviceSharedPtr& rSrcBitmap,
                            const BitmapDeviceSharedPtr& rMask,
                            const basegfx::B2IRange&     rSrcRect,
-                           const basegfx::B2IRange&     rDstRect,
+                           const basegfx::B2IRange&     rDstRect, 
                            DrawMode                     drawMode );
 
     /** Draw another bitmap through a mask into this device
@@ -530,8 +530,8 @@ public:
     void drawMaskedBitmap( const BitmapDeviceSharedPtr& rSrcBitmap,
                            const BitmapDeviceSharedPtr& rMask,
                            const basegfx::B2IRange&     rSrcRect,
-                           const basegfx::B2IRange&     rDstRect,
-                           DrawMode                     drawMode,
+                           const basegfx::B2IRange&     rDstRect, 
+                           DrawMode                     drawMode, 
                            const BitmapDeviceSharedPtr& rClip );
 
 protected:
@@ -553,58 +553,58 @@ private:
                           const basegfx::B2IRange&  rBounds ) = 0;
 
     virtual void setPixel_i( const basegfx::B2IPoint& rPt,
-                             Color                    lineColor,
+                             Color                    lineColor, 
                              DrawMode                 drawMode ) = 0;
-    virtual void setPixel_i( const basegfx::B2IPoint&     rPt,
-                             Color                        lineColor,
-                             DrawMode                     drawMode,
+    virtual void setPixel_i( const basegfx::B2IPoint&     rPt, 
+                             Color                        lineColor, 
+                             DrawMode                     drawMode, 
                              const BitmapDeviceSharedPtr& rClip ) = 0;
 
     virtual Color getPixel_i( const basegfx::B2IPoint& rPt ) = 0;
 
     virtual sal_uInt32 getPixelData_i( const basegfx::B2IPoint& rPt ) = 0;
 
-    virtual void drawLine_i( const basegfx::B2IPoint& rPt1,
+    virtual void drawLine_i( const basegfx::B2IPoint& rPt1, 
                              const basegfx::B2IPoint& rPt2,
                              const basegfx::B2IRange& rBounds,
-                             Color                    lineColor,
+                             Color                    lineColor, 
                              DrawMode                 drawMode ) = 0;
-    virtual void drawLine_i( const basegfx::B2IPoint&     rPt1,
-                             const basegfx::B2IPoint&     rPt2,
+    virtual void drawLine_i( const basegfx::B2IPoint&     rPt1, 
+                             const basegfx::B2IPoint&     rPt2, 
                              const basegfx::B2IRange&     rBounds,
-                             Color                        lineColor,
-                             DrawMode                     drawMode,
+                             Color                        lineColor, 
+                             DrawMode                     drawMode, 
                              const BitmapDeviceSharedPtr& rClip ) = 0;
 
-    virtual void drawPolygon_i( const basegfx::B2DPolygon& rPoly,
+    virtual void drawPolygon_i( const basegfx::B2DPolygon& rPoly, 
                                 const basegfx::B2IRange&   rBounds,
-                                Color                      lineColor,
+                                Color                      lineColor, 
                                 DrawMode                   drawMode ) = 0;
-    virtual void drawPolygon_i( const basegfx::B2DPolygon&   rPoly,
+    virtual void drawPolygon_i( const basegfx::B2DPolygon&   rPoly, 
                                 const basegfx::B2IRange&     rBounds,
-                                Color                        lineColor,
-                                DrawMode                     drawMode,
+                                Color                        lineColor, 
+                                DrawMode                     drawMode, 
                                 const BitmapDeviceSharedPtr& rClip ) = 0;
 
-    virtual void fillPolyPolygon_i( const basegfx::B2DPolyPolygon& rPoly,
-                                    Color                          fillColor,
+    virtual void fillPolyPolygon_i( const basegfx::B2DPolyPolygon& rPoly, 
+                                    Color                          fillColor, 
                                     DrawMode                       drawMode,
                                     const basegfx::B2IRange&       rBounds ) = 0;
-    virtual void fillPolyPolygon_i( const basegfx::B2DPolyPolygon& rPoly,
-                                    Color                          fillColor,
+    virtual void fillPolyPolygon_i( const basegfx::B2DPolyPolygon& rPoly, 
+                                    Color                          fillColor, 
                                     DrawMode                       drawMode,
-                                    const basegfx::B2IRange&       rBounds,
+                                    const basegfx::B2IRange&       rBounds, 
                                     const BitmapDeviceSharedPtr&   rClip ) = 0;
 
     // must work with *this == rSrcBitmap!
     virtual void drawBitmap_i( const BitmapDeviceSharedPtr& rSrcBitmap,
                                const basegfx::B2IRange&     rSrcRect,
-                               const basegfx::B2IRange&     rDstRect,
+                               const basegfx::B2IRange&     rDstRect, 
                                DrawMode                     drawMode ) = 0;
     virtual void drawBitmap_i( const BitmapDeviceSharedPtr& rSrcBitmap,
                                const basegfx::B2IRange&     rSrcRect,
-                               const basegfx::B2IRange&     rDstRect,
-                               DrawMode                     drawMode,
+                               const basegfx::B2IRange&     rDstRect, 
+                               DrawMode                     drawMode, 
                                const BitmapDeviceSharedPtr& rClip ) = 0;
 
     // must work with *this == rSrcBitmap!
@@ -615,20 +615,20 @@ private:
     virtual void drawMaskedColor_i( Color                        rSrcColor,
                                     const BitmapDeviceSharedPtr& rAlphaMask,
                                     const basegfx::B2IRange&     rSrcRect,
-                                    const basegfx::B2IPoint&     rDstPoint,
+                                    const basegfx::B2IPoint&     rDstPoint, 
                                     const BitmapDeviceSharedPtr& rClip ) = 0;
-
+ 
     // must work with *this == rSrcBitmap!
     virtual void drawMaskedBitmap_i( const BitmapDeviceSharedPtr& rSrcBitmap,
                                      const BitmapDeviceSharedPtr& rMask,
                                      const basegfx::B2IRange&     rSrcRect,
-                                     const basegfx::B2IRange&     rDstRect,
+                                     const basegfx::B2IRange&     rDstRect, 
                                      DrawMode                     drawMode ) = 0;
     virtual void drawMaskedBitmap_i( const BitmapDeviceSharedPtr& rSrcBitmap,
                                      const BitmapDeviceSharedPtr& rMask,
                                      const basegfx::B2IRange&     rSrcRect,
-                                     const basegfx::B2IRange&     rDstRect,
-                                     DrawMode                     drawMode,
+                                     const basegfx::B2IRange&     rDstRect, 
+                                     DrawMode                     drawMode, 
                                      const BitmapDeviceSharedPtr& rClip ) = 0;
 
     BitmapDeviceSharedPtr getGenericRenderer() const;
diff --git a/basebmp/inc/basebmp/clippedlinerenderer.hxx b/basebmp/inc/basebmp/clippedlinerenderer.hxx
index 03b2bc860cbd..310c64543953 100644
--- a/basebmp/inc/basebmp/clippedlinerenderer.hxx
+++ b/basebmp/inc/basebmp/clippedlinerenderer.hxx
@@ -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
@@ -41,7 +41,7 @@ namespace basebmp
 // factored-out bresenham setup code, which is used from two different
 // places in renderClippedLine() below. Admittedly messy for the long
 // parameter list...
-inline bool prepareClip( sal_Int32  a1,
+inline bool prepareClip( sal_Int32  a1, 
                          sal_Int32  a2,
                          sal_Int32  b1,
                          sal_Int32  da,
@@ -50,7 +50,7 @@ inline bool prepareClip( sal_Int32  a1,
                          sal_Int32& o_bs,
                          int        sa,
                          int        sb,
-                         sal_Int32& io_rem,
+                         sal_Int32& io_rem, 
                          int&       o_n,
                          sal_uInt32 clipCode1,
                          sal_uInt32 clipCount1,
@@ -97,7 +97,7 @@ inline bool prepareClip( sal_Int32  a1,
         if( clipCode1 & (aMinFlag|aMaxFlag) )
         {
             cb = (ca + da - !bRoundTowardsPt2) / (2*da);
-
+            
             if( sb >= 0 )
             {
                 o_bs = b1 + cb;
@@ -110,7 +110,7 @@ inline bool prepareClip( sal_Int32  a1,
                 if( o_bs < bMin )
                     return false;
             }
-
+            
             io_rem += ca - 2*da*cb;
         }
         else
@@ -128,7 +128,7 @@ inline bool prepareClip( sal_Int32  a1,
                 if( o_as < aMin )
                     return false;
             }
-
+            
             io_rem += 2*db*ca - cb;
         }
     }
@@ -146,7 +146,7 @@ inline bool prepareClip( sal_Int32  a1,
             cb = 2*da*((clipCode2 & bMinFlag) ? b1 - bMin : bMax - b1);
             clipCode2 &= (cb + da < ca + bRoundTowardsPt2) ? ~(aMinFlag|aMaxFlag) : ~(bMinFlag|bMaxFlag);
         }
-
+        
         if( clipCode2 & (aMinFlag|aMaxFlag) )
             o_n = (clipCode2 & aMinFlag) ? o_as - aMin : aMax - o_as;
         else
@@ -186,7 +186,7 @@ inline bool prepareClip( sal_Int32  a1,
 
     @param end
     right-bottom image iterator
-
+    
     @param acc
     Image accessor
 
@@ -196,20 +196,20 @@ inline bool prepareClip( sal_Int32  a1,
     pixel, the pixel closer to pt1 will be chosen. Giving true here
     makes renderClippedLine() choose pt2 in those cases.
  */
-template< class Iterator, class Accessor >
+template< class Iterator, class Accessor > 
 void renderClippedLine( basegfx::B2IPoint             aPt1,
                         basegfx::B2IPoint             aPt2,
                         const basegfx::B2IRange&      rClipRect,
                         typename Accessor::value_type color,
-                        Iterator                      begin,
-                        Accessor                      acc,
+                        Iterator                      begin, 
+                        Accessor                      acc, 
                         bool                          bRoundTowardsPt2=false )
 {
     // Algorithm according to Steven Eker's 'Pixel-perfect line clipping',
     // Graphics Gems V, pp. 314-322
-    sal_uInt32 clipCode1 = basegfx::tools::getCohenSutherlandClipFlags(aPt1,
+    sal_uInt32 clipCode1 = basegfx::tools::getCohenSutherlandClipFlags(aPt1, 
                                                                        rClipRect);
-    sal_uInt32 clipCode2 = basegfx::tools::getCohenSutherlandClipFlags(aPt2,
+    sal_uInt32 clipCode2 = basegfx::tools::getCohenSutherlandClipFlags(aPt2, 
                                                                        rClipRect);
 
     if( clipCode1 & clipCode2 )
@@ -218,7 +218,7 @@ void renderClippedLine( basegfx::B2IPoint             aPt1,
     sal_uInt32 clipCount1 = basegfx::tools::getNumberOfClipPlanes(clipCode1);
     sal_uInt32 clipCount2 = basegfx::tools::getNumberOfClipPlanes(clipCode2);
 
-    if( (clipCode1 != 0 && clipCode2 == 0)
+    if( (clipCode1 != 0 && clipCode2 == 0) 
         || (clipCount1 == 2 && clipCount2 == 1) )
     {
         std::swap(clipCount2,clipCount1);
@@ -240,7 +240,7 @@ void renderClippedLine( basegfx::B2IPoint             aPt1,
         adx *= -1;
         sx = -1;
     }
-
+    
     // TODO(E1): This might overflow
     sal_Int32 ady = y2 - y1;
     int sy = 1;
@@ -249,7 +249,7 @@ void renderClippedLine( basegfx::B2IPoint             aPt1,
         ady *= -1;
         sy = -1;
     }
-
+    
     int n  = 0;
     sal_Int32 xs = x1;
     sal_Int32 ys = y1;
@@ -268,7 +268,7 @@ void renderClippedLine( basegfx::B2IPoint             aPt1,
                         bRoundTowardsPt2 ));
 
         Iterator currIter( begin + vigra::Diff2D(0,ys) );
-        typename vigra::IteratorTraits<Iterator>::row_iterator
+        typename vigra::IteratorTraits<Iterator>::row_iterator 
             rowIter( currIter.rowIterator() + xs );
 
         adx *= 2;
@@ -307,7 +307,7 @@ void renderClippedLine( basegfx::B2IPoint             aPt1,
             {
                 acc.set(color, rowIter);
 
-                if( --n < 0 )
+                if( --n < 0 ) 
                     break;
 
                 if( rem >= 0 )
@@ -344,7 +344,7 @@ void renderClippedLine( basegfx::B2IPoint             aPt1,
                         bRoundTowardsPt2 ));
 
         Iterator currIter( begin + vigra::Diff2D(xs,0) );
-        typename vigra::IteratorTraits<Iterator>::column_iterator
+        typename vigra::IteratorTraits<Iterator>::column_iterator 
             colIter( currIter.columnIterator() + ys );
 
         adx *= 2;
@@ -364,7 +364,7 @@ void renderClippedLine( basegfx::B2IPoint             aPt1,
                     xs += sx;
                     ys += sy;
                     rem -= ady;
-
+                    
                     currIter.x += sx;
                     colIter = currIter.columnIterator() + ys;
                 }
diff --git a/basebmp/inc/basebmp/color.hxx b/basebmp/inc/basebmp/color.hxx
index e9aab93a715c..a38e255a4566 100644
--- a/basebmp/inc/basebmp/color.hxx
+++ b/basebmp/inc/basebmp/color.hxx
@@ -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
@@ -37,7 +37,7 @@ namespace basebmp
 class Color
 {
 private:
-    sal_uInt32          mnColor;
+    sal_uInt32			mnColor;
 
 public:
     typedef sal_uInt32  value_type;
@@ -54,7 +54,7 @@ public:
     void setBlue( sal_uInt8 nBlue ) { mnColor &= ~0x000000FFUL; mnColor |= nBlue; }
 
     void setGrey( sal_uInt8 nGreyVal ) { mnColor = (sal_uInt32)nGreyVal << 16 | (sal_uInt32)nGreyVal << 8 | nGreyVal; }
-
+    
     sal_uInt8 getRed() const   { return 0xFF & (sal_uInt8)(mnColor >> 16); }
     sal_uInt8 getGreen() const { return 0xFF & (sal_uInt8)(mnColor >> 8); }
     sal_uInt8 getBlue() const  { return 0xFF & (sal_uInt8)mnColor; }
diff --git a/basebmp/inc/basebmp/colorblendaccessoradapter.hxx b/basebmp/inc/basebmp/colorblendaccessoradapter.hxx
index 03263c2c6062..18b62a7223f4 100644
--- a/basebmp/inc/basebmp/colorblendaccessoradapter.hxx
+++ b/basebmp/inc/basebmp/colorblendaccessoradapter.hxx
@@ -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
@@ -43,7 +43,7 @@ namespace basebmp
     when blitting through a mask) - there really isn't no other
     sensible default behaviour for these methods.
  */
-template< class    WrappedAccessor,
+template< class    WrappedAccessor, 
           typename AlphaType,
           bool     polarity > class ConstantColorBlendSetterAccessorAdapter
 {
@@ -53,7 +53,7 @@ public:
     typedef typename WrappedAccessor::value_type color_type;
 
 private:
-    typename ColorTraits< color_type >::
+    typename ColorTraits< color_type >:: 
              template blend_functor<alpha_type,polarity>::type   maFunctor;
     WrappedAccessor                                              maWrappee;
     color_type                                                   maBlendColor;
@@ -106,14 +106,14 @@ public:
     // -------------------------------------------------------
 
     /// @return constant value, regardless of iterator content
-    template< typename IteratorType > value_type operator()(IteratorType const& ) const
-    {
+    template< typename IteratorType > value_type operator()(IteratorType const& ) const 
+    { 
         return maGetterValue;
     }
     /// @return constant value, regardless of iterator content
     template< typename IteratorType, class Difference >
     value_type operator()(IteratorType const& , Difference const& ) const
-    {
+    { 
         return maGetterValue;
     }
 
@@ -121,7 +121,7 @@ public:
 
     template< typename V, typename IteratorType >
     void set(V const& value, IteratorType const& i) const
-    {
+    { 
         maWrappee.set(
             maFunctor(
                 vigra::detail::RequiresExplicitCast<alpha_type>::cast(value),
@@ -142,7 +142,7 @@ public:
             diff );
     }
 };
-
+   
 } // namespace basebmp
 
 #endif /* INCLUDED_BASEBMP_COLORBLENDACCESSORADAPTER_HXX */
diff --git a/basebmp/inc/basebmp/colormisc.hxx b/basebmp/inc/basebmp/colormisc.hxx
index 0974ebaa44a4..635a732bc773 100644
--- a/basebmp/inc/basebmp/colormisc.hxx
+++ b/basebmp/inc/basebmp/colormisc.hxx
@@ -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
@@ -127,18 +127,18 @@ template<> struct ColorTraits< Color >
     template< typename AlphaType, bool polarity > struct blend_functor;
 
     /// Calculate normalized distance between color c1 and c2
-    static inline double distance( const Color& c1,
-                                   const Color& c2 )
-    {
+    static inline double distance( const Color& c1, 
+                                   const Color& c2 ) 
+    { 
         return (c1 - c2).magnitude();
     }
 
-    static inline component_type toGreyscale( const Color& c )
+    static inline component_type toGreyscale( const Color& c ) 
     {
         return c.getGreyscale();
     }
 
-    static inline Color fromGreyscale( component_type c )
+    static inline Color fromGreyscale( component_type c ) 
     {
         return Color(c,c,c);
     }
@@ -175,7 +175,7 @@ struct NumericTraits<basebmp::Color>
     typedef VigraTrueType  isSigned;
     typedef VigraTrueType  isOrdered;
     typedef VigraFalseType isComplex;
-
+    
     static Type zero() { return Type(); }
     static Type one() { return Type(0x01010101); }
     static Type nonZero() { return Type(0x01010101); }
diff --git a/basebmp/inc/basebmp/colortraits.hxx b/basebmp/inc/basebmp/colortraits.hxx
index 9c30b8f082c0..aa5e57d2a265 100644
--- a/basebmp/inc/basebmp/colortraits.hxx
+++ b/basebmp/inc/basebmp/colortraits.hxx
@@ -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
@@ -43,10 +43,10 @@ namespace basebmp
     When true, 0 means fully transparent, and 1 fully opaque. And vice
     versa.
  */
-template< typename ValueType,
+template< typename ValueType, 
           typename AlphaType,
           bool     polarity > struct BlendFunctor;
-template< typename ValueType,
+template< typename ValueType, 
           typename AlphaType > struct BlendFunctor<ValueType,AlphaType,true>
   : public TernaryFunctorBase<AlphaType,ValueType,ValueType,ValueType>
 {
@@ -59,7 +59,7 @@ template< typename ValueType,
         return (vigra::NumericTraits<AlphaType>::one()-fAlpha)*v1 + fAlpha*v2;
     }
 };
-template< typename ValueType,
+template< typename ValueType, 
           typename AlphaType > struct BlendFunctor<ValueType,AlphaType,false>
   : public TernaryFunctorBase<AlphaType,ValueType,ValueType,ValueType>
 {
@@ -78,12 +78,12 @@ template< typename ValueType,
 
     @tpl polarity
     When true, 0 means fully transparent, and 1 fully opaque. And vice
-    versa.
+    versa.    
  */
-template< typename ValueType,
+template< typename ValueType, 
           typename AlphaType,
           bool     polarity > struct IntegerBlendFunctor;
-template< typename ValueType,
+template< typename ValueType, 
           typename AlphaType > struct IntegerBlendFunctor<ValueType,AlphaType,true>
   : public TernaryFunctorBase<AlphaType,ValueType,ValueType,ValueType>
 {
@@ -96,7 +96,7 @@ template< typename ValueType,
             vigra::NumericTraits<AlphaType>::max();
     }
 };
-template< typename ValueType,
+template< typename ValueType, 
           typename AlphaType > struct IntegerBlendFunctor<ValueType,AlphaType,false>
   : public TernaryFunctorBase<AlphaType,ValueType,ValueType,ValueType>
 {
@@ -104,7 +104,7 @@ template< typename ValueType,
                           ValueType v1,
                           ValueType v2 ) const
     {
-        return (alpha*v1 +
+        return (alpha*v1 + 
                 vigra::NumericTraits<AlphaType>::toPromote(
                     vigra::NumericTraits<AlphaType>::max()-alpha)*v2) /
             vigra::NumericTraits<AlphaType>::max();
@@ -128,18 +128,18 @@ template< typename ColorType > struct ColorTraits
     typedef ColorType component_type;
 
     /// Calculate normalized distance between color c1 and c2
-    static inline vigra::NormTraits<ColorType> distance( ColorType c1,
-                                                         ColorType c2 )
-    {
+    static inline vigra::NormTraits<ColorType> distance( ColorType c1, 
+                                                         ColorType c2 ) 
+    { 
         return vigra::norm(c1 - c2);
     }
 
-    static inline component_type toGreyscale( ColorType c )
+    static inline component_type toGreyscale( ColorType c ) 
     {
         return c;
     }
 
-    static inline ColorType fromGreyscale( component_type c )
+    static inline ColorType fromGreyscale( component_type c ) 
     {
         return c;
     }
diff --git a/basebmp/inc/basebmp/compositeiterator.hxx b/basebmp/inc/basebmp/compositeiterator.hxx
index 70f2acebb043..ed56ebd3579d 100755
--- a/basebmp/inc/basebmp/compositeiterator.hxx
+++ b/basebmp/inc/basebmp/compositeiterator.hxx
@@ -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
@@ -78,16 +78,16 @@ namespace detail
         { return *mpVal1 - *rhs.mpVal1; }
 
     private:
-        T1* mpVal1;
-        T2* mpVal2;
+        T1* mpVal1; 
+        T2* mpVal2; 
     };
 
-    template< typename Iterator1,
-              typename Iterator2,
-              typename ValueType,
+    template< typename Iterator1, 
+              typename Iterator2, 
+              typename ValueType, 
               typename DifferenceType,
               typename IteratorCategory,
-              class Derived >
+              class Derived > 
     class CompositeIteratorBase : public NonStandardIterator
     {
     public:
@@ -109,12 +109,12 @@ namespace detail
 
     public:
         CompositeIteratorBase() :
-            maIter1(),
+            maIter1(), 
             maIter2()
         {}
 
         CompositeIteratorBase( const iterator1_type& rIter1, const iterator2_type& rIter2 ) :
-            maIter1( rIter1 ),
+            maIter1( rIter1 ), 
             maIter2( rIter2 )
         {}
 
@@ -224,7 +224,7 @@ namespace detail
     };
 }
 
-/** Provide the composition of two 1D image iterators
+/** Provide the composition of two 1D image iterators 
 
     Use this template to compose two iterators into one (e.g. image
     and mask). Operations are transitive, e.g. operator== only returns
@@ -234,31 +234,31 @@ namespace detail
     avoid funny effects, iterator ranges given by a CompositeIterator
     should consist of wrapped iterators of similar range
  */
-template< typename Iterator1,
+template< typename Iterator1, 
           typename Iterator2,
-          typename ValueType,
+          typename ValueType, 
           typename DifferenceType,
-          typename IteratorCategory >
-class CompositeIterator1D :
-    public detail::CompositeIteratorBase< Iterator1,
-                                          Iterator2,
+          typename IteratorCategory > 
+class CompositeIterator1D : 
+    public detail::CompositeIteratorBase< Iterator1, 
+                                          Iterator2, 
                                           ValueType,
                                           DifferenceType,
                                           IteratorCategory,
-                                          CompositeIterator1D<Iterator1,
+                                          CompositeIterator1D<Iterator1, 
                                                               Iterator2,
-                                                              ValueType,
+                                                              ValueType, 
                                                               DifferenceType,
                                                               IteratorCategory> >
 {
-    typedef detail::CompositeIteratorBase< Iterator1,
-                                           Iterator2,
+    typedef detail::CompositeIteratorBase< Iterator1, 
+                                           Iterator2, 
                                            ValueType,
                                            DifferenceType,
                                            IteratorCategory,
-                                           CompositeIterator1D<Iterator1,
+                                           CompositeIterator1D<Iterator1, 
                                                                Iterator2,
-                                                               ValueType,
+                                                               ValueType, 
                                                                DifferenceType,
                                                                IteratorCategory> > base_type;
 public:
@@ -266,13 +266,13 @@ public:
         base_type()
     {}
 
-    CompositeIterator1D( const Iterator1& rIter1,
+    CompositeIterator1D( const Iterator1& rIter1, 
                          const Iterator2& rIter2 ) :
         base_type( rIter1, rIter2 )
     {}
 };
 
-/** Provide the composition of two 2D image iterators
+/** Provide the composition of two 2D image iterators 
 
     Use this template to compose two iterators into one (e.g. image
     and mask). Operations are transitive, e.g. operator== only returns
@@ -282,23 +282,23 @@ public:
     avoid funny effects, iterator ranges given by a CompositeIterator
     should consist of wrapped iterators of similar range
  */
-template< typename Iterator1, typename Iterator2 > class CompositeIterator2D :
-    public detail::CompositeIteratorBase< Iterator1,
-                                          Iterator2,
+template< typename Iterator1, typename Iterator2 > class CompositeIterator2D : 
+    public detail::CompositeIteratorBase< Iterator1, 
+                                          Iterator2, 
                                           std::pair<
-                                                typename vigra::IteratorTraits<Iterator1>::value_type,
+                                                typename vigra::IteratorTraits<Iterator1>::value_type, 
                                                 typename vigra::IteratorTraits<Iterator2>::value_type >,
-                                          typename vigra::IteratorTraits<Iterator1>::difference_type,
-                                          typename vigra::IteratorTraits<Iterator1>::iterator_category,
+                                          typename vigra::IteratorTraits<Iterator1>::difference_type, 
+                                          typename vigra::IteratorTraits<Iterator1>::iterator_category, 
                                           CompositeIterator2D<Iterator1, Iterator2> >
 {
-    typedef detail::CompositeIteratorBase< Iterator1,
-                                           Iterator2,
+    typedef detail::CompositeIteratorBase< Iterator1, 
+                                           Iterator2, 
                                            std::pair<
-                                                typename vigra::IteratorTraits<Iterator1>::value_type,
+                                                typename vigra::IteratorTraits<Iterator1>::value_type, 
                                                 typename vigra::IteratorTraits<Iterator2>::value_type >,
-                                           typename vigra::IteratorTraits<Iterator1>::difference_type,
-                                           typename vigra::IteratorTraits<Iterator1>::iterator_category,
+                                           typename vigra::IteratorTraits<Iterator1>::difference_type, 
+                                           typename vigra::IteratorTraits<Iterator1>::iterator_category, 
                                            CompositeIterator2D<Iterator1, Iterator2> > base_type;
 public:
     typedef CompositeIterator1D< typename Iterator1::row_iterator,
@@ -361,7 +361,7 @@ public:
                                this->maIter2.columnIterator());
     }
 };
-
+   
 } // namespace basebmp
 
 #endif /* INCLUDED_BASEBMP_COMPOSITEITERATOR_HXX */
diff --git a/basebmp/inc/basebmp/debug.hxx b/basebmp/inc/basebmp/debug.hxx
index a01d69326307..21fad45c6a6e 100644
--- a/basebmp/inc/basebmp/debug.hxx
+++ b/basebmp/inc/basebmp/debug.hxx
@@ -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
@@ -36,13 +36,13 @@ namespace basebmp
     class BitmapDevice;
 
     /** Dump content of BitmapDevice to given output stream.
-
-        @param rDevice
+        
+        @param rDevice   
         Device whose content should be dumped.
-
-        @param rOutputStream
-        Stream to write output to.
-    */
+    
+        @param rOutputStream    
+        Stream to write output to.  
+    */        
     void debugDump( const boost::shared_ptr< BitmapDevice >& rDevice,
                     ::std::ostream&                          rOutputStream );
 }
diff --git a/basebmp/inc/basebmp/drawmodes.hxx b/basebmp/inc/basebmp/drawmodes.hxx
index 6cdf34fd808a..aed821ce23cc 100644
--- a/basebmp/inc/basebmp/drawmodes.hxx
+++ b/basebmp/inc/basebmp/drawmodes.hxx
@@ -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
@@ -32,7 +32,7 @@
 
 namespace basebmp
 {
-    enum DrawMode
+    enum DrawMode 
     {
         /** Default draw mode, which simply renders pixel in the
             requested color
diff --git a/basebmp/inc/basebmp/endian.hxx b/basebmp/inc/basebmp/endian.hxx
index fb76ad1b306e..a11761857475 100644
--- a/basebmp/inc/basebmp/endian.hxx
+++ b/basebmp/inc/basebmp/endian.hxx
@@ -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
diff --git a/basebmp/inc/basebmp/fillimage.hxx b/basebmp/inc/basebmp/fillimage.hxx
index 344ee20e6ce5..a1e708fbb7e2 100644
--- a/basebmp/inc/basebmp/fillimage.hxx
+++ b/basebmp/inc/basebmp/fillimage.hxx
@@ -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
@@ -35,8 +35,8 @@ namespace basebmp
 {
 
 template< class DestIterator, class DestAccessor, typename T >
-void fillImage( DestIterator begin,
-                DestIterator end,
+void fillImage( DestIterator begin, 
+                DestIterator end, 
                 DestAccessor ad,
                 T            fillVal )
 {
@@ -49,9 +49,9 @@ void fillImage( DestIterator begin,
             rowIter( begin.rowIterator() );
         const typename vigra::IteratorTraits<DestIterator>::row_iterator
             rowEnd( rowIter + width );
-
-        // TODO(P2): Provide specialized span fill methods on the
-        // iterator/accessor
+        
+        // TODO(P2): Provide specialized span fill methods on the       
+        // iterator/accessor        
         while( rowIter != rowEnd )
             ad.set(fillVal, rowIter++);
     }
diff --git a/basebmp/inc/basebmp/genericcolorimageaccessor.hxx b/basebmp/inc/basebmp/genericcolorimageaccessor.hxx
index eaf8e2b34bfa..c6fb797d8815 100644
--- a/basebmp/inc/basebmp/genericcolorimageaccessor.hxx
+++ b/basebmp/inc/basebmp/genericcolorimageaccessor.hxx
@@ -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
@@ -51,17 +51,17 @@ namespace basebmp
             meDrawMode(DrawMode_PAINT)
         {}
 
-        GenericColorImageAccessor( BitmapDeviceSharedPtr const& rTarget,
+        GenericColorImageAccessor( BitmapDeviceSharedPtr const& rTarget, 
                                    DrawMode                     eDrawMode ) :
             mpDevice(rTarget),
             meDrawMode(eDrawMode)
         {}
 
-        template< typename Iterator >
+        template< typename Iterator > 
         Color operator()( Iterator const& i ) const
         { return mpDevice->getPixel( basegfx::B2IPoint( i->x,i->y ) ); }
 
-        template< typename Iterator, typename Difference >
+        template< typename Iterator, typename Difference > 
         Color operator()( Iterator const& i, Difference const& diff) const
         { return mpDevice->getPixel( basegfx::B2IPoint( i[diff]->x,
                                                         i[diff]->y ) ); }
diff --git a/basebmp/inc/basebmp/greylevelformats.hxx b/basebmp/inc/basebmp/greylevelformats.hxx
index 0adbcbb53c30..ba0c82bffc09 100644
--- a/basebmp/inc/basebmp/greylevelformats.hxx
+++ b/basebmp/inc/basebmp/greylevelformats.hxx
@@ -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
@@ -44,29 +44,29 @@
 namespace basebmp
 {
 
-template< typename PixelType,
+template< typename PixelType, 
           typename ColorType,
-          int      UsedRange > struct GreylevelGetter :
-        public std::unary_function<PixelType, ColorType>
+          int      UsedRange > struct GreylevelGetter : 
+        public std::unary_function<PixelType, ColorType> 
 {
     ColorType operator()( PixelType const& c ) const
-    {
+    { 
         return ColorTraits<ColorType>::fromGreyscale(
             vigra::NumericTraits<PixelType>::toPromote(c) *
             vigra::NumericTraits<PixelType>::maxConst / UsedRange );
     }
 };
 
-template< typename PixelType,
+template< typename PixelType, 
           typename ColorType,
-          int      UsedRange > struct GreylevelSetter :
-    public std::unary_function<ColorType, PixelType>
+          int      UsedRange > struct GreylevelSetter : 
+    public std::unary_function<ColorType, PixelType> 
 {
     PixelType operator()( ColorType const& c ) const
     {
         return vigra::NumericTraits<PixelType>::toPromote(
-            ColorTraits<ColorType>::toGreyscale(c)) *
-            UsedRange /
+            ColorTraits<ColorType>::toGreyscale(c)) *  
+            UsedRange / 
             vigra::NumericTraits<PixelType>::maxConst;
     }
 };
@@ -95,7 +95,7 @@ template< class Iterator,
 
 template< int BitsPerPixel,
           bool MsbFirst > struct PixelFormatTraitsTemplate_PackedGreylevel :
-    public PixelFormatTraitsTemplate_Greylevel<
+    public PixelFormatTraitsTemplate_Greylevel<    
                PackedPixelIterator< sal_uInt8,
                                     BitsPerPixel,
                                     true >,
@@ -123,7 +123,7 @@ BASEBMP_SPECIALIZE_ACCESSORTRAITS(PixelFormatTraits_GREY4_MSB::getter_type,
                                   PixelFormatTraits_GREY4_MSB::setter_type);
 
 // 8bpp
-typedef PixelFormatTraitsTemplate_Greylevel<
+typedef PixelFormatTraitsTemplate_Greylevel<    
     PixelIterator< sal_uInt8 >,
     StandardAccessor< sal_uInt8 >,
     255 >                                                   PixelFormatTraits_GREY8;
diff --git a/basebmp/inc/basebmp/iteratortraits.hxx b/basebmp/inc/basebmp/iteratortraits.hxx
index 716081f62c53..28dcacc1a470 100644
--- a/basebmp/inc/basebmp/iteratortraits.hxx
+++ b/basebmp/inc/basebmp/iteratortraits.hxx
@@ -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
@@ -37,17 +37,17 @@ namespace basebmp
 template< class Iterator > struct IteratorTraits
 {
     /// VigraTrueType, if iterator does not provide *operator()/operator[] methods
-    typedef typename vigra::IsDerivedFrom<Iterator,NonStandardIterator>::result
+    typedef typename vigra::IsDerivedFrom<Iterator,NonStandardIterator>::result 
             isNonStandardIterator;
 
     /// Retrieve default accessor for this iterator (and given value type)
     template< typename ValueType > struct defaultAccessor : public
-        // select according to non-standardness of iterator type
+        // select according to non-standardness of iterator type    
         vigra::If< isNonStandardIterator,
             NonStandardAccessor< ValueType >,
             StandardAccessor< ValueType > >
     {};
-
+    
 };
 
 } // namespace basebmp
diff --git a/basebmp/inc/basebmp/linerenderer.hxx b/basebmp/inc/basebmp/linerenderer.hxx
index 7c5f09dbb2d1..4eb36a023f3a 100644
--- a/basebmp/inc/basebmp/linerenderer.hxx
+++ b/basebmp/inc/basebmp/linerenderer.hxx
@@ -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
@@ -60,7 +60,7 @@ namespace basebmp
 
     @param end
     right-bottom image iterator
-
+    
     @param acc
     Image accessor
 
@@ -70,12 +70,12 @@ namespace basebmp
     pixel, the pixel closer to pt1 will be chosen. Giving true here
     makes renderClippedLine() choose pt2 in those cases.
  */
-template< class Iterator, class Accessor >
+template< class Iterator, class Accessor > 
 void renderLine( const basegfx::B2IPoint&      rPt1,
                  const basegfx::B2IPoint&      rPt2,
                  typename Accessor::value_type color,
-                 Iterator                      begin,
-                 Accessor                      acc,
+                 Iterator                      begin, 
+                 Accessor                      acc, 
                  bool                          bRoundTowardsPt2=false )
 {
     // code inspired by Paul Heckbert's Digital Line Drawing
@@ -114,7 +114,7 @@ void renderLine( const basegfx::B2IPoint&      rPt1,
         ady *= 2;
 
         Iterator currIter( begin + vigra::Diff2D(0,ys) );
-        typename vigra::IteratorTraits<Iterator>::row_iterator
+        typename vigra::IteratorTraits<Iterator>::row_iterator 
             rowIter( currIter.rowIterator() + xs );
         while(true)
         {
@@ -123,7 +123,7 @@ void renderLine( const basegfx::B2IPoint&      rPt1,
             if( xs == x2 )
                 return;
 
-            if( rem >= 0 )
+            if( rem >= 0 ) 
             {
                 ys += sy;
                 xs += sx;
@@ -148,7 +148,7 @@ void renderLine( const basegfx::B2IPoint&      rPt1,
         ady *= 2;
 
         Iterator currIter( begin + vigra::Diff2D(xs,0) );
-        typename vigra::IteratorTraits<Iterator>::column_iterator
+        typename vigra::IteratorTraits<Iterator>::column_iterator 
             colIter( currIter.columnIterator() + ys );
         while(true)
         {
@@ -156,8 +156,8 @@ void renderLine( const basegfx::B2IPoint&      rPt1,
 
             if( ys == y2 )
                 return;
-
-            if( rem >= 0 )
+            
+            if( rem >= 0 ) 
             {
                 xs += sx;
                 ys += sy;
diff --git a/basebmp/inc/basebmp/metafunctions.hxx b/basebmp/inc/basebmp/metafunctions.hxx
index 7eafac284f56..ae7a9c6ae850 100644
--- a/basebmp/inc/basebmp/metafunctions.hxx
+++ b/basebmp/inc/basebmp/metafunctions.hxx
@@ -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
@@ -35,12 +35,12 @@
 namespace basebmp
 {
 
-// TODO(Q3): move to generic place (o3tl?)
+// TODO(Q3): move to generic place (o3tl?)    
 
 /** template meta function: add const qualifier to 2nd type, if given
     1st type has it
 */
-template<typename A, typename B> struct clone_const
+template<typename A, typename B> struct clone_const 
 {
     typedef B type;
 };
@@ -52,7 +52,7 @@ template<typename A, typename B> struct clone_const<const A,B>
 /** template meta function: add const qualifier to plain type (if not
     already there)
  */
-template <typename T> struct add_const
+template <typename T> struct add_const 
 {
     typedef const T type;
 };
@@ -62,7 +62,7 @@ template <typename T> struct add_const<const T>
 };
 
 /// template meta function: remove const qualifier from plain type
-template <typename T> struct remove_const
+template <typename T> struct remove_const 
 {
     typedef T type;
 };
@@ -134,10 +134,10 @@ inline bool is_negative( int x )
 template< typename T, typename trueCase, typename falseCase >
 struct ifScalarIntegral
 {
-    typedef
-    typename vigra::If<
+    typedef  
+    typename vigra::If< 
         typename vigra::NumericTraits< T >::isIntegral,
-        typename vigra::If<
+        typename vigra::If< 
             typename vigra::NumericTraits< T >::isScalar,
             trueCase,
             falseCase >::type,
@@ -148,11 +148,11 @@ struct ifScalarIntegral
 template< typename T, typename trueCase, typename falseCase >
 struct ifScalarNonIntegral
 {
-    typedef
-    typename vigra::If<
+    typedef  
+    typename vigra::If< 
         typename vigra::NumericTraits< T >::isIntegral,
         falseCase,
-        typename vigra::If<
+        typename vigra::If< 
             typename vigra::NumericTraits< T >::isScalar,
             trueCase,
             falseCase >::type >::type type;
@@ -162,11 +162,11 @@ struct ifScalarNonIntegral
 template< typename T1, typename T2, typename trueCase, typename falseCase >
 struct ifBothScalarIntegral
 {
-    typedef
-    typename ifScalarIntegral<
-        T1,
-        typename ifScalarIntegral<
-            T2,
+    typedef  
+    typename ifScalarIntegral< 
+        T1, 
+        typename ifScalarIntegral< 
+            T2, 
             trueCase,
             falseCase >::type,
         falseCase >::type type;
@@ -190,7 +190,7 @@ template<> struct numberOfTrailingZeros<0>
 
 //--------------------------------------------------------------
 
-/// Count number of one bits
+/// Count number of one bits 
 template< unsigned int val > struct bitcount
 {
     enum { next = val >> 1 };
@@ -204,13 +204,13 @@ template<> struct bitcount<0>
 
 //--------------------------------------------------------------
 
-/// Shift left for positive shift value, and right otherwise
+/// Shift left for positive shift value, and right otherwise 
 template< typename T > inline T shiftLeft( T v, int shift )
 {
     return shift > 0 ? v << shift : v >> (-shift);
 }
 
-/// Shift right for positive shift value, and left otherwise
+/// Shift right for positive shift value, and left otherwise 
 template< typename T > inline T shiftRight( T v, int shift )
 {
     return shift > 0 ? v >> shift : v << (-shift);
diff --git a/basebmp/inc/basebmp/nonstandarditerator.hxx b/basebmp/inc/basebmp/nonstandarditerator.hxx
index c9069da18826..b5b2dfebda7f 100644
--- a/basebmp/inc/basebmp/nonstandarditerator.hxx
+++ b/basebmp/inc/basebmp/nonstandarditerator.hxx
@@ -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
diff --git a/basebmp/inc/basebmp/packedpixeliterator.hxx b/basebmp/inc/basebmp/packedpixeliterator.hxx
index 0a48ce2024ff..24d5ec9bf025 100644
--- a/basebmp/inc/basebmp/packedpixeliterator.hxx
+++ b/basebmp/inc/basebmp/packedpixeliterator.hxx
@@ -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
@@ -41,10 +41,10 @@ namespace basebmp
 {
 
 /// Get bitmask for data at given intra-word position, for given bit depth
-template< typename value_type,
-          int      bits_per_pixel,
-          bool     MsbFirst,
-          typename difference_type >
+template< typename value_type, 
+          int      bits_per_pixel, 
+          bool     MsbFirst, 
+          typename difference_type > 
 inline value_type get_mask( difference_type d )
 {
     BOOST_STATIC_ASSERT(bits_per_pixel > 0);
@@ -55,20 +55,20 @@ inline value_type get_mask( difference_type d )
     const unsigned int nIntraWordPositions( sizeof(value_type)*8 / bits_per_pixel );
 
     //      create bits_per_pixel 1s      shift to intra-word position
-    return ((~(~0 << bits_per_pixel)) << bits_per_pixel*(MsbFirst ?
-                                                         (nIntraWordPositions-1 - (d % nIntraWordPositions)) :
+    return ((~(~0 << bits_per_pixel)) << bits_per_pixel*(MsbFirst ? 
+                                                         (nIntraWordPositions-1 - (d % nIntraWordPositions)) : 
                                                          (d % nIntraWordPositions)));
 }
 
 template< int num_intraword_positions, int bits_per_pixel, bool MsbFirst, typename difference_type > inline difference_type get_shift( difference_type remainder )
 {
-    return bits_per_pixel*(MsbFirst ?
+    return bits_per_pixel*(MsbFirst ? 
                            (num_intraword_positions - 1 - remainder) :
                            remainder);
 }
 
-template< typename Valuetype,
-          int      bits_per_pixel,
+template< typename Valuetype, 
+          int      bits_per_pixel, 
           bool     MsbFirst > class PackedPixelColumnIterator : public NonStandardIterator
 {
 public:
@@ -238,8 +238,8 @@ public:
     }
 };
 
-template< typename Valuetype,
-          int      bits_per_pixel,
+template< typename Valuetype,           
+          int      bits_per_pixel, 
           bool     MsbFirst > class PackedPixelRowIterator : public NonStandardIterator
 {
 public:
@@ -279,12 +279,12 @@ private:
         remainder_ = newValue % num_intraword_positions;
 
         const mask_type shifted_mask(
-            MsbFirst ?
-            unsigned_cast<mask_type>(mask_) >> bits_per_pixel :
+            MsbFirst ? 
+            unsigned_cast<mask_type>(mask_) >> bits_per_pixel : 
             mask_ << bits_per_pixel );
 
         // data_offset is 0 for shifted mask, and 1 for wrapped-around mask
-        mask_ = (1-data_offset)*shifted_mask + data_offset*(MsbFirst ?
+        mask_ = (1-data_offset)*shifted_mask + data_offset*(MsbFirst ? 
                                                             bit_mask << bits_per_pixel*(num_intraword_positions-1) :
                                                             bit_mask);
     }
@@ -307,12 +307,12 @@ private:
         remainder_ = newRemainder + isNegative*num_intraword_positions;
 
         const mask_type shifted_mask(
-            MsbFirst ?
+            MsbFirst ? 
             mask_ << bits_per_pixel :
             unsigned_cast<mask_type>(mask_) >> bits_per_pixel );
 
         // data_offset is 0 for shifted mask, and 1 for wrapped-around mask
-        mask_ = (1-data_offset)*shifted_mask + data_offset*(MsbFirst ?
+        mask_ = (1-data_offset)*shifted_mask + data_offset*(MsbFirst ? 
                                                             bit_mask :
                                                             bit_mask << bits_per_pixel*(num_intraword_positions-1));
     }
@@ -324,8 +324,8 @@ private:
 
     bool less( PackedPixelRowIterator const & rhs ) const
     {
-        return data_ == rhs.data_ ?
-            (remainder_ < rhs.remainder_) :
+        return data_ == rhs.data_ ? 
+            (remainder_ < rhs.remainder_) : 
             (data_ < rhs.data_);
     }
 
@@ -448,9 +448,9 @@ public:
 
     value_type get() const
     {
-        return unsigned_cast<value_type>(*data_ & mask_) >>
-            get_shift<num_intraword_positions,
-                      bits_per_pixel,
+        return unsigned_cast<value_type>(*data_ & mask_) >> 
+            get_shift<num_intraword_positions, 
+                      bits_per_pixel, 
                       MsbFirst>(remainder_);
     }
 
@@ -463,9 +463,9 @@ public:
 
     void set( value_type v ) const
     {
-        const value_type pixel_value(
-            (v <<
-             get_shift<num_intraword_positions, bits_per_pixel, MsbFirst>(remainder_))
+        const value_type pixel_value( 
+            (v << 
+             get_shift<num_intraword_positions, bits_per_pixel, MsbFirst>(remainder_)) 
             & mask_ );
         *data_ = (*data_ & ~mask_) | pixel_value;
     }
@@ -484,8 +484,8 @@ public:
     one pixel into an machine data type (like one bit per pixel, eight
     of which packed into one char)
  */
-template< typename Valuetype,
-          int      bits_per_pixel,
+template< typename Valuetype,           
+          int      bits_per_pixel, 
           bool     MsbFirst > class PackedPixelIterator : public NonStandardIterator
 {
 public:
@@ -494,10 +494,10 @@ public:
     typedef vigra::Diff2D                               difference_type;
     typedef image_traverser_tag                         iterator_category;
     typedef PackedPixelRowIterator<value_type,
-                                   bits_per_pixel,
+                                   bits_per_pixel, 
                                    MsbFirst>            row_iterator;
     typedef PackedPixelColumnIterator<value_type,
-                                      bits_per_pixel,
+                                      bits_per_pixel, 
                                       MsbFirst>         column_iterator;
 
     typedef value_type*                                 pointer;
@@ -518,12 +518,12 @@ public:
 
 private:
     pointer current() const
-    {
+    { 
         return y() + (x / num_intraword_positions);
     }
 
     pointer current(int dx, int dy) const
-    {
+    { 
         return y(dy) + ((x+dx)/num_intraword_positions);
     }
 
@@ -605,27 +605,27 @@ public:
     {
         const int remainder( x % num_intraword_positions );
 
-        return (unsigned_cast<value_type>(*current() &
+        return (unsigned_cast<value_type>(*current() & 
                                           get_mask<value_type, bits_per_pixel, MsbFirst>(remainder))
-                >> get_shift<num_intraword_positions, bits_per_pixel, MsbFirst>(remainder));
+                >> get_shift<num_intraword_positions, bits_per_pixel, MsbFirst>(remainder)); 
     }
 
     value_type get(difference_type const & d) const
     {
         const int remainder( x(d.x) % num_intraword_positions );
 
-        return (unsigned_cast<value_type>(*current(d.x,d.y) &
+        return (unsigned_cast<value_type>(*current(d.x,d.y) & 
                                           get_mask<value_type, bits_per_pixel, MsbFirst>(remainder))
-                >> get_shift<num_intraword_positions, bits_per_pixel, MsbFirst>(remainder));
+                >> get_shift<num_intraword_positions, bits_per_pixel, MsbFirst>(remainder)); 
     }
 
     void set( value_type v ) const
     {
         const int remainder( x % num_intraword_positions );
         const int mask( get_mask<value_type, bits_per_pixel, MsbFirst>(remainder) );
-        const value_type pixel_value(
-            (v <<
-             get_shift<num_intraword_positions, bits_per_pixel, MsbFirst>(remainder))
+        const value_type pixel_value( 
+            (v << 
+             get_shift<num_intraword_positions, bits_per_pixel, MsbFirst>(remainder)) 
             & mask );
         pointer p = current();
         *p = (*p & ~mask) | pixel_value;
@@ -635,9 +635,9 @@ public:
     {
         const int remainder( (x + d.x) % num_intraword_positions );
         const int mask( get_mask<value_type, bits_per_pixel, MsbFirst>(remainder) );
-        const value_type pixel_value(
+        const value_type pixel_value( 
             (v <<
-             get_shift<num_intraword_positions, bits_per_pixel, MsbFirst>(remainder))
+             get_shift<num_intraword_positions, bits_per_pixel, MsbFirst>(remainder)) 
              & mask );
         pointer p = current(d.x,d.y);
         *p = (*p & ~mask) | pixel_value;
@@ -649,11 +649,11 @@ public:
 // partial specialization for the accessor traits masked_accessor
 // selector metafunction - can employ fast mask functor for the 1bpp
 // case.
-template< class Accessor,
-          class MaskAccessor,
+template< class Accessor, 
+          class MaskAccessor, 
           class Iterator,
           bool  polarity,
-          bool  MsbFirst > struct maskedAccessorSelector< Accessor,
+          bool  MsbFirst > struct maskedAccessorSelector< Accessor, 
                                                           MaskAccessor,
                                                           Iterator,
                                                           PackedPixelIterator< typename MaskAccessor::value_type,
@@ -661,7 +661,7 @@ template< class Accessor,
                                                                                MsbFirst >,
                                                           polarity >
 {
-    typedef TernarySetterFunctionAccessorAdapter<
+    typedef TernarySetterFunctionAccessorAdapter< 
         Accessor,
         MaskAccessor,
         typename outputMaskFunctorSelector<
diff --git a/basebmp/inc/basebmp/paletteformats.hxx b/basebmp/inc/basebmp/paletteformats.hxx
index d3de0ea18dd7..29129ba45ee3 100644
--- a/basebmp/inc/basebmp/paletteformats.hxx
+++ b/basebmp/inc/basebmp/paletteformats.hxx
@@ -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
@@ -48,7 +48,7 @@ namespace basebmp
 //-----------------------------------------------------------------------------
 
 /** Lookup index value for given color value in a PaletteImageAccessor
- */
+ */    
 template< class Accessor > struct ColorLookup
 {
     typename Accessor::data_type operator()( const Accessor&               acc,
@@ -61,7 +61,7 @@ template< class Accessor > struct ColorLookup
 //-----------------------------------------------------------------------------
 
 // partial specialization of AccessorTraits for PaletteAccessor
-template< class Accessor, typename ColorType > struct AccessorTraits<
+template< class Accessor, typename ColorType > struct AccessorTraits< 
     PaletteImageAccessor< Accessor, ColorType > >
 {
     /// value type of described accessor
@@ -85,7 +85,7 @@ template< class Accessor, typename ColorType > struct AccessorTraits<
      *  want to wrap a masked_accessor with a PaletteAccessor, not the
      *  other way around.
      */
-    template< class MaskAccessor,
+    template< class MaskAccessor, 
               class Iterator,
               class MaskIterator > struct                                     masked_accessor
     {
@@ -116,7 +116,7 @@ template< class Iterator,
 
 template< int BitsPerPixel,
           bool MsbFirst > struct PixelFormatTraitsTemplate_PackedPalette :
-    public PixelFormatTraitsTemplate_Palette<
+    public PixelFormatTraitsTemplate_Palette<    
                PackedPixelIterator< sal_uInt8,
                                     BitsPerPixel,
                                     MsbFirst >,
@@ -138,7 +138,7 @@ typedef PixelFormatTraitsTemplate_PackedPalette<4, true>  PixelFormatTraits_PAL4
 typedef PixelFormatTraitsTemplate_PackedPalette<4, false> PixelFormatTraits_PAL4_LSB;
 
 // 8bpp
-typedef PixelFormatTraitsTemplate_Palette<
+typedef PixelFormatTraitsTemplate_Palette<    
     PixelIterator< sal_uInt8 >,
     StandardAccessor< sal_uInt8 > >                       PixelFormatTraits_PAL8;
 
diff --git a/basebmp/inc/basebmp/paletteimageaccessor.hxx b/basebmp/inc/basebmp/paletteimageaccessor.hxx
index 79bbb9aae9b7..9e7033c5f086 100644
--- a/basebmp/inc/basebmp/paletteimageaccessor.hxx
+++ b/basebmp/inc/basebmp/paletteimageaccessor.hxx
@@ -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
@@ -61,26 +61,26 @@ private:
     template<class A, typename C> friend class PaletteImageAccessor;
 #endif
 
-    Accessor          maAccessor;
+    Accessor          maAccessor;  
     const value_type* mpPalette;
     std::size_t       mnNumEntries;
 
 public:
-    PaletteImageAccessor() :
+    PaletteImageAccessor() : 
         maAccessor(),
         mpPalette(0),
         mnNumEntries(0)
     {}
 
-    template< class A > explicit
-    PaletteImageAccessor( PaletteImageAccessor<A,ColorType> const& rSrc ) :
+    template< class A > explicit 
+    PaletteImageAccessor( PaletteImageAccessor<A,ColorType> const& rSrc ) : 
         maAccessor( rSrc.maAccessor ),
         mpPalette( rSrc.mpPalette ),
         mnNumEntries( rSrc.mnNumEntries )
     {}
 
     PaletteImageAccessor( const value_type* pPalette,
-                          std::size_t       numEntries ) :
+                          std::size_t       numEntries ) : 
         maAccessor(),
         mpPalette(pPalette),
         mnNumEntries(numEntries)
@@ -88,7 +88,7 @@ public:
 
     template< class T > PaletteImageAccessor( T                 accessor,
                                               const value_type* pPalette,
-                                              std::size_t       numEntries ) :
+                                              std::size_t       numEntries ) : 
         maAccessor(accessor),
         mpPalette(pPalette),
         mnNumEntries(numEntries)
@@ -114,7 +114,7 @@ public:
         while( curr_entry != palette_end )
         {
             if( ColorTraits<value_type>::distance(*curr_entry,
-                                                  *best_entry)
+                                                  *best_entry) 
                 > ColorTraits<value_type>::distance(*curr_entry,
                                                     v) )
             {
@@ -130,22 +130,22 @@ public:
     // -------------------------------------------------------
 
     template< class Iterator >
-    value_type operator()(Iterator const& i) const
-    {
-        return mpPalette[ maAccessor(i) ];
+    value_type operator()(Iterator const& i) const 
+    { 
+        return mpPalette[ maAccessor(i) ]; 
     }
 
     template< class Iterator, class Difference >
     value_type operator()(Iterator const& i, Difference const& diff) const
     {
-        return mpPalette[ maAccessor(i,diff) ];
+        return mpPalette[ maAccessor(i,diff) ]; 
     }
 
     // -------------------------------------------------------
 
     template< typename V, class Iterator >
     void set(V const& value, Iterator const& i) const
-    {
+    { 
         maAccessor.set(
             lookup(
                 vigra::detail::RequiresExplicitCast<value_type>::cast(value) ),
diff --git a/basebmp/inc/basebmp/pixelformatadapters.hxx b/basebmp/inc/basebmp/pixelformatadapters.hxx
index 2acd90b5bea8..d765ed4b29d5 100644
--- a/basebmp/inc/basebmp/pixelformatadapters.hxx
+++ b/basebmp/inc/basebmp/pixelformatadapters.hxx
@@ -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
@@ -52,12 +52,12 @@ namespace basebmp
     to other templates, which in turn can invoke the nested meta
     function.
  */
-template< typename Getter,
+template< typename Getter, 
           typename Setter > struct AccessorSelector
 {
     template< typename Accessor > struct wrap_accessor
     {
-        typedef UnaryFunctionAccessorAdapter< Accessor,
+        typedef UnaryFunctionAccessorAdapter< Accessor, 
                                               Getter,
                                               Setter > type;
     };
@@ -66,7 +66,7 @@ template< typename Getter,
 //-----------------------------------------------------------------------------
 
 /** Convert color value to pixel data type
- */
+ */    
 template< class Accessor, typename DataType > struct ColorConvert
 {
     DataType operator()( const Accessor&               acc,
diff --git a/basebmp/inc/basebmp/pixeliterator.hxx b/basebmp/inc/basebmp/pixeliterator.hxx
index 84b99942927b..05ce99f51c42 100644
--- a/basebmp/inc/basebmp/pixeliterator.hxx
+++ b/basebmp/inc/basebmp/pixeliterator.hxx
@@ -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
@@ -228,13 +228,13 @@ private:
     }
 
     pointer current() const
-    {
-        return y() + x;
+    { 
+        return y() + x; 
     }
 
     pointer current(int dx, int dy) const
-    {
-        return y(dy) + x+dx;
+    { 
+        return y(dy) + x+dx; 
     }
 
 public:
diff --git a/basebmp/inc/basebmp/polypolygonrenderer.hxx b/basebmp/inc/basebmp/polypolygonrenderer.hxx
index 7cfacad510e5..7c81c167f47b 100644
--- a/basebmp/inc/basebmp/polypolygonrenderer.hxx
+++ b/basebmp/inc/basebmp/polypolygonrenderer.hxx
@@ -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
@@ -66,28 +66,28 @@ namespace basebmp
             sal_Int64 mnX;
             sal_Int64 mnXDelta;
 
-            bool      mbDownwards; // needed for nonzero winding rule
+            bool 	  mbDownwards; // needed for nonzero winding rule
                                    // fills
 
-            Vertex() :
-                mnYCounter(0),
+            Vertex() : 
+                mnYCounter(0), 
                 mnX(0),
                 mnXDelta(0),
                 mbDownwards(true)
             {}
-            Vertex( basegfx::B2DPoint const& rPt1,
-                    basegfx::B2DPoint const& rPt2,
-                    bool                     bDownwards ) :
-                mnYCounter( basegfx::fround(rPt2.getY()) -
-                            basegfx::fround(rPt1.getY()) ),
+            Vertex( basegfx::B2DPoint const& rPt1, 
+                    basegfx::B2DPoint const& rPt2, 
+                    bool                     bDownwards ) : 
+                mnYCounter( basegfx::fround(rPt2.getY()) - 
+                            basegfx::fround(rPt1.getY()) ), 
                 mnX( toFractional( basegfx::fround(rPt1.getX()) )),
                 mnXDelta( toFractional(
-                              ((rPt2.getX() - rPt1.getX()) /
+                              ((rPt2.getX() - rPt1.getX()) / 
                                (double)mnYCounter) )),
                 mbDownwards(bDownwards)
             {}
         };
-
+    
         typedef std::vector< std::vector<Vertex> > VectorOfVectorOfVertices;
         typedef std::vector< Vertex* >             VectorOfVertexPtr;
 
@@ -138,12 +138,12 @@ namespace basebmp
         @param rClipRect
         Clipping rectangle, relative to the begin iterator. No pixel outside
         this clip rect will be modified.
-
+        
         @param rPoly
         Polygon to fill
      */
     template< class DestIterator, class DestAccessor, typename T >
-    void renderClippedPolyPolygon( DestIterator                   begin,
+    void renderClippedPolyPolygon( DestIterator                   begin, 
                                    DestAccessor                   ad,
                                    T                              fillColor,
                                    const basegfx::B2IRange&       rClipRect,
@@ -159,8 +159,8 @@ namespace basebmp
 
         basegfx::B2DRange const aPolyBounds( basegfx::tools::getRange(rPoly) );
 
-        const sal_Int32 nMinY( basegfx::fround(aPolyBounds.getMinY()) );
-        const sal_Int32 nMaxY(
+        const sal_Int32	nMinY( basegfx::fround(aPolyBounds.getMinY()) );
+        const sal_Int32	nMaxY( 
             std::min(
                 nClipY2-1,
                 basegfx::fround(aPolyBounds.getMaxY())));
@@ -191,7 +191,7 @@ namespace basebmp
         // current scanline - initially, points to first scanline
         // within the clip rect, or to the polygon's first scanline
         // (whichever is greater)
-        DestIterator aScanline( begin +
+        DestIterator aScanline( begin + 
                                 vigra::Diff2D(
                                     0,
                                     std::max(nMinY,
@@ -212,14 +212,14 @@ namespace basebmp
                 detail::VectorOfVectorOfVertices::value_type::iterator const end=aGET[y-nMinY].end();
                 while( vertex != end )
                 {
-                    // find insertion pos by binary search, and put ptr
-                    // into active edge vector
+                    // find insertion pos by binary search, and put ptr 
+                    // into active edge vector  
                     pAET->insert( std::lower_bound( pAET->begin(),
                                                     pAET->end(),
                                                     &(*vertex),
                                                     aComp ),
                                   &(*vertex) );
-
+                    
                     ++vertex;
                 }
             }
@@ -227,7 +227,7 @@ namespace basebmp
             // with less than two active edges, no fill visible
             if( pAET->size() >= 2 )
             {
-                typename vigra::IteratorTraits<DestIterator>::row_iterator
+                typename vigra::IteratorTraits<DestIterator>::row_iterator 
                     rowIter( aScanline.rowIterator() );
 
                 // process each span in current scanline, with
@@ -248,9 +248,9 @@ namespace basebmp
 
                     // calc fill status for both rules. might save a
                     // few percent runtime to specialize here...
-                    const bool bEvenOddFill(
+                    const bool bEvenOddFill( 
                         eFillRule == basegfx::FillRule_EVEN_ODD && !(nCrossedEdges & 0x01) );
-                    const bool bNonZeroWindingFill(
+                    const bool bNonZeroWindingFill( 
                         eFillRule == basegfx::FillRule_NONZERO_WINDING_NUMBER && nWindingNumber != 0 );
 
                     // is span visible?
@@ -260,18 +260,18 @@ namespace basebmp
                         rV2.mnX > nClipX1_frac )
                     {
                         // clip span to horizontal bounds
-                        sal_Int32 const nStartX(
+                        sal_Int32 const nStartX( 
                             std::max( nClipX1,
                                       std::min( nClipX2-1,
                                                 detail::toRoundedInteger(rV1.mnX) )));
-                        sal_Int32 const nEndX(
+                        sal_Int32 const nEndX( 
                             std::max( nClipX1,
                                       std::min( nClipX2,
                                                 detail::toRoundedInteger(rV2.mnX) )));
 
-                        typename vigra::IteratorTraits<DestIterator>::row_iterator
+                        typename vigra::IteratorTraits<DestIterator>::row_iterator 
                             currPix( rowIter + nStartX);
-                        typename vigra::IteratorTraits<DestIterator>::row_iterator
+                        typename vigra::IteratorTraits<DestIterator>::row_iterator 
                             rowEnd( rowIter + nEndX );
 
                         // TODO(P2): Provide specialized span fill methods on the
@@ -283,7 +283,7 @@ namespace basebmp
                     // step vertices
                     rV1.mnX += rV1.mnXDelta;
                     --rV1.mnYCounter;
-
+                    
                     ++nCrossedEdges;
                 }
 
@@ -352,7 +352,7 @@ namespace basebmp
                     if( !bFallbackTaken && (*currVertex)->mnYCounter > 0 )
                         pAETOther->push_back( *currVertex );
                 }
-
+                
                 std::swap( pAET, pAETOther );
             }
 
diff --git a/basebmp/inc/basebmp/rgb24pixelformats.hxx b/basebmp/inc/basebmp/rgb24pixelformats.hxx
index 788144a50b8d..17a0b5f641b3 100644
--- a/basebmp/inc/basebmp/rgb24pixelformats.hxx
+++ b/basebmp/inc/basebmp/rgb24pixelformats.hxx
@@ -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
@@ -40,17 +40,17 @@
 namespace basebmp
 {
 
-template< typename PixelType, typename ColorType > struct RGBValueGetter :
-        public std::unary_function<PixelType, ColorType>
+template< typename PixelType, typename ColorType > struct RGBValueGetter : 
+        public std::unary_function<PixelType, ColorType> 
 {
     ColorType operator()( PixelType const& c ) const
-    {
-        return ColorType(c.red(),c.green(),c.blue());
+    { 
+        return ColorType(c.red(),c.green(),c.blue()); 
     }
 };
 
-template< typename PixelType, typename ColorType > struct RGBValueSetter :
-    public std::unary_function<ColorType, PixelType>
+template< typename PixelType, typename ColorType > struct RGBValueSetter : 
+    public std::unary_function<ColorType, PixelType> 
 {
     PixelType operator()( ColorType const& c ) const
     {
diff --git a/basebmp/inc/basebmp/rgbmaskpixelformats.hxx b/basebmp/inc/basebmp/rgbmaskpixelformats.hxx
index d42125239529..b68630ee9600 100644
--- a/basebmp/inc/basebmp/rgbmaskpixelformats.hxx
+++ b/basebmp/inc/basebmp/rgbmaskpixelformats.hxx
@@ -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
@@ -67,8 +67,8 @@ namespace basebmp
     @tpl SwapBytes
     When true, the final pixel values will be byte-swapped before
     passed on.
- */
-template< typename     PixelType,
+ */ 
+template< typename     PixelType, 
           typename     ColorType,
           unsigned int RedMask,
           unsigned int GreenMask,
@@ -81,7 +81,7 @@ template< typename     PixelType,
     typedef typename ColorTraits<ColorType>::component_type component_type;
 
     // calc corrective shifts for all three channels in advance
-    enum {
+    enum { 
         red_shift   = numberOfTrailingZeros<RedMask>::value,
         green_shift = numberOfTrailingZeros<GreenMask>::value,
         blue_shift  = numberOfTrailingZeros<BlueMask>::value,
@@ -92,19 +92,19 @@ template< typename     PixelType,
     };
 };
 
-template< typename     PixelType,
+template< typename     PixelType, 
           typename     ColorType,
           unsigned int RedMask,
           unsigned int GreenMask,
           unsigned int BlueMask,
-          bool         SwapBytes > struct RGBMaskGetter :
+          bool         SwapBytes > struct RGBMaskGetter : 
         public RGBMaskFunctorBase<PixelType,
                                   ColorType,
                                   RedMask,
                                   GreenMask,
                                   BlueMask,
                                   SwapBytes>,
-        public std::unary_function<PixelType, ColorType>
+        public std::unary_function<PixelType, ColorType> 
 {
     typedef RGBMaskFunctorBase<PixelType,
                                ColorType,
@@ -114,7 +114,7 @@ template< typename     PixelType,
                                SwapBytes> base_type;
 
     ColorType operator()( PixelType v ) const
-    {
+    { 
         v = SwapBytes ? byteSwap(v) : v;
 
         const typename base_type::unsigned_pixel_type red  (v & RedMask);
@@ -124,7 +124,7 @@ template< typename     PixelType,
         // shift color nibbles to right-aligend position. ORing it
         // channel value shifted twice the number of channel bits, to
         // spread the value into the component_type range
-        ColorType res( (shiftRight(red,
+        ColorType res( (shiftRight(red, 
                                    base_type::red_shift-8*
                                    (signed)sizeof(typename base_type::component_type)+
                                    base_type::red_bits)) |
@@ -132,7 +132,7 @@ template< typename     PixelType,
                                    base_type::red_shift-8*
                                    (signed)sizeof(typename base_type::component_type)+
                                    2*base_type::red_bits)),
-
+                       
                        (shiftRight(green,
                                    base_type::green_shift-8*
                                    (signed)sizeof(typename base_type::component_type)+
@@ -141,7 +141,7 @@ template< typename     PixelType,
                                    base_type::green_shift-8*
                                    (signed)sizeof(typename base_type::component_type)+
                                    2*base_type::green_bits)),
-
+                       
                        (shiftRight(blue,
                                    base_type::blue_shift-8*
                                    (signed)sizeof(typename base_type::component_type)+
@@ -154,19 +154,19 @@ template< typename     PixelType,
     }
 };
 
-template< typename     PixelType,
+template< typename     PixelType, 
           typename     ColorType,
           unsigned int RedMask,
           unsigned int GreenMask,
           unsigned int BlueMask,
-          bool         SwapBytes > struct RGBMaskSetter :
+          bool         SwapBytes > struct RGBMaskSetter : 
         public RGBMaskFunctorBase<PixelType,
                                   ColorType,
                                   RedMask,
                                   GreenMask,
                                   BlueMask,
                                   SwapBytes>,
-        public std::unary_function<ColorType, PixelType>
+        public std::unary_function<ColorType, PixelType> 
 {
     typedef RGBMaskFunctorBase<PixelType,
                                ColorType,
@@ -181,7 +181,7 @@ template< typename     PixelType,
         const typename base_type::unsigned_pixel_type green(c.getGreen());
         const typename base_type::unsigned_pixel_type blue (c.getBlue());
 
-        typename base_type::unsigned_pixel_type res(
+        typename base_type::unsigned_pixel_type res( 
             (shiftLeft(red,
                        base_type::red_shift-8*
                        (signed)sizeof(typename base_type::component_type)+
@@ -201,7 +201,7 @@ template< typename     PixelType,
 
 //-----------------------------------------------------------------------------
 
-template< typename     PixelType,
+template< typename     PixelType, 
           unsigned int RedMask,
           unsigned int GreenMask,
           unsigned int BlueMask,
diff --git a/basebmp/inc/basebmp/scaleimage.hxx b/basebmp/inc/basebmp/scaleimage.hxx
index cb83e1353d5c..4f4847c88908 100644
--- a/basebmp/inc/basebmp/scaleimage.hxx
+++ b/basebmp/inc/basebmp/scaleimage.hxx
@@ -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
@@ -43,8 +43,8 @@ template< class SourceIter, class SourceAcc,
 void scaleLine( SourceIter      s_begin,
                 SourceIter      s_end,
                 SourceAcc       s_acc,
-                DestIter        d_begin,
-                DestIter        d_end,
+                DestIter        d_begin, 
+                DestIter        d_end, 
                 DestAcc         d_acc )
 {
     const int src_width  = s_end - s_begin;
@@ -57,7 +57,7 @@ void scaleLine( SourceIter      s_begin,
         // shrink
         int rem = 0;
         while( s_begin != s_end )
-        {
+        {            
             if( rem >= 0 )
             {
                 d_acc.set( s_acc(s_begin), d_begin );
@@ -67,7 +67,7 @@ void scaleLine( SourceIter      s_begin,
             }
 
             rem += dest_width;
-            ++s_begin;
+            ++s_begin;            
         }
     }
     else
@@ -80,10 +80,10 @@ void scaleLine( SourceIter      s_begin,
             {
                 rem -= dest_width;
                 ++s_begin;
-            }
+            }            
 
             d_acc.set( s_acc(s_begin), d_begin );
-
+            
             rem += src_width;
             ++d_begin;
         }
@@ -122,8 +122,8 @@ template< class SourceIter, class SourceAcc,
 void scaleImage( SourceIter      s_begin,
                  SourceIter      s_end,
                  SourceAcc       s_acc,
-                 DestIter        d_begin,
-                 DestIter        d_end,
+                 DestIter        d_begin, 
+                 DestIter        d_end, 
                  DestAcc         d_acc,
                  bool            bMustCopy=false )
 {
@@ -133,8 +133,8 @@ void scaleImage( SourceIter      s_begin,
     const int dest_width ( d_end.x - d_begin.x );
     const int dest_height( d_end.y - d_begin.y );
 
-    if( !bMustCopy &&
-        src_width == dest_width &&
+    if( !bMustCopy && 
+        src_width == dest_width && 
         src_height == dest_height )
     {
         // no scaling involved, can simply copy
@@ -146,7 +146,7 @@ void scaleImage( SourceIter      s_begin,
     typedef vigra::BasicImage<typename SourceAcc::value_type> TmpImage;
     typedef typename TmpImage::traverser TmpImageIter;
 
-    TmpImage     tmp_image(src_width,
+    TmpImage     tmp_image(src_width, 
                            dest_height);
     TmpImageIter t_begin = tmp_image.upperLeft();
 
@@ -156,7 +156,7 @@ void scaleImage( SourceIter      s_begin,
         typename SourceIter::column_iterator   s_cbegin = s_begin.columnIterator();
         typename TmpImageIter::column_iterator t_cbegin = t_begin.columnIterator();
 
-        scaleLine(s_cbegin, s_cbegin+src_height, s_acc,
+        scaleLine(s_cbegin, s_cbegin+src_height, s_acc, 
                   t_cbegin, t_cbegin+dest_height, tmp_image.accessor());
     }
 
@@ -168,7 +168,7 @@ void scaleImage( SourceIter      s_begin,
         typename DestIter::row_iterator     d_rbegin = d_begin.rowIterator();
         typename TmpImageIter::row_iterator t_rbegin = t_begin.rowIterator();
 
-        scaleLine(t_rbegin, t_rbegin+src_width, tmp_image.accessor(),
+        scaleLine(t_rbegin, t_rbegin+src_width, tmp_image.accessor(), 
                   d_rbegin, d_rbegin+dest_width, d_acc);
     }
 }
diff --git a/basebmp/inc/basebmp/scanlineformats.hxx b/basebmp/inc/basebmp/scanlineformats.hxx
index d83aea688a37..8d7cafb962cb 100644
--- a/basebmp/inc/basebmp/scanlineformats.hxx
+++ b/basebmp/inc/basebmp/scanlineformats.hxx
@@ -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
diff --git a/basebmp/inc/basebmp/stridedarrayiterator.hxx b/basebmp/inc/basebmp/stridedarrayiterator.hxx
index 8139cc8a8bc9..6b6157c9b681 100644
--- a/basebmp/inc/basebmp/stridedarrayiterator.hxx
+++ b/basebmp/inc/basebmp/stridedarrayiterator.hxx
@@ -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
diff --git a/basebmp/inc/basebmp/tools.hxx b/basebmp/inc/basebmp/tools.hxx
index d7ca0423ac1f..78ab3dfab023 100644
--- a/basebmp/inc/basebmp/tools.hxx
+++ b/basebmp/inc/basebmp/tools.hxx
@@ -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
@@ -43,7 +43,7 @@ namespace basebmp
 
     template< class Iterator, class Accessor >
     inline vigra::triple<Iterator,Iterator,Accessor>
-    destIterRange(Iterator const&          begin,
+    destIterRange(Iterator const&          begin, 
                   Accessor const&          accessor,
                   const basegfx::B2IRange& rRange)
     {
@@ -55,7 +55,7 @@ namespace basebmp
 
     template< class Iterator, class Accessor >
     inline vigra::triple<Iterator,Iterator,Accessor>
-    srcIterRange(Iterator const&          begin,
+    srcIterRange(Iterator const&          begin, 
                  Accessor const&          accessor,
                  const basegfx::B2IRange& rRange)
     {
@@ -67,7 +67,7 @@ namespace basebmp
 
     template< class Iterator, class Accessor >
     inline vigra::pair<Iterator,Accessor>
-    srcIter(Iterator const&          begin,
+    srcIter(Iterator const&          begin, 
             Accessor const&          accessor,
             const basegfx::B2IPoint& rPt)
     {
@@ -78,7 +78,7 @@ namespace basebmp
 
     template< class Iterator, class Accessor >
     inline vigra::pair<Iterator,Accessor>
-    destIter(Iterator const&          begin,
+    destIter(Iterator const&          begin, 
              Accessor const&          accessor,
              const basegfx::B2IPoint& rPt)
     {
diff --git a/basebmp/inc/basebmp/truecolormaskaccessor.hxx b/basebmp/inc/basebmp/truecolormaskaccessor.hxx
index d4e3ff33f30e..4f7b59a6b05b 100644
--- a/basebmp/inc/basebmp/truecolormaskaccessor.hxx
+++ b/basebmp/inc/basebmp/truecolormaskaccessor.hxx
@@ -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
@@ -39,15 +39,15 @@
 namespace basebmp
 {
 
-namespace
+namespace 
 {
-    /// Shift left for positive shift value, and right otherwise
+    /// Shift left for positive shift value, and right otherwise 
     template< typename T > inline T shiftLeft( T v, int shift )
     {
         return shift > 0 ? v << shift : v >> (-shift);
     }
 
-    /// Shift right for positive shift value, and left otherwise
+    /// Shift right for positive shift value, and left otherwise 
     template< typename T > inline T shiftRight( T v, int shift )
     {
         return shift > 0 ? v >> shift : v << (-shift);
@@ -75,7 +75,7 @@ namespace
     When true, the final pixel values will be byte-swapped before
     passed to/from the iterator.
  */
-template< class    Accessor,
+template< class    Accessor, 
           typename ColorType,
           int      RedMask,
           int      GreenMask,
@@ -94,11 +94,11 @@ private:
     template<class A, typename C, int R, int G, int B, bool S> friend class TrueColorMaskAccessor;
 #endif
 
-    Accessor     maAccessor;
+    Accessor     maAccessor;  
 
 public:
     // calc corrective shifts for all three channels in advance
-    enum {
+    enum { 
         red_shift   = numberOfTrailingZeros<RedMask>::value,
         green_shift = numberOfTrailingZeros<GreenMask>::value,
         blue_shift  = numberOfTrailingZeros<BlueMask>::value,
@@ -114,13 +114,13 @@ public:
         maAccessor()
     {}
 
-    template< class A > explicit
+    template< class A > explicit 
     TrueColorMaskAccessor( TrueColorMaskAccessor< A,
                                                   ColorType,
                                                   RedMask,
                                                   GreenMask,
                                                   BlueMask,
-                                                  SwapBytes > const& rSrc ) :
+                                                  SwapBytes > const& rSrc ) : 
         maAccessor( rSrc.maAccessor )
     {}
 
@@ -143,16 +143,16 @@ public:
         const unsigned_data_type green(v & GreenMask);
         const unsigned_data_type blue (v & BlueMask);
 
-        value_type res( (shiftRight(red,
+        value_type res( (shiftRight(red, 
                                     red_shift-8*sizeof(component_type)+red_bits)) |
                         (shiftRight(red,
                                     red_shift-8*sizeof(component_type)+2*red_bits)),
-
+                        
                         (shiftRight(green,
                                     green_shift-8*sizeof(component_type)+green_bits)) |
                         (shiftRight(green,
                                     green_shift-8*sizeof(component_type)+2*green_bits)),
-
+                        
                         (shiftRight(blue,
                                     blue_shift-8*sizeof(component_type)+blue_bits)) |
                         (shiftRight(blue,
@@ -166,7 +166,7 @@ public:
         const unsigned_data_type green(v.getGreen());
         const unsigned_data_type blue (v.getBlue());
 
-        unsigned_data_type res(
+        unsigned_data_type res( 
             (shiftLeft(red,
                        red_shift-8*sizeof(component_type)+red_bits) & RedMask) |
             (shiftLeft(green,
@@ -180,10 +180,10 @@ public:
     // -------------------------------------------------------
 
     template< class Iterator >
-    value_type operator()(Iterator const& i) const
-    {
-        return toValue(
-            unsigned_cast<data_type>( maAccessor(i)) );
+    value_type operator()(Iterator const& i) const 
+    { 
+        return toValue( 
+            unsigned_cast<data_type>( maAccessor(i)) ); 
     }
 
     template< class Iterator, class Difference >
@@ -197,7 +197,7 @@ public:
 
     template< typename V, class Iterator >
     void set(V const& value, Iterator const& i) const
-    {
+    { 
         maAccessor.set(
             toPacked(
                 vigra::detail::RequiresExplicitCast<value_type>::cast(
@@ -208,10 +208,10 @@ public:
     template< typename V, class Iterator, class Difference >
     void set(V const& value, Iterator const& i, Difference const& diff) const
     {
-        maAccessor.set(
+        maAccessor.set( 
             toPacked(
                 vigra::detail::RequiresExplicitCast<value_type>::cast(
-                    value)),
+                    value)), 
             i,
             diff );
     }
@@ -220,7 +220,7 @@ public:
 //-----------------------------------------------------------------------------
 
 /** Convert Color to packed true color value for TrueColorMaskAccessor
- */
+ */    
 template< class Accessor > struct ColorConvert
 {
     typename Accessor::data_type operator()( const Accessor&               acc,
@@ -233,13 +233,13 @@ template< class Accessor > struct ColorConvert
 //-----------------------------------------------------------------------------
 
 // partial specialization for TrueColorMaskAccessor
-template< class    Accessor,
+template< class    Accessor, 
           typename ColorType,
           int      RedMask,
           int      GreenMask,
           int      BlueMask,
-          bool     SwapBytes > struct AccessorTraits<
-    TrueColorMaskAccessor< Accessor,
+          bool     SwapBytes > struct AccessorTraits< 
+    TrueColorMaskAccessor< Accessor, 
                            ColorType,
                            RedMask,
                            GreenMask,
@@ -247,7 +247,7 @@ template< class    Accessor,
                            SwapBytes > >
 {
     /// value type of described accessor
-    typedef typename TrueColorMaskAccessor< Accessor,
+    typedef typename TrueColorMaskAccessor< Accessor, 
                                             ColorType,
                                             RedMask,
                                             GreenMask,
@@ -255,7 +255,7 @@ template< class    Accessor,
                                             SwapBytes >::value_type  value_type;
 
     /// Retrieve stand-alone color lookup function for given Accessor type
-    typedef ColorConvert< TrueColorMaskAccessor< Accessor,
+    typedef ColorConvert< TrueColorMaskAccessor< Accessor, 
                                                  ColorType,
                                                  RedMask,
                                                  GreenMask,
@@ -277,7 +277,7 @@ template< class    Accessor,
      *  want to wrap a masked_accessor with a TrueColorMaskAccessor,
      *  not the other way around.
      */
-    template< class MaskAccessor,
+    template< class MaskAccessor, 
               class Iterator,
               class MaskIterator > struct                            masked_accessor
     {
diff --git a/basebmp/source/bitmapdevice.cxx b/basebmp/source/bitmapdevice.cxx
index 4e179c3a0ce0..8e5d2b9081e6 100644
--- a/basebmp/source/bitmapdevice.cxx
+++ b/basebmp/source/bitmapdevice.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
@@ -119,10 +119,10 @@ namespace
               bool     polarity,
               typename MaskFunctorMode > struct masked_input_splitting_accessor
     {
-        typedef BinarySetterFunctionAccessorAdapter<
+        typedef BinarySetterFunctionAccessorAdapter< 
             DestAccessor,
-            BinaryFunctorSplittingWrapper<
-                typename outputMaskFunctorSelector<
+            BinaryFunctorSplittingWrapper< 
+                typename outputMaskFunctorSelector< 
                          typename JoinedAccessor::value_type::first_type,
                          typename JoinedAccessor::value_type::second_type,
                          polarity,
@@ -155,10 +155,10 @@ namespace
         alpha masks. With those mask formats, clipping and alpha
         blending is handled natively.
      */
-    template< class DestIterator,
-              class RawAccessor,
+    template< class DestIterator, 
+              class RawAccessor, 
               class AccessorSelector,
-              class Masks > class BitmapRenderer :
+              class Masks > class BitmapRenderer : 
                   public BitmapDevice
     {
     public:
@@ -174,13 +174,13 @@ namespace
         typedef typename Masks::alphamask_format_traits::raw_accessor_type alphamask_rawaccessor_type;
         typedef typename Masks::alphamask_format_traits::accessor_selector alphamask_accessorselector_type;
 
-        typedef typename AccessorSelector::template wrap_accessor<
+        typedef typename AccessorSelector::template wrap_accessor< 
             raw_accessor_type >::type                                      dest_accessor_type;
 
         typedef AccessorTraits< dest_accessor_type >                       accessor_traits;
-        typedef CompositeIterator2D< dest_iterator_type,
+        typedef CompositeIterator2D< dest_iterator_type, 
                                      mask_iterator_type >                  composite_iterator_type;
-        typedef CompositeIterator2D< vigra::Diff2D,
+        typedef CompositeIterator2D< vigra::Diff2D, 
                                      vigra::Diff2D >                       generic_composite_iterator_type;
 
         typedef BitmapRenderer<mask_iterator_type,
@@ -202,22 +202,22 @@ namespace
 
         typedef typename raw_accessor_traits::xor_accessor                 raw_xor_accessor_type;
         typedef AccessorTraits<raw_xor_accessor_type>                      raw_xor_accessor_traits;
-        typedef typename accessor_selector::template wrap_accessor<
+        typedef typename accessor_selector::template wrap_accessor< 
             raw_xor_accessor_type >::type                                  xor_accessor_type;
         typedef AccessorTraits<xor_accessor_type>                          xor_accessor_traits;
 
         // -------------------------------------------------------
 
-        typedef typename raw_accessor_traits::template masked_accessor<
+        typedef typename raw_accessor_traits::template masked_accessor< 
             mask_rawaccessor_type,
             dest_iterator_type,
             mask_iterator_type,
             Masks::clipmask_polarity>::type                                raw_maskedaccessor_type;
-        typedef typename accessor_selector::template wrap_accessor<
+        typedef typename accessor_selector::template wrap_accessor< 
             raw_maskedaccessor_type >::type                                masked_accessor_type;
         typedef typename AccessorTraits<
             raw_maskedaccessor_type>::xor_accessor                         raw_maskedxor_accessor_type;
-        typedef typename accessor_selector::template wrap_accessor<
+        typedef typename accessor_selector::template wrap_accessor< 
             raw_maskedxor_accessor_type >::type                            masked_xoraccessor_type;
 
         // -------------------------------------------------------
@@ -225,24 +225,24 @@ namespace
         // ((iter,mask),mask) special case (e.g. for clipped
         // drawMaskedColor())
         typedef AccessorTraits< raw_maskedaccessor_type >                  raw_maskedaccessor_traits;
-        typedef typename raw_maskedaccessor_traits::template masked_accessor<
+        typedef typename raw_maskedaccessor_traits::template masked_accessor< 
             mask_rawaccessor_type,
             composite_iterator_type,
             mask_iterator_type,
             Masks::clipmask_polarity>::type                                raw_maskedmask_accessor_type;
 
-        typedef CompositeIterator2D<
+        typedef CompositeIterator2D< 
             composite_iterator_type,
             mask_iterator_type>                                            composite_composite_mask_iterator_type;
-
+        
         // -------------------------------------------------------
 
-        typedef ConstantColorBlendSetterAccessorAdapter<
+        typedef ConstantColorBlendSetterAccessorAdapter< 
             dest_accessor_type,
             typename alphamask_rawaccessor_type::value_type,
             Masks::alphamask_polarity>                                     colorblend_accessor_type;
         typedef AccessorTraits<colorblend_accessor_type>                   colorblend_accessor_traits;
-        typedef typename colorblend_accessor_traits::template masked_accessor<
+        typedef typename colorblend_accessor_traits::template masked_accessor< 
             mask_rawaccessor_type,
             dest_iterator_type,
             mask_iterator_type,
@@ -250,12 +250,12 @@ namespace
 
         // -------------------------------------------------------
 
-        typedef ConstantColorBlendSetterAccessorAdapter<
+        typedef ConstantColorBlendSetterAccessorAdapter< 
             dest_accessor_type,
             Color,
             Masks::alphamask_polarity>                                     colorblend_generic_accessor_type;
         typedef AccessorTraits<colorblend_generic_accessor_type>           colorblend_generic_accessor_traits;
-        typedef typename colorblend_generic_accessor_traits::template masked_accessor<
+        typedef typename colorblend_generic_accessor_traits::template masked_accessor< 
             mask_rawaccessor_type,
             dest_iterator_type,
             mask_iterator_type,
@@ -272,7 +272,7 @@ namespace
 
         dest_iterator_type                      maBegin;
         typename accessor_traits::color_lookup  maColorLookup;
-        to_uint32_functor                       maToUInt32Converter;
+        to_uint32_functor                       maToUInt32Converter;    
         dest_accessor_type                      maAccessor;
         colorblend_accessor_type                maColorBlendAccessor;
         colorblend_generic_accessor_type        maGenericColorBlendAccessor;
@@ -293,12 +293,12 @@ namespace
                         sal_Int32                        nScanlineFormat,
                         sal_Int32                        nScanlineStride,
                         sal_uInt8*                       pFirstScanline,
-                        dest_iterator_type               begin,
+                        dest_iterator_type               begin, 
                         raw_accessor_type                rawAccessor,
                         dest_accessor_type               accessor,
                         const RawMemorySharedArray&      rMem,
                         const PaletteMemorySharedVector& rPalette ) :
-            BitmapDevice( rBounds, nScanlineFormat,
+            BitmapDevice( rBounds, nScanlineFormat, 
                           nScanlineStride, pFirstScanline, rMem, rPalette ),
             maBegin( begin ),
             maColorLookup(),
@@ -368,30 +368,30 @@ namespace
         {
             fillImage(destIterRange(maBegin,
                                     maRawAccessor,
-                                    rBounds),
-                      maColorLookup(
+                                    rBounds), 
+                      maColorLookup( 
                           maAccessor,
                           fillColor) );
         }
 
-        virtual void setPixel_i( const basegfx::B2IPoint& rPt,
-                                 Color                    pixelColor,
+        virtual void setPixel_i( const basegfx::B2IPoint& rPt, 
+                                 Color                    pixelColor, 
                                  DrawMode                 drawMode )
         {
-            const DestIterator pixel( maBegin +
+            const DestIterator pixel( maBegin + 
                                       vigra::Diff2D(rPt.getX(),
                                                     rPt.getY()) );
             if( drawMode == DrawMode_XOR )
-                maXorAccessor.set( pixelColor,
+                maXorAccessor.set( pixelColor, 
                                    pixel );
             else
-                maAccessor.set( pixelColor,
+                maAccessor.set( pixelColor, 
                                 pixel );
         }
 
-        virtual void setPixel_i( const basegfx::B2IPoint&     rPt,
-                                 Color                        pixelColor,
-                                 DrawMode                     drawMode,
+        virtual void setPixel_i( const basegfx::B2IPoint&     rPt, 
+                                 Color                        pixelColor, 
+                                 DrawMode                     drawMode, 
                                  const BitmapDeviceSharedPtr& rClip )
         {
             boost::shared_ptr<mask_bitmap_type> pMask( getCompatibleClipMask(rClip) );
@@ -400,7 +400,7 @@ namespace
             const vigra::Diff2D offset(rPt.getX(),
                                        rPt.getY());
 
-            const composite_iterator_type aIter(
+            const composite_iterator_type aIter( 
                 maBegin + offset,
                 pMask->maBegin + offset );
 
@@ -414,7 +414,7 @@ namespace
 
         virtual Color getPixel_i(const basegfx::B2IPoint& rPt )
         {
-            const DestIterator pixel( maBegin +
+            const DestIterator pixel( maBegin + 
                                       vigra::Diff2D(rPt.getX(),
                                                     rPt.getY()) );
             return maAccessor(pixel);
@@ -422,7 +422,7 @@ namespace
 
         virtual sal_uInt32 getPixelData_i( const basegfx::B2IPoint& rPt )
         {
-            const DestIterator pixel( maBegin +
+            const DestIterator pixel( maBegin + 
                                       vigra::Diff2D(rPt.getX(),
                                                     rPt.getY()) );
             return maToUInt32Converter(maRawAccessor(pixel));
@@ -436,7 +436,7 @@ namespace
                               const Iterator&          begin,
                               const RawAcc&            rawAcc )
         {
-            renderClippedLine( rPt1,
+            renderClippedLine( rPt1, 
                                rPt2,
                                rBounds,
                                col,
@@ -459,15 +459,15 @@ namespace
                              begin,
                              rawAcc );
         }
-
+    
         template< typename Iterator, typename RawAcc, typename XorAcc >
         void implDrawLine( const basegfx::B2IPoint& rPt1,
                            const basegfx::B2IPoint& rPt2,
                            const basegfx::B2IRange& rBounds,
                            Color                    col,
-                           const Iterator&          begin,
+                           const Iterator&          begin, 
                            const RawAcc&            rawAcc,
-                           const XorAcc&            xorAcc,
+                           const XorAcc&            xorAcc, 
                            DrawMode                 drawMode )
         {
             if( drawMode == DrawMode_XOR )
@@ -478,10 +478,10 @@ namespace
                                 begin, maAccessor, rawAcc );
         }
 
-        virtual void drawLine_i(const basegfx::B2IPoint& rPt1,
-                                const basegfx::B2IPoint& rPt2,
+        virtual void drawLine_i(const basegfx::B2IPoint& rPt1, 
+                                const basegfx::B2IPoint& rPt2, 
                                 const basegfx::B2IRange& rBounds,
-                                Color                    lineColor,
+                                Color                    lineColor, 
                                 DrawMode                 drawMode )
         {
             implDrawLine(rPt1,rPt2,rBounds,lineColor,
@@ -494,15 +494,15 @@ namespace
             boost::shared_ptr<mask_bitmap_type> pMask( getCompatibleClipMask(rClip) );
             OSL_ASSERT( pMask );
 
-            return composite_iterator_type( maBegin,
+            return composite_iterator_type( maBegin, 
                                             pMask->maBegin );
         }
 
-        virtual void drawLine_i(const basegfx::B2IPoint&     rPt1,
-                                const basegfx::B2IPoint&     rPt2,
+        virtual void drawLine_i(const basegfx::B2IPoint&     rPt1, 
+                                const basegfx::B2IPoint&     rPt2, 
                                 const basegfx::B2IRange&     rBounds,
-                                Color                        lineColor,
-                                DrawMode                     drawMode,
+                                Color                        lineColor, 
+                                DrawMode                     drawMode, 
                                 const BitmapDeviceSharedPtr& rClip )
         {
             implDrawLine(rPt1,rPt2,rBounds,lineColor,
@@ -512,72 +512,72 @@ namespace
         }
 
         template< typename Iterator, typename RawAcc >
-        void implDrawPolygon( const basegfx::B2DPolygon& rPoly,
+        void implDrawPolygon( const basegfx::B2DPolygon& rPoly, 
                               const basegfx::B2IRange&   rBounds,
                               Color                      col,
-                              const Iterator&            begin,
+                              const Iterator&            begin, 
                               const RawAcc&              acc )
         {
             basegfx::B2DPolygon aPoly( rPoly );
             if( rPoly.areControlPointsUsed() )
                 aPoly = basegfx::tools::adaptiveSubdivideByCount( rPoly );
 
-            const typename dest_iterator_type::value_type colorIndex( maColorLookup(
+            const typename dest_iterator_type::value_type colorIndex( maColorLookup( 
                                                                           maAccessor,
                                                                           col));
             const sal_uInt32                              nVertices( aPoly.count() );
             for( sal_uInt32 i=1; i<nVertices; ++i )
-                implRenderLine2( basegfx::fround(aPoly.getB2DPoint(i-1)),
-                                 basegfx::fround(aPoly.getB2DPoint(i)),
+                implRenderLine2( basegfx::fround(aPoly.getB2DPoint(i-1)), 
+                                 basegfx::fround(aPoly.getB2DPoint(i)), 
                                  rBounds,
                                  colorIndex,
                                  begin,
                                  acc );
 
             if( nVertices > 1 && aPoly.isClosed() )
-                implRenderLine2( basegfx::fround(aPoly.getB2DPoint(nVertices-1)),
-                                 basegfx::fround(aPoly.getB2DPoint(0)),
+                implRenderLine2( basegfx::fround(aPoly.getB2DPoint(nVertices-1)), 
+                                 basegfx::fround(aPoly.getB2DPoint(0)), 
                                  rBounds,
                                  colorIndex,
                                  begin,
                                  acc );
         }
 
-        virtual void drawPolygon_i(const basegfx::B2DPolygon& rPoly,
+        virtual void drawPolygon_i(const basegfx::B2DPolygon& rPoly, 
                                    const basegfx::B2IRange&   rBounds,
-                                   Color                      lineColor,
+                                   Color                      lineColor, 
                                    DrawMode                   drawMode )
         {
             if( drawMode == DrawMode_XOR )
-                implDrawPolygon( rPoly, rBounds, lineColor,
-                                 maBegin,
+                implDrawPolygon( rPoly, rBounds, lineColor, 
+                                 maBegin, 
                                  maRawXorAccessor );
             else
-                implDrawPolygon( rPoly, rBounds, lineColor,
-                                 maBegin,
+                implDrawPolygon( rPoly, rBounds, lineColor, 
+                                 maBegin, 
                                  maRawAccessor );
         }
 
-        virtual void drawPolygon_i(const basegfx::B2DPolygon&   rPoly,
+        virtual void drawPolygon_i(const basegfx::B2DPolygon&   rPoly, 
                                    const basegfx::B2IRange&     rBounds,
-                                   Color                        lineColor,
-                                   DrawMode                     drawMode,
+                                   Color                        lineColor, 
+                                   DrawMode                     drawMode, 
                                    const BitmapDeviceSharedPtr& rClip )
         {
             if( drawMode == DrawMode_XOR )
-                implDrawPolygon( rPoly, rBounds, lineColor,
+                implDrawPolygon( rPoly, rBounds, lineColor, 
                                  getMaskedIter(rClip),
                                  maRawMaskedXorAccessor );
             else
-                implDrawPolygon( rPoly, rBounds, lineColor,
+                implDrawPolygon( rPoly, rBounds, lineColor, 
                                  getMaskedIter(rClip),
                                  maRawMaskedAccessor );
         }
 
         template< typename Iterator, typename RawAcc >
-        void implFillPolyPolygon( const basegfx::B2DPolyPolygon& rPoly,
+        void implFillPolyPolygon( const basegfx::B2DPolyPolygon& rPoly, 
                                   Color                          col,
-                                  const Iterator&                begin,
+                                  const Iterator&                begin, 
                                   const RawAcc&                  acc,
                                   const basegfx::B2IRange&       rBounds )
         {
@@ -585,7 +585,7 @@ namespace
             if( rPoly.areControlPointsUsed() )
                 aPoly = basegfx::tools::adaptiveSubdivideByCount( rPoly );
 
-            renderClippedPolyPolygon( begin,
+            renderClippedPolyPolygon( begin, 
                                       acc,
                                       maColorLookup( maAccessor,
                                                      col),
@@ -594,36 +594,36 @@ namespace
                                       basegfx::FillRule_EVEN_ODD );
         }
 
-        virtual void fillPolyPolygon_i(const basegfx::B2DPolyPolygon& rPoly,
-                                       Color                          fillColor,
+        virtual void fillPolyPolygon_i(const basegfx::B2DPolyPolygon& rPoly, 
+                                       Color                          fillColor, 
                                        DrawMode                       drawMode,
                                        const basegfx::B2IRange&       rBounds )
         {
             if( drawMode == DrawMode_XOR )
-                implFillPolyPolygon( rPoly, fillColor,
+                implFillPolyPolygon( rPoly, fillColor, 
                                      maBegin,
                                      maRawXorAccessor,
                                      rBounds );
             else
-                implFillPolyPolygon( rPoly, fillColor,
+                implFillPolyPolygon( rPoly, fillColor, 
                                      maBegin,
                                      maRawAccessor,
                                      rBounds );
         }
 
-        virtual void fillPolyPolygon_i(const basegfx::B2DPolyPolygon& rPoly,
-                                       Color                          fillColor,
+        virtual void fillPolyPolygon_i(const basegfx::B2DPolyPolygon& rPoly, 
+                                       Color                          fillColor, 
                                        DrawMode                       drawMode,
-                                       const basegfx::B2IRange&       rBounds,
+                                       const basegfx::B2IRange&       rBounds, 
                                        const BitmapDeviceSharedPtr&   rClip )
         {
             if( drawMode == DrawMode_XOR )
-                implFillPolyPolygon( rPoly, fillColor,
+                implFillPolyPolygon( rPoly, fillColor, 
                                      getMaskedIter(rClip),
                                      maRawMaskedXorAccessor,
                                      rBounds );
             else
-                implFillPolyPolygon( rPoly, fillColor,
+                implFillPolyPolygon( rPoly, fillColor, 
                                      getMaskedIter(rClip),
                                      maRawMaskedAccessor,
                                      rBounds );
@@ -657,7 +657,7 @@ namespace
                                    const Acc&                   acc)
         {
             GenericColorImageAccessor aSrcAcc( rSrcBitmap );
-
+ 
             scaleImage(
                 srcIterRange(vigra::Diff2D(),
                              aSrcAcc,
@@ -669,7 +669,7 @@ namespace
 
         virtual void drawBitmap_i(const BitmapDeviceSharedPtr& rSrcBitmap,
                                   const basegfx::B2IRange&     rSrcRect,
-                                  const basegfx::B2IRange&     rDstRect,
+                                  const basegfx::B2IRange&     rDstRect, 
                                   DrawMode                     drawMode )
         {
             if( isCompatibleBitmap( rSrcBitmap ) )
@@ -698,8 +698,8 @@ namespace
 
         virtual void drawBitmap_i(const BitmapDeviceSharedPtr& rSrcBitmap,
                                   const basegfx::B2IRange&     rSrcRect,
-                                  const basegfx::B2IRange&     rDstRect,
-                                  DrawMode                     drawMode,
+                                  const basegfx::B2IRange&     rDstRect, 
+                                  DrawMode                     drawMode, 
                                   const BitmapDeviceSharedPtr& rClip )
         {
             if( isCompatibleBitmap( rSrcBitmap ) )
@@ -751,12 +751,12 @@ namespace
                     maBegin + vigra::Diff2D(rDstPoint.getX(),
                                             rDstPoint.getY()),
                     pMask->maBegin + topLeft(rSrcRect) );
-
+                            
                 fillImage(aBegin,
                           aBegin + vigra::Diff2D(rSrcRect.getWidth(),
-                                                 rSrcRect.getHeight()),
+                                                 rSrcRect.getHeight()), 
                           maRawMaskedAccessor,
-                          maColorLookup(
+                          maColorLookup( 
                               maAccessor,
                               aSrcColor) );
             }
@@ -777,7 +777,7 @@ namespace
         virtual void drawMaskedColor_i(Color                        aSrcColor,
                                        const BitmapDeviceSharedPtr& rAlphaMask,
                                        const basegfx::B2IRange&     rSrcRect,
-                                       const basegfx::B2IPoint&     rDstPoint,
+                                       const basegfx::B2IPoint&     rDstPoint, 
                                        const BitmapDeviceSharedPtr& rClip )
         {
             boost::shared_ptr<mask_bitmap_type>      pMask( getCompatibleClipMask(rAlphaMask) );
@@ -786,7 +786,7 @@ namespace
             if( pAlpha )
             {
                 const composite_iterator_type aBegin( getMaskedIter(rClip) );
-                maMaskedColorBlendAccessor.get1stWrappedAccessor().setColor(
+                maMaskedColorBlendAccessor.get1stWrappedAccessor().setColor( 
                     aSrcColor );
 
                 vigra::copyImage( srcIterRange(pAlpha->maBegin,
@@ -811,12 +811,12 @@ namespace
                         pMask->maBegin + topLeft(rSrcRect)),
                     pClipMask->maBegin + vigra::Diff2D(rDstPoint.getX(),
                                                        rDstPoint.getY()) );
-
+                            
                 fillImage(aBegin,
                           aBegin + vigra::Diff2D(rSrcRect.getWidth(),
-                                                 rSrcRect.getHeight()),
+                                                 rSrcRect.getHeight()), 
                           maRawMaskedMaskAccessor,
-                          maColorLookup(
+                          maColorLookup( 
                               maAccessor,
                               aSrcColor) );
             }
@@ -824,7 +824,7 @@ namespace
             {
                 GenericColorImageAccessor aSrcAcc( rAlphaMask );
                 const composite_iterator_type aBegin( getMaskedIter(rClip) );
-                maGenericMaskedColorBlendAccessor.get1stWrappedAccessor().setColor(
+                maGenericMaskedColorBlendAccessor.get1stWrappedAccessor().setColor( 
                     aSrcColor );
 
                 vigra::copyImage( srcIterRange(vigra::Diff2D(),
@@ -902,7 +902,7 @@ namespace
         virtual void drawMaskedBitmap_i(const BitmapDeviceSharedPtr& rSrcBitmap,
                                         const BitmapDeviceSharedPtr& rMask,
                                         const basegfx::B2IRange&     rSrcRect,
-                                        const basegfx::B2IRange&     rDstRect,
+                                        const basegfx::B2IRange&     rDstRect, 
                                         DrawMode                     drawMode )
         {
             if( isCompatibleClipMask(rMask) &&
@@ -937,8 +937,8 @@ namespace
         virtual void drawMaskedBitmap_i(const BitmapDeviceSharedPtr& rSrcBitmap,
                                         const BitmapDeviceSharedPtr& rMask,
                                         const basegfx::B2IRange&     rSrcRect,
-                                        const basegfx::B2IRange&     rDstRect,
-                                        DrawMode                     drawMode,
+                                        const basegfx::B2IRange&     rDstRect, 
+                                        DrawMode                     drawMode, 
                                         const BitmapDeviceSharedPtr& rClip )
         {
             if( isCompatibleClipMask(rMask) &&
@@ -974,7 +974,7 @@ namespace
 
 struct ImplBitmapDevice
 {
-    /** Bitmap memory plus deleter.
+    /** Bitmap memory plus deleter. 
 
         Always points to the start of the mem
      */
@@ -983,7 +983,7 @@ struct ImplBitmapDevice
     /// Palette memory plus deleter (might be NULL)
     PaletteMemorySharedVector mpPalette;
 
-    /** Bounds of the device.
+    /** Bounds of the device. 
 
         maBounds.getWidth()/getHeight() yield the true size of the
         device (i.e. the rectangle given by maBounds covers the device
@@ -992,7 +992,7 @@ struct ImplBitmapDevice
      */
     basegfx::B2IRange         maBounds;
 
-    /** Bounds of the device.
+    /** Bounds of the device. 
 
         maBounds.getWidth()/getHeight() yield the true size of the
         device minus 1 (i.e. the rectangle given by maBounds covers
@@ -1009,7 +1009,7 @@ struct ImplBitmapDevice
 
     /// Scanline stride. Negative for bottom-to-top formats
     sal_Int32                 mnScanlineStride;
-
+    
     /// raw ptr to 0th scanline. used for cloning a generic renderer
     sal_uInt8*                mpFirstScanline;
 
@@ -1050,7 +1050,7 @@ BitmapDevice::BitmapDevice( const basegfx::B2IRange&         rBounds,
     mpImpl->mnScanlineStride = nScanlineStride;
     mpImpl->mpFirstScanline  = pFirstScanline;
 }
-
+    
 BitmapDevice::~BitmapDevice()
 {
     // outline, because of internal ImplBitmapDevice
@@ -1058,7 +1058,7 @@ BitmapDevice::~BitmapDevice()
 
 basegfx::B2IVector BitmapDevice::getSize() const
 {
-
+    
     return basegfx::B2IVector(
         mpImpl->maBounds.getMaxX() - mpImpl->maBounds.getMinX(),
         mpImpl->maBounds.getMaxY() - mpImpl->maBounds.getMinY() );
@@ -1076,7 +1076,7 @@ sal_Int32 BitmapDevice::getScanlineFormat() const
 
 sal_Int32 BitmapDevice::getScanlineStride() const
 {
-    return mpImpl->mnScanlineStride < 0 ?
+    return mpImpl->mnScanlineStride < 0 ? 
         -mpImpl->mnScanlineStride : mpImpl->mnScanlineStride;
 }
 
@@ -1100,17 +1100,17 @@ void BitmapDevice::clear( Color fillColor )
     clear_i( fillColor, mpImpl->maBounds );
 }
 
-void BitmapDevice::setPixel( const basegfx::B2IPoint& rPt,
-                             Color                    lineColor,
+void BitmapDevice::setPixel( const basegfx::B2IPoint& rPt, 
+                             Color                    lineColor, 
                              DrawMode                 drawMode )
 {
     if( mpImpl->maLineClipRect.isInside(rPt) )
         setPixel_i(rPt,lineColor,drawMode);
 }
 
-void BitmapDevice::setPixel( const basegfx::B2IPoint&     rPt,
-                             Color                        lineColor,
-                             DrawMode                     drawMode,
+void BitmapDevice::setPixel( const basegfx::B2IPoint&     rPt, 
+                             Color                        lineColor, 
+                             DrawMode                     drawMode, 
                              const BitmapDeviceSharedPtr& rClip )
 {
     if( !rClip )
@@ -1144,22 +1144,22 @@ sal_uInt32 BitmapDevice::getPixelData( const basegfx::B2IPoint& rPt )
     return 0;
 }
 
-void BitmapDevice::drawLine( const basegfx::B2IPoint& rPt1,
-                             const basegfx::B2IPoint& rPt2,
-                             Color                    lineColor,
+void BitmapDevice::drawLine( const basegfx::B2IPoint& rPt1, 
+                             const basegfx::B2IPoint& rPt2, 
+                             Color                    lineColor, 
                              DrawMode                 drawMode )
 {
-    drawLine_i( rPt1,
+    drawLine_i( rPt1, 
                 rPt2,
                 mpImpl->maLineClipRect,
                 lineColor,
                 drawMode );
 }
 
-void BitmapDevice::drawLine( const basegfx::B2IPoint&     rPt1,
-                             const basegfx::B2IPoint&     rPt2,
-                             Color                        lineColor,
-                             DrawMode                     drawMode,
+void BitmapDevice::drawLine( const basegfx::B2IPoint&     rPt1, 
+                             const basegfx::B2IPoint&     rPt2, 
+                             Color                        lineColor, 
+                             DrawMode                     drawMode, 
                              const BitmapDeviceSharedPtr& rClip )
 {
     if( !rClip )
@@ -1169,19 +1169,19 @@ void BitmapDevice::drawLine( const basegfx::B2IPoint&     rPt1,
     }
 
     if( isCompatibleClipMask( rClip ) )
-        drawLine_i( rPt1,
+        drawLine_i( rPt1, 
                     rPt2,
                     mpImpl->maLineClipRect,
                     lineColor,
                     drawMode,
                     rClip );
     else
-        getGenericRenderer()->drawLine( rPt1, rPt2, lineColor,
+        getGenericRenderer()->drawLine( rPt1, rPt2, lineColor, 
                                         drawMode, rClip );
 }
 
-void BitmapDevice::drawPolygon( const basegfx::B2DPolygon& rPoly,
-                                Color                      lineColor,
+void BitmapDevice::drawPolygon( const basegfx::B2DPolygon& rPoly, 
+                                Color                      lineColor, 
                                 DrawMode                   drawMode )
 {
     const sal_uInt32 numVertices( rPoly.count() );
@@ -1191,9 +1191,9 @@ void BitmapDevice::drawPolygon( const basegfx::B2DPolygon& rPoly,
                        lineColor, drawMode );
 }
 
-void BitmapDevice::drawPolygon( const basegfx::B2DPolygon&   rPoly,
-                                Color                        lineColor,
-                                DrawMode                     drawMode,
+void BitmapDevice::drawPolygon( const basegfx::B2DPolygon&   rPoly, 
+                                Color                        lineColor, 
+                                DrawMode                     drawMode, 
                                 const BitmapDeviceSharedPtr& rClip )
 {
     if( !rClip )
@@ -1210,21 +1210,21 @@ void BitmapDevice::drawPolygon( const basegfx::B2DPolygon&   rPoly,
                            mpImpl->maLineClipRect,
                            lineColor, drawMode, rClip );
         else
-            getGenericRenderer()->drawPolygon( rPoly, lineColor,
+            getGenericRenderer()->drawPolygon( rPoly, lineColor, 
                                                drawMode, rClip );
     }
 }
 
-void BitmapDevice::fillPolyPolygon( const basegfx::B2DPolyPolygon& rPoly,
-                                    Color                          fillColor,
+void BitmapDevice::fillPolyPolygon( const basegfx::B2DPolyPolygon& rPoly, 
+                                    Color                          fillColor, 
                                     DrawMode                       drawMode )
 {
     fillPolyPolygon_i( rPoly, fillColor, drawMode, mpImpl->maBounds );
 }
 
-void BitmapDevice::fillPolyPolygon( const basegfx::B2DPolyPolygon& rPoly,
-                                    Color                          fillColor,
-                                    DrawMode                       drawMode,
+void BitmapDevice::fillPolyPolygon( const basegfx::B2DPolyPolygon& rPoly, 
+                                    Color                          fillColor, 
+                                    DrawMode                       drawMode, 
                                     const BitmapDeviceSharedPtr&   rClip )
 {
     if( !rClip )
@@ -1236,7 +1236,7 @@ void BitmapDevice::fillPolyPolygon( const basegfx::B2DPolyPolygon& rPoly,
     if( isCompatibleClipMask( rClip ) )
         fillPolyPolygon_i( rPoly, fillColor, drawMode, mpImpl->maBounds, rClip );
     else
-        getGenericRenderer()->fillPolyPolygon( rPoly, fillColor,
+        getGenericRenderer()->fillPolyPolygon( rPoly, fillColor, 
                                                drawMode, rClip );
 }
 
@@ -1270,7 +1270,7 @@ namespace
                        const ::basegfx::B2IRange& rSourceBounds,
                        const ::basegfx::B2IRange& rDestBounds )
     {
-        const ::basegfx::B2IPoint aSourceTopLeft(
+        const ::basegfx::B2IPoint aSourceTopLeft( 
             io_rSourceArea.getMinimum() );
 
         ::basegfx::B2IRange aLocalSourceArea( io_rSourceArea );
@@ -1280,28 +1280,28 @@ namespace
 
         if( aLocalSourceArea.isEmpty() )
             return false;
-
+            
         // calc relative new source area points (relative to orig
         // source area)
-        const ::basegfx::B2IVector aUpperLeftOffset(
+        const ::basegfx::B2IVector aUpperLeftOffset( 
             aLocalSourceArea.getMinimum()-aSourceTopLeft );
-        const ::basegfx::B2IVector aLowerRightOffset(
+        const ::basegfx::B2IVector aLowerRightOffset( 
             aLocalSourceArea.getMaximum()-aSourceTopLeft );
 
         ::basegfx::B2IRange aLocalDestArea( io_rDestPoint + aUpperLeftOffset,
                                             io_rDestPoint + aLowerRightOffset );
-
+            
         // clip dest area (which must be inside rDestBounds)
         aLocalDestArea.intersect( rDestBounds );
-
+            
         if( aLocalDestArea.isEmpty() )
             return false;
 
         // calc relative new dest area points (relative to orig
         // source area)
-        const ::basegfx::B2IVector aDestUpperLeftOffset(
+        const ::basegfx::B2IVector aDestUpperLeftOffset( 
             aLocalDestArea.getMinimum()-io_rDestPoint );
-        const ::basegfx::B2IVector aDestLowerRightOffset(
+        const ::basegfx::B2IVector aDestLowerRightOffset( 
             aLocalDestArea.getMaximum()-io_rDestPoint );
 
         io_rSourceArea = ::basegfx::B2IRange( aSourceTopLeft + aDestUpperLeftOffset,
@@ -1323,9 +1323,9 @@ namespace
         const double nScaleY( io_rDestArea.getHeight() / (double)io_rSourceArea.getHeight() );
 
         // extract range origins
-        const basegfx::B2IPoint   aDestTopLeft(
+        const basegfx::B2IPoint   aDestTopLeft( 
             io_rDestArea.getMinimum() );
-        const ::basegfx::B2IPoint aSourceTopLeft(
+        const ::basegfx::B2IPoint aSourceTopLeft( 
             io_rSourceArea.getMinimum() );
 
         ::basegfx::B2IRange aLocalSourceArea( io_rSourceArea );
@@ -1335,30 +1335,30 @@ namespace
 
         if( aLocalSourceArea.isEmpty() )
             return false;
-
+            
         // calc relative new source area points (relative to orig
         // source area)
-        const ::basegfx::B2IVector aUpperLeftOffset(
+        const ::basegfx::B2IVector aUpperLeftOffset( 
             aLocalSourceArea.getMinimum()-aSourceTopLeft );
-        const ::basegfx::B2IVector aLowerRightOffset(
+        const ::basegfx::B2IVector aLowerRightOffset( 
             aLocalSourceArea.getMaximum()-aSourceTopLeft );
 
         ::basegfx::B2IRange aLocalDestArea( basegfx::fround(aDestTopLeft.getX() + nScaleX*aUpperLeftOffset.getX()),
                                             basegfx::fround(aDestTopLeft.getY() + nScaleY*aUpperLeftOffset.getY()),
                                             basegfx::fround(aDestTopLeft.getX() + nScaleX*aLowerRightOffset.getX()),
                                             basegfx::fround(aDestTopLeft.getY() + nScaleY*aLowerRightOffset.getY()) );
-
+            
         // clip dest area (which must be inside rDestBounds)
         aLocalDestArea.intersect( rDestBounds );
-
+            
         if( aLocalDestArea.isEmpty() )
             return false;
 
         // calc relative new dest area points (relative to orig
         // source area)
-        const ::basegfx::B2IVector aDestUpperLeftOffset(
+        const ::basegfx::B2IVector aDestUpperLeftOffset( 
             aLocalDestArea.getMinimum()-aDestTopLeft );
-        const ::basegfx::B2IVector aDestLowerRightOffset(
+        const ::basegfx::B2IVector aDestLowerRightOffset( 
             aLocalDestArea.getMaximum()-aDestTopLeft );
 
         io_rSourceArea = ::basegfx::B2IRange( basegfx::fround(aSourceTopLeft.getX() + aDestUpperLeftOffset.getX()/nScaleX),
@@ -1369,7 +1369,7 @@ namespace
 
         // final source area clip (chopping round-offs)
         io_rSourceArea.intersect( rSourceBounds );
-
+            
         if( io_rSourceArea.isEmpty() )
             return false;
 
@@ -1380,7 +1380,7 @@ namespace
 
 void BitmapDevice::drawBitmap( const BitmapDeviceSharedPtr& rSrcBitmap,
                                const basegfx::B2IRange&     rSrcRect,
-                               const basegfx::B2IRange&     rDstRect,
+                               const basegfx::B2IRange&     rDstRect, 
                                DrawMode                     drawMode )
 {
     const basegfx::B2IVector& rSrcSize( rSrcBitmap->getSize() );
@@ -1402,8 +1402,8 @@ void BitmapDevice::drawBitmap( const BitmapDeviceSharedPtr& rSrcBitmap,
 
 void BitmapDevice::drawBitmap( const BitmapDeviceSharedPtr& rSrcBitmap,
                                const basegfx::B2IRange&     rSrcRect,
-                               const basegfx::B2IRange&     rDstRect,
-                               DrawMode                     drawMode,
+                               const basegfx::B2IRange&     rDstRect, 
+                               DrawMode                     drawMode, 
                                const BitmapDeviceSharedPtr& rClip )
 {
     if( !rClip )
@@ -1431,7 +1431,7 @@ void BitmapDevice::drawBitmap( const BitmapDeviceSharedPtr& rSrcBitmap,
         }
         else
         {
-            getGenericRenderer()->drawBitmap( rSrcBitmap, rSrcRect,
+            getGenericRenderer()->drawBitmap( rSrcBitmap, rSrcRect, 
                                               rDstRect, drawMode, rClip );
         }
     }
@@ -1462,7 +1462,7 @@ void BitmapDevice::drawMaskedColor( Color                        aSrcColor,
 
             const basegfx::B2ITuple aSize( aSrcRange.getWidth(),
                                            aSrcRange.getHeight() );
-            BitmapDeviceSharedPtr pAlphaCopy(
+            BitmapDeviceSharedPtr pAlphaCopy( 
                 cloneBitmapDevice( aSize,
                                    shared_from_this()) );
             basegfx::B2ITuple aGcc3WorkaroundTemporary;
@@ -1484,7 +1484,7 @@ void BitmapDevice::drawMaskedColor( Color                        aSrcColor,
 void BitmapDevice::drawMaskedColor( Color                        aSrcColor,
                                     const BitmapDeviceSharedPtr& rAlphaMask,
                                     const basegfx::B2IRange&     rSrcRect,
-                                    const basegfx::B2IPoint&     rDstPoint,
+                                    const basegfx::B2IPoint&     rDstPoint, 
                                     const BitmapDeviceSharedPtr& rClip )
 {
     if( !rClip )
@@ -1515,7 +1515,7 @@ void BitmapDevice::drawMaskedColor( Color                        aSrcColor,
 
                 const basegfx::B2ITuple aSize( aSrcRange.getWidth(),
                                                aSrcRange.getHeight() );
-                BitmapDeviceSharedPtr pAlphaCopy(
+                BitmapDeviceSharedPtr pAlphaCopy( 
                     cloneBitmapDevice( aSize,
                                        shared_from_this()) );
                 basegfx::B2ITuple aGcc3WorkaroundTemporary;
@@ -1543,7 +1543,7 @@ void BitmapDevice::drawMaskedColor( Color                        aSrcColor,
 void BitmapDevice::drawMaskedBitmap( const BitmapDeviceSharedPtr& rSrcBitmap,
                                      const BitmapDeviceSharedPtr& rMask,
                                      const basegfx::B2IRange&     rSrcRect,
-                                     const basegfx::B2IRange&     rDstRect,
+                                     const basegfx::B2IRange&     rDstRect, 
                                      DrawMode                     drawMode )
 {
     OSL_ASSERT( rMask->getSize() == rSrcBitmap->getSize() );
@@ -1568,8 +1568,8 @@ void BitmapDevice::drawMaskedBitmap( const BitmapDeviceSharedPtr& rSrcBitmap,
 void BitmapDevice::drawMaskedBitmap( const BitmapDeviceSharedPtr& rSrcBitmap,
                                      const BitmapDeviceSharedPtr& rMask,
                                      const basegfx::B2IRange&     rSrcRect,
-                                     const basegfx::B2IRange&     rDstRect,
-                                     DrawMode                     drawMode,
+                                     const basegfx::B2IRange&     rDstRect, 
+                                     DrawMode                     drawMode, 
                                      const BitmapDeviceSharedPtr& rClip )
 {
     if( !rClip )
@@ -1599,7 +1599,7 @@ void BitmapDevice::drawMaskedBitmap( const BitmapDeviceSharedPtr& rSrcBitmap,
         }
         else
         {
-            getGenericRenderer()->drawMaskedBitmap( rSrcBitmap, rMask, rSrcRect,
+            getGenericRenderer()->drawMaskedBitmap( rSrcBitmap, rMask, rSrcRect, 
                                                     rDstRect, drawMode, rClip );
         }
     }
@@ -1674,7 +1674,7 @@ BitmapDeviceSharedPtr createRenderer(
                             typename FormatTraits::accessor_selector,
                             MaskTraits >                        Renderer;
 
-    return BitmapDeviceSharedPtr(
+    return BitmapDeviceSharedPtr( 
         new Renderer( rBounds,
                       nScanlineFormat,
                       nScanlineStride,
@@ -1690,7 +1690,7 @@ BitmapDeviceSharedPtr createRenderer(
 }
 
 /// Create standard grey level palette
-PaletteMemorySharedVector createStandardPalette(
+PaletteMemorySharedVector createStandardPalette( 
     const PaletteMemorySharedVector& pPal,
     sal_Int32                        nNumEntries )
 {
@@ -1699,14 +1699,14 @@ PaletteMemorySharedVector createStandardPalette(
 
     boost::shared_ptr< std::vector<Color> > pLocalPal(
         new std::vector<Color>(nNumEntries) );
-
+    
     const sal_Int32 nIncrement( 0x00FFFFFF/nNumEntries );
     --nNumEntries;
     for( sal_Int32 i=0, c=0; i<nNumEntries; ++i,c+=nIncrement )
         pLocalPal->at(i) = Color(0xFF000000 | c);
-
+    
     pLocalPal->at(nNumEntries) = Color(0xFFFFFFFF);
-
+    
     return pLocalPal;
 }
 
@@ -1752,7 +1752,7 @@ BitmapDeviceSharedPtr createRenderer(
                                       nScanlineStride,
                                       pFirstScanline,
                                       typename FormatTraits::raw_accessor_type(),
-                                      typename FormatTraits::accessor_selector::template
+                                      typename FormatTraits::accessor_selector::template 
                                           wrap_accessor<
                                       typename FormatTraits::raw_accessor_type>::type(
                                           &pPal->at(0),
@@ -1796,27 +1796,27 @@ BitmapDeviceSharedPtr createBitmapDeviceImpl( const basegfx::B2IVector&        r
                                               PaletteMemorySharedVector        pPal,
                                               const basegfx::B2IRange*         pSubset )
 {
-    if( nScanlineFormat <= Format::NONE ||
+    if( nScanlineFormat <= Format::NONE || 
         nScanlineFormat >  Format::MAX )
         return BitmapDeviceSharedPtr();
 
-    static const sal_uInt8 bitsPerPixel[] =
+    static const sal_uInt8 bitsPerPixel[] = 
     {
-        0,  // NONE
-        1,  // ONE_BIT_MSB_GREY
-        1,  // ONE_BIT_LSB_GREY
-        1,  // ONE_BIT_MSB_PAL
-        1,  // ONE_BIT_LSB_PAL
-        4,  // FOUR_BIT_MSB_GREY
-        4,  // FOUR_BIT_LSB_GREY
-        4,  // FOUR_BIT_MSB_PAL
-        4,  // FOUR_BIT_LSB_PAL
-        8,  // EIGHT_BIT_PAL
-        8,  // EIGHT_BIT_GREY
-        16, // SIXTEEN_BIT_LSB_TC_MASK
-        16, // SIXTEEN_BIT_MSB_TC_MASK
-        24, // TWENTYFOUR_BIT_TC_MASK
-        32, // THIRTYTWO_BIT_TC_MASK
+        0,  // NONE                   
+        1,  // ONE_BIT_MSB_GREY       
+        1,  // ONE_BIT_LSB_GREY       
+        1,  // ONE_BIT_MSB_PAL        
+        1,  // ONE_BIT_LSB_PAL        
+        4,  // FOUR_BIT_MSB_GREY      
+        4,  // FOUR_BIT_LSB_GREY      
+        4,  // FOUR_BIT_MSB_PAL       
+        4,  // FOUR_BIT_LSB_PAL       
+        8,  // EIGHT_BIT_PAL          
+        8,  // EIGHT_BIT_GREY         
+        16, // SIXTEEN_BIT_LSB_TC_MASK    
+        16, // SIXTEEN_BIT_MSB_TC_MASK    
+        24, // TWENTYFOUR_BIT_TC_MASK 
+        32, // THIRTYTWO_BIT_TC_MASK  
         32, // THIRTYTWO_BIT_TC_MASK_ARGB
     };
 
@@ -1835,7 +1835,7 @@ BitmapDeviceSharedPtr createBitmapDeviceImpl( const basegfx::B2IVector&        r
     // factor in bottom-up scanline order case
     nScanlineStride *= bTopDown ? 1 : -1;
 
-    const std::size_t nMemSize(
+    const std::size_t nMemSize( 
         (nScanlineStride < 0 ? -nScanlineStride : nScanlineStride)*rSize.getY() );
 
     if( !pMem )
@@ -1846,7 +1846,7 @@ BitmapDeviceSharedPtr createBitmapDeviceImpl( const basegfx::B2IVector&        r
         rtl_zeroMemory(pMem.get(),nMemSize);
     }
 
-    sal_uInt8* pFirstScanline = nScanlineStride < 0 ?
+    sal_uInt8* pFirstScanline = nScanlineStride < 0 ? 
         pMem.get() + nMemSize + nScanlineStride : pMem.get();
 
     // shrink render area to given subset, if given
@@ -1969,9 +1969,9 @@ BitmapDeviceSharedPtr createBitmapDevice( const basegfx::B2IVector& rSize,
                                           bool                      bTopDown,
                                           sal_Int32                 nScanlineFormat )
 {
-    return createBitmapDeviceImpl( rSize,
-                                   bTopDown,
-                                   nScanlineFormat,
+    return createBitmapDeviceImpl( rSize, 
+                                   bTopDown, 
+                                   nScanlineFormat, 
                                    boost::shared_array< sal_uInt8 >(),
                                    PaletteMemorySharedVector(),
                                    NULL );
@@ -1982,9 +1982,9 @@ BitmapDeviceSharedPtr createBitmapDevice( const basegfx::B2IVector&        rSize
                                           sal_Int32                        nScanlineFormat,
                                           const PaletteMemorySharedVector& rPalette )
 {
-    return createBitmapDeviceImpl( rSize,
-                                   bTopDown,
-                                   nScanlineFormat,
+    return createBitmapDeviceImpl( rSize, 
+                                   bTopDown, 
+                                   nScanlineFormat, 
                                    boost::shared_array< sal_uInt8 >(),
                                    rPalette,
                                    NULL );
@@ -1996,9 +1996,9 @@ BitmapDeviceSharedPtr createBitmapDevice( const basegfx::B2IVector&        rSize
                                           const RawMemorySharedArray&      rMem,
                                           const PaletteMemorySharedVector& rPalette )
 {
-    return createBitmapDeviceImpl( rSize,
-                                   bTopDown,
-                                   nScanlineFormat,
+    return createBitmapDeviceImpl( rSize, 
+                                   bTopDown, 
+                                   nScanlineFormat, 
                                    rMem,
                                    rPalette,
                                    NULL );
@@ -2008,8 +2008,8 @@ BitmapDeviceSharedPtr subsetBitmapDevice( const BitmapDeviceSharedPtr&     rProt
                                           const basegfx::B2IRange&         rSubset )
 {
     return createBitmapDeviceImpl( rProto->getSize(),
-                                   rProto->isTopDown(),
-                                   rProto->getScanlineFormat(),
+                                   rProto->isTopDown(), 
+                                   rProto->getScanlineFormat(), 
                                    rProto->getBuffer(),
                                    rProto->getPalette(),
                                    &rSubset );
@@ -2018,9 +2018,9 @@ BitmapDeviceSharedPtr subsetBitmapDevice( const BitmapDeviceSharedPtr&     rProt
 BitmapDeviceSharedPtr cloneBitmapDevice( const basegfx::B2IVector&        rSize,
                                          const BitmapDeviceSharedPtr&     rProto )
 {
-    return createBitmapDeviceImpl( rSize,
-                                   rProto->isTopDown(),
-                                   rProto->getScanlineFormat(),
+    return createBitmapDeviceImpl( rSize, 
+                                   rProto->isTopDown(), 
+                                   rProto->getScanlineFormat(), 
                                    boost::shared_array< sal_uInt8 >(),
                                    rProto->getPalette(),
                                    NULL );
@@ -2036,16 +2036,16 @@ BitmapDeviceSharedPtr BitmapDevice::getGenericRenderer() const
     typedef BitmapRenderer< PixelFormatTraits_GenericInteger::iterator_type,
                             PixelFormatTraits_GenericInteger::raw_accessor_type,
                             PixelFormatTraits_GenericInteger::accessor_selector,
-                            MaskTraitsGeneric >
+                            MaskTraitsGeneric >                        
             Renderer;
 
     if( !mpImpl->mpGenericRenderer )
     {
         mpImpl->mpGenericRenderer.reset(
             new Renderer(
-                mpImpl->maBounds,
-                isTopDown(),
-                getScanlineFormat(),
+                mpImpl->maBounds, 
+                isTopDown(), 
+                getScanlineFormat(), 
                 getScanlineStride(),
                 mpImpl->mpFirstScanline,
                 PixelFormatTraits_GenericInteger::iterator_type(),
@@ -2053,7 +2053,7 @@ BitmapDeviceSharedPtr BitmapDevice::getGenericRenderer() const
                     const_cast<BitmapDevice*>(this)->shared_from_this()),
                 GenericIntegerImageAccessor<Color>(
                     const_cast<BitmapDevice*>(this)->shared_from_this()),
-                getBuffer(),
+                getBuffer(), 
                 getPalette() ));
     }
 #endif
diff --git a/basebmp/source/debug.cxx b/basebmp/source/debug.cxx
index 7781e43c19bc..d5a44717e3da 100644
--- a/basebmp/source/debug.cxx
+++ b/basebmp/source/debug.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
@@ -86,7 +86,7 @@ namespace basebmp
         const bool               bTopDown( rDevice->isTopDown() );
         const sal_Int32          nScanlineFormat( rDevice->getScanlineFormat() );
 
-        rOutputStream
+        rOutputStream 
             << "/* basebmp::BitmapDevice content dump */" << std::endl
             << "/* Width   = " << aSize.getX() << " */" << std::endl
             << "/* Height  = " << aSize.getY() << " */" << std::endl
@@ -98,7 +98,7 @@ namespace basebmp
         rOutputStream << std::hex;
         for( int y=0; y<aSize.getY(); ++y )
         {
-            for( int x=0; x<aSize.getX(); ++x )
+            for( int x=0; x<aSize.getX(); ++x ) 
                 rOutputStream << std::setw(8) << (sal_uInt32)rDevice->getPixel( basegfx::B2IPoint(x,y) ).toInt32() << " ";
             rOutputStream << std::endl;
         }
diff --git a/basebmp/source/intconversion.hxx b/basebmp/source/intconversion.hxx
index 0fb7a0bf684a..c60527fe6657 100644
--- a/basebmp/source/intconversion.hxx
+++ b/basebmp/source/intconversion.hxx
@@ -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
@@ -40,7 +40,7 @@ namespace basebmp
     template< class RgbVal > struct UInt32FromRgbValue
     {
         sal_uInt32 operator()( RgbVal const& c ) const
-        {
+        { 
             return (c[0] << 16) | (c[1] << 8) | c[2];
         }
     };
@@ -49,7 +49,7 @@ namespace basebmp
     template< class RgbVal > struct RgbValueFromUInt32
     {
         RgbVal operator()( sal_uInt32 c ) const
-        {
+        { 
             return RgbVal((c >> 16) & 0xFF,
                           (c >> 8) & 0xFF,
                           c & 0xFF);
@@ -62,9 +62,9 @@ namespace basebmp
         typedef std::identity<DataType> to;
         typedef std::identity<DataType> from;
     };
-    template< unsigned int RedIndex,
-              unsigned int GreenIndex,
-              unsigned int BlueIndex > struct uInt32Converter<
+    template< unsigned int RedIndex, 
+              unsigned int GreenIndex, 
+              unsigned int BlueIndex > struct uInt32Converter< 
                   vigra::RGBValue< sal_uInt8,
                                    RedIndex,
                                    GreenIndex,
diff --git a/basebmp/source/polypolygonrenderer.cxx b/basebmp/source/polypolygonrenderer.cxx
index 79453402ef4c..d359c6c7378c 100644
--- a/basebmp/source/polypolygonrenderer.cxx
+++ b/basebmp/source/polypolygonrenderer.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
@@ -41,8 +41,8 @@ namespace detail
         sal_Int32 const nNumScanlines( (sal_Int32)rGET.size() );
 
         // add all polygons to GET
-        for( sal_uInt32 i(0), nCount(rPolyPoly.count());
-             i<nCount;
+        for( sal_uInt32 i(0), nCount(rPolyPoly.count()); 
+             i<nCount; 
              ++i )
         {
             // add all vertices to GET
diff --git a/basebmp/test/basictest.cxx b/basebmp/test/basictest.cxx
index 6f96cf56f492..dbaae09e4f1d 100644
--- a/basebmp/test/basictest.cxx
+++ b/basebmp/test/basictest.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
diff --git a/basebmp/test/bmpdemo.cxx b/basebmp/test/bmpdemo.cxx
index 99aa1bac2c5c..bf985ae555b4 100644
--- a/basebmp/test/bmpdemo.cxx
+++ b/basebmp/test/bmpdemo.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
@@ -82,7 +82,7 @@ namespace
 {
 
 /// template meta function: add const qualifier, if given 2nd type has it
-template<typename A, typename B> struct clone_const
+template<typename A, typename B> struct clone_const 
 {
     typedef B type;
 };
@@ -91,7 +91,7 @@ template<typename A, typename B> struct clone_const<const A,B>
     typedef const B type;
 };
 
-template< class DestIterator, class DestAccessor > class Renderer :
+template< class DestIterator, class DestAccessor > class Renderer : 
         public basegfx::B2DPolyPolygonRasterConverter
 {
 private:
@@ -104,8 +104,8 @@ public:
     Renderer(const basegfx::B2DPolyPolygon&     rPolyPolyRaster,
              typename DestIterator::value_type  fillColor,
              typename DestIterator::value_type  clearColor,
-             DestIterator                       begin,
-             DestIterator                       end,
+             DestIterator                       begin, 
+             DestIterator                       end, 
              DestAccessor                       accessor ) :
         B2DPolyPolygonRasterConverter(rPolyPolyRaster,
                                       basegfx::B2DRange(0,0,
@@ -120,13 +120,13 @@ public:
 
     virtual void span(const double& rfXLeft,
                       const double& rfXRight,
-                      sal_Int32     nY,
-                      bool          bOn )
+                      sal_Int32 	nY, 
+                      bool 			bOn )
     {
         DestIterator currIter( begin_ + vigra::Diff2D(0,nY) );
-        typename DestIterator::row_iterator rowIter( currIter.rowIterator() +
+        typename DestIterator::row_iterator rowIter( currIter.rowIterator() + 
                                                      basegfx::fround(rfXLeft) );
-        typename DestIterator::row_iterator rowEnd( currIter.rowIterator() +
+        typename DestIterator::row_iterator rowEnd( currIter.rowIterator() + 
                                                     basegfx::fround(rfXRight) );
         if( bOn )
             while( rowIter != rowEnd )
@@ -143,13 +143,13 @@ public:
     }
 };
 
-template< class DestIterator, class DestAccessor >
+template< class DestIterator, class DestAccessor > 
     std::auto_ptr< Renderer< DestIterator, DestAccessor > > makeRenderer(
         const basegfx::B2DPolyPolygon&                          rPolyPolyRaster,
         typename DestIterator::value_type                       fillColor,
         typename DestIterator::value_type                       clearColor,
         vigra::triple<DestIterator, DestIterator, DestAccessor> dest )
-{
+{ 
     return std::auto_ptr< Renderer< DestIterator, DestAccessor > >(
         new Renderer< DestIterator, DestAccessor >(rPolyPolyRaster,
                                                    fillColor,
@@ -219,7 +219,7 @@ public:
 };
 
 /// template meta function: remove const qualifier from plain type
-template <typename T> struct remove_const
+template <typename T> struct remove_const 
 {
     typedef T type;
 };
@@ -252,21 +252,21 @@ template< typename data_type, int bits_per_pixel, bool MsbFirst, typename differ
     const unsigned int nIntraWordPositions( sizeof(data_type)*8 / bits_per_pixel );
 
     //      create bits_per_pixel 1s      shift to intra-word position
-    return ((~(~0 << bits_per_pixel)) << bits_per_pixel*(MsbFirst ?
-                                                         (nIntraWordPositions-1 - (d % nIntraWordPositions)) :
+    return ((~(~0 << bits_per_pixel)) << bits_per_pixel*(MsbFirst ? 
+                                                         (nIntraWordPositions-1 - (d % nIntraWordPositions)) : 
                                                          (d % nIntraWordPositions)));
 }
 
 template< int num_intraword_positions, int bits_per_pixel, bool MsbFirst, typename difference_type > inline difference_type get_shift( difference_type remainder )
 {
-    return bits_per_pixel*(MsbFirst ?
+    return bits_per_pixel*(MsbFirst ? 
                            (num_intraword_positions - 1 - remainder) :
                            remainder);
 }
 
-template< typename Datatype,
-          typename Valuetype,
-          int      bits_per_pixel,
+template< typename Datatype, 
+          typename Valuetype, 
+          int      bits_per_pixel, 
           bool     MsbFirst > class PackedPixelColumnIterator
 {
 public:
@@ -416,7 +416,7 @@ public:
 
     value_type get() const
     {
-        // TODO(Q3): use traits to get unsigned type for data_type (if
+        // TODO(Q3): use traits to get unsigned type for data_type (if  
         // not already)
         return static_cast<unsigned int>(*y() & mask_) >> shift_;
     }
@@ -441,9 +441,9 @@ public:
     }
 };
 
-template< typename Datatype,
-          typename Valuetype,
-          int      bits_per_pixel,
+template< typename Datatype, 
+          typename Valuetype,           
+          int      bits_per_pixel, 
           bool     MsbFirst > class PackedPixelRowIterator
 {
 public:
@@ -484,14 +484,14 @@ private:
         remainder_ = newValue % num_intraword_positions;
 
         const mask_type shifted_mask(
-            MsbFirst ?
+            MsbFirst ? 
             // TODO(Q3): use traits to get unsigned type for data_type
             // (if not already)
-            static_cast<unsigned int>(mask_) >> bits_per_pixel :
+            static_cast<unsigned int>(mask_) >> bits_per_pixel : 
             mask_ << bits_per_pixel );
 
         // data_offset is 0 for shifted mask, and 1 for wrapped-around mask
-        mask_ = (1-data_offset)*shifted_mask + data_offset*(MsbFirst ?
+        mask_ = (1-data_offset)*shifted_mask + data_offset*(MsbFirst ? 
                                                             bit_mask << bits_per_pixel*(num_intraword_positions-1) :
                                                             bit_mask);
     }
@@ -514,14 +514,14 @@ private:
         remainder_ = newRemainder + isNegative*num_intraword_positions;
 
         const mask_type shifted_mask(
-            MsbFirst ?
+            MsbFirst ? 
             mask_ << bits_per_pixel :
             // TODO(Q3): use traits to get unsigned type for data_type
             // (if not already)
             static_cast<unsigned int>(mask_) >> bits_per_pixel );
 
         // data_offset is 0 for shifted mask, and 1 for wrapped-around mask
-        mask_ = (1-data_offset)*shifted_mask + data_offset*(MsbFirst ?
+        mask_ = (1-data_offset)*shifted_mask + data_offset*(MsbFirst ? 
                                                             bit_mask :
                                                             bit_mask << bits_per_pixel*(num_intraword_positions-1));
     }
@@ -533,8 +533,8 @@ private:
 
     bool less( PackedPixelRowIterator const & rhs ) const
     {
-        return data_ == rhs.data_ ?
-            (remainder_ < rhs.remainder_) :
+        return data_ == rhs.data_ ? 
+            (remainder_ < rhs.remainder_) : 
             (data_ < rhs.data_);
     }
 
@@ -661,7 +661,7 @@ public:
     {
         // TODO(Q3): use traits to get unsigned type for data_type (if
         // not already)
-        return static_cast<unsigned int>(*data_ & mask_) >>
+        return static_cast<unsigned int>(*data_ & mask_) >> 
             get_shift<num_intraword_positions, bits_per_pixel, MsbFirst>(remainder_);
     }
 
@@ -674,9 +674,9 @@ public:
 
     void set( value_type v ) const
     {
-        const value_type pixel_value(
-            (v <<
-             get_shift<num_intraword_positions, bits_per_pixel, MsbFirst>(remainder_))
+        const value_type pixel_value( 
+            (v << 
+             get_shift<num_intraword_positions, bits_per_pixel, MsbFirst>(remainder_)) 
             & mask_ );
         *data_ = (*data_ & ~mask_) | pixel_value;
     }
@@ -689,9 +689,9 @@ public:
     }
 };
 
-template< typename Datatype,
-          typename Valuetype,
-          int      bits_per_pixel,
+template< typename Datatype, 
+          typename Valuetype,           
+          int      bits_per_pixel, 
           bool     MsbFirst > class PackedPixelIterator
 {
 public:
@@ -700,13 +700,13 @@ public:
     typedef Valuetype                                   value_type;
     typedef vigra::Diff2D                               difference_type;
     typedef image_traverser_tag                         iterator_category;
-    typedef PackedPixelRowIterator<data_type,
+    typedef PackedPixelRowIterator<data_type, 
                                    value_type,
-                                   bits_per_pixel,
+                                   bits_per_pixel, 
                                    MsbFirst>            row_iterator;
-    typedef PackedPixelColumnIterator<data_type,
+    typedef PackedPixelColumnIterator<data_type, 
                                       value_type,
-                                      bits_per_pixel,
+                                      bits_per_pixel, 
                                       MsbFirst>         column_iterator;
 
     typedef data_type*                                  pointer;
@@ -727,12 +727,12 @@ public:
 
 private:
     pointer current() const
-    {
+    { 
         return y() + (x / num_intraword_positions);
     }
 
     pointer current(int dx, int dy) const
-    {
+    { 
         return y(dy) + ((x+dx)/num_intraword_positions);
     }
 
@@ -816,9 +816,9 @@ public:
 
         // TODO(Q3): use traits to get unsigned type for data_type (if
         // not already)
-        return (static_cast<unsigned int>(*current() &
+        return (static_cast<unsigned int>(*current() & 
                                           get_mask<data_type, bits_per_pixel, MsbFirst>(remainder))
-                >> (MsbFirst ?
+                >> (MsbFirst ? 
                     (num_intraword_positions - remainder) :
                     remainder));
     }
@@ -829,18 +829,18 @@ public:
 
         // TODO(Q3): use traits to get unsigned type for data_type (if
         // not already)
-        return (static_cast<unsigned int>(*current(d.x,d.y) &
+        return (static_cast<unsigned int>(*current(d.x,d.y) & 
                                           get_mask<data_type, bits_per_pixel, MsbFirst>(remainder))
-                >> get_shift<num_intraword_positions, bits_per_pixel, MsbFirst>(remainder));
+                >> get_shift<num_intraword_positions, bits_per_pixel, MsbFirst>(remainder)); 
     }
 
     void set( value_type v ) const
     {
         const int remainder( x() % num_intraword_positions );
         const int mask( get_mask<data_type, bits_per_pixel, MsbFirst>(remainder) );
-        const value_type pixel_value(
-            (v <<
-             get_shift<num_intraword_positions, bits_per_pixel, MsbFirst>(remainder))
+        const value_type pixel_value( 
+            (v << 
+             get_shift<num_intraword_positions, bits_per_pixel, MsbFirst>(remainder)) 
             & mask );
         pointer p = current();
         *p = (*p & ~mask) | pixel_value;
@@ -850,9 +850,9 @@ public:
     {
         const int remainder( x(d.x) % num_intraword_positions );
         const int mask( get_mask<data_type, bits_per_pixel, MsbFirst>(remainder) );
-        const value_type pixel_value(
+        const value_type pixel_value( 
             (v <<
-             get_shift<num_intraword_positions, bits_per_pixel, MsbFirst>(remainder))
+             get_shift<num_intraword_positions, bits_per_pixel, MsbFirst>(remainder)) 
              & mask );
         pointer p = current(d.x,d.y);
         *p = (*p & ~mask) | pixel_value;
@@ -878,7 +878,7 @@ private:
                  BitmapColor const& rRHS ) const
     {
         // convert RGBValue's linear space to a normed linear space
-        return sqrt(
+        return sqrt( 
             vigra::sq(rLHS.GetRed()-rRHS.GetRed()) +
             vigra::sq(rLHS.GetGreen()-rRHS.GetGreen()) +
             vigra::sq(rLHS.GetBlue()-rRHS.GetBlue()) );
@@ -916,16 +916,16 @@ private:
     value_type toCol( BitmapColor const& rCol ) const
     {
         return value_type(rCol.GetRed(),rCol.GetGreen(),rCol.GetBlue());
-    }
+    } 
 
 public:
-    PaletteImageAccessor() :
+    PaletteImageAccessor() : 
         palette(0),
         num_entries(0)
     {}
 
     PaletteImageAccessor( const BitmapColor* pPalette,
-                          data_type          entries ) :
+                          data_type          entries ) : 
         palette(pPalette),
         num_entries(entries)
     {}
@@ -942,8 +942,8 @@ public:
 
     template< typename V, class Iterator >
     void set(V const& value, Iterator const& i) const
-    {
-        i.set(
+    { 
+        i.set( 
             find_best_match(
                 vigra::detail::RequiresExplicitCast<value_type>::cast(value) ));
     }
@@ -951,9 +951,9 @@ public:
     template< typename V, class Iterator, class Difference >
     void set(V const& value, Iterator const& i, Difference const& diff) const
     {
-        i.set(
+        i.set( 
             find_best_match(
-                vigra::detail::RequiresExplicitCast<value_type>::cast(value)),
+                vigra::detail::RequiresExplicitCast<value_type>::cast(value)), 
             diff );
     }
 };
@@ -965,7 +965,7 @@ class TestApp : public Application
 {
 public:
     virtual void Main();
-    virtual USHORT  Exception( USHORT nError );
+    virtual USHORT	Exception( USHORT nError );
 };
 
 class TestWindow : public Dialog
@@ -980,9 +980,9 @@ class TestWindow : public Dialog
         }
         virtual ~TestWindow() {}
         virtual void MouseButtonUp( const MouseEvent& /*rMEvt*/ )
-        {
+        { 
             //TODO: do something cool
-            EndDialog();
+            EndDialog(); 
         }
         virtual void Paint( const Rectangle& rRect );
 };
@@ -1076,16 +1076,16 @@ void TestWindow::Paint( const Rectangle& /*rRect*/ )
         ::rtl::OUString aSvg;
         basegfx::B2DPolyPolygon aPoly;
 
-        basegfx::tools::importFromSvgD( aPoly,
-                                        ::rtl::OUString::createFromAscii(
+        basegfx::tools::importFromSvgD( aPoly, 
+                                        ::rtl::OUString::createFromAscii( 
                                             "m0 0 h7 v7 h-7 z" ) );
-        basegfx::tools::importFromSvgD( aPoly,
-                                        ::rtl::OUString::createFromAscii(
+        basegfx::tools::importFromSvgD( aPoly, 
+                                        ::rtl::OUString::createFromAscii( 
                                             "m2 2 h3 v3 h-3 z" ) );
 
-        pDevice->fillPolyPolygon(
+        pDevice->fillPolyPolygon( 
             aPoly,
-            basebmp::Color(0xFFFFFFFF),
+            basebmp::Color(0xFFFFFFFF), 
             basebmp::DrawMode_PAINT );
     }
 
@@ -1101,17 +1101,17 @@ void TestWindow::Paint( const Rectangle& /*rRect*/ )
         pMask->drawLine( aPt111, aPt222, aCol333, basebmp::DrawMode_PAINT );
 
 
-        ::rtl::OUString aSvg = ::rtl::OUString::createFromAscii(
+        ::rtl::OUString aSvg = ::rtl::OUString::createFromAscii( 
             "m 0 0 h5 l5 5 v5 h-5 l-5-5 z" );
         basegfx::B2DPolyPolygon aPoly;
         basegfx::tools::importFromSvgD( aPoly, aSvg );
         pMask->clear(basebmp::Color(0xFFFFFFFF));
-        pMask->drawPolygon(
+        pMask->drawPolygon( 
             aPoly.getB2DPolygon(0),
-            basebmp::Color(0),
+            basebmp::Color(0), 
             basebmp::DrawMode_PAINT );
 
-        basebmp::BitmapDeviceSharedPtr pSubsetDevice =
+        basebmp::BitmapDeviceSharedPtr pSubsetDevice = 
             basebmp::subsetBitmapDevice( pDevice,
                                          basegfx::B2IRange(3,3,7,7) );
 
@@ -1123,7 +1123,7 @@ void TestWindow::Paint( const Rectangle& /*rRect*/ )
 
     {
         const basebmp::Color aCol(0xFFFFFFFF);
-        basegfx::B2DPolygon aRect = basegfx::tools::createPolygonFromRect(
+        basegfx::B2DPolygon aRect = basegfx::tools::createPolygonFromRect( 
             basegfx::B2DRange( 0,0,1001,1001 ));
         pDevice->drawPolygon( aRect, aCol, basebmp::DrawMode_PAINT );
 
@@ -1170,7 +1170,7 @@ void TestWindow::Paint( const Rectangle& /*rRect*/ )
             basegfx::B2DPolygon aPoly;
             aPoly.append( basegfx::B2DPoint(project( aP1 ) + aCenter) );
             aPoly.append( basegfx::B2DPoint(project( aP2 ) + aCenter) );
-            pDevice->fillPolyPolygon(
+            pDevice->fillPolyPolygon( 
                 basegfx::tools::createAreaGeometryForPolygon(
                     aPoly,
 //                    std::max(1,n/30),
@@ -1179,7 +1179,7 @@ void TestWindow::Paint( const Rectangle& /*rRect*/ )
                     basegfx::tools::B2DLINEJOIN_NONE),
                 aLineColor,
                 basebmp::DrawMode_PAINT);
-
+            
             aPoint.setX( (int)((((double)aP1.getX())*cosd - ((double)aP1.getY())*sind)*factor) );
             aPoint.setY( (int)((((double)aP1.getY())*cosd + ((double)aP1.getX())*sind)*factor) );
             aP1 = aPoint;
@@ -1194,7 +1194,7 @@ void TestWindow::Paint( const Rectangle& /*rRect*/ )
 
     // Fill bitmap with generated content
     {
-        ScopedBitmapWriteAccess pWriteAccess( aBitmap.AcquireWriteAccess(),
+        ScopedBitmapWriteAccess pWriteAccess( aBitmap.AcquireWriteAccess(), 
                                               aBitmap );
         for( int y=0; y<aTestSize.getY(); ++y )
             for( int x=0; x<aTestSize.getX(); ++x )
@@ -1225,7 +1225,7 @@ void TestApp::Main()
     try
     {
         uno::Reference< uno::XComponentContext > xCtx = ::cppu::defaultBootstrap_InitialComponentContext();
-        xFactory = uno::Reference< lang::XMultiServiceFactory >(  xCtx->getServiceManager(),
+        xFactory = uno::Reference< lang::XMultiServiceFactory >(  xCtx->getServiceManager(), 
                                                                   uno::UNO_QUERY );
         if( xFactory.is() )
             ::comphelper::setProcessServiceFactory( xFactory );
diff --git a/basebmp/test/bmpmasktest.cxx b/basebmp/test/bmpmasktest.cxx
index 9be504819fe8..536949dd33a8 100644
--- a/basebmp/test/bmpmasktest.cxx
+++ b/basebmp/test/bmpmasktest.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
diff --git a/basebmp/test/bmptest.cxx b/basebmp/test/bmptest.cxx
index 9e33f0a8d713..f168d6cad2f7 100644
--- a/basebmp/test/bmptest.cxx
+++ b/basebmp/test/bmptest.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
diff --git a/basebmp/test/cliptest.cxx b/basebmp/test/cliptest.cxx
index 875016d878cc..bae78df71d28 100644
--- a/basebmp/test/cliptest.cxx
+++ b/basebmp/test/cliptest.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
diff --git a/basebmp/test/export.map b/basebmp/test/export.map
index 3308588ef6f8..0dbbcc5a7372 100644
--- a/basebmp/test/export.map
+++ b/basebmp/test/export.map
@@ -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
diff --git a/basebmp/test/filltest.cxx b/basebmp/test/filltest.cxx
index 150fa11b3a72..9fc111696f5a 100644
--- a/basebmp/test/filltest.cxx
+++ b/basebmp/test/filltest.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
diff --git a/basebmp/test/linetest.cxx b/basebmp/test/linetest.cxx
index fcd383fccdb0..97761c02adb2 100644
--- a/basebmp/test/linetest.cxx
+++ b/basebmp/test/linetest.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
diff --git a/basebmp/test/masktest.cxx b/basebmp/test/masktest.cxx
index 77cd05588d5a..748f9379cc24 100644
--- a/basebmp/test/masktest.cxx
+++ b/basebmp/test/masktest.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
diff --git a/basebmp/test/polytest.cxx b/basebmp/test/polytest.cxx
index f3b1f0018e17..8c85af4521a4 100644
--- a/basebmp/test/polytest.cxx
+++ b/basebmp/test/polytest.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
diff --git a/basebmp/test/tools.cxx b/basebmp/test/tools.cxx
index dbc11395d715..3d2bea05165e 100644
--- a/basebmp/test/tools.cxx
+++ b/basebmp/test/tools.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
diff --git a/basebmp/test/tools.hxx b/basebmp/test/tools.hxx
index 254a988fc1bb..99d8c6bdebf2 100644
--- a/basebmp/test/tools.hxx
+++ b/basebmp/test/tools.hxx
@@ -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
diff --git a/basegfx/inc/basegfx/color/bcolor.hxx b/basegfx/inc/basegfx/color/bcolor.hxx
index db66dd8dbdee..a3feea8d0154 100644
--- a/basegfx/inc/basegfx/color/bcolor.hxx
+++ b/basegfx/inc/basegfx/color/bcolor.hxx
@@ -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
@@ -54,52 +54,52 @@ namespace basegfx
     */
     class BColor : public B3DTuple
     {
-    public:
-        /** Create a Color with red, green and blue components from [0.0 to 1.0]
+    public:					
+        /**	Create a Color with red, green and blue components from [0.0 to 1.0]
 
             The color is initialized to (0.0, 0.0, 0.0)
         */
-        BColor()
-        :   B3DTuple()
+        BColor() 
+        :	B3DTuple()
         {}
 
-        /** Create a 3D Color
+        /**	Create a 3D Color
 
             @param fRed
             @param fGreen
             @param fBlue
             These parameters are used to initialize the red, green and blue intensities of the color
         */
-        BColor(double fRed, double fGreen, double fBlue)
-        :   B3DTuple(fRed, fGreen, fBlue)
+        BColor(double fRed, double fGreen, double fBlue) 
+        :	B3DTuple(fRed, fGreen, fBlue)
         {}
 
-        /** Create a 3D Color
+        /**	Create a 3D Color
 
             @param fLuminosity
             The parameter is used to initialize the red, green and blue intensities of the color
         */
-        BColor(double fLuminosity)
-        :   B3DTuple(fLuminosity, fLuminosity, fLuminosity)
+        BColor(double fLuminosity) 
+        :	B3DTuple(fLuminosity, fLuminosity, fLuminosity)
         {}
 
-        /** Create a copy of a Color
+        /**	Create a copy of a Color
 
             @param rVec
             The Color which will be copied.
         */
-        BColor(const BColor& rVec)
-        :   B3DTuple(rVec)
+        BColor(const BColor& rVec) 
+        :	B3DTuple(rVec)
         {}
 
         /** constructor with tuple to allow copy-constructing
             from B3DTuple-based classes
         */
-        BColor(const ::basegfx::B3DTuple& rTuple)
-        :   B3DTuple(rTuple)
+        BColor(const ::basegfx::B3DTuple& rTuple) 
+        :	B3DTuple(rTuple)
         {}
 
-        ~BColor()
+        ~BColor() 
         {}
 
         // data access read
@@ -114,33 +114,33 @@ namespace basegfx
 
         /** *=operator to allow usage from BColor, too
         */
-        BColor& operator*=( const BColor& rPnt )
-        {
+        BColor& operator*=( const BColor& rPnt ) 
+        { 
             mfX *= rPnt.mfX;
-            mfY *= rPnt.mfY;
-            mfZ *= rPnt.mfZ;
-            return *this;
+            mfY *= rPnt.mfY; 
+            mfZ *= rPnt.mfZ; 
+            return *this; 
         }
 
         /** *=operator to allow usage from BColor, too
         */
-        BColor& operator*=(double t)
-        {
-            mfX *= t;
-            mfY *= t;
-            mfZ *= t;
-            return *this;
+        BColor& operator*=(double t) 
+        { 
+            mfX *= t; 
+            mfY *= t; 
+            mfZ *= t; 
+            return *this; 
         }
 
         /** assignment operator to allow assigning the results
             of B3DTuple calculations
         */
-        BColor& operator=( const ::basegfx::B3DTuple& rVec )
-        {
+        BColor& operator=( const ::basegfx::B3DTuple& rVec ) 
+        { 
             mfX = rVec.getX();
-            mfY = rVec.getY();
-            mfZ = rVec.getZ();
-            return *this;
+            mfY = rVec.getY(); 
+            mfZ = rVec.getZ(); 
+            return *this; 
         }
 
         // blend to another color using luminance
diff --git a/basegfx/inc/basegfx/color/bcolormodifier.hxx b/basegfx/inc/basegfx/color/bcolormodifier.hxx
index 962da760f850..c50b450d6fd8 100644
--- a/basegfx/inc/basegfx/color/bcolormodifier.hxx
+++ b/basegfx/inc/basegfx/color/bcolormodifier.hxx
@@ -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
@@ -35,32 +35,32 @@
 
 namespace basegfx
 {
-    /** Descriptor for type of color modification
+    /**	Descriptor for type of color modification
     */
     enum BColorModifyMode
     {
-        BCOLORMODIFYMODE_REPLACE,       // replace all color with local color
-        BCOLORMODIFYMODE_INTERPOLATE,   // interpolate color between given and local with local value
-        BCOLORMODIFYMODE_GRAY,          // convert color to gray
-        BCOLORMODIFYMODE_BLACKANDWHITE  // convert color to B&W, local value is treshhold
+        BCOLORMODIFYMODE_REPLACE,		// replace all color with local color
+        BCOLORMODIFYMODE_INTERPOLATE,	// interpolate color between given and local with local value
+        BCOLORMODIFYMODE_GRAY,			// convert color to gray
+        BCOLORMODIFYMODE_BLACKANDWHITE	// convert color to B&W, local value is treshhold
     };
 
-    /** Class to hold a color, value and mode for a color modification. Color modification is
+    /**	Class to hold a color, value and mode for a color modification. Color modification is
         done calling the getModifiedColor() method
     */
     class BColorModifier
     {
     protected:
-        ::basegfx::BColor                           maBColor;
-        double                                      mfValue;
-        BColorModifyMode                            meMode;
+        ::basegfx::BColor							maBColor;
+        double										mfValue;
+        BColorModifyMode							meMode;
 
     public:
         BColorModifier(
-            const ::basegfx::BColor& rBColor,
-            double fValue = 0.5,
+            const ::basegfx::BColor& rBColor, 
+            double fValue = 0.5, 
             BColorModifyMode eMode = BCOLORMODIFYMODE_REPLACE)
-        :   maBColor(rBColor),
+        :	maBColor(rBColor),
             mfValue(fValue),
             meMode(eMode)
         {}
@@ -71,9 +71,9 @@ namespace basegfx
             return (maBColor == rCompare.maBColor && mfValue == rCompare.mfValue && meMode == rCompare.meMode);
         }
 
-        bool operator!=(const BColorModifier& rCompare) const
-        {
-            return !(operator==(rCompare));
+        bool operator!=(const BColorModifier& rCompare) const 
+        { 
+            return !(operator==(rCompare)); 
         }
 
         // data access
@@ -85,13 +85,13 @@ namespace basegfx
         ::basegfx::BColor getModifiedColor(const ::basegfx::BColor& aSourceColor) const;
     };
 
-    /** Class to hold a stack of BColorModifiers and to get the modified color with
+    /**	Class to hold a stack of BColorModifiers and to get the modified color with
         applying all existing entry changes
     */
     class BColorModifierStack
     {
     protected:
-        ::std::vector< BColorModifier >             maBColorModifiers;
+        ::std::vector< BColorModifier >				maBColorModifiers;
 
     public:
         sal_uInt32 count() const
@@ -125,14 +125,14 @@ namespace basegfx
             }
         }
 
-        void push(const BColorModifier& rNew)
-        {
-            maBColorModifiers.push_back(rNew);
+        void push(const BColorModifier& rNew) 
+        { 
+            maBColorModifiers.push_back(rNew); 
         }
 
-        void pop()
-        {
-            maBColorModifiers.pop_back();
+        void pop() 
+        { 
+            maBColorModifiers.pop_back(); 
         }
     };
 } // end of namespace basegfx
diff --git a/basegfx/inc/basegfx/color/bcolortools.hxx b/basegfx/inc/basegfx/color/bcolortools.hxx
index 9121b145afa7..f8d13eb5f1b2 100644
--- a/basegfx/inc/basegfx/color/bcolortools.hxx
+++ b/basegfx/inc/basegfx/color/bcolortools.hxx
@@ -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
diff --git a/basegfx/inc/basegfx/curve/b2dbeziertools.hxx b/basegfx/inc/basegfx/curve/b2dbeziertools.hxx
index 3cc34fec5482..33c76b4d0b04 100644
--- a/basegfx/inc/basegfx/curve/b2dbeziertools.hxx
+++ b/basegfx/inc/basegfx/curve/b2dbeziertools.hxx
@@ -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
@@ -46,8 +46,8 @@ namespace basegfx
     class B2DCubicBezierHelper
     {
     private:
-        ::std::vector< double >         maLengthArray;
-        sal_uInt32                      mnEdgeCount;
+        ::std::vector< double >			maLengthArray;
+        sal_uInt32						mnEdgeCount;
 
     public:
         B2DCubicBezierHelper(const B2DCubicBezier& rBase, sal_uInt32 nDivisions = 9);
diff --git a/basegfx/inc/basegfx/curve/b2dcubicbezier.hxx b/basegfx/inc/basegfx/curve/b2dcubicbezier.hxx
index ea58a0a50b80..41ae7a388ad5 100644
--- a/basegfx/inc/basegfx/curve/b2dcubicbezier.hxx
+++ b/basegfx/inc/basegfx/curve/b2dcubicbezier.hxx
@@ -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
@@ -45,12 +45,12 @@ namespace basegfx
 {
     class B2DCubicBezier
     {
-        B2DPoint                                        maStartPoint;
-        B2DPoint                                        maEndPoint;
-        B2DPoint                                        maControlPointA;
-        B2DPoint                                        maControlPointB;
+        B2DPoint										maStartPoint;
+        B2DPoint										maEndPoint;
+        B2DPoint										maControlPointA;
+        B2DPoint										maControlPointB;
 
-    public:
+    public:		
         B2DCubicBezier();
         B2DCubicBezier(const B2DCubicBezier& rBezier);
         B2DCubicBezier(const B2DPoint& rStart, const B2DPoint& rEnd);
@@ -71,7 +71,7 @@ namespace basegfx
         // test if contained bezier is trivial and reset vectors accordingly
         void testAndSolveTrivialBezier();
 
-        /** get length of edge
+        /** get length of edge 
 
             This method handles beziers and simple edges. For
             beziers, the deviation describes the maximum allowed
@@ -100,10 +100,10 @@ namespace basegfx
         // data interface
         B2DPoint getStartPoint() const { return maStartPoint; }
         void setStartPoint(const B2DPoint& rValue) { maStartPoint = rValue; }
-
+        
         B2DPoint getEndPoint() const { return maEndPoint; }
         void setEndPoint(const B2DPoint& rValue) { maEndPoint = rValue; }
-
+        
         B2DPoint getControlPointA() const { return maControlPointA; }
         void setControlPointA(const B2DPoint& rValue) { maControlPointA = rValue; }
 
@@ -146,14 +146,14 @@ namespace basegfx
             value.
             No start point is added, but all necessary created edges
             and the end point
-
+            
             @param rPoly
             Output polygon. The subdivided bezier segment is added to
             this polygon via B2DPolygon::append().
-
+            
             @param rCurve
             The cubic bezier curve to subdivide
-
+            
             @param fDistanceBound
             Bound on the maximal distance of the approximation to the
             true curve.
diff --git a/basegfx/inc/basegfx/curve/b2dquadraticbezier.hxx b/basegfx/inc/basegfx/curve/b2dquadraticbezier.hxx
index 08cd6be59c78..2ca4149a5775 100644
--- a/basegfx/inc/basegfx/curve/b2dquadraticbezier.hxx
+++ b/basegfx/inc/basegfx/curve/b2dquadraticbezier.hxx
@@ -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
@@ -36,15 +36,15 @@ namespace basegfx
 {
     class B2DQuadraticBezier
     {
-        ::basegfx::B2DPoint                         maStartPoint;
-        ::basegfx::B2DPoint                         maEndPoint;
-        ::basegfx::B2DPoint                         maControlPoint;
+        ::basegfx::B2DPoint							maStartPoint;
+        ::basegfx::B2DPoint							maEndPoint;
+        ::basegfx::B2DPoint							maControlPoint;
 
-    public:
+    public:		
         B2DQuadraticBezier();
         B2DQuadraticBezier(const B2DQuadraticBezier& rBezier);
         B2DQuadraticBezier(const ::basegfx::B2DPoint& rStart, const ::basegfx::B2DPoint& rEnd);
-        B2DQuadraticBezier(const ::basegfx::B2DPoint& rStart,
+        B2DQuadraticBezier(const ::basegfx::B2DPoint& rStart, 
             const ::basegfx::B2DPoint& rControlPoint, const ::basegfx::B2DPoint& rEnd);
         ~B2DQuadraticBezier();
 
@@ -61,10 +61,10 @@ namespace basegfx
         // data interface
         ::basegfx::B2DPoint getStartPoint() const { return maStartPoint; }
         void setStartPoint(const ::basegfx::B2DPoint& rValue) { maStartPoint = rValue; }
-
+        
         ::basegfx::B2DPoint getEndPoint() const { return maEndPoint; }
         void setEndPoint(const ::basegfx::B2DPoint& rValue) { maEndPoint = rValue; }
-
+        
         ::basegfx::B2DPoint getControlPoint() const { return maControlPoint; }
         void setControlPoint(const ::basegfx::B2DPoint& rValue) { maControlPoint = rValue; }
     };
diff --git a/basegfx/inc/basegfx/matrix/b2dhommatrix.hxx b/basegfx/inc/basegfx/matrix/b2dhommatrix.hxx
index 910224897301..2e2a874bf025 100644
--- a/basegfx/inc/basegfx/matrix/b2dhommatrix.hxx
+++ b/basegfx/inc/basegfx/matrix/b2dhommatrix.hxx
@@ -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
@@ -128,14 +128,14 @@ namespace basegfx
     };
 
     // Addition, Subtraktion
-    inline B2DHomMatrix operator+(const B2DHomMatrix& rMatA, const B2DHomMatrix& rMatB)
+    inline B2DHomMatrix	operator+(const B2DHomMatrix& rMatA, const B2DHomMatrix& rMatB)
     {
         B2DHomMatrix aSum(rMatA);
         aSum += rMatB;
         return aSum;
     }
 
-    inline B2DHomMatrix operator-(const B2DHomMatrix& rMatA, const B2DHomMatrix& rMatB)
+    inline B2DHomMatrix	operator-(const B2DHomMatrix& rMatA, const B2DHomMatrix& rMatB)
     {
         B2DHomMatrix aDiv(rMatA);
         aDiv -= rMatB;
@@ -143,21 +143,21 @@ namespace basegfx
     }
 
     // Multiplikation, Division mit Konstante
-    inline B2DHomMatrix operator*(const B2DHomMatrix& rMat, double fValue)
+    inline B2DHomMatrix	operator*(const B2DHomMatrix& rMat, double fValue)
     {
-        B2DHomMatrix aNew(rMat);
-        aNew *= fValue;
-        return aNew;
+        B2DHomMatrix aNew(rMat); 
+        aNew *= fValue; 
+        return aNew; 
     }
 
-    inline B2DHomMatrix operator/(const B2DHomMatrix& rMat, double fValue)
+    inline B2DHomMatrix	operator/(const B2DHomMatrix& rMat, double fValue)
     {
-        B2DHomMatrix aNew(rMat);
+        B2DHomMatrix aNew(rMat); 
         aNew *= 1.0 / fValue;
-        return aNew;
+        return aNew; 
     }
 
-    inline B2DHomMatrix operator*(const B2DHomMatrix& rMatA, const B2DHomMatrix& rMatB)
+    inline B2DHomMatrix	operator*(const B2DHomMatrix& rMatA, const B2DHomMatrix& rMatB)
     {
         B2DHomMatrix aMul(rMatB);
         aMul *= rMatA;
diff --git a/basegfx/inc/basegfx/matrix/b2dhommatrixtools.hxx b/basegfx/inc/basegfx/matrix/b2dhommatrixtools.hxx
index 7ce9e75c3058..35a2160df299 100644
--- a/basegfx/inc/basegfx/matrix/b2dhommatrixtools.hxx
+++ b/basegfx/inc/basegfx/matrix/b2dhommatrixtools.hxx
@@ -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
@@ -41,11 +41,11 @@ namespace basegfx
     namespace tools
     {
         /** If the rotation angle is an approximate multiple of pi/2,
-            force fSin/fCos to -1/0/1, to maintain orthogonality (which
-            might also be advantageous for the other cases, but: for
-            multiples of pi/2, the exact values _can_ be attained. It
-            would be largely unintuitive, if a 180 degrees rotation
-            would introduce slight roundoff errors, instead of exactly
+            force fSin/fCos to -1/0/1, to maintain orthogonality (which 
+            might also be advantageous for the other cases, but: for 
+            multiples of pi/2, the exact values _can_ be attained. It 
+            would be largely unintuitive, if a 180 degrees rotation 
+            would introduce slight roundoff errors, instead of exactly 
             mirroring the coordinate system)
          */
         void createSinCosOrthogonal(double& o_rSin, double& rCos, double fRadiant);
@@ -163,12 +163,12 @@ namespace basegfx
             }
 
             // data access
-            B2DHomMatrix getB2DHomMatrix() const
+            B2DHomMatrix getB2DHomMatrix() const 
             {
                 return createScaleShearXRotateTranslateB2DHomMatrix(
                     maScale, mfShearX, mfRotate, maTranslate);
             }
-
+            
             const B2DVector& getScale() const { return maScale; }
             const B2DVector& getTranslate() const { return maTranslate; }
             double getRotate() const { return mfRotate; }
diff --git a/basegfx/inc/basegfx/matrix/b3dhommatrix.hxx b/basegfx/inc/basegfx/matrix/b3dhommatrix.hxx
index bc35fcde321e..fc0c0f6ff4e6 100644
--- a/basegfx/inc/basegfx/matrix/b3dhommatrix.hxx
+++ b/basegfx/inc/basegfx/matrix/b3dhommatrix.hxx
@@ -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
@@ -101,7 +101,7 @@ namespace basegfx
         void frustum(double fLeft = -1.0, double fRight = 1.0,
             double fBottom = -1.0, double fTop = 1.0,
             double fNear = 0.001, double fFar = 1.0);
-
+        
         void ortho(double fLeft = -1.0, double fRight = 1.0,
             double fBottom = -1.0, double fTop = 1.0,
             double fNear = 0.0, double fFar = 1.0);
@@ -135,14 +135,14 @@ namespace basegfx
     };
 
     // addition, subtraction
-    inline B3DHomMatrix operator+(const B3DHomMatrix& rMatA, const B3DHomMatrix& rMatB)
+    inline B3DHomMatrix	operator+(const B3DHomMatrix& rMatA, const B3DHomMatrix& rMatB)
     {
         B3DHomMatrix aSum(rMatA);
         aSum += rMatB;
         return aSum;
     }
 
-    inline B3DHomMatrix operator-(const B3DHomMatrix& rMatA, const B3DHomMatrix& rMatB)
+    inline B3DHomMatrix	operator-(const B3DHomMatrix& rMatA, const B3DHomMatrix& rMatB)
     {
         B3DHomMatrix aDiv(rMatA);
         aDiv -= rMatB;
@@ -150,21 +150,21 @@ namespace basegfx
     }
 
     // multiplication, division by constant value
-    inline B3DHomMatrix operator*(const B3DHomMatrix& rMat, double fValue)
+    inline B3DHomMatrix	operator*(const B3DHomMatrix& rMat, double fValue)
     {
-        B3DHomMatrix aNew(rMat);
-        aNew *= fValue;
-        return aNew;
+        B3DHomMatrix aNew(rMat); 
+        aNew *= fValue; 
+        return aNew; 
     }
 
-    inline B3DHomMatrix operator/(const B3DHomMatrix& rMat, double fValue)
+    inline B3DHomMatrix	operator/(const B3DHomMatrix& rMat, double fValue)
     {
-        B3DHomMatrix aNew(rMat);
+        B3DHomMatrix aNew(rMat); 
         aNew *= 1.0 / fValue;
-        return aNew;
+        return aNew; 
     }
 
-    inline B3DHomMatrix operator*(const B3DHomMatrix& rMatA, const B3DHomMatrix& rMatB)
+    inline B3DHomMatrix	operator*(const B3DHomMatrix& rMatA, const B3DHomMatrix& rMatB)
     {
         B3DHomMatrix aMul(rMatB);
         aMul *= rMatA;
diff --git a/basegfx/inc/basegfx/numeric/ftools.hxx b/basegfx/inc/basegfx/numeric/ftools.hxx
index 65a6566dae25..9cf5e3d9ab6e 100644
--- a/basegfx/inc/basegfx/numeric/ftools.hxx
+++ b/basegfx/inc/basegfx/numeric/ftools.hxx
@@ -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
@@ -34,25 +34,25 @@
 // standard PI defines from solar.h, but we do not want to link against tools
 
 #ifndef F_PI
-#define F_PI        M_PI
+#define F_PI		M_PI
 #endif
 #ifndef F_PI2
-#define F_PI2       M_PI_2
+#define F_PI2		M_PI_2
 #endif
 #ifndef F_PI4
-#define F_PI4       M_PI_4
+#define F_PI4		M_PI_4
 #endif
 #ifndef F_PI180
-#define F_PI180     (M_PI/180.0)
+#define F_PI180 	(M_PI/180.0)
 #endif
 #ifndef F_PI1800
-#define F_PI1800    (M_PI/1800.0)
+#define F_PI1800	(M_PI/1800.0)
 #endif
 #ifndef F_PI18000
-#define F_PI18000   (M_PI/18000.0)
+#define F_PI18000	(M_PI/18000.0)
 #endif
 #ifndef F_2PI
-#define F_2PI       (2.0*M_PI)
+#define F_2PI		(2.0*M_PI)
 #endif
 
 //////////////////////////////////////////////////////////////////////////////
@@ -67,16 +67,16 @@ namespace basegfx
     inline sal_Int32 fround( double fVal )
     {
         return fVal > 0.0 ? static_cast<sal_Int32>( fVal + .5 ) : -static_cast<sal_Int32>( -fVal + .5 );
-    }
+    } 
 
     /** Round double to nearest integer
-
-        @return the nearest 64 bit integer
+        
+        @return the nearest 64 bit integer 
     */
     inline sal_Int64 fround64( double fVal )
     {
         return fVal > 0.0 ? static_cast<sal_Int64>( fVal + .5 ) : -static_cast<sal_Int64>( -fVal + .5 );
-    }
+    } 
 
     /** Prune a small epsilon range around zero.
 
@@ -97,9 +97,9 @@ namespace basegfx
         // just use the full comparison. I keep the original here, maybe there will be a better
         // solution some day.
         //
-        //return fVal < 0.0 ?
+        //return fVal < 0.0 ? 
         //    (::std::min(fVal,-0.00001)) :
-        //    (::std::max(fVal,0.00001));
+        //    (::std::max(fVal,0.00001)); 
 
         if(fVal < 0.0)
             return (fVal < -0.00001 ? fVal : -0.00001);
@@ -127,17 +127,17 @@ namespace basegfx
 
     /** Convert value from degrees to radians
      */
-    inline double deg2rad( double v )
-    {
+    inline double deg2rad( double v ) 
+    { 
         // divide first, to get exact values for v being a multiple of
         // 90 degrees
-        return v / 90.0 * M_PI_2;
+        return v / 90.0 * M_PI_2; 
     }
 
     /** Convert value radians to degrees
      */
-    inline double rad2deg( double v )
-    {
+    inline double rad2deg( double v ) 
+    { 
         // divide first, to get exact values for v being a multiple of
         // pi/2
         return v / M_PI_2 * 90.0;
@@ -147,7 +147,7 @@ namespace basegfx
     class fTools
     {
         /// Threshold value for equalZero()
-        static double                                   mfSmallValue;
+        static double									mfSmallValue;
 
     public:
         /// Get threshold value for equalZero and friends
@@ -156,46 +156,46 @@ namespace basegfx
         static void setSmallValue(const double& rfNew) { mfSmallValue = rfNew; }
 
         /// Compare against small value
-        static bool equalZero(const double& rfVal)
-        {
-            return (fabs(rfVal) <= getSmallValue());
+        static bool equalZero(const double& rfVal) 
+        { 
+            return (fabs(rfVal) <= getSmallValue()); 
         }
 
         /// Compare against given small value
-        static bool equalZero(const double& rfVal, const double& rfSmallValue)
-        {
-            return (fabs(rfVal) <= rfSmallValue);
+        static bool equalZero(const double& rfVal, const double& rfSmallValue) 
+        { 
+            return (fabs(rfVal) <= rfSmallValue); 
         }
 
-        static bool equal(const double& rfValA, const double& rfValB)
-        {
+        static bool equal(const double& rfValA, const double& rfValB) 
+        { 
             // changed to approxEqual usage for better numerical correctness
             return rtl::math::approxEqual(rfValA, rfValB);
         }
 
-        static bool equal(const double& rfValA, const double& rfValB, const double& rfSmallValue)
-        {
-            return (fabs(rfValA - rfValB) <= rfSmallValue);
+        static bool equal(const double& rfValA, const double& rfValB, const double& rfSmallValue) 
+        { 
+            return (fabs(rfValA - rfValB) <= rfSmallValue); 
         }
 
-        static bool less(const double& rfValA, const double& rfValB)
-        {
-            return (rfValA < rfValB && !equal(rfValA, rfValB));
+        static bool less(const double& rfValA, const double& rfValB) 
+        { 
+            return (rfValA < rfValB && !equal(rfValA, rfValB)); 
         }
 
-        static bool lessOrEqual(const double& rfValA, const double& rfValB)
-        {
-            return (rfValA < rfValB || equal(rfValA, rfValB));
+        static bool lessOrEqual(const double& rfValA, const double& rfValB) 
+        { 
+            return (rfValA < rfValB || equal(rfValA, rfValB)); 
         }
 
-        static bool more(const double& rfValA, const double& rfValB)
-        {
-            return (rfValA > rfValB && !equal(rfValA, rfValB));
+        static bool more(const double& rfValA, const double& rfValB) 
+        { 
+            return (rfValA > rfValB && !equal(rfValA, rfValB)); 
         }
 
-        static bool moreOrEqual(const double& rfValA, const double& rfValB)
-        {
-            return (rfValA > rfValB || equal(rfValA, rfValB));
+        static bool moreOrEqual(const double& rfValA, const double& rfValB) 
+        { 
+            return (rfValA > rfValB || equal(rfValA, rfValB)); 
         }
     };
 } // end of namespace basegfx
diff --git a/basegfx/inc/basegfx/pixel/bpixel.hxx b/basegfx/inc/basegfx/pixel/bpixel.hxx
index 2684ff44e5d6..84af578f4b52 100644
--- a/basegfx/inc/basegfx/pixel/bpixel.hxx
+++ b/basegfx/inc/basegfx/pixel/bpixel.hxx
@@ -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
@@ -47,16 +47,16 @@ namespace basegfx
             struct
             {
                 // bitfield
-                unsigned                                mnR : 8;        // red intensity
-                unsigned                                mnG : 8;        // green intensity
-                unsigned                                mnB : 8;        // blue intensity
-                unsigned                                mnO : 8;        // opacity, 0 == full transparence
+                unsigned								mnR : 8;		// red intensity
+                unsigned								mnG : 8;		// green intensity
+                unsigned								mnB : 8;		// blue intensity
+                unsigned								mnO : 8;		// opacity, 0 == full transparence
             } maRGBO;
-
+            
             struct
             {
                 // bitfield
-                unsigned                                mnValue : 32;   // all values
+                unsigned								mnValue : 32;	// all values
             } maCombinedRGBO;
         } maPixelUnion;
 
@@ -96,10 +96,10 @@ namespace basegfx
         {}
 
         // assignment operator
-        BPixel& operator=( const BPixel& rPixel )
-        {
+        BPixel& operator=( const BPixel& rPixel ) 
+        { 
             maPixelUnion.maCombinedRGBO.mnValue = rPixel.maPixelUnion.maCombinedRGBO.mnValue;
-            return *this;
+            return *this; 
         }
 
         // data access read
@@ -123,13 +123,13 @@ namespace basegfx
         bool isEmpty() const { return isInvisible(); }
         bool isUsed() const { return isVisible(); }
 
-        bool operator==( const BPixel& rPixel ) const
-        {
+        bool operator==( const BPixel& rPixel ) const 
+        { 
             return (rPixel.maPixelUnion.maCombinedRGBO.mnValue == maPixelUnion.maCombinedRGBO.mnValue);
         }
 
-        bool operator!=( const BPixel& rPixel ) const
-        {
+        bool operator!=( const BPixel& rPixel ) const 
+        { 
             return (rPixel.maPixelUnion.maCombinedRGBO.mnValue != maPixelUnion.maCombinedRGBO.mnValue);
         }
 
@@ -140,28 +140,28 @@ namespace basegfx
     //////////////////////////////////////////////////////////////////////////
     // external operators
 
-    inline BPixel minimum(const BPixel& rTupA, const BPixel& rTupB)
-    {
+    inline BPixel minimum(const BPixel& rTupA, const BPixel& rTupB) 
+    { 
         BPixel aMin(
             (rTupB.getRed() < rTupA.getRed()) ? rTupB.getRed() : rTupA.getRed(),
             (rTupB.getGreen() < rTupA.getGreen()) ? rTupB.getGreen() : rTupA.getGreen(),
             (rTupB.getBlue() < rTupA.getBlue()) ? rTupB.getBlue() : rTupA.getBlue(),
-            (rTupB.getOpacity() < rTupA.getOpacity()) ? rTupB.getOpacity() : rTupA.getOpacity());
+            (rTupB.getOpacity() < rTupA.getOpacity()) ? rTupB.getOpacity() : rTupA.getOpacity()); 
         return aMin;
     }
 
-    inline BPixel maximum(const BPixel& rTupA, const BPixel& rTupB)
-    {
+    inline BPixel maximum(const BPixel& rTupA, const BPixel& rTupB) 
+    { 
         BPixel aMax(
             (rTupB.getRed() > rTupA.getRed()) ? rTupB.getRed() : rTupA.getRed(),
             (rTupB.getGreen() > rTupA.getGreen()) ? rTupB.getGreen() : rTupA.getGreen(),
             (rTupB.getBlue() > rTupA.getBlue()) ? rTupB.getBlue() : rTupA.getBlue(),
-            (rTupB.getOpacity() > rTupA.getOpacity()) ? rTupB.getOpacity() : rTupA.getOpacity());
+            (rTupB.getOpacity() > rTupA.getOpacity()) ? rTupB.getOpacity() : rTupA.getOpacity()); 
         return aMax;
     }
 
-    inline BPixel interpolate(const BPixel& rOld1, const BPixel& rOld2, double t)
-    {
+    inline BPixel interpolate(const BPixel& rOld1, const BPixel& rOld2, double t) 
+    { 
         if(rOld1 == rOld2)
         {
             return rOld1;
@@ -186,8 +186,8 @@ namespace basegfx
         }
     }
 
-    inline BPixel average(const BPixel& rOld1, const BPixel& rOld2)
-    {
+    inline BPixel average(const BPixel& rOld1, const BPixel& rOld2) 
+    { 
         if(rOld1 == rOld2)
         {
             return rOld1;
@@ -201,9 +201,9 @@ namespace basegfx
                 (sal_uInt8)(((sal_uInt32)rOld1.getOpacity() + (sal_uInt32)rOld2.getOpacity()) >> 1L));
         }
     }
-
+    
     inline BPixel average(const BPixel& rOld1, const BPixel& rOld2, const BPixel& rOld3)
-    {
+    { 
         if(rOld1 == rOld2 && rOld2 == rOld3)
         {
             return rOld1;
diff --git a/basegfx/inc/basegfx/point/b2dhompoint.hxx b/basegfx/inc/basegfx/point/b2dhompoint.hxx
index 254ee9251dd3..4e66c43f119e 100644
--- a/basegfx/inc/basegfx/point/b2dhompoint.hxx
+++ b/basegfx/inc/basegfx/point/b2dhompoint.hxx
@@ -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
@@ -49,18 +49,18 @@ namespace basegfx
     {
     protected:
         /// This member contains the coordinate part of the point
-        ::basegfx::B2DTuple                 maTuple;
+        ::basegfx::B2DTuple					maTuple;
 
         /// This Member holds the homogenous part of the point
-        double                                      mfW;
+        double										mfW;
 
-        /** Test if this homogen point does have a homogenous part
+        /**	Test if this homogen point does have a homogenous part
 
             @return Returns true if this point has no homogenous part
         */
         bool implIsHomogenized() const;
-
-        /** Remove homogenous part of this Point
+        
+        /**	Remove homogenous part of this Point
 
             This method does necessary calculations to remove
             the evtl. homogenous part of this Point. This may
@@ -68,7 +68,7 @@ namespace basegfx
         */
         void implHomogenize();
 
-        /** Test and on demand remove homogenous part
+        /**	Test and on demand remove homogenous part
 
             This method tests if this Point does have a homogenous part
             and then evtl. takes actions to remove that part.
@@ -80,87 +80,87 @@ namespace basegfx
         */
         void implTestAndHomogenize() const;
 
-    public:
-        /** Create a homogen point
+    public:					
+        /**	Create a homogen point
 
             The point is initialized to (0.0, 0.0)
         */
-        B2DHomPoint()
-        :   maTuple(),
+        B2DHomPoint() 
+        :	maTuple(),
             mfW(1.0)
         {}
 
-        /** Create a homogen point
+        /**	Create a homogen point
 
             @param fX
             This parameter is used to initialize the X-coordinate
             of the Point. The homogenous part is initialized to 1.0.
-
+            
             @param fY
             This parameter is used to initialize the Y-coordinate
             of the Point. The homogenous part is initialized to 1.0.
         */
-        B2DHomPoint(double fX, double fY)
-        :   maTuple(fX, fY),
+        B2DHomPoint(double fX, double fY) 
+        :	maTuple(fX, fY),
             mfW(1.0)
         {}
 
-        /** Create a copy of a 2D Point
+        /**	Create a copy of a 2D Point
 
             @param rVec
-            The 2D point which will be copied. The homogenous part
+            The 2D point which will be copied. The homogenous part 
             is initialized to 1.0.
         */
-        B2DHomPoint(const B2DPoint& rVec)
-        :   maTuple(rVec),
+        B2DHomPoint(const B2DPoint& rVec) 
+        :	maTuple(rVec),
             mfW(1.0)
         {}
 
-        /** Create a copy of a homogen point
+        /**	Create a copy of a homogen point
 
             @param rVec
-            The homogen point which will be copied. The homogenous part
+            The homogen point which will be copied. The homogenous part 
             is copied, too.
         */
-        B2DHomPoint(const B2DHomPoint& rVec)
-        :   maTuple(rVec.maTuple.getX(), rVec.maTuple.getY()),
+        B2DHomPoint(const B2DHomPoint& rVec) 
+        :	maTuple(rVec.maTuple.getX(), rVec.maTuple.getY()),
             mfW(rVec.mfW)
         {}
 
-        ~B2DHomPoint()
+        ~B2DHomPoint() 
         {}
 
-        /** Get a 2D point from this homogenous point
+        /**	Get a 2D point from this homogenous point
 
             This method normalizes this homogen point if necessary and
             returns the corresponding 2D point for this homogen point.
-
+            
             @attention Even when this method is const it may change all
             members of this instance.
         */
         B2DPoint getB2DPoint() const;
 
-        /** Get X-coordinate
+        /**	Get X-coordinate
 
             This method normalizes this homogen point if necessary and
             returns the corresponding X-coordinate for this homogen point.
-
+            
             @attention Even when this method is const it may change all
             members of this instance.
         */
         double getX() const;
 
-        /** Get Y-coordinate
+        /**	Get Y-coordinate
 
             This method normalizes this homogen point if necessary and
             returns the corresponding Y-coordinate for this homogen point.
-
+            
             @attention Even when this method is const it may change all
             members of this instance.
         */
         double getY() const;
 
-        /** Set X-coordinate of the homogen point.
+        /**	Set X-coordinate of the homogen point.
 
             This method sets the X-coordinate of the homogen point. If
             the point does have a homogenous part this is taken into account.
@@ -170,7 +170,7 @@ namespace basegfx
         */
         void setX(double fX);
 
-        /** Set Y-coordinate of the homogen point.
+        /**	Set Y-coordinate of the homogen point.
 
             This method sets the Y-coordinate of the homogen point. If
             the point does have a homogenous part this is taken into account.
@@ -186,7 +186,7 @@ namespace basegfx
         B2DHomPoint& operator+=( const B2DHomPoint& rPnt );
 
         B2DHomPoint& operator-=( const B2DHomPoint& rPnt );
-
+        
         B2DHomPoint& operator*=(double t);
 
         B2DHomPoint& operator*=( const B2DHomMatrix& rMat );
@@ -194,11 +194,11 @@ namespace basegfx
         B2DHomPoint& operator/=(double t);
 
         B2DHomPoint& operator-(void);
-
+        
         bool operator==( const B2DHomPoint& rPnt ) const;
 
         bool operator!=( const B2DHomPoint& rPnt ) const;
-
+        
         B2DHomPoint& operator=( const B2DHomPoint& rPnt );
     };
 
@@ -214,7 +214,7 @@ namespace basegfx
     B2DHomPoint interpolate(B2DHomPoint& rOld1, B2DHomPoint& rOld2, double t);
 
     B2DHomPoint average(B2DHomPoint& rOld1, B2DHomPoint& rOld2);
-
+    
     B2DHomPoint average(B2DHomPoint& rOld1, B2DHomPoint& rOld2, B2DHomPoint& rOld3);
 
     B2DHomPoint operator+(const B2DHomPoint& rVecA, const B2DHomPoint& rVecB);
diff --git a/basegfx/inc/basegfx/point/b2dpoint.hxx b/basegfx/inc/basegfx/point/b2dpoint.hxx
index 273a1c54e3ba..41587c868b9c 100644
--- a/basegfx/inc/basegfx/point/b2dpoint.hxx
+++ b/basegfx/inc/basegfx/point/b2dpoint.hxx
@@ -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
@@ -48,73 +48,73 @@ namespace basegfx
     */
     class B2DPoint : public ::basegfx::B2DTuple
     {
-    public:
-        /** Create a 2D Point
+    public:					
+        /**	Create a 2D Point
 
             The point is initialized to (0.0, 0.0)
         */
-        B2DPoint()
-        :   B2DTuple()
+        B2DPoint() 
+        :	B2DTuple()
         {}
 
-        /** Create a 2D Point
+        /**	Create a 2D Point
 
             @param fX
             This parameter is used to initialize the X-coordinate
             of the 2D Point.
-
+            
             @param fY
             This parameter is used to initialize the Y-coordinate
             of the 2D Point.
         */
-        B2DPoint(double fX, double fY)
-        :   B2DTuple(fX, fY)
+        B2DPoint(double fX, double fY) 
+        :	B2DTuple(fX, fY)
         {}
 
-        /** Create a copy of a 2D Point
+        /**	Create a copy of a 2D Point
 
             @param rPoint
             The 2D Point which will be copied.
         */
-        B2DPoint(const B2DPoint& rPoint)
-        :   B2DTuple(rPoint)
+        B2DPoint(const B2DPoint& rPoint) 
+        :	B2DTuple(rPoint)
         {}
 
-        /** Create a copy of a 2D Point
+        /**	Create a copy of a 2D Point
 
             @param rPoint
             The 2D Point which will be copied.
         */
-        B2DPoint(const ::basegfx::B2IPoint& rPoint)
-        :   B2DTuple(rPoint)
+        B2DPoint(const ::basegfx::B2IPoint& rPoint) 
+        :	B2DTuple(rPoint)
         {}
 
         /** constructor with tuple to allow copy-constructing
             from B2DTuple-based classes
         */
-        B2DPoint(const ::basegfx::B2DTuple& rTuple)
-        :   B2DTuple(rTuple)
+        B2DPoint(const ::basegfx::B2DTuple& rTuple) 
+        :	B2DTuple(rTuple)
         {}
 
-        ~B2DPoint()
+        ~B2DPoint() 
         {}
 
         /** *=operator to allow usage from B2DPoint, too
         */
-        B2DPoint& operator*=( const B2DPoint& rPnt )
-        {
+        B2DPoint& operator*=( const B2DPoint& rPnt ) 
+        { 
             mfX *= rPnt.mfX;
-            mfY *= rPnt.mfY;
-            return *this;
+            mfY *= rPnt.mfY; 
+            return *this; 
         }
 
         /** *=operator to allow usage from B2DPoint, too
         */
-        B2DPoint& operator*=(double t)
-        {
-            mfX *= t;
-            mfY *= t;
-            return *this;
+        B2DPoint& operator*=(double t) 
+        { 
+            mfX *= t; 
+            mfY *= t; 
+            return *this; 
         }
 
         /** assignment operator to allow assigning the results
@@ -139,7 +139,7 @@ namespace basegfx
     //////////////////////////////////////////////////////////////////////////
 
     /** Transform B2DPoint by given transformation matrix.
-
+        
         Since this is a Point, translational components of the
         matrix are used.
     */
diff --git a/basegfx/inc/basegfx/point/b2ipoint.hxx b/basegfx/inc/basegfx/point/b2ipoint.hxx
index dec51735de7c..6a88404a76e3 100644
--- a/basegfx/inc/basegfx/point/b2ipoint.hxx
+++ b/basegfx/inc/basegfx/point/b2ipoint.hxx
@@ -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
@@ -45,64 +45,64 @@ namespace basegfx
     */
     class B2IPoint : public ::basegfx::B2ITuple
     {
-    public:
-        /** Create a 2D Point
+    public:					
+        /**	Create a 2D Point
 
             The point is initialized to (0, 0)
         */
-        B2IPoint()
-        :   B2ITuple()
+        B2IPoint() 
+        :	B2ITuple()
         {}
 
-        /** Create a 2D Point
+        /**	Create a 2D Point
 
             @param nX
             This parameter is used to initialize the X-coordinate
             of the 2D Point.
-
+            
             @param nY
             This parameter is used to initialize the Y-coordinate
             of the 2D Point.
         */
-        B2IPoint(sal_Int32 nX, sal_Int32 nY)
-        :   B2ITuple(nX, nY)
+        B2IPoint(sal_Int32 nX, sal_Int32 nY) 
+        :	B2ITuple(nX, nY)
         {}
 
-        /** Create a copy of a 2D Point
+        /**	Create a copy of a 2D Point
 
             @param rPoint
             The 2D Point which will be copied.
         */
-        B2IPoint(const B2IPoint& rPoint)
-        :   B2ITuple(rPoint)
+        B2IPoint(const B2IPoint& rPoint) 
+        :	B2ITuple(rPoint)
         {}
 
         /** constructor with tuple to allow copy-constructing
             from B2ITuple-based classes
         */
-        B2IPoint(const ::basegfx::B2ITuple& rTuple)
-        :   B2ITuple(rTuple)
+        B2IPoint(const ::basegfx::B2ITuple& rTuple) 
+        :	B2ITuple(rTuple)
         {}
 
-        ~B2IPoint()
+        ~B2IPoint() 
         {}
 
         /** *=operator to allow usage from B2IPoint, too
         */
-        B2IPoint& operator*=( const B2IPoint& rPnt )
-        {
+        B2IPoint& operator*=( const B2IPoint& rPnt ) 
+        { 
             mnX *= rPnt.mnX;
-            mnY *= rPnt.mnY;
-            return *this;
+            mnY *= rPnt.mnY; 
+            return *this; 
         }
 
         /** *=operator to allow usage from B2IPoint, too
         */
-        B2IPoint& operator*=(sal_Int32 t)
-        {
-            mnX *= t;
-            mnY *= t;
-            return *this;
+        B2IPoint& operator*=(sal_Int32 t) 
+        { 
+            mnX *= t; 
+            mnY *= t; 
+            return *this; 
         }
 
         /** assignment operator to allow assigning the results
diff --git a/basegfx/inc/basegfx/point/b3dhompoint.hxx b/basegfx/inc/basegfx/point/b3dhompoint.hxx
index 7417d7528d16..bbf8fd1b1bef 100644
--- a/basegfx/inc/basegfx/point/b3dhompoint.hxx
+++ b/basegfx/inc/basegfx/point/b3dhompoint.hxx
@@ -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
@@ -49,22 +49,22 @@ namespace basegfx
     {
     protected:
         /// This member contains the coordinate part of the point
-        ::basegfx::B3DTuple                 maTuple;
-
+        ::basegfx::B3DTuple					maTuple;
+        
         /// This Member holds the homogenous part of the point
-        double                                      mfW;
+        double										mfW;
 
-        /** Test if this homogen point does have a homogenous part
+        /**	Test if this homogen point does have a homogenous part
 
             @return Returns true if this point has no homogenous part
         */
-        bool implIsHomogenized() const
-        {
+        bool implIsHomogenized() const 
+        { 
             const double fOne(1.0);
-            return ::basegfx::fTools::equal(mfW, fOne);
+            return ::basegfx::fTools::equal(mfW, fOne); 
         }
-
-        /** Remove homogenous part of this Point
+        
+        /**	Remove homogenous part of this Point
 
             This method does necessary calculations to remove
             the evtl. homogenous part of this Point. This may
@@ -72,7 +72,7 @@ namespace basegfx
         */
         void implHomogenize();
 
-        /** Test and on demand remove homogenous part
+        /**	Test and on demand remove homogenous part
 
             This method tests if this Point does have a homogenous part
             and then evtl. takes actions to remove that part.
@@ -88,65 +88,65 @@ namespace basegfx
                 ((B3DHomPoint*)this)->implHomogenize();
         }
 
-    public:
-        /** Create a homogen point
+    public:					
+        /**	Create a homogen point
 
             The point is initialized to (0.0, 0.0, 0.0)
         */
-        B3DHomPoint()
-        :   maTuple(),
+        B3DHomPoint() 
+        :	maTuple(),
             mfW(1.0)
         {}
 
-        /** Create a homogen point
+        /**	Create a homogen point
 
             @param fX
             This parameter is used to initialize the X-coordinate
             of the Point. The homogenous part is initialized to 1.0.
-
+            
             @param fY
             This parameter is used to initialize the Y-coordinate
             of the Point. The homogenous part is initialized to 1.0.
-
+            
             @param fZ
             This parameter is used to initialize the Z-coordinate
             of the Point. The homogenous part is initialized to 1.0.
         */
-        B3DHomPoint(double fX, double fY, double fZ)
-        :   maTuple(fX, fY, fZ),
+        B3DHomPoint(double fX, double fY, double fZ) 
+        :	maTuple(fX, fY, fZ),
             mfW(1.0)
         {}
 
-        /** Create a copy of a 3D Point
+        /**	Create a copy of a 3D Point
 
             @param rVec
-            The 3D point which will be copied. The homogenous part
+            The 3D point which will be copied. The homogenous part 
             is initialized to 1.0.
         */
-        B3DHomPoint(const B3DPoint& rVec)
-        :   maTuple(rVec),
+        B3DHomPoint(const B3DPoint& rVec) 
+        :	maTuple(rVec),
             mfW(1.0)
         {}
 
-        /** Create a copy of a homogen point
+        /**	Create a copy of a homogen point
 
             @param rVec
-            The homogen point which will be copied. The homogenous part
+            The homogen point which will be copied. The homogenous part 
             is copied, too.
         */
-        B3DHomPoint(const B3DHomPoint& rVec)
-        :   maTuple(rVec.maTuple.getX(), rVec.maTuple.getY(), rVec.maTuple.getZ()),
+        B3DHomPoint(const B3DHomPoint& rVec) 
+        :	maTuple(rVec.maTuple.getX(), rVec.maTuple.getY(), rVec.maTuple.getZ()),
             mfW(rVec.mfW)
         {}
 
-        ~B3DHomPoint()
+        ~B3DHomPoint() 
         {}
 
-        /** get a 3D point from this homogenous point
+        /**	get a 3D point from this homogenous point
 
             This method normalizes this homogen point if necessary and
             returns the corresponding 3D point for this homogen point.
-
+            
             @attention Even when this method is const it may change all
             members of this instance.
         */
@@ -156,49 +156,49 @@ namespace basegfx
             return B3DPoint(maTuple.getX(), maTuple.getY(), maTuple.getZ());
         }
 
-        /** get X-coordinate
+        /**	get X-coordinate
 
             This method normalizes this homogen point if necessary and
             returns the corresponding X-coordinate for this homogen point.
-
+            
             @attention Even when this method is const it may change all
             members of this instance.
         */
         double getX() const
-        {
+        { 
             implTestAndHomogenize();
-            return maTuple.getX();
+            return maTuple.getX(); 
         }
 
-        /** get Y-coordinate
+        /**	get Y-coordinate
 
             This method normalizes this homogen point if necessary and
             returns the corresponding Y-coordinate for this homogen point.
-
+            
             @attention Even when this method is const it may change all
             members of this instance.
         */
         double getY() const
-        {
+        { 
             implTestAndHomogenize();
-            return maTuple.getY();
+            return maTuple.getY(); 
         }
 
-        /** get Z-coordinate
+        /**	get Z-coordinate
 
             This method normalizes this homogen point if necessary and
             returns the corresponding Z-coordinate for this homogen point.
-
+            
             @attention Even when this method is const it may change all
             members of this instance.
         */
         double getZ() const
-        {
+        { 
             implTestAndHomogenize();
-            return maTuple.getY();
+            return maTuple.getY(); 
         }
 
-        /** Set X-coordinate of the homogen point.
+        /**	Set X-coordinate of the homogen point.
 
             This method sets the X-coordinate of the homogen point. If
             the point does have a homogenous part this is taken into account.
@@ -211,7 +211,7 @@ namespace basegfx
             maTuple.setX(implIsHomogenized() ? fX : fX * mfW );
         }
 
-        /** Set Y-coordinate of the homogen point.
+        /**	Set Y-coordinate of the homogen point.
 
             This method sets the Y-coordinate of the homogen point. If
             the point does have a homogenous part this is taken into account.
@@ -224,7 +224,7 @@ namespace basegfx
             maTuple.setY(implIsHomogenized() ? fY : fY * mfW );
         }
 
-        /** Set Z-coordinate of the homogen point.
+        /**	Set Z-coordinate of the homogen point.
 
             This method sets the Z-coordinate of the homogen point. If
             the point does have a homogenous part this is taken into account.
@@ -240,8 +240,8 @@ namespace basegfx
         // operators
         //////////////////////////////////////////////////////////////////////
 
-        B3DHomPoint& operator+=( const B3DHomPoint& rPnt )
-        {
+        B3DHomPoint& operator+=( const B3DHomPoint& rPnt ) 
+        { 
             maTuple.setX(getX() * rPnt.mfW + rPnt.getX() * mfW);
             maTuple.setY(getY() * rPnt.mfW + rPnt.getY() * mfW);
             maTuple.setZ(getZ() * rPnt.mfW + rPnt.getZ() * mfW);
@@ -250,8 +250,8 @@ namespace basegfx
             return *this;
         }
 
-        B3DHomPoint& operator-=( const B3DHomPoint& rPnt )
-        {
+        B3DHomPoint& operator-=( const B3DHomPoint& rPnt ) 
+        { 
             maTuple.setX(getX() * rPnt.mfW - rPnt.getX() * mfW);
             maTuple.setY(getY() * rPnt.mfW - rPnt.getY() * mfW);
             maTuple.setZ(getZ() * rPnt.mfW - rPnt.getZ() * mfW);
@@ -259,146 +259,146 @@ namespace basegfx
 
             return *this;
         }
-
-        B3DHomPoint& operator*=(double t)
-        {
+        
+        B3DHomPoint& operator*=(double t) 
+        { 
             if(!::basegfx::fTools::equalZero(t))
             {
                 mfW /= t;
             }
 
-            return *this;
+            return *this; 
         }
 
-        B3DHomPoint& operator/=(double t)
-        {
+        B3DHomPoint& operator/=(double t) 
+        { 
             mfW *= t;
-            return *this;
+            return *this; 
         }
 
         B3DHomPoint& operator-(void)
-        {
+        {	
             mfW = -mfW;
             return *this;
         }
-
-        bool operator==( const B3DHomPoint& rPnt ) const
-        {
+        
+        bool operator==( const B3DHomPoint& rPnt ) const 
+        { 
             implTestAndHomogenize();
             return (maTuple == rPnt.maTuple);
         }
 
-        bool operator!=( const B3DHomPoint& rPnt ) const
-        {
+        bool operator!=( const B3DHomPoint& rPnt ) const 
+        { 
             implTestAndHomogenize();
             return (maTuple != rPnt.maTuple);
         }
-
-        B3DHomPoint& operator=( const B3DHomPoint& rPnt )
-        {
+        
+        B3DHomPoint& operator=( const B3DHomPoint& rPnt ) 
+        { 
             maTuple = rPnt.maTuple;
             mfW = rPnt.mfW;
-            return *this;
+            return *this; 
         }
     };
 
     // external operators
     //////////////////////////////////////////////////////////////////////////
 
-    inline B3DHomPoint minimum(const B3DHomPoint& rVecA, const B3DHomPoint& rVecB)
-    {
+    inline B3DHomPoint minimum(const B3DHomPoint& rVecA, const B3DHomPoint& rVecB) 
+    { 
         B3DHomPoint aMin(
             (rVecB.getX() < rVecA.getX()) ? rVecB.getX() : rVecA.getX(),
             (rVecB.getY() < rVecA.getY()) ? rVecB.getY() : rVecA.getY(),
-            (rVecB.getZ() < rVecA.getZ()) ? rVecB.getZ() : rVecA.getZ());
+            (rVecB.getZ() < rVecA.getZ()) ? rVecB.getZ() : rVecA.getZ()); 
         return aMin;
     }
 
-    inline B3DHomPoint maximum(const B3DHomPoint& rVecA, const B3DHomPoint& rVecB)
-    {
+    inline B3DHomPoint maximum(const B3DHomPoint& rVecA, const B3DHomPoint& rVecB) 
+    { 
         B3DHomPoint aMax(
             (rVecB.getX() > rVecA.getX()) ? rVecB.getX() : rVecA.getX(),
             (rVecB.getY() > rVecA.getY()) ? rVecB.getY() : rVecA.getY(),
-            (rVecB.getZ() > rVecA.getZ()) ? rVecB.getZ() : rVecA.getZ());
+            (rVecB.getZ() > rVecA.getZ()) ? rVecB.getZ() : rVecA.getZ()); 
         return aMax;
     }
 
-    inline B3DHomPoint absolute(const B3DHomPoint& rVec)
-    {
+    inline B3DHomPoint absolute(const B3DHomPoint& rVec) 
+    { 
         B3DHomPoint aAbs(
             (0.0 > rVec.getX()) ? -rVec.getX() : rVec.getX(),
             (0.0 > rVec.getY()) ? -rVec.getY() : rVec.getY(),
-            (0.0 > rVec.getZ()) ? -rVec.getZ() : rVec.getZ());
+            (0.0 > rVec.getZ()) ? -rVec.getZ() : rVec.getZ()); 
         return aAbs;
     }
 
-    inline B3DHomPoint interpolate(B3DHomPoint& rOld1, B3DHomPoint& rOld2, double t)
-    {
+    inline B3DHomPoint interpolate(B3DHomPoint& rOld1, B3DHomPoint& rOld2, double t) 
+    { 
         B3DHomPoint aInt(
             ((rOld2.getX() - rOld1.getX()) * t) + rOld1.getX(),
             ((rOld2.getY() - rOld1.getY()) * t) + rOld1.getY(),
-            ((rOld2.getZ() - rOld1.getZ()) * t) + rOld1.getZ());
+            ((rOld2.getZ() - rOld1.getZ()) * t) + rOld1.getZ()); 
         return aInt;
     }
 
-    inline B3DHomPoint average(B3DHomPoint& rOld1, B3DHomPoint& rOld2)
-    {
+    inline B3DHomPoint average(B3DHomPoint& rOld1, B3DHomPoint& rOld2) 
+    { 
         B3DHomPoint aAvg(
             (rOld1.getX() + rOld2.getX()) * 0.5,
             (rOld1.getY() + rOld2.getY()) * 0.5,
-            (rOld1.getZ() + rOld2.getZ()) * 0.5);
+            (rOld1.getZ() + rOld2.getZ()) * 0.5); 
         return aAvg;
     }
-
+    
     inline B3DHomPoint average(B3DHomPoint& rOld1, B3DHomPoint& rOld2, B3DHomPoint& rOld3)
-    {
+    { 
         B3DHomPoint aAvg(
             (rOld1.getX() + rOld2.getX() + rOld3.getX()) * (1.0 / 3.0),
             (rOld1.getY() + rOld2.getY() + rOld3.getY()) * (1.0 / 3.0),
-            (rOld1.getZ() + rOld2.getZ() + rOld3.getZ()) * (1.0 / 3.0));
+            (rOld1.getZ() + rOld2.getZ() + rOld3.getZ()) * (1.0 / 3.0)); 
         return aAvg;
     }
 
     inline B3DHomPoint operator+(const B3DHomPoint& rVecA, const B3DHomPoint& rVecB)
-    {
-        B3DHomPoint aSum(rVecA);
-        aSum += rVecB;
-        return aSum;
+    { 
+        B3DHomPoint aSum(rVecA); 
+        aSum += rVecB; 
+        return aSum; 
     }
 
     inline B3DHomPoint operator-(const B3DHomPoint& rVecA, const B3DHomPoint& rVecB)
-    {
-        B3DHomPoint aSub(rVecA);
-        aSub -= rVecB;
-        return aSub;
+    { 
+        B3DHomPoint aSub(rVecA); 
+        aSub -= rVecB; 
+        return aSub; 
     }
 
     inline B3DHomPoint operator*(const B3DHomPoint& rVec, double t)
-    {
-        B3DHomPoint aNew(rVec);
-        aNew *= t;
-        return aNew;
+    { 
+        B3DHomPoint aNew(rVec); 
+        aNew *= t; 
+        return aNew; 
     }
 
     inline B3DHomPoint operator*(double t, const B3DHomPoint& rVec)
-    {
-        B3DHomPoint aNew(rVec);
-        aNew *= t;
-        return aNew;
+    { 
+        B3DHomPoint aNew(rVec); 
+        aNew *= t; 
+        return aNew; 
     }
 
     inline B3DHomPoint operator/(const B3DHomPoint& rVec, double t)
-    {
-        B3DHomPoint aNew(rVec);
-        aNew /= t;
-        return aNew;
+    { 
+        B3DHomPoint aNew(rVec); 
+        aNew /= t; 
+        return aNew; 
     }
 
     inline B3DHomPoint operator/(double t, const B3DHomPoint& rVec)
     {
-        B3DHomPoint aNew(rVec);
-        aNew /= t;
-        return aNew;
+        B3DHomPoint aNew(rVec); 
+        aNew /= t; 
+        return aNew; 
     }
 } // end of namespace basegfx
 
diff --git a/basegfx/inc/basegfx/point/b3dpoint.hxx b/basegfx/inc/basegfx/point/b3dpoint.hxx
index 943f74c1352d..9551eca17dfc 100644
--- a/basegfx/inc/basegfx/point/b3dpoint.hxx
+++ b/basegfx/inc/basegfx/point/b3dpoint.hxx
@@ -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
@@ -45,81 +45,81 @@ namespace basegfx
     */
     class B3DPoint : public ::basegfx::B3DTuple
     {
-    public:
-        /** Create a 3D Point
+    public:					
+        /**	Create a 3D Point
 
             The point is initialized to (0.0, 0.0, 0.0)
         */
-        B3DPoint()
-        :   B3DTuple()
+        B3DPoint() 
+        :	B3DTuple()
         {}
 
-        /** Create a 3D Point
+        /**	Create a 3D Point
 
             @param fX
             This parameter is used to initialize the X-coordinate
             of the 3D Point.
-
+            
             @param fY
             This parameter is used to initialize the Y-coordinate
             of the 3D Point.
-
+            
             @param fZ
             This parameter is used to initialize the Z-coordinate
             of the 3D Point.
         */
-        B3DPoint(double fX, double fY, double fZ)
-        :   B3DTuple(fX, fY, fZ)
+        B3DPoint(double fX, double fY, double fZ) 
+        :	B3DTuple(fX, fY, fZ)
         {}
 
-        /** Create a copy of a 3D Point
+        /**	Create a copy of a 3D Point
 
             @param rVec
             The 3D Point which will be copied.
         */
-        B3DPoint(const B3DPoint& rVec)
-        :   B3DTuple(rVec)
+        B3DPoint(const B3DPoint& rVec) 
+        :	B3DTuple(rVec)
         {}
 
         /** constructor with tuple to allow copy-constructing
             from B3DTuple-based classes
         */
-        B3DPoint(const ::basegfx::B3DTuple& rTuple)
-        :   B3DTuple(rTuple)
+        B3DPoint(const ::basegfx::B3DTuple& rTuple) 
+        :	B3DTuple(rTuple)
         {}
 
-        ~B3DPoint()
+        ~B3DPoint() 
         {}
 
         /** *=operator to allow usage from B3DPoint, too
         */
-        B3DPoint& operator*=( const B3DPoint& rPnt )
-        {
+        B3DPoint& operator*=( const B3DPoint& rPnt ) 
+        { 
             mfX *= rPnt.mfX;
-            mfY *= rPnt.mfY;
-            mfZ *= rPnt.mfZ;
-            return *this;
+            mfY *= rPnt.mfY; 
+            mfZ *= rPnt.mfZ; 
+            return *this; 
         }
 
         /** *=operator to allow usage from B3DPoint, too
         */
-        B3DPoint& operator*=(double t)
-        {
-            mfX *= t;
-            mfY *= t;
-            mfZ *= t;
-            return *this;
+        B3DPoint& operator*=(double t) 
+        { 
+            mfX *= t; 
+            mfY *= t; 
+            mfZ *= t; 
+            return *this; 
         }
 
         /** assignment operator to allow assigning the results
             of B3DTuple calculations
         */
-        B3DPoint& operator=( const ::basegfx::B3DTuple& rVec )
-        {
+        B3DPoint& operator=( const ::basegfx::B3DTuple& rVec ) 
+        { 
             mfX = rVec.getX();
-            mfY = rVec.getY();
-            mfZ = rVec.getZ();
-            return *this;
+            mfY = rVec.getY(); 
+            mfZ = rVec.getZ(); 
+            return *this; 
         }
 
         /** Transform point by given transformation matrix.
@@ -139,7 +139,7 @@ namespace basegfx
     //////////////////////////////////////////////////////////////////////////
 
     /** Transform B3DPoint by given transformation matrix.
-
+        
         Since this is a Point, translational components of the
         matrix are used.
     */
diff --git a/basegfx/inc/basegfx/point/b3ipoint.hxx b/basegfx/inc/basegfx/point/b3ipoint.hxx
index f20fe3d99c79..a095edc8e2d1 100644
--- a/basegfx/inc/basegfx/point/b3ipoint.hxx
+++ b/basegfx/inc/basegfx/point/b3ipoint.hxx
@@ -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
@@ -45,81 +45,81 @@ namespace basegfx
     */
     class B3IPoint : public ::basegfx::B3ITuple
     {
-    public:
-        /** Create a 3D Point
+    public:					
+        /**	Create a 3D Point
 
             The point is initialized to (0, 0, 0)
         */
-        B3IPoint()
-        :   B3ITuple()
+        B3IPoint() 
+        :	B3ITuple()
         {}
 
-        /** Create a 3D Point
+        /**	Create a 3D Point
 
             @param nX
             This parameter is used to initialize the X-coordinate
             of the 3D Point.
-
+            
             @param nY
             This parameter is used to initialize the Y-coordinate
             of the 3D Point.
-
+            
             @param nZ
             This parameter is used to initialize the Z-coordinate
             of the 3D Point.
         */
-        B3IPoint(sal_Int32 nX, sal_Int32 nY, sal_Int32 nZ)
-        :   B3ITuple(nX, nY, nZ)
+        B3IPoint(sal_Int32 nX, sal_Int32 nY, sal_Int32 nZ) 
+        :	B3ITuple(nX, nY, nZ)
         {}
 
-        /** Create a copy of a 3D Point
+        /**	Create a copy of a 3D Point
 
             @param rVec
             The 3D Point which will be copied.
         */
-        B3IPoint(const B3IPoint& rVec)
-        :   B3ITuple(rVec)
+        B3IPoint(const B3IPoint& rVec) 
+        :	B3ITuple(rVec)
         {}
 
         /** constructor with tuple to allow copy-constructing
             from B3ITuple-based classes
         */
-        B3IPoint(const ::basegfx::B3ITuple& rTuple)
-        :   B3ITuple(rTuple)
+        B3IPoint(const ::basegfx::B3ITuple& rTuple) 
+        :	B3ITuple(rTuple)
         {}
 
-        ~B3IPoint()
+        ~B3IPoint() 
         {}
 
         /** *=operator to allow usage from B3IPoint, too
         */
-        B3IPoint& operator*=( const B3IPoint& rPnt )
-        {
+        B3IPoint& operator*=( const B3IPoint& rPnt ) 
+        { 
             mnX *= rPnt.mnX;
-            mnY *= rPnt.mnY;
-            mnZ *= rPnt.mnZ;
-            return *this;
+            mnY *= rPnt.mnY; 
+            mnZ *= rPnt.mnZ; 
+            return *this; 
         }
 
         /** *=operator to allow usage from B3IPoint, too
         */
-        B3IPoint& operator*=(sal_Int32 t)
-        {
-            mnX *= t;
-            mnY *= t;
-            mnZ *= t;
-            return *this;
+        B3IPoint& operator*=(sal_Int32 t) 
+        { 
+            mnX *= t; 
+            mnY *= t; 
+            mnZ *= t; 
+            return *this; 
         }
 
         /** assignment operator to allow assigning the results
             of B3ITuple calculations
         */
-        B3IPoint& operator=( const ::basegfx::B3ITuple& rVec )
-        {
+        B3IPoint& operator=( const ::basegfx::B3ITuple& rVec ) 
+        { 
             mnX = rVec.getX();
-            mnY = rVec.getY();
-            mnZ = rVec.getZ();
-            return *this;
+            mnY = rVec.getY(); 
+            mnZ = rVec.getZ(); 
+            return *this; 
         }
 
         /** Transform point by given transformation matrix.
diff --git a/basegfx/inc/basegfx/polygon/b2dlinegeometry.hxx b/basegfx/inc/basegfx/polygon/b2dlinegeometry.hxx
index fd8997fcda4d..59857f7c6234 100644
--- a/basegfx/inc/basegfx/polygon/b2dlinegeometry.hxx
+++ b/basegfx/inc/basegfx/polygon/b2dlinegeometry.hxx
@@ -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
@@ -42,7 +42,7 @@ namespace basegfx
         /** Create line start/end geometry element, mostly arrows and things like that.
 
             @param rCandidate
-            The polygon which needs to get that line ends and needs to have two points
+            The polygon which needs to get that line ends and needs to have two points 
             at least.
 
             @param rArrow
@@ -56,8 +56,8 @@ namespace basegfx
             defines the size of the element, it's describing the target width in X
             of the arrow.
 
-            @param fDockingPosition needs to be in [0.0 ..1.0] range, where 0.0 means
-            that the tip of the arrow will be aligned with the polygon start, 1.0 means
+            @param fDockingPosition needs to be in [0.0 ..1.0] range, where 0.0 means 
+            that the tip of the arrow will be aligned with the polygon start, 1.0 means 
             the bottom. The default of 0.5 describes a centered arrow.
 
             @param pConsumedLength
@@ -73,8 +73,8 @@ namespace basegfx
             The Line start and end polygon, correctly rotated and scaled
         */
         B2DPolyPolygon createAreaGeometryForLineStartEnd(
-            const B2DPolygon& rCandidate,
-            const B2DPolyPolygon& rArrow,
+            const B2DPolygon& rCandidate, 
+            const B2DPolyPolygon& rArrow, 
             bool bStart,
             double fWidth,
             double fCandidateLength = 0.0, // 0.0 -> calculate self
@@ -84,9 +84,9 @@ namespace basegfx
         /** create filled polygon geometry for lines with a line width
 
             This method will create bezier based, fillable polygons which
-            will resample the curve if it was extended for the given half
-            line width. It will remove extrema positions from contained
-            bezier segments and get as close as possible and defined by
+            will resample the curve if it was extended for the given half 
+            line width. It will remove extrema positions from contained 
+            bezier segments and get as close as possible and defined by 
             the given parameters to the ideal result.
 
             It will check edges for trivial bezier to avoid unnecessary
@@ -113,7 +113,7 @@ namespace basegfx
 
             @param fMaxPartOfEdge
             Allows to influence from with relative length of a control vector
-            compared to it's edge a split is forced. The smaller, the more
+            compared to it's edge a split is forced. The smaller, the more 
             subdivisions will be needed to create the filled geometry. Allowed
             range is cropped to [1.0 .. 0.01]
 
@@ -129,10 +129,10 @@ namespace basegfx
             needed and defined.
         */
         B2DPolyPolygon createAreaGeometry(
-            const B2DPolygon& rCandidate,
-            double fHalfLineWidth,
-            B2DLineJoin eJoin = B2DLINEJOIN_ROUND,
-            double fMaxAllowedAngle = (12.5 * F_PI180),
+            const B2DPolygon& rCandidate, 
+            double fHalfLineWidth, 
+            B2DLineJoin eJoin = B2DLINEJOIN_ROUND, 
+            double fMaxAllowedAngle = (12.5 * F_PI180), 
             double fMaxPartOfEdge = 0.4,
             double fMiterMinimumAngle = (15.0 * F_PI180));
     } // end of namespace tools
diff --git a/basegfx/inc/basegfx/polygon/b2dpolygon.hxx b/basegfx/inc/basegfx/polygon/b2dpolygon.hxx
index a12120b5f441..9782c6535b1c 100644
--- a/basegfx/inc/basegfx/polygon/b2dpolygon.hxx
+++ b/basegfx/inc/basegfx/polygon/b2dpolygon.hxx
@@ -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
@@ -112,11 +112,11 @@ namespace basegfx
         B2VectorContinuity getContinuityInPoint(sal_uInt32 nIndex) const;
 
         /** check edge for being a bezier segment
-
-            This test the existance of control vectors, but do not apply
-            testAndSolveTrivialBezier() to the bezier segment, so it is still useful
+            
+            This test the existance of control vectors, but do not apply 
+            testAndSolveTrivialBezier() to the bezier segment, so it is still useful 
             to do so.
-            Since it can use internal data representations, it is faster
+            Since it can use internal data representations, it is faster 
             than using getBezierSegment() and applying isBezier() on it.
 
             @param nIndex
@@ -126,14 +126,14 @@ namespace basegfx
             true if edge exists and at least one control vector is used
         */
         bool isBezierSegment(sal_uInt32 nIndex) const;
-
+        
         /** bezier segment access
-
+            
             This method also works when it is no bezier segment at all and will fill
             the given B2DCubicBezier as needed.
             In any case, the given B2DCubicBezier will be filled, if necessary with
             the single start point (if no valid edge exists).
-
+            
             @param nIndex
             Index of the addressed edge's start point
 
@@ -180,18 +180,18 @@ namespace basegfx
             (a) the range of the polygon points
             (b) the range of the polygon points and control points
             (c) the outer range of the subdivided bezier curve
-
-            Ranges (a) and (c) are produced by tools::getRange(); resp. this
+            
+            Ranges (a) and (c) are produced by tools::getRange(); resp. this 
             getB2DRange(). tools::getRangeWithControlPoints handles case (b).
-
-            To get range (c) a simple solution would be to subdivide the polygon
-            and use getRange() on it. Since subdivision is expensive and decreases
+            
+            To get range (c) a simple solution would be to subdivide the polygon 
+            and use getRange() on it. Since subdivision is expensive and decreases 
             the polygon quality, i added this new method. It will use a
             methodology suggested by HDU. First, it gets the range (a).
             Then it iterates over the bezier segments and for each it
             first tests if the outer range of the bezier segment is already
             contained in the result range.
-
+            
             The subdivision itself uses getAllExtremumPositions() to only
             calculate extremum points and to expand the result accordingly.
             Thus it calculates maximal four extremum points on the bezier
diff --git a/basegfx/inc/basegfx/polygon/b2dpolygonclipper.hxx b/basegfx/inc/basegfx/polygon/b2dpolygonclipper.hxx
index d13d3d0a862c..0bb560edae67 100644
--- a/basegfx/inc/basegfx/polygon/b2dpolygonclipper.hxx
+++ b/basegfx/inc/basegfx/polygon/b2dpolygonclipper.hxx
@@ -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
diff --git a/basegfx/inc/basegfx/polygon/b2dpolygoncutandtouch.hxx b/basegfx/inc/basegfx/polygon/b2dpolygoncutandtouch.hxx
index a9d6e0a1b6fe..14235ab2c887 100644
--- a/basegfx/inc/basegfx/polygon/b2dpolygoncutandtouch.hxx
+++ b/basegfx/inc/basegfx/polygon/b2dpolygoncutandtouch.hxx
@@ -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
@@ -65,7 +65,7 @@ namespace basegfx
         B2DPolygon addPointsAtCuts(const B2DPolygon& rCandidate, const B2DPolyPolygon& rMask);
         B2DPolyPolygon addPointsAtCuts(const B2DPolyPolygon& rCandidate, const B2DPolyPolygon& rMask);
 
-        // look for self-intersections in given polygon and add extra points there. Result will have no
+        // look for self-intersections in given polygon and add extra points there. Result will have no 
         // intersections on an edge
         B2DPolygon addPointsAtCuts(const B2DPolygon& rCandidate);
 
diff --git a/basegfx/inc/basegfx/polygon/b2dpolygontools.hxx b/basegfx/inc/basegfx/polygon/b2dpolygontools.hxx
index 7d1d0bc9660c..9f45a2fa8fda 100644
--- a/basegfx/inc/basegfx/polygon/b2dpolygontools.hxx
+++ b/basegfx/inc/basegfx/polygon/b2dpolygontools.hxx
@@ -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
@@ -51,7 +51,7 @@ namespace basegfx
         void openWithGeometryChange(B2DPolygon& rCandidate);
         void closeWithGeometryChange(B2DPolygon& rCandidate);
 
-        /** Check if given polygon is closed.
+        /**	Check if given polygon is closed. 
 
             This is kind of a 'classic' method to support old polygon
             definitions.  Those old polygon definitions define the
@@ -88,7 +88,7 @@ namespace basegfx
         B2DRange getRangeWithControlPoints(const B2DPolygon& rCandidate);
 
         /** Get the range of a polygon
-
+            
             This method creates the outer range of the subdivided bezier curve.
             For detailed discussion see B2DPolygon::getB2DRange()
 
@@ -124,13 +124,13 @@ namespace basegfx
 
         // get a snippet from given polygon for absolute distances. The polygon is assumed
         // to be opened (not closed). fFrom and fTo need to be in range [0.0 .. fLength], where
-        // fTo >= fFrom. If length is given, it is assumed the correct polygon length,
+        // fTo >= fFrom. If length is given, it is assumed the correct polygon length, 
         // if 0.0 it is calculated using getLength(...)
         B2DPolygon getSnippetAbsolute(const B2DPolygon& rCandidate, double fFrom, double fTo, double fLength = 0.0);
 
         // get a snippet from given polygon for relative distances. The polygon is assumed
         // to be opened (not closed). fFrom and fTo need to be in range [0.0 .. 1.0], where
-        // fTo >= fFrom. If length is given, it is assumed the correct polygon length,
+        // fTo >= fFrom. If length is given, it is assumed the correct polygon length, 
         // if 0.0 it is calculated using getLength(...)
         B2DPolygon getSnippetRelative(const B2DPolygon& rCandidate, double fFrom = 0.0, double fTo = 1.0, double fLength = 0.0);
 
@@ -149,22 +149,22 @@ namespace basegfx
         // Definitions for the cut flags used from the findCut methods
         typedef sal_uInt16 CutFlagValue;
 
-        #define CUTFLAG_NONE            (0x0000)
-        #define CUTFLAG_LINE            (0x0001)
-        #define CUTFLAG_START1          (0x0002)
-        #define CUTFLAG_START2          (0x0004)
-        #define CUTFLAG_END1            (0x0008)
-        #define CUTFLAG_END2            (0x0010)
-        #define CUTFLAG_ALL         (CUTFLAG_LINE|CUTFLAG_START1|CUTFLAG_START2|CUTFLAG_END1|CUTFLAG_END2)
-        #define CUTFLAG_DEFAULT     (CUTFLAG_LINE|CUTFLAG_START2|CUTFLAG_END2)
+        #define	CUTFLAG_NONE			(0x0000)
+        #define	CUTFLAG_LINE			(0x0001)
+        #define	CUTFLAG_START1			(0x0002)
+        #define	CUTFLAG_START2			(0x0004)
+        #define	CUTFLAG_END1			(0x0008)
+        #define	CUTFLAG_END2			(0x0010)
+        #define	CUTFLAG_ALL			(CUTFLAG_LINE|CUTFLAG_START1|CUTFLAG_START2|CUTFLAG_END1|CUTFLAG_END2)
+        #define	CUTFLAG_DEFAULT		(CUTFLAG_LINE|CUTFLAG_START2|CUTFLAG_END2)
 
         // Calculate cut between the points given by the two indices. pCut1
         // and pCut2 will contain the cut coordinate on each edge in ]0.0, 1.0]
         // (if given) and the return value will contain a cut description.
         CutFlagValue findCut(
             const B2DPolygon& rCandidate,
-            sal_uInt32 nIndex1, sal_uInt32 nIndex2,
-            CutFlagValue aCutFlags = CUTFLAG_DEFAULT,
+            sal_uInt32 nIndex1, sal_uInt32 nIndex2, 
+            CutFlagValue aCutFlags = CUTFLAG_DEFAULT, 
             double* pCut1 = 0L, double* pCut2 = 0L);
 
         // This version is working with two indexed edges from different
@@ -172,7 +172,7 @@ namespace basegfx
         CutFlagValue findCut(
             const B2DPolygon& rCandidate1, sal_uInt32 nIndex1,
             const B2DPolygon& rCandidate2, sal_uInt32 nIndex2,
-            CutFlagValue aCutFlags = CUTFLAG_DEFAULT,
+            CutFlagValue aCutFlags = CUTFLAG_DEFAULT, 
             double* pCut1 = 0L, double* pCut2 = 0L);
 
         // This version works with two points and vectors to define the
@@ -188,8 +188,8 @@ namespace basegfx
         // value in pCut (if provided)
         bool isPointOnEdge(
             const B2DPoint& rPoint,
-            const B2DPoint& rEdgeStart,
-            const B2DVector& rEdgeDelta,
+            const B2DPoint& rEdgeStart, 
+            const B2DVector& rEdgeDelta, 
             double* pCut = 0L);
 
         /** Apply given LineDashing to given polygon
@@ -197,8 +197,8 @@ namespace basegfx
             This method is used to cut down line polygons to the needed
             pieces when a dashing needs to be applied.
             It is now capable of keeping contained bezier segments.
-            It is also capable of delivering line and non-line portions
-            depending on what target polygons You provide. This is useful
+            It is also capable of delivering line and non-line portions 
+            depending on what target polygons You provide. This is useful 
             e.g. for dashed lines with two colors.
             If the last and the first snippet in one of the results have
             a common start/end ppoint, they will be merged to achieve as
@@ -226,8 +226,8 @@ namespace basegfx
             be calculated internally.
         */
         void applyLineDashing(
-            const B2DPolygon& rCandidate,
-            const ::std::vector<double>& rDotDashArray,
+            const B2DPolygon& rCandidate, 
+            const ::std::vector<double>& rDotDashArray, 
             B2DPolyPolygon* pLineTarget,
             B2DPolyPolygon* pGapTarget = 0,
             double fFullDashDotLen = 0.0);
@@ -238,9 +238,9 @@ namespace basegfx
         // 2 x fDistance, and the circle around both points with radius fDistance.
         bool isInEpsilonRange(const B2DPoint& rEdgeStart, const B2DPoint& rEdgeEnd, const B2DPoint& rTestPosition, double fDistance);
 
-        // test if point is inside epsilon-range around the given Polygon. Can be used
-        // for HitTesting. The epsilon-range is defined to be the rectangle centered
-        // to the given edge, using height 2 x fDistance, and the circle around both points
+        // test if point is inside epsilon-range around the given Polygon. Can be used 
+        // for HitTesting. The epsilon-range is defined to be the rectangle centered 
+        // to the given edge, using height 2 x fDistance, and the circle around both points 
         // with radius fDistance.
         bool isInEpsilonRange(const B2DPolygon& rCandidate, const B2DPoint& rTestPosition, double fDistance);
 
@@ -320,7 +320,7 @@ namespace basegfx
 
         /** Create an unit ellipse polygon with the given angles, from start to end
          */
-        B2DPolygon createPolygonFromEllipseSegment( const B2DPoint& rCenter, double fRadiusX, double fRadiusY, double   fStart, double fEnd );
+        B2DPolygon createPolygonFromEllipseSegment( const B2DPoint& rCenter, double fRadiusX, double fRadiusY, double	fStart, double fEnd );
 
         B2DPolygon createPolygonFromUnitEllipseSegment( double fStart, double fEnd );
 
@@ -404,7 +404,7 @@ namespace basegfx
         // calculates if given point is on given line, taking care of the numerical epsilon
         bool isPointOnLine(const B2DPoint& rStart, const B2DPoint& rEnd, const B2DPoint& rCandidate, bool bWithPoints = false);
 
-        // calculates if given point is on given polygon, taking care of the numerical epsilon. Uses
+        // calculates if given point is on given polygon, taking care of the numerical epsilon. Uses 
         // isPointOnLine internally
         bool isPointOnPolygon(const B2DPolygon& rCandidate, const B2DPoint& rPoint, bool bWithPoints = true);
 
@@ -448,7 +448,7 @@ namespace basegfx
             preserved.
             The polygon is subdivided if curve segments are included. That subdivision is the base
             for the newly created points.
-            If the source is closed, the indirectly existing last edge may NOT have the
+            If the source is closed, the indirectly existing last edge may NOT have the 
             given length.
             If the source is open, all edges will have the given length. You may use the last
             point of the original when You want to add the last edge Yourself.
@@ -461,7 +461,7 @@ namespace basegfx
             original start point. Negative values are truncated to 0.0.
 
             @param fEnd
-            The maximum distance for the last point. No more points behind this distance will be created.
+            The maximum distance for the last point. No more points behind this distance will be created. 
             Use 0.0 to proccess the whole polygon. Negative values are truncated to 0.0. It also
             needs to be more or equal to fStart, else it is truncated to fStart.
 
@@ -470,12 +470,12 @@ namespace basegfx
          */
         B2DPolygon createEdgesOfGivenLength(const B2DPolygon& rCandidate, double fLength, double fStart = 0.0, double fEnd = 0.0);
 
-        /** Create Waveline along given polygon
+        /** Create Waveline along given polygon 
             The implementation is based on createEdgesOfGivenLength and creates a curve
             segment with the given dimensions for each created line segment. The polygon
             is treated as if opened (closed state will be ignored) and only for whole
             edges a curve segment will be created (no rest handling)
-
+        
             @param rCandidate
             The polygon along which the waveline will be created
 
@@ -488,7 +488,7 @@ namespace basegfx
         B2DPolygon createWaveline(const B2DPolygon& rCandidate, double fWaveWidth, double fWaveHeight);
 
         /** split each edge of a polygon in exactly nSubEdges equidistant edges
-
+            
             @param rCandidate
             The source polygon. If too small (no edges), nSubEdges too small (<2)
             or neither bHandleCurvedEdgesnor bHandleStraightEdges it will just be returned.
@@ -496,12 +496,12 @@ namespace basegfx
 
             @param nSubEdges
             How many edges shall be created as replacement for each single edge
-
+            
             @param bHandleCurvedEdges
             Process curved edges or not. If to handle the curved edges will be splitted
             into nSubEdges part curved edges of equidistant bezier distances. If not,
             curved edges will just be copied.
-
+            
             @param bHandleStraightEdges
             Process straight edges or not. If to handle the straight edges will be splitted
             into nSubEdges part curved edges of equidistant length. If not,
@@ -517,7 +517,7 @@ namespace basegfx
         /** snap some polygon coordinates to discrete coordinates
 
             This method allows to snap some polygon points to discrete (integer) values
-            which equals e.g. a snap to discrete coordinates. It will snap points of
+            which equals e.g. a snap to discrete coordinates. It will snap points of 
             horizontal and vertical edges
 
             @param rCandidate
diff --git a/basegfx/inc/basegfx/polygon/b2dpolygontriangulator.hxx b/basegfx/inc/basegfx/polygon/b2dpolygontriangulator.hxx
index e23d640b8833..736883234335 100644
--- a/basegfx/inc/basegfx/polygon/b2dpolygontriangulator.hxx
+++ b/basegfx/inc/basegfx/polygon/b2dpolygontriangulator.hxx
@@ -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
diff --git a/basegfx/inc/basegfx/polygon/b2dpolypolygon.hxx b/basegfx/inc/basegfx/polygon/b2dpolypolygon.hxx
index 0032cc47ce4e..fa0a95c415b6 100644
--- a/basegfx/inc/basegfx/polygon/b2dpolypolygon.hxx
+++ b/basegfx/inc/basegfx/polygon/b2dpolypolygon.hxx
@@ -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
@@ -36,8 +36,8 @@
 class ImplB2DPolyPolygon;
 
 namespace basegfx
-{
-    class B2DPolygon;
+{ 
+    class B2DPolygon; 
     class B2DHomMatrix;
 } // end of namespace basegfx
 
@@ -53,7 +53,7 @@ namespace basegfx
     private:
         ImplType                                        mpPolyPolygon;
 
-    public:
+    public:		
         B2DPolyPolygon();
         B2DPolyPolygon(const B2DPolyPolygon& rPolyPolygon);
         explicit B2DPolyPolygon(const B2DPolygon& rPolygon);
diff --git a/basegfx/inc/basegfx/polygon/b2dpolypolygoncutter.hxx b/basegfx/inc/basegfx/polygon/b2dpolypolygoncutter.hxx
index 7e648302c5e5..f538585018bd 100644
--- a/basegfx/inc/basegfx/polygon/b2dpolypolygoncutter.hxx
+++ b/basegfx/inc/basegfx/polygon/b2dpolypolygoncutter.hxx
@@ -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
@@ -62,7 +62,7 @@ namespace basegfx
         // it's depth is increased when inside a polygon, decreased when inside a hole. The result is a depth
         // which e.g. is -1 for holes outside everything, 1 for a polygon covered by another polygon and zero
         // for e.g. holes in a polygon or polygons outside everythig else.
-        // In the 2nd step, all polygons with depth other than zero are removed. If bKeepAboveZero is used,
+        // In the 2nd step, all polygons with depth other than zero are removed. If bKeepAboveZero is used, 
         // all polygons < 1 are removed. The bKeepAboveZero mode is useful for clipping, e.g. just append
         // one polygon to another and use this mode -> only parts where two polygons overlapped will be kept.
         // In combination with correct orientation of the input orientations and the SolveCrossover calls this
diff --git a/basegfx/inc/basegfx/polygon/b2dpolypolygonfillrule.hxx b/basegfx/inc/basegfx/polygon/b2dpolypolygonfillrule.hxx
index f5ceb67586e8..67f93ef80b0b 100644
--- a/basegfx/inc/basegfx/polygon/b2dpolypolygonfillrule.hxx
+++ b/basegfx/inc/basegfx/polygon/b2dpolypolygonfillrule.hxx
@@ -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
diff --git a/basegfx/inc/basegfx/polygon/b2dpolypolygonrasterconverter.hxx b/basegfx/inc/basegfx/polygon/b2dpolypolygonrasterconverter.hxx
index a77f1a371a8a..1d58f05a9528 100644
--- a/basegfx/inc/basegfx/polygon/b2dpolypolygonrasterconverter.hxx
+++ b/basegfx/inc/basegfx/polygon/b2dpolypolygonrasterconverter.hxx
@@ -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
@@ -45,7 +45,7 @@ namespace basegfx
         derive from this, and override the span() method, which will
         get called for every scanline span of the poly-polygon.
 
-        @derive
+        @derive 
         Overwrite span() with the render output method of your choice.
      */
     class B2DPolyPolygonRasterConverter
@@ -73,7 +73,7 @@ namespace basegfx
             area might also be larger.
          */
         B2DPolyPolygonRasterConverter(const B2DPolyPolygon& rPolyPolyRaster,
-                                      const B2DRectangle&   rRasterArea );
+                                      const B2DRectangle&	rRasterArea );
 
         virtual ~B2DPolyPolygonRasterConverter();
 
@@ -89,7 +89,7 @@ namespace basegfx
 
             @param rfXLeft
             The left end of the current horizontal span
-
+            
             @param rfXRight
             The right end of the current horizontal span
 
@@ -102,8 +102,8 @@ namespace basegfx
         */
         virtual void span(const double& rfXLeft,
                           const double& rfXRight,
-                          sal_Int32     nY,
-                          bool          bOn ) = 0;
+                          sal_Int32 	nY, 
+                          bool 			bOn ) = 0;
 
         /// @internal
         struct Vertex
@@ -111,9 +111,9 @@ namespace basegfx
             inline Vertex();
             inline Vertex( const B2DPoint&, const B2DPoint&, bool );
 
-            B2DPoint    aP1;
-            B2DPoint    aP2;
-            bool        bDownwards;
+            B2DPoint	aP1;
+            B2DPoint	aP2;
+            bool 		bDownwards;
         };
 
     private:
@@ -123,18 +123,18 @@ namespace basegfx
 
         void init();
 
-        typedef ::std::vector<Vertex>               VectorOfVertices;
-        typedef ::std::vector<VectorOfVertices>     VectorOfVertexVectors;
+        typedef ::std::vector<Vertex>				VectorOfVertices;
+        typedef ::std::vector<VectorOfVertices>		VectorOfVertexVectors;
 
         /// The poly-polygon to raster-convert
-        B2DPolyPolygon                              maPolyPolygon;
+        B2DPolyPolygon								maPolyPolygon;
         /// Total bound rect of the poly-polygon
-        const B2DRectangle                          maPolyPolyRectangle;
+        const B2DRectangle							maPolyPolyRectangle;
 
         /** Vector containing for each scanline a vector which in turn
             contains all vertices that start on the specific scanline
          */
-        VectorOfVertexVectors                       maScanlines;
+        VectorOfVertexVectors						maScanlines;
     };
 }
 
diff --git a/basegfx/inc/basegfx/polygon/b2dpolypolygontools.hxx b/basegfx/inc/basegfx/polygon/b2dpolypolygontools.hxx
index 1115a96ef8da..dc63cdb53c68 100644
--- a/basegfx/inc/basegfx/polygon/b2dpolypolygontools.hxx
+++ b/basegfx/inc/basegfx/polygon/b2dpolypolygontools.hxx
@@ -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
@@ -72,7 +72,7 @@ namespace basegfx
         // is created.
         B2DPolyPolygon adaptiveSubdivideByCount(const B2DPolyPolygon& rCandidate, sal_uInt32 nCount = 0L);
 
-        // isInside test for B2dPoint. On border is not inside as long as not true is given
+        // isInside test for B2dPoint. On border is not inside as long as not true is given 
         // in bWithBorder flag. It is assumed that the orientations of the given polygon are correct.
         bool isInside(const B2DPolyPolygon& rCandidate, const B2DPoint& rPoint, bool bWithBorder = false);
 
@@ -101,19 +101,19 @@ namespace basegfx
             The outer range of the polygon
         */
         B2DRange getRange(const B2DPolyPolygon& rCandidate);
-
+            
         /** Apply given LineDashing to given polyPolygon
 
             For a description see applyLineDashing in b2dpolygontoos.hxx
         */
         void applyLineDashing(
-            const B2DPolyPolygon& rCandidate,
-            const ::std::vector<double>& rDotDashArray,
+            const B2DPolyPolygon& rCandidate, 
+            const ::std::vector<double>& rDotDashArray, 
             B2DPolyPolygon* pLineTarget,
             B2DPolyPolygon* pGapTarget = 0,
             double fFullDashDotLen = 0.0);
 
-        // test if point is inside epsilon-range around the given PolyPolygon. Can be used
+        // test if point is inside epsilon-range around the given PolyPolygon. Can be used 
         // for HitTesting. The epsilon-range is defined to be the tube around the PolyPolygon
         // with distance fDistance and rounded edges (start and end point).
         bool isInEpsilonRange(const B2DPolyPolygon& rCandidate, const B2DPoint& rTestPosition, double fDistance);
@@ -179,7 +179,7 @@ namespace basegfx
         B2DPolyPolygon createB2DPolyPolygonFromB3DPolyPolygon(const B3DPolyPolygon& rCandidate, const B3DHomMatrix& rMat);
 
         // for each contained edge in each contained polygon calculate the smallest distance. Return the index to the smallest
-        // edge in rEdgeIndex and the index to the polygon in rPolygonIndex. The relative position on the edge is returned in rCut.
+        // edge in rEdgeIndex and the index to the polygon in rPolygonIndex. The relative position on the edge is returned in rCut. 
         // If nothing was found (e.g. empty input plygon), DBL_MAX is returned.
         double getSmallestDistancePointToPolyPolygon(const B2DPolyPolygon& rCandidate, const B2DPoint& rTestPoint, sal_uInt32& rPolygonIndex, sal_uInt32& rEdgeIndex, double& rCut);
 
@@ -218,7 +218,7 @@ namespace basegfx
 
             @param rPolyPoly
             The poly-polygon to export
-
+            
             @param bUseRelativeCoordinates
             When true, all coordinate values are exported as relative
             to the current position. This tends to save some space,
@@ -234,14 +234,14 @@ namespace basegfx
             value alone, without any "<path ...>" or "d="...")
          */
         ::rtl::OUString exportToSvgD( const B2DPolyPolygon& rPolyPoly,
-                                      bool                  bUseRelativeCoordinates=true,
-                                      bool                  bDetectQuadraticBeziers=true );
+                                      bool 					bUseRelativeCoordinates=true,
+                                      bool 					bDetectQuadraticBeziers=true );
 
         // #i76891# Try to remove existing curve segments if they are simply edges
         B2DPolyPolygon simplifyCurveSegments(const B2DPolyPolygon& rCandidate);
 
         /** split each edge of a polyPolygon in exactly nSubEdges equidistant edges
-
+            
             @param rCandidate
             The source polyPolygon. If too small (no edges), nSubEdges too small (<2)
             or neither bHandleCurvedEdgesnor bHandleStraightEdges it will just be returned.
@@ -262,7 +262,7 @@ namespace basegfx
         /** snap some polygon coordinates to discrete coordinates
 
             This method allows to snap some polygon points to discrete (integer) values
-            which equals e.g. a snap to discrete coordinates. It will snap points of
+            which equals e.g. a snap to discrete coordinates. It will snap points of 
             horizontal and vertical edges
 
             @param rCandidate
diff --git a/basegfx/inc/basegfx/polygon/b2dtrapezoid.hxx b/basegfx/inc/basegfx/polygon/b2dtrapezoid.hxx
index 70ffdf2b7339..e71f392fd1c1 100644
--- a/basegfx/inc/basegfx/polygon/b2dtrapezoid.hxx
+++ b/basegfx/inc/basegfx/polygon/b2dtrapezoid.hxx
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2008 by Sun Microsystems, Inc.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -50,12 +50,12 @@ namespace basegfx
         // - mfBottomY >= mfTopY
         // - mfTopXRight >= mfTopXLeft
         // - mfBottomXRight >= mfBottomXLeft
-        double              mfTopXLeft;
-        double              mfTopXRight;
-        double              mfTopY;
-        double              mfBottomXLeft;
-        double              mfBottomXRight;
-        double              mfBottomY;
+        double				mfTopXLeft;
+        double				mfTopXRight;
+        double				mfTopY;
+        double				mfBottomXLeft;
+        double				mfBottomXRight;
+        double				mfBottomY;
 
     public:
         // constructor
@@ -97,22 +97,22 @@ namespace basegfx
         // for primitive decompositions. To use it, the shear and rotate parts of the
         // involved transformations HAVE to be taken into account.
         void trapezoidSubdivide(
-            B2DTrapezoidVector& ro_Result,
+            B2DTrapezoidVector& ro_Result, 
             const B2DPolyPolygon& rSourcePolyPolygon);
 
         // directly create trapezoids from given edge. Depending on the given geometry,
         // none up to three trapezoids will be created
         void createLineTrapezoidFromEdge(
-            B2DTrapezoidVector& ro_Result,
-            const B2DPoint& rPointA,
-            const B2DPoint& rPointB,
+            B2DTrapezoidVector& ro_Result, 
+            const B2DPoint& rPointA, 
+            const B2DPoint& rPointB, 
             double fLineWidth = 1.0);
 
         // create trapezoids for all edges of the given polygon. The closed state of
         // the polygon is taken into account. If curves are contaned, the default
         // AdaptiveSubdivision will be used.
         void createLineTrapezoidFromB2DPolygon(
-            B2DTrapezoidVector& ro_Result,
+            B2DTrapezoidVector& ro_Result, 
             const B2DPolygon& rPolygon,
             double fLineWidth = 1.0);
 
@@ -120,7 +120,7 @@ namespace basegfx
         // the PolyPolygon is taken into account. If curves are contaned, the default
         // AdaptiveSubdivision will be used.
         void createLineTrapezoidFromB2DPolyPolygon(
-            B2DTrapezoidVector& ro_Result,
+            B2DTrapezoidVector& ro_Result, 
             const B2DPolyPolygon& rPolyPolygon,
             double fLineWidth = 1.0);
 
diff --git a/basegfx/inc/basegfx/polygon/b3dpolygon.hxx b/basegfx/inc/basegfx/polygon/b3dpolygon.hxx
index 1732c1338042..5e1601087b38 100644
--- a/basegfx/inc/basegfx/polygon/b3dpolygon.hxx
+++ b/basegfx/inc/basegfx/polygon/b3dpolygon.hxx
@@ -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
diff --git a/basegfx/inc/basegfx/polygon/b3dpolygonclipper.hxx b/basegfx/inc/basegfx/polygon/b3dpolygonclipper.hxx
index 71c7f36d50d8..e60f7a7977c5 100644
--- a/basegfx/inc/basegfx/polygon/b3dpolygonclipper.hxx
+++ b/basegfx/inc/basegfx/polygon/b3dpolygonclipper.hxx
@@ -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
@@ -41,13 +41,13 @@ namespace basegfx
 
     namespace tools
     {
-        /** define for deciding one of X,Y,Z directions
+        /**	define for deciding one of X,Y,Z directions
         */
         enum B3DOrientation
         {
-            B3DORIENTATION_X,       // X-Axis
-            B3DORIENTATION_Y,       // Y-Axis
-            B3DORIENTATION_Z        // Z-Axis
+            B3DORIENTATION_X,		// X-Axis
+            B3DORIENTATION_Y,		// Y-Axis
+            B3DORIENTATION_Z		// Z-Axis
         };
 
         // Clip given 3D polygon against a plane orthogonal to X,Y or Z axis. The plane is defined using the
diff --git a/basegfx/inc/basegfx/polygon/b3dpolygontools.hxx b/basegfx/inc/basegfx/polygon/b3dpolygontools.hxx
index 7945fc1bde00..0ab6fbf371de 100644
--- a/basegfx/inc/basegfx/polygon/b3dpolygontools.hxx
+++ b/basegfx/inc/basegfx/polygon/b3dpolygontools.hxx
@@ -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
@@ -46,7 +46,7 @@ namespace basegfx
     {
         // B3DPolygon tools
 
-        /** Check if given polygon is closed. This is kind of a
+        /**	Check if given polygon is closed. This is kind of a
             'classic' method to support old polygon definitions.
             Those old polygon definitions define the closed state
             of the polygon using identical start and endpoints. This
@@ -105,15 +105,15 @@ namespace basegfx
             For a description see applyLineDashing in b2dpolygontoos.hxx
         */
         void applyLineDashing(
-            const B3DPolygon& rCandidate,
-            const ::std::vector<double>& rDotDashArray,
+            const B3DPolygon& rCandidate, 
+            const ::std::vector<double>& rDotDashArray, 
             B3DPolyPolygon* pLineTarget,
             B3DPolyPolygon* pGapTarget = 0,
             double fFullDashDotLen = 0.0);
 
         /** Create/replace normals for given 3d geometry with default normals from given center to outside.
-            rCandidate: the 3d geometry to change
-            rCenter:    the center of the 3d geometry
+            rCandidate:	the 3d geometry to change
+            rCenter:	the center of the 3d geometry
          */
         B3DPolygon applyDefaultNormalsSphere( const B3DPolygon& rCandidate, const B3DPoint& rCenter);
 
@@ -141,8 +141,8 @@ namespace basegfx
         // fDistance, and the sphere around both points with radius fDistance.
         bool isInEpsilonRange(const B3DPoint& rEdgeStart, const B3DPoint& rEdgeEnd, const B3DPoint& rTestPosition, double fDistance);
 
-        // test if point is inside epsilon-range around the given Polygon. Can be used
-        // for HitTesting. The epsilon-range is defined to be the cylinder centered to
+        // test if point is inside epsilon-range around the given Polygon. Can be used 
+        // for HitTesting. The epsilon-range is defined to be the cylinder centered to 
         // the given edge, using radius fDistance, and the sphere around both points with radius fDistance.
         bool isInEpsilonRange(const B3DPolygon& rCandidate, const B3DPoint& rTestPosition, double fDistance);
 
@@ -154,7 +154,7 @@ namespace basegfx
         // calculates if given point is on given line, taking care of the numerical epsilon
         bool isPointOnLine(const B3DPoint& rStart, const B3DPoint& rEnd, const B3DPoint& rCandidate, bool bWithPoints = false);
 
-        // calculates if given point is on given polygon, taking care of the numerical epsilon. Uses
+        // calculates if given point is on given polygon, taking care of the numerical epsilon. Uses 
         // isPointOnLine internally
         bool isPointOnPolygon(const B3DPolygon& rCandidate, const B3DPoint& rPoint, bool bWithPoints = true);
 
@@ -174,7 +174,7 @@ namespace basegfx
         /** snap some polygon coordinates to discrete coordinates
 
             This method allows to snap some polygon points to discrete (integer) values
-            which equals e.g. a snap to discrete coordinates. It will snap points of
+            which equals e.g. a snap to discrete coordinates. It will snap points of 
             horizontal and vertical edges
 
             @param rCandidate
diff --git a/basegfx/inc/basegfx/polygon/b3dpolypolygon.hxx b/basegfx/inc/basegfx/polygon/b3dpolypolygon.hxx
index 76e0c2f844c0..08ff7a91f513 100644
--- a/basegfx/inc/basegfx/polygon/b3dpolypolygon.hxx
+++ b/basegfx/inc/basegfx/polygon/b3dpolypolygon.hxx
@@ -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
@@ -35,8 +35,8 @@
 class ImplB3DPolyPolygon;
 
 namespace basegfx
-{
-    class B3DPolygon;
+{ 
+    class B3DPolygon; 
     class B3DHomMatrix;
     class B2DHomMatrix;
 } // end of namespace basegfx
@@ -53,7 +53,7 @@ namespace basegfx
     private:
         ImplType                                        mpPolyPolygon;
 
-    public:
+    public:		
         B3DPolyPolygon();
         B3DPolyPolygon(const B3DPolyPolygon& rPolyPolygon);
         explicit B3DPolyPolygon(const B3DPolygon& rPolygon);
diff --git a/basegfx/inc/basegfx/polygon/b3dpolypolygontools.hxx b/basegfx/inc/basegfx/polygon/b3dpolypolygontools.hxx
index 813be9839a9a..881c7092d674 100644
--- a/basegfx/inc/basegfx/polygon/b3dpolypolygontools.hxx
+++ b/basegfx/inc/basegfx/polygon/b3dpolypolygontools.hxx
@@ -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
@@ -54,8 +54,8 @@ namespace basegfx
             For a description see applyLineDashing in b2dpolygontoos.hxx
         */
         void applyLineDashing(
-            const B3DPolyPolygon& rCandidate,
-            const ::std::vector<double>& rDotDashArray,
+            const B3DPolyPolygon& rCandidate, 
+            const ::std::vector<double>& rDotDashArray, 
             B3DPolyPolygon* pLineTarget,
             B3DPolyPolygon* pGapTarget = 0,
             double fFullDashDotLen = 0.0);
@@ -90,8 +90,8 @@ namespace basegfx
             If nHorSeg == 0 and/or nVerSeg == 0, a default will be calculated to have a step at least each 15 degrees.
             With VerStart, VerStop and hor range in cartesian may be specified to create a partial sphere only.
          */
-        B3DPolyPolygon createSpherePolyPolygonFromB3DRange(
-            const B3DRange& rRange,
+        B3DPolyPolygon createSpherePolyPolygonFromB3DRange( 
+            const B3DRange& rRange, 
             sal_uInt32 nHorSeg = 0L, sal_uInt32 nVerSeg = 0L,
             double fVerStart = F_PI2, double fVerStop = -F_PI2,
             double fHorStart = 0.0, double fHorStop = F_2PI);
@@ -108,16 +108,16 @@ namespace basegfx
         /** same as createSpherePolyPolygonFromB3DRange, but creates filled polygons (closed and oriented)
             There is one extra, the bool bNormals defines if normals will be set, default is false
          */
-        B3DPolyPolygon createSphereFillPolyPolygonFromB3DRange(
-            const B3DRange& rRange,
+        B3DPolyPolygon createSphereFillPolyPolygonFromB3DRange( 
+            const B3DRange& rRange, 
             sal_uInt32 nHorSeg = 0L, sal_uInt32 nVerSeg = 0L,
             bool bNormals = false,
             double fVerStart = F_PI2, double fVerStop = -F_PI2,
             double fHorStart = 0.0, double fHorStop = F_2PI);
 
         /** Create/replace normals for given 3d geometry with default normals from given center to outside.
-            rCandidate: the 3d geometry to change
-            rCenter:    the center of the 3d geometry
+            rCandidate:	the 3d geometry to change
+            rCenter:	the center of the 3d geometry
          */
         B3DPolyPolygon applyDefaultNormalsSphere( const B3DPolyPolygon& rCandidate, const B3DPoint& rCenter);
 
@@ -139,7 +139,7 @@ namespace basegfx
          */
         B3DPolyPolygon applyDefaultTextureCoordinatesSphere( const B3DPolyPolygon& rCandidate, const B3DPoint& rCenter, bool bChangeX = true, bool bChangeY = true);
 
-        // isInside test for B3DPoint. On border is not inside as long as not true is given
+        // isInside test for B3DPoint. On border is not inside as long as not true is given 
         // in bWithBorder flag. It is assumed that the orientations of the given polygon are correct.
         bool isInside(const B3DPolyPolygon& rCandidate, const B3DPoint& rPoint, bool bWithBorder = false);
 
diff --git a/basegfx/inc/basegfx/range/b1drange.hxx b/basegfx/inc/basegfx/range/b1drange.hxx
index eba1536f4ee6..07648a7aa4e1 100644
--- a/basegfx/inc/basegfx/range/b1drange.hxx
+++ b/basegfx/inc/basegfx/range/b1drange.hxx
@@ -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
@@ -37,55 +37,55 @@ namespace basegfx
 
     class B1DRange
     {
-        ::basegfx::BasicRange< double, DoubleTraits >   maRange;
+        ::basegfx::BasicRange< double, DoubleTraits >	maRange;
 
-    public:
-        B1DRange()
+    public:		
+        B1DRange() 
         {
         }
-
-        explicit B1DRange(double fStartValue)
-        :   maRange(fStartValue)
+        
+        explicit B1DRange(double fStartValue) 
+        :	maRange(fStartValue) 
         {
         }
-
-        B1DRange(double fStartValue1, double fStartValue2)
-        :   maRange(fStartValue1)
+        
+        B1DRange(double fStartValue1, double fStartValue2) 
+        :	maRange(fStartValue1) 
         {
             expand(fStartValue2);
         }
-
+        
         B1DRange(const B1DRange& rRange)
-        :   maRange(rRange.maRange)
+        :	maRange(rRange.maRange) 
         {
         }
 
         explicit B1DRange( const B1IRange& rRange );
 
-        bool isEmpty() const
+        bool isEmpty() const 
         {
             return maRange.isEmpty();
         }
 
-        void reset()
-        {
-            maRange.reset();
+        void reset() 
+        { 
+            maRange.reset(); 
         }
-
-        bool operator==( const B1DRange& rRange ) const
-        {
-            return (maRange == rRange.maRange);
+        
+        bool operator==( const B1DRange& rRange ) const 
+        { 
+            return (maRange == rRange.maRange); 
         }
 
-        bool operator!=( const B1DRange& rRange ) const
-        {
-            return (maRange != rRange.maRange);
+        bool operator!=( const B1DRange& rRange ) const 
+        { 
+            return (maRange != rRange.maRange); 
         }
 
-        B1DRange& operator=(const B1DRange& rRange)
-        {
-            maRange = rRange.maRange;
-            return *this;
+        B1DRange& operator=(const B1DRange& rRange) 
+        { 
+            maRange = rRange.maRange; 
+            return *this; 
         }
 
         bool equal(const B1DRange& rRange) const
@@ -93,64 +93,64 @@ namespace basegfx
             return (maRange.equal(rRange.maRange));
         }
 
-        double getMinimum() const
-        {
-            return maRange.getMinimum();
+        double getMinimum() const 
+        { 
+            return maRange.getMinimum(); 
         }
 
-        double getMaximum() const
-        {
-            return maRange.getMaximum();
+        double getMaximum() const 
+        { 
+            return maRange.getMaximum(); 
         }
 
-        double getRange() const
-        {
-            return maRange.getRange();
+        double getRange() const  
+        { 
+            return maRange.getRange(); 
         }
-
+    
         double getCenter() const
         {
-            return maRange.getCenter();
+            return maRange.getCenter(); 
         }
 
-        bool isInside(double fValue) const
-        {
-            return maRange.isInside(fValue);
+        bool isInside(double fValue) const 
+        { 
+            return maRange.isInside(fValue); 
         }
-
-        bool isInside(const B1DRange& rRange) const
-        {
-            return maRange.isInside(rRange.maRange);
+        
+        bool isInside(const B1DRange& rRange) const 
+        { 
+            return maRange.isInside(rRange.maRange); 
         }
 
-        bool overlaps(const B1DRange& rRange) const
-        {
-            return maRange.overlaps(rRange.maRange);
+        bool overlaps(const B1DRange& rRange) const 
+        { 
+            return maRange.overlaps(rRange.maRange); 
         }
 
-        bool overlapsMore(const B1DRange& rRange) const
-        {
-            return maRange.overlapsMore(rRange.maRange);
+        bool overlapsMore(const B1DRange& rRange) const 
+        { 
+            return maRange.overlapsMore(rRange.maRange); 
         }
 
-        void expand(double fValue)
-        {
-            maRange.expand(fValue);
+        void expand(double fValue) 
+        { 
+            maRange.expand(fValue); 
         }
 
-        void expand(const B1DRange& rRange)
-        {
-            maRange.expand(rRange.maRange);
+        void expand(const B1DRange& rRange) 
+        { 
+            maRange.expand(rRange.maRange); 
         }
 
-        void intersect(const B1DRange& rRange)
-        {
-            maRange.intersect(rRange.maRange);
+        void intersect(const B1DRange& rRange) 
+        { 
+            maRange.intersect(rRange.maRange); 
         }
 
         void grow(double fValue)
         {
-            maRange.grow(fValue);
+            maRange.grow(fValue); 
         }
     };
 
diff --git a/basegfx/inc/basegfx/range/b1ibox.hxx b/basegfx/inc/basegfx/range/b1ibox.hxx
index cb4ab8770a49..961bac7dfbd4 100644
--- a/basegfx/inc/basegfx/range/b1ibox.hxx
+++ b/basegfx/inc/basegfx/range/b1ibox.hxx
@@ -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
@@ -35,107 +35,107 @@ namespace basegfx
 {
     class B1IBox
     {
-        ::basegfx::BasicBox maRange;
+        ::basegfx::BasicBox	maRange;
 
-    public:
-        B1IBox()
+    public:		
+        B1IBox() 
         {
         }
-
-        explicit B1IBox(sal_Int32 nStartValue)
-        :   maRange(nStartValue)
+        
+        explicit B1IBox(sal_Int32 nStartValue) 
+        :	maRange(nStartValue) 
         {
         }
-
-        B1IBox(sal_Int32 nStartValue1, sal_Int32 nStartValue2)
-        :   maRange(nStartValue1)
+        
+        B1IBox(sal_Int32 nStartValue1, sal_Int32 nStartValue2) 
+        :	maRange(nStartValue1) 
         {
             expand(nStartValue2);
         }
 
         B1IBox(const B1IBox& rBox)
-        :   maRange(rBox.maRange)
+        :	maRange(rBox.maRange) 
         {
         }
 
-        bool isEmpty() const
+        bool isEmpty() const 
         {
             return maRange.isEmpty();
         }
 
-        void reset()
-        {
-            maRange.reset();
+        void reset() 
+        { 
+            maRange.reset(); 
         }
-
-        bool operator==( const B1IBox& rBox ) const
-        {
-            return (maRange == rBox.maRange);
+        
+        bool operator==( const B1IBox& rBox ) const 
+        { 
+            return (maRange == rBox.maRange); 
         }
 
-        bool operator!=( const B1IBox& rBox ) const
-        {
-            return (maRange != rBox.maRange);
+        bool operator!=( const B1IBox& rBox ) const 
+        { 
+            return (maRange != rBox.maRange); 
         }
 
-        void operator=(const B1IBox& rBox)
-        {
-            maRange = rBox.maRange;
+        void operator=(const B1IBox& rBox) 
+        { 
+            maRange = rBox.maRange; 
         }
 
-        sal_Int32 getMinimum() const
-        {
-            return maRange.getMinimum();
+        sal_Int32 getMinimum() const 
+        { 
+            return maRange.getMinimum(); 
         }
 
-        sal_Int32 getMaximum() const
-        {
-            return maRange.getMaximum();
+        sal_Int32 getMaximum() const 
+        { 
+            return maRange.getMaximum(); 
         }
 
-        Int32Traits::DifferenceType getRange() const
-        {
-            return maRange.getRange();
+        Int32Traits::DifferenceType getRange() const  
+        { 
+            return maRange.getRange(); 
         }
-
+    
         double getCenter() const
         {
-            return maRange.getCenter();
+            return maRange.getCenter(); 
         }
 
-        bool isInside(sal_Int32 nValue) const
-        {
-            return maRange.isInside(nValue);
+        bool isInside(sal_Int32 nValue) const 
+        { 
+            return maRange.isInside(nValue); 
         }
-
-        bool isInside(const B1IBox& rBox) const
-        {
-            return maRange.isInside(rBox.maRange);
+        
+        bool isInside(const B1IBox& rBox) const 
+        { 
+            return maRange.isInside(rBox.maRange); 
         }
 
-        bool overlaps(const B1IBox& rBox) const
-        {
-            return maRange.overlaps(rBox.maRange);
+        bool overlaps(const B1IBox& rBox) const 
+        { 
+            return maRange.overlaps(rBox.maRange); 
         }
 
-        void expand(sal_Int32 nValue)
-        {
-            maRange.expand(nValue);
+        void expand(sal_Int32 nValue) 
+        { 
+            maRange.expand(nValue); 
         }
 
-        void expand(const B1IBox& rBox)
-        {
-            maRange.expand(rBox.maRange);
+        void expand(const B1IBox& rBox) 
+        { 
+            maRange.expand(rBox.maRange); 
         }
 
-        void intersect(const B1IBox& rBox)
-        {
-            maRange.intersect(rBox.maRange);
+        void intersect(const B1IBox& rBox) 
+        { 
+            maRange.intersect(rBox.maRange); 
         }
 
         void grow(sal_Int32 nValue)
         {
-            maRange.grow(nValue);
+            maRange.grow(nValue); 
         }
     };
 } // end of namespace basegfx
diff --git a/basegfx/inc/basegfx/range/b1irange.hxx b/basegfx/inc/basegfx/range/b1irange.hxx
index 6c65fbaebff4..e65d3e62ead4 100644
--- a/basegfx/inc/basegfx/range/b1irange.hxx
+++ b/basegfx/inc/basegfx/range/b1irange.hxx
@@ -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
@@ -35,108 +35,108 @@ namespace basegfx
 {
     class B1IRange
     {
-        ::basegfx::BasicRange< sal_Int32, Int32Traits > maRange;
+        ::basegfx::BasicRange< sal_Int32, Int32Traits >	maRange;
 
-    public:
-        B1IRange()
+    public:		
+        B1IRange() 
         {
         }
-
-        explicit B1IRange(sal_Int32 nStartValue)
-        :   maRange(nStartValue)
+        
+        explicit B1IRange(sal_Int32 nStartValue) 
+        :	maRange(nStartValue) 
         {
         }
-
-        B1IRange(sal_Int32 nStartValue1, sal_Int32 nStartValue2)
-        :   maRange(nStartValue1)
+        
+        B1IRange(sal_Int32 nStartValue1, sal_Int32 nStartValue2) 
+        :	maRange(nStartValue1) 
         {
             expand(nStartValue2);
         }
 
         B1IRange(const B1IRange& rRange)
-        :   maRange(rRange.maRange)
+        :	maRange(rRange.maRange) 
         {
         }
 
-        bool isEmpty() const
+        bool isEmpty() const 
         {
             return maRange.isEmpty();
         }
 
-        void reset()
-        {
-            maRange.reset();
+        void reset() 
+        { 
+            maRange.reset(); 
         }
-
-        bool operator==( const B1IRange& rRange ) const
-        {
-            return (maRange == rRange.maRange);
+        
+        bool operator==( const B1IRange& rRange ) const 
+        { 
+            return (maRange == rRange.maRange); 
         }
 
-        bool operator!=( const B1IRange& rRange ) const
-        {
-            return (maRange != rRange.maRange);
+        bool operator!=( const B1IRange& rRange ) const 
+        { 
+            return (maRange != rRange.maRange); 
         }
 
-        B1IRange& operator=(const B1IRange& rRange)
-        {
-            maRange = rRange.maRange;
-            return *this;
+        B1IRange& operator=(const B1IRange& rRange) 
+        { 
+            maRange = rRange.maRange; 
+            return *this; 
         }
 
-        sal_Int32 getMinimum() const
-        {
-            return maRange.getMinimum();
+        sal_Int32 getMinimum() const 
+        { 
+            return maRange.getMinimum(); 
         }
 
-        sal_Int32 getMaximum() const
-        {
-            return maRange.getMaximum();
+        sal_Int32 getMaximum() const 
+        { 
+            return maRange.getMaximum(); 
         }
 
-        Int32Traits::DifferenceType getRange() const
-        {
-            return maRange.getRange();
+        Int32Traits::DifferenceType getRange() const  
+        { 
+            return maRange.getRange(); 
         }
-
+    
         double getCenter() const
         {
-            return maRange.getCenter();
+            return maRange.getCenter(); 
         }
 
-        bool isInside(sal_Int32 nValue) const
-        {
-            return maRange.isInside(nValue);
+        bool isInside(sal_Int32 nValue) const 
+        { 
+            return maRange.isInside(nValue); 
         }
-
-        bool isInside(const B1IRange& rRange) const
-        {
-            return maRange.isInside(rRange.maRange);
+        
+        bool isInside(const B1IRange& rRange) const 
+        { 
+            return maRange.isInside(rRange.maRange); 
         }
 
-        bool overlaps(const B1IRange& rRange) const
-        {
-            return maRange.overlaps(rRange.maRange);
+        bool overlaps(const B1IRange& rRange) const 
+        { 
+            return maRange.overlaps(rRange.maRange); 
         }
 
-        void expand(sal_Int32 nValue)
-        {
-            maRange.expand(nValue);
+        void expand(sal_Int32 nValue) 
+        { 
+            maRange.expand(nValue); 
         }
 
-        void expand(const B1IRange& rRange)
-        {
-            maRange.expand(rRange.maRange);
+        void expand(const B1IRange& rRange) 
+        { 
+            maRange.expand(rRange.maRange); 
         }
 
-        void intersect(const B1IRange& rRange)
-        {
-            maRange.intersect(rRange.maRange);
+        void intersect(const B1IRange& rRange) 
+        { 
+            maRange.intersect(rRange.maRange); 
         }
 
         void grow(sal_Int32 nValue)
         {
-            maRange.grow(nValue);
+            maRange.grow(nValue); 
         }
     };
 } // end of namespace basegfx
diff --git a/basegfx/inc/basegfx/range/b2dconnectedranges.hxx b/basegfx/inc/basegfx/range/b2dconnectedranges.hxx
index 6c41ede934cf..6d110e43d732 100644
--- a/basegfx/inc/basegfx/range/b2dconnectedranges.hxx
+++ b/basegfx/inc/basegfx/range/b2dconnectedranges.hxx
@@ -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
@@ -72,16 +72,16 @@ namespace basegfx
     public:
         /// Type of the basic entity (rect + user data)
         typedef ::std::pair< B2DRange, UserData > ComponentType;
-        typedef ::std::list< ComponentType >      ComponentListType;
+        typedef ::std::list< ComponentType >	  ComponentListType;
 
         /// List of (intersecting) components, plus overall bounds
         struct ConnectedComponents
         {
-            ComponentListType   maComponentList;
-            B2DRange            maTotalBounds;
+            ComponentListType	maComponentList;
+            B2DRange			maTotalBounds;
         };
 
-        typedef ::std::list< ConnectedComponents > ConnectedComponentsType;
+        typedef ::std::list< ConnectedComponents > ConnectedComponentsType;	
 
 
         /// Create the range calculator
@@ -108,15 +108,15 @@ namespace basegfx
             ranges (typically, for well-behaved input, it is O(n)
             though).
          */
-        void addRange( const B2DRange&  rRange,
-                       const UserData&  rUserData )
+        void addRange( const B2DRange& 	rRange,
+                       const UserData&	rUserData )
         {
             // check whether fast path is possible: if new range is
             // outside accumulated total range, can add it as a
             // separate component right away.
-            const bool bNotOutsideEverything(
+            const bool bNotOutsideEverything( 
                 maTotalBounds.overlaps( rRange ) );
-
+            
             // update own global bounds range
             maTotalBounds.expand( rRange );
 
@@ -171,7 +171,7 @@ namespace basegfx
                         // no position and size.
 
                         if( !aCurrAggregate->maTotalBounds.isEmpty() &&
-                            aCurrAggregate->maTotalBounds.overlaps(
+                            aCurrAggregate->maTotalBounds.overlaps( 
                                 aNewConnectedComponent.maTotalBounds ) )
                         {
                             // union the intersecting
@@ -180,13 +180,13 @@ namespace basegfx
 
                             // calc union bounding box
                             aNewConnectedComponent.maTotalBounds.expand( aCurrAggregate->maTotalBounds );
-
+                        
                             // extract all aCurrAggregate components
                             // to aNewConnectedComponent
-                            aNewConnectedComponent.maComponentList.splice(
-                                aNewConnectedComponent.maComponentList.end(),
+                            aNewConnectedComponent.maComponentList.splice( 
+                                aNewConnectedComponent.maComponentList.end(), 
                                 aCurrAggregate->maComponentList );
-
+                        
                             // remove and delete aCurrAggregate entry
                             // from list (we've gutted it's content
                             // above). list::erase() will update our
@@ -211,17 +211,17 @@ namespace basegfx
             //
 
             // add new component to the end of the component list
-            aNewConnectedComponent.maComponentList.push_back(
+            aNewConnectedComponent.maComponentList.push_back( 
                 ComponentType( rRange, rUserData ) );
-
+                               
             // do some consistency checks (aka post conditions)
             OSL_ENSURE( !aNewConnectedComponent.maComponentList.empty(),
                         "B2DConnectedRanges::addRange(): empty aggregate list" );
-            OSL_ENSURE( !aNewConnectedComponent.maTotalBounds.isEmpty() ||
-                        (aNewConnectedComponent.maTotalBounds.isEmpty() &&
+            OSL_ENSURE( !aNewConnectedComponent.maTotalBounds.isEmpty() || 
+                        (aNewConnectedComponent.maTotalBounds.isEmpty() && 
                          aNewConnectedComponent.maComponentList.size() == 1),
                         "B2DConnectedRanges::addRange(): empty ranges must be solitary");
-
+            
             // add aNewConnectedComponent as a new entry to
             // maDisjunctAggregatesList
             maDisjunctAggregatesList.push_back( aNewConnectedComponent );
@@ -241,7 +241,7 @@ namespace basegfx
                                     maDisjunctAggregatesList.end(),
                                     aFunctor );
         }
-
+        
     private:
         // default: disabled copy/assignment
         B2DConnectedRanges(const B2DConnectedRanges&);
@@ -252,11 +252,11 @@ namespace basegfx
             Each entry corresponds to one of the top-level rectangles
             in the drawing above.
          */
-        ConnectedComponentsType maDisjunctAggregatesList;
-
+        ConnectedComponentsType	maDisjunctAggregatesList;
+        
         /** Global bound rect over all added ranges.
          */
-        B2DRange                maTotalBounds;
+        B2DRange				maTotalBounds;
     };
 }
 
diff --git a/basegfx/inc/basegfx/range/b2dpolyrange.hxx b/basegfx/inc/basegfx/range/b2dpolyrange.hxx
index 2202869dc921..9faedb7f5c96 100644
--- a/basegfx/inc/basegfx/range/b2dpolyrange.hxx
+++ b/basegfx/inc/basegfx/range/b2dpolyrange.hxx
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2008 by Sun Microsystems, Inc.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/basegfx/inc/basegfx/range/b2drange.hxx b/basegfx/inc/basegfx/range/b2drange.hxx
index fc3a6fe53659..79ae376b683c 100644
--- a/basegfx/inc/basegfx/range/b2drange.hxx
+++ b/basegfx/inc/basegfx/range/b2drange.hxx
@@ -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
@@ -43,25 +43,25 @@ namespace basegfx
 
     class B2DRange
     {
-    public:
-        typedef double          ValueType;
-        typedef DoubleTraits    TraitsType;
+    public:		
+        typedef double 			ValueType;
+        typedef DoubleTraits 	TraitsType;
 
-        B2DRange()
+        B2DRange() 
         {
         }
-
+        
         explicit B2DRange(const B2DTuple& rTuple)
-        :   maRangeX(rTuple.getX()),
+        :	maRangeX(rTuple.getX()),
             maRangeY(rTuple.getY())
         {
         }
-
+        
         B2DRange(double x1,
                  double y1,
                  double x2,
                  double y2)
-        :   maRangeX(x1),
+        :	maRangeX(x1),
             maRangeY(y1)
         {
             maRangeX.expand(x2);
@@ -70,57 +70,57 @@ namespace basegfx
 
         B2DRange(const B2DTuple& rTuple1,
                  const B2DTuple& rTuple2)
-        :   maRangeX(rTuple1.getX()),
+        :	maRangeX(rTuple1.getX()),
             maRangeY(rTuple1.getY())
         {
             expand( rTuple2 );
         }
-
+        
         B2DRange(const B2DRange& rRange)
-        :   maRangeX(rRange.maRangeX),
+        :	maRangeX(rRange.maRangeX),
             maRangeY(rRange.maRangeY)
         {
         }
 
         explicit B2DRange(const B2IRange& rRange);
 
-        bool isEmpty() const
+        bool isEmpty() const 
         {
             return (
-                maRangeX.isEmpty()
+                maRangeX.isEmpty() 
                 || maRangeY.isEmpty()
                 );
         }
 
-        void reset()
-        {
-            maRangeX.reset();
-            maRangeY.reset();
+        void reset() 
+        { 
+            maRangeX.reset(); 
+            maRangeY.reset(); 
         }
 
-        bool operator==( const B2DRange& rRange ) const
-        {
-            return (maRangeX == rRange.maRangeX
-                && maRangeY == rRange.maRangeY);
+        bool operator==( const B2DRange& rRange ) const 
+        { 
+            return (maRangeX == rRange.maRangeX 
+                && maRangeY == rRange.maRangeY); 
         }
 
-        bool operator!=( const B2DRange& rRange ) const
-        {
-            return (maRangeX != rRange.maRangeX
-                || maRangeY != rRange.maRangeY);
+        bool operator!=( const B2DRange& rRange ) const 
+        { 
+            return (maRangeX != rRange.maRangeX 
+                || maRangeY != rRange.maRangeY); 
         }
 
-        B2DRange& operator=(const B2DRange& rRange)
-        {
-            maRangeX = rRange.maRangeX;
-            maRangeY = rRange.maRangeY;
-            return *this;
+        B2DRange& operator=(const B2DRange& rRange) 
+        { 
+            maRangeX = rRange.maRangeX; 
+            maRangeY = rRange.maRangeY; 
+            return *this; 
         }
 
         bool equal(const B2DRange& rRange) const
         {
-            return (maRangeX.equal(rRange.maRangeX)
-                    && maRangeY.equal(rRange.maRangeY));
+            return (maRangeX.equal(rRange.maRangeX) 
+                    && maRangeY.equal(rRange.maRangeY)); 
         }
 
         double getMinX() const
@@ -160,7 +160,7 @@ namespace basegfx
                 maRangeY.getMinimum()
                 );
         }
-
+        
         B2DPoint getMaximum() const
         {
             return B2DPoint(
@@ -176,7 +176,7 @@ namespace basegfx
                 maRangeY.getRange()
                 );
         }
-
+    
         B2DPoint getCenter() const
         {
             return B2DPoint(
@@ -184,21 +184,21 @@ namespace basegfx
                 maRangeY.getCenter()
                 );
         }
-
+    
         double getCenterX() const
         {
             return maRangeX.getCenter();
         }
-
+    
         double getCenterY() const
         {
             return maRangeY.getCenter();
         }
-
+    
         bool isInside(const B2DTuple& rTuple) const
         {
             return (
-                maRangeX.isInside(rTuple.getX())
+                maRangeX.isInside(rTuple.getX()) 
                 && maRangeY.isInside(rTuple.getY())
                 );
         }
@@ -206,7 +206,7 @@ namespace basegfx
         bool isInside(const B2DRange& rRange) const
         {
             return (
-                maRangeX.isInside(rRange.maRangeX)
+                maRangeX.isInside(rRange.maRangeX) 
                 && maRangeY.isInside(rRange.maRangeY)
                 );
         }
@@ -214,7 +214,7 @@ namespace basegfx
         bool overlaps(const B2DRange& rRange) const
         {
             return (
-                maRangeX.overlaps(rRange.maRangeX)
+                maRangeX.overlaps(rRange.maRangeX) 
                 && maRangeY.overlaps(rRange.maRangeY)
                 );
         }
@@ -222,7 +222,7 @@ namespace basegfx
         bool overlapsMore(const B2DRange& rRange) const
         {
             return (
-                maRangeX.overlapsMore(rRange.maRangeX)
+                maRangeX.overlapsMore(rRange.maRangeX) 
                 && maRangeY.overlapsMore(rRange.maRangeY)
                 );
         }
@@ -235,29 +235,29 @@ namespace basegfx
 
         void expand(const B2DRange& rRange)
         {
-            maRangeX.expand(rRange.maRangeX);
-            maRangeY.expand(rRange.maRangeY);
+            maRangeX.expand(rRange.maRangeX); 
+            maRangeY.expand(rRange.maRangeY); 
         }
 
         void intersect(const B2DRange& rRange)
         {
-            maRangeX.intersect(rRange.maRangeX);
-            maRangeY.intersect(rRange.maRangeY);
+            maRangeX.intersect(rRange.maRangeX); 
+            maRangeY.intersect(rRange.maRangeY); 
         }
 
         void grow(double fValue)
         {
-            maRangeX.grow(fValue);
-            maRangeY.grow(fValue);
+            maRangeX.grow(fValue); 
+            maRangeY.grow(fValue); 
         }
 
         void transform(const B2DHomMatrix& rMatrix);
 
     private:
-        typedef ::basegfx::BasicRange< ValueType, TraitsType >  MyBasicRange;
+        typedef ::basegfx::BasicRange< ValueType, TraitsType >	MyBasicRange;
 
-        MyBasicRange        maRangeX;
-        MyBasicRange        maRangeY;
+        MyBasicRange		maRangeX;
+        MyBasicRange		maRangeY;
     };
 
     /** Round double to nearest integer for 2D range
@@ -285,9 +285,9 @@ namespace basegfx
 
         @return the input vector
      */
-    ::std::vector< B2DRange >& computeSetDifference( ::std::vector< B2DRange >& o_rResult,
-                                                     const B2DRange&            rFirst,
-                                                     const B2DRange&            rSecond );
+    ::std::vector< B2DRange >& computeSetDifference( ::std::vector< B2DRange >&	o_rResult,
+                                                     const B2DRange&			rFirst,
+                                                     const B2DRange&			rSecond );
 
 } // end of namespace basegfx
 
diff --git a/basegfx/inc/basegfx/range/b2drangeclipper.hxx b/basegfx/inc/basegfx/range/b2drangeclipper.hxx
index 3285ffeaffe1..1b08bbf7766c 100644
--- a/basegfx/inc/basegfx/range/b2drangeclipper.hxx
+++ b/basegfx/inc/basegfx/range/b2drangeclipper.hxx
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2008 by Sun Microsystems, Inc.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -39,13 +39,13 @@ namespace basegfx
     namespace tools
     {
         /** Extract poly-polygon w/o self-intersections from poly-range
-
+            
             Similar to the solveCrossovers(const B2DPolyPolygon&)
             method, this one calculates a self-intersection-free
             poly-polygon with the same topology, and encoding
             inside/outsidedness via polygon orientation and layering.
          */
-        B2DPolyPolygon solveCrossovers(const std::vector<B2DRange>& rRanges,
+        B2DPolyPolygon solveCrossovers(const std::vector<B2DRange>& rRanges, 
                                        const std::vector<B2VectorOrientation>& rOrientations);
     }
 }
diff --git a/basegfx/inc/basegfx/range/b2drectangle.hxx b/basegfx/inc/basegfx/range/b2drectangle.hxx
index 1fd2087f0bcd..f9924a9eddfa 100644
--- a/basegfx/inc/basegfx/range/b2drectangle.hxx
+++ b/basegfx/inc/basegfx/range/b2drectangle.hxx
@@ -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
diff --git a/basegfx/inc/basegfx/range/b2ibox.hxx b/basegfx/inc/basegfx/range/b2ibox.hxx
index a188c7e8abe6..575eb22fe13b 100644
--- a/basegfx/inc/basegfx/range/b2ibox.hxx
+++ b/basegfx/inc/basegfx/range/b2ibox.hxx
@@ -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
@@ -40,20 +40,20 @@ namespace basegfx
 {
     class B2IBox
     {
-    public:
-        typedef sal_Int32       ValueType;
-        typedef Int32Traits     TraitsType;
+    public:		
+        typedef sal_Int32 		ValueType;
+        typedef Int32Traits 	TraitsType;
 
-        B2IBox()
+        B2IBox() 
         {
         }
-
+        
         explicit B2IBox(const B2ITuple& rTuple)
-        :   maRangeX(rTuple.getX()),
+        :	maRangeX(rTuple.getX()),
             maRangeY(rTuple.getY())
         {
         }
-
+        
         B2IBox(sal_Int32 x1,
                sal_Int32 y1,
                sal_Int32 x2,
@@ -64,7 +64,7 @@ namespace basegfx
             maRangeX.expand(x2);
             maRangeY.expand(y2);
         }
-
+        
         B2IBox(const B2ITuple& rTuple1,
                const B2ITuple& rTuple2) :
             maRangeX(rTuple1.getX()),
@@ -72,40 +72,40 @@ namespace basegfx
         {
             expand( rTuple2 );
         }
-
+        
         B2IBox(const B2IBox& rBox) :
             maRangeX(rBox.maRangeX),
             maRangeY(rBox.maRangeY)
         {
         }
 
-        bool isEmpty() const
+        bool isEmpty() const 
         {
             return maRangeX.isEmpty() || maRangeY.isEmpty();
         }
 
-        void reset()
-        {
-            maRangeX.reset();
-            maRangeY.reset();
+        void reset() 
+        { 
+            maRangeX.reset(); 
+            maRangeY.reset(); 
         }
 
-        bool operator==( const B2IBox& rBox ) const
-        {
-            return (maRangeX == rBox.maRangeX
-                && maRangeY == rBox.maRangeY);
+        bool operator==( const B2IBox& rBox ) const 
+        { 
+            return (maRangeX == rBox.maRangeX 
+                && maRangeY == rBox.maRangeY); 
         }
 
-        bool operator!=( const B2IBox& rBox ) const
-        {
-            return (maRangeX != rBox.maRangeX
-                || maRangeY != rBox.maRangeY);
+        bool operator!=( const B2IBox& rBox ) const 
+        { 
+            return (maRangeX != rBox.maRangeX 
+                || maRangeY != rBox.maRangeY); 
         }
 
-        void operator=(const B2IBox& rBox)
-        {
-            maRangeX = rBox.maRangeX;
-            maRangeY = rBox.maRangeY;
+        void operator=(const B2IBox& rBox) 
+        { 
+            maRangeX = rBox.maRangeX; 
+            maRangeY = rBox.maRangeY; 
         }
 
         sal_Int32 getMinX() const
@@ -145,7 +145,7 @@ namespace basegfx
                 maRangeY.getMinimum()
                 );
         }
-
+        
         B2IPoint getMaximum() const
         {
             return B2IPoint(
@@ -161,7 +161,7 @@ namespace basegfx
                 maRangeY.getRange()
                 );
         }
-
+    
         B2DPoint getCenter() const
         {
             return B2DPoint(
@@ -169,11 +169,11 @@ namespace basegfx
                 maRangeY.getCenter()
                 );
         }
-
+    
         bool isInside(const B2ITuple& rTuple) const
         {
             return (
-                maRangeX.isInside(rTuple.getX())
+                maRangeX.isInside(rTuple.getX()) 
                 && maRangeY.isInside(rTuple.getY())
                 );
         }
@@ -181,7 +181,7 @@ namespace basegfx
         bool isInside(const B2IBox& rBox) const
         {
             return (
-                maRangeX.isInside(rBox.maRangeX)
+                maRangeX.isInside(rBox.maRangeX) 
                 && maRangeY.isInside(rBox.maRangeY)
                 );
         }
@@ -189,7 +189,7 @@ namespace basegfx
         bool overlaps(const B2IBox& rBox) const
         {
             return (
-                maRangeX.overlaps(rBox.maRangeX)
+                maRangeX.overlaps(rBox.maRangeX) 
                 && maRangeY.overlaps(rBox.maRangeY)
                 );
         }
@@ -202,25 +202,25 @@ namespace basegfx
 
         void expand(const B2IBox& rBox)
         {
-            maRangeX.expand(rBox.maRangeX);
-            maRangeY.expand(rBox.maRangeY);
+            maRangeX.expand(rBox.maRangeX); 
+            maRangeY.expand(rBox.maRangeY); 
         }
 
         void intersect(const B2IBox& rBox)
         {
-            maRangeX.intersect(rBox.maRangeX);
-            maRangeY.intersect(rBox.maRangeY);
+            maRangeX.intersect(rBox.maRangeX); 
+            maRangeY.intersect(rBox.maRangeY); 
         }
 
         void grow(sal_Int32 nValue)
         {
-            maRangeX.grow(nValue);
-            maRangeY.grow(nValue);
+            maRangeX.grow(nValue); 
+            maRangeY.grow(nValue); 
         }
 
     private:
-        BasicBox        maRangeX;
-        BasicBox        maRangeY;
+        BasicBox		maRangeX;
+        BasicBox		maRangeY;
     };
 
     /** Compute the set difference of the two given boxes
@@ -242,9 +242,9 @@ namespace basegfx
 
         @return the input vector
      */
-    ::std::vector< B2IBox >& computeSetDifference( ::std::vector< B2IBox >& o_rResult,
-                                                   const B2IBox&            rFirst,
-                                                   const B2IBox&            rSecond );
+    ::std::vector< B2IBox >& computeSetDifference( ::std::vector< B2IBox >&	o_rResult,
+                                                   const B2IBox&			rFirst,
+                                                   const B2IBox&			rSecond );
 
 } // end of namespace basegfx
 
diff --git a/basegfx/inc/basegfx/range/b2irange.hxx b/basegfx/inc/basegfx/range/b2irange.hxx
index 8d4690283da0..a672347330c5 100644
--- a/basegfx/inc/basegfx/range/b2irange.hxx
+++ b/basegfx/inc/basegfx/range/b2irange.hxx
@@ -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
@@ -40,73 +40,73 @@ namespace basegfx
 {
     class B2IRange
     {
-    public:
-        typedef sal_Int32       ValueType;
-        typedef Int32Traits     TraitsType;
+    public:		
+        typedef sal_Int32 		ValueType;
+        typedef Int32Traits 	TraitsType;
 
-        B2IRange()
+        B2IRange() 
         {
         }
-
+        
         explicit B2IRange(const B2ITuple& rTuple)
-        :   maRangeX(rTuple.getX()),
+        :	maRangeX(rTuple.getX()),
             maRangeY(rTuple.getY())
         {
         }
-
+        
         B2IRange(sal_Int32 x1,
                  sal_Int32 y1,
                  sal_Int32 x2,
                  sal_Int32 y2)
-        :   maRangeX(x1),
+        :	maRangeX(x1),
             maRangeY(y1)
         {
             maRangeX.expand(x2);
             maRangeY.expand(y2);
         }
-
+        
         B2IRange(const B2ITuple& rTuple1,
                  const B2ITuple& rTuple2)
-        :   maRangeX(rTuple1.getX()),
+        :	maRangeX(rTuple1.getX()),
             maRangeY(rTuple1.getY())
         {
             expand( rTuple2 );
         }
-
+        
         B2IRange(const B2IRange& rRange)
-        :   maRangeX(rRange.maRangeX),
+        :	maRangeX(rRange.maRangeX),
             maRangeY(rRange.maRangeY)
         {
         }
 
-        bool isEmpty() const
+        bool isEmpty() const 
         {
             return maRangeX.isEmpty() || maRangeY.isEmpty();
         }
 
-        void reset()
-        {
-            maRangeX.reset();
-            maRangeY.reset();
+        void reset() 
+        { 
+            maRangeX.reset(); 
+            maRangeY.reset(); 
         }
 
-        bool operator==( const B2IRange& rRange ) const
-        {
-            return (maRangeX == rRange.maRangeX
-                && maRangeY == rRange.maRangeY);
+        bool operator==( const B2IRange& rRange ) const 
+        { 
+            return (maRangeX == rRange.maRangeX 
+                && maRangeY == rRange.maRangeY); 
         }
 
-        bool operator!=( const B2IRange& rRange ) const
-        {
-            return (maRangeX != rRange.maRangeX
-                || maRangeY != rRange.maRangeY);
+        bool operator!=( const B2IRange& rRange ) const 
+        { 
+            return (maRangeX != rRange.maRangeX 
+                || maRangeY != rRange.maRangeY); 
         }
 
-        B2IRange& operator=(const B2IRange& rRange)
-        {
-            maRangeX = rRange.maRangeX;
-            maRangeY = rRange.maRangeY;
-            return *this;
+        B2IRange& operator=(const B2IRange& rRange) 
+        { 
+            maRangeX = rRange.maRangeX; 
+            maRangeY = rRange.maRangeY; 
+            return *this; 
         }
 
         sal_Int32 getMinX() const
@@ -146,7 +146,7 @@ namespace basegfx
                 maRangeY.getMinimum()
                 );
         }
-
+        
         B2IPoint getMaximum() const
         {
             return B2IPoint(
@@ -162,7 +162,7 @@ namespace basegfx
                 maRangeY.getRange()
                 );
         }
-
+    
         B2DPoint getCenter() const
         {
             return B2DPoint(
@@ -170,11 +170,11 @@ namespace basegfx
                 maRangeY.getCenter()
                 );
         }
-
+    
         bool isInside(const B2ITuple& rTuple) const
         {
             return (
-                maRangeX.isInside(rTuple.getX())
+                maRangeX.isInside(rTuple.getX()) 
                 && maRangeY.isInside(rTuple.getY())
                 );
         }
@@ -182,7 +182,7 @@ namespace basegfx
         bool isInside(const B2IRange& rRange) const
         {
             return (
-                maRangeX.isInside(rRange.maRangeX)
+                maRangeX.isInside(rRange.maRangeX) 
                 && maRangeY.isInside(rRange.maRangeY)
                 );
         }
@@ -190,7 +190,7 @@ namespace basegfx
         bool overlaps(const B2IRange& rRange) const
         {
             return (
-                maRangeX.overlaps(rRange.maRangeX)
+                maRangeX.overlaps(rRange.maRangeX) 
                 && maRangeY.overlaps(rRange.maRangeY)
                 );
         }
@@ -203,27 +203,27 @@ namespace basegfx
 
         void expand(const B2IRange& rRange)
         {
-            maRangeX.expand(rRange.maRangeX);
-            maRangeY.expand(rRange.maRangeY);
+            maRangeX.expand(rRange.maRangeX); 
+            maRangeY.expand(rRange.maRangeY); 
         }
 
         void intersect(const B2IRange& rRange)
         {
-            maRangeX.intersect(rRange.maRangeX);
-            maRangeY.intersect(rRange.maRangeY);
+            maRangeX.intersect(rRange.maRangeX); 
+            maRangeY.intersect(rRange.maRangeY); 
         }
 
         void grow(sal_Int32 nValue)
         {
-            maRangeX.grow(nValue);
-            maRangeY.grow(nValue);
+            maRangeX.grow(nValue); 
+            maRangeY.grow(nValue); 
         }
 
     private:
-        typedef ::basegfx::BasicRange< ValueType, TraitsType >  MyBasicRange;
+        typedef ::basegfx::BasicRange< ValueType, TraitsType >	MyBasicRange;
 
-        MyBasicRange        maRangeX;
-        MyBasicRange        maRangeY;
+        MyBasicRange		maRangeX;
+        MyBasicRange		maRangeY;
     };
 
     /** Compute the set difference of the two given ranges
@@ -245,9 +245,9 @@ namespace basegfx
 
         @return the input vector
      */
-    ::std::vector< B2IRange >& computeSetDifference( ::std::vector< B2IRange >& o_rResult,
-                                                     const B2IRange&            rFirst,
-                                                     const B2IRange&            rSecond );
+    ::std::vector< B2IRange >& computeSetDifference( ::std::vector< B2IRange >&	o_rResult,
+                                                     const B2IRange&			rFirst,
+                                                     const B2IRange&			rSecond );
 
 } // end of namespace basegfx
 
diff --git a/basegfx/inc/basegfx/range/b2irectangle.hxx b/basegfx/inc/basegfx/range/b2irectangle.hxx
index a9e46c82710c..7674253b30dd 100644
--- a/basegfx/inc/basegfx/range/b2irectangle.hxx
+++ b/basegfx/inc/basegfx/range/b2irectangle.hxx
@@ -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
diff --git a/basegfx/inc/basegfx/range/b3drange.hxx b/basegfx/inc/basegfx/range/b3drange.hxx
index 2a2a42aa0718..18d4b9437d84 100644
--- a/basegfx/inc/basegfx/range/b3drange.hxx
+++ b/basegfx/inc/basegfx/range/b3drange.hxx
@@ -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
@@ -41,31 +41,31 @@ namespace basegfx
 
     class B3DRange
     {
-        typedef ::basegfx::BasicRange< double, DoubleTraits >   MyBasicRange;
+        typedef ::basegfx::BasicRange< double, DoubleTraits >	MyBasicRange;
 
-        MyBasicRange            maRangeX;
-        MyBasicRange            maRangeY;
-        MyBasicRange            maRangeZ;
+        MyBasicRange			maRangeX;
+        MyBasicRange			maRangeY;
+        MyBasicRange			maRangeZ;
 
-    public:
-        B3DRange()
+    public:		
+        B3DRange() 
         {
         }
-
+        
         explicit B3DRange(const B3DTuple& rTuple)
-        :   maRangeX(rTuple.getX()),
+        :	maRangeX(rTuple.getX()),
             maRangeY(rTuple.getY()),
             maRangeZ(rTuple.getZ())
         {
         }
-
+        
         B3DRange(double x1,
                  double y1,
                  double z1,
                  double x2,
                  double y2,
                  double z2)
-        :   maRangeX(x1),
+        :	maRangeX(x1),
             maRangeY(y1),
             maRangeZ(z1)
         {
@@ -76,15 +76,15 @@ namespace basegfx
 
         B3DRange(const B3DTuple& rTuple1,
                  const B3DTuple& rTuple2)
-        :   maRangeX(rTuple1.getX()),
+        :	maRangeX(rTuple1.getX()),
             maRangeY(rTuple1.getY()),
             maRangeZ(rTuple1.getZ())
         {
             expand(rTuple2);
         }
-
+        
         B3DRange(const B3DRange& rRange)
-        :   maRangeX(rRange.maRangeX),
+        :	maRangeX(rRange.maRangeX),
             maRangeY(rRange.maRangeY),
             maRangeZ(rRange.maRangeZ)
         {
@@ -92,49 +92,49 @@ namespace basegfx
 
         explicit B3DRange(const B3IRange& rRange);
 
-        bool isEmpty() const
+        bool isEmpty() const 
         {
             return (
-                maRangeX.isEmpty()
-                || maRangeY.isEmpty()
+                maRangeX.isEmpty() 
+                || maRangeY.isEmpty() 
                 || maRangeZ.isEmpty()
                 );
         }
 
-        void reset()
-        {
-            maRangeX.reset();
-            maRangeY.reset();
-            maRangeZ.reset();
+        void reset() 
+        { 
+            maRangeX.reset(); 
+            maRangeY.reset(); 
+            maRangeZ.reset(); 
         }
-
-        bool operator==( const B3DRange& rRange ) const
-        {
-            return (maRangeX == rRange.maRangeX
+        
+        bool operator==( const B3DRange& rRange ) const 
+        { 
+            return (maRangeX == rRange.maRangeX 
                 && maRangeY == rRange.maRangeY
-                && maRangeZ == rRange.maRangeZ);
+                && maRangeZ == rRange.maRangeZ); 
         }
 
-        bool operator!=( const B3DRange& rRange ) const
-        {
-            return (maRangeX != rRange.maRangeX
+        bool operator!=( const B3DRange& rRange ) const 
+        { 
+            return (maRangeX != rRange.maRangeX 
                 || maRangeY != rRange.maRangeY
-                || maRangeZ != rRange.maRangeZ);
+                || maRangeZ != rRange.maRangeZ); 
         }
 
-        B3DRange& operator=(const B3DRange& rRange)
-        {
-            maRangeX = rRange.maRangeX;
-            maRangeY = rRange.maRangeY;
-            maRangeZ = rRange.maRangeZ;
-            return *this;
+        B3DRange& operator=(const B3DRange& rRange) 
+        { 
+            maRangeX = rRange.maRangeX; 
+            maRangeY = rRange.maRangeY; 
+            maRangeZ = rRange.maRangeZ; 
+            return *this; 
         }
 
         bool equal(const B3DRange& rRange) const
         {
-            return (maRangeX.equal(rRange.maRangeX)
+            return (maRangeX.equal(rRange.maRangeX) 
                     && maRangeY.equal(rRange.maRangeY)
-                    && maRangeZ.equal(rRange.maRangeZ));
+                    && maRangeZ.equal(rRange.maRangeZ)); 
         }
 
         double getMinX() const
@@ -190,7 +190,7 @@ namespace basegfx
                 maRangeZ.getMinimum()
                 );
         }
-
+        
         B3DPoint getMaximum() const
         {
             return B3DPoint(
@@ -208,7 +208,7 @@ namespace basegfx
                 maRangeZ.getRange()
                 );
         }
-
+    
         B3DPoint getCenter() const
         {
             return B3DPoint(
@@ -217,26 +217,26 @@ namespace basegfx
                 maRangeZ.getCenter()
                 );
         }
-
+    
         double getCenterX() const
         {
             return maRangeX.getCenter();
         }
-
+    
         double getCenterY() const
         {
             return maRangeY.getCenter();
         }
-
+    
         double getCenterZ() const
         {
             return maRangeZ.getCenter();
         }
-
+    
         bool isInside(const B3DTuple& rTuple) const
         {
             return (
-                maRangeX.isInside(rTuple.getX())
+                maRangeX.isInside(rTuple.getX()) 
                 && maRangeY.isInside(rTuple.getY())
                 && maRangeZ.isInside(rTuple.getZ())
                 );
@@ -245,7 +245,7 @@ namespace basegfx
         bool isInside(const B3DRange& rRange) const
         {
             return (
-                maRangeX.isInside(rRange.maRangeX)
+                maRangeX.isInside(rRange.maRangeX) 
                 && maRangeY.isInside(rRange.maRangeY)
                 && maRangeZ.isInside(rRange.maRangeZ)
                 );
@@ -254,7 +254,7 @@ namespace basegfx
         bool overlaps(const B3DRange& rRange) const
         {
             return (
-                maRangeX.overlaps(rRange.maRangeX)
+                maRangeX.overlaps(rRange.maRangeX) 
                 && maRangeY.overlaps(rRange.maRangeY)
                 && maRangeZ.overlaps(rRange.maRangeZ)
                 );
@@ -269,23 +269,23 @@ namespace basegfx
 
         void expand(const B3DRange& rRange)
         {
-            maRangeX.expand(rRange.maRangeX);
-            maRangeY.expand(rRange.maRangeY);
-            maRangeZ.expand(rRange.maRangeZ);
+            maRangeX.expand(rRange.maRangeX); 
+            maRangeY.expand(rRange.maRangeY); 
+            maRangeZ.expand(rRange.maRangeZ); 
         }
 
         void intersect(const B3DRange& rRange)
         {
-            maRangeX.intersect(rRange.maRangeX);
-            maRangeY.intersect(rRange.maRangeY);
-            maRangeZ.intersect(rRange.maRangeZ);
+            maRangeX.intersect(rRange.maRangeX); 
+            maRangeY.intersect(rRange.maRangeY); 
+            maRangeZ.intersect(rRange.maRangeZ); 
         }
 
         void grow(double fValue)
         {
-            maRangeX.grow(fValue);
-            maRangeY.grow(fValue);
-            maRangeZ.grow(fValue);
+            maRangeX.grow(fValue); 
+            maRangeY.grow(fValue); 
+            maRangeZ.grow(fValue); 
         }
 
         void transform(const B3DHomMatrix& rMatrix);
diff --git a/basegfx/inc/basegfx/range/b3dvolume.hxx b/basegfx/inc/basegfx/range/b3dvolume.hxx
index 18163d5b6c34..c844b4f00c27 100644
--- a/basegfx/inc/basegfx/range/b3dvolume.hxx
+++ b/basegfx/inc/basegfx/range/b3dvolume.hxx
@@ -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
diff --git a/basegfx/inc/basegfx/range/b3ibox.hxx b/basegfx/inc/basegfx/range/b3ibox.hxx
index f9693465a2bb..f2f5d8aada4f 100644
--- a/basegfx/inc/basegfx/range/b3ibox.hxx
+++ b/basegfx/inc/basegfx/range/b3ibox.hxx
@@ -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
@@ -38,22 +38,22 @@ namespace basegfx
 {
     class B3IBox
     {
-        BasicBox            maRangeX;
-        BasicBox            maRangeY;
-        BasicBox            maRangeZ;
+        BasicBox			maRangeX;
+        BasicBox			maRangeY;
+        BasicBox			maRangeZ;
 
-    public:
-        B3IBox()
+    public:		
+        B3IBox() 
         {
         }
-
+        
         explicit B3IBox(const B3ITuple& rTuple) :
             maRangeX(rTuple.getX()),
             maRangeY(rTuple.getY()),
             maRangeZ(rTuple.getZ())
         {
         }
-
+        
         B3IBox(sal_Int32 x1,
                sal_Int32 y1,
                sal_Int32 z1,
@@ -85,37 +85,37 @@ namespace basegfx
         {
         }
 
-        bool isEmpty() const
+        bool isEmpty() const 
         {
             return maRangeX.isEmpty() || maRangeY.isEmpty() || maRangeZ.isEmpty();
         }
 
-        void reset()
-        {
-            maRangeX.reset();
-            maRangeY.reset();
-            maRangeZ.reset();
+        void reset() 
+        { 
+            maRangeX.reset(); 
+            maRangeY.reset(); 
+            maRangeZ.reset(); 
         }
-
-        bool operator==( const B3IBox& rBox ) const
-        {
-            return (maRangeX == rBox.maRangeX
+        
+        bool operator==( const B3IBox& rBox ) const 
+        { 
+            return (maRangeX == rBox.maRangeX 
                 && maRangeY == rBox.maRangeY
-                && maRangeZ == rBox.maRangeZ);
+                && maRangeZ == rBox.maRangeZ); 
         }
 
-        bool operator!=( const B3IBox& rBox ) const
-        {
-            return (maRangeX != rBox.maRangeX
+        bool operator!=( const B3IBox& rBox ) const 
+        { 
+            return (maRangeX != rBox.maRangeX 
                 || maRangeY != rBox.maRangeY
-                || maRangeZ != rBox.maRangeZ);
+                || maRangeZ != rBox.maRangeZ); 
         }
 
-        void operator=(const B3IBox& rBox)
-        {
-            maRangeX = rBox.maRangeX;
-            maRangeY = rBox.maRangeY;
-            maRangeZ = rBox.maRangeZ;
+        void operator=(const B3IBox& rBox) 
+        { 
+            maRangeX = rBox.maRangeX; 
+            maRangeY = rBox.maRangeY; 
+            maRangeZ = rBox.maRangeZ; 
         }
 
         sal_Int32 getMinX() const
@@ -171,7 +171,7 @@ namespace basegfx
                 maRangeZ.getMinimum()
                 );
         }
-
+        
         B3IPoint getMaximum() const
         {
             return B3IPoint(
@@ -189,7 +189,7 @@ namespace basegfx
                 maRangeZ.getRange()
                 );
         }
-
+    
         B3DPoint getCenter() const
         {
             return B3DPoint(
@@ -198,11 +198,11 @@ namespace basegfx
                 maRangeZ.getCenter()
                 );
         }
-
+    
         bool isInside(const B3ITuple& rTuple) const
         {
             return (
-                maRangeX.isInside(rTuple.getX())
+                maRangeX.isInside(rTuple.getX()) 
                 && maRangeY.isInside(rTuple.getY())
                 && maRangeZ.isInside(rTuple.getZ())
                 );
@@ -211,7 +211,7 @@ namespace basegfx
         bool isInside(const B3IBox& rBox) const
         {
             return (
-                maRangeX.isInside(rBox.maRangeX)
+                maRangeX.isInside(rBox.maRangeX) 
                 && maRangeY.isInside(rBox.maRangeY)
                 && maRangeZ.isInside(rBox.maRangeZ)
                 );
@@ -220,7 +220,7 @@ namespace basegfx
         bool overlaps(const B3IBox& rBox) const
         {
             return (
-                maRangeX.overlaps(rBox.maRangeX)
+                maRangeX.overlaps(rBox.maRangeX) 
                 && maRangeY.overlaps(rBox.maRangeY)
                 && maRangeZ.overlaps(rBox.maRangeZ)
                 );
@@ -235,23 +235,23 @@ namespace basegfx
 
         void expand(const B3IBox& rBox)
         {
-            maRangeX.expand(rBox.maRangeX);
-            maRangeY.expand(rBox.maRangeY);
-            maRangeZ.expand(rBox.maRangeZ);
+            maRangeX.expand(rBox.maRangeX); 
+            maRangeY.expand(rBox.maRangeY); 
+            maRangeZ.expand(rBox.maRangeZ); 
         }
 
         void intersect(const B3IBox& rBox)
         {
-            maRangeX.intersect(rBox.maRangeX);
-            maRangeY.intersect(rBox.maRangeY);
-            maRangeZ.intersect(rBox.maRangeZ);
+            maRangeX.intersect(rBox.maRangeX); 
+            maRangeY.intersect(rBox.maRangeY); 
+            maRangeZ.intersect(rBox.maRangeZ); 
         }
 
         void grow(sal_Int32 nValue)
         {
-            maRangeX.grow(nValue);
-            maRangeY.grow(nValue);
-            maRangeZ.grow(nValue);
+            maRangeX.grow(nValue); 
+            maRangeY.grow(nValue); 
+            maRangeZ.grow(nValue); 
         }
     };
 } // end of namespace basegfx
diff --git a/basegfx/inc/basegfx/range/b3irange.hxx b/basegfx/inc/basegfx/range/b3irange.hxx
index e2b9a08c3093..057c15579ed0 100644
--- a/basegfx/inc/basegfx/range/b3irange.hxx
+++ b/basegfx/inc/basegfx/range/b3irange.hxx
@@ -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
@@ -38,31 +38,31 @@ namespace basegfx
 {
     class B3IRange
     {
-        typedef ::basegfx::BasicRange< sal_Int32, Int32Traits > MyBasicRange;
+        typedef ::basegfx::BasicRange< sal_Int32, Int32Traits >	MyBasicRange;
 
-        MyBasicRange            maRangeX;
-        MyBasicRange            maRangeY;
-        MyBasicRange            maRangeZ;
+        MyBasicRange			maRangeX;
+        MyBasicRange			maRangeY;
+        MyBasicRange			maRangeZ;
 
-    public:
-        B3IRange()
+    public:		
+        B3IRange() 
         {
         }
-
+        
         explicit B3IRange(const B3ITuple& rTuple)
-        :   maRangeX(rTuple.getX()),
+        :	maRangeX(rTuple.getX()),
             maRangeY(rTuple.getY()),
             maRangeZ(rTuple.getZ())
         {
         }
-
+        
         B3IRange(sal_Int32 x1,
                  sal_Int32 y1,
                  sal_Int32 z1,
                  sal_Int32 x2,
                  sal_Int32 y2,
                  sal_Int32 z2)
-        :   maRangeX(x1),
+        :	maRangeX(x1),
             maRangeY(y1),
             maRangeZ(z1)
         {
@@ -73,7 +73,7 @@ namespace basegfx
 
         B3IRange(const B3ITuple& rTuple1,
                  const B3ITuple& rTuple2)
-        :   maRangeX(rTuple1.getX()),
+        :	maRangeX(rTuple1.getX()),
             maRangeY(rTuple1.getY()),
             maRangeZ(rTuple1.getZ())
         {
@@ -81,44 +81,44 @@ namespace basegfx
         }
 
         B3IRange(const B3IRange& rRange)
-        :   maRangeX(rRange.maRangeX),
+        :	maRangeX(rRange.maRangeX),
             maRangeY(rRange.maRangeY),
             maRangeZ(rRange.maRangeZ)
         {
         }
 
-        bool isEmpty() const
+        bool isEmpty() const 
         {
             return maRangeX.isEmpty() || maRangeY.isEmpty() || maRangeZ.isEmpty();
         }
 
-        void reset()
-        {
-            maRangeX.reset();
-            maRangeY.reset();
-            maRangeZ.reset();
+        void reset() 
+        { 
+            maRangeX.reset(); 
+            maRangeY.reset(); 
+            maRangeZ.reset(); 
         }
-
-        bool operator==( const B3IRange& rRange ) const
-        {
-            return (maRangeX == rRange.maRangeX
+        
+        bool operator==( const B3IRange& rRange ) const 
+        { 
+            return (maRangeX == rRange.maRangeX 
                 && maRangeY == rRange.maRangeY
-                && maRangeZ == rRange.maRangeZ);
+                && maRangeZ == rRange.maRangeZ); 
         }
 
-        bool operator!=( const B3IRange& rRange ) const
-        {
-            return (maRangeX != rRange.maRangeX
+        bool operator!=( const B3IRange& rRange ) const 
+        { 
+            return (maRangeX != rRange.maRangeX 
                 || maRangeY != rRange.maRangeY
-                || maRangeZ != rRange.maRangeZ);
+                || maRangeZ != rRange.maRangeZ); 
         }
 
-        B3IRange& operator=(const B3IRange& rRange)
-        {
-            maRangeX = rRange.maRangeX;
-            maRangeY = rRange.maRangeY;
-            maRangeZ = rRange.maRangeZ;
-            return *this;
+        B3IRange& operator=(const B3IRange& rRange) 
+        { 
+            maRangeX = rRange.maRangeX; 
+            maRangeY = rRange.maRangeY; 
+            maRangeZ = rRange.maRangeZ; 
+            return *this; 
         }
 
         sal_Int32 getMinX() const
@@ -174,7 +174,7 @@ namespace basegfx
                 maRangeZ.getMinimum()
                 );
         }
-
+        
         B3IPoint getMaximum() const
         {
             return B3IPoint(
@@ -192,7 +192,7 @@ namespace basegfx
                 maRangeZ.getRange()
                 );
         }
-
+    
         B3DPoint getCenter() const
         {
             return B3DPoint(
@@ -201,11 +201,11 @@ namespace basegfx
                 maRangeZ.getCenter()
                 );
         }
-
+    
         bool isInside(const B3ITuple& rTuple) const
         {
             return (
-                maRangeX.isInside(rTuple.getX())
+                maRangeX.isInside(rTuple.getX()) 
                 && maRangeY.isInside(rTuple.getY())
                 && maRangeZ.isInside(rTuple.getZ())
                 );
@@ -214,7 +214,7 @@ namespace basegfx
         bool isInside(const B3IRange& rRange) const
         {
             return (
-                maRangeX.isInside(rRange.maRangeX)
+                maRangeX.isInside(rRange.maRangeX) 
                 && maRangeY.isInside(rRange.maRangeY)
                 && maRangeZ.isInside(rRange.maRangeZ)
                 );
@@ -223,7 +223,7 @@ namespace basegfx
         bool overlaps(const B3IRange& rRange) const
         {
             return (
-                maRangeX.overlaps(rRange.maRangeX)
+                maRangeX.overlaps(rRange.maRangeX) 
                 && maRangeY.overlaps(rRange.maRangeY)
                 && maRangeZ.overlaps(rRange.maRangeZ)
                 );
@@ -238,23 +238,23 @@ namespace basegfx
 
         void expand(const B3IRange& rRange)
         {
-            maRangeX.expand(rRange.maRangeX);
-            maRangeY.expand(rRange.maRangeY);
-            maRangeZ.expand(rRange.maRangeZ);
+            maRangeX.expand(rRange.maRangeX); 
+            maRangeY.expand(rRange.maRangeY); 
+            maRangeZ.expand(rRange.maRangeZ); 
         }
 
         void intersect(const B3IRange& rRange)
         {
-            maRangeX.intersect(rRange.maRangeX);
-            maRangeY.intersect(rRange.maRangeY);
-            maRangeZ.intersect(rRange.maRangeZ);
+            maRangeX.intersect(rRange.maRangeX); 
+            maRangeY.intersect(rRange.maRangeY); 
+            maRangeZ.intersect(rRange.maRangeZ); 
         }
 
         void grow(sal_Int32 nValue)
         {
-            maRangeX.grow(nValue);
-            maRangeY.grow(nValue);
-            maRangeZ.grow(nValue);
+            maRangeX.grow(nValue); 
+            maRangeY.grow(nValue); 
+            maRangeZ.grow(nValue); 
         }
     };
 } // end of namespace basegfx
diff --git a/basegfx/inc/basegfx/range/b3ivolume.hxx b/basegfx/inc/basegfx/range/b3ivolume.hxx
index 0250a9050251..6349c7abd089 100644
--- a/basegfx/inc/basegfx/range/b3ivolume.hxx
+++ b/basegfx/inc/basegfx/range/b3ivolume.hxx
@@ -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
diff --git a/basegfx/inc/basegfx/range/basicbox.hxx b/basegfx/inc/basegfx/range/basicbox.hxx
index 0a5274bc9bc9..a426c8ccd925 100644
--- a/basegfx/inc/basegfx/range/basicbox.hxx
+++ b/basegfx/inc/basegfx/range/basicbox.hxx
@@ -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
diff --git a/basegfx/inc/basegfx/range/basicrange.hxx b/basegfx/inc/basegfx/range/basicrange.hxx
index 578e36824cf3..44b94ec229c7 100644
--- a/basegfx/inc/basegfx/range/basicrange.hxx
+++ b/basegfx/inc/basegfx/range/basicrange.hxx
@@ -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
@@ -38,12 +38,12 @@ namespace basegfx
     template< typename T, typename Traits > class BasicRange
     {
     protected:
-        T       mnMinimum;
-        T       mnMaximum;
-
+        T		mnMinimum;
+        T		mnMaximum;
+                            
     public:
-        typedef T       ValueType;
-        typedef Traits  TraitsType;
+        typedef T 		ValueType;
+        typedef Traits	TraitsType;
 
         BasicRange() :
             mnMinimum(Traits::maxVal()),
@@ -147,13 +147,13 @@ namespace basegfx
             return ((rRange.mnMaximum > mnMinimum) && (rRange.mnMinimum < mnMaximum));
         }
 
-        bool operator==( const BasicRange& rRange ) const
-        {
+        bool operator==( const BasicRange& rRange ) const 
+        { 
             return (mnMinimum == rRange.mnMinimum && mnMaximum == rRange.mnMaximum);
         }
 
-        bool operator!=( const BasicRange& rRange ) const
-        {
+        bool operator!=( const BasicRange& rRange ) const 
+        { 
             return (mnMinimum != rRange.mnMinimum || mnMaximum != rRange.mnMaximum);
         }
 
@@ -161,13 +161,13 @@ namespace basegfx
         {
             mnMinimum = rRange.mnMinimum;
             mnMaximum = rRange.mnMaximum;
-            return *this;
+            return *this; 
         }
 
         bool equal(const BasicRange& rRange) const
         {
             return (
-                fTools::equal(mnMinimum, rRange.mnMinimum) &&
+                fTools::equal(mnMinimum, rRange.mnMinimum) && 
                 fTools::equal(mnMaximum, rRange.mnMaximum));
         }
 
@@ -206,7 +206,7 @@ namespace basegfx
                     {
                         mnMinimum = rRange.mnMinimum;
                     }
-
+                    
                     if(rRange.mnMaximum > mnMaximum)
                     {
                         mnMaximum = rRange.mnMaximum;
@@ -228,7 +228,7 @@ namespace basegfx
                 {
                     mnMinimum = rRange.mnMinimum;
                 }
-
+            
                 if(rRange.mnMaximum < mnMaximum)
                 {
                     mnMaximum = rRange.mnMaximum;
diff --git a/basegfx/inc/basegfx/range/rangeexpander.hxx b/basegfx/inc/basegfx/range/rangeexpander.hxx
index f8d2ac9c6b68..f2ccb9897fb2 100644
--- a/basegfx/inc/basegfx/range/rangeexpander.hxx
+++ b/basegfx/inc/basegfx/range/rangeexpander.hxx
@@ -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
@@ -52,9 +52,9 @@ namespace basegfx
     */
     template< typename RangeType > class RangeExpander
     {
-    public:
-        typedef RangeType   ValueType;
-        typedef void        result_type;
+    public: 
+        typedef RangeType 	ValueType;
+        typedef void 		result_type;
 
         explicit RangeExpander( ValueType& rBounds ) :
             mrBounds( rBounds )
diff --git a/basegfx/inc/basegfx/raster/bpixelraster.hxx b/basegfx/inc/basegfx/raster/bpixelraster.hxx
index c28adcdb2ef7..909f53c20263 100644
--- a/basegfx/inc/basegfx/raster/bpixelraster.hxx
+++ b/basegfx/inc/basegfx/raster/bpixelraster.hxx
@@ -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
@@ -48,10 +48,10 @@ namespace basegfx
         BPixelRaster& operator=(const BPixelRaster&);
 
     protected:
-        sal_uInt32                  mnWidth;
-        sal_uInt32                  mnHeight;
-        sal_uInt32                  mnCount;
-        BPixel*                     mpContent;
+        sal_uInt32					mnWidth;
+        sal_uInt32					mnHeight;
+        sal_uInt32					mnCount;
+        BPixel*						mpContent;
 
     public:
         // reset
@@ -62,7 +62,7 @@ namespace basegfx
 
         // constructor/destructor
         BPixelRaster(sal_uInt32 nWidth, sal_uInt32 nHeight)
-        :   mnWidth(nWidth),
+        :	mnWidth(nWidth),
             mnHeight(nHeight),
             mnCount(nWidth * nHeight),
             mpContent(new BPixel[mnCount])
@@ -84,12 +84,12 @@ namespace basegfx
         sal_uInt32 getWidth() const { return mnWidth; }
         sal_uInt32 getHeight() const { return mnHeight; }
         sal_uInt32 getCount() const { return mnCount; }
-
+        
         // data access read only
         const BPixel& getBPixel(sal_uInt32 nIndex) const
         {
 #ifdef DBG_UTIL
-            if(nIndex >= mnCount)
+            if(nIndex >= mnCount) 
             {
                 OSL_ENSURE(false, "getBPixel: Access out of range (!)");
                 return BPixel::getEmptyBPixel();
@@ -102,7 +102,7 @@ namespace basegfx
         BPixel& getBPixel(sal_uInt32 nIndex)
         {
 #ifdef DBG_UTIL
-            if(nIndex >= mnCount)
+            if(nIndex >= mnCount) 
             {
                 OSL_ENSURE(false, "getBPixel: Access out of range (!)");
                 return mpContent[0L];
diff --git a/basegfx/inc/basegfx/raster/bzpixelraster.hxx b/basegfx/inc/basegfx/raster/bzpixelraster.hxx
index 2c0905a78397..d1c36c515991 100644
--- a/basegfx/inc/basegfx/raster/bzpixelraster.hxx
+++ b/basegfx/inc/basegfx/raster/bzpixelraster.hxx
@@ -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
@@ -42,7 +42,7 @@ namespace basegfx
     {
     protected:
         // additionally, host a ZBuffer
-        sal_uInt16*                 mpZBuffer;
+        sal_uInt16*					mpZBuffer;
 
     public:
         // reset
@@ -54,7 +54,7 @@ namespace basegfx
 
         // constructor/destructor
         BZPixelRaster(sal_uInt32 nWidth, sal_uInt32 nHeight)
-        :   BPixelRaster(nWidth, nHeight),
+        :	BPixelRaster(nWidth, nHeight),
             mpZBuffer(new sal_uInt16[mnCount])
         {
             rtl_zeroMemory(mpZBuffer, sizeof(sal_uInt16) * mnCount);
@@ -69,7 +69,7 @@ namespace basegfx
         const sal_uInt16& getZ(sal_uInt32 nIndex) const
         {
 #ifdef DBG_UTIL
-            if(nIndex >= mnCount)
+            if(nIndex >= mnCount) 
             {
                 OSL_ENSURE(false, "getZ: Access out of range (!)");
                 return mpZBuffer[0L];
@@ -82,7 +82,7 @@ namespace basegfx
         sal_uInt16& getZ(sal_uInt32 nIndex)
         {
 #ifdef DBG_UTIL
-            if(nIndex >= mnCount)
+            if(nIndex >= mnCount) 
             {
                 OSL_ENSURE(false, "getZ: Access out of range (!)");
                 return mpZBuffer[0L];
diff --git a/basegfx/inc/basegfx/raster/rasterconvert3d.hxx b/basegfx/inc/basegfx/raster/rasterconvert3d.hxx
index fb777482246d..0a504e8f1fb2 100644
--- a/basegfx/inc/basegfx/raster/rasterconvert3d.hxx
+++ b/basegfx/inc/basegfx/raster/rasterconvert3d.hxx
@@ -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
@@ -52,18 +52,18 @@ namespace basegfx
     class ip_single
     {
     private:
-        double                                      mfVal;
-        double                                      mfInc;
+        double										mfVal;
+        double										mfInc;
 
     public:
-        ip_single()
-        :   mfVal(0.0),
-            mfInc(0.0)
+        ip_single() 
+        :	mfVal(0.0), 
+            mfInc(0.0) 
         {}
 
-        ip_single(double fVal, double fInc)
-        :   mfVal(fVal),
-            mfInc(fInc)
+        ip_single(double fVal, double fInc) 
+        :	mfVal(fVal), 
+            mfInc(fInc) 
         {}
 
         double getVal() const { return mfVal; }
@@ -78,17 +78,17 @@ namespace basegfx
     class ip_double
     {
     private:
-        ip_single                                   maX;
-        ip_single                                   maY;
+        ip_single									maX;
+        ip_single									maY;
 
     public:
-        ip_double()
-        :   maX(),
+        ip_double() 
+        :	maX(),
             maY()
         {}
 
-        ip_double(double fXVal, double fXInc, double fYVal, double fYInc)
-        :   maX(fXVal, fXInc),
+        ip_double(double fXVal, double fXInc, double fYVal, double fYInc) 
+        :	maX(fXVal, fXInc),
             maY(fYVal, fYInc)
         {}
 
@@ -104,19 +104,19 @@ namespace basegfx
     class ip_triple
     {
     private:
-        ip_single                                   maX;
-        ip_single                                   maY;
-        ip_single                                   maZ;
+        ip_single									maX;
+        ip_single									maY;
+        ip_single									maZ;
 
     public:
-        ip_triple()
-        :   maX(),
+        ip_triple() 
+        :	maX(),
             maY(),
             maZ()
         {}
 
-        ip_triple(double fXVal, double fXInc, double fYVal, double fYInc, double fZVal, double fZInc)
-        :   maX(fXVal, fXInc),
+        ip_triple(double fXVal, double fXInc, double fYVal, double fYInc, double fZVal, double fZInc) 
+        :	maX(fXVal, fXInc),
             maY(fYVal, fYInc),
             maZ(fZVal, fZInc)
         {}
@@ -135,15 +135,15 @@ namespace basegfx
 
 namespace basegfx
 {
-    #define SCANLINE_EMPTY_INDEX (0xffffffff)
+    #define	SCANLINE_EMPTY_INDEX (0xffffffff)
 
     class InterpolatorProvider3D
     {
     private:
-        ::std::vector< ip_triple >                  maColorInterpolators;
-        ::std::vector< ip_triple >                  maNormalInterpolators;
-        ::std::vector< ip_double >                  maTextureInterpolators;
-        ::std::vector< ip_triple >                  maInverseTextureInterpolators;
+        ::std::vector< ip_triple >					maColorInterpolators;
+        ::std::vector< ip_triple >					maNormalInterpolators;
+        ::std::vector< ip_double >					maTextureInterpolators;
+        ::std::vector< ip_triple >					maInverseTextureInterpolators;
 
     protected:
         sal_uInt32 addColorInterpolator(const BColor& rA, const BColor& rB, double fInvYDelta)
@@ -212,19 +212,19 @@ namespace basegfx
     class RasterConversionLineEntry3D
     {
     private:
-        ip_single                                   maX;
-        ip_single                                   maZ;
-        sal_Int32                                   mnY;
-        sal_uInt32                                  mnCount;
+        ip_single									maX;
+        ip_single									maZ;
+        sal_Int32									mnY;
+        sal_uInt32									mnCount;
 
-        sal_uInt32                                  mnColorIndex;
-        sal_uInt32                                  mnNormalIndex;
-        sal_uInt32                                  mnTextureIndex;
-        sal_uInt32                                  mnInverseTextureIndex;
+        sal_uInt32									mnColorIndex;
+        sal_uInt32									mnNormalIndex;
+        sal_uInt32									mnTextureIndex;
+        sal_uInt32									mnInverseTextureIndex;
 
     public:
         RasterConversionLineEntry3D(const double& rfX, const double& rfDeltaX, const double& rfZ, const double& rfDeltaZ, sal_Int32 nY, sal_uInt32 nCount)
-        :   maX(rfX, rfDeltaX),
+        :	maX(rfX, rfDeltaX),
             maZ(rfZ, rfDeltaZ),
             mnY(nY),
             mnCount(nCount),
@@ -311,7 +311,7 @@ namespace basegfx
     {
     private:
         // the line entries for an area conversion run
-        ::std::vector< RasterConversionLineEntry3D >            maLineEntries;
+        ::std::vector< RasterConversionLineEntry3D >			maLineEntries;
 
         struct lineComparator
         {
diff --git a/basegfx/inc/basegfx/tools/b2dclipstate.hxx b/basegfx/inc/basegfx/tools/b2dclipstate.hxx
index 7d336d8cb48e..92b15781efb7 100644
--- a/basegfx/inc/basegfx/tools/b2dclipstate.hxx
+++ b/basegfx/inc/basegfx/tools/b2dclipstate.hxx
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2008 by Sun Microsystems, Inc.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -77,7 +77,7 @@ namespace basegfx
 
             /// unshare this poly-range with all internally shared instances
             void makeUnique();
-
+            
             /// Set clip to 'null' - nothing is visible
             void makeNull();
             /// returns true when clip is 'null' - nothing is visible
diff --git a/basegfx/inc/basegfx/tools/canvastools.hxx b/basegfx/inc/basegfx/tools/canvastools.hxx
index 1903518d991b..50b41ba7f8a1 100755
--- a/basegfx/inc/basegfx/tools/canvastools.hxx
+++ b/basegfx/inc/basegfx/tools/canvastools.hxx
@@ -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
@@ -53,7 +53,7 @@ namespace com { namespace sun { namespace star { namespace rendering
     class  XPolyPolygon2D;
 } } } }
 
-namespace com { namespace sun { namespace star { namespace awt
+namespace com { namespace sun { namespace star { namespace awt 
 {
     struct Point;
     struct Size;
@@ -79,101 +79,101 @@ namespace basegfx
         // Polygon conversions
         // ===================================================================
 
-        ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XPolyPolygon2D >
-            xPolyPolygonFromB2DPolygon( const ::com::sun::star::uno::Reference<
-                                            ::com::sun::star::rendering::XGraphicDevice >&  xGraphicDevice,
-                                        const ::basegfx::B2DPolygon&                        rPoly    );
+        ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XPolyPolygon2D > 
+            xPolyPolygonFromB2DPolygon( const ::com::sun::star::uno::Reference< 
+                                            ::com::sun::star::rendering::XGraphicDevice >& 	xGraphicDevice,
+                                        const ::basegfx::B2DPolygon&						rPoly	 );
 
-        ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XPolyPolygon2D >
-            xPolyPolygonFromB2DPolyPolygon( const ::com::sun::star::uno::Reference<
-                                                 ::com::sun::star::rendering::XGraphicDevice >&     xGraphicDevice,
-                                            const ::basegfx::B2DPolyPolygon&                    rPolyPoly    );
+        ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XPolyPolygon2D > 
+            xPolyPolygonFromB2DPolyPolygon( const ::com::sun::star::uno::Reference< 
+                                                 ::com::sun::star::rendering::XGraphicDevice >& 	xGraphicDevice,
+                                            const ::basegfx::B2DPolyPolygon&					rPolyPoly	 );
 
 
-        ::com::sun::star::uno::Sequence<
-              ::com::sun::star::uno::Sequence<
-                  ::com::sun::star::geometry::RealBezierSegment2D > >
+        ::com::sun::star::uno::Sequence< 
+              ::com::sun::star::uno::Sequence< 
+                  ::com::sun::star::geometry::RealBezierSegment2D > > 
                     bezierSequenceSequenceFromB2DPolyPolygon( const ::basegfx::B2DPolyPolygon& rPolyPoly );
 
-        ::com::sun::star::uno::Sequence<
-              ::com::sun::star::uno::Sequence<
-                  ::com::sun::star::geometry::RealPoint2D > >
+        ::com::sun::star::uno::Sequence< 
+              ::com::sun::star::uno::Sequence< 
+                  ::com::sun::star::geometry::RealPoint2D > > 
                     pointSequenceSequenceFromB2DPolyPolygon( const ::basegfx::B2DPolyPolygon& rPolyPoly );
 
-        ::basegfx::B2DPolygon polygonFromPoint2DSequence(
-            const ::com::sun::star::uno::Sequence<
+        ::basegfx::B2DPolygon polygonFromPoint2DSequence( 
+            const ::com::sun::star::uno::Sequence< 
                 ::com::sun::star::geometry::RealPoint2D >& rPoints );
 
-        ::basegfx::B2DPolyPolygon polyPolygonFromPoint2DSequenceSequence(
-            const ::com::sun::star::uno::Sequence<
+        ::basegfx::B2DPolyPolygon polyPolygonFromPoint2DSequenceSequence( 
+            const ::com::sun::star::uno::Sequence< 
                 ::com::sun::star::uno::Sequence< ::com::sun::star::geometry::RealPoint2D > >& rPoints );
 
-        ::basegfx::B2DPolygon polygonFromBezier2DSequence(
-            const ::com::sun::star::uno::Sequence<
+        ::basegfx::B2DPolygon polygonFromBezier2DSequence( 
+            const ::com::sun::star::uno::Sequence< 
                 ::com::sun::star::geometry::RealBezierSegment2D >& rPoints );
 
-        ::basegfx::B2DPolyPolygon polyPolygonFromBezier2DSequenceSequence(
-            const ::com::sun::star::uno::Sequence<
+        ::basegfx::B2DPolyPolygon polyPolygonFromBezier2DSequenceSequence( 
+            const ::com::sun::star::uno::Sequence< 
                 ::com::sun::star::uno::Sequence< ::com::sun::star::geometry::RealBezierSegment2D > >& rPoints );
 
         ::basegfx::B2DPolyPolygon b2DPolyPolygonFromXPolyPolygon2D(
-            const ::com::sun::star::uno::Reference<
+            const ::com::sun::star::uno::Reference< 
                      ::com::sun::star::rendering::XPolyPolygon2D >& rPoly );
 
         // Matrix conversions
         // ===================================================================
 
-        ::com::sun::star::geometry::AffineMatrix2D&
-            affineMatrixFromHomMatrix( ::com::sun::star::geometry::AffineMatrix2D&  matrix,
-                                       const ::basegfx::B2DHomMatrix&               transform);
+        ::com::sun::star::geometry::AffineMatrix2D& 
+            affineMatrixFromHomMatrix( ::com::sun::star::geometry::AffineMatrix2D&	matrix,
+                                       const ::basegfx::B2DHomMatrix&				transform);
 
         ::com::sun::star::geometry::AffineMatrix3D& affineMatrixFromHomMatrix3D(
-            ::com::sun::star::geometry::AffineMatrix3D& matrix,
+            ::com::sun::star::geometry::AffineMatrix3D&	matrix,
             const ::basegfx::B3DHomMatrix& transform);
 
-        ::basegfx::B2DHomMatrix&
-            homMatrixFromAffineMatrix( ::basegfx::B2DHomMatrix&                             transform,
-                                       const ::com::sun::star::geometry::AffineMatrix2D&    matrix );
+        ::basegfx::B2DHomMatrix& 
+            homMatrixFromAffineMatrix( ::basegfx::B2DHomMatrix&								transform,
+                                       const ::com::sun::star::geometry::AffineMatrix2D&	matrix );
 
         ::basegfx::B2DHomMatrix homMatrixFromAffineMatrix( const ::com::sun::star::geometry::AffineMatrix2D& matrix );
         ::basegfx::B3DHomMatrix homMatrixFromAffineMatrix3D( const ::com::sun::star::geometry::AffineMatrix3D& matrix );
 
-        ::com::sun::star::geometry::Matrix2D&
+        ::com::sun::star::geometry::Matrix2D& 
             matrixFromHomMatrix( ::com::sun::star::geometry::Matrix2D& matrix,
-                                 const ::basegfx::B2DHomMatrix&        transform);
+                                 const ::basegfx::B2DHomMatrix&		   transform);
 
-        ::basegfx::B2DHomMatrix&
-            homMatrixFromMatrix( ::basegfx::B2DHomMatrix&                    transform,
+        ::basegfx::B2DHomMatrix& 
+            homMatrixFromMatrix( ::basegfx::B2DHomMatrix&					 transform,
                                  const ::com::sun::star::geometry::Matrix2D& matrix );
 
         // Geometry conversions
         // ===================================================================
 
-        ::com::sun::star::geometry::RealSize2D          size2DFromB2DSize( const ::basegfx::B2DVector& );
-        ::com::sun::star::geometry::RealPoint2D         point2DFromB2DPoint( const ::basegfx::B2DPoint& );
-        ::com::sun::star::geometry::RealRectangle2D     rectangle2DFromB2DRectangle( const ::basegfx::B2DRange& );
-        ::com::sun::star::geometry::RealRectangle3D     rectangle3DFromB3DRectangle( const ::basegfx::B3DRange& );
-
-        ::basegfx::B2DVector    b2DSizeFromRealSize2D( const ::com::sun::star::geometry::RealSize2D& );
-        ::basegfx::B2DPoint     b2DPointFromRealPoint2D( const ::com::sun::star::geometry::RealPoint2D& );
-        ::basegfx::B2DRange     b2DRectangleFromRealRectangle2D( const ::com::sun::star::geometry::RealRectangle2D& );
-        ::basegfx::B3DRange     b3DRectangleFromRealRectangle3D( const ::com::sun::star::geometry::RealRectangle3D& );
+        ::com::sun::star::geometry::RealSize2D  		size2DFromB2DSize( const ::basegfx::B2DVector& );
+        ::com::sun::star::geometry::RealPoint2D 		point2DFromB2DPoint( const ::basegfx::B2DPoint& );
+        ::com::sun::star::geometry::RealRectangle2D 	rectangle2DFromB2DRectangle( const ::basegfx::B2DRange& );
+        ::com::sun::star::geometry::RealRectangle3D 	rectangle3DFromB3DRectangle( const ::basegfx::B3DRange& );
 
-        ::com::sun::star::geometry::IntegerSize2D       integerSize2DFromB2ISize( const ::basegfx::B2IVector& );
-        ::com::sun::star::geometry::IntegerPoint2D      integerPoint2DFromB2IPoint( const ::basegfx::B2IPoint& );
-        ::com::sun::star::geometry::IntegerRectangle2D  integerRectangle2DFromB2IRectangle( const ::basegfx::B2IRange& );
+        ::basegfx::B2DVector  	b2DSizeFromRealSize2D( const ::com::sun::star::geometry::RealSize2D& );
+        ::basegfx::B2DPoint		b2DPointFromRealPoint2D( const ::com::sun::star::geometry::RealPoint2D& );
+        ::basegfx::B2DRange		b2DRectangleFromRealRectangle2D( const ::com::sun::star::geometry::RealRectangle2D& );
+        ::basegfx::B3DRange		b3DRectangleFromRealRectangle3D( const ::com::sun::star::geometry::RealRectangle3D& );
 
-        ::basegfx::B2IVector    b2ISizeFromIntegerSize2D( const ::com::sun::star::geometry::IntegerSize2D& );
-        ::basegfx::B2IPoint     b2IPointFromIntegerPoint2D( const ::com::sun::star::geometry::IntegerPoint2D& );
-        ::basegfx::B2IRange     b2IRectangleFromIntegerRectangle2D( const ::com::sun::star::geometry::IntegerRectangle2D& );
+        ::com::sun::star::geometry::IntegerSize2D  		integerSize2DFromB2ISize( const ::basegfx::B2IVector& );
+        ::com::sun::star::geometry::IntegerPoint2D  	integerPoint2DFromB2IPoint( const ::basegfx::B2IPoint& );
+        ::com::sun::star::geometry::IntegerRectangle2D	integerRectangle2DFromB2IRectangle( const ::basegfx::B2IRange& );
 
-        ::com::sun::star::awt::Size         awtSizeFromB2ISize( const ::basegfx::B2IVector& );
-        ::com::sun::star::awt::Point        awtPointFromB2IPoint( const ::basegfx::B2IPoint& );
-        ::com::sun::star::awt::Rectangle    awtRectangleFromB2IRectangle( const ::basegfx::B2IRange& );
+        ::basegfx::B2IVector  	b2ISizeFromIntegerSize2D( const ::com::sun::star::geometry::IntegerSize2D& );
+        ::basegfx::B2IPoint		b2IPointFromIntegerPoint2D( const ::com::sun::star::geometry::IntegerPoint2D& );
+        ::basegfx::B2IRange		b2IRectangleFromIntegerRectangle2D( const ::com::sun::star::geometry::IntegerRectangle2D& );
+        
+        ::com::sun::star::awt::Size  		awtSizeFromB2ISize( const ::basegfx::B2IVector& );
+        ::com::sun::star::awt::Point  		awtPointFromB2IPoint( const ::basegfx::B2IPoint& );
+        ::com::sun::star::awt::Rectangle	awtRectangleFromB2IRectangle( const ::basegfx::B2IRange& );
 
-        ::basegfx::B2IVector    b2ISizeFromAwtSize( const ::com::sun::star::awt::Size& );
-        ::basegfx::B2IPoint     b2IPointFromAwtPoint( const ::com::sun::star::awt::Point& );
-        ::basegfx::B2IRange     b2IRectangleFromAwtRectangle( const ::com::sun::star::awt::Rectangle& );
+        ::basegfx::B2IVector  	b2ISizeFromAwtSize( const ::com::sun::star::awt::Size& );
+        ::basegfx::B2IPoint		b2IPointFromAwtPoint( const ::com::sun::star::awt::Point& );
+        ::basegfx::B2IRange		b2IRectangleFromAwtRectangle( const ::com::sun::star::awt::Rectangle& );
 
         // Geometry comparisons
         // ===================================================================
@@ -202,8 +202,8 @@ namespace basegfx
             @return the closest integer range, which completely
             contains rRange.
          */
-        ::basegfx::B2IRange     b2ISurroundingRangeFromB2DRange( const ::basegfx::B2DRange& rRange );
-
+        ::basegfx::B2IRange 	b2ISurroundingRangeFromB2DRange( const ::basegfx::B2DRange& rRange );
+        
         /** Return smalltest B2DRange with integer values, which
             completely contains given floating point range.
 
@@ -213,8 +213,8 @@ namespace basegfx
             @return the closest B2DRange with integer coordinates,
             which completely contains rRange.
          */
-        ::basegfx::B2DRange     b2DSurroundingIntegerRangeFromB2DRange( const ::basegfx::B2DRange& rRange );
-
+        ::basegfx::B2DRange 	b2DSurroundingIntegerRangeFromB2DRange( const ::basegfx::B2DRange& rRange );
+        
     }
 }
 
diff --git a/basegfx/inc/basegfx/tools/debugplotter.hxx b/basegfx/inc/basegfx/tools/debugplotter.hxx
index ece104af3553..a36c5ab7c681 100644
--- a/basegfx/inc/basegfx/tools/debugplotter.hxx
+++ b/basegfx/inc/basegfx/tools/debugplotter.hxx
@@ -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
@@ -34,7 +34,7 @@
 #include <basegfx/polygon/b2dpolygon.hxx>
 #include <basegfx/polygon/b2dpolypolygon.hxx>
 #include <rtl/string.hxx>
-#include <boost/utility.hpp> // for noncopyable
+#include <boost/utility.hpp> // for noncopyable 
 #include <vector>
 #include <utility>
 #include <iostream>
@@ -59,48 +59,48 @@ namespace basegfx
     public:
         /** Create new debug output object
 
-            @param pTitle
+            @param pTitle 
             Title of the debug output, will appear in trace output
          */
         explicit DebugPlotter( const sal_Char* pTitle );
 
         /** Create new debug output object
 
-            @param pTitle
+            @param pTitle 
             Title of the debug output, will appear in trace output
 
             @param rOutputStream
             Stream to write output to. Must stay valid over the
             lifetime of this object!
-         */
+         */        
         DebugPlotter( const sal_Char* pTitle,
                       ::std::ostream& rOutputStream );
 
         ~DebugPlotter();
 
-        void plot( const B2DPoint&          rPoint,
-                   const sal_Char*          pTitle );
-        void plot( const B2DVector&         rVec,
-                   const sal_Char*          pTitle );
-        void plot( const B2DCubicBezier&    rBezier,
-                   const sal_Char*          pTitle );
-        void plot( const B2DRange&          rRange,
-                   const sal_Char*          pTitle );
-        void plot( const B2DPolygon&        rPoly,
-                   const sal_Char*          pTitle );
-        void plot( const B2DPolyPolygon&    rPoly,
-                   const sal_Char*          pTitle );
+        void plot( const B2DPoint&  		rPoint,
+                   const sal_Char* 			pTitle );
+        void plot( const B2DVector& 		rVec,
+                   const sal_Char* 			pTitle );
+        void plot( const B2DCubicBezier&	rBezier,
+                   const sal_Char* 			pTitle );
+        void plot( const B2DRange&  		rRange,
+                   const sal_Char* 			pTitle );
+        void plot( const B2DPolygon& 		rPoly,
+                   const sal_Char* 			pTitle );
+        void plot( const B2DPolyPolygon&	rPoly,
+                   const sal_Char* 			pTitle );
 
     private:
         void print( const sal_Char* );
 
-        ::rtl::OString                                              maTitle;
-        ::std::vector< ::std::pair< B2DPoint, ::rtl::OString > >    maPoints;
-        ::std::vector< ::std::pair< B2DVector, ::rtl::OString > >   maVectors;
-        ::std::vector< ::std::pair< B2DRange, ::rtl::OString > >    maRanges;
-        ::std::vector< ::std::pair< B2DPolygon, ::rtl::OString > >  maPolygons;
+        ::rtl::OString												maTitle;
+        ::std::vector< ::std::pair< B2DPoint, ::rtl::OString > >	maPoints;
+        ::std::vector< ::std::pair< B2DVector, ::rtl::OString > >	maVectors;
+        ::std::vector< ::std::pair< B2DRange, ::rtl::OString > >	maRanges;
+        ::std::vector< ::std::pair< B2DPolygon, ::rtl::OString > >	maPolygons;
 
-        ::std::ostream*                                             mpOutputStream;
+        ::std::ostream*												mpOutputStream;
     };
 }
 
diff --git a/basegfx/inc/basegfx/tools/gradienttools.hxx b/basegfx/inc/basegfx/tools/gradienttools.hxx
index 2f436fa1d717..53a8aa6ea89a 100644
--- a/basegfx/inc/basegfx/tools/gradienttools.hxx
+++ b/basegfx/inc/basegfx/tools/gradienttools.hxx
@@ -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
@@ -98,11 +98,11 @@ namespace basegfx
             Gradient angle (from ODF)
          */
         ODFGradientInfo& createLinearODFGradientInfo(ODFGradientInfo& o_rGradientInfo,
-                                                     const B2DRange&  rTargetArea,
-                                                     sal_uInt32       nSteps,
-                                                     double           fBorder,
+                                                     const B2DRange&  rTargetArea, 
+                                                     sal_uInt32       nSteps, 
+                                                     double           fBorder, 
                                                      double           fAngle);
-
+        
         /** Calculate linear gradient blend value
 
             This method generates you the lerp alpha value for
@@ -157,9 +157,9 @@ namespace basegfx
             Gradient angle (from ODF)
          */
         ODFGradientInfo& createAxialODFGradientInfo(ODFGradientInfo& o_rGradientInfo,
-                                                    const B2DRange&  rTargetArea,
-                                                    sal_uInt32       nSteps,
-                                                    double           fBorder,
+                                                    const B2DRange&  rTargetArea, 
+                                                    sal_uInt32       nSteps, 
+                                                    double           fBorder, 
                                                     double           fAngle);
 
         /** Calculate axial gradient blend value
@@ -188,7 +188,7 @@ namespace basegfx
 
             return t;
         }
-
+        
         /** Create matrix for ODF's radial gradient definition
 
             @param o_rGradientInfo
@@ -212,11 +212,11 @@ namespace basegfx
             Gradient angle (from ODF)
          */
         ODFGradientInfo& createRadialODFGradientInfo(ODFGradientInfo& o_rGradientInfo,
-                                                     const B2DRange&  rTargetArea,
+                                                     const B2DRange&  rTargetArea, 
                                                      const B2DVector& rOffset,
-                                                     sal_uInt32       nSteps,
+                                                     sal_uInt32       nSteps, 
                                                      double           fBorder);
-
+        
         /** Calculate radial gradient blend value
 
             This method generates you the lerp alpha value for
@@ -271,10 +271,10 @@ namespace basegfx
             Gradient angle (from ODF)
          */
         ODFGradientInfo& createEllipticalODFGradientInfo(ODFGradientInfo& o_rGradientInfo,
-                                                         const B2DRange&  rTargetArea,
+                                                         const B2DRange&  rTargetArea, 
                                                          const B2DVector& rOffset,
-                                                         sal_uInt32       nSteps,
-                                                         double           fBorder,
+                                                         sal_uInt32       nSteps, 
+                                                         double           fBorder, 
                                                          double           fAngle);
 
         /** Calculate elliptical gradient blend value
@@ -319,10 +319,10 @@ namespace basegfx
             Gradient angle (from ODF)
          */
         ODFGradientInfo& createSquareODFGradientInfo(ODFGradientInfo& o_rGradientInfo,
-                                                     const B2DRange&  rTargetArea,
+                                                     const B2DRange&  rTargetArea, 
                                                      const B2DVector& rOffset,
-                                                     sal_uInt32       nSteps,
-                                                     double           fBorder,
+                                                     sal_uInt32       nSteps, 
+                                                     double           fBorder, 
                                                      double           fAngle);
 
         /** Calculate square gradient blend value
@@ -380,10 +380,10 @@ namespace basegfx
             Gradient angle (from ODF)
          */
         ODFGradientInfo& createRectangularODFGradientInfo(ODFGradientInfo& o_rGradientInfo,
-                                                          const B2DRange&  rTargetArea,
+                                                          const B2DRange&  rTargetArea, 
                                                           const B2DVector& rOffset,
-                                                          sal_uInt32       nSteps,
-                                                          double           fBorder,
+                                                          sal_uInt32       nSteps, 
+                                                          double           fBorder, 
                                                           double           fAngle);
 
         /** Calculate rectangular gradient blend value
diff --git a/basegfx/inc/basegfx/tools/keystoplerp.hxx b/basegfx/inc/basegfx/tools/keystoplerp.hxx
index a54b3485b1a1..df4d3bb942d3 100644
--- a/basegfx/inc/basegfx/tools/keystoplerp.hxx
+++ b/basegfx/inc/basegfx/tools/keystoplerp.hxx
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2008 by Sun Microsystems, Inc.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/basegfx/inc/basegfx/tools/lerp.hxx b/basegfx/inc/basegfx/tools/lerp.hxx
index 590ef34c2009..8bcaf993305f 100644
--- a/basegfx/inc/basegfx/tools/lerp.hxx
+++ b/basegfx/inc/basegfx/tools/lerp.hxx
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2008 by Sun Microsystems, Inc.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -46,11 +46,11 @@ namespace basegfx
             @param t
             As usual, t must be in the [0,1] range
         */
-        template< typename ValueType > ValueType lerp( const ValueType&     rFrom,
-                                                       const ValueType&     rTo,
-                                                       double               t )
+        template< typename ValueType > ValueType lerp( const ValueType& 	rFrom, 
+                                                       const ValueType& 	rTo, 
+                                                       double				t )
         {
-            // This is only to suppress a double->int warning. All other
+            // This is only to suppress a double->int warning. All other 
             // types should be okay here.
             return static_cast<ValueType>( (1.0-t)*rFrom + t*rTo );
         }
diff --git a/basegfx/inc/basegfx/tools/rectcliptools.hxx b/basegfx/inc/basegfx/tools/rectcliptools.hxx
index ae7c057666d9..ce9cfc3532be 100644
--- a/basegfx/inc/basegfx/tools/rectcliptools.hxx
+++ b/basegfx/inc/basegfx/tools/rectcliptools.hxx
@@ -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
@@ -36,7 +36,7 @@ namespace basegfx
 {
     namespace tools
     {
-        namespace RectClipFlags
+        namespace RectClipFlags 
         {
             static const sal_uInt32 LEFT   = (sal_Int32)0x01;
             static const sal_uInt32 RIGHT  = (sal_Int32)0x02;
@@ -52,9 +52,9 @@ namespace basegfx
             outside one or more of the four half planes defining the
             rectangle (see RectClipFlags for possible values)
          */
-        template< class Point, class Rect > inline
+        template< class Point, class Rect > inline 
            sal_uInt32 getCohenSutherlandClipFlags( const Point& rP,
-                                                   const Rect&  rR )
+                                                   const Rect&  rR ) 
         {
             // maxY | minY | maxX | minX
             sal_uInt32 clip  = (rP.getX() < rR.getMinX()) << 0;
diff --git a/basegfx/inc/basegfx/tools/tools.hxx b/basegfx/inc/basegfx/tools/tools.hxx
index 896fd22c162d..e1791990df72 100644
--- a/basegfx/inc/basegfx/tools/tools.hxx
+++ b/basegfx/inc/basegfx/tools/tools.hxx
@@ -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
@@ -42,7 +42,7 @@ namespace basegfx
             This function clips a line given by two points against the
             given rectangle. The resulting line is returned in the
             given points.
-
+            
             @param io_rStart
             Start point of the line. On return, contains the clipped
             start point.
@@ -57,9 +57,9 @@ namespace basegfx
             @return true, when at least part of the line is visible
             after the clip, false otherwise
          */
-        bool liangBarskyClip2D( ::basegfx::B2DPoint&        io_rStart,
-                                ::basegfx::B2DPoint&        io_rEnd,
-                                const ::basegfx::B2DRange&  rClipRect );
+        bool liangBarskyClip2D( ::basegfx::B2DPoint& 		io_rStart, 
+                                ::basegfx::B2DPoint& 		io_rEnd,
+                                const ::basegfx::B2DRange&	rClipRect );
 
         /** Expand given parallelogram, such that it extends beyond
             bound rect in a given direction.
@@ -119,11 +119,11 @@ namespace basegfx
             @param rFitTarget
             The rectangle to fit the parallelogram into.
          */
-        void infiniteLineFromParallelogram( ::basegfx::B2DPoint&        io_rLeftTop,
-                                            ::basegfx::B2DPoint&        io_rLeftBottom,
-                                            ::basegfx::B2DPoint&        io_rRightTop,
-                                            ::basegfx::B2DPoint&        io_rRightBottom,
-                                            const ::basegfx::B2DRange&  rFitTarget  );
+        void infiniteLineFromParallelogram( ::basegfx::B2DPoint& 		io_rLeftTop,
+                                            ::basegfx::B2DPoint& 		io_rLeftBottom,
+                                            ::basegfx::B2DPoint& 		io_rRightTop,
+                                            ::basegfx::B2DPoint& 		io_rRightBottom,
+                                            const ::basegfx::B2DRange&	rFitTarget	);
 
     }
 }
diff --git a/basegfx/inc/basegfx/tools/unopolypolygon.hxx b/basegfx/inc/basegfx/tools/unopolypolygon.hxx
index 8a4044e1ca4b..acf56f0c2361 100755
--- a/basegfx/inc/basegfx/tools/unopolypolygon.hxx
+++ b/basegfx/inc/basegfx/tools/unopolypolygon.hxx
@@ -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
@@ -38,10 +38,10 @@
 
 
 namespace basegfx
-{
+{ 
 namespace unotools
 {
-    typedef ::cppu::WeakComponentImplHelper3<
+    typedef ::cppu::WeakComponentImplHelper3< 
              ::com::sun::star::rendering::XLinePolyPolygon2D,
           ::com::sun::star::rendering::XBezierPolyPolygon2D,
           ::com::sun::star::lang::XServiceInfo > UnoPolyPolygonBase;
@@ -88,9 +88,9 @@ namespace unotools
                 throw ::com::sun::star::lang::IndexOutOfBoundsException();
         }
 
-        B2DPolyPolygon getSubsetPolyPolygon( sal_Int32 nPolygonIndex,
-                                             sal_Int32 nNumberOfPolygons,
-                                             sal_Int32 nPointIndex,
+        B2DPolyPolygon getSubsetPolyPolygon( sal_Int32 nPolygonIndex, 
+                                             sal_Int32 nNumberOfPolygons, 
+                                             sal_Int32 nPointIndex, 
                                              sal_Int32 nNumberOfPoints ) const;
 
         /// Get cow copy of internal polygon. not thread-safe outside this object.
diff --git a/basegfx/inc/basegfx/tuple/b2dtuple.hxx b/basegfx/inc/basegfx/tuple/b2dtuple.hxx
index 71dd227ac736..988761025c8d 100644
--- a/basegfx/inc/basegfx/tuple/b2dtuple.hxx
+++ b/basegfx/inc/basegfx/tuple/b2dtuple.hxx
@@ -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
@@ -47,64 +47,64 @@ namespace basegfx
     class B2DTuple
     {
     protected:
-        double                                      mfX;
-        double                                      mfY;
-
-    public:
-        /** Create a 2D Tuple
+        double										mfX;
+        double										mfY;
+                            
+    public:					
+        /**	Create a 2D Tuple
 
             The tuple is initialized to (0.0, 0.0)
         */
-        B2DTuple()
-        :   mfX(0.0),
-            mfY(0.0)
+        B2DTuple() 
+        :	mfX(0.0), 
+            mfY(0.0) 
         {}
 
-        /** Create a 2D Tuple
+        /**	Create a 2D Tuple
 
             @param fX
             This parameter is used to initialize the X-coordinate
             of the 2D Tuple.
-
+            
             @param fY
             This parameter is used to initialize the Y-coordinate
             of the 2D Tuple.
         */
-        B2DTuple(double fX, double fY)
-        :   mfX( fX ),
-            mfY( fY )
+        B2DTuple(double fX, double fY) 
+        :	mfX( fX ), 
+            mfY( fY ) 
         {}
 
-        /** Create a copy of a 2D Tuple
+        /**	Create a copy of a 2D Tuple
 
             @param rTup
             The 2D Tuple which will be copied.
         */
-        B2DTuple(const B2DTuple& rTup)
-        :   mfX( rTup.mfX ),
-            mfY( rTup.mfY )
+        B2DTuple(const B2DTuple& rTup) 
+        :	mfX( rTup.mfX ), 
+            mfY( rTup.mfY ) 
         {}
 
-        /** Create a copy of a 2D integer Tuple
+        /**	Create a copy of a 2D integer Tuple
 
             @param rTup
             The 2D Tuple which will be copied.
         */
         explicit B2DTuple(const B2ITuple& rTup);
 
-        ~B2DTuple()
+        ~B2DTuple() 
         {}
 
         /// Get X-Coordinate of 2D Tuple
         double getX() const
-        {
-            return mfX;
+        { 
+            return mfX; 
         }
 
         /// Get Y-Coordinate of 2D Tuple
         double getY() const
-        {
-            return mfY;
+        { 
+            return mfY; 
         }
 
         /// Set X-Coordinate of 2D Tuple
@@ -120,8 +120,8 @@ namespace basegfx
         }
 
         /// Array-access to 2D Tuple
-        const double& operator[] (int nPos) const
-        {
+        const double& operator[] (int nPos) const 
+        { 
             // Here, normally one if(...) should be used. In the assumption that
             // both double members can be accessed as an array a shortcut is used here.
             // if(0 == nPos) return mfX; return mfY;
@@ -130,7 +130,7 @@ namespace basegfx
 
         /// Array-access to 2D Tuple
         double& operator[] (int nPos)
-        {
+        { 
             // Here, normally one if(...) should be used. In the assumption that
             // both double members can be accessed as an array a shortcut is used here.
             // if(0 == nPos) return mfX; return mfY;
@@ -141,99 +141,99 @@ namespace basegfx
         //////////////////////////////////////////////////////////////////////
 
         bool equalZero() const
-        {
-            return (this == &getEmptyTuple() ||
+        { 
+            return (this == &getEmptyTuple() || 
                     (fTools::equalZero(mfX) && fTools::equalZero(mfY)));
         }
 
         bool equalZero(const double& rfSmallValue) const
-        {
-            return (this == &getEmptyTuple() ||
+        { 
+            return (this == &getEmptyTuple() || 
                     (fTools::equalZero(mfX, rfSmallValue) && fTools::equalZero(mfY, rfSmallValue)));
         }
 
         bool equal(const B2DTuple& rTup) const
-        {
+        { 
             return (
                 this == &rTup ||
-                (fTools::equal(mfX, rTup.mfX) &&
+                (fTools::equal(mfX, rTup.mfX) && 
                 fTools::equal(mfY, rTup.mfY)));
         }
 
         bool equal(const B2DTuple& rTup, const double& rfSmallValue) const
-        {
+        { 
             return (
                 this == &rTup ||
-                (fTools::equal(mfX, rTup.mfX, rfSmallValue) &&
+                (fTools::equal(mfX, rTup.mfX, rfSmallValue) && 
                 fTools::equal(mfY, rTup.mfY, rfSmallValue)));
         }
 
         // operators
         //////////////////////////////////////////////////////////////////////
 
-        B2DTuple& operator+=( const B2DTuple& rTup )
-        {
+        B2DTuple& operator+=( const B2DTuple& rTup ) 
+        { 
             mfX += rTup.mfX;
-            mfY += rTup.mfY;
-            return *this;
+            mfY += rTup.mfY; 
+            return *this; 
         }
 
-        B2DTuple& operator-=( const B2DTuple& rTup )
-        {
+        B2DTuple& operator-=( const B2DTuple& rTup ) 
+        { 
             mfX -= rTup.mfX;
-            mfY -= rTup.mfY;
-            return *this;
+            mfY -= rTup.mfY; 
+            return *this; 
         }
 
-        B2DTuple& operator/=( const B2DTuple& rTup )
-        {
+        B2DTuple& operator/=( const B2DTuple& rTup ) 
+        { 
             mfX /= rTup.mfX;
-            mfY /= rTup.mfY;
-            return *this;
+            mfY /= rTup.mfY; 
+            return *this; 
         }
 
-        B2DTuple& operator*=( const B2DTuple& rTup )
-        {
+        B2DTuple& operator*=( const B2DTuple& rTup ) 
+        { 
             mfX *= rTup.mfX;
-            mfY *= rTup.mfY;
-            return *this;
+            mfY *= rTup.mfY; 
+            return *this; 
         }
 
-        B2DTuple& operator*=(double t)
-        {
-            mfX *= t;
-            mfY *= t;
-            return *this;
+        B2DTuple& operator*=(double t) 
+        { 
+            mfX *= t; 
+            mfY *= t; 
+            return *this; 
         }
 
-        B2DTuple& operator/=(double t)
-        {
+        B2DTuple& operator/=(double t) 
+        { 
             const double fVal(1.0 / t);
-            mfX *= fVal;
-            mfY *= fVal;
-            return *this;
+            mfX *= fVal; 
+            mfY *= fVal; 
+            return *this; 
         }
 
-        B2DTuple operator-(void) const
-        {
-            return B2DTuple(-mfX, -mfY);
+        B2DTuple operator-(void) const 
+        {	
+            return B2DTuple(-mfX, -mfY); 
         }
-
-        bool operator==( const B2DTuple& rTup ) const
-        {
+        
+        bool operator==( const B2DTuple& rTup ) const 
+        { 
             return equal(rTup);
         }
 
-        bool operator!=( const B2DTuple& rTup ) const
-        {
+        bool operator!=( const B2DTuple& rTup ) const 
+        { 
             return !equal(rTup);
         }
-
-        B2DTuple& operator=( const B2DTuple& rTup )
-        {
+        
+        B2DTuple& operator=( const B2DTuple& rTup ) 
+        { 
             mfX = rTup.mfX;
-            mfY = rTup.mfY;
-            return *this;
+            mfY = rTup.mfY; 
+            return *this; 
         }
 
         void correctValues(const double fCompareValue = 0.0);
@@ -244,109 +244,109 @@ namespace basegfx
     // external operators
     //////////////////////////////////////////////////////////////////////////
 
-    inline B2DTuple minimum(const B2DTuple& rTupA, const B2DTuple& rTupB)
-    {
+    inline B2DTuple minimum(const B2DTuple& rTupA, const B2DTuple& rTupB) 
+    { 
         B2DTuple aMin(
             (rTupB.getX() < rTupA.getX()) ? rTupB.getX() : rTupA.getX(),
-            (rTupB.getY() < rTupA.getY()) ? rTupB.getY() : rTupA.getY());
+            (rTupB.getY() < rTupA.getY()) ? rTupB.getY() : rTupA.getY()); 
         return aMin;
     }
 
-    inline B2DTuple maximum(const B2DTuple& rTupA, const B2DTuple& rTupB)
-    {
+    inline B2DTuple maximum(const B2DTuple& rTupA, const B2DTuple& rTupB) 
+    { 
         B2DTuple aMax(
             (rTupB.getX() > rTupA.getX()) ? rTupB.getX() : rTupA.getX(),
-            (rTupB.getY() > rTupA.getY()) ? rTupB.getY() : rTupA.getY());
+            (rTupB.getY() > rTupA.getY()) ? rTupB.getY() : rTupA.getY()); 
         return aMax;
     }
 
-    inline B2DTuple absolute(const B2DTuple& rTup)
-    {
+    inline B2DTuple absolute(const B2DTuple& rTup) 
+    { 
         B2DTuple aAbs(
             (0.0 > rTup.getX()) ? -rTup.getX() : rTup.getX(),
-            (0.0 > rTup.getY()) ? -rTup.getY() : rTup.getY());
+            (0.0 > rTup.getY()) ? -rTup.getY() : rTup.getY()); 
         return aAbs;
     }
 
-    inline B2DTuple interpolate(const B2DTuple& rOld1, const B2DTuple& rOld2, double t)
-    {
+    inline B2DTuple interpolate(const B2DTuple& rOld1, const B2DTuple& rOld2, double t) 
+    { 
         B2DTuple aInt(
             ((rOld2.getX() - rOld1.getX()) * t) + rOld1.getX(),
-            ((rOld2.getY() - rOld1.getY()) * t) + rOld1.getY());
+            ((rOld2.getY() - rOld1.getY()) * t) + rOld1.getY()); 
         return aInt;
     }
 
-    inline B2DTuple average(const B2DTuple& rOld1, const B2DTuple& rOld2)
-    {
+    inline B2DTuple average(const B2DTuple& rOld1, const B2DTuple& rOld2) 
+    { 
         B2DTuple aAvg(
             (rOld1.getX() + rOld2.getX()) * 0.5,
-            (rOld1.getY() + rOld2.getY()) * 0.5);
+            (rOld1.getY() + rOld2.getY()) * 0.5); 
         return aAvg;
     }
-
+    
     inline B2DTuple average(const B2DTuple& rOld1, const B2DTuple& rOld2, const B2DTuple& rOld3)
-    {
+    { 
         B2DTuple aAvg(
             (rOld1.getX() + rOld2.getX() + rOld3.getX()) * (1.0 / 3.0),
-            (rOld1.getY() + rOld2.getY() + rOld3.getY()) * (1.0 / 3.0));
+            (rOld1.getY() + rOld2.getY() + rOld3.getY()) * (1.0 / 3.0)); 
         return aAvg;
     }
 
     inline B2DTuple operator+(const B2DTuple& rTupA, const B2DTuple& rTupB)
-    {
-        B2DTuple aSum(rTupA);
-        aSum += rTupB;
-        return aSum;
+    { 
+        B2DTuple aSum(rTupA); 
+        aSum += rTupB; 
+        return aSum; 
     }
 
     inline B2DTuple operator-(const B2DTuple& rTupA, const B2DTuple& rTupB)
-    {
-        B2DTuple aSub(rTupA);
-        aSub -= rTupB;
-        return aSub;
+    { 
+        B2DTuple aSub(rTupA); 
+        aSub -= rTupB; 
+        return aSub; 
     }
 
     inline B2DTuple operator/(const B2DTuple& rTupA, const B2DTuple& rTupB)
-    {
-        B2DTuple aDiv(rTupA);
-        aDiv /= rTupB;
-        return aDiv;
+    { 
+        B2DTuple aDiv(rTupA); 
+        aDiv /= rTupB; 
+        return aDiv; 
     }
 
     inline B2DTuple operator*(const B2DTuple& rTupA, const B2DTuple& rTupB)
-    {
-        B2DTuple aMul(rTupA);
-        aMul *= rTupB;
-        return aMul;
+    { 
+        B2DTuple aMul(rTupA); 
+        aMul *= rTupB; 
+        return aMul; 
     }
 
     inline B2DTuple operator*(const B2DTuple& rTup, double t)
-    {
-        B2DTuple aNew(rTup);
-        aNew *= t;
-        return aNew;
+    { 
+        B2DTuple aNew(rTup); 
+        aNew *= t; 
+        return aNew; 
     }
 
     inline B2DTuple operator*(double t, const B2DTuple& rTup)
-    {
-        B2DTuple aNew(rTup);
-        aNew *= t;
-        return aNew;
+    { 
+        B2DTuple aNew(rTup); 
+        aNew *= t; 
+        return aNew; 
     }
 
     inline B2DTuple operator/(const B2DTuple& rTup, double t)
-    {
-        B2DTuple aNew(rTup);
-        aNew /= t;
-        return aNew;
+    { 
+        B2DTuple aNew(rTup); 
+        aNew /= t; 
+        return aNew; 
     }
 
     inline B2DTuple operator/(double t, const B2DTuple& rTup)
     {
-        B2DTuple aNew(t, t);
-        B2DTuple aTmp(rTup);
-        aNew /= aTmp;
-        return aNew;
+        B2DTuple aNew(t, t); 
+        B2DTuple aTmp(rTup); 
+        aNew /= aTmp; 
+        return aNew; 
     }
 
     /** Round double to nearest integer for 2D tuple
diff --git a/basegfx/inc/basegfx/tuple/b2i64tuple.hxx b/basegfx/inc/basegfx/tuple/b2i64tuple.hxx
index 9c813c07a994..31bbc81ceb21 100644
--- a/basegfx/inc/basegfx/tuple/b2i64tuple.hxx
+++ b/basegfx/inc/basegfx/tuple/b2i64tuple.hxx
@@ -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
@@ -45,57 +45,57 @@ namespace basegfx
     class B2I64Tuple
     {
     protected:
-        sal_Int64                                       mnX;
-        sal_Int64                                       mnY;
-
-    public:
-        /** Create a 2D Tuple
+        sal_Int64										mnX;
+        sal_Int64										mnY;
+                            
+    public:					
+        /**	Create a 2D Tuple
 
             The tuple is initialized to (0, 0)
         */
-        B2I64Tuple()
-        :   mnX(0),
-            mnY(0)
+        B2I64Tuple() 
+        :	mnX(0), 
+            mnY(0) 
         {}
 
-        /** Create a 2D Tuple
+        /**	Create a 2D Tuple
 
             @param fX
             This parameter is used to initialize the X-coordinate
             of the 2D Tuple.
-
+            
             @param fY
             This parameter is used to initialize the Y-coordinate
             of the 2D Tuple.
         */
-        B2I64Tuple(sal_Int64 fX, sal_Int64 fY)
-        :   mnX( fX ),
-            mnY( fY )
+        B2I64Tuple(sal_Int64 fX, sal_Int64 fY) 
+        :	mnX( fX ), 
+            mnY( fY ) 
         {}
 
-        /** Create a copy of a 2D Tuple
+        /**	Create a copy of a 2D Tuple
 
             @param rTup
             The 2D Tuple which will be copied.
         */
-        B2I64Tuple(const B2I64Tuple& rTup)
-        :   mnX( rTup.mnX ),
-            mnY( rTup.mnY )
+        B2I64Tuple(const B2I64Tuple& rTup) 
+        :	mnX( rTup.mnX ), 
+            mnY( rTup.mnY ) 
         {}
 
-        ~B2I64Tuple()
+        ~B2I64Tuple() 
         {}
 
         /// Get X-Coordinate of 2D Tuple
         sal_Int64 getX() const
-        {
-            return mnX;
+        { 
+            return mnX; 
         }
 
         /// Get Y-Coordinate of 2D Tuple
         sal_Int64 getY() const
-        {
-            return mnY;
+        { 
+            return mnY; 
         }
 
         /// Set X-Coordinate of 2D Tuple
@@ -111,8 +111,8 @@ namespace basegfx
         }
 
         /// Array-access to 2D Tuple
-        const sal_Int64& operator[] (int nPos) const
-        {
+        const sal_Int64& operator[] (int nPos) const 
+        { 
             // Here, normally one if(...) should be used. In the assumption that
             // both sal_Int64 members can be accessed as an array a shortcut is used here.
             // if(0 == nPos) return mnX; return mnY;
@@ -121,7 +121,7 @@ namespace basegfx
 
         /// Array-access to 2D Tuple
         sal_Int64& operator[] (int nPos)
-        {
+        { 
             // Here, normally one if(...) should be used. In the assumption that
             // both sal_Int64 members can be accessed as an array a shortcut is used here.
             // if(0 == nPos) return mnX; return mnY;
@@ -131,70 +131,70 @@ namespace basegfx
         // operators
         //////////////////////////////////////////////////////////////////////
 
-        B2I64Tuple& operator+=( const B2I64Tuple& rTup )
-        {
+        B2I64Tuple& operator+=( const B2I64Tuple& rTup ) 
+        { 
             mnX += rTup.mnX;
-            mnY += rTup.mnY;
-            return *this;
+            mnY += rTup.mnY; 
+            return *this; 
         }
 
-        B2I64Tuple& operator-=( const B2I64Tuple& rTup )
-        {
+        B2I64Tuple& operator-=( const B2I64Tuple& rTup ) 
+        { 
             mnX -= rTup.mnX;
-            mnY -= rTup.mnY;
-            return *this;
+            mnY -= rTup.mnY; 
+            return *this; 
         }
 
-        B2I64Tuple& operator/=( const B2I64Tuple& rTup )
-        {
+        B2I64Tuple& operator/=( const B2I64Tuple& rTup ) 
+        { 
             mnX /= rTup.mnX;
-            mnY /= rTup.mnY;
-            return *this;
+            mnY /= rTup.mnY; 
+            return *this; 
         }
 
-        B2I64Tuple& operator*=( const B2I64Tuple& rTup )
-        {
+        B2I64Tuple& operator*=( const B2I64Tuple& rTup ) 
+        { 
             mnX *= rTup.mnX;
-            mnY *= rTup.mnY;
-            return *this;
+            mnY *= rTup.mnY; 
+            return *this; 
         }
 
-        B2I64Tuple& operator*=(sal_Int64 t)
-        {
-            mnX *= t;
-            mnY *= t;
-            return *this;
+        B2I64Tuple& operator*=(sal_Int64 t) 
+        { 
+            mnX *= t; 
+            mnY *= t; 
+            return *this; 
         }
 
-        B2I64Tuple& operator/=(sal_Int64 t)
-        {
-            mnX /= t;
-            mnY /= t;
-            return *this;
+        B2I64Tuple& operator/=(sal_Int64 t) 
+        { 
+            mnX /= t; 
+            mnY /= t; 
+            return *this; 
         }
 
-        B2I64Tuple operator-(void) const
-        {
-            return B2I64Tuple(-mnX, -mnY);
+        B2I64Tuple operator-(void) const 
+        {	
+            return B2I64Tuple(-mnX, -mnY); 
         }
-
+        
         bool equalZero() const { return mnX == 0 && mnY == 0; }
 
-        bool operator==( const B2I64Tuple& rTup ) const
-        {
+        bool operator==( const B2I64Tuple& rTup ) const 
+        { 
             return this == &rTup || (rTup.mnX == mnX && rTup.mnY == mnY);
         }
 
-        bool operator!=( const B2I64Tuple& rTup ) const
-        {
+        bool operator!=( const B2I64Tuple& rTup ) const 
+        { 
             return !(*this == rTup);
         }
-
-        B2I64Tuple& operator=( const B2I64Tuple& rTup )
-        {
+        
+        B2I64Tuple& operator=( const B2I64Tuple& rTup ) 
+        { 
             mnX = rTup.mnX;
-            mnY = rTup.mnY;
-            return *this;
+            mnY = rTup.mnY; 
+            return *this; 
         }
 
         static const B2I64Tuple& getEmptyTuple();
@@ -203,109 +203,109 @@ namespace basegfx
     // external operators
     //////////////////////////////////////////////////////////////////////////
 
-    inline B2I64Tuple minimum(const B2I64Tuple& rTupA, const B2I64Tuple& rTupB)
-    {
+    inline B2I64Tuple minimum(const B2I64Tuple& rTupA, const B2I64Tuple& rTupB) 
+    { 
         B2I64Tuple aMin(
             (rTupB.getX() < rTupA.getX()) ? rTupB.getX() : rTupA.getX(),
-            (rTupB.getY() < rTupA.getY()) ? rTupB.getY() : rTupA.getY());
+            (rTupB.getY() < rTupA.getY()) ? rTupB.getY() : rTupA.getY()); 
         return aMin;
     }
 
-    inline B2I64Tuple maximum(const B2I64Tuple& rTupA, const B2I64Tuple& rTupB)
-    {
+    inline B2I64Tuple maximum(const B2I64Tuple& rTupA, const B2I64Tuple& rTupB) 
+    { 
         B2I64Tuple aMax(
             (rTupB.getX() > rTupA.getX()) ? rTupB.getX() : rTupA.getX(),
-            (rTupB.getY() > rTupA.getY()) ? rTupB.getY() : rTupA.getY());
+            (rTupB.getY() > rTupA.getY()) ? rTupB.getY() : rTupA.getY()); 
         return aMax;
     }
 
-    inline B2I64Tuple absolute(const B2I64Tuple& rTup)
-    {
+    inline B2I64Tuple absolute(const B2I64Tuple& rTup) 
+    { 
         B2I64Tuple aAbs(
             (0 > rTup.getX()) ? -rTup.getX() : rTup.getX(),
-            (0 > rTup.getY()) ? -rTup.getY() : rTup.getY());
+            (0 > rTup.getY()) ? -rTup.getY() : rTup.getY()); 
         return aAbs;
     }
 
-    inline B2DTuple interpolate(const B2I64Tuple& rOld1, const B2I64Tuple& rOld2, double t)
-    {
+    inline B2DTuple interpolate(const B2I64Tuple& rOld1, const B2I64Tuple& rOld2, double t) 
+    { 
         B2DTuple aInt(
             ((rOld2.getX() - rOld1.getX()) * t) + rOld1.getX(),
-            ((rOld2.getY() - rOld1.getY()) * t) + rOld1.getY());
+            ((rOld2.getY() - rOld1.getY()) * t) + rOld1.getY()); 
         return aInt;
     }
 
-    inline B2DTuple average(const B2I64Tuple& rOld1, const B2I64Tuple& rOld2)
-    {
+    inline B2DTuple average(const B2I64Tuple& rOld1, const B2I64Tuple& rOld2) 
+    { 
         B2DTuple aAvg(
             (rOld1.getX() + rOld2.getX()) * 0.5,
-            (rOld1.getY() + rOld2.getY()) * 0.5);
+            (rOld1.getY() + rOld2.getY()) * 0.5); 
         return aAvg;
     }
-
+    
     inline B2DTuple average(const B2I64Tuple& rOld1, const B2I64Tuple& rOld2, const B2I64Tuple& rOld3)
-    {
+    { 
         B2DTuple aAvg(
             (rOld1.getX() + rOld2.getX() + rOld3.getX()) * (1.0 / 3.0),
-            (rOld1.getY() + rOld2.getY() + rOld3.getY()) * (1.0 / 3.0));
+            (rOld1.getY() + rOld2.getY() + rOld3.getY()) * (1.0 / 3.0)); 
         return aAvg;
     }
 
     inline B2I64Tuple operator+(const B2I64Tuple& rTupA, const B2I64Tuple& rTupB)
-    {
-        B2I64Tuple aSum(rTupA);
-        aSum += rTupB;
-        return aSum;
+    { 
+        B2I64Tuple aSum(rTupA); 
+        aSum += rTupB; 
+        return aSum; 
     }
 
     inline B2I64Tuple operator-(const B2I64Tuple& rTupA, const B2I64Tuple& rTupB)
-    {
-        B2I64Tuple aSub(rTupA);
-        aSub -= rTupB;
-        return aSub;
+    { 
+        B2I64Tuple aSub(rTupA); 
+        aSub -= rTupB; 
+        return aSub; 
     }
 
     inline B2I64Tuple operator/(const B2I64Tuple& rTupA, const B2I64Tuple& rTupB)
-    {
-        B2I64Tuple aDiv(rTupA);
-        aDiv /= rTupB;
-        return aDiv;
+    { 
+        B2I64Tuple aDiv(rTupA); 
+        aDiv /= rTupB; 
+        return aDiv; 
     }
 
     inline B2I64Tuple operator*(const B2I64Tuple& rTupA, const B2I64Tuple& rTupB)
-    {
-        B2I64Tuple aMul(rTupA);
-        aMul *= rTupB;
-        return aMul;
+    { 
+        B2I64Tuple aMul(rTupA); 
+        aMul *= rTupB; 
+        return aMul; 
     }
 
     inline B2I64Tuple operator*(const B2I64Tuple& rTup, sal_Int64 t)
-    {
-        B2I64Tuple aNew(rTup);
-        aNew *= t;
-        return aNew;
+    { 
+        B2I64Tuple aNew(rTup); 
+        aNew *= t; 
+        return aNew; 
     }
 
     inline B2I64Tuple operator*(sal_Int64 t, const B2I64Tuple& rTup)
-    {
-        B2I64Tuple aNew(rTup);
-        aNew *= t;
-        return aNew;
+    { 
+        B2I64Tuple aNew(rTup); 
+        aNew *= t; 
+        return aNew; 
     }
 
     inline B2I64Tuple operator/(const B2I64Tuple& rTup, sal_Int64 t)
-    {
-        B2I64Tuple aNew(rTup);
-        aNew /= t;
-        return aNew;
+    { 
+        B2I64Tuple aNew(rTup); 
+        aNew /= t; 
+        return aNew; 
     }
 
     inline B2I64Tuple operator/(sal_Int64 t, const B2I64Tuple& rTup)
     {
-        B2I64Tuple aNew(t, t);
-        B2I64Tuple aTmp(rTup);
-        aNew /= aTmp;
-        return aNew;
+        B2I64Tuple aNew(t, t); 
+        B2I64Tuple aTmp(rTup); 
+        aNew /= aTmp; 
+        return aNew; 
     }
 } // end of namespace basegfx
 
diff --git a/basegfx/inc/basegfx/tuple/b2ituple.hxx b/basegfx/inc/basegfx/tuple/b2ituple.hxx
index da29b5509dec..1871a4656244 100644
--- a/basegfx/inc/basegfx/tuple/b2ituple.hxx
+++ b/basegfx/inc/basegfx/tuple/b2ituple.hxx
@@ -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
@@ -44,57 +44,57 @@ namespace basegfx
     class B2ITuple
     {
     protected:
-        sal_Int32                                       mnX;
-        sal_Int32                                       mnY;
-
-    public:
-        /** Create a 2D Tuple
+        sal_Int32										mnX;
+        sal_Int32										mnY;
+                            
+    public:					
+        /**	Create a 2D Tuple
 
             The tuple is initialized to (0, 0)
         */
-        B2ITuple()
-        :   mnX(0),
-            mnY(0)
+        B2ITuple() 
+        :	mnX(0), 
+            mnY(0) 
         {}
 
-        /** Create a 2D Tuple
+        /**	Create a 2D Tuple
 
             @param fX
             This parameter is used to initialize the X-coordinate
             of the 2D Tuple.
-
+            
             @param fY
             This parameter is used to initialize the Y-coordinate
             of the 2D Tuple.
         */
-        B2ITuple(sal_Int32 fX, sal_Int32 fY)
-        :   mnX( fX ),
-            mnY( fY )
+        B2ITuple(sal_Int32 fX, sal_Int32 fY) 
+        :	mnX( fX ), 
+            mnY( fY ) 
         {}
 
-        /** Create a copy of a 2D Tuple
+        /**	Create a copy of a 2D Tuple
 
             @param rTup
             The 2D Tuple which will be copied.
         */
-        B2ITuple(const B2ITuple& rTup)
-        :   mnX( rTup.mnX ),
-            mnY( rTup.mnY )
+        B2ITuple(const B2ITuple& rTup) 
+        :	mnX( rTup.mnX ), 
+            mnY( rTup.mnY ) 
         {}
 
-        ~B2ITuple()
+        ~B2ITuple() 
         {}
 
         /// Get X-Coordinate of 2D Tuple
         sal_Int32 getX() const
-        {
-            return mnX;
+        { 
+            return mnX; 
         }
 
         /// Get Y-Coordinate of 2D Tuple
         sal_Int32 getY() const
-        {
-            return mnY;
+        { 
+            return mnY; 
         }
 
         /// Set X-Coordinate of 2D Tuple
@@ -110,8 +110,8 @@ namespace basegfx
         }
 
         /// Array-access to 2D Tuple
-        const sal_Int32& operator[] (int nPos) const
-        {
+        const sal_Int32& operator[] (int nPos) const 
+        { 
             // Here, normally one if(...) should be used. In the assumption that
             // both sal_Int32 members can be accessed as an array a shortcut is used here.
             // if(0 == nPos) return mnX; return mnY;
@@ -120,7 +120,7 @@ namespace basegfx
 
         /// Array-access to 2D Tuple
         sal_Int32& operator[] (int nPos)
-        {
+        { 
             // Here, normally one if(...) should be used. In the assumption that
             // both sal_Int32 members can be accessed as an array a shortcut is used here.
             // if(0 == nPos) return mnX; return mnY;
@@ -130,70 +130,70 @@ namespace basegfx
         // operators
         //////////////////////////////////////////////////////////////////////
 
-        B2ITuple& operator+=( const B2ITuple& rTup )
-        {
+        B2ITuple& operator+=( const B2ITuple& rTup ) 
+        { 
             mnX += rTup.mnX;
-            mnY += rTup.mnY;
-            return *this;
+            mnY += rTup.mnY; 
+            return *this; 
         }
 
-        B2ITuple& operator-=( const B2ITuple& rTup )
-        {
+        B2ITuple& operator-=( const B2ITuple& rTup ) 
+        { 
             mnX -= rTup.mnX;
-            mnY -= rTup.mnY;
-            return *this;
+            mnY -= rTup.mnY; 
+            return *this; 
         }
 
-        B2ITuple& operator/=( const B2ITuple& rTup )
-        {
+        B2ITuple& operator/=( const B2ITuple& rTup ) 
+        { 
             mnX /= rTup.mnX;
-            mnY /= rTup.mnY;
-            return *this;
+            mnY /= rTup.mnY; 
+            return *this; 
         }
 
-        B2ITuple& operator*=( const B2ITuple& rTup )
-        {
+        B2ITuple& operator*=( const B2ITuple& rTup ) 
+        { 
             mnX *= rTup.mnX;
-            mnY *= rTup.mnY;
-            return *this;
+            mnY *= rTup.mnY; 
+            return *this; 
         }
 
-        B2ITuple& operator*=(sal_Int32 t)
-        {
-            mnX *= t;
-            mnY *= t;
-            return *this;
+        B2ITuple& operator*=(sal_Int32 t) 
+        { 
+            mnX *= t; 
+            mnY *= t; 
+            return *this; 
         }
 
-        B2ITuple& operator/=(sal_Int32 t)
-        {
-            mnX /= t;
-            mnY /= t;
-            return *this;
+        B2ITuple& operator/=(sal_Int32 t) 
+        { 
+            mnX /= t; 
+            mnY /= t; 
+            return *this; 
         }
 
-        B2ITuple operator-(void) const
-        {
-            return B2ITuple(-mnX, -mnY);
+        B2ITuple operator-(void) const 
+        {	
+            return B2ITuple(-mnX, -mnY); 
         }
-
+        
         bool equalZero() const { return mnX == 0 && mnY == 0; }
 
-        bool operator==( const B2ITuple& rTup ) const
-        {
+        bool operator==( const B2ITuple& rTup ) const 
+        { 
             return this == &rTup || (rTup.mnX == mnX && rTup.mnY == mnY);
         }
 
-        bool operator!=( const B2ITuple& rTup ) const
-        {
+        bool operator!=( const B2ITuple& rTup ) const 
+        { 
             return !(*this == rTup);
         }
-
-        B2ITuple& operator=( const B2ITuple& rTup )
-        {
+        
+        B2ITuple& operator=( const B2ITuple& rTup ) 
+        { 
             mnX = rTup.mnX;
-            mnY = rTup.mnY;
-            return *this;
+            mnY = rTup.mnY; 
+            return *this; 
         }
 
         static const B2ITuple& getEmptyTuple();
@@ -204,16 +204,16 @@ namespace basegfx
 
     class B2DTuple;
 
-    B2ITuple minimum(const B2ITuple& rTupA, const B2ITuple& rTupB);
-
-    B2ITuple maximum(const B2ITuple& rTupA, const B2ITuple& rTupB);
+    B2ITuple minimum(const B2ITuple& rTupA, const B2ITuple& rTupB); 
 
-    B2ITuple absolute(const B2ITuple& rTup);
+    B2ITuple maximum(const B2ITuple& rTupA, const B2ITuple& rTupB); 
 
-    B2DTuple interpolate(const B2ITuple& rOld1, const B2ITuple& rOld2, double t);
+    B2ITuple absolute(const B2ITuple& rTup); 
 
-    B2DTuple average(const B2ITuple& rOld1, const B2ITuple& rOld2);
+    B2DTuple interpolate(const B2ITuple& rOld1, const B2ITuple& rOld2, double t); 
 
+    B2DTuple average(const B2ITuple& rOld1, const B2ITuple& rOld2); 
+    
     B2DTuple average(const B2ITuple& rOld1, const B2ITuple& rOld2, const B2ITuple& rOld3);
 
     B2ITuple operator+(const B2ITuple& rTupA, const B2ITuple& rTupB);
diff --git a/basegfx/inc/basegfx/tuple/b3dtuple.hxx b/basegfx/inc/basegfx/tuple/b3dtuple.hxx
index 11fb797ff0ff..a803b1633910 100644
--- a/basegfx/inc/basegfx/tuple/b3dtuple.hxx
+++ b/basegfx/inc/basegfx/tuple/b3dtuple.hxx
@@ -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
@@ -47,78 +47,78 @@ namespace basegfx
     class B3DTuple
     {
     protected:
-        double                                      mfX;
-        double                                      mfY;
-        double                                      mfZ;
+        double										mfX;
+        double										mfY;
+        double										mfZ;
 
     public:
-        /** Create a 3D Tuple
+        /**	Create a 3D Tuple
 
             The tuple is initialized to (0.0, 0.0, 0.0)
         */
         B3DTuple()
-        :   mfX(0.0),
+        :	mfX(0.0),
             mfY(0.0),
             mfZ(0.0)
         {}
 
-        /** Create a 3D Tuple
+        /**	Create a 3D Tuple
 
             @param fX
             This parameter is used to initialize the X-coordinate
             of the 3D Tuple.
-
+            
             @param fY
             This parameter is used to initialize the Y-coordinate
             of the 3D Tuple.
-
+            
             @param fZ
             This parameter is used to initialize the Z-coordinate
             of the 3D Tuple.
         */
         B3DTuple(double fX, double fY, double fZ)
-        :   mfX(fX),
+        :	mfX(fX),
             mfY(fY),
             mfZ(fZ)
         {}
 
-        /** Create a copy of a 3D Tuple
+        /**	Create a copy of a 3D Tuple
 
             @param rTup
             The 3D Tuple which will be copied.
         */
-        B3DTuple(const B3DTuple& rTup)
-        :   mfX( rTup.mfX ),
+        B3DTuple(const B3DTuple& rTup) 
+        :	mfX( rTup.mfX ), 
             mfY( rTup.mfY ),
-            mfZ( rTup.mfZ )
+            mfZ( rTup.mfZ ) 
         {}
 
-        /** Create a copy of a 3D integer Tuple
+        /**	Create a copy of a 3D integer Tuple
 
             @param rTup
             The 3D Tuple which will be copied.
         */
         explicit B3DTuple(const B3ITuple& rTup);
 
-        ~B3DTuple()
+        ~B3DTuple() 
         {}
 
         /// get X-Coordinate of 3D Tuple
         double getX() const
-        {
-            return mfX;
+        { 
+            return mfX; 
         }
 
         /// get Y-Coordinate of 3D Tuple
         double getY() const
-        {
-            return mfY;
+        { 
+            return mfY; 
         }
 
         /// get Z-Coordinate of 3D Tuple
         double getZ() const
-        {
-            return mfZ;
+        { 
+            return mfZ; 
         }
 
         /// set X-Coordinate of 3D Tuple
@@ -140,8 +140,8 @@ namespace basegfx
         }
 
         /// Array-access to 3D Tuple
-        const double& operator[] (int nPos) const
-        {
+        const double& operator[] (int nPos) const 
+        { 
             // Here, normally two if(...)'s should be used. In the assumption that
             // both double members can be accessed as an array a shortcut is used here.
             // if(0 == nPos) return mfX; if(1 == nPos) return mfY; return mfZ;
@@ -150,7 +150,7 @@ namespace basegfx
 
         /// Array-access to 3D Tuple
         double& operator[] (int nPos)
-        {
+        { 
             // Here, normally two if(...)'s should be used. In the assumption that
             // both double members can be accessed as an array a shortcut is used here.
             // if(0 == nPos) return mfX; if(1 == nPos) return mfY; return mfZ;
@@ -161,26 +161,26 @@ namespace basegfx
         //////////////////////////////////////////////////////////////////////
 
         bool equalZero() const
-        {
-            return (this == &getEmptyTuple() ||
-                (::basegfx::fTools::equalZero(mfX)
-                && ::basegfx::fTools::equalZero(mfY)
+        { 
+            return (this == &getEmptyTuple() || 
+                (::basegfx::fTools::equalZero(mfX) 
+                && ::basegfx::fTools::equalZero(mfY) 
                 && ::basegfx::fTools::equalZero(mfZ)));
         }
 
         bool equalZero(const double& rfSmallValue) const
-        {
-            return (this == &getEmptyTuple() ||
-                (::basegfx::fTools::equalZero(mfX, rfSmallValue)
+        { 
+            return (this == &getEmptyTuple() || 
+                (::basegfx::fTools::equalZero(mfX, rfSmallValue) 
                 && ::basegfx::fTools::equalZero(mfY, rfSmallValue)
                 && ::basegfx::fTools::equalZero(mfZ, rfSmallValue)));
         }
 
         bool equal(const B3DTuple& rTup) const
-        {
+        { 
             return (
                 this == &rTup ||
-                (::basegfx::fTools::equal(mfX, rTup.mfX) &&
+                (::basegfx::fTools::equal(mfX, rTup.mfX) && 
                 ::basegfx::fTools::equal(mfY, rTup.mfY) &&
                 ::basegfx::fTools::equal(mfZ, rTup.mfZ)));
         }
@@ -189,84 +189,84 @@ namespace basegfx
         {
             return (
                 this == &rTup ||
-                (::basegfx::fTools::equal(mfX, rTup.mfX, rfSmallValue) &&
-                ::basegfx::fTools::equal(mfY, rTup.mfY, rfSmallValue) &&
+                (::basegfx::fTools::equal(mfX, rTup.mfX, rfSmallValue) && 
+                ::basegfx::fTools::equal(mfY, rTup.mfY, rfSmallValue) && 
                 ::basegfx::fTools::equal(mfZ, rTup.mfZ, rfSmallValue)));
         }
 
         // operators
         //////////////////////////////////////////////////////////////////////
 
-        B3DTuple& operator+=( const B3DTuple& rTup )
-        {
+        B3DTuple& operator+=( const B3DTuple& rTup ) 
+        { 
             mfX += rTup.mfX;
-            mfY += rTup.mfY;
-            mfZ += rTup.mfZ;
-            return *this;
+            mfY += rTup.mfY; 
+            mfZ += rTup.mfZ; 
+            return *this; 
         }
 
-        B3DTuple& operator-=( const B3DTuple& rTup )
-        {
+        B3DTuple& operator-=( const B3DTuple& rTup ) 
+        { 
             mfX -= rTup.mfX;
-            mfY -= rTup.mfY;
-            mfZ -= rTup.mfZ;
-            return *this;
+            mfY -= rTup.mfY; 
+            mfZ -= rTup.mfZ; 
+            return *this; 
         }
 
-        B3DTuple& operator/=( const B3DTuple& rTup )
-        {
+        B3DTuple& operator/=( const B3DTuple& rTup ) 
+        { 
             mfX /= rTup.mfX;
-            mfY /= rTup.mfY;
-            mfZ /= rTup.mfZ;
-            return *this;
+            mfY /= rTup.mfY; 
+            mfZ /= rTup.mfZ; 
+            return *this; 
         }
 
-        B3DTuple& operator*=( const B3DTuple& rTup )
-        {
+        B3DTuple& operator*=( const B3DTuple& rTup ) 
+        { 
             mfX *= rTup.mfX;
-            mfY *= rTup.mfY;
-            mfZ *= rTup.mfZ;
-            return *this;
+            mfY *= rTup.mfY; 
+            mfZ *= rTup.mfZ; 
+            return *this; 
         }
 
-        B3DTuple& operator*=(double t)
-        {
-            mfX *= t;
-            mfY *= t;
-            mfZ *= t;
-            return *this;
+        B3DTuple& operator*=(double t) 
+        { 
+            mfX *= t; 
+            mfY *= t; 
+            mfZ *= t; 
+            return *this; 
         }
 
-        B3DTuple& operator/=(double t)
-        {
+        B3DTuple& operator/=(double t) 
+        { 
             const double fVal(1.0 / t);
-            mfX *= fVal;
-            mfY *= fVal;
-            mfZ *= fVal;
-            return *this;
+            mfX *= fVal; 
+            mfY *= fVal; 
+            mfZ *= fVal; 
+            return *this; 
         }
 
-        B3DTuple operator-(void) const
-        {
-            return B3DTuple(-mfX, -mfY, -mfZ);
+        B3DTuple operator-(void) const 
+        {	
+            return B3DTuple(-mfX, -mfY, -mfZ); 
         }
 
-        bool operator==( const B3DTuple& rTup ) const
-        {
+        bool operator==( const B3DTuple& rTup ) const 
+        { 
             return equal(rTup);
         }
 
-        bool operator!=( const B3DTuple& rTup ) const
-        {
+        bool operator!=( const B3DTuple& rTup ) const 
+        { 
             return !equal(rTup);
         }
-
-        B3DTuple& operator=( const B3DTuple& rTup )
-        {
+        
+        B3DTuple& operator=( const B3DTuple& rTup ) 
+        { 
             mfX = rTup.mfX;
-            mfY = rTup.mfY;
-            mfZ = rTup.mfZ;
-            return *this;
+            mfY = rTup.mfY; 
+            mfZ = rTup.mfZ; 
+            return *this; 
         }
 
         void correctValues(const double fCompareValue = 0.0)
@@ -282,7 +282,7 @@ namespace basegfx
                 {
                     mfY = 0.0;
                 }
-
+                
                 if(::basegfx::fTools::equalZero(mfZ))
                 {
                     mfZ = 0.0;
@@ -294,12 +294,12 @@ namespace basegfx
                 {
                     mfX = fCompareValue;
                 }
-
+                
                 if(::basegfx::fTools::equal(mfY, fCompareValue))
                 {
                     mfY = fCompareValue;
                 }
-
+                
                 if(::basegfx::fTools::equal(mfZ, fCompareValue))
                 {
                     mfZ = fCompareValue;
@@ -313,114 +313,114 @@ namespace basegfx
     // external operators
     //////////////////////////////////////////////////////////////////////////
 
-    inline B3DTuple minimum(const B3DTuple& rTupA, const B3DTuple& rTupB)
-    {
+    inline B3DTuple minimum(const B3DTuple& rTupA, const B3DTuple& rTupB) 
+    { 
         B3DTuple aMin(
             (rTupB.getX() < rTupA.getX()) ? rTupB.getX() : rTupA.getX(),
             (rTupB.getY() < rTupA.getY()) ? rTupB.getY() : rTupA.getY(),
-            (rTupB.getZ() < rTupA.getZ()) ? rTupB.getZ() : rTupA.getZ());
+            (rTupB.getZ() < rTupA.getZ()) ? rTupB.getZ() : rTupA.getZ()); 
         return aMin;
     }
 
-    inline B3DTuple maximum(const B3DTuple& rTupA, const B3DTuple& rTupB)
-    {
+    inline B3DTuple maximum(const B3DTuple& rTupA, const B3DTuple& rTupB) 
+    { 
         B3DTuple aMax(
             (rTupB.getX() > rTupA.getX()) ? rTupB.getX() : rTupA.getX(),
             (rTupB.getY() > rTupA.getY()) ? rTupB.getY() : rTupA.getY(),
-            (rTupB.getZ() > rTupA.getZ()) ? rTupB.getZ() : rTupA.getZ());
+            (rTupB.getZ() > rTupA.getZ()) ? rTupB.getZ() : rTupA.getZ()); 
         return aMax;
     }
 
-    inline B3DTuple absolute(const B3DTuple& rTup)
-    {
+    inline B3DTuple absolute(const B3DTuple& rTup) 
+    { 
         B3DTuple aAbs(
             (0.0 > rTup.getX()) ? -rTup.getX() : rTup.getX(),
             (0.0 > rTup.getY()) ? -rTup.getY() : rTup.getY(),
-            (0.0 > rTup.getZ()) ? -rTup.getZ() : rTup.getZ());
+            (0.0 > rTup.getZ()) ? -rTup.getZ() : rTup.getZ()); 
         return aAbs;
     }
 
-    inline B3DTuple interpolate(const B3DTuple& rOld1, const B3DTuple& rOld2, double t)
-    {
+    inline B3DTuple interpolate(const B3DTuple& rOld1, const B3DTuple& rOld2, double t) 
+    { 
         B3DTuple aInt(
             ((rOld2.getX() - rOld1.getX()) * t) + rOld1.getX(),
             ((rOld2.getY() - rOld1.getY()) * t) + rOld1.getY(),
-            ((rOld2.getZ() - rOld1.getZ()) * t) + rOld1.getZ());
+            ((rOld2.getZ() - rOld1.getZ()) * t) + rOld1.getZ()); 
         return aInt;
     }
 
-    inline B3DTuple average(const B3DTuple& rOld1, const B3DTuple& rOld2)
-    {
+    inline B3DTuple average(const B3DTuple& rOld1, const B3DTuple& rOld2) 
+    { 
         B3DTuple aAvg(
             (rOld1.getX() + rOld2.getX()) * 0.5,
             (rOld1.getY() + rOld2.getY()) * 0.5,
-            (rOld1.getZ() + rOld2.getZ()) * 0.5);
+            (rOld1.getZ() + rOld2.getZ()) * 0.5); 
         return aAvg;
     }
-
+    
     inline B3DTuple average(const B3DTuple& rOld1, const B3DTuple& rOld2, const B3DTuple& rOld3)
-    {
+    { 
         B3DTuple aAvg(
             (rOld1.getX() + rOld2.getX() + rOld3.getX()) * (1.0 / 3.0),
             (rOld1.getY() + rOld2.getY() + rOld3.getY()) * (1.0 / 3.0),
-            (rOld1.getZ() + rOld2.getZ() + rOld3.getZ()) * (1.0 / 3.0));
+            (rOld1.getZ() + rOld2.getZ() + rOld3.getZ()) * (1.0 / 3.0)); 
         return aAvg;
     }
-
+    
     inline B3DTuple operator+(const B3DTuple& rTupA, const B3DTuple& rTupB)
-    {
-        B3DTuple aSum(rTupA);
-        aSum += rTupB;
-        return aSum;
+    { 
+        B3DTuple aSum(rTupA); 
+        aSum += rTupB; 
+        return aSum; 
     }
 
     inline B3DTuple operator-(const B3DTuple& rTupA, const B3DTuple& rTupB)
-    {
-        B3DTuple aSub(rTupA);
-        aSub -= rTupB;
-        return aSub;
+    { 
+        B3DTuple aSub(rTupA); 
+        aSub -= rTupB; 
+        return aSub; 
     }
 
     inline B3DTuple operator/(const B3DTuple& rTupA, const B3DTuple& rTupB)
-    {
-        B3DTuple aDiv(rTupA);
-        aDiv /= rTupB;
-        return aDiv;
+    { 
+        B3DTuple aDiv(rTupA); 
+        aDiv /= rTupB; 
+        return aDiv; 
     }
 
     inline B3DTuple operator*(const B3DTuple& rTupA, const B3DTuple& rTupB)
-    {
-        B3DTuple aMul(rTupA);
-        aMul *= rTupB;
-        return aMul;
+    { 
+        B3DTuple aMul(rTupA); 
+        aMul *= rTupB; 
+        return aMul; 
     }
 
     inline B3DTuple operator*(const B3DTuple& rTup, double t)
-    {
-        B3DTuple aNew(rTup);
-        aNew *= t;
-        return aNew;
+    { 
+        B3DTuple aNew(rTup); 
+        aNew *= t; 
+        return aNew; 
     }
 
     inline B3DTuple operator*(double t, const B3DTuple& rTup)
-    {
-        B3DTuple aNew(rTup);
-        aNew *= t;
-        return aNew;
+    { 
+        B3DTuple aNew(rTup); 
+        aNew *= t; 
+        return aNew; 
     }
 
     inline B3DTuple operator/(const B3DTuple& rTup, double t)
-    {
-        B3DTuple aNew(rTup);
-        aNew /= t;
-        return aNew;
+    { 
+        B3DTuple aNew(rTup); 
+        aNew /= t; 
+        return aNew; 
     }
 
     inline B3DTuple operator/(double t, const B3DTuple& rTup)
     {
-        B3DTuple aNew(rTup);
-        aNew /= t;
-        return aNew;
+        B3DTuple aNew(rTup); 
+        aNew /= t; 
+        return aNew; 
     }
 
     /** Round double to nearest integer for 3D tuple
diff --git a/basegfx/inc/basegfx/tuple/b3i64tuple.hxx b/basegfx/inc/basegfx/tuple/b3i64tuple.hxx
index a2d754fe4f79..765e9851296c 100644
--- a/basegfx/inc/basegfx/tuple/b3i64tuple.hxx
+++ b/basegfx/inc/basegfx/tuple/b3i64tuple.hxx
@@ -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
@@ -45,71 +45,71 @@ namespace basegfx
     class B3I64Tuple
     {
     protected:
-        sal_Int64                                       mnX;
-        sal_Int64                                       mnY;
-        sal_Int64                                       mnZ;
+        sal_Int64										mnX;
+        sal_Int64										mnY;
+        sal_Int64										mnZ;
 
     public:
-        /** Create a 3D Tuple
+        /**	Create a 3D Tuple
 
             The tuple is initialized to (0, 0, 0)
         */
         B3I64Tuple()
-        :   mnX(0),
+        :	mnX(0),
             mnY(0),
             mnZ(0)
         {}
 
-        /** Create a 3D Tuple
+        /**	Create a 3D Tuple
 
             @param nX
             This parameter is used to initialize the X-coordinate
             of the 3D Tuple.
-
+            
             @param nY
             This parameter is used to initialize the Y-coordinate
             of the 3D Tuple.
-
+            
             @param nZ
             This parameter is used to initialize the Z-coordinate
             of the 3D Tuple.
         */
         B3I64Tuple(sal_Int64 nX, sal_Int64 nY, sal_Int64 nZ)
-        :   mnX(nX),
+        :	mnX(nX),
             mnY(nY),
             mnZ(nZ)
         {}
 
-        /** Create a copy of a 3D Tuple
+        /**	Create a copy of a 3D Tuple
 
             @param rTup
             The 3D Tuple which will be copied.
         */
-        B3I64Tuple(const B3I64Tuple& rTup)
-        :   mnX( rTup.mnX ),
+        B3I64Tuple(const B3I64Tuple& rTup) 
+        :	mnX( rTup.mnX ), 
             mnY( rTup.mnY ),
-            mnZ( rTup.mnZ )
+            mnZ( rTup.mnZ ) 
         {}
 
-        ~B3I64Tuple()
+        ~B3I64Tuple() 
         {}
 
         /// get X-Coordinate of 3D Tuple
         sal_Int64 getX() const
-        {
-            return mnX;
+        { 
+            return mnX; 
         }
 
         /// get Y-Coordinate of 3D Tuple
         sal_Int64 getY() const
-        {
-            return mnY;
+        { 
+            return mnY; 
         }
 
         /// get Z-Coordinate of 3D Tuple
         sal_Int64 getZ() const
-        {
-            return mnZ;
+        { 
+            return mnZ; 
         }
 
         /// set X-Coordinate of 3D Tuple
@@ -131,8 +131,8 @@ namespace basegfx
         }
 
         /// Array-access to 3D Tuple
-        const sal_Int64& operator[] (int nPos) const
-        {
+        const sal_Int64& operator[] (int nPos) const 
+        { 
             // Here, normally two if(...)'s should be used. In the assumption that
             // both sal_Int64 members can be accessed as an array a shortcut is used here.
             // if(0 == nPos) return mnX; if(1 == nPos) return mnY; return mnZ;
@@ -141,7 +141,7 @@ namespace basegfx
 
         /// Array-access to 3D Tuple
         sal_Int64& operator[] (int nPos)
-        {
+        { 
             // Here, normally two if(...)'s should be used. In the assumption that
             // both sal_Int64 members can be accessed as an array a shortcut is used here.
             // if(0 == nPos) return mnX; if(1 == nPos) return mnY; return mnZ;
@@ -151,81 +151,81 @@ namespace basegfx
         // operators
         //////////////////////////////////////////////////////////////////////
 
-        B3I64Tuple& operator+=( const B3I64Tuple& rTup )
-        {
+        B3I64Tuple& operator+=( const B3I64Tuple& rTup ) 
+        { 
             mnX += rTup.mnX;
-            mnY += rTup.mnY;
-            mnZ += rTup.mnZ;
-            return *this;
+            mnY += rTup.mnY; 
+            mnZ += rTup.mnZ; 
+            return *this; 
         }
 
-        B3I64Tuple& operator-=( const B3I64Tuple& rTup )
-        {
+        B3I64Tuple& operator-=( const B3I64Tuple& rTup ) 
+        { 
             mnX -= rTup.mnX;
-            mnY -= rTup.mnY;
-            mnZ -= rTup.mnZ;
-            return *this;
+            mnY -= rTup.mnY; 
+            mnZ -= rTup.mnZ; 
+            return *this; 
         }
 
-        B3I64Tuple& operator/=( const B3I64Tuple& rTup )
-        {
+        B3I64Tuple& operator/=( const B3I64Tuple& rTup ) 
+        { 
             mnX /= rTup.mnX;
-            mnY /= rTup.mnY;
-            mnZ /= rTup.mnZ;
-            return *this;
+            mnY /= rTup.mnY; 
+            mnZ /= rTup.mnZ; 
+            return *this; 
         }
 
-        B3I64Tuple& operator*=( const B3I64Tuple& rTup )
-        {
+        B3I64Tuple& operator*=( const B3I64Tuple& rTup ) 
+        { 
             mnX *= rTup.mnX;
-            mnY *= rTup.mnY;
-            mnZ *= rTup.mnZ;
-            return *this;
+            mnY *= rTup.mnY; 
+            mnZ *= rTup.mnZ; 
+            return *this; 
         }
 
-        B3I64Tuple& operator*=(sal_Int64 t)
-        {
-            mnX *= t;
-            mnY *= t;
-            mnZ *= t;
-            return *this;
+        B3I64Tuple& operator*=(sal_Int64 t) 
+        { 
+            mnX *= t; 
+            mnY *= t; 
+            mnZ *= t; 
+            return *this; 
         }
 
-        B3I64Tuple& operator/=(sal_Int64 t)
-        {
-            mnX /= t;
-            mnY /= t;
-            mnZ /= t;
-            return *this;
+        B3I64Tuple& operator/=(sal_Int64 t) 
+        { 
+            mnX /= t; 
+            mnY /= t; 
+            mnZ /= t; 
+            return *this; 
         }
 
-        B3I64Tuple operator-(void) const
-        {
-            return B3I64Tuple(-mnX, -mnY, -mnZ);
+        B3I64Tuple operator-(void) const 
+        {	
+            return B3I64Tuple(-mnX, -mnY, -mnZ); 
         }
 
         bool equalZero() const
-        {
-            return (this == &getEmptyTuple() ||
+        { 
+            return (this == &getEmptyTuple() || 
                 (mnX == 0 && mnY == 0 && mnZ == 0));
         }
 
-        bool operator==( const B3I64Tuple& rTup ) const
-        {
+        bool operator==( const B3I64Tuple& rTup ) const 
+        { 
             return this == &rTup || (rTup.mnX == mnX && rTup.mnY == mnY && rTup.mnZ == mnZ);
         }
 
-        bool operator!=( const B3I64Tuple& rTup ) const
-        {
+        bool operator!=( const B3I64Tuple& rTup ) const 
+        { 
             return !(*this == rTup);
         }
-
-        B3I64Tuple& operator=( const B3I64Tuple& rTup )
-        {
+        
+        B3I64Tuple& operator=( const B3I64Tuple& rTup ) 
+        { 
             mnX = rTup.mnX;
-            mnY = rTup.mnY;
-            mnZ = rTup.mnZ;
-            return *this;
+            mnY = rTup.mnY; 
+            mnZ = rTup.mnZ; 
+            return *this; 
         }
 
         static const B3I64Tuple& getEmptyTuple();
@@ -234,115 +234,115 @@ namespace basegfx
     // external operators
     //////////////////////////////////////////////////////////////////////////
 
-    inline B3I64Tuple minimum(const B3I64Tuple& rTupA, const B3I64Tuple& rTupB)
-    {
+    inline B3I64Tuple minimum(const B3I64Tuple& rTupA, const B3I64Tuple& rTupB) 
+    { 
         B3I64Tuple aMin(
             (rTupB.getX() < rTupA.getX()) ? rTupB.getX() : rTupA.getX(),
             (rTupB.getY() < rTupA.getY()) ? rTupB.getY() : rTupA.getY(),
-            (rTupB.getZ() < rTupA.getZ()) ? rTupB.getZ() : rTupA.getZ());
+            (rTupB.getZ() < rTupA.getZ()) ? rTupB.getZ() : rTupA.getZ()); 
         return aMin;
     }
 
-    inline B3I64Tuple maximum(const B3I64Tuple& rTupA, const B3I64Tuple& rTupB)
-    {
+    inline B3I64Tuple maximum(const B3I64Tuple& rTupA, const B3I64Tuple& rTupB) 
+    { 
         B3I64Tuple aMax(
             (rTupB.getX() > rTupA.getX()) ? rTupB.getX() : rTupA.getX(),
             (rTupB.getY() > rTupA.getY()) ? rTupB.getY() : rTupA.getY(),
-            (rTupB.getZ() > rTupA.getZ()) ? rTupB.getZ() : rTupA.getZ());
+            (rTupB.getZ() > rTupA.getZ()) ? rTupB.getZ() : rTupA.getZ()); 
         return aMax;
     }
 
-    inline B3I64Tuple absolute(const B3I64Tuple& rTup)
-    {
+    inline B3I64Tuple absolute(const B3I64Tuple& rTup) 
+    { 
         B3I64Tuple aAbs(
             (0 > rTup.getX()) ? -rTup.getX() : rTup.getX(),
             (0 > rTup.getY()) ? -rTup.getY() : rTup.getY(),
-            (0 > rTup.getZ()) ? -rTup.getZ() : rTup.getZ());
+            (0 > rTup.getZ()) ? -rTup.getZ() : rTup.getZ()); 
         return aAbs;
     }
 
-    inline B3DTuple interpolate(const B3I64Tuple& rOld1, const B3I64Tuple& rOld2, double t)
-    {
+    inline B3DTuple interpolate(const B3I64Tuple& rOld1, const B3I64Tuple& rOld2, double t) 
+    { 
         B3DTuple aInt(
             ((rOld2.getX() - rOld1.getX()) * t) + rOld1.getX(),
             ((rOld2.getY() - rOld1.getY()) * t) + rOld1.getY(),
-            ((rOld2.getZ() - rOld1.getZ()) * t) + rOld1.getZ());
+            ((rOld2.getZ() - rOld1.getZ()) * t) + rOld1.getZ()); 
         return aInt;
     }
 
-    inline B3DTuple average(const B3I64Tuple& rOld1, const B3I64Tuple& rOld2)
-    {
+    inline B3DTuple average(const B3I64Tuple& rOld1, const B3I64Tuple& rOld2) 
+    { 
         B3DTuple aAvg(
             (rOld1.getX() + rOld2.getX()) * 0.5,
             (rOld1.getY() + rOld2.getY()) * 0.5,
-            (rOld1.getZ() + rOld2.getZ()) * 0.5);
+            (rOld1.getZ() + rOld2.getZ()) * 0.5); 
         return aAvg;
     }
-
+    
     inline B3DTuple average(const B3I64Tuple& rOld1, const B3I64Tuple& rOld2, const B3I64Tuple& rOld3)
-    {
+    { 
         B3DTuple aAvg(
             (rOld1.getX() + rOld2.getX() + rOld3.getX()) * (1.0 / 3.0),
             (rOld1.getY() + rOld2.getY() + rOld3.getY()) * (1.0 / 3.0),
-            (rOld1.getZ() + rOld2.getZ() + rOld3.getZ()) * (1.0 / 3.0));
+            (rOld1.getZ() + rOld2.getZ() + rOld3.getZ()) * (1.0 / 3.0)); 
         return aAvg;
     }
-
+    
     inline B3I64Tuple operator+(const B3I64Tuple& rTupA, const B3I64Tuple& rTupB)
-    {
-        B3I64Tuple aSum(rTupA);
-        aSum += rTupB;
-        return aSum;
+    { 
+        B3I64Tuple aSum(rTupA); 
+        aSum += rTupB; 
+        return aSum; 
     }
 
     inline B3I64Tuple operator-(const B3I64Tuple& rTupA, const B3I64Tuple& rTupB)
-    {
-        B3I64Tuple aSub(rTupA);
-        aSub -= rTupB;
-        return aSub;
+    { 
+        B3I64Tuple aSub(rTupA); 
+        aSub -= rTupB; 
+        return aSub; 
     }
 
     inline B3I64Tuple operator/(const B3I64Tuple& rTupA, const B3I64Tuple& rTupB)
-    {
-        B3I64Tuple aDiv(rTupA);
-        aDiv /= rTupB;
-        return aDiv;
+    { 
+        B3I64Tuple aDiv(rTupA); 
+        aDiv /= rTupB; 
+        return aDiv; 
     }
 
     inline B3I64Tuple operator*(const B3I64Tuple& rTupA, const B3I64Tuple& rTupB)
-    {
-        B3I64Tuple aMul(rTupA);
-        aMul *= rTupB;
-        return aMul;
+    { 
+        B3I64Tuple aMul(rTupA); 
+        aMul *= rTupB; 
+        return aMul; 
     }
 
     inline B3I64Tuple operator*(const B3I64Tuple& rTup, sal_Int64 t)
-    {
-        B3I64Tuple aNew(rTup);
-        aNew *= t;
-        return aNew;
+    { 
+        B3I64Tuple aNew(rTup); 
+        aNew *= t; 
+        return aNew; 
     }
 
     inline B3I64Tuple operator*(sal_Int64 t, const B3I64Tuple& rTup)
-    {
-        B3I64Tuple aNew(rTup);
-        aNew *= t;
-        return aNew;
+    { 
+        B3I64Tuple aNew(rTup); 
+        aNew *= t; 
+        return aNew; 
     }
 
     inline B3I64Tuple operator/(const B3I64Tuple& rTup, sal_Int64 t)
-    {
-        B3I64Tuple aNew(rTup);
-        aNew /= t;
-        return aNew;
+    { 
+        B3I64Tuple aNew(rTup); 
+        aNew /= t; 
+        return aNew; 
     }
 
     inline B3I64Tuple operator/(sal_Int64 t, const B3I64Tuple& rTup)
     {
-        B3I64Tuple aNew(t, t, t);
-        B3I64Tuple aTmp(rTup);
-        aNew /= aTmp;
-        return aNew;
+        B3I64Tuple aNew(t, t, t); 
+        B3I64Tuple aTmp(rTup); 
+        aNew /= aTmp; 
+        return aNew; 
     }
 } // end of namespace basegfx
 
diff --git a/basegfx/inc/basegfx/tuple/b3ituple.hxx b/basegfx/inc/basegfx/tuple/b3ituple.hxx
index 644ae07b6545..89ede03751da 100644
--- a/basegfx/inc/basegfx/tuple/b3ituple.hxx
+++ b/basegfx/inc/basegfx/tuple/b3ituple.hxx
@@ -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
@@ -45,71 +45,71 @@ namespace basegfx
     class B3ITuple
     {
     protected:
-        sal_Int32                                       mnX;
-        sal_Int32                                       mnY;
-        sal_Int32                                       mnZ;
+        sal_Int32										mnX;
+        sal_Int32										mnY;
+        sal_Int32										mnZ;
 
     public:
-        /** Create a 3D Tuple
+        /**	Create a 3D Tuple
 
             The tuple is initialized to (0, 0, 0)
         */
         B3ITuple()
-        :   mnX(0),
+        :	mnX(0),
             mnY(0),
             mnZ(0)
         {}
 
-        /** Create a 3D Tuple
+        /**	Create a 3D Tuple
 
             @param nX
             This parameter is used to initialize the X-coordinate
             of the 3D Tuple.
-
+            
             @param nY
             This parameter is used to initialize the Y-coordinate
             of the 3D Tuple.
-
+            
             @param nZ
             This parameter is used to initialize the Z-coordinate
             of the 3D Tuple.
         */
         B3ITuple(sal_Int32 nX, sal_Int32 nY, sal_Int32 nZ)
-        :   mnX(nX),
+        :	mnX(nX),
             mnY(nY),
             mnZ(nZ)
         {}
 
-        /** Create a copy of a 3D Tuple
+        /**	Create a copy of a 3D Tuple
 
             @param rTup
             The 3D Tuple which will be copied.
         */
-        B3ITuple(const B3ITuple& rTup)
-        :   mnX( rTup.mnX ),
+        B3ITuple(const B3ITuple& rTup) 
+        :	mnX( rTup.mnX ), 
             mnY( rTup.mnY ),
-            mnZ( rTup.mnZ )
+            mnZ( rTup.mnZ ) 
         {}
 
-        ~B3ITuple()
+        ~B3ITuple() 
         {}
 
         /// get X-Coordinate of 3D Tuple
         sal_Int32 getX() const
-        {
-            return mnX;
+        { 
+            return mnX; 
         }
 
         /// get Y-Coordinate of 3D Tuple
         sal_Int32 getY() const
-        {
-            return mnY;
+        { 
+            return mnY; 
         }
 
         /// get Z-Coordinate of 3D Tuple
         sal_Int32 getZ() const
-        {
-            return mnZ;
+        { 
+            return mnZ; 
         }
 
         /// set X-Coordinate of 3D Tuple
@@ -131,8 +131,8 @@ namespace basegfx
         }
 
         /// Array-access to 3D Tuple
-        const sal_Int32& operator[] (int nPos) const
-        {
+        const sal_Int32& operator[] (int nPos) const 
+        { 
             // Here, normally two if(...)'s should be used. In the assumption that
             // both sal_Int32 members can be accessed as an array a shortcut is used here.
             // if(0 == nPos) return mnX; if(1 == nPos) return mnY; return mnZ;
@@ -141,7 +141,7 @@ namespace basegfx
 
         /// Array-access to 3D Tuple
         sal_Int32& operator[] (int nPos)
-        {
+        { 
             // Here, normally two if(...)'s should be used. In the assumption that
             // both sal_Int32 members can be accessed as an array a shortcut is used here.
             // if(0 == nPos) return mnX; if(1 == nPos) return mnY; return mnZ;
@@ -151,81 +151,81 @@ namespace basegfx
         // operators
         //////////////////////////////////////////////////////////////////////
 
-        B3ITuple& operator+=( const B3ITuple& rTup )
-        {
+        B3ITuple& operator+=( const B3ITuple& rTup ) 
+        { 
             mnX += rTup.mnX;
-            mnY += rTup.mnY;
-            mnZ += rTup.mnZ;
-            return *this;
+            mnY += rTup.mnY; 
+            mnZ += rTup.mnZ; 
+            return *this; 
         }
 
-        B3ITuple& operator-=( const B3ITuple& rTup )
-        {
+        B3ITuple& operator-=( const B3ITuple& rTup ) 
+        { 
             mnX -= rTup.mnX;
-            mnY -= rTup.mnY;
-            mnZ -= rTup.mnZ;
-            return *this;
+            mnY -= rTup.mnY; 
+            mnZ -= rTup.mnZ; 
+            return *this; 
         }
 
-        B3ITuple& operator/=( const B3ITuple& rTup )
-        {
+        B3ITuple& operator/=( const B3ITuple& rTup ) 
+        { 
             mnX /= rTup.mnX;
-            mnY /= rTup.mnY;
-            mnZ /= rTup.mnZ;
-            return *this;
+            mnY /= rTup.mnY; 
+            mnZ /= rTup.mnZ; 
+            return *this; 
         }
 
-        B3ITuple& operator*=( const B3ITuple& rTup )
-        {
+        B3ITuple& operator*=( const B3ITuple& rTup ) 
+        { 
             mnX *= rTup.mnX;
-            mnY *= rTup.mnY;
-            mnZ *= rTup.mnZ;
-            return *this;
+            mnY *= rTup.mnY; 
+            mnZ *= rTup.mnZ; 
+            return *this; 
         }
 
-        B3ITuple& operator*=(sal_Int32 t)
-        {
-            mnX *= t;
-            mnY *= t;
-            mnZ *= t;
-            return *this;
+        B3ITuple& operator*=(sal_Int32 t) 
+        { 
+            mnX *= t; 
+            mnY *= t; 
+            mnZ *= t; 
+            return *this; 
         }
 
-        B3ITuple& operator/=(sal_Int32 t)
-        {
-            mnX /= t;
-            mnY /= t;
-            mnZ /= t;
-            return *this;
+        B3ITuple& operator/=(sal_Int32 t) 
+        { 
+            mnX /= t; 
+            mnY /= t; 
+            mnZ /= t; 
+            return *this; 
         }
 
-        B3ITuple operator-(void) const
-        {
-            return B3ITuple(-mnX, -mnY, -mnZ);
+        B3ITuple operator-(void) const 
+        {	
+            return B3ITuple(-mnX, -mnY, -mnZ); 
         }
 
         bool equalZero() const
-        {
-            return (this == &getEmptyTuple() ||
+        { 
+            return (this == &getEmptyTuple() || 
                 (mnX == 0 && mnY == 0 && mnZ == 0));
         }
 
-        bool operator==( const B3ITuple& rTup ) const
-        {
+        bool operator==( const B3ITuple& rTup ) const 
+        { 
             return this == &rTup || (rTup.mnX == mnX && rTup.mnY == mnY && rTup.mnZ == mnZ);
         }
 
-        bool operator!=( const B3ITuple& rTup ) const
-        {
+        bool operator!=( const B3ITuple& rTup ) const 
+        { 
             return !(*this == rTup);
         }
-
-        B3ITuple& operator=( const B3ITuple& rTup )
-        {
+        
+        B3ITuple& operator=( const B3ITuple& rTup ) 
+        { 
             mnX = rTup.mnX;
-            mnY = rTup.mnY;
-            mnZ = rTup.mnZ;
-            return *this;
+            mnY = rTup.mnY; 
+            mnZ = rTup.mnZ; 
+            return *this; 
         }
 
         static const B3ITuple& getEmptyTuple();
@@ -234,115 +234,115 @@ namespace basegfx
     // external operators
     //////////////////////////////////////////////////////////////////////////
 
-    inline B3ITuple minimum(const B3ITuple& rTupA, const B3ITuple& rTupB)
-    {
+    inline B3ITuple minimum(const B3ITuple& rTupA, const B3ITuple& rTupB) 
+    { 
         B3ITuple aMin(
             (rTupB.getX() < rTupA.getX()) ? rTupB.getX() : rTupA.getX(),
             (rTupB.getY() < rTupA.getY()) ? rTupB.getY() : rTupA.getY(),
-            (rTupB.getZ() < rTupA.getZ()) ? rTupB.getZ() : rTupA.getZ());
+            (rTupB.getZ() < rTupA.getZ()) ? rTupB.getZ() : rTupA.getZ()); 
         return aMin;
     }
 
-    inline B3ITuple maximum(const B3ITuple& rTupA, const B3ITuple& rTupB)
-    {
+    inline B3ITuple maximum(const B3ITuple& rTupA, const B3ITuple& rTupB) 
+    { 
         B3ITuple aMax(
             (rTupB.getX() > rTupA.getX()) ? rTupB.getX() : rTupA.getX(),
             (rTupB.getY() > rTupA.getY()) ? rTupB.getY() : rTupA.getY(),
-            (rTupB.getZ() > rTupA.getZ()) ? rTupB.getZ() : rTupA.getZ());
+            (rTupB.getZ() > rTupA.getZ()) ? rTupB.getZ() : rTupA.getZ()); 
         return aMax;
     }
 
-    inline B3ITuple absolute(const B3ITuple& rTup)
-    {
+    inline B3ITuple absolute(const B3ITuple& rTup) 
+    { 
         B3ITuple aAbs(
             (0 > rTup.getX()) ? -rTup.getX() : rTup.getX(),
             (0 > rTup.getY()) ? -rTup.getY() : rTup.getY(),
-            (0 > rTup.getZ()) ? -rTup.getZ() : rTup.getZ());
+            (0 > rTup.getZ()) ? -rTup.getZ() : rTup.getZ()); 
         return aAbs;
     }
 
-    inline B3DTuple interpolate(const B3ITuple& rOld1, const B3ITuple& rOld2, double t)
-    {
+    inline B3DTuple interpolate(const B3ITuple& rOld1, const B3ITuple& rOld2, double t) 
+    { 
         B3DTuple aInt(
             ((rOld2.getX() - rOld1.getX()) * t) + rOld1.getX(),
             ((rOld2.getY() - rOld1.getY()) * t) + rOld1.getY(),
-            ((rOld2.getZ() - rOld1.getZ()) * t) + rOld1.getZ());
+            ((rOld2.getZ() - rOld1.getZ()) * t) + rOld1.getZ()); 
         return aInt;
     }
 
-    inline B3DTuple average(const B3ITuple& rOld1, const B3ITuple& rOld2)
-    {
+    inline B3DTuple average(const B3ITuple& rOld1, const B3ITuple& rOld2) 
+    { 
         B3DTuple aAvg(
             (rOld1.getX() + rOld2.getX()) * 0.5,
             (rOld1.getY() + rOld2.getY()) * 0.5,
-            (rOld1.getZ() + rOld2.getZ()) * 0.5);
+            (rOld1.getZ() + rOld2.getZ()) * 0.5); 
         return aAvg;
     }
-
+    
     inline B3DTuple average(const B3ITuple& rOld1, const B3ITuple& rOld2, const B3ITuple& rOld3)
-    {
+    { 
         B3DTuple aAvg(
             (rOld1.getX() + rOld2.getX() + rOld3.getX()) * (1.0 / 3.0),
             (rOld1.getY() + rOld2.getY() + rOld3.getY()) * (1.0 / 3.0),
-            (rOld1.getZ() + rOld2.getZ() + rOld3.getZ()) * (1.0 / 3.0));
+            (rOld1.getZ() + rOld2.getZ() + rOld3.getZ()) * (1.0 / 3.0)); 
         return aAvg;
     }
-
+    
     inline B3ITuple operator+(const B3ITuple& rTupA, const B3ITuple& rTupB)
-    {
-        B3ITuple aSum(rTupA);
-        aSum += rTupB;
-        return aSum;
+    { 
+        B3ITuple aSum(rTupA); 
+        aSum += rTupB; 
+        return aSum; 
     }
 
     inline B3ITuple operator-(const B3ITuple& rTupA, const B3ITuple& rTupB)
-    {
-        B3ITuple aSub(rTupA);
-        aSub -= rTupB;
-        return aSub;
+    { 
+        B3ITuple aSub(rTupA); 
+        aSub -= rTupB; 
+        return aSub; 
     }
 
     inline B3ITuple operator/(const B3ITuple& rTupA, const B3ITuple& rTupB)
-    {
-        B3ITuple aDiv(rTupA);
-        aDiv /= rTupB;
-        return aDiv;
+    { 
+        B3ITuple aDiv(rTupA); 
+        aDiv /= rTupB; 
+        return aDiv; 
     }
 
     inline B3ITuple operator*(const B3ITuple& rTupA, const B3ITuple& rTupB)
-    {
-        B3ITuple aMul(rTupA);
-        aMul *= rTupB;
-        return aMul;
+    { 
+        B3ITuple aMul(rTupA); 
+        aMul *= rTupB; 
+        return aMul; 
     }
 
     inline B3ITuple operator*(const B3ITuple& rTup, sal_Int32 t)
-    {
-        B3ITuple aNew(rTup);
-        aNew *= t;
-        return aNew;
+    { 
+        B3ITuple aNew(rTup); 
+        aNew *= t; 
+        return aNew; 
     }
 
     inline B3ITuple operator*(sal_Int32 t, const B3ITuple& rTup)
-    {
-        B3ITuple aNew(rTup);
-        aNew *= t;
-        return aNew;
+    { 
+        B3ITuple aNew(rTup); 
+        aNew *= t; 
+        return aNew; 
     }
 
     inline B3ITuple operator/(const B3ITuple& rTup, sal_Int32 t)
-    {
-        B3ITuple aNew(rTup);
-        aNew /= t;
-        return aNew;
+    { 
+        B3ITuple aNew(rTup); 
+        aNew /= t; 
+        return aNew; 
     }
 
     inline B3ITuple operator/(sal_Int32 t, const B3ITuple& rTup)
     {
-        B3ITuple aNew(t, t, t);
-        B3ITuple aTmp(rTup);
-        aNew /= aTmp;
-        return aNew;
+        B3ITuple aNew(t, t, t); 
+        B3ITuple aTmp(rTup); 
+        aNew /= aTmp; 
+        return aNew; 
     }
 } // end of namespace basegfx
 
diff --git a/basegfx/inc/basegfx/vector/b2dsize.hxx b/basegfx/inc/basegfx/vector/b2dsize.hxx
index 6ca3065ba4f9..ee5d4c058ae4 100644
--- a/basegfx/inc/basegfx/vector/b2dsize.hxx
+++ b/basegfx/inc/basegfx/vector/b2dsize.hxx
@@ -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
diff --git a/basegfx/inc/basegfx/vector/b2dvector.hxx b/basegfx/inc/basegfx/vector/b2dvector.hxx
index e4cd8f3f179a..ea0c6c640a60 100644
--- a/basegfx/inc/basegfx/vector/b2dvector.hxx
+++ b/basegfx/inc/basegfx/vector/b2dvector.hxx
@@ -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
@@ -47,73 +47,73 @@ namespace basegfx
     */
     class B2DVector : public ::basegfx::B2DTuple
     {
-    public:
-        /** Create a 2D Vector
+    public:					
+        /**	Create a 2D Vector
 
             The vector is initialized to (0.0, 0.0)
         */
-        B2DVector()
-        :   B2DTuple()
+        B2DVector() 
+        :	B2DTuple()
         {}
 
-        /** Create a 2D Vector
+        /**	Create a 2D Vector
 
             @param fX
             This parameter is used to initialize the X-coordinate
             of the 2D Vector.
-
+            
             @param fY
             This parameter is used to initialize the Y-coordinate
             of the 2D Vector.
         */
-        B2DVector(double fX, double fY)
-        :   B2DTuple(fX, fY)
+        B2DVector(double fX, double fY) 
+        :	B2DTuple(fX, fY)
         {}
 
-        /** Create a copy of a 2D Vector
+        /**	Create a copy of a 2D Vector
 
             @param rVec
             The 2D Vector which will be copied.
         */
-        B2DVector(const B2DVector& rVec)
-        :   B2DTuple(rVec)
+        B2DVector(const B2DVector& rVec) 
+        :	B2DTuple(rVec)
         {}
 
-        /** Create a copy of a 2D Vector
+        /**	Create a copy of a 2D Vector
 
             @param rVec
             The 2D Vector which will be copied.
         */
-        B2DVector(const ::basegfx::B2IVector& rVec)
-        :   B2DTuple(rVec)
+        B2DVector(const ::basegfx::B2IVector& rVec) 
+        :	B2DTuple(rVec)
         {}
 
         /** constructor with tuple to allow copy-constructing
             from B2DTuple-based classes
         */
-        B2DVector(const ::basegfx::B2DTuple& rTuple)
-        :   B2DTuple(rTuple)
+        B2DVector(const ::basegfx::B2DTuple& rTuple) 
+        :	B2DTuple(rTuple)
         {}
 
-        ~B2DVector()
+        ~B2DVector() 
         {}
 
         /** *=operator to allow usage from B2DVector, too
         */
-        B2DVector& operator*=( const B2DVector& rPnt )
-        {
+        B2DVector& operator*=( const B2DVector& rPnt ) 
+        { 
             mfX *= rPnt.mfX;
-            mfY *= rPnt.mfY;
-            return *this;
+            mfY *= rPnt.mfY; 
+            return *this; 
         }
 
         /** *=operator to allow usage from B2DVector, too
         */
-        B2DVector& operator*=(double t)
-        {
-            mfX *= t;
-            mfY *= t;
-            return *this;
+        B2DVector& operator*=(double t) 
+        { 
+            mfX *= t; 
+            mfY *= t; 
+            return *this; 
         }
 
         /** assignment operator to allow assigning the results
@@ -194,7 +194,7 @@ namespace basegfx
 
         static const B2DVector& getEmptyVector();
     };
-
+    
     // external operators
     //////////////////////////////////////////////////////////////////////////
 
@@ -249,14 +249,14 @@ namespace basegfx
     bool areParallel( const B2DVector& rVecA, const B2DVector& rVecB );
 
     /** Transform vector by given transformation matrix.
-
+        
         Since this is a vector, translational components of the
         matrix are disregarded.
     */
     B2DVector operator*( const B2DHomMatrix& rMat, const B2DVector& rVec );
 
     /** Test continuity between given vectors.
-
+        
         The two given vectors are assumed to describe control points on a
         common point. Calculate if there is a continuity between them.
     */
diff --git a/basegfx/inc/basegfx/vector/b2enums.hxx b/basegfx/inc/basegfx/vector/b2enums.hxx
index 6f68440bf715..70067a107d2f 100644
--- a/basegfx/inc/basegfx/vector/b2enums.hxx
+++ b/basegfx/inc/basegfx/vector/b2enums.hxx
@@ -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
@@ -32,43 +32,43 @@
 
 namespace basegfx
 {
-    /** Descriptor for the mathematical orientations of two 2D Vectors
+    /**	Descriptor for the mathematical orientations of two 2D Vectors
     */
     enum B2VectorOrientation
     {
         /// mathematically positive oriented
         ORIENTATION_POSITIVE = 0,
-
+        
         /// mathematically negative oriented
         ORIENTATION_NEGATIVE,
-
+        
         /// mathematically neutral, thus parallel
         ORIENTATION_NEUTRAL
     };
 
-    /** Descriptor for the mathematical continuity of two 2D Vectors
+    /**	Descriptor for the mathematical continuity of two 2D Vectors
     */
     enum B2VectorContinuity
     {
         /// none
         CONTINUITY_NONE = 0,
-
+        
         /// mathematically negative oriented
         CONTINUITY_C1,
-
+        
         /// mathematically neutral, thus parallel
         CONTINUITY_C2
     };
 
-    /** Descriptor for possible line joins between two line segments
+    /**	Descriptor for possible line joins between two line segments
     */
     enum B2DLineJoin
     {
-        B2DLINEJOIN_NONE,       // no rounding
-        B2DLINEJOIN_MIDDLE,     // calc middle value between joints
-        B2DLINEJOIN_BEVEL,      // join edges with line
-        B2DLINEJOIN_MITER,      // extend till cut
-        B2DLINEJOIN_ROUND       // create arc
+        B2DLINEJOIN_NONE,		// no rounding
+        B2DLINEJOIN_MIDDLE,		// calc middle value between joints
+        B2DLINEJOIN_BEVEL,		// join edges with line
+        B2DLINEJOIN_MITER,		// extend till cut
+        B2DLINEJOIN_ROUND		// create arc
     };
 
 } // end of namespace basegfx
diff --git a/basegfx/inc/basegfx/vector/b2isize.hxx b/basegfx/inc/basegfx/vector/b2isize.hxx
index e6cdb048995b..cba0b4cbd46b 100644
--- a/basegfx/inc/basegfx/vector/b2isize.hxx
+++ b/basegfx/inc/basegfx/vector/b2isize.hxx
@@ -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
diff --git a/basegfx/inc/basegfx/vector/b2ivector.hxx b/basegfx/inc/basegfx/vector/b2ivector.hxx
index 9e2fe1009841..2ee15a6a5573 100644
--- a/basegfx/inc/basegfx/vector/b2ivector.hxx
+++ b/basegfx/inc/basegfx/vector/b2ivector.hxx
@@ -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
@@ -46,64 +46,64 @@ namespace basegfx
     */
     class B2IVector : public ::basegfx::B2ITuple
     {
-    public:
-        /** Create a 2D Vector
+    public:					
+        /**	Create a 2D Vector
 
             The vector is initialized to (0, 0)
         */
-        B2IVector()
-        :   B2ITuple()
+        B2IVector() 
+        :	B2ITuple()
         {}
 
-        /** Create a 2D Vector
+        /**	Create a 2D Vector
 
             @param nX
             This parameter is used to initialize the X-coordinate
             of the 2D Vector.
-
+            
             @param nY
             This parameter is used to initialize the Y-coordinate
             of the 2D Vector.
         */
-        B2IVector(sal_Int32 nX, sal_Int32 nY)
-        :   B2ITuple(nX, nY)
+        B2IVector(sal_Int32 nX, sal_Int32 nY) 
+        :	B2ITuple(nX, nY)
         {}
 
-        /** Create a copy of a 2D Vector
+        /**	Create a copy of a 2D Vector
 
             @param rVec
             The 2D Vector which will be copied.
         */
-        B2IVector(const B2IVector& rVec)
-        :   B2ITuple(rVec)
+        B2IVector(const B2IVector& rVec) 
+        :	B2ITuple(rVec)
         {}
 
         /** constructor with tuple to allow copy-constructing
             from B2ITuple-based classes
         */
-        B2IVector(const ::basegfx::B2ITuple& rTuple)
-        :   B2ITuple(rTuple)
+        B2IVector(const ::basegfx::B2ITuple& rTuple) 
+        :	B2ITuple(rTuple)
         {}
 
-        ~B2IVector()
+        ~B2IVector() 
         {}
 
         /** *=operator to allow usage from B2IVector, too
         */
-        B2IVector& operator*=( const B2IVector& rPnt )
-        {
+        B2IVector& operator*=( const B2IVector& rPnt ) 
+        { 
             mnX *= rPnt.mnX;
-            mnY *= rPnt.mnY;
-            return *this;
+            mnY *= rPnt.mnY; 
+            return *this; 
         }
 
         /** *=operator to allow usage from B2IVector, too
         */
-        B2IVector& operator*=(sal_Int32 t)
-        {
-            mnX *= t;
-            mnY *= t;
-            return *this;
+        B2IVector& operator*=(sal_Int32 t) 
+        { 
+            mnX *= t; 
+            mnY *= t; 
+            return *this; 
         }
 
         /** assignment operator to allow assigning the results
@@ -170,7 +170,7 @@ namespace basegfx
 
         static const B2IVector& getEmptyVector();
     };
-
+    
     // external operators
     //////////////////////////////////////////////////////////////////////////
 
@@ -212,14 +212,14 @@ namespace basegfx
     bool areParallel( const B2IVector& rVecA, const B2IVector& rVecB );
 
     /** Transform vector by given transformation matrix.
-
+        
         Since this is a vector, translational components of the
         matrix are disregarded.
     */
     B2IVector operator*( const B2DHomMatrix& rMat, const B2IVector& rVec );
 
     /** Test continuity between given vectors.
-
+        
         The two given vectors are assumed to describe control points on a
         common point. Calculate if there is a continuity between them.
     */
diff --git a/basegfx/inc/basegfx/vector/b3dsize.hxx b/basegfx/inc/basegfx/vector/b3dsize.hxx
index e89a66bfa86c..8b7d64c76e18 100644
--- a/basegfx/inc/basegfx/vector/b3dsize.hxx
+++ b/basegfx/inc/basegfx/vector/b3dsize.hxx
@@ -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
diff --git a/basegfx/inc/basegfx/vector/b3dvector.hxx b/basegfx/inc/basegfx/vector/b3dvector.hxx
index c4c329881170..09f84de189cd 100644
--- a/basegfx/inc/basegfx/vector/b3dvector.hxx
+++ b/basegfx/inc/basegfx/vector/b3dvector.hxx
@@ -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
@@ -48,80 +48,80 @@ namespace basegfx
     class B3DVector : public ::basegfx::B3DTuple
     {
     public:
-        /** Create a 3D Vector
+        /**	Create a 3D Vector
 
             The vector is initialized to (0.0, 0.0, 0.0)
         */
         B3DVector()
-        :   B3DTuple()
+        :	B3DTuple()
         {}
 
-        /** Create a 3D Vector
+        /**	Create a 3D Vector
 
             @param fX
             This parameter is used to initialize the X-coordinate
             of the 3D Vector.
-
+            
             @param fY
             This parameter is used to initialize the Y-coordinate
             of the 3D Vector.
-
+            
             @param fZ
             This parameter is used to initialize the Z-coordinate
             of the 3D Vector.
         */
         B3DVector(double fX, double fY, double fZ)
-        :   B3DTuple(fX, fY, fZ)
+        :	B3DTuple(fX, fY, fZ)
         {}
 
-        /** Create a copy of a 3D Vector
+        /**	Create a copy of a 3D Vector
 
             @param rVec
             The 3D Vector which will be copied.
         */
-        B3DVector(const B3DVector& rVec)
-        :   B3DTuple(rVec)
+        B3DVector(const B3DVector& rVec) 
+        :	B3DTuple(rVec)
         {}
 
         /** constructor with tuple to allow copy-constructing
             from B3DTuple-based classes
         */
-        B3DVector(const ::basegfx::B3DTuple& rTuple)
-        :   B3DTuple(rTuple)
+        B3DVector(const ::basegfx::B3DTuple& rTuple) 
+        :	B3DTuple(rTuple)
         {}
 
-        ~B3DVector()
+        ~B3DVector() 
         {}
 
         /** *=operator to allow usage from B3DVector, too
         */
-        B3DVector& operator*=( const B3DVector& rPnt )
-        {
+        B3DVector& operator*=( const B3DVector& rPnt ) 
+        { 
             mfX *= rPnt.mfX;
-            mfY *= rPnt.mfY;
-            mfZ *= rPnt.mfZ;
-            return *this;
+            mfY *= rPnt.mfY; 
+            mfZ *= rPnt.mfZ; 
+            return *this; 
         }
 
         /** *=operator to allow usage from B3DVector, too
         */
-        B3DVector& operator*=(double t)
-        {
-            mfX *= t;
-            mfY *= t;
-            mfZ *= t;
-            return *this;
+        B3DVector& operator*=(double t) 
+        { 
+            mfX *= t; 
+            mfY *= t; 
+            mfZ *= t; 
+            return *this; 
         }
 
         /** assignment operator to allow assigning the results
             of B3DTuple calculations
         */
-        B3DVector& operator=( const ::basegfx::B3DTuple& rVec )
-        {
+        B3DVector& operator=( const ::basegfx::B3DTuple& rVec ) 
+        { 
             mfX = rVec.getX();
-            mfY = rVec.getY();
-            mfZ = rVec.getZ();
-            return *this;
+            mfY = rVec.getY(); 
+            mfZ = rVec.getZ(); 
+            return *this; 
         }
 
         /** Calculate the length of this 3D Vector
@@ -308,7 +308,7 @@ namespace basegfx
     bool areParallel( const B3DVector& rVecA, const B3DVector& rVecB );
 
     /** Transform vector by given transformation matrix.
-
+        
         Since this is a vector, translational components of the
         matrix are disregarded.
     */
diff --git a/basegfx/inc/basegfx/vector/b3isize.hxx b/basegfx/inc/basegfx/vector/b3isize.hxx
index 604ce5681ee7..8d9ced686651 100644
--- a/basegfx/inc/basegfx/vector/b3isize.hxx
+++ b/basegfx/inc/basegfx/vector/b3isize.hxx
@@ -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
diff --git a/basegfx/inc/basegfx/vector/b3ivector.hxx b/basegfx/inc/basegfx/vector/b3ivector.hxx
index b4900989cc06..af1d90df9056 100644
--- a/basegfx/inc/basegfx/vector/b3ivector.hxx
+++ b/basegfx/inc/basegfx/vector/b3ivector.hxx
@@ -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
@@ -46,80 +46,80 @@ namespace basegfx
     class B3IVector : public ::basegfx::B3ITuple
     {
     public:
-        /** Create a 3D Vector
+        /**	Create a 3D Vector
 
             The vector is initialized to (0, 0, 0)
         */
         B3IVector()
-        :   B3ITuple()
+        :	B3ITuple()
         {}
 
-        /** Create a 3D Vector
+        /**	Create a 3D Vector
 
             @param nX
             This parameter is used to initialize the X-coordinate
             of the 3D Vector.
-
+            
             @param nY
             This parameter is used to initialize the Y-coordinate
             of the 3D Vector.
-
+            
             @param nZ
             This parameter is used to initialize the Z-coordinate
             of the 3D Vector.
         */
         B3IVector(sal_Int32 nX, sal_Int32 nY, sal_Int32 nZ)
-        :   B3ITuple(nX, nY, nZ)
+        :	B3ITuple(nX, nY, nZ)
         {}
 
-        /** Create a copy of a 3D Vector
+        /**	Create a copy of a 3D Vector
 
             @param rVec
             The 3D Vector which will be copied.
         */
-        B3IVector(const B3IVector& rVec)
-        :   B3ITuple(rVec)
+        B3IVector(const B3IVector& rVec) 
+        :	B3ITuple(rVec)
         {}
 
         /** constructor with tuple to allow copy-constructing
             from B3ITuple-based classes
         */
-        B3IVector(const ::basegfx::B3ITuple& rTuple)
-        :   B3ITuple(rTuple)
+        B3IVector(const ::basegfx::B3ITuple& rTuple) 
+        :	B3ITuple(rTuple)
         {}
 
-        ~B3IVector()
+        ~B3IVector() 
         {}
 
         /** *=operator to allow usage from B3IVector, too
         */
-        B3IVector& operator*=( const B3IVector& rPnt )
-        {
+        B3IVector& operator*=( const B3IVector& rPnt ) 
+        { 
             mnX *= rPnt.mnX;
-            mnY *= rPnt.mnY;
-            mnZ *= rPnt.mnZ;
-            return *this;
+            mnY *= rPnt.mnY; 
+            mnZ *= rPnt.mnZ; 
+            return *this; 
         }
 
         /** *=operator to allow usage from B3IVector, too
         */
-        B3IVector& operator*=(sal_Int32 t)
-        {
-            mnX *= t;
-            mnY *= t;
-            mnZ *= t;
-            return *this;
+        B3IVector& operator*=(sal_Int32 t) 
+        { 
+            mnX *= t; 
+            mnY *= t; 
+            mnZ *= t; 
+            return *this; 
         }
 
         /** assignment operator to allow assigning the results
             of B3ITuple calculations
         */
-        B3IVector& operator=( const ::basegfx::B3ITuple& rVec )
-        {
+        B3IVector& operator=( const ::basegfx::B3ITuple& rVec ) 
+        { 
             mnX = rVec.getX();
-            mnY = rVec.getY();
-            mnZ = rVec.getZ();
-            return *this;
+            mnY = rVec.getY(); 
+            mnZ = rVec.getZ(); 
+            return *this; 
         }
 
         /** Calculate the length of this 3D Vector
@@ -229,7 +229,7 @@ namespace basegfx
     //////////////////////////////////////////////////////////////////////////
 
     /** Transform vector by given transformation matrix.
-
+        
         Since this is a vector, translational components of the
         matrix are disregarded.
     */
diff --git a/basegfx/inc/pch/precompiled_basegfx.cxx b/basegfx/inc/pch/precompiled_basegfx.cxx
index ee9c448f8af4..d64c01402438 100644
--- a/basegfx/inc/pch/precompiled_basegfx.cxx
+++ b/basegfx/inc/pch/precompiled_basegfx.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
diff --git a/basegfx/inc/pch/precompiled_basegfx.hxx b/basegfx/inc/pch/precompiled_basegfx.hxx
index 45f87434590d..bb20426ca515 100644
--- a/basegfx/inc/pch/precompiled_basegfx.hxx
+++ b/basegfx/inc/pch/precompiled_basegfx.hxx
@@ -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
diff --git a/basegfx/qa/mkpolygons.pl b/basegfx/qa/mkpolygons.pl
index b465a4f845ab..8d00fa936fa3 100644
--- a/basegfx/qa/mkpolygons.pl
+++ b/basegfx/qa/mkpolygons.pl
@@ -1,6 +1,6 @@
 :
 eval 'exec perl -wS $0 ${1+"$@"}'
-    if 0;
+    if 0; 
 
 #
 # 2009 Copyright Novell, Inc. & Sun Microsystems, Inc.
@@ -10,8 +10,8 @@ eval 'exec perl -wS $0 ${1+"$@"}'
 # only, as published by the Free Software Foundation.
 #
 
-use IO::File;
-use Cwd;
+use	IO::File;
+use	Cwd;
 use File::Spec;
 use File::Spec::Functions;
 use File::Temp;
@@ -25,72 +25,72 @@ $TempDir = "";
 
 
 ###############################################################################
-#   Open a file with the given name.
-#   First it is checked if the temporary directory, in which all files for
-#   the document are gathered, is already present and create it if it is not.
-#   Then create the path to the file inside the temporary directory.
-#   Finally open the file and return a file handle to it.
+#	Open a file with the given name.
+#	First it is checked if the temporary directory, in which all files for
+#	the document are gathered, is already present and create it if it is not.
+#	Then create the path to the file inside the temporary directory.
+#	Finally open the file and return a file handle to it.
 #
-sub open_file
+sub	open_file
 {
-    my  $filename = pop @_;
-
-    #   Create base directory of temporary directory tree if not alreay
-    #   present.
+    my	$filename = pop @_;
+    
+    #	Create base directory of temporary directory tree if not alreay
+    #	present.
     if ($TempDir eq "")
     {
         $TempDir = File::Temp::tempdir (CLEANUP => 1);
     }
-
-    #   Create the path to the file.
+    
+    #	Create the path to the file.
     my $fullname = File::Spec->catfile ($TempDir, $filename);
     my ($volume,$directories,$file) = File::Spec->splitpath ($fullname);
     mkpath (File::Spec->catpath ($volume,$directories,""));
-
-    #   Open the file and return a file handle to it.
+    
+    #	Open the file and return a file handle to it.
     return new IO::File ($fullname, "w");
 }
 
 
 ###############################################################################
-#   Zip the files in the directory tree into the given file.
+#	Zip the files in the directory tree into the given file.
 #
-sub zip_dirtree
+sub	zip_dirtree
 {
-    my  $filename = pop @_;
-
-    my  $cwd = getcwd;
-    my  $zip_name = $filename;
-
-    #   We are about to change the directory.
-    #   Therefore create an absolute pathname for the zip archive.
-
-    #   First transfer the drive from $cwd to $zip_name.  This is a
-    #   workaround for a bug in file_name_is_absolute which thinks
-    #   the the path \bla is an absolute path under DOS.
+    my	$filename = pop @_;
+    
+    my	$cwd = getcwd;
+    my	$zip_name = $filename;
+    
+    #	We are about to change the directory.
+    #	Therefore create an absolute pathname for the zip archive.
+    
+    #	First transfer the drive from $cwd to $zip_name.  This is a
+    #	workaround for a bug in file_name_is_absolute which thinks
+    #	the the path \bla is an absolute path under DOS.
     my ($volume,$directories,$file) = File::Spec->splitpath ($zip_name);
     my ($volume_cwd,$directories_cwd,$file_cwd) = File::Spec->splitpath ($cwd);
     $volume = $volume_cwd if ($volume eq "");
     $zip_name = File::Spec->catpath ($volume,$directories,$file);
-
-    #   Add the current working directory to a relative path.
+    
+    #	Add the current working directory to a relative path.
     if ( ! file_name_is_absolute ($zip_name))
     {
         $zip_name = File::Spec->catfile ($cwd, $zip_name);
-
-        #   Try everything to clean up the name.
+        
+        #	Try everything to clean up the name.
         $zip_name = File::Spec->rel2abs ($filename);
         $zip_name = File::Spec->canonpath ($zip_name);
-
-        #   Remove .. directories from the middle of the path.
+        
+        #	Remove .. directories from the middle of the path.
         while ($zip_name =~ /\/[^\/][^\.\/][^\/]*\/\.\.\//)
         {
             $zip_name = $` . "/" . $';
         }
     }
 
-    #   Just in case the zip program gets confused by an existing file with the
-    #   same name as the one to be written that file is removed first.
+    #	Just in case the zip program gets confused by an existing file with the
+    #	same name as the one to be written that file is removed first.
     if ( -e $filename)
     {
         if (unlink ($filename) == 0)
@@ -100,9 +100,9 @@ sub zip_dirtree
             return;
         }
     }
-
-    #   Finally create the zip file.  First change into the temporary directory
-    #   so that the resulting zip file contains only paths relative to it.
+    
+    #	Finally create the zip file.  First change into the temporary directory
+    #	so that the resulting zip file contains only paths relative to it.
     print "zipping [$ZipCmd $ZipFlags $zip_name *]\n";
     chdir ($TempDir);
     system ("$ZipCmd $ZipFlags $zip_name *");
@@ -249,9 +249,9 @@ sub writeManifest
 
 
 ###############################################################################
-#   Print usage information.
+#	Print usage information.
 #
-sub usage   ()
+sub	usage	()
 {
     print <<END_OF_USAGE;
 usage: $0 <option>* [<SvgD-values>]
@@ -264,9 +264,9 @@ END_OF_USAGE
 }
 
 ###############################################################################
-#   Process the command line.
+#	Process the command line.
 #
-sub process_command_line
+sub	process_command_line
 {
     foreach (@ARGV)
     {
@@ -276,9 +276,9 @@ sub process_command_line
             exit 0;
         }
     }
-
+    
     $global_output_name = "polygons.odp";
-    my  $j = 0, $noMoreOptions = 0;
+    my	$j = 0, $noMoreOptions = 0;
     for (my $i=0; $i<$#ARGV; $i++)
     {
         if ( !$noMoreOptions and $ARGV[$i] eq "-o")
@@ -307,12 +307,12 @@ sub process_command_line
 }
 
 ###############################################################################
-#   Main
+#	Main
 ###############################################################################
 
 $ZipCmd = $ENV{LOG_FILE_ZIP_CMD};
 $ZipFlags = $ENV{LOG_FILE_ZIP_FLAGS};
-#   Provide default values for the zip command and it's flags.
+#	Provide default values for the zip command and it's flags.
 if ( ! defined $ZipCmd)
 {
     $ZipCmd = "zip" unless defined $ZipCmd;
diff --git a/basegfx/source/color/bcolor.cxx b/basegfx/source/color/bcolor.cxx
index 6e5b4c985e6d..2481cf76b6ae 100644
--- a/basegfx/source/color/bcolor.cxx
+++ b/basegfx/source/color/bcolor.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
diff --git a/basegfx/source/color/bcolormodifier.cxx b/basegfx/source/color/bcolormodifier.cxx
index 15662c44414c..5638198d534b 100644
--- a/basegfx/source/color/bcolormodifier.cxx
+++ b/basegfx/source/color/bcolormodifier.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
diff --git a/basegfx/source/color/bcolortools.cxx b/basegfx/source/color/bcolortools.cxx
index 543097de3d77..cb05def184b9 100644
--- a/basegfx/source/color/bcolortools.cxx
+++ b/basegfx/source/color/bcolortools.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
@@ -46,7 +46,7 @@ namespace basegfx { namespace tools
         double h=0, s=0, l=0;
 
         l = (maxVal + minVal) / 2.0;
-
+    
         if( ::basegfx::fTools::equalZero(d) )
         {
             s = h = 0; // hue undefined (achromatic case)
@@ -87,7 +87,7 @@ namespace basegfx { namespace tools
             return nValue2;
         else if( nHue < 240.0 )
             return nValue1 + (nValue2 - nValue1)*(240.0 - nHue)/60.0;
-        else
+        else 
             return nValue1;
     }
 
@@ -103,16 +103,16 @@ namespace basegfx { namespace tools
 
         return BColor(
             hsl2rgbHelper(nVal2,
-                          nVal1,
+                          nVal1, 
                           h + 120.0),
-            hsl2rgbHelper(nVal2,
+            hsl2rgbHelper(nVal2, 
                           nVal1,
                           h),
             hsl2rgbHelper(nVal2,
                           nVal1,
                           h - 120.0) );
     }
-
+    
     BColor rgb2hsv(const BColor& rRGBColor)
     {
         const double r=rRGBColor.getRed(), g=rRGBColor.getGreen(), b=rRGBColor.getBlue();
diff --git a/basegfx/source/curve/b2dbeziertools.cxx b/basegfx/source/curve/b2dbeziertools.cxx
index eddd0b281fc2..de08ee6c1e9f 100644
--- a/basegfx/source/curve/b2dbeziertools.cxx
+++ b/basegfx/source/curve/b2dbeziertools.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
@@ -36,7 +36,7 @@
 namespace basegfx
 {
     B2DCubicBezierHelper::B2DCubicBezierHelper(const B2DCubicBezier& rBase, sal_uInt32 nDivisions)
-    :   maLengthArray(),
+    :	maLengthArray(),
         mnEdgeCount(0)
     {
         const bool bIsBezier(rBase.isBezier());
@@ -114,7 +114,7 @@ namespace basegfx
             // not a bezier, linear edge
             return fDistance / fLength;
         }
-
+        
         // it is a bezier
         ::std::vector< double >::const_iterator aIter = ::std::lower_bound(maLengthArray.begin(), maLengthArray.end(), fDistance);
         const sal_uInt32 nIndex(aIter - maLengthArray.begin());
diff --git a/basegfx/source/curve/b2dcubicbezier.cxx b/basegfx/source/curve/b2dcubicbezier.cxx
index 80bd8922160b..3d1c0cb7324e 100644
--- a/basegfx/source/curve/b2dcubicbezier.cxx
+++ b/basegfx/source/curve/b2dcubicbezier.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
@@ -34,8 +34,8 @@
 
 #include <limits>
 
-// #i37443#
-#define FACTOR_FOR_UNSHARPEN    (1.6)
+// #i37443# 
+#define FACTOR_FOR_UNSHARPEN	(1.6)
 #ifdef DBG_UTIL
 static double fMultFactUnsharpen = FACTOR_FOR_UNSHARPEN;
 #endif
@@ -47,21 +47,21 @@ namespace basegfx
     namespace
     {
         void ImpSubDivAngle(
-            const B2DPoint& rfPA,           // start point
-            const B2DPoint& rfEA,           // edge on A
-            const B2DPoint& rfEB,           // edge on B
-            const B2DPoint& rfPB,           // end point
-            B2DPolygon& rTarget,            // target polygon
-            double fAngleBound,             // angle bound in [0.0 .. 2PI]
-            bool bAllowUnsharpen,           // #i37443# allow the criteria to get unsharp in recursions
-            sal_uInt16 nMaxRecursionDepth)  // endless loop protection
+            const B2DPoint& rfPA,			// start point
+            const B2DPoint& rfEA,			// edge on A
+            const B2DPoint& rfEB,			// edge on B
+            const B2DPoint& rfPB,			// end point
+            B2DPolygon& rTarget,			// target polygon
+            double fAngleBound,				// angle bound in [0.0 .. 2PI]
+            bool bAllowUnsharpen,			// #i37443# allow the criteria to get unsharp in recursions
+            sal_uInt16 nMaxRecursionDepth)	// endless loop protection
         {
             if(nMaxRecursionDepth)
             {
                 // do angle test
                 B2DVector aLeft(rfEA - rfPA);
                 B2DVector aRight(rfEB - rfPB);
-
+                
                 // #i72104#
                 if(aLeft.equalZero())
                 {
@@ -117,13 +117,13 @@ namespace basegfx
         }
 
         void ImpSubDivAngleStart(
-            const B2DPoint& rfPA,           // start point
-            const B2DPoint& rfEA,           // edge on A
-            const B2DPoint& rfEB,           // edge on B
-            const B2DPoint& rfPB,           // end point
-            B2DPolygon& rTarget,            // target polygon
-            const double& rfAngleBound,     // angle bound in [0.0 .. 2PI]
-            bool bAllowUnsharpen)           // #i37443# allow the criteria to get unsharp in recursions
+            const B2DPoint& rfPA,			// start point
+            const B2DPoint& rfEA,			// edge on A
+            const B2DPoint& rfEB,			// edge on B
+            const B2DPoint& rfPB,			// end point
+            B2DPolygon& rTarget,			// target polygon
+            const double& rfAngleBound,		// angle bound in [0.0 .. 2PI]
+            bool bAllowUnsharpen)			// #i37443# allow the criteria to get unsharp in recursions
         {
             sal_uInt16 nMaxRecursionDepth(8);
             const B2DVector aLeft(rfEA - rfPA);
@@ -153,7 +153,7 @@ namespace basegfx
                         if(!bLeftEqualZero)
                         {
                             double fFactor;
-
+                            
                             if(fabs(aBase.getX()) > fabs(aBase.getY()))
                             {
                                 fFactor = aLeft.getX() / aBase.getX();
@@ -172,7 +172,7 @@ namespace basegfx
                         if(!bRightEqualZero)
                         {
                             double fFactor;
-
+                            
                             if(fabs(aBase.getX()) > fabs(aBase.getY()))
                             {
                                 fFactor = aRight.getX() / -aBase.getX();
@@ -262,14 +262,14 @@ namespace basegfx
         }
 
         void ImpSubDivDistance(
-            const B2DPoint& rfPA,           // start point
-            const B2DPoint& rfEA,           // edge on A
-            const B2DPoint& rfEB,           // edge on B
-            const B2DPoint& rfPB,           // end point
-            B2DPolygon& rTarget,            // target polygon
-            double fDistanceBound2,         // quadratic distance criteria
-            double fLastDistanceError2,     // the last quadratic distance error
-            sal_uInt16 nMaxRecursionDepth)  // endless loop protection
+            const B2DPoint& rfPA,			// start point
+            const B2DPoint& rfEA,			// edge on A
+            const B2DPoint& rfEB,			// edge on B
+            const B2DPoint& rfPB,			// end point
+            B2DPolygon& rTarget,			// target polygon
+            double fDistanceBound2,			// quadratic distance criteria
+            double fLastDistanceError2,		// the last quadratic distance error
+            sal_uInt16 nMaxRecursionDepth)	// endless loop protection
         {
             if(nMaxRecursionDepth)
             {
@@ -338,19 +338,19 @@ namespace basegfx
 namespace basegfx
 {
     B2DCubicBezier::B2DCubicBezier(const B2DCubicBezier& rBezier)
-    :   maStartPoint(rBezier.maStartPoint),
+    :	maStartPoint(rBezier.maStartPoint),
         maEndPoint(rBezier.maEndPoint),
         maControlPointA(rBezier.maControlPointA),
         maControlPointB(rBezier.maControlPointB)
     {
     }
-
+    
     B2DCubicBezier::B2DCubicBezier()
     {
     }
-
+    
     B2DCubicBezier::B2DCubicBezier(const B2DPoint& rStart, const B2DPoint& rEnd)
-    :   maStartPoint(rStart),
+    :	maStartPoint(rStart),
         maEndPoint(rEnd),
         maControlPointA(rStart),
         maControlPointB(rEnd)
@@ -358,7 +358,7 @@ namespace basegfx
     }
 
     B2DCubicBezier::B2DCubicBezier(const B2DPoint& rStart, const B2DPoint& rControlPointA, const B2DPoint& rControlPointB, const B2DPoint& rEnd)
-    :   maStartPoint(rStart),
+    :	maStartPoint(rStart),
         maEndPoint(rEnd),
         maControlPointA(rControlPointA),
         maControlPointB(rControlPointB)
@@ -376,7 +376,7 @@ namespace basegfx
         maEndPoint = rBezier.maEndPoint;
         maControlPointA = rBezier.maControlPointA;
         maControlPointB = rBezier.maControlPointB;
-
+        
         return *this;
     }
 
@@ -427,8 +427,8 @@ namespace basegfx
         if(maControlPointA != maStartPoint || maControlPointB != maEndPoint)
         {
             const B2DVector aEdge(maEndPoint - maStartPoint);
-
-            // controls parallel to edge can be trivial. No edge -> not parallel -> control can
+            
+            // controls parallel to edge can be trivial. No edge -> not parallel -> control can 
             // still not be trivial (e.g. ballon loop)
             if(!aEdge.equalZero())
             {
@@ -447,8 +447,8 @@ namespace basegfx
                 // vector would need to be used too, but to be trivial it is assumed to
                 // be of roughly equal length to the edge, so edge length can be used
                 // for both. Only needed when one of both is not trivial per se.
-                const double fInverseEdgeLength(bAIsTrivial && bBIsTrivial
-                    ? 1.0
+                const double fInverseEdgeLength(bAIsTrivial && bBIsTrivial 
+                    ? 1.0 
                     : 1.0 / aEdge.getLength());
 
                 // if A is not zero, check if it could be
@@ -461,8 +461,8 @@ namespace basegfx
                     if(fTools::equalZero(fCross))
                     {
                         // get scale to edge. Use bigger distance for numeric quality
-                        const double fScale(fabs(aEdge.getX()) > fabs(aEdge.getY())
-                            ? aVecA.getX() / aEdge.getX()
+                        const double fScale(fabs(aEdge.getX()) > fabs(aEdge.getY()) 
+                            ? aVecA.getX() / aEdge.getX() 
                             : aVecA.getY() / aEdge.getY());
 
                         // relative end point of vector in edge range?
@@ -479,12 +479,12 @@ namespace basegfx
                 {
                     // parallel to edge? Check aVecB, aEdge
                     const double fCross(aVecB.cross(aEdge) * fInverseEdgeLength);
-
+                    
                     if(fTools::equalZero(fCross))
                     {
                         // get scale to edge. Use bigger distance for numeric quality
-                        const double fScale(fabs(aEdge.getX()) > fabs(aEdge.getY())
-                            ? aVecB.getX() / aEdge.getX()
+                        const double fScale(fabs(aEdge.getX()) > fabs(aEdge.getY()) 
+                            ? aVecB.getX() / aEdge.getX() 
                             : aVecB.getY() / aEdge.getY());
 
                         // end point of vector in edge range? Caution: controlB is directed AGAINST edge
@@ -658,7 +658,7 @@ namespace basegfx
     {
         if(isBezier())
         {
-            ImpSubDivDistance(maStartPoint, maControlPointA, maControlPointB, maEndPoint, rTarget,
+            ImpSubDivDistance(maStartPoint, maControlPointA, maControlPointB, maEndPoint, rTarget, 
                 fDistanceBound * fDistanceBound, ::std::numeric_limits<double>::max(), 30);
         }
         else
@@ -678,7 +678,7 @@ namespace basegfx
             const B2DPoint aS1R(interpolate(maControlPointB, maEndPoint, t));
             const B2DPoint aS2L(interpolate(aS1L, aS1C, t));
             const B2DPoint aS2R(interpolate(aS1C, aS1R, t));
-
+    
             return interpolate(aS2L, aS2R, t);
         }
         else
@@ -850,7 +850,7 @@ namespace basegfx
     B2DCubicBezier B2DCubicBezier::snippet(double fStart, double fEnd) const
     {
         B2DCubicBezier aRetval;
-
+        
         if(fTools::more(fStart, 1.0))
         {
             fStart = 1.0;
@@ -1076,7 +1076,7 @@ namespace basegfx
         // derivative is polynomial of order 2
         // check if the polynomial has non-imaginary roots
         const double fD = fB*fB - fA*fC;
-        if( fD >= 0.0 ) // TODO: is this test needed? geometrically not IMHO
+        if( fD >= 0.0 )	// TODO: is this test needed? geometrically not IMHO
         {
             // calculate the first root
             const double fS = sqrt(fD);
diff --git a/basegfx/source/curve/b2dquadraticbezier.cxx b/basegfx/source/curve/b2dquadraticbezier.cxx
index 6afba95e52c1..377496016e8f 100644
--- a/basegfx/source/curve/b2dquadraticbezier.cxx
+++ b/basegfx/source/curve/b2dquadraticbezier.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
@@ -35,24 +35,24 @@
 namespace basegfx
 {
     B2DQuadraticBezier::B2DQuadraticBezier(const B2DQuadraticBezier& rBezier)
-    :   maStartPoint(rBezier.maStartPoint),
+    :	maStartPoint(rBezier.maStartPoint),
         maEndPoint(rBezier.maEndPoint),
         maControlPoint(rBezier.maControlPoint)
     {
     }
-
+    
     B2DQuadraticBezier::B2DQuadraticBezier()
     {
     }
-
+    
     B2DQuadraticBezier::B2DQuadraticBezier(const ::basegfx::B2DPoint& rStart, const ::basegfx::B2DPoint& rEnd)
-    :   maStartPoint(rStart),
+    :	maStartPoint(rStart),
         maEndPoint(rEnd)
     {
     }
 
     B2DQuadraticBezier::B2DQuadraticBezier(const ::basegfx::B2DPoint& rStart, const ::basegfx::B2DPoint& rControl, const ::basegfx::B2DPoint& rEnd)
-    :   maStartPoint(rStart),
+    :	maStartPoint(rStart),
         maEndPoint(rEnd),
         maControlPoint(rControl)
     {
@@ -68,7 +68,7 @@ namespace basegfx
         maStartPoint = rBezier.maStartPoint;
         maEndPoint = rBezier.maEndPoint;
         maControlPoint = rBezier.maControlPoint;
-
+        
         return *this;
     }
 
diff --git a/basegfx/source/inc/PolygonPoint.hxx b/basegfx/source/inc/PolygonPoint.hxx
index 49b9cd19758b..5e6bdf9d37f0 100644
--- a/basegfx/source/inc/PolygonPoint.hxx
+++ b/basegfx/source/inc/PolygonPoint.hxx
@@ -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
@@ -34,16 +34,16 @@
 
 template < class Point > class SimplePointEntry
 {
-    Point                                           maPoint;
+    Point											maPoint;
 
 public:
     SimplePointEntry()
-    :   maPoint(Point::getEmptyPoint())
+    :	maPoint(Point::getEmptyPoint())
     {
     }
 
     SimplePointEntry(const Point& rInitPoint)
-    :   maPoint(rInitPoint)
+    :	maPoint(rInitPoint)
     {
     }
 
@@ -51,7 +51,7 @@ public:
     {
         return maPoint;
     }
-
+    
     void setPoint(const Point& rValue)
     {
         maPoint = rValue;
@@ -67,18 +67,18 @@ public:
 
 template < class Vector > class SimpleBezierEntry
 {
-    Vector                                          maBackward;
-    Vector                                          maForward;
+    Vector											maBackward;
+    Vector											maForward;
 
 public:
     SimpleBezierEntry()
-    :   maBackward(Vector::getEmptyVector()),
+    :	maBackward(Vector::getEmptyVector()),
         maForward(Vector::getEmptyVector())
     {
     }
 
     SimpleBezierEntry(const Vector& rInitBackward, const Vector& rInitForward)
-    :   maBackward(rInitBackward),
+    :	maBackward(rInitBackward),
         maForward(rInitForward)
     {
     }
@@ -87,7 +87,7 @@ public:
     {
         return maBackward;
     }
-
+    
     void setBackwardVector(const Vector& rValue)
     {
         maBackward = rValue;
@@ -131,11 +131,11 @@ template < class Point, class Vector > class PolygonPointList
     typedef ::std::vector< LocalSimplePointEntry > SimplePointVector;
     typedef ::std::vector< LocalSimpleBezierEntry > SimpleBezierVector;
 
-    sal_uInt32                                      mnBezierCount;
-    SimplePointVector                               maPoints;
-    SimpleBezierVector*                             mpVectors;
+    sal_uInt32										mnBezierCount;
+    SimplePointVector								maPoints;
+    SimpleBezierVector*								mpVectors;
 
-    unsigned                                        mbIsClosed : 1;
+    unsigned										mbIsClosed : 1;
 
     void implTryToReduceToPointVector()
     {
@@ -168,7 +168,7 @@ public:
     }
 
     PolygonPointList()
-    :   mnBezierCount(0L),
+    :	mnBezierCount(0L),
         mpVectors(0L),
         mbIsClosed(false)
     {
@@ -176,7 +176,7 @@ public:
     }
 
     PolygonPointList(const PolygonPointList& rSource)
-    :   mnBezierCount(0L),
+    :	mnBezierCount(0L),
         maPoints(rSource.maPoints),
         mpVectors(0L),
         mbIsClosed(rSource.mbIsClosed)
@@ -190,7 +190,7 @@ public:
     }
 
     PolygonPointList(const PolygonPointList& rSource, sal_uInt32 nIndex, sal_uInt32 nCount)
-    :   mnBezierCount(0L),
+    :	mnBezierCount(0L),
         maPoints(nCount),
         mpVectors(0L),
         mbIsClosed(rSource.mbIsClosed)
@@ -309,7 +309,7 @@ public:
         else
         {
             bool bEmptyVector(rValue == Vector::getEmptyVector());
-
+            
             if(bEmptyVector)
                 return;
 
@@ -318,7 +318,7 @@ public:
             mnBezierCount++;
         }
     }
-
+    
     const Vector& getForwardVector(sal_uInt32 nIndex) const
     {
         if(mpVectors)
@@ -347,7 +347,7 @@ public:
         else
         {
             bool bEmptyVector(rValue == Vector::getEmptyVector());
-
+            
             if(bEmptyVector)
                 return;
 
@@ -462,7 +462,7 @@ public:
                 if(mnBezierCount)
                 {
                     SimpleBezierVector::iterator aTestIter(aStart);
-
+                    
                     for( ; mnBezierCount && aTestIter != aEnd; ++aTestIter)
                     {
                         if(aTestIter->isBezierNeeded())
@@ -498,7 +498,7 @@ public:
             {
                 SimplePointVector::iterator aStart(maPoints.begin());
                 SimplePointVector::iterator aEnd(maPoints.end());
-
+                
                 for(sal_uInt32 a(0); a < nHalfSize; a++)
                 {
                     LocalSimplePointEntry aTemp = *aStart;
@@ -512,7 +512,7 @@ public:
             {
                 SimpleBezierVector::iterator aStart(mpVectors->begin());
                 SimpleBezierVector::iterator aEnd(mpVectors->end());
-
+                
                 for(sal_uInt32 a(0); a < nHalfSize; a++)
                 {
                     LocalSimpleBezierEntry aTemp = *aStart;
diff --git a/basegfx/source/inc/hommatrixtemplate.hxx b/basegfx/source/inc/hommatrixtemplate.hxx
index fe58ed260291..5730f3ac99e1 100644
--- a/basegfx/source/inc/hommatrixtemplate.hxx
+++ b/basegfx/source/inc/hommatrixtemplate.hxx
@@ -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
@@ -49,7 +49,7 @@ namespace basegfx
         {
             enum { RowSize = _RowSize };
 
-            double                                          mfValue[RowSize];
+            double											mfValue[RowSize];
 
         public:
             ImplMatLine()
@@ -86,8 +86,8 @@ namespace basegfx
         {
             enum { RowSize = _RowSize };
 
-            ImplMatLine< RowSize >                          maLine[RowSize - 1];
-            ImplMatLine< RowSize >*                         mpLine;
+            ImplMatLine< RowSize >							maLine[RowSize - 1];
+            ImplMatLine< RowSize >*							mpLine;
 
         public:
             // Is last line used?
@@ -115,7 +115,7 @@ namespace basegfx
             }
 
             ImplHomMatrixTemplate()
-                :   mpLine(0L)
+                :	mpLine(0L)
             {
                 // complete initialization with identity matrix, all lines
                 // were initialized with a trailing 1 followed by 0's.
@@ -127,7 +127,7 @@ namespace basegfx
             }
 
             ImplHomMatrixTemplate(const ImplHomMatrixTemplate& rToBeCopied)
-                :   mpLine(0L)
+                :	mpLine(0L)
             {
                 // complete initialization using copy
                 for(sal_uInt16 a(0); a < (RowSize - 1); a++)
@@ -157,7 +157,7 @@ namespace basegfx
                 {
                     return maLine[nRow].get(nColumn);
                 }
-
+        
                 if(mpLine)
                 {
                     return mpLine->get(nColumn);
@@ -219,12 +219,12 @@ namespace basegfx
                 double fBig, fSum, fDum;
                 double fStorage[RowSize];
                 sal_uInt16 a, b, c;
-
+              
                 // #i30874# Initialize nAMax (compiler warns)
                 sal_uInt16 nAMax = 0;
-
+    
                 nParity = 1;
-
+    
                 // Calc the max of each line. If a line is empty,
                 // stop immediately since matrix is not invertible then.
                 for(a = 0; a < RowSize; a++)
@@ -255,7 +255,7 @@ namespace basegfx
                     for(a = 0; a < b; a++)
                     {
                         fSum = get(a, b);
-
+                
                         for(c = 0; c < a; c++)
                         {
                             fSum -= get(a, c) * get(c, b);
@@ -265,11 +265,11 @@ namespace basegfx
                     }
 
                     fBig = 0.0;
-
+            
                     for(a = b; a < RowSize; a++)
                     {
                         fSum = get(a, b);
-
+                
                         for(c = 0; c < b; c++)
                         {
                             fSum -= get(a, c) * get(c, b);
@@ -277,7 +277,7 @@ namespace basegfx
 
                         set(a, b, fSum);
                         fDum = fStorage[a] * fabs(fSum);
-
+                
                         if(::basegfx::fTools::moreOrEqual(fDum, fBig))
                         {
                             fBig = fDum;
@@ -299,15 +299,15 @@ namespace basegfx
                     }
 
                     nIndex[b] = nAMax;
-
+    
                     // here the failure of precision occurs
                     const double fValBB(fabs(get(b, b)));
-
+            
                     if(::basegfx::fTools::equalZero(fValBB))
                     {
                         return false;
                     }
-
+    
                     if(b != (RowSize - 1))
                     {
                         fDum = 1.0 / get(b, b);
@@ -327,7 +327,7 @@ namespace basegfx
                 sal_uInt16 b, ip;
                 sal_Int16 a, a2 = -1;
                 double fSum;
-
+    
                 for(a = 0; a < RowSize; a++)
                 {
                     ip = nIndex[a];
@@ -395,7 +395,7 @@ namespace basegfx
                 ImplHomMatrixTemplate aWork(*this);
                 sal_uInt16 nIndex[RowSize];
                 sal_Int16 nParity;
-
+        
                 return aWork.ludcmp(nIndex, nParity);
             }
 
@@ -479,7 +479,7 @@ namespace basegfx
                     fRetval = (double)nParity;
 
                     // last line needs no multiply if not existing; default value would be 1.
-                    const sal_uInt16 nMaxLine(
+                    const sal_uInt16 nMaxLine( 
                         sal::static_int_cast<sal_uInt16>(aWork.mpLine ? RowSize : (RowSize - 1)) );
 
                     for(sal_uInt16 a(0); a < nMaxLine; a++)
@@ -573,10 +573,10 @@ namespace basegfx
                     for(sal_uInt16 b(0); b < RowSize; ++b)
                     {
                         fValue = 0.0;
-
+                
                         for(sal_uInt16 c(0); c < RowSize; ++c)
                             fValue += aCopy.get(c, b) * rMat.get(a, c);
-
+                
                         set(a, b, fValue);
                     }
                 }
diff --git a/basegfx/source/inc/polygontemplate.hxx b/basegfx/source/inc/polygontemplate.hxx
index 9ab7fdd941bd..ede08e9848ba 100644
--- a/basegfx/source/inc/polygontemplate.hxx
+++ b/basegfx/source/inc/polygontemplate.hxx
@@ -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
@@ -34,16 +34,16 @@
 
 template < class Point > class ImplSimplePointEntry
 {
-    Point                                           maPoint;
+    Point											maPoint;
 
 public:
     ImplSimplePointEntry()
-    :   maPoint(Point::getEmptyPoint())
+    :	maPoint(Point::getEmptyPoint())
     {
     }
 
     ImplSimplePointEntry(const Point& rInitPoint)
-    :   maPoint(rInitPoint)
+    :	maPoint(rInitPoint)
     {
     }
 
@@ -51,7 +51,7 @@ public:
     {
         return maPoint;
     }
-
+    
     void setPoint(const Point& rValue)
     {
         maPoint = rValue;
@@ -67,18 +67,18 @@ public:
 
 template < class Vector > class ImplSimpleBezierEntry
 {
-    Vector                                          maBackward;
-    Vector                                          maForward;
+    Vector											maBackward;
+    Vector											maForward;
 
 public:
     ImplSimpleBezierEntry()
-    :   maBackward(Vector::getEmptyVector()),
+    :	maBackward(Vector::getEmptyVector()),
         maForward(Vector::getEmptyVector())
     {
     }
 
     ImplSimpleBezierEntry(const Vector& rInitBackward, const Vector& rInitForward)
-    :   maBackward(rInitBackward),
+    :	maBackward(rInitBackward),
         maForward(rInitForward)
     {
     }
@@ -87,7 +87,7 @@ public:
     {
         return maBackward;
     }
-
+    
     void setBackwardVector(const Vector& rValue)
     {
         maBackward = rValue;
@@ -131,11 +131,11 @@ template < class Point, class Vector > class ImplPolygonTemplate
     typedef ::std::vector< LocalImplSimplePointEntry > SimplePointVector;
     typedef ::std::vector< LocalImplSimpleBezierEntry > SimpleBezierVector;
 
-    sal_uInt32                                      mnBezierCount;
-    SimplePointVector                               maPoints;
-    SimpleBezierVector*                             mpVectors;
+    sal_uInt32										mnBezierCount;
+    SimplePointVector								maPoints;
+    SimpleBezierVector*								mpVectors;
 
-    unsigned                                        mbIsClosed : 1;
+    unsigned										mbIsClosed : 1;
 
     void implTryToReduceToPointVector()
     {
@@ -168,7 +168,7 @@ public:
     }
 
     ImplPolygonTemplate()
-    :   mnBezierCount(0L),
+    :	mnBezierCount(0L),
         mpVectors(0L),
         mbIsClosed(false)
     {
@@ -176,7 +176,7 @@ public:
     }
 
     ImplPolygonTemplate(const ImplPolygonTemplate& rSource)
-    :   mnBezierCount(0L),
+    :	mnBezierCount(0L),
         maPoints(rSource.maPoints),
         mpVectors(0L),
         mbIsClosed(rSource.mbIsClosed)
@@ -190,7 +190,7 @@ public:
     }
 
     ImplPolygonTemplate(const ImplPolygonTemplate& rSource, sal_uInt32 nIndex, sal_uInt32 nCount)
-    :   mnBezierCount(0L),
+    :	mnBezierCount(0L),
         maPoints(nCount),
         mpVectors(0L),
         mbIsClosed(rSource.mbIsClosed)
@@ -309,7 +309,7 @@ public:
         else
         {
             bool bEmptyVector(rValue.equalZero());
-
+            
             if(bEmptyVector)
                 return;
 
@@ -318,7 +318,7 @@ public:
             mnBezierCount++;
         }
     }
-
+    
     const Vector& getForwardVector(sal_uInt32 nIndex) const
     {
         if(mpVectors)
@@ -347,7 +347,7 @@ public:
         else
         {
             bool bEmptyVector(rValue.equalZero());
-
+            
             if(bEmptyVector)
                 return;
 
@@ -462,7 +462,7 @@ public:
                 if(mnBezierCount)
                 {
                     SimpleBezierVector::iterator aTestIter(aStart);
-
+                    
                     for( ; mnBezierCount && aTestIter != aEnd; ++aTestIter)
                     {
                         if(aTestIter->isBezierNeeded())
@@ -498,7 +498,7 @@ public:
             {
                 SimplePointVector::iterator aStart(maPoints.begin());
                 SimplePointVector::iterator aEnd(maPoints.end());
-
+                
                 for(sal_uInt32 a(0); a < nHalfSize; a++)
                 {
                     LocalImplSimplePointEntry aTemp = *aStart;
@@ -512,7 +512,7 @@ public:
             {
                 SimpleBezierVector::iterator aStart(mpVectors->begin());
                 SimpleBezierVector::iterator aEnd(mpVectors->end());
-
+                
                 for(sal_uInt32 a(0); a < nHalfSize; a++)
                 {
                     LocalImplSimpleBezierEntry aTemp = *aStart;
diff --git a/basegfx/source/matrix/b2dhommatrix.cxx b/basegfx/source/matrix/b2dhommatrix.cxx
index 96d3bdb01c01..5964d43c34d8 100644
--- a/basegfx/source/matrix/b2dhommatrix.cxx
+++ b/basegfx/source/matrix/b2dhommatrix.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
@@ -42,8 +42,8 @@ namespace basegfx
     class Impl2DHomMatrix : public ::basegfx::internal::ImplHomMatrixTemplate< 3 >
     {
     };
-
-    namespace { struct IdentityMatrix : public rtl::Static< B2DHomMatrix::ImplType,
+    
+    namespace { struct IdentityMatrix : public rtl::Static< B2DHomMatrix::ImplType, 
                                                             IdentityMatrix > {}; }
 
     B2DHomMatrix::B2DHomMatrix() :
@@ -61,7 +61,7 @@ namespace basegfx
     }
 
     B2DHomMatrix::B2DHomMatrix(double f_0x0, double f_0x1, double f_0x2, double f_1x0, double f_1x1, double f_1x2)
-    :   mpImpl( IdentityMatrix::get() ) // use common identity matrix, will be made unique with 1st set-call
+    :	mpImpl( IdentityMatrix::get() ) // use common identity matrix, will be made unique with 1st set-call
     {
         mpImpl->set(0, 0, f_0x0);
         mpImpl->set(0, 1, f_0x1);
@@ -231,7 +231,7 @@ namespace basegfx
 
             tools::createSinCosOrthogonal(fSin, fCos, fRadiant);
             Impl2DHomMatrix aRotMat;
-
+            
             aRotMat.set(0, 0, fCos);
             aRotMat.set(1, 1, fCos);
             aRotMat.set(1, 0, fSin);
@@ -246,7 +246,7 @@ namespace basegfx
         if(!fTools::equalZero(fX) || !fTools::equalZero(fY))
         {
             Impl2DHomMatrix aTransMat;
-
+            
             aTransMat.set(0, 2, fX);
             aTransMat.set(1, 2, fY);
 
@@ -261,7 +261,7 @@ namespace basegfx
         if(!fTools::equal(fOne, fX) || !fTools::equal(fOne, fY))
         {
             Impl2DHomMatrix aScaleMat;
-
+            
             aScaleMat.set(0, 0, fX);
             aScaleMat.set(1, 1, fY);
 
@@ -275,7 +275,7 @@ namespace basegfx
         if(!fTools::equalZero(fSx))
         {
             Impl2DHomMatrix aShearXMat;
-
+            
             aShearXMat.set(0, 1, fSx);
 
             mpImpl->doMulMatrix(aShearXMat);
@@ -288,7 +288,7 @@ namespace basegfx
         if(!fTools::equalZero(fSy))
         {
             Impl2DHomMatrix aShearYMat;
-
+            
             aShearYMat.set(1, 0, fSy);
 
             mpImpl->doMulMatrix(aShearYMat);
@@ -356,7 +356,7 @@ namespace basegfx
                         // and correct rotation, it's the Y-Axis rotation minus 90 degrees
                         rRotate = atan2(aUnitVecY.getY(), aUnitVecY.getX()) - M_PI_2;
                     }
-
+                    
                     // one or both unit vectors do not extist, determinant is zero, no decomposition possible.
                     // Eventually used rotations or shears are lost
                     return false;
@@ -411,7 +411,7 @@ namespace basegfx
 
                     if(!fTools::equalZero(rRotate))
                     {
-                        // To be able to correct the shear for aUnitVecY, rotation needs to be
+                        // To be able to correct the shear for aUnitVecY, rotation needs to be 
                         // removed first. Correction of aUnitVecX is easy, it will be rotated back to (1, 0).
                         aUnitVecX.setX(rScale.getX());
                         aUnitVecX.setY(0.0);
@@ -420,7 +420,7 @@ namespace basegfx
                         const double fNegRotate(-rRotate);
                         const double fSin(sin(fNegRotate));
                         const double fCos(cos(fNegRotate));
-
+                        
                         const double fNewX(aUnitVecY.getX() * fCos - aUnitVecY.getY() * fSin);
                         const double fNewY(aUnitVecY.getX() * fSin + aUnitVecY.getY() * fCos);
 
diff --git a/basegfx/source/matrix/b2dhommatrixtools.cxx b/basegfx/source/matrix/b2dhommatrixtools.cxx
index 0b85ee229ecc..4fce6f39965f 100644
--- a/basegfx/source/matrix/b2dhommatrixtools.cxx
+++ b/basegfx/source/matrix/b2dhommatrixtools.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
@@ -69,7 +69,7 @@ namespace basegfx
             if( fTools::equalZero( fmod( fRadiant, F_PI2 ) ) )
             {
                 // determine quadrant
-                const sal_Int32 nQuad(
+                const sal_Int32 nQuad( 
                     (4 + fround( 4/F_2PI*fmod( fRadiant, F_2PI ) )) % 4 );
                 switch( nQuad )
                 {
@@ -219,7 +219,7 @@ namespace basegfx
                             /* Row 1, Column 0 */ fSin * fScaleX,
                             /* Row 1, Column 1 */ fScaleY * fCos,
                             /* Row 1, Column 2 */ fTranslateY);
-
+                        
                         return aRetval;
                     }
                 }
@@ -254,13 +254,13 @@ namespace basegfx
                             /* Row 1, Column 0 */ fSin * fScaleX,
                             /* Row 1, Column 1 */ fScaleY * ((fSin * fShearX) + fCos),
                             /* Row 1, Column 2 */ fTranslateY);
-
+                        
                         return aRetval;
                     }
                 }
             }
         }
-
+        
         B2DHomMatrix createShearXRotateTranslateB2DHomMatrix(
             double fShearX,
             double fRadiant,
@@ -289,7 +289,7 @@ namespace basegfx
                         /* Row 1, Column 0 */ fSin,
                         /* Row 1, Column 1 */ fCos,
                         /* Row 1, Column 2 */ fTranslateY);
-
+                    
                     return aRetval;
                 }
             }
@@ -306,7 +306,7 @@ namespace basegfx
                         /* Row 1, Column 0 */ 0.0,
                         /* Row 1, Column 1 */ 1.0,
                         /* Row 1, Column 2 */ fTranslateY);
-
+                    
                     return aRetval;
                 }
                 else
@@ -324,12 +324,12 @@ namespace basegfx
                         /* Row 1, Column 0 */ fSin,
                         /* Row 1, Column 1 */ (fSin * fShearX) + fCos,
                         /* Row 1, Column 2 */ fTranslateY);
-
+                    
                     return aRetval;
                 }
             }
         }
-
+        
         B2DHomMatrix createScaleTranslateB2DHomMatrix(
             double fScaleX, double fScaleY,
             double fTranslateX, double fTranslateY)
@@ -348,7 +348,7 @@ namespace basegfx
                 {
                     /// no translate, but scale.
                     B2DHomMatrix aRetval;
-
+                    
                     aRetval.set(0, 0, fScaleX);
                     aRetval.set(1, 1, fScaleY);
 
@@ -364,7 +364,7 @@ namespace basegfx
                         /* Row 1, Column 0 */ 0.0,
                         /* Row 1, Column 1 */ fScaleY,
                         /* Row 1, Column 2 */ fTranslateY);
-
+                    
                     return aRetval;
                 }
             }
@@ -375,14 +375,14 @@ namespace basegfx
             double fRadiant)
         {
             B2DHomMatrix aRetval;
-
+            
             if(!fTools::equalZero(fRadiant))
             {
                 double fSin(0.0);
                 double fCos(1.0);
 
                 createSinCosOrthogonal(fSin, fCos, fRadiant);
-
+                
                 aRetval.set3x2(
                     /* Row 0, Column 0 */ fCos,
                     /* Row 0, Column 1 */ -fSin,
diff --git a/basegfx/source/matrix/b3dhommatrix.cxx b/basegfx/source/matrix/b3dhommatrix.cxx
index bc3c3b0b55dd..b36470f154de 100644
--- a/basegfx/source/matrix/b3dhommatrix.cxx
+++ b/basegfx/source/matrix/b3dhommatrix.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
@@ -38,8 +38,8 @@ namespace basegfx
     class Impl3DHomMatrix : public ::basegfx::internal::ImplHomMatrixTemplate< 4 >
     {
     };
-
-    namespace { struct IdentityMatrix : public rtl::Static< B3DHomMatrix::ImplType,
+    
+    namespace { struct IdentityMatrix : public rtl::Static< B3DHomMatrix::ImplType, 
                                                             IdentityMatrix > {}; }
 
     B3DHomMatrix::B3DHomMatrix() :
@@ -228,7 +228,7 @@ namespace basegfx
 
                 mpImpl->doMulMatrix(aRotMatY);
             }
-
+            
             if(!fTools::equalZero(fAngleZ))
             {
                 Impl3DHomMatrix aRotMatZ;
@@ -250,7 +250,7 @@ namespace basegfx
         if(!fTools::equalZero(fX) || !fTools::equalZero(fY) || !fTools::equalZero(fZ))
         {
             Impl3DHomMatrix aTransMat;
-
+            
             aTransMat.set(0, 3, fX);
             aTransMat.set(1, 3, fY);
             aTransMat.set(2, 3, fZ);
@@ -266,7 +266,7 @@ namespace basegfx
         if(!fTools::equal(fOne, fX) || !fTools::equal(fOne, fY) ||!fTools::equal(fOne, fZ))
         {
             Impl3DHomMatrix aScaleMat;
-
+            
             aScaleMat.set(0, 0, fX);
             aScaleMat.set(1, 1, fY);
             aScaleMat.set(2, 2, fZ);
@@ -281,7 +281,7 @@ namespace basegfx
         if(!fTools::equalZero(fSx) || !fTools::equalZero(fSy))
         {
             Impl3DHomMatrix aShearXYMat;
-
+            
             aShearXYMat.set(0, 2, fSx);
             aShearXYMat.set(1, 2, fSy);
 
@@ -295,7 +295,7 @@ namespace basegfx
         if(!fTools::equalZero(fSy) || !fTools::equalZero(fSz))
         {
             Impl3DHomMatrix aShearYZMat;
-
+            
             aShearYZMat.set(1, 0, fSy);
             aShearYZMat.set(2, 0, fSz);
 
@@ -309,7 +309,7 @@ namespace basegfx
         if(!fTools::equalZero(fSx) || !fTools::equalZero(fSz))
         {
             Impl3DHomMatrix aShearXZMat;
-
+            
             aShearXZMat.set(0, 1, fSx);
             aShearXZMat.set(2, 1, fSz);
 
@@ -350,7 +350,7 @@ namespace basegfx
         }
 
         Impl3DHomMatrix aFrustumMat;
-
+        
         aFrustumMat.set(0, 0, 2.0 * fNear / (fRight - fLeft));
         aFrustumMat.set(1, 1, 2.0 * fNear / (fTop - fBottom));
         aFrustumMat.set(0, 2, (fRight + fLeft) / (fRight - fLeft));
@@ -362,7 +362,7 @@ namespace basegfx
 
         mpImpl->doMulMatrix(aFrustumMat);
     }
-
+    
     void B3DHomMatrix::ortho(double fLeft, double fRight, double fBottom, double fTop, double fNear, double fFar)
     {
         if(fTools::equal(fNear, fFar))
@@ -383,14 +383,14 @@ namespace basegfx
         }
 
         Impl3DHomMatrix aOrthoMat;
-
+        
         aOrthoMat.set(0, 0, 2.0 / (fRight - fLeft));
         aOrthoMat.set(1, 1, 2.0 / (fTop - fBottom));
         aOrthoMat.set(2, 2, -1.0 * (2.0 / (fFar - fNear)));
         aOrthoMat.set(0, 3, -1.0 * ((fRight + fLeft) / (fRight - fLeft)));
         aOrthoMat.set(1, 3, -1.0 * ((fTop + fBottom) / (fTop - fBottom)));
         aOrthoMat.set(2, 3, -1.0 * ((fFar + fNear) / (fFar - fNear)));
-
+        
         mpImpl->doMulMatrix(aOrthoMat);
     }
 
@@ -501,7 +501,7 @@ namespace basegfx
 
         // get ShearYZ
         rShear.setZ(aCol1.scalar(aCol2));
-
+        
         if(fTools::equalZero(rShear.getZ()))
         {
             rShear.setZ(0.0);
@@ -551,7 +551,7 @@ namespace basegfx
         {
             double fy=0;
             double cy=0;
-
+            
             if( ::basegfx::fTools::equal( aCol0.getZ(), 1.0 )
                 || aCol0.getZ() > 1.0 )
             {
diff --git a/basegfx/source/numeric/ftools.cxx b/basegfx/source/numeric/ftools.cxx
index 3111b26a1818..b86f640ff602 100644
--- a/basegfx/source/numeric/ftools.cxx
+++ b/basegfx/source/numeric/ftools.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
diff --git a/basegfx/source/pixel/bpixel.cxx b/basegfx/source/pixel/bpixel.cxx
index 57de666787ab..499251bf0c48 100644
--- a/basegfx/source/pixel/bpixel.cxx
+++ b/basegfx/source/pixel/bpixel.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
diff --git a/basegfx/source/point/b2dhompoint.cxx b/basegfx/source/point/b2dhompoint.cxx
index 979fbd4cdd3b..1efaa86ac45c 100644
--- a/basegfx/source/point/b2dhompoint.cxx
+++ b/basegfx/source/point/b2dhompoint.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
@@ -33,10 +33,10 @@
 
 namespace basegfx
 {
-    bool B2DHomPoint::implIsHomogenized() const
-    {
+    bool B2DHomPoint::implIsHomogenized() const 
+    { 
         const double fOne(1.0);
-        return ::basegfx::fTools::equal(fOne, mfW);
+        return ::basegfx::fTools::equal(fOne, mfW); 
     }
 
     void B2DHomPoint::implHomogenize()
@@ -60,15 +60,15 @@ namespace basegfx
     }
 
     double B2DHomPoint::getX() const
-    {
+    { 
         implTestAndHomogenize();
-        return maTuple.getX();
+        return maTuple.getX(); 
     }
 
     double B2DHomPoint::getY() const
-    {
+    { 
         implTestAndHomogenize();
-        return maTuple.getY();
+        return maTuple.getY(); 
     }
 
     void B2DHomPoint::setX(double fX)
@@ -81,8 +81,8 @@ namespace basegfx
         maTuple.setY(implIsHomogenized() ? fY : fY * mfW );
     }
 
-    B2DHomPoint& B2DHomPoint::operator+=( const B2DHomPoint& rPnt )
-    {
+    B2DHomPoint& B2DHomPoint::operator+=( const B2DHomPoint& rPnt ) 
+    { 
         maTuple.setX(getX() * rPnt.mfW + rPnt.getX() * mfW);
         maTuple.setY(getY() * rPnt.mfW + rPnt.getY() * mfW);
         mfW = mfW * rPnt.mfW;
@@ -90,8 +90,8 @@ namespace basegfx
         return *this;
     }
 
-    B2DHomPoint& B2DHomPoint::operator-=( const B2DHomPoint& rPnt )
-    {
+    B2DHomPoint& B2DHomPoint::operator-=( const B2DHomPoint& rPnt ) 
+    { 
         maTuple.setX(getX() * rPnt.mfW - rPnt.getX() * mfW);
         maTuple.setY(getY() * rPnt.mfW - rPnt.getY() * mfW);
         mfW = mfW * rPnt.mfW;
@@ -99,14 +99,14 @@ namespace basegfx
         return *this;
     }
 
-    B2DHomPoint& B2DHomPoint::operator*=(double t)
-    {
+    B2DHomPoint& B2DHomPoint::operator*=(double t) 
+    { 
         if(!::basegfx::fTools::equalZero(t))
         {
             mfW /= t;
         }
 
-        return *this;
+        return *this; 
     }
 
     B2DHomPoint& B2DHomPoint::operator*=( const B2DHomMatrix& rMat )
@@ -129,130 +129,130 @@ namespace basegfx
         return *this;
     }
 
-    B2DHomPoint& B2DHomPoint::operator/=(double t)
-    {
+    B2DHomPoint& B2DHomPoint::operator/=(double t) 
+    { 
         mfW *= t;
-        return *this;
+        return *this; 
     }
 
     B2DHomPoint& B2DHomPoint::operator-(void)
-    {
+    {	
         mfW = -mfW;
         return *this;
     }
 
-    bool B2DHomPoint::operator==( const B2DHomPoint& rPnt ) const
-    {
+    bool B2DHomPoint::operator==( const B2DHomPoint& rPnt ) const 
+    { 
         implTestAndHomogenize();
         return (maTuple == rPnt.maTuple);
     }
 
-    bool B2DHomPoint::operator!=( const B2DHomPoint& rPnt ) const
-    {
+    bool B2DHomPoint::operator!=( const B2DHomPoint& rPnt ) const 
+    { 
         implTestAndHomogenize();
         return (maTuple != rPnt.maTuple);
     }
 
-    B2DHomPoint& B2DHomPoint::operator=( const B2DHomPoint& rPnt )
-    {
+    B2DHomPoint& B2DHomPoint::operator=( const B2DHomPoint& rPnt ) 
+    { 
         maTuple = rPnt.maTuple;
         mfW = rPnt.mfW;
-        return *this;
+        return *this; 
     }
 
-    B2DHomPoint minimum(const B2DHomPoint& rVecA, const B2DHomPoint& rVecB)
-    {
+    B2DHomPoint minimum(const B2DHomPoint& rVecA, const B2DHomPoint& rVecB) 
+    { 
         B2DHomPoint aMin(
             (rVecB.getX() < rVecA.getX()) ? rVecB.getX() : rVecA.getX(),
-            (rVecB.getY() < rVecA.getY()) ? rVecB.getY() : rVecA.getY());
+            (rVecB.getY() < rVecA.getY()) ? rVecB.getY() : rVecA.getY()); 
         return aMin;
     }
 
-    B2DHomPoint maximum(const B2DHomPoint& rVecA, const B2DHomPoint& rVecB)
-    {
+    B2DHomPoint maximum(const B2DHomPoint& rVecA, const B2DHomPoint& rVecB) 
+    { 
         B2DHomPoint aMax(
             (rVecB.getX() > rVecA.getX()) ? rVecB.getX() : rVecA.getX(),
-            (rVecB.getY() > rVecA.getY()) ? rVecB.getY() : rVecA.getY());
+            (rVecB.getY() > rVecA.getY()) ? rVecB.getY() : rVecA.getY()); 
         return aMax;
     }
-    B2DHomPoint absolute(const B2DHomPoint& rVec)
-    {
+    B2DHomPoint absolute(const B2DHomPoint& rVec) 
+    { 
         B2DHomPoint aAbs(
             (0.0 > rVec.getX()) ? -rVec.getX() : rVec.getX(),
-            (0.0 > rVec.getY()) ? -rVec.getY() : rVec.getY());
+            (0.0 > rVec.getY()) ? -rVec.getY() : rVec.getY()); 
         return aAbs;
     }
 
-    B2DHomPoint interpolate(B2DHomPoint& rOld1, B2DHomPoint& rOld2, double t)
-    {
+    B2DHomPoint interpolate(B2DHomPoint& rOld1, B2DHomPoint& rOld2, double t) 
+    { 
         B2DHomPoint aInt(
             ((rOld2.getX() - rOld1.getX()) * t) + rOld1.getX(),
-            ((rOld2.getY() - rOld1.getY()) * t) + rOld1.getY());
+            ((rOld2.getY() - rOld1.getY()) * t) + rOld1.getY()); 
         return aInt;
     }
 
-    B2DHomPoint average(B2DHomPoint& rOld1, B2DHomPoint& rOld2)
-    {
+    B2DHomPoint average(B2DHomPoint& rOld1, B2DHomPoint& rOld2) 
+    { 
         B2DHomPoint aAvg(
             (rOld1.getX() + rOld2.getX()) * 0.5,
-            (rOld1.getY() + rOld2.getY()) * 0.5);
+            (rOld1.getY() + rOld2.getY()) * 0.5); 
         return aAvg;
     }
-
+    
     B2DHomPoint average(B2DHomPoint& rOld1, B2DHomPoint& rOld2, B2DHomPoint& rOld3)
-    {
+    { 
         B2DHomPoint aAvg(
             (rOld1.getX() + rOld2.getX() + rOld3.getX()) * (1.0 / 3.0),
-            (rOld1.getY() + rOld2.getY() + rOld3.getY()) * (1.0 / 3.0));
+            (rOld1.getY() + rOld2.getY() + rOld3.getY()) * (1.0 / 3.0)); 
         return aAvg;
     }
 
     B2DHomPoint operator+(const B2DHomPoint& rVecA, const B2DHomPoint& rVecB)
-    {
-        B2DHomPoint aSum(rVecA);
-        aSum += rVecB;
-        return aSum;
+    { 
+        B2DHomPoint aSum(rVecA); 
+        aSum += rVecB; 
+        return aSum; 
     }
 
     B2DHomPoint operator-(const B2DHomPoint& rVecA, const B2DHomPoint& rVecB)
-    {
-        B2DHomPoint aSub(rVecA);
-        aSub -= rVecB;
-        return aSub;
+    { 
+        B2DHomPoint aSub(rVecA); 
+        aSub -= rVecB; 
+        return aSub; 
     }
 
     B2DHomPoint operator*(const B2DHomPoint& rVec, double t)
-    {
-        B2DHomPoint aNew(rVec);
-        aNew *= t;
-        return aNew;
+    { 
+        B2DHomPoint aNew(rVec); 
+        aNew *= t; 
+        return aNew; 
     }
 
     B2DHomPoint operator*(double t, const B2DHomPoint& rVec)
-    {
-        B2DHomPoint aNew(rVec);
-        aNew *= t;
-        return aNew;
+    { 
+        B2DHomPoint aNew(rVec); 
+        aNew *= t; 
+        return aNew; 
     }
 
     B2DHomPoint operator*( const B2DHomMatrix& rMat, const B2DHomPoint& rPoint )
     {
-        B2DHomPoint aNew(rPoint);
+        B2DHomPoint aNew(rPoint); 
         return aNew*=rMat;
     }
 
     B2DHomPoint operator/(const B2DHomPoint& rVec, double t)
-    {
-        B2DHomPoint aNew(rVec);
-        aNew /= t;
-        return aNew;
+    { 
+        B2DHomPoint aNew(rVec); 
+        aNew /= t; 
+        return aNew; 
     }
 
     B2DHomPoint operator/(double t, const B2DHomPoint& rVec)
     {
-        B2DHomPoint aNew(rVec);
-        aNew /= t;
-        return aNew;
+        B2DHomPoint aNew(rVec); 
+        aNew /= t; 
+        return aNew; 
     }
 } // end of namespace basegfx
 
diff --git a/basegfx/source/point/b2dpoint.cxx b/basegfx/source/point/b2dpoint.cxx
index 39b5eaa6fcbf..4fc398ee627a 100644
--- a/basegfx/source/point/b2dpoint.cxx
+++ b/basegfx/source/point/b2dpoint.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
@@ -35,30 +35,30 @@
 
 namespace basegfx
 {
-    B2DPoint& B2DPoint::operator=( const ::basegfx::B2DTuple& rPoint )
-    {
+    B2DPoint& B2DPoint::operator=( const ::basegfx::B2DTuple& rPoint ) 
+    { 
         mfX = rPoint.getX();
-        mfY = rPoint.getY();
-        return *this;
+        mfY = rPoint.getY(); 
+        return *this; 
     }
 
     B2DPoint& B2DPoint::operator*=( const ::basegfx::B2DHomMatrix& rMat )
     {
         double fTempX(
-            rMat.get(0, 0) * mfX +
-            rMat.get(0, 1) * mfY +
+            rMat.get(0, 0) * mfX + 
+            rMat.get(0, 1) * mfY + 
             rMat.get(0, 2));
         double fTempY(
-            rMat.get(1, 0) * mfX +
-            rMat.get(1, 1) * mfY +
+            rMat.get(1, 0) * mfX + 
+            rMat.get(1, 1) * mfY + 
             rMat.get(1, 2));
 
         if(!rMat.isLastLineDefault())
         {
             const double fOne(1.0);
             const double fTempM(
-                rMat.get(2, 0) * mfX +
-                rMat.get(2, 1) * mfY +
+                rMat.get(2, 0) * mfX + 
+                rMat.get(2, 1) * mfY + 
                 rMat.get(2, 2));
 
             if(!fTools::equalZero(fTempM) && !fTools::equal(fOne, fTempM))
diff --git a/basegfx/source/point/b2ipoint.cxx b/basegfx/source/point/b2ipoint.cxx
index 09af767518b3..e99e0c72c972 100644
--- a/basegfx/source/point/b2ipoint.cxx
+++ b/basegfx/source/point/b2ipoint.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
@@ -33,30 +33,30 @@
 
 namespace basegfx
 {
-    B2IPoint& B2IPoint::operator=( const ::basegfx::B2ITuple& rPoint )
-    {
+    B2IPoint& B2IPoint::operator=( const ::basegfx::B2ITuple& rPoint ) 
+    { 
         mnX = rPoint.getX();
-        mnY = rPoint.getY();
-        return *this;
+        mnY = rPoint.getY(); 
+        return *this; 
     }
 
     B2IPoint& B2IPoint::operator*=( const ::basegfx::B2DHomMatrix& rMat )
     {
         double fTempX(
-            rMat.get(0, 0) * mnX +
-            rMat.get(0, 1) * mnY +
+            rMat.get(0, 0) * mnX + 
+            rMat.get(0, 1) * mnY + 
             rMat.get(0, 2));
         double fTempY(
-            rMat.get(1, 0) * mnX +
-            rMat.get(1, 1) * mnY +
+            rMat.get(1, 0) * mnX + 
+            rMat.get(1, 1) * mnY + 
             rMat.get(1, 2));
 
         if(!rMat.isLastLineDefault())
         {
             const double fOne(1.0);
             const double fTempM(
-                rMat.get(2, 0) * mnX +
-                rMat.get(2, 1) * mnY +
+                rMat.get(2, 0) * mnX + 
+                rMat.get(2, 1) * mnY + 
                 rMat.get(2, 2));
 
             if(!fTools::equalZero(fTempM) && !fTools::equal(fOne, fTempM))
diff --git a/basegfx/source/point/b3dhompoint.cxx b/basegfx/source/point/b3dhompoint.cxx
index 34dee5bc01d0..04c4d517bbf4 100644
--- a/basegfx/source/point/b3dhompoint.cxx
+++ b/basegfx/source/point/b3dhompoint.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
diff --git a/basegfx/source/point/b3dpoint.cxx b/basegfx/source/point/b3dpoint.cxx
index 8bc1f06f3356..3c79eb4bfe50 100644
--- a/basegfx/source/point/b3dpoint.cxx
+++ b/basegfx/source/point/b3dpoint.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
@@ -55,9 +55,9 @@ namespace basegfx
         {
             const double fOne(1.0);
             const double fTempM(
-                rMat.get(3, 0) * mfX +
-                rMat.get(3, 1) * mfY +
-                rMat.get(3, 2) * mfZ +
+                rMat.get(3, 0) * mfX + 
+                rMat.get(3, 1) * mfY + 
+                rMat.get(3, 2) * mfZ + 
                 rMat.get(3, 3));
 
             if(!fTools::equalZero(fTempM) && !fTools::equal(fOne, fTempM))
diff --git a/basegfx/source/point/b3ipoint.cxx b/basegfx/source/point/b3ipoint.cxx
index 19bb25b8bf46..c0b2e0c362df 100644
--- a/basegfx/source/point/b3ipoint.cxx
+++ b/basegfx/source/point/b3ipoint.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
@@ -55,9 +55,9 @@ namespace basegfx
         {
             const double fOne(1.0);
             const double fTempM(
-                rMat.get(3, 0) * mnX +
-                rMat.get(3, 1) * mnY +
-                rMat.get(3, 2) * mnZ +
+                rMat.get(3, 0) * mnX + 
+                rMat.get(3, 1) * mnY + 
+                rMat.get(3, 2) * mnZ + 
                 rMat.get(3, 3));
 
             if(!fTools::equalZero(fTempM) && !fTools::equal(fOne, fTempM))
diff --git a/basegfx/source/polygon/b2dlinegeometry.cxx b/basegfx/source/polygon/b2dlinegeometry.cxx
index 0db5efbfb86d..2e984ea2308c 100644
--- a/basegfx/source/polygon/b2dlinegeometry.cxx
+++ b/basegfx/source/polygon/b2dlinegeometry.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
@@ -46,8 +46,8 @@ namespace basegfx
     namespace tools
     {
         B2DPolyPolygon createAreaGeometryForLineStartEnd(
-            const B2DPolygon& rCandidate,
-            const B2DPolyPolygon& rArrow,
+            const B2DPolygon& rCandidate, 
+            const B2DPolyPolygon& rArrow, 
             bool bStart,
             double fWidth,
             double fCandidateLength,
@@ -58,7 +58,7 @@ namespace basegfx
             OSL_ENSURE(rCandidate.count() > 1L, "createAreaGeometryForLineStartEnd: Line polygon has too less points (!)");
             OSL_ENSURE(rArrow.count() > 0L, "createAreaGeometryForLineStartEnd: Empty arrow PolyPolygon (!)");
             OSL_ENSURE(fWidth > 0.0, "createAreaGeometryForLineStartEnd: Width too small (!)");
-            OSL_ENSURE(fDockingPosition >= 0.0 && fDockingPosition <= 1.0,
+            OSL_ENSURE(fDockingPosition >= 0.0 && fDockingPosition <= 1.0, 
                 "createAreaGeometryForLineStartEnd: fDockingPosition out of range [0.0 .. 1.0] (!)");
 
             if(fWidth < 0.0)
@@ -108,7 +108,7 @@ namespace basegfx
                 // get the polygon vector we want to plant this arrow on
                 const double fConsumedLength(fArrowYLength * (1.0 - fDockingPosition));
                 const B2DVector aHead(rCandidate.getB2DPoint((bStart) ? 0L : rCandidate.count() - 1L));
-                const B2DVector aTail(getPositionAbsolute(rCandidate,
+                const B2DVector aTail(getPositionAbsolute(rCandidate, 
                     (bStart) ? fConsumedLength : fCandidateLength - fConsumedLength, fCandidateLength));
 
                 // from that vector, take the needed rotation and add rotate for arrow to transformation
@@ -221,7 +221,7 @@ namespace basegfx
             {
                 B2DCubicBezier aLeft, aRight;
                 rCandidate.split(0.5, &aLeft, &aRight);
-
+        
                 impSubdivideToSimple(aLeft, rTarget, fMaxCosQuad, fMaxPartOfEdgeQuad, nMaxRecursionDepth - 1);
                 impSubdivideToSimple(aRight, rTarget, fMaxCosQuad, fMaxPartOfEdgeQuad, nMaxRecursionDepth - 1);
             }
@@ -248,7 +248,7 @@ namespace basegfx
                     aEdge.setControlPointA(rCandidate.getNextControlPoint(a));
                     aEdge.setControlPointB(rCandidate.getPrevControlPoint(nNextIndex));
                     aEdge.setEndPoint(rCandidate.getB2DPoint(nNextIndex));
-
+                    
                     // get rid of unnecessary bezier segments
                     aEdge.testAndSolveTrivialBezier();
 
@@ -260,7 +260,7 @@ namespace basegfx
 
                         aExtremumPositions.reserve(4);
                         aEdge.getAllExtremumPositions(aExtremumPositions);
-
+                        
                         const sal_uInt32 nCount(aExtremumPositions.size());
 
                         if(nCount)
@@ -276,7 +276,7 @@ namespace basegfx
                                 // split aEdge at next split pos
                                 B2DCubicBezier aLeft;
                                 const double fSplitPos(aExtremumPositions[b++]);
-
+                                
                                 aEdge.split(fSplitPos, &aLeft, &aEdge);
                                 aLeft.testAndSolveTrivialBezier();
 
@@ -289,7 +289,7 @@ namespace basegfx
                                 {
                                     aRetval.append(aLeft.getEndPoint());
                                 }
-
+                            
                                 if(b < nCount)
                                 {
                                     // correct the remaining split positions to fit to shortened aEdge
@@ -301,7 +301,7 @@ namespace basegfx
                                     }
                                 }
                             }
-
+                        
                             // test the shortened rest of aEdge
                             aEdge.testAndSolveTrivialBezier();
 
@@ -366,7 +366,7 @@ namespace basegfx
                     double fCut(0.0);
                     const tools::CutFlagValue aCut(tools::findCut(
                         rEdge.getStartPoint(), aPerpendStart,
-                        rEdge.getEndPoint(), aPerpendEnd,
+                        rEdge.getEndPoint(), aPerpendEnd, 
                         CUTFLAG_ALL, &fCut));
 
                     if(CUTFLAG_NONE != aCut)
@@ -394,7 +394,7 @@ namespace basegfx
                 // append original in-between point
                 aBezierPolygon.append(rEdge.getEndPoint());
 
-                // create lower edge.
+                // create lower edge. 
                 {
                     // create displacement vectors and check if they cut
                     const B2DVector aPerpendStart(getNormalizedPerpendicular(aTangentA) * fHalfLineWidth);
@@ -402,7 +402,7 @@ namespace basegfx
                     double fCut(0.0);
                     const tools::CutFlagValue aCut(tools::findCut(
                         rEdge.getEndPoint(), aPerpendEnd,
-                        rEdge.getStartPoint(), aPerpendStart,
+                        rEdge.getStartPoint(), aPerpendStart, 
                         CUTFLAG_ALL, &fCut));
 
                     if(CUTFLAG_NONE != aCut)
@@ -442,11 +442,11 @@ namespace basegfx
                 const B2DVector aEdgeTangent((rEdge.getEndPoint() - rEdge.getStartPoint()) * 0.3);
                 const B2DVector aPerpendEdgeVector(getNormalizedPerpendicular(aEdgeTangent) * fHalfLineWidth);
                 B2DPolygon aEdgePolygon;
-
+                
                 // create upper edge
                 aEdgePolygon.append(rEdge.getStartPoint() - aPerpendEdgeVector);
                 aEdgePolygon.append(rEdge.getEndPoint() - aPerpendEdgeVector);
-
+                
                 // append original in-between point
                 aEdgePolygon.append(rEdge.getEndPoint());
 
@@ -464,13 +464,13 @@ namespace basegfx
         }
 
         B2DPolygon createAreaGeometryForJoin(
-            const B2DVector& rTangentPrev,
+            const B2DVector& rTangentPrev, 
             const B2DVector& rTangentEdge,
-            const B2DVector& rPerpendPrev,
+            const B2DVector& rPerpendPrev, 
             const B2DVector& rPerpendEdge,
             const B2DPoint& rPoint,
-            double fHalfLineWidth,
-            B2DLineJoin eJoin,
+            double fHalfLineWidth, 
+            B2DLineJoin eJoin, 
             double fMiterMinimumAngle)
         {
             OSL_ENSURE(fHalfLineWidth > 0.0, "createAreaGeometryForJoin: LineWidth too small (!)");
@@ -480,7 +480,7 @@ namespace basegfx
             B2DPolygon aEdgePolygon;
             const B2DPoint aStartPoint(rPoint + rPerpendPrev);
             const B2DPoint aEndPoint(rPoint + rPerpendEdge);
-
+            
             // test if for Miter, the angle is too small and the fallback
             // to bevel needs to be used
             if(B2DLINEJOIN_MITER == eJoin)
@@ -501,7 +501,7 @@ namespace basegfx
                     aEdgePolygon.append(aEndPoint);
                     aEdgePolygon.append(rPoint);
                     aEdgePolygon.append(aStartPoint);
-
+                    
                     // Look for the cut point between start point along rTangentPrev and
                     // end point along rTangentEdge. -rTangentEdge should be used, but since
                     // the cut value is used for interpolating along the first edge, the negation
@@ -515,7 +515,7 @@ namespace basegfx
                         const B2DPoint aCutPoint(interpolate(aStartPoint, aStartPoint + rTangentPrev, fCutPos));
                         aEdgePolygon.append(aCutPoint);
                     }
-
+                    
                     break;
                 }
                 case B2DLINEJOIN_ROUND :
@@ -523,7 +523,7 @@ namespace basegfx
                     // use tooling to add needed EllipseSegment
                     double fAngleStart(atan2(rPerpendPrev.getY(), rPerpendPrev.getX()));
                     double fAngleEnd(atan2(rPerpendEdge.getY(), rPerpendEdge.getX()));
-
+                    
                     // atan2 results are [-PI .. PI], consolidate to [0.0 .. 2PI]
                     if(fAngleStart < 0.0)
                     {
@@ -560,7 +560,7 @@ namespace basegfx
                     aEdgePolygon.append(aEndPoint);
                     aEdgePolygon.append(rPoint);
                     aEdgePolygon.append(aStartPoint);
-
+                    
                     break;
                 }
             }
@@ -575,10 +575,10 @@ namespace basegfx
     namespace tools
     {
         B2DPolyPolygon createAreaGeometry(
-            const B2DPolygon& rCandidate,
-            double fHalfLineWidth,
-            B2DLineJoin eJoin,
-            double fMaxAllowedAngle,
+            const B2DPolygon& rCandidate, 
+            double fHalfLineWidth, 
+            B2DLineJoin eJoin, 
+            double fMaxAllowedAngle, 
             double fMaxPartOfEdge,
             double fMiterMinimumAngle)
         {
@@ -611,10 +611,10 @@ namespace basegfx
 
             B2DPolygon aCandidate(rCandidate);
             const double fMaxCos(cos(fMaxAllowedAngle));
-
+            
             aCandidate.removeDoublePoints();
             aCandidate = subdivideToSimple(aCandidate, fMaxCos * fMaxCos, fMaxPartOfEdge * fMaxPartOfEdge);
-
+            
             const sal_uInt32 nPointCount(aCandidate.count());
 
             if(nPointCount)
@@ -659,7 +659,7 @@ namespace basegfx
 
                             if(ORIENTATION_NEUTRAL == aOrientation)
                             {
-                                // they are parallell or empty; if they are both not zero and point
+                                // they are parallell or empty; if they are both not zero and point 
                                 // in opposite direction, a half-circle is needed
                                 if(!aTangentPrev.equalZero() && !aTangentEdge.equalZero())
                                 {
@@ -678,11 +678,11 @@ namespace basegfx
                             {
                                 const B2DVector aPerpendPrev(getNormalizedPerpendicular(aTangentPrev) * -fHalfLineWidth);
                                 const B2DVector aPerpendEdge(getNormalizedPerpendicular(aTangentEdge) * -fHalfLineWidth);
-
+                                
                                 aRetval.append(createAreaGeometryForJoin(
                                     aTangentPrev, aTangentEdge,
-                                    aPerpendPrev, aPerpendEdge,
-                                    aEdge.getStartPoint(), fHalfLineWidth,
+                                    aPerpendPrev, aPerpendEdge, 
+                                    aEdge.getStartPoint(), fHalfLineWidth, 
                                     eJoin, fMiterMinimumAngle));
                             }
                             else if(ORIENTATION_NEGATIVE == aOrientation)
@@ -692,8 +692,8 @@ namespace basegfx
 
                                 aRetval.append(createAreaGeometryForJoin(
                                     aTangentEdge, aTangentPrev,
-                                    aPerpendEdge, aPerpendPrev,
-                                    aEdge.getStartPoint(), fHalfLineWidth,
+                                    aPerpendEdge, aPerpendPrev, 
+                                    aEdge.getStartPoint(), fHalfLineWidth, 
                                     eJoin, fMiterMinimumAngle));
                             }
                         }
diff --git a/basegfx/source/polygon/b2dpolygon.cxx b/basegfx/source/polygon/b2dpolygon.cxx
index d8255dc7ec10..698013711c79 100644
--- a/basegfx/source/polygon/b2dpolygon.cxx
+++ b/basegfx/source/polygon/b2dpolygon.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
@@ -46,8 +46,8 @@ struct CoordinateData2D : public basegfx::B2DPoint
 public:
     CoordinateData2D() {}
 
-    explicit CoordinateData2D(const basegfx::B2DPoint& rData)
-    :   B2DPoint(rData)
+    explicit CoordinateData2D(const basegfx::B2DPoint& rData) 
+    :	B2DPoint(rData) 
     {}
 
     CoordinateData2D& operator=(const basegfx::B2DPoint& rData)
@@ -56,9 +56,9 @@ public:
         return *this;
     }
 
-    void transform(const basegfx::B2DHomMatrix& rMatrix)
-    {
-        *this *= rMatrix;
+    void transform(const basegfx::B2DHomMatrix& rMatrix) 
+    { 
+        *this *= rMatrix; 
     }
 };
 
@@ -68,21 +68,21 @@ class CoordinateDataArray2D
 {
     typedef ::std::vector< CoordinateData2D > CoordinateData2DVector;
 
-    CoordinateData2DVector                          maVector;
+    CoordinateData2DVector							maVector;
 
 public:
     explicit CoordinateDataArray2D(sal_uInt32 nCount)
-    :   maVector(nCount)
+    :	maVector(nCount)
     {
     }
 
     explicit CoordinateDataArray2D(const CoordinateDataArray2D& rOriginal)
-    :   maVector(rOriginal.maVector)
+    :	maVector(rOriginal.maVector)
     {
     }
 
     CoordinateDataArray2D(const CoordinateDataArray2D& rOriginal, sal_uInt32 nIndex, sal_uInt32 nCount)
-    :   maVector(rOriginal.maVector.begin() + nIndex, rOriginal.maVector.begin() + (nIndex + nCount))
+    :	maVector(rOriginal.maVector.begin() + nIndex, rOriginal.maVector.begin() + (nIndex + nCount))
     {
     }
 
@@ -163,7 +163,7 @@ public:
             const sal_uInt32 nHalfSize(bIsClosed ? (maVector.size() - 1) >> 1 : maVector.size() >> 1);
             CoordinateData2DVector::iterator aStart(bIsClosed ? maVector.begin() + 1 : maVector.begin());
             CoordinateData2DVector::iterator aEnd(maVector.end() - 1);
-
+            
             for(sal_uInt32 a(0); a < nHalfSize; a++)
             {
                 ::std::swap(*aStart, *aEnd);
@@ -252,35 +252,35 @@ public:
 
 class ControlVectorPair2D
 {
-    basegfx::B2DVector                          maPrevVector;
-    basegfx::B2DVector                          maNextVector;
+    basegfx::B2DVector							maPrevVector;
+    basegfx::B2DVector							maNextVector;
 
 public:
-    const basegfx::B2DVector& getPrevVector() const
-    {
-        return maPrevVector;
+    const basegfx::B2DVector& getPrevVector() const 
+    { 
+        return maPrevVector; 
     }
-
-    void setPrevVector(const basegfx::B2DVector& rValue)
-    {
-        if(rValue != maPrevVector)
-            maPrevVector = rValue;
+    
+    void setPrevVector(const basegfx::B2DVector& rValue) 
+    { 
+        if(rValue != maPrevVector) 
+            maPrevVector = rValue; 
     }
 
-    const basegfx::B2DVector& getNextVector() const
-    {
-        return maNextVector;
+    const basegfx::B2DVector& getNextVector() const 
+    { 
+        return maNextVector; 
     }
 
-    void setNextVector(const basegfx::B2DVector& rValue)
-    {
-        if(rValue != maNextVector)
-            maNextVector = rValue;
+    void setNextVector(const basegfx::B2DVector& rValue) 
+    { 
+        if(rValue != maNextVector) 
+            maNextVector = rValue; 
     }
 
-    bool operator==(const ControlVectorPair2D& rData) const
-    {
-        return (maPrevVector == rData.getPrevVector() && maNextVector == rData.getNextVector());
+    bool operator==(const ControlVectorPair2D& rData) const 
+    { 
+        return (maPrevVector == rData.getPrevVector() && maNextVector == rData.getNextVector()); 
     }
 
     void flip()
@@ -295,17 +295,17 @@ class ControlVectorArray2D
 {
     typedef ::std::vector< ControlVectorPair2D > ControlVectorPair2DVector;
 
-    ControlVectorPair2DVector                           maVector;
-    sal_uInt32                                          mnUsedVectors;
+    ControlVectorPair2DVector							maVector;
+    sal_uInt32											mnUsedVectors;
 
 public:
     explicit ControlVectorArray2D(sal_uInt32 nCount)
-    :   maVector(nCount),
+    :	maVector(nCount),
         mnUsedVectors(0)
     {}
 
     ControlVectorArray2D(const ControlVectorArray2D& rOriginal, sal_uInt32 nIndex, sal_uInt32 nCount)
-    :   maVector(),
+    :	maVector(),
         mnUsedVectors(0)
     {
         ControlVectorPair2DVector::const_iterator aStart(rOriginal.maVector.begin());
@@ -336,8 +336,8 @@ public:
         return (maVector == rCandidate.maVector);
     }
 
-    bool isUsed() const
-    {
+    bool isUsed() const 
+    { 
         return (0 != mnUsedVectors);
     }
 
@@ -488,7 +488,7 @@ public:
             const sal_uInt32 nHalfSize(bIsClosed ? (maVector.size() - 1) >> 1 : maVector.size() >> 1);
             ControlVectorPair2DVector::iterator aStart(bIsClosed ? maVector.begin() + 1 : maVector.begin());
             ControlVectorPair2DVector::iterator aEnd(maVector.end() - 1);
-
+            
             for(sal_uInt32 a(0); a < nHalfSize; a++)
             {
                 // swap Prev and Next
@@ -523,10 +523,10 @@ class ImplBufferedData
 {
 private:
     // Possibility to hold the last subdivision
-    boost::scoped_ptr< basegfx::B2DPolygon >        mpDefaultSubdivision;
+    boost::scoped_ptr< basegfx::B2DPolygon >		mpDefaultSubdivision;
 
     // Possibility to hold the last B2DRange calculation
-    boost::scoped_ptr< basegfx::B2DRange >          mpB2DRange;
+    boost::scoped_ptr< basegfx::B2DRange >		    mpB2DRange;
 
 public:
     ImplBufferedData()
@@ -543,7 +543,7 @@ public:
 
         return *mpDefaultSubdivision;
     }
-
+    
     const basegfx::B2DRange& getB2DRange(const basegfx::B2DPolygon& rSource) const
     {
         if(!mpB2DRange)
@@ -583,10 +583,10 @@ public:
                                     // the range with control points of the current edge is not completely
                                     // inside the current range without control points. Expand current range by
                                     // subdividing the bezier segment.
-                                    // Ideal here is a subdivision at the extreme values, so use
+                                    // Ideal here is a subdivision at the extreme values, so use 
                                     // getAllExtremumPositions to get all extremas in one run
                                     ::std::vector< double > aExtremas;
-
+                                    
                                     aExtremas.reserve(4);
                                     aEdge.getAllExtremumPositions(aExtremas);
 
@@ -620,11 +620,11 @@ class ImplB2DPolygon
 private:
     // The point vector. This vector exists always and defines the
     // count of members.
-    CoordinateDataArray2D                           maPoints;
+    CoordinateDataArray2D							maPoints;
 
     // The control point vectors. This vectors are created on demand
     // and may be zero.
-    boost::scoped_ptr< ControlVectorArray2D >       mpControlVector;
+    boost::scoped_ptr< ControlVectorArray2D >		mpControlVector;
 
     // buffered data for e.g. default subdivision and range
     boost::scoped_ptr< ImplBufferedData >           mpBufferedData;
@@ -659,14 +659,14 @@ public:
     }
 
     ImplB2DPolygon()
-    :   maPoints(0),
+    :	maPoints(0),
         mpControlVector(),
         mpBufferedData(),
         mbIsClosed(false)
     {}
 
     ImplB2DPolygon(const ImplB2DPolygon& rToBeCopied)
-    :   maPoints(rToBeCopied.maPoints),
+    :	maPoints(rToBeCopied.maPoints),
         mpControlVector(),
         mpBufferedData(),
         mbIsClosed(rToBeCopied.mbIsClosed)
@@ -679,7 +679,7 @@ public:
     }
 
     ImplB2DPolygon(const ImplB2DPolygon& rToBeCopied, sal_uInt32 nIndex, sal_uInt32 nCount)
-    :   maPoints(rToBeCopied.maPoints, nIndex, nCount),
+    :	maPoints(rToBeCopied.maPoints, nIndex, nCount),
         mpControlVector(),
         mpBufferedData(),
         mbIsClosed(rToBeCopied.mbIsClosed)
@@ -703,7 +703,7 @@ public:
 
         // complete initialization using copy
         if(rToBeCopied.mpControlVector && rToBeCopied.mpControlVector->isUsed())
-            mpControlVector.reset( new ControlVectorArray2D(*rToBeCopied.mpControlVector) );
+            mpControlVector.reset( new ControlVectorArray2D(*rToBeCopied.mpControlVector) );        
 
         return *this;
     }
@@ -1069,7 +1069,7 @@ public:
 
                         remove(nIndex, 1);
                     }
-                }
+                } 
                 while(bRemove);
             }
             else
@@ -1141,7 +1141,7 @@ public:
                 {
                     const basegfx::B2DVector& rPrevVector(mpControlVector->getPrevVector(a));
                     const basegfx::B2DVector& rNextVector(mpControlVector->getNextVector(a));
-
+                    
                     if(!rPrevVector.equalZero())
                     {
                         basegfx::B2DVector aPrevVector(rMatrix * rPrevVector);
@@ -1195,21 +1195,21 @@ public:
 
 namespace basegfx
 {
-    namespace
-    {
-        struct DefaultPolygon: public rtl::Static<B2DPolygon::ImplType, DefaultPolygon> {};
+    namespace 
+    { 
+        struct DefaultPolygon: public rtl::Static<B2DPolygon::ImplType, DefaultPolygon> {}; 
     }
 
-    B2DPolygon::B2DPolygon()
-    :   mpPolygon(DefaultPolygon::get())
+    B2DPolygon::B2DPolygon() 
+    :	mpPolygon(DefaultPolygon::get())
     {}
 
     B2DPolygon::B2DPolygon(const B2DPolygon& rPolygon)
-    :   mpPolygon(rPolygon.mpPolygon)
+    :	mpPolygon(rPolygon.mpPolygon)
     {}
 
     B2DPolygon::B2DPolygon(const B2DPolygon& rPolygon, sal_uInt32 nIndex, sal_uInt32 nCount)
-    :   mpPolygon(ImplB2DPolygon(*rPolygon.mpPolygon, nIndex, nCount))
+    :	mpPolygon(ImplB2DPolygon(*rPolygon.mpPolygon, nIndex, nCount))
     {
         // TODO(P2): one extra temporary here (cow_wrapper copies
         // given ImplB2DPolygon into its internal impl_t wrapper type)
@@ -1252,7 +1252,7 @@ namespace basegfx
     B2DPoint B2DPolygon::getB2DPoint(sal_uInt32 nIndex) const
     {
         OSL_ENSURE(nIndex < mpPolygon->count(), "B2DPolygon access outside range (!)");
-
+        
         return mpPolygon->getPoint(nIndex);
     }
 
@@ -1274,7 +1274,7 @@ namespace basegfx
     void B2DPolygon::insert(sal_uInt32 nIndex, const B2DPoint& rPoint, sal_uInt32 nCount)
     {
         OSL_ENSURE(nIndex <= mpPolygon->count(), "B2DPolygon Insert outside range (!)");
-
+        
         if(nCount)
         {
             mpPolygon->insert(nIndex, rPoint, nCount);
@@ -1297,7 +1297,7 @@ namespace basegfx
     B2DPoint B2DPolygon::getPrevControlPoint(sal_uInt32 nIndex) const
     {
         OSL_ENSURE(nIndex < mpPolygon->count(), "B2DPolygon access outside range (!)");
-
+        
         if(mpPolygon->areControlPointsUsed())
         {
             return mpPolygon->getPoint(nIndex) + mpPolygon->getPrevControlVector(nIndex);
@@ -1311,7 +1311,7 @@ namespace basegfx
     B2DPoint B2DPolygon::getNextControlPoint(sal_uInt32 nIndex) const
     {
         OSL_ENSURE(nIndex < mpPolygon->count(), "B2DPolygon access outside range (!)");
-
+        
         if(mpPolygon->areControlPointsUsed())
         {
             return mpPolygon->getPoint(nIndex) + mpPolygon->getNextControlVector(nIndex);
@@ -1381,7 +1381,7 @@ namespace basegfx
     {
         OSL_ENSURE(nIndex < mpPolygon->count(), "B2DPolygon access outside range (!)");
 
-        if(mpPolygon->areControlPointsUsed() &&
+        if(mpPolygon->areControlPointsUsed() && 
             (!mpPolygon->getPrevControlVector(nIndex).equalZero() || !mpPolygon->getNextControlVector(nIndex).equalZero()))
         {
             mpPolygon->resetControlVectors(nIndex);
@@ -1397,8 +1397,8 @@ namespace basegfx
     }
 
     void B2DPolygon::appendBezierSegment(
-        const B2DPoint& rNextControlPoint,
-        const B2DPoint& rPrevControlPoint,
+        const B2DPoint& rNextControlPoint, 
+        const B2DPoint& rPrevControlPoint, 
         const B2DPoint& rPoint)
     {
         const B2DVector aNewNextVector(mpPolygon->count() ? B2DVector(rNextControlPoint - mpPolygon->getPoint(mpPolygon->count() - 1)) : B2DVector::getEmptyVector());
@@ -1453,7 +1453,7 @@ namespace basegfx
     bool B2DPolygon::isBezierSegment(sal_uInt32 nIndex) const
     {
         OSL_ENSURE(nIndex < mpPolygon->count(), "B2DPolygon access outside range (!)");
-
+        
         if(mpPolygon->areControlPointsUsed())
         {
             // Check if the edge exists
@@ -1462,7 +1462,7 @@ namespace basegfx
             if(bNextIndexValidWithoutClose || mpPolygon->isClosed())
             {
                 const sal_uInt32 nNextIndex(bNextIndexValidWithoutClose ? nIndex + 1 : 0);
-                return (!mpPolygon->getPrevControlVector(nNextIndex).equalZero()
+                return (!mpPolygon->getPrevControlVector(nNextIndex).equalZero() 
                     || !mpPolygon->getNextControlVector(nIndex).equalZero());
             }
             else
@@ -1572,13 +1572,13 @@ namespace basegfx
     void B2DPolygon::remove(sal_uInt32 nIndex, sal_uInt32 nCount)
     {
         OSL_ENSURE(nIndex + nCount <= mpPolygon->count(), "B2DPolygon Remove outside range (!)");
-
+        
         if(nCount)
         {
             mpPolygon->remove(nIndex, nCount);
         }
     }
-
+    
     void B2DPolygon::clear()
     {
         mpPolygon = DefaultPolygon::get();
diff --git a/basegfx/source/polygon/b2dpolygonclipper.cxx b/basegfx/source/polygon/b2dpolygonclipper.cxx
index 6e5c7701e2ec..b8d589e47a6d 100644
--- a/basegfx/source/polygon/b2dpolygonclipper.cxx
+++ b/basegfx/source/polygon/b2dpolygonclipper.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
@@ -93,15 +93,15 @@ namespace basegfx
                 {
                     // add cuts with axis to polygon, including bezier segments
                     // Build edge to cut with. Make it a little big longer than needed for
-                    // numerical stability. We want to cut against the edge seen as endless
+                    // numerical stability. We want to cut against the edge seen as endless 
                     // ray here, but addPointsAtCuts() will limit itself to the
                     // edge's range ]0.0 .. 1.0[.
                     const double fSmallExtension((aCandidateRange.getWidth() + aCandidateRange.getHeight()) * (0.5 * 0.1));
                     const B2DPoint aStart(
-                        bParallelToXAxis ? aCandidateRange.getMinX() - fSmallExtension : fValueOnOtherAxis,
+                        bParallelToXAxis ? aCandidateRange.getMinX() - fSmallExtension : fValueOnOtherAxis, 
                         bParallelToXAxis ? fValueOnOtherAxis : aCandidateRange.getMinY() - fSmallExtension);
                     const B2DPoint aEnd(
-                        bParallelToXAxis ? aCandidateRange.getMaxX() + fSmallExtension : fValueOnOtherAxis,
+                        bParallelToXAxis ? aCandidateRange.getMaxX() + fSmallExtension : fValueOnOtherAxis, 
                         bParallelToXAxis ? fValueOnOtherAxis : aCandidateRange.getMaxY() + fSmallExtension);
                     const B2DPolygon aCandidate(addPointsAtCuts(rCandidate, aStart, aEnd));
                     const sal_uInt32 nPointCount(aCandidate.count());
@@ -248,7 +248,7 @@ namespace basegfx
                 // This needs to be done with the topology knowlegde and is unfurtunately
                 // more expensive, too.
                 const B2DPolygon aClip(createPolygonFromRect(rRange));
-
+                
                 return clipPolygonOnPolyPolygon(rCandidate, B2DPolyPolygon(aClip), bInside, bStroke);
             }
 
@@ -337,10 +337,10 @@ namespace basegfx
             }
             else
             {
-                // for details, see comment in clipPolygonOnRange for the "cutting off
+                // for details, see comment in clipPolygonOnRange for the "cutting off 
                 // the outer parts of filled polygons at parallell lines" explanations
                 const B2DPolygon aClip(createPolygonFromRect(rRange));
-
+                
                 return clipPolyPolygonOnPolyPolygon(rCandidate, B2DPolyPolygon(aClip), bInside, bStroke);
             }
 
@@ -418,7 +418,7 @@ namespace basegfx
         B2DPolyPolygon clipPolyPolygonOnPolyPolygon(const B2DPolyPolygon& rCandidate, const B2DPolyPolygon& rClip, bool bInside, bool bStroke)
         {
             B2DPolyPolygon aRetval;
-
+            
             if(rCandidate.count() && rClip.count())
             {
                 if(bStroke)
@@ -492,10 +492,10 @@ namespace basegfx
                     // area clipping
                     B2DPolyPolygon aMergePolyPolygonA(rClip);
 
-                    // First solve all polygon-self and polygon-polygon intersections.
-                    // Also get rid of some not-needed polygons (neutral, no area -> when
+                    // First solve all polygon-self and polygon-polygon intersections. 
+                    // Also get rid of some not-needed polygons (neutral, no area -> when 
                     // no intersections, these are tubes).
-                    // Now it is possible to correct the orientations in the cut-free
+                    // Now it is possible to correct the orientations in the cut-free 
                     // polygons to values corresponding to painting the PolyPolygon with
                     // a XOR-WindingRule.
                     aMergePolyPolygonA = solveCrossovers(aMergePolyPolygonA);
@@ -574,28 +574,28 @@ namespace basegfx
         *
         */
         struct scissor_plane {
-            double nx,ny;           // plane normal
-            double d;               // [-] minimum distance from origin
-            sal_uInt32 clipmask;    // clipping mask, e.g. 1000 1000
+            double nx,ny;			// plane normal
+            double d;				// [-] minimum distance from origin
+            sal_uInt32 clipmask;	// clipping mask, e.g. 1000 1000
         };
 
         /*
         *
         * polygon clipping rules  (straight out of Foley and Van Dam)
         * ===========================================================
-        * current   |next       |emit
+        * current	|next		|emit
         * ____________________________________
-        * inside    |inside     |next
-        * inside    |outside    |intersect with clip plane
-        * outside   |outside    |nothing
-        * outside   |inside     |intersect with clip plane follwed by next
+        * inside	|inside		|next
+        * inside	|outside	|intersect with clip plane
+        * outside	|outside	|nothing
+        * outside	|inside		|intersect with clip plane follwed by next
         *
         */
-        sal_uInt32 scissorLineSegment( ::basegfx::B2DPoint           *in_vertex,    // input buffer
-                                       sal_uInt32                     in_count,     // number of verts in input buffer
-                                       ::basegfx::B2DPoint           *out_vertex,   // output buffer
-                                       scissor_plane                 *pPlane,       // scissoring plane
-                                       const ::basegfx::B2DRectangle &rR )          // clipping rectangle
+        sal_uInt32 scissorLineSegment( ::basegfx::B2DPoint			 *in_vertex,	// input buffer
+                                       sal_uInt32					  in_count,		// number of verts in input buffer
+                                       ::basegfx::B2DPoint			 *out_vertex,	// output buffer
+                                       scissor_plane				 *pPlane,		// scissoring plane
+                                       const ::basegfx::B2DRectangle &rR )			// clipping rectangle
         {
             ::basegfx::B2DPoint *curr;
             ::basegfx::B2DPoint *next;
@@ -604,7 +604,7 @@ namespace basegfx
 
             // process all the verts
             for(sal_uInt32 i=0; i<in_count; i++) {
-
+                    
                 // vertices are relative to the coordinate
                 // system defined by the rectangle.
                 curr = &in_vertex[i];
@@ -662,7 +662,7 @@ namespace basegfx
             return out_count;
         }
 
-        B2DPolygon clipTriangleListOnRange( const B2DPolygon& rCandidate,
+        B2DPolygon clipTriangleListOnRange( const B2DPolygon& rCandidate, 
                                             const B2DRange&   rRange )
         {
             B2DPolygon aResult;
@@ -698,13 +698,13 @@ namespace basegfx
                     ////////////////////////////////////////////////////////////////////////
                     ////////////////////////////////////////////////////////////////////////
                     ////////////////////////////////////////////////////////////////////////
-                    //
+                    // 
                     // Upper bound for the maximal number of vertices when intersecting an
                     // axis-aligned rectangle with a triangle in E2
-                    //
+                    // 
                     // The rectangle and the triangle are in general position, and have 4 and 3
                     // vertices, respectively.
-                    //
+                    // 
                     //   Lemma: Since the rectangle is a convex polygon ( see
                     //   http://mathworld.wolfram.com/ConvexPolygon.html for a definition), and
                     //   has no holes, it follows that any straight line will intersect the
@@ -716,7 +716,7 @@ namespace basegfx
                     //   other 'outside') will at utmost add _one_  vertex to the resulting
                     //   intersection polygon (adding two intersection vertices, and removing at
                     //   least one rectangle vertex):
-                    //
+                    // 
                     //         *
                     //     +--+-----------------+
                     //     | *                  |
@@ -725,7 +725,7 @@ namespace basegfx
                     //    *|                    |
                     //   * |                    |
                     //     +--------------------+
-                    //
+                    // 
                     //   Proof: If the straight line intersects the rectangle two
                     //   times, it does so for distinct edges, i.e. the intersection has
                     //   minimally one of the rectangle's vertices on either side of the straight
@@ -733,17 +733,17 @@ namespace basegfx
                     //   minimally _one_ rectangle vertex removed from the resulting clip
                     //   polygon, and therefore, a clip against a half-plane has the net effect
                     //   of adding at utmost _one_ vertex to the resulting clip polygon.
-                    //
+                    // 
                     // Theorem: The intersection of a rectangle and a triangle results in a
                     // polygon with at utmost 7 vertices.
-                    //
+                    // 
                     // Proof: The inside of the triangle can be described as the consecutive
                     // intersection with three half-planes. Together with the lemma above, this
                     // results in at utmost 3 additional vertices added to the already existing 4
                     // rectangle vertices.
-                    //
+                    // 
                     // This upper bound is attained with the following example configuration:
-                    //
+                    // 
                     //                               *
                     //                             ***
                     //                           ** *
@@ -765,7 +765,7 @@ namespace basegfx
                     //     --*6-----5-----
                     //         **  *
                     //           **
-                    //
+                    // 
                     // As we need to scissor all triangles against the
                     // output rectangle we employ an output buffer for the
                     // resulting vertices.  the question is how large this
@@ -800,7 +800,7 @@ namespace basegfx
                     ::basegfx::B2DPoint stack[3];
                     unsigned int clipflag = 0;
 
-                    for(sal_uInt32 nIndex=0; nIndex<nVertexCount; ++nIndex)
+                    for(sal_uInt32 nIndex=0; nIndex<nVertexCount; ++nIndex) 
                     {
                         // rotate stack
                         stack[0] = stack[1];
@@ -810,14 +810,14 @@ namespace basegfx
                         // clipping judgement
                         clipflag |= !(rRange.isInside(stack[2]));
 
-                        if(nIndex > 1)
+                        if(nIndex > 1) 
                         {
                             // consume vertices until a single seperate triangle has been visited.
-                            if(!((nIndex+1)%3))
+                            if(!((nIndex+1)%3)) 
                             {
                                 // if any of the last three vertices was outside
                                 // we need to scissor against the destination rectangle
-                                if(clipflag & 7)
+                                if(clipflag & 7) 
                                 {
                                     ::basegfx::B2DPoint buf0[16];
                                     ::basegfx::B2DPoint buf1[16];
@@ -831,12 +831,12 @@ namespace basegfx
                                     vertex_count = scissorLineSegment(buf0,vertex_count,buf1,&sp[2],rRange);
                                     vertex_count = scissorLineSegment(buf1,vertex_count,buf0,&sp[3],rRange);
 
-                                    if(vertex_count >= 3)
+                                    if(vertex_count >= 3) 
                                     {
                                         // convert triangle fan back to triangle list.
                                         ::basegfx::B2DPoint v0(buf0[0]);
                                         ::basegfx::B2DPoint v1(buf0[1]);
-                                        for(sal_uInt32 i=2; i<vertex_count; ++i)
+                                        for(sal_uInt32 i=2; i<vertex_count; ++i) 
                                         {
                                             ::basegfx::B2DPoint v2(buf0[i]);
                                             aResult.append(v0);
@@ -846,10 +846,10 @@ namespace basegfx
                                         }
                                     }
                                 }
-                                else
+                                else 
                                 {
                                     // the last triangle has not been altered, simply copy to result
-                                    for(sal_uInt32 i=0; i<3; ++i)
+                                    for(sal_uInt32 i=0; i<3; ++i) 
                                         aResult.append(stack[i]);
                                 }
                             }
diff --git a/basegfx/source/polygon/b2dpolygoncutandtouch.cxx b/basegfx/source/polygon/b2dpolygoncutandtouch.cxx
index e03aadfe1577..d84409146b01 100644
--- a/basegfx/source/polygon/b2dpolygoncutandtouch.cxx
+++ b/basegfx/source/polygon/b2dpolygoncutandtouch.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
@@ -43,7 +43,7 @@
 //////////////////////////////////////////////////////////////////////////////
 // defines
 
-#define SUBDIVIDE_FOR_CUT_TEST_COUNT        (50)
+#define	SUBDIVIDE_FOR_CUT_TEST_COUNT		(50)
 
 //////////////////////////////////////////////////////////////////////////////
 
@@ -55,13 +55,13 @@ namespace basegfx
 
         class temporaryPoint
         {
-            B2DPoint                            maPoint;        // the new point
-            sal_uInt32                          mnIndex;        // index after which to insert
-            double                              mfCut;          // parametric cut description [0.0 .. 1.0]
+            B2DPoint							maPoint;		// the new point
+            sal_uInt32							mnIndex;		// index after which to insert
+            double								mfCut;			// parametric cut description [0.0 .. 1.0]
 
         public:
             temporaryPoint(const B2DPoint& rNewPoint, sal_uInt32 nIndex, double fCut)
-            :   maPoint(rNewPoint),
+            :	maPoint(rNewPoint),
                 mnIndex(nIndex),
                 mfCut(fCut)
             {
@@ -90,9 +90,9 @@ namespace basegfx
 
         class temporaryPolygonData
         {
-            B2DPolygon                              maPolygon;
-            B2DRange                                maRange;
-            temporaryPointVector                    maPoints;
+            B2DPolygon								maPolygon;
+            B2DRange								maRange;
+            temporaryPointVector					maPoints;
 
         public:
             const B2DPolygon& getPolygon() const { return maPolygon; }
@@ -126,12 +126,12 @@ namespace basegfx
 
                     // add start point
                     aRetval.append(rCandidate.getB2DPoint(0));
-
+                    
                     for(sal_uInt32 a(0L); a < nCount; a++)
                     {
                         // get edge
                         rCandidate.getBezierSegment(a, aEdge);
-
+                        
                         if(aEdge.isBezier())
                         {
                             // control vectors involved for this edge
@@ -171,7 +171,7 @@ namespace basegfx
                                     aRetval.append(aNewPoint);
                                 }
                             }
-
+                            
                             // add edge end point
                             aRetval.append(aEdge.getEndPoint());
                         }
@@ -183,7 +183,7 @@ namespace basegfx
                     // set closed flag and correct last point (which is added double now).
                     tools::closeWithGeometryChange(aRetval);
                 }
-
+                
                 return aRetval;
             }
             else
@@ -238,8 +238,8 @@ namespace basegfx
         ////////////////////////////////////////////////////////////////////////////////
 
         void findEdgeCutsTwoEdges(
-            const B2DPoint& rCurrA, const B2DPoint& rNextA,
-            const B2DPoint& rCurrB, const B2DPoint& rNextB,
+            const B2DPoint& rCurrA, const B2DPoint& rNextA, 
+            const B2DPoint& rCurrB, const B2DPoint& rNextB, 
             sal_uInt32 nIndA, sal_uInt32 nIndB,
             temporaryPointVector& rTempPointsA, temporaryPointVector& rTempPointsB)
         {
@@ -415,7 +415,7 @@ namespace basegfx
 
         void findEdgeCutsBezierAndEdge(
             const B2DCubicBezier& rCubicA,
-            const B2DPoint& rCurrB, const B2DPoint& rNextB,
+            const B2DPoint& rCurrB, const B2DPoint& rNextB, 
             sal_uInt32 nIndA, sal_uInt32 nIndB,
             temporaryPointVector& rTempPointsA, temporaryPointVector& rTempPointsB)
         {
@@ -429,7 +429,7 @@ namespace basegfx
 
             // create subdivided polygons and find cuts between them
             // Keep adaptiveSubdivideByCount due to needed quality
-            aTempPolygonA.reserve(SUBDIVIDE_FOR_CUT_TEST_COUNT + 8);
+            aTempPolygonA.reserve(SUBDIVIDE_FOR_CUT_TEST_COUNT + 8); 
             aTempPolygonA.append(rCubicA.getStartPoint());
             rCubicA.adaptiveSubdivideByCount(aTempPolygonA, SUBDIVIDE_FOR_CUT_TEST_COUNT);
             aTempPolygonEdge.append(rCurrB);
@@ -470,10 +470,10 @@ namespace basegfx
 
             // create subdivided polygons and find cuts between them
             // Keep adaptiveSubdivideByCount due to needed quality
-            aTempPolygonA.reserve(SUBDIVIDE_FOR_CUT_TEST_COUNT + 8);
+            aTempPolygonA.reserve(SUBDIVIDE_FOR_CUT_TEST_COUNT + 8); 
             aTempPolygonA.append(rCubicA.getStartPoint());
             rCubicA.adaptiveSubdivideByCount(aTempPolygonA, SUBDIVIDE_FOR_CUT_TEST_COUNT);
-            aTempPolygonB.reserve(SUBDIVIDE_FOR_CUT_TEST_COUNT + 8);
+            aTempPolygonB.reserve(SUBDIVIDE_FOR_CUT_TEST_COUNT + 8); 
             aTempPolygonB.append(rCubicB.getStartPoint());
             rCubicB.adaptiveSubdivideByCount(aTempPolygonB, SUBDIVIDE_FOR_CUT_TEST_COUNT);
 
@@ -514,7 +514,7 @@ namespace basegfx
 
             // create subdivided polygon and find cuts on it
             // Keep adaptiveSubdivideByCount due to needed quality
-            aTempPolygon.reserve(SUBDIVIDE_FOR_CUT_TEST_COUNT + 8);
+            aTempPolygon.reserve(SUBDIVIDE_FOR_CUT_TEST_COUNT + 8); 
             aTempPolygon.append(rCubicA.getStartPoint());
             rCubicA.adaptiveSubdivideByCount(aTempPolygon, SUBDIVIDE_FOR_CUT_TEST_COUNT);
             findCuts(aTempPolygon, aTempPointVector);
@@ -594,7 +594,7 @@ namespace basegfx
                                     else
                                     {
                                         // test for simple edge-edge cuts
-                                        findEdgeCutsTwoEdges(aCubicA.getStartPoint(), aCubicA.getEndPoint(), aCubicB.getStartPoint(), aCubicB.getEndPoint(),
+                                        findEdgeCutsTwoEdges(aCubicA.getStartPoint(), aCubicA.getEndPoint(), aCubicB.getStartPoint(), aCubicB.getEndPoint(), 
                                             a, b, rTempPoints, rTempPoints);
                                     }
                                 }
@@ -615,7 +615,7 @@ namespace basegfx
                             {
                                 const B2DPoint aNextB(rCandidate.getB2DPoint(b + 1L == nPointCount ? 0L : b + 1L));
                                 const B2DRange aRangeB(aCurrB, aNextB);
-
+                                
                                 // consecutive segments touch of course
                                 bool bOverlap = false;
                                 if( b > a+1)
@@ -626,7 +626,7 @@ namespace basegfx
                                 {
                                     findEdgeCutsTwoEdges(aCurrA, aNextA, aCurrB, aNextB, a, b, rTempPoints, rTempPoints);
                                 }
-
+                                
                                 // prepare next step
                                 aCurrB = aNextB;
                             }
@@ -653,13 +653,13 @@ namespace basegfx
         ////////////////////////////////////////////////////////////////////////////////
 
         void findTouchesOnEdge(
-            const B2DPoint& rCurr, const B2DPoint& rNext, const B2DPolygon& rPointPolygon,
+            const B2DPoint& rCurr, const B2DPoint& rNext, const B2DPolygon& rPointPolygon, 
             sal_uInt32 nInd, temporaryPointVector& rTempPoints)
         {
             // find out if points from rPointPolygon are positioned on given edge. If Yes, add
             // points there to represent touches (which may be enter or leave nodes later).
             const sal_uInt32 nPointCount(rPointPolygon.count());
-
+            
             if(nPointCount)
             {
                 const B2DRange aRange(rCurr, rNext);
@@ -667,7 +667,7 @@ namespace basegfx
                 B2DVector aNormalizedEdgeVector(aEdgeVector);
                 aNormalizedEdgeVector.normalize();
                 bool bTestUsingX(fabs(aEdgeVector.getX()) > fabs(aEdgeVector.getY()));
-
+                
                 for(sal_uInt32 a(0L); a < nPointCount; a++)
                 {
                     const B2DPoint aTestPoint(rPointPolygon.getB2DPoint(a));
@@ -680,7 +680,7 @@ namespace basegfx
 
                             if(areParallel(aNormalizedEdgeVector, aTestVector))
                             {
-                                const double fCut((bTestUsingX)
+                                const double fCut((bTestUsingX) 
                                     ? aTestVector.getX() / aEdgeVector.getX()
                                     : aTestVector.getY() / aEdgeVector.getY());
                                 const double fZero(0.0);
@@ -700,7 +700,7 @@ namespace basegfx
         ////////////////////////////////////////////////////////////////////////////////
 
         void findTouchesOnCurve(
-            const B2DCubicBezier& rCubicA, const B2DPolygon& rPointPolygon,
+            const B2DCubicBezier& rCubicA, const B2DPolygon& rPointPolygon, 
             sal_uInt32 nInd, temporaryPointVector& rTempPoints)
         {
             // find all points from rPointPolygon which touch the given bezier segment. Add an entry
@@ -711,7 +711,7 @@ namespace basegfx
 
             // create subdivided polygon and find cuts on it
             // Keep adaptiveSubdivideByCount due to needed quality
-            aTempPolygon.reserve(SUBDIVIDE_FOR_CUT_TEST_COUNT + 8);
+            aTempPolygon.reserve(SUBDIVIDE_FOR_CUT_TEST_COUNT + 8); 
             aTempPolygon.append(rCubicA.getStartPoint());
             rCubicA.adaptiveSubdivideByCount(aTempPolygon, SUBDIVIDE_FOR_CUT_TEST_COUNT);
             findTouches(aTempPolygon, rPointPolygon, aTempPointVector);
@@ -787,7 +787,7 @@ namespace basegfx
 
         void findCuts(const B2DPolygon& rCandidateA, const B2DPolygon& rCandidateB, temporaryPointVector& rTempPointsA, temporaryPointVector& rTempPointsB)
         {
-            // find out if edges from both polygons cut. If so, add entries to rTempPoints which
+            // find out if edges from both polygons cut. If so, add entries to rTempPoints which 
             // should be added to the polygons accordingly
             const sal_uInt32 nPointCountA(rCandidateA.count());
             const sal_uInt32 nPointCountB(rCandidateB.count());
@@ -846,7 +846,7 @@ namespace basegfx
                                     else
                                     {
                                         // test for simple edge-edge cuts
-                                        findEdgeCutsTwoEdges(aCubicA.getStartPoint(), aCubicA.getEndPoint(), aCubicB.getStartPoint(), aCubicB.getEndPoint(),
+                                        findEdgeCutsTwoEdges(aCubicA.getStartPoint(), aCubicA.getEndPoint(), aCubicB.getStartPoint(), aCubicB.getEndPoint(), 
                                             a, b, rTempPointsA, rTempPointsB);
                                     }
                                 }
@@ -910,7 +910,7 @@ namespace basegfx
             if(rCandidate.count())
             {
                 temporaryPointVector aTempPoints;
-
+                
                 findTouches(rCandidate, rCandidate, aTempPoints);
                 findCuts(rCandidate, aTempPoints);
 
@@ -1015,11 +1015,11 @@ namespace basegfx
             {
                 temporaryPointVector aTempPoints;
                 temporaryPointVector aTempPointsUnused;
-
+                
                 for(sal_uInt32 a(0L); a < rMask.count(); a++)
                 {
                     const B2DPolygon aPartMask(rMask.getB2DPolygon(a));
-
+                    
                     findTouches(rCandidate, aPartMask, aTempPoints);
                     findCuts(rCandidate, aPartMask, aTempPoints, aTempPointsUnused);
                 }
@@ -1051,7 +1051,7 @@ namespace basegfx
         B2DPolygon addPointsAtCuts(const B2DPolygon& rCandidate, const B2DPoint& rStart, const B2DPoint& rEnd)
         {
             const sal_uInt32 nCount(rCandidate.count());
-
+            
             if(nCount && !rStart.equal(rEnd))
             {
                 const B2DRange aPolygonRange(rCandidate.getB2DRange());
@@ -1113,7 +1113,7 @@ namespace basegfx
         {
             const sal_uInt32 nCountA(rCandidate.count());
             const sal_uInt32 nCountM(rPolyMask.count());
-
+            
             if(nCountA && nCountM)
             {
                 const B2DRange aRangeA(rCandidate.getB2DRange());
@@ -1207,7 +1207,7 @@ namespace basegfx
             if(rCandidate.count())
             {
                 temporaryPointVector aTempPoints;
-
+                
                 findCuts(rCandidate, aTempPoints);
 
                 return mergeTemporaryPointsAndPolygon(rCandidate, aTempPoints);
diff --git a/basegfx/source/polygon/b2dpolygontools.cxx b/basegfx/source/polygon/b2dpolygontools.cxx
index e9db491ecd48..476fa1c82b67 100644
--- a/basegfx/source/polygon/b2dpolygontools.cxx
+++ b/basegfx/source/polygon/b2dpolygontools.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
@@ -46,10 +46,10 @@
 #include <numeric>
 #include <limits>
 
-// #i37443#
-#define ANGLE_BOUND_START_VALUE     (2.25)
-#define ANGLE_BOUND_MINIMUM_VALUE   (0.1)
-#define COUNT_SUBDIVIDE_DEFAULT     (4L)
+// #i37443# 
+#define ANGLE_BOUND_START_VALUE		(2.25)
+#define ANGLE_BOUND_MINIMUM_VALUE	(0.1)
+#define COUNT_SUBDIVIDE_DEFAULT		(4L)
 #ifdef DBG_UTIL
 static double fAngleBoundStartValue = ANGLE_BOUND_START_VALUE;
 #endif
@@ -102,7 +102,7 @@ namespace basegfx
         {
             // #i80172# Removed unnecessary assertion
             // OSL_ENSURE(!rCandidate.isClosed(), "checkClosed: already closed (!)");
-
+            
             if(rCandidate.count() > 1 && rCandidate.getB2DPoint(0) == rCandidate.getB2DPoint(rCandidate.count() - 1))
             {
                 closeWithGeometryChange(rCandidate);
@@ -190,13 +190,13 @@ namespace basegfx
                     const sal_uInt32 nEdgeCount(rCandidate.isClosed() ? nPointCount : nPointCount - 1);
                     B2DCubicBezier aBezier;
                     aBezier.setStartPoint(rCandidate.getB2DPoint(0));
-
+                    
                     // perf: try to avoid too many realloctions by guessing the result's pointcount
                     aRetval.reserve(nPointCount*4);
-
+                    
                     // add start point (always)
                     aRetval.append(aBezier.getStartPoint());
-
+                    
                     for(sal_uInt32 a(0L); a < nEdgeCount; a++)
                     {
                         // get next and control points
@@ -273,13 +273,13 @@ namespace basegfx
                     const sal_uInt32 nEdgeCount(rCandidate.isClosed() ? nPointCount : nPointCount - 1);
                     B2DCubicBezier aBezier;
                     aBezier.setStartPoint(rCandidate.getB2DPoint(0));
-
+                    
                     // perf: try to avoid too many realloctions by guessing the result's pointcount
                     aRetval.reserve(nPointCount*4);
-
+                    
                     // add start point (always)
                     aRetval.append(aBezier.getStartPoint());
-
+                    
                     // #i37443# prepare convenient AngleBound if none was given
                     if(0.0 == fAngleBound)
                     {
@@ -293,7 +293,7 @@ namespace basegfx
                     {
                         fAngleBound = 0.1;
                     }
-
+                    
                     for(sal_uInt32 a(0L); a < nEdgeCount; a++)
                     {
                         // get next and control points
@@ -346,19 +346,19 @@ namespace basegfx
                     const sal_uInt32 nEdgeCount(rCandidate.isClosed() ? nPointCount : nPointCount - 1);
                     B2DCubicBezier aBezier;
                     aBezier.setStartPoint(rCandidate.getB2DPoint(0));
-
+    
                     // perf: try to avoid too many realloctions by guessing the result's pointcount
                     aRetval.reserve(nPointCount*4);
-
+                    
                     // add start point (always)
                     aRetval.append(aBezier.getStartPoint());
-
+                
                     // #i37443# prepare convenient count if none was given
                     if(0L == nCount)
                     {
                         nCount = COUNT_SUBDIVIDE_DEFAULT;
                     }
-
+                    
                     for(sal_uInt32 a(0L); a < nEdgeCount; a++)
                     {
                         // get next and control points
@@ -419,7 +419,7 @@ namespace basegfx
                     {
                         const B2DPoint aPreviousPoint(aCurrentPoint);
                         aCurrentPoint = aCandidate.getB2DPoint(a);
-
+                        
                         // cross-over in Y?
                         const bool bCompYA(fTools::more(aPreviousPoint.getY(), rPoint.getY()));
                         const bool bCompYB(fTools::more(aCurrentPoint.getY(), rPoint.getY()));
@@ -429,7 +429,7 @@ namespace basegfx
                             // cross-over in X?
                             const bool bCompXA(fTools::more(aPreviousPoint.getX(), rPoint.getX()));
                             const bool bCompXB(fTools::more(aCurrentPoint.getX(), rPoint.getX()));
-
+                        
                             if(bCompXA == bCompXB)
                             {
                                 if(bCompXA)
@@ -488,7 +488,7 @@ namespace basegfx
                 for(sal_uInt32 a(0); a < nPointCount; a++)
                 {
                     aRetval.expand(rCandidate.getB2DPoint(a));
-
+                    
                     if(bControlPointsUsed)
                     {
                         aRetval.expand(rCandidate.getNextControlPoint(a));
@@ -592,7 +592,7 @@ namespace basegfx
         {
             double fRetval(0.0);
             const sal_uInt32 nPointCount(rCandidate.count());
-
+            
             if(nPointCount)
             {
                 const sal_uInt32 nEdgeCount(rCandidate.isClosed() ? nPointCount : nPointCount - 1L);
@@ -742,7 +742,7 @@ namespace basegfx
                         {
                             // get as bezier segment
                             const B2DCubicBezier aBezierSegment(
-                                aRetval, rCandidate.getNextControlPoint(nIndex),
+                                aRetval, rCandidate.getNextControlPoint(nIndex), 
                                 rCandidate.getPrevControlPoint(nNextIndex), aNextPoint);
 
                             if(aBezierSegment.isBezier())
@@ -751,12 +751,12 @@ namespace basegfx
                                 // length and bezier distances
                                 const B2DCubicBezierHelper aBezierSegmentHelper(aBezierSegment);
                                 const double fBezierDistance(aBezierSegmentHelper.distanceToRelative(fDistance));
-
+                                
                                 aRetval = aBezierSegment.interpolatePoint(fBezierDistance);
                                 bDone = true;
                             }
                         }
-
+                        
                         if(!bDone)
                         {
                             const double fRelativeInEdge(fDistance / fEdgeLength);
@@ -848,7 +848,7 @@ namespace basegfx
                                 if(fTools::equalZero(fEdgeLength))
                                 {
                                     aRetval.append(rCandidate.getB2DPoint(a));
-
+                                    
                                     if(rCandidate.areControlPointsUsed())
                                     {
                                         aRetval.setNextControlPoint(aRetval.count() - 1, rCandidate.getNextControlPoint(a));
@@ -860,11 +860,11 @@ namespace basegfx
                                     const B2DPoint aStart(rCandidate.getB2DPoint(a));
                                     const B2DPoint aEnd(rCandidate.getB2DPoint(nNextIndex));
                                     bool bDone(false);
-
+                                    
                                     if(rCandidate.areControlPointsUsed())
                                     {
                                         const B2DCubicBezier aBezierSegment(
-                                            aStart, rCandidate.getNextControlPoint(a),
+                                            aStart, rCandidate.getNextControlPoint(a), 
                                             rCandidate.getPrevControlPoint(nNextIndex), aEnd);
 
                                         if(aBezierSegment.isBezier())
@@ -881,7 +881,7 @@ namespace basegfx
                                             bDone = true;
                                         }
                                     }
-
+                                    
                                     if(!bDone)
                                     {
                                         const double fRelValue((fFrom - fPositionOfStart) / fEdgeLength);
@@ -906,7 +906,7 @@ namespace basegfx
                             {
                                 const sal_uInt32 nNextIndex((a + 1) % nPointCount);
                                 aRetval.append(rCandidate.getB2DPoint(nNextIndex));
-
+                                
                                 if(rCandidate.areControlPointsUsed())
                                 {
                                     aRetval.setPrevControlPoint(aRetval.count() - 1, rCandidate.getPrevControlPoint(nNextIndex));
@@ -918,11 +918,11 @@ namespace basegfx
                                 const B2DPoint aStart(rCandidate.getB2DPoint(a));
                                 const B2DPoint aEnd(rCandidate.getB2DPoint(nNextIndex));
                                 bool bDone(false);
-
+                                
                                 if(rCandidate.areControlPointsUsed())
                                 {
                                     const B2DCubicBezier aBezierSegment(
-                                        aStart, rCandidate.getNextControlPoint(a),
+                                        aStart, rCandidate.getNextControlPoint(a), 
                                         rCandidate.getPrevControlPoint(nNextIndex), aEnd);
 
                                     if(aBezierSegment.isBezier())
@@ -957,7 +957,7 @@ namespace basegfx
                                 // add segments end point
                                 const sal_uInt32 nNextIndex((a + 1) % nPointCount);
                                 aRetval.append(rCandidate.getB2DPoint(nNextIndex));
-
+                                
                                 if(rCandidate.areControlPointsUsed())
                                 {
                                     aRetval.setPrevControlPoint(aRetval.count() - 1, rCandidate.getPrevControlPoint(nNextIndex));
@@ -993,8 +993,8 @@ namespace basegfx
 
         CutFlagValue findCut(
             const B2DPolygon& rCandidate,
-            sal_uInt32 nIndex1, sal_uInt32 nIndex2,
-            CutFlagValue aCutFlags,
+            sal_uInt32 nIndex1, sal_uInt32 nIndex2, 
+            CutFlagValue aCutFlags, 
             double* pCut1, double* pCut2)
         {
             CutFlagValue aRetval(CUTFLAG_NONE);
@@ -1024,7 +1024,7 @@ namespace basegfx
         CutFlagValue findCut(
             const B2DPolygon& rCandidate1, sal_uInt32 nIndex1,
             const B2DPolygon& rCandidate2, sal_uInt32 nIndex2,
-            CutFlagValue aCutFlags,
+            CutFlagValue aCutFlags, 
             double* pCut1, double* pCut2)
         {
             CutFlagValue aRetval(CUTFLAG_NONE);
@@ -1064,7 +1064,7 @@ namespace basegfx
             bool bFinished(!((bool)(aCutFlags & CUTFLAG_ALL)));
 
             // test for same points?
-            if(!bFinished
+            if(!bFinished 
                 && (aCutFlags & (CUTFLAG_START1|CUTFLAG_END1))
                 && (aCutFlags & (CUTFLAG_START2|CUTFLAG_END2)))
             {
@@ -1132,7 +1132,7 @@ namespace basegfx
                         aRetval = (CUTFLAG_LINE|CUTFLAG_START1);
                     }
                 }
-
+                
                 if(!bFinished && (aCutFlags & CUTFLAG_START2))
                 {
                     // start2 on line 1 ?
@@ -1154,7 +1154,7 @@ namespace basegfx
                         aRetval = (CUTFLAG_LINE|CUTFLAG_END1);
                     }
                 }
-
+                
                 if(!bFinished && (aCutFlags & CUTFLAG_END2))
                 {
                     // end2 on line 1 ?
@@ -1223,8 +1223,8 @@ namespace basegfx
 
         bool isPointOnEdge(
             const B2DPoint& rPoint,
-            const B2DPoint& rEdgeStart,
-            const B2DVector& rEdgeDelta,
+            const B2DPoint& rEdgeStart, 
+            const B2DVector& rEdgeDelta, 
             double* pCut)
         {
             bool bDeltaXIsZero(fTools::equalZero(rEdgeDelta.getX()));
@@ -1367,7 +1367,7 @@ namespace basegfx
                                     const double fBezierSplitStart(aCubicBezierHelper.distanceToRelative(fLastDotDashMovingLength));
                                     const double fBezierSplitEnd(aCubicBezierHelper.distanceToRelative(fDotDashMovingLength));
                                     B2DCubicBezier aBezierSnippet(aCurrentEdge.snippet(fBezierSplitStart, fBezierSplitEnd));
-
+                                    
                                     if(!aSnippet.count())
                                     {
                                         aSnippet.append(aBezierSnippet.getStartPoint());
@@ -1386,7 +1386,7 @@ namespace basegfx
 
                                     aSnippet.clear();
                                 }
-
+                                
                                 // prepare next DotDashArray step and flip line/gap flag
                                 fLastDotDashMovingLength = fDotDashMovingLength;
                                 fDotDashMovingLength += rDotDashArray[(++nDotDashIndex) % nDotDashCount];
@@ -1396,14 +1396,14 @@ namespace basegfx
                             // append closing snippet [fLastDotDashMovingLength, fEdgeLength]
                             const bool bHandleLine(bIsLine && pLineTarget);
                             const bool bHandleGap(!bIsLine && pGapTarget);
-
+                            
                             if(bHandleLine || bHandleGap)
                             {
                                 B2DCubicBezier aRight;
                                 const double fBezierSplit(aCubicBezierHelper.distanceToRelative(fLastDotDashMovingLength));
 
                                 aCurrentEdge.split(fBezierSplit, 0, &aRight);
-
+                                
                                 if(!aSnippet.count())
                                 {
                                     aSnippet.append(aRight.getStartPoint());
@@ -1411,7 +1411,7 @@ namespace basegfx
 
                                 aSnippet.appendBezierSegment(aRight.getControlPointA(), aRight.getControlPointB(), aRight.getEndPoint());
                             }
-
+                            
                             // prepare move to next edge
                             fDotDashMovingLength -= fEdgeLength;
                         }
@@ -1449,7 +1449,7 @@ namespace basegfx
 
                                     aSnippet.clear();
                                 }
-
+                                
                                 // prepare next DotDashArray step and flip line/gap flag
                                 fLastDotDashMovingLength = fDotDashMovingLength;
                                 fDotDashMovingLength += rDotDashArray[(++nDotDashIndex) % nDotDashCount];
@@ -1459,7 +1459,7 @@ namespace basegfx
                             // append snippet [fLastDotDashMovingLength, fEdgeLength]
                             const bool bHandleLine(bIsLine && pLineTarget);
                             const bool bHandleGap(!bIsLine && pGapTarget);
-
+                            
                             if(bHandleLine || bHandleGap)
                             {
                                 if(!aSnippet.count())
@@ -1469,12 +1469,12 @@ namespace basegfx
 
                                 aSnippet.append(aCurrentEdge.getEndPoint());
                             }
-
+                            
                             // prepare move to next edge
                             fDotDashMovingLength -= fEdgeLength;
                         }
                     }
-
+                    
                     // prepare next edge step (end point gets new start point)
                     aCurrentEdge.setStartPoint(aCurrentEdge.getEndPoint());
                 }
@@ -1631,7 +1631,7 @@ namespace basegfx
             return false;
         }
 
-        // test if point is inside epsilon-range around the given Polygon. Can be used
+        // test if point is inside epsilon-range around the given Polygon. Can be used 
         // for HitTesting. The epsilon-range is defined to be the tube around the polygon
         // with distance fDistance and rounded edges (start and end point).
         bool isInEpsilonRange(const B2DPolygon& rCandidate, const B2DPoint& rTestPosition, double fDistance)
@@ -1639,7 +1639,7 @@ namespace basegfx
             // force to non-bezier polygon
             const B2DPolygon aCandidate(rCandidate.getDefaultAdaptiveSubdivision());
             const sal_uInt32 nPointCount(aCandidate.count());
-
+            
             if(nPointCount)
             {
                 const sal_uInt32 nEdgeCount(aCandidate.isClosed() ? nPointCount : nPointCount - 1L);
@@ -1831,7 +1831,7 @@ namespace basegfx
 
             // close
             aRetval.setClosed( true );
-
+            
             return aRetval;
         }
 
@@ -1849,7 +1849,7 @@ namespace basegfx
                 // close
                 aRetval.setClosed( true );
             }
-
+            
             return aRetval;
         }
 
@@ -1864,7 +1864,7 @@ namespace basegfx
             const double fKappa((M_SQRT2 - 1.0) * 4.0 / 3.0);
             const double fScaledKappa(fKappa * (1.0 / STEPSPERQUARTER));
             const B2DHomMatrix aRotateMatrix(createRotateB2DHomMatrix(F_PI2 / STEPSPERQUARTER));
-
+                
             B2DPoint aPoint(1.0, 0.0);
             B2DPoint aForward(1.0, fScaledKappa);
             B2DPoint aBackward(1.0, -fScaledKappa);
@@ -1900,7 +1900,7 @@ namespace basegfx
                 case 1 :
                 {
                     static B2DPolygon aUnitCircleStartQuadrantOne;
-
+                    
                     if(!aUnitCircleStartQuadrantOne.count())
                     {
                         ::osl::Mutex m_mutex;
@@ -1912,7 +1912,7 @@ namespace basegfx
                 case 2 :
                 {
                     static B2DPolygon aUnitCircleStartQuadrantTwo;
-
+                    
                     if(!aUnitCircleStartQuadrantTwo.count())
                     {
                         ::osl::Mutex m_mutex;
@@ -1924,7 +1924,7 @@ namespace basegfx
                 case 3 :
                 {
                     static B2DPolygon aUnitCircleStartQuadrantThree;
-
+                    
                     if(!aUnitCircleStartQuadrantThree.count())
                     {
                         ::osl::Mutex m_mutex;
@@ -1936,7 +1936,7 @@ namespace basegfx
                 default : // case 0 :
                 {
                     static B2DPolygon aUnitCircleStartQuadrantZero;
-
+                    
                     if(!aUnitCircleStartQuadrantZero.count())
                     {
                         ::osl::Mutex m_mutex;
@@ -1954,7 +1954,7 @@ namespace basegfx
             const B2DHomMatrix aMatrix(createScaleTranslateB2DHomMatrix(fRadiusX, fRadiusY, rCenter.getX(), rCenter.getY()));
 
             aRetval.transform(aMatrix);
-
+            
             return aRetval;
         }
 
@@ -2017,7 +2017,7 @@ namespace basegfx
                     double fSegEndRad((nStartSegment + 1) * fAnglePerSegment);
                     double fFactor(fScaledKappa * ((fSegEndRad - fStart) / fAnglePerSegment));
                     B2DPoint aSegEnd(cos(fSegEndRad), sin(fSegEndRad));
-
+                
                     aRetval.appendBezierSegment(
                         aSegStart + (B2DPoint(-aSegStart.getY(), aSegStart.getX()) * fFactor),
                         aSegEnd - (B2DPoint(-aSegEnd.getY(), aSegEnd.getX()) * fFactor),
@@ -2045,7 +2045,7 @@ namespace basegfx
                     const double fSegStartRad(nSegment * fAnglePerSegment);
                     fFactor = fScaledKappa * ((fEnd - fSegStartRad) / fAnglePerSegment);
                     aSegEnd = B2DPoint(cos(fEnd), sin(fEnd));
-
+                    
                     aRetval.appendBezierSegment(
                         aSegStart + (B2DPoint(-aSegStart.getY(), aSegStart.getX()) * fFactor),
                         aSegEnd - (B2DPoint(-aSegEnd.getY(), aSegEnd.getX()) * fFactor),
@@ -2073,7 +2073,7 @@ namespace basegfx
         {
             OSL_ENSURE(!rCandidate.areControlPointsUsed(), "hasNeutralPoints: ATM works not for curves (!)");
             const sal_uInt32 nPointCount(rCandidate.count());
-
+            
             if(nPointCount > 2L)
             {
                 B2DPoint aPrevPoint(rCandidate.getB2DPoint(nPointCount - 1L));
@@ -2142,7 +2142,7 @@ namespace basegfx
 
                 // copy closed state
                 aRetval.setClosed(rCandidate.isClosed());
-
+    
                 return aRetval;
             }
             else
@@ -2225,7 +2225,7 @@ namespace basegfx
                 {
                     const double fZero(0.0);
                     const double fOne(1.0);
-                    const double fParamTestOnCurr(fabs(aEdgeVector.getX()) > fabs(aEdgeVector.getY())
+                    const double fParamTestOnCurr(fabs(aEdgeVector.getX()) > fabs(aEdgeVector.getY()) 
                         ? aTestVector.getX() / aEdgeVector.getX()
                         : aTestVector.getY() / aEdgeVector.getY());
 
@@ -2398,7 +2398,7 @@ namespace basegfx
                 if( !bNullVertex )
                 {
                     // 2D cross product - is 1 for CW and -1 for CCW turns
-                    const int nCrossProduct( nHorizontalEdgeType*nCurrVerticalEdgeType -
+                    const int nCrossProduct( nHorizontalEdgeType*nCurrVerticalEdgeType - 
                                              nVerticalEdgeType*nCurrHorizontalEdgeType );
 
                     if( !nCrossProduct )
@@ -2421,9 +2421,9 @@ namespace basegfx
                         if( (nCrossProduct == 1) != bCWPolygon )
                             return false;
                     }
-
+                    
                     ++nNumTurns;
-
+                    
                     // More than four 90 degree turns are an
                     // indication that this must not be a rectangle.
                     if( nNumTurns > 4 )
@@ -2431,9 +2431,9 @@ namespace basegfx
                 }
 
                 // store current state for the next turn
-                nVerticalEdgeType   = nCurrVerticalEdgeType;
+                nVerticalEdgeType	= nCurrVerticalEdgeType;
                 nHorizontalEdgeType = nCurrHorizontalEdgeType;
-                bNullVertex         = false; // won't reach this line,
+                bNullVertex		    = false; // won't reach this line,
                                              // if bCurrNullVertex is
                                              // true - see above
             }
@@ -2505,7 +2505,7 @@ namespace basegfx
                 const B2DVector aVector2(rTestPoint - rPointA);
                 const double fDividend((aVector2.getX() * aVector1.getX()) + (aVector2.getY() * aVector1.getY()));
                 const double fDivisor((aVector1.getX() * aVector1.getX()) + (aVector1.getY() * aVector1.getY()));
-
+                
                 rCut = fDividend / fDivisor;
 
                 const B2DPoint aCutPoint(rPointA + rCut * aVector1);
@@ -2671,7 +2671,7 @@ namespace basegfx
                         {
                             aRetval.setPrevControlPoint(a, distort(rCandidate.getPrevControlPoint(a), rOriginal, rTopLeft, rTopRight, rBottomLeft, rBottomRight));
                         }
-
+                        
                         if(!rCandidate.getNextControlPoint(a).equalZero())
                         {
                             aRetval.setNextControlPoint(a, distort(rCandidate.getNextControlPoint(a), rOriginal, rTopLeft, rTopRight, rBottomLeft, rBottomRight));
@@ -2798,7 +2798,7 @@ namespace basegfx
 
                             bRetval = true;
                         }
-
+                        
                         if(rCandidate.isNextControlPointUsed(nIndex))
                         {
                             if(!rCandidate.isClosed() && nIndex == nPointCount + 1)
@@ -2814,7 +2814,7 @@ namespace basegfx
 
                             bRetval = true;
                         }
-
+                        
                         break;
                     }
                     case CONTINUITY_C1 :
@@ -2829,7 +2829,7 @@ namespace basegfx
                             aVectorPrev.normalize();
                             aVectorNext.normalize();
                             const B2VectorOrientation aOrientation(getOrientation(aVectorPrev, aVectorNext));
-
+                            
                             if(ORIENTATION_NEUTRAL == aOrientation && aVectorPrev.scalar(aVectorNext) < 0.0)
                             {
                                 // parallel and opposite direction; check length
@@ -2840,9 +2840,9 @@ namespace basegfx
                                     const sal_uInt32 nNextIndex((nIndex + 1) % nPointCount);
                                     const double fLenPrevEdge(B2DVector(rCandidate.getB2DPoint(nPrevIndex) - aCurrentPoint).getLength() * (1.0 / 3.0));
                                     const double fLenNextEdge(B2DVector(rCandidate.getB2DPoint(nNextIndex) - aCurrentPoint).getLength() * (1.0 / 3.0));
-
-                                    rCandidate.setControlPoints(nIndex,
-                                        aCurrentPoint + (aVectorPrev * fLenPrevEdge),
+                                    
+                                    rCandidate.setControlPoints(nIndex, 
+                                        aCurrentPoint + (aVectorPrev * fLenPrevEdge), 
                                         aCurrentPoint + (aVectorNext * fLenNextEdge));
                                     bRetval = true;
                                 }
@@ -2854,14 +2854,14 @@ namespace basegfx
 
                                 if(ORIENTATION_POSITIVE == aOrientation)
                                 {
-                                    rCandidate.setControlPoints(nIndex,
-                                        aCurrentPoint - (aNormalizedPerpendicular * fLenPrev),
+                                    rCandidate.setControlPoints(nIndex, 
+                                        aCurrentPoint - (aNormalizedPerpendicular * fLenPrev), 
                                         aCurrentPoint + (aNormalizedPerpendicular * fLenNext));
                                 }
                                 else
                                 {
-                                    rCandidate.setControlPoints(nIndex,
-                                        aCurrentPoint + (aNormalizedPerpendicular * fLenPrev),
+                                    rCandidate.setControlPoints(nIndex, 
+                                        aCurrentPoint + (aNormalizedPerpendicular * fLenPrev), 
                                         aCurrentPoint - (aNormalizedPerpendicular * fLenNext));
                                 }
 
@@ -2881,14 +2881,14 @@ namespace basegfx
                             aVectorPrev.normalize();
                             aVectorNext.normalize();
                             const B2VectorOrientation aOrientation(getOrientation(aVectorPrev, aVectorNext));
-
+                            
                             if(ORIENTATION_NEUTRAL == aOrientation && aVectorPrev.scalar(aVectorNext) < 0.0)
                             {
                                 // parallel and opposite direction; set length. Use one direction for better numerical correctness
                                 const B2DVector aScaledDirection(aVectorPrev * fCommonLength);
 
                                 rCandidate.setControlPoints(nIndex,
-                                    aCurrentPoint + aScaledDirection,
+                                    aCurrentPoint + aScaledDirection, 
                                     aCurrentPoint - aScaledDirection);
                             }
                             else
@@ -2899,14 +2899,14 @@ namespace basegfx
 
                                 if(ORIENTATION_POSITIVE == aOrientation)
                                 {
-                                    rCandidate.setControlPoints(nIndex,
-                                        aCurrentPoint - aPerpendicular,
+                                    rCandidate.setControlPoints(nIndex, 
+                                        aCurrentPoint - aPerpendicular, 
                                         aCurrentPoint + aPerpendicular);
                                 }
                                 else
                                 {
-                                    rCandidate.setControlPoints(nIndex,
-                                        aCurrentPoint + aPerpendicular,
+                                    rCandidate.setControlPoints(nIndex, 
+                                        aCurrentPoint + aPerpendicular, 
                                         aCurrentPoint - aPerpendicular);
                                 }
                             }
@@ -3043,7 +3043,7 @@ namespace basegfx
                             {
                                 const double fSplitPoint(1.0 / b);
                                 B2DCubicBezier aLeftPart;
-
+                                
                                 aCurrentEdge.split(fSplitPoint, &aLeftPart, &aCurrentEdge);
                                 aRetval.appendBezierSegment(aLeftPart.getControlPointA(), aLeftPart.getControlPointB(), aLeftPart.getEndPoint());
                             }
@@ -3065,7 +3065,7 @@ namespace basegfx
                                 aCurrentEdge.setStartPoint(aSplitPoint);
                             }
                         }
-
+ 
                         // copy remaining segment to target
                         aRetval.append(aCurrentEdge.getEndPoint());
                     }
@@ -3114,14 +3114,14 @@ namespace basegfx
         }
 
         bool isPolyPolygonEqualRectangle( const B2DPolyPolygon& rPolyPoly,
-                                          const B2DRange&      rRect )
+                                          const B2DRange&	   rRect )
         {
             // exclude some cheap cases first
             if( rPolyPoly.count() != 1 )
                 return false;
 
             // fill array with rectangle vertices
-            const B2DPoint aPoints[] =
+            const B2DPoint aPoints[] = 
               {
                   B2DPoint(rRect.getMinX(),rRect.getMinY()),
                   B2DPoint(rRect.getMaxX(),rRect.getMinY()),
@@ -3142,9 +3142,9 @@ namespace basegfx
                 {
                     const B2DPoint p(rPoly.getB2DPoint(i));
 
-                    //     1 | x0 y0 1 |
+                    //	   1 | x0 y0 1 |
                     // A = - | x1 y1 1 |
-                    //     2 | x2 y2 1 |
+                    //	   2 | x2 y2 1 |
                     double fDoubleArea = p2.getX()*p.getY() -
                                          p2.getY()*p.getX() -
                                          p1.getX()*p.getY() +
@@ -3172,7 +3172,7 @@ namespace basegfx
         B2DPolygon createSimplifiedPolygon( const B2DPolygon& rCandidate )
         {
             const sal_uInt32 nCount(rCandidate.count());
-
+            
             if(nCount && rCandidate.areControlPointsUsed())
             {
                 const sal_uInt32 nEdgeCount(rCandidate.isClosed() ? nCount : nCount - 1);
@@ -3199,7 +3199,7 @@ namespace basegfx
                         {
                             // split off left, now extremum-free part and append
                             B2DCubicBezier aLeft;
-
+                            
                             aSegment.split(fExtremumPos, &aLeft, &aSegment);
                             aLeft.testAndSolveTrivialBezier();
                             aSegment.testAndSolveTrivialBezier();
@@ -3387,7 +3387,7 @@ namespace basegfx
                                 const double fScalar(fPositionInEdge / fEdgeLength);
                                 aRetval.append(aCurrent + (aEdge * fScalar));
                                 fPositionInEdge += fLength;
-
+                                
                                 if(bEndActive)
                                 {
                                     fAbsolutePosition += fLength;
@@ -3433,12 +3433,12 @@ namespace basegfx
             {
                 fWaveWidth = 0.0;
             }
-
+            
             if(fWaveHeight < 0.0)
             {
                 fWaveHeight = 0.0;
             }
-
+            
             const bool bHasWidth(!fTools::equalZero(fWaveWidth));
             const bool bHasHeight(!fTools::equalZero(fWaveHeight));
 
@@ -3491,7 +3491,7 @@ namespace basegfx
             {
                 // no width -> no waveline, stay empty and return
             }
-
+            
             return aRetval;
         }
 
@@ -3553,7 +3553,7 @@ namespace basegfx
 
             if(nPointCount > 1)
             {
-                // Start by copying the source polygon to get a writeable copy. The closed state is
+                // Start by copying the source polygon to get a writeable copy. The closed state is 
                 // copied by aRetval's initialisation, too, so no need to copy it in this method
                 B2DPolygon aRetval(rCandidate);
 
diff --git a/basegfx/source/polygon/b2dpolygontriangulator.cxx b/basegfx/source/polygon/b2dpolygontriangulator.cxx
index 83fcc036c996..1e1fe44f6741 100644
--- a/basegfx/source/polygon/b2dpolygontriangulator.cxx
+++ b/basegfx/source/polygon/b2dpolygontriangulator.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
@@ -47,14 +47,14 @@ namespace basegfx
     {
         class EdgeEntry
         {
-            EdgeEntry*                              mpNext;
-            B2DPoint                                maStart;
-            B2DPoint                                maEnd;
-            double                                  mfAtan2;
+            EdgeEntry*								mpNext;
+            B2DPoint								maStart;
+            B2DPoint								maEnd;
+            double									mfAtan2;
 
         public:
             EdgeEntry(const B2DPoint& rStart, const B2DPoint& rEnd)
-            :   mpNext(0L),
+            :	mpNext(0L),
                 maStart(rStart),
                 maEnd(rEnd),
                 mfAtan2(0.0)
@@ -129,11 +129,11 @@ namespace basegfx
 
         class Triangulator
         {
-            EdgeEntry*                                      mpList;
-            EdgeEntries                                     maStartEntries;
-            EdgeEntryPointers                               maNewEdgeEntries;
-            B2DPolygon                                      maResult;
-
+            EdgeEntry*										mpList;
+            EdgeEntries										maStartEntries;
+            EdgeEntryPointers								maNewEdgeEntries;
+            B2DPolygon										maResult;
+    
             void handleClosingEdge(const B2DPoint& rStart, const B2DPoint& rEnd);
             bool CheckPointInTriangle(EdgeEntry* pEdgeA, EdgeEntry* pEdgeB, const B2DPoint& rTestPoint);
             void createTriangle(const B2DPoint& rA, const B2DPoint& rB, const B2DPoint& rC);
@@ -152,7 +152,7 @@ namespace basegfx
             EdgeEntry* pCurr = mpList;
             EdgeEntry* pPrev = 0L;
 
-            while(pCurr
+            while(pCurr 
                 && pCurr->getStart().getY() <= aNew.getStart().getY()
                 && *pCurr != aNew)
             {
@@ -212,7 +212,7 @@ namespace basegfx
                     EdgeEntry* pEnd = new EdgeEntry(*pStart);
                     maNewEdgeEntries.push_back(pStart);
                     maNewEdgeEntries.push_back(pEnd);
-
+                    
                     pStart->setNext(pEnd);
                     pEnd->setNext(pEdgeA->getNext());
                     pEdgeA->setNext(pStart);
@@ -233,7 +233,7 @@ namespace basegfx
 
         // consume as long as there are edges
         Triangulator::Triangulator(const B2DPolyPolygon& rCandidate)
-        :   mpList(0L)
+        :	mpList(0L)
         {
             // add all available edges to the single linked local list which will be sorted
             // by Y,X,atan2 when adding nodes
@@ -343,7 +343,7 @@ namespace basegfx
                             {
                                 // look for end point in triange
                                 pTestEdge = pEdgeB->getNext();
-
+                                
                                 while(bNoPointInTriangle && pTestEdge)
                                 {
                                     if(aRange.getMaxY() < pTestEdge->getStart().getY())
diff --git a/basegfx/source/polygon/b2dpolypolygon.cxx b/basegfx/source/polygon/b2dpolypolygon.cxx
index 9b28dffd19af..bcc991050e4f 100644
--- a/basegfx/source/polygon/b2dpolypolygon.cxx
+++ b/basegfx/source/polygon/b2dpolypolygon.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
@@ -42,9 +42,9 @@
 
 class ImplB2DPolyPolygon
 {
-    typedef ::std::vector< basegfx::B2DPolygon >    PolygonVector;
+    typedef ::std::vector< basegfx::B2DPolygon >	PolygonVector;
 
-    PolygonVector                                   maPolygons;
+    PolygonVector									maPolygons;
 
 public:
     ImplB2DPolyPolygon() : maPolygons()
@@ -201,7 +201,7 @@ public:
 
 namespace basegfx
 {
-    namespace { struct DefaultPolyPolygon: public rtl::Static<B2DPolyPolygon::ImplType,
+    namespace { struct DefaultPolyPolygon: public rtl::Static<B2DPolyPolygon::ImplType, 
                                                               DefaultPolyPolygon> {}; }
 
     B2DPolyPolygon::B2DPolyPolygon() :
@@ -256,7 +256,7 @@ namespace basegfx
     B2DPolygon B2DPolyPolygon::getB2DPolygon(sal_uInt32 nIndex) const
     {
         OSL_ENSURE(nIndex < mpPolyPolygon->count(), "B2DPolyPolygon access outside range (!)");
-
+        
         return mpPolyPolygon->getB2DPolygon(nIndex);
     }
 
@@ -286,7 +286,7 @@ namespace basegfx
     void B2DPolyPolygon::insert(sal_uInt32 nIndex, const B2DPolygon& rPolygon, sal_uInt32 nCount)
     {
         OSL_ENSURE(nIndex <= mpPolyPolygon->count(), "B2DPolyPolygon Insert outside range (!)");
-
+        
         if(nCount)
             mpPolyPolygon->insert(nIndex, rPolygon, nCount);
     }
@@ -324,7 +324,7 @@ namespace basegfx
     void B2DPolyPolygon::insert(sal_uInt32 nIndex, const B2DPolyPolygon& rPolyPolygon)
     {
         OSL_ENSURE(nIndex <= mpPolyPolygon->count(), "B2DPolyPolygon Insert outside range (!)");
-
+        
         if(rPolyPolygon.count())
             mpPolyPolygon->insert(nIndex, rPolyPolygon);
     }
@@ -338,11 +338,11 @@ namespace basegfx
     void B2DPolyPolygon::remove(sal_uInt32 nIndex, sal_uInt32 nCount)
     {
         OSL_ENSURE(nIndex + nCount <= mpPolyPolygon->count(), "B2DPolyPolygon Remove outside range (!)");
-
+        
         if(nCount)
             mpPolyPolygon->remove(nIndex, nCount);
     }
-
+    
     void B2DPolyPolygon::clear()
     {
         mpPolyPolygon = DefaultPolyPolygon::get();
diff --git a/basegfx/source/polygon/b2dpolypolygoncutter.cxx b/basegfx/source/polygon/b2dpolypolygoncutter.cxx
index 4f9cf3a75f72..81985b3f0305 100644
--- a/basegfx/source/polygon/b2dpolypolygoncutter.cxx
+++ b/basegfx/source/polygon/b2dpolypolygoncutter.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
@@ -51,9 +51,9 @@ namespace basegfx
 
         struct StripHelper
         {
-            B2DRange                                maRange;
-            sal_Int32                               mnDepth;
-            B2VectorOrientation                     meOrinetation;
+            B2DRange								maRange;
+            sal_Int32								mnDepth;
+            B2VectorOrientation						meOrinetation;
         };
 
         //////////////////////////////////////////////////////////////////////////////
@@ -119,7 +119,7 @@ namespace basegfx
 
         class solver
         {
-        private:
+        private:   
             const B2DPolyPolygon    maOriginal;
             PNV                     maPNV;
             VNV                     maVNV;
@@ -174,7 +174,7 @@ namespace basegfx
                     // b is right turn seen from a, test if Test is right of both and so outside (left is seeen as inside)
                     const bool bBoolA(fTools::lessOrEqual(rVecA.cross(rTest), 0.0));
                     const bool bBoolB(fTools::moreOrEqual(rVecB.cross(rTest), 0.0));
-
+                    
                     return (!(bBoolA && bBoolB));
                 }
             }
@@ -205,7 +205,7 @@ namespace basegfx
                 // Use maOriginalNext, not maNext to create the original (yet unchanged)
                 // curve segment. Otherwise, this segment would NOT ne correct.
                 const B2DVector& rCPB(bPrev ? maVNV[maPNV[rPN.mnIP].mnI].maOriginalNext : maVNV[maPNV[rPN.mnIN].mnI].maPrev);
-
+                
                 return B2DCubicBezier(rStart, rStart + rCPA, rEnd + rCPB, rEnd);
             }
 
@@ -221,7 +221,7 @@ namespace basegfx
                         // deadend on A (identical edge)
                         return;
                     }
-
+                    
                     const B2DCubicBezier aNextB(createSegment(rPNb, false));
                     const B2DCubicBezier aPrevB(createSegment(rPNb, true));
 
@@ -298,7 +298,7 @@ namespace basegfx
                             const B2DVector aNextCA(aNextA.interpolatePoint(0.5) - aNextA.getStartPoint());
                             const B2DVector aPrevCB(aPrevB.interpolatePoint(0.5) - aPrevB.getStartPoint());
                             const bool bEnter(impLeftOfEdges(aPrevCA, aNextCA, aPrevCB));
-
+                            
                             const B2DCubicBezier aNextA2(createSegment(*pPNa2, false));
                             const B2DCubicBezier aPrevA2(createSegment(*pPNa2, true));
                             const B2DCubicBezier aNextB2(createSegment(*pPNb2, false));
@@ -306,7 +306,7 @@ namespace basegfx
                             const B2DVector aNextCA2(aNextA2.interpolatePoint(0.5) - aNextA2.getStartPoint());
                             const B2DVector aNextCB2(aNextB2.interpolatePoint(0.5) - aNextB2.getStartPoint());
                             const bool bLeave(impLeftOfEdges(aPrevCA2, aNextCA2, aNextCB2));
-
+                        
                             if(bEnter != bLeave)
                             {
                                 // crossover
@@ -568,7 +568,7 @@ namespace basegfx
 
                             // fill data
                             sal_uInt32 nInsertIndex(0);
-
+                            
                             for(a = 0; a < nOriginalCount; a++)
                             {
                                 const B2DPolygon aCandidate(aGeometry.getB2DPolygon(a));
@@ -612,11 +612,11 @@ namespace basegfx
                             {
                                 const B2DPoint& rPoint = pPNCurr->maPoint;
                                 aNewPart.append(rPoint);
-
+                                
                                 if(mbIsCurve)
                                 {
                                     const VN& rVNCurr = maVNV[pPNCurr->mnI];
-
+                                    
                                     if(!rVNCurr.maPrev.equalZero())
                                     {
                                         aNewPart.setPrevControlPoint(aNewPart.count() - 1, rPoint + rVNCurr.maPrev);
@@ -628,7 +628,7 @@ namespace basegfx
                                     }
                                 }
 
-                                pPNCurr->mnI = SAL_MAX_UINT32;
+                                pPNCurr->mnI = SAL_MAX_UINT32; 
                                 nCountdown--;
                                 pPNCurr = &(maPNV[pPNCurr->mnIN]);
                             }
@@ -813,7 +813,7 @@ namespace basegfx
         {
             solver aSolver(rCandidate);
             B2DPolyPolygon aRetval(stripNeutralPolygons(aSolver.getB2DPolyPolygon()));
-
+            
             return correctOrientations(aRetval);
         }
 
@@ -821,7 +821,7 @@ namespace basegfx
         {
             solver aSolver(rCandidate);
             B2DPolyPolygon aRetval(stripNeutralPolygons(aSolver.getB2DPolyPolygon()));
-
+            
             return correctOrientations(aRetval);
         }
 
@@ -844,7 +844,7 @@ namespace basegfx
                 aRetval.append(rCandidateB);
                 aRetval = solveCrossovers(aRetval);
                 aRetval = stripNeutralPolygons(aRetval);
-
+                
                 return stripDispensablePolygons(aRetval, false);
             }
         }
@@ -869,7 +869,7 @@ namespace basegfx
                 aRetval.append(rCandidateB);
                 aRetval = solveCrossovers(aRetval);
                 aRetval = stripNeutralPolygons(aRetval);
-
+                
                 return correctOrientations(aRetval);
             }
         }
@@ -894,7 +894,7 @@ namespace basegfx
                 aRetval.append(rCandidateB);
                 aRetval = solveCrossovers(aRetval);
                 aRetval = stripNeutralPolygons(aRetval);
-
+                
                 return stripDispensablePolygons(aRetval, true);
             }
         }
@@ -913,11 +913,11 @@ namespace basegfx
             {
                 // Make B topologically to holes and append to A
                 B2DPolyPolygon aRetval(rCandidateB);
-
+                
                 aRetval.flip();
                 aRetval.append(rCandidateA);
 
-                // solve crossovers and throw away all sub-polygons which have a
+                // solve crossovers and throw away all sub-polygons which have a 
                 // depth other than 0.
                 aRetval = basegfx::tools::solveCrossovers(aRetval);
                 aRetval = basegfx::tools::stripNeutralPolygons(aRetval);
@@ -929,7 +929,7 @@ namespace basegfx
         B2DPolyPolygon mergeToSinglePolyPolygon(const std::vector< basegfx::B2DPolyPolygon >& rInput)
         {
             std::vector< basegfx::B2DPolyPolygon > aInput(rInput);
-
+            
             // first step: prepareForPolygonOperation and simple merge of non-overlapping
             // PolyPolygons for speedup; this is possible for the wanted OR-operation
             if(aInput.size())
diff --git a/basegfx/source/polygon/b2dpolypolygonrasterconverter.cxx b/basegfx/source/polygon/b2dpolypolygonrasterconverter.cxx
index b795c04e158e..e5e4cb5eddf5 100644
--- a/basegfx/source/polygon/b2dpolypolygonrasterconverter.cxx
+++ b/basegfx/source/polygon/b2dpolypolygonrasterconverter.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
@@ -61,7 +61,7 @@ namespace basegfx
 
             // current size of index list
             sal_uInt32 m_current_size;
-
+                            
             // last known size of index list
             sal_uInt32 m_previous_size;
 
@@ -81,7 +81,7 @@ namespace basegfx
     };
 
     inline radixSort::radixSort( void ) {
-
+        
         m_indices1 = NULL;
         m_indices2 = NULL;
         m_current_size = 0;
@@ -97,7 +97,7 @@ namespace basegfx
     }
 
     bool radixSort::resize( sal_uInt32 nNumElements ) {
-
+        
         if(nNumElements==m_previous_size)
             return true;
 
@@ -125,7 +125,7 @@ namespace basegfx
 
             m_current_size = nNumElements;
         }
-
+        
         m_previous_size = nNumElements;
 
         // initialize indices
@@ -144,7 +144,7 @@ namespace basegfx
 
         // clear counters
         sal_uInt32 *ptr = m_counter;
-        for(int i=0; i<64; ++i)
+        for(int i=0; i<64; ++i) 
         {
             *ptr++ = 0;
             *ptr++ = 0;
@@ -177,7 +177,7 @@ namespace basegfx
         bool bSorted = true;
         while(p!=pe) {
             float value = *(float *)(((sal_uInt8 *)pInput)+((*Indices++)*dwStride));
-            if(value<previous_value)    {
+            if(value<previous_value)	{
                 bSorted = false;
                 break;
             }
@@ -244,7 +244,7 @@ namespace basegfx
                         sal_uInt32 id = *Indices++;
                         m_indices2[m_offset[InputBytes[id*dwStride]]++] = id;
                     }
-                    sal_uInt32 *Tmp = m_indices1;
+                    sal_uInt32 *Tmp	= m_indices1;
                     m_indices1 = m_indices2;
                     m_indices2 = Tmp;
                 }
@@ -264,7 +264,7 @@ namespace basegfx
                         if(Radix<128) m_indices2[m_offset[Radix]++] = m_indices1[i];
                         else m_indices2[--m_offset[Radix]] = m_indices1[i];
                     }
-                    sal_uInt32 *Tmp = m_indices1;
+                    sal_uInt32 *Tmp	= m_indices1;
                     m_indices1 = m_indices2;
                     m_indices2 = Tmp;
                 }
@@ -272,7 +272,7 @@ namespace basegfx
                     if(unique_value>=128) {
                         for(i=0;i<nNumElements;i++)
                             m_indices2[i] = m_indices1[nNumElements-i-1];
-                        sal_uInt32 *Tmp = m_indices1;
+                        sal_uInt32 *Tmp	= m_indices1;
                         m_indices1 = m_indices2;
                         m_indices2 = Tmp;
                     }
@@ -286,7 +286,7 @@ namespace basegfx
     //************************************************************
     // Internal vertex storage of B2DPolyPolygonRasterConverter
     //************************************************************
-
+    
     inline B2DPolyPolygonRasterConverter::Vertex::Vertex() :
         aP1(),
         aP2(),
@@ -312,14 +312,14 @@ namespace basegfx
         class ImplLineNode
         {
         public:
-            sal_Int32   mnYCounter;
-            float       mfXPos;
-            float       mfXDelta;
-            bool        mbDownwards;
-
+            sal_Int32	mnYCounter;
+            float		mfXPos;
+            float		mfXDelta;
+            bool		mbDownwards;
+        
         public:
             /**rP1 and rP2 must not have equal y values, when rounded
-               to integer!
+               to integer! 
             */
             ImplLineNode(const B2DPoint& rP1, const B2DPoint& rP2, bool bDown) :
                 mnYCounter( fround(rP2.getY()) - fround(rP1.getY()) ),
@@ -330,11 +330,11 @@ namespace basegfx
             }
 
             /// get current x position
-            const float& getXPos() const
-            {
-                return mfXPos;
+            const float& getXPos() const 
+            { 
+                return mfXPos; 
             }
-
+        
             /// returns true, if line ends on this Y value
             float nextLine()
             {
@@ -379,19 +379,19 @@ namespace basegfx
             }
         };
     }
-
+    
     void B2DPolyPolygonRasterConverter::init()
     {
         if(!maPolyPolyRectangle.isEmpty())
         {
-            const sal_Int32 nMinY( fround(maPolyPolyRectangle.getMinY()) );
+            const sal_Int32	nMinY( fround(maPolyPolyRectangle.getMinY()) );
             const sal_Int32 nScanlines(fround(maPolyPolyRectangle.getMaxY()) - nMinY);
 
             maScanlines.resize( nScanlines+1 );
 
-            // add all polygons
-            for( sal_uInt32 i(0), nCount(maPolyPolygon.count());
-                 i < nCount;
+            // add all polygons 
+            for( sal_uInt32 i(0), nCount(maPolyPolygon.count()); 
+                 i < nCount; 
                  ++i )
             {
                 // add all vertices
@@ -464,7 +464,7 @@ namespace basegfx
     B2DPolyPolygonRasterConverter::B2DPolyPolygonRasterConverter( const B2DPolyPolygon& rPolyPolyRaster,
                                                                   const B2DRectangle&   rRasterArea ) :
         maPolyPolygon( rPolyPolyRaster ),
-        maPolyPolyRectangle(
+        maPolyPolyRectangle( 
             getCombinedBounds( rPolyPolyRaster,
                                rRasterArea ) ),
         maScanlines()
@@ -511,12 +511,12 @@ namespace basegfx
         if( maScanlines.empty() )
             return; // no scanlines at all -> bail out
 
-        const sal_Int32 nMinY( fround(maPolyPolyRectangle.getMinY()) );
+        const sal_Int32	nMinY( fround(maPolyPolyRectangle.getMinY()) );
         const sal_Int32 nScanlines(fround(maPolyPolyRectangle.getMaxY()) - nMinY);
 
         // Vector of currently active vertices. A vertex is active, if
         // it crosses or touches the current scanline.
-        VectorOfLineNodes   aActiveVertices;
+        VectorOfLineNodes	aActiveVertices;
 
         // mickey's optimized version...
         radixSort   rs;
@@ -540,7 +540,7 @@ namespace basegfx
             }
 
             // sort with increasing X
-            if(bSort)
+            if(bSort) 
             {
                 bSort = false;
 
@@ -565,7 +565,7 @@ namespace basegfx
             else
             {
                 const sal_Int32 nCurrY( nMinY + y );
-
+                
                 // scanline not empty - forward all scans to derived,
                 // according to selected fill rule
 
@@ -609,14 +609,14 @@ namespace basegfx
                                   i % 2 == 0 );
 
                             float delta = aActiveVertices[nIndex].nextLine();
-                            if(delta > 0.0f)
+                            if(delta > 0.0f) 
                             {
                                 if(aActiveVertices[nIndex].getXPos() > aActiveVertices[nNextIndex].getXPos())
                                     bSort = true;
                             }
-                            else if(delta < 0.0f)
+                            else if(delta < 0.0f) 
                             {
-                                if(i)
+                                if(i) 
                                 {
                                     sal_uInt32 nPrevIndex = sorted[i-1];
                                     if(aActiveVertices[nIndex].getXPos() < aActiveVertices[nPrevIndex].getXPos())
@@ -644,14 +644,14 @@ namespace basegfx
                                   nWindingNumber != 0 );
 
                             float delta = aActiveVertices[nIndex].nextLine();
-                            if(delta > 0.0f)
+                            if(delta > 0.0f) 
                             {
                                 if(aActiveVertices[nIndex].getXPos() > aActiveVertices[nNextIndex].getXPos())
                                     bSort = true;
                             }
-                            else if(delta < 0.0f)
+                            else if(delta < 0.0f) 
                             {
-                                if(i)
+                                if(i) 
                                 {
                                     sal_uInt32 nPrevIndex = sorted[i-1];
                                     if(aActiveVertices[nIndex].getXPos() < aActiveVertices[nPrevIndex].getXPos())
@@ -673,10 +673,10 @@ namespace basegfx
 
                 // also call nextLine on very last line node
                 sal_uInt32 nIndex = sorted[nb-1];
-                float delta = aActiveVertices[nIndex].nextLine();
+                float delta = aActiveVertices[nIndex].nextLine();                
                 if(delta < 0.0f)
                 {
-                    if(nb)
+                    if(nb) 
                     {
                         sal_uInt32 nPrevIndex = sorted[nb-2];
                         if(aActiveVertices[nIndex].getXPos() < aActiveVertices[nPrevIndex].getXPos())
@@ -691,7 +691,7 @@ namespace basegfx
                                                      ::boost::mem_fn( &ImplLineNode::isEnded ) ),
                                    aActiveVertices.end() );
             nb = aActiveVertices.size();
-            if(nb != nb_previous)
+            if(nb != nb_previous) 
             {
                 nb_previous = nb;
                 bSort = true;
diff --git a/basegfx/source/polygon/b2dpolypolygontools.cxx b/basegfx/source/polygon/b2dpolypolygontools.cxx
index dcfa34f93c02..8e15fceba96f 100644
--- a/basegfx/source/polygon/b2dpolypolygontools.cxx
+++ b/basegfx/source/polygon/b2dpolypolygontools.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
@@ -278,16 +278,16 @@ namespace basegfx
             if(rCandidate.count() && fFullDashDotLen > 0.0)
             {
                 B2DPolyPolygon aLineTarget, aGapTarget;
-
+    
                 for(sal_uInt32 a(0L); a < rCandidate.count(); a++)
                 {
                     const B2DPolygon aCandidate(rCandidate.getB2DPolygon(a));
-
+                    
                     applyLineDashing(
-                        aCandidate,
-                        rDotDashArray,
-                        pLineTarget ? &aLineTarget : 0,
-                        pGapTarget ? &aGapTarget : 0,
+                        aCandidate, 
+                        rDotDashArray, 
+                        pLineTarget ? &aLineTarget : 0, 
+                        pGapTarget ? &aGapTarget : 0, 
                         fFullDashDotLen);
 
                     if(pLineTarget)
@@ -502,7 +502,7 @@ namespace basegfx
             // exclude some cheap cases first
             if( rPoly.count() != 1 )
                 return false;
-
+            
             return isRectangle( rPoly.getB2DPolygon(0) );
         }
 
diff --git a/basegfx/source/polygon/b2dsvgpolypolygon.cxx b/basegfx/source/polygon/b2dsvgpolypolygon.cxx
index d2815337edaf..cff043d0378e 100644
--- a/basegfx/source/polygon/b2dsvgpolypolygon.cxx
+++ b/basegfx/source/polygon/b2dsvgpolypolygon.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
@@ -43,9 +43,9 @@ namespace basegfx
     {
         namespace
         {
-            void lcl_skipSpaces(sal_Int32&              io_rPos,
-                                const ::rtl::OUString&  rStr,
-                                const sal_Int32         nLen)
+            void lcl_skipSpaces(sal_Int32& 				io_rPos, 
+                                const ::rtl::OUString& 	rStr, 
+                                const sal_Int32 		nLen)
             {
                 while( io_rPos < nLen &&
                        sal_Unicode(' ') == rStr[io_rPos] )
@@ -54,11 +54,11 @@ namespace basegfx
                 }
             }
 
-            void lcl_skipSpacesAndCommas(sal_Int32&             io_rPos,
-                                         const ::rtl::OUString& rStr,
-                                         const sal_Int32        nLen)
+            void lcl_skipSpacesAndCommas(sal_Int32& 			io_rPos, 
+                                         const ::rtl::OUString& rStr, 
+                                         const sal_Int32 		nLen)
             {
-                while(io_rPos < nLen
+                while(io_rPos < nLen 
                       && (sal_Unicode(' ') == rStr[io_rPos] || sal_Unicode(',') == rStr[io_rPos]))
                 {
                     ++io_rPos;
@@ -80,10 +80,10 @@ namespace basegfx
                                           bSignAllowed);
             }
 
-            bool lcl_getDoubleChar(double&                  o_fRetval,
-                                   sal_Int32&               io_rPos,
-                                   const ::rtl::OUString&   rStr,
-                                   const sal_Int32          /*nLen*/)
+            bool lcl_getDoubleChar(double& 					o_fRetval,
+                                   sal_Int32& 				io_rPos, 
+                                   const ::rtl::OUString& 	rStr, 
+                                   const sal_Int32 			/*nLen*/)
             {
                 sal_Unicode aChar( rStr[io_rPos] );
                 ::rtl::OUStringBuffer sNumberString;
@@ -105,7 +105,7 @@ namespace basegfx
                 {
                     sNumberString.append(rStr[io_rPos]);
                     aChar = rStr[++io_rPos];
-
+    
                     if(sal_Unicode('+') == aChar || sal_Unicode('-') == aChar)
                     {
                         sNumberString.append(rStr[io_rPos]);
@@ -122,10 +122,10 @@ namespace basegfx
                 if(sNumberString.getLength())
                 {
                     rtl_math_ConversionStatus eStatus;
-                    o_fRetval = ::rtl::math::stringToDouble( sNumberString.makeStringAndClear(),
-                                                             (sal_Unicode)('.'),
-                                                             (sal_Unicode)(','),
-                                                             &eStatus,
+                    o_fRetval = ::rtl::math::stringToDouble( sNumberString.makeStringAndClear(), 
+                                                             (sal_Unicode)('.'), 
+                                                             (sal_Unicode)(','), 
+                                                             &eStatus, 
                                                              NULL );
                     return ( eStatus == rtl_math_ConversionStatus_Ok );
                 }
@@ -133,10 +133,10 @@ namespace basegfx
                 return false;
             }
 
-            bool lcl_importDoubleAndSpaces( double&                 o_fRetval,
-                                            sal_Int32&              io_rPos,
-                                            const ::rtl::OUString&  rStr,
-                                            const sal_Int32         nLen )
+            bool lcl_importDoubleAndSpaces( double& 				o_fRetval, 
+                                            sal_Int32& 				io_rPos, 
+                                            const ::rtl::OUString& 	rStr, 
+                                            const sal_Int32 		nLen )
             {
                 if( !lcl_getDoubleChar(o_fRetval, io_rPos, rStr, nLen) )
                     return false;
@@ -147,9 +147,9 @@ namespace basegfx
             }
 
             bool lcl_importNumberAndSpaces(sal_Int32&                o_nRetval,
-                                           sal_Int32&               io_rPos,
-                                           const ::rtl::OUString&   rStr,
-                                           const sal_Int32      nLen)
+                                           sal_Int32& 				io_rPos, 
+                                           const ::rtl::OUString& 	rStr, 
+                                           const sal_Int32 		nLen)
             {
                 sal_Unicode aChar( rStr[io_rPos] );
                 ::rtl::OUStringBuffer sNumberString;
@@ -177,9 +177,9 @@ namespace basegfx
                 return false;
             }
 
-            void lcl_skipNumber(sal_Int32&              io_rPos,
-                                const ::rtl::OUString&  rStr,
-                                const sal_Int32         nLen)
+            void lcl_skipNumber(sal_Int32& 				io_rPos, 
+                                const ::rtl::OUString& 	rStr, 
+                                const sal_Int32 		nLen)
             {
                 bool bSignAllowed(true);
 
@@ -190,9 +190,9 @@ namespace basegfx
                 }
             }
 
-            void lcl_skipDouble(sal_Int32&              io_rPos,
-                                const ::rtl::OUString&  rStr,
-                                const sal_Int32         /*nLen*/)
+            void lcl_skipDouble(sal_Int32& 				io_rPos, 
+                                const ::rtl::OUString& 	rStr, 
+                                const sal_Int32 		/*nLen*/)
             {
                 sal_Unicode aChar( rStr[io_rPos] );
 
@@ -208,7 +208,7 @@ namespace basegfx
                 if(sal_Unicode('e') == aChar || sal_Unicode('E') == aChar)
                 {
                     aChar = rStr[++io_rPos];
-
+    
                     if(sal_Unicode('+') == aChar || sal_Unicode('-') == aChar)
                         aChar = rStr[++io_rPos];
 
@@ -218,33 +218,33 @@ namespace basegfx
                     }
                 }
             }
-            void lcl_skipNumberAndSpacesAndCommas(sal_Int32&                io_rPos,
-                                                  const ::rtl::OUString&    rStr,
-                                                  const sal_Int32           nLen)
+            void lcl_skipNumberAndSpacesAndCommas(sal_Int32& 				io_rPos, 
+                                                  const ::rtl::OUString& 	rStr, 
+                                                  const sal_Int32 			nLen)
             {
                 lcl_skipNumber(io_rPos, rStr, nLen);
                 lcl_skipSpacesAndCommas(io_rPos, rStr, nLen);
             }
 
             // #100617# Allow to skip doubles, too.
-            void lcl_skipDoubleAndSpacesAndCommas(sal_Int32&                io_rPos,
-                                                  const ::rtl::OUString&    rStr,
-                                                  const sal_Int32           nLen)
+            void lcl_skipDoubleAndSpacesAndCommas(sal_Int32& 				io_rPos, 
+                                                  const ::rtl::OUString& 	rStr, 
+                                                  const sal_Int32 			nLen)
             {
                 lcl_skipDouble(io_rPos, rStr, nLen);
                 lcl_skipSpacesAndCommas(io_rPos, rStr, nLen);
             }
 
-            void lcl_putNumberChar( ::rtl::OUStringBuffer& rStr,
-                                    double                 fValue )
+            void lcl_putNumberChar( ::rtl::OUStringBuffer& rStr, 
+                                    double 		 	       fValue )
             {
                 rStr.append( fValue );
             }
 
-            void lcl_putNumberCharWithSpace( ::rtl::OUStringBuffer& rStr,
-                                             double                 fValue,
-                                             double                 fOldValue,
-                                             bool                   bUseRelativeCoordinates )
+            void lcl_putNumberCharWithSpace( ::rtl::OUStringBuffer& rStr, 
+                                             double 		        fValue,
+                                             double 		        fOldValue,
+                                             bool 			        bUseRelativeCoordinates )
             {
                 if( bUseRelativeCoordinates )
                     fValue -= fOldValue;
@@ -252,7 +252,7 @@ namespace basegfx
                 const sal_Int32 aLen( rStr.getLength() );
                 if(aLen)
                 {
-                    if( lcl_isOnNumberChar(rStr.charAt(aLen - 1), false) &&
+                    if( lcl_isOnNumberChar(rStr.charAt(aLen - 1), false) && 
                         fValue >= 0.0 )
                     {
                         rStr.append( sal_Unicode(' ') );
@@ -264,13 +264,13 @@ namespace basegfx
 
             inline sal_Unicode lcl_getCommand( sal_Char cUpperCaseCommand,
                                                sal_Char cLowerCaseCommand,
-                                               bool     bUseRelativeCoordinates )
+                                               bool 	bUseRelativeCoordinates )
             {
                 return bUseRelativeCoordinates ? cLowerCaseCommand : cUpperCaseCommand;
             }
         }
 
-        bool importFromSvgD(B2DPolyPolygon& o_rPolyPolygon, const ::rtl::OUString&  rSvgDStatement)
+        bool importFromSvgD(B2DPolyPolygon& o_rPolyPolygon, const ::rtl::OUString& 	rSvgDStatement)
         {
             o_rPolyPolygon.clear();
             const sal_Int32 nLen(rSvgDStatement.getLength());
@@ -301,7 +301,7 @@ namespace basegfx
                         bIsClosed = true;
                         break;
                     }
-
+                
                     case 'm' :
                     case 'M' :
                     {
@@ -326,9 +326,9 @@ namespace basegfx
                                 {
                                     closeWithGeometryChange(aCurrPoly);
                                 }
-
+                                
                                 o_rPolyPolygon.append(aCurrPoly);
-
+                                
                                 // reset import values
                                 bIsClosed = false;
                                 aCurrPoly.clear();
@@ -354,7 +354,7 @@ namespace basegfx
                             // set last position
                             nLastX = nX;
                             nLastY = nY;
-
+                        
                             // add point
                             aCurrPoly.append(B2DPoint(nX, nY));
                         }
@@ -384,13 +384,13 @@ namespace basegfx
 
                             // set last position
                             nLastX = nX;
-
+                        
                             // add point
                             aCurrPoly.append(B2DPoint(nX, nY));
                         }
                         break;
                     }
-
+                
                     case 'v' :
                     {
                         bRelative = true;
@@ -414,13 +414,13 @@ namespace basegfx
 
                             // set last position
                             nLastY = nY;
-
+                        
                             // add point
                             aCurrPoly.append(B2DPoint(nX, nY));
                         }
                         break;
                     }
-
+                
                     case 's' :
                     {
                         bRelative = true;
@@ -479,7 +479,7 @@ namespace basegfx
                         }
                         break;
                     }
-
+                
                     case 'c' :
                     {
                         bRelative = true;
@@ -528,7 +528,7 @@ namespace basegfx
                         }
                         break;
                     }
-
+                
                     // #100617# quadratic beziers are imported as cubic ones
                     case 'q' :
                     {
@@ -579,7 +579,7 @@ namespace basegfx
                         }
                         break;
                     }
-
+                
                     // #100617# relative quadratic beziers are imported as cubic
                     case 't' :
                     {
@@ -633,11 +633,11 @@ namespace basegfx
                                 const B2DPoint aQuadControlPoint(
                                     ((3.0 * aPrevControl.getX()) - aPrevPoint.getX()) / 2.0,
                                     ((3.0 * aPrevControl.getY()) - aPrevPoint.getY()) / 2.0);
-
+                                
                                 // calculate the cubic bezier coefficients from the quadratic ones.
                                 const double nX2Prime((aQuadControlPoint.getX() * 2.0 + nX) / 3.0);
                                 const double nY2Prime((aQuadControlPoint.getY() * 2.0 + nY) / 3.0);
-
+                                
                                 // append curved edge, use mirrored cubic control point directly
                                 aCurrPoly.appendBezierSegment(aPrevControl, B2DPoint(nX2Prime, nY2Prime), B2DPoint(nX, nY));
                             }
@@ -699,7 +699,7 @@ namespace basegfx
                             {
                                 // normalize according to SVG spec
                                 fRX=fabs(fRX); fRY=fabs(fRY);
-
+                                
                                 // from the SVG spec, appendix F.6.4
 
                                 // |x1'|   |cos phi   sin phi|  |(x1 - x2)/2|
@@ -707,12 +707,12 @@ namespace basegfx
                                 const B2DPoint p1(nLastX, nLastY);
                                 const B2DPoint p2(nX, nY);
                                 B2DHomMatrix aTransform(basegfx::tools::createRotateB2DHomMatrix(-fPhi*M_PI/180));
-
+                               
                                 const B2DPoint p1_prime( aTransform * B2DPoint(((p1-p2)/2.0)) );
 
                                 //           ______________________________________       rx y1'
                                 // |cx'|  + /  rx^2 ry^2 - rx^2 y1'^2 - ry^2 x1^2           ry
-                                // |cy'| =-/       rx^2y1'^2 + ry^2 x1'^2               - ry x1'
+                                // |cy'| =-/       rx^2y1'^2 + ry^2 x1'^2               - ry x1' 
                                 //                                                          rx
                                 // chose + if f_A != f_S
                                 // chose - if f_A  = f_S
@@ -741,7 +741,7 @@ namespace basegfx
                                         aCurrPoly.append(B2DPoint(nX, nY));
                                         continue;
                                     }
-
+                                    
                                     fRY=sqrt(fRadicant2);
                                     fRX=fRatio*fRY;
 
@@ -759,7 +759,7 @@ namespace basegfx
                                         -fFactor*fRY*p1_prime.getX()/fRX);
                                 }
 
-                                //              +           u - v
+                                //              +           u - v 
                                 // angle(u,v) =  arccos( ------------ )     (take the sign of (ux vy - uy vx))
                                 //              -        ||u|| ||v||
 
@@ -767,14 +767,14 @@ namespace basegfx
                                 // theta1 = angle((   ), |                | )
                                 //                  0    | (y1' - cy')/ry |
                                 const B2DPoint aRadii(fRX,fRY);
-                                double fTheta1(
+                                double fTheta1( 
                                     B2DVector(1.0,0.0).angle(
                                         (p1_prime-aCenter_prime)/aRadii));
 
                                 //                 |1|    |  (-x1' - cx')/rx |
                                 // theta2 = angle( | | ,  |                  | )
                                 //                 |0|    |  (-y1' - cy')/ry |
-                                double fTheta2(
+                                double fTheta2( 
                                     B2DVector(1.0,0.0).angle(
                                         (-p1_prime-aCenter_prime)/aRadii));
 
@@ -786,7 +786,7 @@ namespace basegfx
                                 // (since
                                 // createPolygonFromEllipseSegment()
                                 // normalizes to e.g. cw arc)
-                                const bool bFlipSegment( (bLargeArcFlag!=0) ==
+                                const bool bFlipSegment( (bLargeArcFlag!=0) == 
                                     (fmod(fTheta2+2*M_PI-fTheta1,
                                           2*M_PI)<M_PI) );
                                 if( bFlipSegment )
@@ -794,11 +794,11 @@ namespace basegfx
 
                                 // finally, create bezier polygon from this
                                 B2DPolygon aSegment(
-                                    tools::createPolygonFromUnitEllipseSegment(
+                                    tools::createPolygonFromUnitEllipseSegment( 
                                         fTheta1, fTheta2 ));
 
                                 // transform ellipse by rotation & move to final center
-                                aTransform = basegfx::tools::createScaleB2DHomMatrix(fRX, fRY);
+                                aTransform = basegfx::tools::createScaleB2DHomMatrix(fRX, fRY); 
                                 aTransform.translate(aCenter_prime.getX(),
                                                      aCenter_prime.getY());
                                 aTransform.rotate(fPhi*M_PI/180);
@@ -806,7 +806,7 @@ namespace basegfx
                                 aTransform.translate(aOffset.getX(),
                                                      aOffset.getY());
                                 aSegment.transform(aTransform);
-
+                                
                                 // createPolygonFromEllipseSegment()
                                 // always creates arcs that are
                                 // positively oriented - flip polygon
@@ -862,8 +862,8 @@ namespace basegfx
             {
                 if(!lcl_importDoubleAndSpaces(nX, nPos, rSvgPointsAttribute, nLen)) return false;
                 if(!lcl_importDoubleAndSpaces(nY, nPos, rSvgPointsAttribute, nLen)) return false;
-
-                // add point
+                
+                // add point        
                 o_rPoly.append(B2DPoint(nX, nY));
 
                 // skip to next number, or finish
@@ -875,7 +875,7 @@ namespace basegfx
 
         ::rtl::OUString exportToSvgD(
             const B2DPolyPolygon& rPolyPolygon,
-            bool bUseRelativeCoordinates,
+            bool bUseRelativeCoordinates, 
             bool bDetectQuadraticBeziers)
         {
             const sal_uInt32 nCount(rPolyPolygon.count());
@@ -909,7 +909,7 @@ namespace basegfx
                         const B2DPoint aEdgeEnd(aPolygon.getB2DPoint(nNextIndex));
 
                         // handle edge from (aEdgeStart, aEdgeEnd) using indices (nIndex, nNextIndex)
-                        const bool bEdgeIsBezier(bPolyUsesControlPoints
+                        const bool bEdgeIsBezier(bPolyUsesControlPoints 
                             && (aPolygon.isNextControlPointUsed(nIndex) || aPolygon.isPrevControlPointUsed(nNextIndex)));
 
                         if(bEdgeIsBezier)
@@ -920,18 +920,18 @@ namespace basegfx
                             bool bIsQuadraticBezier(false);
 
                             // check continuity at current edge's start point. For SVG, do NOT use an
-                            // existing continuity since no 'S' or 's' statement should be written. At
-                            // import, that 'previous' control vector is not available. SVG documentation
+                            // existing continuity since no 'S' or 's' statement should be written. At 
+                            // import, that 'previous' control vector is not available. SVG documentation 
                             // says for interpretation:
                             //
-                            // "(If there is no previous command or if the previous command was
-                            // not an C, c, S or s, assume the first control point is coincident
+                            // "(If there is no previous command or if the previous command was 
+                            // not an C, c, S or s, assume the first control point is coincident 
                             // with the current point.)"
                             //
                             // That's what is done from our import, so avoid exporting it as first statement
                             // is necessary.
                             const bool bSymmetricAtEdgeStart(
-                                0 != nIndex
+                                0 != nIndex 
                                 && CONTINUITY_C2 == aPolygon.getContinuityInPoint(nIndex));
 
                             if(bDetectQuadraticBeziers)
@@ -941,7 +941,7 @@ namespace basegfx
                                 // the same place when they are prolonged
                                 // to the common quadratic control point
                                 //
-                                // Left: P = (3P1 - P0) / 2
+                                // Left: P = (3P1 - P0) / 2 
                                 // Right: P = (3P2 - P3) / 2
                                 aLeft = B2DPoint((3.0 * aControlEdgeStart - aEdgeStart) / 2.0);
                                 aRight= B2DPoint((3.0 * aControlEdgeEnd - aEdgeEnd) / 2.0);
@@ -960,7 +960,7 @@ namespace basegfx
                                         aResult.append(aCommand);
                                         aLastSVGCommand = aCommand;
                                     }
-
+                                    
                                     lcl_putNumberCharWithSpace(aResult, aEdgeEnd.getX(), aCurrentSVGPosition.getX(), bUseRelativeCoordinates);
                                     lcl_putNumberCharWithSpace(aResult, aEdgeEnd.getY(), aCurrentSVGPosition.getY(), bUseRelativeCoordinates);
                                     aLastSVGCommand = aCommand;
@@ -975,7 +975,7 @@ namespace basegfx
                                         aResult.append(aCommand);
                                         aLastSVGCommand = aCommand;
                                     }
-
+                                    
                                     lcl_putNumberCharWithSpace(aResult, aLeft.getX(), aCurrentSVGPosition.getX(), bUseRelativeCoordinates);
                                     lcl_putNumberCharWithSpace(aResult, aLeft.getY(), aCurrentSVGPosition.getY(), bUseRelativeCoordinates);
                                     lcl_putNumberCharWithSpace(aResult, aEdgeEnd.getX(), aCurrentSVGPosition.getX(), bUseRelativeCoordinates);
@@ -996,7 +996,7 @@ namespace basegfx
                                         aResult.append(aCommand);
                                         aLastSVGCommand = aCommand;
                                     }
-
+                                    
                                     lcl_putNumberCharWithSpace(aResult, aControlEdgeEnd.getX(), aCurrentSVGPosition.getX(), bUseRelativeCoordinates);
                                     lcl_putNumberCharWithSpace(aResult, aControlEdgeEnd.getY(), aCurrentSVGPosition.getY(), bUseRelativeCoordinates);
                                     lcl_putNumberCharWithSpace(aResult, aEdgeEnd.getX(), aCurrentSVGPosition.getX(), bUseRelativeCoordinates);
@@ -1013,7 +1013,7 @@ namespace basegfx
                                         aResult.append(aCommand);
                                         aLastSVGCommand = aCommand;
                                     }
-
+                                    
                                     lcl_putNumberCharWithSpace(aResult, aControlEdgeStart.getX(), aCurrentSVGPosition.getX(), bUseRelativeCoordinates);
                                     lcl_putNumberCharWithSpace(aResult, aControlEdgeStart.getY(), aCurrentSVGPosition.getY(), bUseRelativeCoordinates);
                                     lcl_putNumberCharWithSpace(aResult, aControlEdgeEnd.getX(), aCurrentSVGPosition.getX(), bUseRelativeCoordinates);
diff --git a/basegfx/source/polygon/b2dtrapezoid.cxx b/basegfx/source/polygon/b2dtrapezoid.cxx
index 4cd63f938114..e2651f1c02b7 100644
--- a/basegfx/source/polygon/b2dtrapezoid.cxx
+++ b/basegfx/source/polygon/b2dtrapezoid.cxx
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2008 by Sun Microsystems, Inc.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -46,20 +46,20 @@ namespace basegfx
         // currently, thus the YPositions will be equal. I did not create a special
         // class for this since holdingthe pointers is more effective and also can be
         // used as baseclass for the traversing edges
-
+        
         class TrDeSimpleEdge
         {
         protected:
             // pointers to start and end point
-            const B2DPoint*     mpStart;
-            const B2DPoint*     mpEnd;
+            const B2DPoint*		mpStart;
+            const B2DPoint*		mpEnd;
 
         public:
             // constructor
             TrDeSimpleEdge(
                 const B2DPoint* pStart,
                 const B2DPoint* pEnd)
-            :   mpStart(pStart),
+            :	mpStart(pStart),
                 mpEnd(pEnd)
             {
             }
@@ -75,7 +75,7 @@ namespace basegfx
         typedef ::std::vector< TrDeSimpleEdge > TrDeSimpleEdges;
 
         //////////////////////////////////////////////////////////////////////////////
-        // helper class for holding a traversing edge. It will always have some
+        // helper class for holding a traversing edge. It will always have some 
         // distance in YPos. The slope (in a numerically useful form, see comments) is
         // hold and used in SortValue to allow sorting traversing edges by Y, X and slope
         // (in that order)
@@ -84,7 +84,7 @@ namespace basegfx
         {
         private:
             // the slope in a numerical useful form for sorting
-            sal_uInt32          mnSortValue;
+            sal_uInt32			mnSortValue;
 
         public:
             // convenience data read access
@@ -104,7 +104,7 @@ namespace basegfx
 
                 // convert to sal_uInt32 value
                 const_cast< TrDeEdgeEntry* >(this)->mnSortValue = sal_uInt32(fRadiant);
-
+                
                 return mnSortValue;
             }
 
@@ -113,7 +113,7 @@ namespace basegfx
                 const B2DPoint* pStart,
                 const B2DPoint* pEnd,
                 sal_uInt32 nSortValue = 0)
-            :   TrDeSimpleEdge(pStart, pEnd),
+            :	TrDeSimpleEdge(pStart, pEnd),
                 mnSortValue(nSortValue)
             {
                 // force traversal of deltaY downward
@@ -134,7 +134,7 @@ namespace basegfx
                 if(mpStart != pNewStart)
                 {
                     mpStart = pNewStart;
-
+                    
                     // no horizontal edges allowed, all neeed to traverse vertivally
                     OSL_ENSURE(mpEnd->getY() > mpStart->getY(), "Illegal TrDeEdgeEntry constructed (!)");
                 }
@@ -148,7 +148,7 @@ namespace basegfx
                 if(mpEnd != pNewEnd)
                 {
                     mpEnd = pNewEnd;
-
+                    
                     // no horizontal edges allowed, all neeed to traverse vertivally
                     OSL_ENSURE(mpEnd->getY() > mpStart->getY(), "Illegal TrDeEdgeEntry constructed (!)");
                 }
@@ -162,10 +162,10 @@ namespace basegfx
                     if(fTools::equal(getStart().getX(), rComp.getStart().getX(), fTools::getSmallValue()))
                     {
                         // when start points are equal, use the direction the edge is pointing
-                        // to. That value is created on demand and derived from atan2 in the
+                        // to. That value is created on demand and derived from atan2 in the 
                         // range ]0.0 .. pi[ (without extremas, we always have a deltaY in this
-                        // class) and scaled to sal_uInt32 range for best precision. 0 means no angle,
-                        // while SAL_MAX_UINT32 means pi. Thus, the higher the value, the more left
+                        // class) and scaled to sal_uInt32 range for best precision. 0 means no angle, 
+                        // while SAL_MAX_UINT32 means pi. Thus, the higher the value, the more left 
                         // the edge traverses.
                         return (getSortValue() > rComp.getSortValue());
                     }
@@ -183,11 +183,11 @@ namespace basegfx
             // method for cut support
             B2DPoint getCutPointForGivenY(double fGivenY)
             {
-                // Calculate cut point locally (do not use interpolate) since it is numerically
+                // Calculate cut point locally (do not use interpolate) since it is numerically 
                 // necessary to guarantee the new, equal Y-coordinate
                 const double fFactor((fGivenY - getStart().getY()) / getDeltaY());
                 const double fDeltaXNew(fFactor * getDeltaX());
-
+                
                 return B2DPoint(getStart().getX() + fDeltaXNew, fGivenY);
             }
         };
@@ -211,10 +211,10 @@ namespace basegfx
         {
         private:
             // local data
-            sal_uInt32                  mnInitialEdgeEntryCount;
-            TrDeEdgeEntries             maTrDeEdgeEntries;
-            ::std::vector< B2DPoint >   maPoints;
-            ::std::vector< B2DPoint* >  maNewPoints;
+            sal_uInt32					mnInitialEdgeEntryCount;
+            TrDeEdgeEntries				maTrDeEdgeEntries;
+            ::std::vector< B2DPoint >	maPoints;
+            ::std::vector< B2DPoint* >	maNewPoints;
 
             void addEdgeSorted(
                 TrDeEdgeEntries::iterator aCurrent,
@@ -292,12 +292,12 @@ namespace basegfx
                 {
                     return false;
                 }
-
+                
                 if(aEdgeA.getStart().equal(aEdgeB.getEnd(), fTools::getSmallValue()))
                 {
                     return false;
                 }
-
+                
                 if(aEdgeA.getEnd().equal(aEdgeB.getStart(), fTools::getSmallValue()))
                 {
                     return false;
@@ -378,7 +378,7 @@ namespace basegfx
                     {
                         delete pNewPoint;
                     }
-
+                
                     return bRetval;
                 }
 
@@ -434,7 +434,7 @@ namespace basegfx
                                 {
                                     // cut is in XRange of horizontal edge, potenitally needed cut
                                     B2DPoint* pNewPoint = new B2DPoint(aSplit);
-
+                                    
                                     if(splitEdgeAtGivenPoint(aCompare, *pNewPoint, aCurrent))
                                     {
                                         maNewPoints.push_back(pNewPoint);
@@ -455,7 +455,7 @@ namespace basegfx
         public:
             TrapezoidSubdivider(
                 const B2DPolyPolygon& rSourcePolyPolygon)
-            :   mnInitialEdgeEntryCount(0),
+            :	mnInitialEdgeEntryCount(0),
                 maTrDeEdgeEntries(),
                 maPoints(),
                 maNewPoints()
@@ -506,8 +506,8 @@ namespace basegfx
                     }
 
                     // Moved the edge construction to a 3rd run: doing it in the 2nd run is
-                    // possible(and i used it), but requires a working vector::reserve()
-                    // implementation, else the vector will be reallocated and the pointers
+                    // possible(and i used it), but requires a working vector::reserve() 
+                    // implementation, else the vector will be reallocated and the pointers 
                     // in the edges may be wrong. Security first here.
                     sal_uInt32 nStartIndex(0);
 
@@ -583,7 +583,7 @@ namespace basegfx
                 //
                 // There always must be two edges with the same YStart value: When adding the polygons
                 // in the constructor, there is always a topmost point from which two edges start; when
-                // the topmost is an edge, there is a start and end of this edge from which two edges
+                // the topmost is an edge, there is a start and end of this edge from which two edges 
                 // start. All cases have two edges with same StartY (QED).
                 //
                 // Based on this these edges get corrected when:
@@ -593,7 +593,7 @@ namespace basegfx
                 // - another edge starts inside the thought trapezoid
                 //
                 // All this cases again produce a valid state so that the first two edges have a common
-                // Ystart again. Some cases lead to a restart of the process, some allow consuming the
+                // Ystart again. Some cases lead to a restart of the process, some allow consuming the 
                 // edges and create the intended trapezoid.
                 //
                 // Be careful when doing chages here: It is essential to keep all possible paths
@@ -606,8 +606,8 @@ namespace basegfx
                 {
                     // measuring shows that the relation between edges and created trapezoids is
                     // mostly in the 1:1 range, thus reserve as much trapezoids as edges exist. Do
-                    // not use maTrDeEdgeEntries.size() since that may be a non-constant time
-                    // operation for Lists. Instead, use mnInitialEdgeEntryCount which will contain
+                    // not use maTrDeEdgeEntries.size() since that may be a non-constant time 
+                    // operation for Lists. Instead, use mnInitialEdgeEntryCount which will contain 
                     // the roughly counted adds to the List
                     ro_Result.reserve(ro_Result.size() + mnInitialEdgeEntryCount);
                 }
@@ -634,9 +634,9 @@ namespace basegfx
 
                     if(!fTools::equal(aLeft.getStart().getY(), aRight.getStart().getY(), fTools::getSmallValue()))
                     {
-                        // Should not happen: We have a 2nd edge, but YStart is on another
+                        // Should not happen: We have a 2nd edge, but YStart is on another 
                         // line; consume the single edge to not have an endless loop and start
-                        // next. During development i constantly had breakpoints here, so i am
+                        // next. During development i constantly had breakpoints here, so i am 
                         // sure enough to add an assertion here
                         OSL_ENSURE(false, "Trapeziod decomposer in illegal state (!)");
                         maTrDeEdgeEntries.pop_front();
@@ -646,7 +646,7 @@ namespace basegfx
                     // aLeft and aRight build a thought trapezoid now. They have a common
                     // start line (same Y for start points). Potentially, one of the edges
                     // is longer than the other. It is only needed to look at the shorter
-                    // length which build the potential trapezoid. To do so, get the end points
+                    // length which build the potential trapezoid. To do so, get the end points 
                     // locally and adapt the evtl. longer one. Use only aLeftEnd and aRightEnd
                     // from here on, not the aLeft.getEnd() or aRight.getEnd() accesses.
                     B2DPoint aLeftEnd(aLeft.getEnd());
@@ -656,7 +656,7 @@ namespace basegfx
                     // needs to be prepared. Also remember which one actually is longer.
                     const bool bEndOnSameLine(fTools::equal(aLeftEnd.getY(), aRightEnd.getY(), fTools::getSmallValue()));
                     bool bLeftIsLonger(false);
-
+                    
                     if(!bEndOnSameLine)
                     {
                         // check which edge is longer and correct accordingly
@@ -698,7 +698,7 @@ namespace basegfx
                             else
                             {
                                 B2DPoint* pNewPoint = new B2DPoint(aRightEnd);
-
+                                
                                 if(splitEdgeAtGivenPoint(aRight, *pNewPoint, aCurrent))
                                 {
                                     maNewPoints.push_back(pNewPoint);
@@ -713,10 +713,10 @@ namespace basegfx
                         // consume both edges and start next run
                         maTrDeEdgeEntries.pop_front();
                         maTrDeEdgeEntries.pop_front();
-
+                        
                         continue;
                     }
-
+                
                     // check if the edges self-intersect. This can only happen when
                     // start and end point are different
                     bool bRangesSet(false);
@@ -742,7 +742,7 @@ namespace basegfx
 
                     // now we need to check if there are intersections with other edges
                     // or if other edges start inside the candidate trapezoid
-                    if(aCurrent != maTrDeEdgeEntries.end()
+                    if(aCurrent != maTrDeEdgeEntries.end() 
                         && fTools::less(aCurrent->getStart().getY(), aLeftEnd.getY()))
                     {
                         // get XRanges of edges
@@ -751,11 +751,11 @@ namespace basegfx
                             aLeftRange = B1DRange(aLeft.getStart().getX(), aLeftEnd.getX());
                             aRightRange = B1DRange(aRight.getStart().getX(), aRightEnd.getX());
                         }
-
+                        
                         // build full XRange for fast check
                         B1DRange aAllRange(aLeftRange);
                         aAllRange.expand(aRightRange);
-
+                    
                         // prepare loop iterator; aCurrent needs to stay unchanged for
                         // eventual sorted insertions of new EdgeNodes. Also prepare stop flag
                         TrDeEdgeEntries::iterator aLoop(aCurrent);
@@ -776,7 +776,7 @@ namespace basegfx
 
                             // get compare XRange
                             const B1DRange aCompareRange(aCompare.getStart().getX(), aCompare.getEnd().getX());
-
+                
                             // use fast range test first
                             if(aAllRange.overlaps(aCompareRange))
                             {
@@ -789,12 +789,12 @@ namespace basegfx
 
                                     // check for start point of aCompare being inside thought
                                     // trapezoid
-                                    if(aCompare.getStart().getX() >= aSplitLeft.getX() &&
+                                    if(aCompare.getStart().getX() >= aSplitLeft.getX() && 
                                         aCompare.getStart().getX() <= aSplitRight.getX())
                                     {
                                         // is inside, correct and restart loop
                                         B2DPoint* pNewLeft = new B2DPoint(aSplitLeft);
-
+                                        
                                         if(splitEdgeAtGivenPoint(aLeft, *pNewLeft, aCurrent))
                                         {
                                             maNewPoints.push_back(pNewLeft);
@@ -803,9 +803,9 @@ namespace basegfx
                                         {
                                             delete pNewLeft;
                                         }
-
+                                        
                                         B2DPoint* pNewRight = new B2DPoint(aSplitRight);
-
+        
                                         if(splitEdgeAtGivenPoint(aRight, *pNewRight, aCurrent))
                                         {
                                             maNewPoints.push_back(pNewRight);
@@ -814,7 +814,7 @@ namespace basegfx
                                         {
                                             delete pNewRight;
                                         }
-
+                                        
                                         bDone = true;
                                     }
                                 }
@@ -824,7 +824,7 @@ namespace basegfx
                                     // test for concrete cut of compare edge with left edge
                                     bDone = testAndCorrectEdgeIntersection(aLeft, aCompare, aCurrent);
                                 }
-
+                                
                                 if(!bDone && aRightRange.overlaps(aCompareRange))
                                 {
                                     // test for concrete cut of compare edge with Right edge
@@ -844,14 +844,14 @@ namespace basegfx
                     }
 
                     // when we get here, the intended trapezoid can be used. It needs to
-                    // be corrected, eventually (if prepared); but this is no reason not to
+                    // be corrected, eventually (if prepared); but this is no reason not to 
                     // use it in the same loop iteration
                     if(!bEndOnSameLine)
                     {
                         if(bLeftIsLonger)
                         {
                             B2DPoint* pNewPoint = new B2DPoint(aLeftEnd);
-
+                            
                             if(splitEdgeAtGivenPoint(aLeft, *pNewPoint, aCurrent))
                             {
                                 maNewPoints.push_back(pNewPoint);
@@ -864,7 +864,7 @@ namespace basegfx
                         else
                         {
                             B2DPoint* pNewPoint = new B2DPoint(aRightEnd);
-
+                            
                             if(splitEdgeAtGivenPoint(aRight, *pNewPoint, aCurrent))
                             {
                                 maNewPoints.push_back(pNewPoint);
@@ -887,7 +887,7 @@ namespace basegfx
                             aLeftEnd.getX(),
                             aRightEnd.getX(),
                             aLeftEnd.getY()));
-
+                    
                     maTrDeEdgeEntries.pop_front();
                     maTrDeEdgeEntries.pop_front();
                 }
@@ -907,7 +907,7 @@ namespace basegfx
         const double& rfBottomXLeft,
         const double& rfBottomXRight,
         const double& rfBottomY)
-    :   mfTopXLeft(rfTopXLeft),
+    :	mfTopXLeft(rfTopXLeft),
         mfTopXRight(rfTopXRight),
         mfTopY(rfTopY),
         mfBottomXLeft(rfBottomXLeft),
@@ -964,9 +964,9 @@ namespace basegfx
         }
 
         void createLineTrapezoidFromEdge(
-            B2DTrapezoidVector& ro_Result,
-            const B2DPoint& rPointA,
-            const B2DPoint& rPointB,
+            B2DTrapezoidVector& ro_Result, 
+            const B2DPoint& rPointA, 
+            const B2DPoint& rPointB, 
             double fLineWidth)
         {
             if(fTools::lessOrEqual(fLineWidth, 0.0))
@@ -1036,14 +1036,14 @@ namespace basegfx
                 aTrDeEdgeEntries.push_back(basegfx::trapezoidhelper::TrDeEdgeEntry(&aEndLow, &aStartLow, 0));
                 aTrDeEdgeEntries.sort();
 
-                // here we know we have exactly four edges, and they do not cut, touch or
+                // here we know we have exactly four edges, and they do not cut, touch or 
                 // intersect. This makes processing much easier. Get the first two as start
                 // edges for the thought trapezoid
                 basegfx::trapezoidhelper::TrDeEdgeEntries::iterator aCurrent(aTrDeEdgeEntries.begin());
                 basegfx::trapezoidhelper::TrDeEdgeEntries::reference aLeft(*aCurrent++);
                 basegfx::trapezoidhelper::TrDeEdgeEntries::reference aRight(*aCurrent++);
                 const bool bEndOnSameLine(fTools::equal(aLeft.getEnd().getY(), aRight.getEnd().getY(), fTools::getSmallValue()));
-
+                
                 if(bEndOnSameLine)
                 {
                     // create two triangle trapezoids
@@ -1070,7 +1070,7 @@ namespace basegfx
                 }
                 else
                 {
-                    // create three trapezoids. Check which edge is longer and
+                    // create three trapezoids. Check which edge is longer and 
                     // correct accordingly
                     const bool bLeftIsLonger(fTools::more(aLeft.getEnd().getY(), aRight.getEnd().getY()));
 
@@ -1080,7 +1080,7 @@ namespace basegfx
                         basegfx::trapezoidhelper::TrDeEdgeEntries::reference aLeft2(*aCurrent++);
                         const B2DPoint aSplitLeft(aLeft.getCutPointForGivenY(aRight.getEnd().getY()));
                         const B2DPoint aSplitRight(aRight2.getCutPointForGivenY(aLeft.getEnd().getY()));
-
+                        
                         ro_Result.push_back(
                             B2DTrapezoid(
                                 aLeft.getStart().getX(),
@@ -1089,7 +1089,7 @@ namespace basegfx
                                 aSplitLeft.getX(),
                                 aRight.getEnd().getX(),
                                 aRight.getEnd().getY()));
-
+                                
                         ro_Result.push_back(
                             B2DTrapezoid(
                                 aSplitLeft.getX(),
@@ -1098,7 +1098,7 @@ namespace basegfx
                                 aLeft2.getStart().getX(),
                                 aSplitRight.getX(),
                                 aLeft2.getStart().getY()));
-
+                                
                         ro_Result.push_back(
                             B2DTrapezoid(
                                 aLeft2.getStart().getX(),
@@ -1147,7 +1147,7 @@ namespace basegfx
         }
 
         void createLineTrapezoidFromB2DPolygon(
-            B2DTrapezoidVector& ro_Result,
+            B2DTrapezoidVector& ro_Result, 
             const B2DPolygon& rPolygon,
             double fLineWidth)
         {
@@ -1161,11 +1161,12 @@ namespace basegfx
 
             if(aSource.areControlPointsUsed())
             {
-                aSource = aSource.getDefaultAdaptiveSubdivision();
+            const double fPrecisionFactor = 0.25;
+                aSource = adaptiveSubdivideByDistance( aSource, fLineWidth * fPrecisionFactor );
             }
 
             const sal_uInt32 nPointCount(aSource.count());
-
+            
             if(!nPointCount)
             {
                 return;
@@ -1180,14 +1181,14 @@ namespace basegfx
             {
                 const sal_uInt32 nNextIndex((a + 1) % nPointCount);
                 const B2DPoint aNext(aSource.getB2DPoint(nNextIndex));
-
+                
                 createLineTrapezoidFromEdge(ro_Result, aCurrent, aNext, fLineWidth);
                 aCurrent = aNext;
             }
         }
 
         void createLineTrapezoidFromB2DPolyPolygon(
-            B2DTrapezoidVector& ro_Result,
+            B2DTrapezoidVector& ro_Result, 
             const B2DPolyPolygon& rPolyPolygon,
             double fLineWidth)
         {
@@ -1205,7 +1206,7 @@ namespace basegfx
             }
 
             const sal_uInt32 nCount(aSource.count());
-
+            
             if(!nCount)
             {
                 return;
@@ -1214,7 +1215,7 @@ namespace basegfx
             for(sal_uInt32 a(0); a < nCount; a++)
             {
                 createLineTrapezoidFromB2DPolygon(
-                    ro_Result,
+                    ro_Result, 
                     aSource.getB2DPolygon(a),
                     fLineWidth);
             }
diff --git a/basegfx/source/polygon/b3dpolygon.cxx b/basegfx/source/polygon/b3dpolygon.cxx
index 1985d3301d4b..5237fa589f42 100644
--- a/basegfx/source/polygon/b3dpolygon.cxx
+++ b/basegfx/source/polygon/b3dpolygon.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
@@ -42,38 +42,38 @@
 
 class CoordinateData3D
 {
-    basegfx::B3DPoint                               maPoint;
+    basegfx::B3DPoint								maPoint;
 
 public:
-    CoordinateData3D()
-    :   maPoint()
+    CoordinateData3D() 
+    :	maPoint() 
     {
     }
 
     explicit CoordinateData3D(const basegfx::B3DPoint& rData)
-    :   maPoint(rData)
+    :	maPoint(rData) 
     {
     }
 
-    const basegfx::B3DPoint& getCoordinate() const
-    {
-        return maPoint;
+    const basegfx::B3DPoint& getCoordinate() const 
+    { 
+        return maPoint; 
     }
 
-    void setCoordinate(const basegfx::B3DPoint& rValue)
-    {
-        if(rValue != maPoint)
-            maPoint = rValue;
+    void setCoordinate(const basegfx::B3DPoint& rValue) 
+    { 
+        if(rValue != maPoint) 
+            maPoint = rValue; 
     }
 
-    bool operator==(const CoordinateData3D& rData) const
-    {
-        return (maPoint == rData.getCoordinate());
+    bool operator==(const CoordinateData3D& rData) const 
+    {	
+        return (maPoint == rData.getCoordinate()); 
     }
 
-    void transform(const basegfx::B3DHomMatrix& rMatrix)
-    {
-        maPoint *= rMatrix;
+    void transform(const basegfx::B3DHomMatrix& rMatrix) 
+    { 
+        maPoint *= rMatrix; 
     }
 };
 
@@ -83,21 +83,21 @@ class CoordinateDataArray3D
 {
     typedef ::std::vector< CoordinateData3D > CoordinateData3DVector;
 
-    CoordinateData3DVector                          maVector;
+    CoordinateData3DVector							maVector;
 
 public:
     explicit CoordinateDataArray3D(sal_uInt32 nCount)
-    :   maVector(nCount)
+    :	maVector(nCount)
     {
     }
 
     explicit CoordinateDataArray3D(const CoordinateDataArray3D& rOriginal)
-    :   maVector(rOriginal.maVector)
+    :	maVector(rOriginal.maVector)
     {
     }
 
     CoordinateDataArray3D(const CoordinateDataArray3D& rOriginal, sal_uInt32 nIndex, sal_uInt32 nCount)
-    :   maVector(rOriginal.maVector.begin() + nIndex, rOriginal.maVector.begin() + (nIndex + nCount))
+    :	maVector(rOriginal.maVector.begin() + nIndex, rOriginal.maVector.begin() + (nIndex + nCount))
     {
     }
 
@@ -123,7 +123,7 @@ public:
             for(a = 1; a < nPointCount; a++)
             {
                 const basegfx::B3DPoint& rCandidate = maVector[a].getCoordinate();
-
+                
                 if((rCandidate.getX() < pSmallest->getX())
                     || (rCandidate.getX() == pSmallest->getX() && rCandidate.getY() < pSmallest->getY())
                     || (rCandidate.getX() == pSmallest->getX() && rCandidate.getY() == pSmallest->getY() && rCandidate.getZ() < pSmallest->getZ()))
@@ -237,7 +237,7 @@ public:
             const sal_uInt32 nHalfSize(maVector.size() >> 1L);
             CoordinateData3DVector::iterator aStart(maVector.begin());
             CoordinateData3DVector::iterator aEnd(maVector.end() - 1L);
-
+            
             for(sal_uInt32 a(0); a < nHalfSize; a++)
             {
                 ::std::swap(*aStart, *aEnd);
@@ -265,24 +265,24 @@ class BColorArray
 {
     typedef ::std::vector< ::basegfx::BColor > BColorDataVector;
 
-    BColorDataVector                                    maVector;
-    sal_uInt32                                          mnUsedEntries;
+    BColorDataVector									maVector;
+    sal_uInt32											mnUsedEntries;
 
 public:
     explicit BColorArray(sal_uInt32 nCount)
-    :   maVector(nCount),
+    :	maVector(nCount),
         mnUsedEntries(0L)
     {
     }
 
     explicit BColorArray(const BColorArray& rOriginal)
-    :   maVector(rOriginal.maVector),
+    :	maVector(rOriginal.maVector),
         mnUsedEntries(rOriginal.mnUsedEntries)
     {
     }
 
     BColorArray(const BColorArray& rOriginal, sal_uInt32 nIndex, sal_uInt32 nCount)
-    :   maVector(),
+    :	maVector(),
         mnUsedEntries(0L)
     {
         BColorDataVector::const_iterator aStart(rOriginal.maVector.begin());
@@ -314,8 +314,8 @@ public:
         return (maVector == rCandidate.maVector);
     }
 
-    bool isUsed() const
-    {
+    bool isUsed() const 
+    { 
         return (0L != mnUsedEntries);
     }
 
@@ -412,7 +412,7 @@ public:
             const sal_uInt32 nHalfSize(maVector.size() >> 1L);
             BColorDataVector::iterator aStart(maVector.begin());
             BColorDataVector::iterator aEnd(maVector.end() - 1L);
-
+            
             for(sal_uInt32 a(0); a < nHalfSize; a++)
             {
                 ::std::swap(*aStart, *aEnd);
@@ -429,24 +429,24 @@ class NormalsArray3D
 {
     typedef ::std::vector< ::basegfx::B3DVector > NormalsData3DVector;
 
-    NormalsData3DVector                                 maVector;
-    sal_uInt32                                          mnUsedEntries;
+    NormalsData3DVector									maVector;
+    sal_uInt32											mnUsedEntries;
 
 public:
     explicit NormalsArray3D(sal_uInt32 nCount)
-    :   maVector(nCount),
+    :	maVector(nCount),
         mnUsedEntries(0L)
     {
     }
 
     explicit NormalsArray3D(const NormalsArray3D& rOriginal)
-    :   maVector(rOriginal.maVector),
+    :	maVector(rOriginal.maVector),
         mnUsedEntries(rOriginal.mnUsedEntries)
     {
     }
 
     NormalsArray3D(const NormalsArray3D& rOriginal, sal_uInt32 nIndex, sal_uInt32 nCount)
-    :   maVector(),
+    :	maVector(),
         mnUsedEntries(0L)
     {
         NormalsData3DVector::const_iterator aStart(rOriginal.maVector.begin());
@@ -478,8 +478,8 @@ public:
         return (maVector == rCandidate.maVector);
     }
 
-    bool isUsed() const
-    {
+    bool isUsed() const 
+    { 
         return (0L != mnUsedEntries);
     }
 
@@ -576,7 +576,7 @@ public:
             const sal_uInt32 nHalfSize(maVector.size() >> 1L);
             NormalsData3DVector::iterator aStart(maVector.begin());
             NormalsData3DVector::iterator aEnd(maVector.end() - 1L);
-
+            
             for(sal_uInt32 a(0); a < nHalfSize; a++)
             {
                 ::std::swap(*aStart, *aEnd);
@@ -604,24 +604,24 @@ class TextureCoordinate2D
 {
     typedef ::std::vector< ::basegfx::B2DPoint > TextureData2DVector;
 
-    TextureData2DVector                                 maVector;
-    sal_uInt32                                          mnUsedEntries;
+    TextureData2DVector									maVector;
+    sal_uInt32											mnUsedEntries;
 
 public:
     explicit TextureCoordinate2D(sal_uInt32 nCount)
-    :   maVector(nCount),
+    :	maVector(nCount),
         mnUsedEntries(0L)
     {
     }
 
     explicit TextureCoordinate2D(const TextureCoordinate2D& rOriginal)
-    :   maVector(rOriginal.maVector),
+    :	maVector(rOriginal.maVector),
         mnUsedEntries(rOriginal.mnUsedEntries)
     {
     }
 
     TextureCoordinate2D(const TextureCoordinate2D& rOriginal, sal_uInt32 nIndex, sal_uInt32 nCount)
-    :   maVector(),
+    :	maVector(),
         mnUsedEntries(0L)
     {
         TextureData2DVector::const_iterator aStart(rOriginal.maVector.begin());
@@ -653,8 +653,8 @@ public:
         return (maVector == rCandidate.maVector);
     }
 
-    bool isUsed() const
-    {
+    bool isUsed() const 
+    { 
         return (0L != mnUsedEntries);
     }
 
@@ -751,7 +751,7 @@ public:
             const sal_uInt32 nHalfSize(maVector.size() >> 1L);
             TextureData2DVector::iterator aStart(maVector.begin());
             TextureData2DVector::iterator aEnd(maVector.end() - 1L);
-
+            
             for(sal_uInt32 a(0); a < nHalfSize; a++)
             {
                 ::std::swap(*aStart, *aEnd);
@@ -779,29 +779,29 @@ class ImplB3DPolygon
 {
     // The point vector. This vector exists always and defines the
     // count of members.
-    CoordinateDataArray3D                           maPoints;
+    CoordinateDataArray3D							maPoints;
 
     // The BColor vector. This vectors are created on demand
     // and may be zero.
-    BColorArray*                                    mpBColors;
+    BColorArray*									mpBColors;
 
     // The Normals vector. This vectors are created on demand
     // and may be zero.
-    NormalsArray3D*                                 mpNormals;
+    NormalsArray3D*									mpNormals;
 
     // The TextureCoordinates vector. This vectors are created on demand
     // and may be zero.
-    TextureCoordinate2D*                            mpTextureCoordiantes;
+    TextureCoordinate2D*							mpTextureCoordiantes;
 
     // The calculated plane normal. mbPlaneNormalValid says if it's valid.
-    ::basegfx::B3DVector                            maPlaneNormal;
+    ::basegfx::B3DVector							maPlaneNormal;
 
     // bitfield
     // flag which decides if this polygon is opened or closed
-    unsigned                                        mbIsClosed : 1;
+    unsigned										mbIsClosed : 1;
 
     // flag which says if maPlaneNormal is up-to-date
-    unsigned                                        mbPlaneNormalValid : 1;
+    unsigned										mbPlaneNormalValid : 1;
 
 protected:
     void invalidatePlaneNormal()
@@ -816,7 +816,7 @@ public:
     // This constructor is only used from the static identity polygon, thus
     // the RefCount is set to 1 to never 'delete' this static incarnation.
     ImplB3DPolygon()
-    :   maPoints(0L),
+    :	maPoints(0L),
         mpBColors(0L),
         mpNormals(0L),
         mpTextureCoordiantes(0L),
@@ -828,7 +828,7 @@ public:
     }
 
     ImplB3DPolygon(const ImplB3DPolygon& rToBeCopied)
-    :   maPoints(rToBeCopied.maPoints),
+    :	maPoints(rToBeCopied.maPoints),
         mpBColors(0L),
         mpNormals(0L),
         mpTextureCoordiantes(0L),
@@ -854,7 +854,7 @@ public:
     }
 
     ImplB3DPolygon(const ImplB3DPolygon& rToBeCopied, sal_uInt32 nIndex, sal_uInt32 nCount)
-    :   maPoints(rToBeCopied.maPoints, nIndex, nCount),
+    :	maPoints(rToBeCopied.maPoints, nIndex, nCount),
         mpBColors(0L),
         mpNormals(0L),
         mpTextureCoordiantes(0L),
@@ -1535,7 +1535,7 @@ public:
 
 namespace basegfx
 {
-    namespace { struct DefaultPolygon : public rtl::Static< B3DPolygon::ImplType,
+    namespace { struct DefaultPolygon : public rtl::Static< B3DPolygon::ImplType, 
                                                             DefaultPolygon > {}; }
 
     B3DPolygon::B3DPolygon() :
@@ -1592,7 +1592,7 @@ namespace basegfx
     basegfx::B3DPoint B3DPolygon::getB3DPoint(sal_uInt32 nIndex) const
     {
         OSL_ENSURE(nIndex < mpPolygon->count(), "B3DPolygon access outside range (!)");
-
+        
         return mpPolygon->getPoint(nIndex);
     }
 
@@ -1607,7 +1607,7 @@ namespace basegfx
     BColor B3DPolygon::getBColor(sal_uInt32 nIndex) const
     {
         OSL_ENSURE(nIndex < mpPolygon->count(), "B3DPolygon access outside range (!)");
-
+        
         return mpPolygon->getBColor(nIndex);
     }
 
@@ -1638,7 +1638,7 @@ namespace basegfx
     B3DVector B3DPolygon::getNormal(sal_uInt32 nIndex) const
     {
         OSL_ENSURE(nIndex < mpPolygon->count(), "B3DPolygon access outside range (!)");
-
+        
         return mpPolygon->getNormal(nIndex);
     }
 
@@ -1670,7 +1670,7 @@ namespace basegfx
     B2DPoint B3DPolygon::getTextureCoordinate(sal_uInt32 nIndex) const
     {
         OSL_ENSURE(nIndex < mpPolygon->count(), "B3DPolygon access outside range (!)");
-
+        
         return mpPolygon->getTextureCoordinate(nIndex);
     }
 
@@ -1702,7 +1702,7 @@ namespace basegfx
     void B3DPolygon::insert(sal_uInt32 nIndex, const ::basegfx::B3DPoint& rPoint, sal_uInt32 nCount)
     {
         OSL_ENSURE(nIndex <= mpPolygon->count(), "B3DPolygon Insert outside range (!)");
-
+        
         if(nCount)
             mpPolygon->insert(nIndex, rPoint, nCount);
     }
@@ -1762,11 +1762,11 @@ namespace basegfx
     void B3DPolygon::remove(sal_uInt32 nIndex, sal_uInt32 nCount)
     {
         OSL_ENSURE(nIndex + nCount <= mpPolygon->count(), "B3DPolygon Remove outside range (!)");
-
+        
         if(nCount)
             mpPolygon->remove(nIndex, nCount);
     }
-
+    
     void B3DPolygon::clear()
     {
         mpPolygon = DefaultPolygon::get();
diff --git a/basegfx/source/polygon/b3dpolygonclipper.cxx b/basegfx/source/polygon/b3dpolygonclipper.cxx
index 88ebf12dae7b..c7e3925e54f9 100644
--- a/basegfx/source/polygon/b3dpolygonclipper.cxx
+++ b/basegfx/source/polygon/b3dpolygonclipper.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
@@ -245,7 +245,7 @@ namespace basegfx
                             {
                                 impAppendCopy(aNewPolygon, rCandidate, nNextIndex);
                             }
-
+                        
                             // pepare next step
                             aCurrent = aNext;
                         }
@@ -279,7 +279,7 @@ namespace basegfx
                             {
                                 impAppendCopy(aNewPolygon, rCandidate, nNextIndex);
                             }
-
+                        
                             // pepare next step
                             aCurrent = aNext;
                         }
@@ -337,7 +337,7 @@ namespace basegfx
             {
                 const B3DRange aCandidateRange3D(getRange(rCandidate));
                 const B2DRange aCandidateRange(
-                    aCandidateRange3D.getMinX(), aCandidateRange3D.getMinY(),
+                    aCandidateRange3D.getMinX(), aCandidateRange3D.getMinY(), 
                     aCandidateRange3D.getMaxX(), aCandidateRange3D.getMaxY());
 
                 if(rRange.isInside(aCandidateRange))
diff --git a/basegfx/source/polygon/b3dpolygontools.cxx b/basegfx/source/polygon/b3dpolygontools.cxx
index 77bbbd379d3c..809eeec4997c 100644
--- a/basegfx/source/polygon/b3dpolygontools.cxx
+++ b/basegfx/source/polygon/b3dpolygontools.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
@@ -250,7 +250,7 @@ namespace basegfx
         {
             double fRetval(0.0);
             const sal_uInt32 nPointCount(rCandidate.count());
-
+            
             if(nPointCount > 1L)
             {
                 const sal_uInt32 nLoopCount(rCandidate.isClosed() ? nPointCount : nPointCount - 1L);
@@ -448,7 +448,7 @@ namespace basegfx
 
                             aSnippet.clear();
                         }
-
+                        
                         // prepare next DotDashArray step and flip line/gap flag
                         fLastDotDashMovingLength = fDotDashMovingLength;
                         fDotDashMovingLength += rDotDashArray[(++nDotDashIndex) % nDotDashCount];
@@ -458,7 +458,7 @@ namespace basegfx
                     // append snippet [fLastDotDashMovingLength, fEdgeLength]
                     const bool bHandleLine(bIsLine && pLineTarget);
                     const bool bHandleGap(!bIsLine && pGapTarget);
-
+                    
                     if(bHandleLine || bHandleGap)
                     {
                         if(!aSnippet.count())
@@ -468,10 +468,10 @@ namespace basegfx
 
                         aSnippet.append(aNextPoint);
                     }
-
+                    
                     // prepare move to next edge
                     fDotDashMovingLength -= fEdgeLength;
-
+                    
                     // prepare next edge step (end point gets new start point)
                     aCurrentPoint = aNextPoint;
                 }
@@ -673,7 +673,7 @@ namespace basegfx
                         if(bChangeY)
                         {
                             aTexCoor.setY(fOne);
-
+                            
                             if(bChangeX)
                             {
                                 bPolarPoints = true;
@@ -683,7 +683,7 @@ namespace basegfx
                     else
                     {
                         double fX(fOne - ((atan2(aVector.getZ(), aVector.getX()) + F_PI) / F_2PI));
-
+                        
                         // correct cartesinan point coordiante dependent from center value
                         if(fX > fXCenter + 0.5)
                         {
@@ -827,7 +827,7 @@ namespace basegfx
         bool isInEpsilonRange(const B3DPolygon& rCandidate, const B3DPoint& rTestPosition, double fDistance)
         {
             const sal_uInt32 nPointCount(rCandidate.count());
-
+            
             if(nPointCount)
             {
                 const sal_uInt32 nEdgeCount(rCandidate.isClosed() ? nPointCount : nPointCount - 1L);
@@ -894,7 +894,7 @@ namespace basegfx
                             {
                                 const B3DPoint aPreviousPoint(aCurrentPoint);
                                 aCurrentPoint = rCandidate.getB3DPoint(a);
-
+                                
                                 // cross-over in Z?
                                 const bool bCompZA(fTools::more(aPreviousPoint.getZ(), rPoint.getZ()));
                                 const bool bCompZB(fTools::more(aCurrentPoint.getZ(), rPoint.getZ()));
@@ -904,7 +904,7 @@ namespace basegfx
                                     // cross-over in Y?
                                     const bool bCompYA(fTools::more(aPreviousPoint.getY(), rPoint.getY()));
                                     const bool bCompYB(fTools::more(aCurrentPoint.getY(), rPoint.getY()));
-
+                                
                                     if(bCompYA == bCompYB)
                                     {
                                         if(bCompYA)
@@ -935,7 +935,7 @@ namespace basegfx
                             {
                                 const B3DPoint aPreviousPoint(aCurrentPoint);
                                 aCurrentPoint = rCandidate.getB3DPoint(a);
-
+                                
                                 // cross-over in Z?
                                 const bool bCompZA(fTools::more(aPreviousPoint.getZ(), rPoint.getZ()));
                                 const bool bCompZB(fTools::more(aCurrentPoint.getZ(), rPoint.getZ()));
@@ -945,7 +945,7 @@ namespace basegfx
                                     // cross-over in X?
                                     const bool bCompXA(fTools::more(aPreviousPoint.getX(), rPoint.getX()));
                                     const bool bCompXB(fTools::more(aCurrentPoint.getX(), rPoint.getX()));
-
+                                
                                     if(bCompXA == bCompXB)
                                     {
                                         if(bCompXA)
@@ -976,7 +976,7 @@ namespace basegfx
                             {
                                 const B3DPoint aPreviousPoint(aCurrentPoint);
                                 aCurrentPoint = rCandidate.getB3DPoint(a);
-
+                                
                                 // cross-over in Y?
                                 const bool bCompYA(fTools::more(aPreviousPoint.getY(), rPoint.getY()));
                                 const bool bCompYB(fTools::more(aCurrentPoint.getY(), rPoint.getY()));
@@ -986,7 +986,7 @@ namespace basegfx
                                     // cross-over in X?
                                     const bool bCompXA(fTools::more(aPreviousPoint.getX(), rPoint.getX()));
                                     const bool bCompXB(fTools::more(aCurrentPoint.getX(), rPoint.getX()));
-
+                                
                                     if(bCompXA == bCompXB)
                                     {
                                         if(bCompXA)
@@ -1055,7 +1055,7 @@ namespace basegfx
                     const double fZero(0.0);
                     const double fOne(1.0);
                     double fParamTestOnCurr(0.0);
-
+                    
                     if(aEdgeVector.getX() > aEdgeVector.getY())
                     {
                         if(aEdgeVector.getX() > aEdgeVector.getZ())
@@ -1133,7 +1133,7 @@ namespace basegfx
                 {
                     const B3DVector aCompareEdge(rPlanePoint - rEdgeStart);
                     const double fScalarCompare(rPlaneNormal.scalar(aCompareEdge));
-
+                    
                     fCut = fScalarCompare / fScalarEdge;
                     return true;
                 }
@@ -1157,7 +1157,7 @@ namespace basegfx
                     return getCutBetweenLineAndPlane(aPlaneNormal, aPointOnPlane, rEdgeStart, rEdgeEnd, fCut);
                 }
             }
-
+            
             return false;
         }
 
@@ -1201,7 +1201,7 @@ namespace basegfx
 
             if(nPointCount > 1)
             {
-                // Start by copying the source polygon to get a writeable copy. The closed state is
+                // Start by copying the source polygon to get a writeable copy. The closed state is 
                 // copied by aRetval's initialisation, too, so no need to copy it in this method
                 B3DPolygon aRetval(rCandidate);
 
diff --git a/basegfx/source/polygon/b3dpolypolygon.cxx b/basegfx/source/polygon/b3dpolypolygon.cxx
index a29680b14a59..90e179db258b 100644
--- a/basegfx/source/polygon/b3dpolypolygon.cxx
+++ b/basegfx/source/polygon/b3dpolypolygon.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
@@ -41,9 +41,9 @@
 
 class ImplB3DPolyPolygon
 {
-    typedef ::std::vector< ::basegfx::B3DPolygon >  PolygonVector;
+    typedef ::std::vector< ::basegfx::B3DPolygon >	PolygonVector;
 
-    PolygonVector                                   maPolygons;
+    PolygonVector									maPolygons;
 
 public:
     ImplB3DPolyPolygon() : maPolygons()
@@ -208,7 +208,7 @@ public:
 
 namespace basegfx
 {
-    namespace { struct DefaultPolyPolygon : public rtl::Static<B3DPolyPolygon::ImplType,
+    namespace { struct DefaultPolyPolygon : public rtl::Static<B3DPolyPolygon::ImplType, 
                                                                DefaultPolyPolygon> {}; }
 
     B3DPolyPolygon::B3DPolyPolygon() :
@@ -263,7 +263,7 @@ namespace basegfx
     B3DPolygon B3DPolyPolygon::getB3DPolygon(sal_uInt32 nIndex) const
     {
         OSL_ENSURE(nIndex < mpPolyPolygon->count(), "B3DPolyPolygon access outside range (!)");
-
+        
         return mpPolyPolygon->getB3DPolygon(nIndex);
     }
 
@@ -347,7 +347,7 @@ namespace basegfx
     void B3DPolyPolygon::insert(sal_uInt32 nIndex, const B3DPolygon& rPolygon, sal_uInt32 nCount)
     {
         OSL_ENSURE(nIndex <= mpPolyPolygon->count(), "B3DPolyPolygon Insert outside range (!)");
-
+        
         if(nCount)
             mpPolyPolygon->insert(nIndex, rPolygon, nCount);
     }
@@ -361,7 +361,7 @@ namespace basegfx
     void B3DPolyPolygon::insert(sal_uInt32 nIndex, const B3DPolyPolygon& rPolyPolygon)
     {
         OSL_ENSURE(nIndex <= mpPolyPolygon->count(), "B3DPolyPolygon Insert outside range (!)");
-
+        
         if(rPolyPolygon.count())
             mpPolyPolygon->insert(nIndex, rPolyPolygon);
     }
@@ -375,11 +375,11 @@ namespace basegfx
     void B3DPolyPolygon::remove(sal_uInt32 nIndex, sal_uInt32 nCount)
     {
         OSL_ENSURE(nIndex + nCount <= mpPolyPolygon->count(), "B3DPolyPolygon Remove outside range (!)");
-
+        
         if(nCount)
             mpPolyPolygon->remove(nIndex, nCount);
     }
-
+    
     void B3DPolyPolygon::clear()
     {
         mpPolyPolygon = DefaultPolyPolygon::get();
diff --git a/basegfx/source/polygon/b3dpolypolygontools.cxx b/basegfx/source/polygon/b3dpolypolygontools.cxx
index d86a4526acfd..6a7848f11f12 100644
--- a/basegfx/source/polygon/b3dpolypolygontools.cxx
+++ b/basegfx/source/polygon/b3dpolypolygontools.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
@@ -69,16 +69,16 @@ namespace basegfx
             if(rCandidate.count() && fFullDashDotLen > 0.0)
             {
                 B3DPolyPolygon aLineTarget, aGapTarget;
-
+    
                 for(sal_uInt32 a(0L); a < rCandidate.count(); a++)
                 {
                     const B3DPolygon aCandidate(rCandidate.getB3DPolygon(a));
-
+                    
                     applyLineDashing(
-                        aCandidate,
-                        rDotDashArray,
-                        pLineTarget ? &aLineTarget : 0,
-                        pGapTarget ? &aGapTarget : 0,
+                        aCandidate, 
+                        rDotDashArray, 
+                        pLineTarget ? &aLineTarget : 0, 
+                        pGapTarget ? &aGapTarget : 0, 
                         fFullDashDotLen);
 
                     if(pLineTarget)
@@ -341,8 +341,8 @@ namespace basegfx
 
             return aRetval;
         }
-
-        B3DPolyPolygon createSpherePolyPolygonFromB3DRange( const B3DRange& rRange,
+        
+        B3DPolyPolygon createSpherePolyPolygonFromB3DRange( const B3DRange& rRange, 
             sal_uInt32 nHorSeg, sal_uInt32 nVerSeg,
             double fVerStart, double fVerStop,
             double fHorStart, double fHorStop)
@@ -423,8 +423,8 @@ namespace basegfx
 
             return aRetval;
         }
-
-        B3DPolyPolygon createSphereFillPolyPolygonFromB3DRange( const B3DRange& rRange,
+        
+        B3DPolyPolygon createSphereFillPolyPolygonFromB3DRange( const B3DRange& rRange, 
             sal_uInt32 nHorSeg, sal_uInt32 nVerSeg,
             bool bNormals,
             double fVerStart, double fVerStop,
diff --git a/basegfx/source/range/b1drange.cxx b/basegfx/source/range/b1drange.cxx
index 6581b04680e2..e8cfd90ea54e 100644
--- a/basegfx/source/range/b1drange.cxx
+++ b/basegfx/source/range/b1drange.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
@@ -33,7 +33,7 @@
 
 namespace basegfx
 {
-    B1DRange::B1DRange( const B1IRange& rRange ) :
+    B1DRange::B1DRange( const B1IRange& rRange ) : 
         maRange()
     {
         if( !rRange.isEmpty() )
@@ -45,7 +45,7 @@ namespace basegfx
 
     B1IRange fround(const B1DRange& rRange)
     {
-        return rRange.isEmpty() ?
+        return rRange.isEmpty() ? 
             B1IRange() :
             B1IRange( fround( rRange.getMinimum()),
                       fround( rRange.getMaximum()) );
diff --git a/basegfx/source/range/b2dpolyrange.cxx b/basegfx/source/range/b2dpolyrange.cxx
index e212e083ef55..3487c2ade056 100644
--- a/basegfx/source/range/b2dpolyrange.cxx
+++ b/basegfx/source/range/b2dpolyrange.cxx
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2008 by Sun Microsystems, Inc.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -42,10 +42,10 @@
 #include <algorithm>
 #include <vector>
 
-static basegfx::B2VectorOrientation flipOrientation(
+static basegfx::B2VectorOrientation flipOrientation( 
     basegfx::B2VectorOrientation eOrient)
 {
-    return eOrient == basegfx::ORIENTATION_POSITIVE ?
+    return eOrient == basegfx::ORIENTATION_POSITIVE ? 
         basegfx::ORIENTATION_NEGATIVE : basegfx::ORIENTATION_POSITIVE;
 }
 
@@ -151,11 +151,11 @@ namespace basegfx
 
         void appendPolyRange(const ImplB2DPolyRange& rPolyRange)
         {
-            maRanges.insert(maRanges.end(),
-                            rPolyRange.maRanges.begin(),
+            maRanges.insert(maRanges.end(), 
+                            rPolyRange.maRanges.begin(), 
                             rPolyRange.maRanges.end());
-            maOrient.insert(maOrient.end(),
-                            rPolyRange.maOrient.begin(),
+            maOrient.insert(maOrient.end(), 
+                            rPolyRange.maOrient.begin(), 
                             rPolyRange.maOrient.end());
             updateBounds();
         }
@@ -200,7 +200,7 @@ namespace basegfx
             // cannot use boost::bind here, since isInside is overloaded.
             // It is currently not possible to resolve the overload
             // by considering one of the other template arguments.
-            std::vector<B2DRange>::const_iterator       aCurr( maRanges.begin() );
+            std::vector<B2DRange>::const_iterator 		aCurr( maRanges.begin() );
             const std::vector<B2DRange>::const_iterator aEnd ( maRanges.end() );
             while( aCurr != aEnd )
                 if( aCurr->isInside( rValue ) )
@@ -215,7 +215,7 @@ namespace basegfx
                 return false;
 
             const std::vector<B2DRange>::const_iterator aEnd( maRanges.end() );
-            return std::find_if( maRanges.begin(),
+            return std::find_if( maRanges.begin(), 
                                  aEnd,
                                  boost::bind<bool>( boost::mem_fn( &B2DRange::overlaps ),
                                                     _1,
@@ -260,8 +260,8 @@ namespace basegfx
         }
 
     private:
-        B2DRange                         maBounds;
-        std::vector<B2DRange>            maRanges;
+        B2DRange						 maBounds;
+        std::vector<B2DRange>			 maRanges;
         std::vector<B2VectorOrientation> maOrient;
     };
 
@@ -275,7 +275,7 @@ namespace basegfx
     B2DPolyRange::B2DPolyRange( const ElementType& rElem ) :
         mpImpl( ImplB2DPolyRange( rElem ) )
     {}
-
+    
     B2DPolyRange::B2DPolyRange( const B2DRange& rRange, B2VectorOrientation eOrient ) :
         mpImpl( ImplB2DPolyRange( rRange, eOrient ) )
     {}
@@ -382,7 +382,7 @@ namespace basegfx
     {
         return mpImpl->isInside(rTuple);
     }
-
+    
     bool B2DPolyRange::isInside( const B2DRange& rRange ) const
     {
         return mpImpl->isInside(rRange);
diff --git a/basegfx/source/range/b2drange.cxx b/basegfx/source/range/b2drange.cxx
index 693470c3ef14..a8cae6ef4917 100644
--- a/basegfx/source/range/b2drange.cxx
+++ b/basegfx/source/range/b2drange.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
@@ -35,7 +35,7 @@
 
 namespace basegfx
 {
-    B2DRange::B2DRange( const B2IRange& rRange ) :
+    B2DRange::B2DRange( const B2IRange& rRange ) : 
         maRangeX(),
         maRangeY()
     {
@@ -66,7 +66,7 @@ namespace basegfx
     {
         return rRange.isEmpty() ?
             B2IRange() :
-            B2IRange(fround(rRange.getMinimum()),
+            B2IRange(fround(rRange.getMinimum()), 
                      fround(rRange.getMaximum()));
     }
 } // end of namespace basegfx
diff --git a/basegfx/source/range/b2drangeclipper.cxx b/basegfx/source/range/b2drangeclipper.cxx
index 524479b4fde0..874e4ddfceb0 100644
--- a/basegfx/source/range/b2drangeclipper.cxx
+++ b/basegfx/source/range/b2drangeclipper.cxx
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2008 by Sun Microsystems, Inc.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -53,8 +53,8 @@ namespace basegfx
 {
     namespace
     {
-        // Generating a poly-polygon from a bunch of rectangles
-        //
+        // Generating a poly-polygon from a bunch of rectangles 
+        // 
         // Helper functionality for sweep-line algorithm
         // ====================================================
 
@@ -92,13 +92,13 @@ namespace basegfx
                 PROCEED_RIGHT=1
             };
 
-            /** Create active edge
+            /** Create active edge 
 
                 @param rRect
                 Rectangle this edge is part of
 
                 @param fInvariantCoord
-                The invariant ccordinate value of this edge
+                The invariant ccordinate value of this edge 
 
                 @param eEdgeType
                 Is fInvariantCoord the lower or the higher value, for
@@ -116,12 +116,12 @@ namespace basegfx
                 meEdgeDirection( eEdgeDirection )
             {}
 
-            double              getInvariantCoord() const { return mfInvariantCoord; }
+            double 				getInvariantCoord() const { return mfInvariantCoord; }
             const B2DRectangle& getRect() const { return *mpAssociatedRect; }
-            std::ptrdiff_t      getTargetPolygonIndex() const { return mnPolygonIdx; }
-            void                setTargetPolygonIndex( std::ptrdiff_t nIdx ) { mnPolygonIdx = nIdx; }
-            EdgeType            getEdgeType() const { return meEdgeType; }
-            EdgeDirection       getEdgeDirection() const { return meEdgeDirection; }
+            std::ptrdiff_t 		getTargetPolygonIndex() const { return mnPolygonIdx; }
+            void				setTargetPolygonIndex( std::ptrdiff_t nIdx ) { mnPolygonIdx = nIdx; }
+            EdgeType 			getEdgeType() const { return meEdgeType; }
+            EdgeDirection 		getEdgeDirection() const { return meEdgeDirection; }
 
             /// For STL sort
             bool operator<( const ActiveEdge& rRHS ) const { return mfInvariantCoord < rRHS.mfInvariantCoord; }
@@ -155,7 +155,7 @@ namespace basegfx
             std::ptrdiff_t      mnPolygonIdx;
 
             /// 'upper' or 'lower' edge of original rectangle.
-            EdgeType            meEdgeType;
+            EdgeType	        meEdgeType;
 
             /// 'left' or 'right'
             EdgeDirection       meEdgeDirection;
@@ -166,7 +166,7 @@ namespace basegfx
 
 
         /** Element of the sweep line event list
-
+            
             As the sweep line traverses across the overall area,
             rectangle edges parallel to it generate events, and
             rectangle edges orthogonal to it generate active
@@ -209,9 +209,9 @@ namespace basegfx
                 Is fPos the lower or the higher value, for the
                 rectangle this event is generated for?
              */
-            SweepLineEvent( double              fPos,
+            SweepLineEvent( double 				fPos,
                             const B2DRectangle& rRect,
-                            EdgeType            eEdgeType,
+                            EdgeType			eEdgeType,
                             EdgeDirection       eDirection) :
                 mfPos( fPos ),
                 mpAssociatedRect( &rRect ),
@@ -219,17 +219,17 @@ namespace basegfx
                 meEdgeDirection( eDirection )
             {}
 
-            double              getPos() const { return mfPos; }
+            double 				getPos() const { return mfPos; }
             const B2DRectangle& getRect() const { return *mpAssociatedRect; }
-            EdgeType            getEdgeType() const { return meEdgeType; }
-            EdgeDirection       getEdgeDirection() const { return meEdgeDirection; }
+            EdgeType 			getEdgeType() const { return meEdgeType; }
+            EdgeDirection 		getEdgeDirection() const { return meEdgeDirection; }
 
             /// For STL sort
             bool operator<( const SweepLineEvent& rRHS ) const { return mfPos < rRHS.mfPos; }
 
         private:
             /// position of the event, in the direction of the line sweep
-            double                mfPos;
+            double 		          mfPos;
 
             /** Rectangle this event is generated for
 
@@ -243,7 +243,7 @@ namespace basegfx
             const B2DRectangle*   mpAssociatedRect;
 
             /// 'upper' or 'lower' edge of original rectangle.
-            EdgeType              meEdgeType;
+            EdgeType	          meEdgeType;
 
             /// 'up' or 'down'
             EdgeDirection         meEdgeDirection;
@@ -253,7 +253,7 @@ namespace basegfx
 
 
         /** Smart point container for B2DMultiRange::getPolyPolygon()
-
+            
             This class provides methods needed only here, and is used
             as a place to store some additional information per
             polygon. Also, most of the intersection logic is
@@ -264,7 +264,7 @@ namespace basegfx
         public:
             /** Create polygon
              */
-            ImplPolygon() :
+            ImplPolygon() : 
                 mpLeadingRightEdge(NULL),
                 mnIdx(-1),
                 maPoints(),
@@ -278,8 +278,8 @@ namespace basegfx
             bool isFinished() const { return mbIsFinished; }
 
             /// Add point to the end of the existing points
-            void append( const B2DPoint& rPoint )
-            {
+            void append( const B2DPoint& rPoint ) 
+            { 
                 OSL_PRECOND( maPoints.empty() ||
                              maPoints.back().getX() == rPoint.getX() ||
                              maPoints.back().getY() == rPoint.getY(),
@@ -289,7 +289,7 @@ namespace basegfx
                     maPoints.back() != rPoint )
                 {
                     // avoid duplicate points
-                    maPoints.push_back( rPoint );
+                    maPoints.push_back( rPoint ); 
                 }
             }
 
@@ -316,25 +316,25 @@ namespace basegfx
                 list of upcoming active edges).
              */
             std::ptrdiff_t intersect( SweepLineEvent&   rEvent,
-                                      ActiveEdge&       rActiveEdge,
+                                      ActiveEdge&		rActiveEdge,
                                       VectorOfPolygons& rPolygonPool,
                                       B2DPolyPolygon&   rRes,
                                       bool              isFinishingEdge )
             {
                 OSL_PRECOND( !isFinished(),
                              "ImplPolygon::intersect(): called on already finished polygon!" );
-                OSL_PRECOND( !isFinishingEdge
+                OSL_PRECOND( !isFinishingEdge 
                              || (isFinishingEdge && &rEvent.getRect() == &rActiveEdge.getRect()),
                              "ImplPolygon::intersect(): inconsistent ending!" );
 
-                const B2DPoint aIntersectionPoint( rEvent.getPos(),
+                const B2DPoint aIntersectionPoint( rEvent.getPos(), 
                                                    rActiveEdge.getInvariantCoord() );
 
                 // intersection point, goes to our polygon
                 // unconditionally
                 append(aIntersectionPoint);
 
-                const bool isSweepLineEnteringRect(
+                const bool isSweepLineEnteringRect( 
                     rEvent.getEdgeType() == SweepLineEvent::STARTING_EDGE);
                 if( isFinishingEdge )
                 {
@@ -360,8 +360,8 @@ namespace basegfx
                 {
                     OSL_ENSURE( rActiveEdge.getTargetPolygonIndex() != -1,
                                 "ImplPolygon::intersect(): non-trivial intersection hit empty polygon!" );
-
-                    const bool isHittingLeftEdge(
+                    
+                    const bool isHittingLeftEdge( 
                         rActiveEdge.getEdgeDirection() == ActiveEdge::PROCEED_LEFT);
 
                     if( isHittingLeftEdge )
@@ -375,7 +375,7 @@ namespace basegfx
                                                       rPolygonPool);
                 }
             }
-
+                        
         private:
             std::ptrdiff_t getPolygonPoolIndex() const { return mnIdx; }
 
@@ -384,7 +384,7 @@ namespace basegfx
             {
                 const bool isActiveEdgeProceedLeft(
                     rActiveEdge.getEdgeDirection() == ActiveEdge::PROCEED_LEFT);
-                const bool isSweepLineEnteringRect(
+                const bool isSweepLineEnteringRect( 
                     rEvent.getEdgeType() == SweepLineEvent::STARTING_EDGE);
                 (void)isActiveEdgeProceedLeft;
                 (void)isSweepLineEnteringRect;
@@ -401,7 +401,7 @@ namespace basegfx
             {
                 OSL_ENSURE( rActiveEdge.getEdgeDirection() == ActiveEdge::PROCEED_RIGHT,
                             "ImplPolygon::handleInitialOwnRightEdge(): start edge wrong polygon order" );
-
+                
                 rActiveEdge.setTargetPolygonIndex(mnIdx);
                 mpLeadingRightEdge = &rActiveEdge;
             }
@@ -441,7 +441,7 @@ namespace basegfx
                 }
             }
 
-            std::ptrdiff_t handleComplexLeftEdge(ActiveEdge&       rActiveEdge,
+            std::ptrdiff_t handleComplexLeftEdge(ActiveEdge&	   rActiveEdge,
                                                  const B2DPoint&   rIntersectionPoint,
                                                  VectorOfPolygons& rPolygonPool,
                                                  B2DPolyPolygon&   rRes)
@@ -490,7 +490,7 @@ namespace basegfx
                 }
             }
 
-            std::ptrdiff_t handleComplexRightEdge(ActiveEdge&       rActiveEdge,
+            std::ptrdiff_t handleComplexRightEdge(ActiveEdge&		rActiveEdge,
                                                   const B2DPoint&   rIntersectionPoint,
                                                   VectorOfPolygons& rPolygonPool)
             {
@@ -498,10 +498,10 @@ namespace basegfx
                 ImplPolygon& rTmp=rPolygonPool.get(nTmpIdx);
 
                 rTmp.append(rIntersectionPoint);
-
+                
                 rActiveEdge.setTargetPolygonIndex(mnIdx);
                 mpLeadingRightEdge = &rActiveEdge;
-
+                
                 rTmp.mpLeadingRightEdge = NULL;
 
                 return nTmpIdx;
@@ -509,7 +509,7 @@ namespace basegfx
 
             /// True when sweep line hits our own active edge
             bool metOwnEdge(const SweepLineEvent& rEvent,
-                            ActiveEdge&           rActiveEdge)
+                            ActiveEdge&			  rActiveEdge)
             {
                 const bool bHitOwnEdge=&rEvent.getRect() == &rActiveEdge.getRect();
                 return bHitOwnEdge;
@@ -521,7 +521,7 @@ namespace basegfx
                 B2DPolygon aRes;
                 std::for_each( maPoints.begin(),
                                maPoints.end(),
-                               boost::bind(
+                               boost::bind( 
                      &B2DPolygon::append,
                                    boost::ref(aRes),
                                    _1,
@@ -532,13 +532,13 @@ namespace basegfx
 
             /** Finish this polygon, push to result set.
              */
-            void finish(B2DPolyPolygon& rRes)
-            {
+            void finish(B2DPolyPolygon& rRes) 
+            { 
                 OSL_PRECOND( maPoints.empty() ||
                              maPoints.front().getX() == maPoints.back().getX() ||
                              maPoints.front().getY() == maPoints.back().getY(),
                              "ImplPolygon::finish(): first and last point violate 90 degree line angle constraint!" );
-
+                
                 mbIsFinished = true;
                 mpLeadingRightEdge = NULL;
 
@@ -560,7 +560,7 @@ namespace basegfx
             std::vector<B2DPoint> maPoints;
 
             /// When true, this polygon is 'done', i.e. nothing must be added anymore.
-            bool                  mbIsFinished;
+            bool				  mbIsFinished;
         };
 
         /** Init sweep line event list
@@ -590,7 +590,7 @@ namespace basegfx
             {
                 const B2DRectangle& rCurrRect( *aCurrRect++ );
 
-                o_rEventVector.push_back(
+                o_rEventVector.push_back( 
                     SweepLineEvent( rCurrRect.getMinX(),
                                     rCurrRect,
                                     SweepLineEvent::STARTING_EDGE,
@@ -607,7 +607,7 @@ namespace basegfx
             {
                 const B2DRectangle& rCurrRect( *aCurrRectR++ );
 
-                o_rEventVector.push_back(
+                o_rEventVector.push_back( 
                     SweepLineEvent( rCurrRect.getMaxX(),
                                     rCurrRect,
                                     SweepLineEvent::FINISHING_EDGE,
@@ -656,8 +656,8 @@ namespace basegfx
             @param rCurrEvent
             The actual event that caused this call
          */
-        void createActiveEdgesFromStartEvent( ListOfEdges&      io_rEdgeList,
-                                              VectorOfPolygons& io_rPolygonPool,
+        void createActiveEdgesFromStartEvent( ListOfEdges&		io_rEdgeList,
+                                              VectorOfPolygons&	io_rPolygonPool,
                                               SweepLineEvent&   rCurrEvent )
         {
             ListOfEdges         aNewEdges;
@@ -670,16 +670,16 @@ namespace basegfx
             io_rPolygonPool.get(nIdxPolygon).setPolygonPoolIndex(nIdxPolygon);
 
             // upper edge
-            aNewEdges.push_back(
-                ActiveEdge(
+            aNewEdges.push_back( 
+                ActiveEdge( 
                     rRect,
                     rRect.getMinY(),
                     bGoesDown ? nIdxPolygon : -1,
                     ActiveEdge::UPPER,
                     bGoesDown ? ActiveEdge::PROCEED_LEFT : ActiveEdge::PROCEED_RIGHT) );
             // lower edge
-            aNewEdges.push_back(
-                ActiveEdge(
+            aNewEdges.push_back( 
+                ActiveEdge( 
                     rRect,
                     rRect.getMaxY(),
                     bGoesDown ? -1 : nIdxPolygon,
@@ -697,22 +697,22 @@ namespace basegfx
             // starts and finishes this rect correctly (as only then,
             // the polygon will have their associated active edges
             // set).
-            const double                nMinY( rRect.getMinY() );
-            const double                nMaxY( rRect.getMaxY() );
-            ListOfEdges::iterator       aCurr( io_rEdgeList.begin() );
+            const double				nMinY( rRect.getMinY() );
+            const double				nMaxY( rRect.getMaxY() );
+            ListOfEdges::iterator 	    aCurr( io_rEdgeList.begin() );
             const ListOfEdges::iterator aEnd ( io_rEdgeList.end() );
             while( aCurr != aEnd )
             {
                 const double nCurrY( aCurr->getInvariantCoord() );
 
-                if( nCurrY >= nMinY &&
+                if( nCurrY >= nMinY && 
                     aNewEdges.size() == 2 ) // only add, if not yet done.
                 {
                     // insert upper edge _before_ aCurr. Thus, it will
                     // be the first entry for a range of equal y
                     // values. Using splice here, since we hold
                     // references to the moved list element!
-                    io_rEdgeList.splice( aCurr,
+                    io_rEdgeList.splice( aCurr, 
                                          aNewEdges,
                                          aNewEdges.begin() );
                 }
@@ -724,7 +724,7 @@ namespace basegfx
                     // (aCurr is the first entry strictly larger than
                     // nMaxY). Using splice here, since we hold
                     // references to the moved list element!
-                    io_rEdgeList.splice( aCurr,
+                    io_rEdgeList.splice( aCurr, 
                                          aNewEdges,
                                          aNewEdges.begin() );
                     // done with insertion, can early-exit here.
@@ -797,13 +797,13 @@ namespace basegfx
                 // second encounter of my rect -> second edge
                 // encountered, done
                 const bool bExit=
-                    nCount &&
+                    nCount && 
                     isSameRect(*first,
                                rCurrRect);
 
                 // deal with current active edge
-                nCurrPolyIdx =
-                    rPolygonPool.get(nCurrPolyIdx).intersect(
+                nCurrPolyIdx = 
+                    rPolygonPool.get(nCurrPolyIdx).intersect( 
                         rCurrEvent,
                         *first,
                         rPolygonPool,
@@ -824,29 +824,29 @@ namespace basegfx
             }
         }
 
-        template<int bPerformErase> inline void processActiveEdgesTopDown(
+        template<int bPerformErase> inline void processActiveEdgesTopDown( 
             SweepLineEvent&   rCurrEvent,
             ListOfEdges&      rActiveEdgeList,
             VectorOfPolygons& rPolygonPool,
             B2DPolyPolygon&   rRes )
         {
             processActiveEdges<bPerformErase>(
-                rActiveEdgeList. begin(),
-                rActiveEdgeList. end(),
+                rActiveEdgeList. begin(), 
+                rActiveEdgeList. end(), 
                 rActiveEdgeList,
                 rCurrEvent,
                 rPolygonPool,
                 rRes);
         }
 
-        template<int bPerformErase> inline void processActiveEdgesBottomUp(
+        template<int bPerformErase> inline void processActiveEdgesBottomUp( 
             SweepLineEvent&   rCurrEvent,
             ListOfEdges&      rActiveEdgeList,
             VectorOfPolygons& rPolygonPool,
             B2DPolyPolygon&   rRes )
         {
             processActiveEdges<bPerformErase>(
-                rActiveEdgeList. rbegin(),
+                rActiveEdgeList. rbegin(), 
                 rActiveEdgeList. rend(),
                 rActiveEdgeList,
                 rCurrEvent,
@@ -865,7 +865,7 @@ namespace basegfx
             createActiveEdgesFromStartEvent( rActiveEdgeList,
                                              rPolygonPool,
                                              rCurrEvent );
-
+            
             if( SweepLineEvent::PROCEED_DOWN == rCurrEvent.getEdgeDirection() )
                 processActiveEdgesTopDown<NoErase>(
                     rCurrEvent, rActiveEdgeList, rPolygonPool, rRes);
@@ -901,7 +901,7 @@ namespace basegfx
 
     namespace tools
     {
-        B2DPolyPolygon solveCrossovers(const std::vector<B2DRange>& rRanges,
+        B2DPolyPolygon solveCrossovers(const std::vector<B2DRange>& rRanges, 
                                        const std::vector<B2VectorOrientation>& rOrientations)
         {
             // sweep-line algorithm to generate a poly-polygon
@@ -910,8 +910,8 @@ namespace basegfx
             //
             // This algorithm uses the well-known sweep line
             // concept, explained in every good text book about
-            // computational geometry.
-            //
+            // computational geometry. 
+            // 
             // We start with creating two structures for every
             // rectangle, one representing the left x coordinate,
             // one representing the right x coordinate (and both
@@ -929,7 +929,7 @@ namespace basegfx
 
             B2DPolyPolygon   aRes;
             VectorOfPolygons aPolygonPool;
-            ListOfEdges      aActiveEdgeList;
+            ListOfEdges 	 aActiveEdgeList;
 
             // sometimes not enough, but a usable compromise
             aPolygonPool.reserve( rRanges.size() );
diff --git a/basegfx/source/range/b2xrange.cxx b/basegfx/source/range/b2xrange.cxx
index 296b54574800..87046a0bc281 100644
--- a/basegfx/source/range/b2xrange.cxx
+++ b/basegfx/source/range/b2xrange.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
@@ -39,14 +39,14 @@ namespace basegfx
     {
         /** Generic implementation of the difference set computation
 
-            @tpl RangeType
+            @tpl RangeType 
             Type to operate on. Must provide ValueType and TraitsType
             nested types.
          */
-        template< class RangeType > void doComputeSetDifference(
-            ::std::vector< RangeType >& o_rRanges,
-            const RangeType&            a,
-            const RangeType&            b )
+        template< class RangeType > void doComputeSetDifference( 
+            ::std::vector< RangeType >&	o_rRanges,
+            const RangeType&			a,
+            const RangeType&			b )
         {
             o_rRanges.clear();
 
@@ -64,45 +64,45 @@ namespace basegfx
                 return;
             }
 
-            const typename RangeType::ValueType                     ax(a.getMinX());
-            const typename RangeType::ValueType                     ay(a.getMinY());
-            const typename RangeType::TraitsType::DifferenceType    aw(a.getWidth());
-            const typename RangeType::TraitsType::DifferenceType    ah(a.getHeight());
-            const typename RangeType::ValueType                     bx(b.getMinX());
-            const typename RangeType::ValueType                     by(b.getMinY());
-            const typename RangeType::TraitsType::DifferenceType    bw(b.getWidth());
-            const typename RangeType::TraitsType::DifferenceType    bh(b.getHeight());
-
-            const typename RangeType::TraitsType::DifferenceType    h0( (by > ay) ? by - ay : 0 );
-            const typename RangeType::TraitsType::DifferenceType    h3( (by + bh < ay + ah) ? ay + ah - by - bh : 0 );
-            const typename RangeType::TraitsType::DifferenceType    w1( (bx > ax) ? bx - ax : 0 );
-            const typename RangeType::TraitsType::DifferenceType    w2( (ax + aw > bx + bw) ? ax + aw - bx - bw : 0 );
-            const typename RangeType::TraitsType::DifferenceType    h12( (h0 + h3 < ah) ? ah - h0 - h3 : 0 );
+            const typename RangeType::ValueType 					ax(a.getMinX());
+            const typename RangeType::ValueType 					ay(a.getMinY());
+            const typename RangeType::TraitsType::DifferenceType 	aw(a.getWidth());
+            const typename RangeType::TraitsType::DifferenceType 	ah(a.getHeight());
+            const typename RangeType::ValueType 					bx(b.getMinX());
+            const typename RangeType::ValueType 					by(b.getMinY());
+            const typename RangeType::TraitsType::DifferenceType	bw(b.getWidth());
+            const typename RangeType::TraitsType::DifferenceType	bh(b.getHeight());
+
+            const typename RangeType::TraitsType::DifferenceType	h0( (by > ay) ? by - ay : 0 );
+            const typename RangeType::TraitsType::DifferenceType	h3( (by + bh < ay + ah) ? ay + ah - by - bh : 0 );
+            const typename RangeType::TraitsType::DifferenceType 	w1( (bx > ax) ? bx - ax : 0 );
+            const typename RangeType::TraitsType::DifferenceType	w2( (ax + aw > bx + bw) ? ax + aw - bx - bw : 0 );
+            const typename RangeType::TraitsType::DifferenceType	h12( (h0 + h3 < ah) ? ah - h0 - h3 : 0 );
 
             // TODO(E2): Use numeric_cast instead of static_cast here,
             // need range checks!
             if (h0 > 0)
-                o_rRanges.push_back(
+                o_rRanges.push_back( 
                     RangeType(ax,ay,
                               static_cast<typename RangeType::ValueType>(ax+aw),
                               static_cast<typename RangeType::ValueType>(ay+h0)) );
 
             if (w1 > 0 && h12 > 0)
-                o_rRanges.push_back(
+                o_rRanges.push_back( 
                     RangeType(ax,
                               static_cast<typename RangeType::ValueType>(ay+h0),
                               static_cast<typename RangeType::ValueType>(ax+w1),
                               static_cast<typename RangeType::ValueType>(ay+h0+h12)) );
 
             if (w2 > 0 && h12 > 0)
-                o_rRanges.push_back(
+                o_rRanges.push_back( 
                     RangeType(static_cast<typename RangeType::ValueType>(bx+bw),
                               static_cast<typename RangeType::ValueType>(ay+h0),
                               static_cast<typename RangeType::ValueType>(bx+bw+w2),
                               static_cast<typename RangeType::ValueType>(ay+h0+h12)) );
 
             if (h3 > 0)
-                o_rRanges.push_back(
+                o_rRanges.push_back( 
                     RangeType(ax,
                               static_cast<typename RangeType::ValueType>(ay+h0+h12),
                               static_cast<typename RangeType::ValueType>(ax+aw),
@@ -110,27 +110,27 @@ namespace basegfx
         }
     }
 
-    ::std::vector< B2IRange >& computeSetDifference( ::std::vector< B2IRange >& o_rResult,
-                                                     const B2IRange&            rFirst,
-                                                     const B2IRange&            rSecond )
+    ::std::vector< B2IRange >& computeSetDifference( ::std::vector< B2IRange >&	o_rResult,
+                                                     const B2IRange&			rFirst,
+                                                     const B2IRange&			rSecond )
     {
         doComputeSetDifference( o_rResult, rFirst, rSecond );
 
         return o_rResult;
     }
 
-    ::std::vector< B2DRange >& computeSetDifference( ::std::vector< B2DRange >& o_rResult,
-                                                     const B2DRange&            rFirst,
-                                                     const B2DRange&            rSecond )
+    ::std::vector< B2DRange >& computeSetDifference( ::std::vector< B2DRange >&	o_rResult,
+                                                     const B2DRange&			rFirst,
+                                                     const B2DRange&			rSecond )
     {
         doComputeSetDifference( o_rResult, rFirst, rSecond );
 
         return o_rResult;
     }
 
-    ::std::vector< B2IBox >& computeSetDifference( ::std::vector< B2IBox >& o_rResult,
-                                                   const B2IBox&            rFirst,
-                                                   const B2IBox&            rSecond )
+    ::std::vector< B2IBox >& computeSetDifference( ::std::vector< B2IBox >&	o_rResult,
+                                                   const B2IBox&			rFirst,
+                                                   const B2IBox&			rSecond )
     {
         doComputeSetDifference( o_rResult, rFirst, rSecond );
 
diff --git a/basegfx/source/range/b3drange.cxx b/basegfx/source/range/b3drange.cxx
index aaeeae684bdd..9c1c039a9cd2 100644
--- a/basegfx/source/range/b3drange.cxx
+++ b/basegfx/source/range/b3drange.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
@@ -72,11 +72,11 @@ namespace basegfx
     {
         return rRange.isEmpty() ?
             B3IRange() :
-            B3IRange(fround(rRange.getMinX()),
-                     fround(rRange.getMinY()),
-                     fround(rRange.getMinZ()),
-                     fround(rRange.getMaxX()),
-                     fround(rRange.getMaxY()),
+            B3IRange(fround(rRange.getMinX()), 
+                     fround(rRange.getMinY()), 
+                     fround(rRange.getMinZ()), 
+                     fround(rRange.getMaxX()), 
+                     fround(rRange.getMaxY()), 
                      fround(rRange.getMaxZ()));
     }
 
diff --git a/basegfx/source/raster/bpixelraster.cxx b/basegfx/source/raster/bpixelraster.cxx
index dd62ebd67634..92fec5cc9edd 100644
--- a/basegfx/source/raster/bpixelraster.cxx
+++ b/basegfx/source/raster/bpixelraster.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
diff --git a/basegfx/source/raster/bzpixelraster.cxx b/basegfx/source/raster/bzpixelraster.cxx
index dd1fe7719b1b..70ff41d8ae8d 100644
--- a/basegfx/source/raster/bzpixelraster.cxx
+++ b/basegfx/source/raster/bzpixelraster.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
diff --git a/basegfx/source/raster/rasterconvert3d.cxx b/basegfx/source/raster/rasterconvert3d.cxx
index 2c42dc313451..e64a61025437 100644
--- a/basegfx/source/raster/rasterconvert3d.cxx
+++ b/basegfx/source/raster/rasterconvert3d.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
@@ -59,7 +59,7 @@ namespace basegfx
     }
 
     RasterConverter3D::RasterConverter3D()
-    :   InterpolatorProvider3D(),
+    :	InterpolatorProvider3D(),
         maLineEntries()
     {}
 
@@ -106,7 +106,7 @@ namespace basegfx
 
                         if(!nStep || aCurrentEntry->decrementRasterConversionLineEntry3D(nStep))
                         {
-                            // add when exactly on current line or when incremet to it did not
+                            // add when exactly on current line or when incremet to it did not 
                             // completely consume it
                             if(nStep)
                             {
@@ -206,15 +206,15 @@ namespace basegfx
                     const double fEyeB(((*pViewToEye) * aEnd).getZ());
 
                     rEntry.setInverseTextureIndex(addInverseTextureInterpolator(
-                        rFill.getTextureCoordinate(a),
-                        rFill.getTextureCoordinate(b),
+                        rFill.getTextureCoordinate(a), 
+                        rFill.getTextureCoordinate(b), 
                         fEyeA, fEyeB, fInvYDelta));
                 }
                 else
                 {
                     rEntry.setTextureIndex(addTextureInterpolator(
-                        rFill.getTextureCoordinate(a),
-                        rFill.getTextureCoordinate(b),
+                        rFill.getTextureCoordinate(a), 
+                        rFill.getTextureCoordinate(b), 
                         fInvYDelta));
                 }
             }
@@ -236,7 +236,7 @@ namespace basegfx
             {
                 reset();
                 maLineEntries.clear();
-
+                
                 B2DVector aVector(aEnd.getX() - aStart.getX(), aEnd.getY() - aStart.getY());
                 aVector.normalize();
                 const B2DVector aPerpend(getPerpendicular(aVector) * ((static_cast<double>(nLineWidth) + 0.5) * 0.5));
@@ -270,7 +270,7 @@ namespace basegfx
                 {
                     reset();
                     maLineEntries.clear();
-
+                    
                     // horizontal line, create vertical entries. These will be sorted by
                     // X anyways, so no need to distinguish the case here
                     maLineEntries.push_back(RasterConversionLineEntry3D(
@@ -306,7 +306,7 @@ namespace basegfx
 
                 RasterConversionLineEntry3D& rEntry = maLineEntries[maLineEntries.size() - 1];
 
-                // need to choose a X-Distance for the 2nd edge which guarantees all pixels
+                // need to choose a X-Distance for the 2nd edge which guarantees all pixels 
                 // of the line to be set. This is exactly the X-Increment for one Y-Step.
                 // Same is true for Z, so in both cases, add one increment to them. To also
                 // guarantee one pixel per line, add a minimum of one for X.
diff --git a/basegfx/source/tools/b2dclipstate.cxx b/basegfx/source/tools/b2dclipstate.cxx
index 005dca1aa66a..f203d4f572c2 100644
--- a/basegfx/source/tools/b2dclipstate.cxx
+++ b/basegfx/source/tools/b2dclipstate.cxx
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2008 by Sun Microsystems, Inc.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -82,7 +82,7 @@ namespace tools
         bool isCleared() const
         {
             return !maClipPoly.count()
-                && !maPendingPolygons.count()
+                && !maPendingPolygons.count() 
                 && !maPendingRanges.count();
         }
 
@@ -102,7 +102,7 @@ namespace tools
 
         bool isNull() const
         {
-            return !maPendingPolygons.count()
+            return !maPendingPolygons.count() 
                 && !maPendingRanges.count()
                 && isNullClipPoly();
         }
@@ -118,9 +118,9 @@ namespace tools
 
         bool operator==(const ImplB2DClipState& rRHS) const
         {
-            return maPendingPolygons == rRHS.maPendingPolygons
+            return maPendingPolygons == rRHS.maPendingPolygons 
                 && maPendingRanges == rRHS.maPendingRanges
-                && maClipPoly == rRHS.maClipPoly
+                && maClipPoly == rRHS.maClipPoly 
                 && mePendingOps == rRHS.mePendingOps;
         }
 
@@ -207,10 +207,10 @@ namespace tools
         {
             if( isCleared() )
                 return;
-
+            
             addClipState(rOther, UNION);
         }
-
+        
         void intersectRange(const B2DRange& rRange)
         {
             if( isNull() )
@@ -239,10 +239,10 @@ namespace tools
         {
             if( isNull() )
                 return;
-
+            
             addClipState(rOther, INTERSECT);
         }
-
+        
         void subtractRange(const B2DRange& rRange )
         {
             if( isNull() )
@@ -266,7 +266,7 @@ namespace tools
 
             addPolyPolygon(rPolyPoly,SUBTRACT);
         }
-
+        
         void subtractClipState(const ImplB2DClipState& rOther)
         {
             if( isNull() )
@@ -274,7 +274,7 @@ namespace tools
 
             addClipState(rOther, SUBTRACT);
         }
-
+        
         void xorRange(const B2DRange& rRange)
         {
             addRange(rRange,XOR);
@@ -294,7 +294,7 @@ namespace tools
         {
             addClipState(rOther, XOR);
         }
-
+        
         B2DPolyPolygon getClipPoly() const
         {
             commitPendingRanges();
@@ -368,7 +368,7 @@ namespace tools
                     maPendingPolygons = solveCrossovers(maPendingPolygons);
                     maPendingPolygons = stripNeutralPolygons(maPendingPolygons);
                     maPendingPolygons = stripDispensablePolygons(maPendingPolygons, false);
-
+                        
                     if( bIsCleared )
                     {
                         // not representable, strictly speaking,
@@ -402,7 +402,7 @@ namespace tools
                 return;
 
             // use the specialized range clipper for the win
-            B2DPolyPolygon aCollectedRanges;
+            B2DPolyPolygon aCollectedRanges; 
             const bool bIsEmpty=isNullClipPoly();
             const bool bIsCleared=!maClipPoly.count();
             switch(mePendingOps)
@@ -470,7 +470,7 @@ namespace tools
                     aCollectedRanges = maPendingRanges.solveCrossovers();
                     aCollectedRanges = stripNeutralPolygons(aCollectedRanges);
                     aCollectedRanges = stripDispensablePolygons(aCollectedRanges, false);
-
+                        
                     if( bIsCleared )
                     {
                         // not representable, strictly speaking,
@@ -497,7 +497,7 @@ namespace tools
             maPendingRanges.clear();
             mePendingOps = UNION;
         }
-
+        
         mutable B2DPolyPolygon maPendingPolygons;
         mutable B2DPolyRange   maPendingRanges;
         mutable B2DPolyPolygon maClipPoly;
@@ -537,7 +537,7 @@ namespace tools
     {
         mpImpl.make_unique();
     }
-
+    
     void B2DClipState::makeNull()
     {
         mpImpl->makeNull();
@@ -630,7 +630,7 @@ namespace tools
     {
         mpImpl->subtractClipState(*rState.mpImpl);
     }
-
+    
     void B2DClipState::xorRange(const B2DRange& rRange)
     {
         mpImpl->xorRange(rRange);
diff --git a/basegfx/source/tools/canvastools.cxx b/basegfx/source/tools/canvastools.cxx
index 2192148461dc..8b4114cd329f 100755
--- a/basegfx/source/tools/canvastools.cxx
+++ b/basegfx/source/tools/canvastools.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
@@ -96,12 +96,12 @@ namespace basegfx
 
                 uno::Sequence< geometry::RealPoint2D > outputSequence( nNumPoints );
                 geometry::RealPoint2D* pOutput = outputSequence.getArray();
-
+                
                 // fill sequence from polygon
                 sal_uInt32 i;
                 for( i=0; i<nNumPoints; ++i )
                 {
-                    const ::basegfx::B2DPoint   aPoint( rPoly.getB2DPoint(i) );
+                    const ::basegfx::B2DPoint 	aPoint( rPoly.getB2DPoint(i) );
 
                     pOutput[i] = geometry::RealPoint2D( aPoint.getX(),
                                                         aPoint.getY() );
@@ -131,7 +131,7 @@ namespace basegfx
 
         //---------------------------------------------------------------------------------------
 
-        uno::Sequence< uno::Sequence< geometry::RealPoint2D > > pointSequenceSequenceFromB2DPolyPolygon( const ::basegfx::B2DPolyPolygon& rPolyPoly  )
+        uno::Sequence< uno::Sequence< geometry::RealPoint2D > > pointSequenceSequenceFromB2DPolyPolygon( const ::basegfx::B2DPolyPolygon& rPolyPoly	 )
         {
             const sal_uInt32 nNumPolies( rPolyPoly.count() );
             sal_uInt32 i;
@@ -149,8 +149,8 @@ namespace basegfx
 
         //---------------------------------------------------------------------------------------
 
-        uno::Reference< rendering::XPolyPolygon2D > xPolyPolygonFromB2DPolygon( const uno::Reference< rendering::XGraphicDevice >&  xGraphicDevice,
-                                                                                const ::basegfx::B2DPolygon&                        rPoly    )
+        uno::Reference< rendering::XPolyPolygon2D > xPolyPolygonFromB2DPolygon( const uno::Reference< rendering::XGraphicDevice >& 	xGraphicDevice,
+                                                                                const ::basegfx::B2DPolygon&						rPoly	 )
         {
             uno::Reference< rendering::XPolyPolygon2D > xRes;
 
@@ -182,8 +182,8 @@ namespace basegfx
 
         //---------------------------------------------------------------------------------------
 
-        uno::Reference< rendering::XPolyPolygon2D > xPolyPolygonFromB2DPolyPolygon( const uno::Reference< rendering::XGraphicDevice >&  xGraphicDevice,
-                                                                                    const ::basegfx::B2DPolyPolygon&                    rPolyPoly    )
+        uno::Reference< rendering::XPolyPolygon2D > xPolyPolygonFromB2DPolyPolygon( const uno::Reference< rendering::XGraphicDevice >& 	xGraphicDevice,
+                                                                                    const ::basegfx::B2DPolyPolygon&					rPolyPoly	 )
         {
             uno::Reference< rendering::XPolyPolygon2D > xRes;
 
@@ -195,13 +195,13 @@ namespace basegfx
 
             if( rPolyPoly.areControlPointsUsed() )
             {
-                xRes.set( xGraphicDevice->createCompatibleBezierPolyPolygon(
+                xRes.set( xGraphicDevice->createCompatibleBezierPolyPolygon( 
                               bezierSequenceSequenceFromB2DPolyPolygon( rPolyPoly ) ),
                           uno::UNO_QUERY );
             }
             else
             {
-                xRes.set( xGraphicDevice->createCompatibleLinePolyPolygon(
+                xRes.set( xGraphicDevice->createCompatibleLinePolyPolygon( 
                               pointSequenceSequenceFromB2DPolyPolygon( rPolyPoly ) ),
                           uno::UNO_QUERY );
             }
@@ -294,7 +294,7 @@ namespace basegfx
 
         ::basegfx::B2DPolyPolygon b2DPolyPolygonFromXPolyPolygon2D( const uno::Reference< rendering::XPolyPolygon2D >& xPoly )
         {
-            ::basegfx::unotools::UnoPolyPolygon* pPolyImpl =
+            ::basegfx::unotools::UnoPolyPolygon* pPolyImpl = 
                 dynamic_cast< ::basegfx::unotools::UnoPolyPolygon* >( xPoly.get() );
 
             if( pPolyImpl )
@@ -332,7 +332,7 @@ namespace basegfx
                         throw lang::IllegalArgumentException(
                             ::rtl::OUString::createFromAscii(
                                     "basegfx::unotools::b2DPolyPolygonFromXPolyPolygon2D(): Invalid input"
-                                    "poly-polygon, cannot retrieve vertex data"),
+                                    "poly-polygon, cannot retrieve vertex data"), 
                             uno::Reference< uno::XInterface >(),
                             0 );
                     }
@@ -348,8 +348,8 @@ namespace basegfx
 
         //---------------------------------------------------------------------------------------
 
-        ::basegfx::B2DHomMatrix& homMatrixFromAffineMatrix( ::basegfx::B2DHomMatrix&        output,
-                                                            const geometry::AffineMatrix2D& input )
+        ::basegfx::B2DHomMatrix& homMatrixFromAffineMatrix( ::basegfx::B2DHomMatrix&		output,
+                                                            const geometry::AffineMatrix2D&	input )
         {
             // ensure last row is [0,0,1] (and optimized away)
             output.identity();
@@ -400,8 +400,8 @@ namespace basegfx
             return output;
         }
 
-        geometry::AffineMatrix2D& affineMatrixFromHomMatrix( geometry::AffineMatrix2D&      output,
-                                                             const ::basegfx::B2DHomMatrix& input)
+        geometry::AffineMatrix2D& affineMatrixFromHomMatrix( geometry::AffineMatrix2D&		output,
+                                                             const ::basegfx::B2DHomMatrix&	input)
         {
             output.m00 = input.get(0,0);
             output.m01 = input.get(0,1);
@@ -415,13 +415,13 @@ namespace basegfx
 
         geometry::AffineMatrix3D& affineMatrixFromHomMatrix3D(
             geometry::AffineMatrix3D& output,
-            const ::basegfx::B3DHomMatrix&  input)
+            const ::basegfx::B3DHomMatrix&	input)
         {
             output.m00 = input.get(0,0);
             output.m01 = input.get(0,1);
             output.m02 = input.get(0,2);
             output.m03 = input.get(0,3);
-
+            
             output.m10 = input.get(1,0);
             output.m11 = input.get(1,1);
             output.m12 = input.get(1,2);
@@ -437,7 +437,7 @@ namespace basegfx
 
         //---------------------------------------------------------------------------------------
 
-        ::basegfx::B2DHomMatrix& homMatrixFromMatrix( ::basegfx::B2DHomMatrix&  output,
+        ::basegfx::B2DHomMatrix& homMatrixFromMatrix( ::basegfx::B2DHomMatrix&	output,
                                                       const geometry::Matrix2D& input )
         {
             // ensure last row is [0,0,1] (and optimized away)
diff --git a/basegfx/source/tools/debugplotter.cxx b/basegfx/source/tools/debugplotter.cxx
index 2c68eb44a846..d45c1726941b 100755
--- a/basegfx/source/tools/debugplotter.cxx
+++ b/basegfx/source/tools/debugplotter.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
@@ -40,7 +40,7 @@ namespace basegfx
     namespace
     {
         void outputHeader( const ::rtl::OString& rTitle,
-                           ::std::ostream*       pStm )
+                           ::std::ostream* 		 pStm )
         {
             // output gnuplot setup
             if( pStm )
@@ -70,12 +70,12 @@ namespace basegfx
                     "line(p,q,r) = p*(1-t)+q*t" << ::std::endl <<
                     // Plot a line's x component of a line in implicit
                     // form ax + by + c = 0
-                    "implicitLineX(a,b,c,t) = a*-c + t*-b" << ::std::endl <<
+                    "implicitLineX(a,b,c,t) = a*-c + t*-b" << ::std::endl <<									 
                     // Plot a line's y component of a line in implicit
                     // form ax + by + c = 0
-                    "implicitLineY(a,b,c,t) = b*-c + t*a" << ::std::endl <<
-                    "pointmarkx(c,t) = c-0.03*t" << ::std::endl <<                                       // hack for displaying single points in parametric form
-                    "pointmarky(c,t) = c+0.03*t" << ::std::endl <<                                       // hack for displaying single points in parametric form
+                    "implicitLineY(a,b,c,t) = b*-c + t*a" << ::std::endl <<									 	 
+                    "pointmarkx(c,t) = c-0.03*t" << ::std::endl <<										 // hack for displaying single points in parametric form
+                    "pointmarky(c,t) = c+0.03*t" << ::std::endl <<										 // hack for displaying single points in parametric form
                     "# end of setup" << ::std::endl;
             }
             else
@@ -103,12 +103,12 @@ namespace basegfx
                            "line(p,q,r) = p*(1-t)+q*t\n",
                            // Plot a line's x component of a line in implicit
                            // form ax + by + c = 0
-                           "implicitLineX(a,b,c,t) = a*-c + t*-b\n",
+                           "implicitLineX(a,b,c,t) = a*-c + t*-b\n",									 
                            // Plot a line's y component of a line in implicit
                            // form ax + by + c = 0
-                           "implicitLineY(a,b,c,t) = b*-c + t*a\n",
-                           "pointmarkx(c,t) = c-0.03*t\n",                                       // hack for displaying single points in parametric form
-                           "pointmarky(c,t) = c+0.03*t\n",                                       // hack for displaying single points in parametric form
+                           "implicitLineY(a,b,c,t) = b*-c + t*a\n",									 	 
+                           "pointmarkx(c,t) = c-0.03*t\n",										 // hack for displaying single points in parametric form
+                           "pointmarky(c,t) = c+0.03*t\n",										 // hack for displaying single points in parametric form
                            "# end of setup\n",
                            (const sal_Char*)rTitle );
             }
@@ -121,7 +121,7 @@ namespace basegfx
                 mpStream( pStm )
             {
             }
-
+            
             void outputPoint( const ::std::pair< B2DPoint, ::rtl::OString >& rElem )
             {
                 if( mpStream )
@@ -129,7 +129,7 @@ namespace basegfx
                 else
                     OSL_TRACE( " %f\t%f\n", rElem.first.getX(), rElem.first.getY() );
             }
-
+            
             void outputVector( const ::std::pair< B2DVector, ::rtl::OString >& rElem )
             {
                 if( mpStream )
@@ -137,16 +137,16 @@ namespace basegfx
                 else
                     OSL_TRACE( " %f\t%f\n\n", rElem.first.getX(), rElem.first.getY() );
             }
-
+            
             void outputRect( const ::std::pair< B2DRange, ::rtl::OString >& rElem )
             {
                 const double nX0( rElem.first.getMinX() );
                 const double nY0( rElem.first.getMinY() );
                 const double nX1( rElem.first.getMaxX() );
                 const double nY1( rElem.first.getMaxY() );
-
+                
                 if( mpStream )
-                    *mpStream << " "
+                    *mpStream << " " 
                               << nX0 << "\t" << nY0 << "\t"
                               << nX1 << "\t" << nY0 << "\t"
                               << nX1 << "\t" << nY1 << "\t"
@@ -154,7 +154,7 @@ namespace basegfx
                               << nX0 << "\t" << nY0 << ::std::endl << ::std::endl;
 
                 else
-                    OSL_TRACE( " %f\t%f\t%f\t%f\t%f\t%f\t%f\t%f\t%f\t%f\n\n",
+                    OSL_TRACE( " %f\t%f\t%f\t%f\t%f\t%f\t%f\t%f\t%f\t%f\n\n", 
                                nX0, nY0,
                                nX1, nY0,
                                nX1, nY1,
@@ -163,7 +163,7 @@ namespace basegfx
             }
 
         private:
-            ::std::ostream*     mpStream;
+            ::std::ostream* 	mpStream;            
         };
     }
 
@@ -201,7 +201,7 @@ namespace basegfx
             bHavePolygons )
         {
             outputHeader( maTitle, mpOutputStream );
-
+            
             print( "\n\n# parametric primitive output\n"
                    "plot [t=0:1] \\\n" );
 
@@ -236,7 +236,7 @@ namespace basegfx
                     if( maPolygons.at(i).first.areControlPointsUsed() )
                     {
                         const B2DPolygon& rCurrPoly( maPolygons.at(i).first );
-
+                        
                         const sal_uInt32 nCount( rCurrPoly.count() );
                         for( sal_uInt32 k=0; k<nCount; ++k )
                         {
@@ -249,7 +249,7 @@ namespace basegfx
                             const B2DPoint& rP3( k+1<nCount ? rCurrPoly.getB2DPoint(k+1) : rCurrPoly.getB2DPoint(k) );
 
                             if( mpOutputStream )
-                                *mpOutputStream << "  cubicBezier("
+                                *mpOutputStream << "  cubicBezier(" 
                                                 << rP0.getX() << ","
                                     << rP1.getX() << ","
                                     << rP2.getX() << ","
@@ -277,7 +277,7 @@ namespace basegfx
                     {
                         if( bNeedColon )
                             print( ", \\\n" );
-
+                        
                         if( mpOutputStream )
                             *mpOutputStream << " '-' using ($1):($2) title \"Polygon "
                                             << (const sal_Char*)maPolygons.at(i).second << "\" with lp";
@@ -362,15 +362,15 @@ namespace basegfx
                                               ::rtl::OString( pTitle ) ) );
     }
 
-    void DebugPlotter::plot( const B2DVector&   rVec,
-                             const sal_Char*    pTitle )
+    void DebugPlotter::plot( const B2DVector&	rVec,
+                             const sal_Char* 	pTitle )
     {
         maVectors.push_back( ::std::make_pair( rVec,
                                                ::rtl::OString( pTitle ) ) );
     }
 
-    void DebugPlotter::plot( const B2DCubicBezier&  rBezier,
-                             const sal_Char*        pTitle )
+    void DebugPlotter::plot( const B2DCubicBezier&	rBezier,
+                             const sal_Char* 		pTitle )
     {
         B2DPolygon aPoly;
         aPoly.append(rBezier.getStartPoint());
@@ -386,15 +386,15 @@ namespace basegfx
                                               ::rtl::OString( pTitle ) ) );
     }
 
-    void DebugPlotter::plot( const B2DPolygon&  rPoly,
-                             const sal_Char*    pTitle )
+    void DebugPlotter::plot( const B2DPolygon&	rPoly,
+                             const sal_Char* 	pTitle )
     {
         maPolygons.push_back( ::std::make_pair( rPoly,
                                                 ::rtl::OString( pTitle ) ) );
     }
 
-    void DebugPlotter::plot( const B2DPolyPolygon&  rPoly,
-                             const sal_Char*        pTitle )
+    void DebugPlotter::plot( const B2DPolyPolygon&	rPoly,
+                             const sal_Char* 		pTitle )
     {
         const ::rtl::OString aTitle( pTitle );
         const sal_uInt32 nCount( rPoly.count() );
diff --git a/basegfx/source/tools/gradienttools.cxx b/basegfx/source/tools/gradienttools.cxx
index 857b668da68e..2db3b34c422d 100644
--- a/basegfx/source/tools/gradienttools.cxx
+++ b/basegfx/source/tools/gradienttools.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
@@ -39,9 +39,9 @@ namespace basegfx
         for the border treatment. Factored out here.
     */
     static void init1DGradientInfo(ODFGradientInfo& o_rGradientInfo,
-                                   const B2DRange&  rTargetRange,
+                                   const B2DRange&  rTargetRange, 
                                    sal_uInt32       nSteps,
-                                   double           fBorder,
+                                   double           fBorder, 
                                    double           fAngle,
                                    bool             bAxial)
     {
@@ -75,7 +75,7 @@ namespace basegfx
             o_rGradientInfo.maTextureTransform.scale(1.0, fSizeWithoutBorder * .5);
             o_rGradientInfo.maTextureTransform.translate(0.0, 0.5);
         }
-        else
+        else 
         {
             if(!fTools::equal(fSizeWithoutBorder, 1.0))
             {
@@ -91,7 +91,7 @@ namespace basegfx
         {
             const B2DPoint aCenter(0.5*fTargetSizeX,
                                    0.5*fTargetSizeY);
-            o_rGradientInfo.maTextureTransform *=
+            o_rGradientInfo.maTextureTransform *= 
                 basegfx::tools::createRotateAroundPoint(aCenter, fAngle);
         }
 
@@ -110,17 +110,17 @@ namespace basegfx
         except for the border treatment. Factored out here.
     */
     static void initEllipticalGradientInfo(ODFGradientInfo& o_rGradientInfo,
-                                           const B2DRange&  rTargetRange,
+                                           const B2DRange&  rTargetRange, 
                                            const B2DVector& rOffset,
                                            sal_uInt32       nSteps,
-                                           double           fBorder,
+                                           double           fBorder, 
                                            double           fAngle,
                                            bool             bCircular)
     {
         o_rGradientInfo.maTextureTransform.identity();
         o_rGradientInfo.maBackTextureTransform.identity();
         o_rGradientInfo.mnSteps = nSteps;
-
+    
         fAngle = -fAngle;
 
         double fTargetSizeX(rTargetRange.getWidth());
@@ -136,7 +136,7 @@ namespace basegfx
             fTargetOffsetY -= (fOriginalDiag - fTargetSizeY) / 2.0;
             fTargetSizeX = fOriginalDiag;
             fTargetSizeY = fOriginalDiag;
-        }
+        }    
         else
         {
             fTargetOffsetX -= (0.4142 / 2.0 ) * fTargetSizeX;
@@ -183,10 +183,10 @@ namespace basegfx
         here.
     */
     static void initRectGradientInfo(ODFGradientInfo& o_rGradientInfo,
-                                     const B2DRange&  rTargetRange,
+                                     const B2DRange&  rTargetRange, 
                                      const B2DVector& rOffset,
                                      sal_uInt32       nSteps,
-                                     double           fBorder,
+                                     double           fBorder, 
                                      double           fAngle)
     {
         o_rGradientInfo.maTextureTransform.identity();
@@ -222,9 +222,9 @@ namespace basegfx
         // add texture rotate after scale to keep perpendicular angles
         if(0.0 != fAngle)
         {
-            const B2DPoint aCenter(0.5*fTargetSizeX,
+            const B2DPoint aCenter(0.5*fTargetSizeX, 
                                    0.5*fTargetSizeY);
-            o_rGradientInfo.maTextureTransform *=
+            o_rGradientInfo.maTextureTransform *= 
                 basegfx::tools::createRotateAroundPoint(aCenter, fAngle);
         }
 
@@ -250,100 +250,100 @@ namespace basegfx
     namespace tools
     {
         ODFGradientInfo& createLinearODFGradientInfo(ODFGradientInfo& o_rGradientInfo,
-                                                     const B2DRange&  rTargetArea,
-                                                     sal_uInt32       nSteps,
-                                                     double           fBorder,
+                                                     const B2DRange&  rTargetArea, 
+                                                     sal_uInt32       nSteps, 
+                                                     double           fBorder, 
                                                      double           fAngle)
         {
             init1DGradientInfo(o_rGradientInfo,
-                               rTargetArea,
+                               rTargetArea, 
                                nSteps,
-                               fBorder,
+                               fBorder, 
                                fAngle,
                                false);
             return o_rGradientInfo;
         }
 
         ODFGradientInfo& createAxialODFGradientInfo(ODFGradientInfo& o_rGradientInfo,
-                                                    const B2DRange&  rTargetArea,
-                                                    sal_uInt32       nSteps,
-                                                    double           fBorder,
+                                                    const B2DRange&  rTargetArea, 
+                                                    sal_uInt32       nSteps, 
+                                                    double           fBorder, 
                                                     double           fAngle)
         {
             init1DGradientInfo(o_rGradientInfo,
-                               rTargetArea,
+                               rTargetArea, 
                                nSteps,
-                               fBorder,
+                               fBorder, 
                                fAngle,
                                true);
             return o_rGradientInfo;
         }
 
         ODFGradientInfo& createRadialODFGradientInfo(ODFGradientInfo& o_rGradientInfo,
-                                                     const B2DRange&  rTargetArea,
+                                                     const B2DRange&  rTargetArea, 
                                                      const B2DVector& rOffset,
-                                                     sal_uInt32       nSteps,
+                                                     sal_uInt32       nSteps, 
                                                      double           fBorder)
         {
             initEllipticalGradientInfo(o_rGradientInfo,
-                                       rTargetArea,
+                                       rTargetArea, 
                                        rOffset,
                                        nSteps,
-                                       fBorder,
+                                       fBorder, 
                                        0.0,
                                        true);
             return o_rGradientInfo;
         }
 
         ODFGradientInfo& createEllipticalODFGradientInfo(ODFGradientInfo& o_rGradientInfo,
-                                                         const B2DRange&  rTargetArea,
+                                                         const B2DRange&  rTargetArea, 
                                                          const B2DVector& rOffset,
-                                                         sal_uInt32       nSteps,
-                                                         double           fBorder,
+                                                         sal_uInt32       nSteps, 
+                                                         double           fBorder, 
                                                          double           fAngle)
         {
             initEllipticalGradientInfo(o_rGradientInfo,
-                                       rTargetArea,
+                                       rTargetArea, 
                                        rOffset,
                                        nSteps,
-                                       fBorder,
+                                       fBorder, 
                                        fAngle,
                                        false);
             return o_rGradientInfo;
         }
 
         ODFGradientInfo& createSquareODFGradientInfo(ODFGradientInfo& o_rGradientInfo,
-                                                     const B2DRange&  rTargetArea,
+                                                     const B2DRange&  rTargetArea, 
                                                      const B2DVector& rOffset,
-                                                     sal_uInt32       nSteps,
-                                                     double           fBorder,
+                                                     sal_uInt32       nSteps, 
+                                                     double           fBorder, 
                                                      double           fAngle)
         {
             initRectGradientInfo(o_rGradientInfo,
-                                 rTargetArea,
+                                 rTargetArea, 
                                  rOffset,
                                  nSteps,
-                                 fBorder,
+                                 fBorder, 
                                  fAngle);
             return o_rGradientInfo;
         }
 
         ODFGradientInfo& createRectangularODFGradientInfo(ODFGradientInfo& o_rGradientInfo,
-                                                          const B2DRange&  rTargetArea,
+                                                          const B2DRange&  rTargetArea, 
                                                           const B2DVector& rOffset,
-                                                          sal_uInt32       nSteps,
-                                                          double           fBorder,
+                                                          sal_uInt32       nSteps, 
+                                                          double           fBorder, 
                                                           double           fAngle)
         {
             initRectGradientInfo(o_rGradientInfo,
-                                 rTargetArea,
+                                 rTargetArea, 
                                  rOffset,
                                  nSteps,
-                                 fBorder,
+                                 fBorder, 
                                  fAngle);
             return o_rGradientInfo;
         }
-
+        
     } // namespace tools
 
 } // namespace basegfx
diff --git a/basegfx/source/tools/keystoplerp.cxx b/basegfx/source/tools/keystoplerp.cxx
index 883bfec6bc96..e666543c846f 100644
--- a/basegfx/source/tools/keystoplerp.cxx
+++ b/basegfx/source/tools/keystoplerp.cxx
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2008 by Sun Microsystems, Inc.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -40,14 +40,14 @@ static void validateInput(const std::vector<double>& rKeyStops)
 {
     (void)rKeyStops;
 #ifdef DBG_UTIL
-    OSL_ENSURE( rKeyStops.size() > 1,
+    OSL_ENSURE( rKeyStops.size() > 1, 
                 "KeyStopLerp::KeyStopLerp(): key stop vector must have two entries or more" );
-
+            
     // rKeyStops must be sorted in ascending order
     for( ::std::size_t i=1, len=rKeyStops.size(); i<len; ++i )
     {
         if( rKeyStops[i-1] > rKeyStops[i] )
-            OSL_ENSURE( false,
+            OSL_ENSURE( false, 
                         "KeyStopLerp::KeyStopLerp(): time vector is not sorted in ascending order!" );
     }
 #endif
@@ -66,10 +66,10 @@ namespace basegfx
 
         KeyStopLerp::KeyStopLerp( const ::com::sun::star::uno::Sequence<double>& rKeyStops ) :
             maKeyStops(rKeyStops.getLength()),
-            mnLastIndex(0)
+            mnLastIndex(0)            
         {
-            std::copy( rKeyStops.getConstArray(),
-                       rKeyStops.getConstArray()+rKeyStops.getLength(),
+            std::copy( rKeyStops.getConstArray(), 
+                       rKeyStops.getConstArray()+rKeyStops.getLength(), 
                        maKeyStops.begin() );
             validateInput(maKeyStops);
         }
@@ -81,7 +81,7 @@ namespace basegfx
                 maKeyStops.at(mnLastIndex+1) >= fAlpha )
             {
                 // nope, find new index
-                mnLastIndex = std::min<std::ptrdiff_t>(
+                mnLastIndex = std::min<std::ptrdiff_t>( 
                     maKeyStops.size()-2,
                     // range is ensured by max below
                     std::max<std::ptrdiff_t>(
@@ -94,7 +94,7 @@ namespace basegfx
 
             // lerp between stop and stop+1
             const double fRawLerp=
-                (fAlpha-maKeyStops.at(mnLastIndex)) /
+                (fAlpha-maKeyStops.at(mnLastIndex)) / 
                 (maKeyStops.at(mnLastIndex+1) - maKeyStops.at(mnLastIndex));
 
             // clamp to permissible range (input fAlpha might be
diff --git a/basegfx/source/tools/liangbarsky.cxx b/basegfx/source/tools/liangbarsky.cxx
index f07cea4a34d9..ca222896e4fb 100644
--- a/basegfx/source/tools/liangbarsky.cxx
+++ b/basegfx/source/tools/liangbarsky.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
@@ -41,7 +41,7 @@ namespace basegfx
         {
             // see Foley/vanDam, pp. 122 for the Liang-Barsky line
             // clipping algorithm
-            inline bool liangBarskyClipT( double  nDenom,
+            inline bool liangBarskyClipT( double  nDenom, 
                                           double  nNumerator,
                                           double& io_rTE,
                                           double& io_rTL )
@@ -54,7 +54,7 @@ namespace basegfx
                         return false;
                     else if( t > io_rTE )
                         io_rTE = t;
-                }
+                } 
                 else if( nDenom < 0 )
                 {
                     t = nNumerator / nDenom;
@@ -74,9 +74,9 @@ namespace basegfx
 
         // see Foley/vanDam, pp. 122 for the Liang-Barsky line
         // clipping algorithm
-        bool liangBarskyClip2D( ::basegfx::B2DPoint&        io_rStart,
-                                ::basegfx::B2DPoint&        io_rEnd,
-                                const ::basegfx::B2DRange&  rClipRect )
+        bool liangBarskyClip2D( ::basegfx::B2DPoint& 		io_rStart, 
+                                ::basegfx::B2DPoint& 		io_rEnd,
+                                const ::basegfx::B2DRange&	rClipRect )
         {
             const double nDX( io_rEnd.getX() - io_rStart.getX() );
             const double nDY( io_rEnd.getY() - io_rStart.getY() );
@@ -91,16 +91,16 @@ namespace basegfx
                 double nTE( 0.0 );
                 double nTL( 1.0 );
                 if( liangBarskyClipT(nDX, rClipRect.getMinX() - io_rStart.getX(),
-                                     nTE, nTL ) )                   // inside wrt. left edge
+                                     nTE, nTL ) ) 					// inside wrt. left edge
                 {
                     if( liangBarskyClipT(-nDX, io_rStart.getX() - rClipRect.getMaxX(),
-                                         nTE, nTL ) )               // inside wrt. right edge
+                                         nTE, nTL ) ) 				// inside wrt. right edge
                     {
                         if( liangBarskyClipT(nDY, rClipRect.getMinY() - io_rStart.getY(),
-                                             nTE, nTL ) )           // inside wrt. bottom edge
+                                             nTE, nTL ) ) 			// inside wrt. bottom edge
                         {
                             if( liangBarskyClipT(-nDY, io_rStart.getY() - rClipRect.getMaxY(),
-                                                 nTE, nTL ) )       // inside wrt. top edge
+                                                 nTE, nTL ) ) 		// inside wrt. top edge
                             {
                                 // compute actual intersection points,
                                 // if nTL has changed
diff --git a/basegfx/source/tools/tools.cxx b/basegfx/source/tools/tools.cxx
index d375f144169d..523dc5f9bdc1 100644
--- a/basegfx/source/tools/tools.cxx
+++ b/basegfx/source/tools/tools.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
@@ -40,18 +40,18 @@ namespace basegfx
     {
         namespace
         {
-            inline double distance( const double&                   nX,
-                                    const double&                   nY,
-                                    const ::basegfx::B2DVector&     rNormal,
-                                    const double&                   nC )
+            inline double distance( const double&					nX,
+                                    const double&					nY,
+                                    const ::basegfx::B2DVector& 	rNormal, 
+                                    const double&					nC )
             {
                 return nX*rNormal.getX() + nY*rNormal.getY() - nC;
             }
 
-            void moveLineOutsideRect( ::basegfx::B2DPoint&          io_rStart,
-                                      ::basegfx::B2DPoint&          io_rEnd,
-                                      const ::basegfx::B2DVector&   rMoveDirection,
-                                      const ::basegfx::B2DRange&    rFitTarget      )
+            void moveLineOutsideRect( ::basegfx::B2DPoint& 			io_rStart,
+                                      ::basegfx::B2DPoint& 			io_rEnd,
+                                      const ::basegfx::B2DVector&	rMoveDirection,
+                                      const ::basegfx::B2DRange&	rFitTarget		)
             {
                 // calc c for normal line form equation n x - c = 0
                 const double nC( rMoveDirection.scalar( io_rStart ) );
@@ -60,17 +60,17 @@ namespace basegfx
                 // rect corners to the line
                 const double nMaxDistance( ::std::max(
                                                0.0,
-                                               ::std::max(
+                                               ::std::max( 
                                                    distance(rFitTarget.getMinX(),
                                                             rFitTarget.getMinY(),
                                                             rMoveDirection,
                                                             nC),
-                                                   ::std::max(
+                                                   ::std::max( 
                                                        distance(rFitTarget.getMinX(),
                                                                 rFitTarget.getMaxY(),
                                                                 rMoveDirection,
                                                                 nC),
-                                                       ::std::max(
+                                                       ::std::max( 
                                                            distance(rFitTarget.getMaxX(),
                                                                     rFitTarget.getMinY(),
                                                                     rMoveDirection,
@@ -88,11 +88,11 @@ namespace basegfx
             }
         }
 
-        void infiniteLineFromParallelogram( ::basegfx::B2DPoint&        io_rLeftTop,
-                                            ::basegfx::B2DPoint&        io_rLeftBottom,
-                                            ::basegfx::B2DPoint&        io_rRightTop,
-                                            ::basegfx::B2DPoint&        io_rRightBottom,
-                                            const ::basegfx::B2DRange&  rFitTarget  )
+        void infiniteLineFromParallelogram( ::basegfx::B2DPoint& 		io_rLeftTop,
+                                            ::basegfx::B2DPoint& 		io_rLeftBottom,
+                                            ::basegfx::B2DPoint& 		io_rRightTop,
+                                            ::basegfx::B2DPoint& 		io_rRightBottom,
+                                            const ::basegfx::B2DRange&	rFitTarget	)
         {
             // For the top and bottom border line of the
             // parallelogram, we determine the distance to all four
@@ -114,7 +114,7 @@ namespace basegfx
 
             const ::basegfx::B2DVector aNormalTop( aDirectionVertical );
             const ::basegfx::B2DVector aNormalBottom( -aDirectionVertical );
-
+            
             // now extend parallelogram, such that the bound rect
             // point are included
             moveLineOutsideRect( io_rLeftTop, io_rRightTop, aNormalTop, rFitTarget );
diff --git a/basegfx/source/tools/unopolypolygon.cxx b/basegfx/source/tools/unopolypolygon.cxx
index 871fed7c7d18..b10476e3e87e 100755
--- a/basegfx/source/tools/unopolypolygon.cxx
+++ b/basegfx/source/tools/unopolypolygon.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
@@ -61,8 +61,8 @@ namespace unotools
     }
 
     void SAL_CALL UnoPolyPolygon::addPolyPolygon(
-        const geometry::RealPoint2D&                        position,
-        const uno::Reference< rendering::XPolyPolygon2D >&  polyPolygon ) throw (lang::IllegalArgumentException,uno::RuntimeException)
+        const geometry::RealPoint2D& 						position, 
+        const uno::Reference< rendering::XPolyPolygon2D >&	polyPolygon ) throw (lang::IllegalArgumentException,uno::RuntimeException)
     {
         osl::MutexGuard const guard( m_aMutex );
         modifying();
@@ -115,7 +115,7 @@ namespace unotools
                 // found - contract violation.
                 if( !xLinePoly.is() )
                     throw lang::IllegalArgumentException(
-                        ::rtl::OUString(
+                        ::rtl::OUString( 
                             RTL_CONSTASCII_USTRINGPARAM(
                                 "UnoPolyPolygon::addPolyPolygon(): Invalid input "
                                 "poly-polygon, cannot retrieve vertex data")),
@@ -129,8 +129,8 @@ namespace unotools
             }
         }
 
-        const B2DRange  aBounds( tools::getRange( aSrcPoly ) );
-        const B2DVector     aOffset( unotools::b2DPointFromRealPoint2D( position ) -
+        const B2DRange	aBounds( tools::getRange( aSrcPoly ) );
+        const B2DVector 	aOffset( unotools::b2DPointFromRealPoint2D( position ) -
                                              aBounds.getMinimum() );
 
         if( !aOffset.equalZero() )
@@ -144,14 +144,14 @@ namespace unotools
 
     sal_Int32 SAL_CALL UnoPolyPolygon::getNumberOfPolygons() throw (uno::RuntimeException)
     {
-        osl::MutexGuard const guard( m_aMutex );
+        osl::MutexGuard const guard( m_aMutex );        
         return maPolyPoly.count();
     }
 
-    sal_Int32 SAL_CALL UnoPolyPolygon::getNumberOfPolygonPoints(
+    sal_Int32 SAL_CALL UnoPolyPolygon::getNumberOfPolygonPoints( 
         sal_Int32 polygon ) throw (lang::IndexOutOfBoundsException,uno::RuntimeException)
     {
-        osl::MutexGuard const guard( m_aMutex );
+        osl::MutexGuard const guard( m_aMutex );        
         checkIndex( polygon );
 
         return maPolyPoly.getB2DPolygon(polygon).count();
@@ -159,35 +159,35 @@ namespace unotools
 
     rendering::FillRule SAL_CALL UnoPolyPolygon::getFillRule() throw (uno::RuntimeException)
     {
-        osl::MutexGuard const guard( m_aMutex );
+        osl::MutexGuard const guard( m_aMutex );        
         return meFillRule;
     }
 
-    void SAL_CALL UnoPolyPolygon::setFillRule(
+    void SAL_CALL UnoPolyPolygon::setFillRule( 
         rendering::FillRule fillRule ) throw (uno::RuntimeException)
     {
-        osl::MutexGuard const guard( m_aMutex );
+        osl::MutexGuard const guard( m_aMutex );        
         modifying();
 
         meFillRule = fillRule;
     }
 
-    sal_Bool SAL_CALL UnoPolyPolygon::isClosed(
+    sal_Bool SAL_CALL UnoPolyPolygon::isClosed( 
         sal_Int32 index ) throw (lang::IndexOutOfBoundsException,uno::RuntimeException)
     {
-        osl::MutexGuard const guard( m_aMutex );
+        osl::MutexGuard const guard( m_aMutex );        
         checkIndex( index );
 
         return maPolyPoly.getB2DPolygon(index).isClosed();
     }
 
     void SAL_CALL UnoPolyPolygon::setClosed(
-        sal_Int32 index,
+        sal_Int32 index, 
         sal_Bool closedState ) throw (lang::IndexOutOfBoundsException,uno::RuntimeException)
     {
         osl::MutexGuard const guard( m_aMutex );
         modifying();
-
+        
         if( index == -1L )
         {
             // set all
@@ -207,28 +207,28 @@ namespace unotools
     }
 
     uno::Sequence< uno::Sequence< geometry::RealPoint2D > > SAL_CALL UnoPolyPolygon::getPoints(
-        sal_Int32 nPolygonIndex,
-        sal_Int32 nNumberOfPolygons,
-        sal_Int32 nPointIndex,
+        sal_Int32 nPolygonIndex, 
+        sal_Int32 nNumberOfPolygons, 
+        sal_Int32 nPointIndex, 
         sal_Int32 nNumberOfPoints ) throw (lang::IndexOutOfBoundsException,uno::RuntimeException)
     {
         osl::MutexGuard const guard( m_aMutex );
-
-        return unotools::pointSequenceSequenceFromB2DPolyPolygon(
+        
+        return unotools::pointSequenceSequenceFromB2DPolyPolygon( 
             getSubsetPolyPolygon( nPolygonIndex,
                                   nNumberOfPolygons,
                                   nPointIndex,
                                   nNumberOfPoints ) );
     }
 
-    void SAL_CALL UnoPolyPolygon::setPoints(
-        const uno::Sequence< uno::Sequence< geometry::RealPoint2D > >& points,
+    void SAL_CALL UnoPolyPolygon::setPoints( 
+        const uno::Sequence< uno::Sequence< geometry::RealPoint2D > >& points, 
         sal_Int32 nPolygonIndex ) throw (lang::IndexOutOfBoundsException,uno::RuntimeException)
     {
         osl::MutexGuard const guard( m_aMutex );
         modifying();
-
-        const B2DPolyPolygon& rNewPolyPoly(
+        
+        const B2DPolyPolygon& rNewPolyPoly( 
             unotools::polyPolygonFromPoint2DSequenceSequence( points ) );
 
         if( nPolygonIndex == -1 )
@@ -243,11 +243,11 @@ namespace unotools
         }
     }
 
-    geometry::RealPoint2D SAL_CALL UnoPolyPolygon::getPoint(
-        sal_Int32 nPolygonIndex,
+    geometry::RealPoint2D SAL_CALL UnoPolyPolygon::getPoint( 
+        sal_Int32 nPolygonIndex, 
         sal_Int32 nPointIndex ) throw (lang::IndexOutOfBoundsException,uno::RuntimeException)
     {
-        osl::MutexGuard const guard( m_aMutex );
+        osl::MutexGuard const guard( m_aMutex );        
         checkIndex( nPolygonIndex );
 
         const B2DPolygon& rPoly( maPolyPoly.getB2DPolygon( nPolygonIndex ) );
@@ -258,12 +258,12 @@ namespace unotools
         return unotools::point2DFromB2DPoint( rPoly.getB2DPoint( nPointIndex ) );
     }
 
-    void SAL_CALL UnoPolyPolygon::setPoint(
-        const geometry::RealPoint2D& point,
-        sal_Int32 nPolygonIndex,
+    void SAL_CALL UnoPolyPolygon::setPoint( 
+        const geometry::RealPoint2D& point, 
+        sal_Int32 nPolygonIndex, 
         sal_Int32 nPointIndex ) throw (lang::IndexOutOfBoundsException,uno::RuntimeException)
     {
-        osl::MutexGuard const guard( m_aMutex );
+        osl::MutexGuard const guard( m_aMutex );        
         checkIndex( nPolygonIndex );
         modifying();
 
@@ -277,28 +277,28 @@ namespace unotools
         maPolyPoly.setB2DPolygon( nPolygonIndex, aPoly );
     }
 
-    uno::Sequence< uno::Sequence< geometry::RealBezierSegment2D > > SAL_CALL UnoPolyPolygon::getBezierSegments(
+    uno::Sequence< uno::Sequence< geometry::RealBezierSegment2D > > SAL_CALL UnoPolyPolygon::getBezierSegments( 
         sal_Int32 nPolygonIndex,
-        sal_Int32 nNumberOfPolygons,
-        sal_Int32 nPointIndex,
+        sal_Int32 nNumberOfPolygons, 
+        sal_Int32 nPointIndex, 
         sal_Int32 nNumberOfPoints ) throw (lang::IndexOutOfBoundsException, uno::RuntimeException)
     {
-        osl::MutexGuard const guard( m_aMutex );
-        return unotools::bezierSequenceSequenceFromB2DPolyPolygon(
+        osl::MutexGuard const guard( m_aMutex );        
+        return unotools::bezierSequenceSequenceFromB2DPolyPolygon( 
             getSubsetPolyPolygon( nPolygonIndex,
                                   nNumberOfPolygons,
                                   nPointIndex,
                                   nNumberOfPoints ) );
     }
 
-    void SAL_CALL UnoPolyPolygon::setBezierSegments(
-        const uno::Sequence< uno::Sequence< geometry::RealBezierSegment2D > >&  points,
-        sal_Int32                                                               nPolygonIndex ) throw (lang::IndexOutOfBoundsException,
+    void SAL_CALL UnoPolyPolygon::setBezierSegments( 
+        const uno::Sequence< uno::Sequence< geometry::RealBezierSegment2D > >&	points, 
+        sal_Int32 																nPolygonIndex ) throw (lang::IndexOutOfBoundsException, 
                                                                                                        uno::RuntimeException)
     {
-        osl::MutexGuard const guard( m_aMutex );
+        osl::MutexGuard const guard( m_aMutex );        
         modifying();
-        const B2DPolyPolygon& rNewPolyPoly(
+        const B2DPolyPolygon& rNewPolyPoly( 
             unotools::polyPolygonFromBezier2DSequenceSequence( points ) );
 
         if( nPolygonIndex == -1 )
@@ -313,11 +313,11 @@ namespace unotools
         }
     }
 
-    geometry::RealBezierSegment2D SAL_CALL UnoPolyPolygon::getBezierSegment( sal_Int32 nPolygonIndex,
-                                                                             sal_Int32 nPointIndex ) throw (lang::IndexOutOfBoundsException,
+    geometry::RealBezierSegment2D SAL_CALL UnoPolyPolygon::getBezierSegment( sal_Int32 nPolygonIndex, 
+                                                                             sal_Int32 nPointIndex ) throw (lang::IndexOutOfBoundsException, 
                                                                                                             uno::RuntimeException)
     {
-        osl::MutexGuard const guard( m_aMutex );
+        osl::MutexGuard const guard( m_aMutex );        
         checkIndex( nPolygonIndex );
 
         const B2DPolygon& rPoly( maPolyPoly.getB2DPolygon( nPolygonIndex ) );
@@ -338,12 +338,12 @@ namespace unotools
                                               rCtrl1.getY() );
     }
 
-    void SAL_CALL UnoPolyPolygon::setBezierSegment( const geometry::RealBezierSegment2D& segment,
-                                                         sal_Int32                       nPolygonIndex,
-                                                         sal_Int32                       nPointIndex ) throw (lang::IndexOutOfBoundsException,
+    void SAL_CALL UnoPolyPolygon::setBezierSegment( const geometry::RealBezierSegment2D& segment, 
+                                                         sal_Int32 						 nPolygonIndex, 
+                                                         sal_Int32						 nPointIndex ) throw (lang::IndexOutOfBoundsException, 
                                                                                                               uno::RuntimeException)
     {
-        osl::MutexGuard const guard( m_aMutex );
+        osl::MutexGuard const guard( m_aMutex );        
         checkIndex( nPolygonIndex );
         modifying();
 
@@ -356,27 +356,27 @@ namespace unotools
         aPoly.setB2DPoint( nPointIndex,
                            B2DPoint( segment.Px,
                                      segment.Py ) );
-        aPoly.setNextControlPoint(nPointIndex,
+        aPoly.setNextControlPoint(nPointIndex, 
                                   B2DPoint(segment.C1x, segment.C1y));
-        aPoly.setPrevControlPoint((nPointIndex + 1) % nPointCount,
+        aPoly.setPrevControlPoint((nPointIndex + 1) % nPointCount, 
                                   B2DPoint(segment.C2x, segment.C2y));
 
         maPolyPoly.setB2DPolygon( nPolygonIndex, aPoly );
     }
 
     B2DPolyPolygon UnoPolyPolygon::getSubsetPolyPolygon(
-        sal_Int32 nPolygonIndex,
-        sal_Int32 nNumberOfPolygons,
-        sal_Int32 nPointIndex,
+        sal_Int32 nPolygonIndex, 
+        sal_Int32 nNumberOfPolygons, 
+        sal_Int32 nPointIndex, 
         sal_Int32 nNumberOfPoints ) const
     {
-        osl::MutexGuard const guard( m_aMutex );
+        osl::MutexGuard const guard( m_aMutex );        
         checkIndex( nPolygonIndex );
 
         const sal_Int32 nPolyCount( maPolyPoly.count() );
 
         // check for "full polygon" case
-        if( !nPolygonIndex &&
+        if( !nPolygonIndex && 
             !nPointIndex &&
             nNumberOfPolygons == nPolyCount &&
             nNumberOfPoints == -1 )
@@ -409,7 +409,7 @@ namespace unotools
 
                 nFirstPoint = nPointIndex;
             }
-
+                
             if( i==nNumberOfPolygons-1 && nNumberOfPoints != -1 )
             {
                 // very last polygon - respect nNumberOfPoints
@@ -443,7 +443,7 @@ namespace unotools
                 aSubsetPoly.append( aTmp );
             }
         }
-
+            
         return aSubsetPoly;
     }
 
@@ -468,7 +468,7 @@ namespace unotools
     {
         uno::Sequence< ::rtl::OUString > aRet(1);
         aRet[0] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM ( SERVICE_NAME ) );
-
+        
         return aRet;
     }
 
diff --git a/basegfx/source/tuple/b2dtuple.cxx b/basegfx/source/tuple/b2dtuple.cxx
index 01a3bf145d7e..535d46a4b068 100644
--- a/basegfx/source/tuple/b2dtuple.cxx
+++ b/basegfx/source/tuple/b2dtuple.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
@@ -41,9 +41,9 @@ namespace basegfx
         return EmptyTuple::get();
     }
 
-    B2DTuple::B2DTuple(const B2ITuple& rTup)
-    :   mfX( rTup.getX() ),
-        mfY( rTup.getY() )
+    B2DTuple::B2DTuple(const B2ITuple& rTup) 
+    :	mfX( rTup.getX() ), 
+        mfY( rTup.getY() ) 
     {}
 
     void B2DTuple::correctValues(const double fCompareValue)
diff --git a/basegfx/source/tuple/b2i64tuple.cxx b/basegfx/source/tuple/b2i64tuple.cxx
index 3457fc138dd1..50da246269c6 100644
--- a/basegfx/source/tuple/b2i64tuple.cxx
+++ b/basegfx/source/tuple/b2i64tuple.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
diff --git a/basegfx/source/tuple/b2ituple.cxx b/basegfx/source/tuple/b2ituple.cxx
index eb9888f11ecb..18f39a3a107f 100644
--- a/basegfx/source/tuple/b2ituple.cxx
+++ b/basegfx/source/tuple/b2ituple.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
@@ -43,109 +43,109 @@ namespace basegfx
     // external operators
     //////////////////////////////////////////////////////////////////////////
 
-    B2ITuple minimum(const B2ITuple& rTupA, const B2ITuple& rTupB)
-    {
+    B2ITuple minimum(const B2ITuple& rTupA, const B2ITuple& rTupB) 
+    { 
         B2ITuple aMin(
             (rTupB.getX() < rTupA.getX()) ? rTupB.getX() : rTupA.getX(),
-            (rTupB.getY() < rTupA.getY()) ? rTupB.getY() : rTupA.getY());
+            (rTupB.getY() < rTupA.getY()) ? rTupB.getY() : rTupA.getY()); 
         return aMin;
     }
 
-    B2ITuple maximum(const B2ITuple& rTupA, const B2ITuple& rTupB)
-    {
+    B2ITuple maximum(const B2ITuple& rTupA, const B2ITuple& rTupB) 
+    { 
         B2ITuple aMax(
             (rTupB.getX() > rTupA.getX()) ? rTupB.getX() : rTupA.getX(),
-            (rTupB.getY() > rTupA.getY()) ? rTupB.getY() : rTupA.getY());
+            (rTupB.getY() > rTupA.getY()) ? rTupB.getY() : rTupA.getY()); 
         return aMax;
     }
 
-    B2ITuple absolute(const B2ITuple& rTup)
-    {
+    B2ITuple absolute(const B2ITuple& rTup) 
+    { 
         B2ITuple aAbs(
             (0 > rTup.getX()) ? -rTup.getX() : rTup.getX(),
-            (0 > rTup.getY()) ? -rTup.getY() : rTup.getY());
+            (0 > rTup.getY()) ? -rTup.getY() : rTup.getY()); 
         return aAbs;
     }
 
-    B2DTuple interpolate(const B2ITuple& rOld1, const B2ITuple& rOld2, double t)
-    {
+    B2DTuple interpolate(const B2ITuple& rOld1, const B2ITuple& rOld2, double t) 
+    { 
         B2DTuple aInt(
             ((rOld2.getX() - rOld1.getX()) * t) + rOld1.getX(),
-            ((rOld2.getY() - rOld1.getY()) * t) + rOld1.getY());
+            ((rOld2.getY() - rOld1.getY()) * t) + rOld1.getY()); 
         return aInt;
     }
 
-    B2DTuple average(const B2ITuple& rOld1, const B2ITuple& rOld2)
-    {
+    B2DTuple average(const B2ITuple& rOld1, const B2ITuple& rOld2) 
+    { 
         B2DTuple aAvg(
             (rOld1.getX() + rOld2.getX()) * 0.5,
-            (rOld1.getY() + rOld2.getY()) * 0.5);
+            (rOld1.getY() + rOld2.getY()) * 0.5); 
         return aAvg;
     }
-
+    
     B2DTuple average(const B2ITuple& rOld1, const B2ITuple& rOld2, const B2ITuple& rOld3)
-    {
+    { 
         B2DTuple aAvg(
             (rOld1.getX() + rOld2.getX() + rOld3.getX()) * (1.0 / 3.0),
-            (rOld1.getY() + rOld2.getY() + rOld3.getY()) * (1.0 / 3.0));
+            (rOld1.getY() + rOld2.getY() + rOld3.getY()) * (1.0 / 3.0)); 
         return aAvg;
     }
 
     B2ITuple operator+(const B2ITuple& rTupA, const B2ITuple& rTupB)
-    {
-        B2ITuple aSum(rTupA);
-        aSum += rTupB;
-        return aSum;
+    { 
+        B2ITuple aSum(rTupA); 
+        aSum += rTupB; 
+        return aSum; 
     }
 
     B2ITuple operator-(const B2ITuple& rTupA, const B2ITuple& rTupB)
-    {
-        B2ITuple aSub(rTupA);
-        aSub -= rTupB;
-        return aSub;
+    { 
+        B2ITuple aSub(rTupA); 
+        aSub -= rTupB; 
+        return aSub; 
     }
 
     B2ITuple operator/(const B2ITuple& rTupA, const B2ITuple& rTupB)
-    {
-        B2ITuple aDiv(rTupA);
-        aDiv /= rTupB;
-        return aDiv;
+    { 
+        B2ITuple aDiv(rTupA); 
+        aDiv /= rTupB; 
+        return aDiv; 
     }
 
     B2ITuple operator*(const B2ITuple& rTupA, const B2ITuple& rTupB)
-    {
-        B2ITuple aMul(rTupA);
-        aMul *= rTupB;
-        return aMul;
+    { 
+        B2ITuple aMul(rTupA); 
+        aMul *= rTupB; 
+        return aMul; 
     }
 
     B2ITuple operator*(const B2ITuple& rTup, sal_Int32 t)
-    {
-        B2ITuple aNew(rTup);
-        aNew *= t;
-        return aNew;
+    { 
+        B2ITuple aNew(rTup); 
+        aNew *= t; 
+        return aNew; 
     }
 
     B2ITuple operator*(sal_Int32 t, const B2ITuple& rTup)
-    {
-        B2ITuple aNew(rTup);
-        aNew *= t;
-        return aNew;
+    { 
+        B2ITuple aNew(rTup); 
+        aNew *= t; 
+        return aNew; 
     }
 
     B2ITuple operator/(const B2ITuple& rTup, sal_Int32 t)
-    {
-        B2ITuple aNew(rTup);
-        aNew /= t;
-        return aNew;
+    { 
+        B2ITuple aNew(rTup); 
+        aNew /= t; 
+        return aNew; 
     }
 
     B2ITuple operator/(sal_Int32 t, const B2ITuple& rTup)
     {
-        B2ITuple aNew(t, t);
-        B2ITuple aTmp(rTup);
-        aNew /= aTmp;
-        return aNew;
+        B2ITuple aNew(t, t); 
+        B2ITuple aTmp(rTup); 
+        aNew /= aTmp; 
+        return aNew; 
     }
 
 } // end of namespace basegfx
diff --git a/basegfx/source/tuple/b3dtuple.cxx b/basegfx/source/tuple/b3dtuple.cxx
index d9204154b192..b9ae130fcb89 100644
--- a/basegfx/source/tuple/b3dtuple.cxx
+++ b/basegfx/source/tuple/b3dtuple.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
@@ -40,10 +40,10 @@ namespace basegfx
         return EmptyTuple::get();
     }
 
-    B3DTuple::B3DTuple(const B3ITuple& rTup)
-    :   mfX( rTup.getX() ),
+    B3DTuple::B3DTuple(const B3ITuple& rTup) 
+    :	mfX( rTup.getX() ), 
         mfY( rTup.getY() ),
-        mfZ( rTup.getZ() )
+        mfZ( rTup.getZ() ) 
     {}
 
     B3ITuple fround(const B3DTuple& rTup)
diff --git a/basegfx/source/tuple/b3i64tuple.cxx b/basegfx/source/tuple/b3i64tuple.cxx
index ce2094568bb8..fb1c4672c609 100644
--- a/basegfx/source/tuple/b3i64tuple.cxx
+++ b/basegfx/source/tuple/b3i64tuple.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
diff --git a/basegfx/source/tuple/b3ituple.cxx b/basegfx/source/tuple/b3ituple.cxx
index 014e8876588c..20dc0b48363d 100644
--- a/basegfx/source/tuple/b3ituple.cxx
+++ b/basegfx/source/tuple/b3ituple.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
diff --git a/basegfx/source/vector/b2dvector.cxx b/basegfx/source/vector/b2dvector.cxx
index bb08b104eff8..74eafa59c47c 100644
--- a/basegfx/source/vector/b2dvector.cxx
+++ b/basegfx/source/vector/b2dvector.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
@@ -61,16 +61,16 @@ namespace basegfx
         return *this;
     }
 
-    B2DVector& B2DVector::operator=( const B2DTuple& rVec )
-    {
+    B2DVector& B2DVector::operator=( const B2DTuple& rVec ) 
+    { 
         mfX = rVec.getX();
-        mfY = rVec.getY();
-        return *this;
+        mfY = rVec.getY(); 
+        return *this; 
     }
 
 
-    double B2DVector::getLength() const
-    {
+    double B2DVector::getLength() const 
+    { 
         if(fTools::equalZero(mfX))
         {
             return fabs(mfY);
@@ -80,17 +80,17 @@ namespace basegfx
             return fabs(mfX);
         }
 
-        return hypot( mfX, mfY );
+        return hypot( mfX, mfY ); 
     }
 
-    double B2DVector::scalar( const B2DVector& rVec ) const
-    {
-        return((mfX * rVec.mfX) + (mfY * rVec.mfY));
+    double B2DVector::scalar( const B2DVector& rVec ) const 
+    { 
+        return((mfX * rVec.mfX) + (mfY * rVec.mfY)); 
     }
 
-    double B2DVector::cross( const B2DVector& rVec ) const
-    {
-        return(mfX * rVec.getY() - mfY * rVec.getX());
+    double B2DVector::cross( const B2DVector& rVec ) const 
+    { 
+        return(mfX * rVec.getY() - mfY * rVec.getX()); 
     }
 
     double B2DVector::angle( const B2DVector& rVec ) const
@@ -153,7 +153,7 @@ namespace basegfx
     }
 
     B2VectorOrientation getOrientation( const B2DVector& rVecA, const B2DVector& rVecB )
-    {
+    { 
         double fVal(rVecA.getX() * rVecB.getY() - rVecA.getY() * rVecB.getX());
 
         if(fTools::equalZero(fVal))
diff --git a/basegfx/source/vector/b2ivector.cxx b/basegfx/source/vector/b2ivector.cxx
index 026a600c0c94..b1ffad45b809 100644
--- a/basegfx/source/vector/b2ivector.cxx
+++ b/basegfx/source/vector/b2ivector.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
diff --git a/basegfx/source/vector/b3dvector.cxx b/basegfx/source/vector/b3dvector.cxx
index 74e4eb07eb33..6fe3dfe18127 100644
--- a/basegfx/source/vector/b3dvector.cxx
+++ b/basegfx/source/vector/b3dvector.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
@@ -65,7 +65,7 @@ namespace basegfx
         aNew.normalize();
         return aNew;
     }
-
+    
     B3DVector B3DVector::getProjectionOnPlane(const B3DVector& rNormalizedPlane) const
     {
         B3DVector aNew(*this);
@@ -73,8 +73,8 @@ namespace basegfx
         aNew = cross(aNew, rNormalizedPlane);
 
         aNew.mfX = mfX - aNew.mfX;
-        aNew.mfY = mfY - aNew.mfY;
-        aNew.mfZ = mfZ - aNew.mfZ;
+        aNew.mfY = mfY - aNew.mfY; 
+        aNew.mfZ = mfZ - aNew.mfZ; 
 
         return aNew;
     }
diff --git a/basegfx/source/vector/b3ivector.cxx b/basegfx/source/vector/b3ivector.cxx
index a11871ef1b19..90122e4a6396 100644
--- a/basegfx/source/vector/b3ivector.cxx
+++ b/basegfx/source/vector/b3ivector.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
diff --git a/basegfx/source/workbench/bezierclip.cxx b/basegfx/source/workbench/bezierclip.cxx
index 12c0d6f7d6df..e489fd50ab96 100644
--- a/basegfx/source/workbench/bezierclip.cxx
+++ b/basegfx/source/workbench/bezierclip.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
@@ -58,7 +58,7 @@
 
 // -----------------------------------------------------------------------------
 
-/* Implementation of the so-called 'Fat-Line Bezier Clipping Algorithm' by Sederberg et al.
+/* Implementation of the so-called 'Fat-Line Bezier Clipping Algorithm' by Sederberg et al. 
  *
  * Actual reference is: T. W. Sederberg and T Nishita: Curve
  * intersection using Bezier clipping. In Computer Aided Design, 22
@@ -142,9 +142,9 @@ void Impl_calcFatLine( FatLine& line, const Bezier& c )
     }
 }
 
-void Impl_calcBounds( Point2D&          leftTop,
-                      Point2D&          rightBottom,
-                      const Bezier&     c1          )
+void Impl_calcBounds( Point2D& 			leftTop,
+                      Point2D& 			rightBottom,
+                      const Bezier& 	c1 			)
 {
     leftTop.x = ::std::min( c1.p0.x, ::std::min( c1.p1.x, ::std::min( c1.p2.x, c1.p3.x ) ) );
     leftTop.y = ::std::min( c1.p0.y, ::std::min( c1.p1.y, ::std::min( c1.p2.y, c1.p3.y ) ) );
@@ -180,11 +180,11 @@ bool Impl_doBBoxIntersect( const Bezier& c1,
  * the left, the second is the intersection of the max value line with
  * the convex hull from the right.
  */
-bool Impl_calcSafeParams( double&           t1,
-                          double&           t2,
-                          const Polygon2D&  rPoly,
-                          double            lowerYBound,
-                          double            upperYBound )
+bool Impl_calcSafeParams( double& 			t1, 
+                          double& 			t2,
+                          const Polygon2D&	rPoly,
+                          double			lowerYBound,
+                          double			upperYBound )
 {
     // need the convex hull of the control polygon, as this is
     // guaranteed to completely bound the curve
@@ -193,7 +193,7 @@ bool Impl_calcSafeParams( double&           t1,
     // init min and max buffers
     t1 = 0.0 ;
     double currLowerT( 1.0 );
-
+    
     t2 = 1.0;
     double currHigherT( 0.0 );
 
@@ -236,7 +236,7 @@ bool Impl_calcSafeParams( double&           t1,
             // one of the horizontal bounds lines
             const double r_x( p1.x - p0.x );
             const double r_y( p1.y - p0.y );
-
+            
             if( tolZero(r_y) )
             {
                 // r_y is virtually zero, thus we've got a horizontal
@@ -257,7 +257,7 @@ bool Impl_calcSafeParams( double&           t1,
 
                 // calc intersection with horizontal dMin line
                 const double currTLow( (lowerYBound - p0.y) * r_x / r_y + p0.x );
-
+                
                 // calc intersection with horizontal dMax line
                 const double currTHigh( (upperYBound - p0.y) * r_x / r_y + p0.x );
 
@@ -268,7 +268,7 @@ bool Impl_calcSafeParams( double&           t1,
             // set flag that at least one segment is contained or
             // intersects given horizontal band.
             bIntersection = true;
-        }
+        }            
     }
 
 #ifndef WITH_SAFEPARAMBASE_TEST
@@ -289,20 +289,20 @@ bool Impl_calcSafeParams( double&           t1,
  * The polynomial coefficients c0 to c3 given to this method
  * must correspond to t values of 0, 1/3, 2/3 and 1, respectively.
  */
-bool Impl_calcSafeParams_clip( double&          t1,
-                               double&          t2,
-                               const FatLine&   bounds,
-                               double           c0,
-                               double           c1,
-                               double           c2,
-                               double           c3 )
+bool Impl_calcSafeParams_clip( double& 			t1, 
+                               double& 			t2,
+                               const FatLine& 	bounds,
+                               double  			c0, 
+                               double  			c1, 
+                               double  			c2, 
+                               double  			c3 )
 {
     /* first of all, determine convex hull of c0-c3 */
     Polygon2D poly(4);
-    poly[0] = Point2D(0,        c0);
-    poly[1] = Point2D(1.0/3.0,  c1);
-    poly[2] = Point2D(2.0/3.0,  c2);
-    poly[3] = Point2D(1,        c3);
+    poly[0] = Point2D(0, 		c0);
+    poly[1] = Point2D(1.0/3.0, 	c1);
+    poly[2] = Point2D(2.0/3.0, 	c2);
+    poly[3] = Point2D(1, 		c3);
 
 #ifndef WITH_SAFEPARAM_DETAILED_TEST
 
@@ -313,14 +313,14 @@ bool Impl_calcSafeParams_clip( double&          t1,
 
     Polygon2D convHull( convexHull( poly ) );
 
-    cout << "# convex hull testing" << endl
+    cout << "# convex hull testing" << endl 
          << "plot [t=0:1] ";
-    cout << " bez("
-         << poly[0].x << ","
+    cout << " bez(" 
+         << poly[0].x << "," 
          << poly[1].x << ","
          << poly[2].x << ","
          << poly[3].x << ",t),bez("
-         << poly[0].y << ","
+         << poly[0].y << "," 
          << poly[1].y << ","
          << poly[2].y << ","
          << poly[3].y << ",t), "
@@ -352,10 +352,10 @@ bool Impl_calcSafeParams_clip( double&          t1,
 
 // -----------------------------------------------------------------------------
 
-void Impl_deCasteljauAt( Bezier&        part1,
-                         Bezier&        part2,
-                         const Bezier&  input,
-                         double         t        )
+void Impl_deCasteljauAt( Bezier& 		part1, 
+                         Bezier& 		part2, 
+                         const Bezier& 	input, 
+                         double			t		 )
 {
     // deCasteljau bezier arc, scheme is:
     //
@@ -387,26 +387,26 @@ void Impl_deCasteljauAt( Bezier&        part1,
     }
     else
     {
-        part1.p0.x = input.p0.x;                                    part1.p0.y = input.p0.y;
-        part1.p1.x = (1.0 - t)*part1.p0.x + t*input.p1.x;           part1.p1.y = (1.0 - t)*part1.p0.y + t*input.p1.y;
-        const double Hx ( (1.0 - t)*input.p1.x + t*input.p2.x ),    Hy ( (1.0 - t)*input.p1.y + t*input.p2.y );
-        part1.p2.x = (1.0 - t)*part1.p1.x + t*Hx;                   part1.p2.y = (1.0 - t)*part1.p1.y + t*Hy;
-        part2.p3.x = input.p3.x;                                    part2.p3.y = input.p3.y;
-        part2.p2.x = (1.0 - t)*input.p2.x + t*input.p3.x;           part2.p2.y = (1.0 - t)*input.p2.y + t*input.p3.y;
-        part2.p1.x = (1.0 - t)*Hx + t*part2.p2.x;                   part2.p1.y = (1.0 - t)*Hy + t*part2.p2.y;
-        part2.p0.x = (1.0 - t)*part1.p2.x + t*part2.p1.x;           part2.p0.y = (1.0 - t)*part1.p2.y + t*part2.p1.y;
-        part1.p3.x = part2.p0.x;                                    part1.p3.y = part2.p0.y;
+        part1.p0.x = input.p0.x; 		   	 						part1.p0.y = input.p0.y;
+        part1.p1.x = (1.0 - t)*part1.p0.x + t*input.p1.x; 			part1.p1.y = (1.0 - t)*part1.p0.y + t*input.p1.y;
+        const double Hx ( (1.0 - t)*input.p1.x + t*input.p2.x ), 	Hy ( (1.0 - t)*input.p1.y + t*input.p2.y );
+        part1.p2.x = (1.0 - t)*part1.p1.x + t*Hx;   				part1.p2.y = (1.0 - t)*part1.p1.y + t*Hy;
+        part2.p3.x = input.p3.x; 		   	        				part2.p3.y = input.p3.y;
+        part2.p2.x = (1.0 - t)*input.p2.x + t*input.p3.x;  			part2.p2.y = (1.0 - t)*input.p2.y + t*input.p3.y;
+        part2.p1.x = (1.0 - t)*Hx + t*part2.p2.x;   				part2.p1.y = (1.0 - t)*Hy + t*part2.p2.y;
+        part2.p0.x = (1.0 - t)*part1.p2.x + t*part2.p1.x;  			part2.p0.y = (1.0 - t)*part1.p2.y + t*part2.p1.y;
+        part1.p3.x = part2.p0.x; 		            				part1.p3.y = part2.p0.y;
     }
 }
 
 // -----------------------------------------------------------------------------
 
-void printCurvesWithSafeRange( const Bezier& c1, const Bezier& c2, double t1_c1, double t2_c1,
+void printCurvesWithSafeRange( const Bezier& c1, const Bezier& c2, double t1_c1, double t2_c1, 
                                const Bezier& c2_part, const FatLine& bounds_c2 )
 {
     static int offset = 0;
 
-    cout << "# safe param range testing" << endl
+    cout << "# safe param range testing" << endl 
          << "plot [t=0.0:1.0] ";
 
     // clip safe ranges off c1
@@ -421,41 +421,41 @@ void printCurvesWithSafeRange( const Bezier& c1, const Bezier& c2, double t1_c1,
 
     // output remaining segment (c1_part1)
 
-    cout << "bez("
-         << c1.p0.x+offset << ","
+    cout << "bez(" 
+         << c1.p0.x+offset << "," 
          << c1.p1.x+offset << ","
          << c1.p2.x+offset << ","
          << c1.p3.x+offset << ",t),bez("
-         << c1.p0.y << ","
+         << c1.p0.y << "," 
          << c1.p1.y << ","
          << c1.p2.y << ","
          << c1.p3.y << ",t), bez("
-         << c2.p0.x+offset << ","
+         << c2.p0.x+offset << "," 
          << c2.p1.x+offset << ","
          << c2.p2.x+offset << ","
          << c2.p3.x+offset << ",t),bez("
-         << c2.p0.y << ","
+         << c2.p0.y << "," 
          << c2.p1.y << ","
          << c2.p2.y << ","
          << c2.p3.y << ",t), "
 #if 1
          << "bez("
-         << c1_part1.p0.x+offset << ","
+         << c1_part1.p0.x+offset << "," 
          << c1_part1.p1.x+offset << ","
          << c1_part1.p2.x+offset << ","
          << c1_part1.p3.x+offset << ",t),bez("
-         << c1_part1.p0.y << ","
+         << c1_part1.p0.y << "," 
          << c1_part1.p1.y << ","
          << c1_part1.p2.y << ","
          << c1_part1.p3.y << ",t), "
 #endif
 #if 1
          << "bez("
-         << c2_part.p0.x+offset << ","
+         << c2_part.p0.x+offset << "," 
          << c2_part.p1.x+offset << ","
          << c2_part.p2.x+offset << ","
          << c2_part.p3.x+offset << ",t),bez("
-         << c2_part.p0.y << ","
+         << c2_part.p0.y << "," 
          << c2_part.p1.y << ","
          << c2_part.p2.y << ","
          << c2_part.p3.y << ",t), "
@@ -463,9 +463,9 @@ void printCurvesWithSafeRange( const Bezier& c1, const Bezier& c2, double t1_c1,
          << "linex("
          << bounds_c2.a << ","
          << bounds_c2.b << ","
-         << bounds_c2.c << ",t)+" << offset << ", liney("
-         << bounds_c2.a << ","
-         << bounds_c2.b << ","
+         << bounds_c2.c << ",t)+" << offset << ", liney(" 
+         << bounds_c2.a << "," 
+         << bounds_c2.b << "," 
          << bounds_c2.c << ",t) title \"fat line (center)\", linex("
          << bounds_c2.a << ","
          << bounds_c2.b << ","
@@ -479,82 +479,82 @@ void printCurvesWithSafeRange( const Bezier& c1, const Bezier& c2, double t1_c1,
          << bounds_c2.a << ","
          << bounds_c2.b << ","
          << bounds_c2.c-bounds_c2.dMax << ",t) title \"fat line (max) \"" << endl;
-
+    
     offset += 1;
 }
 
 // -----------------------------------------------------------------------------
 
-void printResultWithFinalCurves( const Bezier& c1, const Bezier& c1_part,
-                                 const Bezier& c2, const Bezier& c2_part,
+void printResultWithFinalCurves( const Bezier& c1, const Bezier& c1_part, 
+                                 const Bezier& c2, const Bezier& c2_part, 
                                  double t1_c1, double t2_c1 )
 {
     static int offset = 0;
 
-    cout << "# final result" << endl
+    cout << "# final result" << endl 
          << "plot [t=0.0:1.0] ";
 
-    cout << "bez("
-         << c1.p0.x+offset << ","
+    cout << "bez(" 
+         << c1.p0.x+offset << "," 
          << c1.p1.x+offset << ","
          << c1.p2.x+offset << ","
          << c1.p3.x+offset << ",t),bez("
-         << c1.p0.y << ","
+         << c1.p0.y << "," 
          << c1.p1.y << ","
          << c1.p2.y << ","
          << c1.p3.y << ",t), bez("
-         << c1_part.p0.x+offset << ","
+         << c1_part.p0.x+offset << "," 
          << c1_part.p1.x+offset << ","
          << c1_part.p2.x+offset << ","
          << c1_part.p3.x+offset << ",t),bez("
-         << c1_part.p0.y << ","
+         << c1_part.p0.y << "," 
          << c1_part.p1.y << ","
          << c1_part.p2.y << ","
-         << c1_part.p3.y << ",t), "
+         << c1_part.p3.y << ",t), " 
          << " pointmarkx(bez("
-         << c1.p0.x+offset << ","
+         << c1.p0.x+offset << "," 
          << c1.p1.x+offset << ","
          << c1.p2.x+offset << ","
          << c1.p3.x+offset << ","
          << t1_c1 << "),t), "
-         << " pointmarky(bez("
-         << c1.p0.y << ","
+         << " pointmarky(bez(" 
+         << c1.p0.y << "," 
          << c1.p1.y << ","
          << c1.p2.y << ","
          << c1.p3.y << ","
          << t1_c1 << "),t), "
          << " pointmarkx(bez("
-         << c1.p0.x+offset << ","
+         << c1.p0.x+offset << "," 
          << c1.p1.x+offset << ","
          << c1.p2.x+offset << ","
          << c1.p3.x+offset << ","
          << t2_c1 << "),t), "
-         << " pointmarky(bez("
-         << c1.p0.y << ","
+         << " pointmarky(bez(" 
+         << c1.p0.y << "," 
          << c1.p1.y << ","
          << c1.p2.y << ","
          << c1.p3.y << ","
          << t2_c1 << "),t), "
 
          << "bez("
-         << c2.p0.x+offset << ","
+         << c2.p0.x+offset << "," 
          << c2.p1.x+offset << ","
          << c2.p2.x+offset << ","
          << c2.p3.x+offset << ",t),bez("
-         << c2.p0.y << ","
+         << c2.p0.y << "," 
          << c2.p1.y << ","
          << c2.p2.y << ","
          << c2.p3.y << ",t), "
          << "bez("
-         << c2_part.p0.x+offset << ","
+         << c2_part.p0.x+offset << "," 
          << c2_part.p1.x+offset << ","
          << c2_part.p2.x+offset << ","
          << c2_part.p3.x+offset << ",t),bez("
-         << c2_part.p0.y << ","
+         << c2_part.p0.y << "," 
          << c2_part.p1.y << ","
          << c2_part.p2.y << ","
          << c2_part.p3.y << ",t)" << endl;
-
+    
     offset += 1;
 }
 
@@ -562,8 +562,8 @@ void printResultWithFinalCurves( const Bezier& c1, const Bezier& c1_part,
 
 /** determine parameter ranges [0,t1) and (t2,1] on c1, where c1 is guaranteed to lie outside c2.
       Returns false, if the two curves don't even intersect.
-
-    @param t1
+ 
+    @param t1 
     Range [0,t1) on c1 is guaranteed to lie outside c2
 
     @param t2
@@ -581,51 +581,51 @@ void printResultWithFinalCurves( const Bezier& c1, const Bezier& c1_part,
     @param c2_part
     Subdivided current part of c2
  */
-bool Impl_calcClipRange( double&        t1,
-                         double&        t2,
-                         const Bezier&  c1_orig,
-                         const Bezier&  c1_part,
-                         const Bezier&  c2_orig,
-                         const Bezier&  c2_part )
+bool Impl_calcClipRange( double& 		t1, 
+                         double& 		t2,
+                         const Bezier& 	c1_orig,
+                         const Bezier& 	c1_part,
+                         const Bezier& 	c2_orig,
+                         const Bezier& 	c2_part )
 {
-    // TODO: Maybe also check fat line orthogonal to P0P3, having P0
+    // TODO: Maybe also check fat line orthogonal to P0P3, having P0 
     //       and P3 as the extremal points
-
+    
     if( Impl_doBBoxIntersect(c1_part, c2_part) )
     {
         // Calculate fat lines around c1
-        FatLine bounds_c2;
+        FatLine	bounds_c2;
 
         // must use the subdivided version of c2, since the fat line
         // algorithm works implicitely with the convex hull bounding
         // box.
         Impl_calcFatLine(bounds_c2, c2_part);
-
+       
         // determine clip positions on c2. Can use original c1 (which
         // is necessary anyway, to get the t's on the original curve),
         // since the distance calculations work directly in the
         // Bernstein polynom parameter domain.
-        if( Impl_calcSafeParams_clip( t1, t2, bounds_c2,
+        if( Impl_calcSafeParams_clip( t1, t2, bounds_c2, 
                                       calcLineDistance( bounds_c2.a,
                                                         bounds_c2.b,
                                                         bounds_c2.c,
                                                         c1_orig.p0.x,
-                                                        c1_orig.p0.y    ),
+                                                        c1_orig.p0.y	),
                                       calcLineDistance( bounds_c2.a,
                                                         bounds_c2.b,
                                                         bounds_c2.c,
                                                         c1_orig.p1.x,
-                                                        c1_orig.p1.y    ),
+                                                        c1_orig.p1.y	),
                                       calcLineDistance( bounds_c2.a,
                                                         bounds_c2.b,
                                                         bounds_c2.c,
                                                         c1_orig.p2.x,
-                                                        c1_orig.p2.y    ),
+                                                        c1_orig.p2.y	),
                                       calcLineDistance( bounds_c2.a,
                                                         bounds_c2.b,
                                                         bounds_c2.c,
                                                         c1_orig.p3.x,
-                                                        c1_orig.p3.y    ) ) )
+                                                        c1_orig.p3.y	) ) )
         {
             //printCurvesWithSafeRange(c1_orig, c2_orig, t1, t2, c2_part, bounds_c2);
 
@@ -649,14 +649,14 @@ bool Impl_calcClipRange( double&        t1,
 void Impl_calcFocus( Bezier& res, const Bezier& c )
 {
     // arbitrary small value, for now
-    // TODO: find meaningful value
+    // TODO: find meaningful value 
     const double minPivotValue( 1.0e-20 );
 
     Point2D::value_type fMatrix[6];
     Point2D::value_type fRes[2];
 
     // calc new curve from hodograph, c and linear blend
-
+    
     // Coefficients for derivative of c are (C_i=n(C_{i+1} - C_i)):
     //
     // 3(P1 - P0), 3(P2 - P1), 3(P3 - P2) (bezier curve of degree 2)
@@ -664,7 +664,7 @@ void Impl_calcFocus( Bezier& res, const Bezier& c )
     // The hodograph is then (bezier curve of 2nd degree is P0(1-t)^2 + 2P1(1-t)t + P2t^2):
     //
     // 3(P1 - P0)(1-t)^2 + 6(P2 - P1)(1-t)t + 3(P3 - P2)t^2
-    //
+    // 
     // rotate by 90 degrees: x=-y, y=x and you get the normal vector function N(t):
     //
     // x(t) = -(3(P1.y - P0.y)(1-t)^2 + 6(P2.y - P1.y)(1-t)t + 3(P3.y - P2.y)t^2)
@@ -675,11 +675,11 @@ void Impl_calcFocus( Bezier& res, const Bezier& c )
     //
     // This results in the following expression for F(t):
     //
-    // x(t) =  P0.x (1-t)^3 + 3 P1.x (1-t)^2t + 3 P2.x (1.t)t^2 + P3.x t^3 -
-    //          (c0(1-t) + c1 t)(3(P1.y - P0.y)(1-t)^2 + 6(P2.y - P1.y)(1-t)t + 3(P3.y - P2.y)t^2)
+    // x(t) =  P0.x (1-t)^3 + 3 P1.x (1-t)^2t + 3 P2.x (1.t)t^2 + P3.x t^3 - 
+    //			(c0(1-t) + c1 t)(3(P1.y - P0.y)(1-t)^2 + 6(P2.y - P1.y)(1-t)t + 3(P3.y - P2.y)t^2)
     //
-    // y(t) =  P0.y (1-t)^3 + 3 P1.y (1-t)^2t + 3 P2.y (1.t)t^2 + P3.y t^3 +
-    //          (c0(1-t) + c1 t)(3(P1.x - P0.x)(1-t)^2 + 6(P2.x - P1.x)(1-t)t + 3(P3.x - P2.x)t^2)
+    // y(t) =  P0.y (1-t)^3 + 3 P1.y (1-t)^2t + 3 P2.y (1.t)t^2 + P3.y t^3 + 
+    //			(c0(1-t) + c1 t)(3(P1.x - P0.x)(1-t)^2 + 6(P2.x - P1.x)(1-t)t + 3(P3.x - P2.x)t^2)
     //
     // As a heuristic, we set F(0)=F(1) (thus, the curve is closed and _tends_ to be small):
     //
@@ -712,7 +712,7 @@ void Impl_calcFocus( Bezier& res, const Bezier& c )
     fMatrix[4] = c.p3.y - c.p2.y;
     fMatrix[5] = (c.p3.x - c.p0.x)/3.0;
 
-    // TODO: determine meaningful value for
+    // TODO: determine meaningful value for 
     if( !solve(fMatrix, 2, 3, fRes, minPivotValue) )
     {
         // TODO: generate meaningful values here
@@ -727,38 +727,38 @@ void Impl_calcFocus( Bezier& res, const Bezier& c )
     // now, the reordered and per-coefficient collected focus curve is
     // the following third degree bezier curve F(t):
     //
-    // x(t) =  P0.x (1-t)^3 + 3 P1.x (1-t)^2t + 3 P2.x (1.t)t^2 + P3.x t^3 -
-    //          (c0(1-t) + c1 t)(3(P1.y - P0.y)(1-t)^2 + 6(P2.y - P1.y)(1-t)t + 3(P3.y - P2.y)t^2)
-    //      =  P0.x (1-t)^3 + 3 P1.x (1-t)^2t + 3 P2.x (1.t)t^2 + P3.x t^3 -
-    //         (3c0P1.y(1-t)^3 - 3c0P0.y(1-t)^3 + 6c0P2.y(1-t)^2t - 6c0P1.y(1-t)^2t +
-    //          3c0P3.y(1-t)t^2 - 3c0P2.y(1-t)t^2 +
-    //          3c1P1.y(1-t)^2t - 3c1P0.y(1-t)^2t + 6c1P2.y(1-t)t^2 - 6c1P1.y(1-t)t^2 +
-    //          3c1P3.yt^3 - 3c1P2.yt^3)
-    //      =  (P0.x - 3 c0 P1.y + 3 c0 P0.y)(1-t)^3 +
-    //         3(P1.x - c1 P1.y + c1 P0.y - 2 c0 P2.y + 2 c0 P1.y)(1-t)^2t +
-    //         3(P2.x - 2 c1 P2.y + 2 c1 P1.y - c0 P3.y + c0 P2.y)(1-t)t^2 +
-    //         (P3.x - 3 c1 P3.y + 3 c1 P2.y)t^3
-    //      =  (P0.x - 3 c0(P1.y - P0.y))(1-t)^3 +
-    //         3(P1.x - c1(P1.y - P0.y) - 2c0(P2.y - P1.y))(1-t)^2t +
-    //         3(P2.x - 2 c1(P2.y - P1.y) - c0(P3.y - P2.y))(1-t)t^2 +
-    //         (P3.x - 3 c1(P3.y - P2.y))t^3
+    // x(t) =  P0.x (1-t)^3 + 3 P1.x (1-t)^2t + 3 P2.x (1.t)t^2 + P3.x t^3 - 
+    //			(c0(1-t) + c1 t)(3(P1.y - P0.y)(1-t)^2 + 6(P2.y - P1.y)(1-t)t + 3(P3.y - P2.y)t^2)
+    //      =  P0.x (1-t)^3 + 3 P1.x (1-t)^2t + 3 P2.x (1.t)t^2 + P3.x t^3 - 
+    //		   (3c0P1.y(1-t)^3 - 3c0P0.y(1-t)^3 + 6c0P2.y(1-t)^2t - 6c0P1.y(1-t)^2t + 
+    //		    3c0P3.y(1-t)t^2 - 3c0P2.y(1-t)t^2 + 
+    //		    3c1P1.y(1-t)^2t - 3c1P0.y(1-t)^2t + 6c1P2.y(1-t)t^2 - 6c1P1.y(1-t)t^2 + 
+    //		    3c1P3.yt^3 - 3c1P2.yt^3)
+    //		=  (P0.x - 3 c0 P1.y + 3 c0 P0.y)(1-t)^3 + 
+    //		   3(P1.x - c1 P1.y + c1 P0.y - 2 c0 P2.y + 2 c0 P1.y)(1-t)^2t +
+    //		   3(P2.x - 2 c1 P2.y + 2 c1 P1.y - c0 P3.y + c0 P2.y)(1-t)t^2 +
+    //		   (P3.x - 3 c1 P3.y + 3 c1 P2.y)t^3
+    //		=  (P0.x - 3 c0(P1.y - P0.y))(1-t)^3 + 
+    //		   3(P1.x - c1(P1.y - P0.y) - 2c0(P2.y - P1.y))(1-t)^2t +
+    //		   3(P2.x - 2 c1(P2.y - P1.y) - c0(P3.y - P2.y))(1-t)t^2 +
+    //		   (P3.x - 3 c1(P3.y - P2.y))t^3
     //
-    // y(t) =  P0.y (1-t)^3 + 3 P1.y (1-t)^2t + 3 P2.y (1-t)t^2 + P3.y t^3 +
-    //          (c0(1-t) + c1 t)(3(P1.x - P0.x)(1-t)^2 + 6(P2.x - P1.x)(1-t)t + 3(P3.x - P2.x)t^2)
-    //      =  P0.y (1-t)^3 + 3 P1.y (1-t)^2t + 3 P2.y (1-t)t^2 + P3.y t^3 +
-    //         3c0(P1.x - P0.x)(1-t)^3 + 6c0(P2.x - P1.x)(1-t)^2t + 3c0(P3.x - P2.x)(1-t)t^2 +
-    //         3c1(P1.x - P0.x)(1-t)^2t + 6c1(P2.x - P1.x)(1-t)t^2 + 3c1(P3.x - P2.x)t^3
-    //      =  (P0.y + 3 c0 (P1.x - P0.x))(1-t)^3 +
-    //         3(P1.y + 2 c0 (P2.x - P1.x) + c1 (P1.x - P0.x))(1-t)^2t +
-    //         3(P2.y + c0 (P3.x - P2.x) + 2 c1 (P2.x - P1.x))(1-t)t^2 +
-    //         (P3.y + 3 c1 (P3.x - P2.x))t^3
+    // y(t) =  P0.y (1-t)^3 + 3 P1.y (1-t)^2t + 3 P2.y (1-t)t^2 + P3.y t^3 + 
+    //			(c0(1-t) + c1 t)(3(P1.x - P0.x)(1-t)^2 + 6(P2.x - P1.x)(1-t)t + 3(P3.x - P2.x)t^2)
+    //		=  P0.y (1-t)^3 + 3 P1.y (1-t)^2t + 3 P2.y (1-t)t^2 + P3.y t^3 + 
+    //		   3c0(P1.x - P0.x)(1-t)^3 + 6c0(P2.x - P1.x)(1-t)^2t + 3c0(P3.x - P2.x)(1-t)t^2 + 
+    //		   3c1(P1.x - P0.x)(1-t)^2t + 6c1(P2.x - P1.x)(1-t)t^2 + 3c1(P3.x - P2.x)t^3
+    //		=  (P0.y + 3 c0 (P1.x - P0.x))(1-t)^3 + 
+    //		   3(P1.y + 2 c0 (P2.x - P1.x) + c1 (P1.x - P0.x))(1-t)^2t + 
+    //		   3(P2.y + c0 (P3.x - P2.x) + 2 c1 (P2.x - P1.x))(1-t)t^2 +
+    //		   (P3.y + 3 c1 (P3.x - P2.x))t^3
     //
     // Therefore, the coefficients F0 to F3 of the focus curve are:
     //
-    // F0.x = (P0.x - 3 c0(P1.y - P0.y))                    F0.y = (P0.y + 3 c0 (P1.x - P0.x))
-    // F1.x = (P1.x - c1(P1.y - P0.y) - 2c0(P2.y - P1.y))   F1.y = (P1.y + 2 c0 (P2.x - P1.x) + c1 (P1.x - P0.x))
-    // F2.x = (P2.x - 2 c1(P2.y - P1.y) - c0(P3.y - P2.y))  F2.y = (P2.y + c0 (P3.x - P2.x) + 2 c1 (P2.x - P1.x))
-    // F3.x = (P3.x - 3 c1(P3.y - P2.y))                    F3.y = (P3.y + 3 c1 (P3.x - P2.x))
+    // F0.x = (P0.x - 3 c0(P1.y - P0.y))					F0.y = (P0.y + 3 c0 (P1.x - P0.x))
+    // F1.x = (P1.x - c1(P1.y - P0.y) - 2c0(P2.y - P1.y))	F1.y = (P1.y + 2 c0 (P2.x - P1.x) + c1 (P1.x - P0.x))
+    // F2.x = (P2.x - 2 c1(P2.y - P1.y) - c0(P3.y - P2.y))	F2.y = (P2.y + c0 (P3.x - P2.x) + 2 c1 (P2.x - P1.x))
+    // F3.x = (P3.x - 3 c1(P3.y - P2.y))					F3.y = (P3.y + 3 c1 (P3.x - P2.x))
     //
     res.p0.x = c.p0.x - 3*fRes[0]*(c.p1.y - c.p0.y);
     res.p1.x = c.p1.x - fRes[1]*(c.p1.y - c.p0.y) - 2*fRes[0]*(c.p2.y - c.p1.y);
@@ -773,15 +773,15 @@ void Impl_calcFocus( Bezier& res, const Bezier& c )
 
 // -----------------------------------------------------------------------------
 
-bool Impl_calcSafeParams_focus( double&         t1,
-                                double&         t2,
-                                const Bezier&   curve,
-                                const Bezier&   focus )
+bool Impl_calcSafeParams_focus( double& 		t1, 
+                                double& 		t2,
+                                const Bezier& 	curve,
+                                const Bezier& 	focus )
 {
     // now, we want to determine which normals of the original curve
     // P(t) intersect with the focus curve F(t). The condition for
     // this statement is P'(t)(P(t) - F) = 0, i.e. hodograph P'(t) and
-    // line through P(t) and F are perpendicular.
+    // line through P(t) and F are perpendicular. 
     // If you expand this equation, you end up with something like
     //
     // (\sum_{i=0}^n (P_i - F)B_i^n(t))^T (\sum_{j=0}^{n-1} n(P_{j+1} - P_j)B_j^{n-1}(t))
@@ -794,7 +794,7 @@ bool Impl_calcSafeParams_focus( double&         t1,
     // If we combine the B_i^n(t)B_j^{n-1}(t) product, we arrive at a
     // Bernstein polynomial of degree 2n-1, as
     //
-    // \binom{n}{i}(1-t)^{n-i}t^i) \binom{n-1}{j}(1-t)^{n-1-j}t^j) =
+    // \binom{n}{i}(1-t)^{n-i}t^i) \binom{n-1}{j}(1-t)^{n-1-j}t^j) = 
     // \binom{n}{i}\binom{n-1}{j}(1-t)^{2n-1-i-j}t^{i+j}
     //
     // Thus, with the defining equation for a 2n-1 degree Bernstein
@@ -829,7 +829,7 @@ bool Impl_calcSafeParams_focus( double&         t1,
     // u axis, thus simply throw away u coordinate).
     //
     // \fallfac are so-called falling factorials (see Concrete
-    // Mathematics, p. 47 for a definition).
+    // Mathematics, p. 47 for a definition). 
     //
 
     // now, for tensor product bezier curves, the convex hull property
@@ -855,7 +855,7 @@ bool Impl_calcSafeParams_focus( double&         t1,
         {
             // calc single d_{ij} sum:
             for( d=0.0, k=::std::max(0,i-n); k<=k_max && k<=i; ++k )
-            {
+            {                
                 l = i - k; // invariant: k + l = i
                 assert(k>=0 && k<=n-1); // k \in {0,...,n-1}
                 assert(l>=0 && l<=n);   // l \in {0,...,n}
@@ -863,9 +863,9 @@ bool Impl_calcSafeParams_focus( double&         t1,
                 // TODO: find, document and assert proper limits for n and int's max_val.
                 // This becomes important should anybody wants to use
                 // this code for higher-than-cubic beziers
-                d += static_cast<double>(fallFac(n,l)*fallFac(n-1,k)*fac(i)) /
+                d += static_cast<double>(fallFac(n,l)*fallFac(n-1,k)*fac(i)) / 
                     static_cast<double>(fac(l)*fac(k) * fallFac(2*n-1,i)) * n *
-                    ( (curve[k+1].x - curve[k].x)*(curve[l].x - focus[j].x) +   // dot product here
+                    ( (curve[k+1].x - curve[k].x)*(curve[l].x - focus[j].x) +	// dot product here 
                       (curve[k+1].y - curve[k].y)*(curve[l].y - focus[j].y) );
             }
 
@@ -886,7 +886,7 @@ bool Impl_calcSafeParams_focus( double&         t1,
 
     Polygon2D convHull( convexHull( controlPolygon ) );
 
-    cout << "# convex hull testing (focus)" << endl
+    cout << "# convex hull testing (focus)" << endl 
          << "plot [t=0:1] ";
     cout << "'-' using ($1):($2) title \"control polygon\" with lp, "
          << "'-' using ($1):($2) title \"convex hull\" with lp" << endl;
@@ -920,7 +920,7 @@ bool Impl_calcSafeParams_focus( double&         t1,
     determine safe parameter interval on c1 with regard to c2, then
     the other way around), we call this method recursively with c1 and
     c2 swapped.
-
+    
     @param result
     Output iterator where the final t values are added to. If curves
     don't intersect, nothing is added.
@@ -928,31 +928,31 @@ bool Impl_calcSafeParams_focus( double&         t1,
     @param delta
     Maximal allowed distance to true critical point (measured in the
     original curve's coordinate system)
-
+    
     @param safeRangeFunctor
     Functor object, that must provide the following operator():
-    bool safeRangeFunctor( double& t1,
-                           double& t2,
-                           const Bezier& c1_orig,
-                           const Bezier& c1_part,
-                           const Bezier& c2_orig,
+    bool safeRangeFunctor( double& t1, 
+                           double& t2, 
+                           const Bezier& c1_orig, 
+                           const Bezier& c1_part, 
+                           const Bezier& c2_orig, 
                            const Bezier& c2_part );
     This functor must calculate the safe ranges [0,t1] and [t2,1] on
     c1_orig, where c1_orig is 'safe' from c2_part. If the whole
     c1_orig is safe, false must be returned, true otherwise.
  */
-template <class Functor> void Impl_applySafeRanges_rec( ::std::back_insert_iterator< ::std::vector< ::std::pair<double, double> > >&    result,
-                                                        double                                                                          delta,
-                                                        const Functor&                                                                  safeRangeFunctor,
-                                                        int                                                                             recursionLevel,
-                                                        const Bezier&                                                                   c1_orig,
-                                                        const Bezier&                                                                   c1_part,
-                                                        double                                                                          last_t1_c1,
-                                                        double                                                                          last_t2_c1,
-                                                        const Bezier&                                                                   c2_orig,
-                                                        const Bezier&                                                                   c2_part,
-                                                        double                                                                          last_t1_c2,
-                                                        double                                                                          last_t2_c2  )
+template <class Functor> void Impl_applySafeRanges_rec( ::std::back_insert_iterator< ::std::vector< ::std::pair<double, double> > >&	result,
+                                                        double 																			delta,
+                                                        const Functor& 																	safeRangeFunctor,
+                                                        int																				recursionLevel,
+                                                        const Bezier& 																	c1_orig,
+                                                        const Bezier& 																	c1_part,
+                                                        double																			last_t1_c1,
+                                                        double																			last_t2_c1,
+                                                        const Bezier& 																	c2_orig,
+                                                        const Bezier& 																	c2_part,
+                                                        double																			last_t1_c2,
+                                                        double																			last_t2_c2  )
 {
     // check end condition
     // ===================
@@ -971,7 +971,7 @@ template <class Functor> void Impl_applySafeRanges_rec( ::std::back_insert_itera
     for( int i=0; i<recursionLevel; ++i ) cerr << " ";
     if( recursionLevel % 2 )
     {
-        cerr << "level: " << recursionLevel
+        cerr << "level: " << recursionLevel 
              << " t: "
              << last_t1_c2 + (last_t2_c2 - last_t1_c2)/2.0
              << ", c1: " << last_t1_c2 << " " << last_t2_c2
@@ -980,7 +980,7 @@ template <class Functor> void Impl_applySafeRanges_rec( ::std::back_insert_itera
     }
     else
     {
-        cerr << "level: " << recursionLevel
+        cerr << "level: " << recursionLevel 
              << " t: "
              << last_t1_c1 + (last_t2_c1 - last_t1_c1)/2.0
              << ", c1: " << last_t1_c1 << " " << last_t2_c1
@@ -1027,10 +1027,10 @@ template <class Functor> void Impl_applySafeRanges_rec( ::std::back_insert_itera
 
 #if 1
             if( fabs(last_t2_c1 - last_t1_c1) < 0.0001 &&
-                fabs(last_t2_c2 - last_t1_c2) < 0.0001  )
+                fabs(last_t2_c2 - last_t1_c2) < 0.0001	)
 #else
             if( fabs(last_t2_c1 - last_t1_c1) < 0.01 &&
-                fabs(last_t2_c2 - last_t1_c2) < 0.01    )
+                fabs(last_t2_c2 - last_t1_c2) < 0.01	)
 #endif
             {
                 // done. Add to result
@@ -1075,7 +1075,7 @@ template <class Functor> void Impl_applySafeRanges_rec( ::std::back_insert_itera
                     Bezier part2;
 
                     double intervalMiddle;
-
+            
                     if( last_t2_c1 - last_t1_c1 > last_t2_c2 - last_t1_c2 )
                     {
                         // subdivide c1
@@ -1110,7 +1110,7 @@ template <class Functor> void Impl_applySafeRanges_rec( ::std::back_insert_itera
                         // curve, this simply amounts to subdivision
                         // at 0.5)
                         Impl_deCasteljauAt( part1, part2, c2_part, 0.5 );
-
+                
                         // and descend recursively with swapped curves
                         Impl_applySafeRanges_rec( result, delta, safeRangeFunctor, recursionLevel+1,
                                                   c2_orig, part1, last_t1_c2, intervalMiddle,
@@ -1158,14 +1158,14 @@ template <class Functor> void Impl_applySafeRanges_rec( ::std::back_insert_itera
 
 struct ClipBezierFunctor
 {
-    bool operator()( double& t1_c1,
-                     double& t2_c1,
+    bool operator()( double& t1_c1, 
+                     double& t2_c1, 
                      const Bezier& c1_orig,
                      const Bezier& c1_part,
                      const Bezier& c2_orig,
                      const Bezier& c2_part ) const
-    {
-        return Impl_calcClipRange( t1_c1, t2_c1, c1_orig, c1_part, c2_orig, c2_part );
+    { 
+        return Impl_calcClipRange( t1_c1, t2_c1, c1_orig, c1_part, c2_orig, c2_part ); 
     }
 };
 
@@ -1173,13 +1173,13 @@ struct ClipBezierFunctor
 
 struct BezierTangencyFunctor
 {
-    bool operator()( double& t1_c1,
-                     double& t2_c1,
+    bool operator()( double& t1_c1, 
+                     double& t2_c1, 
                      const Bezier& c1_orig,
                      const Bezier& c1_part,
                      const Bezier& c2_orig,
                      const Bezier& c2_part ) const
-    {
+    {     
         // calc focus curve of c2
         Bezier focus;
         Impl_calcFocus(focus, c2_part); // need to use subdivided c2
@@ -1200,7 +1200,7 @@ struct BezierTangencyFunctor
 // -----------------------------------------------------------------------------
 
 /** Perform a bezier clip (curve against curve)
-
+    
     @param result
     Output iterator where the final t values are added to. This
     iterator will remain empty, if there are no intersections.
@@ -1209,10 +1209,10 @@ struct BezierTangencyFunctor
     Maximal allowed distance to true intersection (measured in the
     original curve's coordinate system)
  */
-void clipBezier( ::std::back_insert_iterator< ::std::vector< ::std::pair<double, double> > >&   result,
-                 double                                                                         delta,
-                 const Bezier&                                                                  c1,
-                 const Bezier&                                                                  c2        )
+void clipBezier( ::std::back_insert_iterator< ::std::vector< ::std::pair<double, double> > >&	result,
+                 double 																		delta,
+                 const Bezier& 																	c1,
+                 const Bezier& 																	c2		  )
 {
 #if 0
     // first of all, determine list of collinear normals. Collinear
@@ -1256,7 +1256,7 @@ void clipBezier( ::std::back_insert_iterator< ::std::vector< ::std::pair<double,
     }
     c1_segments[i] = c1_remainder;
     c2_segments[i] = c2_remainder;
-
+                
     // now, c1/c2_segments contain all segments, then
     // clip every resulting segment against every other
     unsigned int c1_curr, c2_curr;
@@ -1266,10 +1266,10 @@ void clipBezier( ::std::back_insert_iterator< ::std::vector< ::std::pair<double,
         {
             if( c1_curr != c2_curr )
             {
-                Impl_clipBezier_rec(result, delta, 0,
-                                    c1_segments[c1_curr], c1_segments[c1_curr],
+                Impl_clipBezier_rec(result, delta, 0, 
+                                    c1_segments[c1_curr], c1_segments[c1_curr], 
                                     0.0, 1.0,
-                                    c2_segments[c2_curr], c2_segments[c2_curr],
+                                    c2_segments[c2_curr], c2_segments[c2_curr], 
                                     0.0, 1.0);
             }
         }
@@ -1286,8 +1286,8 @@ int main(int argc, const char *argv[])
     double curr_Offset( 0 );
     unsigned int i,j,k;
 
-    Bezier someCurves[] =
-        {
+    Bezier someCurves[] = 
+        { 
 //            {Point2D(0.0,0.0),Point2D(0.0,1.0),Point2D(1.0,1.0),Point2D(1.0,0.0)},
 //            {Point2D(0.0,0.0),Point2D(0.0,1.0),Point2D(1.0,1.0),Point2D(1.0,0.5)},
 //            {Point2D(1.0,0.0),Point2D(0.0,0.0),Point2D(0.0,1.0),Point2D(1.0,1.0)}
@@ -1351,7 +1351,7 @@ int main(int argc, const char *argv[])
         };
 
     // output gnuplot setup
-    cout << "#!/usr/bin/gnuplot -persist" << endl
+    cout << "#!/usr/bin/gnuplot -persist" << endl 
          << "#" << endl
          << "# automatically generated by bezierclip, don't change!" << endl
          << "#" << endl
@@ -1362,13 +1362,13 @@ int main(int argc, const char *argv[])
          << "pointmarky(c,t) = c+0.03*t" << endl
          << "linex(a,b,c,t) = a*-c + t*-b" << endl
          << "liney(a,b,c,t) = b*-c + t*a" << endl << endl
-         << "# end of setup" << endl << endl;
+         << "# end of setup" << endl << endl; 
 
 #ifdef WITH_CONVEXHULL_TEST
     // test convex hull algorithm
     const double convHull_xOffset( curr_Offset );
     curr_Offset += 20;
-    cout << "# convex hull testing" << endl
+    cout << "# convex hull testing" << endl 
          << "plot [t=0:1] ";
     for( i=0; i<sizeof(someCurves)/sizeof(Bezier); ++i )
     {
@@ -1377,18 +1377,18 @@ int main(int argc, const char *argv[])
         aTestPoly[1] = someCurves[i].p1;
         aTestPoly[2] = someCurves[i].p2;
         aTestPoly[3] = someCurves[i].p3;
-
+        
         aTestPoly[0].x += convHull_xOffset;
         aTestPoly[1].x += convHull_xOffset;
         aTestPoly[2].x += convHull_xOffset;
         aTestPoly[3].x += convHull_xOffset;
 
-        cout << " bez("
-             << aTestPoly[0].x << ","
+        cout << " bez(" 
+             << aTestPoly[0].x << "," 
              << aTestPoly[1].x << ","
              << aTestPoly[2].x << ","
              << aTestPoly[3].x << ",t),bez("
-             << aTestPoly[0].y << ","
+             << aTestPoly[0].y << "," 
              << aTestPoly[1].y << ","
              << aTestPoly[2].y << ","
              << aTestPoly[3].y << ",t), '-' using ($1):($2) title \"convex hull " << i << "\" with lp";
@@ -1405,14 +1405,14 @@ int main(int argc, const char *argv[])
         aTestPoly[1] = someCurves[i].p1;
         aTestPoly[2] = someCurves[i].p2;
         aTestPoly[3] = someCurves[i].p3;
-
+        
         aTestPoly[0].x += convHull_xOffset;
         aTestPoly[1].x += convHull_xOffset;
         aTestPoly[2].x += convHull_xOffset;
         aTestPoly[3].x += convHull_xOffset;
 
         Polygon2D convHull( convexHull(aTestPoly) );
-
+        
         for( k=0; k<convHull.size(); ++k )
         {
             cout << convHull[k].x << " " << convHull[k].y << endl;
@@ -1426,7 +1426,7 @@ int main(int argc, const char *argv[])
     // test convex hull algorithm
     const double multiSubdivide_xOffset( curr_Offset );
     curr_Offset += 20;
-    cout << "# multi subdivide testing" << endl
+    cout << "# multi subdivide testing" << endl 
          << "plot [t=0:1] ";
     for( i=0; i<sizeof(someCurves)/sizeof(Bezier); ++i )
     {
@@ -1458,30 +1458,30 @@ int main(int argc, const char *argv[])
         // subdivide at t2
         Impl_deCasteljauAt( c1_part3, c1_part2, c, t2 );
 
-        cout << " bez("
-             << c1_part1.p0.x << ","
+        cout << " bez(" 
+             << c1_part1.p0.x << "," 
              << c1_part1.p1.x << ","
              << c1_part1.p2.x << ","
              << c1_part1.p3.x << ",t), bez("
-             << c1_part1.p0.y+0.01 << ","
+             << c1_part1.p0.y+0.01 << "," 
              << c1_part1.p1.y+0.01 << ","
              << c1_part1.p2.y+0.01 << ","
              << c1_part1.p3.y+0.01 << ",t) title \"middle " << i << "\", "
-             << " bez("
-             << c1_part2.p0.x << ","
+             << " bez(" 
+             << c1_part2.p0.x << "," 
              << c1_part2.p1.x << ","
              << c1_part2.p2.x << ","
              << c1_part2.p3.x << ",t), bez("
-             << c1_part2.p0.y << ","
+             << c1_part2.p0.y << "," 
              << c1_part2.p1.y << ","
              << c1_part2.p2.y << ","
              << c1_part2.p3.y << ",t) title \"right " << i << "\", "
-             << " bez("
-             << c1_part3.p0.x << ","
+             << " bez(" 
+             << c1_part3.p0.x << "," 
              << c1_part3.p1.x << ","
              << c1_part3.p2.x << ","
              << c1_part3.p3.x << ",t), bez("
-             << c1_part3.p0.y << ","
+             << c1_part3.p0.y << "," 
              << c1_part3.p1.y << ","
              << c1_part3.p2.y << ","
              << c1_part3.p3.y << ",t) title \"left " << i << "\"";
@@ -1498,12 +1498,12 @@ int main(int argc, const char *argv[])
     // test fatline algorithm
     const double fatLine_xOffset( curr_Offset );
     curr_Offset += 20;
-    cout << "# fat line testing" << endl
+    cout << "# fat line testing" << endl 
          << "plot [t=0:1] ";
     for( i=0; i<sizeof(someCurves)/sizeof(Bezier); ++i )
     {
         Bezier c( someCurves[i] );
-
+        
         c.p0.x += fatLine_xOffset;
         c.p1.x += fatLine_xOffset;
         c.p2.x += fatLine_xOffset;
@@ -1513,20 +1513,20 @@ int main(int argc, const char *argv[])
 
         Impl_calcFatLine(line, c);
 
-        cout << " bez("
-             << c.p0.x << ","
+        cout << " bez(" 
+             << c.p0.x << "," 
              << c.p1.x << ","
              << c.p2.x << ","
              << c.p3.x << ",t), bez("
-             << c.p0.y << ","
+             << c.p0.y << "," 
              << c.p1.y << ","
              << c.p2.y << ","
              << c.p3.y << ",t) title \"bezier " << i << "\", linex("
              << line.a << ","
              << line.b << ","
-             << line.c << ",t), liney("
-             << line.a << ","
-             << line.b << ","
+             << line.c << ",t), liney(" 
+             << line.a << "," 
+             << line.b << "," 
              << line.c << ",t) title \"fat line (center) on " << i << "\", linex("
              << line.a << ","
              << line.b << ","
@@ -1552,12 +1552,12 @@ int main(int argc, const char *argv[])
     // test focus curve algorithm
     const double focus_xOffset( curr_Offset );
     curr_Offset += 20;
-    cout << "# focus line testing" << endl
+    cout << "# focus line testing" << endl 
          << "plot [t=0:1] ";
     for( i=0; i<sizeof(someCurves)/sizeof(Bezier); ++i )
     {
         Bezier c( someCurves[i] );
-
+        
         c.p0.x += focus_xOffset;
         c.p1.x += focus_xOffset;
         c.p2.x += focus_xOffset;
@@ -1567,20 +1567,20 @@ int main(int argc, const char *argv[])
         Bezier focus;
         Impl_calcFocus(focus, c);
 
-        cout << " bez("
-             << c.p0.x << ","
+        cout << " bez(" 
+             << c.p0.x << "," 
              << c.p1.x << ","
              << c.p2.x << ","
              << c.p3.x << ",t), bez("
-             << c.p0.y << ","
+             << c.p0.y << "," 
              << c.p1.y << ","
              << c.p2.y << ","
-             << c.p3.y << ",t) title \"bezier " << i << "\", bez("
-             << focus.p0.x << ","
+             << c.p3.y << ",t) title \"bezier " << i << "\", bez(" 
+             << focus.p0.x << "," 
              << focus.p1.x << ","
              << focus.p2.x << ","
              << focus.p3.x << ",t), bez("
-             << focus.p0.y << ","
+             << focus.p0.y << "," 
              << focus.p1.y << ","
              << focus.p2.y << ","
              << focus.p3.y << ",t) title \"focus " << i << "\"";
@@ -1596,12 +1596,12 @@ int main(int argc, const char *argv[])
 #ifdef WITH_SAFEPARAMBASE_TEST
     // test safe params base method
     double safeParamsBase_xOffset( curr_Offset );
-    cout << "# safe param base method testing" << endl
+    cout << "# safe param base method testing" << endl 
          << "plot [t=0:1] ";
     for( i=0; i<sizeof(someCurves)/sizeof(Bezier); ++i )
     {
         Bezier c( someCurves[i] );
-
+        
         c.p0.x += safeParamsBase_xOffset;
         c.p1.x += safeParamsBase_xOffset;
         c.p2.x += safeParamsBase_xOffset;
@@ -1618,13 +1618,13 @@ int main(int argc, const char *argv[])
         bool bRet( Impl_calcSafeParams( t1, t2, poly, 0, 1 ) );
 
         Polygon2D convHull( convexHull( poly ) );
-
-        cout << " bez("
-             << poly[0].x << ","
+        
+        cout << " bez(" 
+             << poly[0].x << "," 
              << poly[1].x << ","
              << poly[2].x << ","
              << poly[3].x << ",t),bez("
-             << poly[0].y << ","
+             << poly[0].y << "," 
              << poly[1].y << ","
              << poly[2].y << ","
              << poly[3].y << ",t), "
@@ -1650,7 +1650,7 @@ int main(int argc, const char *argv[])
     for( i=0; i<sizeof(someCurves)/sizeof(Bezier); ++i )
     {
         Bezier c( someCurves[i] );
-
+        
         c.p0.x += safeParamsBase_xOffset;
         c.p1.x += safeParamsBase_xOffset;
         c.p2.x += safeParamsBase_xOffset;
@@ -1667,7 +1667,7 @@ int main(int argc, const char *argv[])
         Impl_calcSafeParams( t1, t2, poly, 0, 1 );
 
         Polygon2D convHull( convexHull( poly ) );
-
+        
         unsigned int k;
         for( k=0; k<poly.size(); ++k )
         {
@@ -1692,7 +1692,7 @@ int main(int argc, const char *argv[])
     // test safe parameter range algorithm
     const double safeParams_xOffset( curr_Offset );
     curr_Offset += 20;
-    cout << "# safe param range testing" << endl
+    cout << "# safe param range testing" << endl 
          << "plot [t=0.0:1.0] ";
     for( i=0; i<sizeof(someCurves)/sizeof(Bezier); ++i )
     {
@@ -1700,7 +1700,7 @@ int main(int argc, const char *argv[])
         {
             Bezier c1( someCurves[i] );
             Bezier c2( someCurves[j] );
-
+            
             c1.p0.x += safeParams_xOffset;
             c1.p1.x += safeParams_xOffset;
             c1.p2.x += safeParams_xOffset;
@@ -1726,28 +1726,28 @@ int main(int argc, const char *argv[])
 
                 // output remaining segment (c1_part1)
 
-                cout << " bez("
-                     << c1.p0.x << ","
+                cout << " bez(" 
+                     << c1.p0.x << "," 
                      << c1.p1.x << ","
                      << c1.p2.x << ","
                      << c1.p3.x << ",t),bez("
-                     << c1.p0.y << ","
+                     << c1.p0.y << "," 
                      << c1.p1.y << ","
                      << c1.p2.y << ","
                      << c1.p3.y << ",t), bez("
-                     << c2.p0.x << ","
+                     << c2.p0.x << "," 
                      << c2.p1.x << ","
                      << c2.p2.x << ","
                      << c2.p3.x << ",t),bez("
-                     << c2.p0.y << ","
+                     << c2.p0.y << "," 
                      << c2.p1.y << ","
                      << c2.p2.y << ","
                      << c2.p3.y << ",t), bez("
-                     << c1_part1.p0.x << ","
+                     << c1_part1.p0.x << "," 
                      << c1_part1.p1.x << ","
                      << c1_part1.p2.x << ","
                      << c1_part1.p3.x << ",t),bez("
-                     << c1_part1.p0.y << ","
+                     << c1_part1.p0.y << "," 
                      << c1_part1.p1.y << ","
                      << c1_part1.p2.y << ","
                      << c1_part1.p3.y << ",t)";
@@ -1769,7 +1769,7 @@ int main(int argc, const char *argv[])
     {
         Bezier c1( someCurves[0] );
         Bezier c2( someCurves[1] );
-
+            
         c1.p0.x += safeParams2_xOffset;
         c1.p1.x += safeParams2_xOffset;
         c1.p2.x += safeParams2_xOffset;
@@ -1790,7 +1790,7 @@ int main(int argc, const char *argv[])
     // test safe parameter range from focus algorithm
     const double safeParamsFocus_xOffset( curr_Offset );
     curr_Offset += 20;
-    cout << "# safe param range from focus testing" << endl
+    cout << "# safe param range from focus testing" << endl 
          << "plot [t=0.0:1.0] ";
     for( i=0; i<sizeof(someCurves)/sizeof(Bezier); ++i )
     {
@@ -1798,7 +1798,7 @@ int main(int argc, const char *argv[])
         {
             Bezier c1( someCurves[i] );
             Bezier c2( someCurves[j] );
-
+            
             c1.p0.x += safeParamsFocus_xOffset;
             c1.p1.x += safeParamsFocus_xOffset;
             c1.p2.x += safeParamsFocus_xOffset;
@@ -1818,10 +1818,10 @@ int main(int argc, const char *argv[])
                 Bezier c1_part1;
                 Bezier c1_part2;
                 Bezier c1_part3;
-
+                
                 // subdivide at t1_c1
                 Impl_deCasteljauAt( c1_part1, c1_part2, c2, 0.30204 );
-
+                
                 // subdivide at t2_c1. As we're working on
                 // c1_part2 now, we have to adapt t2_c1 since
                 // we're no longer in the original parameter
@@ -1830,7 +1830,7 @@ int main(int argc, const char *argv[])
                 // relates the t2 value into the new parameter
                 // range [0,1] of c1_part2.
                 Impl_deCasteljauAt( c1_part1, c1_part3, c1_part2, (0.57151-0.30204)/(1.0-0.30204) );
-
+                
                 c2 = c1_part1;
                 Impl_calcFocus( focus, c2 );
             }
@@ -1850,49 +1850,49 @@ int main(int argc, const char *argv[])
             Bezier c1_part1;
             Bezier c1_part2;
             Bezier c1_part3;
-
+            
             // subdivide at t1_c1
             Impl_deCasteljauAt( c1_part1, c1_part2, c1, t1 );
             // subdivide at t2_c1
             Impl_deCasteljauAt( c1_part1, c1_part3, c1_part2, (t2-t1)/(1.0-t1) );
-
+            
             // output remaining segment (c1_part1)
-
-            cout << " bez("
-                 << c1.p0.x << ","
+            
+            cout << " bez(" 
+                 << c1.p0.x << "," 
                  << c1.p1.x << ","
                  << c1.p2.x << ","
                  << c1.p3.x << ",t),bez("
-                 << c1.p0.y << ","
+                 << c1.p0.y << "," 
                  << c1.p1.y << ","
                  << c1.p2.y << ","
                  << c1.p3.y << ",t) title \"c1\", "
 #ifdef WITH_SAFEFOCUSPARAM_CALCFOCUS
                  << "bez("
-                 << c2.p0.x << ","
+                 << c2.p0.x << "," 
                  << c2.p1.x << ","
                  << c2.p2.x << ","
                  << c2.p3.x << ",t),bez("
-                 << c2.p0.y << ","
+                 << c2.p0.y << "," 
                  << c2.p1.y << ","
                  << c2.p2.y << ","
                  << c2.p3.y << ",t) title \"c2\", "
                  << "bez("
-                 << focus.p0.x << ","
+                 << focus.p0.x << "," 
                  << focus.p1.x << ","
                  << focus.p2.x << ","
                  << focus.p3.x << ",t),bez("
-                 << focus.p0.y << ","
+                 << focus.p0.y << "," 
                  << focus.p1.y << ","
                  << focus.p2.y << ","
                  << focus.p3.y << ",t) title \"focus\"";
 #else
                  << "bez("
-                 << c2.p0.x << ","
+                 << c2.p0.x << "," 
                  << c2.p1.x << ","
                  << c2.p2.x << ","
                  << c2.p3.x << ",t),bez("
-                 << c2.p0.y << ","
+                 << c2.p0.y << "," 
                  << c2.p1.y << ","
                  << c2.p2.y << ","
                  << c2.p3.y << ",t) title \"focus\"";
@@ -1900,11 +1900,11 @@ int main(int argc, const char *argv[])
             if( bRet )
             {
                 cout << ", bez("
-                     << c1_part1.p0.x << ","
+                     << c1_part1.p0.x << "," 
                      << c1_part1.p1.x << ","
                      << c1_part1.p2.x << ","
                      << c1_part1.p3.x << ",t),bez("
-                     << c1_part1.p0.y+0.01 << ","
+                     << c1_part1.p0.y+0.01 << "," 
                      << c1_part1.p1.y+0.01 << ","
                      << c1_part1.p2.y+0.01 << ","
                      << c1_part1.p3.y+0.01 << ",t) title \"part\"";
@@ -1926,7 +1926,7 @@ int main(int argc, const char *argv[])
     {
         Bezier c1( someCurves[0] );
         Bezier c2( someCurves[1] );
-
+            
         c1.p0.x += safeParams3_xOffset;
         c1.p1.x += safeParams3_xOffset;
         c1.p2.x += safeParams3_xOffset;
@@ -1937,7 +1937,7 @@ int main(int argc, const char *argv[])
         c2.p3.x += safeParams3_xOffset;
 
         double t1, t2;
-
+        
         Bezier focus;
 #ifdef WITH_SAFEFOCUSPARAM_CALCFOCUS
         Impl_calcFocus( focus, c2 );
@@ -1952,13 +1952,13 @@ int main(int argc, const char *argv[])
 #endif
 
 #ifdef WITH_BEZIERCLIP_TEST
-    ::std::vector< ::std::pair<double, double> >                                result;
+    ::std::vector< ::std::pair<double, double> > 								result;
     ::std::back_insert_iterator< ::std::vector< ::std::pair<double, double> > > ii(result);
 
     // test full bezier clipping
     const double bezierClip_xOffset( curr_Offset );
     curr_Offset += 20;
-    cout << endl << endl << "# bezier clip testing" << endl
+    cout << endl << endl << "# bezier clip testing" << endl 
          << "plot [t=0:1] ";
     for( i=0; i<sizeof(someCurves)/sizeof(Bezier); ++i )
     {
@@ -1976,39 +1976,39 @@ int main(int argc, const char *argv[])
             c2.p2.x += bezierClip_xOffset;
             c2.p3.x += bezierClip_xOffset;
 
-            cout << " bez("
-                 << c1.p0.x << ","
+            cout << " bez(" 
+                 << c1.p0.x << "," 
                  << c1.p1.x << ","
                  << c1.p2.x << ","
                  << c1.p3.x << ",t),bez("
-                 << c1.p0.y << ","
+                 << c1.p0.y << "," 
                  << c1.p1.y << ","
                  << c1.p2.y << ","
                  << c1.p3.y << ",t), bez("
-                 << c2.p0.x << ","
+                 << c2.p0.x << "," 
                  << c2.p1.x << ","
                  << c2.p2.x << ","
                  << c2.p3.x << ",t),bez("
-                 << c2.p0.y << ","
+                 << c2.p0.y << "," 
                  << c2.p1.y << ","
                  << c2.p2.y << ","
-                 << c2.p3.y << ",t), '-' using (bez("
-                 << c1.p0.x << ","
+                 << c2.p3.y << ",t), '-' using (bez(" 
+                 << c1.p0.x << "," 
                  << c1.p1.x << ","
                  << c1.p2.x << ","
-                 << c1.p3.x
+                 << c1.p3.x 
                  << ",$1)):(bez("
-                 << c1.p0.y << ","
+                 << c1.p0.y << "," 
                  << c1.p1.y << ","
                  << c1.p2.y << ","
                  << c1.p3.y << ",$1)) title \"bezier " << i << " clipped against " << j << " (t on " << i << ")\", "
-                 << " '-' using (bez("
-                 << c2.p0.x << ","
+                 << " '-' using (bez(" 
+                 << c2.p0.x << "," 
                  << c2.p1.x << ","
                  << c2.p2.x << ","
-                 << c2.p3.x
+                 << c2.p3.x 
                  << ",$1)):(bez("
-                 << c2.p0.y << ","
+                 << c2.p0.y << "," 
                  << c2.p1.y << ","
                  << c2.p2.y << ","
                  << c2.p3.y << ",$1)) title \"bezier " << i << " clipped against " << j << " (t on " << j << ")\"";
diff --git a/basegfx/source/workbench/bezierclip.hxx b/basegfx/source/workbench/bezierclip.hxx
index ca16ad0fdd44..b32d7e20c26a 100644
--- a/basegfx/source/workbench/bezierclip.hxx
+++ b/basegfx/source/workbench/bezierclip.hxx
@@ -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
@@ -41,13 +41,13 @@ struct Point2D
 
 struct Bezier
 {
-    Point2D p0;
-    Point2D p1;
-    Point2D p2;
-    Point2D p3;
+    Point2D	p0;
+    Point2D	p1;
+    Point2D	p2;
+    Point2D	p3;
 
-    Point2D&        operator[]( int i ) { return reinterpret_cast<Point2D*>(this)[i]; }
-    const Point2D&  operator[]( int i ) const { return reinterpret_cast<const Point2D*>(this)[i]; }
+    Point2D& 		operator[]( int i ) { return reinterpret_cast<Point2D*>(this)[i]; }
+    const Point2D& 	operator[]( int i ) const { return reinterpret_cast<const Point2D*>(this)[i]; }
 };
 
 struct FatLine
diff --git a/basegfx/source/workbench/convexhull.cxx b/basegfx/source/workbench/convexhull.cxx
index 99d9fb86c1d9..dbed418d557e 100644
--- a/basegfx/source/workbench/convexhull.cxx
+++ b/basegfx/source/workbench/convexhull.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
@@ -36,12 +36,12 @@
 
 // -----------------------------------------------------------------------------
 
-/* Implements the theta function from Sedgewick: Algorithms in XXX, chapter 24 */
+/* Implements the theta function from Sedgewick: Algorithms in XXX, chapter 24 */ 
 template <class PointType> double theta( const PointType& p1, const PointType& p2 )
 {
     typename PointType::value_type dx, dy, ax, ay;
     double t;
-
+    
     dx = p2.x - p1.x; ax = absval( dx );
     dy = p2.y - p1.y; ay = absval( dy );
     t = (ax+ay == 0) ? 0 : (double) dy/(ax+ay);
@@ -49,13 +49,13 @@ template <class PointType> double theta( const PointType& p1, const PointType& p
         t = 2-t;
     else if( dy < 0 )
         t = 4+t;
-
+    
     return t*90.0;
 }
 
 /* Model of LessThanComparable for theta sort.
- * Uses the theta function from Sedgewick: Algorithms in XXX, chapter 24
- */
+ * Uses the theta function from Sedgewick: Algorithms in XXX, chapter 24 
+ */ 
 template <class PointType> class ThetaCompare : public ::std::binary_function< const PointType&, const PointType&, bool >
 {
 public:
@@ -83,7 +83,7 @@ template <class PointType, class CmpFunctor> typename PointType::value_type ccw(
     typename PointType::value_type theta0( thetaCmp(p0) );
     typename PointType::value_type theta1( thetaCmp(p1) );
     typename PointType::value_type theta2( thetaCmp(p2) );
-
+    
 #if 0
     if( theta0 == theta1 ||
         theta0 == theta2 ||
@@ -120,7 +120,7 @@ template <class PointType, class CmpFunctor> typename PointType::value_type ccw(
  Sometimes, the resulting polygon is not the convex hull (see below
  for an edge configuration to reproduce that problem)
 
- Problem analysis:
+ Problem analysis: 
  =================
 
  The root cause of this bug is the fact that the second part of
@@ -157,7 +157,7 @@ template <class PointType, class CmpFunctor> typename PointType::value_type ccw(
  also classify them as 'equal'. Thus, the second stage of the
  convex hull algorithm sorts the first one out, effectively
  reducing a cluster of theta-equal points to only one. This
- single point can then be treated correctly.
+ single point can then be treated correctly.    
 */
 
 
@@ -172,7 +172,7 @@ Polygon2D convexHull( const Polygon2D& rPoly )
     // determine safe point on hull (smallest y value)
     for( min=1, i=2; i<=N; ++i )
     {
-        if( result[i].y < result[min].y )
+        if( result[i].y < result[min].y ) 
             min = i;
     }
 
@@ -196,7 +196,7 @@ Polygon2D convexHull( const Polygon2D& rPoly )
 
     // setup sentinel
     result[0] = result[N];
-
+    
     // generate convex hull
     Polygon2D::size_type M;
     for( M=3, i=4; i<=N; ++i )
diff --git a/basegfx/source/workbench/gauss.hxx b/basegfx/source/workbench/gauss.hxx
index 63910c6ded2d..837df10af330 100644
--- a/basegfx/source/workbench/gauss.hxx
+++ b/basegfx/source/workbench/gauss.hxx
@@ -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
@@ -26,7 +26,7 @@
  ************************************************************************/
 
 /** This method eliminates elements below main diagonal in the given
-    matrix by gaussian elimination.
+    matrix by gaussian elimination. 
 
     @param matrix
     The matrix to operate on. Last column is the result vector (right
@@ -46,14 +46,14 @@
 
     @return true, if elimination succeeded.
  */
-template <class Matrix, typename BaseType>
-bool eliminate(     Matrix&         matrix,
-                    int             rows,
-                    int             cols,
-                    const BaseType& minPivot    )
+template <class Matrix, typename BaseType> 
+bool eliminate( 	Matrix&			matrix,
+                    int				rows,
+                    int				cols,
+                    const BaseType& minPivot	)
 {
-    BaseType    temp;
-    int         max, i, j, k;   /* *must* be signed, when looping like: j>=0 ! */
+    BaseType	temp;
+    int			max, i, j, k;	/* *must* be signed, when looping like: j>=0 ! */
 
     /* eliminate below main diagonal */
     for(i=0; i<cols-1; ++i)
@@ -61,12 +61,12 @@ bool eliminate(     Matrix&         matrix,
         /* find best pivot */
         max = i;
         for(j=i+1; j<rows; ++j)
-            if( fabs(matrix[ j*cols + i ]) > fabs(matrix[ max*cols + i ]) )
+            if( fabs(matrix[ j*cols + i ]) > fabs(matrix[ max*cols + i ]) ) 
                 max = j;
 
         /* check pivot value */
         if( fabs(matrix[ max*cols + i ]) < minPivot )
-            return false;   /* pivot too small! */
+            return false;	/* pivot too small! */
 
         /* interchange rows 'max' and 'i' */
         for(k=0; k<cols; ++k)
@@ -75,11 +75,11 @@ bool eliminate(     Matrix&         matrix,
             matrix[ i*cols + k ] = matrix[ max*cols + k ];
             matrix[ max*cols + k ] = temp;
         }
-
+        
         /* eliminate column */
         for(j=i+1; j<rows; ++j)
             for(k=cols-1; k>=i; --k)
-                matrix[ j*cols + k ] -= matrix[ i*cols + k ] *
+                matrix[ j*cols + k ] -= matrix[ i*cols + k ] * 
                     matrix[ j*cols + i ] / matrix[ i*cols + i ];
     }
 
@@ -108,14 +108,14 @@ bool eliminate(     Matrix&         matrix,
     @return true, if back substitution was possible (i.e. no division
     by zero occured).
  */
-template <class Matrix, class Vector, typename BaseType>
-bool substitute(    const Matrix&   matrix,
-                    int             rows,
-                    int             cols,
-                    Vector&         result  )
+template <class Matrix, class Vector, typename BaseType> 
+bool substitute(	const Matrix&	matrix,
+                    int				rows,
+                    int				cols,
+                    Vector&			result	)
 {
-    BaseType    temp;
-    int         j,k;    /* *must* be signed, when looping like: j>=0 ! */
+    BaseType	temp;
+    int			j,k;	/* *must* be signed, when looping like: j>=0 ! */
 
     /* substitute backwards */
     for(j=rows-1; j>=0; --j)
@@ -125,7 +125,7 @@ bool substitute(    const Matrix&   matrix,
             temp += matrix[ j*cols + k ] * result[k];
 
         if( matrix[ j*cols + j ] == 0.0 )
-            return false;   /* imminent division by zero! */
+            return false;	/* imminent division by zero! */
 
         result[j] = (matrix[ j*cols + cols-1 ] - temp) / matrix[ j*cols + j ];
     }
@@ -158,12 +158,12 @@ bool substitute(    const Matrix&   matrix,
 
     @return true, if elimination succeeded.
  */
-template <class Matrix, class Vector, typename BaseType>
-bool solve( Matrix&     matrix,
-            int         rows,
-            int         cols,
-            Vector&     result,
-            BaseType    minPivot    )
+template <class Matrix, class Vector, typename BaseType> 
+bool solve(	Matrix&		matrix,
+            int			rows,
+            int			cols,
+            Vector&		result,
+            BaseType	minPivot	)
 {
     if( eliminate<Matrix,BaseType>(matrix, rows, cols, minPivot) )
         return substitute<Matrix,Vector,BaseType>(matrix, rows, cols, result);
diff --git a/basegfx/test/basegfx1d.cxx b/basegfx/test/basegfx1d.cxx
index 41ac65da56e3..41f26617b036 100644
--- a/basegfx/test/basegfx1d.cxx
+++ b/basegfx/test/basegfx1d.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
diff --git a/basegfx/test/basegfx2d.cxx b/basegfx/test/basegfx2d.cxx
index 31005a158982..8b17ba133bc0 100644
--- a/basegfx/test/basegfx2d.cxx
+++ b/basegfx/test/basegfx2d.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
@@ -148,7 +148,7 @@ public:
 
     void impex()
     {
-        B2DPolyPolygon  aPoly;
+        B2DPolyPolygon 	aPoly;
         ::rtl::OUString aExport;
 
         CPPUNIT_ASSERT_MESSAGE("importing simple rectangle from SVG-D",
@@ -294,23 +294,23 @@ public:
         B2DPolyRange aRange;
         aRange.appendElement(B2DRange(0,0,1,1),ORIENTATION_POSITIVE);
         aRange.appendElement(B2DRange(2,2,3,3),ORIENTATION_POSITIVE);
-
-        CPPUNIT_ASSERT_MESSAGE("simple poly range - count",
+        
+        CPPUNIT_ASSERT_MESSAGE("simple poly range - count", 
                                aRange.count() == 2);
-        CPPUNIT_ASSERT_MESSAGE("simple poly range - first element",
+        CPPUNIT_ASSERT_MESSAGE("simple poly range - first element", 
                                aRange.getElement(0).head == B2DRange(0,0,1,1));
-        CPPUNIT_ASSERT_MESSAGE("simple poly range - second element",
+        CPPUNIT_ASSERT_MESSAGE("simple poly range - second element", 
                                aRange.getElement(1).head == B2DRange(2,2,3,3));
 
         // B2DPolyRange relies on correctly orientated rects
         const B2DRange aRect(0,0,1,1);
-        CPPUNIT_ASSERT_MESSAGE("createPolygonFromRect - correct orientation",
+        CPPUNIT_ASSERT_MESSAGE("createPolygonFromRect - correct orientation", 
                                tools::getOrientation(
                                    tools::createPolygonFromRect(aRect)) == ORIENTATION_POSITIVE );
     }
 
-    // Change the following lines only, if you add, remove or rename
-    // member functions of the current class,
+    // Change the following lines only, if you add, remove or rename 
+    // member functions of the current class, 
     // because these macros are need by auto register mechanism.
 
     CPPUNIT_TEST_SUITE(b2dpolyrange);
@@ -321,15 +321,15 @@ public:
 class b2dbeziertools : public CppUnit::TestFixture
 {
 private:
-    B2DCubicBezier aHalfCircle;                     // not exactly, but a look-alike
-    B2DCubicBezier aQuarterCircle;                  // not exactly, but a look-alike
-    B2DCubicBezier aLoop;                           // identical endpoints, curve goes back to where it started
-    B2DCubicBezier aStraightLineDistinctEndPoints;  // truly a line
-    B2DCubicBezier aStraightLineDistinctEndPoints2; // truly a line, with slightly different control points
-    B2DCubicBezier aStraightLineIdenticalEndPoints; // degenerate case of aLoop
+    B2DCubicBezier aHalfCircle; 					// not exactly, but a look-alike
+    B2DCubicBezier aQuarterCircle; 					// not exactly, but a look-alike
+    B2DCubicBezier aLoop; 							// identical endpoints, curve goes back to where it started
+    B2DCubicBezier aStraightLineDistinctEndPoints;	// truly a line
+    B2DCubicBezier aStraightLineDistinctEndPoints2;	// truly a line, with slightly different control points
+    B2DCubicBezier aStraightLineIdenticalEndPoints;	// degenerate case of aLoop
     B2DCubicBezier aStraightLineIdenticalEndPoints2;// degenerate case of aLoop, with slightly different control points
-    B2DCubicBezier aCrossing;                       // curve self-intersects somewhere in the middle
-    B2DCubicBezier aCusp;                           // curve has a point of undefined tangency
+    B2DCubicBezier aCrossing;						// curve self-intersects somewhere in the middle
+    B2DCubicBezier aCusp;							// curve has a point of undefined tangency
 
 
 public:
@@ -344,16 +344,16 @@ public:
         const B2DPoint quarterDown( 0.25, 0.25 );
         const B2DPoint quarterUp( 0.75, 0.75 );
 
-        aHalfCircle     = B2DCubicBezier(a00, a01, a11, a10);
+        aHalfCircle 	= B2DCubicBezier(a00, a01, a11, a10);
 
         // The spline control points become
         //
-        //  (R * cos(A), R * sin(A))
-        //  (R * cos(A) - h * sin(A), R * sin(A) + h * cos (A))
-        //  (R * cos(B) + h * sin(B), R * sin(B) - h * cos (B))
-        //  (R * cos(B), R * sin(B))
+        // 	(R * cos(A), R * sin(A))
+        // 	(R * cos(A) - h * sin(A), R * sin(A) + h * cos (A))
+        // 	(R * cos(B) + h * sin(B), R * sin(B) - h * cos (B))
+        // 	(R * cos(B), R * sin(B))
         //
-        // where    h = 4/3 * R * tan ((B-A)/4)
+        // where	h = 4/3 * R * tan ((B-A)/4)
         //
         // with R being the radius, A start angle and B end angle (A < B).
         //
@@ -362,17 +362,17 @@ public:
 
         // Choosing R=1, A=0, B=pi/2
         const double h( 4.0/3.0 * tan(M_PI/8.0) );
-        aQuarterCircle  = B2DCubicBezier(a10 + B2DPoint(1.0,0.0),
+        aQuarterCircle 	= B2DCubicBezier(a10 + B2DPoint(1.0,0.0),
                                          B2DPoint(B2DPoint( 1.0, h ) + B2DPoint(1.0,0.0)),
                                          B2DPoint(B2DPoint( h, 1.0) + B2DPoint(1.0,0.0)),
                                          a01 + B2DPoint(1.0,0.0));
 
-        aCusp           = B2DCubicBezier(a00 + B2DPoint(2.0,0.0),
+        aCusp 			= B2DCubicBezier(a00 + B2DPoint(2.0,0.0),
                                          B2DPoint(a11 + B2DPoint(2.0,0.0)),
                                          B2DPoint(a01 + B2DPoint(2.0,0.0)),
                                          a10 + B2DPoint(2.0,0.0));
 
-        aLoop           = B2DCubicBezier(a00 + B2DPoint(3.0,0.0),
+        aLoop			= B2DCubicBezier(a00 + B2DPoint(3.0,0.0),
                                          B2DPoint(a01 + B2DPoint(3.0,0.0)),
                                          B2DPoint(a10 + B2DPoint(3.0,0.0)),
                                          a00 + B2DPoint(3.0,0.0));
@@ -397,7 +397,7 @@ public:
                                                           B2DPoint(quarterUp + B2DPoint(7.0,0.0)),
                                                           a00 + B2DPoint(7.0,0.0));
 
-        aCrossing       = B2DCubicBezier(a00 + B2DPoint(8.0,0.0),
+        aCrossing		= B2DCubicBezier(a00 + B2DPoint(8.0,0.0),
                                          B2DPoint(B2DPoint(2.0,2.0) + B2DPoint(8.0,0.0)),
                                          B2DPoint(B2DPoint(-1.0,2.0) + B2DPoint(8.0,0.0)),
                                          a10 + B2DPoint(8.0,0.0));
@@ -543,7 +543,7 @@ public:
     // because these macros are need by auto register mechanism.
 
     CPPUNIT_TEST_SUITE(b2dbeziertools);
-    CPPUNIT_TEST(adaptiveByDistance);   // TODO: add tests for quadratic bezier (subdivide and degree reduction)
+    CPPUNIT_TEST(adaptiveByDistance);	// TODO: add tests for quadratic bezier (subdivide and degree reduction)
     CPPUNIT_TEST(adaptiveByAngle);
     CPPUNIT_TEST_SUITE_END();
 }; // class b2dcubicbezier
@@ -581,12 +581,12 @@ public:
 class b2dhommatrix : public CppUnit::TestFixture
 {
 private:
-    B2DHomMatrix    maIdentity;
-    B2DHomMatrix    maScale;
-    B2DHomMatrix    maTranslate;
-    B2DHomMatrix    maShear;
-    B2DHomMatrix    maAffine;
-    B2DHomMatrix    maPerspective;
+    B2DHomMatrix	maIdentity;
+    B2DHomMatrix	maScale;
+    B2DHomMatrix	maTranslate;
+    B2DHomMatrix	maShear;
+    B2DHomMatrix	maAffine;
+    B2DHomMatrix	maPerspective;
 
 public:
     // initialise your test code values here.
@@ -639,12 +639,12 @@ public:
 
     void equal()
     {
-        B2DHomMatrix    aIdentity;
-        B2DHomMatrix    aScale;
-        B2DHomMatrix    aTranslate;
-        B2DHomMatrix    aShear;
-        B2DHomMatrix    aAffine;
-        B2DHomMatrix    aPerspective;
+        B2DHomMatrix	aIdentity;
+        B2DHomMatrix	aScale;
+        B2DHomMatrix	aTranslate;
+        B2DHomMatrix	aShear;
+        B2DHomMatrix	aAffine;
+        B2DHomMatrix	aPerspective;
 
         // setup some test matrices
         aIdentity.identity(); // force compact layout
@@ -1096,7 +1096,7 @@ public:
         aNonRect5.setControlPoints(1,B2DPoint(1,0),B2DPoint(-11,0));
         aNonRect5.setClosed(true);
 
-        CPPUNIT_ASSERT_MESSAGE("checking rectangle-ness of rectangle 1",
+        CPPUNIT_ASSERT_MESSAGE("checking rectangle-ness of rectangle 1", 
                                tools::isRectangle( aRect1 ));
         CPPUNIT_ASSERT_MESSAGE("checking rectangle-ness of rectangle 2",
                                tools::isRectangle( aRect2 ));
@@ -1108,7 +1108,7 @@ public:
                                !tools::isRectangle( aNonRect3 ));
         CPPUNIT_ASSERT_MESSAGE("checking non-rectangle-ness of polygon 4",
                                !tools::isRectangle( aNonRect4 ));
-        CPPUNIT_ASSERT_MESSAGE("checking non-rectangle-ness of polygon 5",
+        CPPUNIT_ASSERT_MESSAGE("checking non-rectangle-ness of polygon 5", 
                                !tools::isRectangle( aNonRect5 ));
     }
 
@@ -1296,118 +1296,118 @@ public:
     // insert your test code here.
     void hslTest()
     {
-        CPPUNIT_ASSERT_MESSAGE("white",
+        CPPUNIT_ASSERT_MESSAGE("white", 
                                tools::rgb2hsl(maWhite) == BColor(0,0,1));
-        CPPUNIT_ASSERT_MESSAGE("black",
+        CPPUNIT_ASSERT_MESSAGE("black", 
                                tools::rgb2hsl(maBlack) == BColor(0,0,0));
-        CPPUNIT_ASSERT_MESSAGE("red",
+        CPPUNIT_ASSERT_MESSAGE("red", 
                                tools::rgb2hsl(maRed) == BColor(0,1,0.5));
-        CPPUNIT_ASSERT_MESSAGE("green",
+        CPPUNIT_ASSERT_MESSAGE("green", 
                                tools::rgb2hsl(maGreen) == BColor(120,1,0.5));
-        CPPUNIT_ASSERT_MESSAGE("blue",
+        CPPUNIT_ASSERT_MESSAGE("blue", 
                                tools::rgb2hsl(maBlue) == BColor(240,1,0.5));
-        CPPUNIT_ASSERT_MESSAGE("yellow",
+        CPPUNIT_ASSERT_MESSAGE("yellow", 
                                tools::rgb2hsl(maYellow) == BColor(60,1,0.5));
-        CPPUNIT_ASSERT_MESSAGE("magenta",
+        CPPUNIT_ASSERT_MESSAGE("magenta", 
                                tools::rgb2hsl(maMagenta) == BColor(300,1,0.5));
-        CPPUNIT_ASSERT_MESSAGE("cyan",
+        CPPUNIT_ASSERT_MESSAGE("cyan", 
                                tools::rgb2hsl(maCyan) == BColor(180,1,0.5));
-        CPPUNIT_ASSERT_MESSAGE("third hue case",
+        CPPUNIT_ASSERT_MESSAGE("third hue case", 
                                tools::rgb2hsl(BColor(0,0.5,1)) == BColor(210,1,0.5));
 
-        CPPUNIT_ASSERT_MESSAGE("roundtrip white",
+        CPPUNIT_ASSERT_MESSAGE("roundtrip white", 
                                tools::hsl2rgb(tools::rgb2hsl(maWhite)) == maWhite);
-        CPPUNIT_ASSERT_MESSAGE("roundtrip black",
+        CPPUNIT_ASSERT_MESSAGE("roundtrip black", 
                                tools::hsl2rgb(tools::rgb2hsl(maBlack)) == maBlack);
-        CPPUNIT_ASSERT_MESSAGE("roundtrip red",
+        CPPUNIT_ASSERT_MESSAGE("roundtrip red", 
                                tools::hsl2rgb(tools::rgb2hsl(maRed)) == maRed);
-        CPPUNIT_ASSERT_MESSAGE("roundtrip green",
+        CPPUNIT_ASSERT_MESSAGE("roundtrip green", 
                                tools::hsl2rgb(tools::rgb2hsl(maGreen)) == maGreen);
-        CPPUNIT_ASSERT_MESSAGE("roundtrip blue",
+        CPPUNIT_ASSERT_MESSAGE("roundtrip blue", 
                                tools::hsl2rgb(tools::rgb2hsl(maBlue)) == maBlue);
-        CPPUNIT_ASSERT_MESSAGE("roundtrip yellow",
+        CPPUNIT_ASSERT_MESSAGE("roundtrip yellow", 
                                tools::hsl2rgb(tools::rgb2hsl(maYellow)) == maYellow);
-        CPPUNIT_ASSERT_MESSAGE("roundtrip magenta",
+        CPPUNIT_ASSERT_MESSAGE("roundtrip magenta", 
                                tools::hsl2rgb(tools::rgb2hsl(maMagenta)) == maMagenta);
-        CPPUNIT_ASSERT_MESSAGE("roundtrip cyan",
+        CPPUNIT_ASSERT_MESSAGE("roundtrip cyan", 
                                tools::hsl2rgb(tools::rgb2hsl(maCyan)) == maCyan);
 
-        CPPUNIT_ASSERT_MESSAGE("grey10",
+        CPPUNIT_ASSERT_MESSAGE("grey10", 
                                tools::rgb2hsl(maWhite*.1) == BColor(0,0,.1));
-        CPPUNIT_ASSERT_MESSAGE("grey90",
+        CPPUNIT_ASSERT_MESSAGE("grey90", 
                                tools::rgb2hsl(maWhite*.9) == BColor(0,0,.9));
-        CPPUNIT_ASSERT_MESSAGE("red/2",
+        CPPUNIT_ASSERT_MESSAGE("red/2", 
                                tools::rgb2hsl(maRed*.5) == BColor(0,1,0.25));
-        CPPUNIT_ASSERT_MESSAGE("green/2",
+        CPPUNIT_ASSERT_MESSAGE("green/2", 
                                tools::rgb2hsl(maGreen*.5) == BColor(120,1,0.25));
-        CPPUNIT_ASSERT_MESSAGE("blue/2",
+        CPPUNIT_ASSERT_MESSAGE("blue/2", 
                                tools::rgb2hsl(maBlue*.5) == BColor(240,1,0.25));
-        CPPUNIT_ASSERT_MESSAGE("yellow/2",
+        CPPUNIT_ASSERT_MESSAGE("yellow/2", 
                                tools::rgb2hsl(maYellow*.5) == BColor(60,1,0.25));
-        CPPUNIT_ASSERT_MESSAGE("magenta/2",
+        CPPUNIT_ASSERT_MESSAGE("magenta/2", 
                                tools::rgb2hsl(maMagenta*.5) == BColor(300,1,0.25));
-        CPPUNIT_ASSERT_MESSAGE("cyan/2",
+        CPPUNIT_ASSERT_MESSAGE("cyan/2", 
                                tools::rgb2hsl(maCyan*.5) == BColor(180,1,0.25));
 
-        CPPUNIT_ASSERT_MESSAGE("pastel",
+        CPPUNIT_ASSERT_MESSAGE("pastel", 
                                tools::rgb2hsl(BColor(.75,.25,.25)) == BColor(0,.5,.5));
     }
 
     // insert your test code here.
     void hsvTest()
     {
-        CPPUNIT_ASSERT_MESSAGE("white",
+        CPPUNIT_ASSERT_MESSAGE("white", 
                                tools::rgb2hsv(maWhite) == BColor(0,0,1));
-        CPPUNIT_ASSERT_MESSAGE("black",
+        CPPUNIT_ASSERT_MESSAGE("black", 
                                tools::rgb2hsv(maBlack) == BColor(0,0,0));
-        CPPUNIT_ASSERT_MESSAGE("red",
+        CPPUNIT_ASSERT_MESSAGE("red", 
                                tools::rgb2hsv(maRed) == BColor(0,1,1));
-        CPPUNIT_ASSERT_MESSAGE("green",
+        CPPUNIT_ASSERT_MESSAGE("green", 
                                tools::rgb2hsv(maGreen) == BColor(120,1,1));
-        CPPUNIT_ASSERT_MESSAGE("blue",
+        CPPUNIT_ASSERT_MESSAGE("blue", 
                                tools::rgb2hsv(maBlue) == BColor(240,1,1));
-        CPPUNIT_ASSERT_MESSAGE("yellow",
+        CPPUNIT_ASSERT_MESSAGE("yellow", 
                                tools::rgb2hsv(maYellow) == BColor(60,1,1));
-        CPPUNIT_ASSERT_MESSAGE("magenta",
+        CPPUNIT_ASSERT_MESSAGE("magenta", 
                                tools::rgb2hsv(maMagenta) == BColor(300,1,1));
-        CPPUNIT_ASSERT_MESSAGE("cyan",
+        CPPUNIT_ASSERT_MESSAGE("cyan", 
                                tools::rgb2hsv(maCyan) == BColor(180,1,1));
 
-        CPPUNIT_ASSERT_MESSAGE("roundtrip white",
+        CPPUNIT_ASSERT_MESSAGE("roundtrip white", 
                                tools::hsv2rgb(tools::rgb2hsv(maWhite)) == maWhite);
-        CPPUNIT_ASSERT_MESSAGE("roundtrip black",
+        CPPUNIT_ASSERT_MESSAGE("roundtrip black", 
                                tools::hsv2rgb(tools::rgb2hsv(maBlack)) == maBlack);
-        CPPUNIT_ASSERT_MESSAGE("roundtrip red",
+        CPPUNIT_ASSERT_MESSAGE("roundtrip red", 
                                tools::hsv2rgb(tools::rgb2hsv(maRed)) == maRed);
-        CPPUNIT_ASSERT_MESSAGE("roundtrip green",
+        CPPUNIT_ASSERT_MESSAGE("roundtrip green", 
                                tools::hsv2rgb(tools::rgb2hsv(maGreen)) == maGreen);
-        CPPUNIT_ASSERT_MESSAGE("roundtrip blue",
+        CPPUNIT_ASSERT_MESSAGE("roundtrip blue", 
                                tools::hsv2rgb(tools::rgb2hsv(maBlue)) == maBlue);
-        CPPUNIT_ASSERT_MESSAGE("roundtrip yellow",
+        CPPUNIT_ASSERT_MESSAGE("roundtrip yellow", 
                                tools::hsv2rgb(tools::rgb2hsv(maYellow)) == maYellow);
-        CPPUNIT_ASSERT_MESSAGE("roundtrip magenta",
+        CPPUNIT_ASSERT_MESSAGE("roundtrip magenta", 
                                tools::hsv2rgb(tools::rgb2hsv(maMagenta)) == maMagenta);
-        CPPUNIT_ASSERT_MESSAGE("roundtrip cyan",
+        CPPUNIT_ASSERT_MESSAGE("roundtrip cyan", 
                                tools::hsv2rgb(tools::rgb2hsv(maCyan)) == maCyan);
 
-        CPPUNIT_ASSERT_MESSAGE("grey10",
+        CPPUNIT_ASSERT_MESSAGE("grey10", 
                                tools::rgb2hsv(maWhite*.1) == BColor(0,0,.1));
-        CPPUNIT_ASSERT_MESSAGE("grey90",
+        CPPUNIT_ASSERT_MESSAGE("grey90", 
                                tools::rgb2hsv(maWhite*.9) == BColor(0,0,.9));
-        CPPUNIT_ASSERT_MESSAGE("red/2",
+        CPPUNIT_ASSERT_MESSAGE("red/2", 
                                tools::rgb2hsv(maRed*.5) == BColor(0,1,0.5));
-        CPPUNIT_ASSERT_MESSAGE("green/2",
+        CPPUNIT_ASSERT_MESSAGE("green/2", 
                                tools::rgb2hsv(maGreen*.5) == BColor(120,1,0.5));
-        CPPUNIT_ASSERT_MESSAGE("blue/2",
+        CPPUNIT_ASSERT_MESSAGE("blue/2", 
                                tools::rgb2hsv(maBlue*.5) == BColor(240,1,0.5));
-        CPPUNIT_ASSERT_MESSAGE("yellow/2",
+        CPPUNIT_ASSERT_MESSAGE("yellow/2", 
                                tools::rgb2hsv(maYellow*.5) == BColor(60,1,0.5));
-        CPPUNIT_ASSERT_MESSAGE("magenta/2",
+        CPPUNIT_ASSERT_MESSAGE("magenta/2", 
                                tools::rgb2hsv(maMagenta*.5) == BColor(300,1,0.5));
-        CPPUNIT_ASSERT_MESSAGE("cyan/2",
+        CPPUNIT_ASSERT_MESSAGE("cyan/2", 
                                tools::rgb2hsv(maCyan*.5) == BColor(180,1,0.5));
 
-        CPPUNIT_ASSERT_MESSAGE("pastel",
+        CPPUNIT_ASSERT_MESSAGE("pastel", 
                                tools::rgb2hsv(BColor(.5,.25,.25)) == BColor(0,.5,.5));
     }
 
@@ -1423,8 +1423,8 @@ public:
         tools::rgb2ciexyz(maCyan);
     }
 
-    // Change the following lines only, if you add, remove or rename
-    // member functions of the current class,
+    // Change the following lines only, if you add, remove or rename 
+    // member functions of the current class, 
     // because these macros are need by auto register mechanism.
 
     CPPUNIT_TEST_SUITE(bcolor);
diff --git a/basegfx/test/basegfx3d.cxx b/basegfx/test/basegfx3d.cxx
index a16132e0810f..9faf4f5d43ea 100644
--- a/basegfx/test/basegfx3d.cxx
+++ b/basegfx/test/basegfx3d.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
diff --git a/basegfx/test/basegfxtools.cxx b/basegfx/test/basegfxtools.cxx
index 1a8b97a559b2..635f92019b91 100644
--- a/basegfx/test/basegfxtools.cxx
+++ b/basegfx/test/basegfxtools.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
@@ -96,8 +96,8 @@ public:
         CPPUNIT_ASSERT_MESSAGE("0.51", nIndex==1 && fAlpha==1.0);
     }
 
-    // Change the following lines only, if you add, remove or rename
-    // member functions of the current class,
+    // Change the following lines only, if you add, remove or rename 
+    // member functions of the current class, 
     // because these macros are need by auto register mechanism.
 
     CPPUNIT_TEST_SUITE(KeyStopLerpTest);
diff --git a/basegfx/test/boxclipper.cxx b/basegfx/test/boxclipper.cxx
index d52218a51ee0..329905b4d1aa 100644
--- a/basegfx/test/boxclipper.cxx
+++ b/basegfx/test/boxclipper.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
@@ -64,7 +64,7 @@ inline double getRandomOrdinal( const ::std::size_t n )
 
 inline bool compare(const B2DPoint& left, const B2DPoint& right)
 {
-    return left.getX()<right.getX()
+    return left.getX()<right.getX() 
         || (left.getX()==right.getX() && left.getY()<right.getY());
 }
 
@@ -146,7 +146,7 @@ public:
         aRingIntersection2.appendElement( aWest2, ORIENTATION_NEGATIVE );
 
         aRingIntersectExtraStrip = aRingIntersection2;
-        aRingIntersectExtraStrip.appendElement( B2DRange(0, -25, 200, 25),
+        aRingIntersectExtraStrip.appendElement( B2DRange(0, -25, 200, 25), 
                                                 ORIENTATION_NEGATIVE );
 
         aComplexIntersections.appendElement( aCenter, ORIENTATION_NEGATIVE );
@@ -243,7 +243,7 @@ public:
     void verifyPoly(const char* sName, const char* sSvg, const B2DPolyRange& toTest)
     {
         B2DPolyPolygon aTmp1;
-        CPPUNIT_ASSERT_MESSAGE(sName,
+        CPPUNIT_ASSERT_MESSAGE(sName, 
                                tools::importFromSvgD(
                                    aTmp1,
                                    rtl::OUString::createFromAscii(sSvg)));
@@ -298,12 +298,12 @@ public:
         verifyPoly("randomIntersections", randomIntersections, aRandomIntersections);
     }
 
-    void dumpSvg(const char* pName,
+    void dumpSvg(const char* pName, 
                  const ::basegfx::B2DPolyPolygon& rPoly)
     {
         (void)pName; (void)rPoly;
 #if defined(VERBOSE)
-        fprintf(stderr, "%s - svg:d=\"%s\"\n",
+        fprintf(stderr, "%s - svg:d=\"%s\"\n", 
                 pName, rtl::OUStringToOString(
                     basegfx::tools::exportToSvgD(rPoly),
                     RTL_TEXTENCODING_UTF8).getStr() );
@@ -341,12 +341,12 @@ public:
                 rRange.getElement(i).head);
             if( rRange.getElement(i).tail.head == ORIENTATION_NEGATIVE )
                 aRect.flip();
-
+            
             genericClip.append(aRect);
         }
 
 #if defined(VERBOSE)
-        fprintf(stderr, "%s input      - svg:d=\"%s\"\n",
+        fprintf(stderr, "%s input      - svg:d=\"%s\"\n", 
                 pName, rtl::OUStringToOString(
                     basegfx::tools::exportToSvgD(
                         genericClip),
@@ -359,7 +359,7 @@ public:
                 normalizePoly(
                     boxClipResult)));
 #if defined(VERBOSE)
-        fprintf(stderr, "%s boxclipper - svg:d=\"%s\"\n",
+        fprintf(stderr, "%s boxclipper - svg:d=\"%s\"\n", 
                 pName, rtl::OUStringToOString(
                     boxClipSvg,
                     RTL_TEXTENCODING_UTF8).getStr() );
@@ -371,13 +371,13 @@ public:
                 normalizePoly(
                     genericClip)));
 #if defined(VERBOSE)
-        fprintf(stderr, "%s genclipper - svg:d=\"%s\"\n",
+        fprintf(stderr, "%s genclipper - svg:d=\"%s\"\n", 
                 pName, rtl::OUStringToOString(
                     genericClipSvg,
                     RTL_TEXTENCODING_UTF8).getStr() );
 #endif
 
-        CPPUNIT_ASSERT_MESSAGE(pName,
+        CPPUNIT_ASSERT_MESSAGE(pName, 
                                genericClipSvg == boxClipSvg);
     }
 
@@ -393,7 +393,7 @@ public:
         validatePoly("intersectionSE", aIntersectionSE);
         validatePoly("intersectionSW", aIntersectionSW);
         validatePoly("intersectionNW", aIntersectionNW);
-        // subtle differences on Solaris Intel, comparison not smart enough
+        // subtle differences on Solaris Intel, comparison not smart enough 
         // (due to floating point inaccuracies)
         //validatePoly("ringIntersection", aRingIntersection);
         //validatePoly("ringIntersection2", aRingIntersection2);
@@ -403,14 +403,14 @@ public:
         //validatePoly("randomIntersections", aRandomIntersections);
     }
 
-    // Change the following lines only, if you add, remove or rename
-    // member functions of the current class,
+    // Change the following lines only, if you add, remove or rename 
+    // member functions of the current class, 
     // because these macros are need by auto register mechanism.
 
     CPPUNIT_TEST_SUITE(boxclipper);
     CPPUNIT_TEST(validatePoly);
     CPPUNIT_TEST(verifyPoly);
-    CPPUNIT_TEST(getPolyPolygon);
+    CPPUNIT_TEST(getPolyPolygon);    
     CPPUNIT_TEST_SUITE_END();
 };
 
diff --git a/basegfx/test/clipstate.cxx b/basegfx/test/clipstate.cxx
index 3d9f59979aa7..1141cb4053d3 100644
--- a/basegfx/test/clipstate.cxx
+++ b/basegfx/test/clipstate.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
@@ -53,11 +53,11 @@ namespace basegfx2d
 class clipstate : public CppUnit::TestFixture
 {
 private:
-    tools::B2DClipState aUnion1;
-    tools::B2DClipState aUnion2;
-    tools::B2DClipState aIntersect;
-    tools::B2DClipState aXor;
-    tools::B2DClipState aSubtract;
+    tools::B2DClipState aUnion1; 
+    tools::B2DClipState aUnion2; 
+    tools::B2DClipState aIntersect; 
+    tools::B2DClipState aXor; 
+    tools::B2DClipState aSubtract; 
 
 public:
     void setUp()
@@ -107,14 +107,14 @@ public:
     void verifyPoly(const char* sName, const char* sSvg, const tools::B2DClipState& toTest)
     {
 #if defined(VERBOSE)
-        fprintf(stderr, "%s - svg:d=\"%s\"\n",
+        fprintf(stderr, "%s - svg:d=\"%s\"\n", 
                 sName, rtl::OUStringToOString(
                     basegfx::tools::exportToSvgD(toTest.getClipPoly()),
                     RTL_TEXTENCODING_UTF8).getStr() );
 #endif
 
         B2DPolyPolygon aTmp1;
-        CPPUNIT_ASSERT_MESSAGE(sName,
+        CPPUNIT_ASSERT_MESSAGE(sName, 
                                tools::importFromSvgD(
                                    aTmp1,
                                    rtl::OUString::createFromAscii(sSvg)));
@@ -149,7 +149,7 @@ public:
 
     void verifyMixedClips()
     {
-        tools::B2DClipState aMixedClip;
+        tools::B2DClipState aMixedClip; 
 
         const char* unionSvg="m100 10v90h-90v10h-20v-10h-90v-90h-10v-20h10v-90h90v-10h20v10h90v90h10v20z";
 
diff --git a/basegfx/test/export.map b/basegfx/test/export.map
index 3308588ef6f8..0dbbcc5a7372 100644
--- a/basegfx/test/export.map
+++ b/basegfx/test/export.map
@@ -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
diff --git a/basegfx/test/genericclipper.cxx b/basegfx/test/genericclipper.cxx
index 84230a084493..fd17fc754586 100644
--- a/basegfx/test/genericclipper.cxx
+++ b/basegfx/test/genericclipper.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
@@ -81,8 +81,8 @@ public:
     void tearDown()
     {}
 
-    void validate(const char* pName,
-                  const char* pValidSvgD,
+    void validate(const char* pName, 
+                  const char* pValidSvgD, 
                   B2DPolyPolygon (*pFunc)(const B2DPolyPolygon&, const B2DPolyPolygon&))
     {
         const B2DPolyPolygon aSelfIntersect(
@@ -90,12 +90,12 @@ public:
         const B2DPolyPolygon aRect(
             tools::prepareForPolygonOperation(aShiftedRectangle));
 #if defined(VERBOSE)
-        fprintf(stderr, "%s input LHS - svg:d=\"%s\"\n",
+        fprintf(stderr, "%s input LHS - svg:d=\"%s\"\n", 
                 pName, rtl::OUStringToOString(
                     basegfx::tools::exportToSvgD(
                         aSelfIntersect),
                     RTL_TEXTENCODING_UTF8).getStr() );
-        fprintf(stderr, "%s input RHS - svg:d=\"%s\"\n",
+        fprintf(stderr, "%s input RHS - svg:d=\"%s\"\n", 
                 pName, rtl::OUStringToOString(
                     basegfx::tools::exportToSvgD(
                         aRect),
@@ -106,7 +106,7 @@ public:
             pFunc(aSelfIntersect, aRect);
 
 #if defined(VERBOSE)
-        fprintf(stderr, "%s - svg:d=\"%s\"\n",
+        fprintf(stderr, "%s - svg:d=\"%s\"\n", 
                 pName, rtl::OUStringToOString(
                     basegfx::tools::exportToSvgD(aRes),
                     RTL_TEXTENCODING_UTF8).getStr() );
@@ -142,8 +142,8 @@ public:
         validate("validateDiff", pValid, &tools::solvePolygonOperationDiff);
     }
 
-    // Change the following lines only, if you add, remove or rename
-    // member functions of the current class,
+    // Change the following lines only, if you add, remove or rename 
+    // member functions of the current class, 
     // because these macros are need by auto register mechanism.
 
     CPPUNIT_TEST_SUITE(genericclipper);
diff --git a/basegfx/test/testtools.cxx b/basegfx/test/testtools.cxx
index e96eb4d8edce..d2980171125b 100644
--- a/basegfx/test/testtools.cxx
+++ b/basegfx/test/testtools.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
@@ -53,7 +53,7 @@ namespace basegfx
             // mode, therefore every plot has at least _two_
             // functions: one for the x and one for the y value, both
             // depending on t.
-            mrOutputStream << "#!/usr/bin/gnuplot -persist" << ::std::endl
+            mrOutputStream << "#!/usr/bin/gnuplot -persist" << ::std::endl 
                            << "#" << ::std::endl
                            << "# automatically generated by basegfx::testtools::Plotter, don't change!" << ::std::endl
                            << "#" << ::std::endl
@@ -95,7 +95,7 @@ namespace basegfx
             public:
                 PointWriter( ::std::ostream& rOutputStream ) :
                     mrOutputStream( rOutputStream )
-                {
+                { 
                 }
 
                 void operator()( const B2DPoint& rPoint ) const
@@ -105,7 +105,7 @@ namespace basegfx
                 }
 
             private:
-                ::std::ostream&     mrOutputStream;
+                ::std::ostream& 	mrOutputStream;
             };
         }
 
@@ -113,7 +113,7 @@ namespace basegfx
         {
             // End the plot line
             mrOutputStream << ::std::endl;
-
+                        
             // write stored data points. Cannot write before, since
             // this is an inline dataset, which must be after the plot <...>
             // line
@@ -126,7 +126,7 @@ namespace basegfx
 
             if( pointCount < 1 )
                 return;
-
+            
             if( pointCount == 1 )
             {
                 plot( rPoly.getB2DPoint(0) );
@@ -139,9 +139,9 @@ namespace basegfx
                 if(rPoly.isNextControlPointUsed(i) || rPoly.isPrevControlPointUsed(i + 1))
                 {
                     const B2DCubicBezier aBezierPlot(
-                        rPoly.getB2DPoint(i), rPoly.getNextControlPoint(i),
+                        rPoly.getB2DPoint(i), rPoly.getNextControlPoint(i), 
                         rPoly.getPrevControlPoint(i + 1), rPoly.getB2DPoint(i + 1));
-
+                    
                     plot(aBezierPlot);
                 }
                 else
@@ -176,19 +176,19 @@ namespace basegfx
 
             // decompose into four lines
             plot( B2DPoint(rRect.getMinX(),
-                           rRect.getMinY()),
+                           rRect.getMinY()), 
                   B2DPoint(rRect.getMaxX(),
                            rRect.getMinY()) );
             plot( B2DPoint(rRect.getMaxX(),
-                           rRect.getMinY()),
+                           rRect.getMinY()), 
                   B2DPoint(rRect.getMaxX(),
                            rRect.getMaxY()) );
             plot( B2DPoint(rRect.getMaxX(),
-                           rRect.getMaxY()),
+                           rRect.getMaxY()), 
                   B2DPoint(rRect.getMinX(),
                            rRect.getMaxY()) );
             plot( B2DPoint(rRect.getMinX(),
-                           rRect.getMaxY()),
+                           rRect.getMaxY()), 
                   B2DPoint(rRect.getMinX(),
                            rRect.getMinY()) );
         }
@@ -197,10 +197,10 @@ namespace basegfx
         {
             writeSeparator();
             mrOutputStream << "line(" << rStartPoint.getX()
-                           << "," << rEndPoint.getX()
+                           << "," << rEndPoint.getX() 
                            << ",t), "
                            << "line(" << rStartPoint.getY()
-                           << "," << rEndPoint.getY()
+                           << "," << rEndPoint.getY() 
                            << ",t)";
         }
 
@@ -208,13 +208,13 @@ namespace basegfx
         {
             writeSeparator();
             mrOutputStream << "cubicBezier(" << rCurve.getStartPoint().getX()
-                           << "," << rCurve.getControlPointA().getX()
-                           << "," << rCurve.getControlPointB().getX()
+                           << "," << rCurve.getControlPointA().getX() 
+                           << "," << rCurve.getControlPointB().getX() 
                            << "," << rCurve.getEndPoint().getX()
                            << ",t), "
                            << "cubicBezier(" << rCurve.getStartPoint().getY()
-                           << "," << rCurve.getControlPointA().getY()
-                           << "," << rCurve.getControlPointB().getY()
+                           << "," << rCurve.getControlPointA().getY() 
+                           << "," << rCurve.getControlPointB().getY() 
                            << "," << rCurve.getEndPoint().getY()
                            << ",t)";
         }
diff --git a/basegfx/test/testtools.hxx b/basegfx/test/testtools.hxx
index 1837f9f31a89..a4dafd4c34b5 100644
--- a/basegfx/test/testtools.hxx
+++ b/basegfx/test/testtools.hxx
@@ -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
@@ -88,9 +88,9 @@ namespace basegfx
         private:
             void writeSeparator();
 
-            ::std::ostream&             mrOutputStream;
-            ::std::vector< B2DPoint >   maPoints;
-            bool                        mbFirstElement;
+            ::std::ostream& 			mrOutputStream;
+            ::std::vector< B2DPoint > 	maPoints;
+            bool						mbFirstElement;
         };
     }
 }
diff --git a/canvas/inc/canvas/base/basemutexhelper.hxx b/canvas/inc/canvas/base/basemutexhelper.hxx
index 787c200e0b0c..07f5aaa80128 100644
--- a/canvas/inc/canvas/base/basemutexhelper.hxx
+++ b/canvas/inc/canvas/base/basemutexhelper.hxx
@@ -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
@@ -62,7 +62,7 @@ namespace canvas
         }
 
 protected:
-        mutable ::osl::Mutex m_aMutex;
+        mutable ::osl::Mutex m_aMutex; 
     };
 }
 
diff --git a/canvas/inc/canvas/base/bitmapcanvasbase.hxx b/canvas/inc/canvas/base/bitmapcanvasbase.hxx
index 0cbf90836bfb..daa3b2486ae1 100644
--- a/canvas/inc/canvas/base/bitmapcanvasbase.hxx
+++ b/canvas/inc/canvas/base/bitmapcanvasbase.hxx
@@ -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
@@ -66,42 +66,42 @@ namespace canvas
         @see CanvasBase for further contractual requirements towards
         the CanvasHelper type, and some examples.
      */
-    template< class Base,
-              class CanvasHelper,
-              class Mutex=::osl::MutexGuard,
-              class UnambiguousBase=::com::sun::star::uno::XInterface > class BitmapCanvasBase :
+    template< class Base, 
+              class CanvasHelper, 
+              class Mutex=::osl::MutexGuard, 
+              class UnambiguousBase=::com::sun::star::uno::XInterface > class BitmapCanvasBase : 
         public CanvasBase< Base, CanvasHelper, Mutex, UnambiguousBase >
     {
     public:
-        typedef CanvasBase< Base, CanvasHelper, Mutex, UnambiguousBase >    BaseType;
+        typedef CanvasBase< Base, CanvasHelper, Mutex, UnambiguousBase >	BaseType;
 
         // XBitmapCanvas
-        virtual void SAL_CALL copyRect( const ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XBitmapCanvas >&   sourceCanvas,
-                                        const ::com::sun::star::geometry::RealRectangle2D&                                      sourceRect,
-                                        const ::com::sun::star::rendering::ViewState&                                           sourceViewState,
-                                        const ::com::sun::star::rendering::RenderState&                                         sourceRenderState,
-                                        const ::com::sun::star::geometry::RealRectangle2D&                                      destRect,
-                                        const ::com::sun::star::rendering::ViewState&                                           destViewState,
-                                        const ::com::sun::star::rendering::RenderState&                                         destRenderState ) throw (::com::sun::star::lang::IllegalArgumentException,
+        virtual void SAL_CALL copyRect( const ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XBitmapCanvas >& 	sourceCanvas, 
+                                        const ::com::sun::star::geometry::RealRectangle2D& 										sourceRect, 
+                                        const ::com::sun::star::rendering::ViewState& 											sourceViewState, 
+                                        const ::com::sun::star::rendering::RenderState& 										sourceRenderState, 
+                                        const ::com::sun::star::geometry::RealRectangle2D& 										destRect, 
+                                        const ::com::sun::star::rendering::ViewState& 											destViewState, 
+                                        const ::com::sun::star::rendering::RenderState& 										destRenderState ) throw (::com::sun::star::lang::IllegalArgumentException, 
                                                                                                                                                          ::com::sun::star::uno::RuntimeException)
         {
-            tools::verifyArgs(sourceCanvas, sourceRect, sourceViewState, sourceRenderState,
-                              destRect, destViewState, destRenderState,
+            tools::verifyArgs(sourceCanvas, sourceRect, sourceViewState, sourceRenderState, 
+                              destRect, destViewState, destRenderState, 
                               BOOST_CURRENT_FUNCTION,
                               static_cast< typename BaseType::UnambiguousBaseType* >(this));
 
             typename BaseType::MutexType aGuard( BaseType::m_aMutex );
-
+            
             BaseType::mbSurfaceDirty = true;
             BaseType::maCanvasHelper.modifying();
 
-            BaseType::maCanvasHelper.copyRect( this,
-                                               sourceCanvas,
-                                               sourceRect,
-                                               sourceViewState,
-                                               sourceRenderState,
-                                               destRect,
-                                               destViewState,
+            BaseType::maCanvasHelper.copyRect( this, 
+                                               sourceCanvas, 
+                                               sourceRect, 
+                                               sourceViewState, 
+                                               sourceRenderState, 
+                                               destRect, 
+                                               destViewState, 
                                                destRenderState );
         }
 
@@ -110,7 +110,7 @@ namespace canvas
         {
             typename BaseType::MutexType aGuard( BaseType::m_aMutex );
 
-            return BaseType::maCanvasHelper.getSize();
+            return BaseType::maCanvasHelper.getSize();            
         }
 
         virtual ::sal_Bool SAL_CALL hasAlpha(  ) throw (::com::sun::star::uno::RuntimeException)
@@ -120,8 +120,8 @@ namespace canvas
             return BaseType::maCanvasHelper.hasAlpha();
         }
 
-        virtual ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XBitmap > SAL_CALL getScaledBitmap( const ::com::sun::star::geometry::RealSize2D& newSize,
-                                                                                                                   sal_Bool                                      beFast ) throw (::com::sun::star::uno::RuntimeException)
+        virtual ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XBitmap > SAL_CALL getScaledBitmap( const ::com::sun::star::geometry::RealSize2D& newSize, 
+                                                                                                                   sal_Bool 									 beFast ) throw (::com::sun::star::uno::RuntimeException)
         {
             typename BaseType::MutexType aGuard( BaseType::m_aMutex );
 
diff --git a/canvas/inc/canvas/base/bufferedgraphicdevicebase.hxx b/canvas/inc/canvas/base/bufferedgraphicdevicebase.hxx
index eed9c46a6442..d383dbde6edd 100644
--- a/canvas/inc/canvas/base/bufferedgraphicdevicebase.hxx
+++ b/canvas/inc/canvas/base/bufferedgraphicdevicebase.hxx
@@ -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
@@ -52,7 +52,7 @@ namespace canvas
 {
     /** Helper template base class for XGraphicDevice implementations
         on windows.
-
+        
         Use this base class if your target device is a
         window. Additionally to GraphicDeviceBase, this template
         provides an implementation of the awt::XWindowListener
@@ -88,14 +88,14 @@ namespace canvas
         derives from multiple UNO interface (were each provides its
         own version of XInterface, making the conversion ambiguous)
      */
-    template< class Base,
-              class DeviceHelper,
-              class Mutex=::osl::MutexGuard,
-              class UnambiguousBase=::com::sun::star::uno::XInterface > class BufferedGraphicDeviceBase :
+    template< class Base, 
+              class DeviceHelper, 
+              class Mutex=::osl::MutexGuard, 
+              class UnambiguousBase=::com::sun::star::uno::XInterface > class BufferedGraphicDeviceBase : 
         public GraphicDeviceBase< Base, DeviceHelper, Mutex, UnambiguousBase >
     {
     public:
-        typedef GraphicDeviceBase< Base, DeviceHelper, Mutex, UnambiguousBase > BaseType;
+        typedef GraphicDeviceBase< Base, DeviceHelper, Mutex, UnambiguousBase >	BaseType;
         typedef BufferedGraphicDeviceBase OurType;
         typedef Mutex MutexType;
 
@@ -118,7 +118,7 @@ namespace canvas
         }
 
         // XBufferController
-        virtual ::sal_Int32 SAL_CALL createBuffers( ::sal_Int32 nBuffers ) throw (::com::sun::star::lang::IllegalArgumentException,
+        virtual ::sal_Int32 SAL_CALL createBuffers( ::sal_Int32 nBuffers ) throw (::com::sun::star::lang::IllegalArgumentException, 
                                                                                   ::com::sun::star::uno::RuntimeException)
         {
             tools::verifyRange( nBuffers, (sal_Int32)1 );
@@ -161,7 +161,7 @@ namespace canvas
             is called, with rBounds the window bound rect relative to
             the frame window.
          */
-        void setWindow( const ::com::sun::star::uno::Reference<
+        void setWindow( const ::com::sun::star::uno::Reference< 
                               ::com::sun::star::awt::XWindow2 >& rWindow )
         {
             if( mxWindow.is() )
@@ -172,7 +172,7 @@ namespace canvas
             if( mxWindow.is() )
             {
                 mbIsVisible = mxWindow->isVisible();
-                mbIsTopLevel =
+                mbIsTopLevel = 
                     ::com::sun::star::uno::Reference< ::com::sun::star::awt::XTopWindow >(
                         mxWindow,
                         ::com::sun::star::uno::UNO_QUERY ).is();
@@ -186,7 +186,7 @@ namespace canvas
         {
             return mxWindow;
         }
-
+        
         ::com::sun::star::uno::Any getXWindow() const
         {
             return ::com::sun::star::uno::makeAny(mxWindow);
@@ -210,7 +210,7 @@ namespace canvas
         }
 
         ::com::sun::star::awt::Rectangle transformBounds( const ::com::sun::star::awt::Rectangle& rBounds )
-        {
+        {        
             // notifySizeUpdate's bounds are relative to the toplevel
             // window
             if( !mbIsTopLevel )
diff --git a/canvas/inc/canvas/base/cachedprimitivebase.hxx b/canvas/inc/canvas/base/cachedprimitivebase.hxx
index bfcd292615b9..cd306f9c983f 100644
--- a/canvas/inc/canvas/base/cachedprimitivebase.hxx
+++ b/canvas/inc/canvas/base/cachedprimitivebase.hxx
@@ -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
@@ -60,17 +60,17 @@ namespace canvas
             @param rTarget
             The target canvas the repaint should happen on.
 
-            @param bFailForChangedViewTransform
+            @param bFailForChangedViewTransform 
             When true, derived classes will never receive doRedraw()
             calls with dissimilar view transformations and
             bSameViewTransform set to false. This is useful for cached
             objects where re-transforming the generated output is not
             desirable, e.g. for hinted font output.
          */
-        CachedPrimitiveBase( const ::com::sun::star::rendering::ViewState&  rUsedViewState,
-                             const ::com::sun::star::uno::Reference<
+        CachedPrimitiveBase( const ::com::sun::star::rendering::ViewState&	rUsedViewState,
+                             const ::com::sun::star::uno::Reference< 
                                     ::com::sun::star::rendering::XCanvas >& rTarget,
-                             bool                                           bFailForChangedViewTransform );
+                             bool											bFailForChangedViewTransform );
 
         /// Dispose all internal references
         virtual void SAL_CALL disposing();
@@ -107,15 +107,15 @@ namespace canvas
             @param bSameViewTransform
             When true, rNewState and rOldState have the same transformation.
          */
-        virtual ::sal_Int8 doRedraw( const ::com::sun::star::rendering::ViewState&  rNewState,
-                                     const ::com::sun::star::rendering::ViewState&  rOldState,
-                                     const ::com::sun::star::uno::Reference<
-                                         ::com::sun::star::rendering::XCanvas >&    rTargetCanvas,
-                                     bool                                           bSameViewTransform ) = 0;
-
-        ::com::sun::star::rendering::ViewState                                      maUsedViewState;
-        ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XCanvas >    mxTarget;
-        const bool                                                                  mbFailForChangedViewTransform;
+        virtual ::sal_Int8 doRedraw( const ::com::sun::star::rendering::ViewState&	rNewState,
+                                     const ::com::sun::star::rendering::ViewState&	rOldState,
+                                     const ::com::sun::star::uno::Reference< 
+                                         ::com::sun::star::rendering::XCanvas >& 	rTargetCanvas,
+                                     bool											bSameViewTransform ) = 0;
+
+        ::com::sun::star::rendering::ViewState										maUsedViewState;
+        ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XCanvas >	mxTarget;
+        const bool																	mbFailForChangedViewTransform;
     };
 }
 
diff --git a/canvas/inc/canvas/base/canvasbase.hxx b/canvas/inc/canvas/base/canvasbase.hxx
index 1d15910564b9..51ead9cab681 100644
--- a/canvas/inc/canvas/base/canvasbase.hxx
+++ b/canvas/inc/canvas/base/canvasbase.hxx
@@ -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
@@ -99,17 +99,17 @@ namespace canvas
         derives from multiple UNO interface (were each provides its
         own version of XInterface, making the conversion ambiguous)
      */
-    template< class Base,
-              class CanvasHelper,
-              class Mutex=::osl::MutexGuard,
-              class UnambiguousBase=::com::sun::star::uno::XInterface > class CanvasBase :
+    template< class Base, 
+              class CanvasHelper, 
+              class Mutex=::osl::MutexGuard, 
+              class UnambiguousBase=::com::sun::star::uno::XInterface > class CanvasBase : 
             public Base
     {
     public:
-        typedef Base            BaseType;
-        typedef CanvasHelper    HelperType;
-        typedef Mutex           MutexType;
-        typedef UnambiguousBase UnambiguousBaseType;
+        typedef Base 			BaseType;
+        typedef CanvasHelper	HelperType;
+        typedef Mutex			MutexType;
+        typedef UnambiguousBase	UnambiguousBaseType;
 
         /** Create CanvasBase
          */
@@ -143,12 +143,12 @@ namespace canvas
             maCanvasHelper.clear();
         }
 
-        virtual void SAL_CALL drawPoint( const ::com::sun::star::geometry::RealPoint2D&     aPoint,
-                                         const ::com::sun::star::rendering::ViewState&      viewState,
-                                         const ::com::sun::star::rendering::RenderState&    renderState ) throw (::com::sun::star::lang::IllegalArgumentException,
+        virtual void SAL_CALL drawPoint( const ::com::sun::star::geometry::RealPoint2D& 	aPoint,
+                                         const ::com::sun::star::rendering::ViewState& 		viewState,
+                                         const ::com::sun::star::rendering::RenderState& 	renderState ) throw (::com::sun::star::lang::IllegalArgumentException, 
                                                                                                                  ::com::sun::star::uno::RuntimeException)
         {
-            tools::verifyArgs(aPoint, viewState, renderState,
+            tools::verifyArgs(aPoint, viewState, renderState, 
                               BOOST_CURRENT_FUNCTION,
                               static_cast< UnambiguousBaseType* >(this));
 
@@ -160,13 +160,13 @@ namespace canvas
             maCanvasHelper.drawPoint( this, aPoint, viewState, renderState );
         }
 
-        virtual void SAL_CALL drawLine( const ::com::sun::star::geometry::RealPoint2D&  aStartPoint,
-                                        const ::com::sun::star::geometry::RealPoint2D&  aEndPoint,
-                                        const ::com::sun::star::rendering::ViewState&   viewState,
-                                        const ::com::sun::star::rendering::RenderState& renderState ) throw (::com::sun::star::lang::IllegalArgumentException,
+        virtual void SAL_CALL drawLine( const ::com::sun::star::geometry::RealPoint2D& 	aStartPoint,
+                                        const ::com::sun::star::geometry::RealPoint2D& 	aEndPoint,
+                                        const ::com::sun::star::rendering::ViewState& 	viewState,
+                                        const ::com::sun::star::rendering::RenderState& renderState	) throw (::com::sun::star::lang::IllegalArgumentException, 
                                                                                                              ::com::sun::star::uno::RuntimeException)
         {
-            tools::verifyArgs(aStartPoint, aEndPoint, viewState, renderState,
+            tools::verifyArgs(aStartPoint, aEndPoint, viewState, renderState, 
                               BOOST_CURRENT_FUNCTION,
                               static_cast< UnambiguousBaseType* >(this));
 
@@ -178,13 +178,13 @@ namespace canvas
             maCanvasHelper.drawLine( this, aStartPoint, aEndPoint, viewState, renderState );
         }
 
-        virtual void SAL_CALL drawBezier( const ::com::sun::star::geometry::RealBezierSegment2D&    aBezierSegment,
-                                          const ::com::sun::star::geometry::RealPoint2D&            aEndPoint,
-                                          const ::com::sun::star::rendering::ViewState&             viewState,
-                                          const ::com::sun::star::rendering::RenderState&           renderState ) throw (::com::sun::star::lang::IllegalArgumentException,
+        virtual void SAL_CALL drawBezier( const ::com::sun::star::geometry::RealBezierSegment2D& 	aBezierSegment,
+                                          const ::com::sun::star::geometry::RealPoint2D& 			aEndPoint,
+                                          const ::com::sun::star::rendering::ViewState& 			viewState,
+                                          const ::com::sun::star::rendering::RenderState& 			renderState ) throw (::com::sun::star::lang::IllegalArgumentException, 
                                                                                                                          ::com::sun::star::uno::RuntimeException)
         {
-            tools::verifyArgs(aBezierSegment, aEndPoint, viewState, renderState,
+            tools::verifyArgs(aBezierSegment, aEndPoint, viewState, renderState, 
                               BOOST_CURRENT_FUNCTION,
                               static_cast< UnambiguousBaseType* >(this));
 
@@ -198,11 +198,11 @@ namespace canvas
 
         virtual ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XCachedPrimitive > SAL_CALL
             drawPolyPolygon( const ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XPolyPolygon2D >& xPolyPolygon,
-                             const ::com::sun::star::rendering::ViewState&                                          viewState,
-                             const ::com::sun::star::rendering::RenderState&                                        renderState ) throw (::com::sun::star::lang::IllegalArgumentException,
+                             const ::com::sun::star::rendering::ViewState& 											viewState,
+                             const ::com::sun::star::rendering::RenderState& 										renderState ) throw (::com::sun::star::lang::IllegalArgumentException, 
                                                                                                                                          ::com::sun::star::uno::RuntimeException)
         {
-            tools::verifyArgs(xPolyPolygon, viewState, renderState,
+            tools::verifyArgs(xPolyPolygon, viewState, renderState, 
                               BOOST_CURRENT_FUNCTION,
                               static_cast< UnambiguousBaseType* >(this));
 
@@ -215,13 +215,13 @@ namespace canvas
         }
 
         virtual ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XCachedPrimitive > SAL_CALL
-            strokePolyPolygon( const ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XPolyPolygon2D >&   xPolyPolygon,
-                               const ::com::sun::star::rendering::ViewState&                                            viewState,
-                               const ::com::sun::star::rendering::RenderState&                                          renderState,
-                               const ::com::sun::star::rendering::StrokeAttributes&                                     strokeAttributes ) throw (::com::sun::star::lang::IllegalArgumentException,
+            strokePolyPolygon( const ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XPolyPolygon2D >& 	xPolyPolygon,
+                               const ::com::sun::star::rendering::ViewState& 											viewState,
+                               const ::com::sun::star::rendering::RenderState& 											renderState,
+                               const ::com::sun::star::rendering::StrokeAttributes& 									strokeAttributes ) throw (::com::sun::star::lang::IllegalArgumentException, 
                                                                                                                                                   ::com::sun::star::uno::RuntimeException)
         {
-            tools::verifyArgs(xPolyPolygon, viewState, renderState, strokeAttributes,
+            tools::verifyArgs(xPolyPolygon, viewState, renderState, strokeAttributes, 
                               BOOST_CURRENT_FUNCTION,
                               static_cast< UnambiguousBaseType* >(this));
 
@@ -234,14 +234,14 @@ namespace canvas
         }
 
         virtual ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XCachedPrimitive > SAL_CALL
-            strokeTexturedPolyPolygon( const ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XPolyPolygon2D >&   xPolyPolygon,
-                                       const ::com::sun::star::rendering::ViewState&                                            viewState,
-                                       const ::com::sun::star::rendering::RenderState&                                          renderState,
-                                       const ::com::sun::star::uno::Sequence< ::com::sun::star::rendering::Texture >&           textures,
-                                       const ::com::sun::star::rendering::StrokeAttributes&                                     strokeAttributes ) throw (::com::sun::star::lang::IllegalArgumentException,
+            strokeTexturedPolyPolygon( const ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XPolyPolygon2D >& 	xPolyPolygon,
+                                       const ::com::sun::star::rendering::ViewState& 											viewState,
+                                       const ::com::sun::star::rendering::RenderState& 											renderState,
+                                       const ::com::sun::star::uno::Sequence< ::com::sun::star::rendering::Texture >& 			textures,
+                                       const ::com::sun::star::rendering::StrokeAttributes& 									strokeAttributes ) throw (::com::sun::star::lang::IllegalArgumentException, 
                                                                                                                                                           ::com::sun::star::uno::RuntimeException)
         {
-            tools::verifyArgs(xPolyPolygon, viewState, renderState, strokeAttributes,
+            tools::verifyArgs(xPolyPolygon, viewState, renderState, strokeAttributes, 
                               BOOST_CURRENT_FUNCTION,
                               static_cast< UnambiguousBaseType* >(this));
 
@@ -254,15 +254,15 @@ namespace canvas
         }
 
         virtual ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XCachedPrimitive > SAL_CALL
-            strokeTextureMappedPolyPolygon( const ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XPolyPolygon2D >&  xPolyPolygon,
-                                            const ::com::sun::star::rendering::ViewState&                                           viewState,
-                                            const ::com::sun::star::rendering::RenderState&                                         renderState,
-                                            const ::com::sun::star::uno::Sequence< ::com::sun::star::rendering::Texture >&          textures,
-                                            const ::com::sun::star::uno::Reference< ::com::sun::star::geometry::XMapping2D >&       xMapping,
-                                            const ::com::sun::star::rendering::StrokeAttributes&                                    strokeAttributes ) throw (::com::sun::star::lang::IllegalArgumentException,
+            strokeTextureMappedPolyPolygon( const ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XPolyPolygon2D >& 	xPolyPolygon,
+                                            const ::com::sun::star::rendering::ViewState& 											viewState,
+                                            const ::com::sun::star::rendering::RenderState& 										renderState,
+                                            const ::com::sun::star::uno::Sequence< ::com::sun::star::rendering::Texture >& 			textures,
+                                            const ::com::sun::star::uno::Reference< ::com::sun::star::geometry::XMapping2D >& 		xMapping,
+                                            const ::com::sun::star::rendering::StrokeAttributes& 									strokeAttributes ) throw (::com::sun::star::lang::IllegalArgumentException, 
                                                                                                                                                               ::com::sun::star::uno::RuntimeException)
         {
-            tools::verifyArgs(xPolyPolygon, viewState, renderState, textures, xMapping, strokeAttributes,
+            tools::verifyArgs(xPolyPolygon, viewState, renderState, textures, xMapping, strokeAttributes, 
                               BOOST_CURRENT_FUNCTION,
                               static_cast< UnambiguousBaseType* >(this));
 
@@ -275,13 +275,13 @@ namespace canvas
         }
 
         virtual ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XPolyPolygon2D >   SAL_CALL
-            queryStrokeShapes( const ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XPolyPolygon2D >&   xPolyPolygon,
-                               const ::com::sun::star::rendering::ViewState&                                            viewState,
-                               const ::com::sun::star::rendering::RenderState&                                          renderState,
-                               const ::com::sun::star::rendering::StrokeAttributes&                                     strokeAttributes ) throw (::com::sun::star::lang::IllegalArgumentException,
+            queryStrokeShapes( const ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XPolyPolygon2D >& 	xPolyPolygon,
+                               const ::com::sun::star::rendering::ViewState& 											viewState,
+                               const ::com::sun::star::rendering::RenderState& 											renderState,
+                               const ::com::sun::star::rendering::StrokeAttributes& 									strokeAttributes ) throw (::com::sun::star::lang::IllegalArgumentException, 
                                                                                                                                                   ::com::sun::star::uno::RuntimeException)
         {
-            tools::verifyArgs(xPolyPolygon, viewState, renderState, strokeAttributes,
+            tools::verifyArgs(xPolyPolygon, viewState, renderState, strokeAttributes, 
                               BOOST_CURRENT_FUNCTION,
                               static_cast< UnambiguousBaseType* >(this));
 
@@ -295,11 +295,11 @@ namespace canvas
 
         virtual ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XCachedPrimitive > SAL_CALL
             fillPolyPolygon( const ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XPolyPolygon2D >& xPolyPolygon,
-                             const ::com::sun::star::rendering::ViewState&                                          viewState,
-                             const ::com::sun::star::rendering::RenderState&                                        renderState ) throw (::com::sun::star::lang::IllegalArgumentException,
+                             const ::com::sun::star::rendering::ViewState& 											viewState,
+                             const ::com::sun::star::rendering::RenderState& 										renderState ) throw (::com::sun::star::lang::IllegalArgumentException, 
                                                                                                                                          ::com::sun::star::uno::RuntimeException)
         {
-            tools::verifyArgs(xPolyPolygon, viewState, renderState,
+            tools::verifyArgs(xPolyPolygon, viewState, renderState, 
                               BOOST_CURRENT_FUNCTION,
                               static_cast< UnambiguousBaseType* >(this));
 
@@ -313,12 +313,12 @@ namespace canvas
 
         virtual ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XCachedPrimitive > SAL_CALL
             fillTexturedPolyPolygon( const ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XPolyPolygon2D >& xPolyPolygon,
-                                     const ::com::sun::star::rendering::ViewState&                                          viewState,
-                                     const ::com::sun::star::rendering::RenderState&                                        renderState,
-                                     const ::com::sun::star::uno::Sequence< ::com::sun::star::rendering::Texture >&         textures ) throw (::com::sun::star::lang::IllegalArgumentException,
+                                     const ::com::sun::star::rendering::ViewState& 											viewState,
+                                     const ::com::sun::star::rendering::RenderState& 										renderState,
+                                     const ::com::sun::star::uno::Sequence< ::com::sun::star::rendering::Texture >& 		textures ) throw (::com::sun::star::lang::IllegalArgumentException, 
                                                                                                                                               ::com::sun::star::uno::RuntimeException)
         {
-            tools::verifyArgs(xPolyPolygon, viewState, renderState, textures,
+            tools::verifyArgs(xPolyPolygon, viewState, renderState, textures, 
                               BOOST_CURRENT_FUNCTION,
                               static_cast< UnambiguousBaseType* >(this));
 
@@ -331,13 +331,13 @@ namespace canvas
         }
 
         virtual ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XCachedPrimitive > SAL_CALL
-            fillTextureMappedPolyPolygon( const ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XPolyPolygon2D >&    xPolyPolygon,
-                                          const ::com::sun::star::rendering::ViewState&                                             viewState,
-                                          const ::com::sun::star::rendering::RenderState&                                           renderState,
-                                          const ::com::sun::star::uno::Sequence< ::com::sun::star::rendering::Texture >&            textures,
-                                          const ::com::sun::star::uno::Reference< ::com::sun::star::geometry::XMapping2D >&         xMapping ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException)
+            fillTextureMappedPolyPolygon( const ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XPolyPolygon2D >& 	xPolyPolygon,
+                                          const ::com::sun::star::rendering::ViewState& 											viewState,
+                                          const ::com::sun::star::rendering::RenderState& 											renderState,
+                                          const ::com::sun::star::uno::Sequence< ::com::sun::star::rendering::Texture >& 			textures,
+                                          const ::com::sun::star::uno::Reference< ::com::sun::star::geometry::XMapping2D >& 		xMapping ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException)
         {
-            tools::verifyArgs(xPolyPolygon, viewState, renderState, textures, xMapping,
+            tools::verifyArgs(xPolyPolygon, viewState, renderState, textures, xMapping, 
                               BOOST_CURRENT_FUNCTION,
                               static_cast< UnambiguousBaseType* >(this));
 
@@ -351,15 +351,15 @@ namespace canvas
 
 
         virtual ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XCanvasFont > SAL_CALL
-            createFont( const ::com::sun::star::rendering::FontRequest&                                     fontRequest,
-                        const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >&    extraFontProperties,
-                        const ::com::sun::star::geometry::Matrix2D&                                         fontMatrix ) throw (::com::sun::star::lang::IllegalArgumentException,
+            createFont( const ::com::sun::star::rendering::FontRequest& 									fontRequest,
+                        const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& 	extraFontProperties,
+                        const ::com::sun::star::geometry::Matrix2D& 										fontMatrix ) throw (::com::sun::star::lang::IllegalArgumentException, 
                                                                                                                                 ::com::sun::star::uno::RuntimeException)
         {
-            tools::verifyArgs(fontRequest,
+            tools::verifyArgs(fontRequest, 
                               // dummy, to keep argPos in sync
-                              fontRequest,
-                              fontMatrix,
+                              fontRequest, 
+                              fontMatrix, 
                               BOOST_CURRENT_FUNCTION,
                               static_cast< UnambiguousBaseType* >(this));
 
@@ -370,11 +370,11 @@ namespace canvas
 
 
         virtual ::com::sun::star::uno::Sequence< ::com::sun::star::rendering::FontInfo > SAL_CALL
-            queryAvailableFonts( const ::com::sun::star::rendering::FontInfo&                                       aFilter,
-                                 const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >&   aFontProperties ) throw (::com::sun::star::lang::IllegalArgumentException,
+            queryAvailableFonts( const ::com::sun::star::rendering::FontInfo& 										aFilter,
+                                 const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& 	aFontProperties ) throw (::com::sun::star::lang::IllegalArgumentException, 
                                                                                                                                              ::com::sun::star::uno::RuntimeException)
         {
-            tools::verifyArgs(aFilter,
+            tools::verifyArgs(aFilter, 
                               BOOST_CURRENT_FUNCTION,
                               static_cast< UnambiguousBaseType* >(this));
 
@@ -385,17 +385,17 @@ namespace canvas
 
 
         virtual ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XCachedPrimitive > SAL_CALL
-            drawText( const ::com::sun::star::rendering::StringContext&                                     text,
-                      const ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XCanvasFont >&   xFont,
-                      const ::com::sun::star::rendering::ViewState&                                         viewState,
-                      const ::com::sun::star::rendering::RenderState&                                       renderState,
-                      sal_Int8                                                                              textDirection ) throw (::com::sun::star::lang::IllegalArgumentException,
+            drawText( const ::com::sun::star::rendering::StringContext& 									text,
+                      const ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XCanvasFont >& 	xFont,
+                      const ::com::sun::star::rendering::ViewState& 										viewState,
+                      const ::com::sun::star::rendering::RenderState& 										renderState,
+                      sal_Int8 																				textDirection ) throw (::com::sun::star::lang::IllegalArgumentException, 
                                                                                                                                    ::com::sun::star::uno::RuntimeException)
         {
-            tools::verifyArgs(xFont, viewState, renderState,
+            tools::verifyArgs(xFont, viewState, renderState, 
                               BOOST_CURRENT_FUNCTION,
                               static_cast< UnambiguousBaseType* >(this));
-            tools::verifyRange( textDirection,
+            tools::verifyRange( textDirection, 
                                 ::com::sun::star::rendering::TextDirection::WEAK_LEFT_TO_RIGHT,
                                 ::com::sun::star::rendering::TextDirection::STRONG_RIGHT_TO_LEFT );
 
@@ -410,10 +410,10 @@ namespace canvas
 
         virtual ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XCachedPrimitive > SAL_CALL
             drawTextLayout( const ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XTextLayout >& layoutetText,
-                            const ::com::sun::star::rendering::ViewState&                                       viewState,
-                            const ::com::sun::star::rendering::RenderState&                                     renderState ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException)
+                            const ::com::sun::star::rendering::ViewState& 										viewState,
+                            const ::com::sun::star::rendering::RenderState& 									renderState ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException)
         {
-            tools::verifyArgs(layoutetText, viewState, renderState,
+            tools::verifyArgs(layoutetText, viewState, renderState, 
                               BOOST_CURRENT_FUNCTION,
                               static_cast< UnambiguousBaseType* >(this));
 
@@ -428,10 +428,10 @@ namespace canvas
 
         virtual ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XCachedPrimitive > SAL_CALL
             drawBitmap( const ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XBitmap >& xBitmap,
-                        const ::com::sun::star::rendering::ViewState&                                   viewState,
-                        const ::com::sun::star::rendering::RenderState&                                 renderState ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException)
+                        const ::com::sun::star::rendering::ViewState& 									viewState,
+                        const ::com::sun::star::rendering::RenderState& 								renderState ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException)
         {
-            tools::verifyArgs(xBitmap, viewState, renderState,
+            tools::verifyArgs(xBitmap, viewState, renderState, 
                               BOOST_CURRENT_FUNCTION,
                               static_cast< UnambiguousBaseType* >(this));
 
@@ -444,11 +444,11 @@ namespace canvas
         }
 
         virtual ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XCachedPrimitive > SAL_CALL
-            drawBitmapModulated( const ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XBitmap >&    xBitmap,
-                                 const ::com::sun::star::rendering::ViewState&                                      viewState,
-                                 const ::com::sun::star::rendering::RenderState&                                    renderState ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException)
+            drawBitmapModulated( const ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XBitmap >& 	xBitmap,
+                                 const ::com::sun::star::rendering::ViewState& 										viewState,
+                                 const ::com::sun::star::rendering::RenderState& 									renderState ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException)
         {
-            tools::verifyArgs(xBitmap, viewState, renderState,
+            tools::verifyArgs(xBitmap, viewState, renderState, 
                               BOOST_CURRENT_FUNCTION,
                               static_cast< UnambiguousBaseType* >(this));
 
@@ -471,8 +471,8 @@ namespace canvas
     protected:
         ~CanvasBase() {} // we're a ref-counted UNO class. _We_ destroy ourselves.
 
-        HelperType          maCanvasHelper;
-        mutable bool        mbSurfaceDirty;
+        HelperType 			maCanvasHelper;
+        mutable bool		mbSurfaceDirty;
 
     private:
         CanvasBase( const CanvasBase& );
diff --git a/canvas/inc/canvas/base/canvascustomspritebase.hxx b/canvas/inc/canvas/base/canvascustomspritebase.hxx
index aaca84c110de..5d1231231d94 100644
--- a/canvas/inc/canvas/base/canvascustomspritebase.hxx
+++ b/canvas/inc/canvas/base/canvascustomspritebase.hxx
@@ -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
@@ -78,16 +78,16 @@ namespace canvas
         @see CanvasCustomSpriteHelper for further contractual
         requirements towards the SpriteHelper type, and some examples.
      */
-    template< class Base,
-              class SpriteHelper,
-              class CanvasHelper,
-              class Mutex=::osl::MutexGuard,
-              class UnambiguousBase=::com::sun::star::uno::XInterface > class CanvasCustomSpriteBase :
+    template< class Base, 
+              class SpriteHelper, 
+              class CanvasHelper, 
+              class Mutex=::osl::MutexGuard, 
+              class UnambiguousBase=::com::sun::star::uno::XInterface > class CanvasCustomSpriteBase : 
         public IntegerBitmapBase< Base, CanvasHelper, Mutex, UnambiguousBase >
     {
     public:
-        typedef IntegerBitmapBase< Base, CanvasHelper, Mutex, UnambiguousBase > BaseType;
-        typedef SpriteHelper                                                    SpriteHelperType;
+        typedef IntegerBitmapBase< Base, CanvasHelper, Mutex, UnambiguousBase >	BaseType;
+        typedef SpriteHelper													SpriteHelperType;
 
         CanvasCustomSpriteBase() :
             maSpriteHelper()
@@ -123,16 +123,16 @@ namespace canvas
             return BaseType::clear();
         }
 
-        virtual ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XCachedPrimitive > SAL_CALL
-            drawBitmap( const ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XBitmap >& xBitmap,
-                        const ::com::sun::star::rendering::ViewState&                                   viewState,
-                        const ::com::sun::star::rendering::RenderState&                                 renderState ) throw (::com::sun::star::lang::IllegalArgumentException,
+        virtual ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XCachedPrimitive > SAL_CALL 	
+            drawBitmap( const ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XBitmap >& xBitmap, 
+                        const ::com::sun::star::rendering::ViewState& 									viewState, 
+                        const ::com::sun::star::rendering::RenderState& 								renderState ) throw (::com::sun::star::lang::IllegalArgumentException, 
                                                                                                                              ::com::sun::star::uno::RuntimeException)
         {
-            tools::verifyArgs(xBitmap, viewState, renderState,
+            tools::verifyArgs(xBitmap, viewState, renderState, 
                               BOOST_CURRENT_FUNCTION,
                               static_cast< typename BaseType::UnambiguousBaseType* >(this));
-
+        
             typename BaseType::MutexType aGuard( BaseType::m_aMutex );
 
             maSpriteHelper.checkDrawBitmap( this, xBitmap, viewState, renderState );
@@ -151,22 +151,22 @@ namespace canvas
         // functionality provided at the baseclass.
 
         // XSprite
-        virtual void SAL_CALL setAlpha( double alpha ) throw (::com::sun::star::lang::IllegalArgumentException,
+        virtual void SAL_CALL setAlpha( double alpha ) throw (::com::sun::star::lang::IllegalArgumentException, 
                                                               ::com::sun::star::uno::RuntimeException)
         {
             tools::verifyRange( alpha, 0.0, 1.0 );
-
+            
             typename BaseType::MutexType aGuard( BaseType::m_aMutex );
 
             maSpriteHelper.setAlpha( this, alpha );
         }
 
-        virtual void SAL_CALL move( const ::com::sun::star::geometry::RealPoint2D&  aNewPos,
-                                    const ::com::sun::star::rendering::ViewState&   viewState,
-                                    const ::com::sun::star::rendering::RenderState& renderState ) throw (::com::sun::star::lang::IllegalArgumentException,
+        virtual void SAL_CALL move( const ::com::sun::star::geometry::RealPoint2D& 	aNewPos, 
+                                    const ::com::sun::star::rendering::ViewState& 	viewState, 
+                                    const ::com::sun::star::rendering::RenderState& renderState ) throw (::com::sun::star::lang::IllegalArgumentException, 
                                                                                                          ::com::sun::star::uno::RuntimeException)
         {
-            tools::verifyArgs(aNewPos, viewState, renderState,
+            tools::verifyArgs(aNewPos, viewState, renderState, 
                               BOOST_CURRENT_FUNCTION,
                               static_cast< typename BaseType::UnambiguousBaseType* >(this));
 
@@ -175,10 +175,10 @@ namespace canvas
             maSpriteHelper.move( this, aNewPos, viewState, renderState );
         }
 
-        virtual void SAL_CALL transform( const ::com::sun::star::geometry::AffineMatrix2D& aTransformation ) throw (::com::sun::star::lang::IllegalArgumentException,
+        virtual void SAL_CALL transform( const ::com::sun::star::geometry::AffineMatrix2D& aTransformation ) throw (::com::sun::star::lang::IllegalArgumentException, 
                                                                                                                     ::com::sun::star::uno::RuntimeException)
         {
-            tools::verifyArgs(aTransformation,
+            tools::verifyArgs(aTransformation, 
                               BOOST_CURRENT_FUNCTION,
                               static_cast< typename BaseType::UnambiguousBaseType* >(this));
 
@@ -218,7 +218,7 @@ namespace canvas
         }
 
         // XCustomSprite
-        virtual ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XCanvas > SAL_CALL
+        virtual ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XCanvas > SAL_CALL 
             getContentCanvas() throw (::com::sun::star::uno::RuntimeException)
         {
             typename BaseType::MutexType aGuard( BaseType::m_aMutex );
diff --git a/canvas/inc/canvas/base/canvascustomspritehelper.hxx b/canvas/inc/canvas/base/canvascustomspritehelper.hxx
index 2dd034d4eb56..290cbaffc4ef 100644
--- a/canvas/inc/canvas/base/canvascustomspritehelper.hxx
+++ b/canvas/inc/canvas/base/canvascustomspritehelper.hxx
@@ -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
@@ -59,8 +59,8 @@ namespace canvas
             @param rOwningSpriteCanvas
             The XSpriteCanvas this sprite is displayed on
          */
-        void init( const ::com::sun::star::geometry::RealSize2D&    rSpriteSize,
-                   const SpriteSurface::Reference&                  rOwningSpriteCanvas );
+        void init( const ::com::sun::star::geometry::RealSize2D& 	rSpriteSize,
+                   const SpriteSurface::Reference&					rOwningSpriteCanvas );
 
         /** Object is being disposed, release all internal references
 
@@ -74,24 +74,24 @@ namespace canvas
         void clearingContent( const Sprite::Reference& rSprite );
 
         /// need to call this method for XCanvas::drawBitmap(), for opacity tracking
-        void checkDrawBitmap( const Sprite::Reference&                                                          rSprite,
-                              const ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XBitmap >&   xBitmap,
-                              const ::com::sun::star::rendering::ViewState&                                     viewState,
-                              const ::com::sun::star::rendering::RenderState&                                   renderState );
+        void checkDrawBitmap( const Sprite::Reference& 															rSprite,
+                              const ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XBitmap >&	xBitmap, 
+                              const ::com::sun::star::rendering::ViewState& 									viewState, 
+                              const ::com::sun::star::rendering::RenderState& 									renderState );
 
         // XSprite
         void setAlpha( const Sprite::Reference& rSprite,
-                       double                   alpha );
-        void move( const Sprite::Reference&                         rSprite,
-                   const ::com::sun::star::geometry::RealPoint2D&   aNewPos,
-                   const ::com::sun::star::rendering::ViewState&    viewState,
-                   const ::com::sun::star::rendering::RenderState&  renderState );
-        void transform( const Sprite::Reference&                            rSprite,
-                       const ::com::sun::star::geometry::AffineMatrix2D&    aTransformation );
-        void clip( const Sprite::Reference&                                                                 rSprite,
-                   const ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XPolyPolygon2D >&   aClip );
-        void setPriority( const Sprite::Reference&  rSprite,
-                          double                    nPriority );
+                       double 					alpha );
+        void move( const Sprite::Reference& 						rSprite,
+                   const ::com::sun::star::geometry::RealPoint2D& 	aNewPos, 
+                   const ::com::sun::star::rendering::ViewState& 	viewState, 
+                   const ::com::sun::star::rendering::RenderState& 	renderState );
+        void transform( const Sprite::Reference& 							rSprite,
+                       const ::com::sun::star::geometry::AffineMatrix2D&	aTransformation );
+        void clip( const Sprite::Reference& 																rSprite,
+                   const ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XPolyPolygon2D >&	aClip );
+        void setPriority( const Sprite::Reference&	rSprite,
+                          double 					nPriority );
         void show( const Sprite::Reference& rSprite );
         void hide( const Sprite::Reference& rSprite );
 
@@ -104,7 +104,7 @@ namespace canvas
 
         // redraw must be implemented by derived - non sensible default implementation
         // void redraw( const Sprite::Reference& rSprite,
-        //              const ::basegfx::B2DPoint& rPos ) const;
+        //				const ::basegfx::B2DPoint& rPos ) const;
 
 
         // Helper methods for derived classes
@@ -146,7 +146,7 @@ namespace canvas
         double getAlpha() const { return mfAlpha; }
 
         /// Retrieve current clip
-        const ::com::sun::star::uno::Reference<
+        const ::com::sun::star::uno::Reference< 
             ::com::sun::star::rendering::XPolyPolygon2D >& getClip() const { return mxClipPoly; }
 
         const ::basegfx::B2DHomMatrix& getTransformation() const { return maTransform; }
@@ -211,7 +211,7 @@ namespace canvas
 
             @derive Needs to be provided by backend-specific code
          */
-        virtual ::basegfx::B2DPolyPolygon polyPolygonFromXPolyPolygon2D(
+        virtual ::basegfx::B2DPolyPolygon polyPolygonFromXPolyPolygon2D( 
             ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XPolyPolygon2D >& xPoly ) const = 0;
 
         /** Update clip information from current state
@@ -230,7 +230,7 @@ namespace canvas
         // --------------------------------------------------------------------
 
         /// Owning sprite canvas
-        SpriteSurface::Reference                            mpSpriteCanvas;
+        SpriteSurface::Reference							mpSpriteCanvas;
 
         /** Currently active clip area.
 
@@ -238,20 +238,20 @@ namespace canvas
             clip shows the full sprite content, or contains a
             rectangular subarea of the sprite, outside of which
             the sprite content is fully clipped.
-
+            
             @see mbIsCurrClipRectangle
          */
-        ::basegfx::B2DRange                                 maCurrClipBounds;
+        ::basegfx::B2DRange									maCurrClipBounds;
 
         // sprite state
-        ::basegfx::B2DPoint                                 maPosition;
-        ::basegfx::B2DVector                                maSize;
-        ::basegfx::B2DHomMatrix                             maTransform;
-        ::com::sun::star::uno::Reference<
-              ::com::sun::star::rendering::XPolyPolygon2D > mxClipPoly;
+        ::basegfx::B2DPoint									maPosition;
+        ::basegfx::B2DVector								maSize;
+        ::basegfx::B2DHomMatrix								maTransform;
+        ::com::sun::star::uno::Reference< 
+              ::com::sun::star::rendering::XPolyPolygon2D >	mxClipPoly;
         double                                              mfPriority;
-        double                                              mfAlpha;
-        bool                                                mbActive; // true, if not hidden
+        double												mfAlpha;
+        bool												mbActive; // true, if not hidden
 
         /** If true, denotes that the current sprite clip is a true
             rectangle, i.e. maCurrClipBounds <em>exactly</em>
@@ -259,7 +259,7 @@ namespace canvas
 
             @see maCurrClipBounds
          */
-        bool                                                mbIsCurrClipRectangle;
+        bool												mbIsCurrClipRectangle;
 
         /** Redraw speedup.
 
@@ -268,7 +268,7 @@ namespace canvas
             neither have to take alpha into account, nor prepare any
             background for the sprite area.
          */
-        mutable bool                                        mbIsContentFullyOpaque;
+        mutable bool										mbIsContentFullyOpaque;
 
         /// True, iff mfAlpha has changed
         mutable bool                                        mbAlphaDirty;
diff --git a/canvas/inc/canvas/base/doublebitmapbase.hxx b/canvas/inc/canvas/base/doublebitmapbase.hxx
index 736e2b84da6a..50f7d785e49a 100644
--- a/canvas/inc/canvas/base/doublebitmapbase.hxx
+++ b/canvas/inc/canvas/base/doublebitmapbase.hxx
@@ -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
@@ -67,19 +67,19 @@ namespace canvas
         @see CanvasBase for further contractual requirements towards
         the CanvasHelper type, and some examples.
      */
-    template< class Base,
-              class CanvasHelper,
-              class Mutex=::osl::MutexGuard,
-              class UnambiguousBase=::com::sun::star::uno::XInterface > class DoubleBitmapBase :
+    template< class Base, 
+              class CanvasHelper, 
+              class Mutex=::osl::MutexGuard, 
+              class UnambiguousBase=::com::sun::star::uno::XInterface > class DoubleBitmapBase : 
         public BitmapCanvasBase< Base, CanvasHelper, Mutex, UnambiguousBase >
     {
     public:
-        typedef BitmapCanvasBase< Base, CanvasHelper, Mutex, UnambiguousBase >  BaseType;
+        typedef BitmapCanvasBase< Base, CanvasHelper, Mutex, UnambiguousBase >	BaseType;
 
         // XIeeeDoubleBitmap
-        virtual ::com::sun::star::uno::Sequence< double > SAL_CALL getData( ::com::sun::star::rendering::FloatingPointBitmapLayout& bitmapLayout,
-                                                                            const ::com::sun::star::geometry::IntegerRectangle2D&   rect ) throw (::com::sun::star::lang::IndexOutOfBoundsException,
-                                                                                                                                                  ::com::sun::star::rendering::VolatileContentDestroyedException,
+        virtual ::com::sun::star::uno::Sequence< double > SAL_CALL getData( ::com::sun::star::rendering::FloatingPointBitmapLayout&	bitmapLayout, 
+                                                                            const ::com::sun::star::geometry::IntegerRectangle2D& 	rect ) throw (::com::sun::star::lang::IndexOutOfBoundsException, 
+                                                                                                                                                  ::com::sun::star::rendering::VolatileContentDestroyedException, 
                                                                                                                                                   ::com::sun::star::uno::RuntimeException)
         {
             verifyInput(rect, this);
@@ -91,9 +91,9 @@ namespace canvas
                                                      rect );
         }
 
-        virtual void SAL_CALL setData( const ::com::sun::star::uno::Sequence< double >&              data,
-                                       const ::com::sun::star::rendering::FloatingPointBitmapLayout& bitmapLayout,
-                                       const ::com::sun::star::geometry::IntegerRectangle2D&         rect ) throw (::com::sun::star::lang::IllegalArgumentException,
+        virtual void SAL_CALL setData( const ::com::sun::star::uno::Sequence< double >& 			 data, 
+                                       const ::com::sun::star::rendering::FloatingPointBitmapLayout& bitmapLayout, 
+                                       const ::com::sun::star::geometry::IntegerRectangle2D& 		 rect ) throw (::com::sun::star::lang::IllegalArgumentException, 
                                                                                                                    ::com::sun::star::lang::IndexOutOfBoundsException,
                                                                                                                    ::com::sun::star::uno::RuntimeException)
         {
@@ -108,10 +108,10 @@ namespace canvas
             BaseType::maCanvasHelper.setData( data, bitmapLayout, rect );
         }
 
-        virtual void SAL_CALL setPixel( const ::com::sun::star::uno::Sequence< double >&                color,
-                                        const ::com::sun::star::rendering::FloatingPointBitmapLayout&   bitmapLayout,
-                                        const ::com::sun::star::geometry::IntegerPoint2D&               pos ) throw (::com::sun::star::lang::IllegalArgumentException,
-                                                                                                                     ::com::sun::star::lang::IndexOutOfBoundsException,
+        virtual void SAL_CALL setPixel( const ::com::sun::star::uno::Sequence< double >& 				color, 
+                                        const ::com::sun::star::rendering::FloatingPointBitmapLayout&	bitmapLayout, 
+                                        const ::com::sun::star::geometry::IntegerPoint2D& 				pos ) throw (::com::sun::star::lang::IllegalArgumentException, 
+                                                                                                                     ::com::sun::star::lang::IndexOutOfBoundsException, 
                                                                                                                      ::com::sun::star::uno::RuntimeException)
         {
             verifyInput(bitmapLayout, pos, this);
@@ -125,9 +125,9 @@ namespace canvas
             BaseType::maCanvasHelper.setPixel( color, bitmapLayout, pos );
         }
 
-        virtual ::com::sun::star::uno::Sequence< double > SAL_CALL getPixel( ::com::sun::star::rendering::FloatingPointBitmapLayout&    bitmapLayout,
-                                                                             const ::com::sun::star::geometry::IntegerPoint2D&          pos ) throw (::com::sun::star::lang::IndexOutOfBoundsException,
-                                                                                                                                                     ::com::sun::star::rendering::VolatileContentDestroyedException,
+        virtual ::com::sun::star::uno::Sequence< double > SAL_CALL getPixel( ::com::sun::star::rendering::FloatingPointBitmapLayout&	bitmapLayout, 
+                                                                             const ::com::sun::star::geometry::IntegerPoint2D& 			pos ) throw (::com::sun::star::lang::IndexOutOfBoundsException, 
+                                                                                                                                                     ::com::sun::star::rendering::VolatileContentDestroyedException, 
                                                                                                                                                      ::com::sun::star::uno::RuntimeException)
         {
             verifyInput(pos, this);
diff --git a/canvas/inc/canvas/base/floatbitmapbase.hxx b/canvas/inc/canvas/base/floatbitmapbase.hxx
index 36d21cc5c36e..3db6fb490624 100644
--- a/canvas/inc/canvas/base/floatbitmapbase.hxx
+++ b/canvas/inc/canvas/base/floatbitmapbase.hxx
@@ -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
@@ -67,22 +67,22 @@ namespace canvas
         @see CanvasBase for further contractual requirements towards
         the CanvasHelper type, and some examples.
      */
-    template< class Base,
-              class CanvasHelper,
-              class Mutex=::osl::MutexGuard,
-              class UnambiguousBase=::com::sun::star::uno::XInterface > class FloatBitmapBase :
+    template< class Base, 
+              class CanvasHelper, 
+              class Mutex=::osl::MutexGuard, 
+              class UnambiguousBase=::com::sun::star::uno::XInterface > class FloatBitmapBase : 
         public BitmapCanvasBase< Base, CanvasHelper, Mutex, UnambiguousBase >
     {
     public:
-        typedef BitmapCanvasBase< Base, CanvasHelper, Mutex, UnambiguousBase >  BaseType;
+        typedef BitmapCanvasBase< Base, CanvasHelper, Mutex, UnambiguousBase >	BaseType;
 
         // XIeeeFloatBitmap
-        virtual ::com::sun::star::uno::Sequence< float > SAL_CALL getData( ::com::sun::star::rendering::FloatingPointBitmapLayout&  bitmapLayout,
-                                                                           const ::com::sun::star::geometry::IntegerRectangle2D&    rect ) throw (::com::sun::star::lang::IndexOutOfBoundsException,
-                                                                                                                                               ::com::sun::star::rendering::VolatileContentDestroyedException,
+        virtual ::com::sun::star::uno::Sequence< float > SAL_CALL getData( ::com::sun::star::rendering::FloatingPointBitmapLayout&	bitmapLayout, 
+                                                                           const ::com::sun::star::geometry::IntegerRectangle2D& 	rect ) throw (::com::sun::star::lang::IndexOutOfBoundsException, 
+                                                                                                                                               ::com::sun::star::rendering::VolatileContentDestroyedException, 
                                                                                                                                                ::com::sun::star::uno::RuntimeException)
         {
-            verifyInput(rect,
+            verifyInput(rect, 
                         static_cast< typename BaseType::UnambiguousBaseType* >(this));
             verifyIndexRange(rect, getSize() );
 
@@ -92,13 +92,13 @@ namespace canvas
                                                      rect );
         }
 
-        virtual void SAL_CALL setData( const ::com::sun::star::uno::Sequence< float >&               data,
-                                       const ::com::sun::star::rendering::FloatingPointBitmapLayout& bitmapLayout,
-                                       const ::com::sun::star::geometry::IntegerRectangle2D&         rect ) throw (::com::sun::star::lang::IllegalArgumentException,
+        virtual void SAL_CALL setData( const ::com::sun::star::uno::Sequence< float >& 				 data, 
+                                       const ::com::sun::star::rendering::FloatingPointBitmapLayout& bitmapLayout, 
+                                       const ::com::sun::star::geometry::IntegerRectangle2D& 		 rect ) throw (::com::sun::star::lang::IllegalArgumentException, 
                                                                                                                    ::com::sun::star::lang::IndexOutOfBoundsException,
                                                                                                                    ::com::sun::star::uno::RuntimeException)
         {
-            verifyInput(bitmapLayout, rect,
+            verifyInput(bitmapLayout, rect, 
                         static_cast< typename BaseType::UnambiguousBaseType* >(this));
             verifyIndexRange(rect, getSize() );
 
@@ -110,13 +110,13 @@ namespace canvas
             BaseType::maCanvasHelper.setData( data, bitmapLayout, rect );
         }
 
-        virtual void SAL_CALL setPixel( const ::com::sun::star::uno::Sequence< float >&                 color,
-                                        const ::com::sun::star::rendering::FloatingPointBitmapLayout&   bitmapLayout,
-                                        const ::com::sun::star::geometry::IntegerPoint2D&               pos ) throw (::com::sun::star::lang::IllegalArgumentException,
-                                                                                                                     ::com::sun::star::lang::IndexOutOfBoundsException,
+        virtual void SAL_CALL setPixel( const ::com::sun::star::uno::Sequence< float >& 				color, 
+                                        const ::com::sun::star::rendering::FloatingPointBitmapLayout&	bitmapLayout, 
+                                        const ::com::sun::star::geometry::IntegerPoint2D& 				pos ) throw (::com::sun::star::lang::IllegalArgumentException, 
+                                                                                                                     ::com::sun::star::lang::IndexOutOfBoundsException, 
                                                                                                                      ::com::sun::star::uno::RuntimeException)
         {
-            verifyInput(bitmapLayout, pos,
+            verifyInput(bitmapLayout, pos, 
                         static_cast< typename BaseType::UnambiguousBaseType* >(this));
             verifyIndexRange(pos, getSize() );
 
@@ -128,12 +128,12 @@ namespace canvas
             BaseType::maCanvasHelper.setPixel( color, bitmapLayout, pos );
         }
 
-        virtual ::com::sun::star::uno::Sequence< float > SAL_CALL getPixel( ::com::sun::star::rendering::FloatingPointBitmapLayout& bitmapLayout,
-                                                                            const ::com::sun::star::geometry::IntegerPoint2D&       pos ) throw (::com::sun::star::lang::IndexOutOfBoundsException,
-                                                                                                                                                 ::com::sun::star::rendering::VolatileContentDestroyedException,
+        virtual ::com::sun::star::uno::Sequence< float > SAL_CALL getPixel( ::com::sun::star::rendering::FloatingPointBitmapLayout& bitmapLayout, 
+                                                                            const ::com::sun::star::geometry::IntegerPoint2D& 		pos ) throw (::com::sun::star::lang::IndexOutOfBoundsException, 
+                                                                                                                                                 ::com::sun::star::rendering::VolatileContentDestroyedException, 
                                                                                                                                                  ::com::sun::star::uno::RuntimeException)
         {
-            verifyInput(pos,
+            verifyInput(pos, 
                         static_cast< typename BaseType::UnambiguousBaseType* >(this));
             verifyIndexRange(pos, getSize() );
 
diff --git a/canvas/inc/canvas/base/graphicdevicebase.hxx b/canvas/inc/canvas/base/graphicdevicebase.hxx
index 6750c28e22c8..ef068c568644 100644
--- a/canvas/inc/canvas/base/graphicdevicebase.hxx
+++ b/canvas/inc/canvas/base/graphicdevicebase.hxx
@@ -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
@@ -45,7 +45,7 @@
 namespace canvas
 {
     /** Helper template base class for XGraphicDevice implementations.
-
+        
         This base class provides partial implementations of the
         XGraphicDevice-related interface, such as XColorSpace.
 
@@ -105,17 +105,17 @@ namespace canvas
         derives from multiple UNO interface (were each provides its
         own version of XInterface, making the conversion ambiguous)
      */
-    template< class Base,
+    template< class Base, 
               class DeviceHelper,
-              class Mutex=::osl::MutexGuard,
-              class UnambiguousBase=::com::sun::star::uno::XInterface > class GraphicDeviceBase :
+              class Mutex=::osl::MutexGuard, 
+              class UnambiguousBase=::com::sun::star::uno::XInterface > class GraphicDeviceBase : 
         public Base
     {
     public:
-        typedef Base              BaseType;
-        typedef DeviceHelper      DeviceHelperType;
-        typedef Mutex             MutexType;
-        typedef UnambiguousBase   UnambiguousBaseType;
+        typedef Base 			  BaseType;
+        typedef DeviceHelper	  DeviceHelperType;
+        typedef Mutex			  MutexType;
+        typedef UnambiguousBase	  UnambiguousBaseType;
         typedef GraphicDeviceBase ThisType;
 
         typedef ::rtl::Reference< GraphicDeviceBase > Reference;
@@ -132,15 +132,15 @@ namespace canvas
                                          ("DeviceHandle",
                                           boost::bind(&DeviceHelper::getDeviceHandle,
                                                       boost::ref(maDeviceHelper)))
-                                         ("SurfaceHandle",
+                                         ("SurfaceHandle",  
                                           boost::bind(&DeviceHelper::getSurfaceHandle,
                                                       boost::ref(maDeviceHelper)))
-                                         ("DumpScreenContent",
+                                         ("DumpScreenContent",  
                                           boost::bind(&ThisType::getDumpScreenContent,
                                                       this),
                                           boost::bind(&ThisType::setDumpScreenContent,
                                                       this,
-                                                      _1)));
+                                                      _1))); 
         }
 
 #if defined __SUNPRO_CC
@@ -197,10 +197,10 @@ namespace canvas
             return maDeviceHelper.createCompatibleBezierPolyPolygon( this, points );
         }
 
-        virtual ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XBitmap > SAL_CALL createCompatibleBitmap( const ::com::sun::star::geometry::IntegerSize2D& size ) throw (::com::sun::star::lang::IllegalArgumentException,
+        virtual ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XBitmap > SAL_CALL createCompatibleBitmap( const ::com::sun::star::geometry::IntegerSize2D& size ) throw (::com::sun::star::lang::IllegalArgumentException, 
                                                                                                                                                                                          ::com::sun::star::uno::RuntimeException)
         {
-            tools::verifyBitmapSize(size,
+            tools::verifyBitmapSize(size, 
                                     BOOST_CURRENT_FUNCTION,
                                     static_cast< UnambiguousBaseType* >(this));
 
@@ -209,10 +209,10 @@ namespace canvas
             return maDeviceHelper.createCompatibleBitmap( this, size );
         }
 
-        virtual ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XVolatileBitmap > SAL_CALL createVolatileBitmap( const ::com::sun::star::geometry::IntegerSize2D& size ) throw (::com::sun::star::lang::IllegalArgumentException,
+        virtual ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XVolatileBitmap > SAL_CALL createVolatileBitmap( const ::com::sun::star::geometry::IntegerSize2D& size ) throw (::com::sun::star::lang::IllegalArgumentException, 
                                                                                                                                                                                                ::com::sun::star::uno::RuntimeException)
         {
-            tools::verifyBitmapSize(size,
+            tools::verifyBitmapSize(size, 
                                     BOOST_CURRENT_FUNCTION,
                                     static_cast< UnambiguousBaseType* >(this));
 
@@ -221,10 +221,10 @@ namespace canvas
             return maDeviceHelper.createVolatileBitmap( this, size );
         }
 
-        virtual ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XBitmap > SAL_CALL createCompatibleAlphaBitmap( const ::com::sun::star::geometry::IntegerSize2D& size ) throw (::com::sun::star::lang::IllegalArgumentException,
+        virtual ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XBitmap > SAL_CALL createCompatibleAlphaBitmap( const ::com::sun::star::geometry::IntegerSize2D& size ) throw (::com::sun::star::lang::IllegalArgumentException, 
                                                                                                                                                                                               ::com::sun::star::uno::RuntimeException)
         {
-            tools::verifyBitmapSize(size,
+            tools::verifyBitmapSize(size, 
                                     BOOST_CURRENT_FUNCTION,
                                     static_cast< UnambiguousBaseType* >(this));
 
@@ -233,10 +233,10 @@ namespace canvas
             return maDeviceHelper.createCompatibleAlphaBitmap( this, size );
         }
 
-        virtual ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XVolatileBitmap > SAL_CALL createVolatileAlphaBitmap( const ::com::sun::star::geometry::IntegerSize2D& size ) throw (::com::sun::star::lang::IllegalArgumentException,
+        virtual ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XVolatileBitmap > SAL_CALL createVolatileAlphaBitmap( const ::com::sun::star::geometry::IntegerSize2D& size ) throw (::com::sun::star::lang::IllegalArgumentException, 
                                                                                                                                                                                                     ::com::sun::star::uno::RuntimeException)
         {
-            tools::verifyBitmapSize(size,
+            tools::verifyBitmapSize(size, 
                                     BOOST_CURRENT_FUNCTION,
                                     static_cast< UnambiguousBaseType* >(this));
 
@@ -277,7 +277,7 @@ namespace canvas
         {
             return ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XParametricPolyPolygon2D >(
                 ParametricPolyPolygon::create(this,
-                                              aServiceSpecifier,
+                                              aServiceSpecifier, 
                                               Arguments));
         }
 
@@ -304,28 +304,28 @@ namespace canvas
             return maPropHelper.getPropertySetInfo();
         }
 
-        virtual void SAL_CALL setPropertyValue( const ::rtl::OUString&            aPropertyName,
-                                                const ::com::sun::star::uno::Any& aValue ) throw (::com::sun::star::beans::UnknownPropertyException,
-                                                                                                  ::com::sun::star::beans::PropertyVetoException,
-                                                                                                  ::com::sun::star::lang::IllegalArgumentException,
-                                                                                                  ::com::sun::star::lang::WrappedTargetException,
+        virtual void SAL_CALL setPropertyValue( const ::rtl::OUString&            aPropertyName, 
+                                                const ::com::sun::star::uno::Any& aValue ) throw (::com::sun::star::beans::UnknownPropertyException, 
+                                                                                                  ::com::sun::star::beans::PropertyVetoException, 
+                                                                                                  ::com::sun::star::lang::IllegalArgumentException, 
+                                                                                                  ::com::sun::star::lang::WrappedTargetException, 
                                                                                                   ::com::sun::star::uno::RuntimeException)
         {
             MutexType aGuard( BaseType::m_aMutex );
             maPropHelper.setPropertyValue( aPropertyName, aValue );
         }
 
-        virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const ::rtl::OUString& aPropertyName ) throw (::com::sun::star::beans::UnknownPropertyException,
-                                                                                                                    ::com::sun::star::lang::WrappedTargetException,
+        virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const ::rtl::OUString& aPropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, 
+                                                                                                                    ::com::sun::star::lang::WrappedTargetException, 
                                                                                                                     ::com::sun::star::uno::RuntimeException)
         {
             MutexType aGuard( BaseType::m_aMutex );
             return maPropHelper.getPropertyValue( aPropertyName );
         }
 
-        virtual void SAL_CALL addPropertyChangeListener( const ::rtl::OUString& aPropertyName,
-                                                         const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw (::com::sun::star::beans::UnknownPropertyException,
-                                                                                                                                                                        ::com::sun::star::lang::WrappedTargetException,
+        virtual void SAL_CALL addPropertyChangeListener( const ::rtl::OUString& aPropertyName, 
+                                                         const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw (::com::sun::star::beans::UnknownPropertyException, 
+                                                                                                                                                                        ::com::sun::star::lang::WrappedTargetException, 
                                                                                                                                                                         ::com::sun::star::uno::RuntimeException)
         {
             MutexType aGuard( BaseType::m_aMutex );
@@ -333,9 +333,9 @@ namespace canvas
                                                     xListener );
         }
 
-        virtual void SAL_CALL removePropertyChangeListener( const ::rtl::OUString& aPropertyName,
-                                                            const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw (::com::sun::star::beans::UnknownPropertyException,
-                                                                                                                                                                           ::com::sun::star::lang::WrappedTargetException,
+        virtual void SAL_CALL removePropertyChangeListener( const ::rtl::OUString& aPropertyName, 
+                                                            const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw (::com::sun::star::beans::UnknownPropertyException, 
+                                                                                                                                                                           ::com::sun::star::lang::WrappedTargetException, 
                                                                                                                                                                            ::com::sun::star::uno::RuntimeException)
         {
             MutexType aGuard( BaseType::m_aMutex );
@@ -343,9 +343,9 @@ namespace canvas
                                                        xListener );
         }
 
-        virtual void SAL_CALL addVetoableChangeListener( const ::rtl::OUString& aPropertyName,
-                                                         const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& xListener ) throw (::com::sun::star::beans::UnknownPropertyException,
-                                                                                                                                                                        ::com::sun::star::lang::WrappedTargetException,
+        virtual void SAL_CALL addVetoableChangeListener( const ::rtl::OUString& aPropertyName, 
+                                                         const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& xListener ) throw (::com::sun::star::beans::UnknownPropertyException, 
+                                                                                                                                                                        ::com::sun::star::lang::WrappedTargetException, 
                                                                                                                                                                         ::com::sun::star::uno::RuntimeException)
         {
             MutexType aGuard( BaseType::m_aMutex );
@@ -353,9 +353,9 @@ namespace canvas
                                                     xListener );
         }
 
-        virtual void SAL_CALL removeVetoableChangeListener( const ::rtl::OUString& aPropertyName,
-                                                            const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& xListener ) throw (::com::sun::star::beans::UnknownPropertyException,
-                                                                                                                                                                           ::com::sun::star::lang::WrappedTargetException,
+        virtual void SAL_CALL removeVetoableChangeListener( const ::rtl::OUString& aPropertyName, 
+                                                            const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& xListener ) throw (::com::sun::star::beans::UnknownPropertyException, 
+                                                                                                                                                                           ::com::sun::star::lang::WrappedTargetException, 
                                                                                                                                                                            ::com::sun::star::uno::RuntimeException)
         {
             MutexType aGuard( BaseType::m_aMutex );
diff --git a/canvas/inc/canvas/base/integerbitmapbase.hxx b/canvas/inc/canvas/base/integerbitmapbase.hxx
index c3956080483b..4bb2a5000111 100644
--- a/canvas/inc/canvas/base/integerbitmapbase.hxx
+++ b/canvas/inc/canvas/base/integerbitmapbase.hxx
@@ -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
@@ -67,20 +67,20 @@ namespace canvas
         @see CanvasBase for further contractual requirements towards
         the CanvasHelper type, and some examples.
      */
-    template< class Base,
-              class CanvasHelper,
-              class Mutex=::osl::MutexGuard,
-              class UnambiguousBase=::com::sun::star::uno::XInterface > class IntegerBitmapBase :
+    template< class Base, 
+              class CanvasHelper, 
+              class Mutex=::osl::MutexGuard, 
+              class UnambiguousBase=::com::sun::star::uno::XInterface > class IntegerBitmapBase : 
         public BitmapCanvasBase< Base, CanvasHelper, Mutex, UnambiguousBase >
     {
     public:
-        typedef BitmapCanvasBase< Base, CanvasHelper, Mutex, UnambiguousBase >  BaseType;
+        typedef BitmapCanvasBase< Base, CanvasHelper, Mutex, UnambiguousBase >	BaseType;
 
         // XIntegerBitmap
-        virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getData( ::com::sun::star::rendering::IntegerBitmapLayout&     bitmapLayout,
+        virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getData( ::com::sun::star::rendering::IntegerBitmapLayout& 	bitmapLayout,
                                                                               const ::com::sun::star::geometry::IntegerRectangle2D& rect ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::rendering::VolatileContentDestroyedException, ::com::sun::star::uno::RuntimeException)
         {
-            tools::verifyArgs(rect,
+            tools::verifyArgs(rect, 
                               BOOST_CURRENT_FUNCTION,
                               static_cast< typename BaseType::UnambiguousBaseType* >(this));
             tools::verifyIndexRange(rect, BaseType::getSize() );
@@ -91,11 +91,11 @@ namespace canvas
                                                      rect );
         }
 
-        virtual void SAL_CALL setData( const ::com::sun::star::uno::Sequence< sal_Int8 >&      data,
-                                       const ::com::sun::star::rendering::IntegerBitmapLayout& bitmapLayout,
+        virtual void SAL_CALL setData( const ::com::sun::star::uno::Sequence< sal_Int8 >& 	   data, 
+                                       const ::com::sun::star::rendering::IntegerBitmapLayout& bitmapLayout, 
                                        const ::com::sun::star::geometry::IntegerRectangle2D&   rect ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException)
         {
-            tools::verifyArgs(bitmapLayout, rect,
+            tools::verifyArgs(bitmapLayout, rect, 
                               BOOST_CURRENT_FUNCTION,
                               static_cast< typename BaseType::UnambiguousBaseType* >(this));
             tools::verifyIndexRange(rect, BaseType::getSize() );
@@ -108,11 +108,11 @@ namespace canvas
             BaseType::maCanvasHelper.setData( data, bitmapLayout, rect );
         }
 
-        virtual void SAL_CALL setPixel( const ::com::sun::star::uno::Sequence< sal_Int8 >&      color,
-                                        const ::com::sun::star::rendering::IntegerBitmapLayout& bitmapLayout,
-                                        const ::com::sun::star::geometry::IntegerPoint2D&       pos ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException)
+        virtual void SAL_CALL setPixel( const ::com::sun::star::uno::Sequence< sal_Int8 >& 		color, 
+                                        const ::com::sun::star::rendering::IntegerBitmapLayout& bitmapLayout, 
+                                        const ::com::sun::star::geometry::IntegerPoint2D& 		pos ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException)
         {
-            tools::verifyArgs(bitmapLayout, pos,
+            tools::verifyArgs(bitmapLayout, pos, 
                               BOOST_CURRENT_FUNCTION,
                               static_cast< typename BaseType::UnambiguousBaseType* >(this));
             tools::verifyIndexRange(pos, BaseType::getSize() );
@@ -128,7 +128,7 @@ namespace canvas
         virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getPixel( ::com::sun::star::rendering::IntegerBitmapLayout& bitmapLayout,
                                                                                const ::com::sun::star::geometry::IntegerPoint2D& pos ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::rendering::VolatileContentDestroyedException, ::com::sun::star::uno::RuntimeException)
         {
-            tools::verifyArgs(pos,
+            tools::verifyArgs(pos, 
                               BOOST_CURRENT_FUNCTION,
                               static_cast< typename BaseType::UnambiguousBaseType* >(this));
             tools::verifyIndexRange(pos, BaseType::getSize() );
diff --git a/canvas/inc/canvas/base/sprite.hxx b/canvas/inc/canvas/base/sprite.hxx
index 7525e567dc60..87e70214b70c 100644
--- a/canvas/inc/canvas/base/sprite.hxx
+++ b/canvas/inc/canvas/base/sprite.hxx
@@ -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
@@ -47,9 +47,9 @@ namespace canvas
        be XInterface - reference holders to a Sprite must be able to
        control lifetime of reference target)
      */
-
+    
     /** Helper interface to connect SpriteCanvas with various
-        sprite implementations.
+        sprite implementations. 
 
         This interface should be implemented from every sprite class,
         as it provides essential repaint and update area facilitates.
@@ -109,8 +109,8 @@ namespace canvas
         {
             const double nPrioL( rLHS->getPriority() );
             const double nPrioR( rRHS->getPriority() );
-
-            // if prios are equal, tie-break on ptr value
+            
+            // if prios are equal, tie-break on ptr value   
             return nPrioL == nPrioR ? rLHS.get() < rRHS.get() : nPrioL < nPrioR;
         }
     };
diff --git a/canvas/inc/canvas/base/spritecanvasbase.hxx b/canvas/inc/canvas/base/spritecanvasbase.hxx
index b56001c1c6e9..ba3eb7ee6aa9 100644
--- a/canvas/inc/canvas/base/spritecanvasbase.hxx
+++ b/canvas/inc/canvas/base/spritecanvasbase.hxx
@@ -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
@@ -70,15 +70,15 @@ namespace canvas
         @see CanvasBase for further contractual requirements towards
         the CanvasHelper type, and some examples.
      */
-    template< class Base,
-              class CanvasHelper,
-              class Mutex=::osl::MutexGuard,
-              class UnambiguousBase=::com::sun::star::uno::XInterface > class SpriteCanvasBase :
+    template< class Base, 
+              class CanvasHelper, 
+              class Mutex=::osl::MutexGuard, 
+              class UnambiguousBase=::com::sun::star::uno::XInterface > class SpriteCanvasBase : 
         public IntegerBitmapBase< Base, CanvasHelper, Mutex, UnambiguousBase >
     {
     public:
-        typedef IntegerBitmapBase< Base, CanvasHelper, Mutex, UnambiguousBase > BaseType;
-        typedef ::rtl::Reference< SpriteCanvasBase >                            Reference;
+        typedef IntegerBitmapBase< Base, CanvasHelper, Mutex, UnambiguousBase >	BaseType;
+        typedef ::rtl::Reference< SpriteCanvasBase > 							Reference;
 
         SpriteCanvasBase() :
             maRedrawManager()
@@ -99,56 +99,56 @@ namespace canvas
         }
 
         // XSpriteCanvas
-        virtual ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XAnimatedSprite > SAL_CALL createSpriteFromAnimation( const ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XAnimation >& animation ) throw (::com::sun::star::lang::IllegalArgumentException,
+        virtual ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XAnimatedSprite > SAL_CALL createSpriteFromAnimation( const ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XAnimation >& animation ) throw (::com::sun::star::lang::IllegalArgumentException, 
                                                                                                                                                                                                                                            ::com::sun::star::uno::RuntimeException)
         {
-            tools::verifyArgs(animation,
+            tools::verifyArgs(animation, 
                               BOOST_CURRENT_FUNCTION,
                               static_cast< typename BaseType::UnambiguousBaseType* >(this));
 
             typename BaseType::MutexType aGuard( BaseType::m_aMutex );
-
+            
             return BaseType::maCanvasHelper.createSpriteFromAnimation(animation);
         }
 
-        virtual ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XAnimatedSprite > SAL_CALL createSpriteFromBitmaps( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XBitmap > >& animationBitmaps,
-                                                                                                                                   sal_Int8                                                                                                           interpolationMode ) throw (::com::sun::star::lang::IllegalArgumentException,
-                                                                                                                                                                                                                                                                                 ::com::sun::star::rendering::VolatileContentDestroyedException,
+        virtual ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XAnimatedSprite > SAL_CALL createSpriteFromBitmaps( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XBitmap > >& animationBitmaps, 
+                                                                                                                                   sal_Int8                                                                                                           interpolationMode ) throw (::com::sun::star::lang::IllegalArgumentException, 
+                                                                                                                                                                                                                                                                                 ::com::sun::star::rendering::VolatileContentDestroyedException, 
                                                                                                                                                                                                                                                                                  ::com::sun::star::uno::RuntimeException)
         {
-            tools::verifyArgs(animationBitmaps,
+            tools::verifyArgs(animationBitmaps,  
                               BOOST_CURRENT_FUNCTION,
                               static_cast< typename BaseType::UnambiguousBaseType* >(this));
-            tools::verifyRange( interpolationMode,
+            tools::verifyRange( interpolationMode, 
                                 ::com::sun::star::rendering::InterpolationMode::NEAREST_NEIGHBOR,
                                 ::com::sun::star::rendering::InterpolationMode::BEZIERSPLINE4 );
 
             typename BaseType::MutexType aGuard( BaseType::m_aMutex );
-
+            
             return BaseType::maCanvasHelper.createSpriteFromBitmaps(animationBitmaps, interpolationMode);
         }
 
-        virtual ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XCustomSprite > SAL_CALL createCustomSprite( const ::com::sun::star::geometry::RealSize2D& spriteSize ) throw (::com::sun::star::lang::IllegalArgumentException,
+        virtual ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XCustomSprite > SAL_CALL createCustomSprite( const ::com::sun::star::geometry::RealSize2D& spriteSize ) throw (::com::sun::star::lang::IllegalArgumentException, 
                                                                                                                                                                                               ::com::sun::star::uno::RuntimeException)
         {
-            tools::verifySpriteSize(spriteSize,
+            tools::verifySpriteSize(spriteSize, 
                                     BOOST_CURRENT_FUNCTION,
                                     static_cast< typename BaseType::UnambiguousBaseType* >(this));
 
             typename BaseType::MutexType aGuard( BaseType::m_aMutex );
-
+            
             return BaseType::maCanvasHelper.createCustomSprite(spriteSize);
         }
 
-        virtual ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XSprite > SAL_CALL createClonedSprite( const ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XSprite >& original ) throw (::com::sun::star::lang::IllegalArgumentException,
+        virtual ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XSprite > SAL_CALL createClonedSprite( const ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XSprite >& original ) throw (::com::sun::star::lang::IllegalArgumentException, 
                                                                                                                                                                                                                         ::com::sun::star::uno::RuntimeException)
         {
-            tools::verifyArgs(original,
+            tools::verifyArgs(original,  
                               BOOST_CURRENT_FUNCTION,
                               static_cast< typename BaseType::UnambiguousBaseType* >(this));
 
             typename BaseType::MutexType aGuard( BaseType::m_aMutex );
-
+            
             return BaseType::maCanvasHelper.createClonedSprite(original);
         }
 
@@ -171,10 +171,10 @@ namespace canvas
             maRedrawManager.hideSprite( rSprite );
         }
 
-        virtual void moveSprite( const Sprite::Reference&       rSprite,
-                                 const ::basegfx::B2DPoint&     rOldPos,
-                                 const ::basegfx::B2DPoint&     rNewPos,
-                                 const ::basegfx::B2DVector&    rSpriteSize )
+        virtual void moveSprite( const Sprite::Reference&		rSprite, 
+                                 const ::basegfx::B2DPoint& 	rOldPos,
+                                 const ::basegfx::B2DPoint&		rNewPos,
+                                 const ::basegfx::B2DVector& 	rSpriteSize )
         {
             OSL_ASSERT( rSprite.is() );
 
@@ -183,9 +183,9 @@ namespace canvas
             maRedrawManager.moveSprite( rSprite, rOldPos, rNewPos, rSpriteSize );
         }
 
-        virtual void updateSprite( const Sprite::Reference&     rSprite,
-                                   const ::basegfx::B2DPoint&   rPos,
-                                   const ::basegfx::B2DRange&   rUpdateArea )
+        virtual void updateSprite( const Sprite::Reference& 	rSprite, 
+                                   const ::basegfx::B2DPoint& 	rPos,
+                                   const ::basegfx::B2DRange&	rUpdateArea )
         {
             OSL_ASSERT( rSprite.is() );
 
diff --git a/canvas/inc/canvas/base/spritesurface.hxx b/canvas/inc/canvas/base/spritesurface.hxx
index 8ad6ce7404b5..d4f3766df475 100644
--- a/canvas/inc/canvas/base/spritesurface.hxx
+++ b/canvas/inc/canvas/base/spritesurface.hxx
@@ -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
@@ -33,7 +33,7 @@
 namespace canvas
 {
     /* Definition of the SpriteSurface interface */
-
+    
     /** Canvas surface containing sprites
 
         Every canvas surface that contains sprites must implement this
@@ -53,20 +53,20 @@ namespace canvas
         virtual void hideSprite( const Sprite::Reference& rSprite ) = 0;
 
         /// Sprites should call this from XSprite::move()
-        virtual void moveSprite( const Sprite::Reference&       rSprite,
-                                 const ::basegfx::B2DPoint&     rOldPos,
-                                 const ::basegfx::B2DPoint&     rNewPos,
-                                 const ::basegfx::B2DVector&    rSpriteSize ) = 0;
+        virtual void moveSprite( const Sprite::Reference&		rSprite, 
+                                 const ::basegfx::B2DPoint& 	rOldPos,
+                                 const ::basegfx::B2DPoint&		rNewPos,
+                                 const ::basegfx::B2DVector& 	rSpriteSize ) = 0;
 
         /** Sprites should call this when some part of the content has
-            changed.
+            changed. 
 
             That includes show/hide, i.e. for show, both showSprite()
             and updateSprite() must be called.
         */
-        virtual void updateSprite( const Sprite::Reference&     rSprite,
-                                   const ::basegfx::B2DPoint&   rPos,
-                                   const ::basegfx::B2DRange&   rUpdateArea ) = 0;
+        virtual void updateSprite( const Sprite::Reference& 	rSprite, 
+                                   const ::basegfx::B2DPoint& 	rPos,
+                                   const ::basegfx::B2DRange&	rUpdateArea ) = 0;
     };
 }
 
diff --git a/canvas/inc/canvas/canvastools.hxx b/canvas/inc/canvas/canvastools.hxx
index 6c9fdfee484a..50d30f14d212 100755
--- a/canvas/inc/canvas/canvastools.hxx
+++ b/canvas/inc/canvas/canvastools.hxx
@@ -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
@@ -52,7 +52,7 @@ namespace basegfx
     class B2DPolyPolygon;
 }
 
-namespace com { namespace sun { namespace star { namespace geometry
+namespace com { namespace sun { namespace star { namespace geometry 
 {
     struct RealSize2D;
     struct IntegerSize2D;
@@ -60,7 +60,7 @@ namespace com { namespace sun { namespace star { namespace geometry
     struct Matrix2D;
 } } } }
 
-namespace com { namespace sun { namespace star { namespace rendering
+namespace com { namespace sun { namespace star { namespace rendering 
 {
     struct RenderState;
     struct ViewState;
@@ -70,14 +70,14 @@ namespace com { namespace sun { namespace star { namespace rendering
     class  XIntegerBitmapColorSpace;
     class  XPolyPolygon2D;
 
-    bool operator==( const RenderState& rLHS,
+    bool operator==( const RenderState&	rLHS,
                      const RenderState& rRHS );
-
+    
     bool operator==( const ViewState& rLHS,
-                     const ViewState& rRHS );
+                     const ViewState& rRHS );    
 } } } }
 
-namespace com { namespace sun { namespace star { namespace awt
+namespace com { namespace sun { namespace star { namespace awt 
 {
     struct Rectangle;
     class  XWindow2;
@@ -159,65 +159,65 @@ namespace canvas
         // View- and RenderState utilities
         // ===================================================================
 
-        ::com::sun::star::rendering::RenderState&
-            initRenderState( ::com::sun::star::rendering::RenderState&                      renderState );
-
-        ::com::sun::star::rendering::ViewState&
-            initViewState( ::com::sun::star::rendering::ViewState&                          viewState );
-
-        ::basegfx::B2DHomMatrix&
-            getViewStateTransform( ::basegfx::B2DHomMatrix&                                 transform,
-                                   const ::com::sun::star::rendering::ViewState&            viewState );
-
-        ::com::sun::star::rendering::ViewState&
-            setViewStateTransform( ::com::sun::star::rendering::ViewState&                  viewState,
-                                   const ::basegfx::B2DHomMatrix&                           transform );
-
-        ::basegfx::B2DHomMatrix&
-            getRenderStateTransform( ::basegfx::B2DHomMatrix&                               transform,
-                                     const ::com::sun::star::rendering::RenderState&        renderState );
-
-        ::com::sun::star::rendering::RenderState&
-            setRenderStateTransform( ::com::sun::star::rendering::RenderState&              renderState,
-                                     const ::basegfx::B2DHomMatrix&                         transform );
-
-        ::com::sun::star::rendering::ViewState&
-            appendToViewState( ::com::sun::star::rendering::ViewState&                      viewState,
-                               const ::basegfx::B2DHomMatrix&                               transform );
-
-        ::com::sun::star::rendering::RenderState&
-            appendToRenderState( ::com::sun::star::rendering::RenderState&                  renderState,
-                                 const ::basegfx::B2DHomMatrix&                             transform );
-
-        ::com::sun::star::rendering::ViewState&
-            prependToViewState( ::com::sun::star::rendering::ViewState&                     viewState,
-                                const ::basegfx::B2DHomMatrix&                              transform );
-
-        ::com::sun::star::rendering::RenderState&
-            prependToRenderState( ::com::sun::star::rendering::RenderState&                 renderState,
-                                  const ::basegfx::B2DHomMatrix&                            transform );
+        ::com::sun::star::rendering::RenderState& 
+            initRenderState( ::com::sun::star::rendering::RenderState&						renderState );
 
-        ::basegfx::B2DHomMatrix&
-            mergeViewAndRenderTransform( ::basegfx::B2DHomMatrix&                           transform,
-                                         const ::com::sun::star::rendering::ViewState&      viewState,
-                                         const ::com::sun::star::rendering::RenderState&    renderState );
+        ::com::sun::star::rendering::ViewState& 
+            initViewState( ::com::sun::star::rendering::ViewState&							viewState );
 
+        ::basegfx::B2DHomMatrix& 
+            getViewStateTransform( ::basegfx::B2DHomMatrix&									transform,
+                                   const ::com::sun::star::rendering::ViewState&			viewState );
+        
         ::com::sun::star::rendering::ViewState&
-            mergeViewAndRenderState( ::com::sun::star::rendering::ViewState&                resultViewState,
-                                     const ::com::sun::star::rendering::ViewState&          viewState,
-                                     const ::com::sun::star::rendering::RenderState&        renderState,
-                                     const ::com::sun::star::uno::Reference<
-                                         ::com::sun::star::rendering::XCanvas >&            xCanvas );
+            setViewStateTransform( ::com::sun::star::rendering::ViewState& 					viewState,
+                                   const ::basegfx::B2DHomMatrix&							transform );
+        
+        ::basegfx::B2DHomMatrix& 
+            getRenderStateTransform( ::basegfx::B2DHomMatrix&								transform,
+                                     const ::com::sun::star::rendering::RenderState&		renderState );
+        
+        ::com::sun::star::rendering::RenderState& 
+            setRenderStateTransform( ::com::sun::star::rendering::RenderState& 				renderState,
+                                     const ::basegfx::B2DHomMatrix&							transform );
+        
+        ::com::sun::star::rendering::ViewState& 
+            appendToViewState( ::com::sun::star::rendering::ViewState&						viewState,
+                               const ::basegfx::B2DHomMatrix&								transform );
+        
+        ::com::sun::star::rendering::RenderState& 
+            appendToRenderState( ::com::sun::star::rendering::RenderState&					renderState,
+                                 const ::basegfx::B2DHomMatrix&								transform );
+        
+        ::com::sun::star::rendering::ViewState& 
+            prependToViewState( ::com::sun::star::rendering::ViewState&						viewState,
+                                const ::basegfx::B2DHomMatrix&								transform );
+        
+        ::com::sun::star::rendering::RenderState& 
+            prependToRenderState( ::com::sun::star::rendering::RenderState&					renderState,
+                                  const ::basegfx::B2DHomMatrix&							transform );
+
+        ::basegfx::B2DHomMatrix& 
+            mergeViewAndRenderTransform( ::basegfx::B2DHomMatrix&							transform,
+                                         const ::com::sun::star::rendering::ViewState&		viewState,
+                                         const ::com::sun::star::rendering::RenderState&	renderState );
+
+        ::com::sun::star::rendering::ViewState& 
+            mergeViewAndRenderState( ::com::sun::star::rendering::ViewState&				resultViewState,
+                                     const ::com::sun::star::rendering::ViewState&			viewState,
+                                     const ::com::sun::star::rendering::RenderState&		renderState,
+                                     const ::com::sun::star::uno::Reference< 
+                                         ::com::sun::star::rendering::XCanvas >& 			xCanvas );
 
 
         // Matrix utilities
         // ===================================================================
 
-        ::com::sun::star::geometry::AffineMatrix2D&
-            setIdentityAffineMatrix2D( ::com::sun::star::geometry::AffineMatrix2D&  matrix );
+        ::com::sun::star::geometry::AffineMatrix2D& 
+            setIdentityAffineMatrix2D( ::com::sun::star::geometry::AffineMatrix2D&	matrix );
 
-        ::com::sun::star::geometry::Matrix2D&
-            setIdentityMatrix2D( ::com::sun::star::geometry::Matrix2D&              matrix );
+        ::com::sun::star::geometry::Matrix2D& 
+            setIdentityMatrix2D( ::com::sun::star::geometry::Matrix2D&			    matrix );
 
 
         // Special utilities
@@ -242,9 +242,9 @@ namespace canvas
 
             @return a reference to the resulting rectangle
          */
-        ::basegfx::B2DRange& calcTransformedRectBounds( ::basegfx::B2DRange&            o_Rect,
-                                                        const ::basegfx::B2DRange&      i_Rect,
-                                                        const ::basegfx::B2DHomMatrix&  i_Transformation );
+        ::basegfx::B2DRange& calcTransformedRectBounds( ::basegfx::B2DRange&			o_Rect,
+                                                        const ::basegfx::B2DRange&		i_Rect,
+                                                        const ::basegfx::B2DHomMatrix&	i_Transformation );
 
         /** Calc a transform that maps one rectangle on top of
             another.
@@ -282,11 +282,11 @@ namespace canvas
 
             @see calcTransformedRectBounds()
         */
-        ::basegfx::B2DHomMatrix& calcRectToRectTransform( ::basegfx::B2DHomMatrix&          o_transform,
-                                                          const ::basegfx::B2DRange&        i_destRect,
-                                                          const ::basegfx::B2DRange&        i_srcRect,
-                                                          const ::basegfx::B2DHomMatrix&    i_transformation );
-
+        ::basegfx::B2DHomMatrix& calcRectToRectTransform( ::basegfx::B2DHomMatrix&			o_transform,
+                                                          const ::basegfx::B2DRange&		i_destRect,
+                                                          const ::basegfx::B2DRange&		i_srcRect,
+                                                          const ::basegfx::B2DHomMatrix&	i_transformation );
+        
         /** Calc a transform that maps the upper, left corner of a
              rectangle to the origin.
 
@@ -314,10 +314,10 @@ namespace canvas
             @see calcRectToRectTransform()
             @see calcTransformedRectBounds()
         */
-        ::basegfx::B2DHomMatrix& calcRectToOriginTransform( ::basegfx::B2DHomMatrix&        o_transform,
-                                                            const ::basegfx::B2DRange&      i_srcRect,
-                                                            const ::basegfx::B2DHomMatrix&  i_transformation );
-
+        ::basegfx::B2DHomMatrix& calcRectToOriginTransform( ::basegfx::B2DHomMatrix&		o_transform,
+                                                            const ::basegfx::B2DRange&		i_srcRect,
+                                                            const ::basegfx::B2DHomMatrix&	i_transformation );
+        
         /** Check whether a given rectangle is within another
             transformed rectangle.
 
@@ -338,9 +338,9 @@ namespace canvas
             @param rTransformation
             This transformation is applied to rTransformRect
          */
-        bool isInside( const ::basegfx::B2DRange&       rContainedRect,
-                       const ::basegfx::B2DRange&       rTransformRect,
-                       const ::basegfx::B2DHomMatrix&   rTransformation );
+        bool isInside( const ::basegfx::B2DRange& 		rContainedRect,
+                       const ::basegfx::B2DRange& 		rTransformRect, 
+                       const ::basegfx::B2DHomMatrix&	rTransformation );
 
         /** Clip a scroll to the given bound rect
 
@@ -416,14 +416,14 @@ namespace canvas
         ::basegfx::B2IRange spritePixelAreaFromB2DRange( const ::basegfx::B2DRange& rRange );
 
         /** Retrieve various internal properties of the actual canvas implementation.
-
+            
             This method retrieves a bunch of internal, implementation-
             and platform-dependent values from the canvas
             implementation. Among them are for example operating
             system window handles. The actual layout and content of
             the returned sequence is dependent on the component
             implementation, undocumented and subject to change.
-
+            
             @param i_rxCanvas
             Input parameter, the canvas representation for which the device information
             is to be retrieveds
@@ -433,7 +433,7 @@ namespace canvas
 
             @return A reference to the resulting sequence of parameters
         */
-        ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& getDeviceInfo(
+        ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& getDeviceInfo( 
             const ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XCanvas >& i_rxCanvas,
             ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& o_rxParams );
 
@@ -449,7 +449,7 @@ namespace canvas
             Use this method for dead-simple bitmap implementations,
             that map all their formats to 8888 RGBA color.
          */
-        ::com::sun::star::rendering::IntegerBitmapLayout getStdMemoryLayout(
+        ::com::sun::star::rendering::IntegerBitmapLayout getStdMemoryLayout( 
             const ::com::sun::star::geometry::IntegerSize2D& rBitmapSize );
 
         /// Convert standard 8888 RGBA color to vcl color
@@ -474,14 +474,14 @@ namespace canvas
             typedef ::std::numeric_limits< Source > SourceLimits;
             typedef ::std::numeric_limits< Target > TargetLimits;
 
-            if( ( arg<0 && !TargetLimits::is_signed) ||                     // loosing the sign here
-                ( SourceLimits::is_signed && arg<TargetLimits::min()) ||    // underflow will happen
-                ( arg>TargetLimits::max() ) )                               // overflow will happen
+            if( ( arg<0 && !TargetLimits::is_signed) || 					// loosing the sign here
+                ( SourceLimits::is_signed && arg<TargetLimits::min()) ||	// underflow will happen
+                ( arg>TargetLimits::max() ) ) 					            // overflow will happen
             {
 #if defined(VERBOSE) && defined(DBG_UTIL)
                 OSL_TRACE("numeric_cast detected data loss");
 #endif
-                throw ::com::sun::star::uno::RuntimeException(
+                throw ::com::sun::star::uno::RuntimeException( 
                     ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "numeric_cast detected data loss" )),
                     NULL );
             }
@@ -489,7 +489,7 @@ namespace canvas
             return static_cast<Target>(arg);
         }
 
-        ::com::sun::star::awt::Rectangle getAbsoluteWindowRect(
+        ::com::sun::star::awt::Rectangle getAbsoluteWindowRect( 
             const ::com::sun::star::awt::Rectangle&                                    rRect,
             const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow2 >& xWin  );
 
@@ -505,7 +505,7 @@ namespace canvas
            for smooth gradient color differences
          */
         int calcGradientStepCount( ::basegfx::B2DHomMatrix&                        rTotalTransform,
-                                   const ::com::sun::star::rendering::ViewState&   viewState,
+                                   const ::com::sun::star::rendering::ViewState&   viewState, 
                                    const ::com::sun::star::rendering::RenderState& renderState,
                                    const ::com::sun::star::rendering::Texture&     texture,
                                    int                                             nColorSteps );
@@ -527,8 +527,8 @@ namespace canvas
         public:
             struct MapEntry
             {
-                const char*     maKey;
-                ValueType       maValue;
+                const char*		maKey;
+                ValueType		maValue;
             };
 
             /** Create a ValueMap for the given array of MapEntries.
@@ -548,18 +548,18 @@ namespace canvas
                 or not. When bCaseSensitive is false, all MapEntry strings
                 must be lowercase!
             */
-            ValueMap( const MapEntry*   pMap,
-                      ::std::size_t     nEntries,
-                      bool              bCaseSensitive ) :
+            ValueMap( const MapEntry* 	pMap,
+                      ::std::size_t		nEntries,
+                      bool				bCaseSensitive ) :
                 mpMap( pMap ),
                 mnEntries( nEntries ),
                 mbCaseSensitive( bCaseSensitive )
             {
-#ifdef DBG_UTIL
+#ifdef DBG_UTIL                
                 // Ensure that map entries are sorted (and all lowercase, if this
                 // map is case insensitive)
                 const ::rtl::OString aStr( pMap->maKey );
-                if( !mbCaseSensitive &&
+                if( !mbCaseSensitive && 
                     aStr != aStr.toAsciiLowerCase() )
                 {
                     OSL_TRACE("ValueMap::ValueMap(): Key %s is not lowercase",
@@ -580,9 +580,9 @@ namespace canvas
                             OSL_ENSURE( false,
                                         "ValueMap::ValueMap(): Map is not sorted" );
                         }
-
+                        
                         const ::rtl::OString aStr2( pMap[1].maKey );
-                        if( !mbCaseSensitive &&
+                        if( !mbCaseSensitive && 
                             aStr2 != aStr2.toAsciiLowerCase() )
                         {
                             OSL_TRACE("ValueMap::ValueMap(): Key %s is not lowercase",
@@ -609,21 +609,21 @@ namespace canvas
                 @return true, if a matching entry was found.
             */
             bool lookup( const ::rtl::OUString& rName,
-                         ValueType&             o_rResult ) const
+                         ValueType&				o_rResult ) const
             {
                 // rName is required to contain only ASCII characters.
                 // TODO(Q1): Enforce this at upper layers
                 ::rtl::OString aKey( ::rtl::OUStringToOString( mbCaseSensitive ? rName : rName.toAsciiLowerCase(),
                                                                RTL_TEXTENCODING_ASCII_US ) );
-                MapEntry aSearchKey =
-                    {
-                        aKey.getStr(),
+                MapEntry aSearchKey = 
+                    { 
+                        aKey.getStr(), 
                         ValueType()
                     };
 
                 const MapEntry* pRes;
                 const MapEntry* pEnd = mpMap+mnEntries;
-                if( (pRes=::std::lower_bound( mpMap,
+                if( (pRes=::std::lower_bound( mpMap, 
                                               pEnd,
                                               aSearchKey,
                                               &mapComparator )) != pEnd )
@@ -649,10 +649,10 @@ namespace canvas
                 return strcmp( rLHS.maKey,
                                rRHS.maKey ) < 0;
             }
-
-            const MapEntry*     mpMap;
-            ::std::size_t       mnEntries;
-            bool                mbCaseSensitive;
+            
+            const MapEntry* 	mpMap;
+            ::std::size_t		mnEntries;
+            bool				mbCaseSensitive;
         };
     }
 }
diff --git a/canvas/inc/canvas/debug.hxx b/canvas/inc/canvas/debug.hxx
index 40573cbd758d..9399c0300064 100644
--- a/canvas/inc/canvas/debug.hxx
+++ b/canvas/inc/canvas/debug.hxx
@@ -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
diff --git a/canvas/inc/canvas/elapsedtime.hxx b/canvas/inc/canvas/elapsedtime.hxx
index c0ae5218eb64..2e0b5fa9c988 100644
--- a/canvas/inc/canvas/elapsedtime.hxx
+++ b/canvas/inc/canvas/elapsedtime.hxx
@@ -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
@@ -69,14 +69,14 @@ namespace canvas
             /** Gets this timer's base timer.
              */
             ::boost::shared_ptr<ElapsedTime> const & getTimeBase() const;
-
+            
             /** Reset the time
 
                 The instance of the reset() call starts the time
                 measurement from scratch. That means, a subsequent
                 getElapsedTime() call will return the time difference
                 between reset() and getElapsedTime() call.
-             */
+             */            
             void reset();
 
             /** Query the elapsed time
@@ -88,9 +88,9 @@ namespace canvas
                 continuous flow of time).
 
                 @return the elapsed time in seconds.
-             */
+             */            
             double getElapsedTime() const;
-
+            
             /** Pauses the running timer.
 
                 This method stops the time, as returned by this
@@ -100,8 +100,8 @@ namespace canvas
                 called).
              */
             void pauseTimer();
-
-            /** Continues the paused timer.
+            
+            /** Continues the paused timer.  
 
                 This method re-enables the time flow, that is, time
                 starts running again for clients calling
@@ -113,7 +113,7 @@ namespace canvas
                 pauseTimer().
              */
             void continueTimer();
-
+                        
             /** Adjusts the timer, hold and pause times.
 
                 This method modifies the time as returned by this
@@ -121,18 +121,18 @@ namespace canvas
                 as returned by getElapsedTime(), regardless of the
                 mode (e.g. paused, or on hold).
 
-                @param fOffset
+                @param fOffset 
                 This value will be added to the current time, i.e. the
                 next call to getElapsedTime() (when performed
                 immediately) will be adjusted by fOffset.
 
-                @param bLimitToLastQueriedTime
+                @param bLimitToLastQueriedTime 
                 Limits the given offset to the time that has been
                 taken via getElapsedTime()
             */
             void adjustTimer( double fOffset,
                               bool bLimitToLastQueriedTime = true );
-
+            
             /** Holds the current time.
 
                 This call makes the timer hold the current time
@@ -145,35 +145,35 @@ namespace canvas
                 clock keeps running internally.
             */
             void holdTimer();
-
+            
             /** Releases a held timer.
 
                 After this call, the timer again returns the running
                 time on getElapsedTime().
              */
             void releaseTimer();
-
+            
         private:
             static double getSystemTime();
             double getCurrentTime() const;
             double getElapsedTimeImpl() const; // does not set m_fLastQueriedTime
 
-            const ::boost::shared_ptr<ElapsedTime>  m_pTimeBase;
-
+            const ::boost::shared_ptr<ElapsedTime>	m_pTimeBase;
+            
             /// To validate adjustTimer() calls with bLimitToLastQueriedTime=true
-            mutable double                          m_fLastQueriedTime;
+            mutable double 							m_fLastQueriedTime;
 
             /// Start time, from which the difference to the time base is returned
-            double                                  m_fStartTime;
+            double 									m_fStartTime;
 
-            /// Instant, when last pause or hold started, relative to m_fStartTime
-            double                                  m_fFrozenTime;
+            /// Instant, when last pause or hold started, relative to m_fStartTime 
+            double 									m_fFrozenTime;
 
             /// True, when in pause mode
-            bool                                    m_bInPauseMode;
+            bool									m_bInPauseMode;
 
             /// True, when in hold mode
-            bool                                    m_bInHoldMode;
+            bool									m_bInHoldMode;
         };
 
     }
diff --git a/canvas/inc/canvas/parametricpolypolygon.hxx b/canvas/inc/canvas/parametricpolypolygon.hxx
index aac98a67a713..56f3daac684c 100644
--- a/canvas/inc/canvas/parametricpolypolygon.hxx
+++ b/canvas/inc/canvas/parametricpolypolygon.hxx
@@ -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
@@ -51,7 +51,7 @@ namespace canvas
     typedef ::cppu::WeakComponentImplHelper2< ::com::sun::star::rendering::XParametricPolyPolygon2D,
                                                    ::com::sun::star::lang::XServiceInfo > ParametricPolyPolygon_Base;
 
-    class ParametricPolyPolygon : public ::comphelper::OBaseMutex,
+    class ParametricPolyPolygon : public ::comphelper::OBaseMutex, 
                                   public ParametricPolyPolygon_Base,
                                   private ::boost::noncopyable
     {
@@ -71,8 +71,8 @@ namespace canvas
         struct Values
         {
             Values( const ::basegfx::B2DPolygon&                        rGradientPoly,
-                    const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< double > >& rColors,
-                    const ::com::sun::star::uno::Sequence< double >&    rStops,
+                    const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< double > >&	rColors,
+                    const ::com::sun::star::uno::Sequence< double >&	rStops,
                     double                                              nAspectRatio,
                     GradientType                                        eType ) :
                 maGradientPoly( rGradientPoly ),
@@ -84,23 +84,23 @@ namespace canvas
             }
 
             /// Polygonal gradient shape (ignored for linear and axial gradient)
-            const ::basegfx::B2DPolygon                         maGradientPoly;
+            const ::basegfx::B2DPolygon							maGradientPoly;
 
             /// Aspect ratio of gradient, affects scaling of innermost gradient polygon
-            const double                                        mnAspectRatio;
+            const double										mnAspectRatio;
 
             /// Gradient colors
-            const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< double > >      maColors;
+            const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< double > >		maColors;
 
             /// Gradient color stops
-            const ::com::sun::star::uno::Sequence< double >     maStops;
+            const ::com::sun::star::uno::Sequence< double >		maStops;
 
             /// Type of gradient to render (as e.g. linear grads are not represented by maGradientPoly)
-            const GradientType                                  meType;
+            const GradientType									meType;
         };
 
         static ::com::sun::star::uno::Sequence< ::rtl::OUString > getAvailableServiceNames();
-        static ParametricPolyPolygon* create(
+        static ParametricPolyPolygon* create( 
             const ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XGraphicDevice >& rDevice,
             const ::rtl::OUString& rServiceName,
             const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& rArgs );
@@ -121,49 +121,49 @@ namespace canvas
 
         /// Query all defining values of this object atomically
         Values getValues() const;
-
+        
     protected:
         ~ParametricPolyPolygon(); // we're a ref-counted UNO class. _We_ destroy ourselves.
 
     private:
-        static ParametricPolyPolygon* createLinearHorizontalGradient( const ::com::sun::star::uno::Reference<
-                                                                         ::com::sun::star::rendering::XGraphicDevice >& rDevice,
-                                                                      const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< double > >& colors,
+        static ParametricPolyPolygon* createLinearHorizontalGradient( const ::com::sun::star::uno::Reference< 
+                                                                         ::com::sun::star::rendering::XGraphicDevice >& rDevice,  
+                                                                      const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< double > >& colors, 
                                                                       const ::com::sun::star::uno::Sequence< double >& stops );
-        static ParametricPolyPolygon* createEllipticalGradient( const ::com::sun::star::uno::Reference<
-                                                                   ::com::sun::star::rendering::XGraphicDevice >& rDevice,
+        static ParametricPolyPolygon* createEllipticalGradient( const ::com::sun::star::uno::Reference< 
+                                                                   ::com::sun::star::rendering::XGraphicDevice >& rDevice,  
                                                                 const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< double > >& colors,
                                                                 const ::com::sun::star::uno::Sequence< double >& stops,
                                                                 double fAspect );
-        static ParametricPolyPolygon* createRectangularGradient( const ::com::sun::star::uno::Reference<
-                                                                    ::com::sun::star::rendering::XGraphicDevice >& rDevice,
+        static ParametricPolyPolygon* createRectangularGradient( const ::com::sun::star::uno::Reference< 
+                                                                    ::com::sun::star::rendering::XGraphicDevice >& rDevice,  
                                                                  const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< double > >& colors,
                                                                  const ::com::sun::star::uno::Sequence< double >& stops,
                                                                  double fAspect );
 
         /// Private, because objects can only be created from the static factories
-        ParametricPolyPolygon( const ::com::sun::star::uno::Reference<
-                                   ::com::sun::star::rendering::XGraphicDevice >&   rDevice,
-                               const ::basegfx::B2DPolygon&                     rGradientPoly,
-                               GradientType                                     eType,
-                               const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< double > >&  colors,
-                               const ::com::sun::star::uno::Sequence< double >&     stops );
-        ParametricPolyPolygon( const ::com::sun::star::uno::Reference<
-                                   ::com::sun::star::rendering::XGraphicDevice >&   rDevice,
-                               const ::basegfx::B2DPolygon&                     rGradientPoly,
-                               GradientType                                     eType,
-                               const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< double > >&  colors,
-                               const ::com::sun::star::uno::Sequence< double >&     stops,
-                               double                                           nAspectRatio );
-        ParametricPolyPolygon( const ::com::sun::star::uno::Reference<
-                                   ::com::sun::star::rendering::XGraphicDevice >&   rDevice,
-                               GradientType                                     eType,
-                               const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< double > >&  colors,
-                               const ::com::sun::star::uno::Sequence< double >&     stops );
-
-        ::com::sun::star::uno::Reference<
-            ::com::sun::star::rendering::XGraphicDevice >    mxDevice;
-
+        ParametricPolyPolygon( const ::com::sun::star::uno::Reference< 
+                                   ::com::sun::star::rendering::XGraphicDevice >& 	rDevice,  
+                               const ::basegfx::B2DPolygon& 					rGradientPoly,
+                               GradientType	  									eType,
+                               const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< double > >& 	colors,
+                               const ::com::sun::star::uno::Sequence< double >& 	stops );
+        ParametricPolyPolygon( const ::com::sun::star::uno::Reference< 
+                                   ::com::sun::star::rendering::XGraphicDevice >& 	rDevice,  
+                               const ::basegfx::B2DPolygon& 					rGradientPoly,
+                               GradientType	  									eType,
+                               const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< double > >& 	colors,
+                               const ::com::sun::star::uno::Sequence< double >& 	stops,
+                               double											nAspectRatio );
+        ParametricPolyPolygon( const ::com::sun::star::uno::Reference< 
+                                   ::com::sun::star::rendering::XGraphicDevice >& 	rDevice,
+                               GradientType	  									eType,
+                               const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< double > >& 	colors,
+                               const ::com::sun::star::uno::Sequence< double >& 	stops );
+
+        ::com::sun::star::uno::Reference< 
+            ::com::sun::star::rendering::XGraphicDevice > 	 mxDevice;
+                                                                      
         /// All defining values of this object
         const Values                                         maValues;
     };
diff --git a/canvas/inc/canvas/prioritybooster.hxx b/canvas/inc/canvas/prioritybooster.hxx
index 012c08138f4b..5234c32b7b81 100644
--- a/canvas/inc/canvas/prioritybooster.hxx
+++ b/canvas/inc/canvas/prioritybooster.hxx
@@ -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
diff --git a/canvas/inc/canvas/propertysethelper.hxx b/canvas/inc/canvas/propertysethelper.hxx
index 6d486d3fee83..3b9c06e18f70 100644
--- a/canvas/inc/canvas/propertysethelper.hxx
+++ b/canvas/inc/canvas/propertysethelper.hxx
@@ -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
@@ -140,16 +140,16 @@ namespace canvas
 
         // XPropertySet implementation
         ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > getPropertySetInfo() const;
-        void setPropertyValue( const ::rtl::OUString&            aPropertyName,
+        void setPropertyValue( const ::rtl::OUString&            aPropertyName, 
                                const ::com::sun::star::uno::Any& aValue );
         ::com::sun::star::uno::Any getPropertyValue( const ::rtl::OUString& PropertyName ) const;
-        void addPropertyChangeListener( const ::rtl::OUString& aPropertyName,
+        void addPropertyChangeListener( const ::rtl::OUString& aPropertyName, 
                                         const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener );
-        void removePropertyChangeListener( const ::rtl::OUString& aPropertyName,
+        void removePropertyChangeListener( const ::rtl::OUString& aPropertyName, 
                                            const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener );
-        void addVetoableChangeListener( const ::rtl::OUString& aPropertyName,
+        void addVetoableChangeListener( const ::rtl::OUString& aPropertyName, 
                                         const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& xListener );
-        void removeVetoableChangeListener( const ::rtl::OUString& aPropertyName,
+        void removeVetoableChangeListener( const ::rtl::OUString& aPropertyName, 
                                            const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& xListener );
 
     private:
diff --git a/canvas/inc/canvas/rendering/bitmap.hxx b/canvas/inc/canvas/rendering/bitmap.hxx
index 4051e7b14408..2afb4b84adad 100644
--- a/canvas/inc/canvas/rendering/bitmap.hxx
+++ b/canvas/inc/canvas/rendering/bitmap.hxx
@@ -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
@@ -87,22 +87,22 @@ namespace canvas
         ::basegfx::B2IVector getSize() const;
 
         ::com::sun::star::uno::Sequence< sal_Int8 > getData(
-            ::com::sun::star::rendering::IntegerBitmapLayout&       bitmapLayout,
-            const ::com::sun::star::geometry::IntegerRectangle2D&   rect );
+            ::com::sun::star::rendering::IntegerBitmapLayout&		bitmapLayout,
+            const ::com::sun::star::geometry::IntegerRectangle2D&	rect );
 
         void setData(
-            const ::com::sun::star::uno::Sequence< sal_Int8 >&      data,
+            const ::com::sun::star::uno::Sequence< sal_Int8 >&		data, 
             const ::com::sun::star::rendering::IntegerBitmapLayout& bitmapLayout,
-            const ::com::sun::star::geometry::IntegerRectangle2D&   rect );
+            const ::com::sun::star::geometry::IntegerRectangle2D&	rect );
 
         void setPixel(
-            const ::com::sun::star::uno::Sequence< sal_Int8 >&      color,
+            const ::com::sun::star::uno::Sequence< sal_Int8 >&		color, 
             const ::com::sun::star::rendering::IntegerBitmapLayout& bitmapLayout,
-            const ::com::sun::star::geometry::IntegerPoint2D&       pos );
+            const ::com::sun::star::geometry::IntegerPoint2D&		pos );
 
         ::com::sun::star::uno::Sequence< sal_Int8 > getPixel(
-            ::com::sun::star::rendering::IntegerBitmapLayout&       bitmapLayout,
-            const ::com::sun::star::geometry::IntegerPoint2D&       pos );
+            ::com::sun::star::rendering::IntegerBitmapLayout&		bitmapLayout,
+            const ::com::sun::star::geometry::IntegerPoint2D&		pos );
 
         /** Render the bitmap content to associated
             SurfaceProxyManager's screen.
@@ -112,7 +112,7 @@ namespace canvas
 
             @param rPos
             Output position
-
+            
             @param rTransform
             Output transformation (does not affect output position)
          */
@@ -128,12 +128,12 @@ namespace canvas
 
             @param rPos
             Output position
-
+            
             @param rArea
             Subset of the surface to render. Coordinate system are
             surface area pixel, given area will be clipped to the
             surface bounds.
-
+            
             @param rTransform
             Output transformation (does not affect output position)
          */
@@ -141,7 +141,7 @@ namespace canvas
                    const ::basegfx::B2DPoint&     rPos,
                    const ::basegfx::B2DRange&     rArea,
                    const ::basegfx::B2DHomMatrix& rTransform );
-
+        
         /** Render the bitmap content to associated
             SurfaceProxyManager's screen.
 
@@ -150,11 +150,11 @@ namespace canvas
 
             @param rPos
             Output position
-
+            
             @param rClipPoly
             Clip polygon for the surface. The clip polygon is also
             subject to the output transformation.
-
+            
             @param rTransform
             Output transformation (does not affect output position)
          */
@@ -170,42 +170,42 @@ namespace canvas
          */
         void clear( const ::com::sun::star::uno::Sequence< double >& color );
 
-        void fillB2DPolyPolygon(
-            const ::basegfx::B2DPolyPolygon&                    rPolyPolygon,
-            const ::com::sun::star::rendering::ViewState&       viewState,
-            const ::com::sun::star::rendering::RenderState&     renderState );
+        void fillB2DPolyPolygon( 
+            const ::basegfx::B2DPolyPolygon&                    rPolyPolygon, 
+            const ::com::sun::star::rendering::ViewState& 		viewState, 
+            const ::com::sun::star::rendering::RenderState& 	renderState );
 
 
         // High-level drawing operations (from the XCanvas interface)
         // ==========================================================
 
         /// See XCanvas interface
-        void drawPoint( const ::com::sun::star::geometry::RealPoint2D&      aPoint,
-                        const ::com::sun::star::rendering::ViewState&       viewState,
-                        const ::com::sun::star::rendering::RenderState&     renderState );
+        void drawPoint( const ::com::sun::star::geometry::RealPoint2D& 		aPoint, 
+                        const ::com::sun::star::rendering::ViewState& 		viewState, 
+                        const ::com::sun::star::rendering::RenderState& 	renderState );
         /// See XCanvas interface
-        void drawLine( const ::com::sun::star::geometry::RealPoint2D&   aStartPoint,
-                       const ::com::sun::star::geometry::RealPoint2D&   aEndPoint,
-                       const ::com::sun::star::rendering::ViewState&    viewState,
-                       const ::com::sun::star::rendering::RenderState&  renderState );
+        void drawLine( const ::com::sun::star::geometry::RealPoint2D& 	aStartPoint, 
+                       const ::com::sun::star::geometry::RealPoint2D& 	aEndPoint, 
+                       const ::com::sun::star::rendering::ViewState& 	viewState, 
+                       const ::com::sun::star::rendering::RenderState& 	renderState	);
         /// See XCanvas interface
-        void drawBezier( const ::com::sun::star::geometry::RealBezierSegment2D& aBezierSegment,
-                         const ::com::sun::star::geometry::RealPoint2D&         aEndPoint,
-                         const ::com::sun::star::rendering::ViewState&          viewState,
-                         const ::com::sun::star::rendering::RenderState&        renderState );
+        void drawBezier( const ::com::sun::star::geometry::RealBezierSegment2D&	aBezierSegment, 
+                         const ::com::sun::star::geometry::RealPoint2D& 		aEndPoint,
+                         const ::com::sun::star::rendering::ViewState& 			viewState, 
+                         const ::com::sun::star::rendering::RenderState& 		renderState );
         /// See XCanvas interface
-        ICachedPrimitiveSharedPtr drawPolyPolygon(
-            const ::com::sun::star::uno::Reference<
-                  ::com::sun::star::rendering::XPolyPolygon2D >&    xPolyPolygon,
-            const ::com::sun::star::rendering::ViewState&           viewState,
+        ICachedPrimitiveSharedPtr drawPolyPolygon( 
+            const ::com::sun::star::uno::Reference< 
+                  ::com::sun::star::rendering::XPolyPolygon2D >& 	xPolyPolygon, 
+            const ::com::sun::star::rendering::ViewState&           viewState, 
             const ::com::sun::star::rendering::RenderState&         renderState );
 
         /// See XCanvas interface
-        ICachedPrimitiveSharedPtr strokePolyPolygon(
-            const ::com::sun::star::uno::Reference<
-                  ::com::sun::star::rendering::XPolyPolygon2D >&    xPolyPolygon,
-            const ::com::sun::star::rendering::ViewState&           viewState,
-            const ::com::sun::star::rendering::RenderState&         renderState,
+        ICachedPrimitiveSharedPtr strokePolyPolygon( 
+            const ::com::sun::star::uno::Reference< 
+                  ::com::sun::star::rendering::XPolyPolygon2D >& 	xPolyPolygon, 
+            const ::com::sun::star::rendering::ViewState&           viewState, 
+            const ::com::sun::star::rendering::RenderState& 		renderState, 
             const ::com::sun::star::rendering::StrokeAttributes&    strokeAttributes );
         /** See XCanvas interface
 
@@ -215,14 +215,14 @@ namespace canvas
             sequence. This is to decouple this interface from the
             client's XBitmap-implementation class.
          */
-        ICachedPrimitiveSharedPtr strokeTexturedPolyPolygon(
-            const ::com::sun::star::uno::Reference<
-                  ::com::sun::star::rendering::XPolyPolygon2D >&    xPolyPolygon,
-            const ::com::sun::star::rendering::ViewState&           viewState,
-            const ::com::sun::star::rendering::RenderState&         renderState,
-            const ::com::sun::star::uno::Sequence<
+        ICachedPrimitiveSharedPtr strokeTexturedPolyPolygon( 
+            const ::com::sun::star::uno::Reference< 
+                  ::com::sun::star::rendering::XPolyPolygon2D >& 	xPolyPolygon, 
+            const ::com::sun::star::rendering::ViewState&           viewState, 
+            const ::com::sun::star::rendering::RenderState& 		renderState, 
+            const ::com::sun::star::uno::Sequence< 
                   ::com::sun::star::rendering::Texture >&           textures,
-            const ::std::vector< ::boost::shared_ptr<Bitmap> >&     textureAnnotations,
+            const ::std::vector< ::boost::shared_ptr<Bitmap> >&     textureAnnotations, 
             const ::com::sun::star::rendering::StrokeAttributes&    strokeAttributes );
         /** See XCanvas interface
 
@@ -232,23 +232,23 @@ namespace canvas
             sequence. This is to decouple this interface from the
             client's XBitmap-implementation class.
          */
-        ICachedPrimitiveSharedPtr strokeTextureMappedPolyPolygon(
-            const ::com::sun::star::uno::Reference<
-                  ::com::sun::star::rendering::XPolyPolygon2D >&    xPolyPolygon,
-            const ::com::sun::star::rendering::ViewState&           viewState,
-            const ::com::sun::star::rendering::RenderState&         renderState,
-            const ::com::sun::star::uno::Sequence<
+        ICachedPrimitiveSharedPtr strokeTextureMappedPolyPolygon( 
+            const ::com::sun::star::uno::Reference< 
+                  ::com::sun::star::rendering::XPolyPolygon2D >& 	xPolyPolygon, 
+            const ::com::sun::star::rendering::ViewState& 			viewState, 
+            const ::com::sun::star::rendering::RenderState& 		renderState, 
+            const ::com::sun::star::uno::Sequence< 
                   ::com::sun::star::rendering::Texture >&           textures,
-            const ::std::vector< ::boost::shared_ptr<Bitmap> >&     textureAnnotations,
-            const ::com::sun::star::uno::Reference<
-                  ::com::sun::star::geometry::XMapping2D >&         xMapping,
-            const ::com::sun::star::rendering::StrokeAttributes&    strokeAttributes );
+            const ::std::vector< ::boost::shared_ptr<Bitmap> >&     textureAnnotations, 
+            const ::com::sun::star::uno::Reference< 
+                  ::com::sun::star::geometry::XMapping2D >& 		xMapping, 
+            const ::com::sun::star::rendering::StrokeAttributes& 	strokeAttributes );
         /// See XCanvas interface
-        ICachedPrimitiveSharedPtr fillPolyPolygon(
-            const ::com::sun::star::uno::Reference<
-                  ::com::sun::star::rendering::XPolyPolygon2D >&    xPolyPolygon,
-            const ::com::sun::star::rendering::ViewState&           viewState,
-            const ::com::sun::star::rendering::RenderState&         renderState );
+        ICachedPrimitiveSharedPtr fillPolyPolygon( 
+            const ::com::sun::star::uno::Reference< 
+                  ::com::sun::star::rendering::XPolyPolygon2D >& 	xPolyPolygon, 
+            const ::com::sun::star::rendering::ViewState& 			viewState, 
+            const ::com::sun::star::rendering::RenderState& 		renderState );
         /** See XCanvas interface
 
             @param textureAnnotations
@@ -257,14 +257,14 @@ namespace canvas
             sequence. This is to decouple this interface from the
             client's XBitmap-implementation class.
          */
-        ICachedPrimitiveSharedPtr fillTexturedPolyPolygon(
-            const ::com::sun::star::uno::Reference<
-                  ::com::sun::star::rendering::XPolyPolygon2D >&    xPolyPolygon,
-            const ::com::sun::star::rendering::ViewState&           viewState,
-            const ::com::sun::star::rendering::RenderState&         renderState,
-            const ::com::sun::star::uno::Sequence<
+        ICachedPrimitiveSharedPtr fillTexturedPolyPolygon( 
+            const ::com::sun::star::uno::Reference< 
+                  ::com::sun::star::rendering::XPolyPolygon2D >&	xPolyPolygon, 
+            const ::com::sun::star::rendering::ViewState& 			viewState, 
+            const ::com::sun::star::rendering::RenderState& 		renderState, 
+            const ::com::sun::star::uno::Sequence< 
                   ::com::sun::star::rendering::Texture >&           textures,
-            const ::std::vector< ::boost::shared_ptr<Bitmap> >&     textureAnnotations );
+            const ::std::vector< ::boost::shared_ptr<Bitmap> >&     textureAnnotations ); 
         /** See XCanvas interface
 
             @param textureAnnotations
@@ -273,39 +273,39 @@ namespace canvas
             sequence. This is to decouple this interface from the
             client's XBitmap-implementation class.
          */
-        ICachedPrimitiveSharedPtr fillTextureMappedPolyPolygon(
-            const ::com::sun::star::uno::Reference<
-                  ::com::sun::star::rendering::XPolyPolygon2D >&    xPolyPolygon,
-            const ::com::sun::star::rendering::ViewState&           viewState,
-            const ::com::sun::star::rendering::RenderState&         renderState,
-            const ::com::sun::star::uno::Sequence<
+        ICachedPrimitiveSharedPtr fillTextureMappedPolyPolygon( 
+            const ::com::sun::star::uno::Reference< 
+                  ::com::sun::star::rendering::XPolyPolygon2D >& 	xPolyPolygon, 
+            const ::com::sun::star::rendering::ViewState&           viewState, 
+            const ::com::sun::star::rendering::RenderState& 		renderState, 
+            const ::com::sun::star::uno::Sequence< 
                   ::com::sun::star::rendering::Texture >&           textures,
             const ::std::vector< ::boost::shared_ptr<Bitmap> >&     textureAnnotations,
-            const ::com::sun::star::uno::Reference<
-                  ::com::sun::star::geometry::XMapping2D >&         xMapping );
+            const ::com::sun::star::uno::Reference< 
+                  ::com::sun::star::geometry::XMapping2D >& 		xMapping );
 
         /// See XCanvas interface
-        ICachedPrimitiveSharedPtr drawBitmap(
-            const ::com::sun::star::uno::Reference<
-                  ::com::sun::star::rendering::XBitmap >&   xBitmap,
-            const ::com::sun::star::rendering::ViewState&   viewState,
+        ICachedPrimitiveSharedPtr drawBitmap( 
+            const ::com::sun::star::uno::Reference< 
+                  ::com::sun::star::rendering::XBitmap >&   xBitmap, 
+            const ::com::sun::star::rendering::ViewState& 	viewState, 
             const ::com::sun::star::rendering::RenderState& renderState );
         /// See XCanvas interface
-        ICachedPrimitiveSharedPtr drawBitmap(
-            const ::boost::shared_ptr<Bitmap>&              rImage,
-            const ::com::sun::star::rendering::ViewState&   viewState,
+        ICachedPrimitiveSharedPtr drawBitmap( 
+            const ::boost::shared_ptr<Bitmap>&              rImage, 
+            const ::com::sun::star::rendering::ViewState& 	viewState, 
             const ::com::sun::star::rendering::RenderState& renderState );
 
         /// See XCanvas interface
-        ICachedPrimitiveSharedPtr drawBitmapModulated(
-            const ::com::sun::star::uno::Reference<
-                  ::com::sun::star::rendering::XBitmap >&       xBitmap,
-            const ::com::sun::star::rendering::ViewState&       viewState,
+        ICachedPrimitiveSharedPtr drawBitmapModulated( 
+            const ::com::sun::star::uno::Reference< 
+                  ::com::sun::star::rendering::XBitmap >&		xBitmap, 
+            const ::com::sun::star::rendering::ViewState& 		viewState, 
             const ::com::sun::star::rendering::RenderState&     renderState );
         /// See XCanvas interface
-        ICachedPrimitiveSharedPtr drawBitmapModulated(
-            const ::boost::shared_ptr<Bitmap>&                  rImage,
-            const ::com::sun::star::rendering::ViewState&       viewState,
+        ICachedPrimitiveSharedPtr drawBitmapModulated( 
+            const ::boost::shared_ptr<Bitmap>&                  rImage, 
+            const ::com::sun::star::rendering::ViewState& 		viewState, 
             const ::com::sun::star::rendering::RenderState&     renderState );
 
     private:
diff --git a/canvas/inc/canvas/rendering/icachedprimitive.hxx b/canvas/inc/canvas/rendering/icachedprimitive.hxx
index d138770bf1c5..66f04ffab0e5 100644
--- a/canvas/inc/canvas/rendering/icachedprimitive.hxx
+++ b/canvas/inc/canvas/rendering/icachedprimitive.hxx
@@ -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
diff --git a/canvas/inc/canvas/rendering/icolorbuffer.hxx b/canvas/inc/canvas/rendering/icolorbuffer.hxx
index d48a52ca5e09..9f40a99812a7 100644
--- a/canvas/inc/canvas/rendering/icolorbuffer.hxx
+++ b/canvas/inc/canvas/rendering/icolorbuffer.hxx
@@ -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
@@ -40,23 +40,23 @@ namespace canvas
         Use this interface to represent a surface of raw pixel (e.g. a
         bitmap) to the canvas rendering framework.
      */
-    struct IColorBuffer
+    struct IColorBuffer 
     {
         /// The underlying pixel format for this buffer
         enum Format
         {
-            // 24-bit RGB pixel format, 8 bits per channel.
+            // 24-bit RGB pixel format, 8 bits per channel. 
             FMT_R8G8B8,
-
-            // 32-bit ARGB pixel format with alpha, 8 bits per channel.
+            
+            // 32-bit ARGB pixel format with alpha, 8 bits per channel. 
             FMT_A8R8G8B8,
-
-            // 32-bit RGB pixel format, 8 bits per channel.
+            
+            // 32-bit RGB pixel format, 8 bits per channel. 
             FMT_X8R8G8B8,
-
-            // for enum to 32bit
+            
+            // for enum to 32bit    
             FMT_UNKNOWN = static_cast<sal_uInt32>(-1)
-        };
+        }; 
 
         virtual ~IColorBuffer() {}
 
diff --git a/canvas/inc/canvas/rendering/irendermodule.hxx b/canvas/inc/canvas/rendering/irendermodule.hxx
index 153112bcf08b..3c959f7eb322 100644
--- a/canvas/inc/canvas/rendering/irendermodule.hxx
+++ b/canvas/inc/canvas/rendering/irendermodule.hxx
@@ -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
diff --git a/canvas/inc/canvas/rendering/isurface.hxx b/canvas/inc/canvas/rendering/isurface.hxx
index dea980e7c179..fc85a18ac22b 100644
--- a/canvas/inc/canvas/rendering/isurface.hxx
+++ b/canvas/inc/canvas/rendering/isurface.hxx
@@ -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
diff --git a/canvas/inc/canvas/rendering/isurfaceproxy.hxx b/canvas/inc/canvas/rendering/isurfaceproxy.hxx
index 90addf75a8f9..0363a29a269c 100644
--- a/canvas/inc/canvas/rendering/isurfaceproxy.hxx
+++ b/canvas/inc/canvas/rendering/isurfaceproxy.hxx
@@ -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
@@ -46,7 +46,7 @@ namespace canvas
     {
         virtual ~ISurfaceProxy() {}
 
-        /** Notify the proxy that the color buffer has changed
+        /** Notify the proxy that the color buffer has changed   
          */
         virtual void setColorBufferDirty() = 0;
 
@@ -57,7 +57,7 @@ namespace canvas
 
             @param rPos
             Output position
-
+            
             @param rTransform
             Output transformation (does not affect output position)
          */
@@ -72,12 +72,12 @@ namespace canvas
 
             @param rPos
             Output position
-
+            
             @param rArea
             Subset of the surface to render. Coordinate system are
             surface area pixel, given area will be clipped to the
             surface bounds.
-
+            
             @param rTransform
             Output transformation (does not affect output position)
          */
@@ -85,7 +85,7 @@ namespace canvas
                            const ::basegfx::B2DPoint&     rPos,
                            const ::basegfx::B2DRange&     rArea,
                            const ::basegfx::B2DHomMatrix& rTransform ) = 0;
-
+        
         /** Render the surface content to screen.
 
             @param fAlpha
@@ -93,11 +93,11 @@ namespace canvas
 
             @param rPos
             Output position
-
+            
             @param rClipPoly
             Clip polygon for the surface. The clip polygon is also
             subject to the output transformation.
-
+            
             @param rTransform
             Output transformation (does not affect output position)
          */
diff --git a/canvas/inc/canvas/rendering/isurfaceproxymanager.hxx b/canvas/inc/canvas/rendering/isurfaceproxymanager.hxx
index 64eaca155d87..742803df5746 100644
--- a/canvas/inc/canvas/rendering/isurfaceproxymanager.hxx
+++ b/canvas/inc/canvas/rendering/isurfaceproxymanager.hxx
@@ -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
@@ -64,7 +64,7 @@ namespace canvas
             Internally this texture may even be distributed to several
             real hardware surfaces.
         */
-        virtual ::boost::shared_ptr< ISurfaceProxy > createSurfaceProxy(
+        virtual ::boost::shared_ptr< ISurfaceProxy > createSurfaceProxy( 
             const IColorBufferSharedPtr& pBuffer ) const = 0;
     };
 
diff --git a/canvas/inc/canvas/spriteredrawmanager.hxx b/canvas/inc/canvas/spriteredrawmanager.hxx
index 41809a84272b..9654979a7190 100644
--- a/canvas/inc/canvas/spriteredrawmanager.hxx
+++ b/canvas/inc/canvas/spriteredrawmanager.hxx
@@ -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
@@ -55,7 +55,7 @@ namespace canvas
         events are later grouped by connected areas (i.e. all sprites
         that somehow overlap over a rectangular area are grouped
         together); the forEachSpriteArea() method calls the passed
-        functor for each of those connected areas.
+        functor for each of those connected areas. 
 
         Note that, although this class generally works with IEEE
         doubles, the calculation of connected areas happens in the
@@ -64,7 +64,7 @@ namespace canvas
         artifacts. Therefore, sprites that touch the same pixel (but
         don't necessarily have the same floating point coordinates
         there) will reside in a common sprite area and handled
-        together in the forEachSpriteArea functor call.
+        together in the forEachSpriteArea functor call. 
      */
     class SpriteRedrawManager : private ::boost::noncopyable
     {
@@ -91,9 +91,9 @@ namespace canvas
 
                 @internal
              */
-            SpriteInfo( const Sprite::Reference&    rRef,
-                        const ::basegfx::B2DRange&  rTrueUpdateArea,
-                        bool                        bNeedsUpdate ) :
+            SpriteInfo( const Sprite::Reference& 	rRef,
+                        const ::basegfx::B2DRange&	rTrueUpdateArea,
+                        bool 					 	bNeedsUpdate ) :
                 mpSprite( rRef ),
                 maTrueUpdateArea( rTrueUpdateArea ),
                 mbNeedsUpdate( bNeedsUpdate ),
@@ -120,10 +120,10 @@ namespace canvas
 
                 @internal
              */
-            SpriteInfo( const Sprite::Reference&    rRef,
-                        const ::basegfx::B2DRange&  rTrueUpdateArea,
-                        bool                        bNeedsUpdate,
-                        bool                        bIsPureMove ) :
+            SpriteInfo( const Sprite::Reference& 	rRef,
+                        const ::basegfx::B2DRange&	rTrueUpdateArea,
+                        bool 					 	bNeedsUpdate,
+                        bool 					 	bIsPureMove ) :
                 mpSprite( rRef ),
                 maTrueUpdateArea( rTrueUpdateArea ),
                 mbNeedsUpdate( bNeedsUpdate ),
@@ -131,18 +131,18 @@ namespace canvas
             {
             }
 
-            const Sprite::Reference&    getSprite() const { return mpSprite; }
+            const Sprite::Reference&	getSprite() const { return mpSprite; }
 
             // #i61843# need to return by value here, to be used safely from bind
             ::basegfx::B2DRange         getUpdateArea() const { return maTrueUpdateArea; }
-            bool                        needsUpdate() const { return mbNeedsUpdate; }
-            bool                        isPureMove() const { return mbIsPureMove; }
+            bool						needsUpdate() const { return mbNeedsUpdate; }
+            bool						isPureMove() const { return mbIsPureMove; }
 
         private:
-            Sprite::Reference       mpSprite;
-            ::basegfx::B2DRange     maTrueUpdateArea;
-            bool                    mbNeedsUpdate;
-            bool                    mbIsPureMove;
+            Sprite::Reference 		mpSprite;
+            ::basegfx::B2DRange		maTrueUpdateArea;
+            bool					mbNeedsUpdate;
+            bool 					mbIsPureMove;
         };
 
 
@@ -163,10 +163,10 @@ namespace canvas
             {
             }
 
-            SpriteChangeRecord( const Sprite::Reference&    rSprite,
-                                const ::basegfx::B2DPoint&  rOldPos,
-                                const ::basegfx::B2DPoint&  rNewPos,
-                                const ::basegfx::B2DVector& rSpriteSize ) :
+            SpriteChangeRecord( const Sprite::Reference&	rSprite, 
+                                const ::basegfx::B2DPoint& 	rOldPos,
+                                const ::basegfx::B2DPoint& 	rNewPos,
+                                const ::basegfx::B2DVector&	rSpriteSize ) :
                 meChangeType( move ),
                 mpAffectedSprite( rSprite ),
                 maOldPos( rOldPos ),
@@ -177,9 +177,9 @@ namespace canvas
             {
             }
 
-            SpriteChangeRecord( const Sprite::Reference&    rSprite,
-                                const ::basegfx::B2DPoint&  rPos,
-                                const ::basegfx::B2DRange&  rUpdateArea ) :
+            SpriteChangeRecord( const Sprite::Reference&	rSprite, 
+                                const ::basegfx::B2DPoint& 	rPos,
+                                const ::basegfx::B2DRange& 	rUpdateArea ) :
                 meChangeType( update ),
                 mpAffectedSprite( rSprite ),
                 maOldPos( rPos ),
@@ -189,17 +189,17 @@ namespace canvas
 
             Sprite::Reference getSprite() const { return mpAffectedSprite; }
 
-            ChangeType          meChangeType;
-            Sprite::Reference   mpAffectedSprite;
-            ::basegfx::B2DPoint maOldPos;
-            ::basegfx::B2DRange maUpdateArea;
+            ChangeType			meChangeType;
+            Sprite::Reference	mpAffectedSprite;
+            ::basegfx::B2DPoint	maOldPos;
+            ::basegfx::B2DRange	maUpdateArea;
         };
 
-        typedef ::std::vector< SpriteChangeRecord >             VectorOfChangeRecords;
-        typedef ::std::list< Sprite::Reference >                ListOfSprites;
-        typedef ::basegfx::B2DConnectedRanges< SpriteInfo >     SpriteConnectedRanges;
-        typedef SpriteConnectedRanges::ComponentType            AreaComponent;
-        typedef SpriteConnectedRanges::ConnectedComponents      UpdateArea;
+        typedef ::std::vector< SpriteChangeRecord > 			VectorOfChangeRecords;
+        typedef ::std::list< Sprite::Reference > 				ListOfSprites;
+        typedef ::basegfx::B2DConnectedRanges< SpriteInfo >		SpriteConnectedRanges;
+        typedef SpriteConnectedRanges::ComponentType			AreaComponent;
+        typedef SpriteConnectedRanges::ConnectedComponents		UpdateArea;
         typedef ::std::vector< Sprite::Reference >              VectorOfSprites;
 
         SpriteRedrawManager();
@@ -213,8 +213,8 @@ namespace canvas
          */
         template< typename Functor > struct AreaUpdateCaller
         {
-            AreaUpdateCaller( Functor&                      rFunc,
-                              const SpriteRedrawManager&    rManager ) :
+            AreaUpdateCaller( Functor& 						rFunc,
+                              const SpriteRedrawManager&	rManager ) :
                 mrFunc( rFunc ),
                 mrManager( rManager )
             {
@@ -225,8 +225,8 @@ namespace canvas
                 mrManager.handleArea( mrFunc, rUpdateArea );
             }
 
-            Functor&                    mrFunc;
-            const SpriteRedrawManager&  mrManager;
+            Functor& 					mrFunc;
+            const SpriteRedrawManager&	mrManager;
         };
 
         /** Call given functor for each sprite area that needs an
@@ -241,7 +241,7 @@ namespace canvas
             void backgroundPaint( ::basegfx::B2DRange aUpdateRect );
             void scrollUpdate( ::basegfx::B2DRange& o_rMoveStart,
                                ::basegfx::B2DRange& o_rMoveEnd,
-                               UpdateArea           aUpdateArea );
+                               UpdateArea 		  	aUpdateArea );
             void opaqueUpdate( const ::basegfx::B2DRange&                          rTotalArea,
                                const ::std::vector< ::canvas::Sprite::Reference >& rSortedUpdateSprites );
             void genericUpdate( const ::basegfx::B2DRange&                          rTotalArea,
@@ -262,7 +262,7 @@ namespace canvas
 
             setupUpdateAreas( aUpdateAreas );
 
-            aUpdateAreas.forEachAggregate(
+            aUpdateAreas.forEachAggregate( 
                 AreaUpdateCaller< Functor >( rFunc, *this ) );
         }
 
@@ -288,13 +288,13 @@ namespace canvas
         // SpriteSurface interface, is delegated to e.g. from SpriteCanvas
         void showSprite( const Sprite::Reference& rSprite );
         void hideSprite( const Sprite::Reference& rSprite );
-        void moveSprite( const Sprite::Reference&       rSprite,
-                         const ::basegfx::B2DPoint&     rOldPos,
-                         const ::basegfx::B2DPoint&     rNewPos,
-                         const ::basegfx::B2DVector&    rSpriteSize );
-        void updateSprite( const Sprite::Reference&     rSprite,
-                           const ::basegfx::B2DPoint&   rPos,
-                           const ::basegfx::B2DRange&   rUpdateArea );
+        void moveSprite( const Sprite::Reference&		rSprite, 
+                         const ::basegfx::B2DPoint& 	rOldPos,
+                         const ::basegfx::B2DPoint&		rNewPos,
+                         const ::basegfx::B2DVector& 	rSpriteSize );
+        void updateSprite( const Sprite::Reference& 	rSprite, 
+                           const ::basegfx::B2DPoint& 	rPos,
+                           const ::basegfx::B2DRange&	rUpdateArea );
 
         /** Internal, handles each distinct component for forEachAggregate()
 
@@ -303,8 +303,8 @@ namespace canvas
 
             @internal
          */
-        template< typename Functor > void handleArea( Functor&          rFunc,
-                                                      const UpdateArea& rUpdateArea ) const
+        template< typename Functor > void handleArea( Functor& 			rFunc,
+                                                      const UpdateArea&	rUpdateArea ) const
         {
             // check whether this area contains changed sprites at all
             // (if not, just ignore it)
@@ -326,7 +326,7 @@ namespace canvas
                     // cache number of sprites in this area (it's a
                     // list, and both isAreaUpdateScroll() and
                     // isAreaUpdateOpaque() need it).
-                    const ::std::size_t nNumSprites(
+                    const ::std::size_t nNumSprites( 
                         rUpdateArea.maComponentList.size() );
 
                     if( isAreaUpdateScroll( aMoveStart,
@@ -334,15 +334,15 @@ namespace canvas
                                             rUpdateArea,
                                             nNumSprites ) )
                     {
-                        rFunc.scrollUpdate( aMoveStart,
+                        rFunc.scrollUpdate( aMoveStart, 
                                             aMoveEnd,
                                             rUpdateArea );
                     }
-                    else
+                    else 
                     {
-                        // potentially, more than a single sprite
-                        // involved. Have to sort component lists for
-                        // sprite prio.
+                        // potentially, more than a single sprite   
+                        // involved. Have to sort component lists for   
+                        // sprite prio. 
                         VectorOfSprites aSortedUpdateSprites;
                         SpriteConnectedRanges::ComponentListType::const_iterator aCurr(
                             rUpdateArea.maComponentList.begin() );
@@ -360,12 +360,12 @@ namespace canvas
                         ::std::sort( aSortedUpdateSprites.begin(),
                                      aSortedUpdateSprites.end(),
                                      SpriteComparator() );
-
+                        
                         if( isAreaUpdateOpaque( rUpdateArea,
                                                 nNumSprites ) )
                         {
                             rFunc.opaqueUpdate( rUpdateArea.maTotalBounds,
-                                                aSortedUpdateSprites );
+                                                aSortedUpdateSprites );                    
                         }
                         else
                         {
@@ -385,11 +385,11 @@ namespace canvas
 
         bool areSpritesChanged( const UpdateArea& rUpdateArea ) const;
 
-        bool isAreaUpdateNotOpaque( const ::basegfx::B2DRange&  rUpdateRect,
-                                    const AreaComponent&        rComponent ) const;
+        bool isAreaUpdateNotOpaque( const ::basegfx::B2DRange&	rUpdateRect, 
+                                    const AreaComponent&		rComponent ) const;
 
-        bool isAreaUpdateOpaque( const UpdateArea&  rUpdateArea,
-                                 ::std::size_t      nNumSprites ) const;
+        bool isAreaUpdateOpaque( const UpdateArea&	rUpdateArea,
+                                 ::std::size_t		nNumSprites ) const;
 
         /** Check whether given update area can be handled by a simple
             scroll
@@ -404,13 +404,13 @@ namespace canvas
             @param rUpdateArea
             Area to check for scroll update optimization
          */
-        bool isAreaUpdateScroll( ::basegfx::B2DRange&   o_rMoveStart,
-                                 ::basegfx::B2DRange&   o_rMoveEnd,
-                                 const UpdateArea&      rUpdateArea,
-                                 ::std::size_t          nNumSprites ) const;
+        bool isAreaUpdateScroll( ::basegfx::B2DRange& 	o_rMoveStart,
+                                 ::basegfx::B2DRange& 	o_rMoveEnd,
+                                 const UpdateArea& 		rUpdateArea,
+                                 ::std::size_t			nNumSprites ) const;
 
 
-        ListOfSprites                   maSprites; // list of active
+        ListOfSprites					maSprites; // list of active
                                                    // sprite
                                                    // objects. this
                                                    // list is only
@@ -422,7 +422,7 @@ namespace canvas
                                                    // itself to notify
                                                    // us.
 
-        VectorOfChangeRecords           maChangeRecords; // vector of
+        VectorOfChangeRecords			maChangeRecords; // vector of
                                                          // sprites
                                                          // changes
                                                          // since last
diff --git a/canvas/inc/canvas/vclwrapper.hxx b/canvas/inc/canvas/vclwrapper.hxx
index c8b404a02b06..4e53179d6c73 100644
--- a/canvas/inc/canvas/vclwrapper.hxx
+++ b/canvas/inc/canvas/vclwrapper.hxx
@@ -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
@@ -119,19 +119,19 @@ namespace canvas
                 // This here is the whole purpose of the template:
                 // protecting object deletion with the solar mutex
                 ::vos::OGuard aGuard( Application::GetSolarMutex() );
-
+                
                 if( mpWrappee )
                     delete mpWrappee;
             }
 
-            Wrappee*        operator->() { return mpWrappee; }
-            const Wrappee*  operator->() const { return mpWrappee; }
+            Wrappee* 		operator->() { return mpWrappee; }
+            const Wrappee* 	operator->() const { return mpWrappee; }
 
-            Wrappee&        operator*() { return *mpWrappee; }
-            const Wrappee&  operator*() const { return *mpWrappee; }
+            Wrappee& 		operator*() { return *mpWrappee; }
+            const Wrappee& 	operator*() const { return *mpWrappee; }
 
-            Wrappee&        get() { return *mpWrappee; }
-            const Wrappee&  get() const { return *mpWrappee; }
+            Wrappee& 		get() { return *mpWrappee; }
+            const Wrappee& 	get() const { return *mpWrappee; }
 
             void swap( VCLObject& rOther )
             {
@@ -139,8 +139,8 @@ namespace canvas
             }
 
         private:
-
-            Wrappee* mpWrappee;
+        
+            Wrappee* mpWrappee;            
         };
 
     }
diff --git a/canvas/inc/canvas/verbosetrace.hxx b/canvas/inc/canvas/verbosetrace.hxx
index ad3d736b49f7..2dd36226c017 100644
--- a/canvas/inc/canvas/verbosetrace.hxx
+++ b/canvas/inc/canvas/verbosetrace.hxx
@@ -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
@@ -32,7 +32,7 @@
 /// Wrap OSL_TRACE with a verbosity switch
 #define VERBOSE_TRACE     OSL_TRACE
 #else
-#define VERBOSE_TRACE     1 ? ((void)0) : OSL_TRACE
+#define VERBOSE_TRACE	  1 ? ((void)0) : OSL_TRACE
 #endif
 
 #endif /* INCLUDED_CANVAS_VERBOSETRACE_HXX */
diff --git a/canvas/inc/canvas/verifyinput.hxx b/canvas/inc/canvas/verifyinput.hxx
index d9bd3f88233f..6292a7a1234e 100644
--- a/canvas/inc/canvas/verifyinput.hxx
+++ b/canvas/inc/canvas/verifyinput.hxx
@@ -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
@@ -39,7 +39,7 @@
 #include <boost/current_function.hpp>
 
 
-namespace com { namespace sun { namespace star { namespace geometry
+namespace com { namespace sun { namespace star { namespace geometry 
 {
     struct RealPoint2D;
     struct RealSize2D;
@@ -52,7 +52,7 @@ namespace com { namespace sun { namespace star { namespace geometry
     struct IntegerRectangle2D;
 } } } }
 
-namespace com { namespace sun { namespace star { namespace rendering
+namespace com { namespace sun { namespace star { namespace rendering 
 {
     struct RenderState;
     struct StrokeAttributes;
@@ -95,11 +95,11 @@ namespace canvas
 
             @throws an lang::IllegalArgumentException, if anything is wrong
          */
-        void verifyInput( const ::com::sun::star::geometry::AffineMatrix2D& rMatrix,
-                          const char*                                       pStr,
-                          const ::com::sun::star::uno::Reference<
-                              ::com::sun::star::uno::XInterface >&          xIf,
-                          ::sal_Int16                                       nArgPos );
+        void verifyInput( const ::com::sun::star::geometry::AffineMatrix2D&	rMatrix,
+                          const char*										pStr,
+                          const ::com::sun::star::uno::Reference< 
+                              ::com::sun::star::uno::XInterface >&			xIf,
+                          ::sal_Int16										nArgPos );
 
         /** Verify that the given transformation contains valid floating point
             values.
@@ -118,11 +118,11 @@ namespace canvas
 
             @throws an lang::IllegalArgumentException, if anything is wrong
          */
-        void verifyInput( const ::com::sun::star::geometry::Matrix2D&   rMatrix,
-                          const char*                                   pStr,
-                          const ::com::sun::star::uno::Reference<
-                              ::com::sun::star::uno::XInterface >&      xIf,
-                          ::sal_Int16                                   nArgPos );
+        void verifyInput( const ::com::sun::star::geometry::Matrix2D&	rMatrix,
+                          const char*									pStr,
+                          const ::com::sun::star::uno::Reference< 
+                              ::com::sun::star::uno::XInterface >&		xIf,
+                          ::sal_Int16									nArgPos );
 
         /** Verify that the given point contains valid floating point
             values.
@@ -141,11 +141,11 @@ namespace canvas
 
             @throws an lang::IllegalArgumentException, if anything is wrong
          */
-        void verifyInput( const ::com::sun::star::geometry::RealPoint2D&    rPoint,
-                          const char*                                       pStr,
-                          const ::com::sun::star::uno::Reference<
-                              ::com::sun::star::uno::XInterface >&          xIf,
-                          ::sal_Int16                                       nArgPos );
+        void verifyInput( const ::com::sun::star::geometry::RealPoint2D&	rPoint,
+                          const char*										pStr,
+                          const ::com::sun::star::uno::Reference< 
+                              ::com::sun::star::uno::XInterface >&			xIf,
+                          ::sal_Int16										nArgPos );
 
         /** Verify that the given size contains valid floating point
             values.
@@ -164,11 +164,11 @@ namespace canvas
 
             @throws an lang::IllegalArgumentException, if anything is wrong
          */
-        void verifyInput( const ::com::sun::star::geometry::RealSize2D& rSize,
-                          const char*                                   pStr,
-                          const ::com::sun::star::uno::Reference<
-                              ::com::sun::star::uno::XInterface >&      xIf,
-                          ::sal_Int16                                   nArgPos );
+        void verifyInput( const ::com::sun::star::geometry::RealSize2D&	rSize,
+                          const char*									pStr,
+                          const ::com::sun::star::uno::Reference< 
+                              ::com::sun::star::uno::XInterface >&		xIf,
+                          ::sal_Int16									nArgPos );
 
         /** Verify that the given bezier segment contains valid
             floating point values.
@@ -187,11 +187,11 @@ namespace canvas
 
             @throws an lang::IllegalArgumentException, if anything is wrong
          */
-        void verifyInput( const ::com::sun::star::geometry::RealBezierSegment2D&    rSegment,
-                          const char*                                               pStr,
-                          const ::com::sun::star::uno::Reference<
-                              ::com::sun::star::uno::XInterface >&                  xIf,
-                          ::sal_Int16                                               nArgPos );
+        void verifyInput( const ::com::sun::star::geometry::RealBezierSegment2D&	rSegment,
+                          const char*												pStr,
+                          const ::com::sun::star::uno::Reference< 
+                              ::com::sun::star::uno::XInterface >&					xIf,
+                          ::sal_Int16												nArgPos );
 
         /** Verify that the given point contains valid floating point
             values.
@@ -210,11 +210,11 @@ namespace canvas
 
             @throws an lang::IllegalArgumentException, if anything is wrong
          */
-        void verifyInput( const ::com::sun::star::geometry::RealPoint2D&    rPoint,
-                          const char*                                       pStr,
-                          const ::com::sun::star::uno::Reference<
-                              ::com::sun::star::uno::XInterface >&          xIf,
-                          ::sal_Int16                                       nArgPos );
+        void verifyInput( const ::com::sun::star::geometry::RealPoint2D&	rPoint,
+                          const char*										pStr,
+                          const ::com::sun::star::uno::Reference< 
+                              ::com::sun::star::uno::XInterface >&			xIf,
+                          ::sal_Int16										nArgPos );
 
         /** Verify that the given rectangle contains valid floating
             point values.
@@ -233,11 +233,11 @@ namespace canvas
 
             @throws an lang::IllegalArgumentException, if anything is wrong
          */
-        void verifyInput( const ::com::sun::star::geometry::RealRectangle2D&    rRect,
-                          const char*                                           pStr,
-                          const ::com::sun::star::uno::Reference<
-                              ::com::sun::star::uno::XInterface >&              xIf,
-                          ::sal_Int16                                           nArgPos );
+        void verifyInput( const ::com::sun::star::geometry::RealRectangle2D&	rRect,
+                          const char*											pStr,
+                          const ::com::sun::star::uno::Reference< 
+                              ::com::sun::star::uno::XInterface >&				xIf,
+                          ::sal_Int16											nArgPos );
 
         /** Basic check for view state validity.
 
@@ -255,11 +255,11 @@ namespace canvas
 
             @throws an lang::IllegalArgumentException, if anything is wrong
          */
-        void verifyInput( const ::com::sun::star::rendering::ViewState& viewState,
-                          const char*                                   pStr,
-                          const ::com::sun::star::uno::Reference<
-                                   ::com::sun::star::uno::XInterface >& xIf,
-                          ::sal_Int16                                   nArgPos );
+        void verifyInput( const ::com::sun::star::rendering::ViewState&	viewState, 
+                          const char*									pStr,
+                          const ::com::sun::star::uno::Reference< 
+                                   ::com::sun::star::uno::XInterface >&	xIf,
+                          ::sal_Int16									nArgPos );
 
         /** Basic check for render state validity.
 
@@ -281,12 +281,12 @@ namespace canvas
 
             @throws an lang::IllegalArgumentException, if anything is wrong
          */
-        void verifyInput( const ::com::sun::star::rendering::RenderState&   renderState,
-                          const char*                                       pStr,
-                          const ::com::sun::star::uno::Reference<
-                                   ::com::sun::star::uno::XInterface >&     xIf,
-                          ::sal_Int16                                       nArgPos,
-                          sal_Int32                                         nMinColorComponents=0 );
+        void verifyInput( const ::com::sun::star::rendering::RenderState&	renderState, 
+                          const char*										pStr,
+                          const ::com::sun::star::uno::Reference< 
+                                   ::com::sun::star::uno::XInterface >&		xIf,
+                          ::sal_Int16										nArgPos,
+                          sal_Int32											nMinColorComponents=0 );
 
         /** Basic check for stroke attributes validity.
 
@@ -304,11 +304,11 @@ namespace canvas
 
             @throws an lang::IllegalArgumentException, if anything is wrong
          */
-        void verifyInput( const ::com::sun::star::rendering::StrokeAttributes&  strokeAttributes,
-                          const char*                                           pStr,
-                          const ::com::sun::star::uno::Reference<
-                                   ::com::sun::star::uno::XInterface >&         xIf,
-                          ::sal_Int16                                           nArgPos );
+        void verifyInput( const ::com::sun::star::rendering::StrokeAttributes&	strokeAttributes,
+                          const char*											pStr,
+                          const ::com::sun::star::uno::Reference< 
+                                   ::com::sun::star::uno::XInterface >&			xIf,
+                          ::sal_Int16											nArgPos );
 
         /** Basic check for texture validity.
 
@@ -326,11 +326,11 @@ namespace canvas
 
             @throws an lang::IllegalArgumentException, if anything is wrong
          */
-        void verifyInput( const ::com::sun::star::rendering::Texture&   texture,
-                          const char*                                   pStr,
-                          const ::com::sun::star::uno::Reference<
-                                   ::com::sun::star::uno::XInterface >& xIf,
-                          ::sal_Int16                                   nArgPos );
+        void verifyInput( const ::com::sun::star::rendering::Texture& 	texture,
+                          const char*									pStr,
+                          const ::com::sun::star::uno::Reference< 
+                                   ::com::sun::star::uno::XInterface >&	xIf,
+                          ::sal_Int16									nArgPos );
 
         /** Basic check for bitmap layout validity.
 
@@ -348,11 +348,11 @@ namespace canvas
 
             @throws an lang::IllegalArgumentException, if anything is wrong
          */
-        void verifyInput( const ::com::sun::star::rendering::IntegerBitmapLayout&   bitmapLayout,
-                          const char*                                               pStr,
-                          const ::com::sun::star::uno::Reference<
-                                   ::com::sun::star::uno::XInterface >&             xIf,
-                          ::sal_Int16                                               nArgPos );
+        void verifyInput( const ::com::sun::star::rendering::IntegerBitmapLayout& 	bitmapLayout,
+                          const char*												pStr,
+                          const ::com::sun::star::uno::Reference< 
+                                   ::com::sun::star::uno::XInterface >&				xIf,
+                          ::sal_Int16												nArgPos );
 
         /** Basic check for bitmap layout validity.
 
@@ -371,10 +371,10 @@ namespace canvas
             @throws an lang::IllegalArgumentException, if anything is wrong
          */
         void verifyInput( const ::com::sun::star::rendering::FloatingPointBitmapLayout& bitmapLayout,
-                          const char*                                                   pStr,
-                          const ::com::sun::star::uno::Reference<
-                                   ::com::sun::star::uno::XInterface >&                 xIf,
-                          ::sal_Int16                                                   nArgPos );
+                          const char*													pStr,
+                          const ::com::sun::star::uno::Reference< 
+                                   ::com::sun::star::uno::XInterface >&					xIf,
+                          ::sal_Int16													nArgPos );
 
         /** Basic check for font info validity.
 
@@ -392,11 +392,11 @@ namespace canvas
 
             @throws an lang::IllegalArgumentException, if anything is wrong
          */
-        void verifyInput( const ::com::sun::star::rendering::FontInfo&  fontInfo,
-                          const char*                                   pStr,
-                          const ::com::sun::star::uno::Reference<
-                                   ::com::sun::star::uno::XInterface >& xIf,
-                          ::sal_Int16                                   nArgPos );
+        void verifyInput( const ::com::sun::star::rendering::FontInfo&	fontInfo,
+                          const char*									pStr,
+                          const ::com::sun::star::uno::Reference< 
+                                   ::com::sun::star::uno::XInterface >&	xIf,
+                          ::sal_Int16									nArgPos );
 
         /** Basic check for font request validity.
 
@@ -414,11 +414,11 @@ namespace canvas
 
             @throws an lang::IllegalArgumentException, if anything is wrong
          */
-        void verifyInput( const ::com::sun::star::rendering::FontRequest&   fontRequest,
-                          const char*                                       pStr,
-                          const ::com::sun::star::uno::Reference<
-                                   ::com::sun::star::uno::XInterface >&     xIf,
-                          ::sal_Int16                                       nArgPos );
+        void verifyInput( const ::com::sun::star::rendering::FontRequest&	fontRequest,
+                          const char*										pStr,
+                          const ::com::sun::star::uno::Reference< 
+                                   ::com::sun::star::uno::XInterface >&		xIf,
+                          ::sal_Int16										nArgPos );
 
         /** Templatized check for uno::Reference validity.
 
@@ -436,12 +436,12 @@ namespace canvas
 
             @throws an lang::IllegalArgumentException, if anything is wrong
          */
-        template< class Interface > void verifyInput(
-            const ::com::sun::star::uno::Reference< Interface >&    rRef,
-            const char*                                             pStr,
-            const ::com::sun::star::uno::Reference<
-                ::com::sun::star::uno::XInterface >&                xIf,
-            ::sal_Int16                                             nArgPos )
+        template< class Interface > void verifyInput( 
+            const ::com::sun::star::uno::Reference< Interface >&	rRef,
+            const char*												pStr,
+            const ::com::sun::star::uno::Reference< 
+                ::com::sun::star::uno::XInterface >&				xIf,
+            ::sal_Int16												nArgPos )
         {
             (void)pStr; (void)xIf; (void)nArgPos;
 
@@ -475,12 +475,12 @@ namespace canvas
 
             @throws an lang::IllegalArgumentException, if anything is wrong
          */
-        template< typename SequenceContent > void verifyInput(
-            const ::com::sun::star::uno::Sequence< SequenceContent >&   rSequence,
-            const char*                                                 pStr,
-            const ::com::sun::star::uno::Reference<
-                ::com::sun::star::uno::XInterface >&                    xIf,
-            ::sal_Int16                                                 nArgPos )
+        template< typename SequenceContent > void verifyInput( 
+            const ::com::sun::star::uno::Sequence< SequenceContent >&	rSequence,
+            const char*													pStr,
+            const ::com::sun::star::uno::Reference< 
+                ::com::sun::star::uno::XInterface >&					xIf,
+            ::sal_Int16													nArgPos )
         {
             const SequenceContent* pCurr = rSequence.getConstArray();
             const SequenceContent* pEnd  = pCurr + rSequence.getLength();
@@ -489,60 +489,60 @@ namespace canvas
         }
 
         /// Catch-all, to handle cases that DON'T need input checking (i.e. the Integer geometry ones)
-        template< typename T > void verifyInput( const T&                                   /*rDummy*/,
-                                                 const char*                                /*pStr*/,
-                                                 const ::com::sun::star::uno::Reference<
-                                                       ::com::sun::star::uno::XInterface >& /*xIf*/,
-                                                 ::sal_Int16                                /*nArgPos*/ )
+        template< typename T > void verifyInput( const T&									/*rDummy*/,
+                                                 const char*								/*pStr*/,
+                                                 const ::com::sun::star::uno::Reference< 
+                                                       ::com::sun::star::uno::XInterface >&	/*xIf*/,
+                                                 ::sal_Int16								/*nArgPos*/ )
         {
         }
 
         // TODO(Q2): Employ some template arglist magic here, to avoid
         // this duplication of code...
 
-        template< typename Arg0 > void verifyArgs( const Arg0&                                  rArg0,
-                                                   const char*                                  pStr,
-                                                   const ::com::sun::star::uno::Reference<
-                                                           ::com::sun::star::uno::XInterface >& xIf )
+        template< typename Arg0 > void verifyArgs( const Arg0& 									rArg0,
+                                                   const char*									pStr,
+                                                   const ::com::sun::star::uno::Reference< 
+                                                           ::com::sun::star::uno::XInterface >&	xIf )
         {
             verifyInput( rArg0, pStr, xIf, 0 );
         }
 
-        template< typename Arg0,
-                  typename Arg1 > void verifyArgs( const Arg0&                                  rArg0,
-                                                   const Arg1&                                  rArg1,
-                                                   const char*                                  pStr,
-                                                   const ::com::sun::star::uno::Reference<
-                                                           ::com::sun::star::uno::XInterface >& xIf )
+        template< typename Arg0, 
+                  typename Arg1 > void verifyArgs( const Arg0& 									rArg0,
+                                                   const Arg1& 									rArg1,
+                                                   const char*									pStr,
+                                                   const ::com::sun::star::uno::Reference< 
+                                                           ::com::sun::star::uno::XInterface >&	xIf )
         {
             verifyInput( rArg0, pStr, xIf, 0 );
             verifyInput( rArg1, pStr, xIf, 1 );
         }
 
-        template< typename Arg0,
-                  typename Arg1,
-                  typename Arg2 > void verifyArgs( const Arg0&                                  rArg0,
-                                                   const Arg1&                                  rArg1,
-                                                   const Arg2&                                  rArg2,
-                                                   const char*                                  pStr,
-                                                   const ::com::sun::star::uno::Reference<
-                                                           ::com::sun::star::uno::XInterface >& xIf )
+        template< typename Arg0, 
+                  typename Arg1, 
+                  typename Arg2 > void verifyArgs( const Arg0& 									rArg0,
+                                                   const Arg1& 									rArg1,
+                                                   const Arg2& 									rArg2,
+                                                   const char*									pStr,
+                                                   const ::com::sun::star::uno::Reference< 
+                                                           ::com::sun::star::uno::XInterface >&	xIf )
         {
             verifyInput( rArg0, pStr, xIf, 0 );
             verifyInput( rArg1, pStr, xIf, 1 );
             verifyInput( rArg2, pStr, xIf, 2 );
         }
 
-        template< typename Arg0,
-                  typename Arg1,
-                  typename Arg2,
-                  typename Arg3 > void verifyArgs( const Arg0&                                  rArg0,
-                                                   const Arg1&                                  rArg1,
-                                                   const Arg2&                                  rArg2,
-                                                   const Arg3&                                  rArg3,
-                                                   const char*                                  pStr,
-                                                   const ::com::sun::star::uno::Reference<
-                                                           ::com::sun::star::uno::XInterface >& xIf )
+        template< typename Arg0, 
+                  typename Arg1, 
+                  typename Arg2, 
+                  typename Arg3 > void verifyArgs( const Arg0& 									rArg0,
+                                                   const Arg1& 									rArg1,
+                                                   const Arg2& 									rArg2,
+                                                   const Arg3& 									rArg3,
+                                                   const char*									pStr,
+                                                   const ::com::sun::star::uno::Reference< 
+                                                           ::com::sun::star::uno::XInterface >&	xIf )
         {
             verifyInput( rArg0, pStr, xIf, 0 );
             verifyInput( rArg1, pStr, xIf, 1 );
@@ -550,18 +550,18 @@ namespace canvas
             verifyInput( rArg3, pStr, xIf, 3 );
         }
 
-        template< typename Arg0,
-                  typename Arg1,
-                  typename Arg2,
-                  typename Arg3,
-                  typename Arg4 > void verifyArgs( const Arg0&                                  rArg0,
-                                                   const Arg1&                                  rArg1,
-                                                   const Arg2&                                  rArg2,
-                                                   const Arg3&                                  rArg3,
-                                                   const Arg4&                                  rArg4,
-                                                   const char*                                  pStr,
-                                                   const ::com::sun::star::uno::Reference<
-                                                           ::com::sun::star::uno::XInterface >& xIf )
+        template< typename Arg0, 
+                  typename Arg1, 
+                  typename Arg2, 
+                  typename Arg3, 
+                  typename Arg4 > void verifyArgs( const Arg0& 									rArg0,
+                                                   const Arg1& 									rArg1,
+                                                   const Arg2& 									rArg2,
+                                                   const Arg3& 									rArg3,
+                                                   const Arg4& 									rArg4,
+                                                   const char*									pStr,
+                                                   const ::com::sun::star::uno::Reference< 
+                                                           ::com::sun::star::uno::XInterface >&	xIf )
         {
             verifyInput( rArg0, pStr, xIf, 0 );
             verifyInput( rArg1, pStr, xIf, 1 );
@@ -570,20 +570,20 @@ namespace canvas
             verifyInput( rArg4, pStr, xIf, 4 );
         }
 
-        template< typename Arg0,
-                  typename Arg1,
-                  typename Arg2,
-                  typename Arg3,
-                  typename Arg4,
-                  typename Arg5 > void verifyArgs( const Arg0&                                  rArg0,
-                                                   const Arg1&                                  rArg1,
-                                                   const Arg2&                                  rArg2,
-                                                   const Arg3&                                  rArg3,
-                                                   const Arg4&                                  rArg4,
-                                                   const Arg5&                                  rArg5,
-                                                   const char*                                  pStr,
-                                                   const ::com::sun::star::uno::Reference<
-                                                           ::com::sun::star::uno::XInterface >& xIf )
+        template< typename Arg0, 
+                  typename Arg1, 
+                  typename Arg2, 
+                  typename Arg3, 
+                  typename Arg4, 
+                  typename Arg5 > void verifyArgs( const Arg0& 									rArg0,
+                                                   const Arg1& 									rArg1,
+                                                   const Arg2& 									rArg2,
+                                                   const Arg3& 									rArg3,
+                                                   const Arg4& 									rArg4,
+                                                   const Arg5& 									rArg5,
+                                                   const char*									pStr,
+                                                   const ::com::sun::star::uno::Reference< 
+                                                           ::com::sun::star::uno::XInterface >&	xIf )
         {
             verifyInput( rArg0, pStr, xIf, 0 );
             verifyInput( rArg1, pStr, xIf, 1 );
@@ -593,22 +593,22 @@ namespace canvas
             verifyInput( rArg5, pStr, xIf, 5 );
         }
 
-        template< typename Arg0,
-                  typename Arg1,
-                  typename Arg2,
-                  typename Arg3,
-                  typename Arg4,
-                  typename Arg5,
-                  typename Arg6 > void verifyArgs( const Arg0&                                  rArg0,
-                                                   const Arg1&                                  rArg1,
-                                                   const Arg2&                                  rArg2,
-                                                   const Arg3&                                  rArg3,
-                                                   const Arg4&                                  rArg4,
-                                                   const Arg5&                                  rArg5,
-                                                   const Arg6&                                  rArg6,
-                                                   const char*                                  pStr,
-                                                   const ::com::sun::star::uno::Reference<
-                                                           ::com::sun::star::uno::XInterface >& xIf )
+        template< typename Arg0, 
+                  typename Arg1, 
+                  typename Arg2, 
+                  typename Arg3, 
+                  typename Arg4, 
+                  typename Arg5, 
+                  typename Arg6 > void verifyArgs( const Arg0& 									rArg0,
+                                                   const Arg1& 									rArg1,
+                                                   const Arg2& 									rArg2,
+                                                   const Arg3& 									rArg3,
+                                                   const Arg4& 									rArg4,
+                                                   const Arg5& 									rArg5,
+                                                   const Arg6& 									rArg6,
+                                                   const char*									pStr,
+                                                   const ::com::sun::star::uno::Reference< 
+                                                           ::com::sun::star::uno::XInterface >&	xIf )
         {
             verifyInput( rArg0, pStr, xIf, 0 );
             verifyInput( rArg1, pStr, xIf, 1 );
@@ -670,7 +670,7 @@ namespace canvas
 
         /** Range checker, which throws ::com::sun::star::lang::IndexOutOfBounds exception, when
             index range is violated
-
+            
             @param rect
             Rect to verify
 
@@ -678,11 +678,11 @@ namespace canvas
             Given rectangle must be within ((0,0), (size.Width, size.Height))
          */
         void verifyIndexRange( const ::com::sun::star::geometry::IntegerRectangle2D& rect,
-                               const ::com::sun::star::geometry::IntegerSize2D&      size );
+                               const ::com::sun::star::geometry::IntegerSize2D& 	 size );
 
         /** Range checker, which throws ::com::sun::star::lang::IndexOutOfBounds exception, when
             index range is violated
-
+            
             @param pos
             Position to verify
 
@@ -694,24 +694,24 @@ namespace canvas
 
         /** Range checker, which throws ::com::sun::star::lang::IndexOutOfBounds exception, when
             the size is negative or null
-
+            
             @param size
             Size to verify
          */
         void verifyBitmapSize( const ::com::sun::star::geometry::IntegerSize2D& size,
-                               const char*                                      pStr,
-                               const ::com::sun::star::uno::Reference<
-                                       ::com::sun::star::uno::XInterface >&     xIf );
+                               const char*										pStr,
+                               const ::com::sun::star::uno::Reference< 
+                                       ::com::sun::star::uno::XInterface >&		xIf );
 
         /** Range checker, which throws ::com::sun::star::lang::IndexOutOfBounds exception, when
             the size is negative or null
-
+            
             @param size
             Size to verify
          */
         void verifySpriteSize( const ::com::sun::star::geometry::RealSize2D& size,
-                               const char*                                   pStr,
-                               const ::com::sun::star::uno::Reference<
+                               const char*									 pStr,
+                               const ::com::sun::star::uno::Reference< 
                                        ::com::sun::star::uno::XInterface >&  xIf );
     }
 }
diff --git a/canvas/inc/pch/precompiled_canvas.cxx b/canvas/inc/pch/precompiled_canvas.cxx
index cf58a0cb5b97..0840251746fd 100644
--- a/canvas/inc/pch/precompiled_canvas.cxx
+++ b/canvas/inc/pch/precompiled_canvas.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
diff --git a/canvas/inc/pch/precompiled_canvas.hxx b/canvas/inc/pch/precompiled_canvas.hxx
index 6d4bb1d1b9e6..cff3ffad8710 100644
--- a/canvas/inc/pch/precompiled_canvas.hxx
+++ b/canvas/inc/pch/precompiled_canvas.hxx
@@ -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
diff --git a/canvas/source/cairo/cairo_cachedbitmap.cxx b/canvas/source/cairo/cairo_cachedbitmap.cxx
index 53b0bb02d76d..c27dc819df38 100644
--- a/canvas/source/cairo/cairo_cachedbitmap.cxx
+++ b/canvas/source/cairo/cairo_cachedbitmap.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
@@ -47,8 +47,8 @@ using namespace ::com::sun::star;
 namespace cairocanvas
 {
     CachedBitmap::CachedBitmap( const SurfaceSharedPtr&                     pSurface,
-                                const rendering::ViewState&                 rUsedViewState,
-                                const rendering::RenderState&               rUsedRenderState,
+                                const rendering::ViewState&	  				rUsedViewState,
+                                const rendering::RenderState&	  			rUsedRenderState,
                                 const uno::Reference< rendering::XCanvas >& rTarget ) :
         CachedPrimitiveBase( rUsedViewState, rTarget, true ),
         mpSurface( pSurface ),
@@ -63,10 +63,10 @@ namespace cairocanvas
         CachedPrimitiveBase::disposing();
     }
 
-    ::sal_Int8 CachedBitmap::doRedraw( const rendering::ViewState&                  rNewState,
-                                       const rendering::ViewState&                  /*rOldState*/,
-                                       const uno::Reference< rendering::XCanvas >&  rTargetCanvas,
-                                       bool                                         bSameViewTransform )
+    ::sal_Int8 CachedBitmap::doRedraw( const rendering::ViewState&					rNewState,
+                                       const rendering::ViewState&					/*rOldState*/,
+                                       const uno::Reference< rendering::XCanvas >& 	rTargetCanvas,
+                                       bool											bSameViewTransform )
     {
         ENSURE_OR_THROW( bSameViewTransform,
                           "CachedBitmap::doRedraw(): base called with changed view transform "
diff --git a/canvas/source/cairo/cairo_cachedbitmap.hxx b/canvas/source/cairo/cairo_cachedbitmap.hxx
index a704a0d6c20f..20f99463f84f 100644
--- a/canvas/source/cairo/cairo_cachedbitmap.hxx
+++ b/canvas/source/cairo/cairo_cachedbitmap.hxx
@@ -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
@@ -43,24 +43,24 @@ namespace cairocanvas
         /** Create an XCachedPrimitive for given GraphicObject
          */
         CachedBitmap( const ::cairo::SurfaceSharedPtr&                pSurface,
-                      const ::com::sun::star::rendering::ViewState&   rUsedViewState,
+                      const ::com::sun::star::rendering::ViewState&	  rUsedViewState,
                       const ::com::sun::star::rendering::RenderState& rUsedRenderState,
-                      const ::com::sun::star::uno::Reference<
-                         ::com::sun::star::rendering::XCanvas >&      rTarget   );
+                      const ::com::sun::star::uno::Reference< 
+                         ::com::sun::star::rendering::XCanvas >&      rTarget	);
 
         /// Dispose all internal references
         virtual void SAL_CALL disposing();
 
     private:
-        virtual ::sal_Int8 doRedraw( const ::com::sun::star::rendering::ViewState&  rNewState,
-                                     const ::com::sun::star::rendering::ViewState&  rOldState,
-                                     const ::com::sun::star::uno::Reference<
-                     ::com::sun::star::rendering::XCanvas >&    rTargetCanvas,
-                                     bool                                           bSameViewTransform );
+        virtual ::sal_Int8 doRedraw( const ::com::sun::star::rendering::ViewState&	rNewState,
+                                     const ::com::sun::star::rendering::ViewState&	rOldState,
+                                     const ::com::sun::star::uno::Reference< 
+                     ::com::sun::star::rendering::XCanvas >& 	rTargetCanvas,
+                                     bool											bSameViewTransform );
 
 
     ::cairo::SurfaceSharedPtr mpSurface;
-    const ::com::sun::star::rendering::RenderState  maRenderState;
+    const ::com::sun::star::rendering::RenderState	maRenderState;
     };
 }
 
diff --git a/canvas/source/cairo/cairo_cairo.cxx b/canvas/source/cairo/cairo_cairo.cxx
index f855a4f1700c..86fc215c5c13 100644
--- a/canvas/source/cairo/cairo_cairo.cxx
+++ b/canvas/source/cairo/cairo_cairo.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
@@ -33,7 +33,7 @@
 
 #ifdef WNT
 # include <tools/prewin.h>
-# include <windows.h>
+# include <windows.h> 
 # include <tools/postwin.h>
 #endif
 
@@ -44,7 +44,7 @@ namespace cairo
 {
 /****************************************************************************************
  * Platform independent part of surface backends for OpenOffice.org Cairo Canvas        *
- * For the rest of the functions (and the platform-specific derived                     *
+ * For the rest of the functions (and the platform-specific derived                     *  
  *  Surface classes), see platform specific cairo_<platform>_cairo.cxx                  *
  ****************************************************************************************/
 
diff --git a/canvas/source/cairo/cairo_cairo.hxx b/canvas/source/cairo/cairo_cairo.hxx
index 10832ac27be6..1fd99547cd06 100644
--- a/canvas/source/cairo/cairo_cairo.hxx
+++ b/canvas/source/cairo/cairo_cairo.hxx
@@ -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
@@ -58,7 +58,7 @@ namespace cairo {
         For each cairo-supported platform, there's an implementation of
         this interface
      */
-    struct Surface
+    struct Surface 
     {
     public:
         virtual ~Surface() {}
@@ -83,11 +83,11 @@ namespace cairo {
     /// Create Surface from given cairo surface
     SurfaceSharedPtr createSurface( const CairoSurfaceSharedPtr& rSurface );
     /// Create surface with given dimensions
-    SurfaceSharedPtr createSurface( const OutputDevice& rRefDevice,
+    SurfaceSharedPtr createSurface( const OutputDevice& rRefDevice, 
                                     int x, int y, int width, int height );
     /// Create Surface for given bitmap data
-    SurfaceSharedPtr createBitmapSurface( const OutputDevice& rRefDevice,
-                                          const BitmapSystemData& rData,
+    SurfaceSharedPtr createBitmapSurface( const OutputDevice& rRefDevice, 
+                                          const BitmapSystemData& rData, 
                                           const Size&             rSize );
 
     /// Check whether cairo will work on given window
diff --git a/canvas/source/cairo/cairo_canvas.cxx b/canvas/source/cairo/cairo_canvas.cxx
index 54d04158c993..57d4d3f6066d 100644
--- a/canvas/source/cairo/cairo_canvas.cxx
+++ b/canvas/source/cairo/cairo_canvas.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
@@ -49,7 +49,7 @@
 
 #ifdef WNT
 # include <tools/prewin.h>
-# include <windows.h>
+# include <windows.h> 
 # include <tools/postwin.h>
 #endif
 
@@ -87,16 +87,16 @@ namespace cairocanvas
 
         ENSURE_ARG_OR_THROW( maArguments.getLength() >= 6 &&
                              maArguments[0].getValueTypeClass() == uno::TypeClass_HYPER &&
-                             maArguments[5].getValueTypeClass() == uno::TypeClass_SEQUENCE,
+                             maArguments[5].getValueTypeClass() == uno::TypeClass_SEQUENCE, 
                              "Canvas::initialize: wrong number of arguments, or wrong types" );
 
         // We expect a single Any here, containing a pointer to a valid
         // VCL output device, on which to output (mostly needed for text)
         sal_Int64 nPtr = 0;
         maArguments[0] >>= nPtr;
-        OutputDevice* pOutDev = reinterpret_cast<OutputDevice*>(nPtr);
-
-        ENSURE_ARG_OR_THROW( pOutDev != NULL,
+        OutputDevice* pOutDev = reinterpret_cast<OutputDevice*>(nPtr); 
+        
+        ENSURE_ARG_OR_THROW( pOutDev != NULL, 
                              "Canvas::initialize: invalid OutDev pointer" );
 
         awt::Rectangle aBounds;
@@ -110,10 +110,10 @@ namespace cairocanvas
             throw lang::NoSupportException(
                 ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(
                                      "Passed SystemGraphicsData invalid!")),
-                NULL);
+                NULL);        
 
         bool bHasXRender = IsCairoWorking(pOutDev);
-        ENSURE_ARG_OR_THROW( bHasXRender == true,
+        ENSURE_ARG_OR_THROW( bHasXRender == true, 
                              "SpriteCanvas::SpriteCanvas: No RENDER extension" );
 
         // setup helper
@@ -124,7 +124,7 @@ namespace cairocanvas
                              *this, this );
 
         // forward surface to render on to canvashelper
-        maCanvasHelper.setSurface(
+        maCanvasHelper.setSurface( 
             maDeviceHelper.getSurface(),
             false );
 
@@ -153,7 +153,7 @@ namespace cairocanvas
 
     bool Canvas::repaint( const SurfaceSharedPtr&       pSurface,
                           const rendering::ViewState&   viewState,
-                          const rendering::RenderState& renderState )
+                          const rendering::RenderState&	renderState )
     {
         return maCanvasHelper.repaint( pSurface, viewState, renderState );
     }
diff --git a/canvas/source/cairo/cairo_canvas.hxx b/canvas/source/cairo/cairo_canvas.hxx
index bbcb89c54c7d..a655aacb3535 100644
--- a/canvas/source/cairo/cairo_canvas.hxx
+++ b/canvas/source/cairo/cairo_canvas.hxx
@@ -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
@@ -67,9 +67,9 @@ namespace cairocanvas
                                                 ::com::sun::star::lang::XMultiServiceFactory,
                                                 ::com::sun::star::util::XUpdatable,
                                                 ::com::sun::star::beans::XPropertySet,
-                                                ::com::sun::star::lang::XServiceName >  GraphicDeviceBase_Base;
+                                                ::com::sun::star::lang::XServiceName >	GraphicDeviceBase_Base;
     typedef ::canvas::GraphicDeviceBase< ::canvas::BaseMutexHelper< GraphicDeviceBase_Base >,
-                                                 DeviceHelper,
+                                                 DeviceHelper, 
                                                  ::osl::MutexGuard,
                                                  ::cppu::OWeakObject > CanvasBase_Base;
 
@@ -94,9 +94,9 @@ namespace cairocanvas
     };
 
     typedef ::canvas::IntegerBitmapBase< CanvasBaseSurfaceProvider_Base,
-                                         CanvasHelper,
+                                         CanvasHelper, 
                                          ::osl::MutexGuard,
-                                         ::cppu::OWeakObject >          CanvasBaseT;
+                                         ::cppu::OWeakObject >			CanvasBaseT;
 
     /** Product of this component's factory.
 
@@ -111,9 +111,9 @@ namespace cairocanvas
                    public RepaintTarget
     {
     public:
-        Canvas( const ::com::sun::star::uno::Sequence<
+        Canvas( const ::com::sun::star::uno::Sequence< 
                   ::com::sun::star::uno::Any >&               aArguments,
-                const ::com::sun::star::uno::Reference<
+                const ::com::sun::star::uno::Reference< 
                   ::com::sun::star::uno::XComponentContext >& rxContext );
 
         void initialize();
@@ -133,15 +133,15 @@ namespace cairocanvas
         //                          Classname     Base doing refcounting        Base implementing the XComponent interface
         //                            |                 |                            |
         //                            V                 V                            V
-        DECLARE_UNO3_XCOMPONENT_AGG_DEFAULTS( Canvas, GraphicDeviceBase_Base, ::cppu::WeakComponentImplHelperBase );
+        DECLARE_UNO3_XCOMPONENT_AGG_DEFAULTS( Canvas, GraphicDeviceBase_Base, ::cppu::WeakComponentImplHelperBase ); 
 
         // XServiceName
         virtual ::rtl::OUString SAL_CALL getServiceName(  ) throw (::com::sun::star::uno::RuntimeException);
 
         // RepaintTarget
         virtual bool repaint( const ::cairo::SurfaceSharedPtr& pSurface,
-                  const ::com::sun::star::rendering::ViewState& viewState,
-                  const ::com::sun::star::rendering::RenderState&   renderState );
+                  const ::com::sun::star::rendering::ViewState&	viewState,
+                  const ::com::sun::star::rendering::RenderState&	renderState );
 
         // SurfaceProvider
         virtual SurfaceSharedPtr getSurface();
diff --git a/canvas/source/cairo/cairo_canvasbitmap.cxx b/canvas/source/cairo/cairo_canvasbitmap.cxx
index 445839ca0127..19945d782559 100644
--- a/canvas/source/cairo/cairo_canvasbitmap.cxx
+++ b/canvas/source/cairo/cairo_canvasbitmap.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
@@ -42,7 +42,7 @@
 # include "cairo_win32_cairo.hxx"
 # include <cairo-win32.h>
 #else
-# error Native API needed.
+# error Native API needed. 
 #endif
 
 using namespace ::cairo;
@@ -55,15 +55,15 @@ namespace
     {
         // cant seem to retrieve HBITMAP from cairo. copy content then
         HDC hScreenDC=GetDC(NULL);
-        HBITMAP hBmpBitmap = CreateCompatibleBitmap( hScreenDC,
-                                                     rSize.getX(),
+        HBITMAP hBmpBitmap = CreateCompatibleBitmap( hScreenDC, 
+                                                     rSize.getX(), 
                                                      rSize.getY() );
 
-        HDC     hBmpDC = CreateCompatibleDC( 0 );
+        HDC 	hBmpDC = CreateCompatibleDC( 0 );
         HBITMAP hBmpOld = (HBITMAP) SelectObject( hBmpDC, hBmpBitmap );
 
-        BitBlt( hBmpDC, 0, 0, rSize.getX(), rSize.getX(),
-                cairo_win32_surface_get_dc(rSurface->getCairoSurface().get()),
+        BitBlt( hBmpDC, 0, 0, rSize.getX(), rSize.getX(), 
+                cairo_win32_surface_get_dc(rSurface->getCairoSurface().get()), 
                 0, 0, SRCCOPY );
 
         SelectObject( hBmpDC, hBmpOld );
@@ -139,7 +139,7 @@ namespace cairocanvas
     }
 
     bool CanvasBitmap::repaint( const SurfaceSharedPtr&       pSurface,
-                                const rendering::ViewState&   viewState,
+                                const rendering::ViewState&	  viewState,
                                 const rendering::RenderState& renderState )
     {
         return maCanvasHelper.repaint( pSurface, viewState, renderState );
@@ -151,23 +151,23 @@ namespace cairocanvas
         // 0 ... get BitmapEx
         // 1 ... get Pixbuf with bitmap RGB content
         // 2 ... get Pixbuf with bitmap alpha mask
-        switch( nHandle )
+        switch( nHandle ) 
         {
             case 0:
             {
                 aRV = uno::Any( reinterpret_cast<sal_Int64>( (BitmapEx*) NULL ) );
                 break;
             }
-            case 1:
+            case 1: 
             {
 #ifdef CAIRO_HAS_XLIB_SURFACE
                 X11Surface* pXlibSurface=dynamic_cast<X11Surface*>(mpBufferSurface.get());
                 OSL_ASSERT(pXlibSurface);
                 uno::Sequence< uno::Any > args( 3 );
-                args[0] = uno::Any( false );  // do not call XFreePixmap on it
+                args[0] = uno::Any( false );  // do not call XFreePixmap on it      
                 args[1] = uno::Any( pXlibSurface->getPixmap()->mhDrawable );
                 args[2] = uno::Any( sal_Int32( pXlibSurface->getDepth() ) );
-
+                
                 aRV = uno::Any( args );
 #elif defined CAIRO_HAS_QUARTZ_SURFACE
                 QuartzSurface* pQuartzSurface = dynamic_cast<QuartzSurface*>(mpBufferSurface.get());
@@ -180,7 +180,7 @@ namespace cairocanvas
                 // the alpha channel is ignored here.
                 uno::Sequence< uno::Any > args( 1 );
                 args[1] = uno::Any( sal_Int64(surface2HBitmap(mpBufferSurface,maSize)) );
-
+                
                 aRV = uno::Any( args );
                 // caller frees the bitmap
 #else
@@ -188,7 +188,7 @@ namespace cairocanvas
 #endif
                 break;
             }
-            case 2:
+            case 2: 
             {
 #ifdef CAIRO_HAS_XLIB_SURFACE
                 uno::Sequence< uno::Any > args( 3 );
@@ -196,8 +196,8 @@ namespace cairocanvas
                 CairoSharedPtr   pAlphaCairo = pAlphaSurface->getCairo();
                 X11Surface* pXlibSurface=dynamic_cast<X11Surface*>(pAlphaSurface.get());
                 OSL_ASSERT(pXlibSurface);
-
-                // create RGB image (levels of gray) of alpha channel of original picture
+                
+                // create RGB image (levels of gray) of alpha channel of original picture       
                 cairo_set_source_rgba( pAlphaCairo.get(), 1, 1, 1, 1 );
                 cairo_set_operator( pAlphaCairo.get(), CAIRO_OPERATOR_SOURCE );
                 cairo_paint( pAlphaCairo.get() );
@@ -205,22 +205,22 @@ namespace cairocanvas
                 cairo_set_operator( pAlphaCairo.get(), CAIRO_OPERATOR_XOR );
                 cairo_paint( pAlphaCairo.get() );
                 pAlphaCairo.reset();
-
+                
                 X11PixmapSharedPtr pPixmap = pXlibSurface->getPixmap();
                 args[0] = uno::Any( true );
                 args[1] = ::com::sun::star::uno::Any( pPixmap->mhDrawable );
                 args[2] = ::com::sun::star::uno::Any( sal_Int32( pXlibSurface->getDepth () ) );
-                pPixmap->clear(); // caller takes ownership of pixmap
-
-                // return pixmap and alphachannel pixmap - it will be used in BitmapEx
+                pPixmap->clear(); // caller takes ownership of pixmap   
+                
+                // return pixmap and alphachannel pixmap - it will be used in BitmapEx      
                 aRV = uno::Any( args );
 #elif defined CAIRO_HAS_QUARTZ_SURFACE
                 SurfaceSharedPtr pAlphaSurface = mpSurfaceProvider->createSurface( maSize, CAIRO_CONTENT_COLOR );
                 CairoSharedPtr   pAlphaCairo = pAlphaSurface->getCairo();
                 QuartzSurface* pQuartzSurface=dynamic_cast<QuartzSurface*>(pAlphaSurface.get());
                 OSL_ASSERT(pQuartzSurface);
-
-                // create RGB image (levels of gray) of alpha channel of original picture
+                
+                // create RGB image (levels of gray) of alpha channel of original picture       
                 cairo_set_source_rgba( pAlphaCairo.get(), 1, 1, 1, 1 );
                 cairo_set_operator( pAlphaCairo.get(), CAIRO_OPERATOR_SOURCE );
                 cairo_paint( pAlphaCairo.get() );
@@ -228,16 +228,16 @@ namespace cairocanvas
                 cairo_set_operator( pAlphaCairo.get(), CAIRO_OPERATOR_XOR );
                 cairo_paint( pAlphaCairo.get() );
                 pAlphaCairo.reset();
-
+                
                 uno::Sequence< uno::Any > args( 1 );
                 args[0] = uno::Any( sal_IntPtr (pQuartzSurface->getCGContext()) );
-                // return ??? and alphachannel ??? - it will be used in BitmapEx
+                // return ??? and alphachannel ??? - it will be used in BitmapEx      
                 aRV = uno::Any( args );
 #elif defined CAIRO_HAS_WIN32_SURFACE
                 SurfaceSharedPtr pAlphaSurface = mpSurfaceProvider->createSurface( maSize, CAIRO_CONTENT_COLOR );
                 CairoSharedPtr   pAlphaCairo = pAlphaSurface->getCairo();
-
-                // create RGB image (levels of gray) of alpha channel of original picture
+                
+                // create RGB image (levels of gray) of alpha channel of original picture       
                 cairo_set_source_rgba( pAlphaCairo.get(), 1, 1, 1, 1 );
                 cairo_set_operator( pAlphaCairo.get(), CAIRO_OPERATOR_SOURCE );
                 cairo_paint( pAlphaCairo.get() );
@@ -249,7 +249,7 @@ namespace cairocanvas
                 // cant seem to retrieve HBITMAP from cairo. copy content then
                 uno::Sequence< uno::Any > args( 1 );
                 args[1] = uno::Any( sal_Int64(surface2HBitmap(pAlphaSurface,maSize)) );
-
+                
                 aRV = uno::Any( args );
                 // caller frees the bitmap
 #else
@@ -279,7 +279,7 @@ namespace cairocanvas
     {
         uno::Sequence< ::rtl::OUString > aRet(1);
         aRet[0] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM ( SERVICE_NAME ) );
-
+        
         return aRet;
     }
 
diff --git a/canvas/source/cairo/cairo_canvasbitmap.hxx b/canvas/source/cairo/cairo_canvasbitmap.hxx
index 5597a5ade004..2f6abf29a83a 100644
--- a/canvas/source/cairo/cairo_canvasbitmap.hxx
+++ b/canvas/source/cairo/cairo_canvasbitmap.hxx
@@ -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
@@ -55,18 +55,18 @@ namespace cairocanvas
     typedef ::cppu::WeakComponentImplHelper4< ::com::sun::star::rendering::XBitmapCanvas,
                                               ::com::sun::star::rendering::XIntegerBitmap,
                                               ::com::sun::star::lang::XServiceInfo,
-                                              ::com::sun::star::beans::XFastPropertySet >   CanvasBitmapBase_Base;
-    class CanvasBitmapSpriteSurface_Base :
+                                              ::com::sun::star::beans::XFastPropertySet >  	CanvasBitmapBase_Base;
+    class CanvasBitmapSpriteSurface_Base : 
         public ::canvas::BaseMutexHelper<CanvasBitmapBase_Base>,
         public SurfaceProvider
     {
     };
 
-    typedef ::canvas::IntegerBitmapBase<
+    typedef ::canvas::IntegerBitmapBase< 
           CanvasBitmapSpriteSurface_Base,
-          CanvasHelper,
+          CanvasHelper, 
           ::osl::MutexGuard,
-          ::cppu::OWeakObject >                         CanvasBitmap_Base;
+          ::cppu::OWeakObject >							CanvasBitmap_Base;
 
     class CanvasBitmap : public CanvasBitmap_Base,
                          public RepaintTarget
@@ -76,7 +76,7 @@ namespace cairocanvas
 
             @param rSize
             Size of the bitmap
-
+        
             @param rDevice
             Reference device, with which bitmap should be compatible
         */
@@ -93,7 +93,7 @@ namespace cairocanvas
         //                                    Classname     Base doing refcounting        Base implementing the XComponent interface
         //                                       |                 |                            |
         //                                       V                 V                            V
-        DECLARE_UNO3_XCOMPONENT_AGG_DEFAULTS( CanvasBitmap, CanvasBitmapBase_Base, ::cppu::WeakComponentImplHelperBase );
+        DECLARE_UNO3_XCOMPONENT_AGG_DEFAULTS( CanvasBitmap, CanvasBitmapBase_Base, ::cppu::WeakComponentImplHelperBase ); 
 
         // XServiceInfo
         virtual ::rtl::OUString SAL_CALL getImplementationName(  ) throw (::com::sun::star::uno::RuntimeException);
@@ -109,7 +109,7 @@ namespace cairocanvas
 
         // RepaintTarget
         virtual bool repaint( const SurfaceSharedPtr&                         pSurface,
-                              const ::com::sun::star::rendering::ViewState&   viewState,
+                              const ::com::sun::star::rendering::ViewState&	  viewState,
                               const ::com::sun::star::rendering::RenderState& renderState );
 
         // XFastPropertySet
diff --git a/canvas/source/cairo/cairo_canvascustomsprite.cxx b/canvas/source/cairo/cairo_canvascustomsprite.cxx
index ad9a743da885..c3ab8ef9c7c2 100644
--- a/canvas/source/cairo/cairo_canvascustomsprite.cxx
+++ b/canvas/source/cairo/cairo_canvascustomsprite.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
@@ -49,7 +49,7 @@ using namespace ::com::sun::star;
 
 namespace cairocanvas
 {
-    CanvasCustomSprite::CanvasCustomSprite( const ::com::sun::star::geometry::RealSize2D&   rSpriteSize,
+    CanvasCustomSprite::CanvasCustomSprite( const ::com::sun::star::geometry::RealSize2D& 	rSpriteSize,
                                             const SpriteCanvasRef&                          rRefDevice ) :
         mpSpriteCanvas( rRefDevice ),
         maSize( ::canvas::tools::roundUp( rSpriteSize.Width ),
@@ -64,8 +64,8 @@ namespace cairocanvas
 
         mpBufferSurface = mpSpriteCanvas->createSurface( maSize );
 
-        maCanvasHelper.init( maSize,
-                             *rRefDevice,
+        maCanvasHelper.init( maSize, 
+                             *rRefDevice, 
                              rRefDevice.get() );
         maCanvasHelper.setSurface( mpBufferSurface, true );
 
@@ -76,7 +76,7 @@ namespace cairocanvas
         // clear sprite to 100% transparent
         maCanvasHelper.clear();
     }
-
+    
     void SAL_CALL CanvasCustomSprite::disposing()
     {
         ::osl::MutexGuard aGuard( m_aMutex );
@@ -103,16 +103,16 @@ namespace cairocanvas
         ::osl::MutexGuard aGuard( m_aMutex );
 
         maSpriteHelper.redraw( pCairo,
-                               rOrigOutputPos,
-                               mbSurfaceDirty,
+                               rOrigOutputPos, 
+                               mbSurfaceDirty, 
                                bBufferedUpdate );
 
         mbSurfaceDirty = false;
     }
 
     bool CanvasCustomSprite::repaint( const SurfaceSharedPtr&       pSurface,
-                                      const rendering::ViewState&   viewState,
-                                      const rendering::RenderState& renderState )
+                                      const rendering::ViewState&	viewState,
+                                      const rendering::RenderState&	renderState )
     {
         return maCanvasHelper.repaint( pSurface, viewState, renderState );
     }
@@ -169,7 +169,7 @@ namespace cairocanvas
     {
         uno::Sequence< ::rtl::OUString > aRet(1);
         aRet[0] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM ( SERVICE_NAME ) );
-
+        
         return aRet;
     }
 }
diff --git a/canvas/source/cairo/cairo_canvascustomsprite.hxx b/canvas/source/cairo/cairo_canvascustomsprite.hxx
index abebdc85d917..20b0cb945440 100644
--- a/canvas/source/cairo/cairo_canvascustomsprite.hxx
+++ b/canvas/source/cairo/cairo_canvascustomsprite.hxx
@@ -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
@@ -57,7 +57,7 @@ namespace cairocanvas
     typedef ::cppu::WeakComponentImplHelper4< ::com::sun::star::rendering::XCustomSprite,
                                                ::com::sun::star::rendering::XBitmapCanvas,
                                               ::com::sun::star::rendering::XIntegerBitmap,
-                                                ::com::sun::star::lang::XServiceInfo >  CanvasCustomSpriteBase_Base;
+                                                ::com::sun::star::lang::XServiceInfo >	CanvasCustomSpriteBase_Base;
     /** Mixin Sprite
 
         Have to mixin the Sprite interface before deriving from
@@ -82,10 +82,10 @@ namespace cairocanvas
     };
 
     typedef ::canvas::CanvasCustomSpriteBase< CanvasCustomSpriteSpriteBase_Base,
-                                              SpriteHelper,
-                                              CanvasHelper,
+                                              SpriteHelper, 
+                                              CanvasHelper, 
                                               ::osl::MutexGuard,
-                                              ::cppu::OWeakObject >                     CanvasCustomSpriteBaseT;
+                                              ::cppu::OWeakObject > 					CanvasCustomSpriteBaseT;
 
     /* Definition of CanvasCustomSprite class */
 
@@ -107,7 +107,7 @@ namespace cairocanvas
             @param rDevice
             Target DX device
          */
-        CanvasCustomSprite( const ::com::sun::star::geometry::RealSize2D&   rSpriteSize,
+        CanvasCustomSprite( const ::com::sun::star::geometry::RealSize2D& 	rSpriteSize,
                             const SpriteCanvasRef&                          rRefDevice );
 
         virtual void SAL_CALL disposing();
@@ -133,7 +133,7 @@ namespace cairocanvas
 
         // RepaintTarget
         virtual bool repaint( const ::cairo::SurfaceSharedPtr&                pSurface,
-                              const ::com::sun::star::rendering::ViewState&   viewState,
+                              const ::com::sun::star::rendering::ViewState&	  viewState,
                               const ::com::sun::star::rendering::RenderState& renderState );
 
         // SurfaceProvider
@@ -145,7 +145,7 @@ namespace cairocanvas
 
     private:
         /** MUST hold here, too, since CanvasHelper only contains a
-            raw pointer (without refcounting)
+            raw pointer (without refcounting) 
         */
         SpriteCanvasRef           mpSpriteCanvas;
         ::cairo::SurfaceSharedPtr mpBufferSurface;
diff --git a/canvas/source/cairo/cairo_canvasfont.cxx b/canvas/source/cairo/cairo_canvasfont.cxx
index 452280728151..43a40fc521bc 100644
--- a/canvas/source/cairo/cairo_canvasfont.cxx
+++ b/canvas/source/cairo/cairo_canvasfont.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
@@ -49,26 +49,26 @@ namespace cairocanvas
         class LocalGuard
         {
         public:
-            LocalGuard() :
+            LocalGuard() : 
                 aGuard( Application::GetSolarMutex() )
             {
             }
 
             /// To be compatible with CanvasBase mutex concept
-            LocalGuard( const ::osl::Mutex& ) :
+            LocalGuard( const ::osl::Mutex& ) : 
                 aGuard( Application::GetSolarMutex() )
             {
             }
 
         private:
-            ::vos::OGuard aGuard;
-        };
+            ::vos::OGuard aGuard;        
+        }; 
     }
 
-    CanvasFont::CanvasFont( const rendering::FontRequest&                   rFontRequest,
-                            const uno::Sequence< beans::PropertyValue >&    /*rExtraFontProperties*/,
-                            const geometry::Matrix2D&                       rFontMatrix,
-                            const SurfaceProviderRef&                       rDevice ) :
+    CanvasFont::CanvasFont( const rendering::FontRequest& 					rFontRequest,
+                            const uno::Sequence< beans::PropertyValue >&	/*rExtraFontProperties*/, 
+                            const geometry::Matrix2D& 						rFontMatrix,
+                            const SurfaceProviderRef&						rDevice ) :
         CanvasFont_Base( m_aMutex ),
         maFont( Font( rFontRequest.FontDescription.FamilyName,
                       rFontRequest.FontDescription.StyleName,
@@ -99,7 +99,7 @@ namespace cairocanvas
                 const Size aSize = pOutDev->GetFontMetric( *maFont ).GetSize();
 
                 const double fDividend( rFontMatrix.m10 + rFontMatrix.m11 );
-                double fStretch = (rFontMatrix.m00 + rFontMatrix.m01);
+                double fStretch = (rFontMatrix.m00 + rFontMatrix.m01);            
 
                 if( !::basegfx::fTools::equalZero( fDividend) )
                     fStretch /= fDividend;
@@ -127,9 +127,9 @@ namespace cairocanvas
         if( !mpRefDevice.is() )
             return uno::Reference< rendering::XTextLayout >(); // we're disposed
 
-        return new TextLayout( aText,
-                               nDirection,
-                               nRandomSeed,
+        return new TextLayout( aText, 
+                               nDirection, 
+                               nRandomSeed, 
                                Reference( this ),
                                mpRefDevice );
     }
diff --git a/canvas/source/cairo/cairo_canvasfont.hxx b/canvas/source/cairo/cairo_canvasfont.hxx
index 9b59ca57fa52..b73ef7ad6827 100644
--- a/canvas/source/cairo/cairo_canvasfont.hxx
+++ b/canvas/source/cairo/cairo_canvasfont.hxx
@@ -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
@@ -54,7 +54,7 @@ namespace cairocanvas
     typedef ::cppu::WeakComponentImplHelper2< ::com::sun::star::rendering::XCanvasFont,
                                                ::com::sun::star::lang::XServiceInfo > CanvasFont_Base;
 
-    class CanvasFont : public ::comphelper::OBaseMutex,
+    class CanvasFont : public ::comphelper::OBaseMutex, 
                        public CanvasFont_Base,
                        private ::boost::noncopyable
     {
@@ -63,10 +63,10 @@ namespace cairocanvas
             CanvasFont,
             ::com::sun::star::rendering::XCanvasFont > Reference;
 
-        CanvasFont( const ::com::sun::star::rendering::FontRequest&                                  fontRequest,
-                    const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& extraFontProperties,
-                    const ::com::sun::star::geometry::Matrix2D&                                      rFontMatrix,
-                    const SurfaceProviderRef&                                                        rDevice );
+        CanvasFont( const ::com::sun::star::rendering::FontRequest& 								 fontRequest,
+                    const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& extraFontProperties, 
+                    const ::com::sun::star::geometry::Matrix2D&										 rFontMatrix,
+                    const SurfaceProviderRef&														 rDevice );
 
         /// Dispose all internal references
         virtual void SAL_CALL disposing();
@@ -86,9 +86,9 @@ namespace cairocanvas
         ::Font getVCLFont() const;
 
     private:
-        ::canvas::vcltools::VCLObject<Font>      maFont;
+        ::canvas::vcltools::VCLObject<Font>		 maFont;
         ::com::sun::star::rendering::FontRequest maFontRequest;
-        SurfaceProviderRef                       mpRefDevice;
+        SurfaceProviderRef						 mpRefDevice;
     };
 
 }
diff --git a/canvas/source/cairo/cairo_canvashelper.cxx b/canvas/source/cairo/cairo_canvashelper.cxx
index eec6a09fb215..04396ba480c9 100644
--- a/canvas/source/cairo/cairo_canvashelper.cxx
+++ b/canvas/source/cairo/cairo_canvashelper.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
@@ -227,7 +227,7 @@ namespace cairocanvas
                 compositingMode = CAIRO_OPERATOR_SATURATE;
                 break;
         }
-        cairo_set_operator( mpCairo.get(), compositingMode );
+        cairo_set_operator( mpCairo.get(), compositingMode );    
     }
 
     void CanvasHelper::clear()
@@ -247,7 +247,7 @@ namespace cairocanvas
             else
                 cairo_set_source_rgb( mpCairo.get(), 1.0, 1.0, 1.0 );
             cairo_set_operator( mpCairo.get(), CAIRO_OPERATOR_SOURCE );
-
+            
             cairo_rectangle( mpCairo.get(), 0, 0, maSize.getX(), maSize.getY() );
             cairo_fill( mpCairo.get() );
 
@@ -255,18 +255,18 @@ namespace cairocanvas
         }
     }
 
-    void CanvasHelper::drawPoint( const rendering::XCanvas*     ,
-                                  const geometry::RealPoint2D&  ,
-                                  const rendering::ViewState&   ,
-                                  const rendering::RenderState&  )
+    void CanvasHelper::drawPoint( const rendering::XCanvas* 	, 
+                                  const geometry::RealPoint2D& 	, 
+                                  const rendering::ViewState& 	, 
+                                  const rendering::RenderState&	 )
     {
     }
 
-    void CanvasHelper::drawLine( const rendering::XCanvas*      /*pCanvas*/,
-                                 const geometry::RealPoint2D&   aStartPoint,
-                                 const geometry::RealPoint2D&   aEndPoint,
-                                 const rendering::ViewState&    viewState,
-                                 const rendering::RenderState&  renderState )
+    void CanvasHelper::drawLine( const rendering::XCanvas* 		/*pCanvas*/, 
+                                 const geometry::RealPoint2D& 	aStartPoint, 
+                                 const geometry::RealPoint2D& 	aEndPoint, 
+                                 const rendering::ViewState& 	viewState, 
+                                 const rendering::RenderState& 	renderState )
     {
     if( mpCairo ) {
         cairo_save( mpCairo.get() );
@@ -283,11 +283,11 @@ namespace cairocanvas
     }
     }
 
-    void CanvasHelper::drawBezier( const rendering::XCanvas*            ,
-                                   const geometry::RealBezierSegment2D& aBezierSegment,
-                                   const geometry::RealPoint2D&         aEndPoint,
-                                   const rendering::ViewState&          viewState,
-                                   const rendering::RenderState&        renderState )
+    void CanvasHelper::drawBezier( const rendering::XCanvas* 			, 
+                                   const geometry::RealBezierSegment2D&	aBezierSegment, 
+                                   const geometry::RealPoint2D& 		aEndPoint,
+                                   const rendering::ViewState& 			viewState, 
+                                   const rendering::RenderState& 		renderState )
     {
     if( mpCairo ) {
         cairo_save( mpCairo.get() );
@@ -297,7 +297,7 @@ namespace cairocanvas
         useStates( viewState, renderState, true );
 
         cairo_move_to( mpCairo.get(), aBezierSegment.Px + 0.5, aBezierSegment.Py + 0.5 );
-        cairo_curve_to( mpCairo.get(),
+        cairo_curve_to( mpCairo.get(), 
                         aBezierSegment.C1x + 0.5, aBezierSegment.C1y + 0.5,
                         aBezierSegment.C2x + 0.5, aBezierSegment.C2y + 0.5,
                         aEndPoint.X + 0.5, aEndPoint.Y + 0.5 );
@@ -325,7 +325,7 @@ namespace cairocanvas
         CanvasBitmap* pBitmapImpl = dynamic_cast< CanvasBitmap* >( xBitmap.get() );
         if( pBitmapImpl )
             return pBitmapImpl->getSurface();
-
+ 
         SurfaceProvider* pSurfaceProvider = dynamic_cast<SurfaceProvider*>( xBitmap.get() );
         if( pSurfaceProvider )
             return pSurfaceProvider->getSurface();
@@ -336,16 +336,16 @@ namespace cairocanvas
     static ::BitmapEx bitmapExFromXBitmap( const uno::Reference< rendering::XBitmap >& xBitmap )
     {
         // TODO(F1): Add support for floating point bitmap formats
-        uno::Reference<rendering::XIntegerReadOnlyBitmap> xIntBmp(xBitmap,
+        uno::Reference<rendering::XIntegerReadOnlyBitmap> xIntBmp(xBitmap, 
                                                                   uno::UNO_QUERY_THROW);
         ::BitmapEx aBmpEx = ::vcl::unotools::bitmapExFromXBitmap(xIntBmp);
         if( !!aBmpEx )
             return aBmpEx;
 
         // TODO(F1): extract pixel from XBitmap interface
-        ENSURE_OR_THROW( false,
+        ENSURE_OR_THROW( false, 
                          "bitmapExFromXBitmap(): could not extract BitmapEx" );
-
+ 
         return ::BitmapEx();
     }
 
@@ -408,7 +408,7 @@ namespace cairocanvas
         SurfaceSharedPtr pSurface = surfaceFromXBitmap( xBitmap );
         if( pSurface )
             data = NULL;
-        else
+        else 
         {
             ::BitmapEx aBmpEx = bitmapExFromXBitmap(xBitmap);
             ::Bitmap aBitmap = aBmpEx.GetBitmap();
@@ -425,10 +425,10 @@ namespace cairocanvas
             if( !pSurface ) {
                 AlphaMask aAlpha = aBmpEx.GetAlpha();
 
-                ::BitmapReadAccess* pBitmapReadAcc = aBitmap.AcquireReadAccess();
-                ::BitmapReadAccess* pAlphaReadAcc = NULL;
-                const long      nWidth = pBitmapReadAcc->Width();
-                const long      nHeight = pBitmapReadAcc->Height();
+                ::BitmapReadAccess*	pBitmapReadAcc = aBitmap.AcquireReadAccess();
+                ::BitmapReadAccess*	pAlphaReadAcc = NULL;
+                const long		nWidth = pBitmapReadAcc->Width();
+                const long		nHeight = pBitmapReadAcc->Height();
                 long nX, nY;
                 bool bIsAlpha = false;
 
@@ -624,29 +624,29 @@ namespace cairocanvas
                         }
                     }
                 }
-
+            
                 aBitmap.ReleaseAccess( pBitmapReadAcc );
                 if( pAlphaReadAcc )
                     aAlpha.ReleaseAccess( pAlphaReadAcc );
 
                 SurfaceSharedPtr pImageSurface = createSurface(
                     CairoSurfaceSharedPtr(
-                        cairo_image_surface_create_for_data(
+                        cairo_image_surface_create_for_data( 
                             data,
                             bIsAlpha ? CAIRO_FORMAT_ARGB32 : CAIRO_FORMAT_RGB24,
                             nWidth, nHeight, nWidth*4 ),
                         &cairo_surface_destroy) );
+                
+                // 		pSurface = rSurfaceProvider->getSurface( ::basegfx::B2ISize( nWidth, nHeight ), bIsAlpha ? CAIRO_CONTENT_COLOR_ALPHA : CAIRO_CONTENT_COLOR );
+                // 		Cairo* pTargetCairo = cairo_create( pSurface );
+                // 		cairo_set_source_surface( pTargetCairo, pImageSurface, 0, 0 );
 
-                //      pSurface = rSurfaceProvider->getSurface( ::basegfx::B2ISize( nWidth, nHeight ), bIsAlpha ? CAIRO_CONTENT_COLOR_ALPHA : CAIRO_CONTENT_COLOR );
-                //      Cairo* pTargetCairo = cairo_create( pSurface );
-                //      cairo_set_source_surface( pTargetCairo, pImageSurface, 0, 0 );
-
-                //                  //if( !bIsAlpha )
-                //                  //cairo_set_operator( pTargetCairo, CAIRO_OPERATOR_SOURCE );
+                // 				    //if( !bIsAlpha )
+                // 				    //cairo_set_operator( pTargetCairo, CAIRO_OPERATOR_SOURCE );
 
-                //      cairo_paint( pTargetCairo );
-                //      cairo_destroy( pTargetCairo );
-                //      cairo_surface_destroy( pImageSurface );
+                // 		cairo_paint( pTargetCairo );
+                // 		cairo_destroy( pTargetCairo );
+                // 		cairo_surface_destroy( pImageSurface );
                 pSurface = pImageSurface;
 
                 bHasAlpha = bIsAlpha;
@@ -810,10 +810,10 @@ namespace cairocanvas
             uno::Reference< lang::XServiceInfo > xRef( aTexture.Gradient, uno::UNO_QUERY );
 
             OSL_TRACE( "gradient fill" );
-            if( xRef.is() &&
+            if( xRef.is() && 
             xRef->getImplementationName().equals( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( PARAMETRICPOLYPOLYGON_IMPLEMENTATION_NAME ) ) ) ) {
                 // TODO(Q1): Maybe use dynamic_cast here
-
+                
                 // TODO(E1): Return value
                 // TODO(F1): FillRule
             OSL_TRACE( "known implementation" );
@@ -827,12 +827,12 @@ namespace cairocanvas
                        aTransform.m11, aTransform.m02, aTransform.m12);
             if( pPolyImpl->getValues().meType == canvas::ParametricPolyPolygon::GRADIENT_RECTANGULAR )
             {
-                // no general path gradient yet in cairo; emulate then
+                // no general path gradient yet in cairo; emulate then                
                 cairo_save( pCairo );
                 cairo_clip( pCairo );
 
                 // fill bound rect with start color
-                cairo_rectangle( pCairo, rBounds.getMinX(), rBounds.getMinY(),
+                cairo_rectangle( pCairo, rBounds.getMinX(), rBounds.getMinY(), 
                                  rBounds.getWidth(), rBounds.getHeight() );
                 setColor(pCairo,pPolyImpl->getValues().maColors[0]);
                 cairo_fill(pCairo);
@@ -840,8 +840,8 @@ namespace cairocanvas
                 cairo_transform( pCairo, &aTextureMatrix );
 
                 // longest line in gradient bound rect
-                const unsigned int nGradientSize(
-                    static_cast<unsigned int>(
+                const unsigned int nGradientSize( 
+                    static_cast<unsigned int>( 
                         ::basegfx::B2DVector(rBounds.getMinimum() - rBounds.getMaximum()).getLength() + 1.0 ) );
 
                 // typical number for pixel of the same color (strip size)
@@ -849,10 +849,10 @@ namespace cairocanvas
 
                 // use at least three steps, and at utmost the number of color
                 // steps
-                const unsigned int nStepCount(
-                    ::std::max(
+                const unsigned int nStepCount( 
+                    ::std::max( 
                         3U,
-                        ::std::min(
+                        ::std::min( 
                             nGradientSize / nStripSize,
                             128U )) + 1 );
 
@@ -860,7 +860,7 @@ namespace cairocanvas
                 basegfx::tools::KeyStopLerp aLerper(pPolyImpl->getValues().maStops);
                 for( unsigned int i=1; i<nStepCount; ++i )
                 {
-                    const double fT( i/double(nStepCount) );
+                    const double fT( i/double(nStepCount) );            
 
                     std::ptrdiff_t nIndex;
                     double fAlpha;
@@ -939,7 +939,7 @@ namespace cairocanvas
                                       rendering::FillRule eFillrule )
     {
         if( pTextures )
-            ENSURE_ARG_OR_THROW( pTextures->getLength(),
+            ENSURE_ARG_OR_THROW( pTextures->getLength(), 
                              "CanvasHelper::fillTexturedPolyPolygon: empty texture sequence");
 
     bool bOpToDo = false;
@@ -950,8 +950,8 @@ namespace cairocanvas
     cairo_matrix_init_identity( &aIdentityMatrix );
     cairo_set_matrix( pCairo, &aIdentityMatrix );
 
-    cairo_set_fill_rule( pCairo,
-                         eFillrule == rendering::FillRule_EVEN_ODD ?
+    cairo_set_fill_rule( pCairo, 
+                         eFillrule == rendering::FillRule_EVEN_ODD ? 
                          CAIRO_FILL_RULE_EVEN_ODD : CAIRO_FILL_RULE_WINDING );
 
     for( sal_uInt32 nPolygonIndex = 0; nPolygonIndex < aPolyPolygon.count(); nPolygonIndex++ ) {
@@ -959,7 +959,7 @@ namespace cairocanvas
         const sal_uInt32 nPointCount( aPolygon.count() );
         // to correctly render closed curves, need to output first
         // point twice (so output one additional point)
-        const sal_uInt32 nExtendedPointCount( nPointCount +
+        const sal_uInt32 nExtendedPointCount( nPointCount + 
                                               aPolygon.isClosed()*aPolygon.areControlPointsUsed() );
 
         if( nPointCount > 1) {
@@ -998,7 +998,7 @@ namespace cairocanvas
                     nAY = aA.getY();
                     nBX = aB.getX();
                     nBY = aB.getY();
-
+                
                     if( aOperation == Stroke ) {
                         nAX += 0.5;
                         nAY += 0.5;
@@ -1007,7 +1007,7 @@ namespace cairocanvas
                     }
                     cairo_matrix_transform_point( &aOrigMatrix, &nAX, &nAY );
                     cairo_matrix_transform_point( &aOrigMatrix, &nBX, &nBY );
-                    cairo_curve_to( pCairo, nAX, nAY, nBX, nBY, nX, nY );
+                    cairo_curve_to( pCairo, nAX, nAY, nBX, nBY, nX, nY );                
                 } else {
                     cairo_line_to( pCairo, nX, nY );
                     OSL_TRACE( "line to %f,%f", nX, nY );
@@ -1048,7 +1048,7 @@ namespace cairocanvas
                         const uno::Sequence< rendering::Texture >* pTextures,
                         Cairo* pCairo ) const
     {
-        const ::basegfx::B2DPolyPolygon& rPolyPoly(
+        const ::basegfx::B2DPolyPolygon& rPolyPoly( 
             ::basegfx::unotools::b2DPolyPolygonFromXPolyPolygon2D(xPolyPolygon) );
 
         if( !pCairo )
@@ -1075,7 +1075,7 @@ namespace cairocanvas
                         aEdge.setB2DPoint(1, aCandidate.getB2DPoint(nNextIndex));
                         aEdge.setNextControlPoint(0, aCandidate.getNextControlPoint(b));
                         aEdge.setPrevControlPoint(1, aCandidate.getPrevControlPoint(nNextIndex));
-
+                        
                         doPolyPolygonImplementation( basegfx::B2DPolyPolygon(aEdge),
                                                      aOperation,
                                                      pCairo, pTextures,
@@ -1090,31 +1090,31 @@ namespace cairocanvas
         }
         else
         {
-            doPolyPolygonImplementation( rPolyPoly, aOperation,
-                                         pCairo, pTextures,
+            doPolyPolygonImplementation( rPolyPoly, aOperation, 
+                                         pCairo, pTextures, 
                                          mpSurfaceProvider,
                                          xPolyPolygon->getFillRule() );
         }
     }
 
-    uno::Reference< rendering::XCachedPrimitive > CanvasHelper::drawPolyPolygon( const rendering::XCanvas*                          ,
-                                                                                 const uno::Reference< rendering::XPolyPolygon2D >& xPolyPolygon,
-                                                                                 const rendering::ViewState&                        viewState,
-                                                                                 const rendering::RenderState&                      renderState )
+    uno::Reference< rendering::XCachedPrimitive > CanvasHelper::drawPolyPolygon( const rendering::XCanvas* 							, 
+                                                                                 const uno::Reference< rendering::XPolyPolygon2D >& xPolyPolygon, 
+                                                                                 const rendering::ViewState& 						viewState, 
+                                                                                 const rendering::RenderState& 						renderState )
     {
 #ifdef CAIRO_CANVAS_PERF_TRACE
         struct timespec aTimer;
         mxDevice->startPerfTrace( &aTimer );
 #endif
-
+        
         if( mpCairo ) {
             cairo_save( mpCairo.get() );
-
+            
             cairo_set_line_width( mpCairo.get(), 1 );
-
+            
             useStates( viewState, renderState, true );
             doPolyPolygonPath( xPolyPolygon, Stroke );
-
+            
             cairo_restore( mpCairo.get() );
         } else
             OSL_TRACE ("CanvasHelper called after it was disposed");
@@ -1126,11 +1126,11 @@ namespace cairocanvas
         return uno::Reference< rendering::XCachedPrimitive >(NULL);
     }
 
-    uno::Reference< rendering::XCachedPrimitive > CanvasHelper::strokePolyPolygon( const rendering::XCanvas*                            ,
-                                                                                   const uno::Reference< rendering::XPolyPolygon2D >&   xPolyPolygon,
-                                                                                   const rendering::ViewState&                          viewState,
-                                                                                   const rendering::RenderState&                        renderState,
-                                                                                   const rendering::StrokeAttributes&                   strokeAttributes )
+    uno::Reference< rendering::XCachedPrimitive > CanvasHelper::strokePolyPolygon( const rendering::XCanvas* 							, 
+                                                                                   const uno::Reference< rendering::XPolyPolygon2D >& 	xPolyPolygon, 
+                                                                                   const rendering::ViewState& 							viewState, 
+                                                                                   const rendering::RenderState& 						renderState, 
+                                                                                   const rendering::StrokeAttributes& 					strokeAttributes )
     {
     #ifdef CAIRO_CANVAS_PERF_TRACE
     struct timespec aTimer;
@@ -1166,7 +1166,7 @@ namespace cairocanvas
         bool bNoLineJoin(false);
 
         switch( strokeAttributes.JoinType ) {
-            // cairo doesn't have join type NONE so we use MITER as it's pretty close
+            // cairo doesn't have join type NONE so we use MITER as it's pretty close  
             case rendering::PathJoinType::NONE:
                 bNoLineJoin = true;
             case rendering::PathJoinType::MITER:
@@ -1204,43 +1204,43 @@ namespace cairocanvas
         return uno::Reference< rendering::XCachedPrimitive >(NULL);
     }
 
-    uno::Reference< rendering::XCachedPrimitive > CanvasHelper::strokeTexturedPolyPolygon( const rendering::XCanvas*                            ,
-                                                                                           const uno::Reference< rendering::XPolyPolygon2D >&   /*xPolyPolygon*/,
-                                                                                           const rendering::ViewState&                          /*viewState*/,
-                                                                                           const rendering::RenderState&                        /*renderState*/,
-                                                                                           const uno::Sequence< rendering::Texture >&           /*textures*/,
-                                                                                           const rendering::StrokeAttributes&                   /*strokeAttributes*/ )
+    uno::Reference< rendering::XCachedPrimitive > CanvasHelper::strokeTexturedPolyPolygon( const rendering::XCanvas* 							, 
+                                                                                           const uno::Reference< rendering::XPolyPolygon2D >& 	/*xPolyPolygon*/, 
+                                                                                           const rendering::ViewState& 							/*viewState*/, 
+                                                                                           const rendering::RenderState& 						/*renderState*/, 
+                                                                                           const uno::Sequence< rendering::Texture >& 			/*textures*/, 
+                                                                                           const rendering::StrokeAttributes& 					/*strokeAttributes*/ )
     {
         // TODO
         return uno::Reference< rendering::XCachedPrimitive >(NULL);
     }
 
-    uno::Reference< rendering::XCachedPrimitive > CanvasHelper::strokeTextureMappedPolyPolygon( const rendering::XCanvas*                           ,
-                                                                                                const uno::Reference< rendering::XPolyPolygon2D >&  /*xPolyPolygon*/,
-                                                                                                const rendering::ViewState&                         /*viewState*/,
-                                                                                                const rendering::RenderState&                       /*renderState*/,
-                                                                                                const uno::Sequence< rendering::Texture >&          /*textures*/,
-                                                                                                const uno::Reference< geometry::XMapping2D >&       /*xMapping*/,
-                                                                                                const rendering::StrokeAttributes&                  /*strokeAttributes*/ )
+    uno::Reference< rendering::XCachedPrimitive > CanvasHelper::strokeTextureMappedPolyPolygon( const rendering::XCanvas* 							, 
+                                                                                                const uno::Reference< rendering::XPolyPolygon2D >&	/*xPolyPolygon*/, 
+                                                                                                const rendering::ViewState& 						/*viewState*/, 
+                                                                                                const rendering::RenderState& 						/*renderState*/, 
+                                                                                                const uno::Sequence< rendering::Texture >& 			/*textures*/, 
+                                                                                                const uno::Reference< geometry::XMapping2D >& 		/*xMapping*/, 
+                                                                                                const rendering::StrokeAttributes& 					/*strokeAttributes*/ )
     {
         // TODO
         return uno::Reference< rendering::XCachedPrimitive >(NULL);
     }
 
-    uno::Reference< rendering::XPolyPolygon2D >   CanvasHelper::queryStrokeShapes( const rendering::XCanvas*                            ,
-                                                                                   const uno::Reference< rendering::XPolyPolygon2D >&   /*xPolyPolygon*/,
-                                                                                   const rendering::ViewState&                          /*viewState*/,
-                                                                                   const rendering::RenderState&                        /*renderState*/,
-                                                                                   const rendering::StrokeAttributes&                   /*strokeAttributes*/ )
+    uno::Reference< rendering::XPolyPolygon2D >   CanvasHelper::queryStrokeShapes( const rendering::XCanvas* 							, 
+                                                                                   const uno::Reference< rendering::XPolyPolygon2D >& 	/*xPolyPolygon*/, 
+                                                                                   const rendering::ViewState& 							/*viewState*/, 
+                                                                                   const rendering::RenderState& 						/*renderState*/, 
+                                                                                   const rendering::StrokeAttributes& 					/*strokeAttributes*/ )
     {
         // TODO
         return uno::Reference< rendering::XPolyPolygon2D >(NULL);
     }
 
-    uno::Reference< rendering::XCachedPrimitive > CanvasHelper::fillPolyPolygon( const rendering::XCanvas*                          ,
-                                                                                 const uno::Reference< rendering::XPolyPolygon2D >& xPolyPolygon,
-                                                                                 const rendering::ViewState&                        viewState,
-                                                                                 const rendering::RenderState&                      renderState )
+    uno::Reference< rendering::XCachedPrimitive > CanvasHelper::fillPolyPolygon( const rendering::XCanvas* 							, 
+                                                                                 const uno::Reference< rendering::XPolyPolygon2D >& xPolyPolygon, 
+                                                                                 const rendering::ViewState& 						viewState, 
+                                                                                 const rendering::RenderState& 						renderState )
     {
     #ifdef CAIRO_CANVAS_PERF_TRACE
     struct timespec aTimer;
@@ -1252,7 +1252,7 @@ namespace cairocanvas
 
         useStates( viewState, renderState, true );
         doPolyPolygonPath( xPolyPolygon, Fill );
-
+        
         cairo_restore( mpCairo.get() );
     } else
         OSL_TRACE ("CanvasHelper called after it was disposed");
@@ -1264,11 +1264,11 @@ namespace cairocanvas
         return uno::Reference< rendering::XCachedPrimitive >(NULL);
     }
 
-    uno::Reference< rendering::XCachedPrimitive > CanvasHelper::fillTexturedPolyPolygon( const rendering::XCanvas*                          ,
+    uno::Reference< rendering::XCachedPrimitive > CanvasHelper::fillTexturedPolyPolygon( const rendering::XCanvas* 							, 
                                                                                          const uno::Reference< rendering::XPolyPolygon2D >& xPolyPolygon,
-                                                                                         const rendering::ViewState&                        viewState,
-                                                                                         const rendering::RenderState&                      renderState,
-                                                                                         const uno::Sequence< rendering::Texture >&         textures )
+                                                                                         const rendering::ViewState& 						viewState,
+                                                                                         const rendering::RenderState& 						renderState,
+                                                                                         const uno::Sequence< rendering::Texture >& 		textures )
     {
     if( mpCairo ) {
         cairo_save( mpCairo.get() );
@@ -1282,19 +1282,19 @@ namespace cairocanvas
         return uno::Reference< rendering::XCachedPrimitive >(NULL);
     }
 
-    uno::Reference< rendering::XCachedPrimitive > CanvasHelper::fillTextureMappedPolyPolygon( const rendering::XCanvas*                             ,
-                                                                                              const uno::Reference< rendering::XPolyPolygon2D >&    /*xPolyPolygon*/,
-                                                                                              const rendering::ViewState&                           /*viewState*/,
-                                                                                              const rendering::RenderState&                         /*renderState*/,
-                                                                                              const uno::Sequence< rendering::Texture >&            /*textures*/,
-                                                                                              const uno::Reference< geometry::XMapping2D >&         /*xMapping*/ )
+    uno::Reference< rendering::XCachedPrimitive > CanvasHelper::fillTextureMappedPolyPolygon( const rendering::XCanvas* 							, 
+                                                                                              const uno::Reference< rendering::XPolyPolygon2D >& 	/*xPolyPolygon*/, 
+                                                                                              const rendering::ViewState& 							/*viewState*/, 
+                                                                                              const rendering::RenderState& 						/*renderState*/, 
+                                                                                              const uno::Sequence< rendering::Texture >& 			/*textures*/, 
+                                                                                              const uno::Reference< geometry::XMapping2D >& 		/*xMapping*/ )
     {
         // TODO
         return uno::Reference< rendering::XCachedPrimitive >(NULL);
     }
 
-    uno::Reference< rendering::XCachedPrimitive > CanvasHelper::implDrawBitmapSurface( const rendering::XCanvas*        pCanvas,
-                                                                                       const SurfaceSharedPtr&        pInputSurface,
+    uno::Reference< rendering::XCachedPrimitive > CanvasHelper::implDrawBitmapSurface( const rendering::XCanvas* 	    pCanvas, 
+                                                                                       const SurfaceSharedPtr&        pInputSurface, 
                                                                                        const rendering::ViewState&      viewState,
                                                                                        const rendering::RenderState&    renderState,
                                                                                        const geometry::IntegerSize2D&   rSize,
@@ -1313,8 +1313,8 @@ namespace cairocanvas
 
             useStates( viewState, renderState, true );
 
-            //          if( !bHasAlpha )
-            //          cairo_set_operator( mpCairo.get(), CAIRO_OPERATOR_SOURCE );
+            //   	    if( !bHasAlpha )
+            //   		cairo_set_operator( mpCairo.get(), CAIRO_OPERATOR_SOURCE );
 
             Matrix aMatrix;
 
@@ -1333,7 +1333,7 @@ namespace cairocanvas
                 aBitmapSize.Width = static_cast<sal_Int32>( dWidth );
                 aBitmapSize.Height = static_cast<sal_Int32>( dHeight );
 
-                SurfaceSharedPtr pScaledSurface = mpSurfaceProvider->createSurface(
+                SurfaceSharedPtr pScaledSurface = mpSurfaceProvider->createSurface( 
                     ::basegfx::B2ISize( aBitmapSize.Width, aBitmapSize.Height ),
                     bHasAlpha ? CAIRO_CONTENT_COLOR_ALPHA : CAIRO_CONTENT_COLOR );
                 CairoSharedPtr pCairo = pScaledSurface->getCairo();
@@ -1349,9 +1349,9 @@ namespace cairocanvas
                 aMatrix.xx = aMatrix.yy = 1;
                 cairo_set_matrix( mpCairo.get(), &aMatrix );
 
-                rv = uno::Reference< rendering::XCachedPrimitive >(
-                    new CachedBitmap( pSurface, viewState, renderState,
-                                      // cast away const, need to
+                rv = uno::Reference< rendering::XCachedPrimitive >( 
+                    new CachedBitmap( pSurface, viewState, renderState, 
+                                      // cast away const, need to   
                                       // change refcount (as this is
                                       // ~invisible to client code,
                                       // still logically const)
@@ -1409,10 +1409,10 @@ namespace cairocanvas
         return rv; // uno::Reference< rendering::XCachedPrimitive >(NULL);
     }
 
-    uno::Reference< rendering::XCachedPrimitive > CanvasHelper::drawBitmap( const rendering::XCanvas*                   pCanvas,
-                                                                            const uno::Reference< rendering::XBitmap >& xBitmap,
-                                                                            const rendering::ViewState&                 viewState,
-                                                                            const rendering::RenderState&               renderState )
+    uno::Reference< rendering::XCachedPrimitive > CanvasHelper::drawBitmap( const rendering::XCanvas* 					pCanvas, 
+                                                                            const uno::Reference< rendering::XBitmap >& xBitmap, 
+                                                                            const rendering::ViewState& 				viewState, 
+                                                                            const rendering::RenderState& 				renderState )
     {
     #ifdef CAIRO_CANVAS_PERF_TRACE
     struct timespec aTimer;
@@ -1440,10 +1440,10 @@ namespace cairocanvas
     return rv;
     }
 
-    uno::Reference< rendering::XCachedPrimitive > CanvasHelper::drawBitmapModulated( const rendering::XCanvas*                      pCanvas,
-                                                                                     const uno::Reference< rendering::XBitmap >&    xBitmap,
-                                                                                     const rendering::ViewState&                    viewState,
-                                                                                     const rendering::RenderState&                  renderState )
+    uno::Reference< rendering::XCachedPrimitive > CanvasHelper::drawBitmapModulated( const rendering::XCanvas* 						pCanvas, 
+                                                                                     const uno::Reference< rendering::XBitmap >& 	xBitmap, 
+                                                                                     const rendering::ViewState& 					viewState, 
+                                                                                     const rendering::RenderState& 					renderState )
     {
 #ifdef CAIRO_CANVAS_PERF_TRACE
         struct timespec aTimer;
@@ -1476,14 +1476,14 @@ namespace cairocanvas
         return uno::Reference< rendering::XGraphicDevice >(mpDevice);
     }
 
-    void CanvasHelper::copyRect( const rendering::XCanvas*                          ,
-                                 const uno::Reference< rendering::XBitmapCanvas >&  /*sourceCanvas*/,
-                                 const geometry::RealRectangle2D&                   /*sourceRect*/,
-                                 const rendering::ViewState&                        /*sourceViewState*/,
-                                 const rendering::RenderState&                      /*sourceRenderState*/,
-                                 const geometry::RealRectangle2D&                   /*destRect*/,
-                                 const rendering::ViewState&                        /*destViewState*/,
-                                 const rendering::RenderState&                      /*destRenderState*/ )
+    void CanvasHelper::copyRect( const rendering::XCanvas* 							, 
+                                 const uno::Reference< rendering::XBitmapCanvas >&	/*sourceCanvas*/, 
+                                 const geometry::RealRectangle2D& 					/*sourceRect*/, 
+                                 const rendering::ViewState& 						/*sourceViewState*/, 
+                                 const rendering::RenderState& 						/*sourceRenderState*/, 
+                                 const geometry::RealRectangle2D& 					/*destRect*/, 
+                                 const rendering::ViewState& 						/*destViewState*/, 
+                                 const rendering::RenderState& 						/*destRenderState*/ )
     {
         // TODO(F2): copyRect NYI
     }
@@ -1496,8 +1496,8 @@ namespace cairocanvas
         return ::basegfx::unotools::integerSize2DFromB2ISize( maSize );
     }
 
-    uno::Reference< rendering::XBitmap > CanvasHelper::getScaledBitmap( const geometry::RealSize2D& newSize,
-                                                                        sal_Bool                    /*beFast*/ )
+    uno::Reference< rendering::XBitmap > CanvasHelper::getScaledBitmap( const geometry::RealSize2D&	newSize, 
+                                                                        sal_Bool 					/*beFast*/ )
     {
 #ifdef CAIRO_CANVAS_PERF_TRACE
         struct timespec aTimer;
@@ -1518,7 +1518,7 @@ namespace cairocanvas
         return uno::Reference< rendering::XBitmap >();
     }
 
-    uno::Sequence< sal_Int8 > CanvasHelper::getData( rendering::IntegerBitmapLayout&     aLayout,
+    uno::Sequence< sal_Int8 > CanvasHelper::getData( rendering::IntegerBitmapLayout&     aLayout, 
                                                      const geometry::IntegerRectangle2D& rect )
     {
         if( mpCairo ) {
@@ -1536,30 +1536,30 @@ namespace cairocanvas
             cairo_paint( pCairo );
             cairo_destroy( pCairo );
             cairo_surface_destroy( pImageSurface );
-
+ 
             aLayout.ScanLines = nHeight;
             aLayout.ScanLineBytes = nWidth*4;
             aLayout.ScanLineStride = aLayout.ScanLineBytes;
-
+ 
             return aRes;
         }
-
+ 
         return uno::Sequence< sal_Int8 >();
     }
 
-    void CanvasHelper::setData( const uno::Sequence< sal_Int8 >&        /*data*/,
-                                const rendering::IntegerBitmapLayout&   /*bitmapLayout*/,
-                                const geometry::IntegerRectangle2D&     /*rect*/ )
+    void CanvasHelper::setData( const uno::Sequence< sal_Int8 >& 		/*data*/, 
+                                const rendering::IntegerBitmapLayout&   /*bitmapLayout*/, 
+                                const geometry::IntegerRectangle2D& 	/*rect*/ )
     {
     }
 
-    void CanvasHelper::setPixel( const uno::Sequence< sal_Int8 >&       /*color*/,
-                                 const rendering::IntegerBitmapLayout&  /*bitmapLayout*/,
+    void CanvasHelper::setPixel( const uno::Sequence< sal_Int8 >&       /*color*/, 
+                                 const rendering::IntegerBitmapLayout&  /*bitmapLayout*/, 
                                  const geometry::IntegerPoint2D&        /*pos*/ )
     {
     }
 
-    uno::Sequence< sal_Int8 > CanvasHelper::getPixel( rendering::IntegerBitmapLayout&   /*bitmapLayout*/,
+    uno::Sequence< sal_Int8 > CanvasHelper::getPixel( rendering::IntegerBitmapLayout&   /*bitmapLayout*/, 
                                                       const geometry::IntegerPoint2D&   /*pos*/ )
     {
         return uno::Sequence< sal_Int8 >();
@@ -1571,8 +1571,8 @@ namespace cairocanvas
         return uno::Reference< rendering::XBitmapPalette >();
     }
 
-    namespace
-    {
+    namespace 
+    { 
         class CairoColorSpace : public cppu::WeakImplHelper1< com::sun::star::rendering::XIntegerBitmapColorSpace >
         {
         private:
@@ -1595,8 +1595,8 @@ namespace cairocanvas
             {
                 return uno::Sequence< beans::PropertyValue >();
             }
-            virtual uno::Sequence< double > SAL_CALL convertColorSpace( const uno::Sequence< double >& deviceColor,
-                                                                        const uno::Reference< rendering::XColorSpace >& targetColorSpace ) throw (lang::IllegalArgumentException,
+            virtual uno::Sequence< double > SAL_CALL convertColorSpace( const uno::Sequence< double >& deviceColor, 
+                                                                        const uno::Reference< rendering::XColorSpace >& targetColorSpace ) throw (lang::IllegalArgumentException, 
                                                                                                                                                   uno::RuntimeException)
             {
                 // TODO(P3): if we know anything about target
@@ -1609,7 +1609,7 @@ namespace cairocanvas
             {
                 const double*  pIn( deviceColor.getConstArray() );
                 const sal_Size nLen( deviceColor.getLength() );
-                ENSURE_ARG_OR_THROW2(nLen%4==0,
+                ENSURE_ARG_OR_THROW2(nLen%4==0, 
                                      "number of channels no multiple of 4",
                                      static_cast<rendering::XColorSpace*>(this), 0);
 
@@ -1630,7 +1630,7 @@ namespace cairocanvas
             {
                 const double*  pIn( deviceColor.getConstArray() );
                 const sal_Size nLen( deviceColor.getLength() );
-                ENSURE_ARG_OR_THROW2(nLen%4==0,
+                ENSURE_ARG_OR_THROW2(nLen%4==0, 
                                      "number of channels no multiple of 4",
                                      static_cast<rendering::XColorSpace*>(this), 0);
 
@@ -1651,7 +1651,7 @@ namespace cairocanvas
             {
                 const double*  pIn( deviceColor.getConstArray() );
                 const sal_Size nLen( deviceColor.getLength() );
-                ENSURE_ARG_OR_THROW2(nLen%4==0,
+                ENSURE_ARG_OR_THROW2(nLen%4==0, 
                                      "number of channels no multiple of 4",
                                      static_cast<rendering::XColorSpace*>(this), 0);
 
@@ -1729,15 +1729,15 @@ namespace cairocanvas
             {
                 return util::Endianness::LITTLE;
             }
-            virtual uno::Sequence<double> SAL_CALL convertFromIntegerColorSpace( const uno::Sequence< ::sal_Int8 >& deviceColor,
-                                                                                 const uno::Reference< rendering::XColorSpace >& targetColorSpace ) throw (lang::IllegalArgumentException,
+            virtual uno::Sequence<double> SAL_CALL convertFromIntegerColorSpace( const uno::Sequence< ::sal_Int8 >& deviceColor, 
+                                                                                 const uno::Reference< rendering::XColorSpace >& targetColorSpace ) throw (lang::IllegalArgumentException, 
                                                                                                                                                            uno::RuntimeException)
             {
                 if( dynamic_cast<CairoColorSpace*>(targetColorSpace.get()) )
                 {
                     const sal_Int8* pIn( deviceColor.getConstArray() );
                     const sal_Size  nLen( deviceColor.getLength() );
-                    ENSURE_ARG_OR_THROW2(nLen%4==0,
+                    ENSURE_ARG_OR_THROW2(nLen%4==0, 
                                          "number of channels no multiple of 4",
                                          static_cast<rendering::XColorSpace*>(this), 0);
 
@@ -1761,8 +1761,8 @@ namespace cairocanvas
                     return targetColorSpace->convertFromARGB(aIntermediate);
                 }
             }
-            virtual uno::Sequence< ::sal_Int8 > SAL_CALL convertToIntegerColorSpace( const uno::Sequence< ::sal_Int8 >& deviceColor,
-                                                                                     const uno::Reference< rendering::XIntegerBitmapColorSpace >& targetColorSpace ) throw (lang::IllegalArgumentException,
+            virtual uno::Sequence< ::sal_Int8 > SAL_CALL convertToIntegerColorSpace( const uno::Sequence< ::sal_Int8 >& deviceColor, 
+                                                                                     const uno::Reference< rendering::XIntegerBitmapColorSpace >& targetColorSpace ) throw (lang::IllegalArgumentException, 
                                                                                                                                                                             uno::RuntimeException)
             {
                 if( dynamic_cast<CairoColorSpace*>(targetColorSpace.get()) )
@@ -1783,7 +1783,7 @@ namespace cairocanvas
             {
                 const sal_Int8* pIn( deviceColor.getConstArray() );
                 const sal_Size  nLen( deviceColor.getLength() );
-                ENSURE_ARG_OR_THROW2(nLen%4==0,
+                ENSURE_ARG_OR_THROW2(nLen%4==0, 
                                      "number of channels no multiple of 4",
                                      static_cast<rendering::XColorSpace*>(this), 0);
 
@@ -1808,7 +1808,7 @@ namespace cairocanvas
             {
                 const sal_Int8* pIn( deviceColor.getConstArray() );
                 const sal_Size  nLen( deviceColor.getLength() );
-                ENSURE_ARG_OR_THROW2(nLen%4==0,
+                ENSURE_ARG_OR_THROW2(nLen%4==0, 
                                      "number of channels no multiple of 4",
                                      static_cast<rendering::XColorSpace*>(this), 0);
 
@@ -1833,7 +1833,7 @@ namespace cairocanvas
             {
                 const sal_Int8* pIn( deviceColor.getConstArray() );
                 const sal_Size  nLen( deviceColor.getLength() );
-                ENSURE_ARG_OR_THROW2(nLen%4==0,
+                ENSURE_ARG_OR_THROW2(nLen%4==0, 
                                      "number of channels no multiple of 4",
                                      static_cast<rendering::XColorSpace*>(this), 0);
 
@@ -1906,7 +1906,7 @@ namespace cairocanvas
             }
 
         public:
-            CairoColorSpace() :
+            CairoColorSpace() : 
                 maComponentTags(4),
                 maBitCounts(4)
             {
@@ -1917,21 +1917,21 @@ namespace cairocanvas
                 pTags[2] = rendering::ColorComponentTag::RGB_RED;
                 pTags[3] = rendering::ColorComponentTag::PREMULTIPLIED_ALPHA;
 
-                pBitCounts[0] =
-                    pBitCounts[1] =
-                    pBitCounts[2] =
+                pBitCounts[0] = 
+                    pBitCounts[1] = 
+                    pBitCounts[2] = 
                     pBitCounts[3] = 8;
             }
         };
 
         struct CairoColorSpaceHolder : public rtl::StaticWithInit<uno::Reference<rendering::XIntegerBitmapColorSpace>,
-                                                                     CairoColorSpaceHolder>
+                                                                     CairoColorSpaceHolder> 
         {
             uno::Reference<rendering::XIntegerBitmapColorSpace> operator()()
             {
                 return new CairoColorSpace();
             }
-        };
+        }; 
     }
 
     rendering::IntegerBitmapLayout CanvasHelper::getMemoryLayout()
@@ -1964,7 +1964,7 @@ namespace cairocanvas
 
     bool CanvasHelper::repaint( const SurfaceSharedPtr& pSurface,
                                 const rendering::ViewState&      viewState,
-                                const rendering::RenderState&    renderState )
+                                const rendering::RenderState&	 renderState )
     {
         OSL_TRACE("CanvasHelper::repaint");
 
@@ -1982,8 +1982,8 @@ namespace cairocanvas
             aMatrix.xx = aMatrix.yy = 1;
             cairo_set_matrix( mpCairo.get(), &aMatrix );
 
-            //          if( !bHasAlpha )
-            //          cairo_set_operator( mpCairo.get(), CAIRO_OPERATOR_SOURCE );
+            //   	    if( !bHasAlpha )
+            //   		cairo_set_operator( mpCairo.get(), CAIRO_OPERATOR_SOURCE );
 
             cairo_set_source_surface( mpCairo.get(), pSurface->getCairoSurface().get(), 0, 0 );
             cairo_paint( mpCairo.get() );
diff --git a/canvas/source/cairo/cairo_canvashelper.hxx b/canvas/source/cairo/cairo_canvashelper.hxx
index d89429b77a25..e20da8fb3be7 100644
--- a/canvas/source/cairo/cairo_canvashelper.hxx
+++ b/canvas/source/cairo/cairo_canvashelper.hxx
@@ -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
@@ -94,170 +94,170 @@ namespace cairocanvas
         // XCanvas (only providing, not implementing the
         // interface. Also note subtle method parameter differences)
         void clear();
-        void drawPoint( const ::com::sun::star::rendering::XCanvas*     pCanvas,
-                        const ::com::sun::star::geometry::RealPoint2D&  aPoint,
-                        const ::com::sun::star::rendering::ViewState&   viewState,
+        void drawPoint( const ::com::sun::star::rendering::XCanvas* 	pCanvas, 
+                        const ::com::sun::star::geometry::RealPoint2D& 	aPoint, 
+                        const ::com::sun::star::rendering::ViewState& 	viewState, 
                         const ::com::sun::star::rendering::RenderState& renderState );
-        void drawLine( const ::com::sun::star::rendering::XCanvas*      pCanvas,
-                       const ::com::sun::star::geometry::RealPoint2D&   aStartPoint,
-                       const ::com::sun::star::geometry::RealPoint2D&   aEndPoint,
-                       const ::com::sun::star::rendering::ViewState&    viewState,
-                       const ::com::sun::star::rendering::RenderState&  renderState );
-        void drawBezier( const ::com::sun::star::rendering::XCanvas*            pCanvas,
-                         const ::com::sun::star::geometry::RealBezierSegment2D& aBezierSegment,
-                         const ::com::sun::star::geometry::RealPoint2D&         aEndPoint,
-                         const ::com::sun::star::rendering::ViewState&          viewState,
-                         const ::com::sun::star::rendering::RenderState&        renderState );
-        ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XCachedPrimitive >
-            drawPolyPolygon( const ::com::sun::star::rendering::XCanvas*            pCanvas,
-                             const ::com::sun::star::uno::Reference<
-                                     ::com::sun::star::rendering::XPolyPolygon2D >& xPolyPolygon,
-                             const ::com::sun::star::rendering::ViewState&          viewState,
-                             const ::com::sun::star::rendering::RenderState&        renderState );
-        ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XCachedPrimitive >
-            strokePolyPolygon( const ::com::sun::star::rendering::XCanvas*          pCanvas,
-                               const ::com::sun::star::uno::Reference<
-                                       ::com::sun::star::rendering::XPolyPolygon2D >&   xPolyPolygon,
-                               const ::com::sun::star::rendering::ViewState&        viewState,
-                               const ::com::sun::star::rendering::RenderState&      renderState,
+        void drawLine( const ::com::sun::star::rendering::XCanvas* 		pCanvas, 
+                       const ::com::sun::star::geometry::RealPoint2D& 	aStartPoint, 
+                       const ::com::sun::star::geometry::RealPoint2D& 	aEndPoint, 
+                       const ::com::sun::star::rendering::ViewState& 	viewState, 
+                       const ::com::sun::star::rendering::RenderState& 	renderState	);
+        void drawBezier( const ::com::sun::star::rendering::XCanvas* 			pCanvas, 
+                         const ::com::sun::star::geometry::RealBezierSegment2D&	aBezierSegment, 
+                         const ::com::sun::star::geometry::RealPoint2D& 		aEndPoint,
+                         const ::com::sun::star::rendering::ViewState& 			viewState, 
+                         const ::com::sun::star::rendering::RenderState& 		renderState );
+        ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XCachedPrimitive > 	
+            drawPolyPolygon( const ::com::sun::star::rendering::XCanvas* 			pCanvas, 
+                             const ::com::sun::star::uno::Reference< 
+                                     ::com::sun::star::rendering::XPolyPolygon2D >&	xPolyPolygon, 
+                             const ::com::sun::star::rendering::ViewState& 			viewState, 
+                             const ::com::sun::star::rendering::RenderState& 		renderState );
+        ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XCachedPrimitive > 	
+            strokePolyPolygon( const ::com::sun::star::rendering::XCanvas* 			pCanvas, 
+                               const ::com::sun::star::uno::Reference< 
+                                       ::com::sun::star::rendering::XPolyPolygon2D >& 	xPolyPolygon, 
+                               const ::com::sun::star::rendering::ViewState& 		viewState, 
+                               const ::com::sun::star::rendering::RenderState& 		renderState, 
                                const ::com::sun::star::rendering::StrokeAttributes& strokeAttributes );
-        ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XCachedPrimitive >
-            strokeTexturedPolyPolygon( const ::com::sun::star::rendering::XCanvas*          pCanvas,
-                                       const ::com::sun::star::uno::Reference<
-                                               ::com::sun::star::rendering::XPolyPolygon2D >&   xPolyPolygon,
-                                       const ::com::sun::star::rendering::ViewState&        viewState,
-                                       const ::com::sun::star::rendering::RenderState&      renderState,
-                                       const ::com::sun::star::uno::Sequence<
-                                               ::com::sun::star::rendering::Texture >&      textures,
+        ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XCachedPrimitive > 	
+            strokeTexturedPolyPolygon( const ::com::sun::star::rendering::XCanvas* 			pCanvas, 
+                                       const ::com::sun::star::uno::Reference< 
+                                               ::com::sun::star::rendering::XPolyPolygon2D >& 	xPolyPolygon, 
+                                       const ::com::sun::star::rendering::ViewState& 		viewState, 
+                                       const ::com::sun::star::rendering::RenderState& 		renderState, 
+                                       const ::com::sun::star::uno::Sequence< 
+                                               ::com::sun::star::rendering::Texture >& 		textures, 
                                        const ::com::sun::star::rendering::StrokeAttributes& strokeAttributes );
-        ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XCachedPrimitive >
-            strokeTextureMappedPolyPolygon( const ::com::sun::star::rendering::XCanvas*             pCanvas,
-                                            const ::com::sun::star::uno::Reference<
-                                                    ::com::sun::star::rendering::XPolyPolygon2D >&  xPolyPolygon,
-                                            const ::com::sun::star::rendering::ViewState&           viewState,
-                                            const ::com::sun::star::rendering::RenderState&         renderState,
-                                            const ::com::sun::star::uno::Sequence<
-                                                    ::com::sun::star::rendering::Texture >&         textures,
-                                            const ::com::sun::star::uno::Reference<
-                                                    ::com::sun::star::geometry::XMapping2D >&       xMapping,
-                                            const ::com::sun::star::rendering::StrokeAttributes&    strokeAttributes );
-        ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XPolyPolygon2D >
-            queryStrokeShapes( const ::com::sun::star::rendering::XCanvas*          pCanvas,
-                               const ::com::sun::star::uno::Reference<
-                                       ::com::sun::star::rendering::XPolyPolygon2D >&   xPolyPolygon,
-                               const ::com::sun::star::rendering::ViewState&        viewState,
-                               const ::com::sun::star::rendering::RenderState&      renderState,
+        ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XCachedPrimitive > 	
+            strokeTextureMappedPolyPolygon( const ::com::sun::star::rendering::XCanvas* 			pCanvas, 
+                                            const ::com::sun::star::uno::Reference< 
+                                                    ::com::sun::star::rendering::XPolyPolygon2D >& 	xPolyPolygon, 
+                                            const ::com::sun::star::rendering::ViewState& 			viewState, 
+                                            const ::com::sun::star::rendering::RenderState& 		renderState, 
+                                            const ::com::sun::star::uno::Sequence< 
+                                                    ::com::sun::star::rendering::Texture >& 		textures, 
+                                            const ::com::sun::star::uno::Reference< 
+                                                    ::com::sun::star::geometry::XMapping2D >& 		xMapping, 
+                                            const ::com::sun::star::rendering::StrokeAttributes& 	strokeAttributes );
+        ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XPolyPolygon2D >   	
+            queryStrokeShapes( const ::com::sun::star::rendering::XCanvas* 			pCanvas, 
+                               const ::com::sun::star::uno::Reference< 
+                                       ::com::sun::star::rendering::XPolyPolygon2D >& 	xPolyPolygon, 
+                               const ::com::sun::star::rendering::ViewState& 		viewState, 
+                               const ::com::sun::star::rendering::RenderState& 		renderState, 
                                const ::com::sun::star::rendering::StrokeAttributes& strokeAttributes );
-        ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XCachedPrimitive >
-            fillPolyPolygon( const ::com::sun::star::rendering::XCanvas*            pCanvas,
-                             const ::com::sun::star::uno::Reference<
-                                     ::com::sun::star::rendering::XPolyPolygon2D >&     xPolyPolygon,
-                             const ::com::sun::star::rendering::ViewState&          viewState,
-                             const ::com::sun::star::rendering::RenderState&        renderState );
-        ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XCachedPrimitive >
-            fillTexturedPolyPolygon( const ::com::sun::star::rendering::XCanvas*            pCanvas,
-                                     const ::com::sun::star::uno::Reference<
-                                             ::com::sun::star::rendering::XPolyPolygon2D >&     xPolyPolygon,
-                                     const ::com::sun::star::rendering::ViewState&          viewState,
-                                     const ::com::sun::star::rendering::RenderState&        renderState,
-                                     const ::com::sun::star::uno::Sequence<
-                                             ::com::sun::star::rendering::Texture >&        textures );
-        ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XCachedPrimitive >
-            fillTextureMappedPolyPolygon( const ::com::sun::star::rendering::XCanvas*           pCanvas,
-                                          const ::com::sun::star::uno::Reference<
-                                                  ::com::sun::star::rendering::XPolyPolygon2D >&    xPolyPolygon,
-                                          const ::com::sun::star::rendering::ViewState&         viewState,
-                                          const ::com::sun::star::rendering::RenderState&       renderState,
-                                          const ::com::sun::star::uno::Sequence<
-                                                  ::com::sun::star::rendering::Texture >&       textures,
-                                          const ::com::sun::star::uno::Reference<
-                                                  ::com::sun::star::geometry::XMapping2D >&         xMapping );
+        ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XCachedPrimitive > 	
+            fillPolyPolygon( const ::com::sun::star::rendering::XCanvas* 			pCanvas, 
+                             const ::com::sun::star::uno::Reference< 
+                                     ::com::sun::star::rendering::XPolyPolygon2D >& 	xPolyPolygon, 
+                             const ::com::sun::star::rendering::ViewState& 			viewState, 
+                             const ::com::sun::star::rendering::RenderState& 		renderState );
+        ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XCachedPrimitive > 	
+            fillTexturedPolyPolygon( const ::com::sun::star::rendering::XCanvas* 			pCanvas, 
+                                     const ::com::sun::star::uno::Reference< 
+                                             ::com::sun::star::rendering::XPolyPolygon2D >& 	xPolyPolygon, 
+                                     const ::com::sun::star::rendering::ViewState& 			viewState, 
+                                     const ::com::sun::star::rendering::RenderState& 		renderState, 
+                                     const ::com::sun::star::uno::Sequence< 
+                                             ::com::sun::star::rendering::Texture >& 		textures );
+        ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XCachedPrimitive > 	
+            fillTextureMappedPolyPolygon( const ::com::sun::star::rendering::XCanvas* 			pCanvas, 
+                                          const ::com::sun::star::uno::Reference< 
+                                                  ::com::sun::star::rendering::XPolyPolygon2D >& 	xPolyPolygon, 
+                                          const ::com::sun::star::rendering::ViewState& 		viewState, 
+                                          const ::com::sun::star::rendering::RenderState& 		renderState, 
+                                          const ::com::sun::star::uno::Sequence< 
+                                                  ::com::sun::star::rendering::Texture >& 		textures, 
+                                          const ::com::sun::star::uno::Reference< 
+                                                  ::com::sun::star::geometry::XMapping2D >& 		xMapping );
 
         ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XCanvasFont > SAL_CALL
-            createFont( const ::com::sun::star::rendering::XCanvas*             pCanvas,
-                        const ::com::sun::star::rendering::FontRequest&         fontRequest,
-                        const ::com::sun::star::uno::Sequence<
-                                ::com::sun::star::beans::PropertyValue >&       extraFontProperties,
-                        const ::com::sun::star::geometry::Matrix2D&             fontMatrix );
-
-        ::com::sun::star::uno::Sequence< ::com::sun::star::rendering::FontInfo >
-            queryAvailableFonts( const ::com::sun::star::rendering::XCanvas*        pCanvas,
-                                 const ::com::sun::star::rendering::FontInfo&       aFilter,
-                                 const ::com::sun::star::uno::Sequence<
-                                         ::com::sun::star::beans::PropertyValue >&  aFontProperties );
-
-        ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XCachedPrimitive >
-            drawText( const ::com::sun::star::rendering::XCanvas*           pCanvas,
-                      const ::com::sun::star::rendering::StringContext&     text,
-                      const ::com::sun::star::uno::Reference<
-                              ::com::sun::star::rendering::XCanvasFont >&   xFont,
-                      const ::com::sun::star::rendering::ViewState&         viewState,
-                      const ::com::sun::star::rendering::RenderState&       renderState,
-                      sal_Int8                                              textDirection );
-
-        ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XCachedPrimitive >
-            drawTextLayout( const ::com::sun::star::rendering::XCanvas*     pCanvas,
-                            const ::com::sun::star::uno::Reference<
-                                ::com::sun::star::rendering::XTextLayout >& layoutetText,
-                            const ::com::sun::star::rendering::ViewState&   viewState,
+            createFont( const ::com::sun::star::rendering::XCanvas* 			pCanvas, 
+                        const ::com::sun::star::rendering::FontRequest& 		fontRequest, 
+                        const ::com::sun::star::uno::Sequence< 
+                                ::com::sun::star::beans::PropertyValue >& 		extraFontProperties, 
+                        const ::com::sun::star::geometry::Matrix2D& 			fontMatrix );
+
+        ::com::sun::star::uno::Sequence< ::com::sun::star::rendering::FontInfo > 
+            queryAvailableFonts( const ::com::sun::star::rendering::XCanvas* 		pCanvas, 
+                                 const ::com::sun::star::rendering::FontInfo& 		aFilter, 
+                                 const ::com::sun::star::uno::Sequence< 
+                                         ::com::sun::star::beans::PropertyValue >& 	aFontProperties );
+
+        ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XCachedPrimitive > 
+            drawText( const ::com::sun::star::rendering::XCanvas* 			pCanvas, 
+                      const ::com::sun::star::rendering::StringContext& 	text, 
+                      const ::com::sun::star::uno::Reference< 
+                              ::com::sun::star::rendering::XCanvasFont >& 	xFont, 
+                      const ::com::sun::star::rendering::ViewState& 		viewState, 
+                      const ::com::sun::star::rendering::RenderState& 		renderState, 
+                      sal_Int8 												textDirection );
+
+        ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XCachedPrimitive > 
+            drawTextLayout( const ::com::sun::star::rendering::XCanvas* 	pCanvas, 
+                            const ::com::sun::star::uno::Reference< 
+                                ::com::sun::star::rendering::XTextLayout >& layoutetText, 
+                            const ::com::sun::star::rendering::ViewState& 	viewState, 
                             const ::com::sun::star::rendering::RenderState& renderState );
 
-        ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XCachedPrimitive >
-            drawBitmap( const ::com::sun::star::rendering::XCanvas*     pCanvas,
-                        const ::com::sun::star::uno::Reference<
-                                ::com::sun::star::rendering::XBitmap >& xBitmap,
-                        const ::com::sun::star::rendering::ViewState&   viewState,
+        ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XCachedPrimitive > 	
+            drawBitmap( const ::com::sun::star::rendering::XCanvas* 	pCanvas, 
+                        const ::com::sun::star::uno::Reference< 
+                                ::com::sun::star::rendering::XBitmap >& xBitmap, 
+                        const ::com::sun::star::rendering::ViewState& 	viewState, 
                         const ::com::sun::star::rendering::RenderState& renderState );
-        ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XCachedPrimitive >
-            drawBitmapModulated( const ::com::sun::star::rendering::XCanvas*        pCanvas,
-                                 const ::com::sun::star::uno::Reference<
-                                         ::com::sun::star::rendering::XBitmap >&        xBitmap,
-                                 const ::com::sun::star::rendering::ViewState&      viewState,
-                                 const ::com::sun::star::rendering::RenderState&    renderState );
-        ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XGraphicDevice >
+        ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XCachedPrimitive > 	
+            drawBitmapModulated( const ::com::sun::star::rendering::XCanvas* 		pCanvas, 
+                                 const ::com::sun::star::uno::Reference< 
+                                         ::com::sun::star::rendering::XBitmap >&		xBitmap, 
+                                 const ::com::sun::star::rendering::ViewState& 		viewState, 
+                                 const ::com::sun::star::rendering::RenderState& 	renderState );
+        ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XGraphicDevice > 
             getDevice();
 
         // BitmapCanvasHelper functionality
         // ================================
 
-        void copyRect( const ::com::sun::star::rendering::XCanvas*          pCanvas,
-                       const ::com::sun::star::uno::Reference<
-                               ::com::sun::star::rendering::XBitmapCanvas >&    sourceCanvas,
-                       const ::com::sun::star::geometry::RealRectangle2D&   sourceRect,
-                       const ::com::sun::star::rendering::ViewState&        sourceViewState,
-                       const ::com::sun::star::rendering::RenderState&      sourceRenderState,
-                       const ::com::sun::star::geometry::RealRectangle2D&   destRect,
-                       const ::com::sun::star::rendering::ViewState&        destViewState,
-                       const ::com::sun::star::rendering::RenderState&      destRenderState );
-
+        void copyRect( const ::com::sun::star::rendering::XCanvas* 			pCanvas, 
+                       const ::com::sun::star::uno::Reference< 
+                               ::com::sun::star::rendering::XBitmapCanvas >& 	sourceCanvas, 
+                       const ::com::sun::star::geometry::RealRectangle2D& 	sourceRect, 
+                       const ::com::sun::star::rendering::ViewState& 		sourceViewState, 
+                       const ::com::sun::star::rendering::RenderState& 		sourceRenderState, 
+                       const ::com::sun::star::geometry::RealRectangle2D& 	destRect, 
+                       const ::com::sun::star::rendering::ViewState& 		destViewState, 
+                       const ::com::sun::star::rendering::RenderState& 		destRenderState );
+            
         ::com::sun::star::geometry::IntegerSize2D getSize();
 
-        ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XBitmap >
-            getScaledBitmap( const ::com::sun::star::geometry::RealSize2D&  newSize,
-                             sal_Bool                                       beFast );
+        ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XBitmap > 
+            getScaledBitmap( const ::com::sun::star::geometry::RealSize2D& 	newSize, 
+                             sal_Bool 										beFast );
 
-        ::com::sun::star::uno::Sequence< sal_Int8 >
-            getData( ::com::sun::star::rendering::IntegerBitmapLayout&      bitmapLayout,
+        ::com::sun::star::uno::Sequence< sal_Int8 > 
+            getData( ::com::sun::star::rendering::IntegerBitmapLayout& 		bitmapLayout,
                      const ::com::sun::star::geometry::IntegerRectangle2D&  rect );
 
-        void setData( const ::com::sun::star::uno::Sequence< sal_Int8 >&         data,
-                      const ::com::sun::star::rendering::IntegerBitmapLayout&    bitmapLayout,
+        void setData( const ::com::sun::star::uno::Sequence< sal_Int8 >&         data, 
+                      const ::com::sun::star::rendering::IntegerBitmapLayout&    bitmapLayout, 
                       const ::com::sun::star::geometry::IntegerRectangle2D&      rect );
 
-        void setPixel( const ::com::sun::star::uno::Sequence< sal_Int8 >&        color,
-                       const ::com::sun::star::rendering::IntegerBitmapLayout&   bitmapLayout,
+        void setPixel( const ::com::sun::star::uno::Sequence< sal_Int8 >&        color, 
+                       const ::com::sun::star::rendering::IntegerBitmapLayout&   bitmapLayout, 
                        const ::com::sun::star::geometry::IntegerPoint2D&         pos );
 
-        ::com::sun::star::uno::Sequence< sal_Int8 >
-            getPixel( ::com::sun::star::rendering::IntegerBitmapLayout& bitmapLayout,
+        ::com::sun::star::uno::Sequence< sal_Int8 > 
+            getPixel( ::com::sun::star::rendering::IntegerBitmapLayout& bitmapLayout, 
                       const ::com::sun::star::geometry::IntegerPoint2D& pos );
 
         ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XBitmapPalette > getPalette();
 
         ::com::sun::star::rendering::IntegerBitmapLayout getMemoryLayout();
-
+        
         // Flush drawing queue to screen
-        void                    flush() const;
+        void					flush() const;
 
         /** Called from XCanvas base classes, to notify that content
             is _about_ to change
@@ -270,26 +270,26 @@ namespace cairocanvas
         {
             LINE_COLOR, FILL_COLOR, TEXT_COLOR, IGNORE_COLOR
         };
-
+        
     void doPolyPolygonPath( const ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XPolyPolygon2D >& xPolyPolygon,
                   Operation aOperation,
                   bool bNoLineJoin = false,
                   const ::com::sun::star::uno::Sequence< ::com::sun::star::rendering::Texture >* pTextures=NULL,
                   ::cairo::Cairo* pCairo=NULL ) const;
 
-        ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XCachedPrimitive >
-    implDrawBitmapSurface(
-                   const ::com::sun::star::rendering::XCanvas*      pCanvas,
-                   const ::cairo::SurfaceSharedPtr&                 pSurface,
-                   const ::com::sun::star::rendering::ViewState&    viewState,
+        ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XCachedPrimitive > 	
+    implDrawBitmapSurface( 
+                   const ::com::sun::star::rendering::XCanvas* 	    pCanvas, 
+                   const ::cairo::SurfaceSharedPtr&                 pSurface, 
+                   const ::com::sun::star::rendering::ViewState& 	viewState, 
                    const ::com::sun::star::rendering::RenderState&  renderState,
                    const ::com::sun::star::geometry::IntegerSize2D& rSize,
                    bool bModulateColors,
                    bool bHasAlpha );
 
         bool repaint( const ::cairo::SurfaceSharedPtr& pSurface,
-              const ::com::sun::star::rendering::ViewState& viewState,
-              const ::com::sun::star::rendering::RenderState&   renderState );
+              const ::com::sun::star::rendering::ViewState&	viewState,
+              const ::com::sun::star::rendering::RenderState&	renderState );
 
     protected:
         /** Surface provider
diff --git a/canvas/source/cairo/cairo_canvashelper_text.cxx b/canvas/source/cairo/cairo_canvashelper_text.cxx
index 35310e1c078d..33a80eae262b 100644
--- a/canvas/source/cairo/cairo_canvashelper_text.cxx
+++ b/canvas/source/cairo/cairo_canvashelper_text.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
@@ -53,31 +53,31 @@ namespace cairocanvas
         LINE_COLOR, FILL_COLOR, TEXT_COLOR, IGNORE_COLOR
     };
 
-    uno::Reference< rendering::XCanvasFont > CanvasHelper::createFont( const rendering::XCanvas*                    ,
-                                                                       const rendering::FontRequest&                fontRequest,
-                                                                       const uno::Sequence< beans::PropertyValue >& extraFontProperties,
-                                                                       const geometry::Matrix2D&                    fontMatrix )
+    uno::Reference< rendering::XCanvasFont > CanvasHelper::createFont( const rendering::XCanvas* 					, 
+                                                                       const rendering::FontRequest& 				fontRequest, 
+                                                                       const uno::Sequence< beans::PropertyValue >& extraFontProperties, 
+                                                                       const geometry::Matrix2D& 					fontMatrix )
     {
         return uno::Reference< rendering::XCanvasFont >( new CanvasFont( fontRequest, extraFontProperties, fontMatrix, mpSurfaceProvider ));
     }
 
-    uno::Sequence< rendering::FontInfo > CanvasHelper::queryAvailableFonts( const rendering::XCanvas*                       ,
-                                                                            const rendering::FontInfo&                      /*aFilter*/,
-                                                                            const uno::Sequence< beans::PropertyValue >&    /*aFontProperties*/ )
+    uno::Sequence< rendering::FontInfo > CanvasHelper::queryAvailableFonts( const rendering::XCanvas* 						, 
+                                                                            const rendering::FontInfo& 						/*aFilter*/, 
+                                                                            const uno::Sequence< beans::PropertyValue >& 	/*aFontProperties*/ )
     {
         // TODO
         return uno::Sequence< rendering::FontInfo >();
     }
 
     static bool
-    setupFontTransform( ::OutputDevice&                 rOutDev,
-                        ::Point&                        o_rPoint,
-                        ::Font&                         io_rVCLFont,
-                        const rendering::ViewState&     rViewState,
-                        const rendering::RenderState&   rRenderState )
+    setupFontTransform( ::OutputDevice&				    rOutDev,
+                        ::Point&						o_rPoint,
+                        ::Font& 						io_rVCLFont, 
+                        const rendering::ViewState& 	rViewState,
+                        const rendering::RenderState& 	rRenderState )
     {
         ::basegfx::B2DHomMatrix aMatrix;
-
+            
         ::canvas::tools::mergeViewAndRenderTransform(aMatrix,
                                                      rViewState,
                                                      rRenderState);
@@ -85,7 +85,7 @@ namespace cairocanvas
         ::basegfx::B2DTuple aScale;
         ::basegfx::B2DTuple aTranslate;
         double nRotate, nShearX;
-
+            
         aMatrix.decompose( aScale, aTranslate, nRotate, nShearX );
 
         // query font metric _before_ tampering with width and height
@@ -124,9 +124,9 @@ namespace cairocanvas
     static int
     setupOutDevState( OutputDevice&                 rOutDev,
                       const rendering::XCanvas*     pOwner,
-                      const rendering::ViewState&   viewState,
+                      const rendering::ViewState& 	viewState,
                       const rendering::RenderState& renderState,
-                      ColorType                     eColorType )
+                      ColorType						eColorType )
     {
         ::canvas::tools::verifyInput( renderState,
                                       BOOST_CURRENT_FUNCTION,
@@ -146,7 +146,7 @@ namespace cairocanvas
 
         if( viewState.Clip.is() )
         {
-            ::basegfx::B2DPolyPolygon aClipPoly(
+            ::basegfx::B2DPolyPolygon aClipPoly( 
                 ::basegfx::unotools::b2DPolyPolygonFromXPolyPolygon2D(
                     viewState.Clip) );
 
@@ -155,22 +155,22 @@ namespace cairocanvas
                 // setup non-empty clipping
                 ::basegfx::B2DHomMatrix aMatrix;
                 aClipPoly.transform(
-                    ::basegfx::unotools::homMatrixFromAffineMatrix( aMatrix,
+                    ::basegfx::unotools::homMatrixFromAffineMatrix( aMatrix, 
                                                                     viewState.AffineTransform ) );
-
+                
                 aClipRegion = Region::GetRegionFromPolyPolygon( ::PolyPolygon( aClipPoly ) );
             }
         }
 
         if( renderState.Clip.is() )
         {
-            ::basegfx::B2DPolyPolygon aClipPoly(
+            ::basegfx::B2DPolyPolygon aClipPoly( 
                 ::basegfx::unotools::b2DPolyPolygonFromXPolyPolygon2D(
                     renderState.Clip) );
 
             ::basegfx::B2DHomMatrix aMatrix;
             aClipPoly.transform(
-                ::canvas::tools::mergeViewAndRenderTransform( aMatrix,
+                ::canvas::tools::mergeViewAndRenderTransform( aMatrix, 
                                                               viewState,
                                                               renderState ) );
 
@@ -240,7 +240,7 @@ namespace cairocanvas
                     break;
 
                 default:
-                    ENSURE_OR_THROW( false,
+                    ENSURE_OR_THROW( false, 
                                       "CanvasHelper::setupOutDevState(): Unexpected color type");
                     break;
             }
@@ -251,17 +251,17 @@ namespace cairocanvas
 
     bool setupTextOutput( OutputDevice&                                     rOutDev,
                           const rendering::XCanvas*                         pOwner,
-                          ::Point&                                          o_rOutPos,
-                          const rendering::ViewState&                       viewState,
-                          const rendering::RenderState&                     renderState,
-                          const uno::Reference< rendering::XCanvasFont >&   xFont   )
+                          ::Point&										    o_rOutPos,
+                          const rendering::ViewState& 					    viewState,
+                          const rendering::RenderState& 					renderState,
+                          const uno::Reference< rendering::XCanvasFont >&	xFont	)
     {
         setupOutDevState( rOutDev, pOwner, viewState, renderState, TEXT_COLOR );
 
         ::Font aVCLFont;
 
         CanvasFont* pFont = dynamic_cast< CanvasFont* >( xFont.get() );
-
+        
         ENSURE_ARG_OR_THROW( pFont,
                          "CanvasHelper::setupTextOutput(): Font not compatible with this canvas" );
 
@@ -288,12 +288,12 @@ namespace cairocanvas
         return true;
     }
 
-    uno::Reference< rendering::XCachedPrimitive > CanvasHelper::drawText( const rendering::XCanvas*                         pOwner,
-                                                                          const rendering::StringContext&                   text,
-                                                                          const uno::Reference< rendering::XCanvasFont >&   xFont,
-                                                                          const rendering::ViewState&                       viewState,
-                                                                          const rendering::RenderState&                     renderState,
-                                                                          sal_Int8                                          textDirection )
+    uno::Reference< rendering::XCachedPrimitive > CanvasHelper::drawText( const rendering::XCanvas* 						pOwner, 
+                                                                          const rendering::StringContext& 					text, 
+                                                                          const uno::Reference< rendering::XCanvasFont >& 	xFont, 
+                                                                          const rendering::ViewState& 						viewState, 
+                                                                          const rendering::RenderState& 					renderState, 
+                                                                          sal_Int8				 							textDirection )
     {
 #ifdef CAIRO_CANVAS_PERF_TRACE
         struct timespec aTimer;
@@ -351,10 +351,10 @@ namespace cairocanvas
         return uno::Reference< rendering::XCachedPrimitive >(NULL);
     }
 
-    uno::Reference< rendering::XCachedPrimitive > CanvasHelper::drawTextLayout( const rendering::XCanvas*                       pOwner,
-                                                                                const uno::Reference< rendering::XTextLayout >& xLayoutedText,
-                                                                                const rendering::ViewState&                     viewState,
-                                                                                const rendering::RenderState&                   renderState )
+    uno::Reference< rendering::XCachedPrimitive > CanvasHelper::drawTextLayout( const rendering::XCanvas* 						pOwner, 
+                                                                                const uno::Reference< rendering::XTextLayout >& xLayoutedText, 
+                                                                                const rendering::ViewState& 					viewState, 
+                                                                                const rendering::RenderState& 					renderState )
     {
         ENSURE_ARG_OR_THROW( xLayoutedText.is(),
                          "CanvasHelper::drawTextLayout(): layout is NULL");
diff --git a/canvas/source/cairo/cairo_canvashelper_texturefill.cxx b/canvas/source/cairo/cairo_canvashelper_texturefill.cxx
index ee8aff6980cf..c4eb5273ae9d 100644
--- a/canvas/source/cairo/cairo_canvashelper_texturefill.cxx
+++ b/canvas/source/cairo/cairo_canvashelper_texturefill.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
@@ -72,19 +72,19 @@ namespace cairocanvas
 {
     namespace
     {
-        bool textureFill( OutputDevice&         rOutDev,
-                          GraphicObject&        rGraphic,
-                          const ::Point&        rPosPixel,
-                          const ::Size&         rNextTileX,
-                          const ::Size&         rNextTileY,
-                          sal_Int32             nTilesX,
-                          sal_Int32             nTilesY,
-                          const ::Size&         rTileSize,
-                          const GraphicAttr&    rAttr)
+        bool textureFill( OutputDevice&			rOutDev,
+                          GraphicObject&		rGraphic,
+                          const ::Point&		rPosPixel,
+                          const ::Size&			rNextTileX,
+                          const ::Size&			rNextTileY,
+                          sal_Int32				nTilesX,
+                          sal_Int32				nTilesY,
+                          const ::Size&			rTileSize,
+                          const GraphicAttr&	rAttr)
         {
-            BOOL    bRet( false );
-            Point   aCurrPos;
-            int     nX, nY;
+            BOOL	bRet( false );
+            Point 	aCurrPos;
+            int 	nX, nY;
 
             for( nY=0; nY < nTilesY; ++nY )
             {
@@ -95,11 +95,11 @@ namespace cairocanvas
                 {
                     // update return value. This method should return true, if
                     // at least one of the looped Draws succeeded.
-                    bRet |= rGraphic.Draw( &rOutDev,
+                    bRet |= rGraphic.Draw( &rOutDev, 
                                            aCurrPos,
                                            rTileSize,
                                            &rAttr );
-
+                    
                     aCurrPos.X() += rNextTileX.Width();
                     aCurrPos.Y() += rNextTileX.Height();
                 }
@@ -119,15 +119,15 @@ namespace cairocanvas
         }
     }
 
-    uno::Reference< rendering::XCachedPrimitive > CanvasHelper::fillTexturedPolyPolygon( const rendering::XCanvas&                          rCanvas,
+    uno::Reference< rendering::XCachedPrimitive > CanvasHelper::fillTexturedPolyPolygon( const rendering::XCanvas& 							rCanvas, 
                                                                                          const uno::Reference< rendering::XPolyPolygon2D >& xPolyPolygon,
-                                                                                         const rendering::ViewState&                        viewState,
-                                                                                         const rendering::RenderState&                      renderState,
-                                                                                         const uno::Sequence< rendering::Texture >&         textures )
+                                                                                         const rendering::ViewState& 						viewState,
+                                                                                         const rendering::RenderState& 						renderState,
+                                                                                         const uno::Sequence< rendering::Texture >& 		textures )
     {
         ENSURE_ARG_OR_THROW( xPolyPolygon.is(),
                          "CanvasHelper::fillPolyPolygon(): polygon is NULL");
-        ENSURE_ARG_OR_THROW( textures.getLength(),
+        ENSURE_ARG_OR_THROW( textures.getLength(), 
                          "CanvasHelper::fillTexturedPolyPolygon: empty texture sequence");
 
     cairo_save( mpCairo );
diff --git a/canvas/source/cairo/cairo_devicehelper.cxx b/canvas/source/cairo/cairo_devicehelper.cxx
index 70a5ea51c0ea..dac4c77aa007 100644
--- a/canvas/source/cairo/cairo_devicehelper.cxx
+++ b/canvas/source/cairo/cairo_devicehelper.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
@@ -77,7 +77,7 @@ namespace cairocanvas
 
         OutputDevice* pOutDev=getOutputDevice();
         mpSurface = cairo::createSurface( *pOutDev,
-                                          pOutDev->GetOutOffXPixel(),
+                                          pOutDev->GetOutOffXPixel(), 
                                           pOutDev->GetOutOffYPixel(),
                                           pOutDev->GetOutputWidthPixel(),
                                           pOutDev->GetOutputHeightPixel() );
@@ -103,15 +103,15 @@ namespace cairocanvas
 #if defined (UNX) && !defined (QUARTZ)
         // X11 only
         if( mpSurface )
-            mpSurface->Resize( rSize.getX() + pOutDev->GetOutOffXPixel(),
+            mpSurface->Resize( rSize.getX() + pOutDev->GetOutOffXPixel(), 
                                rSize.getY() + pOutDev->GetOutOffYPixel() );
         else
 #endif
-            mpSurface = cairo::createSurface(
+            mpSurface = cairo::createSurface( 
                 *pOutDev,
-                pOutDev->GetOutOffXPixel(),
+                pOutDev->GetOutOffXPixel(), 
                 pOutDev->GetOutOffYPixel(),
-                rSize.getX(), rSize.getY() );
+                rSize.getX(), rSize.getY() );        
     }
 
     geometry::RealSize2D DeviceHelper::getPhysicalResolution()
@@ -139,35 +139,35 @@ namespace cairocanvas
         return ::vcl::unotools::size2DFromSize( aLogSize );
     }
 
-    uno::Reference< rendering::XLinePolyPolygon2D > DeviceHelper::createCompatibleLinePolyPolygon(
-        const uno::Reference< rendering::XGraphicDevice >&              ,
-        const uno::Sequence< uno::Sequence< geometry::RealPoint2D > >&  points )
+    uno::Reference< rendering::XLinePolyPolygon2D > DeviceHelper::createCompatibleLinePolyPolygon( 
+        const uno::Reference< rendering::XGraphicDevice >& 				,
+        const uno::Sequence< uno::Sequence< geometry::RealPoint2D > >&	points )
     {
         // disposed?
         if( !mpSurfaceProvider )
             return uno::Reference< rendering::XLinePolyPolygon2D >(); // we're disposed
 
-        return uno::Reference< rendering::XLinePolyPolygon2D >(
-            new ::basegfx::unotools::UnoPolyPolygon(
+        return uno::Reference< rendering::XLinePolyPolygon2D >( 
+            new ::basegfx::unotools::UnoPolyPolygon( 
                 ::basegfx::unotools::polyPolygonFromPoint2DSequenceSequence( points ) ) );
     }
 
-    uno::Reference< rendering::XBezierPolyPolygon2D > DeviceHelper::createCompatibleBezierPolyPolygon(
-        const uno::Reference< rendering::XGraphicDevice >&                      ,
-        const uno::Sequence< uno::Sequence< geometry::RealBezierSegment2D > >&  points )
+    uno::Reference< rendering::XBezierPolyPolygon2D > DeviceHelper::createCompatibleBezierPolyPolygon( 
+        const uno::Reference< rendering::XGraphicDevice >& 						,
+        const uno::Sequence< uno::Sequence< geometry::RealBezierSegment2D > >&	points )
     {
         // disposed?
         if( !mpSurfaceProvider )
             return uno::Reference< rendering::XBezierPolyPolygon2D >(); // we're disposed
 
-        return uno::Reference< rendering::XBezierPolyPolygon2D >(
+        return uno::Reference< rendering::XBezierPolyPolygon2D >( 
             new ::basegfx::unotools::UnoPolyPolygon(
                 ::basegfx::unotools::polyPolygonFromBezier2DSequenceSequence( points ) ) );
     }
 
-    uno::Reference< rendering::XBitmap > DeviceHelper::createCompatibleBitmap(
-        const uno::Reference< rendering::XGraphicDevice >&  rDevice,
-        const geometry::IntegerSize2D&                      size )
+    uno::Reference< rendering::XBitmap > DeviceHelper::createCompatibleBitmap( 
+        const uno::Reference< rendering::XGraphicDevice >& 	rDevice,
+        const geometry::IntegerSize2D& 						size )
     {
         // disposed?
         if( !mpSurfaceProvider )
@@ -178,19 +178,19 @@ namespace cairocanvas
                 ::basegfx::unotools::b2ISizeFromIntegerSize2D( size ),
                 SurfaceProviderRef(mpSurfaceProvider),
                 rDevice.get(),
-                false ));
+                false )); 
     }
 
-    uno::Reference< rendering::XVolatileBitmap > DeviceHelper::createVolatileBitmap(
-        const uno::Reference< rendering::XGraphicDevice >&  ,
-        const geometry::IntegerSize2D&                      /*size*/ )
+    uno::Reference< rendering::XVolatileBitmap > DeviceHelper::createVolatileBitmap( 
+        const uno::Reference< rendering::XGraphicDevice >& 	,
+        const geometry::IntegerSize2D& 						/*size*/ )
     {
         return uno::Reference< rendering::XVolatileBitmap >();
     }
 
-    uno::Reference< rendering::XBitmap > DeviceHelper::createCompatibleAlphaBitmap(
-        const uno::Reference< rendering::XGraphicDevice >&  rDevice,
-        const geometry::IntegerSize2D&                      size )
+    uno::Reference< rendering::XBitmap > DeviceHelper::createCompatibleAlphaBitmap( 
+        const uno::Reference< rendering::XGraphicDevice >& 	rDevice,
+        const geometry::IntegerSize2D& 						size )
     {
         // disposed?
         if( !mpSurfaceProvider )
@@ -201,12 +201,12 @@ namespace cairocanvas
                 ::basegfx::unotools::b2ISizeFromIntegerSize2D( size ),
                 SurfaceProviderRef(mpSurfaceProvider),
                 rDevice.get(),
-                true ));
+                true )); 
     }
 
-    uno::Reference< rendering::XVolatileBitmap > DeviceHelper::createVolatileAlphaBitmap(
-        const uno::Reference< rendering::XGraphicDevice >&  ,
-        const geometry::IntegerSize2D&                      /*size*/ )
+    uno::Reference< rendering::XVolatileBitmap > DeviceHelper::createVolatileAlphaBitmap( 
+        const uno::Reference< rendering::XGraphicDevice >& 	,
+        const geometry::IntegerSize2D& 						/*size*/ )
     {
         return uno::Reference< rendering::XVolatileBitmap >();
     }
@@ -222,11 +222,11 @@ namespace cairocanvas
         // TODO(F3): offer fullscreen mode the XCanvas way
         return false;
     }
-
+    
     uno::Any DeviceHelper::isAccelerated() const
     {
         return ::com::sun::star::uno::makeAny(false);
-    }
+    }  
 
     uno::Any DeviceHelper::getDeviceHandle() const
     {
@@ -238,18 +238,18 @@ namespace cairocanvas
         return uno::Any();
     }
 
-    namespace
-    {
+    namespace 
+    { 
         struct DeviceColorSpace: public rtl::StaticWithInit<uno::Reference<rendering::XColorSpace>,
-                                                            DeviceColorSpace>
+                                                            DeviceColorSpace> 
         {
             uno::Reference<rendering::XColorSpace> operator()()
             {
                 return vcl::unotools::createStandardColorSpace();
             }
-        };
+        }; 
     }
-
+    
     uno::Reference<rendering::XColorSpace> DeviceHelper::getColorSpace() const
     {
         // always the same
diff --git a/canvas/source/cairo/cairo_devicehelper.hxx b/canvas/source/cairo/cairo_devicehelper.hxx
index 84c5a84926ca..ad8bf48e20a0 100644
--- a/canvas/source/cairo/cairo_devicehelper.hxx
+++ b/canvas/source/cairo/cairo_devicehelper.hxx
@@ -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
@@ -58,7 +58,7 @@ namespace cairocanvas
         /** init helper
 
             @param rCanvas
-            Owning canvas.
+            Owning canvas. 
 
             @param rRefDevice
             Reference output device. Needed for resolution
@@ -73,31 +73,31 @@ namespace cairocanvas
         // XWindowGraphicDevice
         ::com::sun::star::geometry::RealSize2D getPhysicalResolution();
         ::com::sun::star::geometry::RealSize2D getPhysicalSize();
-        ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XLinePolyPolygon2D > createCompatibleLinePolyPolygon(
-            const ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XGraphicDevice >&                               rDevice,
+        ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XLinePolyPolygon2D > createCompatibleLinePolyPolygon( 
+            const ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XGraphicDevice >& 								 rDevice,
             const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< ::com::sun::star::geometry::RealPoint2D > >& points );
-        ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XBezierPolyPolygon2D > createCompatibleBezierPolyPolygon(
-            const ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XGraphicDevice >&                                       rDevice,
+        ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XBezierPolyPolygon2D > createCompatibleBezierPolyPolygon( 
+            const ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XGraphicDevice >& 								 		 rDevice,
             const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< ::com::sun::star::geometry::RealBezierSegment2D > >& points );
-        ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XBitmap > createCompatibleBitmap(
-            const ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XGraphicDevice >&  rDevice,
-            const ::com::sun::star::geometry::IntegerSize2D&                                        size );
-        ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XVolatileBitmap > createVolatileBitmap(
-            const ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XGraphicDevice >&  rDevice,
-            const ::com::sun::star::geometry::IntegerSize2D&                                        size );
-        ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XBitmap > createCompatibleAlphaBitmap(
-            const ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XGraphicDevice >&  rDevice,
-            const ::com::sun::star::geometry::IntegerSize2D&                                        size );
-        ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XVolatileBitmap > createVolatileAlphaBitmap(
-            const ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XGraphicDevice >&  rDevice,
-            const ::com::sun::star::geometry::IntegerSize2D&                                        size );
+        ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XBitmap > createCompatibleBitmap( 
+            const ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XGraphicDevice >& 	rDevice,
+            const ::com::sun::star::geometry::IntegerSize2D& 										size );
+        ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XVolatileBitmap > createVolatileBitmap( 
+            const ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XGraphicDevice >& 	rDevice,
+            const ::com::sun::star::geometry::IntegerSize2D& 										size );
+        ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XBitmap > createCompatibleAlphaBitmap( 
+            const ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XGraphicDevice >& 	rDevice,
+            const ::com::sun::star::geometry::IntegerSize2D& 										size );
+        ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XVolatileBitmap > createVolatileAlphaBitmap( 
+            const ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XGraphicDevice >& 	rDevice,
+            const ::com::sun::star::geometry::IntegerSize2D& 										size );
         sal_Bool hasFullScreenMode(  );
         sal_Bool enterFullScreenMode( sal_Bool bEnter );
 
         ::com::sun::star::uno::Any isAccelerated() const;
         ::com::sun::star::uno::Any getDeviceHandle() const;
         ::com::sun::star::uno::Any getSurfaceHandle() const;
-        ::com::sun::star::uno::Reference<
+        ::com::sun::star::uno::Reference< 
             ::com::sun::star::rendering::XColorSpace > getColorSpace() const;
 
         /** called when DumpScreenContent property is enabled on
@@ -115,7 +115,7 @@ namespace cairocanvas
         /** init helper
 
             @param rCanvas
-            Owning canvas.
+            Owning canvas. 
 
             @param rRefDevice
             Reference output device. Needed for resolution
@@ -123,7 +123,7 @@ namespace cairocanvas
          */
         void implInit( SurfaceProvider& rSurfaceProvider,
                        OutputDevice&    rRefDevice );
-        void setSize( const ::basegfx::B2ISize& rSize );
+        void setSize( const ::basegfx::B2ISize&	rSize );
 
     private:
         /** Surface provider
diff --git a/canvas/source/cairo/cairo_quartz_cairo.cxx b/canvas/source/cairo/cairo_quartz_cairo.cxx
index 52626a0ae849..efea258f4888 100644
--- a/canvas/source/cairo/cairo_quartz_cairo.cxx
+++ b/canvas/source/cairo/cairo_quartz_cairo.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
@@ -67,7 +67,7 @@ namespace cairo
             mpView(NULL),
             mpSurface( pSurface )
     {
-        // Necessary, context is lost otherwise
+        // Necessary, context is lost otherwise   
         CGContextRetain( getCGContext() ); //  == NULL for non-native surfaces
     }
 
@@ -79,7 +79,7 @@ namespace cairo
      * @param width width of the new surface
      * @param height height of the new surface
      *
-     * pSysData contains the platform native Window reference.
+     * pSysData contains the platform native Window reference. 
      * pSysData is used to create a surface on the Window
      *
      * Set the mpSurface to the new surface or NULL
@@ -92,19 +92,19 @@ namespace cairo
 
         // on Mac OS X / Quartz we are not drawing directly to the screen, but via regular CGContextRef.
         // The actual drawing to NSView (i.e. screen) is done in QuartzSurface::flush()
-
-        // HACK: currently initial size for windowsurface is 0x0, which is not possible for us.
-        if (width == 0 || height == 0) {
+        
+        // HACK: currently initial size for windowsurface is 0x0, which is not possible for us.    
+        if (width == 0 || height == 0) {	   
             width = [mpView bounds].size.width;
             height = [mpView bounds].size.height;
             OSL_TRACE("Canvas::cairo::Surface(): BUG!! size is ZERO! fixing to %d x %d...", width, height);
         }
-
+        
         // create a generic surface, NSView/Window is ARGB32.
         mpSurface.reset(
             cairo_quartz_surface_create(CAIRO_FORMAT_ARGB32, width, height),
             &cairo_surface_destroy);
-
+        
         cairo_surface_set_device_offset( mpSurface.get(), x, y );
     }
 
@@ -124,14 +124,14 @@ namespace cairo
     {
         OSL_TRACE("Canvas::cairo::Surface(CGContext:%p, x:%d, y:%d, w:%d, h:%d): New Surface.", rContext, x, y, width, height);
         // create surface based on CGContext
-
+        
         // ensure kCGBitmapByteOrder32Host flag, otherwise Cairo breaks (we are practically always using CGBitmapContext)
         OSL_ASSERT ((CGBitmapContextGetBitsPerPixel(rContext) != 32) ||
                     (CGBitmapContextGetBitmapInfo(rContext) & kCGBitmapByteOrderMask) == kCGBitmapByteOrder32Host);
-
+        
         mpSurface.reset(cairo_quartz_surface_create_for_cg_context(rContext, width, height),
                         &cairo_surface_destroy);
-
+        
         cairo_surface_set_device_offset( mpSurface.get(), x, y );
 
         // Necessary, context is lost otherwise
@@ -155,7 +155,7 @@ namespace cairo
     }
 
     /**
-     * QuartzSurface::getSimilar:  Create new similar Canvas surface
+     * QuartzSurface::getSimilar:  Create new similar Canvas surface 
      * @param aContent format of the new surface (cairo_content_t from cairo/src/cairo.h)
      * @param width width of the new surface
      * @param height height of the new surface
@@ -166,11 +166,11 @@ namespace cairo
      * Cairo surface from aContent (cairo_content_t)
      *
      * @return new surface or NULL
-     **/
+     **/     
     SurfaceSharedPtr QuartzSurface::getSimilar( Content aContent, int width, int height ) const
     {
         return SurfaceSharedPtr(
-            new QuartzSurface(
+            new QuartzSurface( 
                 CairoSurfaceSharedPtr(
                     cairo_surface_create_similar( mpSurface.get(), aContent, width, height ),
                     &cairo_surface_destroy )));
@@ -198,35 +198,35 @@ namespace cairo
     {
         // can only flush surfaces with NSView
         if( !mpView ) return;
-
+        
         OSL_TRACE("Canvas::cairo::QuartzSurface::flush(): flush to NSView");
-
+        
         CGContextRef mrContext = getCGContext();
-
+        
         if (!mrContext) return;
-
+        
         [mpView lockFocus];
-
+        
         /**
-         * This code is using same screen update code as in VCL (esp. AquaSalGraphics::UpdateWindow() )
+         * This code is using same screen update code as in VCL (esp. AquaSalGraphics::UpdateWindow() ) 
          */
         CGContextRef rViewContext = reinterpret_cast<CGContextRef>([[NSGraphicsContext currentContext] graphicsPort]);
         CGImageRef xImage = CGBitmapContextCreateImage(mrContext);
-        CGContextDrawImage(rViewContext,
-                           CGRectMake( 0, 0,
-                                       CGImageGetWidth(xImage),
+        CGContextDrawImage(rViewContext, 
+                           CGRectMake( 0, 0, 
+                                       CGImageGetWidth(xImage), 
                                        CGImageGetHeight(xImage)),
                            xImage);
         CGImageRelease( xImage );
         CGContextFlush( rViewContext );
-
+        
         [mpView unlockFocus];
     }
 
     /**
      * QuartzSurface::getDepth:  Get the color depth of the Canvas surface.
      *
-     * @return color depth
+     * @return color depth 
      **/
     int QuartzSurface::getDepth() const
     {
@@ -238,7 +238,7 @@ namespace cairo
             }
         }
         OSL_TRACE("Canvas::cairo::QuartzSurface::getDepth(): ERROR - depth unspecified!");
-
+        
         return -1;
     }
 
@@ -295,18 +295,18 @@ namespace cairo
                                     int x, int y, int width, int height )
     {
         SurfaceSharedPtr surf;
-
-        if( rRefDevice.GetOutDevType() == OUTDEV_WINDOW )
+        
+        if( rRefDevice.GetOutDevType() == OUTDEV_WINDOW ) 
         {
             const Window &rWindow = (const Window &) rRefDevice;
             const SystemEnvData* pSysData = GetSysData(&rWindow);
             if (pSysData)
                 surf = SurfaceSharedPtr(new QuartzSurface(pSysData->pView, x, y, width, height));
-        }
+        }                                       
         else if( rRefDevice.GetOutDevType() == OUTDEV_VIRDEV )
         {
             SystemGraphicsData aSysData = ((const VirtualDevice&) rRefDevice).GetSystemGfxData();
-
+            
             if (aSysData.rCGContext)
                 surf =  SurfaceSharedPtr(new QuartzSurface(aSysData.rCGContext, x, y, width, height));
         }
@@ -323,18 +323,18 @@ namespace cairo
      *
      * @return new surface or empty surface
      **/
-    SurfaceSharedPtr createBitmapSurface( const OutputDevice&     /* rRefDevice */,
-                                          const BitmapSystemData& rData,
+    SurfaceSharedPtr createBitmapSurface( const OutputDevice&     /* rRefDevice */, 
+                                          const BitmapSystemData& rData, 
                                           const Size&             rSize )
     {
-        OSL_TRACE( "requested size: %d x %d available size: %d x %d",
+        OSL_TRACE( "requested size: %d x %d available size: %d x %d", 
                    rSize.Width(), rSize.Height(), rData.mnWidth, rData.mnHeight );
-
+        
         if ( rData.mnWidth == rSize.Width() && rData.mnHeight == rSize.Height() )
         {
             CGContextRef rContext = (CGContextRef)rData.rImageContext;
             OSL_TRACE("Canvas::cairo::createBitmapSurface(): New native image surface, context = %p.", rData.rImageContext);
-
+                        
             return SurfaceSharedPtr(new QuartzSurface(rContext, 0, 0, rData.mnWidth, rData.mnHeight));
         }
         return SurfaceSharedPtr();
diff --git a/canvas/source/cairo/cairo_quartz_cairo.hxx b/canvas/source/cairo/cairo_quartz_cairo.hxx
index 104016751293..bd845977ebf9 100644
--- a/canvas/source/cairo/cairo_quartz_cairo.hxx
+++ b/canvas/source/cairo/cairo_quartz_cairo.hxx
@@ -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
@@ -37,7 +37,7 @@
 
 namespace cairo {
 
-    class QuartzSurface : public Surface
+    class QuartzSurface : public Surface 
     {
         NSView*               mpView; // if NULL - bg surface
         CairoSurfaceSharedPtr mpSurface;
@@ -64,9 +64,9 @@ namespace cairo {
         virtual void flush() const;
 
         int getDepth() const;
-
+      
         CGContextRef getCGContext() const;
-
+        
     };
 }
 
diff --git a/canvas/source/cairo/cairo_repainttarget.hxx b/canvas/source/cairo/cairo_repainttarget.hxx
index 3e4d40f1efe7..315148bd268a 100644
--- a/canvas/source/cairo/cairo_repainttarget.hxx
+++ b/canvas/source/cairo/cairo_repainttarget.hxx
@@ -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
@@ -39,7 +39,7 @@ using namespace ::cairo;
 namespace cairocanvas
 {
     /* Definition of RepaintTarget interface */
-
+    
     /** Target interface for XCachedPrimitive implementations
 
         This interface must be implemented on all canvas
diff --git a/canvas/source/cairo/cairo_services.cxx b/canvas/source/cairo/cairo_services.cxx
index a43b281c56bf..3ecd96cec54c 100644
--- a/canvas/source/cairo/cairo_services.cxx
+++ b/canvas/source/cairo/cairo_services.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
diff --git a/canvas/source/cairo/cairo_sprite.hxx b/canvas/source/cairo/cairo_sprite.hxx
index 8f5a0d2d3ddd..7fca236edfa5 100644
--- a/canvas/source/cairo/cairo_sprite.hxx
+++ b/canvas/source/cairo/cairo_sprite.hxx
@@ -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
diff --git a/canvas/source/cairo/cairo_spritecanvas.cxx b/canvas/source/cairo/cairo_spritecanvas.cxx
index 43911c1113d6..5083c601069b 100644
--- a/canvas/source/cairo/cairo_spritecanvas.cxx
+++ b/canvas/source/cairo/cairo_spritecanvas.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,9 +79,9 @@ namespace cairocanvas
          */
         ENSURE_ARG_OR_THROW( maArguments.getLength() >= 4 &&
                              maArguments[0].getValueTypeClass() == uno::TypeClass_HYPER &&
-                             maArguments[4].getValueTypeClass() == uno::TypeClass_INTERFACE,
+                             maArguments[4].getValueTypeClass() == uno::TypeClass_INTERFACE, 
                              "CairoSpriteCanvas::initialize: wrong number of arguments, or wrong types" );
-
+        
         awt::Rectangle aRect;
         maArguments[2] >>= aRect;
 
@@ -96,17 +96,17 @@ namespace cairocanvas
             throw lang::NoSupportException(
                 ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(
                                      "Parent window not VCL window, or canvas out-of-process!")),
-                NULL);
+                NULL);            
 
         bool bHasXRender = IsCairoWorking(pParentWindow);
-        ENSURE_ARG_OR_THROW( bHasXRender == true,
+        ENSURE_ARG_OR_THROW( bHasXRender == true, 
                              "CairoSpriteCanvas::SpriteCanvas: No RENDER extension" );
 
         Size aPixelSize( pParentWindow->GetOutputSizePixel() );
         const ::basegfx::B2ISize aSize( aPixelSize.Width(),
                                         aPixelSize.Height() );
 
-        ENSURE_ARG_OR_THROW( pParentWindow != NULL,
+        ENSURE_ARG_OR_THROW( pParentWindow != NULL, 
                              "CairoSpriteCanvas::initialize: invalid Window pointer" );
 
         // setup helper
@@ -115,7 +115,7 @@ namespace cairocanvas
                              aSize,
                              bIsFullscreen );
 
-        setWindow(uno::Reference<awt::XWindow2>(xParentWindow, uno::UNO_QUERY_THROW));
+        setWindow(uno::Reference<awt::XWindow2>(xParentWindow, uno::UNO_QUERY_THROW)); 
 
         maCanvasHelper.init( maRedrawManager,
                              *this,
@@ -214,7 +214,7 @@ namespace cairocanvas
     {
         maCanvasHelper.setSize( rSize );
         // re-set background surface, in case it needed recreation
-        maCanvasHelper.setSurface( maDeviceHelper.getBufferSurface(),
+        maCanvasHelper.setSurface( maDeviceHelper.getBufferSurface(), 
                                    false );
     }
 
diff --git a/canvas/source/cairo/cairo_spritecanvas.hxx b/canvas/source/cairo/cairo_spritecanvas.hxx
index fcc0ae76839b..65fb741cc88a 100644
--- a/canvas/source/cairo/cairo_spritecanvas.hxx
+++ b/canvas/source/cairo/cairo_spritecanvas.hxx
@@ -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
@@ -67,9 +67,9 @@ namespace cairocanvas
                                                 ::com::sun::star::awt::XWindowListener,
                                                 ::com::sun::star::util::XUpdatable,
                                                 ::com::sun::star::beans::XPropertySet,
-                                                ::com::sun::star::lang::XServiceName >  WindowGraphicDeviceBase_Base;
+                                                ::com::sun::star::lang::XServiceName >	WindowGraphicDeviceBase_Base;
     typedef ::canvas::BufferedGraphicDeviceBase< ::canvas::BaseMutexHelper< WindowGraphicDeviceBase_Base >,
-                                                 SpriteDeviceHelper,
+                                                 SpriteDeviceHelper, 
                                                  ::osl::MutexGuard,
                                                  ::cppu::OWeakObject > SpriteCanvasBase_Base;
     /** Mixin SpriteSurface
@@ -96,9 +96,9 @@ namespace cairocanvas
     };
 
     typedef ::canvas::SpriteCanvasBase< SpriteCanvasBaseSpriteSurface_Base,
-                                        SpriteCanvasHelper,
+                                        SpriteCanvasHelper, 
                                         ::osl::MutexGuard,
-                                        ::cppu::OWeakObject >           SpriteCanvasBaseT;
+                                        ::cppu::OWeakObject >			SpriteCanvasBaseT;
 
     /** Product of this component's factory.
 
@@ -113,9 +113,9 @@ namespace cairocanvas
                          public RepaintTarget
     {
     public:
-        SpriteCanvas( const ::com::sun::star::uno::Sequence<
+        SpriteCanvas( const ::com::sun::star::uno::Sequence< 
                             ::com::sun::star::uno::Any >&               aArguments,
-                      const ::com::sun::star::uno::Reference<
+                      const ::com::sun::star::uno::Reference< 
                             ::com::sun::star::uno::XComponentContext >& rxContext );
 
         void initialize();
@@ -132,7 +132,7 @@ namespace cairocanvas
         //                                    Classname     Base doing refcounting        Base implementing the XComponent interface
         //                                       |                 |                            |
         //                                       V                 V                            V
-        DECLARE_UNO3_XCOMPONENT_AGG_DEFAULTS( SpriteCanvas, WindowGraphicDeviceBase_Base, ::cppu::WeakComponentImplHelperBase );
+        DECLARE_UNO3_XCOMPONENT_AGG_DEFAULTS( SpriteCanvas, WindowGraphicDeviceBase_Base, ::cppu::WeakComponentImplHelperBase ); 
 
         // XBufferController (partial)
         virtual ::sal_Bool SAL_CALL showBuffer( ::sal_Bool bUpdateAll ) throw (::com::sun::star::uno::RuntimeException);
@@ -153,7 +153,7 @@ namespace cairocanvas
 
         // RepaintTarget
         virtual bool repaint( const ::cairo::SurfaceSharedPtr&                pSurface,
-                              const ::com::sun::star::rendering::ViewState&   viewState,
+                              const ::com::sun::star::rendering::ViewState&	  viewState,
                               const ::com::sun::star::rendering::RenderState& renderState );
 
         SurfaceSharedPtr getWindowSurface();
diff --git a/canvas/source/cairo/cairo_spritecanvashelper.cxx b/canvas/source/cairo/cairo_spritecanvashelper.cxx
index bb4b44201043..e4fcf85f0761 100644
--- a/canvas/source/cairo/cairo_spritecanvashelper.cxx
+++ b/canvas/source/cairo/cairo_spritecanvashelper.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
@@ -35,7 +35,7 @@
 
 #include <vcl/canvastools.hxx>
 
-#include <comphelper/scopeguard.hxx>
+#include <comphelper/scopeguard.hxx> 
 
 #include <basegfx/range/b2drectangle.hxx>
 #include <basegfx/tools/canvastools.hxx>
@@ -59,7 +59,7 @@ namespace cairocanvas
          */
         void spriteRedraw( const CairoSharedPtr& pCairo,
                            const ::canvas::Sprite::Reference& rSprite )
-        {
+        {            
             // downcast to derived cairocanvas::Sprite interface, which
             // provides the actual redraw methods.
             ::boost::polymorphic_downcast< Sprite* >(rSprite.get())->redraw( pCairo, true);
@@ -70,7 +70,7 @@ namespace cairocanvas
                                 const ::basegfx::B2DRange& rArea )
         {
             cairo_save( pCairo.get() );
-            cairo_rectangle( pCairo.get(), ceil( rArea.getMinX() ), ceil( rArea.getMinY() ),
+            cairo_rectangle( pCairo.get(), ceil( rArea.getMinX() ), ceil( rArea.getMinY() ), 
                              floor( rArea.getWidth() ), floor( rArea.getHeight() ) );
             cairo_clip( pCairo.get() );
             cairo_set_source_surface( pCairo.get(), pBackgroundSurface->getCairoSurface().get(), 0, 0 );
@@ -87,8 +87,8 @@ namespace cairocanvas
             // wouldn't save much render time, and b) will clutter
             // scrolled sprite content outside this area)
             cairo_save( pCairo.get() );
-            cairo_rectangle( pCairo.get(), rArea.getMinX(), rArea.getMinY(),
-                             sal::static_int_cast<sal_Int32>(rArea.getWidth()),
+            cairo_rectangle( pCairo.get(), rArea.getMinX(), rArea.getMinY(), 
+                             sal::static_int_cast<sal_Int32>(rArea.getWidth()), 
                              sal::static_int_cast<sal_Int32>(rArea.getHeight()) );
             cairo_clip( pCairo.get() );
 
@@ -119,7 +119,7 @@ namespace cairocanvas
             Used for generic update, which renders into device buffer.
          */
         void spriteRedrawStub2( const CairoSharedPtr& pCairo,
-                                const ::canvas::Sprite::Reference&  rSprite )
+                                const ::canvas::Sprite::Reference&	rSprite )
         {
             if( rSprite.is() )
             {
@@ -139,7 +139,7 @@ namespace cairocanvas
 
             if( rSprite.is() )
                 ::boost::polymorphic_downcast< Sprite* >( rSprite.get() )->redraw( pCairo, false );
-        }
+        } 
     }
 
     SpriteCanvasHelper::SpriteCanvasHelper() :
@@ -159,7 +159,7 @@ namespace cairocanvas
 
         CanvasHelper::init( rSize, rDevice, &rDevice );
     }
-
+    
     void SpriteCanvasHelper::disposing()
     {
         mpCompositingSurface.reset();
@@ -167,17 +167,17 @@ namespace cairocanvas
         mpRedrawManager = NULL;
 
         // forward to base
-        CanvasHelper::disposing();
+        CanvasHelper::disposing();        
     }
 
-    uno::Reference< rendering::XAnimatedSprite > SpriteCanvasHelper::createSpriteFromAnimation(
+    uno::Reference< rendering::XAnimatedSprite > SpriteCanvasHelper::createSpriteFromAnimation( 
         const uno::Reference< rendering::XAnimation >& )
     {
         return uno::Reference< rendering::XAnimatedSprite >();
     }
 
-    uno::Reference< rendering::XAnimatedSprite > SpriteCanvasHelper::createSpriteFromBitmaps(
-        const uno::Sequence< uno::Reference< rendering::XBitmap > >& /*animationBitmaps*/,
+    uno::Reference< rendering::XAnimatedSprite > SpriteCanvasHelper::createSpriteFromBitmaps( 
+        const uno::Sequence< uno::Reference< rendering::XBitmap > >& /*animationBitmaps*/, 
         sal_Int8                                                     /*interpolationMode*/ )
     {
         return uno::Reference< rendering::XAnimatedSprite >();
@@ -188,12 +188,12 @@ namespace cairocanvas
         if( !mpRedrawManager )
             return uno::Reference< rendering::XCustomSprite >(); // we're disposed
 
-        return uno::Reference< rendering::XCustomSprite >(
-            new CanvasCustomSprite( spriteSize,
+        return uno::Reference< rendering::XCustomSprite >( 
+            new CanvasCustomSprite( spriteSize, 
                                     mpOwningSpriteCanvas ) );
     }
 
-    uno::Reference< rendering::XSprite > SpriteCanvasHelper::createClonedSprite(
+    uno::Reference< rendering::XSprite > SpriteCanvasHelper::createClonedSprite( 
         const uno::Reference< rendering::XSprite >& )
     {
         return uno::Reference< rendering::XSprite >();
@@ -203,7 +203,7 @@ namespace cairocanvas
                                                sal_Bool                   bUpdateAll,
                                                bool&                      io_bSurfaceDirty )
     {
-        if( !mpRedrawManager ||
+        if( !mpRedrawManager || 
             !mpOwningSpriteCanvas ||
             !mpOwningSpriteCanvas->getWindowSurface() ||
             !mpOwningSpriteCanvas->getBufferSurface() )
@@ -243,8 +243,8 @@ namespace cairocanvas
             cairo_rectangle( pCompositingCairo.get(), 0, 0, rSize.getX(), rSize.getY() );
             cairo_clip( pCompositingCairo.get() );
             cairo_save( pCompositingCairo.get() );
-            cairo_set_source_surface( pCompositingCairo.get(),
-                                      mpOwningSpriteCanvas->getBufferSurface()->getCairoSurface().get(),
+            cairo_set_source_surface( pCompositingCairo.get(), 
+                                      mpOwningSpriteCanvas->getBufferSurface()->getCairoSurface().get(), 
                                       0, 0 );
             cairo_set_operator( pCompositingCairo.get(), CAIRO_OPERATOR_SOURCE );
             cairo_paint( pCompositingCairo.get() );
@@ -252,7 +252,7 @@ namespace cairocanvas
 
             // repaint all active sprites on top of background into
             // VDev.
-            mpRedrawManager->forEachSprite(
+            mpRedrawManager->forEachSprite( 
                 ::boost::bind(
                     &spriteRedraw,
                     boost::cref(pCompositingCairo),
@@ -261,8 +261,8 @@ namespace cairocanvas
             // flush to screen
             cairo_rectangle( pWindowCairo.get(), 0, 0, rSize.getX(), rSize.getY() );
             cairo_clip( pWindowCairo.get() );
-            cairo_set_source_surface( pWindowCairo.get(),
-                                      pCompositingSurface->getCairoSurface().get(),
+            cairo_set_source_surface( pWindowCairo.get(), 
+                                      pCompositingSurface->getCairoSurface().get(), 
                                       0, 0 );
             cairo_set_operator( pWindowCairo.get(), CAIRO_OPERATOR_SOURCE );
             cairo_paint( pWindowCairo.get() );
@@ -282,14 +282,14 @@ namespace cairocanvas
 
     void SpriteCanvasHelper::backgroundPaint( const ::basegfx::B2DRange& rUpdateRect )
     {
-        if( mpOwningSpriteCanvas && mpCompositingSurface )
+        if( mpOwningSpriteCanvas && mpCompositingSurface ) 
             repaintBackground( mpCompositingSurface->getCairo(),
-                               mpOwningSpriteCanvas->getBufferSurface(),
+                               mpOwningSpriteCanvas->getBufferSurface(), 
                                rUpdateRect );
     }
 
-    void SpriteCanvasHelper::scrollUpdate( const ::basegfx::B2DRange&                       rMoveStart,
-                                           const ::basegfx::B2DRange&                       rMoveEnd,
+    void SpriteCanvasHelper::scrollUpdate( const ::basegfx::B2DRange& 						rMoveStart, 
+                                           const ::basegfx::B2DRange& 						rMoveEnd,
                                            const ::canvas::SpriteRedrawManager::UpdateArea& rUpdateArea )
     {
         ENSURE_OR_THROW( mpOwningSpriteCanvas &&
@@ -313,7 +313,7 @@ namespace cairocanvas
         // the destination area: otherwise, the next scroll update
         // would copy pixel that are not supposed to be part of
         // the sprite.
-        ::basegfx::B2IRange aSourceRect(
+        ::basegfx::B2IRange aSourceRect( 
             ::canvas::tools::spritePixelAreaFromB2DRange( rMoveStart ) );
         const ::basegfx::B2IRange& rDestRect(
             ::canvas::tools::spritePixelAreaFromB2DRange( rMoveEnd ) );
@@ -323,7 +323,7 @@ namespace cairocanvas
 
         // TODO(E3): This is plain buggy (but copies the behaviour of
         // the old Impress slideshow) - the scrolled area might
-        // actually lie _below_ another window!
+        // actually lie _below_ another window!        
 
         // clip to output bounds (cannot properly scroll stuff
         // _outside_ our screen area)
@@ -340,7 +340,7 @@ namespace cairocanvas
             // repaint all affected sprites directly to output device
             ::std::for_each( rUpdateArea.maComponentList.begin(),
                              rUpdateArea.maComponentList.end(),
-                             ::boost::bind(
+                             ::boost::bind( 
                                  &spriteRedrawStub3,
                                  boost::cref(pCompositingCairo),
                                  _1 ) );
@@ -355,24 +355,24 @@ namespace cairocanvas
 
             cairo_save( pCompositingCairo.get() );
             // scroll content in device back buffer
-            cairo_set_source_surface( pCompositingCairo.get(),
+            cairo_set_source_surface( pCompositingCairo.get(), 
                                       mpOwningSpriteCanvas->getBufferSurface()->getCairoSurface().get(),
                                       aDestPos.getX() - aSourceUpperLeftPos.getX(),
                                       aDestPos.getY() - aSourceUpperLeftPos.getY() );
             cairo_rectangle( pCompositingCairo.get(),
                              aDestPos.getX(), aDestPos.getY(),
-                             sal::static_int_cast<sal_Int32>(aDestRect.getWidth()),
+                             sal::static_int_cast<sal_Int32>(aDestRect.getWidth()), 
                              sal::static_int_cast<sal_Int32>(aDestRect.getHeight()) );
             cairo_clip( pCompositingCairo.get() );
             cairo_set_operator( pCompositingCairo.get(), CAIRO_OPERATOR_SOURCE );
             cairo_paint( pCompositingCairo.get() );
             cairo_restore( pCompositingCairo.get() );
 
-            const ::canvas::SpriteRedrawManager::SpriteConnectedRanges::ComponentListType::const_iterator
+            const ::canvas::SpriteRedrawManager::SpriteConnectedRanges::ComponentListType::const_iterator 
                 aFirst( rUpdateArea.maComponentList.begin() );
-            ::canvas::SpriteRedrawManager::SpriteConnectedRanges::ComponentListType::const_iterator
+            ::canvas::SpriteRedrawManager::SpriteConnectedRanges::ComponentListType::const_iterator 
                   aSecond( aFirst ); ++aSecond;
-
+        
             ENSURE_OR_THROW( aFirst->second.getSprite().is(),
                              "VCLCanvas::scrollUpdate(): no sprite" );
 
@@ -403,13 +403,13 @@ namespace cairocanvas
 
         cairo_rectangle( pWindowCairo.get(), 0, 0, rSize.getX(), rSize.getY() );
         cairo_clip( pWindowCairo.get() );
-        cairo_set_source_surface( pWindowCairo.get(),
-                                  pCompositingSurface->getCairoSurface().get(),
+        cairo_set_source_surface( pWindowCairo.get(), 
+                                  pCompositingSurface->getCairoSurface().get(), 
                                   0, 0 );
         cairo_set_operator( pWindowCairo.get(), CAIRO_OPERATOR_SOURCE );
         cairo_paint( pWindowCairo.get() );
     }
-
+    
     void SpriteCanvasHelper::opaqueUpdate( const ::basegfx::B2DRange&                          rTotalArea,
                                            const ::std::vector< ::canvas::Sprite::Reference >& rSortedUpdateSprites )
     {
@@ -438,7 +438,7 @@ namespace cairocanvas
         // repaint all affected sprites directly to output device
         ::std::for_each( rSortedUpdateSprites.begin(),
                          rSortedUpdateSprites.end(),
-                         ::boost::bind(
+                         ::boost::bind( 
                              &spriteRedrawStub,
                              boost::cref(pCompositingCairo),
                              _1 ) );
@@ -448,13 +448,13 @@ namespace cairocanvas
         cairo_clip( pWindowCairo.get() );
         cairo_rectangle( pWindowCairo.get(), aPos.getX(), aPos.getY(), aSize.getX(), aSize.getY() );
         cairo_clip( pWindowCairo.get() );
-        cairo_set_source_surface( pWindowCairo.get(),
-                                  pCompositingSurface->getCairoSurface().get(),
+        cairo_set_source_surface( pWindowCairo.get(), 
+                                  pCompositingSurface->getCairoSurface().get(), 
                                   0, 0 );
         cairo_set_operator( pWindowCairo.get(), CAIRO_OPERATOR_SOURCE );
         cairo_paint( pWindowCairo.get() );
     }
-
+    
     void SpriteCanvasHelper::genericUpdate( const ::basegfx::B2DRange&                          rRequestedArea,
                                             const ::std::vector< ::canvas::Sprite::Reference >& rSortedUpdateSprites )
     {
@@ -477,7 +477,7 @@ namespace cairocanvas
         // a fraction of a sprite pixel...  Clip position at origin,
         // otherwise, truncation of size below might leave visible
         // areas uncovered by VDev.
-        const Point aOutputPosition(
+        const Point aOutputPosition( 
             ::std::max( sal_Int32( 0 ),
                         static_cast< sal_Int32 >(rRequestedArea.getMinX()) ),
             ::std::max( sal_Int32( 0 ),
@@ -485,7 +485,7 @@ namespace cairocanvas
         // round output size towards +infty. Don't want to truncate a
         // fraction of a sprite pixel... Limit size of VDev to output
         // device's area.
-        const Size  aOutputSize(
+        const Size  aOutputSize( 
             ::std::min( rSize.getX(),
                         ::canvas::tools::roundUp( rRequestedArea.getMaxX() - aOutputPosition.X()) ),
             ::std::min( rSize.getY(),
@@ -496,13 +496,13 @@ namespace cairocanvas
 
         // paint background
         cairo_save( pCompositingCairo.get() );
-        cairo_set_source_surface( pCompositingCairo.get(),
-                                  mpOwningSpriteCanvas->getBufferSurface()->getCairoSurface().get(),
+        cairo_set_source_surface( pCompositingCairo.get(), 
+                                  mpOwningSpriteCanvas->getBufferSurface()->getCairoSurface().get(), 
                                   0, 0 );
         cairo_set_operator( pCompositingCairo.get(), CAIRO_OPERATOR_SOURCE );
         cairo_paint( pCompositingCairo.get() );
         cairo_restore( pCompositingCairo.get() );
-
+        
         // repaint all affected sprites on top of background into
         // VDev.
         ::std::for_each( rSortedUpdateSprites.begin(),
@@ -514,8 +514,8 @@ namespace cairocanvas
         // flush to screen
         cairo_rectangle( pWindowCairo.get(), aOutputPosition.X(), aOutputPosition.Y(), aOutputSize.Width(), aOutputSize.Height() );
         cairo_clip( pWindowCairo.get() );
-        cairo_set_source_surface( pWindowCairo.get(),
-                                  pCompositingSurface->getCairoSurface().get(),
+        cairo_set_source_surface( pWindowCairo.get(), 
+                                  pCompositingSurface->getCairoSurface().get(), 
                                   0, 0 );
         cairo_set_operator( pWindowCairo.get(), CAIRO_OPERATOR_SOURCE );
         cairo_paint( pWindowCairo.get() );
@@ -532,13 +532,13 @@ namespace cairocanvas
 
         if( !mpCompositingSurface )
         {
-            mpCompositingSurface =
-                mpOwningSpriteCanvas->getWindowSurface()->getSimilar(
-                    CAIRO_CONTENT_COLOR,
+            mpCompositingSurface = 
+                mpOwningSpriteCanvas->getWindowSurface()->getSimilar( 
+                    CAIRO_CONTENT_COLOR, 
                     rNeededSize.getX(), rNeededSize.getY() );
             maCompositingSurfaceSize = rNeededSize;
         }
-
+        
         return mpCompositingSurface;
     }
 }
diff --git a/canvas/source/cairo/cairo_spritecanvashelper.hxx b/canvas/source/cairo/cairo_spritecanvashelper.hxx
index 2adc245fe4e1..aeb0368b2f41 100644
--- a/canvas/source/cairo/cairo_spritecanvashelper.hxx
+++ b/canvas/source/cairo/cairo_spritecanvashelper.hxx
@@ -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
@@ -50,31 +50,31 @@ namespace cairocanvas
     public:
         SpriteCanvasHelper();
 
-        void init( ::canvas::SpriteRedrawManager& rManager,
+        void init( ::canvas::SpriteRedrawManager& rManager, 
                    SpriteCanvas&                  rOwningSpriteCanvas,
                    const ::basegfx::B2ISize&      rSize );
-
+    
         /// Dispose all internal references
         void disposing();
 
         // XSpriteCanvas
-        ::com::sun::star::uno::Reference<
-              ::com::sun::star::rendering::XAnimatedSprite >        createSpriteFromAnimation(
+        ::com::sun::star::uno::Reference< 
+              ::com::sun::star::rendering::XAnimatedSprite > 		createSpriteFromAnimation( 
                 const ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XAnimation >& animation );
 
-        ::com::sun::star::uno::Reference<
-              ::com::sun::star::rendering::XAnimatedSprite >        createSpriteFromBitmaps(
-                const ::com::sun::star::uno::Sequence<
-                      ::com::sun::star::uno::Reference<
-                            ::com::sun::star::rendering::XBitmap > >& animationBitmaps,
+        ::com::sun::star::uno::Reference< 
+              ::com::sun::star::rendering::XAnimatedSprite > 		createSpriteFromBitmaps( 
+                const ::com::sun::star::uno::Sequence< 
+                      ::com::sun::star::uno::Reference< 
+                            ::com::sun::star::rendering::XBitmap > >& animationBitmaps, 
                 sal_Int8                                              interpolationMode );
-
-        ::com::sun::star::uno::Reference<
-              ::com::sun::star::rendering::XCustomSprite >      createCustomSprite(
+    
+        ::com::sun::star::uno::Reference< 
+              ::com::sun::star::rendering::XCustomSprite > 		createCustomSprite( 
                 const ::com::sun::star::geometry::RealSize2D& spriteSize );
-
-        ::com::sun::star::uno::Reference<
-              ::com::sun::star::rendering::XSprite >                createClonedSprite(
+    
+        ::com::sun::star::uno::Reference< 
+              ::com::sun::star::rendering::XSprite > 				createClonedSprite( 
                 const ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XSprite >& original );
 
         /** Actually perform the screen update
@@ -118,21 +118,21 @@ namespace cairocanvas
             All info necessary, should rMoveStart be partially or
             fully outside the outdev
          */
-        void scrollUpdate( const ::basegfx::B2DRange&                           rMoveStart,
-                           const ::basegfx::B2DRange&                           rMoveEnd,
-                           const ::canvas::SpriteRedrawManager::UpdateArea&     rUpdateArea );
+        void scrollUpdate( const ::basegfx::B2DRange& 							rMoveStart, 
+                           const ::basegfx::B2DRange& 							rMoveEnd,
+                           const ::canvas::SpriteRedrawManager::UpdateArea& 	rUpdateArea );
 
         void opaqueUpdate( const ::basegfx::B2DRange&                          rTotalArea,
-                           const ::std::vector< ::canvas::Sprite::Reference >& rSortedUpdateSprites );
+                           const ::std::vector< ::canvas::Sprite::Reference >& rSortedUpdateSprites );                    
 
         void genericUpdate( const ::basegfx::B2DRange&                          rTotalArea,
-                            const ::std::vector< ::canvas::Sprite::Reference >& rSortedUpdateSprites );
+                            const ::std::vector< ::canvas::Sprite::Reference >& rSortedUpdateSprites );                    
 
     private:
         ::cairo::SurfaceSharedPtr getCompositingSurface( const ::basegfx::B2ISize& rNeededSize );
 
         /// Set from the SpriteCanvas: instance coordinating sprite redraw
-        ::canvas::SpriteRedrawManager*  mpRedrawManager;
+        ::canvas::SpriteRedrawManager*	mpRedrawManager;
 
         /// Set from the init method. used to generate sprites
         SpriteCanvas*                   mpOwningSpriteCanvas;
diff --git a/canvas/source/cairo/cairo_spritedevicehelper.cxx b/canvas/source/cairo/cairo_spritedevicehelper.cxx
index ef345cd60eaf..4a4cdc45fa32 100644
--- a/canvas/source/cairo/cairo_spritedevicehelper.cxx
+++ b/canvas/source/cairo/cairo_spritedevicehelper.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
@@ -63,7 +63,7 @@ namespace cairocanvas
     {}
 
     void SpriteDeviceHelper::init( Window&                   rOutputWindow,
-                                   SpriteCanvas&             rSpriteCanvas,
+                                   SpriteCanvas&			 rSpriteCanvas,
                                    const ::basegfx::B2ISize& rSize,
                                    bool                      bFullscreen )
     {
@@ -111,7 +111,7 @@ namespace cairocanvas
     uno::Any SpriteDeviceHelper::isAccelerated() const
     {
         return ::com::sun::star::uno::makeAny(true);
-    }
+    }  
 
     uno::Any SpriteDeviceHelper::getDeviceHandle() const
     {
@@ -135,8 +135,8 @@ namespace cairocanvas
         if( mpBufferSurface && maSize != rSize )
             mpBufferSurface.reset();
         if( !mpBufferSurface )
-            mpBufferSurface = getWindowSurface()->getSimilar(
-                CAIRO_CONTENT_COLOR,
+            mpBufferSurface = getWindowSurface()->getSimilar( 
+                CAIRO_CONTENT_COLOR, 
                 rSize.getX(), rSize.getY() );
 
         if( maSize != rSize )
diff --git a/canvas/source/cairo/cairo_spritedevicehelper.hxx b/canvas/source/cairo/cairo_spritedevicehelper.hxx
index 3e46014f28b0..8cb5fda7bc8b 100644
--- a/canvas/source/cairo/cairo_spritedevicehelper.hxx
+++ b/canvas/source/cairo/cairo_spritedevicehelper.hxx
@@ -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
@@ -53,7 +53,7 @@ namespace cairocanvas
         SpriteDeviceHelper();
 
         void init( Window&                   rOutputWindow,
-                   SpriteCanvas&             rSpriteCanvas,
+                   SpriteCanvas&			 rSpriteCanvas,
                    const ::basegfx::B2ISize& rSize,
                    bool                      bFullscreen );
 
@@ -62,7 +62,7 @@ namespace cairocanvas
 
         // XWindowGraphicDevice
         ::sal_Int32 createBuffers( ::sal_Int32 nBuffers );
-        void        destroyBuffers(  );
+        void 		destroyBuffers(  );
         ::sal_Bool  showBuffer( bool, ::sal_Bool );
         ::sal_Bool  switchBuffer( bool, ::sal_Bool bUpdateAll );
 
@@ -71,7 +71,7 @@ namespace cairocanvas
         ::com::sun::star::uno::Any getSurfaceHandle() const;
 
         void notifySizeUpdate( const ::com::sun::star::awt::Rectangle& rBounds );
-        void setSize( const ::basegfx::B2ISize& rSize );
+        void setSize( const ::basegfx::B2ISize&	rSize );
 
         ::cairo::SurfaceSharedPtr getSurface();
         ::cairo::SurfaceSharedPtr getBufferSurface();
@@ -83,7 +83,7 @@ namespace cairocanvas
 
     private:
         /// Pointer to sprite canvas (owner of this helper), needed to create bitmaps
-        SpriteCanvas*             mpSpriteCanvas;
+        SpriteCanvas*		      mpSpriteCanvas;
 
         ::cairo::SurfaceSharedPtr mpBufferSurface;
 
diff --git a/canvas/source/cairo/cairo_spritehelper.cxx b/canvas/source/cairo/cairo_spritehelper.cxx
index a3ba84648f3b..6d447463c59f 100644
--- a/canvas/source/cairo/cairo_spritehelper.cxx
+++ b/canvas/source/cairo/cairo_spritehelper.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
@@ -63,9 +63,9 @@ namespace cairocanvas
         mpBufferSurface(),
         mbTextureDirty(true)
     {}
-
+    
     void SpriteHelper::init( const geometry::RealSize2D& rSpriteSize,
-                             const SpriteCanvasRef&      rSpriteCanvas )
+                             const SpriteCanvasRef&	     rSpriteCanvas )
     {
         ENSURE_OR_THROW( rSpriteCanvas.get(),
                           "SpriteHelper::init(): Invalid device, sprite canvas or surface" );
@@ -147,7 +147,7 @@ namespace cairocanvas
                         ::basegfx::unotools::b2DPolyPolygonFromXPolyPolygon2D(
                             rClip ));
 
-                    doPolyPolygonImplementation( aClipPoly, Clip, pCairo.get(),
+                    doPolyPolygonImplementation( aClipPoly, Clip, pCairo.get(), 
                                                  NULL, SurfaceProviderRef(mpSpriteCanvas.get()),
                                                  rClip->getFillRule() );
                 }
@@ -159,8 +159,8 @@ namespace cairocanvas
 
                 if( isContentFullyOpaque() )
                     cairo_set_operator( pCairo.get(), CAIRO_OPERATOR_SOURCE );
-                cairo_set_source_surface( pCairo.get(),
-                                          mpBufferSurface->getCairoSurface().get(),
+                cairo_set_source_surface( pCairo.get(), 
+                                          mpBufferSurface->getCairoSurface().get(), 
                                           fX, fY );
                 if( ::rtl::math::approxEqual( fAlpha, 1.0 ) )
                     cairo_paint( pCairo.get() );
diff --git a/canvas/source/cairo/cairo_spritehelper.hxx b/canvas/source/cairo/cairo_spritehelper.hxx
index 0d770e25003e..f3b2c1ff6727 100644
--- a/canvas/source/cairo/cairo_spritehelper.hxx
+++ b/canvas/source/cairo/cairo_spritehelper.hxx
@@ -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
@@ -76,7 +76,7 @@ namespace cairocanvas
             When true, little debug bound rects for sprites are shown
          */
         void init( const ::com::sun::star::geometry::RealSize2D& rSpriteSize,
-                   const SpriteCanvasRef&                        rSpriteCanvas );
+                   const SpriteCanvasRef&					     rSpriteCanvas );
 
         void disposing();
 
@@ -98,11 +98,11 @@ namespace cairocanvas
          */
         void redraw( const ::cairo::CairoSharedPtr& pCairo,
                      const ::basegfx::B2DPoint&     rPos,
-                     bool&                          bSurfacesDirty,
+                     bool& 						    bSurfacesDirty,
                      bool                           bBufferedUpdate ) const;
-
+        
     private:
-        virtual ::basegfx::B2DPolyPolygon polyPolygonFromXPolyPolygon2D(
+        virtual ::basegfx::B2DPolyPolygon polyPolygonFromXPolyPolygon2D( 
             ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XPolyPolygon2D >& xPoly ) const;
 
 
diff --git a/canvas/source/cairo/cairo_spritesurface.hxx b/canvas/source/cairo/cairo_spritesurface.hxx
index 343d51e5d816..44c696124cfa 100644
--- a/canvas/source/cairo/cairo_spritesurface.hxx
+++ b/canvas/source/cairo/cairo_spritesurface.hxx
@@ -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
@@ -39,7 +39,7 @@ class Rectangle;
 namespace cairocanvas
 {
     /* Definition of SpriteSurface interface */
-
+    
     class SpriteSurface
     {
     public:
@@ -52,18 +52,18 @@ namespace cairocanvas
         virtual void hideSprite( const Sprite::ImplRef& sprite ) = 0;
 
         // call this when XSprite::move() is called
-        virtual void moveSprite( const Sprite::ImplRef& sprite,
-                                 const Point&           rOldPos,
-                                 const Point&           rNewPos,
-                                 const Size&            rSpriteSize ) = 0;
+        virtual void moveSprite( const Sprite::ImplRef&	sprite, 
+                                 const Point& 			rOldPos,
+                                 const Point& 			rNewPos,
+                                 const Size& 			rSpriteSize ) = 0;
 
         // call this when some part of your sprite has changed. That
         // includes show/hide�, i.e. for show, both showSprite and
         // updateSprite must be called.
-        virtual void updateSprite( const Sprite::ImplRef&   sprite,
-                                   const Point&             rPos,
-                                   const Rectangle&         rUpdateArea ) = 0;
-
+        virtual void updateSprite( const Sprite::ImplRef& 	sprite, 
+                                   const Point& 			rPos,
+                                   const Rectangle& 		rUpdateArea ) = 0;
+        
     };
 }
 
diff --git a/canvas/source/cairo/cairo_surfaceprovider.hxx b/canvas/source/cairo/cairo_surfaceprovider.hxx
index a6ec53be333f..fc58c2f6aca9 100644
--- a/canvas/source/cairo/cairo_surfaceprovider.hxx
+++ b/canvas/source/cairo/cairo_surfaceprovider.hxx
@@ -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
@@ -43,7 +43,7 @@ namespace cairocanvas
     class Bitmap;
 
     /* Definition of RepaintTarget interface */
-
+    
     /** Target interface for XCachedPrimitive implementations
 
         This interface must be implemented on all canvas
@@ -61,7 +61,7 @@ namespace cairocanvas
         virtual SurfaceSharedPtr getSurface() = 0;
 
         /// create new surface in given size
-        virtual SurfaceSharedPtr createSurface( const ::basegfx::B2ISize& rSize,
+        virtual SurfaceSharedPtr createSurface( const ::basegfx::B2ISize& rSize, 
                                                 Content aContent = CAIRO_CONTENT_COLOR_ALPHA ) = 0;
         /// create new surface from given bitmap
         virtual SurfaceSharedPtr createSurface( ::Bitmap& rBitmap ) = 0;
diff --git a/canvas/source/cairo/cairo_textlayout.cxx b/canvas/source/cairo/cairo_textlayout.cxx
index dfe2071c3726..0b9475e6dfa4 100644
--- a/canvas/source/cairo/cairo_textlayout.cxx
+++ b/canvas/source/cairo/cairo_textlayout.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
@@ -67,7 +67,7 @@
 # include "cairo_xlib_cairo.hxx"
 # include <cairo-ft.h>
 #else
-# error Native API needed.
+# error Native API needed. 
 #endif
 
 using namespace ::cairo;
@@ -78,7 +78,7 @@ namespace cairocanvas
     namespace
     {
         void setupLayoutMode( OutputDevice& rOutDev,
-                              sal_Int8      nTextDirection )
+                              sal_Int8		nTextDirection )	
         {
             // TODO(P3): avoid if already correctly set
             ULONG nLayoutMode;
@@ -107,11 +107,11 @@ namespace cairocanvas
         }
     }
 
-    TextLayout::TextLayout( const rendering::StringContext&     aText,
-                            sal_Int8                            nDirection,
-                            sal_Int64                           /*nRandomSeed*/,
-                            const CanvasFont::Reference&        rFont,
-                            const SurfaceProviderRef&           rRefDevice ) :
+    TextLayout::TextLayout( const rendering::StringContext& 	aText, 
+                            sal_Int8                        	nDirection, 
+                            sal_Int64                       	/*nRandomSeed*/,
+                            const CanvasFont::Reference&      	rFont,
+                            const SurfaceProviderRef&			rRefDevice ) :
         TextLayout_Base( m_aMutex ),
         maText( aText ),
         maLogicalAdvancements(),
@@ -120,7 +120,7 @@ namespace cairocanvas
         mnTextDirection( nDirection )
     {
     }
-
+    
     TextLayout::~TextLayout()
     {
     }
@@ -223,7 +223,7 @@ namespace cairocanvas
         return 0.0;
     }
 
-    double SAL_CALL TextLayout::combinedJustify( const uno::Sequence< uno::Reference< rendering::XTextLayout > >& /*aNextLayouts*/,
+    double SAL_CALL TextLayout::combinedJustify( const uno::Sequence< uno::Reference< rendering::XTextLayout > >& /*aNextLayouts*/, 
                                                  double /*nSize*/ ) throw (lang::IllegalArgumentException, uno::RuntimeException)
     {
         ::osl::MutexGuard aGuard( m_aMutex );
@@ -240,7 +240,7 @@ namespace cairocanvas
         return rendering::TextHit();
     }
 
-    rendering::Caret SAL_CALL TextLayout::getCaret( sal_Int32 /*nInsertionIndex*/,
+    rendering::Caret SAL_CALL TextLayout::getCaret( sal_Int32 /*nInsertionIndex*/, 
                                                     sal_Bool /*bExcludeLigatures*/ ) throw (lang::IndexOutOfBoundsException, uno::RuntimeException)
     {
         ::osl::MutexGuard aGuard( m_aMutex );
@@ -249,8 +249,8 @@ namespace cairocanvas
         return rendering::Caret();
     }
 
-    sal_Int32 SAL_CALL TextLayout::getNextInsertionIndex( sal_Int32 /*nStartIndex*/,
-                                                          sal_Int32 /*nCaretAdvancement*/,
+    sal_Int32 SAL_CALL TextLayout::getNextInsertionIndex( sal_Int32 /*nStartIndex*/, 
+                                                          sal_Int32 /*nCaretAdvancement*/, 
                                                           sal_Bool /*bExcludeLigatures*/ ) throw (lang::IndexOutOfBoundsException, uno::RuntimeException)
     {
         ::osl::MutexGuard aGuard( m_aMutex );
@@ -259,7 +259,7 @@ namespace cairocanvas
         return 0;
     }
 
-    uno::Reference< rendering::XPolyPolygon2D > SAL_CALL TextLayout::queryVisualHighlighting( sal_Int32 /*nStartIndex*/,
+    uno::Reference< rendering::XPolyPolygon2D > SAL_CALL TextLayout::queryVisualHighlighting( sal_Int32 /*nStartIndex*/, 
                                                                                               sal_Int32 /*nEndIndex*/ ) throw (lang::IndexOutOfBoundsException, uno::RuntimeException)
     {
         ::osl::MutexGuard aGuard( m_aMutex );
@@ -268,7 +268,7 @@ namespace cairocanvas
         return uno::Reference< rendering::XPolyPolygon2D >();
     }
 
-    uno::Reference< rendering::XPolyPolygon2D > SAL_CALL TextLayout::queryLogicalHighlighting( sal_Int32 /*nStartIndex*/,
+    uno::Reference< rendering::XPolyPolygon2D > SAL_CALL TextLayout::queryLogicalHighlighting( sal_Int32 /*nStartIndex*/, 
                                                                                                sal_Int32 /*nEndIndex*/ ) throw (lang::IndexOutOfBoundsException, uno::RuntimeException)
     {
         ::osl::MutexGuard aGuard( m_aMutex );
@@ -305,12 +305,12 @@ namespace cairocanvas
 
         return maText;
     }
-
+  
     void TextLayout::useFont( Cairo* pCairo )
     {
     rendering::FontRequest aFontRequest = mpFont->getFontRequest();
     rendering::FontInfo aFontInfo = aFontRequest.FontDescription;
-
+    
     cairo_select_font_face( pCairo, ::rtl::OUStringToOString( aFontInfo.FamilyName, RTL_TEXTENCODING_UTF8 ), CAIRO_FONT_SLANT_NORMAL, CAIRO_FONT_WEIGHT_NORMAL );
     cairo_set_font_size( pCairo, aFontRequest.CellSize );
     }
@@ -363,7 +363,7 @@ namespace cairocanvas
         return true;
     }
 
-
+        
   /**
    * TextLayout::draw
    *
@@ -381,7 +381,7 @@ namespace cairocanvas
                            const rendering::ViewState&   viewState,
                            const rendering::RenderState& renderState ) const
     {
-        ::osl::MutexGuard aGuard( m_aMutex );
+        ::osl::MutexGuard aGuard( m_aMutex );        
         SystemTextLayoutData aSysLayoutData;
 #if (defined CAIRO_HAS_WIN32_SURFACE) && (OSL_DEBUG_LEVEL > 1)
         LOGFONTW logfont;
@@ -390,11 +390,11 @@ namespace cairocanvas
 
         // TODO(P2): cache that
         ::boost::scoped_array< sal_Int32 > aOffsets(new sal_Int32[maLogicalAdvancements.getLength()]);
-
+        
         if( maLogicalAdvancements.getLength() )
         {
             setupTextOffsets( aOffsets.get(), maLogicalAdvancements, viewState, renderState );
-
+            
             // TODO(F3): ensure correct length and termination for DX
             // array (last entry _must_ contain the overall width)
         }
@@ -415,7 +415,7 @@ namespace cairocanvas
                       aSysLayoutData.aSysFontData.bFakeItalic ? "FI " : "",
                       ::rtl::OUStringToOString( maText.Text.copy( maText.StartPosition, maText.Length ),
                                                 RTL_TEXTENCODING_UTF8 ).getStr());
-
+            
             if (maLogicalAdvancements.getLength())        // VCL FALLBACK - with glyph advances
             {
                 rOutDev.DrawTextArray( rOutpos, maText.Text, aOffsets.get(),
@@ -431,24 +431,24 @@ namespace cairocanvas
                 return true;
             }
         }
-
+        
         if (aSysLayoutData.rGlyphData.empty()) return false; //??? false?
-
+        
         /**
-         * Setup platform independent glyph vector into cairo-based glyphs vector.
+         * Setup platform independent glyph vector into cairo-based glyphs vector. 
          **/
-
+        
         // setup glyphs
         std::vector<cairo_glyph_t> cairo_glyphs;
         cairo_glyphs.reserve( 256 );
-
+        
         for( int nStart = 0; nStart < (int) aSysLayoutData.rGlyphData.size(); nStart++ )
         {
             cairo_glyph_t aGlyph;
             SystemGlyphData systemGlyph = aSysLayoutData.rGlyphData.at(nStart);
             aGlyph.index = systemGlyph.index;
 #ifdef CAIRO_HAS_WIN32_SURFACE
-            // Cairo requires standard glyph indexes (ETO_GLYPH_INDEX), while vcl/win/* uses ucs4 chars.
+            // Cairo requires standard glyph indexes (ETO_GLYPH_INDEX), while vcl/win/* uses ucs4 chars. 
             // Convert to standard indexes
             aGlyph.index = cairo::ucs4toindex((unsigned int) aGlyph.index, aSysLayoutData.aSysFontData.hFont);
 #endif
@@ -458,34 +458,34 @@ namespace cairocanvas
         }
 
         if (cairo_glyphs.empty()) return true;  //true or false??
-
+        
         /**
          * Setup font
-         **/
+         **/        
         cairo_font_face_t* font_face = NULL;
 
 #ifdef CAIRO_HAS_QUARTZ_SURFACE
         // TODO: use cairo_quartz_font_face_create_for_cgfont(cgFont)
         //       when CGFont (Mac OS X 10.5 API) is provided by the AQUA VCL backend.
         font_face = cairo_quartz_font_face_create_for_atsu_font_id((ATSUFontID) aSysLayoutData.aSysFontData.aATSUFontID);
-
-#elif defined CAIRO_HAS_WIN32_SURFACE
+        
+#elif defined CAIRO_HAS_WIN32_SURFACE        
   #if (OSL_DEBUG_LEVEL > 1)
         GetObjectW( aSysLayoutData.aSysFontData.hFont, sizeof(logfont), &logfont );
   #endif
         // Note: cairo library uses logfont fallbacks when lfEscapement, lfOrientation and lfWidth are not zero.
         // VCL always has non-zero value for lfWidth
         font_face = cairo_win32_font_face_create_for_hfont(aSysLayoutData.aSysFontData.hFont);
-
+        
 #elif defined CAIRO_HAS_XLIB_SURFACE
         font_face = cairo_ft_font_face_create_for_ft_face((FT_Face)aSysLayoutData.aSysFontData.nFontId,
                                                           aSysLayoutData.aSysFontData.nFontFlags);
 #else
-# error Native API needed.
+# error Native API needed. 
 #endif
 
         CairoSharedPtr pSCairo = pSurface->getCairo();
-
+        
         cairo_set_font_face( pSCairo.get(), font_face);
 
         // create default font options. cairo_get_font_options() does not retrieve the surface defaults,
@@ -494,23 +494,23 @@ namespace cairocanvas
         if (aSysLayoutData.aSysFontData.bAntialias) {
             // CAIRO_ANTIALIAS_GRAY provides more similar result to VCL Canvas,
             // so we're not using CAIRO_ANTIALIAS_SUBPIXEL
-            cairo_font_options_set_antialias(options, CAIRO_ANTIALIAS_GRAY);
+            cairo_font_options_set_antialias(options, CAIRO_ANTIALIAS_GRAY); 
         }
         cairo_set_font_options( pSCairo.get(), options);
 
         // Font color
         Color mTextColor = rOutDev.GetTextColor();
-        cairo_set_source_rgb(pSCairo.get(),
-                             mTextColor.GetRed()/255.0,
+        cairo_set_source_rgb(pSCairo.get(), 
+                             mTextColor.GetRed()/255.0, 
                              mTextColor.GetGreen()/255.0,
                              mTextColor.GetBlue()/255.0);
-
+        
         // Font rotation and scaling
         cairo_matrix_t m;
         Font aFont = rOutDev.GetFont();
         FontMetric aMetric( rOutDev.GetFontMetric(aFont) );
         long nWidth = 0;
-
+        
         // width calculation is deep magic and platform/font dependant.
         // width == 0 means no scaling, and usually width == height means the same.
         // Other values mean horizontal scaling (narrow or stretching)
@@ -524,26 +524,26 @@ namespace cairocanvas
             // of width of the font
             nWidth = aFont.GetHeight() * aFont.GetWidth() / aMetric.GetWidth();
         }
-
+        
         cairo_matrix_init_identity(&m);
-
+        
         if (aSysLayoutData.orientation) cairo_matrix_rotate(&m, (3600 - aSysLayoutData.orientation) * M_PI / 1800.0);
-
+        
         cairo_matrix_scale(&m, nWidth, aFont.GetHeight());
 
         //faux italics
         if (aSysLayoutData.aSysFontData.bFakeItalic) m.xy = -m.xx * 0x6000L / 0x10000L;
-
+        
         cairo_set_font_matrix(pSCairo.get(), &m);
-
-        OSL_TRACE("\r\n:cairocanvas::TextLayout::draw(S,O,p,v,r): Size:(%d,%d), W:%d->%d, Pos (%d,%d), G(%d,%d,%d) %s%s%s%s || Name:%s - %s",
+        
+        OSL_TRACE("\r\n:cairocanvas::TextLayout::draw(S,O,p,v,r): Size:(%d,%d), W:%d->%d, Pos (%d,%d), G(%d,%d,%d) %s%s%s%s || Name:%s - %s", 
                   aFont.GetWidth(),
                   aFont.GetHeight(),
                   aMetric.GetWidth(),
                   nWidth,
                   (int) rOutpos.X(),
                   (int) rOutpos.Y(),
-                  cairo_glyphs[0].index, cairo_glyphs[1].index, cairo_glyphs[2].index,
+                  cairo_glyphs[0].index, cairo_glyphs[1].index, cairo_glyphs[2].index, 
                   maLogicalAdvancements.getLength() ? "ADV " : "",
                   aSysLayoutData.aSysFontData.bAntialias ? "AA " : "",
                   aSysLayoutData.aSysFontData.bFakeBold ? "FB " : "",
@@ -556,14 +556,14 @@ namespace cairocanvas
                   ::rtl::OUStringToOString( maText.Text.copy( maText.StartPosition, maText.Length ),
                                             RTL_TEXTENCODING_UTF8 ).getStr()
             );
-
+        
         cairo_show_glyphs(pSCairo.get(), &cairo_glyphs[0], cairo_glyphs.size());
-
+        
         //faux bold
         if (aSysLayoutData.aSysFontData.bFakeBold) {
             double bold_dx = 0.5 * sqrt( 0.7 * aFont.GetHeight() );
             int total_steps = 2 * ((int) (bold_dx + 0.5));
-
+            
             // loop to draw the text for every half pixel of displacement
             for (int nSteps = 0; nSteps < total_steps; nSteps++) {
                 for(int nGlyphIdx = 0; nGlyphIdx < (int) cairo_glyphs.size(); nGlyphIdx++) {
@@ -573,9 +573,9 @@ namespace cairocanvas
             }
             OSL_TRACE(":cairocanvas::TextLayout::draw(S,O,p,v,r): FAKEBOLD - dx:%d", (int) bold_dx);
         }
-
+        
         cairo_restore( pSCairo.get() );
-        cairo_font_face_destroy(font_face);
+        cairo_font_face_destroy(font_face); 
         return true;
     }
 
@@ -612,10 +612,10 @@ namespace cairocanvas
         };
     }
 
-    void TextLayout::setupTextOffsets( sal_Int32*                       outputOffsets,
-                                       const uno::Sequence< double >&   inputOffsets,
-                                       const rendering::ViewState&      viewState,
-                                       const rendering::RenderState&    renderState     ) const
+    void TextLayout::setupTextOffsets( sal_Int32*						outputOffsets,
+                                       const uno::Sequence< double >& 	inputOffsets,
+                                       const rendering::ViewState& 		viewState,
+                                       const rendering::RenderState& 	renderState		) const
     {
         ENSURE_OR_THROW( outputOffsets!=NULL,
                           "TextLayout::setupTextOffsets offsets NULL" );
@@ -650,7 +650,7 @@ namespace cairocanvas
     {
         uno::Sequence< ::rtl::OUString > aRet(1);
         aRet[0] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM ( SERVICE_NAME ) );
-
+        
         return aRet;
     }
 }
diff --git a/canvas/source/cairo/cairo_textlayout.hxx b/canvas/source/cairo/cairo_textlayout.hxx
index 6e14907c01bb..6fc2d7b96dc0 100644
--- a/canvas/source/cairo/cairo_textlayout.hxx
+++ b/canvas/source/cairo/cairo_textlayout.hxx
@@ -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
@@ -51,16 +51,16 @@ namespace cairocanvas
     typedef ::cppu::WeakComponentImplHelper2< ::com::sun::star::rendering::XTextLayout,
                                                ::com::sun::star::lang::XServiceInfo > TextLayout_Base;
 
-    class TextLayout : public ::comphelper::OBaseMutex,
+    class TextLayout : public ::comphelper::OBaseMutex, 
                        public TextLayout_Base,
                        private ::boost::noncopyable
     {
     public:
-        TextLayout( const ::com::sun::star::rendering::StringContext& aText,
-                    sal_Int8                                          nDirection,
+        TextLayout( const ::com::sun::star::rendering::StringContext& aText, 
+                    sal_Int8                                          nDirection, 
                     sal_Int64                                         nRandomSeed,
                     const CanvasFont::Reference&                      rFont,
-                    const SurfaceProviderRef&                         rRefDevice );
+                    const SurfaceProviderRef&	                      rRefDevice );
 
         /// Dispose all internal references
         virtual void SAL_CALL disposing();
@@ -83,7 +83,7 @@ namespace cairocanvas
         virtual sal_Int8 SAL_CALL getMainTextDirection(  ) throw (::com::sun::star::uno::RuntimeException);
         virtual ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XCanvasFont > SAL_CALL getFont(  ) throw (::com::sun::star::uno::RuntimeException);
         virtual ::com::sun::star::rendering::StringContext SAL_CALL getText(  ) throw (::com::sun::star::uno::RuntimeException);
-
+        
         // XServiceInfo
         virtual ::rtl::OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException );
         virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw( ::com::sun::star::uno::RuntimeException );
@@ -92,14 +92,14 @@ namespace cairocanvas
         bool draw( ::cairo::Cairo* pCairo );
         bool draw( SurfaceSharedPtr&                               pSurface,
                    OutputDevice&                                   rOutDev,
-                   const Point&                                    rOutpos,
-                   const ::com::sun::star::rendering::ViewState&   viewState,
+                   const Point&                                    rOutpos, 
+                   const ::com::sun::star::rendering::ViewState&   viewState, 
                    const ::com::sun::star::rendering::RenderState& renderState ) const;
 
-        void setupTextOffsets( sal_Int32*                                       outputOffsets,
+        void setupTextOffsets( sal_Int32*										outputOffsets,
                                const ::com::sun::star::uno::Sequence< double >& inputOffsets,
-                               const ::com::sun::star::rendering::ViewState&    viewState,
-                               const ::com::sun::star::rendering::RenderState&  renderState     ) const;
+                               const ::com::sun::star::rendering::ViewState& 	viewState, 
+                               const ::com::sun::star::rendering::RenderState& 	renderState		) const;
 
     protected:
         ~TextLayout(); // we're a ref-counted UNO class. _We_ destroy ourselves.
@@ -108,7 +108,7 @@ namespace cairocanvas
         ::com::sun::star::rendering::StringContext maText;
         ::com::sun::star::uno::Sequence< double >  maLogicalAdvancements;
         CanvasFont::Reference                      mpFont;
-        SurfaceProviderRef                         mpRefDevice;
+        SurfaceProviderRef               		   mpRefDevice;
         sal_Int8                                   mnTextDirection;
 
         void useFont( ::cairo::Cairo* pCairo );
diff --git a/canvas/source/cairo/cairo_win32_cairo.cxx b/canvas/source/cairo/cairo_win32_cairo.cxx
index d0d6558c2fdd..c22286bd3ff2 100644
--- a/canvas/source/cairo/cairo_win32_cairo.cxx
+++ b/canvas/source/cairo/cairo_win32_cairo.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
@@ -25,6 +25,8 @@
  *
  ************************************************************************/
 
+#define _WIN32_WINNT 0x0500
+
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_canvas.hxx"
 
@@ -34,7 +36,7 @@
  ************************************************************************/
 
 #include <tools/prewin.h>
-#include <windows.h>
+#include <windows.h> 
 #include <tools/postwin.h>
 
 #include <osl/diagnose.h>
@@ -78,7 +80,7 @@ namespace cairo
      * @param x horizontal location of the new surface
      * @param y vertical location of the new surface
      *
-     * pSysData contains the platform native Window reference.
+     * pSysData contains the platform native Window reference. 
      * pSysData is used to create a surface on the Window
      *
      * Set the mpSurface to the new surface or NULL
@@ -103,7 +105,7 @@ namespace cairo
         mpSurface()
     {
         OSL_ASSERT(rBmpData.pDIB == NULL);
-
+        
         if(rBmpData.pDIB != NULL) {
             // So just leave mpSurface to NULL, little else we can do at
             // this stage. Hopefully the Win32 patch to
@@ -111,8 +113,8 @@ namespace cairo
             // const Size&) will catch the cases where this
             // constructor would be called with a DIB bitmap, and we
             // will never get here. At least it worked for Ballmer.ppt.
-        }
-        else
+        } 
+        else 
         {
             HDC hDC = CreateCompatibleDC(NULL);
             void* hOrigBitmap;
@@ -138,7 +140,7 @@ namespace cairo
     }
 
     /**
-     * Surface::getSimilar:  Create new similar Canvas surface
+     * Surface::getSimilar:  Create new similar Canvas surface 
      * @param aContent format of the new surface (cairo_content_t from cairo/src/cairo.h)
      * @param width width of the new surface
      * @param height height of the new surface
@@ -149,11 +151,11 @@ namespace cairo
      * Cairo surface from aContent (cairo_content_t)
      *
      * @return new surface or NULL
-     **/
+     **/     
     SurfaceSharedPtr Win32Surface::getSimilar( Content aContent, int width, int height ) const
     {
         return SurfaceSharedPtr(
-            new Win32Surface(
+            new Win32Surface( 
                 CairoSurfaceSharedPtr(
                     cairo_surface_create_similar( mpSurface.get(), aContent, width, height ),
                     &cairo_surface_destroy )));
@@ -181,7 +183,7 @@ namespace cairo
     /**
      * Surface::getDepth:  Get the color depth of the Canvas surface.
      *
-     * @return color depth
+     * @return color depth 
      **/
     int Win32Surface::getDepth() const
     {
@@ -272,9 +274,9 @@ namespace cairo
                                           const BitmapSystemData& rData,
                                           const Size&             rSize )
     {
-        OSL_TRACE( "requested size: %d x %d available size: %d x %d",
+        OSL_TRACE( "requested size: %d x %d available size: %d x %d", 
                    rSize.Width(), rSize.Height(), rData.mnWidth, rData.mnHeight );
-
+        
         if ( rData.mnWidth == rSize.Width() && rData.mnHeight == rSize.Height() )
             return SurfaceSharedPtr(new Win32Surface( rData ));
         else
@@ -295,24 +297,24 @@ namespace cairo
         WORD glyph_index;
         HDC hdc = NULL;
         int i = 0;
-
+        
         hdc = CreateCompatibleDC (NULL);
-
+        
         if (!hdc) return 0;
         if (!SetGraphicsMode (hdc, GM_ADVANCED)) {
             DeleteDC (hdc);
             return 0;
         }
-
+        
         SelectObject (hdc, hfont);
         SetMapMode (hdc, MM_TEXT);
-
+        
         unicode[0] = ucs4;
         unicode[1] = 0;
         if (GetGlyphIndicesW (hdc, unicode, 1, &glyph_index, 0) == GDI_ERROR) {
             glyph_index = 0;
         }
-
+        
         DeleteDC (hdc);
         return glyph_index;
     }
diff --git a/canvas/source/cairo/cairo_win32_cairo.hxx b/canvas/source/cairo/cairo_win32_cairo.hxx
index 3b083d28e748..bd1a192de778 100644
--- a/canvas/source/cairo/cairo_win32_cairo.hxx
+++ b/canvas/source/cairo/cairo_win32_cairo.hxx
@@ -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
@@ -30,7 +30,7 @@
 
 #ifdef WNT
 # include <tools/prewin.h>
-# include <windows.h>
+# include <windows.h> 
 # include <tools/postwin.h>
 #endif
 
@@ -38,7 +38,7 @@
 
 namespace cairo {
 
-    class Win32Surface : public Surface
+    class Win32Surface : public Surface 
     {
         CairoSurfaceSharedPtr mpSurface;
 
diff --git a/canvas/source/cairo/cairo_xlib_cairo.cxx b/canvas/source/cairo/cairo_xlib_cairo.cxx
index 823ad05e426f..2c2924ff8490 100644
--- a/canvas/source/cairo/cairo_xlib_cairo.cxx
+++ b/canvas/source/cairo/cairo_xlib_cairo.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
@@ -105,8 +105,8 @@ namespace cairo
      *
      * Set the mpSurface as pSurface
      **/
-    X11Surface::X11Surface( const X11SysData&            rSysData,
-                            const X11PixmapSharedPtr&    rPixmap,
+    X11Surface::X11Surface( const X11SysData&            rSysData, 
+                            const X11PixmapSharedPtr&    rPixmap, 
                             const CairoSurfaceSharedPtr& pSurface ) :
         maSysData(rSysData),
         mpPixmap(rPixmap),
@@ -124,7 +124,7 @@ namespace cairo
      *
      * Set the mpSurface as pSurface
      **/
-    X11Surface::X11Surface( const CairoSurfaceSharedPtr& pSurface ) :
+    X11Surface::X11Surface( const CairoSurfaceSharedPtr& pSurface ) : 
         maSysData(),
         mpPixmap(),
         mpSurface(pSurface)
@@ -168,7 +168,7 @@ namespace cairo
      *
      * Set the mpSurface to the new surface or NULL
      **/
-    X11Surface::X11Surface( const X11SysData&       rSysData,
+    X11Surface::X11Surface( const X11SysData&       rSysData, 
                             const BitmapSystemData& rData ) :
         maSysData( rSysData ),
         mpPixmap(),
@@ -193,7 +193,7 @@ namespace cairo
     }
 
     /**
-     * Surface::getSimilar:  Create new similar Canvas surface
+     * Surface::getSimilar:  Create new similar Canvas surface 
      * @param aContent format of the new surface (cairo_content_t from cairo/src/cairo.h)
      * @param width width of the new surface
      * @param height height of the new surface
@@ -204,17 +204,17 @@ namespace cairo
      * Cairo surface from aContent (cairo_content_t)
      *
      * @return new surface or NULL
-     **/
+     **/     
     SurfaceSharedPtr X11Surface::getSimilar( Content aContent, int width, int height ) const
     {
         Pixmap hPixmap;
 
-        if( maSysData.pDisplay && maSysData.hDrawable )
+        if( maSysData.pDisplay && maSysData.hDrawable ) 
         {
             XRenderPictFormat* pFormat;
-            int nFormat;
+            int	nFormat;
 
-            switch (aContent)
+            switch (aContent) 
             {
                 case CAIRO_CONTENT_ALPHA:
                     nFormat = PictStandardA8;
@@ -236,20 +236,20 @@ namespace cairo
             X11SysData aSysData(maSysData);
             aSysData.pRenderFormat = pFormat;
             return SurfaceSharedPtr(
-                new X11Surface( aSysData,
+                new X11Surface( aSysData, 
                                 X11PixmapSharedPtr(
                                     new X11Pixmap(hPixmap, maSysData.pDisplay)),
                                 CairoSurfaceSharedPtr(
-                                    cairo_xlib_surface_create_with_xrender_format(
-                                        (Display*)maSysData.pDisplay,
+                                    cairo_xlib_surface_create_with_xrender_format( 
+                                        (Display*)maSysData.pDisplay, 
                                         hPixmap,
                                         ScreenOfDisplay((Display *)maSysData.pDisplay, maSysData.nScreen),
                                         pFormat, width, height ),
                                     &cairo_surface_destroy) ));
-        }
+        } 
         else
             return SurfaceSharedPtr(
-                new X11Surface( maSysData,
+                new X11Surface( maSysData, 
                                 X11PixmapSharedPtr(),
                                 CairoSurfaceSharedPtr(
                                     cairo_surface_create_similar( mpSurface.get(), aContent, width, height ),
@@ -290,7 +290,7 @@ namespace cairo
     /**
      * Surface::getDepth:  Get the color depth of the Canvas surface.
      *
-     * @return color depth
+     * @return color depth 
      **/
     int X11Surface::getDepth() const
     {
@@ -334,10 +334,10 @@ namespace cairo
     }
 
     SurfaceSharedPtr createBitmapSurface( const OutputDevice&     rRefDevice,
-                                          const BitmapSystemData& rData,
+                                          const BitmapSystemData& rData, 
                                           const Size&             rSize )
     {
-        OSL_TRACE( "requested size: %d x %d available size: %d x %d",
+        OSL_TRACE( "requested size: %d x %d available size: %d x %d", 
                    rSize.Width(), rSize.Height(), rData.mnWidth, rData.mnHeight );
         if ( rData.mnWidth == rSize.Width() && rData.mnHeight == rSize.Height() )
         {
diff --git a/canvas/source/cairo/cairo_xlib_cairo.hxx b/canvas/source/cairo/cairo_xlib_cairo.hxx
index aa5cfa67a2b6..aafe04577a68 100644
--- a/canvas/source/cairo/cairo_xlib_cairo.hxx
+++ b/canvas/source/cairo/cairo_xlib_cairo.hxx
@@ -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
@@ -42,13 +42,13 @@ namespace cairo {
         explicit X11SysData( const SystemGraphicsData& );
         explicit X11SysData( const SystemEnvData& );
 
-        void*   pDisplay;       // the relevant display connection
-        long    hDrawable;      // a drawable
-        void*   pVisual;        // the visual in use
-        int nScreen;        // the current screen of the drawable
-        int     nDepth;         // depth of said visual
-        long    aColormap;      // the colormap being used
-        void*   pRenderFormat;  // render format for drawable
+        void*	pDisplay;		// the relevant display connection
+        long	hDrawable;      // a drawable
+        void*	pVisual;		// the visual in use
+        int	nScreen;		// the current screen of the drawable
+        int		nDepth; 		// depth of said visual
+        long	aColormap;		// the colormap being used
+        void*	pRenderFormat;  // render format for drawable
     };
 
     /// RAII wrapper for a pixmap
@@ -69,7 +69,7 @@ namespace cairo {
 
     typedef boost::shared_ptr<X11Pixmap>       X11PixmapSharedPtr;
 
-    class X11Surface : public Surface
+    class X11Surface : public Surface 
     {
         const X11SysData      maSysData;
         X11PixmapSharedPtr    mpPixmap;
diff --git a/canvas/source/directx/dx_5rm.cxx b/canvas/source/directx/dx_5rm.cxx
index 642ef7bd7db6..42cc316eabe4 100755
--- a/canvas/source/directx/dx_5rm.cxx
+++ b/canvas/source/directx/dx_5rm.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
@@ -74,7 +74,7 @@
 #include "dx_impltools.hxx"
 #include <malloc.h>
 
-#if defined(DX_DEBUG_IMAGES)
+#if defined(DX_DEBUG_IMAGES) 
 # if OSL_DEBUG_LEVEL > 0
 #  include <imdebug.h>
 #  undef min
@@ -452,8 +452,8 @@ namespace dxcanvas
             return pDirectDraw2;
         }
 
-        HRESULT WINAPI EnumTextureFormatsCallback( LPDDSURFACEDESC  pSurfaceDesc,
-                                                   LPVOID           pContext        )
+        HRESULT WINAPI EnumTextureFormatsCallback( LPDDSURFACEDESC 	pSurfaceDesc,
+                                                   LPVOID			pContext		)
         {
             // dirty cast of given context back to result ModeSelectContext
             DDPIXELFORMAT* pResult = (DDPIXELFORMAT*)pContext;
@@ -586,7 +586,7 @@ namespace dxcanvas
             struct ModeSelectContext
             {
                 DDSURFACEDESC selectedDesc;
-                ::basegfx::B2ISize   requestedSize;
+                ::basegfx::B2ISize	 requestedSize;
             };
 
             /** Query actual size of the device
@@ -606,7 +606,7 @@ namespace dxcanvas
 
                 @return the amount of free surface mem
             */
-            std::size_t   getAvailableSurfaceMem( bool bWithAGPMem=true ) const;
+            std::size_t	  getAvailableSurfaceMem( bool bWithAGPMem=true ) const;
 
             /** Query the amount of memory available for new textures
 
@@ -642,15 +642,15 @@ namespace dxcanvas
                 to serialize access to DirectX's global state, a global
                 mutex is required.
             */
-            static ::osl::Mutex                     maMutex;
+            static ::osl::Mutex						maMutex;
 
             HWND                                    mhWnd;
-            ::boost::scoped_ptr<SystemChildWindow>  mpWindow;
-            ::basegfx::B2IVector                    maSize;
-
-            ModeSelectContext                       maSelectedFullscreenMode;
+            ::boost::scoped_ptr<SystemChildWindow>	mpWindow;
+            ::basegfx::B2IVector					maSize;
+                
+            ModeSelectContext						maSelectedFullscreenMode;
             DDPIXELFORMAT                           maTextureFormat;
-
+        
             MONITORINFO                             maMonitorInfo; // monitor info for mpDirectDraw's monitor
             COMReference<IDirectDraw2>              mpDirectDraw;
             COMReference<IDirectDrawSurface>        mpPrimarySurface;
@@ -659,23 +659,23 @@ namespace dxcanvas
             COMReference< IDirect3D2 >              mpDirect3D;
             COMReference< IDirect3DDevice2 >        mpDirect3DDevice;
 
-            mutable ::canvas::tools::ElapsedTime    maLastUpdate;   // for the frame counter
+            mutable ::canvas::tools::ElapsedTime	maLastUpdate;	// for the frame counter
 
             D3DDEVICEDESC                           maDeviceDesc;
 
-            typedef std::vector<canvas::Vertex>     vertexCache_t;
-            vertexCache_t                           maVertexCache;
-            std::size_t                             mnCount;
+            typedef std::vector<canvas::Vertex>	    vertexCache_t;
+            vertexCache_t							maVertexCache;
+            std::size_t								mnCount;
 
             int                                     mnBeginSceneCount;
-
-            const bool                              mbPageFlipping;
-            bool                                    mbHasNoTearingBlt;
-            bool                                    mbError;
-            PrimitiveType                           meType;
-
-            ::canvas::ISurfaceSharedPtr             mpTexture;
-            ::basegfx::B2IVector                    maPageSize;
+                
+            const bool								mbPageFlipping;
+            bool 									mbHasNoTearingBlt;
+            bool									mbError;
+            PrimitiveType							meType;
+
+            ::canvas::ISurfaceSharedPtr				mpTexture;
+            ::basegfx::B2IVector					maPageSize;
         };
 
         ::osl::Mutex DXRenderModule::maMutex;
@@ -684,7 +684,7 @@ namespace dxcanvas
         // DXSurface::ImplRenderModuleGuard
         //////////////////////////////////////////////////////////////////////////////////
 
-        inline DXSurface::ImplRenderModuleGuard::ImplRenderModuleGuard(
+        inline DXSurface::ImplRenderModuleGuard::ImplRenderModuleGuard( 
             DXRenderModule& rRenderModule ) :
             mrRenderModule( rRenderModule )
         {
@@ -725,7 +725,7 @@ namespace dxcanvas
         //////////////////////////////////////////////////////////////////////////////////
 
         DXSurface::DXSurface( DXRenderModule&           rRenderModule,
-                              const ::basegfx::B2ISize& rSize ) :
+                              const ::basegfx::B2ISize& rSize ) : 
             mrRenderModule(rRenderModule),
             mpTexture(NULL),
             mpSurface(NULL),
@@ -746,7 +746,7 @@ namespace dxcanvas
                 return;
 #endif
 
-            ENSURE_ARG_OR_THROW(rSize.getX() > 0 && rSize.getY() > 0,
+            ENSURE_ARG_OR_THROW(rSize.getX() > 0 && rSize.getY() > 0, 
                             "DXSurface::DXSurface(): request for zero-sized surface");
 
             const D3DDEVICEDESC &deviceDesc = rRenderModule.getDeviceDesc();
@@ -838,7 +838,7 @@ namespace dxcanvas
                 return false;
             }
 
-#if defined(DX_DEBUG_IMAGES)
+#if defined(DX_DEBUG_IMAGES) 
 # if OSL_DEBUG_LEVEL > 0
             if( mpSurface.is() )
             {
@@ -846,14 +846,14 @@ namespace dxcanvas
                 rtl_fillMemory( &aSurfaceDesc,sizeof(DDSURFACEDESC),0 );
                 aSurfaceDesc.dwSize = sizeof(DDSURFACEDESC);
 
-                if( SUCCEEDED(mpSurface->Lock( NULL,
-                                               &aSurfaceDesc,
+                if( SUCCEEDED(mpSurface->Lock( NULL, 
+                                               &aSurfaceDesc, 
                                                DDLOCK_NOSYSLOCK|DDLOCK_SURFACEMEMORYPTR|DDLOCK_WAIT|DDLOCK_READONLY,
                                                NULL)) )
                 {
-                    imdebug( "rgba w=%d h=%d %p",
-                             aSurfaceDesc.dwWidth,
-                             aSurfaceDesc.dwHeight,
+                    imdebug( "rgba w=%d h=%d %p", 
+                             aSurfaceDesc.dwWidth, 
+                             aSurfaceDesc.dwHeight, 
                              aSurfaceDesc.lpSurface );
 
                     mpSurface->Unlock(NULL);
@@ -876,7 +876,7 @@ namespace dxcanvas
             if(!(mpSurface.is()))
                 return false;
 
-            if(mpSurface->IsLost() == DDERR_SURFACELOST)
+            if(mpSurface->IsLost() == DDERR_SURFACELOST) 
             {
                 mpSurface->Restore();
                 return false;
@@ -905,8 +905,8 @@ namespace dxcanvas
             aSurfaceDesc.dwSize = sizeof(DDSURFACEDESC);
 
             // TODO(P2): only lock the region we want to update
-            if( FAILED(mpSurface->Lock( NULL,
-                                        &aSurfaceDesc,
+            if( FAILED(mpSurface->Lock( NULL, 
+                                        &aSurfaceDesc, 
                                         DDLOCK_NOSYSLOCK|DDLOCK_SURFACEMEMORYPTR|DDLOCK_WAIT|DDLOCK_WRITEONLY,
                                         NULL)) )
                 return false;
@@ -924,7 +924,7 @@ namespace dxcanvas
 
                         // calculate the destination memory address
                         sal_uInt8 *pDst = ((sal_uInt8*)aSurfaceDesc.lpSurface+
-                                           (rDestPos.getY()*aSurfaceDesc.lPitch) +
+                                           (rDestPos.getY()*aSurfaceDesc.lPitch) + 
                                            (4*rDestPos.getX()));
 
                         const sal_uInt32 nNumBytesToCopy(
@@ -952,7 +952,7 @@ namespace dxcanvas
 
                         // calculate the destination memory address
                         sal_uInt8 *pDst = ((sal_uInt8*)aSurfaceDesc.lpSurface+
-                                           (rDestPos.getY()*aSurfaceDesc.lPitch) +
+                                           (rDestPos.getY()*aSurfaceDesc.lPitch) + 
                                            (4*rDestPos.getX()));
 
                         const sal_uInt64 nNumColumns(rSourceRect.getWidth());
@@ -986,7 +986,7 @@ namespace dxcanvas
 
                         // calculate the destination memory address
                         sal_uInt8 *pDst = ((sal_uInt8*)aSurfaceDesc.lpSurface+
-                                           (rDestPos.getY()*aSurfaceDesc.lPitch) +
+                                           (rDestPos.getY()*aSurfaceDesc.lPitch) + 
                                            (4*rDestPos.getX()));
 
                         const sal_uInt64 nNumLines(rSourceRect.getHeight());
@@ -1005,7 +1005,7 @@ namespace dxcanvas
                     break;
 
                     default:
-                        ENSURE_OR_RETURN_FALSE(false,
+                        ENSURE_OR_RETURN_FALSE(false, 
                                           "DXSurface::update(): Unknown/unimplemented buffer format" );
                         break;
                 }
@@ -1019,7 +1019,7 @@ namespace dxcanvas
         //////////////////////////////////////////////////////////////////////////////////
         // DXSurface::getSize
         //////////////////////////////////////////////////////////////////////////////////
-
+        
         ::basegfx::B2IVector DXSurface::getSize()
         {
             return maSize;
@@ -1103,19 +1103,19 @@ namespace dxcanvas
 
             maVertexCache.reserve(1024);
 
-            mpWindow.reset(
+            mpWindow.reset( 
                 new SystemChildWindow(
                 const_cast<Window *>(&rWindow), 0) );
 
             // system child window must not receive mouse events
             mpWindow->SetMouseTransparent( TRUE );
-
+            
             // parent should receive paint messages as well
             // [PARENTCLIPMODE_NOCLIP], the argument is here
             // passed as plain numeric value since the stupid
             // define utilizes a USHORT cast.
             mpWindow->SetParentClipMode(0x0002);
-
+            
             // the system child window must not clear its background
             mpWindow->EnableEraseBackground( FALSE );
 
@@ -1143,7 +1143,7 @@ namespace dxcanvas
 
             MonitorList aMonitorList;
             fillMonitorList( aMonitorList );
-
+            
              mpDirectDraw = COMReference<IDirectDraw2>(
                 createDirectDraw(aMonitorList, maMonitorInfo, mhWnd));
 
@@ -1191,8 +1191,8 @@ namespace dxcanvas
 
             // check for supported primary surface formats...
             unsigned int nDisplayFormat = getDisplayFormat() & 0x00000FFF;
-            if(nDisplayFormat != 0x888 && nDisplayFormat != 0x565)
-            {
+            if(nDisplayFormat != 0x888 && nDisplayFormat != 0x565) 
+            {    
                 // go defunct, and exit
                 VERBOSE_TRACE( "Device::Device(): Unsupported DisplayFormat" );
                 mpDirectDraw.reset();
@@ -1200,7 +1200,7 @@ namespace dxcanvas
             }
 
             // create primary surface reference
-            DDSURFACEDESC       aSurfaceDesc;
+            DDSURFACEDESC 		aSurfaceDesc;
             IDirectDrawSurface* pPrimarySurface;
 
             rtl_fillMemory( &aSurfaceDesc,
@@ -1348,7 +1348,7 @@ namespace dxcanvas
         {
             // create and setup 3D device
             // ==========================
-            LPDIRECT3D2 pDirect3D;
+            LPDIRECT3D2	pDirect3D;
             if( FAILED( mpDirectDraw->QueryInterface( IID_IDirect3D2, (LPVOID*)&pDirect3D ) ) )
             {
                 // go defunct, and exit
@@ -1360,8 +1360,8 @@ namespace dxcanvas
 
             LPDIRECT3DDEVICE2 pDirect3DDevice;
             // try HW-accelerated device first
-            if( FAILED(mpDirect3D->CreateDevice( IID_IDirect3DHALDevice,
-                                                 mpBackBufferSurface.get(),
+            if( FAILED(mpDirect3D->CreateDevice( IID_IDirect3DHALDevice, 
+                                                 mpBackBufferSurface.get(), 
                                                  &pDirect3DDevice )) )
             {
                 // no HW 3D support - go defunct, and exit
@@ -1375,7 +1375,7 @@ namespace dxcanvas
             rtl_fillMemory(&aHELDeviceDesc,sizeof(aHELDeviceDesc),0);
             maDeviceDesc.dwSize = sizeof(maDeviceDesc);
             aHELDeviceDesc.dwSize = sizeof(aHELDeviceDesc);
-            if(FAILED(pDirect3DDevice->GetCaps(&maDeviceDesc,&aHELDeviceDesc)))
+            if(FAILED(pDirect3DDevice->GetCaps(&maDeviceDesc,&aHELDeviceDesc))) 
             {
                 // go defunct, and exit
                 VERBOSE_TRACE( "Device::setup3DDevice(): GetCaps() for Direct3DDevice failed" );
@@ -1403,7 +1403,7 @@ namespace dxcanvas
                 else if(maTextureFormat.dwBBitMask != 0x000000FF)
                     bSupportedFormat = false;
 
-                if(bSupportedFormat)
+                if(bSupportedFormat) 
                 {
                     VERBOSE_TRACE( "Device::setup3DDevice(): chose texture format dwRGBBitCount %d, dwRBitMask %x, "
                                    "dwGBitMask %x, dwBBitMask %x and dwRGBAlphaBitMask %x. The texture uses %s alpha.",
@@ -1413,11 +1413,11 @@ namespace dxcanvas
                                    maTextureFormat.dwBBitMask,
                                    maTextureFormat.dwRGBAlphaBitMask,
                                    maTextureFormat.dwFlags & DDPF_ALPHAPREMULT ? "premultiplied" : "non-premultiplied" );
-
+                    
                     // setup the device (with as much as we can possibly do here)
                     // ==========================================================
 
-                    LPDIRECT3DVIEWPORT2 pViewport;
+                    LPDIRECT3DVIEWPORT2	pViewport;
 
                     if( SUCCEEDED(mpDirect3D->CreateViewport( &pViewport, NULL )) )
                     {
@@ -1499,8 +1499,8 @@ namespace dxcanvas
 
         bool DXRenderModule::queryCaps()
         {
-            DDCAPS  aHWCaps;
-            DDCAPS  aHELCaps;
+            DDCAPS	aHWCaps;
+            DDCAPS	aHELCaps;
 
             rtl_fillMemory( &aHWCaps,
                             sizeof(aHWCaps), 0 );
@@ -1518,12 +1518,12 @@ namespace dxcanvas
             mbHasNoTearingBlt = aHWCaps.dwFXCaps & DDBLTFX_NOTEARING;
 
             VERBOSE_TRACE( "dxcanvas initialization: %d bytes VRAM free for surfaces (%d with AGP mem), "
-                           "%d bytes VRAM free for textures (%d with AGP mem)",
+                           "%d bytes VRAM free for textures (%d with AGP mem)", 
                            getAvailableSurfaceMem( false ),
                            getAvailableSurfaceMem( true ),
                            getAvailableTextureMem( false ),
                            getAvailableTextureMem( true ) );
-
+            
             return true;
         }
 
@@ -1559,7 +1559,7 @@ namespace dxcanvas
         // DXRenderModule::getDisplayFormat
         //////////////////////////////////////////////////////////////////////////////////
 
-        unsigned int DXRenderModule::getDisplayFormat() const
+        unsigned int DXRenderModule::getDisplayFormat() const 
         {
             unsigned int nFormat;
             nFormat  = ::canvas::tools::bitcount32(maSelectedFullscreenMode.selectedDesc.ddpfPixelFormat.dwRGBAlphaBitMask)<<12;
@@ -1581,7 +1581,7 @@ namespace dxcanvas
             std::size_t nRes( 0 );
 
             DDSCAPS aSurfaceCaps;
-            DWORD   nTotal, nFree;
+            DWORD	nTotal, nFree;
 
             // real VRAM (const_cast, since GetAvailableVidMem is non-const)
             aSurfaceCaps.dwCaps = DDSCAPS_OFFSCREENPLAIN | DDSCAPS_VIDEOMEMORY | DDSCAPS_LOCALVIDMEM;
@@ -1596,7 +1596,7 @@ namespace dxcanvas
                 aSurfaceCaps.dwCaps = DDSCAPS_OFFSCREENPLAIN | DDSCAPS_VIDEOMEMORY | DDSCAPS_NONLOCALVIDMEM;
                 if( FAILED(const_cast<IDirectDraw2&>(*mpDirectDraw).GetAvailableVidMem( &aSurfaceCaps, &nTotal, &nFree )) )
                     return 0;
-
+                
                 nRes += nFree;
             }
 
@@ -1615,7 +1615,7 @@ namespace dxcanvas
             std::size_t nRes( 0 );
 
             DDSCAPS aSurfaceCaps;
-            DWORD   nTotal, nFree;
+            DWORD	nTotal, nFree;
 
             // TODO(F1): Check if flags are applicable
 
@@ -1632,7 +1632,7 @@ namespace dxcanvas
                 aSurfaceCaps.dwCaps = DDSCAPS_TEXTURE | DDSCAPS_VIDEOMEMORY | DDSCAPS_NONLOCALVIDMEM;
                 if( FAILED(const_cast<IDirectDraw2&>(*mpDirectDraw).GetAvailableVidMem( &aSurfaceCaps, &nTotal, &nFree )) )
                     return 0;
-
+                
                 nRes += nFree;
             }
 
@@ -1650,13 +1650,13 @@ namespace dxcanvas
         {
             POINT aPoint = { 0, 0 };
             ClientToScreen( mhWnd, &aPoint );
-
+ 
             // i52230 make sure given screen coordinate is relative to
             // this monitor's area (the device rendering is always
             // contained to a single monitor)
             aPoint.x -= maMonitorInfo.rcMonitor.left;
             aPoint.y -= maMonitorInfo.rcMonitor.top;
-
+ 
             io_rDestPos.setX( io_rDestPos.getX() + aPoint.x );
             io_rDestPos.setY( io_rDestPos.getY() + aPoint.y );
 
@@ -1684,7 +1684,7 @@ namespace dxcanvas
 
         COMReference<IDirectDrawSurface> DXRenderModule::createSystemMemorySurface( const ::basegfx::B2IVector& rSize )
         {
-            DDSURFACEDESC       aSurfaceDesc;
+            DDSURFACEDESC 		aSurfaceDesc;
             IDirectDrawSurface* pSurface;
 
             aSurfaceDesc.dwSize = sizeof(DDSURFACEDESC);
@@ -1695,7 +1695,7 @@ namespace dxcanvas
             rtl_copyMemory( &aSurfaceDesc.ddpfPixelFormat, &maTextureFormat, sizeof(DDPIXELFORMAT) );
 
             aSurfaceDesc.ddsCaps.dwCaps = DDSCAPS_OFFSCREENPLAIN | DDSCAPS_SYSTEMMEMORY;
-
+     
             HRESULT nRes = mpDirectDraw->CreateSurface(&aSurfaceDesc, &pSurface, NULL);
             if(FAILED(nRes))
                 return COMReference<IDirectDrawSurface>(NULL);
@@ -1739,7 +1739,7 @@ namespace dxcanvas
                     renderMemAvailable();
 #endif
                     VERBOSE_TRACE( "Device::flip(): Using true page flipping" );
-
+                    
                     // use true page flipping. Hopefully, the 3D hardware
                     // is flushed on this flip call (rumours have it that
                     // way), otherwise, perform the Lock hack as for the
@@ -1774,7 +1774,7 @@ namespace dxcanvas
                     // target (the backbuffer in this case). OTOH, I've
                     // found that this tends to degrade performance
                     // significantly on complying cards...
-
+                    
                     // TODO(P1): Up until rev. 1.3, this method contained
                     // code to make sure the blit will start _immediately_
                     // after the Blt call. If this is not warranted, wait
@@ -1798,14 +1798,14 @@ namespace dxcanvas
                     DDBLTFX* pBltFX = NULL;
                     if( mbHasNoTearingBlt )
                     {
-                        // Blt can internally schedule for no-tearing
-                        // ===========================================
-
+                        // Blt can internally schedule for no-tearing   
+                        // ===========================================  
+                        
                         rtl_fillMemory( &aBltFx,
                                         sizeof(aBltFx), 0 );
                         aBltFx.dwSize = sizeof(aBltFx);
                         aBltFx.dwDDFX = DDBLTFX_NOTEARING;
-
+                        
                         pBltFX = &aBltFx;
                     }
 
@@ -1863,7 +1863,7 @@ namespace dxcanvas
         // DXRenderModule::validateMainSurfaces
         //////////////////////////////////////////////////////////////////////////////////
 
-        bool DXRenderModule::validateMainSurfaces()
+        bool DXRenderModule::validateMainSurfaces() 
         {
             if(mpPrimarySurface.get()) {
                 if(mpPrimarySurface->IsLost() == DDERR_SURFACELOST) {
@@ -1873,20 +1873,20 @@ namespace dxcanvas
             }
 
             if(mpBackBufferSurface.get()) {
-                if(mpBackBufferSurface->IsLost() == DDERR_SURFACELOST)
-                {
+                if(mpBackBufferSurface->IsLost() == DDERR_SURFACELOST) 
+                {	
                     // TODO(F1): simply restoring the backbuffer does not
                     // work as expected, we need to re-create everything
                     // from scratch. find out why...
                     //if(SUCCEEDED(mpBackBufferSurface->Restore()))
-                    //  return setup3DDevice();
+                    //	return setup3DDevice();
 
                     mpBackBufferSurface.reset();
 
                     // get us a backbuffer for simulated flipping
                     IDirectDrawSurface* pSurface;
 
-                    // TODO(P2): Strictly speaking, we don't need a full screen worth of
+                    // TODO(P2): Strictly speaking, we don't need a full screen worth of 
                     // backbuffer here. We could also scale dynamically with the current
                     // window size, but this will make it necessary to temporarily have two
                     // buffers while copying from the old to the new one. YMMV.
@@ -1949,16 +1949,16 @@ namespace dxcanvas
 
             if( mbPageFlipping )
             {
-                // render on top of backbuffer. We have
+                // render on top of backbuffer. We have 
                 // page flipping, anyway, thus this will
                 // cost us nothing.
                 pGraphics = createSurfaceGraphics( mpBackBufferSurface );
             }
             else
             {
-                // render FPS directly to front buffer.
+                // render FPS directly to front buffer. 
                 // That saves us another explicit blit,
-                // and for me, the FPS counter can blink,
+                // and for me, the FPS counter can blink, 
                 // if it likes to...
                 pGraphics = createSurfaceGraphics( mpPrimarySurface );
             }
@@ -1968,16 +1968,16 @@ namespace dxcanvas
                 // clear background. We might be doing optimized redraws,
                 // and the background under the FPS count will then not be
                 // cleared.
-                Gdiplus::SolidBrush aBrush(
+                Gdiplus::SolidBrush aBrush( 
                     Gdiplus::Color( 255, 255, 255 ) );
 
                 pGraphics->FillRectangle( &aBrush,
                                           rPos.X, rPos.Y, 80.0, 20.0 );
             }
 
-            Gdiplus::SolidBrush aBrush(
+            Gdiplus::SolidBrush aBrush( 
                 Gdiplus::Color( 255, 0, 255 ) );
-            Gdiplus::Font aFont( NULL,
+            Gdiplus::Font aFont( NULL, 
                                  16,
                                  Gdiplus::FontStyleRegular,
                                  Gdiplus::UnitWorld,
@@ -1999,7 +1999,7 @@ namespace dxcanvas
                               "DXRenderModule::renderMemAvailable(): within 3D scene" );
 
             const double nSurfaceMem( getAvailableSurfaceMem()/1024 );
-
+                            
             ::rtl::OUString text( ::rtl::math::doubleToUString( nSurfaceMem,
                                                                 rtl_math_StringFormat_F,
                                                                 2,'.',NULL,' ') );
@@ -2028,7 +2028,7 @@ namespace dxcanvas
             renderInfoText( text,
                             Gdiplus::PointF( 0.0, 40) );
 
-            VERBOSE_TRACE( "dxcanvas: %f free surface mem, %f free texture mem",
+            VERBOSE_TRACE( "dxcanvas: %f free surface mem, %f free texture mem", 
                            nSurfaceMem, nTexMem );
         }
 
@@ -2043,7 +2043,7 @@ namespace dxcanvas
 
             const double denominator( maLastUpdate.getElapsedTime() );
             maLastUpdate.reset();
-
+                            
             ::rtl::OUString text( ::rtl::math::doubleToUString( denominator == 0.0 ? 100.0 : 1.0/denominator,
                                                                 rtl_math_StringFormat_F,
                                                                 2,'.',NULL,' ') );
@@ -2055,9 +2055,9 @@ namespace dxcanvas
             text += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM (" fps"));
 
             renderInfoText( text,
-                            Gdiplus::PointF() );
+                            Gdiplus::PointF() ); 
 
-            VERBOSE_TRACE( "dxcanvas: %f FPS",
+            VERBOSE_TRACE( "dxcanvas: %f FPS", 
                            denominator == 0.0 ? 100.0 : 1.0/denominator );
         }
 
@@ -2111,7 +2111,7 @@ namespace dxcanvas
             if(mpTexture.use_count() == 1)
                 return mpTexture;
 
-            return ::canvas::ISurfaceSharedPtr(
+            return ::canvas::ISurfaceSharedPtr( 
                 new DXSurface(*this,
                               aSize) );
         }
@@ -2264,7 +2264,7 @@ namespace dxcanvas
 
             maVertexCache.clear();
 
-            mbError |= FAILED(mpDirect3DDevice->DrawPrimitive(D3DPT_TRIANGLELIST,
+            mbError |= FAILED(mpDirect3DDevice->DrawPrimitive(D3DPT_TRIANGLELIST, 
                                                               D3DVT_TLVERTEX,
                                                               (LPVOID)vertices,
                                                               size,
diff --git a/canvas/source/directx/dx_9rm.cxx b/canvas/source/directx/dx_9rm.cxx
index a0f485befa12..af520e90e537 100755
--- a/canvas/source/directx/dx_9rm.cxx
+++ b/canvas/source/directx/dx_9rm.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
@@ -73,7 +73,7 @@
 #include "dx_impltools.hxx"
 #include <vcl/sysdata.hxx>
 
-#if defined(DX_DEBUG_IMAGES)
+#if defined(DX_DEBUG_IMAGES) 
 # if OSL_DEBUG_LEVEL > 0
 #  include <imdebug.h>
 #  undef min
@@ -171,7 +171,7 @@ namespace dxcanvas
             public:
                 explicit inline ImplRenderModuleGuard( DXRenderModule& rRenderModule );
                 inline ~ImplRenderModuleGuard();
-
+                    
             private:
                 DXRenderModule& mrRenderModule;
             };
@@ -193,7 +193,7 @@ namespace dxcanvas
         public:
             explicit DXRenderModule( const ::Window& rWindow );
             ~DXRenderModule();
-
+                    
             virtual void lock() const { maMutex.acquire(); }
             virtual void unlock() const { maMutex.release(); }
 
@@ -225,7 +225,7 @@ namespace dxcanvas
             bool createDevice();
             bool verifyDevice( const UINT nAdapter );
             UINT getAdapterFromWindow();
-
+            
             /** This object represents the DirectX state machine.  In order
                 to serialize access to DirectX's global state, a global
                 mutex is required.
@@ -259,7 +259,7 @@ namespace dxcanvas
                 float u,v;
             };
 
-            std::size_t                                 maNumVertices;
+            std::size_t									maNumVertices;
             std::size_t                                 maWriteIndex;
             std::size_t                                 maReadIndex;
         };
@@ -270,7 +270,7 @@ namespace dxcanvas
         // DXSurface::ImplRenderModuleGuard
         //////////////////////////////////////////////////////////////////////////////////
 
-        inline DXSurface::ImplRenderModuleGuard::ImplRenderModuleGuard(
+        inline DXSurface::ImplRenderModuleGuard::ImplRenderModuleGuard( 
             DXRenderModule& rRenderModule ) :
             mrRenderModule( rRenderModule )
         {
@@ -311,7 +311,7 @@ namespace dxcanvas
         //////////////////////////////////////////////////////////////////////////////////
 
         DXSurface::DXSurface( DXRenderModule&           rRenderModule,
-                              const ::basegfx::B2ISize& rSize ) :
+                              const ::basegfx::B2ISize& rSize ) : 
             mrRenderModule(rRenderModule),
             mpTexture(NULL),
             maSize()
@@ -331,7 +331,7 @@ namespace dxcanvas
                 return;
 #endif
 
-            ENSURE_ARG_OR_THROW(rSize.getX() > 0 && rSize.getY() > 0,
+            ENSURE_ARG_OR_THROW(rSize.getX() > 0 && rSize.getY() > 0, 
                             "DXSurface::DXSurface(): request for zero-sized surface");
 
             COMReference<IDirect3DDevice9> pDevice(rRenderModule.getDevice());
@@ -418,7 +418,7 @@ namespace dxcanvas
             rect.bottom = std::min(maSize.getY(),
                                    rect.top + sal_Int32(rSourceRect.getHeight()+1));
             const bool bClearRightColumn( rect.right < maSize.getX() );
-            const bool bClearBottomRow( rect.bottom < maSize.getY() );
+            const bool bClearBottomRow( rect.bottom < maSize.getY() );            
 
             if(SUCCEEDED(mpTexture->LockRect(0,&aLockedRect,&rect,D3DLOCK_NOSYSLOCK)))
             {
@@ -453,9 +453,9 @@ namespace dxcanvas
                                     // manager allocates one pixel gap
                                     // between them. Clear that to
                                     // transparent.
-                                    pDst[nNumBytesToCopy] =
-                                        pDst[nNumBytesToCopy+1] =
-                                        pDst[nNumBytesToCopy+2] =
+                                    pDst[nNumBytesToCopy] = 
+                                        pDst[nNumBytesToCopy+1] = 
+                                        pDst[nNumBytesToCopy+2] = 
                                         pDst[nNumBytesToCopy+3] = 0x00;
                                 }
                                 pDst += aLockedRect.Pitch;
@@ -541,7 +541,7 @@ namespace dxcanvas
                         break;
 
                         default:
-                            ENSURE_OR_RETURN_FALSE(false,
+                            ENSURE_OR_RETURN_FALSE(false, 
                                             "DXSurface::update(): Unknown/unimplemented buffer format" );
                             break;
                     }
@@ -558,7 +558,7 @@ namespace dxcanvas
         //////////////////////////////////////////////////////////////////////////////////
         // DXSurface::getSize
         //////////////////////////////////////////////////////////////////////////////////
-
+        
         ::basegfx::B2IVector DXSurface::getSize()
         {
             return maSize;
@@ -625,7 +625,7 @@ namespace dxcanvas
                 }
             }
             maPageSize=aPageSize;
-
+            
             IDirect3DVertexBuffer9 *pVB(NULL);
             DWORD aFVF(D3DFVF_XYZRHW|D3DFVF_DIFFUSE|D3DFVF_TEX1);
             if( FAILED(mpDevice->CreateVertexBuffer(sizeof(dxvertex)*maNumVertices,
@@ -682,19 +682,19 @@ namespace dxcanvas
 
             maVertexCache.reserve(1024);
 
-            mpWindow.reset(
+            mpWindow.reset( 
                 new SystemChildWindow(
                 const_cast<Window *>(&rWindow), 0) );
 
             // system child window must not receive mouse events
             mpWindow->SetMouseTransparent( TRUE );
-
+            
             // parent should receive paint messages as well
             // [PARENTCLIPMODE_NOCLIP], the argument is here
             // passed as plain numeric value since the stupid
             // define utilizes a USHORT cast.
             mpWindow->SetParentClipMode(0x0002);
-
+            
             // the system child window must not clear its background
             mpWindow->EnableEraseBackground( FALSE );
 
@@ -763,7 +763,7 @@ namespace dxcanvas
             D3DADAPTER_IDENTIFIER9 aIdent;
             if(FAILED(mpDirect3D9->GetAdapterIdentifier(nAdapter,0,&aIdent)))
                 return false;
-
+            
             DXCanvasItem aConfigItem;
             DXCanvasItem::DeviceInfo aInfo;
             aInfo.nVendorId = aIdent.VendorId;
@@ -940,13 +940,13 @@ namespace dxcanvas
 
             flushVertexCache();
 
-            // TODO(P2): Might be faster to actually pass update area here
-            RECT aRect =
+            // TODO(P2): Might be faster to actually pass update area here 
+            RECT aRect = 
                 {
                     rUpdateArea.getMinX(),
                     rUpdateArea.getMinY(),
                     rUpdateArea.getMaxX(),
-                    rUpdateArea.getMaxY()
+                    rUpdateArea.getMaxY() 
                 };
             HRESULT hr(mpSwapChain->Present(&aRect,&aRect,NULL,NULL,0));
             if(FAILED(hr))
@@ -1182,7 +1182,7 @@ namespace dxcanvas
                 }
 
                 default:
-                    OSL_ENSURE(false,
+                    OSL_ENSURE(false, 
                                "DXRenderModule::pushVertex(): unexpected primitive type");
                     break;
             }
@@ -1217,7 +1217,7 @@ namespace dxcanvas
         //////////////////////////////////////////////////////////////////////////////////
         // DXRenderModule::commitVertexCache
         //////////////////////////////////////////////////////////////////////////////////
-
+        
         void DXRenderModule::commitVertexCache()
         {
             if(maReadIndex != maWriteIndex)
diff --git a/canvas/source/directx/dx_bitmap.cxx b/canvas/source/directx/dx_bitmap.cxx
index d1468105a22b..f3fd7e3038aa 100755
--- a/canvas/source/directx/dx_bitmap.cxx
+++ b/canvas/source/directx/dx_bitmap.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
@@ -38,7 +38,7 @@
 #include <basegfx/matrix/b2dhommatrix.hxx>
 #include <basegfx/range/b2irange.hxx>
 
-#if defined(DX_DEBUG_IMAGES)
+#if defined(DX_DEBUG_IMAGES) 
 # if OSL_DEBUG_LEVEL > 0
 #  include <imdebug.h>
 #  undef min
@@ -55,7 +55,7 @@ namespace dxcanvas
     //////////////////////////////////////////////////////////////////////////////////
 
     DXBitmap::DXBitmap( const BitmapSharedPtr& rBitmap,
-                        bool                   bWithAlpha ) :
+                        bool				   bWithAlpha ) : 
         mpGdiPlusUser( GDIPlusUser::createInstance() ),
         maSize(rBitmap->GetWidth(),rBitmap->GetHeight()),
         mpBitmap(rBitmap),
@@ -65,7 +65,7 @@ namespace dxcanvas
     }
 
     DXBitmap::DXBitmap( const ::basegfx::B2IVector& rSize,
-                        bool                        bWithAlpha ) :
+                        bool						bWithAlpha ) : 
         mpGdiPlusUser( GDIPlusUser::createInstance() ),
         maSize(rSize),
         mpBitmap(),
@@ -75,16 +75,16 @@ namespace dxcanvas
         // create container for pixel data
         if(mbAlpha)
         {
-            mpBitmap.reset(
-                new Gdiplus::Bitmap(
+            mpBitmap.reset( 
+                new Gdiplus::Bitmap( 
                     maSize.getX(),
                     maSize.getY(),
                     PixelFormat32bppARGB));
         }
         else
         {
-            mpBitmap.reset(
-                new Gdiplus::Bitmap(
+            mpBitmap.reset( 
+                new Gdiplus::Bitmap( 
                     maSize.getX(),
                     maSize.getY(),
                     PixelFormat24bppRGB));
@@ -113,7 +113,7 @@ namespace dxcanvas
         return mbAlpha;
     }
 
-    uno::Sequence< sal_Int8 > DXBitmap::getData( rendering::IntegerBitmapLayout&     /*bitmapLayout*/,
+    uno::Sequence< sal_Int8 > DXBitmap::getData( rendering::IntegerBitmapLayout&     /*bitmapLayout*/, 
                                                  const geometry::IntegerRectangle2D& rect )
     {
         uno::Sequence< sal_Int8 > aRes( (rect.X2-rect.X1)*(rect.Y2-rect.Y1)*4 ); // TODO(F1): Be format-agnostic here
@@ -121,11 +121,11 @@ namespace dxcanvas
         const Gdiplus::Rect aRect( tools::gdiPlusRectFromIntegerRectangle2D( rect ) );
 
         Gdiplus::BitmapData aBmpData;
-        aBmpData.Width       = rect.X2-rect.X1;
-        aBmpData.Height      = rect.Y2-rect.Y1;
-        aBmpData.Stride      = 4*aBmpData.Width;
+        aBmpData.Width		 = rect.X2-rect.X1;
+        aBmpData.Height		 = rect.Y2-rect.Y1;
+        aBmpData.Stride 	 = 4*aBmpData.Width;
         aBmpData.PixelFormat = PixelFormat32bppARGB;
-        aBmpData.Scan0       = aRes.getArray();
+        aBmpData.Scan0		 = aRes.getArray(); 
 
         // TODO(F1): Support more pixel formats natively
 
@@ -147,18 +147,18 @@ namespace dxcanvas
         return aRes;
     }
 
-    void DXBitmap::setData( const uno::Sequence< sal_Int8 >&        data,
-                            const rendering::IntegerBitmapLayout&   /*bitmapLayout*/,
-                            const geometry::IntegerRectangle2D&     rect )
+    void DXBitmap::setData( const uno::Sequence< sal_Int8 >& 		data, 
+                            const rendering::IntegerBitmapLayout&   /*bitmapLayout*/, 
+                            const geometry::IntegerRectangle2D& 	rect )
     {
         const Gdiplus::Rect aRect( tools::gdiPlusRectFromIntegerRectangle2D( rect ) );
 
         Gdiplus::BitmapData aBmpData;
-        aBmpData.Width       = rect.X2-rect.X1;
-        aBmpData.Height      = rect.Y2-rect.Y1;
-        aBmpData.Stride      = 4*aBmpData.Width;
+        aBmpData.Width		 = rect.X2-rect.X1;
+        aBmpData.Height		 = rect.Y2-rect.Y1;
+        aBmpData.Stride 	 = 4*aBmpData.Width;
         aBmpData.PixelFormat = PixelFormat32bppARGB;
-        aBmpData.Scan0       = (void*)data.getConstArray();
+        aBmpData.Scan0		 = (void*)data.getConstArray(); 
 
         // TODO(F1): Support more pixel formats natively
 
@@ -178,40 +178,40 @@ namespace dxcanvas
     }
 
     void DXBitmap::setPixel( const uno::Sequence< sal_Int8 >&       color,
-                             const rendering::IntegerBitmapLayout&  /*bitmapLayout*/,
+                             const rendering::IntegerBitmapLayout&  /*bitmapLayout*/, 
                              const geometry::IntegerPoint2D&        pos )
     {
         const geometry::IntegerSize2D aSize( maSize.getX(),maSize.getY() );
 
-        ENSURE_ARG_OR_THROW( pos.X >= 0 && pos.X < aSize.Width,
+        ENSURE_ARG_OR_THROW( pos.X >= 0 && pos.X < aSize.Width, 
                              "CanvasHelper::setPixel: X coordinate out of bounds" );
-        ENSURE_ARG_OR_THROW( pos.Y >= 0 && pos.Y < aSize.Height,
+        ENSURE_ARG_OR_THROW( pos.Y >= 0 && pos.Y < aSize.Height, 
                              "CanvasHelper::setPixel: Y coordinate out of bounds" );
-        ENSURE_ARG_OR_THROW( color.getLength() > 3,
+        ENSURE_ARG_OR_THROW( color.getLength() > 3, 
                              "CanvasHelper::setPixel: not enough color components" );
 
-        if( Gdiplus::Ok != mpBitmap->SetPixel( pos.X, pos.Y,
+        if( Gdiplus::Ok != mpBitmap->SetPixel( pos.X, pos.Y, 
                                                       Gdiplus::Color( tools::sequenceToArgb( color ))))
         {
             throw uno::RuntimeException();
         }
     }
 
-    uno::Sequence< sal_Int8 > DXBitmap::getPixel( rendering::IntegerBitmapLayout&   /*bitmapLayout*/,
+    uno::Sequence< sal_Int8 > DXBitmap::getPixel( rendering::IntegerBitmapLayout&   /*bitmapLayout*/, 
                                                   const geometry::IntegerPoint2D&   pos )
     {
         const geometry::IntegerSize2D aSize( maSize.getX(),maSize.getY() );
 
-        ENSURE_ARG_OR_THROW( pos.X >= 0 && pos.X < aSize.Width,
+        ENSURE_ARG_OR_THROW( pos.X >= 0 && pos.X < aSize.Width, 
                              "CanvasHelper::getPixel: X coordinate out of bounds" );
-        ENSURE_ARG_OR_THROW( pos.Y >= 0 && pos.Y < aSize.Height,
+        ENSURE_ARG_OR_THROW( pos.Y >= 0 && pos.Y < aSize.Height, 
                              "CanvasHelper::getPixel: Y coordinate out of bounds" );
 
         Gdiplus::Color aColor;
 
         if( Gdiplus::Ok != mpBitmap->GetPixel( pos.X, pos.Y, &aColor ) )
             return uno::Sequence< sal_Int8 >();
-
+            
         return tools::argbToIntSequence(aColor.GetValue());
     }
 
diff --git a/canvas/source/directx/dx_bitmap.hxx b/canvas/source/directx/dx_bitmap.hxx
index 5e767994e16c..63feb769783b 100755
--- a/canvas/source/directx/dx_bitmap.hxx
+++ b/canvas/source/directx/dx_bitmap.hxx
@@ -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
@@ -45,9 +45,9 @@ namespace dxcanvas
     {
     public:
         DXBitmap( const BitmapSharedPtr& rBitmap,
-                  bool                   bWithAlpha );
+                  bool					 bWithAlpha );
         DXBitmap( const ::basegfx::B2IVector& rSize,
-                  bool                        bWithAlpha );
+                  bool						  bWithAlpha );
 
         virtual GraphicsSharedPtr         getGraphics();
 
@@ -56,22 +56,22 @@ namespace dxcanvas
         virtual bool                      hasAlpha() const;
 
         ::com::sun::star::uno::Sequence< sal_Int8 > getData(
-            ::com::sun::star::rendering::IntegerBitmapLayout&       bitmapLayout,
-            const ::com::sun::star::geometry::IntegerRectangle2D&   rect );
+            ::com::sun::star::rendering::IntegerBitmapLayout&		bitmapLayout,
+            const ::com::sun::star::geometry::IntegerRectangle2D&	rect );
 
         void setData(
-            const ::com::sun::star::uno::Sequence< sal_Int8 >&      data,
+            const ::com::sun::star::uno::Sequence< sal_Int8 >&		data,
             const ::com::sun::star::rendering::IntegerBitmapLayout& bitmapLayout,
-            const ::com::sun::star::geometry::IntegerRectangle2D&   rect );
+            const ::com::sun::star::geometry::IntegerRectangle2D&	rect );
 
         void setPixel(
-            const ::com::sun::star::uno::Sequence< sal_Int8 >&      color,
+            const ::com::sun::star::uno::Sequence< sal_Int8 >&		color,
             const ::com::sun::star::rendering::IntegerBitmapLayout& bitmapLayout,
-            const ::com::sun::star::geometry::IntegerPoint2D&       pos );
+            const ::com::sun::star::geometry::IntegerPoint2D&		pos );
 
         ::com::sun::star::uno::Sequence< sal_Int8 > getPixel(
-            ::com::sun::star::rendering::IntegerBitmapLayout&       bitmapLayout,
-            const ::com::sun::star::geometry::IntegerPoint2D&       pos );
+            ::com::sun::star::rendering::IntegerBitmapLayout&		bitmapLayout,
+            const ::com::sun::star::geometry::IntegerPoint2D&		pos );
 
     private:
         // Refcounted global GDI+ state container
diff --git a/canvas/source/directx/dx_bitmapcanvashelper.cxx b/canvas/source/directx/dx_bitmapcanvashelper.cxx
index 860b56401873..def7f222eddd 100755
--- a/canvas/source/directx/dx_bitmapcanvashelper.cxx
+++ b/canvas/source/directx/dx_bitmapcanvashelper.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
@@ -99,11 +99,11 @@ namespace dxcanvas
         {
             GraphicsSharedPtr pGraphics( mpTarget->getGraphics() );
 
-            Gdiplus::Color aClearColor = hasAlpha() ?
+            Gdiplus::Color aClearColor = hasAlpha() ? 
                 Gdiplus::Color( 0,255,255,255 ) : Gdiplus::Color((Gdiplus::ARGB)Gdiplus::Color::White);
 
             ENSURE_OR_THROW(
-                Gdiplus::Ok == pGraphics->SetCompositingMode(
+                Gdiplus::Ok == pGraphics->SetCompositingMode( 
                     Gdiplus::CompositingModeSourceCopy ), // force set, don't blend
                 "BitmapCanvasHelper::clear(): GDI+ SetCompositingMode call failed" );
             ENSURE_OR_THROW(
@@ -112,26 +112,26 @@ namespace dxcanvas
         }
     }
 
-    uno::Reference< rendering::XCachedPrimitive > BitmapCanvasHelper::drawTextLayout( const rendering::XCanvas*                       /*pCanvas*/,
-                                                                                      const uno::Reference< rendering::XTextLayout >& xLayoutetText,
-                                                                                      const rendering::ViewState&                     viewState,
-                                                                                      const rendering::RenderState&                   renderState )
+    uno::Reference< rendering::XCachedPrimitive > BitmapCanvasHelper::drawTextLayout( const rendering::XCanvas* 					  /*pCanvas*/, 
+                                                                                      const uno::Reference< rendering::XTextLayout >& xLayoutetText, 
+                                                                                      const rendering::ViewState& 					  viewState, 
+                                                                                      const rendering::RenderState& 				  renderState )
     {
-        ENSURE_OR_THROW( xLayoutetText.is(),
+        ENSURE_OR_THROW( xLayoutetText.is(), 
                           "BitmapCanvasHelper::drawTextLayout: layout is NULL");
 
         if( needOutput() )
         {
-            TextLayout* pTextLayout =
+            TextLayout* pTextLayout = 
                 dynamic_cast< TextLayout* >( xLayoutetText.get() );
 
             ENSURE_OR_THROW( pTextLayout,
                                 "BitmapCanvasHelper::drawTextLayout(): TextLayout not compatible with this canvas" );
 
             pTextLayout->draw( mpTarget->getGraphics(),
-                               viewState,
-                               renderState,
-                               maOutputOffset,
+                               viewState, 
+                               renderState, 
+                               maOutputOffset, 
                                mpDevice,
                                mpTarget->hasAlpha() );
         }
@@ -139,14 +139,14 @@ namespace dxcanvas
         return uno::Reference< rendering::XCachedPrimitive >(NULL);
     }
 
-    void BitmapCanvasHelper::copyRect( const rendering::XCanvas*                            /*pCanvas*/,
-                                       const uno::Reference< rendering::XBitmapCanvas >&    /*sourceCanvas*/,
-                                       const geometry::RealRectangle2D&                     /*sourceRect*/,
-                                       const rendering::ViewState&                          /*sourceViewState*/,
-                                       const rendering::RenderState&                        /*sourceRenderState*/,
-                                       const geometry::RealRectangle2D&                     /*destRect*/,
-                                       const rendering::ViewState&                          /*destViewState*/,
-                                       const rendering::RenderState&                        /*destRenderState*/ )
+    void BitmapCanvasHelper::copyRect( const rendering::XCanvas* 							/*pCanvas*/, 
+                                       const uno::Reference< rendering::XBitmapCanvas >&	/*sourceCanvas*/, 
+                                       const geometry::RealRectangle2D& 					/*sourceRect*/, 
+                                       const rendering::ViewState& 							/*sourceViewState*/, 
+                                       const rendering::RenderState& 						/*sourceRenderState*/, 
+                                       const geometry::RealRectangle2D& 					/*destRect*/, 
+                                       const rendering::ViewState& 							/*destViewState*/, 
+                                       const rendering::RenderState& 						/*destRenderState*/ )
     {
         // TODO(F2): copyRect NYI
     }
@@ -159,14 +159,14 @@ namespace dxcanvas
         return basegfx::unotools::integerSize2DFromB2ISize(mpTarget->getSize());
     }
 
-    uno::Reference< rendering::XBitmap > BitmapCanvasHelper::getScaledBitmap( const geometry::RealSize2D& /*newSize*/,
-                                                                              sal_Bool                    /*beFast*/ )
+    uno::Reference< rendering::XBitmap > BitmapCanvasHelper::getScaledBitmap( const geometry::RealSize2D& /*newSize*/, 
+                                                                              sal_Bool 					  /*beFast*/ )
     {
         // TODO(F1):
         return uno::Reference< rendering::XBitmap >();
     }
 
-    uno::Sequence< sal_Int8 > BitmapCanvasHelper::getData( rendering::IntegerBitmapLayout&     bitmapLayout,
+    uno::Sequence< sal_Int8 > BitmapCanvasHelper::getData( rendering::IntegerBitmapLayout&     bitmapLayout, 
                                                            const geometry::IntegerRectangle2D& rect )
     {
         RTL_LOGFILE_CONTEXT( aLog, "::dxcanvas::BitmapCanvasHelper::getData()" );
@@ -176,14 +176,14 @@ namespace dxcanvas
 
         if( !mpTarget )
             return uno::Sequence< sal_Int8 >();
-
+    
         bitmapLayout = getMemoryLayout();
         return mpTarget->getData(bitmapLayout,rect);
     }
 
-    void BitmapCanvasHelper::setData( const uno::Sequence< sal_Int8 >&      data,
-                                      const rendering::IntegerBitmapLayout& bitmapLayout,
-                                      const geometry::IntegerRectangle2D&   rect )
+    void BitmapCanvasHelper::setData( const uno::Sequence< sal_Int8 >& 		data, 
+                                      const rendering::IntegerBitmapLayout& bitmapLayout, 
+                                      const geometry::IntegerRectangle2D& 	rect )
     {
         RTL_LOGFILE_CONTEXT( aLog, "::dxcanvas::BitmapCanvasHelper::setData()" );
 
@@ -196,8 +196,8 @@ namespace dxcanvas
         mpTarget->setData(data,bitmapLayout,rect);
     }
 
-    void BitmapCanvasHelper::setPixel( const uno::Sequence< sal_Int8 >&       color,
-                                       const rendering::IntegerBitmapLayout&  bitmapLayout,
+    void BitmapCanvasHelper::setPixel( const uno::Sequence< sal_Int8 >&       color, 
+                                       const rendering::IntegerBitmapLayout&  bitmapLayout, 
                                        const geometry::IntegerPoint2D&        pos )
     {
         RTL_LOGFILE_CONTEXT( aLog, "::dxcanvas::BitmapCanvasHelper::setPixel()" );
@@ -211,7 +211,7 @@ namespace dxcanvas
         mpTarget->setPixel(color,bitmapLayout,pos);
     }
 
-    uno::Sequence< sal_Int8 > BitmapCanvasHelper::getPixel( rendering::IntegerBitmapLayout&   bitmapLayout,
+    uno::Sequence< sal_Int8 > BitmapCanvasHelper::getPixel( rendering::IntegerBitmapLayout&   bitmapLayout, 
                                                             const geometry::IntegerPoint2D&   pos )
     {
         RTL_LOGFILE_CONTEXT( aLog, "::dxcanvas::BitmapCanvasHelper::getPixel()" );
diff --git a/canvas/source/directx/dx_bitmapcanvashelper.hxx b/canvas/source/directx/dx_bitmapcanvashelper.hxx
index 411d8764dfc7..37dd0ebf2850 100755
--- a/canvas/source/directx/dx_bitmapcanvashelper.hxx
+++ b/canvas/source/directx/dx_bitmapcanvashelper.hxx
@@ -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
@@ -80,33 +80,33 @@ namespace dxcanvas
         void clear();
 
         ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XCachedPrimitive >
-            drawTextLayout( const ::com::sun::star::rendering::XCanvas*     pCanvas,
+            drawTextLayout( const ::com::sun::star::rendering::XCanvas* 	pCanvas,
                             const ::com::sun::star::uno::Reference<
                                 ::com::sun::star::rendering::XTextLayout >& layoutetText,
-                            const ::com::sun::star::rendering::ViewState&   viewState,
+                            const ::com::sun::star::rendering::ViewState& 	viewState,
                             const ::com::sun::star::rendering::RenderState& renderState );
 
         // BitmapCanvasHelper functionality
         // ================================
 
-        void copyRect( const ::com::sun::star::rendering::XCanvas*          pCanvas,
+        void copyRect( const ::com::sun::star::rendering::XCanvas* 			pCanvas,
                        const ::com::sun::star::uno::Reference<
-                               ::com::sun::star::rendering::XBitmapCanvas >&    sourceCanvas,
-                       const ::com::sun::star::geometry::RealRectangle2D&   sourceRect,
-                       const ::com::sun::star::rendering::ViewState&        sourceViewState,
-                       const ::com::sun::star::rendering::RenderState&      sourceRenderState,
-                       const ::com::sun::star::geometry::RealRectangle2D&   destRect,
-                       const ::com::sun::star::rendering::ViewState&        destViewState,
-                       const ::com::sun::star::rendering::RenderState&      destRenderState );
+                               ::com::sun::star::rendering::XBitmapCanvas >& 	sourceCanvas,
+                       const ::com::sun::star::geometry::RealRectangle2D& 	sourceRect,
+                       const ::com::sun::star::rendering::ViewState& 		sourceViewState,
+                       const ::com::sun::star::rendering::RenderState& 		sourceRenderState,
+                       const ::com::sun::star::geometry::RealRectangle2D& 	destRect,
+                       const ::com::sun::star::rendering::ViewState& 		destViewState,
+                       const ::com::sun::star::rendering::RenderState& 		destRenderState );
 
         ::com::sun::star::geometry::IntegerSize2D getSize();
 
         ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XBitmap >
-            getScaledBitmap( const ::com::sun::star::geometry::RealSize2D&  newSize,
-                             sal_Bool                                       beFast );
+            getScaledBitmap( const ::com::sun::star::geometry::RealSize2D& 	newSize,
+                             sal_Bool 										beFast );
 
         ::com::sun::star::uno::Sequence< sal_Int8 >
-            getData( ::com::sun::star::rendering::IntegerBitmapLayout&      bitmapLayout,
+            getData( ::com::sun::star::rendering::IntegerBitmapLayout& 		bitmapLayout,
                      const ::com::sun::star::geometry::IntegerRectangle2D&  rect );
 
         void setData( const ::com::sun::star::uno::Sequence< sal_Int8 >&         data,
diff --git a/canvas/source/directx/dx_bitmapprovider.hxx b/canvas/source/directx/dx_bitmapprovider.hxx
index 3eccf3c4939e..4e462218938f 100644
--- a/canvas/source/directx/dx_bitmapprovider.hxx
+++ b/canvas/source/directx/dx_bitmapprovider.hxx
@@ -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
diff --git a/canvas/source/directx/dx_canvas.cxx b/canvas/source/directx/dx_canvas.cxx
index f55467c1af50..d54e2141e026 100644
--- a/canvas/source/directx/dx_canvas.cxx
+++ b/canvas/source/directx/dx_canvas.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
@@ -60,8 +60,8 @@
 #include <vcl/sysdata.hxx>
 
 #define CANVAS_TECH "GDI+"
-#define CANVAS_SERVICE_NAME              "com.sun.star.rendering.Canvas."            CANVAS_TECH
-#define CANVAS_IMPLEMENTATION_NAME       "com.sun.star.comp.rendering.Canvas."       CANVAS_TECH
+#define CANVAS_SERVICE_NAME        		 "com.sun.star.rendering.Canvas."      		 CANVAS_TECH
+#define CANVAS_IMPLEMENTATION_NAME 		 "com.sun.star.comp.rendering.Canvas." 		 CANVAS_TECH
 #define BITMAPCANVAS_SERVICE_NAME        "com.sun.star.rendering.BitmapCanvas."      CANVAS_TECH
 #define BITMAPCANVAS_IMPLEMENTATION_NAME "com.sun.star.comp.rendering.BitmapCanvas." CANVAS_TECH
 
@@ -98,7 +98,7 @@ namespace dxcanvas
         // pointer to a valid window, on which to output
         // At index 2, we expect the current window bound rect
         ENSURE_ARG_OR_THROW( maArguments.getLength() >= 6 &&
-                             maArguments[5].getValueTypeClass() == uno::TypeClass_SEQUENCE,
+                             maArguments[5].getValueTypeClass() == uno::TypeClass_SEQUENCE, 
                              "SpriteCanvas::initialize: wrong number of arguments, or wrong types" );
 
         uno::Sequence<sal_Int8> aSeq;
@@ -109,15 +109,15 @@ namespace dxcanvas
             throw lang::NoSupportException(
                 ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(
                                      "Passed SystemGraphicsData or HDC invalid!")),
-                NULL);
-
+                NULL);            
+        
         // setup helper
         maDeviceHelper.init( pSysData->hDC,
                              *this );
         maCanvasHelper.setDevice( *this );
-        maCanvasHelper.setTarget(
+        maCanvasHelper.setTarget( 
             GraphicsProviderSharedPtr(
-                new GraphicsProviderImpl(
+                new GraphicsProviderImpl( 
                     Gdiplus::Graphics::FromHDC(pSysData->hDC))));
 
         maArguments.realloc(0);
@@ -158,7 +158,7 @@ namespace dxcanvas
         // pointer to a valid window, on which to output
         // At index 2, we expect the current window bound rect
         ENSURE_ARG_OR_THROW( maArguments.getLength() >= 6 &&
-                             maArguments[5].getValueTypeClass() == uno::TypeClass_SEQUENCE,
+                             maArguments[5].getValueTypeClass() == uno::TypeClass_SEQUENCE, 
                              "SpriteCanvas::initialize: wrong number of arguments, or wrong types" );
 
         uno::Sequence<sal_Int8> aSeq;
@@ -169,8 +169,8 @@ namespace dxcanvas
             throw lang::NoSupportException(
                 ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(
                                      "Passed SystemGraphicsData or HDC invalid!")),
-                NULL);
-
+                NULL);            
+        
         // setup helper
         maDeviceHelper.init( pSysData->hDC,
                              *this );
diff --git a/canvas/source/directx/dx_canvas.hxx b/canvas/source/directx/dx_canvas.hxx
index be15b875c4b6..64d9a1f42b17 100644
--- a/canvas/source/directx/dx_canvas.hxx
+++ b/canvas/source/directx/dx_canvas.hxx
@@ -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
@@ -61,15 +61,15 @@ namespace dxcanvas
                                               ::com::sun::star::lang::XMultiServiceFactory,
                                               ::com::sun::star::util::XUpdatable,
                                               ::com::sun::star::beans::XPropertySet,
-                                              ::com::sun::star::lang::XServiceName >    GraphicDeviceBase1_Base;
+                                              ::com::sun::star::lang::XServiceName >	GraphicDeviceBase1_Base;
     typedef ::canvas::GraphicDeviceBase< ::canvas::BaseMutexHelper< GraphicDeviceBase1_Base >,
                                            DeviceHelper,
                                            ::osl::MutexGuard,
-                                           ::cppu::OWeakObject >    CanvasBase1_Base;
+                                           ::cppu::OWeakObject > 	CanvasBase1_Base;
     typedef ::canvas::CanvasBase< CanvasBase1_Base,
                                   CanvasHelper,
                                   ::osl::MutexGuard,
-                                  ::cppu::OWeakObject >     CanvasBaseT;
+                                  ::cppu::OWeakObject >		CanvasBaseT;
 
     /** Product of this component's factory.
 
@@ -118,15 +118,15 @@ namespace dxcanvas
                                               ::com::sun::star::lang::XMultiServiceFactory,
                                               ::com::sun::star::util::XUpdatable,
                                               ::com::sun::star::beans::XPropertySet,
-                                              ::com::sun::star::lang::XServiceName >    GraphicDeviceBase2_Base;
+                                              ::com::sun::star::lang::XServiceName >	GraphicDeviceBase2_Base;
     typedef ::canvas::GraphicDeviceBase< ::canvas::BaseMutexHelper< GraphicDeviceBase2_Base >,
                                            DeviceHelper,
                                            ::osl::MutexGuard,
-                                           ::cppu::OWeakObject >    CanvasBase2_Base;
+                                           ::cppu::OWeakObject > 	CanvasBase2_Base;
     typedef ::canvas::IntegerBitmapBase< CanvasBase2_Base,
                                          BitmapCanvasHelper,
                                          ::osl::MutexGuard,
-                                         ::cppu::OWeakObject >      BitmapCanvasBaseT;
+                                         ::cppu::OWeakObject >		BitmapCanvasBaseT;
 
     /** Product of this component's factory.
 
diff --git a/canvas/source/directx/dx_canvasbitmap.cxx b/canvas/source/directx/dx_canvasbitmap.cxx
index f15af7745422..db1a5f93747a 100755
--- a/canvas/source/directx/dx_canvasbitmap.cxx
+++ b/canvas/source/directx/dx_canvasbitmap.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
@@ -69,8 +69,8 @@ namespace dxcanvas
     }
 
     struct AlphaDIB
-    {
-        BITMAPINFOHEADER bmiHeader;
+    { 
+        BITMAPINFOHEADER bmiHeader; 
         RGBQUAD          bmiColors[256];
     };
 
@@ -80,15 +80,15 @@ namespace dxcanvas
         // 0 ... get BitmapEx
         // 1 ... get Pixbuf with bitmap RGB content
         // 2 ... get Pixbuf with bitmap alpha mask
-        switch( nHandle )
+        switch( nHandle ) 
         {
             // sorry, no BitmapEx here...
             case 0:
                 aRes = ::com::sun::star::uno::Any( reinterpret_cast<sal_Int64>( (BitmapEx*) NULL ) );
                 break;
 
-            case 1:
-            {
+            case 1: 
+            {     
                 if(!mpBitmap->hasAlpha())
                 {
                     HBITMAP aHBmp;
@@ -96,7 +96,7 @@ namespace dxcanvas
 
                     uno::Sequence< uno::Any > args(1);
                     args[0] = uno::Any( sal_Int64(aHBmp) );
-
+                    
                     aRes <<= args;
                 }
                 else
@@ -105,12 +105,12 @@ namespace dxcanvas
                     // canvas uses inline alpha channel
                     HDC hScreenDC=GetDC(NULL);
                     const basegfx::B2IVector aSize(mpBitmap->getSize());
-                    HBITMAP hBmpBitmap = CreateCompatibleBitmap( hScreenDC,
-                                                                 aSize.getX(),
+                    HBITMAP hBmpBitmap = CreateCompatibleBitmap( hScreenDC, 
+                                                                 aSize.getX(), 
                                                                  aSize.getY() );
                     if( !hBmpBitmap )
                         return aRes;
-
+                    
                     BITMAPINFOHEADER aBIH;
 
                     aBIH.biSize = sizeof( BITMAPINFOHEADER );
@@ -128,11 +128,11 @@ namespace dxcanvas
                     aBIH.biClrImportant = 0;
 
                     Gdiplus::BitmapData aBmpData;
-                    aBmpData.Width       = aSize.getX();
-                    aBmpData.Height      = aSize.getY();
-                    aBmpData.Stride      = 4*aBmpData.Width;
+                    aBmpData.Width		 = aSize.getX();
+                    aBmpData.Height		 = aSize.getY();
+                    aBmpData.Stride 	 = 4*aBmpData.Width;
                     aBmpData.PixelFormat = PixelFormat32bppARGB;
-                    aBmpData.Scan0       = NULL;
+                    aBmpData.Scan0		 = NULL;
                     const Gdiplus::Rect aRect( 0,0,aSize.getX(),aSize.getY() );
                     BitmapSharedPtr pGDIPlusBitmap=mpBitmap->getBitmap();
                     if( Gdiplus::Ok != pGDIPlusBitmap->LockBits( &aRect,
@@ -140,7 +140,7 @@ namespace dxcanvas
                                                                  PixelFormat32bppARGB, // outputs ARGB (big endian)
                                                                  &aBmpData ) )
                     {
-                        // failed to lock, bail out
+                        // failed to lock, bail out 
                         return aRes;
                     }
 
@@ -152,13 +152,13 @@ namespace dxcanvas
 
                     uno::Sequence< uno::Any > args(1);
                     args[0] = uno::Any( sal_Int64(hBmpBitmap) );
-
+                    
                     aRes <<= args;
                 }
             }
             break;
 
-            case 2:
+            case 2: 
             {
                 if(!mpBitmap->hasAlpha())
                 {
@@ -188,7 +188,7 @@ namespace dxcanvas
                     HBITMAP hBmpBitmap = CreateCompatibleBitmap( hScreenDC, aSize.getX(), aSize.getY() );
                     if( !hBmpBitmap )
                         return aRes;
-
+                    
                     aDIB.bmiHeader.biSize = sizeof( BITMAPINFOHEADER );
                     aDIB.bmiHeader.biWidth = aSize.getX();
                     aDIB.bmiHeader.biHeight = -aSize.getY();
@@ -202,11 +202,11 @@ namespace dxcanvas
                     aDIB.bmiHeader.biClrImportant = 0;
 
                     Gdiplus::BitmapData aBmpData;
-                    aBmpData.Width       = aSize.getX();
-                    aBmpData.Height      = aSize.getY();
-                    aBmpData.Stride      = 4*aBmpData.Width;
+                    aBmpData.Width		 = aSize.getX();
+                    aBmpData.Height		 = aSize.getY();
+                    aBmpData.Stride 	 = 4*aBmpData.Width;
                     aBmpData.PixelFormat = PixelFormat32bppARGB;
-                    aBmpData.Scan0       = NULL;
+                    aBmpData.Scan0		 = NULL;
                     const Gdiplus::Rect aRect( 0,0,aSize.getX(),aSize.getY() );
                     BitmapSharedPtr pGDIPlusBitmap=mpBitmap->getBitmap();
                     if( Gdiplus::Ok != pGDIPlusBitmap->LockBits( &aRect,
@@ -214,7 +214,7 @@ namespace dxcanvas
                                                                  PixelFormat32bppARGB, // outputs ARGB (big endian)
                                                                  &aBmpData ) )
                     {
-                        // failed to lock, bail out
+                        // failed to lock, bail out 
                         return aRes;
                     }
 
@@ -237,13 +237,13 @@ namespace dxcanvas
                     pGDIPlusBitmap->UnlockBits( &aBmpData );
 
                     // set bits to newly create HBITMAP
-                    SetDIBits( hScreenDC, hBmpBitmap, 0,
-                               aSize.getY(), pAlphaBits.get(),
+                    SetDIBits( hScreenDC, hBmpBitmap, 0, 
+                               aSize.getY(), pAlphaBits.get(), 
                                (PBITMAPINFO)&aDIB, DIB_RGB_COLORS );
 
                     uno::Sequence< uno::Any > args(1);
                     args[0] = uno::Any( sal_Int64(hBmpBitmap) );
-
+                    
                     aRes <<= args;
                 }
             }
@@ -270,7 +270,7 @@ namespace dxcanvas
     {
         uno::Sequence< ::rtl::OUString > aRet(1);
         aRet[0] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM ( SERVICE_NAME ) );
-
+        
         return aRet;
     }
 
diff --git a/canvas/source/directx/dx_canvasbitmap.hxx b/canvas/source/directx/dx_canvasbitmap.hxx
index 75800f3c8abd..f3327909b817 100755
--- a/canvas/source/directx/dx_canvasbitmap.hxx
+++ b/canvas/source/directx/dx_canvasbitmap.hxx
@@ -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
@@ -58,11 +58,11 @@ namespace dxcanvas
     typedef ::cppu::WeakComponentImplHelper4< ::com::sun::star::rendering::XBitmapCanvas,
                                               ::com::sun::star::rendering::XIntegerBitmap,
                                                ::com::sun::star::lang::XServiceInfo,
-                                               ::com::sun::star::beans::XFastPropertySet >      CanvasBitmapBase_Base;
+                                               ::com::sun::star::beans::XFastPropertySet >  	CanvasBitmapBase_Base;
     typedef ::canvas::IntegerBitmapBase< ::canvas::BaseMutexHelper< CanvasBitmapBase_Base >,
                                          BitmapCanvasHelper,
                                          ::osl::MutexGuard,
-                                         ::cppu::OWeakObject >                          CanvasBitmap_Base;
+                                         ::cppu::OWeakObject >							CanvasBitmap_Base;
 
     class CanvasBitmap : public CanvasBitmap_Base, public BitmapProvider
     {
diff --git a/canvas/source/directx/dx_canvascustomsprite.cxx b/canvas/source/directx/dx_canvascustomsprite.cxx
index 9c8309d5e39f..6a1de9f1aba5 100755
--- a/canvas/source/directx/dx_canvascustomsprite.cxx
+++ b/canvas/source/directx/dx_canvascustomsprite.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
@@ -49,11 +49,11 @@ using namespace ::com::sun::star;
 
 namespace dxcanvas
 {
-    CanvasCustomSprite::CanvasCustomSprite( const ::com::sun::star::geometry::RealSize2D&   rSpriteSize,
+    CanvasCustomSprite::CanvasCustomSprite( const ::com::sun::star::geometry::RealSize2D& 	rSpriteSize,
                                             const SpriteCanvasRef&                          rRefDevice,
-                                            const IDXRenderModuleSharedPtr&                 rRenderModule,
-                                            const ::canvas::ISurfaceProxyManagerSharedPtr&  rSurfaceProxy,
-                                            bool                                            bShowSpriteBounds ) :
+                                            const IDXRenderModuleSharedPtr&					rRenderModule,
+                                            const ::canvas::ISurfaceProxyManagerSharedPtr&	rSurfaceProxy,
+                                            bool											bShowSpriteBounds ) :
         mpSpriteCanvas( rRefDevice ),
         mpSurface()
     {
diff --git a/canvas/source/directx/dx_canvascustomsprite.hxx b/canvas/source/directx/dx_canvascustomsprite.hxx
index be83b26e1b52..30226b043e40 100755
--- a/canvas/source/directx/dx_canvascustomsprite.hxx
+++ b/canvas/source/directx/dx_canvascustomsprite.hxx
@@ -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,7 +56,7 @@ namespace dxcanvas
     typedef ::cppu::WeakComponentImplHelper4< ::com::sun::star::rendering::XCustomSprite,
                                                ::com::sun::star::rendering::XBitmapCanvas,
                                               ::com::sun::star::rendering::XIntegerBitmap,
-                                                ::com::sun::star::lang::XServiceInfo >  CanvasCustomSpriteBase_Base;
+                                                ::com::sun::star::lang::XServiceInfo >	CanvasCustomSpriteBase_Base;
     /** Mixin Sprite
 
         Have to mixin the Sprite interface before deriving from
@@ -83,7 +83,7 @@ namespace dxcanvas
                                               SpriteHelper,
                                               BitmapCanvasHelper,
                                               ::osl::MutexGuard,
-                                              ::cppu::OWeakObject >                     CanvasCustomSpriteBaseT;
+                                              ::cppu::OWeakObject > 					CanvasCustomSpriteBaseT;
 
     /* Definition of CanvasCustomSprite class */
 
@@ -104,11 +104,11 @@ namespace dxcanvas
             @param rDevice
             Target DX device
          */
-        CanvasCustomSprite( const ::com::sun::star::geometry::RealSize2D&   rSpriteSize,
+        CanvasCustomSprite( const ::com::sun::star::geometry::RealSize2D& 	rSpriteSize,
                             const SpriteCanvasRef&                          rRefDevice,
-                            const IDXRenderModuleSharedPtr&                 rRenderModule,
-                            const ::canvas::ISurfaceProxyManagerSharedPtr&  rSurfaceProxy,
-                            bool                                            bShowSpriteBounds );
+                            const IDXRenderModuleSharedPtr&					rRenderModule,
+                            const ::canvas::ISurfaceProxyManagerSharedPtr&	rSurfaceProxy,
+                            bool											bShowSpriteBounds );
 
         virtual void SAL_CALL disposing();
 
diff --git a/canvas/source/directx/dx_canvasfont.cxx b/canvas/source/directx/dx_canvasfont.cxx
index d87079b34c0f..dce38d70e9ff 100755
--- a/canvas/source/directx/dx_canvasfont.cxx
+++ b/canvas/source/directx/dx_canvasfont.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
@@ -54,9 +54,9 @@ namespace dxcanvas
         }
     }
 
-    CanvasFont::CanvasFont( const rendering::FontRequest&                   rFontRequest,
-                            const uno::Sequence< beans::PropertyValue >&    /*extraFontProperties*/,
-                            const geometry::Matrix2D&                       fontMatrix ) :
+    CanvasFont::CanvasFont( const rendering::FontRequest& 					rFontRequest,
+                            const uno::Sequence< beans::PropertyValue >& 	/*extraFontProperties*/,
+                            const geometry::Matrix2D& 						fontMatrix ) :
         CanvasFont_Base( m_aMutex ),
         mpGdiPlusUser( GDIPlusUser::createInstance() ),
         // TODO(F1): extraFontProperties, fontMatrix
@@ -90,8 +90,8 @@ namespace dxcanvas
     }
 
     uno::Reference< rendering::XTextLayout > SAL_CALL CanvasFont::createTextLayout( const rendering::StringContext& aText,
-                                                                                    sal_Int8                        nDirection,
-                                                                                    sal_Int64                       nRandomSeed ) throw (uno::RuntimeException)
+                                                                                    sal_Int8 						nDirection,
+                                                                                    sal_Int64 						nRandomSeed ) throw (uno::RuntimeException)
     {
         ::osl::MutexGuard aGuard( m_aMutex );
 
diff --git a/canvas/source/directx/dx_canvasfont.hxx b/canvas/source/directx/dx_canvasfont.hxx
index 4a6c8b779ad0..8905da728b7a 100755
--- a/canvas/source/directx/dx_canvasfont.hxx
+++ b/canvas/source/directx/dx_canvasfont.hxx
@@ -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
@@ -52,8 +52,8 @@ namespace dxcanvas
 {
     class SpriteCanvas;
 
-    typedef ::boost::shared_ptr< Gdiplus::Font >        FontSharedPtr;
-    typedef ::boost::shared_ptr< Gdiplus::FontFamily >  FontFamilySharedPtr;
+    typedef ::boost::shared_ptr< Gdiplus::Font > 		FontSharedPtr;
+    typedef ::boost::shared_ptr< Gdiplus::FontFamily > 	FontFamilySharedPtr;
 
     typedef ::cppu::WeakComponentImplHelper2< ::com::sun::star::rendering::XCanvasFont,
                                                ::com::sun::star::lang::XServiceInfo > CanvasFont_Base;
@@ -68,7 +68,7 @@ namespace dxcanvas
             ::com::sun::star::rendering::XCanvasFont > ImplRef;
 
         CanvasFont( const ::com::sun::star::rendering::FontRequest&                                     fontRequest,
-                    const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >&    extraFontProperties,
+                    const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& 	extraFontProperties,
                     const ::com::sun::star::geometry::Matrix2D&                                         fontMatrix );
 
         /// Dispose all internal references
@@ -86,17 +86,17 @@ namespace dxcanvas
         virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw( ::com::sun::star::uno::RuntimeException );
         virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames()  throw( ::com::sun::star::uno::RuntimeException );
 
-        double              getCellAscent() const;
-        double              getEmHeight() const;
-        FontSharedPtr       getFont() const;
+        double				getCellAscent() const;
+        double				getEmHeight() const;
+        FontSharedPtr 		getFont() const;
         const ::com::sun::star::geometry::Matrix2D& getFontMatrix() const;
 
     private:
-        GDIPlusUserSharedPtr                        mpGdiPlusUser;
-        FontFamilySharedPtr                         mpFontFamily;
-        FontSharedPtr                               mpFont;
-        ::com::sun::star::rendering::FontRequest    maFontRequest;
-        ::com::sun::star::geometry::Matrix2D        maFontMatrix;
+        GDIPlusUserSharedPtr						mpGdiPlusUser;
+        FontFamilySharedPtr							mpFontFamily;
+        FontSharedPtr								mpFont;
+        ::com::sun::star::rendering::FontRequest	maFontRequest;
+        ::com::sun::star::geometry::Matrix2D		maFontMatrix;
     };
 
 }
diff --git a/canvas/source/directx/dx_canvashelper.cxx b/canvas/source/directx/dx_canvashelper.cxx
index 866cc0f03ec3..16c5efb71f56 100755
--- a/canvas/source/directx/dx_canvashelper.cxx
+++ b/canvas/source/directx/dx_canvashelper.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
@@ -142,7 +142,7 @@ namespace dxcanvas
     }
 
     void CanvasHelper::setTarget( const GraphicsProviderSharedPtr& rTarget,
-                                  const ::basegfx::B2ISize&        rOutputOffset )
+                                  const ::basegfx::B2ISize& 	   rOutputOffset )
     {
         ENSURE_OR_THROW( rTarget,
                          "CanvasHelper::setTarget(): invalid target" );
@@ -161,7 +161,7 @@ namespace dxcanvas
             Gdiplus::Color aClearColor = Gdiplus::Color((Gdiplus::ARGB)Gdiplus::Color::White);
 
             ENSURE_OR_THROW(
-                Gdiplus::Ok == pGraphics->SetCompositingMode(
+                Gdiplus::Ok == pGraphics->SetCompositingMode( 
                     Gdiplus::CompositingModeSourceCopy ), // force set, don't blend
                 "CanvasHelper::clear(): GDI+ SetCompositingMode call failed" );
             ENSURE_OR_THROW(
@@ -170,19 +170,19 @@ namespace dxcanvas
         }
     }
 
-    void CanvasHelper::drawPoint( const rendering::XCanvas*     /*pCanvas*/,
-                                  const geometry::RealPoint2D&  aPoint,
-                                  const rendering::ViewState&   viewState,
-                                  const rendering::RenderState& renderState )
+    void CanvasHelper::drawPoint( const rendering::XCanvas* 	/*pCanvas*/,
+                                  const geometry::RealPoint2D& 	aPoint,
+                                  const rendering::ViewState& 	viewState,
+                                  const rendering::RenderState&	renderState )
     {
         if( needOutput() )
         {
             GraphicsSharedPtr pGraphics( mpGraphicsProvider->getGraphics() );
 
             setupGraphicsState( pGraphics, viewState, renderState );
-
-            Gdiplus::SolidBrush aBrush(
-                Gdiplus::Color(
+        
+            Gdiplus::SolidBrush aBrush( 
+                Gdiplus::Color( 
                     tools::sequenceToArgb(renderState.DeviceColor)) );
 
             // determine size of one-by-one device pixel ellipse
@@ -198,27 +198,27 @@ namespace dxcanvas
                 Gdiplus::Ok == pGraphics->FillEllipse( &aBrush,
                                                        // disambiguate call
                                                        Gdiplus::REAL(aPoint.X),
-                                                       Gdiplus::REAL(aPoint.Y),
-                                                       Gdiplus::REAL(vector.X),
+                                                       Gdiplus::REAL(aPoint.Y), 
+                                                       Gdiplus::REAL(vector.X), 
                                                        Gdiplus::REAL(vector.Y) ),
                 "CanvasHelper::drawPoint(): GDI+ call failed" );
         }
     }
 
-    void CanvasHelper::drawLine( const rendering::XCanvas*      /*pCanvas*/,
-                                 const geometry::RealPoint2D&   aStartPoint,
-                                 const geometry::RealPoint2D&   aEndPoint,
-                                 const rendering::ViewState&    viewState,
-                                 const rendering::RenderState&  renderState )
+    void CanvasHelper::drawLine( const rendering::XCanvas* 		/*pCanvas*/,
+                                 const geometry::RealPoint2D& 	aStartPoint,
+                                 const geometry::RealPoint2D& 	aEndPoint,
+                                 const rendering::ViewState& 	viewState,
+                                 const rendering::RenderState& 	renderState )
     {
         if( needOutput() )
         {
             GraphicsSharedPtr pGraphics( mpGraphicsProvider->getGraphics() );
 
             setupGraphicsState( pGraphics, viewState, renderState );
-
-            Gdiplus::Pen aPen(
-                Gdiplus::Color(
+        
+            Gdiplus::Pen aPen( 
+                Gdiplus::Color( 
                     tools::sequenceToArgb(renderState.DeviceColor)),
                 Gdiplus::REAL(0.0) );
 
@@ -231,10 +231,10 @@ namespace dxcanvas
                 pGraphics->GetPixelOffsetMode() );
             pGraphics->SetPixelOffsetMode( Gdiplus::PixelOffsetModeNone );
 
-            Gdiplus::Status hr = pGraphics->DrawLine( &aPen,
+            Gdiplus::Status hr = pGraphics->DrawLine( &aPen, 
                                                       Gdiplus::REAL(aStartPoint.X), // disambiguate call
-                                                      Gdiplus::REAL(aStartPoint.Y),
-                                                      Gdiplus::REAL(aEndPoint.X),
+                                                      Gdiplus::REAL(aStartPoint.Y), 
+                                                      Gdiplus::REAL(aEndPoint.X), 
                                                       Gdiplus::REAL(aEndPoint.Y) );
             pGraphics->SetPixelOffsetMode( aOldMode );
 
@@ -244,20 +244,20 @@ namespace dxcanvas
         }
     }
 
-    void CanvasHelper::drawBezier( const rendering::XCanvas*            /*pCanvas*/,
-                                   const geometry::RealBezierSegment2D& aBezierSegment,
-                                   const geometry::RealPoint2D&         aEndPoint,
-                                   const rendering::ViewState&          viewState,
-                                   const rendering::RenderState&        renderState )
+    void CanvasHelper::drawBezier( const rendering::XCanvas* 			/*pCanvas*/, 
+                                   const geometry::RealBezierSegment2D&	aBezierSegment, 
+                                   const geometry::RealPoint2D& 		aEndPoint,
+                                   const rendering::ViewState& 			viewState, 
+                                   const rendering::RenderState& 		renderState )
     {
         if( needOutput() )
         {
             GraphicsSharedPtr pGraphics( mpGraphicsProvider->getGraphics() );
 
             setupGraphicsState( pGraphics, viewState, renderState );
-
-            Gdiplus::Pen aPen(
-                Gdiplus::Color(
+        
+            Gdiplus::Pen aPen( 
+                Gdiplus::Color( 
                     tools::sequenceToArgb(renderState.DeviceColor)),
                 Gdiplus::REAL(0.0) );
 
@@ -266,7 +266,7 @@ namespace dxcanvas
             // PixelOffsetModeNone to achieve visually pleasing
             // results, whereas all other operations (e.g. polygon
             // fills, bitmaps) look better with PixelOffsetModeHalf.
-            const Gdiplus::PixelOffsetMode aOldMode(
+            const Gdiplus::PixelOffsetMode aOldMode( 
                 pGraphics->GetPixelOffsetMode() );
             pGraphics->SetPixelOffsetMode( Gdiplus::PixelOffsetModeNone );
 
@@ -288,12 +288,12 @@ namespace dxcanvas
         }
     }
 
-    uno::Reference< rendering::XCachedPrimitive > CanvasHelper::drawPolyPolygon( const rendering::XCanvas*                          /*pCanvas*/,
-                                                                                 const uno::Reference< rendering::XPolyPolygon2D >& xPolyPolygon,
-                                                                                 const rendering::ViewState&                        viewState,
-                                                                                 const rendering::RenderState&                      renderState )
+    uno::Reference< rendering::XCachedPrimitive > CanvasHelper::drawPolyPolygon( const rendering::XCanvas* 							/*pCanvas*/, 
+                                                                                 const uno::Reference< rendering::XPolyPolygon2D >& xPolyPolygon, 
+                                                                                 const rendering::ViewState& 						viewState, 
+                                                                                 const rendering::RenderState& 						renderState )
     {
-        ENSURE_OR_THROW( xPolyPolygon.is(),
+        ENSURE_OR_THROW( xPolyPolygon.is(), 
                           "CanvasHelper::drawPolyPolygon: polygon is NULL");
 
         if( needOutput() )
@@ -301,18 +301,18 @@ namespace dxcanvas
             GraphicsSharedPtr pGraphics( mpGraphicsProvider->getGraphics() );
 
             setupGraphicsState( pGraphics, viewState, renderState );
-
-            Gdiplus::Pen aPen(
-                Gdiplus::Color(
+        
+            Gdiplus::Pen aPen( 
+                Gdiplus::Color( 
                     tools::sequenceToArgb(renderState.DeviceColor)),
                 Gdiplus::REAL(0.0) );
-
+        
             // #122683# Switched precedence of pixel offset
             // mode. Seemingly, polygon stroking needs
             // PixelOffsetModeNone to achieve visually pleasing
             // results, whereas all other operations (e.g. polygon
             // fills, bitmaps) look better with PixelOffsetModeHalf.
-            const Gdiplus::PixelOffsetMode aOldMode(
+            const Gdiplus::PixelOffsetMode aOldMode( 
                 pGraphics->GetPixelOffsetMode() );
             pGraphics->SetPixelOffsetMode( Gdiplus::PixelOffsetModeNone );
 
@@ -332,13 +332,13 @@ namespace dxcanvas
         return uno::Reference< rendering::XCachedPrimitive >(NULL);
     }
 
-    uno::Reference< rendering::XCachedPrimitive > CanvasHelper::strokePolyPolygon( const rendering::XCanvas*                            /*pCanvas*/,
-                                                                                   const uno::Reference< rendering::XPolyPolygon2D >&   xPolyPolygon,
-                                                                                   const rendering::ViewState&                          viewState,
-                                                                                   const rendering::RenderState&                        renderState,
-                                                                                   const rendering::StrokeAttributes&                   strokeAttributes )
+    uno::Reference< rendering::XCachedPrimitive > CanvasHelper::strokePolyPolygon( const rendering::XCanvas* 							/*pCanvas*/, 
+                                                                                   const uno::Reference< rendering::XPolyPolygon2D >& 	xPolyPolygon, 
+                                                                                   const rendering::ViewState& 							viewState, 
+                                                                                   const rendering::RenderState& 						renderState, 
+                                                                                   const rendering::StrokeAttributes& 					strokeAttributes )
     {
-        ENSURE_OR_THROW( xPolyPolygon.is(),
+        ENSURE_OR_THROW( xPolyPolygon.is(), 
                           "CanvasHelper::drawPolyPolygon: polygon is NULL");
 
         if( needOutput() )
@@ -346,13 +346,13 @@ namespace dxcanvas
             GraphicsSharedPtr pGraphics( mpGraphicsProvider->getGraphics() );
 
             setupGraphicsState( pGraphics, viewState, renderState );
-
+        
 
             // Setup stroke pen
             // ----------------
 
-            Gdiplus::Pen aPen(
-                Gdiplus::Color(
+            Gdiplus::Pen aPen( 
+                Gdiplus::Color( 
                     tools::sequenceToArgb(renderState.DeviceColor)),
                 static_cast< Gdiplus::REAL >(strokeAttributes.StrokeWidth) );
 
@@ -361,18 +361,18 @@ namespace dxcanvas
             // PixelOffsetModeNone to achieve visually pleasing
             // results, whereas all other operations (e.g. polygon
             // fills, bitmaps) look better with PixelOffsetModeHalf.
-            const Gdiplus::PixelOffsetMode aOldMode(
+            const Gdiplus::PixelOffsetMode aOldMode( 
                 pGraphics->GetPixelOffsetMode() );
             pGraphics->SetPixelOffsetMode( Gdiplus::PixelOffsetModeNone );
 
             const bool bIsMiter(rendering::PathJoinType::MITER == strokeAttributes.JoinType);
             const bool bIsNone(rendering::PathJoinType::NONE == strokeAttributes.JoinType);
-
+            
             if(bIsMiter)
                 aPen.SetMiterLimit( static_cast< Gdiplus::REAL >(strokeAttributes.MiterLimit) );
 
-            const ::std::vector< Gdiplus::REAL >& rDashArray(
-                ::comphelper::sequenceToContainer< ::std::vector< Gdiplus::REAL > >(
+            const ::std::vector< Gdiplus::REAL >& rDashArray( 
+                ::comphelper::sequenceToContainer< ::std::vector< Gdiplus::REAL > >( 
                     strokeAttributes.DashArray ) );
             if( !rDashArray.empty() )
             {
@@ -401,45 +401,45 @@ namespace dxcanvas
         return uno::Reference< rendering::XCachedPrimitive >(NULL);
     }
 
-    uno::Reference< rendering::XCachedPrimitive > CanvasHelper::strokeTexturedPolyPolygon( const rendering::XCanvas*                            /*pCanvas*/,
-                                                                                           const uno::Reference< rendering::XPolyPolygon2D >&   /*xPolyPolygon*/,
-                                                                                           const rendering::ViewState&                          /*viewState*/,
-                                                                                           const rendering::RenderState&                        /*renderState*/,
-                                                                                           const uno::Sequence< rendering::Texture >&           /*textures*/,
-                                                                                           const rendering::StrokeAttributes&                   /*strokeAttributes*/ )
+    uno::Reference< rendering::XCachedPrimitive > CanvasHelper::strokeTexturedPolyPolygon( const rendering::XCanvas* 							/*pCanvas*/, 
+                                                                                           const uno::Reference< rendering::XPolyPolygon2D >& 	/*xPolyPolygon*/, 
+                                                                                           const rendering::ViewState& 							/*viewState*/, 
+                                                                                           const rendering::RenderState& 						/*renderState*/, 
+                                                                                           const uno::Sequence< rendering::Texture >& 			/*textures*/, 
+                                                                                           const rendering::StrokeAttributes& 					/*strokeAttributes*/ )
     {
         // TODO
         return uno::Reference< rendering::XCachedPrimitive >(NULL);
     }
 
-    uno::Reference< rendering::XCachedPrimitive > CanvasHelper::strokeTextureMappedPolyPolygon( const rendering::XCanvas*                           /*pCanvas*/,
-                                                                                                const uno::Reference< rendering::XPolyPolygon2D >&  /*xPolyPolygon*/,
-                                                                                                const rendering::ViewState&                         /*viewState*/,
-                                                                                                const rendering::RenderState&                       /*renderState*/,
-                                                                                                const uno::Sequence< rendering::Texture >&          /*textures*/,
-                                                                                                const uno::Reference< geometry::XMapping2D >&       /*xMapping*/,
-                                                                                                const rendering::StrokeAttributes&                  /*strokeAttributes*/ )
+    uno::Reference< rendering::XCachedPrimitive > CanvasHelper::strokeTextureMappedPolyPolygon( const rendering::XCanvas* 							/*pCanvas*/, 
+                                                                                                const uno::Reference< rendering::XPolyPolygon2D >&	/*xPolyPolygon*/, 
+                                                                                                const rendering::ViewState& 						/*viewState*/, 
+                                                                                                const rendering::RenderState& 						/*renderState*/, 
+                                                                                                const uno::Sequence< rendering::Texture >& 			/*textures*/, 
+                                                                                                const uno::Reference< geometry::XMapping2D >& 		/*xMapping*/, 
+                                                                                                const rendering::StrokeAttributes& 					/*strokeAttributes*/ )
     {
         // TODO
         return uno::Reference< rendering::XCachedPrimitive >(NULL);
     }
 
-    uno::Reference< rendering::XPolyPolygon2D >   CanvasHelper::queryStrokeShapes( const rendering::XCanvas*                            /*pCanvas*/,
-                                                                                   const uno::Reference< rendering::XPolyPolygon2D >&   /*xPolyPolygon*/,
-                                                                                   const rendering::ViewState&                          /*viewState*/,
-                                                                                   const rendering::RenderState&                        /*renderState*/,
-                                                                                   const rendering::StrokeAttributes&                   /*strokeAttributes*/ )
+    uno::Reference< rendering::XPolyPolygon2D >   CanvasHelper::queryStrokeShapes( const rendering::XCanvas* 							/*pCanvas*/, 
+                                                                                   const uno::Reference< rendering::XPolyPolygon2D >& 	/*xPolyPolygon*/, 
+                                                                                   const rendering::ViewState& 							/*viewState*/, 
+                                                                                   const rendering::RenderState& 						/*renderState*/, 
+                                                                                   const rendering::StrokeAttributes& 					/*strokeAttributes*/ )
     {
         // TODO
         return uno::Reference< rendering::XPolyPolygon2D >(NULL);
     }
 
-    uno::Reference< rendering::XCachedPrimitive > CanvasHelper::fillPolyPolygon( const rendering::XCanvas*                          /*pCanvas*/,
-                                                                                 const uno::Reference< rendering::XPolyPolygon2D >& xPolyPolygon,
-                                                                                 const rendering::ViewState&                        viewState,
-                                                                                 const rendering::RenderState&                      renderState )
+    uno::Reference< rendering::XCachedPrimitive > CanvasHelper::fillPolyPolygon( const rendering::XCanvas* 							/*pCanvas*/, 
+                                                                                 const uno::Reference< rendering::XPolyPolygon2D >& xPolyPolygon, 
+                                                                                 const rendering::ViewState& 						viewState, 
+                                                                                 const rendering::RenderState& 						renderState )
     {
-        ENSURE_OR_THROW( xPolyPolygon.is(),
+        ENSURE_OR_THROW( xPolyPolygon.is(), 
                           "CanvasHelper::fillPolyPolygon: polygon is NULL");
 
         if( needOutput() )
@@ -448,9 +448,9 @@ namespace dxcanvas
 
             setupGraphicsState( pGraphics, viewState, renderState );
 
-            Gdiplus::SolidBrush aBrush(
+            Gdiplus::SolidBrush aBrush( 
                 tools::sequenceToArgb(renderState.DeviceColor));
-
+                
             GraphicsPathSharedPtr pPath( tools::graphicsPathFromXPolyPolygon2D( xPolyPolygon ) );
 
             // TODO(F1): FillRule
@@ -462,47 +462,47 @@ namespace dxcanvas
         return uno::Reference< rendering::XCachedPrimitive >(NULL);
     }
 
-    uno::Reference< rendering::XCachedPrimitive > CanvasHelper::fillTextureMappedPolyPolygon( const rendering::XCanvas*                             /*pCanvas*/,
-                                                                                              const uno::Reference< rendering::XPolyPolygon2D >&    /*xPolyPolygon*/,
-                                                                                              const rendering::ViewState&                           /*viewState*/,
-                                                                                              const rendering::RenderState&                         /*renderState*/,
-                                                                                              const uno::Sequence< rendering::Texture >&            /*textures*/,
-                                                                                              const uno::Reference< geometry::XMapping2D >&         /*xMapping*/ )
+    uno::Reference< rendering::XCachedPrimitive > CanvasHelper::fillTextureMappedPolyPolygon( const rendering::XCanvas* 							/*pCanvas*/, 
+                                                                                              const uno::Reference< rendering::XPolyPolygon2D >& 	/*xPolyPolygon*/, 
+                                                                                              const rendering::ViewState& 							/*viewState*/, 
+                                                                                              const rendering::RenderState& 						/*renderState*/, 
+                                                                                              const uno::Sequence< rendering::Texture >& 			/*textures*/, 
+                                                                                              const uno::Reference< geometry::XMapping2D >& 		/*xMapping*/ )
     {
         // TODO
         return uno::Reference< rendering::XCachedPrimitive >(NULL);
     }
 
-    uno::Reference< rendering::XCanvasFont > CanvasHelper::createFont( const rendering::XCanvas*                    /*pCanvas*/,
-                                                                       const rendering::FontRequest&                fontRequest,
-                                                                       const uno::Sequence< beans::PropertyValue >& extraFontProperties,
-                                                                       const geometry::Matrix2D&                    fontMatrix )
+    uno::Reference< rendering::XCanvasFont > CanvasHelper::createFont( const rendering::XCanvas* 					/*pCanvas*/, 
+                                                                       const rendering::FontRequest& 				fontRequest, 
+                                                                       const uno::Sequence< beans::PropertyValue >& extraFontProperties, 
+                                                                       const geometry::Matrix2D& 					fontMatrix )
     {
         if( needOutput() )
         {
-            return uno::Reference< rendering::XCanvasFont >(
+            return uno::Reference< rendering::XCanvasFont >( 
                     new CanvasFont(fontRequest, extraFontProperties, fontMatrix ) );
         }
 
         return uno::Reference< rendering::XCanvasFont >();
     }
 
-    uno::Sequence< rendering::FontInfo > CanvasHelper::queryAvailableFonts( const rendering::XCanvas*                       /*pCanvas*/,
-                                                                            const rendering::FontInfo&                      /*aFilter*/,
-                                                                            const uno::Sequence< beans::PropertyValue >&    /*aFontProperties*/ )
+    uno::Sequence< rendering::FontInfo > CanvasHelper::queryAvailableFonts( const rendering::XCanvas* 						/*pCanvas*/, 
+                                                                            const rendering::FontInfo& 						/*aFilter*/, 
+                                                                            const uno::Sequence< beans::PropertyValue >& 	/*aFontProperties*/ )
     {
         // TODO
         return uno::Sequence< rendering::FontInfo >();
     }
 
-    uno::Reference< rendering::XCachedPrimitive > CanvasHelper::drawText( const rendering::XCanvas*                         /*pCanvas*/,
-                                                                          const rendering::StringContext&                   text,
-                                                                          const uno::Reference< rendering::XCanvasFont >&   xFont,
-                                                                          const rendering::ViewState&                       viewState,
-                                                                          const rendering::RenderState&                     renderState,
-                                                                          sal_Int8                                          /*textDirection*/ )
+    uno::Reference< rendering::XCachedPrimitive > CanvasHelper::drawText( const rendering::XCanvas* 						/*pCanvas*/, 
+                                                                          const rendering::StringContext& 					text, 
+                                                                          const uno::Reference< rendering::XCanvasFont >& 	xFont, 
+                                                                          const rendering::ViewState& 						viewState, 
+                                                                          const rendering::RenderState& 					renderState, 
+                                                                          sal_Int8				 							/*textDirection*/ )
     {
-        ENSURE_OR_THROW( xFont.is(),
+        ENSURE_OR_THROW( xFont.is(), 
                           "CanvasHelper::drawText: font is NULL");
 
         if( needOutput() )
@@ -510,12 +510,12 @@ namespace dxcanvas
             GraphicsSharedPtr pGraphics( mpGraphicsProvider->getGraphics() );
 
             setupGraphicsState( pGraphics, viewState, renderState );
-
-            Gdiplus::SolidBrush aBrush(
-                Gdiplus::Color(
+        
+            Gdiplus::SolidBrush aBrush( 
+                Gdiplus::Color( 
                     tools::sequenceToArgb(renderState.DeviceColor)));
 
-            CanvasFont::ImplRef pFont(
+            CanvasFont::ImplRef pFont( 
                 tools::canvasFontFromXFont(xFont) );
 
             // Move glyphs up, such that output happens at the font
@@ -524,7 +524,7 @@ namespace dxcanvas
                                     static_cast<Gdiplus::REAL>(-(pFont->getFont()->GetSize()*
                                                                  pFont->getCellAscent() /
                                                                  pFont->getEmHeight())) );
-
+            
             // TODO(F1): According to
             // http://support.microsoft.com/default.aspx?scid=kb;EN-US;Q307208,
             // we might have to revert to GDI and ExTextOut here,
@@ -547,26 +547,26 @@ namespace dxcanvas
         return uno::Reference< rendering::XCachedPrimitive >(NULL);
     }
 
-    uno::Reference< rendering::XCachedPrimitive > CanvasHelper::drawTextLayout( const rendering::XCanvas*                       /*pCanvas*/,
-                                                                                const uno::Reference< rendering::XTextLayout >& xLayoutetText,
-                                                                                const rendering::ViewState&                     viewState,
-                                                                                const rendering::RenderState&                   renderState )
+    uno::Reference< rendering::XCachedPrimitive > CanvasHelper::drawTextLayout( const rendering::XCanvas* 						/*pCanvas*/, 
+                                                                                const uno::Reference< rendering::XTextLayout >& xLayoutetText, 
+                                                                                const rendering::ViewState& 					viewState, 
+                                                                                const rendering::RenderState& 					renderState )
     {
-        ENSURE_OR_THROW( xLayoutetText.is(),
+        ENSURE_OR_THROW( xLayoutetText.is(), 
                           "CanvasHelper::drawTextLayout: layout is NULL");
 
         if( needOutput() )
         {
-            TextLayout* pTextLayout =
+            TextLayout* pTextLayout = 
                 dynamic_cast< TextLayout* >( xLayoutetText.get() );
 
             ENSURE_OR_THROW( pTextLayout,
                                 "CanvasHelper::drawTextLayout(): TextLayout not compatible with this canvas" );
 
             pTextLayout->draw( mpGraphicsProvider->getGraphics(),
-                               viewState,
-                               renderState,
-                               maOutputOffset,
+                               viewState, 
+                               renderState, 
+                               maOutputOffset, 
                                mpDevice,
                                false );
         }
@@ -574,12 +574,12 @@ namespace dxcanvas
         return uno::Reference< rendering::XCachedPrimitive >(NULL);
     }
 
-    uno::Reference< rendering::XCachedPrimitive > CanvasHelper::drawBitmap( const rendering::XCanvas*                   /*pCanvas*/,
-                                                                            const uno::Reference< rendering::XBitmap >& xBitmap,
-                                                                            const rendering::ViewState&                 viewState,
-                                                                            const rendering::RenderState&               renderState )
+    uno::Reference< rendering::XCachedPrimitive > CanvasHelper::drawBitmap( const rendering::XCanvas* 					/*pCanvas*/, 
+                                                                            const uno::Reference< rendering::XBitmap >& xBitmap, 
+                                                                            const rendering::ViewState& 				viewState, 
+                                                                            const rendering::RenderState& 				renderState )
     {
-        ENSURE_OR_THROW( xBitmap.is(),
+        ENSURE_OR_THROW( xBitmap.is(), 
                           "CanvasHelper::drawBitmap: bitmap is NULL");
 
         if( needOutput() )
@@ -611,12 +611,12 @@ namespace dxcanvas
         return uno::Reference< rendering::XCachedPrimitive >(NULL);
     }
 
-    uno::Reference< rendering::XCachedPrimitive > CanvasHelper::drawBitmapModulated( const rendering::XCanvas*                      pCanvas,
-                                                                                     const uno::Reference< rendering::XBitmap >&    xBitmap,
-                                                                                     const rendering::ViewState&                    viewState,
-                                                                                     const rendering::RenderState&                  renderState )
+    uno::Reference< rendering::XCachedPrimitive > CanvasHelper::drawBitmapModulated( const rendering::XCanvas* 						pCanvas, 
+                                                                                     const uno::Reference< rendering::XBitmap >& 	xBitmap, 
+                                                                                     const rendering::ViewState& 					viewState, 
+                                                                                     const rendering::RenderState& 					renderState )
     {
-        ENSURE_OR_THROW( xBitmap.is(),
+        ENSURE_OR_THROW( xBitmap.is(), 
                           "CanvasHelper::drawBitmap: bitmap is NULL");
 
         // no color set -> this is equivalent to a plain drawBitmap(), then
@@ -624,13 +624,13 @@ namespace dxcanvas
             return drawBitmap( pCanvas, xBitmap, viewState, renderState );
 
         if( needOutput() )
-        {
+        {            
             GraphicsSharedPtr pGraphics( mpGraphicsProvider->getGraphics() );
 
             setupGraphicsState( pGraphics, viewState, renderState );
 
             BitmapSharedPtr pBitmap( tools::bitmapFromXBitmap( xBitmap ) );
-            Gdiplus::Rect aRect( 0, 0,
+            Gdiplus::Rect aRect( 0, 0, 
                                  pBitmap->GetWidth(),
                                  pBitmap->GetHeight() );
 
@@ -646,8 +646,8 @@ namespace dxcanvas
                                                rARGBColor.Blue,
                                                rARGBColor.Alpha );
 
-            ENSURE_OR_THROW(
-                Gdiplus::Ok == pGraphics->DrawImage( pBitmap.get(),
+            ENSURE_OR_THROW( 
+                Gdiplus::Ok == pGraphics->DrawImage( pBitmap.get(), 
                                                      aRect,
                                                      0, 0,
                                                      pBitmap->GetWidth(),
@@ -711,7 +711,7 @@ namespace dxcanvas
                 // TODO(F2): Problem, because GDI+ only knows about two compositing modes
                 aRet = Gdiplus::CompositingModeSourceOver;
                 break;
-
+                
             default:
                 ENSURE_OR_THROW( false, "CanvasHelper::calcCompositingMode: unexpected mode" );
                 break;
@@ -721,10 +721,10 @@ namespace dxcanvas
     }
 
     void CanvasHelper::setupGraphicsState( GraphicsSharedPtr&            rGraphics,
-                                           const rendering::ViewState&   viewState,
+                                           const rendering::ViewState& 	 viewState, 
                                            const rendering::RenderState& renderState )
     {
-        ENSURE_OR_THROW( needOutput(),
+        ENSURE_OR_THROW( needOutput(), 
                           "CanvasHelper::setupGraphicsState: primary graphics invalid" );
         ENSURE_OR_THROW( mpDevice,
                           "CanvasHelper::setupGraphicsState: reference device invalid" );
@@ -744,12 +744,12 @@ namespace dxcanvas
         Gdiplus::Matrix aMatrix;
         tools::gdiPlusMatrixFromB2DHomMatrix( aMatrix, aTransform );
 
-        ENSURE_OR_THROW(
+        ENSURE_OR_THROW( 
             Gdiplus::Ok == rGraphics->SetTransform( &aMatrix ),
             "CanvasHelper::setupGraphicsState(): Failed to set GDI+ transformation" );
 
         // setup view and render state clipping
-        ENSURE_OR_THROW(
+        ENSURE_OR_THROW( 
             Gdiplus::Ok == rGraphics->ResetClip(),
             "CanvasHelper::setupGraphicsState(): Failed to reset GDI+ clip" );
 
@@ -757,16 +757,16 @@ namespace dxcanvas
         {
             GraphicsPathSharedPtr aClipPath( tools::graphicsPathFromXPolyPolygon2D( viewState.Clip ) );
 
-            // TODO(P3): Cache clip. SetClip( GraphicsPath ) performs abyssmally on GDI+.
-            // Try SetClip( Rect ) or similar for simple clip paths (need some support in
+            // TODO(P3): Cache clip. SetClip( GraphicsPath ) performs abyssmally on GDI+. 
+            // Try SetClip( Rect ) or similar for simple clip paths (need some support in 
             // LinePolyPolygon, then)
-            ENSURE_OR_THROW(
-                Gdiplus::Ok == rGraphics->SetClip( aClipPath.get(),
+            ENSURE_OR_THROW( 
+                Gdiplus::Ok == rGraphics->SetClip( aClipPath.get(), 
                                                    Gdiplus::CombineModeIntersect ),
                 "CanvasHelper::setupGraphicsState(): Cannot set GDI+ clip" );
         }
 
-        // setup overall transform only now. View clip above was relative to
+        // setup overall transform only now. View clip above was relative to 
         // view transform
         ::canvas::tools::mergeViewAndRenderTransform(aTransform,
                                                      viewState,
@@ -782,7 +782,7 @@ namespace dxcanvas
 
         tools::gdiPlusMatrixFromB2DHomMatrix( aMatrix, aTransform );
 
-        ENSURE_OR_THROW(
+        ENSURE_OR_THROW( 
             Gdiplus::Ok == rGraphics->SetTransform( &aMatrix ),
             "CanvasHelper::setupGraphicsState(): Cannot set GDI+ transformation" );
 
@@ -790,18 +790,18 @@ namespace dxcanvas
         {
             GraphicsPathSharedPtr aClipPath( tools::graphicsPathFromXPolyPolygon2D( renderState.Clip ) );
 
-            // TODO(P3): Cache clip. SetClip( GraphicsPath ) performs abyssmally on GDI+.
-            // Try SetClip( Rect ) or similar for simple clip paths (need some support in
+            // TODO(P3): Cache clip. SetClip( GraphicsPath ) performs abyssmally on GDI+. 
+            // Try SetClip( Rect ) or similar for simple clip paths (need some support in 
             // LinePolyPolygon, then)
-            ENSURE_OR_THROW(
-                Gdiplus::Ok == rGraphics->SetClip( aClipPath.get(),
+            ENSURE_OR_THROW( 
+                Gdiplus::Ok == rGraphics->SetClip( aClipPath.get(), 
                                                    Gdiplus::CombineModeIntersect ),
                 "CanvasHelper::setupGraphicsState(): Cannot set GDI+ clip" );
         }
 
         // setup compositing
         const Gdiplus::CompositingMode eCompositing( calcCompositingMode( renderState.CompositeOperation ) );
-        ENSURE_OR_THROW(
+        ENSURE_OR_THROW( 
             Gdiplus::Ok == rGraphics->SetCompositingMode( eCompositing ),
             "CanvasHelper::setupGraphicsState(): Cannot set GDI* compositing mode)" );
     }
diff --git a/canvas/source/directx/dx_canvashelper.hxx b/canvas/source/directx/dx_canvashelper.hxx
index 2f175cce88e5..9536653f91b8 100755
--- a/canvas/source/directx/dx_canvashelper.hxx
+++ b/canvas/source/directx/dx_canvashelper.hxx
@@ -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
@@ -86,7 +86,7 @@ namespace dxcanvas
             Output offset in pixel
          */
         void setTarget( const GraphicsProviderSharedPtr& rTarget,
-                        const ::basegfx::B2ISize&        rOutputOffset );
+                        const ::basegfx::B2ISize& 		 rOutputOffset );
 
 
         // CanvasHelper functionality
@@ -95,131 +95,131 @@ namespace dxcanvas
         // XCanvas (only providing, not implementing the
         // interface. Also note subtle method parameter differences)
         void clear();
-        void drawPoint( const ::com::sun::star::rendering::XCanvas*     pCanvas,
-                        const ::com::sun::star::geometry::RealPoint2D&  aPoint,
-                        const ::com::sun::star::rendering::ViewState&   viewState,
+        void drawPoint( const ::com::sun::star::rendering::XCanvas* 	pCanvas, 
+                        const ::com::sun::star::geometry::RealPoint2D& 	aPoint, 
+                        const ::com::sun::star::rendering::ViewState& 	viewState, 
                         const ::com::sun::star::rendering::RenderState& renderState );
-        void drawLine( const ::com::sun::star::rendering::XCanvas*      pCanvas,
-                       const ::com::sun::star::geometry::RealPoint2D&   aStartPoint,
-                       const ::com::sun::star::geometry::RealPoint2D&   aEndPoint,
-                       const ::com::sun::star::rendering::ViewState&    viewState,
-                       const ::com::sun::star::rendering::RenderState&  renderState );
-        void drawBezier( const ::com::sun::star::rendering::XCanvas*            pCanvas,
-                         const ::com::sun::star::geometry::RealBezierSegment2D& aBezierSegment,
-                         const ::com::sun::star::geometry::RealPoint2D&         aEndPoint,
-                         const ::com::sun::star::rendering::ViewState&          viewState,
-                         const ::com::sun::star::rendering::RenderState&        renderState );
+        void drawLine( const ::com::sun::star::rendering::XCanvas* 		pCanvas,
+                       const ::com::sun::star::geometry::RealPoint2D& 	aStartPoint,
+                       const ::com::sun::star::geometry::RealPoint2D& 	aEndPoint,
+                       const ::com::sun::star::rendering::ViewState& 	viewState,
+                       const ::com::sun::star::rendering::RenderState& 	renderState	);
+        void drawBezier( const ::com::sun::star::rendering::XCanvas* 			pCanvas,
+                         const ::com::sun::star::geometry::RealBezierSegment2D&	aBezierSegment,
+                         const ::com::sun::star::geometry::RealPoint2D& 		aEndPoint,
+                         const ::com::sun::star::rendering::ViewState& 			viewState,
+                         const ::com::sun::star::rendering::RenderState& 		renderState );
         ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XCachedPrimitive >
-            drawPolyPolygon( const ::com::sun::star::rendering::XCanvas*            pCanvas,
+            drawPolyPolygon( const ::com::sun::star::rendering::XCanvas* 			pCanvas,
                              const ::com::sun::star::uno::Reference<
-                                     ::com::sun::star::rendering::XPolyPolygon2D >& xPolyPolygon,
-                             const ::com::sun::star::rendering::ViewState&          viewState,
-                             const ::com::sun::star::rendering::RenderState&        renderState );
+                                     ::com::sun::star::rendering::XPolyPolygon2D >&	xPolyPolygon,
+                             const ::com::sun::star::rendering::ViewState& 			viewState,
+                             const ::com::sun::star::rendering::RenderState& 		renderState );
         ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XCachedPrimitive >
-            strokePolyPolygon( const ::com::sun::star::rendering::XCanvas*          pCanvas,
+            strokePolyPolygon( const ::com::sun::star::rendering::XCanvas* 			pCanvas,
                                const ::com::sun::star::uno::Reference<
-                                       ::com::sun::star::rendering::XPolyPolygon2D >&   xPolyPolygon,
-                               const ::com::sun::star::rendering::ViewState&        viewState,
-                               const ::com::sun::star::rendering::RenderState&      renderState,
+                                       ::com::sun::star::rendering::XPolyPolygon2D >& 	xPolyPolygon,
+                               const ::com::sun::star::rendering::ViewState& 		viewState,
+                               const ::com::sun::star::rendering::RenderState& 		renderState,
                                const ::com::sun::star::rendering::StrokeAttributes& strokeAttributes );
         ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XCachedPrimitive >
-            strokeTexturedPolyPolygon( const ::com::sun::star::rendering::XCanvas*          pCanvas,
+            strokeTexturedPolyPolygon( const ::com::sun::star::rendering::XCanvas* 			pCanvas,
                                        const ::com::sun::star::uno::Reference<
-                                               ::com::sun::star::rendering::XPolyPolygon2D >&   xPolyPolygon,
-                                       const ::com::sun::star::rendering::ViewState&        viewState,
-                                       const ::com::sun::star::rendering::RenderState&      renderState,
+                                               ::com::sun::star::rendering::XPolyPolygon2D >& 	xPolyPolygon,
+                                       const ::com::sun::star::rendering::ViewState& 		viewState,
+                                       const ::com::sun::star::rendering::RenderState& 		renderState,
                                        const ::com::sun::star::uno::Sequence<
-                                               ::com::sun::star::rendering::Texture >&      textures,
+                                               ::com::sun::star::rendering::Texture >& 		textures,
                                        const ::com::sun::star::rendering::StrokeAttributes& strokeAttributes );
         ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XCachedPrimitive >
-            strokeTextureMappedPolyPolygon( const ::com::sun::star::rendering::XCanvas*             pCanvas,
+            strokeTextureMappedPolyPolygon( const ::com::sun::star::rendering::XCanvas* 			pCanvas,
                                             const ::com::sun::star::uno::Reference<
-                                                    ::com::sun::star::rendering::XPolyPolygon2D >&  xPolyPolygon,
-                                            const ::com::sun::star::rendering::ViewState&           viewState,
-                                            const ::com::sun::star::rendering::RenderState&         renderState,
+                                                    ::com::sun::star::rendering::XPolyPolygon2D >& 	xPolyPolygon,
+                                            const ::com::sun::star::rendering::ViewState& 			viewState,
+                                            const ::com::sun::star::rendering::RenderState& 		renderState,
                                             const ::com::sun::star::uno::Sequence<
-                                                    ::com::sun::star::rendering::Texture >&         textures,
+                                                    ::com::sun::star::rendering::Texture >& 		textures,
                                             const ::com::sun::star::uno::Reference<
-                                                    ::com::sun::star::geometry::XMapping2D >&       xMapping,
-                                            const ::com::sun::star::rendering::StrokeAttributes&    strokeAttributes );
+                                                    ::com::sun::star::geometry::XMapping2D >& 		xMapping,
+                                            const ::com::sun::star::rendering::StrokeAttributes& 	strokeAttributes );
         ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XPolyPolygon2D >
-            queryStrokeShapes( const ::com::sun::star::rendering::XCanvas*          pCanvas,
+            queryStrokeShapes( const ::com::sun::star::rendering::XCanvas* 			pCanvas,
                                const ::com::sun::star::uno::Reference<
-                                       ::com::sun::star::rendering::XPolyPolygon2D >&   xPolyPolygon,
-                               const ::com::sun::star::rendering::ViewState&        viewState,
-                               const ::com::sun::star::rendering::RenderState&      renderState,
+                                       ::com::sun::star::rendering::XPolyPolygon2D >& 	xPolyPolygon,
+                               const ::com::sun::star::rendering::ViewState& 		viewState,
+                               const ::com::sun::star::rendering::RenderState& 		renderState,
                                const ::com::sun::star::rendering::StrokeAttributes& strokeAttributes );
         ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XCachedPrimitive >
-            fillPolyPolygon( const ::com::sun::star::rendering::XCanvas*            pCanvas,
+            fillPolyPolygon( const ::com::sun::star::rendering::XCanvas* 			pCanvas,
                              const ::com::sun::star::uno::Reference<
-                                     ::com::sun::star::rendering::XPolyPolygon2D >&     xPolyPolygon,
-                             const ::com::sun::star::rendering::ViewState&          viewState,
-                             const ::com::sun::star::rendering::RenderState&        renderState );
+                                     ::com::sun::star::rendering::XPolyPolygon2D >& 	xPolyPolygon,
+                             const ::com::sun::star::rendering::ViewState& 			viewState,
+                             const ::com::sun::star::rendering::RenderState& 		renderState );
         ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XCachedPrimitive >
-            fillTexturedPolyPolygon( const ::com::sun::star::rendering::XCanvas*            pCanvas,
+            fillTexturedPolyPolygon( const ::com::sun::star::rendering::XCanvas* 			pCanvas,
                                      const ::com::sun::star::uno::Reference<
-                                             ::com::sun::star::rendering::XPolyPolygon2D >&     xPolyPolygon,
-                                     const ::com::sun::star::rendering::ViewState&          viewState,
-                                     const ::com::sun::star::rendering::RenderState&        renderState,
+                                             ::com::sun::star::rendering::XPolyPolygon2D >& 	xPolyPolygon,
+                                     const ::com::sun::star::rendering::ViewState& 			viewState,
+                                     const ::com::sun::star::rendering::RenderState& 		renderState,
                                      const ::com::sun::star::uno::Sequence<
-                                             ::com::sun::star::rendering::Texture >&        textures );
+                                             ::com::sun::star::rendering::Texture >& 		textures );
         ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XCachedPrimitive >
-            fillTextureMappedPolyPolygon( const ::com::sun::star::rendering::XCanvas*           pCanvas,
+            fillTextureMappedPolyPolygon( const ::com::sun::star::rendering::XCanvas* 			pCanvas,
                                           const ::com::sun::star::uno::Reference<
-                                                  ::com::sun::star::rendering::XPolyPolygon2D >&    xPolyPolygon,
-                                          const ::com::sun::star::rendering::ViewState&         viewState,
-                                          const ::com::sun::star::rendering::RenderState&       renderState,
+                                                  ::com::sun::star::rendering::XPolyPolygon2D >& 	xPolyPolygon,
+                                          const ::com::sun::star::rendering::ViewState& 		viewState,
+                                          const ::com::sun::star::rendering::RenderState& 		renderState,
                                           const ::com::sun::star::uno::Sequence<
-                                                  ::com::sun::star::rendering::Texture >&       textures,
+                                                  ::com::sun::star::rendering::Texture >& 		textures,
                                           const ::com::sun::star::uno::Reference<
-                                                  ::com::sun::star::geometry::XMapping2D >&         xMapping );
+                                                  ::com::sun::star::geometry::XMapping2D >& 		xMapping );
 
         ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XCanvasFont > SAL_CALL
-            createFont( const ::com::sun::star::rendering::XCanvas*             pCanvas,
-                        const ::com::sun::star::rendering::FontRequest&         fontRequest,
+            createFont( const ::com::sun::star::rendering::XCanvas* 			pCanvas,
+                        const ::com::sun::star::rendering::FontRequest& 		fontRequest,
                         const ::com::sun::star::uno::Sequence<
-                                ::com::sun::star::beans::PropertyValue >&       extraFontProperties,
-                        const ::com::sun::star::geometry::Matrix2D&             fontMatrix );
+                                ::com::sun::star::beans::PropertyValue >& 		extraFontProperties,
+                        const ::com::sun::star::geometry::Matrix2D& 			fontMatrix );
 
         ::com::sun::star::uno::Sequence< ::com::sun::star::rendering::FontInfo >
-            queryAvailableFonts( const ::com::sun::star::rendering::XCanvas*        pCanvas,
-                                 const ::com::sun::star::rendering::FontInfo&       aFilter,
+            queryAvailableFonts( const ::com::sun::star::rendering::XCanvas* 		pCanvas,
+                                 const ::com::sun::star::rendering::FontInfo& 		aFilter,
                                  const ::com::sun::star::uno::Sequence<
-                                         ::com::sun::star::beans::PropertyValue >&  aFontProperties );
+                                         ::com::sun::star::beans::PropertyValue >& 	aFontProperties );
 
         ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XCachedPrimitive >
-            drawText( const ::com::sun::star::rendering::XCanvas*           pCanvas,
-                      const ::com::sun::star::rendering::StringContext&     text,
+            drawText( const ::com::sun::star::rendering::XCanvas* 			pCanvas,
+                      const ::com::sun::star::rendering::StringContext& 	text,
                       const ::com::sun::star::uno::Reference<
-                              ::com::sun::star::rendering::XCanvasFont >&   xFont,
-                      const ::com::sun::star::rendering::ViewState&         viewState,
-                      const ::com::sun::star::rendering::RenderState&       renderState,
-                      sal_Int8                                              textDirection );
+                              ::com::sun::star::rendering::XCanvasFont >& 	xFont,
+                      const ::com::sun::star::rendering::ViewState& 		viewState,
+                      const ::com::sun::star::rendering::RenderState& 		renderState,
+                      sal_Int8 												textDirection );
 
         ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XCachedPrimitive >
-            drawTextLayout( const ::com::sun::star::rendering::XCanvas*     pCanvas,
+            drawTextLayout( const ::com::sun::star::rendering::XCanvas* 	pCanvas,
                             const ::com::sun::star::uno::Reference<
                                 ::com::sun::star::rendering::XTextLayout >& layoutetText,
-                            const ::com::sun::star::rendering::ViewState&   viewState,
+                            const ::com::sun::star::rendering::ViewState& 	viewState,
                             const ::com::sun::star::rendering::RenderState& renderState );
 
         ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XCachedPrimitive >
-            drawBitmap( const ::com::sun::star::rendering::XCanvas*     pCanvas,
+            drawBitmap( const ::com::sun::star::rendering::XCanvas* 	pCanvas,
                         const ::com::sun::star::uno::Reference<
                                 ::com::sun::star::rendering::XBitmap >& xBitmap,
-                        const ::com::sun::star::rendering::ViewState&   viewState,
+                        const ::com::sun::star::rendering::ViewState& 	viewState,
                         const ::com::sun::star::rendering::RenderState& renderState );
         ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XCachedPrimitive >
-            drawBitmapModulated( const ::com::sun::star::rendering::XCanvas*        pCanvas,
+            drawBitmapModulated( const ::com::sun::star::rendering::XCanvas* 		pCanvas,
                                  const ::com::sun::star::uno::Reference<
-                                         ::com::sun::star::rendering::XBitmap >&        xBitmap,
-                                 const ::com::sun::star::rendering::ViewState&      viewState,
-                                 const ::com::sun::star::rendering::RenderState&    renderState );
+                                         ::com::sun::star::rendering::XBitmap >&		xBitmap,
+                                 const ::com::sun::star::rendering::ViewState& 		viewState,
+                                 const ::com::sun::star::rendering::RenderState& 	renderState );
         ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XGraphicDevice >
             getDevice();
 
         // Flush drawing queue to screen
-        void                    flush() const;
+        void					flush() const;
 
         /** Called from XCanvas base classes, to notify that content
             is _about_ to change
@@ -228,7 +228,7 @@ namespace dxcanvas
 
     protected:
         /// Refcounted global GDI+ state container
-        GDIPlusUserSharedPtr            mpGdiPlusUser;
+        GDIPlusUserSharedPtr			mpGdiPlusUser;
 
         /** Phyical output device
 
@@ -244,13 +244,13 @@ namespace dxcanvas
 
         // returns transparency of color
         void setupGraphicsState( GraphicsSharedPtr&                              rGraphics,
-                                 const ::com::sun::star::rendering::ViewState&   viewState,
+                                 const ::com::sun::star::rendering::ViewState& 	 viewState, 
                                  const ::com::sun::star::rendering::RenderState& renderState );
 
-        Gdiplus::CompositingMode    calcCompositingMode( sal_Int8 nMode );
+        Gdiplus::CompositingMode 	calcCompositingMode( sal_Int8 nMode );
 
         /// Current (transformation-independent) output buffer offset
-        ::basegfx::B2ISize              maOutputOffset;
+        ::basegfx::B2ISize				maOutputOffset;
     };
 }
 
diff --git a/canvas/source/directx/dx_canvashelper_texturefill.cxx b/canvas/source/directx/dx_canvashelper_texturefill.cxx
index 60d62dad338a..794cb03ad8b9 100755
--- a/canvas/source/directx/dx_canvashelper_texturefill.cxx
+++ b/canvas/source/directx/dx_canvashelper_texturefill.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
@@ -62,7 +62,7 @@ namespace dxcanvas
 {
     namespace
     {
-        typedef ::boost::shared_ptr< Gdiplus::PathGradientBrush >   PathGradientBrushSharedPtr;
+        typedef ::boost::shared_ptr< Gdiplus::PathGradientBrush > 	PathGradientBrushSharedPtr;
 
         bool fillLinearGradient( GraphicsSharedPtr&                             rGraphics,
                                  const ::canvas::ParametricPolyPolygon::Values& /*rValues*/,
@@ -106,9 +106,9 @@ namespace dxcanvas
             ::basegfx::B2DPoint aRightTop( 1.0, 0.0 );
             ::basegfx::B2DPoint aRightBottom( 1.0, 1.0 );
 
-            aLeftTop    *= aTextureTransform;
+            aLeftTop	*= aTextureTransform;
             aLeftBottom *= aTextureTransform;
-            aRightTop   *= aTextureTransform;
+            aRightTop 	*= aTextureTransform;
             aRightBottom*= aTextureTransform;
 
             Gdiplus::RectF aBounds;
@@ -200,9 +200,9 @@ namespace dxcanvas
 
         int numColorSteps( const Gdiplus::Color& rColor1, const Gdiplus::Color& rColor2 )
         {
-            return ::std::max(
+            return ::std::max( 
                 labs( rColor1.GetRed() - rColor2.GetRed() ),
-                ::std::max(
+                ::std::max(                    
                     labs( rColor1.GetGreen() - rColor2.GetGreen() ),
                     labs( rColor1.GetBlue()  - rColor2.GetBlue() ) ) );
         }
@@ -212,8 +212,8 @@ namespace dxcanvas
                                     const std::vector< Gdiplus::REAL >&            rStops,
                                     GraphicsSharedPtr&                             rGraphics,
                                     const GraphicsPathSharedPtr&                   rPath,
-                                    const rendering::ViewState&                    viewState,
-                                    const rendering::RenderState&                  renderState,
+                                    const rendering::ViewState& 				   viewState,
+                                    const rendering::RenderState& 				   renderState,
                                     const rendering::Texture&                      texture )
         {
             // copy original fill path object, might have to change it
@@ -274,7 +274,7 @@ namespace dxcanvas
                                                            nColorSteps);
 
                 ::basegfx::B2DHomMatrix aTextureTransform;
-                ::basegfx::unotools::homMatrixFromAffineMatrix( aTextureTransform,
+                ::basegfx::unotools::homMatrixFromAffineMatrix( aTextureTransform, 
                                                                 texture.AffineTransform );
                 // determine overall transformation for inner polygon (might
                 // have to be prefixed by anisotrophic scaling)
@@ -284,8 +284,8 @@ namespace dxcanvas
                 // here, keep it all the way and only change the vertex values
                 // in the loop below (as ::Polygon is a pimpl class, creating
                 // one every loop turn would really stress the mem allocator)
-                ::basegfx::B2DPolygon   aOuterPoly( rGradientPoly );
-                ::basegfx::B2DPolygon   aInnerPoly;
+                ::basegfx::B2DPolygon 	aOuterPoly( rGradientPoly );
+                ::basegfx::B2DPolygon 	aInnerPoly;
 
                 // subdivide polygon _before_ rendering, would otherwise have
                 // to be performed on every loop turn.
@@ -314,7 +314,7 @@ namespace dxcanvas
                 else if( nAspectRatio < 1.0 )
                 {
                     // width < height case
-                    aInnerPolygonTransformMatrix.scale( 0.0,
+                    aInnerPolygonTransformMatrix.scale( 0.0, 
                                                         1.0 - nAspectRatio );
                 }
                 else
@@ -337,7 +337,7 @@ namespace dxcanvas
                 {
                     std::ptrdiff_t nIndex;
                     double fAlpha;
-                    const double fT( i/double(nStepCount) );
+                    const double fT( i/double(nStepCount) );            
                     boost::tuples::tie(nIndex,fAlpha)=aLerper.lerp(fT);
 
                     const Gdiplus::Color aFillColor(
@@ -440,8 +440,8 @@ namespace dxcanvas
                            const std::vector< Gdiplus::REAL >&            rStops,
                            GraphicsSharedPtr&                             rGraphics,
                            const GraphicsPathSharedPtr&                   rPath,
-                           const rendering::ViewState&                    viewState,
-                           const rendering::RenderState&                  renderState,
+                           const rendering::ViewState& 					  viewState,
+                           const rendering::RenderState& 				  renderState,
                            const rendering::Texture&                      texture )
         {
             switch( rValues.meType )
@@ -554,11 +554,11 @@ namespace dxcanvas
 
     // -------------------------------------------------------------
 
-    uno::Reference< rendering::XCachedPrimitive > CanvasHelper::fillTexturedPolyPolygon( const rendering::XCanvas*                          /*pCanvas*/,
+    uno::Reference< rendering::XCachedPrimitive > CanvasHelper::fillTexturedPolyPolygon( const rendering::XCanvas* 							/*pCanvas*/,
                                                                                          const uno::Reference< rendering::XPolyPolygon2D >& xPolyPolygon,
-                                                                                         const rendering::ViewState&                        viewState,
-                                                                                         const rendering::RenderState&                      renderState,
-                                                                                         const uno::Sequence< rendering::Texture >&         textures )
+                                                                                         const rendering::ViewState& 						viewState,
+                                                                                         const rendering::RenderState& 						renderState,
+                                                                                         const uno::Sequence< rendering::Texture >& 		textures )
     {
         ENSURE_OR_THROW( xPolyPolygon.is(),
                           "CanvasHelper::fillTexturedPolyPolygon: polygon is NULL");
@@ -584,7 +584,7 @@ namespace dxcanvas
                     const ::canvas::ParametricPolyPolygon::Values& rValues(
                         pGradient->getValues() );
 
-                    OSL_ASSERT(rValues.maColors.getLength() == rValues.maStops.getLength()
+                    OSL_ASSERT(rValues.maColors.getLength() == rValues.maStops.getLength() 
                                && rValues.maColors.getLength() > 1);
 
                     std::vector< Gdiplus::Color > aColors(rValues.maColors.getLength());
diff --git a/canvas/source/directx/dx_config.cxx b/canvas/source/directx/dx_config.cxx
index bfbb46a42d09..6638891e127e 100755
--- a/canvas/source/directx/dx_config.cxx
+++ b/canvas/source/directx/dx_config.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
@@ -41,8 +41,8 @@ using namespace com::sun::star;
 namespace dxcanvas
 {
     DXCanvasItem::DXCanvasItem() :
-        ConfigItem(
-            ::rtl::OUString(
+        ConfigItem( 
+            ::rtl::OUString( 
                 RTL_CONSTASCII_USTRINGPARAM( "Office.Canvas/DXCanvas" )),
             CONFIG_MODE_IMMEDIATE_UPDATE ),
         maValues(),
diff --git a/canvas/source/directx/dx_config.hxx b/canvas/source/directx/dx_config.hxx
index a1499a64f44f..b9dfa6408c7b 100644
--- a/canvas/source/directx/dx_config.hxx
+++ b/canvas/source/directx/dx_config.hxx
@@ -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
@@ -75,8 +75,8 @@ namespace dxcanvas
         void blacklistDevice( const DeviceInfo& rDeviceInfo );
         void adaptMaxTextureSize( basegfx::B2IVector& io_maxTextureSize ) const;
             virtual void            Notify( const com::sun::star::uno::Sequence<rtl::OUString>& aPropertyNames);
-            virtual void            Commit();
-
+            virtual void            Commit(); 
+        
     private:
         typedef std::set< DeviceInfo > ValueSet;
         ValueSet                   maValues;
diff --git a/canvas/source/directx/dx_devicehelper.cxx b/canvas/source/directx/dx_devicehelper.cxx
index 731e28e2700f..61d3bd73ea7d 100755
--- a/canvas/source/directx/dx_devicehelper.cxx
+++ b/canvas/source/directx/dx_devicehelper.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
@@ -116,8 +116,8 @@ namespace dxcanvas
     }
 
     uno::Reference< rendering::XLinePolyPolygon2D > DeviceHelper::createCompatibleLinePolyPolygon(
-        const uno::Reference< rendering::XGraphicDevice >&              /*rDevice*/,
-        const uno::Sequence< uno::Sequence< geometry::RealPoint2D > >&  points )
+        const uno::Reference< rendering::XGraphicDevice >& 				/*rDevice*/,
+        const uno::Sequence< uno::Sequence< geometry::RealPoint2D > >&	points )
     {
         if( !mpDevice )
             return uno::Reference< rendering::XLinePolyPolygon2D >(); // we're disposed
@@ -128,8 +128,8 @@ namespace dxcanvas
     }
 
     uno::Reference< rendering::XBezierPolyPolygon2D > DeviceHelper::createCompatibleBezierPolyPolygon(
-        const uno::Reference< rendering::XGraphicDevice >&                      /*rDevice*/,
-        const uno::Sequence< uno::Sequence< geometry::RealBezierSegment2D > >&  points )
+        const uno::Reference< rendering::XGraphicDevice >& 						/*rDevice*/,
+        const uno::Sequence< uno::Sequence< geometry::RealBezierSegment2D > >&	points )
     {
         if( !mpDevice )
             return uno::Reference< rendering::XBezierPolyPolygon2D >(); // we're disposed
@@ -140,8 +140,8 @@ namespace dxcanvas
     }
 
     uno::Reference< rendering::XBitmap > DeviceHelper::createCompatibleBitmap(
-        const uno::Reference< rendering::XGraphicDevice >&  /*rDevice*/,
-        const geometry::IntegerSize2D&                      size )
+        const uno::Reference< rendering::XGraphicDevice >& 	/*rDevice*/,
+        const geometry::IntegerSize2D& 						size )
     {
         if( !mpDevice )
             return uno::Reference< rendering::XBitmap >(); // we're disposed
@@ -156,15 +156,15 @@ namespace dxcanvas
     }
 
     uno::Reference< rendering::XVolatileBitmap > DeviceHelper::createVolatileBitmap(
-        const uno::Reference< rendering::XGraphicDevice >&  /*rDevice*/,
-        const geometry::IntegerSize2D&                      /*size*/ )
+        const uno::Reference< rendering::XGraphicDevice >& 	/*rDevice*/,
+        const geometry::IntegerSize2D& 						/*size*/ )
     {
         return uno::Reference< rendering::XVolatileBitmap >();
     }
 
     uno::Reference< rendering::XBitmap > DeviceHelper::createCompatibleAlphaBitmap(
-        const uno::Reference< rendering::XGraphicDevice >&  /*rDevice*/,
-        const geometry::IntegerSize2D&                      size )
+        const uno::Reference< rendering::XGraphicDevice >& 	/*rDevice*/,
+        const geometry::IntegerSize2D& 						size )
     {
         if( !mpDevice )
             return uno::Reference< rendering::XBitmap >(); // we're disposed
@@ -179,8 +179,8 @@ namespace dxcanvas
     }
 
     uno::Reference< rendering::XVolatileBitmap > DeviceHelper::createVolatileAlphaBitmap(
-        const uno::Reference< rendering::XGraphicDevice >&  /*rDevice*/,
-        const geometry::IntegerSize2D&                      /*size*/ )
+        const uno::Reference< rendering::XGraphicDevice >& 	/*rDevice*/,
+        const geometry::IntegerSize2D& 						/*size*/ )
     {
         return uno::Reference< rendering::XVolatileBitmap >();
     }
@@ -216,18 +216,18 @@ namespace dxcanvas
         return uno::Any();
     }
 
-    namespace
-    {
+    namespace 
+    { 
         struct DeviceColorSpace: public rtl::StaticWithInit<uno::Reference<rendering::XColorSpace>,
-                                                            DeviceColorSpace>
+                                                            DeviceColorSpace> 
         {
             uno::Reference<rendering::XColorSpace> operator()()
             {
                 return vcl::unotools::createStandardColorSpace();
             }
-        };
+        }; 
     }
-
+    
     uno::Reference<rendering::XColorSpace> DeviceHelper::getColorSpace() const
     {
         // always the same
diff --git a/canvas/source/directx/dx_devicehelper.hxx b/canvas/source/directx/dx_devicehelper.hxx
index 7c85f7a8f8de..625160d0a0d9 100755
--- a/canvas/source/directx/dx_devicehelper.hxx
+++ b/canvas/source/directx/dx_devicehelper.hxx
@@ -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
@@ -50,7 +50,7 @@ namespace dxcanvas
         DeviceHelper();
 
         /** Init the device helper
-
+            
             @param hdc
             private or class dc of the output device. is only stored,
             not release
@@ -68,23 +68,23 @@ namespace dxcanvas
         ::com::sun::star::geometry::RealSize2D getPhysicalResolution();
         ::com::sun::star::geometry::RealSize2D getPhysicalSize();
         ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XLinePolyPolygon2D > createCompatibleLinePolyPolygon(
-            const ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XGraphicDevice >&                               rDevice,
+            const ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XGraphicDevice >& 								 rDevice,
             const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< ::com::sun::star::geometry::RealPoint2D > >& points );
         ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XBezierPolyPolygon2D > createCompatibleBezierPolyPolygon(
-            const ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XGraphicDevice >&                                       rDevice,
+            const ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XGraphicDevice >& 								 		 rDevice,
             const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< ::com::sun::star::geometry::RealBezierSegment2D > >& points );
         ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XBitmap > createCompatibleBitmap(
-            const ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XGraphicDevice >&  rDevice,
-            const ::com::sun::star::geometry::IntegerSize2D&                                        size );
+            const ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XGraphicDevice >& 	rDevice,
+            const ::com::sun::star::geometry::IntegerSize2D& 										size );
         ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XVolatileBitmap > createVolatileBitmap(
-            const ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XGraphicDevice >&  rDevice,
-            const ::com::sun::star::geometry::IntegerSize2D&                                        size );
+            const ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XGraphicDevice >& 	rDevice,
+            const ::com::sun::star::geometry::IntegerSize2D& 										size );
         ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XBitmap > createCompatibleAlphaBitmap(
-            const ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XGraphicDevice >&  rDevice,
-            const ::com::sun::star::geometry::IntegerSize2D&                                        size );
+            const ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XGraphicDevice >& 	rDevice,
+            const ::com::sun::star::geometry::IntegerSize2D& 										size );
         ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XVolatileBitmap > createVolatileAlphaBitmap(
-            const ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XGraphicDevice >&  rDevice,
-            const ::com::sun::star::geometry::IntegerSize2D&                                        size );
+            const ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XGraphicDevice >& 	rDevice,
+            const ::com::sun::star::geometry::IntegerSize2D& 										size );
 
         sal_Bool hasFullScreenMode();
         sal_Bool enterFullScreenMode( sal_Bool bEnter );
@@ -92,7 +92,7 @@ namespace dxcanvas
         ::com::sun::star::uno::Any isAccelerated() const;
         ::com::sun::star::uno::Any getDeviceHandle() const;
         ::com::sun::star::uno::Any getSurfaceHandle() const;
-        ::com::sun::star::uno::Reference<
+        ::com::sun::star::uno::Reference< 
             ::com::sun::star::rendering::XColorSpace > getColorSpace() const;
 
         /** called when DumpScreenContent property is enabled on
diff --git a/canvas/source/directx/dx_gdiplususer.cxx b/canvas/source/directx/dx_gdiplususer.cxx
index f11965ac6860..317f908a78b7 100755
--- a/canvas/source/directx/dx_gdiplususer.cxx
+++ b/canvas/source/directx/dx_gdiplususer.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
@@ -38,10 +38,10 @@ namespace dxcanvas
 {
     namespace
     {
-        ::osl::Mutex*   p_gdiPlusUsageCountMutex( osl::Mutex::getGlobalMutex() );
-        int             n_gdiPlusUsageCount( 0 );
+        ::osl::Mutex* 	p_gdiPlusUsageCountMutex( osl::Mutex::getGlobalMutex() );
+        int				n_gdiPlusUsageCount( 0 );
 
-        ULONG_PTR       a_GdiPlusToken;     // GDI+ handle. Owned by this object
+        ULONG_PTR		a_GdiPlusToken;		// GDI+ handle. Owned by this object        
     }
 
     GDIPlusUserSharedPtr GDIPlusUser::createInstance()
@@ -51,7 +51,7 @@ namespace dxcanvas
 
     GDIPlusUser::~GDIPlusUser()
     {
-        ::osl::MutexGuard aGuard( *p_gdiPlusUsageCountMutex );
+        ::osl::MutexGuard aGuard( *p_gdiPlusUsageCountMutex ); 
 
         --n_gdiPlusUsageCount;
 
@@ -61,7 +61,7 @@ namespace dxcanvas
 
     GDIPlusUser::GDIPlusUser()
     {
-        ::osl::MutexGuard aGuard( *p_gdiPlusUsageCountMutex );
+        ::osl::MutexGuard aGuard( *p_gdiPlusUsageCountMutex ); 
 
         if( n_gdiPlusUsageCount == 0 )
         {
@@ -71,8 +71,8 @@ namespace dxcanvas
             // default constructor
             Gdiplus::GdiplusStartupInput gdiPlusStartupInput;
 
-            Gdiplus::GdiplusStartup( &a_GdiPlusToken,
-                                     &gdiPlusStartupInput,
+            Gdiplus::GdiplusStartup( &a_GdiPlusToken, 
+                                     &gdiPlusStartupInput, 
                                      NULL );
         }
 
diff --git a/canvas/source/directx/dx_gdiplususer.hxx b/canvas/source/directx/dx_gdiplususer.hxx
index 409449aab954..f65e2b59196c 100755
--- a/canvas/source/directx/dx_gdiplususer.hxx
+++ b/canvas/source/directx/dx_gdiplususer.hxx
@@ -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
diff --git a/canvas/source/directx/dx_graphicsprovider.hxx b/canvas/source/directx/dx_graphicsprovider.hxx
index 74c47e26a99a..c5fb62f50529 100644
--- a/canvas/source/directx/dx_graphicsprovider.hxx
+++ b/canvas/source/directx/dx_graphicsprovider.hxx
@@ -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
diff --git a/canvas/source/directx/dx_ibitmap.hxx b/canvas/source/directx/dx_ibitmap.hxx
index 6419d5a198fc..b5f4b486ca8d 100644
--- a/canvas/source/directx/dx_ibitmap.hxx
+++ b/canvas/source/directx/dx_ibitmap.hxx
@@ -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
@@ -46,22 +46,22 @@ namespace dxcanvas
         virtual bool                      hasAlpha() const = 0;
 
         virtual ::com::sun::star::uno::Sequence< sal_Int8 > getData(
-            ::com::sun::star::rendering::IntegerBitmapLayout&       bitmapLayout,
-            const ::com::sun::star::geometry::IntegerRectangle2D&   rect ) = 0;
+            ::com::sun::star::rendering::IntegerBitmapLayout&		bitmapLayout,
+            const ::com::sun::star::geometry::IntegerRectangle2D&	rect ) = 0;
 
         virtual void setData(
-            const ::com::sun::star::uno::Sequence< sal_Int8 >&      data,
+            const ::com::sun::star::uno::Sequence< sal_Int8 >&		data,
             const ::com::sun::star::rendering::IntegerBitmapLayout& bitmapLayout,
-            const ::com::sun::star::geometry::IntegerRectangle2D&   rect ) = 0;
+            const ::com::sun::star::geometry::IntegerRectangle2D&	rect ) = 0;
 
         virtual void setPixel(
-            const ::com::sun::star::uno::Sequence< sal_Int8 >&      color,
+            const ::com::sun::star::uno::Sequence< sal_Int8 >&		color,
             const ::com::sun::star::rendering::IntegerBitmapLayout& bitmapLayout,
-            const ::com::sun::star::geometry::IntegerPoint2D&       pos ) = 0;
+            const ::com::sun::star::geometry::IntegerPoint2D&		pos ) = 0;
 
         virtual ::com::sun::star::uno::Sequence< sal_Int8 > getPixel(
-            ::com::sun::star::rendering::IntegerBitmapLayout&       bitmapLayout,
-            const ::com::sun::star::geometry::IntegerPoint2D&       pos ) = 0;
+            ::com::sun::star::rendering::IntegerBitmapLayout&		bitmapLayout,
+            const ::com::sun::star::geometry::IntegerPoint2D&		pos ) = 0;
     };
 
     typedef boost::shared_ptr<IBitmap> IBitmapSharedPtr;
diff --git a/canvas/source/directx/dx_impltools.cxx b/canvas/source/directx/dx_impltools.cxx
index c298fb9238f9..a24105474a58 100755
--- a/canvas/source/directx/dx_impltools.cxx
+++ b/canvas/source/directx/dx_impltools.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
@@ -72,7 +72,7 @@ namespace dxcanvas
     namespace tools
     {
         ::basegfx::B2DPolyPolygon polyPolygonFromXPolyPolygon2D( const uno::Reference< rendering::XPolyPolygon2D >& xPoly )
-        {
+        {    
             LinePolyPolygon* pPolyImpl = dynamic_cast< LinePolyPolygon* >( xPoly.get() );
 
             if( pPolyImpl )
@@ -168,8 +168,8 @@ namespace dxcanvas
                                         static_cast<Gdiplus::REAL>(rMatrix.get(1,2)) );
         }
 
-        void gdiPlusMatrixFromAffineMatrix2D( Gdiplus::Matrix&                  rGdiplusMatrix,
-                                              const geometry::AffineMatrix2D&   rMatrix )
+        void gdiPlusMatrixFromAffineMatrix2D( Gdiplus::Matrix& 					rGdiplusMatrix, 
+                                              const geometry::AffineMatrix2D&	rMatrix )
         {
             rGdiplusMatrix.SetElements( static_cast<Gdiplus::REAL>(rMatrix.m00),
                                         static_cast<Gdiplus::REAL>(rMatrix.m10),
@@ -185,7 +185,7 @@ namespace dxcanvas
             // out of it
             inline Gdiplus::PointF implGdiPlusPointFromRealPoint2D( const ::com::sun::star::geometry::RealPoint2D& rPoint )
             {
-                return Gdiplus::PointF( static_cast<Gdiplus::REAL>(rPoint.X),
+                return Gdiplus::PointF( static_cast<Gdiplus::REAL>(rPoint.X), 
                                         static_cast<Gdiplus::REAL>(rPoint.Y) );
             }
 
@@ -193,7 +193,7 @@ namespace dxcanvas
                                              ::std::vector< Gdiplus::PointF >&  rPoints,
                                              const ::basegfx::B2DPolygon&       rPoly,
                                              bool bNoLineJoin)
-            {
+            {                
                 const sal_uInt32 nPoints( rPoly.count() );
 
                 if( nPoints < 2 )
@@ -218,15 +218,15 @@ namespace dxcanvas
                     for( sal_uInt32 nCurrPoint=0; nCurrPoint<nPoints; ++nCurrPoint )
                     {
                         const ::basegfx::B2DPoint& rPoint( rPoly.getB2DPoint( nCurrPoint ) );
-                        rPoints[nCurrOutput++] = Gdiplus::PointF( static_cast<Gdiplus::REAL>(rPoint.getX()),
+                        rPoints[nCurrOutput++] = Gdiplus::PointF( static_cast<Gdiplus::REAL>(rPoint.getX()), 
                                                                   static_cast<Gdiplus::REAL>(rPoint.getY()) );
 
                         const ::basegfx::B2DPoint& rControlPointA( rPoly.getNextControlPoint( nCurrPoint ) );
-                        rPoints[nCurrOutput++] = Gdiplus::PointF( static_cast<Gdiplus::REAL>(rControlPointA.getX()),
+                        rPoints[nCurrOutput++] = Gdiplus::PointF( static_cast<Gdiplus::REAL>(rControlPointA.getX()), 
                                                                   static_cast<Gdiplus::REAL>(rControlPointA.getY()) );
 
                         const ::basegfx::B2DPoint& rControlPointB( rPoly.getPrevControlPoint( (nCurrPoint + 1) % nPoints) );
-                        rPoints[nCurrOutput++] = Gdiplus::PointF( static_cast<Gdiplus::REAL>(rControlPointB.getX()),
+                        rPoints[nCurrOutput++] = Gdiplus::PointF( static_cast<Gdiplus::REAL>(rControlPointB.getX()), 
                                                                   static_cast<Gdiplus::REAL>(rControlPointB.getY()) );
                     }
 
@@ -236,7 +236,7 @@ namespace dxcanvas
                         // control points for the last point, see
                         // above)
                         const ::basegfx::B2DPoint& rPoint( rPoly.getB2DPoint(0) );
-                        rPoints[nCurrOutput++] = Gdiplus::PointF( static_cast<Gdiplus::REAL>(rPoint.getX()),
+                        rPoints[nCurrOutput++] = Gdiplus::PointF( static_cast<Gdiplus::REAL>(rPoint.getX()), 
                                                                   static_cast<Gdiplus::REAL>(rPoint.getY()) );
 
                         if(bNoLineJoin && nCurrOutput > 7)
@@ -285,7 +285,7 @@ namespace dxcanvas
                     for( sal_uInt32 nCurrPoint=0; nCurrPoint<nPoints; ++nCurrPoint )
                     {
                         const ::basegfx::B2DPoint& rPoint( rPoly.getB2DPoint( nCurrPoint ) );
-                        rPoints[nCurrPoint] = Gdiplus::PointF( static_cast<Gdiplus::REAL>(rPoint.getX()),
+                        rPoints[nCurrPoint] = Gdiplus::PointF( static_cast<Gdiplus::REAL>(rPoint.getX()), 
                                                                static_cast<Gdiplus::REAL>(rPoint.getY()) );
                     }
 
@@ -321,17 +321,17 @@ namespace dxcanvas
 
         Gdiplus::Rect gdiPlusRectFromIntegerRectangle2D( const geometry::IntegerRectangle2D& rRect )
         {
-            return Gdiplus::Rect( rRect.X1,
-                                  rRect.Y1,
-                                  rRect.X2 - rRect.X1,
+            return Gdiplus::Rect( rRect.X1, 
+                                  rRect.Y1, 
+                                  rRect.X2 - rRect.X1, 
                                   rRect.Y2 - rRect.Y1 );
         }
 
         Gdiplus::RectF gdiPlusRectFFromRectangle2D( const geometry::RealRectangle2D& rRect )
         {
-            return Gdiplus::RectF( static_cast<Gdiplus::REAL>(rRect.X1),
-                                   static_cast<Gdiplus::REAL>(rRect.Y1),
-                                   static_cast<Gdiplus::REAL>(rRect.X2 - rRect.X1),
+            return Gdiplus::RectF( static_cast<Gdiplus::REAL>(rRect.X1), 
+                                   static_cast<Gdiplus::REAL>(rRect.Y1), 
+                                   static_cast<Gdiplus::REAL>(rRect.X2 - rRect.X1), 
                                    static_cast<Gdiplus::REAL>(rRect.Y2 - rRect.Y1) );
         }
 
@@ -353,19 +353,19 @@ namespace dxcanvas
         geometry::RealRectangle2D realRectangle2DFromGdiPlusRectF( const Gdiplus::RectF& rRect )
         {
             return geometry::RealRectangle2D( rRect.X, rRect.Y,
-                                              rRect.X + rRect.Width,
+                                              rRect.X + rRect.Width, 
                                               rRect.Y + rRect.Height );
         }
 
-        ::basegfx::B2DPoint b2dPointFromGdiPlusPointF( const Gdiplus::PointF& rPoint )
+        ::basegfx::B2DPoint	b2dPointFromGdiPlusPointF( const Gdiplus::PointF& rPoint )
         {
             return ::basegfx::B2DPoint( rPoint.X, rPoint.Y );
         }
 
-        ::basegfx::B2DRange b2dRangeFromGdiPlusRectF( const Gdiplus::RectF& rRect )
+        ::basegfx::B2DRange	b2dRangeFromGdiPlusRectF( const Gdiplus::RectF& rRect )
         {
             return ::basegfx::B2DRange( rRect.X, rRect.Y,
-                                        rRect.X + rRect.Width,
+                                        rRect.X + rRect.Width, 
                                         rRect.Y + rRect.Height );
         }
 
@@ -374,10 +374,10 @@ namespace dxcanvas
             // TODO(F1): handle color space conversions, when defined on canvas/graphicDevice
             uno::Sequence< double > aRet(4);
 
-            aRet[0] = ((rColor >> 16) & 0xFF) / 255.0;  // red
-            aRet[1] = ((rColor >> 8) & 0xFF) / 255.0;   // green
-            aRet[2] = (rColor & 0xFF) / 255.0;          // blue
-            aRet[3] = ((rColor >> 24) & 0xFF) / 255.0;  // alpha
+            aRet[0] = ((rColor >> 16) & 0xFF) / 255.0; 	// red
+            aRet[1] = ((rColor >> 8) & 0xFF) / 255.0;	// green
+            aRet[2] = (rColor & 0xFF) / 255.0;			// blue
+            aRet[3] = ((rColor >> 24) & 0xFF) / 255.0;	// alpha	
 
             return aRet;
         }
@@ -387,17 +387,17 @@ namespace dxcanvas
             // TODO(F1): handle color space conversions, when defined on canvas/graphicDevice
             uno::Sequence< sal_Int8 > aRet(4);
 
-            aRet[0] = static_cast<sal_Int8>((rColor >> 16) & 0xFF); // red
-            aRet[1] = static_cast<sal_Int8>((rColor >> 8) & 0xFF);  // green
-            aRet[2] = static_cast<sal_Int8>(rColor & 0xFF);         // blue
-            aRet[3] = static_cast<sal_Int8>((rColor >> 24) & 0xFF); // alpha
+            aRet[0] = static_cast<sal_Int8>((rColor >> 16) & 0xFF);	// red
+            aRet[1] = static_cast<sal_Int8>((rColor >> 8) & 0xFF);	// green
+            aRet[2] = static_cast<sal_Int8>(rColor & 0xFF);			// blue
+            aRet[3] = static_cast<sal_Int8>((rColor >> 24) & 0xFF);	// alpha	
 
             return aRet;
         }
 
         Gdiplus::ARGB sequenceToArgb( const uno::Sequence< sal_Int8 >& rColor )
         {
-            ENSURE_OR_THROW( rColor.getLength() > 2,
+            ENSURE_OR_THROW( rColor.getLength() > 2, 
                               "sequenceToArgb: need at least three channels" );
 
             // TODO(F1): handle color space conversions, when defined on canvas/graphicDevice
@@ -413,7 +413,7 @@ namespace dxcanvas
 
         Gdiplus::ARGB sequenceToArgb( const uno::Sequence< double >& rColor )
         {
-            ENSURE_OR_THROW( rColor.getLength() > 2,
+            ENSURE_OR_THROW( rColor.getLength() > 2, 
                               "sequenceToColor: need at least three channels" );
 
             // TODO(F1): handle color space conversions, when defined on canvas/graphicDevice
@@ -423,9 +423,9 @@ namespace dxcanvas
             ::canvas::tools::verifyRange(rColor[1],0.0,1.0);
             ::canvas::tools::verifyRange(rColor[2],0.0,1.0);
 
-            aColor =
-                (static_cast<sal_uInt8>( ::basegfx::fround( 255*rColor[0] ) ) << 16) |
-                (static_cast<sal_uInt8>( ::basegfx::fround( 255*rColor[1] ) ) << 8) |
+            aColor = 
+                (static_cast<sal_uInt8>( ::basegfx::fround( 255*rColor[0] ) ) << 16) | 
+                (static_cast<sal_uInt8>( ::basegfx::fround( 255*rColor[1] ) ) << 8) | 
                 static_cast<sal_uInt8>( ::basegfx::fround( 255*rColor[2] ) );
 
             if( rColor.getLength() > 3 )
@@ -453,9 +453,9 @@ namespace dxcanvas
                     // TODO(F1): Closed/open polygons
 
                     // convert from RealPoint2D array to Gdiplus::PointF array
-                    ::std::transform( const_cast< uno::Sequence< geometry::RealPoint2D >& >(points[nCurrPoly]).getArray(),
-                                      const_cast< uno::Sequence< geometry::RealPoint2D >& >(points[nCurrPoly]).getArray()+nCurrSize,
-                                      aPoints.begin(),
+                    ::std::transform( const_cast< uno::Sequence< geometry::RealPoint2D >& >(points[nCurrPoly]).getArray(), 
+                                      const_cast< uno::Sequence< geometry::RealPoint2D >& >(points[nCurrPoly]).getArray()+nCurrSize, 
+                                      aPoints.begin(), 
                                       implGdiPlusPointFromRealPoint2D );
 
                     pRes->AddLines( &aPoints[0], nCurrSize );
@@ -467,8 +467,8 @@ namespace dxcanvas
 
         GraphicsPathSharedPtr graphicsPathFromB2DPolygon( const ::basegfx::B2DPolygon& rPoly, bool bNoLineJoin )
         {
-            GraphicsPathSharedPtr               pRes( new Gdiplus::GraphicsPath() );
-            ::std::vector< Gdiplus::PointF >    aPoints;
+            GraphicsPathSharedPtr 				pRes( new Gdiplus::GraphicsPath() );
+            ::std::vector< Gdiplus::PointF > 	aPoints;
 
             graphicsPathFromB2DPolygon( pRes, aPoints, rPoly, bNoLineJoin );
 
@@ -477,14 +477,14 @@ namespace dxcanvas
 
         GraphicsPathSharedPtr graphicsPathFromB2DPolyPolygon( const ::basegfx::B2DPolyPolygon& rPoly, bool bNoLineJoin )
         {
-            GraphicsPathSharedPtr               pRes( new Gdiplus::GraphicsPath() );
-            ::std::vector< Gdiplus::PointF >    aPoints;
+            GraphicsPathSharedPtr 				pRes( new Gdiplus::GraphicsPath() );
+            ::std::vector< Gdiplus::PointF > 	aPoints;
 
             const sal_uInt32 nPolies( rPoly.count() );
             for( sal_uInt32 nCurrPoly=0; nCurrPoly<nPolies; ++nCurrPoly )
             {
-                graphicsPathFromB2DPolygon( pRes,
-                                            aPoints,
+                graphicsPathFromB2DPolygon( pRes, 
+                                            aPoints, 
                                             rPoly.getB2DPolygon( nCurrPoly ),
                                             bNoLineJoin);
             }
@@ -508,38 +508,38 @@ namespace dxcanvas
         }
 
         bool drawGdiPlusBitmap( const GraphicsSharedPtr& rGraphics,
-                                const BitmapSharedPtr&   rBitmap )
+                                const BitmapSharedPtr&	 rBitmap )
         {
-            Gdiplus::PointF aPoint;
+            Gdiplus::PointF	aPoint;
             return (Gdiplus::Ok == rGraphics->DrawImage( rBitmap.get(),
                                                          aPoint ) );
         }
 
         bool drawDIBits( const GraphicsSharedPtr& rGraphics,
-                         const BITMAPINFO&        rBI,
-                         const void*              pBits )
+                         const BITMAPINFO&		  rBI,
+                         const void*			  pBits )
         {
-            BitmapSharedPtr pBitmap(
-                Gdiplus::Bitmap::FromBITMAPINFO( &rBI,
+            BitmapSharedPtr pBitmap( 
+                Gdiplus::Bitmap::FromBITMAPINFO( &rBI, 
                                                  (void*)pBits ) );
 
             return drawGdiPlusBitmap( rGraphics,
                                       pBitmap );
         }
-
+            
         bool drawRGBABits( const GraphicsSharedPtr& rGraphics,
-                           const RawRGBABitmap&     rRawRGBAData )
+                           const RawRGBABitmap&		rRawRGBAData )
         {
-            BitmapSharedPtr pBitmap( new Gdiplus::Bitmap( rRawRGBAData.mnWidth,
+            BitmapSharedPtr pBitmap( new Gdiplus::Bitmap( rRawRGBAData.mnWidth, 
                                                           rRawRGBAData.mnHeight,
                                                           PixelFormat32bppARGB ) );
-
+            
             Gdiplus::BitmapData aBmpData;
-            aBmpData.Width       = rRawRGBAData.mnWidth;
-            aBmpData.Height      = rRawRGBAData.mnHeight;
-            aBmpData.Stride      = 4*aBmpData.Width; // bottom-up format
+            aBmpData.Width		 = rRawRGBAData.mnWidth;
+            aBmpData.Height		 = rRawRGBAData.mnHeight;
+            aBmpData.Stride 	 = 4*aBmpData.Width; // bottom-up format
             aBmpData.PixelFormat = PixelFormat32bppARGB;
-            aBmpData.Scan0       = rRawRGBAData.mpBitmapData.get();
+            aBmpData.Scan0		 = rRawRGBAData.mpBitmapData.get();
 
             const Gdiplus::Rect aRect( 0,0,aBmpData.Width,aBmpData.Height );
             if( Gdiplus::Ok != pBitmap->LockBits( &aRect,
@@ -549,7 +549,7 @@ namespace dxcanvas
             {
                 return false;
             }
-
+                    
             // commit data to bitmap
             pBitmap->UnlockBits( &aBmpData );
 
@@ -573,8 +573,8 @@ namespace dxcanvas
                 // =================================================
 
                 const geometry::IntegerSize2D aBmpSize( xBitmap->getSize() );
-                BitmapSharedPtr               pBitmap;
-
+                BitmapSharedPtr 			  pBitmap;
+                                                              
                 if( xBitmap->hasAlpha() )
                 {
                     // TODO(P2): At least for the alpha bitmap case, it
@@ -594,10 +594,10 @@ namespace dxcanvas
                                                         aBmpSize.Height,
                                                         PixelFormat24bppRGB ) );
                 }
-
+                
                 GraphicsSharedPtr pGraphics(createGraphicsFromBitmap(pBitmap));
                 tools::setupGraphics(*pGraphics);
-                if( !drawVCLBitmapFromXBitmap(
+                if( !drawVCLBitmapFromXBitmap( 
                         pGraphics,
                         xBitmap) )
                 {
@@ -608,7 +608,7 @@ namespace dxcanvas
             }
         }
 
-        CanvasFont::ImplRef canvasFontFromXFont( const uno::Reference< rendering::XCanvasFont >& xFont )
+        CanvasFont::ImplRef	canvasFontFromXFont( const uno::Reference< rendering::XCanvasFont >& xFont )
         {
             CanvasFont* pCanvasFont = dynamic_cast< CanvasFont* >(xFont.get());
 
@@ -619,15 +619,15 @@ namespace dxcanvas
         }
 
         void setModulateImageAttributes( Gdiplus::ImageAttributes& o_rAttr,
-                                         double                    nRedModulation,
-                                         double                    nGreenModulation,
-                                         double                    nBlueModulation,
-                                         double                    nAlphaModulation )
+                                         double					   nRedModulation,
+                                         double					   nGreenModulation,
+                                         double					   nBlueModulation,
+                                         double					   nAlphaModulation )
         {
-            // This gets rather verbose, but we have to setup a color
+            // This gets rather verbose, but we have to setup a color 
             // transformation matrix, in order to incorporate the global
             // alpha value mfAlpha into the bitmap rendering.
-            Gdiplus::ColorMatrix     aColorMatrix;
+            Gdiplus::ColorMatrix	 aColorMatrix;
 
             aColorMatrix.m[0][0] = static_cast<Gdiplus::REAL>(nRedModulation);
             aColorMatrix.m[0][1] = 0.0;
@@ -660,7 +660,7 @@ namespace dxcanvas
             aColorMatrix.m[4][4] = 1.0;
 
             o_rAttr.SetColorMatrix( &aColorMatrix,
-                                    Gdiplus::ColorMatrixFlagsDefault,
+                                    Gdiplus::ColorMatrixFlagsDefault, 
                                     Gdiplus::ColorAdjustTypeDefault );
         }
 
diff --git a/canvas/source/directx/dx_impltools.hxx b/canvas/source/directx/dx_impltools.hxx
index 6eb0bc415ea5..358e7858015c 100755
--- a/canvas/source/directx/dx_impltools.hxx
+++ b/canvas/source/directx/dx_impltools.hxx
@@ -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
@@ -80,21 +80,21 @@ namespace dxcanvas
 
         void setupGraphics( Gdiplus::Graphics& rGraphics );
 
-        void gdiPlusMatrixFromB2DHomMatrix( Gdiplus::Matrix&        rGdiplusMatrix,
-                                            const ::basegfx::B2DHomMatrix&  rMatrix );
-        void gdiPlusMatrixFromAffineMatrix2D( Gdiplus::Matrix&                          rGdiplusMatrix,
+        void gdiPlusMatrixFromB2DHomMatrix( Gdiplus::Matrix& 		rGdiplusMatrix,
+                                            const ::basegfx::B2DHomMatrix&	rMatrix );
+        void gdiPlusMatrixFromAffineMatrix2D( Gdiplus::Matrix& 							rGdiplusMatrix,
                                               const ::com::sun::star::geometry::AffineMatrix2D& rMatrix );
 
         Gdiplus::PointF gdiPlusPointFFromRealPoint2D( const ::com::sun::star::geometry::RealPoint2D& );
-        Gdiplus::RectF  gdiPlusRectFFromRectangle2D( const ::com::sun::star::geometry::RealRectangle2D& );
-        Gdiplus::Rect   gdiPlusRectFromIntegerRectangle2D( const ::com::sun::star::geometry::IntegerRectangle2D& );
-        RECT            gdiRectFromB2IRect( const ::basegfx::B2IRange& );
+        Gdiplus::RectF 	gdiPlusRectFFromRectangle2D( const ::com::sun::star::geometry::RealRectangle2D& );
+        Gdiplus::Rect 	gdiPlusRectFromIntegerRectangle2D( const ::com::sun::star::geometry::IntegerRectangle2D& );
+        RECT 			gdiRectFromB2IRect( const ::basegfx::B2IRange& );
 
-        ::com::sun::star::geometry::RealPoint2D     realPoint2DFromGdiPlusPointF( const Gdiplus::PointF& );
-        ::com::sun::star::geometry::RealRectangle2D realRectangle2DFromGdiPlusRectF( const Gdiplus::RectF& );
+        ::com::sun::star::geometry::RealPoint2D		realPoint2DFromGdiPlusPointF( const Gdiplus::PointF& );
+        ::com::sun::star::geometry::RealRectangle2D	realRectangle2DFromGdiPlusRectF( const Gdiplus::RectF& );
 
-        ::basegfx::B2DPoint b2dPointFromGdiPlusPointF( const Gdiplus::PointF& );
-        ::basegfx::B2DRange b2dRangeFromGdiPlusRectF( const Gdiplus::RectF& );
+        ::basegfx::B2DPoint	b2dPointFromGdiPlusPointF( const Gdiplus::PointF& );
+        ::basegfx::B2DRange	b2dRangeFromGdiPlusRectF( const Gdiplus::RectF& );
 
         ::com::sun::star::uno::Sequence< double > argbToDoubleSequence( const Gdiplus::ARGB& rColor );
         ::com::sun::star::uno::Sequence< sal_Int8 > argbToIntSequence( const Gdiplus::ARGB& rColor );
@@ -113,22 +113,22 @@ namespace dxcanvas
             bool bNoLineJoin = false);
 
         GraphicsPathSharedPtr graphicsPathFromXPolyPolygon2D(
-            const ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XPolyPolygon2D >&,
+            const ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XPolyPolygon2D >&, 
             bool bNoLineJoin = false );
 
         bool drawGdiPlusBitmap( const GraphicsSharedPtr& rGraphics,
-                                const BitmapSharedPtr&   rBitmap );
+                                const BitmapSharedPtr&	 rBitmap );
         bool drawDIBits( const ::boost::shared_ptr< Gdiplus::Graphics >& rGraphics,
                          const BITMAPINFO&                               rBI,
                          const void*                                     pBits );
 
         bool drawRGBABits( const ::boost::shared_ptr< Gdiplus::Graphics >& rGraphics,
-                           const RawRGBABitmap&                            rRawRGBAData );
+                           const RawRGBABitmap&							   rRawRGBAData );
 
         BitmapSharedPtr bitmapFromXBitmap( const ::com::sun::star::uno::Reference<
-                                                   ::com::sun::star::rendering::XBitmap >&  xBitmap );
+                                                   ::com::sun::star::rendering::XBitmap >&	xBitmap );
 
-        CanvasFont::ImplRef canvasFontFromXFont( const ::com::sun::star::uno::Reference<
+        CanvasFont::ImplRef	canvasFontFromXFont( const ::com::sun::star::uno::Reference<
                                                      ::com::sun::star::rendering::XCanvasFont >& xFont );
 
         void setModulateImageAttributes( Gdiplus::ImageAttributes& o_rAttr,
diff --git a/canvas/source/directx/dx_linepolypolygon.cxx b/canvas/source/directx/dx_linepolypolygon.cxx
index 12bd4e98ae31..3ef4db927544 100755
--- a/canvas/source/directx/dx_linepolypolygon.cxx
+++ b/canvas/source/directx/dx_linepolypolygon.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
@@ -57,7 +57,7 @@ namespace dxcanvas
 
         return mpPath;
     }
-
+    
     void LinePolyPolygon::modifying() const
     {
         mpPath.reset();
diff --git a/canvas/source/directx/dx_linepolypolygon.hxx b/canvas/source/directx/dx_linepolypolygon.hxx
index cb2d76587169..b7813e95d1ed 100755
--- a/canvas/source/directx/dx_linepolypolygon.hxx
+++ b/canvas/source/directx/dx_linepolypolygon.hxx
@@ -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
@@ -48,8 +48,8 @@ namespace dxcanvas
         // overridden, to clear mpPath
         virtual void modifying() const;
 
-        GDIPlusUserSharedPtr            mpGdiPlusUser;
-        mutable GraphicsPathSharedPtr   mpPath;
+        GDIPlusUserSharedPtr			mpGdiPlusUser;
+        mutable GraphicsPathSharedPtr	mpPath;
     };
 }
 
diff --git a/canvas/source/directx/dx_rendermodule.hxx b/canvas/source/directx/dx_rendermodule.hxx
index e6bd8a7b5701..7dd6fa3bc1b9 100755
--- a/canvas/source/directx/dx_rendermodule.hxx
+++ b/canvas/source/directx/dx_rendermodule.hxx
@@ -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
diff --git a/canvas/source/directx/dx_sprite.hxx b/canvas/source/directx/dx_sprite.hxx
index 56c984439f45..f37fb4519610 100755
--- a/canvas/source/directx/dx_sprite.hxx
+++ b/canvas/source/directx/dx_sprite.hxx
@@ -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
diff --git a/canvas/source/directx/dx_spritecanvas.cxx b/canvas/source/directx/dx_spritecanvas.cxx
index 43350287d92a..e9f43c8b1cac 100755
--- a/canvas/source/directx/dx_spritecanvas.cxx
+++ b/canvas/source/directx/dx_spritecanvas.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
@@ -93,7 +93,7 @@ namespace dxcanvas
            5: SystemGraphicsData as a streamed Any
          */
         ENSURE_ARG_OR_THROW( maArguments.getLength() >= 5 &&
-                             maArguments[4].getValueTypeClass() == uno::TypeClass_INTERFACE,
+                             maArguments[4].getValueTypeClass() == uno::TypeClass_INTERFACE, 
                              "VCLSpriteCanvas::initialize: wrong number of arguments, or wrong types" );
 
         uno::Reference< awt::XWindow > xParentWindow;
@@ -103,7 +103,7 @@ namespace dxcanvas
             throw lang::NoSupportException(
                 ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(
                                      "Parent window not VCL window, or canvas out-of-process!")),
-                NULL);
+                NULL);            
 
         awt::Rectangle aRect;
         maArguments[2] >>= aRect;
@@ -177,9 +177,9 @@ namespace dxcanvas
     {
         ::osl::MutexGuard aGuard( m_aMutex );
 
-        return maDeviceHelper.getRenderModule();
+        return maDeviceHelper.getRenderModule(); 
     }
-
+    
     const DXSurfaceBitmapSharedPtr& SpriteCanvas::getBackBuffer() const
     {
         ::osl::MutexGuard aGuard( m_aMutex );
diff --git a/canvas/source/directx/dx_spritecanvas.hxx b/canvas/source/directx/dx_spritecanvas.hxx
index b14d79050ccf..dee7513e45b0 100755
--- a/canvas/source/directx/dx_spritecanvas.hxx
+++ b/canvas/source/directx/dx_spritecanvas.hxx
@@ -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
@@ -64,11 +64,11 @@ namespace dxcanvas
                                               ::com::sun::star::awt::XWindowListener,
                                               ::com::sun::star::util::XUpdatable,
                                               ::com::sun::star::beans::XPropertySet,
-                                              ::com::sun::star::lang::XServiceName >    WindowGraphicDeviceBase_Base;
+                                              ::com::sun::star::lang::XServiceName >	WindowGraphicDeviceBase_Base;
     typedef ::canvas::BufferedGraphicDeviceBase< ::canvas::BaseMutexHelper< WindowGraphicDeviceBase_Base >,
                                                    SpriteDeviceHelper,
                                                    ::osl::MutexGuard,
-                                                   ::cppu::OWeakObject >    SpriteCanvasBase_Base;
+                                                   ::cppu::OWeakObject > 	SpriteCanvasBase_Base;
     /** Mixin SpriteSurface
 
         Have to mixin the SpriteSurface before deriving from
@@ -94,7 +94,7 @@ namespace dxcanvas
     typedef ::canvas::SpriteCanvasBase< SpriteCanvasBaseSpriteSurface_Base,
                                         SpriteCanvasHelper,
                                         ::osl::MutexGuard,
-                                        ::cppu::OWeakObject >           SpriteCanvasBaseT;
+                                        ::cppu::OWeakObject >			SpriteCanvasBaseT;
 
     /** Product of this component's factory.
 
diff --git a/canvas/source/directx/dx_spritecanvashelper.cxx b/canvas/source/directx/dx_spritecanvashelper.cxx
index 211fd5502919..9b93a8e1060b 100755
--- a/canvas/source/directx/dx_spritecanvashelper.cxx
+++ b/canvas/source/directx/dx_spritecanvashelper.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
@@ -33,7 +33,7 @@
 #include <canvas/canvastools.hxx>
 #include <tools/diagnose_ex.h>
 
-#include <comphelper/scopeguard.hxx>
+#include <comphelper/scopeguard.hxx> 
 
 #include <basegfx/range/b2drectangle.hxx>
 #include <basegfx/tools/canvastools.hxx>
@@ -43,7 +43,7 @@
 #include "dx_spritecanvashelper.hxx"
 #include "dx_canvascustomsprite.hxx"
 
-#if defined(DX_DEBUG_IMAGES)
+#if defined(DX_DEBUG_IMAGES) 
 # if OSL_DEBUG_LEVEL > 0
 #  include <imdebug.h>
 #  undef min
@@ -57,9 +57,9 @@ namespace dxcanvas
 {
     namespace
     {
-        void repaintBackground( const ::basegfx::B2DRange&      rUpdateArea,
-                                const ::basegfx::B2IRange&      rOutputArea,
-                                const DXSurfaceBitmapSharedPtr& rBackBuffer )
+        void repaintBackground( const ::basegfx::B2DRange&		rUpdateArea,
+                                const ::basegfx::B2IRange&		rOutputArea,
+                                const DXSurfaceBitmapSharedPtr&	rBackBuffer )
         {
             // TODO(E1): Use numeric_cast to catch overflow here
             ::basegfx::B2IRange aActualArea( 0, 0,
@@ -119,11 +119,11 @@ namespace dxcanvas
     }
 
     void SpriteCanvasHelper::init( SpriteCanvas&                                    rParent,
-                                   ::canvas::SpriteRedrawManager&                   rManager,
-                                   const IDXRenderModuleSharedPtr&                  rRenderModule,
-                                   const ::canvas::ISurfaceProxyManagerSharedPtr&   rSurfaceProxy,
-                                   const DXSurfaceBitmapSharedPtr&                  rBackBuffer,
-                                   const ::basegfx::B2ISize&                        rOutputOffset )
+                                   ::canvas::SpriteRedrawManager&					rManager,
+                                   const IDXRenderModuleSharedPtr&					rRenderModule,
+                                   const ::canvas::ISurfaceProxyManagerSharedPtr&	rSurfaceProxy,
+                                   const DXSurfaceBitmapSharedPtr&					rBackBuffer,
+                                   const ::basegfx::B2ISize&						rOutputOffset )
     {
         // init base
         setDevice( rParent );
@@ -135,7 +135,7 @@ namespace dxcanvas
         mpSurfaceProxy  = rSurfaceProxy;
         mpBackBuffer    = rBackBuffer;
     }
-
+    
     void SpriteCanvasHelper::disposing()
     {
         if(mpRenderModule)
@@ -147,17 +147,17 @@ namespace dxcanvas
         mpSpriteSurface = NULL;
 
         // forward to base
-        CanvasHelper::disposing();
+        CanvasHelper::disposing();        
     }
 
-    uno::Reference< rendering::XAnimatedSprite > SpriteCanvasHelper::createSpriteFromAnimation(
+    uno::Reference< rendering::XAnimatedSprite > SpriteCanvasHelper::createSpriteFromAnimation( 
         const uno::Reference< rendering::XAnimation >& /*animation*/ )
     {
         return uno::Reference< rendering::XAnimatedSprite >();
     }
 
-    uno::Reference< rendering::XAnimatedSprite > SpriteCanvasHelper::createSpriteFromBitmaps(
-        const uno::Sequence< uno::Reference< rendering::XBitmap > >& /*animationBitmaps*/,
+    uno::Reference< rendering::XAnimatedSprite > SpriteCanvasHelper::createSpriteFromBitmaps( 
+        const uno::Sequence< uno::Reference< rendering::XBitmap > >& /*animationBitmaps*/, 
         sal_Int8                                                     /*interpolationMode*/ )
     {
         return uno::Reference< rendering::XAnimatedSprite >();
@@ -168,8 +168,8 @@ namespace dxcanvas
         if( !mpRedrawManager )
             return uno::Reference< rendering::XCustomSprite >(); // we're disposed
 
-        return uno::Reference< rendering::XCustomSprite >(
-            new CanvasCustomSprite( spriteSize,
+        return uno::Reference< rendering::XCustomSprite >( 
+            new CanvasCustomSprite( spriteSize, 
                                     mpSpriteSurface,
                                     mpRenderModule,
                                     mpSurfaceProxy,
@@ -185,7 +185,7 @@ namespace dxcanvas
                                                sal_Bool                       bUpdateAll,
                                                bool&                          io_bSurfaceDirty )
     {
-        if( !mpRedrawManager ||
+        if( !mpRedrawManager || 
             !mpRenderModule ||
             !mpBackBuffer )
         {
@@ -196,7 +196,7 @@ namespace dxcanvas
 # if OSL_DEBUG_LEVEL > 0
         mpBackBuffer->imageDebugger();
 # endif
-#endif
+#endif        
 
         // store current output area (need to tunnel that to the
         // background, scroll, opaque and general sprite repaint
@@ -207,8 +207,8 @@ namespace dxcanvas
         maUpdateRect.reset();
 
         // TODO(P1): Might be worthwile to track areas of background
-        // changes, too.
-
+        // changes, too.        
+        
         // TODO(P2): Might be worthwhile to use page-flipping only if
         // a certain percentage of screen area has changed - and
         // compose directly to the front buffer otherwise.
@@ -258,7 +258,7 @@ namespace dxcanvas
         // change record vector must be cleared, for the next turn of
         // rendering and sprite changing
         mpRedrawManager->clearChangeRecords();
-
+        
         io_bSurfaceDirty = false;
 
         return sal_True;
@@ -275,8 +275,8 @@ namespace dxcanvas
                            mpBackBuffer );
     }
 
-    void SpriteCanvasHelper::scrollUpdate( const ::basegfx::B2DRange&                       /*rMoveStart*/,
-                                           const ::basegfx::B2DRange&                       rMoveEnd,
+    void SpriteCanvasHelper::scrollUpdate( const ::basegfx::B2DRange& 						/*rMoveStart*/, 
+                                           const ::basegfx::B2DRange& 						rMoveEnd,
                                            const ::canvas::SpriteRedrawManager::UpdateArea& rUpdateArea )
     {
         ENSURE_OR_THROW( mpRenderModule &&
@@ -321,11 +321,11 @@ namespace dxcanvas
                                          static_cast<sal_Int32>(maScrapRect.getWidth()),
                                          static_cast<sal_Int32>(maScrapRect.getHeight()) );
         aActualArea.intersect( fround( rUpdateArea.maTotalBounds ) );
-
+        
         // add given update area to the 'blit to foreground' rect
         maUpdateRect.expand( aActualArea );
     }
-
+    
     void SpriteCanvasHelper::opaqueUpdate( const ::basegfx::B2DRange&                          rTotalArea,
                                            const ::std::vector< ::canvas::Sprite::Reference >& rSortedUpdateSprites )
     {
@@ -344,12 +344,12 @@ namespace dxcanvas
         ::basegfx::B2IRange aActualArea( 0, 0,
                                          static_cast<sal_Int32>(maScrapRect.getWidth()),
                                          static_cast<sal_Int32>(maScrapRect.getHeight()) );
-        aActualArea.intersect( fround( rTotalArea ) );
-
+        aActualArea.intersect( fround( rTotalArea ) );        
+        
         // add given update area to the 'blit to foreground' rect
         maUpdateRect.expand( aActualArea );
     }
-
+    
     void SpriteCanvasHelper::genericUpdate( const ::basegfx::B2DRange&                          rTotalArea,
                                             const ::std::vector< ::canvas::Sprite::Reference >& rSortedUpdateSprites )
     {
@@ -375,7 +375,7 @@ namespace dxcanvas
         ::std::for_each( rSortedUpdateSprites.begin(),
                          rSortedUpdateSprites.end(),
                          ::std::ptr_fun( &spriteRedrawStub ) );
-
+        
         // add given update area to the 'blit to foreground' rect
         maUpdateRect.expand( aActualArea );
     }
diff --git a/canvas/source/directx/dx_spritecanvashelper.hxx b/canvas/source/directx/dx_spritecanvashelper.hxx
index 5015818e0c77..79300a87fa0b 100755
--- a/canvas/source/directx/dx_spritecanvashelper.hxx
+++ b/canvas/source/directx/dx_spritecanvashelper.hxx
@@ -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
@@ -52,33 +52,33 @@ namespace dxcanvas
         SpriteCanvasHelper();
 
         void init( SpriteCanvas&                                    rParent,
-                   ::canvas::SpriteRedrawManager&                   rManager,
-                   const IDXRenderModuleSharedPtr&                  rRenderModule,
-                   const ::canvas::ISurfaceProxyManagerSharedPtr&   rSurfaceProxy,
-                   const DXSurfaceBitmapSharedPtr&                  rBackBuffer,
-                   const ::basegfx::B2ISize&                        rOutputOffset );
+                   ::canvas::SpriteRedrawManager&					rManager,
+                   const IDXRenderModuleSharedPtr&					rRenderModule,
+                   const ::canvas::ISurfaceProxyManagerSharedPtr&	rSurfaceProxy,
+                   const DXSurfaceBitmapSharedPtr&					rBackBuffer,
+                   const ::basegfx::B2ISize&						rOutputOffset );
 
         /// Dispose all internal references
         void disposing();
 
         // XSpriteCanvas
         ::com::sun::star::uno::Reference<
-              ::com::sun::star::rendering::XAnimatedSprite >        createSpriteFromAnimation(
+              ::com::sun::star::rendering::XAnimatedSprite > 		createSpriteFromAnimation(
                 const ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XAnimation >& animation );
 
         ::com::sun::star::uno::Reference<
-              ::com::sun::star::rendering::XAnimatedSprite >        createSpriteFromBitmaps(
+              ::com::sun::star::rendering::XAnimatedSprite > 		createSpriteFromBitmaps(
                 const ::com::sun::star::uno::Sequence<
                       ::com::sun::star::uno::Reference<
                             ::com::sun::star::rendering::XBitmap > >& animationBitmaps,
                 sal_Int8                                              interpolationMode );
 
         ::com::sun::star::uno::Reference<
-              ::com::sun::star::rendering::XCustomSprite >      createCustomSprite(
+              ::com::sun::star::rendering::XCustomSprite > 		createCustomSprite(
                 const ::com::sun::star::geometry::RealSize2D& spriteSize );
 
         ::com::sun::star::uno::Reference<
-              ::com::sun::star::rendering::XSprite >                createClonedSprite(
+              ::com::sun::star::rendering::XSprite > 				createClonedSprite(
                 const ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XSprite >& original );
 
         /** Actually perform the screen update
@@ -122,9 +122,9 @@ namespace dxcanvas
             All info necessary, should rMoveStart be partially or
             fully outside the outdev
          */
-        void scrollUpdate( const ::basegfx::B2DRange&                           rMoveStart,
-                           const ::basegfx::B2DRange&                           rMoveEnd,
-                           const ::canvas::SpriteRedrawManager::UpdateArea&     rUpdateArea );
+        void scrollUpdate( const ::basegfx::B2DRange& 							rMoveStart,
+                           const ::basegfx::B2DRange& 							rMoveEnd,
+                           const ::canvas::SpriteRedrawManager::UpdateArea& 	rUpdateArea );
 
         void opaqueUpdate( const ::basegfx::B2DRange&                          rTotalArea,
                            const ::std::vector< ::canvas::Sprite::Reference >& rSortedUpdateSprites );
@@ -137,15 +137,15 @@ namespace dxcanvas
         SpriteCanvas*                                   mpSpriteSurface;
 
         /// Set from the SpriteCanvas: instance coordinating sprite redraw
-        ::canvas::SpriteRedrawManager*                  mpRedrawManager;
+        ::canvas::SpriteRedrawManager*					mpRedrawManager;
 
         /// DX device, handling all low-level rendering
-        IDXRenderModuleSharedPtr                        mpRenderModule;
+        IDXRenderModuleSharedPtr						mpRenderModule;
 
-        ::canvas::ISurfaceProxyManagerSharedPtr         mpSurfaceProxy;
+        ::canvas::ISurfaceProxyManagerSharedPtr			mpSurfaceProxy;
 
         /// Backbuffer, contains the static canvas render output
-        DXSurfaceBitmapSharedPtr                        mpBackBuffer;
+        DXSurfaceBitmapSharedPtr						mpBackBuffer;
 
         /// Completely temporary rect storage (used by sprite repaint)
         mutable ::basegfx::B2IRange                     maUpdateRect;
diff --git a/canvas/source/directx/dx_spritedevicehelper.cxx b/canvas/source/directx/dx_spritedevicehelper.cxx
index 0437634a8d1e..6f2999475131 100644
--- a/canvas/source/directx/dx_spritedevicehelper.cxx
+++ b/canvas/source/directx/dx_spritedevicehelper.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
@@ -65,7 +65,7 @@ namespace dxcanvas
     }
 
     void SpriteDeviceHelper::init( Window&               rWindow,
-                                   SpriteCanvas&         rSpriteCanvas,
+                                   SpriteCanvas&		 rSpriteCanvas,
                                    const awt::Rectangle& rRect,
                                    bool                  /*bFullscreen*/ )
     {
@@ -128,8 +128,8 @@ namespace dxcanvas
     }
 
     uno::Reference< rendering::XBitmap > SpriteDeviceHelper::createCompatibleBitmap(
-        const uno::Reference< rendering::XGraphicDevice >&  /*rDevice*/,
-        const geometry::IntegerSize2D&                      size )
+        const uno::Reference< rendering::XGraphicDevice >& 	/*rDevice*/,
+        const geometry::IntegerSize2D& 						size )
     {
         if( !getDevice() )
             return uno::Reference< rendering::XBitmap >(); // we're disposed
@@ -146,15 +146,15 @@ namespace dxcanvas
     }
 
     uno::Reference< rendering::XVolatileBitmap > SpriteDeviceHelper::createVolatileBitmap(
-        const uno::Reference< rendering::XGraphicDevice >&  /*rDevice*/,
-        const geometry::IntegerSize2D&                      /*size*/ )
+        const uno::Reference< rendering::XGraphicDevice >& 	/*rDevice*/,
+        const geometry::IntegerSize2D& 						/*size*/ )
     {
         return uno::Reference< rendering::XVolatileBitmap >();
     }
 
     uno::Reference< rendering::XBitmap > SpriteDeviceHelper::createCompatibleAlphaBitmap(
-        const uno::Reference< rendering::XGraphicDevice >&  /*rDevice*/,
-        const geometry::IntegerSize2D&                      size )
+        const uno::Reference< rendering::XGraphicDevice >& 	/*rDevice*/,
+        const geometry::IntegerSize2D& 						size )
     {
         if( !getDevice() )
             return uno::Reference< rendering::XBitmap >(); // we're disposed
@@ -171,8 +171,8 @@ namespace dxcanvas
     }
 
     uno::Reference< rendering::XVolatileBitmap > SpriteDeviceHelper::createVolatileAlphaBitmap(
-        const uno::Reference< rendering::XGraphicDevice >&  /*rDevice*/,
-        const geometry::IntegerSize2D&                      /*size*/ )
+        const uno::Reference< rendering::XGraphicDevice >& 	/*rDevice*/,
+        const geometry::IntegerSize2D& 						/*size*/ )
     {
         return uno::Reference< rendering::XVolatileBitmap >();
     }
diff --git a/canvas/source/directx/dx_spritedevicehelper.hxx b/canvas/source/directx/dx_spritedevicehelper.hxx
index f697b246929e..235e01bb8c12 100644
--- a/canvas/source/directx/dx_spritedevicehelper.hxx
+++ b/canvas/source/directx/dx_spritedevicehelper.hxx
@@ -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
@@ -53,7 +53,7 @@ namespace dxcanvas
 
         void init( Window&                                  rWindow,
                    SpriteCanvas&                            rSpriteCanvas,
-                   const ::com::sun::star::awt::Rectangle&  rRect,
+                   const ::com::sun::star::awt::Rectangle&	rRect,
                    bool                                     bFullscreen );
 
         /// Dispose all internal references
@@ -61,28 +61,28 @@ namespace dxcanvas
 
         // partial override XWindowGraphicDevice
         ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XBitmap > createCompatibleBitmap(
-            const ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XGraphicDevice >&  rDevice,
-            const ::com::sun::star::geometry::IntegerSize2D&                                        size );
+            const ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XGraphicDevice >& 	rDevice,
+            const ::com::sun::star::geometry::IntegerSize2D& 										size );
         ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XVolatileBitmap > createVolatileBitmap(
-            const ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XGraphicDevice >&  rDevice,
-            const ::com::sun::star::geometry::IntegerSize2D&                                        size );
+            const ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XGraphicDevice >& 	rDevice,
+            const ::com::sun::star::geometry::IntegerSize2D& 										size );
         ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XBitmap > createCompatibleAlphaBitmap(
-            const ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XGraphicDevice >&  rDevice,
-            const ::com::sun::star::geometry::IntegerSize2D&                                        size );
+            const ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XGraphicDevice >& 	rDevice,
+            const ::com::sun::star::geometry::IntegerSize2D& 										size );
         ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XVolatileBitmap > createVolatileAlphaBitmap(
-            const ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XGraphicDevice >&  rDevice,
-            const ::com::sun::star::geometry::IntegerSize2D&                                        size );
+            const ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XGraphicDevice >& 	rDevice,
+            const ::com::sun::star::geometry::IntegerSize2D& 										size );
 
         sal_Bool hasFullScreenMode(  );
         sal_Bool enterFullScreenMode( sal_Bool bEnter );
 
         ::sal_Int32 createBuffers( ::sal_Int32 nBuffers );
-        void        destroyBuffers(  );
+        void 		destroyBuffers(  );
         ::sal_Bool  showBuffer( bool bIsVisible, ::sal_Bool bUpdateAll );
         ::sal_Bool  switchBuffer( bool bIsVisible, ::sal_Bool bUpdateAll );
 
         const IDXRenderModuleSharedPtr& getRenderModule() const { return mpRenderModule; }
-        const DXSurfaceBitmapSharedPtr& getBackBuffer() const { return mpBackBuffer; }
+        const DXSurfaceBitmapSharedPtr&	getBackBuffer() const { return mpBackBuffer; }
         const ::canvas::ISurfaceProxyManagerSharedPtr &getSurfaceProxy() const { return mpSurfaceProxyManager; }
 
         ::com::sun::star::uno::Any isAccelerated() const;
diff --git a/canvas/source/directx/dx_spritehelper.cxx b/canvas/source/directx/dx_spritehelper.cxx
index d0b0c3e2101e..74ab14ec8d9d 100755
--- a/canvas/source/directx/dx_spritehelper.cxx
+++ b/canvas/source/directx/dx_spritehelper.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
@@ -65,15 +65,15 @@ namespace dxcanvas
         mbShowSpriteBounds( false )
     {
     }
-
-    void SpriteHelper::init( const geometry::RealSize2D&     rSpriteSize,
-                             const SpriteCanvasRef&          rSpriteCanvas,
+    
+    void SpriteHelper::init( const geometry::RealSize2D&	 rSpriteSize,
+                             const SpriteCanvasRef&			 rSpriteCanvas,
                              const IDXRenderModuleSharedPtr& rRenderModule,
-                             const DXSurfaceBitmapSharedPtr  rBitmap,
-                             bool                            bShowSpriteBounds )
+                             const DXSurfaceBitmapSharedPtr	 rBitmap,
+                             bool							 bShowSpriteBounds )
     {
-        ENSURE_OR_THROW( rSpriteCanvas.get() &&
-                          rRenderModule &&
+        ENSURE_OR_THROW( rSpriteCanvas.get() && 
+                          rRenderModule && 
                           rBitmap,
                           "SpriteHelper::init(): Invalid device, sprite canvas or surface" );
 
@@ -138,7 +138,7 @@ namespace dxcanvas
             // background buffer.
 
             // log output pos in device pixel
-            VERBOSE_TRACE( "SpriteHelper::redraw(): output pos is (%f, %f)",
+            VERBOSE_TRACE( "SpriteHelper::redraw(): output pos is (%f, %f)", 
                            rPos.getX(),
                            rPos.getY() );
 
@@ -150,8 +150,8 @@ namespace dxcanvas
             mbTextureDirty   = false;
             io_bSurfaceDirty = false; // state taken, and processed.
 
-            ::basegfx::B2DPolyPolygon   aClipPath; // empty for no clip
-            bool                        bIsClipRectangular( false ); // false, if no
+            ::basegfx::B2DPolyPolygon	aClipPath; // empty for no clip
+            bool						bIsClipRectangular( false ); // false, if no 
                                                                     // clip, or clip
                                                                     // is complex
 
@@ -190,10 +190,10 @@ namespace dxcanvas
                 // apply a simple rect clip
                 // ========================
 
-                ::basegfx::B2DRectangle aClipBounds(
+                ::basegfx::B2DRectangle aClipBounds( 
                     ::basegfx::tools::getRange( aClipPath ) );
                 aClipBounds.intersect( aSourceRect );
-
+                 
                 mpBitmap->draw(fAlpha,rPos,aClipBounds,rTransform);
             }
             else
diff --git a/canvas/source/directx/dx_spritehelper.hxx b/canvas/source/directx/dx_spritehelper.hxx
index b83b8b6a988c..213d68c45a99 100755
--- a/canvas/source/directx/dx_spritehelper.hxx
+++ b/canvas/source/directx/dx_spritehelper.hxx
@@ -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
@@ -75,9 +75,9 @@ namespace dxcanvas
             @param bShowSpriteBounds
             When true, little debug bound rects for sprites are shown
          */
-        void init( const ::com::sun::star::geometry::RealSize2D&    rSpriteSize,
-                   const SpriteCanvasRef&                           rSpriteCanvas,
-                   const IDXRenderModuleSharedPtr&                  rRenderModule,
+        void init( const ::com::sun::star::geometry::RealSize2D&	rSpriteSize,
+                   const SpriteCanvasRef&							rSpriteCanvas,
+                   const IDXRenderModuleSharedPtr&					rRenderModule,
                    const DXSurfaceBitmapSharedPtr                   rBitmap,
                    bool                                             bShowSpriteBounds );
 
@@ -94,13 +94,13 @@ namespace dxcanvas
         void redraw( bool& io_bSurfaceDirty ) const;
 
     private:
-        virtual ::basegfx::B2DPolyPolygon polyPolygonFromXPolyPolygon2D(
+        virtual ::basegfx::B2DPolyPolygon polyPolygonFromXPolyPolygon2D( 
             ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XPolyPolygon2D >& xPoly ) const;
 
         /// Returns true, if the sprite _really_ needs redraw
         bool needRedraw() const;
 
-        SpriteCanvasRef             mpSpriteCanvas;
+        SpriteCanvasRef				mpSpriteCanvas;
 
         DXSurfaceBitmapSharedPtr    mpBitmap;
         mutable bool                mbTextureDirty;  // when true, texture needs update
diff --git a/canvas/source/directx/dx_surfacebitmap.cxx b/canvas/source/directx/dx_surfacebitmap.cxx
index 258c10c4dd5c..85b8ab693cfe 100644
--- a/canvas/source/directx/dx_surfacebitmap.cxx
+++ b/canvas/source/directx/dx_surfacebitmap.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
@@ -39,7 +39,7 @@
 #include <basegfx/matrix/b2dhommatrix.hxx>
 #include <basegfx/range/b2irange.hxx>
 
-#if defined(DX_DEBUG_IMAGES)
+#if defined(DX_DEBUG_IMAGES) 
 # if OSL_DEBUG_LEVEL > 0
 #  include <imdebug.h>
 #  undef min
@@ -135,7 +135,7 @@ namespace dxcanvas
 
         canvas::IColorBuffer::Format DXColorBuffer::getFormat() const
         {
-            return canvas::IColorBuffer::FMT_X8R8G8B8;
+            return canvas::IColorBuffer::FMT_X8R8G8B8; 
         }
 
         //////////////////////////////////////////////////////////////////////////////////
@@ -146,7 +146,7 @@ namespace dxcanvas
         {
         public:
 
-            GDIColorBuffer( const BitmapSharedPtr&      rSurface,
+            GDIColorBuffer( const BitmapSharedPtr&		rSurface,
                             const ::basegfx::B2IVector& rSize ) :
                 mpGDIPlusBitmap(rSurface),
                 maSize(rSize),
@@ -187,7 +187,7 @@ namespace dxcanvas
             {
                 return NULL;
             }
-
+            
             return static_cast<sal_uInt8*>(aBmpData.Scan0);
         }
 
@@ -221,10 +221,10 @@ namespace dxcanvas
     // DXSurfaceBitmap::DXSurfaceBitmap
     //////////////////////////////////////////////////////////////////////////////////
 
-    DXSurfaceBitmap::DXSurfaceBitmap( const ::basegfx::B2IVector&                   rSize,
-                                      const canvas::ISurfaceProxyManagerSharedPtr&  rMgr,
-                                      const IDXRenderModuleSharedPtr&               rRenderModule,
-                                      bool                                          bWithAlpha ) :
+    DXSurfaceBitmap::DXSurfaceBitmap( const ::basegfx::B2IVector&					rSize,
+                                      const canvas::ISurfaceProxyManagerSharedPtr&	rMgr,
+                                      const IDXRenderModuleSharedPtr&				rRenderModule,
+                                      bool											bWithAlpha ) : 
         mpGdiPlusUser( GDIPlusUser::createInstance() ),
         maSize(rSize),
         mpRenderModule(rRenderModule),
@@ -258,11 +258,11 @@ namespace dxcanvas
         // create container for pixel data
         if(mbAlpha)
         {
-            mpGDIPlusBitmap.reset(
-                new Gdiplus::Bitmap(
+            mpGDIPlusBitmap.reset( 
+                new Gdiplus::Bitmap( 
                     maSize.getX(),
                     maSize.getY(),
-                    PixelFormat32bppARGB
+                    PixelFormat32bppARGB 
                     ));
             mpGraphics.reset( tools::createGraphicsFromBitmap(mpGDIPlusBitmap) );
 
@@ -359,18 +359,18 @@ namespace dxcanvas
         const DWORD dwFlags = DDLOCK_NOSYSLOCK|DDLOCK_SURFACEMEMORYPTR|DDLOCK_WAIT|DDLOCK_READONLY;
 
         // lock the directx surface to receive the pointer to the surface memory.
-        if(SUCCEEDED(mpSurface->Lock(NULL,&aSurfaceDesc,dwFlags,NULL)))
+        if(SUCCEEDED(mpSurface->Lock(NULL,&aSurfaceDesc,dwFlags,NULL))) 
         {
             // decide about the format we pass the gdi+, the directx surface is always
             // 32bit, either with or without alpha component.
             Gdiplus::PixelFormat nFormat = hasAlpha() ? PixelFormat32bppARGB : PixelFormat32bppRGB;
 
-            // construct a gdi+ bitmap from the raw pixel data.
+            // construct a gdi+ bitmap from the raw pixel data. 
             pResult.reset(new Gdiplus::Bitmap( maSize.getX(),maSize.getY(),
                                                aSurfaceDesc.lPitch,
                                                nFormat,
                                                (BYTE *)aSurfaceDesc.lpSurface ));
-
+            
             // unlock the directx surface
             mpSurface->Unlock(NULL);
         }
@@ -382,7 +382,7 @@ namespace dxcanvas
             // 32bit, either with or without alpha component.
             Gdiplus::PixelFormat nFormat = hasAlpha() ? PixelFormat32bppARGB : PixelFormat32bppRGB;
 
-            // construct a gdi+ bitmap from the raw pixel data.
+            // construct a gdi+ bitmap from the raw pixel data. 
             pResult.reset(new Gdiplus::Bitmap( maSize.getX(),maSize.getY(),
                                                 aLockedRect.Pitch,
                                                 nFormat,
@@ -481,8 +481,8 @@ namespace dxcanvas
         rtl_fillMemory( &aSurfaceDesc,sizeof(DDSURFACEDESC),0 );
         aSurfaceDesc.dwSize = sizeof(DDSURFACEDESC);
 
-        if( FAILED(mpSurface->Lock( NULL,
-                                    &aSurfaceDesc,
+        if( FAILED(mpSurface->Lock( NULL, 
+                                    &aSurfaceDesc, 
                                     DDLOCK_NOSYSLOCK|DDLOCK_SURFACEMEMORYPTR|DDLOCK_WAIT|DDLOCK_READONLY,
                                     NULL)) )
             return;
@@ -495,7 +495,7 @@ namespace dxcanvas
         if( FAILED(mpSurface->LockRect(&aLockedRect,NULL,D3DLOCK_NOSYSLOCK|D3DLOCK_READONLY)) )
             return;
 
-        imdebug("bgra w=%d h=%d %p", maSize.getX(),
+        imdebug("bgra w=%d h=%d %p", maSize.getX(), 
                 maSize.getY(), aLockedRect.pBits);
         mpSurface->UnlockRect();
 #endif
@@ -507,7 +507,7 @@ namespace dxcanvas
     // DXSurfaceBitmap::getData
     //////////////////////////////////////////////////////////////////////////////////
 
-    uno::Sequence< sal_Int8 > DXSurfaceBitmap::getData( rendering::IntegerBitmapLayout&     /*bitmapLayout*/,
+    uno::Sequence< sal_Int8 > DXSurfaceBitmap::getData( rendering::IntegerBitmapLayout&     /*bitmapLayout*/, 
                                                         const geometry::IntegerRectangle2D& rect )
     {
         if(hasAlpha())
@@ -517,11 +517,11 @@ namespace dxcanvas
             const Gdiplus::Rect aRect( tools::gdiPlusRectFromIntegerRectangle2D( rect ) );
 
             Gdiplus::BitmapData aBmpData;
-            aBmpData.Width       = rect.X2-rect.X1;
-            aBmpData.Height      = rect.Y2-rect.Y1;
-            aBmpData.Stride      = 4*aBmpData.Width;
+            aBmpData.Width		 = rect.X2-rect.X1;
+            aBmpData.Height		 = rect.Y2-rect.Y1;
+            aBmpData.Stride 	 = 4*aBmpData.Width;
             aBmpData.PixelFormat = PixelFormat32bppARGB;
-            aBmpData.Scan0       = aRes.getArray();
+            aBmpData.Scan0		 = aRes.getArray(); 
 
             // TODO(F1): Support more pixel formats natively
 
@@ -562,7 +562,7 @@ namespace dxcanvas
             sal_uInt8 *pSrc = (sal_uInt8 *)((((BYTE *)aSurfaceDesc.lpSurface)+(rect.Y1*aSurfaceDesc.lPitch))+rect.X1);
             sal_uInt8 *pDst = (sal_uInt8 *)aRes.getArray();
             sal_uInt32 nSegmentSizeInBytes = nWidth<<4;
-            for(sal_uInt32 y=0; y<nHeight; ++y)
+            for(sal_uInt32 y=0; y<nHeight; ++y) 
             {
                 rtl_copyMemory(pDst,pSrc,nSegmentSizeInBytes);
                 pDst += nSegmentSizeInBytes;
@@ -578,7 +578,7 @@ namespace dxcanvas
             sal_uInt8 *pSrc = (sal_uInt8 *)((((BYTE *)aLockedRect.pBits)+(rect.Y1*aLockedRect.Pitch))+rect.X1);
             sal_uInt8 *pDst = (sal_uInt8 *)aRes.getArray();
             sal_uInt32 nSegmentSizeInBytes = nWidth<<4;
-            for(sal_uInt32 y=0; y<nHeight; ++y)
+            for(sal_uInt32 y=0; y<nHeight; ++y) 
             {
                 rtl_copyMemory(pDst,pSrc,nSegmentSizeInBytes);
                 pDst += nSegmentSizeInBytes;
@@ -595,20 +595,20 @@ namespace dxcanvas
     // DXSurfaceBitmap::setData
     //////////////////////////////////////////////////////////////////////////////////
 
-    void DXSurfaceBitmap::setData( const uno::Sequence< sal_Int8 >&      data,
-                                   const rendering::IntegerBitmapLayout& /*bitmapLayout*/,
-                                   const geometry::IntegerRectangle2D&   rect )
+    void DXSurfaceBitmap::setData( const uno::Sequence< sal_Int8 >& 	 data, 
+                                   const rendering::IntegerBitmapLayout& /*bitmapLayout*/, 
+                                   const geometry::IntegerRectangle2D& 	 rect )
     {
         if(hasAlpha())
         {
             const Gdiplus::Rect aRect( tools::gdiPlusRectFromIntegerRectangle2D( rect ) );
 
             Gdiplus::BitmapData aBmpData;
-            aBmpData.Width       = rect.X2-rect.X1;
-            aBmpData.Height      = rect.Y2-rect.Y1;
-            aBmpData.Stride      = 4*aBmpData.Width;
+            aBmpData.Width		 = rect.X2-rect.X1;
+            aBmpData.Height		 = rect.Y2-rect.Y1;
+            aBmpData.Stride 	 = 4*aBmpData.Width;
             aBmpData.PixelFormat = PixelFormat32bppARGB;
-            aBmpData.Scan0       = (void*)data.getConstArray();
+            aBmpData.Scan0		 = (void*)data.getConstArray(); 
 
             // TODO(F1): Support more pixel formats natively
 
@@ -644,7 +644,7 @@ namespace dxcanvas
             sal_uInt8 *pSrc = (sal_uInt8 *)data.getConstArray();
             sal_uInt8 *pDst = (sal_uInt8 *)((((BYTE *)aSurfaceDesc.lpSurface)+(rect.Y1*aSurfaceDesc.lPitch))+rect.X1);
             sal_uInt32 nSegmentSizeInBytes = nWidth<<4;
-            for(sal_uInt32 y=0; y<nHeight; ++y)
+            for(sal_uInt32 y=0; y<nHeight; ++y) 
             {
                 rtl_copyMemory(pDst,pSrc,nSegmentSizeInBytes);
                 pSrc += nSegmentSizeInBytes;
@@ -661,7 +661,7 @@ namespace dxcanvas
             sal_uInt8 *pSrc = (sal_uInt8 *)data.getConstArray();
             sal_uInt8 *pDst = (sal_uInt8 *)((((BYTE *)aLockedRect.pBits)+(rect.Y1*aLockedRect.Pitch))+rect.X1);
             sal_uInt32 nSegmentSizeInBytes = nWidth<<4;
-            for(sal_uInt32 y=0; y<nHeight; ++y)
+            for(sal_uInt32 y=0; y<nHeight; ++y) 
             {
                 rtl_copyMemory(pDst,pSrc,nSegmentSizeInBytes);
                 pSrc += nSegmentSizeInBytes;
@@ -679,22 +679,22 @@ namespace dxcanvas
     // DXSurfaceBitmap::setPixel
     //////////////////////////////////////////////////////////////////////////////////
 
-    void DXSurfaceBitmap::setPixel( const uno::Sequence< sal_Int8 >&      color,
-                                    const rendering::IntegerBitmapLayout& /*bitmapLayout*/,
+    void DXSurfaceBitmap::setPixel( const uno::Sequence< sal_Int8 >&      color, 
+                                    const rendering::IntegerBitmapLayout& /*bitmapLayout*/, 
                                     const geometry::IntegerPoint2D&       pos )
     {
         if(hasAlpha())
         {
             const geometry::IntegerSize2D aSize( maSize.getX(),maSize.getY() );
 
-            ENSURE_ARG_OR_THROW( pos.X >= 0 && pos.X < aSize.Width,
+            ENSURE_ARG_OR_THROW( pos.X >= 0 && pos.X < aSize.Width, 
                             "CanvasHelper::setPixel: X coordinate out of bounds" );
-            ENSURE_ARG_OR_THROW( pos.Y >= 0 && pos.Y < aSize.Height,
+            ENSURE_ARG_OR_THROW( pos.Y >= 0 && pos.Y < aSize.Height, 
                             "CanvasHelper::setPixel: Y coordinate out of bounds" );
-            ENSURE_ARG_OR_THROW( color.getLength() > 3,
+            ENSURE_ARG_OR_THROW( color.getLength() > 3, 
                             "CanvasHelper::setPixel: not enough color components" );
 
-            if( Gdiplus::Ok != mpGDIPlusBitmap->SetPixel( pos.X, pos.Y,
+            if( Gdiplus::Ok != mpGDIPlusBitmap->SetPixel( pos.X, pos.Y, 
                                                 Gdiplus::Color( tools::sequenceToArgb( color ))))
             {
                 throw uno::RuntimeException();
@@ -702,11 +702,11 @@ namespace dxcanvas
         }
         else
         {
-            ENSURE_ARG_OR_THROW( pos.X >= 0 && pos.X < maSize.getX(),
+            ENSURE_ARG_OR_THROW( pos.X >= 0 && pos.X < maSize.getX(), 
                             "CanvasHelper::setPixel: X coordinate out of bounds" );
-            ENSURE_ARG_OR_THROW( pos.Y >= 0 && pos.Y < maSize.getY(),
+            ENSURE_ARG_OR_THROW( pos.Y >= 0 && pos.Y < maSize.getY(), 
                             "CanvasHelper::setPixel: Y coordinate out of bounds" );
-            ENSURE_ARG_OR_THROW( color.getLength() > 3,
+            ENSURE_ARG_OR_THROW( color.getLength() > 3, 
                             "CanvasHelper::setPixel: not enough color components" );
 
             Gdiplus::Color aColor(tools::sequenceToArgb(color));
@@ -743,30 +743,30 @@ namespace dxcanvas
     // DXSurfaceBitmap::getPixel
     //////////////////////////////////////////////////////////////////////////////////
 
-    uno::Sequence< sal_Int8 > DXSurfaceBitmap::getPixel( rendering::IntegerBitmapLayout&   /*bitmapLayout*/,
+    uno::Sequence< sal_Int8 > DXSurfaceBitmap::getPixel( rendering::IntegerBitmapLayout&   /*bitmapLayout*/, 
                                                          const geometry::IntegerPoint2D&   pos )
     {
         if(hasAlpha())
         {
             const geometry::IntegerSize2D aSize( maSize.getX(),maSize.getY() );
 
-            ENSURE_ARG_OR_THROW( pos.X >= 0 && pos.X < aSize.Width,
+            ENSURE_ARG_OR_THROW( pos.X >= 0 && pos.X < aSize.Width, 
                             "CanvasHelper::getPixel: X coordinate out of bounds" );
-            ENSURE_ARG_OR_THROW( pos.Y >= 0 && pos.Y < aSize.Height,
+            ENSURE_ARG_OR_THROW( pos.Y >= 0 && pos.Y < aSize.Height, 
                             "CanvasHelper::getPixel: Y coordinate out of bounds" );
 
             Gdiplus::Color aColor;
 
             if( Gdiplus::Ok != mpGDIPlusBitmap->GetPixel( pos.X, pos.Y, &aColor ) )
                 return uno::Sequence< sal_Int8 >();
-
+            
             return tools::argbToIntSequence(aColor.GetValue());
         }
         else
         {
-            ENSURE_ARG_OR_THROW( pos.X >= 0 && pos.X < maSize.getX(),
+            ENSURE_ARG_OR_THROW( pos.X >= 0 && pos.X < maSize.getX(), 
                             "CanvasHelper::getPixel: X coordinate out of bounds" );
-            ENSURE_ARG_OR_THROW( pos.Y >= 0 && pos.Y < maSize.getY(),
+            ENSURE_ARG_OR_THROW( pos.Y >= 0 && pos.Y < maSize.getY(), 
                             "CanvasHelper::getPixel: Y coordinate out of bounds" );
 
 #if DIRECTX_VERSION < 0x0900
@@ -792,7 +792,7 @@ namespace dxcanvas
             Gdiplus::Color aColor(*pDst);
             mpSurface->UnlockRect();
 #endif
-
+            
             return tools::argbToIntSequence(aColor.GetValue());
         }
     }
diff --git a/canvas/source/directx/dx_surfacebitmap.hxx b/canvas/source/directx/dx_surfacebitmap.hxx
index c3f1f9ed9074..ac7f403ad17f 100644
--- a/canvas/source/directx/dx_surfacebitmap.hxx
+++ b/canvas/source/directx/dx_surfacebitmap.hxx
@@ -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
@@ -40,10 +40,10 @@ namespace dxcanvas
     class DXSurfaceBitmap : public IBitmap
     {
     public:
-        DXSurfaceBitmap( const ::basegfx::B2IVector&                    rSize,
-                         const canvas::ISurfaceProxyManagerSharedPtr&   rMgr,
-                         const IDXRenderModuleSharedPtr&                rRenderModule,
-                         bool                                           bWithAlpha );
+        DXSurfaceBitmap( const ::basegfx::B2IVector&					rSize,
+                         const canvas::ISurfaceProxyManagerSharedPtr&	rMgr,
+                         const IDXRenderModuleSharedPtr&				rRenderModule,
+                         bool											bWithAlpha );
 
         bool resize( const ::basegfx::B2IVector& rSize );
         void clear();
@@ -54,41 +54,41 @@ namespace dxcanvas
         virtual ::basegfx::B2IVector      getSize() const;
         virtual bool                      hasAlpha() const;
 
-        COMReference<surface_type>              getSurface() const { return mpSurface; }
+        COMReference<surface_type>				getSurface() const { return mpSurface; }
 
-        bool draw( double                           fAlpha,
-                   const ::basegfx::B2DPoint&       rPos,
-                   const ::basegfx::B2DHomMatrix&   rTransform );
+        bool draw( double							fAlpha,
+                   const ::basegfx::B2DPoint&		rPos,
+                   const ::basegfx::B2DHomMatrix&	rTransform );
 
-        bool draw( const ::basegfx::B2IRange&       rArea );
+        bool draw( const ::basegfx::B2IRange&		rArea );
 
-        bool draw( double                           fAlpha,
-                   const ::basegfx::B2DPoint&       rPos,
-                   const ::basegfx::B2DRange&       rArea,
-                   const ::basegfx::B2DHomMatrix&   rTransform );
+        bool draw( double							fAlpha,
+                   const ::basegfx::B2DPoint&		rPos,
+                   const ::basegfx::B2DRange&		rArea,
+                   const ::basegfx::B2DHomMatrix&	rTransform );
 
-        bool draw( double                           fAlpha,
+        bool draw( double							fAlpha,
                    const ::basegfx::B2DPoint&       rPos,
                    const ::basegfx::B2DPolyPolygon& rClipPoly,
                    const ::basegfx::B2DHomMatrix&   rTransform );
 
         virtual ::com::sun::star::uno::Sequence< sal_Int8 > getData(
-            ::com::sun::star::rendering::IntegerBitmapLayout&       bitmapLayout,
-            const ::com::sun::star::geometry::IntegerRectangle2D&   rect );
+            ::com::sun::star::rendering::IntegerBitmapLayout&		bitmapLayout,
+            const ::com::sun::star::geometry::IntegerRectangle2D&	rect );
 
         virtual void setData(
-            const ::com::sun::star::uno::Sequence< sal_Int8 >&      data,
+            const ::com::sun::star::uno::Sequence< sal_Int8 >&		data,
             const ::com::sun::star::rendering::IntegerBitmapLayout& bitmapLayout,
-            const ::com::sun::star::geometry::IntegerRectangle2D&   rect );
+            const ::com::sun::star::geometry::IntegerRectangle2D&	rect );
 
         virtual void setPixel(
-            const ::com::sun::star::uno::Sequence< sal_Int8 >&      color,
+            const ::com::sun::star::uno::Sequence< sal_Int8 >&		color,
             const ::com::sun::star::rendering::IntegerBitmapLayout& bitmapLayout,
-            const ::com::sun::star::geometry::IntegerPoint2D&       pos );
+            const ::com::sun::star::geometry::IntegerPoint2D&		pos );
 
         virtual ::com::sun::star::uno::Sequence< sal_Int8 > getPixel(
-            ::com::sun::star::rendering::IntegerBitmapLayout&       bitmapLayout,
-            const ::com::sun::star::geometry::IntegerPoint2D&       pos );
+            ::com::sun::star::rendering::IntegerBitmapLayout&		bitmapLayout,
+            const ::com::sun::star::geometry::IntegerPoint2D&		pos );
 
 #ifdef DX_DEBUG_IMAGES
         void imageDebugger();
diff --git a/canvas/source/directx/dx_surfacegraphics.cxx b/canvas/source/directx/dx_surfacegraphics.cxx
index 97a89b7e66cf..b6a487b3bbb9 100755
--- a/canvas/source/directx/dx_surfacegraphics.cxx
+++ b/canvas/source/directx/dx_surfacegraphics.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
@@ -41,7 +41,7 @@ namespace dxcanvas
         {
             COMReference<surface_type> mpSurface;
             HDC                        maHDC;
-
+            
             GraphicsDeleter(const COMReference<surface_type>& rSurface, HDC hdc) :
                 mpSurface(rSurface),
                 maHDC(hdc)
@@ -57,7 +57,7 @@ namespace dxcanvas
 
                 if(mpSurface.is())
                     mpSurface->ReleaseDC( maHDC );
-            }
+            }      
         };
     }
 
diff --git a/canvas/source/directx/dx_surfacegraphics.hxx b/canvas/source/directx/dx_surfacegraphics.hxx
index 29b84ed81670..94fda28870f7 100755
--- a/canvas/source/directx/dx_surfacegraphics.hxx
+++ b/canvas/source/directx/dx_surfacegraphics.hxx
@@ -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
diff --git a/canvas/source/directx/dx_textlayout.cxx b/canvas/source/directx/dx_textlayout.cxx
index 1516b49d1620..4293b4c7144f 100755
--- a/canvas/source/directx/dx_textlayout.cxx
+++ b/canvas/source/directx/dx_textlayout.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
@@ -44,10 +44,10 @@ using namespace ::com::sun::star;
 
 namespace dxcanvas
 {
-    TextLayout::TextLayout( const rendering::StringContext&     aText,
-                            sal_Int8                            nDirection,
-                            sal_Int64                           /*nRandomSeed*/,
-                            const CanvasFont::ImplRef&          rFont ) :
+    TextLayout::TextLayout( const rendering::StringContext& 	aText,
+                            sal_Int8                        	nDirection,
+                            sal_Int64                       	/*nRandomSeed*/,
+                            const CanvasFont::ImplRef&      	rFont ) :
         TextLayout_Base( m_aMutex ),
         maText( aText ),
         maLogicalAdvancements(),
@@ -231,9 +231,9 @@ namespace dxcanvas
     }
 
     bool TextLayout::draw( const GraphicsSharedPtr&                           rGraphics,
-                           const rendering::ViewState&                        rViewState,
-                           const rendering::RenderState&                      rRenderState,
-                           const ::basegfx::B2ISize&                          rOutputOffset,
+                           const rendering::ViewState& 						  rViewState,
+                           const rendering::RenderState& 					  rRenderState,
+                           const ::basegfx::B2ISize& 						  rOutputOffset,
                            const uno::Reference< rendering::XGraphicDevice >& xGraphicDevice,
                            bool                                               bAlphaSurface ) const
     {
diff --git a/canvas/source/directx/dx_textlayout.hxx b/canvas/source/directx/dx_textlayout.hxx
index ca8c6793fe87..3ca6dd96faf4 100755
--- a/canvas/source/directx/dx_textlayout.hxx
+++ b/canvas/source/directx/dx_textlayout.hxx
@@ -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
diff --git a/canvas/source/directx/dx_textlayout_drawhelper.cxx b/canvas/source/directx/dx_textlayout_drawhelper.cxx
index 56ec00e9a648..88f5a5c87fc1 100755
--- a/canvas/source/directx/dx_textlayout_drawhelper.cxx
+++ b/canvas/source/directx/dx_textlayout_drawhelper.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
@@ -74,16 +74,16 @@ namespace dxcanvas
     {
     }
 
-    void TextLayoutDrawHelper::drawText(
+    void TextLayoutDrawHelper::drawText( 
         const GraphicsSharedPtr&                            rGraphics,
-        const ::com::sun::star::rendering::ViewState&       rViewState,
-        const ::com::sun::star::rendering::RenderState&     rRenderState,
-        const ::basegfx::B2ISize&                           rOutputOffset,
-        const ::com::sun::star::rendering::StringContext&   rText,
-        const ::com::sun::star::uno::Sequence< double >&    rLogicalAdvancements,
+        const ::com::sun::star::rendering::ViewState& 		rViewState,
+        const ::com::sun::star::rendering::RenderState& 	rRenderState,
+        const ::basegfx::B2ISize& 							rOutputOffset,
+        const ::com::sun::star::rendering::StringContext& 	rText,
+        const ::com::sun::star::uno::Sequence< double >& 	rLogicalAdvancements,
         const ::com::sun::star::uno::Reference<
-            ::com::sun::star::rendering::XCanvasFont >&     rCanvasFont,
-        const ::com::sun::star::geometry::Matrix2D&         rFontMatrix,
+            ::com::sun::star::rendering::XCanvasFont >& 	rCanvasFont,
+        const ::com::sun::star::geometry::Matrix2D& 		rFontMatrix,
         bool                                                bAlphaSurface )
     {
         HDC hdc = rGraphics->GetHDC();
@@ -237,10 +237,10 @@ namespace dxcanvas
         }
     }
 
-    geometry::RealRectangle2D TextLayoutDrawHelper::queryTextBounds( const rendering::StringContext&                    rText,
-                                                                     const uno::Sequence< double >&                     rLogicalAdvancements,
-                                                                     const uno::Reference< rendering::XCanvasFont >&    rCanvasFont,
-                                                                     const geometry::Matrix2D&                          rFontMatrix )
+    geometry::RealRectangle2D TextLayoutDrawHelper::queryTextBounds( const rendering::StringContext& 					rText,
+                                                                     const uno::Sequence< double >& 					rLogicalAdvancements,
+                                                                     const uno::Reference< rendering::XCanvasFont >&	rCanvasFont,
+                                                                     const geometry::Matrix2D& 							rFontMatrix )
     {
         if(!(rText.Length))
             return geometry::RealRectangle2D();
diff --git a/canvas/source/directx/dx_textlayout_drawhelper.hxx b/canvas/source/directx/dx_textlayout_drawhelper.hxx
index c484867055af..474ffacc0e59 100755
--- a/canvas/source/directx/dx_textlayout_drawhelper.hxx
+++ b/canvas/source/directx/dx_textlayout_drawhelper.hxx
@@ -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
@@ -55,22 +55,22 @@ namespace dxcanvas
 
         // draw text
         void drawText( const boost::shared_ptr<Gdiplus::Graphics>&          rGraphics,
-                       const ::com::sun::star::rendering::ViewState&        rViewState,
-                       const ::com::sun::star::rendering::RenderState&      rRenderState,
-                       const ::basegfx::B2ISize&                            rOutputOffset,
-                       const ::com::sun::star::rendering::StringContext&    rText,
-                       const ::com::sun::star::uno::Sequence< double >&     rLogicalAdvancements,
+                       const ::com::sun::star::rendering::ViewState& 		rViewState,
+                       const ::com::sun::star::rendering::RenderState& 		rRenderState,
+                       const ::basegfx::B2ISize& 							rOutputOffset,
+                       const ::com::sun::star::rendering::StringContext& 	rText,
+                       const ::com::sun::star::uno::Sequence< double >& 	rLogicalAdvancements,
                        const ::com::sun::star::uno::Reference<
-                               ::com::sun::star::rendering::XCanvasFont >&  rCanvasFont,
-                       const ::com::sun::star::geometry::Matrix2D&          rFontMatrix,
+                               ::com::sun::star::rendering::XCanvasFont >& 	rCanvasFont,
+                       const ::com::sun::star::geometry::Matrix2D& 			rFontMatrix,
                        bool                                                 bAlphaSurface );
 
         ::com::sun::star::geometry::RealRectangle2D queryTextBounds(
-            const ::com::sun::star::rendering::StringContext&   rText,
-            const ::com::sun::star::uno::Sequence< double >&    rLogicalAdvancements,
+            const ::com::sun::star::rendering::StringContext& 	rText,
+            const ::com::sun::star::uno::Sequence< double >& 	rLogicalAdvancements,
             const ::com::sun::star::uno::Reference<
-                ::com::sun::star::rendering::XCanvasFont >&     rCanvasFont,
-              const ::com::sun::star::geometry::Matrix2D&       rFontMatrix );
+                ::com::sun::star::rendering::XCanvasFont >&		rCanvasFont,
+              const ::com::sun::star::geometry::Matrix2D& 		rFontMatrix );
 
 #ifdef DBG_UTIL
         void test();
@@ -78,7 +78,7 @@ namespace dxcanvas
 
     protected:
         ::com::sun::star::uno::Reference<
-              ::com::sun::star::rendering::XGraphicDevice > mxGraphicDevice;
+              ::com::sun::star::rendering::XGraphicDevice >	mxGraphicDevice;
     };
 }
 
diff --git a/canvas/source/directx/dx_vcltools.cxx b/canvas/source/directx/dx_vcltools.cxx
index c48931b87eae..ef6e9e2ce2f2 100755
--- a/canvas/source/directx/dx_vcltools.cxx
+++ b/canvas/source/directx/dx_vcltools.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
@@ -69,30 +69,30 @@ namespace dxcanvas
                             return 1L << rBIH.biBitCount;
                     }
                 }
-                else
+                else 
                 {
                     BITMAPCOREHEADER* pCoreHeader = (BITMAPCOREHEADER*)&rBIH;
 
                     if( pCoreHeader->bcBitCount <= 8 )
                         return 1L << pCoreHeader->bcBitCount;
                 }
-
+                
                 return 0; // nothing known
             }
 
             /// Draw DI bits to given Graphics
-            bool drawDIBits( const ::boost::shared_ptr< Gdiplus::Graphics >& rGraphics,
-                             const void*                                     hDIB )
+            bool drawDIBits( const ::boost::shared_ptr< Gdiplus::Graphics >& rGraphics, 
+                             const void* 									 hDIB )
             {
-                bool            bRet( false );
+                bool 			bRet( false );
                 BitmapSharedPtr pBitmap;
 
                 const BITMAPINFO* pBI = (BITMAPINFO*)GlobalLock( (HGLOBAL)hDIB );
 
                 if( pBI )
                 {
-                    const BITMAPINFOHEADER* pBIH = (BITMAPINFOHEADER*)pBI;
-                    const BYTE*             pBits = (BYTE*) pBI + *(DWORD*)pBI +
+                    const BITMAPINFOHEADER*	pBIH = (BITMAPINFOHEADER*)pBI;
+                    const BYTE*				pBits = (BYTE*) pBI + *(DWORD*)pBI +
                         calcDIBColorCount( *pBIH ) * sizeof( RGBQUAD );
 
                     // forward to outsourced GDI+ rendering method
@@ -111,8 +111,8 @@ namespace dxcanvas
                 Reference to bitmap. Might get modified, in such a way
                 that it will hold a DIB after a successful function call.
              */
-            bool drawVCLBitmap( const ::boost::shared_ptr< Gdiplus::Graphics >& rGraphics,
-                                ::Bitmap&                                       rBmp )
+            bool drawVCLBitmap( const ::boost::shared_ptr< Gdiplus::Graphics >&	rGraphics, 
+                                ::Bitmap& 										rBmp )
             {
                 BitmapSystemData aBmpSysData;
 
@@ -171,15 +171,15 @@ namespace dxcanvas
                 const ::Size aBmpSize( rBmpEx.GetSizePixel() );
 
                 RawRGBABitmap aBmpData;
-                aBmpData.mnWidth     = aBmpSize.Width();
-                aBmpData.mnHeight    = aBmpSize.Height();
+                aBmpData.mnWidth	 = aBmpSize.Width();
+                aBmpData.mnHeight	 = aBmpSize.Height();
                 aBmpData.mpBitmapData.reset( new sal_uInt8[ 4*aBmpData.mnWidth*aBmpData.mnHeight ] );
 
                 Bitmap aBitmap( rBmpEx.GetBitmap() );
 
                 ScopedBitmapReadAccess pReadAccess( aBitmap.AcquireReadAccess(),
                                                     aBitmap );
-
+                    
                 const sal_Int32 nWidth( aBmpSize.Width() );
                 const sal_Int32 nHeight( aBmpSize.Height() );
 
@@ -196,14 +196,14 @@ namespace dxcanvas
 
                     // By convention, the access buffer always has
                     // one of the following formats:
-                    //
+                    // 
                     //    BMP_FORMAT_1BIT_MSB_PAL
-                    //    BMP_FORMAT_4BIT_MSN_PAL
-                    //    BMP_FORMAT_8BIT_PAL
-                    //    BMP_FORMAT_16BIT_TC_LSB_MASK
-                    //    BMP_FORMAT_24BIT_TC_BGR
-                    //    BMP_FORMAT_32BIT_TC_MASK
-                    //
+                    //	  BMP_FORMAT_4BIT_MSN_PAL
+                    //	  BMP_FORMAT_8BIT_PAL
+                    //	  BMP_FORMAT_16BIT_TC_LSB_MASK
+                    //	  BMP_FORMAT_24BIT_TC_BGR
+                    //	  BMP_FORMAT_32BIT_TC_MASK
+                    // 
                     // and is always BMP_FORMAT_BOTTOM_UP
                     //
                     // This is the way
@@ -219,11 +219,11 @@ namespace dxcanvas
                                       "::dxcanvas::tools::bitmapFromVCLBitmapEx(): "
                                       "Unsupported alpha scanline format" );
 
-                    BitmapColor     aCol;
+                    BitmapColor		aCol;
                     const sal_Int32 nWidth( aBmpSize.Width() );
                     const sal_Int32 nHeight( aBmpSize.Height() );
-                    sal_uInt8*      pCurrOutput( aBmpData.mpBitmapData.get() );
-                    int             x, y;
+                    sal_uInt8* 		pCurrOutput( aBmpData.mpBitmapData.get() );
+                    int 			x, y;
 
                     for( y=0; y<nHeight; ++y )
                     {
@@ -339,14 +339,14 @@ namespace dxcanvas
 
                     // By convention, the access buffer always has
                     // one of the following formats:
-                    //
+                    // 
                     //    BMP_FORMAT_1BIT_MSB_PAL
-                    //    BMP_FORMAT_4BIT_MSN_PAL
-                    //    BMP_FORMAT_8BIT_PAL
-                    //    BMP_FORMAT_16BIT_TC_LSB_MASK
-                    //    BMP_FORMAT_24BIT_TC_BGR
-                    //    BMP_FORMAT_32BIT_TC_MASK
-                    //
+                    //	  BMP_FORMAT_4BIT_MSN_PAL
+                    //	  BMP_FORMAT_8BIT_PAL
+                    //	  BMP_FORMAT_16BIT_TC_LSB_MASK
+                    //	  BMP_FORMAT_24BIT_TC_BGR
+                    //	  BMP_FORMAT_32BIT_TC_MASK
+                    // 
                     // and is always BMP_FORMAT_BOTTOM_UP
                     //
                     // This is the way
@@ -361,12 +361,12 @@ namespace dxcanvas
                                       "::dxcanvas::tools::bitmapFromVCLBitmapEx(): "
                                       "Unsupported mask scanline format" );
 
-                    BitmapColor     aCol;
-                    int             nCurrBit;
-                    const int       nMask( 1L );
-                    const int       nInitialBit(7);
-                    sal_uInt8*      pCurrOutput( aBmpData.mpBitmapData.get() );
-                    int             x, y;
+                    BitmapColor		aCol;
+                    int 			nCurrBit;
+                    const int		nMask( 1L );
+                    const int 		nInitialBit(7);
+                    sal_uInt8* 		pCurrOutput( aBmpData.mpBitmapData.get() );
+                    int 			x, y;
 
                     // mapping table, to get from mask index color to
                     // alpha value (which depends on the mask's palette)
@@ -442,7 +442,7 @@ namespace dxcanvas
                                 for( x=0, nCurrBit=nInitialBit; x<nWidth; ++x )
                                 {
                                     // yes. x and y are swapped on Get/SetPixel
-                                    aCol = pReadAccess->GetColor(y,x);
+                                    aCol = pReadAccess->GetColor(y,x);                            
 
                                     // store as RGBA
                                     *pCurrOutput++ = aCol.GetBlue();
@@ -487,10 +487,10 @@ namespace dxcanvas
                 return aBmpData;
             }
 
-            bool drawVCLBitmapEx( const ::boost::shared_ptr< Gdiplus::Graphics >& rGraphics,
-                                  const ::BitmapEx&                               rBmpEx )
+            bool drawVCLBitmapEx( const ::boost::shared_ptr< Gdiplus::Graphics >& rGraphics, 
+                                  const ::BitmapEx& 							  rBmpEx )
             {
-                if( !rBmpEx.IsTransparent() )
+                if( !rBmpEx.IsTransparent() ) 
                 {
                     Bitmap aBmp( rBmpEx.GetBitmap() );
                     return drawVCLBitmap( rGraphics, aBmp );
@@ -503,11 +503,11 @@ namespace dxcanvas
             }
         }
 
-        bool drawVCLBitmapFromXBitmap( const ::boost::shared_ptr< Gdiplus::Graphics >& rGraphics,
-                                       const uno::Reference< rendering::XBitmap >&     xBitmap )
+        bool drawVCLBitmapFromXBitmap( const ::boost::shared_ptr< Gdiplus::Graphics >& rGraphics, 
+                                       const uno::Reference< rendering::XBitmap >&	   xBitmap )
         {
             // TODO(F2): add support for floating point bitmap formats
-            uno::Reference< rendering::XIntegerReadOnlyBitmap > xIntBmp(
+            uno::Reference< rendering::XIntegerReadOnlyBitmap > xIntBmp( 
                 xBitmap, uno::UNO_QUERY );
 
             if( !xIntBmp.is() )
diff --git a/canvas/source/directx/dx_vcltools.hxx b/canvas/source/directx/dx_vcltools.hxx
index fab96cb79e5a..2c479873bb70 100755
--- a/canvas/source/directx/dx_vcltools.hxx
+++ b/canvas/source/directx/dx_vcltools.hxx
@@ -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
@@ -50,13 +50,13 @@ namespace dxcanvas
         */
         struct RawRGBABitmap
         {
-            sal_Int32                           mnWidth;
-            sal_Int32                           mnHeight;
-            ::boost::shared_ptr< sal_uInt8 >    mpBitmapData;
+            sal_Int32							mnWidth;
+            sal_Int32							mnHeight;
+            ::boost::shared_ptr< sal_uInt8 >	mpBitmapData;
         };
 
-        bool drawVCLBitmapFromXBitmap( const ::boost::shared_ptr< Gdiplus::Graphics >& rGraphics,
-                                       const ::com::sun::star::uno::Reference<
+        bool drawVCLBitmapFromXBitmap( const ::boost::shared_ptr< Gdiplus::Graphics >& rGraphics, 
+                                       const ::com::sun::star::uno::Reference< 
                                              ::com::sun::star::rendering::XBitmap >&   xBitmap );
     }
 }
diff --git a/canvas/source/directx/dx_winstuff.hxx b/canvas/source/directx/dx_winstuff.hxx
index d1718b07f3d1..1c3841bdae09 100755
--- a/canvas/source/directx/dx_winstuff.hxx
+++ b/canvas/source/directx/dx_winstuff.hxx
@@ -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
@@ -84,9 +84,14 @@
 
 #else
 
+    #include <dxsdkver.h>
     #include <d3d9.h>
     #include <d3dx9.h>
-//  #include <dxerr9.h>     #i107614# removing include, it has been changed in the latest sdk fron August2009 from dxerr9.h into dxerr.h
+    #if _DXSDK_BUILD_MAJOR < 1734 /* Earlier than the August 2009 DXSDK */
+        #include <dxerr9.h>
+    #else
+        #include <dxerr.h>
+    #endif
 
     typedef IDirect3DSurface9 surface_type;
 
@@ -111,13 +116,13 @@ using ::std::min;
 namespace dxcanvas
 {
     // some shared pointer typedefs to Gdiplus objects
-    typedef ::boost::shared_ptr< Gdiplus::Graphics >        GraphicsSharedPtr;
-    typedef ::boost::shared_ptr< Gdiplus::GraphicsPath >    GraphicsPathSharedPtr;
-    typedef ::boost::shared_ptr< Gdiplus::Bitmap >          BitmapSharedPtr;
-    typedef ::boost::shared_ptr< Gdiplus::CachedBitmap >    CachedBitmapSharedPtr;
-    typedef ::boost::shared_ptr< Gdiplus::Font >            FontSharedPtr;
-    typedef ::boost::shared_ptr< Gdiplus::Brush >           BrushSharedPtr;
-    typedef ::boost::shared_ptr< Gdiplus::TextureBrush >    TextureBrushSharedPtr;
+    typedef ::boost::shared_ptr< Gdiplus::Graphics > 		GraphicsSharedPtr;
+    typedef ::boost::shared_ptr< Gdiplus::GraphicsPath > 	GraphicsPathSharedPtr;
+    typedef ::boost::shared_ptr< Gdiplus::Bitmap > 			BitmapSharedPtr;
+    typedef ::boost::shared_ptr< Gdiplus::CachedBitmap > 	CachedBitmapSharedPtr;
+    typedef ::boost::shared_ptr< Gdiplus::Font > 			FontSharedPtr;
+    typedef ::boost::shared_ptr< Gdiplus::Brush > 			BrushSharedPtr;
+    typedef ::boost::shared_ptr< Gdiplus::TextureBrush > 	TextureBrushSharedPtr;
 
     /** COM object RAII wrapper
 
@@ -190,13 +195,13 @@ namespace dxcanvas
             return refcount;
         }
 
-        bool        is() const { return mp != NULL; }
+        bool		is() const { return mp != NULL; }
         T*          get() const { return mp; }
         T*          operator->() const { return mp; }
         T&          operator*() const { return *mp; }
 
     private:
-        T*  mp;
+        T*	mp;
     };
 
     // get_pointer() enables boost::mem_fn to recognize COMReference
diff --git a/canvas/source/factory/cf_service.cxx b/canvas/source/factory/cf_service.cxx
index f949016d9f83..0d78e598be99 100644
--- a/canvas/source/factory/cf_service.cxx
+++ b/canvas/source/factory/cf_service.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
@@ -57,7 +57,7 @@ using namespace ::com::sun::star;
 using namespace ::com::sun::star::uno;
 using ::rtl::OUString;
 
-namespace
+namespace 
 {
 
 OUString SAL_CALL getImplName()
@@ -94,7 +94,7 @@ class CanvasFactory
     mutable bool                      m_bCacheHasUseAcceleratedEntry;
     mutable bool                      m_bCacheHasUseAAEntry;
 
-    void checkConfigFlag( bool& r_bFlag,
+    void checkConfigFlag( bool& r_bFlag, 
                           bool& r_CacheFlag,
                           const OUString& nodeName ) const;
     Reference<XInterface> use(
@@ -149,7 +149,7 @@ CanvasFactory::CanvasFactory( Reference<XComponentContext> const & xContext ) :
     m_bCacheHasUseAcceleratedEntry(),
     m_bCacheHasUseAAEntry()
 {
-    try
+    try 
     {
         // read out configuration for preferred services:
         Reference<lang::XMultiServiceFactory> xConfigProvider(
@@ -166,10 +166,10 @@ CanvasFactory::CanvasFactory( Reference<XComponentContext> const & xContext ) :
         m_xCanvasConfigNameAccess.set(
             xConfigProvider->createInstanceWithArguments(
                 OUSTR("com.sun.star.configuration.ConfigurationAccess"),
-                Sequence<Any>( &propValue, 1 ) ),
+                Sequence<Any>( &propValue, 1 ) ), 
             UNO_QUERY_THROW );
 
-        propValue = makeAny(
+        propValue = makeAny( 
             beans::PropertyValue(
                 OUSTR("nodepath"), -1,
                 makeAny( OUSTR("/org.openoffice.Office.Canvas/CanvasServiceList") ),
@@ -188,7 +188,7 @@ CanvasFactory::CanvasFactory( Reference<XComponentContext> const & xContext ) :
         while( pCurr != pEnd )
         {
             Reference<container::XNameAccess> xEntryNameAccess(
-                xHierarchicalNameAccess->getByHierarchicalName(*pCurr),
+                xHierarchicalNameAccess->getByHierarchicalName(*pCurr), 
                 UNO_QUERY );
 
             if( xEntryNameAccess.is() )
@@ -205,11 +205,11 @@ CanvasFactory::CanvasFactory( Reference<XComponentContext> const & xContext ) :
             ++pCurr;
         }
     }
-    catch (RuntimeException &)
+    catch (RuntimeException &) 
     {
         throw;
     }
-    catch (Exception&)
+    catch (Exception&) 
     {
     }
 
@@ -221,7 +221,7 @@ CanvasFactory::CanvasFactory( Reference<XComponentContext> const & xContext ) :
         aServices[0] = OUSTR("com.sun.star.comp.rendering.Canvas.VCL");
         m_aAvailableImplementations.push_back( std::make_pair(OUSTR("com.sun.star.rendering.Canvas"),
                                                               aServices) );
-
+        
         aServices[0] = OUSTR("com.sun.star.comp.rendering.SpriteCanvas.VCL");
         m_aAvailableImplementations.push_back( std::make_pair(OUSTR("com.sun.star.rendering.SpriteCanvas"),
                                                               aServices) );
@@ -285,25 +285,25 @@ Reference<XInterface> CanvasFactory::createInstanceWithContext(
 //______________________________________________________________________________
 Reference<XInterface> CanvasFactory::use(
     OUString const & serviceName,
-    Sequence<Any> const & args,
+    Sequence<Any> const & args, 
     Reference<XComponentContext> const & xContext ) const
 {
     try {
         return m_xContext->getServiceManager()->createInstanceWithArgumentsAndContext(
             serviceName, args, xContext);
     }
-    catch (RuntimeException &)
+    catch (RuntimeException &) 
     {
         throw;
     }
-    catch (Exception &)
+    catch (Exception &) 
     {
         return Reference<XInterface>();
     }
 }
 
 //______________________________________________________________________________
-void CanvasFactory::checkConfigFlag( bool& r_bFlag,
+void CanvasFactory::checkConfigFlag( bool& r_bFlag, 
                                      bool& r_CacheFlag,
                                      const OUString& nodeName ) const
 {
@@ -330,28 +330,28 @@ Reference<XInterface> CanvasFactory::lookupAndUse(
 
     // forcing last entry from impl list, if config flag set
     bool bForceLastEntry(false);
-    checkConfigFlag( bForceLastEntry,
+    checkConfigFlag( bForceLastEntry, 
                      m_bCacheHasForcedLastImpl,
                      OUSTR("ForceSafeServiceImpl") );
-
+    
     // use anti-aliasing canvas, if config flag set (or not existing)
     bool bUseAAEntry(true);
     checkConfigFlag( bUseAAEntry,
                      m_bCacheHasUseAAEntry,
                      OUSTR("UseAntialiasingCanvas") );
-
+    
     // use accelerated canvas, if config flag set (or not existing)
     bool bUseAcceleratedEntry(true);
     checkConfigFlag( bUseAcceleratedEntry,
                      m_bCacheHasUseAcceleratedEntry,
                      OUSTR("UseAcceleratedCanvas") );
-
+    
     // try to reuse last working implementation for given service name
     const CacheVector::iterator aEnd(m_aCachedImplementations.end());
     CacheVector::iterator aMatch;
-    if( (aMatch=std::find_if(m_aCachedImplementations.begin(),
-                             aEnd,
-                             boost::bind(&OUString::equals,
+    if( (aMatch=std::find_if(m_aCachedImplementations.begin(), 
+                             aEnd, 
+                             boost::bind(&OUString::equals, 
                                          boost::cref(serviceName),
                                          boost::bind(
                                              std::select1st<CachePair>(),
@@ -365,9 +365,9 @@ Reference<XInterface> CanvasFactory::lookupAndUse(
     // lookup in available service list
     const AvailVector::const_iterator aAvailEnd(m_aAvailableImplementations.end());
     AvailVector::const_iterator aAvailImplsMatch;
-    if( (aAvailImplsMatch=std::find_if(m_aAvailableImplementations.begin(),
-                                       aAvailEnd,
-                                       boost::bind(&OUString::equals,
+    if( (aAvailImplsMatch=std::find_if(m_aAvailableImplementations.begin(), 
+                                       aAvailEnd, 
+                                       boost::bind(&OUString::equals, 
                                                    boost::cref(serviceName),
                                                    boost::bind(
                                                        std::select1st<AvailPair>(),
@@ -378,9 +378,9 @@ Reference<XInterface> CanvasFactory::lookupAndUse(
 
     const AvailVector::const_iterator aAAEnd(m_aAAImplementations.end());
     AvailVector::const_iterator aAAImplsMatch;
-    if( (aAAImplsMatch=std::find_if(m_aAAImplementations.begin(),
-                                    aAAEnd,
-                                    boost::bind(&OUString::equals,
+    if( (aAAImplsMatch=std::find_if(m_aAAImplementations.begin(), 
+                                    aAAEnd, 
+                                    boost::bind(&OUString::equals, 
                                                 boost::cref(serviceName),
                                                 boost::bind(
                                                     std::select1st<AvailPair>(),
@@ -391,9 +391,9 @@ Reference<XInterface> CanvasFactory::lookupAndUse(
 
     const AvailVector::const_iterator aAccelEnd(m_aAcceleratedImplementations.end());
     AvailVector::const_iterator aAccelImplsMatch;
-    if( (aAccelImplsMatch=std::find_if(m_aAcceleratedImplementations.begin(),
-                                       aAccelEnd,
-                                       boost::bind(&OUString::equals,
+    if( (aAccelImplsMatch=std::find_if(m_aAcceleratedImplementations.begin(), 
+                                       aAccelEnd, 
+                                       boost::bind(&OUString::equals, 
                                                    boost::cref(serviceName),
                                                    boost::bind(
                                                        std::select1st<AvailPair>(),
@@ -418,7 +418,7 @@ Reference<XInterface> CanvasFactory::lookupAndUse(
     if( bForceLastEntry )
         pCurrImpl = pEndImpl-1;
 
-    while( pCurrImpl != pEndImpl )
+    while( pCurrImpl != pEndImpl ) 
     {
         const OUString aCurrName(pCurrImpl->trim());
 
@@ -427,7 +427,7 @@ Reference<XInterface> CanvasFactory::lookupAndUse(
         const bool bIsAcceleratedImpl(
             std::find_if(pFirstAccelImpl,
                          pEndAccelImpl,
-                         boost::bind(&OUString::equals,
+                         boost::bind(&OUString::equals, 
                                      boost::cref(aCurrName),
                                      boost::bind(
                                          &OUString::trim,
@@ -438,7 +438,7 @@ Reference<XInterface> CanvasFactory::lookupAndUse(
         const bool bIsAAImpl(
             std::find_if(pFirstAAImpl,
                          pEndAAImpl,
-                         boost::bind(&OUString::equals,
+                         boost::bind(&OUString::equals, 
                                      boost::cref(aCurrName),
                                      boost::bind(
                                          &OUString::trim,
@@ -455,7 +455,7 @@ Reference<XInterface> CanvasFactory::lookupAndUse(
             Reference<XInterface> xCanvas(
                 use( pCurrImpl->trim(), args, xContext ) );
 
-            if(xCanvas.is())
+            if(xCanvas.is()) 
             {
                 if( aMatch != aEnd )
                 {
@@ -466,7 +466,7 @@ Reference<XInterface> CanvasFactory::lookupAndUse(
                 else
                 {
                     // new service name, add new cache entry
-                    m_aCachedImplementations.push_back(std::make_pair(serviceName,
+                    m_aCachedImplementations.push_back(std::make_pair(serviceName, 
                                                                       pCurrImpl->trim()));
                 }
 
diff --git a/canvas/source/null/null_canvasbitmap.cxx b/canvas/source/null/null_canvasbitmap.cxx
index 9bd2058a6d74..3af293baa81c 100644
--- a/canvas/source/null/null_canvasbitmap.cxx
+++ b/canvas/source/null/null_canvasbitmap.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
@@ -77,7 +77,7 @@ namespace nullcanvas
     {
         uno::Sequence< ::rtl::OUString > aRet(1);
         aRet[0] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM ( SERVICE_NAME ) );
-
+        
         return aRet;
     }
 
diff --git a/canvas/source/null/null_canvasbitmap.hxx b/canvas/source/null/null_canvasbitmap.hxx
index 3fa0c15cd314..dc13e1c160b5 100644
--- a/canvas/source/null/null_canvasbitmap.hxx
+++ b/canvas/source/null/null_canvasbitmap.hxx
@@ -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
@@ -51,11 +51,11 @@ namespace nullcanvas
 {
     typedef ::cppu::WeakComponentImplHelper3< ::com::sun::star::rendering::XBitmapCanvas,
                                               ::com::sun::star::rendering::XIntegerBitmap,
-                                               ::com::sun::star::lang::XServiceInfo >   CanvasBitmapBase_Base;
-    typedef ::canvas::IntegerBitmapBase< ::canvas::BaseMutexHelper< CanvasBitmapBase_Base >,
-                                         CanvasHelper,
+                                               ::com::sun::star::lang::XServiceInfo >  	CanvasBitmapBase_Base;
+    typedef ::canvas::IntegerBitmapBase< ::canvas::BaseMutexHelper< CanvasBitmapBase_Base >, 
+                                         CanvasHelper, 
                                          ::osl::MutexGuard,
-                                         ::cppu::OWeakObject >                          CanvasBitmap_Base;
+                                         ::cppu::OWeakObject >							CanvasBitmap_Base;
 
     class CanvasBitmap : public CanvasBitmap_Base,
                          private UsageCounter< CanvasBitmap >
@@ -65,7 +65,7 @@ namespace nullcanvas
 
             @param rSize
             Size of the bitmap
-
+        
             @param rDevice
             Reference device, with which bitmap should be compatible
          */
@@ -83,7 +83,7 @@ namespace nullcanvas
 
     private:
         /** MUST hold here, too, since CanvasHelper only contains a
-            raw pointer (without refcounting)
+            raw pointer (without refcounting) 
         */
         DeviceRef               mpDevice;
     };
diff --git a/canvas/source/null/null_canvascustomsprite.cxx b/canvas/source/null/null_canvascustomsprite.cxx
index 9c45c50954f9..9b6047318261 100644
--- a/canvas/source/null/null_canvascustomsprite.cxx
+++ b/canvas/source/null/null_canvascustomsprite.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
@@ -48,7 +48,7 @@ using namespace ::com::sun::star;
 
 namespace nullcanvas
 {
-    CanvasCustomSprite::CanvasCustomSprite( const ::com::sun::star::geometry::RealSize2D&   rSpriteSize,
+    CanvasCustomSprite::CanvasCustomSprite( const ::com::sun::star::geometry::RealSize2D& 	rSpriteSize,
                                             const SpriteCanvasRef&                          rRefDevice ) :
         mpSpriteCanvas( rRefDevice )
     {
@@ -64,7 +64,7 @@ namespace nullcanvas
         maSpriteHelper.init( rSpriteSize,
                              rRefDevice );
     }
-
+    
     void SAL_CALL CanvasCustomSprite::disposing()
     {
         ::osl::MutexGuard aGuard( m_aMutex );
@@ -99,7 +99,7 @@ namespace nullcanvas
     {
         uno::Sequence< ::rtl::OUString > aRet(1);
         aRet[0] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM ( SERVICE_NAME ) );
-
+        
         return aRet;
     }
 }
diff --git a/canvas/source/null/null_canvascustomsprite.hxx b/canvas/source/null/null_canvascustomsprite.hxx
index 554fb3033b05..acf7e0b09a6a 100644
--- a/canvas/source/null/null_canvascustomsprite.hxx
+++ b/canvas/source/null/null_canvascustomsprite.hxx
@@ -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,7 +56,7 @@ namespace nullcanvas
     typedef ::cppu::WeakComponentImplHelper4< ::com::sun::star::rendering::XCustomSprite,
                                                ::com::sun::star::rendering::XBitmapCanvas,
                                               ::com::sun::star::rendering::XIntegerBitmap,
-                                                ::com::sun::star::lang::XServiceInfo >  CanvasCustomSpriteBase_Base;
+                                                ::com::sun::star::lang::XServiceInfo >	CanvasCustomSpriteBase_Base;
     /** Mixin Sprite
 
         Have to mixin the Sprite interface before deriving from
@@ -80,10 +80,10 @@ namespace nullcanvas
     };
 
     typedef ::canvas::CanvasCustomSpriteBase< CanvasCustomSpriteSpriteBase_Base,
-                                              SpriteHelper,
-                                              CanvasHelper,
+                                              SpriteHelper, 
+                                              CanvasHelper, 
                                               ::osl::MutexGuard,
-                                              ::cppu::OWeakObject >                     CanvasCustomSpriteBaseT;
+                                              ::cppu::OWeakObject > 					CanvasCustomSpriteBaseT;
 
     /* Definition of CanvasCustomSprite class */
 
@@ -105,7 +105,7 @@ namespace nullcanvas
             @param rDevice
             Target DX device
          */
-        CanvasCustomSprite( const ::com::sun::star::geometry::RealSize2D&   rSpriteSize,
+        CanvasCustomSprite( const ::com::sun::star::geometry::RealSize2D& 	rSpriteSize,
                             const SpriteCanvasRef&                          rRefDevice );
 
         virtual void SAL_CALL disposing();
@@ -127,7 +127,7 @@ namespace nullcanvas
 
     private:
         /** MUST hold here, too, since CanvasHelper only contains a
-            raw pointer (without refcounting)
+            raw pointer (without refcounting) 
         */
         SpriteCanvasRef mpSpriteCanvas;
     };
diff --git a/canvas/source/null/null_canvasfont.cxx b/canvas/source/null/null_canvasfont.cxx
index a8c6f027e40d..6f246becbe96 100644
--- a/canvas/source/null/null_canvasfont.cxx
+++ b/canvas/source/null/null_canvasfont.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
@@ -39,9 +39,9 @@ using namespace ::com::sun::star;
 
 namespace nullcanvas
 {
-    CanvasFont::CanvasFont( const rendering::FontRequest&                   rFontRequest,
-                            const uno::Sequence< beans::PropertyValue >&    /*extraFontProperties*/,
-                            const geometry::Matrix2D&                       fontMatrix ) :
+    CanvasFont::CanvasFont( const rendering::FontRequest& 					rFontRequest,
+                            const uno::Sequence< beans::PropertyValue >& 	/*extraFontProperties*/, 
+                            const geometry::Matrix2D& 						fontMatrix ) :
         CanvasFont_Base( m_aMutex ),
         maFontRequest( rFontRequest ),
         maFontMatrix( fontMatrix )
@@ -53,9 +53,9 @@ namespace nullcanvas
         ::osl::MutexGuard aGuard( m_aMutex );
     }
 
-    uno::Reference< rendering::XTextLayout > SAL_CALL CanvasFont::createTextLayout( const rendering::StringContext& aText,
-                                                                                    sal_Int8                        nDirection,
-                                                                                    sal_Int64                       nRandomSeed ) throw (uno::RuntimeException)
+    uno::Reference< rendering::XTextLayout > SAL_CALL CanvasFont::createTextLayout( const rendering::StringContext& aText, 
+                                                                                    sal_Int8 						nDirection, 
+                                                                                    sal_Int64 						nRandomSeed ) throw (uno::RuntimeException)
     {
         ::osl::MutexGuard aGuard( m_aMutex );
 
@@ -110,7 +110,7 @@ namespace nullcanvas
     {
         uno::Sequence< ::rtl::OUString > aRet(1);
         aRet[0] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM ( SERVICE_NAME ) );
-
+        
         return aRet;
     }
 
diff --git a/canvas/source/null/null_canvasfont.hxx b/canvas/source/null/null_canvasfont.hxx
index 01dc5cac5720..cc505f812c75 100644
--- a/canvas/source/null/null_canvasfont.hxx
+++ b/canvas/source/null/null_canvasfont.hxx
@@ -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
@@ -54,18 +54,18 @@ namespace nullcanvas
     typedef ::cppu::WeakComponentImplHelper2< ::com::sun::star::rendering::XCanvasFont,
                                                ::com::sun::star::lang::XServiceInfo > CanvasFont_Base;
 
-    class CanvasFont : public ::comphelper::OBaseMutex,
+    class CanvasFont : public ::comphelper::OBaseMutex, 
                        public CanvasFont_Base,
                        private UsageCounter< CanvasFont >,
                        private ::boost::noncopyable
     {
     public:
-        typedef ::comphelper::ImplementationReference<
-            CanvasFont,
+        typedef ::comphelper::ImplementationReference< 
+            CanvasFont, 
             ::com::sun::star::rendering::XCanvasFont > ImplRef;
 
         CanvasFont( const ::com::sun::star::rendering::FontRequest&                                     fontRequest,
-                    const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >&    extraFontProperties,
+                    const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& 	extraFontProperties, 
                     const ::com::sun::star::geometry::Matrix2D&                                         fontMatrix );
 
         /// Dispose all internal references
@@ -86,8 +86,8 @@ namespace nullcanvas
         const ::com::sun::star::geometry::Matrix2D& getFontMatrix() const;
 
     private:
-        ::com::sun::star::rendering::FontRequest    maFontRequest;
-        ::com::sun::star::geometry::Matrix2D        maFontMatrix;
+        ::com::sun::star::rendering::FontRequest	maFontRequest;
+        ::com::sun::star::geometry::Matrix2D		maFontMatrix;
     };
 
 }
diff --git a/canvas/source/null/null_canvashelper.cxx b/canvas/source/null/null_canvashelper.cxx
index 21e2c74f6b95..ff67200c0ec3 100644
--- a/canvas/source/null/null_canvashelper.cxx
+++ b/canvas/source/null/null_canvashelper.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
@@ -85,172 +85,172 @@ namespace nullcanvas
     {
     }
 
-    void CanvasHelper::drawPoint( const rendering::XCanvas*     /*pCanvas*/,
-                                  const geometry::RealPoint2D&  /*aPoint*/,
-                                  const rendering::ViewState&   /*viewState*/,
-                                  const rendering::RenderState& /*renderState*/ )
+    void CanvasHelper::drawPoint( const rendering::XCanvas* 	/*pCanvas*/, 
+                                  const geometry::RealPoint2D& 	/*aPoint*/, 
+                                  const rendering::ViewState& 	/*viewState*/, 
+                                  const rendering::RenderState&	/*renderState*/ )
     {
     }
 
-    void CanvasHelper::drawLine( const rendering::XCanvas*      /*pCanvas*/,
-                                 const geometry::RealPoint2D&   /*aPoint1*/,
-                                 const geometry::RealPoint2D&   /*aPoint2*/,
-                                 const rendering::ViewState&    /*viewState*/,
-                                 const rendering::RenderState&  /*renderState*/ )
+    void CanvasHelper::drawLine( const rendering::XCanvas* 	    /*pCanvas*/, 
+                                 const geometry::RealPoint2D& 	/*aPoint1*/, 
+                                 const geometry::RealPoint2D& 	/*aPoint2*/, 
+                                 const rendering::ViewState& 	/*viewState*/, 
+                                 const rendering::RenderState&	/*renderState*/ )
     {
     }
 
-    void CanvasHelper::drawBezier( const rendering::XCanvas*            /*pCanvas*/,
-                                   const geometry::RealBezierSegment2D& /*aBezierSegment*/,
-                                   const geometry::RealPoint2D&         /*aEndPoint*/,
-                                   const rendering::ViewState&          /*viewState*/,
-                                   const rendering::RenderState&        /*renderState*/ )
+    void CanvasHelper::drawBezier( const rendering::XCanvas* 			/*pCanvas*/, 
+                                   const geometry::RealBezierSegment2D&	/*aBezierSegment*/, 
+                                   const geometry::RealPoint2D& 		/*aEndPoint*/,
+                                   const rendering::ViewState& 			/*viewState*/, 
+                                   const rendering::RenderState& 		/*renderState*/ )
     {
     }
 
-    uno::Reference< rendering::XCachedPrimitive > CanvasHelper::drawPolyPolygon( const rendering::XCanvas*                          /*pCanvas*/,
-                                                                                 const uno::Reference< rendering::XPolyPolygon2D >& /*xPolyPolygon*/,
-                                                                                 const rendering::ViewState&                        /*viewState*/,
-                                                                                 const rendering::RenderState&                      /*renderState*/ )
+    uno::Reference< rendering::XCachedPrimitive > CanvasHelper::drawPolyPolygon( const rendering::XCanvas* 							/*pCanvas*/, 
+                                                                                 const uno::Reference< rendering::XPolyPolygon2D >& /*xPolyPolygon*/, 
+                                                                                 const rendering::ViewState& 						/*viewState*/, 
+                                                                                 const rendering::RenderState& 						/*renderState*/ )
     {
         // TODO(P1): Provide caching here.
         return uno::Reference< rendering::XCachedPrimitive >(NULL);
     }
 
-    uno::Reference< rendering::XCachedPrimitive > CanvasHelper::strokePolyPolygon( const rendering::XCanvas*                            /*pCanvas*/,
-                                                                                   const uno::Reference< rendering::XPolyPolygon2D >&   /*xPolyPolygon*/,
-                                                                                   const rendering::ViewState&                          /*viewState*/,
-                                                                                   const rendering::RenderState&                        /*renderState*/,
-                                                                                   const rendering::StrokeAttributes&                   /*strokeAttributes*/ )
+    uno::Reference< rendering::XCachedPrimitive > CanvasHelper::strokePolyPolygon( const rendering::XCanvas* 							/*pCanvas*/, 
+                                                                                   const uno::Reference< rendering::XPolyPolygon2D >& 	/*xPolyPolygon*/, 
+                                                                                   const rendering::ViewState& 							/*viewState*/, 
+                                                                                   const rendering::RenderState& 						/*renderState*/, 
+                                                                                   const rendering::StrokeAttributes& 					/*strokeAttributes*/ )
     {
         // TODO(P1): Provide caching here.
         return uno::Reference< rendering::XCachedPrimitive >(NULL);
     }
 
-    uno::Reference< rendering::XCachedPrimitive > CanvasHelper::strokeTexturedPolyPolygon( const rendering::XCanvas*                            /*pCanvas*/,
-                                                                                           const uno::Reference< rendering::XPolyPolygon2D >&   /*xPolyPolygon*/,
-                                                                                           const rendering::ViewState&                          /*viewState*/,
-                                                                                           const rendering::RenderState&                        /*renderState*/,
-                                                                                           const uno::Sequence< rendering::Texture >&           /*textures*/,
-                                                                                           const rendering::StrokeAttributes&                   /*strokeAttributes*/ )
+    uno::Reference< rendering::XCachedPrimitive > CanvasHelper::strokeTexturedPolyPolygon( const rendering::XCanvas* 							/*pCanvas*/, 
+                                                                                           const uno::Reference< rendering::XPolyPolygon2D >& 	/*xPolyPolygon*/, 
+                                                                                           const rendering::ViewState& 							/*viewState*/, 
+                                                                                           const rendering::RenderState& 						/*renderState*/, 
+                                                                                           const uno::Sequence< rendering::Texture >& 			/*textures*/, 
+                                                                                           const rendering::StrokeAttributes& 					/*strokeAttributes*/ )
     {
         // TODO
         return uno::Reference< rendering::XCachedPrimitive >(NULL);
     }
 
-    uno::Reference< rendering::XCachedPrimitive > CanvasHelper::strokeTextureMappedPolyPolygon( const rendering::XCanvas*                           /*pCanvas*/,
-                                                                                                const uno::Reference< rendering::XPolyPolygon2D >&  /*xPolyPolygon*/,
-                                                                                                const rendering::ViewState&                         /*viewState*/,
-                                                                                                const rendering::RenderState&                       /*renderState*/,
-                                                                                                const uno::Sequence< rendering::Texture >&          /*textures*/,
-                                                                                                const uno::Reference< geometry::XMapping2D >&       /*xMapping*/,
-                                                                                                const rendering::StrokeAttributes&                  /*strokeAttributes*/ )
+    uno::Reference< rendering::XCachedPrimitive > CanvasHelper::strokeTextureMappedPolyPolygon( const rendering::XCanvas* 							/*pCanvas*/, 
+                                                                                                const uno::Reference< rendering::XPolyPolygon2D >&	/*xPolyPolygon*/, 
+                                                                                                const rendering::ViewState& 						/*viewState*/, 
+                                                                                                const rendering::RenderState& 						/*renderState*/, 
+                                                                                                const uno::Sequence< rendering::Texture >& 			/*textures*/, 
+                                                                                                const uno::Reference< geometry::XMapping2D >& 		/*xMapping*/, 
+                                                                                                const rendering::StrokeAttributes& 					/*strokeAttributes*/ )
     {
         // TODO
         return uno::Reference< rendering::XCachedPrimitive >(NULL);
     }
 
-    uno::Reference< rendering::XPolyPolygon2D >   CanvasHelper::queryStrokeShapes( const rendering::XCanvas*                            /*pCanvas*/,
-                                                                                   const uno::Reference< rendering::XPolyPolygon2D >&   /*xPolyPolygon*/,
-                                                                                   const rendering::ViewState&                          /*viewState*/,
-                                                                                   const rendering::RenderState&                        /*renderState*/,
-                                                                                   const rendering::StrokeAttributes&                   /*strokeAttributes*/ )
+    uno::Reference< rendering::XPolyPolygon2D >   CanvasHelper::queryStrokeShapes( const rendering::XCanvas* 							/*pCanvas*/, 
+                                                                                   const uno::Reference< rendering::XPolyPolygon2D >& 	/*xPolyPolygon*/, 
+                                                                                   const rendering::ViewState& 							/*viewState*/, 
+                                                                                   const rendering::RenderState& 						/*renderState*/, 
+                                                                                   const rendering::StrokeAttributes& 					/*strokeAttributes*/ )
     {
         // TODO
         return uno::Reference< rendering::XPolyPolygon2D >(NULL);
     }
 
-    uno::Reference< rendering::XCachedPrimitive > CanvasHelper::fillPolyPolygon( const rendering::XCanvas*                          /*pCanvas*/,
-                                                                                 const uno::Reference< rendering::XPolyPolygon2D >& /*xPolyPolygon*/,
-                                                                                 const rendering::ViewState&                        /*viewState*/,
-                                                                                 const rendering::RenderState&                      /*renderState*/ )
+    uno::Reference< rendering::XCachedPrimitive > CanvasHelper::fillPolyPolygon( const rendering::XCanvas* 							/*pCanvas*/, 
+                                                                                 const uno::Reference< rendering::XPolyPolygon2D >& /*xPolyPolygon*/, 
+                                                                                 const rendering::ViewState& 						/*viewState*/, 
+                                                                                 const rendering::RenderState& 						/*renderState*/ )
     {
         // TODO(P1): Provide caching here.
         return uno::Reference< rendering::XCachedPrimitive >(NULL);
     }
 
-    uno::Reference< rendering::XCachedPrimitive > CanvasHelper::fillTexturedPolyPolygon( const rendering::XCanvas*                          /*pCanvas*/,
+    uno::Reference< rendering::XCachedPrimitive > CanvasHelper::fillTexturedPolyPolygon( const rendering::XCanvas* 							/*pCanvas*/, 
                                                                                          const uno::Reference< rendering::XPolyPolygon2D >& /*xPolyPolygon*/,
-                                                                                         const rendering::ViewState&                        /*viewState*/,
-                                                                                         const rendering::RenderState&                      /*renderState*/,
-                                                                                         const uno::Sequence< rendering::Texture >&         /*textures*/ )
+                                                                                         const rendering::ViewState& 						/*viewState*/,
+                                                                                         const rendering::RenderState& 						/*renderState*/,
+                                                                                         const uno::Sequence< rendering::Texture >& 		/*textures*/ )
     {
         // TODO(P1): Provide caching here.
         return uno::Reference< rendering::XCachedPrimitive >(NULL);
     }
 
-    uno::Reference< rendering::XCachedPrimitive > CanvasHelper::fillTextureMappedPolyPolygon( const rendering::XCanvas*                             /*pCanvas*/,
-                                                                                              const uno::Reference< rendering::XPolyPolygon2D >&    /*xPolyPolygon*/,
-                                                                                              const rendering::ViewState&                           /*viewState*/,
-                                                                                              const rendering::RenderState&                         /*renderState*/,
-                                                                                              const uno::Sequence< rendering::Texture >&            /*textures*/,
-                                                                                              const uno::Reference< geometry::XMapping2D >&         /*xMapping*/ )
+    uno::Reference< rendering::XCachedPrimitive > CanvasHelper::fillTextureMappedPolyPolygon( const rendering::XCanvas* 							/*pCanvas*/, 
+                                                                                              const uno::Reference< rendering::XPolyPolygon2D >& 	/*xPolyPolygon*/, 
+                                                                                              const rendering::ViewState& 							/*viewState*/, 
+                                                                                              const rendering::RenderState& 						/*renderState*/, 
+                                                                                              const uno::Sequence< rendering::Texture >& 			/*textures*/, 
+                                                                                              const uno::Reference< geometry::XMapping2D >& 		/*xMapping*/ )
     {
         // TODO
         return uno::Reference< rendering::XCachedPrimitive >(NULL);
     }
 
-    uno::Reference< rendering::XCanvasFont > CanvasHelper::createFont( const rendering::XCanvas*                    /*pCanvas*/,
-                                                                       const rendering::FontRequest&                fontRequest,
-                                                                       const uno::Sequence< beans::PropertyValue >& extraFontProperties,
-                                                                       const geometry::Matrix2D&                    fontMatrix )
+    uno::Reference< rendering::XCanvasFont > CanvasHelper::createFont( const rendering::XCanvas* 					/*pCanvas*/, 
+                                                                       const rendering::FontRequest& 				fontRequest, 
+                                                                       const uno::Sequence< beans::PropertyValue >& extraFontProperties, 
+                                                                       const geometry::Matrix2D& 					fontMatrix )
     {
-        return uno::Reference< rendering::XCanvasFont >(
+        return uno::Reference< rendering::XCanvasFont >( 
             new CanvasFont(fontRequest, extraFontProperties, fontMatrix ) );
     }
 
-    uno::Sequence< rendering::FontInfo > CanvasHelper::queryAvailableFonts( const rendering::XCanvas*                       /*pCanvas*/,
-                                                                            const rendering::FontInfo&                      /*aFilter*/,
-                                                                            const uno::Sequence< beans::PropertyValue >&    /*aFontProperties*/ )
+    uno::Sequence< rendering::FontInfo > CanvasHelper::queryAvailableFonts( const rendering::XCanvas* 						/*pCanvas*/, 
+                                                                            const rendering::FontInfo& 						/*aFilter*/, 
+                                                                            const uno::Sequence< beans::PropertyValue >& 	/*aFontProperties*/ )
     {
         // TODO
         return uno::Sequence< rendering::FontInfo >();
     }
 
-    uno::Reference< rendering::XCachedPrimitive > CanvasHelper::drawText( const rendering::XCanvas*                         /*pCanvas*/,
-                                                                          const rendering::StringContext&                   /*text*/,
-                                                                          const uno::Reference< rendering::XCanvasFont >&   /*xFont*/,
-                                                                          const rendering::ViewState&                       /*viewState*/,
-                                                                          const rendering::RenderState&                     /*renderState*/,
-                                                                          sal_Int8                                          /*textDirection*/ )
+    uno::Reference< rendering::XCachedPrimitive > CanvasHelper::drawText( const rendering::XCanvas* 						/*pCanvas*/, 
+                                                                          const rendering::StringContext& 					/*text*/, 
+                                                                          const uno::Reference< rendering::XCanvasFont >& 	/*xFont*/, 
+                                                                          const rendering::ViewState& 						/*viewState*/, 
+                                                                          const rendering::RenderState& 					/*renderState*/, 
+                                                                          sal_Int8				 							/*textDirection*/ )
     {
         return uno::Reference< rendering::XCachedPrimitive >(NULL);
     }
 
-    uno::Reference< rendering::XCachedPrimitive > CanvasHelper::drawTextLayout( const rendering::XCanvas*                       /*pCanvas*/,
-                                                                                const uno::Reference< rendering::XTextLayout >& xLayoutetText,
-                                                                                const rendering::ViewState&                     viewState,
-                                                                                const rendering::RenderState&                   renderState )
+    uno::Reference< rendering::XCachedPrimitive > CanvasHelper::drawTextLayout( const rendering::XCanvas* 						/*pCanvas*/, 
+                                                                                const uno::Reference< rendering::XTextLayout >& xLayoutetText, 
+                                                                                const rendering::ViewState& 					viewState, 
+                                                                                const rendering::RenderState& 					renderState )
     {
-        ENSURE_OR_THROW( xLayoutetText.is(),
+        ENSURE_OR_THROW( xLayoutetText.is(), 
                           "CanvasHelper::drawTextLayout: layout is NULL");
 
-        TextLayout* pTextLayout =
+        TextLayout* pTextLayout = 
             dynamic_cast< TextLayout* >( xLayoutetText.get() );
-
+        
         ENSURE_OR_THROW( pTextLayout,
                           "CanvasHelper::drawTextLayout(): TextLayout not compatible with this canvas" );
 
-        pTextLayout->draw( viewState,
-                           renderState,
+        pTextLayout->draw( viewState, 
+                           renderState, 
                            mpDevice );
 
         return uno::Reference< rendering::XCachedPrimitive >(NULL);
     }
 
-    uno::Reference< rendering::XCachedPrimitive > CanvasHelper::drawBitmap( const rendering::XCanvas*                   /*pCanvas*/,
-                                                                            const uno::Reference< rendering::XBitmap >& /*xBitmap*/,
-                                                                            const rendering::ViewState&                 /*viewState*/,
-                                                                            const rendering::RenderState&               /*renderState*/ )
+    uno::Reference< rendering::XCachedPrimitive > CanvasHelper::drawBitmap( const rendering::XCanvas* 					/*pCanvas*/, 
+                                                                            const uno::Reference< rendering::XBitmap >& /*xBitmap*/, 
+                                                                            const rendering::ViewState& 				/*viewState*/, 
+                                                                            const rendering::RenderState& 				/*renderState*/ )
     {
         // TODO(P1): Provide caching here.
         return uno::Reference< rendering::XCachedPrimitive >(NULL);
     }
 
-    uno::Reference< rendering::XCachedPrimitive > CanvasHelper::drawBitmapModulated( const rendering::XCanvas*                      /*pCanvas*/,
-                                                                                     const uno::Reference< rendering::XBitmap >&    /*xBitmap*/,
-                                                                                     const rendering::ViewState&                    /*viewState*/,
-                                                                                     const rendering::RenderState&                  /*renderState*/ )
+    uno::Reference< rendering::XCachedPrimitive > CanvasHelper::drawBitmapModulated( const rendering::XCanvas* 						/*pCanvas*/, 
+                                                                                     const uno::Reference< rendering::XBitmap >& 	/*xBitmap*/, 
+                                                                                     const rendering::ViewState& 					/*viewState*/, 
+                                                                                     const rendering::RenderState& 					/*renderState*/ )
     {
         // TODO(P1): Provide caching here.
         return uno::Reference< rendering::XCachedPrimitive >(NULL);
@@ -261,14 +261,14 @@ namespace nullcanvas
         return uno::Reference< rendering::XGraphicDevice >(mpDevice);
     }
 
-    void CanvasHelper::copyRect( const rendering::XCanvas*                          /*pCanvas*/,
-                                 const uno::Reference< rendering::XBitmapCanvas >&  /*sourceCanvas*/,
-                                 const geometry::RealRectangle2D&                   /*sourceRect*/,
-                                 const rendering::ViewState&                        /*sourceViewState*/,
-                                 const rendering::RenderState&                      /*sourceRenderState*/,
-                                 const geometry::RealRectangle2D&                   /*destRect*/,
-                                 const rendering::ViewState&                        /*destViewState*/,
-                                 const rendering::RenderState&                      /*destRenderState*/ )
+    void CanvasHelper::copyRect( const rendering::XCanvas* 							/*pCanvas*/, 
+                                 const uno::Reference< rendering::XBitmapCanvas >&	/*sourceCanvas*/, 
+                                 const geometry::RealRectangle2D& 					/*sourceRect*/, 
+                                 const rendering::ViewState& 						/*sourceViewState*/, 
+                                 const rendering::RenderState& 						/*sourceRenderState*/, 
+                                 const geometry::RealRectangle2D& 					/*destRect*/, 
+                                 const rendering::ViewState& 						/*destViewState*/, 
+                                 const rendering::RenderState& 						/*destRenderState*/ )
     {
         // TODO(F2): copyRect NYI
     }
@@ -281,33 +281,33 @@ namespace nullcanvas
         return ::basegfx::unotools::integerSize2DFromB2ISize( maSize );
     }
 
-    uno::Reference< rendering::XBitmap > CanvasHelper::getScaledBitmap( const geometry::RealSize2D& /*newSize*/,
-                                                                        sal_Bool                    /*beFast*/ )
+    uno::Reference< rendering::XBitmap > CanvasHelper::getScaledBitmap( const geometry::RealSize2D&	/*newSize*/, 
+                                                                        sal_Bool 					/*beFast*/ )
     {
         // TODO(F1):
         return uno::Reference< rendering::XBitmap >();
     }
 
-    uno::Sequence< sal_Int8 > CanvasHelper::getData( rendering::IntegerBitmapLayout&     /*bitmapLayout*/,
+    uno::Sequence< sal_Int8 > CanvasHelper::getData( rendering::IntegerBitmapLayout&     /*bitmapLayout*/, 
                                                      const geometry::IntegerRectangle2D& /*rect*/ )
     {
         // TODO
         return uno::Sequence< sal_Int8 >();
     }
 
-    void CanvasHelper::setData( const uno::Sequence< sal_Int8 >&        /*data*/,
-                                const rendering::IntegerBitmapLayout&   /*bitmapLayout*/,
-                                const geometry::IntegerRectangle2D&     /*rect*/ )
+    void CanvasHelper::setData( const uno::Sequence< sal_Int8 >& 		/*data*/, 
+                                const rendering::IntegerBitmapLayout&   /*bitmapLayout*/, 
+                                const geometry::IntegerRectangle2D& 	/*rect*/ )
     {
     }
 
-    void CanvasHelper::setPixel( const uno::Sequence< sal_Int8 >&       /*color*/,
-                                 const rendering::IntegerBitmapLayout&  /*bitmapLayout*/,
+    void CanvasHelper::setPixel( const uno::Sequence< sal_Int8 >&       /*color*/, 
+                                 const rendering::IntegerBitmapLayout&  /*bitmapLayout*/, 
                                  const geometry::IntegerPoint2D&        /*pos*/ )
     {
     }
 
-    uno::Sequence< sal_Int8 > CanvasHelper::getPixel( rendering::IntegerBitmapLayout&   /*bitmapLayout*/,
+    uno::Sequence< sal_Int8 > CanvasHelper::getPixel( rendering::IntegerBitmapLayout&   /*bitmapLayout*/, 
                                                       const geometry::IntegerPoint2D&   /*pos*/ )
     {
         return uno::Sequence< sal_Int8 >();
diff --git a/canvas/source/null/null_canvashelper.hxx b/canvas/source/null/null_canvashelper.hxx
index 976eb529b56f..19ca414d1f0c 100644
--- a/canvas/source/null/null_canvashelper.hxx
+++ b/canvas/source/null/null_canvashelper.hxx
@@ -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
@@ -81,170 +81,170 @@ namespace nullcanvas
         // XCanvas (only providing, not implementing the
         // interface. Also note subtle method parameter differences)
         void clear();
-        void drawPoint( const ::com::sun::star::rendering::XCanvas*     pCanvas,
-                        const ::com::sun::star::geometry::RealPoint2D&  aPoint,
-                        const ::com::sun::star::rendering::ViewState&   viewState,
+        void drawPoint( const ::com::sun::star::rendering::XCanvas* 	pCanvas, 
+                        const ::com::sun::star::geometry::RealPoint2D& 	aPoint, 
+                        const ::com::sun::star::rendering::ViewState& 	viewState, 
                         const ::com::sun::star::rendering::RenderState& renderState );
-        void drawLine( const ::com::sun::star::rendering::XCanvas*      pCanvas,
-                       const ::com::sun::star::geometry::RealPoint2D&   aStartPoint,
-                       const ::com::sun::star::geometry::RealPoint2D&   aEndPoint,
-                       const ::com::sun::star::rendering::ViewState&    viewState,
-                       const ::com::sun::star::rendering::RenderState&  renderState );
-        void drawBezier( const ::com::sun::star::rendering::XCanvas*            pCanvas,
-                         const ::com::sun::star::geometry::RealBezierSegment2D& aBezierSegment,
-                         const ::com::sun::star::geometry::RealPoint2D&         aEndPoint,
-                         const ::com::sun::star::rendering::ViewState&          viewState,
-                         const ::com::sun::star::rendering::RenderState&        renderState );
-        ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XCachedPrimitive >
-            drawPolyPolygon( const ::com::sun::star::rendering::XCanvas*            pCanvas,
-                             const ::com::sun::star::uno::Reference<
-                                     ::com::sun::star::rendering::XPolyPolygon2D >& xPolyPolygon,
-                             const ::com::sun::star::rendering::ViewState&          viewState,
-                             const ::com::sun::star::rendering::RenderState&        renderState );
-        ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XCachedPrimitive >
-            strokePolyPolygon( const ::com::sun::star::rendering::XCanvas*          pCanvas,
-                               const ::com::sun::star::uno::Reference<
-                                       ::com::sun::star::rendering::XPolyPolygon2D >&   xPolyPolygon,
-                               const ::com::sun::star::rendering::ViewState&        viewState,
-                               const ::com::sun::star::rendering::RenderState&      renderState,
+        void drawLine( const ::com::sun::star::rendering::XCanvas* 		pCanvas, 
+                       const ::com::sun::star::geometry::RealPoint2D& 	aStartPoint, 
+                       const ::com::sun::star::geometry::RealPoint2D& 	aEndPoint, 
+                       const ::com::sun::star::rendering::ViewState& 	viewState, 
+                       const ::com::sun::star::rendering::RenderState& 	renderState	);
+        void drawBezier( const ::com::sun::star::rendering::XCanvas* 			pCanvas, 
+                         const ::com::sun::star::geometry::RealBezierSegment2D&	aBezierSegment, 
+                         const ::com::sun::star::geometry::RealPoint2D& 		aEndPoint,
+                         const ::com::sun::star::rendering::ViewState& 			viewState, 
+                         const ::com::sun::star::rendering::RenderState& 		renderState );
+        ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XCachedPrimitive > 	
+            drawPolyPolygon( const ::com::sun::star::rendering::XCanvas* 			pCanvas, 
+                             const ::com::sun::star::uno::Reference< 
+                                     ::com::sun::star::rendering::XPolyPolygon2D >&	xPolyPolygon, 
+                             const ::com::sun::star::rendering::ViewState& 			viewState, 
+                             const ::com::sun::star::rendering::RenderState& 		renderState );
+        ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XCachedPrimitive > 	
+            strokePolyPolygon( const ::com::sun::star::rendering::XCanvas* 			pCanvas, 
+                               const ::com::sun::star::uno::Reference< 
+                                       ::com::sun::star::rendering::XPolyPolygon2D >& 	xPolyPolygon, 
+                               const ::com::sun::star::rendering::ViewState& 		viewState, 
+                               const ::com::sun::star::rendering::RenderState& 		renderState, 
                                const ::com::sun::star::rendering::StrokeAttributes& strokeAttributes );
-        ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XCachedPrimitive >
-            strokeTexturedPolyPolygon( const ::com::sun::star::rendering::XCanvas*          pCanvas,
-                                       const ::com::sun::star::uno::Reference<
-                                               ::com::sun::star::rendering::XPolyPolygon2D >&   xPolyPolygon,
-                                       const ::com::sun::star::rendering::ViewState&        viewState,
-                                       const ::com::sun::star::rendering::RenderState&      renderState,
-                                       const ::com::sun::star::uno::Sequence<
-                                               ::com::sun::star::rendering::Texture >&      textures,
+        ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XCachedPrimitive > 	
+            strokeTexturedPolyPolygon( const ::com::sun::star::rendering::XCanvas* 			pCanvas, 
+                                       const ::com::sun::star::uno::Reference< 
+                                               ::com::sun::star::rendering::XPolyPolygon2D >& 	xPolyPolygon, 
+                                       const ::com::sun::star::rendering::ViewState& 		viewState, 
+                                       const ::com::sun::star::rendering::RenderState& 		renderState, 
+                                       const ::com::sun::star::uno::Sequence< 
+                                               ::com::sun::star::rendering::Texture >& 		textures, 
                                        const ::com::sun::star::rendering::StrokeAttributes& strokeAttributes );
-        ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XCachedPrimitive >
-            strokeTextureMappedPolyPolygon( const ::com::sun::star::rendering::XCanvas*             pCanvas,
-                                            const ::com::sun::star::uno::Reference<
-                                                    ::com::sun::star::rendering::XPolyPolygon2D >&  xPolyPolygon,
-                                            const ::com::sun::star::rendering::ViewState&           viewState,
-                                            const ::com::sun::star::rendering::RenderState&         renderState,
-                                            const ::com::sun::star::uno::Sequence<
-                                                    ::com::sun::star::rendering::Texture >&         textures,
-                                            const ::com::sun::star::uno::Reference<
-                                                    ::com::sun::star::geometry::XMapping2D >&       xMapping,
-                                            const ::com::sun::star::rendering::StrokeAttributes&    strokeAttributes );
-        ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XPolyPolygon2D >
-            queryStrokeShapes( const ::com::sun::star::rendering::XCanvas*          pCanvas,
-                               const ::com::sun::star::uno::Reference<
-                                       ::com::sun::star::rendering::XPolyPolygon2D >&   xPolyPolygon,
-                               const ::com::sun::star::rendering::ViewState&        viewState,
-                               const ::com::sun::star::rendering::RenderState&      renderState,
+        ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XCachedPrimitive > 	
+            strokeTextureMappedPolyPolygon( const ::com::sun::star::rendering::XCanvas* 			pCanvas, 
+                                            const ::com::sun::star::uno::Reference< 
+                                                    ::com::sun::star::rendering::XPolyPolygon2D >& 	xPolyPolygon, 
+                                            const ::com::sun::star::rendering::ViewState& 			viewState, 
+                                            const ::com::sun::star::rendering::RenderState& 		renderState, 
+                                            const ::com::sun::star::uno::Sequence< 
+                                                    ::com::sun::star::rendering::Texture >& 		textures, 
+                                            const ::com::sun::star::uno::Reference< 
+                                                    ::com::sun::star::geometry::XMapping2D >& 		xMapping, 
+                                            const ::com::sun::star::rendering::StrokeAttributes& 	strokeAttributes );
+        ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XPolyPolygon2D >   	
+            queryStrokeShapes( const ::com::sun::star::rendering::XCanvas* 			pCanvas, 
+                               const ::com::sun::star::uno::Reference< 
+                                       ::com::sun::star::rendering::XPolyPolygon2D >& 	xPolyPolygon, 
+                               const ::com::sun::star::rendering::ViewState& 		viewState, 
+                               const ::com::sun::star::rendering::RenderState& 		renderState, 
                                const ::com::sun::star::rendering::StrokeAttributes& strokeAttributes );
-        ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XCachedPrimitive >
-            fillPolyPolygon( const ::com::sun::star::rendering::XCanvas*            pCanvas,
-                             const ::com::sun::star::uno::Reference<
-                                     ::com::sun::star::rendering::XPolyPolygon2D >&     xPolyPolygon,
-                             const ::com::sun::star::rendering::ViewState&          viewState,
-                             const ::com::sun::star::rendering::RenderState&        renderState );
-        ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XCachedPrimitive >
-            fillTexturedPolyPolygon( const ::com::sun::star::rendering::XCanvas*            pCanvas,
-                                     const ::com::sun::star::uno::Reference<
-                                             ::com::sun::star::rendering::XPolyPolygon2D >&     xPolyPolygon,
-                                     const ::com::sun::star::rendering::ViewState&          viewState,
-                                     const ::com::sun::star::rendering::RenderState&        renderState,
-                                     const ::com::sun::star::uno::Sequence<
-                                             ::com::sun::star::rendering::Texture >&        textures );
-        ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XCachedPrimitive >
-            fillTextureMappedPolyPolygon( const ::com::sun::star::rendering::XCanvas*           pCanvas,
-                                          const ::com::sun::star::uno::Reference<
-                                                  ::com::sun::star::rendering::XPolyPolygon2D >&    xPolyPolygon,
-                                          const ::com::sun::star::rendering::ViewState&         viewState,
-                                          const ::com::sun::star::rendering::RenderState&       renderState,
-                                          const ::com::sun::star::uno::Sequence<
-                                                  ::com::sun::star::rendering::Texture >&       textures,
-                                          const ::com::sun::star::uno::Reference<
-                                                  ::com::sun::star::geometry::XMapping2D >&         xMapping );
+        ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XCachedPrimitive > 	
+            fillPolyPolygon( const ::com::sun::star::rendering::XCanvas* 			pCanvas, 
+                             const ::com::sun::star::uno::Reference< 
+                                     ::com::sun::star::rendering::XPolyPolygon2D >& 	xPolyPolygon, 
+                             const ::com::sun::star::rendering::ViewState& 			viewState, 
+                             const ::com::sun::star::rendering::RenderState& 		renderState );
+        ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XCachedPrimitive > 	
+            fillTexturedPolyPolygon( const ::com::sun::star::rendering::XCanvas* 			pCanvas, 
+                                     const ::com::sun::star::uno::Reference< 
+                                             ::com::sun::star::rendering::XPolyPolygon2D >& 	xPolyPolygon, 
+                                     const ::com::sun::star::rendering::ViewState& 			viewState, 
+                                     const ::com::sun::star::rendering::RenderState& 		renderState, 
+                                     const ::com::sun::star::uno::Sequence< 
+                                             ::com::sun::star::rendering::Texture >& 		textures );
+        ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XCachedPrimitive > 	
+            fillTextureMappedPolyPolygon( const ::com::sun::star::rendering::XCanvas* 			pCanvas, 
+                                          const ::com::sun::star::uno::Reference< 
+                                                  ::com::sun::star::rendering::XPolyPolygon2D >& 	xPolyPolygon, 
+                                          const ::com::sun::star::rendering::ViewState& 		viewState, 
+                                          const ::com::sun::star::rendering::RenderState& 		renderState, 
+                                          const ::com::sun::star::uno::Sequence< 
+                                                  ::com::sun::star::rendering::Texture >& 		textures, 
+                                          const ::com::sun::star::uno::Reference< 
+                                                  ::com::sun::star::geometry::XMapping2D >& 		xMapping );
 
         ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XCanvasFont > SAL_CALL
-            createFont( const ::com::sun::star::rendering::XCanvas*             pCanvas,
-                        const ::com::sun::star::rendering::FontRequest&         fontRequest,
-                        const ::com::sun::star::uno::Sequence<
-                                ::com::sun::star::beans::PropertyValue >&       extraFontProperties,
-                        const ::com::sun::star::geometry::Matrix2D&             fontMatrix );
-
-        ::com::sun::star::uno::Sequence< ::com::sun::star::rendering::FontInfo >
-            queryAvailableFonts( const ::com::sun::star::rendering::XCanvas*        pCanvas,
-                                 const ::com::sun::star::rendering::FontInfo&       aFilter,
-                                 const ::com::sun::star::uno::Sequence<
-                                         ::com::sun::star::beans::PropertyValue >&  aFontProperties );
-
-        ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XCachedPrimitive >
-            drawText( const ::com::sun::star::rendering::XCanvas*           pCanvas,
-                      const ::com::sun::star::rendering::StringContext&     text,
-                      const ::com::sun::star::uno::Reference<
-                              ::com::sun::star::rendering::XCanvasFont >&   xFont,
-                      const ::com::sun::star::rendering::ViewState&         viewState,
-                      const ::com::sun::star::rendering::RenderState&       renderState,
-                      sal_Int8                                              textDirection );
-
-        ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XCachedPrimitive >
-            drawTextLayout( const ::com::sun::star::rendering::XCanvas*     pCanvas,
-                            const ::com::sun::star::uno::Reference<
-                                ::com::sun::star::rendering::XTextLayout >& layoutetText,
-                            const ::com::sun::star::rendering::ViewState&   viewState,
+            createFont( const ::com::sun::star::rendering::XCanvas* 			pCanvas, 
+                        const ::com::sun::star::rendering::FontRequest& 		fontRequest, 
+                        const ::com::sun::star::uno::Sequence< 
+                                ::com::sun::star::beans::PropertyValue >& 		extraFontProperties, 
+                        const ::com::sun::star::geometry::Matrix2D& 			fontMatrix );
+
+        ::com::sun::star::uno::Sequence< ::com::sun::star::rendering::FontInfo > 
+            queryAvailableFonts( const ::com::sun::star::rendering::XCanvas* 		pCanvas, 
+                                 const ::com::sun::star::rendering::FontInfo& 		aFilter, 
+                                 const ::com::sun::star::uno::Sequence< 
+                                         ::com::sun::star::beans::PropertyValue >& 	aFontProperties );
+
+        ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XCachedPrimitive > 
+            drawText( const ::com::sun::star::rendering::XCanvas* 			pCanvas, 
+                      const ::com::sun::star::rendering::StringContext& 	text, 
+                      const ::com::sun::star::uno::Reference< 
+                              ::com::sun::star::rendering::XCanvasFont >& 	xFont, 
+                      const ::com::sun::star::rendering::ViewState& 		viewState, 
+                      const ::com::sun::star::rendering::RenderState& 		renderState, 
+                      sal_Int8 												textDirection );
+
+        ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XCachedPrimitive > 
+            drawTextLayout( const ::com::sun::star::rendering::XCanvas* 	pCanvas, 
+                            const ::com::sun::star::uno::Reference< 
+                                ::com::sun::star::rendering::XTextLayout >& layoutetText, 
+                            const ::com::sun::star::rendering::ViewState& 	viewState, 
                             const ::com::sun::star::rendering::RenderState& renderState );
 
-        ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XCachedPrimitive >
-            drawBitmap( const ::com::sun::star::rendering::XCanvas*     pCanvas,
-                        const ::com::sun::star::uno::Reference<
-                                ::com::sun::star::rendering::XBitmap >& xBitmap,
-                        const ::com::sun::star::rendering::ViewState&   viewState,
+        ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XCachedPrimitive > 	
+            drawBitmap( const ::com::sun::star::rendering::XCanvas* 	pCanvas, 
+                        const ::com::sun::star::uno::Reference< 
+                                ::com::sun::star::rendering::XBitmap >& xBitmap, 
+                        const ::com::sun::star::rendering::ViewState& 	viewState, 
                         const ::com::sun::star::rendering::RenderState& renderState );
-        ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XCachedPrimitive >
-            drawBitmapModulated( const ::com::sun::star::rendering::XCanvas*        pCanvas,
-                                 const ::com::sun::star::uno::Reference<
-                                         ::com::sun::star::rendering::XBitmap >&        xBitmap,
-                                 const ::com::sun::star::rendering::ViewState&      viewState,
-                                 const ::com::sun::star::rendering::RenderState&    renderState );
-        ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XGraphicDevice >
+        ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XCachedPrimitive > 	
+            drawBitmapModulated( const ::com::sun::star::rendering::XCanvas* 		pCanvas, 
+                                 const ::com::sun::star::uno::Reference< 
+                                         ::com::sun::star::rendering::XBitmap >&		xBitmap, 
+                                 const ::com::sun::star::rendering::ViewState& 		viewState, 
+                                 const ::com::sun::star::rendering::RenderState& 	renderState );
+        ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XGraphicDevice > 
             getDevice();
 
         // BitmapCanvasHelper functionality
         // ================================
 
-        void copyRect( const ::com::sun::star::rendering::XCanvas*          pCanvas,
-                       const ::com::sun::star::uno::Reference<
-                               ::com::sun::star::rendering::XBitmapCanvas >&    sourceCanvas,
-                       const ::com::sun::star::geometry::RealRectangle2D&   sourceRect,
-                       const ::com::sun::star::rendering::ViewState&        sourceViewState,
-                       const ::com::sun::star::rendering::RenderState&      sourceRenderState,
-                       const ::com::sun::star::geometry::RealRectangle2D&   destRect,
-                       const ::com::sun::star::rendering::ViewState&        destViewState,
-                       const ::com::sun::star::rendering::RenderState&      destRenderState );
-
+        void copyRect( const ::com::sun::star::rendering::XCanvas* 			pCanvas, 
+                       const ::com::sun::star::uno::Reference< 
+                               ::com::sun::star::rendering::XBitmapCanvas >& 	sourceCanvas, 
+                       const ::com::sun::star::geometry::RealRectangle2D& 	sourceRect, 
+                       const ::com::sun::star::rendering::ViewState& 		sourceViewState, 
+                       const ::com::sun::star::rendering::RenderState& 		sourceRenderState, 
+                       const ::com::sun::star::geometry::RealRectangle2D& 	destRect, 
+                       const ::com::sun::star::rendering::ViewState& 		destViewState, 
+                       const ::com::sun::star::rendering::RenderState& 		destRenderState );
+            
         ::com::sun::star::geometry::IntegerSize2D getSize();
 
-        ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XBitmap >
-            getScaledBitmap( const ::com::sun::star::geometry::RealSize2D&  newSize,
-                             sal_Bool                                       beFast );
+        ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XBitmap > 
+            getScaledBitmap( const ::com::sun::star::geometry::RealSize2D& 	newSize, 
+                             sal_Bool 										beFast );
 
-        ::com::sun::star::uno::Sequence< sal_Int8 >
-            getData( ::com::sun::star::rendering::IntegerBitmapLayout&      bitmapLayout,
+        ::com::sun::star::uno::Sequence< sal_Int8 > 
+            getData( ::com::sun::star::rendering::IntegerBitmapLayout& 		bitmapLayout,
                      const ::com::sun::star::geometry::IntegerRectangle2D&  rect );
 
-        void setData( const ::com::sun::star::uno::Sequence< sal_Int8 >&         data,
-                      const ::com::sun::star::rendering::IntegerBitmapLayout&    bitmapLayout,
+        void setData( const ::com::sun::star::uno::Sequence< sal_Int8 >&         data, 
+                      const ::com::sun::star::rendering::IntegerBitmapLayout&    bitmapLayout, 
                       const ::com::sun::star::geometry::IntegerRectangle2D&      rect );
 
-        void setPixel( const ::com::sun::star::uno::Sequence< sal_Int8 >&        color,
-                       const ::com::sun::star::rendering::IntegerBitmapLayout&   bitmapLayout,
+        void setPixel( const ::com::sun::star::uno::Sequence< sal_Int8 >&        color, 
+                       const ::com::sun::star::rendering::IntegerBitmapLayout&   bitmapLayout, 
                        const ::com::sun::star::geometry::IntegerPoint2D&         pos );
 
-        ::com::sun::star::uno::Sequence< sal_Int8 >
-            getPixel( ::com::sun::star::rendering::IntegerBitmapLayout& bitmapLayout,
+        ::com::sun::star::uno::Sequence< sal_Int8 > 
+            getPixel( ::com::sun::star::rendering::IntegerBitmapLayout& bitmapLayout, 
                       const ::com::sun::star::geometry::IntegerPoint2D& pos );
 
         ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XBitmapPalette > getPalette();
 
         ::com::sun::star::rendering::IntegerBitmapLayout getMemoryLayout();
-
+        
         // Flush drawing queue to screen
-        void                    flush() const;
+        void					flush() const;
 
         /** Called from XCanvas base classes, to notify that content
             is _about_ to change
@@ -263,7 +263,7 @@ namespace nullcanvas
 
     private:
         /// Current size of the output surface in pixel
-        ::basegfx::B2ISize              maSize;
+        ::basegfx::B2ISize				maSize;
 
         /// When true, content is able to represent alpha
         bool                            mbHaveAlpha;
diff --git a/canvas/source/null/null_devicehelper.cxx b/canvas/source/null/null_devicehelper.cxx
index b04820b15716..b2ddbfd74d51 100644
--- a/canvas/source/null/null_devicehelper.cxx
+++ b/canvas/source/null/null_devicehelper.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
@@ -58,8 +58,8 @@ namespace nullcanvas
     {
     }
 
-    void DeviceHelper::init( SpriteCanvas&              rSpriteCanvas,
-                             const ::basegfx::B2ISize&  rSize,
+    void DeviceHelper::init( SpriteCanvas&				rSpriteCanvas,
+                             const ::basegfx::B2ISize&	rSize,
                              bool                       bFullscreen )
     {
         mpSpriteCanvas = &rSpriteCanvas;
@@ -83,35 +83,35 @@ namespace nullcanvas
         return geometry::RealSize2D( 210, 280 );
     }
 
-    uno::Reference< rendering::XLinePolyPolygon2D > DeviceHelper::createCompatibleLinePolyPolygon(
-        const uno::Reference< rendering::XGraphicDevice >&              /*rDevice*/,
-        const uno::Sequence< uno::Sequence< geometry::RealPoint2D > >&  points )
+    uno::Reference< rendering::XLinePolyPolygon2D > DeviceHelper::createCompatibleLinePolyPolygon( 
+        const uno::Reference< rendering::XGraphicDevice >& 				/*rDevice*/,
+        const uno::Sequence< uno::Sequence< geometry::RealPoint2D > >&	points )
     {
         // disposed?
         if( !mpSpriteCanvas )
             return uno::Reference< rendering::XLinePolyPolygon2D >(); // we're disposed
 
-        return uno::Reference< rendering::XLinePolyPolygon2D >(
-            new ::basegfx::unotools::UnoPolyPolygon(
+        return uno::Reference< rendering::XLinePolyPolygon2D >( 
+            new ::basegfx::unotools::UnoPolyPolygon( 
                 ::basegfx::unotools::polyPolygonFromPoint2DSequenceSequence( points )));
     }
 
-    uno::Reference< rendering::XBezierPolyPolygon2D > DeviceHelper::createCompatibleBezierPolyPolygon(
-        const uno::Reference< rendering::XGraphicDevice >&                      /*rDevice*/,
-        const uno::Sequence< uno::Sequence< geometry::RealBezierSegment2D > >&  points )
+    uno::Reference< rendering::XBezierPolyPolygon2D > DeviceHelper::createCompatibleBezierPolyPolygon( 
+        const uno::Reference< rendering::XGraphicDevice >& 						/*rDevice*/,
+        const uno::Sequence< uno::Sequence< geometry::RealBezierSegment2D > >&	points )
     {
         // disposed?
         if( !mpSpriteCanvas )
             return uno::Reference< rendering::XBezierPolyPolygon2D >(); // we're disposed
 
-        return uno::Reference< rendering::XBezierPolyPolygon2D >(
-            new ::basegfx::unotools::UnoPolyPolygon(
+        return uno::Reference< rendering::XBezierPolyPolygon2D >( 
+            new ::basegfx::unotools::UnoPolyPolygon( 
                 ::basegfx::unotools::polyPolygonFromBezier2DSequenceSequence( points ) ) );
     }
 
-    uno::Reference< rendering::XBitmap > DeviceHelper::createCompatibleBitmap(
-        const uno::Reference< rendering::XGraphicDevice >&  /*rDevice*/,
-        const geometry::IntegerSize2D&                      size )
+    uno::Reference< rendering::XBitmap > DeviceHelper::createCompatibleBitmap( 
+        const uno::Reference< rendering::XGraphicDevice >& 	/*rDevice*/,
+        const geometry::IntegerSize2D& 						size )
     {
         // disposed?
         if( !mpSpriteCanvas )
@@ -121,19 +121,19 @@ namespace nullcanvas
             new CanvasBitmap(
                 ::basegfx::unotools::b2ISizeFromIntegerSize2D( size ),
                 mpSpriteCanvas,
-                false ));
+                false )); 
     }
 
-    uno::Reference< rendering::XVolatileBitmap > DeviceHelper::createVolatileBitmap(
-        const uno::Reference< rendering::XGraphicDevice >&  /*rDevice*/,
-        const geometry::IntegerSize2D&                      /*size*/ )
+    uno::Reference< rendering::XVolatileBitmap > DeviceHelper::createVolatileBitmap( 
+        const uno::Reference< rendering::XGraphicDevice >& 	/*rDevice*/,
+        const geometry::IntegerSize2D& 						/*size*/ )
     {
         return uno::Reference< rendering::XVolatileBitmap >();
     }
 
-    uno::Reference< rendering::XBitmap > DeviceHelper::createCompatibleAlphaBitmap(
-        const uno::Reference< rendering::XGraphicDevice >&  /*rDevice*/,
-        const geometry::IntegerSize2D&                      size )
+    uno::Reference< rendering::XBitmap > DeviceHelper::createCompatibleAlphaBitmap( 
+        const uno::Reference< rendering::XGraphicDevice >& 	/*rDevice*/,
+        const geometry::IntegerSize2D& 						size )
     {
         // disposed?
         if( !mpSpriteCanvas )
@@ -143,12 +143,12 @@ namespace nullcanvas
             new CanvasBitmap(
                 ::basegfx::unotools::b2ISizeFromIntegerSize2D( size ),
                 mpSpriteCanvas,
-                true ));
+                true )); 
     }
 
-    uno::Reference< rendering::XVolatileBitmap > DeviceHelper::createVolatileAlphaBitmap(
-        const uno::Reference< rendering::XGraphicDevice >&  /*rDevice*/,
-        const geometry::IntegerSize2D&                      /*size*/ )
+    uno::Reference< rendering::XVolatileBitmap > DeviceHelper::createVolatileAlphaBitmap( 
+        const uno::Reference< rendering::XGraphicDevice >& 	/*rDevice*/,
+        const geometry::IntegerSize2D& 						/*size*/ )
     {
         return uno::Reference< rendering::XVolatileBitmap >();
     }
@@ -164,7 +164,7 @@ namespace nullcanvas
         // TODO(F3): offer fullscreen mode the XCanvas way
         return false;
     }
-
+    
     ::sal_Int32 DeviceHelper::createBuffers( ::sal_Int32 /*nBuffers*/ )
     {
         // TODO(F3): implement XBufferStrategy interface. For now, we
@@ -207,19 +207,19 @@ namespace nullcanvas
     {
         return uno::Any();
     }
-
-    namespace
-    {
+    
+    namespace 
+    { 
         struct DeviceColorSpace: public rtl::StaticWithInit<uno::Reference<rendering::XColorSpace>,
-                                                            DeviceColorSpace>
+                                                            DeviceColorSpace> 
         {
             uno::Reference<rendering::XColorSpace> operator()()
             {
                 return vcl::unotools::createStandardColorSpace();
             }
-        };
+        }; 
     }
-
+    
     uno::Reference<rendering::XColorSpace> DeviceHelper::getColorSpace() const
     {
         // always the same
diff --git a/canvas/source/null/null_devicehelper.hxx b/canvas/source/null/null_devicehelper.hxx
index 2e6298c2e2b6..ff382f06f904 100644
--- a/canvas/source/null/null_devicehelper.hxx
+++ b/canvas/source/null/null_devicehelper.hxx
@@ -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
@@ -47,8 +47,8 @@ namespace nullcanvas
     public:
         DeviceHelper();
 
-        void init( SpriteCanvas&                rSpriteCanvas,
-                   const ::basegfx::B2ISize&    rSize,
+        void init( SpriteCanvas&				rSpriteCanvas,
+                   const ::basegfx::B2ISize&	rSize,
                    bool                         bFullscreen );
 
         /// Dispose all internal references
@@ -57,36 +57,36 @@ namespace nullcanvas
         // XWindowGraphicDevice
         ::com::sun::star::geometry::RealSize2D getPhysicalResolution();
         ::com::sun::star::geometry::RealSize2D getPhysicalSize();
-        ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XLinePolyPolygon2D > createCompatibleLinePolyPolygon(
-            const ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XGraphicDevice >&                               rDevice,
+        ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XLinePolyPolygon2D > createCompatibleLinePolyPolygon( 
+            const ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XGraphicDevice >& 								 rDevice,
             const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< ::com::sun::star::geometry::RealPoint2D > >& points );
-        ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XBezierPolyPolygon2D > createCompatibleBezierPolyPolygon(
-            const ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XGraphicDevice >&                                       rDevice,
+        ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XBezierPolyPolygon2D > createCompatibleBezierPolyPolygon( 
+            const ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XGraphicDevice >& 								 		 rDevice,
             const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< ::com::sun::star::geometry::RealBezierSegment2D > >& points );
-        ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XBitmap > createCompatibleBitmap(
-            const ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XGraphicDevice >&  rDevice,
-            const ::com::sun::star::geometry::IntegerSize2D&                                        size );
-        ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XVolatileBitmap > createVolatileBitmap(
-            const ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XGraphicDevice >&  rDevice,
-            const ::com::sun::star::geometry::IntegerSize2D&                                        size );
-        ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XBitmap > createCompatibleAlphaBitmap(
-            const ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XGraphicDevice >&  rDevice,
-            const ::com::sun::star::geometry::IntegerSize2D&                                        size );
-        ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XVolatileBitmap > createVolatileAlphaBitmap(
-            const ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XGraphicDevice >&  rDevice,
-            const ::com::sun::star::geometry::IntegerSize2D&                                        size );
+        ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XBitmap > createCompatibleBitmap( 
+            const ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XGraphicDevice >& 	rDevice,
+            const ::com::sun::star::geometry::IntegerSize2D& 										size );
+        ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XVolatileBitmap > createVolatileBitmap( 
+            const ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XGraphicDevice >& 	rDevice,
+            const ::com::sun::star::geometry::IntegerSize2D& 										size );
+        ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XBitmap > createCompatibleAlphaBitmap( 
+            const ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XGraphicDevice >& 	rDevice,
+            const ::com::sun::star::geometry::IntegerSize2D& 										size );
+        ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XVolatileBitmap > createVolatileAlphaBitmap( 
+            const ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XGraphicDevice >& 	rDevice,
+            const ::com::sun::star::geometry::IntegerSize2D& 										size );
         sal_Bool hasFullScreenMode(  );
         sal_Bool enterFullScreenMode( sal_Bool bEnter );
 
         ::sal_Int32 createBuffers( ::sal_Int32 nBuffers );
-        void        destroyBuffers(  );
+        void 		destroyBuffers(  );
         ::sal_Bool  showBuffer( bool bIsVisible, ::sal_Bool bUpdateAll );
         ::sal_Bool  switchBuffer( bool bIsVisible, ::sal_Bool bUpdateAll );
 
         ::com::sun::star::uno::Any isAccelerated() const;
         ::com::sun::star::uno::Any getDeviceHandle() const;
         ::com::sun::star::uno::Any getSurfaceHandle() const;
-        ::com::sun::star::uno::Reference<
+        ::com::sun::star::uno::Reference< 
             ::com::sun::star::rendering::XColorSpace> getColorSpace() const;
 
         void notifySizeUpdate( const ::com::sun::star::awt::Rectangle& rBounds );
@@ -98,7 +98,7 @@ namespace nullcanvas
 
     private:
         /// Pointer to sprite canvas (owner of this helper), needed to create bitmaps
-        SpriteCanvas*           mpSpriteCanvas;
+        SpriteCanvas*			mpSpriteCanvas;
         ::basegfx::B2ISize      maSize;
         bool                    mbFullScreen;
     };
diff --git a/canvas/source/null/null_spritecanvas.cxx b/canvas/source/null/null_spritecanvas.cxx
index ac41b3fe149a..76d53e63ee46 100644
--- a/canvas/source/null/null_spritecanvas.cxx
+++ b/canvas/source/null/null_spritecanvas.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
@@ -76,7 +76,7 @@ namespace nullcanvas
         // containing a pointer to a valid window, on which to output
         // At index 2, we expect the current window bound rect
         ENSURE_ARG_OR_THROW( maArguments.getLength() >= 4 &&
-                             maArguments[1].getValueTypeClass() == uno::TypeClass_LONG,
+                             maArguments[1].getValueTypeClass() == uno::TypeClass_LONG, 
                              "SpriteCanvas::initialize: wrong number of arguments, or wrong types" );
 
         awt::Rectangle aRect;
diff --git a/canvas/source/null/null_spritecanvas.hxx b/canvas/source/null/null_spritecanvas.hxx
index 136e09a291db..4aa17fe87dbe 100644
--- a/canvas/source/null/null_spritecanvas.hxx
+++ b/canvas/source/null/null_spritecanvas.hxx
@@ -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
@@ -61,11 +61,11 @@ namespace nullcanvas
                                                ::com::sun::star::rendering::XBufferController,
                                                ::com::sun::star::awt::XWindowListener,
                                                ::com::sun::star::beans::XPropertySet,
-                                               ::com::sun::star::lang::XServiceName >   WindowGraphicDeviceBase_Base;
+                                               ::com::sun::star::lang::XServiceName >	WindowGraphicDeviceBase_Base;
     typedef ::canvas::BufferedGraphicDeviceBase< ::canvas::BaseMutexHelper< WindowGraphicDeviceBase_Base >,
-                                                   DeviceHelper,
+                                                   DeviceHelper, 
                                                    ::osl::MutexGuard,
-                                                   ::cppu::OWeakObject >    SpriteCanvasBase_Base;
+                                                   ::cppu::OWeakObject > 	SpriteCanvasBase_Base;
     /** Mixin SpriteSurface
 
         Have to mixin the SpriteSurface before deriving from
@@ -89,9 +89,9 @@ namespace nullcanvas
     };
 
     typedef ::canvas::SpriteCanvasBase< SpriteCanvasBaseSpriteSurface_Base,
-                                        SpriteCanvasHelper,
+                                        SpriteCanvasHelper, 
                                         ::osl::MutexGuard,
-                                        ::cppu::OWeakObject >           SpriteCanvasBaseT;
+                                        ::cppu::OWeakObject >			SpriteCanvasBaseT;
 
     /** Product of this component's factory.
 
@@ -106,9 +106,9 @@ namespace nullcanvas
                          private UsageCounter< SpriteCanvas >
     {
     public:
-        SpriteCanvas( const ::com::sun::star::uno::Sequence<
+        SpriteCanvas( const ::com::sun::star::uno::Sequence< 
                             ::com::sun::star::uno::Any >&               aArguments,
-                      const ::com::sun::star::uno::Reference<
+                      const ::com::sun::star::uno::Reference< 
                             ::com::sun::star::uno::XComponentContext >& rxContext );
 
         void initialize();
@@ -125,7 +125,7 @@ namespace nullcanvas
         //                                    Classname     Base doing refcounting        Base implementing the XComponent interface
         //                                       |                 |                            |
         //                                       V                 V                            V
-        DECLARE_UNO3_XCOMPONENT_AGG_DEFAULTS( SpriteCanvas, WindowGraphicDeviceBase_Base, ::cppu::WeakComponentImplHelperBase );
+        DECLARE_UNO3_XCOMPONENT_AGG_DEFAULTS( SpriteCanvas, WindowGraphicDeviceBase_Base, ::cppu::WeakComponentImplHelperBase ); 
 
         // XBufferController (partial)
         virtual ::sal_Bool SAL_CALL showBuffer( ::sal_Bool bUpdateAll ) throw (::com::sun::star::uno::RuntimeException);
diff --git a/canvas/source/null/null_spritecanvashelper.cxx b/canvas/source/null/null_spritecanvashelper.cxx
index 60a81726b196..26ba2bd7ad50 100644
--- a/canvas/source/null/null_spritecanvashelper.cxx
+++ b/canvas/source/null/null_spritecanvashelper.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
@@ -32,7 +32,7 @@
 #include <canvas/verbosetrace.hxx>
 #include <canvas/canvastools.hxx>
 
-#include <comphelper/scopeguard.hxx>
+#include <comphelper/scopeguard.hxx> 
 
 #include <basegfx/range/b2drectangle.hxx>
 #include <basegfx/tools/canvastools.hxx>
@@ -61,23 +61,23 @@ namespace nullcanvas
 
         CanvasHelper::init( rSize, rDevice, bHasAlpha );
     }
-
+    
     void SpriteCanvasHelper::disposing()
     {
         mpRedrawManager = NULL;
 
         // forward to base
-        CanvasHelper::disposing();
+        CanvasHelper::disposing();        
     }
 
-    uno::Reference< rendering::XAnimatedSprite > SpriteCanvasHelper::createSpriteFromAnimation(
+    uno::Reference< rendering::XAnimatedSprite > SpriteCanvasHelper::createSpriteFromAnimation( 
         const uno::Reference< rendering::XAnimation >& /*animation*/ )
     {
         return uno::Reference< rendering::XAnimatedSprite >();
     }
 
-    uno::Reference< rendering::XAnimatedSprite > SpriteCanvasHelper::createSpriteFromBitmaps(
-        const uno::Sequence< uno::Reference< rendering::XBitmap > >& /*animationBitmaps*/,
+    uno::Reference< rendering::XAnimatedSprite > SpriteCanvasHelper::createSpriteFromBitmaps( 
+        const uno::Sequence< uno::Reference< rendering::XBitmap > >& /*animationBitmaps*/, 
         sal_Int8                                                     /*interpolationMode*/ )
     {
         return uno::Reference< rendering::XAnimatedSprite >();
@@ -88,8 +88,8 @@ namespace nullcanvas
         if( !mpRedrawManager )
             return uno::Reference< rendering::XCustomSprite >(); // we're disposed
 
-        return uno::Reference< rendering::XCustomSprite >(
-            new CanvasCustomSprite( spriteSize,
+        return uno::Reference< rendering::XCustomSprite >( 
+            new CanvasCustomSprite( spriteSize, 
                                     mpDevice ) );
     }
 
@@ -111,21 +111,21 @@ namespace nullcanvas
         // TODO
     }
 
-    void SpriteCanvasHelper::scrollUpdate( const ::basegfx::B2DRange&                       /*rMoveStart*/,
-                                           const ::basegfx::B2DRange&                       /*rMoveEnd*/,
+    void SpriteCanvasHelper::scrollUpdate( const ::basegfx::B2DRange& 						/*rMoveStart*/, 
+                                           const ::basegfx::B2DRange& 						/*rMoveEnd*/,
                                            const ::canvas::SpriteRedrawManager::UpdateArea& /*rUpdateArea*/ )
     {
         // TODO
     }
-
+    
     void SpriteCanvasHelper::opaqueUpdate( const ::canvas::SpriteRedrawManager::UpdateArea& /*rUpdateArea*/ )
     {
         // TODO
     }
-
+    
     void SpriteCanvasHelper::genericUpdate( const ::canvas::SpriteRedrawManager::UpdateArea& /*rUpdateArea*/ )
     {
         // TODO
     }
-
+    
 }
diff --git a/canvas/source/null/null_spritecanvashelper.hxx b/canvas/source/null/null_spritecanvashelper.hxx
index 4fd7f6764779..b6e740f25acd 100644
--- a/canvas/source/null/null_spritecanvashelper.hxx
+++ b/canvas/source/null/null_spritecanvashelper.hxx
@@ -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
@@ -53,28 +53,28 @@ namespace nullcanvas
                    SpriteCanvas&                  rDevice,
                    const ::basegfx::B2ISize&      rSize,
                    bool                           bHasAlpha );
-
+    
         /// Dispose all internal references
         void disposing();
 
         // XSpriteCanvas
-        ::com::sun::star::uno::Reference<
-              ::com::sun::star::rendering::XAnimatedSprite >        createSpriteFromAnimation(
+        ::com::sun::star::uno::Reference< 
+              ::com::sun::star::rendering::XAnimatedSprite > 		createSpriteFromAnimation( 
                 const ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XAnimation >& animation );
 
-        ::com::sun::star::uno::Reference<
-              ::com::sun::star::rendering::XAnimatedSprite >        createSpriteFromBitmaps(
-                const ::com::sun::star::uno::Sequence<
-                      ::com::sun::star::uno::Reference<
-                            ::com::sun::star::rendering::XBitmap > >& animationBitmaps,
+        ::com::sun::star::uno::Reference< 
+              ::com::sun::star::rendering::XAnimatedSprite > 		createSpriteFromBitmaps( 
+                const ::com::sun::star::uno::Sequence< 
+                      ::com::sun::star::uno::Reference< 
+                            ::com::sun::star::rendering::XBitmap > >& animationBitmaps, 
                 sal_Int8                                              interpolationMode );
-
-        ::com::sun::star::uno::Reference<
-              ::com::sun::star::rendering::XCustomSprite >      createCustomSprite(
+    
+        ::com::sun::star::uno::Reference< 
+              ::com::sun::star::rendering::XCustomSprite > 		createCustomSprite( 
                 const ::com::sun::star::geometry::RealSize2D& spriteSize );
-
-        ::com::sun::star::uno::Reference<
-              ::com::sun::star::rendering::XSprite >                createClonedSprite(
+    
+        ::com::sun::star::uno::Reference< 
+              ::com::sun::star::rendering::XSprite > 				createClonedSprite( 
                 const ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XSprite >& original );
 
         /** Actually perform the screen update
@@ -118,9 +118,9 @@ namespace nullcanvas
             All info necessary, should rMoveStart be partially or
             fully outside the outdev
          */
-        void scrollUpdate( const ::basegfx::B2DRange&                           rMoveStart,
-                           const ::basegfx::B2DRange&                           rMoveEnd,
-                           const ::canvas::SpriteRedrawManager::UpdateArea&     rUpdateArea );
+        void scrollUpdate( const ::basegfx::B2DRange& 							rMoveStart, 
+                           const ::basegfx::B2DRange& 							rMoveEnd,
+                           const ::canvas::SpriteRedrawManager::UpdateArea& 	rUpdateArea );
 
         void opaqueUpdate( const ::canvas::SpriteRedrawManager::UpdateArea& rUpdateArea );
 
@@ -128,7 +128,7 @@ namespace nullcanvas
 
     private:
         /// Set from the SpriteCanvas: instance coordinating sprite redraw
-        ::canvas::SpriteRedrawManager*  mpRedrawManager;
+        ::canvas::SpriteRedrawManager*	mpRedrawManager;
     };
 }
 
diff --git a/canvas/source/null/null_spritehelper.cxx b/canvas/source/null/null_spritehelper.cxx
index 94a4fa6b6578..182b8cd4368e 100644
--- a/canvas/source/null/null_spritehelper.cxx
+++ b/canvas/source/null/null_spritehelper.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
@@ -62,9 +62,9 @@ namespace nullcanvas
         mbTextureDirty( true )
     {
     }
-
-    void SpriteHelper::init( const geometry::RealSize2D&    rSpriteSize,
-                             const SpriteCanvasRef&         rSpriteCanvas )
+    
+    void SpriteHelper::init( const geometry::RealSize2D&	rSpriteSize,
+                             const SpriteCanvasRef&			rSpriteCanvas )
     {
         ENSURE_OR_THROW( rSpriteCanvas.get(),
                           "SpriteHelper::init(): Invalid device, sprite canvas or surface" );
diff --git a/canvas/source/null/null_spritehelper.hxx b/canvas/source/null/null_spritehelper.hxx
index 18585374ad9a..5b01322a3b4b 100644
--- a/canvas/source/null/null_spritehelper.hxx
+++ b/canvas/source/null/null_spritehelper.hxx
@@ -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
@@ -78,8 +78,8 @@ namespace nullcanvas
             @param bShowSpriteBounds
             When true, little debug bound rects for sprites are shown
          */
-        void init( const ::com::sun::star::geometry::RealSize2D&    rSpriteSize,
-                   const SpriteCanvasRef&                           rSpriteCanvas );
+        void init( const ::com::sun::star::geometry::RealSize2D&	rSpriteSize,
+                   const SpriteCanvasRef&							rSpriteCanvas );
 
         void disposing();
 
@@ -91,13 +91,13 @@ namespace nullcanvas
             dirty or not. If texture was updated, set to false
          */
         void redraw( bool& io_bSurfaceDirty ) const;
-
+        
     private:
-        virtual ::basegfx::B2DPolyPolygon polyPolygonFromXPolyPolygon2D(
+        virtual ::basegfx::B2DPolyPolygon polyPolygonFromXPolyPolygon2D( 
             ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XPolyPolygon2D >& xPoly ) const;
 
 
-        SpriteCanvasRef             mpSpriteCanvas;
+        SpriteCanvasRef				mpSpriteCanvas;
         mutable bool                mbTextureDirty;  // when true, texture needs update
     };
 }
diff --git a/canvas/source/null/null_textlayout.cxx b/canvas/source/null/null_textlayout.cxx
index 991de3421958..14552df88b5b 100644
--- a/canvas/source/null/null_textlayout.cxx
+++ b/canvas/source/null/null_textlayout.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
@@ -43,10 +43,10 @@ using namespace ::com::sun::star;
 
 namespace nullcanvas
 {
-    TextLayout::TextLayout( const rendering::StringContext&     aText,
-                            sal_Int8                            nDirection,
-                            sal_Int64                           /*nRandomSeed*/,
-                            const CanvasFont::ImplRef&          rFont ) :
+    TextLayout::TextLayout( const rendering::StringContext& 	aText, 
+                            sal_Int8                        	nDirection, 
+                            sal_Int64                       	/*nRandomSeed*/,
+                            const CanvasFont::ImplRef&      	rFont ) :
         TextLayout_Base( m_aMutex ),
         maText( aText ),
         maLogicalAdvancements(),
@@ -54,7 +54,7 @@ namespace nullcanvas
         mnTextDirection( nDirection )
     {
     }
-
+    
     TextLayout::~TextLayout()
     {
     }
@@ -143,7 +143,7 @@ namespace nullcanvas
         return 0.0;
     }
 
-    double SAL_CALL TextLayout::combinedJustify( const uno::Sequence< uno::Reference< rendering::XTextLayout > >& /*aNextLayouts*/,
+    double SAL_CALL TextLayout::combinedJustify( const uno::Sequence< uno::Reference< rendering::XTextLayout > >& /*aNextLayouts*/, 
                                                  double /*nSize*/ ) throw (lang::IllegalArgumentException, uno::RuntimeException)
     {
         ::osl::MutexGuard aGuard( m_aMutex );
@@ -160,7 +160,7 @@ namespace nullcanvas
         return rendering::TextHit();
     }
 
-    rendering::Caret SAL_CALL TextLayout::getCaret( sal_Int32 /*nInsertionIndex*/,
+    rendering::Caret SAL_CALL TextLayout::getCaret( sal_Int32 /*nInsertionIndex*/, 
                                                     sal_Bool  /*bExcludeLigatures*/ ) throw (lang::IndexOutOfBoundsException, uno::RuntimeException)
     {
         ::osl::MutexGuard aGuard( m_aMutex );
@@ -169,8 +169,8 @@ namespace nullcanvas
         return rendering::Caret();
     }
 
-    sal_Int32 SAL_CALL TextLayout::getNextInsertionIndex( sal_Int32 /*nStartIndex*/,
-                                                          sal_Int32 /*nCaretAdvancement*/,
+    sal_Int32 SAL_CALL TextLayout::getNextInsertionIndex( sal_Int32 /*nStartIndex*/, 
+                                                          sal_Int32 /*nCaretAdvancement*/, 
                                                           sal_Bool  /*bExcludeLigatures*/ ) throw (lang::IndexOutOfBoundsException, uno::RuntimeException)
     {
         ::osl::MutexGuard aGuard( m_aMutex );
@@ -179,7 +179,7 @@ namespace nullcanvas
         return 0;
     }
 
-    uno::Reference< rendering::XPolyPolygon2D > SAL_CALL TextLayout::queryVisualHighlighting( sal_Int32 /*nStartIndex*/,
+    uno::Reference< rendering::XPolyPolygon2D > SAL_CALL TextLayout::queryVisualHighlighting( sal_Int32 /*nStartIndex*/, 
                                                                                               sal_Int32 /*nEndIndex*/ ) throw (lang::IndexOutOfBoundsException, uno::RuntimeException)
     {
         ::osl::MutexGuard aGuard( m_aMutex );
@@ -188,7 +188,7 @@ namespace nullcanvas
         return uno::Reference< rendering::XPolyPolygon2D >();
     }
 
-    uno::Reference< rendering::XPolyPolygon2D > SAL_CALL TextLayout::queryLogicalHighlighting( sal_Int32 /*nStartIndex*/,
+    uno::Reference< rendering::XPolyPolygon2D > SAL_CALL TextLayout::queryLogicalHighlighting( sal_Int32 /*nStartIndex*/, 
                                                                                                sal_Int32 /*nEndIndex*/ ) throw (lang::IndexOutOfBoundsException, uno::RuntimeException)
     {
         ::osl::MutexGuard aGuard( m_aMutex );
@@ -225,10 +225,10 @@ namespace nullcanvas
 
         return maText;
     }
-
-    bool TextLayout::draw( const rendering::ViewState&                          /*rViewState*/,
-                           const rendering::RenderState&                        /*rRenderState*/,
-                           const uno::Reference< rendering::XGraphicDevice >&   /*xGraphicDevice*/ ) const
+  
+    bool TextLayout::draw( const rendering::ViewState& 							/*rViewState*/, 
+                           const rendering::RenderState& 						/*rRenderState*/,
+                           const uno::Reference< rendering::XGraphicDevice >&	/*xGraphicDevice*/ ) const
     {
         ::osl::MutexGuard aGuard( m_aMutex );
 
@@ -255,7 +255,7 @@ namespace nullcanvas
     {
         uno::Sequence< ::rtl::OUString > aRet(1);
         aRet[0] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM ( SERVICE_NAME ) );
-
+        
         return aRet;
     }
 }
diff --git a/canvas/source/null/null_textlayout.hxx b/canvas/source/null/null_textlayout.hxx
index 4e348b2f5fa8..7902a1669b38 100644
--- a/canvas/source/null/null_textlayout.hxx
+++ b/canvas/source/null/null_textlayout.hxx
@@ -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
@@ -49,14 +49,14 @@ namespace nullcanvas
     typedef ::cppu::WeakComponentImplHelper2< ::com::sun::star::rendering::XTextLayout,
                                                ::com::sun::star::lang::XServiceInfo > TextLayout_Base;
 
-    class TextLayout : public ::comphelper::OBaseMutex,
+    class TextLayout : public ::comphelper::OBaseMutex, 
                        public TextLayout_Base,
                        private UsageCounter< TextLayout >,
                        private ::boost::noncopyable
     {
     public:
-        TextLayout( const ::com::sun::star::rendering::StringContext& aText,
-                    sal_Int8                                                  nDirection,
+        TextLayout( const ::com::sun::star::rendering::StringContext& aText, 
+                    sal_Int8                                                  nDirection, 
                     sal_Int64                                                 nRandomSeed,
                     const CanvasFont::ImplRef&                                rFont );
 
@@ -81,15 +81,15 @@ namespace nullcanvas
         virtual sal_Int8 SAL_CALL getMainTextDirection(  ) throw (::com::sun::star::uno::RuntimeException);
         virtual ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XCanvasFont > SAL_CALL getFont(  ) throw (::com::sun::star::uno::RuntimeException);
         virtual ::com::sun::star::rendering::StringContext SAL_CALL getText(  ) throw (::com::sun::star::uno::RuntimeException);
-
+        
         // XServiceInfo
         virtual ::rtl::OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException );
         virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw( ::com::sun::star::uno::RuntimeException );
         virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames()  throw( ::com::sun::star::uno::RuntimeException );
 
-        bool draw( const ::com::sun::star::rendering::ViewState&         rViewState,
+        bool draw( const ::com::sun::star::rendering::ViewState&         rViewState, 
                    const ::com::sun::star::rendering::RenderState&       rRenderState,
-                   const ::com::sun::star::uno::Reference<
+                   const ::com::sun::star::uno::Reference< 
                          ::com::sun::star::rendering::XGraphicDevice >&  xGraphicDevice ) const;
 
     protected:
diff --git a/canvas/source/null/null_usagecounter.hxx b/canvas/source/null/null_usagecounter.hxx
index 28e3c6b2c176..486b894e4787 100644
--- a/canvas/source/null/null_usagecounter.hxx
+++ b/canvas/source/null/null_usagecounter.hxx
@@ -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
@@ -52,7 +52,7 @@ namespace nullcanvas
         ~UsageCounter()
         {
             const sal_Int32 nCount( osl_decrementInterlockedCount( &s_nCount ) );
-
+            
             if( !nCount )
             {
                 OSL_TRACE( "%s, last instance deleted.\n",
diff --git a/canvas/source/null/sprite.hxx b/canvas/source/null/sprite.hxx
index d34070848765..5938778b73f5 100644
--- a/canvas/source/null/sprite.hxx
+++ b/canvas/source/null/sprite.hxx
@@ -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
diff --git a/canvas/source/simplecanvas/simplecanvasimpl.cxx b/canvas/source/simplecanvas/simplecanvasimpl.cxx
index 2c87eb6d5621..cb105cbdc236 100644
--- a/canvas/source/simplecanvas/simplecanvasimpl.cxx
+++ b/canvas/source/simplecanvas/simplecanvasimpl.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
@@ -56,16 +56,16 @@ using namespace canvas;
 
 namespace
 {
-    inline uno::Sequence< double > color2Sequence( sal_Int32 const& nColor      )
+    inline uno::Sequence< double > color2Sequence( sal_Int32 const& nColor  	)
     {
         // TODO(F3): Color management
         uno::Sequence< double > aRes( 4 );
-
-        aRes[0] = static_cast<sal_uInt8>( (nColor&0xFF000000U) >> 24U ) / 255.0;
-        aRes[1] = static_cast<sal_uInt8>( (nColor&0x00FF0000U) >> 16U ) / 255.0;
-        aRes[2] = static_cast<sal_uInt8>( (nColor&0x0000FF00U) >>  8U ) / 255.0;
-        aRes[3] = static_cast<sal_uInt8>( (nColor&0x000000FFU) )        / 255.0;
-
+        
+        aRes[0] = static_cast<sal_uInt8>( (nColor&0xFF000000U) >> 24U ) / 255.0; 
+        aRes[1] = static_cast<sal_uInt8>( (nColor&0x00FF0000U) >> 16U ) / 255.0; 
+        aRes[2] = static_cast<sal_uInt8>( (nColor&0x0000FF00U) >>  8U ) / 255.0; 
+        aRes[3] = static_cast<sal_uInt8>( (nColor&0x000000FFU) )        / 255.0; 
+        
         return aRes;
     }
 
@@ -85,7 +85,7 @@ namespace
         uno::Reference< rendering::XPolyPolygon2D > xRes(
             xDevice->createCompatibleLinePolyPolygon( sequenceSequence ),
             uno::UNO_QUERY );
-        if( xRes.is() )
+        if( xRes.is() ) 
             xRes->setClosed( 0, sal_True );
         return xRes;
     }
@@ -117,7 +117,7 @@ namespace
 
 
     typedef ::cppu::WeakComponentImplHelper2< ::com::sun::star::rendering::XSimpleCanvas,
-                                              ::com::sun::star::lang::XServiceName >    SimpleCanvasBase;
+                                              ::com::sun::star::lang::XServiceName >	SimpleCanvasBase;
 
     class SimpleCanvasImpl : private cppu::BaseMutex,
                              public SimpleCanvasBase
@@ -129,7 +129,7 @@ namespace
         }
 
         rendering::RenderState createStrokingRenderState() const
-        {
+        { 
             return rendering::RenderState(maRenderState.m_aTransformation,
                                           *maRenderState.m_aRectClip,
                                           *maRenderState.m_aPenColor,
@@ -142,7 +142,7 @@ namespace
         }
 
         rendering::RenderState createFillingRenderState() const
-        {
+        { 
             return rendering::RenderState(maRenderState.m_aTransformation,
                                           *maRenderState.m_aRectClip,
                                           *maRenderState.m_aFillColor,
@@ -173,7 +173,7 @@ namespace
             mxCanvas( grabCanvas(aArguments) ),
             maFont(boost::bind( &rendering::XCanvas::createFont,
                                 boost::cref(mxCanvas),
-                                _1,
+                                _1, 
                                 uno::Sequence< beans::PropertyValue >(),
                                 geometry::Matrix2D() )),
             maViewState(),
@@ -192,18 +192,18 @@ namespace
         }
 
         // Ifc XSimpleCanvas
-        virtual void SAL_CALL selectFont( const ::rtl::OUString& sFontName,
-                                          double                 size,
-                                          ::sal_Bool             bold,
+        virtual void SAL_CALL selectFont( const ::rtl::OUString& sFontName, 
+                                          double                 size, 
+                                          ::sal_Bool             bold, 
                                           ::sal_Bool             italic ) throw (uno::RuntimeException)
         {
             ::osl::MutexGuard aGuard( m_aMutex );
-
+            
             maFont->FontDescription.FamilyName = sFontName;
             maFont->CellSize = size;
-            maFont->FontDescription.FontDescription.Weight =
+            maFont->FontDescription.FontDescription.Weight = 
                 bold ? rendering::PanoseWeight::BOLD : rendering::PanoseWeight::MEDIUM;
-            maFont->FontDescription.FontDescription.Letterform =
+            maFont->FontDescription.FontDescription.Letterform = 
                 italic ? rendering::PanoseLetterForm::OBLIQUE_CONTACT : rendering::PanoseLetterForm::ANYTHING;
         }
 
@@ -239,7 +239,7 @@ namespace
                                 createFillingRenderState());
         }
 
-        virtual void SAL_CALL drawLine( const geometry::RealPoint2D& aStartPoint,
+        virtual void SAL_CALL drawLine( const geometry::RealPoint2D& aStartPoint, 
                                         const geometry::RealPoint2D& aEndPoint ) throw (uno::RuntimeException)
         {
             ::osl::MutexGuard aGuard( m_aMutex );
@@ -280,8 +280,8 @@ namespace
                                           createStrokingRenderState());
         }
 
-        virtual void SAL_CALL drawText( const rendering::StringContext& aText,
-                                        const geometry::RealPoint2D&    aOutPos,
+        virtual void SAL_CALL drawText( const rendering::StringContext& aText, 
+                                        const geometry::RealPoint2D&    aOutPos, 
                                         ::sal_Int8                      nTextDirection ) throw (uno::RuntimeException)
         {
             ::osl::MutexGuard aGuard( m_aMutex );
@@ -296,7 +296,7 @@ namespace
                                nTextDirection);
         }
 
-        virtual void SAL_CALL drawBitmap( const uno::Reference< rendering::XBitmap >& xBitmap,
+        virtual void SAL_CALL drawBitmap( const uno::Reference< rendering::XBitmap >& xBitmap, 
                                           const geometry::RealPoint2D&                aLeftTop ) throw (uno::RuntimeException)
         {
             ::osl::MutexGuard aGuard( m_aMutex );
@@ -379,7 +379,7 @@ namespace
 
         uno::Reference<rendering::XCanvas> mxCanvas;
         SimpleFont                         maFont;
-        rendering::ViewState               maViewState;
+        rendering::ViewState               maViewState;   
         SimpleRenderState                  maRenderState;
     };
 
diff --git a/canvas/source/tools/bitmap.cxx b/canvas/source/tools/bitmap.cxx
index eb7732b9a8f6..4bc517605377 100644
--- a/canvas/source/tools/bitmap.cxx
+++ b/canvas/source/tools/bitmap.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
@@ -141,9 +141,9 @@ namespace canvas
             mpImage->unlock();
         }
 
-        void setPixel( const ::com::sun::star::uno::Sequence< sal_Int8 >&       color,
+        void setPixel( const ::com::sun::star::uno::Sequence< sal_Int8 >&		color,
                        const ::com::sun::star::rendering::IntegerBitmapLayout&  /*bitmapLayout*/,
-                       const ::com::sun::star::geometry::IntegerPoint2D&        pos )
+                       const ::com::sun::star::geometry::IntegerPoint2D&		pos )
         {
             struct ARGBColor
             {
@@ -307,7 +307,7 @@ namespace canvas
         }
 
         void fillB2DPolyPolygon( const ::basegfx::B2DPolyPolygon&   rPolyPolygon,
-                                 const rendering::ViewState&        viewState,
+                                 const rendering::ViewState& 		viewState,
                                  const rendering::RenderState&      renderState )
         {
             mbIsSurfaceDirty = true;
@@ -321,28 +321,28 @@ namespace canvas
         // the XCanvas-render interface
         // ============================
 
-        void drawPoint( const geometry::RealPoint2D&    aPoint,
-                        const rendering::ViewState&     viewState,
-                        const rendering::RenderState&   renderState )
+        void drawPoint( const geometry::RealPoint2D& 	aPoint,
+                        const rendering::ViewState& 	viewState,
+                        const rendering::RenderState& 	renderState )
         {
             mbIsSurfaceDirty = true;
 
             mpImage->drawPoint( aPoint, viewState, renderState );
         }
 
-        void drawLine( const geometry::RealPoint2D&     aStartPoint,
-                       const geometry::RealPoint2D&     aEndPoint,
+        void drawLine( const geometry::RealPoint2D& 	aStartPoint,
+                       const geometry::RealPoint2D& 	aEndPoint,
                        const rendering::ViewState&      viewState,
-                       const rendering::RenderState&    renderState )
+                       const rendering::RenderState& 	renderState	)
         {
             mbIsSurfaceDirty = true;
 
             mpImage->drawLine( aStartPoint, aEndPoint, viewState, renderState );
         }
 
-        void drawBezier( const geometry::RealBezierSegment2D&   aBezierSegment,
+        void drawBezier( const geometry::RealBezierSegment2D&	aBezierSegment,
                          const geometry::RealPoint2D&           aEndPoint,
-                         const rendering::ViewState&            viewState,
+                         const rendering::ViewState& 			viewState,
                          const rendering::RenderState&          renderState )
         {
             mbIsSurfaceDirty = true;
@@ -351,7 +351,7 @@ namespace canvas
         }
 
         ICachedPrimitiveSharedPtr drawPolyPolygon(
-            const uno::Reference< rendering::XPolyPolygon2D >&  xPolyPolygon,
+            const uno::Reference< rendering::XPolyPolygon2D >& 	xPolyPolygon,
             const rendering::ViewState&                         viewState,
             const rendering::RenderState&                       renderState )
         {
@@ -362,7 +362,7 @@ namespace canvas
         }
 
         ICachedPrimitiveSharedPtr strokePolyPolygon(
-            const uno::Reference< rendering::XPolyPolygon2D >&  xPolyPolygon,
+            const uno::Reference< rendering::XPolyPolygon2D >& 	xPolyPolygon,
             const rendering::ViewState&                         viewState,
             const rendering::RenderState&                       renderState,
             const rendering::StrokeAttributes&                  strokeAttributes )
@@ -377,7 +377,7 @@ namespace canvas
         }
 
         ICachedPrimitiveSharedPtr strokeTexturedPolyPolygon(
-            const uno::Reference< rendering::XPolyPolygon2D >&   xPolyPolygon,
+            const uno::Reference< rendering::XPolyPolygon2D >& 	 xPolyPolygon,
             const rendering::ViewState&                          viewState,
             const rendering::RenderState&                        renderState,
             const uno::Sequence< rendering::Texture >&           textures,
@@ -400,7 +400,7 @@ namespace canvas
         }
 
         ICachedPrimitiveSharedPtr strokeTextureMappedPolyPolygon(
-            const uno::Reference< rendering::XPolyPolygon2D >&   xPolyPolygon,
+            const uno::Reference< rendering::XPolyPolygon2D >& 	 xPolyPolygon,
             const rendering::ViewState&                          viewState,
             const rendering::RenderState&                        renderState,
             const uno::Sequence< rendering::Texture >&           textures,
@@ -426,7 +426,7 @@ namespace canvas
 
 
         ICachedPrimitiveSharedPtr fillPolyPolygon(
-            const uno::Reference< rendering::XPolyPolygon2D >&  xPolyPolygon,
+            const uno::Reference< rendering::XPolyPolygon2D >& 	xPolyPolygon,
             const rendering::ViewState&                         viewState,
             const rendering::RenderState&                       renderState )
         {
@@ -439,7 +439,7 @@ namespace canvas
         }
 
         ICachedPrimitiveSharedPtr fillTexturedPolyPolygon(
-            const uno::Reference< rendering::XPolyPolygon2D >&   xPolyPolygon,
+            const uno::Reference< rendering::XPolyPolygon2D >&	 xPolyPolygon,
             const rendering::ViewState&                          viewState,
             const rendering::RenderState&                        renderState,
             const uno::Sequence< rendering::Texture >&           textures,
@@ -461,7 +461,7 @@ namespace canvas
 
 
         ICachedPrimitiveSharedPtr fillTextureMappedPolyPolygon(
-            const uno::Reference< rendering::XPolyPolygon2D >&   xPolyPolygon,
+            const uno::Reference< rendering::XPolyPolygon2D >& 	 xPolyPolygon,
             const rendering::ViewState&                          viewState,
             const rendering::RenderState&                        renderState,
             const uno::Sequence< rendering::Texture >&           textures,
@@ -510,7 +510,7 @@ namespace canvas
         }
 
         ICachedPrimitiveSharedPtr drawBitmapModulated(
-            const uno::Reference< rendering::XBitmap >&     xBitmap,
+            const uno::Reference< rendering::XBitmap >&		xBitmap,
             const rendering::ViewState&                     viewState,
             const rendering::RenderState&                   renderState )
         {
@@ -630,16 +630,16 @@ namespace canvas
     }
 
     void Bitmap::setPixel(
-        const ::com::sun::star::uno::Sequence< sal_Int8 >&      color,
+        const ::com::sun::star::uno::Sequence< sal_Int8 >&		color,
         const ::com::sun::star::rendering::IntegerBitmapLayout& bitmapLayout,
-        const ::com::sun::star::geometry::IntegerPoint2D&       pos )
+        const ::com::sun::star::geometry::IntegerPoint2D&		pos )
     {
         mpImpl->setPixel(color,bitmapLayout,pos);
     }
 
     uno::Sequence< sal_Int8 > Bitmap::getPixel(
-        ::com::sun::star::rendering::IntegerBitmapLayout&       bitmapLayout,
-        const ::com::sun::star::geometry::IntegerPoint2D&       pos )
+        ::com::sun::star::rendering::IntegerBitmapLayout&		bitmapLayout,
+        const ::com::sun::star::geometry::IntegerPoint2D&		pos )
     {
         return mpImpl->getPixel(bitmapLayout,pos);
     }
@@ -675,37 +675,37 @@ namespace canvas
 
     void Bitmap::fillB2DPolyPolygon(
             const ::basegfx::B2DPolyPolygon&    rPolyPolygon,
-            const rendering::ViewState&         viewState,
+            const rendering::ViewState& 		viewState,
             const rendering::RenderState&       renderState )
     {
         mpImpl->fillB2DPolyPolygon( rPolyPolygon, viewState, renderState );
     }
 
-    void Bitmap::drawPoint( const geometry::RealPoint2D&    aPoint,
-                            const rendering::ViewState&     viewState,
-                            const rendering::RenderState&   renderState )
+    void Bitmap::drawPoint( const geometry::RealPoint2D& 	aPoint,
+                            const rendering::ViewState& 	viewState,
+                            const rendering::RenderState& 	renderState )
     {
         return mpImpl->drawPoint( aPoint, viewState, renderState );
     }
 
-    void Bitmap::drawLine( const geometry::RealPoint2D&     aStartPoint,
-                           const geometry::RealPoint2D&     aEndPoint,
+    void Bitmap::drawLine( const geometry::RealPoint2D& 	aStartPoint,
+                           const geometry::RealPoint2D& 	aEndPoint,
                            const rendering::ViewState&      viewState,
-                           const rendering::RenderState&    renderState )
+                           const rendering::RenderState& 	renderState	)
     {
         return mpImpl->drawLine( aStartPoint, aEndPoint, viewState, renderState );
     }
 
-    void Bitmap::drawBezier( const geometry::RealBezierSegment2D&   aBezierSegment,
+    void Bitmap::drawBezier( const geometry::RealBezierSegment2D&	aBezierSegment,
                              const geometry::RealPoint2D&           aEndPoint,
-                             const rendering::ViewState&            viewState,
+                             const rendering::ViewState& 			viewState,
                              const rendering::RenderState&          renderState )
     {
         return mpImpl->drawBezier( aBezierSegment, aEndPoint, viewState, renderState );
     }
 
     ICachedPrimitiveSharedPtr Bitmap::drawPolyPolygon(
-        const uno::Reference< rendering::XPolyPolygon2D >&  xPolyPolygon,
+        const uno::Reference< rendering::XPolyPolygon2D >& 	xPolyPolygon,
         const rendering::ViewState&                         viewState,
         const rendering::RenderState&                       renderState )
     {
@@ -713,7 +713,7 @@ namespace canvas
     }
 
     ICachedPrimitiveSharedPtr Bitmap::strokePolyPolygon(
-        const uno::Reference< rendering::XPolyPolygon2D >&  xPolyPolygon,
+        const uno::Reference< rendering::XPolyPolygon2D >& 	xPolyPolygon,
         const rendering::ViewState&                         viewState,
         const rendering::RenderState&                       renderState,
         const rendering::StrokeAttributes&                  strokeAttributes )
@@ -722,7 +722,7 @@ namespace canvas
     }
 
     ICachedPrimitiveSharedPtr Bitmap::strokeTexturedPolyPolygon(
-        const uno::Reference< rendering::XPolyPolygon2D >&   xPolyPolygon,
+        const uno::Reference< rendering::XPolyPolygon2D >& 	 xPolyPolygon,
         const rendering::ViewState&                          viewState,
         const rendering::RenderState&                        renderState,
         const uno::Sequence< rendering::Texture >&           textures,
@@ -738,7 +738,7 @@ namespace canvas
     }
 
     ICachedPrimitiveSharedPtr Bitmap::strokeTextureMappedPolyPolygon(
-        const uno::Reference< rendering::XPolyPolygon2D >&   xPolyPolygon,
+        const uno::Reference< rendering::XPolyPolygon2D >& 	 xPolyPolygon,
         const rendering::ViewState&                          viewState,
         const rendering::RenderState&                        renderState,
         const uno::Sequence< rendering::Texture >&           textures,
@@ -757,7 +757,7 @@ namespace canvas
 
 
     ICachedPrimitiveSharedPtr Bitmap::fillPolyPolygon(
-        const uno::Reference< rendering::XPolyPolygon2D >&  xPolyPolygon,
+        const uno::Reference< rendering::XPolyPolygon2D >& 	xPolyPolygon,
         const rendering::ViewState&                         viewState,
         const rendering::RenderState&                       renderState )
     {
@@ -767,7 +767,7 @@ namespace canvas
     }
 
     ICachedPrimitiveSharedPtr Bitmap::fillTexturedPolyPolygon(
-        const uno::Reference< rendering::XPolyPolygon2D >&   xPolyPolygon,
+        const uno::Reference< rendering::XPolyPolygon2D >&	 xPolyPolygon,
         const rendering::ViewState&                          viewState,
         const rendering::RenderState&                        renderState,
         const uno::Sequence< rendering::Texture >&           textures,
@@ -781,7 +781,7 @@ namespace canvas
     }
 
     ICachedPrimitiveSharedPtr Bitmap::fillTextureMappedPolyPolygon(
-        const uno::Reference< rendering::XPolyPolygon2D >&   xPolyPolygon,
+        const uno::Reference< rendering::XPolyPolygon2D >& 	 xPolyPolygon,
         const rendering::ViewState&                          viewState,
         const rendering::RenderState&                        renderState,
         const uno::Sequence< rendering::Texture >&           textures,
@@ -817,7 +817,7 @@ namespace canvas
     }
 
     ICachedPrimitiveSharedPtr Bitmap::drawBitmapModulated(
-        const uno::Reference< rendering::XBitmap >&     xBitmap,
+        const uno::Reference< rendering::XBitmap >&		xBitmap,
         const rendering::ViewState&                     viewState,
         const rendering::RenderState&                   renderState )
     {
diff --git a/canvas/source/tools/cachedprimitivebase.cxx b/canvas/source/tools/cachedprimitivebase.cxx
index 0d850b842007..c20585ec5d79 100644
--- a/canvas/source/tools/cachedprimitivebase.cxx
+++ b/canvas/source/tools/cachedprimitivebase.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
@@ -44,9 +44,9 @@ using namespace ::com::sun::star;
 
 namespace canvas
 {
-    CachedPrimitiveBase::CachedPrimitiveBase( const rendering::ViewState&                   rUsedViewState,
-                                              const uno::Reference< rendering::XCanvas >&   rTarget,
-                                              bool                                          bFailForChangedViewTransform ) :
+    CachedPrimitiveBase::CachedPrimitiveBase( const rendering::ViewState&					rUsedViewState,
+                                              const uno::Reference< rendering::XCanvas >&	rTarget,
+                                              bool											bFailForChangedViewTransform ) :
         CachedPrimitiveBase_Base( m_aMutex ),
         maUsedViewState( rUsedViewState ),
         mxTarget( rTarget ),
@@ -71,9 +71,9 @@ namespace canvas
         ::basegfx::B2DHomMatrix aUsedTransformation;
         ::basegfx::B2DHomMatrix aNewTransformation;
 
-        ::basegfx::unotools::homMatrixFromAffineMatrix( aUsedTransformation,
+        ::basegfx::unotools::homMatrixFromAffineMatrix( aUsedTransformation, 
                                                         maUsedViewState.AffineTransform );
-        ::basegfx::unotools::homMatrixFromAffineMatrix( aNewTransformation,
+        ::basegfx::unotools::homMatrixFromAffineMatrix( aNewTransformation, 
                                                         aState.AffineTransform );
 
         const bool bSameViewTransforms( aUsedTransformation == aNewTransformation );
@@ -86,9 +86,9 @@ namespace canvas
             return rendering::RepaintResult::FAILED;
         }
 
-        return doRedraw( aState,
-                         maUsedViewState,
-                         mxTarget,
+        return doRedraw( aState, 
+                         maUsedViewState, 
+                         mxTarget, 
                          bSameViewTransforms );
     }
 
@@ -106,7 +106,7 @@ namespace canvas
     {
         uno::Sequence< ::rtl::OUString > aRet(1);
         aRet[0] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM ( SERVICE_NAME ) );
-
+        
         return aRet;
     }
 }
diff --git a/canvas/source/tools/canvascustomspritehelper.cxx b/canvas/source/tools/canvascustomspritehelper.cxx
index f9d4f186d7a7..94f57e38a749 100644
--- a/canvas/source/tools/canvascustomspritehelper.cxx
+++ b/canvas/source/tools/canvascustomspritehelper.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
@@ -58,7 +58,7 @@ namespace canvas
             maCurrClipBounds.reset();
             mbIsCurrClipRectangle = true;
         }
-        else
+        else 
         {
             const sal_Int32 nNumClipPolygons( mxClipPoly->getNumberOfPolygons() );
 
@@ -77,14 +77,14 @@ namespace canvas
             const ::basegfx::B2DRectangle aBounds( 0.0, 0.0,
                                                    maSize.getX(),
                                                    maSize.getY() );
-
+                
             // rectangular area which is actually covered by the sprite.
             // coordinates are relative to the sprite origin.
             ::basegfx::B2DRectangle aSpriteRectPixel;
             ::canvas::tools::calcTransformedRectBounds( aSpriteRectPixel,
                                                         aBounds,
                                                         maTransform );
-
+                
             // aClipBoundsA = new clip bound rect, intersected
             // with sprite area
             ::basegfx::B2DRectangle aClipBoundsA(rClipBounds);
@@ -101,9 +101,9 @@ namespace canvas
             {
                 // new clip could be a single rectangle - check
                 // that now:
-                const bool bNewClipIsRect(
+                const bool bNewClipIsRect( 
                     ::basegfx::tools::isRectangle( aClipPath.getB2DPolygon(0) ) );
-
+                
                 // both new and old clip are truly rectangles
                 // - can now take the optimized path
                 const bool bUseOptimizedUpdate( bNewClipIsRect &&
@@ -136,14 +136,14 @@ namespace canvas
                     // translate this area to the final position,
                     // coordinates need to be relative to the
                     // spritecanvas.
-                    VectorOfRects::const_iterator       aCurr( aClipDifferences.begin() );
+                    VectorOfRects::const_iterator 		aCurr( aClipDifferences.begin() );
                     const VectorOfRects::const_iterator aEnd( aClipDifferences.end() );
                     while( aCurr != aEnd )
                     {
                         mpSpriteCanvas->updateSprite(
-                            rSprite,
+                            rSprite, 
                             maPosition,
-                            ::basegfx::B2DRectangle(
+                            ::basegfx::B2DRectangle( 
                                 maPosition + aCurr->getMinimum(),
                                 maPosition + aCurr->getMaximum() ) );
                         ++aCurr;
@@ -154,7 +154,7 @@ namespace canvas
                 }
             }
         }
-
+                    
         // caller needs to perform update calls
         return false;
     }
@@ -180,15 +180,15 @@ namespace canvas
     {
     }
 
-    void CanvasCustomSpriteHelper::init( const geometry::RealSize2D&        rSpriteSize,
-                                         const SpriteSurface::Reference&    rOwningSpriteCanvas )
+    void CanvasCustomSpriteHelper::init( const geometry::RealSize2D& 		rSpriteSize,
+                                         const SpriteSurface::Reference&	rOwningSpriteCanvas )
     {
         ENSURE_OR_THROW( rOwningSpriteCanvas.get(),
                           "CanvasCustomSpriteHelper::init(): Invalid owning sprite canvas" );
 
         mpSpriteCanvas = rOwningSpriteCanvas;
         maSize.setX( ::std::max( 1.0,
-                                 ceil( rSpriteSize.Width ) ) ); // round up to nearest int,
+                                 ceil( rSpriteSize.Width ) ) ); // round up to nearest int, 
                                                                  // enforce sprite to have at
                                                                  // least (1,1) pixel size
         maSize.setY( ::std::max( 1.0,
@@ -206,10 +206,10 @@ namespace canvas
         mbIsContentFullyOpaque = false;
     }
 
-    void CanvasCustomSpriteHelper::checkDrawBitmap( const Sprite::Reference&                    rSprite,
-                                                    const uno::Reference< rendering::XBitmap >& xBitmap,
-                                                    const rendering::ViewState&                 viewState,
-                                                    const rendering::RenderState&               renderState )
+    void CanvasCustomSpriteHelper::checkDrawBitmap( const Sprite::Reference& 					rSprite,
+                                                    const uno::Reference< rendering::XBitmap >&	xBitmap, 
+                                                    const rendering::ViewState& 				viewState, 
+                                                    const rendering::RenderState& 				renderState )
     {
         // check whether bitmap is non-alpha, and whether its
         // transformed size covers the whole sprite.
@@ -229,7 +229,7 @@ namespace canvas
                                              rInputSize.Width,
                                              rInputSize.Height ),
                     ::canvas::tools::mergeViewAndRenderTransform(aTransform,
-                                                                 viewState,
+                                                                 viewState, 
                                                                  renderState) ) )
             {
                 // bitmap is opaque and will fully cover the sprite,
@@ -239,8 +239,8 @@ namespace canvas
         }
     }
 
-    void CanvasCustomSpriteHelper::setAlpha( const Sprite::Reference&   rSprite,
-                                             double                     alpha )
+    void CanvasCustomSpriteHelper::setAlpha( const Sprite::Reference&	rSprite,
+                                             double 					alpha )
     {
         if( !mpSpriteCanvas.get() )
             return; // we're disposed
@@ -260,27 +260,27 @@ namespace canvas
         }
     }
 
-    void CanvasCustomSpriteHelper::move( const Sprite::Reference&       rSprite,
-                                         const geometry::RealPoint2D&   aNewPos,
-                                         const rendering::ViewState&    viewState,
-                                         const rendering::RenderState&  renderState )
+    void CanvasCustomSpriteHelper::move( const Sprite::Reference&		rSprite,
+                                         const geometry::RealPoint2D&  	aNewPos, 
+                                         const rendering::ViewState&   	viewState, 
+                                         const rendering::RenderState& 	renderState )
     {
         if( !mpSpriteCanvas.get() )
             return; // we're disposed
 
         ::basegfx::B2DHomMatrix aTransform;
         ::canvas::tools::mergeViewAndRenderTransform(aTransform,
-                                                     viewState,
+                                                     viewState, 
                                                      renderState);
 
         // convert position to device pixel
-        ::basegfx::B2DPoint aPoint(
+        ::basegfx::B2DPoint aPoint( 
             ::basegfx::unotools::b2DPointFromRealPoint2D(aNewPos) );
         aPoint *= aTransform;
 
         if( aPoint != maPosition )
         {
-            const ::basegfx::B2DRectangle&  rBounds( getFullSpriteRect() );
+            const ::basegfx::B2DRectangle& 	rBounds( getFullSpriteRect() );
 
             if( mbActive )
             {
@@ -295,8 +295,8 @@ namespace canvas
         }
     }
 
-    void CanvasCustomSpriteHelper::transform( const Sprite::Reference&          rSprite,
-                                              const geometry::AffineMatrix2D&   aTransformation )
+    void CanvasCustomSpriteHelper::transform( const Sprite::Reference&			rSprite,
+                                              const geometry::AffineMatrix2D&	aTransformation )
     {
         ::basegfx::B2DHomMatrix aMatrix;
         ::basegfx::unotools::homMatrixFromAffineMatrix(aMatrix,
@@ -312,10 +312,10 @@ namespace canvas
             if( !updateClipState( rSprite ) &&
                 mbActive )
             {
-                mpSpriteCanvas->updateSprite( rSprite,
+                mpSpriteCanvas->updateSprite( rSprite, 
                                               maPosition,
                                               rPrevBounds );
-                mpSpriteCanvas->updateSprite( rSprite,
+                mpSpriteCanvas->updateSprite( rSprite, 
                                               maPosition,
                                               getUpdateArea() );
             }
@@ -324,7 +324,7 @@ namespace canvas
         }
     }
 
-    void CanvasCustomSpriteHelper::clip( const Sprite::Reference&                           rSprite,
+    void CanvasCustomSpriteHelper::clip( const Sprite::Reference&							rSprite,
                                          const uno::Reference< rendering::XPolyPolygon2D >& xClip )
     {
         // NULL xClip explicitely allowed here (to clear clipping)
@@ -337,10 +337,10 @@ namespace canvas
         if( !updateClipState( rSprite ) &&
             mbActive )
         {
-            mpSpriteCanvas->updateSprite( rSprite,
+            mpSpriteCanvas->updateSprite( rSprite, 
                                           maPosition,
                                           rPrevBounds );
-            mpSpriteCanvas->updateSprite( rSprite,
+            mpSpriteCanvas->updateSprite( rSprite, 
                                           maPosition,
                                           getUpdateArea() );
         }
@@ -348,8 +348,8 @@ namespace canvas
         mbClipDirty = true;
     }
 
-    void CanvasCustomSpriteHelper::setPriority( const Sprite::Reference&    rSprite,
-                                                double                      nPriority )
+    void CanvasCustomSpriteHelper::setPriority( const Sprite::Reference&	rSprite,
+                                                double 						nPriority )
     {
         if( !mpSpriteCanvas.get() )
             return; // we're disposed
@@ -384,7 +384,7 @@ namespace canvas
 
             if( mfAlpha != 0.0 )
             {
-                mpSpriteCanvas->updateSprite( rSprite,
+                mpSpriteCanvas->updateSprite( rSprite, 
                                               maPosition,
                                               getUpdateArea() );
             }
@@ -402,13 +402,13 @@ namespace canvas
         {
             mpSpriteCanvas->hideSprite( rSprite );
             mbActive = false;
-
+            
             // TODO(P1): if clip is the NULL clip (nothing visible),
             // also save us the update call.
 
             if( mfAlpha != 0.0 )
             {
-                mpSpriteCanvas->updateSprite( rSprite,
+                mpSpriteCanvas->updateSprite( rSprite, 
                                               maPosition,
                                               getUpdateArea() );
             }
@@ -420,7 +420,7 @@ namespace canvas
     // Sprite interface
     bool CanvasCustomSpriteHelper::isAreaUpdateOpaque( const ::basegfx::B2DRange& rUpdateArea ) const
     {
-        if( !mbIsCurrClipRectangle ||
+        if( !mbIsCurrClipRectangle || 
             !mbIsContentFullyOpaque ||
             !::rtl::math::approxEqual(mfAlpha, 1.0) )
         {
@@ -476,7 +476,7 @@ namespace canvas
                                                            maSize.getX(),
                                                            maSize.getY() ) );
         else
-            return ::basegfx::B2DRectangle(
+            return ::basegfx::B2DRectangle( 
                 maPosition + maCurrClipBounds.getMinimum(),
                 maPosition + maCurrClipBounds.getMaximum() );
     }
diff --git a/canvas/source/tools/canvastools.cxx b/canvas/source/tools/canvastools.cxx
index ad833cc3ca40..9ee743137821 100755
--- a/canvas/source/tools/canvastools.cxx
+++ b/canvas/source/tools/canvastools.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
@@ -120,7 +120,7 @@ namespace canvas
     {
         geometry::RealSize2D createInfiniteSize2D()
         {
-            return geometry::RealSize2D(
+            return geometry::RealSize2D( 
                 ::std::numeric_limits<double>::infinity(),
                 ::std::numeric_limits<double>::infinity() );
         }
@@ -145,36 +145,36 @@ namespace canvas
             return viewState;
         }
 
-        ::basegfx::B2DHomMatrix& getViewStateTransform( ::basegfx::B2DHomMatrix&    transform,
-                                                        const rendering::ViewState& viewState )
+        ::basegfx::B2DHomMatrix& getViewStateTransform( ::basegfx::B2DHomMatrix&	transform,
+                                                        const rendering::ViewState&	viewState )
         {
             return ::basegfx::unotools::homMatrixFromAffineMatrix( transform, viewState.AffineTransform );
         }
 
-        rendering::ViewState& setViewStateTransform( rendering::ViewState&          viewState,
-                                                     const ::basegfx::B2DHomMatrix& transform )
+        rendering::ViewState& setViewStateTransform( rendering::ViewState& 			viewState,
+                                                     const ::basegfx::B2DHomMatrix&	transform )
         {
             ::basegfx::unotools::affineMatrixFromHomMatrix( viewState.AffineTransform, transform );
 
             return viewState;
         }
 
-        ::basegfx::B2DHomMatrix& getRenderStateTransform( ::basegfx::B2DHomMatrix&      transform,
-                                                          const rendering::RenderState& renderState )
+        ::basegfx::B2DHomMatrix& getRenderStateTransform( ::basegfx::B2DHomMatrix&		transform,
+                                                          const rendering::RenderState&	renderState )
         {
             return ::basegfx::unotools::homMatrixFromAffineMatrix( transform, renderState.AffineTransform );
         }
 
-        rendering::RenderState& setRenderStateTransform( rendering::RenderState&        renderState,
-                                                         const ::basegfx::B2DHomMatrix& transform )
+        rendering::RenderState& setRenderStateTransform( rendering::RenderState& 		renderState,
+                                                         const ::basegfx::B2DHomMatrix&	transform )
         {
             ::basegfx::unotools::affineMatrixFromHomMatrix( renderState.AffineTransform, transform );
 
             return renderState;
         }
 
-        rendering::RenderState& appendToRenderState( rendering::RenderState&        renderState,
-                                                   const ::basegfx::B2DHomMatrix&   rTransform )
+        rendering::RenderState& appendToRenderState( rendering::RenderState&		renderState,
+                                                   const ::basegfx::B2DHomMatrix&	rTransform )
         {
             ::basegfx::B2DHomMatrix transform;
 
@@ -182,8 +182,8 @@ namespace canvas
             return setRenderStateTransform( renderState, transform * rTransform );
         }
 
-        rendering::ViewState& appendToViewState( rendering::ViewState&          viewState,
-                                                 const ::basegfx::B2DHomMatrix& rTransform )
+        rendering::ViewState& appendToViewState( rendering::ViewState&			viewState,
+                                                 const ::basegfx::B2DHomMatrix&	rTransform )
         {
             ::basegfx::B2DHomMatrix transform;
 
@@ -191,8 +191,8 @@ namespace canvas
             return setViewStateTransform( viewState, transform * rTransform );
         }
 
-        rendering::RenderState& prependToRenderState( rendering::RenderState&           renderState,
-                                                      const ::basegfx::B2DHomMatrix&    rTransform )
+        rendering::RenderState& prependToRenderState( rendering::RenderState&			renderState,
+                                                      const ::basegfx::B2DHomMatrix&	rTransform )
         {
             ::basegfx::B2DHomMatrix transform;
 
@@ -200,8 +200,8 @@ namespace canvas
             return setRenderStateTransform( renderState, rTransform * transform );
         }
 
-        rendering::ViewState& prependToViewState( rendering::ViewState&             viewState,
-                                                  const ::basegfx::B2DHomMatrix&        rTransform )
+        rendering::ViewState& prependToViewState( rendering::ViewState&				viewState,
+                                                  const ::basegfx::B2DHomMatrix&		rTransform )
         {
             ::basegfx::B2DHomMatrix transform;
 
@@ -209,9 +209,9 @@ namespace canvas
             return setViewStateTransform( viewState, rTransform * transform );
         }
 
-        ::basegfx::B2DHomMatrix& mergeViewAndRenderTransform( ::basegfx::B2DHomMatrix&      combinedTransform,
-                                                              const rendering::ViewState&   viewState,
-                                                              const rendering::RenderState& renderState )
+        ::basegfx::B2DHomMatrix& mergeViewAndRenderTransform( ::basegfx::B2DHomMatrix&		combinedTransform,
+                                                              const rendering::ViewState&	viewState,
+                                                              const rendering::RenderState& renderState	)
         {
             ::basegfx::B2DHomMatrix viewTransform;
 
@@ -219,25 +219,25 @@ namespace canvas
             ::basegfx::unotools::homMatrixFromAffineMatrix( viewTransform, viewState.AffineTransform );
 
             // this statement performs combinedTransform = viewTransform * combinedTransform
-            combinedTransform *= viewTransform;
+            combinedTransform *= viewTransform; 
 
             return combinedTransform;
         }
 
-        rendering::ViewState& mergeViewAndRenderState( rendering::ViewState&                        resultViewState,
-                                                       const rendering::ViewState&                  viewState,
-                                                       const rendering::RenderState&                renderState,
-                                                       const uno::Reference< rendering::XCanvas >&  /*xCanvas*/     )
+        rendering::ViewState& mergeViewAndRenderState( rendering::ViewState&						resultViewState,
+                                                       const rendering::ViewState&					viewState,
+                                                       const rendering::RenderState&				renderState,
+                                                       const uno::Reference< rendering::XCanvas >& 	/*xCanvas*/ 	)
         {
-            ::basegfx::B2DHomMatrix     aTmpMatrix;
-            geometry::AffineMatrix2D    convertedMatrix;
+            ::basegfx::B2DHomMatrix		aTmpMatrix;
+            geometry::AffineMatrix2D 	convertedMatrix;
 
             resultViewState.Clip = NULL; // TODO(F2): intersect clippings
 
-            return setViewStateTransform(
+            return setViewStateTransform( 
                 resultViewState,
                 mergeViewAndRenderTransform( aTmpMatrix,
-                                             viewState,
+                                             viewState, 
                                              renderState ) );
         }
 
@@ -263,8 +263,8 @@ namespace canvas
             return matrix;
         }
 
-        namespace
-        {
+        namespace 
+        { 
             class StandardColorSpace : public cppu::WeakImplHelper1< com::sun::star::rendering::XIntegerBitmapColorSpace >
             {
             private:
@@ -287,8 +287,8 @@ namespace canvas
                 {
                     return uno::Sequence< beans::PropertyValue >();
                 }
-                virtual uno::Sequence< double > SAL_CALL convertColorSpace( const uno::Sequence< double >& deviceColor,
-                                                                            const uno::Reference< rendering::XColorSpace >& targetColorSpace ) throw (lang::IllegalArgumentException,
+                virtual uno::Sequence< double > SAL_CALL convertColorSpace( const uno::Sequence< double >& deviceColor, 
+                                                                            const uno::Reference< rendering::XColorSpace >& targetColorSpace ) throw (lang::IllegalArgumentException, 
                                                                                                                                                       uno::RuntimeException)
                 {
                     // TODO(P3): if we know anything about target
@@ -301,7 +301,7 @@ namespace canvas
                 {
                     const double*  pIn( deviceColor.getConstArray() );
                     const sal_Size nLen( deviceColor.getLength() );
-                    ENSURE_ARG_OR_THROW2(nLen%4==0,
+                    ENSURE_ARG_OR_THROW2(nLen%4==0, 
                                          "number of channels no multiple of 4",
                                          static_cast<rendering::XColorSpace*>(this), 0);
 
@@ -318,7 +318,7 @@ namespace canvas
                 {
                     const double*  pIn( deviceColor.getConstArray() );
                     const sal_Size nLen( deviceColor.getLength() );
-                    ENSURE_ARG_OR_THROW2(nLen%4==0,
+                    ENSURE_ARG_OR_THROW2(nLen%4==0, 
                                          "number of channels no multiple of 4",
                                          static_cast<rendering::XColorSpace*>(this), 0);
 
@@ -335,7 +335,7 @@ namespace canvas
                 {
                     const double*  pIn( deviceColor.getConstArray() );
                     const sal_Size nLen( deviceColor.getLength() );
-                    ENSURE_ARG_OR_THROW2(nLen%4==0,
+                    ENSURE_ARG_OR_THROW2(nLen%4==0, 
                                          "number of channels no multiple of 4",
                                          static_cast<rendering::XColorSpace*>(this), 0);
 
@@ -413,15 +413,15 @@ namespace canvas
                 {
                     return util::Endianness::LITTLE;
                 }
-                virtual uno::Sequence<double> SAL_CALL convertFromIntegerColorSpace( const uno::Sequence< ::sal_Int8 >& deviceColor,
-                                                                                     const uno::Reference< rendering::XColorSpace >& targetColorSpace ) throw (lang::IllegalArgumentException,
+                virtual uno::Sequence<double> SAL_CALL convertFromIntegerColorSpace( const uno::Sequence< ::sal_Int8 >& deviceColor, 
+                                                                                     const uno::Reference< rendering::XColorSpace >& targetColorSpace ) throw (lang::IllegalArgumentException, 
                                                                                                                                                                uno::RuntimeException)
                 {
                     if( dynamic_cast<StandardColorSpace*>(targetColorSpace.get()) )
                     {
                         const sal_Int8* pIn( deviceColor.getConstArray() );
                         const sal_Size  nLen( deviceColor.getLength() );
-                        ENSURE_ARG_OR_THROW2(nLen%4==0,
+                        ENSURE_ARG_OR_THROW2(nLen%4==0, 
                                              "number of channels no multiple of 4",
                                              static_cast<rendering::XColorSpace*>(this), 0);
 
@@ -445,8 +445,8 @@ namespace canvas
                         return targetColorSpace->convertFromARGB(aIntermediate);
                     }
                 }
-                virtual uno::Sequence< ::sal_Int8 > SAL_CALL convertToIntegerColorSpace( const uno::Sequence< ::sal_Int8 >& deviceColor,
-                                                                                         const uno::Reference< rendering::XIntegerBitmapColorSpace >& targetColorSpace ) throw (lang::IllegalArgumentException,
+                virtual uno::Sequence< ::sal_Int8 > SAL_CALL convertToIntegerColorSpace( const uno::Sequence< ::sal_Int8 >& deviceColor, 
+                                                                                         const uno::Reference< rendering::XIntegerBitmapColorSpace >& targetColorSpace ) throw (lang::IllegalArgumentException, 
                                                                                                                                                                               uno::RuntimeException)
                 {
                     if( dynamic_cast<StandardColorSpace*>(targetColorSpace.get()) )
@@ -467,7 +467,7 @@ namespace canvas
                 {
                     const sal_Int8* pIn( deviceColor.getConstArray() );
                     const sal_Size  nLen( deviceColor.getLength() );
-                    ENSURE_ARG_OR_THROW2(nLen%4==0,
+                    ENSURE_ARG_OR_THROW2(nLen%4==0, 
                                          "number of channels no multiple of 4",
                                          static_cast<rendering::XColorSpace*>(this), 0);
 
@@ -488,7 +488,7 @@ namespace canvas
                 {
                     const sal_Int8* pIn( deviceColor.getConstArray() );
                     const sal_Size  nLen( deviceColor.getLength() );
-                    ENSURE_ARG_OR_THROW2(nLen%4==0,
+                    ENSURE_ARG_OR_THROW2(nLen%4==0, 
                                          "number of channels no multiple of 4",
                                          static_cast<rendering::XColorSpace*>(this), 0);
 
@@ -510,7 +510,7 @@ namespace canvas
                 {
                     const sal_Int8* pIn( deviceColor.getConstArray() );
                     const sal_Size  nLen( deviceColor.getLength() );
-                    ENSURE_ARG_OR_THROW2(nLen%4==0,
+                    ENSURE_ARG_OR_THROW2(nLen%4==0, 
                                          "number of channels no multiple of 4",
                                          static_cast<rendering::XColorSpace*>(this), 0);
 
@@ -584,7 +584,7 @@ namespace canvas
                 }
 
             public:
-                StandardColorSpace() :
+                StandardColorSpace() : 
                     maComponentTags(4),
                     maBitCounts(4)
                 {
@@ -595,21 +595,21 @@ namespace canvas
                     pTags[2] = rendering::ColorComponentTag::RGB_BLUE;
                     pTags[3] = rendering::ColorComponentTag::ALPHA;
 
-                    pBitCounts[0] =
-                    pBitCounts[1] =
-                    pBitCounts[2] =
+                    pBitCounts[0] = 
+                    pBitCounts[1] = 
+                    pBitCounts[2] = 
                     pBitCounts[3] = 8;
                 }
             };
 
             struct StandardColorSpaceHolder : public rtl::StaticWithInit<uno::Reference<rendering::XIntegerBitmapColorSpace>,
-                                                                         StandardColorSpaceHolder>
+                                                                         StandardColorSpaceHolder> 
             {
                 uno::Reference<rendering::XIntegerBitmapColorSpace> operator()()
                 {
                     return new StandardColorSpace();
                 }
-            };
+            }; 
         }
 
         uno::Reference<rendering::XIntegerBitmapColorSpace> getStdColorSpace()
@@ -639,7 +639,7 @@ namespace canvas
             return ::Color( pCols[3], pCols[0], pCols[1], pCols[2] );
 #else
             return ::Color( *reinterpret_cast< const ::ColorData* >(rColor.getConstArray()) );
-#endif
+#endif            
         }
 
         uno::Sequence<sal_Int8> colorToStdIntSequence( const ::Color& rColor )
@@ -662,17 +662,17 @@ namespace canvas
         // rSpriteSize is mapped with its left,top corner to (0,0)
         // again. This is required to properly render sprite
         // animations to buffer bitmaps.
-        ::basegfx::B2DHomMatrix& calcRectToOriginTransform( ::basegfx::B2DHomMatrix&            o_transform,
-                                                            const ::basegfx::B2DRange&          i_srcRect,
-                                                            const ::basegfx::B2DHomMatrix&      i_transformation )
+        ::basegfx::B2DHomMatrix& calcRectToOriginTransform( ::basegfx::B2DHomMatrix&			o_transform,
+                                                            const ::basegfx::B2DRange&			i_srcRect,
+                                                            const ::basegfx::B2DHomMatrix&		i_transformation )
         {
             if( i_srcRect.isEmpty() )
                 return o_transform=i_transformation;
 
             // transform by given transformation
-            ::basegfx::B2DRectangle aTransformedRect;
+            ::basegfx::B2DRectangle aTransformedRect; 
 
-            calcTransformedRectBounds( aTransformedRect,
+            calcTransformedRectBounds( aTransformedRect, 
                                        i_srcRect,
                                        i_transformation );
 
@@ -686,9 +686,9 @@ namespace canvas
             return o_transform;
         }
 
-        ::basegfx::B2DRange& calcTransformedRectBounds( ::basegfx::B2DRange&            outRect,
-                                                        const ::basegfx::B2DRange&      inRect,
-                                                        const ::basegfx::B2DHomMatrix&  transformation )
+        ::basegfx::B2DRange& calcTransformedRectBounds( ::basegfx::B2DRange&			outRect,
+                                                        const ::basegfx::B2DRange&		inRect,
+                                                        const ::basegfx::B2DHomMatrix& 	transformation )
         {
             outRect.reset();
 
@@ -697,7 +697,7 @@ namespace canvas
 
             // transform all four extremal points of the rectangle,
             // take bounding rect of those.
-
+            
             // transform left-top point
             outRect.expand( transformation * inRect.getMinimum() );
 
@@ -723,11 +723,11 @@ namespace canvas
             // over and out.
             return outRect;
         }
-
-        ::basegfx::B2DHomMatrix& calcRectToRectTransform( ::basegfx::B2DHomMatrix&          o_transform,
-                                                          const ::basegfx::B2DRange&        destRect,
-                                                          const ::basegfx::B2DRange&        srcRect,
-                                                          const ::basegfx::B2DHomMatrix&    transformation )
+        
+        ::basegfx::B2DHomMatrix& calcRectToRectTransform( ::basegfx::B2DHomMatrix&			o_transform,
+                                                          const ::basegfx::B2DRange&		destRect,
+                                                          const ::basegfx::B2DRange&		srcRect,
+                                                          const ::basegfx::B2DHomMatrix&	transformation )
         {
             if( srcRect.isEmpty() ||
                 destRect.isEmpty() )
@@ -736,8 +736,8 @@ namespace canvas
             }
 
             // transform inputRect by transformation
-            ::basegfx::B2DRectangle aTransformedRect;
-            calcTransformedRectBounds( aTransformedRect,
+            ::basegfx::B2DRectangle aTransformedRect; 
+            calcTransformedRectBounds( aTransformedRect, 
                                        srcRect,
                                        transformation );
 
@@ -749,28 +749,28 @@ namespace canvas
             const double xDenom( aTransformedRect.getWidth() );
             const double yDenom( aTransformedRect.getHeight() );
             if( xDenom != 0.0 && yDenom != 0.0 )
-                aCorrectedTransform.scale( destRect.getWidth() / xDenom,
+                aCorrectedTransform.scale( destRect.getWidth() / xDenom, 
                                            destRect.getHeight() / yDenom );
             // TODO(E2): error handling
 
             // translate to final position
-            aCorrectedTransform.translate( destRect.getMinX(),
+            aCorrectedTransform.translate( destRect.getMinX(), 
                                            destRect.getMinY() );
-
+            
             ::basegfx::B2DHomMatrix transform( transformation );
             o_transform = aCorrectedTransform * transform;
 
             return o_transform;
         }
 
-        bool isInside( const ::basegfx::B2DRange&       rContainedRect,
-                       const ::basegfx::B2DRange&       rTransformRect,
-                       const ::basegfx::B2DHomMatrix&   rTransformation )
+        bool isInside( const ::basegfx::B2DRange& 		rContainedRect,
+                       const ::basegfx::B2DRange& 		rTransformRect, 
+                       const ::basegfx::B2DHomMatrix&	rTransformation )
         {
             if( rContainedRect.isEmpty() || rTransformRect.isEmpty() )
                 return false;
 
-            ::basegfx::B2DPolygon aPoly(
+            ::basegfx::B2DPolygon aPoly( 
                 ::basegfx::tools::createPolygonFromRect( rTransformRect ) );
             aPoly.transform( rTransformation );
 
@@ -788,7 +788,7 @@ namespace canvas
                                const ::basegfx::B2IRange& rSourceBounds,
                                const ::basegfx::B2IRange& rDestBounds )
             {
-                const ::basegfx::B2IPoint aSourceTopLeft(
+                const ::basegfx::B2IPoint aSourceTopLeft( 
                     io_rSourceArea.getMinimum() );
 
                 ::basegfx::B2IRange aLocalSourceArea( io_rSourceArea );
@@ -798,28 +798,28 @@ namespace canvas
 
                 if( aLocalSourceArea.isEmpty() )
                     return false;
-
+            
                 // calc relative new source area points (relative to orig
                 // source area)
-                const ::basegfx::B2IVector aUpperLeftOffset(
+                const ::basegfx::B2IVector aUpperLeftOffset( 
                     aLocalSourceArea.getMinimum()-aSourceTopLeft );
-                const ::basegfx::B2IVector aLowerRightOffset(
+                const ::basegfx::B2IVector aLowerRightOffset( 
                     aLocalSourceArea.getMaximum()-aSourceTopLeft );
 
                 ::basegfx::B2IRange aLocalDestArea( io_rDestPoint + aUpperLeftOffset,
                                                     io_rDestPoint + aLowerRightOffset );
-
+            
                 // clip dest area (which must be inside rDestBounds)
                 aLocalDestArea.intersect( rDestBounds );
-
+            
                 if( aLocalDestArea.isEmpty() )
                     return false;
 
                 // calc relative new dest area points (relative to orig
                 // source area)
-                const ::basegfx::B2IVector aDestUpperLeftOffset(
+                const ::basegfx::B2IVector aDestUpperLeftOffset( 
                     aLocalDestArea.getMinimum()-io_rDestPoint );
-                const ::basegfx::B2IVector aDestLowerRightOffset(
+                const ::basegfx::B2IVector aDestLowerRightOffset( 
                     aLocalDestArea.getMaximum()-io_rDestPoint );
 
                 io_rSourceArea = ::basegfx::B2IRange( aSourceTopLeft + aDestUpperLeftOffset,
@@ -847,7 +847,7 @@ namespace canvas
                                                 io_rDestPoint.getY(),
                                                 (io_rDestPoint.getX()
                                                  + static_cast<sal_Int32>(rRange.getX())),
-                                                (io_rDestPoint.getY()
+                                                (io_rDestPoint.getY() 
                                                  + static_cast<sal_Int32>(rRange.getY())) );
             // limit to output area (no point updating outside of it)
             aInputDestArea.intersect( rBounds );
@@ -885,36 +885,36 @@ namespace canvas
         {
             if( rRange.isEmpty() )
                 return ::basegfx::B2IRange();
-
+            
             const ::basegfx::B2IPoint aTopLeft( ::basegfx::fround( rRange.getMinX() ),
                                                 ::basegfx::fround( rRange.getMinY() ) );
             return ::basegfx::B2IRange( aTopLeft,
-                                        aTopLeft + ::basegfx::B2IPoint(
+                                        aTopLeft + ::basegfx::B2IPoint( 
                                             ::basegfx::fround( rRange.getWidth() ),
                                             ::basegfx::fround( rRange.getHeight() ) ) );
         }
 
         uno::Sequence< uno::Any >& getDeviceInfo( const uno::Reference< rendering::XCanvas >& i_rxCanvas,
-                                                  uno::Sequence< uno::Any >&                  o_rxParams )
+                                                  uno::Sequence< uno::Any >& 				  o_rxParams )
         {
             o_rxParams.realloc( 0 );
-
+            
             if( i_rxCanvas.is() )
             {
                 try
                 {
                     uno::Reference< rendering::XGraphicDevice > xDevice( i_rxCanvas->getDevice(),
                                                                          uno::UNO_QUERY_THROW );
-
-                    uno::Reference< lang::XServiceInfo >  xServiceInfo( xDevice,
+                
+                    uno::Reference< lang::XServiceInfo >  xServiceInfo( xDevice, 
                                                                         uno::UNO_QUERY_THROW );
-                    uno::Reference< beans::XPropertySet > xPropSet( xDevice,
+                    uno::Reference< beans::XPropertySet > xPropSet( xDevice, 
                                                                     uno::UNO_QUERY_THROW );
-
+                    
                     o_rxParams.realloc( 2 );
-
+                
                     o_rxParams[ 0 ] = uno::makeAny( xServiceInfo->getImplementationName() );
-                    o_rxParams[ 1 ] = uno::makeAny( xPropSet->getPropertyValue(
+                    o_rxParams[ 1 ] = uno::makeAny( xPropSet->getPropertyValue( 
                                                         ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("DeviceHandle") ) ) );
                 }
                 catch( uno::Exception& )
@@ -922,7 +922,7 @@ namespace canvas
                     // ignore, but return empty sequence
                 }
             }
-
+            
             return o_rxParams;
         }
 
@@ -992,7 +992,7 @@ namespace canvas
         }
 
         int calcGradientStepCount( ::basegfx::B2DHomMatrix&      rTotalTransform,
-                                   const rendering::ViewState&   viewState,
+                                   const rendering::ViewState&   viewState, 
                                    const rendering::RenderState& renderState,
                                    const rendering::Texture&     texture,
                                    int                           nColorSteps )
@@ -1002,7 +1002,7 @@ namespace canvas
             ::basegfx::B2DHomMatrix aMatrix;
 
             rTotalTransform.identity();
-            ::basegfx::unotools::homMatrixFromAffineMatrix( rTotalTransform,
+            ::basegfx::unotools::homMatrixFromAffineMatrix( rTotalTransform, 
                                                             texture.AffineTransform );
             ::canvas::tools::mergeViewAndRenderTransform(aMatrix,
                                                          viewState,
@@ -1016,15 +1016,15 @@ namespace canvas
             ::basegfx::B2DPoint aRightTop( 1.0, 0.0 );
             ::basegfx::B2DPoint aRightBottom( 1.0, 1.0 );
 
-            aLeftTop    *= rTotalTransform;
+            aLeftTop	*= rTotalTransform;
             aLeftBottom *= rTotalTransform;
-            aRightTop   *= rTotalTransform;
+            aRightTop 	*= rTotalTransform;
             aRightBottom*= rTotalTransform;
 
             // longest line in gradient bound rect
-            const int nGradientSize(
-                static_cast<int>(
-                    ::std::max(
+            const int nGradientSize( 
+                static_cast<int>( 
+                    ::std::max( 
                         ::basegfx::B2DVector(aRightBottom-aLeftTop).getLength(),
                         ::basegfx::B2DVector(aRightTop-aLeftBottom).getLength() ) + 1.0 ) );
 
@@ -1034,7 +1034,7 @@ namespace canvas
             // use at least three steps, and at utmost the number of color
             // steps
             return ::std::max( 3,
-                               ::std::min(
+                               ::std::min( 
                                    nGradientSize / nStripSize,
                                    nColorSteps ) );
         }
diff --git a/canvas/source/tools/elapsedtime.cxx b/canvas/source/tools/elapsedtime.cxx
index 6ca58a2bf1ee..b8fb039654b7 100644
--- a/canvas/source/tools/elapsedtime.cxx
+++ b/canvas/source/tools/elapsedtime.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
@@ -65,7 +65,7 @@ double ElapsedTime::getSystemTime()
     // TEMP!!!
     // Awaiting corresponding functionality in OSL
     //
-
+    
     // is there a performance counter available?
     static bool bTimeSetupDone( false );
     static bool bPerfTimerAvailable( false );
@@ -77,7 +77,7 @@ double ElapsedTime::getSystemTime()
     // current sys time and nInitialCount exceeds IEEE double's
     // mantissa, time will start to run jerky.
     static LONGLONG nInitialCount;
-
+    
     if( !bTimeSetupDone )
     {
         if( QueryPerformanceFrequency(
@@ -90,7 +90,7 @@ double ElapsedTime::getSystemTime()
         }
         bTimeSetupDone = true;
     }
-
+    
     if( bPerfTimerAvailable )
     {
         LONGLONG nCurrCount;
@@ -111,7 +111,7 @@ double ElapsedTime::getSystemTime()
 // TODO(Q2): is 0 okay for the failure case here?
 double ElapsedTime::getSystemTime()
 {
-    TimeValue aTimeVal;
+    TimeValue aTimeVal;   
     if( osl_getSystemTime( &aTimeVal ) )
         return ((aTimeVal.Nanosec * 10e-10) + aTimeVal.Seconds);
     else
@@ -183,7 +183,7 @@ double ElapsedTime::getElapsedTimeImpl() const
 {
     if (m_bInHoldMode || m_bInPauseMode)
         return m_fFrozenTime;
-
+    
     return getCurrentTime() - m_fStartTime;
 }
 
diff --git a/canvas/source/tools/image.cxx b/canvas/source/tools/image.cxx
index b6183e463e99..d7424269ab9d 100644
--- a/canvas/source/tools/image.cxx
+++ b/canvas/source/tools/image.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
@@ -372,11 +372,11 @@ namespace canvas { namespace
                 // one of the following formats:
                 //
                 //    BMP_FORMAT_1BIT_MSB_PAL
-                //    BMP_FORMAT_4BIT_MSN_PAL
-                //    BMP_FORMAT_8BIT_PAL
-                //    BMP_FORMAT_16BIT_TC_LSB_MASK
-                //    BMP_FORMAT_24BIT_TC_BGR
-                //    BMP_FORMAT_32BIT_TC_MASK
+                //	  BMP_FORMAT_4BIT_MSN_PAL
+                //	  BMP_FORMAT_8BIT_PAL
+                //	  BMP_FORMAT_16BIT_TC_LSB_MASK
+                //	  BMP_FORMAT_24BIT_TC_BGR
+                //	  BMP_FORMAT_32BIT_TC_MASK
                 //
                 // and is always BMP_FORMAT_BOTTOM_UP
                 //
@@ -393,9 +393,9 @@ namespace canvas { namespace
                                   "vclBitmapEx2Raw(): "
                                   "Unsupported alpha scanline format" );
 
-                BitmapColor     aCol;
-                sal_uInt8*      pCurrOutput( rBmpData.mpBitmapData );
-                int             x, y;
+                BitmapColor		aCol;
+                sal_uInt8* 		pCurrOutput( rBmpData.mpBitmapData );
+                int 			x, y;
 
                 for( y=0; y<nHeight; ++y )
                 {
@@ -514,11 +514,11 @@ namespace canvas { namespace
                 // one of the following formats:
                 //
                 //    BMP_FORMAT_1BIT_MSB_PAL
-                //    BMP_FORMAT_4BIT_MSN_PAL
-                //    BMP_FORMAT_8BIT_PAL
-                //    BMP_FORMAT_16BIT_TC_LSB_MASK
-                //    BMP_FORMAT_24BIT_TC_BGR
-                //    BMP_FORMAT_32BIT_TC_MASK
+                //	  BMP_FORMAT_4BIT_MSN_PAL
+                //	  BMP_FORMAT_8BIT_PAL
+                //	  BMP_FORMAT_16BIT_TC_LSB_MASK
+                //	  BMP_FORMAT_24BIT_TC_BGR
+                //	  BMP_FORMAT_32BIT_TC_MASK
                 //
                 // and is always BMP_FORMAT_BOTTOM_UP
                 //
@@ -534,12 +534,12 @@ namespace canvas { namespace
                                   "vclBitmapEx2Raw(): "
                                   "Unsupported mask scanline format" );
 
-                BitmapColor     aCol;
-                int             nCurrBit;
-                const int       nMask( 1L );
-                const int       nInitialBit(7);
+                BitmapColor		aCol;
+                int 			nCurrBit;
+                const int		nMask( 1L );
+                const int 		nInitialBit(7);
                 sal_uInt32 *pBuffer = reinterpret_cast<sal_uInt32 *>(rBmpData.mpBitmapData);
-                int             x, y;
+                int 			x, y;
 
                 // mapping table, to get from mask index color to
                 // alpha value (which depends on the mask's palette)
@@ -899,7 +899,7 @@ namespace canvas { namespace
 template<class pixel_format>
 void Image::drawLinePolyPolygonImpl( const ::basegfx::B2DPolyPolygon&   rPolyPolygon,
                                      double                             fStrokeWidth,
-                                     const rendering::ViewState&        viewState,
+                                     const rendering::ViewState&        viewState, 
                                      const rendering::RenderState&      renderState )
 {
     ::basegfx::B2DPolyPolygon aPolyPolygon( rPolyPolygon );
@@ -1039,7 +1039,7 @@ void Image::drawLinePolyPolygon( const ::basegfx::B2DPolyPolygon&   rPoly,
  */
 ImageCachedPrimitiveSharedPtr Image::implDrawBitmap(
     const Image&                     rBitmap,
-    const rendering::ViewState&      viewState,
+    const rendering::ViewState& 	 viewState,
     const rendering::RenderState&    renderState )
 {
     ::basegfx::B2DPolyPolygon aPoly(
@@ -1179,7 +1179,7 @@ class cachedPrimitiveFTPP : public ImageCachedPrimitive
 
 template<class pixel_format,class span_gen_type>
 ImageCachedPrimitiveSharedPtr Image::fillTexturedPolyPolygonImpl(
-                                     const Image&                     rTexture,
+                                     const Image&					  rTexture,
                                      const ::basegfx::B2DPolyPolygon& rPolyPolygon,
                                      const ::basegfx::B2DHomMatrix&   rOverallTransform,
                                      const ::basegfx::B2DHomMatrix&   rViewTransform,
@@ -1393,11 +1393,11 @@ ImageCachedPrimitiveSharedPtr Image::fillTexturedPolyPolygon(
 #if AGG_VERSION >= 2400
         typedef agg::image_accessor_wrap< pixfmt_rgba32, wrap_x_type, wrap_y_type > img_source_type_rgba;
         typedef agg::image_accessor_wrap< pixfmt_rgb24, wrap_x_type, wrap_y_type > img_source_type_rgb;
-
+ 
         typedef agg::span_image_resample_rgba_affine< img_source_type_rgba > span_gen_type_rgba;
         typedef agg::span_image_resample_rgb_affine< img_source_type_rgb > span_gen_type_rgb;
 #else
-    typedef agg::span_pattern_resample_rgba_affine< pixfmt_rgba32::color_type,
+    typedef agg::span_pattern_resample_rgba_affine<	pixfmt_rgba32::color_type,
                                                     pixfmt_rgba32::order_type,
                                                     wrap_x_type,
                                                     wrap_y_type> span_gen_type_rgba;
@@ -1413,7 +1413,7 @@ ImageCachedPrimitiveSharedPtr Image::fillTexturedPolyPolygon(
     if(nDest == FMT_R8G8B8 && nSource == FMT_R8G8B8)
     {
         return fillTexturedPolyPolygonImpl< agg::pixfmt_rgb24,
-                                            span_gen_type_rgb >(
+                                            span_gen_type_rgb >( 
                                                 rTexture,
                                                 rPolyPolygon,
                                                 rOverallTransform,
@@ -1423,7 +1423,7 @@ ImageCachedPrimitiveSharedPtr Image::fillTexturedPolyPolygon(
     else if(nDest == FMT_R8G8B8 && nSource == FMT_A8R8G8B8)
     {
         return fillTexturedPolyPolygonImpl< agg::pixfmt_rgb24,
-                                            span_gen_type_rgba >(
+                                            span_gen_type_rgba >( 
                                                 rTexture,
                                                 rPolyPolygon,
                                                 rOverallTransform,
@@ -1433,7 +1433,7 @@ ImageCachedPrimitiveSharedPtr Image::fillTexturedPolyPolygon(
     else if(nDest == FMT_A8R8G8B8 && nSource == FMT_R8G8B8)
     {
         return fillTexturedPolyPolygonImpl< agg::pixfmt_rgba32,
-                                            span_gen_type_rgb >(
+                                            span_gen_type_rgb >( 
                                                 rTexture,
                                                 rPolyPolygon,
                                                 rOverallTransform,
@@ -1443,7 +1443,7 @@ ImageCachedPrimitiveSharedPtr Image::fillTexturedPolyPolygon(
     else if(nDest == FMT_A8R8G8B8 && nSource == FMT_A8R8G8B8)
     {
         return fillTexturedPolyPolygonImpl< agg::pixfmt_rgba32,
-                                            span_gen_type_rgba >(
+                                            span_gen_type_rgba >( 
                                                 rTexture,
                                                 rPolyPolygon,
                                                 rOverallTransform,
@@ -1520,10 +1520,10 @@ void Image::fillGradientImpl( const ParametricPolyPolygon::Values& rValues,
     gradient_polymorphic_wrapper<gradient_rect> gf_rectangular;
     gf_rectangular.m_gradient.width = static_cast<int>(rBounds.getWidth())<<4;
     gf_rectangular.m_gradient.height = static_cast<int>(rBounds.getHeight())<<4;
-    const gradient_polymorphic_wrapper_base *gf[] = { &gf_x,            // GRADIENT_LINEAR
-                                                      &gf_x,            // GRADIENT_AXIAL
-                                                      &gf_radial,       // GRADIENT_ELLIPTICAL
-                                                      &gf_rectangular   // GRADIENT_RECTANGULAR
+    const gradient_polymorphic_wrapper_base *gf[] = { &gf_x,			// GRADIENT_LINEAR
+                                                      &gf_x,			// GRADIENT_AXIAL
+                                                      &gf_radial,		// GRADIENT_ELLIPTICAL
+                                                      &gf_rectangular	// GRADIENT_RECTANGULAR
                                                     };
 
     // how do texture coordinates change when the pixel coordinate change?
@@ -1762,7 +1762,7 @@ Image::Image( const uno::Reference< rendering::XBitmap >& xBitmap ) :
 #endif
 
     // TODO(F1): Add support for floating point bitmap formats
-    uno::Reference<rendering::XIntegerReadOnlyBitmap> xIntBmp(xBitmap,
+    uno::Reference<rendering::XIntegerReadOnlyBitmap> xIntBmp(xBitmap, 
                                                               uno::UNO_QUERY_THROW);
     ::BitmapEx aBmpEx = ::vcl::unotools::bitmapExFromXBitmap(xIntBmp);
     if( !!aBmpEx )
@@ -1841,7 +1841,7 @@ void Image::clear( sal_uInt8 a,
 
 void Image::fillB2DPolyPolygon(
             const ::basegfx::B2DPolyPolygon&    rPolyPolygon,
-            const rendering::ViewState&         viewState,
+            const rendering::ViewState& 		viewState,
             const rendering::RenderState&       renderState )
 {
 #if defined(PROFILER)
@@ -1919,9 +1919,9 @@ IColorBuffer::Format Image::getFormat() const
 // Image::drawPoint
 //////////////////////////////////////////////////////////////////////////////////
 
-void Image::drawPoint( const geometry::RealPoint2D&     /*aPoint*/,
-                       const rendering::ViewState&      /*viewState*/,
-                       const rendering::RenderState&    /*renderState*/ )
+void Image::drawPoint( const geometry::RealPoint2D& 	/*aPoint*/,
+                       const rendering::ViewState& 		/*viewState*/,
+                       const rendering::RenderState& 	/*renderState*/ )
 {
     OSL_ENSURE(false,
                "Image::drawPoint(): NYI" );
@@ -1931,10 +1931,10 @@ void Image::drawPoint( const geometry::RealPoint2D&     /*aPoint*/,
 // Image::drawLine
 //////////////////////////////////////////////////////////////////////////////////
 
-void Image::drawLine( const geometry::RealPoint2D&  aStartPoint,
-                      const geometry::RealPoint2D&  aEndPoint,
-                      const rendering::ViewState&   viewState,
-                      const rendering::RenderState& renderState )
+void Image::drawLine( const geometry::RealPoint2D& 	aStartPoint,
+                      const geometry::RealPoint2D& 	aEndPoint,
+                      const rendering::ViewState& 	viewState,
+                      const rendering::RenderState& renderState	)
 {
     ::basegfx::B2DPolygon aLinePoly;
     aLinePoly.append(
@@ -1952,9 +1952,9 @@ void Image::drawLine( const geometry::RealPoint2D&  aStartPoint,
 // Image::drawBezier
 //////////////////////////////////////////////////////////////////////////////////
 
-void Image::drawBezier( const geometry::RealBezierSegment2D&    aBezierSegment,
+void Image::drawBezier( const geometry::RealBezierSegment2D&	aBezierSegment,
                         const geometry::RealPoint2D&            aEndPoint,
-                        const rendering::ViewState&             viewState,
+                        const rendering::ViewState& 			viewState,
                         const rendering::RenderState&           renderState )
 {
     basegfx::B2DPolygon aBezierPoly;
@@ -1976,7 +1976,7 @@ void Image::drawBezier( const geometry::RealBezierSegment2D&    aBezierSegment,
 //////////////////////////////////////////////////////////////////////////////////
 
 ImageCachedPrimitiveSharedPtr Image::drawPolyPolygon(
-    const uno::Reference< rendering::XPolyPolygon2D >&  xPolyPolygon,
+    const uno::Reference< rendering::XPolyPolygon2D >& 	xPolyPolygon,
     const rendering::ViewState&                         viewState,
     const rendering::RenderState&                       renderState )
 {
@@ -2001,7 +2001,7 @@ ImageCachedPrimitiveSharedPtr Image::drawPolyPolygon(
 //////////////////////////////////////////////////////////////////////////////////
 
 ImageCachedPrimitiveSharedPtr Image::strokePolyPolygon(
-    const uno::Reference< rendering::XPolyPolygon2D >&  xPolyPolygon,
+    const uno::Reference< rendering::XPolyPolygon2D >& 	xPolyPolygon,
     const rendering::ViewState&                         viewState,
     const rendering::RenderState&                       renderState,
     const rendering::StrokeAttributes&                  strokeAttributes )
@@ -2023,7 +2023,7 @@ ImageCachedPrimitiveSharedPtr Image::strokePolyPolygon(
 //////////////////////////////////////////////////////////////////////////////////
 
 ImageCachedPrimitiveSharedPtr Image::strokeTexturedPolyPolygon(
-    const uno::Reference< rendering::XPolyPolygon2D >&  /*xPolyPolygon*/,
+    const uno::Reference< rendering::XPolyPolygon2D >& 	/*xPolyPolygon*/,
     const rendering::ViewState&                         /*viewState*/,
     const rendering::RenderState&                       /*renderState*/,
     const uno::Sequence< rendering::Texture >&          /*textures*/,
@@ -2042,12 +2042,12 @@ ImageCachedPrimitiveSharedPtr Image::strokeTexturedPolyPolygon(
 //////////////////////////////////////////////////////////////////////////////////
 
 ImageCachedPrimitiveSharedPtr Image::strokeTextureMappedPolyPolygon(
-    const uno::Reference< rendering::XPolyPolygon2D >&  /*xPolyPolygon*/,
+    const uno::Reference< rendering::XPolyPolygon2D >& 	/*xPolyPolygon*/,
     const rendering::ViewState&                         /*viewState*/,
     const rendering::RenderState&                       /*renderState*/,
     const uno::Sequence< rendering::Texture >&          /*textures*/,
     const ::std::vector< ::boost::shared_ptr<Image> >&  /*textureAnnotations*/,
-    const uno::Reference< geometry::XMapping2D >&       /*xMapping*/,
+    const uno::Reference< geometry::XMapping2D >& 		/*xMapping*/,
     const rendering::StrokeAttributes&                  /*strokeAttributes*/ )
 {
     OSL_ENSURE(false,
@@ -2062,9 +2062,9 @@ ImageCachedPrimitiveSharedPtr Image::strokeTextureMappedPolyPolygon(
 //////////////////////////////////////////////////////////////////////////////////
 
 template<class pixel_format>
-ImageCachedPrimitiveSharedPtr Image::fillPolyPolygonImpl(
-            const ::basegfx::B2DPolyPolygon&                    rPolyPolygon,
-            const rendering::ViewState&                         viewState,
+ImageCachedPrimitiveSharedPtr Image::fillPolyPolygonImpl( 
+            const ::basegfx::B2DPolyPolygon&                    rPolyPolygon, 
+            const rendering::ViewState&                         viewState, 
             const rendering::RenderState&                       renderState )
 {
 #if defined(PROFILER)
@@ -2161,7 +2161,7 @@ ImageCachedPrimitiveSharedPtr Image::fillPolyPolygonImpl(
 //////////////////////////////////////////////////////////////////////////////////
 
 ImageCachedPrimitiveSharedPtr Image::fillPolyPolygon(
-    const uno::Reference< rendering::XPolyPolygon2D >&  xPolyPolygon,
+    const uno::Reference< rendering::XPolyPolygon2D >& 	xPolyPolygon,
     const rendering::ViewState&                         viewState,
     const rendering::RenderState&                       renderState )
 {
@@ -2190,7 +2190,7 @@ ImageCachedPrimitiveSharedPtr Image::fillPolyPolygon(
 //////////////////////////////////////////////////////////////////////////////////
 
 ImageCachedPrimitiveSharedPtr Image::fillTexturedPolyPolygon(
-    const uno::Reference< rendering::XPolyPolygon2D >&  xPolyPolygon,
+    const uno::Reference< rendering::XPolyPolygon2D >&	xPolyPolygon,
     const rendering::ViewState&                         viewState,
     const rendering::RenderState&                       renderState,
     const uno::Sequence< rendering::Texture >&          textures,
@@ -2284,12 +2284,12 @@ ImageCachedPrimitiveSharedPtr Image::fillTexturedPolyPolygon(
 //////////////////////////////////////////////////////////////////////////////////
 
 ImageCachedPrimitiveSharedPtr Image::fillTextureMappedPolyPolygon(
-    const uno::Reference< rendering::XPolyPolygon2D >&  /*xPolyPolygon*/,
+    const uno::Reference< rendering::XPolyPolygon2D >& 	/*xPolyPolygon*/,
     const rendering::ViewState&                         /*viewState*/,
     const rendering::RenderState&                       /*renderState*/,
     const uno::Sequence< rendering::Texture >&          /*textures*/,
     const ::std::vector< ::boost::shared_ptr<Image> >&  /*textureAnnotations*/,
-    const uno::Reference< geometry::XMapping2D >&       /*xMapping*/ )
+    const uno::Reference< geometry::XMapping2D >& 		/*xMapping*/ )
 {
     OSL_ENSURE(false,
                "Image::fillTextureMappedPolyPolygon(): NYI" );
@@ -2339,7 +2339,7 @@ ImageCachedPrimitiveSharedPtr Image::drawBitmap(
 
 ImageCachedPrimitiveSharedPtr Image::drawBitmap(
     const ImageSharedPtr&           rImage,
-    const rendering::ViewState&     viewState,
+    const rendering::ViewState& 	viewState,
     const rendering::RenderState&   renderState )
 {
 #if defined(PROFILER)
@@ -2380,7 +2380,7 @@ ImageCachedPrimitiveSharedPtr Image::drawBitmapModulated(
 
 ImageCachedPrimitiveSharedPtr Image::drawBitmapModulated(
     const ImageSharedPtr&           rImage,
-    const rendering::ViewState&     viewState,
+    const rendering::ViewState& 	viewState,
     const rendering::RenderState&   renderState )
 {
     // TODO(P3): Implement bitmap caching
diff --git a/canvas/source/tools/image.hxx b/canvas/source/tools/image.hxx
index 1c62c7d6276b..110c27e1fb8a 100644
--- a/canvas/source/tools/image.hxx
+++ b/canvas/source/tools/image.hxx
@@ -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
@@ -81,7 +81,7 @@ namespace canvas
 
         void fillB2DPolyPolygon(
             const ::basegfx::B2DPolyPolygon&                    rPolyPolygon,
-            const ::com::sun::star::rendering::ViewState&       viewState,
+            const ::com::sun::star::rendering::ViewState& 		viewState,
             const ::com::sun::star::rendering::RenderState&     renderState );
 
 
@@ -99,91 +99,91 @@ namespace canvas
         // High-level drawing operations (from the XCanvas interface)
         // ==========================================================
 
-        void drawPoint( const ::com::sun::star::geometry::RealPoint2D&      aPoint,
-                        const ::com::sun::star::rendering::ViewState&       viewState,
-                        const ::com::sun::star::rendering::RenderState&     renderState );
+        void drawPoint( const ::com::sun::star::geometry::RealPoint2D& 		aPoint,
+                        const ::com::sun::star::rendering::ViewState& 		viewState,
+                        const ::com::sun::star::rendering::RenderState& 	renderState );
         void drawLine( const ::com::sun::star::geometry::RealPoint2D&       aStartPoint,
                        const ::com::sun::star::geometry::RealPoint2D&       aEndPoint,
                        const ::com::sun::star::rendering::ViewState&        viewState,
-                       const ::com::sun::star::rendering::RenderState&      renderState );
-        void drawBezier( const ::com::sun::star::geometry::RealBezierSegment2D& aBezierSegment,
-                         const ::com::sun::star::geometry::RealPoint2D&         aEndPoint,
-                         const ::com::sun::star::rendering::ViewState&          viewState,
-                         const ::com::sun::star::rendering::RenderState&        renderState );
+                       const ::com::sun::star::rendering::RenderState&      renderState	);
+        void drawBezier( const ::com::sun::star::geometry::RealBezierSegment2D&	aBezierSegment,
+                         const ::com::sun::star::geometry::RealPoint2D& 		aEndPoint,
+                         const ::com::sun::star::rendering::ViewState& 			viewState,
+                         const ::com::sun::star::rendering::RenderState& 		renderState );
         ImageCachedPrimitiveSharedPtr drawPolyPolygon(
             const ::com::sun::star::uno::Reference<
-                  ::com::sun::star::rendering::XPolyPolygon2D >&    xPolyPolygon,
+                  ::com::sun::star::rendering::XPolyPolygon2D >& 	xPolyPolygon,
             const ::com::sun::star::rendering::ViewState&           viewState,
             const ::com::sun::star::rendering::RenderState&         renderState );
 
         ImageCachedPrimitiveSharedPtr strokePolyPolygon(
             const ::com::sun::star::uno::Reference<
-                  ::com::sun::star::rendering::XPolyPolygon2D >&    xPolyPolygon,
+                  ::com::sun::star::rendering::XPolyPolygon2D >& 	xPolyPolygon,
             const ::com::sun::star::rendering::ViewState&           viewState,
-            const ::com::sun::star::rendering::RenderState&         renderState,
+            const ::com::sun::star::rendering::RenderState& 		renderState,
             const ::com::sun::star::rendering::StrokeAttributes&    strokeAttributes );
         ImageCachedPrimitiveSharedPtr strokeTexturedPolyPolygon(
             const ::com::sun::star::uno::Reference<
-                  ::com::sun::star::rendering::XPolyPolygon2D >&    xPolyPolygon,
+                  ::com::sun::star::rendering::XPolyPolygon2D >& 	xPolyPolygon,
             const ::com::sun::star::rendering::ViewState&           viewState,
-            const ::com::sun::star::rendering::RenderState&         renderState,
+            const ::com::sun::star::rendering::RenderState& 		renderState,
             const ::com::sun::star::uno::Sequence<
                   ::com::sun::star::rendering::Texture >&           textures,
             const ::std::vector< ::boost::shared_ptr<Image> >&      textureAnnotations,
             const ::com::sun::star::rendering::StrokeAttributes&    strokeAttributes );
         ImageCachedPrimitiveSharedPtr strokeTextureMappedPolyPolygon(
             const ::com::sun::star::uno::Reference<
-                  ::com::sun::star::rendering::XPolyPolygon2D >&    xPolyPolygon,
-            const ::com::sun::star::rendering::ViewState&           viewState,
-            const ::com::sun::star::rendering::RenderState&         renderState,
+                  ::com::sun::star::rendering::XPolyPolygon2D >& 	xPolyPolygon,
+            const ::com::sun::star::rendering::ViewState& 			viewState,
+            const ::com::sun::star::rendering::RenderState& 		renderState,
             const ::com::sun::star::uno::Sequence<
                   ::com::sun::star::rendering::Texture >&           textures,
             const ::std::vector< ::boost::shared_ptr<Image> >&      textureAnnotations,
             const ::com::sun::star::uno::Reference<
-                  ::com::sun::star::geometry::XMapping2D >&         xMapping,
-            const ::com::sun::star::rendering::StrokeAttributes&    strokeAttributes );
+                  ::com::sun::star::geometry::XMapping2D >& 		xMapping,
+            const ::com::sun::star::rendering::StrokeAttributes& 	strokeAttributes );
         ImageCachedPrimitiveSharedPtr fillPolyPolygon(
             const ::com::sun::star::uno::Reference<
-                  ::com::sun::star::rendering::XPolyPolygon2D >&    xPolyPolygon,
-            const ::com::sun::star::rendering::ViewState&           viewState,
-            const ::com::sun::star::rendering::RenderState&         renderState );
+                  ::com::sun::star::rendering::XPolyPolygon2D >& 	xPolyPolygon,
+            const ::com::sun::star::rendering::ViewState& 			viewState,
+            const ::com::sun::star::rendering::RenderState& 		renderState );
         ImageCachedPrimitiveSharedPtr fillTexturedPolyPolygon(
             const ::com::sun::star::uno::Reference<
-                  ::com::sun::star::rendering::XPolyPolygon2D >&    xPolyPolygon,
-            const ::com::sun::star::rendering::ViewState&           viewState,
-            const ::com::sun::star::rendering::RenderState&         renderState,
+                  ::com::sun::star::rendering::XPolyPolygon2D >&	xPolyPolygon,
+            const ::com::sun::star::rendering::ViewState& 			viewState,
+            const ::com::sun::star::rendering::RenderState& 		renderState,
             const ::com::sun::star::uno::Sequence<
                   ::com::sun::star::rendering::Texture >&           textures,
             const ::std::vector< ::boost::shared_ptr<Image> >&      textureAnnotations );
         ImageCachedPrimitiveSharedPtr fillTextureMappedPolyPolygon(
             const ::com::sun::star::uno::Reference<
-                  ::com::sun::star::rendering::XPolyPolygon2D >&    xPolyPolygon,
+                  ::com::sun::star::rendering::XPolyPolygon2D >& 	xPolyPolygon,
             const ::com::sun::star::rendering::ViewState&           viewState,
-            const ::com::sun::star::rendering::RenderState&         renderState,
+            const ::com::sun::star::rendering::RenderState& 		renderState,
             const ::com::sun::star::uno::Sequence<
                   ::com::sun::star::rendering::Texture >&           textures,
             const ::std::vector< ::boost::shared_ptr<Image> >&      textureAnnotations,
             const ::com::sun::star::uno::Reference<
-                  ::com::sun::star::geometry::XMapping2D >&         xMapping );
+                  ::com::sun::star::geometry::XMapping2D >& 		xMapping );
 
         ImageCachedPrimitiveSharedPtr drawBitmap(
             const ::com::sun::star::uno::Reference<
                   ::com::sun::star::rendering::XBitmap >&   xBitmap,
-            const ::com::sun::star::rendering::ViewState&   viewState,
+            const ::com::sun::star::rendering::ViewState& 	viewState,
             const ::com::sun::star::rendering::RenderState& renderState );
         ImageCachedPrimitiveSharedPtr drawBitmap(
             const ::boost::shared_ptr<Image>&               rImage,
-            const ::com::sun::star::rendering::ViewState&   viewState,
+            const ::com::sun::star::rendering::ViewState& 	viewState,
             const ::com::sun::star::rendering::RenderState& renderState );
 
         ImageCachedPrimitiveSharedPtr drawBitmapModulated(
             const ::com::sun::star::uno::Reference<
-                  ::com::sun::star::rendering::XBitmap >&       xBitmap,
-            const ::com::sun::star::rendering::ViewState&       viewState,
+                  ::com::sun::star::rendering::XBitmap >&		xBitmap,
+            const ::com::sun::star::rendering::ViewState& 		viewState,
             const ::com::sun::star::rendering::RenderState&     renderState );
         ImageCachedPrimitiveSharedPtr drawBitmapModulated(
             const ::boost::shared_ptr<Image>&                   rImage,
-            const ::com::sun::star::rendering::ViewState&       viewState,
+            const ::com::sun::star::rendering::ViewState& 		viewState,
             const ::com::sun::star::rendering::RenderState&     renderState );
 
     private:
@@ -194,7 +194,7 @@ namespace canvas
 
         ImageCachedPrimitiveSharedPtr implDrawBitmap(
                              const Image&                                    rBitmap,
-                             const ::com::sun::star::rendering::ViewState&   viewState,
+                             const ::com::sun::star::rendering::ViewState& 	 viewState,
                              const ::com::sun::star::rendering::RenderState& renderState );
 
         ImageCachedPrimitiveSharedPtr fillTexturedPolyPolygon(
@@ -215,7 +215,7 @@ namespace canvas
         template<class pixel_format>
         void drawLinePolyPolygonImpl( const ::basegfx::B2DPolyPolygon&                  rPoly,
                                       double                                            fStrokeWidth,
-                                      const ::com::sun::star::rendering::ViewState&     viewState,
+                                      const ::com::sun::star::rendering::ViewState&     viewState, 
                                       const ::com::sun::star::rendering::RenderState&   renderState );
 
         template<class pixel_format,class span_gen_type>
@@ -236,8 +236,8 @@ namespace canvas
 
         template<class pixel_format>
         ImageCachedPrimitiveSharedPtr fillPolyPolygonImpl(
-            const ::basegfx::B2DPolyPolygon&                    rPolyPolygon,
-            const ::com::sun::star::rendering::ViewState&       viewState,
+            const ::basegfx::B2DPolyPolygon&                    rPolyPolygon, 
+            const ::com::sun::star::rendering::ViewState&       viewState, 
             const ::com::sun::star::rendering::RenderState&     renderState );
 
         template<class pixel_format> void clearImpl( sal_uInt8 a,
diff --git a/canvas/source/tools/image_sysprereq.h b/canvas/source/tools/image_sysprereq.h
index ad81259c75c7..1b1541deb3a5 100644
--- a/canvas/source/tools/image_sysprereq.h
+++ b/canvas/source/tools/image_sysprereq.h
@@ -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
diff --git a/canvas/source/tools/imagecachedprimitive.hxx b/canvas/source/tools/imagecachedprimitive.hxx
index dfcf2bc6a831..f9317faaace1 100644
--- a/canvas/source/tools/imagecachedprimitive.hxx
+++ b/canvas/source/tools/imagecachedprimitive.hxx
@@ -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
diff --git a/canvas/source/tools/page.cxx b/canvas/source/tools/page.cxx
index 5035c0e81916..653343983a18 100644
--- a/canvas/source/tools/page.cxx
+++ b/canvas/source/tools/page.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
diff --git a/canvas/source/tools/page.hxx b/canvas/source/tools/page.hxx
index 51b770ad4ade..3f68aca2372a 100644
--- a/canvas/source/tools/page.hxx
+++ b/canvas/source/tools/page.hxx
@@ -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
@@ -49,7 +49,7 @@ namespace canvas
      */
     class Page
     {
-    public:
+    public:	
         Page( const IRenderModuleSharedPtr& rRenderModule );
 
         FragmentSharedPtr        allocateSpace( const ::basegfx::B2ISize& rSize );
@@ -78,21 +78,21 @@ namespace canvas
     class PageFragment
     {
     public:
-        PageFragment( const SurfaceRect& r,
+        PageFragment( const SurfaceRect& r, 
                       Page*              pPage ) :
             mpPage(pPage),
             maRect(r),
             mpBuffer(),
-            maSourceOffset()
+            maSourceOffset() 
         {
         }
-
+            
         /// Creates a 'naked' fragment.
         PageFragment( const ::basegfx::B2ISize& rSize ) :
             mpPage(NULL),
             maRect(rSize),
             mpBuffer(),
-            maSourceOffset()
+            maSourceOffset() 
         {
         }
 
@@ -111,7 +111,7 @@ namespace canvas
 
             mpPage=NULL;
         }
-
+            
         bool select( bool bRefresh )
         {
             // request was made to select this fragment,
diff --git a/canvas/source/tools/pagemanager.cxx b/canvas/source/tools/pagemanager.cxx
index b2a71bf86cd3..31b4ceba415f 100644
--- a/canvas/source/tools/pagemanager.cxx
+++ b/canvas/source/tools/pagemanager.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
@@ -87,7 +87,7 @@ namespace canvas
     //////////////////////////////////////////////////////////////////////////////////
     // PageManager::free
     //////////////////////////////////////////////////////////////////////////////////
-
+    
     void PageManager::free( const FragmentSharedPtr& pFragment )
     {
         // erase the reference to the given fragment from our
@@ -194,7 +194,7 @@ namespace canvas
     //////////////////////////////////////////////////////////////////////////////////
     // PageManager::validatePages
     //////////////////////////////////////////////////////////////////////////////////
-
+    
     void PageManager::validatePages()
     {
         ::std::for_each( maPages.begin(),
@@ -214,7 +214,7 @@ namespace canvas
     //////////////////////////////////////////////////////////////////////////////////
     // PageManager::getRenderModule
     //////////////////////////////////////////////////////////////////////////////////
-
+    
     canvas::IRenderModuleSharedPtr PageManager::getRenderModule() const
     {
         return mpRenderModule;
diff --git a/canvas/source/tools/pagemanager.hxx b/canvas/source/tools/pagemanager.hxx
index bf20b1d61e43..66a12c0e13e9 100644
--- a/canvas/source/tools/pagemanager.hxx
+++ b/canvas/source/tools/pagemanager.hxx
@@ -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
@@ -44,8 +44,8 @@ namespace canvas
     class PageManager
     {
     public:
-        PageManager( const canvas::IRenderModuleSharedPtr pRenderModule ) :
-            mpRenderModule(pRenderModule)
+        PageManager( const canvas::IRenderModuleSharedPtr pRenderModule ) : 
+            mpRenderModule(pRenderModule) 
         {
         }
 
diff --git a/canvas/source/tools/parametricpolypolygon.cxx b/canvas/source/tools/parametricpolypolygon.cxx
index 368f04a572e3..8a690f7c0ebc 100644
--- a/canvas/source/tools/parametricpolypolygon.cxx
+++ b/canvas/source/tools/parametricpolypolygon.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
@@ -60,7 +60,7 @@ namespace canvas
         return aRet;
     }
 
-    ParametricPolyPolygon* ParametricPolyPolygon::create(
+    ParametricPolyPolygon* ParametricPolyPolygon::create( 
         const uno::Reference< rendering::XGraphicDevice >& rDevice,
         const ::rtl::OUString& rServiceName,
         const uno::Sequence< uno::Any >& rArgs )
@@ -131,42 +131,42 @@ namespace canvas
         return NULL;
     }
 
-    ParametricPolyPolygon* ParametricPolyPolygon::createLinearHorizontalGradient(
-        const uno::Reference< rendering::XGraphicDevice >&  rDevice,
-        const uno::Sequence< uno::Sequence< double > >&     colors,
-        const uno::Sequence< double >&                      stops )
+    ParametricPolyPolygon* ParametricPolyPolygon::createLinearHorizontalGradient( 
+        const uno::Reference< rendering::XGraphicDevice >& 	rDevice,
+        const uno::Sequence< uno::Sequence< double > >&		colors, 
+        const uno::Sequence< double >& 						stops )
     {
         // TODO(P2): hold gradient brush statically, and only setup
         // the colors
         return new ParametricPolyPolygon( rDevice, GRADIENT_LINEAR, colors, stops );
     }
 
-    ParametricPolyPolygon* ParametricPolyPolygon::createEllipticalGradient(
-        const uno::Reference< rendering::XGraphicDevice >&  rDevice,
-        const uno::Sequence< uno::Sequence< double > >&     colors,
-        const uno::Sequence< double >&                      stops,
+    ParametricPolyPolygon* ParametricPolyPolygon::createEllipticalGradient( 
+        const uno::Reference< rendering::XGraphicDevice >& 	rDevice,
+        const uno::Sequence< uno::Sequence< double > >&		colors, 
+        const uno::Sequence< double >& 						stops,
         double                                              fAspectRatio )
     {
         // TODO(P2): hold gradient polygon statically, and only setup
         // the colors
-        return new ParametricPolyPolygon(
+        return new ParametricPolyPolygon( 
             rDevice,
-            ::basegfx::tools::createPolygonFromCircle(
+            ::basegfx::tools::createPolygonFromCircle( 
                 ::basegfx::B2DPoint(0,0), 1 ),
             GRADIENT_ELLIPTICAL,
             colors, stops, fAspectRatio );
     }
 
     ParametricPolyPolygon* ParametricPolyPolygon::createRectangularGradient( const uno::Reference< rendering::XGraphicDevice >& rDevice,
-                                                                             const uno::Sequence< uno::Sequence< double > >&    colors,
-                                                                             const uno::Sequence< double >&                     stops,
+                                                                             const uno::Sequence< uno::Sequence< double > >&	colors, 
+                                                                             const uno::Sequence< double >& 					stops,
                                                                              double                                             fAspectRatio )
     {
         // TODO(P2): hold gradient polygon statically, and only setup
         // the colors
-        return new ParametricPolyPolygon(
+        return new ParametricPolyPolygon( 
             rDevice,
-            ::basegfx::tools::createPolygonFromRect(
+            ::basegfx::tools::createPolygonFromRect( 
                 ::basegfx::B2DRectangle( -1, -1, 1, 1 ) ),
             GRADIENT_RECTANGULAR,
             colors, stops, fAspectRatio );
@@ -235,11 +235,11 @@ namespace canvas
     {
     }
 
-    ParametricPolyPolygon::ParametricPolyPolygon( const uno::Reference< rendering::XGraphicDevice >&    rDevice,
-                                                  const ::basegfx::B2DPolygon&                          rGradientPoly,
+    ParametricPolyPolygon::ParametricPolyPolygon( const uno::Reference< rendering::XGraphicDevice >& 	rDevice,
+                                                  const ::basegfx::B2DPolygon&							rGradientPoly,
                                                   GradientType                                          eType,
-                                                  const uno::Sequence< uno::Sequence< double > >&       rColors,
-                                                  const uno::Sequence< double >&                        rStops ) :
+                                                  const uno::Sequence< uno::Sequence< double > >&		rColors, 
+                                                  const uno::Sequence< double >& 						rStops ) :
         ParametricPolyPolygon_Base( m_aMutex ),
         mxDevice( rDevice ),
         maValues( rGradientPoly,
@@ -250,13 +250,13 @@ namespace canvas
     {
     }
 
-    ParametricPolyPolygon::ParametricPolyPolygon( const uno::Reference< rendering::XGraphicDevice >&    rDevice,
-                                                  const ::basegfx::B2DPolygon&                          rGradientPoly,
+    ParametricPolyPolygon::ParametricPolyPolygon( const uno::Reference< rendering::XGraphicDevice >& 	rDevice,
+                                                  const ::basegfx::B2DPolygon&							rGradientPoly,
                                                   GradientType                                          eType,
-                                                  const uno::Sequence< uno::Sequence< double > >&       rColors,
-                                                  const uno::Sequence< double >&                        rStops,
-                                                  double                                                nAspectRatio ) :
-        ParametricPolyPolygon_Base( m_aMutex ),
+                                                  const uno::Sequence< uno::Sequence< double > >&		rColors, 
+                                                  const uno::Sequence< double >& 						rStops,
+                                                  double												nAspectRatio ) :
+        ParametricPolyPolygon_Base( m_aMutex ),        
         mxDevice( rDevice ),
         maValues( rGradientPoly,
                   rColors,
@@ -266,15 +266,15 @@ namespace canvas
     {
     }
 
-    ParametricPolyPolygon::ParametricPolyPolygon( const uno::Reference< rendering::XGraphicDevice >&    rDevice,
-                                                  GradientType                                          eType,
-                                                  const uno::Sequence< uno::Sequence< double > >&       rColors,
-                                                  const uno::Sequence< double >&                        rStops ) :
-        ParametricPolyPolygon_Base( m_aMutex ),
+    ParametricPolyPolygon::ParametricPolyPolygon( const uno::Reference< rendering::XGraphicDevice >& 	rDevice,
+                                                  GradientType	 										eType,
+                                                  const uno::Sequence< uno::Sequence< double > >&		rColors, 
+                                                  const uno::Sequence< double >& 						rStops ) :
+        ParametricPolyPolygon_Base( m_aMutex ),        
         mxDevice( rDevice ),
         maValues( ::basegfx::B2DPolygon(),
                   rColors,
-                  rStops,
+                  rStops, 
                   1.0,
                   eType )
     {
diff --git a/canvas/source/tools/prioritybooster.cxx b/canvas/source/tools/prioritybooster.cxx
index 984003ebc984..9fa7df105b57 100644
--- a/canvas/source/tools/prioritybooster.cxx
+++ b/canvas/source/tools/prioritybooster.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
@@ -29,7 +29,7 @@
 #include "precompiled_canvas.hxx"
 
 
-#ifdef WNT
+#ifdef WNT            
 # if defined _MSC_VER
 # pragma warning(push,1)
 # endif
@@ -54,10 +54,10 @@ namespace canvas
             int mnOldPriority;
         };
 
-        PriorityBooster::PriorityBooster( sal_Int32 nDelta ) :
+        PriorityBooster::PriorityBooster( sal_Int32 nDelta ) : 
             mpImpl( new PriorityBooster_Impl )
         {
-#ifdef WNT
+#ifdef WNT            
             HANDLE aCurrThread = GetCurrentThread();
             mpImpl->mnOldPriority = GetThreadPriority( aCurrThread );
 
@@ -73,8 +73,8 @@ namespace canvas
 
         PriorityBooster::~PriorityBooster()
         {
-#ifdef WNT
-            SetThreadPriority( GetCurrentThread(),
+#ifdef WNT            
+            SetThreadPriority( GetCurrentThread(), 
                                mpImpl->mnOldPriority );
 #endif
         }
diff --git a/canvas/source/tools/propertysethelper.cxx b/canvas/source/tools/propertysethelper.cxx
index c95eae045ee5..154d0de927c2 100644
--- a/canvas/source/tools/propertysethelper.cxx
+++ b/canvas/source/tools/propertysethelper.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
@@ -42,7 +42,7 @@ namespace canvas
                 ::rtl::OUString::createFromAscii("PropertySetHelper: property ") +
                 aPropertyName +
                 ::rtl::OUString::createFromAscii(" not found."),
-                uno::Reference< uno::XInterface >()
+                uno::Reference< uno::XInterface >() 
                 );
         }
 
@@ -65,7 +65,7 @@ namespace canvas
             }
         };
     }
-
+    
     PropertySetHelper::PropertySetHelper() :
         mpMap(),
         maMapEntries()
@@ -113,14 +113,14 @@ namespace canvas
         return mpMap->lookup( aPropertyName,
                               aDummy );
     }
-
+                   
     uno::Reference< beans::XPropertySetInfo > PropertySetHelper::getPropertySetInfo() const
     {
         // we're a stealth property set
         return uno::Reference< beans::XPropertySetInfo >();
     }
 
-    void PropertySetHelper::setPropertyValue( const ::rtl::OUString& aPropertyName,
+    void PropertySetHelper::setPropertyValue( const ::rtl::OUString& aPropertyName, 
                                               const uno::Any&        aValue )
     {
         Callbacks aCallbacks;
@@ -155,7 +155,7 @@ namespace canvas
         return uno::Any();
     }
 
-    void PropertySetHelper::addPropertyChangeListener( const ::rtl::OUString&                                  aPropertyName,
+    void PropertySetHelper::addPropertyChangeListener( const ::rtl::OUString&                                  aPropertyName, 
                                                        const uno::Reference< beans::XPropertyChangeListener >& /*xListener*/ )
     {
         // check validity of property, but otherwise ignore the
@@ -164,13 +164,13 @@ namespace canvas
             throwUnknown( aPropertyName );
     }
 
-    void PropertySetHelper::removePropertyChangeListener( const ::rtl::OUString&                                  /*aPropertyName*/,
+    void PropertySetHelper::removePropertyChangeListener( const ::rtl::OUString&                                  /*aPropertyName*/, 
                                                           const uno::Reference< beans::XPropertyChangeListener >& /*xListener*/ )
     {
         // ignore request, no listener added in the first place
     }
-
-    void PropertySetHelper::addVetoableChangeListener( const ::rtl::OUString&                                  aPropertyName,
+    
+    void PropertySetHelper::addVetoableChangeListener( const ::rtl::OUString&                                  aPropertyName, 
                                                        const uno::Reference< beans::XVetoableChangeListener >& /*xListener*/ )
     {
         // check validity of property, but otherwise ignore the
@@ -179,7 +179,7 @@ namespace canvas
             throwUnknown( aPropertyName );
     }
 
-    void PropertySetHelper::removeVetoableChangeListener( const ::rtl::OUString&                                  /*aPropertyName*/,
+    void PropertySetHelper::removeVetoableChangeListener( const ::rtl::OUString&                                  /*aPropertyName*/, 
                                                           const uno::Reference< beans::XVetoableChangeListener >& /*xListener*/ )
     {
         // ignore request, no listener added in the first place
diff --git a/canvas/source/tools/spriteredrawmanager.cxx b/canvas/source/tools/spriteredrawmanager.cxx
index 7027a9d263df..73a500162a45 100644
--- a/canvas/source/tools/spriteredrawmanager.cxx
+++ b/canvas/source/tools/spriteredrawmanager.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
@@ -80,10 +80,10 @@ namespace canvas
                                 maMoveStartArea = ::basegfx::B2DRectangle(
                                     rSpriteRecord.maOldPos,
                                     rSpriteRecord.maOldPos + rSpriteRecord.maUpdateArea.getRange() );
-                                mbIsMove        = true;
+                                mbIsMove	 	= true;
                             }
 
-                            maMoveEndArea   = rSpriteRecord.maUpdateArea;
+                            maMoveEndArea	= rSpriteRecord.maUpdateArea;
                             break;
 
                         case SpriteRedrawManager::SpriteChangeRecord::update:
@@ -100,7 +100,7 @@ namespace canvas
                             break;
 
                         default:
-                            ENSURE_OR_THROW( false,
+                            ENSURE_OR_THROW( false, 
                                               "Unexpected case in SpriteUpdater::operator()" );
                             break;
                     }
@@ -128,12 +128,12 @@ namespace canvas
 
                         // round all given range up to enclosing
                         // integer rectangle - since the whole thing
-                        // here is about
+                        // here is about 
 
                         // first, draw the new sprite position
-                        rUpdateCollector.addRange(
-                            ::basegfx::unotools::b2DSurroundingIntegerRangeFromB2DRange( maMoveEndArea ),
-                            SpriteRedrawManager::SpriteInfo(
+                        rUpdateCollector.addRange( 
+                            ::basegfx::unotools::b2DSurroundingIntegerRangeFromB2DRange( maMoveEndArea ), 
+                            SpriteRedrawManager::SpriteInfo( 
                                 mpAffectedSprite,
                                 maMoveEndArea,
                                 true,
@@ -141,9 +141,9 @@ namespace canvas
 
                         // then, clear the old place (looks smoother
                         // this way)
-                        rUpdateCollector.addRange(
-                            ::basegfx::unotools::b2DSurroundingIntegerRangeFromB2DRange( maMoveStartArea ),
-                            SpriteRedrawManager::SpriteInfo(
+                        rUpdateCollector.addRange( 
+                            ::basegfx::unotools::b2DSurroundingIntegerRangeFromB2DRange( maMoveStartArea ), 
+                            SpriteRedrawManager::SpriteInfo( 
                                 Sprite::Reference(),
                                 maMoveStartArea,
                                 true,
@@ -153,9 +153,9 @@ namespace canvas
                 else if( mbIsGenericUpdate &&
                          !maMoveEndArea.isEmpty() )
                 {
-                    rUpdateCollector.addRange(
-                        ::basegfx::unotools::b2DSurroundingIntegerRangeFromB2DRange( maMoveEndArea ),
-                        SpriteRedrawManager::SpriteInfo(
+                    rUpdateCollector.addRange( 
+                        ::basegfx::unotools::b2DSurroundingIntegerRangeFromB2DRange( maMoveEndArea ), 
+                        SpriteRedrawManager::SpriteInfo( 
                             mpAffectedSprite,
                             maMoveEndArea,
                             true ) );
@@ -163,15 +163,15 @@ namespace canvas
             }
 
         private:
-            Sprite::Reference       mpAffectedSprite;
-            ::basegfx::B2DRectangle maMoveStartArea;
-            ::basegfx::B2DRectangle maMoveEndArea;
+            Sprite::Reference		mpAffectedSprite;
+            ::basegfx::B2DRectangle	maMoveStartArea;
+            ::basegfx::B2DRectangle	maMoveEndArea;
 
             /// True, if at least one move was encountered
-            bool                    mbIsMove;
+            bool					mbIsMove;
 
             /// True, if at least one generic update was encountered
-            bool                    mbIsGenericUpdate;
+            bool					mbIsGenericUpdate;
         };
 
 
@@ -182,7 +182,7 @@ namespace canvas
         {
         public:
             /** Generate update area list
-
+                
                 @param rUpdater
                 Reference to an updater object, which will receive the
                 update areas.
@@ -191,8 +191,8 @@ namespace canvas
                 Container with all sprite change requests
 
              */
-            SpriteUpdater( SpriteRedrawManager::SpriteConnectedRanges&          rUpdater,
-                           const SpriteRedrawManager::VectorOfChangeRecords&    rChangeContainer ) :
+            SpriteUpdater( SpriteRedrawManager::SpriteConnectedRanges&			rUpdater,
+                           const SpriteRedrawManager::VectorOfChangeRecords&	rChangeContainer ) :
                 mrUpdater( rUpdater ),
                 mrChangeContainer( rChangeContainer )
             {
@@ -210,17 +210,17 @@ namespace canvas
              */
             void operator()( const Sprite::Reference& rSprite )
             {
-                const SpriteTracer aSpriteTracer(
-                    ::std::for_each( mrChangeContainer.begin(),
-                                     mrChangeContainer.end(),
+                const SpriteTracer aSpriteTracer( 
+                    ::std::for_each( mrChangeContainer.begin(), 
+                                     mrChangeContainer.end(), 
                                      SpriteTracer( rSprite ) ) );
 
                 aSpriteTracer.commit( mrUpdater );
             }
 
         private:
-            SpriteRedrawManager::SpriteConnectedRanges&         mrUpdater;
-            const SpriteRedrawManager::VectorOfChangeRecords&   mrChangeContainer;
+            SpriteRedrawManager::SpriteConnectedRanges&			mrUpdater;
+            const SpriteRedrawManager::VectorOfChangeRecords&	mrChangeContainer;
         };
     }
 
@@ -249,7 +249,7 @@ namespace canvas
             ++aCurrSprite;
         }
 
-        // sort sprites after prio
+        // sort sprites after prio 
         VectorOfSprites aSortedSpriteVector;
         ::std::copy( maSprites.begin(),
                      maSprites.end(),
@@ -275,7 +275,7 @@ namespace canvas
 
         VectorOfSprites::iterator aBegin( aUpdatableSprites.begin() );
         VectorOfSprites::iterator aEnd  ( aUpdatableSprites.end() );
-        ::std::sort( aBegin,
+        ::std::sort( aBegin, 
                      aEnd,
                      aSpriteComparator );
 
@@ -284,7 +284,7 @@ namespace canvas
         // for each unique sprite, check the change event vector,
         // calculate the update operation from that, and add the
         // result to the aUpdateArea.
-        ::std::for_each( aBegin,
+        ::std::for_each( aBegin, 
                          aEnd,
                          SpriteUpdater( rUpdateAreas,
                                         maChangeRecords) );
@@ -298,19 +298,19 @@ namespace canvas
         // (i.e. the difference between aSortedSpriteVector and
         // aUpdatableSprites).
         VectorOfSprites aUnchangedSprites;
-        ::std::set_difference( aSortedSpriteVector.begin(),
+        ::std::set_difference( aSortedSpriteVector.begin(), 
                                aSortedSpriteVector.end(),
                                aBegin, aEnd,
                                ::std::back_insert_iterator< VectorOfSprites >(aUnchangedSprites) );
 
         // add each remaining unchanged sprite to connected ranges,
         // marked as "don't need update"
-        VectorOfSprites::const_iterator         aCurr( aUnchangedSprites.begin() );
-        const VectorOfSprites::const_iterator   aEnd2( aUnchangedSprites.end() );
+        VectorOfSprites::const_iterator 		aCurr( aUnchangedSprites.begin() );
+        const VectorOfSprites::const_iterator	aEnd2( aUnchangedSprites.end() );
         while( aCurr != aEnd2 )
         {
             const ::basegfx::B2DRange& rUpdateArea( (*aCurr)->getUpdateArea() );
-            rUpdateAreas.addRange(
+            rUpdateAreas.addRange( 
                 ::basegfx::unotools::b2DSurroundingIntegerRangeFromB2DRange( rUpdateArea ),
                 SpriteInfo(*aCurr,
                            rUpdateArea,
@@ -335,10 +335,10 @@ namespace canvas
     }
 #endif
 
-    bool SpriteRedrawManager::isAreaUpdateScroll( ::basegfx::B2DRectangle&  o_rMoveStart,
-                                                  ::basegfx::B2DRectangle&  o_rMoveEnd,
-                                                  const UpdateArea&         rUpdateArea,
-                                                  ::std::size_t             nNumSprites ) const
+    bool SpriteRedrawManager::isAreaUpdateScroll( ::basegfx::B2DRectangle& 	o_rMoveStart,
+                                                  ::basegfx::B2DRectangle& 	o_rMoveEnd,
+                                                  const UpdateArea& 		rUpdateArea,
+                                                  ::std::size_t				nNumSprites ) const
     {
         // check for a solitary move, which consists of exactly two
         // pure-move entries, the first with valid, the second with
@@ -351,11 +351,11 @@ namespace canvas
         if( nNumSprites != 2 )
             return false;
 
-        const SpriteConnectedRanges::ComponentListType::const_iterator aFirst(
+        const SpriteConnectedRanges::ComponentListType::const_iterator aFirst( 
             rUpdateArea.maComponentList.begin() );
-        SpriteConnectedRanges::ComponentListType::const_iterator aSecond(
+        SpriteConnectedRanges::ComponentListType::const_iterator aSecond( 
             aFirst ); ++aSecond;
-
+        
         if( !aFirst->second.isPureMove() ||
             !aSecond->second.isPureMove() ||
             !aFirst->second.getSprite().is() ||
@@ -367,9 +367,9 @@ namespace canvas
             // content not fully opaque over update region.
             return false;
         }
-
-        o_rMoveStart      = aSecond->second.getUpdateArea();
-        o_rMoveEnd        = aFirst->second.getUpdateArea();
+        
+        o_rMoveStart 	  = aSecond->second.getUpdateArea();
+        o_rMoveEnd   	  = aFirst->second.getUpdateArea();
 
 #if OSL_DEBUG_LEVEL > 0
         ::basegfx::B2DRectangle aTotalBounds( o_rMoveStart );
@@ -384,8 +384,8 @@ namespace canvas
         return true;
     }
 
-    bool SpriteRedrawManager::isAreaUpdateNotOpaque( const ::basegfx::B2DRectangle& rUpdateRect,
-                                                     const AreaComponent&           rComponent ) const
+    bool SpriteRedrawManager::isAreaUpdateNotOpaque( const ::basegfx::B2DRectangle& rUpdateRect, 
+                                                     const AreaComponent&			rComponent ) const
     {
         const Sprite::Reference& pAffectedSprite( rComponent.second.getSprite() );
 
@@ -395,8 +395,8 @@ namespace canvas
         return !pAffectedSprite->isAreaUpdateOpaque( rUpdateRect );
     }
 
-    bool SpriteRedrawManager::isAreaUpdateOpaque( const UpdateArea& rUpdateArea,
-                                                  ::std::size_t     nNumSprites ) const
+    bool SpriteRedrawManager::isAreaUpdateOpaque( const UpdateArea&	rUpdateArea,
+                                                  ::std::size_t		nNumSprites ) const
     {
         // check whether the sprites in the update area's list will
         // fully cover the given area _and_ do that in an opaque way
@@ -413,9 +413,9 @@ namespace canvas
         if( nNumSprites > 3 || nNumSprites < 1 )
             return false;
 
-        const SpriteConnectedRanges::ComponentListType::const_iterator aBegin(
+        const SpriteConnectedRanges::ComponentListType::const_iterator aBegin( 
             rUpdateArea.maComponentList.begin() );
-        const SpriteConnectedRanges::ComponentListType::const_iterator aEnd(
+        const SpriteConnectedRanges::ComponentListType::const_iterator aEnd( 
             rUpdateArea.maComponentList.end() );
 
         // now, calc the _true_ update area, by merging all sprite's
@@ -445,12 +445,12 @@ namespace canvas
         //
         // if not a single changed sprite found - just ignore this
         // component (return false)
-        const SpriteConnectedRanges::ComponentListType::const_iterator aEnd(
+        const SpriteConnectedRanges::ComponentListType::const_iterator aEnd( 
             rUpdateArea.maComponentList.end() );
         return (::std::find_if( rUpdateArea.maComponentList.begin(),
                                 aEnd,
                                 ::boost::bind( &SpriteInfo::needsUpdate,
-                                               ::boost::bind(
+                                               ::boost::bind( 
                                                    ::std::select2nd<SpriteConnectedRanges::ComponentType>(),
                                                    _1 ) ) ) != aEnd );
     }
@@ -497,10 +497,10 @@ namespace canvas
         maSprites.remove( rSprite );
     }
 
-    void SpriteRedrawManager::moveSprite( const Sprite::Reference&      rSprite,
-                                          const ::basegfx::B2DPoint&    rOldPos,
-                                          const ::basegfx::B2DPoint&    rNewPos,
-                                          const ::basegfx::B2DVector&   rSpriteSize )
+    void SpriteRedrawManager::moveSprite( const Sprite::Reference&		rSprite, 
+                                          const ::basegfx::B2DPoint& 	rOldPos,
+                                          const ::basegfx::B2DPoint&	rNewPos,
+                                          const ::basegfx::B2DVector& 	rSpriteSize )
     {
         maChangeRecords.push_back( SpriteChangeRecord( rSprite,
                                                        rOldPos,
@@ -508,9 +508,9 @@ namespace canvas
                                                        rSpriteSize ) );
     }
 
-    void SpriteRedrawManager::updateSprite( const Sprite::Reference&    rSprite,
-                                            const ::basegfx::B2DPoint&  rPos,
-                                            const ::basegfx::B2DRange&  rUpdateArea )
+    void SpriteRedrawManager::updateSprite( const Sprite::Reference& 	rSprite, 
+                                            const ::basegfx::B2DPoint& 	rPos,
+                                            const ::basegfx::B2DRange&	rUpdateArea )
     {
         maChangeRecords.push_back( SpriteChangeRecord( rSprite,
                                                        rPos,
diff --git a/canvas/source/tools/surface.cxx b/canvas/source/tools/surface.cxx
index aaef28ba489f..d897ffedd0e7 100644
--- a/canvas/source/tools/surface.cxx
+++ b/canvas/source/tools/surface.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
@@ -31,7 +31,7 @@
 #include "surface.hxx"
 #include <basegfx/polygon/b2dpolygonclipper.hxx>
 #include <basegfx/matrix/b2dhommatrixtools.hxx>
-#include <comphelper/scopeguard.hxx>
+#include <comphelper/scopeguard.hxx> 
 #include <boost/bind.hpp>
 
 namespace canvas
@@ -158,22 +158,22 @@ namespace canvas
             ######################################
             ######################################
             ######################################
-
+            
                            Y
                            ^+1
                            |
-                   2       |       3
+                   2	   |	   3
                      x------------x
-                     |     |      |
-                      |    |      |
+                     |	   |	  |
+                      |	   |	  |
                ------|-----O------|------>X
-               -1    |     |      |     +1
-                     |     |      |
+               -1  	 |	   |	  |		+1
+                     |	   |	  |
                      x------------x
                     1      |       0
                             |
                            |-1
-
+            
             ######################################
             ######################################
             ######################################
@@ -262,7 +262,7 @@ namespace canvas
             aDestOffset = mpFragment->getPos();
 
         // convert size to normalized device coordinates
-        const ::basegfx::B2DRectangle& rUV(
+        const ::basegfx::B2DRectangle& rUV( 
             getUVCoords(aPos1 - maSourceOffset + aDestOffset,
                         aSize) );
         const double u1(rUV.getMinX());
@@ -284,30 +284,30 @@ namespace canvas
             ######################################
             ######################################
             ######################################
-
+            
                            Y
                            ^+1
                            |
-                   2       |       3
+                   2	   |	   3
                      x------------x
-                     |     |      |
-                      |    |      |
+                     |	   |	  |
+                      |	   |	  |
                ------|-----O------|------>X
-               -1    |     |      |     +1
-                     |     |      |
+               -1  	 |	   |	  |		+1
+                     |	   |	  |
                      x------------x
                     1      |       0
                             |
                            |-1
-
+            
             ######################################
             ######################################
             ######################################
         */
 
         const ::basegfx::B2DPoint& p0(aTransform * ::basegfx::B2DPoint(aSize.getX(),aSize.getY()));
-        const ::basegfx::B2DPoint& p1(aTransform * ::basegfx::B2DPoint(0.0,         aSize.getY()));
-        const ::basegfx::B2DPoint& p2(aTransform * ::basegfx::B2DPoint(0.0,         0.0));
+        const ::basegfx::B2DPoint& p1(aTransform * ::basegfx::B2DPoint(0.0,			aSize.getY()));
+        const ::basegfx::B2DPoint& p2(aTransform * ::basegfx::B2DPoint(0.0,			0.0));
         const ::basegfx::B2DPoint& p3(aTransform * ::basegfx::B2DPoint(aSize.getX(),0.0));
 
         canvas::Vertex vertex;
@@ -385,22 +385,22 @@ namespace canvas
             ######################################
             ######################################
             ######################################
-
+            
                            Y
                            ^+1
                            |
-                   2       |       3
+                   2	   |	   3
                      x------------x
-                     |     |      |
-                      |    |      |
+                     |	   |	  |
+                      |	   |	  |
                ------|-----O------|------>X
-               -1    |     |      |     +1
-                     |     |      |
+               -1  	 |	   |	  |		+1
+                     |	   |	  |
                      x------------x
                     1      |       0
                             |
                            |-1
-
+            
             ######################################
             ######################################
             ######################################
@@ -430,19 +430,19 @@ namespace canvas
 #endif
 
             pRenderModule->beginPrimitive( canvas::IRenderModule::PRIMITIVE_TYPE_TRIANGLE );
-
-            // issue an endPrimitive() when leaving the scope
+            
+            // issue an endPrimitive() when leaving the scope   
             const ::comphelper::ScopeGuard aScopeGuard(
                 boost::bind( &::canvas::IRenderModule::endPrimitive,
                                 ::boost::ref(pRenderModule) ) );
 
-            for(sal_uInt32 nIndex=0; nIndex<nVertexCount; ++nIndex)
+            for(sal_uInt32 nIndex=0; nIndex<nVertexCount; ++nIndex) 
             {
                 const basegfx::B2DPoint &aPoint = rTriangleList.getB2DPoint(nIndex);
                 basegfx::B2DPoint aTransformedPoint(aTransform * aPoint);
                 const double tu(((aPoint.getX()-aSurfaceClipRect.getMinX())*rUV.getWidth()/w)+rUV.getMinX());
                 const double tv(((aPoint.getY()-aSurfaceClipRect.getMinY())*rUV.getHeight()/h)+rUV.getMinY());
-                vertex.u=static_cast<float>(tu);
+                vertex.u=static_cast<float>(tu); 
                 vertex.v=static_cast<float>(tv);
                 vertex.x=static_cast<float>(aTransformedPoint.getX());
                 vertex.y=static_cast<float>(aTransformedPoint.getY());
diff --git a/canvas/source/tools/surface.hxx b/canvas/source/tools/surface.hxx
index 9acda579803a..1b200f39f11b 100644
--- a/canvas/source/tools/surface.hxx
+++ b/canvas/source/tools/surface.hxx
@@ -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
@@ -72,7 +72,7 @@ namespace canvas
 
             @param rPos
             Output position
-
+                
             @param rTransform
             Output transformation (does not affect output position)
         */
@@ -87,12 +87,12 @@ namespace canvas
 
             @param rPos
             Output position
-
+                
             @param rArea
             Subset of the surface to render. Coordinate system are
             surface area pixel, given area will be clipped to the
             surface bounds.
-
+                
             @param rTransform
             Output transformation (does not affect output position)
         */
@@ -109,11 +109,11 @@ namespace canvas
 
             @param rPos
             Output position
-
+                
             @param rClipPoly
             Clip polygon for the surface. The clip polygon is also
             subject to the output transformation.
-
+                
             @param rTransform
             Output transformation (does not affect output position)
         */
diff --git a/canvas/source/tools/surfaceproxy.cxx b/canvas/source/tools/surfaceproxy.cxx
index f4c31d4a2dc6..18fba2f11b06 100644
--- a/canvas/source/tools/surfaceproxy.cxx
+++ b/canvas/source/tools/surfaceproxy.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
@@ -91,7 +91,7 @@ namespace canvas
             }
         }
     }
-
+    
     //////////////////////////////////////////////////////////////////////////////////
     // SurfaceProxy::setColorBufferDirty
     //////////////////////////////////////////////////////////////////////////////////
@@ -128,7 +128,7 @@ namespace canvas
 
     bool SurfaceProxy::draw( double                         fAlpha,
                              const ::basegfx::B2DPoint&     rPos,
-                             const ::basegfx::B2DRange&     rArea,
+                             const ::basegfx::B2DRange&		rArea,
                              const ::basegfx::B2DHomMatrix& rTransform )
     {
         ::std::for_each( maSurfaceList.begin(),
@@ -153,7 +153,7 @@ namespace canvas
                              const ::basegfx::B2DHomMatrix&   rTransform )
     {
         const ::basegfx::B2DPolygon& rTriangulatedPolygon(
-            ::basegfx::triangulator::triangulate(rClipPoly));
+            ::basegfx::triangulator::triangulate(rClipPoly)); 
 
 #if defined(VERBOSE) && OSL_DEBUG_LEVEL > 0
         // dump polygons
@@ -163,7 +163,7 @@ namespace canvas
                        basegfx::tools::exportToSvgD( rClipPoly ),
                        RTL_TEXTENCODING_ASCII_US).getStr(),
                    rtl::OUStringToOString(
-                       basegfx::tools::exportToSvgD(
+                       basegfx::tools::exportToSvgD( 
                            basegfx::B2DPolyPolygon(rTriangulatedPolygon) ),
                        RTL_TEXTENCODING_ASCII_US).getStr() );
 #endif
diff --git a/canvas/source/tools/surfaceproxy.hxx b/canvas/source/tools/surfaceproxy.hxx
index 7e42096c541b..1867fdcd34d5 100644
--- a/canvas/source/tools/surfaceproxy.hxx
+++ b/canvas/source/tools/surfaceproxy.hxx
@@ -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
@@ -65,7 +65,7 @@ namespace canvas
 
             @param rPos
             Output position
-
+                
             @param rTransform
             Output transformation (does not affect output position)
         */
@@ -80,12 +80,12 @@ namespace canvas
 
             @param rPos
             Output position
-
+                
             @param rArea
             Subset of the surface to render. Coordinate system are
             surface area pixel, given area will be clipped to the
             surface bounds.
-
+                
             @param rTransform
             Output transformation (does not affect output position)
         */
@@ -93,7 +93,7 @@ namespace canvas
                            const ::basegfx::B2DPoint&     rPos,
                            const ::basegfx::B2DRange&     rArea,
                            const ::basegfx::B2DHomMatrix& rTransform );
-
+            
         /** Render the surface content to screen.
 
             @param fAlpha
@@ -101,11 +101,11 @@ namespace canvas
 
             @param rPos
             Output position
-
+                
             @param rClipPoly
             Clip polygon for the surface. The clip polygon is also
             subject to the output transformation.
-
+                
             @param rTransform
             Output transformation (does not affect output position)
         */
@@ -122,9 +122,9 @@ namespace canvas
         // need a list here.
         std::vector<SurfaceSharedPtr> maSurfaceList;
 
-        // pointer to the source of image data
-        // which always is stored in system memory,
-        // 32bit rgba and can have any size.
+        // pointer to the source of image data  
+        // which always is stored in system memory, 
+        // 32bit rgba and can have any size.    
         canvas::IColorBufferSharedPtr mpBuffer;
     };
 
diff --git a/canvas/source/tools/surfaceproxymanager.cxx b/canvas/source/tools/surfaceproxymanager.cxx
index dcc2ff574b57..9d4ff85008c1 100644
--- a/canvas/source/tools/surfaceproxymanager.cxx
+++ b/canvas/source/tools/surfaceproxymanager.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
@@ -69,7 +69,7 @@ namespace canvas
             return SurfaceProxySharedPtr(new SurfaceProxy(pBuffer,mpPageManager));
         }
 
-    private:
+    private:    
         PageManagerSharedPtr mpPageManager;
     };
 
diff --git a/canvas/source/tools/surfacerect.hxx b/canvas/source/tools/surfacerect.hxx
index cbeaa5e144d7..14b3723618ef 100644
--- a/canvas/source/tools/surfacerect.hxx
+++ b/canvas/source/tools/surfacerect.hxx
@@ -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
@@ -88,7 +88,7 @@ namespace canvas
             if((lx1 >= x2) && (lx2 >= x2)) return false;
             return true;
         }
-
+        
         //! Returns true if the vertical line intersects the rect.
         bool vLineIntersect( sal_Int32 lx, sal_Int32 ly1, sal_Int32 ly2 ) const
         {
@@ -116,7 +116,7 @@ namespace canvas
             if(r.vLineIntersect(x2,y1,y2)) return true;
             return false;
         }
-
+        
         bool inside( const SurfaceRect& r ) const
         {
             const sal_Int32 x1(maPos.getX());
diff --git a/canvas/source/tools/verifyinput.cxx b/canvas/source/tools/verifyinput.cxx
index 42ab1c7aee19..e05850518b50 100644
--- a/canvas/source/tools/verifyinput.cxx
+++ b/canvas/source/tools/verifyinput.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
@@ -68,10 +68,10 @@ namespace canvas
 {
     namespace tools
     {
-        void verifyInput( const geometry::RealPoint2D&              rPoint,
-                          const char*                               pStr,
-                          const uno::Reference< uno::XInterface >&  xIf,
-                          ::sal_Int16                               nArgPos )
+        void verifyInput( const geometry::RealPoint2D&				rPoint,
+                          const char*								pStr,
+                          const uno::Reference< uno::XInterface >&	xIf,
+                          ::sal_Int16								nArgPos )
         {
             (void)pStr; (void)xIf; (void)nArgPos;
 
@@ -102,10 +102,10 @@ namespace canvas
 #endif
         }
 
-        void verifyInput( const geometry::RealSize2D&               rSize,
-                          const char*                               pStr,
-                          const uno::Reference< uno::XInterface >&  xIf,
-                          ::sal_Int16                               nArgPos )
+        void verifyInput( const geometry::RealSize2D&				rSize,
+                          const char*								pStr,
+                          const uno::Reference< uno::XInterface >&	xIf,
+                          ::sal_Int16								nArgPos )
         {
             (void)pStr; (void)xIf; (void)nArgPos;
 
@@ -136,10 +136,10 @@ namespace canvas
 #endif
         }
 
-        void verifyInput( const geometry::RealBezierSegment2D&      rSegment,
-                          const char*                               pStr,
-                          const uno::Reference< uno::XInterface >&  xIf,
-                          ::sal_Int16                               nArgPos )
+        void verifyInput( const geometry::RealBezierSegment2D&		rSegment,
+                          const char*								pStr,
+                          const uno::Reference< uno::XInterface >&	xIf,
+                          ::sal_Int16								nArgPos )
         {
             (void)pStr; (void)xIf; (void)nArgPos;
 
@@ -210,10 +210,10 @@ namespace canvas
 #endif
         }
 
-        void verifyInput( const geometry::RealRectangle2D&          rRect,
-                          const char*                               pStr,
-                          const uno::Reference< uno::XInterface >&  xIf,
-                          ::sal_Int16                               nArgPos )
+        void verifyInput( const geometry::RealRectangle2D&			rRect,
+                          const char*								pStr,
+                          const uno::Reference< uno::XInterface >&	xIf,
+                          ::sal_Int16								nArgPos )
         {
             (void)pStr; (void)xIf; (void)nArgPos;
 
@@ -264,15 +264,15 @@ namespace canvas
 #endif
         }
 
-        void verifyInput( const geometry::AffineMatrix2D&           matrix,
-                          const char*                               pStr,
-                          const uno::Reference< uno::XInterface >&  xIf,
-                          ::sal_Int16                               nArgPos )
+        void verifyInput( const geometry::AffineMatrix2D&			matrix, 
+                          const char*								pStr,
+                          const uno::Reference< uno::XInterface >&	xIf,
+                          ::sal_Int16								nArgPos )
         {
             (void)pStr; (void)xIf; (void)nArgPos;
 
 #if OSL_DEBUG_LEVEL > 0
-            const sal_Int32 nBinaryState(
+            const sal_Int32 nBinaryState( 
                 100000 * !::rtl::math::isFinite( matrix.m00 ) +
                  10000 * !::rtl::math::isFinite( matrix.m01 ) +
                   1000 * !::rtl::math::isFinite( matrix.m02 ) +
@@ -301,16 +301,16 @@ namespace canvas
             }
 #endif
         }
-
-        void verifyInput( const geometry::Matrix2D&                 matrix,
-                          const char*                               pStr,
-                          const uno::Reference< uno::XInterface >&  xIf,
-                          ::sal_Int16                               nArgPos )
+        
+        void verifyInput( const geometry::Matrix2D&					matrix, 
+                          const char*								pStr,
+                          const uno::Reference< uno::XInterface >&	xIf,
+                          ::sal_Int16								nArgPos )
         {
             (void)pStr; (void)xIf; (void)nArgPos;
 
 #if OSL_DEBUG_LEVEL > 0
-            const sal_Int32 nBinaryState(
+            const sal_Int32 nBinaryState( 
                 1000 * !::rtl::math::isFinite( matrix.m00 ) +
                  100 * !::rtl::math::isFinite( matrix.m01 ) +
                   10 * !::rtl::math::isFinite( matrix.m10 ) +
@@ -335,21 +335,21 @@ namespace canvas
             }
 #endif
         }
-
-        void verifyInput( const rendering::ViewState&               viewState,
-                          const char*                               pStr,
-                          const uno::Reference< uno::XInterface >&  xIf,
-                          ::sal_Int16                               nArgPos )
+        
+        void verifyInput( const rendering::ViewState&				viewState, 
+                          const char*								pStr,
+                          const uno::Reference< uno::XInterface >&	xIf,
+                          ::sal_Int16								nArgPos )
         {
             verifyInput( viewState.AffineTransform,
                          pStr, xIf, nArgPos );
         }
 
-        void verifyInput( const rendering::RenderState&             renderState,
-                          const char*                               pStr,
-                          const uno::Reference< uno::XInterface >&  xIf,
-                          ::sal_Int16                               nArgPos,
-                          sal_Int32                                 nMinColorComponents )
+        void verifyInput( const rendering::RenderState&				renderState, 
+                          const char*								pStr,
+                          const uno::Reference< uno::XInterface >&	xIf,
+                          ::sal_Int16								nArgPos,
+                          sal_Int32									nMinColorComponents )
         {
             verifyInput( renderState.AffineTransform,
                          pStr, xIf, nArgPos );
@@ -388,10 +388,10 @@ namespace canvas
             }
         }
 
-        void verifyInput( const rendering::Texture&                 texture,
-                          const char*                               pStr,
-                          const uno::Reference< uno::XInterface >&  xIf,
-                          ::sal_Int16                               nArgPos )
+        void verifyInput( const rendering::Texture&					texture,
+                          const char*								pStr,
+                          const uno::Reference< uno::XInterface >&	xIf,
+                          ::sal_Int16								nArgPos )
         {
             verifyInput( texture.AffineTransform,
                          pStr, xIf, nArgPos );
@@ -463,9 +463,9 @@ namespace canvas
         {
             struct VerifyDashValue
             {
-                VerifyDashValue( const char*                                pStr,
-                                 const uno::Reference< uno::XInterface >&   xIf,
-                                 ::sal_Int16                                nArgPos ) :
+                VerifyDashValue( const char*								pStr,
+                                 const uno::Reference< uno::XInterface >&	xIf,
+                                 ::sal_Int16								nArgPos ) :
                     mpStr( pStr ),
                     mrIf( xIf ),
                     mnArgPos( nArgPos )
@@ -490,16 +490,16 @@ namespace canvas
                     }
                 }
 
-                const char*                                 mpStr;
-                const uno::Reference< uno::XInterface >&    mrIf;
-                sal_Int16                                   mnArgPos;
+                const char*									mpStr;
+                const uno::Reference< uno::XInterface >&	mrIf;
+                sal_Int16									mnArgPos;
             };
         }
 
-        void verifyInput( const rendering::StrokeAttributes&        strokeAttributes,
-                          const char*                               pStr,
-                          const uno::Reference< uno::XInterface >&  xIf,
-                          ::sal_Int16                               nArgPos )
+        void verifyInput( const rendering::StrokeAttributes&		strokeAttributes,
+                          const char*								pStr,
+                          const uno::Reference< uno::XInterface >&	xIf,
+                          ::sal_Int16								nArgPos )
         {
             if( !::rtl::math::isFinite( strokeAttributes.StrokeWidth ) ||
                 strokeAttributes.StrokeWidth < 0.0 )
@@ -536,7 +536,7 @@ namespace canvas
             ::std::for_each( strokeAttributes.DashArray.getConstArray(),
                              strokeAttributes.DashArray.getConstArray() + strokeAttributes.DashArray.getLength(),
                              VerifyDashValue( pStr, xIf, nArgPos ) );
-
+                                
             ::std::for_each( strokeAttributes.LineArray.getConstArray(),
                              strokeAttributes.LineArray.getConstArray() + strokeAttributes.LineArray.getLength(),
                              VerifyDashValue( pStr, xIf, nArgPos ) );
@@ -590,10 +590,10 @@ namespace canvas
             }
         }
 
-        void verifyInput( const rendering::IntegerBitmapLayout&     bitmapLayout,
-                          const char*                               pStr,
-                          const uno::Reference< uno::XInterface >&  xIf,
-                          ::sal_Int16                               nArgPos )
+        void verifyInput( const rendering::IntegerBitmapLayout& 	bitmapLayout,
+                          const char*								pStr,
+                          const uno::Reference< uno::XInterface >&	xIf,
+                          ::sal_Int16								nArgPos )
         {
             (void)pStr; (void)xIf; (void)nArgPos;
 
@@ -664,14 +664,14 @@ namespace canvas
 #else
                     throw lang::IllegalArgumentException();
 #endif
-                }
+                }                
             }
         }
 
-        void verifyInput( const rendering::FloatingPointBitmapLayout&   bitmapLayout,
-                          const char*                                   pStr,
-                          const uno::Reference< uno::XInterface >&      xIf,
-                          ::sal_Int16                                   nArgPos )
+        void verifyInput( const rendering::FloatingPointBitmapLayout&	bitmapLayout,
+                          const char*									pStr,
+                          const uno::Reference< uno::XInterface >&		xIf,
+                          ::sal_Int16									nArgPos )
         {
             (void)pStr; (void)xIf; (void)nArgPos;
 
@@ -741,7 +741,7 @@ namespace canvas
 #else
                 throw lang::IllegalArgumentException();
 #endif
-            }
+            }                
 
             if( bitmapLayout.Format < rendering::FloatingPointBitmapFormat::HALFFLOAT ||
                 bitmapLayout.Format > rendering::FloatingPointBitmapFormat::DOUBLE )
@@ -760,19 +760,19 @@ namespace canvas
             }
         }
 
-        void verifyInput( const rendering::FontInfo&                /*fontInfo*/,
-                          const char*                               /*pStr*/,
-                          const uno::Reference< uno::XInterface >&  /*xIf*/,
-                          ::sal_Int16                               /*nArgPos*/ )
+        void verifyInput( const rendering::FontInfo&				/*fontInfo*/,
+                          const char*								/*pStr*/,
+                          const uno::Reference< uno::XInterface >&	/*xIf*/,
+                          ::sal_Int16								/*nArgPos*/ )
         {
             // TODO(E3): Implement FontDescription checks, once the
             // Panose stuff is ready.
         }
 
-        void verifyInput( const rendering::FontRequest&             fontRequest,
-                          const char*                               pStr,
-                          const uno::Reference< uno::XInterface >&  xIf,
-                          ::sal_Int16                               nArgPos )
+        void verifyInput( const rendering::FontRequest&				fontRequest,
+                          const char*								pStr,
+                          const uno::Reference< uno::XInterface >&	xIf,
+                          ::sal_Int16								nArgPos )
         {
             verifyInput( fontRequest.FontDescription,
                          pStr, xIf, nArgPos );
@@ -818,10 +818,10 @@ namespace canvas
             }
         }
 
-        void verifyIndexRange( const geometry::IntegerRectangle2D&  rect,
-                               const geometry::IntegerSize2D&       size )
+        void verifyIndexRange( const geometry::IntegerRectangle2D& 	rect,
+                               const geometry::IntegerSize2D& 	 	size )
         {
-            const ::basegfx::B2IRange aRect(
+            const ::basegfx::B2IRange aRect( 
                 ::basegfx::unotools::b2IRectangleFromIntegerRectangle2D(
                     rect ) );
 
@@ -846,9 +846,9 @@ namespace canvas
             }
         }
 
-        void verifyBitmapSize( const geometry::IntegerSize2D&           size,
-                               const char*                              pStr,
-                               const uno::Reference< uno::XInterface >& xIf )
+        void verifyBitmapSize( const geometry::IntegerSize2D& 			size,
+                               const char*								pStr,
+                               const uno::Reference< uno::XInterface >&	xIf )
         {
             (void)pStr; (void)xIf;
 
@@ -883,9 +883,9 @@ namespace canvas
             }
         }
 
-        void verifySpriteSize( const geometry::RealSize2D&              size,
-                               const char*                              pStr,
-                               const uno::Reference< uno::XInterface >& xIf )
+        void verifySpriteSize( const geometry::RealSize2D& 				size,
+                               const char*								pStr,
+                               const uno::Reference< uno::XInterface >&	xIf )
         {
             (void)pStr; (void)xIf;
 
diff --git a/canvas/source/vcl/backbuffer.cxx b/canvas/source/vcl/backbuffer.cxx
index 3820c4e42657..be5f90076f22 100644
--- a/canvas/source/vcl/backbuffer.cxx
+++ b/canvas/source/vcl/backbuffer.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
@@ -34,7 +34,7 @@
 namespace vclcanvas
 {
     BackBuffer::BackBuffer( const OutputDevice& rRefDevice,
-                            bool                bMonochromeBuffer ) :
+                            bool 				bMonochromeBuffer ) :
         maVDev( new VirtualDevice( rRefDevice,
                                    bMonochromeBuffer ) )
     {
@@ -46,13 +46,13 @@ namespace vclcanvas
             maVDev->SetAntialiasing( ANTIALIASING_ENABLE_B2DDRAW | maVDev->GetAntialiasing() );
 #else
             // switch off AA for WIN32 and UNIX, the VCLCanvas does not look good with it and
-            // is not required to do AA. It would need to be adapted to use it correctly
+            // is not required to do AA. It would need to be adapted to use it correctly 
             // (especially gradient painting). This will need extra work.
             maVDev->SetAntialiasing( maVDev->GetAntialiasing() & !ANTIALIASING_ENABLE_B2DDRAW);
 #endif
         }
     }
-
+        
     OutputDevice& BackBuffer::getOutDev()
     {
         return maVDev.get();
@@ -62,7 +62,7 @@ namespace vclcanvas
     {
         return maVDev.get();
     }
-
+    
     void BackBuffer::setSize( const ::Size& rNewSize )
     {
         maVDev->SetOutputSizePixel( rNewSize );
diff --git a/canvas/source/vcl/backbuffer.hxx b/canvas/source/vcl/backbuffer.hxx
index 4f4dfa1f638c..d89b1be3f666 100644
--- a/canvas/source/vcl/backbuffer.hxx
+++ b/canvas/source/vcl/backbuffer.hxx
@@ -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
@@ -49,16 +49,16 @@ namespace vclcanvas
             chosen. When true, the buffer will be monochrome, i.e. one
             bit deep.
          */
-        BackBuffer( const OutputDevice& rRefDevice,
-                    bool                bMonochromeBuffer=false );
-
-        virtual OutputDevice&       getOutDev();
-        virtual const OutputDevice& getOutDev() const;
-
+        BackBuffer( const OutputDevice& rRefDevice, 
+                    bool 				bMonochromeBuffer=false );
+        
+        virtual OutputDevice& 		getOutDev();
+        virtual const OutputDevice&	getOutDev() const;
+        
         void setSize( const ::Size& rNewSize );
-
+        
     private:
-        ::canvas::vcltools::VCLObject<VirtualDevice>    maVDev;
+        ::canvas::vcltools::VCLObject<VirtualDevice>	maVDev;            
     };
 
     typedef ::boost::shared_ptr< BackBuffer > BackBufferSharedPtr;
diff --git a/canvas/source/vcl/bitmapbackbuffer.cxx b/canvas/source/vcl/bitmapbackbuffer.cxx
index 31c78283a128..0c8f65e079d2 100644
--- a/canvas/source/vcl/bitmapbackbuffer.cxx
+++ b/canvas/source/vcl/bitmapbackbuffer.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
@@ -40,8 +40,8 @@
 
 namespace vclcanvas
 {
-    BitmapBackBuffer::BitmapBackBuffer( const BitmapEx&         rBitmap,
-                                        const OutputDevice&     rRefDevice ) :
+    BitmapBackBuffer::BitmapBackBuffer( const BitmapEx& 		rBitmap,
+                                        const OutputDevice& 	rRefDevice ) :
         maBitmap( rBitmap ),
         mpVDev( NULL ),
         mrRefDevice( rRefDevice ),
@@ -49,13 +49,13 @@ namespace vclcanvas
         mbVDevContentIsCurrent( false )
     {
     }
-
+        
     BitmapBackBuffer::~BitmapBackBuffer()
     {
         // make sure solar mutex is held on deletion (other methods
         // are supposed to be called with already locked solar mutex)
         ::vos::OGuard aGuard( Application::GetSolarMutex() );
-
+        
         if( mpVDev )
             delete mpVDev;
     }
@@ -77,7 +77,7 @@ namespace vclcanvas
     void BitmapBackBuffer::clear()
     {
         // force current content to bitmap, make all transparent white
-        getBitmapReference().Erase(COL_TRANSPARENT);
+        getBitmapReference().Erase(COL_TRANSPARENT);        
     }
 
     BitmapEx& BitmapBackBuffer::getBitmapReference()
@@ -97,7 +97,7 @@ namespace vclcanvas
         // client queries bitmap, and will possibly alter content -
         // next time, VDev needs to be updated
         mbBitmapContentIsCurrent = true;
-        mbVDevContentIsCurrent   = false;
+        mbVDevContentIsCurrent 	 = false;
 
         return *maBitmap;
     }
@@ -121,11 +121,11 @@ namespace vclcanvas
         {
             // VDev not yet created, do it now. Create an alpha-VDev,
             // if bitmap has transparency.
-            mpVDev = maBitmap->IsTransparent() ?
+            mpVDev = maBitmap->IsTransparent() ? 
                 new VirtualDevice( mrRefDevice, 0, 0 ) :
                 new VirtualDevice( mrRefDevice );
 
-            OSL_ENSURE( mpVDev,
+            OSL_ENSURE( mpVDev, 
                         "BitmapBackBuffer::createVDev(): Unable to create VirtualDevice" );
 
             mpVDev->SetOutputSizePixel( maBitmap->GetSizePixel() );
@@ -136,7 +136,7 @@ namespace vclcanvas
             mpVDev->SetAntialiasing( ANTIALIASING_ENABLE_B2DDRAW | mpVDev->GetAntialiasing() );
 #else
             // switch off AA for WIN32 and UNIX, the VCLCanvas does not look good with it and
-            // is not required to do AA. It would need to be adapted to use it correctly
+            // is not required to do AA. It would need to be adapted to use it correctly 
             // (especially gradient painting). This will need extra work.
             mpVDev->SetAntialiasing(mpVDev->GetAntialiasing() & !ANTIALIASING_ENABLE_B2DDRAW);
 #endif
@@ -159,7 +159,7 @@ namespace vclcanvas
         // canvas queried the VDev, and will possibly paint into
         // it. Next time, bitmap must be updated
         mbBitmapContentIsCurrent = false;
-        mbVDevContentIsCurrent   = true;
+        mbVDevContentIsCurrent 	 = true;
     }
 }
 
diff --git a/canvas/source/vcl/bitmapbackbuffer.hxx b/canvas/source/vcl/bitmapbackbuffer.hxx
index 96dd525b98a4..0a7e7d1c10c9 100644
--- a/canvas/source/vcl/bitmapbackbuffer.hxx
+++ b/canvas/source/vcl/bitmapbackbuffer.hxx
@@ -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
@@ -50,12 +50,12 @@ namespace vclcanvas
     public:
         /** Create a backbuffer for given reference device
          */
-        BitmapBackBuffer( const BitmapEx&       rBitmap,
-                          const OutputDevice&   rRefDevice );
-
+        BitmapBackBuffer( const BitmapEx& 		rBitmap,
+                          const OutputDevice& 	rRefDevice );
+        
         ~BitmapBackBuffer();
 
-        virtual OutputDevice&       getOutDev();
+        virtual OutputDevice& 		getOutDev();
         virtual const OutputDevice& getOutDev() const;
 
         /// Clear the underlying bitmap to white, all transparent
@@ -66,17 +66,17 @@ namespace vclcanvas
 
             @internal
         */
-        BitmapEx&                   getBitmapReference();
-        Size                        getBitmapSizePixel() const;
+        BitmapEx&					getBitmapReference(); 
+        Size						getBitmapSizePixel() const; 
 
     private:
         void createVDev() const;
         void updateVDev() const;
 
-        ::canvas::vcltools::VCLObject<BitmapEx> maBitmap;
-        mutable VirtualDevice*                  mpVDev; // created only on demand
+        ::canvas::vcltools::VCLObject<BitmapEx>	maBitmap;
+        mutable VirtualDevice*					mpVDev; // created only on demand
 
-        const OutputDevice&                     mrRefDevice;
+        const OutputDevice& 					mrRefDevice;
 
         /** When true, the bitmap contains the last valid
             content. When false, and mbVDevContentIsCurrent is true,
@@ -85,7 +85,7 @@ namespace vclcanvas
             called). When both are false, this object is just
             initialized.
          */
-        mutable bool                            mbBitmapContentIsCurrent;
+        mutable bool							mbBitmapContentIsCurrent; 
 
         /** When true, and mpVDev is non-NULL, the VDev contains the
             last valid content. When false, and
@@ -93,7 +93,7 @@ namespace vclcanvas
             last valid content. When both are false, this object is
             just initialized.
          */
-        mutable bool                            mbVDevContentIsCurrent;
+        mutable bool							mbVDevContentIsCurrent;
     };
 
     typedef ::boost::shared_ptr< BitmapBackBuffer > BitmapBackBufferSharedPtr;
diff --git a/canvas/source/vcl/cachedbitmap.cxx b/canvas/source/vcl/cachedbitmap.cxx
index 70ca3a3e67ed..f1d90208d600 100644
--- a/canvas/source/vcl/cachedbitmap.cxx
+++ b/canvas/source/vcl/cachedbitmap.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
@@ -45,12 +45,12 @@ using namespace ::com::sun::star;
 
 namespace vclcanvas
 {
-    CachedBitmap::CachedBitmap( const GraphicObjectSharedPtr&               rGraphicObject,
-                                const ::Point&                              rPoint,
-                                const ::Size&                               rSize,
-                                const GraphicAttr&                          rAttr,
-                                const rendering::ViewState&                 rUsedViewState,
-                                const rendering::RenderState&               rUsedRenderState,
+    CachedBitmap::CachedBitmap( const GraphicObjectSharedPtr& 				rGraphicObject,
+                                const ::Point& 								rPoint, 
+                                const ::Size& 								rSize,
+                                const GraphicAttr&							rAttr,
+                                const rendering::ViewState&	  				rUsedViewState,
+                                const rendering::RenderState&	  			rUsedRenderState,
                                 const uno::Reference< rendering::XCanvas >& rTarget ) :
         CachedPrimitiveBase( rUsedViewState, rTarget, true ),
         mpGraphicObject( rGraphicObject ),
@@ -70,10 +70,10 @@ namespace vclcanvas
         CachedPrimitiveBase::disposing();
     }
 
-    ::sal_Int8 CachedBitmap::doRedraw( const rendering::ViewState&                  rNewState,
-                                       const rendering::ViewState&                  rOldState,
-                                       const uno::Reference< rendering::XCanvas >&  rTargetCanvas,
-                                       bool                                         bSameViewTransform )
+    ::sal_Int8 CachedBitmap::doRedraw( const rendering::ViewState&					rNewState,
+                                       const rendering::ViewState&					rOldState,
+                                       const uno::Reference< rendering::XCanvas >& 	rTargetCanvas,
+                                       bool											bSameViewTransform )
     {
         ENSURE_OR_THROW( bSameViewTransform,
                          "CachedBitmap::doRedraw(): base called with changed view transform "
diff --git a/canvas/source/vcl/cachedbitmap.hxx b/canvas/source/vcl/cachedbitmap.hxx
index c45720c086c8..0ac544f1856c 100644
--- a/canvas/source/vcl/cachedbitmap.hxx
+++ b/canvas/source/vcl/cachedbitmap.hxx
@@ -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
@@ -47,31 +47,31 @@ namespace vclcanvas
 
         /** Create an XCachedPrimitive for given GraphicObject
          */
-        CachedBitmap( const GraphicObjectSharedPtr&                   rGraphicObject,
-                      const ::Point&                                  rPoint,
+        CachedBitmap( const GraphicObjectSharedPtr& 				  rGraphicObject,
+                      const ::Point&                                  rPoint, 
                       const ::Size&                                   rSize,
                       const GraphicAttr&                              rAttr,
-                      const ::com::sun::star::rendering::ViewState&   rUsedViewState,
+                      const ::com::sun::star::rendering::ViewState&	  rUsedViewState,
                       const ::com::sun::star::rendering::RenderState& rUsedRenderState,
-                      const ::com::sun::star::uno::Reference<
-                              ::com::sun::star::rendering::XCanvas >&   rTarget );
+                      const ::com::sun::star::uno::Reference< 
+                              ::com::sun::star::rendering::XCanvas >&   rTarget	);
 
         /// Dispose all internal references
         virtual void SAL_CALL disposing();
 
     private:
-        virtual ::sal_Int8 doRedraw( const ::com::sun::star::rendering::ViewState&  rNewState,
-                                     const ::com::sun::star::rendering::ViewState&  rOldState,
-                                     const ::com::sun::star::uno::Reference<
-                                         ::com::sun::star::rendering::XCanvas >&    rTargetCanvas,
-                                     bool                                           bSameViewTransform );
+        virtual ::sal_Int8 doRedraw( const ::com::sun::star::rendering::ViewState&	rNewState,
+                                     const ::com::sun::star::rendering::ViewState&	rOldState,
+                                     const ::com::sun::star::uno::Reference< 
+                                         ::com::sun::star::rendering::XCanvas >& 	rTargetCanvas,
+                                     bool											bSameViewTransform );
 
 
-        GraphicObjectSharedPtr                                                      mpGraphicObject;
+        GraphicObjectSharedPtr														mpGraphicObject;
         const ::com::sun::star::rendering::RenderState                              maRenderState;
-        const ::Point                                                               maPoint;
-        const ::Size                                                                maSize;
-        const GraphicAttr                                                           maAttributes;
+        const ::Point								 								maPoint; 
+        const ::Size 																maSize;
+        const GraphicAttr															maAttributes;
     };
 }
 
diff --git a/canvas/source/vcl/canvas.cxx b/canvas/source/vcl/canvas.cxx
index 837c064b4411..3b6685912b4c 100644
--- a/canvas/source/vcl/canvas.cxx
+++ b/canvas/source/vcl/canvas.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
@@ -57,7 +57,7 @@ namespace vclcanvas
 {
     namespace
     {
-        class OutDevHolder : public OutDevProvider,
+        class OutDevHolder : public OutDevProvider, 
             private ::boost::noncopyable
         {
         public:
@@ -66,13 +66,13 @@ namespace vclcanvas
             {}
 
         private:
-            virtual OutputDevice&       getOutDev() { return mrOutDev; }
+            virtual OutputDevice& 		getOutDev() { return mrOutDev; }
             virtual const OutputDevice& getOutDev() const { return mrOutDev; }
 
             // TODO(Q2): Lifetime issue. This _only_ works reliably,
             // if disposing the Canvas correctly disposes all
             // entities which hold this pointer.
-            OutputDevice& mrOutDev;
+            OutputDevice& mrOutDev; 
         };
     }
 
@@ -102,7 +102,7 @@ namespace vclcanvas
         VERBOSE_TRACE( "VCLCanvas::initialize called" );
 
         ENSURE_ARG_OR_THROW( maArguments.getLength() >= 6 &&
-                             maArguments[0].getValueTypeClass() == uno::TypeClass_HYPER,
+                             maArguments[0].getValueTypeClass() == uno::TypeClass_HYPER, 
                              "Canvas::initialize: wrong number of arguments, or wrong types" );
 
         sal_Int64 nPtr = 0;
@@ -114,7 +114,7 @@ namespace vclcanvas
                 ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(
                                      "Passed OutDev invalid!")),
                 NULL);
-
+        
         OutDevProviderSharedPtr pOutdevProvider( new OutDevHolder(*pOutDev) );
 
         // setup helper
@@ -147,15 +147,15 @@ namespace vclcanvas
         return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( CANVAS_SERVICE_NAME ) );
     }
 
-    bool Canvas::repaint( const GraphicObjectSharedPtr& rGrf,
+    bool Canvas::repaint( const GraphicObjectSharedPtr&	rGrf,
                           const rendering::ViewState&   viewState,
                           const rendering::RenderState& renderState,
-                          const ::Point&                rPt,
-                          const ::Size&                 rSz,
-                          const GraphicAttr&            rAttr ) const
+                          const ::Point& 				rPt, 
+                          const ::Size& 				rSz,
+                          const GraphicAttr&			rAttr ) const
     {
         tools::LocalGuard aGuard;
 
         return maCanvasHelper.repaint( rGrf, viewState, renderState, rPt, rSz, rAttr );
-    }
+    }    
 }
diff --git a/canvas/source/vcl/canvas.hxx b/canvas/source/vcl/canvas.hxx
index adda8d8eea40..581abe3bbe09 100644
--- a/canvas/source/vcl/canvas.hxx
+++ b/canvas/source/vcl/canvas.hxx
@@ -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
@@ -62,15 +62,15 @@ namespace vclcanvas
                                               ::com::sun::star::lang::XMultiServiceFactory,
                                               ::com::sun::star::util::XUpdatable,
                                               ::com::sun::star::beans::XPropertySet,
-                                              ::com::sun::star::lang::XServiceName >    GraphicDeviceBase_Base;
+                                              ::com::sun::star::lang::XServiceName >	GraphicDeviceBase_Base;
     typedef ::canvas::GraphicDeviceBase< ::canvas::BaseMutexHelper< GraphicDeviceBase_Base >,
-                                           DeviceHelper,
+                                           DeviceHelper, 
                                            tools::LocalGuard,
-                                           ::cppu::OWeakObject >    CanvasBase_Base;
+                                           ::cppu::OWeakObject > 	CanvasBase_Base;
     typedef ::canvas::IntegerBitmapBase< CanvasBase_Base,
-                                         CanvasHelper,
+                                         CanvasHelper, 
                                          tools::LocalGuard,
-                                         ::cppu::OWeakObject >      CanvasBaseT;
+                                         ::cppu::OWeakObject >		CanvasBaseT;
 
     /** Product of this component's factory.
 
@@ -85,9 +85,9 @@ namespace vclcanvas
                    public RepaintTarget
     {
     public:
-        Canvas( const ::com::sun::star::uno::Sequence<
+        Canvas( const ::com::sun::star::uno::Sequence< 
                       ::com::sun::star::uno::Any >&               aArguments,
-                const ::com::sun::star::uno::Reference<
+                const ::com::sun::star::uno::Reference< 
                       ::com::sun::star::uno::XComponentContext >& rxContext );
 
         void initialize();
@@ -107,7 +107,7 @@ namespace vclcanvas
         //                                    Classname     Base doing refcounting        Base implementing the XComponent interface
         //                                       |                 |                            |
         //                                       V                 V                            V
-        DECLARE_UNO3_XCOMPONENT_AGG_DEFAULTS( Canvas,   GraphicDeviceBase_Base, ::cppu::WeakComponentImplHelperBase );
+        DECLARE_UNO3_XCOMPONENT_AGG_DEFAULTS( Canvas,   GraphicDeviceBase_Base, ::cppu::WeakComponentImplHelperBase ); 
 
         // XServiceName
         virtual ::rtl::OUString SAL_CALL getServiceName(  ) throw (::com::sun::star::uno::RuntimeException);
@@ -116,7 +116,7 @@ namespace vclcanvas
         virtual bool repaint( const GraphicObjectSharedPtr&                 rGrf,
                               const com::sun::star::rendering::ViewState&   viewState,
                               const com::sun::star::rendering::RenderState& renderState,
-                              const ::Point&                                rPt,
+                              const ::Point&                                rPt, 
                               const ::Size&                                 rSz,
                               const GraphicAttr&                            rAttr ) const;
 
diff --git a/canvas/source/vcl/canvasbitmap.cxx b/canvas/source/vcl/canvasbitmap.cxx
index 38008e86ba87..e6bdc2dda1d1 100644
--- a/canvas/source/vcl/canvasbitmap.cxx
+++ b/canvas/source/vcl/canvasbitmap.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
@@ -46,11 +46,11 @@ namespace vclcanvas
                                 bool                           bAlphaBitmap,
                                 rendering::XGraphicDevice&     rDevice,
                                 const OutDevProviderSharedPtr& rOutDevProvider )
-    {
+    { 
         // create bitmap for given reference device
         // ========================================
         const USHORT nBitCount( (USHORT)24U );
-        const BitmapPalette*    pPalette = NULL;
+        const BitmapPalette*	pPalette = NULL;
 
         Bitmap aBitmap( rSize, nBitCount, pPalette );
 
@@ -60,8 +60,8 @@ namespace vclcanvas
         // use alpha VDev, then).
         if( bAlphaBitmap )
         {
-            AlphaMask   aAlpha ( rSize );
-
+            AlphaMask 	aAlpha ( rSize );
+            
             maCanvasHelper.init( BitmapEx( aBitmap, aAlpha ),
                                  rDevice,
                                  rOutDevProvider );
@@ -104,7 +104,7 @@ namespace vclcanvas
     {
         uno::Sequence< ::rtl::OUString > aRet(1);
         aRet[0] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM ( SERVICE_NAME ) );
-
+        
         return aRet;
     }
 
@@ -120,7 +120,7 @@ namespace vclcanvas
     bool CanvasBitmap::repaint( const GraphicObjectSharedPtr& rGrf,
                                 const rendering::ViewState&   viewState,
                                 const rendering::RenderState& renderState,
-                                const ::Point&                rPt,
+                                const ::Point&                rPt, 
                                 const ::Size&                 rSz,
                                 const GraphicAttr&            rAttr ) const
     {
diff --git a/canvas/source/vcl/canvasbitmap.hxx b/canvas/source/vcl/canvasbitmap.hxx
index 6440b830c3ee..c5a008afdc5d 100644
--- a/canvas/source/vcl/canvasbitmap.hxx
+++ b/canvas/source/vcl/canvasbitmap.hxx
@@ -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
@@ -55,11 +55,11 @@ namespace vclcanvas
     typedef ::cppu::WeakComponentImplHelper4< ::com::sun::star::rendering::XBitmapCanvas,
                                                ::com::sun::star::rendering::XIntegerBitmap,
                                                 ::com::sun::star::lang::XServiceInfo,
-                                             ::com::sun::star::beans::XFastPropertySet >    CanvasBitmapBase_Base;
-    typedef ::canvas::IntegerBitmapBase< ::canvas::BaseMutexHelper< CanvasBitmapBase_Base >,
-                                         CanvasBitmapHelper,
+                                             ::com::sun::star::beans::XFastPropertySet >  	CanvasBitmapBase_Base;
+    typedef ::canvas::IntegerBitmapBase< ::canvas::BaseMutexHelper< CanvasBitmapBase_Base >, 
+                                         CanvasBitmapHelper, 
                                          tools::LocalGuard,
-                                         ::cppu::OWeakObject >                          CanvasBitmap_Base;
+                                         ::cppu::OWeakObject >							CanvasBitmap_Base;
 
     class CanvasBitmap : public CanvasBitmap_Base,
                          public RepaintTarget
@@ -84,7 +84,7 @@ namespace vclcanvas
         /// Must be called with locked Solar mutex
         CanvasBitmap( const BitmapEx&                              rBitmap,
                       ::com::sun::star::rendering::XGraphicDevice& rDevice,
-                      const OutDevProviderSharedPtr&               rOutDevProvider );
+                      const OutDevProviderSharedPtr&               rOutDevProvider ); 
 
         // overridden because of mpDevice
         virtual void SAL_CALL disposing();
@@ -98,7 +98,7 @@ namespace vclcanvas
         virtual bool repaint( const GraphicObjectSharedPtr&                   rGrf,
                               const ::com::sun::star::rendering::ViewState&   viewState,
                               const ::com::sun::star::rendering::RenderState& renderState,
-                              const ::Point&                                  rPt,
+                              const ::Point&                                  rPt, 
                               const ::Size&                                   rSz,
                               const GraphicAttr&                              rAttr ) const;
 
@@ -120,7 +120,7 @@ namespace vclcanvas
 
     private:
         /** MUST hold here, too, since CanvasHelper only contains a
-            raw pointer (without refcounting)
+            raw pointer (without refcounting) 
         */
         ::com::sun::star::uno::Reference<com::sun::star::rendering::XGraphicDevice> mxDevice;
     };
diff --git a/canvas/source/vcl/canvasbitmaphelper.cxx b/canvas/source/vcl/canvasbitmaphelper.cxx
index 8fb5a872589d..5d472e8d185a 100644
--- a/canvas/source/vcl/canvasbitmaphelper.cxx
+++ b/canvas/source/vcl/canvasbitmaphelper.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
@@ -60,7 +60,7 @@ namespace vclcanvas
     CanvasBitmapHelper::CanvasBitmapHelper() :
         mpBackBuffer(),
         mpOutDevReference()
-    {
+    { 
     }
 
     void CanvasBitmapHelper::setBitmap( const BitmapEx& rBitmap )
@@ -86,8 +86,8 @@ namespace vclcanvas
         // forward new settings to base class (ref device, output
         // surface, no protection (own backbuffer), alpha depends on
         // whether BmpEx is transparent or not)
-        CanvasHelper::init( rDevice,
-                            mpBackBuffer,
+        CanvasHelper::init( rDevice, 
+                            mpBackBuffer, 
                             false,
                             rBitmap.IsTransparent() );
     }
@@ -100,7 +100,7 @@ namespace vclcanvas
         // forward to base class
         CanvasHelper::disposing();
     }
-
+    
     geometry::IntegerSize2D CanvasBitmapHelper::getSize()
     {
         if( !mpBackBuffer )
@@ -116,8 +116,8 @@ namespace vclcanvas
             mpBackBuffer->clear(); // alpha vdev needs special treatment
     }
 
-    uno::Reference< rendering::XBitmap > CanvasBitmapHelper::getScaledBitmap( const geometry::RealSize2D&   newSize,
-                                                                              sal_Bool                      beFast )
+    uno::Reference< rendering::XBitmap > CanvasBitmapHelper::getScaledBitmap( const geometry::RealSize2D& 	newSize, 
+                                                                              sal_Bool 						beFast )
     {
         ENSURE_OR_THROW( mpDevice,
                           "disposed CanvasHelper" );
@@ -129,15 +129,15 @@ namespace vclcanvas
 
         BitmapEx aRes( mpBackBuffer->getBitmapReference() );
 
-        aRes.Scale( ::vcl::unotools::sizeFromRealSize2D(newSize),
+        aRes.Scale( ::vcl::unotools::sizeFromRealSize2D(newSize), 
                      beFast ? BMP_SCALE_FAST : BMP_SCALE_INTERPOLATE );
 
-        return uno::Reference< rendering::XBitmap >(
+        return uno::Reference< rendering::XBitmap >( 
             new CanvasBitmap( aRes, *mpDevice, mpOutDevReference ) );
     }
 
-    uno::Sequence< sal_Int8 > CanvasBitmapHelper::getData( rendering::IntegerBitmapLayout&      rLayout,
-                                                           const geometry::IntegerRectangle2D&  rect )
+    uno::Sequence< sal_Int8 > CanvasBitmapHelper::getData( rendering::IntegerBitmapLayout& 		rLayout,
+                                                           const geometry::IntegerRectangle2D&	rect )
     {
         RTL_LOGFILE_CONTEXT( aLog, "::vclcanvas::CanvasBitmapHelper::getData()" );
 
@@ -150,7 +150,7 @@ namespace vclcanvas
 
         ScopedBitmapReadAccess pReadAccess( aBitmap.AcquireReadAccess(),
                                             aBitmap );
-        ScopedBitmapReadAccess pAlphaReadAccess( aAlpha.IsEmpty() ?
+        ScopedBitmapReadAccess pAlphaReadAccess( aAlpha.IsEmpty() ? 
                                                  (BitmapReadAccess*)NULL : aAlpha.AcquireReadAccess(),
                                                  aAlpha );
 
@@ -159,24 +159,24 @@ namespace vclcanvas
 
         // TODO(F1): Support more formats.
         const Size aBmpSize( aBitmap.GetSizePixel() );
-
+            
         rLayout.ScanLines = aBmpSize.Height();
         rLayout.ScanLineBytes = aBmpSize.Width()*4;
-        rLayout.ScanLineStride = rLayout.ScanLineBytes;
+        rLayout.ScanLineStride = rLayout.ScanLineBytes;        
 
-        // for the time being, always return as BGRA
+        // for the time being, always return as BGRA 
         uno::Sequence< sal_Int8 > aRes( 4*aBmpSize.Width()*aBmpSize.Height() );
         sal_Int8* pRes = aRes.getArray();
 
         int nCurrPos(0);
-        for( int y=rect.Y1;
-             y<aBmpSize.Height() && y<rect.Y2;
+        for( int y=rect.Y1; 
+             y<aBmpSize.Height() && y<rect.Y2; 
              ++y )
         {
             if( pAlphaReadAccess.get() != NULL )
             {
-                for( int x=rect.X1;
-                     x<aBmpSize.Width() && x<rect.X2;
+                for( int x=rect.X1; 
+                     x<aBmpSize.Width() && x<rect.X2; 
                      ++x )
                 {
                     pRes[ nCurrPos++ ] = pReadAccess->GetColor( y, x ).GetRed();
@@ -187,8 +187,8 @@ namespace vclcanvas
             }
             else
             {
-                for( int x=rect.X1;
-                     x<aBmpSize.Width() && x<rect.X2;
+                for( int x=rect.X1; 
+                     x<aBmpSize.Width() && x<rect.X2; 
                      ++x )
                 {
                     pRes[ nCurrPos++ ] = pReadAccess->GetColor( y, x ).GetRed();
@@ -201,10 +201,10 @@ namespace vclcanvas
 
         return aRes;
     }
-
-    void CanvasBitmapHelper::setData( const uno::Sequence< sal_Int8 >&      data,
-                                      const rendering::IntegerBitmapLayout& rLayout,
-                                      const geometry::IntegerRectangle2D&   rect )
+    
+    void CanvasBitmapHelper::setData( const uno::Sequence< sal_Int8 >& 		data, 
+                                      const rendering::IntegerBitmapLayout& rLayout, 
+                                      const geometry::IntegerRectangle2D&	rect )
     {
         RTL_LOGFILE_CONTEXT( aLog, "::vclcanvas::CanvasBitmapHelper::setData()" );
 
@@ -230,27 +230,27 @@ namespace vclcanvas
         {
             ScopedBitmapWriteAccess pWriteAccess( aBitmap.AcquireWriteAccess(),
                                                   aBitmap );
-            ScopedBitmapWriteAccess pAlphaWriteAccess( aAlpha.IsEmpty() ?
+            ScopedBitmapWriteAccess pAlphaWriteAccess( aAlpha.IsEmpty() ? 
                                                        (BitmapWriteAccess*)NULL : aAlpha.AcquireWriteAccess(),
                                                        aAlpha );
 
             if( pAlphaWriteAccess.get() )
             {
                 DBG_ASSERT( pAlphaWriteAccess->GetScanlineFormat() == BMP_FORMAT_8BIT_PAL ||
-                            pAlphaWriteAccess->GetScanlineFormat() == BMP_FORMAT_8BIT_TC_MASK,
+                            pAlphaWriteAccess->GetScanlineFormat() == BMP_FORMAT_8BIT_TC_MASK, 
                             "non-8bit alpha not supported!" );
-            }
-
+            } 
+            
             ENSURE_OR_THROW( pWriteAccess.get() != NULL,
                              "Could not acquire write access to bitmap" );
 
             // TODO(F1): Support more formats.
-            const Size aBmpSize( aBitmap.GetSizePixel() );
+            const Size aBmpSize( aBitmap.GetSizePixel() ); 
 
-            // for the time being, always read as BGRA
+            // for the time being, always read as BGRA 
             int x, y, nCurrPos(0);
-            for( y=rect.Y1;
-                 y<aBmpSize.Height() && y<rect.Y2;
+            for( y=rect.Y1; 
+                 y<aBmpSize.Height() && y<rect.Y2; 
                  ++y )
             {
                 if( pAlphaWriteAccess.get() != NULL )
@@ -262,8 +262,8 @@ namespace vclcanvas
                             Scanline pScan  = pWriteAccess->GetScanline( y );
                             Scanline pAScan = pAlphaWriteAccess->GetScanline( y );
 
-                            for( x=rect.X1;
-                                 x<aBmpSize.Width() && x<rect.X2;
+                            for( x=rect.X1; 
+                                 x<aBmpSize.Width() && x<rect.X2; 
                                  ++x )
                             {
                                 *pScan++ = (BYTE)pWriteAccess->GetBestPaletteIndex(
@@ -272,9 +272,9 @@ namespace vclcanvas
                                                  data[ nCurrPos+2 ] ) );
 
                                 nCurrPos += 3;
-
+                        
                                 // cast to unsigned byte, for correct subtraction result
-                                *pAScan++ = static_cast<BYTE>(255 -
+                                *pAScan++ = static_cast<BYTE>(255 - 
                                                               static_cast<sal_uInt8>(data[ nCurrPos++ ]));
                             }
                         }
@@ -285,8 +285,8 @@ namespace vclcanvas
                             Scanline pScan  = pWriteAccess->GetScanline( y );
                             Scanline pAScan = pAlphaWriteAccess->GetScanline( y );
 
-                            for( x=rect.X1;
-                                 x<aBmpSize.Width() && x<rect.X2;
+                            for( x=rect.X1; 
+                                 x<aBmpSize.Width() && x<rect.X2; 
                                  ++x )
                             {
                                 *pScan++ = data[ nCurrPos+2 ];
@@ -294,9 +294,9 @@ namespace vclcanvas
                                 *pScan++ = data[ nCurrPos   ];
 
                                 nCurrPos += 3;
-
+                        
                                 // cast to unsigned byte, for correct subtraction result
-                                *pAScan++ = static_cast<BYTE>(255 -
+                                *pAScan++ = static_cast<BYTE>(255 - 
                                                               static_cast<sal_uInt8>(data[ nCurrPos++ ]));
                             }
                         }
@@ -307,8 +307,8 @@ namespace vclcanvas
                             Scanline pScan  = pWriteAccess->GetScanline( y );
                             Scanline pAScan = pAlphaWriteAccess->GetScanline( y );
 
-                            for( x=rect.X1;
-                                 x<aBmpSize.Width() && x<rect.X2;
+                            for( x=rect.X1; 
+                                 x<aBmpSize.Width() && x<rect.X2; 
                                  ++x )
                             {
                                 *pScan++ = data[ nCurrPos   ];
@@ -316,9 +316,9 @@ namespace vclcanvas
                                 *pScan++ = data[ nCurrPos+2 ];
 
                                 nCurrPos += 3;
-
+                        
                                 // cast to unsigned byte, for correct subtraction result
-                                *pAScan++ = static_cast<BYTE>(255 -
+                                *pAScan++ = static_cast<BYTE>(255 - 
                                                               static_cast<sal_uInt8>(data[ nCurrPos++ ]));
                             }
                         }
@@ -326,19 +326,19 @@ namespace vclcanvas
 
                         default:
                         {
-                            for( x=rect.X1;
-                                 x<aBmpSize.Width() && x<rect.X2;
+                            for( x=rect.X1; 
+                                 x<aBmpSize.Width() && x<rect.X2; 
                                  ++x )
-                            {
+                            { 
                                 pWriteAccess->SetPixel( y, x, BitmapColor( data[ nCurrPos   ],
                                                                            data[ nCurrPos+1 ],
                                                                            data[ nCurrPos+2 ] ) );
                                 nCurrPos += 3;
-
+                        
                                 // cast to unsigned byte, for correct subtraction result
-                                pAlphaWriteAccess->SetPixel( y, x,
-                                                             BitmapColor(
-                                                                 static_cast<BYTE>(255 -
+                                pAlphaWriteAccess->SetPixel( y, x, 
+                                                             BitmapColor( 
+                                                                 static_cast<BYTE>(255 - 
                                                                                    static_cast<sal_uInt8>(data[ nCurrPos++ ])) ) );
                             }
                         }
@@ -355,8 +355,8 @@ namespace vclcanvas
                         {
                             Scanline pScan = pWriteAccess->GetScanline( y );
 
-                            for( x=rect.X1;
-                                 x<aBmpSize.Width() && x<rect.X2;
+                            for( x=rect.X1; 
+                                 x<aBmpSize.Width() && x<rect.X2; 
                                  ++x )
                             {
                                 *pScan++ = (BYTE)pWriteAccess->GetBestPaletteIndex(
@@ -373,8 +373,8 @@ namespace vclcanvas
                         {
                             Scanline pScan = pWriteAccess->GetScanline( y );
 
-                            for( x=rect.X1;
-                                 x<aBmpSize.Width() && x<rect.X2;
+                            for( x=rect.X1; 
+                                 x<aBmpSize.Width() && x<rect.X2; 
                                  ++x )
                             {
                                 *pScan++ = data[ nCurrPos+2 ];
@@ -390,8 +390,8 @@ namespace vclcanvas
                         {
                             Scanline pScan = pWriteAccess->GetScanline( y );
 
-                            for( x=rect.X1;
-                                 x<aBmpSize.Width() && x<rect.X2;
+                            for( x=rect.X1; 
+                                 x<aBmpSize.Width() && x<rect.X2; 
                                  ++x )
                             {
                                 *pScan++ = data[ nCurrPos   ];
@@ -405,8 +405,8 @@ namespace vclcanvas
 
                         default:
                         {
-                            for( x=rect.X1;
-                                 x<aBmpSize.Width() && x<rect.X2;
+                            for( x=rect.X1; 
+                                 x<aBmpSize.Width() && x<rect.X2; 
                                  ++x )
                             {
                                 pWriteAccess->SetPixel( y, x, BitmapColor( data[ nCurrPos   ],
@@ -430,14 +430,14 @@ namespace vclcanvas
             if( aAlpha.IsEmpty() )
                 setBitmap( BitmapEx( aBitmap ) );
             else
-                setBitmap( BitmapEx( aBitmap,
+                setBitmap( BitmapEx( aBitmap, 
                                      AlphaMask( aAlpha ) ) );
         }
     }
 
-    void CanvasBitmapHelper::setPixel( const uno::Sequence< sal_Int8 >&      color,
-                                       const rendering::IntegerBitmapLayout& rLayout,
-                                       const geometry::IntegerPoint2D&       pos )
+    void CanvasBitmapHelper::setPixel( const uno::Sequence< sal_Int8 >& 	 color, 
+                                       const rendering::IntegerBitmapLayout& rLayout, 
+                                       const geometry::IntegerPoint2D& 		 pos )
     {
         RTL_LOGFILE_CONTEXT( aLog, "::vclcanvas::CanvasBitmapHelper::setPixel()" );
 
@@ -446,11 +446,11 @@ namespace vclcanvas
 
         const Size aBmpSize( mpBackBuffer->getBitmapReference().GetSizePixel() );
 
-        ENSURE_ARG_OR_THROW( pos.X >= 0 && pos.X < aBmpSize.Width(),
+        ENSURE_ARG_OR_THROW( pos.X >= 0 && pos.X < aBmpSize.Width(), 
                          "X coordinate out of bounds" );
-        ENSURE_ARG_OR_THROW( pos.Y >= 0 && pos.Y < aBmpSize.Height(),
+        ENSURE_ARG_OR_THROW( pos.Y >= 0 && pos.Y < aBmpSize.Height(), 
                          "Y coordinate out of bounds" );
-        ENSURE_ARG_OR_THROW( color.getLength() > 3,
+        ENSURE_ARG_OR_THROW( color.getLength() > 3, 
                          "not enough color components" );
 
         const rendering::IntegerBitmapLayout aRefLayout( getMemoryLayout() );
@@ -472,7 +472,7 @@ namespace vclcanvas
         {
             ScopedBitmapWriteAccess pWriteAccess( aBitmap.AcquireWriteAccess(),
                                                   aBitmap );
-            ScopedBitmapWriteAccess pAlphaWriteAccess( aAlpha.IsEmpty() ?
+            ScopedBitmapWriteAccess pAlphaWriteAccess( aAlpha.IsEmpty() ? 
                                                        (BitmapWriteAccess*)NULL : aAlpha.AcquireWriteAccess(),
                                                        aAlpha );
 
@@ -496,12 +496,12 @@ namespace vclcanvas
             if( aAlpha.IsEmpty() )
                 setBitmap( BitmapEx( aBitmap ) );
             else
-                setBitmap( BitmapEx( aBitmap,
+                setBitmap( BitmapEx( aBitmap, 
                                      AlphaMask( aAlpha ) ) );
         }
     }
 
-    uno::Sequence< sal_Int8 > CanvasBitmapHelper::getPixel( rendering::IntegerBitmapLayout& rLayout,
+    uno::Sequence< sal_Int8 > CanvasBitmapHelper::getPixel( rendering::IntegerBitmapLayout&	rLayout, 
                                                             const geometry::IntegerPoint2D& pos )
     {
         RTL_LOGFILE_CONTEXT( aLog, "::vclcanvas::CanvasBitmapHelper::getPixel()" );
@@ -512,13 +512,13 @@ namespace vclcanvas
         rLayout = getMemoryLayout();
         rLayout.ScanLines = 1;
         rLayout.ScanLineBytes = 4;
-        rLayout.ScanLineStride = rLayout.ScanLineBytes;
+        rLayout.ScanLineStride = rLayout.ScanLineBytes;        
 
         const Size aBmpSize( mpBackBuffer->getBitmapReference().GetSizePixel() );
 
-        ENSURE_ARG_OR_THROW( pos.X >= 0 && pos.X < aBmpSize.Width(),
+        ENSURE_ARG_OR_THROW( pos.X >= 0 && pos.X < aBmpSize.Width(), 
                          "X coordinate out of bounds" );
-        ENSURE_ARG_OR_THROW( pos.Y >= 0 && pos.Y < aBmpSize.Height(),
+        ENSURE_ARG_OR_THROW( pos.Y >= 0 && pos.Y < aBmpSize.Height(), 
                          "Y coordinate out of bounds" );
 
         Bitmap aBitmap( mpBackBuffer->getBitmapReference().GetBitmap() );
@@ -526,7 +526,7 @@ namespace vclcanvas
 
         ScopedBitmapReadAccess pReadAccess( aBitmap.AcquireReadAccess(),
                                             aBitmap );
-        ScopedBitmapReadAccess pAlphaReadAccess( aAlpha.IsEmpty() ?
+        ScopedBitmapReadAccess pAlphaReadAccess( aAlpha.IsEmpty() ? 
                                                  (BitmapReadAccess*)NULL : aAlpha.AcquireReadAccess(),
                                                  aAlpha );
         ENSURE_OR_THROW( pReadAccess.get() != NULL,
@@ -534,7 +534,7 @@ namespace vclcanvas
 
         uno::Sequence< sal_Int8 > aRes( 4 );
         sal_Int8* pRes = aRes.getArray();
-
+            
         const BitmapColor aColor( pReadAccess->GetColor( pos.Y, pos.X ) );
         pRes[ 0 ] = aColor.GetRed();
         pRes[ 1 ] = aColor.GetGreen();
diff --git a/canvas/source/vcl/canvasbitmaphelper.hxx b/canvas/source/vcl/canvasbitmaphelper.hxx
index 196d53d7b58a..35c4135b6b95 100644
--- a/canvas/source/vcl/canvasbitmaphelper.hxx
+++ b/canvas/source/vcl/canvasbitmaphelper.hxx
@@ -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
@@ -92,24 +92,24 @@ namespace vclcanvas
 
         ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XBitmapCanvas > queryBitmapCanvas();
 
-        ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XBitmap >
-            getScaledBitmap( const ::com::sun::star::geometry::RealSize2D&  newSize,
-                             sal_Bool                                       beFast );
+        ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XBitmap > 
+            getScaledBitmap( const ::com::sun::star::geometry::RealSize2D& 	newSize, 
+                             sal_Bool 										beFast );
 
-        ::com::sun::star::uno::Sequence< sal_Int8 >
-            getData( ::com::sun::star::rendering::IntegerBitmapLayout&      bitmapLayout,
-                     const ::com::sun::star::geometry::IntegerRectangle2D&  rect );
+        ::com::sun::star::uno::Sequence< sal_Int8 > 
+            getData( ::com::sun::star::rendering::IntegerBitmapLayout& 		bitmapLayout,
+                     const ::com::sun::star::geometry::IntegerRectangle2D&	rect );
 
-        void setData( const ::com::sun::star::uno::Sequence< sal_Int8 >&        data,
-                      const ::com::sun::star::rendering::IntegerBitmapLayout&   bitmapLayout,
-                      const ::com::sun::star::geometry::IntegerRectangle2D&     rect );
+        void setData( const ::com::sun::star::uno::Sequence< sal_Int8 >& 		data, 
+                      const ::com::sun::star::rendering::IntegerBitmapLayout& 	bitmapLayout, 
+                      const ::com::sun::star::geometry::IntegerRectangle2D& 	rect );
 
-        void setPixel( const ::com::sun::star::uno::Sequence< sal_Int8 >&       color,
-                       const ::com::sun::star::rendering::IntegerBitmapLayout&  bitmapLayout,
-                       const ::com::sun::star::geometry::IntegerPoint2D&        pos );
+        void setPixel( const ::com::sun::star::uno::Sequence< sal_Int8 >& 		color, 
+                       const ::com::sun::star::rendering::IntegerBitmapLayout&	bitmapLayout, 
+                       const ::com::sun::star::geometry::IntegerPoint2D& 		pos );
 
-        ::com::sun::star::uno::Sequence< sal_Int8 >
-            getPixel( ::com::sun::star::rendering::IntegerBitmapLayout& bitmapLayout,
+        ::com::sun::star::uno::Sequence< sal_Int8 > 
+            getPixel( ::com::sun::star::rendering::IntegerBitmapLayout& bitmapLayout, 
                       const ::com::sun::star::geometry::IntegerPoint2D& pos );
 
         ::com::sun::star::rendering::IntegerBitmapLayout getMemoryLayout();
@@ -119,9 +119,9 @@ namespace vclcanvas
 
     private:
 
-        void setBitmap( const BitmapEx& rBitmap );
+        void setBitmap( const BitmapEx&	rBitmap );
 
-        BitmapBackBufferSharedPtr   mpBackBuffer;
+        BitmapBackBufferSharedPtr	mpBackBuffer;
         OutDevProviderSharedPtr     mpOutDevReference;
     };
 }
diff --git a/canvas/source/vcl/canvascustomsprite.cxx b/canvas/source/vcl/canvascustomsprite.cxx
index a55109a9749f..ecd942af84e2 100644
--- a/canvas/source/vcl/canvascustomsprite.cxx
+++ b/canvas/source/vcl/canvascustomsprite.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
@@ -65,16 +65,16 @@ namespace vclcanvas
                                             const OutDevProviderSharedPtr&            rOutDevProvider,
                                             bool                                      bShowSpriteBounds )
     {
-        ENSURE_OR_THROW( rOwningSpriteCanvas.get() &&
+        ENSURE_OR_THROW( rOwningSpriteCanvas.get() && 
                          rOutDevProvider,
                          "CanvasCustomSprite::CanvasCustomSprite(): Invalid sprite canvas" );
 
         // setup back buffer
         // -----------------
 
-        const ::Size aSize(
+        const ::Size aSize( 
             static_cast<sal_Int32>( ::std::max( 1.0,
-                                                ceil( rSpriteSize.Width ))),  // round up to nearest int,
+                                                ceil( rSpriteSize.Width ))),  // round up to nearest int, 
                                                                               // enforce sprite to have at
                                                                                // least (1,1) pixel size
             static_cast<sal_Int32>( ::std::max( 1.0,
@@ -85,7 +85,7 @@ namespace vclcanvas
         pBackBuffer->setSize( aSize );
 
         // create mask backbuffer, with one bit color depth
-        BackBufferSharedPtr pBackBufferMask( new BackBuffer( rOutDevProvider->getOutDev(),
+        BackBufferSharedPtr pBackBufferMask( new BackBuffer( rOutDevProvider->getOutDev(), 
                                                              true ) );
         pBackBufferMask->setSize( aSize );
 
@@ -95,7 +95,7 @@ namespace vclcanvas
         // disable font antialiasing (causes ugly shadows otherwise)
         pBackBuffer->getOutDev().SetAntialiasing( ANTIALIASING_DISABLE_TEXT );
         pBackBufferMask->getOutDev().SetAntialiasing( ANTIALIASING_DISABLE_TEXT );
-
+            
         // set mask vdev drawmode, such that everything is painted
         // black. That leaves us with a binary image, white for
         // background, black for painted content
@@ -109,8 +109,8 @@ namespace vclcanvas
         // always render into back buffer, don't preserve state (it's
         // our private VDev, after all), have notion of alpha
         maCanvasHelper.init( rDevice,
-                             pBackBuffer,
-                             false,
+                             pBackBuffer, 
+                             false, 
                              true );
         maCanvasHelper.setBackgroundOutDev( pBackBufferMask );
 
@@ -118,7 +118,7 @@ namespace vclcanvas
         // setup sprite helper
         // -------------------
 
-        maSpriteHelper.init( rSpriteSize,
+        maSpriteHelper.init( rSpriteSize, 
                              rOwningSpriteCanvas,
                              pBackBuffer,
                              pBackBufferMask,
@@ -153,7 +153,7 @@ namespace vclcanvas
     {
         uno::Sequence< ::rtl::OUString > aRet(1);
         aRet[0] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM ( SERVICE_NAME ) );
-
+        
         return aRet;
     }
 
@@ -172,20 +172,20 @@ namespace vclcanvas
     {
         tools::LocalGuard aGuard;
 
-        maSpriteHelper.redraw( rOutDev,
-                               rOrigOutputPos,
-                               mbSurfaceDirty,
+        maSpriteHelper.redraw( rOutDev, 
+                               rOrigOutputPos, 
+                               mbSurfaceDirty, 
                                bBufferedUpdate );
-
+        
         mbSurfaceDirty = false;
     }
 
-    bool CanvasCustomSprite::repaint( const GraphicObjectSharedPtr& rGrf,
+    bool CanvasCustomSprite::repaint( const GraphicObjectSharedPtr&	rGrf,
                                       const rendering::ViewState&   viewState,
                                       const rendering::RenderState& renderState,
-                                      const ::Point&                rPt,
-                                      const ::Size&                 rSz,
-                                      const GraphicAttr&            rAttr ) const
+                                      const ::Point& 				rPt, 
+                                      const ::Size& 				rSz,
+                                      const GraphicAttr&			rAttr ) const
     {
         tools::LocalGuard aGuard;
 
diff --git a/canvas/source/vcl/canvascustomsprite.hxx b/canvas/source/vcl/canvascustomsprite.hxx
index 21202b75368d..7d8be2a36f3b 100644
--- a/canvas/source/vcl/canvascustomsprite.hxx
+++ b/canvas/source/vcl/canvascustomsprite.hxx
@@ -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
@@ -58,7 +58,7 @@ namespace vclcanvas
     typedef ::cppu::WeakComponentImplHelper4< ::com::sun::star::rendering::XCustomSprite,
                                                ::com::sun::star::rendering::XBitmapCanvas,
                                               ::com::sun::star::rendering::XIntegerBitmap,
-                                                ::com::sun::star::lang::XServiceInfo >  CanvasCustomSpriteBase_Base;
+                                                ::com::sun::star::lang::XServiceInfo >	CanvasCustomSpriteBase_Base;
     /** Mixin Sprite
 
         Have to mixin the Sprite interface before deriving from
@@ -82,10 +82,10 @@ namespace vclcanvas
     };
 
     typedef ::canvas::CanvasCustomSpriteBase< CanvasCustomSpriteSpriteBase_Base,
-                                              SpriteHelper,
-                                              CanvasHelper,
+                                              SpriteHelper, 
+                                              CanvasHelper, 
                                               tools::LocalGuard,
-                                              ::cppu::OWeakObject >                     CanvasCustomSpriteBaseT;
+                                              ::cppu::OWeakObject > 					CanvasCustomSpriteBaseT;
 
     /* Definition of CanvasCustomSprite class */
 
@@ -106,7 +106,7 @@ namespace vclcanvas
         //                                    Classname           Base doing refcount          Base implementing the XComponent interface
         //                                          |                    |                         |
         //                                          V                    V                         V
-        DECLARE_UNO3_XCOMPONENT_AGG_DEFAULTS( CanvasCustomSprite, CanvasCustomSpriteBase_Base, ::cppu::WeakComponentImplHelperBase );
+        DECLARE_UNO3_XCOMPONENT_AGG_DEFAULTS( CanvasCustomSprite, CanvasCustomSpriteBase_Base, ::cppu::WeakComponentImplHelperBase ); 
 
         // XServiceInfo
         virtual ::rtl::OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException );
@@ -124,7 +124,7 @@ namespace vclcanvas
         virtual bool repaint( const GraphicObjectSharedPtr&                   rGrf,
                               const ::com::sun::star::rendering::ViewState&   viewState,
                               const ::com::sun::star::rendering::RenderState& renderState,
-                              const ::Point&                                  rPt,
+                              const ::Point&                                  rPt, 
                               const ::Size&                                   rSz,
                               const GraphicAttr&                              rAttr ) const;
     };
diff --git a/canvas/source/vcl/canvasfont.cxx b/canvas/source/vcl/canvasfont.cxx
index e95a3f79f2b5..2c178702318d 100644
--- a/canvas/source/vcl/canvasfont.cxx
+++ b/canvas/source/vcl/canvasfont.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
@@ -43,9 +43,9 @@ using namespace ::com::sun::star;
 
 namespace vclcanvas
 {
-    CanvasFont::CanvasFont( const rendering::FontRequest&                   rFontRequest,
-                            const uno::Sequence< beans::PropertyValue >&    ,
-                            const geometry::Matrix2D&                       rFontMatrix,
+    CanvasFont::CanvasFont( const rendering::FontRequest& 					rFontRequest,
+                            const uno::Sequence< beans::PropertyValue >&	, 
+                            const geometry::Matrix2D& 						rFontMatrix,
                             rendering::XGraphicDevice&                      rDevice,
                             const OutDevProviderSharedPtr&                  rOutDevProvider ) :
         CanvasFont_Base( m_aMutex ),
@@ -77,13 +77,13 @@ namespace vclcanvas
             const Size aSize = rOutDev.GetFontMetric( *maFont ).GetSize();
 
             const double fDividend( rFontMatrix.m10 + rFontMatrix.m11 );
-            double fStretch = (rFontMatrix.m00 + rFontMatrix.m01);
-
+            double fStretch = (rFontMatrix.m00 + rFontMatrix.m01);            
+            
             if( !::basegfx::fTools::equalZero( fDividend) )
                 fStretch /= fDividend;
-
+            
             const long nNewWidth = ::basegfx::fround( aSize.Width() * fStretch );
-
+            
             maFont->SetWidth( nNewWidth );
 
             rOutDev.EnableMapMode(bOldMapState);
@@ -105,10 +105,10 @@ namespace vclcanvas
         if( !mpRefDevice.is() )
             return uno::Reference< rendering::XTextLayout >(); // we're disposed
 
-        return new TextLayout( aText,
-                               nDirection,
-                               nRandomSeed,
-                               Reference( this ),
+        return new TextLayout( aText, 
+                               nDirection, 
+                               nRandomSeed, 
+                               Reference( this ), 
                                mpRefDevice,
                                mpOutDevProvider);
     }
diff --git a/canvas/source/vcl/canvasfont.hxx b/canvas/source/vcl/canvasfont.hxx
index e0c9a567a29a..06375e40dd57 100644
--- a/canvas/source/vcl/canvasfont.hxx
+++ b/canvas/source/vcl/canvasfont.hxx
@@ -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,7 +56,7 @@ namespace vclcanvas
     typedef ::cppu::WeakComponentImplHelper2< ::com::sun::star::rendering::XCanvasFont,
                                                ::com::sun::star::lang::XServiceInfo > CanvasFont_Base;
 
-    class CanvasFont : public ::comphelper::OBaseMutex,
+    class CanvasFont : public ::comphelper::OBaseMutex, 
                        public CanvasFont_Base,
                        private ::boost::noncopyable
     {
@@ -65,9 +65,9 @@ namespace vclcanvas
             CanvasFont,
             ::com::sun::star::rendering::XCanvasFont > Reference;
 
-        CanvasFont( const ::com::sun::star::rendering::FontRequest&                                     fontRequest,
-                    const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >&    extraFontProperties,
-                    const ::com::sun::star::geometry::Matrix2D&                                         rFontMatrix,
+        CanvasFont( const ::com::sun::star::rendering::FontRequest& 									fontRequest,
+                    const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& 	extraFontProperties, 
+                    const ::com::sun::star::geometry::Matrix2D&											rFontMatrix,
                     ::com::sun::star::rendering::XGraphicDevice&                                        rDevice,
                     const OutDevProviderSharedPtr&                                                      rOutDevProvider );
 
diff --git a/canvas/source/vcl/canvashelper.cxx b/canvas/source/vcl/canvashelper.cxx
index a83b260d52d5..c73ab26a9de7 100644
--- a/canvas/source/vcl/canvashelper.cxx
+++ b/canvas/source/vcl/canvashelper.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
@@ -78,7 +78,7 @@ namespace vclcanvas
         basegfx::B2DLineJoin b2DJoineFromJoin( sal_Int8 nJoinType )
         {
             switch( nJoinType )
-            {
+            {                
                 case rendering::PathJoinType::NONE:
                     return basegfx::B2DLINEJOIN_NONE;
 
@@ -118,26 +118,26 @@ namespace vclcanvas
     }
 
     void CanvasHelper::init( rendering::XGraphicDevice&     rDevice,
-                             const OutDevProviderSharedPtr& rOutDev,
-                             bool                           bProtect,
-                             bool                           bHaveAlpha )
+                             const OutDevProviderSharedPtr&	rOutDev, 
+                             bool 							bProtect,
+                             bool 							bHaveAlpha )
     {
         // cast away const, need to change refcount (as this is
         // ~invisible to client code, still logically const)
-        mpDevice    = &rDevice;
+        mpDevice	= &rDevice;
         mbHaveAlpha = bHaveAlpha;
 
         setOutDev( rOutDev, bProtect );
     }
 
-    void CanvasHelper::setOutDev( const OutDevProviderSharedPtr& rOutDev,
-                                  bool                           bProtect )
+    void CanvasHelper::setOutDev( const OutDevProviderSharedPtr& rOutDev, 
+                                  bool 							 bProtect )
     {
         if( bProtect )
             mpProtectedOutDev = rOutDev;
         else
             mpProtectedOutDev.reset();
-
+            
         mpOutDev = rOutDev;
     }
 
@@ -164,7 +164,7 @@ namespace vclcanvas
             if( mp2ndOutDev )
             {
                 OutputDevice& rOutDev2( mp2ndOutDev->getOutDev() );
-
+                
                 rOutDev2.SetDrawMode( DRAWMODE_DEFAULT );
                 rOutDev2.EnableMapMode( FALSE );
                 rOutDev2.SetLineColor( COL_WHITE );
@@ -177,10 +177,10 @@ namespace vclcanvas
         }
     }
 
-    void CanvasHelper::drawPoint( const rendering::XCanvas*     ,
-                                  const geometry::RealPoint2D&  aPoint,
-                                  const rendering::ViewState&   viewState,
-                                  const rendering::RenderState& renderState )
+    void CanvasHelper::drawPoint( const rendering::XCanvas* 	, 
+                                  const geometry::RealPoint2D& 	aPoint,
+                                  const rendering::ViewState& 	viewState,
+                                  const rendering::RenderState&	renderState )
     {
         // are we disposed?
         if( mpOutDev )
@@ -199,11 +199,11 @@ namespace vclcanvas
         }
     }
 
-    void CanvasHelper::drawLine( const rendering::XCanvas*      ,
-                                 const geometry::RealPoint2D&   aStartRealPoint2D,
-                                 const geometry::RealPoint2D&   aEndRealPoint2D,
-                                 const rendering::ViewState&    viewState,
-                                 const rendering::RenderState&  renderState )
+    void CanvasHelper::drawLine( const rendering::XCanvas* 		, 
+                                 const geometry::RealPoint2D& 	aStartRealPoint2D,
+                                 const geometry::RealPoint2D& 	aEndRealPoint2D,
+                                 const rendering::ViewState& 	viewState,
+                                 const rendering::RenderState& 	renderState )
     {
         // are we disposed?
         if( mpOutDev )
@@ -224,24 +224,24 @@ namespace vclcanvas
         }
     }
 
-    void CanvasHelper::drawBezier( const rendering::XCanvas*            ,
-                                   const geometry::RealBezierSegment2D& aBezierSegment,
-                                   const geometry::RealPoint2D&         _aEndPoint,
-                                   const rendering::ViewState&          viewState,
-                                   const rendering::RenderState&        renderState )
+    void CanvasHelper::drawBezier( const rendering::XCanvas* 			, 
+                                   const geometry::RealBezierSegment2D&	aBezierSegment,
+                                   const geometry::RealPoint2D& 		_aEndPoint,
+                                   const rendering::ViewState& 			viewState,
+                                   const rendering::RenderState& 		renderState )
     {
         if( mpOutDev )
         {
             tools::OutDevStateKeeper aStateKeeper( mpProtectedOutDev );
             setupOutDevState( viewState, renderState, LINE_COLOR );
 
-            const Point& rStartPoint( tools::mapRealPoint2D( geometry::RealPoint2D(aBezierSegment.Px,
+            const Point& rStartPoint( tools::mapRealPoint2D( geometry::RealPoint2D(aBezierSegment.Px, 
                                                                                    aBezierSegment.Py),
                                                             viewState, renderState ) );
-            const Point& rCtrlPoint1( tools::mapRealPoint2D( geometry::RealPoint2D(aBezierSegment.C1x,
+            const Point& rCtrlPoint1( tools::mapRealPoint2D( geometry::RealPoint2D(aBezierSegment.C1x, 
                                                                                    aBezierSegment.C1y),
                                                             viewState, renderState ) );
-            const Point& rCtrlPoint2( tools::mapRealPoint2D( geometry::RealPoint2D(aBezierSegment.C2x,
+            const Point& rCtrlPoint2( tools::mapRealPoint2D( geometry::RealPoint2D(aBezierSegment.C2x, 
                                                                                    aBezierSegment.C2y),
                                                              viewState, renderState ) );
             const Point& rEndPoint( tools::mapRealPoint2D( _aEndPoint,
@@ -249,13 +249,13 @@ namespace vclcanvas
 
             ::Polygon aPoly(4);
             aPoly.SetPoint( rStartPoint, 0 );
-            aPoly.SetFlags( 0, POLY_NORMAL );
+            aPoly.SetFlags( 0, POLY_NORMAL ); 
             aPoly.SetPoint( rCtrlPoint1, 1 );
-            aPoly.SetFlags( 1, POLY_CONTROL );
+            aPoly.SetFlags( 1, POLY_CONTROL ); 
             aPoly.SetPoint( rCtrlPoint2, 2 );
-            aPoly.SetFlags( 2, POLY_CONTROL );
+            aPoly.SetFlags( 2, POLY_CONTROL ); 
             aPoly.SetPoint( rEndPoint, 3 );
-            aPoly.SetFlags( 3, POLY_NORMAL );
+            aPoly.SetFlags( 3, POLY_NORMAL ); 
 
             // TODO(F2): alpha
             mpOutDev->getOutDev().DrawPolygon( aPoly );
@@ -264,10 +264,10 @@ namespace vclcanvas
         }
     }
 
-    uno::Reference< rendering::XCachedPrimitive > CanvasHelper::drawPolyPolygon( const rendering::XCanvas*                          ,
+    uno::Reference< rendering::XCachedPrimitive > CanvasHelper::drawPolyPolygon( const rendering::XCanvas* 							, 
                                                                                  const uno::Reference< rendering::XPolyPolygon2D >& xPolyPolygon,
-                                                                                 const rendering::ViewState&                        viewState,
-                                                                                 const rendering::RenderState&                      renderState )
+                                                                                 const rendering::ViewState& 						viewState,
+                                                                                 const rendering::RenderState& 						renderState )
     {
         ENSURE_ARG_OR_THROW( xPolyPolygon.is(),
                          "polygon is NULL");
@@ -277,14 +277,14 @@ namespace vclcanvas
             tools::OutDevStateKeeper aStateKeeper( mpProtectedOutDev );
             setupOutDevState( viewState, renderState, LINE_COLOR );
 
-            const ::basegfx::B2DPolyPolygon& rPolyPoly(
+            const ::basegfx::B2DPolyPolygon& rPolyPoly( 
                 ::basegfx::unotools::b2DPolyPolygonFromXPolyPolygon2D(xPolyPolygon) );
             const PolyPolygon aPolyPoly( tools::mapPolyPolygon( rPolyPoly, viewState, renderState ) );
 
             if( rPolyPoly.isClosed() )
             {
                 mpOutDev->getOutDev().DrawPolyPolygon( aPolyPoly );
-
+                
                 if( mp2ndOutDev )
                     mp2ndOutDev->getOutDev().DrawPolyPolygon( aPolyPoly );
             }
@@ -302,7 +302,7 @@ namespace vclcanvas
                 for( USHORT i=0; i<nSize; ++i )
                 {
                     mpOutDev->getOutDev().DrawPolyLine( aPolyPoly[i] );
-
+                    
                     if( mp2ndOutDev )
                         mp2ndOutDev->getOutDev().DrawPolyLine( aPolyPoly[i] );
                 }
@@ -313,11 +313,11 @@ namespace vclcanvas
         return uno::Reference< rendering::XCachedPrimitive >(NULL);
     }
 
-    uno::Reference< rendering::XCachedPrimitive > CanvasHelper::strokePolyPolygon( const rendering::XCanvas*                            ,
-                                                                                   const uno::Reference< rendering::XPolyPolygon2D >&   xPolyPolygon,
-                                                                                   const rendering::ViewState&                          viewState,
-                                                                                   const rendering::RenderState&                        renderState,
-                                                                                   const rendering::StrokeAttributes&                   strokeAttributes )
+    uno::Reference< rendering::XCachedPrimitive > CanvasHelper::strokePolyPolygon( const rendering::XCanvas* 							, 
+                                                                                   const uno::Reference< rendering::XPolyPolygon2D >& 	xPolyPolygon,
+                                                                                   const rendering::ViewState& 							viewState,
+                                                                                   const rendering::RenderState& 						renderState,
+                                                                                   const rendering::StrokeAttributes& 					strokeAttributes )
     {
         ENSURE_ARG_OR_THROW( xPolyPolygon.is(),
                          "polygon is NULL");
@@ -333,7 +333,7 @@ namespace vclcanvas
                                               strokeAttributes.StrokeWidth);
             aLinePixelSize *= aMatrix;
 
-            ::basegfx::B2DPolyPolygon aPolyPoly(
+            ::basegfx::B2DPolyPolygon aPolyPoly( 
                 ::basegfx::unotools::b2DPolyPolygonFromXPolyPolygon2D(xPolyPolygon) );
 
             if( aPolyPoly.areControlPointsUsed() )
@@ -354,11 +354,11 @@ namespace vclcanvas
                 {
                     // AW: new interface; You may also get gaps in the same run now
                     basegfx::tools::applyLineDashing(aPolyPoly.getB2DPolygon(i), aDashArray, &aDashedPolyPoly);
-                    //aDashedPolyPoly.append(
+                    //aDashedPolyPoly.append( 
                     //    ::basegfx::tools::applyLineDashing( aPolyPoly.getB2DPolygon(i),
                     //                                        aDashArray ) );
                 }
-
+                
                 aPolyPoly = aDashedPolyPoly;
             }
 
@@ -375,7 +375,7 @@ namespace vclcanvas
             {
                 // render as a 'thick' line
                 setupOutDevState( viewState, renderState, FILL_COLOR );
-
+                
                 for( sal_uInt32 i=0; i<aPolyPoly.count(); ++i )
                 {
                     // TODO(F2): Use MiterLimit from StrokeAttributes,
@@ -389,7 +389,7 @@ namespace vclcanvas
                     // AW: New interface, will create bezier polygons now
                     aStrokedPolyPoly.append(basegfx::tools::createAreaGeometry(
                         aPolyPoly.getB2DPolygon(i), strokeAttributes.StrokeWidth*0.5, b2DJoineFromJoin(strokeAttributes.JoinType)));
-                    //aStrokedPolyPoly.append(
+                    //aStrokedPolyPoly.append( 
                     //    ::basegfx::tools::createAreaGeometryForPolygon( aPolyPoly.getB2DPolygon(i),
                     //                                                    strokeAttributes.StrokeWidth*0.5,
                     //                                                    b2DJoineFromJoin(strokeAttributes.JoinType) ) );
@@ -399,7 +399,7 @@ namespace vclcanvas
             // transform only _now_, all the StrokeAttributes are in
             // user coordinates.
             aStrokedPolyPoly.transform( aMatrix );
-
+            
             const PolyPolygon aVCLPolyPoly( aStrokedPolyPoly );
 
             // TODO(F2): When using alpha here, must handle that via
@@ -410,7 +410,7 @@ namespace vclcanvas
             // via OutDev::DrawPolyPolygon(), on/off fill would
             // generate off areas on those self-intersections.
             USHORT nSize( aVCLPolyPoly.Count() );
-
+            
             for( USHORT i=0; i<nSize; ++i )
             {
                 if( aStrokedPolyPoly.getB2DPolygon( i ).isClosed() ) {
@@ -439,40 +439,40 @@ namespace vclcanvas
         return uno::Reference< rendering::XCachedPrimitive >(NULL);
     }
 
-    uno::Reference< rendering::XCachedPrimitive > CanvasHelper::strokeTexturedPolyPolygon( const rendering::XCanvas*                            ,
-                                                                                           const uno::Reference< rendering::XPolyPolygon2D >&   ,
-                                                                                           const rendering::ViewState&                          ,
-                                                                                           const rendering::RenderState&                        ,
-                                                                                           const uno::Sequence< rendering::Texture >&           ,
-                                                                                           const rendering::StrokeAttributes&                    )
+    uno::Reference< rendering::XCachedPrimitive > CanvasHelper::strokeTexturedPolyPolygon( const rendering::XCanvas* 							, 
+                                                                                           const uno::Reference< rendering::XPolyPolygon2D >& 	,
+                                                                                           const rendering::ViewState& 							,
+                                                                                           const rendering::RenderState& 						,
+                                                                                           const uno::Sequence< rendering::Texture >& 			,
+                                                                                           const rendering::StrokeAttributes& 					 )
     {
         return uno::Reference< rendering::XCachedPrimitive >(NULL);
     }
 
-    uno::Reference< rendering::XCachedPrimitive > CanvasHelper::strokeTextureMappedPolyPolygon( const rendering::XCanvas*                           ,
-                                                                                                const uno::Reference< rendering::XPolyPolygon2D >&  ,
-                                                                                                const rendering::ViewState&                         ,
-                                                                                                const rendering::RenderState&                       ,
-                                                                                                const uno::Sequence< rendering::Texture >&          ,
-                                                                                                const uno::Reference< geometry::XMapping2D >&       ,
-                                                                                                const rendering::StrokeAttributes&                   )
+    uno::Reference< rendering::XCachedPrimitive > CanvasHelper::strokeTextureMappedPolyPolygon( const rendering::XCanvas* 							, 
+                                                                                                const uno::Reference< rendering::XPolyPolygon2D >& 	,
+                                                                                                const rendering::ViewState& 						,
+                                                                                                const rendering::RenderState& 						,
+                                                                                                const uno::Sequence< rendering::Texture >& 			,
+                                                                                                const uno::Reference< geometry::XMapping2D >& 		,
+                                                                                                const rendering::StrokeAttributes& 					 )
     {
         return uno::Reference< rendering::XCachedPrimitive >(NULL);
     }
 
-    uno::Reference< rendering::XPolyPolygon2D >   CanvasHelper::queryStrokeShapes( const rendering::XCanvas*                            ,
-                                                                                   const uno::Reference< rendering::XPolyPolygon2D >&   ,
-                                                                                   const rendering::ViewState&                          ,
-                                                                                   const rendering::RenderState&                        ,
-                                                                                   const rendering::StrokeAttributes&                    )
+    uno::Reference< rendering::XPolyPolygon2D >   CanvasHelper::queryStrokeShapes( const rendering::XCanvas* 							, 
+                                                                                   const uno::Reference< rendering::XPolyPolygon2D >& 	,
+                                                                                   const rendering::ViewState& 							,
+                                                                                   const rendering::RenderState& 						,
+                                                                                   const rendering::StrokeAttributes& 					 )
     {
         return uno::Reference< rendering::XPolyPolygon2D >(NULL);
     }
 
-    uno::Reference< rendering::XCachedPrimitive > CanvasHelper::fillPolyPolygon( const rendering::XCanvas*                          ,
+    uno::Reference< rendering::XCachedPrimitive > CanvasHelper::fillPolyPolygon( const rendering::XCanvas* 							, 
                                                                                  const uno::Reference< rendering::XPolyPolygon2D >& xPolyPolygon,
-                                                                                 const rendering::ViewState&                        viewState,
-                                                                                 const rendering::RenderState&                      renderState )
+                                                                                 const rendering::ViewState& 						viewState,
+                                                                                 const rendering::RenderState& 						renderState )
     {
         ENSURE_ARG_OR_THROW( xPolyPolygon.is(),
                          "polygon is NULL");
@@ -486,7 +486,7 @@ namespace vclcanvas
             ::basegfx::B2DPolyPolygon aB2DPolyPoly(
                 ::basegfx::unotools::b2DPolyPolygonFromXPolyPolygon2D(xPolyPolygon));
             aB2DPolyPoly.setClosed(true); // ensure closed poly, otherwise VCL does not fill
-            const PolyPolygon aPolyPoly( tools::mapPolyPolygon(
+            const PolyPolygon aPolyPoly( tools::mapPolyPolygon( 
                                              aB2DPolyPoly,
                                              viewState, renderState ) );
             const bool bSourceAlpha( renderState.CompositeOperation == rendering::CompositeOperation::SOURCE );
@@ -530,46 +530,46 @@ namespace vclcanvas
         return uno::Reference< rendering::XCachedPrimitive >(NULL);
     }
 
-    uno::Reference< rendering::XCachedPrimitive > CanvasHelper::fillTextureMappedPolyPolygon( const rendering::XCanvas*                             ,
-                                                                                              const uno::Reference< rendering::XPolyPolygon2D >&    ,
-                                                                                              const rendering::ViewState&                           ,
-                                                                                              const rendering::RenderState&                         ,
-                                                                                              const uno::Sequence< rendering::Texture >&            ,
-                                                                                              const uno::Reference< geometry::XMapping2D >&              )
+    uno::Reference< rendering::XCachedPrimitive > CanvasHelper::fillTextureMappedPolyPolygon( const rendering::XCanvas* 							, 
+                                                                                              const uno::Reference< rendering::XPolyPolygon2D >& 	,
+                                                                                              const rendering::ViewState& 							,
+                                                                                              const rendering::RenderState& 						,
+                                                                                              const uno::Sequence< rendering::Texture >& 			,
+                                                                                              const uno::Reference< geometry::XMapping2D >& 			 )
     {
         return uno::Reference< rendering::XCachedPrimitive >(NULL);
     }
 
-    uno::Reference< rendering::XCanvasFont > CanvasHelper::createFont( const rendering::XCanvas*                        ,
-                                                                       const rendering::FontRequest&                    fontRequest,
-                                                                       const uno::Sequence< beans::PropertyValue >&     extraFontProperties,
-                                                                       const geometry::Matrix2D&                        fontMatrix )
+    uno::Reference< rendering::XCanvasFont > CanvasHelper::createFont( const rendering::XCanvas* 						, 
+                                                                       const rendering::FontRequest& 					fontRequest,
+                                                                       const uno::Sequence< beans::PropertyValue >& 	extraFontProperties,
+                                                                       const geometry::Matrix2D& 						fontMatrix )
     {
         if( mpOutDev && mpDevice )
         {
             // TODO(F2): font properties and font matrix
             return uno::Reference< rendering::XCanvasFont >(
-                    new CanvasFont(fontRequest, extraFontProperties, fontMatrix,
+                    new CanvasFont(fontRequest, extraFontProperties, fontMatrix, 
                                    *mpDevice, mpOutDev) );
         }
 
         return uno::Reference< rendering::XCanvasFont >();
     }
 
-    uno::Sequence< rendering::FontInfo > CanvasHelper::queryAvailableFonts( const rendering::XCanvas*                       ,
-                                                                            const rendering::FontInfo&                      ,
-                                                                            const uno::Sequence< beans::PropertyValue >&     )
+    uno::Sequence< rendering::FontInfo > CanvasHelper::queryAvailableFonts( const rendering::XCanvas* 						, 
+                                                                            const rendering::FontInfo& 						,
+                                                                            const uno::Sequence< beans::PropertyValue >& 	 )
     {
         // TODO(F2)
         return uno::Sequence< rendering::FontInfo >();
     }
 
-    uno::Reference< rendering::XCachedPrimitive > CanvasHelper::drawText( const rendering::XCanvas*                         ,
-                                                                          const rendering::StringContext&                   text,
-                                                                          const uno::Reference< rendering::XCanvasFont >&   xFont,
-                                                                          const rendering::ViewState&                       viewState,
-                                                                          const rendering::RenderState&                     renderState,
-                                                                          sal_Int8                                          textDirection )
+    uno::Reference< rendering::XCachedPrimitive > CanvasHelper::drawText( const rendering::XCanvas* 						, 
+                                                                          const rendering::StringContext& 					text,
+                                                                          const uno::Reference< rendering::XCanvasFont >& 	xFont,
+                                                                          const rendering::ViewState& 						viewState,
+                                                                          const rendering::RenderState& 					renderState,
+                                                                          sal_Int8				 							textDirection )
     {
         ENSURE_ARG_OR_THROW( xFont.is(),
                          "font is NULL");
@@ -623,10 +623,10 @@ namespace vclcanvas
         return uno::Reference< rendering::XCachedPrimitive >(NULL);
     }
 
-    uno::Reference< rendering::XCachedPrimitive > CanvasHelper::drawTextLayout( const rendering::XCanvas*                       ,
+    uno::Reference< rendering::XCachedPrimitive > CanvasHelper::drawTextLayout( const rendering::XCanvas* 						, 
                                                                                 const uno::Reference< rendering::XTextLayout >& xLayoutedText,
-                                                                                const rendering::ViewState&                     viewState,
-                                                                                const rendering::RenderState&                   renderState )
+                                                                                const rendering::ViewState& 					viewState,
+                                                                                const rendering::RenderState& 					renderState )
     {
         ENSURE_ARG_OR_THROW( xLayoutedText.is(),
                          "layout is NULL");
@@ -665,11 +665,11 @@ namespace vclcanvas
         return uno::Reference< rendering::XCachedPrimitive >(NULL);
     }
 
-    uno::Reference< rendering::XCachedPrimitive > CanvasHelper::implDrawBitmap( const rendering::XCanvas*                   pCanvas,
+    uno::Reference< rendering::XCachedPrimitive > CanvasHelper::implDrawBitmap( const rendering::XCanvas* 					pCanvas, 
                                                                                 const uno::Reference< rendering::XBitmap >& xBitmap,
-                                                                                const rendering::ViewState&                 viewState,
-                                                                                const rendering::RenderState&               renderState,
-                                                                                bool                                        bModulateColors )
+                                                                                const rendering::ViewState& 				viewState,
+                                                                                const rendering::RenderState& 				renderState,
+                                                                                bool 										bModulateColors )
     {
         ENSURE_ARG_OR_THROW( xBitmap.is(),
                              "bitmap is NULL");
@@ -735,12 +735,12 @@ namespace vclcanvas
                 // color modulation is requested), decompose to check
                 // whether GraphicObject suffices
                 ::basegfx::B2DVector aScale;
-                double               nRotate;
-                double               nShearX;
+                double				 nRotate;
+                double				 nShearX;
                 aMatrix.decompose( aScale, aOutputPos, nRotate, nShearX );
-
-                GraphicAttr             aGrfAttr;
-                GraphicObjectSharedPtr  pGrfObj;
+                
+                GraphicAttr 			aGrfAttr;
+                GraphicObjectSharedPtr 	pGrfObj;
 
                 ::Size aBmpSize( aBmpEx.GetSizePixel() );
 
@@ -758,8 +758,8 @@ namespace vclcanvas
                     // transOrig*transModulate (which would be
                     // equivalent to the origAlpha*modulateAlpha the
                     // DX canvas performs)
-                    aGrfAttr.SetTransparency(
-                        static_cast< BYTE >(
+                    aGrfAttr.SetTransparency( 
+                        static_cast< BYTE >( 
                             ::basegfx::fround( 255.0*( 1.0 - nAlphaModulation ) ) ) );
                 }
 
@@ -787,8 +787,8 @@ namespace vclcanvas
                     // modify output position, to account for the fact
                     // that transformBitmap() always normalizes its output
                     // bitmap into the smallest enclosing box.
-                    ::basegfx::B2DRectangle aDestRect;
-                    ::canvas::tools::calcTransformedRectBounds( aDestRect,
+                    ::basegfx::B2DRectangle	aDestRect;            
+                    ::canvas::tools::calcTransformedRectBounds( aDestRect, 
                                                                 ::basegfx::B2DRectangle(0,
                                                                                         0,
                                                                                         aBmpSize.Width(),
@@ -801,7 +801,7 @@ namespace vclcanvas
                     // complex transformation, use generic affine bitmap
                     // transformation
                     aBmpEx = tools::transformBitmap( aBmpEx,
-                                                     aMatrix,
+                                                     aMatrix, 
                                                      renderState.DeviceColor,
                                                      tools::MODULATE_NONE );
 
@@ -830,7 +830,7 @@ namespace vclcanvas
                                    aPt,
                                    aSz,
                                    &aGrfAttr );
-
+                
                 // created GraphicObject, which possibly cached
                 // display bitmap - return cache object, to retain
                 // that information.
@@ -853,24 +853,24 @@ namespace vclcanvas
         return uno::Reference< rendering::XCachedPrimitive >(NULL);
     }
 
-    uno::Reference< rendering::XCachedPrimitive > CanvasHelper::drawBitmap( const rendering::XCanvas*                   pCanvas,
+    uno::Reference< rendering::XCachedPrimitive > CanvasHelper::drawBitmap( const rendering::XCanvas* 					pCanvas, 
                                                                             const uno::Reference< rendering::XBitmap >& xBitmap,
-                                                                            const rendering::ViewState&                 viewState,
-                                                                            const rendering::RenderState&               renderState )
+                                                                            const rendering::ViewState& 				viewState,
+                                                                            const rendering::RenderState& 				renderState )
     {
-        return implDrawBitmap( pCanvas,
+        return implDrawBitmap( pCanvas, 
                                xBitmap,
                                viewState,
                                renderState,
                                false );
     }
 
-    uno::Reference< rendering::XCachedPrimitive > CanvasHelper::drawBitmapModulated( const rendering::XCanvas*                      pCanvas,
-                                                                                     const uno::Reference< rendering::XBitmap >&    xBitmap,
-                                                                                     const rendering::ViewState&                    viewState,
-                                                                                     const rendering::RenderState&                  renderState )
+    uno::Reference< rendering::XCachedPrimitive > CanvasHelper::drawBitmapModulated( const rendering::XCanvas* 						pCanvas, 
+                                                                                     const uno::Reference< rendering::XBitmap >& 	xBitmap,
+                                                                                     const rendering::ViewState& 					viewState,
+                                                                                     const rendering::RenderState& 					renderState )
     {
-        return implDrawBitmap( pCanvas,
+        return implDrawBitmap( pCanvas, 
                                xBitmap,
                                viewState,
                                renderState,
@@ -884,18 +884,18 @@ namespace vclcanvas
         return uno::Reference< rendering::XGraphicDevice >(mpDevice);
     }
 
-    void CanvasHelper::copyRect( const rendering::XCanvas*                          ,
-                                 const uno::Reference< rendering::XBitmapCanvas >&  ,
-                                 const geometry::RealRectangle2D&                   ,
-                                 const rendering::ViewState&                        ,
-                                 const rendering::RenderState&                      ,
-                                 const geometry::RealRectangle2D&                   ,
-                                 const rendering::ViewState&                        ,
-                                 const rendering::RenderState&                       )
+    void CanvasHelper::copyRect( const rendering::XCanvas* 							, 
+                                 const uno::Reference< rendering::XBitmapCanvas >& 	, 
+                                 const geometry::RealRectangle2D& 					, 
+                                 const rendering::ViewState& 						, 
+                                 const rendering::RenderState& 						, 
+                                 const geometry::RealRectangle2D& 					, 
+                                 const rendering::ViewState& 						, 
+                                 const rendering::RenderState& 						 )
     {
         // TODO(F1)
     }
-
+            
     geometry::IntegerSize2D CanvasHelper::getSize()
     {
         if( !mpOutDev.get() )
@@ -904,8 +904,8 @@ namespace vclcanvas
         return ::vcl::unotools::integerSize2DFromSize( mpOutDev->getOutDev().GetOutputSizePixel() );
     }
 
-    uno::Reference< rendering::XBitmap > CanvasHelper::getScaledBitmap( const geometry::RealSize2D& newSize,
-                                                                        sal_Bool                    beFast )
+    uno::Reference< rendering::XBitmap > CanvasHelper::getScaledBitmap( const geometry::RealSize2D& newSize, 
+                                                                        sal_Bool 					beFast )
     {
         if( !mpOutDev.get() || !mpDevice )
             return uno::Reference< rendering::XBitmap >(); // we're disposed
@@ -921,14 +921,14 @@ namespace vclcanvas
 
         Bitmap aBitmap( rOutDev.GetBitmap(aEmptyPoint, aBmpSize) );
 
-        aBitmap.Scale( ::vcl::unotools::sizeFromRealSize2D(newSize),
+        aBitmap.Scale( ::vcl::unotools::sizeFromRealSize2D(newSize), 
                        beFast ? BMP_SCALE_FAST : BMP_SCALE_INTERPOLATE );
 
-        return uno::Reference< rendering::XBitmap >(
+        return uno::Reference< rendering::XBitmap >( 
             new CanvasBitmap( aBitmap, *mpDevice, mpOutDev ) );
     }
 
-    uno::Sequence< sal_Int8 > CanvasHelper::getData( rendering::IntegerBitmapLayout&     rLayout,
+    uno::Sequence< sal_Int8 > CanvasHelper::getData( rendering::IntegerBitmapLayout& 	 rLayout,
                                                      const geometry::IntegerRectangle2D& rect )
     {
         if( !mpOutDev.get() )
@@ -937,14 +937,14 @@ namespace vclcanvas
         rLayout = getMemoryLayout();
 
         // TODO(F2): Support alpha canvas here
-        const Rectangle aRect( ::vcl::unotools::rectangleFromIntegerRectangle2D(rect) );
+        const Rectangle	aRect( ::vcl::unotools::rectangleFromIntegerRectangle2D(rect) );
 
         OutputDevice& rOutDev( mpOutDev->getOutDev() );
 
         tools::OutDevStateKeeper aStateKeeper( mpProtectedOutDev );
         rOutDev.EnableMapMode( FALSE );
 
-        Bitmap aBitmap( rOutDev.GetBitmap(aRect.TopLeft(),
+        Bitmap aBitmap( rOutDev.GetBitmap(aRect.TopLeft(), 
                                           aRect.GetSize()) );
 
         ScopedBitmapReadAccess pReadAccess( aBitmap.AcquireReadAccess(),
@@ -958,7 +958,7 @@ namespace vclcanvas
 
         rLayout.ScanLines = nHeight;
         rLayout.ScanLineBytes = nWidth*4;
-        rLayout.ScanLineStride = rLayout.ScanLineBytes;
+        rLayout.ScanLineStride = rLayout.ScanLineBytes;        
 
         uno::Sequence< sal_Int8 > aRes( 4*nWidth*nHeight );
         sal_Int8* pRes = aRes.getArray();
@@ -978,9 +978,9 @@ namespace vclcanvas
         return aRes;
     }
 
-    void CanvasHelper::setData( const uno::Sequence< sal_Int8 >&        data,
-                                const rendering::IntegerBitmapLayout&   aLayout,
-                                const geometry::IntegerRectangle2D&     rect )
+    void CanvasHelper::setData( const uno::Sequence< sal_Int8 >& 		data, 
+                                const rendering::IntegerBitmapLayout& 	aLayout, 
+                                const geometry::IntegerRectangle2D&		rect )
     {
         if( !mpOutDev.get() )
             return; // we're disposed
@@ -998,7 +998,7 @@ namespace vclcanvas
         rOutDev.EnableMapMode( FALSE );
 
         const Rectangle aRect( ::vcl::unotools::rectangleFromIntegerRectangle2D(rect) );
-        const USHORT    nBitCount( ::std::min( (USHORT)24U,
+        const USHORT 	nBitCount( ::std::min( (USHORT)24U, 
                                                (USHORT)rOutDev.GetBitCount() ) );
         const BitmapPalette* pPalette = NULL;
 
@@ -1012,7 +1012,7 @@ namespace vclcanvas
             const Size  aSize(1,1);
             Bitmap aTmpBitmap( rOutDev.GetBitmap( aEmptyPoint,
                                                   aSize ) );
-
+            
             ScopedBitmapReadAccess pReadAccess( aTmpBitmap.AcquireReadAccess(),
                                                 aTmpBitmap );
 
@@ -1027,11 +1027,11 @@ namespace vclcanvas
         {
             ScopedBitmapWriteAccess pWriteAccess( aBitmap.AcquireWriteAccess(),
                                                   aBitmap );
-
+            
             ENSURE_OR_THROW( pWriteAccess.get() != NULL,
                              "Could not acquire write access to OutDev bitmap" );
 
-            // for the time being, always read as RGB
+            // for the time being, always read as RGB 
             const sal_Int32 nWidth( rect.X2 - rect.X1 );
             const sal_Int32 nHeight( rect.Y2 - rect.Y1 );
             int x, y, nCurrPos(0);
@@ -1111,9 +1111,9 @@ namespace vclcanvas
         }
     }
 
-    void CanvasHelper::setPixel( const uno::Sequence< sal_Int8 >&       color,
-                                 const rendering::IntegerBitmapLayout&  rLayout,
-                                 const geometry::IntegerPoint2D&        pos )
+    void CanvasHelper::setPixel( const uno::Sequence< sal_Int8 >& 		color, 
+                                 const rendering::IntegerBitmapLayout&	rLayout, 
+                                 const geometry::IntegerPoint2D& 		pos )
     {
         if( !mpOutDev.get() )
             return; // we're disposed
@@ -1125,11 +1125,11 @@ namespace vclcanvas
 
         const Size aBmpSize( rOutDev.GetOutputSizePixel() );
 
-        ENSURE_ARG_OR_THROW( pos.X >= 0 && pos.X < aBmpSize.Width(),
+        ENSURE_ARG_OR_THROW( pos.X >= 0 && pos.X < aBmpSize.Width(), 
                              "X coordinate out of bounds" );
-        ENSURE_ARG_OR_THROW( pos.Y >= 0 && pos.Y < aBmpSize.Height(),
+        ENSURE_ARG_OR_THROW( pos.Y >= 0 && pos.Y < aBmpSize.Height(), 
                              "Y coordinate out of bounds" );
-        ENSURE_ARG_OR_THROW( color.getLength() > 3,
+        ENSURE_ARG_OR_THROW( color.getLength() > 3, 
                              "not enough color components" );
 
         const rendering::IntegerBitmapLayout aRefLayout( getMemoryLayout() );
@@ -1140,11 +1140,11 @@ namespace vclcanvas
                              "Mismatching memory layout" );
 
         // TODO(F2): Support alpha canvas here
-        rOutDev.DrawPixel( ::vcl::unotools::pointFromIntegerPoint2D( pos ),
+        rOutDev.DrawPixel( ::vcl::unotools::pointFromIntegerPoint2D( pos ), 
                            ::canvas::tools::stdIntSequenceToColor( color ));
     }
 
-    uno::Sequence< sal_Int8 > CanvasHelper::getPixel( rendering::IntegerBitmapLayout& rLayout,
+    uno::Sequence< sal_Int8 > CanvasHelper::getPixel( rendering::IntegerBitmapLayout& rLayout, 
                                                       const geometry::IntegerPoint2D& pos )
     {
         if( !mpOutDev.get() )
@@ -1153,7 +1153,7 @@ namespace vclcanvas
         rLayout = getMemoryLayout();
         rLayout.ScanLines = 1;
         rLayout.ScanLineBytes = 4;
-        rLayout.ScanLineStride = rLayout.ScanLineBytes;
+        rLayout.ScanLineStride = rLayout.ScanLineBytes;        
 
         OutputDevice& rOutDev( mpOutDev->getOutDev() );
 
@@ -1162,15 +1162,15 @@ namespace vclcanvas
 
         const Size aBmpSize( rOutDev.GetOutputSizePixel() );
 
-        ENSURE_ARG_OR_THROW( pos.X >= 0 && pos.X < aBmpSize.Width(),
+        ENSURE_ARG_OR_THROW( pos.X >= 0 && pos.X < aBmpSize.Width(), 
                              "X coordinate out of bounds" );
-        ENSURE_ARG_OR_THROW( pos.Y >= 0 && pos.Y < aBmpSize.Height(),
+        ENSURE_ARG_OR_THROW( pos.Y >= 0 && pos.Y < aBmpSize.Height(), 
                              "Y coordinate out of bounds" );
 
         // TODO(F2): Support alpha canvas here
         return ::canvas::tools::colorToStdIntSequence(
-            rOutDev.GetPixel(
-                ::vcl::unotools::pointFromIntegerPoint2D( pos )));
+            rOutDev.GetPixel( 
+                ::vcl::unotools::pointFromIntegerPoint2D( pos ))); 
     }
 
     rendering::IntegerBitmapLayout CanvasHelper::getMemoryLayout()
@@ -1181,11 +1181,11 @@ namespace vclcanvas
         return ::canvas::tools::getStdMemoryLayout(getSize());
     }
 
-    int CanvasHelper::setupOutDevState( const rendering::ViewState&     viewState,
-                                        const rendering::RenderState&   renderState,
-                                        ColorType                       eColorType ) const
+    int CanvasHelper::setupOutDevState( const rendering::ViewState& 	viewState,
+                                        const rendering::RenderState& 	renderState,
+                                        ColorType						eColorType ) const
     {
-        ENSURE_OR_THROW( mpOutDev.get(),
+        ENSURE_OR_THROW( mpOutDev.get(), 
                          "outdev null. Are we disposed?" );
 
         ::canvas::tools::verifyInput( renderState,
@@ -1214,7 +1214,7 @@ namespace vclcanvas
 
         if( viewState.Clip.is() )
         {
-            ::basegfx::B2DPolyPolygon aClipPoly(
+            ::basegfx::B2DPolyPolygon aClipPoly( 
                 ::basegfx::unotools::b2DPolyPolygonFromXPolyPolygon2D(viewState.Clip) );
 
             if( aClipPoly.count() )
@@ -1222,9 +1222,9 @@ namespace vclcanvas
                 // setup non-empty clipping
                 ::basegfx::B2DHomMatrix aMatrix;
                 aClipPoly.transform(
-                    ::basegfx::unotools::homMatrixFromAffineMatrix( aMatrix,
+                    ::basegfx::unotools::homMatrixFromAffineMatrix( aMatrix, 
                                                                     viewState.AffineTransform ) );
-
+                
                 aClipRegion = Region::GetRegionFromPolyPolygon( ::PolyPolygon( aClipPoly ) );
             }
             else
@@ -1236,12 +1236,12 @@ namespace vclcanvas
 
         if( renderState.Clip.is() )
         {
-            ::basegfx::B2DPolyPolygon aClipPoly(
+            ::basegfx::B2DPolyPolygon aClipPoly( 
                 ::basegfx::unotools::b2DPolyPolygonFromXPolyPolygon2D(renderState.Clip) );
 
             ::basegfx::B2DHomMatrix aMatrix;
             aClipPoly.transform(
-                ::canvas::tools::mergeViewAndRenderTransform( aMatrix,
+                ::canvas::tools::mergeViewAndRenderTransform( aMatrix, 
                                                               viewState,
                                                               renderState ) );
 
@@ -1267,14 +1267,14 @@ namespace vclcanvas
         if( aClipRegion.IsNull() )
         {
             rOutDev.SetClipRegion();
-
+                
             if( p2ndOutDev )
                 p2ndOutDev->SetClipRegion();
         }
         else
         {
             rOutDev.SetClipRegion( aClipRegion );
-
+                
             if( p2ndOutDev )
                 p2ndOutDev->SetClipRegion( aClipRegion );
         }
@@ -1326,7 +1326,7 @@ namespace vclcanvas
                     break;
 
                 default:
-                    ENSURE_OR_THROW( false,
+                    ENSURE_OR_THROW( false, 
                                      "Unexpected color type");
                     break;
             }
@@ -1335,12 +1335,12 @@ namespace vclcanvas
         return nTransparency;
     }
 
-    bool CanvasHelper::setupTextOutput( ::Point&                                        o_rOutPos,
-                                        const rendering::ViewState&                     viewState,
-                                        const rendering::RenderState&                   renderState,
-                                        const uno::Reference< rendering::XCanvasFont >& xFont   ) const
+    bool CanvasHelper::setupTextOutput( ::Point&										o_rOutPos,
+                                        const rendering::ViewState& 					viewState,
+                                        const rendering::RenderState& 					renderState,
+                                        const uno::Reference< rendering::XCanvasFont >&	xFont	) const
     {
-        ENSURE_OR_THROW( mpOutDev.get(),
+        ENSURE_OR_THROW( mpOutDev.get(), 
                          "outdev null. Are we disposed?" );
 
         setupOutDevState( viewState, renderState, TEXT_COLOR );
@@ -1350,7 +1350,7 @@ namespace vclcanvas
         ::Font aVCLFont;
 
         CanvasFont* pFont = dynamic_cast< CanvasFont* >( xFont.get() );
-
+        
         ENSURE_ARG_OR_THROW( pFont,
                              "Font not compatible with this canvas" );
 
@@ -1380,12 +1380,12 @@ namespace vclcanvas
         return true;
     }
 
-    bool CanvasHelper::repaint( const GraphicObjectSharedPtr&   rGrf,
+    bool CanvasHelper::repaint( const GraphicObjectSharedPtr&	rGrf,
                                 const rendering::ViewState&     viewState,
                                 const rendering::RenderState&   renderState,
-                                const ::Point&                  rPt,
-                                const ::Size&                   rSz,
-                                const GraphicAttr&              rAttr ) const
+                                const ::Point& 					rPt, 
+                                const ::Size& 					rSz,
+                                const GraphicAttr&				rAttr ) const
     {
         ENSURE_OR_RETURN_FALSE( rGrf,
                           "Invalid Graphic" );
@@ -1407,7 +1407,7 @@ namespace vclcanvas
             return true;
         }
     }
-
+    
     void CanvasHelper::flush() const
     {
         if( mpOutDev && mpOutDev->getOutDev().GetOutDevType() == OUTDEV_WINDOW )
diff --git a/canvas/source/vcl/canvashelper.hxx b/canvas/source/vcl/canvashelper.hxx
index ef5eafa0c9ef..834619503aad 100644
--- a/canvas/source/vcl/canvashelper.hxx
+++ b/canvas/source/vcl/canvashelper.hxx
@@ -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
@@ -84,7 +84,7 @@ namespace vclcanvas
             When true, hasAlpha() will always return true, otherwise, false.
          */
         void init( ::com::sun::star::rendering::XGraphicDevice& rDevice,
-                   const OutDevProviderSharedPtr&               rOutDev,
+                   const OutDevProviderSharedPtr&               rOutDev, 
                    bool                                         bProtect,
                    bool                                         bHaveAlpha );
 
@@ -93,8 +93,8 @@ namespace vclcanvas
             This changes the primary output device, where rendering is
             sent to.
          */
-        void setOutDev( const OutDevProviderSharedPtr&  rOutDev,
-                        bool                            bProtect);
+        void setOutDev( const OutDevProviderSharedPtr&	rOutDev,
+                        bool							bProtect);
 
         /** Set secondary output device
 
@@ -109,164 +109,164 @@ namespace vclcanvas
         // XCanvas (only providing, not implementing the
         // interface. Also note subtle method parameter differences)
         void clear();
-        void drawPoint( const ::com::sun::star::rendering::XCanvas*         rCanvas,
-                        const ::com::sun::star::geometry::RealPoint2D&      aPoint,
-                        const ::com::sun::star::rendering::ViewState&       viewState,
-                        const ::com::sun::star::rendering::RenderState&     renderState );
-        void drawLine( const ::com::sun::star::rendering::XCanvas*      rCanvas,
-                       const ::com::sun::star::geometry::RealPoint2D&   aStartPoint,
-                       const ::com::sun::star::geometry::RealPoint2D&   aEndPoint,
-                       const ::com::sun::star::rendering::ViewState&    viewState,
-                       const ::com::sun::star::rendering::RenderState&  renderState );
-        void drawBezier( const ::com::sun::star::rendering::XCanvas*            rCanvas,
-                         const ::com::sun::star::geometry::RealBezierSegment2D& aBezierSegment,
-                         const ::com::sun::star::geometry::RealPoint2D&         aEndPoint,
-                         const ::com::sun::star::rendering::ViewState&          viewState,
-                         const ::com::sun::star::rendering::RenderState&        renderState );
-        ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XCachedPrimitive >
-            drawPolyPolygon( const ::com::sun::star::rendering::XCanvas*        rCanvas,
-                             const ::com::sun::star::uno::Reference<
-                                 ::com::sun::star::rendering::XPolyPolygon2D >&     xPolyPolygon,
-                             const ::com::sun::star::rendering::ViewState&      viewState,
-                             const ::com::sun::star::rendering::RenderState&    renderState );
-        ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XCachedPrimitive >
-            strokePolyPolygon( const ::com::sun::star::rendering::XCanvas*          rCanvas,
-                               const ::com::sun::star::uno::Reference<
-                                       ::com::sun::star::rendering::XPolyPolygon2D >&   xPolyPolygon,
-                               const ::com::sun::star::rendering::ViewState&        viewState,
-                               const ::com::sun::star::rendering::RenderState&      renderState,
+        void drawPoint( const ::com::sun::star::rendering::XCanvas* 		rCanvas, 
+                        const ::com::sun::star::geometry::RealPoint2D& 		aPoint, 
+                        const ::com::sun::star::rendering::ViewState& 		viewState, 
+                        const ::com::sun::star::rendering::RenderState& 	renderState );
+        void drawLine( const ::com::sun::star::rendering::XCanvas* 		rCanvas, 
+                       const ::com::sun::star::geometry::RealPoint2D& 	aStartPoint, 
+                       const ::com::sun::star::geometry::RealPoint2D& 	aEndPoint, 
+                       const ::com::sun::star::rendering::ViewState& 	viewState, 
+                       const ::com::sun::star::rendering::RenderState& 	renderState	);
+        void drawBezier( const ::com::sun::star::rendering::XCanvas* 			rCanvas, 
+                         const ::com::sun::star::geometry::RealBezierSegment2D&	aBezierSegment, 
+                         const ::com::sun::star::geometry::RealPoint2D& 		aEndPoint,
+                         const ::com::sun::star::rendering::ViewState& 			viewState, 
+                         const ::com::sun::star::rendering::RenderState& 		renderState );
+        ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XCachedPrimitive > 	
+            drawPolyPolygon( const ::com::sun::star::rendering::XCanvas* 		rCanvas, 
+                             const ::com::sun::star::uno::Reference< 
+                                 ::com::sun::star::rendering::XPolyPolygon2D >& 	xPolyPolygon, 
+                             const ::com::sun::star::rendering::ViewState& 		viewState, 
+                             const ::com::sun::star::rendering::RenderState& 	renderState );
+        ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XCachedPrimitive > 	
+            strokePolyPolygon( const ::com::sun::star::rendering::XCanvas* 			rCanvas, 
+                               const ::com::sun::star::uno::Reference< 
+                                       ::com::sun::star::rendering::XPolyPolygon2D >& 	xPolyPolygon, 
+                               const ::com::sun::star::rendering::ViewState& 		viewState, 
+                               const ::com::sun::star::rendering::RenderState& 		renderState, 
                                const ::com::sun::star::rendering::StrokeAttributes& strokeAttributes );
-        ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XCachedPrimitive >
-            strokeTexturedPolyPolygon( const ::com::sun::star::rendering::XCanvas*          rCanvas,
-                                       const ::com::sun::star::uno::Reference<
-                                               ::com::sun::star::rendering::XPolyPolygon2D >&   xPolyPolygon,
-                                       const ::com::sun::star::rendering::ViewState&        viewState,
-                                       const ::com::sun::star::rendering::RenderState&      renderState,
-                                       const ::com::sun::star::uno::Sequence<
-                                               ::com::sun::star::rendering::Texture >&      textures,
+        ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XCachedPrimitive > 	
+            strokeTexturedPolyPolygon( const ::com::sun::star::rendering::XCanvas* 			rCanvas, 
+                                       const ::com::sun::star::uno::Reference< 
+                                               ::com::sun::star::rendering::XPolyPolygon2D >& 	xPolyPolygon, 
+                                       const ::com::sun::star::rendering::ViewState& 		viewState, 
+                                       const ::com::sun::star::rendering::RenderState& 		renderState, 
+                                       const ::com::sun::star::uno::Sequence< 
+                                               ::com::sun::star::rendering::Texture >& 		textures, 
                                        const ::com::sun::star::rendering::StrokeAttributes& strokeAttributes );
-        ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XCachedPrimitive >
-            strokeTextureMappedPolyPolygon( const ::com::sun::star::rendering::XCanvas*             rCanvas,
-                                            const ::com::sun::star::uno::Reference<
-                                                    ::com::sun::star::rendering::XPolyPolygon2D >&  xPolyPolygon,
-                                            const ::com::sun::star::rendering::ViewState&           viewState,
-                                            const ::com::sun::star::rendering::RenderState&         renderState,
-                                            const ::com::sun::star::uno::Sequence<
-                                                    ::com::sun::star::rendering::Texture >&         textures,
-                                            const ::com::sun::star::uno::Reference<
-                                                    ::com::sun::star::geometry::XMapping2D >&       xMapping,
-                                            const ::com::sun::star::rendering::StrokeAttributes&    strokeAttributes );
-        ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XPolyPolygon2D >
-            queryStrokeShapes( const ::com::sun::star::rendering::XCanvas*          rCanvas,
-                               const ::com::sun::star::uno::Reference<
-                                       ::com::sun::star::rendering::XPolyPolygon2D >&   xPolyPolygon,
-                               const ::com::sun::star::rendering::ViewState&        viewState,
-                               const ::com::sun::star::rendering::RenderState&      renderState,
+        ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XCachedPrimitive > 	
+            strokeTextureMappedPolyPolygon( const ::com::sun::star::rendering::XCanvas* 			rCanvas, 
+                                            const ::com::sun::star::uno::Reference< 
+                                                    ::com::sun::star::rendering::XPolyPolygon2D >& 	xPolyPolygon, 
+                                            const ::com::sun::star::rendering::ViewState& 			viewState, 
+                                            const ::com::sun::star::rendering::RenderState& 		renderState, 
+                                            const ::com::sun::star::uno::Sequence< 
+                                                    ::com::sun::star::rendering::Texture >& 		textures, 
+                                            const ::com::sun::star::uno::Reference< 
+                                                    ::com::sun::star::geometry::XMapping2D >& 		xMapping, 
+                                            const ::com::sun::star::rendering::StrokeAttributes& 	strokeAttributes );
+        ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XPolyPolygon2D >   	
+            queryStrokeShapes( const ::com::sun::star::rendering::XCanvas* 			rCanvas, 
+                               const ::com::sun::star::uno::Reference< 
+                                       ::com::sun::star::rendering::XPolyPolygon2D >& 	xPolyPolygon, 
+                               const ::com::sun::star::rendering::ViewState& 		viewState, 
+                               const ::com::sun::star::rendering::RenderState& 		renderState, 
                                const ::com::sun::star::rendering::StrokeAttributes& strokeAttributes );
-        ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XCachedPrimitive >
-            fillPolyPolygon( const ::com::sun::star::rendering::XCanvas*            rCanvas,
-                             const ::com::sun::star::uno::Reference<
-                                     ::com::sun::star::rendering::XPolyPolygon2D >&     xPolyPolygon,
-                             const ::com::sun::star::rendering::ViewState&          viewState,
-                             const ::com::sun::star::rendering::RenderState&        renderState );
-        ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XCachedPrimitive >
-            fillTexturedPolyPolygon( const ::com::sun::star::rendering::XCanvas*            rCanvas,
-                                     const ::com::sun::star::uno::Reference<
-                                             ::com::sun::star::rendering::XPolyPolygon2D >& xPolyPolygon,
-                                     const ::com::sun::star::rendering::ViewState&          viewState,
-                                     const ::com::sun::star::rendering::RenderState&        renderState,
-                                     const ::com::sun::star::uno::Sequence<
-                                             ::com::sun::star::rendering::Texture >&        textures );
-        ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XCachedPrimitive >
-            fillTextureMappedPolyPolygon( const ::com::sun::star::rendering::XCanvas*           rCanvas,
-                                          const ::com::sun::star::uno::Reference<
-                                                  ::com::sun::star::rendering::XPolyPolygon2D >&    xPolyPolygon,
-                                          const ::com::sun::star::rendering::ViewState&         viewState,
-                                          const ::com::sun::star::rendering::RenderState&       renderState,
-                                          const ::com::sun::star::uno::Sequence<
-                                                  ::com::sun::star::rendering::Texture >&       textures,
-                                          const ::com::sun::star::uno::Reference<
-                                                  ::com::sun::star::geometry::XMapping2D >&         xMapping );
-
-        ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XCanvasFont >
-            createFont( const ::com::sun::star::rendering::XCanvas*         rCanvas,
-                        const ::com::sun::star::rendering::FontRequest&     fontRequest,
-                        const ::com::sun::star::uno::Sequence<
-                            ::com::sun::star::beans::PropertyValue >&       extraFontProperties,
-                        const ::com::sun::star::geometry::Matrix2D&         fontMatrix );
-
-        ::com::sun::star::uno::Sequence< ::com::sun::star::rendering::FontInfo >
-            queryAvailableFonts( const ::com::sun::star::rendering::XCanvas*        rCanvas,
-                                 const ::com::sun::star::rendering::FontInfo&       aFilter,
-                                 const ::com::sun::star::uno::Sequence<
-                                         ::com::sun::star::beans::PropertyValue >&  aFontProperties );
-
-        ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XCachedPrimitive >
-            drawText( const ::com::sun::star::rendering::XCanvas*       rCanvas,
-                      const ::com::sun::star::rendering::StringContext& text,
-                      const ::com::sun::star::uno::Reference<
-                              ::com::sun::star::rendering::XCanvasFont >& xFont,
-                      const ::com::sun::star::rendering::ViewState&     viewState,
-                      const ::com::sun::star::rendering::RenderState&   renderState,
-                      sal_Int8                                          textDirection );
-
-        ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XCachedPrimitive >
-            drawTextLayout( const ::com::sun::star::rendering::XCanvas*         rCanvas,
-                            const ::com::sun::star::uno::Reference<
-                                    ::com::sun::star::rendering::XTextLayout >& layoutetText,
-                            const ::com::sun::star::rendering::ViewState&       viewState,
-                            const ::com::sun::star::rendering::RenderState&     renderState );
-
-        ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XCachedPrimitive >
-            drawBitmap( const ::com::sun::star::rendering::XCanvas*     rCanvas,
-                        const ::com::sun::star::uno::Reference<
-                                ::com::sun::star::rendering::XBitmap >& xBitmap,
-                        const ::com::sun::star::rendering::ViewState&   viewState,
+        ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XCachedPrimitive > 	
+            fillPolyPolygon( const ::com::sun::star::rendering::XCanvas* 			rCanvas, 
+                             const ::com::sun::star::uno::Reference< 
+                                     ::com::sun::star::rendering::XPolyPolygon2D >& 	xPolyPolygon, 
+                             const ::com::sun::star::rendering::ViewState& 			viewState, 
+                             const ::com::sun::star::rendering::RenderState& 		renderState );
+        ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XCachedPrimitive > 	
+            fillTexturedPolyPolygon( const ::com::sun::star::rendering::XCanvas* 			rCanvas, 
+                                     const ::com::sun::star::uno::Reference< 
+                                             ::com::sun::star::rendering::XPolyPolygon2D >&	xPolyPolygon, 
+                                     const ::com::sun::star::rendering::ViewState& 			viewState, 
+                                     const ::com::sun::star::rendering::RenderState& 		renderState, 
+                                     const ::com::sun::star::uno::Sequence< 
+                                             ::com::sun::star::rendering::Texture >& 		textures );
+        ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XCachedPrimitive > 	
+            fillTextureMappedPolyPolygon( const ::com::sun::star::rendering::XCanvas* 			rCanvas, 
+                                          const ::com::sun::star::uno::Reference< 
+                                                  ::com::sun::star::rendering::XPolyPolygon2D >& 	xPolyPolygon, 
+                                          const ::com::sun::star::rendering::ViewState& 		viewState, 
+                                          const ::com::sun::star::rendering::RenderState& 		renderState, 
+                                          const ::com::sun::star::uno::Sequence< 
+                                                  ::com::sun::star::rendering::Texture >& 		textures, 
+                                          const ::com::sun::star::uno::Reference< 
+                                                  ::com::sun::star::geometry::XMapping2D >& 		xMapping );
+
+        ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XCanvasFont > 
+            createFont( const ::com::sun::star::rendering::XCanvas* 		rCanvas,
+                        const ::com::sun::star::rendering::FontRequest& 	fontRequest, 
+                        const ::com::sun::star::uno::Sequence< 
+                            ::com::sun::star::beans::PropertyValue >& 		extraFontProperties, 
+                        const ::com::sun::star::geometry::Matrix2D& 		fontMatrix );
+
+        ::com::sun::star::uno::Sequence< ::com::sun::star::rendering::FontInfo > 
+            queryAvailableFonts( const ::com::sun::star::rendering::XCanvas* 		rCanvas,
+                                 const ::com::sun::star::rendering::FontInfo& 		aFilter, 
+                                 const ::com::sun::star::uno::Sequence< 
+                                         ::com::sun::star::beans::PropertyValue >& 	aFontProperties );
+
+        ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XCachedPrimitive > 
+            drawText( const ::com::sun::star::rendering::XCanvas* 		rCanvas,
+                      const ::com::sun::star::rendering::StringContext& text, 
+                      const ::com::sun::star::uno::Reference< 
+                              ::com::sun::star::rendering::XCanvasFont >& xFont, 
+                      const ::com::sun::star::rendering::ViewState& 	viewState, 
+                      const ::com::sun::star::rendering::RenderState& 	renderState, 
+                      sal_Int8 											textDirection );
+
+        ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XCachedPrimitive > 
+            drawTextLayout( const ::com::sun::star::rendering::XCanvas* 		rCanvas,
+                            const ::com::sun::star::uno::Reference< 
+                                    ::com::sun::star::rendering::XTextLayout >& layoutetText, 
+                            const ::com::sun::star::rendering::ViewState& 		viewState, 
+                            const ::com::sun::star::rendering::RenderState& 	renderState );
+
+        ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XCachedPrimitive > 	
+            drawBitmap( const ::com::sun::star::rendering::XCanvas* 	rCanvas,
+                        const ::com::sun::star::uno::Reference< 
+                                ::com::sun::star::rendering::XBitmap >& xBitmap, 
+                        const ::com::sun::star::rendering::ViewState& 	viewState, 
                         const ::com::sun::star::rendering::RenderState& renderState );
-        ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XCachedPrimitive >
-            drawBitmapModulated( const ::com::sun::star::rendering::XCanvas*        rCanvas,
-                                 const ::com::sun::star::uno::Reference<
-                                         ::com::sun::star::rendering::XBitmap >&        xBitmap,
-                                 const ::com::sun::star::rendering::ViewState&      viewState,
-                                 const ::com::sun::star::rendering::RenderState&    renderState );
-        ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XGraphicDevice >
+        ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XCachedPrimitive > 	
+            drawBitmapModulated( const ::com::sun::star::rendering::XCanvas* 		rCanvas,
+                                 const ::com::sun::star::uno::Reference< 
+                                         ::com::sun::star::rendering::XBitmap >&		xBitmap, 
+                                 const ::com::sun::star::rendering::ViewState& 		viewState, 
+                                 const ::com::sun::star::rendering::RenderState&	renderState );
+        ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XGraphicDevice > 
             getDevice();
 
         // BitmapCanvasHelper functionality
         // ================================
 
-        void copyRect( const ::com::sun::star::rendering::XCanvas*          rCanvas,
-                       const ::com::sun::star::uno::Reference<
-                               ::com::sun::star::rendering::XBitmapCanvas >&    sourceCanvas,
-                       const ::com::sun::star::geometry::RealRectangle2D&   sourceRect,
-                       const ::com::sun::star::rendering::ViewState&        sourceViewState,
-                       const ::com::sun::star::rendering::RenderState&      sourceRenderState,
-                       const ::com::sun::star::geometry::RealRectangle2D&   destRect,
-                       const ::com::sun::star::rendering::ViewState&        destViewState,
-                       const ::com::sun::star::rendering::RenderState&      destRenderState );
-
+        void copyRect( const ::com::sun::star::rendering::XCanvas* 			rCanvas,
+                       const ::com::sun::star::uno::Reference< 
+                               ::com::sun::star::rendering::XBitmapCanvas >& 	sourceCanvas, 
+                       const ::com::sun::star::geometry::RealRectangle2D& 	sourceRect, 
+                       const ::com::sun::star::rendering::ViewState& 		sourceViewState, 
+                       const ::com::sun::star::rendering::RenderState& 		sourceRenderState, 
+                       const ::com::sun::star::geometry::RealRectangle2D& 	destRect, 
+                       const ::com::sun::star::rendering::ViewState& 		destViewState, 
+                       const ::com::sun::star::rendering::RenderState& 		destRenderState );
+            
         ::com::sun::star::geometry::IntegerSize2D getSize();
 
         ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XBitmapCanvas > queryBitmapCanvas();
 
-        ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XBitmap >
-            getScaledBitmap( const ::com::sun::star::geometry::RealSize2D&  newSize,
-                             sal_Bool                                               beFast );
+        ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XBitmap > 
+            getScaledBitmap( const ::com::sun::star::geometry::RealSize2D& 	newSize, 
+                             sal_Bool 												beFast );
 
-        ::com::sun::star::uno::Sequence< sal_Int8 >
-            getData( ::com::sun::star::rendering::IntegerBitmapLayout&      bitmapLayout,
-                     const ::com::sun::star::geometry::IntegerRectangle2D&  rect );
+        ::com::sun::star::uno::Sequence< sal_Int8 > 
+            getData( ::com::sun::star::rendering::IntegerBitmapLayout& 		bitmapLayout,
+                     const ::com::sun::star::geometry::IntegerRectangle2D&	rect );
 
-        void setData( const ::com::sun::star::uno::Sequence< sal_Int8 >&        data,
-                      const ::com::sun::star::rendering::IntegerBitmapLayout&   bitmapLayout,
-                      const ::com::sun::star::geometry::IntegerRectangle2D&     rect );
+        void setData( const ::com::sun::star::uno::Sequence< sal_Int8 >& 		data, 
+                      const ::com::sun::star::rendering::IntegerBitmapLayout& 	bitmapLayout, 
+                      const ::com::sun::star::geometry::IntegerRectangle2D& 	rect );
 
-        void setPixel( const ::com::sun::star::uno::Sequence< sal_Int8 >&       color,
-                       const ::com::sun::star::rendering::IntegerBitmapLayout&  bitmapLayout,
-                       const ::com::sun::star::geometry::IntegerPoint2D&        pos );
+        void setPixel( const ::com::sun::star::uno::Sequence< sal_Int8 >& 		color, 
+                       const ::com::sun::star::rendering::IntegerBitmapLayout&	bitmapLayout, 
+                       const ::com::sun::star::geometry::IntegerPoint2D& 		pos );
 
-        ::com::sun::star::uno::Sequence< sal_Int8 >
-            getPixel( ::com::sun::star::rendering::IntegerBitmapLayout& bitmapLayout,
+        ::com::sun::star::uno::Sequence< sal_Int8 > 
+            getPixel( ::com::sun::star::rendering::IntegerBitmapLayout& bitmapLayout, 
                       const ::com::sun::star::geometry::IntegerPoint2D& pos );
 
         ::com::sun::star::rendering::IntegerBitmapLayout getMemoryLayout();
@@ -275,7 +275,7 @@ namespace vclcanvas
         bool repaint( const GraphicObjectSharedPtr&                   rGrf,
                       const ::com::sun::star::rendering::ViewState&   viewState,
                       const ::com::sun::star::rendering::RenderState& renderState,
-                      const ::Point&                                  rPt,
+                      const ::Point&                                  rPt, 
                       const ::Size&                                   rSz,
                       const GraphicAttr&                              rAttr ) const;
 
@@ -291,11 +291,11 @@ namespace vclcanvas
         {
             LINE_COLOR, FILL_COLOR, TEXT_COLOR, IGNORE_COLOR
         };
-
+        
         // returns transparency of color
-        int setupOutDevState( const ::com::sun::star::rendering::ViewState&     viewState,
-                              const ::com::sun::star::rendering::RenderState&   renderState,
-                              ColorType                                         eColorType ) const;
+        int setupOutDevState( const ::com::sun::star::rendering::ViewState& 	viewState, 
+                              const ::com::sun::star::rendering::RenderState& 	renderState,
+                              ColorType											eColorType ) const;
 
         /** Called from XCanvas base classes, to notify that content
             is _about_ to change
@@ -325,18 +325,18 @@ namespace vclcanvas
         bool                                         mbHaveAlpha;
 
     private:
-        ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XCachedPrimitive >
-            implDrawBitmap( const ::com::sun::star::rendering::XCanvas*     rCanvas,
-                            const ::com::sun::star::uno::Reference<
-                                    ::com::sun::star::rendering::XBitmap >&     xBitmap,
-                            const ::com::sun::star::rendering::ViewState&   viewState,
+        ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XCachedPrimitive > 	
+            implDrawBitmap( const ::com::sun::star::rendering::XCanvas* 	rCanvas,
+                            const ::com::sun::star::uno::Reference< 
+                                    ::com::sun::star::rendering::XBitmap >& 	xBitmap, 
+                            const ::com::sun::star::rendering::ViewState& 	viewState, 
                             const ::com::sun::star::rendering::RenderState& renderState,
-                            bool                                            bModulateColors );
+                            bool 											bModulateColors );
 
-        bool setupTextOutput( ::Point&                                                                              o_rOutPos,
-                              const ::com::sun::star::rendering::ViewState&                                         viewState,
-                              const ::com::sun::star::rendering::RenderState&                                       renderState,
-                              const ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XCanvasFont >&   xFont ) const;
+        bool setupTextOutput( ::Point&																				o_rOutPos,
+                              const ::com::sun::star::rendering::ViewState& 										viewState, 
+                              const ::com::sun::star::rendering::RenderState& 										renderState, 
+                              const ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XCanvasFont >&	xFont ) const;
 
     };
 }
diff --git a/canvas/source/vcl/canvashelper_texturefill.cxx b/canvas/source/vcl/canvashelper_texturefill.cxx
index 023ceb2b5005..c53b15f04323 100755..100644
--- a/canvas/source/vcl/canvashelper_texturefill.cxx
+++ b/canvas/source/vcl/canvashelper_texturefill.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
@@ -78,19 +78,19 @@ namespace vclcanvas
 {
     namespace
     {
-        bool textureFill( OutputDevice&         rOutDev,
-                          GraphicObject&        rGraphic,
-                          const ::Point&        rPosPixel,
-                          const ::Size&         rNextTileX,
-                          const ::Size&         rNextTileY,
-                          sal_Int32             nTilesX,
-                          sal_Int32             nTilesY,
-                          const ::Size&         rTileSize,
-                          const GraphicAttr&    rAttr)
+        bool textureFill( OutputDevice&			rOutDev,
+                          GraphicObject&		rGraphic,
+                          const ::Point&		rPosPixel,
+                          const ::Size&			rNextTileX,
+                          const ::Size&			rNextTileY,
+                          sal_Int32				nTilesX,
+                          sal_Int32				nTilesY,
+                          const ::Size&			rTileSize,
+                          const GraphicAttr&	rAttr)
         {
-            BOOL    bRet( false );
-            Point   aCurrPos;
-            int     nX, nY;
+            BOOL	bRet( false );
+            Point 	aCurrPos;
+            int 	nX, nY;
 
             for( nY=0; nY < nTilesY; ++nY )
             {
@@ -101,11 +101,11 @@ namespace vclcanvas
                 {
                     // update return value. This method should return true, if
                     // at least one of the looped Draws succeeded.
-                    bRet |= rGraphic.Draw( &rOutDev,
+                    bRet |= rGraphic.Draw( &rOutDev, 
                                            aCurrPos,
                                            rTileSize,
                                            &rAttr );
-
+                    
                     aCurrPos.X() += rNextTileX.Width();
                     aCurrPos.Y() += rNextTileX.Height();
                 }
@@ -120,10 +120,10 @@ namespace vclcanvas
             Since most of the code for linear and axial gradients are
             the same, we've a unified method here
          */
-        void fillLinearGradient( OutputDevice&                                  rOutDev,
-                                 const ::basegfx::B2DHomMatrix&                 rTextureTransform,
-                                 const ::Rectangle&                             rBounds,
-                                 unsigned int                                   nStepCount,
+        void fillLinearGradient( OutputDevice&					                rOutDev,
+                                 const ::basegfx::B2DHomMatrix&	                rTextureTransform,
+                                 const ::Rectangle&				                rBounds,
+                                 unsigned int								    nStepCount,
                                  const ::canvas::ParametricPolyPolygon::Values& rValues,
                                  const std::vector< ::Color >&                  rColors )
         {
@@ -136,23 +136,23 @@ namespace vclcanvas
             ::basegfx::B2DPoint aRightTop( 1.0, 0.0 );
             ::basegfx::B2DPoint aRightBottom( 1.0, 1.0 );
 
-            aLeftTop    *= rTextureTransform;
+            aLeftTop	*= rTextureTransform;
             aLeftBottom *= rTextureTransform;
-            aRightTop   *= rTextureTransform;
+            aRightTop 	*= rTextureTransform;
             aRightBottom*= rTextureTransform;
 
             // calc length of bound rect diagonal
-            const ::basegfx::B2DVector aBoundRectDiagonal(
+            const ::basegfx::B2DVector aBoundRectDiagonal( 
                 ::vcl::unotools::b2DPointFromPoint( rBounds.TopLeft() ) -
                 ::vcl::unotools::b2DPointFromPoint( rBounds.BottomRight() ) );
             const double nDiagonalLength( aBoundRectDiagonal.getLength() );
 
             // create direction of gradient:
             //     _______
-            //     |  |  |
+            //     |  |  | 
             // ->  |  |  | ...
-            //     |  |  |
-            //     -------
+            //     |  |  | 
+            //     -------            
             ::basegfx::B2DVector aDirection( aRightTop - aLeftTop );
             aDirection.normalize();
 
@@ -164,7 +164,7 @@ namespace vclcanvas
                                                              aRightTop,
                                                              aRightBottom,
                                                              ::vcl::unotools::b2DRectangleFromRectangle( rBounds ) );
-
+            
 
             // render gradient
             // ===============
@@ -183,7 +183,7 @@ namespace vclcanvas
             OSL_ENSURE( nStepCount >= 3,
                         "fillLinearGradient(): stepcount smaller than 3" );
 
-
+        
             // fill initial strip (extending two times the bound rect's
             // diagonal to the 'left'
             // ------------------------------------------------------
@@ -204,7 +204,7 @@ namespace vclcanvas
 
             // iteratively render all other strips
             // -----------------------------------
-
+            
             // ensure that nStepCount matches color stop parity, to
             // have a well-defined middle color e.g. for axial
             // gradients.
@@ -221,7 +221,7 @@ namespace vclcanvas
                 double fAlpha;
                 boost::tuples::tie(nIndex,fAlpha)=aLerper.lerp(double(i)/nStepCount);
 
-                rOutDev.SetFillColor(
+                rOutDev.SetFillColor( 
                     Color( (UINT8)(basegfx::tools::lerp(rColors[nIndex].GetRed(),rColors[nIndex+1].GetRed(),fAlpha)),
                            (UINT8)(basegfx::tools::lerp(rColors[nIndex].GetGreen(),rColors[nIndex+1].GetGreen(),fAlpha)),
                            (UINT8)(basegfx::tools::lerp(rColors[nIndex].GetBlue(),rColors[nIndex+1].GetBlue(),fAlpha)) ));
@@ -236,18 +236,18 @@ namespace vclcanvas
                 // increased by one, to account for the fact that we
                 // calculate the right border here (whereas the fill
                 // color is governed by the left edge)
-                const ::basegfx::B2DPoint& rPoint3(
-                    (nStepCount - i-1)/double(nStepCount)*aLeftTop +
+                const ::basegfx::B2DPoint& rPoint3( 
+                    (nStepCount - i-1)/double(nStepCount)*aLeftTop + 
                     (i+1)/double(nStepCount)*aRightTop );
                 aTempPoly[1] = ::Point( ::basegfx::fround( rPoint3.getX() ),
                                         ::basegfx::fround( rPoint3.getY() ) );
 
-                const ::basegfx::B2DPoint& rPoint4(
-                    (nStepCount - i-1)/double(nStepCount)*aLeftBottom +
+                const ::basegfx::B2DPoint& rPoint4( 
+                    (nStepCount - i-1)/double(nStepCount)*aLeftBottom + 
                     (i+1)/double(nStepCount)*aRightBottom );
                 aTempPoly[2] = ::Point( ::basegfx::fround( rPoint4.getX() ),
                                         ::basegfx::fround( rPoint4.getY() ) );
-
+                
                 rOutDev.DrawPolygon( aTempPoly );
             }
 
@@ -293,8 +293,8 @@ namespace vclcanvas
             // here, keep it all the way and only change the vertex values
             // in the loop below (as ::Polygon is a pimpl class, creating
             // one every loop turn would really stress the mem allocator)
-            ::basegfx::B2DPolygon   aOuterPoly( rGradientPoly );
-            ::basegfx::B2DPolygon   aInnerPoly;
+            ::basegfx::B2DPolygon 	aOuterPoly( rGradientPoly );
+            ::basegfx::B2DPolygon 	aInnerPoly;
 
             // subdivide polygon _before_ rendering, would otherwise have
             // to be performed on every loop turn.
@@ -302,7 +302,7 @@ namespace vclcanvas
                 aOuterPoly = ::basegfx::tools::adaptiveSubdivideByAngle(aOuterPoly);
 
             aInnerPoly = aOuterPoly;
-
+        
             // only transform outer polygon _after_ copying it into
             // aInnerPoly, because inner polygon has to be scaled before
             // the actual texture transformation takes place
@@ -312,7 +312,7 @@ namespace vclcanvas
             // have to be prefixed by anisotrophic scaling)
             ::basegfx::B2DHomMatrix aInnerPolygonTransformMatrix;
 
-
+        
             // apply scaling (possibly anisotrophic) to inner polygon
             // ------------------------------------------------------
 
@@ -331,7 +331,7 @@ namespace vclcanvas
             else if( nAspectRatio < 1.0 )
             {
                 // width < height case
-                aInnerPolygonTransformMatrix.scale( 0.0,
+                aInnerPolygonTransformMatrix.scale( 0.0, 
                                                     1.0 - nAspectRatio );
             }
             else
@@ -345,11 +345,11 @@ namespace vclcanvas
 
             // apply final matrix to polygon
             aInnerPoly.transform( aInnerPolygonTransformMatrix );
-
+        
 
             const sal_uInt32 nNumPoints( aOuterPoly.count() );
-            ::Polygon        aTempPoly( static_cast<USHORT>(nNumPoints+1) );
-
+            ::Polygon		 aTempPoly( static_cast<USHORT>(nNumPoints+1) );
+        
             // increase number of steps by one: polygonal gradients have
             // the outermost polygon rendered in rColor2, and the
             // innermost in rColor1. The innermost polygon will never
@@ -359,7 +359,7 @@ namespace vclcanvas
             // |                       |
             // |-------|-------|-------|
             // |                       |
-            // 3       2       1       0
+            // 3       2       1       0 
             //
             // This yields 4 tick marks, where 0 is never attained (since
             // zero-area polygons typically don't display perceivable
@@ -379,27 +379,27 @@ namespace vclcanvas
 
                 for( unsigned int i=1,p; i<nStepCount; ++i )
                 {
-                    const double fT( i/double(nStepCount) );
+                    const double fT( i/double(nStepCount) );            
 
                     std::ptrdiff_t nIndex;
                     double fAlpha;
                     boost::tuples::tie(nIndex,fAlpha)=aLerper.lerp(fT);
 
                     // lerp color
-                    rOutDev.SetFillColor(
+                    rOutDev.SetFillColor( 
                         Color( (UINT8)(basegfx::tools::lerp(rColors[nIndex].GetRed(),rColors[nIndex+1].GetRed(),fAlpha)),
                                (UINT8)(basegfx::tools::lerp(rColors[nIndex].GetGreen(),rColors[nIndex+1].GetGreen(),fAlpha)),
                                (UINT8)(basegfx::tools::lerp(rColors[nIndex].GetBlue(),rColors[nIndex+1].GetBlue(),fAlpha)) ));
 
                     // scale and render polygon, by interpolating between
-                    // outer and inner polygon.
+                    // outer and inner polygon. 
 
                     for( p=0; p<nNumPoints; ++p )
                     {
                         const ::basegfx::B2DPoint& rOuterPoint( aOuterPoly.getB2DPoint(p) );
                         const ::basegfx::B2DPoint& rInnerPoint( aInnerPoly.getB2DPoint(p) );
 
-                        aTempPoly[(USHORT)p] = ::Point(
+                        aTempPoly[(USHORT)p] = ::Point( 
                             basegfx::fround( fT*rInnerPoint.getX() + (1-fT)*rOuterPoint.getX() ),
                             basegfx::fround( fT*rInnerPoint.getY() + (1-fT)*rOuterPoint.getY() ) );
                     }
@@ -423,8 +423,8 @@ namespace vclcanvas
                 // here, keep it all the way and only change the vertex values
                 // in the loop below (as ::Polygon is a pimpl class, creating
                 // one every loop turn would really stress the mem allocator)
-                ::PolyPolygon           aTempPolyPoly;
-                ::Polygon               aTempPoly2( static_cast<USHORT>(nNumPoints+1) );
+                ::PolyPolygon			aTempPolyPoly;
+                ::Polygon				aTempPoly2( static_cast<USHORT>(nNumPoints+1) );
 
                 aTempPoly2[0] = rBounds.TopLeft();
                 aTempPoly2[1] = rBounds.TopRight();
@@ -438,18 +438,18 @@ namespace vclcanvas
                 for( unsigned int i=0,p; i<nStepCount; ++i )
                 {
                     const double fT( (i+1)/double(nStepCount) );
-
+            
                     std::ptrdiff_t nIndex;
                     double fAlpha;
                     boost::tuples::tie(nIndex,fAlpha)=aLerper.lerp(fT);
 
                     // lerp color
-                    rOutDev.SetFillColor(
+                    rOutDev.SetFillColor( 
                         Color( (UINT8)(basegfx::tools::lerp(rColors[nIndex].GetRed(),rColors[nIndex+1].GetRed(),fAlpha)),
                                (UINT8)(basegfx::tools::lerp(rColors[nIndex].GetGreen(),rColors[nIndex+1].GetGreen(),fAlpha)),
                                (UINT8)(basegfx::tools::lerp(rColors[nIndex].GetBlue(),rColors[nIndex+1].GetBlue(),fAlpha)) ));
 
-#if defined(VERBOSE) && OSL_DEBUG_LEVEL > 0
+#if defined(VERBOSE) && OSL_DEBUG_LEVEL > 0        
                     if( i && !(i % 10) )
                         rOutDev.SetFillColor( COL_RED );
 #endif
@@ -463,7 +463,7 @@ namespace vclcanvas
                         const ::basegfx::B2DPoint& rOuterPoint( aOuterPoly.getB2DPoint(p) );
                         const ::basegfx::B2DPoint& rInnerPoint( aInnerPoly.getB2DPoint(p) );
 
-                        aTempPoly[(USHORT)p] = ::Point(
+                        aTempPoly[(USHORT)p] = ::Point( 
                             basegfx::fround( fT*rInnerPoint.getX() + (1-fT)*rOuterPoint.getX() ),
                             basegfx::fround( fT*rInnerPoint.getY() + (1-fT)*rOuterPoint.getY() ) );
                     }
@@ -497,7 +497,7 @@ namespace vclcanvas
         }
 
         void doGradientFill( OutputDevice&                                  rOutDev,
-                             const ::canvas::ParametricPolyPolygon::Values& rValues,
+                             const ::canvas::ParametricPolyPolygon::Values&	rValues,
                              const std::vector< ::Color >&                  rColors,
                              const ::basegfx::B2DHomMatrix&                 rTextureTransform,
                              const ::Rectangle&                             rBounds,
@@ -514,7 +514,7 @@ namespace vclcanvas
                                         rValues,
                                         rColors );
                     break;
-
+               
                 case ::canvas::ParametricPolyPolygon::GRADIENT_ELLIPTICAL:
                     // FALLTHROUGH intended
                 case ::canvas::ParametricPolyPolygon::GRADIENT_RECTANGULAR:
@@ -535,9 +535,9 @@ namespace vclcanvas
 
         int numColorSteps( const ::Color& rColor1, const ::Color& rColor2 )
         {
-            return ::std::max(
+            return ::std::max( 
                 labs( rColor1.GetRed() - rColor2.GetRed() ),
-                ::std::max(
+                ::std::max(                    
                     labs( rColor1.GetGreen() - rColor2.GetGreen() ),
                     labs( rColor1.GetBlue()  - rColor2.GetBlue() ) ) );
         }
@@ -547,7 +547,7 @@ namespace vclcanvas
                            const ::canvas::ParametricPolyPolygon::Values&  rValues,
                            const std::vector< ::Color >&                   rColors,
                            const PolyPolygon&                              rPoly,
-                           const rendering::ViewState&                     viewState,
+                           const rendering::ViewState&                     viewState, 
                            const rendering::RenderState&                   renderState,
                            const rendering::Texture&                       texture,
                            int                                             nTransparency )
@@ -573,11 +573,11 @@ namespace vclcanvas
                                                        texture,
                                                        nColorSteps);
 
-            rOutDev.SetLineColor();
+            rOutDev.SetLineColor(); 
 
             // determine maximal bound rect of texture-filled
             // polygon
-            const ::Rectangle aPolygonDeviceRectOrig(
+            const ::Rectangle aPolygonDeviceRectOrig( 
                 rPoly.GetBoundRect() );
 
             if( tools::isRectangle( rPoly ) )
@@ -700,19 +700,20 @@ namespace vclcanvas
             }
 #endif // complex-clipping vs. XOR-trick
 
-#if defined(VERBOSE) && OSL_DEBUG_LEVEL > 0
+#if defined(VERBOSE) && OSL_DEBUG_LEVEL > 0        
             {
                 ::basegfx::B2DRectangle aRect(0.0, 0.0, 1.0, 1.0);
                 ::basegfx::B2DRectangle aTextureDeviceRect;
-                ::canvas::tools::calcTransformedRectBounds( aTextureDeviceRect,
-                                                            aRect,
+                ::basegfx::B2DHomMatrix aTextureTransform;
+                ::canvas::tools::calcTransformedRectBounds( aTextureDeviceRect, 
+                                                            aRect, 
                                                             aTextureTransform );
-                rOutDev.SetLineColor( COL_RED );
+                rOutDev.SetLineColor( COL_RED ); 
                 rOutDev.SetFillColor();
                 rOutDev.DrawRect( ::vcl::unotools::rectangleFromB2DRectangle( aTextureDeviceRect ) );
 
-                rOutDev.SetLineColor( COL_BLUE );
-                ::Polygon aPoly1(
+                rOutDev.SetLineColor( COL_BLUE ); 
+                ::Polygon aPoly1( 
                     ::vcl::unotools::rectangleFromB2DRectangle( aRect ));
                 ::basegfx::B2DPolygon aPoly2( aPoly1.getB2DPolygon() );
                 aPoly2.transform( aTextureTransform );
@@ -725,15 +726,15 @@ namespace vclcanvas
         }
     }
 
-    uno::Reference< rendering::XCachedPrimitive > CanvasHelper::fillTexturedPolyPolygon( const rendering::XCanvas*                          pCanvas,
+    uno::Reference< rendering::XCachedPrimitive > CanvasHelper::fillTexturedPolyPolygon( const rendering::XCanvas* 							pCanvas, 
                                                                                          const uno::Reference< rendering::XPolyPolygon2D >& xPolyPolygon,
-                                                                                         const rendering::ViewState&                        viewState,
-                                                                                         const rendering::RenderState&                      renderState,
-                                                                                         const uno::Sequence< rendering::Texture >&         textures )
+                                                                                         const rendering::ViewState& 						viewState,
+                                                                                         const rendering::RenderState& 						renderState,
+                                                                                         const uno::Sequence< rendering::Texture >& 		textures )
     {
         ENSURE_ARG_OR_THROW( xPolyPolygon.is(),
                          "CanvasHelper::fillPolyPolygon(): polygon is NULL");
-        ENSURE_ARG_OR_THROW( textures.getLength(),
+        ENSURE_ARG_OR_THROW( textures.getLength(), 
                          "CanvasHelper::fillTexturedPolyPolygon: empty texture sequence");
 
         if( mpOutDev )
@@ -741,7 +742,7 @@ namespace vclcanvas
             tools::OutDevStateKeeper aStateKeeper( mpProtectedOutDev );
 
             const int nTransparency( setupOutDevState( viewState, renderState, IGNORE_COLOR ) );
-            PolyPolygon aPolyPoly( tools::mapPolyPolygon(
+            PolyPolygon aPolyPoly( tools::mapPolyPolygon( 
                                        ::basegfx::unotools::b2DPolyPolygonFromXPolyPolygon2D(xPolyPolygon),
                                        viewState, renderState ) );
 
@@ -750,7 +751,7 @@ namespace vclcanvas
             {
                 // try to cast XParametricPolyPolygon2D reference to
                 // our implementation class.
-                ::canvas::ParametricPolyPolygon* pGradient =
+                ::canvas::ParametricPolyPolygon* pGradient = 
                       dynamic_cast< ::canvas::ParametricPolyPolygon* >( textures[0].Gradient.get() );
 
                 if( pGradient && pGradient->getValues().maColors.getLength() )
@@ -799,14 +800,14 @@ namespace vclcanvas
             else if( textures[0].Bitmap.is() )
             {
                 const geometry::IntegerSize2D aBmpSize( textures[0].Bitmap->getSize() );
-
+                
                 ENSURE_ARG_OR_THROW( aBmpSize.Width != 0 &&
                                  aBmpSize.Height != 0,
                                  "CanvasHelper::fillTexturedPolyPolygon(): zero-sized texture bitmap" );
 
                 // determine maximal bound rect of texture-filled
                 // polygon
-                const ::Rectangle aPolygonDeviceRect(
+                const ::Rectangle aPolygonDeviceRect( 
                     aPolyPoly.GetBoundRect() );
 
 
@@ -821,18 +822,18 @@ namespace vclcanvas
                                                              viewState,
                                                              renderState);
                 ::basegfx::B2DHomMatrix aTextureTransform;
-                ::basegfx::unotools::homMatrixFromAffineMatrix( aTextureTransform,
+                ::basegfx::unotools::homMatrixFromAffineMatrix( aTextureTransform, 
                                                                 textures[0].AffineTransform );
-
+                
                 aTotalTransform *= aTextureTransform;
 
                 const ::basegfx::B2DRectangle aRect(0.0, 0.0, 1.0, 1.0);
                 ::basegfx::B2DRectangle aTextureDeviceRect;
-                ::canvas::tools::calcTransformedRectBounds( aTextureDeviceRect,
-                                                            aRect,
+                ::canvas::tools::calcTransformedRectBounds( aTextureDeviceRect, 
+                                                            aRect, 
                                                             aTotalTransform );
 
-                const ::Rectangle aIntegerTextureDeviceRect(
+                const ::Rectangle aIntegerTextureDeviceRect( 
                     ::vcl::unotools::rectangleFromB2DRectangle( aTextureDeviceRect ) );
 
                 if( bRectangularPolygon &&
@@ -859,14 +860,14 @@ namespace vclcanvas
                         pColor[2] = 0.0;
                         pColor[3] = textures[0].Alpha;
 
-                        return drawBitmapModulated( pCanvas,
+                        return drawBitmapModulated( pCanvas, 
                                                     textures[0].Bitmap,
                                                     viewState,
                                                     aLocalState );
                     }
                     else
                     {
-                        return drawBitmap( pCanvas,
+                        return drawBitmap( pCanvas, 
                                            textures[0].Bitmap,
                                            viewState,
                                            aLocalState );
@@ -893,7 +894,7 @@ namespace vclcanvas
                     // combine with view and render transform
                     ::basegfx::B2DHomMatrix aMatrix;
                     ::canvas::tools::mergeViewAndRenderTransform(aMatrix, viewState, renderState);
-
+                    
                     // combine all three transformations into one
                     // global texture-to-device-space transformation
                     aTotalTransform *= aMatrix;
@@ -903,12 +904,12 @@ namespace vclcanvas
                     // appropriate GraphicObject
                     ::basegfx::B2DVector aScale;
                     ::basegfx::B2DPoint  aOutputPos;
-                    double               nRotate;
-                    double               nShearX;
+                    double				 nRotate;
+                    double				 nShearX;
                     aTotalTransform.decompose( aScale, aOutputPos, nRotate, nShearX );
-
-                    GraphicAttr             aGrfAttr;
-                    GraphicObjectSharedPtr  pGrfObj;
+                
+                    GraphicAttr 			aGrfAttr;
+                    GraphicObjectSharedPtr 	pGrfObj;
 
                     if( ::basegfx::fTools::equalZero( nShearX ) )
                     {
@@ -917,8 +918,8 @@ namespace vclcanvas
                         // and translation)
 
                         // setup GraphicAttr
-                        aGrfAttr.SetMirrorFlags(
-                            ( aScale.getX() < 0.0 ? BMP_MIRROR_HORZ : 0 ) |
+                        aGrfAttr.SetMirrorFlags( 
+                            ( aScale.getX() < 0.0 ? BMP_MIRROR_HORZ : 0 ) | 
                             ( aScale.getY() < 0.0 ? BMP_MIRROR_VERT : 0 ) );
                         aGrfAttr.SetRotation( static_cast< USHORT >(::basegfx::fround( nRotate*10.0 )) );
 
@@ -976,9 +977,9 @@ namespace vclcanvas
                     // device coordinate space, were we determine the
                     // start point from it.
                     ::basegfx::B2DRectangle aTextureSpacePolygonRect;
-                    ::canvas::tools::calcTransformedRectBounds( aTextureSpacePolygonRect,
+                    ::canvas::tools::calcTransformedRectBounds( aTextureSpacePolygonRect, 
                                                                 ::vcl::unotools::b2DRectangleFromRectangle(
-                                                                    aPolygonDeviceRect ),
+                                                                    aPolygonDeviceRect ), 
                                                                 aInverseTextureTransform );
 
                     // calc left, top of extended polygon rect in
@@ -1001,26 +1002,26 @@ namespace vclcanvas
 
                     // and convert back to device space
                     ::basegfx::B2DRectangle aSingleDeviceTextureRect;
-                    ::canvas::tools::calcTransformedRectBounds( aSingleDeviceTextureRect,
-                                                                aSingleTextureRect,
+                    ::canvas::tools::calcTransformedRectBounds( aSingleDeviceTextureRect, 
+                                                                aSingleTextureRect, 
                                                                 aPureTotalTransform );
-
-                    const ::Point aPtRepeat( ::vcl::unotools::pointFromB2DPoint(
+                    
+                    const ::Point aPtRepeat( ::vcl::unotools::pointFromB2DPoint( 
                                                  aSingleDeviceTextureRect.getMinimum() ) );
                     const ::Size  aSz( ::basegfx::fround( aScale.getX() * aBmpSize.Width ),
                                        ::basegfx::fround( aScale.getY() * aBmpSize.Height ) );
                     const ::Size  aIntegerNextTileX( ::vcl::unotools::sizeFromB2DSize(aNextTileX) );
                     const ::Size  aIntegerNextTileY( ::vcl::unotools::sizeFromB2DSize(aNextTileY) );
 
-                    const ::Point aPt( textures[0].RepeatModeX == rendering::TexturingMode::NONE ?
+                    const ::Point aPt( textures[0].RepeatModeX == rendering::TexturingMode::NONE ? 
                                        ::basegfx::fround( aOutputPos.getX() ) : aPtRepeat.X(),
-                                       textures[0].RepeatModeY == rendering::TexturingMode::NONE ?
+                                       textures[0].RepeatModeY == rendering::TexturingMode::NONE ? 
                                        ::basegfx::fround( aOutputPos.getY() ) : aPtRepeat.Y() );
-                    const sal_Int32 nTilesX( textures[0].RepeatModeX == rendering::TexturingMode::NONE ?
+                    const sal_Int32 nTilesX( textures[0].RepeatModeX == rendering::TexturingMode::NONE ? 
                                              1 : nX2 - nX1 );
-                    const sal_Int32 nTilesY( textures[0].RepeatModeX == rendering::TexturingMode::NONE ?
+                    const sal_Int32 nTilesY( textures[0].RepeatModeX == rendering::TexturingMode::NONE ? 
                                              1 : nY2 - nY1 );
-
+                    
                     OutputDevice& rOutDev( mpOutDev->getOutDev() );
 
                     if( bRectangularPolygon )
@@ -1048,8 +1049,8 @@ namespace vclcanvas
                             // transOrig*transModulate (which would be
                             // equivalent to the origAlpha*modulateAlpha
                             // the DX canvas performs)
-                            aGrfAttr.SetTransparency(
-                                static_cast< BYTE >(
+                            aGrfAttr.SetTransparency( 
+                                static_cast< BYTE >( 
                                     ::basegfx::fround( 255.0*( 1.0 - textures[0].Alpha ) ) ) );
                         }
 
@@ -1116,11 +1117,11 @@ namespace vclcanvas
                             // output VDev content alpha-blended to
                             // target position.
                             const ::Point aEmptyPoint;
-                            Bitmap aContentBmp(
-                                aVDev.GetBitmap( aEmptyPoint,
+                            Bitmap aContentBmp( 
+                                aVDev.GetBitmap( aEmptyPoint, 
                                                  aVDev.GetOutputSizePixel() ) );
 
-                            BYTE nCol( static_cast< BYTE >(
+                            BYTE nCol( static_cast< BYTE >( 
                                            ::basegfx::fround( 255.0*( 1.0 - textures[0].Alpha ) ) ) );
                             AlphaMask aAlpha( aVDev.GetOutputSizePixel(),
                                               &nCol );
diff --git a/canvas/source/vcl/devicehelper.cxx b/canvas/source/vcl/devicehelper.cxx
index 9b7b9fac2857..a2f9081bd25d 100644
--- a/canvas/source/vcl/devicehelper.cxx
+++ b/canvas/source/vcl/devicehelper.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
@@ -87,15 +87,15 @@ namespace vclcanvas
         return ::vcl::unotools::size2DFromSize( aLogSize );
     }
 
-    uno::Reference< rendering::XLinePolyPolygon2D > DeviceHelper::createCompatibleLinePolyPolygon(
-        const uno::Reference< rendering::XGraphicDevice >&              ,
-        const uno::Sequence< uno::Sequence< geometry::RealPoint2D > >&  points )
+    uno::Reference< rendering::XLinePolyPolygon2D > DeviceHelper::createCompatibleLinePolyPolygon( 
+        const uno::Reference< rendering::XGraphicDevice >& 				,
+        const uno::Sequence< uno::Sequence< geometry::RealPoint2D > >&	points )
     {
         uno::Reference< rendering::XLinePolyPolygon2D > xPoly;
         if( !mpOutDev )
             return xPoly; // we're disposed
 
-        xPoly.set( new ::basegfx::unotools::UnoPolyPolygon(
+        xPoly.set( new ::basegfx::unotools::UnoPolyPolygon( 
                        ::basegfx::unotools::polyPolygonFromPoint2DSequenceSequence( points ) ) );
         // vcl only handles even_odd polygons
         xPoly->setFillRule(rendering::FillRule_EVEN_ODD);
@@ -103,15 +103,15 @@ namespace vclcanvas
         return xPoly;
     }
 
-    uno::Reference< rendering::XBezierPolyPolygon2D > DeviceHelper::createCompatibleBezierPolyPolygon(
-        const uno::Reference< rendering::XGraphicDevice >&                      ,
-        const uno::Sequence< uno::Sequence< geometry::RealBezierSegment2D > >&  points )
+    uno::Reference< rendering::XBezierPolyPolygon2D > DeviceHelper::createCompatibleBezierPolyPolygon( 
+        const uno::Reference< rendering::XGraphicDevice >& 						,
+        const uno::Sequence< uno::Sequence< geometry::RealBezierSegment2D > >&	points )
     {
         uno::Reference< rendering::XBezierPolyPolygon2D > xPoly;
         if( !mpOutDev )
             return xPoly; // we're disposed
 
-        xPoly.set( new ::basegfx::unotools::UnoPolyPolygon(
+        xPoly.set( new ::basegfx::unotools::UnoPolyPolygon( 
                        ::basegfx::unotools::polyPolygonFromBezier2DSequenceSequence( points ) ) );
         // vcl only handles even_odd polygons
         xPoly->setFillRule(rendering::FillRule_EVEN_ODD);
@@ -119,44 +119,44 @@ namespace vclcanvas
         return xPoly;
     }
 
-    uno::Reference< rendering::XBitmap > DeviceHelper::createCompatibleBitmap(
+    uno::Reference< rendering::XBitmap > DeviceHelper::createCompatibleBitmap( 
         const uno::Reference< rendering::XGraphicDevice >& rDevice,
-        const geometry::IntegerSize2D&                     size )
+        const geometry::IntegerSize2D& 					   size )
     {
         if( !mpOutDev )
             return uno::Reference< rendering::XBitmap >(); // we're disposed
 
-        return uno::Reference< rendering::XBitmap >(
+        return uno::Reference< rendering::XBitmap >( 
             new CanvasBitmap( ::vcl::unotools::sizeFromIntegerSize2D(size),
                               false,
                               *rDevice.get(),
                               mpOutDev ) );
     }
 
-    uno::Reference< rendering::XVolatileBitmap > DeviceHelper::createVolatileBitmap(
-        const uno::Reference< rendering::XGraphicDevice >&  ,
-        const geometry::IntegerSize2D&                       )
+    uno::Reference< rendering::XVolatileBitmap > DeviceHelper::createVolatileBitmap( 
+        const uno::Reference< rendering::XGraphicDevice >& 	,
+        const geometry::IntegerSize2D& 						 )
     {
         return uno::Reference< rendering::XVolatileBitmap >();
     }
 
-    uno::Reference< rendering::XBitmap > DeviceHelper::createCompatibleAlphaBitmap(
+    uno::Reference< rendering::XBitmap > DeviceHelper::createCompatibleAlphaBitmap( 
         const uno::Reference< rendering::XGraphicDevice >& rDevice,
         const geometry::IntegerSize2D&                     size )
     {
         if( !mpOutDev )
             return uno::Reference< rendering::XBitmap >(); // we're disposed
 
-        return uno::Reference< rendering::XBitmap >(
+        return uno::Reference< rendering::XBitmap >( 
             new CanvasBitmap( ::vcl::unotools::sizeFromIntegerSize2D(size),
                               true,
                               *rDevice.get(),
                               mpOutDev ) );
     }
 
-    uno::Reference< rendering::XVolatileBitmap > DeviceHelper::createVolatileAlphaBitmap(
-        const uno::Reference< rendering::XGraphicDevice >&  ,
-        const geometry::IntegerSize2D&                       )
+    uno::Reference< rendering::XVolatileBitmap > DeviceHelper::createVolatileAlphaBitmap( 
+        const uno::Reference< rendering::XGraphicDevice >& 	,
+        const geometry::IntegerSize2D& 						 )
     {
         return uno::Reference< rendering::XVolatileBitmap >();
     }
@@ -171,44 +171,44 @@ namespace vclcanvas
         (void)bEnter;
         return false;
     }
-
+    
     void DeviceHelper::disposing()
     {
         // release all references
         mpOutDev.reset();
     }
-
+       
     uno::Any DeviceHelper::isAccelerated() const
     {
         return ::com::sun::star::uno::makeAny(false);
     }
-
+  
     uno::Any DeviceHelper::getDeviceHandle() const
     {
         if( !mpOutDev )
             return uno::Any();
-
-        return uno::makeAny(
+  
+        return uno::makeAny( 
             reinterpret_cast< sal_Int64 >(&mpOutDev->getOutDev()) );
     }
-
+  
     uno::Any DeviceHelper::getSurfaceHandle() const
     {
         return getDeviceHandle();
     }
-
-    namespace
-    {
+  
+    namespace 
+    { 
         struct DeviceColorSpace: public rtl::StaticWithInit<uno::Reference<rendering::XColorSpace>,
-                                                            DeviceColorSpace>
+                                                            DeviceColorSpace> 
         {
             uno::Reference<rendering::XColorSpace> operator()()
             {
                 return vcl::unotools::createStandardColorSpace();
             }
-        };
+        }; 
     }
-
+    
     uno::Reference<rendering::XColorSpace> DeviceHelper::getColorSpace() const
     {
         // always the same
@@ -238,5 +238,5 @@ namespace vclcanvas
             ++nFilePostfixCount;
         }
     }
-
+    
 }
diff --git a/canvas/source/vcl/devicehelper.hxx b/canvas/source/vcl/devicehelper.hxx
index aa17e98b8070..753af6adec40 100644
--- a/canvas/source/vcl/devicehelper.hxx
+++ b/canvas/source/vcl/devicehelper.hxx
@@ -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
@@ -60,31 +60,31 @@ namespace vclcanvas
         // XWindowGraphicDevice
         ::com::sun::star::geometry::RealSize2D getPhysicalResolution();
         ::com::sun::star::geometry::RealSize2D getPhysicalSize();
-        ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XLinePolyPolygon2D > createCompatibleLinePolyPolygon(
-            const ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XGraphicDevice >&                               rDevice,
+        ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XLinePolyPolygon2D > createCompatibleLinePolyPolygon( 
+            const ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XGraphicDevice >& 								 rDevice,
             const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< ::com::sun::star::geometry::RealPoint2D > >& points );
-        ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XBezierPolyPolygon2D > createCompatibleBezierPolyPolygon(
-            const ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XGraphicDevice >&                                       rDevice,
+        ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XBezierPolyPolygon2D > createCompatibleBezierPolyPolygon( 
+            const ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XGraphicDevice >& 								 		 rDevice,
             const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< ::com::sun::star::geometry::RealBezierSegment2D > >& points );
-        ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XBitmap > createCompatibleBitmap(
-            const ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XGraphicDevice >&  rDevice,
-            const ::com::sun::star::geometry::IntegerSize2D&                                        size );
-        ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XVolatileBitmap > createVolatileBitmap(
-            const ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XGraphicDevice >&  rDevice,
-            const ::com::sun::star::geometry::IntegerSize2D&                                        size );
-        ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XBitmap > createCompatibleAlphaBitmap(
-            const ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XGraphicDevice >&  rDevice,
-            const ::com::sun::star::geometry::IntegerSize2D&                                        size );
-        ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XVolatileBitmap > createVolatileAlphaBitmap(
-            const ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XGraphicDevice >&  rDevice,
-            const ::com::sun::star::geometry::IntegerSize2D&                                        size );
+        ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XBitmap > createCompatibleBitmap( 
+            const ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XGraphicDevice >& 	rDevice,
+            const ::com::sun::star::geometry::IntegerSize2D& 										size );
+        ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XVolatileBitmap > createVolatileBitmap( 
+            const ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XGraphicDevice >& 	rDevice,
+            const ::com::sun::star::geometry::IntegerSize2D& 										size );
+        ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XBitmap > createCompatibleAlphaBitmap( 
+            const ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XGraphicDevice >& 	rDevice,
+            const ::com::sun::star::geometry::IntegerSize2D& 										size );
+        ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XVolatileBitmap > createVolatileAlphaBitmap( 
+            const ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XGraphicDevice >& 	rDevice,
+            const ::com::sun::star::geometry::IntegerSize2D& 										size );
         sal_Bool hasFullScreenMode(  );
         sal_Bool enterFullScreenMode( sal_Bool bEnter );
 
         ::com::sun::star::uno::Any isAccelerated() const;
         ::com::sun::star::uno::Any getDeviceHandle() const;
         ::com::sun::star::uno::Any getSurfaceHandle() const;
-        ::com::sun::star::uno::Reference<
+        ::com::sun::star::uno::Reference< 
             ::com::sun::star::rendering::XColorSpace > getColorSpace() const;
 
         OutDevProviderSharedPtr getOutDev() const { return mpOutDev; }
@@ -96,7 +96,7 @@ namespace vclcanvas
 
     private:
         /// For retrieving device info
-        OutDevProviderSharedPtr mpOutDev;
+        OutDevProviderSharedPtr mpOutDev; 
     };
 }
 
diff --git a/canvas/source/vcl/impltools.cxx b/canvas/source/vcl/impltools.cxx
index b4c19aa5a028..f9c548af5824 100644
--- a/canvas/source/vcl/impltools.cxx
+++ b/canvas/source/vcl/impltools.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
@@ -95,7 +95,7 @@ namespace vclcanvas
                 }
 
                 // TODO(F2): add support for floating point bitmap formats
-                uno::Reference< rendering::XIntegerReadOnlyBitmap > xIntBmp(
+                uno::Reference< rendering::XIntegerReadOnlyBitmap > xIntBmp( 
                     xBitmap, uno::UNO_QUERY_THROW );
 
                 ::BitmapEx aBmpEx = ::vcl::unotools::bitmapExFromXBitmap( xIntBmp );
@@ -103,21 +103,21 @@ namespace vclcanvas
                     return aBmpEx;
 
                 // TODO(F1): extract pixel from XBitmap interface
-                ENSURE_OR_THROW( false,
+                ENSURE_OR_THROW( false, 
                                   "bitmapExFromXBitmap(): could not extract bitmap" );
             }
-
+ 
             return ::BitmapEx();
         }
 
-        bool setupFontTransform( ::Point&                       o_rPoint,
-                                 ::Font&                        io_rVCLFont,
-                                 const rendering::ViewState&    rViewState,
-                                 const rendering::RenderState&  rRenderState,
-                                 ::OutputDevice&                rOutDev )
+        bool setupFontTransform( ::Point&						o_rPoint,
+                                 ::Font& 						io_rVCLFont, 
+                                 const rendering::ViewState& 	rViewState,
+                                 const rendering::RenderState& 	rRenderState,
+                                 ::OutputDevice&				rOutDev )
         {
             ::basegfx::B2DHomMatrix aMatrix;
-
+            
             ::canvas::tools::mergeViewAndRenderTransform(aMatrix,
                                                          rViewState,
                                                          rRenderState);
@@ -125,12 +125,12 @@ namespace vclcanvas
             ::basegfx::B2DTuple aScale;
             ::basegfx::B2DTuple aTranslate;
             double nRotate, nShearX;
-
+            
             aMatrix.decompose( aScale, aTranslate, nRotate, nShearX );
 
             // #i72417# detecting the 180 degree rotation case manually here.
-            if( aScale.getX() < 0.0 &&
-                aScale.getY() < 0.0 &&
+            if( aScale.getX() < 0.0 && 
+                aScale.getY() < 0.0 && 
                 basegfx::fTools::equalZero(nRotate) )
             {
                 aScale *= -1.0;
@@ -190,9 +190,9 @@ namespace vclcanvas
         // VCL-Canvas related
         //---------------------------------------------------------------------
 
-        ::Point mapRealPoint2D( const geometry::RealPoint2D&    rPoint,
-                                const rendering::ViewState&     rViewState,
-                                const rendering::RenderState&   rRenderState )
+        ::Point mapRealPoint2D( const geometry::RealPoint2D& 	rPoint,
+                                const rendering::ViewState& 	rViewState,
+                                const rendering::RenderState&	rRenderState )
         {
             ::basegfx::B2DPoint aPoint( ::basegfx::unotools::b2DPointFromRealPoint2D(rPoint) );
 
@@ -204,9 +204,9 @@ namespace vclcanvas
             return ::vcl::unotools::pointFromB2DPoint( aPoint );
         }
 
-        ::PolyPolygon mapPolyPolygon( const ::basegfx::B2DPolyPolygon&  rPoly,
-                                      const rendering::ViewState&       rViewState,
-                                      const rendering::RenderState&     rRenderState )
+        ::PolyPolygon mapPolyPolygon( const ::basegfx::B2DPolyPolygon& 	rPoly,
+                                      const rendering::ViewState& 		rViewState,
+                                      const rendering::RenderState&		rRenderState )
         {
             ::basegfx::B2DHomMatrix aMatrix;
             ::canvas::tools::mergeViewAndRenderTransform(aMatrix,
@@ -220,28 +220,28 @@ namespace vclcanvas
             return ::PolyPolygon( aTemp );
         }
 
-        ::BitmapEx transformBitmap( const BitmapEx&                 rBitmap,
-                                    const ::basegfx::B2DHomMatrix&  rTransform,
-                                    const uno::Sequence< double >&  rDeviceColor,
-                                    ModulationMode                  eModulationMode )
+        ::BitmapEx transformBitmap( const BitmapEx& 				rBitmap,
+                                    const ::basegfx::B2DHomMatrix& 	rTransform,
+                                    const uno::Sequence< double >&	rDeviceColor,
+                                    ModulationMode					eModulationMode )
         {
             RTL_LOGFILE_CONTEXT( aLog, "::vclcanvas::tools::transformBitmap()" );
             RTL_LOGFILE_CONTEXT_TRACE1( aLog, "::vclcanvas::tools::transformBitmap: 0x%X", &rBitmap );
-
+            
             // calc transformation and size of bitmap to be
             // generated. Note, that the translational components are
             // deleted from the transformation; this can be handled by
             // an offset when painting the bitmap
-            const Size                  aBmpSize( rBitmap.GetSizePixel() );
-            ::basegfx::B2DRectangle     aDestRect;
-
+            const Size 					aBmpSize( rBitmap.GetSizePixel() );
+            ::basegfx::B2DRectangle		aDestRect;
+            
             bool bCopyBack( false );
 
             // calc effective transformation for bitmap
             const ::basegfx::B2DRectangle aSrcRect( 0, 0,
                                                     aBmpSize.Width(),
                                                     aBmpSize.Height() );
-            ::canvas::tools::calcTransformedRectBounds( aDestRect,
+            ::canvas::tools::calcTransformedRectBounds( aDestRect, 
                                                         aSrcRect,
                                                         rTransform );
 
@@ -259,7 +259,7 @@ namespace vclcanvas
             const double nRedModulation( bModulateColors ? rDeviceColor[0] : 1.0 );
             const double nGreenModulation( bModulateColors ? rDeviceColor[1] : 1.0 );
             const double nBlueModulation( bModulateColors ? rDeviceColor[2] : 1.0 );
-            const double nAlphaModulation( bModulateColors && rDeviceColor.getLength() > 3 ?
+            const double nAlphaModulation( bModulateColors && rDeviceColor.getLength() > 3 ? 
                                            rDeviceColor[3] : 1.0 );
 
             Bitmap aSrcBitmap( rBitmap.GetBitmap() );
@@ -277,8 +277,8 @@ namespace vclcanvas
 
             ScopedBitmapReadAccess pReadAccess( aSrcBitmap.AcquireReadAccess(),
                                                 aSrcBitmap );
-            ScopedBitmapReadAccess pAlphaReadAccess( rBitmap.IsTransparent() ?
-                                                     aSrcAlpha.AcquireReadAccess() :
+            ScopedBitmapReadAccess pAlphaReadAccess( rBitmap.IsTransparent() ? 
+                                                     aSrcAlpha.AcquireReadAccess() : 
                                                      (BitmapReadAccess*)NULL,
                                                      aSrcAlpha );
 
@@ -286,7 +286,7 @@ namespace vclcanvas
                 (pAlphaReadAccess.get() == NULL && rBitmap.IsTransparent()) )
             {
                 // TODO(E2): Error handling!
-                ENSURE_OR_THROW( false,
+                ENSURE_OR_THROW( false, 
                                   "transformBitmap(): could not access source bitmap" );
             }
 
@@ -317,7 +317,7 @@ namespace vclcanvas
             }
             // else: mapping table is not used
 
-            const Size aDestBmpSize( ::basegfx::fround( aDestRect.getWidth() ),
+            const Size aDestBmpSize( ::basegfx::fround( aDestRect.getWidth() ), 
                                      ::basegfx::fround( aDestRect.getHeight() ) );
 
             if( aDestBmpSize.Width() == 0 || aDestBmpSize.Height() == 0 )
@@ -337,7 +337,7 @@ namespace vclcanvas
                 ScopedBitmapWriteAccess pAlphaWriteAccess( aDstAlpha.AcquireWriteAccess(),
                                                            aDstAlpha );
 
-
+                
                 if( pWriteAccess.get() != NULL &&
                     pAlphaWriteAccess.get() != NULL &&
                     rTransform.isInvertible() )
@@ -347,8 +347,8 @@ namespace vclcanvas
                     // source
                     ::basegfx::B2DHomMatrix aTransform( aLocalTransform );
                     aTransform.invert();
-
-                    // for the time being, always read as ARGB
+                
+                    // for the time being, always read as ARGB 
                     for( int y=0; y<aDestBmpSize.Height(); ++y )
                     {
                         if( bModulateColors )
@@ -383,36 +383,36 @@ namespace vclcanvas
                                         // nAlphaModulation. This is a
                                         // little bit verbose, formula
                                         // is 255 - (255-pixAlpha)*nAlphaModulation
-                                        // (invert 'alpha' pixel value,
-                                        // to get the standard alpha
+                                        // (invert 'alpha' pixel value, 
+                                        // to get the standard alpha 
                                         // channel behaviour)
-                                        pAlphaWriteAccess->SetPixel( y, x,
-                                                                     BitmapColor(
-                                                                         255U -
+                                        pAlphaWriteAccess->SetPixel( y, x, 
+                                                                     BitmapColor( 
+                                                                         255U - 
                                                                          static_cast<BYTE>(
                                                                              nAlphaModulation*
                                                                              (255U
-                                                                              - aAlphaMap[ pAlphaReadAccess->GetPixel(
+                                                                              - aAlphaMap[ pAlphaReadAccess->GetPixel( 
                                                                                                nSrcY,
                                                                                                nSrcX ).GetIndex() ] ) + .5 ) ) );
 
                                         BitmapColor aColor( pReadAccess->GetPixel( nSrcY,
                                                                                    nSrcX ) );
 
-                                        aColor.SetRed(
+                                        aColor.SetRed( 
                                             static_cast<BYTE>(
                                                 nRedModulation *
                                                 aColor.GetRed() + .5 ));
-                                        aColor.SetGreen(
+                                        aColor.SetGreen( 
                                             static_cast<BYTE>(
                                                 nGreenModulation *
                                                 aColor.GetGreen() + .5 ));
-                                        aColor.SetBlue(
+                                        aColor.SetBlue( 
                                             static_cast<BYTE>(
                                                 nBlueModulation *
                                                 aColor.GetBlue() + .5 ));
 
-                                        pWriteAccess->SetPixel( y, x,
+                                        pWriteAccess->SetPixel( y, x, 
                                                                 aColor );
                                     }
                                 }
@@ -437,12 +437,12 @@ namespace vclcanvas
                                         // nAlphaModulation. This is a
                                         // little bit verbose, formula
                                         // is 255 - 255*nAlphaModulation
-                                        // (invert 'alpha' pixel value,
-                                        // to get the standard alpha
+                                        // (invert 'alpha' pixel value, 
+                                        // to get the standard alpha 
                                         // channel behaviour)
-                                        pAlphaWriteAccess->SetPixel( y, x,
-                                                                     BitmapColor(
-                                                                         255U -
+                                        pAlphaWriteAccess->SetPixel( y, x, 
+                                                                     BitmapColor( 
+                                                                         255U - 
                                                                          static_cast<BYTE>(
                                                                              nAlphaModulation*255.0
                                                                              + .5 ) ) );
@@ -450,20 +450,20 @@ namespace vclcanvas
                                         BitmapColor aColor( pReadAccess->GetPixel( nSrcY,
                                                                                    nSrcX ) );
 
-                                        aColor.SetRed(
+                                        aColor.SetRed( 
                                             static_cast<BYTE>(
                                                 nRedModulation *
                                                 aColor.GetRed() + .5 ));
-                                        aColor.SetGreen(
+                                        aColor.SetGreen( 
                                             static_cast<BYTE>(
                                                 nGreenModulation *
                                                 aColor.GetGreen() + .5 ));
-                                        aColor.SetBlue(
+                                        aColor.SetBlue( 
                                             static_cast<BYTE>(
                                                 nBlueModulation *
                                                 aColor.GetBlue() + .5 ));
 
-                                        pWriteAccess->SetPixel( y, x,
+                                        pWriteAccess->SetPixel( y, x, 
                                                                 aColor );
                                     }
                                 }
@@ -490,8 +490,8 @@ namespace vclcanvas
                                     }
                                     else
                                     {
-                                        pAlphaWriteAccess->SetPixel( y, x,
-                                                                     aAlphaMap[
+                                        pAlphaWriteAccess->SetPixel( y, x, 
+                                                                     aAlphaMap[ 
                                                                          pAlphaReadAccess->GetPixel( nSrcY,
                                                                                                      nSrcX ) ] );
 
@@ -530,7 +530,7 @@ namespace vclcanvas
                 else
                 {
                     // TODO(E2): Error handling!
-                    ENSURE_OR_THROW( false,
+                    ENSURE_OR_THROW( false, 
                                       "transformBitmap(): could not access bitmap" );
                 }
             }
diff --git a/canvas/source/vcl/impltools.hxx b/canvas/source/vcl/impltools.hxx
index 8bedfc6de340..7457b3b390b6 100644
--- a/canvas/source/vcl/impltools.hxx
+++ b/canvas/source/vcl/impltools.hxx
@@ -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
@@ -47,7 +47,7 @@ class OutputDevice;
 class Point;
 class Size;
 
-namespace basegfx
+namespace basegfx 
 {
     namespace matrix
     {
@@ -63,26 +63,26 @@ namespace basegfx
     }
 }
 
-namespace com { namespace sun { namespace star { namespace awt
+namespace com { namespace sun { namespace star { namespace awt 
 {
     struct Point;
     struct Size;
     struct Rectangle;
 } } } }
 
-namespace com { namespace sun { namespace star { namespace drawing
+namespace com { namespace sun { namespace star { namespace drawing 
 {
     struct HomogenMatrix3;
 } } } }
 
-namespace com { namespace sun { namespace star { namespace geometry
+namespace com { namespace sun { namespace star { namespace geometry 
 {
     struct RealPoint2D;
     struct RealSize2D;
     struct RealRectangle2D;
 } } } }
 
-namespace com { namespace sun { namespace star { namespace rendering
+namespace com { namespace sun { namespace star { namespace rendering 
 {
     struct RenderState;
     struct ViewState;
@@ -97,18 +97,18 @@ namespace vclcanvas
     namespace tools
     {
         ::BitmapEx
-        bitmapExFromXBitmap( const ::com::sun::star::uno::Reference<
+        bitmapExFromXBitmap( const ::com::sun::star::uno::Reference< 
                              ::com::sun::star::rendering::XBitmap >& );
 
         /** Setup VCL font and output position
 
             @returns false, if no text output should happen
          */
-        bool setupFontTransform( ::Point&                                                   o_rPoint,
-                                 ::Font&                                                    io_rVCLFont,
-                                 const ::com::sun::star::rendering::ViewState&      viewState,
-                                 const ::com::sun::star::rendering::RenderState&    renderState,
-                                 ::OutputDevice&                                            rOutDev );
+        bool setupFontTransform( ::Point&													o_rPoint,
+                                 ::Font& 													io_rVCLFont, 
+                                 const ::com::sun::star::rendering::ViewState& 		viewState,
+                                 const ::com::sun::star::rendering::RenderState& 	renderState,
+                                 ::OutputDevice&											rOutDev );
 
         /** Predicate, to determine whether polygon is actually an axis-aligned rectangle
 
@@ -121,19 +121,19 @@ namespace vclcanvas
         class LocalGuard
         {
         public:
-            LocalGuard() :
+            LocalGuard() : 
                 aGuard( Application::GetSolarMutex() )
             {
             }
 
             /// To be compatible with CanvasBase mutex concept
-            LocalGuard( const ::osl::Mutex& ) :
+            LocalGuard( const ::osl::Mutex& ) : 
                 aGuard( Application::GetSolarMutex() )
             {
             }
 
         private:
-            ::vos::OGuard aGuard;
+            ::vos::OGuard aGuard;        
         };
 
         class OutDevStateKeeper
@@ -152,7 +152,7 @@ namespace vclcanvas
             {
                 init();
             }
-
+ 
             ~OutDevStateKeeper()
             {
                 if( mpOutDev )
@@ -172,17 +172,17 @@ namespace vclcanvas
                 }
             }
 
-            OutputDevice*   mpOutDev;
-            const bool      mbMappingWasEnabled;
+            OutputDevice*	mpOutDev;
+            const bool		mbMappingWasEnabled;
         };
 
-        ::Point mapRealPoint2D( const ::com::sun::star::geometry::RealPoint2D&  rPoint,
-                                const ::com::sun::star::rendering::ViewState&   rViewState,
-                                const ::com::sun::star::rendering::RenderState& rRenderState );
+        ::Point mapRealPoint2D( const ::com::sun::star::geometry::RealPoint2D& 	rPoint,
+                                const ::com::sun::star::rendering::ViewState& 	rViewState,
+                                const ::com::sun::star::rendering::RenderState&	rRenderState );
 
-        ::PolyPolygon mapPolyPolygon( const ::basegfx::B2DPolyPolygon&                          rPoly,
-                                      const ::com::sun::star::rendering::ViewState&     rViewState,
-                                      const ::com::sun::star::rendering::RenderState&   rRenderState );
+        ::PolyPolygon mapPolyPolygon( const ::basegfx::B2DPolyPolygon& 							rPoly,
+                                      const ::com::sun::star::rendering::ViewState& 	rViewState,
+                                      const ::com::sun::star::rendering::RenderState&	rRenderState );
 
         enum ModulationMode
         {
@@ -190,10 +190,10 @@ namespace vclcanvas
             MODULATE_WITH_DEVICECOLOR
         };
 
-        ::BitmapEx transformBitmap( const BitmapEx&                                     rBitmap,
-                                    const ::basegfx::B2DHomMatrix&                      rTransform,
-                                    const ::com::sun::star::uno::Sequence< double >&    rDeviceColor,
-                                    ModulationMode                                      eModulationMode );
+        ::BitmapEx transformBitmap( const BitmapEx& 									rBitmap,
+                                    const ::basegfx::B2DHomMatrix& 						rTransform,
+                                    const ::com::sun::star::uno::Sequence< double >&	rDeviceColor,
+                                    ModulationMode										eModulationMode );
 
     }
 }
diff --git a/canvas/source/vcl/outdevprovider.hxx b/canvas/source/vcl/outdevprovider.hxx
index dd5f870c7d9c..e0ec2c3bc42b 100644
--- a/canvas/source/vcl/outdevprovider.hxx
+++ b/canvas/source/vcl/outdevprovider.hxx
@@ -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
@@ -38,7 +38,7 @@ namespace vclcanvas
 {
     /* Definition of OutDevProvider interface */
 
-    /** Implementers of this interface provide the CanvasHelper
+    /** Implementers of this interface provide the CanvasHelper 
         with its OutputDevice.
 
         This additional level of indirection was necessary, as the
@@ -51,7 +51,7 @@ namespace vclcanvas
     public:
         virtual ~OutDevProvider() {}
 
-        virtual OutputDevice&       getOutDev() = 0;
+        virtual OutputDevice& 		getOutDev() = 0;
         virtual const OutputDevice& getOutDev() const = 0;
     };
 
diff --git a/canvas/source/vcl/repainttarget.hxx b/canvas/source/vcl/repainttarget.hxx
index ce2037bf5b67..58a943051247 100644
--- a/canvas/source/vcl/repainttarget.hxx
+++ b/canvas/source/vcl/repainttarget.hxx
@@ -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
@@ -39,7 +39,7 @@ class GraphicAttr;
 namespace vclcanvas
 {
     /* Definition of RepaintTarget interface */
-
+    
     /** Target interface for XCachedPrimitive implementations
 
         This interface must be implemented on all canvas
@@ -54,7 +54,7 @@ namespace vclcanvas
         virtual bool repaint( const GraphicObjectSharedPtr&                   rGrf,
                               const ::com::sun::star::rendering::ViewState&   viewState,
                               const ::com::sun::star::rendering::RenderState& renderState,
-                              const ::Point&                                  rPt,
+                              const ::Point&                                  rPt, 
                               const ::Size&                                   rSz,
                               const GraphicAttr&                              rAttr ) const = 0;
     };
diff --git a/canvas/source/vcl/services.cxx b/canvas/source/vcl/services.cxx
index e8cd2379a38f..e0a6d3f9c156 100644
--- a/canvas/source/vcl/services.cxx
+++ b/canvas/source/vcl/services.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
diff --git a/canvas/source/vcl/sprite.hxx b/canvas/source/vcl/sprite.hxx
index 29ff80239e02..75f6701dd890 100644
--- a/canvas/source/vcl/sprite.hxx
+++ b/canvas/source/vcl/sprite.hxx
@@ -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
diff --git a/canvas/source/vcl/spritecanvas.cxx b/canvas/source/vcl/spritecanvas.cxx
index c08529d3cb35..02a8d91da6fa 100644
--- a/canvas/source/vcl/spritecanvas.cxx
+++ b/canvas/source/vcl/spritecanvas.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
@@ -64,7 +64,7 @@ namespace vclcanvas
     void SpriteCanvas::initialize()
     {
         tools::LocalGuard aGuard;
-
+  
         // #i64742# Only call initialize when not in probe mode
         if( maArguments.getLength() == 0 )
             return;
@@ -80,7 +80,7 @@ namespace vclcanvas
              boost::bind(&SpriteCanvasHelper::enableUnsafeScrolling,
                          boost::ref(maCanvasHelper),
                          _1))
-            ("SpriteBounds",
+            ("SpriteBounds", 
              boost::bind(&SpriteCanvasHelper::isSpriteBounds,
                          boost::ref(maCanvasHelper)),
              boost::bind(&SpriteCanvasHelper::enableSpriteBounds,
@@ -89,7 +89,7 @@ namespace vclcanvas
 
         VERBOSE_TRACE( "VCLSpriteCanvas::initialize called" );
 
-        ENSURE_ARG_OR_THROW( maArguments.getLength() >= 1,
+        ENSURE_ARG_OR_THROW( maArguments.getLength() >= 1, 
                              "VCLSpriteCanvas::initialize: wrong number of arguments" );
 
         /* maArguments:
@@ -102,21 +102,21 @@ namespace vclcanvas
          */
         ENSURE_ARG_OR_THROW( maArguments.getLength() >= 4 &&
                              maArguments[0].getValueTypeClass() == uno::TypeClass_HYPER &&
-                             maArguments[4].getValueTypeClass() == uno::TypeClass_INTERFACE,
+                             maArguments[4].getValueTypeClass() == uno::TypeClass_INTERFACE, 
                              "VCLSpriteCanvas::initialize: wrong number of arguments, or wrong types" );
-
+        
         uno::Reference< awt::XWindow > xParentWindow;
         maArguments[4] >>= xParentWindow;
-
+        
         OutDevProviderSharedPtr pOutDev( new WindowOutDevHolder(xParentWindow) );
-
-        // setup helper
+        
+        // setup helper    
         maDeviceHelper.init( pOutDev );
-        setWindow(uno::Reference<awt::XWindow2>(xParentWindow, uno::UNO_QUERY_THROW));
+        setWindow(uno::Reference<awt::XWindow2>(xParentWindow, uno::UNO_QUERY_THROW)); 
         maCanvasHelper.init( maDeviceHelper.getBackBuffer(),
                              *this,
                              maRedrawManager,
-                             false,   // no OutDev state preservation
+                             false,   // no OutDev state preservation  
                              false ); // no alpha on surface
 
         maArguments.realloc(0);
@@ -151,7 +151,7 @@ namespace vclcanvas
     sal_Bool SAL_CALL SpriteCanvas::updateScreen( sal_Bool bUpdateAll ) throw (uno::RuntimeException)
     {
         tools::LocalGuard aGuard;
-
+        
         // avoid repaints on hidden window (hidden: not mapped to
         // screen). Return failure, since the screen really has _not_
         // been updated (caller should try again later)
@@ -164,12 +164,12 @@ namespace vclcanvas
         return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( SPRITECANVAS_SERVICE_NAME ) );
     }
 
-    bool SpriteCanvas::repaint( const GraphicObjectSharedPtr&   rGrf,
+    bool SpriteCanvas::repaint( const GraphicObjectSharedPtr&	rGrf,
                                 const rendering::ViewState&     viewState,
                                 const rendering::RenderState&   renderState,
-                                const ::Point&                  rPt,
-                                const ::Size&                   rSz,
-                                const GraphicAttr&              rAttr ) const
+                                const ::Point& 					rPt, 
+                                const ::Size& 					rSz,
+                                const GraphicAttr&				rAttr ) const
     {
         tools::LocalGuard aGuard;
 
diff --git a/canvas/source/vcl/spritecanvas.hxx b/canvas/source/vcl/spritecanvas.hxx
index db4b05ddb9b2..c637241d0095 100644
--- a/canvas/source/vcl/spritecanvas.hxx
+++ b/canvas/source/vcl/spritecanvas.hxx
@@ -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
@@ -66,11 +66,11 @@ namespace vclcanvas
                                               ::com::sun::star::awt::XWindowListener,
                                               ::com::sun::star::util::XUpdatable,
                                               ::com::sun::star::beans::XPropertySet,
-                                              ::com::sun::star::lang::XServiceName >    WindowGraphicDeviceBase_Base;
+                                              ::com::sun::star::lang::XServiceName >	WindowGraphicDeviceBase_Base;
     typedef ::canvas::BufferedGraphicDeviceBase< ::canvas::BaseMutexHelper< WindowGraphicDeviceBase_Base >,
-                                                 SpriteDeviceHelper,
+                                                 SpriteDeviceHelper, 
                                                  tools::LocalGuard,
-                                                 ::cppu::OWeakObject >  SpriteCanvasBase_Base;
+                                                 ::cppu::OWeakObject > 	SpriteCanvasBase_Base;
 
     /** Mixin SpriteSurface
 
@@ -95,9 +95,9 @@ namespace vclcanvas
     };
 
     typedef ::canvas::SpriteCanvasBase< SpriteCanvasBaseSpriteSurface_Base,
-                                        SpriteCanvasHelper,
+                                        SpriteCanvasHelper, 
                                         tools::LocalGuard,
-                                        ::cppu::OWeakObject >           SpriteCanvasBaseT;
+                                        ::cppu::OWeakObject >			SpriteCanvasBaseT;
 
     /** Product of this component's factory.
 
@@ -112,9 +112,9 @@ namespace vclcanvas
                          public RepaintTarget
     {
     public:
-        SpriteCanvas( const ::com::sun::star::uno::Sequence<
+        SpriteCanvas( const ::com::sun::star::uno::Sequence< 
                             ::com::sun::star::uno::Any >&               aArguments,
-                      const ::com::sun::star::uno::Reference<
+                      const ::com::sun::star::uno::Reference< 
                             ::com::sun::star::uno::XComponentContext >& rxContext );
 
         void initialize();
@@ -134,7 +134,7 @@ namespace vclcanvas
         //                                    Classname     Base doing refcounting        Base implementing the XComponent interface
         //                                       |                 |                            |
         //                                       V                 V                            V
-        DECLARE_UNO3_XCOMPONENT_AGG_DEFAULTS( SpriteCanvas, WindowGraphicDeviceBase_Base, ::cppu::WeakComponentImplHelperBase );
+        DECLARE_UNO3_XCOMPONENT_AGG_DEFAULTS( SpriteCanvas, WindowGraphicDeviceBase_Base, ::cppu::WeakComponentImplHelperBase ); 
 
         // XBufferController (partial)
         virtual ::sal_Bool SAL_CALL showBuffer( ::sal_Bool bUpdateAll ) throw (::com::sun::star::uno::RuntimeException);
@@ -150,7 +150,7 @@ namespace vclcanvas
         virtual bool repaint( const GraphicObjectSharedPtr&                   rGrf,
                               const ::com::sun::star::rendering::ViewState&   viewState,
                               const ::com::sun::star::rendering::RenderState& renderState,
-                              const ::Point&                                  rPt,
+                              const ::Point&                                  rPt, 
                               const ::Size&                                   rSz,
                               const GraphicAttr&                              rAttr ) const;
 
diff --git a/canvas/source/vcl/spritecanvashelper.cxx b/canvas/source/vcl/spritecanvashelper.cxx
index f2327a29c480..c89e31eac008 100644
--- a/canvas/source/vcl/spritecanvashelper.cxx
+++ b/canvas/source/vcl/spritecanvashelper.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
@@ -63,24 +63,24 @@ namespace vclcanvas
          */
         void spriteRedraw( OutputDevice&                      rOutDev,
                            const ::canvas::Sprite::Reference& rSprite )
-        {
+        {            
             // downcast to derived vclcanvas::Sprite interface, which
             // provides the actual redraw methods.
             ::boost::polymorphic_downcast< Sprite* >(rSprite.get())->redraw(rOutDev,
                                                                             true);
         }
 
-        double calcNumPixel( const ::canvas::Sprite::Reference& rSprite )
+        double calcNumPixel( const ::canvas::Sprite::Reference&	rSprite )
         {
-            const ::basegfx::B2DSize& rSize(
+            const ::basegfx::B2DSize& rSize( 
                 ::boost::polymorphic_downcast< Sprite* >(rSprite.get())->getSizePixel() );
 
             return rSize.getX() * rSize.getY();
         }
 
-        void repaintBackground( OutputDevice&               rOutDev,
-                                OutputDevice&               rBackBuffer,
-                                const ::basegfx::B2DRange&  rArea )
+        void repaintBackground( OutputDevice& 				rOutDev,
+                                OutputDevice& 				rBackBuffer,
+                                const ::basegfx::B2DRange&	rArea )
         {
             const ::Point& rPos( ::vcl::unotools::pointFromB2DPoint( rArea.getMinimum()) );
             const ::Size& rSize( ::vcl::unotools::sizeFromB2DSize( rArea.getRange()) );
@@ -92,7 +92,7 @@ namespace vclcanvas
                                      OutputDevice&                      rOutDev,
                                      const ::basegfx::B2IRange&         rArea )
         {
-            const Rectangle& rRequestedArea(
+            const Rectangle& rRequestedArea( 
                 ::vcl::unotools::rectangleFromB2IRectangle( rArea ) );
 
             // clip output to actual update region (otherwise a)
@@ -132,8 +132,8 @@ namespace vclcanvas
             adapted size.
          */
         void spriteRedrawStub2( OutputDevice&                       rOutDev,
-                                const ::basegfx::B2DPoint&          rOutPos,
-                                const ::canvas::Sprite::Reference&  rSprite )
+                                const ::basegfx::B2DPoint& 			rOutPos,
+                                const ::canvas::Sprite::Reference&	rSprite )
         {
             if( rSprite.is() )
             {
@@ -165,11 +165,11 @@ namespace vclcanvas
                     rSprite.get() )->redraw( rOutDev,
                                              false );
             }
-        }
+        } 
 
-        void renderInfoText( OutputDevice&          rOutDev,
+        void renderInfoText( OutputDevice& 			rOutDev,
                              const ::rtl::OUString& rStr,
-                             const Point&           rPos )
+                             const Point&		    rPos )
         {
             Font aVCLFont;
             aVCLFont.SetHeight( 20 );
@@ -199,7 +199,7 @@ namespace vclcanvas
 #endif
     }
 
-    void SpriteCanvasHelper::init( const OutDevProviderSharedPtr& rOutDev,
+    void SpriteCanvasHelper::init( const OutDevProviderSharedPtr& rOutDev, 
                                    SpriteCanvas&                  rOwningSpriteCanvas,
                                    ::canvas::SpriteRedrawManager& rManager,
                                    bool                           bProtect,
@@ -220,14 +220,14 @@ namespace vclcanvas
         CanvasHelper::disposing();
     }
 
-    uno::Reference< rendering::XAnimatedSprite > SpriteCanvasHelper::createSpriteFromAnimation(
+    uno::Reference< rendering::XAnimatedSprite > SpriteCanvasHelper::createSpriteFromAnimation( 
         const uno::Reference< rendering::XAnimation >&  )
     {
         return uno::Reference< rendering::XAnimatedSprite >();
     }
 
-    uno::Reference< rendering::XAnimatedSprite > SpriteCanvasHelper::createSpriteFromBitmaps(
-        const uno::Sequence< uno::Reference< rendering::XBitmap > >& ,
+    uno::Reference< rendering::XAnimatedSprite > SpriteCanvasHelper::createSpriteFromBitmaps( 
+        const uno::Sequence< uno::Reference< rendering::XBitmap > >& , 
         sal_Int8                                                      )
     {
         return uno::Reference< rendering::XAnimatedSprite >();
@@ -239,7 +239,7 @@ namespace vclcanvas
             return uno::Reference< rendering::XCustomSprite >(); // we're disposed
 
         return uno::Reference< rendering::XCustomSprite >(
-            new CanvasCustomSprite( spriteSize,
+            new CanvasCustomSprite( spriteSize, 
                                     *mpDevice,
                                     mpOwningSpriteCanvas,
                                     mpOwningSpriteCanvas->getFrontBuffer(),
@@ -252,9 +252,9 @@ namespace vclcanvas
     }
 
     sal_Bool SpriteCanvasHelper::updateScreen( sal_Bool bUpdateAll,
-                                               bool&    io_bSurfaceDirty )
+                                               bool&	io_bSurfaceDirty )
     {
-        if( !mpRedrawManager ||
+        if( !mpRedrawManager || 
             !mpOwningSpriteCanvas ||
             !mpOwningSpriteCanvas->getFrontBuffer() ||
             !mpOwningSpriteCanvas->getBackBuffer() )
@@ -265,15 +265,15 @@ namespace vclcanvas
         // commit to backbuffer
         flush();
 
-        OutputDevice&       rOutDev( mpOwningSpriteCanvas->getFrontBuffer()->getOutDev() );
+        OutputDevice& 		rOutDev( mpOwningSpriteCanvas->getFrontBuffer()->getOutDev() );
         BackBufferSharedPtr pBackBuffer( mpOwningSpriteCanvas->getBackBuffer() );
-        OutputDevice&       rBackOutDev( pBackBuffer->getOutDev() );
+        OutputDevice& 		rBackOutDev( pBackBuffer->getOutDev() );
 
         // actual OutputDevice is a shared resource - restore its
         // state when done.
         tools::OutDevStateKeeper aStateKeeper( rOutDev );
 
-        const Size  aOutDevSize( rBackOutDev.GetOutputSizePixel() );
+        const Size 	aOutDevSize( rBackOutDev.GetOutputSizePixel() );
         const Point aEmptyPoint(0,0);
 
         Window* pTargetWindow = NULL;
@@ -319,13 +319,13 @@ namespace vclcanvas
 
             maVDev->SetOutputSizePixel( aOutDevSize );
             maVDev->EnableMapMode( FALSE );
-            maVDev->DrawOutDev( aEmptyPoint, aOutDevSize,
-                                aEmptyPoint, aOutDevSize,
+            maVDev->DrawOutDev( aEmptyPoint, aOutDevSize, 
+                                aEmptyPoint, aOutDevSize, 
                                 rBackOutDev );
 
             // repaint all active sprites on top of background into
             // VDev.
-            mpRedrawManager->forEachSprite(
+            mpRedrawManager->forEachSprite( 
                 ::boost::bind(
                     &spriteRedraw,
                     ::boost::ref( maVDev.get() ),
@@ -334,9 +334,9 @@ namespace vclcanvas
             // flush to screen
             rOutDev.EnableMapMode( FALSE );
             rOutDev.SetClipRegion();
-            rOutDev.DrawOutDev( aEmptyPoint, aOutDevSize,
-                                aEmptyPoint, aOutDevSize,
-                                *maVDev );
+            rOutDev.DrawOutDev( aEmptyPoint, aOutDevSize, 
+                                aEmptyPoint, aOutDevSize, 
+                                *maVDev );        
         }
 
         // change record vector must be cleared, for the next turn of
@@ -354,9 +354,9 @@ namespace vclcanvas
 
 #if defined(VERBOSE) && OSL_DEBUG_LEVEL > 0
         static ::canvas::tools::ElapsedTime aElapsedTime;
-
+        
         // log time immediately after surface flip
-        OSL_TRACE( "SpriteCanvasHelper::updateScreen(): flip done at %f",
+        OSL_TRACE( "SpriteCanvasHelper::updateScreen(): flip done at %f", 
                    aElapsedTime.getElapsedTime() );
 #endif
 
@@ -380,15 +380,15 @@ namespace vclcanvas
                          mpOwningSpriteCanvas->getFrontBuffer(),
                          "SpriteCanvasHelper::backgroundPaint(): NULL device pointer " );
 
-        OutputDevice&       rOutDev( mpOwningSpriteCanvas->getFrontBuffer()->getOutDev() );
+        OutputDevice& 		rOutDev( mpOwningSpriteCanvas->getFrontBuffer()->getOutDev() );
         BackBufferSharedPtr pBackBuffer( mpOwningSpriteCanvas->getBackBuffer() );
-        OutputDevice&       rBackOutDev( pBackBuffer->getOutDev() );
+        OutputDevice& 		rBackOutDev( pBackBuffer->getOutDev() );
 
         repaintBackground( rOutDev, rBackOutDev, rUpdateRect );
     }
 
-    void SpriteCanvasHelper::scrollUpdate( const ::basegfx::B2DRange&                       rMoveStart,
-                                           const ::basegfx::B2DRange&                       rMoveEnd,
+    void SpriteCanvasHelper::scrollUpdate( const ::basegfx::B2DRange& 						rMoveStart, 
+                                           const ::basegfx::B2DRange& 						rMoveEnd,
                                            const ::canvas::SpriteRedrawManager::UpdateArea& rUpdateArea )
     {
         ENSURE_OR_THROW( mpOwningSpriteCanvas &&
@@ -396,9 +396,9 @@ namespace vclcanvas
                          mpOwningSpriteCanvas->getFrontBuffer(),
                          "SpriteCanvasHelper::scrollUpdate(): NULL device pointer " );
 
-        OutputDevice&       rOutDev( mpOwningSpriteCanvas->getFrontBuffer()->getOutDev() );
+        OutputDevice& 		rOutDev( mpOwningSpriteCanvas->getFrontBuffer()->getOutDev() );
         BackBufferSharedPtr pBackBuffer( mpOwningSpriteCanvas->getBackBuffer() );
-        OutputDevice&       rBackOutDev( pBackBuffer->getOutDev() );
+        OutputDevice& 		rBackOutDev( pBackBuffer->getOutDev() );
 
         const Size&                rTargetSizePixel( rOutDev.GetOutputSizePixel() );
         const ::basegfx::B2IRange  aOutputBounds( 0,0,
@@ -410,7 +410,7 @@ namespace vclcanvas
         // the destination area: otherwise, the next scroll update
         // would copy pixel that are not supposed to be part of
         // the sprite.
-        ::basegfx::B2IRange aSourceRect(
+        ::basegfx::B2IRange aSourceRect( 
             ::canvas::tools::spritePixelAreaFromB2DRange( rMoveStart ) );
         const ::basegfx::B2IRange& rDestRect(
             ::canvas::tools::spritePixelAreaFromB2DRange( rMoveEnd ) );
@@ -439,7 +439,7 @@ namespace vclcanvas
             // repaint all affected sprites directly to output device
             ::std::for_each( rUpdateArea.maComponentList.begin(),
                              rUpdateArea.maComponentList.end(),
-                             ::boost::bind(
+                             ::boost::bind( 
                                  &spriteRedrawStub3,
                                  ::boost::ref( rOutDev ),
                                  _1 ) );
@@ -453,11 +453,11 @@ namespace vclcanvas
                               ::Size( static_cast<sal_Int32>(aSourceRect.getRange().getX()),
                                       static_cast<sal_Int32>(aSourceRect.getRange().getY()) ) );
 
-            const ::canvas::SpriteRedrawManager::SpriteConnectedRanges::ComponentListType::const_iterator
+            const ::canvas::SpriteRedrawManager::SpriteConnectedRanges::ComponentListType::const_iterator 
                 aFirst( rUpdateArea.maComponentList.begin() );
-            ::canvas::SpriteRedrawManager::SpriteConnectedRanges::ComponentListType::const_iterator
+            ::canvas::SpriteRedrawManager::SpriteConnectedRanges::ComponentListType::const_iterator 
                   aSecond( aFirst ); ++aSecond;
-
+        
             ENSURE_OR_THROW( aFirst->second.getSprite().is(),
                               "VCLCanvas::scrollUpdate(): no sprite" );
 
@@ -488,7 +488,7 @@ namespace vclcanvas
                                         ::boost::ref(rBackOutDev),
                                         _1 ) );
     }
-
+    
     void SpriteCanvasHelper::opaqueUpdate( const ::basegfx::B2DRange&                          rTotalArea,
                                            const ::std::vector< ::canvas::Sprite::Reference >& rSortedUpdateSprites )
     {
@@ -511,12 +511,12 @@ namespace vclcanvas
         // repaint all affected sprites directly to output device
         ::std::for_each( rSortedUpdateSprites.begin(),
                          rSortedUpdateSprites.end(),
-                         ::boost::bind(
+                         ::boost::bind( 
                              &spriteRedrawStub,
                              ::boost::ref( rOutDev ),
                              _1 ) );
     }
-
+    
     void SpriteCanvasHelper::genericUpdate( const ::basegfx::B2DRange&                          rRequestedArea,
                                             const ::std::vector< ::canvas::Sprite::Reference >& rSortedUpdateSprites )
     {
@@ -525,9 +525,9 @@ namespace vclcanvas
                          mpOwningSpriteCanvas->getFrontBuffer(),
                          "SpriteCanvasHelper::genericUpdate(): NULL device pointer " );
 
-        OutputDevice&       rOutDev( mpOwningSpriteCanvas->getFrontBuffer()->getOutDev() );
+        OutputDevice& 		rOutDev( mpOwningSpriteCanvas->getFrontBuffer()->getOutDev() );
         BackBufferSharedPtr pBackBuffer( mpOwningSpriteCanvas->getBackBuffer() );
-        OutputDevice&       rBackOutDev( pBackBuffer->getOutDev() );
+        OutputDevice& 		rBackOutDev( pBackBuffer->getOutDev() );
 
         // limit size of update VDev to target outdev's size
         const Size& rTargetSizePixel( rOutDev.GetOutputSizePixel() );
@@ -536,7 +536,7 @@ namespace vclcanvas
         // a fraction of a sprite pixel...  Clip position at origin,
         // otherwise, truncation of size below might leave visible
         // areas uncovered by VDev.
-        const ::Point aOutputPosition(
+        const ::Point aOutputPosition( 
             ::std::max( sal_Int32( 0 ),
                         static_cast< sal_Int32 >(rRequestedArea.getMinX()) ),
             ::std::max( sal_Int32( 0 ),
@@ -545,7 +545,7 @@ namespace vclcanvas
         // fraction of a sprite pixel... Limit coverage of VDev to
         // output device's area (i.e. not only to total size, but to
         // cover _only_ the visible parts).
-        const ::Size aOutputSize(
+        const ::Size aOutputSize( 
             ::std::max( sal_Int32( 0 ),
                         ::std::min( static_cast< sal_Int32 >(rTargetSizePixel.Width() - aOutputPosition.X()),
                                     ::canvas::tools::roundUp( rRequestedArea.getMaxX() - aOutputPosition.X() ))),
@@ -567,7 +567,7 @@ namespace vclcanvas
         // repaint.
         if( aCurrOutputSize.Width() < aOutputSize.Width() ||
             aCurrOutputSize.Height() < aOutputSize.Height() )
-        {
+        {           
             // TODO(P1): Come up with a clever tactic to reduce maVDev
             // from time to time. Reduction with threshold (say, if
             // maVDev is more than twice too large) is not wise, as
@@ -579,10 +579,10 @@ namespace vclcanvas
         // paint background
         maVDev->EnableMapMode( FALSE );
         maVDev->SetClipRegion();
-        maVDev->DrawOutDev( aEmptyPoint, aOutputSize,
-                            aOutputPosition, aOutputSize,
+        maVDev->DrawOutDev( aEmptyPoint, aOutputSize, 
+                            aOutputPosition, aOutputSize, 
                             rBackOutDev );
-
+        
         // repaint all affected sprites on top of background into
         // VDev.
         ::std::for_each( rSortedUpdateSprites.begin(),
@@ -595,16 +595,16 @@ namespace vclcanvas
 
         // flush to screen
         rOutDev.EnableMapMode( FALSE );
-        rOutDev.DrawOutDev( aOutputPosition, aOutputSize,
-                            aEmptyPoint, aOutputSize,
-                            *maVDev );
+        rOutDev.DrawOutDev( aOutputPosition, aOutputSize, 
+                            aEmptyPoint, aOutputSize, 
+                            *maVDev );        
     }
-
+    
     void SpriteCanvasHelper::renderFrameCounter( OutputDevice& rOutDev )
     {
         const double denominator( maLastUpdate.getElapsedTime() );
         maLastUpdate.reset();
-
+                        
         ::rtl::OUString text( ::rtl::math::doubleToUString( denominator == 0.0 ? 100.0 : 1.0/denominator,
                                                             rtl_math_StringFormat_F,
                                                             2,'.',NULL,' ') );
@@ -616,7 +616,7 @@ namespace vclcanvas
         text += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM (" fps"));
 
         renderInfoText( rOutDev,
-                        text,
+                        text, 
                         Point(0, 0) );
     }
 
@@ -655,19 +655,19 @@ namespace vclcanvas
             sal_Int32 nCount(0);
 
             mpRedrawManager->forEachSprite( makeAdder(nCount,sal_Int32(1)) );
-            ::rtl::OUString text(
-                ::rtl::OUString::valueOf(
+            ::rtl::OUString text( 
+                ::rtl::OUString::valueOf( 
                     // disambiguate overload...
                     static_cast<sal_Int64>(nCount) ) );
 
             // pad with leading space
             while( text.getLength() < 3 )
                 text = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM (" ")) + text;
-
+            
             text = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM ("Sprites: ")) + text;
-
+            
             renderInfoText( rOutDev,
-                            text,
+                            text, 
                             Point(0, 30) );
         }
     }
@@ -687,31 +687,31 @@ namespace vclcanvas
                                                 ::boost::bind(
                                                     &calcNumPixel,
                                                     _1 ) ) );
-
+            
             static const int NUM_VIRDEV(2);
             static const int BYTES_PER_PIXEL(3);
-
+            
             const Size& rVDevSize( maVDev->GetOutputSizePixel() );
             const Size& rBackBufferSize( pBackBuffer->getOutDev().GetOutputSizePixel() );
-
+            
             const double nMemUsage( nPixel * NUM_VIRDEV * BYTES_PER_PIXEL +
                                     rVDevSize.Width()*rVDevSize.Height() * BYTES_PER_PIXEL +
                                     rBackBufferSize.Width()*rBackBufferSize.Height() * BYTES_PER_PIXEL );
-
+            
             ::rtl::OUString text( ::rtl::math::doubleToUString( nMemUsage / 1048576.0,
                                                                 rtl_math_StringFormat_F,
                                                                 2,'.',NULL,' ') );
-
+            
             // pad with leading space
             while( text.getLength() < 4 )
                 text = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM (" ")) + text;
-
-            text = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM ("Mem: ")) +
-                text +
+            
+            text = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM ("Mem: ")) + 
+                text + 
                 ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM ("MB"));
-
+            
             renderInfoText( rOutDev,
-                            text,
+                            text, 
                             Point(0, 60) );
         }
     }
diff --git a/canvas/source/vcl/spritecanvashelper.hxx b/canvas/source/vcl/spritecanvashelper.hxx
index bc80f4359e5b..f85dd755eb19 100644
--- a/canvas/source/vcl/spritecanvashelper.hxx
+++ b/canvas/source/vcl/spritecanvashelper.hxx
@@ -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
@@ -50,7 +50,7 @@ namespace vclcanvas
     public:
         SpriteCanvasHelper();
 
-        void init( const OutDevProviderSharedPtr& rOutDev,
+        void init( const OutDevProviderSharedPtr& rOutDev, 
                    SpriteCanvas&                  rOwningSpriteCanvas,
                    ::canvas::SpriteRedrawManager& rManager,
                    bool                           bProtect,
@@ -60,23 +60,23 @@ namespace vclcanvas
         void disposing();
 
         // XSpriteCanvas
-        ::com::sun::star::uno::Reference<
-              ::com::sun::star::rendering::XAnimatedSprite >        createSpriteFromAnimation(
+        ::com::sun::star::uno::Reference< 
+              ::com::sun::star::rendering::XAnimatedSprite > 		createSpriteFromAnimation( 
                 const ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XAnimation >& animation );
 
-        ::com::sun::star::uno::Reference<
-              ::com::sun::star::rendering::XAnimatedSprite >        createSpriteFromBitmaps(
-                const ::com::sun::star::uno::Sequence<
-                      ::com::sun::star::uno::Reference<
-                            ::com::sun::star::rendering::XBitmap > >& animationBitmaps,
+        ::com::sun::star::uno::Reference< 
+              ::com::sun::star::rendering::XAnimatedSprite > 		createSpriteFromBitmaps( 
+                const ::com::sun::star::uno::Sequence< 
+                      ::com::sun::star::uno::Reference< 
+                            ::com::sun::star::rendering::XBitmap > >& animationBitmaps, 
                 sal_Int8                                              interpolationMode );
-
-        ::com::sun::star::uno::Reference<
-              ::com::sun::star::rendering::XCustomSprite >      createCustomSprite(
+    
+        ::com::sun::star::uno::Reference< 
+              ::com::sun::star::rendering::XCustomSprite > 		createCustomSprite( 
                 const ::com::sun::star::geometry::RealSize2D& spriteSize );
-
-        ::com::sun::star::uno::Reference<
-              ::com::sun::star::rendering::XSprite >                createClonedSprite(
+    
+        ::com::sun::star::uno::Reference< 
+              ::com::sun::star::rendering::XSprite > 				createClonedSprite( 
                 const ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XSprite >& original );
 
         /** Actually perform the screen update
@@ -90,7 +90,7 @@ namespace vclcanvas
             yes, we're performing a full update, anyway)
          */
         sal_Bool updateScreen( sal_Bool bUpdateAll,
-                               bool&    io_bSurfaceDirty );
+                               bool&	io_bSurfaceDirty );
 
         // SpriteRedrawManager functor calls
         // -------------------------------------------------
@@ -115,9 +115,9 @@ namespace vclcanvas
             All info necessary, should rMoveStart be partially or
             fully outside the outdev
          */
-        void scrollUpdate( const ::basegfx::B2DRange&                           rMoveStart,
-                           const ::basegfx::B2DRange&                           rMoveEnd,
-                           const ::canvas::SpriteRedrawManager::UpdateArea&     rUpdateArea );
+        void scrollUpdate( const ::basegfx::B2DRange& 							rMoveStart, 
+                           const ::basegfx::B2DRange& 							rMoveEnd,
+                           const ::canvas::SpriteRedrawManager::UpdateArea& 	rUpdateArea );
 
         void opaqueUpdate( const ::basegfx::B2DRange&                          rTotalArea,
                            const ::std::vector< ::canvas::Sprite::Reference >& rSortedUpdateSprites );
@@ -125,22 +125,22 @@ namespace vclcanvas
         void genericUpdate( const ::basegfx::B2DRange&                          rTotalArea,
                             const ::std::vector< ::canvas::Sprite::Reference >& rSortedUpdateSprites );
 
-        ::com::sun::star::uno::Any isUnsafeScrolling() const
-        {
-            return ::com::sun::star::uno::makeAny(mbIsUnsafeScrolling);
+        ::com::sun::star::uno::Any isUnsafeScrolling() const 
+        { 
+            return ::com::sun::star::uno::makeAny(mbIsUnsafeScrolling); 
         }
-        void enableUnsafeScrolling( const ::com::sun::star::uno::Any& rAny )
-        {
-            mbIsUnsafeScrolling = rAny.get<bool>();
+        void enableUnsafeScrolling( const ::com::sun::star::uno::Any& rAny ) 
+        { 
+            mbIsUnsafeScrolling = rAny.get<bool>(); 
         }
 
         ::com::sun::star::uno::Any isSpriteBounds() const
-        {
-            return ::com::sun::star::uno::makeAny(mbShowSpriteBounds);
+        { 
+            return ::com::sun::star::uno::makeAny(mbShowSpriteBounds); 
         }
         void enableSpriteBounds( const ::com::sun::star::uno::Any& rAny )
-        {
-            mbShowSpriteBounds = rAny.get<bool>();
+        { 
+            mbShowSpriteBounds = rAny.get<bool>(); 
         }
 
     private:
@@ -149,7 +149,7 @@ namespace vclcanvas
         void renderMemUsage( OutputDevice& rOutDev );
 
         /// Set from the SpriteCanvas: instance coordinating sprite redraw
-        ::canvas::SpriteRedrawManager*                  mpRedrawManager;
+        ::canvas::SpriteRedrawManager*					mpRedrawManager;
 
         /// Set from the init method. used to generate sprites
         SpriteCanvas*                                   mpOwningSpriteCanvas;
@@ -159,16 +159,16 @@ namespace vclcanvas
             Typically, sprites will be composited in the background,
             before pushing them to screen. This happens here.
          */
-        ::canvas::vcltools::VCLObject< VirtualDevice >  maVDev;
+        ::canvas::vcltools::VCLObject< VirtualDevice >	maVDev;
 
         /// For the frame counter timings
-        ::canvas::tools::ElapsedTime                    maLastUpdate;
+        ::canvas::tools::ElapsedTime					maLastUpdate;
 
         /// When true, canvas displays debug info on each frame
-        bool                                            mbShowFrameInfo;
+        bool											mbShowFrameInfo;
 
         /// When true, canvas creates all new sprites with red lines in the corners
-        bool                                            mbShowSpriteBounds;
+        bool											mbShowSpriteBounds;
 
         /// When true, canvas uses the scroll optimization (direct scrolls in front buffer)
         bool                                            mbIsUnsafeScrolling;
diff --git a/canvas/source/vcl/spritedevicehelper.cxx b/canvas/source/vcl/spritedevicehelper.cxx
index 4c0ea4fd6d3b..c30d705c70f1 100644
--- a/canvas/source/vcl/spritedevicehelper.cxx
+++ b/canvas/source/vcl/spritedevicehelper.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
@@ -65,7 +65,7 @@ namespace vclcanvas
         mpBackBuffer->getOutDev().SetAntialiasing( ANTIALIASING_ENABLE_B2DDRAW | mpBackBuffer->getOutDev().GetAntialiasing() );
 #else
         // switch off AA for WIN32 and UNIX, the VCLCanvas does not look good with it and
-        // is not required to do AA. It would need to be adapted to use it correctly
+        // is not required to do AA. It would need to be adapted to use it correctly 
         // (especially gradient painting). This will need extra work.
         mpBackBuffer->getOutDev().SetAntialiasing(mpBackBuffer->getOutDev().GetAntialiasing() & !ANTIALIASING_ENABLE_B2DDRAW);
 #endif
@@ -105,30 +105,30 @@ namespace vclcanvas
 
         DeviceHelper::disposing();
     }
-
+       
     uno::Any SpriteDeviceHelper::isAccelerated() const
     {
         return DeviceHelper::isAccelerated();
     }
-
+  
     uno::Any SpriteDeviceHelper::getDeviceHandle() const
     {
         return DeviceHelper::getDeviceHandle();
     }
-
+  
     uno::Any SpriteDeviceHelper::getSurfaceHandle() const
     {
         if( !mpBackBuffer )
             return uno::Any();
 
-        return uno::makeAny(
+        return uno::makeAny( 
             reinterpret_cast< sal_Int64 >(&mpBackBuffer->getOutDev()) );
     }
 
     void SpriteDeviceHelper::notifySizeUpdate( const awt::Rectangle& rBounds )
     {
         if( mpBackBuffer )
-            mpBackBuffer->setSize( ::Size(rBounds.Width,
+            mpBackBuffer->setSize( ::Size(rBounds.Width, 
                                           rBounds.Height) );
     }
 
@@ -143,9 +143,9 @@ namespace vclcanvas
             String aFilename( String::CreateFromAscii("dbg_backbuffer") );
             aFilename += String::CreateFromInt32(nFilePostfixCount);
             aFilename += String::CreateFromAscii(".bmp");
-
+                
             SvFileStream aStream( aFilename, STREAM_STD_READWRITE );
-
+                
             const ::Point aEmptyPoint;
             mpBackBuffer->getOutDev().EnableMapMode( FALSE );
             aStream << mpBackBuffer->getOutDev().GetBitmap(aEmptyPoint,
@@ -154,5 +154,5 @@ namespace vclcanvas
 
         ++nFilePostfixCount;
     }
-
+    
 }
diff --git a/canvas/source/vcl/spritedevicehelper.hxx b/canvas/source/vcl/spritedevicehelper.hxx
index eaedbc8ca5ac..ed0ba4b3829b 100644
--- a/canvas/source/vcl/spritedevicehelper.hxx
+++ b/canvas/source/vcl/spritedevicehelper.hxx
@@ -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
@@ -60,7 +60,7 @@ namespace vclcanvas
         void disposing();
 
         ::sal_Int32 createBuffers( ::sal_Int32 nBuffers );
-        void        destroyBuffers(  );
+        void 		destroyBuffers(  );
         ::sal_Bool  showBuffer( bool bWindowVisible, ::sal_Bool bUpdateAll );
         ::sal_Bool  switchBuffer( bool bWindowVisible, ::sal_Bool bUpdateAll );
 
diff --git a/canvas/source/vcl/spritehelper.cxx b/canvas/source/vcl/spritehelper.cxx
index a09905e006a8..bfb4e8b30a41 100644
--- a/canvas/source/vcl/spritehelper.cxx
+++ b/canvas/source/vcl/spritehelper.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
@@ -76,11 +76,11 @@ namespace vclcanvas
     {
         ENSURE_OR_THROW( rOwningSpriteCanvas.get() && rBackBuffer && rBackBufferMask,
                          "SpriteHelper::init(): Invalid sprite canvas or back buffer" );
-
-        mpBackBuffer        = rBackBuffer;
-        mpBackBufferMask    = rBackBufferMask;
-        mbShowSpriteBounds  = bShowSpriteBounds;
-
+        
+        mpBackBuffer 		= rBackBuffer;
+        mpBackBufferMask 	= rBackBufferMask;
+        mbShowSpriteBounds 	= bShowSpriteBounds;
+        
         init( rSpriteSize, rOwningSpriteCanvas );
     }
 
@@ -92,22 +92,22 @@ namespace vclcanvas
         // forward to parent
         CanvasCustomSpriteHelper::disposing();
     }
-
+   
     void SpriteHelper::redraw( OutputDevice&                rTargetSurface,
-                               const ::basegfx::B2DPoint&   rPos,
-                               bool&                        io_bSurfacesDirty,
+                               const ::basegfx::B2DPoint&	rPos,
+                               bool& 						io_bSurfacesDirty,
                                bool                         bBufferedUpdate ) const
     {
         (void)bBufferedUpdate; // not used on every platform
 
-        if( !mpBackBuffer ||
+        if( !mpBackBuffer || 
             !mpBackBufferMask )
         {
             return; // we're disposed
         }
 
         // log output pos in device pixel
-        VERBOSE_TRACE( "SpriteHelper::redraw(): output pos is (%f, %f)",
+        VERBOSE_TRACE( "SpriteHelper::redraw(): output pos is (%f, %f)", 
                        rPos.getX(),
                        rPos.getY() );
 
@@ -116,16 +116,16 @@ namespace vclcanvas
         if( isActive() &&
             !::basegfx::fTools::equalZero( fAlpha ) )
         {
-            const Point                 aEmptyPoint;
-            const ::basegfx::B2DVector& rOrigOutputSize( getSizePixel() );
+            const Point					aEmptyPoint;
+            const ::basegfx::B2DVector&	rOrigOutputSize( getSizePixel() );
 
             // might get changed below (e.g. adapted for
             // transformations). IMPORTANT: both position and size are
             // rounded to integer values. From now on, only those
             // rounded values are used, to keep clip and content in
             // sync.
-            ::Size  aOutputSize( ::vcl::unotools::sizeFromB2DSize( rOrigOutputSize ) );
-            ::Point aOutPos( ::vcl::unotools::pointFromB2DPoint( rPos ) );
+            ::Size 	aOutputSize( ::vcl::unotools::sizeFromB2DSize( rOrigOutputSize ) );
+            ::Point	aOutPos( ::vcl::unotools::pointFromB2DPoint( rPos ) );
 
 
             // TODO(F3): Support for alpha-VDev
@@ -140,10 +140,10 @@ namespace vclcanvas
             // longer dirty in relation to our cache
             io_bSurfacesDirty = false;
             transformUpdated();
-
+                
             if( bNeedBitmapUpdate )
             {
-                Bitmap aBmp( mpBackBuffer->getOutDev().GetBitmap( aEmptyPoint,
+                Bitmap aBmp( mpBackBuffer->getOutDev().GetBitmap( aEmptyPoint, 
                                                                   aOutputSize ) );
 
                 if( isContentFullyOpaque() )
@@ -158,7 +158,7 @@ namespace vclcanvas
                 {
                     // sprite content might contain alpha, create
                     // BmpEx, then.
-                    Bitmap aMask( mpBackBufferMask->getOutDev().GetBitmap( aEmptyPoint,
+                    Bitmap aMask( mpBackBufferMask->getOutDev().GetBitmap( aEmptyPoint, 
                                                                            aOutputSize ) );
 
                     // bitmasks are much faster than alphamasks on some platforms
@@ -192,7 +192,7 @@ namespace vclcanvas
             // to translate the clip polygon
             aTransform.translate( aOutPos.X(),
                                   aOutPos.Y() );
-
+            
             if( !bIdentityTransform )
             {
                 if( !::basegfx::fTools::equalZero( aTransform.get(0,1) ) ||
@@ -204,14 +204,14 @@ namespace vclcanvas
                     // modify output position, to account for the fact
                     // that transformBitmap() always normalizes its output
                     // bitmap into the smallest enclosing box.
-                    ::basegfx::B2DRectangle aDestRect;
-                    ::canvas::tools::calcTransformedRectBounds( aDestRect,
+                    ::basegfx::B2DRectangle	aDestRect;            
+                    ::canvas::tools::calcTransformedRectBounds( aDestRect, 
                                                                 ::basegfx::B2DRectangle(0,
                                                                                         0,
                                                                                         rOrigOutputSize.getX(),
                                                                                         rOrigOutputSize.getY()),
                                                                 aTransform );
-
+                        
                     aOutPos.X() = ::basegfx::fround( aDestRect.getMinX() );
                     aOutPos.Y() = ::basegfx::fround( aDestRect.getMinY() );
 
@@ -220,7 +220,7 @@ namespace vclcanvas
                     // actually re-create the bitmap ONLY if necessary
                     if( bNeedBitmapUpdate )
                         maContent = tools::transformBitmap( *maContent,
-                                                            aTransform,
+                                                            aTransform, 
                                                             uno::Sequence<double>(),
                                                             tools::MODULATE_NONE );
 
@@ -230,9 +230,9 @@ namespace vclcanvas
                 {
                     // relatively 'simplistic' transformation -
                     // retrieve scale and translational offset
-                    aOutputSize.setWidth (
+                    aOutputSize.setWidth ( 
                         ::basegfx::fround( rOrigOutputSize.getX() * aTransform.get(0,0) ) );
-                    aOutputSize.setHeight(
+                    aOutputSize.setHeight( 
                         ::basegfx::fround( rOrigOutputSize.getY() * aTransform.get(1,1) ) );
 
                     aOutPos.X() = ::basegfx::fround( aTransform.get(0,2) );
@@ -249,12 +249,12 @@ namespace vclcanvas
                 bool bSpriteRedrawn( false );
 
                 rTargetSurface.Push( PUSH_CLIPREGION );
-
+                
                 // apply clip (if any)
                 if( getClip().is() )
                 {
                     ::basegfx::B2DPolyPolygon aClipPoly(
-                        ::basegfx::unotools::b2DPolyPolygonFromXPolyPolygon2D(
+                        ::basegfx::unotools::b2DPolyPolygonFromXPolyPolygon2D( 
                             getClip() ));
 
                     if( aClipPoly.count() )
@@ -277,7 +277,7 @@ namespace vclcanvas
                         // when filling complex polypolygons.
                         bool bAtLeastOnePolygon( false );
                         const sal_Int32 nPolygons( aClipPoly.count() );
-
+    
                         for( sal_Int32 i=0; i<nPolygons; ++i )
                         {
                             if( !::basegfx::tools::isRectangle(
@@ -320,8 +320,8 @@ namespace vclcanvas
                             // underneath.
                             rTargetSurface.Push( PUSH_RASTEROP );
                             rTargetSurface.SetRasterOp( ROP_XOR );
-                            rTargetSurface.DrawBitmap( aOutPos,
-                                                       aOutputSize,
+                            rTargetSurface.DrawBitmap( aOutPos, 
+                                                       aOutputSize, 
                                                        maContent->GetBitmap() );
 
                             rTargetSurface.SetLineColor();
@@ -330,10 +330,10 @@ namespace vclcanvas
                             rTargetSurface.DrawPolyPolygon(PolyPolygon(aClipPoly)); // #i76339#
 
                             rTargetSurface.SetRasterOp( ROP_XOR );
-                            rTargetSurface.DrawBitmap( aOutPos,
-                                                       aOutputSize,
+                            rTargetSurface.DrawBitmap( aOutPos, 
+                                                       aOutputSize, 
                                                        maContent->GetBitmap() );
-
+                            
                             rTargetSurface.Pop();
 
                             bSpriteRedrawn = true;
@@ -345,7 +345,7 @@ namespace vclcanvas
                             // or using alpha blending - cannot use
                             // XOR, thus, employing the still somewhat
                             // speedier triangle clip method
-                            ::basegfx::B2DPolygon aTriangulatedClip(::basegfx::triangulator::triangulate(aClipPoly));
+                            ::basegfx::B2DPolygon aTriangulatedClip(::basegfx::triangulator::triangulate(aClipPoly)); 
 
                             // restrict the clipping area to the visible portion of the output device.
                             Size aSize(rTargetSurface.GetOutputSizePixel());
@@ -377,16 +377,16 @@ namespace vclcanvas
 
                         // draw semi-transparent
                         BYTE nColor( static_cast<UINT8>( ::basegfx::fround( 255.0*(1.0 - fAlpha) + .5) ) );
-                        AlphaMask aAlpha( maContent->GetSizePixel(),
+                        AlphaMask aAlpha( maContent->GetSizePixel(), 
                                           &nColor );
-
+            
                         // mask out fully transparent areas
                         if( maContent->IsTransparent() )
                             aAlpha.Replace( maContent->GetMask(), 255 );
 
-                        // alpha-blend to output
-                        rTargetSurface.DrawBitmapEx( aOutPos, aOutputSize,
-                                                     BitmapEx( maContent->GetBitmap(),
+                        // alpha-blend to output                    
+                        rTargetSurface.DrawBitmapEx( aOutPos, aOutputSize, 
+                                                     BitmapEx( maContent->GetBitmap(), 
                                                                aAlpha ) );
                     }
                 }
@@ -395,7 +395,7 @@ namespace vclcanvas
 
                 if( mbShowSpriteBounds )
                 {
-                    ::PolyPolygon aMarkerPoly(
+                    ::PolyPolygon aMarkerPoly( 
                         ::canvas::tools::getBoundMarksPolyPolygon(
                             ::basegfx::B2DRectangle(aOutPos.X(),
                                                     aOutPos.Y(),
@@ -415,19 +415,19 @@ namespace vclcanvas
                     Font aVCLFont;
                     aVCLFont.SetHeight( std::min(long(20),aOutputSize.Height()) );
                     aVCLFont.SetColor( COL_RED );
-
+                    
                     rTargetSurface.SetTextAlign(ALIGN_TOP);
                     rTargetSurface.SetTextColor( COL_RED );
                     rTargetSurface.SetFont( aVCLFont );
-
+                    
                     ::rtl::OUString text( ::rtl::math::doubleToUString( getPriority(),
                                                                         rtl_math_StringFormat_F,
                                                                         2,'.',NULL,' ') );
-
+                    
                     rTargetSurface.DrawText( aOutPos+Point(2,2), text );
 
 #if defined(VERBOSE) && OSL_DEBUG_LEVEL > 0
-                    OSL_TRACE( "SpriteHelper::redraw(): sprite %X has prio %f\n",
+                    OSL_TRACE( "SpriteHelper::redraw(): sprite %X has prio %f\n", 
                                this, getPriority() );
 #endif
                 }
diff --git a/canvas/source/vcl/spritehelper.hxx b/canvas/source/vcl/spritehelper.hxx
index 67aa588dff6e..062a7b434e17 100644
--- a/canvas/source/vcl/spritehelper.hxx
+++ b/canvas/source/vcl/spritehelper.hxx
@@ -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
@@ -76,9 +76,9 @@ namespace vclcanvas
          */
         void init( const ::com::sun::star::geometry::RealSize2D& rSpriteSize,
                    const ::canvas::SpriteSurface::Reference&     rOwningSpriteCanvas,
-                   const BackBufferSharedPtr&                    rBackBuffer,
-                   const BackBufferSharedPtr&                    rBackBufferMask,
-                   bool                                          bShowSpriteBounds );
+                   const BackBufferSharedPtr&					 rBackBuffer,
+                   const BackBufferSharedPtr&					 rBackBufferMask,
+                   bool											 bShowSpriteBounds );
 
         void disposing();
 
@@ -98,19 +98,19 @@ namespace vclcanvas
          */
         void redraw( OutputDevice&              rOutDev,
                      const ::basegfx::B2DPoint& rPos,
-                     bool&                      bSurfacesDirty,
+                     bool& 						bSurfacesDirty,
                      bool                       bBufferedUpdate ) const;
 
     private:
-        virtual ::basegfx::B2DPolyPolygon polyPolygonFromXPolyPolygon2D(
+        virtual ::basegfx::B2DPolyPolygon polyPolygonFromXPolyPolygon2D( 
             ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XPolyPolygon2D >& xPoly ) const;
 
         // for the redraw
-        BackBufferSharedPtr                                 mpBackBuffer;
-        BackBufferSharedPtr                                 mpBackBufferMask;
+        BackBufferSharedPtr									mpBackBuffer;
+        BackBufferSharedPtr									mpBackBufferMask;
 
         /// Cached bitmap for the current sprite content
-        mutable ::canvas::vcltools::VCLObject<BitmapEx>     maContent;
+        mutable ::canvas::vcltools::VCLObject<BitmapEx>		maContent;
 
         /// When true, line sprite corners in red
         bool                                                mbShowSpriteBounds;
diff --git a/canvas/source/vcl/textlayout.cxx b/canvas/source/vcl/textlayout.cxx
index a2fd331fa66f..ba5832eed3a0 100644
--- a/canvas/source/vcl/textlayout.cxx
+++ b/canvas/source/vcl/textlayout.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
@@ -55,7 +55,7 @@ namespace vclcanvas
     namespace
     {
         void setupLayoutMode( OutputDevice& rOutDev,
-                              sal_Int8      nTextDirection )
+                              sal_Int8		nTextDirection )	
         {
             // TODO(P3): avoid if already correctly set
             ULONG nLayoutMode;
@@ -288,7 +288,7 @@ namespace vclcanvas
         return 0.0;
     }
 
-    double SAL_CALL TextLayout::combinedJustify( const uno::Sequence< uno::Reference< rendering::XTextLayout > >& aNextLayouts,
+    double SAL_CALL TextLayout::combinedJustify( const uno::Sequence< uno::Reference< rendering::XTextLayout > >& aNextLayouts, 
                                                  double                                                           nSize ) throw (lang::IllegalArgumentException, uno::RuntimeException)
     {
         tools::LocalGuard aGuard;
@@ -398,10 +398,10 @@ namespace vclcanvas
             // TODO(P2): cache that
             ::boost::scoped_array< sal_Int32 > aOffsets(new sal_Int32[maLogicalAdvancements.getLength()]);
             setupTextOffsets( aOffsets.get(), maLogicalAdvancements, viewState, renderState );
-
+            
             // TODO(F3): ensure correct length and termination for DX
             // array (last entry _must_ contain the overall width)
-
+            
             rOutDev.DrawTextArray( rOutpos,
                                    maText.Text,
                                    aOffsets.get(),
@@ -451,10 +451,10 @@ namespace vclcanvas
         };
     }
 
-    void TextLayout::setupTextOffsets( sal_Int32*                       outputOffsets,
-                                       const uno::Sequence< double >&   inputOffsets,
-                                       const rendering::ViewState&      viewState,
-                                       const rendering::RenderState&    renderState     ) const
+    void TextLayout::setupTextOffsets( sal_Int32*						outputOffsets,
+                                       const uno::Sequence< double >& 	inputOffsets,
+                                       const rendering::ViewState& 		viewState,
+                                       const rendering::RenderState& 	renderState		) const
     {
         ENSURE_OR_THROW( outputOffsets!=NULL,
                           "TextLayout::setupTextOffsets offsets NULL" );
diff --git a/canvas/source/vcl/textlayout.hxx b/canvas/source/vcl/textlayout.hxx
index ad443ae76376..00159cd25103 100644
--- a/canvas/source/vcl/textlayout.hxx
+++ b/canvas/source/vcl/textlayout.hxx
@@ -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
@@ -50,13 +50,13 @@ namespace vclcanvas
     typedef ::cppu::WeakComponentImplHelper2< ::com::sun::star::rendering::XTextLayout,
                                                ::com::sun::star::lang::XServiceInfo > TextLayout_Base;
 
-    class TextLayout : public ::comphelper::OBaseMutex,
+    class TextLayout : public ::comphelper::OBaseMutex, 
                        public TextLayout_Base,
                        private ::boost::noncopyable
     {
     public:
-        TextLayout( const ::com::sun::star::rendering::StringContext&   aText,
-                    sal_Int8                                            nDirection,
+        TextLayout( const ::com::sun::star::rendering::StringContext& 	aText, 
+                    sal_Int8                                            nDirection, 
                     sal_Int64                                           nRandomSeed,
                     const CanvasFont::Reference&                        rFont,
                     const ::com::sun::star::uno::Reference<
@@ -84,24 +84,24 @@ namespace vclcanvas
         virtual sal_Int8 SAL_CALL getMainTextDirection(  ) throw (::com::sun::star::uno::RuntimeException);
         virtual ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XCanvasFont > SAL_CALL getFont(  ) throw (::com::sun::star::uno::RuntimeException);
         virtual ::com::sun::star::rendering::StringContext SAL_CALL getText(  ) throw (::com::sun::star::uno::RuntimeException);
-
+        
         // XServiceInfo
         virtual ::rtl::OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException );
         virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw( ::com::sun::star::uno::RuntimeException );
         virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames()  throw( ::com::sun::star::uno::RuntimeException );
 
-        bool draw( OutputDevice&                                   rOutDev,
-                   const Point&                                    rOutpos,
-                   const ::com::sun::star::rendering::ViewState&   viewState,
+        bool draw( OutputDevice&                                   rOutDev, 
+                   const Point&                                    rOutpos, 
+                   const ::com::sun::star::rendering::ViewState&   viewState, 
                    const ::com::sun::star::rendering::RenderState& renderState ) const;
 
     private:
-        void setupTextOffsets( sal_Int32*                                       outputOffsets,
+        void setupTextOffsets( sal_Int32*										outputOffsets,
                                const ::com::sun::star::uno::Sequence< double >& inputOffsets,
-                               const ::com::sun::star::rendering::ViewState&    viewState,
-                               const ::com::sun::star::rendering::RenderState&  renderState     ) const;
+                               const ::com::sun::star::rendering::ViewState& 	viewState, 
+                               const ::com::sun::star::rendering::RenderState& 	renderState		) const;
 
-        ::com::sun::star::rendering::StringContext       maText;
+        ::com::sun::star::rendering::StringContext 	     maText;
         ::com::sun::star::uno::Sequence< double >        maLogicalAdvancements;
         CanvasFont::Reference                            mpFont;
         ::com::sun::star::uno::Reference<
diff --git a/canvas/source/vcl/windowoutdevholder.cxx b/canvas/source/vcl/windowoutdevholder.cxx
index 9515912a1d93..e86ea1b7d837 100644
--- a/canvas/source/vcl/windowoutdevholder.cxx
+++ b/canvas/source/vcl/windowoutdevholder.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
diff --git a/canvas/source/vcl/windowoutdevholder.hxx b/canvas/source/vcl/windowoutdevholder.hxx
index ae20a49462e1..3b3ab70844bb 100644
--- a/canvas/source/vcl/windowoutdevholder.hxx
+++ b/canvas/source/vcl/windowoutdevholder.hxx
@@ -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
@@ -38,7 +38,7 @@
 
 namespace vclcanvas
 {
-    class WindowOutDevHolder : public OutDevProvider,
+    class WindowOutDevHolder : public OutDevProvider, 
                                private ::boost::noncopyable
     {
     public:
@@ -46,7 +46,7 @@ namespace vclcanvas
                                            ::com::sun::star::awt::XWindow>& xWin );
 
     private:
-        virtual OutputDevice&       getOutDev() { return mrOutputWindow; }
+        virtual OutputDevice& 		getOutDev() { return mrOutputWindow; }
         virtual const OutputDevice& getOutDev() const { return mrOutputWindow; }
 
         // TODO(Q2): Lifetime issue. Though WindowGraphicDeviceBase
@@ -59,7 +59,7 @@ namespace vclcanvas
         // vcl/source/window/window.cxx is broken, that disposes the
         // canvas during window deletion, we're riding a dead horse
         // here
-        Window& mrOutputWindow;
+        Window& mrOutputWindow; 
     };
 }
 
diff --git a/canvas/workben/canvasdemo.cxx b/canvas/workben/canvasdemo.cxx
index 6cb2afa82d7b..7496d7c1d5f3 100644
--- a/canvas/workben/canvasdemo.cxx
+++ b/canvas/workben/canvasdemo.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
@@ -78,7 +78,7 @@ class DemoApp : public Application
 {
 public:
     virtual void Main();
-    virtual USHORT  Exception( USHORT nError );
+    virtual USHORT	Exception( USHORT nError );
 };
 
 static void PrintHelp()
@@ -98,9 +98,9 @@ class TestWindow : public Dialog
         }
         virtual ~TestWindow() {}
         virtual void MouseButtonUp( const MouseEvent& /*rMEvt*/ )
-        {
+        { 
             //TODO: do something cool
-            EndDialog();
+            EndDialog(); 
         }
         virtual void Paint( const Rectangle& rRect );
 };
@@ -144,7 +144,7 @@ class DemoRenderer
             //it doesn't seem to do anything in either VCL or cairocanvas
             //I was hoping that CLEAR would clear the canvas before we paint,
             //but nothing changes
-            maRenderState.CompositeOperation = rendering::CompositeOperation::OVER;
+            maRenderState.CompositeOperation = rendering::CompositeOperation::OVER; 
 
             maBox.Width() = aSize.Width() / 3;
             maBox.Height() = aSize.Height() / 3;
@@ -204,7 +204,7 @@ class DemoRenderer
             xPoly = mxDevice->createCompatibleLinePolyPolygon( aPolys );
             xPoly->setClosed( 0, true );
             uno::Reference< rendering::XPolyPolygon2D> xPP( xPoly, uno::UNO_QUERY );
-
+            
             rendering::RenderState aRenderState( maRenderState );
             aRenderState.DeviceColor = aColor;
             mxCanvas->drawPolyPolygon( xPP, maViewState, aRenderState );
@@ -235,7 +235,7 @@ class DemoRenderer
                 {
                     a = 2.0 * M_PI * j / VERTICES;
 
-//                  FIXME: set cap_style to 'ROUND'
+//					FIXME: set cap_style to 'ROUND'
                     mxCanvas->drawLine( aSrc,
                                         geometry::RealPoint2D( RADIUS * cos (a),
                                                                RADIUS * sin (a) ),
@@ -254,7 +254,7 @@ class DemoRenderer
 
             uno::Sequence< geometry::RealPoint2D > aPoints( nLength );
             uno::Reference< rendering::XLinePolyPolygon2D > xPoly;
-
+        
             aPoints[0] = geometry::RealPoint2D( anchor_x, anchor_y );
             for (int i = 0; i < nLength; i++ )
             {
@@ -288,7 +288,7 @@ class DemoRenderer
 
             rendering::RenderState aRenderState( maRenderState );
             aRenderState.DeviceColor = maColorRed;
-//          aRenderState.DeviceColor[3] = 0.5;
+//			aRenderState.DeviceColor[3] = 0.5;
             rendering::StrokeAttributes aStrokeAttrs;
             aStrokeAttrs.StrokeWidth = 4.0;
             aStrokeAttrs.MiterLimit = 2.0; // ?
@@ -314,7 +314,7 @@ class DemoRenderer
             rendering::RenderState maOldRenderState = maRenderState; // push
 
             drawTitle( ::rtl::OString( "Rectangles" ) );
-
+            
             drawRect( Rectangle( 20, 30, 70, 60 ), maColorRed, 8 );
             // color mediumseagreen, stipple fill, outline black
             drawRect( Rectangle( 90, 40, 180, 100 ), maColorBlack, 4 );
@@ -331,16 +331,16 @@ class DemoRenderer
 
             drawTitle( ::rtl::OString( "Ellipses" ) );
 
-            const basegfx::B2DPoint aCenter( maBox.Width()*.5,
+            const basegfx::B2DPoint aCenter( maBox.Width()*.5, 
                                              maBox.Height()*.5 );
-            const basegfx::B2DPoint aRadii( maBox.Width()*.3,
+            const basegfx::B2DPoint aRadii( maBox.Width()*.3, 
                                             maBox.Height()*.3 );
-            const basegfx::B2DPolygon& rEllipse(
-                basegfx::tools::createPolygonFromEllipse( aCenter,
+            const basegfx::B2DPolygon& rEllipse( 
+                basegfx::tools::createPolygonFromEllipse( aCenter, 
                                                           aRadii.getX(),
                                                           aRadii.getY() ));
 
-            uno::Reference< rendering::XPolyPolygon2D > xPoly(
+            uno::Reference< rendering::XPolyPolygon2D > xPoly( 
                 basegfx::unotools::xPolyPolygonFromB2DPolygon(mxDevice,
                                                               rEllipse) );
 
@@ -384,7 +384,7 @@ class DemoRenderer
             translate( maBox.Width()*0.1, maBox.Height()*0.2 );
             maRenderState.AffineTransform.m00 *= 4.0/15;
             maRenderState.AffineTransform.m11 *= 3.0/15;
-
+            
             mxCanvas->drawBitmap(xBitmap, maViewState, maRenderState);
 
             // uno::Reference< rendering::XBitmap > xBitmap2( xBitmap->getScaledBitmap(geometry::RealSize2D(48, 48), false) );
@@ -426,7 +426,7 @@ class DemoRenderer
 
             const double r= 30.0;
             const int num_curves = 3;
-
+          
             //hacky hack hack
             uno::Sequence< geometry::RealBezierSegment2D > aBeziers (num_curves);
             uno::Reference< rendering::XBezierPolyPolygon2D > xPoly;
@@ -445,7 +445,7 @@ class DemoRenderer
             //uno::Reference< rendering::XBezierPolyPolygon2D> xPP( xPoly, uno::UNO_QUERY );
             //compiles, but totally screws up.  I think it is interpretting the bezier as a line
             uno::Reference< rendering::XPolyPolygon2D> xPP( xPoly, uno::UNO_QUERY );
-
+        
             rendering::StrokeAttributes aStrokeAttrs;
             aStrokeAttrs.StrokeWidth = 4.0;
             aStrokeAttrs.MiterLimit = 2.0; // ?
@@ -455,7 +455,7 @@ class DemoRenderer
             mxCanvas->strokePolyPolygon( xPP, maViewState, maRenderState, aStrokeAttrs );
             //you can't draw a BezierPolyPolygon2D with this, even though it is derived from it
             //mxCanvas->drawPolyPolygon( xPP, maViewState, maRenderState );
-
+                       
             maRenderState = maOldRenderState; // pop
         }
 
@@ -470,7 +470,7 @@ class DemoRenderer
             translate( 0.0, maBox.Height() * 2.0 );
 
             drawTitle( ::rtl::OString( "Arcs" ) );
-
+            
 
             //begin hacks
             //This stuff doesn't belong here, but probably in curves
@@ -482,7 +482,7 @@ class DemoRenderer
             double by;
             bx= gimmerand();
             by= gimmerand();
-
+                
             for (int i= 0; i < 1; i++)
             {
                 //point a= point b;
@@ -510,7 +510,7 @@ class DemoRenderer
                     );
                 geometry::RealPoint2D aEndPoint(bx, by);
                 maRenderState.DeviceColor = maColorBlack;
-                mxCanvas->drawBezier(
+                mxCanvas->drawBezier( 
                     aBezierSegment,
                     aEndPoint,
                     maViewState, maRenderState );
@@ -527,7 +527,7 @@ class DemoRenderer
 
             for (int i= 0; i < sides; i++)
             {
-                aPoints[i]= geometry::RealPoint2D( centerx + r * cos(i*2 * M_PI/sides),
+                aPoints[i]= geometry::RealPoint2D( centerx + r * cos(i*2 * M_PI/sides), 
                                                    centery + r * sin(i*2 * M_PI/sides));
             }
             uno::Sequence< uno::Sequence< geometry::RealPoint2D > > aPolys(1);
@@ -556,7 +556,7 @@ class DemoRenderer
                 drawRegularPolygon(35*i, 35, sides, 15);
                 sides++;
             }
-
+    
             maRenderState = maOldRenderState; // pop
         }
 
@@ -613,15 +613,15 @@ void TestWindow::Paint( const Rectangle& /*rRect*/ )
         aRenderer.drawImages();
 
         // check whether virdev actually contained something
-        uno::Reference< rendering::XBitmap > xBitmap(xVDevCanvas, uno::UNO_QUERY);
+        uno::Reference< rendering::XBitmap > xBitmap(xVDevCanvas, uno::UNO_QUERY);        
         if( !xBitmap.is() )
             return;
-
+        
         aRenderer.maRenderState.AffineTransform.m02 += 100;
         aRenderer.maRenderState.AffineTransform.m12 += 100;
         xCanvas->drawBitmap(xBitmap, aRenderer.maViewState, aRenderer.maRenderState);
 
-        uno::Reference< rendering::XSpriteCanvas > xSpriteCanvas( xCanvas,
+        uno::Reference< rendering::XSpriteCanvas > xSpriteCanvas( xCanvas, 
                                                                   uno::UNO_QUERY );
         if( xSpriteCanvas.is() )
             xSpriteCanvas->updateScreen( sal_True ); // without
@@ -673,7 +673,7 @@ void DemoApp::Main()
     try
     {
         uno::Reference< uno::XComponentContext > xCtx = ::cppu::defaultBootstrap_InitialComponentContext();
-        xFactory = uno::Reference< lang::XMultiServiceFactory >(  xCtx->getServiceManager(),
+        xFactory = uno::Reference< lang::XMultiServiceFactory >(  xCtx->getServiceManager(), 
                                                                   uno::UNO_QUERY );
         if( xFactory.is() )
             ::comphelper::setProcessServiceFactory( xFactory );
diff --git a/comphelper/inc/comphelper/ChainablePropertySet.hxx b/comphelper/inc/comphelper/ChainablePropertySet.hxx
index 0d36c2d10144..5b6b72d4fdb7 100644
--- a/comphelper/inc/comphelper/ChainablePropertySet.hxx
+++ b/comphelper/inc/comphelper/ChainablePropertySet.hxx
@@ -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
@@ -34,8 +34,8 @@
 #include <comphelper/PropertyInfoHash.hxx>
 #include "comphelper/comphelperdllapi.h"
 
-namespace comphelper
-{
+namespace comphelper 
+{ 
     class ChainablePropertySetInfo;
 }
 namespace vos
@@ -52,19 +52,19 @@ namespace vos
  * To be used as a base class for PropertySets, the subclass must implement
  * the 6 protected pure virtual functions. If a mutex is passed to the
  * constructor, this is locked before any call to _getSingleValue or
- * _setSingleValue and released after all processing has completed
+ * _setSingleValue and released after all processing has completed 
  * (including _postSetValues or _postGetValues )
- *
- * The implementations of getPropertyValues/setPropertyValues call
+ * 
+ * The implementations of getPropertyValues/setPropertyValues call 
  * lockMutex and _preGetValues/_preSetValues once before calling
  * _getSingleValue/_setSingleValue for each property. After each
  * property has been dealt with, _postGetValues/_postSetValues
  * are called once.
  *
- * Any MasterPropertySet implementations that can include an
- * implementation of a given ChainablePropertySet must be
+ * Any MasterPropertySet implementations that can include an 
+ * implementation of a given ChainablePropertySet must be 
  * declared as a 'friend' in the implementation of the ChainablePropertySet.
- *
+ * 
  */
 
 namespace comphelper
@@ -83,72 +83,72 @@ namespace comphelper
 
         virtual void _preSetValues ()
             throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException ) = 0;
-        virtual void _setSingleValue( const comphelper::PropertyInfo & rInfo, const ::com::sun::star::uno::Any &rValue )
+        virtual void _setSingleValue( const comphelper::PropertyInfo & rInfo, const ::com::sun::star::uno::Any &rValue ) 
             throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException ) = 0;
         virtual void _postSetValues ()
             throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException ) = 0;
 
         virtual void _preGetValues ()
             throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException ) = 0;
-        virtual void _getSingleValue( const comphelper::PropertyInfo & rInfo, ::com::sun::star::uno::Any & rValue )
+        virtual void _getSingleValue( const comphelper::PropertyInfo & rInfo, ::com::sun::star::uno::Any & rValue ) 
             throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException ) = 0;
         virtual void _postGetValues ()
             throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException ) = 0;
 
         virtual void _preGetPropertyState ()
             throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException );
-        virtual void _getPropertyState( const comphelper::PropertyInfo& rInfo, ::com::sun::star::beans::PropertyState& rState )
+        virtual void _getPropertyState( const comphelper::PropertyInfo& rInfo, ::com::sun::star::beans::PropertyState& rState ) 
             throw(::com::sun::star::beans::UnknownPropertyException );
         virtual void _postGetPropertyState ()
             throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException );
 
-        virtual void _setPropertyToDefault( const comphelper::PropertyInfo& rEntry )
+        virtual void _setPropertyToDefault( const comphelper::PropertyInfo& rEntry )  
             throw(::com::sun::star::beans::UnknownPropertyException );
-        virtual ::com::sun::star::uno::Any _getPropertyDefault( const comphelper::PropertyInfo& rEntry )
+        virtual ::com::sun::star::uno::Any _getPropertyDefault( const comphelper::PropertyInfo& rEntry ) 
             throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException );
 
     public:
         ChainablePropertySet( comphelper::ChainablePropertySetInfo* pInfo, vos::IMutex *pMutex = NULL )
             throw();
-        virtual ~ChainablePropertySet()
+        virtual ~ChainablePropertySet() 
             throw();
 
         // XPropertySet
-        virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo(  )
+        virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo(  ) 
             throw(::com::sun::star::uno::RuntimeException);
-        virtual void SAL_CALL setPropertyValue( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue )
+        virtual void SAL_CALL setPropertyValue( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) 
             throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
-        virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const ::rtl::OUString& PropertyName )
+        virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const ::rtl::OUString& PropertyName ) 
             throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
-        virtual void SAL_CALL addPropertyChangeListener( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener )
+        virtual void SAL_CALL addPropertyChangeListener( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) 
             throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
-        virtual void SAL_CALL removePropertyChangeListener( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener )
+        virtual void SAL_CALL removePropertyChangeListener( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) 
             throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
-        virtual void SAL_CALL addVetoableChangeListener( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener )
+        virtual void SAL_CALL addVetoableChangeListener( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) 
             throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
-        virtual void SAL_CALL removeVetoableChangeListener( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener )
+        virtual void SAL_CALL removeVetoableChangeListener( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) 
             throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
 
         // XMultiPropertySet
-        virtual void SAL_CALL setPropertyValues( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyNames, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aValues )
+        virtual void SAL_CALL setPropertyValues( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyNames, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aValues ) 
             throw(::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
-        virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > SAL_CALL getPropertyValues( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyNames )
+        virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > SAL_CALL getPropertyValues( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyNames ) 
             throw(::com::sun::star::uno::RuntimeException);
-        virtual void SAL_CALL addPropertiesChangeListener( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyNames, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener )
+        virtual void SAL_CALL addPropertiesChangeListener( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyNames, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener ) 
             throw(::com::sun::star::uno::RuntimeException);
-        virtual void SAL_CALL removePropertiesChangeListener( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener )
+        virtual void SAL_CALL removePropertiesChangeListener( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener ) 
             throw(::com::sun::star::uno::RuntimeException);
-        virtual void SAL_CALL firePropertiesChangeEvent( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyNames, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener )
+        virtual void SAL_CALL firePropertiesChangeEvent( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyNames, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener ) 
             throw(::com::sun::star::uno::RuntimeException);
 
         // XPropertyState
-        virtual ::com::sun::star::beans::PropertyState SAL_CALL getPropertyState( const ::rtl::OUString& PropertyName )
+        virtual ::com::sun::star::beans::PropertyState SAL_CALL getPropertyState( const ::rtl::OUString& PropertyName ) 
             throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException);
-        virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyState > SAL_CALL getPropertyStates( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyName )
+        virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyState > SAL_CALL getPropertyStates( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyName ) 
             throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException);
-        virtual void SAL_CALL setPropertyToDefault( const ::rtl::OUString& PropertyName )
+        virtual void SAL_CALL setPropertyToDefault( const ::rtl::OUString& PropertyName ) 
             throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException);
-        virtual ::com::sun::star::uno::Any SAL_CALL getPropertyDefault( const ::rtl::OUString& aPropertyName )
+        virtual ::com::sun::star::uno::Any SAL_CALL getPropertyDefault( const ::rtl::OUString& aPropertyName ) 
             throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
     };
 }
diff --git a/comphelper/inc/comphelper/ChainablePropertySetInfo.hxx b/comphelper/inc/comphelper/ChainablePropertySetInfo.hxx
index 76d181e21e7b..727595dfd5ad 100644
--- a/comphelper/inc/comphelper/ChainablePropertySetInfo.hxx
+++ b/comphelper/inc/comphelper/ChainablePropertySetInfo.hxx
@@ -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
@@ -34,7 +34,7 @@
 #include <comphelper/TypeGeneration.hxx>
 #include "comphelper/comphelperdllapi.h"
 
-/*
+/* 
  * A ChainablePropertySetInfo is usually initialised with a pointer to the first element
  * of a null-terminated static table of PropertyInfo structs. This is placed in a hash_map
  * for fast access
@@ -52,25 +52,25 @@ namespace comphelper
         PropertyInfoHash maMap;
         com::sun::star::uno::Sequence < com::sun::star::beans::Property > maProperties;
     public:
-        ChainablePropertySetInfo()
+        ChainablePropertySetInfo() 
             throw();
-        ChainablePropertySetInfo( PropertyInfo * pMap )
+        ChainablePropertySetInfo( PropertyInfo * pMap ) 
             throw();
 
-        virtual ~ChainablePropertySetInfo()
+        virtual ~ChainablePropertySetInfo() 
             throw();
 
-        void add( PropertyInfo* pMap, sal_Int32 nCount = -1 )
+        void add( PropertyInfo* pMap, sal_Int32 nCount = -1 ) 
             throw();
-        void remove( const rtl::OUString& aName )
+        void remove( const rtl::OUString& aName ) 
             throw();
 
         // XPropertySetInfo
-        virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::Property > SAL_CALL getProperties()
+        virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::Property > SAL_CALL getProperties() 
             throw(::com::sun::star::uno::RuntimeException);
-        virtual ::com::sun::star::beans::Property SAL_CALL getPropertyByName( const ::rtl::OUString& aName )
+        virtual ::com::sun::star::beans::Property SAL_CALL getPropertyByName( const ::rtl::OUString& aName ) 
             throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException);
-        virtual sal_Bool SAL_CALL hasPropertyByName( const ::rtl::OUString& Name )
+        virtual sal_Bool SAL_CALL hasPropertyByName( const ::rtl::OUString& Name ) 
             throw(::com::sun::star::uno::RuntimeException);
     };
 }
diff --git a/comphelper/inc/comphelper/IdPropArrayHelper.hxx b/comphelper/inc/comphelper/IdPropArrayHelper.hxx
index 187c52fdc446..8e3d00765bce 100644
--- a/comphelper/inc/comphelper/IdPropArrayHelper.hxx
+++ b/comphelper/inc/comphelper/IdPropArrayHelper.hxx
@@ -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
@@ -42,7 +42,7 @@ namespace comphelper
     //************************************************************
     //  OIdPropertyArrayUsageHelper
     //************************************************************
-    template <typename TYPE> struct OIdPropertyArrayUsageHelperMutex
+    template <typename TYPE> struct OIdPropertyArrayUsageHelperMutex 
             : public rtl::Static< ::osl::Mutex, OIdPropertyArrayUsageHelperMutex<TYPE> > {};
 
     typedef std::map< sal_Int32, ::cppu::IPropertyArrayHelper*, std::less< sal_Int32 > > OIdPropertyArrayMap;
@@ -50,8 +50,8 @@ namespace comphelper
     class OIdPropertyArrayUsageHelper
     {
     protected:
-        static sal_Int32                        s_nRefCount;
-        static OIdPropertyArrayMap*             s_pMap;
+        static sal_Int32						s_nRefCount;
+        static OIdPropertyArrayMap*				s_pMap;
 
     public:
         OIdPropertyArrayUsageHelper();
@@ -82,17 +82,17 @@ namespace comphelper
             <BR>
             as long as IPropertyArrayHelper has no virtual destructor, the implementation of ~OPropertyArrayUsageHelper
             assumes that you created an ::cppu::OPropertyArrayHelper when deleting s_pProps.
-            @return                         an pointer to the newly created array helper. Must not be NULL.
+            @return							an pointer to the newly created array helper. Must not be NULL.
         */
         virtual ::cppu::IPropertyArrayHelper* createArrayHelper(sal_Int32 nId) const = 0;
     };
 
     //------------------------------------------------------------------
     template<class TYPE>
-    sal_Int32                       OIdPropertyArrayUsageHelper< TYPE >::s_nRefCount    = 0;
+    sal_Int32						OIdPropertyArrayUsageHelper< TYPE >::s_nRefCount	= 0;
 
     template<class TYPE>
-    OIdPropertyArrayMap*            OIdPropertyArrayUsageHelper< TYPE >::s_pMap = NULL;
+    OIdPropertyArrayMap*			OIdPropertyArrayUsageHelper< TYPE >::s_pMap	= NULL;
 
     //------------------------------------------------------------------
     template <class TYPE>
diff --git a/comphelper/inc/comphelper/InlineContainer.hxx b/comphelper/inc/comphelper/InlineContainer.hxx
index a5d80e263aac..c1978d330882 100644
--- a/comphelper/inc/comphelper/InlineContainer.hxx
+++ b/comphelper/inc/comphelper/InlineContainer.hxx
@@ -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
diff --git a/comphelper/inc/comphelper/MasterPropertySet.hxx b/comphelper/inc/comphelper/MasterPropertySet.hxx
index 170b4f72db3b..643e4dd3ef81 100644
--- a/comphelper/inc/comphelper/MasterPropertySet.hxx
+++ b/comphelper/inc/comphelper/MasterPropertySet.hxx
@@ -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
@@ -37,8 +37,8 @@ namespace vos
 {
     class IMutex;
 }
-namespace comphelper
-{
+namespace comphelper 
+{ 
     class MasterPropertySetInfo;
     class ChainablePropertySet;
     struct SlaveData
@@ -80,74 +80,74 @@ namespace comphelper
 
         virtual void _preSetValues ()
             throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException ) = 0;
-        virtual void _setSingleValue( const comphelper::PropertyInfo & rInfo, const ::com::sun::star::uno::Any &rValue )
+        virtual void _setSingleValue( const comphelper::PropertyInfo & rInfo, const ::com::sun::star::uno::Any &rValue ) 
             throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException ) = 0;
         virtual void _postSetValues ()
             throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException ) = 0;
 
         virtual void _preGetValues ()
             throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException ) = 0;
-        virtual void _getSingleValue( const comphelper::PropertyInfo & rInfo, ::com::sun::star::uno::Any & rValue )
+        virtual void _getSingleValue( const comphelper::PropertyInfo & rInfo, ::com::sun::star::uno::Any & rValue ) 
             throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException ) = 0;
         virtual void _postGetValues ()
             throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException ) = 0;
 
         virtual void _preGetPropertyState ()
             throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException );
-        virtual void _getPropertyState( const comphelper::PropertyInfo& rInfo, ::com::sun::star::beans::PropertyState& rState )
+        virtual void _getPropertyState( const comphelper::PropertyInfo& rInfo, ::com::sun::star::beans::PropertyState& rState ) 
             throw(::com::sun::star::beans::UnknownPropertyException );
         virtual void _postGetPropertyState ()
             throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException );
 
-        virtual void _setPropertyToDefault( const comphelper::PropertyInfo& rEntry )
+        virtual void _setPropertyToDefault( const comphelper::PropertyInfo& rEntry )  
             throw(::com::sun::star::beans::UnknownPropertyException );
-        virtual ::com::sun::star::uno::Any _getPropertyDefault( const comphelper::PropertyInfo& rEntry )
+        virtual ::com::sun::star::uno::Any _getPropertyDefault( const comphelper::PropertyInfo& rEntry ) 
             throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException );
 
     public:
         MasterPropertySet( comphelper::MasterPropertySetInfo* pInfo, ::vos::IMutex *pMutex = NULL )
             throw();
-        virtual ~MasterPropertySet()
+        virtual ~MasterPropertySet() 
             throw();
         void registerSlave ( ChainablePropertySet *pNewSet )
             throw();
 
         // XPropertySet
-        virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo(  )
+        virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo(  ) 
             throw(::com::sun::star::uno::RuntimeException);
-        virtual void SAL_CALL setPropertyValue( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue )
+        virtual void SAL_CALL setPropertyValue( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) 
             throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
-        virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const ::rtl::OUString& PropertyName )
+        virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const ::rtl::OUString& PropertyName ) 
             throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
-        virtual void SAL_CALL addPropertyChangeListener( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener )
+        virtual void SAL_CALL addPropertyChangeListener( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) 
             throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
-        virtual void SAL_CALL removePropertyChangeListener( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener )
+        virtual void SAL_CALL removePropertyChangeListener( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) 
             throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
-        virtual void SAL_CALL addVetoableChangeListener( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener )
+        virtual void SAL_CALL addVetoableChangeListener( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) 
             throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
-        virtual void SAL_CALL removeVetoableChangeListener( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener )
+        virtual void SAL_CALL removeVetoableChangeListener( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) 
             throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
 
         // XMultiPropertySet
-        virtual void SAL_CALL setPropertyValues( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyNames, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aValues )
+        virtual void SAL_CALL setPropertyValues( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyNames, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aValues ) 
             throw(::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
-        virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > SAL_CALL getPropertyValues( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyNames )
+        virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > SAL_CALL getPropertyValues( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyNames ) 
             throw(::com::sun::star::uno::RuntimeException);
-        virtual void SAL_CALL addPropertiesChangeListener( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyNames, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener )
+        virtual void SAL_CALL addPropertiesChangeListener( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyNames, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener ) 
             throw(::com::sun::star::uno::RuntimeException);
-        virtual void SAL_CALL removePropertiesChangeListener( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener )
+        virtual void SAL_CALL removePropertiesChangeListener( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener ) 
             throw(::com::sun::star::uno::RuntimeException);
-        virtual void SAL_CALL firePropertiesChangeEvent( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyNames, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener )
+        virtual void SAL_CALL firePropertiesChangeEvent( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyNames, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener ) 
             throw(::com::sun::star::uno::RuntimeException);
 
         // XPropertyState
-        virtual ::com::sun::star::beans::PropertyState SAL_CALL getPropertyState( const ::rtl::OUString& PropertyName )
+        virtual ::com::sun::star::beans::PropertyState SAL_CALL getPropertyState( const ::rtl::OUString& PropertyName ) 
             throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException);
-        virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyState > SAL_CALL getPropertyStates( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyName )
+        virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyState > SAL_CALL getPropertyStates( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyName ) 
             throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException);
-        virtual void SAL_CALL setPropertyToDefault( const ::rtl::OUString& PropertyName )
+        virtual void SAL_CALL setPropertyToDefault( const ::rtl::OUString& PropertyName ) 
             throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException);
-        virtual ::com::sun::star::uno::Any SAL_CALL getPropertyDefault( const ::rtl::OUString& aPropertyName )
+        virtual ::com::sun::star::uno::Any SAL_CALL getPropertyDefault( const ::rtl::OUString& aPropertyName ) 
             throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
     };
 }
diff --git a/comphelper/inc/comphelper/MasterPropertySetInfo.hxx b/comphelper/inc/comphelper/MasterPropertySetInfo.hxx
index 94a639fca755..db0c2efd498c 100644
--- a/comphelper/inc/comphelper/MasterPropertySetInfo.hxx
+++ b/comphelper/inc/comphelper/MasterPropertySetInfo.hxx
@@ -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
@@ -44,25 +44,25 @@ namespace comphelper
         PropertyDataHash maMap;
         com::sun::star::uno::Sequence < com::sun::star::beans::Property > maProperties;
     public:
-        MasterPropertySetInfo()
+        MasterPropertySetInfo() 
             throw();
-        MasterPropertySetInfo( PropertyInfo * pMap )
+        MasterPropertySetInfo( PropertyInfo * pMap ) 
             throw();
-        virtual ~MasterPropertySetInfo()
+        virtual ~MasterPropertySetInfo() 
             throw();
         void add( PropertyInfo* pMap, sal_Int32 nCount = -1, sal_uInt8 nMapId = 0 )
             throw();
         void add( PropertyInfoHash &rHash, sal_uInt8 nMapId )
             throw();
-        void remove( const rtl::OUString& aName )
+        void remove( const rtl::OUString& aName ) 
             throw();
 
         // XPropertySetInfo
-        virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::Property > SAL_CALL getProperties()
+        virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::Property > SAL_CALL getProperties() 
             throw(::com::sun::star::uno::RuntimeException);
-        virtual ::com::sun::star::beans::Property SAL_CALL getPropertyByName( const ::rtl::OUString& aName )
+        virtual ::com::sun::star::beans::Property SAL_CALL getPropertyByName( const ::rtl::OUString& aName ) 
             throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException);
-        virtual sal_Bool SAL_CALL hasPropertyByName( const ::rtl::OUString& Name )
+        virtual sal_Bool SAL_CALL hasPropertyByName( const ::rtl::OUString& Name ) 
             throw(::com::sun::star::uno::RuntimeException);
     };
 }
diff --git a/comphelper/inc/comphelper/PropertyInfoHash.hxx b/comphelper/inc/comphelper/PropertyInfoHash.hxx
index 106f40487f5b..59c0f70f1774 100644
--- a/comphelper/inc/comphelper/PropertyInfoHash.hxx
+++ b/comphelper/inc/comphelper/PropertyInfoHash.hxx
@@ -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
@@ -31,8 +31,8 @@
 #include <rtl/ustring.hxx>
 #include <comphelper/TypeGeneration.hxx>
 #include <hash_map>
-namespace comphelper
-{
+namespace comphelper 
+{ 
     struct PropertyInfo
     {
         const sal_Char* mpName;
@@ -60,12 +60,12 @@ namespace comphelper
     };
 }
 
-typedef std::hash_map < ::rtl::OUString,
-                        ::comphelper::PropertyInfo*,
-                        ::rtl::OUStringHash,
+typedef std::hash_map < ::rtl::OUString, 
+                        ::comphelper::PropertyInfo*, 
+                        ::rtl::OUStringHash, 
                         ::comphelper::eqFunc > PropertyInfoHash;
-typedef std::hash_map < ::rtl::OUString,
-                        ::comphelper::PropertyData*,
-                        ::rtl::OUStringHash,
+typedef std::hash_map < ::rtl::OUString, 
+                        ::comphelper::PropertyData*, 
+                        ::rtl::OUStringHash, 
                         ::comphelper::eqFunc > PropertyDataHash;
 #endif
diff --git a/comphelper/inc/comphelper/SelectionMultiplex.hxx b/comphelper/inc/comphelper/SelectionMultiplex.hxx
index 633a86f4fdb8..ae2bde4079ab 100644
--- a/comphelper/inc/comphelper/SelectionMultiplex.hxx
+++ b/comphelper/inc/comphelper/SelectionMultiplex.hxx
@@ -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
@@ -53,7 +53,7 @@ namespace comphelper
         friend class OSelectionChangeMultiplexer;
 
         OSelectionChangeMultiplexer*    m_pAdapter;
-        ::osl::Mutex&                   m_rMutex;
+        ::osl::Mutex&				    m_rMutex;
 
     public:
         OSelectionChangeListener(::osl::Mutex& _rMutex)
@@ -77,14 +77,14 @@ namespace comphelper
     //= OSelectionChangeMultiplexer
     //==================================================================
     /// multiplexer for selection changes
-    class COMPHELPER_DLLPUBLIC OSelectionChangeMultiplexer  :public cppu::WeakImplHelper1< ::com::sun::star::view::XSelectionChangeListener>
+    class COMPHELPER_DLLPUBLIC OSelectionChangeMultiplexer	:public cppu::WeakImplHelper1< ::com::sun::star::view::XSelectionChangeListener>
     {
         friend class OSelectionChangeListener;
-         ::com::sun::star::uno::Reference< ::com::sun::star::view::XSelectionSupplier>  m_xSet;
-        OSelectionChangeListener*                   m_pListener;
-        sal_Int32                                   m_nLockCount;
-        sal_Bool                                    m_bListening        : 1;
-        sal_Bool                                    m_bAutoSetRelease   : 1;
+         ::com::sun::star::uno::Reference< ::com::sun::star::view::XSelectionSupplier>	m_xSet;
+        OSelectionChangeListener*					m_pListener;
+        sal_Int32									m_nLockCount;
+        sal_Bool									m_bListening		: 1;
+        sal_Bool									m_bAutoSetRelease	: 1;
 
         OSelectionChangeMultiplexer(const OSelectionChangeMultiplexer&);
         OSelectionChangeMultiplexer& operator=(const OSelectionChangeMultiplexer&);
@@ -100,17 +100,17 @@ namespace comphelper
         virtual void SAL_CALL selectionChanged( const ::com::sun::star::lang::EventObject& aEvent ) throw (::com::sun::star::uno::RuntimeException);
 
         /// incremental lock
-        void        lock();
+        void		lock();
         /// incremental unlock
-        void        unlock();
+        void		unlock();
         /// get the lock count
-        sal_Int32   locked() const { return m_nLockCount; }
+        sal_Int32	locked() const { return m_nLockCount; }
 
         void dispose();
     };
 
 //.........................................................................
-}   // namespace comphelper
+}	// namespace comphelper
 //.........................................................................
 
 #endif // INCLUDED_COMPHELPER_SELECTION_MULTIPLEX_HXX
diff --git a/comphelper/inc/comphelper/SettingsHelper.hxx b/comphelper/inc/comphelper/SettingsHelper.hxx
index fa954009c78e..83139b3a7d7a 100644
--- a/comphelper/inc/comphelper/SettingsHelper.hxx
+++ b/comphelper/inc/comphelper/SettingsHelper.hxx
@@ -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
diff --git a/comphelper/inc/comphelper/TypeGeneration.hxx b/comphelper/inc/comphelper/TypeGeneration.hxx
index 6660e560f4af..d3659875cd23 100644
--- a/comphelper/inc/comphelper/TypeGeneration.hxx
+++ b/comphelper/inc/comphelper/TypeGeneration.hxx
@@ -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
@@ -31,7 +31,7 @@
 #include <sal/types.h>
 #include "comphelper/comphelperdllapi.h"
 
-#define CPPU_E2T(type)      ((com::sun::star::uno::Type*)type)
+#define CPPU_E2T(type) 		((com::sun::star::uno::Type*)type)
 
 namespace com { namespace sun { namespace star { namespace uno {
     class Type;
@@ -40,66 +40,66 @@ namespace comphelper
 {
     enum CppuTypes
     {
-        CPPUTYPE_UNKNOWN,           // 0 == unknown == error!!!!
+        CPPUTYPE_UNKNOWN,			// 0 == unknown == error!!!!
 
-        CPPUTYPE_BOOLEAN,           //getBooleanCppuType()
-        CPPUTYPE_INT8,              //getCppuType( (sal_Int8*)0 )
-        CPPUTYPE_INT16,             //getCppuType( (sal_Int16*)0 )
-        CPPUTYPE_INT32,             //getCppuType( (sal_Int32*)0 )
-        CPPUTYPE_DOUBLE,            //getCppuType( (double*)0 )
-        CPPUTYPE_FLOAT,             //getCppuType( (float*)0 )
-        CPPUTYPE_OUSTRING,          //getCppuType( (OUString*)0 )
+        CPPUTYPE_BOOLEAN,			//getBooleanCppuType()
+        CPPUTYPE_INT8,				//getCppuType( (sal_Int8*)0 )
+        CPPUTYPE_INT16,				//getCppuType( (sal_Int16*)0 )
+        CPPUTYPE_INT32,				//getCppuType( (sal_Int32*)0 )
+        CPPUTYPE_DOUBLE,			//getCppuType( (double*)0 )
+        CPPUTYPE_FLOAT,				//getCppuType( (float*)0 )
+        CPPUTYPE_OUSTRING,			//getCppuType( (OUString*)0 )
 
-        CPPUTYPE_FONTSLANT,         //getCppuType( (FontSlant*)0 )
-        CPPUTYPE_LOCALE,            //getCppuType( (Locale*)0 )
-        CPPUTYPE_PROPERTYVALUE,     //getCppuType( (Sequence<PropertyValue>*)0 )
-        CPPUTYPE_PROPERTYVALUES,    //getCppuType( (Sequence<PropertyValues>*)0 )
-        CPPUTYPE_BORDERLINE,        //getCppuType( (table::BorderLine*)0 )
-        CPPUTYPE_BREAK,             //getCppuType( (style::BreakType*)0 )
-        CPPUTYPE_GRAPHICLOC,        //getCppuType( (style::GraphicLocation*)0 )
-        CPPUTYPE_DROPCAPFMT,        //getCppuType( (style::DropCapFormat*)0 )
-        CPPUTYPE_LINESPACE,         //getCppuType( (style::LineSpacing*)0 )
-        CPPUTYPE_AWTSIZE,           //getCppuType( (awt::Size*)0 )
-        CPPUTYPE_SHADOWFMT,         //getCppuType( (table::ShadowFormat*)0 )
-        CPPUTYPE_TBLCOLSEP,         //getCppuType( (Sequence<text::TableColumnSeparator>*)0 )
-        CPPUTYPE_PNTSEQSEQ,         //getCppuType( (PointSequenceSequence*)0 )
-        CPPUTYPE_DOCIDXMRK,         //getCppuType( (Sequence< Reference< XDocumentIndexMark > >*)0 )
-        CPPUTYPE_SEQINT8,           //getCppuType( (Sequence<sal_Int8>*)0 )
-        CPPUTYPE_SEQTABSTOP,        //getCppuType( (Sequence<style::TabStop>*)0 )
-        CPPUTYPE_SEQANCHORTYPE,     //getCppuType( (Sequence<text::TextContentAnchorType>*)0 )
-        CPPUTYPE_SEQDEPTXTFLD,      //getCppuType( (Sequence<Reference<XDependentTextField> >*)0 )
-        CPPUTYPE_TXTCNTANCHOR,      //getCppuType( (text::TextContentAnchorType*)0 )
-        CPPUTYPE_WRAPTXTMODE,       //getCppuType( (text::WrapTextMode*)0 )
-        CPPUTYPE_COLORMODE,         //getCppuType( (drawing::ColorMode*)0 )
-        CPPUTYPE_PAGESTYLELAY,      //getCppuType( (style::PageStyleLayout*)0 )
-        CPPUTYPE_VERTALIGN,         //getCppuType( (style::VerticalAlignment*)0 )
-        CPPUTYPE_TABLEBORDER,       //getCppuType( (table::TableBorder*)0 )
-        CPPUTYPE_GRFCROP,           //getCppuType( (text::GraphicCrop*)0 )
-        CPPUTYPE_SECTFILELNK,       //getCppuType( (text::SectionFileLink*)0 )
-        CPPUTYPE_PAGENUMTYPE,       //getCppuType( (const PageNumberType*)0 )
-        CPPUTYPE_DATETIME,          //getCppuType( (util::DateTime*)0 )
-        CPPUTYPE_DATE,              //getCppuType( (util::Date*)0 )
+        CPPUTYPE_FONTSLANT,			//getCppuType( (FontSlant*)0 )
+        CPPUTYPE_LOCALE,			//getCppuType( (Locale*)0 )
+        CPPUTYPE_PROPERTYVALUE,		//getCppuType( (Sequence<PropertyValue>*)0 )
+        CPPUTYPE_PROPERTYVALUES, 	//getCppuType( (Sequence<PropertyValues>*)0 )
+        CPPUTYPE_BORDERLINE,		//getCppuType( (table::BorderLine*)0 )
+        CPPUTYPE_BREAK,				//getCppuType( (style::BreakType*)0 )
+        CPPUTYPE_GRAPHICLOC,		//getCppuType( (style::GraphicLocation*)0 )
+        CPPUTYPE_DROPCAPFMT,		//getCppuType( (style::DropCapFormat*)0 )
+        CPPUTYPE_LINESPACE,			//getCppuType( (style::LineSpacing*)0 )
+        CPPUTYPE_AWTSIZE,			//getCppuType( (awt::Size*)0 )
+        CPPUTYPE_SHADOWFMT,			//getCppuType( (table::ShadowFormat*)0 )
+        CPPUTYPE_TBLCOLSEP,			//getCppuType( (Sequence<text::TableColumnSeparator>*)0 )
+        CPPUTYPE_PNTSEQSEQ,			//getCppuType( (PointSequenceSequence*)0 )
+        CPPUTYPE_DOCIDXMRK,			//getCppuType( (Sequence< Reference< XDocumentIndexMark > >*)0 )
+        CPPUTYPE_SEQINT8,			//getCppuType( (Sequence<sal_Int8>*)0 )
+        CPPUTYPE_SEQTABSTOP,		//getCppuType( (Sequence<style::TabStop>*)0 )
+        CPPUTYPE_SEQANCHORTYPE,		//getCppuType( (Sequence<text::TextContentAnchorType>*)0 )
+        CPPUTYPE_SEQDEPTXTFLD,		//getCppuType( (Sequence<Reference<XDependentTextField> >*)0 )
+        CPPUTYPE_TXTCNTANCHOR,		//getCppuType( (text::TextContentAnchorType*)0 )
+        CPPUTYPE_WRAPTXTMODE,		//getCppuType( (text::WrapTextMode*)0 )
+        CPPUTYPE_COLORMODE,			//getCppuType( (drawing::ColorMode*)0 )
+        CPPUTYPE_PAGESTYLELAY,		//getCppuType( (style::PageStyleLayout*)0 )
+        CPPUTYPE_VERTALIGN,			//getCppuType( (style::VerticalAlignment*)0 )
+        CPPUTYPE_TABLEBORDER,		//getCppuType( (table::TableBorder*)0 )
+        CPPUTYPE_GRFCROP,			//getCppuType( (text::GraphicCrop*)0 )
+        CPPUTYPE_SECTFILELNK,		//getCppuType( (text::SectionFileLink*)0 )
+        CPPUTYPE_PAGENUMTYPE,		//getCppuType( (const PageNumberType*)0 )
+        CPPUTYPE_DATETIME,			//getCppuType( (util::DateTime*)0 )
+        CPPUTYPE_DATE,				//getCppuType( (util::Date*)0 )
 
-        CPPUTYPE_REFINTERFACE,      //getCppuType( (Reference<XInterface>*)0 )
-        CPPUTYPE_REFIDXREPL,        //getCppuType( (Reference<container::XIndexReplace>*)0 )
-        CPPUTYPE_REFNAMECNT,        //getCppuType( (Reference<container::XNameContainer>*)0 )
-        CPPUTYPE_REFTEXTFRAME,      //getCppuType( (Reference<text::XTextFrame>*)0 )
-        CPPUTYPE_REFTEXTSECTION,    //getCppuType( (Reference<text::XTextSection>*)0 )
-        CPPUTYPE_REFFOOTNOTE,       //getCppuType( (Reference<text::XFootnote>*)0 )
-        CPPUTYPE_REFTEXT,           //getCppuType( (Reference<text::XText>*)0 )
-        CPPUTYPE_REFTEXTCOL,        //getCppuType( (Reference<text::XTextColumns>*)0 )
+        CPPUTYPE_REFINTERFACE,		//getCppuType( (Reference<XInterface>*)0 )
+        CPPUTYPE_REFIDXREPL,		//getCppuType( (Reference<container::XIndexReplace>*)0 )
+        CPPUTYPE_REFNAMECNT,		//getCppuType( (Reference<container::XNameContainer>*)0 )
+        CPPUTYPE_REFTEXTFRAME,		//getCppuType( (Reference<text::XTextFrame>*)0 )
+        CPPUTYPE_REFTEXTSECTION,	//getCppuType( (Reference<text::XTextSection>*)0 )
+        CPPUTYPE_REFFOOTNOTE,		//getCppuType( (Reference<text::XFootnote>*)0 )
+        CPPUTYPE_REFTEXT,			//getCppuType( (Reference<text::XText>*)0 )
+        CPPUTYPE_REFTEXTCOL,		//getCppuType( (Reference<text::XTextColumns>*)0 )
 
-        CPPUTYPE_REFFORBCHARS,      //getCppuType( (Reference<XForbiddenCharacters>*)0)
-        CPPUTYPE_REFIDXCNTNR,       //getCppuType( (Reference<XIndexContainer>*)0)
-        CPPUTYPE_REFTEXTCNTNT,      //getCppuType( (Reference<XTextContent>*)0)
-        CPPUTYPE_REFBITMAP,         //getCppuType( (Reference<awt::XBitmap>*)0)
-        CPPUTYPE_REFNMREPLACE,      //getCppuType( (Reference<container::XNameReplace>*)0)
-        CPPUTYPE_REFCELL,           //getCppuType( (Reference<table::XCell>*)0)
-        CPPUTYPE_REFDOCINDEX,       //getCppuType( (Reference<text::XDocumentIndex>*)0)
-        CPPUTYPE_REFDOCIDXMRK,      //getCppuType( (Reference<text::XDocumentIndexMark>*)0)
-        CPPUTYPE_REFTXTFIELD,       //getCppuType( (Reference<text::XTextField>*)0)
-        CPPUTYPE_REFTXTRANGE,       //getCppuType( (Reference<text::XTextRange>*)0)
-        CPPUTYPE_REFTXTTABLE,       //getCppuType( (Reference<text::XTextTable>*)0)
+        CPPUTYPE_REFFORBCHARS,		//getCppuType( (Reference<XForbiddenCharacters>*)0)
+        CPPUTYPE_REFIDXCNTNR,		//getCppuType( (Reference<XIndexContainer>*)0)
+        CPPUTYPE_REFTEXTCNTNT,		//getCppuType( (Reference<XTextContent>*)0)
+        CPPUTYPE_REFBITMAP,			//getCppuType( (Reference<awt::XBitmap>*)0)
+        CPPUTYPE_REFNMREPLACE,		//getCppuType( (Reference<container::XNameReplace>*)0)
+        CPPUTYPE_REFCELL,			//getCppuType( (Reference<table::XCell>*)0)
+        CPPUTYPE_REFDOCINDEX,		//getCppuType( (Reference<text::XDocumentIndex>*)0)
+        CPPUTYPE_REFDOCIDXMRK,		//getCppuType( (Reference<text::XDocumentIndexMark>*)0)
+        CPPUTYPE_REFTXTFIELD,		//getCppuType( (Reference<text::XTextField>*)0)
+        CPPUTYPE_REFTXTRANGE,		//getCppuType( (Reference<text::XTextRange>*)0)
+        CPPUTYPE_REFTXTTABLE,		//getCppuType( (Reference<text::XTextTable>*)0)
         CPPUTYPE_AWTPOINT,          //getCppuType( (awt::Point*)0 )
         CPPUTYPE_REFLIBCONTAINER,   //getCppuType( (Reference< script::XLibraryContainer >*)0)
         CPPUTYPE_SEQANY,            //getCppuType( (Sequence< uno::Any >*)0)
diff --git a/comphelper/inc/comphelper/accessiblecomponenthelper.hxx b/comphelper/inc/comphelper/accessiblecomponenthelper.hxx
index 68fef8eb1f9e..85e36094167d 100644
--- a/comphelper/inc/comphelper/accessiblecomponenthelper.hxx
+++ b/comphelper/inc/comphelper/accessiblecomponenthelper.hxx
@@ -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
@@ -107,8 +107,8 @@ namespace comphelper
     //= OAccessibleExtendedComponentHelper
     //=====================================================================
 
-    typedef ::cppu::ImplHelper1 <   ::com::sun::star::accessibility::XAccessibleExtendedComponent
-                                >   OAccessibleExtendedComponentHelper_Base;
+    typedef	::cppu::ImplHelper1	<	::com::sun::star::accessibility::XAccessibleExtendedComponent
+                                >	OAccessibleExtendedComponentHelper_Base;
 
     /** a helper class for implementing an AccessibleContext which at the same time
         supports an XAccessibleExtendedComponent interface.
@@ -136,7 +136,7 @@ namespace comphelper
     };
 
 //.........................................................................
-}   // namespace comphelper
+}	// namespace comphelper
 //.........................................................................
 
 #endif // COMPHELPER_ACCESSIBLE_COMPONENT_HELPER_HXX
diff --git a/comphelper/inc/comphelper/accessiblecontexthelper.hxx b/comphelper/inc/comphelper/accessiblecontexthelper.hxx
index 32a83ca87219..fdab9baa1fff 100644
--- a/comphelper/inc/comphelper/accessiblecontexthelper.hxx
+++ b/comphelper/inc/comphelper/accessiblecontexthelper.hxx
@@ -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
@@ -64,7 +64,7 @@ namespace comphelper
 
     class OMutexGuard
     {
-        IMutex* m_pMutex;
+        IMutex*	m_pMutex;
     public:
         inline OMutexGuard( IMutex* _pMutex )
             :m_pMutex( _pMutex )
@@ -85,9 +85,9 @@ namespace comphelper
     //=====================================================================
 
     class OContextHelper_Impl;
-    typedef ::cppu::WeakAggComponentImplHelper2 <   ::com::sun::star::accessibility::XAccessibleContext,
+    typedef	::cppu::WeakAggComponentImplHelper2	<	::com::sun::star::accessibility::XAccessibleContext,
                                                     ::com::sun::star::accessibility::XAccessibleEventBroadcaster
-                                                >   OAccessibleContextHelper_Base;
+                                                >	OAccessibleContextHelper_Base;
 
     /** helper class for implementing an AccessibleContext
     */
@@ -96,7 +96,7 @@ namespace comphelper
                 ,public OAccessibleContextHelper_Base
     {
     private:
-        OContextHelper_Impl*    m_pImpl;
+        OContextHelper_Impl*	m_pImpl;
 
     protected:
         OAccessibleContextHelper( );
@@ -143,7 +143,7 @@ namespace comphelper
             XAccessible, we can compare it with all the children, instead of asking all children for their
             context and comparing this context with ourself.</p>
         */
-        void    lateInit( const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >& _rxAccessible );
+        void	lateInit( const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >& _rxAccessible );
 
         /** retrieves the creator previously set with <method>lateInit</method>
         */
@@ -157,7 +157,7 @@ namespace comphelper
             <p>To be used in derived classes which do not supply the external lock themself, but instead get
             them passed from own derivees (or clients).</p>
         */
-        void    forgetExternalLock();
+        void	forgetExternalLock();
 
     public:
         // XAccessibleEventBroadcaster
@@ -200,9 +200,9 @@ namespace comphelper
         };
 
         // ensures that the object is alive
-        inline  void            ensureAlive( const OAccessControl& ) const SAL_THROW( ( ::com::sun::star::lang::DisposedException ) );
-        inline  IMutex*         getExternalLock( const OAccessControl& );
-        inline  ::osl::Mutex&   GetMutex( const OAccessControl& );
+        inline	void			ensureAlive( const OAccessControl& ) const SAL_THROW( ( ::com::sun::star::lang::DisposedException ) );
+        inline	IMutex*			getExternalLock( const OAccessControl& );
+        inline	::osl::Mutex&	GetMutex( const OAccessControl& );
 
     protected:
         // OComponentHelper
@@ -212,15 +212,15 @@ namespace comphelper
         // helper
         /** notifies all AccessibleEventListeners of a certain event
 
-        @precond    not too be called with our mutex locked
-        @param  _nEventId
+        @precond	not too be called with our mutex locked
+        @param	_nEventId
             the id of the even. See AccessibleEventType
-        @param  _rOldValue
+        @param	_rOldValue
             the old value to be notified
-        @param  _rNewValue
+        @param	_rNewValue
             the new value to be notified
         */
-        virtual void SAL_CALL   NotifyAccessibleEvent(
+        virtual void SAL_CALL	NotifyAccessibleEvent(
                     const sal_Int16 _nEventId,
                     const ::com::sun::star::uno::Any& _rOldValue,
                     const ::com::sun::star::uno::Any& _rNewValue
@@ -231,16 +231,16 @@ namespace comphelper
 
             Can even be called with our mutex locked.
 
-        @param  _nEventId
+        @param	_nEventId
             the id of the even. See AccessibleEventType
-        @param  _rOldValue
+        @param	_rOldValue
             the old value to be notified
-        @param  _rNewValue
+        @param	_rNewValue
             the new value to be notified
         @param  _rBuffer
             the buffer that records the event
         */
-        virtual void SAL_CALL   BufferAccessibleEvent(
+        virtual void SAL_CALL	BufferAccessibleEvent(
                     const sal_Int16 _nEventId,
                     const ::com::sun::star::uno::Any& _rOldValue,
                     const ::com::sun::star::uno::Any& _rNewValue,
@@ -249,15 +249,15 @@ namespace comphelper
 
         // life time control
         /// checks whether the object is alive (returns <TRUE/> then) or disposed
-        sal_Bool    isAlive() const;
+        sal_Bool	isAlive() const;
         /// checks for beeing alive. If the object is already disposed (i.e. not alive), an exception is thrown.
-        void        ensureAlive() const SAL_THROW( ( ::com::sun::star::lang::DisposedException ) );
+        void		ensureAlive() const SAL_THROW( ( ::com::sun::star::lang::DisposedException ) );
 
         /** ensures that the object is disposed.
         @precond
             to be called from within the destructor of your derived class only!
         */
-        void        ensureDisposed( );
+        void		ensureDisposed( );
 
         /** shortcut for retrieving the context of the parent (returned by getAccessibleParent)
         */
@@ -265,26 +265,26 @@ namespace comphelper
                     implGetParentContext() SAL_THROW( ( ::com::sun::star::uno::RuntimeException ) );
 
         // access to the base class' broadcast helper/mutex
-        ::cppu::OBroadcastHelper&       GetBroadcastHelper()        { return rBHelper; }
-        const ::cppu::OBroadcastHelper& GetBroadcastHelper() const  { return rBHelper; }
-        ::osl::Mutex&                   GetMutex()                  { return m_aMutex; }
-        IMutex*                         getExternalLock( );
+        ::cppu::OBroadcastHelper&		GetBroadcastHelper()		{ return rBHelper; }
+        const ::cppu::OBroadcastHelper&	GetBroadcastHelper() const	{ return rBHelper; }
+        ::osl::Mutex&					GetMutex()					{ return m_aMutex; }
+        IMutex*							getExternalLock( );
     };
 
     //---------------------------------------------------------------------
-    inline  void OAccessibleContextHelper::ensureAlive( const OAccessControl& ) const SAL_THROW( ( ::com::sun::star::lang::DisposedException ) )
+    inline	void OAccessibleContextHelper::ensureAlive( const OAccessControl& ) const SAL_THROW( ( ::com::sun::star::lang::DisposedException ) )
     {
         ensureAlive();
     }
 
     //---------------------------------------------------------------------
-    inline  IMutex* OAccessibleContextHelper::getExternalLock( const OAccessControl& )
+    inline	IMutex* OAccessibleContextHelper::getExternalLock( const OAccessControl& )
     {
         return getExternalLock();
     }
 
     //---------------------------------------------------------------------
-    inline  ::osl::Mutex& OAccessibleContextHelper::GetMutex( const OAccessControl& )
+    inline	::osl::Mutex& OAccessibleContextHelper::GetMutex( const OAccessControl& )
     {
         return GetMutex();
     }
@@ -292,7 +292,7 @@ namespace comphelper
     //=====================================================================
     //= OContextEntryGuard
     //=====================================================================
-    typedef ::osl::ClearableMutexGuard  OContextEntryGuard_Base;
+    typedef ::osl::ClearableMutexGuard	OContextEntryGuard_Base;
     /** helper class for guarding the entry into OAccessibleContextHelper methods.
 
         <p>The class has two responsibilities:
@@ -368,7 +368,7 @@ namespace comphelper
     }
 
 //.........................................................................
-}   // namespace comphelper
+}	// namespace comphelper
 //.........................................................................
 
 #endif // COMPHELPER_ACCESSIBLE_CONTEXT_HELPER_HXX
diff --git a/comphelper/inc/comphelper/accessibleeventbuffer.hxx b/comphelper/inc/comphelper/accessibleeventbuffer.hxx
index 7f1107df50ad..58bf8a992e06 100644
--- a/comphelper/inc/comphelper/accessibleeventbuffer.hxx
+++ b/comphelper/inc/comphelper/accessibleeventbuffer.hxx
@@ -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
diff --git a/comphelper/inc/comphelper/accessibleeventnotifier.hxx b/comphelper/inc/comphelper/accessibleeventnotifier.hxx
index 7bf5ba76fa0c..e70a56b0265e 100644
--- a/comphelper/inc/comphelper/accessibleeventnotifier.hxx
+++ b/comphelper/inc/comphelper/accessibleeventnotifier.hxx
@@ -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
@@ -50,21 +50,21 @@ namespace comphelper
     {
     // typedefs
     public:
-        typedef sal_uInt32  TClientId;
+        typedef sal_uInt32	TClientId;
 
         typedef ::std::pair< TClientId, ::com::sun::star::accessibility::AccessibleEventObject >
                                                                                     ClientEvent;
 
-        typedef ::cppu::OInterfaceContainerHelper                                   EventListeners;
-        typedef ::std::map< TClientId, EventListeners*, ::std::less< TClientId > >  ClientMap;
+        typedef ::cppu::OInterfaceContainerHelper									EventListeners;
+        typedef ::std::map< TClientId, EventListeners*, ::std::less< TClientId > >	ClientMap;
 
     protected:
-        AccessibleEventNotifier( );     // never implemented
-        ~AccessibleEventNotifier( );    // never implemented
+        AccessibleEventNotifier( );		// never implemented
+        ~AccessibleEventNotifier( );	// never implemented
 
     private:
-        COMPHELPER_DLLPRIVATE AccessibleEventNotifier( const AccessibleEventNotifier& );                // never implemented!
-        COMPHELPER_DLLPRIVATE AccessibleEventNotifier& operator=( const AccessibleEventNotifier& ); // never implemented!
+        COMPHELPER_DLLPRIVATE AccessibleEventNotifier( const AccessibleEventNotifier& );				// never implemented!
+        COMPHELPER_DLLPRIVATE AccessibleEventNotifier& operator=( const AccessibleEventNotifier& );	// never implemented!
 
     public:
         /** registers a client of this class, means a broadcaster of AccessibleEvents
@@ -73,7 +73,7 @@ namespace comphelper
             dies, it <b>must</b> call <member>revokeClient</member> or <member>revokeClientNotifyDisposing</member>
             explicitly itself.</p>
         */
-        static  TClientId   registerClient( );
+        static	TClientId	registerClient( );
 
         /** revokes a broadcaster of AccessibleEvents
 
@@ -83,10 +83,10 @@ namespace comphelper
             When the client is disposed, you should prefer <member>revokeClientNotifyDisposing</member></p>
 
             <p>Any possibly pending events for this client are removed from the queue.</p>
-
+    
             @seealso revokeClientNotifyDisposing
         */
-        static  void        revokeClient( const TClientId _nClient );
+        static	void		revokeClient( const TClientId _nClient );
 
         /** revokes a client, with additionally notifying a disposing event to all listeners registered for
             this client
@@ -99,7 +99,7 @@ namespace comphelper
                 the source to be notified together with the <member scope="com.sun.star.lang">XComponent::disposing</member>
                 call.
         */
-        static  void        revokeClientNotifyDisposing(
+        static	void		revokeClientNotifyDisposing(
                         const TClientId _nClient,
                         const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _rxEventSource
                     ) SAL_THROW( ( ) );
@@ -138,14 +138,14 @@ namespace comphelper
             @param _nClient
                 the id of the client which needs to broadcast the event
         */
-        static void addEvent(
+        static void	addEvent(
                         const TClientId _nClient,
                         const ::com::sun::star::accessibility::AccessibleEventObject& _rEvent
                     ) SAL_THROW( ( ) );
 
     private:
         /// generates a new client id
-        COMPHELPER_DLLPRIVATE static    TClientId   generateId();
+        COMPHELPER_DLLPRIVATE static	TClientId	generateId();
 
         /** looks up a client in our client map, asserts if it cannot find it or no event thread is present
 
@@ -161,11 +161,11 @@ namespace comphelper
                 <TRUE/> if and only if the client could be found and <arg>_rPos</arg> has been filled with
                 it's position
         */
-        COMPHELPER_DLLPRIVATE static    sal_Bool    implLookupClient( const TClientId _nClient, ClientMap::iterator& _rPos );
+        COMPHELPER_DLLPRIVATE static	sal_Bool	implLookupClient( const TClientId _nClient, ClientMap::iterator& _rPos );
     };
 
 //.........................................................................
-}   // namespace comphelper
+}	// namespace comphelper
 //.........................................................................
 
 #endif // COMPHELPER_ACCESSIBLE_EVENT_NOTIFIER
diff --git a/comphelper/inc/comphelper/accessiblekeybindinghelper.hxx b/comphelper/inc/comphelper/accessiblekeybindinghelper.hxx
index 4a7777727290..bcd4c89bfb48 100644
--- a/comphelper/inc/comphelper/accessiblekeybindinghelper.hxx
+++ b/comphelper/inc/comphelper/accessiblekeybindinghelper.hxx
@@ -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
@@ -47,8 +47,8 @@ namespace comphelper
     // OAccessibleKeyBindingHelper
     //==============================================================================
 
-    typedef ::cppu::WeakImplHelper1 <   ::com::sun::star::accessibility::XAccessibleKeyBinding
-                                    >   OAccessibleKeyBindingHelper_Base;
+    typedef	::cppu::WeakImplHelper1 <	::com::sun::star::accessibility::XAccessibleKeyBinding
+                                    >	OAccessibleKeyBindingHelper_Base;
 
     /** a helper class for implementing an accessible keybinding
      */
@@ -56,11 +56,11 @@ namespace comphelper
     {
     private:
         typedef ::std::vector< ::com::sun::star::uno::Sequence< ::com::sun::star::awt::KeyStroke > > KeyBindings;
-
-        KeyBindings     m_aKeyBindings;
+        
+        KeyBindings		m_aKeyBindings;
 
     protected:
-        ::osl::Mutex    m_aMutex;
+        ::osl::Mutex	m_aMutex;
 
         virtual ~OAccessibleKeyBindingHelper();
 
@@ -77,7 +77,7 @@ namespace comphelper
     };
 
 //..............................................................................
-}   // namespace comphelper
+}	// namespace comphelper
 //..............................................................................
 
 #endif // COMPHELPER_ACCESSIBLE_KEYBINDING_HELPER_HXX
diff --git a/comphelper/inc/comphelper/accessibleselectionhelper.hxx b/comphelper/inc/comphelper/accessibleselectionhelper.hxx
index 12c31b39046c..1b3c82730c5f 100644
--- a/comphelper/inc/comphelper/accessibleselectionhelper.hxx
+++ b/comphelper/inc/comphelper/accessibleselectionhelper.hxx
@@ -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
@@ -60,22 +60,22 @@ namespace comphelper
     protected:
 
         // access to context - still waiting to be overwritten
-        virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleContext >
-            implGetAccessibleContext()
+        virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleContext > 
+            implGetAccessibleContext() 
             throw ( ::com::sun::star::uno::RuntimeException ) = 0;
 
         // return if the specified child is visible => watch for special ChildIndexes (ACCESSIBLE_SELECTION_CHILD_xxx)
-        virtual sal_Bool
-            implIsSelected( sal_Int32 nAccessibleChildIndex )
+        virtual sal_Bool 
+            implIsSelected( sal_Int32 nAccessibleChildIndex ) 
             throw (::com::sun::star::uno::RuntimeException) = 0;
 
         // select the specified child => watch for special ChildIndexes (ACCESSIBLE_SELECTION_CHILD_xxx)
         virtual void
-            implSelect( sal_Int32 nAccessibleChildIndex, sal_Bool bSelect )
+            implSelect( sal_Int32 nAccessibleChildIndex, sal_Bool bSelect ) 
             throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException) = 0;
 
     protected:
-
+        
         /** non-virtual versions of the methods which can be implemented using <method>implIsSelected</method> and <method>implSelect</method>
         */
         void SAL_CALL selectAccessibleChild( sal_Int32 nChildIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException);
@@ -91,7 +91,7 @@ namespace comphelper
     //= OAccessibleSelectionHelper
     //=====================================================================
 
-    typedef ::cppu::ImplHelper1< ::com::sun::star::accessibility::XAccessibleSelection > OAccessibleSelectionHelper_Base;
+    typedef	::cppu::ImplHelper1< ::com::sun::star::accessibility::XAccessibleSelection > OAccessibleSelectionHelper_Base;
 
     /** a helper class for implementing an AccessibleSelection which at the same time
         supports an XAccessibleSelection interface.
@@ -101,7 +101,7 @@ namespace comphelper
                                        public OAccessibleSelectionHelper_Base
     {
     protected:
-
+        
         OAccessibleSelectionHelper( );
 
         /// see the respective base class ctor for an extensive comment on this, please
@@ -111,7 +111,7 @@ namespace comphelper
         virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleContext > implGetAccessibleContext() throw ( ::com::sun::star::uno::RuntimeException );
 
     public:
-
+        
         // XInterface
         DECLARE_XINTERFACE( )
         DECLARE_XTYPEPROVIDER( )
@@ -127,7 +127,7 @@ namespace comphelper
     };
 
 //.........................................................................
-}   // namespace comphelper
+}	// namespace comphelper
 //.........................................................................
 
 #endif // COMPHELPER_ACCESSIBLE_SELECTION_HELPER_HXX
diff --git a/comphelper/inc/comphelper/accessibletexthelper.hxx b/comphelper/inc/comphelper/accessibletexthelper.hxx
index 85ad893fd4c4..a5e883c278b3 100644
--- a/comphelper/inc/comphelper/accessibletexthelper.hxx
+++ b/comphelper/inc/comphelper/accessibletexthelper.hxx
@@ -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
@@ -51,26 +51,26 @@ namespace comphelper
     class COMPHELPER_DLLPUBLIC OCommonAccessibleText
     {
     private:
-        ::com::sun::star::uno::Reference < ::com::sun::star::i18n::XBreakIterator >             m_xBreakIter;
-        ::com::sun::star::uno::Reference < ::com::sun::star::i18n::XCharacterClassification >   m_xCharClass;
+        ::com::sun::star::uno::Reference < ::com::sun::star::i18n::XBreakIterator >				m_xBreakIter;
+        ::com::sun::star::uno::Reference < ::com::sun::star::i18n::XCharacterClassification >	m_xCharClass;
 
     protected:
         OCommonAccessibleText();
         virtual ~OCommonAccessibleText();
 
-        ::com::sun::star::uno::Reference < ::com::sun::star::i18n::XBreakIterator >             implGetBreakIterator();
-        ::com::sun::star::uno::Reference < ::com::sun::star::i18n::XCharacterClassification >   implGetCharacterClassification();
-        sal_Bool                                implIsValidBoundary( ::com::sun::star::i18n::Boundary& rBoundary, sal_Int32 nLength );
-        virtual sal_Bool                        implIsValidIndex( sal_Int32 nIndex, sal_Int32 nLength );
-        virtual sal_Bool                        implIsValidRange( sal_Int32 nStartIndex, sal_Int32 nEndIndex, sal_Int32 nLength );
-        virtual ::rtl::OUString                 implGetText() = 0;
-        virtual ::com::sun::star::lang::Locale  implGetLocale() = 0;
-        virtual void                            implGetSelection( sal_Int32& nStartIndex, sal_Int32& nEndIndex ) = 0;
-        virtual void                            implGetGlyphBoundary( ::com::sun::star::i18n::Boundary& rBoundary, sal_Int32 nIndex );
-        virtual sal_Bool                        implGetWordBoundary( ::com::sun::star::i18n::Boundary& rBoundary, sal_Int32 nIndex );
-        virtual void                            implGetSentenceBoundary( ::com::sun::star::i18n::Boundary& rBoundary, sal_Int32 nIndex );
-        virtual void                            implGetParagraphBoundary( ::com::sun::star::i18n::Boundary& rBoundary, sal_Int32 nIndex );
-        virtual void                            implGetLineBoundary( ::com::sun::star::i18n::Boundary& rBoundary, sal_Int32 nIndex );
+        ::com::sun::star::uno::Reference < ::com::sun::star::i18n::XBreakIterator >				implGetBreakIterator();
+        ::com::sun::star::uno::Reference < ::com::sun::star::i18n::XCharacterClassification >	implGetCharacterClassification();
+        sal_Bool								implIsValidBoundary( ::com::sun::star::i18n::Boundary& rBoundary, sal_Int32 nLength );
+        virtual sal_Bool						implIsValidIndex( sal_Int32 nIndex, sal_Int32 nLength );
+        virtual sal_Bool						implIsValidRange( sal_Int32 nStartIndex, sal_Int32 nEndIndex, sal_Int32 nLength );
+        virtual ::rtl::OUString					implGetText() = 0;
+        virtual ::com::sun::star::lang::Locale	implGetLocale() = 0;
+        virtual void							implGetSelection( sal_Int32& nStartIndex, sal_Int32& nEndIndex ) = 0;
+        virtual void							implGetGlyphBoundary( ::com::sun::star::i18n::Boundary& rBoundary, sal_Int32 nIndex );
+        virtual sal_Bool						implGetWordBoundary( ::com::sun::star::i18n::Boundary& rBoundary, sal_Int32 nIndex );
+        virtual void							implGetSentenceBoundary( ::com::sun::star::i18n::Boundary& rBoundary, sal_Int32 nIndex );
+        virtual void							implGetParagraphBoundary( ::com::sun::star::i18n::Boundary& rBoundary, sal_Int32 nIndex );
+        virtual void							implGetLineBoundary( ::com::sun::star::i18n::Boundary& rBoundary, sal_Int32 nIndex );
 
         /** non-virtual versions of the methods
         */
@@ -84,22 +84,22 @@ namespace comphelper
         ::com::sun::star::accessibility::TextSegment SAL_CALL getTextAtIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException);
         ::com::sun::star::accessibility::TextSegment SAL_CALL getTextBeforeIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException);
         ::com::sun::star::accessibility::TextSegment SAL_CALL getTextBehindIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException);
-
+        
     public:
-
+    
         /** Helper method, that detects the difference between
             two strings and returns the deleted selection and
             the inserted selection if available.
-
+            
             @returns true if there are differences between the
             two strings and false if both are equal
-
+            
             @see ::com::sun::star::accessibility::AccessibleEventId
                  ::com::sun::star::accessibility::TextSegment
         */
         static bool implInitTextChangedEvent(
-            const rtl::OUString& rOldString,
-            const rtl::OUString& rNewString,
+            const rtl::OUString& rOldString, 
+            const rtl::OUString& rNewString, 		
             /*out*/ ::com::sun::star::uno::Any& rDeleted,
             /*out*/ ::com::sun::star::uno::Any& rInserted); // throw()
     };
@@ -109,8 +109,8 @@ namespace comphelper
     // OAccessibleTextHelper
     //==============================================================================
 
-    typedef ::cppu::ImplHelper1 <   ::com::sun::star::accessibility::XAccessibleText
-                                >   OAccessibleTextHelper_Base;
+    typedef	::cppu::ImplHelper1 <	::com::sun::star::accessibility::XAccessibleText
+                                >	OAccessibleTextHelper_Base;
 
     /** a helper class for implementing an AccessibleExtendedComponent which at the same time
         supports an XAccessibleText interface
@@ -123,7 +123,7 @@ namespace comphelper
         OAccessibleTextHelper();
         // see the respective base class ctor for an extensive comment on this, please
         OAccessibleTextHelper( IMutex* _pExternalLock );
-
+                                  
     public:
         // XInterface
         DECLARE_XINTERFACE( )
@@ -145,7 +145,7 @@ namespace comphelper
     };
 
 //..............................................................................
-}   // namespace comphelper
+}	// namespace comphelper
 //..............................................................................
 
 #endif // COMPHELPER_ACCESSIBLE_TEXT_HELPER_HXX
@@ -153,33 +153,33 @@ namespace comphelper
 
 // -----------------------------------------------------------------------------
 //
-//  OAccessibleTextHelper is a helper class for implementing the
+//	OAccessibleTextHelper is a helper class for implementing the 
 //  XAccessibleText interface.
 //
-//  The following methods have a default implementation:
-//
-//      getCharacter
-//      getCharacterCount
-//      getSelectedText
-//      getSelectionStart
-//      getSelectionEnd
-//      getText
-//      getTextRange
-//      getTextAtIndex
-//      getTextBeforeIndex
-//      getTextBehindIndex
+//	The following methods have a default implementation:
 //
-//  The following methods must be overriden by derived classes:
+//		getCharacter
+//		getCharacterCount
+//		getSelectedText
+//		getSelectionStart
+//		getSelectionEnd
+//		getText
+//		getTextRange
+//		getTextAtIndex
+//		getTextBeforeIndex
+//		getTextBehindIndex
 //
-//      implGetText
-//      implGetLocale
-//      implGetSelection
-//      getCaretPosition
-//      setCaretPosition
-//      getCharacterAttributes
-//      getCharacterBounds
-//      getIndexAtPoint
-//      setSelection
-//      copyText
+//	The following methods must be overriden by derived classes:
 //
+//		implGetText
+//		implGetLocale
+//		implGetSelection
+//		getCaretPosition
+//		setCaretPosition
+//		getCharacterAttributes
+//		getCharacterBounds
+//		getIndexAtPoint
+//		setSelection
+//		copyText
+//	
 // -----------------------------------------------------------------------------
diff --git a/comphelper/inc/comphelper/accessiblewrapper.hxx b/comphelper/inc/comphelper/accessiblewrapper.hxx
index 3157142e990f..4b8b26b45d49 100644
--- a/comphelper/inc/comphelper/accessiblewrapper.hxx
+++ b/comphelper/inc/comphelper/accessiblewrapper.hxx
@@ -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
@@ -67,7 +67,7 @@ namespace comphelper
     */
     class COMPHELPER_DLLPUBLIC OAccessibleWrapper:public OAccessibleWrapper_Base
                             ,public OComponentProxyAggregation
-
+                            
     {
     private:
         ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >
@@ -118,17 +118,17 @@ namespace comphelper
         ~OAccessibleWrapper( );
 
     private:
-        COMPHELPER_DLLPRIVATE OAccessibleWrapper( );                                        // never implemented
-        COMPHELPER_DLLPRIVATE OAccessibleWrapper( const OAccessibleWrapper& );          // never implemented
-        COMPHELPER_DLLPRIVATE OAccessibleWrapper& operator=( const OAccessibleWrapper& );   // never implemented
+        COMPHELPER_DLLPRIVATE OAccessibleWrapper( );										// never implemented
+        COMPHELPER_DLLPRIVATE OAccessibleWrapper( const OAccessibleWrapper& );			// never implemented
+        COMPHELPER_DLLPRIVATE OAccessibleWrapper& operator=( const OAccessibleWrapper& );	// never implemented
     };
 
     //=========================================================================
     //= OAccessibleContextWrapperHelper
     //=========================================================================
 
-    typedef ::cppu::ImplHelper1 <   ::com::sun::star::accessibility::XAccessibleEventListener
-                                >   OAccessibleContextWrapperHelper_Base;
+    typedef ::cppu::ImplHelper1	<	::com::sun::star::accessibility::XAccessibleEventListener
+                                >	OAccessibleContextWrapperHelper_Base;
 
     /** Helper for wrapping an XAccessibleContext by aggregating a proxy for it.
 
@@ -160,7 +160,7 @@ namespace comphelper
         ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >
                                                             m_xParentAccessible;
 
-        OWrappedAccessibleChildrenManager*                  m_pChildMapper;         // for mapping children from our inner context to our callers
+        OWrappedAccessibleChildrenManager*					m_pChildMapper;			// for mapping children from our inner context to our callers
 
     protected:
         /** ctor
@@ -229,17 +229,17 @@ namespace comphelper
     protected:
         ~OAccessibleContextWrapperHelper( );
 
-        OAccessibleContextWrapperHelper( );                                             // never implemented
-        OAccessibleContextWrapperHelper( const OAccessibleContextWrapperHelper& );              // never implemented
-        OAccessibleContextWrapperHelper& operator=( const OAccessibleContextWrapperHelper& );   // never implemented
+        OAccessibleContextWrapperHelper( );												// never implemented
+        OAccessibleContextWrapperHelper( const OAccessibleContextWrapperHelper& );				// never implemented
+        OAccessibleContextWrapperHelper& operator=( const OAccessibleContextWrapperHelper& );	// never implemented
     };
 
     //=========================================================================
     //= OAccessibleContextWrapper
     //=========================================================================
-    typedef ::cppu::WeakComponentImplHelper2<   ::com::sun::star::accessibility::XAccessibleEventBroadcaster
-                                            ,   ::com::sun::star::accessibility::XAccessibleContext
-                                            >   OAccessibleContextWrapper_CBase;
+    typedef ::cppu::WeakComponentImplHelper2<	::com::sun::star::accessibility::XAccessibleEventBroadcaster
+                                            ,	::com::sun::star::accessibility::XAccessibleContext
+                                            >	OAccessibleContextWrapper_CBase;
 
     class COMPHELPER_DLLPUBLIC OAccessibleContextWrapper
                     :public OBaseMutex
@@ -247,7 +247,7 @@ namespace comphelper
                     ,public OAccessibleContextWrapperHelper
     {
     private:
-        ::comphelper::AccessibleEventNotifier::TClientId    m_nNotifierClient;      // for notifying AccessibleEvents
+        ::comphelper::AccessibleEventNotifier::TClientId	m_nNotifierClient;		// for notifying AccessibleEvents
 
     public:
         /** ctor
@@ -311,23 +311,23 @@ namespace comphelper
         virtual ~OAccessibleContextWrapper();
 
     private:
-        COMPHELPER_DLLPRIVATE OAccessibleContextWrapper();                                              // never implemented
-        COMPHELPER_DLLPRIVATE OAccessibleContextWrapper( const OAccessibleContextWrapper& );                // never implemented
-        COMPHELPER_DLLPRIVATE OAccessibleContextWrapper& operator=( const OAccessibleContextWrapper& ); // never implemented
+        COMPHELPER_DLLPRIVATE OAccessibleContextWrapper();												// never implemented
+        COMPHELPER_DLLPRIVATE OAccessibleContextWrapper( const OAccessibleContextWrapper& );				// never implemented
+        COMPHELPER_DLLPRIVATE OAccessibleContextWrapper& operator=( const OAccessibleContextWrapper& );	// never implemented
     };
 
     //=========================================================================
     //= OWrappedAccessibleChildrenManager
     //=========================================================================
 
-    typedef ::std::map  <   ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >
-                        ,   ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >
-                        ,   OInterfaceCompare< ::com::sun::star::accessibility::XAccessible >
-                        >   AccessibleMap;
+    typedef	::std::map	<	::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >
+                        ,	::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >
+                        ,	OInterfaceCompare< ::com::sun::star::accessibility::XAccessible >
+                        >	AccessibleMap;
                         // TODO: think about if we should hold these objects weak
 
-    typedef ::cppu::WeakImplHelper1 <   ::com::sun::star::lang::XEventListener
-                                    >   OWrappedAccessibleChildrenManager_Base;
+    typedef ::cppu::WeakImplHelper1	<	::com::sun::star::lang::XEventListener
+                                    >	OWrappedAccessibleChildrenManager_Base;
     /** manages wrapping XAccessible's to XAccessible's
     */
     class COMPHELPER_DLLPUBLIC OWrappedAccessibleChildrenManager : public OWrappedAccessibleChildrenManager_Base
@@ -336,9 +336,9 @@ namespace comphelper
         ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >
                                 m_xORB;
         ::com::sun::star::uno::WeakReference< ::com::sun::star::accessibility::XAccessible >
-                                m_aOwningAccessible;    // the XAccessible which belongs to the XAccessibleContext which we work for
-        AccessibleMap           m_aChildrenMap;         // for caching children
-        sal_Bool                m_bTransientChildren;   // are we prohibited to cache our children?
+                                m_aOwningAccessible;	// the XAccessible which belongs to the XAccessibleContext which we work for
+        AccessibleMap			m_aChildrenMap;			// for caching children
+        sal_Bool				m_bTransientChildren;	// are we prohibited to cache our children?
 
     public:
         /// ctor
@@ -349,12 +349,12 @@ namespace comphelper
         /** specifies if the children are to be consideren transient (i.e.: not cached)
             <p>to be called only once per lifetime</p>
         */
-        void    setTransientChildren( sal_Bool _bSet = sal_True );
+        void	setTransientChildren( sal_Bool _bSet = sal_True );
 
         /** sets the XAccessible which belongs to the XAccessibleContext which we work for
             <p>to be called only once per lifetime</p>
         */
-        void    setOwningAccessible( const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >& _rxAcc );
+        void	setOwningAccessible( const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >& _rxAcc );
 
         /// retrieves a wrapper for the given accessible
         ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >
@@ -364,27 +364,27 @@ namespace comphelper
                 );
 
         /// erases the given key from the map (if it is present there)
-        void    removeFromCache( const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >& _rxKey );
+        void	removeFromCache( const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >& _rxKey );
 
         /// invalidates (i.e. empties) the map
-        void    invalidateAll( );
+        void	invalidateAll( );
 
         /** disposes (i.e. cleares) the manager
 
             <p>Note that the XAccessibleContext's of the mapped XAccessible objects are disposed, too.</p>
         */
-        void    dispose();
+        void	dispose();
 
         /** handles a notification as got from the parent of the children we're managing
             <p>This applies only to the notifications which have a direct impact on our map.</p>
         */
-        void    handleChildNotification( const ::com::sun::star::accessibility::AccessibleEventObject& _rEvent );
+        void	handleChildNotification( const ::com::sun::star::accessibility::AccessibleEventObject& _rEvent );
 
         /** translates events as got from the parent of the children we're managing
             <p>This applies only to the notifications which deal with child objects which we manage.</p>
         */
-        void    translateAccessibleEvent(
-            const   ::com::sun::star::accessibility::AccessibleEventObject& _rEvent,
+        void	translateAccessibleEvent(
+            const	::com::sun::star::accessibility::AccessibleEventObject& _rEvent,
                     ::com::sun::star::accessibility::AccessibleEventObject& _rTranslatedEvent
         );
 
@@ -393,19 +393,19 @@ namespace comphelper
         virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw (::com::sun::star::uno::RuntimeException);
 
     protected:
-        void    implTranslateChildEventValue( const ::com::sun::star::uno::Any& _rInValue, ::com::sun::star::uno::Any& _rOutValue );
+        void	implTranslateChildEventValue( const ::com::sun::star::uno::Any& _rInValue, ::com::sun::star::uno::Any& _rOutValue );
 
     protected:
         ~OWrappedAccessibleChildrenManager( );
 
     private:
-        COMPHELPER_DLLPRIVATE OWrappedAccessibleChildrenManager( );                                                     // never implemented
-        COMPHELPER_DLLPRIVATE OWrappedAccessibleChildrenManager( const OWrappedAccessibleChildrenManager& );                // never implemented
-        COMPHELPER_DLLPRIVATE OWrappedAccessibleChildrenManager& operator=( const OWrappedAccessibleChildrenManager& ); // never implemented
+        COMPHELPER_DLLPRIVATE OWrappedAccessibleChildrenManager( );														// never implemented
+        COMPHELPER_DLLPRIVATE OWrappedAccessibleChildrenManager( const OWrappedAccessibleChildrenManager& );				// never implemented
+        COMPHELPER_DLLPRIVATE OWrappedAccessibleChildrenManager& operator=( const OWrappedAccessibleChildrenManager& );	// never implemented
     };
 
 //.............................................................................
-}   // namespace accessibility
+}	// namespace accessibility
 //.............................................................................
 
 #endif // COMPHELPER_ACCESSIBLE_WRAPPER_HXX
diff --git a/comphelper/inc/comphelper/accimplaccess.hxx b/comphelper/inc/comphelper/accimplaccess.hxx
index 8c0052ceae61..9fda7df636f2 100644
--- a/comphelper/inc/comphelper/accimplaccess.hxx
+++ b/comphelper/inc/comphelper/accimplaccess.hxx
@@ -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
@@ -46,8 +46,8 @@ namespace comphelper
     //=====================================================================
     //= OAccessibleImplementationAccess
     //=====================================================================
-    typedef ::cppu::ImplHelper1 <   ::com::sun::star::lang::XUnoTunnel
-                                >   OAccImpl_Base;
+    typedef	::cppu::ImplHelper1	<	::com::sun::star::lang::XUnoTunnel
+                                >	OAccImpl_Base;
     struct OAccImpl_Impl;
 
     /** This is a helper class which allows accessing several aspects of the the implementation
@@ -75,7 +75,7 @@ namespace comphelper
     class COMPHELPER_DLLPUBLIC OAccessibleImplementationAccess : public OAccImpl_Base
     {
     private:
-        OAccImpl_Impl*  m_pImpl;
+        OAccImpl_Impl*	m_pImpl;
 
     protected:
         /// retrieves the parent previously set via <method>setAccessibleParent</method>
@@ -86,14 +86,14 @@ namespace comphelper
         @return
             a bit mask, where a set bit 2^n means that the AccessibleStateType n has been set
         */
-        sal_Int64   implGetForeignControlledStates( ) const;
+        sal_Int64	implGetForeignControlledStates( ) const;
 
         /// sets the accessible parent component
-        virtual void    setAccessibleParent(
+        virtual	void	setAccessibleParent(
             const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >& _rxAccParent );
 
         /// sets or resets a bit of the foreign controlled states
-        virtual void    setStateBit( const sal_Int16 _nState, const sal_Bool _bSet );
+        virtual	void	setStateBit( const sal_Int16 _nState, const sal_Bool _bSet );
 
     protected:
         OAccessibleImplementationAccess( );
@@ -113,7 +113,7 @@ namespace comphelper
             is an invalid context (which means it is <NULL/>, or the implementation is not derived
             from <type>OAccessibleImplementationAccess</type>, or retrieving the implementation failed).
         */
-        static OAccessibleImplementationAccess* getImplementation(
+        static OAccessibleImplementationAccess* getImplementation( 
             const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleContext >& _rxComponent
         );
 
@@ -128,7 +128,7 @@ namespace comphelper
             <TRUE/> in case of success, <FALSE/> otherwise. For error condition please look at
             <method>getImplementation</method>.
         */
-        static sal_Bool setAccessibleParent(
+        static sal_Bool	setAccessibleParent(
             const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleContext >& _rxComponent,
             const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >& _rxNewParent
         );
@@ -145,19 +145,19 @@ namespace comphelper
             <TRUE/> in case of success, <FALSE/> otherwise. For error condition please look at
             <method>getImplementation</method>.
         */
-        static sal_Bool setForeignControlledState(
+        static sal_Bool	setForeignControlledState(
             const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleContext >& _rxComponent,
             const sal_Int16 _nState,
-            const sal_Bool  _bSet
+            const sal_Bool	_bSet
         );
-
+            
 
     private:
         COMPHELPER_DLLPRIVATE static const ::com::sun::star::uno::Sequence< sal_Int8 >& getUnoTunnelImplementationId();
     };
 
 //.........................................................................
-}   // namespace comphelper
+}	// namespace comphelper
 //.........................................................................
 
 
diff --git a/comphelper/inc/comphelper/anytostring.hxx b/comphelper/inc/comphelper/anytostring.hxx
index 92c1685fb440..18c86a084bec 100644
--- a/comphelper/inc/comphelper/anytostring.hxx
+++ b/comphelper/inc/comphelper/anytostring.hxx
@@ -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
@@ -36,7 +36,7 @@ namespace comphelper
 {
 
 /** Creates a STRING representation out of an ANY value.
-
+    
     @param value
            ANY value
     @return
diff --git a/comphelper/inc/comphelper/asyncnotification.hxx b/comphelper/inc/comphelper/asyncnotification.hxx
index fc4dfcd48dd9..e8a87965d1dd 100644
--- a/comphelper/inc/comphelper/asyncnotification.hxx
+++ b/comphelper/inc/comphelper/asyncnotification.hxx
@@ -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
diff --git a/comphelper/inc/comphelper/attributelist.hxx b/comphelper/inc/comphelper/attributelist.hxx
index f408f6496fb9..ebcbbc053235 100644
--- a/comphelper/inc/comphelper/attributelist.hxx
+++ b/comphelper/inc/comphelper/attributelist.hxx
@@ -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,17 +56,17 @@ public:
     void AppendAttributeList( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & );
 
     // ::com::sun::star::xml::sax::XAttributeList
-    virtual sal_Int16 SAL_CALL getLength(void)
+    virtual sal_Int16 SAL_CALL getLength(void) 
         throw( ::com::sun::star::uno::RuntimeException );
-    virtual ::rtl::OUString SAL_CALL getNameByIndex(sal_Int16 i)
+    virtual ::rtl::OUString SAL_CALL getNameByIndex(sal_Int16 i) 
         throw( ::com::sun::star::uno::RuntimeException );
-    virtual ::rtl::OUString SAL_CALL getTypeByIndex(sal_Int16 i)
+    virtual ::rtl::OUString SAL_CALL getTypeByIndex(sal_Int16 i) 
         throw( ::com::sun::star::uno::RuntimeException );
-    virtual ::rtl::OUString SAL_CALL getTypeByName(const ::rtl::OUString& aName)
+    virtual ::rtl::OUString SAL_CALL getTypeByName(const ::rtl::OUString& aName) 
         throw( ::com::sun::star::uno::RuntimeException );
-    virtual ::rtl::OUString SAL_CALL getValueByIndex(sal_Int16 i)
+    virtual ::rtl::OUString SAL_CALL getValueByIndex(sal_Int16 i) 
         throw( ::com::sun::star::uno::RuntimeException );
-    virtual ::rtl::OUString SAL_CALL getValueByName(const ::rtl::OUString& aName)
+    virtual ::rtl::OUString SAL_CALL getValueByName(const ::rtl::OUString& aName) 
         throw( ::com::sun::star::uno::RuntimeException );
 
 };
diff --git a/comphelper/inc/comphelper/basicio.hxx b/comphelper/inc/comphelper/basicio.hxx
index 13ec58954d7d..df93dd9abcfe 100644
--- a/comphelper/inc/comphelper/basicio.hxx
+++ b/comphelper/inc/comphelper/basicio.hxx
@@ -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
@@ -37,9 +37,9 @@ namespace comphelper
 {
 //.........................................................................
 
-namespace stario    = ::com::sun::star::io;
-namespace staruno   = ::com::sun::star::uno;
-namespace starawt   = ::com::sun::star::awt;
+namespace stario	= ::com::sun::star::io;
+namespace staruno	= ::com::sun::star::uno;
+namespace starawt	= ::com::sun::star::awt;
 
 // sal_Bool
 COMPHELPER_DLLPUBLIC const staruno::Reference<stario::XObjectInputStream>& operator >> (const staruno::Reference<stario::XObjectInputStream>& _rxInStream, sal_Bool& _rVal);
@@ -99,7 +99,7 @@ const staruno::Reference<stario::XObjectOutputStream>& operator << (const starun
 }
 
 //.........................................................................
-}   // namespace comphelper
+}	// namespace comphelper
 //.........................................................................
 
 #endif // _COMPHELPER_BASIC_IO_HXX_
diff --git a/comphelper/inc/comphelper/broadcasthelper.hxx b/comphelper/inc/comphelper/broadcasthelper.hxx
index 9e3f4816238c..3ed96e599190 100644
--- a/comphelper/inc/comphelper/broadcasthelper.hxx
+++ b/comphelper/inc/comphelper/broadcasthelper.hxx
@@ -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
@@ -38,23 +38,23 @@ namespace comphelper
 
     //==================================================================================
     //= OMutexAndBroadcastHelper - a class which holds a Mutex and a OBroadcastHelper;
-    //=                 needed because when deriving from OPropertySetHelper,
-    //=                 the OBroadcastHelper has to be initialized before
-    //=                 the OPropertySetHelper
+    //=					needed because when deriving from OPropertySetHelper,
+    //=					the OBroadcastHelper has to be initialized before
+    //=					the OPropertySetHelper
     //==================================================================================
     class OMutexAndBroadcastHelper
     {
     protected:
-        ::osl::Mutex                m_aMutex;
-        ::cppu::OBroadcastHelper    m_aBHelper;
-
+        ::osl::Mutex				m_aMutex;
+        ::cppu::OBroadcastHelper	m_aBHelper;
+        
     public:
         OMutexAndBroadcastHelper() : m_aBHelper( m_aMutex ) { }
-
-        ::osl::Mutex&                   GetMutex()                  { return m_aMutex; }
-        ::cppu::OBroadcastHelper&       GetBroadcastHelper()        { return m_aBHelper; }
-        const ::cppu::OBroadcastHelper& GetBroadcastHelper() const  { return m_aBHelper; }
-
+        
+        ::osl::Mutex&					GetMutex()					{ return m_aMutex; }
+        ::cppu::OBroadcastHelper&		GetBroadcastHelper()		{ return m_aBHelper; }
+        const ::cppu::OBroadcastHelper&	GetBroadcastHelper() const	{ return m_aBHelper; }
+        
     };
 
     // base class for all classes who are derived from OPropertySet and from OComponent
diff --git a/comphelper/inc/comphelper/classids.hxx b/comphelper/inc/comphelper/classids.hxx
index fddd7c5ad8c1..87daf52d8f6c 100644
--- a/comphelper/inc/comphelper/classids.hxx
+++ b/comphelper/inc/comphelper/classids.hxx
@@ -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
diff --git a/comphelper/inc/comphelper/comphelperdllapi.h b/comphelper/inc/comphelper/comphelperdllapi.h
index d7bd80d8a16d..9c2c73efc680 100644
--- a/comphelper/inc/comphelper/comphelperdllapi.h
+++ b/comphelper/inc/comphelper/comphelperdllapi.h
@@ -1,14 +1,14 @@
 #ifndef INCLUDED_COMPHELPERDLLAPI_H
 #define INCLUDED_COMPHELPERDLLAPI_H
-
+                                                                                                                             
 #include "sal/types.h"
-
+                                                                                                                             
 #if defined(COMPHELPER_DLLIMPLEMENTATION)
 #define COMPHELPER_DLLPUBLIC  SAL_DLLPUBLIC_EXPORT
 #else
 #define COMPHELPER_DLLPUBLIC  SAL_DLLPUBLIC_IMPORT
 #endif
 #define COMPHELPER_DLLPRIVATE SAL_DLLPRIVATE
-
+                                                                                                                             
 #endif /* INCLUDED_COMPHELPERDLLAPI_H */
 
diff --git a/comphelper/inc/comphelper/componentbase.hxx b/comphelper/inc/comphelper/componentbase.hxx
index 12d5fdb64355..6b7bebb2dac0 100644
--- a/comphelper/inc/comphelper/componentbase.hxx
+++ b/comphelper/inc/comphelper/componentbase.hxx
@@ -1,6 +1,6 @@
 /*************************************************************************
  * 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
diff --git a/comphelper/inc/comphelper/componentcontext.hxx b/comphelper/inc/comphelper/componentcontext.hxx
index c2f68aab96c0..752bc1a3184a 100644
--- a/comphelper/inc/comphelper/componentcontext.hxx
+++ b/comphelper/inc/comphelper/componentcontext.hxx
@@ -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
diff --git a/comphelper/inc/comphelper/componentfactory.hxx b/comphelper/inc/comphelper/componentfactory.hxx
index c23fbbca80d1..89846f169095 100644
--- a/comphelper/inc/comphelper/componentfactory.hxx
+++ b/comphelper/inc/comphelper/componentfactory.hxx
@@ -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
@@ -42,10 +42,10 @@
 
 #ifdef UNX
 // "libNAMExy.so" (__DLLEXTENSION == "xy.so")
-#define LLCF_LIBNAME( name )    "lib" name __DLLEXTENSION
+#define LLCF_LIBNAME( name )	"lib" name __DLLEXTENSION
 #else
 // "NAMExy.dll" (__DLLEXTENSION == "xy")
-#define LLCF_LIBNAME( name )    name __DLLEXTENSION ".dll"
+#define LLCF_LIBNAME( name )	name __DLLEXTENSION ".dll"
 #endif
 
 
@@ -113,6 +113,6 @@ COMPHELPER_DLLPUBLIC ::com::sun::star::uno::Reference< ::com::sun::star::uno::XI
         );
 
 
-}   // namespace comphelper
+}	// namespace comphelper
 
 #endif // _COMPHELPER_COMPONENTFACTORY_HXX
diff --git a/comphelper/inc/comphelper/componentmodule.hxx b/comphelper/inc/comphelper/componentmodule.hxx
index 660a685d0fd3..dd45fe8ca651 100644
--- a/comphelper/inc/comphelper/componentmodule.hxx
+++ b/comphelper/inc/comphelper/componentmodule.hxx
@@ -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
diff --git a/comphelper/inc/comphelper/composedprops.hxx b/comphelper/inc/comphelper/composedprops.hxx
index 93dab60cde13..42196b4fa985 100644
--- a/comphelper/inc/comphelper/composedprops.hxx
+++ b/comphelper/inc/comphelper/composedprops.hxx
@@ -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
@@ -48,7 +48,7 @@ namespace comphelper
     {
     public:
         /** determines whether or not a property should appear in the composed property set
-            @param  _rPropertyName
+            @param	_rPropertyName
                 the name of the property
         */
         virtual sal_Bool isComposeable(const ::rtl::OUString& _rPropertyName) const = 0;
@@ -58,9 +58,9 @@ namespace comphelper
     //= OComposedPropertySet
     //=====================================================================
     class OComposedPropertySetInfo;
-    typedef ::cppu::WeakImplHelper2 <   ::com::sun::star::beans::XPropertySet
-                                    ,   ::com::sun::star::beans::XPropertyState
-                                    >   OComposedPropertySet_Base;
+    typedef ::cppu::WeakImplHelper2	<	::com::sun::star::beans::XPropertySet
+                                    ,	::com::sun::star::beans::XPropertyState
+                                    >	OComposedPropertySet_Base;
     /** helper class for composing a property set from a sequence of other property sets.
         <p>First: This class is a fast shot, so don't sue me :) (To be honest, it's the migration of an old ugly
         implementation. It's still ugly).</p>
@@ -73,12 +73,12 @@ namespace comphelper
     private:
         ::com::sun::star::uno::Sequence< ::com::sun::star::beans::Property >
                                     m_aProperties;
-        OComposedPropertySetInfo*   m_pInfo;
+        OComposedPropertySetInfo*	m_pInfo;
 
     protected:
-        ::osl::Mutex                m_aMutex;
+        ::osl::Mutex				m_aMutex;
         DECLARE_STL_VECTOR(::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet>, PropertySetArray);
-        PropertySetArray            m_aSingleSets;
+        PropertySetArray			m_aSingleSets;
 
     public:
         /** constructs a composed property set
@@ -115,11 +115,11 @@ namespace comphelper
 
     protected:
                         ~OComposedPropertySet();
-        void            compose(const IPropertySetComposerCallback* _pMetaData);
+        void			compose(const IPropertySetComposerCallback* _pMetaData);
     };
 
 //.........................................................................
-}   // namespace comphelper
+}	// namespace comphelper
 //.........................................................................
 
 #endif // _COMPHELPER_COMPOSEDPROPS_HXX_
diff --git a/comphelper/inc/comphelper/configurationhelper.hxx b/comphelper/inc/comphelper/configurationhelper.hxx
index 52603cd78b06..762657ad474e 100644
--- a/comphelper/inc/comphelper/configurationhelper.hxx
+++ b/comphelper/inc/comphelper/configurationhelper.hxx
@@ -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
diff --git a/comphelper/inc/comphelper/container.hxx b/comphelper/inc/comphelper/container.hxx
index d509cada5603..cde7156da649 100644
--- a/comphelper/inc/comphelper/container.hxx
+++ b/comphelper/inc/comphelper/container.hxx
@@ -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
@@ -45,17 +45,17 @@ namespace comphelper
 class COMPHELPER_DLLPUBLIC IndexAccessIterator
 {
 protected:
-    ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface>    m_xStartingPoint;
+    ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface>	m_xStartingPoint;
 
-    ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface>    m_xCurrentObject;
+    ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface>	m_xCurrentObject;
         // das aktuelle Objekt
-    ::std::vector<sal_Int32>        m_arrChildIndizies;
+    ::std::vector<sal_Int32>		m_arrChildIndizies;
         // ich bewege mich eigentlich durch einen Baum, dummerweise haben dessen
         // Elemente aber kein GetNextSibling, also muss ich mir merken, wo die Childs
         // innerhalb ihres Parents sitzen (das ist sozusagen der Pfad von der Wurzel
         // zu m_xCurrentObject
 
-    ::rtl::OUString     m_ustrProperty;
+    ::rtl::OUString		m_ustrProperty;
         // der Name der gesuchten property
 
 public:
@@ -63,7 +63,7 @@ public:
 
     virtual ~IndexAccessIterator();
 
-    ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface>    Next();
+    ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface>	Next();
 
     virtual void Invalidate() { m_xCurrentObject = NULL; }
 
@@ -77,7 +77,7 @@ protected:
 };
 
 //.........................................................................
-}   // namespace comphelper
+}	// namespace comphelper
 //.........................................................................
 
 #endif // _COMPHELPER_CONTAINER_HXX_
diff --git a/comphelper/inc/comphelper/containermultiplexer.hxx b/comphelper/inc/comphelper/containermultiplexer.hxx
index f623f3040cad..e541fa9aa97a 100644
--- a/comphelper/inc/comphelper/containermultiplexer.hxx
+++ b/comphelper/inc/comphelper/containermultiplexer.hxx
@@ -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
@@ -51,8 +51,8 @@ namespace comphelper
     {
         friend class OContainerListenerAdapter;
     protected:
-        OContainerListenerAdapter*  m_pAdapter;
-        ::osl::Mutex&               m_rMutex;
+        OContainerListenerAdapter*	m_pAdapter;
+        ::osl::Mutex&				m_rMutex;
 
     public:
         OContainerListener(::osl::Mutex& _rMutex);
@@ -78,8 +78,8 @@ namespace comphelper
     protected:
         ::com::sun::star::uno::Reference< ::com::sun::star::container::XContainer >
                                 m_xContainer;
-        OContainerListener*     m_pListener;
-        sal_Int32               m_nLockCount;
+        OContainerListener*		m_pListener;
+        sal_Int32				m_nLockCount;
 
         virtual ~OContainerListenerAdapter();
 
@@ -96,19 +96,19 @@ namespace comphelper
         virtual void SAL_CALL elementReplaced( const ::com::sun::star::container::ContainerEvent& Event ) throw(::com::sun::star::uno::RuntimeException);
 
         // locking the multiplexer
-        void        lock();
-        void        unlock();
-        sal_Int32   locked() const { return m_nLockCount; }
+        void		lock();
+        void		unlock();
+        sal_Int32	locked() const { return m_nLockCount; }
 
         /// dispose the object. No multiplexing anymore
-        void        dispose();
+        void		dispose();
 
         const ::com::sun::star::uno::Reference< ::com::sun::star::container::XContainer >&
                     getContainer() const { return m_xContainer; }
     };
 
 //.........................................................................
-}   // namespace dbaui
+}	// namespace dbaui
 //.........................................................................
 
 #endif // _COMPHELPER_CONTAINERMULTIPLEXER_HXX_
diff --git a/comphelper/inc/comphelper/docpasswordhelper.hxx b/comphelper/inc/comphelper/docpasswordhelper.hxx
index dbbb68372a07..f39fbf4bab62 100644
--- a/comphelper/inc/comphelper/docpasswordhelper.hxx
+++ b/comphelper/inc/comphelper/docpasswordhelper.hxx
@@ -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
@@ -116,7 +116,7 @@ public:
             <FALSE/> otherwise
       */
 
-    static sal_Bool IsModifyPasswordCorrect(
+    static sal_Bool IsModifyPasswordCorrect( 
                 const ::rtl::OUString& aPassword,
                 const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aInfo );
 
@@ -192,7 +192,7 @@ public:
     static ::com::sun::star::uno::Sequence< sal_Int8 > GetXLHashAsSequence(
                 const ::rtl::OUString& aString,
                 rtl_TextEncoding nEnc = RTL_TEXTENCODING_UTF8 );
-
+ 
     // ------------------------------------------------------------------------
 
     /** This helper function tries to request and verify a password to load a
diff --git a/comphelper/inc/comphelper/docpasswordrequest.hxx b/comphelper/inc/comphelper/docpasswordrequest.hxx
index cf04d22c7a6d..5a99964dbcfc 100755
--- a/comphelper/inc/comphelper/docpasswordrequest.hxx
+++ b/comphelper/inc/comphelper/docpasswordrequest.hxx
@@ -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
@@ -53,7 +53,7 @@ class PasswordContinuation;
 /** Implements the task.XInteractionRequest interface for requesting a password
     string for a document.
  */
-class COMPHELPER_DLLPUBLIC DocPasswordRequest :
+class COMPHELPER_DLLPUBLIC DocPasswordRequest : 
         public ::com::sun::star::task::XInteractionRequest,
         public ::cppu::OWeakObject
 {
diff --git a/comphelper/inc/comphelper/documentconstants.hxx b/comphelper/inc/comphelper/documentconstants.hxx
index b78150586e28..fee59ab155aa 100644
--- a/comphelper/inc/comphelper/documentconstants.hxx
+++ b/comphelper/inc/comphelper/documentconstants.hxx
@@ -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
@@ -71,7 +71,7 @@
 #define MIMETYPE_OASIS_OPENDOCUMENT_CHART_ASCII         "application/vnd.oasis.opendocument.chart"
 #define MIMETYPE_OASIS_OPENDOCUMENT_FORMULA_ASCII       "application/vnd.oasis.opendocument.formula"
 #define MIMETYPE_OASIS_OPENDOCUMENT_DATABASE_ASCII      "application/vnd.oasis.opendocument.base"
-#define MIMETYPE_OASIS_OPENDOCUMENT_REPORT_ASCII        "application/vnd.sun.xml.report"
+#define MIMETYPE_OASIS_OPENDOCUMENT_REPORT_ASCII		"application/vnd.sun.xml.report"
 #define MIMETYPE_OASIS_OPENDOCUMENT_REPORT_CHART_ASCII  "application/vnd.sun.xml.report.chart"
 
 #define MIMETYPE_OASIS_OPENDOCUMENT_TEXT                ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( MIMETYPE_OASIS_OPENDOCUMENT_TEXT_ASCII ) )
@@ -83,8 +83,8 @@
 #define MIMETYPE_OASIS_OPENDOCUMENT_CHART               ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( MIMETYPE_OASIS_OPENDOCUMENT_CHART_ASCII ) )
 #define MIMETYPE_OASIS_OPENDOCUMENT_FORMULA             ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( MIMETYPE_OASIS_OPENDOCUMENT_FORMULA_ASCII ) )
 #define MIMETYPE_OASIS_OPENDOCUMENT_DATABASE            ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( MIMETYPE_OASIS_OPENDOCUMENT_DATABASE_ASCII ) )
-#define MIMETYPE_OASIS_OPENDOCUMENT_REPORT              ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( MIMETYPE_OASIS_OPENDOCUMENT_REPORT_ASCII ) )
-#define MIMETYPE_OASIS_OPENDOCUMENT_REPORT_CHART        ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( MIMETYPE_OASIS_OPENDOCUMENT_REPORT_CHART_ASCII ) )
+#define MIMETYPE_OASIS_OPENDOCUMENT_REPORT	            ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( MIMETYPE_OASIS_OPENDOCUMENT_REPORT_ASCII ) )
+#define MIMETYPE_OASIS_OPENDOCUMENT_REPORT_CHART	    ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( MIMETYPE_OASIS_OPENDOCUMENT_REPORT_CHART_ASCII ) )
 
 // template formats of SO8
 #define MIMETYPE_OASIS_OPENDOCUMENT_TEXT_TEMPLATE_ASCII          "application/vnd.oasis.opendocument.text-template"
diff --git a/comphelper/inc/comphelper/documentinfo.hxx b/comphelper/inc/comphelper/documentinfo.hxx
index c791b8d26aab..5f80fab9e627 100644
--- a/comphelper/inc/comphelper/documentinfo.hxx
+++ b/comphelper/inc/comphelper/documentinfo.hxx
@@ -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
diff --git a/comphelper/inc/comphelper/embeddedobjectcontainer.hxx b/comphelper/inc/comphelper/embeddedobjectcontainer.hxx
index c1382557c52a..e8b2c39fb22a 100644
--- a/comphelper/inc/comphelper/embeddedobjectcontainer.hxx
+++ b/comphelper/inc/comphelper/embeddedobjectcontainer.hxx
@@ -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
@@ -75,8 +75,8 @@ public:
                         ~EmbeddedObjectContainer();
 
     void                SwitchPersistence( const com::sun::star::uno::Reference < com::sun::star::embed::XStorage >& );
-    sal_Bool            CommitImageSubStorage();
-    void                ReleaseImageSubStorage();
+    sal_Bool			CommitImageSubStorage();
+    void				ReleaseImageSubStorage();
 
     ::rtl::OUString     CreateUniqueObjectName();
 
@@ -152,13 +152,13 @@ public:
     sal_Bool            InsertGraphicStream( const com::sun::star::uno::Reference < com::sun::star::io::XInputStream >& rStream, const ::rtl::OUString& rObjectName, const ::rtl::OUString& rMediaType );
 
     // try to add a graphical representation for an object in optimized way ( might fail )
-    sal_Bool            InsertGraphicStreamDirectly( const com::sun::star::uno::Reference < com::sun::star::io::XInputStream >& rStream, const ::rtl::OUString& rObjectName, const rtl::OUString& rMediaType );
+    sal_Bool			InsertGraphicStreamDirectly( const com::sun::star::uno::Reference < com::sun::star::io::XInputStream >& rStream, const ::rtl::OUString& rObjectName, const rtl::OUString& rMediaType );
 
     // remove a graphical representation for an object
     sal_Bool            RemoveGraphicStream( const ::rtl::OUString& rObjectName );
 
     // copy the graphical representation from different container
-    sal_Bool            TryToCopyGraphReplacement( EmbeddedObjectContainer& rSrc,
+    sal_Bool			TryToCopyGraphReplacement( EmbeddedObjectContainer& rSrc,
                                                     const ::rtl::OUString& aOrigName,
                                                     const ::rtl::OUString& aTargetName );
 
diff --git a/comphelper/inc/comphelper/enumhelper.hxx b/comphelper/inc/comphelper/enumhelper.hxx
index 7272d9e91d20..552865551b63 100644
--- a/comphelper/inc/comphelper/enumhelper.hxx
+++ b/comphelper/inc/comphelper/enumhelper.hxx
@@ -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
@@ -43,9 +43,9 @@ namespace comphelper
 {
 //.........................................................................
 
-    namespace starcontainer     = ::com::sun::star::container;
-    namespace staruno           = ::com::sun::star::uno;
-    namespace starlang          = ::com::sun::star::lang;
+    namespace starcontainer		= ::com::sun::star::container;
+    namespace staruno			= ::com::sun::star::uno;
+    namespace starlang			= ::com::sun::star::lang;
 
 //==================================================================
 //= OEnumerationLock
@@ -67,7 +67,7 @@ class COMPHELPER_DLLPUBLIC OEnumerationByName : private OEnumerationLock
                                                            starlang::XEventListener    >
 {
     staruno::Sequence< ::rtl::OUString >                m_aNames;
-    sal_Int32                                           m_nPos;
+    sal_Int32											m_nPos;
     staruno::Reference< starcontainer::XNameAccess >    m_xAccess;
     sal_Bool                                            m_bListening;
 
@@ -122,7 +122,7 @@ private:
 //==================================================================
 /** provides an <type scope="com.sun.star.container">XEnumeration</type>
     for an outside set vector of Any's.
-
+    
 */
 class COMPHELPER_DLLPUBLIC OAnyEnumeration : private OEnumerationLock
                                            , public  ::cppu::WeakImplHelper1< starcontainer::XEnumeration >
diff --git a/comphelper/inc/comphelper/eventattachermgr.hxx b/comphelper/inc/comphelper/eventattachermgr.hxx
index cae67a71d4d0..513c6313533d 100644
--- a/comphelper/inc/comphelper/eventattachermgr.hxx
+++ b/comphelper/inc/comphelper/eventattachermgr.hxx
@@ -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
diff --git a/comphelper/inc/comphelper/evtlistenerhlp.hxx b/comphelper/inc/comphelper/evtlistenerhlp.hxx
index 422b44abe7a0..db62ac8efc8d 100644
--- a/comphelper/inc/comphelper/evtlistenerhlp.hxx
+++ b/comphelper/inc/comphelper/evtlistenerhlp.hxx
@@ -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
@@ -51,6 +51,6 @@ namespace comphelper
         virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw(::com::sun::star::uno::RuntimeException);
     };
 //........................................................................
-}   // namespace comphelper
+}	// namespace comphelper
 //........................................................................
 #endif // COMPHELPER_EVENTLISTENERHELPER_HXX
diff --git a/comphelper/inc/comphelper/evtmethodhelper.hxx b/comphelper/inc/comphelper/evtmethodhelper.hxx
index 8e34b0e00149..1c2f70060d76 100755
--- a/comphelper/inc/comphelper/evtmethodhelper.hxx
+++ b/comphelper/inc/comphelper/evtmethodhelper.hxx
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2008 by Sun Microsystems, Inc.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -36,6 +36,6 @@ namespace comphelper
     COMPHELPER_DLLPUBLIC ::com::sun::star::uno::Sequence< ::rtl::OUString> getEventMethodsForType(const ::com::sun::star::uno::Type& type);
 //........................................................................
 
-}   // namespace comphelper
+}	// namespace comphelper
 //........................................................................
 #endif // COMPHELPER_EVENTMEHODHELPER_HXX
diff --git a/comphelper/inc/comphelper/extract.hxx b/comphelper/inc/comphelper/extract.hxx
index b44391c17911..680d94f7cdb6 100644
--- a/comphelper/inc/comphelper/extract.hxx
+++ b/comphelper/inc/comphelper/extract.hxx
@@ -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
@@ -40,8 +40,8 @@ namespace cppu
 /**
  * Sets enum from int32 value.  This function does NOT check for valid enum values!
  *<BR>
- * @param nEnum         int32 enum value
- * @param rType         enum type
+ * @param nEnum			int32 enum value
+ * @param rType			enum type
  * @return enum or emoty any.
  */
 inline ::com::sun::star::uno::Any SAL_CALL int2enum(
@@ -58,8 +58,8 @@ inline ::com::sun::star::uno::Any SAL_CALL int2enum(
 /**
  * Sets int32 from enum or int in any.
  *<BR>
- * @param rnEnum        [out] int32 enum value
- * @param rAny          enum or int
+ * @param rnEnum		[out] int32 enum value
+ * @param rAny			enum or int
  * @param sal_True if enum or int value was set else sal_False.
  */
 inline sal_Bool SAL_CALL enum2int( sal_Int32 & rnEnum, const ::com::sun::star::uno::Any & rAny )
@@ -76,9 +76,9 @@ inline sal_Bool SAL_CALL enum2int( sal_Int32 & rnEnum, const ::com::sun::star::u
 /**
  * Sets int32 from enum or int in any with additional typecheck
  * <BR>
- * @param rAny          enum or int
- * @param eRet          the enum value as int. If there is not enum of the given type or
- *                      a ::com::sun::star::lang::IllegalArgumentException is thrown
+ * @param rAny			enum or int
+ * @param eRet			the enum value as int. If there is not enum of the given type or
+ *						a ::com::sun::star::lang::IllegalArgumentException is thrown
  */
 template< typename E >
 inline void SAL_CALL any2enum( E & eRet, const ::com::sun::star::uno::Any & rAny )
@@ -113,8 +113,8 @@ inline ::com::sun::star::uno::Any SAL_CALL enum2any( E eEnum )
  * it will be queried for it.
  * If no interface is available, the out ref will be cleared.
  *<BR>
- * @param rxOut         [out] demanded interface
- * @param rAny          interface
+ * @param rxOut			[out] demanded interface
+ * @param rAny			interface
  * @return sal_True if any reference (including the null ref) was retrieved from any else sal_False.
  */
 template< class T >
diff --git a/comphelper/inc/comphelper/fileformat.h b/comphelper/inc/comphelper/fileformat.h
index 65f37a2551b7..2408484ff00e 100644
--- a/comphelper/inc/comphelper/fileformat.h
+++ b/comphelper/inc/comphelper/fileformat.h
@@ -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
@@ -30,11 +30,11 @@
 
 /* file format versions *************************************************/
 
-#define SOFFICE_FILEFORMAT_31   3450
-#define SOFFICE_FILEFORMAT_40   3580
-#define SOFFICE_FILEFORMAT_50   5050
-#define SOFFICE_FILEFORMAT_60   6200
-#define SOFFICE_FILEFORMAT_8    6800
+#define SOFFICE_FILEFORMAT_31	3450
+#define SOFFICE_FILEFORMAT_40	3580
+#define SOFFICE_FILEFORMAT_50	5050
+#define SOFFICE_FILEFORMAT_60	6200
+#define SOFFICE_FILEFORMAT_8	6800
 #define SOFFICE_FILEFORMAT_CURRENT SOFFICE_FILEFORMAT_8
 
 #endif
diff --git a/comphelper/inc/comphelper/genericpropertyset.hxx b/comphelper/inc/comphelper/genericpropertyset.hxx
index 6364dea5f020..8b4583a0d949 100644
--- a/comphelper/inc/comphelper/genericpropertyset.hxx
+++ b/comphelper/inc/comphelper/genericpropertyset.hxx
@@ -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
diff --git a/comphelper/inc/comphelper/guarding.hxx b/comphelper/inc/comphelper/guarding.hxx
index 66de00738601..7970d1178b1e 100644
--- a/comphelper/inc/comphelper/guarding.hxx
+++ b/comphelper/inc/comphelper/guarding.hxx
@@ -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
@@ -46,17 +46,17 @@ namespace comphelper
 template <class MUTEX>
 class ORelease
 {
-    MUTEX&  m_rMutex;
+    MUTEX&	m_rMutex;
 
 public:
     ORelease(MUTEX& _rMutex) : m_rMutex(_rMutex) { _rMutex.release(); }
     ~ORelease() { m_rMutex.acquire(); }
 };
 
-typedef ORelease< ::osl::Mutex >    MutexRelease;
+typedef ORelease< ::osl::Mutex >	MutexRelease;
 
 //.........................................................................
-}   // namespace comphelper
+}	// namespace comphelper
 //.........................................................................
 
 #endif // _COMPHELPER_GUARDING_HXX_
diff --git a/comphelper/inc/comphelper/ihwrapnofilter.hxx b/comphelper/inc/comphelper/ihwrapnofilter.hxx
index 1765716acb66..a44870178e1c 100644
--- a/comphelper/inc/comphelper/ihwrapnofilter.hxx
+++ b/comphelper/inc/comphelper/ihwrapnofilter.hxx
@@ -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
diff --git a/comphelper/inc/comphelper/implbase_var.hxx b/comphelper/inc/comphelper/implbase_var.hxx
index 97d360f853a6..44a4bb4263f4 100644
--- a/comphelper/inc/comphelper/implbase_var.hxx
+++ b/comphelper/inc/comphelper/implbase_var.hxx
@@ -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
@@ -27,7 +27,7 @@
 
 /** This header generates the following template classes with a variable number
     of interfaces:
-
+    
     comphelper::ImplHelper<N> <typename Ifc1, ..., typename Ifc<N> >
     comphelper::WeakImplHelper<N> <typename Ifc1, ..., typename Ifc<N> >
     comphelper::WeakComponentImplHelper<N> <typename Ifc1, ...,
@@ -41,11 +41,11 @@
     Don't use this header for interface numbers up to 12;
     always use the existing cppuhelper/(impl|comp)base<1-12>.hxx headers
     for this purpose, which eases debugging.
-
+    
     Including this header requires a little discipline, because it has no
     include guards.  Please use the following external include guard rule
     where <N> is the number of interface types:
-
+    
     #if ! defined(INCLUDED_COMPHELPER_IMPLBASE_VAR_HXX_<N>)
     #define INCLUDED_COMPHELPER_IMPLBASE_VAR_HXX_<N>
     #define COMPHELPER_IMPLBASE_INTERFACE_NUMBER <N>
@@ -139,7 +139,7 @@ struct BOOST_PP_CAT(ImplClassData, COMPHELPER_IMPLBASE_INTERFACE_NUMBER)
 /** Implementation helper implementing interface
     ::com::sun::star::lang::XTypeProvider and method
     XInterface::queryInterface(), but no reference counting.
-
+    
     @derive
     Inherit from this class giving your interface(s) to be implemented as
     template argument(s).  Your sub class defines method implementations for
@@ -187,7 +187,7 @@ public:
     ::com::sun::star::uno::XInterface
     which supports weak mechanism to be held weakly
     (supporting ::com::sun::star::uno::XWeak thru ::cppu::OWeakObject).
-
+    
     @derive
     Inherit from this class giving your interface(s) to be implemented as
     template argument(s).  Your sub class defines method implementations for
@@ -211,7 +211,7 @@ class SAL_NO_VTABLE BOOST_PP_CAT(WeakImplHelper,
             BOOST_PP_CAT(WeakImplHelper, COMPHELPER_IMPLBASE_INTERFACE_NUMBER)<
                 BOOST_PP_ENUM_PARAMS(COMPHELPER_IMPLBASE_INTERFACE_NUMBER, Ifc)>
         > > {};
-
+    
 public:
     virtual ::com::sun::star::uno::Any
         SAL_CALL queryInterface( ::com::sun::star::uno::Type const& rType )
@@ -236,18 +236,18 @@ public:
 /** Implementation helper implementing interfaces
     ::com::sun::star::lang::XTypeProvider and
     ::com::sun::star::uno::XInterface inherting from a BaseClass.
-
+    
     All acquire() and release() calls are delegated to the BaseClass.
     Upon queryInterface(), if a demanded interface is not supported by this
     class directly, the request is delegated to the BaseClass.
-
+    
     @attention
     The BaseClass has to be complete in a sense, that
     ::com::sun::star::uno::XInterface and
     ::com::sun::star::lang::XTypeProvider are implemented properly.
     The BaseClass must have at least one ctor that can be called with
     COMPHELPER_IMPLBASE_MAX_CTOR_ARGS or fewer arguments.
-
+    
     @derive
     Inherit from this class giving your additional interface(s) to be
     implemented as template argument(s).  Your sub class defines method
@@ -273,7 +273,7 @@ class SAL_NO_VTABLE BOOST_PP_CAT(ImplInheritanceHelper,
                 BaseClass,
                 BOOST_PP_ENUM_PARAMS(COMPHELPER_IMPLBASE_INTERFACE_NUMBER, Ifc)>
         > > {};
-
+    
 protected:
 #define COMPHELPER_IMPLBASE_templctor_args(z_, n_, unused_) \
     BOOST_PP_CAT(T, n_) const& BOOST_PP_CAT(arg, n_)
@@ -283,7 +283,7 @@ protected:
         BOOST_PP_ENUM(BOOST_PP_ADD(n_, 1), \
                       COMPHELPER_IMPLBASE_templctor_args, ~) ) \
         : BaseClass( BOOST_PP_ENUM_PARAMS(BOOST_PP_ADD(n_, 1), arg) ) {}
-
+    
     BOOST_PP_CAT(ImplInheritanceHelper, COMPHELPER_IMPLBASE_INTERFACE_NUMBER)()
         : BaseClass() {}
     BOOST_PP_REPEAT(COMPHELPER_IMPLBASE_MAX_CTOR_ARGS,
@@ -323,15 +323,15 @@ public:
 /** Implementation helper supporting
     ::com::sun::star::lang::XTypeProvider and
     ::com::sun::star::lang::XComponent.
-
+    
     Upon disposing objects of this class, sub-classes receive a disposing()
     call.  Objects of this class can be held weakly, i.e. by a
     ::com::sun::star::uno::WeakReference.
-
+    
     @attention
     The life-cycle of the passed mutex reference has to be longer than objects
     of this class.
-
+    
     @derive
     Inherit from this class giving your interface(s) to be implemented as
     template argument(s).  Your sub class defines method implementations for
@@ -356,11 +356,11 @@ class SAL_NO_VTABLE BOOST_PP_CAT(WeakComponentImplHelper,
                          COMPHELPER_IMPLBASE_INTERFACE_NUMBER)<
                 BOOST_PP_ENUM_PARAMS(COMPHELPER_IMPLBASE_INTERFACE_NUMBER, Ifc)>
         > > {};
-
+    
 public:
     BOOST_PP_CAT(WeakComponentImplHelper, COMPHELPER_IMPLBASE_INTERFACE_NUMBER)(
         ::osl::Mutex & rMutex ) : WeakComponentImplHelperBase(rMutex) {}
-
+    
     virtual ::com::sun::star::uno::Any
         SAL_CALL queryInterface( ::com::sun::star::uno::Type const& rType )
         throw (::com::sun::star::uno::RuntimeException)
@@ -380,7 +380,7 @@ public:
         SAL_CALL getImplementationId()
         throw (::com::sun::star::uno::RuntimeException)
         { return ::cppu::ImplHelper_getImplementationId( cd::get() ); }
-
+    
     // implement XComponent directly avoiding ambiguities:
     virtual void SAL_CALL dispose()
         throw (::com::sun::star::uno::RuntimeException)
diff --git a/comphelper/inc/comphelper/implementationreference.hxx b/comphelper/inc/comphelper/implementationreference.hxx
index 806cdc86f129..0a6241452a14 100644
--- a/comphelper/inc/comphelper/implementationreference.hxx
+++ b/comphelper/inc/comphelper/implementationreference.hxx
@@ -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
@@ -92,15 +92,15 @@ namespace comphelper
         have UnoType be something different from XInterface, governed
         by the usage of the C++ interface)
 
-        @sample ImplementationReference< MyCppType, XMyInterface >
+        @sample ImplementationReference< MyCppType, XMyInterface > 
 
-        @sample ImplementationReference< MyAbstractCppType, XMyInterface, XInterface >
+        @sample ImplementationReference< MyAbstractCppType, XMyInterface, XInterface > 
         for an abstract C++ class
 
         @see ::rtl::Reference
 
      */
-    template < class CppType,
+    template < class CppType, 
                class UnoType,
                class XIfType=UnoType > class ImplementationReference
     {
@@ -111,7 +111,7 @@ namespace comphelper
         typedef XIfType UnambiguousXInterfaceType;
 
         /** Default-construct an ImplementationReference
-
+    
             Uno reference will be invalid, implementation pointer will
             be NULL.
          */
@@ -195,28 +195,28 @@ namespace comphelper
             Compatibility method to get an auto_ptr-compatible
             interface
          */
-        ImplementationType*         get() { return mpImpl; }
-        const ImplementationType*   get() const { return mpImpl; }
+        ImplementationType* 		get() { return mpImpl; }
+        const ImplementationType* 	get() const { return mpImpl; }        
 
         /** Release all references
 
             Compatibility method to get an auto_ptr-compatible
             interface
          */
-        void                        reset() { dispose(); }
+        void						reset() { dispose(); }
 
         /** Release all references
-
+            
             This method releases the UNO interface reference, and
             clears the C++ pointer to NULL.
          */
-        void                        dispose() { mxRef = NULL; mpImpl=NULL; }
+        void						dispose() { mxRef = NULL; mpImpl=NULL; }        
 
-        ImplementationType*         operator->() { return mpImpl; }
-        const ImplementationType*   operator->() const { return mpImpl; }
+        ImplementationType* 		operator->() { return mpImpl; }
+        const ImplementationType* 	operator->() const { return mpImpl; }
 
-        ImplementationType&         operator*() { return *mpImpl; }
-        const ImplementationType&   operator*() const { return *mpImpl; }
+        ImplementationType& 		operator*() { return *mpImpl; }
+        const ImplementationType& 	operator*() const { return *mpImpl; }
 
         /// Access to the underlying UNO reference, without extra querying
         ::com::sun::star::uno::Reference< UnoInterfaceType > getRef() { return mxRef; }
@@ -230,7 +230,7 @@ namespace comphelper
         // ImplementationReference& operator= ( const ImplementationReference& );
 
         /** Comparison operator
-
+            
             Object identity is defined to be identity of the
             implementation pointers. This is in general invalid when
             comparing pointers to UNO objects (ambiguous class
@@ -243,7 +243,7 @@ namespace comphelper
         }
 
         /** less-than operator
-
+            
             Object order is defined to be the ordering of the
             implementation pointers. This is in general invalid when
             comparing pointers to UNO objects (ambiguous class
@@ -257,15 +257,15 @@ namespace comphelper
         {
             return mpImpl < rhs.mpImpl;
         }
-
+ 
     private:
-
+        
         // the interface, hard reference to prevent object from vanishing
-        ::com::sun::star::uno::Reference< UnoInterfaceType >    mxRef;
+        ::com::sun::star::uno::Reference< UnoInterfaceType > 	mxRef;
 
         // the c++ object, for our internal stuff
-        ImplementationType*                                     mpImpl;
-
+        ImplementationType* 									mpImpl;
+    
     };
 
 }
diff --git a/comphelper/inc/comphelper/interaction.hxx b/comphelper/inc/comphelper/interaction.hxx
index 1ae1dda61ec4..cf7ebd179873 100644
--- a/comphelper/inc/comphelper/interaction.hxx
+++ b/comphelper/inc/comphelper/interaction.hxx
@@ -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
@@ -51,19 +51,19 @@ namespace comphelper
     */
     class OInteractionSelect
     {
-        sal_Bool    m_bSelected : 1;    /// indicates if the select event occured
+        sal_Bool	m_bSelected : 1;	/// indicates if the select event occured
 
     protected:
         OInteractionSelect() : m_bSelected(sal_False) { }
 
     public:
         /// determines whether or not this handler was selected
-        sal_Bool    wasSelected() const { return m_bSelected; }
+        sal_Bool	wasSelected() const { return m_bSelected; }
         /// resets the state to "not selected", so you may reuse the handler
-        void        reset() { m_bSelected = sal_False; }
+        void		reset() { m_bSelected = sal_False; }
 
     protected:
-        void    implSelected() { m_bSelected = sal_True; }
+        void	implSelected() { m_bSelected = sal_True; }
     };
 
     //=========================================================================
@@ -94,22 +94,22 @@ namespace comphelper
     //=========================================================================
     //= OInteractionApprove
     //=========================================================================
-    typedef OInteraction< ::com::sun::star::task::XInteractionApprove > OInteractionApprove;
+    typedef OInteraction< ::com::sun::star::task::XInteractionApprove >	OInteractionApprove;
 
     //=========================================================================
     //= OInteractionDispprove
     //=========================================================================
-    typedef OInteraction< ::com::sun::star::task::XInteractionDisapprove >  OInteractionDisapprove;
+    typedef OInteraction< ::com::sun::star::task::XInteractionDisapprove >	OInteractionDisapprove;
 
     //=========================================================================
     //= OInteractionAbort
     //=========================================================================
-    typedef OInteraction< ::com::sun::star::task::XInteractionAbort >   OInteractionAbort;
+    typedef OInteraction< ::com::sun::star::task::XInteractionAbort >	OInteractionAbort;
 
     //=========================================================================
     //= OInteractionRetry
     //=========================================================================
-    typedef OInteraction< ::com::sun::star::task::XInteractionRetry >   OInteractionRetry;
+    typedef OInteraction< ::com::sun::star::task::XInteractionRetry >	OInteractionRetry;
 
     //=========================================================================
     //= OInteractionPassword
@@ -137,17 +137,17 @@ namespace comphelper
     //=========================================================================
     //= OInteractionRequest
     //=========================================================================
-    typedef ::cppu::WeakImplHelper1 <   ::com::sun::star::task::XInteractionRequest
-                                    >   OInteractionRequest_Base;
+    typedef ::cppu::WeakImplHelper1	<	::com::sun::star::task::XInteractionRequest
+                                    >	OInteractionRequest_Base;
     /** implements an interaction request (<type scope="com.sun.star.task">XInteractionRequest</type>)<p/>
         at run time, you can freely add any interaction continuation objects
     */
     class COMPHELPER_DLLPUBLIC OInteractionRequest : public OInteractionRequest_Base
     {
         ::com::sun::star::uno::Any
-                    m_aRequest;         /// the request we represent
+                    m_aRequest;			/// the request we represent
         ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionContinuation > >
-                    m_aContinuations;   /// all registered continuations
+                    m_aContinuations;	/// all registered continuations
 
     public:
         OInteractionRequest(const ::com::sun::star::uno::Any& _rRequestDescription);
@@ -162,7 +162,7 @@ namespace comphelper
         virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionContinuation > > SAL_CALL getContinuations(  ) throw(::com::sun::star::uno::RuntimeException);
     };
 //.........................................................................
-}   // namespace comphelper
+}	// namespace comphelper
 //.........................................................................
 
 #endif // _COMPHELPER_INTERACTION_HXX_
diff --git a/comphelper/inc/comphelper/legacysingletonfactory.hxx b/comphelper/inc/comphelper/legacysingletonfactory.hxx
index 7180a66403bb..2fb6eb1dbdd8 100644
--- a/comphelper/inc/comphelper/legacysingletonfactory.hxx
+++ b/comphelper/inc/comphelper/legacysingletonfactory.hxx
@@ -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
diff --git a/comphelper/inc/comphelper/listenernotification.hxx b/comphelper/inc/comphelper/listenernotification.hxx
index f4bf2f916859..9c2e059d0a68 100644
--- a/comphelper/inc/comphelper/listenernotification.hxx
+++ b/comphelper/inc/comphelper/listenernotification.hxx
@@ -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
diff --git a/comphelper/inc/comphelper/locale.hxx b/comphelper/inc/comphelper/locale.hxx
index 3fd8a15aa163..ce3d5b2e0a38 100644
--- a/comphelper/inc/comphelper/locale.hxx
+++ b/comphelper/inc/comphelper/locale.hxx
@@ -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,17 +56,17 @@ class COMPHELPER_DLLPUBLIC Locale
     // const
 
     public:
-
+    
         /** @short seperates LANGUAGE and COUNTRY part of an ISO formated Locale. */
         static const sal_Unicode SEPERATOR_LC;
-
+        
         /** @short seperates COUNTRY and VARIANT part of an ISO formated Locale. */
         static const sal_Unicode SEPERATOR_CV;
-
+        
         /** @short seperates COUNTRY and VARIANT part of an ISO formated Locale.
             @descr Its true for some linux derivates only :-( */
         static const sal_Unicode SEPERATOR_CV_LINUX;
-
+        
         /** @short some predefined Locale objects. */
         static const Locale EN_US();
         static const Locale EN();
@@ -103,50 +103,50 @@ class COMPHELPER_DLLPUBLIC Locale
         static const Locale X_NOTRANSLATE();
         static const Locale ZH_CN();
         static const Locale ZH_TW();
-
+                            
     //-------------------------------------------
     // types
-
+    
     public:
-
+    
         /** @short will be throw during convertion, if a Locale cant be interpreted. */
         struct MalFormedLocaleException
         {
             public:
                 ::rtl::OUString Message;
-
+                
                 MalFormedLocaleException()
                 {}
-
+            
                 MalFormedLocaleException(const ::rtl::OUString& sMessage)
                     : Message(sMessage)
                 {}
         };
-
+    
     //-------------------------------------------
     // member
 
     private :
 
         //---------------------------------------
-        /** @short  must be a valid ISO Language Code.
-
+        /** @short  must be a valid ISO	Language Code.
+        
             @descr  These codes are the lower-case two-letter codes as defined by ISO-639.
                     You can find a full list of these codes at a number of sites, such as:
                     <BR><a href ="http://www.ics.uci.edu/pub/ietf/http/related/iso639.txt">
                     http://www.ics.uci.edu/pub/ietf/http/related/iso639.txt</a>
          */
         ::rtl::OUString m_sLanguage;
-
+        
         //---------------------------------------
-        /** @short  must be a valid ISO Country Code.
-            @descr  These codes are the upper-case two-letter codes as defined by ISO-3166.
+        /** @short  must be a valid ISO Country	Code.
+            @descr  These codes are the upper-case two-letter codes	as defined by ISO-3166.
                     You can find a full list of these codes at a number of sites, such as:
                     <BR><a href="http://www.chemie.fu-berlin.de/diverse/doc/ISO_3166.html">
                     http://www.chemie.fu-berlin.de/diverse/doc/ISO_3166.html</a>
          */
         ::rtl::OUString m_sCountry;
-
+        
         //---------------------------------------
         /** @short  Variant codes are vendor and browser-specific.
             @descr  For example, use WIN for Windows, MAC for Macintosh, and POSIX for POSIX.
@@ -163,40 +163,40 @@ class COMPHELPER_DLLPUBLIC Locale
 
         //---------------------------------------
         /** @short  needed by outside users!
-
+        
             @descr  Otherwise it wouldnt be possible to use
                     any instance of such Locale static ...
          */
         Locale();
-
+        
         //---------------------------------------
         /** @short      construct a Locale from an ISO formated string value.
-
+        
             @seealso    fromISO()
-
+            
             @param      sISO
                         an ISO formated string value, which can be parsed and
                         tokenized into a Lamnguage, Country and Variant part.
-
+                        
             @throw      MalFormedLocaleException
                         if conversion failed.
           */
         Locale(const ::rtl::OUString& sISO)
             throw(MalFormedLocaleException);
-
+        
         //---------------------------------------
         /** @short      construct a Locale from language, country and variant.
-
+        
             @seealso    setLanguage()
             @seealso    setCountry()
             @seealso    setVariant()
-
+            
             @param      sLanguage
                         lowercase two-letter ISO-639 code.
-
+                        
             @param      sCountry
                         uppercase two-letter ISO-3166 code.
-
+                        
             @param      sVariant
                         vendor and browser specific code.
           */
@@ -206,18 +206,18 @@ class COMPHELPER_DLLPUBLIC Locale
 
         //---------------------------------------
         /** @short  copy constructor.
-
+        
             @param  aCopy
                     the copy object.
          */
         Locale(const Locale& aCopy);
-
+               
         //---------------------------------------
         /** @short  returns the language code for this locale.
-
+        
             @descr  That will either be the empty string or
                     a lowercase ISO 639 code.
-
+        
             @return [string]
                     the language code.
          */
@@ -225,18 +225,18 @@ class COMPHELPER_DLLPUBLIC Locale
 
         //---------------------------------------
         /** @short  returns the country/region code for this locale.
-
+        
             @descr  That will either be the empty string or an
                     upercase ISO 3166 2-letter code.
-
+        
             @return [string]
                     the country code.
          */
         ::rtl::OUString getCountry() const;
-
+        
         //---------------------------------------
         /** @short  returns the variant code for this locale.
-
+        
             @return [string]
                     the variant code.
          */
@@ -244,10 +244,10 @@ class COMPHELPER_DLLPUBLIC Locale
 
         //---------------------------------------
         /** @short  set the new language code for this locale.
-
+        
             @descr  That will either be the empty string or
                     a lowercase ISO 639 code.
-
+        
             @param  sLanguage
                     the language code.
          */
@@ -255,45 +255,45 @@ class COMPHELPER_DLLPUBLIC Locale
 
         //---------------------------------------
         /** @short  set the new country/region code for this locale.
-
+        
             @descr  That will either be the empty string or an
                     upercase ISO 3166 2-letter code.
-
+        
             @param  sCountry
                     the country code.
          */
         void setCountry(const ::rtl::OUString& sCountry);
-
+        
         //---------------------------------------
         /** @short  set the new variant code for this locale.
-
+        
             @param  sVariant
                     the variant code.
          */
         void setVariant(const ::rtl::OUString& sVariant);
-
+        
         //---------------------------------------
         /** @short      take over new Locale informations.
-
+        
             @seealso    Locale(const ::rtl::OUString& sISO)
-
+            
             @param      sISO
                         an ISO formated string value, which can be parsed and
                         tokenized into a Lamnguage, Country and Variant part.
                         e.g. "en-US" or "en-US_WIN"
-
+                        
             @throw      MalFormedLocaleException
                         if conversion failed.
           */
         void fromISO(const ::rtl::OUString& sISO)
             throw(MalFormedLocaleException);
-
+        
         //---------------------------------------
         /** @short  converts this Locale to an ISO formated string value.
-
+        
             @descr  The different parts of this Locale will be assempled
                     e.g. to "en-US" or "en-US_WIN"
-
+                    
             @return [string]
                     the ISO formated string.
           */
@@ -301,13 +301,13 @@ class COMPHELPER_DLLPUBLIC Locale
 
         //---------------------------------------
         /** @short  check, if two Locale objects are equals.
-
+        
             @descr  All parts of a Locale (means Language, Country and Variant)
                     will be checked.
-
+                    
             @param  aComparable
                     the Locale object for compare.
-
+                    
             @return [boolean]
                     TRUE if both objects uses the same values for
                     Language, Country and Variant.
@@ -317,10 +317,10 @@ class COMPHELPER_DLLPUBLIC Locale
         //---------------------------------------
         /** @short  check, if two Locale objects
                     uses the same language.
-
+        
             @descr  The Country and Variant parts of a Locale
                     wont be checked here.
-
+                    
             @return [boolean]
                     TRUE if both objects uses the same
                     Language value.
@@ -330,47 +330,47 @@ class COMPHELPER_DLLPUBLIC Locale
         //---------------------------------------
         /** @short      search for an equal or at least for a similar
                         Locale in a list of possible ones.
-
+                        
             @descr      First it searches for a Locale, which is equals
                         to the reference Locale.
                         (means: same Language, Country, Variant)
-
+                        
                         If the reference Locale couldnt be located, it will
                         tried again - but we are checking for "similar" Locales then.
                         (means: same Language)
-
+                        
                         If no similar Locale could be located, we search
                         for a Locale "en-US" inside the given Locale list.
-
+                        
                         If "en-US" could not be located, we search for
                         a Locale "en" inside the given list.
-
+                        
                         If no "same" nor any "similar" locale could be found,
                         we try "x-default" and "x-notranslate" explicitly.
                         Sometimes localized variables are optimized and doesnt use
                         localzation realy. E.g. in case the localized value is a fix
                         product name.
-
+                        
                         If no locale match till now, we use any other existing
                         locale, which exists inside the set of given ones!
-
-            @seealso    equals()
+                        
+            @seealso    equals()                    
             @seealso    similar()
-
+            
             @param      lISOList
                         the list of possible Locales
                         (as formated ISO strings).
-
+                        
             @param      sReferenceISO
                         the reference Locale, which should be searched
                         if its equals or similar to any Locale inside
                         the provided Locale list.
-
+                        
             @return     An iterator, which points to the found element
                         inside the given Locale list.
                         If no matching Locale could be found, it points
-                        to the end of the list.
-
+                        to the end of the list.                        
+                        
             @throw      [MalFormedLocaleException]
                         if at least one ISO formated string couldnt
                         be converted to a valid Locale Object.
@@ -378,19 +378,19 @@ class COMPHELPER_DLLPUBLIC Locale
         static ::std::vector< ::rtl::OUString >::const_iterator getFallback(const ::std::vector< ::rtl::OUString >& lISOList     ,
                                                                             const ::rtl::OUString&                  sReferenceISO)
             throw(MalFormedLocaleException);
-
+            
         //---------------------------------------
         /** @short      search for the next possible fallback locale.
-
+        
             @descr      Instead of getFallback(vector<>, string) this method
                         uses the given locale and decide by using an algorithm
                         which locale can be the next possible one.
-
+                        
                         Algorithm:
                         - if locale has country return language only
                         - if locale different "en-US" return "en-US"
                         - if locale "en-US" return "en"
-
+                        
             @param      aLocale [in/out]!
                         the incoming value will be used to start
                         search for a possible fallback ...
@@ -398,39 +398,39 @@ class COMPHELPER_DLLPUBLIC Locale
                         will be used for return too.
 
             @return     TRUE if the parameter aLocale contains a new fallback value;
-                        FALSE otherwise.
+                        FALSE otherwise.                        
          */
-        static sal_Bool getFallback(Locale& aLocale);
+        static sal_Bool getFallback(Locale& aLocale);            
 
         //---------------------------------------
         /** @short      assign elements of another locale
                         to this instance.
-
+                        
             @param      rCopy
                         another locale object.
          */
         void operator=(const Locale& rCopy);
-
+        
         //---------------------------------------
         /** @short      check if two Locale objects are equals.
-
+        
             @seealso    equals()
-
+            
             @param      aComparable
                         the Locale object for compare.
-
+                        
             @return     [boolean]
                         TRUE if both objects uses the same values for
                         Language, Country and Variant.
          */
         sal_Bool operator==(const Locale& aComparable) const;
-
+        
         //---------------------------------------
         /** @short  check if two Locale objects are different.
-
+        
             @param  aComparable
                     the Locale object for compare.
-
+                    
             @return [boolean]
                     TRUE if at least one part of such Locale
                     isnt the same.
diff --git a/comphelper/inc/comphelper/logging.hxx b/comphelper/inc/comphelper/logging.hxx
index 20f9302cc853..6d90554df273 100644
--- a/comphelper/inc/comphelper/logging.hxx
+++ b/comphelper/inc/comphelper/logging.hxx
@@ -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
@@ -577,7 +577,7 @@ namespace comphelper
             @param _rLoggerName
                 the name of the logger to work with. If empty, the office-wide
                 default logger will be used.
-
+                
         */
         ResourceBasedEventLogger(
             const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rxContext,
@@ -594,7 +594,7 @@ namespace comphelper
             @param _pAsciiLoggerName
                 the ASCII name of the logger to work with. If NULL, the office-wide
                 default logger will be used.
-
+                
         */
         ResourceBasedEventLogger(
             const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rxContext,
diff --git a/comphelper/inc/comphelper/make_shared_from_uno.hxx b/comphelper/inc/comphelper/make_shared_from_uno.hxx
index 3acd4ec13dfe..b68fe6d756fd 100644
--- a/comphelper/inc/comphelper/make_shared_from_uno.hxx
+++ b/comphelper/inc/comphelper/make_shared_from_uno.hxx
@@ -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
@@ -43,7 +43,7 @@ template <typename T> struct ReleaseFunc : ::std::unary_function<T *, void> {
 /** Makes a boost::shared_ptr from a ref-counted UNO object pointer.
     This makes sense if the object is used via UNO (implementing some X
     interface) and also internally using its implementation class, e.g.
-
+    
     <pre>
         boost::shared_ptr<MyUnoImpl> const ptr(
             comphelper::make_shared_from_UNO( new MyUnoImpl ) );
@@ -53,12 +53,12 @@ template <typename T> struct ReleaseFunc : ::std::unary_function<T *, void> {
         takeSharedPtr( ptr );
         ...
     </pre>
-
+    
     @attention The shared_ptr operates on a separate reference counter, so
                weak pointers (boost::weak_ptr) are invalidated when the last
                shared_ptr is destroyed, although the UNO object may still be
                alive.
-
+               
     @param p object pointer
     @return shared_ptr to object
 */
diff --git a/comphelper/inc/comphelper/makesequence.hxx b/comphelper/inc/comphelper/makesequence.hxx
index 4273356bf9aa..83a204f2f34f 100644
--- a/comphelper/inc/comphelper/makesequence.hxx
+++ b/comphelper/inc/comphelper/makesequence.hxx
@@ -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
@@ -47,15 +47,15 @@ inline ::com::sun::star::uno::Sequence<T> makeSequence( T const& element )
     p[n_] = BOOST_PP_CAT(element, n_);
 
 /** The following preprocessor repetitions generate functions like
-
+    
     <pre>
         template <typename T>
         inline ::com::sun::star::uno::Sequence<T> makeSequence(
             T const& element0, T const& element1, ... );
     </pre>
-
+    
     which make a sequence out of the passed elements.
-
+    
     The maximum number of elements can be set by defining
     COMPHELPER_MAKESEQUENCE_MAX_ARGS; its default is 12.
 */
diff --git a/comphelper/inc/comphelper/mediadescriptor.hxx b/comphelper/inc/comphelper/mediadescriptor.hxx
index 7d2333045390..9b4d6137ba82 100644
--- a/comphelper/inc/comphelper/mediadescriptor.hxx
+++ b/comphelper/inc/comphelper/mediadescriptor.hxx
@@ -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
@@ -217,22 +217,22 @@ class COMPHELPER_DLLPUBLIC MediaDescriptor : public SequenceAsHashMap
         //---------------------------------------
         /** Inserts a value into the sequence contained in the property
             'ComponentData' of the media descriptor.
-
+            
             @descr  The property 'ComponentData' should be empty or should
                 contain a value of type ComponentDataSequence (see above). The
                 passed value will be inserted into the sequence, or, if already
                 existing, will be overwritten.
-
+                
             @param rName  The name of the value to be inserted into the
                 sequence of the 'ComponentData' property.
-
+                
             @param rValue  The value to be inserted into the sequence of the
                 'ComponentData' property.
          */
         void setComponentDataEntry(
             const ::rtl::OUString& rName,
             const ::com::sun::star::uno::Any& rValue );
-
+            
         //---------------------------------------
         /** Removes a value from the sequence contained in the property
             'ComponentData' of the media descriptor.
diff --git a/comphelper/inc/comphelper/mimeconfighelper.hxx b/comphelper/inc/comphelper/mimeconfighelper.hxx
index 5e02d4761cb1..6e74bd53132e 100644
--- a/comphelper/inc/comphelper/mimeconfighelper.hxx
+++ b/comphelper/inc/comphelper/mimeconfighelper.hxx
@@ -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
@@ -49,7 +49,7 @@ class COMPHELPER_DLLPUBLIC MimeConfigurationHelper
     ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > m_xObjectConfig;
     ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > m_xVerbsConfig;
     ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > m_xMediaTypeConfig;
-
+    
 public:
 
     MimeConfigurationHelper( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xFactory );
@@ -64,7 +64,7 @@ public:
                                             GetConfigurationByPath( const ::rtl::OUString& aPath );
 
     ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > GetObjConfiguration();
-
+    
     ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > GetVerbsConfiguration();
     ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > GetMediaTypeConfiguration();
 
@@ -112,7 +112,7 @@ public:
     ::rtl::OUString UpdateMediaDescriptorWithFilterName(
                         ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aMediaDescr,
                         ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue >& aObject );
-    sal_Bool AddFilterNameCheckOwnFile(
+    sal_Bool AddFilterNameCheckOwnFile( 
                         ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aMediaDescr );
 
     ::rtl::OUString GetDefaultFilterFromServiceName( const ::rtl::OUString& aServName, sal_Int32 nVersion );
diff --git a/comphelper/inc/comphelper/namecontainer.hxx b/comphelper/inc/comphelper/namecontainer.hxx
index 30d2326794b0..888dcab46136 100644
--- a/comphelper/inc/comphelper/namecontainer.hxx
+++ b/comphelper/inc/comphelper/namecontainer.hxx
@@ -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
diff --git a/comphelper/inc/comphelper/namedvaluecollection.hxx b/comphelper/inc/comphelper/namedvaluecollection.hxx
index 72cd0e7cdfbe..e718045b673e 100644
--- a/comphelper/inc/comphelper/namedvaluecollection.hxx
+++ b/comphelper/inc/comphelper/namedvaluecollection.hxx
@@ -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
diff --git a/comphelper/inc/comphelper/numberedcollection.hxx b/comphelper/inc/comphelper/numberedcollection.hxx
index 03bc1e0b78ed..3e98ba886d09 100644
--- a/comphelper/inc/comphelper/numberedcollection.hxx
+++ b/comphelper/inc/comphelper/numberedcollection.hxx
@@ -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
@@ -59,12 +59,12 @@ namespace comphelper{
 //_______________________________________________
 // definitions
 
-/** @short  defines a collection of UNO components, where every component will get it's own unique number.
+/** @short  defines a collection of UNO components, where every component will get it's own unique number. 
 
     @descr  Such number will be unique at runtime only ... but it supports fragmentation.
             Note: This collection uses weak refrences only to know her components.
             So lifetime of thise components must be controlled outside.
-
+            
     @threadsafe
  */
 class COMPHELPER_DLLPUBLIC NumberedCollection : private ::cppu::BaseMutex
@@ -73,120 +73,120 @@ class COMPHELPER_DLLPUBLIC NumberedCollection : private ::cppu::BaseMutex
     //-------------------------------------------
     // types, const
     private:
-
+        
         struct TNumberedItem
         {
             css::uno::WeakReference< css::uno::XInterface > xItem;
             ::sal_Int32 nNumber;
         };
-
-        typedef ::std::hash_map<
+    
+        typedef ::std::hash_map< 
                     long                    ,
                     TNumberedItem           ,
                     ::std::hash< long >     ,
                     ::std::equal_to< long > > TNumberedItemHash;
-
+    
         typedef ::std::vector< long > TDeadItemList;
-
+    
     //-------------------------------------------
     // interface
     public:
 
         //---------------------------------------
         /** @short  lightweight constructor.
-         */
+         */                    
         NumberedCollection();
-
+        
         //---------------------------------------
         /** @short  free all internaly used resources.
-         */
+         */                    
         virtual ~NumberedCollection();
-
+    
         //---------------------------------------
         /** set an outside component which uses this container and must be set
             as source of all broadcasted messages, exceptions.
-
+    
             It's holded weak only so we do not need any complex dispose sessions.
-
+    
             Note: Passing NULL as parameter will be allowed. It will reset the internal
             member reference only.
-
+    
             @param  xOwner
                     the new owner of this collection.
          */
         void setOwner (const css::uno::Reference< css::uno::XInterface >& xOwner);
-
+        
         //---------------------------------------
         /** set the localized prefix to be used for untitled components.
-
+        
             Localization has to be done outside. This container will return
             those value then. There are no further checks. Its up to you to define
             a suitable string here :-)
-
+            
             @param  sPrefix
                     the new prefix for untitled components.
          */
         void setUntitledPrefix(const ::rtl::OUString& sPrefix);
-
+    
         //---------------------------------------
         /** @see css.frame.XUntitledNumbers */
         virtual ::sal_Int32 SAL_CALL leaseNumber(const css::uno::Reference< css::uno::XInterface >& xComponent)
             throw (css::lang::IllegalArgumentException,
                    css::uno::RuntimeException         );
-
+                   
         //---------------------------------------
         /** @see css.frame.XUntitledNumbers */
         virtual void SAL_CALL releaseNumber(::sal_Int32 nNumber)
             throw (css::lang::IllegalArgumentException,
                    css::uno::RuntimeException         );
-
+                   
         //---------------------------------------
         /** @see css.frame.XUntitledNumbers */
         virtual void SAL_CALL releaseNumberForComponent(const css::uno::Reference< css::uno::XInterface >& xComponent)
             throw (css::lang::IllegalArgumentException,
                    css::uno::RuntimeException         );
-
+                   
         //---------------------------------------
         /** @see css.frame.XUntitledNumbers */
         virtual ::rtl::OUString SAL_CALL getUntitledPrefix()
             throw (css::uno::RuntimeException);
-
+                  
     //-------------------------------------------
     // internal
     private:
 
         //---------------------------------------
         /** @short  trys to find an unique number not already used within this collection.
-
+    
             @descr  It reuses the smalles number which isnt used by any component
                     of this collection. (fragmentation!) If collection is full (means there
                     is no free number) the special value INVALID_NUMBER will be returned.
-
+    
             @note   Those method cant be called within a multithreaded environment ..
                     Because such number wont be "reserved" for the calli of these method
                     it can happen that two calls returns the same number (reasoned by the fact that first calli
                     doesnt used the returned number already.
-
+    
                     So the outside code has to make sure that retrieving and using of those number
                     will be an atomic operation.
-
+    
             @return an unique number or special value INVALID_NUMBER if collection is full.
-         */
+         */                    
         ::sal_Int32 impl_searchFreeNumber ();
-
+    
         void impl_cleanUpDeadItems (      TNumberedItemHash& lItems    ,
                                     const TDeadItemList&     lDeadItems);
-
+                                    
     //-------------------------------------------
     // member
     private:
-
+        
         /// localized string to be used for untitled components
         ::rtl::OUString m_sUntitledPrefix;
-
+    
         /// cache of all "leased numbers" and its bound components
         TNumberedItemHash m_lComponents;
-
+    
         /// used as source of broadcasted messages or exceptions (can be null !)
         css::uno::WeakReference< css::uno::XInterface > m_xOwner;
 };
diff --git a/comphelper/inc/comphelper/numbers.hxx b/comphelper/inc/comphelper/numbers.hxx
index ef5bbe73931c..ffe8959c8051 100644
--- a/comphelper/inc/comphelper/numbers.hxx
+++ b/comphelper/inc/comphelper/numbers.hxx
@@ -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
@@ -38,9 +38,9 @@ namespace comphelper
 {
 //.........................................................................
 
-    namespace staruno   = ::com::sun::star::uno;
-    namespace starlang  = ::com::sun::star::lang;
-    namespace starutil  = ::com::sun::star::util;
+    namespace staruno	= ::com::sun::star::uno;
+    namespace starlang	= ::com::sun::star::lang;
+    namespace starutil	= ::com::sun::star::util;
 
     /// returns the ::com::sun::star::util::NumberFormat of the given key under the given formats
     COMPHELPER_DLLPUBLIC sal_Int16 getNumberFormatType(const staruno::Reference<starutil::XNumberFormats>& xFormats, sal_Int32 nKey);
@@ -67,7 +67,7 @@ namespace comphelper
     );
 
 //.........................................................................
-}   // namespace comphelper
+}	// namespace comphelper
 //.........................................................................
 
 #endif // _COMPHELPER_NUMBERS_HXX_
diff --git a/comphelper/inc/comphelper/officeresourcebundle.hxx b/comphelper/inc/comphelper/officeresourcebundle.hxx
index d45209da9374..1574779add30 100644
--- a/comphelper/inc/comphelper/officeresourcebundle.hxx
+++ b/comphelper/inc/comphelper/officeresourcebundle.hxx
@@ -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
diff --git a/comphelper/inc/comphelper/ofopxmlhelper.hxx b/comphelper/inc/comphelper/ofopxmlhelper.hxx
index db203a08d750..034a96ea0e64 100644
--- a/comphelper/inc/comphelper/ofopxmlhelper.hxx
+++ b/comphelper/inc/comphelper/ofopxmlhelper.hxx
@@ -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
diff --git a/comphelper/inc/comphelper/optional.hxx b/comphelper/inc/comphelper/optional.hxx
index 790e117622fd..d306c8bea8d6 100644
--- a/comphelper/inc/comphelper/optional.hxx
+++ b/comphelper/inc/comphelper/optional.hxx
@@ -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
diff --git a/comphelper/inc/comphelper/optionalvalue.hxx b/comphelper/inc/comphelper/optionalvalue.hxx
index f63e1cde51aa..89bbf017d4a3 100644
--- a/comphelper/inc/comphelper/optionalvalue.hxx
+++ b/comphelper/inc/comphelper/optionalvalue.hxx
@@ -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,7 +56,7 @@ namespace comphelper
     {
     public:
         typedef Element ValueType;
-
+        
         /** Default-construct the value.
 
             A default-constructed value is not valid. You have to
@@ -140,13 +140,13 @@ namespace comphelper
         bool exportValue( ::com::sun::star::uno::Any& o_rAny )
         {
             o_rAny.clear();
-
+            
             if( isValid() )
             {
                 if( !(o_rAny <<= getValue()) )
                     return false;
             }
-
+            
             return true;
         }
 
@@ -163,14 +163,14 @@ namespace comphelper
         bool importValue( const ::com::sun::star::uno::Any& rAny )
         {
             clearValue();
-
+            
             if( rAny.hasValue() )
             {
                 Element tmp;
-
+                
                 if( !(rAny >>= tmp) )
                     return false;
-
+                
                 setValue( tmp );
             }
 
@@ -178,8 +178,8 @@ namespace comphelper
         }
 
     private:
-        Element     maValue;
-        bool        mbValid;
+        Element		maValue;
+        bool		mbValid;
     };
 
 }
diff --git a/comphelper/inc/comphelper/oslfile2streamwrap.hxx b/comphelper/inc/comphelper/oslfile2streamwrap.hxx
index 1a0a7cc55e04..c5fa1fae0ffa 100644
--- a/comphelper/inc/comphelper/oslfile2streamwrap.hxx
+++ b/comphelper/inc/comphelper/oslfile2streamwrap.hxx
@@ -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
@@ -36,21 +36,21 @@
 
 namespace comphelper
 {
-    namespace stario    = ::com::sun::star::io;
-    namespace staruno   = ::com::sun::star::uno;
+    namespace stario	= ::com::sun::star::io;
+    namespace staruno	= ::com::sun::star::uno;
 
 //==================================================================
 // FmUnoIOStream,
 // stream zum schreiben un lesen von Daten, basieren  auf File
 //==================================================================
-struct InputStreamWrapper_Base : public ::cppu::WeakImplHelper1<stario::XInputStream>
+struct InputStreamWrapper_Base : public ::cppu::WeakImplHelper1<stario::XInputStream> 
 {};
 
 class COMPHELPER_DLLPUBLIC OSLInputStreamWrapper : public InputStreamWrapper_Base
 {
-    ::osl::Mutex    m_aMutex;
-    ::osl::File*    m_pFile;
-    sal_Bool        m_bFileOwner : 1;
+    ::osl::Mutex	m_aMutex;
+    ::osl::File*	m_pFile;
+    sal_Bool		m_bFileOwner : 1;
 
 public:
     OSLInputStreamWrapper(::osl::File& _rStream);
@@ -58,41 +58,41 @@ public:
     virtual ~OSLInputStreamWrapper();
 
 // UNO Anbindung
-    virtual void            SAL_CALL acquire() throw()
+    virtual void			SAL_CALL acquire() throw()
         { InputStreamWrapper_Base::acquire(); }
-    virtual void            SAL_CALL release() throw()
+    virtual void			SAL_CALL release() throw()
         { InputStreamWrapper_Base::release(); }
-    virtual ::com::sun::star::uno::Any  SAL_CALL queryInterface(const ::com::sun::star::uno::Type& _rType) throw (::com::sun::star::uno::RuntimeException)
+    virtual ::com::sun::star::uno::Any	SAL_CALL queryInterface(const ::com::sun::star::uno::Type& _rType) throw (::com::sun::star::uno::RuntimeException)
         { return InputStreamWrapper_Base::queryInterface(_rType); }
 
 // stario::XInputStream
-    virtual sal_Int32   SAL_CALL    readBytes(staruno::Sequence< sal_Int8 >& aData, sal_Int32 nBytesToRead) throw(stario::NotConnectedException, stario::BufferSizeExceededException, staruno::RuntimeException);
-    virtual sal_Int32   SAL_CALL    readSomeBytes(staruno::Sequence< sal_Int8 >& aData, sal_Int32 nMaxBytesToRead) throw(stario::NotConnectedException, stario::BufferSizeExceededException, staruno::RuntimeException);
-    virtual void        SAL_CALL    skipBytes(sal_Int32 nBytesToSkip) throw(stario::NotConnectedException, stario::BufferSizeExceededException, staruno::RuntimeException);
-    virtual sal_Int32   SAL_CALL    available() throw(stario::NotConnectedException, staruno::RuntimeException);
-    virtual void        SAL_CALL    closeInput() throw(stario::NotConnectedException, staruno::RuntimeException);
+    virtual sal_Int32	SAL_CALL	readBytes(staruno::Sequence< sal_Int8 >& aData, sal_Int32 nBytesToRead) throw(stario::NotConnectedException, stario::BufferSizeExceededException, staruno::RuntimeException);
+    virtual sal_Int32	SAL_CALL	readSomeBytes(staruno::Sequence< sal_Int8 >& aData, sal_Int32 nMaxBytesToRead) throw(stario::NotConnectedException, stario::BufferSizeExceededException, staruno::RuntimeException);
+    virtual void		SAL_CALL	skipBytes(sal_Int32 nBytesToSkip) throw(stario::NotConnectedException, stario::BufferSizeExceededException, staruno::RuntimeException);
+    virtual sal_Int32	SAL_CALL	available() throw(stario::NotConnectedException, staruno::RuntimeException);
+    virtual void		SAL_CALL	closeInput() throw(stario::NotConnectedException, staruno::RuntimeException);
 };
 
 //==================================================================
 // FmUnoOutStream,
 // Datensenke fuer Files
 //==================================================================
-struct OutputStreamWrapper_Base : public ::cppu::WeakImplHelper1<stario::XOutputStream>
+struct OutputStreamWrapper_Base : public ::cppu::WeakImplHelper1<stario::XOutputStream> 
 {};
 
 class COMPHELPER_DLLPUBLIC OSLOutputStreamWrapper : public OutputStreamWrapper_Base
 {
-    ::osl::File&        rFile;
+    ::osl::File&		rFile;
 
 public:
     OSLOutputStreamWrapper(::osl::File& _rFile) :rFile(_rFile) { }
 
 // UNO Anbindung
-    virtual void            SAL_CALL acquire() throw()
+    virtual void			SAL_CALL acquire() throw()
         { OutputStreamWrapper_Base::acquire(); }
-    virtual void            SAL_CALL release() throw()
+    virtual void			SAL_CALL release() throw()
         { OutputStreamWrapper_Base::release(); }
-    virtual ::com::sun::star::uno::Any  SAL_CALL queryInterface(const ::com::sun::star::uno::Type& _rType) throw (::com::sun::star::uno::RuntimeException)
+    virtual ::com::sun::star::uno::Any	SAL_CALL queryInterface(const ::com::sun::star::uno::Type& _rType) throw (::com::sun::star::uno::RuntimeException)
         { return OutputStreamWrapper_Base::queryInterface(_rType); }
 
 // stario::XOutputStream
@@ -101,7 +101,7 @@ public:
     virtual void SAL_CALL closeOutput() throw(stario::NotConnectedException, stario::BufferSizeExceededException, staruno::RuntimeException);
 };
 
-}   // namespace comphelper
+}	// namespace comphelper
 
 
 #endif // _COMPHELPER_STREAM_OSLFILEWRAPPER_HXX_
diff --git a/comphelper/inc/comphelper/otransactedfilestream.hxx b/comphelper/inc/comphelper/otransactedfilestream.hxx
index b4533b5d9694..736836b9bfcf 100644
--- a/comphelper/inc/comphelper/otransactedfilestream.hxx
+++ b/comphelper/inc/comphelper/otransactedfilestream.hxx
@@ -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
@@ -65,7 +65,7 @@ class COMPHELPER_DLLPUBLIC OTruncatedTransactedFileStream
                                         ::com::sun::star::beans::XPropertySetInfo,
                                         ::com::sun::star::beans::XPropertySet >
 {
-    ::osl::Mutex    m_aMutex;
+    ::osl::Mutex	m_aMutex;
     TTFileStreamData_Impl* m_pStreamData;
 
     void CommonInit_Impl(
diff --git a/comphelper/inc/comphelper/processfactory.hxx b/comphelper/inc/comphelper/processfactory.hxx
index aeaaf498c918..b6c95393171a 100644
--- a/comphelper/inc/comphelper/processfactory.hxx
+++ b/comphelper/inc/comphelper/processfactory.hxx
@@ -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
diff --git a/comphelper/inc/comphelper/propagg.hxx b/comphelper/inc/comphelper/propagg.hxx
index b82f737d534b..124ffb6b145c 100644
--- a/comphelper/inc/comphelper/propagg.hxx
+++ b/comphelper/inc/comphelper/propagg.hxx
@@ -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
@@ -64,9 +64,9 @@ namespace internal
         sal_Bool operator <(const OPropertyAccessor& rOb) const { return nPos < rOb.nPos; }
     };
 
-    typedef std::map< sal_Int32, OPropertyAccessor, ::std::less< sal_Int32 > >  PropertyAccessorMap;
-    typedef PropertyAccessorMap::iterator           PropertyAccessorMapIterator;
-    typedef PropertyAccessorMap::const_iterator     ConstPropertyAccessorMapIterator;
+    typedef std::map< sal_Int32, OPropertyAccessor, ::std::less< sal_Int32 > >	PropertyAccessorMap;
+    typedef PropertyAccessorMap::iterator			PropertyAccessorMapIterator;
+    typedef PropertyAccessorMap::const_iterator		ConstPropertyAccessorMapIterator;
 }
 
 //==================================================================
@@ -76,12 +76,12 @@ namespace internal
 class IPropertyInfoService
 {
 public:
-    /** get the prefered handle for the given property
-        @param      _rName      the property name
-        @return                 the handle the property should be refered by, or -1 if there are no
+    /**	get the prefered handle for the given property
+        @param		_rName		the property name
+        @return					the handle the property should be refered by, or -1 if there are no
                                 preferences for the given property
     */
-    virtual sal_Int32           getPreferedPropertyId(const ::rtl::OUString& _rName) = 0;
+    virtual	sal_Int32			getPreferedPropertyId(const ::rtl::OUString& _rName) = 0;
 };
 
 /**
@@ -89,35 +89,35 @@ public:
  * aggregating property sets
  */
 
-#define DEFAULT_AGGREGATE_PROPERTY_ID   10000
+#define DEFAULT_AGGREGATE_PROPERTY_ID	10000
 //------------------------------------------------------------------
 class COMPHELPER_DLLPUBLIC OPropertyArrayAggregationHelper: public ::cppu::IPropertyArrayHelper
 {
     friend class OPropertySetAggregationHelper;
 protected:
 
-    ::com::sun::star::uno::Sequence< ::com::sun::star::beans::Property> m_aProperties;
-    internal::PropertyAccessorMap           m_aPropertyAccessors;
+    ::com::sun::star::uno::Sequence< ::com::sun::star::beans::Property>	m_aProperties;
+    internal::PropertyAccessorMap			m_aPropertyAccessors;
 
 public:
     /** construct the object.
-        @param  _rProperties    the properties of the object doing the aggregation. These properties
+        @param	_rProperties	the properties of the object doing the aggregation. These properties
                                 are used without any checks, so the caller has to ensure that the names and
                                 handles are valid.
-        @param  _rAggProperties the properties of the aggregate, usually got via an call to getProperties on the
+        @param	_rAggProperties	the properties of the aggregate, usually got via an call to getProperties on the
                                 XPropertySetInfo of the aggregate.
                                 The names of the properties are used without any checks, so the caller has to ensure
                                 that there are no doubles.
                                 The handles are stored for later quick access, but the outside-handles the
                                 aggregate properties get depend from the following two parameters.
-        @param  _pInfoService
+        @param	_pInfoService
                                 If not NULL, the object pointed to is used to calc handles which should be used
                                 for refering the aggregate's properties from outside.
                                 If one of the properties returned from the info service conflict with other handles
                                 alread present (e.g. through _rProperties), the property is handled as if -1 was returned.
                                 If NULL (or, for a special property, a call to getPreferedPropertyId returns -1),
                                 the aggregate property(ies) get a new handle which they can be refered by from outside.
-        @param  _nFirstAggregateId
+        @param	_nFirstAggregateId
                                 if the object is about to create new handles for the aggregate properties, it uses
                                 id's ascending from this given id.
                                 No checks are made if the handle range determined by _nFirstAggregateId conflicts with other
@@ -147,12 +147,12 @@ public:
     virtual sal_Int32 SAL_CALL fillHandles( /*out*/sal_Int32* _pHandles, const ::com::sun::star::uno::Sequence< ::rtl::OUString >& _rPropNames );
 
     /** returns information about a property of the aggregate.
-        @param  _pPropName          points to a string to recieve the property name. No name is returned if this is NULL.
-        @param  _pOriginalHandle    points to a sal_Int32 to recieve the original property hande. No original handle is returned
+        @param	_pPropName			points to a string to recieve the property name. No name is returned if this is NULL.
+        @param	_pOriginalHandle	points to a sal_Int32 to recieve the original property hande. No original handle is returned
                                     if this is NULL.
-        @param  _nHandle            the handle of the property as got by, for instance, fillHandles
+        @param	_nHandle			the handle of the property as got by, for instance, fillHandles
 
-        @return sal_True, if _nHandle marks an aggregate property, otherwise sal_False
+        @return	sal_True, if _nHandle marks an aggregate property, otherwise sal_False
     */
     virtual sal_Bool SAL_CALL fillAggregatePropertyInfoByHandle(::rtl::OUString* _pPropName, sal_Int32* _pOriginalHandle,
                                                    sal_Int32 _nHandle) const;
@@ -180,7 +180,7 @@ public:
         When using the XPropertySetInfo of the aggregate set to determine the existence of a property, then this
         would return false positives.</p>
     */
-    PropertyOrigin  classifyProperty( const ::rtl::OUString& _rName );
+    PropertyOrigin	classifyProperty( const ::rtl::OUString& _rName );
 
 protected:
     const ::com::sun::star::beans::Property* findPropertyByName(const ::rtl::OUString& _rName) const;
@@ -198,7 +198,7 @@ namespace internal
  * supports at least XPropertySet and XMultiPropertySet
  *
  */
-class COMPHELPER_DLLPUBLIC OPropertySetAggregationHelper    :public OPropertyStateHelper
+class COMPHELPER_DLLPUBLIC OPropertySetAggregationHelper	:public OPropertyStateHelper
                                     ,public ::com::sun::star::beans::XPropertiesChangeListener
                                     ,public ::com::sun::star::beans::XVetoableChangeListener
 {
@@ -226,8 +226,8 @@ public:
     virtual ::com::sun::star::uno::Any SAL_CALL getFastPropertyValue(sal_Int32 nHandle) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
 
 // XPropertySet
-    virtual void SAL_CALL           addPropertyChangeListener(const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
-    virtual void SAL_CALL           addVetoableChangeListener(const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL			addPropertyChangeListener(const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL			addVetoableChangeListener(const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
 
 // XPropertiesChangeListener
     virtual void SAL_CALL propertiesChange(const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyChangeEvent >& evt) throw(::com::sun::star::uno::RuntimeException);
@@ -236,13 +236,13 @@ public:
     virtual void SAL_CALL vetoableChange(const ::com::sun::star::beans::PropertyChangeEvent& aEvent) throw(::com::sun::star::beans::PropertyVetoException, ::com::sun::star::uno::RuntimeException);
 
 // XMultiPropertySet
-    virtual void SAL_CALL   setPropertyValues(const ::com::sun::star::uno::Sequence< ::rtl::OUString >& PropertyNames, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& Values) throw(::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
-    virtual void SAL_CALL   addPropertiesChangeListener(const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyNames, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener) throw(::com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL	setPropertyValues(const ::com::sun::star::uno::Sequence< ::rtl::OUString >& PropertyNames, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& Values) throw(::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL	addPropertiesChangeListener(const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyNames, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener) throw(::com::sun::star::uno::RuntimeException);
 
 // XPropertyState
-    virtual ::com::sun::star::beans::PropertyState SAL_CALL getPropertyState(const ::rtl::OUString& PropertyName) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException);
+    virtual ::com::sun::star::beans::PropertyState SAL_CALL	getPropertyState(const ::rtl::OUString& PropertyName) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException);
     virtual void SAL_CALL                                   setPropertyToDefault(const ::rtl::OUString& PropertyName) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException);
-    virtual ::com::sun::star::uno::Any SAL_CALL             getPropertyDefault(const ::rtl::OUString& aPropertyName) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
+    virtual ::com::sun::star::uno::Any SAL_CALL				getPropertyDefault(const ::rtl::OUString& aPropertyName) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
 
 // OPropertySetHelper
     /** still waiting to be overwritten ...
@@ -266,7 +266,7 @@ protected:
     virtual void SAL_CALL getFastPropertyValue(::com::sun::star::uno::Any& rValue, sal_Int32 nHandle) const;
     virtual void SAL_CALL disposing();
 
-    sal_Int32       getOriginalHandle( sal_Int32 _nHandle ) const;
+    sal_Int32	    getOriginalHandle( sal_Int32 _nHandle ) const;
     ::rtl::OUString getPropertyName( sal_Int32 _nHandle ) const;
 
     /** declares the property with the given (public) handle as one to be forwarded to the aggregate
@@ -322,7 +322,7 @@ protected:
 };
 
 //.........................................................................
-}   // namespace comphelper
+}	// namespace comphelper
 //.........................................................................
 
 #endif // _COMPHELPER_PROPERTY_AGGREGATION_HXX_
diff --git a/comphelper/inc/comphelper/proparrhlp.hxx b/comphelper/inc/comphelper/proparrhlp.hxx
index 193f7e100c4a..4ee0393e79dd 100644
--- a/comphelper/inc/comphelper/proparrhlp.hxx
+++ b/comphelper/inc/comphelper/proparrhlp.hxx
@@ -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
@@ -44,13 +44,13 @@ namespace comphelper
 {
 //.........................................................................
 
-    namespace staruno   = ::com::sun::star::uno;
-    namespace starbeans = ::com::sun::star::beans;
+    namespace staruno	= ::com::sun::star::uno;
+    namespace starbeans	= ::com::sun::star::beans;
 
 
 //==================================================================
 
-template <typename TYPE> struct OPropertyArrayUsageHelperMutex
+template <typename TYPE> struct OPropertyArrayUsageHelperMutex 
     : public rtl::Static< ::osl::Mutex, OPropertyArrayUsageHelperMutex<TYPE> > {};
 
 
@@ -58,13 +58,13 @@ template <class TYPE>
 class OPropertyArrayUsageHelper
 {
 protected:
-    static sal_Int32                        s_nRefCount;
-    static ::cppu::IPropertyArrayHelper*    s_pProps;
+    static sal_Int32						s_nRefCount;
+    static ::cppu::IPropertyArrayHelper*	s_pProps;
 
 public:
     OPropertyArrayUsageHelper();
     virtual ~OPropertyArrayUsageHelper()
-    {   // ARGHHHHHHH ..... would like to implement this after the class
+    {	// ARGHHHHHHH ..... would like to implement this after the class
         // definition (as we do with all other methods) but SUNPRO 5 compiler
         // (linker) doesn't like this
         ::osl::MutexGuard aGuard(OPropertyArrayUsageHelperMutex<TYPE>::get());
@@ -79,7 +79,7 @@ public:
     /** call this in the getInfoHelper method of your derived class. The method returns the array helper of the
         class, which is created if neccessary.
     */
-    ::cppu::IPropertyArrayHelper*   getArrayHelper();
+    ::cppu::IPropertyArrayHelper*	getArrayHelper();
 
 protected:
     /** used to implement the creation of the array helper which is shared amongst all instances of the class.
@@ -89,7 +89,7 @@ protected:
         <BR>
         as long as IPropertyArrayHelper has no virtual destructor, the implementation of ~OPropertyArrayUsageHelper
         assumes that you created an ::cppu::OPropertyArrayHelper when deleting s_pProps.
-        @return                         an pointer to the newly created array helper. Must not be NULL.
+        @return							an pointer to the newly created array helper. Must not be NULL.
     */
     virtual ::cppu::IPropertyArrayHelper* createArrayHelper( ) const = 0;
 };
@@ -105,8 +105,8 @@ protected:
         properties.
         <BR>
         The method gets called with Mutex acquired.
-        @param      _rProps             out parameter to be filled with the property descriptions of your own class
-        @param      _rAggregateProps    out parameter to be filled with the properties of your aggregate.
+        @param		_rProps				out parameter to be filled with the property descriptions of your own class
+        @param		_rAggregateProps	out parameter to be filled with the properties of your aggregate.
     */
     virtual void fillProperties(
         ::com::sun::star::uno::Sequence< ::com::sun::star::beans::Property >& /* [out] */ _rProps,
@@ -131,11 +131,11 @@ protected:
 };
 
 //------------------------------------------------------------------
-template<class TYPE>
-sal_Int32                       OPropertyArrayUsageHelper< TYPE >::s_nRefCount  = 0;
+template<class TYPE> 
+sal_Int32						OPropertyArrayUsageHelper< TYPE >::s_nRefCount	= 0;
 
-template<class TYPE>
-::cppu::IPropertyArrayHelper*   OPropertyArrayUsageHelper< TYPE >::s_pProps = NULL;
+template<class TYPE> 
+::cppu::IPropertyArrayHelper*	OPropertyArrayUsageHelper< TYPE >::s_pProps	= NULL;	
 
 //------------------------------------------------------------------
 template <class TYPE>
diff --git a/comphelper/inc/comphelper/property.hxx b/comphelper/inc/comphelper/property.hxx
index 5631cf5670f2..d27f0a179600 100644
--- a/comphelper/inc/comphelper/property.hxx
+++ b/comphelper/inc/comphelper/property.hxx
@@ -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
@@ -45,12 +45,12 @@ namespace comphelper
 {
 //.........................................................................
 
-    namespace starbeans = ::com::sun::star::beans;
-    namespace staruno   = ::com::sun::star::uno;
+    namespace starbeans	= ::com::sun::star::beans;
+    namespace staruno	= ::com::sun::star::uno;
 
 /** compare two properties by name
 */
-    struct PropertyStringLessFunctor : ::std::binary_function< ::com::sun::star::beans::Property, ::rtl::OUString, bool >
+    struct PropertyStringLessFunctor : ::std::binary_function< ::com::sun::star::beans::Property, ::rtl::OUString, bool > 
     {
         // ................................................................
         inline bool operator()( const ::com::sun::star::beans::Property& lhs, const ::rtl::OUString& rhs ) const
@@ -76,7 +76,7 @@ namespace comphelper
     //--------------------------------------------------------------------------
     /** compare two properties by name
      */
-    struct PropertyStringEqualFunctor : ::std::binary_function< ::com::sun::star::beans::Property, ::rtl::OUString, bool >
+    struct PropertyStringEqualFunctor : ::std::binary_function< ::com::sun::star::beans::Property, ::rtl::OUString, bool > 
     {
         // ................................................................
         inline bool operator()( const ::com::sun::star::beans::Property& lhs, const ::rtl::OUString& rhs ) const
@@ -118,20 +118,20 @@ COMPHELPER_DLLPUBLIC void RemoveProperty(staruno::Sequence<starbeans::Property>&
 
 //------------------------------------------------------------------
 /** within the given property sequence, modify attributes of a special property
-    @param  _rProps         the sequence of properties to search in
-    @param  _sPropName      the name of the property which's attributes should be modified
-    @param  _nAddAttrib     the attributes which should be added
-    @param  _nRemoveAttrib  the attributes which should be removed
+    @param	_rProps			the sequence of properties to search in
+    @param	_sPropName		the name of the property which's attributes should be modified
+    @param	_nAddAttrib		the attributes which should be added
+    @param	_nRemoveAttrib	the attributes which should be removed
 */
 COMPHELPER_DLLPUBLIC void ModifyPropertyAttributes(staruno::Sequence<starbeans::Property>& _rProps, const ::rtl::OUString& _sPropName, sal_Int16 _nAddAttrib, sal_Int16 _nRemoveAttrib);
 
 //------------------------------------------------------------------
-/** check if the given set has the given property.
+/**	check if the given set has the given property.
 */
 COMPHELPER_DLLPUBLIC sal_Bool hasProperty(const rtl::OUString& _rName, const staruno::Reference<starbeans::XPropertySet>& _rxSet);
 
 //------------------------------------------------------------------
-/** copy properties between property sets, in compliance with the property
+/**	copy properties between property sets, in compliance with the property
     attributes of the target object
 */
 COMPHELPER_DLLPUBLIC void copyProperties(const staruno::Reference<starbeans::XPropertySet>& _rxSource,
@@ -142,13 +142,13 @@ COMPHELPER_DLLPUBLIC void copyProperties(const staruno::Reference<starbeans::XPr
 //==================================================================
 
 /** helper for implementing ::cppu::OPropertySetHelper::convertFastPropertyValue
-    @param          _rConvertedValue    the conversion result (if successfull)
-    @param          _rOldValue          the old value of the property, calculated from _rCurrentValue
-    @param          _rValueToSet        the new value which is about to be set
-    @param          _rCurrentValue      the current value of the property
-    @return         sal_True, if the value could be converted and has changed
+    @param			_rConvertedValue	the conversion result (if successfull)
+    @param			_rOldValue			the old value of the property, calculated from _rCurrentValue
+    @param			_rValueToSet		the new value which is about to be set
+    @param			_rCurrentValue		the current value of the property
+    @return			sal_True, if the value could be converted and has changed
                     sal_False, if the value could be converted and has not changed
-    @exception      InvalidArgumentException thrown if the value could not be converted to the requested type (which is the template argument)
+    @exception		InvalidArgumentException thrown if the value could not be converted to the requested type (which is the template argument)
 */
 template <class TYPE>
 sal_Bool tryPropertyValue(staruno::Any& /*out*/_rConvertedValue, staruno::Any& /*out*/_rOldValue, const staruno::Any& _rValueToSet, const TYPE& _rCurrentValue)
@@ -166,13 +166,13 @@ sal_Bool tryPropertyValue(staruno::Any& /*out*/_rConvertedValue, staruno::Any& /
 }
 
 /** helper for implementing ::cppu::OPropertySetHelper::convertFastPropertyValue for enum values
-    @param          _rConvertedValue    the conversion result (if successfull)
-    @param          _rOldValue          the old value of the property, calculated from _rCurrentValue
-    @param          _rValueToSet        the new value which is about to be set
-    @param          _rCurrentValue      the current value of the property
-    @return         sal_True, if the value could be converted and has changed
+    @param			_rConvertedValue	the conversion result (if successfull)
+    @param			_rOldValue			the old value of the property, calculated from _rCurrentValue
+    @param			_rValueToSet		the new value which is about to be set
+    @param			_rCurrentValue		the current value of the property
+    @return			sal_True, if the value could be converted and has changed
                     sal_False, if the value could be converted and has not changed
-    @exception      InvalidArgumentException thrown if the value could not be converted to the requested type (which is the template argument)
+    @exception		InvalidArgumentException thrown if the value could not be converted to the requested type (which is the template argument)
 */
 template <class ENUMTYPE>
 sal_Bool tryPropertyValueEnum(staruno::Any& /*out*/_rConvertedValue, staruno::Any& /*out*/_rOldValue, const staruno::Any& _rValueToSet, const ENUMTYPE& _rCurrentValue)
@@ -196,13 +196,13 @@ sal_Bool tryPropertyValueEnum(staruno::Any& /*out*/_rConvertedValue, staruno::An
 }
 
 /** helper for implementing ::cppu::OPropertySetHelper::convertFastPropertyValue for boolean properties
-    @param          _rConvertedValue    the conversion result (if successfull)
-    @param          _rOldValue          the old value of the property, calculated from _rCurrentValue
-    @param          _rValueToSet        the new value which is about to be set
-    @param          _rCurrentValue      the current value of the property
-    @return         sal_True, if the value could be converted and has changed
+    @param			_rConvertedValue	the conversion result (if successfull)
+    @param			_rOldValue			the old value of the property, calculated from _rCurrentValue
+    @param			_rValueToSet		the new value which is about to be set
+    @param			_rCurrentValue		the current value of the property
+    @return			sal_True, if the value could be converted and has changed
                     sal_False, if the value could be converted and has not changed
-    @exception      InvalidArgumentException thrown if the value could not be converted to a boolean type
+    @exception		InvalidArgumentException thrown if the value could not be converted to a boolean type
 */
 inline sal_Bool tryPropertyValue(staruno::Any& /*out*/_rConvertedValue, staruno::Any& /*out*/_rOldValue, const staruno::Any& _rValueToSet, sal_Bool _bCurrentValue)
 {
@@ -219,14 +219,14 @@ inline sal_Bool tryPropertyValue(staruno::Any& /*out*/_rConvertedValue, staruno:
 }
 
 /** helper for implementing ::cppu::OPropertySetHelper::convertFastPropertyValue
-    @param          _rConvertedValue    the conversion result (if successfull)
-    @param          _rOldValue          the old value of the property, calculated from _rCurrentValue
-    @param          _rValueToSet        the new value which is about to be set
-    @param          _rCurrentValue      the current value of the property
-    @param          _rExpectedType      the type which the property should have (if not void)
-    @return         sal_True, if the value could be converted and has changed
+    @param			_rConvertedValue	the conversion result (if successfull)
+    @param			_rOldValue			the old value of the property, calculated from _rCurrentValue
+    @param			_rValueToSet		the new value which is about to be set
+    @param			_rCurrentValue		the current value of the property
+    @param			_rExpectedType		the type which the property should have (if not void)
+    @return			sal_True, if the value could be converted and has changed
                     sal_False, if the value could be converted and has not changed
-    @exception      InvalidArgumentException thrown if the value could not be converted to the requested type (which is the template argument)
+    @exception		InvalidArgumentException thrown if the value could not be converted to the requested type (which is the template argument)
 */
 COMPHELPER_DLLPUBLIC sal_Bool tryPropertyValue(staruno::Any& _rConvertedValue, staruno::Any& _rOldValue, const staruno::Any& _rValueToSet, const staruno::Any& _rCurrentValue, const staruno::Type& _rExpectedType);
 
diff --git a/comphelper/inc/comphelper/propertybag.hxx b/comphelper/inc/comphelper/propertybag.hxx
index cf7e99768e44..f8cd3554b3fd 100644
--- a/comphelper/inc/comphelper/propertybag.hxx
+++ b/comphelper/inc/comphelper/propertybag.hxx
@@ -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
diff --git a/comphelper/inc/comphelper/propertycontainer.hxx b/comphelper/inc/comphelper/propertycontainer.hxx
index 845ebd05e484..b6eab4c7e25a 100644
--- a/comphelper/inc/comphelper/propertycontainer.hxx
+++ b/comphelper/inc/comphelper/propertycontainer.hxx
@@ -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
@@ -89,7 +89,7 @@ protected:
 };
 
 //.........................................................................
-}   // namespace comphelper
+}	// namespace comphelper
 //.........................................................................
 
 #endif // _COMPHELPER_PROPERTYCONTAINER_HXX_
diff --git a/comphelper/inc/comphelper/propertycontainerhelper.hxx b/comphelper/inc/comphelper/propertycontainerhelper.hxx
index 82848203699c..e6f31dd38a57 100644
--- a/comphelper/inc/comphelper/propertycontainerhelper.hxx
+++ b/comphelper/inc/comphelper/propertycontainerhelper.hxx
@@ -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
@@ -83,19 +83,19 @@ struct COMPHELPER_DLLPUBLIC PropertyDescription
 */
 class COMPHELPER_DLLPUBLIC OPropertyContainerHelper
 {
-    typedef ::std::vector< ::com::sun::star::uno::Any > PropertyContainer;
-    typedef PropertyContainer::iterator                 PropertyContainerIterator;
-    typedef PropertyContainer::const_iterator           ConstPropertyContainerIterator;
-    PropertyContainer   m_aHoldProperties;
+    typedef ::std::vector< ::com::sun::star::uno::Any >	PropertyContainer;
+    typedef PropertyContainer::iterator					PropertyContainerIterator;
+    typedef PropertyContainer::const_iterator			ConstPropertyContainerIterator;
+    PropertyContainer	m_aHoldProperties;
         // the properties which are hold by this class' instance, not the derived one's
 
 private:
-    typedef ::std::vector< PropertyDescription >    Properties;
-    typedef Properties::iterator                    PropertiesIterator;
-    typedef Properties::const_iterator              ConstPropertiesIterator;
-    Properties      m_aProperties;
+    typedef ::std::vector< PropertyDescription >	Properties;
+    typedef Properties::iterator					PropertiesIterator;
+    typedef Properties::const_iterator				ConstPropertiesIterator;
+    Properties		m_aProperties;
 
-    sal_Bool        m_bUnused;
+    sal_Bool		m_bUnused;
 
 protected:
     OPropertyContainerHelper();
@@ -103,42 +103,42 @@ protected:
 
     /** register a property. The property is represented through a member of the derived class which calls
         this methdod.
-        @param      _rName              the name of the property
-        @param      _nHandle            the handle of the property
-        @param      _nAttributes        the attributes of the property
-        @param      _pPointerToMember   the pointer to the member representing the property
+        @param		_rName				the name of the property
+        @param		_nHandle			the handle of the property
+        @param		_nAttributes		the attributes of the property
+        @param		_pPointerToMember	the pointer to the member representing the property
                                         within the derived class.
-        @param      _rMemberType        the cppu type of the property represented by the object
+        @param		_rMemberType		the cppu type of the property represented by the object
                                         to which _pPointerToMember points.
     */
-    void    registerProperty(const ::rtl::OUString& _rName, sal_Int32 _nHandle, sal_Int32 _nAttributes,
+    void	registerProperty(const ::rtl::OUString& _rName, sal_Int32 _nHandle, sal_Int32 _nAttributes,
         void* _pPointerToMember, const ::com::sun::star::uno::Type& _rMemberType);
 
 
     /** register a property. The property is represented through a ::com::sun::star::uno::Any member of the
         derived class which calls this methdod.
-        @param      _rName              the name of the property
-        @param      _nHandle            the handle of the property
-        @param      _nAttributes        the attributes of the property
-        @param      _pPointerToMember   the pointer to the member representing the property
+        @param		_rName				the name of the property
+        @param		_nHandle			the handle of the property
+        @param		_nAttributes		the attributes of the property
+        @param		_pPointerToMember	the pointer to the member representing the property
                                         within the derived class, which has to be a ::com::sun::star::uno::Any.
-        @param      _rExpectedType      the expected type of the property. NOT the type of the object to which
+        @param		_rExpectedType		the expected type of the property. NOT the type of the object to which
                                         _pPointerToMember points (this is always an Any).
     */
-    void    registerMayBeVoidProperty(const ::rtl::OUString& _rName, sal_Int32 _nHandle, sal_Int32 _nAttributes,
+    void	registerMayBeVoidProperty(const ::rtl::OUString& _rName, sal_Int32 _nHandle, sal_Int32 _nAttributes,
         ::com::sun::star::uno::Any* _pPointerToMember, const ::com::sun::star::uno::Type& _rExpectedType);
 
     /** register a property. The repository will create an own object holding this property, so there is no
         need to declare an extra member in your derived class
-        @param      _rName              the name of the property
-        @param      _nHandle            the handle of the property
-        @param      _nAttributes        the attributes of the property
-        @param      _rType              the type of the property
-        @param      _pInitialValue      the initial value of the property. May be null if _nAttributes includes
+        @param		_rName				the name of the property
+        @param		_nHandle			the handle of the property
+        @param		_nAttributes		the attributes of the property
+        @param		_rType				the type of the property
+        @param		_pInitialValue		the initial value of the property. May be null if _nAttributes includes
                                         the ::com::sun::star::beans::PropertyAttribute::MAYBEVOID flag.
                                         Else it must be a pointer to an object of the type described by _rType.
     */
-    void    registerPropertyNoMember(const ::rtl::OUString& _rName, sal_Int32 _nHandle, sal_Int32 _nAttributes,
+    void	registerPropertyNoMember(const ::rtl::OUString& _rName, sal_Int32 _nHandle, sal_Int32 _nAttributes,
         const ::com::sun::star::uno::Type& _rType, const void* _pInitialValue);
 
     /** revokes a previously registered property
@@ -183,14 +183,14 @@ protected:
         @param  _rProps
             initial property sequence which is to be extended
     */
-    void    describeProperties(::com::sun::star::uno::Sequence< ::com::sun::star::beans::Property >& /* [out] */ _rProps) const;
+    void	describeProperties(::com::sun::star::uno::Sequence< ::com::sun::star::beans::Property >& /* [out] */ _rProps) const;
 
     /** modify the attributes of an already registered property.
 
         You may want to use this if you're a derived from OPropertyContainer indirectly and want to override
         some settings your base class did.
     */
-    void    modifyAttributes(sal_Int32 _nHandle, sal_Int32 _nAddAttrib, sal_Int32 _nRemoveAttrib);
+    void	modifyAttributes(sal_Int32 _nHandle, sal_Int32 _nAddAttrib, sal_Int32 _nRemoveAttrib);
 
     /** retrieves the description for a registered property
         @throw  com::sun::star::beans::UnknownPropertyException
@@ -201,10 +201,10 @@ protected:
 
 private:
     /// insertion of _rProp into m_aProperties, keeping the sort order
-    COMPHELPER_DLLPRIVATE void  implPushBackProperty(const PropertyDescription& _rProp);
+    COMPHELPER_DLLPRIVATE void	implPushBackProperty(const PropertyDescription& _rProp);
 
     /// search the PropertyDescription for the given handle (within m_aProperties)
-    COMPHELPER_DLLPRIVATE PropertiesIterator    searchHandle(sal_Int32 _nHandle);
+    COMPHELPER_DLLPRIVATE PropertiesIterator	searchHandle(sal_Int32 _nHandle);
 
 private:
     COMPHELPER_DLLPRIVATE OPropertyContainerHelper( const OPropertyContainerHelper& );            // never implemented
@@ -212,7 +212,7 @@ private:
 };
 
 //.........................................................................
-}   // namespace comphelper
+}	// namespace comphelper
 //.........................................................................
 
 #endif // COMPHELPER_PROPERTYCONTAINERHELPER_HXX
diff --git a/comphelper/inc/comphelper/propertysethelper.hxx b/comphelper/inc/comphelper/propertysethelper.hxx
index 505a03c1b4ec..bc0a4efafc12 100644
--- a/comphelper/inc/comphelper/propertysethelper.hxx
+++ b/comphelper/inc/comphelper/propertysethelper.hxx
@@ -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
diff --git a/comphelper/inc/comphelper/propertysetinfo.hxx b/comphelper/inc/comphelper/propertysetinfo.hxx
index 06ad4f4eecc3..d60af9f18d22 100644
--- a/comphelper/inc/comphelper/propertysetinfo.hxx
+++ b/comphelper/inc/comphelper/propertysetinfo.hxx
@@ -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
@@ -81,7 +81,7 @@ public:
     /** adds an array of PropertyMapEntry to this instance
 
         <p>At most the number of entries given will be added, if no terminating entry (<code>mpName == <NULL/></code>) is encountered.</p>
-
+    
         <p>If <arg>nCount</arg> is less than 0, it is ignored and all entries (up to, but not including, the terminating
         one) are added.</p>
     */
diff --git a/comphelper/inc/comphelper/propertystatecontainer.hxx b/comphelper/inc/comphelper/propertystatecontainer.hxx
index dde26ddf90cf..c0a1f5948b1e 100644
--- a/comphelper/inc/comphelper/propertystatecontainer.hxx
+++ b/comphelper/inc/comphelper/propertystatecontainer.hxx
@@ -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
@@ -45,8 +45,8 @@ namespace comphelper
     //=====================================================================
     //= OPropertyStateContainer
     //=====================================================================
-    typedef ::cppu::ImplHelper1 <   ::com::sun::star::beans::XPropertyState
-                                >   OPropertyStateContainer_TBase;
+    typedef ::cppu::ImplHelper1	<	::com::sun::star::beans::XPropertyState
+                                >	OPropertyStateContainer_TBase;
 
     /** helper implementation for components which have properties with a default
 
@@ -63,7 +63,7 @@ namespace comphelper
             @param _rBHelper
                 help to be used for broadcasting events
         */
-        OPropertyStateContainer( ::cppu::OBroadcastHelper&  _rBHelper );
+        OPropertyStateContainer( ::cppu::OBroadcastHelper&	_rBHelper );
 
         // ................................................................
         // XPropertyState
@@ -83,14 +83,14 @@ namespace comphelper
             <p>Already implemented by this base class, no need to override</p>
             @precond <arg>_nHandle</arg> is a valid property handle
         */
-        virtual ::com::sun::star::beans::PropertyState  getPropertyStateByHandle( sal_Int32 _nHandle );
+        virtual ::com::sun::star::beans::PropertyState	getPropertyStateByHandle( sal_Int32 _nHandle );
 
         /** set the property denoted by the given handle to it's default value
 
             <p>Already implemented by this base class, no need to override</p>
             @precond <arg>_nHandle</arg> is a valid property handle
         */
-        virtual void                                    setPropertyToDefaultByHandle( sal_Int32 _nHandle );
+        virtual void									setPropertyToDefaultByHandle( sal_Int32 _nHandle );
 
         /** get the default value for the property denoted by the given handle
 
@@ -107,14 +107,14 @@ namespace comphelper
 
     protected:
         /** returns the handle for the given name
-
+        
             @throw UnknownPropertyException if the given name is not a registered property
         */
-        sal_Int32   getHandleForName( const ::rtl::OUString& _rPropertyName ) SAL_THROW( ( ::com::sun::star::beans::UnknownPropertyException ) );
+        sal_Int32	getHandleForName( const ::rtl::OUString& _rPropertyName ) SAL_THROW( ( ::com::sun::star::beans::UnknownPropertyException ) );
     };
 
 //.........................................................................
-}   // namespace comphelper
+}	// namespace comphelper
 //.........................................................................
 
 #endif // COMPHELPER_PROPERTYSTATECONTAINER_HXX
diff --git a/comphelper/inc/comphelper/propmultiplex.hxx b/comphelper/inc/comphelper/propmultiplex.hxx
index 4d640442a9ae..f1646621721d 100644
--- a/comphelper/inc/comphelper/propmultiplex.hxx
+++ b/comphelper/inc/comphelper/propmultiplex.hxx
@@ -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
@@ -51,8 +51,8 @@ namespace comphelper
     {
         friend class OPropertyChangeMultiplexer;
 
-        OPropertyChangeMultiplexer* m_pAdapter;
-        ::osl::Mutex&               m_rMutex;
+        OPropertyChangeMultiplexer*	m_pAdapter;
+        ::osl::Mutex&				m_rMutex;
 
     public:
         OPropertyChangeListener(::osl::Mutex& _rMutex)
@@ -76,15 +76,15 @@ namespace comphelper
     //= OPropertyChangeMultiplexer
     //==================================================================
     /// multiplexer for property changes
-    class COMPHELPER_DLLPUBLIC OPropertyChangeMultiplexer   :public cppu::WeakImplHelper1< ::com::sun::star::beans::XPropertyChangeListener>
+    class COMPHELPER_DLLPUBLIC OPropertyChangeMultiplexer	:public cppu::WeakImplHelper1< ::com::sun::star::beans::XPropertyChangeListener>
     {
         friend class OPropertyChangeListener;
-         ::com::sun::star::uno::Sequence< ::rtl::OUString >     m_aProperties;
-         ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet>   m_xSet;
-        OPropertyChangeListener*                    m_pListener;
-        sal_Int32                                   m_nLockCount;
-        sal_Bool                                    m_bListening        : 1;
-        sal_Bool                                    m_bAutoSetRelease   : 1;
+         ::com::sun::star::uno::Sequence< ::rtl::OUString >		m_aProperties;
+         ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet>	m_xSet;
+        OPropertyChangeListener*					m_pListener;
+        sal_Int32									m_nLockCount;
+        sal_Bool									m_bListening		: 1;
+        sal_Bool									m_bAutoSetRelease	: 1;
 
 
         virtual ~OPropertyChangeMultiplexer();
@@ -98,18 +98,18 @@ namespace comphelper
         virtual void SAL_CALL propertyChange( const  ::com::sun::star::beans::PropertyChangeEvent& evt ) throw( ::com::sun::star::uno::RuntimeException);
 
         /// incremental lock
-        void        lock();
+        void		lock();
         /// incremental unlock
-        void        unlock();
+        void		unlock();
         /// get the lock count
-        sal_Int32   locked() const { return m_nLockCount; }
+        sal_Int32	locked() const { return m_nLockCount; }
 
         void addProperty(const ::rtl::OUString& aPropertyName);
         void dispose();
     };
 
 //.........................................................................
-}   // namespace comphelper
+}	// namespace comphelper
 //.........................................................................
 
 #endif // _COMPHELPER_PROPERTY_MULTIPLEX_HXX_
diff --git a/comphelper/inc/comphelper/propstate.hxx b/comphelper/inc/comphelper/propstate.hxx
index b0c75147c95c..00620f9f88a2 100644
--- a/comphelper/inc/comphelper/propstate.hxx
+++ b/comphelper/inc/comphelper/propstate.hxx
@@ -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
@@ -74,9 +74,9 @@ namespace comphelper
             getPropertyDefault(const ::rtl::OUString& aPropertyName) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
 
     // access via handle
-        virtual ::com::sun::star::beans::PropertyState  getPropertyStateByHandle(sal_Int32 nHandle);
-        virtual void                                    setPropertyToDefaultByHandle(sal_Int32 nHandle);
-        virtual ::com::sun::star::uno::Any              getPropertyDefaultByHandle(sal_Int32 nHandle) const;
+        virtual ::com::sun::star::beans::PropertyState	getPropertyStateByHandle(sal_Int32 nHandle);
+        virtual void									setPropertyToDefaultByHandle(sal_Int32 nHandle);
+        virtual ::com::sun::star::uno::Any				getPropertyDefaultByHandle(sal_Int32 nHandle) const;
 
     protected:
         virtual ~OPropertyStateHelper();
@@ -105,7 +105,7 @@ namespace comphelper
     };
 
 //.........................................................................
-}   // namespace comphelper
+}	// namespace comphelper
 //.........................................................................
 
 #endif // _COMPHELPER_PROPERTY_STATE_HXX_
diff --git a/comphelper/inc/comphelper/proxyaggregation.hxx b/comphelper/inc/comphelper/proxyaggregation.hxx
index c4c9281da8f2..c6c9ad25dead 100644
--- a/comphelper/inc/comphelper/proxyaggregation.hxx
+++ b/comphelper/inc/comphelper/proxyaggregation.hxx
@@ -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
@@ -50,7 +50,7 @@
   | OComponentProxyAggregationHelper |  - life time coupling: if the inner component (the "aggregate")
   +----------------------------------+    is disposed, the outer (the delegator) is disposed, too, and
                    ^                      vice versa
-                   |                    - UNO based, implementing XEventListener
+                   |					- UNO based, implementing XEventListener
                    |
      +----------------------------+     component aggregating another XComponent
      | OComponentProxyAggregation |     - life time coupling as above
@@ -63,7 +63,7 @@
     => use OComponentProxyAggregation
        - call componentAggregateProxyFor in your ctor
        - call implEnsureDisposeInDtor in your dtor
-
+  
   - wrap a foreign object which is a XComponent, but already have ref-counting mechanisms
     inherited from somewhere else
     => use OComponentProxyAggregationHelper
@@ -88,9 +88,9 @@ namespace comphelper
     class OProxyAggregation
     {
     private:
-        ::com::sun::star::uno::Reference< ::com::sun::star::uno::XAggregation >             m_xProxyAggregate;
-        ::com::sun::star::uno::Reference< ::com::sun::star::lang::XTypeProvider >           m_xProxyTypeAccess;
-        ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >    m_xORB;
+        ::com::sun::star::uno::Reference< ::com::sun::star::uno::XAggregation >				m_xProxyAggregate;
+        ::com::sun::star::uno::Reference< ::com::sun::star::lang::XTypeProvider >			m_xProxyTypeAccess;
+        ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >	m_xORB;
 
     protected:
         inline const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& getORB()
@@ -114,9 +114,9 @@ namespace comphelper
         ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes(  ) throw (::com::sun::star::uno::RuntimeException);
 
     private:
-        OProxyAggregation( );                                       // never implemented
-        OProxyAggregation( const OProxyAggregation& );              // never implemented
-        OProxyAggregation& operator=( const OProxyAggregation& );   // never implemented
+        OProxyAggregation( );										// never implemented
+        OProxyAggregation( const OProxyAggregation& );				// never implemented
+        OProxyAggregation& operator=( const OProxyAggregation& );	// never implemented
     };
 
     //=========================================================================
@@ -131,18 +131,18 @@ namespace comphelper
         calls which your derived class gets to the dispose method of this class.</p>
     */
 
-    class COMPHELPER_DLLPUBLIC OComponentProxyAggregationHelper :public ::cppu::ImplHelper1 <   com::sun::star::lang::XEventListener
+    class COMPHELPER_DLLPUBLIC OComponentProxyAggregationHelper	:public ::cppu::ImplHelper1	<	com::sun::star::lang::XEventListener
                                                                         >
                                             ,private OProxyAggregation
     {
     private:
-        typedef ::cppu::ImplHelper1 <   ::com::sun::star::lang::XEventListener
-                                    >   BASE;   // prevents some MSVC problems
+        typedef	::cppu::ImplHelper1	<	::com::sun::star::lang::XEventListener
+                                    >	BASE;	// prevents some MSVC problems
 
     protected:
         ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent >
                                             m_xInner;
-        ::cppu::OBroadcastHelper&           m_rBHelper;
+        ::cppu::OBroadcastHelper&			m_rBHelper;
 
     protected:
         // OProxyAggregation
@@ -175,17 +175,17 @@ namespace comphelper
         virtual void SAL_CALL dispose() throw( ::com::sun::star::uno::RuntimeException );
 
     private:
-        COMPHELPER_DLLPRIVATE OComponentProxyAggregationHelper( );                                                  // never implemented
-        COMPHELPER_DLLPRIVATE OComponentProxyAggregationHelper( const OComponentProxyAggregationHelper& );          // never implemented
-        COMPHELPER_DLLPRIVATE OComponentProxyAggregationHelper& operator=( const OComponentProxyAggregationHelper& );   // never implemented
+        COMPHELPER_DLLPRIVATE OComponentProxyAggregationHelper( );													// never implemented
+        COMPHELPER_DLLPRIVATE OComponentProxyAggregationHelper( const OComponentProxyAggregationHelper& );			// never implemented
+        COMPHELPER_DLLPRIVATE OComponentProxyAggregationHelper& operator=( const OComponentProxyAggregationHelper& );	// never implemented
     };
 
     //=========================================================================
     //= OComponentProxyAggregation
     //=========================================================================
-    typedef ::cppu::WeakComponentImplHelperBase OComponentProxyAggregation_CBase;
+    typedef ::cppu::WeakComponentImplHelperBase	OComponentProxyAggregation_CBase;
 
-    class COMPHELPER_DLLPUBLIC OComponentProxyAggregation   :public OBaseMutex
+    class COMPHELPER_DLLPUBLIC OComponentProxyAggregation	:public OBaseMutex
                                         ,public OComponentProxyAggregation_CBase
                                         ,public OComponentProxyAggregationHelper
     {
@@ -216,13 +216,13 @@ namespace comphelper
         void implEnsureDisposeInDtor( );
 
     private:
-        COMPHELPER_DLLPRIVATE OComponentProxyAggregation( );                                                // never implemented
-        COMPHELPER_DLLPRIVATE OComponentProxyAggregation( const OComponentProxyAggregation& );          // never implemented
-        COMPHELPER_DLLPRIVATE OComponentProxyAggregation& operator=( const OComponentProxyAggregation& );   // never implemented
+        COMPHELPER_DLLPRIVATE OComponentProxyAggregation( );												// never implemented
+        COMPHELPER_DLLPRIVATE OComponentProxyAggregation( const OComponentProxyAggregation& );			// never implemented
+        COMPHELPER_DLLPRIVATE OComponentProxyAggregation& operator=( const OComponentProxyAggregation& );	// never implemented
     };
 
 //.............................................................................
-}   // namespace comphelper
+}	// namespace comphelper
 //.............................................................................
 
 
diff --git a/comphelper/inc/comphelper/querydeep.hxx b/comphelper/inc/comphelper/querydeep.hxx
index 4115412d8d6c..b9ed44768dab 100644
--- a/comphelper/inc/comphelper/querydeep.hxx
+++ b/comphelper/inc/comphelper/querydeep.hxx
@@ -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
@@ -40,9 +40,9 @@ namespace comphelper
 /**
  * Inspect interfaces types whether they are related by inheritance.
  *<BR>
- * @return      true if rType is derived from rBaseType
- * @param       rBaseType   a <type>Type</type> of an interface.
- * @param       rType       a <type>Type</type> of an interface.
+ * @return		true if rType is derived from rBaseType
+ * @param		rBaseType	a <type>Type</type> of an interface.
+ * @param		rType		a <type>Type</type> of an interface.
  */
 sal_Bool isDerivedFrom(
     const ::com::sun::star::uno::Type & rBaseType,
@@ -52,9 +52,9 @@ sal_Bool isDerivedFrom(
 /**
  * Inspect interface types whether they are related by inheritance.
  *<BR>
- * @return      true if p is of a type derived from rBaseType
- * @param       rBaseType   a <type>Type</type> of an interface.
- * @param       p           a pointer to an interface.
+ * @return		true if p is of a type derived from rBaseType
+ * @param		rBaseType	a <type>Type</type> of an interface.
+ * @param		p			a pointer to an interface.
  */
 template <class Interface>
 inline sal_Bool isDerivedFrom(
@@ -66,14 +66,14 @@ inline sal_Bool isDerivedFrom(
 
 //--------------------------------------------------------------------------------------------------------
 // possible optimization ?
-//  Any aRet(::cppu::queryInterface(rType, p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11, p12));
-//  if (aRet.hasValue())
-//      return aRet;
+//	Any aRet(::cppu::queryInterface(rType, p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11, p12));
+//	if (aRet.hasValue())
+//		return aRet;
 
 /**
  * Inspect types and choose return proper interface.
  *<BR>
- * @param       p1      a pointer to an interface.
+ * @param		p1		a pointer to an interface.
  */
 template< class Interface1 >
 inline ::com::sun::star::uno::Any queryDeepInterface(
@@ -89,8 +89,8 @@ inline ::com::sun::star::uno::Any queryDeepInterface(
 /**
  * Inspect types and choose return proper interface.
  *<BR>
- * @param       p1      a pointer to an interface.
- * @param       p2      a pointer to an interface.
+ * @param		p1		a pointer to an interface.
+ * @param		p2		a pointer to an interface.
  */
 template< class Interface1, class Interface2 >
 inline ::com::sun::star::uno::Any queryDeepInterface(
@@ -108,9 +108,9 @@ inline ::com::sun::star::uno::Any queryDeepInterface(
 /**
  * Inspect types and choose return proper interface.
  *<BR>
- * @param       p1      a pointer to an interface.
- * @param       p2      a pointer to an interface.
- * @param       p3      a pointer to an interface.
+ * @param		p1		a pointer to an interface.
+ * @param		p2		a pointer to an interface.
+ * @param		p3		a pointer to an interface.
  */
 template< class Interface1, class Interface2, class Interface3 >
 inline ::com::sun::star::uno::Any queryDeepInterface(
@@ -130,10 +130,10 @@ inline ::com::sun::star::uno::Any queryDeepInterface(
 /**
  * Inspect types and choose return proper interface.
  *<BR>
- * @param       p1      a pointer to an interface.
- * @param       p2      a pointer to an interface.
- * @param       p3      a pointer to an interface.
- * @param       p4      a pointer to an interface.
+ * @param		p1		a pointer to an interface.
+ * @param		p2		a pointer to an interface.
+ * @param		p3		a pointer to an interface.
+ * @param		p4		a pointer to an interface.
  */
 template< class Interface1, class Interface2, class Interface3, class Interface4 >
 inline ::com::sun::star::uno::Any queryDeepInterface(
@@ -155,11 +155,11 @@ inline ::com::sun::star::uno::Any queryDeepInterface(
 /**
  * Inspect types and choose return proper interface.
  *<BR>
- * @param       p1      a pointer to an interface.
- * @param       p2      a pointer to an interface.
- * @param       p3      a pointer to an interface.
- * @param       p4      a pointer to an interface.
- * @param       p5      a pointer to an interface.
+ * @param		p1		a pointer to an interface.
+ * @param		p2		a pointer to an interface.
+ * @param		p3		a pointer to an interface.
+ * @param		p4		a pointer to an interface.
+ * @param		p5		a pointer to an interface.
  */
 template< class Interface1, class Interface2, class Interface3, class Interface4, class Interface5 >
 inline ::com::sun::star::uno::Any queryDeepInterface(
@@ -183,12 +183,12 @@ inline ::com::sun::star::uno::Any queryDeepInterface(
 /**
  * Inspect types and choose return proper interface.
  *<BR>
- * @param       p1      a pointer to an interface.
- * @param       p2      a pointer to an interface.
- * @param       p3      a pointer to an interface.
- * @param       p4      a pointer to an interface.
- * @param       p5      a pointer to an interface.
- * @param       p6      a pointer to an interface.
+ * @param		p1		a pointer to an interface.
+ * @param		p2		a pointer to an interface.
+ * @param		p3		a pointer to an interface.
+ * @param		p4		a pointer to an interface.
+ * @param		p5		a pointer to an interface.
+ * @param		p6		a pointer to an interface.
  */
 template< class Interface1, class Interface2, class Interface3, class Interface4, class Interface5,
           class Interface6 >
@@ -216,13 +216,13 @@ inline ::com::sun::star::uno::Any queryDeepInterface(
 /**
  * Inspect types and choose return proper interface.
  *<BR>
- * @param       p1      a pointer to an interface.
- * @param       p2      a pointer to an interface.
- * @param       p3      a pointer to an interface.
- * @param       p4      a pointer to an interface.
- * @param       p5      a pointer to an interface.
- * @param       p6      a pointer to an interface.
- * @param       p7      a pointer to an interface.
+ * @param		p1		a pointer to an interface.
+ * @param		p2		a pointer to an interface.
+ * @param		p3		a pointer to an interface.
+ * @param		p4		a pointer to an interface.
+ * @param		p5		a pointer to an interface.
+ * @param		p6		a pointer to an interface.
+ * @param		p7		a pointer to an interface.
  */
 template< class Interface1, class Interface2, class Interface3, class Interface4, class Interface5,
           class Interface6, class Interface7 >
@@ -252,14 +252,14 @@ inline ::com::sun::star::uno::Any queryDeepInterface(
 /**
  * Inspect types and choose return proper interface.
  *<BR>
- * @param       p1      a pointer to an interface.
- * @param       p2      a pointer to an interface.
- * @param       p3      a pointer to an interface.
- * @param       p4      a pointer to an interface.
- * @param       p5      a pointer to an interface.
- * @param       p6      a pointer to an interface.
- * @param       p7      a pointer to an interface.
- * @param       p8      a pointer to an interface.
+ * @param		p1		a pointer to an interface.
+ * @param		p2		a pointer to an interface.
+ * @param		p3		a pointer to an interface.
+ * @param		p4		a pointer to an interface.
+ * @param		p5		a pointer to an interface.
+ * @param		p6		a pointer to an interface.
+ * @param		p7		a pointer to an interface.
+ * @param		p8		a pointer to an interface.
  */
 template< class Interface1, class Interface2, class Interface3, class Interface4, class Interface5,
           class Interface6, class Interface7, class Interface8 >
@@ -291,15 +291,15 @@ inline ::com::sun::star::uno::Any queryDeepInterface(
 /**
  * Inspect types and choose return proper interface.
  *<BR>
- * @param       p1      a pointer to an interface.
- * @param       p2      a pointer to an interface.
- * @param       p3      a pointer to an interface.
- * @param       p4      a pointer to an interface.
- * @param       p5      a pointer to an interface.
- * @param       p6      a pointer to an interface.
- * @param       p7      a pointer to an interface.
- * @param       p8      a pointer to an interface.
- * @param       p9      a pointer to an interface.
+ * @param		p1		a pointer to an interface.
+ * @param		p2		a pointer to an interface.
+ * @param		p3		a pointer to an interface.
+ * @param		p4		a pointer to an interface.
+ * @param		p5		a pointer to an interface.
+ * @param		p6		a pointer to an interface.
+ * @param		p7		a pointer to an interface.
+ * @param		p8		a pointer to an interface.
+ * @param		p9		a pointer to an interface.
  */
 template< class Interface1, class Interface2, class Interface3, class Interface4, class Interface5,
           class Interface6, class Interface7, class Interface8, class Interface9 >
@@ -333,16 +333,16 @@ inline ::com::sun::star::uno::Any queryDeepInterface(
 /**
  * Inspect types and choose return proper interface.
  *<BR>
- * @param       p1      a pointer to an interface.
- * @param       p2      a pointer to an interface.
- * @param       p3      a pointer to an interface.
- * @param       p4      a pointer to an interface.
- * @param       p5      a pointer to an interface.
- * @param       p6      a pointer to an interface.
- * @param       p7      a pointer to an interface.
- * @param       p8      a pointer to an interface.
- * @param       p9      a pointer to an interface.
- * @param       p10     a pointer to an interface.
+ * @param		p1		a pointer to an interface.
+ * @param		p2		a pointer to an interface.
+ * @param		p3		a pointer to an interface.
+ * @param		p4		a pointer to an interface.
+ * @param		p5		a pointer to an interface.
+ * @param		p6		a pointer to an interface.
+ * @param		p7		a pointer to an interface.
+ * @param		p8		a pointer to an interface.
+ * @param		p9		a pointer to an interface.
+ * @param		p10		a pointer to an interface.
  */
 template< class Interface1, class Interface2, class Interface3, class Interface4, class Interface5,
           class Interface6, class Interface7, class Interface8, class Interface9, class Interface10 >
@@ -378,17 +378,17 @@ inline ::com::sun::star::uno::Any queryDeepInterface(
 /**
  * Inspect types and choose return proper interface.
  *<BR>
- * @param       p1      a pointer to an interface.
- * @param       p2      a pointer to an interface.
- * @param       p3      a pointer to an interface.
- * @param       p4      a pointer to an interface.
- * @param       p5      a pointer to an interface.
- * @param       p6      a pointer to an interface.
- * @param       p7      a pointer to an interface.
- * @param       p8      a pointer to an interface.
- * @param       p9      a pointer to an interface.
- * @param       p10     a pointer to an interface.
- * @param       p11     a pointer to an interface.
+ * @param		p1		a pointer to an interface.
+ * @param		p2		a pointer to an interface.
+ * @param		p3		a pointer to an interface.
+ * @param		p4		a pointer to an interface.
+ * @param		p5		a pointer to an interface.
+ * @param		p6		a pointer to an interface.
+ * @param		p7		a pointer to an interface.
+ * @param		p8		a pointer to an interface.
+ * @param		p9		a pointer to an interface.
+ * @param		p10		a pointer to an interface.
+ * @param		p11		a pointer to an interface.
  */
 template< class Interface1, class Interface2, class Interface3, class Interface4, class Interface5,
           class Interface6, class Interface7, class Interface8, class Interface9, class Interface10,
@@ -428,18 +428,18 @@ inline ::com::sun::star::uno::Any queryDeepInterface(
 /**
  * Inspect types and choose return proper interface.
  *<BR>
- * @param       p1      a pointer to an interface.
- * @param       p2      a pointer to an interface.
- * @param       p3      a pointer to an interface.
- * @param       p4      a pointer to an interface.
- * @param       p5      a pointer to an interface.
- * @param       p6      a pointer to an interface.
- * @param       p7      a pointer to an interface.
- * @param       p8      a pointer to an interface.
- * @param       p9      a pointer to an interface.
- * @param       p10     a pointer to an interface.
- * @param       p11     a pointer to an interface.
- * @param       p12     a pointer to an interface.
+ * @param		p1		a pointer to an interface.
+ * @param		p2		a pointer to an interface.
+ * @param		p3		a pointer to an interface.
+ * @param		p4		a pointer to an interface.
+ * @param		p5		a pointer to an interface.
+ * @param		p6		a pointer to an interface.
+ * @param		p7		a pointer to an interface.
+ * @param		p8		a pointer to an interface.
+ * @param		p9		a pointer to an interface.
+ * @param		p10		a pointer to an interface.
+ * @param		p11		a pointer to an interface.
+ * @param		p12		a pointer to an interface.
  */
 template< class Interface1, class Interface2, class Interface3, class Interface4, class Interface5,
           class Interface6, class Interface7, class Interface8, class Interface9, class Interface10,
diff --git a/comphelper/inc/comphelper/regpathhelper.hxx b/comphelper/inc/comphelper/regpathhelper.hxx
index 431cdfb930a6..42d6d6aa5cdd 100644
--- a/comphelper/inc/comphelper/regpathhelper.hxx
+++ b/comphelper/inc/comphelper/regpathhelper.hxx
@@ -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
@@ -38,13 +38,13 @@ namespace comphelper
  * Search for the user registry using the following rules:
  * <dl>
  * <dt> 1. (for further use) search in sversion.ini (.sversionrc) for an entry
- *      REGISTRY_VERSION_STRING (example: UserRegistry 5.0/505=test.rdb) in the section
- *      [Registry]. If found, then take this value instead of the name "user.rdb".
+ *		REGISTRY_VERSION_STRING (example: UserRegistry 5.0/505=test.rdb) in the section
+ *		[Registry]. If found, then take this value instead of the name "user.rdb".
  * <dt> 2. Search in the config directory of the user for a file "user.rdb". If
- *      found return the full path and name of the file. If not found, retry this
- *      step with a dot before ".user.rdb".
+ *		found return the full path and name of the file. If not found, retry this
+ *		step with a dot before ".user.rdb".
  * <dt> 3. If not found a new user registry with name "user.rdb" will be created in the user
- *      config directory.
+ *		config directory.
  * </dl>
  *<BR>
  * @author Juergen Schmidt
diff --git a/comphelper/inc/comphelper/scopeguard.hxx b/comphelper/inc/comphelper/scopeguard.hxx
index 4841a564ae61..14e40abd0047 100644
--- a/comphelper/inc/comphelper/scopeguard.hxx
+++ b/comphelper/inc/comphelper/scopeguard.hxx
@@ -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
@@ -44,7 +44,7 @@ class COMPHELPER_DLLPUBLIC ScopeGuard : private ::boost::noncopyable
 {
 public:
     enum exc_handling { IGNORE_EXCEPTIONS, ALLOW_EXCEPTIONS };
-
+    
     /** @param func function object to be executed in dtor
         @param excHandling switches whether thrown exceptions in dtor will be
                            silently ignored (but OSL_ asserted)
@@ -53,14 +53,14 @@ public:
     explicit ScopeGuard( func_type const & func,
                          exc_handling excHandling = IGNORE_EXCEPTIONS )
         : m_func( func ), m_excHandling( excHandling ) {}
-
+    
     ~ScopeGuard();
-
+    
     /** Dismisses the scope guard, i.e. the function won't
         be executed.
     */
     void dismiss();
-
+    
 private:
     ::boost::function0<void> m_func; // preferring portable syntax
     exc_handling const m_excHandling;
diff --git a/comphelper/inc/comphelper/seekableinput.hxx b/comphelper/inc/comphelper/seekableinput.hxx
index 5fc7ab5b369f..3cf16432b10f 100644
--- a/comphelper/inc/comphelper/seekableinput.hxx
+++ b/comphelper/inc/comphelper/seekableinput.hxx
@@ -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
@@ -41,10 +41,10 @@ namespace comphelper
 class COMPHELPER_DLLPUBLIC OSeekableInputWrapper : public ::cppu::WeakImplHelper2< ::com::sun::star::io::XInputStream,
                                                                 ::com::sun::star::io::XSeekable >
 {
-    ::osl::Mutex    m_aMutex;
+    ::osl::Mutex	m_aMutex;
 
     ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > m_xFactory;
-
+    
     ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream > m_xOriginalStream;
 
     ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream > m_xCopyInput;
@@ -78,7 +78,7 @@ public:
 
 };
 
-}   // namespace comphelper
+}	// namespace comphelper
 
 #endif
 
diff --git a/comphelper/inc/comphelper/seqstream.hxx b/comphelper/inc/comphelper/seqstream.hxx
index dcde150953f6..062cbe35f5a3 100644
--- a/comphelper/inc/comphelper/seqstream.hxx
+++ b/comphelper/inc/comphelper/seqstream.hxx
@@ -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
@@ -51,9 +51,9 @@ namespace comphelper
 class COMPHELPER_DLLPUBLIC SequenceInputStream
 : public ::cppu::WeakImplHelper2< ::com::sun::star::io::XInputStream, ::com::sun::star::io::XSeekable >
 {
-    ::osl::Mutex    m_aMutex;
-    ByteSequence    m_aData;
-    sal_Int32       m_nPos;
+    ::osl::Mutex	m_aMutex;
+    ByteSequence	m_aData;
+    sal_Int32		m_nPos;
 
 public:
     SequenceInputStream(const ByteSequence& rData);
@@ -89,18 +89,18 @@ typedef ::cppu::WeakImplHelper1< ::com::sun::star::io::XOutputStream > OSequence
 class OSequenceOutputStream : public OSequenceOutputStream_Base
 {
 protected:
-    ::com::sun::star::uno::Sequence< sal_Int8 >&    m_rSequence;
-    double                                          m_nResizeFactor;
-    sal_Int32                                       m_nMinimumResize;
-    sal_Int32                                       m_nMaximumResize;
-    sal_Int32                                       m_nSize;
+    ::com::sun::star::uno::Sequence< sal_Int8 >&	m_rSequence;
+    double											m_nResizeFactor;
+    sal_Int32										m_nMinimumResize;
+    sal_Int32										m_nMaximumResize;
+    sal_Int32										m_nSize;
         // the size of the virtual stream. This is not the size of the sequence, but the number of bytes written
         // into the stream at a given moment.
 
-    sal_Bool                                        m_bConnected;
+    sal_Bool										m_bConnected;
         // closeOutput has been called ?
 
-    ::osl::Mutex                                    m_aMutex;
+    ::osl::Mutex									m_aMutex;
 
 protected:
     ~OSequenceOutputStream() { if (m_bConnected) closeOutput(); }
@@ -108,18 +108,18 @@ protected:
 public:
     /** constructs the object. Everything written into the stream through the XOutputStream methods will be forwarded
         to the sequence, reallocating it if neccessary. Writing will start at offset 0 within the sequence.
-        @param      _rSeq               a reference to the sequence which will be used for output.
+        @param		_rSeq				a reference to the sequence which will be used for output.
                                         The caller is responsible for taking care of the lifetime of the stream
                                         object and the sequence. If you're in doubt about this, use <code>closeOutput</code>
                                         before destroying the sequence
-        @param      _nResizeFactor      the factor which is used for resizing the sequence when neccessary. In every
+        @param		_nResizeFactor		the factor which is used for resizing the sequence when neccessary. In every
                                         resize step, the new sequence size will be calculated by multiplying the current
                                         size with this factor, rounded off to the next multiple of 4.
-        @param      _nMinimumResize     the minmal number of bytes which is additionally allocated on resizing
-        @param      _nMaximumResize     as the growth of the stream size is exponential, you may want to specify a
+        @param		_nMinimumResize		the minmal number of bytes which is additionally allocated on resizing
+        @param		_nMaximumResize		as the growth of the stream size is exponential, you may want to specify a
                                         maxmimum amount of memory which the sequence will grow by. If -1 is used,
                                         no limit is applied
-        @see        closeOutput
+        @see		closeOutput
     */
     OSequenceOutputStream(
         ::com::sun::star::uno::Sequence< sal_Int8 >& _rSeq,
diff --git a/comphelper/inc/comphelper/sequence.hxx b/comphelper/inc/comphelper/sequence.hxx
index 5e9c5dc49040..93cd561063b2 100644
--- a/comphelper/inc/comphelper/sequence.hxx
+++ b/comphelper/inc/comphelper/sequence.hxx
@@ -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
@@ -43,7 +43,7 @@ namespace comphelper
 {
 //.........................................................................
 
-    namespace staruno   = ::com::sun::star::uno;
+    namespace staruno	= ::com::sun::star::uno;
 
     //-------------------------------------------------------------------------
     /** search the given string within the given sequence, return the positions where it was found.
@@ -134,7 +134,7 @@ namespace comphelper
     {
     public:
         virtual sal_Bool hasMoreElements() const = 0;
-        virtual ::com::sun::star::uno::Any  nextElement() = 0;
+        virtual ::com::sun::star::uno::Any	nextElement() = 0;
     };
     /** a helper class for iterating through a sequence
     */
@@ -142,7 +142,7 @@ namespace comphelper
     class OSequenceIterator : public IIterator
     {
         const TYPE* m_pElements;
-        sal_Int32   m_nLen;
+        sal_Int32	m_nLen;
         const TYPE* m_pCurrent;
 
     public:
@@ -154,7 +154,7 @@ namespace comphelper
         OSequenceIterator(const ::com::sun::star::uno::Any& _rSequenceAny);
 
         virtual sal_Bool hasMoreElements() const;
-        virtual ::com::sun::star::uno::Any  nextElement();
+        virtual ::com::sun::star::uno::Any	nextElement();
 
     protected:
         void construct(const ::com::sun::star::uno::Sequence< TYPE >& _rSeq);
@@ -233,7 +233,7 @@ namespace comphelper
         values will be truncated. There's currently no measure to
         prevent or detect precision loss, overflow or truncation.
      */
-    template < typename DstType, typename SrcType >
+    template < typename DstType, typename SrcType > 
     ::com::sun::star::uno::Sequence< DstType > arrayToSequence( const SrcType* i_pArray, sal_Int32 nNum )
     {
         ::com::sun::star::uno::Sequence< DstType > result( nNum );
@@ -264,7 +264,7 @@ namespace comphelper
         will be truncated. There's currently no measure to prevent or
         detect precision loss, overflow or truncation.
      */
-    template < typename DstType, typename SrcType >
+    template < typename DstType, typename SrcType > 
     DstType* sequenceToArray( DstType* io_pArray, const ::com::sun::star::uno::Sequence< SrcType >& i_Sequence )
     {
         ::std::copy( i_Sequence.getConstArray(), i_Sequence.getConstArray()+i_Sequence.getLength(), io_pArray );
@@ -294,7 +294,7 @@ namespace comphelper
         truncated. There's currently no measure to prevent or detect
         precision loss, overflow or truncation.
      */
-    template < typename DstType, typename SrcType >
+    template < typename DstType, typename SrcType > 
     ::com::sun::star::uno::Sequence< DstType > containerToSequence( const SrcType& i_Container )
     {
         ::com::sun::star::uno::Sequence< DstType > result( i_Container.size() );
@@ -334,7 +334,7 @@ namespace comphelper
         truncated. There's currently no measure to prevent or detect
         precision loss, overflow or truncation.
      */
-    template < typename DstType, typename SrcType >
+    template < typename DstType, typename SrcType > 
     DstType sequenceToContainer( const ::com::sun::star::uno::Sequence< SrcType >& i_Sequence )
     {
         DstType result( i_Sequence.getLength() );
@@ -372,7 +372,7 @@ namespace comphelper
         truncated. There's currently no measure to prevent or detect
         precision loss, overflow or truncation.
      */
-    template < typename DstType, typename SrcType >
+    template < typename DstType, typename SrcType > 
     DstType& sequenceToContainer( DstType& o_Output, const ::com::sun::star::uno::Sequence< SrcType >& i_Sequence )
     {
         o_Output.resize( i_Sequence.getLength() );
@@ -381,7 +381,7 @@ namespace comphelper
     }
 
 //.........................................................................
-}   // namespace comphelper
+}	// namespace comphelper
 //.........................................................................
 
 
diff --git a/comphelper/inc/comphelper/sequenceashashmap.hxx b/comphelper/inc/comphelper/sequenceashashmap.hxx
index 737fd41efb84..6910324cd230 100644
--- a/comphelper/inc/comphelper/sequenceashashmap.hxx
+++ b/comphelper/inc/comphelper/sequenceashashmap.hxx
@@ -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
@@ -101,7 +101,7 @@ class COMPHELPER_DLLPUBLIC SequenceAsHashMap : public SequenceAsHashMapBase
         /** @see    operator<<(const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >&)
          */
         SequenceAsHashMap(const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& lSource);
-
+        
         //---------------------------------------
         /** @see    operator<<(const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >&)
          */
@@ -196,7 +196,7 @@ class COMPHELPER_DLLPUBLIC SequenceAsHashMap : public SequenceAsHashMapBase
             @descr  Its made const to prevent using of the
                     return value directly as an in/out parameter!
                     usage: myMethod(stlDequeAdapter.getAsAnyList());
-
+                    
             @param  bAsPropertyValue
                     switch between using of PropertyValue or NamedValue as
                     value type.
@@ -205,7 +205,7 @@ class COMPHELPER_DLLPUBLIC SequenceAsHashMap : public SequenceAsHashMapBase
                     contains all items of this map.
          */
         const ::com::sun::star::uno::Any getAsConstAny(::sal_Bool bAsPropertyValue) const;
-
+        
         //---------------------------------------
         /** @short  return this map instance as a
                     sequence< Any >, which can be
@@ -218,12 +218,12 @@ class COMPHELPER_DLLPUBLIC SequenceAsHashMap : public SequenceAsHashMapBase
             @param  bAsPropertyValue
                     switch between using of PropertyValue or NamedValue as
                     value type.
-
+                    
             @return A const sequence which elements of Any, which
                     contains all items of this map.
          */
         const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > getAsConstAnyList(::sal_Bool bAsPropertyValue) const;
-
+        
         //---------------------------------------
         /** @short  return this map instance to as a
                     NamedValue sequence, which can be
@@ -336,12 +336,12 @@ class COMPHELPER_DLLPUBLIC SequenceAsHashMap : public SequenceAsHashMapBase
             @param  rCheck
                     the map containing all items for checking.
 
-            @return
+            @return 
                     TRUE if all items of Rcheck could be found
                     in these map; FALSE otherwise.
          */
         sal_Bool match(const SequenceAsHashMap& rCheck) const;
-
+        
         //---------------------------------------
         /** @short  merge all values from the given map into
                     this one.
@@ -354,7 +354,7 @@ class COMPHELPER_DLLPUBLIC SequenceAsHashMap : public SequenceAsHashMapBase
                     the map containing all items for the update.
          */
         void update(const SequenceAsHashMap& rSource);
-
+        
         //---------------------------------------
         /** @short  can be used to generate a file dump of
                     the current content of this instance.
diff --git a/comphelper/inc/comphelper/sequenceasvector.hxx b/comphelper/inc/comphelper/sequenceasvector.hxx
index 263b68b24c7c..4bc039b8699a 100644
--- a/comphelper/inc/comphelper/sequenceasvector.hxx
+++ b/comphelper/inc/comphelper/sequenceasvector.hxx
@@ -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
@@ -61,9 +61,9 @@ class SequenceAsVector : public ::std::vector< TElementType >
 {
     //-------------------------------------------
     // types
-
+    
     public:
-
+    
         //---------------------------------------
         /** @short  When inheriting from a template using typename is generally required when using
                     types from the base! */
diff --git a/comphelper/inc/comphelper/servicedecl.hxx b/comphelper/inc/comphelper/servicedecl.hxx
index 5d11d41831f5..1c474199dfdd 100644
--- a/comphelper/inc/comphelper/servicedecl.hxx
+++ b/comphelper/inc/comphelper/servicedecl.hxx
@@ -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
@@ -65,7 +65,7 @@ typedef ::boost::function3<
 /** Class to declare a service implementation.  There is no need to implement
     lang::XServiceInfo nor lang::XInitialization anymore.
     The declaration can be done in various ways, the (simplest) form is
-
+    
     <pre>
     class MyClass : cppu::WeakImplHelper2<XInterface1, XInterface2> {
     public:
@@ -79,11 +79,11 @@ typedef ::boost::function3<
         "my.unique.implementation.name",
         "MyServiceSpec1;MyServiceSpec2" );
     </pre>
-
+    
     If the service demands initialization by arguments, the implementation
     class has to define a constructor taking both arguments and component
     context:
-
+    
     <pre>
     class MyClass : cppu::WeakImplHelper2<XInterface1, XInterface2> {
     public:
@@ -102,7 +102,7 @@ typedef ::boost::function3<
     Additionally, there is the possibility to process some code after creation,
     e.g. to add the newly created object as a listener or perform aggregation
     (C++-UNO only):
-
+    
     <pre>
     uno::Reference<uno::XInterface> somePostProcCode( MyClass * p );
     [...]
@@ -119,7 +119,7 @@ class COMPHELPER_DLLPUBLIC ServiceDecl : private ::boost::noncopyable
 {
 public:
     /** Ctor for multiple supported service names.
-
+        
         @param implClass implementation class description
         @param pImplName implementation name
         @param pSupportedServiceNames supported service names
@@ -133,26 +133,26 @@ public:
           m_pImplName(pImplName),
           m_pServiceNames(pSupportedServiceNames),
           m_cDelim(cDelim) {}
-
+    
     /// @internal gets called by component_writeInfoHelper()
     bool writeInfo( ::com::sun::star::registry::XRegistryKey * xKey ) const;
     /// @internal gets called by component_getFactoryHelper()
     void * getFactory( sal_Char const* pImplName ) const;
-
+    
     /// @return supported service names
     ::com::sun::star::uno::Sequence< ::rtl::OUString>
     getSupportedServiceNames() const;
-
+    
     /// @return whether name is in set of supported service names
     bool supportsService( ::rtl::OUString const& name ) const;
-
+    
     /// @return implementation name
     ::rtl::OUString getImplementationName() const;
-
+    
 private:
     class Factory;
     friend class Factory;
-
+    
     detail::CreateFuncF const m_createFunc;
     char const* const m_pImplName;
     char const* const m_pServiceNames;
@@ -172,8 +172,8 @@ class OwnServiceImpl
       private ::boost::noncopyable
 {
     typedef ImplT BaseT;
-
-public:
+    
+public:    
     OwnServiceImpl(
         ServiceDecl const& rServiceDecl,
         css::uno::Sequence<css::uno::Any> const& args,
@@ -183,7 +183,7 @@ public:
         ServiceDecl const& rServiceDecl,
         css::uno::Reference<css::uno::XComponentContext> const& xContext )
         : BaseT(xContext), m_rServiceDecl(rServiceDecl) {}
-
+    
     // XServiceInfo
     virtual ::rtl::OUString SAL_CALL getImplementationName()
         throw (css::uno::RuntimeException) {
@@ -197,7 +197,7 @@ public:
     SAL_CALL getSupportedServiceNames() throw (css::uno::RuntimeException) {
         return m_rServiceDecl.getSupportedServiceNames();
     }
-
+    
 private:
     ServiceDecl const& m_rServiceDecl;
 };
@@ -234,7 +234,7 @@ struct CreateFunc<ImplT, PostProcessFuncT, with_args<false> > {
     PostProcessFuncT const m_postProcessFunc;
     explicit CreateFunc( PostProcessFuncT const& postProcessFunc )
         : m_postProcessFunc(postProcessFunc) {}
-
+    
     css::uno::Reference<css::uno::XInterface>
     operator()( ServiceDecl const& rServiceDecl,
                 css::uno::Sequence<css::uno::Any> const&,
@@ -251,7 +251,7 @@ struct CreateFunc<ImplT, PostProcessFuncT, with_args<true> > {
     PostProcessFuncT const m_postProcessFunc;
     explicit CreateFunc( PostProcessFuncT const& postProcessFunc )
         : m_postProcessFunc(postProcessFunc) {}
-
+    
     css::uno::Reference<css::uno::XInterface>
     operator()( ServiceDecl const& rServiceDecl,
                 css::uno::Sequence<css::uno::Any> const& args,
@@ -266,7 +266,7 @@ struct CreateFunc<ImplT, PostProcessFuncT, with_args<true> > {
 } // namespace detail
 
 /** Defines a service implementation class.
-
+    
     @tpl ImplT_ service implementation class
     @WithArgsT whether the implementation class ctor expects arguments
                (uno::Sequence<uno::Any>, uno::Reference<uno::XComponentContext>)
@@ -275,9 +275,9 @@ struct CreateFunc<ImplT, PostProcessFuncT, with_args<true> > {
 template <typename ImplT_, typename WithArgsT = with_args<false> >
 struct serviceimpl_base {
     typedef ImplT_ ImplT;
-
+    
     detail::CreateFuncF const m_createFunc;
-
+    
     typedef detail::PostProcessDefault<ImplT> PostProcessDefaultT;
 
     /** Default ctor.  Implementation class without args, expecting
@@ -288,7 +288,7 @@ struct serviceimpl_base {
             PostProcessDefaultT() ) ) {}
 
     /** Ctor to pass a post processing function/functor.
-
+        
         @tpl PostProcessDefaultT let your compiler deduce this
         @param postProcessFunc function/functor that gets the yet unacquired
                                ImplT_ pointer returning a
@@ -310,7 +310,7 @@ struct class_ : public serviceimpl_base< detail::ServiceImpl<ImplT_>, WithArgsT
     class_() : baseT() {}
     template <typename PostProcessFuncT>
     /** Ctor to pass a post processing function/functor.
-
+        
         @tpl PostProcessDefaultT let your compiler deduce this
         @param postProcessFunc function/functor that gets the yet unacquired
                                ImplT_ pointer returning a
@@ -331,22 +331,22 @@ struct class_ : public serviceimpl_base< detail::ServiceImpl<ImplT_>, WithArgsT
         pRet = BOOST_PP_CAT(s, n_).getFactory(pImplName);
 
 /** The following preprocessor repetitions generate functions like
-
+    
     <pre>
         inline sal_Bool component_writeInfoHelper(
             ::com::sun::star::lang::XMultiServiceFactory *,
             ::com::sun::star::registry::XRegistryKey * xRegistryKey,
             ServiceDecl const& s0, ServiceDecl const& s1, ... );
-
+        
         inline void * component_getFactoryHelper(
             sal_Char const* pImplName,
             ::com::sun::star::lang::XMultiServiceFactory *,
             ::com::sun::star::registry::XRegistryKey * xRegistryKey,
             ServiceDecl const& s0, ServiceDecl const& s1, ... );
     </pre>
-
+    
     which call on the passed service declarations.
-
+    
     The maximum number of service declarations can be set by defining
     COMPHELPER_SERVICEDECL_COMPONENT_HELPER_MAX_ARGS; its default is 8.
 */
@@ -389,15 +389,15 @@ BOOST_PP_REPEAT_FROM_TO(1, COMPHELPER_SERVICEDECL_COMPONENT_HELPER_MAX_ARGS,
 /** The following preprocessor macro generates the C access functions,
     that are used to initialize and register the components of a
     shared library object.
-
+    
     If you have, say, written a lib that contains three distinct
     components, each with its own ServiceDecl object, you might want
     to employ the following code:
 
     <pre>
         // must reside outside _any_ namespace
-        COMPHELPER_SERVICEDECL_EXPORTS3(yourServiceDecl1,
-                                       yourServiceDecl2,
+        COMPHELPER_SERVICEDECL_EXPORTS3(yourServiceDecl1, 
+                                       yourServiceDecl2, 
                                        yourServiceDecl3);
     </pre>
 
diff --git a/comphelper/inc/comphelper/servicehelper.hxx b/comphelper/inc/comphelper/servicehelper.hxx
index e856ec9f64b5..ef5a7e924a54 100644
--- a/comphelper/inc/comphelper/servicehelper.hxx
+++ b/comphelper/inc/comphelper/servicehelper.hxx
@@ -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
diff --git a/comphelper/inc/comphelper/serviceinfohelper.hxx b/comphelper/inc/comphelper/serviceinfohelper.hxx
index 87e450260b51..2bd713141fee 100644
--- a/comphelper/inc/comphelper/serviceinfohelper.hxx
+++ b/comphelper/inc/comphelper/serviceinfohelper.hxx
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2008 by Sun Microsystems, Inc.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/comphelper/inc/comphelper/sharedmutex.hxx b/comphelper/inc/comphelper/sharedmutex.hxx
index c57c241f1cbb..e4544ca27a20 100644
--- a/comphelper/inc/comphelper/sharedmutex.hxx
+++ b/comphelper/inc/comphelper/sharedmutex.hxx
@@ -1,6 +1,6 @@
 /*************************************************************************
  * 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
diff --git a/comphelper/inc/comphelper/stillreadwriteinteraction.hxx b/comphelper/inc/comphelper/stillreadwriteinteraction.hxx
index 1ade47220c6f..a7940211faa6 100644
--- a/comphelper/inc/comphelper/stillreadwriteinteraction.hxx
+++ b/comphelper/inc/comphelper/stillreadwriteinteraction.hxx
@@ -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
diff --git a/comphelper/inc/comphelper/stl_types.hxx b/comphelper/inc/comphelper/stl_types.hxx
index 7a8a56f5f238..1c9ffdfb6391 100644
--- a/comphelper/inc/comphelper/stl_types.hxx
+++ b/comphelper/inc/comphelper/stl_types.hxx
@@ -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
@@ -157,9 +157,9 @@ public:
 */
 template < class IAFCE >
 struct OInterfaceCompare
-    :public ::std::binary_function  <   ::com::sun::star::uno::Reference< IAFCE >
-                                    ,   ::com::sun::star::uno::Reference< IAFCE >
-                                    ,   bool
+    :public ::std::binary_function	<	::com::sun::star::uno::Reference< IAFCE >
+                                    ,	::com::sun::star::uno::Reference< IAFCE >
+                                    ,	bool
                                     >
 {
     bool operator() (const ::com::sun::star::uno::Reference< IAFCE >& lhs, const ::com::sun::star::uno::Reference< IAFCE >& rhs) const
@@ -173,7 +173,7 @@ struct OInterfaceCompare
 };
 
 template <class _Tp, class _Arg>
-class mem_fun1_t : public ::std::binary_function<_Tp*,_Arg,void>
+class mem_fun1_t : public ::std::binary_function<_Tp*,_Arg,void> 
 {
     typedef void (_Tp::*_fun_type)(_Arg);
 public:
@@ -185,8 +185,8 @@ private:
 
 template <class _Tp, class _Arg>
 inline mem_fun1_t<_Tp,_Arg> mem_fun(void (_Tp::*__f)(_Arg))
-{
-    return mem_fun1_t<_Tp,_Arg>(__f);
+{ 
+    return mem_fun1_t<_Tp,_Arg>(__f); 
 }
 
 //.........................................................................
diff --git a/comphelper/inc/comphelper/stlunosequence.hxx b/comphelper/inc/comphelper/stlunosequence.hxx
index d9757bbd9b51..2ea4d9b68fa4 100644
--- a/comphelper/inc/comphelper/stlunosequence.hxx
+++ b/comphelper/inc/comphelper/stlunosequence.hxx
@@ -1,6 +1,6 @@
 /*************************************************************************
  * 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
diff --git a/comphelper/inc/comphelper/storagehelper.hxx b/comphelper/inc/comphelper/storagehelper.hxx
index b613ddd2c5f1..9123ff0c49a5 100644
--- a/comphelper/inc/comphelper/storagehelper.hxx
+++ b/comphelper/inc/comphelper/storagehelper.hxx
@@ -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
@@ -39,9 +39,9 @@
 #include "comphelper/comphelperdllapi.h"
 
 
-#define PACKAGE_STORAGE_FORMAT_STRING   ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "PackageFormat" ) )
-#define ZIP_STORAGE_FORMAT_STRING       ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ZipFormat" ) )
-#define OFOPXML_STORAGE_FORMAT_STRING   ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "OFOPXMLFormat" ) )
+#define PACKAGE_STORAGE_FORMAT_STRING	::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "PackageFormat" ) )
+#define ZIP_STORAGE_FORMAT_STRING		::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ZipFormat" ) )
+#define OFOPXML_STORAGE_FORMAT_STRING	::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "OFOPXMLFormat" ) )
 
 namespace comphelper {
 
@@ -161,6 +161,8 @@ public:
 
     static sal_Bool IsValidZipEntryFileName( const ::rtl::OUString& aName, sal_Bool bSlashAllowed );
     static sal_Bool IsValidZipEntryFileName( const sal_Unicode *pChar, sal_Int32 nLength, sal_Bool bSlashAllowed );
+
+    static sal_Bool PathHasSegment( const ::rtl::OUString& aPath, const ::rtl::OUString& aSegment );
 };
 
 }
diff --git a/comphelper/inc/comphelper/streamsection.hxx b/comphelper/inc/comphelper/streamsection.hxx
index e3b8d4ebfe8f..766a452caba8 100644
--- a/comphelper/inc/comphelper/streamsection.hxx
+++ b/comphelper/inc/comphelper/streamsection.hxx
@@ -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
@@ -36,37 +36,37 @@
 namespace comphelper
 {
 
-    namespace stario    = ::com::sun::star::io;
-    namespace staruno   = ::com::sun::star::uno;
+    namespace stario	= ::com::sun::star::io;
+    namespace staruno	= ::com::sun::star::uno;
 
 /** implements handling for compatibly reading/writing data from/into an input/output stream.
     data written in a block secured by this class should be readable by older versions which
     use the same mechanism.
 
-    @author Frank Schoenheit
-    @since  00/26/05
+    @author	Frank Schoenheit
+    @since	00/26/05
 */
 
 class COMPHELPER_DLLPUBLIC OStreamSection
 {
-    staruno::Reference< stario::XMarkableStream >       m_xMarkStream;
-    staruno::Reference< stario::XDataInputStream >      m_xInStream;
-    staruno::Reference< stario::XDataOutputStream >     m_xOutStream;
+    staruno::Reference< stario::XMarkableStream >		m_xMarkStream;
+    staruno::Reference< stario::XDataInputStream >		m_xInStream;
+    staruno::Reference< stario::XDataOutputStream >		m_xOutStream;
 
-    sal_Int32   m_nBlockStart;
-    sal_Int32   m_nBlockLen;
+    sal_Int32	m_nBlockStart;
+    sal_Int32	m_nBlockLen;
 
 public:
-    /** starts reading of a "skippable" section of data within the given input stream<BR>
-        @param      _rxInput    the stream to read from. Must support the
+    /**	starts reading of a "skippable" section of data within the given input stream<BR>
+        @param		_rxInput	the stream to read from. Must support the
                                 <type scope="com::sun::star::io">XMarkableStream</type> interface
     */
     OStreamSection(const staruno::Reference< stario::XDataInputStream >& _rxInput);
 
-    /** starts writing of a "skippable" section of data into the given output stream
-        @param      _rxOutput           the stream the stream to write to. Must support the
+    /**	starts writing of a "skippable" section of data into the given output stream
+        @param		_rxOutput			the stream the stream to write to. Must support the
                                         <type scope="com::sun::star::io">XMarkableStream</type> interface
-        @param      _nPresumedLength    estimation for the length of the upcoming section. If greater 0, this
+        @param		_nPresumedLength	estimation for the length of the upcoming section. If greater 0, this
                                         value will be written as section length and corrected (in the dtor) only if
                                         needed. If you know how much bytes you are about to write, you may
                                         want to use this param, saving some stream operations this way.
@@ -83,6 +83,6 @@ public:
     sal_Int32 available();
 };
 
-}   // namespace comphelper
+}	// namespace comphelper
 
 #endif // _COMPHELPER_STREAMSECTION_HXX_
diff --git a/comphelper/inc/comphelper/string.hxx b/comphelper/inc/comphelper/string.hxx
index 8c262edaddfe..41c13eb30c6e 100644
--- a/comphelper/inc/comphelper/string.hxx
+++ b/comphelper/inc/comphelper/string.hxx
@@ -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
diff --git a/comphelper/inc/comphelper/synchronousdispatch.hxx b/comphelper/inc/comphelper/synchronousdispatch.hxx
index b215ec2b990b..4e8af94a4056 100644
--- a/comphelper/inc/comphelper/synchronousdispatch.hxx
+++ b/comphelper/inc/comphelper/synchronousdispatch.hxx
@@ -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
@@ -53,7 +53,7 @@ namespace comphelper
     //= SynchronousDispatch
     //====================================================================
     /** a helper class for working with the dispatch interface replacing
-        loadComponentFromURL
+        loadComponentFromURL 
     */
     class SynchronousDispatch
     {
diff --git a/comphelper/inc/comphelper/types.hxx b/comphelper/inc/comphelper/types.hxx
index 8d5b9f744451..f9ccc7f660a0 100644
--- a/comphelper/inc/comphelper/types.hxx
+++ b/comphelper/inc/comphelper/types.hxx
@@ -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
@@ -47,12 +47,12 @@ namespace comphelper
 {
 //.........................................................................
 
-    namespace staruno       = ::com::sun::star::uno;
-    namespace starawt       = ::com::sun::star::awt;
-    namespace starlang      = ::com::sun::star::lang;
+    namespace staruno		= ::com::sun::star::uno;
+    namespace starawt		= ::com::sun::star::awt;
+    namespace starlang		= ::com::sun::star::lang;
 
-    typedef staruno::Reference< staruno::XInterface >           InterfaceRef;
-    typedef staruno::Sequence< ::rtl::OUString >                StringSequence;
+    typedef staruno::Reference< staruno::XInterface >			InterfaceRef;
+    typedef staruno::Sequence< ::rtl::OUString >				StringSequence;
 
     //-------------------------------------------------------------------------
     /** compare the two given Anys
@@ -64,8 +64,8 @@ namespace comphelper
     //-------------------------------------------------------------------------
     /** compare two FontDescriptor's
     */
-    COMPHELPER_DLLPUBLIC sal_Bool   operator ==(const starawt::FontDescriptor& _rLeft, const starawt::FontDescriptor& _rRight);
-    inline  sal_Bool    operator !=(const starawt::FontDescriptor& _rLeft, const starawt::FontDescriptor& _rRight)
+    COMPHELPER_DLLPUBLIC sal_Bool	operator ==(const starawt::FontDescriptor& _rLeft, const starawt::FontDescriptor& _rRight);
+    inline	sal_Bool	operator !=(const starawt::FontDescriptor& _rLeft, const starawt::FontDescriptor& _rRight)
     {
         return !(_rLeft == _rRight);
     }
@@ -137,11 +137,11 @@ namespace comphelper
 
 
     //-------------------------------------------------------------------------
-    /** get a com::sun::star::awt::FontDescriptor that is fully initialized with
+    /**	get a com::sun::star::awt::FontDescriptor that is fully initialized with
         the XXX_DONTKNOW enum values (which isn't the case if you instantiate it
         via the default constructor)
     */
-    COMPHELPER_DLLPUBLIC starawt::FontDescriptor    getDefaultFont();
+    COMPHELPER_DLLPUBLIC starawt::FontDescriptor	getDefaultFont();
 
     /** examine a sequence for the <type scope="com.sun.star.uno">Type</type> of it's elements.
     */
@@ -155,14 +155,14 @@ namespace comphelper
     // no, we don't use templates here. This would lead to a lot of implicit uses of the conversion methods,
     // which would be difficult to trace ...
 
-    COMPHELPER_DLLPUBLIC sal_Int32      getINT32(const staruno::Any& _rAny);
-    COMPHELPER_DLLPUBLIC sal_Int16      getINT16(const staruno::Any& _rAny);
-    COMPHELPER_DLLPUBLIC double         getDouble(const staruno::Any& _rAny);
-    COMPHELPER_DLLPUBLIC float          getFloat(const staruno::Any& _rAny);
-    COMPHELPER_DLLPUBLIC ::rtl::OUString    getString(const staruno::Any& _rAny);
-    COMPHELPER_DLLPUBLIC sal_Bool       getBOOL(const staruno::Any& _rAny);
+    COMPHELPER_DLLPUBLIC sal_Int32		getINT32(const staruno::Any& _rAny);
+    COMPHELPER_DLLPUBLIC sal_Int16		getINT16(const staruno::Any& _rAny);
+    COMPHELPER_DLLPUBLIC double			getDouble(const staruno::Any& _rAny);
+    COMPHELPER_DLLPUBLIC float			getFloat(const staruno::Any& _rAny);
+    COMPHELPER_DLLPUBLIC ::rtl::OUString	getString(const staruno::Any& _rAny);
+    COMPHELPER_DLLPUBLIC sal_Bool		getBOOL(const staruno::Any& _rAny);
 
-    COMPHELPER_DLLPUBLIC sal_Int32      getEnumAsINT32(const staruno::Any& _rAny) throw(starlang::IllegalArgumentException);
+    COMPHELPER_DLLPUBLIC sal_Int32		getEnumAsINT32(const staruno::Any& _rAny) throw(starlang::IllegalArgumentException);
 
 //= replacement of some former UsrAny.setXXX methods - can be used with rvalues
     inline void setBOOL(staruno::Any& _rAny, sal_Bool _b)
@@ -173,7 +173,7 @@ namespace comphelper
     { return staruno::Any(&_b, ::getBooleanCppuType()); }
 
 //.........................................................................
-}   // namespace comphelper
+}	// namespace comphelper
 //.........................................................................
 
 #endif // _COMPHELPER_TYPES_HXX_
diff --git a/comphelper/inc/comphelper/uieventslogger.hxx b/comphelper/inc/comphelper/uieventslogger.hxx
index 5cf270751dd1..51292a57e4f4 100644
--- a/comphelper/inc/comphelper/uieventslogger.hxx
+++ b/comphelper/inc/comphelper/uieventslogger.hxx
@@ -1,6 +1,6 @@
 /*************************************************************************
  * 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
diff --git a/comphelper/inc/comphelper/uno3.hxx b/comphelper/inc/comphelper/uno3.hxx
index cd6196e50e53..a9c0d2994909 100644
--- a/comphelper/inc/comphelper/uno3.hxx
+++ b/comphelper/inc/comphelper/uno3.hxx
@@ -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
@@ -50,19 +50,19 @@ namespace comphelper
     /** used for declaring UNO3-Defaults, i.e. acquire/release
     */
     #define DECLARE_UNO3_DEFAULTS(classname, baseclass) \
-        virtual void    SAL_CALL acquire() throw() { baseclass::acquire(); }    \
-        virtual void    SAL_CALL release() throw() { baseclass::release(); }    \
-        void            SAL_CALL PUT_SEMICOLON_AT_THE_END()
+        virtual void	SAL_CALL acquire() throw() { baseclass::acquire(); }	\
+        virtual void	SAL_CALL release() throw() { baseclass::release(); }	\
+        void			SAL_CALL PUT_SEMICOLON_AT_THE_END()
 
     /** used for declaring UNO3-Defaults, i.e. acquire/release if you want to forward all queryInterfaces to the base class,
         (e.g. if you overload queryAggregation)
     */
     #define DECLARE_UNO3_AGG_DEFAULTS(classname, baseclass) \
-        virtual void            SAL_CALL acquire() throw() { baseclass::acquire(); } \
-        virtual void            SAL_CALL release() throw() { baseclass::release(); }    \
-        virtual ::com::sun::star::uno::Any  SAL_CALL queryInterface(const ::com::sun::star::uno::Type& _rType) throw (::com::sun::star::uno::RuntimeException) \
+        virtual void			SAL_CALL acquire() throw() { baseclass::acquire(); } \
+        virtual void			SAL_CALL release() throw() { baseclass::release(); }	\
+        virtual ::com::sun::star::uno::Any	SAL_CALL queryInterface(const ::com::sun::star::uno::Type& _rType) throw (::com::sun::star::uno::RuntimeException) \
             { return baseclass::queryInterface(_rType); } \
-        void                    SAL_CALL PUT_SEMICOLON_AT_THE_END()
+        void					SAL_CALL PUT_SEMICOLON_AT_THE_END()
 
     /** Use this macro to forward XComponent methods to base class
 
@@ -87,23 +87,23 @@ namespace comphelper
         that would be ::cppu::WeakComponentImplHelperBase
     */
     #define DECLARE_UNO3_XCOMPONENT_DEFAULTS(classname, baseclass, implhelper) \
-        virtual void SAL_CALL acquire() throw() { baseclass::acquire(); }   \
-        virtual void SAL_CALL release() throw() { baseclass::release(); }   \
+        virtual void SAL_CALL acquire() throw() { baseclass::acquire(); }	\
+        virtual void SAL_CALL release() throw() { baseclass::release(); }	\
         virtual void SAL_CALL dispose() throw (::com::sun::star::uno::RuntimeException) \
-        {                                                                               \
-            implhelper::dispose();                                                      \
-        }                                                                               \
-        virtual void SAL_CALL addEventListener(                                         \
+        { 																				\
+            implhelper::dispose(); 														\
+        }                                                                       		\
+        virtual void SAL_CALL addEventListener( 										\
             ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > const & xListener ) throw (::com::sun::star::uno::RuntimeException) \
-        {                                                                               \
-            implhelper::addEventListener(xListener);                                        \
-        }                                                                               \
-        virtual void SAL_CALL removeEventListener(                                      \
+        {																				\
+            implhelper::addEventListener(xListener);										\
+        }                                                                       		\
+        virtual void SAL_CALL removeEventListener( 										\
             ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > const & xListener ) throw (::com::sun::star::uno::RuntimeException) \
-        {                                                                               \
-            implhelper::removeEventListener(xListener);                                 \
-        }                                                                               \
-        void         SAL_CALL PUT_SEMICOLON_AT_THE_END()
+        {																				\
+            implhelper::removeEventListener(xListener);                  				\
+        }                                                                       		\
+        void		 SAL_CALL PUT_SEMICOLON_AT_THE_END()
 
 
     /** Use this macro to forward XComponent methods to base class
@@ -129,25 +129,25 @@ namespace comphelper
         that would be ::cppu::WeakComponentImplHelperBase
     */
     #define DECLARE_UNO3_XCOMPONENT_AGG_DEFAULTS(classname, baseclass, implhelper) \
-        virtual void SAL_CALL acquire() throw() { baseclass::acquire(); }   \
-        virtual void SAL_CALL release() throw() { baseclass::release(); }   \
-        virtual ::com::sun::star::uno::Any  SAL_CALL queryInterface(const ::com::sun::star::uno::Type& _rType) throw (::com::sun::star::uno::RuntimeException) \
-            { return baseclass::queryInterface(_rType); }                               \
+        virtual void SAL_CALL acquire() throw() { baseclass::acquire(); }	\
+        virtual void SAL_CALL release() throw() { baseclass::release(); }	\
+        virtual ::com::sun::star::uno::Any	SAL_CALL queryInterface(const ::com::sun::star::uno::Type& _rType) throw (::com::sun::star::uno::RuntimeException) \
+            { return baseclass::queryInterface(_rType); } 								\
         virtual void SAL_CALL dispose() throw (::com::sun::star::uno::RuntimeException) \
-        {                                                                               \
-            implhelper::dispose();                                                      \
-        }                                                                               \
-        virtual void SAL_CALL addEventListener(                                         \
+        { 																				\
+            implhelper::dispose(); 														\
+        }                                                                       		\
+        virtual void SAL_CALL addEventListener( 										\
             ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > const & xListener ) throw (::com::sun::star::uno::RuntimeException) \
-        {                                                                               \
-            implhelper::addEventListener(xListener);                                        \
-        }                                                                               \
-        virtual void SAL_CALL removeEventListener(                                      \
+        {																				\
+            implhelper::addEventListener(xListener);										\
+        }                                                                       		\
+        virtual void SAL_CALL removeEventListener( 										\
             ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > const & xListener ) throw (::com::sun::star::uno::RuntimeException) \
-        {                                                                               \
-            implhelper::removeEventListener(xListener);                                 \
-        }                                                                               \
-        void         SAL_CALL PUT_SEMICOLON_AT_THE_END()
+        {																				\
+            implhelper::removeEventListener(xListener);                  				\
+        }                                                                       		\
+        void		 SAL_CALL PUT_SEMICOLON_AT_THE_END()
 
 
     //=====================================================================
@@ -155,7 +155,7 @@ namespace comphelper
     //=====================================================================
     //= forwarding/merging XInterface funtionality
     //=====================================================================
-    #define DECLARE_XINTERFACE( )   \
+    #define DECLARE_XINTERFACE( )	\
         virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& aType ) throw (::com::sun::star::uno::RuntimeException); \
         virtual void SAL_CALL acquire() throw(); \
         virtual void SAL_CALL release() throw();
@@ -191,7 +191,7 @@ namespace comphelper
     //=====================================================================
     //= forwarding/merging XTypeProvider funtionality
     //=====================================================================
-    #define DECLARE_XTYPEPROVIDER( )    \
+    #define DECLARE_XTYPEPROVIDER( )	\
         virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes(  ) throw (::com::sun::star::uno::RuntimeException); \
         virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId(  ) throw (::com::sun::star::uno::RuntimeException);
 
@@ -210,7 +210,7 @@ namespace comphelper
             } \
             return pId->getImplementationId(); \
         }
-
+        
     #define IMPLEMENT_FORWARD_XTYPEPROVIDER2( classname, baseclass1, baseclass2 ) \
         ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL classname::getTypes(  ) throw (::com::sun::star::uno::RuntimeException) \
         { \
@@ -280,7 +280,7 @@ namespace comphelper
     }
     #define FORWARD_DECLARE_INTERFACE(NAME,XFACE) \
         namespace com \
-        {   \
+        {	\
             namespace sun \
             {\
                 namespace star \
@@ -295,7 +295,7 @@ namespace comphelper
 
 
 //.........................................................................
-}   // namespace comphelper
+}	// namespace comphelper
 //.........................................................................
 
 #endif // _COMPHELPER_UNO3_HXX_
diff --git a/comphelper/inc/comphelper/unwrapargs.hxx b/comphelper/inc/comphelper/unwrapargs.hxx
index 652187f9139f..013f573e926c 100644
--- a/comphelper/inc/comphelper/unwrapargs.hxx
+++ b/comphelper/inc/comphelper/unwrapargs.hxx
@@ -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
@@ -98,7 +98,7 @@ inline void extract(
     BOOST_PP_CAT(T, n_) & BOOST_PP_CAT(v, n_)
 
 /** The following preprocessor repetitions generate functions like
-
+    
     <pre>
         template <typename T0, typename T1, ...>
         inline void unwrapArgs(
@@ -109,7 +109,7 @@ inline void extract(
     </pre>
     (full namespace qualification ::com::sun::star has been omitted
     for brevity)
-
+    
     which unwraps the passed sequence's elements, assigning them to the
     referenced values.  Specify optional arguments as boost::optional<T>.
     If the length of the sequence is greater than the count of arguments,
@@ -117,8 +117,8 @@ inline void extract(
     If too few arguments are given in the sequence and a missing argument is
     no boost::optional<T>, then an lang::IllegalArgumentException is thrown
     with the specified xErrorContext (defaults to null-ref).
-
-    The maximum number of service declarations can be set by defining
+    
+    The maximum number of service declarations can be set by defining   
     COMPHELPER_UNWRAPARGS_MAX_ARGS; its default is 12.
 */
 #define COMPHELPER_UNWRAPARGS_make(z_, n_, unused_) \
diff --git a/comphelper/inc/comphelper/weak.hxx b/comphelper/inc/comphelper/weak.hxx
index b23b673e9b1c..a0fa04116e20 100644
--- a/comphelper/inc/comphelper/weak.hxx
+++ b/comphelper/inc/comphelper/weak.hxx
@@ -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
@@ -33,7 +33,7 @@
 #include <cppuhelper/weak.hxx>
 
 namespace comphelper
-{
+{    
 /** Base class to implement an UNO object supporting types and weak references, i.e. the object can be held
     weakly (by a ::com::sun::star::uno::WeakReference).
     This implementation copes with reference counting.  Upon last release(), the virtual dtor
@@ -48,9 +48,9 @@ public:
     OWeakTypeObject();
     virtual ~OWeakTypeObject();
 
-    virtual ::com::sun::star::uno::Any SAL_CALL queryInterface(const ::com::sun::star::uno::Type & rType )  throw (::com::sun::star::uno::RuntimeException);
-    virtual void SAL_CALL acquire() throw ();
-    virtual void SAL_CALL release() throw ();
+    virtual ::com::sun::star::uno::Any SAL_CALL queryInterface(const ::com::sun::star::uno::Type & rType )	throw (::com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL acquire()	throw ();
+    virtual void SAL_CALL release()	throw ();
     virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes(  ) throw (::com::sun::star::uno::RuntimeException);
     virtual ::com::sun::star::uno::Sequence< ::sal_Int8 > SAL_CALL getImplementationId(  ) throw (::com::sun::star::uno::RuntimeException);
 
diff --git a/comphelper/inc/comphelper/weakbag.hxx b/comphelper/inc/comphelper/weakbag.hxx
index 8b2fa1c4449d..6e243dfc2840 100644
--- a/comphelper/inc/comphelper/weakbag.hxx
+++ b/comphelper/inc/comphelper/weakbag.hxx
@@ -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
diff --git a/comphelper/inc/comphelper/weakeventlistener.hxx b/comphelper/inc/comphelper/weakeventlistener.hxx
index 930f19f3a40f..cedef7b1a1af 100644
--- a/comphelper/inc/comphelper/weakeventlistener.hxx
+++ b/comphelper/inc/comphelper/weakeventlistener.hxx
@@ -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
@@ -82,13 +82,13 @@ namespace comphelper
             const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XWeak >& _rxListener,
             const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _rxBroadcaster
         )
-            :m_aListener    (  _rxListener )
-            ,m_xBroadcaster ( _rxBroadcaster )
+            :m_aListener	(  _rxListener )
+            ,m_xBroadcaster	( _rxBroadcaster )
         {
         }
 
     protected:
-        virtual ~OWeakListenerAdapterBase();
+        virtual	~OWeakListenerAdapterBase();
     };
 
 
@@ -119,9 +119,9 @@ namespace comphelper
         );
 
     protected:
-        inline  ::com::sun::star::uno::Reference< LISTENER > getListener( ) const
+        inline	::com::sun::star::uno::Reference< LISTENER > getListener( ) const
         {
-            return  ::com::sun::star::uno::Reference< LISTENER >( OWeakListenerAdapterBase::getListener(), ::com::sun::star::uno::UNO_QUERY );
+            return	::com::sun::star::uno::Reference< LISTENER >( OWeakListenerAdapterBase::getListener(), ::com::sun::star::uno::UNO_QUERY );
         }
 
         // XEventListener overridables
@@ -136,10 +136,10 @@ namespace comphelper
     //=====================================================================
     //= OWeakEventListenerAdapter
     //=====================================================================
-    typedef OWeakListenerAdapter    <   ::com::sun::star::lang::XComponent
-                                    ,   ::com::sun::star::lang::XEventListener
-                                    >   OWeakEventListenerAdapter_Base;
-    /** the most simple listener adapter: for XEventListeners at XComponents
+    typedef OWeakListenerAdapter	<	::com::sun::star::lang::XComponent
+                                    ,	::com::sun::star::lang::XEventListener
+                                    >	OWeakEventListenerAdapter_Base;
+    /**	the most simple listener adapter: for XEventListeners at XComponents
     */
     class COMPHELPER_DLLPUBLIC OWeakEventListenerAdapter : public OWeakEventListenerAdapter_Base
     {
@@ -181,7 +181,7 @@ namespace comphelper
     }
 
 //.........................................................................
-}   // namespace comphelper
+}	// namespace comphelper
 //.........................................................................
 
 #endif// COMPHELPER_WEAKEVENTLISTENER_HXX
diff --git a/comphelper/inc/pch/precompiled_comphelper.cxx b/comphelper/inc/pch/precompiled_comphelper.cxx
index 2936d22924b7..a1584a7a8899 100644
--- a/comphelper/inc/pch/precompiled_comphelper.cxx
+++ b/comphelper/inc/pch/precompiled_comphelper.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
diff --git a/comphelper/inc/pch/precompiled_comphelper.hxx b/comphelper/inc/pch/precompiled_comphelper.hxx
index a3679864b3b1..f8221456c6d8 100644
--- a/comphelper/inc/pch/precompiled_comphelper.hxx
+++ b/comphelper/inc/pch/precompiled_comphelper.hxx
@@ -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
diff --git a/comphelper/qa/complex/comphelper/Map.java b/comphelper/qa/complex/comphelper/Map.java
index deeffe6baf32..751c4a90317b 100644
--- a/comphelper/qa/complex/comphelper/Map.java
+++ b/comphelper/qa/complex/comphelper/Map.java
@@ -1,23 +1,23 @@
 /*
  *
  * 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
- *
+ * 
  * This file is part of OpenOffice.org.
- *
+ * 
  * OpenOffice.org is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License version 3
  * only, as published by the Free Software Foundation.
- *
+ * 
  * OpenOffice.org is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU Lesser General Public License version 3 for more details
  * (a copy is included in the LICENSE file that accompanied this code).
- *
+ * 
  * You should have received a copy of the GNU Lesser General Public License
  * version 3 along with OpenOffice.org.  If not, see
  * <http://www.openoffice.org/license.html>
@@ -292,7 +292,7 @@ public class Map extends complexlib.ComplexTestCase
         public Type getElementType()            { throw new UnsupportedOperationException( "Not implemented." ); }
         public boolean hasElements()            { throw new UnsupportedOperationException( "Not implemented." ); }
     };
-
+    
     private class DummyContainer implements XContainer
     {
         public void addContainerListener( XContainerListener arg0 ) { throw new UnsupportedOperationException( "Not implemented." ); }
diff --git a/comphelper/qa/complex/comphelper/SequenceOutputStreamUnitTest.java b/comphelper/qa/complex/comphelper/SequenceOutputStreamUnitTest.java
index 26879a7c83ad..de95d209b4b8 100644
--- a/comphelper/qa/complex/comphelper/SequenceOutputStreamUnitTest.java
+++ b/comphelper/qa/complex/comphelper/SequenceOutputStreamUnitTest.java
@@ -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
@@ -34,16 +34,16 @@ import com.sun.star.lang.XMultiServiceFactory;
 
 public class SequenceOutputStreamUnitTest extends ComplexTestCase {
     private XMultiServiceFactory m_xMSF = null;
-
+    
     public String[] getTestMethodNames() {
         return new String[] {
             "ExecuteTest01"};
     }
-
+    
     public String getTestObjectName () {
         return "SequenceOutputStreamUnitTest";
     }
-
+    
     public static String getShortTestDescription() {
         return "tests the SequenceOutput/InputStream implementations";
     }
@@ -58,11 +58,11 @@ public class SequenceOutputStreamUnitTest extends ComplexTestCase {
             failed ("Cannot create service factory!");
         }
     }
-
+    
     public void after() {
         m_xMSF = null;
     }
-
+    
     public void ExecuteTest01() {
         Test01 aTest = new Test01 (m_xMSF, log);
         assure ( "Test01 failed!", aTest.test() );
diff --git a/comphelper/qa/complex/comphelper/Test01.java b/comphelper/qa/complex/comphelper/Test01.java
index 6900b738aeba..14738844eafa 100644
--- a/comphelper/qa/complex/comphelper/Test01.java
+++ b/comphelper/qa/complex/comphelper/Test01.java
@@ -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
@@ -37,26 +37,26 @@ import share.LogWriter;
 public class Test01 {
     XMultiServiceFactory m_xMSF = null;
     TestHelper m_aTestHelper = null;
-
+    
     public Test01 ( XMultiServiceFactory xMSF, LogWriter aLogWriter )
     {
         m_xMSF = xMSF;
         m_aTestHelper = new TestHelper (aLogWriter, "Test01: ");
     }
 
-
+    
     public boolean test () {
         try {
             final int nBytesCnt = 20;
-
+            
             //create SequenceOutputStream
-            Object oSequenceOutputStream = m_xMSF.createInstance (
+            Object oSequenceOutputStream = m_xMSF.createInstance ( 
                     "com.sun.star.io.SequenceOutputStream" );
-            XSequenceOutputStream xSeqOutStream =
-                    (XSequenceOutputStream) UnoRuntime.queryInterface (
+            XSequenceOutputStream xSeqOutStream = 
+                    (XSequenceOutputStream) UnoRuntime.queryInterface ( 
                     XSequenceOutputStream.class, oSequenceOutputStream );
             m_aTestHelper.Message ( "SequenceOutputStream created." );
-
+            
             //write something to the stream
             byte pBytesOriginal[] = new byte [nBytesCnt];
             Random oRandom = new Random();
@@ -64,27 +64,27 @@ public class Test01 {
             xSeqOutStream.writeBytes (pBytesOriginal);
             byte pBytesWritten[] = xSeqOutStream.getWrittenBytes ();
             m_aTestHelper.Message ( "SeuenceOutputStream filled." );
-
+            
             //create SequenceInputstream
             Object pArgs[] = new Object[1];
             pArgs[0] = pBytesWritten;
             Object oSequenceInputStream = m_xMSF.createInstanceWithArguments (
                     "com.sun.star.io.SequenceInputStream", pArgs );
-            XSeekableInputStream xSeekableInStream =
-                    (XSeekableInputStream)UnoRuntime.queryInterface (
+            XSeekableInputStream xSeekableInStream = 
+                    (XSeekableInputStream)UnoRuntime.queryInterface ( 
                     XSeekableInputStream.class, oSequenceInputStream );
             m_aTestHelper.Message ( "SequenceInputStream created." );
-
+            
             //read from the stream
             byte pBytesRead[][] = new byte [1][nBytesCnt];
             xSeekableInStream.readBytes ( pBytesRead, pBytesRead[0].length + 1 );
             m_aTestHelper.Message ( "Read from SequenceInputStream." );
-
+            
             //close the streams
             xSeqOutStream.closeOutput ();
             xSeekableInStream.closeInput ();
             m_aTestHelper.Message ( "Both streams closed." );
-
+            
             //compare the original, written and read arrys
             for ( int i = 0; i < nBytesCnt; ++i ) {
                 if ( pBytesOriginal[i] != pBytesWritten[i] ) {
diff --git a/comphelper/qa/complex/comphelper/TestHelper.java b/comphelper/qa/complex/comphelper/TestHelper.java
index 0a6989e95271..8a685e9ca4f2 100644
--- a/comphelper/qa/complex/comphelper/TestHelper.java
+++ b/comphelper/qa/complex/comphelper/TestHelper.java
@@ -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
@@ -31,17 +31,17 @@ import share.LogWriter;
 public class TestHelper {
     LogWriter m_aLogWriter;
     String m_sTestPrefix;
-
+    
     /** Creates a new instance of TestHelper */
     public TestHelper ( LogWriter aLogWriter, String sTestPrefix ) {
         m_aLogWriter = aLogWriter;
         m_sTestPrefix = sTestPrefix;
     }
-
+    
     public void Error ( String sError ) {
         m_aLogWriter.println ( m_sTestPrefix + "Error: " + sError );
     }
-
+    
     public void Message ( String sMessage ) {
         m_aLogWriter.println ( m_sTestPrefix + sMessage );
     }
diff --git a/comphelper/qa/test_string.cxx b/comphelper/qa/test_string.cxx
index 648b7a204340..07740c1b8e04 100644
--- a/comphelper/qa/test_string.cxx
+++ b/comphelper/qa/test_string.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
diff --git a/comphelper/qa/test_weakbag.cxx b/comphelper/qa/test_weakbag.cxx
index 3827e393b58d..13dd8e4af0b8 100644
--- a/comphelper/qa/test_weakbag.cxx
+++ b/comphelper/qa/test_weakbag.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
diff --git a/comphelper/qa/version.map b/comphelper/qa/version.map
index 7321bbca16ad..f313c44bd7ad 100644
--- a/comphelper/qa/version.map
+++ b/comphelper/qa/version.map
@@ -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
diff --git a/comphelper/source/compare/AnyCompareFactory.cxx b/comphelper/source/compare/AnyCompareFactory.cxx
index 136bff63f69b..b5fc3eae4556 100644
--- a/comphelper/source/compare/AnyCompareFactory.cxx
+++ b/comphelper/source/compare/AnyCompareFactory.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,9 +79,9 @@ public:
 
 class AnyCompareFactory : public cppu::WeakImplHelper3< XAnyCompareFactory, XInitialization, XServiceInfo >
 {
-    Reference< XAnyCompare >            m_rAnyCompare;
+    Reference< XAnyCompare > 			m_rAnyCompare;
     Reference< XComponentContext >      m_rContext;
-    Locale                              m_Locale;
+    Locale							  	m_Locale;
 
 public:
     AnyCompareFactory( Reference< XComponentContext > xContext ) : m_rContext( xContext )
diff --git a/comphelper/source/container/IndexedPropertyValuesContainer.cxx b/comphelper/source/container/IndexedPropertyValuesContainer.cxx
index 928cb78a8b85..9487290c974c 100644
--- a/comphelper/source/container/IndexedPropertyValuesContainer.cxx
+++ b/comphelper/source/container/IndexedPropertyValuesContainer.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
diff --git a/comphelper/source/container/NamedPropertyValuesContainer.cxx b/comphelper/source/container/NamedPropertyValuesContainer.cxx
index e57efaec9118..454c7a0ae059 100644
--- a/comphelper/source/container/NamedPropertyValuesContainer.cxx
+++ b/comphelper/source/container/NamedPropertyValuesContainer.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
diff --git a/comphelper/source/container/container.cxx b/comphelper/source/container/container.cxx
index 9f834de85b66..5556d79bbdb4 100644
--- a/comphelper/source/container/container.cxx
+++ b/comphelper/source/container/container.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
@@ -74,7 +74,7 @@ IndexAccessIterator::~IndexAccessIterator() {}
             // zuerst absteigen, wenn moeglich
             ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess> xContainerAccess(xSearchLoop, ::com::sun::star::uno::UNO_QUERY);
             if (xContainerAccess.is() && xContainerAccess->getCount() && ShouldStepInto(xContainerAccess))
-            {   // zum ersten Child
+            {	// zum ersten Child
                 ::com::sun::star::uno::Any aElement(xContainerAccess->getByIndex(0));
                 xSearchLoop = *(::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface>*)aElement.getValue();
                 bCheckingStartingPoint = sal_False;
@@ -85,7 +85,7 @@ IndexAccessIterator::~IndexAccessIterator() {}
             {
                 // dann nach oben und nach rechts, wenn moeglich
                 while (m_arrChildIndizies.size() > 0)
-                {   // (mein Stack ist nich leer, also kann ich noch nach oben gehen)
+                {	// (mein Stack ist nich leer, also kann ich noch nach oben gehen)
                     ::com::sun::star::uno::Reference< ::com::sun::star::container::XChild> xChild(xSearchLoop, ::com::sun::star::uno::UNO_QUERY);
                     OSL_ENSURE(xChild.is(), "IndexAccessIterator::Next : a content has no approriate interface !");
 
@@ -98,7 +98,7 @@ IndexAccessIterator::~IndexAccessIterator() {}
                     m_arrChildIndizies.pop_back();
 
                     if (nOldSearchChildIndex < xContainerAccess->getCount() - 1)
-                    {   // auf dieser Ebene geht es noch nach rechts
+                    {	// auf dieser Ebene geht es noch nach rechts
                         ++nOldSearchChildIndex;
                         // also das naechste Child
                         ::com::sun::star::uno::Any aElement(xContainerAccess->getByIndex(nOldSearchChildIndex));
@@ -115,14 +115,14 @@ IndexAccessIterator::~IndexAccessIterator() {}
                 }
 
                 if ((m_arrChildIndizies.size() == 0) && !bCheckingStartingPoint)
-                {   // das ist genau dann der Fall, wenn ich keinen rechten Nachbarn fuer irgendeinen der direkten Vorfahren des
+                {	// das ist genau dann der Fall, wenn ich keinen rechten Nachbarn fuer irgendeinen der direkten Vorfahren des
                     // urspruenglichen xSearchLoop gefunden habe
                     bHasMoreToSearch = sal_False;
                 }
             }
 
             if (bHasMoreToSearch)
-            {   // ich habe in xSearchLoop jetzt ein Interface eines 'Knotens' meines 'Baumes', den ich noch abtesten kann
+            {	// ich habe in xSearchLoop jetzt ein Interface eines 'Knotens' meines 'Baumes', den ich noch abtesten kann
                 if (ShouldHandleElement(xSearchLoop))
                 {
                     m_xCurrentObject = xSearchLoop;
@@ -147,7 +147,7 @@ IndexAccessIterator::~IndexAccessIterator() {}
 }
 
 //.........................................................................
-}   // namespace comphelper
+}	// namespace comphelper
 //.........................................................................
 
 
diff --git a/comphelper/source/container/containermultiplexer.cxx b/comphelper/source/container/containermultiplexer.cxx
index 176f9cab6f8f..83c05a8e76a8 100644
--- a/comphelper/source/container/containermultiplexer.cxx
+++ b/comphelper/source/container/containermultiplexer.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
@@ -198,6 +198,6 @@ namespace comphelper
     }
 
 //.........................................................................
-}   // namespace comphelper
+}	// namespace comphelper
 //.........................................................................
 
diff --git a/comphelper/source/container/embeddedobjectcontainer.cxx b/comphelper/source/container/embeddedobjectcontainer.cxx
index 17740e7ef09b..6193250a4551 100644
--- a/comphelper/source/container/embeddedobjectcontainer.cxx
+++ b/comphelper/source/container/embeddedobjectcontainer.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
@@ -334,7 +334,7 @@ uno::Reference < embed::XEmbeddedObject > EmbeddedObjectContainer::GetEmbeddedOb
     uno::Reference < container::XNameAccess > xAccess( pImpl->mxStorage, uno::UNO_QUERY );
     uno::Sequence< ::rtl::OUString> aSeq = xAccess->getElementNames();
     const ::rtl::OUString* pIter = aSeq.getConstArray();
-    const ::rtl::OUString* pEnd   = pIter + aSeq.getLength();
+    const ::rtl::OUString* pEnd	  = pIter + aSeq.getLength();
     for(;pIter != pEnd;++pIter)
     {
         (void)*pIter;
@@ -1377,7 +1377,7 @@ sal_Bool EmbeddedObjectContainer::StoreAsChildren(sal_Bool _bOasisFormat,sal_Boo
         comphelper::EmbeddedObjectContainer aCnt( _xStorage );
         const uno::Sequence < ::rtl::OUString > aNames = GetObjectNames();
         const ::rtl::OUString* pIter = aNames.getConstArray();
-        const ::rtl::OUString* pEnd   = pIter + aNames.getLength();
+        const ::rtl::OUString* pEnd	  = pIter + aNames.getLength();
         for(;pIter != pEnd;++pIter)
         {
             uno::Reference < embed::XEmbeddedObject > xObj = GetEmbeddedObject( *pIter );
@@ -1492,7 +1492,7 @@ sal_Bool EmbeddedObjectContainer::StoreChildren(sal_Bool _bOasisFormat,sal_Bool
     sal_Bool bResult = sal_True;
     const uno::Sequence < ::rtl::OUString > aNames = GetObjectNames();
     const ::rtl::OUString* pIter = aNames.getConstArray();
-    const ::rtl::OUString* pEnd   = pIter + aNames.getLength();
+    const ::rtl::OUString* pEnd	  = pIter + aNames.getLength();
     for(;pIter != pEnd;++pIter)
     {
         uno::Reference < embed::XEmbeddedObject > xObj = GetEmbeddedObject( *pIter );
@@ -1617,7 +1617,7 @@ sal_Bool EmbeddedObjectContainer::SetPersistentEntries(const uno::Reference< emb
     sal_Bool bError = sal_False;
     const uno::Sequence < ::rtl::OUString > aNames = GetObjectNames();
     const ::rtl::OUString* pIter = aNames.getConstArray();
-    const ::rtl::OUString* pEnd   = pIter + aNames.getLength();
+    const ::rtl::OUString* pEnd	  = pIter + aNames.getLength();
     for(;pIter != pEnd;++pIter)
     {
         uno::Reference < embed::XEmbeddedObject > xObj = GetEmbeddedObject( *pIter );
diff --git a/comphelper/source/container/enumerablemap.cxx b/comphelper/source/container/enumerablemap.cxx
index 15241cd72dd6..d0cf4e888fc5 100644
--- a/comphelper/source/container/enumerablemap.cxx
+++ b/comphelper/source/container/enumerablemap.cxx
@@ -1,6 +1,6 @@
 /*************************************************************************
  * 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
@@ -466,7 +466,7 @@ namespace comphelper
                          ,public MapEnumeration_Base
     {
     public:
-        MapEnumeration( ::cppu::OWeakObject& _parentMap, MapData& _mapData, ::cppu::OBroadcastHelper& _rBHelper,
+        MapEnumeration( ::cppu::OWeakObject& _parentMap, MapData& _mapData, ::cppu::OBroadcastHelper& _rBHelper, 
                         const EnumerationType _type, const bool _isolated )
             :ComponentBase( _rBHelper, ComponentBase::NoInitializationNeeded() )
             ,m_xKeepMapAlive( _parentMap )
@@ -755,14 +755,14 @@ namespace comphelper
         ComponentMethodGuard aGuard( *this );
         return new MapEnumeration( *this, m_aData, getBroadcastHelper(), eKeys, _Isolated );
     }
-
+    
     //--------------------------------------------------------------------
     Reference< XEnumeration > SAL_CALL EnumerableMap::createValueEnumeration( ::sal_Bool _Isolated ) throw (NoSupportException, RuntimeException)
     {
         ComponentMethodGuard aGuard( *this );
         return new MapEnumeration( *this, m_aData, getBroadcastHelper(), eValues, _Isolated );
     }
-
+    
     //--------------------------------------------------------------------
     Reference< XEnumeration > SAL_CALL EnumerableMap::createElementEnumeration( ::sal_Bool _Isolated ) throw (NoSupportException, RuntimeException)
     {
@@ -776,14 +776,14 @@ namespace comphelper
         ComponentMethodGuard aGuard( *this );
         return m_aData.m_aKeyType;
     }
-
+    
     //--------------------------------------------------------------------
     Type SAL_CALL EnumerableMap::getValueType() throw (RuntimeException)
     {
         ComponentMethodGuard aGuard( *this );
         return m_aData.m_aValueType;
     }
-
+    
     //--------------------------------------------------------------------
     void SAL_CALL EnumerableMap::clear(  ) throw (NoSupportException, RuntimeException)
     {
@@ -794,7 +794,7 @@ namespace comphelper
 
         lcl_notifyMapDataListeners_nothrow( m_aData );
     }
-
+    
     //--------------------------------------------------------------------
     ::sal_Bool SAL_CALL EnumerableMap::containsKey( const Any& _key ) throw (IllegalTypeException, IllegalArgumentException, RuntimeException)
     {
@@ -804,7 +804,7 @@ namespace comphelper
         KeyedValues::const_iterator pos = m_aData.m_pValues->find( _key );
         return ( pos != m_aData.m_pValues->end() );
     }
-
+    
     //--------------------------------------------------------------------
     ::sal_Bool SAL_CALL EnumerableMap::containsValue( const Any& _value ) throw (IllegalTypeException, IllegalArgumentException, RuntimeException)
     {
@@ -821,7 +821,7 @@ namespace comphelper
         }
         return sal_False;
     }
-
+    
     //--------------------------------------------------------------------
     Any SAL_CALL EnumerableMap::get( const Any& _key ) throw (IllegalTypeException, IllegalArgumentException, NoSuchElementException, RuntimeException)
     {
@@ -834,7 +834,7 @@ namespace comphelper
 
         return pos->second;
     }
-
+    
     //--------------------------------------------------------------------
     Any SAL_CALL EnumerableMap::put( const Any& _key, const Any& _value ) throw (NoSupportException, IllegalTypeException, IllegalArgumentException, RuntimeException)
     {
@@ -860,7 +860,7 @@ namespace comphelper
 
         return previousValue;
     }
-
+    
     //--------------------------------------------------------------------
     Any SAL_CALL EnumerableMap::remove( const Any& _key ) throw (NoSupportException, IllegalTypeException, IllegalArgumentException, NoSuchElementException, RuntimeException)
     {
@@ -982,7 +982,7 @@ namespace comphelper
         ComponentMethodGuard aGuard( *this );
         return m_aEnumerator.hasMoreElements();
     }
-
+    
     //--------------------------------------------------------------------
     Any SAL_CALL MapEnumeration::nextElement(  ) throw (NoSuchElementException, WrappedTargetException, RuntimeException)
     {
diff --git a/comphelper/source/container/enumhelper.cxx b/comphelper/source/container/enumhelper.cxx
index 646bffa9810f..0430f091c93e 100644
--- a/comphelper/source/container/enumhelper.cxx
+++ b/comphelper/source/container/enumhelper.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
@@ -98,7 +98,7 @@ staruno::Any SAL_CALL OEnumerationByName::nextElement(  )
         m_xAccess.clear();
     }
 
-    if (!aRes.hasValue())       // es gibt kein Element mehr
+    if (!aRes.hasValue())		// es gibt kein Element mehr
         throw starcontainer::NoSuchElementException();
 
     return aRes;
@@ -202,7 +202,7 @@ staruno::Any SAL_CALL OEnumerationByIndex::nextElement(  )
         }
     }
 
-    if (!aRes.hasValue())       // es gibt kein Element mehr
+    if (!aRes.hasValue())		// es gibt kein Element mehr
         throw starcontainer::NoSuchElementException();
     return aRes;
 }
@@ -283,7 +283,7 @@ staruno::Any SAL_CALL OAnyEnumeration::nextElement(  )
 {
     if ( ! hasMoreElements())
         throw starcontainer::NoSuchElementException();
-
+    
     ::osl::ResettableMutexGuard aLock(m_aLock);
     sal_Int32 nPos = m_nPos;
     ++m_nPos;
@@ -291,7 +291,7 @@ staruno::Any SAL_CALL OAnyEnumeration::nextElement(  )
 }
 
 //.........................................................................
-}   // namespace comphelper
+}	// namespace comphelper
 //.........................................................................
 
 
diff --git a/comphelper/source/container/namecontainer.cxx b/comphelper/source/container/namecontainer.cxx
index 7239a8d573dc..1655e0a73be3 100644
--- a/comphelper/source/container/namecontainer.cxx
+++ b/comphelper/source/container/namecontainer.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
diff --git a/comphelper/source/eventattachermgr/eventattachermgr.cxx b/comphelper/source/eventattachermgr/eventattachermgr.cxx
index bf217f75c8db..c76166e7f610 100644
--- a/comphelper/source/eventattachermgr/eventattachermgr.cxx
+++ b/comphelper/source/eventattachermgr/eventattachermgr.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
@@ -30,7 +30,7 @@
 
 #include <deque>
 
-#if defined( OS2 ) || defined( UNX )
+#if defined( OS2 ) || defined( UNX ) 
 #include <wchar.h>
 #endif
 #include <osl/mutex.hxx>
@@ -75,9 +75,9 @@ namespace comphelper
 //-----------------------------------------------------------------------------
 struct AttachedObject_Impl
 {
-    Reference< XInterface >                 xTarget;
+    Reference< XInterface >					xTarget;
     Sequence< Reference< XEventListener > > aAttachedListenerSeq;
-    Any                                     aHelper;
+    Any             	         			aHelper;
 
     bool    operator<( const AttachedObject_Impl & ) const;
     bool    operator==( const AttachedObject_Impl & ) const;
@@ -130,14 +130,14 @@ class ImplEventAttacherManager
     ::std::deque< AttacherIndex_Impl >  aIndex;
     Mutex aLock;
     // Container fuer die ScriptListener
-    OInterfaceContainerHelper           aScriptListeners;
+    OInterfaceContainerHelper   		aScriptListeners;
     // EventAttacher-Instanz
-    Reference< XEventAttacher >         xAttacher;
-    Reference< XMultiServiceFactory >   mxSMgr;
-    Reference< XIdlReflection >         mxCoreReflection;
-    Reference< XIntrospection >         mxIntrospection;
-    Reference< XTypeConverter >         xConverter;
-    sal_Int16                           nVersion;
+    Reference< XEventAttacher >			xAttacher;
+    Reference< XMultiServiceFactory > 	mxSMgr;
+    Reference< XIdlReflection > 		mxCoreReflection;
+    Reference< XIntrospection > 		mxIntrospection;
+    Reference< XTypeConverter > 		xConverter;
+    sal_Int16							nVersion;
 public:
     ImplEventAttacherManager( const Reference< XIntrospection > & rIntrospection,
                               const Reference< XMultiServiceFactory > rSMgr );
@@ -173,7 +173,7 @@ public:
     virtual void SAL_CALL read(const Reference< XObjectInputStream >& InStream) throw( IOException, RuntimeException );
 
 private:
-    Reference< XIdlReflection > getReflection() throw( Exception );
+    Reference< XIdlReflection >	getReflection() throw( Exception );
 
     /** checks if <arg>_nIndex</arg> is a valid index, throws an <type>IllegalArgumentException</type> if not
     @param _nIndex
@@ -192,11 +192,11 @@ private:
 // nur einzelne Events an einen allgemeinen AllListener weiterleitet
 class AttacherAllListener_Impl : public WeakImplHelper1< XAllListener >
 {
-    ImplEventAttacherManager*           mpManager;
+    ImplEventAttacherManager*   		mpManager;
     Reference< XEventAttacherManager >  xManager;
-    OUString                            aScriptType;
-    OUString                            aScriptCode;
-    sal_Int16                           nVersion;
+    OUString        		           	aScriptType;
+    OUString    	        	        aScriptCode;
+    sal_Int16	                	   	nVersion;
 
     void convertToEventReturn( Any & rRet, const Type & rRetType )
         throw( CannotConvertException );
@@ -275,10 +275,10 @@ void AttacherAllListener_Impl::convertToEventReturn( Any & rRet, const Type & rR
             case TypeClass_FLOAT:           rRet <<= float(0);  break;
             case TypeClass_DOUBLE:          rRet <<= double(0.0);  break;
             case TypeClass_BYTE:            rRet <<= sal_uInt8(0);      break;
-            case TypeClass_SHORT:           rRet <<= sal_Int16( 0 );    break;
-            case TypeClass_LONG:            rRet <<= sal_Int32( 0 );    break;
-            case TypeClass_UNSIGNED_SHORT:  rRet <<= sal_uInt16( 0 );   break;
-            case TypeClass_UNSIGNED_LONG:   rRet <<= sal_uInt32( 0 );   break;
+            case TypeClass_SHORT:			rRet <<= sal_Int16( 0 );	break;
+            case TypeClass_LONG:			rRet <<= sal_Int32( 0 );	break;
+            case TypeClass_UNSIGNED_SHORT:	rRet <<= sal_uInt16( 0 );	break;
+            case TypeClass_UNSIGNED_LONG:	rRet <<= sal_uInt32( 0 );	break;
 
             default:
                 OSL_ASSERT(false);
@@ -351,13 +351,13 @@ Any SAL_CALL AttacherAllListener_Impl::approveFiring( const AllEventObject& Even
                     break;
 
                     // none zero number -> return
-                case TypeClass_FLOAT:           if( *((float*)aRet.getValue()) )    return aRet; break;
-                case TypeClass_DOUBLE:          if( *((double*)aRet.getValue()) )   return aRet; break;
-                case TypeClass_BYTE:            if( *((sal_uInt8*)aRet.getValue()) )    return aRet; break;
-                case TypeClass_SHORT:           if( *((sal_Int16*)aRet.getValue()) )    return aRet; break;
-                case TypeClass_LONG:            if( *((sal_Int32*)aRet.getValue()) )    return aRet; break;
-                case TypeClass_UNSIGNED_SHORT:  if( *((sal_uInt16*)aRet.getValue()) )   return aRet; break;
-                case TypeClass_UNSIGNED_LONG:   if( *((sal_uInt32*)aRet.getValue()) )   return aRet; break;
+                case TypeClass_FLOAT:           if( *((float*)aRet.getValue()) ) 	return aRet; break;
+                case TypeClass_DOUBLE:          if( *((double*)aRet.getValue()) )  	return aRet; break;
+                case TypeClass_BYTE:            if( *((sal_uInt8*)aRet.getValue()) )	return aRet; break;
+                case TypeClass_SHORT:           if( *((sal_Int16*)aRet.getValue()) )	return aRet; break;
+                case TypeClass_LONG:            if( *((sal_Int32*)aRet.getValue()) )   	return aRet; break;
+                case TypeClass_UNSIGNED_SHORT:  if( *((sal_uInt16*)aRet.getValue()) )  	return aRet; break;
+                case TypeClass_UNSIGNED_LONG:   if( *((sal_uInt32*)aRet.getValue()) )  	return aRet; break;
 
                 default:
                     OSL_ASSERT(false);
@@ -528,7 +528,7 @@ void SAL_CALL ImplEventAttacherManager::registerScriptEvent
     throw( IllegalArgumentException, RuntimeException )
 {
     Guard< Mutex > aGuard( aLock );
-
+    
     // Index pruefen und Array anpassen
     ::std::deque<AttacherIndex_Impl>::iterator aIt = implCheckIndex( nIndex );
 
@@ -638,12 +638,12 @@ void SAL_CALL ImplEventAttacherManager::revokeScriptEvent
     Sequence< ScriptEventDescriptor >& rEventList = (*aIt).aEventList;
 
             ScriptEventDescriptor* pEventList = rEventList.getArray();
-    const   ScriptEventDescriptor* pEventListEnd = pEventList + rEventList.getLength();
+    const	ScriptEventDescriptor* pEventListEnd = pEventList + rEventList.getLength();
     for( ; pEventList < pEventListEnd; ++pEventList )
     {
-        if  (   (aLstType               == pEventList->ListenerType )
-            &&  (EventMethod            == pEventList->EventMethod      )
-            &&  (ToRemoveListenerParam  == pEventList->AddListenerParam)
+        if	(	(aLstType				== pEventList->ListenerType	)
+            &&	(EventMethod            == pEventList->EventMethod		)
+            &&	(ToRemoveListenerParam  == pEventList->AddListenerParam)
             )
         {
             ScriptEventDescriptor* pMoveTo = pEventList;
diff --git a/comphelper/source/inc/comphelper_module.hxx b/comphelper/source/inc/comphelper_module.hxx
index ea2fc7eeb4eb..b35a034134c5 100644
--- a/comphelper/source/inc/comphelper_module.hxx
+++ b/comphelper/source/inc/comphelper_module.hxx
@@ -1,6 +1,6 @@
 /*************************************************************************
  * 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
diff --git a/comphelper/source/misc/SelectionMultiplex.cxx b/comphelper/source/misc/SelectionMultiplex.cxx
index d61dee3f29f0..c57bd7ac6ced 100644
--- a/comphelper/source/misc/SelectionMultiplex.cxx
+++ b/comphelper/source/misc/SelectionMultiplex.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
@@ -150,7 +150,7 @@ void SAL_CALL OSelectionChangeMultiplexer::disposing( const  EventObject& _rSour
         if (!locked())
             m_pListener->_disposing(_rSource);
         // disconnect the listener
-        if (m_pListener)    // may have been reset whilest calling into _disposing
+        if (m_pListener)	// may have been reset whilest calling into _disposing
             m_pListener->setAdapter(NULL);
     }
 
diff --git a/comphelper/source/misc/accessiblecomponenthelper.cxx b/comphelper/source/misc/accessiblecomponenthelper.cxx
index 5fb86f3f7b1d..a8877bb0aba0 100644
--- a/comphelper/source/misc/accessiblecomponenthelper.cxx
+++ b/comphelper/source/misc/accessiblecomponenthelper.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
@@ -66,10 +66,10 @@ namespace comphelper
     {
         OExternalLockGuard aGuard( this );
         Rectangle aBounds( implGetBounds() );
-        return  ( _rPoint.X >= 0 )
-            &&  ( _rPoint.Y >= 0 )
-            &&  ( _rPoint.X < aBounds.Width )
-            &&  ( _rPoint.Y < aBounds.Height );
+        return	( _rPoint.X >= 0 )
+            &&	( _rPoint.Y >= 0 )
+            &&	( _rPoint.X < aBounds.Width )
+            &&	( _rPoint.Y < aBounds.Height );
     }
 
     //--------------------------------------------------------------------
@@ -215,7 +215,7 @@ namespace comphelper
     }
 
 //.........................................................................
-}   // namespace comphelper
+}	// namespace comphelper
 //.........................................................................
 
 
diff --git a/comphelper/source/misc/accessiblecontexthelper.cxx b/comphelper/source/misc/accessiblecontexthelper.cxx
index 2e0281848e8c..893fb5d1f119 100644
--- a/comphelper/source/misc/accessiblecontexthelper.cxx
+++ b/comphelper/source/misc/accessiblecontexthelper.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
@@ -52,24 +52,24 @@ namespace comphelper
     class OContextHelper_Impl
     {
     private:
-        OAccessibleContextHelper*           m_pAntiImpl;        // the owning instance
-        IMutex*                             m_pExternalLock;    // the optional additional external lock
+        OAccessibleContextHelper*			m_pAntiImpl;		// the owning instance
+        IMutex*								m_pExternalLock;	// the optional additional external lock
 
-        ::cppu::OInterfaceContainerHelper*  m_pEventListeners;
-        WeakReference< XAccessible >        m_aCreator;         // the XAccessible which created our XAccessibleContext
+        ::cppu::OInterfaceContainerHelper*	m_pEventListeners;
+        WeakReference< XAccessible >		m_aCreator;			// the XAccessible which created our XAccessibleContext
 
-        AccessibleEventNotifier::TClientId  m_nClientId;
+        AccessibleEventNotifier::TClientId	m_nClientId;
 
     public:
-        inline  Reference< XAccessible >    getCreator( ) const                 { return m_aCreator; }
-        inline  void                        setCreator( const Reference< XAccessible >& _rAcc );
+        inline	Reference< XAccessible >	getCreator( ) const					{ return m_aCreator; }
+        inline	void						setCreator( const Reference< XAccessible >& _rAcc );
 
-        inline  IMutex*                     getExternalLock( )                  { return m_pExternalLock; }
-        inline  void                        setExternalLock( IMutex* _pLock )   { m_pExternalLock = _pLock; }
+        inline	IMutex*						getExternalLock( )					{ return m_pExternalLock; }
+        inline	void						setExternalLock( IMutex* _pLock )	{ m_pExternalLock = _pLock; }
 
-        inline  AccessibleEventNotifier::TClientId
-                                            getClientId() const                 { return m_nClientId; }
-        inline  void                        setClientId( const AccessibleEventNotifier::TClientId _nId )
+        inline	AccessibleEventNotifier::TClientId
+                                            getClientId() const					{ return m_nClientId; }
+        inline	void						setClientId( const AccessibleEventNotifier::TClientId _nId )
                                                                                 { m_nClientId = _nId; }
 
     public:
@@ -83,7 +83,7 @@ namespace comphelper
     };
 
     //---------------------------------------------------------------------
-    inline  void OContextHelper_Impl::setCreator( const Reference< XAccessible >& _rAcc )
+    inline	void OContextHelper_Impl::setCreator( const Reference< XAccessible >& _rAcc )
     {
         m_aCreator = _rAcc;
     }
@@ -288,7 +288,7 @@ namespace comphelper
 
         try
         {
-
+            
             Reference< XAccessibleContext > xParentContext( implGetParentContext() );
 
             //  iterate over parent's children and search for this object
@@ -301,7 +301,7 @@ namespace comphelper
                     // two ideas why this could be NULL:
                     // * nobody called our late ctor (init), so we never had a creator at all -> bad
                     // * the creator is already dead. In this case, we should have been disposed, and
-                    //   never survived the above OContextEntryGuard.
+                    //	 never survived the above OContextEntryGuard.
                     // in all other situations the creator should be non-NULL
 
                 if ( xCreator.is() )
@@ -350,7 +350,7 @@ namespace comphelper
     }
 
 //.........................................................................
-}   // namespace comphelper
+}	// namespace comphelper
 //.........................................................................
 
 
diff --git a/comphelper/source/misc/accessibleeventbuffer.cxx b/comphelper/source/misc/accessibleeventbuffer.cxx
index 50c61d59b9e6..b19a06f82eea 100644
--- a/comphelper/source/misc/accessibleeventbuffer.cxx
+++ b/comphelper/source/misc/accessibleeventbuffer.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
diff --git a/comphelper/source/misc/accessibleeventnotifier.cxx b/comphelper/source/misc/accessibleeventnotifier.cxx
index 421fb9868d73..2f7c840b84b6 100644
--- a/comphelper/source/misc/accessibleeventnotifier.cxx
+++ b/comphelper/source/misc/accessibleeventnotifier.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
@@ -41,12 +41,12 @@ using namespace ::comphelper;
 //= AccessibleEventNotifier
 //=====================================================================
 //---------------------------------------------------------------------
-namespace
+namespace 
 {
-    struct lclMutex
+    struct lclMutex 
         : public rtl::Static< ::osl::Mutex, lclMutex > {};
-    struct Clients
-        : public rtl::Static< AccessibleEventNotifier::ClientMap, Clients > {};
+    struct Clients 
+        : public rtl::Static< AccessibleEventNotifier::ClientMap, Clients > {}; 
 }
 
 //.........................................................................
@@ -65,7 +65,7 @@ namespace comphelper
         // Note that the following relies on the fact the elements in the map are traveled with
         // ascending keys (aka client ids)
         AccessibleEventNotifier::ClientMap &rClients = Clients::get();
-        for (   ClientMap::const_iterator aLookup = rClients.begin();
+        for	(	ClientMap::const_iterator aLookup = rClients.begin();
                 aLookup != rClients.end();
                 ++aLookup
             )
@@ -74,7 +74,7 @@ namespace comphelper
             OSL_ENSURE( nCurrent > nBiggestUsedId, "AccessibleEventNotifier::generateId: map is expected to be sorted ascending!" );
 
             if ( nCurrent - nBiggestUsedId > 1 )
-            {   // found a "gap"
+            {	// found a "gap"
                 nFreeId = nBiggestUsedId + 1;
                 break;
             }
@@ -254,6 +254,6 @@ namespace comphelper
     }
 
 //.........................................................................
-}   // namespace comphelper
+}	// namespace comphelper
 //.........................................................................
 
diff --git a/comphelper/source/misc/accessiblekeybindinghelper.cxx b/comphelper/source/misc/accessiblekeybindinghelper.cxx
index d3c22071bfd8..0cbdd8e849a2 100644
--- a/comphelper/source/misc/accessiblekeybindinghelper.cxx
+++ b/comphelper/source/misc/accessiblekeybindinghelper.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
@@ -51,7 +51,7 @@ namespace comphelper
     }
 
     // -----------------------------------------------------------------------------
-
+        
     OAccessibleKeyBindingHelper::OAccessibleKeyBindingHelper( const OAccessibleKeyBindingHelper& rHelper )
         : cppu::WeakImplHelper1<XAccessibleKeyBinding>( rHelper )
         , m_aKeyBindings( rHelper.m_aKeyBindings )
@@ -110,5 +110,5 @@ namespace comphelper
     // -----------------------------------------------------------------------------
 
 //..............................................................................
-}   // namespace comphelper
+}	// namespace comphelper
 //..............................................................................
diff --git a/comphelper/source/misc/accessibleselectionhelper.cxx b/comphelper/source/misc/accessibleselectionhelper.cxx
index 8e31410b337e..0fe9dd004e0f 100644
--- a/comphelper/source/misc/accessibleselectionhelper.cxx
+++ b/comphelper/source/misc/accessibleselectionhelper.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
@@ -187,6 +187,6 @@ namespace comphelper
     }
 
 //.........................................................................
-}   // namespace comphelper
+}	// namespace comphelper
 //.........................................................................
 
diff --git a/comphelper/source/misc/accessibletexthelper.cxx b/comphelper/source/misc/accessibletexthelper.cxx
index e3247cae5b60..a2ede8368eaf 100644
--- a/comphelper/source/misc/accessibletexthelper.cxx
+++ b/comphelper/source/misc/accessibletexthelper.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
@@ -167,7 +167,7 @@ namespace comphelper
                 rBoundary = xBreakIter->getWordBoundary( sText, nIndex, implGetLocale(), i18n::WordType::ANY_WORD, sal_True );
 
                 // it's a word, if the first character is an alpha-numeric character
-                Reference< i18n::XCharacterClassification > xCharClass = implGetCharacterClassification();
+                Reference< i18n::XCharacterClassification >	xCharClass = implGetCharacterClassification();
                 if ( xCharClass.is() )
                 {
                     sal_Int32 nType = xCharClass->getCharacterType( sText, rBoundary.startPos, implGetLocale() );
@@ -194,7 +194,7 @@ namespace comphelper
         if ( implIsValidIndex( nIndex, sText.getLength() ) )
         {
             Locale aLocale = implGetLocale();
-            Reference < i18n::XBreakIterator > xBreakIter = implGetBreakIterator();
+            Reference < i18n::XBreakIterator > xBreakIter = implGetBreakIterator();		
             if ( xBreakIter.is() )
             {
                 rBoundary.endPos = xBreakIter->endOfSentence( sText, nIndex, aLocale );
@@ -242,7 +242,7 @@ namespace comphelper
         sal_Int32 nLength = sText.getLength();
 
         if ( implIsValidIndex( nIndex, nLength ) || nIndex == nLength )
-        {
+        {		
             rBoundary.startPos = 0;
             rBoundary.endPos = nLength;
         }
@@ -379,7 +379,7 @@ namespace comphelper
             }
             break;
             case AccessibleTextType::WORD:
-            {
+            {	
                 // get word at index
                 sal_Bool bWord = implGetWordBoundary( aBoundary, nIndex );
                 if ( bWord && implIsValidBoundary( aBoundary, nLength ) )
@@ -610,7 +610,7 @@ namespace comphelper
                         aResult.SegmentStart = aBoundary.startPos;
                         aResult.SegmentEnd = aBoundary.endPos;
                     }
-                }
+                }							
             }
             break;
             case AccessibleTextType::WORD:
@@ -700,37 +700,37 @@ namespace comphelper
 
     // -----------------------------------------------------------------------------
     bool OCommonAccessibleText::implInitTextChangedEvent(
-        const rtl::OUString& rOldString,
-        const rtl::OUString& rNewString,
+        const rtl::OUString& rOldString, 
+        const rtl::OUString& rNewString, 		
         ::com::sun::star::uno::Any& rDeleted,
         ::com::sun::star::uno::Any& rInserted) // throw()
     {
         sal_uInt32 nLenOld = rOldString.getLength();
         sal_uInt32 nLenNew = rNewString.getLength();
-
+                
         // equal
         if ((0 == nLenOld) && (0 == nLenNew))
             return false;
 
         TextSegment aDeletedText;
-        TextSegment aInsertedText;
-
+        TextSegment aInsertedText;                                
+        
         aDeletedText.SegmentStart = -1;
-        aDeletedText.SegmentEnd = -1;
+        aDeletedText.SegmentEnd = -1;        
         aInsertedText.SegmentStart = -1;
         aInsertedText.SegmentEnd = -1;
-
-        // insert only
+        
+        // insert only        
         if ((0 == nLenOld) && (nLenNew > 0))
         {
             aInsertedText.SegmentStart = 0;
             aInsertedText.SegmentEnd = nLenNew;
             aInsertedText.SegmentText = rNewString.copy( aInsertedText.SegmentStart, aInsertedText.SegmentEnd - aInsertedText.SegmentStart );
 
-            rInserted <<= aInsertedText;
+            rInserted <<= aInsertedText;            
             return true;
         }
-
+            
         // delete only
         if ((nLenOld > 0) && (0 == nLenNew))
         {
@@ -738,28 +738,28 @@ namespace comphelper
             aDeletedText.SegmentEnd = nLenOld;
             aDeletedText.SegmentText = rOldString.copy( aDeletedText.SegmentStart, aDeletedText.SegmentEnd - aDeletedText.SegmentStart );
 
-            rDeleted <<= aDeletedText;
+            rDeleted <<= aDeletedText;            
             return true;
         }
-
+        
         const sal_Unicode* pFirstDiffOld = rOldString.getStr();
-        const sal_Unicode* pLastDiffOld  = rOldString.getStr() + nLenOld;
+        const sal_Unicode* pLastDiffOld  = rOldString.getStr() + nLenOld;    
         const sal_Unicode* pFirstDiffNew = rNewString.getStr();
         const sal_Unicode* pLastDiffNew  = rNewString.getStr() + nLenNew;
-
+        
         // find first difference
-        while ((*pFirstDiffOld == *pFirstDiffNew) &&
-               (pFirstDiffOld  <  pLastDiffOld) &&
+        while ((*pFirstDiffOld == *pFirstDiffNew) && 
+               (pFirstDiffOld  <  pLastDiffOld) && 
                (pFirstDiffNew  <  pLastDiffNew))
         {
             pFirstDiffOld++;
-            pFirstDiffNew++;
-        }
-
+            pFirstDiffNew++;        
+        }    
+        
         // equality test
         if ((0 == *pFirstDiffOld) && (0 == *pFirstDiffNew))
             return false;
-
+        
         // find last difference
         while ( ( pLastDiffOld > pFirstDiffOld) &&
                 ( pLastDiffNew > pFirstDiffNew) &&
@@ -768,27 +768,27 @@ namespace comphelper
             pLastDiffOld--;
             pLastDiffNew--;
         }
-
+                
         if (pFirstDiffOld < pLastDiffOld)
-        {
-            aDeletedText.SegmentStart = pFirstDiffOld - rOldString.getStr();
+        {        
+            aDeletedText.SegmentStart = pFirstDiffOld - rOldString.getStr(); 
             aDeletedText.SegmentEnd = pLastDiffOld  - rOldString.getStr();
-            aDeletedText.SegmentText = rOldString.copy( aDeletedText.SegmentStart, aDeletedText.SegmentEnd - aDeletedText.SegmentStart );
-
+            aDeletedText.SegmentText = rOldString.copy( aDeletedText.SegmentStart, aDeletedText.SegmentEnd - aDeletedText.SegmentStart );            
+            
             rDeleted <<= aDeletedText;
         }
-
+        
         if (pFirstDiffNew < pLastDiffNew)
         {
             aInsertedText.SegmentStart = pFirstDiffNew - rNewString.getStr();
             aInsertedText.SegmentEnd = pLastDiffNew  - rNewString.getStr();
             aInsertedText.SegmentText = rNewString.copy( aInsertedText.SegmentStart, aInsertedText.SegmentEnd - aInsertedText.SegmentStart );
-
+            
             rInserted <<= aInsertedText;
         }
         return true;
     }
-
+                    
     //==============================================================================
     // OAccessibleTextHelper
     //==============================================================================
@@ -823,8 +823,8 @@ namespace comphelper
     sal_Unicode OAccessibleTextHelper::getCharacter( sal_Int32 nIndex ) throw (IndexOutOfBoundsException, RuntimeException)
     {
         OExternalLockGuard aGuard( this );
-
-        return OCommonAccessibleText::getCharacter( nIndex );
+        
+        return OCommonAccessibleText::getCharacter( nIndex );		
     }
 
     // -----------------------------------------------------------------------------
@@ -832,8 +832,8 @@ namespace comphelper
     sal_Int32 OAccessibleTextHelper::getCharacterCount() throw (RuntimeException)
     {
         OExternalLockGuard aGuard( this );
-
-        return OCommonAccessibleText::getCharacterCount();
+        
+        return OCommonAccessibleText::getCharacterCount();		
     }
 
     // -----------------------------------------------------------------------------
@@ -841,8 +841,8 @@ namespace comphelper
     ::rtl::OUString OAccessibleTextHelper::getSelectedText() throw (RuntimeException)
     {
         OExternalLockGuard aGuard( this );
-
-        return OCommonAccessibleText::getSelectedText();
+        
+        return OCommonAccessibleText::getSelectedText();				
     }
 
     // -----------------------------------------------------------------------------
@@ -850,7 +850,7 @@ namespace comphelper
     sal_Int32 OAccessibleTextHelper::getSelectionStart() throw (RuntimeException)
     {
         OExternalLockGuard aGuard( this );
-
+        
         return OCommonAccessibleText::getSelectionStart();
     }
 
@@ -859,8 +859,8 @@ namespace comphelper
     sal_Int32 OAccessibleTextHelper::getSelectionEnd() throw (RuntimeException)
     {
         OExternalLockGuard aGuard( this );
-
-        return OCommonAccessibleText::getSelectionEnd();
+        
+        return OCommonAccessibleText::getSelectionEnd();	
     }
 
     // -----------------------------------------------------------------------------
@@ -868,7 +868,7 @@ namespace comphelper
     ::rtl::OUString OAccessibleTextHelper::getText() throw (RuntimeException)
     {
         OExternalLockGuard aGuard( this );
-
+        
         return OCommonAccessibleText::getText();
     }
 
@@ -877,8 +877,8 @@ namespace comphelper
     ::rtl::OUString OAccessibleTextHelper::getTextRange( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (IndexOutOfBoundsException, RuntimeException)
     {
         OExternalLockGuard aGuard( this );
-
-        return OCommonAccessibleText::getTextRange( nStartIndex, nEndIndex );
+        
+        return OCommonAccessibleText::getTextRange( nStartIndex, nEndIndex );		
     }
 
     // -----------------------------------------------------------------------------
@@ -886,7 +886,7 @@ namespace comphelper
     TextSegment OAccessibleTextHelper::getTextAtIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (IndexOutOfBoundsException, IllegalArgumentException, RuntimeException)
     {
         OExternalLockGuard aGuard( this );
-
+        
         return OCommonAccessibleText::getTextAtIndex( nIndex, aTextType );
     }
 
@@ -895,7 +895,7 @@ namespace comphelper
     TextSegment OAccessibleTextHelper::getTextBeforeIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (IndexOutOfBoundsException, IllegalArgumentException, RuntimeException)
     {
         OExternalLockGuard aGuard( this );
-
+        
         return OCommonAccessibleText::getTextBeforeIndex( nIndex, aTextType );
     }
 
@@ -904,12 +904,12 @@ namespace comphelper
     TextSegment OAccessibleTextHelper::getTextBehindIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (IndexOutOfBoundsException, IllegalArgumentException, RuntimeException)
     {
         OExternalLockGuard aGuard( this );
-
+        
         return OCommonAccessibleText::getTextBehindIndex( nIndex, aTextType );
     }
 
     // -----------------------------------------------------------------------------
 
 //..............................................................................
-}   // namespace comphelper
+}	// namespace comphelper
 //..............................................................................
diff --git a/comphelper/source/misc/accessiblewrapper.cxx b/comphelper/source/misc/accessiblewrapper.cxx
index 0ed694856b97..83368e401f85 100644
--- a/comphelper/source/misc/accessiblewrapper.cxx
+++ b/comphelper/source/misc/accessiblewrapper.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
@@ -34,10 +34,10 @@
 
 #include <algorithm>
 
-using namespace ::comphelper;
-using namespace ::com::sun::star::accessibility;
-using namespace ::com::sun::star::uno;
-using namespace ::com::sun::star::lang;
+using namespace	::comphelper;
+using namespace	::com::sun::star::accessibility;
+using namespace	::com::sun::star::uno;
+using namespace	::com::sun::star::lang;
 
 //.............................................................................
 namespace comphelper
@@ -52,7 +52,7 @@ namespace comphelper
             : public ::std::unary_function< AccessibleMap::value_type, void >
     {
     private:
-        Reference< XEventListener > m_xListener;
+        Reference< XEventListener >	m_xListener;
 
     public:
         RemoveEventListener( const Reference< XEventListener >& _rxListener )
@@ -112,7 +112,7 @@ namespace comphelper
     {
         AccessibleMap::iterator aRemovedPos = m_aChildrenMap.find( _rxKey );
         if ( m_aChildrenMap.end() != aRemovedPos )
-        {   // it was cached
+        {	// it was cached
             // remove ourself as event listener
             RemoveEventListener aOperator( this );
             aOperator( *aRemovedPos );
@@ -133,7 +133,7 @@ namespace comphelper
 
     //-------------------------------------------------------------------------
     Reference< XAccessible > OWrappedAccessibleChildrenManager::getAccessibleWrapperFor(
-        const Reference< XAccessible >& _rxKey, sal_Bool _bCreate )
+        const Reference< XAccessible >& _rxKey,	sal_Bool _bCreate )
     {
         Reference< XAccessible > xValue;
 
@@ -150,7 +150,7 @@ namespace comphelper
             xValue = aPos->second;
         }
         else if ( _bCreate )
-        {   // not found in the cache, and allowed to create
+        {	// not found in the cache, and allowed to create
             // -> new wrapper
             xValue = new OAccessibleWrapper( m_xORB, _rxKey, (Reference< XAccessible >)m_aOwningAccessible );
 
@@ -258,7 +258,7 @@ namespace comphelper
     void OWrappedAccessibleChildrenManager::handleChildNotification( const AccessibleEventObject& _rEvent )
     {
         if ( AccessibleEventId::INVALIDATE_ALL_CHILDREN == _rEvent.EventId )
-        {   // clear our child map
+        {	// clear our child map
             invalidateAll( );
         }
         else if ( AccessibleEventId::CHILD == _rEvent.EventId )
@@ -325,7 +325,7 @@ namespace comphelper
     {
         if ( !m_rBHelper.bDisposed )
         {
-            acquire();  // to prevent duplicate dtor calls
+            acquire();	// to prevent duplicate dtor calls
             dispose();
         }
     }
@@ -679,5 +679,5 @@ namespace comphelper
     }
 
 //.............................................................................
-}   // namespace accessibility
+}	// namespace accessibility
 //.............................................................................
diff --git a/comphelper/source/misc/accimplaccess.cxx b/comphelper/source/misc/accimplaccess.cxx
index e792b9fe43c1..dba945c2d4d2 100644
--- a/comphelper/source/misc/accimplaccess.cxx
+++ b/comphelper/source/misc/accimplaccess.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
@@ -39,7 +39,7 @@ namespace comphelper
 {
 //.........................................................................
 
-#define BITFIELDSIZE    ( sizeof( sal_Int64 ) * 8 )
+#define BITFIELDSIZE	( sizeof( sal_Int64 ) * 8 )
     // maximum number of bits we have in a sal_Int64
 
     using ::com::sun::star::uno::Reference;
@@ -56,17 +56,17 @@ namespace comphelper
     //=====================================================================
     struct OAccImpl_Impl
     {
-        Reference< XAccessible >    m_xAccParent;
-        sal_Int64                   m_nForeignControlledStates;
+        Reference< XAccessible >	m_xAccParent;
+        sal_Int64					m_nForeignControlledStates;
     };
-
+    
 
     //=====================================================================
     //= OAccessibleImplementationAccess
     //=====================================================================
     //---------------------------------------------------------------------
     OAccessibleImplementationAccess::OAccessibleImplementationAccess( )
-        :m_pImpl( new OAccImpl_Impl )
+        :m_pImpl( new OAccImpl_Impl	)
     {
     }
 
@@ -110,7 +110,7 @@ namespace comphelper
 
     //---------------------------------------------------------------------
     sal_Bool OAccessibleImplementationAccess::setForeignControlledState( const Reference< XAccessibleContext >& _rxComponent, const sal_Int16 _nState,
-        const sal_Bool  _bSet )
+        const sal_Bool	_bSet )
     {
         OAccessibleImplementationAccess* pImplementation = getImplementation( _rxComponent );
 
@@ -142,8 +142,8 @@ namespace comphelper
     {
         sal_Int64 nReturn( 0 );
 
-        if  (   ( _rIdentifier.getLength() == 16 )
-            &&  ( 0 == rtl_compareMemory( getUnoTunnelImplementationId().getConstArray(), _rIdentifier.getConstArray(), 16 ) )
+        if	(	( _rIdentifier.getLength() == 16 )
+            &&	( 0 == rtl_compareMemory( getUnoTunnelImplementationId().getConstArray(), _rIdentifier.getConstArray(), 16 ) )
             )
             nReturn = reinterpret_cast< sal_Int64 >( this );
 
@@ -183,7 +183,7 @@ namespace comphelper
     }
 
 //.........................................................................
-}   // namespace comphelper
+}	// namespace comphelper
 //.........................................................................
 
 
diff --git a/comphelper/source/misc/anytostring.cxx b/comphelper/source/misc/anytostring.cxx
index 01f282172f18..5363f6f2ea80 100644
--- a/comphelper/source/misc/anytostring.cxx
+++ b/comphelper/source/misc/anytostring.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
@@ -83,7 +83,7 @@ void appendValue( rtl::OUStringBuffer & buf,
         buf.append( rtl::OUString::unacquired( &typeRef->pTypeName ) );
         buf.appendAscii( RTL_CONSTASCII_STRINGPARAM(") ") );
     }
-
+    
     switch (typeRef->eTypeClass) {
     case typelib_TypeClass_INTERFACE: {
         buf.append( static_cast<sal_Unicode>('@') );
@@ -113,7 +113,7 @@ void appendValue( rtl::OUStringBuffer & buf,
                 reinterpret_cast< typelib_CompoundTypeDescription * >(
                     typeDescr );
             sal_Int32 nDescr = compType->nMembers;
-
+            
             if (compType->pBaseTypeDescription) {
                 appendValue(
                     buf, val, reinterpret_cast<
@@ -122,12 +122,12 @@ void appendValue( rtl::OUStringBuffer & buf,
                 if (nDescr > 0)
                     buf.appendAscii( RTL_CONSTASCII_STRINGPARAM(", ") );
             }
-
+            
             typelib_TypeDescriptionReference ** ppTypeRefs =
                 compType->ppTypeRefs;
             sal_Int32 * memberOffsets = compType->pMemberOffsets;
             rtl_uString ** ppMemberNames = compType->ppMemberNames;
-
+            
             for ( sal_Int32 nPos = 0; nPos < nDescr; ++nPos )
             {
                 buf.append( ppMemberNames[ nPos ] );
@@ -175,7 +175,7 @@ void appendValue( rtl::OUStringBuffer & buf,
                 uno_Sequence * seq =
                     *static_cast< uno_Sequence * const * >(val);
                 sal_Int32 nElements = seq->nElements;
-
+                
                 if (nElements > 0)
                 {
                     buf.appendAscii( RTL_CONSTASCII_STRINGPARAM("{ ") );
diff --git a/comphelper/source/misc/asyncnotification.cxx b/comphelper/source/misc/asyncnotification.cxx
index e8bee632a9b4..6a4e254e71e8 100644
--- a/comphelper/source/misc/asyncnotification.cxx
+++ b/comphelper/source/misc/asyncnotification.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
diff --git a/comphelper/source/misc/comphelper_module.cxx b/comphelper/source/misc/comphelper_module.cxx
index 5f423691592a..0b6b6390e8fd 100644
--- a/comphelper/source/misc/comphelper_module.cxx
+++ b/comphelper/source/misc/comphelper_module.cxx
@@ -1,6 +1,6 @@
 /*************************************************************************
  * 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
diff --git a/comphelper/source/misc/comphelper_services.cxx b/comphelper/source/misc/comphelper_services.cxx
index b46dcea68ba7..ffbe512e086c 100644
--- a/comphelper/source/misc/comphelper_services.cxx
+++ b/comphelper/source/misc/comphelper_services.cxx
@@ -1,6 +1,6 @@
 /*************************************************************************
  * 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
diff --git a/comphelper/source/misc/componentbase.cxx b/comphelper/source/misc/componentbase.cxx
index 657c2c6a5972..ca755a34f98f 100644
--- a/comphelper/source/misc/componentbase.cxx
+++ b/comphelper/source/misc/componentbase.cxx
@@ -1,6 +1,6 @@
 /*************************************************************************
  * 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
diff --git a/comphelper/source/misc/componentcontext.cxx b/comphelper/source/misc/componentcontext.cxx
index 0f9ddad5d2f5..b927f2332d87 100644
--- a/comphelper/source/misc/componentcontext.cxx
+++ b/comphelper/source/misc/componentcontext.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
diff --git a/comphelper/source/misc/componentmodule.cxx b/comphelper/source/misc/componentmodule.cxx
index 63893d0f6d0d..c232ebba4749 100644
--- a/comphelper/source/misc/componentmodule.cxx
+++ b/comphelper/source/misc/componentmodule.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
diff --git a/comphelper/source/misc/configurationhelper.cxx b/comphelper/source/misc/configurationhelper.cxx
index b78d39217d90..dbe5553c33df 100644
--- a/comphelper/source/misc/configurationhelper.cxx
+++ b/comphelper/source/misc/configurationhelper.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
diff --git a/comphelper/source/misc/docpasswordhelper.cxx b/comphelper/source/misc/docpasswordhelper.cxx
index 37941352ae28..38cf1443c165 100644
--- a/comphelper/source/misc/docpasswordhelper.cxx
+++ b/comphelper/source/misc/docpasswordhelper.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
@@ -56,7 +56,7 @@ namespace comphelper {
 static uno::Sequence< sal_Int8 > GeneratePBKDF2Hash( const ::rtl::OUString& aPassword, const uno::Sequence< sal_Int8 >& aSalt, sal_Int32 nCount, sal_Int32 nHashLength )
 {
     uno::Sequence< sal_Int8 > aResult;
-
+    
     if ( aPassword.getLength() && aSalt.getLength() && nCount && nHashLength )
     {
         ::rtl::OString aBytePass = ::rtl::OUStringToOString( aPassword, RTL_TEXTENCODING_UTF8 );
@@ -90,7 +90,7 @@ uno::Sequence< beans::PropertyValue > DocPasswordHelper::GenerateNewModifyPasswo
     TimeValue aTime;
     osl_getSystemTime( &aTime );
     rtlRandomPool aRandomPool = rtl_random_createPool ();
-    rtl_random_addBytes ( aRandomPool, &aTime, 8 );
+    rtl_random_addBytes ( aRandomPool, &aTime, 8 ); 
 
     rtl_random_getBytes ( aRandomPool, aSalt.getArray(), 16 );
 
@@ -156,9 +156,9 @@ sal_Bool DocPasswordHelper::IsModifyPasswordCorrect( const ::rtl::OUString& aPas
 sal_uInt32 DocPasswordHelper::GetWordHashAsUINT32(
                 const ::rtl::OUString& aUString )
 {
-    static sal_uInt16 pInitialCode[] = {
+    static sal_uInt16 pInitialCode[] = { 
         0xE1F0, // 1
-        0x1D0F, // 2
+        0x1D0F, // 2 
         0xCC9C, // 3
         0x84C0, // 4
         0x110C, // 5
@@ -242,7 +242,7 @@ Sequence< sal_Int8 > DocPasswordHelper::GetWordHashAsSequence(
 
     return aResult;
 }
-
+ 
 // ============================================================================
 sal_uInt16 DocPasswordHelper::GetXLHashAsUINT16(
                 const ::rtl::OUString& aUString,
@@ -280,7 +280,7 @@ Sequence< sal_Int8 > DocPasswordHelper::GetXLHashAsSequence(
 
     return aResult;
 }
-
+ 
 // ============================================================================
 
 /*static*/ OUString DocPasswordHelper::requestAndVerifyDocPassword(
diff --git a/comphelper/source/misc/docpasswordrequest.cxx b/comphelper/source/misc/docpasswordrequest.cxx
index 17cdb0ae2d92..8c51876346f3 100644
--- a/comphelper/source/misc/docpasswordrequest.cxx
+++ b/comphelper/source/misc/docpasswordrequest.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
@@ -141,7 +141,7 @@ DocPasswordRequest::~DocPasswordRequest()
             static_cast< XWeak* > ( this ),
             // my own interfaces
             static_cast< XInteractionRequest*  > ( this ) );
-}
+}    
 
 void SAL_CALL DocPasswordRequest::acquire(  ) throw ()
 {
@@ -151,7 +151,7 @@ void SAL_CALL DocPasswordRequest::acquire(  ) throw ()
 void SAL_CALL DocPasswordRequest::release(  ) throw ()
 {
     OWeakObject::release();
-}
+}    
 
 sal_Bool DocPasswordRequest::isAbort() const
 {
diff --git a/comphelper/source/misc/documentinfo.cxx b/comphelper/source/misc/documentinfo.cxx
index aee3a8e005a6..971bb4d85a90 100644
--- a/comphelper/source/misc/documentinfo.cxx
+++ b/comphelper/source/misc/documentinfo.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
@@ -165,7 +165,7 @@ namespace comphelper {
 
             // 5.
             // <-- #i88104# (05-16-08) TKR: use the new XTitle Interface to get the Title -->
-
+                
             Reference< XTitle > xTitle( _rxDocument, UNO_QUERY );
             if ( xTitle.is() )
             {
diff --git a/comphelper/source/misc/documentiologring.cxx b/comphelper/source/misc/documentiologring.cxx
index 5f07f8058fb3..ea5febac0e92 100644
--- a/comphelper/source/misc/documentiologring.cxx
+++ b/comphelper/source/misc/documentiologring.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
diff --git a/comphelper/source/misc/documentiologring.hxx b/comphelper/source/misc/documentiologring.hxx
index f9626ffe5d62..d6563b882167 100644
--- a/comphelper/source/misc/documentiologring.hxx
+++ b/comphelper/source/misc/documentiologring.hxx
@@ -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
diff --git a/comphelper/source/misc/evtlistenerhlp.cxx b/comphelper/source/misc/evtlistenerhlp.cxx
index 6511b9a9ecf7..77ff9684d15e 100644
--- a/comphelper/source/misc/evtlistenerhlp.cxx
+++ b/comphelper/source/misc/evtlistenerhlp.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
diff --git a/comphelper/source/misc/evtmethodhelper.cxx b/comphelper/source/misc/evtmethodhelper.cxx
index e91adee3912b..57edc312b0d3 100755
--- a/comphelper/source/misc/evtmethodhelper.cxx
+++ b/comphelper/source/misc/evtmethodhelper.cxx
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2008 by Sun Microsystems, Inc.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -43,10 +43,10 @@ namespace comphelper
     {
         typelib_InterfaceTypeDescription *pType=0;
         type.getDescription( (typelib_TypeDescription**)&pType);
-
+    
         if(!pType)
             return Sequence< ::rtl::OUString>();
-
+        
         Sequence< ::rtl::OUString> aNames(pType->nMembers);
         ::rtl::OUString* pNames = aNames.getArray();
         for(sal_Int32 i=0;i<pType->nMembers;i++,++pNames)
diff --git a/comphelper/source/misc/ihwrapnofilter.cxx b/comphelper/source/misc/ihwrapnofilter.cxx
index 1cbd1f09f4c6..f1d350ec051c 100644
--- a/comphelper/source/misc/ihwrapnofilter.cxx
+++ b/comphelper/source/misc/ihwrapnofilter.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
diff --git a/comphelper/source/misc/instancelocker.cxx b/comphelper/source/misc/instancelocker.cxx
index c147217f1e7f..f8ae4d5016f6 100644
--- a/comphelper/source/misc/instancelocker.cxx
+++ b/comphelper/source/misc/instancelocker.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
@@ -139,7 +139,7 @@ void SAL_CALL OInstanceLocker::initialize( const uno::Sequence< uno::Any >& aArg
 
     if ( m_bDisposed )
         throw lang::DisposedException(); // TODO
-
+    
     if ( !m_refCount )
         throw uno::RuntimeException(); // the object must be refcounted already!
 
@@ -166,7 +166,7 @@ void SAL_CALL OInstanceLocker::initialize( const uno::Sequence< uno::Any >& aArg
             !( aArguments[1] >>= nModes ) ||
             (
               !( nModes & embed::Actions::PREVENT_CLOSE ) &&
-              !( nModes & embed::Actions::PREVENT_TERMINATION )
+              !( nModes & embed::Actions::PREVENT_TERMINATION ) 
             )
            )
         {
@@ -182,7 +182,7 @@ void SAL_CALL OInstanceLocker::initialize( const uno::Sequence< uno::Any >& aArg
                     ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("If the third argument is provided, it must be XActionsApproval implementation!" ) ),
                     uno::Reference< uno::XInterface >(),
                     0 );
-
+    
         m_pLockListener = new OLockListener( uno::Reference< lang::XComponent > ( static_cast< lang::XComponent* >( this ) ),
                                             xInstance,
                                             nModes,
@@ -308,7 +308,7 @@ void OLockListener::Dispose()
         catch( uno::Exception& )
         {}
     }
-
+    
     m_xInstance = uno::Reference< uno::XInterface >();
     m_bDisposed = sal_True;
 }
diff --git a/comphelper/source/misc/instancelocker.hxx b/comphelper/source/misc/instancelocker.hxx
index 73800e3cee6f..b34eded11cb2 100644
--- a/comphelper/source/misc/instancelocker.hxx
+++ b/comphelper/source/misc/instancelocker.hxx
@@ -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
@@ -58,7 +58,7 @@ class OInstanceLocker : public ::cppu::WeakImplHelper3< ::com::sun::star::lang::
     OLockListener* m_pLockListener;
 
     ::cppu::OInterfaceContainerHelper* m_pListenersContainer; // list of listeners
-
+    
     sal_Bool m_bDisposed;
     sal_Bool m_bInitialized;
 
@@ -72,7 +72,7 @@ public:
     static ::rtl::OUString SAL_CALL getImplementationName_static();
 
     static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL
-        Create(
+        Create( 
             const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext );
 
 // XComponent
@@ -106,7 +106,7 @@ class OLockListener : public ::cppu::WeakImplHelper2< ::com::sun::star::util::XC
     sal_Int32 m_nMode;
 
 public:
-    OLockListener(  const ::com::sun::star::uno::WeakReference< ::com::sun::star::lang::XComponent >& xWrapper,
+    OLockListener(	const ::com::sun::star::uno::WeakReference< ::com::sun::star::lang::XComponent >& xWrapper,
                     const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& xInstance,
                     sal_Int32 nMode,
                     const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XActionsApproval > xApproval );
diff --git a/comphelper/source/misc/interaction.cxx b/comphelper/source/misc/interaction.cxx
index c97f879581e4..3dbcc0c88fa1 100644
--- a/comphelper/source/misc/interaction.cxx
+++ b/comphelper/source/misc/interaction.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
@@ -46,7 +46,7 @@ namespace comphelper
     {
         m_sPassword = _Password;;
     }
-
+    
     //--------------------------------------------------------------------
     ::rtl::OUString SAL_CALL OInteractionPassword::getPassword(  ) throw (RuntimeException)
     {
@@ -93,7 +93,7 @@ namespace comphelper
     }
 
 //.........................................................................
-}   // namespace comphelper
+}	// namespace comphelper
 //.........................................................................
 
 
diff --git a/comphelper/source/misc/legacysingletonfactory.cxx b/comphelper/source/misc/legacysingletonfactory.cxx
index cfc1793e7db2..ddfd1b0e621b 100644
--- a/comphelper/source/misc/legacysingletonfactory.cxx
+++ b/comphelper/source/misc/legacysingletonfactory.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
@@ -127,7 +127,7 @@ namespace comphelper
     {
         return m_sImplementationName;
     }
-
+    
     //--------------------------------------------------------------------
     ::sal_Bool SAL_CALL LegacySingletonFactory::supportsService( const ::rtl::OUString& _rServiceName ) throw (RuntimeException)
     {
@@ -136,7 +136,7 @@ namespace comphelper
         const ::rtl::OUString* pEnd = aServices.getConstArray() + aServices.getLength();
         return ::std::find( pStart, pEnd, _rServiceName ) != pEnd;
     }
-
+    
     //--------------------------------------------------------------------
     Sequence< ::rtl::OUString > SAL_CALL LegacySingletonFactory::getSupportedServiceNames(  ) throw (RuntimeException)
     {
@@ -164,7 +164,7 @@ namespace comphelper
 
         return m_xTheInstance;
     }
-
+    
     //--------------------------------------------------------------------
     Reference< XInterface > SAL_CALL LegacySingletonFactory::createInstanceWithArgumentsAndContext( const Sequence< Any >& _rArguments, const Reference< XComponentContext >& _rxContext ) throw (Exception, RuntimeException)
     {
diff --git a/comphelper/source/misc/listenernotification.cxx b/comphelper/source/misc/listenernotification.cxx
index a9a14a0b9b72..6468237579c3 100644
--- a/comphelper/source/misc/listenernotification.cxx
+++ b/comphelper/source/misc/listenernotification.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
@@ -59,7 +59,7 @@ namespace comphelper
         if ( _rxListener.is() )
             m_aListeners.addInterface( _rxListener );
     }
-
+    
     //--------------------------------------------------------------------
     void OListenerContainer::impl_removeListener( const Reference< XEventListener >& _rxListener )
     {
diff --git a/comphelper/source/misc/locale.cxx b/comphelper/source/misc/locale.cxx
index 53c53f1c3c48..8f00cf6e2338 100644
--- a/comphelper/source/misc/locale.cxx
+++ b/comphelper/source/misc/locale.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
@@ -49,7 +49,7 @@ const Locale Locale::X_DEFAULT()
     static Locale aLocale(
                     ::rtl::OUString::createFromAscii("x"),
                     ::rtl::OUString::createFromAscii("default"));
-    return aLocale;
+    return aLocale;                    
 }
 
 //-----------------------------------------------
@@ -58,7 +58,7 @@ const Locale Locale::EN()
     static Locale aLocale(
                     ::rtl::OUString::createFromAscii("en"),
                     ::rtl::OUString());
-    return aLocale;
+    return aLocale;                    
 }
 
 //-----------------------------------------------
@@ -67,7 +67,7 @@ const Locale Locale::EN_US()
     static Locale aLocale(
                     ::rtl::OUString::createFromAscii("en"),
                     ::rtl::OUString::createFromAscii("US"));
-    return aLocale;
+    return aLocale;                    
 }
 
 //-----------------------------------------------
@@ -76,7 +76,7 @@ const Locale Locale::DE_DE()
     static Locale aLocale(
                     ::rtl::OUString::createFromAscii("de"),
                     ::rtl::OUString::createFromAscii("DE"));
-    return aLocale;
+    return aLocale;                    
 }
 
 //-----------------------------------------------
@@ -85,7 +85,7 @@ const Locale Locale::DE_CH()
     static Locale aLocale(
                     ::rtl::OUString::createFromAscii("de"),
                     ::rtl::OUString::createFromAscii("CH"));
-    return aLocale;
+    return aLocale;                    
 }
 
 //-----------------------------------------------
@@ -94,7 +94,7 @@ const Locale Locale::DE_AT()
     static Locale aLocale(
                     ::rtl::OUString::createFromAscii("de"),
                     ::rtl::OUString::createFromAscii("AT"));
-    return aLocale;
+    return aLocale;                    
 }
 
 //-----------------------------------------------
@@ -103,7 +103,7 @@ const Locale Locale::AR()
     static Locale aLocale(
                     ::rtl::OUString::createFromAscii("ar"),
                     ::rtl::OUString());
-    return aLocale;
+    return aLocale;                    
 }
 
 //-----------------------------------------------
@@ -112,7 +112,7 @@ const Locale Locale::CA()
     static Locale aLocale(
                     ::rtl::OUString::createFromAscii("ca"),
                     ::rtl::OUString());
-    return aLocale;
+    return aLocale;                    
 }
 
 //-----------------------------------------------
@@ -121,7 +121,7 @@ const Locale Locale::CS()
     static Locale aLocale(
                     ::rtl::OUString::createFromAscii("cs"),
                     ::rtl::OUString());
-    return aLocale;
+    return aLocale;                    
 }
 
 //-----------------------------------------------
@@ -130,7 +130,7 @@ const Locale Locale::DA()
     static Locale aLocale(
                     ::rtl::OUString::createFromAscii("da"),
                     ::rtl::OUString());
-    return aLocale;
+    return aLocale;                    
 }
 
 //-----------------------------------------------
@@ -139,7 +139,7 @@ const Locale Locale::EL()
     static Locale aLocale(
                     ::rtl::OUString::createFromAscii("el"),
                     ::rtl::OUString());
-    return aLocale;
+    return aLocale;                    
 }
 
 //-----------------------------------------------
@@ -148,7 +148,7 @@ const Locale Locale::ES()
     static Locale aLocale(
                     ::rtl::OUString::createFromAscii("es"),
                     ::rtl::OUString());
-    return aLocale;
+    return aLocale;                    
 }
 
 //-----------------------------------------------
@@ -157,7 +157,7 @@ const Locale Locale::FI()
     static Locale aLocale(
                     ::rtl::OUString::createFromAscii("fi"),
                     ::rtl::OUString());
-    return aLocale;
+    return aLocale;                    
 }
 
 //-----------------------------------------------
@@ -166,7 +166,7 @@ const Locale Locale::FR()
     static Locale aLocale(
                     ::rtl::OUString::createFromAscii("fr"),
                     ::rtl::OUString());
-    return aLocale;
+    return aLocale;                    
 }
 
 //-----------------------------------------------
@@ -175,7 +175,7 @@ const Locale Locale::HE()
     static Locale aLocale(
                     ::rtl::OUString::createFromAscii("he"),
                     ::rtl::OUString());
-    return aLocale;
+    return aLocale;                    
 }
 
 //-----------------------------------------------
@@ -184,7 +184,7 @@ const Locale Locale::HI_IN()
     static Locale aLocale(
                     ::rtl::OUString::createFromAscii("hi"),
                     ::rtl::OUString::createFromAscii("IN"));
-    return aLocale;
+    return aLocale;                    
 }
 
 //-----------------------------------------------
@@ -193,7 +193,7 @@ const Locale Locale::HU()
     static Locale aLocale(
                     ::rtl::OUString::createFromAscii("hu"),
                     ::rtl::OUString());
-    return aLocale;
+    return aLocale;                    
 }
 
 //-----------------------------------------------
@@ -202,7 +202,7 @@ const Locale Locale::IT()
     static Locale aLocale(
                     ::rtl::OUString::createFromAscii("it"),
                     ::rtl::OUString());
-    return aLocale;
+    return aLocale;                    
 }
 
 //-----------------------------------------------
@@ -211,7 +211,7 @@ const Locale Locale::JA()
     static Locale aLocale(
                     ::rtl::OUString::createFromAscii("ja"),
                     ::rtl::OUString());
-    return aLocale;
+    return aLocale;                    
 }
 
 //-----------------------------------------------
@@ -220,7 +220,7 @@ const Locale Locale::KO()
     static Locale aLocale(
                     ::rtl::OUString::createFromAscii("ko"),
                     ::rtl::OUString());
-    return aLocale;
+    return aLocale;                    
 }
 
 //-----------------------------------------------
@@ -229,7 +229,7 @@ const Locale Locale::NL()
     static Locale aLocale(
                     ::rtl::OUString::createFromAscii("nl"),
                     ::rtl::OUString());
-    return aLocale;
+    return aLocale;                    
 }
 
 //-----------------------------------------------
@@ -238,7 +238,7 @@ const Locale Locale::PL()
     static Locale aLocale(
                     ::rtl::OUString::createFromAscii("pl"),
                     ::rtl::OUString());
-    return aLocale;
+    return aLocale;                    
 }
 
 //-----------------------------------------------
@@ -247,7 +247,7 @@ const Locale Locale::PT()
     static Locale aLocale(
                     ::rtl::OUString::createFromAscii("pt"),
                     ::rtl::OUString());
-    return aLocale;
+    return aLocale;                    
 }
 
 //-----------------------------------------------
@@ -256,7 +256,7 @@ const Locale Locale::PT_BR()
     static Locale aLocale(
                     ::rtl::OUString::createFromAscii("pt"),
                     ::rtl::OUString::createFromAscii("BR"));
-    return aLocale;
+    return aLocale;                    
 }
 
 //-----------------------------------------------
@@ -265,7 +265,7 @@ const Locale Locale::RU()
     static Locale aLocale(
                     ::rtl::OUString::createFromAscii("ru"),
                     ::rtl::OUString());
-    return aLocale;
+    return aLocale;                    
 }
 
 //-----------------------------------------------
@@ -274,7 +274,7 @@ const Locale Locale::SK()
     static Locale aLocale(
                     ::rtl::OUString::createFromAscii("sk"),
                     ::rtl::OUString());
-    return aLocale;
+    return aLocale;                    
 }
 
 //-----------------------------------------------
@@ -283,7 +283,7 @@ const Locale Locale::SL()
     static Locale aLocale(
                     ::rtl::OUString::createFromAscii("sl"),
                     ::rtl::OUString());
-    return aLocale;
+    return aLocale;                    
 }
 
 //-----------------------------------------------
@@ -292,7 +292,7 @@ const Locale Locale::SV()
     static Locale aLocale(
                     ::rtl::OUString::createFromAscii("sv"),
                     ::rtl::OUString());
-    return aLocale;
+    return aLocale;                    
 }
 
 //-----------------------------------------------
@@ -301,7 +301,7 @@ const Locale Locale::TH()
     static Locale aLocale(
                     ::rtl::OUString::createFromAscii("th"),
                     ::rtl::OUString());
-    return aLocale;
+    return aLocale;                    
 }
 
 //-----------------------------------------------
@@ -310,7 +310,7 @@ const Locale Locale::TR()
     static Locale aLocale(
                     ::rtl::OUString::createFromAscii("tr"),
                     ::rtl::OUString());
-    return aLocale;
+    return aLocale;                    
 }
 
 //-----------------------------------------------
@@ -319,7 +319,7 @@ const Locale Locale::X_COMMENT()
     static Locale aLocale(
                     ::rtl::OUString::createFromAscii("x"),
                     ::rtl::OUString::createFromAscii("comment"));
-    return aLocale;
+    return aLocale;                    
 }
 
 //-----------------------------------------------
@@ -328,7 +328,7 @@ const Locale Locale::X_TRANSLATE()
     static Locale aLocale(
                     ::rtl::OUString::createFromAscii("x"),
                     ::rtl::OUString::createFromAscii("translate"));
-    return aLocale;
+    return aLocale;                    
 }
 
 //-----------------------------------------------
@@ -337,7 +337,7 @@ const Locale Locale::X_NOTRANSLATE()
     static Locale aLocale(
                     ::rtl::OUString::createFromAscii("x"),
                     ::rtl::OUString::createFromAscii("notranslate"));
-    return aLocale;
+    return aLocale;                    
 }
 
 //-----------------------------------------------
@@ -346,7 +346,7 @@ const Locale Locale::ZH_CN()
     static Locale aLocale(
                     ::rtl::OUString::createFromAscii("zh"),
                     ::rtl::OUString::createFromAscii("CN"));
-    return aLocale;
+    return aLocale;                    
 }
 
 //-----------------------------------------------
@@ -355,7 +355,7 @@ const Locale Locale::ZH_TW()
     static Locale aLocale(
                     ::rtl::OUString::createFromAscii("zh"),
                     ::rtl::OUString::createFromAscii("TW"));
-    return aLocale;
+    return aLocale;                    
 }
 
 //-----------------------------------------------
@@ -389,7 +389,7 @@ Locale::Locale(const Locale& aCopy)
 {
     (*this) = aCopy; // recycle assign operator
 }
-
+       
 //-----------------------------------------------
 ::rtl::OUString Locale::getLanguage() const
 {
@@ -438,13 +438,13 @@ void Locale::fromISO(const ::rtl::OUString& sISO)
     m_sLanguage = ::rtl::OUString();
     m_sCountry  = ::rtl::OUString();
     m_sVariant  = ::rtl::OUString();
-
+    
     ::rtl::OUString sParser(sISO);
     sParser.trim();
 
     sal_Int32 nStart = 0;
     sal_Int32 nEnd   = 0;
-
+    
     // extract language part
     nEnd = sParser.indexOf(SEPERATOR_LC, nStart);
     if (nEnd<0)
@@ -454,7 +454,7 @@ void Locale::fromISO(const ::rtl::OUString& sISO)
     }
     setLanguage(sParser.copy(nStart, nEnd-nStart));
     nStart = nEnd+1;
-
+    
     // extract country
     nEnd = sParser.indexOf(SEPERATOR_CV, nStart);
     if (nEnd<0)
@@ -465,7 +465,7 @@ void Locale::fromISO(const ::rtl::OUString& sISO)
         return;
     }
     nStart = nEnd+1;
-
+    
     // extract variant
     setVariant(sParser.copy(nStart, sParser.getLength()-nStart));
 }
@@ -474,7 +474,7 @@ void Locale::fromISO(const ::rtl::OUString& sISO)
 ::rtl::OUString Locale::toISO() const
 {
     ::rtl::OUStringBuffer sISO(64);
-
+    
     sISO.append(m_sLanguage);
     if (m_sCountry.getLength())
     {
@@ -487,7 +487,7 @@ void Locale::fromISO(const ::rtl::OUString& sISO)
             sISO.append(m_sVariant);
         }
     }
-
+    
     return sISO.makeStringAndClear();
 }
 
@@ -513,21 +513,21 @@ sal_Bool Locale::similar(const Locale& aComparable) const
     throw(Locale::MalFormedLocaleException)
 {
     Locale aReference(sReferenceISO);
-
+    
     // Note: The same language or "en"/"en-US" should be preferred as fallback.
     // On the other side some localized variables doesnt use localzation in real.
     // May be the use a "fix" value only ... marked as X-DEFAULT or X-NOTRANSLATE.
     // At least it can be discussed, if any language is a valid fallback ...
     // But in case some office functionality depends on that (that means real functionality instead
     // of pure UI descriptions) we should do anything, so it can work.
-
+    
     ::std::vector< ::rtl::OUString >::const_iterator pSimilar      = lISOList.end();
     ::std::vector< ::rtl::OUString >::const_iterator pEN_US        = lISOList.end();
     ::std::vector< ::rtl::OUString >::const_iterator pEN           = lISOList.end();
     ::std::vector< ::rtl::OUString >::const_iterator pXDefault     = lISOList.end();
     ::std::vector< ::rtl::OUString >::const_iterator pXNoTranslate = lISOList.end();
     ::std::vector< ::rtl::OUString >::const_iterator pAny          = lISOList.end();
-
+    
     ::std::vector< ::rtl::OUString >::const_iterator pIt;
     for (  pIt  = lISOList.begin();
            pIt != lISOList.end()  ;
@@ -537,7 +537,7 @@ sal_Bool Locale::similar(const Locale& aComparable) const
         // found Locale, which match with 100% => return it
         if (aCheck.equals(aReference))
             return pIt;
-
+        
         // found similar Locale => safe it as possible fallback
         if (
             (pSimilar == lISOList.end()) &&
@@ -591,22 +591,22 @@ sal_Bool Locale::similar(const Locale& aComparable) const
 
     if (pSimilar != lISOList.end())
         return pSimilar;
-
+    
     if (pEN_US != lISOList.end())
         return pEN_US;
-
+    
     if (pEN != lISOList.end())
         return pEN;
 
     if (pXDefault != lISOList.end())
         return pXDefault;
-
+    
     if (pXNoTranslate != lISOList.end())
         return pXNoTranslate;
-
+    
     if (pAny != lISOList.end())
         return pAny;
-
+    
     return lISOList.end();
 }
 
@@ -644,7 +644,7 @@ sal_Bool Locale::getFallback(Locale& aLocale)
         aLocale.setCountry(::rtl::OUString());
         return sal_True;
     }
-
+    
     // e) "en-US" possible?
     if (!aLocale.equals(EN_US()))
     {
@@ -652,9 +652,9 @@ sal_Bool Locale::getFallback(Locale& aLocale)
         return sal_True;
     }
 
-    // f) no more fallbacks
+    // f) no more fallbacks    
     return sal_False;
-}
+}            
 
 //-----------------------------------------------
 void  Locale::operator=(const Locale& rCopy)
@@ -666,7 +666,7 @@ void  Locale::operator=(const Locale& rCopy)
     m_sCountry  = rCopy.m_sCountry;
     m_sVariant  = rCopy.m_sVariant;
 }
-
+        
 //-----------------------------------------------
 sal_Bool Locale::operator==(const Locale& aComparable) const
 {
diff --git a/comphelper/source/misc/logging.cxx b/comphelper/source/misc/logging.cxx
index 445f2cbe6c14..98576651faa6 100644
--- a/comphelper/source/misc/logging.cxx
+++ b/comphelper/source/misc/logging.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
diff --git a/comphelper/source/misc/mediadescriptor.cxx b/comphelper/source/misc/mediadescriptor.cxx
index 9e02afe8c56c..3da19c8393ca 100644
--- a/comphelper/source/misc/mediadescriptor.cxx
+++ b/comphelper/source/misc/mediadescriptor.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
@@ -602,7 +602,7 @@ sal_Bool MediaDescriptor::impl_addInputStream( sal_Bool bLockFile )
     {
         ::rtl::OUStringBuffer sMsg(256);
         sMsg.appendAscii("Invalid MediaDescriptor detected:\n");
-        sMsg.append     (ex.Message                           );
+        sMsg.append		(ex.Message							  );
         OSL_ENSURE(sal_False, ::rtl::OUStringToOString(sMsg.makeStringAndClear(), RTL_TEXTENCODING_UTF8).getStr());
     }
 #else
diff --git a/comphelper/source/misc/mimeconfighelper.cxx b/comphelper/source/misc/mimeconfighelper.cxx
index b677c977739e..4ba8babee8fc 100644
--- a/comphelper/source/misc/mimeconfighelper.cxx
+++ b/comphelper/source/misc/mimeconfighelper.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
@@ -749,7 +749,7 @@ sal_Bool MimeConfigurationHelper::AddFilterNameCheckOwnFile(
         }
         catch( uno::Exception& )
         {}
-
+        
     return aResult;
 }
 //-------------------------------------------------------------------------
@@ -789,7 +789,7 @@ uno::Sequence< sal_Int8 > MimeConfigurationHelper::GetSequenceClassID( sal_uInt3
 
     return aResult;
 }
-uno::Sequence<sal_Int8> MimeConfigurationHelper::GetSequenceClassIDFromObjectName(const ::rtl::OUString& _sObjectName)
+uno::Sequence<sal_Int8> MimeConfigurationHelper::GetSequenceClassIDFromObjectName(const ::rtl::OUString& _sObjectName) 
 {
     uno::Sequence<sal_Int8> aClassId;
     uno::Reference< container::XNameAccess > xObjectNames = GetConfigurationByPath(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/org.openoffice.Office.Embedding/ObjectNames")));
diff --git a/comphelper/source/misc/namedvaluecollection.cxx b/comphelper/source/misc/namedvaluecollection.cxx
index 8bab7fa3d7c7..82c3dc3eb7e8 100644
--- a/comphelper/source/misc/namedvaluecollection.cxx
+++ b/comphelper/source/misc/namedvaluecollection.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
@@ -312,7 +312,7 @@ namespace comphelper
             NamedValue operator()( const NamedValueRepository::value_type& _rValue )
             {
                 return NamedValue( _rValue.first, _rValue.second );
-            }
+            }                                     
         };
     }
 
diff --git a/comphelper/source/misc/numberedcollection.cxx b/comphelper/source/misc/numberedcollection.cxx
index 11f430a30fba..786491d5df5f 100644
--- a/comphelper/source/misc/numberedcollection.cxx
+++ b/comphelper/source/misc/numberedcollection.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
@@ -91,36 +91,36 @@ void NumberedCollection::setUntitledPrefix(const ::rtl::OUString& sPrefix)
 {
     // SYNCHRONIZED ->
     ::osl::ResettableMutexGuard aLock(m_aMutex);
-
+    
         if ( ! xComponent.is ())
             throw css::lang::IllegalArgumentException (ERRMSG_INVALID_COMPONENT_PARAM, m_xOwner.get(), 1);
 
         long                              pComponent = (long) xComponent.get ();
         TNumberedItemHash::const_iterator pIt        = m_lComponents.find (pComponent);
-
+        
         // a) component already exists - return it's number directly
         if (pIt != m_lComponents.end())
             return pIt->second.nNumber;
-
+        
         // b) component must be added new to this container
-
+        
         // b1) collection is full - no further components possible
         //     -> return INVALID_NUMBER
         ::sal_Int32 nFreeNumber = impl_searchFreeNumber();
         if (nFreeNumber == css::frame::UntitledNumbersConst::INVALID_NUMBER)
             return css::frame::UntitledNumbersConst::INVALID_NUMBER;
-
+        
         // b2) add component to collection and return its number
         TNumberedItem aItem;
         aItem.xItem   = css::uno::WeakReference< css::uno::XInterface >(xComponent);
         aItem.nNumber = nFreeNumber;
         m_lComponents[pComponent] = aItem;
-
+        
         return nFreeNumber;
-
+    
     // <- SYNCHRONIZED
 }
-
+           
 //-----------------------------------------------
 void SAL_CALL NumberedCollection::releaseNumber(::sal_Int32 nNumber)
     throw (css::lang::IllegalArgumentException,
@@ -128,38 +128,38 @@ void SAL_CALL NumberedCollection::releaseNumber(::sal_Int32 nNumber)
 {
     // SYNCHRONIZED ->
     ::osl::ResettableMutexGuard aLock(m_aMutex);
-
+    
         if (nNumber == css::frame::UntitledNumbersConst::INVALID_NUMBER)
             throw css::lang::IllegalArgumentException (ERRMSG_INVALID_NUMBER_PARAM, m_xOwner.get(), 1);
-
+        
         TDeadItemList               lDeadItems;
         TNumberedItemHash::iterator pComponent;
-
+        
         for (  pComponent  = m_lComponents.begin ();
                pComponent != m_lComponents.end   ();
              ++pComponent                          )
         {
             const TNumberedItem&                              rItem = pComponent->second;
             const css::uno::Reference< css::uno::XInterface > xItem = rItem.xItem.get();
-
+        
             if ( ! xItem.is ())
             {
                 lDeadItems.push_back(pComponent->first);
                 continue;
             }
-
+        
             if (rItem.nNumber == nNumber)
             {
                 m_lComponents.erase (pComponent);
                 break;
             }
         }
-
+        
         impl_cleanUpDeadItems(m_lComponents, lDeadItems);
-
+    
     // <- SYNCHRONIZED
 }
-
+           
 //-----------------------------------------------
 void SAL_CALL NumberedCollection::releaseNumberForComponent(const css::uno::Reference< css::uno::XInterface >& xComponent)
     throw (css::lang::IllegalArgumentException,
@@ -167,20 +167,20 @@ void SAL_CALL NumberedCollection::releaseNumberForComponent(const css::uno::Refe
 {
     // SYNCHRONIZED ->
     ::osl::ResettableMutexGuard aLock(m_aMutex);
-
+    
         if ( ! xComponent.is ())
             throw css::lang::IllegalArgumentException (ERRMSG_INVALID_COMPONENT_PARAM, m_xOwner.get(), 1);
-
+    
         long                        pComponent = (long) xComponent.get ();
         TNumberedItemHash::iterator pIt        = m_lComponents.find (pComponent);
-
+    
         // a) component exists and will be removed
         if (pIt != m_lComponents.end())
             m_lComponents.erase(pIt);
-
+        
         // else
         // b) component does not exists - nothing todo here (ignore request!)
-
+    
     // <- SYNCHRONIZED
 }
 
@@ -225,37 +225,37 @@ void SAL_CALL NumberedCollection::releaseNumberForComponent(const css::uno::Refe
 
     // SYNCHRONIZED ->
     ::osl::ResettableMutexGuard aLock(m_aMutex);
-
+    
         TDeadItemList                     lDeadItems;
         TNumberedItemHash::const_iterator pComponent;
-
+    
         for (  pComponent  = m_lComponents.begin ();
                pComponent != m_lComponents.end   ();
              ++pComponent                          )
         {
             const TNumberedItem&                              rItem = pComponent->second;
             const css::uno::Reference< css::uno::XInterface > xItem = rItem.xItem.get();
-
+        
             if ( ! xItem.is ())
             {
                 lDeadItems.push_back(pComponent->first);
                 continue;
             }
-
+        
             ::std::vector< ::sal_Int32 >::iterator pPossible = ::std::find(lPossibleNumbers.begin (), lPossibleNumbers.end (), rItem.nNumber);
             if (pPossible != lPossibleNumbers.end ())
                 lPossibleNumbers.erase (pPossible);
         }
-
+    
         impl_cleanUpDeadItems(m_lComponents, lDeadItems);
-
+    
         // a) non free numbers ... return INVALID_NUMBER
         if (lPossibleNumbers.size () < 1)
             return css::frame::UntitledNumbersConst::INVALID_NUMBER;
-
+        
         // b) return first free number
         return *(lPossibleNumbers.begin ());
-
+        
     // <- SYNCHRONIZED
 }
 
diff --git a/comphelper/source/misc/numbers.cxx b/comphelper/source/misc/numbers.cxx
index 06f9f519c318..7ed79acea4fb 100644
--- a/comphelper/source/misc/numbers.cxx
+++ b/comphelper/source/misc/numbers.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
@@ -39,8 +39,8 @@ namespace comphelper
 {
 //.........................................................................
 
-namespace starbeans = ::com::sun::star::beans;
-namespace starlang  = ::com::sun::star::lang;
+namespace starbeans	= ::com::sun::star::beans;
+namespace starlang	= ::com::sun::star::lang;
 
 //------------------------------------------------------------------------------
 sal_Int16 getNumberFormatType(const staruno::Reference<starutil::XNumberFormats>& xFormats, sal_Int32 nKey)
@@ -145,6 +145,6 @@ Any getNumberFormatProperty( const Reference< XNumberFormatter >& _rxFormatter,
 }
 
 //.........................................................................
-}   // namespace comphelper
+}	// namespace comphelper
 //.........................................................................
 
diff --git a/comphelper/source/misc/officeresourcebundle.cxx b/comphelper/source/misc/officeresourcebundle.cxx
index cbe5b0dc2659..4d22325854ab 100644
--- a/comphelper/source/misc/officeresourcebundle.cxx
+++ b/comphelper/source/misc/officeresourcebundle.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
diff --git a/comphelper/source/misc/officerestartmanager.cxx b/comphelper/source/misc/officerestartmanager.cxx
index 974b8d65e7ae..67b1d4c71246 100644
--- a/comphelper/source/misc/officerestartmanager.cxx
+++ b/comphelper/source/misc/officerestartmanager.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
@@ -87,9 +87,9 @@ void SAL_CALL OOfficeRestartManager::requestRestart( const uno::Reference< task:
         // if the restart already running there is no need to trigger it again
         if ( m_bRestartRequested )
             return;
-#ifndef MACOSX
+
         m_bRestartRequested = sal_True;
-#endif
+
         // the office is still not initialized, no need to terminate, changing the state is enough
         if ( !m_bOfficeInitialized )
             return;
@@ -144,7 +144,7 @@ void SAL_CALL OOfficeRestartManager::notify( const uno::Any& /* aData */ )
                 xFactory->createInstanceWithContext(
                     ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.frame.Desktop" ) ), m_xContext ),
                 uno::UNO_QUERY_THROW );
-
+            
             // Turn Quickstarter veto off
             uno::Reference< beans::XPropertySet > xPropertySet( xDesktop, uno::UNO_QUERY_THROW );
             ::rtl::OUString aVetoPropName( RTL_CONSTASCII_USTRINGPARAM( "SuspendQuickstartVeto" ) );
diff --git a/comphelper/source/misc/officerestartmanager.hxx b/comphelper/source/misc/officerestartmanager.hxx
index 2317d0217060..2fee1080fba5 100644
--- a/comphelper/source/misc/officerestartmanager.hxx
+++ b/comphelper/source/misc/officerestartmanager.hxx
@@ -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
diff --git a/comphelper/source/misc/proxyaggregation.cxx b/comphelper/source/misc/proxyaggregation.cxx
index 1a3dd73930ba..5b59f48ae3f5 100644
--- a/comphelper/source/misc/proxyaggregation.cxx
+++ b/comphelper/source/misc/proxyaggregation.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
@@ -162,10 +162,10 @@ namespace comphelper
             //
             // if ( !m_rBHelper.bDisposed )
             // {
-            //   acquire(); // to prevent duplicate dtor calls
+            //   acquire();	// to prevent duplicate dtor calls
             //   dispose();
             // }
-
+            
         m_xInner.clear();
     }
 
@@ -173,9 +173,9 @@ namespace comphelper
     void SAL_CALL OComponentProxyAggregationHelper::disposing( const EventObject& _rSource ) throw (RuntimeException)
     {
         if ( _rSource.Source == m_xInner )
-        {   // it's our inner context which is dying -> dispose ourself
+        {	// it's our inner context which is dying -> dispose ourself
             if ( !m_rBHelper.bDisposed && !m_rBHelper.bInDispose )
-            {   // (if necessary only, of course)
+            {	// (if necessary only, of course)
                 dispose();
             }
         }
@@ -242,7 +242,7 @@ namespace comphelper
     {
         if ( !rBHelper.bDisposed )
         {
-            acquire();  // to prevent duplicate dtor calls
+            acquire();	// to prevent duplicate dtor calls
             dispose();
         }
     }
@@ -271,6 +271,6 @@ namespace comphelper
 
 
 //.............................................................................
-}   // namespace comphelper
+}	// namespace comphelper
 //.............................................................................
 
diff --git a/comphelper/source/misc/querydeep.cxx b/comphelper/source/misc/querydeep.cxx
index 92e475686783..f7404d0d7bb7 100644
--- a/comphelper/source/misc/querydeep.cxx
+++ b/comphelper/source/misc/querydeep.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
@@ -59,8 +59,8 @@ sal_Bool comphelper::isDerivedFrom(
         // now ask in cppu (aka typelib)
         ::typelib_TypeDescription *pBaseTD = 0, *pTD = 0;
 
-        rBaseType.  getDescription(&pBaseTD);
-        rType.      getDescription(&pTD);
+        rBaseType.	getDescription(&pBaseTD);
+        rType.		getDescription(&pTD);
 
         // interfaces are assignable to a base
         bRet = ::typelib_typedescription_isAssignableFrom(pBaseTD, pTD);
diff --git a/comphelper/source/misc/regpathhelper.cxx b/comphelper/source/misc/regpathhelper.cxx
index 0ac8f0277236..f2e52096c7ad 100644
--- a/comphelper/source/misc/regpathhelper.cxx
+++ b/comphelper/source/misc/regpathhelper.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
@@ -41,18 +41,18 @@ using namespace vos;
 using namespace osl;
 using namespace rtl;
 
-#define PATH_DELEMITTER '/'
+#define PATH_DELEMITTER	'/'
 
-#define USER_REGISTRY_NAME_ENV      "STAR_USER_REGISTRY"
-#define SYSTEM_REGISTRY_NAME_ENV    "STAR_REGISTRY"
-#define REGISTRY_SYSTEM_NAME    "services.rdb"
+#define USER_REGISTRY_NAME_ENV 		"STAR_USER_REGISTRY"
+#define SYSTEM_REGISTRY_NAME_ENV 	"STAR_REGISTRY"
+#define REGISTRY_SYSTEM_NAME	"services.rdb"
 
-#define REGISTRY_LOCAL_NAME     "user60.rdb"
+#define REGISTRY_LOCAL_NAME		"user60.rdb"
 
 #ifdef SAL_UNX
-#define CONFIG_PATH_PREFIX      "."
+#define CONFIG_PATH_PREFIX		"."
 #else
-#define CONFIG_PATH_PREFIX      ""
+#define CONFIG_PATH_PREFIX		""
 #endif
 
 namespace comphelper
@@ -75,7 +75,7 @@ static sal_Bool retrievePortalUserDir( OUString *pDirectory )
           {
             if ( sArg.indexOf(OUString::createFromAscii("-userid")) == 0 )
             {
-
+                
                   bIsPortalUser = sal_True;
                 sal_Int32 nStart = sArg.lastIndexOf( '[' );
                 sal_Int32 nEnd   = sArg.lastIndexOf( ']' );
@@ -96,15 +96,15 @@ static sal_Bool retrievePortalUserDir( OUString *pDirectory )
      }
     return bIsPortalUser;
 }
-
-
+    
+    
 static OUString getDefaultLocalRegistry()
 {
     OUString uBuffer, userRegistryName;
     OUString portalUserDir;
 
     sal_Bool bIsPortalUser = retrievePortalUserDir( &portalUserDir );
-
+    
     if ( bIsPortalUser )
        {
         if(  portalUserDir.getLength() )
@@ -113,7 +113,7 @@ static OUString getDefaultLocalRegistry()
             userRegistryName = portalUserDir;
             userRegistryName += OUString( RTL_CONSTASCII_USTRINGPARAM(
                 "/user/" REGISTRY_LOCAL_NAME ) );
-
+            
             // Directory creation is probably necessary for bootstrapping a new
             // user in the portal environment (the ucb uses this function).
             // This should be solved differently, as
@@ -121,7 +121,7 @@ static OUString getDefaultLocalRegistry()
             OUString sSeparator(RTL_CONSTASCII_USTRINGPARAM("/"));
             OUString sPath(RTL_CONSTASCII_USTRINGPARAM("file://"));
             FileBase::RC retRC = FileBase::E_None;
-
+            
             sal_Int32 nIndex = 3;
             sPath += userRegistryName.getToken(2, '/', nIndex);
             while( nIndex != -1 )
@@ -156,9 +156,9 @@ static OUString getDefaultLocalRegistry()
 
 OUString getPathToUserRegistry()
 {
-    OUString    userRegistryName;
-    FILE        *f=NULL;
-
+    OUString  	userRegistryName;
+    FILE  		*f=NULL;
+    
     // search the environment STAR_USER_REGISTRY
     OString sBuffer( getenv(USER_REGISTRY_NAME_ENV) );
     if ( sBuffer.getLength() > 0 )
@@ -178,25 +178,25 @@ OUString getPathToUserRegistry()
     }
 
     return userRegistryName;
-}
+}	
 
 OUString getPathToSystemRegistry()
 {
     OUString uBuffer;
     OUString registryBaseName( RTL_CONSTASCII_USTRINGPARAM(REGISTRY_SYSTEM_NAME) );
     OUString systemRegistryName;
-    FILE     *f=NULL;
-
-    // search in the directory of the executable
+    FILE  	 *f=NULL;
+ 
+    // search in the directory of the executable 	
     OStartupInfo info;
     if( OStartupInfo::E_None == info.getExecutableFile(uBuffer) )
     {
-        sal_uInt32  lastIndex = uBuffer.lastIndexOf(PATH_DELEMITTER);
+        sal_uInt32 	lastIndex = uBuffer.lastIndexOf(PATH_DELEMITTER);
         if (lastIndex > 0)
         {
-            uBuffer = uBuffer.copy(0, lastIndex + 1);
+            uBuffer = uBuffer.copy(0, lastIndex + 1);	
         }
-
+        
         uBuffer += registryBaseName;
 
         if (!FileBase::getSystemPathFromFileURL(uBuffer, systemRegistryName))
@@ -213,23 +213,23 @@ OUString getPathToSystemRegistry()
         if ( tmpStr.getLength() > 0 )
         {
             f = fopen(tmpStr.getStr(), "r");
-
+        
             if (f != NULL)
             {
                 fclose(f);
                 systemRegistryName = OStringToOUString( tmpStr, osl_getThreadTextEncoding() );
             } else
             {
-                systemRegistryName = OUString();
+                systemRegistryName = OUString();	
             }
         }
     } else
     {
         fclose(f);
     }
-
+    
     return systemRegistryName;
-}
+}	
 
 }
 
diff --git a/comphelper/source/misc/scopeguard.cxx b/comphelper/source/misc/scopeguard.cxx
index 7ce478d8bea0..b9b363bd3986 100644
--- a/comphelper/source/misc/scopeguard.cxx
+++ b/comphelper/source/misc/scopeguard.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
diff --git a/comphelper/source/misc/sequence.cxx b/comphelper/source/misc/sequence.cxx
index b0d7c4da1587..21d7116cc90c 100644
--- a/comphelper/source/misc/sequence.cxx
+++ b/comphelper/source/misc/sequence.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
@@ -92,12 +92,12 @@ staruno::Sequence<sal_Int16> findValue(const staruno::Sequence< ::rtl::OUString
 // -----------------------------------------------------------------------------
 sal_Bool existsValue(const ::rtl::OUString& Value,const staruno::Sequence< ::rtl::OUString >& _aList)
 {
-    const ::rtl::OUString * pIter   = _aList.getConstArray();
-    const ::rtl::OUString * pEnd    = pIter + _aList.getLength();
+    const ::rtl::OUString * pIter	= _aList.getConstArray();
+    const ::rtl::OUString * pEnd	= pIter + _aList.getLength();
     return ::std::find(pIter,pEnd,Value) != pEnd;
 }
 
 //.........................................................................
-}   // namespace comphelper
+}	// namespace comphelper
 //.........................................................................
 
diff --git a/comphelper/source/misc/sequenceashashmap.cxx b/comphelper/source/misc/sequenceashashmap.cxx
index a79ffc9037cc..337557973a2c 100644
--- a/comphelper/source/misc/sequenceashashmap.cxx
+++ b/comphelper/source/misc/sequenceashashmap.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
@@ -123,7 +123,7 @@ void SequenceAsHashMap::operator<<(const css::uno::Sequence< css::uno::Any >& lS
 {
     sal_Int32 c = lSource.getLength();
     sal_Int32 i = 0;
-
+    
     for (i=0; i<c; ++i)
     {
         css::beans::PropertyValue lP;
@@ -136,10 +136,10 @@ void SequenceAsHashMap::operator<<(const css::uno::Sequence< css::uno::Any >& lS
                 throw css::beans::IllegalTypeException(
                         ::rtl::OUString::createFromAscii("PropertyValue struct contains no usefull informations."),
                         css::uno::Reference< css::uno::XInterface >());
-            (*this)[lP.Name] = lP.Value;
+            (*this)[lP.Name] = lP.Value;                    
             continue;
         }
-
+        
         css::beans::NamedValue lN;
         if (lSource[i] >>= lN)
         {
@@ -150,12 +150,12 @@ void SequenceAsHashMap::operator<<(const css::uno::Sequence< css::uno::Any >& lS
                 throw css::beans::IllegalTypeException(
                         ::rtl::OUString::createFromAscii("NamedValue struct contains no usefull informations."),
                         css::uno::Reference< css::uno::XInterface >());
-            (*this)[lN.Name] = lN.Value;
+            (*this)[lN.Name] = lN.Value;                    
             continue;
         }
 
         // ignore VOID Any ... but reject wrong filled ones!
-        if (lSource[i].hasValue())
+        if (lSource[i].hasValue())        
             throw css::beans::IllegalTypeException(
                     ::rtl::OUString::createFromAscii("Any contains wrong type."),
                     css::uno::Reference< css::uno::XInterface >());
@@ -271,7 +271,7 @@ const css::uno::Sequence< css::uno::Any > SequenceAsHashMap::getAsConstAnyList(:
             aProp.Value     = pThis->second;
             pDestination[i] = css::uno::makeAny(aProp);
         }
-
+    
         ++i;
     }
 
@@ -311,10 +311,10 @@ sal_Bool SequenceAsHashMap::match(const SequenceAsHashMap& rCheck) const
         const ::rtl::OUString& sCheckName  = pCheck->first;
         const css::uno::Any&   aCheckValue = pCheck->second;
               const_iterator   pFound      = find(sCheckName);
-
+    
         if (pFound == end())
             return sal_False;
-
+        
         const css::uno::Any& aFoundValue = pFound->second;
         if (aFoundValue != aCheckValue)
             return sal_False;
@@ -335,7 +335,7 @@ void SequenceAsHashMap::update(const SequenceAsHashMap& rUpdate)
     {
         const ::rtl::OUString& sName  = pUpdate->first;
         const css::uno::Any&   aValue = pUpdate->second;
-
+    
         (*this)[sName] = aValue;
     }
 }
diff --git a/comphelper/source/misc/servicedecl.cxx b/comphelper/source/misc/servicedecl.cxx
index 7c3dd169485d..fc44d98719dd 100644
--- a/comphelper/source/misc/servicedecl.cxx
+++ b/comphelper/source/misc/servicedecl.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
@@ -50,7 +50,7 @@ class ServiceDecl::Factory :
 public:
     explicit Factory( ServiceDecl const& rServiceDecl )
         : m_rServiceDecl(rServiceDecl) {}
-
+    
     // XServiceInfo:
     virtual rtl::OUString SAL_CALL getImplementationName()
         throw (uno::RuntimeException);
@@ -67,7 +67,7 @@ public:
     uno::Sequence<uno::Any> const& args,
     uno::Reference<uno::XComponentContext> const& xContext )
         throw (uno::Exception);
-
+    
 private:
     virtual ~Factory();
 
@@ -127,7 +127,7 @@ bool ServiceDecl::writeInfo( registry::XRegistryKey * xKey ) const
         try {
             uno::Reference<registry::XRegistryKey> const xNewKey(
                 xKey->createKey( buf.makeStringAndClear() ) );
-
+            
             rtl::OString const str(m_pServiceNames);
             sal_Int32 nIndex = 0;
             do {
@@ -137,7 +137,7 @@ bool ServiceDecl::writeInfo( registry::XRegistryKey * xKey ) const
                                    RTL_TEXTENCODING_ASCII_US ) );
             }
             while (nIndex >= 0);
-
+            
             bRet = true;
         }
         catch (registry::InvalidRegistryException const&) {
@@ -160,8 +160,8 @@ void * ServiceDecl::getFactory( sal_Char const* pImplName ) const
 uno::Sequence<rtl::OUString> ServiceDecl::getSupportedServiceNames() const
 {
     std::vector<rtl::OUString> vec;
-
-    rtl::OString const str(m_pServiceNames);
+    
+    rtl::OString const str(m_pServiceNames);    
     sal_Int32 nIndex = 0;
     do {
         rtl::OString const token( str.getToken( 0, m_cDelim, nIndex ) );
@@ -169,7 +169,7 @@ uno::Sequence<rtl::OUString> ServiceDecl::getSupportedServiceNames() const
                                       RTL_TEXTENCODING_ASCII_US ) );
     }
     while (nIndex >= 0);
-
+    
     return comphelper::containerToSequence(vec);
 }
 
diff --git a/comphelper/source/misc/serviceinfohelper.cxx b/comphelper/source/misc/serviceinfohelper.cxx
index f2f9da278a06..7fdd286b0c70 100644
--- a/comphelper/source/misc/serviceinfohelper.cxx
+++ b/comphelper/source/misc/serviceinfohelper.cxx
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2008 by Sun Microsystems, Inc.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/comphelper/source/misc/sharedmutex.cxx b/comphelper/source/misc/sharedmutex.cxx
index 4d3fade030a6..02c4787d477a 100644
--- a/comphelper/source/misc/sharedmutex.cxx
+++ b/comphelper/source/misc/sharedmutex.cxx
@@ -1,6 +1,6 @@
 /*************************************************************************
  * 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
diff --git a/comphelper/source/misc/stillreadwriteinteraction.cxx b/comphelper/source/misc/stillreadwriteinteraction.cxx
index 9054f0754b5e..f5b2cddd5bb5 100644
--- a/comphelper/source/misc/stillreadwriteinteraction.cxx
+++ b/comphelper/source/misc/stillreadwriteinteraction.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
@@ -64,7 +64,7 @@ StillReadWriteInteraction::StillReadWriteInteraction(const css::uno::Reference<
     aInterceptedRequest.Continuation = ::getCppuType(static_cast< css::uno::Reference< css::task::XInteractionAbort >* >(0));
     aInterceptedRequest.MatchExact = sal_False;
     lInterceptions.push_back(aInterceptedRequest);
-
+     
     setInterceptedHandler(xHandler);
     setInterceptions(lInterceptions);
 }
diff --git a/comphelper/source/misc/storagehelper.cxx b/comphelper/source/misc/storagehelper.cxx
index e2557523f674..176693e7290e 100644
--- a/comphelper/source/misc/storagehelper.cxx
+++ b/comphelper/source/misc/storagehelper.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
@@ -452,5 +452,36 @@ sal_Bool OStorageHelper::IsValidZipEntryFileName(
     return sal_True;
 }
 
+// ----------------------------------------------------------------------
+sal_Bool OStorageHelper::PathHasSegment( const ::rtl::OUString& aPath, const ::rtl::OUString& aSegment )
+{
+    sal_Bool bResult = sal_False;
+    const sal_Int32 nPathLen = aPath.getLength();
+    const sal_Int32 nSegLen = aSegment.getLength();
+
+    if ( nSegLen && nPathLen >= nSegLen )
+    {
+        ::rtl::OUString aEndSegment( RTL_CONSTASCII_USTRINGPARAM( "/" ) );
+        aEndSegment += aSegment;
+
+        ::rtl::OUString aInternalSegment( aEndSegment );
+        aInternalSegment += ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "/" ) );
+
+        if ( aPath.indexOf( aInternalSegment ) >= 0 )
+            bResult = sal_True;
+
+        if ( !bResult && !aPath.compareTo( aSegment, nSegLen ) )
+        {
+            if ( nPathLen == nSegLen || aPath.getStr()[nSegLen] == (sal_Unicode)'/' )
+                bResult = sal_True;
+        }
+
+        if ( !bResult && nPathLen > nSegLen && aPath.copy( nPathLen - nSegLen - 1, nSegLen + 1 ).equals( aEndSegment ) )
+            bResult = sal_True;
+    }
+
+    return bResult;
+}
+
 }
 
diff --git a/comphelper/source/misc/string.cxx b/comphelper/source/misc/string.cxx
index 951baf0be8d2..8bf0d220d574 100644
--- a/comphelper/source/misc/string.cxx
+++ b/comphelper/source/misc/string.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
diff --git a/comphelper/source/misc/synchronousdispatch.cxx b/comphelper/source/misc/synchronousdispatch.cxx
index 3c55556973f3..c7384f9df6db 100644
--- a/comphelper/source/misc/synchronousdispatch.cxx
+++ b/comphelper/source/misc/synchronousdispatch.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
@@ -97,6 +97,6 @@ uno::Reference< lang::XComponent > SynchronousDispatch::dispatch(
 }
 
 //.........................................................................
-}   // namespace comphelper
+}	// namespace comphelper
 //.........................................................................
 
diff --git a/comphelper/source/misc/types.cxx b/comphelper/source/misc/types.cxx
index 31719eec881a..f1dde3e9eefb 100644
--- a/comphelper/source/misc/types.cxx
+++ b/comphelper/source/misc/types.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
@@ -113,7 +113,7 @@ float getFloat(const Any& _rAny)
 }
 
 //------------------------------------------------------------------------------
-::rtl::OUString getString(const Any& _rAny)
+::rtl::OUString	getString(const Any& _rAny)
 {
     ::rtl::OUString nReturn;
     OSL_VERIFY( _rAny >>= nReturn );
@@ -141,7 +141,7 @@ sal_Int32 getEnumAsINT32(const Any& _rAny) throw(IllegalArgumentException)
 }
 
 //------------------------------------------------------------------------------
-FontDescriptor  getDefaultFont()
+FontDescriptor	getDefaultFont()
 {
     FontDescriptor aReturn;
     aReturn.Slant = FontSlant_DONTKNOW;
@@ -202,8 +202,8 @@ sal_Bool compare_impl(const Type& _rType, const void* pData, const Any& _rValue)
                 reinterpret_cast<const Any*>(pData)->getValue(),
                 _rValue);
     }
-    else if (   (_rType.getTypeClass() == TypeClass_VOID)
-            ||  (_rValue.getValueType().getTypeClass() == TypeClass_VOID)
+    else if	(	(_rType.getTypeClass() == TypeClass_VOID)
+            ||	(_rValue.getValueType().getTypeClass() == TypeClass_VOID)
             )
     {
         bRes = _rType.getTypeClass() == _rValue.getValueType().getTypeClass();
@@ -430,7 +430,7 @@ sal_Bool compare(const Any& rLeft, const Any& rRight)
 }
 
 //-------------------------------------------------------------------------
-sal_Bool    operator ==(const FontDescriptor& _rLeft, const FontDescriptor& _rRight)
+sal_Bool	operator ==(const FontDescriptor& _rLeft, const FontDescriptor& _rRight)
 {
     return ( _rLeft.Name.equals( _rRight.Name ) ) &&
     ( _rLeft.Height == _rRight.Height ) &&
@@ -453,14 +453,14 @@ sal_Bool    operator ==(const FontDescriptor& _rLeft, const FontDescriptor& _rRi
 //-------------------------------------------------------------------------
 Type getSequenceElementType(const Type& _rSequenceType)
 {
-    OSL_ENSURE(_rSequenceType.getTypeClass() == TypeClass_SEQUENCE,
+    OSL_ENSURE(_rSequenceType.getTypeClass() == TypeClass_SEQUENCE, 
                 "getSequenceElementType: must be called with a  sequence type!");
 
     if (!(_rSequenceType.getTypeClass() == TypeClass_SEQUENCE))
         return Type();
 
     TypeDescription aTD(_rSequenceType);
-    typelib_IndirectTypeDescription* pSequenceTD =
+    typelib_IndirectTypeDescription* pSequenceTD = 
         reinterpret_cast< typelib_IndirectTypeDescription* >(aTD.get());
 
     OSL_ASSERT(pSequenceTD);
@@ -472,6 +472,6 @@ Type getSequenceElementType(const Type& _rSequenceType)
     return Type();
 }
 //.........................................................................
-}   // namespace comphelper
+}	// namespace comphelper
 //.........................................................................
 
diff --git a/comphelper/source/misc/uieventslogger.cxx b/comphelper/source/misc/uieventslogger.cxx
index 710c08fdd706..475ce6c86dbf 100644
--- a/comphelper/source/misc/uieventslogger.cxx
+++ b/comphelper/source/misc/uieventslogger.cxx
@@ -1,6 +1,6 @@
 /*************************************************************************
  * 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
@@ -527,7 +527,7 @@ namespace comphelper
     {
         Reference<XMultiServiceFactory> sm = getProcessServiceFactory();
 
-        // getting the Core Uno proxy object
+        // getting the Core Uno proxy object 
         // It will call disposing and make sure we clear all our references
         {
             Reference<XTerminateListener> xCore(
@@ -586,7 +586,7 @@ namespace comphelper
             m_Active = false;
     }
 
-    // private static UiEventsLogger_Impl
+    // private static UiEventsLogger_Impl 
     bool UiEventsLogger_Impl::shouldActivate()
     {
         return getEnabledFromCfg() && getEnabledFromCoreController();
diff --git a/comphelper/source/misc/weak.cxx b/comphelper/source/misc/weak.cxx
index e84e069f0e38..43d69b4e9fc0 100644
--- a/comphelper/source/misc/weak.cxx
+++ b/comphelper/source/misc/weak.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
@@ -44,7 +44,7 @@ OWeakTypeObject::~OWeakTypeObject()
 {
 }
 
-Any SAL_CALL OWeakTypeObject::queryInterface(const Type & rType )   throw (RuntimeException)
+Any SAL_CALL OWeakTypeObject::queryInterface(const Type & rType )	throw (RuntimeException)
 {
     if( rType == XTypeProvider::static_type() )
         return Any( Reference< XTypeProvider >(this) );
@@ -52,12 +52,12 @@ Any SAL_CALL OWeakTypeObject::queryInterface(const Type & rType )   throw (Runti
         return ::cppu::OWeakObject::queryInterface( rType );
 }
 
-void SAL_CALL OWeakTypeObject::acquire()    throw ()
+void SAL_CALL OWeakTypeObject::acquire()	throw ()
 {
     ::cppu::OWeakObject::acquire();
 }
 
-void SAL_CALL OWeakTypeObject::release()    throw ()
+void SAL_CALL OWeakTypeObject::release()	throw ()
 {
     ::cppu::OWeakObject::release();
 }
diff --git a/comphelper/source/misc/weakeventlistener.cxx b/comphelper/source/misc/weakeventlistener.cxx
index 0a96698e7b92..6213a6f1f285 100644
--- a/comphelper/source/misc/weakeventlistener.cxx
+++ b/comphelper/source/misc/weakeventlistener.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
@@ -87,7 +87,7 @@ namespace comphelper
     }
 
 //.........................................................................
-}   // namespace comphelper
+}	// namespace comphelper
 //.........................................................................
 
 
diff --git a/comphelper/source/officeinstdir/officeinstallationdirectories.cxx b/comphelper/source/officeinstdir/officeinstallationdirectories.cxx
index 3ce0d4de865a..bd61880107d2 100644
--- a/comphelper/source/officeinstdir/officeinstallationdirectories.cxx
+++ b/comphelper/source/officeinstdir/officeinstallationdirectories.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
diff --git a/comphelper/source/officeinstdir/officeinstallationdirectories.hxx b/comphelper/source/officeinstdir/officeinstallationdirectories.hxx
index 2ffb3582718a..b76fd1c35c4d 100644
--- a/comphelper/source/officeinstdir/officeinstallationdirectories.hxx
+++ b/comphelper/source/officeinstdir/officeinstallationdirectories.hxx
@@ -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
diff --git a/comphelper/source/processfactory/componentfactory.cxx b/comphelper/source/processfactory/componentfactory.cxx
index 7a3b17111072..88f36551f106 100644
--- a/comphelper/source/processfactory/componentfactory.cxx
+++ b/comphelper/source/processfactory/componentfactory.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
@@ -83,4 +83,4 @@ Reference< XSingleServiceFactory > loadLibComponentFactory(
         rLibName, OUString(), rImplName, xSF, xKey ), UNO_QUERY );
 }
 
-}   // namespace comphelper
+}	// namespace comphelper
diff --git a/comphelper/source/processfactory/processfactory.cxx b/comphelper/source/processfactory/processfactory.cxx
index 514d3377edab..68f4d8bc3259 100644
--- a/comphelper/source/processfactory/processfactory.cxx
+++ b/comphelper/source/processfactory/processfactory.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
diff --git a/comphelper/source/property/ChainablePropertySet.cxx b/comphelper/source/property/ChainablePropertySet.cxx
index 936510f21309..542fee8bddce 100644
--- a/comphelper/source/property/ChainablePropertySet.cxx
+++ b/comphelper/source/property/ChainablePropertySet.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
@@ -42,7 +42,7 @@ using namespace ::com::sun::star::lang;
 using namespace ::com::sun::star::beans;
 using ::vos::IMutex;
 
-ChainablePropertySet::ChainablePropertySet( comphelper::ChainablePropertySetInfo* pInfo, vos::IMutex *pMutex )
+ChainablePropertySet::ChainablePropertySet( comphelper::ChainablePropertySetInfo* pInfo, vos::IMutex *pMutex ) 
     throw()
 : mpInfo ( pInfo )
 , mpMutex ( pMutex )
@@ -50,13 +50,13 @@ ChainablePropertySet::ChainablePropertySet( comphelper::ChainablePropertySetInfo
 {
 }
 
-ChainablePropertySet::~ChainablePropertySet()
+ChainablePropertySet::~ChainablePropertySet() 
     throw()
 {
 }
 
 // XPropertySet
-Reference< XPropertySetInfo > SAL_CALL ChainablePropertySet::getPropertySetInfo(  )
+Reference< XPropertySetInfo > SAL_CALL ChainablePropertySet::getPropertySetInfo(  ) 
     throw(RuntimeException)
 {
     return mxInfo;
@@ -74,7 +74,7 @@ void ChainablePropertySet::unlockMutex()
         mpMutex->release();
 }
 
-void SAL_CALL ChainablePropertySet::setPropertyValue( const ::rtl::OUString& rPropertyName, const Any& rValue )
+void SAL_CALL ChainablePropertySet::setPropertyValue( const ::rtl::OUString& rPropertyName, const Any& rValue ) 
     throw(UnknownPropertyException, PropertyVetoException, IllegalArgumentException, WrappedTargetException, RuntimeException)
 {
     // acquire mutex in c-tor and releases it in the d-tor (exception safe!).
@@ -92,7 +92,7 @@ void SAL_CALL ChainablePropertySet::setPropertyValue( const ::rtl::OUString& rPr
     _postSetValues();
 }
 
-Any SAL_CALL ChainablePropertySet::getPropertyValue( const ::rtl::OUString& rPropertyName )
+Any SAL_CALL ChainablePropertySet::getPropertyValue( const ::rtl::OUString& rPropertyName ) 
     throw(UnknownPropertyException, WrappedTargetException, RuntimeException)
 {
     // acquire mutex in c-tor and releases it in the d-tor (exception safe!).
@@ -113,32 +113,32 @@ Any SAL_CALL ChainablePropertySet::getPropertyValue( const ::rtl::OUString& rPro
     return aAny;
 }
 
-void SAL_CALL ChainablePropertySet::addPropertyChangeListener( const ::rtl::OUString&, const Reference< XPropertyChangeListener >& )
+void SAL_CALL ChainablePropertySet::addPropertyChangeListener( const ::rtl::OUString&, const Reference< XPropertyChangeListener >& ) 
     throw(UnknownPropertyException, WrappedTargetException, RuntimeException)
 {
     // todo
 }
 
-void SAL_CALL ChainablePropertySet::removePropertyChangeListener( const ::rtl::OUString&, const Reference< XPropertyChangeListener >& )
+void SAL_CALL ChainablePropertySet::removePropertyChangeListener( const ::rtl::OUString&, const Reference< XPropertyChangeListener >& ) 
     throw(UnknownPropertyException, WrappedTargetException, RuntimeException)
 {
     // todo
 }
 
-void SAL_CALL ChainablePropertySet::addVetoableChangeListener( const ::rtl::OUString&, const Reference< XVetoableChangeListener >& )
+void SAL_CALL ChainablePropertySet::addVetoableChangeListener( const ::rtl::OUString&, const Reference< XVetoableChangeListener >& ) 
     throw(UnknownPropertyException, WrappedTargetException, RuntimeException)
 {
     // todo
 }
 
-void SAL_CALL ChainablePropertySet::removeVetoableChangeListener( const ::rtl::OUString&, const Reference< XVetoableChangeListener >& )
+void SAL_CALL ChainablePropertySet::removeVetoableChangeListener( const ::rtl::OUString&, const Reference< XVetoableChangeListener >& ) 
     throw(UnknownPropertyException, WrappedTargetException, RuntimeException)
 {
     // todo
 }
 
 // XMultiPropertySet
-void SAL_CALL ChainablePropertySet::setPropertyValues( const Sequence< ::rtl::OUString >& aPropertyNames, const Sequence< Any >& aValues )
+void SAL_CALL ChainablePropertySet::setPropertyValues( const Sequence< ::rtl::OUString >& aPropertyNames, const Sequence< Any >& aValues ) 
     throw(PropertyVetoException, IllegalArgumentException, WrappedTargetException, RuntimeException)
 {
     // acquire mutex in c-tor and releases it in the d-tor (exception safe!).
@@ -172,7 +172,7 @@ void SAL_CALL ChainablePropertySet::setPropertyValues( const Sequence< ::rtl::OU
     }
 }
 
-Sequence< Any > SAL_CALL ChainablePropertySet::getPropertyValues( const Sequence< ::rtl::OUString >& aPropertyNames )
+Sequence< Any > SAL_CALL ChainablePropertySet::getPropertyValues( const Sequence< ::rtl::OUString >& aPropertyNames ) 
     throw(RuntimeException)
 {
     // acquire mutex in c-tor and releases it in the d-tor (exception safe!).
@@ -206,26 +206,26 @@ Sequence< Any > SAL_CALL ChainablePropertySet::getPropertyValues( const Sequence
     return aValues;
 }
 
-void SAL_CALL ChainablePropertySet::addPropertiesChangeListener( const Sequence< ::rtl::OUString >&, const Reference< XPropertiesChangeListener >& )
+void SAL_CALL ChainablePropertySet::addPropertiesChangeListener( const Sequence< ::rtl::OUString >&, const Reference< XPropertiesChangeListener >& ) 
     throw(RuntimeException)
 {
     // todo
 }
 
-void SAL_CALL ChainablePropertySet::removePropertiesChangeListener( const Reference< XPropertiesChangeListener >& )
+void SAL_CALL ChainablePropertySet::removePropertiesChangeListener( const Reference< XPropertiesChangeListener >& ) 
     throw(RuntimeException)
 {
     // todo
 }
 
-void SAL_CALL ChainablePropertySet::firePropertiesChangeEvent( const Sequence< ::rtl::OUString >&, const Reference< XPropertiesChangeListener >& )
+void SAL_CALL ChainablePropertySet::firePropertiesChangeEvent( const Sequence< ::rtl::OUString >&, const Reference< XPropertiesChangeListener >& ) 
     throw(RuntimeException)
 {
     // todo
 }
 
 // XPropertyState
-PropertyState SAL_CALL ChainablePropertySet::getPropertyState( const ::rtl::OUString& PropertyName )
+PropertyState SAL_CALL ChainablePropertySet::getPropertyState( const ::rtl::OUString& PropertyName ) 
     throw(UnknownPropertyException, RuntimeException)
 {
     PropertyInfoHash::const_iterator aIter =  mpInfo->maMap.find( PropertyName );
@@ -241,7 +241,7 @@ PropertyState SAL_CALL ChainablePropertySet::getPropertyState( const ::rtl::OUSt
     return aState;
 }
 
-Sequence< PropertyState > SAL_CALL ChainablePropertySet::getPropertyStates( const Sequence< ::rtl::OUString >& rPropertyNames )
+Sequence< PropertyState > SAL_CALL ChainablePropertySet::getPropertyStates( const Sequence< ::rtl::OUString >& rPropertyNames ) 
     throw(UnknownPropertyException, RuntimeException)
 {
     const sal_Int32 nCount = rPropertyNames.getLength();
@@ -267,7 +267,7 @@ Sequence< PropertyState > SAL_CALL ChainablePropertySet::getPropertyStates( cons
     return aStates;
 }
 
-void SAL_CALL ChainablePropertySet::setPropertyToDefault( const ::rtl::OUString& rPropertyName )
+void SAL_CALL ChainablePropertySet::setPropertyToDefault( const ::rtl::OUString& rPropertyName ) 
     throw(UnknownPropertyException, RuntimeException)
 {
     PropertyInfoHash::const_iterator aIter = mpInfo->maMap.find ( rPropertyName );
@@ -277,7 +277,7 @@ void SAL_CALL ChainablePropertySet::setPropertyToDefault( const ::rtl::OUString&
     _setPropertyToDefault( *((*aIter).second) );
 }
 
-Any SAL_CALL ChainablePropertySet::getPropertyDefault( const ::rtl::OUString& rPropertyName )
+Any SAL_CALL ChainablePropertySet::getPropertyDefault( const ::rtl::OUString& rPropertyName ) 
     throw(UnknownPropertyException, WrappedTargetException, RuntimeException)
 {
     PropertyInfoHash::const_iterator aIter = mpInfo->maMap.find ( rPropertyName );
@@ -293,7 +293,7 @@ void ChainablePropertySet::_preGetPropertyState ()
     OSL_ENSURE( sal_False, "you have to implement this yourself!");
 }
 
-void ChainablePropertySet::_getPropertyState( const comphelper::PropertyInfo&, PropertyState& )
+void ChainablePropertySet::_getPropertyState( const comphelper::PropertyInfo&, PropertyState& ) 
     throw(UnknownPropertyException )
 {
     OSL_ENSURE( sal_False, "you have to implement this yourself!");
@@ -305,13 +305,13 @@ void ChainablePropertySet::_postGetPropertyState ()
     OSL_ENSURE( sal_False, "you have to implement this yourself!");
 }
 
-void ChainablePropertySet::_setPropertyToDefault( const comphelper::PropertyInfo& )
+void ChainablePropertySet::_setPropertyToDefault( const comphelper::PropertyInfo& )  
     throw(UnknownPropertyException )
 {
     OSL_ENSURE( sal_False, "you have to implement this yourself!");
 }
 
-Any ChainablePropertySet::_getPropertyDefault( const comphelper::PropertyInfo& )
+Any ChainablePropertySet::_getPropertyDefault( const comphelper::PropertyInfo& ) 
     throw(UnknownPropertyException, WrappedTargetException )
 {
     OSL_ENSURE( sal_False, "you have to implement this yourself!");
diff --git a/comphelper/source/property/ChainablePropertySetInfo.cxx b/comphelper/source/property/ChainablePropertySetInfo.cxx
index 6660517ef97e..ebe2f05fc382 100644
--- a/comphelper/source/property/ChainablePropertySetInfo.cxx
+++ b/comphelper/source/property/ChainablePropertySetInfo.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
@@ -44,28 +44,28 @@ using ::com::sun::star::beans::Property;
 using ::com::sun::star::beans::XPropertySetInfo;
 using ::com::sun::star::beans::UnknownPropertyException;
 
-ChainablePropertySetInfo::ChainablePropertySetInfo()
+ChainablePropertySetInfo::ChainablePropertySetInfo() 
     throw()
 {
 }
 
-ChainablePropertySetInfo::ChainablePropertySetInfo( PropertyInfo* pMap )
+ChainablePropertySetInfo::ChainablePropertySetInfo( PropertyInfo* pMap ) 
     throw()
 {
     add ( pMap );
 }
 
-ChainablePropertySetInfo::~ChainablePropertySetInfo()
+ChainablePropertySetInfo::~ChainablePropertySetInfo() 
     throw()
 {
 }
 
-void ChainablePropertySetInfo::add( PropertyInfo* pMap, sal_Int32 nCount )
+void ChainablePropertySetInfo::add( PropertyInfo* pMap, sal_Int32 nCount ) 
     throw()
 {
-    // nCount < 0   => add all
-    // nCount == 0  => add nothing
-    // nCount > 0   => add at most nCount entries
+    // nCount < 0	=> add all
+    // nCount == 0	=> add nothing
+    // nCount > 0	=> add at most nCount entries
     if( maProperties.getLength() )
         maProperties.realloc( 0 );
 
@@ -82,7 +82,7 @@ void ChainablePropertySetInfo::add( PropertyInfo* pMap, sal_Int32 nCount )
     }
 }
 
-void ChainablePropertySetInfo::remove( const rtl::OUString& aName )
+void ChainablePropertySetInfo::remove( const rtl::OUString& aName ) 
     throw()
 {
     maMap.erase ( aName );
@@ -90,7 +90,7 @@ void ChainablePropertySetInfo::remove( const rtl::OUString& aName )
          maProperties.realloc( 0 );
 }
 
-Sequence< ::Property > SAL_CALL ChainablePropertySetInfo::getProperties()
+Sequence< ::Property > SAL_CALL ChainablePropertySetInfo::getProperties() 
     throw(::com::sun::star::uno::RuntimeException)
 {
     sal_Int32 nSize = maMap.size();
@@ -116,7 +116,7 @@ Sequence< ::Property > SAL_CALL ChainablePropertySetInfo::getProperties()
     return maProperties;
 }
 
-Property SAL_CALL ChainablePropertySetInfo::getPropertyByName( const ::rtl::OUString& rName )
+Property SAL_CALL ChainablePropertySetInfo::getPropertyByName( const ::rtl::OUString& rName ) 
     throw(::UnknownPropertyException, ::com::sun::star::uno::RuntimeException)
 {
     PropertyInfoHash::iterator aIter = maMap.find( rName );
@@ -135,7 +135,7 @@ Property SAL_CALL ChainablePropertySetInfo::getPropertyByName( const ::rtl::OUSt
     return aProperty;
 }
 
-sal_Bool SAL_CALL ChainablePropertySetInfo::hasPropertyByName( const ::rtl::OUString& rName )
+sal_Bool SAL_CALL ChainablePropertySetInfo::hasPropertyByName( const ::rtl::OUString& rName ) 
     throw(::com::sun::star::uno::RuntimeException)
 {
     return static_cast < sal_Bool > ( maMap.find ( rName ) != maMap.end() );
diff --git a/comphelper/source/property/MasterPropertySet.cxx b/comphelper/source/property/MasterPropertySet.cxx
index 28078a8019fc..1e3214055f35 100644
--- a/comphelper/source/property/MasterPropertySet.cxx
+++ b/comphelper/source/property/MasterPropertySet.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
@@ -61,8 +61,8 @@ AutoOGuardArray::AutoOGuardArray( sal_Int32 nNumElements )
 AutoOGuardArray::~AutoOGuardArray()
 {
     //!! release auto_ptr's and thus the mutexes locks
-    delete [] pGuardArray;
-
+    delete [] pGuardArray; 
+    
 }
 
 //////////////////////////////////////////////////////////////////////
@@ -82,7 +82,7 @@ SlaveData::SlaveData ( ChainablePropertySet *pSlave)
 {
 }
 
-MasterPropertySet::MasterPropertySet( comphelper::MasterPropertySetInfo* pInfo, IMutex *pMutex )
+MasterPropertySet::MasterPropertySet( comphelper::MasterPropertySetInfo* pInfo, IMutex *pMutex ) 
     throw()
 : mpInfo ( pInfo )
 , mpMutex ( pMutex )
@@ -102,7 +102,7 @@ void MasterPropertySet::unlockMutex()
         mpMutex->release();
 }
 
-MasterPropertySet::~MasterPropertySet()
+MasterPropertySet::~MasterPropertySet() 
     throw()
 {
     SlaveMap::iterator aEnd = maSlaveMap.end(), aIter = maSlaveMap.begin();
@@ -114,7 +114,7 @@ MasterPropertySet::~MasterPropertySet()
 }
 
 // XPropertySet
-Reference< XPropertySetInfo > SAL_CALL MasterPropertySet::getPropertySetInfo(  )
+Reference< XPropertySetInfo > SAL_CALL MasterPropertySet::getPropertySetInfo(  ) 
     throw(RuntimeException)
 {
     return mxInfo;
@@ -127,7 +127,7 @@ void MasterPropertySet::registerSlave ( ChainablePropertySet *pNewSet )
     mpInfo->add ( pNewSet->mpInfo->maMap, mnLastId );
 }
 
-void SAL_CALL MasterPropertySet::setPropertyValue( const ::rtl::OUString& rPropertyName, const Any& rValue )
+void SAL_CALL MasterPropertySet::setPropertyValue( const ::rtl::OUString& rPropertyName, const Any& rValue ) 
     throw(UnknownPropertyException, PropertyVetoException, IllegalArgumentException, WrappedTargetException, RuntimeException)
 {
     // acquire mutex in c-tor and releases it in the d-tor (exception safe!).
@@ -149,7 +149,7 @@ void SAL_CALL MasterPropertySet::setPropertyValue( const ::rtl::OUString& rPrope
     else
     {
         ChainablePropertySet * pSlave = maSlaveMap [ (*aIter).second->mnMapId ]->mpSlave;
-
+        
         // acquire mutex in c-tor and releases it in the d-tor (exception safe!).
         std::auto_ptr< vos::OGuard > pMutexGuard2;
         if (pSlave->mpMutex)
@@ -161,7 +161,7 @@ void SAL_CALL MasterPropertySet::setPropertyValue( const ::rtl::OUString& rPrope
     }
 }
 
-Any SAL_CALL MasterPropertySet::getPropertyValue( const ::rtl::OUString& rPropertyName )
+Any SAL_CALL MasterPropertySet::getPropertyValue( const ::rtl::OUString& rPropertyName ) 
     throw(UnknownPropertyException, WrappedTargetException, RuntimeException)
 {
     // acquire mutex in c-tor and releases it in the d-tor (exception safe!).
@@ -189,7 +189,7 @@ Any SAL_CALL MasterPropertySet::getPropertyValue( const ::rtl::OUString& rProper
         std::auto_ptr< vos::OGuard > pMutexGuard2;
         if (pSlave->mpMutex)
             pMutexGuard2.reset( new vos::OGuard(pSlave->mpMutex) );
-
+        
         pSlave->_preGetValues();
         pSlave->_getSingleValue( *((*aIter).second->mpInfo), aAny );
         pSlave->_postGetValues();
@@ -197,32 +197,32 @@ Any SAL_CALL MasterPropertySet::getPropertyValue( const ::rtl::OUString& rProper
     return aAny;
 }
 
-void SAL_CALL MasterPropertySet::addPropertyChangeListener( const ::rtl::OUString&, const Reference< XPropertyChangeListener >& )
+void SAL_CALL MasterPropertySet::addPropertyChangeListener( const ::rtl::OUString&, const Reference< XPropertyChangeListener >& ) 
     throw(UnknownPropertyException, WrappedTargetException, RuntimeException)
 {
     // todo
 }
 
-void SAL_CALL MasterPropertySet::removePropertyChangeListener( const ::rtl::OUString&, const Reference< XPropertyChangeListener >& )
+void SAL_CALL MasterPropertySet::removePropertyChangeListener( const ::rtl::OUString&, const Reference< XPropertyChangeListener >& ) 
     throw(UnknownPropertyException, WrappedTargetException, RuntimeException)
 {
     // todo
 }
 
-void SAL_CALL MasterPropertySet::addVetoableChangeListener( const ::rtl::OUString&, const Reference< XVetoableChangeListener >& )
+void SAL_CALL MasterPropertySet::addVetoableChangeListener( const ::rtl::OUString&, const Reference< XVetoableChangeListener >& ) 
     throw(UnknownPropertyException, WrappedTargetException, RuntimeException)
 {
     // todo
 }
 
-void SAL_CALL MasterPropertySet::removeVetoableChangeListener( const ::rtl::OUString&, const Reference< XVetoableChangeListener >& )
+void SAL_CALL MasterPropertySet::removeVetoableChangeListener( const ::rtl::OUString&, const Reference< XVetoableChangeListener >& ) 
     throw(UnknownPropertyException, WrappedTargetException, RuntimeException)
 {
     // todo
 }
 
 // XMultiPropertySet
-void SAL_CALL MasterPropertySet::setPropertyValues( const Sequence< ::rtl::OUString >& aPropertyNames, const Sequence< Any >& aValues )
+void SAL_CALL MasterPropertySet::setPropertyValues( const Sequence< ::rtl::OUString >& aPropertyNames, const Sequence< Any >& aValues ) 
     throw(PropertyVetoException, IllegalArgumentException, WrappedTargetException, RuntimeException)
 {
     // acquire mutex in c-tor and releases it in the d-tor (exception safe!).
@@ -245,7 +245,7 @@ void SAL_CALL MasterPropertySet::setPropertyValues( const Sequence< ::rtl::OUStr
 
         //!! have an auto_ptr to an array of OGuards in order to have the
         //!! allocated memory properly freed (exception safe!).
-        //!! Since the array itself has auto_ptrs as members we have to use a
+        //!! Since the array itself has auto_ptrs as members we have to use a 
         //!! helper class 'AutoOGuardArray' in order to have
         //!! the acquired locks properly released.
         AutoOGuardArray aOGuardArray( nCount );
@@ -266,7 +266,7 @@ void SAL_CALL MasterPropertySet::setPropertyValues( const Sequence< ::rtl::OUStr
                     // acquire mutex in c-tor and releases it in the d-tor (exception safe!).
                     if (pSlave->mpSlave->mpMutex)
                         aOGuardArray[i].reset( new vos::OGuard(pSlave->mpSlave->mpMutex) );
-
+                    
                     pSlave->mpSlave->_preSetValues();
                     pSlave->SetInit ( sal_True );
                 }
@@ -288,7 +288,7 @@ void SAL_CALL MasterPropertySet::setPropertyValues( const Sequence< ::rtl::OUStr
     }
 }
 
-Sequence< Any > SAL_CALL MasterPropertySet::getPropertyValues( const Sequence< ::rtl::OUString >& aPropertyNames )
+Sequence< Any > SAL_CALL MasterPropertySet::getPropertyValues( const Sequence< ::rtl::OUString >& aPropertyNames ) 
     throw(RuntimeException)
 {
     // acquire mutex in c-tor and releases it in the d-tor (exception safe!).
@@ -310,7 +310,7 @@ Sequence< Any > SAL_CALL MasterPropertySet::getPropertyValues( const Sequence< :
 
         //!! have an auto_ptr to an array of OGuards in order to have the
         //!! allocated memory properly freed (exception safe!).
-        //!! Since the array itself has auto_ptrs as members we have to use a
+        //!! Since the array itself has auto_ptrs as members we have to use a 
         //!! helper class 'AutoOGuardArray' in order to have
         //!! the acquired locks properly released.
         AutoOGuardArray aOGuardArray( nCount );
@@ -354,26 +354,26 @@ Sequence< Any > SAL_CALL MasterPropertySet::getPropertyValues( const Sequence< :
     return aValues;
 }
 
-void SAL_CALL MasterPropertySet::addPropertiesChangeListener( const Sequence< ::rtl::OUString >&, const Reference< XPropertiesChangeListener >& )
+void SAL_CALL MasterPropertySet::addPropertiesChangeListener( const Sequence< ::rtl::OUString >&, const Reference< XPropertiesChangeListener >& ) 
     throw(RuntimeException)
 {
     // todo
 }
 
-void SAL_CALL MasterPropertySet::removePropertiesChangeListener( const Reference< XPropertiesChangeListener >& )
+void SAL_CALL MasterPropertySet::removePropertiesChangeListener( const Reference< XPropertiesChangeListener >& ) 
     throw(RuntimeException)
 {
     // todo
 }
 
-void SAL_CALL MasterPropertySet::firePropertiesChangeEvent( const Sequence< ::rtl::OUString >&, const Reference< XPropertiesChangeListener >& )
+void SAL_CALL MasterPropertySet::firePropertiesChangeEvent( const Sequence< ::rtl::OUString >&, const Reference< XPropertiesChangeListener >& ) 
     throw(RuntimeException)
 {
     // todo
 }
 
 // XPropertyState
-PropertyState SAL_CALL MasterPropertySet::getPropertyState( const ::rtl::OUString& PropertyName )
+PropertyState SAL_CALL MasterPropertySet::getPropertyState( const ::rtl::OUString& PropertyName ) 
     throw(UnknownPropertyException, RuntimeException)
 {
     PropertyDataHash::const_iterator aIter =  mpInfo->maMap.find( PropertyName );
@@ -405,7 +405,7 @@ PropertyState SAL_CALL MasterPropertySet::getPropertyState( const ::rtl::OUStrin
     return aState;
 }
 
-Sequence< PropertyState > SAL_CALL MasterPropertySet::getPropertyStates( const Sequence< ::rtl::OUString >& rPropertyNames )
+Sequence< PropertyState > SAL_CALL MasterPropertySet::getPropertyStates( const Sequence< ::rtl::OUString >& rPropertyNames ) 
     throw(UnknownPropertyException, RuntimeException)
 {
     const sal_Int32 nCount = rPropertyNames.getLength();
@@ -452,7 +452,7 @@ Sequence< PropertyState > SAL_CALL MasterPropertySet::getPropertyStates( const S
     return aStates;
 }
 
-void SAL_CALL MasterPropertySet::setPropertyToDefault( const ::rtl::OUString& rPropertyName )
+void SAL_CALL MasterPropertySet::setPropertyToDefault( const ::rtl::OUString& rPropertyName ) 
     throw(UnknownPropertyException, RuntimeException)
 {
     PropertyDataHash::const_iterator aIter = mpInfo->maMap.find ( rPropertyName );
@@ -462,7 +462,7 @@ void SAL_CALL MasterPropertySet::setPropertyToDefault( const ::rtl::OUString& rP
     _setPropertyToDefault( *((*aIter).second->mpInfo) );
 }
 
-Any SAL_CALL MasterPropertySet::getPropertyDefault( const ::rtl::OUString& rPropertyName )
+Any SAL_CALL MasterPropertySet::getPropertyDefault( const ::rtl::OUString& rPropertyName ) 
     throw(UnknownPropertyException, WrappedTargetException, RuntimeException)
 {
     PropertyDataHash::const_iterator aIter = mpInfo->maMap.find ( rPropertyName );
@@ -478,7 +478,7 @@ void MasterPropertySet::_preGetPropertyState ()
     OSL_ENSURE( sal_False, "you have to implement this yourself!");
 }
 
-void MasterPropertySet::_getPropertyState( const comphelper::PropertyInfo&, PropertyState& )
+void MasterPropertySet::_getPropertyState( const comphelper::PropertyInfo&, PropertyState& ) 
     throw(UnknownPropertyException )
 {
     OSL_ENSURE( sal_False, "you have to implement this yourself!");
@@ -490,13 +490,13 @@ void MasterPropertySet::_postGetPropertyState ()
     OSL_ENSURE( sal_False, "you have to implement this yourself!");
 }
 
-void MasterPropertySet::_setPropertyToDefault( const comphelper::PropertyInfo& )
+void MasterPropertySet::_setPropertyToDefault( const comphelper::PropertyInfo& )  
     throw(UnknownPropertyException )
 {
     OSL_ENSURE( sal_False, "you have to implement this yourself!");
 }
 
-Any MasterPropertySet::_getPropertyDefault( const comphelper::PropertyInfo& )
+Any MasterPropertySet::_getPropertyDefault( const comphelper::PropertyInfo& ) 
     throw(UnknownPropertyException, WrappedTargetException )
 {
     OSL_ENSURE( sal_False, "you have to implement this yourself!");
diff --git a/comphelper/source/property/MasterPropertySetInfo.cxx b/comphelper/source/property/MasterPropertySetInfo.cxx
index 57cf22b77508..67ab45c83c15 100644
--- a/comphelper/source/property/MasterPropertySetInfo.cxx
+++ b/comphelper/source/property/MasterPropertySetInfo.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
@@ -46,18 +46,18 @@ using ::com::sun::star::beans::Property;
 using ::com::sun::star::beans::XPropertySetInfo;
 using ::com::sun::star::beans::UnknownPropertyException;
 
-MasterPropertySetInfo::MasterPropertySetInfo()
+MasterPropertySetInfo::MasterPropertySetInfo() 
     throw()
 {
 }
 
-MasterPropertySetInfo::MasterPropertySetInfo( PropertyInfo* pMap )
+MasterPropertySetInfo::MasterPropertySetInfo( PropertyInfo* pMap ) 
     throw()
 {
     add ( pMap );
 }
 
-MasterPropertySetInfo::~MasterPropertySetInfo()
+MasterPropertySetInfo::~MasterPropertySetInfo() 
     throw()
 {
     PropertyDataHash::iterator aEnd = maMap.end(), aIter = maMap.begin();
@@ -68,12 +68,12 @@ MasterPropertySetInfo::~MasterPropertySetInfo()
     }
 }
 
-void MasterPropertySetInfo::add( PropertyInfo* pMap, sal_Int32 nCount, sal_uInt8 nMapId )
+void MasterPropertySetInfo::add( PropertyInfo* pMap, sal_Int32 nCount, sal_uInt8 nMapId ) 
     throw()
 {
-    // nCount < 0   => add all
-    // nCount == 0  => add nothing
-    // nCount > 0   => add at most nCount entries
+    // nCount < 0	=> add all
+    // nCount == 0	=> add nothing
+    // nCount > 0	=> add at most nCount entries
     if( maProperties.getLength() )
         maProperties.realloc( 0 );
 
@@ -90,7 +90,7 @@ void MasterPropertySetInfo::add( PropertyInfo* pMap, sal_Int32 nCount, sal_uInt8
     }
 }
 
-void MasterPropertySetInfo::add( PropertyInfoHash &rHash, sal_uInt8 nMapId )
+void MasterPropertySetInfo::add( PropertyInfoHash &rHash, sal_uInt8 nMapId ) 
     throw()
 {
     if( maProperties.getLength() )
@@ -109,7 +109,7 @@ void MasterPropertySetInfo::add( PropertyInfoHash &rHash, sal_uInt8 nMapId )
     }
 }
 
-void MasterPropertySetInfo::remove( const rtl::OUString& aName )
+void MasterPropertySetInfo::remove( const rtl::OUString& aName ) 
     throw()
 {
     maMap.erase ( aName );
@@ -117,7 +117,7 @@ void MasterPropertySetInfo::remove( const rtl::OUString& aName )
          maProperties.realloc( 0 );
 }
 
-Sequence< ::Property > SAL_CALL MasterPropertySetInfo::getProperties()
+Sequence< ::Property > SAL_CALL MasterPropertySetInfo::getProperties() 
     throw(::com::sun::star::uno::RuntimeException)
 {
     sal_Int32 nSize = maMap.size();
@@ -143,7 +143,7 @@ Sequence< ::Property > SAL_CALL MasterPropertySetInfo::getProperties()
     return maProperties;
 }
 
-Property SAL_CALL MasterPropertySetInfo::getPropertyByName( const ::rtl::OUString& rName )
+Property SAL_CALL MasterPropertySetInfo::getPropertyByName( const ::rtl::OUString& rName ) 
     throw(::UnknownPropertyException, ::com::sun::star::uno::RuntimeException)
 {
     PropertyDataHash::iterator aIter = maMap.find( rName );
@@ -158,12 +158,12 @@ Property SAL_CALL MasterPropertySetInfo::getPropertyByName( const ::rtl::OUStrin
     const Type* pType;
     GenerateCppuType ( pInfo->meCppuType, pType );
     aProperty.Type = *pType;
-
+    
     aProperty.Attributes = pInfo->mnAttributes;
     return aProperty;
 }
 
-sal_Bool SAL_CALL MasterPropertySetInfo::hasPropertyByName( const ::rtl::OUString& rName )
+sal_Bool SAL_CALL MasterPropertySetInfo::hasPropertyByName( const ::rtl::OUString& rName ) 
     throw(::com::sun::star::uno::RuntimeException)
 {
     return static_cast < sal_Bool > ( maMap.find ( rName ) != maMap.end() );
diff --git a/comphelper/source/property/TypeGeneration.cxx b/comphelper/source/property/TypeGeneration.cxx
index bf880330ce75..6e6dc38582da 100644
--- a/comphelper/source/property/TypeGeneration.cxx
+++ b/comphelper/source/property/TypeGeneration.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
@@ -153,65 +153,65 @@ namespace comphelper
     {
         switch( eType )
         {
-            case CPPUTYPE_BOOLEAN:      pType = &::getBooleanCppuType();    break;
-            case CPPUTYPE_INT8:         pType = &::getCppuType( (sal_Int8*)0 ); break;
-            case CPPUTYPE_INT16:        pType = &::getCppuType( (sal_Int16*)0 );    break;
-            case CPPUTYPE_INT32:        pType = &::getCppuType( (sal_Int32*)0 );    break;
+            case CPPUTYPE_BOOLEAN:		pType = &::getBooleanCppuType();	break;
+            case CPPUTYPE_INT8:			pType = &::getCppuType( (sal_Int8*)0 );	break;
+            case CPPUTYPE_INT16:		pType = &::getCppuType( (sal_Int16*)0 );	break;
+            case CPPUTYPE_INT32:		pType = &::getCppuType( (sal_Int32*)0 );	break;
 
-            case CPPUTYPE_DOUBLE:       pType = &::getCppuType( (double*)0 ); break;
-            case CPPUTYPE_FLOAT:        pType = &::getCppuType( (float*)0 );    break;
-            case CPPUTYPE_OUSTRING:     pType = &::getCppuType( (OUString*)0 ); break;
-            case CPPUTYPE_FONTSLANT:    pType = &::getCppuType( (FontSlant*)0 );    break;
-            case CPPUTYPE_LOCALE:       pType = &::getCppuType( (Locale*)0 );   break;
-            case CPPUTYPE_PROPERTYVALUE:pType = &::getCppuType( (Sequence<PropertyValue>*)0 );  break;
-            case CPPUTYPE_PROPERTYVALUES:   pType = &::getCppuType( (Sequence<PropertyValues>*)0 ); break;
-            case CPPUTYPE_BORDERLINE:   pType = &::getCppuType( (table::BorderLine*)0 );    break;
-            case CPPUTYPE_BREAK:        pType = &::getCppuType( (style::BreakType*)0 ); break;
-            case CPPUTYPE_GRAPHICLOC:   pType = &::getCppuType( (style::GraphicLocation*)0 );   break;
-            case CPPUTYPE_DROPCAPFMT:   pType = &::getCppuType( (style::DropCapFormat*)0 ); break;
-            case CPPUTYPE_LINESPACE:    pType = &::getCppuType( (style::LineSpacing*)0 );   break;
+            case CPPUTYPE_DOUBLE:		pType = &::getCppuType( (double*)0 ); break;
+            case CPPUTYPE_FLOAT:		pType = &::getCppuType( (float*)0 );	break;
+            case CPPUTYPE_OUSTRING:		pType = &::getCppuType( (OUString*)0 );	break;
+            case CPPUTYPE_FONTSLANT:	pType = &::getCppuType( (FontSlant*)0 );	break;
+            case CPPUTYPE_LOCALE:		pType = &::getCppuType( (Locale*)0 );	break;
+            case CPPUTYPE_PROPERTYVALUE:pType = &::getCppuType( (Sequence<PropertyValue>*)0 );	break;
+            case CPPUTYPE_PROPERTYVALUES:	pType = &::getCppuType( (Sequence<PropertyValues>*)0 );	break;
+            case CPPUTYPE_BORDERLINE:	pType = &::getCppuType( (table::BorderLine*)0 );	break;
+            case CPPUTYPE_BREAK:		pType = &::getCppuType( (style::BreakType*)0 );	break;
+            case CPPUTYPE_GRAPHICLOC:	pType = &::getCppuType( (style::GraphicLocation*)0 );	break;
+            case CPPUTYPE_DROPCAPFMT:	pType = &::getCppuType( (style::DropCapFormat*)0 );	break;
+            case CPPUTYPE_LINESPACE:	pType = &::getCppuType( (style::LineSpacing*)0 );	break;
 
-            case CPPUTYPE_AWTSIZE:      pType = &::getCppuType( (awt::Size*)0 );    break;
-            case CPPUTYPE_SHADOWFMT:    pType = &::getCppuType( (table::ShadowFormat*)0 );  break;
-            case CPPUTYPE_TBLCOLSEP:    pType = &::getCppuType( (Sequence<text::TableColumnSeparator>*)0 ); break;
-            case CPPUTYPE_PNTSEQSEQ:    pType = &::getCppuType( (PointSequenceSequence*)0 );    break;
-            case CPPUTYPE_DOCIDXMRK:    pType = &::getCppuType( (Sequence< Reference< XDocumentIndexMark > >*)0 );  break;
-            case CPPUTYPE_SEQINT8:      pType = &::getCppuType( (Sequence<sal_Int8>*)0 );   break;
-            case CPPUTYPE_SEQTABSTOP:   pType = &::getCppuType( (Sequence<style::TabStop>*)0 ); break;
+            case CPPUTYPE_AWTSIZE:		pType = &::getCppuType( (awt::Size*)0 );	break;
+            case CPPUTYPE_SHADOWFMT:	pType = &::getCppuType( (table::ShadowFormat*)0 );	break;
+            case CPPUTYPE_TBLCOLSEP:	pType = &::getCppuType( (Sequence<text::TableColumnSeparator>*)0 );	break;
+            case CPPUTYPE_PNTSEQSEQ:	pType = &::getCppuType( (PointSequenceSequence*)0 );	break;
+            case CPPUTYPE_DOCIDXMRK:	pType = &::getCppuType( (Sequence< Reference< XDocumentIndexMark > >*)0 );	break;
+            case CPPUTYPE_SEQINT8:		pType = &::getCppuType( (Sequence<sal_Int8>*)0 );	break;
+            case CPPUTYPE_SEQTABSTOP:	pType = &::getCppuType( (Sequence<style::TabStop>*)0 ); break;
             case CPPUTYPE_SEQANCHORTYPE:pType = &::getCppuType( (Sequence<text::TextContentAnchorType>*)0 ); break;
-            case CPPUTYPE_SEQDEPTXTFLD: pType = &::getCppuType( (Sequence<Reference<XDependentTextField> >*)0); break;
-            case CPPUTYPE_TXTCNTANCHOR: pType = &::getCppuType( (text::TextContentAnchorType*)0 );  break;
-            case CPPUTYPE_WRAPTXTMODE:  pType = &::getCppuType( (text::WrapTextMode*)0 );   break;
+            case CPPUTYPE_SEQDEPTXTFLD:	pType = &::getCppuType( (Sequence<Reference<XDependentTextField> >*)0); break;
+            case CPPUTYPE_TXTCNTANCHOR:	pType = &::getCppuType( (text::TextContentAnchorType*)0 );	break;
+            case CPPUTYPE_WRAPTXTMODE:	pType = &::getCppuType( (text::WrapTextMode*)0 );	break;
 
-            case CPPUTYPE_COLORMODE:    pType = &::getCppuType( (drawing::ColorMode*)0 ); break;
-            case CPPUTYPE_PAGESTYLELAY: pType = &::getCppuType( (style::PageStyleLayout*)0 ); break;
-            case CPPUTYPE_VERTALIGN:    pType = &::getCppuType( (style::VerticalAlignment*)0 ); break;
-            case CPPUTYPE_TABLEBORDER:  pType = &::getCppuType( (table::TableBorder*)0 ); break;
-            case CPPUTYPE_GRFCROP:      pType = &::getCppuType( (text::GraphicCrop*)0 ); break;
-            case CPPUTYPE_SECTFILELNK:  pType = &::getCppuType( (text::SectionFileLink*)0 ); break;
-            case CPPUTYPE_PAGENUMTYPE:  pType = &::getCppuType( (text::PageNumberType*)0); break;
-            case CPPUTYPE_DATETIME:     pType = &::getCppuType( (util::DateTime*)0 ); break;
-            case CPPUTYPE_DATE:         pType = &::getCppuType( (util::Date*)0 ); break;
+            case CPPUTYPE_COLORMODE:	pType = &::getCppuType( (drawing::ColorMode*)0 ); break;
+            case CPPUTYPE_PAGESTYLELAY:	pType = &::getCppuType( (style::PageStyleLayout*)0 ); break;
+            case CPPUTYPE_VERTALIGN:	pType = &::getCppuType( (style::VerticalAlignment*)0 ); break;
+            case CPPUTYPE_TABLEBORDER:	pType = &::getCppuType( (table::TableBorder*)0 ); break;
+            case CPPUTYPE_GRFCROP:		pType = &::getCppuType( (text::GraphicCrop*)0 ); break;
+            case CPPUTYPE_SECTFILELNK:	pType = &::getCppuType( (text::SectionFileLink*)0 ); break;
+            case CPPUTYPE_PAGENUMTYPE: 	pType = &::getCppuType( (text::PageNumberType*)0); break;
+            case CPPUTYPE_DATETIME:		pType = &::getCppuType( (util::DateTime*)0 ); break;
+            case CPPUTYPE_DATE:			pType = &::getCppuType( (util::Date*)0 ); break;
 
-            case CPPUTYPE_REFINTERFACE: pType = &::getCppuType( (Reference<XInterface>*)0 );    break;
-            case CPPUTYPE_REFIDXREPL:   pType = &::getCppuType( (Reference<container::XIndexReplace>*)0 );  break;
-            case CPPUTYPE_REFNAMECNT:   pType = &::getCppuType( (Reference<container::XNameContainer>*)0 ); break;
-            case CPPUTYPE_REFTEXTFRAME: pType = &::getCppuType( (Reference<text::XTextFrame>*)0 );  break;
-            case CPPUTYPE_REFTEXTSECTION:   pType = &::getCppuType( (Reference<text::XTextSection>*)0 );    break;
-            case CPPUTYPE_REFFOOTNOTE:  pType = &::getCppuType( (Reference<text::XFootnote>*)0 );   break;
-            case CPPUTYPE_REFTEXT:      pType = &::getCppuType( (Reference<text::XText>*)0 );   break;
-            case CPPUTYPE_REFTEXTCOL:   pType = &::getCppuType( (Reference<text::XTextColumns>*)0 );    break;
-            case CPPUTYPE_REFFORBCHARS: pType = &::getCppuType( (Reference<XForbiddenCharacters>*)0 ); break;
-            case CPPUTYPE_REFIDXCNTNR:  pType = &::getCppuType( (Reference<XIndexContainer>*)0 ); break;
-            case CPPUTYPE_REFTEXTCNTNT: pType = &::getCppuType( (Reference<XTextContent>*)0 ); break;
-            case CPPUTYPE_REFBITMAP:    pType = &::getCppuType( (Reference<awt::XBitmap>*)0 ); break;
-            case CPPUTYPE_REFNMREPLACE: pType = &::getCppuType( (Reference<container::XNameReplace>*)0 ); break;
-            case CPPUTYPE_REFCELL:      pType = &::getCppuType( (Reference<table::XCell>*)0 ); break;
-            case CPPUTYPE_REFDOCINDEX:  pType = &::getCppuType( (Reference<text::XDocumentIndex>*)0 ); break;
-            case CPPUTYPE_REFDOCIDXMRK: pType = &::getCppuType( (Reference<text::XDocumentIndexMark>*)0 ); break;
-            case CPPUTYPE_REFTXTFIELD:  pType = &::getCppuType( (Reference<text::XTextField>*)0 ); break;
-            case CPPUTYPE_REFTXTRANGE:  pType = &::getCppuType( (Reference<text::XTextRange>*)0 ); break;
-            case CPPUTYPE_REFTXTTABLE:  pType = &::getCppuType( (Reference<text::XTextTable>*)0 ); break;
+            case CPPUTYPE_REFINTERFACE:	pType = &::getCppuType( (Reference<XInterface>*)0 );	break;
+            case CPPUTYPE_REFIDXREPL:	pType = &::getCppuType( (Reference<container::XIndexReplace>*)0 );	break;
+            case CPPUTYPE_REFNAMECNT:	pType = &::getCppuType( (Reference<container::XNameContainer>*)0 );	break;
+            case CPPUTYPE_REFTEXTFRAME:	pType = &::getCppuType( (Reference<text::XTextFrame>*)0 );	break;
+            case CPPUTYPE_REFTEXTSECTION:	pType = &::getCppuType( (Reference<text::XTextSection>*)0 );	break;
+            case CPPUTYPE_REFFOOTNOTE:	pType = &::getCppuType( (Reference<text::XFootnote>*)0 );	break;
+            case CPPUTYPE_REFTEXT:		pType = &::getCppuType( (Reference<text::XText>*)0 );	break;
+            case CPPUTYPE_REFTEXTCOL:	pType = &::getCppuType( (Reference<text::XTextColumns>*)0 );	break;
+            case CPPUTYPE_REFFORBCHARS:	pType = &::getCppuType( (Reference<XForbiddenCharacters>*)0 ); break;
+            case CPPUTYPE_REFIDXCNTNR:	pType = &::getCppuType( (Reference<XIndexContainer>*)0 ); break;
+            case CPPUTYPE_REFTEXTCNTNT:	pType = &::getCppuType( (Reference<XTextContent>*)0 ); break;
+            case CPPUTYPE_REFBITMAP:	pType = &::getCppuType( (Reference<awt::XBitmap>*)0 ); break;
+            case CPPUTYPE_REFNMREPLACE:	pType = &::getCppuType( (Reference<container::XNameReplace>*)0 ); break;
+            case CPPUTYPE_REFCELL:		pType = &::getCppuType( (Reference<table::XCell>*)0 ); break;
+            case CPPUTYPE_REFDOCINDEX:	pType = &::getCppuType( (Reference<text::XDocumentIndex>*)0 ); break;
+            case CPPUTYPE_REFDOCIDXMRK:	pType = &::getCppuType( (Reference<text::XDocumentIndexMark>*)0 ); break;
+            case CPPUTYPE_REFTXTFIELD:	pType = &::getCppuType( (Reference<text::XTextField>*)0 ); break;
+            case CPPUTYPE_REFTXTRANGE:	pType = &::getCppuType( (Reference<text::XTextRange>*)0 ); break;
+            case CPPUTYPE_REFTXTTABLE:	pType = &::getCppuType( (Reference<text::XTextTable>*)0 ); break;
             case CPPUTYPE_AWTPOINT:     pType = &::getCppuType( (awt::Point*)0 );    break;
             case CPPUTYPE_REFLIBCONTAINER:  pType = &::getCppuType( (Reference< script::XLibraryContainer >*)0);    break;
             case CPPUTYPE_OUSTRINGS:    pType = &::getCppuType( (Sequence< ::rtl::OUString >*)0);    break;
diff --git a/comphelper/source/property/composedprops.cxx b/comphelper/source/property/composedprops.cxx
index 4b44a8fb474e..7a482ae4ada4 100644
--- a/comphelper/source/property/composedprops.cxx
+++ b/comphelper/source/property/composedprops.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
@@ -47,7 +47,7 @@ namespace comphelper
     class OComposedPropertySetInfo : public ::cppu::WeakImplHelper1< XPropertySetInfo >
     {
     private:
-        Sequence< Property>     m_aProperties;
+        Sequence< Property>		m_aProperties;
 
     public:
         OComposedPropertySetInfo(const Sequence< Property>& _rProperties);
@@ -99,7 +99,7 @@ namespace comphelper
             if (xMasterSet.is())
                 aMasterProps = xMasterSet->getPropertySetInfo()->getProperties();
             sal_Int32 nMasterPropsCount = aMasterProps.getLength();
-            const Property* pMasterProps = aMasterProps.getConstArray();
+            const Property*	pMasterProps = aMasterProps.getConstArray();
 
             // check which of the master properties should be included
             Sequence<sal_Bool> aInclusionFlags(nMasterPropsCount);
@@ -128,7 +128,7 @@ namespace comphelper
                         xSecondarySet = m_aSingleSets[i];
                         aSecondaryProperties = xSecondarySet->getPropertySetInfo()->getProperties();
                         nSecondaryPropertyCount = aSecondaryProperties.getLength();
-                        const Property* pSecondaryProperties = aSecondaryProperties.getConstArray();
+                        const Property*	pSecondaryProperties = aSecondaryProperties.getConstArray();
 
                         // search the current primary property in the secondary property sequence
                         sal_Int32 k=0;
@@ -146,7 +146,7 @@ namespace comphelper
             sal_Int32 nOverallProperties = 0;
             for (sal_Int32 nCounter=0; nCounter<nMasterPropsCount; ++nCounter)
             {
-                if (pInclusionFlags[nCounter])
+                if (pInclusionFlags[nCounter]) 
                     ++nOverallProperties;
             }
 
@@ -200,19 +200,19 @@ namespace comphelper
             PropertyState eSecondaryState;
             for (sal_Int32 i=1; i<nSingleSets; ++i)
             {
-                Reference< XPropertySet >   xSecondary(m_aSingleSets[i]);
-                Reference< XPropertyState > xSecondaryState(xSecondary, UNO_QUERY);
+                Reference< XPropertySet >	xSecondary(m_aSingleSets[i]);
+                Reference< XPropertyState >	xSecondaryState(xSecondary, UNO_QUERY);
 
                 // the secondary state
                 eSecondaryState = PropertyState_DIRECT_VALUE;
-                if(xSecondaryState.is())
+                if(xSecondaryState.is()) 
                     eSecondaryState = xSecondaryState->getPropertyState(_rPropertyName);
 
                 // the secondary value
                 Any aSecondaryValue(xSecondary->getPropertyValue(_rPropertyName));
 
-                if  (   (PropertyState_AMBIGUOUS_VALUE == eSecondaryState)      // secondary is ambiguous
-                    ||  !::comphelper::compare(aPrimaryValue, aSecondaryValue)  // unequal values
+                if	(	(PropertyState_AMBIGUOUS_VALUE == eSecondaryState)		// secondary is ambiguous
+                    ||	!::comphelper::compare(aPrimaryValue, aSecondaryValue)	// unequal values
                     )
                 {
                     eState = PropertyState_AMBIGUOUS_VALUE;
@@ -246,7 +246,7 @@ namespace comphelper
         sal_Int32 nSingleSets = m_aSingleSets.size();
         for (sal_Int32 i=0; i<nSingleSets; ++i)
         {
-            Reference< XPropertyState > xState(m_aSingleSets[i], UNO_QUERY);
+            Reference< XPropertyState >	xState(m_aSingleSets[i], UNO_QUERY);
             if(xState.is())
                 xState->setPropertyToDefault(_rPropertyName);
         }
@@ -324,7 +324,7 @@ namespace comphelper
     Property SAL_CALL OComposedPropertySetInfo::getPropertyByName( const ::rtl::OUString& _rName ) throw(UnknownPropertyException, RuntimeException)
     {
         sal_Int32 nLength = m_aProperties.getLength();
-        const Property* pProps = m_aProperties.getConstArray();
+        const Property*	pProps = m_aProperties.getConstArray();
         // TODO TODO TODO: this O(n) search really sucks ...
         for (sal_Int32 i=0; i<nLength; ++i, ++pProps)
         {
@@ -339,11 +339,11 @@ namespace comphelper
     sal_Bool SAL_CALL OComposedPropertySetInfo::hasPropertyByName( const ::rtl::OUString& _rName ) throw(RuntimeException)
     {
         sal_Int32 nLength = m_aProperties.getLength();
-        const Property* pProps = m_aProperties.getConstArray();
+        const Property*	pProps = m_aProperties.getConstArray();
         // TODO TODO TODO: this O(n) search really sucks ...
         for( sal_Int32 i=0; i<nLength; ++i,++pProps )
         {
-            if(pProps->Name == _rName)
+            if(pProps->Name == _rName) 
                 return sal_True;
         }
 
@@ -351,7 +351,7 @@ namespace comphelper
     }
 
 //.........................................................................
-}   // namespace comphelper
+}	// namespace comphelper
 //.........................................................................
 
 
diff --git a/comphelper/source/property/genericpropertyset.cxx b/comphelper/source/property/genericpropertyset.cxx
index b7fb09912153..53c27997470d 100644
--- a/comphelper/source/property/genericpropertyset.cxx
+++ b/comphelper/source/property/genericpropertyset.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
@@ -62,14 +62,14 @@ namespace comphelper
         Mutex maMutex ;
     } ;
 
-    class GenericPropertySet :  public OWeakAggObject,
+    class GenericPropertySet :	public OWeakAggObject,
                                 public XServiceInfo,
                                 public XTypeProvider,
                                 public PropertySetHelper,
                                 private IMPL_GenericPropertySet_MutexContainer
     {
     private:
-        GenericAnyMapImpl   maAnyMap;
+        GenericAnyMapImpl	maAnyMap;
         ::cppu::OMultiTypeInterfaceContainerHelperVar< ::rtl::OUString,UStringHash,UStringEqual> m_aListener;
 
     protected:
diff --git a/comphelper/source/property/opropertybag.cxx b/comphelper/source/property/opropertybag.cxx
index f1282a48c2dd..748281a57f07 100644
--- a/comphelper/source/property/opropertybag.cxx
+++ b/comphelper/source/property/opropertybag.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
@@ -227,7 +227,7 @@ namespace comphelper
         // So, everything of XSet except insert is implemented empty
         return sal_False;
     }
-
+    
     //--------------------------------------------------------------------
     void SAL_CALL OPropertyBag::insert( const Any& _element ) throw (IllegalArgumentException, ElementExistException, RuntimeException)
     {
@@ -246,7 +246,7 @@ namespace comphelper
             )
             throw IllegalTypeException( ::rtl::OUString(), *this );
 
-        m_aDynamicProperties.addVoidProperty( aProperty.Name, aProperty.Type, findFreeHandle(), aProperty.Attributes );
+        m_aDynamicProperties.addVoidProperty( aProperty.Name, aProperty.Type, findFreeHandle(), aProperty.Attributes ); 
 
         // our property info is dirty
         m_pArrayHelper.reset();
@@ -254,7 +254,7 @@ namespace comphelper
         g.clear();
         setModified(sal_True);
     }
-
+    
     //--------------------------------------------------------------------
     void SAL_CALL OPropertyBag::remove( const Any& /*aElement*/ ) throw (IllegalArgumentException, NoSuchElementException, RuntimeException)
     {
@@ -355,7 +355,7 @@ namespace comphelper
             )
             throw IllegalTypeException( ::rtl::OUString(), *this );
 
-        m_aDynamicProperties.addProperty( _rName, findFreeHandle(), _nAttributes, _rInitialValue );
+        m_aDynamicProperties.addProperty( _rName, findFreeHandle(), _nAttributes, _rInitialValue ); 
 
         // our property info is dirty
         m_pArrayHelper.reset();
diff --git a/comphelper/source/property/opropertybag.hxx b/comphelper/source/property/opropertybag.hxx
index 3b9549f7c023..27df2e8bbe6b 100644
--- a/comphelper/source/property/opropertybag.hxx
+++ b/comphelper/source/property/opropertybag.hxx
@@ -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
diff --git a/comphelper/source/property/propagg.cxx b/comphelper/source/property/propagg.cxx
index e796c29eba90..2eb1fc629a1e 100644
--- a/comphelper/source/property/propagg.cxx
+++ b/comphelper/source/property/propagg.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
@@ -83,8 +83,8 @@ OPropertyArrayAggregationHelper::OPropertyArrayAggregationHelper(
     sal_Int32 nMergedProps = nDelegatorProps + nAggregateProps;
     m_aProperties.realloc( nMergedProps );
 
-    const   Property* pAggregateProps   = _rAggProperties.getConstArray();
-    const   Property* pDelegateProps    = _rProperties.getConstArray();
+    const	Property* pAggregateProps	= _rAggProperties.getConstArray();
+    const	Property* pDelegateProps	= _rProperties.getConstArray();
             Property* pMergedProps = m_aProperties.getArray();
 
     // create the map for the delegator properties
@@ -110,11 +110,11 @@ OPropertyArrayAggregationHelper::OPropertyArrayAggregationHelper(
             // no handle from the info service -> default
             nHandle = nAggregateHandle++;
         else
-        {   // check if we alread have a property with the given handle
+        {	// check if we alread have a property with the given handle
             const  Property* pPropsTilNow = m_aProperties.getConstArray();
             for ( sal_Int32 nCheck = 0; nCheck < nMPLoop; ++nCheck, ++pPropsTilNow )
                 if ( pPropsTilNow->Handle == nHandle )
-                {   // conflicts -> use another one (which we don't check anymore, assuming _nFirstAggregateId was large enough)
+                {	// conflicts -> use another one (which we don't check anymore, assuming _nFirstAggregateId was large enough)
                     nHandle = nAggregateHandle++;
                     break;
                 }
@@ -124,7 +124,7 @@ OPropertyArrayAggregationHelper::OPropertyArrayAggregationHelper(
         m_aPropertyAccessors[ nHandle ] = OPropertyAccessor( pMergedProps->Handle, nMPLoop, sal_True );
         pMergedProps->Handle = nHandle;
     }
-    pMergedProps = m_aProperties.getArray();    // reset, needed again below
+    pMergedProps = m_aProperties.getArray();	// reset, needed again below
 
     // sortieren der Properties nach Namen
     ::std::sort( pMergedProps, pMergedProps+nMergedProps, PropertyCompareByName());
@@ -301,7 +301,7 @@ sal_Int32 OPropertyArrayAggregationHelper::fillHandles(
         else
         {
             // binary search is better
-            sal_Int32   nCompVal = 1;
+            sal_Int32	nCompVal = 1;
             const  ::com::sun::star::beans::Property*  pOldEnd = pEnd--;
             const  ::com::sun::star::beans::Property*  pMid = pCur;
 
@@ -517,7 +517,7 @@ void SAL_CALL OPropertySetAggregationHelper::propertiesChange(const  ::com::sun:
         {
             sal_Int32 nHandle = rPH.getHandleByName(pEvents->PropertyName);
             if ( ( nHandle != -1 ) && !isCurrentlyForwardingProperty( nHandle ) )
-            {   // same as above : -1 is valid (73247) ...
+            {	// same as above : -1 is valid (73247) ...
                 pHandles[nDest] = nHandle;
                 pNewValues[nDest] = pEvents->NewValue;
                 pOldValues[nDest] = pEvents->OldValue;
@@ -558,10 +558,10 @@ void OPropertySetAggregationHelper::setAggregation(const  ::com::sun::star::uno:
         m_bListening = sal_False;
     }
 
-    m_xAggregateState       =  m_xAggregateState.query( _rxDelegate );
-    m_xAggregateSet         =  m_xAggregateSet.query( _rxDelegate );
-    m_xAggregateMultiSet    =  m_xAggregateMultiSet.query( _rxDelegate );
-    m_xAggregateFastSet     =  m_xAggregateFastSet.query( _rxDelegate );
+    m_xAggregateState		=  m_xAggregateState.query( _rxDelegate );
+    m_xAggregateSet			=  m_xAggregateSet.query( _rxDelegate );
+    m_xAggregateMultiSet	=  m_xAggregateMultiSet.query( _rxDelegate );
+    m_xAggregateFastSet		=  m_xAggregateFastSet.query( _rxDelegate );
 
     // must support XPropertySet and XMultiPropertySet
     if ( m_xAggregateSet.is() && !m_xAggregateMultiSet.is() )
@@ -634,13 +634,13 @@ sal_Int32 OPropertySetAggregationHelper::getOriginalHandle(sal_Int32 nHandle) co
 
 //------------------------------------------------------------------------------
 void SAL_CALL OPropertySetAggregationHelper::setFastPropertyValue(sal_Int32 _nHandle, const  ::com::sun::star::uno::Any& _rValue)
-        throw(   ::com::sun::star::beans::UnknownPropertyException,  ::com::sun::star::beans::PropertyVetoException,
+        throw(	 ::com::sun::star::beans::UnknownPropertyException,  ::com::sun::star::beans::PropertyVetoException,
                  ::com::sun::star::lang::IllegalArgumentException,  ::com::sun::star::lang::WrappedTargetException,
                  ::com::sun::star::uno::RuntimeException)
 {
     OPropertyArrayAggregationHelper& rPH = static_cast< OPropertyArrayAggregationHelper& >( getInfoHelper() );
     ::rtl::OUString aPropName;
-    sal_Int32   nOriginalHandle = -1;
+    sal_Int32	nOriginalHandle = -1;
 
     // does the handle belong to the aggregation ?
     if (rPH.fillAggregatePropertyInfoByHandle(&aPropName, &nOriginalHandle, _nHandle))
@@ -657,7 +657,7 @@ void OPropertySetAggregationHelper::getFastPropertyValue( ::com::sun::star::uno:
 {
     OPropertyArrayAggregationHelper& rPH = (OPropertyArrayAggregationHelper&)const_cast<OPropertySetAggregationHelper*>(this)->getInfoHelper();
     ::rtl::OUString aPropName;
-    sal_Int32   nOriginalHandle = -1;
+    sal_Int32	nOriginalHandle = -1;
 
     if (rPH.fillAggregatePropertyInfoByHandle(&aPropName, &nOriginalHandle, nHandle))
     {
@@ -668,7 +668,7 @@ void OPropertySetAggregationHelper::getFastPropertyValue( ::com::sun::star::uno:
     }
     else if ( m_pForwarder->isResponsibleFor( nHandle ) )
     {
-        // this is a property which has been "overwritten" in our instance (thus
+        // this is a property which has been "overwritten" in our instance (thus 
         // fillAggregatePropertyInfoByHandle didn't find it)
         rValue = m_xAggregateSet->getPropertyValue( getPropertyName( nHandle ) );
     }
@@ -676,13 +676,13 @@ void OPropertySetAggregationHelper::getFastPropertyValue( ::com::sun::star::uno:
 
 //------------------------------------------------------------------------------
  ::com::sun::star::uno::Any SAL_CALL OPropertySetAggregationHelper::getFastPropertyValue(sal_Int32 nHandle)
-        throw(   ::com::sun::star::beans::UnknownPropertyException,
+        throw(	 ::com::sun::star::beans::UnknownPropertyException,
                  ::com::sun::star::lang::WrappedTargetException,
                  ::com::sun::star::uno::RuntimeException)
 {
     OPropertyArrayAggregationHelper& rPH = static_cast< OPropertyArrayAggregationHelper& >( getInfoHelper() );
     ::rtl::OUString aPropName;
-    sal_Int32   nOriginalHandle = -1;
+    sal_Int32	nOriginalHandle = -1;
      ::com::sun::star::uno::Any  aValue;
 
     if (rPH.fillAggregatePropertyInfoByHandle(&aPropName, &nOriginalHandle, nHandle))
@@ -752,7 +752,7 @@ void SAL_CALL OPropertySetAggregationHelper::setPropertyValues(
                 ++nAggCount;
         }
 
-        pNames = _rPropertyNames.getConstArray();   // reset, we'll need it again below ...
+        pNames = _rPropertyNames.getConstArray();	// reset, we'll need it again below ...
 
         // all properties belong to the aggregate
         if (nAggCount == nLen)
@@ -768,7 +768,7 @@ void SAL_CALL OPropertySetAggregationHelper::setPropertyValues(
             const  ::com::sun::star::uno::Any* pValues = _rValues.getConstArray();
              ::com::sun::star::uno::Any* pConvertedValues = NULL;
              ::com::sun::star::uno::Any* pOldValues = NULL;
-            sal_Int32*  pHandles = NULL;
+            sal_Int32*	pHandles = NULL;
 
             try
             {
@@ -837,7 +837,7 @@ void SAL_CALL OPropertySetAggregationHelper::setPropertyValues(
                                                             pHandles[i], pDelValues[i] ) )
                                 {
                                     // only increment if the property really change
-                                    pHandles[nHitCount]         = pHandles[i];
+                                    pHandles[nHitCount]			= pHandles[i];
                                     nHitCount++;
                                 }
                             }
@@ -899,7 +899,7 @@ void SAL_CALL OPropertySetAggregationHelper::setPropertyValues(
     }
 
     ::rtl::OUString aPropName;
-    sal_Int32   nOriginalHandle = -1;
+    sal_Int32	nOriginalHandle = -1;
     if (rPH.fillAggregatePropertyInfoByHandle(&aPropName, &nOriginalHandle, nHandle))
     {
         if (m_xAggregateState.is())
@@ -923,7 +923,7 @@ void SAL_CALL OPropertySetAggregationHelper::setPropertyToDefault(const ::rtl::O
     }
 
     ::rtl::OUString aPropName;
-    sal_Int32   nOriginalHandle = -1;
+    sal_Int32	nOriginalHandle = -1;
     if (rPH.fillAggregatePropertyInfoByHandle(&aPropName, &nOriginalHandle, nHandle))
     {
         if (m_xAggregateState.is())
@@ -955,7 +955,7 @@ void SAL_CALL OPropertySetAggregationHelper::setPropertyToDefault(const ::rtl::O
         throw  ::com::sun::star::beans::UnknownPropertyException();
 
     ::rtl::OUString aPropName;
-    sal_Int32   nOriginalHandle = -1;
+    sal_Int32	nOriginalHandle = -1;
     if (rPH.fillAggregatePropertyInfoByHandle(&aPropName, &nOriginalHandle, nHandle))
     {
         if (m_xAggregateState.is())
@@ -1022,6 +1022,6 @@ bool OPropertySetAggregationHelper::isCurrentlyForwardingProperty( sal_Int32 _nH
 }
 
 //.........................................................................
-}   // namespace comphelper
+}	// namespace comphelper
 //.........................................................................
 
diff --git a/comphelper/source/property/property.cxx b/comphelper/source/property/property.cxx
index 6ab48aa1965b..d19c0e662767 100644
--- a/comphelper/source/property/property.cxx
+++ b/comphelper/source/property/property.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
@@ -147,15 +147,15 @@ sal_Bool hasProperty(const rtl::OUString& _rName, const Reference<XPropertySet>&
 {
     if (_rxSet.is())
     {
-        //  XPropertySetInfoRef xInfo(rxSet->getPropertySetInfo());
+        //	XPropertySetInfoRef xInfo(rxSet->getPropertySetInfo());
         return _rxSet->getPropertySetInfo()->hasPropertyByName(_rName);
     }
     return sal_False;
 }
 
 //------------------------------------------------------------------
-bool findProperty(Property&              o_rProp,
-                  Sequence<Property>&    i_seqProps,
+bool findProperty(Property&              o_rProp, 
+                  Sequence<Property>&    i_seqProps, 
                   const ::rtl::OUString& i_rPropName)
 {
     const Property* pAry(i_seqProps.getConstArray());
diff --git a/comphelper/source/property/propertybag.cxx b/comphelper/source/property/propertybag.cxx
index 88f925e20db7..a1144d7519a3 100644
--- a/comphelper/source/property/propertybag.cxx
+++ b/comphelper/source/property/propertybag.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
@@ -77,7 +77,7 @@ namespace comphelper
     {
     }
 
-    PropertyBag::~PropertyBag()
+    PropertyBag::~PropertyBag() 
     {
     }
 
diff --git a/comphelper/source/property/propertycontainer.cxx b/comphelper/source/property/propertycontainer.cxx
index c385107733fe..9520568c5d47 100644
--- a/comphelper/source/property/propertycontainer.cxx
+++ b/comphelper/source/property/propertycontainer.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
@@ -99,7 +99,7 @@ void OPropertyContainer::getFastPropertyValue(Any& _rValue, sal_Int32 _nHandle)
 }
 
 //.........................................................................
-}   // namespace comphelper
+}	// namespace comphelper
 //.........................................................................
 
 
diff --git a/comphelper/source/property/propertycontainerhelper.cxx b/comphelper/source/property/propertycontainerhelper.cxx
index 0b420a3eebd8..ac7f4563092d 100644
--- a/comphelper/source/property/propertycontainerhelper.cxx
+++ b/comphelper/source/property/propertycontainerhelper.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
@@ -210,7 +210,7 @@ namespace
 void OPropertyContainerHelper::implPushBackProperty(const PropertyDescription& _rProp)
 {
 #ifdef DBG_UTIL
-    for (   PropertiesIterator checkConflicts = m_aProperties.begin();
+    for	(	PropertiesIterator checkConflicts = m_aProperties.begin();
             checkConflicts != m_aProperties.end();
             ++checkConflicts
         )
@@ -277,10 +277,10 @@ sal_Bool OPropertyContainerHelper::convertFastPropertyValue(
             // (#102329# - 2002-08-14 - fs@openoffice.org)
             // (#i29490# - 2004-06-16 - fs@openoffice.org)
             if ( !aNewRequestedValue.getValueType().equals( aPos->aProperty.Type ) )
-            {   // the actually given value is not of the same type as the one required
+            {	// the actually given value is not of the same type as the one required
                 Any aProperlyTyped( NULL, aPos->aProperty.Type.getTypeLibType() );
 
-                if (    uno_type_assignData(
+                if (	uno_type_assignData(
                             const_cast< void* >( aProperlyTyped.getValue() ), aProperlyTyped.getValueType().getTypeLibType(),
                             const_cast< void* >( aNewRequestedValue.getValue() ), aNewRequestedValue.getValueType().getTypeLibType(),
                             reinterpret_cast< uno_QueryInterfaceFunc >( cpp_queryInterface ),
@@ -296,8 +296,8 @@ sal_Bool OPropertyContainerHelper::convertFastPropertyValue(
             }
 
             // argument check
-            if  (   !   (   (bMayBeVoid && !aNewRequestedValue.hasValue())                      // void is allowed if the attribute says so
-                        ||  (aNewRequestedValue.getValueType().equals(aPos->aProperty.Type))    // else the types have to be equal
+            if	(	!	(	(bMayBeVoid && !aNewRequestedValue.hasValue())			            // void is allowed if the attribute says so
+                        ||	(aNewRequestedValue.getValueType().equals(aPos->aProperty.Type))	// else the types have to be equal
                         )
                 )
             {
@@ -353,7 +353,7 @@ sal_Bool OPropertyContainerHelper::convertFastPropertyValue(
                 aProperlyTyped = Any( NULL, aPos->aProperty.Type.getTypeLibType() );
                     // (need this as we do not want to overwrite the derived class member here)
 
-                if (    uno_type_assignData(
+                if (	uno_type_assignData(
                             const_cast<void*>(aProperlyTyped.getValue()), aProperlyTyped.getValueType().getTypeLibType(),
                             const_cast<void*>(_rValue.getValue()), _rValue.getValueType().getTypeLibType(),
                             reinterpret_cast< uno_QueryInterfaceFunc >( cpp_queryInterface ),
@@ -421,8 +421,8 @@ void OPropertyContainerHelper::setFastPropertyValue(sal_Int32 _nHandle, const An
 #endif
             // copy the data from the to-be-set value
             uno_type_assignData(
-                aPos->aLocation.pDerivedClassMember,        aPos->aProperty.Type.getTypeLibType(),
-                const_cast< void* >( _rValue.getValue() ),  _rValue.getValueType().getTypeLibType(),
+                aPos->aLocation.pDerivedClassMember,		aPos->aProperty.Type.getTypeLibType(),
+                const_cast< void* >( _rValue.getValue() ),	_rValue.getValueType().getTypeLibType(),
                 reinterpret_cast< uno_QueryInterfaceFunc >( cpp_queryInterface ),
                 reinterpret_cast< uno_AcquireFunc >( cpp_acquire ),
                 reinterpret_cast< uno_ReleaseFunc >( cpp_release ) );
@@ -516,7 +516,7 @@ void OPropertyContainerHelper::describeProperties(Sequence< Property >& _rProps)
     Sequence< Property > aOwnProps(m_aProperties.size());
     Property* pOwnProps = aOwnProps.getArray();
 
-    for (   ConstPropertiesIterator aLoop = m_aProperties.begin();
+    for	(	ConstPropertiesIterator aLoop = m_aProperties.begin();
             aLoop != m_aProperties.end();
             ++aLoop, ++pOwnProps
         )
@@ -535,10 +535,10 @@ void OPropertyContainerHelper::describeProperties(Sequence< Property >& _rProps)
     Sequence< Property > aOutput;
     aOutput.realloc(_rProps.getLength() + aOwnProps.getLength());
     // do the merge
-    ::std::merge(   _rProps.getConstArray(), _rProps.getConstArray() + _rProps.getLength(),         // input 1
-                    aOwnProps.getConstArray(), aOwnProps.getConstArray() + aOwnProps.getLength(),   // input 2
-                    aOutput.getArray(),                                                             // output
-                    PropertyCompareByName()                                                         // compare operator
+    ::std::merge(	_rProps.getConstArray(), _rProps.getConstArray() + _rProps.getLength(),			// input 1
+                    aOwnProps.getConstArray(), aOwnProps.getConstArray() + aOwnProps.getLength(),	// input 2
+                    aOutput.getArray(),																// output
+                    PropertyCompareByName()															// compare operator
                 );
 
     // copy the output
@@ -546,7 +546,7 @@ void OPropertyContainerHelper::describeProperties(Sequence< Property >& _rProps)
 }
 
 //.........................................................................
-}   // namespace comphelper
+}	// namespace comphelper
 //.........................................................................
 
 
diff --git a/comphelper/source/property/propertysethelper.cxx b/comphelper/source/property/propertysethelper.cxx
index 9d2abf784c1b..e51d4f6ad025 100644
--- a/comphelper/source/property/propertysethelper.cxx
+++ b/comphelper/source/property/propertysethelper.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
@@ -46,7 +46,7 @@ class PropertySetHelperImpl
 {
 public:
     PropertyMapEntry* find( const OUString& aName ) const throw();
-
+    
     PropertySetInfo* mpInfo;
 };
 }
@@ -169,7 +169,7 @@ void SAL_CALL PropertySetHelper::setPropertyValues( const Sequence< ::rtl::OUStr
     if( nCount )
     {
         PropertyMapEntry** pEntries = new PropertyMapEntry*[nCount+1];
-        pEntries[nCount] = NULL;
+        pEntries[nCount] = NULL;	
         const OUString* pNames = aPropertyNames.getConstArray();
 
         sal_Bool bUnknown = sal_False;
diff --git a/comphelper/source/property/propertysetinfo.cxx b/comphelper/source/property/propertysetinfo.cxx
index efdd495ac1bc..fa439f4c5055 100644
--- a/comphelper/source/property/propertysetinfo.cxx
+++ b/comphelper/source/property/propertysetinfo.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
@@ -71,9 +71,9 @@ PropertyMapImpl::~PropertyMapImpl() throw()
 
 void PropertyMapImpl::add( PropertyMapEntry* pMap, sal_Int32 nCount ) throw()
 {
-    // nCount < 0   => add all
-    // nCount == 0  => add nothing
-    // nCount > 0   => add at most nCount entries
+    // nCount < 0	=> add all
+    // nCount == 0	=> add nothing
+    // nCount > 0	=> add at most nCount entries
 
     while( pMap->mpName && ( ( nCount < 0) || ( nCount-- > 0 ) ) )
     {
diff --git a/comphelper/source/property/propertystatecontainer.cxx b/comphelper/source/property/propertystatecontainer.cxx
index 341dc1b43a78..3e245527f35b 100644
--- a/comphelper/source/property/propertystatecontainer.cxx
+++ b/comphelper/source/property/propertystatecontainer.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
@@ -59,7 +59,7 @@ namespace comphelper
     //= OPropertyStateContainer
     //=====================================================================
     //---------------------------------------------------------------------
-    OPropertyStateContainer::OPropertyStateContainer( ::cppu::OBroadcastHelper& _rBHelper )
+    OPropertyStateContainer::OPropertyStateContainer( ::cppu::OBroadcastHelper&	_rBHelper )
         :OPropertyContainer( _rBHelper )
     {
     }
@@ -120,10 +120,10 @@ namespace comphelper
         PropertyState* pStates = aStates.getArray();
 
         cppu::IPropertyArrayHelper& rHelper = getInfoHelper();
-        Sequence< Property> aAllProperties  = rHelper.getProperties();
-        sal_Int32 nAllProperties            = aAllProperties.getLength();
-        const  Property* pAllProperties     = aAllProperties.getConstArray();
-        const  Property* pAllPropertiesEnd  = pAllProperties + nAllProperties;
+        Sequence< Property> aAllProperties	= rHelper.getProperties();
+        sal_Int32 nAllProperties			= aAllProperties.getLength();
+        const  Property* pAllProperties		= aAllProperties.getConstArray();
+        const  Property* pAllPropertiesEnd	= pAllProperties + nAllProperties;
 
         osl::MutexGuard aGuard( rBHelper.rMutex );
         for ( ; ( pAllProperties != pAllPropertiesEnd ) && ( pLookup != pLookupEnd ); ++pAllProperties )
@@ -190,7 +190,7 @@ namespace comphelper
     }
 
 //.........................................................................
-}   // namespace comphelper
+}	// namespace comphelper
 //.........................................................................
 
 #ifdef FS_PRIV_DEBUG
@@ -213,16 +213,16 @@ namespace comphelper
     //=====================================================================
     //= Test - compiler test
     //=====================================================================
-    typedef ::cppu::OWeakAggObject  Test_RefCountBase;
-    class Test  :public OMutexAndBroadcastHelper
+    typedef ::cppu::OWeakAggObject	Test_RefCountBase;
+    class Test	:public OMutexAndBroadcastHelper
                 ,public OPropertyStateContainer
                 ,public OPropertyArrayUsageHelper< Test >
                 ,public Test_RefCountBase
     {
     private:
-        ::rtl::OUString         m_sStringProperty;
-        Reference< XInterface > m_xInterfaceProperty;
-        Any                     m_aMayBeVoidProperty;
+        ::rtl::OUString			m_sStringProperty;
+        Reference< XInterface >	m_xInterfaceProperty;
+        Any						m_aMayBeVoidProperty;
 
     protected:
         Test( );
@@ -332,7 +332,7 @@ namespace comphelper
     }
 
 //.........................................................................
-}   // namespace comphelper
+}	// namespace comphelper
 //.........................................................................
 
 #endif
diff --git a/comphelper/source/property/propmultiplex.cxx b/comphelper/source/property/propmultiplex.cxx
index db0b35650d32..fd9f910e0ffc 100644
--- a/comphelper/source/property/propmultiplex.cxx
+++ b/comphelper/source/property/propmultiplex.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
@@ -145,7 +145,7 @@ void SAL_CALL OPropertyChangeMultiplexer::disposing( const  EventObject& _rSourc
         if (!locked())
             m_pListener->_disposing(_rSource);
         // disconnect the listener
-        if (m_pListener)    // may have been reset whilest calling into _disposing
+        if (m_pListener)	// may have been reset whilest calling into _disposing
             m_pListener->setAdapter(NULL);
     }
 
diff --git a/comphelper/source/property/propstate.cxx b/comphelper/source/property/propstate.cxx
index 214bccb3f40f..97399444e173 100644
--- a/comphelper/source/property/propstate.cxx
+++ b/comphelper/source/property/propstate.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
@@ -143,7 +143,7 @@ namespace comphelper
 
         ::com::sun::star::uno::Sequence< ::com::sun::star::beans::Property> aProps = rHelper.getProperties();
         const  ::com::sun::star::beans::Property* pProps = aProps.getConstArray();
-        sal_Int32 nPropCount       = aProps.getLength();
+        sal_Int32 nPropCount	   = aProps.getLength();
 
         osl::MutexGuard aGuard(rBHelper.rMutex);
         for (sal_Int32 i=0, j=0; i<nPropCount && j<nLen; ++i, ++pProps)
diff --git a/comphelper/source/streaming/basicio.cxx b/comphelper/source/streaming/basicio.cxx
index eef5c6b844fa..4ae072cb3217 100644
--- a/comphelper/source/streaming/basicio.cxx
+++ b/comphelper/source/streaming/basicio.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
@@ -169,6 +169,6 @@ const staruno::Reference<stario::XObjectOutputStream>& operator << (const starun
 }
 
 //.........................................................................
-}   // namespace comphelper
+}	// namespace comphelper
 //.........................................................................
 
diff --git a/comphelper/source/streaming/memorystream.cxx b/comphelper/source/streaming/memorystream.cxx
index 5298b7511f09..62cf59adb427 100644
--- a/comphelper/source/streaming/memorystream.cxx
+++ b/comphelper/source/streaming/memorystream.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
@@ -159,7 +159,7 @@ void SAL_CALL UNOMemoryStream::seek( sal_Int64 location ) throw (IllegalArgument
 {
     if( (location < 0) || (location > SAL_MAX_INT32) )
         throw IllegalArgumentException( OUString(RTL_CONSTASCII_USTRINGPARAM("this implementation does not support more than 2GB!")), Reference< XInterface >(static_cast<OWeakObject*>(this)), 0 );
-
+ 
     // seek operation should be able to resize the stream
     if ( location > static_cast< sal_Int64 >( maData.size() ) )
         maData.resize( static_cast< sal_Int32 >( location ) );
diff --git a/comphelper/source/streaming/oslfile2streamwrap.cxx b/comphelper/source/streaming/oslfile2streamwrap.cxx
index 9cf8eeaaf08a..3d103fb4c352 100644
--- a/comphelper/source/streaming/oslfile2streamwrap.cxx
+++ b/comphelper/source/streaming/oslfile2streamwrap.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
@@ -121,7 +121,7 @@ void SAL_CALL OSLInputStreamWrapper::skipBytes(sal_Int32 nBytesToSkip) throw( st
 
 #ifdef DBG_UTIL
     m_pFile->getPos(nCurrentPos);
-//  volatile int dummy = 0;                      // to take a look at last changes ;-)
+//  volatile int dummy = 0;						 // to take a look at last changes ;-)
 #endif
 }
 
diff --git a/comphelper/source/streaming/otransactedfilestream.cxx b/comphelper/source/streaming/otransactedfilestream.cxx
index 03539a12305b..a483859036ab 100644
--- a/comphelper/source/streaming/otransactedfilestream.cxx
+++ b/comphelper/source/streaming/otransactedfilestream.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
diff --git a/comphelper/source/streaming/seekableinput.cxx b/comphelper/source/streaming/seekableinput.cxx
index abaf46faf014..d5b81d8f0726 100644
--- a/comphelper/source/streaming/seekableinput.cxx
+++ b/comphelper/source/streaming/seekableinput.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
@@ -86,8 +86,8 @@ uno::Reference< io::XInputStream > OSeekableInputWrapper::CheckSeekableCanWrap(
     if ( xSeek.is() )
         return xInStream;
 
-    uno::Reference< io::XInputStream > xNewStream(
-            static_cast< io::XInputStream* >(
+    uno::Reference< io::XInputStream > xNewStream( 
+            static_cast< io::XInputStream* >( 
                 new OSeekableInputWrapper( xInStream, xFactory ) ) );
     return xNewStream;
 }
@@ -263,5 +263,5 @@ sal_Int64 SAL_CALL OSeekableInputWrapper::getLength()
     return m_xCopySeek->getLength();
 }
 
-}   // namespace comphelper
+}	// namespace comphelper
 
diff --git a/comphelper/source/streaming/seqinputstreamserv.cxx b/comphelper/source/streaming/seqinputstreamserv.cxx
index 015387b9894d..043c76203e6b 100644
--- a/comphelper/source/streaming/seqinputstreamserv.cxx
+++ b/comphelper/source/streaming/seqinputstreamserv.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
diff --git a/comphelper/source/streaming/seqoutputstreamserv.cxx b/comphelper/source/streaming/seqoutputstreamserv.cxx
index a51653e6e419..62b27ad673b7 100644
--- a/comphelper/source/streaming/seqoutputstreamserv.cxx
+++ b/comphelper/source/streaming/seqoutputstreamserv.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
diff --git a/comphelper/source/streaming/seqstream.cxx b/comphelper/source/streaming/seqstream.cxx
index 5c8a32b1f6e5..30fa8b8c6b3f 100644
--- a/comphelper/source/streaming/seqstream.cxx
+++ b/comphelper/source/streaming/seqstream.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
@@ -44,8 +44,8 @@ using namespace ::osl;
 
 //------------------------------------------------------------------
 SequenceInputStream::SequenceInputStream(const ByteSequence& rData)
-:   m_aData(rData)
-,   m_nPos(0)
+:	m_aData(rData)
+,	m_nPos(0)
 {
 }
 
@@ -151,7 +151,7 @@ OSequenceOutputStream::OSequenceOutputStream(Sequence< sal_Int8 >& _rSeq, double
     ,m_nResizeFactor(_nResizeFactor)
     ,m_nMinimumResize(_nMinimumResize)
     ,m_nMaximumResize(_nMaximumResize)
-    ,m_nSize(0) // starting at position 0
+    ,m_nSize(0)	// starting at position 0
     ,m_bConnected(sal_True)
 {
     OSL_ENSURE(m_nResizeFactor > 1, "OSequenceOutputStream::OSequenceOutputStream : invalid resize factor !");
@@ -188,13 +188,13 @@ void SAL_CALL OSequenceOutputStream::writeBytes( const Sequence< sal_Int8 >& _rD
             nNewLength = nCurrentLength + m_nMaximumResize;
 
         if (nNewLength < m_nSize + _rData.getLength())
-        {   // it's not enough .... the data would not fit
+        {	// it's not enough .... the data would not fit
 
             // let's take the double amount of the length of the data to be written, as the next write
             // request could be as large as this one
             sal_Int32 nNewGrowth = _rData.getLength() * 2;
             if ((m_nMaximumResize > 0) && (nNewGrowth > m_nMaximumResize))
-            {   // we came to the limit, again ...
+            {	// we came to the limit, again ...
                 nNewGrowth = m_nMaximumResize;
                 if (nNewGrowth + nCurrentLength < m_nSize + _rData.getLength())
                     // but it would not fit if we respect the limit
diff --git a/comphelper/source/streaming/streamsection.cxx b/comphelper/source/streaming/streamsection.cxx
index 324299813986..2b382ede9964 100644
--- a/comphelper/source/streaming/streamsection.cxx
+++ b/comphelper/source/streaming/streamsection.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
@@ -73,10 +73,10 @@ OStreamSection::OStreamSection(const staruno::Reference< stario::XDataOutputStre
 OStreamSection::~OStreamSection()
 {
     try
-    {   // don't allow any exceptions to leave this block, this may be called during the stack unwinding of an exception
+    {	// don't allow any exceptions to leave this block, this may be called during the stack unwinding of an exception
         // handling routing
         if (m_xInStream.is() &&  m_xMarkStream.is())
-        {   // we're working on an input stream
+        {	// we're working on an input stream
             m_xMarkStream->jumpToMark(m_nBlockStart);
             m_xInStream->skipBytes(m_nBlockLen);
             m_xMarkStream->deleteMark(m_nBlockStart);
@@ -88,7 +88,7 @@ OStreamSection::~OStreamSection()
                 // nothing to do : the estimation the caller gave us (in the ctor) was correct
                 m_xMarkStream->deleteMark(m_nBlockStart);
             else
-            {   // the estimation was wrong (or we didn't get one)
+            {	// the estimation was wrong (or we didn't get one)
                 m_nBlockLen = nRealBlockLength;
                 m_xMarkStream->jumpToMark(m_nBlockStart);
                 m_xOutStream->writeLong(m_nBlockLen);
@@ -106,7 +106,7 @@ sal_Int32 OStreamSection::available()
 {
     sal_Int32 nBytes = 0;
     try
-    {   // don't allow any exceptions to leave this block, this may be called during the stack unwinding of an exception
+    {	// don't allow any exceptions to leave this block, this may be called during the stack unwinding of an exception
         if (m_xInStream.is() &&  m_xMarkStream.is())
             nBytes = m_xMarkStream->offsetToMark(m_nBlockStart) - sizeof(m_nBlockLen);
     }
@@ -117,6 +117,6 @@ sal_Int32 OStreamSection::available()
 }
 // -----------------------------------------------------------------------------
 
-}   // namespace comphelper
+}	// namespace comphelper
 
 
diff --git a/comphelper/source/xml/attributelist.cxx b/comphelper/source/xml/attributelist.cxx
index bcf32b85011f..c41c6043cd68 100644
--- a/comphelper/source/xml/attributelist.cxx
+++ b/comphelper/source/xml/attributelist.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
@@ -44,9 +44,9 @@ struct TagAttribute_Impl
     TagAttribute_Impl( const OUString &aName, const OUString &aType,
                          const OUString &aValue )
     {
-        this->sName     = aName;
-        this->sType     = aType;
-        this->sValue    = aValue;
+        this->sName 	= aName;
+        this->sType 	= aType;
+        this->sValue 	= aValue;
     }
 
     OUString sName;
@@ -124,7 +124,7 @@ AttributeList::~AttributeList()
     delete m_pImpl;
 }
 
-void AttributeList::AddAttribute(   const OUString &sName ,
+void AttributeList::AddAttribute( 	const OUString &sName ,
                                         const OUString &sType ,
                                         const OUString &sValue )
 {
diff --git a/comphelper/source/xml/ofopxmlhelper.cxx b/comphelper/source/xml/ofopxmlhelper.cxx
index 9ad617b0e6d1..9484182abfe0 100644
--- a/comphelper/source/xml/ofopxmlhelper.cxx
+++ b/comphelper/source/xml/ofopxmlhelper.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
@@ -50,8 +50,8 @@
 #include <comphelper/ofopxmlhelper.hxx>
 #include <comphelper/attributelist.hxx>
 
-#define RELATIONINFO_FORMAT 0
-#define CONTENTTYPE_FORMAT  1
+#define RELATIONINFO_FORMAT	0
+#define CONTENTTYPE_FORMAT	1
 #define FORMAT_MAX_ID CONTENTTYPE_FORMAT
 
 using namespace ::com::sun::star;
@@ -89,7 +89,7 @@ void SAL_CALL OFOPXMLHelper::WriteRelationsInfoSequence( const uno::Reference< i
     uno::Reference< xml::sax::XDocumentHandler > xWriterHandler( xWriterSource, uno::UNO_QUERY_THROW );
 
     xWriterSource->setOutputStream( xOutStream );
-
+    
     ::rtl::OUString aRelListElement( RTL_CONSTASCII_USTRINGPARAM( "Relationships" ) );
     ::rtl::OUString aRelElement( RTL_CONSTASCII_USTRINGPARAM( "Relationship" ) );
     ::rtl::OUString aIDAttr( RTL_CONSTASCII_USTRINGPARAM( "Id" ) );
@@ -154,7 +154,7 @@ void SAL_CALL OFOPXMLHelper::WriteContentSequence( const uno::Reference< io::XOu
     uno::Reference< xml::sax::XDocumentHandler > xWriterHandler( xWriterSource, uno::UNO_QUERY_THROW );
 
     xWriterSource->setOutputStream( xOutStream );
-
+    
     ::rtl::OUString aTypesElement( RTL_CONSTASCII_USTRINGPARAM( "Types" ) );
     ::rtl::OUString aDefaultElement( RTL_CONSTASCII_USTRINGPARAM( "Default" ) );
     ::rtl::OUString aOverrideElement( RTL_CONSTASCII_USTRINGPARAM( "Override" ) );
@@ -263,19 +263,19 @@ uno::Sequence< uno::Sequence< beans::StringPair > > OFOPXMLHelper::GetParsingRes
 }
 
 // -----------------------------------
-void SAL_CALL OFOPXMLHelper::startDocument()
+void SAL_CALL OFOPXMLHelper::startDocument() 	
         throw(xml::sax::SAXException, uno::RuntimeException)
 {
 }
 
 // -----------------------------------
-void SAL_CALL OFOPXMLHelper::endDocument()
+void SAL_CALL OFOPXMLHelper::endDocument() 	
         throw(xml::sax::SAXException, uno::RuntimeException)
 {
 }
 
 // -----------------------------------
-void SAL_CALL OFOPXMLHelper::startElement( const ::rtl::OUString& aName, const uno::Reference< xml::sax::XAttributeList >& xAttribs )
+void SAL_CALL OFOPXMLHelper::startElement( const ::rtl::OUString& aName, const uno::Reference< xml::sax::XAttributeList >& xAttribs ) 	
         throw( xml::sax::SAXException, uno::RuntimeException )
 {
     if ( m_nFormat == RELATIONINFO_FORMAT )
@@ -423,7 +423,7 @@ void SAL_CALL OFOPXMLHelper::startElement( const ::rtl::OUString& aName, const u
 }
 
 // -----------------------------------
-void SAL_CALL OFOPXMLHelper::endElement( const ::rtl::OUString& aName )
+void SAL_CALL OFOPXMLHelper::endElement( const ::rtl::OUString& aName ) 	
     throw( xml::sax::SAXException, uno::RuntimeException )
 {
     if ( m_nFormat == RELATIONINFO_FORMAT || m_nFormat == CONTENTTYPE_FORMAT )
@@ -440,25 +440,25 @@ void SAL_CALL OFOPXMLHelper::endElement( const ::rtl::OUString& aName )
 }
 
 // -----------------------------------
-void SAL_CALL OFOPXMLHelper::characters( const ::rtl::OUString& /*aChars*/ )
+void SAL_CALL OFOPXMLHelper::characters( const ::rtl::OUString& /*aChars*/ ) 	
         throw(xml::sax::SAXException, uno::RuntimeException)
 {
 }
 
 // -----------------------------------
-void SAL_CALL OFOPXMLHelper::ignorableWhitespace( const ::rtl::OUString& /*aWhitespaces*/ )
+void SAL_CALL OFOPXMLHelper::ignorableWhitespace( const ::rtl::OUString& /*aWhitespaces*/ ) 	
         throw(xml::sax::SAXException, uno::RuntimeException)
 {
 }
 
 // -----------------------------------
-void SAL_CALL OFOPXMLHelper::processingInstruction( const ::rtl::OUString& /*aTarget*/, const ::rtl::OUString& /*aData*/ )
+void SAL_CALL OFOPXMLHelper::processingInstruction( const ::rtl::OUString& /*aTarget*/, const ::rtl::OUString& /*aData*/ ) 	
         throw(xml::sax::SAXException, uno::RuntimeException)
 {
 }
 
 // -----------------------------------
-void SAL_CALL OFOPXMLHelper::setDocumentLocator( const uno::Reference< xml::sax::XLocator >& /*xLocator*/ )
+void SAL_CALL OFOPXMLHelper::setDocumentLocator( const uno::Reference< xml::sax::XLocator >& /*xLocator*/ ) 	
         throw(xml::sax::SAXException, uno::RuntimeException)
 {
 }
diff --git a/comphelper/test/uno_iterators/uno_iterators.cxx b/comphelper/test/uno_iterators/uno_iterators.cxx
index 6f45b16cf6da..d11504b6ddd5 100644
--- a/comphelper/test/uno_iterators/uno_iterators.cxx
+++ b/comphelper/test/uno_iterators/uno_iterators.cxx
@@ -1,6 +1,6 @@
 /*************************************************************************
  * 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
@@ -52,7 +52,7 @@ void fill_testdata(Sequence<OUString>& seq)
 }
 
 void print_oustring(const OUString& ustr)
-{ cout << OUStringToOString(ustr, RTL_TEXTENCODING_ASCII_US).getStr() << endl; }
+{ cout << OUStringToOString(ustr, RTL_TEXTENCODING_ASCII_US).getStr() << endl; } 
 
 void print_sequence(const Sequence<OUString>& seq)
 {
@@ -158,7 +158,7 @@ void stl_inserting()
     StlUnoSequence<OUString> stl_result = StlUnoSequence<OUString>::createInstance(result);
     fill_testdata(s1);
     fill_testdata(s2);
-
+    
     list<OUString> temp(stl_s1.begin(), stl_s1.end());
     copy(stl_s2.begin()+5, stl_s2.end(), insert_iterator<list<OUString> >(temp, ++temp.begin()));
     copy(temp.begin(), temp.end(), stl_result.begin());
@@ -202,17 +202,17 @@ int main()
     stl_algos();
 
     cout << "--- SOME STL CONVERSIONS" << endl;
-    stl_conversions();
+    stl_conversions();  
 
     cout << "--- INSERTING IN SEQUENCE" << endl;
     stl_inserting();
-
+    
     cout << "--- COMPARING" << endl;
     stl_compare();
-
+    
     cout << "--- CONST SEQUENCE" << endl;
     stl_const_sequence();
-
+    
     cout << "--- HELPERS IN STL-STYLE" << endl;
     stl_helpers();
 }
diff --git a/cppcanvas/inc/cppcanvas/basegfxfactory.hxx b/cppcanvas/inc/cppcanvas/basegfxfactory.hxx
index 268292eb4a55..a7db96d45573 100644
--- a/cppcanvas/inc/cppcanvas/basegfxfactory.hxx
+++ b/cppcanvas/inc/cppcanvas/basegfxfactory.hxx
@@ -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
@@ -72,20 +72,20 @@ namespace cppcanvas
             The created polygon initially has the same size in user
             coordinate space as the source polygon
          */
-        PolyPolygonSharedPtr    createPolyPolygon( const CanvasSharedPtr&, const ::basegfx::B2DPolygon& rPoly ) const;
-        PolyPolygonSharedPtr    createPolyPolygon( const CanvasSharedPtr&, const ::basegfx::B2DPolyPolygon& rPoly ) const;
+        PolyPolygonSharedPtr 	createPolyPolygon( const CanvasSharedPtr&, const ::basegfx::B2DPolygon& rPoly ) const;
+        PolyPolygonSharedPtr 	createPolyPolygon( const CanvasSharedPtr&, const ::basegfx::B2DPolyPolygon& rPoly ) const;
 
         /** Create an uninitialized bitmap with the given size
          */
-        BitmapSharedPtr         createBitmap( const CanvasSharedPtr&, const ::basegfx::B2ISize& rSize ) const;
+        BitmapSharedPtr 		createBitmap( const CanvasSharedPtr&, const ::basegfx::B2ISize& rSize ) const; 
 
         /** Create an uninitialized alpha bitmap with the given size
          */
-        BitmapSharedPtr         createAlphaBitmap( const CanvasSharedPtr&, const ::basegfx::B2ISize& rSize ) const;
+        BitmapSharedPtr 		createAlphaBitmap( const CanvasSharedPtr&, const ::basegfx::B2ISize& rSize ) const; 
 
-        /** Create a text portion with the given content string
+        /** Create a text portion with the given content string 
          */
-        TextSharedPtr           createText( const CanvasSharedPtr&, const ::rtl::OUString& ) const;
+        TextSharedPtr 			createText( const CanvasSharedPtr&, const ::rtl::OUString& ) const;
 
     private:
         friend struct InitInstance2;
diff --git a/cppcanvas/inc/cppcanvas/bitmap.hxx b/cppcanvas/inc/cppcanvas/bitmap.hxx
index cd17ec1837c9..02af63ff4421 100644
--- a/cppcanvas/inc/cppcanvas/bitmap.hxx
+++ b/cppcanvas/inc/cppcanvas/bitmap.hxx
@@ -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
@@ -34,7 +34,7 @@
 #include <cppcanvas/canvasgraphic.hxx>
 #include <cppcanvas/bitmapcanvas.hxx>
 
-namespace com { namespace sun { namespace star { namespace rendering
+namespace com { namespace sun { namespace star { namespace rendering 
 {
     class  XBitmap;
 } } } }
@@ -66,12 +66,12 @@ namespace cppcanvas
 
             @return whether the rendering finished successfully.
          */
-        virtual bool                        drawAlphaModulated( double nAlphaModulation ) const = 0;
+        virtual bool 						drawAlphaModulated( double nAlphaModulation ) const = 0;
 
-        virtual BitmapCanvasSharedPtr       getBitmapCanvas() const = 0;
+        virtual BitmapCanvasSharedPtr		getBitmapCanvas() const = 0;
 
-        virtual ::com::sun::star::uno::Reference<
-            ::com::sun::star::rendering::XBitmap >  getUNOBitmap() const = 0;
+        virtual ::com::sun::star::uno::Reference< 
+            ::com::sun::star::rendering::XBitmap > 	getUNOBitmap() const = 0;
     };
 
     typedef ::boost::shared_ptr< ::cppcanvas::Bitmap > BitmapSharedPtr;
diff --git a/cppcanvas/inc/cppcanvas/bitmapcanvas.hxx b/cppcanvas/inc/cppcanvas/bitmapcanvas.hxx
index 896f0c72845e..f55a1d76b328 100644
--- a/cppcanvas/inc/cppcanvas/bitmapcanvas.hxx
+++ b/cppcanvas/inc/cppcanvas/bitmapcanvas.hxx
@@ -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
@@ -50,10 +50,10 @@ namespace cppcanvas
     class BitmapCanvas : public virtual Canvas
     {
     public:
-        virtual ::basegfx::B2ISize      getSize() const = 0;
+        virtual ::basegfx::B2ISize 		getSize() const = 0;
 
         // shared_ptr does not allow for covariant return types
-        BitmapCanvasSharedPtr           cloneBitmapCanvas() const
+        BitmapCanvasSharedPtr			cloneBitmapCanvas() const
         {
             BitmapCanvasSharedPtr p( ::boost::dynamic_pointer_cast< BitmapCanvas >(this->clone()) );
             OSL_ENSURE(p.get(), "BitmapCanvas::cloneBitmapCanvas(): dynamic cast failed");
diff --git a/cppcanvas/inc/cppcanvas/canvas.hxx b/cppcanvas/inc/cppcanvas/canvas.hxx
index e08adeac2912..a89c91eb9bd4 100644
--- a/cppcanvas/inc/cppcanvas/canvas.hxx
+++ b/cppcanvas/inc/cppcanvas/canvas.hxx
@@ -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
@@ -45,7 +45,7 @@ namespace basegfx
     class B2DPolyPolygon;
 }
 
-namespace com { namespace sun { namespace star { namespace rendering
+namespace com { namespace sun { namespace star { namespace rendering 
 {
     class  XCanvas;
     struct ViewState;
@@ -70,8 +70,8 @@ namespace cppcanvas
     class Canvas
     {
     public:
-        enum
-        {
+        enum 
+        { 
             /** Extra pixel used when canvas anti-aliases.
 
                 Enlarge the bounding box of drawing primitives by this
@@ -85,13 +85,13 @@ namespace cppcanvas
 
         virtual ~Canvas() {}
 
-        virtual void                             setTransformation( const ::basegfx::B2DHomMatrix& rMatrix ) = 0;
+        virtual void 						     setTransformation( const ::basegfx::B2DHomMatrix& rMatrix ) = 0;
         virtual ::basegfx::B2DHomMatrix          getTransformation() const = 0;
 
         virtual void                             setClip( const ::basegfx::B2DPolyPolygon& rClipPoly ) = 0;
         virtual void                             setClip() = 0;
 
-        /** Get current clip
+        /** Get current clip 
 
             @return NULL, if no clip is set, otherwise the current clip poly-polygon
          */
@@ -102,13 +102,13 @@ namespace cppcanvas
         virtual ColorSharedPtr                   createColor() const = 0;
 
         virtual CanvasSharedPtr                  clone() const = 0;
-        virtual void                             clear() const = 0;
+        virtual void                             clear() const = 0;                            
 
         // this should be considered private. if RTTI gets enabled
         // someday, remove that to a separate interface
-        virtual ::com::sun::star::uno::Reference<
-            ::com::sun::star::rendering::XCanvas >          getUNOCanvas() const = 0;
-        virtual ::com::sun::star::rendering::ViewState      getViewState() const = 0;
+        virtual ::com::sun::star::uno::Reference< 
+            ::com::sun::star::rendering::XCanvas > 			getUNOCanvas() const = 0;
+        virtual ::com::sun::star::rendering::ViewState	 	getViewState() const = 0;
     };
 
 }
diff --git a/cppcanvas/inc/cppcanvas/canvasgraphic.hxx b/cppcanvas/inc/cppcanvas/canvasgraphic.hxx
index 24467771dc50..202ff645d50e 100644
--- a/cppcanvas/inc/cppcanvas/canvasgraphic.hxx
+++ b/cppcanvas/inc/cppcanvas/canvasgraphic.hxx
@@ -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
@@ -77,10 +77,10 @@ namespace cppcanvas
 
             /// Copy source as-is to destination. Fa = 1, Fb = 0.
             SOURCE,
-
+    
             /// Leave destination as-is.  Fa = 0, Fb = 1.
             DESTINATION,
-
+            
             /// Copy source over destination. Fa = 1, Fb = 1-Aa.
             OVER,
 
@@ -122,7 +122,7 @@ namespace cppcanvas
 
         /** Set object transformation matrix
          */
-        virtual void                             setTransformation( const ::basegfx::B2DHomMatrix& rMatrix ) = 0;
+        virtual void 						     setTransformation( const ::basegfx::B2DHomMatrix& rMatrix ) = 0;
         /** Get object transformation matrix
          */
         virtual ::basegfx::B2DHomMatrix          getTransformation() const = 0;
@@ -161,7 +161,7 @@ namespace cppcanvas
             @return whether the rendering finished successfully.
          */
         virtual bool draw() const = 0;
-
+        
     };
 
     typedef ::boost::shared_ptr< ::cppcanvas::CanvasGraphic > CanvasGraphicSharedPtr;
diff --git a/cppcanvas/inc/cppcanvas/color.hxx b/cppcanvas/inc/cppcanvas/color.hxx
index 9a5237c264b7..e8dc28175e55 100644
--- a/cppcanvas/inc/cppcanvas/color.hxx
+++ b/cppcanvas/inc/cppcanvas/color.hxx
@@ -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
@@ -49,37 +49,37 @@ namespace cppcanvas
 
         virtual ~Color() {}
 
-        virtual IntSRGBA                                    getIntSRGBA( ::com::sun::star::uno::Sequence< double >& rDeviceColor ) const = 0;
-        virtual ::com::sun::star::uno::Sequence< double >   getDeviceColor( IntSRGBA aSRGBA ) const = 0;
+        virtual IntSRGBA 									getIntSRGBA( ::com::sun::star::uno::Sequence< double >& rDeviceColor ) const = 0;
+        virtual ::com::sun::star::uno::Sequence< double > 	getDeviceColor( IntSRGBA aSRGBA ) const = 0;
     };
 
     typedef ::boost::shared_ptr< ::cppcanvas::Color > ColorSharedPtr;
 
-    inline sal_uInt8 getRed( Color::IntSRGBA nCol )
-    {
-        return static_cast<sal_uInt8>( (nCol&0xFF000000U) >> 24U );
+    inline sal_uInt8 getRed( Color::IntSRGBA nCol ) 
+    { 
+        return static_cast<sal_uInt8>( (nCol&0xFF000000U) >> 24U ); 
     }
 
-    inline sal_uInt8 getGreen( Color::IntSRGBA nCol )
-    {
-        return static_cast<sal_uInt8>( (nCol&0x00FF0000U) >> 16U );
+    inline sal_uInt8 getGreen( Color::IntSRGBA nCol ) 
+    { 
+        return static_cast<sal_uInt8>( (nCol&0x00FF0000U) >> 16U ); 
     }
 
-    inline sal_uInt8 getBlue( Color::IntSRGBA nCol )
-    {
-        return static_cast<sal_uInt8>( (nCol&0x0000FF00U) >> 8U );
+    inline sal_uInt8 getBlue( Color::IntSRGBA nCol ) 
+    { 
+        return static_cast<sal_uInt8>( (nCol&0x0000FF00U) >> 8U ); 
     }
 
-    inline sal_uInt8 getAlpha( Color::IntSRGBA nCol )
-    {
-        return static_cast<sal_uInt8>( nCol&0x000000FFU );
+    inline sal_uInt8 getAlpha( Color::IntSRGBA nCol ) 
+    { 
+        return static_cast<sal_uInt8>( nCol&0x000000FFU ); 
     }
 
-    inline Color::IntSRGBA makeColor( sal_uInt8 nRed, sal_uInt8 nGreen, sal_uInt8 nBlue, sal_uInt8 nAlpha )
-    {
+    inline Color::IntSRGBA makeColor( sal_uInt8 nRed, sal_uInt8 nGreen, sal_uInt8 nBlue, sal_uInt8 nAlpha ) 
+    { 
         return (nRed << 24U)|(nGreen << 16U)|(nBlue << 8U)|(nAlpha);
     }
-
+    
     inline sal_Int32 unMakeColor( sal_uInt8 nAlpha, sal_uInt8 nRed, sal_uInt8 nGreen, sal_uInt8 nBlue)
     {
         return (nAlpha << 24U)|(nRed << 16U)|(nGreen << 8U)|(nBlue);
diff --git a/cppcanvas/inc/cppcanvas/customsprite.hxx b/cppcanvas/inc/cppcanvas/customsprite.hxx
index 15e1c1185aad..bb35e0e760ca 100644
--- a/cppcanvas/inc/cppcanvas/customsprite.hxx
+++ b/cppcanvas/inc/cppcanvas/customsprite.hxx
@@ -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
diff --git a/cppcanvas/inc/cppcanvas/font.hxx b/cppcanvas/inc/cppcanvas/font.hxx
index 2077ae811c85..071072688a34 100644
--- a/cppcanvas/inc/cppcanvas/font.hxx
+++ b/cppcanvas/inc/cppcanvas/font.hxx
@@ -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
@@ -37,7 +37,7 @@ namespace rtl
     class OUString;
 }
 
-namespace com { namespace sun { namespace star { namespace rendering
+namespace com { namespace sun { namespace star { namespace rendering 
 {
     class  XCanvasFont;
 } } } }
@@ -53,9 +53,9 @@ namespace cppcanvas
         virtual ~Font() {}
 
         virtual ::rtl::OUString getName() const = 0;
-        virtual double          getCellSize() const = 0;
+        virtual double 			getCellSize() const = 0;
 
-        virtual ::com::sun::star::uno::Reference<
+        virtual ::com::sun::star::uno::Reference< 
             ::com::sun::star::rendering::XCanvasFont > getUNOFont() const = 0;
     };
 
diff --git a/cppcanvas/inc/cppcanvas/polypolygon.hxx b/cppcanvas/inc/cppcanvas/polypolygon.hxx
index a32e0c19ae50..7bf7644a9fe9 100644
--- a/cppcanvas/inc/cppcanvas/polypolygon.hxx
+++ b/cppcanvas/inc/cppcanvas/polypolygon.hxx
@@ -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
@@ -39,7 +39,7 @@ namespace basegfx
     class B2DPolyPolygon;
 }
 
-namespace com { namespace sun { namespace star { namespace rendering
+namespace com { namespace sun { namespace star { namespace rendering 
 {
     class  XPolyPolygon2D;
 } } } }
@@ -69,21 +69,21 @@ namespace cppcanvas
 
         /** Set polygon fill color
          */
-        virtual void                        setRGBAFillColor( Color::IntSRGBA ) = 0;
+        virtual void						setRGBAFillColor( Color::IntSRGBA ) = 0;
         /** Set polygon line color
          */
-        virtual void                        setRGBALineColor( Color::IntSRGBA ) = 0;
+        virtual void						setRGBALineColor( Color::IntSRGBA ) = 0;
         /** Get polygon fill color
          */
-        virtual Color::IntSRGBA             getRGBAFillColor() const = 0;
+        virtual Color::IntSRGBA				getRGBAFillColor() const = 0;
         /** Get polygon line color
          */
-        virtual Color::IntSRGBA             getRGBALineColor() const = 0;
+        virtual Color::IntSRGBA				getRGBALineColor() const = 0;
 
-        virtual void                        setStrokeWidth( const double& rStrokeWidth ) = 0;
-        virtual double                      getStrokeWidth() const = 0;
+        virtual void 						setStrokeWidth( const double& rStrokeWidth ) = 0;
+        virtual double 						getStrokeWidth() const = 0;
 
-        virtual ::com::sun::star::uno::Reference<
+        virtual ::com::sun::star::uno::Reference< 
             ::com::sun::star::rendering::XPolyPolygon2D > getUNOPolyPolygon() const = 0;
     };
 
diff --git a/cppcanvas/inc/cppcanvas/renderer.hxx b/cppcanvas/inc/cppcanvas/renderer.hxx
index 780a27f31503..5cd31a1b002d 100644
--- a/cppcanvas/inc/cppcanvas/renderer.hxx
+++ b/cppcanvas/inc/cppcanvas/renderer.hxx
@@ -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
@@ -74,8 +74,8 @@ namespace cppcanvas
 
             @return whether the rendering finished successfully.
          */
-        virtual bool drawSubset( sal_Int32  nStartIndex,
-                                 sal_Int32  nEndIndex ) const = 0;
+        virtual bool drawSubset( sal_Int32	nStartIndex,
+                                 sal_Int32	nEndIndex ) const = 0;
 
         /** Query bounding box of metafile subset
 
@@ -101,24 +101,24 @@ namespace cppcanvas
 
             @return the bounding box of the specified subset
          */
-        virtual ::basegfx::B2DRange getSubsetArea( sal_Int32    nStartIndex,
-                                                   sal_Int32    nEndIndex ) const = 0;
+        virtual ::basegfx::B2DRange getSubsetArea( sal_Int32	nStartIndex,
+                                                   sal_Int32	nEndIndex ) const = 0;
 
         /** Parameters for the Renderer
          */
         struct Parameters
         {
             /// Optionally forces the fill color attribute for all actions
-            ::comphelper::OptionalValue< Color::IntSRGBA >          maFillColor;
+            ::comphelper::OptionalValue< Color::IntSRGBA >			maFillColor;
 
             /// Optionally forces the line color attribute for all actions
-            ::comphelper::OptionalValue< Color::IntSRGBA >          maLineColor;
+            ::comphelper::OptionalValue< Color::IntSRGBA >  		maLineColor;
 
             /// Optionally forces the text color attribute for all actions
-            ::comphelper::OptionalValue< Color::IntSRGBA >          maTextColor;
+            ::comphelper::OptionalValue< Color::IntSRGBA >  		maTextColor;
 
             /// Optionally forces the given fontname for all text actions
-            ::comphelper::OptionalValue< ::rtl::OUString >          maFontName;
+            ::comphelper::OptionalValue< ::rtl::OUString >  		maFontName;
 
             /** Optionally transforms all text output actions with the
                 given matrix (in addition to the overall canvas
@@ -128,16 +128,16 @@ namespace cppcanvas
                 rect coordinate system, i.e. the metafile is assumed
                 to be contained in the unit rect.
              */
-            ::comphelper::OptionalValue< ::basegfx::B2DHomMatrix >  maTextTransformation;
+            ::comphelper::OptionalValue< ::basegfx::B2DHomMatrix >	maTextTransformation;
 
             /// Optionally forces the given font weight for all text actions
-            ::comphelper::OptionalValue< sal_Int8 >                 maFontWeight;
+            ::comphelper::OptionalValue< sal_Int8 >					maFontWeight;
 
             /// Optionally forces the given font letter form (italics etc.) for all text actions
-            ::comphelper::OptionalValue< sal_Int8 >                 maFontLetterForm;
+            ::comphelper::OptionalValue< sal_Int8 >					maFontLetterForm;
 
             /// Optionally forces underlining for all text actions
-            ::comphelper::OptionalValue< bool >                     maFontUnderline;
+            ::comphelper::OptionalValue< bool >						maFontUnderline;
         };
     };
 
diff --git a/cppcanvas/inc/cppcanvas/sprite.hxx b/cppcanvas/inc/cppcanvas/sprite.hxx
index 3a80a8137754..ec544b3233b3 100644
--- a/cppcanvas/inc/cppcanvas/sprite.hxx
+++ b/cppcanvas/inc/cppcanvas/sprite.hxx
@@ -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
@@ -39,7 +39,7 @@ namespace basegfx
     class B2DPoint;
 }
 
-namespace com { namespace sun { namespace star { namespace rendering
+namespace com { namespace sun { namespace star { namespace rendering 
 {
     class  XSprite;
 } } } }
@@ -83,7 +83,7 @@ namespace cppcanvas
             interpreted in device coordinates (i.e. screen pixel)
          */
         virtual void setClipPixel( const ::basegfx::B2DPolyPolygon& rClipPoly ) = 0;
-
+        
         /** Set output clipping
 
             This method applies the clip poly-polygon interpreted in
@@ -92,7 +92,7 @@ namespace cppcanvas
         virtual void setClip( const ::basegfx::B2DPolyPolygon& rClipPoly ) = 0;
 
         virtual void setClip() = 0;
-
+        
         virtual void show() = 0;
         virtual void hide() = 0;
 
@@ -106,7 +106,7 @@ namespace cppcanvas
          */
         virtual void setPriority( double fPriority ) = 0;
 
-        virtual ::com::sun::star::uno::Reference<
+        virtual ::com::sun::star::uno::Reference< 
             ::com::sun::star::rendering::XSprite > getUNOSprite() const = 0;
     };
 
diff --git a/cppcanvas/inc/cppcanvas/spritecanvas.hxx b/cppcanvas/inc/cppcanvas/spritecanvas.hxx
index e5fda82d2e41..253a4ef7c28f 100644
--- a/cppcanvas/inc/cppcanvas/spritecanvas.hxx
+++ b/cppcanvas/inc/cppcanvas/spritecanvas.hxx
@@ -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
@@ -39,7 +39,7 @@
 #include <cppcanvas/sprite.hxx>
 #include <cppcanvas/customsprite.hxx>
 
-namespace com { namespace sun { namespace star { namespace rendering
+namespace com { namespace sun { namespace star { namespace rendering 
 {
     class  XSpriteCanvas;
 } } } }
@@ -59,21 +59,21 @@ namespace cppcanvas
     class SpriteCanvas : public virtual BitmapCanvas
     {
     public:
-        virtual bool                    updateScreen( bool bUpdateAll ) const = 0;
-
-        virtual CustomSpriteSharedPtr   createCustomSprite( const ::basegfx::B2DSize& ) const = 0;
-        virtual SpriteSharedPtr         createClonedSprite( const SpriteSharedPtr& ) const = 0;
+        virtual bool					updateScreen( bool bUpdateAll ) const = 0;
+        
+        virtual CustomSpriteSharedPtr 	createCustomSprite( const ::basegfx::B2DSize& ) const = 0;
+        virtual SpriteSharedPtr 		createClonedSprite( const SpriteSharedPtr& ) const = 0;
 
         // shared_ptr does not allow for covariant return types
-        SpriteCanvasSharedPtr           cloneSpriteCanvas() const
+        SpriteCanvasSharedPtr			cloneSpriteCanvas() const
         {
             SpriteCanvasSharedPtr p( ::boost::dynamic_pointer_cast< SpriteCanvas >(this->clone()) );
             OSL_ENSURE(p.get(), "SpriteCanvas::cloneSpriteCanvas(): dynamic cast failed");
             return p;
         }
 
-        virtual ::com::sun::star::uno::Reference<
-            ::com::sun::star::rendering::XSpriteCanvas >    getUNOSpriteCanvas() const = 0;
+        virtual ::com::sun::star::uno::Reference< 
+            ::com::sun::star::rendering::XSpriteCanvas > 	getUNOSpriteCanvas() const = 0;
     };
 
 }
diff --git a/cppcanvas/inc/cppcanvas/text.hxx b/cppcanvas/inc/cppcanvas/text.hxx
index 6fd54b4e0106..53d38adc1a77 100644
--- a/cppcanvas/inc/cppcanvas/text.hxx
+++ b/cppcanvas/inc/cppcanvas/text.hxx
@@ -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
diff --git a/cppcanvas/inc/cppcanvas/vclfactory.hxx b/cppcanvas/inc/cppcanvas/vclfactory.hxx
index b95102f31472..c8ad392dea7f 100644
--- a/cppcanvas/inc/cppcanvas/vclfactory.hxx
+++ b/cppcanvas/inc/cppcanvas/vclfactory.hxx
@@ -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
@@ -52,7 +52,7 @@ namespace rtl
 {
     class OUString;
 }
-namespace com { namespace sun { namespace star { namespace rendering
+namespace com { namespace sun { namespace star { namespace rendering 
 {
     class  XBitmapCanvas;
     class  XSpriteCanvas;
@@ -75,60 +75,60 @@ namespace cppcanvas
     public:
         static VCLFactory& getInstance();
 
-        BitmapCanvasSharedPtr   createCanvas( const ::Window& rVCLWindow );
-        BitmapCanvasSharedPtr   createCanvas( const ::com::sun::star::uno::Reference<
+        BitmapCanvasSharedPtr 	createCanvas( const ::Window& rVCLWindow );
+        BitmapCanvasSharedPtr 	createCanvas( const ::com::sun::star::uno::Reference< 
                                                           ::com::sun::star::rendering::XBitmapCanvas >& xCanvas );
 
-        SpriteCanvasSharedPtr   createSpriteCanvas( const ::Window& rVCLWindow ) const;
-        SpriteCanvasSharedPtr   createSpriteCanvas( const ::com::sun::star::uno::Reference<
+        SpriteCanvasSharedPtr 	createSpriteCanvas( const ::Window& rVCLWindow ) const;
+        SpriteCanvasSharedPtr 	createSpriteCanvas( const ::com::sun::star::uno::Reference< 
                                                                ::com::sun::star::rendering::XSpriteCanvas >& xCanvas ) const;
-        SpriteCanvasSharedPtr   createFullscreenSpriteCanvas( const ::Window& rVCLWindow, const Size& rFullscreenSize ) const;
+        SpriteCanvasSharedPtr 	createFullscreenSpriteCanvas( const ::Window& rVCLWindow, const Size& rFullscreenSize ) const;
 
         /** Create a polygon from a tools::Polygon
 
             The created polygon initially has the same size in user
             coordinate space as the source polygon
          */
-        PolyPolygonSharedPtr    createPolyPolygon( const CanvasSharedPtr&, const ::Polygon& rPoly ) const;
-        PolyPolygonSharedPtr    createPolyPolygon( const CanvasSharedPtr&, const ::PolyPolygon& rPoly ) const;
+        PolyPolygonSharedPtr 	createPolyPolygon( const CanvasSharedPtr&, const ::Polygon& rPoly ) const;
+        PolyPolygonSharedPtr 	createPolyPolygon( const CanvasSharedPtr&, const ::PolyPolygon& rPoly ) const;
 
         /** Create an uninitialized bitmap with the given size
          */
-        BitmapSharedPtr         createBitmap( const CanvasSharedPtr&, const ::Size& rSize ) const;
+        BitmapSharedPtr 		createBitmap( const CanvasSharedPtr&, const ::Size& rSize ) const; 
 
         /** Create an uninitialized alpha bitmap with the given size
          */
-        BitmapSharedPtr         createAlphaBitmap( const CanvasSharedPtr&, const ::Size& rSize ) const;
+        BitmapSharedPtr 		createAlphaBitmap( const CanvasSharedPtr&, const ::Size& rSize ) const; 
 
         /** Create a bitmap from a VCL Bitmap
          */
-        BitmapSharedPtr         createBitmap( const CanvasSharedPtr&, const ::Bitmap& rBitmap ) const;
-        BitmapSharedPtr         createBitmap( const CanvasSharedPtr&, const ::BitmapEx& rBmpEx ) const;
+        BitmapSharedPtr 		createBitmap( const CanvasSharedPtr&, const ::Bitmap& rBitmap ) const; 
+        BitmapSharedPtr 		createBitmap( const CanvasSharedPtr&, const ::BitmapEx& rBmpEx ) const;
 
         /** Create a renderer object from a Graphic
 
             The created renderer initially draws the graphic
             one-by-one units large, in user coordinate space
          */
-        RendererSharedPtr       createRenderer( const CanvasSharedPtr&          rCanvas,
-                                                const ::Graphic&                rGraphic,
-                                                const Renderer::Parameters&     rParms ) const;
+        RendererSharedPtr 		createRenderer( const CanvasSharedPtr&			rCanvas, 
+                                                const ::Graphic& 				rGraphic,
+                                                const Renderer::Parameters& 	rParms ) const;
         /** Create a renderer object from a Metafile
 
             The created renderer initially draws the metafile
             one-by-one units large, in user coordinate space
          */
-        RendererSharedPtr       createRenderer( const CanvasSharedPtr&          rCanvas,
-                                                const ::GDIMetaFile&            rMtf,
-                                                const Renderer::Parameters&     rParms ) const;
+        RendererSharedPtr 		createRenderer( const CanvasSharedPtr&			rCanvas, 
+                                                const ::GDIMetaFile& 			rMtf,
+                                                const Renderer::Parameters& 	rParms ) const;
 
         /** Create an animated sprite from a VCL animation
          */
-        SpriteSharedPtr         createAnimatedSprite( const SpriteCanvasSharedPtr&, const ::Animation& rAnim ) const;
+        SpriteSharedPtr 		createAnimatedSprite( const SpriteCanvasSharedPtr&, const ::Animation& rAnim ) const;
 
-        /** Create a text portion with the given content string
+        /** Create a text portion with the given content string 
          */
-        TextSharedPtr           createText( const CanvasSharedPtr&, const ::rtl::OUString& ) const;
+        TextSharedPtr 			createText( const CanvasSharedPtr&, const ::rtl::OUString& ) const;
 
     private:
         friend struct InitInstance;
diff --git a/cppcanvas/inc/pch/precompiled_cppcanvas.cxx b/cppcanvas/inc/pch/precompiled_cppcanvas.cxx
index 8b82ed878284..1060974ca16d 100644
--- a/cppcanvas/inc/pch/precompiled_cppcanvas.cxx
+++ b/cppcanvas/inc/pch/precompiled_cppcanvas.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
diff --git a/cppcanvas/inc/pch/precompiled_cppcanvas.hxx b/cppcanvas/inc/pch/precompiled_cppcanvas.hxx
index b1bd1d18e74e..50f98a0a9965 100644
--- a/cppcanvas/inc/pch/precompiled_cppcanvas.hxx
+++ b/cppcanvas/inc/pch/precompiled_cppcanvas.hxx
@@ -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
diff --git a/cppcanvas/source/inc/action.hxx b/cppcanvas/source/inc/action.hxx
index 9be2b5309e0f..282536192200 100644
--- a/cppcanvas/source/inc/action.hxx
+++ b/cppcanvas/source/inc/action.hxx
@@ -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
@@ -43,8 +43,8 @@ namespace basegfx
 
 /* Definition of Action interface */
 
-namespace cppcanvas
-{
+namespace cppcanvas 
+{ 
     namespace internal
     {
         /** Interface for internal render actions
@@ -78,7 +78,7 @@ namespace cppcanvas
                     The index given here specifies the first subaction
                     to render.
                  */
-                sal_Int32   mnSubsetBegin;
+                sal_Int32	mnSubsetBegin;
 
                 /** Denotes end of the subset
 
@@ -86,13 +86,13 @@ namespace cppcanvas
                     <em>not<em> to render, i.e. one action behind the
                     subset to be rendered
                  */
-                sal_Int32   mnSubsetEnd;
+                sal_Int32	mnSubsetEnd;
             };
 
             virtual ~Action() {}
 
             /** Render this action to the associated canvas
-
+            
                 @param rTransformation
                 Transformation matrix to apply before rendering
 
@@ -102,7 +102,7 @@ namespace cppcanvas
             virtual bool render( const ::basegfx::B2DHomMatrix& rTransformation ) const = 0;
 
             /** Render the given part of the action to the associated
-                canvas.
+                canvas.		                   
 
                 @param rTransformation
                 Transformation matrix to apply before rendering
@@ -116,10 +116,10 @@ namespace cppcanvas
                 rendering failed for other reasons, false is returned.
              */
             virtual bool render( const ::basegfx::B2DHomMatrix& rTransformation,
-                                 const Subset&                  rSubset ) const = 0;
+                                 const Subset&					rSubset ) const = 0;
 
             /** Query bounds of this action on the associated canvas
-
+            
                 @param rTransformation
                 Transformation matrix to apply
 
@@ -141,8 +141,8 @@ namespace cppcanvas
                 @return the bounds for the given subset in device
                 coordinate space.
              */
-            virtual ::basegfx::B2DRange getBounds( const ::basegfx::B2DHomMatrix&   rTransformation,
-                                                   const Subset&                    rSubset ) const = 0;
+            virtual ::basegfx::B2DRange getBounds( const ::basegfx::B2DHomMatrix&	rTransformation,
+                                                   const Subset&					rSubset ) const = 0;
 
             /** Query action count.
 
@@ -153,7 +153,7 @@ namespace cppcanvas
 
                 @return the number of subset actions
              */
-            virtual sal_Int32 getActionCount() const = 0;
+            virtual sal_Int32 getActionCount() const = 0; 
         };
 
         typedef ::boost::shared_ptr< Action > ActionSharedPtr;
diff --git a/cppcanvas/source/inc/canvasgraphichelper.hxx b/cppcanvas/source/inc/canvasgraphichelper.hxx
index 40cda1d2d186..0d8d2789816e 100644
--- a/cppcanvas/source/inc/canvasgraphichelper.hxx
+++ b/cppcanvas/source/inc/canvasgraphichelper.hxx
@@ -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
@@ -35,7 +35,7 @@
 
 #include <boost/optional.hpp>
 
-namespace com { namespace sun { namespace star { namespace rendering
+namespace com { namespace sun { namespace star { namespace rendering 
 {
     class  XGraphicDevice;
 } } } }
@@ -48,14 +48,14 @@ namespace cppcanvas
 
     namespace internal
     {
-
+        
         class CanvasGraphicHelper : public virtual CanvasGraphic
         {
         public:
             CanvasGraphicHelper( const CanvasSharedPtr& rParentCanvas );
 
             // CanvasGraphic implementation
-            virtual void                             setTransformation( const ::basegfx::B2DHomMatrix& rMatrix );
+            virtual void 						     setTransformation( const ::basegfx::B2DHomMatrix& rMatrix );
             virtual ::basegfx::B2DHomMatrix          getTransformation() const;
             virtual void                             setClip( const ::basegfx::B2DPolyPolygon& rClipPoly );
             virtual void                             setClip();
@@ -68,15 +68,15 @@ namespace cppcanvas
         protected:
             // for our clients
             // ===============
-            CanvasSharedPtr                                                                 getCanvas() const;
-            ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XGraphicDevice > getGraphicDevice() const;
+            CanvasSharedPtr																	getCanvas() const;
+            ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XGraphicDevice >	getGraphicDevice() const;
             const ::com::sun::star::rendering::RenderState&                                 getRenderState() const;
 
         private:
-            mutable ::com::sun::star::rendering::RenderState                                maRenderState;
+            mutable ::com::sun::star::rendering::RenderState 								maRenderState;
 
             boost::optional<basegfx::B2DPolyPolygon>                                        maClipPolyPolygon;
-            CanvasSharedPtr                                                                 mpCanvas;
+            CanvasSharedPtr 																mpCanvas;
             ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XGraphicDevice > mxGraphicDevice;
         };
 
diff --git a/cppcanvas/source/inc/implrenderer.hxx b/cppcanvas/source/inc/implrenderer.hxx
index 8c1f7941abc4..b54c3143493c 100644
--- a/cppcanvas/source/inc/implrenderer.hxx
+++ b/cppcanvas/source/inc/implrenderer.hxx
@@ -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
@@ -63,45 +63,45 @@ namespace cppcanvas
 
         // state stack of OutputDevice, to correctly handle
         // push/pop actions
-        typedef ::std::vector< OutDevState >    VectorOfOutDevStates;
+        typedef ::std::vector< OutDevState >	VectorOfOutDevStates;
 
         class ImplRenderer : public virtual Renderer, protected CanvasGraphicHelper
         {
         public:
-            ImplRenderer( const CanvasSharedPtr&    rCanvas,
-                          const GDIMetaFile&        rMtf,
-                          const Parameters&         rParms );
-            ImplRenderer( const CanvasSharedPtr&    rCanvas,
-                          const BitmapEx&           rBmpEx,
-                          const Parameters&         rParms );
+            ImplRenderer( const CanvasSharedPtr&	rCanvas,
+                          const GDIMetaFile&		rMtf,
+                          const Parameters& 		rParms );
+            ImplRenderer( const CanvasSharedPtr&	rCanvas,
+                          const BitmapEx&			rBmpEx,
+                          const Parameters& 		rParms );
 
             virtual ~ImplRenderer();
 
-            virtual bool                draw() const;
-            virtual bool                drawSubset( sal_Int32   nStartIndex,
-                                                    sal_Int32   nEndIndex ) const;
-            virtual ::basegfx::B2DRange getSubsetArea( sal_Int32    nStartIndex,
-                                                       sal_Int32    nEndIndex ) const;
+            virtual bool 				draw() const;
+            virtual bool 				drawSubset( sal_Int32	nStartIndex,
+                                                    sal_Int32	nEndIndex ) const;
+            virtual ::basegfx::B2DRange getSubsetArea( sal_Int32	nStartIndex,
+                                                       sal_Int32	nEndIndex ) const;
 
 
             // element of the Renderer's action vector. Need to be
             // public, since some functors need it, too.
             struct MtfAction
             {
-                MtfAction( const ActionSharedPtr&   rAction,
-                           sal_Int32                nOrigIndex ) :
+                MtfAction( const ActionSharedPtr& 	rAction,
+                           sal_Int32				nOrigIndex ) :
                     mpAction( rAction ),
                     mnOrigIndex( nOrigIndex )
                 {
                 }
 
                 ActionSharedPtr mpAction;
-                sal_Int32       mnOrigIndex;
+                sal_Int32		mnOrigIndex;
             };
 
             // prefetched and prepared canvas actions
             // (externally not visible)
-            typedef ::std::vector< MtfAction >      ActionVector;
+            typedef ::std::vector< MtfAction > 		ActionVector;
 
 
         private:
@@ -117,7 +117,7 @@ namespace cppcanvas
                                  const ActionFactoryParameters&     rParms,
                                  bool                               bIntersect );
 
-            ::com::sun::star::uno::Reference<
+            ::com::sun::star::uno::Reference< 
                 ::com::sun::star::rendering::XCanvasFont > createFont( double&                         o_rFontRotation,
                                                                        const ::Font&                   rFont,
                                                                        const ActionFactoryParameters&  rParms ) const;
diff --git a/cppcanvas/source/inc/tools.hxx b/cppcanvas/source/inc/tools.hxx
index f6d157d2c60e..c3f5da903f38 100644
--- a/cppcanvas/source/inc/tools.hxx
+++ b/cppcanvas/source/inc/tools.hxx
@@ -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
@@ -32,7 +32,7 @@
 #include <com/sun/star/uno/Sequence.hxx>
 #include <cppcanvas/color.hxx>
 
-namespace com { namespace sun { namespace star { namespace rendering
+namespace com { namespace sun { namespace star { namespace rendering 
 {
     class  XGraphicDevice;
 } } } }
@@ -42,14 +42,14 @@ namespace cppcanvas
 {
     namespace tools
     {
-        ::com::sun::star::uno::Sequence< double >
-            intSRGBAToDoubleSequence( const ::com::sun::star::uno::Reference<
-                                              ::com::sun::star::rendering::XGraphicDevice >&,
+        ::com::sun::star::uno::Sequence< double > 
+            intSRGBAToDoubleSequence( const ::com::sun::star::uno::Reference< 
+                                              ::com::sun::star::rendering::XGraphicDevice >&, 
                                       Color::IntSRGBA );
 
-        Color::IntSRGBA doubleSequenceToIntSRGBA( const ::com::sun::star::uno::Reference<
-                                                          ::com::sun::star::rendering::XGraphicDevice >&    rDevice,
-                                                  const ::com::sun::star::uno::Sequence< double >&              rColor  );
+        Color::IntSRGBA doubleSequenceToIntSRGBA( const ::com::sun::star::uno::Reference< 
+                                                          ::com::sun::star::rendering::XGraphicDevice >& 	rDevice, 
+                                                  const ::com::sun::star::uno::Sequence< double >&				rColor 	);
     }
 }
 
diff --git a/cppcanvas/source/mtfrenderer/bitmapaction.cxx b/cppcanvas/source/mtfrenderer/bitmapaction.cxx
index fd0bb268b6f5..cce524158439 100644
--- a/cppcanvas/source/mtfrenderer/bitmapaction.cxx
+++ b/cppcanvas/source/mtfrenderer/bitmapaction.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
@@ -51,32 +51,32 @@
 
 using namespace ::com::sun::star;
 
-namespace cppcanvas
-{
+namespace cppcanvas 
+{ 
     namespace internal
     {
         namespace
         {
 
             class BitmapAction : public CachedPrimitiveBase
-            {
-            public:
-                BitmapAction( const ::BitmapEx&,
-                              const ::basegfx::B2DPoint& rDstPoint,
-                              const CanvasSharedPtr&,
-                              const OutDevState& );
+            { 
+            public: 
+                BitmapAction( const ::BitmapEx&,  
+                              const ::basegfx::B2DPoint& rDstPoint,  
+                              const CanvasSharedPtr&, 
+                              const OutDevState& ); 
                 BitmapAction( const ::BitmapEx&,
-                              const ::basegfx::B2DPoint&  rDstPoint,
+                              const ::basegfx::B2DPoint&  rDstPoint,  
                               const ::basegfx::B2DVector& rDstSize,
-                              const CanvasSharedPtr&,
-                              const OutDevState& );
+                              const CanvasSharedPtr&, 
+                              const OutDevState& ); 
 
                 virtual bool render( const ::basegfx::B2DHomMatrix& rTransformation,
-                                     const Subset&                  rSubset ) const;
+                                     const Subset&					rSubset ) const;
 
                 virtual ::basegfx::B2DRange getBounds( const ::basegfx::B2DHomMatrix& rTransformation ) const;
-                virtual ::basegfx::B2DRange getBounds( const ::basegfx::B2DHomMatrix&   rTransformation,
-                                                       const Subset&                    rSubset ) const;
+                virtual ::basegfx::B2DRange getBounds( const ::basegfx::B2DHomMatrix&	rTransformation,
+                                                       const Subset&					rSubset ) const;
 
                 virtual sal_Int32 getActionCount() const;
 
@@ -85,18 +85,18 @@ namespace cppcanvas
                 virtual bool render( uno::Reference< rendering::XCachedPrimitive >& rCachedPrimitive,
                                      const ::basegfx::B2DHomMatrix&                 rTransformation ) const;
 
-                uno::Reference< rendering::XBitmap >                    mxBitmap;
-                CanvasSharedPtr                                         mpCanvas;
-                rendering::RenderState                                  maState;
+                uno::Reference< rendering::XBitmap > 					mxBitmap;
+                CanvasSharedPtr											mpCanvas;
+                rendering::RenderState									maState;
             };
 
 
-            BitmapAction::BitmapAction( const ::BitmapEx&          rBmpEx,
-                                        const ::basegfx::B2DPoint& rDstPoint,
-                                        const CanvasSharedPtr&     rCanvas,
+            BitmapAction::BitmapAction( const ::BitmapEx&		   rBmpEx,  
+                                        const ::basegfx::B2DPoint& rDstPoint,  
+                                        const CanvasSharedPtr&     rCanvas, 
                                         const OutDevState&         rState ) :
                 CachedPrimitiveBase( rCanvas, true ),
-                mxBitmap( ::vcl::unotools::xBitmapFromBitmapEx( rCanvas->getUNOCanvas()->getDevice(),
+                mxBitmap( ::vcl::unotools::xBitmapFromBitmapEx( rCanvas->getUNOCanvas()->getDevice(), 
                                                                 rBmpEx ) ),
                 mpCanvas( rCanvas ),
                 maState()
@@ -105,26 +105,26 @@ namespace cppcanvas
 
                 // Setup transformation such that the next render call is
                 // moved rPoint away.
-                const basegfx::B2DHomMatrix aLocalTransformation(basegfx::tools::createTranslateB2DHomMatrix(rDstPoint));
-                ::canvas::tools::appendToRenderState( maState,
+                const basegfx::B2DHomMatrix	aLocalTransformation(basegfx::tools::createTranslateB2DHomMatrix(rDstPoint));
+                ::canvas::tools::appendToRenderState( maState, 
                                                       aLocalTransformation );
 
                 // correct clip (which is relative to original transform)
-                tools::modifyClip( maState,
-                                   rState,
-                                   rCanvas,
-                                   rDstPoint,
+                tools::modifyClip( maState, 
+                                   rState, 
+                                   rCanvas, 
+                                   rDstPoint, 
                                    NULL,
                                    NULL );
             }
 
-            BitmapAction::BitmapAction( const ::BitmapEx&           rBmpEx,
-                                        const ::basegfx::B2DPoint&  rDstPoint,
+            BitmapAction::BitmapAction( const ::BitmapEx&		    rBmpEx,
+                                        const ::basegfx::B2DPoint&  rDstPoint,  
                                         const ::basegfx::B2DVector& rDstSize,
-                                        const CanvasSharedPtr&      rCanvas,
-                                        const OutDevState&          rState      ) :
+                                        const CanvasSharedPtr&      rCanvas, 
+                                        const OutDevState&          rState 		) :
                 CachedPrimitiveBase( rCanvas, true ),
-                mxBitmap( ::vcl::unotools::xBitmapFromBitmapEx( rCanvas->getUNOCanvas()->getDevice(),
+                mxBitmap( ::vcl::unotools::xBitmapFromBitmapEx( rCanvas->getUNOCanvas()->getDevice(), 
                                                                 rBmpEx ) ),
                 mpCanvas( rCanvas ),
                 maState()
@@ -135,18 +135,18 @@ namespace cppcanvas
                 // moved rPoint away, and scaled according to the ratio
                 // given by src and dst size.
                 const ::Size aBmpSize( rBmpEx.GetSizePixel() );
-
-                const ::basegfx::B2DVector aScale( rDstSize.getX() / aBmpSize.Width(),
+                
+                const ::basegfx::B2DVector aScale( rDstSize.getX() / aBmpSize.Width(), 
                                                    rDstSize.getY() / aBmpSize.Height() );
-                const basegfx::B2DHomMatrix aLocalTransformation(basegfx::tools::createScaleTranslateB2DHomMatrix(
+                const basegfx::B2DHomMatrix	aLocalTransformation(basegfx::tools::createScaleTranslateB2DHomMatrix(
                     aScale, rDstPoint));
                 ::canvas::tools::appendToRenderState( maState, aLocalTransformation );
-
+            
                 // correct clip (which is relative to original transform)
-                tools::modifyClip( maState,
-                                   rState,
-                                   rCanvas,
-                                   rDstPoint,
+                tools::modifyClip( maState, 
+                                   rState, 
+                                   rCanvas, 
+                                   rDstPoint, 
                                    &aScale,
                                    NULL );
             }
@@ -163,12 +163,12 @@ namespace cppcanvas
                 rCachedPrimitive = mpCanvas->getUNOCanvas()->drawBitmap( mxBitmap,
                                                                          mpCanvas->getViewState(),
                                                                          aLocalState );
-
+                
                 return true;
             }
 
-            bool BitmapAction::render( const ::basegfx::B2DHomMatrix&   rTransformation,
-                                       const Subset&                    rSubset ) const
+            bool BitmapAction::render( const ::basegfx::B2DHomMatrix&	rTransformation,
+                                       const Subset&					rSubset ) const
             {
                 // bitmap only contains a single action, fail if subset
                 // requests different range
@@ -183,7 +183,7 @@ namespace cppcanvas
             {
                 rendering::RenderState aLocalState( maState );
                 ::canvas::tools::prependToRenderState(aLocalState, rTransformation);
-
+                
                 const geometry::IntegerSize2D aSize( mxBitmap->getSize() );
 
                 return tools::calcDevicePixelBounds( ::basegfx::B2DRange( 0,0,
@@ -193,8 +193,8 @@ namespace cppcanvas
                                                      aLocalState );
             }
 
-            ::basegfx::B2DRange BitmapAction::getBounds( const ::basegfx::B2DHomMatrix& rTransformation,
-                                                         const Subset&                  rSubset ) const
+            ::basegfx::B2DRange BitmapAction::getBounds( const ::basegfx::B2DHomMatrix&	rTransformation,
+                                                         const Subset&					rSubset ) const
             {
                 // bitmap only contains a single action, empty bounds
                 // if subset requests different range
@@ -209,11 +209,11 @@ namespace cppcanvas
             {
                 return 1;
             }
-        }
-
-        ActionSharedPtr BitmapActionFactory::createBitmapAction( const ::BitmapEx&          rBmpEx,
-                                                                 const ::basegfx::B2DPoint& rDstPoint,
-                                                                 const CanvasSharedPtr&     rCanvas,
+        } 
+        
+        ActionSharedPtr BitmapActionFactory::createBitmapAction( const ::BitmapEx&          rBmpEx,  
+                                                                 const ::basegfx::B2DPoint& rDstPoint,  
+                                                                 const CanvasSharedPtr&     rCanvas, 
                                                                  const OutDevState&         rState )
         {
             return ActionSharedPtr( new BitmapAction(rBmpEx,
@@ -221,11 +221,11 @@ namespace cppcanvas
                                                      rCanvas,
                                                      rState ) );
         }
-
+        
         ActionSharedPtr BitmapActionFactory::createBitmapAction( const ::BitmapEx&           rBmpEx,
-                                                                 const ::basegfx::B2DPoint&  rDstPoint,
+                                                                 const ::basegfx::B2DPoint&  rDstPoint,  
                                                                  const ::basegfx::B2DVector& rDstSize,
-                                                                 const CanvasSharedPtr&      rCanvas,
+                                                                 const CanvasSharedPtr&      rCanvas, 
                                                                  const OutDevState&          rState )
         {
             return ActionSharedPtr( new BitmapAction(rBmpEx,
@@ -233,6 +233,6 @@ namespace cppcanvas
                                                      rDstSize,
                                                      rCanvas,
                                                      rState ) );
-        }
+        } 
     }
 }
diff --git a/cppcanvas/source/mtfrenderer/bitmapaction.hxx b/cppcanvas/source/mtfrenderer/bitmapaction.hxx
index 6c41579d39dd..06bec2e3296e 100644
--- a/cppcanvas/source/mtfrenderer/bitmapaction.hxx
+++ b/cppcanvas/source/mtfrenderer/bitmapaction.hxx
@@ -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
@@ -39,8 +39,8 @@ class BitmapEx;
 
 /* Definition of internal::BitmapActionFactory class */
 
-namespace cppcanvas
-{
+namespace cppcanvas 
+{ 
     namespace internal
     {
         struct OutDevState;
@@ -56,16 +56,16 @@ namespace cppcanvas
         {
         public:
             /// Unscaled bitmap action, only references destination point
-            static ActionSharedPtr createBitmapAction( const ::BitmapEx&,
-                                                       const ::basegfx::B2DPoint& rDstPoint,
-                                                       const CanvasSharedPtr&,
-                                                       const OutDevState& );
-
+            static ActionSharedPtr createBitmapAction( const ::BitmapEx&,  
+                                                       const ::basegfx::B2DPoint& rDstPoint,  
+                                                       const CanvasSharedPtr&, 
+                                                       const OutDevState& ); 
+            
             /// Scaled bitmap action, dest point and dest size
             static ActionSharedPtr createBitmapAction( const ::BitmapEx&,
-                                                       const ::basegfx::B2DPoint&  rDstPoint,
+                                                       const ::basegfx::B2DPoint&  rDstPoint,  
                                                        const ::basegfx::B2DVector& rDstSize,
-                                                       const CanvasSharedPtr&,
+                                                       const CanvasSharedPtr&, 
                                                        const OutDevState& );
 
         private:
diff --git a/cppcanvas/source/mtfrenderer/cachedprimitivebase.cxx b/cppcanvas/source/mtfrenderer/cachedprimitivebase.cxx
index 15096c4cfec6..8e526d6cbd30 100644
--- a/cppcanvas/source/mtfrenderer/cachedprimitivebase.cxx
+++ b/cppcanvas/source/mtfrenderer/cachedprimitivebase.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
@@ -40,8 +40,8 @@
 
 using namespace ::com::sun::star;
 
-namespace cppcanvas
-{
+namespace cppcanvas 
+{ 
     namespace internal
     {
         CachedPrimitiveBase::CachedPrimitiveBase( const CanvasSharedPtr& rCanvas,
@@ -75,7 +75,7 @@ namespace cppcanvas
                 (!mbOnlyRedrawWithSameTransform ||
                  maLastTransformation == aTotalTransform) )
             {
-                if( mxCachedPrimitive->redraw( rViewState ) ==
+                if( mxCachedPrimitive->redraw( rViewState ) == 
                     rendering::RepaintResult::REDRAWN )
                 {
                     // cached repaint succeeded, done.
diff --git a/cppcanvas/source/mtfrenderer/cachedprimitivebase.hxx b/cppcanvas/source/mtfrenderer/cachedprimitivebase.hxx
index 2c6ad0411f4b..ce7f5972593a 100644
--- a/cppcanvas/source/mtfrenderer/cachedprimitivebase.hxx
+++ b/cppcanvas/source/mtfrenderer/cachedprimitivebase.hxx
@@ -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
@@ -41,8 +41,8 @@ namespace basegfx { class B2DHomMatrix; }
 
 /* Definition of internal::CachedPrimitiveBase class */
 
-namespace cppcanvas
-{
+namespace cppcanvas 
+{ 
     namespace internal
     {
         /** Base class providing cached re-rendering, if XCanvas
@@ -67,7 +67,7 @@ namespace cppcanvas
                 When true, this class only reuses the cached
                 primitive, if the overall transformation stays the
                 same. Otherwise, repaints are always performed via the
-                cached primitive.
+                cached primitive. 
              */
             CachedPrimitiveBase( const CanvasSharedPtr& rCanvas,
                                  bool                   bOnlyRedrawWithSameTransform );
@@ -79,13 +79,13 @@ namespace cppcanvas
             using Action::render;
 
         private:
-            virtual bool render( ::com::sun::star::uno::Reference<
+            virtual bool render( ::com::sun::star::uno::Reference< 
                                      ::com::sun::star::rendering::XCachedPrimitive >& rCachedPrimitive,
                                  const ::basegfx::B2DHomMatrix&                       rTransformation ) const = 0;
 
             CanvasSharedPtr                                             mpCanvas;
-            mutable ::com::sun::star::uno::Reference<
-                    ::com::sun::star::rendering::XCachedPrimitive >     mxCachedPrimitive;
+            mutable ::com::sun::star::uno::Reference< 
+                    ::com::sun::star::rendering::XCachedPrimitive > 	mxCachedPrimitive;
             mutable ::basegfx::B2DHomMatrix                             maLastTransformation;
             const bool                                                  mbOnlyRedrawWithSameTransform;
         };
diff --git a/cppcanvas/source/mtfrenderer/implrenderer.cxx b/cppcanvas/source/mtfrenderer/implrenderer.cxx
index 1423cd42ed93..e973fc7bb1b7 100644
--- a/cppcanvas/source/mtfrenderer/implrenderer.cxx
+++ b/cppcanvas/source/mtfrenderer/implrenderer.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
@@ -100,10 +100,10 @@ using namespace ::com::sun::star;
 // ======================
 namespace
 {
-    template < class MetaActionType > void setStateColor( MetaActionType*                   pAct,
-                                                          bool&                             rIsColorSet,
-                                                          uno::Sequence< double >&          rColorSequence,
-                                                          const cppcanvas::CanvasSharedPtr& rCanvas )
+    template < class MetaActionType > void setStateColor( MetaActionType* 					pAct,
+                                                          bool&								rIsColorSet,
+                                                          uno::Sequence< double >& 			rColorSequence,
+                                                          const cppcanvas::CanvasSharedPtr&	rCanvas )
     {
         // set rIsColorSet and check for true at the same time
         if( (rIsColorSet=pAct->IsSetting()) != false )
@@ -116,7 +116,7 @@ namespace
             aColor.SetTransparency(0);
             //aColor.SetTransparency(128);
 
-            rColorSequence = ::vcl::unotools::colorToDoubleSequence(
+            rColorSequence = ::vcl::unotools::colorToDoubleSequence( 
                 aColor,
                 rCanvas->getUNOCanvas()->getDevice()->getDeviceColorSpace() );
         }
@@ -143,7 +143,7 @@ namespace
     }
 
     void pushState( ::cppcanvas::internal::VectorOfOutDevStates& rStates,
-                    USHORT nFlags                                           )
+                    USHORT nFlags											)
     {
         rStates.push_back( getState( rStates ) );
         getState( rStates ).pushFlags = nFlags;
@@ -152,12 +152,12 @@ namespace
     void popState( ::cppcanvas::internal::VectorOfOutDevStates& rStates )
     {
         if( getState( rStates ).pushFlags != PUSH_ALL )
-        {
+        {            
             // a state is pushed which is incomplete, i.e. does not
             // restore everything to the previous stack level when
             // popped.
             // That means, we take the old state, and restore every
-            // OutDevState member whose flag is set, from the new to the
+            // OutDevState member whose flag is set, from the new to the 
             // old state. Then the new state gets overwritten by the
             // calculated state
 
@@ -172,28 +172,28 @@ namespace
 
             if( (aCalculatedNewState.pushFlags & PUSH_LINECOLOR) )
             {
-                aCalculatedNewState.lineColor      = rNewState.lineColor;
+                aCalculatedNewState.lineColor 	   = rNewState.lineColor;
                 aCalculatedNewState.isLineColorSet = rNewState.isLineColorSet;
             }
 
             if( (aCalculatedNewState.pushFlags & PUSH_FILLCOLOR) )
             {
-                aCalculatedNewState.fillColor      = rNewState.fillColor;
+                aCalculatedNewState.fillColor 	   = rNewState.fillColor;
                 aCalculatedNewState.isFillColorSet = rNewState.isFillColorSet;
             }
 
             if( (aCalculatedNewState.pushFlags & PUSH_FONT) )
             {
-                aCalculatedNewState.xFont                   = rNewState.xFont;
-                aCalculatedNewState.fontRotation            = rNewState.fontRotation;
-                aCalculatedNewState.textReliefStyle         = rNewState.textReliefStyle;
-                aCalculatedNewState.textOverlineStyle       = rNewState.textOverlineStyle;
-                aCalculatedNewState.textUnderlineStyle      = rNewState.textUnderlineStyle;
-                aCalculatedNewState.textStrikeoutStyle      = rNewState.textStrikeoutStyle;
-                aCalculatedNewState.textEmphasisMarkStyle   = rNewState.textEmphasisMarkStyle;
-                aCalculatedNewState.isTextEffectShadowSet   = rNewState.isTextEffectShadowSet;
-                aCalculatedNewState.isTextWordUnderlineSet  = rNewState.isTextWordUnderlineSet;
-                aCalculatedNewState.isTextOutlineModeSet    = rNewState.isTextOutlineModeSet;
+                aCalculatedNewState.xFont 					= rNewState.xFont;
+                aCalculatedNewState.fontRotation 			= rNewState.fontRotation;
+                aCalculatedNewState.textReliefStyle 		= rNewState.textReliefStyle;
+                aCalculatedNewState.textOverlineStyle 		= rNewState.textOverlineStyle;
+                aCalculatedNewState.textUnderlineStyle 		= rNewState.textUnderlineStyle;
+                aCalculatedNewState.textStrikeoutStyle 		= rNewState.textStrikeoutStyle;
+                aCalculatedNewState.textEmphasisMarkStyle 	= rNewState.textEmphasisMarkStyle;
+                aCalculatedNewState.isTextEffectShadowSet 	= rNewState.isTextEffectShadowSet;
+                aCalculatedNewState.isTextWordUnderlineSet 	= rNewState.isTextWordUnderlineSet;
+                aCalculatedNewState.isTextOutlineModeSet 	= rNewState.isTextOutlineModeSet;
             }
 
             if( (aCalculatedNewState.pushFlags & PUSH_TEXTCOLOR) )
@@ -208,9 +208,9 @@ namespace
 
             if( (aCalculatedNewState.pushFlags & PUSH_CLIPREGION) )
             {
-                aCalculatedNewState.clip        = rNewState.clip;
-                aCalculatedNewState.clipRect    = rNewState.clipRect;
-                aCalculatedNewState.xClipPoly   = rNewState.xClipPoly;
+                aCalculatedNewState.clip 		= rNewState.clip;
+                aCalculatedNewState.clipRect	= rNewState.clipRect;
+                aCalculatedNewState.xClipPoly	= rNewState.xClipPoly;
             }
 
             // TODO(F2): Raster ops NYI
@@ -220,7 +220,7 @@ namespace
 
             if( (aCalculatedNewState.pushFlags & PUSH_TEXTFILLCOLOR) )
             {
-                aCalculatedNewState.textFillColor      = rNewState.textFillColor;
+                aCalculatedNewState.textFillColor 	   = rNewState.textFillColor;
                 aCalculatedNewState.isTextFillColorSet = rNewState.isTextFillColorSet;
             }
 
@@ -236,7 +236,7 @@ namespace
 
             if( (aCalculatedNewState.pushFlags & PUSH_TEXTLINECOLOR) )
             {
-                aCalculatedNewState.textLineColor      = rNewState.textLineColor;
+                aCalculatedNewState.textLineColor 	   = rNewState.textLineColor;
                 aCalculatedNewState.isTextLineColorSet = rNewState.isTextLineColorSet;
             }
 
@@ -265,14 +265,14 @@ namespace
 
     void setupStrokeAttributes( rendering::StrokeAttributes&                          o_rStrokeAttributes,
                                 const ::cppcanvas::internal::ActionFactoryParameters& rParms,
-                                const LineInfo&                                       rLineInfo                 )
+                                const LineInfo&                                       rLineInfo 				)
     {
         const ::basegfx::B2DSize aWidth( rLineInfo.GetWidth(), 0 );
-        o_rStrokeAttributes.StrokeWidth =
+        o_rStrokeAttributes.StrokeWidth = 
             (getState( rParms.mrStates ).mapModeTransform * aWidth).getX();
 
         // setup reasonable defaults
-        o_rStrokeAttributes.MiterLimit   = 15.0; // 1.0 was no good default; GDI+'s limit is 10.0, our's is 15.0
+        o_rStrokeAttributes.MiterLimit 	 = 15.0; // 1.0 was no good default; GDI+'s limit is 10.0, our's is 15.0
         o_rStrokeAttributes.StartCapType = rendering::PathCapType::BUTT;
         o_rStrokeAttributes.EndCapType   = rendering::PathCapType::BUTT;
 
@@ -311,7 +311,7 @@ namespace
 
             const sal_Int32 nNumArryEntries( 2*rLineInfo.GetDashCount() +
                                              2*rLineInfo.GetDotCount() );
-
+                        
             o_rStrokeAttributes.DashArray.realloc( nNumArryEntries );
             double* pDashArray = o_rStrokeAttributes.DashArray.getArray();
 
@@ -331,7 +331,7 @@ namespace
             {
                 pDashArray[nCurrEntry++] = nDotLen;
                 pDashArray[nCurrEntry++] = nDistance;
-            }
+            }            
         }
     }
 
@@ -352,7 +352,7 @@ namespace
                        1,
                        &aBiLevelPalette );
         aSolid.Erase( rMaskColor );
-
+                        
         return BitmapEx( aSolid, aMask );
     }
 
@@ -470,7 +470,7 @@ namespace cppcanvas
                 return false;
             }
 
-            ActionSharedPtr pPolyAction(
+            ActionSharedPtr pPolyAction( 
                 internal::PolyPolyActionFactory::createPolyPolyAction(
                     rPolyPoly, rParms.mrCanvas, rState ) );
 
@@ -480,7 +480,7 @@ namespace cppcanvas
                     MtfAction(
                         pPolyAction,
                         rParms.mrCurrActionIndex ) );
-
+                
                 rParms.mrCurrActionIndex += pPolyAction->getActionCount()-1;
             }
 
@@ -496,7 +496,7 @@ namespace cppcanvas
 
         void ImplRenderer::skipContent( GDIMetaFile& rMtf,
                                         const char*  pCommentString,
-                                        sal_Int32&   io_rCurrActionIndex ) const
+                                        sal_Int32& 	 io_rCurrActionIndex ) const
         {
             ENSURE_OR_THROW( pCommentString,
                               "ImplRenderer::skipContent(): NULL string given" );
@@ -508,7 +508,7 @@ namespace cppcanvas
                 ++io_rCurrActionIndex;
 
                 if( pCurrAct->GetType() == META_COMMENT_ACTION &&
-                    static_cast<MetaCommentAction*>(pCurrAct)->GetComment().CompareIgnoreCaseToAscii(
+                    static_cast<MetaCommentAction*>(pCurrAct)->GetComment().CompareIgnoreCaseToAscii( 
                         pCommentString ) == COMPARE_EQUAL )
                 {
                     // requested comment found, done
@@ -522,7 +522,7 @@ namespace cppcanvas
 
         bool ImplRenderer::isActionContained( GDIMetaFile& rMtf,
                                               const char*  pCommentString,
-                                              USHORT       nType ) const
+                                              USHORT	   nType ) const
         {
             ENSURE_OR_THROW( pCommentString,
                               "ImplRenderer::isActionContained(): NULL string given" );
@@ -543,7 +543,7 @@ namespace cppcanvas
                 }
 
                 if( pCurrAct->GetType() == META_COMMENT_ACTION &&
-                    static_cast<MetaCommentAction*>(pCurrAct)->GetComment().CompareIgnoreCaseToAscii(
+                    static_cast<MetaCommentAction*>(pCurrAct)->GetComment().CompareIgnoreCaseToAscii( 
                         pCommentString ) == COMPARE_EQUAL )
                 {
                     // delimiting end comment found, done
@@ -568,11 +568,11 @@ namespace cppcanvas
             return bRet;
         }
 
-        void ImplRenderer::createGradientAction( const ::PolyPolygon&           rPoly,
-                                                 const ::Gradient&              rGradient,
+        void ImplRenderer::createGradientAction( const ::PolyPolygon& 			rPoly,
+                                                 const ::Gradient&				rGradient,
                                                  const ActionFactoryParameters& rParms,
-                                                 bool                           bIsPolygonRectangle,
-                                                 bool                           bSubsettableActions )
+                                                 bool							bIsPolygonRectangle,
+                                                 bool 							bSubsettableActions )
         {
             DBG_TESTSOLARMUTEX();
 
@@ -589,7 +589,7 @@ namespace cppcanvas
                 nSteps == 0 ||
                 // step count is sufficiently high, such that no
                 // discernible difference should be visible.
-                nSteps > 64 )
+                nSteps > 64 ) 
             {
                 uno::Reference< lang::XMultiServiceFactory> xFactory(
                     rParms.mrCanvas->getUNOCanvas()->getDevice()->getParametricPolyPolygonFactory() );
@@ -630,7 +630,7 @@ namespace cppcanvas
 
                     uno::Sequence< uno::Sequence < double > > aColors(2);
                     uno::Sequence< double > aStops(2);
-
+                    
                     if( rGradient.GetStyle() == GRADIENT_AXIAL )
                     {
                         aStops.realloc(3);
@@ -639,7 +639,7 @@ namespace cppcanvas
                         aStops[0] = 0.0;
                         aStops[1] = 0.5;
                         aStops[2] = 1.0;
-
+                    
                         aColors[0] = aEndColor;
                         aColors[1] = aStartColor;
                         aColors[2] = aEndColor;
@@ -648,14 +648,14 @@ namespace cppcanvas
                     {
                         aStops[0] = 0.0;
                         aStops[1] = 1.0;
-
+                    
                         aColors[0] = aStartColor;
                         aColors[1] = aEndColor;
                     }
 
-                    const ::basegfx::B2DRectangle aBounds(
+                    const ::basegfx::B2DRectangle aBounds( 
                         ::basegfx::tools::getRange(aDevicePoly) );
-                    const ::basegfx::B2DVector aOffset(
+                    const ::basegfx::B2DVector aOffset( 
                         rGradient.GetOfsX() / 100.0,
                         rGradient.GetOfsY() / 100.0);
                     double fRotation( rGradient.GetAngle() * M_PI / 1800.0 );
@@ -745,7 +745,7 @@ namespace cppcanvas
                                              "ImplRenderer::createGradientAction(): Unexpected gradient type" );
                             break;
                     }
-
+                    
                     // As the texture coordinate space is relative to
                     // the polygon coordinate space (NOT to the
                     // polygon itself), move gradient to the start of
@@ -753,9 +753,9 @@ namespace cppcanvas
                     // gradient will always display at the origin, and
                     // not within the polygon bound (which might be
                     // miles away from the origin).
-                    aGradInfo.maTextureTransform.translate( aBounds.getMinX(),
+                    aGradInfo.maTextureTransform.translate( aBounds.getMinX(), 
                                                             aBounds.getMinY() );
-                    ::basegfx::unotools::affineMatrixFromHomMatrix( aTexture.AffineTransform,
+                    ::basegfx::unotools::affineMatrixFromHomMatrix( aTexture.AffineTransform, 
                                                                     aGradInfo.maTextureTransform );
 
                     uno::Sequence<uno::Any> args(3);
@@ -776,20 +776,20 @@ namespace cppcanvas
                         uno::UNO_QUERY);
                     if( aTexture.Gradient.is() )
                     {
-                        ActionSharedPtr pPolyAction(
-                            internal::PolyPolyActionFactory::createPolyPolyAction(
-                                aDevicePoly,
-                                rParms.mrCanvas,
+                        ActionSharedPtr pPolyAction( 
+                            internal::PolyPolyActionFactory::createPolyPolyAction( 
+                                aDevicePoly, 
+                                rParms.mrCanvas, 
                                 getState( rParms.mrStates ),
                                 aTexture ) );
 
                         if( pPolyAction )
                         {
-                            maActions.push_back(
-                                MtfAction(
+                            maActions.push_back( 
+                                MtfAction( 
                                     pPolyAction,
                                     rParms.mrCurrActionIndex ) );
-
+                        
                             rParms.mrCurrActionIndex += pPolyAction->getActionCount()-1;
                         }
 
@@ -809,7 +809,7 @@ namespace cppcanvas
                 // only clip, if given polygon is not a rectangle in
                 // the first place (the gradient is always limited to
                 // the given bound rect)
-                updateClipping(
+                updateClipping( 
                     aDevicePoly,
                     rParms,
                     true );
@@ -834,7 +834,7 @@ namespace cppcanvas
             if( rParms.mrParms.maFontName.isValid() )
                 aFontRequest.FontDescription.FamilyName = rParms.mrParms.maFontName.getValue();
             else
-                aFontRequest.FontDescription.FamilyName = rFont.GetName();
+                aFontRequest.FontDescription.FamilyName = rFont.GetName(); 
 
             aFontRequest.FontDescription.StyleName = rFont.GetStyleName();
 
@@ -842,11 +842,11 @@ namespace cppcanvas
             aFontRequest.FontDescription.IsVertical = rFont.IsVertical() ? util::TriState_YES : util::TriState_NO;
 
             // TODO(F2): improve vclenum->panose conversion
-            aFontRequest.FontDescription.FontDescription.Weight =
+            aFontRequest.FontDescription.FontDescription.Weight = 
                 rParms.mrParms.maFontWeight.isValid() ?
                 rParms.mrParms.maFontWeight.getValue() :
                 ::canvas::tools::numeric_cast<sal_Int8>( ::basegfx::fround( rFont.GetWeight() ) );
-            aFontRequest.FontDescription.FontDescription.Letterform =
+            aFontRequest.FontDescription.FontDescription.Letterform = 
                 rParms.mrParms.maFontLetterForm.isValid() ?
                 rParms.mrParms.maFontLetterForm.getValue() :
                 (rFont.GetItalic() == ITALIC_NONE) ? 0 : 9;
@@ -915,7 +915,7 @@ namespace cppcanvas
         }
 
         // create text effects such as shadow/relief/embossed
-        void ImplRenderer::createTextAction( const ::Point&                 rStartPoint,
+        void ImplRenderer::createTextAction( const ::Point& 		        rStartPoint,
                                              const String                   rString,
                                              int                            nIndex,
                                              int                            nLength,
@@ -1000,7 +1000,7 @@ namespace cppcanvas
             }
 
             // create the actual text action
-            ActionSharedPtr pTextAction(
+            ActionSharedPtr pTextAction( 
                 TextActionFactory::createTextAction(
                     rStartPoint,
                     aReliefOffset,
@@ -1038,7 +1038,7 @@ namespace cppcanvas
                     nStrikeoutWidth = ( rParms.mrVDev.GetTextWidth( aStrikeoutTest ) + 2 ) / 4;
                     aStrikeoutTest.Erase();
 
-                    if( nStrikeoutWidth <= 0 )
+                    if( nStrikeoutWidth <= 0 ) 
                         nStrikeoutWidth = 1;
                 }
 
@@ -1072,7 +1072,7 @@ namespace cppcanvas
                         pStrikeoutCharWidths[ i ] += pStrikeoutCharWidths[ i-1 ];
                     }
 
-                    pStrikeoutTextAction =
+                    pStrikeoutTextAction = 
                         TextActionFactory::createTextAction(
                             rStartPoint,
                             aReliefOffset,
@@ -1093,15 +1093,15 @@ namespace cppcanvas
 
             if( pTextAction )
             {
-                maActions.push_back(
-                    MtfAction(
+                maActions.push_back( 
+                    MtfAction( 
                         pTextAction,
                         rParms.mrCurrActionIndex ) );
 
                 if ( pStrikeoutTextAction )
                 {
-                    maActions.push_back(
-                        MtfAction(
+                    maActions.push_back( 
+                        MtfAction( 
                         pStrikeoutTextAction,
                         rParms.mrCurrActionIndex ) );
                 }
@@ -1110,9 +1110,9 @@ namespace cppcanvas
             }
         }
 
-        void ImplRenderer::updateClipping( const ::basegfx::B2DPolyPolygon& rClipPoly,
+        void ImplRenderer::updateClipping( const ::basegfx::B2DPolyPolygon&	rClipPoly,
                                            const ActionFactoryParameters&   rParms,
-                                           bool                             bIntersect )
+                                           bool								bIntersect )
         {
             ::cppcanvas::internal::OutDevState& rState( getState( rParms.mrStates ) );
             ::basegfx::B2DPolyPolygon aClipPoly( rClipPoly );
@@ -1138,7 +1138,7 @@ namespace cppcanvas
                     // convert rect to polygon beforehand, must revert
                     // to general polygon clipping here.
                     rState.clip = ::basegfx::B2DPolyPolygon(
-                        ::basegfx::tools::createPolygonFromRect(
+                        ::basegfx::tools::createPolygonFromRect( 
                             // #121100# VCL rectangular clips always
                             // include one more pixel to the right
                             // and the bottom
@@ -1168,7 +1168,7 @@ namespace cppcanvas
                     rState.xClipPoly = ::basegfx::unotools::xPolyPolygonFromB2DPolyPolygon(
                         rParms.mrCanvas->getUNOCanvas()->getDevice(),
                         ::basegfx::B2DPolyPolygon(
-                            ::basegfx::tools::createPolygonFromRect(
+                            ::basegfx::tools::createPolygonFromRect( 
                                 // #121100# VCL rectangular clips
                                 // always include one more pixel to
                                 // the right and the bottom
@@ -1186,7 +1186,7 @@ namespace cppcanvas
             }
         }
 
-        void ImplRenderer::updateClipping( const ::Rectangle&             rClipRect,
+        void ImplRenderer::updateClipping( const ::Rectangle&		      rClipRect,
                                            const ActionFactoryParameters& rParms,
                                            bool                           bIntersect )
         {
@@ -1217,11 +1217,11 @@ namespace cppcanvas
 
                 // general case: convert to polygon and clip
                 // -----------------------------------------
-
+                
                 // convert rect to polygon beforehand, must revert
                 // to general polygon clipping here.
                 ::basegfx::B2DPolyPolygon aClipPoly(
-                    ::basegfx::tools::createPolygonFromRect(
+                    ::basegfx::tools::createPolygonFromRect( 
                         ::basegfx::B2DRectangle( rClipRect.Left(),
                                                  rClipRect.Top(),
                                                  rClipRect.Right(),
@@ -1245,7 +1245,7 @@ namespace cppcanvas
                     rState.xClipPoly = ::basegfx::unotools::xPolyPolygonFromB2DPolyPolygon(
                         rParms.mrCanvas->getUNOCanvas()->getDevice(),
                         ::basegfx::B2DPolyPolygon(
-                            ::basegfx::tools::createPolygonFromRect(
+                            ::basegfx::tools::createPolygonFromRect( 
                                 // #121100# VCL rectangular clips
                                 // always include one more pixel to
                                 // the right and the bottom
@@ -1263,7 +1263,7 @@ namespace cppcanvas
             }
         }
 
-        bool ImplRenderer::createActions( GDIMetaFile&                   rMtf,
+        bool ImplRenderer::createActions( GDIMetaFile&				     rMtf,
                                           const ActionFactoryParameters& rFactoryParms,
                                           bool                           bSubsettableActions )
         {
@@ -1278,8 +1278,8 @@ namespace cppcanvas
                  recalc scaling for every drawing operation. This is
                  because the outdev map mode might change at any time.
                  Also keep in mind, that, although we've double precision
-                 float arithmetic now, different offsets might still
-                 generate different roundings (aka
+                 float arithmetic now, different offsets might still 
+                 generate different roundings (aka 
                  'OutputDevice::SetPixelOffset())
 
              */
@@ -1290,7 +1290,7 @@ namespace cppcanvas
             ::VirtualDevice&       rVDev(rFactoryParms.mrVDev);
             const Parameters&      rParms(rFactoryParms.mrParms);
             sal_Int32&             io_rCurrActionIndex(rFactoryParms.mrCurrActionIndex);
-
+            
 
             // Loop over every metaaction
             // ==========================
@@ -1362,12 +1362,12 @@ namespace cppcanvas
                                                "region encountered, falling back to bounding box!" );
 
                                 // #121806# explicitely kept integer
-                                Rectangle aClipRect(
-                                    rVDev.LogicToPixel(
+                                Rectangle aClipRect( 
+                                    rVDev.LogicToPixel( 
                                         pClipAction->GetRegion().GetBoundRect() ) );
 
                                 // intersect current clip with given rect
-                                updateClipping(
+                                updateClipping( 
                                     aClipRect,
                                     rFactoryParms,
                                     false );
@@ -1378,8 +1378,8 @@ namespace cppcanvas
                                 // with old one, just set it)
 
                                 // #121806# explicitely kept integer
-                                updateClipping(
-                                    rVDev.LogicToPixel(
+                                updateClipping( 
+                                    rVDev.LogicToPixel( 
                                         pClipAction->GetRegion().GetPolyPolygon() ).getB2DPolyPolygon(),
                                     rFactoryParms,
                                     false );
@@ -1394,11 +1394,11 @@ namespace cppcanvas
                         MetaISectRectClipRegionAction* pClipAction = static_cast<MetaISectRectClipRegionAction*>(pCurrAct);
 
                         // #121806# explicitely kept integer
-                        Rectangle aClipRect(
+                        Rectangle aClipRect( 
                             rVDev.LogicToPixel( pClipAction->GetRect() ) );
 
                         // intersect current clip with given rect
-                        updateClipping(
+                        updateClipping( 
                             aClipRect,
                             rFactoryParms,
                             true );
@@ -1416,11 +1416,11 @@ namespace cppcanvas
                                            "region encountered, falling back to bounding box!" );
 
                             // #121806# explicitely kept integer
-                            Rectangle aClipRect(
+                            Rectangle aClipRect( 
                                 rVDev.LogicToPixel( pClipAction->GetRegion().GetBoundRect() ) );
 
                             // intersect current clip with given rect
-                            updateClipping(
+                            updateClipping( 
                                 aClipRect,
                                 rFactoryParms,
                                 true );
@@ -1430,8 +1430,8 @@ namespace cppcanvas
                             // intersect current clip with given clip polygon
 
                             // #121806# explicitely kept integer
-                            updateClipping(
-                                rVDev.LogicToPixel(
+                            updateClipping( 
+                                rVDev.LogicToPixel( 
                                     pClipAction->GetRegion().GetPolyPolygon() ).getB2DPolyPolygon(),
                                 rFactoryParms,
                                 true );
@@ -1479,7 +1479,7 @@ namespace cppcanvas
 
                             getState( rStates ).textColor =
                                 ::vcl::unotools::colorToDoubleSequence(
-                                    aColor,
+                                    aColor, 
                                     rCanvas->getUNOCanvas()->getDevice()->getDeviceColorSpace() );
                         }
                     }
@@ -1609,7 +1609,7 @@ namespace cppcanvas
 
                     case META_EPS_ACTION:
                     {
-                        MetaEPSAction*      pAct = static_cast<MetaEPSAction*>(pCurrAct);
+                        MetaEPSAction* 		pAct = static_cast<MetaEPSAction*>(pCurrAct);
                         const GDIMetaFile&  rSubstitute = pAct->GetSubstitute();
 
                         // #121806# explicitely kept integer
@@ -1623,18 +1623,18 @@ namespace cppcanvas
                         const Size aMtfSizePix( ::std::max( aMtfSizePixPre.Width(), 1L ),
                                                 ::std::max( aMtfSizePixPre.Height(), 1L ) );
 
-                        // Setup local transform, such that the
+                        // Setup local transform, such that the 
                         // metafile renders itself into the given
-                        // output rectangle
+                        // output rectangle 
                         pushState( rStates, PUSH_ALL );
-
+                        
                         rVDev.Push();
                         rVDev.SetMapMode( rSubstitute.GetPrefMapMode() );
-
+                        
                         const ::Point& rPos( rVDev.LogicToPixel( pAct->GetPoint() ) );
                         const ::Size&  rSize( rVDev.LogicToPixel( pAct->GetSize() ) );
 
-                        getState( rStates ).transform.translate( rPos.X(),
+                        getState( rStates ).transform.translate( rPos.X(), 
                                                                  rPos.Y() );
                         getState( rStates ).transform.scale( (double)rSize.Width() / aMtfSizePix.Width(),
                                                              (double)rSize.Height() / aMtfSizePix.Height() );
@@ -1698,7 +1698,7 @@ namespace cppcanvas
                             const BYTE* pData = pAct->GetData();
                             if ( pData )
                             {
-                                SvMemoryStream  aMemStm( (void*)pData, pAct->GetDataSize(), STREAM_READ );
+                                SvMemoryStream	aMemStm( (void*)pData, pAct->GetDataSize(), STREAM_READ );
 
                                 SvtGraphicFill aFill;
                                 aMemStm >> aFill;
@@ -1712,26 +1712,26 @@ namespace cppcanvas
                                 // the FloatTransparent action), take
                                 // the normal meta actions.
                                 if( aFill.getFillType() == SvtGraphicFill::fillTexture &&
-                                    !isActionContained( rMtf,
+                                    !isActionContained( rMtf, 
                                                        "XPATHFILL_SEQ_END",
                                                         META_FLOATTRANSPARENT_ACTION ) )
                                 {
                                     rendering::Texture aTexture;
-
+                                    
                                     // TODO(F1): the SvtGraphicFill
                                     // can also transport metafiles
                                     // here, handle that case, too
-                                    Graphic aGraphic;
+                                    Graphic	aGraphic;
                                     aFill.getGraphic( aGraphic );
 
-                                    BitmapEx     aBmpEx( aGraphic.GetBitmapEx() );
+                                    BitmapEx 	 aBmpEx( aGraphic.GetBitmapEx() );
                                     const ::Size aBmpSize( aBmpEx.GetSizePixel() );
 
                                     ::SvtGraphicFill::Transform aTransform;
                                     aFill.getTransform( aTransform );
 
                                     ::basegfx::B2DHomMatrix aMatrix;
-
+                                    
                                     // convert to basegfx matrix
                                     aMatrix.set(0,0, aTransform.matrix[ 0 ] );
                                     aMatrix.set(0,1, aTransform.matrix[ 1 ] );
@@ -1759,14 +1759,14 @@ namespace cppcanvas
                                     aMatrix *= tools::calcLogic2PixelLinearTransform( aLogic2PixelTransform,
                                                                                       rVDev );
 
-                                    ::basegfx::unotools::affineMatrixFromHomMatrix(
+                                    ::basegfx::unotools::affineMatrixFromHomMatrix( 
                                         aTexture.AffineTransform,
                                         aMatrix );
 
                                     aTexture.Alpha = 1.0 - aFill.getTransparency();
-                                    aTexture.Bitmap =
-                                        ::vcl::unotools::xBitmapFromBitmapEx(
-                                            rCanvas->getUNOCanvas()->getDevice(),
+                                    aTexture.Bitmap = 
+                                        ::vcl::unotools::xBitmapFromBitmapEx( 
+                                            rCanvas->getUNOCanvas()->getDevice(), 
                                             aBmpEx );
                                     if( aFill.isTiling() )
                                     {
@@ -1778,31 +1778,31 @@ namespace cppcanvas
                                         aTexture.RepeatModeX = rendering::TexturingMode::NONE;
                                         aTexture.RepeatModeY = rendering::TexturingMode::NONE;
                                     }
-
+                                    
                                     ::PolyPolygon aPath;
                                     aFill.getPath( aPath );
 
                                     ::basegfx::B2DPolyPolygon aPoly( aPath.getB2DPolyPolygon() );
-                                    aPoly.transform( getState( rStates ).mapModeTransform );
-                                    ActionSharedPtr pPolyAction(
-                                        internal::PolyPolyActionFactory::createPolyPolyAction(
+                                    aPoly.transform( getState( rStates ).mapModeTransform ); 
+                                    ActionSharedPtr pPolyAction( 
+                                        internal::PolyPolyActionFactory::createPolyPolyAction( 
                                             aPoly,
-                                            rCanvas,
+                                            rCanvas, 
                                             getState( rStates ),
                                             aTexture ) );
 
                                     if( pPolyAction )
                                     {
-                                        maActions.push_back(
-                                            MtfAction(
+                                        maActions.push_back( 
+                                            MtfAction( 
                                                 pPolyAction,
                                                 io_rCurrActionIndex ) );
-
+                        
                                         io_rCurrActionIndex += pPolyAction->getActionCount()-1;
                                     }
 
                                     // skip broken-down render output
-                                    skipContent( rMtf,
+                                    skipContent( rMtf, 
                                                  "XPATHFILL_SEQ_END",
                                                  io_rCurrActionIndex );
                                 }
@@ -1825,9 +1825,9 @@ namespace cppcanvas
                         const OutDevState& rState( getState( rStates ) );
                         if( rState.lineColor.getLength() )
                         {
-                            ActionSharedPtr pPointAction(
+                            ActionSharedPtr pPointAction( 
                                 internal::PointActionFactory::createPointAction(
-                                    rState.mapModeTransform * ::vcl::unotools::b2DPointFromPoint(
+                                    rState.mapModeTransform * ::vcl::unotools::b2DPointFromPoint( 
                                         static_cast<MetaPointAction*>(pCurrAct)->GetPoint() ),
                                     rCanvas,
                                     rState ) );
@@ -1838,7 +1838,7 @@ namespace cppcanvas
                                     MtfAction(
                                         pPointAction,
                                         io_rCurrActionIndex ) );
-
+                                
                                 io_rCurrActionIndex += pPointAction->getActionCount()-1;
                             }
                         }
@@ -1850,9 +1850,9 @@ namespace cppcanvas
                         const OutDevState& rState( getState( rStates ) );
                         if( rState.lineColor.getLength() )
                         {
-                            ActionSharedPtr pPointAction(
+                            ActionSharedPtr pPointAction( 
                                 internal::PointActionFactory::createPointAction(
-                                    rState.mapModeTransform * ::vcl::unotools::b2DPointFromPoint(
+                                    rState.mapModeTransform * ::vcl::unotools::b2DPointFromPoint( 
                                         static_cast<MetaPixelAction*>(pCurrAct)->GetPoint() ),
                                     rCanvas,
                                     rState,
@@ -1864,7 +1864,7 @@ namespace cppcanvas
                                     MtfAction(
                                         pPointAction,
                                         io_rCurrActionIndex ) );
-
+                                
                                 io_rCurrActionIndex += pPointAction->getActionCount()-1;
                             }
                         }
@@ -1877,7 +1877,7 @@ namespace cppcanvas
                         if( rState.lineColor.getLength() )
                         {
                             MetaLineAction* pLineAct = static_cast<MetaLineAction*>(pCurrAct);
-
+                            
                             const LineInfo& rLineInfo( pLineAct->GetLineInfo() );
 
                             const ::basegfx::B2DPoint aStartPoint(
@@ -1890,7 +1890,7 @@ namespace cppcanvas
                             if( rLineInfo.IsDefault() )
                             {
                                 // plain hair line
-                                pLineAction =
+                                pLineAction =    
                                     internal::LineActionFactory::createLineAction(
                                         aStartPoint,
                                         aEndPoint,
@@ -1903,7 +1903,7 @@ namespace cppcanvas
                                         MtfAction(
                                             pLineAction,
                                             io_rCurrActionIndex ) );
-
+                                    
                                     io_rCurrActionIndex += pLineAction->getActionCount()-1;
                                 }
                             }
@@ -1911,11 +1911,11 @@ namespace cppcanvas
                             {
                                 // 'thick' line
                                 rendering::StrokeAttributes aStrokeAttributes;
-
+                                
                                 setupStrokeAttributes( aStrokeAttributes,
                                                        rFactoryParms,
                                                        rLineInfo );
-
+                                
                                 // XCanvas can only stroke polygons,
                                 // not simple lines - thus, handle
                                 // this case via the polypolygon
@@ -1923,9 +1923,9 @@ namespace cppcanvas
                                 ::basegfx::B2DPolygon aPoly;
                                 aPoly.append( aStartPoint );
                                 aPoly.append( aEndPoint );
-                                pLineAction =
+                                pLineAction =   
                                     internal::PolyPolyActionFactory::createPolyPolyAction(
-                                        ::basegfx::B2DPolyPolygon( aPoly ),
+                                        ::basegfx::B2DPolyPolygon( aPoly ), 
                                         rCanvas, rState, aStrokeAttributes );
 
                                 if( pLineAction )
@@ -1934,7 +1934,7 @@ namespace cppcanvas
                                         MtfAction(
                                             pLineAction,
                                             io_rCurrActionIndex ) );
-
+                                    
                                     io_rCurrActionIndex += pLineAction->getActionCount()-1;
                                 }
                             }
@@ -1946,16 +1946,16 @@ namespace cppcanvas
 
                     case META_RECT_ACTION:
                     {
-                        const Rectangle& rRect(
+                        const Rectangle& rRect( 
                             static_cast<MetaRectAction*>(pCurrAct)->GetRect() );
 
                         if( rRect.IsEmpty() )
                             break;
 
                         const OutDevState& rState( getState( rStates ) );
-                        const ::basegfx::B2DPoint aTopLeftPixel(
+                        const ::basegfx::B2DPoint aTopLeftPixel( 
                             rState.mapModeTransform * ::vcl::unotools::b2DPointFromPoint( rRect.TopLeft() ) );
-                        const ::basegfx::B2DPoint aBottomRightPixel(
+                        const ::basegfx::B2DPoint aBottomRightPixel( 
                             rState.mapModeTransform * ::vcl::unotools::b2DPointFromPoint( rRect.BottomRight() ) +
                             // #121100# OutputDevice::DrawRect() fills
                             // rectangles Apple-like, i.e. with one
@@ -1971,14 +1971,14 @@ namespace cppcanvas
 
                     case META_ROUNDRECT_ACTION:
                     {
-                        const Rectangle& rRect(
+                        const Rectangle& rRect( 
                             static_cast<MetaRoundRectAction*>(pCurrAct)->GetRect());
 
                         if( rRect.IsEmpty() )
                             break;
 
-                        ::basegfx::B2DPolygon aPoly(
-                            ::basegfx::tools::createPolygonFromRect(
+                        ::basegfx::B2DPolygon aPoly( 
+                            ::basegfx::tools::createPolygonFromRect( 
                                 ::basegfx::B2DRange(
                                     ::vcl::unotools::b2DPointFromPoint( rRect.TopLeft() ),
                                     ::vcl::unotools::b2DPointFromPoint( rRect.BottomRight() ) +
@@ -2070,13 +2070,13 @@ namespace cppcanvas
                             const LineInfo& rLineInfo( pPolyLineAct->GetLineInfo() );
                             ::basegfx::B2DPolygon aPoly( pPolyLineAct->GetPolygon().getB2DPolygon() );
                             aPoly.transform( rState.mapModeTransform );
-
+                            
                             ActionSharedPtr pLineAction;
 
                             if( rLineInfo.IsDefault() )
                             {
                                 // plain hair line polygon
-                                pLineAction =
+                                pLineAction = 
                                     internal::PolyPolyActionFactory::createLinePolyPolyAction(
                                         ::basegfx::B2DPolyPolygon(aPoly),
                                         rCanvas,
@@ -2088,7 +2088,7 @@ namespace cppcanvas
                                         MtfAction(
                                             pLineAction,
                                             io_rCurrActionIndex ) );
-
+                                    
                                     io_rCurrActionIndex += pLineAction->getActionCount()-1;
                                 }
                             }
@@ -2096,7 +2096,7 @@ namespace cppcanvas
                             {
                                 // 'thick' line polygon
                                 rendering::StrokeAttributes aStrokeAttributes;
-
+                                
                                 setupStrokeAttributes( aStrokeAttributes,
                                                        rFactoryParms,
                                                        rLineInfo );
@@ -2114,7 +2114,7 @@ namespace cppcanvas
                                         MtfAction(
                                             pLineAction,
                                             io_rCurrActionIndex ) );
-
+                                    
                                     io_rCurrActionIndex += pLineAction->getActionCount()-1;
                                 }
                             }
@@ -2149,7 +2149,7 @@ namespace cppcanvas
                         ActionSharedPtr pBmpAction(
                                 internal::BitmapActionFactory::createBitmapAction(
                                     pAct->GetBitmap(),
-                                    getState( rStates ).mapModeTransform *
+                                    getState( rStates ).mapModeTransform * 
                                     ::vcl::unotools::b2DPointFromPoint( pAct->GetPoint() ),
                                     rCanvas,
                                     getState( rStates ) ) );
@@ -2160,7 +2160,7 @@ namespace cppcanvas
                                 MtfAction(
                                     pBmpAction,
                                     io_rCurrActionIndex ) );
-
+                            
                             io_rCurrActionIndex += pBmpAction->getActionCount()-1;
                         }
                     }
@@ -2173,9 +2173,9 @@ namespace cppcanvas
                         ActionSharedPtr pBmpAction(
                                 internal::BitmapActionFactory::createBitmapAction(
                                     pAct->GetBitmap(),
-                                    getState( rStates ).mapModeTransform *
+                                    getState( rStates ).mapModeTransform * 
                                     ::vcl::unotools::b2DPointFromPoint( pAct->GetPoint() ),
-                                    getState( rStates ).mapModeTransform *
+                                    getState( rStates ).mapModeTransform * 
                                     ::vcl::unotools::b2DSizeFromSize( pAct->GetSize() ),
                                     rCanvas,
                                     getState( rStates ) ) );
@@ -2186,7 +2186,7 @@ namespace cppcanvas
                                 MtfAction(
                                     pBmpAction,
                                     io_rCurrActionIndex ) );
-
+                            
                             io_rCurrActionIndex += pBmpAction->getActionCount()-1;
                         }
                     }
@@ -2206,9 +2206,9 @@ namespace cppcanvas
                         ActionSharedPtr pBmpAction(
                                 internal::BitmapActionFactory::createBitmapAction(
                                     aBmp,
-                                    getState( rStates ).mapModeTransform *
+                                    getState( rStates ).mapModeTransform * 
                                     ::vcl::unotools::b2DPointFromPoint( pAct->GetDestPoint() ),
-                                    getState( rStates ).mapModeTransform *
+                                    getState( rStates ).mapModeTransform * 
                                     ::vcl::unotools::b2DSizeFromSize( pAct->GetDestSize() ),
                                     rCanvas,
                                     getState( rStates ) ) );
@@ -2219,7 +2219,7 @@ namespace cppcanvas
                                 MtfAction(
                                     pBmpAction,
                                     io_rCurrActionIndex ) );
-
+                            
                             io_rCurrActionIndex += pBmpAction->getActionCount()-1;
                         }
                     }
@@ -2232,7 +2232,7 @@ namespace cppcanvas
                         ActionSharedPtr pBmpAction(
                                 internal::BitmapActionFactory::createBitmapAction(
                                     pAct->GetBitmapEx(),
-                                    getState( rStates ).mapModeTransform *
+                                    getState( rStates ).mapModeTransform * 
                                     ::vcl::unotools::b2DPointFromPoint( pAct->GetPoint() ),
                                     rCanvas,
                                     getState( rStates ) ) );
@@ -2243,7 +2243,7 @@ namespace cppcanvas
                                 MtfAction(
                                     pBmpAction,
                                     io_rCurrActionIndex ) );
-
+                            
                             io_rCurrActionIndex += pBmpAction->getActionCount()-1;
                         }
                     }
@@ -2256,9 +2256,9 @@ namespace cppcanvas
                         ActionSharedPtr pBmpAction(
                                 internal::BitmapActionFactory::createBitmapAction(
                                     pAct->GetBitmapEx(),
-                                    getState( rStates ).mapModeTransform *
+                                    getState( rStates ).mapModeTransform * 
                                     ::vcl::unotools::b2DPointFromPoint( pAct->GetPoint() ),
-                                    getState( rStates ).mapModeTransform *
+                                    getState( rStates ).mapModeTransform * 
                                     ::vcl::unotools::b2DSizeFromSize( pAct->GetSize() ),
                                     rCanvas,
                                     getState( rStates ) ) );
@@ -2269,7 +2269,7 @@ namespace cppcanvas
                                 MtfAction(
                                     pBmpAction,
                                     io_rCurrActionIndex ) );
-
+                            
                             io_rCurrActionIndex += pBmpAction->getActionCount()-1;
                         }
                     }
@@ -2289,9 +2289,9 @@ namespace cppcanvas
                         ActionSharedPtr pBmpAction(
                             internal::BitmapActionFactory::createBitmapAction(
                                 aBmp,
-                                getState( rStates ).mapModeTransform *
+                                getState( rStates ).mapModeTransform * 
                                 ::vcl::unotools::b2DPointFromPoint( pAct->GetDestPoint() ),
-                                getState( rStates ).mapModeTransform *
+                                getState( rStates ).mapModeTransform * 
                                 ::vcl::unotools::b2DSizeFromSize( pAct->GetDestSize() ),
                                 rCanvas,
                                 getState( rStates ) ) );
@@ -2302,7 +2302,7 @@ namespace cppcanvas
                                 MtfAction(
                                     pBmpAction,
                                     io_rCurrActionIndex ) );
-
+                            
                             io_rCurrActionIndex += pBmpAction->getActionCount()-1;
                         }
                     }
@@ -2321,7 +2321,7 @@ namespace cppcanvas
                         ActionSharedPtr pBmpAction(
                             internal::BitmapActionFactory::createBitmapAction(
                                 aBmp,
-                                getState( rStates ).mapModeTransform *
+                                getState( rStates ).mapModeTransform * 
                                 ::vcl::unotools::b2DPointFromPoint( pAct->GetPoint() ),
                                 rCanvas,
                                 getState( rStates ) ) );
@@ -2332,7 +2332,7 @@ namespace cppcanvas
                                 MtfAction(
                                     pBmpAction,
                                     io_rCurrActionIndex ) );
-
+                            
                             io_rCurrActionIndex += pBmpAction->getActionCount()-1;
                         }
                     }
@@ -2351,20 +2351,20 @@ namespace cppcanvas
                         ActionSharedPtr pBmpAction(
                             internal::BitmapActionFactory::createBitmapAction(
                                 aBmp,
-                                getState( rStates ).mapModeTransform *
+                                getState( rStates ).mapModeTransform * 
                                 ::vcl::unotools::b2DPointFromPoint( pAct->GetPoint() ),
-                                getState( rStates ).mapModeTransform *
+                                getState( rStates ).mapModeTransform * 
                                 ::vcl::unotools::b2DSizeFromSize( pAct->GetSize() ),
                                 rCanvas,
                                 getState( rStates ) ) );
-
+                        
                         if( pBmpAction )
                         {
                             maActions.push_back(
                                 MtfAction(
                                     pBmpAction,
                                     io_rCurrActionIndex ) );
-
+                            
                             io_rCurrActionIndex += pBmpAction->getActionCount()-1;
                         }
                     }
@@ -2389,9 +2389,9 @@ namespace cppcanvas
                         ActionSharedPtr pBmpAction(
                             internal::BitmapActionFactory::createBitmapAction(
                                 aBmp,
-                                getState( rStates ).mapModeTransform *
+                                getState( rStates ).mapModeTransform * 
                                 ::vcl::unotools::b2DPointFromPoint( pAct->GetDestPoint() ),
-                                getState( rStates ).mapModeTransform *
+                                getState( rStates ).mapModeTransform * 
                                 ::vcl::unotools::b2DSizeFromSize( pAct->GetDestSize() ),
                                 rCanvas,
                                 getState( rStates ) ) );
@@ -2402,7 +2402,7 @@ namespace cppcanvas
                                 MtfAction(
                                     pBmpAction,
                                     io_rCurrActionIndex ) );
-
+                            
                             io_rCurrActionIndex += pBmpAction->getActionCount()-1;
                         }
                     }
@@ -2440,7 +2440,7 @@ namespace cppcanvas
                                     MtfAction(
                                         pPolyAction,
                                         io_rCurrActionIndex ) );
-
+                                
                                 io_rCurrActionIndex += pPolyAction->getActionCount()-1;
                             }
                         }
@@ -2451,7 +2451,7 @@ namespace cppcanvas
                     {
                         MetaFloatTransparentAction* pAct = static_cast<MetaFloatTransparentAction*>(pCurrAct);
 
-                        internal::MtfAutoPtr pMtf(
+                        internal::MtfAutoPtr pMtf( 
                             new ::GDIMetaFile( pAct->GetGDIMetaFile() ) );
 
                         // TODO(P2): Use native canvas gradients here (saves a lot of UNO calls)
@@ -2465,9 +2465,9 @@ namespace cppcanvas
                                 pMtf,
                                 pGradient,
                                 rParms,
-                                getState( rStates ).mapModeTransform *
+                                getState( rStates ).mapModeTransform * 
                                 ::vcl::unotools::b2DPointFromPoint( pAct->GetPoint() ),
-                                getState( rStates ).mapModeTransform *
+                                getState( rStates ).mapModeTransform * 
                                 ::vcl::unotools::b2DSizeFromSize( pAct->GetSize() ),
                                 rCanvas,
                                 getState( rStates ) ) );
@@ -2478,7 +2478,7 @@ namespace cppcanvas
                                 MtfAction(
                                     pFloatTransAction,
                                     io_rCurrActionIndex ) );
-
+                            
                             io_rCurrActionIndex += pFloatTransAction->getActionCount()-1;
                         }
                     }
@@ -2493,11 +2493,11 @@ namespace cppcanvas
                             convertToLocalizedNumerals ( sText,rVDev.GetDigitLanguage() );
 
                         createTextAction(
-                            pAct->GetPoint(),
+                            pAct->GetPoint(), 
                             sText,
-                            pAct->GetIndex(),
+                            pAct->GetIndex(), 
                             pAct->GetLen() == (USHORT)STRING_LEN ? pAct->GetText().Len() - pAct->GetIndex() : pAct->GetLen(),
-                            NULL,
+                            NULL, 
                             rFactoryParms,
                             bSubsettableActions );
                     }
@@ -2512,11 +2512,11 @@ namespace cppcanvas
                             convertToLocalizedNumerals ( sText,rVDev.GetDigitLanguage() );
 
                         createTextAction(
-                            pAct->GetPoint(),
+                            pAct->GetPoint(), 
                             sText,
-                            pAct->GetIndex(),
+                            pAct->GetIndex(), 
                             pAct->GetLen() == (USHORT)STRING_LEN ? pAct->GetText().Len() - pAct->GetIndex() : pAct->GetLen(),
-                            pAct->GetDXArray(),
+                            pAct->GetDXArray(), 
                             rFactoryParms,
                             bSubsettableActions );
                     }
@@ -2529,20 +2529,20 @@ namespace cppcanvas
                         const OutDevState&       rState( getState( rStates ) );
                         const ::Size             aBaselineOffset( tools::getBaselineOffset( rState,
                                                                                             rVDev ) );
-                        const ::Point            aStartPoint( pAct->GetStartPoint() );
-                        const ::basegfx::B2DSize aSize( rState.mapModeTransform *
+                        const ::Point 		     aStartPoint( pAct->GetStartPoint() );
+                        const ::basegfx::B2DSize aSize( rState.mapModeTransform * 
                                                         ::basegfx::B2DSize(pAct->GetWidth(),
                                                                            0 ));
 
-                        ActionSharedPtr pPolyAction(
+                        ActionSharedPtr pPolyAction( 
                             PolyPolyActionFactory::createPolyPolyAction(
-                                tools::createTextLinesPolyPolygon(
-                                    rState.mapModeTransform *
+                                tools::createTextLinesPolyPolygon( 
+                                    rState.mapModeTransform * 
                                     ::basegfx::B2DPoint(
                                         ::vcl::unotools::b2DPointFromPoint(pAct->GetStartPoint()) +
                                         ::vcl::unotools::b2DSizeFromSize(aBaselineOffset)),
                                     aSize.getX(),
-                                    tools::createTextLineInfo( rVDev,
+                                    tools::createTextLineInfo( rVDev, 
                                                                rState )),
                                 rCanvas,
                                 rState ) );
@@ -2573,8 +2573,8 @@ namespace cppcanvas
                                                   pAct->GetStyle(),
                                                   aTmpMtf );
 
-                        createActions( aTmpMtf,
-                                       rFactoryParms,
+                        createActions( aTmpMtf, 
+                                       rFactoryParms, 
                                        bSubsettableActions );
 
                         popState( rStates );
@@ -2590,7 +2590,7 @@ namespace cppcanvas
                         if( rVDev.GetDigitLanguage())
                             convertToLocalizedNumerals ( sText,rVDev.GetDigitLanguage() );
 
-                        const USHORT nLen( pAct->GetLen() == (USHORT)STRING_LEN ?
+                        const USHORT nLen( pAct->GetLen() == (USHORT)STRING_LEN ? 
                                            pAct->GetText().Len() - pAct->GetIndex() : pAct->GetLen() );
 
                         // #i70897# Nothing to do, actually...
@@ -2604,7 +2604,7 @@ namespace cppcanvas
                         // to every logical character.
                         ::boost::scoped_array< sal_Int32 > pDXArray( new sal_Int32[nLen] );
 
-                        rVDev.GetTextArray( pAct->GetText(), pDXArray.get(),
+                        rVDev.GetTextArray( pAct->GetText(), pDXArray.get(), 
                                             pAct->GetIndex(), pAct->GetLen() );
 
                         const sal_Int32 nWidthDifference( pAct->GetWidth() - pDXArray[ nLen-1 ] );
@@ -2623,9 +2623,9 @@ namespace cppcanvas
                         }
 
                         createTextAction(
-                            pAct->GetPoint(),
+                            pAct->GetPoint(), 
                             sText,
-                            pAct->GetIndex(),
+                            pAct->GetIndex(), 
                             pAct->GetLen() == (USHORT)STRING_LEN ? pAct->GetText().Len() - pAct->GetIndex() : pAct->GetLen(),
                             pDXArray.get(),
                             rFactoryParms,
@@ -2674,8 +2674,8 @@ namespace cppcanvas
                     mbRet &= rAction.mpAction->render( maTransformation );
                 }
 
-                void operator()( const ::cppcanvas::internal::ImplRenderer::MtfAction&  rAction,
-                                 const Action::Subset&                                  rSubset )
+                void operator()( const ::cppcanvas::internal::ImplRenderer::MtfAction&	rAction,
+                                 const Action::Subset&									rSubset )
                 {
                     // ANDing the result. We want to fail if at least
                     // one action failed.
@@ -2684,8 +2684,8 @@ namespace cppcanvas
                 }
 
             private:
-                ::basegfx::B2DHomMatrix maTransformation;
-                bool                    mbRet;
+                ::basegfx::B2DHomMatrix	maTransformation;
+                bool					mbRet;
             };
 
             class AreaQuery
@@ -2707,21 +2707,21 @@ namespace cppcanvas
                     maBounds.expand( rAction.mpAction->getBounds( maTransformation ) );
                 }
 
-                void operator()( const ::cppcanvas::internal::ImplRenderer::MtfAction&  rAction,
-                                 const Action::Subset&                                  rSubset )
+                void operator()( const ::cppcanvas::internal::ImplRenderer::MtfAction&	rAction,
+                                 const Action::Subset&									rSubset )
                 {
                     maBounds.expand( rAction.mpAction->getBounds( maTransformation,
                                                                   rSubset ) );
                 }
 
                 ::basegfx::B2DRange getBounds() const
-                {
+                { 
                     return maBounds;
                 }
 
             private:
-                ::basegfx::B2DHomMatrix maTransformation;
-                ::basegfx::B2DRange     maBounds;
+                ::basegfx::B2DHomMatrix	maTransformation;
+                ::basegfx::B2DRange		maBounds;
             };
 
             // Doing that via inline class. Compilers tend to not inline free
@@ -2731,9 +2731,9 @@ namespace cppcanvas
                 bool operator()( const ::cppcanvas::internal::ImplRenderer::MtfAction& rLHS,
                                  const ::cppcanvas::internal::ImplRenderer::MtfAction& rRHS )
                 {
-                    const sal_Int32 nLHSCount( rLHS.mpAction ?
+                    const sal_Int32 nLHSCount( rLHS.mpAction ? 
                                                rLHS.mpAction->getActionCount() : 0 );
-                    const sal_Int32 nRHSCount( rRHS.mpAction ?
+                    const sal_Int32 nRHSCount( rRHS.mpAction ? 
                                                rRHS.mpAction->getActionCount() : 0 );
 
                     // compare end of action range, to have an action selected
@@ -2750,15 +2750,15 @@ namespace cppcanvas
                 Functor to call for each element of the subset
                 range. Must provide the following method signatures:
                 bool result() (returning false if operation failed)
-
+                
              */
-            template< typename Functor > bool
-                forSubsetRange( Functor&                                            rFunctor,
-                                ImplRenderer::ActionVector::const_iterator          aRangeBegin,
-                                ImplRenderer::ActionVector::const_iterator          aRangeEnd,
-                                sal_Int32                                           nStartIndex,
-                                sal_Int32                                           nEndIndex,
-                                const ImplRenderer::ActionVector::const_iterator&   rEnd )
+            template< typename Functor > bool 
+                forSubsetRange( Functor& 											rFunctor,
+                                ImplRenderer::ActionVector::const_iterator			aRangeBegin,
+                                ImplRenderer::ActionVector::const_iterator			aRangeEnd,
+                                sal_Int32											nStartIndex,
+                                sal_Int32											nEndIndex,
+                                const ImplRenderer::ActionVector::const_iterator&	rEnd )
             {
                 if( aRangeBegin == aRangeEnd )
                 {
@@ -2777,7 +2777,7 @@ namespace cppcanvas
                 else
                 {
                     // more than one action.
-
+                
                     // render partial first, full intermediate, and
                     // partial last action
                     Action::Subset aSubset;
@@ -2800,23 +2800,23 @@ namespace cppcanvas
                     if( aRangeEnd == rEnd ||
                         aRangeEnd->mnOrigIndex > nEndIndex )
                     {
-                        // aRangeEnd denotes end of action vector,
-                        //
+                        // aRangeEnd denotes end of action vector, 
+                        // 
                         // or
-                        //
+                        // 
                         // nEndIndex references something _after_
-                        // aRangeBegin, but _before_ aRangeEnd
-                        //
+                        // aRangeBegin, but _before_ aRangeEnd 
+                        // 
                         // either way: no partial action left
                         return rFunctor.result();
                     }
 
                     aSubset.mnSubsetBegin = 0;
                     aSubset.mnSubsetEnd   = nEndIndex - aRangeEnd->mnOrigIndex;
-
+                
                     ENSURE_OR_RETURN_FALSE( aSubset.mnSubsetBegin >= 0 && aSubset.mnSubsetEnd >= 0,
                                       "ImplRenderer::forSubsetRange(): Invalid indices" );
-
+                
                     rFunctor( *aRangeEnd, aSubset );
                 }
 
@@ -2824,10 +2824,10 @@ namespace cppcanvas
             }
         }
 
-        bool ImplRenderer::getSubsetIndices( sal_Int32&                     io_rStartIndex,
-                                             sal_Int32&                     io_rEndIndex,
-                                             ActionVector::const_iterator&  o_rRangeBegin,
-                                             ActionVector::const_iterator&  o_rRangeEnd ) const
+        bool ImplRenderer::getSubsetIndices( sal_Int32&						io_rStartIndex,
+                                             sal_Int32&						io_rEndIndex,
+                                             ActionVector::const_iterator& 	o_rRangeBegin,
+                                             ActionVector::const_iterator& 	o_rRangeEnd ) const
         {
             ENSURE_OR_RETURN_FALSE( io_rStartIndex<=io_rEndIndex,
                               "ImplRenderer::getSubsetIndices(): invalid action range" );
@@ -2852,7 +2852,7 @@ namespace cppcanvas
                 // empty range, don't render anything. The second
                 // condition e.g. happens if the requested range lies
                 // fully before or behind the valid action indices.
-                return false;
+                return false; 
             }
 
 
@@ -2868,16 +2868,16 @@ namespace cppcanvas
             o_rRangeEnd   = ::std::lower_bound( aBegin, aEnd,
                                                 MtfAction( ActionSharedPtr(), io_rEndIndex ),
                                                 UpperBoundActionIndexComparator() );
-            return true;
+            return true; 
         }
 
 
         // Public methods
         // ====================================================================
 
-        ImplRenderer::ImplRenderer( const CanvasSharedPtr&  rCanvas,
-                                    const GDIMetaFile&      rMtf,
-                                    const Parameters&       rParams ) :
+        ImplRenderer::ImplRenderer( const CanvasSharedPtr&	rCanvas,
+                                    const GDIMetaFile&		rMtf,
+                                    const Parameters&		rParams ) :
             CanvasGraphicHelper( rCanvas ),
             maActions()
         {
@@ -2898,7 +2898,7 @@ namespace cppcanvas
                 return;
             }
 
-            VectorOfOutDevStates    aStateStack;
+            VectorOfOutDevStates	aStateStack;
 
             VirtualDevice aVDev;
             aVDev.EnableOutput( FALSE );
@@ -2970,7 +2970,7 @@ namespace cppcanvas
                 rParams.maFontUnderline.isValid() )
             {
                 ::cppcanvas::internal::OutDevState& rState = getState( aStateStack );
-
+                    
                 rState.xFont = createFont( rState.fontRotation,
                                            ::Font(), // default font
                                            aParms );
@@ -2985,13 +2985,13 @@ namespace cppcanvas
                                                               // in
                                                               // createActions!
                            aParms,
-                           true // TODO(P1): make subsettability configurable
+                           true // TODO(P1): make subsettability configurable 
                             );
         }
 
-        ImplRenderer::ImplRenderer( const CanvasSharedPtr&  rCanvas,
-                                    const BitmapEx&         rBmpEx,
-                                    const Parameters&       rParams ) :
+        ImplRenderer::ImplRenderer( const CanvasSharedPtr&	rCanvas,
+                                    const BitmapEx&			rBmpEx,                                    
+                                    const Parameters&		rParams ) :
             CanvasGraphicHelper( rCanvas ),
             maActions()
         {
@@ -3029,7 +3029,7 @@ namespace cppcanvas
             // create a single action for the provided BitmapEx
             maActions.push_back(
                 MtfAction(
-                    BitmapActionFactory::createBitmapAction(
+                    BitmapActionFactory::createBitmapAction( 
                         rBmpEx,
                         ::basegfx::B2DPoint(),
                         rCanvas,
@@ -3041,8 +3041,8 @@ namespace cppcanvas
         {
         }
 
-        bool ImplRenderer::drawSubset( sal_Int32    nStartIndex,
-                                       sal_Int32    nEndIndex ) const
+        bool ImplRenderer::drawSubset( sal_Int32	nStartIndex,
+                                       sal_Int32	nEndIndex ) const
         {
             RTL_LOGFILE_CONTEXT( aLog, "::cppcanvas::internal::ImplRenderer::drawSubset()" );
 
@@ -3061,17 +3061,17 @@ namespace cppcanvas
                 // might also end right at the start of the referenced
                 // action, such that zero of that action needs to be
                 // rendered).
-
+            
 
                 // render subset of actions
                 // ========================
 
                 ::basegfx::B2DHomMatrix aMatrix;
-                ::canvas::tools::getRenderStateTransform( aMatrix,
+                ::canvas::tools::getRenderStateTransform( aMatrix, 
                                                           getRenderState() );
 
                 ActionRenderer aRenderer( aMatrix );
-
+                                   
                 return forSubsetRange( aRenderer,
                                        aRangeBegin,
                                        aRangeEnd,
@@ -3084,15 +3084,15 @@ namespace cppcanvas
                 OSL_ENSURE( false,
                             rtl::OUStringToOString(
                                 comphelper::anyToString( cppu::getCaughtException() ),
-                                RTL_TEXTENCODING_UTF8 ).getStr() );
+                                RTL_TEXTENCODING_UTF8 ).getStr() ); 
 
                 // convert error to return value
                 return false;
             }
         }
 
-        ::basegfx::B2DRange ImplRenderer::getSubsetArea( sal_Int32  nStartIndex,
-                                                         sal_Int32  nEndIndex ) const
+        ::basegfx::B2DRange ImplRenderer::getSubsetArea( sal_Int32	nStartIndex,
+                                                         sal_Int32	nEndIndex ) const
         {
             RTL_LOGFILE_CONTEXT( aLog, "::cppcanvas::internal::ImplRenderer::getSubsetArea()" );
 
@@ -3109,13 +3109,13 @@ namespace cppcanvas
             // might also end right at the start of the referenced
             // action, such that zero of that action needs to be
             // queried).
-
+            
 
             // query bounds for subset of actions
             // ==================================
 
             ::basegfx::B2DHomMatrix aMatrix;
-            ::canvas::tools::getRenderStateTransform( aMatrix,
+            ::canvas::tools::getRenderStateTransform( aMatrix, 
                                                       getRenderState() );
 
             AreaQuery aQuery( aMatrix );
@@ -3134,7 +3134,7 @@ namespace cppcanvas
             RTL_LOGFILE_CONTEXT( aLog, "::cppcanvas::internal::ImplRenderer::draw()" );
 
             ::basegfx::B2DHomMatrix aMatrix;
-            ::canvas::tools::getRenderStateTransform( aMatrix,
+            ::canvas::tools::getRenderStateTransform( aMatrix, 
                                                       getRenderState() );
 
             try
@@ -3146,7 +3146,7 @@ namespace cppcanvas
                 OSL_ENSURE( false,
                             rtl::OUStringToOString(
                                 comphelper::anyToString( cppu::getCaughtException() ),
-                                RTL_TEXTENCODING_UTF8 ).getStr() );
+                                RTL_TEXTENCODING_UTF8 ).getStr() ); 
 
                 return false;
             }
diff --git a/cppcanvas/source/mtfrenderer/lineaction.cxx b/cppcanvas/source/mtfrenderer/lineaction.cxx
index a779e45ab64a..af6e1ecbc72d 100644
--- a/cppcanvas/source/mtfrenderer/lineaction.cxx
+++ b/cppcanvas/source/mtfrenderer/lineaction.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
@@ -51,8 +51,8 @@
 
 using namespace ::com::sun::star;
 
-namespace cppcanvas
-{
+namespace cppcanvas 
+{ 
     namespace internal
     {
         namespace
@@ -61,29 +61,29 @@ namespace cppcanvas
             {
             public:
                 LineAction( const ::basegfx::B2DPoint&,
-                            const ::basegfx::B2DPoint&,
-                            const CanvasSharedPtr&,
-                            const OutDevState& );
+                            const ::basegfx::B2DPoint&,  
+                            const CanvasSharedPtr&, 
+                            const OutDevState& ); 
 
                 virtual bool render( const ::basegfx::B2DHomMatrix& rTransformation ) const;
                 virtual bool render( const ::basegfx::B2DHomMatrix& rTransformation,
-                                     const Subset&                  rSubset ) const;
+                                     const Subset&					rSubset ) const;
 
                 virtual ::basegfx::B2DRange getBounds( const ::basegfx::B2DHomMatrix& rTransformation ) const;
-                virtual ::basegfx::B2DRange getBounds( const ::basegfx::B2DHomMatrix&   rTransformation,
-                                                       const Subset&                    rSubset ) const;
+                virtual ::basegfx::B2DRange getBounds( const ::basegfx::B2DHomMatrix&	rTransformation,
+                                                       const Subset&					rSubset ) const;
 
                 virtual sal_Int32 getActionCount() const;
 
             private:
                 ::basegfx::B2DPoint     maStartPoint;
                 ::basegfx::B2DPoint     maEndPoint;
-                CanvasSharedPtr         mpCanvas;
-                rendering::RenderState  maState;
+                CanvasSharedPtr			mpCanvas;
+                rendering::RenderState	maState;
             };
 
-            LineAction::LineAction( const ::basegfx::B2DPoint& rStartPoint,
-                                    const ::basegfx::B2DPoint& rEndPoint,
+            LineAction::LineAction( const ::basegfx::B2DPoint& rStartPoint, 
+                                    const ::basegfx::B2DPoint& rEndPoint, 
                                     const CanvasSharedPtr&     rCanvas,
                                     const OutDevState&         rState ) :
                 maStartPoint( rStartPoint ),
@@ -103,7 +103,7 @@ namespace cppcanvas
                 rendering::RenderState aLocalState( maState );
                 ::canvas::tools::prependToRenderState(aLocalState, rTransformation);
 
-                mpCanvas->getUNOCanvas()->drawLine( ::basegfx::unotools::point2DFromB2DPoint(maStartPoint),
+                mpCanvas->getUNOCanvas()->drawLine( ::basegfx::unotools::point2DFromB2DPoint(maStartPoint), 
                                                     ::basegfx::unotools::point2DFromB2DPoint(maEndPoint),
                                                     mpCanvas->getViewState(),
                                                     aLocalState );
@@ -111,8 +111,8 @@ namespace cppcanvas
                 return true;
             }
 
-            bool LineAction::render( const ::basegfx::B2DHomMatrix& rTransformation,
-                                     const Subset&                  rSubset ) const
+            bool LineAction::render( const ::basegfx::B2DHomMatrix&	rTransformation,
+                                     const Subset&					rSubset ) const
             {
                 // line only contains a single action, fail if subset
                 // requests different range
@@ -127,15 +127,15 @@ namespace cppcanvas
             {
                 rendering::RenderState aLocalState( maState );
                 ::canvas::tools::prependToRenderState(aLocalState, rTransformation);
-
+                
                 return tools::calcDevicePixelBounds( ::basegfx::B2DRange( maStartPoint,
                                                                           maEndPoint ),
                                                      mpCanvas->getViewState(),
                                                      aLocalState );
             }
 
-            ::basegfx::B2DRange LineAction::getBounds( const ::basegfx::B2DHomMatrix&   rTransformation,
-                                                       const Subset&                    rSubset ) const
+            ::basegfx::B2DRange LineAction::getBounds( const ::basegfx::B2DHomMatrix&	rTransformation,
+                                                       const Subset&					rSubset ) const
             {
                 // line only contains a single action, empty bounds
                 // if subset requests different range
@@ -152,16 +152,16 @@ namespace cppcanvas
             }
         }
 
-        ActionSharedPtr LineActionFactory::createLineAction( const ::basegfx::B2DPoint& rStartPoint,
-                                                             const ::basegfx::B2DPoint& rEndPoint,
-                                                             const CanvasSharedPtr&     rCanvas,
-                                                             const OutDevState&         rState  )
+        ActionSharedPtr LineActionFactory::createLineAction( const ::basegfx::B2DPoint&	rStartPoint,
+                                                             const ::basegfx::B2DPoint&	rEndPoint,  
+                                                             const CanvasSharedPtr&     rCanvas, 
+                                                             const OutDevState&         rState	)
         {
             return ActionSharedPtr( new LineAction( rStartPoint,
-                                                    rEndPoint,
-                                                    rCanvas,
+                                                    rEndPoint,  
+                                                    rCanvas, 
                                                     rState) );
         }
-
+            
     }
 }
diff --git a/cppcanvas/source/mtfrenderer/lineaction.hxx b/cppcanvas/source/mtfrenderer/lineaction.hxx
index 12d308557837..8381b407a256 100644
--- a/cppcanvas/source/mtfrenderer/lineaction.hxx
+++ b/cppcanvas/source/mtfrenderer/lineaction.hxx
@@ -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
@@ -38,12 +38,12 @@ namespace basegfx {
 
 /* Definition of internal::LineActionFactory class */
 
-namespace cppcanvas
-{
+namespace cppcanvas 
+{ 
     namespace internal
     {
-        struct OutDevState;
-
+        struct OutDevState; 
+ 
         /** Creates encapsulated converters between GDIMetaFile and
             XCanvas. The Canvas argument is deliberately placed at the
             constructor, to force reconstruction of this object for a
@@ -56,9 +56,9 @@ namespace cppcanvas
         public:
             /// Plain hair line from point 1 to point 2
             static ActionSharedPtr createLineAction( const ::basegfx::B2DPoint&,
-                                                     const ::basegfx::B2DPoint&,
-                                                     const CanvasSharedPtr&,
-                                                     const OutDevState& );
+                                                     const ::basegfx::B2DPoint&,  
+                                                     const CanvasSharedPtr&, 
+                                                     const OutDevState& ); 
 
         private:
             // static factory, disable big four
@@ -67,7 +67,7 @@ namespace cppcanvas
             LineActionFactory(const LineActionFactory&);
             LineActionFactory& operator=( const LineActionFactory& );
         };
-    }
+    } 
 }
 
 #endif /* _CPPCANVAS_LINEACTION_HXX */
diff --git a/cppcanvas/source/mtfrenderer/mtftools.cxx b/cppcanvas/source/mtfrenderer/mtftools.cxx
index 2d165eca4d38..5017a9b6d4bf 100644
--- a/cppcanvas/source/mtfrenderer/mtftools.cxx
+++ b/cppcanvas/source/mtfrenderer/mtftools.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
@@ -58,17 +58,17 @@ namespace cppcanvas
 {
     namespace tools
     {
-        void initRenderState( rendering::RenderState&                   renderState,
-                              const ::cppcanvas::internal::OutDevState& outdevState )
+        void initRenderState( rendering::RenderState&					renderState,
+                              const ::cppcanvas::internal::OutDevState&	outdevState )
         {
             ::canvas::tools::initRenderState( renderState );
-            ::canvas::tools::setRenderStateTransform( renderState,
+            ::canvas::tools::setRenderStateTransform( renderState, 
                                                       outdevState.transform );
             renderState.Clip = outdevState.xClipPoly;
         }
 
-        ::Size getBaselineOffset( const ::cppcanvas::internal::OutDevState& outdevState,
-                                  const VirtualDevice&                      rVDev )
+        ::Size getBaselineOffset( const ::cppcanvas::internal::OutDevState&	outdevState,
+                                  const VirtualDevice&						rVDev )
         {
             const ::FontMetric& aMetric = rVDev.GetFontMetric();
 
@@ -94,8 +94,8 @@ namespace cppcanvas
             }
         }
 
-        ::basegfx::B2DHomMatrix& calcLogic2PixelLinearTransform( ::basegfx::B2DHomMatrix&   o_rMatrix,
-                                                                 const VirtualDevice&       rVDev )
+        ::basegfx::B2DHomMatrix& calcLogic2PixelLinearTransform( ::basegfx::B2DHomMatrix&	o_rMatrix,
+                                                                 const VirtualDevice& 		rVDev )
         {
             // select size value in the middle of the available range,
             // to have headroom both when map mode scales up, and when
@@ -112,15 +112,15 @@ namespace cppcanvas
             return o_rMatrix;
         }
 
-        ::basegfx::B2DHomMatrix& calcLogic2PixelAffineTransform( ::basegfx::B2DHomMatrix&   o_rMatrix,
-                                                                 const VirtualDevice&       rVDev )
+        ::basegfx::B2DHomMatrix& calcLogic2PixelAffineTransform( ::basegfx::B2DHomMatrix&	o_rMatrix,
+                                                                 const VirtualDevice& 		rVDev )
         {
             // retrieves scale
             calcLogic2PixelLinearTransform(o_rMatrix, rVDev);
 
             // translate according to curr map mode/pref map mode offset
             const ::Point  aEmptyPoint;
-            const ::Point& rTranslatedPoint(
+            const ::Point& rTranslatedPoint( 
                 rVDev.LogicToPixel( aEmptyPoint ));
 
             o_rMatrix.translate(rTranslatedPoint.X(),
@@ -129,32 +129,32 @@ namespace cppcanvas
             return o_rMatrix;
         }
 
-        bool modifyClip( rendering::RenderState&                            o_rRenderState,
-                         const struct ::cppcanvas::internal::OutDevState&   rOutdevState,
-                         const CanvasSharedPtr&                             rCanvas,
-                         const ::basegfx::B2DPoint&                         rOffset,
-                         const ::basegfx::B2DVector*                        pScaling,
+        bool modifyClip( rendering::RenderState&							o_rRenderState,
+                         const struct ::cppcanvas::internal::OutDevState&	rOutdevState,
+                         const CanvasSharedPtr&								rCanvas,
+                         const ::basegfx::B2DPoint&							rOffset,
+                         const ::basegfx::B2DVector*						pScaling,
                          const double*                                      pRotation )
         {
             const ::Point aEmptyPoint;
 
             const bool bOffsetting( !rOffset.equalZero() );
-            const bool bScaling( pScaling &&
-                                 pScaling->getX() != 1.0 &&
+            const bool bScaling( pScaling && 
+                                 pScaling->getX() != 1.0 && 
                                  pScaling->getY() != 1.0 );
             const bool bRotation( pRotation &&
                                   *pRotation != 0.0 );
 
             if( !bOffsetting && !bScaling && !bRotation )
                 return false; // nothing to do
-
+            
             if( rOutdevState.clip.count() )
             {
                 // general polygon case
 
                 ::basegfx::B2DPolyPolygon aLocalClip( rOutdevState.clip );
-                ::basegfx::B2DHomMatrix   aTransform;
-
+                ::basegfx::B2DHomMatrix	  aTransform;
+                    
                 if( bOffsetting )
                     aTransform.translate( -rOffset.getX(),
                                           -rOffset.getY() );
@@ -165,7 +165,7 @@ namespace cppcanvas
                     aTransform.rotate( - *pRotation );
 
                 aLocalClip.transform( aTransform );
-
+                
                 o_rRenderState.Clip = ::basegfx::unotools::xPolyPolygonFromB2DPolyPolygon(
                     rCanvas->getUNOCanvas()->getDevice(),
                     aLocalClip );
@@ -177,20 +177,20 @@ namespace cppcanvas
                 // simple rect case
 
                 const ::Rectangle aLocalClipRect( rOutdevState.clipRect );
-
+                
                 if( bRotation )
                 {
                     // rotation involved - convert to polygon first,
                     // then transform that
-                    ::basegfx::B2DPolygon aLocalClip(
-                        ::basegfx::tools::createPolygonFromRect(
-                                ::basegfx::B2DRectangle(
+                    ::basegfx::B2DPolygon aLocalClip( 
+                        ::basegfx::tools::createPolygonFromRect( 
+                                ::basegfx::B2DRectangle( 
                                     (double)(aLocalClipRect.Left()),
                                     (double)(aLocalClipRect.Top()),
                                     (double)(aLocalClipRect.Right()),
                                     (double)(aLocalClipRect.Bottom()) ) ) );
                     ::basegfx::B2DHomMatrix aTransform;
-
+                    
                     if( bOffsetting )
                         aTransform.translate( -rOffset.getX(),
                                               -rOffset.getY() );
@@ -212,8 +212,8 @@ namespace cppcanvas
                     o_rRenderState.Clip = ::basegfx::unotools::xPolyPolygonFromB2DPolyPolygon(
                         rCanvas->getUNOCanvas()->getDevice(),
                         ::basegfx::B2DPolyPolygon(
-                            ::basegfx::tools::createPolygonFromRect(
-                                ::basegfx::B2DRectangle(
+                            ::basegfx::tools::createPolygonFromRect( 
+                                ::basegfx::B2DRectangle( 
                                     (double)(aLocalClipRect.Left() - rOffset.getX())/pScaling->getX(),
                                     (double)(aLocalClipRect.Top() - rOffset.getY())/pScaling->getY(),
                                     (double)(aLocalClipRect.Right() - rOffset.getX())/pScaling->getX(),
@@ -226,7 +226,7 @@ namespace cppcanvas
                     o_rRenderState.Clip = ::basegfx::unotools::xPolyPolygonFromB2DPolyPolygon(
                         rCanvas->getUNOCanvas()->getDevice(),
                         ::basegfx::B2DPolyPolygon(
-                            ::basegfx::tools::createPolygonFromRect(
+                            ::basegfx::tools::createPolygonFromRect( 
                                 ::basegfx::B2DRectangle( aLocalClipRect.Left() - rOffset.getX(),
                                                          aLocalClipRect.Top() - rOffset.getY(),
                                                          aLocalClipRect.Right() - rOffset.getX(),
@@ -240,31 +240,31 @@ namespace cppcanvas
             return false;
         }
 
-        bool modifyClip( rendering::RenderState&                            o_rRenderState,
-                         const struct ::cppcanvas::internal::OutDevState&   rOutdevState,
-                         const CanvasSharedPtr&                             rCanvas,
-                         const ::Point&                                     rOffset,
-                         const ::basegfx::B2DVector*                        pScaling,
+        bool modifyClip( rendering::RenderState&							o_rRenderState,
+                         const struct ::cppcanvas::internal::OutDevState&	rOutdevState,
+                         const CanvasSharedPtr&								rCanvas,
+                         const ::Point&										rOffset,
+                         const ::basegfx::B2DVector*						pScaling,
                          const double*                                      pRotation )
         {
-            return modifyClip( o_rRenderState,
-                               rOutdevState,
-                               rCanvas,
-                               ::basegfx::B2DPoint( rOffset.X(),
-                                                    rOffset.Y() ),
+            return modifyClip( o_rRenderState, 
+                               rOutdevState, 
+                               rCanvas, 
+                               ::basegfx::B2DPoint( rOffset.X(), 
+                                                    rOffset.Y() ), 
                                pScaling,
                                pRotation );
         }
 
-        bool modifyClip( rendering::RenderState&                            o_rRenderState,
-                         const struct ::cppcanvas::internal::OutDevState&   rOutdevState,
-                         const CanvasSharedPtr&                             rCanvas,
-                         const ::basegfx::B2DHomMatrix&                     rTransform )
+        bool modifyClip( rendering::RenderState&							o_rRenderState,
+                         const struct ::cppcanvas::internal::OutDevState&	rOutdevState,
+                         const CanvasSharedPtr&								rCanvas,
+                         const ::basegfx::B2DHomMatrix&						rTransform )
         {
             if( !rTransform.isIdentity() ||
                 !rTransform.isInvertible() )
                 return false; // nothing to do
-
+            
             ::basegfx::B2DPolyPolygon aLocalClip;
 
             if( rOutdevState.clip.count() )
@@ -276,8 +276,8 @@ namespace cppcanvas
                 const ::Rectangle aLocalClipRect( rOutdevState.clipRect );
 
                 aLocalClip = ::basegfx::B2DPolyPolygon(
-                    ::basegfx::tools::createPolygonFromRect(
-                        ::basegfx::B2DRectangle(
+                    ::basegfx::tools::createPolygonFromRect( 
+                        ::basegfx::B2DRectangle( 
                             aLocalClipRect.Left(),
                             aLocalClipRect.Top(),
                             aLocalClipRect.Right(),
@@ -303,15 +303,15 @@ namespace cppcanvas
         }
 
         // create overline/underline/strikeout line info struct
-        TextLineInfo createTextLineInfo( const ::VirtualDevice&                     rVDev,
-                                         const ::cppcanvas::internal::OutDevState&  rState )
+        TextLineInfo createTextLineInfo( const ::VirtualDevice& 					rVDev,
+                                         const ::cppcanvas::internal::OutDevState&	rState )
         {
             const BOOL bOldMode( rVDev.IsMapModeEnabled() );
 
             // #i68512# Force metric regeneration with mapmode enabled
             // (prolly OutDev bug)
             rVDev.GetFontMetric();
-
+                
             // will restore map mode below
             const_cast< ::VirtualDevice& >(rVDev).EnableMapMode( FALSE );
 
@@ -336,39 +336,39 @@ namespace cppcanvas
         {
             void appendRect( ::basegfx::B2DPolyPolygon& o_rPoly,
                              const ::basegfx::B2DPoint& rStartPos,
-                             const double               nX1,
-                             const double               nY1,
-                             const double               nX2,
-                             const double               nY2 )
+                             const double 				nX1,
+                             const double 				nY1,
+                             const double 				nX2,
+                             const double 				nY2 )
             {
                 const double x( rStartPos.getX() );
                 const double y( rStartPos.getY() );
 
                 o_rPoly.append(
-                    ::basegfx::tools::createPolygonFromRect(
+                    ::basegfx::tools::createPolygonFromRect( 
                         ::basegfx::B2DRectangle( x + nX1, y + nY1, x + nX2, y + nY2 ) ) );
             }
 
             void appendRect( ::basegfx::B2DPolyPolygon& o_rPoly,
-                             const double               nX1,
-                             const double               nY1,
-                             const double               nX2,
-                             const double               nY2 )
+                             const double 				nX1,
+                             const double 				nY1,
+                             const double 				nX2,
+                             const double 				nY2 )
             {
                 o_rPoly.append(
-                    ::basegfx::tools::createPolygonFromRect(
+                    ::basegfx::tools::createPolygonFromRect( 
                         ::basegfx::B2DRectangle( nX1, nY1, nX2, nY2 ) ) );
             }
 
-            void appendDashes( ::basegfx::B2DPolyPolygon&   o_rPoly,
-                               const double                 nX,
-                               const double                 nY,
-                               const double                 nLineWidth,
-                               const double                 nLineHeight,
-                               const double                 nDashWidth,
-                               const double                 nDashSkip )
+            void appendDashes( ::basegfx::B2DPolyPolygon&	o_rPoly,
+                               const double 				nX,
+                               const double 				nY,
+                               const double 				nLineWidth,
+                               const double 				nLineHeight,
+                               const double 				nDashWidth,
+                               const double 				nDashSkip )
             {
-                const sal_Int32 nNumLoops(
+                const sal_Int32 nNumLoops( 
                     static_cast< sal_Int32 >(
                         ::std::max( 1.0,
                                     nLineWidth / nDashSkip ) + .5) );
@@ -377,7 +377,7 @@ namespace cppcanvas
                 for( sal_Int32 i=0; i<nNumLoops; ++i )
                 {
                     appendRect( o_rPoly,
-                                x,              nY,
+                                x, 				nY,
                                 x + nDashWidth, nY + nLineHeight );
 
                     x += nDashSkip;
@@ -388,15 +388,15 @@ namespace cppcanvas
         // create line actions for text such as underline and
         // strikeout
         ::basegfx::B2DPolyPolygon createTextLinesPolyPolygon( const ::basegfx::B2DPoint rStartPos,
-                                                              const double&             rLineWidth,
-                                                              const TextLineInfo&       rTextLineInfo )
+                                                              const double&				rLineWidth,
+                                                              const TextLineInfo&		rTextLineInfo )
         {
             // fill the polypolygon with all text lines
             ::basegfx::B2DPolyPolygon aTextLinesPolyPoly;
 
             switch( rTextLineInfo.mnOverlineStyle )
             {
-                case UNDERLINE_NONE:          // nothing to do
+                case UNDERLINE_NONE:    	  // nothing to do
                     // FALLTHROUGH intended
                 case UNDERLINE_DONTKNOW:
                     break;
@@ -501,7 +501,7 @@ namespace cppcanvas
 
             switch( rTextLineInfo.mnUnderlineStyle )
             {
-                case UNDERLINE_NONE:          // nothing to do
+                case UNDERLINE_NONE:    	  // nothing to do
                     // FALLTHROUGH intended
                 case UNDERLINE_DONTKNOW:
                     break;
@@ -511,11 +511,11 @@ namespace cppcanvas
                 case UNDERLINE_WAVE:          // TODO(F3): NYI
                     // FALLTHROUGH intended
                 case UNDERLINE_SINGLE:
-                    appendRect(
+                    appendRect( 
                         aTextLinesPolyPoly,
                         rStartPos,
                         0,
-                        rTextLineInfo.mnUnderlineOffset,
+                        rTextLineInfo.mnUnderlineOffset, 
                         rLineWidth,
                         rTextLineInfo.mnUnderlineOffset + rTextLineInfo.mnLineHeight );
                     break;
@@ -533,11 +533,11 @@ namespace cppcanvas
                 case UNDERLINE_BOLDWAVE:      // TODO(F3): NYI
                     // FALLTHROUGH intended
                 case UNDERLINE_BOLD:
-                    appendRect(
+                    appendRect( 
                         aTextLinesPolyPoly,
                         rStartPos,
                         0,
-                        rTextLineInfo.mnUnderlineOffset,
+                        rTextLineInfo.mnUnderlineOffset, 
                         rLineWidth,
                         rTextLineInfo.mnUnderlineOffset + 2*rTextLineInfo.mnLineHeight );
                     break;
@@ -545,19 +545,19 @@ namespace cppcanvas
                 case UNDERLINE_DOUBLEWAVE:    // TODO(F3): NYI
                     // FALLTHROUGH intended
                 case UNDERLINE_DOUBLE:
-                    appendRect(
+                    appendRect( 
                         aTextLinesPolyPoly,
                         rStartPos,
                         0,
-                        rTextLineInfo.mnUnderlineOffset - rTextLineInfo.mnLineHeight,
+                        rTextLineInfo.mnUnderlineOffset - rTextLineInfo.mnLineHeight, 
                         rLineWidth,
                         rTextLineInfo.mnUnderlineOffset );
 
-                    appendRect(
+                    appendRect( 
                         aTextLinesPolyPoly,
                         rStartPos,
                         0,
-                        rTextLineInfo.mnUnderlineOffset + 2*rTextLineInfo.mnLineHeight,
+                        rTextLineInfo.mnUnderlineOffset + 2*rTextLineInfo.mnLineHeight, 
                         rLineWidth,
                         rTextLineInfo.mnUnderlineOffset + 3*rTextLineInfo.mnLineHeight );
                     break;
@@ -565,37 +565,37 @@ namespace cppcanvas
                 case UNDERLINE_DASHDOTDOT:    // TODO(F3): NYI
                     // FALLTHROUGH intended
                 case UNDERLINE_DOTTED:
-                    appendDashes(
+                    appendDashes( 
                         aTextLinesPolyPoly,
                         rStartPos.getX(),
                         rStartPos.getY() + rTextLineInfo.mnUnderlineOffset,
                         rLineWidth,
                         rTextLineInfo.mnLineHeight,
-                        rTextLineInfo.mnLineHeight,
+                        rTextLineInfo.mnLineHeight, 
                         2*rTextLineInfo.mnLineHeight );
                     break;
 
                 case UNDERLINE_DASHDOT:       // TODO(F3): NYI
                     // FALLTHROUGH intended
                 case UNDERLINE_DASH:
-                    appendDashes(
+                    appendDashes( 
                         aTextLinesPolyPoly,
                         rStartPos.getX(),
                         rStartPos.getY() + rTextLineInfo.mnUnderlineOffset,
                         rLineWidth,
                         rTextLineInfo.mnLineHeight,
-                        3*rTextLineInfo.mnLineHeight,
+                        3*rTextLineInfo.mnLineHeight, 
                         6*rTextLineInfo.mnLineHeight );
                     break;
 
                 case UNDERLINE_LONGDASH:
-                    appendDashes(
+                    appendDashes( 
                         aTextLinesPolyPoly,
                         rStartPos.getX(),
                         rStartPos.getY() + rTextLineInfo.mnUnderlineOffset,
                         rLineWidth,
                         rTextLineInfo.mnLineHeight,
-                        6*rTextLineInfo.mnLineHeight,
+                        6*rTextLineInfo.mnLineHeight, 
                         12*rTextLineInfo.mnLineHeight );
                     break;
 
@@ -617,39 +617,39 @@ namespace cppcanvas
                     break;
 
                 case STRIKEOUT_SINGLE:
-                    appendRect(
+                    appendRect( 
                         aTextLinesPolyPoly,
                         rStartPos,
                         0,
-                        rTextLineInfo.mnStrikeoutOffset,
+                        rTextLineInfo.mnStrikeoutOffset, 
                         rLineWidth,
                         rTextLineInfo.mnStrikeoutOffset + rTextLineInfo.mnLineHeight );
                     break;
 
                 case STRIKEOUT_BOLD:
-                    appendRect(
+                    appendRect( 
                         aTextLinesPolyPoly,
                         rStartPos,
                         0,
-                        rTextLineInfo.mnStrikeoutOffset,
+                        rTextLineInfo.mnStrikeoutOffset, 
                         rLineWidth,
                         rTextLineInfo.mnStrikeoutOffset + 2*rTextLineInfo.mnLineHeight );
                     break;
 
                 case STRIKEOUT_DOUBLE:
-                    appendRect(
+                    appendRect( 
                         aTextLinesPolyPoly,
                         rStartPos,
                         0,
-                        rTextLineInfo.mnStrikeoutOffset - rTextLineInfo.mnLineHeight,
+                        rTextLineInfo.mnStrikeoutOffset - rTextLineInfo.mnLineHeight, 
                         rLineWidth,
                         rTextLineInfo.mnStrikeoutOffset );
 
-                    appendRect(
+                    appendRect( 
                         aTextLinesPolyPoly,
                         rStartPos,
                         0,
-                        rTextLineInfo.mnStrikeoutOffset + 2*rTextLineInfo.mnLineHeight,
+                        rTextLineInfo.mnStrikeoutOffset + 2*rTextLineInfo.mnLineHeight, 
                         rLineWidth,
                         rTextLineInfo.mnStrikeoutOffset + 3*rTextLineInfo.mnLineHeight );
                     break;
@@ -662,28 +662,28 @@ namespace cppcanvas
             return aTextLinesPolyPoly;
         }
 
-        ::basegfx::B2DRange calcDevicePixelBounds( const ::basegfx::B2DRange&       rBounds,
-                                                   const rendering::ViewState&      viewState,
-                                                   const rendering::RenderState&    renderState )
+        ::basegfx::B2DRange calcDevicePixelBounds( const ::basegfx::B2DRange& 		rBounds,
+                                                   const rendering::ViewState&		viewState,
+                                                   const rendering::RenderState&	renderState )
         {
             ::basegfx::B2DHomMatrix aTransform;
             ::canvas::tools::mergeViewAndRenderTransform( aTransform,
                                                           viewState,
                                                           renderState );
-
+ 
             ::basegfx::B2DRange aTransformedBounds;
             return ::canvas::tools::calcTransformedRectBounds( aTransformedBounds,
-                                                               rBounds,
+                                                               rBounds, 
                                                                aTransform );
         }
 
         // create line actions for text such as underline and
         // strikeout
-        ::basegfx::B2DPolyPolygon createTextLinesPolyPolygon( const double&         rStartOffset,
-                                                              const double&         rLineWidth,
-                                                              const TextLineInfo&   rTextLineInfo )
+        ::basegfx::B2DPolyPolygon createTextLinesPolyPolygon( const double&			rStartOffset,
+                                                              const double&			rLineWidth,
+                                                              const TextLineInfo&	rTextLineInfo )
         {
-            return createTextLinesPolyPolygon(
+            return createTextLinesPolyPolygon( 
                 ::basegfx::B2DPoint( rStartOffset,
                                      0.0 ),
                 rLineWidth,
diff --git a/cppcanvas/source/mtfrenderer/mtftools.hxx b/cppcanvas/source/mtfrenderer/mtftools.hxx
index 3bf0fe31e344..ea63930feb56 100644
--- a/cppcanvas/source/mtfrenderer/mtftools.hxx
+++ b/cppcanvas/source/mtfrenderer/mtftools.hxx
@@ -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
@@ -41,7 +41,7 @@ namespace basegfx
     class B2DVector;
     class B2DPoint;
 }
-namespace com { namespace sun { namespace star { namespace rendering
+namespace com { namespace sun { namespace star { namespace rendering 
 {
     struct RenderState;
 } } } }
@@ -62,8 +62,8 @@ namespace cppcanvas
             sets up the transformation and the clip from the
             OutDevState.
          */
-        void initRenderState( ::com::sun::star::rendering::RenderState& renderState,
-                              const ::cppcanvas::internal::OutDevState&         outdevState );
+        void initRenderState( ::com::sun::star::rendering::RenderState&	renderState,
+                              const ::cppcanvas::internal::OutDevState&			outdevState );
 
         /** Calc output offset relative to baseline
 
@@ -79,8 +79,8 @@ namespace cppcanvas
             @param rVDev
             VDev to obtain font metrics from.
          */
-        ::Size getBaselineOffset( const ::cppcanvas::internal::OutDevState& outdevState,
-                                  const VirtualDevice&                      rVDev );
+        ::Size getBaselineOffset( const ::cppcanvas::internal::OutDevState&	outdevState,
+                                  const VirtualDevice&						rVDev );
 
         /** Construct a matrix that converts from logical to pixel
             coordinate system.
@@ -96,8 +96,8 @@ namespace cppcanvas
 
             @return the calculated transformation matrix.
          */
-        ::basegfx::B2DHomMatrix& calcLogic2PixelLinearTransform( ::basegfx::B2DHomMatrix&   o_rMatrix,
-                                                                 const VirtualDevice&       rVDev );
+        ::basegfx::B2DHomMatrix& calcLogic2PixelLinearTransform( ::basegfx::B2DHomMatrix&	o_rMatrix,
+                                                                 const VirtualDevice& 		rVDev );
 
         /** Construct a matrix that converts from logical to pixel
             coordinate system.
@@ -111,8 +111,8 @@ namespace cppcanvas
 
             @return the calculated transformation matrix.
          */
-        ::basegfx::B2DHomMatrix& calcLogic2PixelAffineTransform( ::basegfx::B2DHomMatrix&   o_rMatrix,
-                                                                 const VirtualDevice&       rVDev );
+        ::basegfx::B2DHomMatrix& calcLogic2PixelAffineTransform( ::basegfx::B2DHomMatrix&	o_rMatrix,
+                                                                 const VirtualDevice& 		rVDev );
 
         /** This method modifies the clip, to cancel the given
             transformation.
@@ -139,11 +139,11 @@ namespace cppcanvas
 
             @return true, if the clip has changed, false if not
          */
-        bool modifyClip( ::com::sun::star::rendering::RenderState&          o_rRenderState,
-                         const struct ::cppcanvas::internal::OutDevState&   rOutdevState,
-                         const CanvasSharedPtr&                             rCanvas,
-                         const ::Point&                                     rOffset,
-                         const ::basegfx::B2DVector*                        pScaling,
+        bool modifyClip( ::com::sun::star::rendering::RenderState&			o_rRenderState,
+                         const struct ::cppcanvas::internal::OutDevState&	rOutdevState,
+                         const CanvasSharedPtr&								rCanvas,
+                         const ::Point&										rOffset,
+                         const ::basegfx::B2DVector*						pScaling,
                          const double*                                      pRotation );
 
         /** This method modifies the clip, to cancel the given
@@ -171,11 +171,11 @@ namespace cppcanvas
 
             @return true, if the clip has changed, false if not
          */
-        bool modifyClip( ::com::sun::star::rendering::RenderState&          o_rRenderState,
-                         const struct ::cppcanvas::internal::OutDevState&   rOutdevState,
-                         const CanvasSharedPtr&                             rCanvas,
-                         const ::basegfx::B2DPoint&                         rOffset,
-                         const ::basegfx::B2DVector*                        pScaling,
+        bool modifyClip( ::com::sun::star::rendering::RenderState&			o_rRenderState,
+                         const struct ::cppcanvas::internal::OutDevState&	rOutdevState,
+                         const CanvasSharedPtr&								rCanvas,
+                         const ::basegfx::B2DPoint&							rOffset,
+                         const ::basegfx::B2DVector*						pScaling,
                          const double*                                      pRotation );
 
         /** This method modifies the clip, to cancel the given
@@ -197,10 +197,10 @@ namespace cppcanvas
 
             @return true, if the clip has changed, false if not
          */
-        bool modifyClip( ::com::sun::star::rendering::RenderState&          o_rRenderState,
-                         const struct ::cppcanvas::internal::OutDevState&   rOutdevState,
-                         const CanvasSharedPtr&                             rCanvas,
-                         const ::basegfx::B2DHomMatrix&                     rTransform );
+        bool modifyClip( ::com::sun::star::rendering::RenderState&			o_rRenderState,
+                         const struct ::cppcanvas::internal::OutDevState&	rOutdevState,
+                         const CanvasSharedPtr&								rCanvas,
+                         const ::basegfx::B2DHomMatrix&						rTransform );
 
         struct TextLineInfo
         {
@@ -209,9 +209,9 @@ namespace cppcanvas
                           const double& rOverlineOffset,
                           const double& rUnderlineOffset,
                           const double& rStrikeoutOffset,
-                          sal_Int8      nOverlineStyle,
-                          sal_Int8      nUnderlineStyle,
-                          sal_Int8      nStrikeoutStyle ) :
+                          sal_Int8		nOverlineStyle,
+                          sal_Int8		nUnderlineStyle,
+                          sal_Int8		nStrikeoutStyle ) :
                 mnLineHeight( rLineHeight ),
                 mnOverlineHeight( rOverlineHeight ),
                 mnOverlineOffset( rOverlineOffset ),
@@ -223,27 +223,27 @@ namespace cppcanvas
             {
             }
 
-            double      mnLineHeight;
-            double      mnOverlineHeight;
-            double      mnOverlineOffset;
-            double      mnUnderlineOffset;
-            double      mnStrikeoutOffset;
-            sal_Int8    mnOverlineStyle;
-            sal_Int8    mnUnderlineStyle;
-            sal_Int8    mnStrikeoutStyle;
+            double 		mnLineHeight;
+            double 		mnOverlineHeight;
+            double 		mnOverlineOffset;
+            double 		mnUnderlineOffset;
+            double 		mnStrikeoutOffset;
+            sal_Int8	mnOverlineStyle;
+            sal_Int8	mnUnderlineStyle;
+            sal_Int8	mnStrikeoutStyle;
         };
 
         /** Transform given bounds to device coordinate system.
          */
-        ::basegfx::B2DRange calcDevicePixelBounds( const ::basegfx::B2DRange&                       rBounds,
-                                                   const ::com::sun::star::rendering::ViewState&    viewState,
-                                                   const ::com::sun::star::rendering::RenderState&  renderState );
+        ::basegfx::B2DRange calcDevicePixelBounds( const ::basegfx::B2DRange& 						rBounds,
+                                                   const ::com::sun::star::rendering::ViewState&	viewState,
+                                                   const ::com::sun::star::rendering::RenderState&	renderState );
 
         /** Generate text underline/strikeout info struct from OutDev
             state.
          */
-        TextLineInfo createTextLineInfo( const ::VirtualDevice&                     rVDev,
-                                         const ::cppcanvas::internal::OutDevState&  rState );
+        TextLineInfo createTextLineInfo( const ::VirtualDevice& 					rVDev,
+                                         const ::cppcanvas::internal::OutDevState&	rState );
 
         /** Create a poly-polygon representing the given combination
             of overline, strikeout and underline.
@@ -257,13 +257,13 @@ namespace cppcanvas
             @param rTextLineInfo
             Common info needed for overline/strikeout/underline generation
          */
-        ::basegfx::B2DPolyPolygon createTextLinesPolyPolygon( const double&         rStartOffset,
-                                                              const double&         rLineWidth,
-                                                              const TextLineInfo&   rTextLineInfo );
+        ::basegfx::B2DPolyPolygon createTextLinesPolyPolygon( const double&			rStartOffset,
+                                                              const double&			rLineWidth,
+                                                              const TextLineInfo&	rTextLineInfo );
 
         ::basegfx::B2DPolyPolygon createTextLinesPolyPolygon( const ::basegfx::B2DPoint rStartPos,
-                                                              const double&             rLineWidth,
-                                                              const TextLineInfo&       rTextLineInfo );
+                                                              const double&				rLineWidth,
+                                                              const TextLineInfo&		rTextLineInfo );
     }
 }
 
diff --git a/cppcanvas/source/mtfrenderer/outdevstate.hxx b/cppcanvas/source/mtfrenderer/outdevstate.hxx
index 37930b2e78b4..2935caa6339f 100644
--- a/cppcanvas/source/mtfrenderer/outdevstate.hxx
+++ b/cppcanvas/source/mtfrenderer/outdevstate.hxx
@@ -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
@@ -81,7 +81,7 @@ namespace cppcanvas
                 textEmphasisMarkStyle(EMPHASISMARK_NONE),
                 pushFlags(PUSH_ALL),
                 textDirection(::com::sun::star::rendering::TextDirection::WEAK_LEFT_TO_RIGHT),
-                textAlignment(0), // TODO(Q2): Synchronize with implrenderer
+                textAlignment(0), // TODO(Q2): Synchronize with implrenderer 
                                   // and possibly new rendering::TextAlignment
                 textReliefStyle(RELIEF_NONE),
                 textOverlineStyle(UNDERLINE_NONE),
@@ -100,44 +100,44 @@ namespace cppcanvas
             {
             }
 
-            ::basegfx::B2DPolyPolygon                                                           clip;
-            ::Rectangle                                                                         clipRect;
-            ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XPolyPolygon2D >     xClipPoly;
+            ::basegfx::B2DPolyPolygon															clip;
+            ::Rectangle																			clipRect;
+            ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XPolyPolygon2D > 	xClipPoly;
 
-            ::com::sun::star::uno::Sequence< double >                                           lineColor;
-            ::com::sun::star::uno::Sequence< double >                                           fillColor;
-            ::com::sun::star::uno::Sequence< double >                                           textColor;
-            ::com::sun::star::uno::Sequence< double >                                           textFillColor;
-            ::com::sun::star::uno::Sequence< double >                                           textLineColor;
+            ::com::sun::star::uno::Sequence< double >											lineColor;
+            ::com::sun::star::uno::Sequence< double >											fillColor;
+            ::com::sun::star::uno::Sequence< double >											textColor;
+            ::com::sun::star::uno::Sequence< double >											textFillColor;
+            ::com::sun::star::uno::Sequence< double >											textLineColor;
 
             /** Current font.
 
                 @attention Beware, this member can be NULL, and
                 nevertheless text output is generated.
              */
-            ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XCanvasFont >        xFont;
-            ::basegfx::B2DHomMatrix                                                             transform;
-            ::basegfx::B2DHomMatrix                                                             mapModeTransform;
-            double                                                                              fontRotation;
-
-            sal_uInt16                                                                          textEmphasisMarkStyle;
-            sal_uInt16                                                                          pushFlags;
-            sal_Int8                                                                            textDirection;
-            sal_Int8                                                                            textAlignment;
-            sal_Int8                                                                            textReliefStyle;
-            sal_Int8                                                                            textOverlineStyle;
-            sal_Int8                                                                            textUnderlineStyle;
-            sal_Int8                                                                            textStrikeoutStyle;
-            TextAlign                                                                           textReferencePoint;
-
-            bool                                                                                isTextOutlineModeSet;
-            bool                                                                                isTextEffectShadowSet;
-            bool                                                                                isTextWordUnderlineSet;
-
-            bool                                                                                isLineColorSet;
-            bool                                                                                isFillColorSet;
-            bool                                                                                isTextFillColorSet;
-            bool                                                                                isTextLineColorSet;
+            ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XCanvasFont > 		xFont;
+            ::basegfx::B2DHomMatrix																transform;
+            ::basegfx::B2DHomMatrix																mapModeTransform;
+            double																				fontRotation;
+
+            sal_uInt16																			textEmphasisMarkStyle;
+            sal_uInt16																			pushFlags;
+            sal_Int8																			textDirection;
+            sal_Int8																			textAlignment;
+            sal_Int8																			textReliefStyle;
+            sal_Int8																			textOverlineStyle;
+            sal_Int8																			textUnderlineStyle;
+            sal_Int8																			textStrikeoutStyle;
+            TextAlign																			textReferencePoint;
+
+            bool																				isTextOutlineModeSet;
+            bool																				isTextEffectShadowSet;
+            bool																				isTextWordUnderlineSet;
+
+            bool																				isLineColorSet;
+            bool																				isFillColorSet;
+            bool																				isTextFillColorSet;
+            bool																				isTextLineColorSet;
         };
     }
 }
diff --git a/cppcanvas/source/mtfrenderer/pointaction.cxx b/cppcanvas/source/mtfrenderer/pointaction.cxx
index dbdc632af11c..532ac5ff0e1e 100644
--- a/cppcanvas/source/mtfrenderer/pointaction.cxx
+++ b/cppcanvas/source/mtfrenderer/pointaction.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
@@ -49,30 +49,30 @@
 
 using namespace ::com::sun::star;
 
-namespace cppcanvas
-{
+namespace cppcanvas 
+{ 
     namespace internal
     {
         namespace
         {
             class PointAction : public Action, private ::boost::noncopyable
-            {
-            public:
-                PointAction( const ::basegfx::B2DPoint&,
-                             const CanvasSharedPtr&,
-                             const OutDevState& );
-                PointAction( const ::basegfx::B2DPoint&,
-                             const CanvasSharedPtr&,
-                             const OutDevState&,
-                             const ::Color&     );
+            { 
+            public: 
+                PointAction( const ::basegfx::B2DPoint&,  
+                             const CanvasSharedPtr&, 
+                             const OutDevState& ); 
+                PointAction( const ::basegfx::B2DPoint&,  
+                             const CanvasSharedPtr&, 
+                             const OutDevState&, 
+                             const ::Color&		); 
 
                 virtual bool render( const ::basegfx::B2DHomMatrix& rTransformation ) const;
                 virtual bool render( const ::basegfx::B2DHomMatrix& rTransformation,
-                                     const Subset&                  rSubset ) const;
+                                     const Subset&					rSubset ) const;
 
                 virtual ::basegfx::B2DRange getBounds( const ::basegfx::B2DHomMatrix& rTransformation ) const;
-                virtual ::basegfx::B2DRange getBounds( const ::basegfx::B2DHomMatrix&   rTransformation,
-                                                       const Subset&                    rSubset ) const;
+                virtual ::basegfx::B2DRange getBounds( const ::basegfx::B2DHomMatrix&	rTransformation,
+                                                       const Subset&					rSubset ) const;
 
                 virtual sal_Int32 getActionCount() const;
 
@@ -81,14 +81,14 @@ namespace cppcanvas
                 PointAction(const PointAction&);
                 PointAction& operator = ( const PointAction& );
 
-                ::basegfx::B2DPoint                         maPoint;
-                CanvasSharedPtr                             mpCanvas;
-                ::com::sun::star::rendering::RenderState    maState;
+                ::basegfx::B2DPoint							maPoint;
+                CanvasSharedPtr								mpCanvas;
+                ::com::sun::star::rendering::RenderState	maState;
             };
 
-            PointAction::PointAction( const ::basegfx::B2DPoint& rPoint,
-                                      const CanvasSharedPtr&     rCanvas,
-                                      const OutDevState&         rState ) :
+            PointAction::PointAction( const ::basegfx::B2DPoint& rPoint, 
+                                      const CanvasSharedPtr& 	 rCanvas,
+                                      const OutDevState& 		 rState ) :
                 maPoint( rPoint ),
                 mpCanvas( rCanvas ),
                 maState()
@@ -97,16 +97,16 @@ namespace cppcanvas
                 maState.DeviceColor = rState.lineColor;
             }
 
-            PointAction::PointAction( const ::basegfx::B2DPoint& rPoint,
-                                      const CanvasSharedPtr&     rCanvas,
-                                      const OutDevState&         rState,
-                                      const ::Color&             rAltColor ) :
+            PointAction::PointAction( const ::basegfx::B2DPoint& rPoint, 
+                                      const CanvasSharedPtr& 	 rCanvas,
+                                      const OutDevState& 		 rState,
+                                      const ::Color&			 rAltColor ) :
                 maPoint( rPoint ),
                 mpCanvas( rCanvas ),
                 maState()
             {
                 tools::initRenderState(maState,rState);
-                maState.DeviceColor = ::vcl::unotools::colorToDoubleSequence(
+                maState.DeviceColor = ::vcl::unotools::colorToDoubleSequence( 
                     rAltColor,
                     rCanvas->getUNOCanvas()->getDevice()->getDeviceColorSpace() );
             }
@@ -119,15 +119,15 @@ namespace cppcanvas
                 rendering::RenderState aLocalState( maState );
                 ::canvas::tools::prependToRenderState(aLocalState, rTransformation);
 
-                mpCanvas->getUNOCanvas()->drawPoint( ::basegfx::unotools::point2DFromB2DPoint(maPoint),
-                                                     mpCanvas->getViewState(),
+                mpCanvas->getUNOCanvas()->drawPoint( ::basegfx::unotools::point2DFromB2DPoint(maPoint), 
+                                                     mpCanvas->getViewState(), 
                                                      aLocalState );
 
                 return true;
             }
 
-            bool PointAction::render( const ::basegfx::B2DHomMatrix&    rTransformation,
-                                      const Subset&                     rSubset ) const
+            bool PointAction::render( const ::basegfx::B2DHomMatrix&	rTransformation,
+                                      const Subset&						rSubset ) const
             {
                 // point only contains a single action, fail if subset
                 // requests different range
@@ -138,11 +138,11 @@ namespace cppcanvas
                 return render( rTransformation );
             }
 
-            ::basegfx::B2DRange PointAction::getBounds( const ::basegfx::B2DHomMatrix&  rTransformation ) const
+            ::basegfx::B2DRange PointAction::getBounds( const ::basegfx::B2DHomMatrix&	rTransformation ) const
             {
                 rendering::RenderState aLocalState( maState );
                 ::canvas::tools::prependToRenderState(aLocalState, rTransformation);
-
+                
                 return tools::calcDevicePixelBounds( ::basegfx::B2DRange( maPoint.getX()-1,
                                                                           maPoint.getY()-1,
                                                                           maPoint.getX()+1,
@@ -151,8 +151,8 @@ namespace cppcanvas
                                                      aLocalState );
             }
 
-            ::basegfx::B2DRange PointAction::getBounds( const ::basegfx::B2DHomMatrix&  rTransformation,
-                                                        const Subset&                   rSubset ) const
+            ::basegfx::B2DRange PointAction::getBounds( const ::basegfx::B2DHomMatrix&	rTransformation,
+                                                        const Subset&					rSubset ) const
             {
                 // point only contains a single action, empty bounds
                 // if subset requests different range
@@ -169,17 +169,17 @@ namespace cppcanvas
             }
         }
 
-        ActionSharedPtr PointActionFactory::createPointAction( const ::basegfx::B2DPoint& rPoint,
-                                                               const CanvasSharedPtr&     rCanvas,
+        ActionSharedPtr PointActionFactory::createPointAction( const ::basegfx::B2DPoint& rPoint,  
+                                                               const CanvasSharedPtr&     rCanvas, 
                                                                const OutDevState&         rState )
         {
             return ActionSharedPtr( new PointAction( rPoint, rCanvas, rState ) );
         }
-
-        ActionSharedPtr PointActionFactory::createPointAction( const ::basegfx::B2DPoint& rPoint,
-                                                               const CanvasSharedPtr&     rCanvas,
-                                                               const OutDevState&         rState,
-                                                               const ::Color&             rColor    )
+        
+        ActionSharedPtr PointActionFactory::createPointAction( const ::basegfx::B2DPoint& rPoint,  
+                                                               const CanvasSharedPtr&     rCanvas, 
+                                                               const OutDevState&         rState, 
+                                                               const ::Color&             rColor	)
         {
             return ActionSharedPtr( new PointAction( rPoint, rCanvas, rState, rColor ) );
         }
diff --git a/cppcanvas/source/mtfrenderer/pointaction.hxx b/cppcanvas/source/mtfrenderer/pointaction.hxx
index c45b71a7dee6..c27b4187431c 100644
--- a/cppcanvas/source/mtfrenderer/pointaction.hxx
+++ b/cppcanvas/source/mtfrenderer/pointaction.hxx
@@ -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
@@ -38,8 +38,8 @@ namespace basegfx {
 
 /* Definition of internal::PointActionFactory class */
 
-namespace cppcanvas
-{
+namespace cppcanvas 
+{ 
     namespace internal
     {
         struct OutDevState;
@@ -52,18 +52,18 @@ namespace cppcanvas
             text layout) is Canvas-dependent.
          */
         class PointActionFactory
-        {
-        public:
+        { 
+        public: 
             /// Point in current color
-            static ActionSharedPtr createPointAction( const ::basegfx::B2DPoint&,
-                                                      const CanvasSharedPtr&,
-                                                      const OutDevState& );
-
+            static ActionSharedPtr createPointAction( const ::basegfx::B2DPoint&,  
+                                                      const CanvasSharedPtr&, 
+                                                      const OutDevState& ); 
+            
             /// Point in given color
-            static ActionSharedPtr createPointAction( const ::basegfx::B2DPoint&,
-                                                      const CanvasSharedPtr&,
-                                                      const OutDevState&,
-                                                      const ::Color&        );
+            static ActionSharedPtr createPointAction( const ::basegfx::B2DPoint&,  
+                                                      const CanvasSharedPtr&, 
+                                                      const OutDevState&, 
+                                                      const ::Color&		); 
 
         private:
             // static factory, disable big four
@@ -72,7 +72,7 @@ namespace cppcanvas
             PointActionFactory(const PointActionFactory&);
             PointActionFactory& operator=( const PointActionFactory& );
         };
-    }
+    } 
 }
 
 #endif /* _CPPCANVAS_POINTACTION_HXX */
diff --git a/cppcanvas/source/mtfrenderer/polypolyaction.cxx b/cppcanvas/source/mtfrenderer/polypolyaction.cxx
index 13be4652acd8..fad1041cc974 100644
--- a/cppcanvas/source/mtfrenderer/polypolyaction.cxx
+++ b/cppcanvas/source/mtfrenderer/polypolyaction.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
@@ -53,33 +53,33 @@
 
 using namespace ::com::sun::star;
 
-namespace cppcanvas
-{
+namespace cppcanvas 
+{ 
     namespace internal
     {
         namespace
         {
             class PolyPolyAction : public CachedPrimitiveBase
-            {
-            public:
-                PolyPolyAction( const ::basegfx::B2DPolyPolygon&,
-                                const CanvasSharedPtr&,
+            { 
+            public: 
+                PolyPolyAction( const ::basegfx::B2DPolyPolygon&,  
+                                const CanvasSharedPtr&, 
                                 const OutDevState&,
                                 bool bFill,
-                                bool bStroke );
-                PolyPolyAction( const ::basegfx::B2DPolyPolygon&,
-                                const CanvasSharedPtr&,
+                                bool bStroke ); 
+                PolyPolyAction( const ::basegfx::B2DPolyPolygon&,  
+                                const CanvasSharedPtr&, 
                                 const OutDevState&,
                                 bool bFill,
                                 bool bStroke,
-                                int nTransparency );
+                                int nTransparency ); 
 
                 virtual bool render( const ::basegfx::B2DHomMatrix& rTransformation,
-                                     const Subset&                  rSubset ) const;
+                                     const Subset&					rSubset ) const;
 
                 virtual ::basegfx::B2DRange getBounds( const ::basegfx::B2DHomMatrix& rTransformation ) const;
-                virtual ::basegfx::B2DRange getBounds( const ::basegfx::B2DHomMatrix&   rTransformation,
-                                                       const Subset&                    rSubset ) const;
+                virtual ::basegfx::B2DRange getBounds( const ::basegfx::B2DHomMatrix&	rTransformation,
+                                                       const Subset&					rSubset ) const;
 
                 virtual sal_Int32 getActionCount() const;
 
@@ -88,17 +88,17 @@ namespace cppcanvas
                 virtual bool render( uno::Reference< rendering::XCachedPrimitive >& rCachedPrimitive,
                                      const ::basegfx::B2DHomMatrix&                 rTransformation ) const;
 
-                const uno::Reference< rendering::XPolyPolygon2D >   mxPolyPoly;
-                const ::basegfx::B2DRange                           maBounds;
-                const CanvasSharedPtr                               mpCanvas;
+                const uno::Reference< rendering::XPolyPolygon2D > 	mxPolyPoly;
+                const ::basegfx::B2DRange							maBounds;
+                const CanvasSharedPtr								mpCanvas;
 
                 // stroke color is now implicit: the maState.DeviceColor member
-                rendering::RenderState                              maState;
-
-                uno::Sequence< double >                             maFillColor;
+                rendering::RenderState								maState;
+                        
+                uno::Sequence< double >								maFillColor;
             };
 
-            PolyPolyAction::PolyPolyAction( const ::basegfx::B2DPolyPolygon&    rPolyPoly,
+            PolyPolyAction::PolyPolyAction( const ::basegfx::B2DPolyPolygon&	rPolyPoly, 
                                             const CanvasSharedPtr&              rCanvas,
                                             const OutDevState&                  rState,
                                             bool                                bFill,
@@ -114,12 +114,12 @@ namespace cppcanvas
 
                 if( bFill )
                     maFillColor = rState.fillColor;
-
+        
                 if( bStroke )
                     maState.DeviceColor = rState.lineColor;
             }
 
-            PolyPolyAction::PolyPolyAction( const ::basegfx::B2DPolyPolygon&    rPolyPoly,
+            PolyPolyAction::PolyPolyAction( const ::basegfx::B2DPolyPolygon&	rPolyPoly, 
                                             const CanvasSharedPtr&              rCanvas,
                                             const OutDevState&                  rState,
                                             bool                                bFill,
@@ -145,7 +145,7 @@ namespace cppcanvas
                     // adapt fill color transparency
                     maFillColor[3] = 1.0 - nTransparency / 100.0;
                 }
-
+        
                 if( bStroke )
                 {
                     maState.DeviceColor = rState.lineColor;
@@ -170,13 +170,13 @@ namespace cppcanvas
 
 #ifdef SPECIAL_DEBUG
                 aLocalState.Clip.clear();
-                aLocalState.DeviceColor =
+                aLocalState.DeviceColor = 
                     ::vcl::unotools::colorToDoubleSequence( mpCanvas->getUNOCanvas()->getDevice(),
                                                             ::Color( 0x80FF0000 ) );
 
                 if( maState.Clip.is() )
-                    mpCanvas->getUNOCanvas()->fillPolyPolygon( maState.Clip,
-                                                               mpCanvas->getViewState(),
+                    mpCanvas->getUNOCanvas()->fillPolyPolygon( maState.Clip, 
+                                                               mpCanvas->getViewState(), 
                                                                aLocalState );
 
                 aLocalState.DeviceColor = maState.DeviceColor;
@@ -188,17 +188,17 @@ namespace cppcanvas
                     // fillPolyPolygon() might throw
                     const uno::Sequence< double > aTmpColor( aLocalState.DeviceColor );
                     aLocalState.DeviceColor = maFillColor;
-
-                    rCachedPrimitive = mpCanvas->getUNOCanvas()->fillPolyPolygon( mxPolyPoly,
+                    
+                    rCachedPrimitive = mpCanvas->getUNOCanvas()->fillPolyPolygon( mxPolyPoly, 
                                                                                   mpCanvas->getViewState(),
                                                                                   aLocalState );
-
+                    
                     aLocalState.DeviceColor = aTmpColor;
                 }
-
+                
                 if( aLocalState.DeviceColor.getLength() )
                 {
-                    rCachedPrimitive = mpCanvas->getUNOCanvas()->drawPolyPolygon( mxPolyPoly,
+                    rCachedPrimitive = mpCanvas->getUNOCanvas()->drawPolyPolygon( mxPolyPoly, 
                                                                                   mpCanvas->getViewState(),
                                                                                   aLocalState );
                 }
@@ -206,8 +206,8 @@ namespace cppcanvas
                 return true;
             }
 
-            bool PolyPolyAction::render( const ::basegfx::B2DHomMatrix& rTransformation,
-                                         const Subset&                  rSubset ) const
+            bool PolyPolyAction::render( const ::basegfx::B2DHomMatrix&	rTransformation,
+                                         const Subset&					rSubset ) const
             {
                 // TODO(F1): Split up poly-polygon into polygons, or even
                 // line segments, when subsets are requested.
@@ -221,19 +221,19 @@ namespace cppcanvas
                 return CachedPrimitiveBase::render( rTransformation );
             }
 
-            ::basegfx::B2DRange PolyPolyAction::getBounds( const ::basegfx::B2DHomMatrix&   rTransformation ) const
+            ::basegfx::B2DRange PolyPolyAction::getBounds( const ::basegfx::B2DHomMatrix&	rTransformation ) const
             {
                 rendering::RenderState aLocalState( maState );
                 ::canvas::tools::prependToRenderState(aLocalState, rTransformation);
-
-                return tools::calcDevicePixelBounds(
+                
+                return tools::calcDevicePixelBounds( 
                     maBounds,
                     mpCanvas->getViewState(),
                     aLocalState );
             }
 
-            ::basegfx::B2DRange PolyPolyAction::getBounds( const ::basegfx::B2DHomMatrix&   rTransformation,
-                                                           const Subset&                    rSubset ) const
+            ::basegfx::B2DRange PolyPolyAction::getBounds( const ::basegfx::B2DHomMatrix&	rTransformation,
+                                                           const Subset&					rSubset ) const
             {
                 // TODO(F1): Split up poly-polygon into polygons, or even
                 // line segments, when subsets are requested.
@@ -258,19 +258,19 @@ namespace cppcanvas
             // -------------------------------------------------------------------------------
 
             class TexturedPolyPolyAction : public CachedPrimitiveBase
-            {
-            public:
+            { 
+            public: 
                 TexturedPolyPolyAction( const ::basegfx::B2DPolyPolygon& rPoly,
-                                        const CanvasSharedPtr&           rCanvas,
-                                        const OutDevState&               rState,
-                                        const rendering::Texture&        rTexture );
+                                        const CanvasSharedPtr&		     rCanvas, 
+                                        const OutDevState&			     rState,
+                                        const rendering::Texture& 	     rTexture ); 
 
                 virtual bool render( const ::basegfx::B2DHomMatrix& rTransformation,
-                                     const Subset&                  rSubset ) const;
+                                     const Subset&					rSubset ) const;
 
                 virtual ::basegfx::B2DRange getBounds( const ::basegfx::B2DHomMatrix& rTransformation ) const;
-                virtual ::basegfx::B2DRange getBounds( const ::basegfx::B2DHomMatrix&   rTransformation,
-                                                       const Subset&                    rSubset ) const;
+                virtual ::basegfx::B2DRange getBounds( const ::basegfx::B2DHomMatrix&	rTransformation,
+                                                       const Subset&					rSubset ) const;
 
                 virtual sal_Int32 getActionCount() const;
 
@@ -279,19 +279,19 @@ namespace cppcanvas
                 virtual bool render( uno::Reference< rendering::XCachedPrimitive >& rCachedPrimitive,
                                      const ::basegfx::B2DHomMatrix&                 rTransformation ) const;
 
-                const uno::Reference< rendering::XPolyPolygon2D >   mxPolyPoly;
-                const ::basegfx::B2DRectangle                       maBounds;
-                const CanvasSharedPtr                               mpCanvas;
+                const uno::Reference< rendering::XPolyPolygon2D >	mxPolyPoly;
+                const ::basegfx::B2DRectangle						maBounds;
+                const CanvasSharedPtr								mpCanvas;
 
                 // stroke color is now implicit: the maState.DeviceColor member
-                rendering::RenderState                              maState;
-                const rendering::Texture                            maTexture;
+                rendering::RenderState								maState;
+                const rendering::Texture							maTexture;
             };
 
-            TexturedPolyPolyAction::TexturedPolyPolyAction( const ::basegfx::B2DPolyPolygon& rPolyPoly,
-                                                            const CanvasSharedPtr&           rCanvas,
-                                                            const OutDevState&               rState,
-                                                            const rendering::Texture&        rTexture ) :
+            TexturedPolyPolyAction::TexturedPolyPolyAction( const ::basegfx::B2DPolyPolygon& rPolyPoly, 
+                                                            const CanvasSharedPtr&		     rCanvas,
+                                                            const OutDevState& 			     rState,
+                                                            const rendering::Texture& 	     rTexture ) :
                 CachedPrimitiveBase( rCanvas, true ),
                 mxPolyPoly( ::basegfx::unotools::xPolyPolygonFromB2DPolyPolygon( rCanvas->getUNOCanvas()->getDevice(), rPolyPoly) ),
                 maBounds( ::basegfx::tools::getRange(rPolyPoly) ),
@@ -313,16 +313,16 @@ namespace cppcanvas
 
                 uno::Sequence< rendering::Texture > aSeq(1);
                 aSeq[0] = maTexture;
-
-                rCachedPrimitive = mpCanvas->getUNOCanvas()->fillTexturedPolyPolygon( mxPolyPoly,
+                
+                rCachedPrimitive = mpCanvas->getUNOCanvas()->fillTexturedPolyPolygon( mxPolyPoly, 
                                                                                       mpCanvas->getViewState(),
                                                                                       aLocalState,
                                                                                       aSeq );
                 return true;
             }
 
-            bool TexturedPolyPolyAction::render( const ::basegfx::B2DHomMatrix& rTransformation,
-                                                 const Subset&                  rSubset ) const
+            bool TexturedPolyPolyAction::render( const ::basegfx::B2DHomMatrix&	rTransformation,
+                                                 const Subset&					rSubset ) const
             {
                 // TODO(F1): Split up poly-polygon into polygons, or even
                 // line segments, when subsets are requested.
@@ -336,19 +336,19 @@ namespace cppcanvas
                 return CachedPrimitiveBase::render( rTransformation );
             }
 
-            ::basegfx::B2DRange TexturedPolyPolyAction::getBounds( const ::basegfx::B2DHomMatrix&   rTransformation ) const
+            ::basegfx::B2DRange TexturedPolyPolyAction::getBounds( const ::basegfx::B2DHomMatrix&	rTransformation ) const
             {
                 rendering::RenderState aLocalState( maState );
                 ::canvas::tools::prependToRenderState(aLocalState, rTransformation);
-
-                return tools::calcDevicePixelBounds(
+                
+                return tools::calcDevicePixelBounds( 
                     maBounds,
                     mpCanvas->getViewState(),
                     aLocalState );
             }
 
-            ::basegfx::B2DRange TexturedPolyPolyAction::getBounds( const ::basegfx::B2DHomMatrix&   rTransformation,
-                                                                   const Subset&                    rSubset ) const
+            ::basegfx::B2DRange TexturedPolyPolyAction::getBounds( const ::basegfx::B2DHomMatrix&	rTransformation,
+                                                                   const Subset&					rSubset ) const
             {
                 // TODO(F1): Split up poly-polygon into polygons, or even
                 // line segments, when subsets are requested.
@@ -372,19 +372,19 @@ namespace cppcanvas
             // -------------------------------------------------------------------------------
 
             class StrokedPolyPolyAction : public CachedPrimitiveBase
-            {
-            public:
+            { 
+            public: 
                 StrokedPolyPolyAction( const ::basegfx::B2DPolyPolygon&     rPoly,
-                                       const CanvasSharedPtr&               rCanvas,
-                                       const OutDevState&                   rState,
-                                       const rendering::StrokeAttributes&   rStrokeAttributes );
+                                       const CanvasSharedPtr&				rCanvas, 
+                                       const OutDevState&					rState,
+                                       const rendering::StrokeAttributes&	rStrokeAttributes ); 
 
                 virtual bool render( const ::basegfx::B2DHomMatrix& rTransformation,
-                                     const Subset&                  rSubset ) const;
+                                     const Subset&					rSubset ) const;
 
                 virtual ::basegfx::B2DRange getBounds( const ::basegfx::B2DHomMatrix& rTransformation ) const;
-                virtual ::basegfx::B2DRange getBounds( const ::basegfx::B2DHomMatrix&   rTransformation,
-                                                       const Subset&                    rSubset ) const;
+                virtual ::basegfx::B2DRange getBounds( const ::basegfx::B2DHomMatrix&	rTransformation,
+                                                       const Subset&					rSubset ) const;
 
                 virtual sal_Int32 getActionCount() const;
 
@@ -393,17 +393,17 @@ namespace cppcanvas
                 virtual bool render( uno::Reference< rendering::XCachedPrimitive >& rCachedPrimitive,
                                      const ::basegfx::B2DHomMatrix&                 rTransformation ) const;
 
-                const uno::Reference< rendering::XPolyPolygon2D >   mxPolyPoly;
-                const ::basegfx::B2DRectangle                       maBounds;
-                const CanvasSharedPtr                               mpCanvas;
-                rendering::RenderState                              maState;
-                const rendering::StrokeAttributes                   maStrokeAttributes;
+                const uno::Reference< rendering::XPolyPolygon2D >	mxPolyPoly;
+                const ::basegfx::B2DRectangle						maBounds;
+                const CanvasSharedPtr								mpCanvas;
+                rendering::RenderState								maState;
+                const rendering::StrokeAttributes					maStrokeAttributes;
             };
 
-            StrokedPolyPolyAction::StrokedPolyPolyAction( const ::basegfx::B2DPolyPolygon&      rPolyPoly,
-                                                          const CanvasSharedPtr&                rCanvas,
-                                                          const OutDevState&                    rState,
-                                                          const rendering::StrokeAttributes&    rStrokeAttributes ) :
+            StrokedPolyPolyAction::StrokedPolyPolyAction( const ::basegfx::B2DPolyPolygon&      rPolyPoly, 
+                                                          const CanvasSharedPtr&				rCanvas,
+                                                          const OutDevState& 					rState,
+                                                          const rendering::StrokeAttributes&	rStrokeAttributes ) :
                 CachedPrimitiveBase( rCanvas, false ),
                 mxPolyPoly( ::basegfx::unotools::xPolyPolygonFromB2DPolyPolygon( rCanvas->getUNOCanvas()->getDevice(), rPolyPoly) ),
                 maBounds( ::basegfx::tools::getRange(rPolyPoly) ),
@@ -424,15 +424,15 @@ namespace cppcanvas
                 rendering::RenderState aLocalState( maState );
                 ::canvas::tools::prependToRenderState(aLocalState, rTransformation);
 
-                rCachedPrimitive = mpCanvas->getUNOCanvas()->strokePolyPolygon( mxPolyPoly,
+                rCachedPrimitive = mpCanvas->getUNOCanvas()->strokePolyPolygon( mxPolyPoly, 
                                                                                 mpCanvas->getViewState(),
                                                                                 aLocalState,
                                                                                 maStrokeAttributes );
                 return true;
             }
 
-            bool StrokedPolyPolyAction::render( const ::basegfx::B2DHomMatrix&  rTransformation,
-                                                const Subset&                   rSubset ) const
+            bool StrokedPolyPolyAction::render( const ::basegfx::B2DHomMatrix&	rTransformation,
+                                                const Subset&					rSubset ) const
             {
                 // TODO(F1): Split up poly-polygon into polygons, or even
                 // line segments, when subsets are requested.
@@ -446,19 +446,19 @@ namespace cppcanvas
                 return CachedPrimitiveBase::render( rTransformation );
             }
 
-            ::basegfx::B2DRange StrokedPolyPolyAction::getBounds( const ::basegfx::B2DHomMatrix&    rTransformation ) const
+            ::basegfx::B2DRange StrokedPolyPolyAction::getBounds( const ::basegfx::B2DHomMatrix&	rTransformation ) const
             {
                 rendering::RenderState aLocalState( maState );
                 ::canvas::tools::prependToRenderState(aLocalState, rTransformation);
-
-                return tools::calcDevicePixelBounds(
+                
+                return tools::calcDevicePixelBounds( 
                     maBounds,
                     mpCanvas->getViewState(),
                     aLocalState );
             }
 
-            ::basegfx::B2DRange StrokedPolyPolyAction::getBounds( const ::basegfx::B2DHomMatrix&    rTransformation,
-                                                                  const Subset&                 rSubset ) const
+            ::basegfx::B2DRange StrokedPolyPolyAction::getBounds( const ::basegfx::B2DHomMatrix&	rTransformation,
+                                                                  const Subset&					rSubset ) const
             {
                 // TODO(F1): Split up poly-polygon into polygons, or even
                 // line segments, when subsets are requested.
@@ -480,40 +480,40 @@ namespace cppcanvas
             }
         }
 
-        ActionSharedPtr PolyPolyActionFactory::createPolyPolyAction( const ::basegfx::B2DPolyPolygon& rPoly,
-                                                                     const CanvasSharedPtr&           rCanvas,
-                                                                     const OutDevState&               rState    )
+        ActionSharedPtr PolyPolyActionFactory::createPolyPolyAction( const ::basegfx::B2DPolyPolygon& rPoly,  
+                                                                     const CanvasSharedPtr&           rCanvas, 
+                                                                     const OutDevState&               rState	)
         {
             OSL_ENSURE( rState.isLineColorSet || rState.isFillColorSet,
                         "PolyPolyActionFactory::createPolyPolyAction() with empty line and fill color" );
-            return ActionSharedPtr( new PolyPolyAction( rPoly, rCanvas, rState,
-                                                        rState.isFillColorSet,
+            return ActionSharedPtr( new PolyPolyAction( rPoly, rCanvas, rState, 
+                                                        rState.isFillColorSet, 
                                                         rState.isLineColorSet ) );
         }
 
-        ActionSharedPtr PolyPolyActionFactory::createPolyPolyAction( const ::basegfx::B2DPolyPolygon&   rPoly,
-                                                                     const CanvasSharedPtr&             rCanvas,
+        ActionSharedPtr PolyPolyActionFactory::createPolyPolyAction( const ::basegfx::B2DPolyPolygon&   rPoly,  
+                                                                     const CanvasSharedPtr&             rCanvas, 
                                                                      const OutDevState&                 rState,
                                                                      const rendering::Texture&          rTexture )
         {
             return ActionSharedPtr( new TexturedPolyPolyAction( rPoly, rCanvas, rState, rTexture ) );
         }
 
-        ActionSharedPtr PolyPolyActionFactory::createLinePolyPolyAction( const ::basegfx::B2DPolyPolygon& rPoly,
-                                                                         const CanvasSharedPtr&           rCanvas,
+        ActionSharedPtr PolyPolyActionFactory::createLinePolyPolyAction( const ::basegfx::B2DPolyPolygon& rPoly,  
+                                                                         const CanvasSharedPtr&           rCanvas, 
                                                                          const OutDevState&               rState )
         {
             OSL_ENSURE( rState.isLineColorSet,
                         "PolyPolyActionFactory::createLinePolyPolyAction() called with empty line color" );
 
-            return ActionSharedPtr( new PolyPolyAction( rPoly, rCanvas, rState,
-                                                        false,
+            return ActionSharedPtr( new PolyPolyAction( rPoly, rCanvas, rState, 
+                                                        false, 
                                                         rState.isLineColorSet ) );
         }
-
-        ActionSharedPtr PolyPolyActionFactory::createPolyPolyAction( const ::basegfx::B2DPolyPolygon&   rPoly,
-                                                                     const CanvasSharedPtr&             rCanvas,
-                                                                     const OutDevState&                 rState,
+        
+        ActionSharedPtr PolyPolyActionFactory::createPolyPolyAction( const ::basegfx::B2DPolyPolygon&   rPoly,	  
+                                                                     const CanvasSharedPtr&				rCanvas, 
+                                                                     const OutDevState&					rState,
                                                                      const rendering::StrokeAttributes& rStrokeAttributes )
         {
             OSL_ENSURE( rState.isLineColorSet,
@@ -521,15 +521,15 @@ namespace cppcanvas
             return ActionSharedPtr( new StrokedPolyPolyAction( rPoly, rCanvas, rState, rStrokeAttributes ) );
         }
 
-        ActionSharedPtr PolyPolyActionFactory::createPolyPolyAction( const ::basegfx::B2DPolyPolygon& rPoly,
-                                                                     const CanvasSharedPtr&           rCanvas,
+        ActionSharedPtr PolyPolyActionFactory::createPolyPolyAction( const ::basegfx::B2DPolyPolygon& rPoly,  
+                                                                     const CanvasSharedPtr&           rCanvas, 
                                                                      const OutDevState&               rState,
-                                                                     int                              nTransparency     )
+                                                                     int                              nTransparency 	)
         {
             OSL_ENSURE( rState.isLineColorSet || rState.isFillColorSet,
                         "PolyPolyActionFactory::createPolyPolyAction() with empty line and fill color" );
-            return ActionSharedPtr( new PolyPolyAction( rPoly, rCanvas, rState,
-                                                        rState.isFillColorSet,
+            return ActionSharedPtr( new PolyPolyAction( rPoly, rCanvas, rState, 
+                                                        rState.isFillColorSet, 
                                                         rState.isLineColorSet,
                                                         nTransparency ) );
         }
diff --git a/cppcanvas/source/mtfrenderer/polypolyaction.hxx b/cppcanvas/source/mtfrenderer/polypolyaction.hxx
index 4ae85a2c3d5d..afabed23a94d 100644
--- a/cppcanvas/source/mtfrenderer/polypolyaction.hxx
+++ b/cppcanvas/source/mtfrenderer/polypolyaction.hxx
@@ -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
@@ -44,8 +44,8 @@ namespace com { namespace sun { namespace star { namespace rendering
 
 /* Definition of internal::PolyPolyActionFactory class */
 
-namespace cppcanvas
-{
+namespace cppcanvas 
+{ 
     namespace internal
     {
         struct OutDevState;
@@ -58,35 +58,35 @@ namespace cppcanvas
             text layout) is Canvas-dependent.
          */
         class PolyPolyActionFactory
-        {
-        public:
+        { 
+        public: 
             /// Create polygon, fill/stroke according to state
-            static ActionSharedPtr createPolyPolyAction( const ::basegfx::B2DPolyPolygon&,
-                                                         const CanvasSharedPtr&,
-                                                         const OutDevState&     );
+            static ActionSharedPtr createPolyPolyAction( const ::basegfx::B2DPolyPolygon&,  
+                                                         const CanvasSharedPtr&, 
+                                                         const OutDevState& 	); 
 
             /// Create texture-filled polygon
-            static ActionSharedPtr createPolyPolyAction( const ::basegfx::B2DPolyPolygon&,
-                                                         const CanvasSharedPtr&,
+            static ActionSharedPtr createPolyPolyAction( const ::basegfx::B2DPolyPolygon&,  
+                                                         const CanvasSharedPtr&, 
                                                          const OutDevState&,
-                                                         const ::com::sun::star::rendering::Texture& );
+                                                         const ::com::sun::star::rendering::Texture& ); 
 
             /// Create line polygon (always stroked, not filled)
-            static ActionSharedPtr createLinePolyPolyAction( const ::basegfx::B2DPolyPolygon&,
-                                                             const CanvasSharedPtr&,
-                                                             const OutDevState& );
+            static ActionSharedPtr createLinePolyPolyAction( const ::basegfx::B2DPolyPolygon&,  
+                                                             const CanvasSharedPtr&, 
+                                                             const OutDevState& ); 
 
             /// Create stroked polygon
-            static ActionSharedPtr createPolyPolyAction( const ::basegfx::B2DPolyPolygon&,
-                                                         const CanvasSharedPtr&,
+            static ActionSharedPtr createPolyPolyAction( const ::basegfx::B2DPolyPolygon&,  
+                                                         const CanvasSharedPtr&, 
                                                          const OutDevState&,
-                                                         const ::com::sun::star::rendering::StrokeAttributes& );
+                                                         const ::com::sun::star::rendering::StrokeAttributes& ); 
 
             /// For transparent painting of the given polygon (normally, we take the colors always opaque)
-            static ActionSharedPtr createPolyPolyAction( const ::basegfx::B2DPolyPolygon&,
-                                                         const CanvasSharedPtr&,
+            static ActionSharedPtr createPolyPolyAction( const ::basegfx::B2DPolyPolygon&,  
+                                                         const CanvasSharedPtr&, 
                                                          const OutDevState&,
-                                                         int nTransparency );
+                                                         int nTransparency ); 
 
         private:
             // static factory, disable big four
@@ -95,7 +95,7 @@ namespace cppcanvas
             PolyPolyActionFactory(const PolyPolyActionFactory&);
             PolyPolyActionFactory& operator=( const PolyPolyActionFactory& );
         };
-    }
+    } 
 }
 
 #endif /* _CPPCANVAS_POLYPOLYACTION_HXX */
diff --git a/cppcanvas/source/mtfrenderer/textaction.cxx b/cppcanvas/source/mtfrenderer/textaction.cxx
index bc4cf6688ca3..55aad51aa6b8 100644
--- a/cppcanvas/source/mtfrenderer/textaction.cxx
+++ b/cppcanvas/source/mtfrenderer/textaction.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
@@ -71,10 +71,10 @@ namespace cppcanvas
     {
         namespace
         {
-            void init( rendering::RenderState&                  o_rRenderState,
-                       const ::basegfx::B2DPoint&               rStartPoint,
-                       const OutDevState&                       rState,
-                       const CanvasSharedPtr&                   rCanvas      )
+            void init( rendering::RenderState&					o_rRenderState,
+                       const ::basegfx::B2DPoint&				rStartPoint, 
+                       const OutDevState& 						rState,
+                       const CanvasSharedPtr& 					rCanvas		 )
             {
                 tools::initRenderState(o_rRenderState,rState);
 
@@ -84,10 +84,10 @@ namespace cppcanvas
                 // since this, opposed to the FontMatrix rotation
                 // elsewhere, _does_ get incorporated into the render
                 // state transform.
-                tools::modifyClip( o_rRenderState,
-                                   rState,
-                                   rCanvas,
-                                   rStartPoint,
+                tools::modifyClip( o_rRenderState, 
+                                   rState, 
+                                   rCanvas, 
+                                   rStartPoint, 
                                    NULL,
                                    &rState.fontRotation );
 
@@ -100,11 +100,11 @@ namespace cppcanvas
                 o_rRenderState.DeviceColor = rState.textColor;
             }
 
-            void init( rendering::RenderState&                  o_rRenderState,
-                       const ::basegfx::B2DPoint&               rStartPoint,
-                       const OutDevState&                       rState,
-                       const CanvasSharedPtr&                   rCanvas,
-                       const ::basegfx::B2DHomMatrix&           rTextTransform  )
+            void init( rendering::RenderState&					o_rRenderState,
+                       const ::basegfx::B2DPoint&				rStartPoint, 
+                       const OutDevState& 						rState,
+                       const CanvasSharedPtr& 					rCanvas,
+                       const ::basegfx::B2DHomMatrix&			rTextTransform	)
             {
                 init( o_rRenderState, rStartPoint, rState, rCanvas );
 
@@ -119,11 +119,11 @@ namespace cppcanvas
                                                        rTextTransform );
             }
 
-            void init( rendering::RenderState&                      o_rRenderState,
-                       uno::Reference< rendering::XCanvasFont >&    o_rFont,
-                       const ::basegfx::B2DPoint&                   rStartPoint,
-                       const OutDevState&                           rState,
-                       const CanvasSharedPtr&                       rCanvas      )
+            void init( rendering::RenderState&						o_rRenderState,
+                       uno::Reference< rendering::XCanvasFont >&	o_rFont,
+                       const ::basegfx::B2DPoint&					rStartPoint, 
+                       const OutDevState& 							rState,
+                       const CanvasSharedPtr& 						rCanvas		 )
             {
                 // ensure that o_rFont is valid. It is possible that
                 // text actions are generated without previously
@@ -136,24 +136,24 @@ namespace cppcanvas
                     geometry::Matrix2D aFontMatrix;
                     ::canvas::tools::setIdentityMatrix2D( aFontMatrix );
 
-                    o_rFont = rCanvas->getUNOCanvas()->createFont(
+                    o_rFont = rCanvas->getUNOCanvas()->createFont( 
                         aFontRequest,
                         uno::Sequence< beans::PropertyValue >(),
                         aFontMatrix );
                 }
 
                 init( o_rRenderState,
-                      rStartPoint,
+                      rStartPoint, 
                       rState,
                       rCanvas );
             }
 
-            void init( rendering::RenderState&                      o_rRenderState,
-                       uno::Reference< rendering::XCanvasFont >&    o_rFont,
-                       const ::basegfx::B2DPoint&                   rStartPoint,
-                       const OutDevState&                           rState,
-                       const CanvasSharedPtr&                       rCanvas,
-                       const ::basegfx::B2DHomMatrix&               rTextTransform  )
+            void init( rendering::RenderState&						o_rRenderState,
+                       uno::Reference< rendering::XCanvasFont >&	o_rFont,
+                       const ::basegfx::B2DPoint&					rStartPoint, 
+                       const OutDevState& 							rState,
+                       const CanvasSharedPtr& 						rCanvas,
+                       const ::basegfx::B2DHomMatrix&				rTextTransform	)
             {
                 init( o_rRenderState, o_rFont, rStartPoint, rState, rCanvas );
 
@@ -168,25 +168,25 @@ namespace cppcanvas
                                                        rTextTransform );
             }
 
-            ::basegfx::B2DPolyPolygon textLinesFromLogicalOffsets( const uno::Sequence< double >&   rOffsets,
-                                                                   const tools::TextLineInfo&       rTextLineInfo )
+            ::basegfx::B2DPolyPolygon textLinesFromLogicalOffsets( const uno::Sequence< double >&	rOffsets,
+                                                                   const tools::TextLineInfo&		rTextLineInfo )
             {
-                return tools::createTextLinesPolyPolygon(
-                    0.0,
+                return tools::createTextLinesPolyPolygon( 
+                    0.0, 
                     // extract character cell furthest to the right
-                    *(::std::max_element(
+                    *(::std::max_element( 
                           rOffsets.getConstArray(),
-                          rOffsets.getConstArray() + rOffsets.getLength() )),
+                          rOffsets.getConstArray() + rOffsets.getLength() )), 
                     rTextLineInfo );
             }
 
-            uno::Sequence< double > setupDXArray( const sal_Int32*   pCharWidths,
-                                                  sal_Int32          nLen,
+            uno::Sequence< double > setupDXArray( const sal_Int32*	 pCharWidths,
+                                                  sal_Int32			 nLen,
                                                   const OutDevState& rState )
             {
                 // convert character widths from logical units
                 uno::Sequence< double > aCharWidthSeq( nLen );
-                double*                 pOutputWidths( aCharWidthSeq.getArray() );
+                double*					pOutputWidths( aCharWidthSeq.getArray() );
 
                 // #143885# maintain (nearly) full precision of DX
                 // array, by circumventing integer-based
@@ -197,29 +197,29 @@ namespace cppcanvas
                     // TODO(F2): use correct scale direction
                     *pOutputWidths++ = *pCharWidths++ * nScale;
                 }
-
+                
                 return aCharWidthSeq;
             }
 
-            uno::Sequence< double > setupDXArray( const ::String&    rText,
-                                                  sal_Int32          nStartPos,
-                                                  sal_Int32          nLen,
-                                                  VirtualDevice&     rVDev,
+            uno::Sequence< double > setupDXArray( const ::String& 	 rText,
+                                                  sal_Int32			 nStartPos,
+                                                  sal_Int32			 nLen,
+                                                  VirtualDevice&	 rVDev,
                                                   const OutDevState& rState )
             {
                 // no external DX array given, create one from given
                 // string
                 ::boost::scoped_array< sal_Int32 > pCharWidths( new sal_Int32[nLen] );
 
-                rVDev.GetTextArray( rText, pCharWidths.get(),
-                                    static_cast<USHORT>(nStartPos),
+                rVDev.GetTextArray( rText, pCharWidths.get(), 
+                                    static_cast<USHORT>(nStartPos), 
                                     static_cast<USHORT>(nLen) );
 
                 return setupDXArray( pCharWidths.get(), nLen, rState );
             }
 
-            ::basegfx::B2DPoint adaptStartPoint( const ::basegfx::B2DPoint&     rStartPoint,
-                                                 const OutDevState&             rState,
+            ::basegfx::B2DPoint adaptStartPoint( const ::basegfx::B2DPoint&		rStartPoint,
+                                                 const OutDevState& 			rState, 
                                                  const uno::Sequence< double >& rOffsets )
             {
                 ::basegfx::B2DPoint aLocalPoint( rStartPoint );
@@ -240,27 +240,27 @@ namespace cppcanvas
 
                 return aLocalPoint;
             }
-
+            
             /** Perform common setup for array text actions
 
                 This method creates the XTextLayout object and
                 initializes it, e.g. with the logical advancements.
              */
-            void initArrayAction( rendering::RenderState&                   o_rRenderState,
-                                  uno::Reference< rendering::XTextLayout >& o_rTextLayout,
-                                  const ::basegfx::B2DPoint&                rStartPoint,
-                                  const ::rtl::OUString&                    rText,
-                                  sal_Int32                                 nStartPos,
-                                  sal_Int32                                 nLen,
-                                  const uno::Sequence< double >&            rOffsets,
-                                  const CanvasSharedPtr&                    rCanvas,
-                                  const OutDevState&                        rState,
-                                  const ::basegfx::B2DHomMatrix*            pTextTransform )
+            void initArrayAction( rendering::RenderState&					o_rRenderState,
+                                  uno::Reference< rendering::XTextLayout >& o_rTextLayout,	
+                                  const ::basegfx::B2DPoint&				rStartPoint,
+                                  const ::rtl::OUString&					rText,
+                                  sal_Int32 								nStartPos,
+                                  sal_Int32 								nLen,
+                                  const uno::Sequence< double >&			rOffsets,
+                                  const CanvasSharedPtr&					rCanvas,
+                                  const OutDevState&						rState,
+                                  const ::basegfx::B2DHomMatrix*			pTextTransform )
             {
                 ENSURE_OR_THROW( rOffsets.getLength(),
                                   "::cppcanvas::internal::initArrayAction(): zero-length DX array" );
 
-                const ::basegfx::B2DPoint aLocalStartPoint(
+                const ::basegfx::B2DPoint aLocalStartPoint( 
                     adaptStartPoint( rStartPoint, rState, rOffsets ) );
 
                 uno::Reference< rendering::XCanvasFont > xFont( rState.xFont );
@@ -270,9 +270,9 @@ namespace cppcanvas
                 else
                     init( o_rRenderState, xFont, aLocalStartPoint, rState, rCanvas );
 
-                o_rTextLayout = xFont->createTextLayout(
-                    rendering::StringContext( rText, nStartPos, nLen ),
-                    rState.textDirection,
+                o_rTextLayout = xFont->createTextLayout( 
+                    rendering::StringContext( rText, nStartPos, nLen ), 
+                    rState.textDirection, 
                     0 );
 
                 ENSURE_OR_THROW( o_rTextLayout.is(),
@@ -281,31 +281,31 @@ namespace cppcanvas
                 o_rTextLayout->applyLogicalAdvancements( rOffsets );
             }
 
-            double getLineWidth( ::VirtualDevice&                rVDev,
-                                 const OutDevState&              rState,
+            double getLineWidth( ::VirtualDevice&                rVDev, 
+                                 const OutDevState&              rState, 
                                  const rendering::StringContext& rStringContext )
             {
                 // TODO(F2): use correct scale direction
-                const ::basegfx::B2DSize aSize( rVDev.GetTextWidth( rStringContext.Text,
-                                                                    static_cast<USHORT>(rStringContext.StartPosition),
+                const ::basegfx::B2DSize aSize( rVDev.GetTextWidth( rStringContext.Text, 
+                                                                    static_cast<USHORT>(rStringContext.StartPosition), 
                                                                     static_cast<USHORT>(rStringContext.Length) ),
                                     0 );
 
                 return (rState.mapModeTransform * aSize).getX();
             }
 
-            uno::Sequence< double >
-                calcSubsetOffsets( rendering::RenderState&                          io_rRenderState,
-                                   double&                                          o_rMinPos,
-                                   double&                                          o_rMaxPos,
-                                   const uno::Reference< rendering::XTextLayout >&  rOrigTextLayout,
-                                   const ::cppcanvas::internal::Action::Subset&     rSubset )
+            uno::Sequence< double > 
+                calcSubsetOffsets( rendering::RenderState&							io_rRenderState,
+                                   double&											o_rMinPos,
+                                   double&											o_rMaxPos,
+                                   const uno::Reference< rendering::XTextLayout >&	rOrigTextLayout,
+                                   const ::cppcanvas::internal::Action::Subset&		rSubset )
             {
                 ENSURE_OR_THROW( rSubset.mnSubsetEnd > rSubset.mnSubsetBegin,
                                   "::cppcanvas::internal::calcSubsetOffsets(): invalid subset range range" );
 
                 uno::Sequence< double > aOrigOffsets( rOrigTextLayout->queryLogicalAdvancements() );
-                const double*           pOffsets( aOrigOffsets.getConstArray() );
+                const double*			pOffsets( aOrigOffsets.getConstArray() );
 
                 ENSURE_OR_THROW( aOrigOffsets.getLength() >= rSubset.mnSubsetEnd,
                                   "::cppcanvas::internal::calcSubsetOffsets(): invalid subset range range" );
@@ -331,11 +331,11 @@ namespace cppcanvas
                 // starting with the second character (the first is
                 // assumed to have output position 0), correct begin
                 // iterator.
-                const double nMaxPos(
-                    *(::std::max_element( pOffsets + (rSubset.mnSubsetBegin <= 0 ?
+                const double nMaxPos( 
+                    *(::std::max_element( pOffsets + (rSubset.mnSubsetBegin <= 0 ? 
                                                       0 : rSubset.mnSubsetBegin-1),
                                           pOffsets + rSubset.mnSubsetEnd )) );
-
+                    
 
                 // adapt render state, to move text output to given offset
                 // -------------------------------------------------------
@@ -366,10 +366,10 @@ namespace cppcanvas
 
                 // reduce DX array to given substring
                 // ----------------------------------
-
-                const sal_Int32         nNewElements( rSubset.mnSubsetEnd - rSubset.mnSubsetBegin );
+                
+                const sal_Int32			nNewElements( rSubset.mnSubsetEnd - rSubset.mnSubsetBegin );
                 uno::Sequence< double > aAdaptedOffsets( nNewElements );
-                double*                 pAdaptedOffsets( aAdaptedOffsets.getArray() );
+                double*					pAdaptedOffsets( aAdaptedOffsets.getArray() );
 
                 // move to new output position (subtract nMinPos,
                 // which is the new '0' position), copy only the range
@@ -378,7 +378,7 @@ namespace cppcanvas
                                   pOffsets + rSubset.mnSubsetEnd,
                                   pAdaptedOffsets,
                                   ::boost::bind( ::std::minus<double>(),
-                                                 _1,
+                                                 _1, 
                                                  nMinPos ) );
 
                 o_rMinPos = nMinPos;
@@ -387,18 +387,18 @@ namespace cppcanvas
                 return aAdaptedOffsets;
             }
 
-            uno::Reference< rendering::XTextLayout >
-                createSubsetLayout( const rendering::StringContext&                 rOrigContext,
-                                    const ::cppcanvas::internal::Action::Subset&    rSubset,
-                                    const uno::Reference< rendering::XTextLayout >& rOrigTextLayout )
+            uno::Reference< rendering::XTextLayout > 
+                createSubsetLayout( const rendering::StringContext&					rOrigContext,
+                                    const ::cppcanvas::internal::Action::Subset&	rSubset,
+                                    const uno::Reference< rendering::XTextLayout >&	rOrigTextLayout )
             {
                 // create temporary new text layout with subset string
                 // ---------------------------------------------------
 
-                const sal_Int32 nNewStartPos( rOrigContext.StartPosition + ::std::min(
+                const sal_Int32 nNewStartPos( rOrigContext.StartPosition + ::std::min( 
                                                   rSubset.mnSubsetBegin, rOrigContext.Length-1 ) );
-                const sal_Int32 nNewLength( ::std::max(
-                                                ::std::min(
+                const sal_Int32 nNewLength( ::std::max( 
+                                                ::std::min( 
                                                     rSubset.mnSubsetEnd - rSubset.mnSubsetBegin,
                                                     rOrigContext.Length ),
                                                 sal_Int32( 0 ) ) );
@@ -407,7 +407,7 @@ namespace cppcanvas
                                                          nNewStartPos,
                                                          nNewLength );
 
-                uno::Reference< rendering::XTextLayout > xTextLayout(
+                uno::Reference< rendering::XTextLayout > xTextLayout( 
                     rOrigTextLayout->getFont()->createTextLayout( aContext,
                                                                   rOrigTextLayout->getMainTextDirection(),
                                                                   0 ),
@@ -435,12 +435,12 @@ namespace cppcanvas
                 @param rSubset
                 Subset to prepare
              */
-            void createSubsetLayout( uno::Reference< rendering::XTextLayout >&  io_rTextLayout,
-                                     rendering::RenderState&                    io_rRenderState,
-                                     double&                                    o_rMinPos,
-                                     double&                                    o_rMaxPos,
-                                     const ::basegfx::B2DHomMatrix&             rTransformation,
-                                     const Action::Subset&                      rSubset )
+            void createSubsetLayout( uno::Reference< rendering::XTextLayout >&	io_rTextLayout,
+                                     rendering::RenderState&					io_rRenderState,
+                                     double&									o_rMinPos,
+                                     double&									o_rMaxPos,
+                                     const ::basegfx::B2DHomMatrix&				rTransformation,
+                                     const Action::Subset&						rSubset )
             {
                 ::canvas::tools::prependToRenderState(io_rRenderState, rTransformation);
 
@@ -469,7 +469,7 @@ namespace cppcanvas
 
                 if( xTextLayout.is() )
                 {
-                    xTextLayout->applyLogicalAdvancements(
+                    xTextLayout->applyLogicalAdvancements( 
                         calcSubsetOffsets( io_rRenderState,
                                            o_rMinPos,
                                            o_rMaxPos,
@@ -502,14 +502,14 @@ namespace cppcanvas
                 part of the text effect (the text itself and the means
                 to render it are unknown to this method)
              */
-            bool renderEffectText( const TextRenderer&                          rRenderer,
-                                   const rendering::RenderState&                rRenderState,
-                                   const rendering::ViewState&                  /*rViewState*/,
-                                   const uno::Reference< rendering::XCanvas >&  xCanvas,
-                                   const ::Color&                               rShadowColor,
-                                   const ::basegfx::B2DSize&                    rShadowOffset,
-                                   const ::Color&                               rReliefColor,
-                                   const ::basegfx::B2DSize&                    rReliefOffset )
+            bool renderEffectText( const TextRenderer& 							rRenderer,
+                                   const rendering::RenderState&				rRenderState,
+                                   const rendering::ViewState&			 		/*rViewState*/,
+                                   const uno::Reference< rendering::XCanvas >&	xCanvas,
+                                   const ::Color&								rShadowColor,
+                                   const ::basegfx::B2DSize&					rShadowOffset,
+                                   const ::Color&								rReliefColor,
+                                   const ::basegfx::B2DSize&					rReliefOffset )
             {
                 ::Color aEmptyColor( COL_AUTO );
                 uno::Reference<rendering::XColorSpace> xColorSpace(
@@ -526,7 +526,7 @@ namespace cppcanvas
 
                     ::canvas::tools::appendToRenderState(aShadowState, aTranslate);
 
-                    aShadowState.DeviceColor =
+                    aShadowState.DeviceColor = 
                         ::vcl::unotools::colorToDoubleSequence( rShadowColor,
                                                                 xColorSpace );
 
@@ -544,7 +544,7 @@ namespace cppcanvas
 
                     ::canvas::tools::appendToRenderState(aReliefState, aTranslate);
 
-                    aReliefState.DeviceColor =
+                    aReliefState.DeviceColor = 
                         ::vcl::unotools::colorToDoubleSequence( rReliefColor,
                                                                 xColorSpace );
 
@@ -558,26 +558,26 @@ namespace cppcanvas
             }
 
 
-            ::basegfx::B2DRange calcEffectTextBounds( const ::basegfx::B2DRange&    rTextBounds,
-                                                      const ::basegfx::B2DRange&    rLineBounds,
-                                                      const ::basegfx::B2DSize&     rReliefOffset,
-                                                      const ::basegfx::B2DSize&     rShadowOffset,
-                                                      const rendering::RenderState& rRenderState,
+            ::basegfx::B2DRange calcEffectTextBounds( const ::basegfx::B2DRange& 	rTextBounds,
+                                                      const ::basegfx::B2DRange& 	rLineBounds,
+                                                      const ::basegfx::B2DSize&		rReliefOffset,
+                                                      const ::basegfx::B2DSize&		rShadowOffset,
+                                                      const rendering::RenderState&	rRenderState,
                                                       const rendering::ViewState&   rViewState )
             {
                 ::basegfx::B2DRange aBounds( rTextBounds );
 
                 // add extends of text lines
                 aBounds.expand( rLineBounds );
-
+                
                 // TODO(Q3): Provide this functionality at the B2DRange
                 ::basegfx::B2DRange aTotalBounds( aBounds );
-                aTotalBounds.expand(
+                aTotalBounds.expand( 
                     ::basegfx::B2DRange( aBounds.getMinX() + rReliefOffset.getX(),
                                          aBounds.getMinY() + rReliefOffset.getY(),
                                          aBounds.getMaxX() + rReliefOffset.getX(),
                                          aBounds.getMaxY() + rReliefOffset.getY() ) );
-                aTotalBounds.expand(
+                aTotalBounds.expand( 
                     ::basegfx::B2DRange( aBounds.getMinX() + rShadowOffset.getX(),
                                          aBounds.getMinY() + rShadowOffset.getY(),
                                          aBounds.getMaxX() + rShadowOffset.getX(),
@@ -588,37 +588,37 @@ namespace cppcanvas
                                                      rRenderState );
             }
 
-            void initEffectLinePolyPolygon( ::basegfx::B2DSize&                             o_rOverallSize,
-                                            uno::Reference< rendering::XPolyPolygon2D >&    o_rTextLines,
-                                            const CanvasSharedPtr&                          rCanvas,
-                                            const uno::Sequence< double >&                  rOffsets,
-                                            const tools::TextLineInfo                       rLineInfo   )
+            void initEffectLinePolyPolygon( ::basegfx::B2DSize& 							o_rOverallSize,
+                                            uno::Reference< rendering::XPolyPolygon2D >&	o_rTextLines,
+                                            const CanvasSharedPtr&							rCanvas,
+                                            const uno::Sequence< double >&					rOffsets,
+                                            const tools::TextLineInfo						rLineInfo	)
             {
-                const ::basegfx::B2DPolyPolygon aPoly(
+                const ::basegfx::B2DPolyPolygon aPoly( 
                     textLinesFromLogicalOffsets(
                         rOffsets,
                         rLineInfo ) );
 
                 o_rOverallSize = ::basegfx::tools::getRange( aPoly ).getRange();
 
-                o_rTextLines = ::basegfx::unotools::xPolyPolygonFromB2DPolyPolygon(
+                o_rTextLines = ::basegfx::unotools::xPolyPolygonFromB2DPolyPolygon( 
                     rCanvas->getUNOCanvas()->getDevice(),
                     aPoly );
             }
 
-            void initEffectLinePolyPolygon( ::basegfx::B2DSize&                             o_rOverallSize,
-                                            uno::Reference< rendering::XPolyPolygon2D >&    o_rTextLines,
-                                            const CanvasSharedPtr&                          rCanvas,
+            void initEffectLinePolyPolygon( ::basegfx::B2DSize& 							o_rOverallSize,
+                                            uno::Reference< rendering::XPolyPolygon2D >&	o_rTextLines,
+                                            const CanvasSharedPtr&							rCanvas,
                                             double                                          nLineWidth,
-                                            const tools::TextLineInfo                       rLineInfo   )
+                                            const tools::TextLineInfo						rLineInfo	)
             {
-                const ::basegfx::B2DPolyPolygon aPoly(
-                    tools::createTextLinesPolyPolygon( 0.0, nLineWidth,
+                const ::basegfx::B2DPolyPolygon aPoly( 
+                    tools::createTextLinesPolyPolygon( 0.0, nLineWidth, 
                                                        rLineInfo ) );
 
                 o_rOverallSize = ::basegfx::tools::getRange( aPoly ).getRange();
 
-                o_rTextLines = ::basegfx::unotools::xPolyPolygonFromB2DPolyPolygon(
+                o_rTextLines = ::basegfx::unotools::xPolyPolygonFromB2DPolyPolygon( 
                     rCanvas->getUNOCanvas()->getDevice(),
                     aPoly );
             }
@@ -627,30 +627,30 @@ namespace cppcanvas
             // -------------------------------------------------------------------------
 
             class TextAction : public Action, private ::boost::noncopyable
-            {
-            public:
-                TextAction( const ::basegfx::B2DPoint&  rStartPoint,
-                            const ::rtl::OUString&      rString,
-                            sal_Int32                   nStartPos,
-                            sal_Int32                   nLen,
-                            const CanvasSharedPtr&      rCanvas,
-                            const OutDevState&          rState );
-
-                TextAction( const ::basegfx::B2DPoint&      rStartPoint,
-                            const ::rtl::OUString&          rString,
-                            sal_Int32                       nStartPos,
-                            sal_Int32                       nLen,
-                            const CanvasSharedPtr&          rCanvas,
-                            const OutDevState&              rState,
-                            const ::basegfx::B2DHomMatrix&  rTextTransform );
+            { 
+            public: 
+                TextAction( const ::basegfx::B2DPoint& 	rStartPoint,
+                            const ::rtl::OUString&		rString,
+                            sal_Int32 					nStartPos,
+                            sal_Int32 					nLen,
+                            const CanvasSharedPtr&		rCanvas,
+                            const OutDevState&			rState );
+
+                TextAction( const ::basegfx::B2DPoint& 		rStartPoint,
+                            const ::rtl::OUString&			rString,
+                            sal_Int32 						nStartPos,
+                            sal_Int32 						nLen,
+                            const CanvasSharedPtr&			rCanvas,
+                            const OutDevState&				rState,
+                            const ::basegfx::B2DHomMatrix&	rTextTransform );
 
                 virtual bool render( const ::basegfx::B2DHomMatrix& rTransformation ) const;
                 virtual bool render( const ::basegfx::B2DHomMatrix& rTransformation,
-                                     const Subset&                  rSubset ) const;
+                                     const Subset&					rSubset ) const;
 
                 virtual ::basegfx::B2DRange getBounds( const ::basegfx::B2DHomMatrix& rTransformation ) const;
-                virtual ::basegfx::B2DRange getBounds( const ::basegfx::B2DHomMatrix&   rTransformation,
-                                                       const Subset&                    rSubset ) const;
+                virtual ::basegfx::B2DRange getBounds( const ::basegfx::B2DHomMatrix&	rTransformation,
+                                                       const Subset&					rSubset ) const;
 
                 virtual sal_Int32 getActionCount() const;
 
@@ -662,48 +662,48 @@ namespace cppcanvas
                 // TextActions, maybe using maOffsets for the
                 // translation.
 
-                uno::Reference< rendering::XCanvasFont >    mxFont;
-                const rendering::StringContext              maStringContext;
-                const CanvasSharedPtr                       mpCanvas;
-                rendering::RenderState                      maState;
-                const sal_Int8                              maTextDirection;
+                uno::Reference< rendering::XCanvasFont >	mxFont;
+                const rendering::StringContext			  	maStringContext;
+                const CanvasSharedPtr						mpCanvas;
+                rendering::RenderState						maState;
+                const sal_Int8								maTextDirection;
             };
 
-            TextAction::TextAction( const ::basegfx::B2DPoint&  rStartPoint,
-                                    const ::rtl::OUString&      rString,
-                                    sal_Int32                   nStartPos,
-                                    sal_Int32                   nLen,
-                                    const CanvasSharedPtr&      rCanvas,
-                                    const OutDevState&          rState  ) :
+            TextAction::TextAction( const ::basegfx::B2DPoint& 	rStartPoint,
+                                    const ::rtl::OUString&		rString,
+                                    sal_Int32 					nStartPos,
+                                    sal_Int32 					nLen,
+                                    const CanvasSharedPtr&		rCanvas,
+                                    const OutDevState&			rState	) :
                 mxFont( rState.xFont ),
                 maStringContext( rString, nStartPos, nLen ),
                 mpCanvas( rCanvas ),
                 maState(),
                 maTextDirection( rState.textDirection )
             {
-                init( maState, mxFont,
-                      rStartPoint,
+                init( maState, mxFont, 
+                      rStartPoint, 
                       rState, rCanvas );
 
                 ENSURE_OR_THROW( mxFont.is(),
                                   "::cppcanvas::internal::TextAction(): Invalid font" );
             }
 
-            TextAction::TextAction( const ::basegfx::B2DPoint&      rStartPoint,
-                                    const ::rtl::OUString&          rString,
-                                    sal_Int32                       nStartPos,
-                                    sal_Int32                       nLen,
-                                    const CanvasSharedPtr&          rCanvas,
-                                    const OutDevState&              rState,
-                                    const ::basegfx::B2DHomMatrix&  rTextTransform ) :
+            TextAction::TextAction( const ::basegfx::B2DPoint& 		rStartPoint,
+                                    const ::rtl::OUString&			rString,
+                                    sal_Int32 						nStartPos,
+                                    sal_Int32 						nLen,
+                                    const CanvasSharedPtr&			rCanvas,
+                                    const OutDevState&				rState,
+                                    const ::basegfx::B2DHomMatrix&	rTextTransform ) :
                 mxFont( rState.xFont ),
                 maStringContext( rString, nStartPos, nLen ),
                 mpCanvas( rCanvas ),
                 maState(),
                 maTextDirection( rState.textDirection )
             {
-                init( maState, mxFont,
-                      rStartPoint,
+                init( maState, mxFont, 
+                      rStartPoint, 
                       rState, rCanvas, rTextTransform );
 
                 ENSURE_OR_THROW( mxFont.is(),
@@ -724,8 +724,8 @@ namespace cppcanvas
                 return true;
             }
 
-            bool TextAction::render( const ::basegfx::B2DHomMatrix& rTransformation,
-                                     const Subset&                  /*rSubset*/ ) const
+            bool TextAction::render( const ::basegfx::B2DHomMatrix&	rTransformation,
+                                     const Subset&					/*rSubset*/ ) const
             {
                 OSL_ENSURE( false,
                             "TextAction::render(): Subset not supported by this object" );
@@ -742,9 +742,9 @@ namespace cppcanvas
                 // create XTextLayout, to have the
                 // XTextLayout::queryTextBounds() method available
                 uno::Reference< rendering::XTextLayout > xTextLayout(
-                    mxFont->createTextLayout(
+                    mxFont->createTextLayout( 
                         maStringContext,
-                        maTextDirection,
+                        maTextDirection, 
                         0 ) );
 
                 rendering::RenderState aLocalState( maState );
@@ -756,8 +756,8 @@ namespace cppcanvas
                                                      aLocalState );
             }
 
-            ::basegfx::B2DRange TextAction::getBounds( const ::basegfx::B2DHomMatrix&   rTransformation,
-                                                       const Subset&                    /*rSubset*/ ) const
+            ::basegfx::B2DRange TextAction::getBounds( const ::basegfx::B2DHomMatrix&	rTransformation,
+                                                       const Subset&					/*rSubset*/ ) const
             {
                 OSL_ENSURE( false,
                             "TextAction::getBounds(): Subset not supported by this object" );
@@ -781,49 +781,49 @@ namespace cppcanvas
 
             // -------------------------------------------------------------------------
 
-            class EffectTextAction :
-                public Action,
+            class EffectTextAction : 
+                public Action, 
                 public TextRenderer,
                 private ::boost::noncopyable
-            {
-            public:
-                EffectTextAction( const ::basegfx::B2DPoint& rStartPoint,
-                                  const ::basegfx::B2DSize&  rReliefOffset,
-                                  const ::Color&             rReliefColor,
-                                  const ::basegfx::B2DSize&  rShadowOffset,
-                                  const ::Color&             rShadowColor,
-                                  const ::rtl::OUString&     rText,
-                                  sal_Int32                  nStartPos,
-                                  sal_Int32                  nLen,
-                                  VirtualDevice&             rVDev,
-                                  const CanvasSharedPtr&     rCanvas,
-                                  const OutDevState&         rState );
-
-                EffectTextAction( const ::basegfx::B2DPoint&        rStartPoint,
-                                  const ::basegfx::B2DSize&         rReliefOffset,
-                                  const ::Color&                    rReliefColor,
-                                  const ::basegfx::B2DSize&         rShadowOffset,
-                                  const ::Color&                    rShadowColor,
-                                  const ::rtl::OUString&            rText,
-                                  sal_Int32                         nStartPos,
-                                  sal_Int32                         nLen,
-                                  VirtualDevice&                    rVDev,
-                                  const CanvasSharedPtr&            rCanvas,
-                                  const OutDevState&                rState,
-                                  const ::basegfx::B2DHomMatrix&    rTextTransform );
+            { 
+            public: 
+                EffectTextAction( const ::basegfx::B2DPoint& rStartPoint,  
+                                  const ::basegfx::B2DSize&	 rReliefOffset,  
+                                  const ::Color&			 rReliefColor,
+                                  const ::basegfx::B2DSize&	 rShadowOffset,
+                                  const ::Color&			 rShadowColor,
+                                  const ::rtl::OUString& 	 rText,
+                                  sal_Int32 				 nStartPos,
+                                  sal_Int32 				 nLen,
+                                  VirtualDevice&			 rVDev,
+                                  const CanvasSharedPtr&	 rCanvas, 
+                                  const OutDevState& 		 rState ); 
+
+                EffectTextAction( const ::basegfx::B2DPoint&        rStartPoint,  
+                                  const ::basegfx::B2DSize&			rReliefOffset,  
+                                  const ::Color&					rReliefColor,
+                                  const ::basegfx::B2DSize&			rShadowOffset,
+                                  const ::Color&					rShadowColor,
+                                  const ::rtl::OUString& 			rText,
+                                  sal_Int32 						nStartPos,
+                                  sal_Int32 						nLen,
+                                  VirtualDevice&					rVDev,
+                                  const CanvasSharedPtr&			rCanvas, 
+                                  const OutDevState& 				rState,
+                                  const ::basegfx::B2DHomMatrix&	rTextTransform ); 
 
                 virtual bool render( const ::basegfx::B2DHomMatrix& rTransformation ) const;
                 virtual bool render( const ::basegfx::B2DHomMatrix& rTransformation,
-                                     const Subset&                  rSubset ) const;
+                                     const Subset&					rSubset ) const;
 
                 virtual ::basegfx::B2DRange getBounds( const ::basegfx::B2DHomMatrix& rTransformation ) const;
-                virtual ::basegfx::B2DRange getBounds( const ::basegfx::B2DHomMatrix&   rTransformation,
-                                                       const Subset&                    rSubset ) const;
+                virtual ::basegfx::B2DRange getBounds( const ::basegfx::B2DHomMatrix&	rTransformation,
+                                                       const Subset&					rSubset ) const;
 
                 virtual sal_Int32 getActionCount() const;
 
             private:
-                /// Interface TextRenderer
+                /// Interface TextRenderer 
                 virtual bool operator()( const rendering::RenderState& rRenderState ) const;
 
                 // TODO(P2): This is potentially a real mass object
@@ -833,23 +833,23 @@ namespace cppcanvas
                 // TextActions, maybe using maOffsets for the
                 // translation.
 
-                uno::Reference< rendering::XCanvasFont >    mxFont;
-                const rendering::StringContext              maStringContext;
-                const CanvasSharedPtr                       mpCanvas;
-                rendering::RenderState                      maState;
-                const tools::TextLineInfo                   maTextLineInfo;
-                ::basegfx::B2DSize                          maLinesOverallSize;
-                const double                                mnLineWidth;
-                uno::Reference< rendering::XPolyPolygon2D > mxTextLines;
-                const ::basegfx::B2DSize                    maReliefOffset;
-                const ::Color                               maReliefColor;
-                const ::basegfx::B2DSize                    maShadowOffset;
-                const ::Color                               maShadowColor;
-                const sal_Int8                              maTextDirection;
+                uno::Reference< rendering::XCanvasFont >	mxFont;
+                const rendering::StringContext			  	maStringContext;
+                const CanvasSharedPtr						mpCanvas;
+                rendering::RenderState						maState;
+                const tools::TextLineInfo					maTextLineInfo;
+                ::basegfx::B2DSize							maLinesOverallSize;
+                const double								mnLineWidth;
+                uno::Reference< rendering::XPolyPolygon2D >	mxTextLines;
+                const ::basegfx::B2DSize					maReliefOffset;
+                const ::Color								maReliefColor;
+                const ::basegfx::B2DSize					maShadowOffset;
+                const ::Color								maShadowColor;
+                const sal_Int8								maTextDirection;
             };
 
-            EffectTextAction::EffectTextAction( const ::basegfx::B2DPoint& rStartPoint,
-                                                const ::basegfx::B2DSize&  rReliefOffset,
+            EffectTextAction::EffectTextAction( const ::basegfx::B2DPoint& rStartPoint,  
+                                                const ::basegfx::B2DSize&  rReliefOffset,  
                                                 const ::Color&             rReliefColor,
                                                 const ::basegfx::B2DSize&  rShadowOffset,
                                                 const ::Color&             rShadowColor,
@@ -857,7 +857,7 @@ namespace cppcanvas
                                                 sal_Int32                  nStartPos,
                                                 sal_Int32                  nLen,
                                                 VirtualDevice&             rVDev,
-                                                const CanvasSharedPtr&     rCanvas,
+                                                const CanvasSharedPtr&     rCanvas, 
                                                 const OutDevState&         rState ) :
                 mxFont( rState.xFont ),
                 maStringContext( rText, nStartPos, nLen ),
@@ -879,26 +879,26 @@ namespace cppcanvas
                                            mnLineWidth,
                                            maTextLineInfo );
 
-                init( maState, mxFont,
-                      rStartPoint,
+                init( maState, mxFont, 
+                      rStartPoint, 
                       rState, rCanvas );
 
                 ENSURE_OR_THROW( mxFont.is() && mxTextLines.is(),
                                   "::cppcanvas::internal::EffectTextAction(): Invalid font or lines" );
             }
 
-            EffectTextAction::EffectTextAction( const ::basegfx::B2DPoint&      rStartPoint,
-                                                const ::basegfx::B2DSize&       rReliefOffset,
-                                                const ::Color&                  rReliefColor,
-                                                const ::basegfx::B2DSize&       rShadowOffset,
-                                                const ::Color&                  rShadowColor,
-                                                const ::rtl::OUString&          rText,
-                                                sal_Int32                       nStartPos,
-                                                sal_Int32                       nLen,
-                                                VirtualDevice&                  rVDev,
-                                                const CanvasSharedPtr&          rCanvas,
-                                                const OutDevState&              rState,
-                                                const ::basegfx::B2DHomMatrix&  rTextTransform ) :
+            EffectTextAction::EffectTextAction( const ::basegfx::B2DPoint&		rStartPoint,  
+                                                const ::basegfx::B2DSize&		rReliefOffset,  
+                                                const ::Color&					rReliefColor,
+                                                const ::basegfx::B2DSize&		rShadowOffset,
+                                                const ::Color&					rShadowColor,
+                                                const ::rtl::OUString& 			rText,
+                                                sal_Int32 						nStartPos,
+                                                sal_Int32 						nLen,
+                                                VirtualDevice&					rVDev,
+                                                const CanvasSharedPtr&			rCanvas, 
+                                                const OutDevState& 				rState,
+                                                const ::basegfx::B2DHomMatrix&	rTextTransform ) :
                 mxFont( rState.xFont ),
                 maStringContext( rText, nStartPos, nLen ),
                 mpCanvas( rCanvas ),
@@ -919,8 +919,8 @@ namespace cppcanvas
                                            mnLineWidth,
                                            maTextLineInfo );
 
-                init( maState, mxFont,
-                      rStartPoint,
+                init( maState, mxFont, 
+                      rStartPoint, 
                       rState, rCanvas, rTextTransform );
 
                 ENSURE_OR_THROW( mxFont.is() && mxTextLines.is(),
@@ -938,7 +938,7 @@ namespace cppcanvas
 
                 rCanvas->drawText( maStringContext, mxFont,
                                    rViewState,
-                                   rRenderState,
+                                   rRenderState, 
                                    maTextDirection );
 
                 return true;
@@ -962,8 +962,8 @@ namespace cppcanvas
                                          maReliefOffset );
             }
 
-            bool EffectTextAction::render( const ::basegfx::B2DHomMatrix&   rTransformation,
-                                           const Subset&                    /*rSubset*/ ) const
+            bool EffectTextAction::render( const ::basegfx::B2DHomMatrix&	rTransformation,
+                                           const Subset&					/*rSubset*/ ) const
             {
                 OSL_ENSURE( false,
                             "EffectTextAction::render(): Subset not supported by this object" );
@@ -980,9 +980,9 @@ namespace cppcanvas
                 // create XTextLayout, to have the
                 // XTextLayout::queryTextBounds() method available
                 uno::Reference< rendering::XTextLayout > xTextLayout(
-                    mxFont->createTextLayout(
+                    mxFont->createTextLayout( 
                         maStringContext,
-                        maTextDirection,
+                        maTextDirection, 
                         0 ) );
 
                 rendering::RenderState aLocalState( maState );
@@ -999,8 +999,8 @@ namespace cppcanvas
                                              mpCanvas->getViewState() );
             }
 
-            ::basegfx::B2DRange EffectTextAction::getBounds( const ::basegfx::B2DHomMatrix& rTransformation,
-                                                             const Subset&                  /*rSubset*/ ) const
+            ::basegfx::B2DRange EffectTextAction::getBounds( const ::basegfx::B2DHomMatrix&	rTransformation,
+                                                             const Subset&					/*rSubset*/ ) const
             {
                 OSL_ENSURE( false,
                             "EffectTextAction::getBounds(): Subset not supported by this object" );
@@ -1025,32 +1025,32 @@ namespace cppcanvas
             // -------------------------------------------------------------------------
 
             class TextArrayAction : public Action, private ::boost::noncopyable
-            {
-            public:
-                TextArrayAction( const ::basegfx::B2DPoint&     rStartPoint,
-                                 const ::rtl::OUString&         rString,
-                                 sal_Int32                      nStartPos,
-                                 sal_Int32                      nLen,
-                                 const uno::Sequence< double >& rOffsets,
-                                 const CanvasSharedPtr&         rCanvas,
-                                 const OutDevState&             rState );
-
-                TextArrayAction( const ::basegfx::B2DPoint&     rStartPoint,
-                                 const ::rtl::OUString&         rString,
-                                 sal_Int32                      nStartPos,
-                                 sal_Int32                      nLen,
-                                 const uno::Sequence< double >& rOffsets,
-                                 const CanvasSharedPtr&         rCanvas,
-                                 const OutDevState&             rState,
-                                 const ::basegfx::B2DHomMatrix& rTextTransform );
+            { 
+            public: 
+                TextArrayAction( const ::basegfx::B2DPoint& 	rStartPoint,
+                                 const ::rtl::OUString&			rString,
+                                 sal_Int32 						nStartPos,
+                                 sal_Int32 						nLen,
+                                 const uno::Sequence< double >&	rOffsets,
+                                 const CanvasSharedPtr&			rCanvas,
+                                 const OutDevState&				rState );
+
+                TextArrayAction( const ::basegfx::B2DPoint& 	rStartPoint,
+                                 const ::rtl::OUString&			rString,
+                                 sal_Int32 						nStartPos,
+                                 sal_Int32 						nLen,
+                                 const uno::Sequence< double >&	rOffsets,
+                                 const CanvasSharedPtr&			rCanvas,
+                                 const OutDevState&				rState,
+                                 const ::basegfx::B2DHomMatrix&	rTextTransform );
 
                 virtual bool render( const ::basegfx::B2DHomMatrix& rTransformation ) const;
                 virtual bool render( const ::basegfx::B2DHomMatrix& rTransformation,
-                                     const Subset&                  rSubset ) const;
+                                     const Subset&					rSubset ) const;
 
                 virtual ::basegfx::B2DRange getBounds( const ::basegfx::B2DHomMatrix& rTransformation ) const;
-                virtual ::basegfx::B2DRange getBounds( const ::basegfx::B2DHomMatrix&   rTransformation,
-                                                       const Subset&                    rSubset ) const;
+                virtual ::basegfx::B2DRange getBounds( const ::basegfx::B2DHomMatrix&	rTransformation,
+                                                       const Subset&					rSubset ) const;
 
                 virtual sal_Int32 getActionCount() const;
 
@@ -1062,23 +1062,23 @@ namespace cppcanvas
                 // TextActions, maybe using maOffsets for the
                 // translation.
 
-                uno::Reference< rendering::XTextLayout >    mxTextLayout;
-                const CanvasSharedPtr                       mpCanvas;
-                rendering::RenderState                      maState;
+                uno::Reference< rendering::XTextLayout >	mxTextLayout;
+                const CanvasSharedPtr						mpCanvas;
+                rendering::RenderState						maState;
             };
 
-            TextArrayAction::TextArrayAction( const ::basegfx::B2DPoint&        rStartPoint,
-                                              const ::rtl::OUString&            rString,
-                                              sal_Int32                         nStartPos,
-                                              sal_Int32                         nLen,
-                                              const uno::Sequence< double >&    rOffsets,
-                                              const CanvasSharedPtr&            rCanvas,
-                                              const OutDevState&                rState ) :
+            TextArrayAction::TextArrayAction( const ::basegfx::B2DPoint& 		rStartPoint,
+                                              const ::rtl::OUString&			rString,
+                                              sal_Int32 						nStartPos,
+                                              sal_Int32 						nLen,
+                                              const uno::Sequence< double >&	rOffsets,
+                                              const CanvasSharedPtr&			rCanvas,
+                                              const OutDevState&				rState ) :
                 mxTextLayout(),
                 mpCanvas( rCanvas ),
                 maState()
             {
-                initArrayAction( maState,
+                initArrayAction( maState, 
                                  mxTextLayout,
                                  rStartPoint,
                                  rString,
@@ -1089,19 +1089,19 @@ namespace cppcanvas
                                  rState, NULL );
             }
 
-            TextArrayAction::TextArrayAction( const ::basegfx::B2DPoint&        rStartPoint,
-                                              const ::rtl::OUString&            rString,
-                                              sal_Int32                         nStartPos,
-                                              sal_Int32                         nLen,
-                                              const uno::Sequence< double >&    rOffsets,
-                                              const CanvasSharedPtr&            rCanvas,
-                                              const OutDevState&                rState,
-                                              const ::basegfx::B2DHomMatrix&    rTextTransform ) :
+            TextArrayAction::TextArrayAction( const ::basegfx::B2DPoint& 		rStartPoint,
+                                              const ::rtl::OUString&			rString,
+                                              sal_Int32 						nStartPos,
+                                              sal_Int32 						nLen,
+                                              const uno::Sequence< double >&	rOffsets,
+                                              const CanvasSharedPtr&			rCanvas,
+                                              const OutDevState&				rState,
+                                              const ::basegfx::B2DHomMatrix&	rTextTransform ) :
                 mxTextLayout(),
                 mpCanvas( rCanvas ),
                 maState()
             {
-                initArrayAction( maState,
+                initArrayAction( maState, 
                                  mxTextLayout,
                                  rStartPoint,
                                  rString,
@@ -1123,38 +1123,38 @@ namespace cppcanvas
 
 #ifdef SPECIAL_DEBUG
                 aLocalState.Clip.clear();
-                aLocalState.DeviceColor =
+                aLocalState.DeviceColor = 
                     ::vcl::unotools::colorToDoubleSequence( mpCanvas->getUNOCanvas()->getDevice(),
                                                             ::Color( 0x80FF0000 ) );
 
                 if( maState.Clip.is() )
-                    mpCanvas->getUNOCanvas()->drawPolyPolygon( maState.Clip,
-                                                               mpCanvas->getViewState(),
+                    mpCanvas->getUNOCanvas()->drawPolyPolygon( maState.Clip, 
+                                                               mpCanvas->getViewState(), 
                                                                aLocalState );
 
                 aLocalState.DeviceColor = maState.DeviceColor;
 #endif
 
-                mpCanvas->getUNOCanvas()->drawTextLayout( mxTextLayout,
-                                                          mpCanvas->getViewState(),
+                mpCanvas->getUNOCanvas()->drawTextLayout( mxTextLayout, 
+                                                          mpCanvas->getViewState(), 
                                                           aLocalState );
 
                 return true;
             }
 
-            bool TextArrayAction::render( const ::basegfx::B2DHomMatrix&    rTransformation,
-                                          const Subset&                     rSubset ) const
+            bool TextArrayAction::render( const ::basegfx::B2DHomMatrix&	rTransformation,
+                                          const Subset&						rSubset ) const
             {
                 RTL_LOGFILE_CONTEXT( aLog, "::cppcanvas::internal::TextArrayAction::render( subset )" );
                 RTL_LOGFILE_CONTEXT_TRACE1( aLog, "::cppcanvas::internal::TextArrayAction: 0x%X", this );
 
-                rendering::RenderState                      aLocalState( maState );
-                uno::Reference< rendering::XTextLayout >    xTextLayout( mxTextLayout );
+                rendering::RenderState 						aLocalState( maState );
+                uno::Reference< rendering::XTextLayout >	xTextLayout( mxTextLayout );
 
                 double nDummy0, nDummy1;
                 createSubsetLayout( xTextLayout,
                                     aLocalState,
-                                    nDummy0,
+                                    nDummy0, 
                                     nDummy1,
                                     rTransformation,
                                     rSubset );
@@ -1162,8 +1162,8 @@ namespace cppcanvas
                 if( !xTextLayout.is() )
                     return true; // empty layout, render nothing
 
-                mpCanvas->getUNOCanvas()->drawTextLayout( xTextLayout,
-                                                          mpCanvas->getViewState(),
+                mpCanvas->getUNOCanvas()->drawTextLayout( xTextLayout, 
+                                                          mpCanvas->getViewState(), 
                                                           aLocalState );
 
                 return true;
@@ -1180,19 +1180,19 @@ namespace cppcanvas
                                                      aLocalState );
             }
 
-            ::basegfx::B2DRange TextArrayAction::getBounds( const ::basegfx::B2DHomMatrix&  rTransformation,
-                                                            const Subset&                   rSubset ) const
+            ::basegfx::B2DRange TextArrayAction::getBounds( const ::basegfx::B2DHomMatrix&	rTransformation,
+                                                            const Subset&					rSubset ) const
             {
                 RTL_LOGFILE_CONTEXT( aLog, "::cppcanvas::internal::TextArrayAction::getBounds( subset )" );
                 RTL_LOGFILE_CONTEXT_TRACE1( aLog, "::cppcanvas::internal::TextArrayAction: 0x%X", this );
 
-                rendering::RenderState                      aLocalState( maState );
-                uno::Reference< rendering::XTextLayout >    xTextLayout( mxTextLayout );
+                rendering::RenderState 						aLocalState( maState );
+                uno::Reference< rendering::XTextLayout >	xTextLayout( mxTextLayout );
 
                 double nDummy0, nDummy1;
                 createSubsetLayout( xTextLayout,
                                     aLocalState,
-                                    nDummy0,
+                                    nDummy0, 
                                     nDummy1,
                                     rTransformation,
                                     rSubset );
@@ -1216,52 +1216,52 @@ namespace cppcanvas
 
             // -------------------------------------------------------------------------
 
-            class EffectTextArrayAction :
-                public Action,
+            class EffectTextArrayAction : 
+                public Action, 
                 public TextRenderer,
                 private ::boost::noncopyable
-            {
-            public:
-                EffectTextArrayAction( const ::basegfx::B2DPoint&       rStartPoint,
-                                       const ::basegfx::B2DSize&        rReliefOffset,
-                                       const ::Color&                   rReliefColor,
-                                       const ::basegfx::B2DSize&        rShadowOffset,
-                                       const ::Color&                   rShadowColor,
-                                       const ::rtl::OUString&           rText,
-                                       sal_Int32                        nStartPos,
-                                       sal_Int32                        nLen,
-                                       const uno::Sequence< double >&   rOffsets,
-                                       VirtualDevice&                   rVDev,
-                                       const CanvasSharedPtr&           rCanvas,
-                                       const OutDevState&               rState  );
-                EffectTextArrayAction( const ::basegfx::B2DPoint&       rStartPoint,
-                                       const ::basegfx::B2DSize&        rReliefOffset,
-                                       const ::Color&                   rReliefColor,
-                                       const ::basegfx::B2DSize&        rShadowOffset,
-                                       const ::Color&                   rShadowColor,
-                                       const ::rtl::OUString&           rText,
-                                       sal_Int32                        nStartPos,
-                                       sal_Int32                        nLen,
-                                       const uno::Sequence< double >&   rOffsets,
-                                       VirtualDevice&                   rVDev,
-                                       const CanvasSharedPtr&           rCanvas,
-                                       const OutDevState&               rState,
-                                       const ::basegfx::B2DHomMatrix&   rTextTransform );
+            { 
+            public: 
+                EffectTextArrayAction( const ::basegfx::B2DPoint&		rStartPoint,  
+                                       const ::basegfx::B2DSize&		rReliefOffset,  
+                                       const ::Color&					rReliefColor,
+                                       const ::basegfx::B2DSize&		rShadowOffset,
+                                       const ::Color&					rShadowColor,
+                                       const ::rtl::OUString& 			rText,
+                                       sal_Int32 						nStartPos,
+                                       sal_Int32 						nLen,
+                                       const uno::Sequence< double >&	rOffsets,
+                                       VirtualDevice&					rVDev,
+                                       const CanvasSharedPtr&			rCanvas, 
+                                       const OutDevState& 				rState	);
+                EffectTextArrayAction( const ::basegfx::B2DPoint&		rStartPoint,  
+                                       const ::basegfx::B2DSize&		rReliefOffset,  
+                                       const ::Color&					rReliefColor,
+                                       const ::basegfx::B2DSize&		rShadowOffset,
+                                       const ::Color&					rShadowColor,
+                                       const ::rtl::OUString& 			rText,
+                                       sal_Int32 						nStartPos,
+                                       sal_Int32 						nLen,
+                                       const uno::Sequence< double >&	rOffsets,
+                                       VirtualDevice&					rVDev,
+                                       const CanvasSharedPtr&			rCanvas, 
+                                       const OutDevState& 				rState,
+                                       const ::basegfx::B2DHomMatrix&	rTextTransform ); 
 
                 virtual bool render( const ::basegfx::B2DHomMatrix& rTransformation ) const;
                 virtual bool render( const ::basegfx::B2DHomMatrix& rTransformation,
-                                     const Subset&                  rSubset ) const;
+                                     const Subset&					rSubset ) const;
 
                 virtual ::basegfx::B2DRange getBounds( const ::basegfx::B2DHomMatrix& rTransformation ) const;
-                virtual ::basegfx::B2DRange getBounds( const ::basegfx::B2DHomMatrix&   rTransformation,
-                                                       const Subset&                    rSubset ) const;
+                virtual ::basegfx::B2DRange getBounds( const ::basegfx::B2DHomMatrix&	rTransformation,
+                                                       const Subset&					rSubset ) const;
 
                 virtual sal_Int32 getActionCount() const;
 
             private:
                 // TextRenderer interface
                 virtual bool operator()( const rendering::RenderState& rRenderState ) const;
-
+                    
                 // TODO(P2): This is potentially a real mass object
                 // (every character might be a separate TextAction),
                 // thus, make it as lightweight as possible. For
@@ -1269,30 +1269,30 @@ namespace cppcanvas
                 // TextActions, maybe using maOffsets for the
                 // translation.
 
-                uno::Reference< rendering::XTextLayout >        mxTextLayout;
-                const CanvasSharedPtr                           mpCanvas;
-                rendering::RenderState                          maState;
-                const tools::TextLineInfo                       maTextLineInfo;
-                ::basegfx::B2DSize                              maLinesOverallSize;
-                uno::Reference< rendering::XPolyPolygon2D >     mxTextLines;
-                const ::basegfx::B2DSize                        maReliefOffset;
-                const ::Color                                   maReliefColor;
-                const ::basegfx::B2DSize                        maShadowOffset;
-                const ::Color                                   maShadowColor;
+                uno::Reference< rendering::XTextLayout >		mxTextLayout;
+                const CanvasSharedPtr							mpCanvas;
+                rendering::RenderState							maState;
+                const tools::TextLineInfo						maTextLineInfo;
+                ::basegfx::B2DSize								maLinesOverallSize;
+                uno::Reference< rendering::XPolyPolygon2D >		mxTextLines;
+                const ::basegfx::B2DSize						maReliefOffset;
+                const ::Color									maReliefColor;
+                const ::basegfx::B2DSize						maShadowOffset;
+                const ::Color									maShadowColor;
             };
 
-            EffectTextArrayAction::EffectTextArrayAction( const ::basegfx::B2DPoint&        rStartPoint,
-                                                          const ::basegfx::B2DSize&         rReliefOffset,
-                                                          const ::Color&                    rReliefColor,
-                                                          const ::basegfx::B2DSize&         rShadowOffset,
-                                                          const ::Color&                    rShadowColor,
-                                                          const ::rtl::OUString&            rText,
-                                                          sal_Int32                         nStartPos,
-                                                          sal_Int32                         nLen,
-                                                          const uno::Sequence< double >&    rOffsets,
-                                                          VirtualDevice&                    rVDev,
-                                                          const CanvasSharedPtr&            rCanvas,
-                                                          const OutDevState&                rState  ) :
+            EffectTextArrayAction::EffectTextArrayAction( const ::basegfx::B2DPoint&		rStartPoint,  
+                                                          const ::basegfx::B2DSize&			rReliefOffset,  
+                                                          const ::Color&					rReliefColor,
+                                                          const ::basegfx::B2DSize&			rShadowOffset,
+                                                          const ::Color&					rShadowColor,
+                                                          const ::rtl::OUString& 			rText,
+                                                          sal_Int32 						nStartPos,
+                                                          sal_Int32 						nLen,
+                                                          const uno::Sequence< double >&	rOffsets,
+                                                          VirtualDevice&					rVDev,
+                                                          const CanvasSharedPtr&			rCanvas, 
+                                                          const OutDevState& 				rState	) :
                 mxTextLayout(),
                 mpCanvas( rCanvas ),
                 maState(),
@@ -1310,7 +1310,7 @@ namespace cppcanvas
                                            rOffsets,
                                            maTextLineInfo );
 
-                initArrayAction( maState,
+                initArrayAction( maState, 
                                  mxTextLayout,
                                  rStartPoint,
                                  rText,
@@ -1321,19 +1321,19 @@ namespace cppcanvas
                                  rState, NULL );
             }
 
-            EffectTextArrayAction::EffectTextArrayAction( const ::basegfx::B2DPoint&        rStartPoint,
-                                                          const ::basegfx::B2DSize&         rReliefOffset,
-                                                          const ::Color&                    rReliefColor,
-                                                          const ::basegfx::B2DSize&         rShadowOffset,
-                                                          const ::Color&                    rShadowColor,
-                                                          const ::rtl::OUString&            rText,
-                                                          sal_Int32                         nStartPos,
-                                                          sal_Int32                         nLen,
-                                                          const uno::Sequence< double >&    rOffsets,
-                                                          VirtualDevice&                    rVDev,
-                                                          const CanvasSharedPtr&            rCanvas,
-                                                          const OutDevState&                rState,
-                                                          const ::basegfx::B2DHomMatrix&    rTextTransform ) :
+            EffectTextArrayAction::EffectTextArrayAction( const ::basegfx::B2DPoint&		rStartPoint,  
+                                                          const ::basegfx::B2DSize&			rReliefOffset,  
+                                                          const ::Color&					rReliefColor,
+                                                          const ::basegfx::B2DSize&			rShadowOffset,
+                                                          const ::Color&					rShadowColor,
+                                                          const ::rtl::OUString& 			rText,
+                                                          sal_Int32 						nStartPos,
+                                                          sal_Int32 						nLen,
+                                                          const uno::Sequence< double >&	rOffsets,
+                                                          VirtualDevice&					rVDev,
+                                                          const CanvasSharedPtr&			rCanvas, 
+                                                          const OutDevState& 				rState,
+                                                          const ::basegfx::B2DHomMatrix&	rTextTransform ) :
                 mxTextLayout(),
                 mpCanvas( rCanvas ),
                 maState(),
@@ -1351,7 +1351,7 @@ namespace cppcanvas
                                            rOffsets,
                                            maTextLineInfo );
 
-                initArrayAction( maState,
+                initArrayAction( maState, 
                                  mxTextLayout,
                                  rStartPoint,
                                  rText,
@@ -1359,7 +1359,7 @@ namespace cppcanvas
                                  nLen,
                                  rOffsets,
                                  rCanvas,
-                                 rState,
+                                 rState, 
                                  &rTextTransform );
             }
 
@@ -1372,7 +1372,7 @@ namespace cppcanvas
                                           rViewState,
                                           rRenderState );
 
-                rCanvas->drawTextLayout( mxTextLayout,
+                rCanvas->drawTextLayout( mxTextLayout, 
                                          rViewState,
                                          rRenderState );
 
@@ -1400,10 +1400,10 @@ namespace cppcanvas
             class EffectTextArrayRenderHelper : public TextRenderer
             {
             public:
-                EffectTextArrayRenderHelper( const uno::Reference< rendering::XCanvas >&        rCanvas,
-                                             const uno::Reference< rendering::XTextLayout >&    rTextLayout,
+                EffectTextArrayRenderHelper( const uno::Reference< rendering::XCanvas >&		rCanvas,
+                                             const uno::Reference< rendering::XTextLayout >& 	rTextLayout,
                                              const uno::Reference< rendering::XPolyPolygon2D >& rLinePolygon,
-                                             const rendering::ViewState&                        rViewState ) :
+                                             const rendering::ViewState&			 			rViewState ) :
                     mrCanvas( rCanvas ),
                     mrTextLayout( rTextLayout ),
                     mrLinePolygon( rLinePolygon ),
@@ -1417,8 +1417,8 @@ namespace cppcanvas
                     mrCanvas->fillPolyPolygon( mrLinePolygon,
                                                mrViewState,
                                                rRenderState );
-
-                    mrCanvas->drawTextLayout( mrTextLayout,
+                    
+                    mrCanvas->drawTextLayout( mrTextLayout, 
                                               mrViewState,
                                               rRenderState );
 
@@ -1426,19 +1426,19 @@ namespace cppcanvas
                 }
 
             private:
-                const uno::Reference< rendering::XCanvas >&         mrCanvas;
-                const uno::Reference< rendering::XTextLayout >&     mrTextLayout;
-                const uno::Reference< rendering::XPolyPolygon2D >&  mrLinePolygon;
-                const rendering::ViewState&                         mrViewState;
+                const uno::Reference< rendering::XCanvas >&			mrCanvas;
+                const uno::Reference< rendering::XTextLayout >&		mrTextLayout;
+                const uno::Reference< rendering::XPolyPolygon2D >&	mrLinePolygon;
+                const rendering::ViewState&			 				mrViewState;
             };
 
-            bool EffectTextArrayAction::render( const ::basegfx::B2DHomMatrix&  rTransformation,
-                                                const Subset&                   rSubset ) const
+            bool EffectTextArrayAction::render( const ::basegfx::B2DHomMatrix&	rTransformation,
+                                                const Subset&					rSubset ) const
             {
                 RTL_LOGFILE_CONTEXT( aLog, "::cppcanvas::internal::EffectTextArrayAction::render( subset )" );
                 RTL_LOGFILE_CONTEXT_TRACE1( aLog, "::cppcanvas::internal::EffectTextArrayAction: 0x%X", this );
 
-                rendering::RenderState                   aLocalState( maState );
+                rendering::RenderState 					 aLocalState( maState );
                 uno::Reference< rendering::XTextLayout > xTextLayout( mxTextLayout );
                 const geometry::RealRectangle2D          aTextBounds( mxTextLayout->queryTextBounds() );
 
@@ -1447,7 +1447,7 @@ namespace cppcanvas
 
                 createSubsetLayout( xTextLayout,
                                     aLocalState,
-                                    nMinPos,
+                                    nMinPos, 
                                     nMaxPos,
                                     rTransformation,
                                     rSubset );
@@ -1460,20 +1460,20 @@ namespace cppcanvas
                 // ===================================
 
                 uno::Reference< rendering::XCanvas > xCanvas( mpCanvas->getUNOCanvas() );
-                const rendering::ViewState&          rViewState( mpCanvas->getViewState() );
-
+                const rendering::ViewState&			 rViewState( mpCanvas->getViewState() );
+                
                 uno::Reference< rendering::XPolyPolygon2D > xTextLines(
-                    ::basegfx::unotools::xPolyPolygonFromB2DPolyPolygon(
+                    ::basegfx::unotools::xPolyPolygonFromB2DPolyPolygon( 
                         xCanvas->getDevice(),
-                        tools::createTextLinesPolyPolygon(
+                        tools::createTextLinesPolyPolygon( 
                             0.0, nMaxPos - nMinPos,
                             maTextLineInfo ) ) );
-
+                
 
                 // render everything
                 // =================
 
-                return renderEffectText(
+                return renderEffectText( 
                     EffectTextArrayRenderHelper( xCanvas,
                                                  xTextLayout,
                                                  xTextLines,
@@ -1503,13 +1503,13 @@ namespace cppcanvas
                                              mpCanvas->getViewState() );
             }
 
-            ::basegfx::B2DRange EffectTextArrayAction::getBounds( const ::basegfx::B2DHomMatrix&    rTransformation,
-                                                                  const Subset&                     rSubset ) const
+            ::basegfx::B2DRange EffectTextArrayAction::getBounds( const ::basegfx::B2DHomMatrix&	rTransformation,
+                                                                  const Subset&						rSubset ) const
             {
                 RTL_LOGFILE_CONTEXT( aLog, "::cppcanvas::internal::EffectTextArrayAction::getBounds( subset )" );
                 RTL_LOGFILE_CONTEXT_TRACE1( aLog, "::cppcanvas::internal::EffectTextArrayAction: 0x%X", this );
 
-                rendering::RenderState                   aLocalState( maState );
+                rendering::RenderState 					 aLocalState( maState );
                 uno::Reference< rendering::XTextLayout > xTextLayout( mxTextLayout );
                 const geometry::RealRectangle2D          aTextBounds( mxTextLayout->queryTextBounds() );
 
@@ -1518,7 +1518,7 @@ namespace cppcanvas
 
                 createSubsetLayout( xTextLayout,
                                     aLocalState,
-                                    nMinPos,
+                                    nMinPos, 
                                     nMaxPos,
                                     rTransformation,
                                     rSubset );
@@ -1531,10 +1531,10 @@ namespace cppcanvas
                 // ===================================
 
                 const ::basegfx::B2DPolyPolygon aPoly(
-                    tools::createTextLinesPolyPolygon(
+                    tools::createTextLinesPolyPolygon( 
                         0.0, nMaxPos - nMinPos,
                         maTextLineInfo ) );
-
+                
                 return calcEffectTextBounds( ::basegfx::unotools::b2DRectangleFromRealRectangle2D(
                                                  xTextLayout->queryTextBounds() ),
                                              ::basegfx::tools::getRange( aPoly ),
@@ -1554,52 +1554,52 @@ namespace cppcanvas
 
             // -------------------------------------------------------------------------
 
-            class OutlineAction :
-                public Action,
+            class OutlineAction : 
+                public Action, 
                 public TextRenderer,
                 private ::boost::noncopyable
-            {
-            public:
-                OutlineAction( const ::basegfx::B2DPoint&                           rStartPoint,
-                               const ::basegfx::B2DSize&                            rReliefOffset,
-                               const ::Color&                                       rReliefColor,
-                               const ::basegfx::B2DSize&                            rShadowOffset,
-                               const ::Color&                                       rShadowColor,
-                               const ::basegfx::B2DRectangle&                       rOutlineBounds,
-                               const uno::Reference< rendering::XPolyPolygon2D >&   rTextPoly,
-                               const ::std::vector< sal_Int32 >&                    rPolygonGlyphMap,
-                               const uno::Sequence< double >&                       rOffsets,
-                               VirtualDevice&                                       rVDev,
-                               const CanvasSharedPtr&                               rCanvas,
-                               const OutDevState&                                   rState  );
-                OutlineAction( const ::basegfx::B2DPoint&                           rStartPoint,
-                               const ::basegfx::B2DSize&                            rReliefOffset,
-                               const ::Color&                                       rReliefColor,
-                               const ::basegfx::B2DSize&                            rShadowOffset,
-                               const ::Color&                                       rShadowColor,
-                               const ::basegfx::B2DRectangle&                       rOutlineBounds,
-                               const uno::Reference< rendering::XPolyPolygon2D >&   rTextPoly,
-                               const ::std::vector< sal_Int32 >&                    rPolygonGlyphMap,
-                               const uno::Sequence< double >&                       rOffsets,
-                               VirtualDevice&                                       rVDev,
-                               const CanvasSharedPtr&                               rCanvas,
-                               const OutDevState&                                   rState,
-                               const ::basegfx::B2DHomMatrix&                       rTextTransform );
+            { 
+            public: 
+                OutlineAction( const ::basegfx::B2DPoint&							rStartPoint,  
+                               const ::basegfx::B2DSize&							rReliefOffset,  
+                               const ::Color&										rReliefColor,
+                               const ::basegfx::B2DSize&							rShadowOffset,
+                               const ::Color&										rShadowColor,
+                               const ::basegfx::B2DRectangle&						rOutlineBounds,
+                               const uno::Reference< rendering::XPolyPolygon2D >&	rTextPoly,
+                               const ::std::vector< sal_Int32 >& 					rPolygonGlyphMap,
+                               const uno::Sequence< double >&						rOffsets,
+                               VirtualDevice&										rVDev,
+                               const CanvasSharedPtr&								rCanvas, 
+                               const OutDevState& 									rState	);
+                OutlineAction( const ::basegfx::B2DPoint&							rStartPoint,  
+                               const ::basegfx::B2DSize&							rReliefOffset,  
+                               const ::Color&										rReliefColor,
+                               const ::basegfx::B2DSize&							rShadowOffset,
+                               const ::Color&										rShadowColor,
+                               const ::basegfx::B2DRectangle&						rOutlineBounds,
+                               const uno::Reference< rendering::XPolyPolygon2D >&	rTextPoly,
+                               const ::std::vector< sal_Int32 >& 					rPolygonGlyphMap,
+                               const uno::Sequence< double >&						rOffsets,
+                               VirtualDevice&										rVDev,
+                               const CanvasSharedPtr&								rCanvas, 
+                               const OutDevState& 									rState,
+                               const ::basegfx::B2DHomMatrix&						rTextTransform ); 
 
                 virtual bool render( const ::basegfx::B2DHomMatrix& rTransformation ) const;
                 virtual bool render( const ::basegfx::B2DHomMatrix& rTransformation,
-                                     const Subset&                  rSubset ) const;
+                                     const Subset&					rSubset ) const;
 
                 virtual ::basegfx::B2DRange getBounds( const ::basegfx::B2DHomMatrix& rTransformation ) const;
-                virtual ::basegfx::B2DRange getBounds( const ::basegfx::B2DHomMatrix&   rTransformation,
-                                                       const Subset&                    rSubset ) const;
+                virtual ::basegfx::B2DRange getBounds( const ::basegfx::B2DHomMatrix&	rTransformation,
+                                                       const Subset&					rSubset ) const;
 
                 virtual sal_Int32 getActionCount() const;
 
             private:
                 // TextRenderer interface
                 virtual bool operator()( const rendering::RenderState& rRenderState ) const;
-
+                    
                 // TODO(P2): This is potentially a real mass object
                 // (every character might be a separate TextAction),
                 // thus, make it as lightweight as possible. For
@@ -1607,7 +1607,7 @@ namespace cppcanvas
                 // TextActions, maybe using maOffsets for the
                 // translation.
 
-                uno::Reference< rendering::XPolyPolygon2D >         mxTextPoly;
+                uno::Reference< rendering::XPolyPolygon2D >			mxTextPoly;
 
                 /** This vector denotes the index of the start polygon
                     for the respective glyph sequence.
@@ -1617,20 +1617,20 @@ namespace cppcanvas
                     maPolygonGlyphMap[i+1] ). Note that this is wrong
                     for BiDi
                  */
-                const ::std::vector< sal_Int32 >                    maPolygonGlyphMap;
-                const uno::Sequence< double >                       maOffsets;
-                const CanvasSharedPtr                               mpCanvas;
-                rendering::RenderState                              maState;
-                double                                              mnOutlineWidth;
-                const uno::Sequence< double >                       maFillColor;
-                const tools::TextLineInfo                           maTextLineInfo;
-                ::basegfx::B2DSize                                  maLinesOverallSize;
-                const ::basegfx::B2DRectangle                       maOutlineBounds;
-                uno::Reference< rendering::XPolyPolygon2D >         mxTextLines;
-                const ::basegfx::B2DSize                            maReliefOffset;
-                const ::Color                                       maReliefColor;
-                const ::basegfx::B2DSize                            maShadowOffset;
-                const ::Color                                       maShadowColor;
+                const ::std::vector< sal_Int32 > 					maPolygonGlyphMap;
+                const uno::Sequence< double >						maOffsets;
+                const CanvasSharedPtr								mpCanvas;
+                rendering::RenderState								maState;
+                double												mnOutlineWidth;
+                const uno::Sequence< double >						maFillColor;
+                const tools::TextLineInfo							maTextLineInfo;
+                ::basegfx::B2DSize									maLinesOverallSize;
+                const ::basegfx::B2DRectangle						maOutlineBounds;
+                uno::Reference< rendering::XPolyPolygon2D >			mxTextLines;
+                const ::basegfx::B2DSize							maReliefOffset;
+                const ::Color										maReliefColor;
+                const ::basegfx::B2DSize							maShadowOffset;
+                const ::Color										maShadowColor;
             };
 
             double calcOutlineWidth( const OutDevState& rState,
@@ -1639,32 +1639,32 @@ namespace cppcanvas
                 const ::basegfx::B2DSize aFontSize( 0,
                                                     rVDev.GetFont().GetHeight() / 64.0 );
 
-                const double nOutlineWidth(
+                const double nOutlineWidth( 
                     (rState.mapModeTransform * aFontSize).getY() );
 
                 return nOutlineWidth < 1.0 ? 1.0 : nOutlineWidth;
             }
 
-            OutlineAction::OutlineAction( const ::basegfx::B2DPoint&                            rStartPoint,
-                                          const ::basegfx::B2DSize&                             rReliefOffset,
-                                          const ::Color&                                        rReliefColor,
-                                          const ::basegfx::B2DSize&                             rShadowOffset,
-                                          const ::Color&                                        rShadowColor,
-                                          const ::basegfx::B2DRectangle&                        rOutlineBounds,
-                                          const uno::Reference< rendering::XPolyPolygon2D >&    rTextPoly,
-                                          const ::std::vector< sal_Int32 >&                     rPolygonGlyphMap,
-                                          const uno::Sequence< double >&                        rOffsets,
-                                          VirtualDevice&                                        rVDev,
-                                          const CanvasSharedPtr&                                rCanvas,
-                                          const OutDevState&                                    rState  ) :
+            OutlineAction::OutlineAction( const ::basegfx::B2DPoint&							rStartPoint,  
+                                          const ::basegfx::B2DSize&								rReliefOffset,  
+                                          const ::Color&										rReliefColor,
+                                          const ::basegfx::B2DSize&								rShadowOffset,
+                                          const ::Color&										rShadowColor,
+                                          const ::basegfx::B2DRectangle&						rOutlineBounds,
+                                          const uno::Reference< rendering::XPolyPolygon2D >& 	rTextPoly,
+                                          const ::std::vector< sal_Int32 >& 					rPolygonGlyphMap,
+                                          const uno::Sequence< double >&						rOffsets,
+                                          VirtualDevice&										rVDev,
+                                          const CanvasSharedPtr&								rCanvas, 
+                                          const OutDevState& 									rState	) :
                 mxTextPoly( rTextPoly ),
                 maPolygonGlyphMap( rPolygonGlyphMap ),
                 maOffsets( rOffsets ),
                 mpCanvas( rCanvas ),
                 maState(),
                 mnOutlineWidth( calcOutlineWidth(rState,rVDev) ),
-                maFillColor(
-                    ::vcl::unotools::colorToDoubleSequence(
+                maFillColor( 
+                    ::vcl::unotools::colorToDoubleSequence( 
                         ::Color( COL_WHITE ),
                         rCanvas->getUNOCanvas()->getDevice()->getDeviceColorSpace() )),
                 maTextLineInfo( tools::createTextLineInfo( rVDev, rState ) ),
@@ -1683,31 +1683,31 @@ namespace cppcanvas
                                            maTextLineInfo );
 
                 init( maState,
-                      rStartPoint,
+                      rStartPoint, 
                       rState,
                       rCanvas );
             }
 
-            OutlineAction::OutlineAction( const ::basegfx::B2DPoint&                            rStartPoint,
-                                          const ::basegfx::B2DSize&                             rReliefOffset,
-                                          const ::Color&                                        rReliefColor,
-                                          const ::basegfx::B2DSize&                             rShadowOffset,
-                                          const ::Color&                                        rShadowColor,
-                                          const ::basegfx::B2DRectangle&                        rOutlineBounds,
-                                          const uno::Reference< rendering::XPolyPolygon2D >&    rTextPoly,
-                                          const ::std::vector< sal_Int32 >&                     rPolygonGlyphMap,
-                                          const uno::Sequence< double >&                        rOffsets,
-                                          VirtualDevice&                                        rVDev,
-                                          const CanvasSharedPtr&                                rCanvas,
-                                          const OutDevState&                                    rState,
-                                          const ::basegfx::B2DHomMatrix&                        rTextTransform ) :
+            OutlineAction::OutlineAction( const ::basegfx::B2DPoint&							rStartPoint,  
+                                          const ::basegfx::B2DSize&								rReliefOffset,  
+                                          const ::Color&										rReliefColor,
+                                          const ::basegfx::B2DSize&								rShadowOffset,
+                                          const ::Color&										rShadowColor,
+                                          const ::basegfx::B2DRectangle&						rOutlineBounds,
+                                          const uno::Reference< rendering::XPolyPolygon2D >& 	rTextPoly,
+                                          const ::std::vector< sal_Int32 >& 					rPolygonGlyphMap,
+                                          const uno::Sequence< double >&						rOffsets,
+                                          VirtualDevice&										rVDev,
+                                          const CanvasSharedPtr&								rCanvas, 
+                                          const OutDevState& 									rState,
+                                          const ::basegfx::B2DHomMatrix&						rTextTransform ) :
                 mxTextPoly( rTextPoly ),
                 maPolygonGlyphMap( rPolygonGlyphMap ),
                 maOffsets( rOffsets ),
                 mpCanvas( rCanvas ),
                 maState(),
                 mnOutlineWidth( calcOutlineWidth(rState,rVDev) ),
-                maFillColor(
+                maFillColor( 
                     ::vcl::unotools::colorToDoubleSequence(
                         ::Color( COL_WHITE ),
                         rCanvas->getUNOCanvas()->getDevice()->getDeviceColorSpace() )),
@@ -1727,7 +1727,7 @@ namespace cppcanvas
                                            maTextLineInfo );
 
                 init( maState,
-                      rStartPoint,
+                      rStartPoint, 
                       rState,
                       rCanvas,
                       rTextTransform );
@@ -1735,7 +1735,7 @@ namespace cppcanvas
 
             bool OutlineAction::operator()( const rendering::RenderState& rRenderState ) const
             {
-                const rendering::ViewState&                 rViewState( mpCanvas->getViewState() );
+                const rendering::ViewState& 				rViewState( mpCanvas->getViewState() );
                 const uno::Reference< rendering::XCanvas >& rCanvas( mpCanvas->getUNOCanvas() );
 
                 rendering::StrokeAttributes aStrokeAttributes;
@@ -1752,12 +1752,12 @@ namespace cppcanvas
                 // TODO(P1): implement caching
 
                 // background of text
-                rCanvas->fillPolyPolygon( mxTextPoly,
+                rCanvas->fillPolyPolygon( mxTextPoly, 
                                           rViewState,
                                           aLocalState );
-
+                
                 // border line of text
-                rCanvas->strokePolyPolygon( mxTextPoly,
+                rCanvas->strokePolyPolygon( mxTextPoly, 
                                             rViewState,
                                             rRenderState,
                                             aStrokeAttributes );
@@ -1796,13 +1796,13 @@ namespace cppcanvas
             class OutlineTextArrayRenderHelper : public TextRenderer
             {
             public:
-                OutlineTextArrayRenderHelper( const uno::Reference< rendering::XCanvas >&        rCanvas,
+                OutlineTextArrayRenderHelper( const uno::Reference< rendering::XCanvas >&		 rCanvas,
                                               const uno::Reference< rendering::XPolyPolygon2D >& rTextPolygon,
                                               const uno::Reference< rendering::XPolyPolygon2D >& rLinePolygon,
-                                              const rendering::ViewState&                        rViewState,
-                                              double                                             nOutlineWidth ) :
-                    maFillColor(
-                        ::vcl::unotools::colorToDoubleSequence(
+                                              const rendering::ViewState&			 			 rViewState,
+                                              double											 nOutlineWidth ) :
+                    maFillColor( 
+                        ::vcl::unotools::colorToDoubleSequence( 
                             ::Color( COL_WHITE ),
                             rCanvas->getDevice()->getDeviceColorSpace() )),
                     mnOutlineWidth( nOutlineWidth ),
@@ -1830,12 +1830,12 @@ namespace cppcanvas
                     // TODO(P1): implement caching
 
                     // background of text
-                    mrCanvas->fillPolyPolygon( mrTextPolygon,
+                    mrCanvas->fillPolyPolygon( mrTextPolygon, 
                                                mrViewState,
                                                aLocalState );
-
+                
                     // border line of text
-                    mrCanvas->strokePolyPolygon( mrTextPolygon,
+                    mrCanvas->strokePolyPolygon( mrTextPolygon, 
                                                  mrViewState,
                                                  rRenderState,
                                                  aStrokeAttributes );
@@ -1854,16 +1854,16 @@ namespace cppcanvas
                 }
 
             private:
-                const uno::Sequence< double >                       maFillColor;
-                double                                              mnOutlineWidth;
-                const uno::Reference< rendering::XCanvas >&         mrCanvas;
-                const uno::Reference< rendering::XPolyPolygon2D >&  mrTextPolygon;
-                const uno::Reference< rendering::XPolyPolygon2D >&  mrLinePolygon;
-                const rendering::ViewState&                         mrViewState;
+                const uno::Sequence< double >						maFillColor;
+                double												mnOutlineWidth;
+                const uno::Reference< rendering::XCanvas >&			mrCanvas;
+                const uno::Reference< rendering::XPolyPolygon2D >&	mrTextPolygon;
+                const uno::Reference< rendering::XPolyPolygon2D >&	mrLinePolygon;
+                const rendering::ViewState&			 				mrViewState;
             };
 
-            bool OutlineAction::render( const ::basegfx::B2DHomMatrix&  rTransformation,
-                                        const Subset&                   rSubset ) const
+            bool OutlineAction::render( const ::basegfx::B2DHomMatrix&	rTransformation,
+                                        const Subset&					rSubset ) const
             {
                 RTL_LOGFILE_CONTEXT( aLog, "::cppcanvas::internal::OutlineAction::render( subset )" );
                 RTL_LOGFILE_CONTEXT_TRACE1( aLog, "::cppcanvas::internal::OutlineAction: 0x%X", this );
@@ -1901,8 +1901,8 @@ namespace cppcanvas
                 // render everything
                 // =================
 
-                return renderEffectText(
-                    OutlineTextArrayRenderHelper(
+                return renderEffectText( 
+                    OutlineTextArrayRenderHelper( 
                         xCanvas,
                         mnOutlineWidth,
                         xTextLayout,
@@ -1933,8 +1933,8 @@ namespace cppcanvas
                                              mpCanvas->getViewState() );
             }
 
-            ::basegfx::B2DRange OutlineAction::getBounds( const ::basegfx::B2DHomMatrix&    rTransformation,
-                                                          const Subset&                     /*rSubset*/ ) const
+            ::basegfx::B2DRange OutlineAction::getBounds( const ::basegfx::B2DHomMatrix&	rTransformation,
+                                                          const Subset&						/*rSubset*/ ) const
             {
                 OSL_ENSURE( false,
                             "OutlineAction::getBounds(): Subset not yet supported by this object" );
@@ -1961,19 +1961,19 @@ namespace cppcanvas
                 text, and creates a properly setup OutlineAction from
                 it.
              */
-            ActionSharedPtr createOutline( const ::basegfx::B2DPoint&       rStartPoint,
-                                           const ::basegfx::B2DSize&        rReliefOffset,
-                                           const ::Color&                   rReliefColor,
+            ActionSharedPtr createOutline( const ::basegfx::B2DPoint&		rStartPoint,  
+                                           const ::basegfx::B2DSize&		rReliefOffset,  
+                                           const ::Color&					rReliefColor,
                                            const ::basegfx::B2DSize&        rShadowOffset,
-                                           const ::Color&                   rShadowColor,
-                                           const String&                    rText,
-                                           sal_Int32                        nStartPos,
-                                           sal_Int32                        nLen,
-                                           const sal_Int32*                 pDXArray,
-                                           VirtualDevice&                   rVDev,
-                                           const CanvasSharedPtr&           rCanvas,
-                                           const OutDevState&               rState,
-                                           const Renderer::Parameters&      rParms  )
+                                           const ::Color&					rShadowColor,
+                                           const String& 					rText,
+                                           sal_Int32 						nStartPos,
+                                           sal_Int32 						nLen,
+                                           const sal_Int32*					pDXArray,
+                                           VirtualDevice&					rVDev,
+                                           const CanvasSharedPtr&			rCanvas, 
+                                           const OutDevState& 				rState,
+                                           const Renderer::Parameters& 		rParms	)
             {
                 // operate on raw DX array here (in logical coordinate
                 // system), to have a higher resolution
@@ -1988,14 +1988,14 @@ namespace cppcanvas
                 ::Font       aUnrotatedFont( aOrigFont );
                 aUnrotatedFont.SetOrientation(0);
                 rVDev.SetFont( aUnrotatedFont );
-
+                
                 // TODO(F3): Don't understand parameter semantics of
                 // GetTextOutlines()
                 ::basegfx::B2DPolyPolygon aResultingPolyPolygon;
                 PolyPolyVector aVCLPolyPolyVector;
                 const bool bHaveOutlines( rVDev.GetTextOutlines( aVCLPolyPolyVector, rText,
                                                                  static_cast<USHORT>(nStartPos),
-                                                                 static_cast<USHORT>(nStartPos),
+                                                                 static_cast<USHORT>(nStartPos), 
                                                                  static_cast<USHORT>(nLen),
                                                                  TRUE, 0, pDXArray ) );
                 rVDev.SetFont(aOrigFont);
@@ -2011,12 +2011,12 @@ namespace cppcanvas
                 // remove offsetting from mapmode transformation
                 // (outline polygons must stay at origin, only need to
                 // be scaled)
-                ::basegfx::B2DHomMatrix aMapModeTransform(
+                ::basegfx::B2DHomMatrix aMapModeTransform( 
                     rState.mapModeTransform );
                 aMapModeTransform.set(0,2, 0.0);
                 aMapModeTransform.set(1,2, 0.0);
 
-                PolyPolyVector::const_iterator       aIter( aVCLPolyPolyVector.begin() );
+                PolyPolyVector::const_iterator 		 aIter( aVCLPolyPolyVector.begin() );
                 const PolyPolyVector::const_iterator aEnd( aVCLPolyPolyVector.end() );
                 for( ; aIter!= aEnd; ++aIter )
                 {
@@ -2065,16 +2065,16 @@ namespace cppcanvas
                                   rVDev,
                                   rState ));
                 const uno::Reference< rendering::XPolyPolygon2D > xTextPoly(
-                    ::basegfx::unotools::xPolyPolygonFromB2DPolyPolygon(
-                        rCanvas->getUNOCanvas()->getDevice(),
+                    ::basegfx::unotools::xPolyPolygonFromB2DPolyPolygon( 
+                        rCanvas->getUNOCanvas()->getDevice(), 
                         aResultingPolyPolygon ) );
 
                 if( rParms.maTextTransformation.isValid() )
                 {
-                    return ActionSharedPtr(
-                        new OutlineAction(
+                    return ActionSharedPtr( 
+                        new OutlineAction( 
                             rStartPoint,
-                            rReliefOffset,
+                            rReliefOffset,  
                             rReliefColor,
                             rShadowOffset,
                             rShadowColor,
@@ -2083,16 +2083,16 @@ namespace cppcanvas
                             aPolygonGlyphMap,
                             aCharWidthSeq,
                             rVDev,
-                            rCanvas,
+                            rCanvas, 
                             rState,
                             rParms.maTextTransformation.getValue() ) );
                 }
                 else
                 {
-                    return ActionSharedPtr(
-                        new OutlineAction(
+                    return ActionSharedPtr( 
+                        new OutlineAction( 
                             rStartPoint,
-                            rReliefOffset,
+                            rReliefOffset,  
                             rReliefColor,
                             rShadowOffset,
                             rShadowColor,
@@ -2101,50 +2101,50 @@ namespace cppcanvas
                             aPolygonGlyphMap,
                             aCharWidthSeq,
                             rVDev,
-                            rCanvas,
-                            rState  ) );
+                            rCanvas, 
+                            rState	) );
                 }
             }
 
         } // namespace
 
-
+        
         // ---------------------------------------------------------------------------------
 
-        ActionSharedPtr TextActionFactory::createTextAction( const ::Point&                 rStartPoint,
-                                                             const ::Size&                  rReliefOffset,
-                                                             const ::Color&                 rReliefColor,
-                                                             const ::Size&                  rShadowOffset,
-                                                             const ::Color&                 rShadowColor,
-                                                             const String&                  rText,
-                                                             sal_Int32                      nStartPos,
-                                                             sal_Int32                      nLen,
-                                                             const sal_Int32*               pDXArray,
-                                                             VirtualDevice&                 rVDev,
-                                                             const CanvasSharedPtr&         rCanvas,
-                                                             const OutDevState&             rState,
-                                                             const Renderer::Parameters&    rParms,
-                                                             bool                           bSubsettable    )
+        ActionSharedPtr TextActionFactory::createTextAction( const ::Point&					rStartPoint,  
+                                                             const ::Size&					rReliefOffset,  
+                                                             const ::Color&					rReliefColor,
+                                                             const ::Size&					rShadowOffset,
+                                                             const ::Color&					rShadowColor,
+                                                             const String& 					rText,
+                                                             sal_Int32 						nStartPos,
+                                                             sal_Int32 						nLen,
+                                                             const sal_Int32*				pDXArray,
+                                                             VirtualDevice&					rVDev,
+                                                             const CanvasSharedPtr&			rCanvas, 
+                                                             const OutDevState& 			rState,
+                                                             const Renderer::Parameters& 	rParms,
+                                                             bool							bSubsettable	)
         {
             const ::Size  aBaselineOffset( tools::getBaselineOffset( rState,
                                                                      rVDev ) );
             // #143885# maintain (nearly) full precision positioning,
             // by circumventing integer-based OutDev-mapping
-            const ::basegfx::B2DPoint aStartPoint(
-                rState.mapModeTransform *
+            const ::basegfx::B2DPoint aStartPoint( 
+                rState.mapModeTransform * 
                 ::basegfx::B2DPoint(rStartPoint.X() + aBaselineOffset.Width(),
                                     rStartPoint.Y() + aBaselineOffset.Height()) );
 
-            const ::basegfx::B2DSize aReliefOffset(
+            const ::basegfx::B2DSize aReliefOffset( 
                 rState.mapModeTransform * ::vcl::unotools::b2DSizeFromSize( rReliefOffset ) );
-            const ::basegfx::B2DSize aShadowOffset(
+            const ::basegfx::B2DSize aShadowOffset( 
                 rState.mapModeTransform * ::vcl::unotools::b2DSizeFromSize( rShadowOffset ) );
 
             if( rState.isTextOutlineModeSet )
             {
                 return createOutline(
-                            aStartPoint,
-                            aReliefOffset,
+                            aStartPoint,  
+                            aReliefOffset,  
                             rReliefColor,
                             aShadowOffset,
                             rShadowColor,
@@ -2153,7 +2153,7 @@ namespace cppcanvas
                             nLen,
                             pDXArray,
                             rVDev,
-                            rCanvas,
+                            rCanvas, 
                             rState,
                             rParms );
             }
@@ -2188,7 +2188,7 @@ namespace cppcanvas
                     // nope
                     if( rParms.maTextTransformation.isValid() )
                     {
-                        return ActionSharedPtr( new TextAction(
+                        return ActionSharedPtr( new TextAction( 
                                                     aStartPoint,
                                                     rText,
                                                     nStartPos,
@@ -2199,7 +2199,7 @@ namespace cppcanvas
                     }
                     else
                     {
-                        return ActionSharedPtr( new TextAction(
+                        return ActionSharedPtr( new TextAction( 
                                                     aStartPoint,
                                                     rText,
                                                     nStartPos,
@@ -2212,9 +2212,9 @@ namespace cppcanvas
                 {
                     // at least one of the effects requested
                     if( rParms.maTextTransformation.isValid() )
-                        return ActionSharedPtr( new EffectTextAction(
+                        return ActionSharedPtr( new EffectTextAction( 
                                                     aStartPoint,
-                                                    aReliefOffset,
+                                                    aReliefOffset,  
                                                     rReliefColor,
                                                     aShadowOffset,
                                                     rShadowColor,
@@ -2226,9 +2226,9 @@ namespace cppcanvas
                                                     rState,
                                                     rParms.maTextTransformation.getValue() ) );
                     else
-                        return ActionSharedPtr( new EffectTextAction(
+                        return ActionSharedPtr( new EffectTextAction( 
                                                     aStartPoint,
-                                                    aReliefOffset,
+                                                    aReliefOffset,  
                                                     rReliefColor,
                                                     aShadowOffset,
                                                     rShadowColor,
@@ -2251,7 +2251,7 @@ namespace cppcanvas
                 {
                     // nope
                     if( rParms.maTextTransformation.isValid() )
-                        return ActionSharedPtr( new TextArrayAction(
+                        return ActionSharedPtr( new TextArrayAction( 
                                                     aStartPoint,
                                                     rText,
                                                     nStartPos,
@@ -2261,7 +2261,7 @@ namespace cppcanvas
                                                     rState,
                                                     rParms.maTextTransformation.getValue() ) );
                     else
-                        return ActionSharedPtr( new TextArrayAction(
+                        return ActionSharedPtr( new TextArrayAction( 
                                                     aStartPoint,
                                                     rText,
                                                     nStartPos,
@@ -2274,9 +2274,9 @@ namespace cppcanvas
                 {
                     // at least one of the effects requested
                     if( rParms.maTextTransformation.isValid() )
-                        return ActionSharedPtr( new EffectTextArrayAction(
-                                                    aStartPoint,
-                                                    aReliefOffset,
+                        return ActionSharedPtr( new EffectTextArrayAction( 
+                                                    aStartPoint,  
+                                                    aReliefOffset,  
                                                     rReliefColor,
                                                     aShadowOffset,
                                                     rShadowColor,
@@ -2289,9 +2289,9 @@ namespace cppcanvas
                                                     rState,
                                                     rParms.maTextTransformation.getValue() ) );
                     else
-                        return ActionSharedPtr( new EffectTextArrayAction(
+                        return ActionSharedPtr( new EffectTextArrayAction( 
                                                     aStartPoint,
-                                                    aReliefOffset,
+                                                    aReliefOffset,  
                                                     rReliefColor,
                                                     aShadowOffset,
                                                     rShadowColor,
diff --git a/cppcanvas/source/mtfrenderer/textaction.hxx b/cppcanvas/source/mtfrenderer/textaction.hxx
index 43aab762f635..afb7e6e6f44b 100644
--- a/cppcanvas/source/mtfrenderer/textaction.hxx
+++ b/cppcanvas/source/mtfrenderer/textaction.hxx
@@ -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
@@ -44,8 +44,8 @@ class String;
 
 /* Definition of internal::TextActionFactory class */
 
-namespace cppcanvas
-{
+namespace cppcanvas 
+{ 
     namespace internal
     {
         struct OutDevState;
@@ -59,7 +59,7 @@ namespace cppcanvas
          */
         class TextActionFactory
         {
-        public:
+        public: 
             /** Create text action, optionally shadow/relief effect
 
                 Note that this method accepts all coordinates in
@@ -74,20 +74,20 @@ namespace cppcanvas
                 subsettable (Action::render( Subset ) works on
                 characters)
              */
-            static ActionSharedPtr createTextAction( const ::Point&                 rStartPoint,
-                                                     const ::Size&                  rReliefOffset,
-                                                     const ::Color&                 rReliefColor,
-                                                     const ::Size&                  rShadowOffset,
-                                                     const ::Color&                 rShadowColor,
-                                                     const ::String&                rText,
-                                                     sal_Int32                      nStartPos,
-                                                     sal_Int32                      nLen,
-                                                     const sal_Int32*               pDXArray,
-                                                     VirtualDevice&                 rVDev,
-                                                     const CanvasSharedPtr&         rCanvas,
-                                                     const OutDevState&             rState,
-                                                     const Renderer::Parameters&    rParms,
-                                                     bool                           bSubsettable );
+            static ActionSharedPtr createTextAction( const ::Point&					rStartPoint,  
+                                                     const ::Size&					rReliefOffset,  
+                                                     const ::Color&					rReliefColor,
+                                                     const ::Size&					rShadowOffset,
+                                                     const ::Color&					rShadowColor,
+                                                     const ::String& 				rText,
+                                                     sal_Int32 						nStartPos,
+                                                     sal_Int32 						nLen,
+                                                     const sal_Int32*				pDXArray,
+                                                     VirtualDevice&					rVDev,
+                                                     const CanvasSharedPtr&			rCanvas, 
+                                                     const OutDevState& 			rState,
+                                                     const Renderer::Parameters& 	rParms,
+                                                     bool							bSubsettable );
 
         private:
             // static factory, disable big four
@@ -96,7 +96,7 @@ namespace cppcanvas
             TextActionFactory(const TextActionFactory&);
             TextActionFactory& operator=( const TextActionFactory& );
         };
-    }
+    } 
 }
 
 #endif /* _CPPCANVAS_TEXTACTION_HXX */
diff --git a/cppcanvas/source/mtfrenderer/transparencygroupaction.cxx b/cppcanvas/source/mtfrenderer/transparencygroupaction.cxx
index a8984d41e585..2903dd0b3d3e 100644
--- a/cppcanvas/source/mtfrenderer/transparencygroupaction.cxx
+++ b/cppcanvas/source/mtfrenderer/transparencygroupaction.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
@@ -71,26 +71,26 @@
 
 using namespace ::com::sun::star;
 
-namespace cppcanvas
-{
+namespace cppcanvas 
+{ 
     namespace internal
     {
         // free support functions
         // ======================
         namespace
         {
-            class TransparencyGroupAction : public Action, private ::boost::noncopyable
-            {
-            public:
+            class TransparencyGroupAction : public Action, private ::boost::noncopyable 
+            { 
+            public: 
                 /** Create new transparency group action.
 
                     @param rGroupMtf
                     Metafile that groups all actions to be rendered
                     transparent
-
+                    
                     @param rParms
                     Render parameters
-
+                
                     @param rDstPoint
                     Left, top edge of destination, in current state
                     coordinate system
@@ -102,13 +102,13 @@ namespace cppcanvas
                     @param nAlpha
                     Alpha value, must be in the range [0,1]
                 */
-                TransparencyGroupAction( MtfAutoPtr&                    rGroupMtf,
-                                         const Renderer::Parameters&    rParms,
-                                         const ::basegfx::B2DPoint&     rDstPoint,
-                                         const ::basegfx::B2DVector&    rDstSize,
-                                         double                         nAlpha,
-                                         const CanvasSharedPtr&         rCanvas,
-                                         const OutDevState&             rState );
+                TransparencyGroupAction( MtfAutoPtr&					rGroupMtf,
+                                         const Renderer::Parameters& 	rParms,
+                                         const ::basegfx::B2DPoint& 	rDstPoint,  
+                                         const ::basegfx::B2DVector& 	rDstSize,  
+                                         double 						nAlpha,
+                                         const CanvasSharedPtr&			rCanvas, 
+                                         const OutDevState& 			rState ); 
 
                 /** Create new transparency group action.
 
@@ -131,41 +131,41 @@ namespace cppcanvas
                     Size of the transparency group object, in current
                     state coordinate system.
                 */
-                TransparencyGroupAction( MtfAutoPtr&                    rGroupMtf,
-                                         GradientAutoPtr&               rAlphaGradient,
-                                         const Renderer::Parameters&    rParms,
-                                         const ::basegfx::B2DPoint&     rDstPoint,
-                                         const ::basegfx::B2DVector&    rDstSize,
-                                         const CanvasSharedPtr&         rCanvas,
-                                         const OutDevState&             rState );
+                TransparencyGroupAction( MtfAutoPtr&					rGroupMtf,
+                                         GradientAutoPtr&				rAlphaGradient,
+                                         const Renderer::Parameters& 	rParms,
+                                         const ::basegfx::B2DPoint& 	rDstPoint,  
+                                         const ::basegfx::B2DVector& 	rDstSize,  
+                                         const CanvasSharedPtr&			rCanvas, 
+                                         const OutDevState& 			rState ); 
 
                 virtual bool render( const ::basegfx::B2DHomMatrix& rTransformation ) const;
                 virtual bool render( const ::basegfx::B2DHomMatrix& rTransformation,
-                                     const Subset&                  rSubset ) const;
+                                     const Subset&					rSubset ) const;
 
                 virtual ::basegfx::B2DRange getBounds( const ::basegfx::B2DHomMatrix& rTransformation ) const;
-                virtual ::basegfx::B2DRange getBounds( const ::basegfx::B2DHomMatrix&   rTransformation,
-                                                       const Subset&                    rSubset ) const;
+                virtual ::basegfx::B2DRange getBounds( const ::basegfx::B2DHomMatrix&	rTransformation,
+                                                       const Subset&					rSubset ) const;
 
                 virtual sal_Int32 getActionCount() const;
 
             private:
-                MtfAutoPtr                                          mpGroupMtf;
-                GradientAutoPtr                                     mpAlphaGradient;
+                MtfAutoPtr											mpGroupMtf;
+                GradientAutoPtr										mpAlphaGradient;
 
-                const Renderer::Parameters                          maParms;
+                const Renderer::Parameters 							maParms;
 
-                const ::basegfx::B2DSize                            maDstSize;
+                const ::basegfx::B2DSize 							maDstSize;
 
-                mutable uno::Reference< rendering::XBitmap >        mxBufferBitmap; // contains last rendered version
-                mutable ::basegfx::B2DHomMatrix                     maLastTransformation; // contains last active transformation
-                mutable Subset                                      maLastSubset; // contains last effective subset
+                mutable uno::Reference< rendering::XBitmap > 		mxBufferBitmap; // contains last rendered version
+                mutable ::basegfx::B2DHomMatrix						maLastTransformation; // contains last active transformation
+                mutable Subset										maLastSubset; // contains last effective subset
 
                 // transformation for
-                // mxBufferBitmap content
-                CanvasSharedPtr                                     mpCanvas;
-                rendering::RenderState                              maState;
-                const double                                        mnAlpha;
+                // mxBufferBitmap content 
+                CanvasSharedPtr										mpCanvas;            
+                rendering::RenderState								maState;
+                const double										mnAlpha;
             };
 
 
@@ -173,24 +173,24 @@ namespace cppcanvas
                 moved rPoint away, and scaled according to the ratio
                 given by src and dst size.
             */
-            void implSetupTransform( rendering::RenderState&    rRenderState,
-                                     const ::basegfx::B2DPoint& rDstPoint   )
+            void implSetupTransform( rendering::RenderState& 	rRenderState,
+                                     const ::basegfx::B2DPoint&	rDstPoint	)
             {
-                ::basegfx::B2DHomMatrix aLocalTransformation;
-
-                aLocalTransformation.translate( rDstPoint.getX(),
+                ::basegfx::B2DHomMatrix	aLocalTransformation;
+                
+                aLocalTransformation.translate( rDstPoint.getX(), 
                                                 rDstPoint.getY() );
                 ::canvas::tools::appendToRenderState( rRenderState,
                                                       aLocalTransformation );
             }
 
-            TransparencyGroupAction::TransparencyGroupAction( MtfAutoPtr&                   rGroupMtf,
-                                                              const Renderer::Parameters&   rParms,
-                                                              const ::basegfx::B2DPoint&    rDstPoint,
-                                                              const ::basegfx::B2DVector&   rDstSize,
-                                                              double                        nAlpha,
-                                                              const CanvasSharedPtr&        rCanvas,
-                                                              const OutDevState&            rState ) :
+            TransparencyGroupAction::TransparencyGroupAction( MtfAutoPtr&					rGroupMtf,
+                                                              const Renderer::Parameters& 	rParms,
+                                                              const ::basegfx::B2DPoint& 	rDstPoint,  
+                                                              const ::basegfx::B2DVector& 	rDstSize,  
+                                                              double 						nAlpha,
+                                                              const CanvasSharedPtr&		rCanvas, 
+                                                              const OutDevState& 			rState ) :
                 mpGroupMtf( rGroupMtf ),
                 mpAlphaGradient(),
                 maParms( rParms ),
@@ -205,10 +205,10 @@ namespace cppcanvas
                 implSetupTransform( maState, rDstPoint );
 
                 // correct clip (which is relative to original transform)
-                tools::modifyClip( maState,
-                                   rState,
-                                   rCanvas,
-                                   rDstPoint,
+                tools::modifyClip( maState, 
+                                   rState, 
+                                   rCanvas, 
+                                   rDstPoint, 
                                    NULL,
                                    NULL );
 
@@ -216,13 +216,13 @@ namespace cppcanvas
                 maLastSubset.mnSubsetEnd = -1;
             }
 
-            TransparencyGroupAction::TransparencyGroupAction( MtfAutoPtr&                   rGroupMtf,
-                                                              GradientAutoPtr&              rAlphaGradient,
-                                                              const Renderer::Parameters&   rParms,
-                                                              const ::basegfx::B2DPoint&    rDstPoint,
-                                                              const ::basegfx::B2DVector&   rDstSize,
-                                                              const CanvasSharedPtr&        rCanvas,
-                                                              const OutDevState&            rState ) :
+            TransparencyGroupAction::TransparencyGroupAction( MtfAutoPtr&					rGroupMtf,
+                                                              GradientAutoPtr&				rAlphaGradient,
+                                                              const Renderer::Parameters& 	rParms,
+                                                              const ::basegfx::B2DPoint& 	rDstPoint,  
+                                                              const ::basegfx::B2DVector& 	rDstSize,  
+                                                              const CanvasSharedPtr&		rCanvas, 
+                                                              const OutDevState& 			rState ) :
                 mpGroupMtf( rGroupMtf ),
                 mpAlphaGradient( rAlphaGradient ),
                 maParms( rParms ),
@@ -237,10 +237,10 @@ namespace cppcanvas
                 implSetupTransform( maState, rDstPoint );
 
                 // correct clip (which is relative to original transform)
-                tools::modifyClip( maState,
-                                   rState,
-                                   rCanvas,
-                                   rDstPoint,
+                tools::modifyClip( maState, 
+                                   rState, 
+                                   rCanvas, 
+                                   rDstPoint, 
                                    NULL,
                                    NULL );
 
@@ -255,8 +255,8 @@ namespace cppcanvas
             // into the direction of having a direct GDIMetaFile2XCanvas
             // renderer, and maybe a separate metafile XCanvas
             // implementation.
-            bool TransparencyGroupAction::render( const ::basegfx::B2DHomMatrix&    rTransformation,
-                                                  const Subset&                     rSubset ) const
+            bool TransparencyGroupAction::render( const ::basegfx::B2DHomMatrix&	rTransformation,
+                                                  const Subset&						rSubset ) const
             {
                 RTL_LOGFILE_CONTEXT( aLog, "::cppcanvas::internal::TransparencyGroupAction::render()" );
                 RTL_LOGFILE_CONTEXT_TRACE1( aLog, "::cppcanvas::internal::TransparencyGroupAction: 0x%X", this );
@@ -275,7 +275,7 @@ namespace cppcanvas
                 // does not matter, remove them before comparing
                 aTotalTransform.set( 0, 2, 0.0 );
                 aTotalTransform.set( 1, 2, 0.0 );
-
+            
                 // if there's no buffer bitmap, or as soon as the
                 // total transformation changes, we've got to
                 // re-render the bitmap
@@ -284,16 +284,16 @@ namespace cppcanvas
                     rSubset.mnSubsetBegin != maLastSubset.mnSubsetBegin ||
                     rSubset.mnSubsetEnd != maLastSubset.mnSubsetEnd )
                 {
-                    DBG_TESTSOLARMUTEX();
+                    DBG_TESTSOLARMUTEX(); 
 
                     // determine total scaling factor of the
                     // transformation matrix - need to make the bitmap
                     // large enough
                     ::basegfx::B2DTuple aScale;
                     ::basegfx::B2DTuple aTranslate;
-                    double              nRotate;
-                    double              nShearX;
-                    if( !aTotalTransform.decompose( aScale,
+                    double				nRotate;
+                    double				nShearX;
+                    if( !aTotalTransform.decompose( aScale, 
                                                     aTranslate,
                                                     nRotate,
                                                     nShearX ) )
@@ -327,7 +327,7 @@ namespace cppcanvas
                         // metaactions from mpGroupMtf
                         GDIMetaFile aMtf;
                         MetaAction* pCurrAct;
-                        int         nCurrActionIndex;
+                        int 		nCurrActionIndex;
 
                         // extract subset actions
                         for( nCurrActionIndex=0,
@@ -408,25 +408,25 @@ namespace cppcanvas
                             }
                         }
 
-                        aVDev.DrawTransparent( aMtf,
+                        aVDev.DrawTransparent( aMtf, 
                                                aEmptyPoint,
                                                aOutputSizePixel,
-                                               *mpAlphaGradient );
+                                               *mpAlphaGradient );                        
                     }
                     else
                     {
                         // no subsetting - render whole mtf
-                        aVDev.DrawTransparent( *mpGroupMtf,
+                        aVDev.DrawTransparent( *mpGroupMtf, 
                                                aEmptyPoint,
                                                aOutputSizePixel,
                                                *mpAlphaGradient );
                     }
-
+                
 
                     // update buffered bitmap and transformation
-                    BitmapSharedPtr aBmp( VCLFactory::getInstance().createBitmap(
+                    BitmapSharedPtr aBmp( VCLFactory::getInstance().createBitmap( 
                                               mpCanvas,
-                                              aVDev.GetBitmapEx(
+                                              aVDev.GetBitmapEx( 
                                                   aEmptyPoint,
                                                   aBitmapSizePixel ) ) );
                     mxBufferBitmap = aBmp->getUNOBitmap();
@@ -450,7 +450,7 @@ namespace cppcanvas
                 // Translation*Rotation*Shear*Scale. Thus, to neutralize
                 // the contained scaling, we've got to right-multiply with
                 // the inverse.
-                ::basegfx::B2ISize aBmpSize(
+                ::basegfx::B2ISize aBmpSize( 
                     ::basegfx::unotools::b2ISizeFromIntegerSize2D( mxBufferBitmap->getSize() ) );
 
                 ::basegfx::B2DHomMatrix aScaleCorrection;
@@ -463,14 +463,14 @@ namespace cppcanvas
 
 #ifdef SPECIAL_DEBUG
                 aLocalState.Clip.clear();
-                aLocalState.DeviceColor =
-                    ::vcl::unotools::colorToDoubleSequence(
+                aLocalState.DeviceColor = 
+                    ::vcl::unotools::colorToDoubleSequence( 
                         ::Color( 0x80FF0000 ),
                         mpCanvas->getUNOCanvas()->getDevice()->getDeviceColorSpace() );
 
                 if( maState.Clip.is() )
-                    mpCanvas->getUNOCanvas()->fillPolyPolygon( maState.Clip,
-                                                               mpCanvas->getViewState(),
+                    mpCanvas->getUNOCanvas()->fillPolyPolygon( maState.Clip, 
+                                                               mpCanvas->getViewState(), 
                                                                aLocalState );
 
                 aLocalState.DeviceColor = maState.DeviceColor;
@@ -488,7 +488,7 @@ namespace cppcanvas
                     // add alpha modulation value to DeviceColor
                     uno::Sequence<rendering::ARGBColor> aCols(1);
                     aCols[0] = rendering::ARGBColor( mnAlpha, 1.0, 1.0, 1.0);
-                    aLocalState.DeviceColor =
+                    aLocalState.DeviceColor = 
                         mpCanvas->getUNOCanvas()->getDevice()->getDeviceColorSpace()->convertFromARGB(
                             aCols);
 
@@ -516,13 +516,13 @@ namespace cppcanvas
 
                 return render( rTransformation, aSubset );
             }
-
-            ::basegfx::B2DRange TransparencyGroupAction::getBounds( const ::basegfx::B2DHomMatrix&  rTransformation ) const
+            
+            ::basegfx::B2DRange TransparencyGroupAction::getBounds( const ::basegfx::B2DHomMatrix&	rTransformation ) const
             {
                 rendering::RenderState aLocalState( maState );
                 ::canvas::tools::prependToRenderState(aLocalState, rTransformation);
-
-                return tools::calcDevicePixelBounds(
+                
+                return tools::calcDevicePixelBounds( 
                     ::basegfx::B2DRange( 0,0,
                                          maDstSize.getX(),
                                          maDstSize.getY() ),
@@ -530,8 +530,8 @@ namespace cppcanvas
                     aLocalState );
             }
 
-            ::basegfx::B2DRange TransparencyGroupAction::getBounds( const ::basegfx::B2DHomMatrix&  rTransformation,
-                                                                    const Subset&                   rSubset ) const
+            ::basegfx::B2DRange TransparencyGroupAction::getBounds( const ::basegfx::B2DHomMatrix&	rTransformation,
+                                                                    const Subset&					rSubset ) const
             {
                 // TODO(F3): Currently, the bounds for
                 // TransparencyGroupAction subsets equal those of the
@@ -554,13 +554,13 @@ namespace cppcanvas
 
         }
 
-        ActionSharedPtr TransparencyGroupActionFactory::createTransparencyGroupAction( MtfAutoPtr&                  rGroupMtf,
-                                                                                       const Renderer::Parameters&  rParms,
-                                                                                       const ::basegfx::B2DPoint&   rDstPoint,
-                                                                                       const ::basegfx::B2DVector&  rDstSize,
-                                                                                       double                       nAlpha,
-                                                                                       const CanvasSharedPtr&       rCanvas,
-                                                                                       const OutDevState&           rState )
+        ActionSharedPtr TransparencyGroupActionFactory::createTransparencyGroupAction( MtfAutoPtr&					rGroupMtf,
+                                                                                       const Renderer::Parameters&	rParms,
+                                                                                       const ::basegfx::B2DPoint& 	rDstPoint,  
+                                                                                       const ::basegfx::B2DVector& 	rDstSize,  
+                                                                                       double 						nAlpha,
+                                                                                       const CanvasSharedPtr&		rCanvas, 
+                                                                                       const OutDevState& 			rState )
         {
             return ActionSharedPtr( new TransparencyGroupAction(rGroupMtf,
                                                                 rParms,
@@ -571,13 +571,13 @@ namespace cppcanvas
                                                                 rState ) );
         }
 
-        ActionSharedPtr TransparencyGroupActionFactory::createTransparencyGroupAction( MtfAutoPtr&                  rGroupMtf,
-                                                                                       GradientAutoPtr&             rAlphaGradient,
-                                                                                       const Renderer::Parameters&  rParms,
-                                                                                       const ::basegfx::B2DPoint&   rDstPoint,
-                                                                                       const ::basegfx::B2DVector&  rDstSize,
-                                                                                       const CanvasSharedPtr&       rCanvas,
-                                                                                       const OutDevState&           rState )
+        ActionSharedPtr TransparencyGroupActionFactory::createTransparencyGroupAction( MtfAutoPtr&					rGroupMtf,
+                                                                                       GradientAutoPtr&				rAlphaGradient,
+                                                                                       const Renderer::Parameters&	rParms,
+                                                                                       const ::basegfx::B2DPoint& 	rDstPoint,  
+                                                                                       const ::basegfx::B2DVector&  rDstSize,  
+                                                                                       const CanvasSharedPtr&		rCanvas, 
+                                                                                       const OutDevState& 			rState )
         {
             return ActionSharedPtr( new TransparencyGroupAction(rGroupMtf,
                                                                 rAlphaGradient,
@@ -587,6 +587,6 @@ namespace cppcanvas
                                                                 rCanvas,
                                                                 rState ) );
         }
-
+        
     }
 }
diff --git a/cppcanvas/source/mtfrenderer/transparencygroupaction.hxx b/cppcanvas/source/mtfrenderer/transparencygroupaction.hxx
index 8384ea2818be..26a603acf081 100644
--- a/cppcanvas/source/mtfrenderer/transparencygroupaction.hxx
+++ b/cppcanvas/source/mtfrenderer/transparencygroupaction.hxx
@@ -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
@@ -45,14 +45,14 @@ class Gradient;
 
 /* Definition of internal::TransparencyGroupActionFactory class */
 
-namespace cppcanvas
-{
+namespace cppcanvas 
+{ 
     namespace internal
     {
         struct OutDevState;
 
-        typedef ::std::auto_ptr< GDIMetaFile >  MtfAutoPtr;
-        typedef ::std::auto_ptr< Gradient >     GradientAutoPtr;
+        typedef ::std::auto_ptr< GDIMetaFile >	MtfAutoPtr;
+        typedef ::std::auto_ptr< Gradient > 	GradientAutoPtr;
 
         /** Transparency group action.
 
@@ -68,8 +68,8 @@ namespace cppcanvas
             text layout) is Canvas-dependent.
          */
         class TransparencyGroupActionFactory
-        {
-        public:
+        { 
+        public: 
             /** Create new transparency group action.
 
                 @param rGroupMtf
@@ -90,14 +90,14 @@ namespace cppcanvas
                 @param nAlpha
                 Alpha value, must be in the range [0,1]
              */
-            static ActionSharedPtr createTransparencyGroupAction( MtfAutoPtr&                   rGroupMtf,
-                                                                  const Renderer::Parameters&   rParms,
-                                                                  const ::basegfx::B2DPoint&    rDstPoint,
-                                                                  const ::basegfx::B2DVector&   rDstSize,
-                                                                  double                        nAlpha,
-                                                                  const CanvasSharedPtr&        rCanvas,
-                                                                  const OutDevState&            rState );
-
+            static ActionSharedPtr createTransparencyGroupAction( MtfAutoPtr&					rGroupMtf,
+                                                                  const Renderer::Parameters& 	rParms,
+                                                                  const ::basegfx::B2DPoint& 	rDstPoint,  
+                                                                  const ::basegfx::B2DVector& 	rDstSize,  
+                                                                  double 						nAlpha,
+                                                                  const CanvasSharedPtr&		rCanvas, 
+                                                                  const OutDevState& 			rState ); 
+            
             /** Create new transparency group action.
 
                 @param rGroupMtf
@@ -119,14 +119,14 @@ namespace cppcanvas
                 Size of the transparency group object, in current
                 state coordinate system.
              */
-            static ActionSharedPtr createTransparencyGroupAction( MtfAutoPtr&                   rGroupMtf,
-                                                                  GradientAutoPtr&              rAlphaGradient,
-                                                                  const Renderer::Parameters&   rParms,
-                                                                  const ::basegfx::B2DPoint&    rDstPoint,
-                                                                  const ::basegfx::B2DVector&   rDstSize,
-                                                                  const CanvasSharedPtr&        rCanvas,
-                                                                  const OutDevState&            rState );
-
+            static ActionSharedPtr createTransparencyGroupAction( MtfAutoPtr&					rGroupMtf,
+                                                                  GradientAutoPtr&				rAlphaGradient,
+                                                                  const Renderer::Parameters&	rParms,
+                                                                  const ::basegfx::B2DPoint& 	rDstPoint,  
+                                                                  const ::basegfx::B2DVector& 	rDstSize,  
+                                                                  const CanvasSharedPtr&		rCanvas, 
+                                                                  const OutDevState& 			rState );
+            
         private:
             // static factory, disable big four
             TransparencyGroupActionFactory();
@@ -134,7 +134,7 @@ namespace cppcanvas
             TransparencyGroupActionFactory(const TransparencyGroupActionFactory&);
             TransparencyGroupActionFactory& operator=( const TransparencyGroupActionFactory& );
         };
-    }
+    } 
 }
 
 #endif /*_CPPCANVAS_TRANSPARENCYGROUPACTION_HXX */
diff --git a/cppcanvas/source/tools/canvasgraphichelper.cxx b/cppcanvas/source/tools/canvasgraphichelper.cxx
index 1e62b816e1d4..e10042ccc649 100644
--- a/cppcanvas/source/tools/canvasgraphichelper.cxx
+++ b/cppcanvas/source/tools/canvasgraphichelper.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
@@ -57,7 +57,7 @@ namespace cppcanvas
             mxGraphicDevice()
         {
             OSL_ENSURE( mpCanvas.get() != NULL &&
-                        mpCanvas->getUNOCanvas().is(),
+                        mpCanvas->getUNOCanvas().is(), 
                         "CanvasGraphicHelper::CanvasGraphicHelper: no valid canvas" );
 
             if( mpCanvas.get() != NULL &&
@@ -73,11 +73,11 @@ namespace cppcanvas
         {
             ::canvas::tools::setRenderStateTransform( maRenderState, rMatrix );
         }
-
+        
         ::basegfx::B2DHomMatrix CanvasGraphicHelper::getTransformation() const
         {
             ::basegfx::B2DHomMatrix aMatrix;
-            return ::canvas::tools::getRenderStateTransform( aMatrix,
+            return ::canvas::tools::getRenderStateTransform( aMatrix, 
                                                              maRenderState );
         }
 
@@ -117,13 +117,13 @@ namespace cppcanvas
 
         void CanvasGraphicHelper::setRGBAColor( Color::IntSRGBA aColor )
         {
-            maRenderState.DeviceColor = tools::intSRGBAToDoubleSequence( mxGraphicDevice,
+            maRenderState.DeviceColor = tools::intSRGBAToDoubleSequence( mxGraphicDevice, 
                                                                          aColor );
         }
 
         Color::IntSRGBA CanvasGraphicHelper::getRGBAColor() const
         {
-            return tools::doubleSequenceToIntSRGBA( mxGraphicDevice,
+            return tools::doubleSequenceToIntSRGBA( mxGraphicDevice, 
                                                     maRenderState.DeviceColor );
         }
 
@@ -142,10 +142,10 @@ namespace cppcanvas
             return mpCanvas;
         }
 
-        uno::Reference< rendering::XGraphicDevice > CanvasGraphicHelper::getGraphicDevice() const
+        uno::Reference< rendering::XGraphicDevice >	CanvasGraphicHelper::getGraphicDevice() const
         {
             return mxGraphicDevice;
         }
-
+        
     }
 }
diff --git a/cppcanvas/source/tools/tools.cxx b/cppcanvas/source/tools/tools.cxx
index 04e6d7f07458..7f71bc0b7097 100644
--- a/cppcanvas/source/tools/tools.cxx
+++ b/cppcanvas/source/tools/tools.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
@@ -37,8 +37,8 @@ namespace cppcanvas
 {
     namespace tools
     {
-        uno::Sequence< double > intSRGBAToDoubleSequence( const uno::Reference< rendering::XGraphicDevice >&,
-                                                          Color::IntSRGBA                                   aColor  )
+        uno::Sequence< double > intSRGBAToDoubleSequence( const uno::Reference< rendering::XGraphicDevice >&, 
+                                                          Color::IntSRGBA 									aColor 	)
         {
             uno::Sequence< double > aRes( 4 );
 
@@ -50,8 +50,8 @@ namespace cppcanvas
             return aRes;
         }
 
-        Color::IntSRGBA doubleSequenceToIntSRGBA( const uno::Reference< rendering::XGraphicDevice >&,
-                                                  const uno::Sequence< double >&                    rColor  )
+        Color::IntSRGBA doubleSequenceToIntSRGBA( const uno::Reference< rendering::XGraphicDevice >&, 
+                                                  const uno::Sequence< double >&					rColor 	)
         {
             return makeColor( static_cast<sal_uInt8>( 255*rColor[0] + .5 ),
                               static_cast<sal_uInt8>( 255*rColor[1] + .5 ),
diff --git a/cppcanvas/source/wrapper/basegfxfactory.cxx b/cppcanvas/source/wrapper/basegfxfactory.cxx
index acf6001d0ca7..437c0c441d55 100644
--- a/cppcanvas/source/wrapper/basegfxfactory.cxx
+++ b/cppcanvas/source/wrapper/basegfxfactory.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
@@ -68,16 +68,16 @@ namespace cppcanvas
     BaseGfxFactory::BaseGfxFactory()
     {
     }
-
+    
     BaseGfxFactory::~BaseGfxFactory()
     {
     }
 
-    PolyPolygonSharedPtr BaseGfxFactory::createPolyPolygon( const CanvasSharedPtr&          rCanvas,
-                                                            const ::basegfx::B2DPolygon&    rPoly ) const
+    PolyPolygonSharedPtr BaseGfxFactory::createPolyPolygon( const CanvasSharedPtr& 			rCanvas, 
+                                                            const ::basegfx::B2DPolygon& 	rPoly ) const
     {
         OSL_ENSURE( rCanvas.get() != NULL &&
-                    rCanvas->getUNOCanvas().is(),
+                    rCanvas->getUNOCanvas().is(), 
                     "BaseGfxFactory::createPolyPolygon(): Invalid canvas" );
 
         if( rCanvas.get() == NULL )
@@ -87,18 +87,18 @@ namespace cppcanvas
         if( !xCanvas.is() )
             return PolyPolygonSharedPtr();
 
-        return PolyPolygonSharedPtr(
-            new internal::ImplPolyPolygon( rCanvas,
+        return PolyPolygonSharedPtr( 
+            new internal::ImplPolyPolygon( rCanvas, 
                                            ::basegfx::unotools::xPolyPolygonFromB2DPolygon(
                                                xCanvas->getDevice(),
                                                rPoly) ) );
     }
-
-    PolyPolygonSharedPtr BaseGfxFactory::createPolyPolygon( const CanvasSharedPtr&              rCanvas,
-                                                            const ::basegfx::B2DPolyPolygon&    rPolyPoly ) const
+    
+    PolyPolygonSharedPtr BaseGfxFactory::createPolyPolygon( const CanvasSharedPtr& 				rCanvas, 
+                                                            const ::basegfx::B2DPolyPolygon& 	rPolyPoly ) const
     {
         OSL_ENSURE( rCanvas.get() != NULL &&
-                    rCanvas->getUNOCanvas().is(),
+                    rCanvas->getUNOCanvas().is(), 
                     "BaseGfxFactory::createPolyPolygon(): Invalid canvas" );
 
         if( rCanvas.get() == NULL )
@@ -108,20 +108,20 @@ namespace cppcanvas
         if( !xCanvas.is() )
             return PolyPolygonSharedPtr();
 
-        return PolyPolygonSharedPtr(
-            new internal::ImplPolyPolygon( rCanvas,
+        return PolyPolygonSharedPtr( 
+            new internal::ImplPolyPolygon( rCanvas, 
                                            ::basegfx::unotools::xPolyPolygonFromB2DPolyPolygon(
                                                xCanvas->getDevice(),
                                                rPolyPoly) ) );
     }
 
-    BitmapSharedPtr BaseGfxFactory::createBitmap( const CanvasSharedPtr&    rCanvas,
+    BitmapSharedPtr BaseGfxFactory::createBitmap( const CanvasSharedPtr&	rCanvas, 
                                                   const ::basegfx::B2ISize& rSize ) const
     {
         OSL_ENSURE( rCanvas.get() != NULL &&
-                    rCanvas->getUNOCanvas().is(),
+                    rCanvas->getUNOCanvas().is(), 
                     "BaseGfxFactory::createBitmap(): Invalid canvas" );
-
+        
         if( rCanvas.get() == NULL )
             return BitmapSharedPtr();
 
@@ -129,19 +129,19 @@ namespace cppcanvas
         if( !xCanvas.is() )
             return BitmapSharedPtr();
 
-        return BitmapSharedPtr(
-            new internal::ImplBitmap( rCanvas,
-                                      xCanvas->getDevice()->createCompatibleBitmap(
+        return BitmapSharedPtr( 
+            new internal::ImplBitmap( rCanvas, 
+                                      xCanvas->getDevice()->createCompatibleBitmap( 
                                           ::basegfx::unotools::integerSize2DFromB2ISize(rSize) ) ) );
     }
 
-    BitmapSharedPtr BaseGfxFactory::createAlphaBitmap( const CanvasSharedPtr&   rCanvas,
+    BitmapSharedPtr BaseGfxFactory::createAlphaBitmap( const CanvasSharedPtr&	rCanvas, 
                                                        const ::basegfx::B2ISize& rSize ) const
     {
         OSL_ENSURE( rCanvas.get() != NULL &&
-                    rCanvas->getUNOCanvas().is(),
+                    rCanvas->getUNOCanvas().is(), 
                     "BaseGfxFactory::createBitmap(): Invalid canvas" );
-
+        
         if( rCanvas.get() == NULL )
             return BitmapSharedPtr();
 
@@ -149,15 +149,15 @@ namespace cppcanvas
         if( !xCanvas.is() )
             return BitmapSharedPtr();
 
-        return BitmapSharedPtr(
-            new internal::ImplBitmap( rCanvas,
-                                      xCanvas->getDevice()->createCompatibleAlphaBitmap(
+        return BitmapSharedPtr( 
+            new internal::ImplBitmap( rCanvas, 
+                                      xCanvas->getDevice()->createCompatibleAlphaBitmap( 
                                           ::basegfx::unotools::integerSize2DFromB2ISize(rSize) ) ) );
     }
 
     TextSharedPtr BaseGfxFactory::createText( const CanvasSharedPtr& rCanvas, const ::rtl::OUString& rText ) const
     {
-        return TextSharedPtr( new internal::ImplText( rCanvas,
+        return TextSharedPtr( new internal::ImplText( rCanvas, 
                                                       rText ) );
     }
 
diff --git a/cppcanvas/source/wrapper/implbitmap.cxx b/cppcanvas/source/wrapper/implbitmap.cxx
index 81d5a5d4e755..68523910a55a 100644
--- a/cppcanvas/source/wrapper/implbitmap.cxx
+++ b/cppcanvas/source/wrapper/implbitmap.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
@@ -43,7 +43,7 @@ namespace cppcanvas
     namespace internal
     {
 
-        ImplBitmap::ImplBitmap( const CanvasSharedPtr&                      rParentCanvas,
+        ImplBitmap::ImplBitmap( const CanvasSharedPtr& 						rParentCanvas,
                                 const uno::Reference< rendering::XBitmap >& rBitmap ) :
             CanvasGraphicHelper( rParentCanvas ),
             mxBitmap( rBitmap ),
@@ -54,7 +54,7 @@ namespace cppcanvas
             uno::Reference< rendering::XBitmapCanvas > xBitmapCanvas( rBitmap,
                                                                       uno::UNO_QUERY );
             if( xBitmapCanvas.is() )
-                mpBitmapCanvas.reset( new ImplBitmapCanvas(
+                mpBitmapCanvas.reset( new ImplBitmapCanvas( 
                                           uno::Reference< rendering::XBitmapCanvas >(rBitmap,
                                                                                      uno::UNO_QUERY) ) );
         }
@@ -78,8 +78,8 @@ namespace cppcanvas
             }
 
             // TODO(P1): implement caching
-            pCanvas->getUNOCanvas()->drawBitmap( mxBitmap,
-                                                 pCanvas->getViewState(),
+            pCanvas->getUNOCanvas()->drawBitmap( mxBitmap, 
+                                                 pCanvas->getViewState(), 
                                                  getRenderState() );
 
             return true;
@@ -102,12 +102,12 @@ namespace cppcanvas
             rendering::RenderState aLocalState( getRenderState() );
             uno::Sequence<rendering::ARGBColor> aCol(1);
             aCol[0] = rendering::ARGBColor( nAlphaModulation, 1.0, 1.0, 1.0 );
-            aLocalState.DeviceColor =
+            aLocalState.DeviceColor = 
                 pCanvas->getUNOCanvas()->getDevice()->getDeviceColorSpace()->convertFromARGB(aCol);
 
             // TODO(P1): implement caching
-            pCanvas->getUNOCanvas()->drawBitmapModulated( mxBitmap,
-                                                          pCanvas->getViewState(),
+            pCanvas->getUNOCanvas()->drawBitmapModulated( mxBitmap, 
+                                                          pCanvas->getViewState(), 
                                                           aLocalState );
 
             return true;
diff --git a/cppcanvas/source/wrapper/implbitmap.hxx b/cppcanvas/source/wrapper/implbitmap.hxx
index 974eb4176b5a..7d0d5e9a41f8 100644
--- a/cppcanvas/source/wrapper/implbitmap.hxx
+++ b/cppcanvas/source/wrapper/implbitmap.hxx
@@ -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
@@ -53,7 +53,7 @@ namespace cppcanvas
         public:
 
             ImplBitmap( const CanvasSharedPtr& rParentCanvas,
-                        const ::com::sun::star::uno::Reference<
+                        const ::com::sun::star::uno::Reference< 
                             ::com::sun::star::rendering::XBitmap >& rBitmap );
 
             virtual ~ImplBitmap();
@@ -62,19 +62,19 @@ namespace cppcanvas
             virtual bool draw() const;
             virtual bool drawAlphaModulated( double nAlphaModulation ) const;
 
-            virtual BitmapCanvasSharedPtr                       getBitmapCanvas() const;
+            virtual BitmapCanvasSharedPtr						getBitmapCanvas() const;
 
             // Bitmap implementation
-            virtual ::com::sun::star::uno::Reference<
-                ::com::sun::star::rendering::XBitmap >  getUNOBitmap() const;
+            virtual ::com::sun::star::uno::Reference< 
+                ::com::sun::star::rendering::XBitmap > 	getUNOBitmap() const;
 
         private:
             // default: disabled copy/assignment
             ImplBitmap(const ImplBitmap&);
             ImplBitmap& operator=( const ImplBitmap& );
 
-            const ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XBitmap >  mxBitmap;
-            BitmapCanvasSharedPtr                                                                   mpBitmapCanvas;
+            const ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XBitmap > 	mxBitmap;
+            BitmapCanvasSharedPtr																	mpBitmapCanvas;
          };
     }
 }
diff --git a/cppcanvas/source/wrapper/implbitmapcanvas.cxx b/cppcanvas/source/wrapper/implbitmapcanvas.cxx
index b9de616ebab1..3885a8784682 100644
--- a/cppcanvas/source/wrapper/implbitmapcanvas.cxx
+++ b/cppcanvas/source/wrapper/implbitmapcanvas.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
@@ -58,7 +58,7 @@ namespace cppcanvas
         ImplBitmapCanvas::~ImplBitmapCanvas()
         {
         }
-
+        
         ::basegfx::B2ISize ImplBitmapCanvas::getSize() const
         {
             OSL_ENSURE( mxBitmap.is(), "ImplBitmapCanvas::getSize(): Invalid canvas" );
diff --git a/cppcanvas/source/wrapper/implbitmapcanvas.hxx b/cppcanvas/source/wrapper/implbitmapcanvas.hxx
index 7d70f226848e..5d97f91e850d 100644
--- a/cppcanvas/source/wrapper/implbitmapcanvas.hxx
+++ b/cppcanvas/source/wrapper/implbitmapcanvas.hxx
@@ -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
@@ -52,13 +52,13 @@ namespace cppcanvas
         class ImplBitmapCanvas : public virtual BitmapCanvas, protected virtual ImplCanvas
         {
         public:
-            ImplBitmapCanvas( const ::com::sun::star::uno::Reference<
+            ImplBitmapCanvas( const ::com::sun::star::uno::Reference< 
                                   ::com::sun::star::rendering::XBitmapCanvas >& rCanvas );
             virtual ~ImplBitmapCanvas();
 
-            virtual ::basegfx::B2ISize      getSize() const;
+            virtual ::basegfx::B2ISize 		getSize() const;
 
-            virtual CanvasSharedPtr         clone() const;
+            virtual CanvasSharedPtr			clone() const;
 
             // take compiler-provided default copy constructor
             //ImplBitmapCanvas(const ImplBitmapCanvas&);
@@ -67,8 +67,8 @@ namespace cppcanvas
             // default: disabled assignment
             ImplBitmapCanvas& operator=( const ImplBitmapCanvas& );
 
-            const ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XBitmapCanvas >    mxBitmapCanvas;
-            const ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XBitmap >          mxBitmap;
+            const ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XBitmapCanvas > 	mxBitmapCanvas;
+            const ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XBitmap > 			mxBitmap;
         };
     }
 }
diff --git a/cppcanvas/source/wrapper/implcanvas.cxx b/cppcanvas/source/wrapper/implcanvas.cxx
index e08f270d117b..92e2678edf0e 100644
--- a/cppcanvas/source/wrapper/implcanvas.cxx
+++ b/cppcanvas/source/wrapper/implcanvas.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
@@ -72,10 +72,10 @@ namespace cppcanvas
         ::basegfx::B2DHomMatrix ImplCanvas::getTransformation() const
         {
             ::basegfx::B2DHomMatrix aMatrix;
-            return ::canvas::tools::getViewStateTransform( aMatrix,
+            return ::canvas::tools::getViewStateTransform( aMatrix, 
                                                            maViewState );
         }
-
+            
         void ImplCanvas::setClip( const ::basegfx::B2DPolyPolygon& rClipPoly )
         {
             // TODO(T3): not thread-safe. B2DPolyPolygon employs copy-on-write
@@ -98,7 +98,7 @@ namespace cppcanvas
         {
             return FontSharedPtr( new ImplFont( getUNOCanvas(), rFontName, rCellSize ) );
         }
-
+    
         ColorSharedPtr ImplCanvas::createColor() const
         {
             return ColorSharedPtr( new ImplColor( getUNOCanvas()->getDevice() ) );
@@ -108,7 +108,7 @@ namespace cppcanvas
         {
             return CanvasSharedPtr( new ImplCanvas( *this ) );
         }
-
+    
         void ImplCanvas::clear() const
         {
             OSL_ENSURE( mxCanvas.is(), "ImplCanvas::clear(): Invalid XCanvas" );
diff --git a/cppcanvas/source/wrapper/implcanvas.hxx b/cppcanvas/source/wrapper/implcanvas.hxx
index 87cb8b8c85fc..dc2d0d89587f 100644
--- a/cppcanvas/source/wrapper/implcanvas.hxx
+++ b/cppcanvas/source/wrapper/implcanvas.hxx
@@ -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
@@ -45,7 +45,7 @@ namespace basegfx
     class B2DPolyPolygon;
 }
 
-namespace com { namespace sun { namespace star { namespace rendering
+namespace com { namespace sun { namespace star { namespace rendering 
 {
     class  XCanvas;
 } } } }
@@ -62,29 +62,29 @@ namespace cppcanvas
         class ImplCanvas : public virtual Canvas
         {
         public:
-            ImplCanvas( const ::com::sun::star::uno::Reference<
+            ImplCanvas( const ::com::sun::star::uno::Reference< 
                             ::com::sun::star::rendering::XCanvas >& rCanvas );
             virtual ~ImplCanvas();
 
             virtual void                             setTransformation( const ::basegfx::B2DHomMatrix& rMatrix );
             virtual ::basegfx::B2DHomMatrix          getTransformation() const;
-
+            
             virtual void                             setClip( const ::basegfx::B2DPolyPolygon& rClipPoly );
             virtual void                             setClip();
             virtual ::basegfx::B2DPolyPolygon const* getClip() const;
-
+            
             virtual FontSharedPtr                    createFont( const ::rtl::OUString& rFontName, const double& rCellSize ) const;
-
+            
             virtual ColorSharedPtr                   createColor() const;
-
+            
             virtual CanvasSharedPtr                  clone() const;
 
             virtual void                             clear() const;
 
-            virtual ::com::sun::star::uno::Reference<
-                ::com::sun::star::rendering::XCanvas >      getUNOCanvas() const;
+            virtual ::com::sun::star::uno::Reference< 
+                ::com::sun::star::rendering::XCanvas > 		getUNOCanvas() const;
 
-            virtual ::com::sun::star::rendering::ViewState  getViewState() const;
+            virtual ::com::sun::star::rendering::ViewState	getViewState() const;
 
             // take compiler-provided default copy constructor
             //ImplCanvas(const ImplCanvas&);
@@ -93,9 +93,9 @@ namespace cppcanvas
             // default: disabled assignment
             ImplCanvas& operator=( const ImplCanvas& );
 
-            mutable ::com::sun::star::rendering::ViewState                                  maViewState;
+            mutable ::com::sun::star::rendering::ViewState									maViewState;
             boost::optional<basegfx::B2DPolyPolygon>                                        maClipPolyPolygon;
-            const ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XCanvas >  mxCanvas;
+            const ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XCanvas > 	mxCanvas;
         };
 
     }
diff --git a/cppcanvas/source/wrapper/implcolor.cxx b/cppcanvas/source/wrapper/implcolor.cxx
index 9e591e3e98f0..fe3e3718f944 100644
--- a/cppcanvas/source/wrapper/implcolor.cxx
+++ b/cppcanvas/source/wrapper/implcolor.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
diff --git a/cppcanvas/source/wrapper/implcolor.hxx b/cppcanvas/source/wrapper/implcolor.hxx
index 5140d905245c..16440f38bcb8 100644
--- a/cppcanvas/source/wrapper/implcolor.hxx
+++ b/cppcanvas/source/wrapper/implcolor.hxx
@@ -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
@@ -49,15 +49,15 @@ namespace cppcanvas
         class ImplColor : public Color
         {
         public:
-            ImplColor( const ::com::sun::star::uno::Reference<
+            ImplColor( const ::com::sun::star::uno::Reference< 
                                ::com::sun::star::rendering::XGraphicDevice >& rDevice );
             virtual ~ImplColor();
 
-            virtual IntSRGBA                                    getIntSRGBA( ::com::sun::star::uno::Sequence< double >& rDeviceColor ) const;
-            virtual ::com::sun::star::uno::Sequence< double >   getDeviceColor( IntSRGBA aSRGBA ) const;
+            virtual IntSRGBA 									getIntSRGBA( ::com::sun::star::uno::Sequence< double >& rDeviceColor ) const;
+            virtual ::com::sun::star::uno::Sequence< double > 	getDeviceColor( IntSRGBA aSRGBA ) const;
 
         private:
-            ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XGraphicDevice > mxDevice;
+            ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XGraphicDevice >	mxDevice;
         };
 
     }
diff --git a/cppcanvas/source/wrapper/implcustomsprite.cxx b/cppcanvas/source/wrapper/implcustomsprite.cxx
index 786b3699af3b..1d43d7cb0b27 100644
--- a/cppcanvas/source/wrapper/implcustomsprite.cxx
+++ b/cppcanvas/source/wrapper/implcustomsprite.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
@@ -39,10 +39,10 @@ namespace cppcanvas
 {
     namespace internal
     {
-        ImplCustomSprite::ImplCustomSprite( const uno::Reference< rendering::XSpriteCanvas >&       rParentCanvas,
-                                            const uno::Reference< rendering::XCustomSprite >&       rSprite,
-                                            const ImplSpriteCanvas::TransformationArbiterSharedPtr& rTransformArbiter ) :
-            ImplSprite( rParentCanvas,
+        ImplCustomSprite::ImplCustomSprite( const uno::Reference< rendering::XSpriteCanvas >& 		rParentCanvas,
+                                            const uno::Reference< rendering::XCustomSprite >& 		rSprite,
+                                            const ImplSpriteCanvas::TransformationArbiterSharedPtr&	rTransformArbiter ) :
+            ImplSprite( rParentCanvas, 
                         uno::Reference< rendering::XSprite >(rSprite,
                                                              uno::UNO_QUERY),
                         rTransformArbiter ),
diff --git a/cppcanvas/source/wrapper/implcustomsprite.hxx b/cppcanvas/source/wrapper/implcustomsprite.hxx
index b02eab38df1e..5498d7d2e198 100644
--- a/cppcanvas/source/wrapper/implcustomsprite.hxx
+++ b/cppcanvas/source/wrapper/implcustomsprite.hxx
@@ -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
@@ -48,11 +48,11 @@ namespace cppcanvas
         class ImplCustomSprite : public virtual CustomSprite, protected virtual ImplSprite
         {
         public:
-            ImplCustomSprite( const ::com::sun::star::uno::Reference<
-                                      ::com::sun::star::rendering::XSpriteCanvas >&     rParentCanvas,
-                              const ::com::sun::star::uno::Reference<
-                                      ::com::sun::star::rendering::XCustomSprite >&     rSprite,
-                              const ImplSpriteCanvas::TransformationArbiterSharedPtr&       rTransformArbiter );
+            ImplCustomSprite( const ::com::sun::star::uno::Reference< 
+                                      ::com::sun::star::rendering::XSpriteCanvas >& 	rParentCanvas,
+                              const ::com::sun::star::uno::Reference< 
+                                      ::com::sun::star::rendering::XCustomSprite >& 	rSprite,
+                              const ImplSpriteCanvas::TransformationArbiterSharedPtr&		rTransformArbiter );
             virtual ~ImplCustomSprite();
 
             virtual CanvasSharedPtr getContentCanvas() const;
@@ -62,8 +62,8 @@ namespace cppcanvas
             ImplCustomSprite(const ImplCustomSprite&);
             ImplCustomSprite& operator=( const ImplCustomSprite& );
 
-            mutable CanvasSharedPtr                                                                         mpLastCanvas;
-            const ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XCustomSprite >    mxCustomSprite;
+            mutable CanvasSharedPtr																			mpLastCanvas;
+            const ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XCustomSprite > 	mxCustomSprite;
         };
     }
 }
diff --git a/cppcanvas/source/wrapper/implfont.cxx b/cppcanvas/source/wrapper/implfont.cxx
index 48decd6677da..f3354a4a0c8c 100644
--- a/cppcanvas/source/wrapper/implfont.cxx
+++ b/cppcanvas/source/wrapper/implfont.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
@@ -42,7 +42,7 @@ namespace cppcanvas
     {
 
         ImplFont::ImplFont( const uno::Reference< rendering::XCanvas >& rCanvas,
-                            const ::rtl::OUString& rFontName,
+                            const ::rtl::OUString& rFontName, 
                             const double& rCellSize ) :
             mxCanvas( rCanvas ),
             mxFont( NULL )
@@ -56,12 +56,12 @@ namespace cppcanvas
             geometry::Matrix2D aFontMatrix;
             ::canvas::tools::setIdentityMatrix2D( aFontMatrix );
 
-            mxFont = mxCanvas->createFont( aFontRequest,
+            mxFont = mxCanvas->createFont( aFontRequest, 
                                            uno::Sequence< beans::PropertyValue >(),
                                            aFontMatrix );
         }
 
-
+        
         ImplFont::~ImplFont()
         {
         }
diff --git a/cppcanvas/source/wrapper/implfont.hxx b/cppcanvas/source/wrapper/implfont.hxx
index c7b93b876e10..e20a4d4b06eb 100644
--- a/cppcanvas/source/wrapper/implfont.hxx
+++ b/cppcanvas/source/wrapper/implfont.hxx
@@ -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
@@ -44,7 +44,7 @@ namespace rtl
     class OUString;
 }
 
-namespace com { namespace sun { namespace star { namespace rendering
+namespace com { namespace sun { namespace star { namespace rendering 
 {
     class  XCanvasFont;
 } } } }
@@ -60,22 +60,22 @@ namespace cppcanvas
         class ImplFont : public Font
         {
         public:
-            ImplFont( const ::com::sun::star::uno::Reference<
+            ImplFont( const ::com::sun::star::uno::Reference< 
                           ::com::sun::star::rendering::XCanvas >& rCanvas,
-                      const ::rtl::OUString& rFontName,
+                      const ::rtl::OUString& rFontName, 
                       const double& rCellSize );
 
             virtual ~ImplFont();
 
             virtual ::rtl::OUString getName() const;
-            virtual double          getCellSize() const;
+            virtual double 			getCellSize() const;
 
-            virtual ::com::sun::star::uno::Reference<
+            virtual ::com::sun::star::uno::Reference< 
                 ::com::sun::star::rendering::XCanvasFont > getUNOFont() const;
 
         private:
-            ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XCanvas >        mxCanvas;
-            ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XCanvasFont >    mxFont;
+            ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XCanvas >		mxCanvas;
+            ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XCanvasFont >	mxFont;
         };
     }
 }
diff --git a/cppcanvas/source/wrapper/implpolypolygon.cxx b/cppcanvas/source/wrapper/implpolypolygon.cxx
index 5e7b8c8cf635..fad73948a38f 100644
--- a/cppcanvas/source/wrapper/implpolypolygon.cxx
+++ b/cppcanvas/source/wrapper/implpolypolygon.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
@@ -52,12 +52,12 @@ namespace cppcanvas
                                           const uno::Reference< rendering::XPolyPolygon2D >& rPolyPoly ) :
             CanvasGraphicHelper( rParentCanvas ),
             mxPolyPoly( rPolyPoly ),
-            maStrokeAttributes(1.0,
-                               10.0,
-                               uno::Sequence< double >(),
-                               uno::Sequence< double >(),
-                               rendering::PathCapType::ROUND,
-                               rendering::PathCapType::ROUND,
+            maStrokeAttributes(1.0, 
+                               10.0, 
+                               uno::Sequence< double >(), 
+                               uno::Sequence< double >(), 
+                               rendering::PathCapType::ROUND, 
+                               rendering::PathCapType::ROUND, 
                                rendering::PathJoinType::ROUND ),
             maFillColor(),
             maStrokeColor(),
@@ -73,7 +73,7 @@ namespace cppcanvas
 
         void ImplPolyPolygon::addPolygon( const ::basegfx::B2DPolygon& rPoly )
         {
-            OSL_ENSURE( mxPolyPoly.is(),
+            OSL_ENSURE( mxPolyPoly.is(), 
                         "ImplPolyPolygon::addPolygon(): Invalid polygon" );
 
             if( !mxPolyPoly.is() )
@@ -81,9 +81,9 @@ namespace cppcanvas
 
             uno::Reference< rendering::XGraphicDevice > xDevice( getGraphicDevice() );
 
-            OSL_ENSURE( xDevice.is(),
+            OSL_ENSURE( xDevice.is(), 
                         "ImplPolyPolygon::addPolygon(): Invalid graphic device" );
-
+            
             if( !xDevice.is() )
                 return;
 
@@ -95,7 +95,7 @@ namespace cppcanvas
 
         void ImplPolyPolygon::addPolyPolygon( const ::basegfx::B2DPolyPolygon& rPoly )
         {
-            OSL_ENSURE( mxPolyPoly.is(),
+            OSL_ENSURE( mxPolyPoly.is(), 
                         "ImplPolyPolygon::addPolyPolygon(): Invalid polygon" );
 
             if( !mxPolyPoly.is() )
@@ -103,9 +103,9 @@ namespace cppcanvas
 
             uno::Reference< rendering::XGraphicDevice > xDevice( getGraphicDevice() );
 
-            OSL_ENSURE( xDevice.is(),
+            OSL_ENSURE( xDevice.is(), 
                         "ImplPolyPolygon::addPolyPolygon(): Invalid graphic device" );
-
+            
             if( !xDevice.is() )
                 return;
 
@@ -117,27 +117,27 @@ namespace cppcanvas
 
         void ImplPolyPolygon::setRGBAFillColor( Color::IntSRGBA aColor )
         {
-            maFillColor = tools::intSRGBAToDoubleSequence( getGraphicDevice(),
+            maFillColor = tools::intSRGBAToDoubleSequence( getGraphicDevice(), 
                                                            aColor );
             mbFillColorSet = true;
         }
 
         void ImplPolyPolygon::setRGBALineColor( Color::IntSRGBA aColor )
         {
-            maStrokeColor = tools::intSRGBAToDoubleSequence( getGraphicDevice(),
+            maStrokeColor = tools::intSRGBAToDoubleSequence( getGraphicDevice(), 
                                                              aColor );
             mbStrokeColorSet = true;
         }
 
         Color::IntSRGBA ImplPolyPolygon::getRGBAFillColor() const
         {
-            return tools::doubleSequenceToIntSRGBA( getGraphicDevice(),
+            return tools::doubleSequenceToIntSRGBA( getGraphicDevice(),  
                                                     maFillColor );
         }
 
         Color::IntSRGBA ImplPolyPolygon::getRGBALineColor() const
         {
-            return tools::doubleSequenceToIntSRGBA( getGraphicDevice(),
+            return tools::doubleSequenceToIntSRGBA( getGraphicDevice(),  
                                                     maStrokeColor );
         }
 
@@ -158,7 +158,7 @@ namespace cppcanvas
             OSL_ENSURE( pCanvas.get() != NULL &&
                         pCanvas->getUNOCanvas().is(),
                         "ImplBitmap::draw: invalid canvas" );
-
+            
             if( pCanvas.get() == NULL ||
                 !pCanvas->getUNOCanvas().is() )
                 return false;
@@ -168,8 +168,8 @@ namespace cppcanvas
                 rendering::RenderState aLocalState( getRenderState() );
                 aLocalState.DeviceColor = maFillColor;
 
-                pCanvas->getUNOCanvas()->fillPolyPolygon( mxPolyPoly,
-                                                          pCanvas->getViewState(),
+                pCanvas->getUNOCanvas()->fillPolyPolygon( mxPolyPoly, 
+                                                          pCanvas->getViewState(), 
                                                           aLocalState );
             }
 
@@ -179,17 +179,17 @@ namespace cppcanvas
                 aLocalState.DeviceColor = maStrokeColor;
 
                 if( ::rtl::math::approxEqual(maStrokeAttributes.StrokeWidth, 1.0) )
-                    pCanvas->getUNOCanvas()->drawPolyPolygon( mxPolyPoly,
-                                                              pCanvas->getViewState(),
+                    pCanvas->getUNOCanvas()->drawPolyPolygon( mxPolyPoly, 
+                                                              pCanvas->getViewState(), 
                                                               aLocalState );
                 else
-                    pCanvas->getUNOCanvas()->strokePolyPolygon( mxPolyPoly,
-                                                                pCanvas->getViewState(),
+                    pCanvas->getUNOCanvas()->strokePolyPolygon( mxPolyPoly, 
+                                                                pCanvas->getViewState(), 
                                                                 aLocalState,
                                                                 maStrokeAttributes );
             }
 
-            return true;
+            return true;            
         }
 
         uno::Reference< rendering::XPolyPolygon2D > ImplPolyPolygon::getUNOPolyPolygon() const
diff --git a/cppcanvas/source/wrapper/implpolypolygon.hxx b/cppcanvas/source/wrapper/implpolypolygon.hxx
index bd5e02d6a3de..85f68c9cebcb 100644
--- a/cppcanvas/source/wrapper/implpolypolygon.hxx
+++ b/cppcanvas/source/wrapper/implpolypolygon.hxx
@@ -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
@@ -42,7 +42,7 @@
 #include <cppcanvas/polypolygon.hxx>
 #include <canvasgraphichelper.hxx>
 
-namespace com { namespace sun { namespace star { namespace rendering
+namespace com { namespace sun { namespace star { namespace rendering 
 {
     struct RealPoint2D;
 } } } }
@@ -57,40 +57,40 @@ namespace cppcanvas
         {
         public:
             ImplPolyPolygon( const CanvasSharedPtr& rParentCanvas,
-                             const ::com::sun::star::uno::Reference<
+                             const ::com::sun::star::uno::Reference< 
                                  ::com::sun::star::rendering::XPolyPolygon2D >& rPolyPoly );
 
             virtual ~ImplPolyPolygon();
 
-            virtual void            addPolygon( const ::basegfx::B2DPolygon& rPoly );
-            virtual void            addPolyPolygon( const ::basegfx::B2DPolyPolygon& rPoly );
+            virtual void 			addPolygon( const ::basegfx::B2DPolygon& rPoly );
+            virtual void 			addPolyPolygon( const ::basegfx::B2DPolyPolygon& rPoly );
 
-            virtual void            setRGBAFillColor( Color::IntSRGBA );
-            virtual void            setRGBALineColor( Color::IntSRGBA );
-            virtual Color::IntSRGBA getRGBAFillColor() const;
-            virtual Color::IntSRGBA getRGBALineColor() const;
+            virtual void			setRGBAFillColor( Color::IntSRGBA );
+            virtual void			setRGBALineColor( Color::IntSRGBA );
+            virtual Color::IntSRGBA	getRGBAFillColor() const;
+            virtual Color::IntSRGBA	getRGBALineColor() const;
 
-            virtual void            setStrokeWidth( const double& rStrokeWidth );
-            virtual double          getStrokeWidth() const;
+            virtual void 			setStrokeWidth( const double& rStrokeWidth );
+            virtual double 			getStrokeWidth() const;
 
-            virtual bool            draw() const;
+            virtual bool 			draw() const;
 
-            virtual ::com::sun::star::uno::Reference<
+            virtual ::com::sun::star::uno::Reference< 
                 ::com::sun::star::rendering::XPolyPolygon2D > getUNOPolyPolygon() const;
 
         private:
             // default: disabled copy/assignment
             ImplPolyPolygon(const ImplPolyPolygon&);
             ImplPolyPolygon& operator= ( const ImplPolyPolygon& );
+        
+            const ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XPolyPolygon2D > 	mxPolyPoly;
 
-            const ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XPolyPolygon2D >   mxPolyPoly;
-
-            ::com::sun::star::rendering::StrokeAttributes                                           maStrokeAttributes;
+            ::com::sun::star::rendering::StrokeAttributes											maStrokeAttributes;
 
-            ::com::sun::star::uno::Sequence< double >                                                       maFillColor;
-            ::com::sun::star::uno::Sequence< double >                                                       maStrokeColor;
-            bool                                                                                            mbFillColorSet;
-            bool                                                                                            mbStrokeColorSet;
+            ::com::sun::star::uno::Sequence< double > 														maFillColor;
+            ::com::sun::star::uno::Sequence< double > 														maStrokeColor;
+            bool																							mbFillColorSet;
+            bool																							mbStrokeColorSet;
         };
 
     }
diff --git a/cppcanvas/source/wrapper/implsprite.cxx b/cppcanvas/source/wrapper/implsprite.cxx
index bf8a1a1a67d6..534022b84e98 100644
--- a/cppcanvas/source/wrapper/implsprite.cxx
+++ b/cppcanvas/source/wrapper/implsprite.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
@@ -45,9 +45,9 @@ namespace cppcanvas
     namespace internal
     {
 
-        ImplSprite::ImplSprite( const uno::Reference< rendering::XSpriteCanvas >&       rParentCanvas,
-                                const uno::Reference< rendering::XSprite >&             rSprite,
-                                const ImplSpriteCanvas::TransformationArbiterSharedPtr& rTransformArbiter ) :
+        ImplSprite::ImplSprite( const uno::Reference< rendering::XSpriteCanvas >& 		rParentCanvas,
+                                const uno::Reference< rendering::XSprite >& 			rSprite,
+                                const ImplSpriteCanvas::TransformationArbiterSharedPtr&	rTransformArbiter ) :
             mxGraphicDevice(),
             mxSprite( rSprite ),
             mxAnimatedSprite(),
@@ -65,9 +65,9 @@ namespace cppcanvas
             OSL_ENSURE( mpTransformArbiter.get(), "ImplSprite::ImplSprite(): Invalid transformation arbiter");
         }
 
-        ImplSprite::ImplSprite( const uno::Reference< rendering::XSpriteCanvas >&       rParentCanvas,
-                                const uno::Reference< rendering::XAnimatedSprite >&     rSprite,
-                                const ImplSpriteCanvas::TransformationArbiterSharedPtr& rTransformArbiter ) :
+        ImplSprite::ImplSprite( const uno::Reference< rendering::XSpriteCanvas >& 		rParentCanvas,
+                                const uno::Reference< rendering::XAnimatedSprite >& 	rSprite,
+                                const ImplSpriteCanvas::TransformationArbiterSharedPtr&	rTransformArbiter ) :
             mxGraphicDevice(),
             mxSprite( uno::Reference< rendering::XSprite >(rSprite,
                                                            uno::UNO_QUERY) ),
@@ -111,13 +111,13 @@ namespace cppcanvas
 
             if( mxSprite.is() )
             {
-                rendering::ViewState    aViewState;
-                rendering::RenderState  aRenderState;
-
+                rendering::ViewState	aViewState;
+                rendering::RenderState	aRenderState;
+                
                 ::canvas::tools::initViewState( aViewState );
                 ::canvas::tools::initRenderState( aRenderState );
-
-                mxSprite->move( ::basegfx::unotools::point2DFromB2DPoint( rNewPos ),
+                
+                mxSprite->move( ::basegfx::unotools::point2DFromB2DPoint( rNewPos ), 
                                 aViewState,
                                 aRenderState );
             }
@@ -129,16 +129,16 @@ namespace cppcanvas
 
             if( mxSprite.is() )
             {
-                rendering::ViewState    aViewState;
-                rendering::RenderState  aRenderState;
+                rendering::ViewState	aViewState;
+                rendering::RenderState	aRenderState;
 
                 ::canvas::tools::initViewState( aViewState );
                 ::canvas::tools::initRenderState( aRenderState );
 
                 ::canvas::tools::setViewStateTransform( aViewState,
                                                         mpTransformArbiter->getTransformation() );
-
-                mxSprite->move( ::basegfx::unotools::point2DFromB2DPoint( rNewPos ),
+                
+                mxSprite->move( ::basegfx::unotools::point2DFromB2DPoint( rNewPos ), 
                                 aViewState,
                                 aRenderState );
             }
@@ -161,7 +161,7 @@ namespace cppcanvas
         {
             OSL_ENSURE( mxGraphicDevice.is(), "ImplSprite::setClip(): Invalid canvas");
             OSL_ENSURE( mxSprite.is(), "ImplSprite::transform(): Invalid sprite");
-
+            
             if( mxSprite.is() && mxGraphicDevice.is() )
                 mxSprite->clip( ::basegfx::unotools::xPolyPolygonFromB2DPolyPolygon( mxGraphicDevice,
                                                                                          rClipPoly ) );
@@ -171,20 +171,20 @@ namespace cppcanvas
         {
             OSL_ENSURE( mxGraphicDevice.is(), "ImplSprite::setClip(): Invalid canvas");
             OSL_ENSURE( mxSprite.is(), "ImplSprite::transform(): Invalid sprite");
-
+            
             if( mxSprite.is() && mxGraphicDevice.is() )
             {
-                ::basegfx::B2DPolyPolygon   aTransformedClipPoly( rClipPoly );
-
-                // extract linear part of canvas view transformation (linear means:
-                // without translational components)
-                ::basegfx::B2DHomMatrix     aViewTransform( mpTransformArbiter->getTransformation() );
+                ::basegfx::B2DPolyPolygon 	aTransformedClipPoly( rClipPoly );
+                
+                // extract linear part of canvas view transformation (linear means:     
+                // without translational components)    
+                ::basegfx::B2DHomMatrix		aViewTransform( mpTransformArbiter->getTransformation() );
                 aViewTransform.set( 0, 2, 0.0 );
                 aViewTransform.set( 1, 2, 0.0 );
-
-                // transform polygon from view to device coordinate space
+                
+                // transform polygon from view to device coordinate space   
                 aTransformedClipPoly.transform( aViewTransform );
-
+                
                 mxSprite->clip( ::basegfx::unotools::xPolyPolygonFromB2DPolyPolygon( mxGraphicDevice,
                                                                                      aTransformedClipPoly ) );
             }
@@ -194,11 +194,11 @@ namespace cppcanvas
         {
             OSL_ENSURE( mxGraphicDevice.is(), "ImplSprite::setClip(): Invalid canvas");
             OSL_ENSURE( mxSprite.is(), "ImplSprite::setClip(): Invalid sprite");
-
+            
             if( mxSprite.is() && mxGraphicDevice.is() )
                 mxSprite->clip( uno::Reference< rendering::XPolyPolygon2D >() );
         }
-
+        
         void ImplSprite::show()
         {
             OSL_ENSURE( mxSprite.is(), "ImplSprite::show(): Invalid sprite");
diff --git a/cppcanvas/source/wrapper/implsprite.hxx b/cppcanvas/source/wrapper/implsprite.hxx
index 4f8c5fdcaef6..ec556fb76f1d 100644
--- a/cppcanvas/source/wrapper/implsprite.hxx
+++ b/cppcanvas/source/wrapper/implsprite.hxx
@@ -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
@@ -47,16 +47,16 @@ namespace cppcanvas
         class ImplSprite : public virtual Sprite
         {
         public:
-            ImplSprite( const ::com::sun::star::uno::Reference<
-                                  ::com::sun::star::rendering::XSpriteCanvas >&     rParentCanvas,
-                        const ::com::sun::star::uno::Reference<
-                                  ::com::sun::star::rendering::XSprite >&       rSprite,
-                        const ImplSpriteCanvas::TransformationArbiterSharedPtr&         rTransformArbiter );
-            ImplSprite( const ::com::sun::star::uno::Reference<
-                                  ::com::sun::star::rendering::XSpriteCanvas >&     rParentCanvas,
-                        const ::com::sun::star::uno::Reference<
+            ImplSprite( const ::com::sun::star::uno::Reference< 
+                                  ::com::sun::star::rendering::XSpriteCanvas >& 	rParentCanvas,
+                        const ::com::sun::star::uno::Reference< 
+                                  ::com::sun::star::rendering::XSprite >& 		rSprite,
+                        const ImplSpriteCanvas::TransformationArbiterSharedPtr&			rTransformArbiter );
+            ImplSprite( const ::com::sun::star::uno::Reference< 
+                                  ::com::sun::star::rendering::XSpriteCanvas >& 	rParentCanvas,
+                        const ::com::sun::star::uno::Reference< 
                                   ::com::sun::star::rendering::XAnimatedSprite >& rSprite,
-                        const ImplSpriteCanvas::TransformationArbiterSharedPtr&         rTransformArbiter );
+                        const ImplSpriteCanvas::TransformationArbiterSharedPtr&			rTransformArbiter );
             virtual ~ImplSprite();
 
             virtual void setAlpha( const double& rAlpha );
@@ -66,16 +66,16 @@ namespace cppcanvas
             virtual void setClipPixel( const ::basegfx::B2DPolyPolygon& rClipPoly );
             virtual void setClip( const ::basegfx::B2DPolyPolygon& rClipPoly );
             virtual void setClip();
-
+        
             virtual void show();
             virtual void hide();
 
             virtual void setPriority( double fPriority );
 
-            virtual ::com::sun::star::uno::Reference<
-                ::com::sun::star::rendering::XSprite >  getUNOSprite() const;
+            virtual ::com::sun::star::uno::Reference< 
+                ::com::sun::star::rendering::XSprite > 	getUNOSprite() const;
 
-            ::com::sun::star::uno::Reference<
+            ::com::sun::star::uno::Reference< 
                 ::com::sun::star::rendering::XGraphicDevice >
                                                                 getGraphicDevice() const;
 
@@ -84,10 +84,10 @@ namespace cppcanvas
             ImplSprite(const ImplSprite&);
             ImplSprite& operator=( const ImplSprite& );
 
-            ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XGraphicDevice >         mxGraphicDevice;
-            const ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XSprite >          mxSprite;
-            const ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XAnimatedSprite >  mxAnimatedSprite;
-            ImplSpriteCanvas::TransformationArbiterSharedPtr                                        mpTransformArbiter;
+            ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XGraphicDevice > 		mxGraphicDevice;
+            const ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XSprite > 			mxSprite;
+            const ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XAnimatedSprite > 	mxAnimatedSprite;
+            ImplSpriteCanvas::TransformationArbiterSharedPtr										mpTransformArbiter;
         };
     }
 }
diff --git a/cppcanvas/source/wrapper/implspritecanvas.cxx b/cppcanvas/source/wrapper/implspritecanvas.cxx
index 4cd555adfb28..3b3712d6ca13 100644
--- a/cppcanvas/source/wrapper/implspritecanvas.cxx
+++ b/cppcanvas/source/wrapper/implspritecanvas.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
@@ -68,7 +68,7 @@ namespace cppcanvas
         {
             OSL_ENSURE( mxSpriteCanvas.is(), "ImplSpriteCanvas::ImplSpriteCanvas(): Invalid canvas" );
         }
-
+        
         ImplSpriteCanvas::ImplSpriteCanvas(const ImplSpriteCanvas& rOrig) :
             Canvas(),
             BitmapCanvas(),
@@ -103,7 +103,7 @@ namespace cppcanvas
 
             return mxSpriteCanvas->updateScreen( bUpdateAll );
         }
-
+        
         CustomSpriteSharedPtr ImplSpriteCanvas::createCustomSprite( const ::basegfx::B2DSize& rSize ) const
         {
             OSL_ENSURE( mxSpriteCanvas.is(), "ImplSpriteCanvas::createCustomSprite(): Invalid canvas" );
@@ -111,7 +111,7 @@ namespace cppcanvas
             if( !mxSpriteCanvas.is() )
                 return CustomSpriteSharedPtr();
 
-            return CustomSpriteSharedPtr(
+            return CustomSpriteSharedPtr( 
                 new ImplCustomSprite( mxSpriteCanvas,
                                       mxSpriteCanvas->createCustomSprite( ::basegfx::unotools::size2DFromB2DSize(rSize) ),
                                       mpTransformArbiter ) );
@@ -120,7 +120,7 @@ namespace cppcanvas
         SpriteSharedPtr ImplSpriteCanvas::createClonedSprite( const SpriteSharedPtr& rSprite ) const
         {
             OSL_ENSURE( mxSpriteCanvas.is(), "ImplSpriteCanvas::createCustomSprite(): Invalid canvas" );
-            OSL_ENSURE( rSprite.get() != NULL && rSprite->getUNOSprite().is(),
+            OSL_ENSURE( rSprite.get() != NULL && rSprite->getUNOSprite().is(), 
                         "ImplSpriteCanvas::createCustomSprite(): Invalid sprite" );
 
             if( !mxSpriteCanvas.is() ||
@@ -130,16 +130,16 @@ namespace cppcanvas
                 return SpriteSharedPtr();
             }
 
-            return SpriteSharedPtr(
+            return SpriteSharedPtr( 
                 new ImplSprite( mxSpriteCanvas,
                                 mxSpriteCanvas->createClonedSprite( rSprite->getUNOSprite() ),
                                 mpTransformArbiter ) );
         }
 
-        SpriteSharedPtr ImplSpriteCanvas::createSpriteFromBitmaps( const uno::Sequence< uno::Reference< rendering::XBitmap > >& rAnimationBitmaps,
-                                                                   sal_Int8                                                     nInterpolationMode )
+        SpriteSharedPtr ImplSpriteCanvas::createSpriteFromBitmaps( const uno::Sequence< uno::Reference< rendering::XBitmap > >& rAnimationBitmaps, 
+                                                                   sal_Int8 													nInterpolationMode )
         {
-            return SpriteSharedPtr( new internal::ImplSprite( mxSpriteCanvas,
+            return SpriteSharedPtr( new internal::ImplSprite( mxSpriteCanvas, 
                                                               mxSpriteCanvas->createSpriteFromBitmaps( rAnimationBitmaps,
                                                                                                        nInterpolationMode ),
                                                               mpTransformArbiter ) );
diff --git a/cppcanvas/source/wrapper/implspritecanvas.hxx b/cppcanvas/source/wrapper/implspritecanvas.hxx
index 655bce3c05a2..9c43fcc8af7c 100644
--- a/cppcanvas/source/wrapper/implspritecanvas.hxx
+++ b/cppcanvas/source/wrapper/implspritecanvas.hxx
@@ -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
@@ -51,29 +51,29 @@ namespace cppcanvas
         class ImplSpriteCanvas : public virtual SpriteCanvas, protected virtual ImplBitmapCanvas
         {
         public:
-            ImplSpriteCanvas( const ::com::sun::star::uno::Reference<
+            ImplSpriteCanvas( const ::com::sun::star::uno::Reference< 
                                   ::com::sun::star::rendering::XSpriteCanvas >& rCanvas );
             ImplSpriteCanvas(const ImplSpriteCanvas&);
 
             virtual ~ImplSpriteCanvas();
 
-            virtual void                    setTransformation( const ::basegfx::B2DHomMatrix& rMatrix );
-
-            virtual bool                    updateScreen( bool bUpdateAll ) const;
+            virtual void 					setTransformation( const ::basegfx::B2DHomMatrix& rMatrix );
 
-            virtual CustomSpriteSharedPtr   createCustomSprite( const ::basegfx::B2DSize& ) const;
-            virtual SpriteSharedPtr         createClonedSprite( const SpriteSharedPtr& ) const;
+            virtual bool					updateScreen( bool bUpdateAll ) const;
+        
+            virtual CustomSpriteSharedPtr 	createCustomSprite( const ::basegfx::B2DSize& ) const;
+            virtual SpriteSharedPtr 		createClonedSprite( const SpriteSharedPtr& ) const;
 
-            SpriteSharedPtr                 createSpriteFromBitmaps(
-                const ::com::sun::star::uno::Sequence<
-                    ::com::sun::star::uno::Reference<
-                        ::com::sun::star::rendering::XBitmap > >&   animationBitmaps,
-                sal_Int8                                                    interpolationMode );
+            SpriteSharedPtr					createSpriteFromBitmaps( 
+                const ::com::sun::star::uno::Sequence< 
+                    ::com::sun::star::uno::Reference< 
+                        ::com::sun::star::rendering::XBitmap > >& 	animationBitmaps, 
+                sal_Int8 													interpolationMode );
 
-            virtual CanvasSharedPtr         clone() const;
+            virtual CanvasSharedPtr			clone() const;
 
-            virtual ::com::sun::star::uno::Reference<
-                ::com::sun::star::rendering::XSpriteCanvas >    getUNOSpriteCanvas() const;
+            virtual ::com::sun::star::uno::Reference< 
+                ::com::sun::star::rendering::XSpriteCanvas > 	getUNOSpriteCanvas() const;
 
             /** This class passes the view transformation
                 to child sprites
@@ -83,16 +83,16 @@ namespace cppcanvas
                 itself, but has somehow pass an object to child
                 sprites those can query for the canvas' view transform.
              */
-            class TransformationArbiter
+            class TransformationArbiter 
             {
             public:
                 TransformationArbiter();
 
-                void                        setTransformation( const ::basegfx::B2DHomMatrix& rViewTransform );
-                ::basegfx::B2DHomMatrix     getTransformation() const;
+                void 						setTransformation( const ::basegfx::B2DHomMatrix& rViewTransform );
+                ::basegfx::B2DHomMatrix  	getTransformation() const;
 
             private:
-                ::basegfx::B2DHomMatrix     maTransformation;
+                ::basegfx::B2DHomMatrix		maTransformation;
             };
 
             typedef ::boost::shared_ptr< TransformationArbiter > TransformationArbiterSharedPtr;
@@ -101,8 +101,8 @@ namespace cppcanvas
             // default: disabled assignment
             ImplSpriteCanvas& operator=( const ImplSpriteCanvas& );
 
-            const ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XSpriteCanvas >    mxSpriteCanvas;
-            TransformationArbiterSharedPtr                                                          mpTransformArbiter;
+            const ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XSpriteCanvas > 	mxSpriteCanvas;
+            TransformationArbiterSharedPtr															mpTransformArbiter;
         };
     }
 }
diff --git a/cppcanvas/source/wrapper/impltext.cxx b/cppcanvas/source/wrapper/impltext.cxx
index 7ebb378ea401..869489048681 100644
--- a/cppcanvas/source/wrapper/impltext.cxx
+++ b/cppcanvas/source/wrapper/impltext.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
@@ -51,8 +51,8 @@ namespace cppcanvas
     namespace internal
     {
 
-        ImplText::ImplText( const CanvasSharedPtr&  rParentCanvas,
-                            const ::rtl::OUString&  rText ) :
+        ImplText::ImplText( const CanvasSharedPtr& 	rParentCanvas,
+                            const ::rtl::OUString&	rText ) :
             CanvasGraphicHelper( rParentCanvas ),
             mpFont(),
             maText(rText)
diff --git a/cppcanvas/source/wrapper/impltext.hxx b/cppcanvas/source/wrapper/impltext.hxx
index b2c8d9fd0e1f..296dca549374 100644
--- a/cppcanvas/source/wrapper/impltext.hxx
+++ b/cppcanvas/source/wrapper/impltext.hxx
@@ -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
@@ -54,8 +54,8 @@ namespace cppcanvas
         {
         public:
 
-            ImplText( const CanvasSharedPtr&    rParentCanvas,
-                      const ::rtl::OUString&    rText );
+            ImplText( const CanvasSharedPtr& 	rParentCanvas,
+                      const ::rtl::OUString&	rText );
 
             virtual ~ImplText();
 
@@ -69,8 +69,8 @@ namespace cppcanvas
             ImplText(const ImplText&);
             ImplText& operator= ( const ImplText& );
 
-            FontSharedPtr       mpFont;
-            ::rtl::OUString     maText;
+            FontSharedPtr		mpFont;
+            ::rtl::OUString		maText;
         };
     }
 }
diff --git a/cppcanvas/source/wrapper/vclfactory.cxx b/cppcanvas/source/wrapper/vclfactory.cxx
index 7983f081b2a9..0b648422fe8b 100644
--- a/cppcanvas/source/wrapper/vclfactory.cxx
+++ b/cppcanvas/source/wrapper/vclfactory.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
@@ -70,15 +70,15 @@ namespace cppcanvas
     VCLFactory::VCLFactory()
     {
     }
-
+    
     VCLFactory::~VCLFactory()
     {
     }
 
     BitmapCanvasSharedPtr VCLFactory::createCanvas( const ::Window& rVCLWindow )
-    {
-        return BitmapCanvasSharedPtr(
-            new internal::ImplBitmapCanvas(
+    {        
+        return BitmapCanvasSharedPtr( 
+            new internal::ImplBitmapCanvas( 
                 uno::Reference< rendering::XBitmapCanvas >(
                     rVCLWindow.GetCanvas(),
                     uno::UNO_QUERY) ) );
@@ -86,14 +86,14 @@ namespace cppcanvas
 
     BitmapCanvasSharedPtr VCLFactory::createCanvas( const uno::Reference< rendering::XBitmapCanvas >& xCanvas )
     {
-        return BitmapCanvasSharedPtr(
+        return BitmapCanvasSharedPtr( 
             new internal::ImplBitmapCanvas( xCanvas ) );
     }
 
     SpriteCanvasSharedPtr VCLFactory::createSpriteCanvas( const ::Window& rVCLWindow ) const
     {
-        return SpriteCanvasSharedPtr(
-            new internal::ImplSpriteCanvas(
+        return SpriteCanvasSharedPtr( 
+            new internal::ImplSpriteCanvas( 
                 uno::Reference< rendering::XSpriteCanvas >(
                     rVCLWindow.GetSpriteCanvas(),
                     uno::UNO_QUERY) ) );
@@ -101,25 +101,25 @@ namespace cppcanvas
 
     SpriteCanvasSharedPtr VCLFactory::createSpriteCanvas( const uno::Reference< rendering::XSpriteCanvas >& xCanvas ) const
     {
-        return SpriteCanvasSharedPtr(
+        return SpriteCanvasSharedPtr( 
             new internal::ImplSpriteCanvas( xCanvas ) );
     }
 
-    SpriteCanvasSharedPtr VCLFactory::createFullscreenSpriteCanvas( const ::Window& rVCLWindow,
-                                                                    const Size&     rFullscreenSize ) const
+    SpriteCanvasSharedPtr VCLFactory::createFullscreenSpriteCanvas( const ::Window& rVCLWindow, 
+                                                                    const Size& 	rFullscreenSize ) const
     {
-        return SpriteCanvasSharedPtr(
-            new internal::ImplSpriteCanvas(
+        return SpriteCanvasSharedPtr( 
+            new internal::ImplSpriteCanvas( 
                 uno::Reference< rendering::XSpriteCanvas >(
                     rVCLWindow.GetFullscreenSpriteCanvas( rFullscreenSize ),
                     uno::UNO_QUERY) ) );
     }
 
-    PolyPolygonSharedPtr VCLFactory::createPolyPolygon( const CanvasSharedPtr&  rCanvas,
-                                                        const ::Polygon&        rPoly ) const
+    PolyPolygonSharedPtr VCLFactory::createPolyPolygon( const CanvasSharedPtr& 	rCanvas, 
+                                                        const ::Polygon& 		rPoly ) const
     {
         OSL_ENSURE( rCanvas.get() != NULL &&
-                    rCanvas->getUNOCanvas().is(),
+                    rCanvas->getUNOCanvas().is(), 
                     "VCLFactory::createPolyPolygon(): Invalid canvas" );
 
         if( rCanvas.get() == NULL )
@@ -129,18 +129,18 @@ namespace cppcanvas
         if( !xCanvas.is() )
             return PolyPolygonSharedPtr();
 
-        return PolyPolygonSharedPtr(
-            new internal::ImplPolyPolygon( rCanvas,
+        return PolyPolygonSharedPtr( 
+            new internal::ImplPolyPolygon( rCanvas, 
                                            ::vcl::unotools::xPolyPolygonFromPolygon(
                                                xCanvas->getDevice(),
                                                rPoly) ) );
     }
 
-    PolyPolygonSharedPtr VCLFactory::createPolyPolygon( const CanvasSharedPtr&  rCanvas,
-                                                        const ::PolyPolygon&    rPolyPoly ) const
+    PolyPolygonSharedPtr VCLFactory::createPolyPolygon( const CanvasSharedPtr& 	rCanvas, 
+                                                        const ::PolyPolygon& 	rPolyPoly ) const
     {
         OSL_ENSURE( rCanvas.get() != NULL &&
-                    rCanvas->getUNOCanvas().is(),
+                    rCanvas->getUNOCanvas().is(), 
                     "VCLFactory::createPolyPolygon(): Invalid canvas" );
 
         if( rCanvas.get() == NULL )
@@ -150,20 +150,20 @@ namespace cppcanvas
         if( !xCanvas.is() )
             return PolyPolygonSharedPtr();
 
-        return PolyPolygonSharedPtr(
-            new internal::ImplPolyPolygon( rCanvas,
+        return PolyPolygonSharedPtr( 
+            new internal::ImplPolyPolygon( rCanvas, 
                                            ::vcl::unotools::xPolyPolygonFromPolyPolygon(
                                                xCanvas->getDevice(),
                                                rPolyPoly) ) );
     }
 
-    BitmapSharedPtr VCLFactory::createBitmap( const CanvasSharedPtr&    rCanvas,
-                                              const ::Size&             rSize ) const
+    BitmapSharedPtr VCLFactory::createBitmap( const CanvasSharedPtr&	rCanvas, 
+                                              const ::Size& 			rSize ) const
     {
         OSL_ENSURE( rCanvas.get() != NULL &&
-                    rCanvas->getUNOCanvas().is(),
+                    rCanvas->getUNOCanvas().is(), 
                     "VCLFactory::createBitmap(): Invalid canvas" );
-
+        
         if( rCanvas.get() == NULL )
             return BitmapSharedPtr();
 
@@ -171,19 +171,19 @@ namespace cppcanvas
         if( !xCanvas.is() )
             return BitmapSharedPtr();
 
-        return BitmapSharedPtr(
-            new internal::ImplBitmap( rCanvas,
-                                      xCanvas->getDevice()->createCompatibleBitmap(
+        return BitmapSharedPtr( 
+            new internal::ImplBitmap( rCanvas, 
+                                      xCanvas->getDevice()->createCompatibleBitmap( 
                                           ::vcl::unotools::integerSize2DFromSize(rSize) ) ) );
     }
 
-    BitmapSharedPtr VCLFactory::createAlphaBitmap( const CanvasSharedPtr&   rCanvas,
-                                                   const ::Size&            rSize ) const
+    BitmapSharedPtr VCLFactory::createAlphaBitmap( const CanvasSharedPtr&	rCanvas, 
+                                                   const ::Size& 			rSize ) const
     {
         OSL_ENSURE( rCanvas.get() != NULL &&
-                    rCanvas->getUNOCanvas().is(),
+                    rCanvas->getUNOCanvas().is(), 
                     "VCLFactory::createBitmap(): Invalid canvas" );
-
+        
         if( rCanvas.get() == NULL )
             return BitmapSharedPtr();
 
@@ -191,17 +191,17 @@ namespace cppcanvas
         if( !xCanvas.is() )
             return BitmapSharedPtr();
 
-        return BitmapSharedPtr(
-            new internal::ImplBitmap( rCanvas,
-                                      xCanvas->getDevice()->createCompatibleAlphaBitmap(
+        return BitmapSharedPtr( 
+            new internal::ImplBitmap( rCanvas, 
+                                      xCanvas->getDevice()->createCompatibleAlphaBitmap( 
                                           ::vcl::unotools::integerSize2DFromSize(rSize) ) ) );
     }
 
-    BitmapSharedPtr VCLFactory::createBitmap( const CanvasSharedPtr&    rCanvas,
-                                              const ::Bitmap&           rBitmap ) const
+    BitmapSharedPtr VCLFactory::createBitmap( const CanvasSharedPtr& 	rCanvas, 
+                                              const ::Bitmap& 			rBitmap ) const
     {
         OSL_ENSURE( rCanvas.get() != NULL &&
-                    rCanvas->getUNOCanvas().is(),
+                    rCanvas->getUNOCanvas().is(), 
                     "VCLFactory::createBitmap(): Invalid canvas" );
 
         if( rCanvas.get() == NULL )
@@ -211,17 +211,17 @@ namespace cppcanvas
         if( !xCanvas.is() )
             return BitmapSharedPtr();
 
-        return BitmapSharedPtr( new internal::ImplBitmap( rCanvas,
+        return BitmapSharedPtr( new internal::ImplBitmap( rCanvas, 
                                                           ::vcl::unotools::xBitmapFromBitmap(
                                                               xCanvas->getDevice(),
                                                               rBitmap) ) );
     }
 
-    BitmapSharedPtr VCLFactory::createBitmap( const CanvasSharedPtr&    rCanvas,
-                                              const ::BitmapEx&         rBmpEx ) const
+    BitmapSharedPtr VCLFactory::createBitmap( const CanvasSharedPtr& 	rCanvas, 
+                                              const ::BitmapEx& 		rBmpEx ) const
     {
         OSL_ENSURE( rCanvas.get() != NULL &&
-                    rCanvas->getUNOCanvas().is(),
+                    rCanvas->getUNOCanvas().is(), 
                     "VCLFactory::createBitmap(): Invalid canvas" );
 
         if( rCanvas.get() == NULL )
@@ -231,18 +231,18 @@ namespace cppcanvas
         if( !xCanvas.is() )
             return BitmapSharedPtr();
 
-        return BitmapSharedPtr( new internal::ImplBitmap( rCanvas,
+        return BitmapSharedPtr( new internal::ImplBitmap( rCanvas, 
                                                           ::vcl::unotools::xBitmapFromBitmapEx(
                                                               xCanvas->getDevice(),
                                                               rBmpEx) ) );
     }
 
-    RendererSharedPtr VCLFactory::createRenderer( const CanvasSharedPtr&        rCanvas,
-                                                  const ::Graphic&              rGraphic,
-                                                  const Renderer::Parameters&   rParms ) const
+    RendererSharedPtr VCLFactory::createRenderer( const CanvasSharedPtr& 		rCanvas, 
+                                                  const ::Graphic& 				rGraphic,
+                                                  const Renderer::Parameters& 	rParms ) const
     {
         OSL_ENSURE( rCanvas.get() != NULL &&
-                    rCanvas->getUNOCanvas().is(),
+                    rCanvas->getUNOCanvas().is(), 
                     "VCLFactory::createRenderer(): Invalid canvas" );
 
         if( rCanvas.get() == NULL )
@@ -253,20 +253,20 @@ namespace cppcanvas
             return RendererSharedPtr();
 
         if( rGraphic.GetType() == GRAPHIC_GDIMETAFILE )
-            return RendererSharedPtr( new internal::ImplRenderer( rCanvas,
+            return RendererSharedPtr( new internal::ImplRenderer( rCanvas, 
                                                                   rGraphic.GetGDIMetaFile(),
                                                                   rParms ) );
         else
-            return RendererSharedPtr( new internal::ImplRenderer( rCanvas,
+            return RendererSharedPtr( new internal::ImplRenderer( rCanvas, 
                                                                   rGraphic.GetBitmapEx(),
                                                                   rParms ) );
     }
 
-    RendererSharedPtr VCLFactory::createRenderer( const CanvasSharedPtr&        rCanvas,
-                                                  const ::GDIMetaFile&          rMtf,
-                                                  const Renderer::Parameters&   rParms ) const
+    RendererSharedPtr VCLFactory::createRenderer( const CanvasSharedPtr& 		rCanvas, 
+                                                  const ::GDIMetaFile& 			rMtf,
+                                                  const Renderer::Parameters& 	rParms ) const
     {
-        return RendererSharedPtr( new internal::ImplRenderer( rCanvas,
+        return RendererSharedPtr( new internal::ImplRenderer( rCanvas, 
                                                               rMtf,
                                                               rParms ) );
     }
@@ -274,7 +274,7 @@ namespace cppcanvas
     SpriteSharedPtr VCLFactory::createAnimatedSprite( const SpriteCanvasSharedPtr& rCanvas, const ::Animation& rAnim ) const
     {
         OSL_ENSURE( rCanvas.get() != NULL &&
-                    rCanvas->getUNOCanvas().is(),
+                    rCanvas->getUNOCanvas().is(), 
                     "VCLFactory::createAnimatedSprite(): Invalid canvas" );
 
         if( rCanvas.get() == NULL )
@@ -323,7 +323,7 @@ namespace cppcanvas
                 // simply clear bitmap to transparent
                 aBmpEx.Erase( ::Color( 255, 0,0,0 ) );
             }
-            else if( rAnimBmp.eDisposal == DISPOSE_PREVIOUS )
+            else if( rAnimBmp.eDisposal == DISPOSE_PREVIOUS ) 
             {
                 // copy in last known full frame
                 aBmpEx = aRestoreBuffer;
@@ -334,10 +334,10 @@ namespace cppcanvas
                         "VCLFactory::createAnimatedSprite(): Somebody set the deprecated DISPOSE_FULL at the Animation" );
 
             // update display
-            aBmpEx.CopyPixel( Rectangle( rAnimBmp.aPosPix,
-                                         rAnimBmp.aSizePix ),
+            aBmpEx.CopyPixel( Rectangle( rAnimBmp.aPosPix, 
+                                         rAnimBmp.aSizePix ), 
                               Rectangle( aEmptyPoint,
-                                         rAnimBmp.aSizePix ),
+                                         rAnimBmp.aSizePix ), 
                               &rAnimBmp.aBmpEx );
 
             // store last DISPOSE_NOT frame, for later
@@ -356,7 +356,7 @@ namespace cppcanvas
 
     TextSharedPtr VCLFactory::createText( const CanvasSharedPtr& rCanvas, const ::rtl::OUString& rText ) const
     {
-        return TextSharedPtr( new internal::ImplText( rCanvas,
+        return TextSharedPtr( new internal::ImplText( rCanvas, 
                                                       rText ) );
     }
 
diff --git a/dtrans/inc/pch/precompiled_dtrans.cxx b/dtrans/inc/pch/precompiled_dtrans.cxx
index 97ae0d1450c1..e19c5505df5e 100644
--- a/dtrans/inc/pch/precompiled_dtrans.cxx
+++ b/dtrans/inc/pch/precompiled_dtrans.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
diff --git a/dtrans/inc/pch/precompiled_dtrans.hxx b/dtrans/inc/pch/precompiled_dtrans.hxx
index fe3362638432..c61ef65599bc 100644
--- a/dtrans/inc/pch/precompiled_dtrans.hxx
+++ b/dtrans/inc/pch/precompiled_dtrans.hxx
@@ -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
diff --git a/dtrans/source/cnttype/mcnttfactory.cxx b/dtrans/source/cnttype/mcnttfactory.cxx
index 07b557350bc0..825e34dd6c56 100644
--- a/dtrans/source/cnttype/mcnttfactory.cxx
+++ b/dtrans/source/cnttype/mcnttfactory.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
@@ -70,7 +70,7 @@ namespace
 // ctor
 //------------------------------------------------------------------------
 
-CMimeContentTypeFactory::CMimeContentTypeFactory( const Reference< XMultiServiceFactory >& rSrvMgr ) :
+CMimeContentTypeFactory::CMimeContentTypeFactory( const Reference< XMultiServiceFactory >& rSrvMgr ) :	
     m_SrvMgr( rSrvMgr )
 {
 }
@@ -90,17 +90,17 @@ Reference< XMimeContentType > CMimeContentTypeFactory::createMimeContentType( co
 // XServiceInfo
 // -------------------------------------------------
 
-OUString SAL_CALL CMimeContentTypeFactory::getImplementationName(  )
+OUString SAL_CALL CMimeContentTypeFactory::getImplementationName(  ) 
     throw( RuntimeException )
 {
     return OUString::createFromAscii( MIMECONTENTTYPEFACTORY_IMPL_NAME );
 }
 
 // -------------------------------------------------
-//  XServiceInfo
+//	XServiceInfo
 // -------------------------------------------------
 
-sal_Bool SAL_CALL CMimeContentTypeFactory::supportsService( const OUString& ServiceName )
+sal_Bool SAL_CALL CMimeContentTypeFactory::supportsService( const OUString& ServiceName ) 
     throw( RuntimeException )
 {
     Sequence < OUString > SupportedServicesNames = MimeContentTypeFactory_getSupportedServiceNames();
@@ -113,10 +113,10 @@ sal_Bool SAL_CALL CMimeContentTypeFactory::supportsService( const OUString& Serv
 }
 
 // -------------------------------------------------
-//  XServiceInfo
+//	XServiceInfo
 // -------------------------------------------------
 
-Sequence< OUString > SAL_CALL CMimeContentTypeFactory::getSupportedServiceNames( )
+Sequence< OUString > SAL_CALL CMimeContentTypeFactory::getSupportedServiceNames( ) 
     throw( RuntimeException )
 {
     return MimeContentTypeFactory_getSupportedServiceNames( );
diff --git a/dtrans/source/cnttype/mcnttfactory.hxx b/dtrans/source/cnttype/mcnttfactory.hxx
index 608a6a5b4e19..92292ffb2b49 100644
--- a/dtrans/source/cnttype/mcnttfactory.hxx
+++ b/dtrans/source/cnttype/mcnttfactory.hxx
@@ -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
@@ -57,26 +57,26 @@ public:
 
     //------------------------------------------------
     // XMimeContentTypeFactory
-    //------------------------------------------------
-
-    virtual ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::XMimeContentType > SAL_CALL createMimeContentType( const ::rtl::OUString& aContentType )
+    //------------------------------------------------ 
+    
+    virtual ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::XMimeContentType > SAL_CALL createMimeContentType( const ::rtl::OUString& aContentType ) 
         throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException);
 
     //------------------------------------------------
     // XServiceInfo
-    //------------------------------------------------
+    //------------------------------------------------ 
 
-    virtual ::rtl::OUString SAL_CALL getImplementationName(  )
+    virtual ::rtl::OUString SAL_CALL getImplementationName(	 )
         throw(::com::sun::star::uno::RuntimeException);
 
-    virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName )
+    virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) 
         throw(::com::sun::star::uno::RuntimeException);
 
-    virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames(  )
+    virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames(  ) 
         throw(::com::sun::star::uno::RuntimeException);
 
 private:
-    ::osl::Mutex                                                                           m_aMutex;
+    ::osl::Mutex																	       m_aMutex;
     const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > m_SrvMgr;
 };
 
diff --git a/dtrans/source/cnttype/mcnttype.cxx b/dtrans/source/cnttype/mcnttype.cxx
index bc5a52920bfb..923768f0dfd5 100644
--- a/dtrans/source/cnttype/mcnttype.cxx
+++ b/dtrans/source/cnttype/mcnttype.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
@@ -63,7 +63,7 @@ CMimeContentType::CMimeContentType( const OUString& aCntType )
 }
 
 //------------------------------------------------------------------------
-//
+// 
 //------------------------------------------------------------------------
 
 OUString SAL_CALL CMimeContentType::getMediaType( ) throw(RuntimeException)
@@ -72,7 +72,7 @@ OUString SAL_CALL CMimeContentType::getMediaType( ) throw(RuntimeException)
 }
 
 //------------------------------------------------------------------------
-//
+// 
 //------------------------------------------------------------------------
 
 OUString SAL_CALL CMimeContentType::getMediaSubtype( ) throw(RuntimeException)
@@ -81,7 +81,7 @@ OUString SAL_CALL CMimeContentType::getMediaSubtype( ) throw(RuntimeException)
 }
 
 //------------------------------------------------------------------------
-//
+// 
 //------------------------------------------------------------------------
 
 OUString SAL_CALL CMimeContentType::getFullMediaType( ) throw(RuntimeException)
@@ -90,7 +90,7 @@ OUString SAL_CALL CMimeContentType::getFullMediaType( ) throw(RuntimeException)
 }
 
 //------------------------------------------------------------------------
-//
+// 
 //------------------------------------------------------------------------
 
 Sequence< OUString > SAL_CALL CMimeContentType::getParameters( ) throw(RuntimeException)
@@ -112,7 +112,7 @@ Sequence< OUString > SAL_CALL CMimeContentType::getParameters( ) throw(RuntimeEx
 }
 
 //------------------------------------------------------------------------
-//
+// 
 //------------------------------------------------------------------------
 
 sal_Bool SAL_CALL CMimeContentType::hasParameter( const OUString& aName ) throw(RuntimeException)
@@ -122,9 +122,9 @@ sal_Bool SAL_CALL CMimeContentType::hasParameter( const OUString& aName ) throw(
 }
 
 //------------------------------------------------------------------------
-//
+// 
 //------------------------------------------------------------------------
-
+    
 OUString SAL_CALL CMimeContentType::getParameterValue( const OUString& aName ) throw(NoSuchElementException, RuntimeException)
 {
     MutexGuard aGuard( m_aMutex );
@@ -136,7 +136,7 @@ OUString SAL_CALL CMimeContentType::getParameterValue( const OUString& aName ) t
 }
 
 //------------------------------------------------------------------------
-//
+// 
 //------------------------------------------------------------------------
 
 void SAL_CALL CMimeContentType::init( const OUString& aCntType ) throw( IllegalArgumentException )
@@ -151,7 +151,7 @@ void SAL_CALL CMimeContentType::init( const OUString& aCntType ) throw( IllegalA
 }
 
 //------------------------------------------------------------------------
-//
+// 
 //------------------------------------------------------------------------
 
 void SAL_CALL CMimeContentType::getSym( void )
@@ -167,7 +167,7 @@ void SAL_CALL CMimeContentType::getSym( void )
 }
 
 //------------------------------------------------------------------------
-//
+// 
 //------------------------------------------------------------------------
 
 void SAL_CALL CMimeContentType::acceptSym( const OUString& pSymTlb )
@@ -175,21 +175,21 @@ void SAL_CALL CMimeContentType::acceptSym( const OUString& pSymTlb )
     if ( pSymTlb.indexOf( m_nxtSym ) < 0 )
         throw IllegalArgumentException( );
 
-    getSym();
+    getSym();		
 }
 
 //------------------------------------------------------------------------
-//
+// 
 //------------------------------------------------------------------------
 
 void SAL_CALL CMimeContentType::skipSpaces( void )
 {
     while ( SPACE == m_nxtSym )
         getSym( );
-}
+}		
 
 //------------------------------------------------------------------------
-//
+// 
 //------------------------------------------------------------------------
 
 void SAL_CALL CMimeContentType::type( void )
@@ -220,7 +220,7 @@ void SAL_CALL CMimeContentType::type( void )
 }
 
 //------------------------------------------------------------------------
-//
+// 
 //------------------------------------------------------------------------
 
 void SAL_CALL CMimeContentType::subtype( void )
@@ -248,7 +248,7 @@ void SAL_CALL CMimeContentType::subtype( void )
 }
 
 //------------------------------------------------------------------------
-//
+// 
 //------------------------------------------------------------------------
 
 void SAL_CALL CMimeContentType::trailer( void )
@@ -263,7 +263,7 @@ void SAL_CALL CMimeContentType::trailer( void )
         }
         else if ( m_nxtSym == OUString::createFromAscii( ";" ) )
         {
-            // get the parameter name
+            // get the parameter name			
             getSym( );
             skipSpaces( );
 
@@ -271,7 +271,7 @@ void SAL_CALL CMimeContentType::trailer( void )
                 throw IllegalArgumentException( );
 
             OUString pname = pName( );
-
+            
             skipSpaces();
             acceptSym( OUString::createFromAscii( "=" ) );
 
@@ -282,23 +282,23 @@ void SAL_CALL CMimeContentType::trailer( void )
 
             // insert into map
             if ( !m_ParameterMap.insert( pair < const OUString, OUString > ( pname, pvalue ) ).second )
-                throw IllegalArgumentException( );
+                throw IllegalArgumentException( );			
         }
         else
             throw IllegalArgumentException( );
-
+        
         skipSpaces( );
     }
 }
 
 //------------------------------------------------------------------------
-//
+// 
 //------------------------------------------------------------------------
 
 OUString SAL_CALL CMimeContentType::pName( )
 {
     OUString pname;
-
+    
     while( m_nxtSym.getLength( ) )
     {
         if ( isInRange( m_nxtSym, TOKEN ) )
@@ -314,7 +314,7 @@ OUString SAL_CALL CMimeContentType::pName( )
 }
 
 //------------------------------------------------------------------------
-//
+// 
 //------------------------------------------------------------------------
 
 OUString SAL_CALL CMimeContentType::pValue( )
@@ -343,14 +343,14 @@ OUString SAL_CALL CMimeContentType::pValue( )
     }
     else
         throw IllegalArgumentException( );
-
+    
     return pvalue;
 }
 
 //------------------------------------------------------------------------
 // the following combinations within a quoted value are not allowed:
-// '";' (quote sign followed by semicolon) and '" ' (quote sign followed
-// by space)
+// '";' (quote sign followed by semicolon) and '" ' (quote sign followed 
+// by space) 
 //------------------------------------------------------------------------
 
 OUString SAL_CALL CMimeContentType::quotedPValue( )
@@ -359,7 +359,7 @@ OUString SAL_CALL CMimeContentType::quotedPValue( )
     sal_Bool bAfterQuoteSign = sal_False;
 
     while ( m_nxtSym.getLength( ) )
-    {
+    {					
         if ( bAfterQuoteSign && ((m_nxtSym == SPACE)||(m_nxtSym == SEMICOLON) ) )
             break;
         else if ( isInRange( m_nxtSym, TOKEN + TSPECIALS + SPACE ) )
@@ -371,7 +371,7 @@ OUString SAL_CALL CMimeContentType::quotedPValue( )
                 bAfterQuoteSign = sal_False;
         }
         else
-            throw IllegalArgumentException( );
+            throw IllegalArgumentException( );						
         getSym( );
     }
 
@@ -379,7 +379,7 @@ OUString SAL_CALL CMimeContentType::quotedPValue( )
 }
 
 //------------------------------------------------------------------------
-//
+// 
 //------------------------------------------------------------------------
 
 OUString SAL_CALL CMimeContentType::nonquotedPValue( )
@@ -390,7 +390,7 @@ OUString SAL_CALL CMimeContentType::nonquotedPValue( )
     {
         if ( isInRange( m_nxtSym, TOKEN ) )
             pvalue += m_nxtSym;
-        else if ( isInRange( m_nxtSym, OUString::createFromAscii( "; " ) ) )
+        else if ( isInRange( m_nxtSym, OUString::createFromAscii( "; " ) ) ) 
             break;
         else
             throw IllegalArgumentException( );
@@ -401,7 +401,7 @@ OUString SAL_CALL CMimeContentType::nonquotedPValue( )
 }
 
 //------------------------------------------------------------------------
-//
+// 
 //------------------------------------------------------------------------
 
 void SAL_CALL CMimeContentType::comment( void )
@@ -409,7 +409,7 @@ void SAL_CALL CMimeContentType::comment( void )
     while ( m_nxtSym.getLength( ) )
     {
         if ( isInRange( m_nxtSym, TOKEN + SPACE ) )
-            getSym( );
+            getSym( );	
         else if ( m_nxtSym == OUString::createFromAscii( ")" ) )
             break;
         else
@@ -418,10 +418,10 @@ void SAL_CALL CMimeContentType::comment( void )
 }
 
 //------------------------------------------------------------------------
-//
+// 
 //------------------------------------------------------------------------
 
 sal_Bool SAL_CALL CMimeContentType::isInRange( const rtl::OUString& aChr, const rtl::OUString& aRange )
 {
-    return ( aRange.indexOf( aChr ) > -1 );
+    return ( aRange.indexOf( aChr ) > -1 );	
 }
diff --git a/dtrans/source/cnttype/mcnttype.hxx b/dtrans/source/cnttype/mcnttype.hxx
index f9b416b51de4..74c57fec3124 100644
--- a/dtrans/source/cnttype/mcnttype.hxx
+++ b/dtrans/source/cnttype/mcnttype.hxx
@@ -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
@@ -59,13 +59,13 @@ public:
     virtual ::rtl::OUString SAL_CALL getMediaSubtype(  ) throw(::com::sun::star::uno::RuntimeException);
     virtual ::rtl::OUString SAL_CALL getFullMediaType(  ) throw(::com::sun::star::uno::RuntimeException);
 
-    virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getParameters(  )
+    virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getParameters(  ) 
         throw(::com::sun::star::uno::RuntimeException);
 
-    virtual sal_Bool SAL_CALL hasParameter( const ::rtl::OUString& aName )
+    virtual sal_Bool SAL_CALL hasParameter( const ::rtl::OUString& aName ) 
         throw(::com::sun::star::uno::RuntimeException);
-
-    virtual ::rtl::OUString SAL_CALL getParameterValue( const ::rtl::OUString& aName )
+    
+    virtual ::rtl::OUString SAL_CALL getParameterValue( const ::rtl::OUString& aName ) 
         throw(::com::sun::star::container::NoSuchElementException, ::com::sun::star::uno::RuntimeException);
 
 private:
@@ -82,15 +82,15 @@ private:
     rtl::OUString SAL_CALL nonquotedPValue( );
     void SAL_CALL comment( void );
     sal_Bool SAL_CALL isInRange( const rtl::OUString& aChr, const rtl::OUString& aRange );
-
+    
 private:
-    ::osl::Mutex                             m_aMutex;
-    rtl::OUString                            m_MediaType;
-    rtl::OUString                            m_MediaSubtype;
-    rtl::OUString                            m_ContentType;
+    ::osl::Mutex							 m_aMutex;
+    rtl::OUString							 m_MediaType;
+    rtl::OUString							 m_MediaSubtype;
+    rtl::OUString							 m_ContentType;
     std::map< rtl::OUString, rtl::OUString > m_ParameterMap;
-    sal_Int32                                m_nPos;
-    rtl::OUString                            m_nxtSym;
+    sal_Int32								 m_nPos;
+    rtl::OUString							 m_nxtSym;
 };
 
 #endif
diff --git a/dtrans/source/cnttype/mcnttype.xml b/dtrans/source/cnttype/mcnttype.xml
index 2a362699eec2..6c84e2a858bf 100644
--- a/dtrans/source/cnttype/mcnttype.xml
+++ b/dtrans/source/cnttype/mcnttype.xml
@@ -1,35 +1,35 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE module-description PUBLIC "-//StarOffice//DTD ComponentDescription 1.0//EN" "module-description.dtd">
 <module-description xmlns:xlink="http://www.w3.org/1999/xlink">
-    <module-name>   mcnttype    </module-name>
+    <module-name>	mcnttype	</module-name>
     <component-description>
         <author> Tino Rachui </author>
-        <name>  com.sun.star.comp.datatransfer.MimeContentTypeFactory </name>
+        <name>	com.sun.star.comp.datatransfer.MimeContentTypeFactory </name>
         <description>
     The win32 implementation of the datatransfer service.
 </description>
-        <loader-name>   com.sun.star.loader.SharedLibrary   </loader-name>
-        <language>  c++ </language>
+        <loader-name>	com.sun.star.loader.SharedLibrary	</loader-name>
+        <language>	c++	</language>
         <status value="beta"/>
-        <supported-service> com.sun.star.datatransfer.MimeContentTypeFactory </supported-service>
-        <service-dependency>    ... </service-dependency>
-        <type>   com.sun.star.datatransfer.XMimeContentTypeFactory  </type>
-        <type>   com.sun.star.datatransfer.XMimeContentType         </type>
-        <type>   com.sun.star.lang.XMultiServiceFactory             </type>
-        <type>   com.sun.star.lang.XSingleServiceFactory            </type>
-        <type>   com.sun.star.lang.XServiceInfo                     </type>
-        <type>   com.sun.star.lang.XTypeProvider                    </type>
-        <type>   com.sun.star.lang.IllegalArgumentException         </type>
-        <type>   com.sun.star.uno.TypeClass                         </type>
-        <type>   com.sun.star.uno.XWeak                             </type>
-        <type>   com.sun.star.uno.XAggregation                      </type>
-        <type>   com.sun.star.registry.XRegistryKey                 </type>
-        <type>   com.sun.star.container.XSet                        </type>
+        <supported-service>	com.sun.star.datatransfer.MimeContentTypeFactory </supported-service>
+        <service-dependency>	...	</service-dependency>
+        <type>	 com.sun.star.datatransfer.XMimeContentTypeFactory	</type>
+        <type>	 com.sun.star.datatransfer.XMimeContentType			</type>
+        <type>	 com.sun.star.lang.XMultiServiceFactory             </type>
+        <type>	 com.sun.star.lang.XSingleServiceFactory			</type>
+        <type>	 com.sun.star.lang.XServiceInfo						</type>
+        <type>	 com.sun.star.lang.XTypeProvider					</type>
+        <type>	 com.sun.star.lang.IllegalArgumentException			</type>
+        <type>	 com.sun.star.uno.TypeClass							</type>
+        <type>	 com.sun.star.uno.XWeak								</type>
+        <type>	 com.sun.star.uno.XAggregation						</type>
+        <type>	 com.sun.star.registry.XRegistryKey					</type>
+        <type>	 com.sun.star.container.XSet						</type>
     </component-description>
-    <project-build-dependency>  cppuhelper  </project-build-dependency>
-    <project-build-dependency>  cppu        </project-build-dependency>
-    <project-build-dependency>  sal         </project-build-dependency>
-    <runtime-module-dependency> cppuhelper  </runtime-module-dependency>
-    <runtime-module-dependency> cppu2       </runtime-module-dependency>
-    <runtime-module-dependency> sal2        </runtime-module-dependency>
+    <project-build-dependency>	cppuhelper	</project-build-dependency>
+    <project-build-dependency>	cppu		</project-build-dependency>
+    <project-build-dependency>	sal			</project-build-dependency>
+    <runtime-module-dependency>	cppuhelper	</runtime-module-dependency>
+    <runtime-module-dependency>	cppu2		</runtime-module-dependency>
+    <runtime-module-dependency>	sal2		</runtime-module-dependency>
 </module-description>
diff --git a/dtrans/source/cnttype/mctfentry.cxx b/dtrans/source/cnttype/mctfentry.cxx
index 095c9ed186ce..f0656f2fd42b 100644
--- a/dtrans/source/cnttype/mctfentry.cxx
+++ b/dtrans/source/cnttype/mctfentry.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
@@ -29,7 +29,7 @@
 #include "precompiled_dtrans.hxx"
 
 //-----------------------------------------------------------------
-//  includes of other projects
+//	includes of other projects
 //-----------------------------------------------------------------
 #include <cppuhelper/factory.hxx>
 #include <com/sun/star/container/XSet.hpp>
@@ -44,36 +44,36 @@
 // the service names
 #define MIMECONTENTTYPEFACTORY_SERVICE_NAME  "com.sun.star.datatransfer.MimeContentTypeFactory"
 
-// the implementation names
+// the implementation names		
 #define MIMECONTENTTYPEFACTORY_IMPL_NAME  "com.sun.star.datatransfer.MimeCntTypeFactory"
 
 // the registry key names
 // a key under which this service will be registered, Format: -> "/ImplName/UNO/SERVICES/ServiceName"
-//                        <     Implementation-Name    ></UNO/SERVICES/><    Service-Name           >
+//                        <     Implementation-Name    ></UNO/SERVICES/><    Service-Name           > 
 #define MIMECONTENTTYPEFACTORY_REGKEY_NAME  "/com.sun.star.datatransfer.MimeCntTypeFactory/UNO/SERVICES/com.sun.star.datatransfer.MimeContentTypeFactory"
 
 //-----------------------------------------------------------------------------------------------------------
 // namespace directives
 //-----------------------------------------------------------------------------------------------------------
 
-using namespace ::rtl                       ;
-using namespace ::cppu                      ;
-using namespace ::com::sun::star::uno       ;
-using namespace ::com::sun::star::registry  ;
+using namespace ::rtl						;
+using namespace ::cppu					    ;
+using namespace ::com::sun::star::uno		;
+using namespace ::com::sun::star::registry	;
 using namespace ::com::sun::star::lang;
 using namespace ::com::sun::star::datatransfer;
 
 //-----------------------------------------------------------------
 // create a static object to initialize the shell9x library
 //-----------------------------------------------------------------
-
+ 
 namespace
 {
 
     //-----------------------------------------------------------------------------------------------------------
     // functions to create a new Clipboad instance; is needed by factory helper implementation
     // @param rServiceManager - service manager, useful if the component needs other uno services
-    // so we should give it to every UNO-Implementation component
+    // so we should give it to every UNO-Implementation component	
     //-----------------------------------------------------------------------------------------------------------
 
     Reference< XInterface > SAL_CALL createInstance( const Reference< XMultiServiceFactory >& rServiceManager )
@@ -83,10 +83,10 @@ namespace
 }
 
 //-----------------------------------------------------------------------------------------------------------
-// the 3 important functions which will be exported
+// the 3 important functions which will be exported 
 //-----------------------------------------------------------------------------------------------------------
 
-extern "C"
+extern "C" 
 {
 
 //----------------------------------------------------------------------
@@ -114,13 +114,13 @@ sal_Bool SAL_CALL component_writeInfo( void* /*pServiceManager*/, void* pRegistr
     {
         try
         {
-            Reference< XRegistryKey > pXNewKey( static_cast< XRegistryKey* >( pRegistryKey ) );
+            Reference< XRegistryKey > pXNewKey( static_cast< XRegistryKey* >( pRegistryKey ) );							
             pXNewKey->createKey( OUString( RTL_CONSTASCII_USTRINGPARAM( MIMECONTENTTYPEFACTORY_REGKEY_NAME ) ) );
             bRetVal = sal_True;
         }
         catch( InvalidRegistryException& )
-        {
-            OSL_ENSURE(sal_False, "InvalidRegistryException caught");
+        {			
+            OSL_ENSURE(sal_False, "InvalidRegistryException caught");			
             bRetVal = sal_False;
         }
     }
@@ -129,7 +129,7 @@ sal_Bool SAL_CALL component_writeInfo( void* /*pServiceManager*/, void* pRegistr
 }
 
 //----------------------------------------------------------------------
-// component_getFactory
+// component_getFactory 
 // returns a factory to create XFilePicker-Services
 //----------------------------------------------------------------------
 
@@ -140,8 +140,8 @@ void* SAL_CALL component_getFactory( const sal_Char* pImplName, uno_Interface* p
     if ( pSrvManager && ( 0 == rtl_str_compare( pImplName, MIMECONTENTTYPEFACTORY_IMPL_NAME ) ) )
     {
         Sequence< OUString > aSNS( 1 );
-        aSNS.getArray( )[0] = OUString( RTL_CONSTASCII_USTRINGPARAM( MIMECONTENTTYPEFACTORY_SERVICE_NAME ) );
-
+        aSNS.getArray( )[0] = OUString( RTL_CONSTASCII_USTRINGPARAM( MIMECONTENTTYPEFACTORY_SERVICE_NAME ) );		
+        
         Reference< XSingleServiceFactory > xFactory ( createSingleFactory(
             reinterpret_cast< XMultiServiceFactory* > ( pSrvManager ),
             OUString::createFromAscii( pImplName ),
@@ -151,7 +151,7 @@ void* SAL_CALL component_getFactory( const sal_Char* pImplName, uno_Interface* p
         {
             xFactory->acquire();
             pRet = xFactory.get();
-        }
+        }			
     }
 
     return pRet;
diff --git a/dtrans/source/cnttype/wbench/testcnttype.cxx b/dtrans/source/cnttype/wbench/testcnttype.cxx
index ff3587ee22e6..6fab27483e6c 100644
--- a/dtrans/source/cnttype/wbench/testcnttype.cxx
+++ b/dtrans/source/cnttype/wbench/testcnttype.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
@@ -30,7 +30,7 @@
 
 
 //_________________________________________________________________________________________________________________________
-//  other includes
+//	other includes
 //_________________________________________________________________________________________________________________________
 #include <cppuhelper/servicefactory.hxx>
 #include <com/sun/star/lang/XTypeProvider.hpp>
@@ -55,19 +55,19 @@
 #define RDB_SYSPATH  "d:\\projects\\src621\\dtrans\\wntmsci7\\bin\\applicat.rdb"
 
 //------------------------------------------------------------
-//  namesapces
+//	namesapces
 //------------------------------------------------------------
 
-using namespace ::rtl;
+using namespace	::rtl;
 using namespace ::std;
 using namespace ::cppu;
 using namespace ::com::sun::star::datatransfer;
 using namespace ::com::sun::star::uno;
-using namespace ::com::sun::star::lang;
+using namespace	::com::sun::star::lang;
 using namespace ::com::sun::star::container;
 
 //------------------------------------------------------------
-//  globales
+//	globales
 //------------------------------------------------------------
 
 //################################################################
@@ -80,7 +80,7 @@ void CheckMimeContentType( const OUString& aCntType, const OUString& aType, cons
 
     OSL_ASSERT( aType    == xMimeCntType->getMediaType ( ) );
     OSL_ASSERT( aSubtype == xMimeCntType->getMediaSubtype ( ) );
-
+    
     try
     {
         Sequence< OUString > seqParam = xMimeCntType->getParameters( );
@@ -104,13 +104,13 @@ void CheckMimeContentType( const OUString& aCntType, const OUString& aType, cons
     }
     catch( NoSuchElementException& )
     {
-
+        
     }
 }
 */
 
 //----------------------------------------------------------------
-//
+//	
 //----------------------------------------------------------------
 
 void ShutdownServiceMgr( Reference< XMultiServiceFactory >& SrvMgr )
@@ -120,7 +120,7 @@ void ShutdownServiceMgr( Reference< XMultiServiceFactory >& SrvMgr )
 
     if ( !xComponent.is() )
         OSL_ENSURE(sal_False, "Error shuting down");
-
+    
     // Dispose and clear factory
     xComponent->dispose();
     SrvMgr.clear();
@@ -128,7 +128,7 @@ void ShutdownServiceMgr( Reference< XMultiServiceFactory >& SrvMgr )
 }
 
 //----------------------------------------------------------------
-//
+//	
 //----------------------------------------------------------------
 
 sal_Bool readCntTypesFromFileIntoVector( char* fname, vector< string >& vecData )
@@ -144,7 +144,7 @@ sal_Bool readCntTypesFromFileIntoVector( char* fname, vector< string >& vecData
 
     char line[1024];
     while ( fscanf( fstream, "%[^\n]s", line ) != EOF )
-    {
+    {		
         vecData.push_back( line );
         fgetc( fstream );
     }
@@ -155,7 +155,7 @@ sal_Bool readCntTypesFromFileIntoVector( char* fname, vector< string >& vecData
 }
 
 //----------------------------------------------------------------
-//
+//	
 //----------------------------------------------------------------
 
 sal_Bool processCntTypesAndWriteResultIntoFile( char* fname, vector< string >& vecData, Reference< XMimeContentTypeFactory > cnttypeFactory )
@@ -173,7 +173,7 @@ sal_Bool processCntTypesAndWriteResultIntoFile( char* fname, vector< string >& v
     const char* pStr = NULL;
 
     for ( vector< string >::iterator iter = vecData.begin( ); iter != iter_end; ++iter )
-    {
+    {	
         try
         {
             fprintf( fstream, "Gelesen: %s\n", iter->c_str( ) );
@@ -190,14 +190,14 @@ sal_Bool processCntTypesAndWriteResultIntoFile( char* fname, vector< string >& v
             {
                 fwprintf( fstream, OUString::createFromAscii("PName: %s\n" ), seqParam[i].getStr( ) );
                 fwprintf( fstream, OUString::createFromAscii("PValue: %s\n" ), xMCntTyp->getParameterValue( seqParam[i] ).getStr( ) );
-            }
+            }			
         }
         catch( IllegalArgumentException& ex )
         {
-            fwprintf( fstream, OUString::createFromAscii( "Fehlerhafter Content-Type gelesen!!!\n\n" ) );
+            fwprintf( fstream, OUString::createFromAscii( "Fehlerhafter Content-Type gelesen!!!\n\n" ) ); 
         }
         catch( NoSuchElementException& )
-        {
+        {		
             fwprintf( fstream, OUString::createFromAscii( "Parameterwert nicht vorhanden\n" ) );
         }
         catch( ... )
@@ -209,12 +209,12 @@ sal_Bool processCntTypesAndWriteResultIntoFile( char* fname, vector< string >& v
     }
 
     fclose( fstream );
-
+    
     return sal_True;
 }
 
 //----------------------------------------------------------------
-//  main
+//	main
 //----------------------------------------------------------------
 
 int SAL_CALL main( int nArgc, char* argv[] )
@@ -244,7 +244,7 @@ int SAL_CALL main( int nArgc, char* argv[] )
         ShutdownServiceMgr( g_xFactory );
     }
 
-    Reference< XMimeContentTypeFactory >
+    Reference< XMimeContentTypeFactory > 
         xMCntTypeFactory( g_xFactory->createInstance( OUString::createFromAscii( "com.sun.star.datatransfer.MimeContentTypeFactory" ) ), UNO_QUERY );
 
     if ( !xMCntTypeFactory.is( ) )
@@ -265,5 +265,5 @@ int SAL_CALL main( int nArgc, char* argv[] )
 
     ShutdownServiceMgr( g_xFactory );
 
-    return 0;
+    return 0;	
 }
diff --git a/dtrans/source/generic/clipboardmanager.cxx b/dtrans/source/generic/clipboardmanager.cxx
index 49b5cde947f7..c66ce63527d2 100644
--- a/dtrans/source/generic/clipboardmanager.cxx
+++ b/dtrans/source/generic/clipboardmanager.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
@@ -42,10 +42,10 @@ using namespace std;
 
 using ::dtrans::ClipboardManager;
 using ::rtl::OUString;
-
+        
 // ------------------------------------------------------------------------
 
-ClipboardManager::ClipboardManager():
+ClipboardManager::ClipboardManager(): 
     WeakComponentImplHelper3< XClipboardManager, XEventListener, XServiceInfo > (m_aMutex),
     m_aDefaultName(OUString::createFromAscii("default"))
 {
@@ -59,7 +59,7 @@ ClipboardManager::~ClipboardManager()
 
 // ------------------------------------------------------------------------
 
-OUString SAL_CALL ClipboardManager::getImplementationName(  )
+OUString SAL_CALL ClipboardManager::getImplementationName(  ) 
     throw(RuntimeException)
 {
     return OUString::createFromAscii(CLIPBOARDMANAGER_IMPLEMENTATION_NAME);
@@ -67,7 +67,7 @@ OUString SAL_CALL ClipboardManager::getImplementationName(  )
 
 // ------------------------------------------------------------------------
 
-sal_Bool SAL_CALL ClipboardManager::supportsService( const OUString& ServiceName )
+sal_Bool SAL_CALL ClipboardManager::supportsService( const OUString& ServiceName ) 
     throw(RuntimeException)
 {
     Sequence < OUString > SupportedServicesNames = ClipboardManager_getSupportedServiceNames();
@@ -81,7 +81,7 @@ sal_Bool SAL_CALL ClipboardManager::supportsService( const OUString& ServiceName
 
 // ------------------------------------------------------------------------
 
-Sequence< OUString > SAL_CALL ClipboardManager::getSupportedServiceNames(  )
+Sequence< OUString > SAL_CALL ClipboardManager::getSupportedServiceNames(  ) 
     throw(RuntimeException)
 {
     return ClipboardManager_getSupportedServiceNames();
@@ -89,7 +89,7 @@ Sequence< OUString > SAL_CALL ClipboardManager::getSupportedServiceNames(  )
 
 // ------------------------------------------------------------------------
 
-Reference< XClipboard > SAL_CALL ClipboardManager::getClipboard( const OUString& aName )
+Reference< XClipboard > SAL_CALL ClipboardManager::getClipboard( const OUString& aName ) 
     throw(NoSuchElementException, RuntimeException)
 {
     MutexGuard aGuard(m_aMutex);
@@ -99,7 +99,7 @@ Reference< XClipboard > SAL_CALL ClipboardManager::getClipboard( const OUString&
         throw DisposedException(OUString::createFromAscii("object is disposed."),
                                 static_cast < XClipboardManager * > (this));
 
-    ClipboardMap::iterator iter =
+    ClipboardMap::iterator iter = 
         m_aClipboardMap.find(aName.getLength() ? aName : m_aDefaultName);
 
     if (iter != m_aClipboardMap.end())
@@ -110,28 +110,28 @@ Reference< XClipboard > SAL_CALL ClipboardManager::getClipboard( const OUString&
 
 // ------------------------------------------------------------------------
 
-void SAL_CALL ClipboardManager::addClipboard( const Reference< XClipboard >& xClipboard )
+void SAL_CALL ClipboardManager::addClipboard( const Reference< XClipboard >& xClipboard ) 
     throw(IllegalArgumentException, ElementExistException, RuntimeException)
 {
     OSL_ASSERT(xClipboard.is());
 
     // check parameter
     if (!xClipboard.is())
-        throw IllegalArgumentException(OUString::createFromAscii("empty reference"),
+        throw IllegalArgumentException(OUString::createFromAscii("empty reference"), 
                                        static_cast < XClipboardManager * > (this), 1);
 
     // the name "default" is reserved for internal use
     OUString aName = xClipboard->getName();
     if (m_aDefaultName.compareTo(aName) == 0)
-        throw IllegalArgumentException(OUString::createFromAscii("name reserved"),
+        throw IllegalArgumentException(OUString::createFromAscii("name reserved"), 
                                        static_cast < XClipboardManager * > (this), 1);
 
     // try to add new clipboard to the list
     ClearableMutexGuard aGuard(m_aMutex);
-    if (!rBHelper.bDisposed && !rBHelper.bInDispose)
-    {
-        pair< const OUString, Reference< XClipboard > > value (
-            aName.getLength() ? aName : m_aDefaultName,
+    if (!rBHelper.bDisposed && !rBHelper.bInDispose) 
+    { 
+        pair< const OUString, Reference< XClipboard > > value ( 
+            aName.getLength() ? aName : m_aDefaultName, 
             xClipboard );
 
         pair< ClipboardMap::iterator, bool > p = m_aClipboardMap.insert(value);
@@ -150,7 +150,7 @@ void SAL_CALL ClipboardManager::addClipboard( const Reference< XClipboard >& xCl
 
 // ------------------------------------------------------------------------
 
-void SAL_CALL ClipboardManager::removeClipboard( const OUString& aName )
+void SAL_CALL ClipboardManager::removeClipboard( const OUString& aName ) 
      throw(RuntimeException)
 {
     MutexGuard aGuard(m_aMutex);
@@ -160,7 +160,7 @@ void SAL_CALL ClipboardManager::removeClipboard( const OUString& aName )
 
 // ------------------------------------------------------------------------
 
-Sequence< OUString > SAL_CALL ClipboardManager::listClipboardNames()
+Sequence< OUString > SAL_CALL ClipboardManager::listClipboardNames() 
     throw(RuntimeException)
 {
     MutexGuard aGuard(m_aMutex);
@@ -168,8 +168,8 @@ Sequence< OUString > SAL_CALL ClipboardManager::listClipboardNames()
     if (rBHelper.bDisposed)
         throw DisposedException(OUString::createFromAscii("object is disposed."),
                                 static_cast < XClipboardManager * > (this));
-
-    if (rBHelper.bInDispose)
+        
+    if (rBHelper.bInDispose) 
         return Sequence< OUString > ();
 
     Sequence< OUString > aRet(m_aClipboardMap.size());
@@ -179,17 +179,17 @@ Sequence< OUString > SAL_CALL ClipboardManager::listClipboardNames()
     for (sal_Int32 n = 0; iter != imax; iter++)
         aRet[n++] = iter->first;
 
-    return aRet;
+    return aRet;  
 }
 
 // ------------------------------------------------------------------------
 
-void SAL_CALL ClipboardManager::dispose()
+void SAL_CALL ClipboardManager::dispose() 
     throw(RuntimeException)
 {
-    ClearableMutexGuard aGuard( rBHelper.rMutex );
-    if (!rBHelper.bDisposed && !rBHelper.bInDispose)
-    {
+    ClearableMutexGuard aGuard( rBHelper.rMutex ); 
+    if (!rBHelper.bDisposed && !rBHelper.bInDispose) 
+    { 
         rBHelper.bInDispose = sal_True;
         aGuard.clear();
 
@@ -197,13 +197,13 @@ void SAL_CALL ClipboardManager::dispose()
         EventObject aEvt(static_cast < XClipboardManager * > (this));
         rBHelper.aLC.disposeAndClear( aEvt );
 
-        // removeClipboard is still allowed here,  so make a copy of the
+        // removeClipboard is still allowed here,  so make a copy of the 
         // list (to ensure integrety) and clear the original.
-        ClearableMutexGuard aGuard2( rBHelper.rMutex );
+        ClearableMutexGuard aGuard2( rBHelper.rMutex ); 
         ClipboardMap aCopy(m_aClipboardMap);
         m_aClipboardMap.clear();
         aGuard2.clear();
-
+        
         // dispose all clipboards still in list
         ClipboardMap::iterator iter = aCopy.begin();
         ClipboardMap::iterator imax = aCopy.end();
@@ -228,12 +228,12 @@ void SAL_CALL ClipboardManager::dispose()
 
         rBHelper.bDisposed = sal_True;
         rBHelper.bInDispose = sal_False;
-    }
+    } 
 }
 
 // ------------------------------------------------------------------------
 
-void SAL_CALL  ClipboardManager::disposing( const EventObject& event )
+void SAL_CALL  ClipboardManager::disposing( const EventObject& event ) 
     throw(RuntimeException)
 {
     Reference < XClipboard > xClipboard(event.Source, UNO_QUERY);
@@ -244,7 +244,7 @@ void SAL_CALL  ClipboardManager::disposing( const EventObject& event )
 
 // ------------------------------------------------------------------------
 
-Reference< XInterface > SAL_CALL ClipboardManager_createInstance(
+Reference< XInterface > SAL_CALL ClipboardManager_createInstance( 
     const Reference< XMultiServiceFactory > & /*xMultiServiceFactory*/)
 {
     return Reference < XInterface >( ( OWeakObject * ) new ClipboardManager());
@@ -253,9 +253,9 @@ Reference< XInterface > SAL_CALL ClipboardManager_createInstance(
 // ------------------------------------------------------------------------
 
 Sequence< OUString > SAL_CALL ClipboardManager_getSupportedServiceNames()
-{
+{ 
     Sequence < OUString > SupportedServicesNames( 1 );
-    SupportedServicesNames[0] =
+    SupportedServicesNames[0] = 
         OUString::createFromAscii("com.sun.star.datatransfer.clipboard.ClipboardManager");
     return SupportedServicesNames;
 }
diff --git a/dtrans/source/generic/clipboardmanager.hxx b/dtrans/source/generic/clipboardmanager.hxx
index 0429c7640ed7..ee03c52c4498 100644
--- a/dtrans/source/generic/clipboardmanager.hxx
+++ b/dtrans/source/generic/clipboardmanager.hxx
@@ -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
@@ -74,24 +74,24 @@ namespace dtrans
         virtual ::rtl::OUString SAL_CALL getImplementationName(  )
             throw(::com::sun::star::uno::RuntimeException);
 
-        virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName )
+        virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) 
             throw(::com::sun::star::uno::RuntimeException);
 
-        virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames(  )
+        virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames(  ) 
             throw(::com::sun::star::uno::RuntimeException);
 
         /*
          * XComponent
          */
 
-        virtual void SAL_CALL dispose()
+        virtual void SAL_CALL dispose() 
             throw(::com::sun::star::uno::RuntimeException);
 
         /*
          * XEventListener
          */
 
-        virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source )
+        virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) 
             throw(::com::sun::star::uno::RuntimeException);
 
         /*
@@ -99,18 +99,18 @@ namespace dtrans
          */
 
         virtual ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::clipboard::XClipboard > SAL_CALL getClipboard( const ::rtl::OUString& aName )
-            throw(::com::sun::star::container::NoSuchElementException,
+            throw(::com::sun::star::container::NoSuchElementException, 
                   ::com::sun::star::uno::RuntimeException);
 
-        virtual void SAL_CALL addClipboard( const ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::clipboard::XClipboard >& xClipboard )
-            throw(::com::sun::star::lang::IllegalArgumentException,
-                  ::com::sun::star::container::ElementExistException,
+        virtual void SAL_CALL addClipboard( const ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::clipboard::XClipboard >& xClipboard ) 
+            throw(::com::sun::star::lang::IllegalArgumentException, 
+                  ::com::sun::star::container::ElementExistException, 
                   ::com::sun::star::uno::RuntimeException);
 
-        virtual void SAL_CALL removeClipboard( const ::rtl::OUString& aName )
+        virtual void SAL_CALL removeClipboard( const ::rtl::OUString& aName ) 
             throw(::com::sun::star::uno::RuntimeException);
 
-        virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL listClipboardNames(  )
+        virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL listClipboardNames(  ) 
             throw(::com::sun::star::uno::RuntimeException);
 
 
@@ -121,7 +121,7 @@ namespace dtrans
 // ------------------------------------------------------------------------
 
 ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL ClipboardManager_getSupportedServiceNames();
-::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL ClipboardManager_createInstance(
+::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL ClipboardManager_createInstance( 
     const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > & xMultiServiceFactory);
 
 #endif
diff --git a/dtrans/source/generic/dtrans.cxx b/dtrans/source/generic/dtrans.cxx
index 1e69158a6a12..1161a1a87c36 100644
--- a/dtrans/source/generic/dtrans.cxx
+++ b/dtrans/source/generic/dtrans.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
@@ -44,7 +44,7 @@ extern "C"
 
 //==================================================================================================
 
-void SAL_CALL component_getImplementationEnvironment(const sal_Char ** ppEnvTypeName,
+void SAL_CALL component_getImplementationEnvironment(const sal_Char ** ppEnvTypeName, 
                                                      uno_Environment ** /*ppEnv*/ )
 {
     *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
@@ -61,7 +61,7 @@ sal_Bool SAL_CALL component_writeInfo(void * /*pServiceManager*/, void * pRegist
             Reference< XRegistryKey > xNewKey(
                 reinterpret_cast< XRegistryKey * >( pRegistryKey )->createKey(
                     OUString::createFromAscii("/" CLIPBOARDMANAGER_IMPLEMENTATION_NAME "/UNO/SERVICES" ) ) );
-
+                        
             const Sequence< OUString > & rSNL = ClipboardManager_getSupportedServiceNames();
             const OUString * pArray = rSNL.getConstArray();
             sal_Int32 nPos;
@@ -70,12 +70,12 @@ sal_Bool SAL_CALL component_writeInfo(void * /*pServiceManager*/, void * pRegist
 
             xNewKey = reinterpret_cast< XRegistryKey * >( pRegistryKey )->createKey(
                 OUString::createFromAscii("/" GENERIC_CLIPBOARD_IMPLEMENTATION_NAME "/UNO/SERVICES" ) );
-
+                        
             const Sequence< OUString > & rSNL2 = GenericClipboard_getSupportedServiceNames();
             pArray = rSNL2.getConstArray();
             for ( nPos = rSNL2.getLength(); nPos--; )
                 xNewKey->createKey( pArray[nPos] );
-
+            
             return sal_True;
         }
         catch (InvalidRegistryException &)
@@ -90,15 +90,15 @@ sal_Bool SAL_CALL component_writeInfo(void * /*pServiceManager*/, void * pRegist
 //==================================================================================================
 
 void * SAL_CALL component_getFactory(
-    const sal_Char * pImplName,
-    void * pServiceManager,
+    const sal_Char * pImplName, 
+    void * pServiceManager, 
     void * /*pRegistryKey*/
 )
 {
     void * pRet = 0;
-
+        
     if (pServiceManager)
-    {
+    { 
         Reference< XSingleServiceFactory > xFactory;
 
         if (rtl_str_compare( pImplName, CLIPBOARDMANAGER_IMPLEMENTATION_NAME ) == 0)
@@ -106,7 +106,7 @@ void * SAL_CALL component_getFactory(
             xFactory = createOneInstanceFactory(
                 reinterpret_cast< XMultiServiceFactory * >( pServiceManager ),
                 OUString::createFromAscii( pImplName ),
-                ClipboardManager_createInstance,
+                ClipboardManager_createInstance, 
                 ClipboardManager_getSupportedServiceNames() );
         }
         else if (rtl_str_compare( pImplName, GENERIC_CLIPBOARD_IMPLEMENTATION_NAME ) == 0)
@@ -114,7 +114,7 @@ void * SAL_CALL component_getFactory(
             xFactory = createSingleFactory(
                 reinterpret_cast< XMultiServiceFactory * >( pServiceManager ),
                 OUString::createFromAscii( pImplName ),
-                GenericClipboard_createInstance,
+                GenericClipboard_createInstance, 
                 GenericClipboard_getSupportedServiceNames() );
         }
 
@@ -124,7 +124,7 @@ void * SAL_CALL component_getFactory(
             pRet = xFactory.get();
         }
     }
-
+        
     return pRet;
 }
 
diff --git a/dtrans/source/generic/dtrans.xml b/dtrans/source/generic/dtrans.xml
index 58ae60cae7c6..53d98425ea61 100644
--- a/dtrans/source/generic/dtrans.xml
+++ b/dtrans/source/generic/dtrans.xml
@@ -35,10 +35,10 @@
         <type> com.sun.star.uno.XWeak </type>
         <type> com.sun.star.uno.XAggregation </type>
     </component-description>
-    <project-build-dependency>  cppuhelper  </project-build-dependency>
-    <project-build-dependency>  cppu        </project-build-dependency>
-    <project-build-dependency>  sal         </project-build-dependency>
-    <runtime-module-dependency> cppuhelper  </runtime-module-dependency>
-    <runtime-module-dependency> cppu2       </runtime-module-dependency>
-    <runtime-module-dependency> sal2        </runtime-module-dependency>
+    <project-build-dependency>	cppuhelper	</project-build-dependency>
+    <project-build-dependency>	cppu		</project-build-dependency>
+    <project-build-dependency>	sal			</project-build-dependency>
+    <runtime-module-dependency>	cppuhelper	</runtime-module-dependency>
+    <runtime-module-dependency>	cppu2		</runtime-module-dependency>
+    <runtime-module-dependency>	sal2		</runtime-module-dependency>
 </module-description>
diff --git a/dtrans/source/generic/generic_clipboard.cxx b/dtrans/source/generic/generic_clipboard.cxx
index 046632d82bf8..adec8aed60e7 100644
--- a/dtrans/source/generic/generic_clipboard.cxx
+++ b/dtrans/source/generic/generic_clipboard.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
@@ -56,7 +56,7 @@ GenericClipboard::~GenericClipboard()
 
 // ------------------------------------------------------------------------
 
-void SAL_CALL GenericClipboard::initialize( const Sequence< Any >& aArguments )
+void SAL_CALL GenericClipboard::initialize( const Sequence< Any >& aArguments ) 
     throw(Exception, RuntimeException)
 {
     if (!m_bInitialized)
@@ -72,7 +72,7 @@ void SAL_CALL GenericClipboard::initialize( const Sequence< Any >& aArguments )
 
 // ------------------------------------------------------------------------
 
-OUString SAL_CALL GenericClipboard::getImplementationName(  )
+OUString SAL_CALL GenericClipboard::getImplementationName(  ) 
     throw(RuntimeException)
 {
     return OUString::createFromAscii(GENERIC_CLIPBOARD_IMPLEMENTATION_NAME);
@@ -80,7 +80,7 @@ OUString SAL_CALL GenericClipboard::getImplementationName(  )
 
 // ------------------------------------------------------------------------
 
-sal_Bool SAL_CALL GenericClipboard::supportsService( const OUString& ServiceName )
+sal_Bool SAL_CALL GenericClipboard::supportsService( const OUString& ServiceName ) 
     throw(RuntimeException)
 {
     Sequence < OUString > SupportedServicesNames = GenericClipboard_getSupportedServiceNames();
@@ -94,7 +94,7 @@ sal_Bool SAL_CALL GenericClipboard::supportsService( const OUString& ServiceName
 
 // ------------------------------------------------------------------------
 
-Sequence< OUString > SAL_CALL GenericClipboard::getSupportedServiceNames(    )
+Sequence< OUString > SAL_CALL GenericClipboard::getSupportedServiceNames(	 ) 
     throw(RuntimeException)
 {
     return GenericClipboard_getSupportedServiceNames();
@@ -102,7 +102,7 @@ Sequence< OUString > SAL_CALL GenericClipboard::getSupportedServiceNames(    )
 
 // ------------------------------------------------------------------------
 
-Reference< XTransferable > SAL_CALL GenericClipboard::getContents()
+Reference< XTransferable > SAL_CALL GenericClipboard::getContents() 
     throw(RuntimeException)
 {
     MutexGuard aGuard(m_aMutex);
@@ -111,8 +111,8 @@ Reference< XTransferable > SAL_CALL GenericClipboard::getContents()
 
 // ------------------------------------------------------------------------
 
-void SAL_CALL GenericClipboard::setContents(const Reference< XTransferable >& xTrans,
-                                      const Reference< XClipboardOwner >& xClipboardOwner )
+void SAL_CALL GenericClipboard::setContents(const Reference< XTransferable >& xTrans, 
+                                      const Reference< XClipboardOwner >& xClipboardOwner ) 
     throw(RuntimeException)
 {
     // remember old values for callbacks before setting the new ones.
@@ -131,7 +131,7 @@ void SAL_CALL GenericClipboard::setContents(const Reference< XTransferable >& xT
         oldOwner->lostOwnership(static_cast < XClipboard * > (this), oldContents);
 
     // notify all listeners on content changes
-    OInterfaceContainerHelper *pContainer =
+    OInterfaceContainerHelper *pContainer = 
         rBHelper.aLC.getContainer(getCppuType( (Reference < XClipboardListener > *) 0));
     if (pContainer)
     {
@@ -149,7 +149,7 @@ void SAL_CALL GenericClipboard::setContents(const Reference< XTransferable >& xT
 
 // ------------------------------------------------------------------------
 
-OUString SAL_CALL GenericClipboard::getName()
+OUString SAL_CALL GenericClipboard::getName() 
     throw(RuntimeException)
 {
     return m_aName;
@@ -166,7 +166,7 @@ sal_Int8 SAL_CALL GenericClipboard::getRenderingCapabilities()
 
 // ------------------------------------------------------------------------
 
-void SAL_CALL GenericClipboard::addClipboardListener( const Reference< XClipboardListener >& listener )
+void SAL_CALL GenericClipboard::addClipboardListener( const Reference< XClipboardListener >& listener ) 
     throw(RuntimeException)
 {
     MutexGuard aGuard( rBHelper.rMutex );
@@ -178,7 +178,7 @@ void SAL_CALL GenericClipboard::addClipboardListener( const Reference< XClipboar
 
 // ------------------------------------------------------------------------
 
-void SAL_CALL GenericClipboard::removeClipboardListener( const Reference< XClipboardListener >& listener )
+void SAL_CALL GenericClipboard::removeClipboardListener( const Reference< XClipboardListener >& listener ) 
     throw(RuntimeException)
 {
     MutexGuard aGuard( rBHelper.rMutex );
@@ -198,7 +198,7 @@ Sequence< OUString > SAL_CALL GenericClipboard_getSupportedServiceNames()
 
 // ------------------------------------------------------------------------
 
-Reference< XInterface > SAL_CALL GenericClipboard_createInstance(
+Reference< XInterface > SAL_CALL GenericClipboard_createInstance( 
     const Reference< XMultiServiceFactory > & /*xMultiServiceFactory*/)
 {
     return Reference < XInterface >( ( OWeakObject * ) new GenericClipboard());
diff --git a/dtrans/source/generic/generic_clipboard.hxx b/dtrans/source/generic/generic_clipboard.hxx
index 54308b0a1bdd..659a32340db1 100644
--- a/dtrans/source/generic/generic_clipboard.hxx
+++ b/dtrans/source/generic/generic_clipboard.hxx
@@ -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
@@ -66,7 +66,7 @@ namespace dtrans
 
     public:
 
-        GenericClipboard();
+        GenericClipboard();    
 
         /*
          * XInitialization
@@ -79,7 +79,7 @@ namespace dtrans
          * XServiceInfo
          */
 
-        virtual ::rtl::OUString SAL_CALL getImplementationName(  )
+        virtual ::rtl::OUString SAL_CALL getImplementationName(	 )
             throw(::com::sun::star::uno::RuntimeException);
 
         virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName )
@@ -92,16 +92,16 @@ namespace dtrans
          * XClipboard
          */
 
-        virtual ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::XTransferable > SAL_CALL getContents()
+        virtual ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::XTransferable > SAL_CALL getContents() 
             throw(::com::sun::star::uno::RuntimeException);
 
-        virtual void SAL_CALL setContents(
-            const ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::XTransferable >& xTrans,
-            const ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::clipboard::XClipboardOwner >& xClipboardOwner )
+        virtual void SAL_CALL setContents( 
+            const ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::XTransferable >& xTrans, 
+            const ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::clipboard::XClipboardOwner >& xClipboardOwner ) 
             throw(::com::sun::star::uno::RuntimeException);
 
-        virtual ::rtl::OUString SAL_CALL getName()
-            throw(::com::sun::star::uno::RuntimeException);
+        virtual ::rtl::OUString SAL_CALL getName() 
+            throw(::com::sun::star::uno::RuntimeException);    
 
         /*
          * XClipboardEx
@@ -114,13 +114,13 @@ namespace dtrans
          * XClipboardNotifier
          */
 
-        virtual void SAL_CALL addClipboardListener(
-            const ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::clipboard::XClipboardListener >& listener )
+        virtual void SAL_CALL addClipboardListener( 
+            const ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::clipboard::XClipboardListener >& listener ) 
             throw(::com::sun::star::uno::RuntimeException);
 
-        virtual void SAL_CALL removeClipboardListener(
-            const ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::clipboard::XClipboardListener >& listener )
-            throw(::com::sun::star::uno::RuntimeException);
+        virtual void SAL_CALL removeClipboardListener( 
+            const ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::clipboard::XClipboardListener >& listener ) 
+            throw(::com::sun::star::uno::RuntimeException);  
 
     };
 
@@ -129,7 +129,7 @@ namespace dtrans
 // ------------------------------------------------------------------------
 
 ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL GenericClipboard_getSupportedServiceNames();
-::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL GenericClipboard_createInstance(
+::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL GenericClipboard_createInstance( 
     const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > & xMultiServiceFactory);
 
 #endif
diff --git a/dtrans/source/inc/DtObjFactory.hxx b/dtrans/source/inc/DtObjFactory.hxx
index fc217e6d5982..8db315d8bbc9 100644
--- a/dtrans/source/inc/DtObjFactory.hxx
+++ b/dtrans/source/inc/DtObjFactory.hxx
@@ -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
@@ -47,7 +47,7 @@ class CDTransObjFactory
 public:
     virtual IDataObjectPtr SAL_CALL createDataObjFromTransferable( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& aServiceManager,
                                                                    const com::sun::star::uno::Reference< com::sun::star::datatransfer::XTransferable >& refXTransferable );
-    virtual com::sun::star::uno::Reference< com::sun::star::datatransfer::XTransferable > SAL_CALL createTransferableFromDataObj(
+    virtual com::sun::star::uno::Reference< com::sun::star::datatransfer::XTransferable > SAL_CALL createTransferableFromDataObj( 
         const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& aServiceManager, IDataObjectPtr pIDataObject );
 };
 
diff --git a/dtrans/source/inc/MtaOleClipb.hxx b/dtrans/source/inc/MtaOleClipb.hxx
index 03facb73d18f..4dc0b19d6e5c 100644
--- a/dtrans/source/inc/MtaOleClipb.hxx
+++ b/dtrans/source/inc/MtaOleClipb.hxx
@@ -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
@@ -43,7 +43,7 @@
 // the Mta-Ole clipboard class is for internal use only!
 // only one instance of this class should be created, the
 // user has to ensure this!
-// the class is not thread-safe because it will be used
+// the class is not thread-safe because it will be used 
 // only from within the clipboard service and the methods
 // of the clipboard service are already synchronized
 //--------------------------------------------------------
@@ -59,9 +59,9 @@ public:
 
     // clipboard functions
     HRESULT setClipboard( IDataObject* pIDataObject );
-    HRESULT getClipboard( IDataObject** ppIDataObject );
+    HRESULT getClipboard( IDataObject** ppIDataObject );	
     HRESULT flushClipboard( );
-
+    
     // register/unregister a clipboard viewer; there can only
     // be one at a time; parameter NULL means unregister
     // a clipboard viewer
@@ -71,8 +71,8 @@ public:
 
 private:
     unsigned int run( );
-
-    // create a hidden windows which serves as an request
+    
+    // create a hidden windows which serves as an request 
     // target; so we guarantee synchronization
     void createMtaOleReqWnd( );
 
@@ -86,7 +86,7 @@ private:
     //---------------------------------------------------------------
 
     LRESULT  onSetClipboard( IDataObject* pIDataObject );
-    LRESULT  onGetClipboard( LPSTREAM* ppStream );
+    LRESULT  onGetClipboard( LPSTREAM* ppStream );	
     LRESULT  onFlushClipboard( );
     sal_Bool onRegisterClipViewer( LPFNC_CLIPVIEWER_CALLBACK_t pfncClipViewerCallback );
 
@@ -94,22 +94,22 @@ private:
     LRESULT onChangeCBChain( HWND hWndRemove, HWND hWndNext );
     LRESULT onDrawClipboard( );
 
-    static LRESULT CALLBACK mtaOleReqWndProc( HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam );
+    static LRESULT CALLBACK mtaOleReqWndProc( HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam );	
     static unsigned int WINAPI oleThreadProc( LPVOID pParam );
 
     static unsigned int WINAPI clipboardChangedNotifierThreadProc( LPVOID pParam );
 
-    sal_Bool WaitForThreadReady( ) const;
+    sal_Bool WaitForThreadReady( ) const;	
 
 private:
-    HANDLE                      m_hOleThread;
-    unsigned                    m_uOleThreadId;
-    HANDLE                      m_hEvtThrdReady;
-    HWND                        m_hwndMtaOleReqWnd;
-    ATOM                        m_MtaOleReqWndClassAtom;
-    HWND                        m_hwndNextClipViewer;
-    LPFNC_CLIPVIEWER_CALLBACK_t m_pfncClipViewerCallback;
-    sal_Bool                    m_bInRegisterClipViewer;
+    HANDLE						m_hOleThread;
+    unsigned					m_uOleThreadId;
+    HANDLE						m_hEvtThrdReady;	
+    HWND						m_hwndMtaOleReqWnd;	
+    ATOM						m_MtaOleReqWndClassAtom;
+    HWND						m_hwndNextClipViewer;
+    LPFNC_CLIPVIEWER_CALLBACK_t	m_pfncClipViewerCallback;	
+    sal_Bool					m_bInRegisterClipViewer;
 
     sal_Bool                    m_bRunClipboardNotifierThread;
     HANDLE                      m_hClipboardChangedNotifierThread;
diff --git a/dtrans/source/os2/clipb/OS2Bitmap.cxx b/dtrans/source/os2/clipb/OS2Bitmap.cxx
index 53b78c7afaef..15188df3bd93 100644
--- a/dtrans/source/os2/clipb/OS2Bitmap.cxx
+++ b/dtrans/source/os2/clipb/OS2Bitmap.cxx
@@ -2,7 +2,7 @@
  *
  *  This code is property of Serenity Systems Intl
  *  All rights reserverd.
- *
+ *  
  ************************************************************************/
 
 #define INCL_WIN
@@ -36,35 +36,35 @@ typedef struct
 
 typedef struct
 {
-    DWORD   biSize;
-    LONG    biWidth;
-    LONG    biHeight;
-    WORD    biPlanes;
-    WORD    biBitCount;
-    DWORD   biCompression;
-    DWORD   biSizeImage;
-    LONG    biXPelsPerMeter;
-    LONG    biYPelsPerMeter;
-    DWORD   biClrUsed;
-    DWORD   biClrImportant;
+    DWORD 	biSize;
+    LONG  	biWidth;
+    LONG  	biHeight;
+    WORD 	biPlanes;
+    WORD 	biBitCount;
+    DWORD 	biCompression;
+    DWORD 	biSizeImage;
+    LONG  	biXPelsPerMeter;
+    LONG  	biYPelsPerMeter;
+    DWORD 	biClrUsed;
+    DWORD 	biClrImportant;
 } W32_BITMAPINFOHEADER, *PW32_BITMAPINFOHEADER;
 
 #pragma pack(pop)
 
 // store screen bitcount
-LONG    lBitCountScreen;
+LONG	lBitCountScreen;
 
 /*
  * Convert an OOo bitmap to an OS/2 bitmap handle
  *
- * An OOo bitmap is a BITMAPFILEHEADER structure followed by a Windows DIB
+ * An OOo bitmap is a BITMAPFILEHEADER structure followed by a Windows DIB 
  *
  * OS/2 InfoHeader is a superset of Win32 InhoHeader, so we can just copy
  * the win32 memory over the os2 memory and fix the cbFix field.
  * colortable and bitmap data share the same format.
  *
 */
-HBITMAP OOoBmpToOS2Handle( Any &aAnyB)
+HBITMAP	OOoBmpToOS2Handle( Any &aAnyB)
 {
     // copy bitmap to clipboard
     Sequence<sal_Int8> ByteStream;
@@ -110,23 +110,23 @@ HBITMAP OOoBmpToOS2Handle( Any &aAnyB)
 /*
  * Convert an OS/2 bitmap handle to OOo bitmap
  *
- * First we need to copy the bitmap to a PS, then we can get bitmap data.
+ * First we need to copy the bitmap to a PS, then we can get bitmap data. 
  *
 */
-int OS2HandleToOOoBmp( HBITMAP hbm, Sequence< sal_Int8 >* OOoDIBStream)
+int	OS2HandleToOOoBmp( HBITMAP hbm, Sequence< sal_Int8 >* OOoDIBStream)
 {
-    HAB     hab = WinQueryAnchorBlock(HWND_DESKTOP);
-    HDC     hdc;
-    SIZEL   sizl;
-    HPS     hps;
-    PM_BYTE*    pbBuffer;
-    ULONG   cbBuffer;
+    HAB 	hab = WinQueryAnchorBlock(HWND_DESKTOP);
+    HDC 	hdc; 
+    SIZEL 	sizl; 
+    HPS 	hps;
+    PM_BYTE*	pbBuffer;
+    ULONG	cbBuffer;
 
     struct {
         BITMAPINFOHEADER2 bmp2;
         RGB2 argb2Color[0x100];
     } bm;
-
+    
     if (!lBitCountScreen) {
         HPS hps = WinGetPS(HWND_DESKTOP);
         HDC hdc = GpiQueryDevice(hps);
@@ -163,7 +163,7 @@ int OS2HandleToOOoBmp( HBITMAP hbm, Sequence< sal_Int8 >* OOoDIBStream)
     }
     // copy bitmap to hps
     GpiSetBitmap(hps, hbm);
-
+    
     // buffer lengths
     cbBuffer = (((bm.bmp2.cBitCount * bm.bmp2.cx) + 31) / 32) * 4 * bm.bmp2.cy * bm.bmp2.cPlanes;
     pbBuffer = (PM_BYTE*) malloc( cbBuffer);
@@ -182,16 +182,16 @@ int OS2HandleToOOoBmp( HBITMAP hbm, Sequence< sal_Int8 >* OOoDIBStream)
     else
         iNumColors = bm.bmp2.cclrUsed;
     int iColorTableSize = iNumColors*sizeof(RGBQUAD);
-
+    
     // reallocate data stream object size
-    OOoDIBStream->realloc( sizeof( W32_BITMAPFILEHEADER )
+    OOoDIBStream->realloc( sizeof( W32_BITMAPFILEHEADER ) 
                 + sizeof( W32_BITMAPINFOHEADER) + iColorTableSize + cbBuffer);
 
     // fill w32 file header data
     PW32_BITMAPFILEHEADER pbfh = (PW32_BITMAPFILEHEADER) OOoDIBStream->getArray();
     memset( pbfh, 0, sizeof( W32_BITMAPFILEHEADER));
     pbfh->bfType = 'MB';
-    pbfh->bfSize = sizeof( W32_BITMAPFILEHEADER )
+    pbfh->bfSize = sizeof( W32_BITMAPFILEHEADER ) 
                 + sizeof( W32_BITMAPINFOHEADER) + iColorTableSize + cbBuffer;
     pbfh->bfOffBits = sizeof( W32_BITMAPFILEHEADER) + sizeof( W32_BITMAPINFOHEADER) + iColorTableSize;
 
@@ -221,7 +221,7 @@ int OS2HandleToOOoBmp( HBITMAP hbm, Sequence< sal_Int8 >* OOoDIBStream)
 int main( void)
 {
     HAB hAB = WinQueryAnchorBlock( HWND_DESKTOP );
-
+    
     // query clipboard data to get mimetype
     if( WinOpenClipbrd( hAB ) )
     {
@@ -237,7 +237,7 @@ int main( void)
                 close( fd);
             } else
                 printf( "failed conversion.\n");
-
+            
         }
         WinCloseClipbrd( hAB);
     }
diff --git a/dtrans/source/os2/clipb/Os2Clipboard.cxx b/dtrans/source/os2/clipb/Os2Clipboard.cxx
index 494df04b640a..c2983ec8eba0 100644
--- a/dtrans/source/os2/clipb/Os2Clipboard.cxx
+++ b/dtrans/source/os2/clipb/Os2Clipboard.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
@@ -45,7 +45,7 @@ using namespace osl;
 using namespace rtl;
 using namespace os2;
 
-const Type CPPUTYPE_SEQINT8  = getCppuType( ( Sequence< sal_Int8 >* )0 );
+const Type CPPUTYPE_SEQINT8	 = getCppuType( ( Sequence< sal_Int8 >* )0 );
 const Type CPPUTYPE_OUSTRING = getCppuType( (OUString*)0 );
 
 #define DTRANS_OBJ_CLASSNAME "DTRANSOBJWND"
@@ -69,7 +69,7 @@ MRESULT EXPENTRY DtransObjWndProc( HWND hWnd, ULONG nMsg, MPARAM nMP1, MPARAM nM
 
     switch ( nMsg )
     {
-    case WM_DRAWCLIPBOARD:  // clipboard content has changed
+    case WM_DRAWCLIPBOARD:	// clipboard content has changed
         {
             Os2Clipboard* os2Clipboard = GetWindowPtr( hWnd);
             if (os2Clipboard)
@@ -114,7 +114,7 @@ Os2Clipboard::Os2Clipboard() :
     if ( WinRegisterClass( hAB, (PSZ)DTRANS_OBJ_CLASSNAME,
                             (PFNWP)DtransObjWndProc, 0, sizeof(ULONG) ))
     {
-        APIRET  rc;
+        APIRET	rc;
         // create object window to get clip viewer messages
         hObjWnd = WinCreateWindow( HWND_OBJECT, (PCSZ)DTRANS_OBJ_CLASSNAME,
                                         (PCSZ)"", 0, 0, 0, 0, 0,
@@ -136,7 +136,7 @@ Os2Clipboard::~Os2Clipboard()
     debug_printf("Os2Clipboard::~Os2Clipboard\n");
 }
 
-void SAL_CALL Os2Clipboard::initialize( const Sequence< Any >& aArguments )
+void SAL_CALL Os2Clipboard::initialize( const Sequence< Any >& aArguments ) 
     throw(Exception, RuntimeException)
 {
     if (!m_bInitialized)
@@ -183,7 +183,7 @@ Reference< XTransferable > SAL_CALL Os2Clipboard::getContents() throw( RuntimeEx
     // when the viewer changes. So we need to check handles of clipboard
     // data and compare with previous handles
     if (UWinOpenClipbrd(hAB)) {
-        sal_Bool    fireChanged = sal_False;
+        sal_Bool	fireChanged = sal_False;
         ULONG handle = UWinQueryClipbrdData( hAB, UCLIP_CF_UNICODETEXT);
         if (handle) {
             if (handle != hText) {
@@ -232,7 +232,7 @@ void SAL_CALL Os2Clipboard::setContents( const Reference< XTransferable >& xTran
         oldOwner->lostOwnership(static_cast < XClipboard * > (this), oldContents);
 
     // notify all listeners on content changes
-    OInterfaceContainerHelper *pContainer =
+    OInterfaceContainerHelper *pContainer = 
         rBHelper.aLC.getContainer(getCppuType( (Reference < XClipboardListener > *) 0));
     if (pContainer)
     {
@@ -246,12 +246,12 @@ void SAL_CALL Os2Clipboard::setContents( const Reference< XTransferable >& xTran
                 xListener->changedContents(aEvent);
         }
     }
-
+    
 #if OSL_DEBUG_LEVEL>0
     // dump list of available mimetypes
     Sequence< DataFlavor > aFlavors( m_aContents->getTransferDataFlavors() );
     for( int i = 0; i < aFlavors.getLength(); i++ )
-        debug_printf("Os2Clipboard::setContents available mimetype: %d %s\n",
+        debug_printf("Os2Clipboard::setContents available mimetype: %d %s\n", 
             i, CHAR_POINTER(aFlavors.getConstArray()[i].MimeType));
 #endif
 
@@ -260,7 +260,7 @@ void SAL_CALL Os2Clipboard::setContents( const Reference< XTransferable >& xTran
                         OUString::createFromAscii( "Unicode-Text" ), CPPUTYPE_OUSTRING);
     DataFlavor nFlavorBitmap( OUString::createFromAscii( "application/x-openoffice-bitmap;windows_formatname=\"Bitmap\"" ),
                         OUString::createFromAscii( "Bitmap" ), CPPUTYPE_DEFAULT);
-
+    
     // try text transfer data (if any)
     PSZ pSharedText = NULL;
     HBITMAP hbm = NULL;
@@ -271,11 +271,11 @@ void SAL_CALL Os2Clipboard::setContents( const Reference< XTransferable >& xTran
         {
             APIRET rc;
             // copy unicode text to clipboard
-            OUString aString;
+            OUString aString; 
             aAny >>= aString;
             // share text
-            rc = DosAllocSharedMem( (PPVOID) &pSharedText, NULL,
-                aString.getLength() * 2 + 2,
+            rc = DosAllocSharedMem( (PPVOID) &pSharedText, NULL, 
+                aString.getLength() * 2 + 2, 
                 PAG_WRITE | PAG_COMMIT | OBJ_GIVEABLE | OBJ_ANY);
             if (!rc)
                 memcpy( pSharedText, aString.getStr(), aString.getLength() * 2 + 2 );
@@ -313,7 +313,7 @@ void SAL_CALL Os2Clipboard::setContents( const Reference< XTransferable >& xTran
             // update internal handle to avoid detection of this text as new data
             hText = (ULONG)pSharedText;
         }
-        // give bitmap to clipboard
+        // give bitmap to clipboard 
         if (hbm) {
             UWinSetClipbrdData( hAB, (ULONG) hbm, UCLIP_CF_BITMAP, CFI_HANDLE);
             // update internal handle to avoid detection of this bitmap as new data
@@ -339,7 +339,7 @@ sal_Int8 SAL_CALL Os2Clipboard::getRenderingCapabilities() throw( RuntimeExcepti
 }
 
 //========================================================================
-// XClipboardNotifier
+// XClipboardNotifier 
 //========================================================================
 
 void SAL_CALL Os2Clipboard::addClipboardListener( const Reference< XClipboardListener >& listener ) throw( RuntimeException )
@@ -382,16 +382,16 @@ void SAL_CALL Os2Clipboard::notifyAllClipboardListener( )
             m_aContents.clear();
             // release the mutex
             aGuard.clear();
-
+        
             // inform previous owner of lost ownership
             if ( xOwner.is() )
                 xOwner->lostOwnership(static_cast < XClipboard * > (this), m_aContents);
 
-            OInterfaceContainerHelper* pICHelper = rBHelper.aLC.getContainer(
+            OInterfaceContainerHelper* pICHelper = rBHelper.aLC.getContainer( 
                 getCppuType( ( Reference< XClipboardListener > * ) 0 ) );
 
             if ( pICHelper )
-            {
+            {				
                 try
                 {
                     OInterfaceIteratorHelper iter(*pICHelper);
@@ -411,18 +411,18 @@ void SAL_CALL Os2Clipboard::notifyAllClipboardListener( )
                         {
                             OSL_ENSURE( false, "RuntimeException caught" );
                             debug_printf( "RuntimeException caught" );
-                        }
-                    }
+                        }					
+                    } 
                 }
                 catch(const ::com::sun::star::lang::DisposedException&)
-                {
+                {					
                     OSL_ENSURE(false, "Service Manager disposed");
                     debug_printf( "Service Manager disposed");
-
+                    
                     // no further clipboard changed notifications
                     //m_pImpl->unregisterClipboardViewer();
                 }
-
+                
             } // end if
         } // end if
     } // end if
@@ -439,7 +439,7 @@ Sequence< OUString > SAL_CALL Os2Clipboard_getSupportedServiceNames()
 
 // ------------------------------------------------------------------------
 
-Reference< XInterface > SAL_CALL Os2Clipboard_createInstance(
+Reference< XInterface > SAL_CALL Os2Clipboard_createInstance( 
     const Reference< XMultiServiceFactory > & xMultiServiceFactory)
 {
     return Reference < XInterface >( ( OWeakObject * ) new Os2Clipboard());
diff --git a/dtrans/source/os2/clipb/Os2Clipboard.hxx b/dtrans/source/os2/clipb/Os2Clipboard.hxx
index 0a9f4d117464..f5ef7ae79883 100644
--- a/dtrans/source/os2/clipb/Os2Clipboard.hxx
+++ b/dtrans/source/os2/clipb/Os2Clipboard.hxx
@@ -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
@@ -51,7 +51,7 @@
 
 namespace os2 {
 
-class Os2Clipboard :
+class Os2Clipboard : 
     //public cppu::WeakComponentImplHelper3< ::com::sun::star::datatransfer::clipboard::XClipboardEx, ::com::sun::star::datatransfer::clipboard::XClipboardNotifier, ::com::sun::star::lang::XServiceInfo >
     public ::cppu::WeakComponentImplHelper4 < \
     ::com::sun::star::datatransfer::clipboard::XClipboardEx, \
@@ -75,20 +75,20 @@ public:
      */
     virtual ::rtl::OUString SAL_CALL getImplementationName()
         throw(::com::sun::star::uno::RuntimeException);
-    virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName )
+    virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) 
         throw(::com::sun::star::uno::RuntimeException);
 
-    virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames()
+    virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() 
         throw(::com::sun::star::uno::RuntimeException);
 
     /*
      * XClipboard
      */
-    virtual ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::XTransferable > SAL_CALL getContents()
+    virtual ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::XTransferable > SAL_CALL getContents() 
         throw( ::com::sun::star::uno::RuntimeException );
-    virtual void SAL_CALL setContents( const ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::XTransferable >& xTransferable, const ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::clipboard::XClipboardOwner >& xClipboardOwner )
+    virtual void SAL_CALL setContents( const ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::XTransferable >& xTransferable, const ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::clipboard::XClipboardOwner >& xClipboardOwner ) 
         throw( ::com::sun::star::uno::RuntimeException );
-    virtual ::rtl::OUString SAL_CALL getName()
+    virtual ::rtl::OUString SAL_CALL getName() 
         throw( ::com::sun::star::uno::RuntimeException );
 
     /*
@@ -96,13 +96,13 @@ public:
      */
     virtual sal_Int8 SAL_CALL getRenderingCapabilities()
         throw( ::com::sun::star::uno::RuntimeException );
-
+        
     /*
      * XClipboardNotifier
      */
-    virtual void SAL_CALL addClipboardListener( const ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::clipboard::XClipboardListener >& listener )
+    virtual void SAL_CALL addClipboardListener( const ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::clipboard::XClipboardListener >& listener ) 
         throw( ::com::sun::star::uno::RuntimeException );
-    virtual void SAL_CALL removeClipboardListener( const ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::clipboard::XClipboardListener >& listener )
+    virtual void SAL_CALL removeClipboardListener( const ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::clipboard::XClipboardListener >& listener ) 
         throw( ::com::sun::star::uno::RuntimeException );
     void SAL_CALL notifyAllClipboardListener( );
 
@@ -110,16 +110,16 @@ public:
     sal_Bool m_bInSetClipboardData;
 
 private:
-    HAB hAB;
-    HWND    hObjWnd;
-    ULONG   hText, hBitmap; // handles to previous clipboard data
+    HAB	hAB;
+    HWND	hObjWnd;
+    ULONG	hText, hBitmap;	// handles to previous clipboard data
 
     ::osl::Mutex m_aMutex;
     ::rtl::OUString m_aName;
-
+    
     ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::XTransferable > m_aContents;
     ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::clipboard::XClipboardOwner > m_aOwner;
-
+    
     sal_Bool m_bInitialized;
 
 };
@@ -129,7 +129,7 @@ private:
 // ------------------------------------------------------------------------
 
 ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL Os2Clipboard_getSupportedServiceNames();
-::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL Os2Clipboard_createInstance(
+::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL Os2Clipboard_createInstance( 
     const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > & xMultiServiceFactory);
 
 #endif
diff --git a/dtrans/source/os2/clipb/Os2Service.cxx b/dtrans/source/os2/clipb/Os2Service.cxx
index cc3e1e9a9b94..918564556309 100644
--- a/dtrans/source/os2/clipb/Os2Service.cxx
+++ b/dtrans/source/os2/clipb/Os2Service.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
@@ -47,7 +47,7 @@ Reference< XInterface > SAL_CALL createInstance( const Reference< XMultiServiceF
 
 } // namespace os2
 
-extern "C"
+extern "C" 
 {
 
 void SAL_CALL component_getImplementationEnvironment(
@@ -64,13 +64,13 @@ sal_Bool SAL_CALL component_writeInfo( void* pServiceManager, void* pRegistryKey
     {
         try
         {
-            Reference< XRegistryKey > pXNewKey( static_cast< XRegistryKey* >( pRegistryKey ) );
+            Reference< XRegistryKey > pXNewKey( static_cast< XRegistryKey* >( pRegistryKey ) );							
             pXNewKey->createKey( OUString( RTL_CONSTASCII_USTRINGPARAM( OS2_CLIPBOARD_REGKEY_NAME ) ) );
             bRetVal = sal_True;
         }
         catch( InvalidRegistryException& )
-        {
-            OSL_ENSURE(sal_False, "InvalidRegistryException caught");
+        {			
+            OSL_ENSURE(sal_False, "InvalidRegistryException caught");			
             bRetVal = sal_False;
         }
     }
@@ -85,8 +85,8 @@ void* SAL_CALL component_getFactory( const sal_Char* pImplName, uno_Interface* p
     if ( pSrvManager && ( 0 == rtl_str_compare( pImplName, OS2_CLIPBOARD_IMPL_NAME ) ) )
     {
         Sequence< OUString > aSNS( 1 );
-        aSNS.getArray()[0] = OUString( RTL_CONSTASCII_USTRINGPARAM( OS2_CLIPBOARD_SERVICE_NAME ) );
-
+        aSNS.getArray()[0] = OUString( RTL_CONSTASCII_USTRINGPARAM( OS2_CLIPBOARD_SERVICE_NAME ) );		
+        
         //OUString( RTL_CONSTASCII_USTRINGPARAM( FPS_IMPL_NAME ) )
         Reference< XSingleServiceFactory > xFactory ( createOneInstanceFactory(
             reinterpret_cast< XMultiServiceFactory* > ( pSrvManager ),
@@ -97,7 +97,7 @@ void* SAL_CALL component_getFactory( const sal_Char* pImplName, uno_Interface* p
         {
             xFactory->acquire();
             pRet = xFactory.get();
-        }
+        }			
     }
 
     return pRet;
diff --git a/dtrans/source/os2/clipb/Os2Transferable.cxx b/dtrans/source/os2/clipb/Os2Transferable.cxx
index fe8c77105e90..613d4d719469 100644
--- a/dtrans/source/os2/clipb/Os2Transferable.cxx
+++ b/dtrans/source/os2/clipb/Os2Transferable.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
@@ -48,12 +48,12 @@ using namespace os2;
 // =======================================================================
 
 Os2Transferable::Os2Transferable(
-    const Reference< XInterface >& xCreator ) :
+    const Reference< XInterface >& xCreator	) :
         m_xCreator( xCreator )
 {
     debug_printf("Os2Transferable::Os2Transferable %08x\n", this);
     hAB = WinQueryAnchorBlock( HWND_DESKTOP );
-
+    
     // query clipboard data to get mimetype
     if( UWinOpenClipbrd( hAB ) )
     {
@@ -70,7 +70,7 @@ Os2Transferable::Os2Transferable(
             //debug_printf("Os2Transferable::Os2Transferable pszText %s\n", pszText);
         }
         UWinCloseClipbrd( hAB);
-    }
+    } 
     else
     {
         debug_printf("Os2Transferable::Os2Transferable failed to open clipboard\n");
@@ -94,7 +94,7 @@ Any SAL_CALL Os2Transferable::getTransferData( const DataFlavor& rFlavor )
     debug_printf("Os2Transferable::getTransferData mimetype: %s\n", CHAR_POINTER(rFlavor.MimeType));
     Any aRet;
     Sequence< sal_Int8 > aData;
-
+    
     // retrieve unicode text
     if( rFlavor.MimeType.equalsIgnoreAsciiCase( OUString::createFromAscii( "text/plain;charset=utf-16" ) ) )
     {
@@ -112,7 +112,7 @@ Any SAL_CALL Os2Transferable::getTransferData( const DataFlavor& rFlavor )
                 return aRet;
         }
     }
-
+    
     // retrieve bitmap
     if( rFlavor.MimeType.equalsIgnoreAsciiCase( OUString::createFromAscii( "application/x-openoffice-bitmap;windows_formatname=\"Bitmap\"" ) ) )
     {
@@ -157,7 +157,7 @@ sal_Bool SAL_CALL Os2Transferable::isDataFlavorSupported( const DataFlavor& aFla
 {
     debug_printf("Os2Transferable::isDataFlavorSupported %08x\n", this);
     debug_printf("Os2Transferable::isDataFlavorSupported %s\n", CHAR_POINTER(aFlavor.MimeType));
-
+    
     if( aFlavor.DataType != getCppuType( (Sequence< sal_Int8 >*)0 ) )
     {
         if( ! aFlavor.MimeType.equalsIgnoreAsciiCase( OUString::createFromAscii( "text/plain;charset=utf-16" ) ) &&
diff --git a/dtrans/source/os2/clipb/Os2Transferable.hxx b/dtrans/source/os2/clipb/Os2Transferable.hxx
index 833aa2680a8a..0bdd6d412cd3 100644
--- a/dtrans/source/os2/clipb/Os2Transferable.hxx
+++ b/dtrans/source/os2/clipb/Os2Transferable.hxx
@@ -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
@@ -49,16 +49,16 @@
 #define debug_printf( ...) { 1; }
 #endif
 
-#define CPPUTYPE_SEQSALINT8       getCppuType( (const Sequence< sal_Int8 >*) 0 )
-#define CPPUTYPE_DEFAULT          CPPUTYPE_SEQSALINT8
+#define CPPUTYPE_SEQSALINT8		  getCppuType( (const Sequence< sal_Int8 >*) 0 )
+#define CPPUTYPE_DEFAULT		  CPPUTYPE_SEQSALINT8
 
 #ifdef OOO_VENDOR
 using namespace com::sun::star::uno;
-HBITMAP OOoBmpToOS2Handle( Any &aAnyB);
-int OS2HandleToOOoBmp( HBITMAP hbm, Sequence< sal_Int8 >* winDIBStream);
+HBITMAP	OOoBmpToOS2Handle( Any &aAnyB);
+int	OS2HandleToOOoBmp( HBITMAP hbm, Sequence< sal_Int8 >* winDIBStream);
 #else
-#define OOoBmpToOS2Handle(a)    0
-#define OS2HandleToOOoBmp(a,b)  0
+#define	OOoBmpToOS2Handle(a)	0
+#define	OS2HandleToOOoBmp(a,b)	0
 #endif
 
 namespace os2 {
@@ -66,12 +66,12 @@ namespace os2 {
     class Os2Transferable : public ::cppu::WeakImplHelper1 <
         ::com::sun::star::datatransfer::XTransferable >
     {
-        HAB         hAB;
-        ::rtl::OUString clipText;
+        HAB			hAB;
+        ::rtl::OUString	clipText;
         ::com::sun::star::datatransfer::DataFlavor aFlavor;
         ::osl::Mutex m_aMutex;
-        ::com::sun::star::uno::Reference< XInterface >          m_xCreator;
-
+        ::com::sun::star::uno::Reference< XInterface >			m_xCreator;
+    
     public:
         Os2Transferable( const ::com::sun::star::uno::Reference< XInterface >& xCreator);
         virtual ~Os2Transferable();
@@ -80,16 +80,16 @@ namespace os2 {
          * XTransferable
          */
 
-        virtual ::com::sun::star::uno::Any SAL_CALL getTransferData( const ::com::sun::star::datatransfer::DataFlavor& aFlavor )
-            throw(::com::sun::star::datatransfer::UnsupportedFlavorException,
-                  ::com::sun::star::io::IOException,
+        virtual ::com::sun::star::uno::Any SAL_CALL getTransferData( const ::com::sun::star::datatransfer::DataFlavor& aFlavor ) 
+            throw(::com::sun::star::datatransfer::UnsupportedFlavorException, 
+                  ::com::sun::star::io::IOException, 
                   ::com::sun::star::uno::RuntimeException
                   );
 
-        virtual ::com::sun::star::uno::Sequence< ::com::sun::star::datatransfer::DataFlavor > SAL_CALL getTransferDataFlavors(  )
+        virtual ::com::sun::star::uno::Sequence< ::com::sun::star::datatransfer::DataFlavor > SAL_CALL getTransferDataFlavors(  ) 
             throw(::com::sun::star::uno::RuntimeException);
 
-        virtual sal_Bool SAL_CALL isDataFlavorSupported( const ::com::sun::star::datatransfer::DataFlavor& aFlavor )
+        virtual sal_Bool SAL_CALL isDataFlavorSupported( const ::com::sun::star::datatransfer::DataFlavor& aFlavor ) 
             throw(::com::sun::star::uno::RuntimeException);
     };
 
diff --git a/dtrans/source/os2/clipb/sysdtrans.xml b/dtrans/source/os2/clipb/sysdtrans.xml
index a6dec8a03a42..cc615619037b 100644
--- a/dtrans/source/os2/clipb/sysdtrans.xml
+++ b/dtrans/source/os2/clipb/sysdtrans.xml
@@ -1,43 +1,43 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE module-description PUBLIC "-//StarOffice//DTD ComponentDescription 1.0//EN" "module-description.dtd">
 <module-description xmlns:xlink="http://www.w3.org/1999/xlink">
-    <module-name>   sysdtrans   </module-name>
+    <module-name>	sysdtrans	</module-name>
     <component-description>
         <author> Tino Rachui </author>
-        <name>  com.sun.star.comp.datatransfer.SystemClipboard </name>
+        <name>	com.sun.star.comp.datatransfer.SystemClipboard </name>
         <description>
     The win32 implementation of the datatransfer service.
 </description>
-        <loader-name>   com.sun.star.loader.SharedLibrary   </loader-name>
-        <language>  c++ </language>
+        <loader-name>	com.sun.star.loader.SharedLibrary	</loader-name>
+        <language>	c++	</language>
         <status value="beta"/>
-        <supported-service> com.sun.star.datatransfer.clipboard.SystemClipboard </supported-service>
-        <service-dependency>    ... </service-dependency>
-        <type>   com.sun.star.datatransfer.clipboard.XClipboardEx   </type>
-        <type>   com.sun.star.datatransfer.XTransferable            </type>
-        <type>   com.sun.star.datatransfer.XTransferableEx          </type>
+        <supported-service>	com.sun.star.datatransfer.clipboard.SystemClipboard </supported-service>
+        <service-dependency>	...	</service-dependency>
+        <type>	 com.sun.star.datatransfer.clipboard.XClipboardEx	</type>
+        <type>   com.sun.star.datatransfer.XTransferable			</type>
+        <type>   com.sun.star.datatransfer.XTransferableEx			</type>
         <type>   com.sun.star.datatransfer.clipboard.XClipboardOwner</type>
         <type>   com.sun.star.datatransfer.clipboard.XClipboardListener</type>
         <type>   com.sun.star.datatransfer.clipboard.XClipboardNotifier</type>
         <type>   com.sun.star.datatransfer.clipboard.XFlushableClipboard</type>
         <type>   com.sun.star.datatransfer.clipboard.RenderingCapabilities</type>
-        <type>   com.sun.star.datatransfer.XTransferDataAccess      </type>
-        <type>   com.sun.star.lang.XComponent                       </type>
-        <type>   com.sun.star.lang.XMultiServiceFactory             </type>
-        <type>   com.sun.star.lang.XSingleServiceFactory            </type>
-        <type>   com.sun.star.lang.XServiceInfo                     </type>
-        <type>   com.sun.star.lang.XTypeProvider                    </type>
-        <type>   com.sun.star.lang.IllegalArgumentException         </type>
-        <type>   com.sun.star.uno.TypeClass                         </type>
-        <type>   com.sun.star.uno.XWeak                             </type>
-        <type>   com.sun.star.uno.XAggregation                      </type>
-        <type>   com.sun.star.registry.XRegistryKey                 </type>
-        <type>   com.sun.star.container.XSet                        </type>
+        <type>   com.sun.star.datatransfer.XTransferDataAccess		</type>
+        <type>	 com.sun.star.lang.XComponent                       </type>
+        <type>	 com.sun.star.lang.XMultiServiceFactory             </type>
+        <type>	 com.sun.star.lang.XSingleServiceFactory			</type>
+        <type>	 com.sun.star.lang.XServiceInfo						</type>
+        <type>	 com.sun.star.lang.XTypeProvider					</type>
+        <type>	 com.sun.star.lang.IllegalArgumentException			</type>
+        <type>	 com.sun.star.uno.TypeClass							</type>
+        <type>	 com.sun.star.uno.XWeak								</type>
+        <type>	 com.sun.star.uno.XAggregation						</type>
+        <type>	 com.sun.star.registry.XRegistryKey					</type>
+        <type>	 com.sun.star.container.XSet						</type>
     </component-description>
-    <project-build-dependency>  cppuhelper  </project-build-dependency>
-    <project-build-dependency>  cppu        </project-build-dependency>
-    <project-build-dependency>  sal         </project-build-dependency>
-    <runtime-module-dependency> cppuhelper  </runtime-module-dependency>
-    <runtime-module-dependency> cppu2       </runtime-module-dependency>
-    <runtime-module-dependency> sal2        </runtime-module-dependency>
+    <project-build-dependency>	cppuhelper	</project-build-dependency>
+    <project-build-dependency>	cppu		</project-build-dependency>
+    <project-build-dependency>	sal			</project-build-dependency>
+    <runtime-module-dependency>	cppuhelper	</runtime-module-dependency>
+    <runtime-module-dependency>	cppu2		</runtime-module-dependency>
+    <runtime-module-dependency>	sal2		</runtime-module-dependency>
 </module-description>
diff --git a/dtrans/source/test/test_dtrans.cxx b/dtrans/source/test/test_dtrans.cxx
index 41d5bfb4f32f..05d525fbe2d1 100644
--- a/dtrans/source/test/test_dtrans.cxx
+++ b/dtrans/source/test/test_dtrans.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
@@ -74,10 +74,10 @@
 #define TRACE( a ) fprintf( stderr, a )
 
 //------------------------------------------------------------------------
-//  namespaces
+//	namespaces
 //------------------------------------------------------------------------
 
-using namespace ::rtl;
+using namespace	::rtl;
 using namespace ::std;
 using namespace ::cppu;
 using namespace ::com::sun::star::container;
@@ -85,16 +85,16 @@ using namespace ::com::sun::star::datatransfer;
 using namespace ::com::sun::star::datatransfer::clipboard;
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::io;
-using namespace ::com::sun::star::lang;
+using namespace	::com::sun::star::lang;
 
 //------------------------------------------------------------------------
-//  globals
+//	globals
 //------------------------------------------------------------------------
 
 const char * app = NULL;
 
 //------------------------------------------------------------------------
-//  ClipboardOwner
+//	ClipboardOwner
 //------------------------------------------------------------------------
 
 class ClipboardOwner : public WeakImplHelper1< XClipboardOwner >
@@ -119,7 +119,7 @@ public:
 };
 
 //------------------------------------------------------------------------
-//  ctor
+//	ctor
 //------------------------------------------------------------------------
 
 ClipboardOwner::ClipboardOwner():
@@ -128,19 +128,19 @@ ClipboardOwner::ClipboardOwner():
 }
 
 //------------------------------------------------------------------------
-//  lostOwnership
+//	lostOwnership
 //------------------------------------------------------------------------
 
-void SAL_CALL ClipboardOwner::lostOwnership( const Reference< XClipboard >& xClipboard, const Reference< XTransferable >& xTrans )
+void SAL_CALL ClipboardOwner::lostOwnership( const Reference< XClipboard >& xClipboard, const Reference< XTransferable >& xTrans ) 
     throw(RuntimeException)
 {
     m_nReceivedLostOwnerships++;
     m_xClipboard = xClipboard;
-    m_xTransferable = xTrans;
+    m_xTransferable = xTrans; 
 }
 
 //------------------------------------------------------------------------
-//  ClipboardListener
+//	ClipboardListener
 //------------------------------------------------------------------------
 
 class ClipboardListener : public WeakImplHelper1< XClipboardListener >
@@ -162,16 +162,16 @@ public:
     //--------------------------------------------------------------------
     // XEventListener
     //--------------------------------------------------------------------
-
+    
     virtual void SAL_CALL disposing( const EventObject& event ) throw(RuntimeException);
-
+    
     sal_uInt32 receivedChangedContentsEvents() { return m_nReceivedChangedContentsEvents; };
     Reference< XClipboard >    changedContentsEventClipboardValue() { return m_xClipboard; }
     Reference< XTransferable > changedContentsEventTransferableValue() { return m_xTransferable; };
 };
 
 //------------------------------------------------------------------------
-//  ctor
+//	ctor
 //------------------------------------------------------------------------
 
 ClipboardListener::ClipboardListener():
@@ -180,7 +180,7 @@ ClipboardListener::ClipboardListener():
 }
 
 //------------------------------------------------------------------------
-//  changedContents
+//	changedContents
 //------------------------------------------------------------------------
 
 void SAL_CALL ClipboardListener::changedContents( const ClipboardEvent& event )
@@ -188,11 +188,11 @@ void SAL_CALL ClipboardListener::changedContents( const ClipboardEvent& event )
 {
     m_nReceivedChangedContentsEvents++;
     m_xClipboard = Reference< XClipboard > (event.Source, UNO_QUERY);
-    m_xTransferable = event.Contents;
+    m_xTransferable = event.Contents; 
 }
 
 //------------------------------------------------------------------------
-//  disposing
+//	disposing
 //------------------------------------------------------------------------
 
 void SAL_CALL ClipboardListener::disposing( const EventObject& event )
@@ -201,14 +201,14 @@ void SAL_CALL ClipboardListener::disposing( const EventObject& event )
 }
 
 //------------------------------------------------------------------------
-//  StringTransferable
+//	StringTransferable
 //------------------------------------------------------------------------
 
 class StringTransferable : public WeakImplHelper2< XClipboardOwner, XTransferable >
 {
-public:
+public:	
     StringTransferable( );
-
+        
     //--------------------------------------------------------------------
     // XTransferable
     //--------------------------------------------------------------------
@@ -216,7 +216,7 @@ public:
     virtual Any SAL_CALL getTransferData( const DataFlavor& aFlavor ) throw(UnsupportedFlavorException, IOException, RuntimeException);
     virtual Sequence< DataFlavor > SAL_CALL getTransferDataFlavors(  ) throw(RuntimeException);
     virtual sal_Bool SAL_CALL isDataFlavorSupported( const DataFlavor& aFlavor ) throw(RuntimeException);
-
+    
     //--------------------------------------------------------------------
     // XClipboardOwner
     //--------------------------------------------------------------------
@@ -225,7 +225,7 @@ public:
 
     sal_Bool receivedLostOwnership() { return m_receivedLostOwnership; };
     void clearReceivedLostOwnership() { m_receivedLostOwnership = sal_False; };
-
+    
 private:
     Sequence< DataFlavor > m_seqDFlv;
     OUString               m_Data;
@@ -233,7 +233,7 @@ private:
 };
 
 //------------------------------------------------------------------------
-//  ctor
+//	ctor
 //------------------------------------------------------------------------
 
 StringTransferable::StringTransferable( ) :
@@ -242,28 +242,28 @@ StringTransferable::StringTransferable( ) :
     m_Data( OUString::createFromAscii("clipboard test content") )
 {
     DataFlavor df;
-
+    
     /*
     df.MimeType = L"text/plain; charset=unicode";
     df.DataType = getCppuType( ( OUString* )0 );
 
     m_seqDFlv[0] = df;
     */
-
+    
     //df.MimeType = L"text/plain; charset=windows1252";
     df.MimeType = OUString::createFromAscii( "text/html" );
     df.DataType = getCppuType( ( Sequence< sal_Int8 >* )0 );
 
-    m_seqDFlv[0] = df;
+    m_seqDFlv[0] = df;	
 }
 
 //------------------------------------------------------------------------
-//  getTransferData
+//	getTransferData
 //------------------------------------------------------------------------
 
-Any SAL_CALL StringTransferable::getTransferData( const DataFlavor& aFlavor )
+Any SAL_CALL StringTransferable::getTransferData( const DataFlavor& aFlavor ) 
     throw(UnsupportedFlavorException, IOException, RuntimeException)
-{
+{	
     Any anyData;
 
     /*if ( aFlavor == m_seqDFlv[0] )
@@ -288,49 +288,49 @@ Any SAL_CALL StringTransferable::getTransferData( const DataFlavor& aFlavor )
 }
 
 //------------------------------------------------------------------------
-//  getTransferDataFlavors
+//	getTransferDataFlavors
 //------------------------------------------------------------------------
 
-Sequence< DataFlavor > SAL_CALL StringTransferable::getTransferDataFlavors(  )
+Sequence< DataFlavor > SAL_CALL StringTransferable::getTransferDataFlavors(  ) 
     throw(RuntimeException)
 {
     return m_seqDFlv;
 }
 
 //------------------------------------------------------------------------
-//  isDataFlavorSupported
+//	isDataFlavorSupported
 //------------------------------------------------------------------------
 
-sal_Bool SAL_CALL StringTransferable::isDataFlavorSupported( const DataFlavor& aFlavor )
+sal_Bool SAL_CALL StringTransferable::isDataFlavorSupported( const DataFlavor& aFlavor ) 
     throw(RuntimeException)
 {
     sal_Int32 nLength = m_seqDFlv.getLength( );
     sal_Bool bRet     = sal_False;
 
-//  for ( sal_Int32 i = 0; i < nLength; ++i )
-//  {
-//      if ( m_seqDFlv[i] == aFlavor )
-//      {
-//          bRet = sal_True;
-//          break;
-//      }
-//  }
+//	for ( sal_Int32 i = 0; i < nLength; ++i )
+//	{
+//		if ( m_seqDFlv[i] == aFlavor )
+//		{
+//			bRet = sal_True;
+//			break;
+//		}
+//	}
 
     return bRet;
 }
 
 //------------------------------------------------------------------------
-//  lostOwnership
+//	lostOwnership
 //------------------------------------------------------------------------
 
-void SAL_CALL StringTransferable::lostOwnership( const Reference< XClipboard >& xClipboard, const Reference< XTransferable >& xTrans )
+void SAL_CALL StringTransferable::lostOwnership( const Reference< XClipboard >& xClipboard, const Reference< XTransferable >& xTrans ) 
     throw(RuntimeException)
 {
     m_receivedLostOwnership = sal_True;
 }
 
 //------------------------------------------------------------------------
-//  main
+//	main
 //------------------------------------------------------------------------
 
 int SAL_CALL main( int argc, const char* argv[] )
@@ -364,8 +364,8 @@ int SAL_CALL main( int argc, const char* argv[] )
     // create service manager
     //------------------------------------------------------------------
     Reference< XMultiServiceFactory > xServiceManager;
-
-    try
+    
+    try 
     {
         xServiceManager = createRegistryServiceFactory( aRegistry, sal_True );
         ENSURE( xServiceManager.is(), "*** ERROR *** service manager could not be created." );
@@ -376,8 +376,8 @@ int SAL_CALL main( int argc, const char* argv[] )
 
         Sequence< Any > arguments(1);
         arguments[0] = makeAny( OUString::createFromAscii( "generic" ) );
-
-        Reference< XClipboard > xClipboard( xServiceManager->createInstanceWithArguments(
+        
+        Reference< XClipboard > xClipboard( xServiceManager->createInstanceWithArguments( 
             OUString::createFromAscii( "com.sun.star.datatransfer.clipboard.GenericClipboard" ),
             arguments ), UNO_QUERY );
 
@@ -399,7 +399,7 @@ int SAL_CALL main( int argc, const char* argv[] )
         Reference< XTransferable > xContents = new StringTransferable();
         Reference< XClipboardOwner > xOwner  = new ClipboardOwner();
         ClipboardOwner *pOwner = (ClipboardOwner *) xOwner.get();
-
+        
         TEST( "initial contents (none): ", xClipboard->getContents().is() == sal_False );
 
         PERFORM( "update on contents with clipboard owner: ", xClipboard->setContents( xContents, xOwner ) );
@@ -412,7 +412,7 @@ int SAL_CALL main( int argc, const char* argv[] )
             TEST( "if received changedContents notification for correct clipboard: ", pListener->changedContentsEventClipboardValue() == xClipboard );
             TEST( "if received changedContents notification for correct clipboard: ", pListener->changedContentsEventTransferableValue() == xContents );
         }
-
+        
         PERFORM( "update on contents without data (clear): ", xClipboard->setContents( Reference< XTransferable >(), Reference< XClipboardOwner >() ) );
         TEST( "if received lostOwnership message(s): ", pOwner->receivedLostOwnerships() > 0 );
         TEST( "if received exactly 1 lostOwnership message: ", pOwner->receivedLostOwnerships() == 1 );
@@ -430,7 +430,7 @@ int SAL_CALL main( int argc, const char* argv[] )
 
         PERFORM( "update on contents without clipboard owner: ", xClipboard->setContents( xContents, Reference< XClipboardOwner >() ) );
         TEST( "that no further lostOwnership messages were received: ", pOwner->receivedLostOwnerships() == 1 );
-        TEST( "current clipboard contents: ", xContents == xClipboard->getContents() );
+        TEST( "current clipboard contents: ", xContents == xClipboard->getContents() );		
 
         if( xClipboardNotifier.is() )
         {
@@ -456,8 +456,8 @@ int SAL_CALL main( int argc, const char* argv[] )
         //--------------------------------------------------------------
         // create an instance of ClipboardManager service
         //--------------------------------------------------------------
-
-        Reference< XClipboardManager > xClipboardManager( xServiceManager->createInstance(
+        
+        Reference< XClipboardManager > xClipboardManager( xServiceManager->createInstance( 
             OUString::createFromAscii( "com.sun.star.datatransfer.clipboard.ClipboardManager" ) ), UNO_QUERY );
 
         ENSURE( xClipboardManager.is(), "*** ERROR *** clipboard manager service could not be created." );
@@ -500,13 +500,13 @@ int SAL_CALL main( int argc, const char* argv[] )
     Reference< XComponent > xComponent( xServiceManager, UNO_QUERY );
 
     ENSURE( xComponent.is(), "*** ERROR *** service manager does not support XComponent." );
-
+    
     // Dispose and clear factory
     xComponent->dispose();
     xServiceManager.clear();
 
     fprintf( stderr, "Done.\n" );
-    return 0;
+    return 0;	
 }
 
 
diff --git a/dtrans/source/win32/clipb/APNDataObject.hxx b/dtrans/source/win32/clipb/APNDataObject.hxx
index 5a5bf1fa3547..442398f340ca 100644
--- a/dtrans/source/win32/clipb/APNDataObject.hxx
+++ b/dtrans/source/win32/clipb/APNDataObject.hxx
@@ -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
@@ -36,13 +36,13 @@
 /*
     an APartment Neutral dataobject wrapper; this wrapper of a IDataObject
     pointer can be used from any apartment without RPC_E_WRONG_THREAD
-    which normally occurs if an apartment tries to use an interface
+    which normally occurs if an apartment tries to use an interface 
     pointer of another apartment; we use containment to hold the original
     DataObject
 */
 class CAPNDataObject : public IDataObject
 {
-public:
+public:	
     CAPNDataObject( IDataObjectPtr rIDataObject );
     ~CAPNDataObject( );
 
@@ -75,8 +75,8 @@ private:
 
 private:
     IDataObjectPtr  m_rIDataObjectOrg;
-    HGLOBAL         m_hGlobal;
-    LONG            m_nRefCnt;
+    HGLOBAL			m_hGlobal;
+    LONG			m_nRefCnt;
 
 // prevent copy and assignment
 private:
diff --git a/dtrans/source/win32/clipb/WinClipbImpl.cxx b/dtrans/source/win32/clipb/WinClipbImpl.cxx
index 30b35a48d391..679836be0040 100644
--- a/dtrans/source/win32/clipb/WinClipbImpl.cxx
+++ b/dtrans/source/win32/clipb/WinClipbImpl.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
@@ -74,11 +74,11 @@ CWinClipbImpl* CWinClipbImpl::s_pCWinClipbImpl = NULL;
 osl::Mutex     CWinClipbImpl::s_aMutex;
 
 //------------------------------------------------------------------------
-//
+// 
 //------------------------------------------------------------------------
 
 CWinClipbImpl::CWinClipbImpl( const OUString& aClipboardName, CWinClipboard* theWinClipboard ) :
-    m_itsName( aClipboardName ),
+    m_itsName( aClipboardName ),	
     m_pWinClipboard( theWinClipboard ),
     m_pCurrentClipContent( NULL )
 {
@@ -91,7 +91,7 @@ CWinClipbImpl::CWinClipbImpl( const OUString& aClipboardName, CWinClipboard* the
 }
 
 //------------------------------------------------------------------------
-//
+// 
 //------------------------------------------------------------------------
 
 CWinClipbImpl::~CWinClipbImpl( )
@@ -114,7 +114,7 @@ Reference< XTransferable > SAL_CALL CWinClipbImpl::getContents( ) throw( Runtime
     ClearableMutexGuard aGuard( m_ClipContentMutex );
 
     if ( NULL != m_pCurrentClipContent )
-    {
+    {		
         return m_pCurrentClipContent->m_XTransferable;
     }
 
@@ -127,19 +127,19 @@ Reference< XTransferable > SAL_CALL CWinClipbImpl::getContents( ) throw( Runtime
     // get the current dataobject from clipboard
     IDataObjectPtr pIDataObject;
     HRESULT hr = m_MtaOleClipboard.getClipboard( &pIDataObject );
-
+        
     if ( SUCCEEDED( hr ) )
     {
-        // create an apartment neutral dataobject and initialize it with a
+        // create an apartment neutral dataobject and initialize it with a 
         // com smart pointer to the IDataObject from clipboard
         IDataObjectPtr pIDo( new CAPNDataObject( pIDataObject ) );
-
+        
         CDTransObjFactory objFactory;
 
-        // remeber pIDo destroys itself due to the smart pointer
+        // remeber pIDo destroys itself due to the smart pointer		
         rClipContent = objFactory.createTransferableFromDataObj( m_pWinClipboard->m_SrvMgr, pIDo );
     }
-
+    
     return rClipContent;
 }
 
@@ -147,34 +147,34 @@ Reference< XTransferable > SAL_CALL CWinClipbImpl::getContents( ) throw( Runtime
 // setContent
 //------------------------------------------------------------------------
 
-void SAL_CALL CWinClipbImpl::setContents(
+void SAL_CALL CWinClipbImpl::setContents( 
     const Reference< XTransferable >& xTransferable,
-    const Reference< XClipboardOwner >& xClipboardOwner )
+    const Reference< XClipboardOwner >& xClipboardOwner ) 
     throw( RuntimeException )
-{
+{	
     CDTransObjFactory objFactory;
     IDataObjectPtr    pIDataObj;
-
+    
     if ( xTransferable.is( ) )
     {
         ClearableMutexGuard aGuard( m_ClipContentMutex );
 
-        m_pCurrentClipContent = new CXNotifyingDataObject(
+        m_pCurrentClipContent = new CXNotifyingDataObject( 
             objFactory.createDataObjFromTransferable( m_pWinClipboard->m_SrvMgr , xTransferable ),
             xTransferable,
             xClipboardOwner,
             this );
-
+        
         aGuard.clear( );
 
-        pIDataObj = IDataObjectPtr( m_pCurrentClipContent );
+        pIDataObj = IDataObjectPtr( m_pCurrentClipContent );		
     }
-
-    m_MtaOleClipboard.setClipboard(pIDataObj.get());
+    
+    m_MtaOleClipboard.setClipboard(pIDataObj.get());	
 }
 
 //------------------------------------------------------------------------
-//
+// 
 //------------------------------------------------------------------------
 
 OUString SAL_CALL CWinClipbImpl::getName(  ) throw( RuntimeException )
@@ -183,7 +183,7 @@ OUString SAL_CALL CWinClipbImpl::getName(  ) throw( RuntimeException )
 }
 
 //------------------------------------------------------------------------
-//
+// 
 //------------------------------------------------------------------------
 
 sal_Int8 SAL_CALL CWinClipbImpl::getRenderingCapabilities(  ) throw( RuntimeException )
@@ -192,11 +192,11 @@ sal_Int8 SAL_CALL CWinClipbImpl::getRenderingCapabilities(  ) throw( RuntimeExce
 }
 
 //------------------------------------------------------------------------
-//
+// 
 //------------------------------------------------------------------------
 
 void SAL_CALL CWinClipbImpl::flushClipboard( ) throw( RuntimeException )
-{
+{	
     // sollte eigentlich hier stehen: ClearableMutexGuard aGuard( m_ClipContentMutex );
     // geht aber nicht, da FlushClipboard zur�ckruft und das DataObject
     // freigibt und damit w�rde es einen Deadlock in onReleaseDataObject geben
@@ -210,10 +210,10 @@ void SAL_CALL CWinClipbImpl::flushClipboard( ) throw( RuntimeException )
 
     if ( NULL != m_pCurrentClipContent )
         m_MtaOleClipboard.flushClipboard( );
-}
+}	
 
 //------------------------------------------------------------------------
-//
+// 
 //------------------------------------------------------------------------
 
 void SAL_CALL CWinClipbImpl::registerClipboardViewer( )
@@ -222,7 +222,7 @@ void SAL_CALL CWinClipbImpl::registerClipboardViewer( )
 }
 
 //------------------------------------------------------------------------
-//
+// 
 //------------------------------------------------------------------------
 
 void SAL_CALL CWinClipbImpl::unregisterClipboardViewer( )
@@ -231,7 +231,7 @@ void SAL_CALL CWinClipbImpl::unregisterClipboardViewer( )
 }
 
 //------------------------------------------------------------------------
-//
+// 
 //------------------------------------------------------------------------
 
 void SAL_CALL CWinClipbImpl::dispose() throw( RuntimeException )
@@ -240,10 +240,10 @@ void SAL_CALL CWinClipbImpl::dispose() throw( RuntimeException )
 }
 
 //------------------------------------------------------------------------
-//
+// 
 //------------------------------------------------------------------------
 
-void WINAPI CWinClipbImpl::onClipboardContentChanged( void )
+void WINAPI CWinClipbImpl::onClipboardContentChanged( void ) 
 {
     MutexGuard aGuard( s_aMutex );
 
diff --git a/dtrans/source/win32/clipb/WinClipbImpl.hxx b/dtrans/source/win32/clipb/WinClipbImpl.hxx
index c7b0a55a064a..bb49506bd2c4 100644
--- a/dtrans/source/win32/clipb/WinClipbImpl.hxx
+++ b/dtrans/source/win32/clipb/WinClipbImpl.hxx
@@ -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
@@ -52,7 +52,7 @@ class CWinClipboard;
 class CXNotifyingDataObject;
 
 //---------------------------------------------------
-// impl class to avoid deadlocks between XTDataObject
+// impl class to avoid deadlocks between XTDataObject 
 // and the clipboard implementation
 //---------------------------------------------------
 
@@ -62,28 +62,28 @@ public:
     ~CWinClipbImpl( );
 
 protected:
-    CWinClipbImpl( const ::rtl::OUString& aClipboardName, CWinClipboard* theWinClipboard );
+    CWinClipbImpl( const ::rtl::OUString& aClipboardName, CWinClipboard* theWinClipboard );	
 
-    ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::XTransferable > SAL_CALL getContents(  )
+    ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::XTransferable > SAL_CALL getContents(  ) 
         throw( ::com::sun::star::uno::RuntimeException );
-
-    void SAL_CALL setContents(
-        const ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::XTransferable >& xTransferable,
-        const ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::clipboard::XClipboardOwner >& xClipboardOwner )
+    
+    void SAL_CALL setContents( 
+        const ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::XTransferable >& xTransferable, 
+        const ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::clipboard::XClipboardOwner >& xClipboardOwner ) 
         throw( ::com::sun::star::uno::RuntimeException );
 
     ::rtl::OUString SAL_CALL getName(  ) throw( ::com::sun::star::uno::RuntimeException );
 
     //------------------------------------------------
-    // XClipboardEx
+    // XClipboardEx 
     //------------------------------------------------
-
+    
     sal_Int8 SAL_CALL getRenderingCapabilities(  ) throw( ::com::sun::star::uno::RuntimeException );
 
     //------------------------------------------------
     // XFlushableClipboard
     //------------------------------------------------
-
+    
     void SAL_CALL flushClipboard( ) throw( com::sun::star::uno::RuntimeException );
 
     //------------------------------------------------
@@ -93,9 +93,9 @@ protected:
     void SAL_CALL dispose( ) throw( ::com::sun::star::uno::RuntimeException );
 
     //------------------------------------------------
-    // member functions
+    // member functions 
     //------------------------------------------------
-
+    
     void SAL_CALL registerClipboardViewer( );
     void SAL_CALL unregisterClipboardViewer( );
 
@@ -105,20 +105,20 @@ private:
     void SAL_CALL onReleaseDataObject( CXNotifyingDataObject* theCaller );
 
 private:
-    ::rtl::OUString         m_itsName;
-    CMtaOleClipboard        m_MtaOleClipboard;
-    CWinClipboard*          m_pWinClipboard;
-    CXNotifyingDataObject*  m_pCurrentClipContent;
+    ::rtl::OUString			m_itsName;
+    CMtaOleClipboard		m_MtaOleClipboard;	
+    CWinClipboard*			m_pWinClipboard;
+    CXNotifyingDataObject*	m_pCurrentClipContent;
     osl::Mutex              m_ClipContentMutex;
 
-    static osl::Mutex       s_aMutex;
-    static CWinClipbImpl*   s_pCWinClipbImpl;
+    static osl::Mutex		s_aMutex;
+    static CWinClipbImpl*	s_pCWinClipbImpl;
 
 private:
     CWinClipbImpl( const CWinClipbImpl& );
     CWinClipbImpl& operator=( const CWinClipbImpl& );
 
-    friend class CWinClipboard;
+    friend class CWinClipboard;	
     friend class CXNotifyingDataObject;
 };
 
diff --git a/dtrans/source/win32/clipb/WinClipboard.cxx b/dtrans/source/win32/clipb/WinClipboard.cxx
index 0454460887e7..f737022dbfbf 100644
--- a/dtrans/source/win32/clipb/WinClipboard.cxx
+++ b/dtrans/source/win32/clipb/WinClipboard.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
@@ -76,8 +76,8 @@ namespace
 // ctor
 //------------------------------------------------------------------------
 /*XEventListener,*/
-CWinClipboard::CWinClipboard( const Reference< XMultiServiceFactory >& rServiceManager, const OUString& aClipboardName ) :
-    WeakComponentImplHelper4< XClipboardEx, XFlushableClipboard, XClipboardNotifier, XServiceInfo >( m_aCbListenerMutex ),
+CWinClipboard::CWinClipboard( const Reference< XMultiServiceFactory >& rServiceManager, const OUString& aClipboardName ) : 
+    WeakComponentImplHelper4< XClipboardEx, XFlushableClipboard, XClipboardNotifier, XServiceInfo >( m_aCbListenerMutex ),	
     m_SrvMgr( rServiceManager )
 {
     m_pImpl.reset( new CWinClipbImpl( aClipboardName, this ) );
@@ -90,7 +90,7 @@ CWinClipboard::CWinClipboard( const Reference< XMultiServiceFactory >& rServiceM
 //------------------------------------------------------------------------
 // getContent
 // to avoid unecessary traffic we check first if there is a clipboard
-// content which was set via setContent, in this case we don't need
+// content which was set via setContent, in this case we don't need 
 // to query the content from the clipboard, create a new wrapper object
 // and so on, we simply return the orignial XTransferable instead of our
 // DOTransferable
@@ -99,7 +99,7 @@ CWinClipboard::CWinClipboard( const Reference< XMultiServiceFactory >& rServiceM
 Reference< XTransferable > SAL_CALL CWinClipboard::getContents( ) throw( RuntimeException )
 {
     MutexGuard aGuard( m_aMutex );
-
+    
     if ( rBHelper.bDisposed )
         throw DisposedException( OUString::createFromAscii( "object is already disposed" ),
                                  static_cast< XClipboardEx* >( this ) );
@@ -115,7 +115,7 @@ Reference< XTransferable > SAL_CALL CWinClipboard::getContents( ) throw( Runtime
 //------------------------------------------------------------------------
 
 void SAL_CALL CWinClipboard::setContents( const Reference< XTransferable >& xTransferable,
-                                          const Reference< XClipboardOwner >& xClipboardOwner )
+                                          const Reference< XClipboardOwner >& xClipboardOwner ) 
                                           throw( RuntimeException )
 {
     MutexGuard aGuard( m_aMutex );
@@ -165,26 +165,26 @@ void SAL_CALL CWinClipboard::flushClipboard( ) throw( RuntimeException )
 //========================================================================
 
 sal_Int8 SAL_CALL CWinClipboard::getRenderingCapabilities(  ) throw( RuntimeException )
-{
+{	
     if ( rBHelper.bDisposed )
         throw DisposedException( OUString::createFromAscii( "object is already disposed" ),
                                  static_cast< XClipboardEx* >( this ) );
 
     if ( NULL != m_pImpl.get( ) )
-        return m_pImpl->getRenderingCapabilities( );
+        return m_pImpl->getRenderingCapabilities( );	
 
     return 0;
 }
 
 //========================================================================
-// XClipboardNotifier
+// XClipboardNotifier 
 //========================================================================
 
 //------------------------------------------------------------------------
 // getName
 //------------------------------------------------------------------------
 
-void SAL_CALL CWinClipboard::addClipboardListener( const Reference< XClipboardListener >& listener )
+void SAL_CALL CWinClipboard::addClipboardListener( const Reference< XClipboardListener >& listener ) 
     throw( RuntimeException )
 {
     if ( rBHelper.bDisposed )
@@ -193,18 +193,18 @@ void SAL_CALL CWinClipboard::addClipboardListener( const Reference< XClipboardLi
 
     // check input parameter
     if ( !listener.is( ) )
-        throw IllegalArgumentException( OUString::createFromAscii( "empty reference" ),
-                                        static_cast< XClipboardEx* >( this ),
+        throw IllegalArgumentException( OUString::createFromAscii( "empty reference" ), 
+                                        static_cast< XClipboardEx* >( this ), 
                                         1 );
 
-    rBHelper.aLC.addInterface( getCppuType( &listener ), listener );
+    rBHelper.aLC.addInterface( getCppuType( &listener ), listener );			
 }
 
 //------------------------------------------------------------------------
 // getName
 //------------------------------------------------------------------------
 
-void SAL_CALL CWinClipboard::removeClipboardListener( const Reference< XClipboardListener >& listener )
+void SAL_CALL CWinClipboard::removeClipboardListener( const Reference< XClipboardListener >& listener ) 
     throw( RuntimeException )
 {
     if ( rBHelper.bDisposed )
@@ -217,7 +217,7 @@ void SAL_CALL CWinClipboard::removeClipboardListener( const Reference< XClipboar
                                         static_cast< XClipboardEx* >( this ),
                                         1 );
 
-    rBHelper.aLC.removeInterface( getCppuType( &listener ), listener );
+    rBHelper.aLC.removeInterface( getCppuType( &listener ), listener );	
 }
 
 //------------------------------------------------------------------------
@@ -233,17 +233,17 @@ void SAL_CALL CWinClipboard::notifyAllClipboardListener( )
         {
             aGuard.clear( );
 
-            OInterfaceContainerHelper* pICHelper = rBHelper.aLC.getContainer(
+            OInterfaceContainerHelper* pICHelper = rBHelper.aLC.getContainer( 
                 getCppuType( ( Reference< XClipboardListener > * ) 0 ) );
 
             if ( pICHelper )
-            {
+            {			    
                 try
                 {
                     OInterfaceIteratorHelper iter(*pICHelper);
                     Reference<XTransferable> rXTransf(m_pImpl->getContents());
                     ClipboardEvent aClipbEvent(static_cast<XClipboard*>(this), rXTransf);
-
+                                
                     while(iter.hasMoreElements())
                     {
                         try
@@ -255,24 +255,24 @@ void SAL_CALL CWinClipboard::notifyAllClipboardListener( )
                         catch(RuntimeException&)
                         {
                             OSL_ENSURE( false, "RuntimeException caught" );
-                        }
-                    }
+                        }					
+                    } 
                 }
                 catch(const ::com::sun::star::lang::DisposedException&)
-                {
+                {			        
                     OSL_ENSURE(false, "Service Manager disposed");
-
+                    
                     // no further clipboard changed notifications
                     m_pImpl->unregisterClipboardViewer();
                 }
-
+                
             } // end if
         } // end if
     } // end if
 }
 
 //------------------------------------------------
-// overwritten base class method which will be
+// overwritten base class method which will be 
 // called by the base class dispose method
 //------------------------------------------------
 
@@ -289,17 +289,17 @@ void SAL_CALL CWinClipboard::disposing()
 // XServiceInfo
 // -------------------------------------------------
 
-OUString SAL_CALL CWinClipboard::getImplementationName(  )
+OUString SAL_CALL CWinClipboard::getImplementationName(  ) 
     throw(RuntimeException)
 {
     return OUString::createFromAscii( WINCLIPBOARD_IMPL_NAME );
 }
 
 // -------------------------------------------------
-//  XServiceInfo
+//	XServiceInfo
 // -------------------------------------------------
 
-sal_Bool SAL_CALL CWinClipboard::supportsService( const OUString& ServiceName )
+sal_Bool SAL_CALL CWinClipboard::supportsService( const OUString& ServiceName ) 
     throw(RuntimeException)
 {
     Sequence < OUString > SupportedServicesNames = WinClipboard_getSupportedServiceNames();
@@ -312,10 +312,10 @@ sal_Bool SAL_CALL CWinClipboard::supportsService( const OUString& ServiceName )
 }
 
 // -------------------------------------------------
-//  XServiceInfo
+//	XServiceInfo
 // -------------------------------------------------
 
-Sequence< OUString > SAL_CALL CWinClipboard::getSupportedServiceNames(   )
+Sequence< OUString > SAL_CALL CWinClipboard::getSupportedServiceNames(	 ) 
     throw(RuntimeException)
 {
     return WinClipboard_getSupportedServiceNames();
diff --git a/dtrans/source/win32/clipb/WinClipboard.hxx b/dtrans/source/win32/clipb/WinClipboard.hxx
index a8b48a246eb2..adb284da63a4 100644
--- a/dtrans/source/win32/clipb/WinClipboard.hxx
+++ b/dtrans/source/win32/clipb/WinClipboard.hxx
@@ -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
@@ -52,11 +52,11 @@
 class CWinClipbImpl;
 
 //------------------------------------------------------------------------
-// implements the XClipboard[Ex] ... interfaces
+// implements the XClipboard[Ex] ... interfaces 
 // for the clipboard viewer mechanism we need a static callback function
-// and a static member to reasocciate from this static function to the
-// class instance
-// watch out: we are using only one static member variable and not a list
+// and a static member to reasocciate from this static function to the 
+// class instance 
+// watch out: we are using only one static member variable and not a list 
 // because we assume to be instanciated only once
 // this will be asured by an OneInstanceFactory of the service and not
 // by this class!
@@ -66,65 +66,65 @@ class CWinClipbImpl;
 // before the constructor of WeakComponentImplHelper
 // will be called and initialized with this mutex
 class CWinClipboardDummy
-{
+{ 
 protected:
-    osl::Mutex      m_aMutex;
-    osl::Mutex      m_aCbListenerMutex;
+    osl::Mutex		m_aMutex;	
+    osl::Mutex		m_aCbListenerMutex;
 };
 
-class CWinClipboard :
+class CWinClipboard : 
     public CWinClipboardDummy,
-    public cppu::WeakComponentImplHelper4<
+    public cppu::WeakComponentImplHelper4< 
         ::com::sun::star::datatransfer::clipboard::XClipboardEx, \
         ::com::sun::star::datatransfer::clipboard::XFlushableClipboard,
-        ::com::sun::star::datatransfer::clipboard::XClipboardNotifier,
+        ::com::sun::star::datatransfer::clipboard::XClipboardNotifier,		
         ::com::sun::star::lang::XServiceInfo >
 {
 public:
-    CWinClipboard( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& rServiceManager,
+    CWinClipboard( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& rServiceManager, 
                    const ::rtl::OUString& aClipboardName );
-
+    
     //------------------------------------------------
     // XClipboard
     //------------------------------------------------
 
-    virtual ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::XTransferable > SAL_CALL getContents(  )
+    virtual ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::XTransferable > SAL_CALL getContents(  ) 
         throw( ::com::sun::star::uno::RuntimeException );
-
-    virtual void SAL_CALL setContents(
-        const ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::XTransferable >& xTransferable,
-        const ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::clipboard::XClipboardOwner >& xClipboardOwner )
+    
+    virtual void SAL_CALL setContents( 
+        const ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::XTransferable >& xTransferable, 
+        const ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::clipboard::XClipboardOwner >& xClipboardOwner ) 
         throw( ::com::sun::star::uno::RuntimeException );
 
-    virtual ::rtl::OUString SAL_CALL getName(  )
+    virtual ::rtl::OUString SAL_CALL getName(  ) 
         throw( ::com::sun::star::uno::RuntimeException );
 
     //------------------------------------------------
     // XFlushableClipboard
     //------------------------------------------------
-
+    
     virtual void SAL_CALL flushClipboard( ) throw( com::sun::star::uno::RuntimeException );
 
     //------------------------------------------------
-    // XClipboardEx
+    // XClipboardEx 
     //------------------------------------------------
-
+    
     virtual sal_Int8 SAL_CALL getRenderingCapabilities(  ) throw( ::com::sun::star::uno::RuntimeException );
 
     //------------------------------------------------
-    // XClipboardNotifier
+    // XClipboardNotifier 
     //------------------------------------------------
 
-    virtual void SAL_CALL addClipboardListener(
-        const ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::clipboard::XClipboardListener >& listener )
+    virtual void SAL_CALL addClipboardListener( 
+        const ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::clipboard::XClipboardListener >& listener ) 
         throw( ::com::sun::star::uno::RuntimeException );
 
-    virtual void SAL_CALL removeClipboardListener(
-        const ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::clipboard::XClipboardListener >& listener )
+    virtual void SAL_CALL removeClipboardListener( 
+        const ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::clipboard::XClipboardListener >& listener ) 
         throw( ::com::sun::star::uno::RuntimeException );
 
     //------------------------------------------------
-    // overwrite base class method, which is called
+    // overwrite base class method, which is called 
     // by base class dispose function
     //------------------------------------------------
 
@@ -132,22 +132,22 @@ public:
 
     //------------------------------------------------
     // XServiceInfo
-    //------------------------------------------------
+    //------------------------------------------------ 
 
-    virtual ::rtl::OUString SAL_CALL getImplementationName(  )
+    virtual ::rtl::OUString SAL_CALL getImplementationName(	 )
         throw(::com::sun::star::uno::RuntimeException);
 
-    virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName )
+    virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) 
         throw(::com::sun::star::uno::RuntimeException);
 
-    virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames(  )
+    virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames(  ) 
         throw(::com::sun::star::uno::RuntimeException);
 
 private:
-    void SAL_CALL notifyAllClipboardListener( );
+    void SAL_CALL notifyAllClipboardListener( );	
 
-private:
-    ::std::auto_ptr< CWinClipbImpl >                                                  m_pImpl;
+private:		
+    ::std::auto_ptr< CWinClipbImpl >												  m_pImpl;	
     ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >  m_SrvMgr;
 
     friend class CWinClipbImpl;
diff --git a/dtrans/source/win32/clipb/sysdtrans.xml b/dtrans/source/win32/clipb/sysdtrans.xml
index a6dec8a03a42..cc615619037b 100644
--- a/dtrans/source/win32/clipb/sysdtrans.xml
+++ b/dtrans/source/win32/clipb/sysdtrans.xml
@@ -1,43 +1,43 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE module-description PUBLIC "-//StarOffice//DTD ComponentDescription 1.0//EN" "module-description.dtd">
 <module-description xmlns:xlink="http://www.w3.org/1999/xlink">
-    <module-name>   sysdtrans   </module-name>
+    <module-name>	sysdtrans	</module-name>
     <component-description>
         <author> Tino Rachui </author>
-        <name>  com.sun.star.comp.datatransfer.SystemClipboard </name>
+        <name>	com.sun.star.comp.datatransfer.SystemClipboard </name>
         <description>
     The win32 implementation of the datatransfer service.
 </description>
-        <loader-name>   com.sun.star.loader.SharedLibrary   </loader-name>
-        <language>  c++ </language>
+        <loader-name>	com.sun.star.loader.SharedLibrary	</loader-name>
+        <language>	c++	</language>
         <status value="beta"/>
-        <supported-service> com.sun.star.datatransfer.clipboard.SystemClipboard </supported-service>
-        <service-dependency>    ... </service-dependency>
-        <type>   com.sun.star.datatransfer.clipboard.XClipboardEx   </type>
-        <type>   com.sun.star.datatransfer.XTransferable            </type>
-        <type>   com.sun.star.datatransfer.XTransferableEx          </type>
+        <supported-service>	com.sun.star.datatransfer.clipboard.SystemClipboard </supported-service>
+        <service-dependency>	...	</service-dependency>
+        <type>	 com.sun.star.datatransfer.clipboard.XClipboardEx	</type>
+        <type>   com.sun.star.datatransfer.XTransferable			</type>
+        <type>   com.sun.star.datatransfer.XTransferableEx			</type>
         <type>   com.sun.star.datatransfer.clipboard.XClipboardOwner</type>
         <type>   com.sun.star.datatransfer.clipboard.XClipboardListener</type>
         <type>   com.sun.star.datatransfer.clipboard.XClipboardNotifier</type>
         <type>   com.sun.star.datatransfer.clipboard.XFlushableClipboard</type>
         <type>   com.sun.star.datatransfer.clipboard.RenderingCapabilities</type>
-        <type>   com.sun.star.datatransfer.XTransferDataAccess      </type>
-        <type>   com.sun.star.lang.XComponent                       </type>
-        <type>   com.sun.star.lang.XMultiServiceFactory             </type>
-        <type>   com.sun.star.lang.XSingleServiceFactory            </type>
-        <type>   com.sun.star.lang.XServiceInfo                     </type>
-        <type>   com.sun.star.lang.XTypeProvider                    </type>
-        <type>   com.sun.star.lang.IllegalArgumentException         </type>
-        <type>   com.sun.star.uno.TypeClass                         </type>
-        <type>   com.sun.star.uno.XWeak                             </type>
-        <type>   com.sun.star.uno.XAggregation                      </type>
-        <type>   com.sun.star.registry.XRegistryKey                 </type>
-        <type>   com.sun.star.container.XSet                        </type>
+        <type>   com.sun.star.datatransfer.XTransferDataAccess		</type>
+        <type>	 com.sun.star.lang.XComponent                       </type>
+        <type>	 com.sun.star.lang.XMultiServiceFactory             </type>
+        <type>	 com.sun.star.lang.XSingleServiceFactory			</type>
+        <type>	 com.sun.star.lang.XServiceInfo						</type>
+        <type>	 com.sun.star.lang.XTypeProvider					</type>
+        <type>	 com.sun.star.lang.IllegalArgumentException			</type>
+        <type>	 com.sun.star.uno.TypeClass							</type>
+        <type>	 com.sun.star.uno.XWeak								</type>
+        <type>	 com.sun.star.uno.XAggregation						</type>
+        <type>	 com.sun.star.registry.XRegistryKey					</type>
+        <type>	 com.sun.star.container.XSet						</type>
     </component-description>
-    <project-build-dependency>  cppuhelper  </project-build-dependency>
-    <project-build-dependency>  cppu        </project-build-dependency>
-    <project-build-dependency>  sal         </project-build-dependency>
-    <runtime-module-dependency> cppuhelper  </runtime-module-dependency>
-    <runtime-module-dependency> cppu2       </runtime-module-dependency>
-    <runtime-module-dependency> sal2        </runtime-module-dependency>
+    <project-build-dependency>	cppuhelper	</project-build-dependency>
+    <project-build-dependency>	cppu		</project-build-dependency>
+    <project-build-dependency>	sal			</project-build-dependency>
+    <runtime-module-dependency>	cppuhelper	</runtime-module-dependency>
+    <runtime-module-dependency>	cppu2		</runtime-module-dependency>
+    <runtime-module-dependency>	sal2		</runtime-module-dependency>
 </module-description>
diff --git a/dtrans/source/win32/clipb/wcbentry.cxx b/dtrans/source/win32/clipb/wcbentry.cxx
index 986e7b4c4db7..bde8c11705b5 100644
--- a/dtrans/source/win32/clipb/wcbentry.cxx
+++ b/dtrans/source/win32/clipb/wcbentry.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
@@ -28,7 +28,7 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_dtrans.hxx"
 //______________________________________________________________________________________________________________
-//  includes of other projects
+//	includes of other projects
 //______________________________________________________________________________________________________________
 #include <cppuhelper/factory.hxx>
 #include <com/sun/star/container/XSet.hpp>
@@ -42,36 +42,36 @@
 // the service names
 #define WINCLIPBOARD_SERVICE_NAME  "com.sun.star.datatransfer.clipboard.SystemClipboard"
 
-// the implementation names
+// the implementation names		
 #define WINCLIPBOARD_IMPL_NAME  "com.sun.star.datatransfer.clipboard.ClipboardW32"
 
 // the registry key names
 // a key under which this service will be registered, Format: -> "/ImplName/UNO/SERVICES/ServiceName"
-//                        <     Implementation-Name    ></UNO/SERVICES/><    Service-Name           >
+//                        <     Implementation-Name    ></UNO/SERVICES/><    Service-Name           > 
 #define WINCLIPBOARD_REGKEY_NAME  "/com.sun.star.datatransfer.clipboard.ClipboardW32/UNO/SERVICES/com.sun.star.datatransfer.clipboard.SystemClipboard"
 
 //-----------------------------------------------------------------------------------------------------------
 // namespace directives
 //-----------------------------------------------------------------------------------------------------------
 
-using namespace ::rtl                       ;
-using namespace ::com::sun::star::uno       ;
-using namespace ::com::sun::star::registry  ;
-using namespace ::cppu                      ;
+using namespace ::rtl						;
+using namespace ::com::sun::star::uno		;
+using namespace ::com::sun::star::registry	;
+using namespace ::cppu					    ;
 using namespace ::com::sun::star::lang;
 using namespace ::com::sun::star::datatransfer::clipboard;
 
 //-----------------------------------------------------------------
 // create a static object to initialize the shell9x library
 //-----------------------------------------------------------------
-
+ 
 namespace
 {
 
     //-----------------------------------------------------------------------------------------------------------
     // functions to create a new Clipboad instance; is needed by factory helper implementation
     // @param rServiceManager - service manager, useful if the component needs other uno services
-    // so we should give it to every UNO-Implementation component
+    // so we should give it to every UNO-Implementation component	
     //-----------------------------------------------------------------------------------------------------------
 
     Reference< XInterface > SAL_CALL createInstance( const Reference< XMultiServiceFactory >& rServiceManager )
@@ -81,10 +81,10 @@ namespace
 }
 
 //-----------------------------------------------------------------------------------------------------------
-// the 3 important functions which will be exported
+// the 3 important functions which will be exported 
 //-----------------------------------------------------------------------------------------------------------
 
-extern "C"
+extern "C" 
 {
 
 //----------------------------------------------------------------------
@@ -112,13 +112,13 @@ sal_Bool SAL_CALL component_writeInfo( void* /*pServiceManager*/, void* pRegistr
     {
         try
         {
-            Reference< XRegistryKey > pXNewKey( static_cast< XRegistryKey* >( pRegistryKey ) );
+            Reference< XRegistryKey > pXNewKey( static_cast< XRegistryKey* >( pRegistryKey ) );							
             pXNewKey->createKey( OUString( RTL_CONSTASCII_USTRINGPARAM( WINCLIPBOARD_REGKEY_NAME ) ) );
             bRetVal = sal_True;
         }
         catch( InvalidRegistryException& )
-        {
-            OSL_ENSURE(sal_False, "InvalidRegistryException caught");
+        {			
+            OSL_ENSURE(sal_False, "InvalidRegistryException caught");			
             bRetVal = sal_False;
         }
     }
@@ -127,7 +127,7 @@ sal_Bool SAL_CALL component_writeInfo( void* /*pServiceManager*/, void* pRegistr
 }
 
 //----------------------------------------------------------------------
-// component_getFactory
+// component_getFactory 
 // returns a factory to create XFilePicker-Services
 //----------------------------------------------------------------------
 
@@ -138,8 +138,8 @@ void* SAL_CALL component_getFactory( const sal_Char* pImplName, uno_Interface* p
     if ( pSrvManager && ( 0 == rtl_str_compare( pImplName, WINCLIPBOARD_IMPL_NAME ) ) )
     {
         Sequence< OUString > aSNS( 1 );
-        aSNS.getArray( )[0] = OUString( RTL_CONSTASCII_USTRINGPARAM( WINCLIPBOARD_SERVICE_NAME ) );
-
+        aSNS.getArray( )[0] = OUString( RTL_CONSTASCII_USTRINGPARAM( WINCLIPBOARD_SERVICE_NAME ) );		
+        
         //OUString( RTL_CONSTASCII_USTRINGPARAM( FPS_IMPL_NAME ) )
         Reference< XSingleServiceFactory > xFactory ( createOneInstanceFactory(
             reinterpret_cast< XMultiServiceFactory* > ( pSrvManager ),
@@ -150,7 +150,7 @@ void* SAL_CALL component_getFactory( const sal_Char* pImplName, uno_Interface* p
         {
             xFactory->acquire();
             pRet = xFactory.get();
-        }
+        }			
     }
 
     return pRet;
diff --git a/dtrans/source/win32/dnd/dnd.xml b/dtrans/source/win32/dnd/dnd.xml
index 10db2ddb2326..a7690cbd2de4 100644
--- a/dtrans/source/win32/dnd/dnd.xml
+++ b/dtrans/source/win32/dnd/dnd.xml
@@ -1,46 +1,46 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE module-description PUBLIC "-//StarOffice//DTD ComponentDescription 1.0//EN" "module-description.dtd">
 <module-description xmlns:xlink="http://www.w3.org/1999/xlink">
-    <module-name>   dnd </module-name>
+    <module-name>	dnd	</module-name>
     <component-description>
         <author> Joachim Lingner </author>
-        <name>  com.sun.star.comp.datatransfer.dnd.OleDragAndDrop </name>
+        <name>	com.sun.star.comp.datatransfer.dnd.OleDragAndDrop </name>
         <description>
     The win32 implementation of the drop target service.
 </description>
-        <loader-name>   com.sun.star.loader.SharedLibrary   </loader-name>
-        <language>  c++ </language>
+        <loader-name>	com.sun.star.loader.SharedLibrary	</loader-name>
+        <language>	c++	</language>
         <status value="beta"/>
-        <supported-service> com.sun.star.datatransfer.dnd.OleDragSource</supported-service>
-        <supported-service> com.sun.star.datatransfer.dnd.OleDropTarget</supported-service>
-        <service-dependency>    ... </service-dependency>
-        <type>   com.sun.star.datatransfer.dnd.DNDConstants         </type>
-        <type>   com.sun.star.datatransfer.dnd.XDropTarget          </type>
-        <type>   com.sun.star.datatransfer.dnd.XDropTargetDragContext   </type>
-        <type>   com.sun.star.datatransfer.dnd.XDropTargetListener  </type>
-        <type>   com.sun.star.datatransfer.dnd.XDropTargetDropContext   </type>
-        <type>   com.sun.star.datatransfer.dnd.XDragSourceContext   </type>
-        <type>   com.sun.star.datatransfer.dnd.XDragSource              </type>
-        <type>   com.sun.star.datatransfer.XTransferable                </type>
-        <type>   com.sun.star.lang.XComponent                       </type>
-        <type>   com.sun.star.lang.XMultiServiceFactory             </type>
-        <type>   com.sun.star.lang.XSingleServiceFactory            </type>
-        <type>   com.sun.star.lang.XServiceInfo                     </type>
-        <type>   com.sun.star.lang.XTypeProvider                    </type>
-        <type>   com.sun.star.lang.IllegalArgumentException         </type>
-        <type>   com.sun.star.lang.XInitialization                  </type>
-        <type>   com.sun.star.lang.XUnoTunnel                       </type>
-        <type>   com.sun.star.uno.TypeClass                         </type>
-        <type>   com.sun.star.uno.XWeak                             </type>
-        <type>   com.sun.star.uno.XAggregation                      </type>
-        <type>   com.sun.star.registry.XRegistryKey                 </type>
-        <type>   com.sun.star.awt.MouseButton                       </type>
-        <type>   com.sun.star.awt.MouseEvent                        </type>
+        <supported-service>	com.sun.star.datatransfer.dnd.OleDragSource</supported-service>
+        <supported-service>	com.sun.star.datatransfer.dnd.OleDropTarget</supported-service>
+        <service-dependency>	...	</service-dependency>
+        <type>	 com.sun.star.datatransfer.dnd.DNDConstants			</type>
+        <type>	 com.sun.star.datatransfer.dnd.XDropTarget          </type>
+        <type>	 com.sun.star.datatransfer.dnd.XDropTargetDragContext	</type>
+        <type>	 com.sun.star.datatransfer.dnd.XDropTargetListener	</type>
+        <type>	 com.sun.star.datatransfer.dnd.XDropTargetDropContext	</type>
+        <type>	 com.sun.star.datatransfer.dnd.XDragSourceContext	</type>
+        <type>	 com.sun.star.datatransfer.dnd.XDragSource				</type>
+        <type>	 com.sun.star.datatransfer.XTransferable				</type>
+        <type>	 com.sun.star.lang.XComponent                       </type>
+        <type>	 com.sun.star.lang.XMultiServiceFactory             </type>
+        <type>	 com.sun.star.lang.XSingleServiceFactory			</type>
+        <type>	 com.sun.star.lang.XServiceInfo						</type>
+        <type>	 com.sun.star.lang.XTypeProvider					</type>
+        <type>	 com.sun.star.lang.IllegalArgumentException			</type>
+        <type>	 com.sun.star.lang.XInitialization					</type>
+        <type>	 com.sun.star.lang.XUnoTunnel						</type>
+        <type>	 com.sun.star.uno.TypeClass							</type>
+        <type>	 com.sun.star.uno.XWeak								</type>
+        <type>	 com.sun.star.uno.XAggregation						</type>
+        <type>	 com.sun.star.registry.XRegistryKey					</type>
+        <type>	 com.sun.star.awt.MouseButton						</type>
+        <type>	 com.sun.star.awt.MouseEvent						</type>
     </component-description>
-    <project-build-dependency>  cppuhelper  </project-build-dependency>
-    <project-build-dependency>  cppu        </project-build-dependency>
-    <project-build-dependency>  sal         </project-build-dependency>
-    <runtime-module-dependency> cppuhelper  </runtime-module-dependency>
-    <runtime-module-dependency> cppu2       </runtime-module-dependency>
-    <runtime-module-dependency> sal2        </runtime-module-dependency>
+    <project-build-dependency>	cppuhelper	</project-build-dependency>
+    <project-build-dependency>	cppu		</project-build-dependency>
+    <project-build-dependency>	sal			</project-build-dependency>
+    <runtime-module-dependency>	cppuhelper	</runtime-module-dependency>
+    <runtime-module-dependency>	cppu2		</runtime-module-dependency>
+    <runtime-module-dependency>	sal2		</runtime-module-dependency>
 </module-description>
diff --git a/dtrans/source/win32/dnd/dndentry.cxx b/dtrans/source/win32/dnd/dndentry.cxx
index 2ea9b7746def..b8ddd5fee8f8 100644
--- a/dtrans/source/win32/dnd/dndentry.cxx
+++ b/dtrans/source/win32/dnd/dndentry.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
@@ -34,10 +34,10 @@
 #include "source.hxx"
 #include "target.hxx"
 
-using namespace ::rtl                       ;
-using namespace ::com::sun::star::uno       ;
-using namespace ::com::sun::star::registry  ;
-using namespace ::cppu                      ;
+using namespace ::rtl						;
+using namespace ::com::sun::star::uno		;
+using namespace ::com::sun::star::registry	;
+using namespace ::cppu					    ;
 using namespace ::com::sun::star::lang;
 
 rtl_StandardModuleCount g_moduleCount = MODULE_COUNT_INIT;
@@ -55,7 +55,7 @@ Reference< XInterface > SAL_CALL createDropTarget( const Reference< XMultiServic
 }
 
 
-extern "C"
+extern "C" 
 {
 sal_Bool SAL_CALL component_canUnload( TimeValue *pTime )
 {
@@ -87,17 +87,17 @@ sal_Bool SAL_CALL component_writeInfo( void* /*pServiceManager*/, void* pRegistr
     {
         try
         {
-            Reference< XRegistryKey > pXNewKey( static_cast< XRegistryKey* >( pRegistryKey ) );
+            Reference< XRegistryKey > pXNewKey( static_cast< XRegistryKey* >( pRegistryKey ) );							
             pXNewKey->createKey( OUString( RTL_CONSTASCII_USTRINGPARAM( DNDSOURCE_REGKEY_NAME ) ) );
             bRetVal = sal_True;
 
-            pXNewKey=  static_cast< XRegistryKey* >( pRegistryKey );
+            pXNewKey=  static_cast< XRegistryKey* >( pRegistryKey );							
             pXNewKey->createKey( OUString( RTL_CONSTASCII_USTRINGPARAM( DNDTARGET_REGKEY_NAME ) ) );
             bRetVal = sal_True;
         }
         catch( InvalidRegistryException& )
-        {
-            OSL_ENSURE(sal_False, "InvalidRegistryException caught");
+        {			
+            OSL_ENSURE(sal_False, "InvalidRegistryException caught");			
             bRetVal = sal_False;
         }
     }
@@ -106,7 +106,7 @@ sal_Bool SAL_CALL component_writeInfo( void* /*pServiceManager*/, void* pRegistr
 }
 
 //----------------------------------------------------------------------
-// component_getFactory
+// component_getFactory 
 // returns a factory to create XFilePicker-Services
 //----------------------------------------------------------------------
 
@@ -118,21 +118,21 @@ void* SAL_CALL component_getFactory( const sal_Char* pImplName, uno_Interface* p
     if ( pSrvManager && ( 0 == rtl_str_compare( pImplName, DNDSOURCE_IMPL_NAME ) ) )
     {
         Sequence< OUString > aSNS( 1 );
-        aSNS.getArray( )[0] = OUString( RTL_CONSTASCII_USTRINGPARAM( DNDSOURCE_SERVICE_NAME ) );
-
+        aSNS.getArray( )[0] = OUString( RTL_CONSTASCII_USTRINGPARAM( DNDSOURCE_SERVICE_NAME ) );		
+        
         xFactory= createSingleFactory(
             reinterpret_cast< XMultiServiceFactory* > ( pSrvManager ),
             OUString::createFromAscii( pImplName ),
             createDragSource,
             aSNS,
             &g_moduleCount.modCnt);
-
+        
     }
     else if( pSrvManager && ( 0 == rtl_str_compare( pImplName, DNDTARGET_IMPL_NAME ) ) )
     {
         Sequence< OUString > aSNS( 1 );
-        aSNS.getArray( )[0] = OUString( RTL_CONSTASCII_USTRINGPARAM( DNDTARGET_SERVICE_NAME ) );
-
+        aSNS.getArray( )[0] = OUString( RTL_CONSTASCII_USTRINGPARAM( DNDTARGET_SERVICE_NAME ) );		
+        
         xFactory= createSingleFactory(
             reinterpret_cast< XMultiServiceFactory* > ( pSrvManager ),
             OUString::createFromAscii( pImplName ),
@@ -145,7 +145,7 @@ void* SAL_CALL component_getFactory( const sal_Char* pImplName, uno_Interface* p
     {
         xFactory->acquire();
         pRet = xFactory.get();
-    }
+    }			
 
     return pRet;
 }
diff --git a/dtrans/source/win32/dnd/globals.cxx b/dtrans/source/win32/dnd/globals.cxx
index 9c6bdba5c024..850144057184 100644
--- a/dtrans/source/win32/dnd/globals.cxx
+++ b/dtrans/source/win32/dnd/globals.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
@@ -47,7 +47,7 @@ sal_Int8 dndOleKeysToAction( DWORD grfKeyState, sal_Int8 nSourceActions)
 
     // no MK_ALT, MK_CONTROL, MK_SHIFT
     if( !(grfKeyState & MK_CONTROL) &&
-        !(grfKeyState & MK_ALT)    &&
+        !(grfKeyState & MK_ALT)	   &&
         !(grfKeyState & MK_RBUTTON) &&
         !(grfKeyState & MK_SHIFT))
     {
@@ -55,7 +55,7 @@ sal_Int8 dndOleKeysToAction( DWORD grfKeyState, sal_Int8 nSourceActions)
         {
             ret= ACTION_DEFAULT | ACTION_MOVE;
         }
-
+        
         else if( nSourceActions & ACTION_COPY )
         {
             ret= ACTION_COPY;
@@ -74,8 +74,8 @@ sal_Int8 dndOleKeysToAction( DWORD grfKeyState, sal_Int8 nSourceActions)
     {
         ret= ACTION_MOVE;
     }
-    else if ( grfKeyState & MK_CONTROL &&
-              !(grfKeyState & MK_SHIFT) )
+    else if ( grfKeyState & MK_CONTROL && 
+              !(grfKeyState & MK_SHIFT)	)
     {
         ret= ACTION_COPY;
     }
@@ -84,7 +84,7 @@ sal_Int8 dndOleKeysToAction( DWORD grfKeyState, sal_Int8 nSourceActions)
     {
         ret= ACTION_LINK;
     }
-    else if ( grfKeyState & MK_RBUTTON |
+    else if ( grfKeyState & MK_RBUTTON | 
               grfKeyState & MK_ALT)
     {
         ret= ACTION_COPY_OR_MOVE | ACTION_LINK;
diff --git a/dtrans/source/win32/dnd/globals.hxx b/dtrans/source/win32/dnd/globals.hxx
index 0f21d00d7371..089d489ee41f 100644
--- a/dtrans/source/win32/dnd/globals.hxx
+++ b/dtrans/source/win32/dnd/globals.hxx
@@ -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
@@ -50,34 +50,34 @@
 #define DNDTARGET_REGKEY_NAME  "/com.sun.star.comp.datatransfer.dnd.OleDropTarget_V1/UNO/SERVICES/com.sun.star.datatransfer.dnd.OleDropTarget"
 
 // This maps key states as occur as parameter, e.g. in IDropTarget::DragEnter,
-// IDropSource::QueryContinueDrag, to actions as are declared in
+// IDropSource::QueryContinueDrag, to actions as are declared in 
 // com::sun::star::datatransfer::dnd::DNDConstants ( ACTION_MOVE etc).
-// If the grfKeyState indicates the ALt or right mousebutton then the returned
+// If the grfKeyState indicates the ALt or right mousebutton then the returned 
 // values combines all possible actions. This is because those key and button are
 // used when the user expect a menu to appear when he drops. The menu then
 // contains entries, such as move, copy, link, cancel.
-// An odd fact is that the argument grfKeyState in IDropTarget::Drop does not
-// contain mouse buttons (winnt 4 SP6). That indicates that the right mouse button
+// An odd fact is that the argument grfKeyState in IDropTarget::Drop does not 
+// contain mouse buttons (winnt 4 SP6). That indicates that the right mouse button 
 // is not considered relevant in a drag operation. Contrarily the file explorer
-// gives that button a special meaning: the user has to select the effect from
+// gives that button a special meaning: the user has to select the effect from 
 // a context menu on drop.
 sal_Int8 dndOleKeysToAction( DWORD grfKeyState, sal_Int8 sourceActions);
 
-// The function maps a windows DROPEFFECTs to actions
+// The function maps a windows DROPEFFECTs to actions 
 // ( com::sun::star::datatransfer::dnd::DNDConstants).
-// The argument can be a combination of different DROPEFFECTS,
-// In that case the return value is also a combination of the
+// The argument can be a combination of different DROPEFFECTS, 
+// In that case the return value is also a combination of the 
 // appropriate actions.
 sal_Int8 dndOleDropEffectsToActions( DWORD dwEffect);
 
 // The function maps actions ( com::sun::star::datatransfer::dnd::DNDConstants)
 // to window DROPEFFECTs.
 // The argument can be a combination of different actions
-// In that case the return value is also a combination of the
+// In that case the return value is also a combination of the 
 // appropriate DROPEFFECTS.
 DWORD dndActionsToDropEffects( sal_Int8 actions);
 
-// If the argument constitutes only one action then it is mapped to the
+// If the argument constitutes only one action then it is mapped to the 
 // corresponding DROPEFFECT otherwise DROPEFFECT_MOVE is returned. This is
 // why move is the default effect (no modifiers pressed, or right mouse button
 // or Alt).
diff --git a/dtrans/source/win32/dnd/idroptarget.cxx b/dtrans/source/win32/dnd/idroptarget.cxx
index 702c9a3e567e..3e0af2d8a679 100644
--- a/dtrans/source/win32/dnd/idroptarget.cxx
+++ b/dtrans/source/win32/dnd/idroptarget.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
@@ -59,7 +59,7 @@ HRESULT STDMETHODCALLTYPE IDropTargetImpl::QueryInterface( REFIID riid, void  **
         *ppvObject= static_cast<IUnknown*>( this);
     else if (  riid == __uuidof( IDropTarget))
         *ppvObject= static_cast<IDropTarget*>( this);
-
+    
     if(*ppvObject)
     {
         AddRef();
@@ -67,14 +67,14 @@ HRESULT STDMETHODCALLTYPE IDropTargetImpl::QueryInterface( REFIID riid, void  **
     }
     else
         return E_NOINTERFACE;
-
+    
 }
-
+        
 ULONG STDMETHODCALLTYPE IDropTargetImpl::AddRef( void)
 {
     return InterlockedIncrement( &m_nRefCount);
 }
-
+        
 ULONG STDMETHODCALLTYPE IDropTargetImpl::Release( void)
 {
     LONG count= InterlockedDecrement( &m_nRefCount);
@@ -91,24 +91,24 @@ STDMETHODIMP IDropTargetImpl::DragEnter( IDataObject __RPC_FAR *pDataObj,
     return m_rDropTarget.DragEnter( pDataObj, grfKeyState,
                                   pt, pdwEffect);
 }
-
+        
 STDMETHODIMP IDropTargetImpl::DragOver( DWORD grfKeyState,
                                    POINTL pt,
                                    DWORD  *pdwEffect)
 {
     return m_rDropTarget.DragOver( grfKeyState, pt, pdwEffect);
 }
-
+        
 STDMETHODIMP IDropTargetImpl::DragLeave( void)
 {
     return m_rDropTarget.DragLeave();
 }
-
+        
 STDMETHODIMP IDropTargetImpl::Drop( IDataObject  *pDataObj,
                    DWORD grfKeyState,
                    POINTL pt,
                    DWORD __RPC_FAR *pdwEffect)
 {
-    return m_rDropTarget.Drop( pDataObj, grfKeyState,
+    return m_rDropTarget.Drop( pDataObj, grfKeyState, 
                                    pt, pdwEffect);
 }
diff --git a/dtrans/source/win32/dnd/idroptarget.hxx b/dtrans/source/win32/dnd/idroptarget.hxx
index dd3cbed3d893..6e66bc22f504 100644
--- a/dtrans/source/win32/dnd/idroptarget.hxx
+++ b/dtrans/source/win32/dnd/idroptarget.hxx
@@ -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
@@ -25,7 +25,7 @@
  *
  ************************************************************************/
 #ifndef _IDROPTARGET_HXX_
-#define _IDROPTARGET_HXX_
+#define _IDROPTARGET_HXX_ 
 
 #include "target.hxx"
 
@@ -35,35 +35,35 @@ class IDropTargetImpl: public IDropTarget
     // Calls to IDropTarget functions are delegated to a DropTarget.
     DropTarget& m_rDropTarget;
 
-    virtual ~IDropTargetImpl(); // delete is only called by IUnknown::Release
+    virtual ~IDropTargetImpl(); // delete is only called by IUnknown::Release 
     IDropTargetImpl( const IDropTargetImpl& );
     IDropTargetImpl& operator=( const IDropTargetImpl& );
 public:
     IDropTargetImpl( DropTarget& pTarget);
 
        // IDropTarget
-    virtual HRESULT STDMETHODCALLTYPE QueryInterface(
+    virtual HRESULT STDMETHODCALLTYPE QueryInterface( 
             /* [in] */ REFIID riid,
             /* [iid_is][out] */ void __RPC_FAR *__RPC_FAR *ppvObject);
-
+        
     virtual ULONG STDMETHODCALLTYPE AddRef( );
-
+        
     virtual ULONG STDMETHODCALLTYPE Release( );
 
-    virtual HRESULT STDMETHODCALLTYPE DragEnter(
+    virtual HRESULT STDMETHODCALLTYPE DragEnter( 
             /* [unique][in] */ IDataObject __RPC_FAR *pDataObj,
             /* [in] */ DWORD grfKeyState,
             /* [in] */ POINTL pt,
             /* [out][in] */ DWORD __RPC_FAR *pdwEffect);
-
-    virtual HRESULT STDMETHODCALLTYPE DragOver(
+        
+    virtual HRESULT STDMETHODCALLTYPE DragOver( 
             /* [in] */ DWORD grfKeyState,
             /* [in] */ POINTL pt,
             /* [out][in] */ DWORD __RPC_FAR *pdwEffect);
-
+        
     virtual HRESULT STDMETHODCALLTYPE DragLeave( ) ;
-
-    virtual HRESULT STDMETHODCALLTYPE Drop(
+        
+    virtual HRESULT STDMETHODCALLTYPE Drop( 
             /* [unique][in] */ IDataObject __RPC_FAR *pDataObj,
             /* [in] */ DWORD grfKeyState,
             /* [in] */ POINTL pt,
diff --git a/dtrans/source/win32/dnd/source.cxx b/dtrans/source/win32/dnd/source.cxx
index 8c05d8806601..461c510177a6 100644
--- a/dtrans/source/win32/dnd/source.cxx
+++ b/dtrans/source/win32/dnd/source.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
@@ -76,7 +76,7 @@ unsigned __stdcall DndOleSTAFunc(LPVOID pParams);
 DragSource::DragSource( const Reference<XMultiServiceFactory>& sf):
     m_serviceFactory( sf),
     WeakComponentImplHelper3< XDragSource, XInitialization, XServiceInfo >(m_mutex),
-//  m_pcurrentContext_impl(0),
+//	m_pcurrentContext_impl(0),
     m_hAppWindow(0),
     m_MouseButton(0),
     m_RunningDndOperationCount(0)
@@ -218,7 +218,7 @@ void SAL_CALL DragSource::startDrag(
 
         DragSourceDropEvent dsde;
 
-        dsde.DropAction  = ACTION_NONE;
+        dsde.DropAction	 = ACTION_NONE;
         dsde.DropSuccess = false;
 
         try
@@ -296,7 +296,7 @@ HRESULT STDMETHODCALLTYPE DragSource::QueryContinueDrag(
     {
         if( ( m_MouseButton == MouseButton::RIGHT &&  !(grfKeyState & MK_RBUTTON) ) ||
             ( m_MouseButton == MouseButton::MIDDLE && !(grfKeyState & MK_MBUTTON) ) ||
-            ( m_MouseButton == MouseButton::LEFT && !(grfKeyState & MK_LBUTTON) )   ||
+            ( m_MouseButton == MouseButton::LEFT && !(grfKeyState & MK_LBUTTON)	)   ||
             ( m_MouseButton == 0 && !(grfKeyState & MK_LBUTTON) ) )
         {
             retVal= DRAGDROP_S_DROP;
diff --git a/dtrans/source/win32/dnd/source.hxx b/dtrans/source/win32/dnd/source.hxx
index decf3f61368f..b1e197f61c6d 100644
--- a/dtrans/source/win32/dnd/source.hxx
+++ b/dtrans/source/win32/dnd/source.hxx
@@ -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
diff --git a/dtrans/source/win32/dnd/sourcecontext.cxx b/dtrans/source/win32/dnd/sourcecontext.cxx
index da4d5c06eefb..ba897bf51e21 100644
--- a/dtrans/source/win32/dnd/sourcecontext.cxx
+++ b/dtrans/source/win32/dnd/sourcecontext.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
diff --git a/dtrans/source/win32/dnd/sourcecontext.hxx b/dtrans/source/win32/dnd/sourcecontext.hxx
index db3f093b21a9..3721c8900f0e 100644
--- a/dtrans/source/win32/dnd/sourcecontext.hxx
+++ b/dtrans/source/win32/dnd/sourcecontext.hxx
@@ -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
@@ -63,17 +63,17 @@ public:
     SourceContext( DragSource* pSource, const Reference<XDragSourceListener>& listener);
     ~SourceContext();
 
-    virtual void SAL_CALL addDragSourceListener( const Reference<XDragSourceListener >& dsl )
+    virtual void SAL_CALL addDragSourceListener( const Reference<XDragSourceListener >& dsl ) 
         throw( RuntimeException);
-    virtual void SAL_CALL removeDragSourceListener( const Reference<XDragSourceListener >& dsl )
+    virtual void SAL_CALL removeDragSourceListener( const Reference<XDragSourceListener >& dsl ) 
         throw( RuntimeException);
-    virtual sal_Int32 SAL_CALL getCurrentCursor(  )
+    virtual sal_Int32 SAL_CALL getCurrentCursor(  ) 
         throw( RuntimeException);
-    virtual void SAL_CALL setCursor( sal_Int32 cursorId )
+    virtual void SAL_CALL setCursor( sal_Int32 cursorId ) 
         throw( RuntimeException);
-    virtual void SAL_CALL setImage( sal_Int32 imageId )
+    virtual void SAL_CALL setImage( sal_Int32 imageId ) 
         throw( RuntimeException);
-    virtual void SAL_CALL transferablesFlavorsChanged(  )
+    virtual void SAL_CALL transferablesFlavorsChanged(  ) 
         throw( RuntimeException);
 
 
diff --git a/dtrans/source/win32/dnd/target.cxx b/dtrans/source/win32/dnd/target.cxx
index 6e2e28bcfc39..94de8536166c 100644
--- a/dtrans/source/win32/dnd/target.cxx
+++ b/dtrans/source/win32/dnd/target.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
@@ -131,11 +131,11 @@ void SAL_CALL DropTarget::initialize( const Sequence< Any >& aArguments )
     // to ensure that it is called from the same thread that created the Window
     // otherwise meesages sent during DND won't reach the windows message queue.
     // Calling AttachThreadInput first would resolve this problem but would block
-    // the message queue of the calling thread. So if the current thread
+    // the message queue of the calling thread. So if the current thread 
     // (even if it's an STA thread) and the thread that created the window are not
     // identical we need to create a new thread as we do when the calling thread is
     // an MTA thread.
-
+    
     if( aArguments.getLength() > 0)
     {
         // Get the window handle from aArgument. It is needed for RegisterDragDrop.
diff --git a/dtrans/source/win32/dnd/target.hxx b/dtrans/source/win32/dnd/target.hxx
index 94982b54818f..923facb6cf1c 100644
--- a/dtrans/source/win32/dnd/target.hxx
+++ b/dtrans/source/win32/dnd/target.hxx
@@ -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
@@ -100,7 +100,7 @@ private:
     // If m_bActive == sal_True then events are fired to XDropTargetListener s,
     // none otherwise. The default value is sal_True.
     sal_Bool m_bActive;
-    sal_Int8    m_nDefaultActions;
+    sal_Int8	m_nDefaultActions;
 
     // This value is set when a XDropTargetListener calls accept or reject on
     // the XDropTargetDropContext or  XDropTargetDragContext.
@@ -112,7 +112,7 @@ private:
     Reference<XTransferable> m_currentData;
     // The current action is used to determine if the USER
     // action has changed (dropActionChanged)
-//  sal_Int8 m_userAction;
+//	sal_Int8 m_userAction;
     // Set by listeners when they call XDropTargetDropContext::dropComplete
     sal_Bool m_bDropComplete;
     // converts IDataObject objects to XTransferable objects.
diff --git a/dtrans/source/win32/dnd/targetdragcontext.cxx b/dtrans/source/win32/dnd/targetdragcontext.cxx
index 15f7ea32a1ef..26042e0d8887 100644
--- a/dtrans/source/win32/dnd/targetdragcontext.cxx
+++ b/dtrans/source/win32/dnd/targetdragcontext.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
@@ -45,7 +45,7 @@ TargetDragContext::~TargetDragContext()
     g_moduleCount.modCnt.release( &g_moduleCount.modCnt );
 }
 
-void SAL_CALL TargetDragContext::acceptDrag( sal_Int8 dragOperation )
+void SAL_CALL TargetDragContext::acceptDrag( sal_Int8 dragOperation ) 
     throw( RuntimeException)
 {
     m_pDropTarget->_acceptDrag( dragOperation, static_cast<XDropTargetDragContext*>( this) );
diff --git a/dtrans/source/win32/dnd/targetdragcontext.hxx b/dtrans/source/win32/dnd/targetdragcontext.hxx
index e4b24b95b0a0..9a2bd9ad5fdb 100644
--- a/dtrans/source/win32/dnd/targetdragcontext.hxx
+++ b/dtrans/source/win32/dnd/targetdragcontext.hxx
@@ -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
@@ -45,7 +45,7 @@ class TargetDragContext: public WeakImplHelper1<XDropTargetDragContext>
     // some calls to the functions of XDropTargetDragContext are delegated
     // to non-interface functions of m_pDropTarget
     DropTarget* m_pDropTarget;
-
+    
     TargetDragContext();
     TargetDragContext( const TargetDragContext&);
     TargetDragContext &operator= ( const TargetDragContext&);
@@ -53,7 +53,7 @@ public:
     TargetDragContext( DropTarget* pTarget);
     ~TargetDragContext();
 
-    virtual void SAL_CALL acceptDrag( sal_Int8 dragOperation )
+    virtual void SAL_CALL acceptDrag( sal_Int8 dragOperation ) 
         throw( RuntimeException);
     virtual void SAL_CALL rejectDrag(  )
         throw( RuntimeException);
diff --git a/dtrans/source/win32/dnd/targetdropcontext.cxx b/dtrans/source/win32/dnd/targetdropcontext.cxx
index a009b8df7527..e383aa526c11 100644
--- a/dtrans/source/win32/dnd/targetdropcontext.cxx
+++ b/dtrans/source/win32/dnd/targetdropcontext.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
@@ -50,19 +50,19 @@ TargetDropContext::~TargetDropContext()
     g_moduleCount.modCnt.release( &g_moduleCount.modCnt );
 }
 
-void SAL_CALL TargetDropContext::acceptDrop( sal_Int8 dropOperation )
+void SAL_CALL TargetDropContext::acceptDrop( sal_Int8 dropOperation ) 
         throw( RuntimeException)
 {
     m_pDropTarget->_acceptDrop( dropOperation, static_cast<XDropTargetDropContext*>( this) );
 }
 
-void SAL_CALL TargetDropContext::rejectDrop( )
+void SAL_CALL TargetDropContext::rejectDrop( ) 
         throw( RuntimeException)
 {
     m_pDropTarget->_rejectDrop(  static_cast<XDropTargetDropContext*>( this) );
 }
-
-void SAL_CALL TargetDropContext::dropComplete( sal_Bool success )
+ 
+void SAL_CALL TargetDropContext::dropComplete( sal_Bool success ) 
         throw( RuntimeException)
 {
     m_pDropTarget->_dropComplete( success, static_cast<XDropTargetDropContext*>( this) );
diff --git a/dtrans/source/win32/dnd/targetdropcontext.hxx b/dtrans/source/win32/dnd/targetdropcontext.hxx
index 6ae6f0182a36..4ff51b9045fc 100644
--- a/dtrans/source/win32/dnd/targetdropcontext.hxx
+++ b/dtrans/source/win32/dnd/targetdropcontext.hxx
@@ -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
@@ -52,21 +52,21 @@ public:
     ~TargetDropContext();
 
 
-    // XDropTargetDragContext
-    virtual void SAL_CALL acceptDrop( sal_Int8 dropOperation )
+    // XDropTargetDragContext 
+    virtual void SAL_CALL acceptDrop( sal_Int8 dropOperation ) 
         throw( RuntimeException);
-    virtual void SAL_CALL rejectDrop(  )
+    virtual void SAL_CALL rejectDrop(  ) 
         throw( RuntimeException);
 
-
-/*  virtual Sequence< DataFlavor > SAL_CALL getCurrentDataFlavors(  )
+    
+/*	virtual Sequence< DataFlavor > SAL_CALL getCurrentDataFlavors(  )
         throw( RuntimeException);
-    virtual sal_Bool SAL_CALL isDataFlavorSupported( const DataFlavor& df )
+    virtual sal_Bool SAL_CALL isDataFlavorSupported( const DataFlavor& df ) 
         throw( RuntimeException);
 */
 
     // XDropTargetDropContext (inherits XDropTargetDragContext)
-    virtual void SAL_CALL dropComplete( sal_Bool success )
+    virtual void SAL_CALL dropComplete( sal_Bool success ) 
         throw(  RuntimeException);
 };
 #endif
diff --git a/dtrans/source/win32/dtobj/APNDataObject.cxx b/dtrans/source/win32/dtobj/APNDataObject.cxx
index 775e952ac885..2f990c79d389 100644
--- a/dtrans/source/win32/dtobj/APNDataObject.cxx
+++ b/dtrans/source/win32/dtobj/APNDataObject.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
@@ -43,8 +43,8 @@
 // defines
 //------------------------------------------------------------------------
 
-#define FREE_HGLOB_ON_RELEASE   TRUE
-#define KEEP_HGLOB_ON_RELEASE   FALSE
+#define FREE_HGLOB_ON_RELEASE	TRUE
+#define KEEP_HGLOB_ON_RELEASE	FALSE
 
 //------------------------------------------------------------------------
 // ctor
@@ -54,58 +54,58 @@ CAPNDataObject::CAPNDataObject( IDataObjectPtr rIDataObject ) :
     m_rIDataObjectOrg( rIDataObject ),
     m_hGlobal( NULL ),
     m_nRefCnt( 0 )
-{
-
+{	
+    
     OSL_ENSURE( m_rIDataObjectOrg.get( ), "constructing CAPNDataObject with empty data object" );
-
+    
     // we marshal the IDataObject interface pointer here so
-    // that it can be unmarshaled multiple times when this
+    // that it can be unmarshaled multiple times when this 
     // class will be used from another apartment
     IStreamPtr pStm;
     HRESULT hr = CreateStreamOnHGlobal( 0, KEEP_HGLOB_ON_RELEASE, &pStm );
-
+            
     OSL_ENSURE( E_INVALIDARG != hr, "invalid args passed to CreateStreamOnHGlobal" );
 
     if ( SUCCEEDED( hr ) )
-    {
-        HRESULT hr_marshal = CoMarshalInterface(
-            pStm.get(),
-            __uuidof(IDataObject),
+    {			
+        HRESULT hr_marshal = CoMarshalInterface( 
+            pStm.get(), 
+            __uuidof(IDataObject), 
             static_cast<LPUNKNOWN>(m_rIDataObjectOrg.get()),
             MSHCTX_LOCAL,
             NULL,
             MSHLFLAGS_TABLEWEAK );
-
+        
         OSL_ENSURE( CO_E_NOTINITIALIZED != hr_marshal, "COM is not initialized" );
 
-        // marshalling may fail if COM is not initialized
+        // marshalling may fail if COM is not initialized 
         // for the calling thread which is a program time
         // error or because of stream errors which are runtime
         // errors for instance E_OUTOFMEMORY etc.
-
+                    
         hr = GetHGlobalFromStream(pStm.get(), &m_hGlobal );
 
         OSL_ENSURE( E_INVALIDARG != hr, "invalid stream passed to GetHGlobalFromStream" );
 
-        // if the marshalling failed we free the
+        // if the marshalling failed we free the 
         // global memory again and set m_hGlobal
         // to a defined value
         if (FAILED(hr_marshal))
         {
             OSL_ENSURE(sal_False, "marshalling failed");
-
+            
             #if OSL_DEBUG_LEVEL > 0
             HGLOBAL hGlobal =
             #endif
-                GlobalFree(m_hGlobal);
+                GlobalFree(m_hGlobal);            
             OSL_ENSURE(NULL == hGlobal, "GlobalFree failed");
             m_hGlobal = NULL;
         }
-    }
+    }	        
 }
 
 CAPNDataObject::~CAPNDataObject( )
-{
+{    
     if (m_hGlobal)
     {
         IStreamPtr pStm;
@@ -118,7 +118,7 @@ CAPNDataObject::~CAPNDataObject( )
             hr = CoReleaseMarshalData(pStm.get());
             OSL_ENSURE(SUCCEEDED(hr), "CoReleaseMarshalData failed");
         }
-    }
+    }    
 }
 
 //------------------------------------------------------------------------
@@ -126,7 +126,7 @@ CAPNDataObject::~CAPNDataObject( )
 //------------------------------------------------------------------------
 
 STDMETHODIMP CAPNDataObject::QueryInterface( REFIID iid, LPVOID* ppvObject )
-{
+{	
     OSL_ASSERT( NULL != ppvObject );
 
     if ( NULL == ppvObject )
@@ -142,7 +142,7 @@ STDMETHODIMP CAPNDataObject::QueryInterface( REFIID iid, LPVOID* ppvObject )
         hr = S_OK;
     }
 
-    return hr;
+    return hr;	
 }
 
 //------------------------------------------------------------------------
@@ -160,7 +160,7 @@ STDMETHODIMP_(ULONG) CAPNDataObject::AddRef( )
 
 STDMETHODIMP_(ULONG) CAPNDataObject::Release( )
 {
-    // we need a helper variable because it's not allowed to access
+    // we need a helper variable because it's not allowed to access 
     // a member variable after an object is destroyed
     ULONG nRefCnt = static_cast< ULONG >( InterlockedDecrement( &m_nRefCnt ) );
 
@@ -175,16 +175,16 @@ STDMETHODIMP_(ULONG) CAPNDataObject::Release( )
 //------------------------------------------------------------------------
 
 STDMETHODIMP CAPNDataObject::GetData( LPFORMATETC pFormatetc, LPSTGMEDIUM pmedium )
-{
+{	
     HRESULT hr = m_rIDataObjectOrg->GetData( pFormatetc, pmedium );
-
+    
     if (RPC_E_WRONG_THREAD == hr)
     {
         IDataObjectPtr pIDOTmp;
         hr = MarshalIDataObjectIntoCurrentApartment(&pIDOTmp);
 
         if (SUCCEEDED(hr))
-            hr = pIDOTmp->GetData(pFormatetc, pmedium);
+            hr = pIDOTmp->GetData(pFormatetc, pmedium);				
     }
     return hr;
 }
@@ -204,7 +204,7 @@ STDMETHODIMP CAPNDataObject::EnumFormatEtc( DWORD dwDirection, IEnumFORMATETC**
 
         if (SUCCEEDED(hr))
             hr = pIDOTmp->EnumFormatEtc(dwDirection, ppenumFormatetc);
-    }
+    }			
     return hr;
 }
 
@@ -217,12 +217,12 @@ STDMETHODIMP CAPNDataObject::QueryGetData( LPFORMATETC pFormatetc )
     HRESULT hr = m_rIDataObjectOrg->QueryGetData( pFormatetc );
 
     if (RPC_E_WRONG_THREAD == hr)
-    {
+    {	
         IDataObjectPtr pIDOTmp;
         hr = MarshalIDataObjectIntoCurrentApartment( &pIDOTmp );
 
         if (SUCCEEDED(hr))
-            hr = pIDOTmp->QueryGetData(pFormatetc);
+            hr = pIDOTmp->QueryGetData(pFormatetc);				
     }
     return hr;
 }
@@ -241,8 +241,8 @@ STDMETHODIMP CAPNDataObject::GetDataHere( LPFORMATETC pFormatetc, LPSTGMEDIUM pm
         hr = MarshalIDataObjectIntoCurrentApartment(&pIDOTmp);
 
         if (SUCCEEDED(hr))
-            hr = pIDOTmp->GetDataHere(pFormatetc, pmedium);
-    }
+            hr = pIDOTmp->GetDataHere(pFormatetc, pmedium);			
+    }	
     return hr;
 }
 
@@ -261,7 +261,7 @@ STDMETHODIMP CAPNDataObject::GetCanonicalFormatEtc(LPFORMATETC pFormatectIn, LPF
 
         if (SUCCEEDED(hr))
             hr = pIDOTmp->GetCanonicalFormatEtc(pFormatectIn, pFormatetcOut);
-    }
+    }	
     return hr;
 }
 
@@ -279,8 +279,8 @@ STDMETHODIMP CAPNDataObject::SetData( LPFORMATETC pFormatetc, LPSTGMEDIUM pmediu
         hr = MarshalIDataObjectIntoCurrentApartment(&pIDOTmp);
 
         if (SUCCEEDED(hr))
-            hr = pIDOTmp->SetData(pFormatetc, pmedium, fRelease);
-    }
+            hr = pIDOTmp->SetData(pFormatetc, pmedium, fRelease);				
+    }	
     return hr;
 }
 
@@ -298,8 +298,8 @@ STDMETHODIMP CAPNDataObject::DAdvise( LPFORMATETC pFormatetc, DWORD advf, LPADVI
         hr = MarshalIDataObjectIntoCurrentApartment(&pIDOTmp);
 
         if (SUCCEEDED(hr))
-            hr = pIDOTmp->DAdvise(pFormatetc, advf, pAdvSink, pdwConnection);
-    }
+            hr = pIDOTmp->DAdvise(pFormatetc, advf, pAdvSink, pdwConnection);			
+    }			
     return hr;
 }
 
@@ -317,8 +317,8 @@ STDMETHODIMP CAPNDataObject::DUnadvise( DWORD dwConnection )
         hr = MarshalIDataObjectIntoCurrentApartment(&pIDOTmp);
 
         if (SUCCEEDED(hr))
-            hr = pIDOTmp->DUnadvise(dwConnection);
-    }
+            hr = pIDOTmp->DUnadvise(dwConnection);			
+    }	
     return hr;
 }
 
@@ -336,8 +336,8 @@ STDMETHODIMP CAPNDataObject::EnumDAdvise( LPENUMSTATDATA * ppenumAdvise )
         hr = MarshalIDataObjectIntoCurrentApartment(&pIDOTmp);
 
         if (SUCCEEDED(hr))
-            hr = pIDOTmp->EnumDAdvise(ppenumAdvise);
-    }
+            hr = pIDOTmp->EnumDAdvise(ppenumAdvise);			
+    }	
     return hr;
 }
 
@@ -360,19 +360,19 @@ HRESULT CAPNDataObject::MarshalIDataObjectIntoCurrentApartment( IDataObject** pp
 
     *ppIDataObj = NULL;
     HRESULT hr = E_FAIL;
-
+    
     if (m_hGlobal)
     {
         IStreamPtr pStm;
         hr = CreateStreamOnHGlobal(m_hGlobal, KEEP_HGLOB_ON_RELEASE, &pStm);
-
+        
         OSL_ENSURE(E_INVALIDARG != hr, "CreateStreamOnHGlobal with invalid args called");
 
         if (SUCCEEDED(hr))
         {
-            hr = CoUnmarshalInterface(pStm.get(), __uuidof(IDataObject), (void**)ppIDataObj);
+            hr = CoUnmarshalInterface(pStm.get(), __uuidof(IDataObject), (void**)ppIDataObj);		    
             OSL_ENSURE(CO_E_NOTINITIALIZED != hr, "COM is not initialized");
         }
-    }
+    }    
     return hr;
 }
diff --git a/dtrans/source/win32/dtobj/APNDataObject.hxx b/dtrans/source/win32/dtobj/APNDataObject.hxx
index 990e38236e66..ce1714419d47 100644
--- a/dtrans/source/win32/dtobj/APNDataObject.hxx
+++ b/dtrans/source/win32/dtobj/APNDataObject.hxx
@@ -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
@@ -38,13 +38,13 @@
 /*
     an APartment Neutral dataobject wrapper; this wrapper of a IDataObject
     pointer can be used from any apartment without RPC_E_WRONG_THREAD
-    which normally occurs if an apartment tries to use an interface
+    which normally occurs if an apartment tries to use an interface 
     pointer of another apartment; we use containment to hold the original
     DataObject
 */
 class CAPNDataObject : public IDataObject
 {
-public:
+public:	
     CAPNDataObject( IDataObjectPtr rIDataObject );
     virtual ~CAPNDataObject( );
 
@@ -77,8 +77,8 @@ private:
 
 private:
     IDataObjectPtr  m_rIDataObjectOrg;
-    HGLOBAL         m_hGlobal;
-    LONG            m_nRefCnt;
+    HGLOBAL			m_hGlobal;
+    LONG			m_nRefCnt;
 
 // prevent copy and assignment
 private:
diff --git a/dtrans/source/win32/dtobj/DOTransferable.cxx b/dtrans/source/win32/dtobj/DOTransferable.cxx
index 951c3a69d291..706560705f99 100644
--- a/dtrans/source/win32/dtobj/DOTransferable.cxx
+++ b/dtrans/source/win32/dtobj/DOTransferable.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
@@ -70,7 +70,7 @@ using namespace com::sun::star::lang;
 using namespace com::sun::star::container;
 
 //------------------------------------------------------------------------
-//
+// 
 //------------------------------------------------------------------------
 
 namespace
@@ -82,7 +82,7 @@ namespace
     sal_Bool isValidFlavor( const DataFlavor& aFlavor )
     {
         return ( aFlavor.MimeType.getLength( ) &&
-                 ( ( aFlavor.DataType ==  CPPUTYPE_SEQINT8 ) ||
+                 ( ( aFlavor.DataType ==  CPPUTYPE_SEQINT8 ) || 
                  ( aFlavor.DataType == CPPUTYPE_OUSTRING ) ) );
     }
 
@@ -93,21 +93,21 @@ namespace
 // ctor
 //------------------------------------------------------------------------
 
-CDOTransferable::CDOTransferable(
+CDOTransferable::CDOTransferable( 
     const Reference< XMultiServiceFactory >& ServiceManager, IDataObjectPtr rDataObject ) :
     m_rDataObject( rDataObject ),
     m_SrvMgr( ServiceManager ),
     m_DataFormatTranslator( m_SrvMgr ),
     m_bUnicodeRegistered( sal_False ),
     m_TxtFormatOnClipboard( CF_INVALID )
-{
+{			
 }
 
 //------------------------------------------------------------------------
-//
+// 
 //------------------------------------------------------------------------
 
-Any SAL_CALL CDOTransferable::getTransferData( const DataFlavor& aFlavor )
+Any SAL_CALL CDOTransferable::getTransferData( const DataFlavor& aFlavor ) 
         throw( UnsupportedFlavorException, IOException, RuntimeException )
 {
     OSL_ASSERT( isValidFlavor( aFlavor ) );
@@ -122,21 +122,21 @@ Any SAL_CALL CDOTransferable::getTransferData( const DataFlavor& aFlavor )
     OSL_ASSERT( CF_INVALID != fetc.getClipformat() );
 
     //------------------------------------------------
-    //  get the data from clipboard in a byte stream
+    //	get the data from clipboard in a byte stream
     //------------------------------------------------
-
+    
     ByteSequence_t clipDataStream;
-
+    
     try
     {
         clipDataStream = getClipboardData( fetc );
     }
     catch( UnsupportedFlavorException& )
     {
-        if ( m_DataFormatTranslator.isUnicodeTextFormat( fetc.getClipformat( ) ) &&
+        if ( m_DataFormatTranslator.isUnicodeTextFormat( fetc.getClipformat( ) ) && 
              m_bUnicodeRegistered )
         {
-             OUString aUnicodeText = synthesizeUnicodeText( );
+             OUString aUnicodeText = synthesizeUnicodeText( );		
              Any aAny = makeAny( aUnicodeText );
              return aAny;
         }
@@ -155,19 +155,19 @@ Any SAL_CALL CDOTransferable::getTransferData( const DataFlavor& aFlavor )
 // getTransferDataFlavors
 //------------------------------------------------------------------------
 
-Sequence< DataFlavor > SAL_CALL CDOTransferable::getTransferDataFlavors(  )
+Sequence< DataFlavor > SAL_CALL CDOTransferable::getTransferDataFlavors(  ) 
     throw( RuntimeException )
-{
-    return m_FlavorList;
+{		
+    return m_FlavorList;	
 }
 
 //------------------------------------------------------------------------
 // isDataFlavorSupported
-// returns true if we find a DataFlavor with the same MimeType and
+// returns true if we find a DataFlavor with the same MimeType and 
 // DataType
 //------------------------------------------------------------------------
 
-sal_Bool SAL_CALL CDOTransferable::isDataFlavorSupported( const DataFlavor& aFlavor )
+sal_Bool SAL_CALL CDOTransferable::isDataFlavorSupported( const DataFlavor& aFlavor ) 
     throw( RuntimeException )
 {
     OSL_ASSERT( isValidFlavor( aFlavor ) );
@@ -182,7 +182,7 @@ sal_Bool SAL_CALL CDOTransferable::isDataFlavorSupported( const DataFlavor& aFla
 //------------------------------------------------------------------------
 // helper function
 // the list of datafalvors currently on the clipboard will be initialized
-// only once; if the client of this Transferable will hold a reference
+// only once; if the client of this Transferable will hold a reference 
 // to it und the underlying clipboard content changes, the client does
 // possible operate on a invalid list
 // if there is only text on the clipboard we will also offer unicode text
@@ -198,7 +198,7 @@ void SAL_CALL CDOTransferable::initFlavorList( )
     if ( SUCCEEDED( hr ) )
     {
         pEnumFormatEtc->Reset( );
-
+        
         FORMATETC fetc;
         while ( S_FALSE != pEnumFormatEtc->Next( 1, &fetc, NULL ) )
         {
@@ -207,9 +207,9 @@ void SAL_CALL CDOTransferable::initFlavorList( )
             // we don't offer this format
             if ( CF_LOCALE == fetc.cfFormat )
                 continue;
-
-            DataFlavor aFlavor = formatEtcToDataFlavor( fetc );
-
+            
+            DataFlavor aFlavor = formatEtcToDataFlavor( fetc );													
+            
             // if text or oemtext is offered we also pretend to have unicode text
             if ( m_DataFormatTranslator.isOemOrAnsiTextFormat( fetc.cfFormat ) &&
                  !m_bUnicodeRegistered )
@@ -220,7 +220,7 @@ void SAL_CALL CDOTransferable::initFlavorList( )
                 m_bUnicodeRegistered   = sal_True;
 
                 // register unicode text as accompany format
-                aFlavor = formatEtcToDataFlavor(
+                aFlavor = formatEtcToDataFlavor( 
                     m_DataFormatTranslator.getFormatEtcForClipformat( CF_UNICODETEXT ) );
                 addSupportedFlavor( aFlavor );
             }
@@ -234,12 +234,12 @@ void SAL_CALL CDOTransferable::initFlavorList( )
 
             // see MSDN IEnumFORMATETC
             CoTaskMemFree( fetc.ptd );
-        }
-    }
+        } 		 
+    }	
 }
 
 //------------------------------------------------------------------------
-//
+// 
 //------------------------------------------------------------------------
 
 inline
@@ -256,20 +256,20 @@ void SAL_CALL CDOTransferable::addSupportedFlavor( const DataFlavor& aFlavor )
 }
 
 //------------------------------------------------------------------------
-// helper function
+// helper function 
 //------------------------------------------------------------------------
 
 //inline
 DataFlavor SAL_CALL CDOTransferable::formatEtcToDataFlavor( const FORMATETC& aFormatEtc )
-{
+{	
     DataFlavor aFlavor;
     LCID lcid = 0;
-
+    
     // for non-unicode text format we must provid a locale to get
     // the character-set of the text, if there is no locale on the
     // clipboard we assume the text is in a charset appropriate for
     // the current thread locale
-    if ( (CF_TEXT == aFormatEtc.cfFormat) || (CF_OEMTEXT == aFormatEtc.cfFormat) )
+    if ( (CF_TEXT == aFormatEtc.cfFormat) || (CF_OEMTEXT == aFormatEtc.cfFormat) )		
         lcid = getLocaleFromClipboard( );
 
     return m_DataFormatTranslator.getDataFlavorFromFormatEtc( aFormatEtc, lcid );
@@ -280,22 +280,22 @@ DataFlavor SAL_CALL CDOTransferable::formatEtcToDataFlavor( const FORMATETC& aFo
 // clipboard the function returns the current thread locale
 //------------------------------------------------------------------------
 
-LCID SAL_CALL CDOTransferable::getLocaleFromClipboard( )
+LCID SAL_CALL CDOTransferable::getLocaleFromClipboard( ) 
 {
     LCID lcid = GetThreadLocale( );
 
     try
-    {
+    {		
         CFormatEtc fetc = m_DataFormatTranslator.getFormatEtcForClipformat( CF_LOCALE );
         ByteSequence_t aLCIDSeq = getClipboardData( fetc );
         lcid = *(reinterpret_cast<LCID*>( aLCIDSeq.getArray( ) ) );
-
-        // because of a Win95/98 Bug; there the high word
+            
+        // because of a Win95/98 Bug; there the high word 
         // of a locale has the same value as the
         // low word e.g. 0x07040704 that's not right
         // correct is 0x00000704
-        lcid &= 0x0000FFFF;
-    }
+        lcid &= 0x0000FFFF; 
+    }	
     catch(...)
     {
         // we take the default locale
@@ -311,27 +311,27 @@ LCID SAL_CALL CDOTransferable::getLocaleFromClipboard( )
 //------------------------------------------------------------------------
 
 CDOTransferable::ByteSequence_t SAL_CALL CDOTransferable::getClipboardData( CFormatEtc& aFormatEtc )
-{
+{	
     STGMEDIUM stgmedium;
     HRESULT hr = m_rDataObject->GetData( aFormatEtc, &stgmedium );
-
+    
     // in case of failure to get a WMF metafile handle, try to get a memory block
-    if( FAILED( hr ) &&
-        ( CF_METAFILEPICT == aFormatEtc.getClipformat() ) &&
+    if( FAILED( hr ) && 
+        ( CF_METAFILEPICT == aFormatEtc.getClipformat() ) && 
         ( TYMED_MFPICT == aFormatEtc.getTymed() ) )
     {
         CFormatEtc aTempFormat( aFormatEtc );
         aTempFormat.setTymed( TYMED_HGLOBAL );
         hr = m_rDataObject->GetData( aTempFormat, &stgmedium );
     }
-
-    if ( FAILED( hr ) )
+        
+    if ( FAILED( hr ) ) 
     {
-        OSL_ASSERT( (hr != E_INVALIDARG) &&
+        OSL_ASSERT( (hr != E_INVALIDARG) && 
                     (hr != DV_E_DVASPECT) &&
                     (hr != DV_E_LINDEX) &&
                     (hr != DV_E_TYMED) );
-
+        
         if ( DV_E_FORMATETC == hr )
             throw UnsupportedFlavorException( );
         else if ( STG_E_MEDIUMFULL == hr )
@@ -339,61 +339,61 @@ CDOTransferable::ByteSequence_t SAL_CALL CDOTransferable::getClipboardData( CFor
         else
             throw RuntimeException( );
     }
-
+    
     ByteSequence_t byteStream;
 
     try
-    {
+    {	
         if ( CF_ENHMETAFILE == aFormatEtc.getClipformat() )
-            byteStream = WinENHMFPictToOOMFPict( stgmedium.hEnhMetaFile );
+            byteStream = WinENHMFPictToOOMFPict( stgmedium.hEnhMetaFile );        		
         else if (CF_HDROP == aFormatEtc.getClipformat())
-            byteStream = CF_HDROPToFileList(stgmedium.hGlobal);
+            byteStream = CF_HDROPToFileList(stgmedium.hGlobal);        
         else
         {
             clipDataToByteStream( aFormatEtc.getClipformat( ), stgmedium, byteStream );
-
+            
             // format conversion if necessary
             if ( CF_DIB == aFormatEtc.getClipformat() )
                 byteStream = WinDIBToOOBMP( byteStream );
             else if ( CF_METAFILEPICT == aFormatEtc.getClipformat() )
-                byteStream = WinMFPictToOOMFPict( byteStream );
+                byteStream = WinMFPictToOOMFPict( byteStream );			
         }
 
         ReleaseStgMedium( &stgmedium );
     }
     catch( CStgTransferHelper::CStgTransferException& )
-    {
+    {		
         ReleaseStgMedium( &stgmedium );
         throw IOException( );
-    }
+    }	
 
     return byteStream;
 }
 
 //------------------------------------------------------------------------
-//
+// 
 //------------------------------------------------------------------------
 
 OUString SAL_CALL CDOTransferable::synthesizeUnicodeText( )
-{
+{	
     ByteSequence_t aTextSequence;
-    CFormatEtc     fetc;
-    LCID           lcid = getLocaleFromClipboard( );
-    sal_uInt32     cpForTxtCnvt = 0;
-
+    CFormatEtc	   fetc;
+    LCID		   lcid = getLocaleFromClipboard( );
+    sal_uInt32	   cpForTxtCnvt = 0;
+    
     if ( CF_TEXT == m_TxtFormatOnClipboard )
     {
         fetc = m_DataFormatTranslator.getFormatEtcForClipformat( CF_TEXT );
         aTextSequence = getClipboardData( fetc );
-
+        
         // determine the codepage used for text conversion
-        cpForTxtCnvt = getWinCPFromLocaleId( lcid, LOCALE_IDEFAULTANSICODEPAGE ).toInt32( );
+        cpForTxtCnvt = getWinCPFromLocaleId( lcid, LOCALE_IDEFAULTANSICODEPAGE ).toInt32( );		
     }
     else if ( CF_OEMTEXT == m_TxtFormatOnClipboard )
     {
         fetc = m_DataFormatTranslator.getFormatEtcForClipformat( CF_OEMTEXT );
         aTextSequence = getClipboardData( fetc );
-
+        
         // determine the codepage used for text conversion
         cpForTxtCnvt = getWinCPFromLocaleId( lcid, LOCALE_IDEFAULTCODEPAGE ).toInt32( );
     }
@@ -408,15 +408,15 @@ OUString SAL_CALL CDOTransferable::synthesizeUnicodeText( )
                            sal::static_int_cast<sal_uInt32>(-1), // Huh ?
                            stgTransferHelper,
                            sal_False);
-
-    CRawHGlobalPtr  ptrHGlob(stgTransferHelper);
-    sal_Unicode*    pWChar = reinterpret_cast<sal_Unicode*>(ptrHGlob.GetMemPtr());
-
+    
+    CRawHGlobalPtr	ptrHGlob(stgTransferHelper);
+    sal_Unicode*	pWChar = reinterpret_cast<sal_Unicode*>(ptrHGlob.GetMemPtr());
+    
     return OUString(pWChar);
 }
 
 //------------------------------------------------------------------------
-//
+// 
 //------------------------------------------------------------------------
 
 void CDOTransferable::clipDataToByteStream( CLIPFORMAT cf, STGMEDIUM stgmedium, ByteSequence_t& aByteSequence )
@@ -447,25 +447,25 @@ void CDOTransferable::clipDataToByteStream( CLIPFORMAT cf, STGMEDIUM stgmedium,
         throw UnsupportedFlavorException( );
         break;
     }
-
+    
     int nMemSize = memTransferHelper.memSize( cf );
     aByteSequence.realloc( nMemSize );
-    memTransferHelper.read( aByteSequence.getArray( ), nMemSize );
+    memTransferHelper.read( aByteSequence.getArray( ), nMemSize );	
 }
 
 //------------------------------------------------------------------------
-//
+// 
 //------------------------------------------------------------------------
 
-inline
+inline 
 Any CDOTransferable::byteStreamToAny( ByteSequence_t& aByteStream, const Type& aRequestedDataType )
-{
+{	
     Any aAny;
 
-    if ( aRequestedDataType == CPPUTYPE_OUSTRING )
-    {
+    if ( aRequestedDataType == CPPUTYPE_OUSTRING )	
+    {		
         OUString str = byteStreamToOUString( aByteStream );
-        aAny = makeAny( str );
+        aAny = makeAny(	str );
     }
     else
         aAny = makeAny( aByteStream );
@@ -474,17 +474,17 @@ Any CDOTransferable::byteStreamToAny( ByteSequence_t& aByteStream, const Type& a
 }
 
 //------------------------------------------------------------------------
-//
+// 
 //------------------------------------------------------------------------
 
-inline
+inline 
 OUString CDOTransferable::byteStreamToOUString( ByteSequence_t& aByteStream )
 {
     sal_Int32 nWChars;
     sal_Int32 nMemSize = aByteStream.getLength( );
 
     // if there is a trailing L"\0" substract 1 from length
-    if ( 0 == aByteStream[ aByteStream.getLength( ) - 2 ] &&
+    if ( 0 == aByteStream[ aByteStream.getLength( ) - 2 ] && 
          0 == aByteStream[ aByteStream.getLength( ) - 1 ] )
         nWChars = static_cast< sal_Int32 >( nMemSize / sizeof( sal_Unicode ) ) - 1;
     else
@@ -494,15 +494,15 @@ OUString CDOTransferable::byteStreamToOUString( ByteSequence_t& aByteStream )
 }
 
 //------------------------------------------------------------------------
-//
+// 
 //------------------------------------------------------------------------
 
-sal_Bool SAL_CALL CDOTransferable::compareDataFlavors(
+sal_Bool SAL_CALL CDOTransferable::compareDataFlavors( 
     const DataFlavor& lhs, const DataFlavor& rhs )
 {
     if ( !m_rXMimeCntFactory.is( ) )
     {
-        m_rXMimeCntFactory = Reference< XMimeContentTypeFactory >( m_SrvMgr->createInstance(
+        m_rXMimeCntFactory = Reference< XMimeContentTypeFactory >( m_SrvMgr->createInstance( 
             OUString::createFromAscii( "com.sun.star.datatransfer.MimeContentTypeFactory" ) ), UNO_QUERY );
     }
     OSL_ASSERT( m_rXMimeCntFactory.is( ) );
@@ -529,20 +529,20 @@ sal_Bool SAL_CALL CDOTransferable::compareDataFlavors(
 }
 
 //------------------------------------------------------------------------
-//
+// 
 //------------------------------------------------------------------------
 
-sal_Bool SAL_CALL CDOTransferable::cmpFullMediaType(
+sal_Bool SAL_CALL CDOTransferable::cmpFullMediaType( 
     const Reference< XMimeContentType >& xLhs, const Reference< XMimeContentType >& xRhs ) const
 {
     return xLhs->getFullMediaType().equalsIgnoreAsciiCase( xRhs->getFullMediaType( ) );
 }
 
 //------------------------------------------------------------------------
-//
+// 
 //------------------------------------------------------------------------
 
-sal_Bool SAL_CALL CDOTransferable::cmpAllContentTypeParameter(
+sal_Bool SAL_CALL CDOTransferable::cmpAllContentTypeParameter( 
     const Reference< XMimeContentType >& xLhs, const Reference< XMimeContentType >& xRhs ) const
 {
     Sequence< OUString > xLhsFlavors = xLhs->getParameters( );
@@ -557,7 +557,7 @@ sal_Bool SAL_CALL CDOTransferable::cmpAllContentTypeParameter(
             OUString pRhs;
 
             for ( sal_Int32 i = 0; i < xLhsFlavors.getLength( ); i++ )
-            {
+            {	
                 pLhs = xLhs->getParameterValue( xLhsFlavors[i] );
                 pRhs = xRhs->getParameterValue( xLhsFlavors[i] );
 
@@ -595,11 +595,11 @@ sal_Bool SAL_CALL CDOTransferable::cmpAllContentTypeParameter(
     {
         if (m_rDataObject.is())
         {
-            IDataObject* pObj= m_rDataObject.get();
+            IDataObject* pObj= m_rDataObject.get(); 
             pObj->AddRef();
             retVal.setValue( &pObj, getCppuType((sal_uInt32*)0));
         }
     }
     return retVal;
 }
-
+        
diff --git a/dtrans/source/win32/dtobj/DOTransferable.hxx b/dtrans/source/win32/dtobj/DOTransferable.hxx
index dd99e857b908..6694af6d3292 100644
--- a/dtrans/source/win32/dtobj/DOTransferable.hxx
+++ b/dtrans/source/win32/dtobj/DOTransferable.hxx
@@ -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
@@ -63,25 +63,25 @@ public:
     // XTransferable
     //------------------------------------------------------------------------
 
-    virtual ::com::sun::star::uno::Any SAL_CALL getTransferData( const ::com::sun::star::datatransfer::DataFlavor& aFlavor )
+    virtual ::com::sun::star::uno::Any SAL_CALL getTransferData( const ::com::sun::star::datatransfer::DataFlavor& aFlavor ) 
         throw( ::com::sun::star::datatransfer::UnsupportedFlavorException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException );
 
-    virtual ::com::sun::star::uno::Sequence< ::com::sun::star::datatransfer::DataFlavor > SAL_CALL getTransferDataFlavors(  )
+    virtual ::com::sun::star::uno::Sequence< ::com::sun::star::datatransfer::DataFlavor > SAL_CALL getTransferDataFlavors(  ) 
         throw( ::com::sun::star::uno::RuntimeException );
-
-    virtual sal_Bool SAL_CALL isDataFlavorSupported( const ::com::sun::star::datatransfer::DataFlavor& aFlavor )
+    
+    virtual sal_Bool SAL_CALL isDataFlavorSupported( const ::com::sun::star::datatransfer::DataFlavor& aFlavor ) 
         throw( ::com::sun::star::uno::RuntimeException );
     //------------------------------------------------------------------------
     // XSystemTransferable
     //------------------------------------------------------------------------
     virtual ::com::sun::star::uno::Any SAL_CALL getData( const com::sun::star::uno::Sequence<sal_Int8>& aProcessId  ) throw
     (::com::sun::star::uno::RuntimeException);
-
+    
 
 private:
     // should be created only by CDTransObjFactory
-    explicit CDOTransferable(
-        const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& ServiceManager,
+    explicit CDOTransferable( 
+        const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& ServiceManager, 
         IDataObjectPtr rDataObject );
 
     //------------------------------------------------------------------------
@@ -89,38 +89,38 @@ private:
     //------------------------------------------------------------------------
 
     void SAL_CALL initFlavorList( );
-
-    void SAL_CALL addSupportedFlavor( const com::sun::star::datatransfer::DataFlavor& aFlavor );
+    
+    void SAL_CALL addSupportedFlavor( const com::sun::star::datatransfer::DataFlavor& aFlavor );	
     com::sun::star::datatransfer::DataFlavor SAL_CALL formatEtcToDataFlavor( const FORMATETC& aFormatEtc );
 
     ByteSequence_t SAL_CALL getClipboardData( CFormatEtc& aFormatEtc );
     rtl::OUString  SAL_CALL synthesizeUnicodeText( );
 
-    void SAL_CALL clipDataToByteStream( CLIPFORMAT cf, STGMEDIUM stgmedium, ByteSequence_t& aByteSequence );
-
+    void SAL_CALL clipDataToByteStream( CLIPFORMAT cf, STGMEDIUM stgmedium, ByteSequence_t& aByteSequence );	
+    
     ::com::sun::star::uno::Any SAL_CALL byteStreamToAny( ByteSequence_t& aByteStream, const com::sun::star::uno::Type& aRequestedDataType );
-    rtl::OUString              SAL_CALL byteStreamToOUString( ByteSequence_t& aByteStream );
-
+    rtl::OUString              SAL_CALL byteStreamToOUString( ByteSequence_t& aByteStream );	
+    
     LCID SAL_CALL getLocaleFromClipboard( );
 
     sal_Bool SAL_CALL compareDataFlavors( const com::sun::star::datatransfer::DataFlavor& lhs,
                                           const com::sun::star::datatransfer::DataFlavor& rhs );
 
-    sal_Bool SAL_CALL cmpFullMediaType( const com::sun::star::uno::Reference< com::sun::star::datatransfer::XMimeContentType >& xLhs,
+    sal_Bool SAL_CALL cmpFullMediaType( const com::sun::star::uno::Reference< com::sun::star::datatransfer::XMimeContentType >& xLhs, 
                                         const com::sun::star::uno::Reference< com::sun::star::datatransfer::XMimeContentType >& xRhs ) const;
 
-    sal_Bool SAL_CALL cmpAllContentTypeParameter( const com::sun::star::uno::Reference< com::sun::star::datatransfer::XMimeContentType >& xLhs,
+    sal_Bool SAL_CALL cmpAllContentTypeParameter( const com::sun::star::uno::Reference< com::sun::star::datatransfer::XMimeContentType >& xLhs, 
                                         const com::sun::star::uno::Reference< com::sun::star::datatransfer::XMimeContentType >& xRhs ) const;
 
 private:
-    IDataObjectPtr                                                                          m_rDataObject;
-    com::sun::star::uno::Sequence< com::sun::star::datatransfer::DataFlavor >               m_FlavorList;
-    const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >  m_SrvMgr;
-    CDataFormatTranslator                                                                   m_DataFormatTranslator;
+    IDataObjectPtr																			m_rDataObject;
+    com::sun::star::uno::Sequence< com::sun::star::datatransfer::DataFlavor >				m_FlavorList;	
+    const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >	m_SrvMgr;
+    CDataFormatTranslator																	m_DataFormatTranslator;
     com::sun::star::uno::Reference< com::sun::star::datatransfer::XMimeContentTypeFactory > m_rXMimeCntFactory;
-    ::osl::Mutex                                                                            m_aMutex;
-    sal_Bool                                                                                m_bUnicodeRegistered;
-    CLIPFORMAT                                                                              m_TxtFormatOnClipboard;
+    ::osl::Mutex																			m_aMutex;
+    sal_Bool																				m_bUnicodeRegistered;
+    CLIPFORMAT																				m_TxtFormatOnClipboard;
 
 // non supported operations
 private:
diff --git a/dtrans/source/win32/dtobj/DTransHelper.cxx b/dtrans/source/win32/dtobj/DTransHelper.cxx
index 30370fdaf3c8..7a90ea2a82ff 100644
--- a/dtrans/source/win32/dtobj/DTransHelper.cxx
+++ b/dtrans/source/win32/dtobj/DTransHelper.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
diff --git a/dtrans/source/win32/dtobj/DTransHelper.hxx b/dtrans/source/win32/dtobj/DTransHelper.hxx
index 7975b84eec57..f0118e4dd0a5 100644
--- a/dtrans/source/win32/dtobj/DTransHelper.hxx
+++ b/dtrans/source/win32/dtobj/DTransHelper.hxx
@@ -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
@@ -74,9 +74,9 @@ public:
     };
 
 public:
-    CStgTransferHelper(
-        sal_Bool bAutoInit = sal_False,
-        HGLOBAL  hGlob = NULL,
+    CStgTransferHelper( 
+        sal_Bool bAutoInit = sal_False, 
+        HGLOBAL  hGlob = NULL, 
         sal_Bool bDelStgOnRelease = sal_False );
 
     ~CStgTransferHelper( );
@@ -87,25 +87,25 @@ public:
     HGLOBAL SAL_CALL getHGlobal( ) const;
     void    SAL_CALL getIStream( LPSTREAM* ppStream );
 
-    void SAL_CALL init(
-        SIZE_T newSize,
-        sal_uInt32 uiFlags = GHND,
+    void SAL_CALL init( 
+        SIZE_T newSize, 
+        sal_uInt32 uiFlags = GHND, 
         sal_Bool bDelStgOnRelease = sal_False );
 
-    void SAL_CALL init(
-        HGLOBAL hGlob,
+    void SAL_CALL init( 
+        HGLOBAL hGlob, 
         sal_Bool bDelStgOnRelease = sal_False );
 
     // returns the size of the managed memory
     sal_uInt32 SAL_CALL memSize( CLIPFORMAT cf = CF_INVALID ) const;
-
-    // free the global memory and necessary
+    
+    // free the global memory and necessary 
     // release the internal stream pointer
     void SAL_CALL cleanup( );
 
 private:
     LPSTREAM m_lpStream;
-    sal_Bool m_bDelStgOnRelease;
+    sal_Bool m_bDelStgOnRelease;	
 
 private:
     CStgTransferHelper( const CStgTransferHelper& );
@@ -114,7 +114,7 @@ private:
 
 //-------------------------------------------------------------------------
 // something like an auto-pointer - allows access to the memory belonging
-// to a HGLOBAL and automatically unlocks a global memory at destruction
+// to a HGLOBAL and automatically unlocks a global memory at destruction 
 // time
 //-------------------------------------------------------------------------
 
@@ -132,7 +132,7 @@ public:
         m_pGlobMem( NULL )
     {
     }
-
+    
 
     //---------------------------------------------
     // ctor
@@ -156,7 +156,7 @@ public:
     }
 
     //---------------------------------------------
-    // lock the global memory (initializes a
+    // lock the global memory (initializes a 
     // pointer to this memory)
     //---------------------------------------------
 
@@ -181,17 +181,17 @@ public:
         GlobalUnlock( m_hGlob );
         m_bIsLocked = FALSE;
         m_pGlobMem = NULL;
-
+        
         return ( NO_ERROR == GetLastError( ) );
     }
 
     //---------------------------------------------
-    // locks the global memory and returns a
+    // locks the global memory and returns a 
     // pointer to this memory
     //---------------------------------------------
 
     LPVOID GetMemPtr( )
-    {
+    {		
         Lock( );
         return m_pGlobMem;
     }
diff --git a/dtrans/source/win32/dtobj/DataFmtTransl.cxx b/dtrans/source/win32/dtobj/DataFmtTransl.cxx
index f72e8bb714a7..7db538d0d3e4 100644
--- a/dtrans/source/win32/dtobj/DataFmtTransl.cxx
+++ b/dtrans/source/win32/dtobj/DataFmtTransl.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
@@ -54,7 +54,7 @@
 #if defined _MSC_VER
 #pragma warning(pop)
 #endif
-
+ 
 
 //------------------------------------------------------------------------
 // namespace directives
@@ -83,22 +83,22 @@ const OUString HTML_FORMAT_NAME_WINDOWS = OUString::createFromAscii( "HTML Forma
 const OUString HTML_FORMAT_NAME_SOFFICE = OUString::createFromAscii( "HTML (HyperText Markup Language)" );
 
 //------------------------------------------------------------------------
-//
+// 
 //------------------------------------------------------------------------
 
 CDataFormatTranslator::CDataFormatTranslator( const Reference< XMultiServiceFactory >& aServiceManager ) :
     m_SrvMgr( aServiceManager )
 {
     m_XDataFormatTranslator = Reference< XDataFormatTranslator >(
-        m_SrvMgr->createInstance( OUString::createFromAscii( "com.sun.star.datatransfer.DataFormatTranslator" ) ), UNO_QUERY );
+        m_SrvMgr->createInstance( OUString::createFromAscii( "com.sun.star.datatransfer.DataFormatTranslator" ) ), UNO_QUERY );	
 }
 
 //------------------------------------------------------------------------
-//
+// 
 //------------------------------------------------------------------------
 
 CFormatEtc CDataFormatTranslator::getFormatEtcFromDataFlavor( const DataFlavor& aDataFlavor ) const
-{
+{	
     sal_Int32 cf = CF_INVALID;
 
     try
@@ -106,21 +106,21 @@ CFormatEtc CDataFormatTranslator::getFormatEtcFromDataFlavor( const DataFlavor&
         if( m_XDataFormatTranslator.is( ) )
         {
             Any aFormat = m_XDataFormatTranslator->getSystemDataTypeFromDataFlavor( aDataFlavor );
-
+            
             if ( aFormat.hasValue( ) )
             {
                 if ( aFormat.getValueType( ) == CPPUTYPE_SALINT32 )
                 {
-                    aFormat >>= cf;
+                    aFormat >>= cf;	
                     OSL_ENSURE( CF_INVALID != cf, "Invalid Clipboard format delivered" );
                 }
                 else if ( aFormat.getValueType( ) == CPPUTYPE_OUSTRING )
                 {
                     OUString aClipFmtName;
                     aFormat >>= aClipFmtName;
-
+            
                     OSL_ASSERT( aClipFmtName.getLength( ) );
-                    cf = RegisterClipboardFormatW( reinterpret_cast<LPCWSTR>(aClipFmtName.getStr( )) );
+                    cf = RegisterClipboardFormatW( reinterpret_cast<LPCWSTR>(aClipFmtName.getStr( )) );			
 
                     OSL_ENSURE( CF_INVALID != cf, "RegisterClipboardFormat failed" );
                 }
@@ -138,13 +138,13 @@ CFormatEtc CDataFormatTranslator::getFormatEtcFromDataFlavor( const DataFlavor&
 }
 
 //------------------------------------------------------------------------
-//
+// 
 //------------------------------------------------------------------------
 
 DataFlavor CDataFormatTranslator::getDataFlavorFromFormatEtc( const FORMATETC& aFormatEtc, LCID lcid ) const
 {
     DataFlavor aFlavor;
-
+   
     try
     {
         CLIPFORMAT aClipformat = aFormatEtc.cfFormat;
@@ -153,12 +153,12 @@ DataFlavor CDataFormatTranslator::getDataFlavorFromFormatEtc( const FORMATETC& a
         aAny <<= static_cast< sal_Int32 >( aClipformat );
 
         if ( isOemOrAnsiTextFormat( aClipformat ) )
-        {
+        {	
             aFlavor.MimeType             = TEXT_PLAIN_CHARSET;
             aFlavor.MimeType            += getTextCharsetFromLCID( lcid, aClipformat );
 
             aFlavor.HumanPresentableName = HPNAME_OEM_ANSI_TEXT;
-            aFlavor.DataType             = CPPUTYPE_SEQSALINT8;
+            aFlavor.DataType             = CPPUTYPE_SEQSALINT8;			
         }
         else if ( CF_INVALID != aClipformat )
         {
@@ -172,7 +172,7 @@ DataFlavor CDataFormatTranslator::getDataFlavorFromFormatEtc( const FORMATETC& a
                     // failed, so we try to resolve via clipboard
                     // format name
                     OUString clipFormatName = getClipboardFormatName( aClipformat );
-
+                    
                     // if we could not get a clipboard format name an
                     // error must have occured or it is a standard
                     // clipboard format that we don't translate, e.g.
@@ -195,7 +195,7 @@ DataFlavor CDataFormatTranslator::getDataFlavorFromFormatEtc( const FORMATETC& a
 }
 
 //------------------------------------------------------------------------
-//
+// 
 //------------------------------------------------------------------------
 
 CFormatEtc SAL_CALL CDataFormatTranslator::getFormatEtcForClipformatName( const OUString& aClipFmtName ) const
@@ -209,7 +209,7 @@ CFormatEtc SAL_CALL CDataFormatTranslator::getFormatEtcForClipformatName( const
 }
 
 //------------------------------------------------------------------------
-//
+// 
 //------------------------------------------------------------------------
 
 OUString CDataFormatTranslator::getClipboardFormatName( CLIPFORMAT aClipformat ) const
@@ -223,7 +223,7 @@ OUString CDataFormatTranslator::getClipboardFormatName( CLIPFORMAT aClipformat )
 }
 
 //------------------------------------------------------------------------
-//
+// 
 //------------------------------------------------------------------------
 
 CFormatEtc SAL_CALL CDataFormatTranslator::getFormatEtcForClipformat( CLIPFORMAT cf ) const
@@ -246,10 +246,10 @@ CFormatEtc SAL_CALL CDataFormatTranslator::getFormatEtcForClipformat( CLIPFORMAT
 
     /*
         hack: in order to paste urls copied by Internet Explorer
-        with "copy link" we set the lindex member to 0
+        with "copy link" we set the lindex member to 0 
         but if we really want to support CFSTR_FILECONTENT and
         the accompany format CFSTR_FILEDESCRIPTOR (FileGroupDescriptor)
-        the client of the clipboard service has to provide a id
+        the client of the clipboard service has to provide a id 
         of which FileContents it wants to paste
         see MSDN: "Handling Shell Data Transfer Scenarios"
     */
@@ -260,7 +260,7 @@ CFormatEtc SAL_CALL CDataFormatTranslator::getFormatEtcForClipformat( CLIPFORMAT
 }
 
 //------------------------------------------------------------------------
-//
+// 
 //------------------------------------------------------------------------
 
 sal_Bool SAL_CALL CDataFormatTranslator::isOemOrAnsiTextFormat( CLIPFORMAT cf ) const
@@ -269,7 +269,7 @@ sal_Bool SAL_CALL CDataFormatTranslator::isOemOrAnsiTextFormat( CLIPFORMAT cf )
 }
 
 //------------------------------------------------------------------------
-//
+// 
 //------------------------------------------------------------------------
 
 sal_Bool SAL_CALL CDataFormatTranslator::isUnicodeTextFormat( CLIPFORMAT cf ) const
@@ -278,16 +278,16 @@ sal_Bool SAL_CALL CDataFormatTranslator::isUnicodeTextFormat( CLIPFORMAT cf ) co
 }
 
 //------------------------------------------------------------------------
-//
+// 
 //------------------------------------------------------------------------
 
-sal_Bool SAL_CALL CDataFormatTranslator::isTextFormat( CLIPFORMAT cf ) const
+sal_Bool SAL_CALL CDataFormatTranslator::isTextFormat( CLIPFORMAT cf ) const 
 {
     return ( isOemOrAnsiTextFormat( cf ) || isUnicodeTextFormat( cf ) );
 }
 
 //------------------------------------------------------------------------
-//
+// 
 //------------------------------------------------------------------------
 
 sal_Bool SAL_CALL CDataFormatTranslator::isHTMLFormat( CLIPFORMAT cf ) const
@@ -297,17 +297,17 @@ sal_Bool SAL_CALL CDataFormatTranslator::isHTMLFormat( CLIPFORMAT cf ) const
 }
 
 //------------------------------------------------------------------------
-//
+// 
 //------------------------------------------------------------------------
 
 sal_Bool SAL_CALL CDataFormatTranslator::isTextHtmlFormat( CLIPFORMAT cf ) const
 {
-    OUString clipFormatName = getClipboardFormatName( cf );
+    OUString clipFormatName = getClipboardFormatName( cf );	
     return ( clipFormatName.equalsIgnoreAsciiCase( HTML_FORMAT_NAME_SOFFICE ) );
 }
 
 //------------------------------------------------------------------------
-//
+// 
 //------------------------------------------------------------------------
 
 OUString SAL_CALL CDataFormatTranslator::getTextCharsetFromLCID( LCID lcid, CLIPFORMAT aClipformat ) const
@@ -316,21 +316,21 @@ OUString SAL_CALL CDataFormatTranslator::getTextCharsetFromLCID( LCID lcid, CLIP
 
     OUString charset;
     if ( CF_TEXT == aClipformat )
-    {
-        charset = getMimeCharsetFromLocaleId(
-                    lcid,
-                    LOCALE_IDEFAULTANSICODEPAGE,
+    {							
+        charset = getMimeCharsetFromLocaleId( 
+                    lcid, 
+                    LOCALE_IDEFAULTANSICODEPAGE, 
                     PRE_WINDOWS_CODEPAGE );
     }
     else if ( CF_OEMTEXT == aClipformat )
-    {
-        charset = getMimeCharsetFromLocaleId(
-                    lcid,
-                    LOCALE_IDEFAULTCODEPAGE,
-                    PRE_OEM_CODEPAGE );
+    {						
+        charset = getMimeCharsetFromLocaleId( 
+                    lcid, 
+                    LOCALE_IDEFAULTCODEPAGE, 
+                    PRE_OEM_CODEPAGE );					
     }
     else // CF_UNICODE
         OSL_ASSERT( sal_False );
-
+    
     return charset;
 }
diff --git a/dtrans/source/win32/dtobj/DataFmtTransl.hxx b/dtrans/source/win32/dtobj/DataFmtTransl.hxx
index 70982ccaf6b9..76d69f8d18b3 100644
--- a/dtrans/source/win32/dtobj/DataFmtTransl.hxx
+++ b/dtrans/source/win32/dtobj/DataFmtTransl.hxx
@@ -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,15 +56,15 @@ class CFormatEtc;
 class CDataFormatTranslator
 {
 public:
-    CDataFormatTranslator( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >&  aServiceManager );
+    CDataFormatTranslator( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >&	aServiceManager );
 
     CFormatEtc getFormatEtcFromDataFlavor( const com::sun::star::datatransfer::DataFlavor& aDataFlavor ) const;
-    com::sun::star::datatransfer::DataFlavor getDataFlavorFromFormatEtc(
+    com::sun::star::datatransfer::DataFlavor getDataFlavorFromFormatEtc( 
         const FORMATETC& aFormatEtc, LCID lcid = GetThreadLocale( ) ) const;
 
     CFormatEtc    SAL_CALL getFormatEtcForClipformat( CLIPFORMAT cf ) const;
     CFormatEtc    SAL_CALL getFormatEtcForClipformatName( const rtl::OUString& aClipFmtName ) const;
-    rtl::OUString SAL_CALL getClipboardFormatName( CLIPFORMAT aClipformat ) const;
+    rtl::OUString SAL_CALL getClipboardFormatName( CLIPFORMAT aClipformat ) const;	
 
     sal_Bool SAL_CALL isHTMLFormat( CLIPFORMAT cf ) const;
     sal_Bool SAL_CALL isTextHtmlFormat( CLIPFORMAT cf ) const;
@@ -72,12 +72,12 @@ public:
     sal_Bool SAL_CALL isUnicodeTextFormat( CLIPFORMAT cf ) const;
     sal_Bool SAL_CALL isTextFormat( CLIPFORMAT cf ) const;
 
-private:
+private:	
     rtl::OUString SAL_CALL getTextCharsetFromLCID( LCID lcid, CLIPFORMAT aClipformat ) const;
 
 private:
-    const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >  m_SrvMgr;
-    com::sun::star::uno::Reference< com::sun::star::datatransfer::XDataFormatTranslator >   m_XDataFormatTranslator;
+    const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >	m_SrvMgr;	
+    com::sun::star::uno::Reference< com::sun::star::datatransfer::XDataFormatTranslator >	m_XDataFormatTranslator;	
 };
 
 #endif
diff --git a/dtrans/source/win32/dtobj/DtObjFactory.cxx b/dtrans/source/win32/dtobj/DtObjFactory.cxx
index e6cadec92983..a5bf3376ee9f 100644
--- a/dtrans/source/win32/dtobj/DtObjFactory.cxx
+++ b/dtrans/source/win32/dtobj/DtObjFactory.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
@@ -69,6 +69,6 @@ Reference< XTransferable > SAL_CALL CDTransObjFactory::createTransferableFromDat
     pTransf->initFlavorList();
     pTransf->release();
 
-    return refDOTransf;
+    return refDOTransf;	
 }
 
diff --git a/dtrans/source/win32/dtobj/Fetc.cxx b/dtrans/source/win32/dtobj/Fetc.cxx
index 525bfd58be4d..cbffb106a85a 100644
--- a/dtrans/source/win32/dtobj/Fetc.cxx
+++ b/dtrans/source/win32/dtobj/Fetc.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
@@ -36,7 +36,7 @@
 #include "..\misc\ImplHelper.hxx"
 
 //------------------------------------------------------------------------
-//
+// 
 //------------------------------------------------------------------------
 
 CFormatEtc::CFormatEtc(  )
@@ -58,7 +58,7 @@ CFormatEtc::CFormatEtc( const FORMATETC& aFormatEtc )
 }
 
 //------------------------------------------------------------------------
-//
+// 
 //------------------------------------------------------------------------
 
 CFormatEtc::~CFormatEtc( )
@@ -67,7 +67,7 @@ CFormatEtc::~CFormatEtc( )
 }
 
 //------------------------------------------------------------------------
-//
+// 
 //------------------------------------------------------------------------
 
 CFormatEtc::CFormatEtc( CLIPFORMAT cf, DWORD tymed, DVTARGETDEVICE* ptd, DWORD dwAspect, LONG lindex )
@@ -76,11 +76,11 @@ CFormatEtc::CFormatEtc( CLIPFORMAT cf, DWORD tymed, DVTARGETDEVICE* ptd, DWORD d
     m_FormatEtc.ptd      = CopyTargetDevice( ptd );
     m_FormatEtc.dwAspect = dwAspect;
     m_FormatEtc.lindex   = lindex;
-    m_FormatEtc.tymed    = tymed;
+    m_FormatEtc.tymed    = tymed; 
 }
 
 //------------------------------------------------------------------------
-//
+// 
 //------------------------------------------------------------------------
 
 CFormatEtc::CFormatEtc( const CFormatEtc& theOther )
@@ -93,7 +93,7 @@ CFormatEtc::CFormatEtc( const CFormatEtc& theOther )
 }
 
 //------------------------------------------------------------------------
-//
+// 
 //------------------------------------------------------------------------
 
 CFormatEtc& CFormatEtc::operator=( const CFormatEtc& theOther )
@@ -113,7 +113,7 @@ CFormatEtc& CFormatEtc::operator=( const CFormatEtc& theOther )
 }
 
 //------------------------------------------------------------------------
-//
+// 
 //------------------------------------------------------------------------
 
 CFormatEtc::operator FORMATETC*( )
@@ -122,7 +122,7 @@ CFormatEtc::operator FORMATETC*( )
 }
 
 //------------------------------------------------------------------------
-//
+// 
 //------------------------------------------------------------------------
 
 CFormatEtc::operator FORMATETC( )
@@ -131,7 +131,7 @@ CFormatEtc::operator FORMATETC( )
 }
 
 //------------------------------------------------------------------------
-//
+// 
 //------------------------------------------------------------------------
 
 void CFormatEtc::getFORMATETC( LPFORMATETC lpFormatEtc )
@@ -143,7 +143,7 @@ void CFormatEtc::getFORMATETC( LPFORMATETC lpFormatEtc )
 }
 
 //------------------------------------------------------------------------
-//
+// 
 //------------------------------------------------------------------------
 
 CLIPFORMAT CFormatEtc::getClipformat( ) const
@@ -152,7 +152,7 @@ CLIPFORMAT CFormatEtc::getClipformat( ) const
 }
 
 //------------------------------------------------------------------------
-//
+// 
 //------------------------------------------------------------------------
 
 DWORD CFormatEtc::getTymed( ) const
@@ -161,7 +161,7 @@ DWORD CFormatEtc::getTymed( ) const
 }
 
 //------------------------------------------------------------------------
-//
+// 
 //------------------------------------------------------------------------
 
 void CFormatEtc::getTargetDevice( DVTARGETDEVICE** lpDvTargetDevice ) const
@@ -176,7 +176,7 @@ void CFormatEtc::getTargetDevice( DVTARGETDEVICE** lpDvTargetDevice ) const
 }
 
 //------------------------------------------------------------------------
-//
+// 
 //------------------------------------------------------------------------
 
 DWORD CFormatEtc::getDvAspect( ) const
@@ -185,7 +185,7 @@ DWORD CFormatEtc::getDvAspect( ) const
 }
 
 //------------------------------------------------------------------------
-//
+// 
 //------------------------------------------------------------------------
 
 LONG CFormatEtc::getLindex( ) const
@@ -194,7 +194,7 @@ LONG CFormatEtc::getLindex( ) const
 }
 
 //------------------------------------------------------------------------
-//
+// 
 //------------------------------------------------------------------------
 
 void CFormatEtc::setClipformat( CLIPFORMAT cf )
@@ -203,7 +203,7 @@ void CFormatEtc::setClipformat( CLIPFORMAT cf )
 }
 
 //------------------------------------------------------------------------
-//
+// 
 //------------------------------------------------------------------------
 
 void CFormatEtc::setTymed( DWORD tymed )
@@ -222,7 +222,7 @@ void CFormatEtc::setTargetDevice( DVTARGETDEVICE* ptd )
 }
 
 //------------------------------------------------------------------------
-//
+// 
 //------------------------------------------------------------------------
 
 void CFormatEtc::setDvAspect( DWORD dwAspect )
@@ -231,7 +231,7 @@ void CFormatEtc::setDvAspect( DWORD dwAspect )
 }
 
 //------------------------------------------------------------------------
-//
+// 
 //------------------------------------------------------------------------
 
 void CFormatEtc::setLindex( LONG lindex )
@@ -240,7 +240,7 @@ void CFormatEtc::setLindex( LONG lindex )
 }
 
 //------------------------------------------------------------------------
-//
+// 
 //------------------------------------------------------------------------
 
 sal_Int32 operator==( const CFormatEtc& lhs, const CFormatEtc& rhs )
@@ -249,7 +249,7 @@ sal_Int32 operator==( const CFormatEtc& lhs, const CFormatEtc& rhs )
 }
 
 //------------------------------------------------------------------------
-//
+// 
 //------------------------------------------------------------------------
 
 sal_Int32 operator!=( const CFormatEtc& lhs, const CFormatEtc& rhs )
diff --git a/dtrans/source/win32/dtobj/Fetc.hxx b/dtrans/source/win32/dtobj/Fetc.hxx
index a0af6dead8c1..7633c0698592 100644
--- a/dtrans/source/win32/dtobj/Fetc.hxx
+++ b/dtrans/source/win32/dtobj/Fetc.hxx
@@ -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
@@ -47,7 +47,7 @@
  stl container elements must fulfill the following requirements:
  1. they need a copy ctor and assignement operator(?)
  2. they must be compareable
- because the FORMATETC structure has a pointer to a TARGETDEVICE
+ because the FORMATETC structure has a pointer to a TARGETDEVICE 
  structure we need a simple wrapper class to fulfill these needs
 ***********************************************************************/
 
diff --git a/dtrans/source/win32/dtobj/FetcList.cxx b/dtrans/source/win32/dtobj/FetcList.cxx
index 8deb2296ad80..a9a627d2ff21 100644
--- a/dtrans/source/win32/dtobj/FetcList.cxx
+++ b/dtrans/source/win32/dtobj/FetcList.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
@@ -59,14 +59,14 @@ using namespace rtl;
 using namespace std;
 
 //------------------------------------------------------------------------
-//
+// 
 //------------------------------------------------------------------------
 
 LCID       CFormatRegistrar::m_TxtLocale   = 0;
 sal_uInt32 CFormatRegistrar::m_TxtCodePage = GetACP( );
 
 //------------------------------------------------------------------------
-//
+// 
 //------------------------------------------------------------------------
 
 CFormatEtcContainer::CFormatEtcContainer( )
@@ -75,29 +75,29 @@ CFormatEtcContainer::CFormatEtcContainer( )
 }
 
 //------------------------------------------------------------------------
-//
+// 
 //------------------------------------------------------------------------
 
 void CFormatEtcContainer::addFormatEtc( const CFormatEtc& fetc )
 {
-    m_FormatMap.push_back( CFormatEtc( fetc ) );
+    m_FormatMap.push_back( CFormatEtc( fetc ) );	
 }
 
 //------------------------------------------------------------------------
-//
+// 
 //------------------------------------------------------------------------
 
 void SAL_CALL CFormatEtcContainer::removeFormatEtc( const CFormatEtc& fetc )
 {
-    FormatEtcMap_t::iterator iter =
+    FormatEtcMap_t::iterator iter = 
         find( m_FormatMap.begin(), m_FormatMap.end(), fetc );
-
+    
     if ( iter != m_FormatMap.end( ) )
         m_FormatMap.erase( iter );
 }
 
 //------------------------------------------------------------------------
-//
+// 
 //------------------------------------------------------------------------
 
 void SAL_CALL CFormatEtcContainer::removeAllFormatEtc( )
@@ -106,40 +106,40 @@ void SAL_CALL CFormatEtcContainer::removeAllFormatEtc( )
 }
 
 //------------------------------------------------------------------------
-//
+// 
 //------------------------------------------------------------------------
 
 sal_Bool CFormatEtcContainer::hasFormatEtc( const CFormatEtc& fetc ) const
-{
-    FormatEtcMap_t::const_iterator iter =
+{	
+    FormatEtcMap_t::const_iterator iter = 
         find( m_FormatMap.begin(), m_FormatMap.end(), fetc );
-
+    
     return ( iter != m_FormatMap.end( ) );
 }
 
 //------------------------------------------------------------------------
-//
+// 
 //------------------------------------------------------------------------
-
+    
 sal_Bool CFormatEtcContainer::hasElements( ) const
 {
     return ( m_FormatMap.size( ) > 0 );
 }
-
+    
 //------------------------------------------------------------------------
-//
+// 
 //------------------------------------------------------------------------
 
 void CFormatEtcContainer::beginEnumFormatEtc( )
 {
     m_EnumIterator = m_FormatMap.begin( );
 }
-
+    
 //------------------------------------------------------------------------
-//
+// 
 //------------------------------------------------------------------------
 
-sal_uInt32 SAL_CALL CFormatEtcContainer::nextFormatEtc( LPFORMATETC lpFetc,
+sal_uInt32 SAL_CALL CFormatEtcContainer::nextFormatEtc( LPFORMATETC lpFetc, 
                                                         sal_uInt32 aNum )
 {
     OSL_ASSERT( lpFetc );
@@ -158,15 +158,15 @@ sal_uInt32 SAL_CALL CFormatEtcContainer::nextFormatEtc( LPFORMATETC lpFetc,
 
 
 //------------------------------------------------------------------------
-//
+// 
 //------------------------------------------------------------------------
 
 sal_Bool SAL_CALL CFormatEtcContainer::skipFormatEtc( sal_uInt32 aNum )
 {
     FormatEtcMap_t::const_iterator iter_end = m_FormatMap.end( );
-    for ( sal_uInt32 i = 0;
-          (i < aNum) && (m_EnumIterator != iter_end);
-          i++, ++m_EnumIterator )
+    for ( sal_uInt32 i = 0; 
+          (i < aNum) && (m_EnumIterator != iter_end); 
+          i++, ++m_EnumIterator ) 
         ;/* intentionally left empty */
 
     return ( m_EnumIterator != m_FormatMap.end( ) );
@@ -177,15 +177,15 @@ sal_Bool SAL_CALL CFormatEtcContainer::skipFormatEtc( sal_uInt32 aNum )
 
 
 //------------------------------------------------------------------------
-//
+// 
 //------------------------------------------------------------------------
 
 CFormatRegistrar::CFormatRegistrar( const Reference< XMultiServiceFactory >& ServiceManager,
-                                    const CDataFormatTranslator& aDataFormatTranslator ) :
+                                    const CDataFormatTranslator& aDataFormatTranslator ) :	
     m_DataFormatTranslator( aDataFormatTranslator ),
     m_bHasSynthesizedLocale( sal_False ),
     m_SrvMgr( ServiceManager )
-{
+{	
 }
 
 // ----------------------------------------------------------------------------------------
@@ -193,26 +193,26 @@ CFormatRegistrar::CFormatRegistrar( const Reference< XMultiServiceFactory >& Ser
 // an appropriate FORMATETC structure, for some formats like unicodetext,
 // text and text/html we will offer an accompany format e.g.:
 //
-// DataFlavor               | Registered Clipformat     |   Registered accompany clipformat
+// DataFlavor				| Registered Clipformat		|	Registered accompany clipformat
 // -------------------------|---------------------------|-----------------------------------
-// text/plain;charset=ansi  | CF_TEXT                   |   CF_UNICODETEXT
-//                          |                           |   CF_LOCALE (if charset != GetACP()
-//                          |                           |
-// text/plain;charset=oem   | CF_OEMTEXT                |   CF_UNICODETEXT
-//                          |                           |   CF_LOCALE (if charset != GetOEMCP()
-//                          |                           |
-// text/plain;charset=utf-16| CF_UNICODETEXT            |   CF_TEXT
-//                          |                           |
-// text/html                | HTML (Hypertext ...)      |   HTML Format
-//                          |                           |
+// text/plain;charset=ansi	| CF_TEXT					|	CF_UNICODETEXT
+//							|							|	CF_LOCALE (if charset != GetACP()
+//							|							|
+// text/plain;charset=oem	| CF_OEMTEXT				|	CF_UNICODETEXT
+//							|							|	CF_LOCALE (if charset != GetOEMCP()
+//							|							|
+// text/plain;charset=utf-16| CF_UNICODETEXT			|	CF_TEXT 
+//							|							|
+// text/html				| HTML (Hypertext ...)		|	HTML Format
+//							|							|
 //
-// if some tries to register different text formats with different charsets the last
+// if some tries to register different text formats with different charsets the last 
 // registered wins and the others are ignored
 // ----------------------------------------------------------------------------------------
 
-void SAL_CALL CFormatRegistrar::RegisterFormats(
+void SAL_CALL CFormatRegistrar::RegisterFormats( 
     const Reference< XTransferable >& aXTransferable, CFormatEtcContainer& aFormatEtcContainer )
-{
+{	
     Sequence< DataFlavor > aFlavorList = aXTransferable->getTransferDataFlavors( );
     sal_Int32  nFlavors                = aFlavorList.getLength( );
     sal_Bool   bUnicodeRegistered      = sal_False;
@@ -222,7 +222,7 @@ void SAL_CALL CFormatRegistrar::RegisterFormats(
     {
         aFlavor = aFlavorList[i];
         CFormatEtc fetc = m_DataFormatTranslator.getFormatEtcFromDataFlavor( aFlavor );
-
+        
         // maybe an internal format so we ignore it
         if ( CF_INVALID == fetc.getClipformat( ) )
             continue;
@@ -240,52 +240,52 @@ void SAL_CALL CFormatRegistrar::RegisterFormats(
                 // we register CF_TEXT for non unicode clients
                 if ( m_DataFormatTranslator.isUnicodeTextFormat( fetc.getClipformat() ) )
                 {
-                    aFormatEtcContainer.addFormatEtc( fetc ); // add CF_UNICODE
-                    aFormatEtcContainer.addFormatEtc(
+                    aFormatEtcContainer.addFormatEtc( fetc ); // add CF_UNICODE					
+                    aFormatEtcContainer.addFormatEtc( 
                         m_DataFormatTranslator.getFormatEtcForClipformat( CF_TEXT ) ); // add CF_TEXT
                     bUnicodeRegistered = sal_True;
                 }
-                else if ( !hasUnicodeFlavor( aXTransferable ) )
+                else if ( !hasUnicodeFlavor( aXTransferable ) ) 
                 {
                     // we try to investigate the charset and make a valid
                     // windows codepage from this charset the default
                     // return value is the result of GetACP( )
                     OUString charset = getCharsetFromDataFlavor( aFlavor );
-                    sal_uInt32 txtCP = getWinCPFromMimeCharset( charset );
-
+                    sal_uInt32 txtCP = getWinCPFromMimeCharset( charset );					
+                    
                     // we try to get a Locale appropriate for this codepage
                     if ( findLocaleForTextCodePage( ) )
                     {
                         m_TxtCodePage = txtCP;
 
-                        aFormatEtcContainer.addFormatEtc(
+                        aFormatEtcContainer.addFormatEtc( 
                             m_DataFormatTranslator.getFormatEtcForClipformat( CF_UNICODETEXT ) );
-
+                        
                         if ( !IsOEMCP( m_TxtCodePage ) )
-                            aFormatEtcContainer.addFormatEtc(
+                            aFormatEtcContainer.addFormatEtc( 
                                 m_DataFormatTranslator.getFormatEtcForClipformat( CF_TEXT ) );
                         else
-                            aFormatEtcContainer.addFormatEtc(
+                            aFormatEtcContainer.addFormatEtc( 
                                 m_DataFormatTranslator.getFormatEtcForClipformat( CF_OEMTEXT ) );
 
-                        aFormatEtcContainer.addFormatEtc(
+                        aFormatEtcContainer.addFormatEtc( 
                             m_DataFormatTranslator.getFormatEtcForClipformat( CF_LOCALE ) );
-
-                        // we save the flavor so it's easier when
+                    
+                        // we save the flavor so it's easier when 
                         // queried for it in XTDataObject::GetData(...)
                         m_RegisteredTextFlavor  = aFlavor;
                         m_bHasSynthesizedLocale = sal_True;
-                    }
+                    }					
                 }
             }
             else if ( m_DataFormatTranslator.isTextHtmlFormat( fetc.getClipformat( ) ) ) // Html (Hyper Text...)
             {
                 // we add text/html ( HTML (HyperText Markup Language) )
                 aFormatEtcContainer.addFormatEtc( fetc );
-
+                
                 // and HTML Format
                 OUString htmlFormat( OUString::createFromAscii( "HTML Format" ) );
-                aFormatEtcContainer.addFormatEtc(
+                aFormatEtcContainer.addFormatEtc( 
                     m_DataFormatTranslator.getFormatEtcForClipformatName( htmlFormat ) );
             }
         }
@@ -293,7 +293,7 @@ void SAL_CALL CFormatRegistrar::RegisterFormats(
 }
 
 //------------------------------------------------------------------------
-//
+// 
 //------------------------------------------------------------------------
 
 sal_Bool SAL_CALL CFormatRegistrar::hasSynthesizedLocale( ) const
@@ -302,7 +302,7 @@ sal_Bool SAL_CALL CFormatRegistrar::hasSynthesizedLocale( ) const
 }
 
 //------------------------------------------------------------------------
-//
+// 
 //------------------------------------------------------------------------
 
 LCID SAL_CALL CFormatRegistrar::getSynthesizedLocale( ) const
@@ -311,7 +311,7 @@ LCID SAL_CALL CFormatRegistrar::getSynthesizedLocale( ) const
 }
 
 //------------------------------------------------------------------------
-//
+// 
 //------------------------------------------------------------------------
 
 sal_uInt32 SAL_CALL CFormatRegistrar::getRegisteredTextCodePage( ) const
@@ -320,7 +320,7 @@ sal_uInt32 SAL_CALL CFormatRegistrar::getRegisteredTextCodePage( ) const
 }
 
 //------------------------------------------------------------------------
-//
+// 
 //------------------------------------------------------------------------
 
 DataFlavor SAL_CALL CFormatRegistrar::getRegisteredTextFlavor( ) const
@@ -329,7 +329,7 @@ DataFlavor SAL_CALL CFormatRegistrar::getRegisteredTextFlavor( ) const
 }
 
 //------------------------------------------------------------------------
-//
+// 
 //------------------------------------------------------------------------
 
 sal_Bool SAL_CALL CFormatRegistrar::isSynthesizeableFormat( const CFormatEtc& aFormatEtc ) const
@@ -340,7 +340,7 @@ sal_Bool SAL_CALL CFormatRegistrar::isSynthesizeableFormat( const CFormatEtc& aF
 }
 
 //------------------------------------------------------------------------
-//
+// 
 //------------------------------------------------------------------------
 
 inline
@@ -352,7 +352,7 @@ sal_Bool SAL_CALL CFormatRegistrar::needsToSynthesizeAccompanyFormats( const CFo
 }
 
 //------------------------------------------------------------------------
-//
+// 
 //------------------------------------------------------------------------
 
 OUString SAL_CALL CFormatRegistrar::getCharsetFromDataFlavor( const DataFlavor& aFlavor )
@@ -361,22 +361,22 @@ OUString SAL_CALL CFormatRegistrar::getCharsetFromDataFlavor( const DataFlavor&
 
     try
     {
-        Reference< XMimeContentTypeFactory > xMimeFac(
+        Reference< XMimeContentTypeFactory > xMimeFac( 
             m_SrvMgr->createInstance( OUString::createFromAscii( \
                 "com.sun.star.datatransfer.MimeContentTypeFactory" ) ), UNO_QUERY );
-
+        
         if( xMimeFac.is( ) )
         {
             Reference< XMimeContentType > xMimeType( xMimeFac->createMimeContentType( aFlavor.MimeType ) );
             if ( xMimeType->hasParameter( TEXTPLAIN_PARAM_CHARSET ) )
                 charset = xMimeType->getParameterValue( TEXTPLAIN_PARAM_CHARSET );
-            else
+            else 
                 charset = getMimeCharsetFromWinCP( GetACP( ), PRE_WINDOWS_CODEPAGE );
         }
     }
     catch(NoSuchElementException&)
     {
-        OSL_ENSURE( sal_False, "Unexpected" );
+        OSL_ENSURE( sal_False, "Unexpected" ); 		
     }
     catch(...)
     {
@@ -387,21 +387,21 @@ OUString SAL_CALL CFormatRegistrar::getCharsetFromDataFlavor( const DataFlavor&
 }
 
 //------------------------------------------------------------------------
-//
+// 
 //------------------------------------------------------------------------
 
 sal_Bool SAL_CALL CFormatRegistrar::hasUnicodeFlavor( const Reference< XTransferable >& aXTransferable ) const
 {
     CFormatEtc fetc( CF_UNICODETEXT );
 
-    DataFlavor aFlavor =
+    DataFlavor aFlavor = 
         m_DataFormatTranslator.getDataFlavorFromFormatEtc( fetc );
-
+    
     return aXTransferable->isDataFlavorSupported( aFlavor );
-}
+}	
 
 //------------------------------------------------------------------------
-//
+// 
 //------------------------------------------------------------------------
 
 inline
@@ -411,7 +411,7 @@ sal_Bool CFormatRegistrar::isEqualCurrentSystemCodePage( sal_uInt32 aCodePage )
 }
 
 //------------------------------------------------------------------------
-//
+// 
 //------------------------------------------------------------------------
 
 sal_Bool SAL_CALL CFormatRegistrar::findLocaleForTextCodePage( )
@@ -422,59 +422,59 @@ sal_Bool SAL_CALL CFormatRegistrar::findLocaleForTextCodePage( )
 }
 
 //------------------------------------------------------------------------
-//
+// 
 //------------------------------------------------------------------------
 
 sal_Bool SAL_CALL CFormatRegistrar::isLocaleCodePage( LCID lcid, LCTYPE lctype, sal_uInt32 codepage )
-{
-    char  buff[6];
+{	
+    char  buff[6];	
     sal_uInt32 localeCodePage;
-
+    
     OSL_ASSERT( IsValidLocale( lcid, LCID_INSTALLED ) );
 
     // get the ansi codepage of the current locale
-    GetLocaleInfoA( lcid, lctype, buff, sizeof( buff ) );
+    GetLocaleInfoA( lcid, lctype, buff, sizeof( buff ) );	
     localeCodePage = atol( buff );
 
     return ( localeCodePage == codepage );
 }
 
 //------------------------------------------------------------------------
-//
+// 
 //------------------------------------------------------------------------
 
 inline
-sal_Bool SAL_CALL CFormatRegistrar::isLocaleOemCodePage( LCID lcid, sal_uInt32 codepage )
+sal_Bool SAL_CALL CFormatRegistrar::isLocaleOemCodePage( LCID lcid, sal_uInt32 codepage ) 
 {
     return isLocaleCodePage( lcid, LOCALE_IDEFAULTCODEPAGE, codepage );
 }
 
 //------------------------------------------------------------------------
-//
+// 
 //------------------------------------------------------------------------
 
 inline
 sal_Bool SAL_CALL CFormatRegistrar::isLocaleAnsiCodePage( LCID lcid, sal_uInt32 codepage )
 {
-    return isLocaleCodePage( lcid, LOCALE_IDEFAULTANSICODEPAGE, codepage );
-}
+    return isLocaleCodePage( lcid, LOCALE_IDEFAULTANSICODEPAGE, codepage );	
+}	
 
 //------------------------------------------------------------------------
-//
+// 
 //------------------------------------------------------------------------
 
 BOOL CALLBACK CFormatRegistrar::EnumLocalesProc( LPSTR lpLocaleStr )
 {
     // the lpLocaleStr parametere is hexadecimal
     LCID lcid = strtol( lpLocaleStr, NULL, 16 );
-
-    if ( isLocaleAnsiCodePage( lcid, CFormatRegistrar::m_TxtCodePage ) ||
+    
+    if ( isLocaleAnsiCodePage( lcid, CFormatRegistrar::m_TxtCodePage ) || 
          isLocaleOemCodePage( lcid, CFormatRegistrar::m_TxtCodePage ) )
-    {
-        CFormatRegistrar::m_TxtLocale = lcid;
+    {		
+        CFormatRegistrar::m_TxtLocale = lcid;		
         return sal_False; // stop enumerating
     }
-
+    
     return sal_True;
 }
 
diff --git a/dtrans/source/win32/dtobj/FetcList.hxx b/dtrans/source/win32/dtobj/FetcList.hxx
index c5105a8662b6..f0a16b38811b 100644
--- a/dtrans/source/win32/dtobj/FetcList.hxx
+++ b/dtrans/source/win32/dtobj/FetcList.hxx
@@ -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
@@ -49,7 +49,7 @@
 
 /*****************************************************************
     a simple container for FORMATECT structures
-    instances of this class are not thread-safe
+    instances of this class are not thread-safe 
 *****************************************************************/
 
 class CFormatEtcContainer
@@ -59,23 +59,23 @@ public:
 
     // duplicates not allowed
     void SAL_CALL addFormatEtc( const CFormatEtc& fetc );
-
-    // removes the specified formatetc
+    
+    // removes the specified formatetc 
     void SAL_CALL removeFormatEtc( const CFormatEtc& fetc );
-
+    
     // removes the formatetc at pos
     void SAL_CALL removeAllFormatEtc( );
 
     sal_Bool SAL_CALL hasFormatEtc( const CFormatEtc& fetc ) const;
-
+    
     sal_Bool SAL_CALL hasElements( ) const;
-
+    
     // begin enumeration
     void SAL_CALL beginEnumFormatEtc( );
-
+    
     // copies the specified number of formatetc structures starting
     // at the current enum position
-    // the return value is the number of copied elements; if the
+    // the return value is the number of copied elements; if the 
     // current enum position is at the end the return value is 0
     sal_uInt32 SAL_CALL nextFormatEtc( LPFORMATETC lpFetc, sal_uInt32 aNum = 1 );
 
@@ -85,7 +85,7 @@ public:
 protected:
     typedef std::vector< CFormatEtc > FormatEtcMap_t;
 
-private:
+private:	
     FormatEtcMap_t           m_FormatMap;
     FormatEtcMap_t::iterator m_EnumIterator;
 };
@@ -94,10 +94,10 @@ private:
     a helper class which converts data flavors to clipformats,
     creates an appropriate formatetc structures and if possible
     synthesizes clipboard formats if necessary, e.g. if text
-    is provided a locale will also be provided;
+    is provided a locale will also be provided; 
     the class registers the formatetc within a CFormatEtcContainer
 
-    instances of this class are not thread-safe and multiple
+    instances of this class are not thread-safe and multiple 
     instances of this class would use the same static variables
     that's why this class should not be used by multiple threads,
     only one thread of a process should use it
@@ -110,24 +110,24 @@ class CFormatRegistrar
 {
 public:
     CFormatRegistrar( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& ServiceManager,
-                      const CDataFormatTranslator& aDataFormatTranslator );
-
+                      const CDataFormatTranslator& aDataFormatTranslator );	
+    
     void SAL_CALL RegisterFormats( const com::sun::star::uno::Reference< com::sun::star::datatransfer::XTransferable >& aXTransferable,
                                    CFormatEtcContainer& aFormatEtcContainer );
-
+    
     sal_Bool   SAL_CALL hasSynthesizedLocale( ) const;
     LCID       SAL_CALL getSynthesizedLocale( ) const;
     sal_uInt32 SAL_CALL getRegisteredTextCodePage( ) const;
     com::sun::star::datatransfer::DataFlavor SAL_CALL getRegisteredTextFlavor( ) const;
-
+    
     sal_Bool  SAL_CALL isSynthesizeableFormat( const CFormatEtc& aFormatEtc ) const;
     sal_Bool  SAL_CALL needsToSynthesizeAccompanyFormats( const CFormatEtc& aFormatEtc ) const;
 
-private:
+private:		
     sal_Bool      SAL_CALL isEqualCurrentSystemCodePage( sal_uInt32 aCodePage ) const;
     rtl::OUString SAL_CALL getCharsetFromDataFlavor( const com::sun::star::datatransfer::DataFlavor& aFlavor );
-
-    sal_Bool SAL_CALL hasUnicodeFlavor(
+    
+    sal_Bool SAL_CALL hasUnicodeFlavor( 
         const com::sun::star::uno::Reference< com::sun::star::datatransfer::XTransferable >& aXTransferable ) const;
 
     sal_Bool SAL_CALL findLocaleForTextCodePage( );
@@ -137,17 +137,17 @@ private:
     static sal_Bool SAL_CALL isLocaleCodePage( LCID lcid, LCTYPE lctype, sal_uInt32 codepage );
 
     static BOOL CALLBACK EnumLocalesProc( LPSTR lpLocaleStr );
-
-private:
-    const CDataFormatTranslator&             m_DataFormatTranslator;
-    sal_Bool                                 m_bHasSynthesizedLocale;
+    
+private:			
+    const CDataFormatTranslator&			 m_DataFormatTranslator;
+    sal_Bool								 m_bHasSynthesizedLocale;
     com::sun::star::datatransfer::DataFlavor m_RegisteredTextFlavor;
 
-    const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >  m_SrvMgr;
-
+    const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >	m_SrvMgr;
+    
     static LCID       m_TxtLocale;
     static sal_uInt32 m_TxtCodePage;
-
+    
 private:
     CFormatRegistrar( const CFormatRegistrar& );
     CFormatRegistrar& operator=( const CFormatRegistrar& );
diff --git a/dtrans/source/win32/dtobj/FmtFilter.cxx b/dtrans/source/win32/dtobj/FmtFilter.cxx
index c8a8743647a9..a5af5ca3de5c 100644
--- a/dtrans/source/win32/dtobj/FmtFilter.cxx
+++ b/dtrans/source/win32/dtobj/FmtFilter.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
@@ -73,24 +73,24 @@ Sequence< sal_Int8 > SAL_CALL WinMFPictToOOMFPict( Sequence< sal_Int8 >& aMetaFi
 {
     OSL_ASSERT( aMetaFilePict.getLength( ) == sizeof( METAFILEPICT ) );
 
-    Sequence< sal_Int8 > mfpictStream;
+    Sequence< sal_Int8 > mfpictStream;	
     METAFILEPICT* pMFPict = reinterpret_cast< METAFILEPICT* >( aMetaFilePict.getArray( ) );
     HMETAFILE hMf = pMFPict->hMF;
     sal_uInt32 nCount = GetMetaFileBitsEx( hMf, 0, NULL );
-
+            
     if ( nCount > 0 )
     {
         mfpictStream.realloc( nCount + sizeof( METAFILEHEADER ) );
 
         METAFILEHEADER* pMFHeader = reinterpret_cast< METAFILEHEADER* >( mfpictStream.getArray( ) );
-        SMALL_RECT aRect = { 0,
-                             0,
-                             static_cast< short >( pMFPict->xExt ),
+        SMALL_RECT aRect = { 0, 
+                             0, 
+                             static_cast< short >( pMFPict->xExt ), 
                              static_cast< short >( pMFPict->yExt ) };
         USHORT nInch;
 
         switch( pMFPict->mm )
-        {
+        {	
         case MM_TEXT:
             nInch = 72;
             break;
@@ -106,7 +106,7 @@ Sequence< sal_Int8 > SAL_CALL WinMFPictToOOMFPict( Sequence< sal_Int8 >& aMetaFi
         case MM_LOENGLISH:
             nInch = 254;
             break;
-
+            
         case MM_HIENGLISH:
         case MM_ISOTROPIC:
         case MM_ANISOTROPIC:
@@ -133,20 +133,20 @@ Sequence< sal_Int8 > SAL_CALL WinMFPictToOOMFPict( Sequence< sal_Int8 >& aMetaFi
         nCount = GetMetaFileBitsEx( pMFPict->hMF, nCount, pMFBuff + sizeof( METAFILEHEADER ) );
         OSL_ASSERT( nCount > 0 );
     }
-
+    
     return mfpictStream;
 }
 
 //-------------------------------------------------------------
-// convert a windows enhanced metafile to a openoffice metafile
+// convert a windows enhanced metafile to a openoffice metafile 
 //-------------------------------------------------------------
 
 Sequence< sal_Int8 > SAL_CALL WinENHMFPictToOOMFPict( HENHMETAFILE hEnhMetaFile )
 {
-    Sequence< sal_Int8 >    aRet;
-    UINT                    nSize = 0;
+    Sequence< sal_Int8 >	aRet;
+    UINT					nSize = 0;
 
-    if( hEnhMetaFile &&
+    if( hEnhMetaFile && 
         ( ( nSize = GetEnhMetaFileBits( hEnhMetaFile, 0, NULL ) ) != 0 ) )
     {
         aRet.realloc( nSize );
@@ -164,8 +164,8 @@ Sequence< sal_Int8 > SAL_CALL WinENHMFPictToOOMFPict( HENHMETAFILE hEnhMetaFile
 
 HMETAFILEPICT SAL_CALL OOMFPictToWinMFPict( Sequence< sal_Int8 >& aOOMetaFilePict )
 {
-    HMETAFILEPICT   hPict = NULL;
-    HMETAFILE       hMtf = SetMetaFileBitsEx( aOOMetaFilePict.getLength(), (sal_uChar*) aOOMetaFilePict.getConstArray() );
+    HMETAFILEPICT	hPict = NULL;
+    HMETAFILE		hMtf = SetMetaFileBitsEx( aOOMetaFilePict.getLength(), (sal_uChar*) aOOMetaFilePict.getConstArray() );
 
     if( hMtf )
     {
@@ -200,14 +200,14 @@ HENHMETAFILE SAL_CALL OOMFPictToWinENHMFPict( Sequence< sal_Int8 >& aOOMetaFileP
 Sequence< sal_Int8 > SAL_CALL WinDIBToOOBMP( const Sequence< sal_Int8 >& aWinDIB )
 {
     OSL_ASSERT( aWinDIB.getLength( ) > sizeof( BITMAPINFOHEADER ) );
-
+    
     Sequence< sal_Int8 > ooBmpStream;
 
     ooBmpStream.realloc( aWinDIB.getLength( ) + sizeof(BITMAPFILEHEADER) );
-
-    const BITMAPINFOHEADER  *pBmpInfoHdr = (const BITMAPINFOHEADER*)aWinDIB.getConstArray();
-    BITMAPFILEHEADER        *pBmpFileHdr = reinterpret_cast< BITMAPFILEHEADER* >( ooBmpStream.getArray() );
-    DWORD                   nOffset      = sizeof( BITMAPFILEHEADER ) + sizeof( BITMAPINFOHEADER );
+        
+    const BITMAPINFOHEADER	*pBmpInfoHdr = (const BITMAPINFOHEADER*)aWinDIB.getConstArray();
+    BITMAPFILEHEADER		*pBmpFileHdr = reinterpret_cast< BITMAPFILEHEADER* >( ooBmpStream.getArray() );
+    DWORD					nOffset      = sizeof( BITMAPFILEHEADER ) + sizeof( BITMAPINFOHEADER );
 
     rtl_copyMemory( pBmpFileHdr + 1, pBmpInfoHdr, aWinDIB.getLength( ) );
 
@@ -215,12 +215,12 @@ Sequence< sal_Int8 > SAL_CALL WinDIBToOOBMP( const Sequence< sal_Int8 >& aWinDIB
         nOffset += ( pBmpInfoHdr->biClrUsed ? pBmpInfoHdr->biClrUsed : ( 1 << pBmpInfoHdr->biBitCount ) ) << 2;
     else if( ( BI_BITFIELDS == pBmpInfoHdr->biCompression ) && ( ( 16 == pBmpInfoHdr->biBitCount ) || ( 32 == pBmpInfoHdr->biBitCount ) ) )
         nOffset += 12;
-
+        
     pBmpFileHdr->bfType      = 'MB';
     pBmpFileHdr->bfSize      = 0; // maybe: nMemSize + sizeof(BITMAPFILEHEADER)
     pBmpFileHdr->bfReserved1 = 0;
     pBmpFileHdr->bfReserved2 = 0;
-    pBmpFileHdr->bfOffBits   = nOffset;
+    pBmpFileHdr->bfOffBits   = nOffset;	
 
     return ooBmpStream;
 }
@@ -231,12 +231,12 @@ Sequence< sal_Int8 > SAL_CALL WinDIBToOOBMP( const Sequence< sal_Int8 >& aWinDIB
 
 Sequence< sal_Int8 > SAL_CALL OOBmpToWinDIB( Sequence< sal_Int8 >& aOOBmp )
 {
-    OSL_ASSERT( aOOBmp.getLength( ) >
+    OSL_ASSERT( aOOBmp.getLength( ) > 
                 ( sizeof( BITMAPFILEHEADER ) + sizeof( BITMAPINFOHEADER ) ) );
 
     Sequence< sal_Int8 > winDIBStream( aOOBmp.getLength( ) - sizeof( BITMAPFILEHEADER ) );
 
-    rtl_copyMemory( winDIBStream.getArray( ),
+    rtl_copyMemory( winDIBStream.getArray( ), 
                     aOOBmp.getArray( )  + sizeof( BITMAPFILEHEADER ),
                     aOOBmp.getLength( ) - sizeof( BITMAPFILEHEADER ) );
 
@@ -248,49 +248,49 @@ Sequence< sal_Int8 > SAL_CALL OOBmpToWinDIB( Sequence< sal_Int8 >& aOOBmp )
 // well known under MS Windows
 // the MS HTML Format has a header before the real html data
 //
-// Version:1.0      Version number of the clipboard. Staring is 0.9
-// StartHTML:       Byte count from the beginning of the clipboard to the start
-//                  of the context, or -1 if no context
-// EndHTML:         Byte count from the beginning of the clipboard to the end
-//                  of the context, or -1 if no context
-// StartFragment:   Byte count from the beginning of the clipboard to the
-//                  start of the fragment
-// EndFragment:     Byte count from the beginning of the clipboard to the
-//                  end of the fragment
-// StartSelection:  Byte count from the beginning of the clipboard to the
-//                  start of the selection
-// EndSelection:    Byte count from the beginning of the clipboard to the
-//                  end of the selection
+// Version:1.0		Version number of the clipboard. Staring is 0.9
+// StartHTML:		Byte count from the beginning of the clipboard to the start
+//					of the context, or -1 if no context
+// EndHTML:			Byte count from the beginning of the clipboard to the end
+//					of the context, or -1 if no context
+// StartFragment:	Byte count from the beginning of the clipboard to the 
+//					start of the fragment
+// EndFragment:		Byte count from the beginning of the clipboard to the
+//					end of the fragment
+// StartSelection:	Byte count from the beginning of the clipboard to the
+//					start of the selection
+// EndSelection:	Byte count from the beginning of the clipboard to the
+//					end of the selection
 //
 // StartSelection and EndSelection are optional
 // The fragment should be preceded and followed by the HTML comments
-// <!--StartFragment--> and <!--EndFragment--> (no space between !-- and the
+// <!--StartFragment--> and <!--EndFragment--> (no space between !-- and the 
 // text
 //------------------------------------------------------------------------------
 /*
 Sequence< sal_Int8 > SAL_CALL TextHtmlToHTMLFormat( Sequence< sal_Int8 >& aTextHtml )
 {
     OSL_ASSERT( aTextHtml.getLength( ) > 0 );
-
+    
     // check parameter
     if ( !(aTextHtml.getLength( ) > 0) )
         return Sequence< sal_Int8 >( );
 
-    // we create a buffer with the approximated size of
+    // we create a buffer with the approximated size of 
     // the HTML Format header
     char aHTMLFmtHdr[120];
-
+        
     rtl_zeroMemory( aHTMLFmtHdr, sizeof( aHTMLFmtHdr ) );
 
     // fill the buffer with dummy values to calc the
     // exact length
-
-    wsprintf(
-        aHTMLFmtHdr,
+    
+    wsprintf( 
+        aHTMLFmtHdr, 
         "Version:1.0\nStartHTML:%010d\r\nnEndHTML:%010d\r\nStartFragment:%010\r\nnEndFragment:%010d\r\n", 0, 0, 0, 0 );
 
     sal_uInt32 lHTMLFmtHdr = rtl_str_getLength( aHTMLFmtHdr );
-
+    
     // the office allways writes the start
     // and end html tag in upper cases and
     // without spaces
@@ -305,8 +305,8 @@ Sequence< sal_Int8 > SAL_CALL TextHtmlToHTMLFormat( Sequence< sal_Int8 >& aTextH
     OString startBodyTag( "<BODY" );
     OString endBodyTag(   "</BODY" );
 
-    OString textHtml(
-        reinterpret_cast< const sal_Char* >( aTextHtml.getConstArray( ) ),
+    OString textHtml( 
+        reinterpret_cast< const sal_Char* >( aTextHtml.getConstArray( ) ), 
         aTextHtml.getLength( ) );
 
     sal_Int32 nStartHtml  = textHtml.indexOf( startHtmlTag );
@@ -328,27 +328,27 @@ Sequence< sal_Int8 > SAL_CALL TextHtmlToHTMLFormat( Sequence< sal_Int8 >& aTextH
         // fill the html header
         rtl_zeroMemory( aHTMLFmtHdr, sizeof( aHTMLFmtHdr ) );
 
-        wsprintf(
-            aHTMLFmtHdr,
+        wsprintf( 
+            aHTMLFmtHdr, 
             "Version:1.0\nStartHTML:%010d\r\nEndHTML:%010d\r\nStartFragment:%010d\r\nEndFragment:%010d\r\n",
             nStartHtml, nEndHtml, nStartFrgmt, nEndFrgmt );
-
+        
         // we add space for a trailing \0
         aHTMLFmtSequence.realloc( lHTMLFmtHdr + aTextHtml.getLength( ) + 1 );
         rtl_zeroMemory( aHTMLFmtSequence.getArray( ), aHTMLFmtSequence.getLength( ) );
-
+        
         // copy the HTML Format header
-        rtl_copyMemory(
+        rtl_copyMemory( 
             static_cast< LPVOID >( aHTMLFmtSequence.getArray( ) ),
             static_cast< LPVOID >( aHTMLFmtHdr ), lHTMLFmtHdr );
-
+        
         // concat the text/html
         rtl_copyMemory(
             static_cast< LPVOID >( aHTMLFmtSequence.getArray( ) + lHTMLFmtHdr ),
             static_cast< LPVOID >( aTextHtml.getArray( ) ),
-            aTextHtml.getLength( ) );
+            aTextHtml.getLength( ) );			
     }
-
+    
     return aHTMLFmtSequence;
 }
 */
@@ -377,37 +377,37 @@ const std::string TAG_END_BODY = std::string("</BODY");
 Sequence<sal_Int8> SAL_CALL TextHtmlToHTMLFormat(Sequence<sal_Int8>& aTextHtml)
 {
     OSL_ASSERT(aTextHtml.getLength() > 0);
-
+    
     if (!(aTextHtml.getLength() > 0))
         return Sequence<sal_Int8>();
-
+                    
     // fill the buffer with dummy values to calc the exact length
-    std::string dummyHtmlHeader = GetHtmlFormatHeader(0, 0, 0, 0);
+    std::string dummyHtmlHeader = GetHtmlFormatHeader(0, 0, 0, 0);		
     size_t lHtmlFormatHeader = dummyHtmlHeader.length();
-
+               
     std::string textHtml(
-        reinterpret_cast<const sal_Char*>(aTextHtml.getConstArray()),
+        reinterpret_cast<const sal_Char*>(aTextHtml.getConstArray()), 
         reinterpret_cast<const sal_Char*>(aTextHtml.getConstArray()) + aTextHtml.getLength());
-
+                                                            
     std::string::size_type nStartHtml = textHtml.find(TAG_HTML) + lHtmlFormatHeader - 1; // we start one before '<HTML>' Word 2000 does also so
     std::string::size_type nEndHtml = textHtml.find(TAG_END_HTML) + lHtmlFormatHeader + TAG_END_HTML.length() + 1; // our SOffice 5.2 wants 2 behind </HTML>?
-
+    
     // The body tag may have parameters so we need to search for the
     // closing '>' manually e.g. <BODY param> #92840#
-    std::string::size_type nStartFragment = textHtml.find(">", textHtml.find(TAG_BODY)) + lHtmlFormatHeader + 1;
+    std::string::size_type nStartFragment = textHtml.find(">", textHtml.find(TAG_BODY)) + lHtmlFormatHeader + 1; 
     std::string::size_type nEndFragment = textHtml.find(TAG_END_BODY) + lHtmlFormatHeader;
 
-    std::string htmlFormat = GetHtmlFormatHeader(nStartHtml, nEndHtml, nStartFragment, nEndFragment);
+    std::string htmlFormat = GetHtmlFormatHeader(nStartHtml, nEndHtml, nStartFragment, nEndFragment);	
     htmlFormat += textHtml;
-
+        
     Sequence<sal_Int8> byteSequence(htmlFormat.length() + 1); // space the trailing '\0'
-    rtl_zeroMemory(byteSequence.getArray(), byteSequence.getLength());
-
+    rtl_zeroMemory(byteSequence.getArray(), byteSequence.getLength());						
+        
     rtl_copyMemory(
         static_cast<void*>(byteSequence.getArray()),
         static_cast<const void*>(htmlFormat.c_str()),
         htmlFormat.length());
-
+    
     return byteSequence;
 }
 
@@ -417,27 +417,27 @@ std::wstring getFileExtension(const std::wstring& aFilename)
     if ((idx != std::wstring::npos))
     {
         return std::wstring(aFilename, idx);
-    }
+    }    
     return std::wstring();
 }
 
 const std::wstring SHELL_LINK_FILE_EXTENSION = L".lnk";
 
 bool isShellLink(const std::wstring& aFilename)
-{
+{    
     std::wstring ext = getFileExtension(aFilename);
-    return (_wcsicmp(ext.c_str(), SHELL_LINK_FILE_EXTENSION.c_str()) == 0);
+    return (_wcsicmp(ext.c_str(), SHELL_LINK_FILE_EXTENSION.c_str()) == 0);    
 }
-
-/** Resolve a Windows Shell Link (lnk) file. If a resolution
+  
+/** Resolve a Windows Shell Link (lnk) file. If a resolution 
     is not possible simply return the provided name of the
     lnk file. */
-std::wstring getShellLinkTarget(const std::wstring& aLnkFile)
+std::wstring getShellLinkTarget(const std::wstring& aLnkFile) 
 {
     OSL_ASSERT(isShellLink(aLnkFile));
-
+    
     std::wstring target = aLnkFile;
-
+    
     try
     {
         sal::systools::COMReference<IShellLinkA> pIShellLink;
@@ -445,34 +445,34 @@ std::wstring getShellLinkTarget(const std::wstring& aLnkFile)
             CLSID_ShellLink, NULL, CLSCTX_INPROC_SERVER, IID_IShellLink, reinterpret_cast<LPVOID*>(&pIShellLink));
         if (FAILED(hr))
             return target;
-
+            
         sal::systools::COMReference<IPersistFile> pIPersistFile =
-            pIShellLink.QueryInterface<IPersistFile>(IID_IPersistFile);
-
+            pIShellLink.QueryInterface<IPersistFile>(IID_IPersistFile);        
+        
         hr = pIPersistFile->Load(aLnkFile.c_str(), STGM_READ);
         if (FAILED(hr))
             return target;
-
+                 
         hr = pIShellLink->Resolve(NULL, SLR_UPDATE | SLR_NO_UI);
         if (FAILED(hr))
             return target;
-
+        
         char pathA[MAX_PATH];
-        WIN32_FIND_DATA wfd;
-        hr = pIShellLink->GetPath(pathA, MAX_PATH, &wfd, SLGP_RAWPATH);
+        WIN32_FIND_DATA wfd;                     
+        hr = pIShellLink->GetPath(pathA, MAX_PATH, &wfd, SLGP_RAWPATH);                                                           
         if (FAILED(hr))
-            return target;
-
+            return target;            
+        
         wchar_t pathW[MAX_PATH];
-        MultiByteToWideChar(CP_ACP, 0, pathA, -1, pathW, MAX_PATH);
-        target = pathW;
+        MultiByteToWideChar(CP_ACP, 0, pathA, -1, pathW, MAX_PATH);        
+        target = pathW;                            
     }
     catch(sal::systools::ComError& ex)
     {
         OSL_ENSURE(false, ex.what());
         ex = ex;
-    }
-    return target;
+    }    
+    return target;    
 }
 
 typedef std::vector<std::wstring> FileList_t;
@@ -483,54 +483,54 @@ typedef Sequence<sal_Int8> ByteSequence_t;
    a double '\0' terminated string buffer */
 size_t CalcSizeForStringListBuffer(const FileList_t& fileList)
 {
-    if (fileList.size() == 0)
-        return 0;
-
-    size_t size = 1; // one for the very final '\0'
+    if (fileList.size() == 0)     
+        return 0;    
+        
+    size_t size = 1; // one for the very final '\0'     
     FileList_t::const_iterator iter_end = fileList.end();
-    for (FileList_t::const_iterator iter = fileList.begin(); iter != iter_end; ++iter)
+    for (FileList_t::const_iterator iter = fileList.begin(); iter != iter_end; ++iter)    
     {
         size += iter->length() + 1; // length including terminating '\0'
-    }
+    }                
     return (size * sizeof(FileList_ValueType_t::value_type));
 }
 
 ByteSequence_t FileListToByteSequence(const FileList_t& fileList)
-{
+{    
     ByteSequence_t bseq;
-    size_t size = CalcSizeForStringListBuffer(fileList);
-
+    size_t size = CalcSizeForStringListBuffer(fileList);        
+    
     if (size > 0)
     {
         bseq.realloc(size);
         wchar_t* p = reinterpret_cast<wchar_t*>(bseq.getArray());
         ZeroMemory(p, size);
-
+        
         FileList_t::const_iterator iter;
         FileList_t::const_iterator iter_end = fileList.end();
         for (iter = fileList.begin(); iter != iter_end; ++iter)
         {
             wcsncpy(p, iter->c_str(), iter->length());
             p += (iter->length() + 1);
-        }
+        }        
     }
     return bseq;
 }
-
+   
 ByteSequence_t CF_HDROPToFileList(HGLOBAL hGlobal)
-{
-    UINT nFiles = DragQueryFileW((HDROP)hGlobal, 0xFFFFFFFF, NULL, 0);
+{    
+    UINT nFiles = DragQueryFileW((HDROP)hGlobal, 0xFFFFFFFF, NULL, 0);    
     FileList_t files;
-
+            
     for (UINT i = 0; i < nFiles; i++)
     {
         wchar_t buff[MAX_PATH];
-        /*UINT size =*/ DragQueryFileW((HDROP)hGlobal, i, buff, MAX_PATH);
+        /*UINT size =*/ DragQueryFileW((HDROP)hGlobal, i, buff, MAX_PATH);            
         std::wstring filename = buff;
         if (isShellLink(filename))
             filename = getShellLinkTarget(filename);
-        files.push_back(filename);
-    }
+        files.push_back(filename);            
+    }                
     return FileListToByteSequence(files);
 }
 
diff --git a/dtrans/source/win32/dtobj/FmtFilter.hxx b/dtrans/source/win32/dtobj/FmtFilter.hxx
index 3f433561a3b1..59c9993f14b9 100644
--- a/dtrans/source/win32/dtobj/FmtFilter.hxx
+++ b/dtrans/source/win32/dtobj/FmtFilter.hxx
@@ -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
@@ -73,7 +73,7 @@ com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL OOBmpToWinDIB( com::sun::star
 
 /*------------------------------------------------------------------------
     input:
-    aTextHtml - a sequence of text/html which will be converted to the
+    aTextHtml - a sequence of text/html which will be converted to the 
     HTML Format; the HTML Format has header before the real html data
     the Format is described in the MSDN Library under HTML Clipboard
     Format
diff --git a/dtrans/source/win32/dtobj/MimeAttrib.hxx b/dtrans/source/win32/dtobj/MimeAttrib.hxx
index 7bd631cc79d5..f1c900733774 100644
--- a/dtrans/source/win32/dtobj/MimeAttrib.hxx
+++ b/dtrans/source/win32/dtobj/MimeAttrib.hxx
@@ -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
diff --git a/dtrans/source/win32/dtobj/TxtCnvtHlp.cxx b/dtrans/source/win32/dtobj/TxtCnvtHlp.cxx
index 3eecad271567..6102e5eaf7a0 100644
--- a/dtrans/source/win32/dtobj/TxtCnvtHlp.cxx
+++ b/dtrans/source/win32/dtobj/TxtCnvtHlp.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
@@ -75,8 +75,8 @@ int CalcBuffSizeForTextConversion( UINT code_page, LPCWSTR lpWideCharString, int
 // the buffer
 //------------------------------------------------------------------
 
-int MultiByteToWideCharEx( UINT cp_src,
-                           LPCSTR lpMultiByteString,
+int MultiByteToWideCharEx( UINT cp_src, 
+                           LPCSTR lpMultiByteString, 
                            sal_uInt32 lenStr,
                            CStgTransferHelper& refDTransHelper,
                            BOOL bEnsureTrailingZero )
@@ -84,9 +84,9 @@ int MultiByteToWideCharEx( UINT cp_src,
     OSL_ASSERT( IsValidCodePage( cp_src ) );
     OSL_ASSERT( NULL != lpMultiByteString );
 
-    // calculate the required buff size
+    // calculate the required buff size 
     int reqSize = CalcBuffSizeForTextConversion( cp_src, lpMultiByteString, lenStr );
-
+    
     if ( bEnsureTrailingZero )
         reqSize += sizeof( sal_Unicode );
 
@@ -96,9 +96,9 @@ int MultiByteToWideCharEx( UINT cp_src,
     // setup a global memory pointer
     CRawHGlobalPtr ptrHGlob( refDTransHelper );
 
-    // do the converssion an return
-    return MultiByteToWideChar( cp_src,
-                                0,
+    // do the converssion an return 
+    return MultiByteToWideChar( cp_src, 
+                                0, 
                                 lpMultiByteString,
                                 lenStr,
                                 static_cast< LPWSTR >( ptrHGlob.GetMemPtr( ) ),
@@ -111,8 +111,8 @@ int MultiByteToWideCharEx( UINT cp_src,
 // the buffer
 //------------------------------------------------------------------
 
-int WideCharToMultiByteEx( UINT cp_dest,
-                           LPCWSTR lpWideCharString,
+int WideCharToMultiByteEx( UINT cp_dest, 
+                           LPCWSTR lpWideCharString, 
                            sal_uInt32 lenStr,
                            CStgTransferHelper& refDTransHelper,
                            BOOL bEnsureTrailingZero )
@@ -120,7 +120,7 @@ int WideCharToMultiByteEx( UINT cp_dest,
     OSL_ASSERT( IsValidCodePage( cp_dest ) );
     OSL_ASSERT( NULL != lpWideCharString );
 
-    // calculate the required buff size
+    // calculate the required buff size 
     int reqSize = CalcBuffSizeForTextConversion( cp_dest, lpWideCharString, lenStr );
 
     if ( bEnsureTrailingZero )
@@ -132,7 +132,7 @@ int WideCharToMultiByteEx( UINT cp_dest,
     // setup a global memory pointer
     CRawHGlobalPtr ptrHGlob( refDTransHelper );
 
-    // do the converssion an return
+    // do the converssion an return 
     return WideCharToMultiByte( cp_dest,
                                 0,
                                 lpWideCharString,
diff --git a/dtrans/source/win32/dtobj/TxtCnvtHlp.hxx b/dtrans/source/win32/dtobj/TxtCnvtHlp.hxx
index a4d59a69284e..c8b209b6be68 100644
--- a/dtrans/source/win32/dtobj/TxtCnvtHlp.hxx
+++ b/dtrans/source/win32/dtobj/TxtCnvtHlp.hxx
@@ -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
@@ -48,16 +48,16 @@
 // deklarations
 //------------------------------------------------------------------------
 
-int MultiByteToWideCharEx( UINT cp_src,
+int MultiByteToWideCharEx( UINT cp_src, 
                            LPCSTR lpMultiByteString,
                            sal_uInt32 lenStr,
-                           CStgTransferHelper& refDTransHelper,
+                           CStgTransferHelper& refDTransHelper, 
                            BOOL bEnsureTrailingZero = TRUE );
 
-int WideCharToMultiByteEx( UINT cp_dest,
-                           LPCWSTR lpWideCharString,
+int WideCharToMultiByteEx( UINT cp_dest, 
+                           LPCWSTR lpWideCharString, 
                            sal_uInt32 lenStr,
-                           CStgTransferHelper& refDTransHelper,
+                           CStgTransferHelper& refDTransHelper, 
                            BOOL bEnsureTrailingZero = TRUE );
 
 #endif
diff --git a/dtrans/source/win32/dtobj/XNotifyingDataObject.cxx b/dtrans/source/win32/dtobj/XNotifyingDataObject.cxx
index 25e3fab3a702..1393060bbda4 100644
--- a/dtrans/source/win32/dtobj/XNotifyingDataObject.cxx
+++ b/dtrans/source/win32/dtobj/XNotifyingDataObject.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
@@ -43,28 +43,28 @@ using com::sun::star::uno::RuntimeException;
 using com::sun::star::uno::Reference;
 
 
-CXNotifyingDataObject::CXNotifyingDataObject(
-    const IDataObjectPtr& aIDataObject,
+CXNotifyingDataObject::CXNotifyingDataObject( 
+    const IDataObjectPtr& aIDataObject,	
     const Reference< XTransferable >& aXTransferable,
     const Reference< XClipboardOwner >& aXClipOwner,
     CWinClipbImpl* theWinClipImpl ) :
-    m_nRefCnt( 0 ),
+    m_nRefCnt( 0 ),	
     m_aIDataObject( aIDataObject ),
     m_XTransferable( aXTransferable ),
     m_XClipboardOwner( aXClipOwner ),
     m_pWinClipImpl( theWinClipImpl )
-{
+{					
 }
 
 STDMETHODIMP CXNotifyingDataObject::QueryInterface( REFIID iid, LPVOID* ppvObject )
-{
+{	
     if ( NULL == ppvObject )
         return E_INVALIDARG;
 
     HRESULT hr = E_NOINTERFACE;
 
     *ppvObject = NULL;
-    if ( ( __uuidof( IUnknown ) == iid ) ||
+    if ( ( __uuidof( IUnknown ) == iid ) || 
          ( __uuidof( IDataObject ) == iid ) )
     {
         *ppvObject = static_cast< IUnknown* >( this );
@@ -81,8 +81,8 @@ STDMETHODIMP_(ULONG) CXNotifyingDataObject::AddRef( )
 }
 
 STDMETHODIMP_(ULONG) CXNotifyingDataObject::Release( )
-{
-    ULONG nRefCnt =
+{	
+    ULONG nRefCnt = 
         static_cast< ULONG >( InterlockedDecrement( &m_nRefCnt ) );
 
     if ( 0 == nRefCnt )
@@ -97,50 +97,50 @@ STDMETHODIMP_(ULONG) CXNotifyingDataObject::Release( )
 }
 
 STDMETHODIMP CXNotifyingDataObject::GetData( LPFORMATETC pFormatetc, LPSTGMEDIUM pmedium )
-{
-    return m_aIDataObject->GetData(pFormatetc, pmedium);
+{			
+    return m_aIDataObject->GetData(pFormatetc, pmedium);	
 }
 
-STDMETHODIMP CXNotifyingDataObject::EnumFormatEtc(
+STDMETHODIMP CXNotifyingDataObject::EnumFormatEtc( 
     DWORD dwDirection, IEnumFORMATETC** ppenumFormatetc )
-{
-    return m_aIDataObject->EnumFormatEtc(dwDirection, ppenumFormatetc);
+{	
+    return m_aIDataObject->EnumFormatEtc(dwDirection, ppenumFormatetc);	
 }
 
 STDMETHODIMP CXNotifyingDataObject::QueryGetData( LPFORMATETC pFormatetc )
 {
-    return m_aIDataObject->QueryGetData(pFormatetc);
+    return m_aIDataObject->QueryGetData(pFormatetc);	
 }
 
 STDMETHODIMP CXNotifyingDataObject::GetDataHere( LPFORMATETC lpFetc, LPSTGMEDIUM lpStgMedium )
 {
-    return m_aIDataObject->GetDataHere(lpFetc, lpStgMedium);
+    return m_aIDataObject->GetDataHere(lpFetc, lpStgMedium);	
 }
 
 STDMETHODIMP CXNotifyingDataObject::GetCanonicalFormatEtc( LPFORMATETC lpFetc, LPFORMATETC lpCanonicalFetc )
 {
-    return m_aIDataObject->GetCanonicalFormatEtc(lpFetc, lpCanonicalFetc);
+    return m_aIDataObject->GetCanonicalFormatEtc(lpFetc, lpCanonicalFetc);	
 }
 
 STDMETHODIMP CXNotifyingDataObject::SetData( LPFORMATETC lpFetc, LPSTGMEDIUM lpStgMedium, BOOL bRelease )
-{
-    return m_aIDataObject->SetData( lpFetc, lpStgMedium, bRelease );
+{	
+    return m_aIDataObject->SetData( lpFetc, lpStgMedium, bRelease );	
 }
 
-STDMETHODIMP CXNotifyingDataObject::DAdvise(
+STDMETHODIMP CXNotifyingDataObject::DAdvise( 
     LPFORMATETC lpFetc, DWORD advf, LPADVISESINK lpAdvSink, DWORD* pdwConnection )
-{
-    return m_aIDataObject->DAdvise( lpFetc, advf, lpAdvSink, pdwConnection );
+{	
+    return m_aIDataObject->DAdvise( lpFetc, advf, lpAdvSink, pdwConnection );	
 }
 
 STDMETHODIMP CXNotifyingDataObject::DUnadvise( DWORD dwConnection )
-{
+{	
     return m_aIDataObject->DUnadvise( dwConnection );
 }
 
 STDMETHODIMP CXNotifyingDataObject::EnumDAdvise( LPENUMSTATDATA * ppenumAdvise )
 {
-    return m_aIDataObject->EnumDAdvise( ppenumAdvise );
+    return m_aIDataObject->EnumDAdvise( ppenumAdvise );	
 }
 
 CXNotifyingDataObject::operator IDataObject*( )
@@ -153,11 +153,11 @@ void SAL_CALL CXNotifyingDataObject::lostOwnership( )
     try
     {
         if (m_XClipboardOwner.is())
-            m_XClipboardOwner->lostOwnership(
+            m_XClipboardOwner->lostOwnership( 
                 static_cast<XClipboardEx*>(m_pWinClipImpl->m_pWinClipboard ), m_XTransferable);
     }
     catch(RuntimeException&)
     {
         OSL_ENSURE( sal_False, "RuntimeException caught" );
-    }
+    }	
 }
diff --git a/dtrans/source/win32/dtobj/XNotifyingDataObject.hxx b/dtrans/source/win32/dtobj/XNotifyingDataObject.hxx
index 394b835c3612..a3549a087858 100644
--- a/dtrans/source/win32/dtobj/XNotifyingDataObject.hxx
+++ b/dtrans/source/win32/dtobj/XNotifyingDataObject.hxx
@@ -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
@@ -59,14 +59,14 @@ class CWinClipbImpl;
 class CXNotifyingDataObject : public IDataObject
 {
 public:
-    CXNotifyingDataObject(
-        const IDataObjectPtr& aIDataObject,
+    CXNotifyingDataObject( 
+        const IDataObjectPtr& aIDataObject,		
         const com::sun::star::uno::Reference< com::sun::star::datatransfer::XTransferable >& aXTransferable,
         const com::sun::star::uno::Reference< com::sun::star::datatransfer::clipboard::XClipboardOwner >& aXClipOwner,
         CWinClipbImpl* theWinClipImpl );
 
     virtual ~CXNotifyingDataObject() {}
-
+    
     //-----------------------------------------------------------------
     // ole interface implementation
     //-----------------------------------------------------------------
@@ -92,12 +92,12 @@ public:
 private:
     void SAL_CALL lostOwnership( );
 
-private:
-    sal_Int32                                                                                           m_nRefCnt;
-    IDataObjectPtr                                                                                      m_aIDataObject;
-    const com::sun::star::uno::Reference< com::sun::star::datatransfer::XTransferable >                 m_XTransferable;
-    const com::sun::star::uno::Reference< com::sun::star::datatransfer::clipboard::XClipboardOwner >    m_XClipboardOwner;
-    CWinClipbImpl*                                                                                      m_pWinClipImpl;
+private:	
+    sal_Int32																							m_nRefCnt;
+    IDataObjectPtr																						m_aIDataObject;	
+    const com::sun::star::uno::Reference< com::sun::star::datatransfer::XTransferable >					m_XTransferable;
+    const com::sun::star::uno::Reference< com::sun::star::datatransfer::clipboard::XClipboardOwner >	m_XClipboardOwner;
+    CWinClipbImpl*																						m_pWinClipImpl;
 
     friend class CWinClipbImpl;
 };
diff --git a/dtrans/source/win32/dtobj/XTDataObject.cxx b/dtrans/source/win32/dtobj/XTDataObject.cxx
index e17a931d7380..cdc925638adf 100644
--- a/dtrans/source/win32/dtobj/XTDataObject.cxx
+++ b/dtrans/source/win32/dtobj/XTDataObject.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
@@ -320,7 +320,7 @@ void SAL_CALL CXTDataObject::renderAnyDataAndSetupStgMedium(
         stgmedium.hMetaFilePict  = OOMFPictToWinMFPict( clipDataStream );
         stgmedium.pUnkForRelease = NULL;
     }
-    else if( CF_ENHMETAFILE == fetc.cfFormat )
+    else if( CF_ENHMETAFILE	== fetc.cfFormat )
     {
         stgmedium.tymed          = TYMED_ENHMF;
         stgmedium.hMetaFilePict  = OOMFPictToWinENHMFPict( clipDataStream );
@@ -475,12 +475,12 @@ void SAL_CALL CXTDataObject::renderSynthesizedHtmlAndSetupStgMedium( FORMATETC&
     Sequence< sal_Int8 > aHTMLFormatSequence = TextHtmlToHTMLFormat( aTextHtmlSequence );
 
     sal_uInt32 nBytesToTransfer = aHTMLFormatSequence.getLength( );
-
-    renderDataAndSetupStgMedium(
-        reinterpret_cast< const sal_Int8* >( aHTMLFormatSequence.getArray( ) ),
-        fetc,
-        0,
-        nBytesToTransfer,
+    
+    renderDataAndSetupStgMedium( 
+        reinterpret_cast< const sal_Int8* >( aHTMLFormatSequence.getArray( ) ), 
+        fetc, 
+        0, 
+        nBytesToTransfer, 
         stgmedium );
 }
 
@@ -488,12 +488,12 @@ void SAL_CALL CXTDataObject::renderSynthesizedHtmlAndSetupStgMedium( FORMATETC&
 // IDataObject->EnumFormatEtc
 //------------------------------------------------------------------------
 
-STDMETHODIMP CXTDataObject::EnumFormatEtc(
+STDMETHODIMP CXTDataObject::EnumFormatEtc( 
     DWORD dwDirection, IEnumFORMATETC** ppenumFormatetc )
 {
-    if ( NULL == ppenumFormatetc )
+    if ( NULL == ppenumFormatetc ) 
         return E_INVALIDARG;
-
+    
     if ( DATADIR_SET == dwDirection )
         return E_NOTIMPL;
 
@@ -506,7 +506,7 @@ STDMETHODIMP CXTDataObject::EnumFormatEtc(
     {
         *ppenumFormatetc = new CEnumFormatEtc( this, m_FormatEtcContainer );
         if ( NULL != *ppenumFormatetc )
-            static_cast< LPUNKNOWN >( *ppenumFormatetc )->AddRef( );
+            static_cast< LPUNKNOWN >( *ppenumFormatetc )->AddRef( );		
 
         hr = ( NULL != *ppenumFormatetc ) ? S_OK : E_OUTOFMEMORY;
     }
@@ -601,9 +601,9 @@ inline
 DataFlavor SAL_CALL CXTDataObject::formatEtcToDataFlavor( const FORMATETC& aFormatEtc ) const
 {
     DataFlavor aFlavor;
-
+    
     if ( m_FormatRegistrar.hasSynthesizedLocale( ) )
-        aFlavor =
+        aFlavor = 
             m_DataFormatTranslator.getDataFlavorFromFormatEtc( aFormatEtc, m_FormatRegistrar.getSynthesizedLocale( ) );
     else
         aFlavor = m_DataFormatTranslator.getDataFlavorFromFormatEtc( aFormatEtc );
@@ -615,7 +615,7 @@ DataFlavor SAL_CALL CXTDataObject::formatEtcToDataFlavor( const FORMATETC& aForm
 }
 
 //------------------------------------------------------------------------
-//
+// 
 //------------------------------------------------------------------------
 
 inline
@@ -636,28 +636,28 @@ void CXTDataObject::validateFormatEtc( LPFORMATETC lpFormatEtc ) const
          !(lpFormatEtc->tymed & TYMED_ENHMF) )
         throw CInvalidFormatEtcException( DV_E_TYMED );
 
-    if ( lpFormatEtc->cfFormat == CF_METAFILEPICT &&
+    if ( lpFormatEtc->cfFormat == CF_METAFILEPICT && 
          !(lpFormatEtc->tymed & TYMED_MFPICT) )
         throw CInvalidFormatEtcException( DV_E_TYMED );
-
-    if ( lpFormatEtc->cfFormat == CF_ENHMETAFILE &&
+    
+    if ( lpFormatEtc->cfFormat == CF_ENHMETAFILE && 
          !(lpFormatEtc->tymed & TYMED_ENHMF) )
         throw CInvalidFormatEtcException( DV_E_TYMED );
 }
 
 //------------------------------------------------------------------------
-//
+// 
 //------------------------------------------------------------------------
 
 //inline
-void SAL_CALL CXTDataObject::setupStgMedium( const FORMATETC& fetc,
+void SAL_CALL CXTDataObject::setupStgMedium( const FORMATETC& fetc, 											 
                                              CStgTransferHelper& stgTransHlp,
                                              STGMEDIUM& stgmedium )
 {
     stgmedium.pUnkForRelease = NULL;
 
     if ( fetc.cfFormat == CF_METAFILEPICT )
-    {
+    {	
         stgmedium.tymed         = TYMED_MFPICT;
         stgmedium.hMetaFilePict = static_cast< HMETAFILEPICT >( stgTransHlp.getHGlobal( ) );
     }
@@ -677,21 +677,21 @@ void SAL_CALL CXTDataObject::setupStgMedium( const FORMATETC& fetc,
         stgTransHlp.getIStream( &stgmedium.pstm );
     }
     else
-        OSL_ASSERT( sal_False );
+        OSL_ASSERT( sal_False );	
 }
 
 //------------------------------------------------------------------------
-//
+// 
 //------------------------------------------------------------------------
 
-inline
+inline 
 void SAL_CALL CXTDataObject::invalidateStgMedium( STGMEDIUM& stgmedium ) const
 {
     stgmedium.tymed = TYMED_NULL;
 }
 
 //------------------------------------------------------------------------
-//
+// 
 //------------------------------------------------------------------------
 
 inline
@@ -721,7 +721,7 @@ inline void SAL_CALL CXTDataObject::InitializeFormatEtcContainer( )
 {
     if ( !m_bFormatEtcContainerInitialized )
     {
-        m_FormatRegistrar.RegisterFormats( m_XTransferable, m_FormatEtcContainer );
+        m_FormatRegistrar.RegisterFormats( m_XTransferable, m_FormatEtcContainer );	
         m_bFormatEtcContainerInitialized = sal_True;
     }
 }
@@ -755,7 +755,7 @@ STDMETHODIMP CEnumFormatEtc::QueryInterface( REFIID iid, LPVOID* ppvObject )
 
     *ppvObject = NULL;
 
-    if ( ( __uuidof( IUnknown ) == iid ) ||
+    if ( ( __uuidof( IUnknown ) == iid ) || 
          ( __uuidof( IEnumFORMATETC ) == iid ) )
     {
         *ppvObject = static_cast< IUnknown* >( this );
@@ -773,7 +773,7 @@ STDMETHODIMP CEnumFormatEtc::QueryInterface( REFIID iid, LPVOID* ppvObject )
 STDMETHODIMP_(ULONG) CEnumFormatEtc::AddRef( )
 {
     // keep the dataobject alive
-    m_lpUnkOuter->AddRef( );
+    m_lpUnkOuter->AddRef( );		
     return InterlockedIncrement( &m_nRefCnt );
 }
 
@@ -783,7 +783,7 @@ STDMETHODIMP_(ULONG) CEnumFormatEtc::AddRef( )
 
 STDMETHODIMP_(ULONG) CEnumFormatEtc::Release( )
 {
-    // release the outer dataobject
+    // release the outer dataobject		
     m_lpUnkOuter->Release( );
 
     ULONG nRefCnt = InterlockedDecrement( &m_nRefCnt );
@@ -799,7 +799,7 @@ STDMETHODIMP_(ULONG) CEnumFormatEtc::Release( )
 
 STDMETHODIMP CEnumFormatEtc::Next( ULONG nRequested, LPFORMATETC lpDest, ULONG* lpFetched )
 {
-    if ( ( nRequested < 1 ) ||
+    if ( ( nRequested < 1 ) || 
          (( nRequested > 1 ) && ( NULL == lpFetched )) ||
          IsBadWritePtr( lpDest, sizeof( FORMATETC ) * nRequested ) )
         return E_INVALIDARG;
@@ -818,7 +818,7 @@ STDMETHODIMP CEnumFormatEtc::Next( ULONG nRequested, LPFORMATETC lpDest, ULONG*
 
 STDMETHODIMP CEnumFormatEtc::Skip( ULONG celt )
 {
-    return m_FormatEtcContainer.skipFormatEtc( celt ) ? S_OK : S_FALSE;
+    return m_FormatEtcContainer.skipFormatEtc( celt ) ? S_OK : S_FALSE;	
 }
 
 //----------------------------------------------------------------------------
@@ -839,10 +839,10 @@ STDMETHODIMP CEnumFormatEtc::Clone( IEnumFORMATETC** ppenum )
 {
     if ( NULL == ppenum )
         return E_INVALIDARG;
-
+    
     *ppenum = new CEnumFormatEtc( m_lpUnkOuter, m_FormatEtcContainer );
     if ( NULL != ppenum )
-        static_cast< LPUNKNOWN >( *ppenum )->AddRef( );
+        static_cast< LPUNKNOWN >( *ppenum )->AddRef( );		
 
     return ( NULL != *ppenum ) ? S_OK : E_OUTOFMEMORY;
 }
diff --git a/dtrans/source/win32/dtobj/XTDataObject.hxx b/dtrans/source/win32/dtobj/XTDataObject.hxx
index b7b20af56ac7..530e8a832b52 100644
--- a/dtrans/source/win32/dtobj/XTDataObject.hxx
+++ b/dtrans/source/win32/dtobj/XTDataObject.hxx
@@ -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
@@ -61,12 +61,12 @@
       a clipboard client ask for the available formats on the clipboard
       and decides if there is a format he can use
       if there is one, he requests the data in this format
-
-    - This class inherits from IDataObject an so can be placed on the
-      OleClipboard. The class wrapps a transferable object which is the
+      
+    - This class inherits from IDataObject an so can be placed on the 
+      OleClipboard. The class wrapps a transferable object which is the 
       original DataSource
     - DataFlavors offerd by this transferable will be translated into
-      appropriate clipboard formats
+      appropriate clipboard formats 
     - if the transferable contains text data always text and unicodetext
       will be offered or vice versa
     - text data will be automaticaly converted between text und unicode text
@@ -83,7 +83,7 @@ public:
     CXTDataObject( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& aServiceManager,
                    const ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::XTransferable >& aXTransferable );
     virtual ~CXTDataObject() {}
-
+    
     //-----------------------------------------------------------------
     // ole interface implementation
     //-----------------------------------------------------------------
@@ -106,15 +106,15 @@ public:
 
     operator IDataObject*( );
 
-private:
-    com::sun::star::datatransfer::DataFlavor SAL_CALL formatEtcToDataFlavor( const FORMATETC& aFormatEtc ) const;
-
+private:	
+    com::sun::star::datatransfer::DataFlavor SAL_CALL formatEtcToDataFlavor( const FORMATETC& aFormatEtc ) const;	
+    
     void SAL_CALL renderDataAndSetupStgMedium( const sal_Int8* lpStorage,
-                                               const FORMATETC& fetc,
+                                               const FORMATETC& fetc, 
                                                sal_uInt32 nInitStgSize,
                                                sal_uInt32 nBytesToTransfer,
                                                STGMEDIUM& stgmedium );
-
+    
     void SAL_CALL renderLocaleAndSetupStgMedium( FORMATETC& fetc, STGMEDIUM& stgmedium );
     void SAL_CALL renderUnicodeAndSetupStgMedium( FORMATETC& fetc, STGMEDIUM& stgmedium );
     void SAL_CALL renderAnyDataAndSetupStgMedium( FORMATETC& fetc, STGMEDIUM& stgmedium );
@@ -124,29 +124,29 @@ private:
     void    SAL_CALL renderSynthesizedTextAndSetupStgMedium( FORMATETC& fetc, STGMEDIUM& stgmedium );
     void    SAL_CALL renderSynthesizedHtmlAndSetupStgMedium( FORMATETC& fetc, STGMEDIUM& stgmedium );
 
-    void SAL_CALL setupStgMedium( const FORMATETC& fetc,
-                                  CStgTransferHelper& stgTransHlp,
+    void SAL_CALL setupStgMedium( const FORMATETC& fetc, 
+                                  CStgTransferHelper& stgTransHlp, 
                                   STGMEDIUM& stgmedium );
-
-    void validateFormatEtc( LPFORMATETC lpFormatEtc ) const;
+    
+    void validateFormatEtc( LPFORMATETC lpFormatEtc ) const;	
     void SAL_CALL invalidateStgMedium( STGMEDIUM& stgmedium ) const;
 
     HRESULT SAL_CALL translateStgExceptionCode( HRESULT hr ) const;
 
     inline void SAL_CALL InitializeFormatEtcContainer( );
 
-private:
-    LONG m_nRefCnt;
+private:	
+    LONG m_nRefCnt;	
     const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > m_SrvMgr;
     ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::XTransferable >      m_XTransferable;
-    CFormatEtcContainer                                                                    m_FormatEtcContainer;
+    CFormatEtcContainer																       m_FormatEtcContainer;
     sal_Bool                                                                               m_bFormatEtcContainerInitialized;
-    CDataFormatTranslator                                                                  m_DataFormatTranslator;
-    CFormatRegistrar                                                                       m_FormatRegistrar;
+    CDataFormatTranslator															       m_DataFormatTranslator;
+    CFormatRegistrar																       m_FormatRegistrar;	
 };
 
 //------------------------------------------------------------------------
-//
+// 
 //------------------------------------------------------------------------
 
 class CEnumFormatEtc : public IEnumFORMATETC
@@ -154,22 +154,22 @@ class CEnumFormatEtc : public IEnumFORMATETC
 public:
     CEnumFormatEtc( LPUNKNOWN lpUnkOuter, const CFormatEtcContainer& aFormatEtcContainer );
     virtual ~CEnumFormatEtc() {}
-
-    // IUnknown
+    
+    // IUnknown 
     STDMETHODIMP           QueryInterface( REFIID iid, LPVOID* ppvObject );
     STDMETHODIMP_( ULONG ) AddRef( );
     STDMETHODIMP_( ULONG ) Release( );
 
-    //IEnumFORMATETC
+    //IEnumFORMATETC 
     STDMETHODIMP Next( ULONG nRequested, LPFORMATETC lpDest, ULONG* lpFetched );
     STDMETHODIMP Skip( ULONG celt );
     STDMETHODIMP Reset( );
     STDMETHODIMP Clone( IEnumFORMATETC** ppenum );
 
 private:
-    LONG                m_nRefCnt;
+    LONG	            m_nRefCnt;
     LPUNKNOWN           m_lpUnkOuter;
-    CFormatEtcContainer m_FormatEtcContainer;
+    CFormatEtcContainer m_FormatEtcContainer;    
 };
 
 typedef CEnumFormatEtc *PCEnumFormatEtc;
diff --git a/dtrans/source/win32/ftransl/ftransl.cxx b/dtrans/source/win32/ftransl/ftransl.cxx
index c0a8264a71b8..6d995b362132 100644
--- a/dtrans/source/win32/ftransl/ftransl.cxx
+++ b/dtrans/source/win32/ftransl/ftransl.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
@@ -55,14 +55,14 @@
 #define IMPL_NAME  "com.sun.star.datatransfer.DataFormatTranslator"
 
 #define MODULE_PRIVATE
-#define CPPUTYPE_SEQSALINT8       getCppuType( (const Sequence< sal_Int8 >*) 0 )
-#define CPPUTYPE_DEFAULT          CPPUTYPE_SEQSALINT8
-#define CPPUTYPE_OUSTR            getCppuType( (const ::rtl::OUString*) 0 )
+#define CPPUTYPE_SEQSALINT8		  getCppuType( (const Sequence< sal_Int8 >*) 0 )
+#define CPPUTYPE_DEFAULT		  CPPUTYPE_SEQSALINT8
+#define CPPUTYPE_OUSTR			  getCppuType( (const ::rtl::OUString*) 0 )
 #define CPPUTYPE_SALINT32         getCppuType( ( sal_Int32 * ) 0 )
-#define OUSTR( str )              OUString::createFromAscii( #str )
+#define OUSTR( str )			  OUString::createFromAscii( #str )
 #define OUSTR_( str )             OUString::createFromAscii( str )
 #define EMPTY_OUSTR               OUString::createFromAscii( "" )
-//#define PRIVATE_OO                  OUString::createFromAscii( "application/x-openoffice;" "windows_formatname=" )
+//#define PRIVATE_OO				  OUString::createFromAscii( "application/x-openoffice;" "windows_formatname=" )
 
 const rtl::OUString Windows_FormatName = rtl::OUString::createFromAscii("windows_formatname");
 const com::sun::star::uno::Type CppuType_ByteSequence = ::getCppuType((const com::sun::star::uno::Sequence<sal_Int8>*)0);
@@ -125,7 +125,7 @@ FormatEntry::FormatEntry(
 
     aStandardFormatId = std_clipboard_format_id;
 }
-
+    
 //------------------------------------------------------------------------
 // ctor
 //------------------------------------------------------------------------
@@ -133,7 +133,7 @@ FormatEntry::FormatEntry(
 CDataFormatTranslator::CDataFormatTranslator( const Reference< XMultiServiceFactory >& rSrvMgr ) :
     m_SrvMgr( rSrvMgr )
 {
-    initTranslationTable( );
+    initTranslationTable( );	
 }
 
 //------------------------------------------------------------------------
@@ -241,7 +241,7 @@ OUString SAL_CALL CDataFormatTranslator::getImplementationName(  )
 }
 
 // -------------------------------------------------
-//  XServiceInfo
+//	XServiceInfo
 // -------------------------------------------------
 
 sal_Bool SAL_CALL CDataFormatTranslator::supportsService( const OUString& ServiceName )
@@ -257,7 +257,7 @@ sal_Bool SAL_CALL CDataFormatTranslator::supportsService( const OUString& Servic
 }
 
 // -------------------------------------------------
-//  XServiceInfo
+//	XServiceInfo
 // -------------------------------------------------
 
 Sequence< OUString > SAL_CALL CDataFormatTranslator::getSupportedServiceNames( )
@@ -276,23 +276,23 @@ Sequence< OUString > SAL_CALL CDataFormatTranslator::getSupportedServiceNames( )
 // -------------------------------------------------
 
 void SAL_CALL CDataFormatTranslator::initTranslationTable()
-{
+{    
     //SOT_FORMATSTR_ID_DIF
-    m_TranslTable.push_back(FormatEntry("application/x-openoffice-dif;windows_formatname=\"DIF\"", "DIF", "DIF", CF_DIF, CPPUTYPE_DEFAULT));
+    m_TranslTable.push_back(FormatEntry("application/x-openoffice-dif;windows_formatname=\"DIF\"", "DIF", "DIF", CF_DIF, CPPUTYPE_DEFAULT)); 
     // SOT_FORMAT_BITMAP
     m_TranslTable.push_back(FormatEntry("application/x-openoffice-bitmap;windows_formatname=\"Bitmap\"", "Bitmap", "Bitmap", CF_DIB, CPPUTYPE_DEFAULT));
-    // SOT_FORMAT_STRING
+    // SOT_FORMAT_STRING	
     m_TranslTable.push_back(FormatEntry("text/plain;charset=utf-16", "Unicode-Text", "", CF_UNICODETEXT, CppuType_String));
     // Format Locale - for internal use
     m_TranslTable.push_back(FormatEntry("application/x-openoffice-locale;windows_formatname=\"Locale\"", "Locale", "Locale", CF_LOCALE, CPPUTYPE_DEFAULT));
     // SOT_FORMAT_WMF
     m_TranslTable.push_back(FormatEntry("application/x-openoffice-wmf;windows_formatname=\"Image WMF\"", "Windows MetaFile", "Image WMF", CF_METAFILEPICT, CPPUTYPE_DEFAULT));
-    // SOT_FORMAT_EMF
+    // SOT_FORMAT_EMF	
     m_TranslTable.push_back(FormatEntry("application/x-openoffice-emf;windows_formatname=\"Image EMF\"", "Windows Enhanced MetaFile", "Image EMF", CF_ENHMETAFILE, CPPUTYPE_DEFAULT));
-    // SOT_FORMAT_FILE_LIST
+    // SOT_FORMAT_FILE_LIST	
     m_TranslTable.push_back(FormatEntry("application/x-openoffice-filelist;windows_formatname=\"FileList\"", "FileList", "FileList", CF_HDROP, CPPUTYPE_DEFAULT));
     //SOT_FORMATSTR_ID_SYLK
-    m_TranslTable.push_back(FormatEntry("application/x-openoffice-sylk;windows_formatname=\"Sylk\"", "Sylk", "Sylk", CF_SYLK, CPPUTYPE_DEFAULT ) );
+    m_TranslTable.push_back(FormatEntry("application/x-openoffice-sylk;windows_formatname=\"Sylk\"", "Sylk", "Sylk", CF_SYLK, CPPUTYPE_DEFAULT ) );	
     // SOT_FORMAT_GDIMETAFILE
     m_TranslTable.push_back(FormatEntry("application/x-openoffice-gdimetafile;windows_formatname=\"GDIMetaFile\"", "GDIMetaFile", NULL, CF_INVALID, CPPUTYPE_DEFAULT));
     // SOT_FORMAT_PRIVATE
@@ -302,19 +302,19 @@ void SAL_CALL CDataFormatTranslator::initTranslationTable()
     // SOT_FORMAT_RTF
     m_TranslTable.push_back(FormatEntry("text/richtext", "Rich Text Format", NULL, CF_INVALID, CPPUTYPE_DEFAULT));
     // SOT_FORMATSTR_ID_DRAWING
-    m_TranslTable.push_back(FormatEntry("application/x-openoffice-drawing;windows_formatname=\"Drawing Format\"", "Drawing Format", NULL, CF_INVALID, CPPUTYPE_DEFAULT));
+    m_TranslTable.push_back(FormatEntry("application/x-openoffice-drawing;windows_formatname=\"Drawing Format\"", "Drawing Format", NULL, CF_INVALID, CPPUTYPE_DEFAULT)); 
     // SOT_FORMATSTR_ID_SVXB
     m_TranslTable.push_back(FormatEntry("application/x-openoffice-svbx;windows_formatname=\"SVXB (StarView Bitmap/Animation)\"", "SVXB (StarView Bitmap/Animation)", NULL, CF_INVALID, CPPUTYPE_DEFAULT));
     // SOT_FORMATSTR_ID_SVIM
     m_TranslTable.push_back(FormatEntry("application/x-openoffice-svim;windows_formatname=\"SVIM (StarView ImageMap)\"", "SVIM (StarView ImageMap)", NULL, CF_INVALID, CPPUTYPE_DEFAULT));
     // SOT_FORMATSTR_ID_XFA
     m_TranslTable.push_back(FormatEntry("application/x-openoffice-xfa;windows_formatname=\"XFA (XOutDev FillAttr)\"", "XFA (XOutDev FillAttr)", NULL, CF_INVALID, CPPUTYPE_DEFAULT));
-    // SOT_FORMATSTR_ID_EDITENGINE
-    m_TranslTable.push_back(FormatEntry("application/x-openoffice-editengine;windows_formatname=\"EditEngineFormat\"", "EditEngineFormat", NULL, CF_INVALID, CPPUTYPE_DEFAULT));
+    // SOT_FORMATSTR_ID_EDITENGINE 
+    m_TranslTable.push_back(FormatEntry("application/x-openoffice-editengine;windows_formatname=\"EditEngineFormat\"", "EditEngineFormat", NULL, CF_INVALID, CPPUTYPE_DEFAULT)); 
     // SOT_FORMATSTR_ID_INTERNALLINK_STATE
-    m_TranslTable.push_back(FormatEntry("application/x-openoffice-internallink-state;windows_formatname=\"StatusInfo vom SvxInternalLink\"", "StatusInfo vom SvxInternalLink", NULL, CF_INVALID, CPPUTYPE_DEFAULT));
+    m_TranslTable.push_back(FormatEntry("application/x-openoffice-internallink-state;windows_formatname=\"StatusInfo vom SvxInternalLink\"", "StatusInfo vom SvxInternalLink", NULL, CF_INVALID, CPPUTYPE_DEFAULT)); 
     // SOT_FORMATSTR_ID_SOLK
-    m_TranslTable.push_back(FormatEntry("application/x-openoffice-solk;windows_formatname=\"SOLK (StarOffice Link)\"", "SOLK (StarOffice Link)", NULL, CF_INVALID, CPPUTYPE_DEFAULT));
+    m_TranslTable.push_back(FormatEntry("application/x-openoffice-solk;windows_formatname=\"SOLK (StarOffice Link)\"", "SOLK (StarOffice Link)", NULL, CF_INVALID, CPPUTYPE_DEFAULT)); 
     // SOT_FORMATSTR_ID_NETSCAPE_BOOKMARK
     m_TranslTable.push_back(FormatEntry("application/x-openoffice-netscape-bookmark;windows_formatname=\"Netscape Bookmark\"", "Netscape Bookmark", NULL, CF_INVALID, CPPUTYPE_DEFAULT));
     // SOT_FORMATSTR_ID_TREELISTBOX
@@ -322,7 +322,7 @@ void SAL_CALL CDataFormatTranslator::initTranslationTable()
     // SOT_FORMATSTR_ID_NATIVE
     m_TranslTable.push_back(FormatEntry("application/x-openoffice-native;windows_formatname=\"Native\"", "Native", NULL, CF_INVALID, CPPUTYPE_DEFAULT));
     // SOT_FORMATSTR_ID_OWNERLINK
-    m_TranslTable.push_back(FormatEntry("application/x-openoffice-ownerlink;windows_formatname=\"OwnerLink\"", "OwnerLink", NULL, CF_INVALID, CPPUTYPE_DEFAULT));
+    m_TranslTable.push_back(FormatEntry("application/x-openoffice-ownerlink;windows_formatname=\"OwnerLink\"", "OwnerLink", NULL, CF_INVALID, CPPUTYPE_DEFAULT));	
     // SOT_FORMATSTR_ID_STARSERVER
     m_TranslTable.push_back(FormatEntry("application/x-openoffice-starserver;windows_formatname=\"StarServerFormat\"", "StarServerFormat", NULL, CF_INVALID, CPPUTYPE_DEFAULT));
     // SOT_FORMATSTR_ID_STAROBJECT
@@ -362,7 +362,7 @@ void SAL_CALL CDataFormatTranslator::initTranslationTable()
     // SOT_FORMATSTR_ID_STARCHART
     m_TranslTable.push_back(FormatEntry("application/x-openoffice-starchart;windows_formatname=\"StarChartDocument\"", "StarChartDocument", NULL, CF_INVALID, CPPUTYPE_DEFAULT));
     // SOT_FORMATSTR_ID_STARCHART_40
-    m_TranslTable.push_back(FormatEntry("application/x-openoffice-starchart-40;windows_formatname=\"StarChartDocument 4.0\"", "StarChartDocument 4.0", NULL, CF_INVALID, CPPUTYPE_DEFAULT));
+    m_TranslTable.push_back(FormatEntry("application/x-openoffice-starchart-40;windows_formatname=\"StarChartDocument 4.0\"", "StarChartDocument 4.0", NULL, CF_INVALID, CPPUTYPE_DEFAULT));	
     // SOT_FORMATSTR_ID_STARCHART_50
     m_TranslTable.push_back(FormatEntry("application/x-openoffice-starchart-50;windows_formatname=\"StarChart 5.0\"", "StarChart 5.0", NULL, CF_INVALID, CPPUTYPE_DEFAULT));
     //SOT_FORMATSTR_ID_STARIMAGE
@@ -370,7 +370,7 @@ void SAL_CALL CDataFormatTranslator::initTranslationTable()
     //SOT_FORMATSTR_ID_STARIMAGE_40
     m_TranslTable.push_back(FormatEntry("application/x-openoffice-starimage-40;windows_formatname=\"StarImageDocument 4.0\"", "StarImageDocument 4.0", NULL, CF_INVALID, CPPUTYPE_DEFAULT));
     //SOT_FORMATSTR_ID_STARIMAGE_50
-    m_TranslTable.push_back(FormatEntry("application/x-openoffice-starimage-50;windows_formatname=\"StarImage 5.0\"",  "StarImage 5.0", NULL, CF_INVALID, CPPUTYPE_DEFAULT));
+    m_TranslTable.push_back(FormatEntry("application/x-openoffice-starimage-50;windows_formatname=\"StarImage 5.0\"",  "StarImage 5.0", NULL, CF_INVALID, CPPUTYPE_DEFAULT));	
     //SOT_FORMATSTR_ID_STARMATH
     m_TranslTable.push_back(FormatEntry("application/x-openoffice-starmath;windows_formatname=\"StarMath\"", "StarMath", NULL, CF_INVALID, CPPUTYPE_DEFAULT));
     //SOT_FORMATSTR_ID_STARMATH_40
@@ -378,7 +378,7 @@ void SAL_CALL CDataFormatTranslator::initTranslationTable()
     //SOT_FORMATSTR_ID_STARMATH_50
     m_TranslTable.push_back(FormatEntry("application/x-openoffice-starmath-50;windows_formatname=\"StarMath 5.0\"", "StarMath 5.0", NULL, CF_INVALID, CPPUTYPE_DEFAULT));
     //SOT_FORMATSTR_ID_STAROBJECT_PAINTDOC
-    m_TranslTable.push_back(FormatEntry("application/x-openoffice-starobject-paintdoc;windows_formatname=\"StarObjectPaintDocument\"", "StarObjectPaintDocument", NULL, CF_INVALID, CPPUTYPE_DEFAULT));
+    m_TranslTable.push_back(FormatEntry("application/x-openoffice-starobject-paintdoc;windows_formatname=\"StarObjectPaintDocument\"", "StarObjectPaintDocument", NULL, CF_INVALID, CPPUTYPE_DEFAULT));	
     //SOT_FORMATSTR_ID_FILLED_AREA
     m_TranslTable.push_back(FormatEntry("application/x-openoffice-filled-area;windows_formatname=\"FilledArea\"", "FilledArea", NULL, CF_INVALID, CPPUTYPE_DEFAULT));
     //SOT_FORMATSTR_ID_HTML
@@ -390,32 +390,32 @@ void SAL_CALL CDataFormatTranslator::initTranslationTable()
     //SOT_FORMATSTR_ID_CNT_MSGATTACHFILE
     m_TranslTable.push_back(FormatEntry("application/x-openoffice-msgattachfile;windows_formatname=\"CNT_MSGATTACHFILE_FORMAT\"", "CNT_MSGATTACHFILE_FORMAT", NULL, CF_INVALID, CPPUTYPE_DEFAULT));
     //SOT_FORMATSTR_ID_BIFF_5
-    m_TranslTable.push_back(FormatEntry("application/x-openoffice-biff5;windows_formatname=\"Biff5\"", "Biff5", NULL, CF_INVALID, CPPUTYPE_DEFAULT));
+    m_TranslTable.push_back(FormatEntry("application/x-openoffice-biff5;windows_formatname=\"Biff5\"", "Biff5", NULL, CF_INVALID, CPPUTYPE_DEFAULT));	
     //SOT_FORMATSTR_ID_BIFF__5
-    m_TranslTable.push_back(FormatEntry("application/x-openoffice-biff-5;windows_formatname=\"Biff 5\"", "Biff 5", NULL, CF_INVALID, CPPUTYPE_DEFAULT));
+    m_TranslTable.push_back(FormatEntry("application/x-openoffice-biff-5;windows_formatname=\"Biff 5\"", "Biff 5", NULL, CF_INVALID, CPPUTYPE_DEFAULT));	
     //SOT_FORMATSTR_ID_BIFF_8
-    m_TranslTable.push_back(FormatEntry("application/x-openoffice-biff-8;windows_formatname=\"Biff8\"", "Biff8", NULL, CF_INVALID, CPPUTYPE_DEFAULT));
+    m_TranslTable.push_back(FormatEntry("application/x-openoffice-biff-8;windows_formatname=\"Biff8\"", "Biff8", NULL, CF_INVALID, CPPUTYPE_DEFAULT));        
     //SOT_FORMATSTR_ID_SYLK_BIGCAPS
-    m_TranslTable.push_back(FormatEntry("application/x-openoffice-sylk-bigcaps;windows_formatname=\"SYLK\"", "SYLK", NULL, CF_INVALID, CPPUTYPE_DEFAULT));
+    m_TranslTable.push_back(FormatEntry("application/x-openoffice-sylk-bigcaps;windows_formatname=\"SYLK\"", "SYLK", NULL, CF_INVALID, CPPUTYPE_DEFAULT)); 
     //SOT_FORMATSTR_ID_LINK
     m_TranslTable.push_back(FormatEntry("application/x-openoffice-link;windows_formatname=\"Link\"", "Link", NULL, CF_INVALID, CPPUTYPE_DEFAULT));
     //SOT_FORMATSTR_ID_STARDRAW_TABBAR
-    m_TranslTable.push_back(FormatEntry("application/x-openoffice-stardraw-tabbar;windows_formatname=\"StarDraw TabBar\"", "StarDraw TabBar", NULL, CF_INVALID, CPPUTYPE_DEFAULT));
+    m_TranslTable.push_back(FormatEntry("application/x-openoffice-stardraw-tabbar;windows_formatname=\"StarDraw TabBar\"", "StarDraw TabBar", NULL, CF_INVALID, CPPUTYPE_DEFAULT));	
     //SOT_FORMATSTR_ID_SONLK
     m_TranslTable.push_back(FormatEntry("application/x-openoffice-sonlk;windows_formatname=\"SONLK (StarOffice Navi Link)\"", "SONLK (StarOffice Navi Link)", NULL, CF_INVALID, CPPUTYPE_DEFAULT));
     //SOT_FORMATSTR_ID_MSWORD_DOC
-    m_TranslTable.push_back(FormatEntry("application/msword", "MSWordDoc", NULL, CF_INVALID, CPPUTYPE_DEFAULT));
+    m_TranslTable.push_back(FormatEntry("application/msword", "MSWordDoc", NULL, CF_INVALID, CPPUTYPE_DEFAULT));			
     //SOT_FORMATSTR_ID_STAR_FRAMESET_DOC
     m_TranslTable.push_back(FormatEntry("application/x-openoffice-star-frameset-doc;windows_formatname=\"StarFrameSetDocument\"", "StarFrameSetDocument", NULL, CF_INVALID, CPPUTYPE_DEFAULT));
     //SOT_FORMATSTR_ID_OFFICE_DOC
     m_TranslTable.push_back(FormatEntry("application/x-openoffice-office-doc;windows_formatname=\"OfficeDocument\"", "OfficeDocument", NULL, CF_INVALID, CPPUTYPE_DEFAULT));
     //SOT_FORMATSTR_ID_NOTES_DOCINFO
-    m_TranslTable.push_back(FormatEntry("application/x-openoffice-notes-docinfo;windows_formatname=\"NotesDocInfo\"", "NotesDocInfo", NULL, CF_INVALID, CPPUTYPE_DEFAULT));
+    m_TranslTable.push_back(FormatEntry("application/x-openoffice-notes-docinfo;windows_formatname=\"NotesDocInfo\"", "NotesDocInfo", NULL, CF_INVALID, CPPUTYPE_DEFAULT));	
     //SOT_FORMATSTR_ID_NOTES_HNOTE
     m_TranslTable.push_back(FormatEntry("application/x-openoffice-notes-hnote;windows_formatname=\"NoteshNote\"", "NoteshNote", NULL, CF_INVALID, CPPUTYPE_DEFAULT));
     //SOT_FORMATSTR_ID_NOTES_NATIVE
-    m_TranslTable.push_back(FormatEntry("application/x-openoffice-notes-native;windows_formatname=\"Native\"", "Native", NULL, CF_INVALID, CPPUTYPE_DEFAULT));
-    //SOT_FORMATSTR_ID_SFX_DOC
+    m_TranslTable.push_back(FormatEntry("application/x-openoffice-notes-native;windows_formatname=\"Native\"", "Native", NULL, CF_INVALID, CPPUTYPE_DEFAULT));		
+    //SOT_FORMATSTR_ID_SFX_DOC	
     m_TranslTable.push_back(FormatEntry("application/x-openoffice-sfx-doc;windows_formatname=\"SfxDocument\"", "SfxDocument", NULL, CF_INVALID, CPPUTYPE_DEFAULT));
     //SOT_FORMATSTR_ID_EVDF
     m_TranslTable.push_back(FormatEntry("application/x-openoffice-evdf;windows_formatname=\"EVDF (Explorer View Dummy Format)\"", "EVDF (Explorer View Dummy Format)", NULL, CF_INVALID, CPPUTYPE_DEFAULT));
@@ -424,9 +424,9 @@ void SAL_CALL CDataFormatTranslator::initTranslationTable()
     //SOT_FORMATSTR_ID_IDF
     m_TranslTable.push_back(FormatEntry("application/x-openoffice-idf;windows_formatname=\"IDF (Iconview Dummy Format)\"", "IDF (Iconview Dummy Format)", NULL, CF_INVALID, CPPUTYPE_DEFAULT));
     //SOT_FORMATSTR_ID_EFTP
-    m_TranslTable.push_back(FormatEntry("application/x-openoffice-eftp;windows_formatname=\"EFTP (Explorer Ftp File)\"", "EFTP (Explorer Ftp File)", NULL, CF_INVALID, CPPUTYPE_DEFAULT));
+    m_TranslTable.push_back(FormatEntry("application/x-openoffice-eftp;windows_formatname=\"EFTP (Explorer Ftp File)\"", "EFTP (Explorer Ftp File)", NULL, CF_INVALID, CPPUTYPE_DEFAULT));	
     //SOT_FORMATSTR_ID_EFD
-    m_TranslTable.push_back(FormatEntry("application/x-openoffice-efd;windows_formatname=\"EFD (Explorer Ftp Dir)\"", "EFD (Explorer Ftp Dir)", NULL, CF_INVALID, CPPUTYPE_DEFAULT));
+    m_TranslTable.push_back(FormatEntry("application/x-openoffice-efd;windows_formatname=\"EFD (Explorer Ftp Dir)\"", "EFD (Explorer Ftp Dir)", NULL, CF_INVALID, CPPUTYPE_DEFAULT));	
     //SOT_FORMATSTR_ID_SVX_FORMFIELDEXCH
     m_TranslTable.push_back(FormatEntry("application/x-openoffice-svx-formfieldexch;windows_formatname=\"SvxFormFieldExch\"", "SvxFormFieldExch", NULL, CF_INVALID, CPPUTYPE_DEFAULT));
     //SOT_FORMATSTR_ID_EXTENDED_TABBAR
@@ -434,13 +434,13 @@ void SAL_CALL CDataFormatTranslator::initTranslationTable()
     //SOT_FORMATSTR_ID_SBA_DATAEXCHANGE
     m_TranslTable.push_back(FormatEntry("application/x-openoffice-sba-dataexchange;windows_formatname=\"SBA-DATAFORMAT\"", "SBA-DATAFORMAT", NULL, CF_INVALID, CPPUTYPE_DEFAULT));
     //SOT_FORMATSTR_ID_SBA_FIELDDATAEXCHANGE
-    m_TranslTable.push_back(FormatEntry("application/x-openoffice-sba-fielddataexchange;windows_formatname=\"SBA-FIELDFORMAT\"", "SBA-FIELDFORMAT", NULL, CF_INVALID, CPPUTYPE_DEFAULT));
+    m_TranslTable.push_back(FormatEntry("application/x-openoffice-sba-fielddataexchange;windows_formatname=\"SBA-FIELDFORMAT\"", "SBA-FIELDFORMAT", NULL, CF_INVALID, CPPUTYPE_DEFAULT));	
     //SOT_FORMATSTR_ID_SBA_PRIVATE_URL
     m_TranslTable.push_back(FormatEntry("application/x-openoffice-sba-private-url;windows_formatname=\"SBA-PRIVATEURLFORMAT\"", "SBA-PRIVATEURLFORMAT", NULL, CF_INVALID, CPPUTYPE_DEFAULT));
     //SOT_FORMATSTR_ID_SBA_TABED
-    m_TranslTable.push_back(FormatEntry("application/x-openoffice-sba-tabed;windows_formatname=\"Tabed\"", "Tabed", NULL, CF_INVALID, CPPUTYPE_DEFAULT));
+    m_TranslTable.push_back(FormatEntry("application/x-openoffice-sba-tabed;windows_formatname=\"Tabed\"", "Tabed", NULL, CF_INVALID, CPPUTYPE_DEFAULT));	
     //SOT_FORMATSTR_ID_SBA_TABID
-    m_TranslTable.push_back(FormatEntry("application/x-openoffice-sba-tabid;windows_formatname=\"Tabid\"", "Tabid", NULL, CF_INVALID, CPPUTYPE_DEFAULT));
+    m_TranslTable.push_back(FormatEntry("application/x-openoffice-sba-tabid;windows_formatname=\"Tabid\"", "Tabid", NULL, CF_INVALID, CPPUTYPE_DEFAULT));	
     //SOT_FORMATSTR_ID_SBA_JOIN
     m_TranslTable.push_back(FormatEntry("application/x-openoffice-sba-join;windows_formatname=\"SBA-JOINFORMAT\"", "SBA-JOINFORMAT", NULL, CF_INVALID, CPPUTYPE_DEFAULT));
     //SOT_FORMATSTR_ID_OBJECTDESCRIPTOR
@@ -454,27 +454,27 @@ void SAL_CALL CDataFormatTranslator::initTranslationTable()
     //SOT_FORMATSTR_ID_EMBEDDED_OBJ
     m_TranslTable.push_back(FormatEntry("application/x-openoffice-embedded-obj-xml;windows_formatname=\"Star Embedded Object (XML)\"", "Star Embedded Object (XML)", NULL, CF_INVALID, CPPUTYPE_DEFAULT));
     //SOT_FORMATSTR_ID_FILECONTENT
-    m_TranslTable.push_back(FormatEntry("application/x-openoffice-filecontent;windows_formatname=\"" CFSTR_FILECONTENTS "\"", CFSTR_FILECONTENTS, NULL, CF_INVALID, CPPUTYPE_DEFAULT));
+    m_TranslTable.push_back(FormatEntry("application/x-openoffice-filecontent;windows_formatname=\"" CFSTR_FILECONTENTS "\"", CFSTR_FILECONTENTS, NULL, CF_INVALID, CPPUTYPE_DEFAULT));	
     //SOT_FORMATSTR_ID_FILEGRPDESCRIPTOR
     m_TranslTable.push_back(FormatEntry("application/x-openoffice-filegrpdescriptor;windows_formatname=\"" CFSTR_FILEDESCRIPTOR "\"", CFSTR_FILEDESCRIPTOR, NULL, CF_INVALID, CPPUTYPE_DEFAULT));
     //SOT_FORMATSTR_ID_FILENAME
-    m_TranslTable.push_back(FormatEntry("application/x-openoffice-filename;windows_formatname=\"" CFSTR_FILENAME "\"", CFSTR_FILENAME, NULL, CF_INVALID, CPPUTYPE_DEFAULT));
+    m_TranslTable.push_back(FormatEntry("application/x-openoffice-filename;windows_formatname=\"" CFSTR_FILENAME "\"", CFSTR_FILENAME, NULL, CF_INVALID, CPPUTYPE_DEFAULT));	
     //SOT_FORMATSTR_ID_SD_OLE
     m_TranslTable.push_back(FormatEntry("application/x-openoffice-sd-ole;windows_formatname=\"SD-OLE\"", "SD-OLE", NULL, CF_INVALID, CPPUTYPE_DEFAULT));
     //SOT_FORMATSTR_ID_EMBEDDED_OBJ_OLE
-    m_TranslTable.push_back(FormatEntry("application/x-openoffice-embedded-obj-ole;windows_formatname=\"Embedded Object\"", "Embedded Object", NULL, CF_INVALID, CPPUTYPE_DEFAULT));
+    m_TranslTable.push_back(FormatEntry("application/x-openoffice-embedded-obj-ole;windows_formatname=\"Embedded Object\"", "Embedded Object", NULL, CF_INVALID, CPPUTYPE_DEFAULT));	
     //SOT_FORMATSTR_ID_EMBED_SOURCE_OLE
     m_TranslTable.push_back(FormatEntry("application/x-openoffice-embed-source-ole;windows_formatname=\"Embed Source\"", "Embed Source", NULL, CF_INVALID, CPPUTYPE_DEFAULT));
     //SOT_FORMATSTR_ID_OBJECTDESCRIPTOR_OLE
-    m_TranslTable.push_back(FormatEntry("application/x-openoffice-objectdescriptor-ole;windows_formatname=\"Object Descriptor\"", "Object Descriptor", NULL, CF_INVALID, CPPUTYPE_DEFAULT));
+    m_TranslTable.push_back(FormatEntry("application/x-openoffice-objectdescriptor-ole;windows_formatname=\"Object Descriptor\"", "Object Descriptor", NULL, CF_INVALID, CPPUTYPE_DEFAULT));	
     //SOT_FORMATSTR_ID_LINKSRCDESCRIPTOR_OLE
     m_TranslTable.push_back(FormatEntry("application/x-openoffice-linkdescriptor-ole;windows_formatname=\"Link Source Descriptor\"", "Link Source Descriptor", NULL, CF_INVALID, CPPUTYPE_DEFAULT));
     //SOT_FORMATSTR_ID_LINK_SOURCE_OLE
-    m_TranslTable.push_back(FormatEntry("application/x-openoffice-link-source-ole;windows_formatname=\"Link Source\"", "Link Source", NULL, CF_INVALID, CPPUTYPE_DEFAULT));
+    m_TranslTable.push_back(FormatEntry("application/x-openoffice-link-source-ole;windows_formatname=\"Link Source\"", "Link Source", NULL, CF_INVALID, CPPUTYPE_DEFAULT));	
     //SOT_FORMATSTR_ID_SBA_CTRLDATAEXCHANGE
     m_TranslTable.push_back(FormatEntry("application/x-openoffice-sba-ctrldataexchange;windows_formatname=\"SBA-CTRLFORMAT\"", "SBA-CTRLFORMAT", NULL, CF_INVALID, CPPUTYPE_DEFAULT));
     //SOT_FORMATSTR_ID_OUTPLACE_OBJ
-    m_TranslTable.push_back(FormatEntry("application/x-openoffice-outplace-obj;windows_formatname=\"OutPlace Object\"", "OutPlace Object", NULL, CF_INVALID, CPPUTYPE_DEFAULT));
+    m_TranslTable.push_back(FormatEntry("application/x-openoffice-outplace-obj;windows_formatname=\"OutPlace Object\"", "OutPlace Object", NULL, CF_INVALID, CPPUTYPE_DEFAULT));	
     //SOT_FORMATSTR_ID_CNT_OWN_CLIP
     m_TranslTable.push_back(FormatEntry("application/x-openoffice-cnt-own-clip;windows_formatname=\"CntOwnClipboard\"", "CntOwnClipboard", NULL, CF_INVALID, CPPUTYPE_DEFAULT));
     //SOT_FORMATSTR_ID_INET_IMAGE
@@ -482,19 +482,19 @@ void SAL_CALL CDataFormatTranslator::initTranslationTable()
     //SOT_FORMATSTR_ID_NETSCAPE_IMAGE
     m_TranslTable.push_back(FormatEntry("application/x-openoffice-netscape-image;windows_formatname=\"Netscape Image Format\"", "Netscape Image Format", NULL, CF_INVALID, CPPUTYPE_DEFAULT));
     //SOT_FORMATSTR_ID_SBA_FORMEXCHANGE
-    m_TranslTable.push_back(FormatEntry("application/x-openoffice-sba-formexchange;windows_formatname=\"SBA_FORMEXCHANGE\"", "SBA_FORMEXCHANGE", NULL, CF_INVALID, CPPUTYPE_DEFAULT));  //SOT_FORMATSTR_ID_SBA_REPORTEXCHANGE
+    m_TranslTable.push_back(FormatEntry("application/x-openoffice-sba-formexchange;windows_formatname=\"SBA_FORMEXCHANGE\"", "SBA_FORMEXCHANGE", NULL, CF_INVALID, CPPUTYPE_DEFAULT));	//SOT_FORMATSTR_ID_SBA_REPORTEXCHANGE	
     m_TranslTable.push_back(FormatEntry("application/x-openoffice-sba-reportexchange;windows_formatname=\"SBA_REPORTEXCHANGE\"", "SBA_REPORTEXCHANGE", NULL, CF_INVALID, CPPUTYPE_DEFAULT));
     //SOT_FORMATSTR_ID_UNIFORMRESOURCELOCATOR
     m_TranslTable.push_back(FormatEntry("application/x-openoffice-uniformresourcelocator;windows_formatname=\"UniformResourceLocator\"", "UniformResourceLocator", NULL, CF_INVALID, CPPUTYPE_DEFAULT));
     //SOT_FORMATSTR_ID_STARCHARTDOCUMENT_50
     m_TranslTable.push_back(FormatEntry("application/x-openoffice-starchartdocument-50;windows_formatname=\"StarChartDocument 5.0\"", "StarChartDocument 5.0", NULL, CF_INVALID, CPPUTYPE_DEFAULT));
     //SOT_FORMATSTR_ID_GRAPHOBJ
-    m_TranslTable.push_back(FormatEntry("application/x-openoffice-graphobj;windows_formatname=\"Graphic Object\"", "Graphic Object", NULL, CF_INVALID, CPPUTYPE_DEFAULT));
-    //SOT_FORMATSTR_ID_STARWRITER_60
+    m_TranslTable.push_back(FormatEntry("application/x-openoffice-graphobj;windows_formatname=\"Graphic Object\"", "Graphic Object", NULL, CF_INVALID, CPPUTYPE_DEFAULT));	
+    //SOT_FORMATSTR_ID_STARWRITER_60		
     m_TranslTable.push_back(FormatEntry("application/vnd.sun.xml.writer", "Writer 6.0", NULL, CF_INVALID, CPPUTYPE_DEFAULT));
     //SOT_FORMATSTR_ID_STARWRITERWEB_60
     m_TranslTable.push_back(FormatEntry("application/vnd.sun.xml.writer.web", "Writer/Web 6.0", NULL, CF_INVALID, CPPUTYPE_DEFAULT));
-    //SOT_FORMATSTR_ID_STARWRITERGLOB_60
+    //SOT_FORMATSTR_ID_STARWRITERGLOB_60	
     m_TranslTable.push_back(FormatEntry("application/vnd.sun.xml.writer.global", "Writer/Global 6.0", NULL, CF_INVALID, CPPUTYPE_DEFAULT));
     //SOT_FORMATSTR_ID_STARWDRAW_60
     m_TranslTable.push_back(FormatEntry("application/vnd.sun.xml.draw", "Draw 6.0", NULL, CF_INVALID, CPPUTYPE_DEFAULT));
@@ -513,7 +513,7 @@ void SAL_CALL CDataFormatTranslator::initTranslationTable()
     //SOT_FORMATSTR_ID_DUMMY3
     m_TranslTable.push_back(FormatEntry("application/x-openoffice-dummy3;windows_formatname=\"SO_DUMMYFORMAT_3\"", "SO_DUMMYFORMAT_3", NULL, CF_INVALID, CPPUTYPE_DEFAULT));
     //SOT_FORMATSTR_ID_DUMMY4
-    m_TranslTable.push_back(FormatEntry("application/x-openoffice-dummy4;windows_formatname=\"SO_DUMMYFORMAT_4\"", "SO_DUMMYFORMAT_4", NULL, CF_INVALID, CPPUTYPE_DEFAULT));
+    m_TranslTable.push_back(FormatEntry("application/x-openoffice-dummy4;windows_formatname=\"SO_DUMMYFORMAT_4\"", "SO_DUMMYFORMAT_4", NULL, CF_INVALID, CPPUTYPE_DEFAULT));	
 }
 
 // -------------------------------------------------
diff --git a/dtrans/source/win32/ftransl/ftransl.hxx b/dtrans/source/win32/ftransl/ftransl.hxx
index 631ae89cc388..081f579a3388 100644
--- a/dtrans/source/win32/ftransl/ftransl.hxx
+++ b/dtrans/source/win32/ftransl/ftransl.hxx
@@ -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
@@ -68,8 +68,8 @@ struct FormatEntry
     );
 
     com::sun::star::datatransfer::DataFlavor aDataFlavor;
-    rtl::OUString                            aNativeFormatName;
-    sal_Int32                                aStandardFormatId;
+    rtl::OUString							 aNativeFormatName;
+    sal_Int32								 aStandardFormatId;
 };
 
 //------------------------------------------------
@@ -98,7 +98,7 @@ public:
     // XServiceInfo
     //------------------------------------------------
 
-    virtual ::rtl::OUString SAL_CALL getImplementationName(  )
+    virtual ::rtl::OUString SAL_CALL getImplementationName(	 )
         throw(::com::sun::star::uno::RuntimeException);
 
     virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName )
@@ -123,8 +123,8 @@ private:
     com::sun::star::datatransfer::DataFlavor SAL_CALL mkDataFlv( const rtl::OUString& cnttype, const rtl::OUString& hpname, ::com::sun::star::uno::Type dtype );
 
 private:
-    std::vector< FormatEntry >  m_TranslTable;
-    const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >  m_SrvMgr;
+    std::vector< FormatEntry >	m_TranslTable;
+    const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >	m_SrvMgr;
 };
 
 
diff --git a/dtrans/source/win32/ftransl/ftransl.xml b/dtrans/source/win32/ftransl/ftransl.xml
index 28cddad4bbab..0e23f39aed4d 100644
--- a/dtrans/source/win32/ftransl/ftransl.xml
+++ b/dtrans/source/win32/ftransl/ftransl.xml
@@ -1,33 +1,33 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE module-description PUBLIC "-//StarOffice//DTD ComponentDescription 1.0//EN" "module-description.dtd">
 <module-description xmlns:xlink="http://www.w3.org/1999/xlink">
-    <module-name>   ftransl </module-name>
+    <module-name>	ftransl	</module-name>
     <component-description>
         <author> Tino Rachui </author>
-        <name>  com.sun.star.comp.datatransfer.DataFormatTranslator </name>
+        <name>	com.sun.star.comp.datatransfer.DataFormatTranslator </name>
         <description>
     The win32 implementation of the datatransfer service.
 </description>
-        <loader-name>   com.sun.star.loader.SharedLibrary   </loader-name>
-        <language>  c++ </language>
+        <loader-name>	com.sun.star.loader.SharedLibrary	</loader-name>
+        <language>	c++	</language>
         <status value="beta"/>
-        <supported-service> com.sun.star.datatransfer.DataFormatTranslator </supported-service>
-        <service-dependency>    ... </service-dependency>
-        <type>   com.sun.star.datatransfer.XDataFormatTranslator    </type>
-        <type>   com.sun.star.lang.XMultiServiceFactory             </type>
-        <type>   com.sun.star.lang.XSingleServiceFactory            </type>
-        <type>   com.sun.star.lang.XServiceInfo                     </type>
-        <type>   com.sun.star.lang.XTypeProvider                    </type>
-        <type>   com.sun.star.uno.TypeClass                         </type>
-        <type>   com.sun.star.uno.XWeak                             </type>
-        <type>   com.sun.star.uno.XAggregation                      </type>
-        <type>   com.sun.star.registry.XRegistryKey                 </type>
-        <type>   com.sun.star.container.XSet                        </type>
+        <supported-service>	com.sun.star.datatransfer.DataFormatTranslator </supported-service>
+        <service-dependency>	...	</service-dependency>
+        <type>	 com.sun.star.datatransfer.XDataFormatTranslator  	</type>
+        <type>	 com.sun.star.lang.XMultiServiceFactory             </type>
+        <type>	 com.sun.star.lang.XSingleServiceFactory			</type>
+        <type>	 com.sun.star.lang.XServiceInfo						</type>
+        <type>	 com.sun.star.lang.XTypeProvider					</type>
+        <type>	 com.sun.star.uno.TypeClass							</type>
+        <type>	 com.sun.star.uno.XWeak								</type>
+        <type>	 com.sun.star.uno.XAggregation						</type>
+        <type>	 com.sun.star.registry.XRegistryKey					</type>
+        <type>	 com.sun.star.container.XSet						</type>
     </component-description>
-    <project-build-dependency>  cppuhelper  </project-build-dependency>
-    <project-build-dependency>  cppu        </project-build-dependency>
-    <project-build-dependency>  sal         </project-build-dependency>
-    <runtime-module-dependency> cppuhelper  </runtime-module-dependency>
-    <runtime-module-dependency> cppu2       </runtime-module-dependency>
-    <runtime-module-dependency> sal2        </runtime-module-dependency>
+    <project-build-dependency>	cppuhelper	</project-build-dependency>
+    <project-build-dependency>	cppu		</project-build-dependency>
+    <project-build-dependency>	sal			</project-build-dependency>
+    <runtime-module-dependency>	cppuhelper	</runtime-module-dependency>
+    <runtime-module-dependency>	cppu2		</runtime-module-dependency>
+    <runtime-module-dependency>	sal2		</runtime-module-dependency>
 </module-description>
diff --git a/dtrans/source/win32/ftransl/ftranslentry.cxx b/dtrans/source/win32/ftransl/ftranslentry.cxx
index 01d1521b15bc..c8648b7edb4c 100644
--- a/dtrans/source/win32/ftransl/ftranslentry.cxx
+++ b/dtrans/source/win32/ftransl/ftranslentry.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
@@ -29,7 +29,7 @@
 #include "precompiled_dtrans.hxx"
 
 //-----------------------------------------------------------------
-//  includes of other projects
+//	includes of other projects
 //-----------------------------------------------------------------
 #include <cppuhelper/factory.hxx>
 #include <com/sun/star/container/XSet.hpp>
@@ -47,36 +47,36 @@
 // the service names
 #define SERVICE_NAME  "com.sun.star.datatransfer.DataFormatTranslator"
 
-// the implementation names
+// the implementation names		
 #define IMPL_NAME  "com.sun.star.datatransfer.DataFormatTranslator"
 
 // the registry key names
 // a key under which this service will be registered, Format: -> "/ImplName/UNO/SERVICES/ServiceName"
-//                        <     Implementation-Name    ></UNO/SERVICES/><    Service-Name           >
+//                        <     Implementation-Name    ></UNO/SERVICES/><    Service-Name           > 
 #define REGKEY_NAME  "/com.sun.star.datatransfer.DataFormatTranslator/UNO/SERVICES/com.sun.star.datatransfer.DataFormatTranslator"
 
 //-----------------------------------------------------------------------------------------------------------
 // namespace directives
 //-----------------------------------------------------------------------------------------------------------
 
-using namespace ::rtl                       ;
-using namespace ::cppu                      ;
-using namespace ::com::sun::star::uno       ;
-using namespace ::com::sun::star::registry  ;
+using namespace ::rtl						;
+using namespace ::cppu					    ;
+using namespace ::com::sun::star::uno		;
+using namespace ::com::sun::star::registry	;
 using namespace ::com::sun::star::lang;
 using namespace ::com::sun::star::datatransfer;
 
 //-----------------------------------------------------------------
 // create a static object to initialize the shell9x library
 //-----------------------------------------------------------------
-
+ 
 namespace
 {
 
     //-----------------------------------------------------------------------------------------------------------
     // functions to create a new Clipboad instance; is needed by factory helper implementation
     // @param rServiceManager - service manager, useful if the component needs other uno services
-    // so we should give it to every UNO-Implementation component
+    // so we should give it to every UNO-Implementation component	
     //-----------------------------------------------------------------------------------------------------------
 
     Reference< XInterface > SAL_CALL createInstance( const Reference< XMultiServiceFactory >& rServiceManager )
@@ -86,10 +86,10 @@ namespace
 }
 
 //-----------------------------------------------------------------------------------------------------------
-// the 3 important functions which will be exported
+// the 3 important functions which will be exported 
 //-----------------------------------------------------------------------------------------------------------
 
-extern "C"
+extern "C" 
 {
 
 //----------------------------------------------------------------------
@@ -117,13 +117,13 @@ sal_Bool SAL_CALL component_writeInfo( void* /*pServiceManager*/, void* pRegistr
     {
         try
         {
-            Reference< XRegistryKey > pXNewKey( static_cast< XRegistryKey* >( pRegistryKey ) );
+            Reference< XRegistryKey > pXNewKey( static_cast< XRegistryKey* >( pRegistryKey ) );							
             pXNewKey->createKey( OUString( RTL_CONSTASCII_USTRINGPARAM( REGKEY_NAME ) ) );
             bRetVal = sal_True;
         }
         catch( InvalidRegistryException& )
-        {
-            OSL_ENSURE(sal_False, "InvalidRegistryException caught");
+        {			
+            OSL_ENSURE(sal_False, "InvalidRegistryException caught");			
             bRetVal = sal_False;
         }
     }
@@ -132,7 +132,7 @@ sal_Bool SAL_CALL component_writeInfo( void* /*pServiceManager*/, void* pRegistr
 }
 
 //----------------------------------------------------------------------
-// component_getFactory
+// component_getFactory 
 // returns a factory to create XFilePicker-Services
 //----------------------------------------------------------------------
 
@@ -143,8 +143,8 @@ void* SAL_CALL component_getFactory( const sal_Char* pImplName, uno_Interface* p
     if ( pSrvManager && ( 0 == rtl_str_compare( pImplName, IMPL_NAME ) ) )
     {
         Sequence< OUString > aSNS( 1 );
-        aSNS.getArray( )[0] = OUString( RTL_CONSTASCII_USTRINGPARAM( SERVICE_NAME ) );
-
+        aSNS.getArray( )[0] = OUString( RTL_CONSTASCII_USTRINGPARAM( SERVICE_NAME ) );		
+        
         Reference< XSingleServiceFactory > xFactory ( createOneInstanceFactory(
             reinterpret_cast< XMultiServiceFactory* > ( pSrvManager ),
             OUString::createFromAscii( pImplName ),
@@ -154,7 +154,7 @@ void* SAL_CALL component_getFactory( const sal_Char* pImplName, uno_Interface* p
         {
             xFactory->acquire();
             pRet = xFactory.get();
-        }
+        }			
     }
 
     return pRet;
diff --git a/dtrans/source/win32/misc/ImplHelper.cxx b/dtrans/source/win32/misc/ImplHelper.cxx
index 4bfb7f462fc2..9218c5a45cc9 100644
--- a/dtrans/source/win32/misc/ImplHelper.cxx
+++ b/dtrans/source/win32/misc/ImplHelper.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
@@ -65,7 +65,7 @@ using ::rtl::OUString;
 using ::rtl::OString;
 
 //------------------------------------------------------------------------
-// returns a windows codepage appropriate to the
+// returns a windows codepage appropriate to the 
 // given mime charset parameter value
 //------------------------------------------------------------------------
 
@@ -75,10 +75,10 @@ sal_uInt32 SAL_CALL getWinCPFromMimeCharset( const OUString& charset )
 
     if ( charset.getLength( ) )
     {
-        OString osCharset(
+        OString osCharset( 
             charset.getStr( ), charset.getLength( ), RTL_TEXTENCODING_ASCII_US );
 
-        rtl_TextEncoding txtEnc =
+        rtl_TextEncoding txtEnc = 
             rtl_getTextEncodingFromMimeCharset( osCharset.getStr( ) );
 
         sal_uInt32 winChrs = rtl_getBestWindowsCharsetFromTextEncoding( txtEnc );
@@ -86,10 +86,10 @@ sal_uInt32 SAL_CALL getWinCPFromMimeCharset( const OUString& charset )
         CHARSETINFO chrsInf;
         sal_Bool bRet = TranslateCharsetInfo( (DWORD*)winChrs, &chrsInf, TCI_SRCCHARSET ) ?
                         sal_True : sal_False;
-
+    
         // if one of the above functions fails
         // we will return the current ANSI codepage
-        // of this thread
+        // of this thread	
         if ( bRet )
             winCP = chrsInf.ciACP;
     }
@@ -105,10 +105,10 @@ sal_uInt32 SAL_CALL getWinCPFromMimeCharset( const OUString& charset )
 OUString SAL_CALL getWinCPFromLocaleId( LCID lcid, LCTYPE lctype )
 {
     OSL_ASSERT( IsValidLocale( lcid, LCID_SUPPORTED ) );
-
-    // we set an default value
+    
+    // we set an default value 
     OUString winCP;
-
+    
     // set an default value
     if ( LOCALE_IDEFAULTCODEPAGE == lctype )
     {
@@ -124,14 +124,14 @@ OUString SAL_CALL getWinCPFromLocaleId( LCID lcid, LCTYPE lctype )
     // we use the GetLocaleInfoA because don't want to provide
     // a unicode wrapper function for Win9x in sal/systools
     char buff[6];
-    sal_Int32 nResult = GetLocaleInfoA(
+    sal_Int32 nResult = GetLocaleInfoA( 
         lcid, lctype | LOCALE_USE_CP_ACP, buff, sizeof( buff ) );
-
+    
     OSL_ASSERT( nResult );
 
     if ( nResult )
     {
-        sal_Int32 len = MultiByteToWideChar(
+        sal_Int32 len = MultiByteToWideChar( 
             CP_ACP, 0, buff, -1, NULL, 0 );
 
         OSL_ASSERT( len > 0 );
@@ -140,7 +140,7 @@ OUString SAL_CALL getWinCPFromLocaleId( LCID lcid, LCTYPE lctype )
 
         if ( NULL != lpwchBuff.get( ) )
         {
-            len = MultiByteToWideChar(
+            len = MultiByteToWideChar(	
                 CP_ACP, 0, buff, -1, reinterpret_cast<LPWSTR>(lpwchBuff.get( )), len );
 
             winCP = OUString( lpwchBuff.get( ), (len - 1) );
@@ -152,7 +152,7 @@ OUString SAL_CALL getWinCPFromLocaleId( LCID lcid, LCTYPE lctype )
 
 //--------------------------------------------------
 // returns a mime charset parameter value appropriate
-// to the given codepage, optional a prefix can be
+// to the given codepage, optional a prefix can be 
 // given, e.g. "windows-" or "cp"
 //--------------------------------------------------
 
@@ -162,7 +162,7 @@ OUString SAL_CALL getMimeCharsetFromWinCP( sal_uInt32 cp, const OUString& aPrefi
 }
 
 //--------------------------------------------------
-// returns a mime charset parameter value appropriate
+// returns a mime charset parameter value appropriate 
 // to the given locale id and locale type, optional a
 // prefix can be given, e.g. "windows-" or "cp"
 //--------------------------------------------------
@@ -185,10 +185,10 @@ sal_Bool SAL_CALL IsOEMCP( sal_uInt32 codepage )
                               775, 850, 852, 855, 857, 860,
                               861, 862, 863, 864, 865, 866,
                               869, 874, 932, 936, 949, 950, 1361 };
-
+    
     for ( sal_Int8 i = 0; i < ( sizeof( arrOEMCP )/sizeof( sal_uInt32 ) ); ++i )
         if ( arrOEMCP[i] == codepage )
-            return sal_True;
+            return sal_True;			
 
     return sal_False;
 }
@@ -279,14 +279,14 @@ DVTARGETDEVICE* SAL_CALL CopyTargetDevice( DVTARGETDEVICE* ptdSrc )
         if ( NULL != ptdSrc )
         {
             ptdDest = static_cast< DVTARGETDEVICE* >( CoTaskMemAlloc( ptdSrc->tdSize ) );
-            rtl_copyMemory( ptdDest, ptdSrc, static_cast< size_t >( ptdSrc->tdSize ) );
+            rtl_copyMemory( ptdDest, ptdSrc, static_cast< size_t >( ptdSrc->tdSize ) );	
         }
     }
 #ifdef __MINGW32__
     han.Reset();
 #else
     __except( EXCEPTION_EXECUTE_HANDLER )
-    {
+    {		
     }
 #endif
 
@@ -315,9 +315,9 @@ DVTARGETDEVICE* SAL_CALL CopyTargetDevice( DVTARGETDEVICE* ptdSrc )
 //  petcSrc       pointer to source FORMATETC
 //
 // Return Value:
-//  returns TRUE if copy was successful;
-//  retuns FALSE if not successful, e.g. one or both of the pointers
-//  were invalid or the pointers were equal
+//  returns TRUE if copy was successful; 
+//	retuns FALSE if not successful, e.g. one or both of the pointers
+//	were invalid or the pointers were equal
 //-------------------------------------------------------------------------
 
 sal_Bool SAL_CALL CopyFormatEtc( LPFORMATETC petcDest, LPFORMATETC petcSrc )
@@ -338,15 +338,15 @@ sal_Bool SAL_CALL CopyFormatEtc( LPFORMATETC petcDest, LPFORMATETC petcSrc )
         {
 
         petcDest->cfFormat = petcSrc->cfFormat;
-
+        
         petcDest->ptd      = NULL;
         if ( NULL != petcSrc->ptd )
             petcDest->ptd  = CopyTargetDevice(petcSrc->ptd);
-
+        
         petcDest->dwAspect = petcSrc->dwAspect;
         petcDest->lindex   = petcSrc->lindex;
         petcDest->tymed    = petcSrc->tymed;
-
+    
         bRet = sal_True;
         }
     }
@@ -367,9 +367,9 @@ sal_Bool SAL_CALL CopyFormatEtc( LPFORMATETC petcDest, LPFORMATETC petcSrc )
 
 //-------------------------------------------------------------------------
 // returns:
-//  1 for exact match,
-//  0 for no match,
-// -1 for partial match (which is defined to mean the left is a subset
+//  1 for exact match, 
+//  0 for no match, 
+// -1 for partial match (which is defined to mean the left is a subset 
 //    of the right: fewer aspects, null target device, fewer medium).
 //-------------------------------------------------------------------------
 
@@ -389,7 +389,7 @@ sal_Int32 SAL_CALL CompareFormatEtc( const FORMATETC* pFetcLhs, const FORMATETC*
 #endif
         if ( pFetcLhs != pFetcRhs )
 
-        if ( ( pFetcLhs->cfFormat != pFetcRhs->cfFormat ) ||
+        if ( ( pFetcLhs->cfFormat != pFetcRhs->cfFormat ) || 
              ( pFetcLhs->lindex   != pFetcRhs->lindex ) ||
              !CompareTargetDevice( pFetcLhs->ptd, pFetcRhs->ptd ) )
         {
@@ -466,10 +466,10 @@ sal_Bool SAL_CALL CompareTargetDevice( DVTARGETDEVICE* ptdLeft, DVTARGETDEVICE*
 
         // one ot the two is NULL
         else if ( ( NULL != ptdRight ) && ( NULL != ptdLeft ) )
+        
+        if ( ptdLeft->tdSize == ptdRight->tdSize )		
 
-        if ( ptdLeft->tdSize == ptdRight->tdSize )
-
-        if ( rtl_compareMemory( ptdLeft, ptdRight, ptdLeft->tdSize ) == 0 )
+        if ( rtl_compareMemory( ptdLeft, ptdRight, ptdLeft->tdSize ) == 0 )			
             bRet = sal_True;
     }
 #ifdef __MINGW32__
diff --git a/dtrans/source/win32/misc/ImplHelper.hxx b/dtrans/source/win32/misc/ImplHelper.hxx
index f410424c947f..067fd46ff2c1 100644
--- a/dtrans/source/win32/misc/ImplHelper.hxx
+++ b/dtrans/source/win32/misc/ImplHelper.hxx
@@ -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
@@ -58,11 +58,11 @@ DVTARGETDEVICE* SAL_CALL CopyTargetDevice(DVTARGETDEVICE* ptdSrc);
 // some codepage helper functions
 
 //--------------------------------------------------
-// returns a windows codepage appropriate to the
+// returns a windows codepage appropriate to the 
 // given mime charset parameter value
 //--------------------------------------------------
 
-sal_uInt32 SAL_CALL getWinCPFromMimeCharset(
+sal_uInt32 SAL_CALL getWinCPFromMimeCharset( 
     const rtl::OUString& charset );
 
 //--------------------------------------------------
@@ -70,25 +70,25 @@ sal_uInt32 SAL_CALL getWinCPFromMimeCharset(
 // given locale and locale type
 //--------------------------------------------------
 
-rtl::OUString SAL_CALL getWinCPFromLocaleId(
+rtl::OUString SAL_CALL getWinCPFromLocaleId( 
     LCID lcid, LCTYPE lctype );
 
 //--------------------------------------------------
 // returns a mime charset parameter value appropriate
-// to the given codepage, optional a prefix can be
+// to the given codepage, optional a prefix can be 
 // given, e.g. "windows-" or "cp"
 //--------------------------------------------------
 
-rtl::OUString SAL_CALL getMimeCharsetFromWinCP(
+rtl::OUString SAL_CALL getMimeCharsetFromWinCP( 
     sal_uInt32 cp, const rtl::OUString& aPrefix );
 
 //--------------------------------------------------
-// returns a mime charset parameter value appropriate
+// returns a mime charset parameter value appropriate 
 // to the given locale id and locale type, optional a
 // prefix can be given, e.g. "windows-" or "cp"
 //--------------------------------------------------
 
-rtl::OUString SAL_CALL getMimeCharsetFromLocaleId(
+rtl::OUString SAL_CALL getMimeCharsetFromLocaleId( 
     LCID lcid, LCTYPE lctype, const rtl::OUString& aPrefix  );
 
 //-----------------------------------------------------
diff --git a/dtrans/source/win32/misc/WinClip.hxx b/dtrans/source/win32/misc/WinClip.hxx
index 670fd70d97d6..d57384c91573 100644
--- a/dtrans/source/win32/misc/WinClip.hxx
+++ b/dtrans/source/win32/misc/WinClip.hxx
@@ -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
diff --git a/dtrans/source/win32/mtaole/MtaOleClipb.cxx b/dtrans/source/win32/mtaole/MtaOleClipb.cxx
index 3d083b9e5735..d0ed2e3a98e7 100644
--- a/dtrans/source/win32/mtaole/MtaOleClipb.cxx
+++ b/dtrans/source/win32/mtaole/MtaOleClipb.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
@@ -35,14 +35,14 @@
     the ole clipboard, which runs only in an sta thread.
     The consequence is that callback from the ole clipboard are in the
     context of this sta thread. In the soffice applications this may lead
-    to problems because they all use the one and only mutex called
+    to problems because they all use the one and only mutex called 
     SolarMutex.
-    In order to transfer clipboard requests to our sta thread we use a
+    In order to transfer clipboard requests to our sta thread we use a 
     hidden window an forward these requests via window messages.
 */
 
 #ifdef _MSC_VER
-#pragma warning( disable : 4786 ) // identifier was truncated to 'number'
+#pragma warning( disable : 4786 ) // identifier was truncated to 'number' 
                                    // characters in the debug information
 #endif
 
@@ -61,7 +61,7 @@
 #endif
 
 //----------------------------------------------------------------
-//  namespace directives
+//	namespace directives
 //----------------------------------------------------------------
 
 using osl::Condition;
@@ -70,7 +70,7 @@ using osl::MutexGuard;
 using osl::ClearableMutexGuard;
 
 //----------------------------------------------------------------
-//  defines
+//	defines
 //----------------------------------------------------------------
 
 namespace /* private */
@@ -83,26 +83,26 @@ namespace /* private */
     //--------------------------------------------------------
 
     const sal_uInt32 MSG_SETCLIPBOARD               = WM_USER + 0x0001;
-    const sal_uInt32 MSG_GETCLIPBOARD               = WM_USER + 0x0002;
-    const sal_uInt32 MSG_REGCLIPVIEWER              = WM_USER + 0x0003;
-    const sal_uInt32 MSG_FLUSHCLIPBOARD             = WM_USER + 0x0004;
-    const sal_uInt32 MSG_SHUTDOWN                   = WM_USER + 0x0005;
+    const sal_uInt32 MSG_GETCLIPBOARD		        = WM_USER + 0x0002;
+    const sal_uInt32 MSG_REGCLIPVIEWER		        = WM_USER + 0x0003;
+    const sal_uInt32 MSG_FLUSHCLIPBOARD		        = WM_USER + 0x0004;
+    const sal_uInt32 MSG_SHUTDOWN			        = WM_USER + 0x0005;
 
-    const sal_uInt32 MAX_WAITTIME                   = 10000;  // msec
-    const sal_uInt32 MAX_WAIT_SHUTDOWN              = 10000; // msec
-    const sal_uInt32 MAX_CLIPEVENT_PROCESSING_TIME  = 5000;  // msec
+    const sal_uInt32 MAX_WAITTIME					= 10000;  // msec    
+    const sal_uInt32 MAX_WAIT_SHUTDOWN				= 10000; // msec
+    const sal_uInt32 MAX_CLIPEVENT_PROCESSING_TIME	= 5000;  // msec
 
     const sal_Bool MANUAL_RESET                     = sal_True;
     const sal_Bool AUTO_RESET                       = sal_False;
     const sal_Bool INIT_NONSIGNALED                 = sal_False;
-
+    
     //------------------------------------------------------
-    /*  Cannot use osl conditions because they are blocking
+    /*  Cannot use osl conditions because they are blocking 
         without waking up on messages sent by another thread
         this leads to deadlocks because we are blocking the
-        communication between inter-thread marshalled COM
+        communication between inter-thread marshalled COM 
         pointers.
-        COM Proxy-Stub communication uses SendMessages for
+        COM Proxy-Stub communication uses SendMessages for 
         synchronization purposes.
     */
     class Win32Condition
@@ -112,55 +112,55 @@ namespace /* private */
             Win32Condition()
             {
                 m_hEvent = CreateEvent(
-                    0,      /* no security */
-                    true,   /* manual reset */
+                    0,		/* no security */
+                    true,	/* manual reset */
                     false,  /* initial state not signaled */
-                    0);     /* automatic name */
+                    0);  	/* automatic name */
             }
-
-            // dtor
+            
+            // dtor 
             ~Win32Condition()
             {
                 CloseHandle(m_hEvent);
             }
-
+            
             // wait infinite for event be signaled
             // leave messages sent through
             void wait()
             {
                 while(1)
                 {
-                    DWORD dwResult =
+                    DWORD dwResult = 
                         MsgWaitForMultipleObjects(1, &m_hEvent, FALSE, INFINITE, QS_SENDMESSAGE);
-
-                       switch (dwResult)
+                        
+                       switch (dwResult)   
                     {
                         case WAIT_OBJECT_0:
-                            return;
+                            return;				
 
                         case WAIT_OBJECT_0 + 1:
                         {
-                            /* PeekMessage processes all messages in the SendMessage
+                            /* PeekMessage processes all messages in the SendMessage 
                                queue that's what we want, messages from the PostMessage
                                queue stay untouched */
-                            MSG msg;
+                            MSG	msg;                            	       		            
                                PeekMessage(&msg, NULL, 0, 0, PM_NOREMOVE);
-
+                               
                             break;
-                        }
+                        }			            
                     }
                 }
             }
-
+            
             // reset the event
             void set()
             {
                 SetEvent(m_hEvent);
             }
-
+            
         private:
             HANDLE m_hEvent;
-
+            
         // prevent copy/assignment
         private:
             Win32Condition(const Win32Condition&);
@@ -173,14 +173,14 @@ namespace /* private */
 
     struct MsgCtx
     {
-        Win32Condition  aCondition;
-        HRESULT         hr;
+        Win32Condition	aCondition;
+        HRESULT      	hr;
     };
-
+    
 } /* namespace private */
 
 //----------------------------------------------------------------
-//  static member initialization
+//	static member initialization
 //----------------------------------------------------------------
 
 CMtaOleClipboard* CMtaOleClipboard::s_theMtaOleClipboardInst = NULL;
@@ -194,13 +194,13 @@ HRESULT MarshalIDataObjectInStream( IDataObject* pIDataObject, LPSTREAM* ppStrea
 {
     OSL_ASSERT( NULL != pIDataObject );
     OSL_ASSERT( NULL != ppStream );
-
+    
     *ppStream = NULL;
     return CoMarshalInterThreadInterfaceInStream(
         __uuidof(IDataObject),  //The IID of inteface to be marshaled
-        pIDataObject,           //The interface pointer
-        ppStream                //IStream pointer
-        );
+        pIDataObject,			//The interface pointer
+        ppStream				//IStream pointer 
+        );    
 }
 
 //--------------------------------------------------------------------
@@ -212,12 +212,12 @@ HRESULT UnmarshalIDataObjectAndReleaseStream( LPSTREAM lpStream, IDataObject** p
 {
     OSL_ASSERT( NULL != lpStream );
     OSL_ASSERT( NULL != ppIDataObject );
-
+    
     *ppIDataObject = NULL;
     return CoGetInterfaceAndReleaseStream(
-        lpStream,
-        __uuidof(IDataObject),
-        reinterpret_cast<LPVOID*>(ppIDataObject));
+        lpStream, 
+        __uuidof(IDataObject), 
+        reinterpret_cast<LPVOID*>(ppIDataObject));   
 }
 
 //--------------------------------------------------------------------
@@ -250,8 +250,8 @@ public:
     ~CAutoComInit( )
     {
         /*
-            we only call CoUninitialize when
-            CoInitailize returned S_FALSE, what
+            we only call CoUninitialize when 
+            CoInitailize returned S_FALSE, what 
             means that com was already initialize
             for that thread so we keep the balance
             if CoInitialize returned S_OK what means
@@ -271,10 +271,10 @@ private:
 // ctor
 //--------------------------------------------------------------------
 
-CMtaOleClipboard::CMtaOleClipboard( ) :
+CMtaOleClipboard::CMtaOleClipboard( ) : 
     m_hOleThread( NULL ),
     m_uOleThreadId( 0 ),
-    m_hEvtThrdReady( NULL ),
+    m_hEvtThrdReady( NULL ),	
     m_hwndMtaOleReqWnd( NULL ),
     m_MtaOleReqWndClassAtom( 0 ),
     m_hwndNextClipViewer( NULL ),
@@ -283,15 +283,15 @@ CMtaOleClipboard::CMtaOleClipboard( ) :
     m_hClipboardChangedEvent( m_hClipboardChangedNotifierEvents[0] ),
     m_hTerminateClipboardChangedNotifierEvent( m_hClipboardChangedNotifierEvents[1] ),
     m_ClipboardChangedEventCount( 0 )
-{
+{ 
     // signals that the thread was successfully setup
-    m_hEvtThrdReady  = CreateEventA( 0, MANUAL_RESET, INIT_NONSIGNALED, NULL );
-
+    m_hEvtThrdReady  = CreateEventA( 0, MANUAL_RESET, INIT_NONSIGNALED, NULL );			
+    
     OSL_ASSERT( NULL != m_hEvtThrdReady );
 
     s_theMtaOleClipboardInst = this;
 
-    m_hOleThread = (HANDLE)_beginthreadex(
+    m_hOleThread = (HANDLE)_beginthreadex( 
         NULL, 0, CMtaOleClipboard::oleThreadProc, this, 0, &m_uOleThreadId );
     OSL_ASSERT( NULL != m_hOleThread );
 
@@ -317,7 +317,7 @@ CMtaOleClipboard::CMtaOleClipboard( ) :
 //--------------------------------------------------------------------
 
 CMtaOleClipboard::~CMtaOleClipboard( )
-{
+{	
     // block calling threads out
     if ( NULL != m_hEvtThrdReady )
         ResetEvent( m_hEvtThrdReady );
@@ -326,7 +326,7 @@ CMtaOleClipboard::~CMtaOleClipboard( )
     m_bRunClipboardNotifierThread = sal_False;
     SetEvent( m_hTerminateClipboardChangedNotifierEvent );
 
-    sal_uInt32 dwResult = WaitForSingleObject(
+    sal_uInt32 dwResult = WaitForSingleObject( 
         m_hClipboardChangedNotifierThread, MAX_WAIT_SHUTDOWN );
 
     OSL_ENSURE( dwResult == WAIT_OBJECT_0, "clipboard notifier thread could not terminate" );
@@ -341,10 +341,10 @@ CMtaOleClipboard::~CMtaOleClipboard( )
         CloseHandle( m_hClipboardChangedNotifierEvents[1] );
 
     // end the thread
-    // because DestroyWindow can only be called
+    // because DestroyWindow can only be called 
     // from within the thread that created the window
-    sendMessage( MSG_SHUTDOWN,
-                 static_cast< WPARAM >( 0 ),
+    sendMessage( MSG_SHUTDOWN, 
+                 static_cast< WPARAM >( 0 ), 
                  static_cast< LPARAM >( 0 ) );
 
     // wait for thread shutdown
@@ -367,7 +367,7 @@ CMtaOleClipboard::~CMtaOleClipboard( )
 
 
 //--------------------------------------------------------------------
-//
+// 
 //--------------------------------------------------------------------
 
 HRESULT CMtaOleClipboard::flushClipboard( )
@@ -381,19 +381,19 @@ HRESULT CMtaOleClipboard::flushClipboard( )
     OSL_ENSURE( GetCurrentThreadId( ) != m_uOleThreadId, \
         "flushClipboard from within clipboard sta thread called" );
 
-    MsgCtx  aMsgCtx;
-
-    postMessage( MSG_FLUSHCLIPBOARD,
-                 static_cast< WPARAM >( 0 ),
-                 reinterpret_cast< LPARAM >( &aMsgCtx ) );
+    MsgCtx  aMsgCtx;  
 
+    postMessage( MSG_FLUSHCLIPBOARD, 
+                 static_cast< WPARAM >( 0 ), 
+                 reinterpret_cast< LPARAM >( &aMsgCtx ) ); 
+        
     aMsgCtx.aCondition.wait( /* infinite */ );
-
+    
     return aMsgCtx.hr;
 }
 
 //--------------------------------------------------------------------
-//
+// 
 //--------------------------------------------------------------------
 
 HRESULT CMtaOleClipboard::getClipboard( IDataObject** ppIDataObject )
@@ -411,25 +411,25 @@ HRESULT CMtaOleClipboard::getClipboard( IDataObject** ppIDataObject )
 
     LPSTREAM lpStream;
     HRESULT  hr = E_FAIL;
-
+    
     *ppIDataObject = NULL;
-
-    MsgCtx    aMsgCtx;
-
+    
+    MsgCtx	  aMsgCtx;  
+        
     postMessage( MSG_GETCLIPBOARD,
                  reinterpret_cast< WPARAM >( &lpStream ),
                  reinterpret_cast< LPARAM >( &aMsgCtx ) );
-
+        
     aMsgCtx.aCondition.wait( /* infinite */ );
 
     hr = aMsgCtx.hr;
-
+        
     if ( SUCCEEDED( hr ) )
     {
         hr = UnmarshalIDataObjectAndReleaseStream( lpStream, ppIDataObject );
         OSL_ENSURE( SUCCEEDED( hr ), "unmarshalling clipboard data object failed" );
     }
-
+    
     return hr;
 }
 
@@ -439,21 +439,21 @@ HRESULT CMtaOleClipboard::getClipboard( IDataObject** ppIDataObject )
 //--------------------------------------------------------------------
 
 HRESULT CMtaOleClipboard::setClipboard( IDataObject* pIDataObject )
-{
+{		
     if ( !WaitForThreadReady( ) )
     {
         OSL_ENSURE( sal_False, "clipboard sta thread not ready" );
         return E_FAIL;
     }
-
+    
     CAutoComInit comAutoInit;
-
+        
     OSL_ENSURE( GetCurrentThreadId( ) != m_uOleThreadId, "setClipboard from within the clipboard sta thread called" );
-
+    
     // because we marshall this request
     // into the sta thread we better
-    // acquire the interface here so
-    // that the object will not be
+    // acquire the interface here so 
+    // that the object will not be 
     // destroyed before the ole clipboard
     // can acquire it
     // remember: pIDataObject may be NULL
@@ -462,12 +462,12 @@ HRESULT CMtaOleClipboard::setClipboard( IDataObject* pIDataObject )
     if ( pIDataObject )
         pIDataObject->AddRef( );
 
-    postMessage(
-        MSG_SETCLIPBOARD,
-        reinterpret_cast< WPARAM >( pIDataObject ),
+    postMessage( 
+        MSG_SETCLIPBOARD, 
+        reinterpret_cast< WPARAM >( pIDataObject ), 
         0 );
-
-    // because this is an asynchronous function
+    
+    // because this is an asynchronous function 
     // the return value is useless
     return S_OK;
 }
@@ -488,14 +488,14 @@ sal_Bool CMtaOleClipboard::registerClipViewer( LPFNC_CLIPVIEWER_CALLBACK_t pfncC
 
     OSL_ENSURE( GetCurrentThreadId( ) != m_uOleThreadId, "registerClipViewer from within the OleThread called" );
 
-    MsgCtx  aMsgCtx;
+    MsgCtx  aMsgCtx;  
 
     postMessage( MSG_REGCLIPVIEWER,
                  reinterpret_cast<WPARAM>( pfncClipViewerCallback ),
                  reinterpret_cast<LPARAM>( &aMsgCtx ) );
-
+        
     aMsgCtx.aCondition.wait( /* infinite */ );
-
+    
     return bRet;
 }
 
@@ -504,7 +504,7 @@ sal_Bool CMtaOleClipboard::registerClipViewer( LPFNC_CLIPVIEWER_CALLBACK_t pfncC
 //--------------------------------------------------------------------
 
 sal_Bool CMtaOleClipboard::onRegisterClipViewer( LPFNC_CLIPVIEWER_CALLBACK_t pfncClipViewerCallback )
-{
+{		
     sal_Bool bRet = sal_True;
 
     // we need exclusive access because the clipboard changed notifier
@@ -514,7 +514,7 @@ sal_Bool CMtaOleClipboard::onRegisterClipViewer( LPFNC_CLIPVIEWER_CALLBACK_t pfn
     // register if not yet done
     if ( ( NULL != pfncClipViewerCallback ) && ( NULL == m_pfncClipViewerCallback ) )
     {
-        // SetClipboardViewer sends a WM_DRAWCLIPBOARD message we ignore
+        // SetClipboardViewer sends a WM_DRAWCLIPBOARD message we ignore 
         // this message if we register ourself as clip viewer
         m_bInRegisterClipViewer = sal_True;
         m_hwndNextClipViewer = SetClipboardViewer( m_hwndMtaOleReqWnd );
@@ -534,38 +534,38 @@ sal_Bool CMtaOleClipboard::onRegisterClipViewer( LPFNC_CLIPVIEWER_CALLBACK_t pfn
         // unregister if input parameter is NULL and we previously registered
         // as clipboard viewer
         ChangeClipboardChain( m_hwndMtaOleReqWnd, m_hwndNextClipViewer );
-        m_hwndNextClipViewer = NULL;
+        m_hwndNextClipViewer = NULL;		
     }
 
     return bRet;
 }
 
 //--------------------------------------------------------------------
-//
+// 
 //--------------------------------------------------------------------
 
 LRESULT CMtaOleClipboard::onSetClipboard( IDataObject* pIDataObject )
-{
+{	
     return static_cast<LRESULT>( OleSetClipboard( pIDataObject ) );
 }
 
 //--------------------------------------------------------------------
-//
+// 
 //--------------------------------------------------------------------
 
 LRESULT CMtaOleClipboard::onGetClipboard( LPSTREAM* ppStream )
-{
+{	
     OSL_ASSERT(NULL != ppStream);
 
     IDataObjectPtr pIDataObject;
-
+    
     // forward the request to the OleClipboard
     HRESULT hr = OleGetClipboard( &pIDataObject );
     if ( SUCCEEDED( hr ) )
     {
         hr = MarshalIDataObjectInStream(pIDataObject.get(), ppStream);
         OSL_ENSURE(SUCCEEDED(hr), "marshalling cliboard data object failed");
-    }
+    }		
     return static_cast<LRESULT>(hr);
 }
 
@@ -574,7 +574,7 @@ LRESULT CMtaOleClipboard::onGetClipboard( LPSTREAM* ppStream )
 //--------------------------------------------------------------------
 
 LRESULT CMtaOleClipboard::onFlushClipboard( )
-{
+{	
     return static_cast<LRESULT>( OleFlushClipboard( ) );
 }
 
@@ -589,11 +589,11 @@ LRESULT CMtaOleClipboard::onChangeCBChain( HWND hWndRemove, HWND hWndNext )
     else if ( IsWindow( m_hwndNextClipViewer ) )
     {
         // forward the message to the next one
-        DWORD dwResult;
-        SendMessageTimeoutA(
-            m_hwndNextClipViewer,
-            WM_CHANGECBCHAIN,
-            reinterpret_cast<WPARAM>(hWndRemove),
+        DWORD dwResult;		
+        SendMessageTimeoutA( 
+            m_hwndNextClipViewer, 
+            WM_CHANGECBCHAIN, 
+            reinterpret_cast<WPARAM>(hWndRemove), 
             reinterpret_cast<LPARAM>(hWndNext),
             SMTO_BLOCK,
             MAX_CLIPEVENT_PROCESSING_TIME,
@@ -614,7 +614,7 @@ LRESULT CMtaOleClipboard::onDrawClipboard( )
     if ( !m_bInRegisterClipViewer )
     {
         ClearableMutexGuard aGuard( m_ClipboardChangedEventCountMutex );
-
+    
         m_ClipboardChangedEventCount++;
         SetEvent( m_hClipboardChangedEvent );
 
@@ -625,9 +625,9 @@ LRESULT CMtaOleClipboard::onDrawClipboard( )
     if ( IsWindow( m_hwndNextClipViewer ) )
     {
         DWORD dwResult;
-        SendMessageTimeoutA(
-            m_hwndNextClipViewer,
-            WM_DRAWCLIPBOARD,
+        SendMessageTimeoutA( 
+            m_hwndNextClipViewer, 
+            WM_DRAWCLIPBOARD, 
             static_cast< WPARAM >( 0 ),
             static_cast< LPARAM >( 0 ),
             SMTO_BLOCK,
@@ -639,7 +639,7 @@ LRESULT CMtaOleClipboard::onDrawClipboard( )
 }
 
 //--------------------------------------------------------------------
-// SendMessage so we don't need to supply the HWND if we send
+// SendMessage so we don't need to supply the HWND if we send 
 // something to our wrapped window
 //--------------------------------------------------------------------
 
@@ -649,7 +649,7 @@ LRESULT CMtaOleClipboard::sendMessage( UINT msg, WPARAM wParam, LPARAM lParam )
 }
 
 //--------------------------------------------------------------------
-// PostMessage so we don't need to supply the HWND if we send
+// PostMessage so we don't need to supply the HWND if we send 
 // something to our wrapped window
 //--------------------------------------------------------------------
 
@@ -666,18 +666,18 @@ sal_Bool CMtaOleClipboard::postMessage( UINT msg, WPARAM wParam, LPARAM lParam )
 LRESULT CALLBACK CMtaOleClipboard::mtaOleReqWndProc( HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam )
 {
     LRESULT lResult = 0;
-
+        
     // get a connection to the class-instance via the static member
     CMtaOleClipboard* pImpl = CMtaOleClipboard::s_theMtaOleClipboardInst;
     OSL_ASSERT( NULL != pImpl );
-
+    
     switch( uMsg )
     {
-    case MSG_SETCLIPBOARD:
-        {
+    case MSG_SETCLIPBOARD:	
+        {               
             IDataObject* pIDataObject = reinterpret_cast< IDataObject* >( wParam );
             pImpl->onSetClipboard( pIDataObject );
-
+            
             // in setClipboard we did acquire the
             // interface pointer in order to prevent
             // destruction of the object before the
@@ -691,8 +691,8 @@ LRESULT CALLBACK CMtaOleClipboard::mtaOleReqWndProc( HWND hWnd, UINT uMsg, WPARA
         break;
 
     case MSG_GETCLIPBOARD:
-        {
-            MsgCtx* aMsgCtx = reinterpret_cast< MsgCtx* >( lParam );
+        {                              
+            MsgCtx* aMsgCtx = reinterpret_cast< MsgCtx* >( lParam );        
             OSL_ASSERT( aMsgCtx );
 
             aMsgCtx->hr = pImpl->onGetClipboard( reinterpret_cast< LPSTREAM* >(wParam) );
@@ -700,19 +700,19 @@ LRESULT CALLBACK CMtaOleClipboard::mtaOleReqWndProc( HWND hWnd, UINT uMsg, WPARA
         }
         break;
 
-    case MSG_FLUSHCLIPBOARD:
-        {
-            MsgCtx* aMsgCtx = reinterpret_cast< MsgCtx* >( lParam );
+    case MSG_FLUSHCLIPBOARD:		
+        {   
+            MsgCtx* aMsgCtx = reinterpret_cast< MsgCtx* >( lParam );        
             OSL_ASSERT( aMsgCtx );
 
-            aMsgCtx->hr = pImpl->onFlushClipboard( );
+            aMsgCtx->hr = pImpl->onFlushClipboard( );		
             aMsgCtx->aCondition.set( );
         }
         break;
 
     case MSG_REGCLIPVIEWER:
-        {
-            MsgCtx* aMsgCtx = reinterpret_cast< MsgCtx* >( lParam );
+        {               
+            MsgCtx* aMsgCtx = reinterpret_cast< MsgCtx* >( lParam );        
             OSL_ASSERT( aMsgCtx );
 
             pImpl->onRegisterClipViewer( reinterpret_cast<CMtaOleClipboard::LPFNC_CLIPVIEWER_CALLBACK_t>(wParam) );
@@ -721,7 +721,7 @@ LRESULT CALLBACK CMtaOleClipboard::mtaOleReqWndProc( HWND hWnd, UINT uMsg, WPARA
         break;
 
     case WM_CHANGECBCHAIN:
-        lResult = pImpl->onChangeCBChain(
+        lResult = pImpl->onChangeCBChain( 
             reinterpret_cast< HWND >( wParam ), reinterpret_cast< HWND >( lParam ) );
         break;
 
@@ -734,53 +734,53 @@ LRESULT CALLBACK CMtaOleClipboard::mtaOleReqWndProc( HWND hWnd, UINT uMsg, WPARA
         break;
 
     // force the sta thread to end
-    case WM_DESTROY:
+    case WM_DESTROY:		
         PostQuitMessage( 0 );
         break;
 
     default:
         lResult = DefWindowProcA( hWnd, uMsg, wParam, lParam );
         break;
-    }
-
+    }    
+            
     return lResult;
 }
 
 //--------------------------------------------------------------------
-//
+// 
 //--------------------------------------------------------------------
 
 void CMtaOleClipboard::createMtaOleReqWnd( )
 {
     WNDCLASSEXA  wcex;
-
+    
     HINSTANCE hInst = GetModuleHandleA( CLIPSRV_DLL_NAME );
     OSL_ENSURE( NULL != hInst, "The name of the clipboard service dll must have changed" );
 
     ZeroMemory( &wcex, sizeof( WNDCLASSEXA ) );
 
-    wcex.cbSize         = sizeof(WNDCLASSEXA);
-    wcex.style          = 0;
-    wcex.lpfnWndProc    = static_cast< WNDPROC >( CMtaOleClipboard::mtaOleReqWndProc );
-    wcex.cbClsExtra     = 0;
-    wcex.cbWndExtra     = 0;
-    wcex.hInstance      = hInst;
-    wcex.hIcon          = NULL;
-    wcex.hCursor        = NULL;
-    wcex.hbrBackground  = NULL;
-    wcex.lpszMenuName   = NULL;
-    wcex.lpszClassName  = g_szWndClsName;
-    wcex.hIconSm        = NULL;
+    wcex.cbSize			= sizeof(WNDCLASSEXA); 
+    wcex.style			= 0;
+    wcex.lpfnWndProc	= static_cast< WNDPROC >( CMtaOleClipboard::mtaOleReqWndProc );
+    wcex.cbClsExtra		= 0;
+    wcex.cbWndExtra		= 0;
+    wcex.hInstance		= hInst;
+    wcex.hIcon			= NULL;
+    wcex.hCursor		= NULL;
+    wcex.hbrBackground	= NULL;
+    wcex.lpszMenuName	= NULL;
+    wcex.lpszClassName	= g_szWndClsName;
+    wcex.hIconSm		= NULL;
 
     m_MtaOleReqWndClassAtom = RegisterClassExA( &wcex );
 
     if ( 0 != m_MtaOleReqWndClassAtom )
-        m_hwndMtaOleReqWnd = CreateWindowA(
+        m_hwndMtaOleReqWnd = CreateWindowA( 
             g_szWndClsName, NULL, 0, 0, 0, 0, 0, NULL, NULL, hInst, NULL );
 }
 
 //--------------------------------------------------------------------
-//
+// 
 //--------------------------------------------------------------------
 
 unsigned int CMtaOleClipboard::run( )
@@ -801,9 +801,9 @@ unsigned int CMtaOleClipboard::run( )
             SetEvent( m_hEvtThrdReady );
 
         // pumping messages
-        MSG msg;
+        MSG msg;		
         while( GetMessageA( &msg, NULL, 0, 0 ) )
-            DispatchMessageA( &msg );
+            DispatchMessageA( &msg );	
 
         nRet = 0;
     }
@@ -816,20 +816,20 @@ unsigned int CMtaOleClipboard::run( )
 }
 
 //--------------------------------------------------------------------
-//
+// 
 //--------------------------------------------------------------------
 
 unsigned int WINAPI CMtaOleClipboard::oleThreadProc( LPVOID pParam )
 {
-    CMtaOleClipboard* pInst =
+    CMtaOleClipboard* pInst = 
         reinterpret_cast<CMtaOleClipboard*>( pParam );
     OSL_ASSERT( NULL != pInst );
-
+    
     return pInst->run( );
 }
 
 //--------------------------------------------------------------------
-//
+// 
 //--------------------------------------------------------------------
 
 unsigned int WINAPI CMtaOleClipboard::clipboardChangedNotifierThreadProc( LPVOID pParam )
@@ -842,7 +842,7 @@ unsigned int WINAPI CMtaOleClipboard::clipboardChangedNotifierThreadProc( LPVOID
     // assuming we don't need a lock for
     // a boolean variable like m_bRun...
     while ( pInst->m_bRunClipboardNotifierThread )
-    {
+    {   
         // wait for clipboard changed or terminate event
         WaitForMultipleObjects( 2, pInst->m_hClipboardChangedNotifierEvents, false, INFINITE );
 
@@ -862,18 +862,18 @@ unsigned int WINAPI CMtaOleClipboard::clipboardChangedNotifierThreadProc( LPVOID
             // notify all clipboard listener
             if ( pInst->m_pfncClipViewerCallback )
                 pInst->m_pfncClipViewerCallback( );
-        }
+        }  
         else
             aGuard.clear( );
-    }
-
+    }      
+    
     CoUninitialize( );
 
     return ( 0 );
 }
 
 //--------------------------------------------------------------------
-//
+// 
 //--------------------------------------------------------------------
 
 inline
@@ -883,7 +883,7 @@ sal_Bool CMtaOleClipboard::WaitForThreadReady( ) const
 
     if ( NULL != m_hEvtThrdReady )
     {
-        DWORD dwResult = WaitForSingleObject(
+        DWORD dwResult = WaitForSingleObject( 
             m_hEvtThrdReady, MAX_WAITTIME );
         bRet = ( dwResult == WAIT_OBJECT_0 );
     }
diff --git a/dtrans/source/win32/workbench/XTDo.cxx b/dtrans/source/win32/workbench/XTDo.cxx
index c3209429cf21..63734e9842dd 100644
--- a/dtrans/source/win32/workbench/XTDo.cxx
+++ b/dtrans/source/win32/workbench/XTDo.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
@@ -65,8 +65,8 @@ using namespace ::std;
 //------------------------------------------------------------------------
 /*
     in the constructor we enumerate all formats offered by the transferable
-    and convert the formats into formatetc structures
-    if the transferable supports text in different charsets we use either
+    and convert the formats into formatetc structures 
+    if the transferable supports text in different charsets we use either 
     the charset equal to the charset of the current thread or an arbitrary
     charset supported by the transferable and the system
     if the transferable supports only unicodetext we offer in addition to
@@ -76,8 +76,8 @@ using namespace ::std;
 */
 CXTDataObject::CXTDataObject( ) :
     m_nRefCnt( 0 )
-{
-
+{		
+    
 }
 
 //------------------------------------------------------------------------
@@ -85,7 +85,7 @@ CXTDataObject::CXTDataObject( ) :
 //------------------------------------------------------------------------
 
 STDMETHODIMP CXTDataObject::QueryInterface( REFIID iid, LPVOID* ppvObject )
-{
+{	
     OSL_ASSERT( NULL != ppvObject );
 
     if ( NULL == ppvObject )
@@ -134,7 +134,7 @@ STDMETHODIMP_(ULONG) CXTDataObject::Release( )
 }
 
 /*------------------------------------------------------------------------
-
+ 
  IDataObject->GetData
  we deliver data only into global memory
 
@@ -145,11 +145,11 @@ STDMETHODIMP_(ULONG) CXTDataObject::Release( )
         problems (windows needs '\0' terminated strings
  2.2. we expect unicode data as Sequence< sal_Unicode > and all other
         text and raw data as Sequence< sal_Int8 >
-
+ 
 ------------------------------------------------------------------------*/
 
 STDMETHODIMP CXTDataObject::GetData( LPFORMATETC pFormatetc, LPSTGMEDIUM pmedium )
-{
+{		
     if ( ( NULL == pFormatetc ) || ( NULL == pmedium ) )
         return E_INVALIDARG;
 
@@ -168,7 +168,7 @@ STDMETHODIMP CXTDataObject::GetData( LPFORMATETC pFormatetc, LPSTGMEDIUM pmedium
 
         hr = S_OK;
     }
-
+    
     return hr;
 }
 
@@ -180,7 +180,7 @@ STDMETHODIMP CXTDataObject::EnumFormatEtc( DWORD dwDirection, IEnumFORMATETC** p
 {
     if ( ( NULL == ppenumFormatetc ) || ( DATADIR_SET == dwDirection ) )
         return E_INVALIDARG;
-
+    
     *ppenumFormatetc = NULL;
 
     HRESULT hr = E_FAIL;
@@ -313,7 +313,7 @@ STDMETHODIMP CEnumFormatEtc::QueryInterface( REFIID iid, LPVOID* ppvObject )
 STDMETHODIMP_(ULONG) CEnumFormatEtc::AddRef( )
 {
     // keep the dataobject alive
-    m_pUnkDataObj->AddRef( );
+    m_pUnkDataObj->AddRef( );		
     return InterlockedIncrement( &m_nRefCnt );
 }
 
@@ -323,7 +323,7 @@ STDMETHODIMP_(ULONG) CEnumFormatEtc::AddRef( )
 
 STDMETHODIMP_(ULONG) CEnumFormatEtc::Release( )
 {
-    // release the outer dataobject
+    // release the outer dataobject		
     m_pUnkDataObj->Release( );
 
     // we need a helper variable because it's
@@ -348,9 +348,9 @@ STDMETHODIMP CEnumFormatEtc::Next( ULONG celt, LPFORMATETC rgelt, ULONG* pceltFe
     ULONG   ulFetched = 0;
     ULONG   ulToFetch = celt;
     HRESULT hr        = S_FALSE;
-
+    
     while( m_nCurrPos < 1 )
-    {
+    {		
         rgelt->cfFormat = CF_TEXT;
         rgelt->ptd      = NULL;
         rgelt->dwAspect = DVASPECT_CONTENT;
@@ -362,15 +362,15 @@ STDMETHODIMP CEnumFormatEtc::Next( ULONG celt, LPFORMATETC rgelt, ULONG* pceltFe
         --ulToFetch;
         ++ulFetched;
     }
-
+    
     if ( ulFetched == celt )
         hr = S_OK;
 
     if ( NULL != pceltFetched )
-    {
+    {		
         *pceltFetched = ulFetched;
     }
-
+    
     return hr;
 }
 
@@ -381,7 +381,7 @@ STDMETHODIMP CEnumFormatEtc::Next( ULONG celt, LPFORMATETC rgelt, ULONG* pceltFe
 STDMETHODIMP CEnumFormatEtc::Skip( ULONG celt )
 {
     HRESULT hr = S_FALSE;
-
+    
     /*
     if ( ( m_nCurrPos + celt ) < m_nClipFormats )
     {
@@ -415,9 +415,9 @@ STDMETHODIMP CEnumFormatEtc::Clone( IEnumFORMATETC** ppenum )
         return E_INVALIDARG;
 
     HRESULT hr = E_FAIL;
-
+    
     *ppenum = NULL;
-
+    
     CEnumFormatEtc* pCEnumFEtc = new CEnumFormatEtc( m_pUnkDataObj );
     if ( NULL != pCEnumFEtc )
     {
diff --git a/dtrans/source/win32/workbench/XTDo.hxx b/dtrans/source/win32/workbench/XTDo.hxx
index e34a931380f8..77dbcfa1fb0c 100644
--- a/dtrans/source/win32/workbench/XTDo.hxx
+++ b/dtrans/source/win32/workbench/XTDo.hxx
@@ -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,12 +56,12 @@ class EnumFormatEtc;
       a clipboard client ask for the available formats on the clipboard
       and decides if there is a format he can use
       if there is one, he requests the data in this format
-
-    - This class inherits from IDataObject an so can be placed on the
-      OleClipboard. The class wrapps a transferable object which is the
+      
+    - This class inherits from IDataObject an so can be placed on the 
+      OleClipboard. The class wrapps a transferable object which is the 
       original DataSource
     - DataFlavors offerd by this transferable will be translated into
-      appropriate clipboard formats
+      appropriate clipboard formats 
     - if the transferable contains text data always text and unicodetext
       will be offered or vice versa
     - text data will be automaticaly converted between text und unicode text
@@ -74,7 +74,7 @@ class CXTDataObject : public IDataObject
 {
 public:
     CXTDataObject( );
-
+    
     //-----------------------------------------------------------------
     // ole interface implementation
     //-----------------------------------------------------------------
@@ -100,33 +100,33 @@ public:
 private:
 
 private:
-    LONG m_nRefCnt;
+    LONG m_nRefCnt;	
 };
 
 //------------------------------------------------------------------------
-//
+// 
 //------------------------------------------------------------------------
 
 class CEnumFormatEtc : public IEnumFORMATETC
 {
 public:
     CEnumFormatEtc( LPUNKNOWN pUnkDataObj );
-
-    // IUnknown
+    
+    // IUnknown 
     STDMETHODIMP           QueryInterface( REFIID iid, LPVOID* ppvObject );
     STDMETHODIMP_( ULONG ) AddRef( );
     STDMETHODIMP_( ULONG ) Release( );
 
-    //IEnumFORMATETC
+    //IEnumFORMATETC 
     STDMETHODIMP Next( ULONG celt, LPFORMATETC rgelt, ULONG* pceltFetched );
     STDMETHODIMP Skip( ULONG celt );
     STDMETHODIMP Reset( );
     STDMETHODIMP Clone( IEnumFORMATETC** ppenum );
 
 private:
-    LONG                                m_nRefCnt;
-    LPUNKNOWN                           m_pUnkDataObj;
-    ULONG                               m_nCurrPos;
+    LONG								m_nRefCnt;
+    LPUNKNOWN							m_pUnkDataObj;
+    ULONG								m_nCurrPos;	
 };
 
 typedef CEnumFormatEtc *PCEnumFormatEtc;
diff --git a/dtrans/source/win32/workbench/test_wincb.cxx b/dtrans/source/win32/workbench/test_wincb.cxx
index b3f1a2ef95ee..1831a7e6e39c 100644
--- a/dtrans/source/win32/workbench/test_wincb.cxx
+++ b/dtrans/source/win32/workbench/test_wincb.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
@@ -30,14 +30,14 @@
 
 
 //_________________________________________________________________________________________________________________________
-//  interface includes
+//	interface includes
 //_________________________________________________________________________________________________________________________
 
 
 #include "..\misc\ImplHelper.hxx"
 
 //_________________________________________________________________________________________________________________________
-//  other includes
+//	other includes
 //_________________________________________________________________________________________________________________________
 #include <cppuhelper/servicefactory.hxx>
 #include <com/sun/star/datatransfer/XTransferable.hpp>
@@ -79,27 +79,27 @@
 #define EVT_NONAME           ""
 
 //------------------------------------------------------------
-//  namesapces
+//	namesapces
 //------------------------------------------------------------
 
-using namespace ::rtl;
+using namespace	::rtl;
 using namespace ::std;
 using namespace ::cppu;
 using namespace ::com::sun::star::datatransfer;
 using namespace ::com::sun::star::datatransfer::clipboard;
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::io;
-using namespace ::com::sun::star::lang;
+using namespace	::com::sun::star::lang;
 
 //------------------------------------------------------------
-//  globales
+//	globales
 //------------------------------------------------------------
 
 Reference< XTransferable > rXTransfRead;
-HANDLE  g_hEvtThreadWakeup;
+HANDLE	g_hEvtThreadWakeup;
 
 //------------------------------------------------------------
-//
+//	
 //------------------------------------------------------------
 
 class CClipboardListener : public WeakImplHelper1 < XClipboardListener >
@@ -110,7 +110,7 @@ public:
     //-------------------------------------------------
     // XClipboardListener
     //-------------------------------------------------
-
+    
     virtual void SAL_CALL disposing( const EventObject& Source ) throw(RuntimeException);
     virtual void SAL_CALL changedContents( const ClipboardEvent& event ) throw( RuntimeException );
 };
@@ -130,39 +130,39 @@ void SAL_CALL CClipboardListener::changedContents( const ClipboardEvent& event )
 }
 
 //------------------------------------------------------------
-//
+//	
 //------------------------------------------------------------
 
 class CTransferable : public WeakImplHelper2< XClipboardOwner, XTransferable >
 {
-public:
+public:	
     CTransferable( );
-
+        
     //-------------------------------------------------
     // XTransferable
     //-------------------------------------------------
 
-    virtual Any SAL_CALL getTransferData( const DataFlavor& aFlavor )
+    virtual Any SAL_CALL getTransferData( const DataFlavor& aFlavor ) 
         throw(UnsupportedFlavorException, IOException, RuntimeException);
 
     virtual Sequence< DataFlavor > SAL_CALL getTransferDataFlavors(  ) throw(RuntimeException);
 
     virtual sal_Bool SAL_CALL isDataFlavorSupported( const DataFlavor& aFlavor ) throw(RuntimeException);
-
+    
     //-------------------------------------------------
     // XClipboardOwner
     //-------------------------------------------------
 
-    virtual void SAL_CALL lostOwnership( const Reference< XClipboard >& xClipboard, const Reference< XTransferable >& xTrans )
+    virtual void SAL_CALL lostOwnership( const Reference< XClipboard >& xClipboard, const Reference< XTransferable >& xTrans ) 
         throw(RuntimeException);
-
+    
 private:
     Sequence< DataFlavor > m_FlavorList;
     OUString               m_Data;
 };
 
 //----------------------------------------------------------------
-//  ctor
+//	ctor
 //----------------------------------------------------------------
 
 CTransferable::CTransferable( ) :
@@ -170,10 +170,10 @@ CTransferable::CTransferable( ) :
     m_Data( OUString::createFromAscii( "Ich habe mir ein neues Fahrrad gekauft!" ) )
 {
     DataFlavor df;
-
+    
     //df.MimeType = L"text/plain;charset=utf-16";
     //df.DataType = getCppuType( ( OUString* )0 );
-
+    
     df.MimeType = L"text/plain;charset=Windows1252";
     df.DataType = getCppuType( (Sequence< sal_Int8 >*)0 );
 
@@ -181,12 +181,12 @@ CTransferable::CTransferable( ) :
 }
 
 //----------------------------------------------------------------
-//  getTransferData
+//	getTransferData
 //----------------------------------------------------------------
 
-Any SAL_CALL CTransferable::getTransferData( const DataFlavor& aFlavor )
+Any SAL_CALL CTransferable::getTransferData( const DataFlavor& aFlavor ) 
     throw(UnsupportedFlavorException, IOException, RuntimeException)
-{
+{	
     Any anyData;
 
     /*
@@ -195,9 +195,9 @@ Any SAL_CALL CTransferable::getTransferData( const DataFlavor& aFlavor )
     */
     if ( aFlavor.MimeType.equalsIgnoreCase( m_FlavorList[0].MimeType ) )
     {
-        OString text(
-            m_Data.getStr( ),
-            m_Data.getLength( ),
+        OString text( 
+            m_Data.getStr( ), 
+            m_Data.getLength( ), 
             RTL_TEXTENCODING_ASCII_US );
 
         Sequence< sal_Int8 > textStream( text.getLength( ) + 1 );
@@ -205,7 +205,7 @@ Any SAL_CALL CTransferable::getTransferData( const DataFlavor& aFlavor )
         rtl_copyMemory( textStream.getArray( ), text.getStr( ), textStream.getLength( ) );
 
         anyData = makeAny( textStream );
-    }
+    }	
     else
         throw UnsupportedFlavorException( );
 
@@ -213,54 +213,54 @@ Any SAL_CALL CTransferable::getTransferData( const DataFlavor& aFlavor )
 }
 
 //----------------------------------------------------------------
-//  getTransferDataFlavors
+//	getTransferDataFlavors
 //----------------------------------------------------------------
 
-Sequence< DataFlavor > SAL_CALL CTransferable::getTransferDataFlavors(  )
+Sequence< DataFlavor > SAL_CALL CTransferable::getTransferDataFlavors(  ) 
     throw(RuntimeException)
 {
     return m_FlavorList;
 }
 
 //----------------------------------------------------------------
-//  isDataFlavorSupported
+//	isDataFlavorSupported
 //----------------------------------------------------------------
 
-sal_Bool SAL_CALL CTransferable::isDataFlavorSupported( const DataFlavor& aFlavor )
+sal_Bool SAL_CALL CTransferable::isDataFlavorSupported( const DataFlavor& aFlavor ) 
     throw(RuntimeException)
 {
     sal_Int32 nLength = m_FlavorList.getLength( );
-
+    
     for ( sal_Int32 i = 0; i < nLength; ++i )
-        if ( m_FlavorList[i].MimeType == aFlavor.MimeType )
-            return sal_True;
+        if ( m_FlavorList[i].MimeType == aFlavor.MimeType )	
+            return sal_True;			
 
     return sal_False;
 }
 
 //----------------------------------------------------------------
-//  lostOwnership
+//	lostOwnership
 //----------------------------------------------------------------
 
-void SAL_CALL CTransferable::lostOwnership(
-    const Reference< XClipboard >& xClipboard, const Reference< XTransferable >& xTrans )
+void SAL_CALL CTransferable::lostOwnership( 
+    const Reference< XClipboard >& xClipboard, const Reference< XTransferable >& xTrans ) 
     throw(RuntimeException)
 {
     //MessageBox( NULL, TEXT("No longer clipboard owner"), TEXT("Info"), MB_OK | MB_ICONINFORMATION );
 }
 
 //----------------------------------------------------------------
-//  main
+//	main
 //----------------------------------------------------------------
 
 int SAL_CALL main( int nArgc, char* Argv[] )
 {
-    // create a multi-threaded apartment; we can test only
+    // create a multi-threaded apartment; we can test only 
     // with a multithreaded apartment because for a single
     // threaded apartment we need a message loop to deliver
     // messages to our XTDataObject
     //HRESULT hr = CoInitializeEx( NULL, COINIT_MULTITHREADED );
-    HRESULT hr = CoInitialize( NULL );
+    HRESULT hr = CoInitialize( NULL );	
 
     char buff[6];
 
@@ -289,7 +289,7 @@ int SAL_CALL main( int nArgc, char* Argv[] )
 
     Reference< XTransferable > rXTransf( static_cast< XTransferable* >( new CTransferable ) );
 
-    Reference< XClipboard >
+    Reference< XClipboard > 
         xClipboard( g_xFactory->createInstance( OUString( WINCLIPBOARD_SERVICE_NAME ) ), UNO_QUERY );
     if ( !xClipboard.is( ) )
     {
@@ -299,7 +299,7 @@ int SAL_CALL main( int nArgc, char* Argv[] )
 
     Reference< XClipboardNotifier > xClipNotifier( xClipboard, UNO_QUERY );
     Reference< XClipboardListener > rXClipListener( static_cast< XClipboardListener* >( new CClipboardListener() ) );
-    xClipNotifier->addClipboardListener( rXClipListener );
+    xClipNotifier->addClipboardListener( rXClipListener );	
 
     MessageBox( NULL, TEXT("Go"), TEXT("INFO"), MB_OK|MB_ICONINFORMATION);
 
@@ -315,7 +315,7 @@ int SAL_CALL main( int nArgc, char* Argv[] )
     */
 
     MessageBox( NULL, TEXT("Stop"), TEXT("INFO"), MB_OK|MB_ICONINFORMATION);
-
+    
     // flush the clipboard content
     Reference< XFlushableClipboard > rXFlushableClip( xClipboard, UNO_QUERY );
     rXFlushableClip->flushClipboard( );
@@ -324,7 +324,7 @@ int SAL_CALL main( int nArgc, char* Argv[] )
     xClipNotifier->removeClipboardListener( rXClipListener );
     rXClipListener = Reference< XClipboardListener >( );
     xClipNotifier  = Reference< XClipboardNotifier >( );
-
+    
     //--------------------------------------------------
     // shutdown the service manager
     //--------------------------------------------------
@@ -334,7 +334,7 @@ int SAL_CALL main( int nArgc, char* Argv[] )
 
     if ( !xComponent.is() )
         OSL_ENSURE(sal_False, "Error shuting down");
-
+    
     // Dispose and clear factory
     xComponent->dispose();
     xComponent = Reference< XComponent >( );
@@ -344,5 +344,5 @@ int SAL_CALL main( int nArgc, char* Argv[] )
 
     CoUninitialize( );
 
-    return 0;
+    return 0;	
 }
diff --git a/dtrans/source/win32/workbench/testmarshal.cxx b/dtrans/source/win32/workbench/testmarshal.cxx
index 3927a1dcf449..8c46c7bc374e 100644
--- a/dtrans/source/win32/workbench/testmarshal.cxx
+++ b/dtrans/source/win32/workbench/testmarshal.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
@@ -30,11 +30,11 @@
 
 
 //_________________________________________________________________________________________________________________________
-//  interface includes
+//	interface includes
 //_________________________________________________________________________________________________________________________
 
 //_________________________________________________________________________________________________________________________
-//  other includes
+//	other includes
 //_________________________________________________________________________________________________________________________
 #include <rtl/ustring.hxx>
 #include <sal/types.h>
@@ -67,17 +67,17 @@
 #define RAW_MARSHALING
 
 //------------------------------------------------------------
-//  namesapces
+//	namesapces
 //------------------------------------------------------------
 
-using namespace ::rtl;
+using namespace	::rtl;
 using namespace ::std;
 
 //------------------------------------------------------------
-//  globales
+//	globales
 //------------------------------------------------------------
 
-HANDLE  g_hEvtThreadWakeup;
+HANDLE	g_hEvtThreadWakeup;
 
 #ifdef RAW_MARSHALING
     HGLOBAL g_hGlob;
@@ -91,21 +91,21 @@ HANDLE  g_hEvtThreadWakeup;
 unsigned int _stdcall ThreadProc(LPVOID pParam)
 {
     // setup another apartment
-    HRESULT hr = OleInitialize( NULL );
+    HRESULT hr = OleInitialize( NULL );	
 
     WaitForSingleObject( g_hEvtThreadWakeup, INFINITE );
 
     IDataObject* pIDo;
 
 #ifdef RAW_MARSHALING
-
+    
     IStream* pStm = NULL;
     hr = CreateStreamOnHGlobal( g_hGlob, FALSE, &pStm );
     if ( SUCCEEDED( hr ) )
     {
-        hr = CoUnmarshalInterface(
-                pStm,
-                __uuidof( IDataObject ),
+        hr = CoUnmarshalInterface( 
+                pStm, 
+                __uuidof( IDataObject ), 
                 (void**)&pIDo );
 
         hr = pStm->Release( );
@@ -113,7 +113,7 @@ unsigned int _stdcall ThreadProc(LPVOID pParam)
 
 #else
 
-    hr = CoGetInterfaceAndReleaseStream(
+    hr = CoGetInterfaceAndReleaseStream( 
         g_pStm,
         __uuidof( IDataObject ),
         (void**)&pIDo
@@ -125,7 +125,7 @@ unsigned int _stdcall ThreadProc(LPVOID pParam)
     hr = pIDo->EnumFormatEtc( DATADIR_GET, &pIEEtc );
 
     hr = OleIsCurrentClipboard( pIDo );
-
+    
     hr = OleFlushClipboard( );
 
     OleUninitialize( );
@@ -136,16 +136,16 @@ unsigned int _stdcall ThreadProc(LPVOID pParam)
 //################################################################
 
 //----------------------------------------------------------------
-//  main
+//	main
 //----------------------------------------------------------------
 
 int SAL_CALL main( int nArgc, char* Argv[] )
 {
-    HRESULT hr = OleInitialize( NULL );
+    HRESULT hr = OleInitialize( NULL );	
 
-    g_hEvtThreadWakeup = CreateEvent( 0,
-                                      EVT_MANUAL_RESET,
-                                      EVT_INIT_NONSIGNALED,
+    g_hEvtThreadWakeup = CreateEvent( 0, 
+                                      EVT_MANUAL_RESET, 
+                                      EVT_INIT_NONSIGNALED, 
                                       EVT_NONAME );
 
     unsigned uThreadId;
@@ -165,18 +165,18 @@ int SAL_CALL main( int nArgc, char* Argv[] )
     if ( SUCCEEDED( hr ) )
     {
 #ifdef RAW_MARSHALING
-
+    
         IStream* pStm = NULL;
 
         hr = CreateStreamOnHGlobal( 0, FALSE, &pStm );
         if ( SUCCEEDED( hr ) )
         {
-            hr = CoMarshalInterface(
-                pStm,
-                __uuidof( IDataObject ),
-                pIDo,
-                MSHCTX_INPROC,
-                0,
+            hr = CoMarshalInterface( 
+                pStm, 
+                __uuidof( IDataObject ), 
+                pIDo, 
+                MSHCTX_INPROC, 
+                0, 
                 MSHLFLAGS_NORMAL );
             if ( SUCCEEDED( hr ) )
                 hr = GetHGlobalFromStream( pStm, &g_hGlob );
@@ -186,7 +186,7 @@ int SAL_CALL main( int nArgc, char* Argv[] )
 
 #else
 
-        hr = CoMarshalInterThreadInterfaceInStream(
+        hr = CoMarshalInterThreadInterfaceInStream( 
                 __uuidof( IDataObject ),
                 pIDo,
                 &g_pStm );
@@ -196,7 +196,7 @@ int SAL_CALL main( int nArgc, char* Argv[] )
         if ( SUCCEEDED( hr ) )
         {
             // wakeup the thread and waiting util it ends
-            SetEvent( g_hEvtThreadWakeup );
+            SetEvent( g_hEvtThreadWakeup );			
 
 #ifdef WAIT_MSGLOOP
 
@@ -204,10 +204,10 @@ int SAL_CALL main( int nArgc, char* Argv[] )
 
             while( bContinue )
             {
-                DWORD dwResult = WaitForMultipleObjects(
-                    1,
-                    &hThread,
-                    TRUE,
+                DWORD dwResult = WaitForMultipleObjects( 
+                    1, 
+                    &hThread, 
+                    TRUE, 
                     0 );
 
                 if ( WAIT_OBJECT_0 == dwResult )
@@ -217,27 +217,27 @@ int SAL_CALL main( int nArgc, char* Argv[] )
                 else
                 {
                     MSG msg;
-                    while( PeekMessage(
-                            &msg,
-                            NULL,
-                            0,
-                            0,
+                    while( PeekMessage( 
+                            &msg, 
+                            NULL, 
+                            0, 
+                            0, 
                             PM_REMOVE ) )
                     {
                         TranslateMessage(&msg);
                         DispatchMessage(&msg);
                     }
-                }
+                }				
             } // while
 
 #endif
 
         } // if
     } // if
-
+    
     OleFlushClipboard( );
 
     OleUninitialize( );
-
-    return 0;
+    
+    return 0;	
 }
diff --git a/dtrans/test/win32/dnd/atlwindow.cxx b/dtrans/test/win32/dnd/atlwindow.cxx
index 2ed1b1b956bb..aed105aad624 100644
--- a/dtrans/test/win32/dnd/atlwindow.cxx
+++ b/dtrans/test/win32/dnd/atlwindow.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
@@ -76,11 +76,11 @@ LRESULT AWindow::OnClose(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled
     m_xDropTarget=0;
     m_xDragSource=0;
 
-
-     // Remove the subclass from the edit control.
-    ::SetWindowLong(m_hwndEdit, GWL_WNDPROC,
-                (LONG) wpOrigEditProc);
-
+    
+     // Remove the subclass from the edit control. 
+    ::SetWindowLong(m_hwndEdit, GWL_WNDPROC, 
+                (LONG) wpOrigEditProc); 
+            
     return 0;
 }
 
@@ -88,26 +88,26 @@ LRESULT AWindow::OnClose(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled
 LRESULT AWindow::OnCreate(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled)
 {
     // Prepare the EDIT control
-    m_hwndEdit = CreateWindowA(
-        "EDIT",     // predefined class
-        NULL,       // no window title
-        WS_CHILD | WS_VISIBLE | WS_VSCROLL |
-            ES_LEFT | ES_MULTILINE | ES_AUTOVSCROLL,
-        0, 0, 0, 0, // set size in WM_SIZE message
-        m_hWnd,       // parent window
-        (HMENU) NULL, // edit control ID
-        (HINSTANCE) GetWindowLong( GWL_HINSTANCE),
-        NULL);
-
-    // the map is used in the window procedure for the edit window to associate the
+    m_hwndEdit = CreateWindowA( 
+        "EDIT",     // predefined class 
+        NULL,       // no window title 
+        WS_CHILD | WS_VISIBLE | WS_VSCROLL | 
+            ES_LEFT | ES_MULTILINE | ES_AUTOVSCROLL, 
+        0, 0, 0, 0, // set size in WM_SIZE message 
+        m_hWnd,       // parent window 
+        (HMENU) NULL, // edit control ID 
+        (HINSTANCE) GetWindowLong( GWL_HINSTANCE), 
+        NULL);  
+
+    // the map is used in the window procedure for the edit window to associate the 
     // it to the right main window ( AWindow)
     mapEditToMainWnd[m_hwndEdit]= m_hWnd;
     // Superclass the edit window, because we want to process mouse messages
-    wpOrigEditProc = (WNDPROC) ::SetWindowLongA(m_hwndEdit,
-                GWL_WNDPROC, (LONG) EditSubclassProc);
-
-
-    // Add text to the window.
+    wpOrigEditProc = (WNDPROC) ::SetWindowLongA(m_hwndEdit, 
+                GWL_WNDPROC, (LONG) EditSubclassProc); 
+            
+    
+    // Add text to the window. 
     if( m_isMTA)
         ::SendMessageA(m_hwndEdit, WM_SETTEXT, 0, (LPARAM) szMTAWin);
     else
@@ -118,7 +118,7 @@ LRESULT AWindow::OnCreate(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandle
     Reference< XInterface> xint= MultiServiceFactory->createInstance(OUString(L"com.sun.star.datatransfer.dnd.OleDragSource"));
     m_xDragSource= Reference<XDragSource>( xint, UNO_QUERY);
     Reference<XInitialization> xInit( xint, UNO_QUERY);
-
+    
     Any ar[2];
     ar[1]<<= (sal_uInt32)m_hWnd;
     xInit->initialize( Sequence<Any>( ar, 2) );
@@ -127,7 +127,7 @@ LRESULT AWindow::OnCreate(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandle
     Reference< XInterface> xintTarget= MultiServiceFactory->createInstance(OUString(L"com.sun.star.datatransfer.dnd.OleDropTarget"));
     m_xDropTarget= Reference<XDropTarget>( xintTarget, UNO_QUERY);
     Reference<XInitialization> xInitTarget( xintTarget, UNO_QUERY);
-
+    
     Any any;
     any <<= (sal_uInt32)m_hWnd;
     xInitTarget->initialize( Sequence<Any>( &any, 1) );
@@ -135,7 +135,7 @@ LRESULT AWindow::OnCreate(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandle
 
     m_xDropTarget->addDropTargetListener( static_cast<XDropTargetListener*>
         ( new DropTargetListener( m_hwndEdit)) );
-//  // make this window tho a drop target
+//	// make this window tho a drop target
     m_xDropTarget->setActive(sal_True);
 
     return 0;
@@ -170,9 +170,9 @@ LRESULT AWindow::OnTimer(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled
         char * pBuffer= new char[length + 1];
         ZeroMemory( pBuffer, length + 1);
         ::SendMessageA( m_hwndEdit, WM_GETTEXT, length, (LPARAM) pBuffer);
-
+        
         IDataObject* pData= NULL;
-        HRESULT hr= CreateDataCache( NULL, CLSID_NULL, __uuidof(IDataObject),(void**) &pData);
+        HRESULT hr= CreateDataCache( NULL, CLSID_NULL, __uuidof(IDataObject),(void**) &pData); 
         if( pData)
         {
             FORMATETC format={ CF_TEXT, NULL, DVASPECT_CONTENT, -1, };
@@ -188,10 +188,10 @@ LRESULT AWindow::OnTimer(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled
             medium.pUnkForRelease= NULL;
 
             pData->SetData( &format,  &medium, TRUE); // releases HGLOBAL eventually
-
-            Reference<XTransferable> xTrans= m_aDataConverter.createTransferableFromDataObj(
+            
+            Reference<XTransferable> xTrans= m_aDataConverter.createTransferableFromDataObj( 
                                                 MultiServiceFactory, pData);
-
+    
             // call XDragSource::executeDrag from an MTA
             if( m_isMTA )
             {
@@ -206,18 +206,18 @@ LRESULT AWindow::OnTimer(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled
                 // We must wait until the thread copied the ThreadData structure
                 WaitForSingleObject( data.evtThreadReady, INFINITE);
                 CloseHandle( data.evtThreadReady);
-
+                    
 
             }
             else
             {
-                m_xDragSource->startDrag( DragGestureEvent(),
+                m_xDragSource->startDrag( DragGestureEvent(), 
                     ACTION_LINK|ACTION_MOVE|ACTION_COPY,
                     0,
                     0,
                     xTrans,
                     Reference<XDragSourceListener>( static_cast<XDragSourceListener*>(new DragSourceListener() ) ) );
-            }
+            }	
         }
 
         delete[] pBuffer;
@@ -228,27 +228,27 @@ LRESULT AWindow::OnTimer(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled
 
 LRESULT AWindow::OnSize(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled)
 {
-    // Make the edit control the size of the window's
-    // client area.
-    ::MoveWindow(m_hwndEdit,
-        0, 0,           // starting x- and y-coordinates
-        LOWORD(lParam), // width of client area
-        HIWORD(lParam), // height of client area
-        TRUE);          // repaint window
-
+    // Make the edit control the size of the window's 
+    // client area. 
+    ::MoveWindow(m_hwndEdit, 
+        0, 0,           // starting x- and y-coordinates 
+        LOWORD(lParam), // width of client area 
+        HIWORD(lParam), // height of client area 
+        TRUE);          // repaint window 
+    
     return 0;
 }
 LRESULT AWindow::OnFocus(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled)
 {
-    ::SetFocus(m_hwndEdit);
-    return 0;
+    ::SetFocus(m_hwndEdit); 
+    return 0; 
 }
-
+ 
 
 
 // Subclass procedure for EDIT window
-LRESULT APIENTRY EditSubclassProc( HWND hwnd, UINT uMsg,WPARAM wParam, LPARAM lParam)
-{
+LRESULT APIENTRY EditSubclassProc( HWND hwnd, UINT uMsg,WPARAM wParam, LPARAM lParam) 
+{ 
 
     if( uMsg >= WM_MOUSEFIRST && uMsg <= WM_MOUSELAST)
     {
@@ -256,7 +256,7 @@ LRESULT APIENTRY EditSubclassProc( HWND hwnd, UINT uMsg,WPARAM wParam, LPARAM lP
         ::SendMessage( hAWindow, uMsg, wParam, lParam);
 
     }
-    return CallWindowProc( wpOrigEditProc, hwnd, uMsg,
-        wParam, lParam);
-}
-
+    return CallWindowProc( wpOrigEditProc, hwnd, uMsg, 
+        wParam, lParam); 
+} 
+ 
diff --git a/dtrans/test/win32/dnd/atlwindow.hxx b/dtrans/test/win32/dnd/atlwindow.hxx
index 7befe05bbb4e..7b278af90131 100644
--- a/dtrans/test/win32/dnd/atlwindow.hxx
+++ b/dtrans/test/win32/dnd/atlwindow.hxx
@@ -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
diff --git a/dtrans/test/win32/dnd/dndTest.cxx b/dtrans/test/win32/dnd/dndTest.cxx
index e1a96598da62..feeef9a0a24b 100644
--- a/dtrans/test/win32/dnd/dndTest.cxx
+++ b/dtrans/test/win32/dnd/dndTest.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
@@ -87,15 +87,15 @@ int main( int argc, char *argv[ ], char *envp[ ] )
         _tprintf(_T("CoInitialize failed \n"));
         return -1;
     }
-
-
+    
+    
     _Module.Init( ObjectMap, GetModuleHandle( NULL));
 
     if( FAILED(hr=doTest()))
     {
         _com_error err( hr);
         const TCHAR * errMsg= err.ErrorMessage();
-//      MessageBox( NULL, errMsg, "Test failed", MB_ICONERROR);
+//		MessageBox( NULL, errMsg, "Test failed", MB_ICONERROR);
     }
 
 
@@ -116,8 +116,8 @@ HRESULT doTest()
     HANDLE hMTAThread= CreateThread( NULL, 0, MTAFunc, &evt, 0, &threadIdMTA);
     WaitForSingleObject( evt, INFINITE);
     CloseHandle(evt);
-
-
+    
+    
     HRESULT hr= S_OK;
     RECT pos1={0,0,300,200};
     AWindow win(_T("DnD starting in Ole STA"), threadIdMTA, pos1);
@@ -132,7 +132,7 @@ HRESULT doTest()
     RECT pos4={ 300, 205, 600, 405};
     AWindow win24( _T("DnD starting in Ole MTA"), threadIdMTA, pos4, true, true);
 
-
+    
     MSG msg;
     while( GetMessage(&msg, (HWND)NULL, 0, 0) )
     {
@@ -144,7 +144,7 @@ HRESULT doTest()
     PostThreadMessage( threadIdMTA, WM_QUIT, 0, 0);
     WaitForSingleObject(hMTAThread, INFINITE);
     CloseHandle(hMTAThread);
-
+    
     return S_OK;
 }
 
@@ -161,8 +161,8 @@ DWORD WINAPI MTAFunc( void* threadData)
 
     RECT pos={0, 406, 300, 605};
     AWindow win(_T("DnD, full MTA"), GetCurrentThreadId(), pos, false, true);
-//  ThreadData data= *( ThreadData*)pParams;
-//  SetEvent(data.evtThreadReady);
+//	ThreadData data= *( ThreadData*)pParams;
+//	SetEvent(data.evtThreadReady);
     while( GetMessage(&msg, (HWND)NULL, 0, 0) )
     {
         switch( msg.message)
@@ -173,7 +173,7 @@ DWORD WINAPI MTAFunc( void* threadData)
             Any any;
             any <<= (sal_uInt32) pData->hWnd;
             pData->xInit->initialize( Sequence<Any>( &any, 1));
-
+                
             CoTaskMemFree( pData);
             break;
         }
@@ -187,7 +187,7 @@ DWORD WINAPI MTAFunc( void* threadData)
             {
                 DataFlavor d= seq[i];
             }
-            pData->source->startDrag( DragGestureEvent(),
+            pData->source->startDrag( DragGestureEvent(), 
                                       ACTION_LINK|ACTION_MOVE|ACTION_COPY,
                                       0,
                                       0,
@@ -199,7 +199,7 @@ DWORD WINAPI MTAFunc( void* threadData)
         }
 
         } // end switch
-
+        
         TranslateMessage(  &msg);
         DispatchMessage( &msg);
     }
diff --git a/dtrans/test/win32/dnd/sourcelistener.cxx b/dtrans/test/win32/dnd/sourcelistener.cxx
index 377157b5512e..7b61d000ffb7 100644
--- a/dtrans/test/win32/dnd/sourcelistener.cxx
+++ b/dtrans/test/win32/dnd/sourcelistener.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
@@ -41,32 +41,32 @@ DragSourceListener::~DragSourceListener()
 {
 }
 
-void SAL_CALL DragSourceListener::disposing( const EventObject& Source )
+void SAL_CALL DragSourceListener::disposing( const EventObject& Source ) 
         throw(RuntimeException)
 {
 }
 
-void SAL_CALL DragSourceListener::dragDropEnd( const DragSourceDropEvent& dsde )
+void SAL_CALL DragSourceListener::dragDropEnd( const DragSourceDropEvent& dsde ) 
     throw(RuntimeException)
 {
 }
 
-void SAL_CALL DragSourceListener::dragEnter( const DragSourceDragEvent& dsde )
+void SAL_CALL DragSourceListener::dragEnter( const DragSourceDragEvent& dsde ) 
     throw(RuntimeException)
 {
 }
 
-void SAL_CALL DragSourceListener::dragExit( const DragSourceEvent& dse )
+void SAL_CALL DragSourceListener::dragExit( const DragSourceEvent& dse ) 
     throw(RuntimeException)
 {
 }
 
-void SAL_CALL DragSourceListener::dragOver( const DragSourceDragEvent& dsde )
+void SAL_CALL DragSourceListener::dragOver( const DragSourceDragEvent& dsde ) 
     throw(RuntimeException)
 {
 }
 
-void SAL_CALL DragSourceListener::dropActionChanged( const DragSourceDragEvent& dsde )
+void SAL_CALL DragSourceListener::dropActionChanged( const DragSourceDragEvent& dsde ) 
     throw(RuntimeException)
 {
 }
diff --git a/dtrans/test/win32/dnd/sourcelistener.hxx b/dtrans/test/win32/dnd/sourcelistener.hxx
index 0480102d7e00..280e08c58a29 100644
--- a/dtrans/test/win32/dnd/sourcelistener.hxx
+++ b/dtrans/test/win32/dnd/sourcelistener.hxx
@@ -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
@@ -46,18 +46,18 @@ public:
     DragSourceListener( );
     ~DragSourceListener();
 
-    virtual void SAL_CALL disposing( const EventObject& Source )
+    virtual void SAL_CALL disposing( const EventObject& Source ) 
         throw(RuntimeException);
 
-    virtual void SAL_CALL dragDropEnd( const DragSourceDropEvent& dsde )
+    virtual void SAL_CALL dragDropEnd( const DragSourceDropEvent& dsde ) 
         throw(RuntimeException);
-    virtual void SAL_CALL dragEnter( const DragSourceDragEvent& dsde )
+    virtual void SAL_CALL dragEnter( const DragSourceDragEvent& dsde ) 
         throw(RuntimeException);
-    virtual void SAL_CALL dragExit( const DragSourceEvent& dse )
+    virtual void SAL_CALL dragExit( const DragSourceEvent& dse ) 
         throw(RuntimeException);
-    virtual void SAL_CALL dragOver( const DragSourceDragEvent& dsde )
+    virtual void SAL_CALL dragOver( const DragSourceDragEvent& dsde ) 
         throw(RuntimeException);
-    virtual void SAL_CALL dropActionChanged( const DragSourceDragEvent& dsde )
+    virtual void SAL_CALL dropActionChanged( const DragSourceDragEvent& dsde ) 
         throw(RuntimeException);
 
 };
diff --git a/dtrans/test/win32/dnd/targetlistener.cxx b/dtrans/test/win32/dnd/targetlistener.cxx
index cb4a5ac72664..03d538b7da45 100644
--- a/dtrans/test/win32/dnd/targetlistener.cxx
+++ b/dtrans/test/win32/dnd/targetlistener.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
@@ -45,28 +45,28 @@ DropTargetListener::~DropTargetListener()
 {
 }
 
-void SAL_CALL DropTargetListener::disposing( const EventObject& Source )
+void SAL_CALL DropTargetListener::disposing( const EventObject& Source ) 
         throw(RuntimeException)
 {
-
+    
 }
 
 
 
-void SAL_CALL DropTargetListener::drop( const DropTargetDropEvent& e )
+void SAL_CALL DropTargetListener::drop( const DropTargetDropEvent& e ) 
     throw(RuntimeException)
 {
-//  e.Context->dropComplete( sal_True);
-//  e.Context->acceptDrop( ACTION_COPY);
+//	e.Context->dropComplete( sal_True);
+//	e.Context->acceptDrop( ACTION_COPY);
     e.Context->rejectDrop();
 
     // if the Transferable contains text, then we send it to the edit window
-//  Sequence<DataFlavor> flavors= e.Transferable->getTransferDataFlavors();
-//  DataFlavor aFlavor;
-//  for( int i=0; i < flavors.getLength(); i++)
-//      aFlavor= flavors[4];
+//	Sequence<DataFlavor> flavors= e.Transferable->getTransferDataFlavors();
+//	DataFlavor aFlavor;
+//	for( int i=0; i < flavors.getLength(); i++)
+//		aFlavor= flavors[4];
 
-    DataFlavor flavor( OUString(OUString::createFromAscii("text/plain;charset=windows-1252")),
+    DataFlavor flavor( OUString(OUString::createFromAscii("text/plain;charset=windows-1252")), 
         OUString(L"Text plain"), getCppuType( ( Sequence<sal_Int8>*)0 ) );
 
     Any anyData= e.Transferable->getTransferData( flavor);
@@ -74,30 +74,30 @@ void SAL_CALL DropTargetListener::drop( const DropTargetDropEvent& e )
     SendMessage( m_hEdit, WM_SETTEXT, 0, (LPARAM) seq.getConstArray() );
 }
 
-void SAL_CALL DropTargetListener::dragEnter( const DropTargetDragEnterEvent& dtde )
+void SAL_CALL DropTargetListener::dragEnter( const DropTargetDragEnterEvent& dtde ) 
      throw(RuntimeException)
 {
     //If one drags something that is not moveable
     if( !(dtde.SourceActions & dtde.DropAction) )
         dtde.Context->acceptDrag( ACTION_COPY);
 
-//  dtde.Context->rejectDrag( );
+//	dtde.Context->rejectDrag( );
 
 }
 
-void SAL_CALL DropTargetListener::dragExit( const DropTargetEvent& dte )
+void SAL_CALL DropTargetListener::dragExit( const DropTargetEvent& dte ) 
      throw(RuntimeException)
 {
 }
 
-void SAL_CALL DropTargetListener::dragOver( const DropTargetDragEvent& dtde )
+void SAL_CALL DropTargetListener::dragOver( const DropTargetDragEvent& dtde ) 
      throw(RuntimeException)
-{
+{	
     if( !(dtde.SourceActions & dtde.DropAction) )
         dtde.Context->acceptDrag( ACTION_COPY);
 }
 
-void SAL_CALL DropTargetListener::dropActionChanged( const DropTargetDragEvent& dtde )
+void SAL_CALL DropTargetListener::dropActionChanged( const DropTargetDragEvent& dtde ) 
     throw(RuntimeException)
 {
 }
diff --git a/dtrans/test/win32/dnd/targetlistener.hxx b/dtrans/test/win32/dnd/targetlistener.hxx
index 9c3402e961da..f52e41d1cdf7 100644
--- a/dtrans/test/win32/dnd/targetlistener.hxx
+++ b/dtrans/test/win32/dnd/targetlistener.hxx
@@ -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
@@ -55,19 +55,19 @@ public:
     DropTargetListener( HWND hEdit);
     ~DropTargetListener();
 
-    virtual void SAL_CALL disposing( const EventObject& Source )
+    virtual void SAL_CALL disposing( const EventObject& Source ) 
         throw(RuntimeException);
 
 
-    virtual void SAL_CALL drop( const DropTargetDropEvent& dtde )
+    virtual void SAL_CALL drop( const DropTargetDropEvent& dtde ) 
         throw(RuntimeException);
-    virtual void SAL_CALL dragEnter( const DropTargetDragEnterEvent& dtde )
+    virtual void SAL_CALL dragEnter( const DropTargetDragEnterEvent& dtde ) 
         throw(RuntimeException);
-    virtual void SAL_CALL dragExit( const DropTargetEvent& dte )
+    virtual void SAL_CALL dragExit( const DropTargetEvent& dte ) 
         throw(RuntimeException);
-    virtual void SAL_CALL dragOver( const DropTargetDragEvent& dtde )
+    virtual void SAL_CALL dragOver( const DropTargetDragEvent& dtde ) 
         throw(RuntimeException);
-    virtual void SAL_CALL dropActionChanged( const DropTargetDragEvent& dtde )
+    virtual void SAL_CALL dropActionChanged( const DropTargetDragEvent& dtde ) 
         throw(RuntimeException);
 };
 
diff --git a/dtrans/test/win32/dnd/transferable.cxx b/dtrans/test/win32/dnd/transferable.cxx
index 4c76ec2fee73..724adfb38d74 100644
--- a/dtrans/test/win32/dnd/transferable.cxx
+++ b/dtrans/test/win32/dnd/transferable.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
@@ -30,7 +30,7 @@
 #include "transferable.hxx"
 
 //----------------------------------------------------------------
-//  ctor
+//	ctor
 //----------------------------------------------------------------
 
 
@@ -40,29 +40,29 @@ CTransferable::CTransferable( wchar_t* dataString ) :
     m_Data( dataString )
 {
     DataFlavor df;
-
+    
     /*
     df.MimeType = L"text/plain; charset=unicode";
     df.DataType = getCppuType( ( OUString* )0 );
 
     m_seqDFlv[0] = df;
     */
-
+    
     //df.MimeType = L"text/plain; charset=windows1252";
     df.MimeType = L"text/plain";
     df.DataType = getCppuType( ( Sequence< sal_Int8 >* )0 );
 
 
-    m_seqDFlv[0] = df;
+    m_seqDFlv[0] = df;	
 }
 
 //----------------------------------------------------------------
-//  getTransferData
+//	getTransferData
 //----------------------------------------------------------------
 
-Any SAL_CALL CTransferable::getTransferData( const DataFlavor& aFlavor )
+Any SAL_CALL CTransferable::getTransferData( const DataFlavor& aFlavor ) 
     throw(UnsupportedFlavorException, IOException, RuntimeException)
-{
+{	
     Any anyData;
 
     /*if ( aFlavor == m_seqDFlv[0] )
@@ -85,20 +85,20 @@ Any SAL_CALL CTransferable::getTransferData( const DataFlavor& aFlavor )
 }
 
 //----------------------------------------------------------------
-//  getTransferDataFlavors
+//	getTransferDataFlavors
 //----------------------------------------------------------------
 
-Sequence< DataFlavor > SAL_CALL CTransferable::getTransferDataFlavors(  )
+Sequence< DataFlavor > SAL_CALL CTransferable::getTransferDataFlavors(  ) 
     throw(RuntimeException)
 {
     return m_seqDFlv;
 }
 
 //----------------------------------------------------------------
-//  isDataFlavorSupported
+//	isDataFlavorSupported
 //----------------------------------------------------------------
 
-sal_Bool SAL_CALL CTransferable::isDataFlavorSupported( const DataFlavor& aFlavor )
+sal_Bool SAL_CALL CTransferable::isDataFlavorSupported( const DataFlavor& aFlavor ) 
     throw(RuntimeException)
 {
     sal_Int32 nLength = m_seqDFlv.getLength( );
@@ -117,10 +117,10 @@ sal_Bool SAL_CALL CTransferable::isDataFlavorSupported( const DataFlavor& aFlavo
 }
 
 //----------------------------------------------------------------
-//  lostOwnership
+//	lostOwnership
 //----------------------------------------------------------------
 
-void SAL_CALL CTransferable::lostOwnership( const Reference< XClipboard >& xClipboard, const Reference< XTransferable >& xTrans )
+void SAL_CALL CTransferable::lostOwnership( const Reference< XClipboard >& xClipboard, const Reference< XTransferable >& xTrans ) 
     throw(RuntimeException)
 {
 }
diff --git a/dtrans/test/win32/dnd/transferable.hxx b/dtrans/test/win32/dnd/transferable.hxx
index a9509f497ab1..74180d44a3a3 100644
--- a/dtrans/test/win32/dnd/transferable.hxx
+++ b/dtrans/test/win32/dnd/transferable.hxx
@@ -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
@@ -28,14 +28,14 @@
 #define _TRANSFERABLE_HXX_
 
 //_________________________________________________________________________________________________________________________
-//  interface includes
+//	interface includes
 //_________________________________________________________________________________________________________________________
 
 
 //#include "..\ImplHelper.hxx"
 
 //_________________________________________________________________________________________________________________________
-//  other includes
+//	other includes
 //_________________________________________________________________________________________________________________________
 
 #include <cppuhelper/servicefactory.hxx>
@@ -79,28 +79,28 @@
 #define EVT_NONAME           ""
 
 //------------------------------------------------------------
-//  namesapces
+//	namesapces
 //------------------------------------------------------------
 
-using namespace ::rtl;
+using namespace	::rtl;
 using namespace ::std;
 using namespace ::cppu;
 using namespace ::com::sun::star::datatransfer;
 using namespace ::com::sun::star::datatransfer::clipboard;
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::io;
-using namespace ::com::sun::star::lang;
+using namespace	::com::sun::star::lang;
 
 //------------------------------------------------------------
-//
+//	
 //------------------------------------------------------------
 
 class CTransferable : public WeakImplHelper2< XClipboardOwner, XTransferable >
 {
-public:
+public:	
     CTransferable( ){};
     CTransferable( wchar_t* dataString);
-
+        
     //-------------------------------------------------
     // XTransferable
     //-------------------------------------------------
@@ -108,13 +108,13 @@ public:
     virtual Any SAL_CALL getTransferData( const DataFlavor& aFlavor ) throw(UnsupportedFlavorException, IOException, RuntimeException);
     virtual Sequence< DataFlavor > SAL_CALL getTransferDataFlavors(  ) throw(RuntimeException);
     virtual sal_Bool SAL_CALL isDataFlavorSupported( const DataFlavor& aFlavor ) throw(RuntimeException);
-
+    
     //-------------------------------------------------
     // XClipboardOwner
     //-------------------------------------------------
 
     virtual void SAL_CALL lostOwnership( const Reference< XClipboard >& xClipboard, const Reference< XTransferable >& xTrans ) throw(RuntimeException);
-
+    
 private:
     Sequence< DataFlavor > m_seqDFlv;
     OUString               m_Data;
diff --git a/i18npool/inc/breakiteratorImpl.hxx b/i18npool/inc/breakiteratorImpl.hxx
index ad49d9f13027..ddf478f82c12 100644
--- a/i18npool/inc/breakiteratorImpl.hxx
+++ b/i18npool/inc/breakiteratorImpl.hxx
@@ -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
@@ -44,9 +44,9 @@
 
 namespace com { namespace sun { namespace star { namespace i18n {
 
-//  ----------------------------------------------------
-//  class BreakIterator
-//  ----------------------------------------------------
+//	----------------------------------------------------
+//	class BreakIterator
+//	----------------------------------------------------
 class BreakIteratorImpl : public cppu::WeakImplHelper2
 <
     XBreakIterator,
@@ -58,61 +58,61 @@ public:
     BreakIteratorImpl();
     ~BreakIteratorImpl();
 
-    virtual sal_Int32 SAL_CALL nextCharacters( const rtl::OUString& Text, sal_Int32 nStartPos,
-        const com::sun::star::lang::Locale& rLocale, sal_Int16 nCharacterIteratorMode, sal_Int32 nCount,
+    virtual sal_Int32 SAL_CALL nextCharacters( const rtl::OUString& Text, sal_Int32 nStartPos, 
+        const com::sun::star::lang::Locale& rLocale, sal_Int16 nCharacterIteratorMode, sal_Int32 nCount, 
         sal_Int32& nDone ) throw(com::sun::star::uno::RuntimeException);
-    virtual sal_Int32 SAL_CALL previousCharacters( const rtl::OUString& Text, sal_Int32 nStartPos,
-        const com::sun::star::lang::Locale& nLocale, sal_Int16 nCharacterIteratorMode, sal_Int32 nCount,
+    virtual sal_Int32 SAL_CALL previousCharacters( const rtl::OUString& Text, sal_Int32 nStartPos, 
+        const com::sun::star::lang::Locale& nLocale, sal_Int16 nCharacterIteratorMode, sal_Int32 nCount, 
         sal_Int32& nDone ) throw(com::sun::star::uno::RuntimeException);
 
-    virtual Boundary SAL_CALL previousWord( const rtl::OUString& Text, sal_Int32 nStartPos,
+    virtual Boundary SAL_CALL previousWord( const rtl::OUString& Text, sal_Int32 nStartPos, 
         const com::sun::star::lang::Locale& nLocale, sal_Int16 WordType) throw(com::sun::star::uno::RuntimeException);
-    virtual Boundary SAL_CALL nextWord( const rtl::OUString& Text, sal_Int32 nStartPos,
+    virtual Boundary SAL_CALL nextWord( const rtl::OUString& Text, sal_Int32 nStartPos, 
         const com::sun::star::lang::Locale& nLocale, sal_Int16 WordType) throw(com::sun::star::uno::RuntimeException);
-    virtual Boundary SAL_CALL getWordBoundary( const rtl::OUString& Text, sal_Int32 nPos,
-        const com::sun::star::lang::Locale& nLocale, sal_Int16 WordType, sal_Bool bDirection )
+    virtual Boundary SAL_CALL getWordBoundary( const rtl::OUString& Text, sal_Int32 nPos, 
+        const com::sun::star::lang::Locale& nLocale, sal_Int16 WordType, sal_Bool bDirection ) 
         throw(com::sun::star::uno::RuntimeException);
 
-    virtual sal_Bool SAL_CALL isBeginWord( const rtl::OUString& Text, sal_Int32 nPos,
+    virtual sal_Bool SAL_CALL isBeginWord( const rtl::OUString& Text, sal_Int32 nPos, 
         const com::sun::star::lang::Locale& nLocale, sal_Int16 WordType ) throw(com::sun::star::uno::RuntimeException);
-    virtual sal_Bool SAL_CALL isEndWord( const rtl::OUString& Text, sal_Int32 nPos,
+    virtual sal_Bool SAL_CALL isEndWord( const rtl::OUString& Text, sal_Int32 nPos, 
         const com::sun::star::lang::Locale& nLocale, sal_Int16 WordType ) throw(com::sun::star::uno::RuntimeException);
-    virtual sal_Int16 SAL_CALL getWordType( const rtl::OUString& Text, sal_Int32 nPos,
+    virtual sal_Int16 SAL_CALL getWordType( const rtl::OUString& Text, sal_Int32 nPos, 
         const com::sun::star::lang::Locale& nLocale ) throw(com::sun::star::uno::RuntimeException);
 
     virtual sal_Int32 SAL_CALL beginOfSentence( const rtl::OUString& Text, sal_Int32 nStartPos,
         const com::sun::star::lang::Locale& nLocale ) throw(com::sun::star::uno::RuntimeException);
-    virtual sal_Int32 SAL_CALL endOfSentence( const rtl::OUString& Text, sal_Int32 nStartPos,
+    virtual sal_Int32 SAL_CALL endOfSentence( const rtl::OUString& Text, sal_Int32 nStartPos, 
         const com::sun::star::lang::Locale& nLocale ) throw(com::sun::star::uno::RuntimeException);
 
-    virtual LineBreakResults SAL_CALL getLineBreak( const rtl::OUString& Text, sal_Int32 nStartPos,
-        const com::sun::star::lang::Locale& nLocale, sal_Int32 nMinBreakPos,
-        const LineBreakHyphenationOptions& hOptions, const LineBreakUserOptions& bOptions )
+    virtual LineBreakResults SAL_CALL getLineBreak( const rtl::OUString& Text, sal_Int32 nStartPos, 
+        const com::sun::star::lang::Locale& nLocale, sal_Int32 nMinBreakPos, 
+        const LineBreakHyphenationOptions& hOptions, const LineBreakUserOptions& bOptions ) 
         throw(com::sun::star::uno::RuntimeException);
 
-    virtual sal_Int16 SAL_CALL getScriptType( const rtl::OUString& Text, sal_Int32 nPos )
+    virtual sal_Int16 SAL_CALL getScriptType( const rtl::OUString& Text, sal_Int32 nPos ) 
         throw(com::sun::star::uno::RuntimeException);
-    virtual sal_Int32 SAL_CALL beginOfScript( const rtl::OUString& Text, sal_Int32 nStartPos,
+    virtual sal_Int32 SAL_CALL beginOfScript( const rtl::OUString& Text, sal_Int32 nStartPos, 
         sal_Int16 ScriptType ) throw(com::sun::star::uno::RuntimeException);
-    virtual sal_Int32 SAL_CALL endOfScript( const rtl::OUString& Text, sal_Int32 nStartPos,
+    virtual sal_Int32 SAL_CALL endOfScript( const rtl::OUString& Text, sal_Int32 nStartPos, 
         sal_Int16 ScriptType ) throw(com::sun::star::uno::RuntimeException);
-    virtual sal_Int32 SAL_CALL previousScript( const rtl::OUString& Text, sal_Int32 nStartPos,
+    virtual sal_Int32 SAL_CALL previousScript( const rtl::OUString& Text, sal_Int32 nStartPos, 
         sal_Int16 ScriptType ) throw(com::sun::star::uno::RuntimeException);
-    virtual sal_Int32 SAL_CALL nextScript( const rtl::OUString& Text, sal_Int32 nStartPos,
+    virtual sal_Int32 SAL_CALL nextScript( const rtl::OUString& Text, sal_Int32 nStartPos, 
         sal_Int16 ScriptType ) throw(com::sun::star::uno::RuntimeException);
 
-    virtual sal_Int32 SAL_CALL beginOfCharBlock( const rtl::OUString& Text, sal_Int32 nStartPos,
+    virtual sal_Int32 SAL_CALL beginOfCharBlock( const rtl::OUString& Text, sal_Int32 nStartPos, 
         const com::sun::star::lang::Locale& nLocale, sal_Int16 CharType ) throw(com::sun::star::uno::RuntimeException);
-    virtual sal_Int32 SAL_CALL endOfCharBlock( const rtl::OUString& Text, sal_Int32 nStartPos,
+    virtual sal_Int32 SAL_CALL endOfCharBlock( const rtl::OUString& Text, sal_Int32 nStartPos, 
         const com::sun::star::lang::Locale& nLocale, sal_Int16 CharType ) throw(com::sun::star::uno::RuntimeException);
-    virtual sal_Int32 SAL_CALL previousCharBlock( const rtl::OUString& Text, sal_Int32 nStartPos,
+    virtual sal_Int32 SAL_CALL previousCharBlock( const rtl::OUString& Text, sal_Int32 nStartPos, 
         const com::sun::star::lang::Locale& nLocale, sal_Int16 CharType ) throw(com::sun::star::uno::RuntimeException);
-    virtual sal_Int32 SAL_CALL nextCharBlock( const rtl::OUString& Text, sal_Int32 nStartPos,
+    virtual sal_Int32 SAL_CALL nextCharBlock( const rtl::OUString& Text, sal_Int32 nStartPos, 
         const com::sun::star::lang::Locale& nLocale, sal_Int16 CharType ) throw(com::sun::star::uno::RuntimeException);
 
     //XServiceInfo
     virtual rtl::OUString SAL_CALL getImplementationName() throw( com::sun::star::uno::RuntimeException );
-    virtual sal_Bool SAL_CALL supportsService(const rtl::OUString& ServiceName)
+    virtual sal_Bool SAL_CALL supportsService(const rtl::OUString& ServiceName) 
         throw( com::sun::star::uno::RuntimeException );
     virtual com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL getSupportedServiceNames()
         throw( com::sun::star::uno::RuntimeException );
diff --git a/i18npool/inc/breakiterator_cjk.hxx b/i18npool/inc/breakiterator_cjk.hxx
index e94dd7cd0534..300f117da0fa 100644
--- a/i18npool/inc/breakiterator_cjk.hxx
+++ b/i18npool/inc/breakiterator_cjk.hxx
@@ -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
@@ -31,9 +31,9 @@
 #include <xdictionary.hxx>
 
 namespace com { namespace sun { namespace star { namespace i18n {
-//  ----------------------------------------------------
-//  class BreakIterator_CJK
-//  ----------------------------------------------------
+//	----------------------------------------------------
+//	class BreakIterator_CJK
+//	----------------------------------------------------
 class BreakIterator_CJK : public BreakIterator_Unicode
 {
 public:
@@ -48,9 +48,9 @@ public:
     Boundary SAL_CALL getWordBoundary( const rtl::OUString& Text, sal_Int32 nPos,
             const com::sun::star::lang::Locale& nLocale, sal_Int16 WordType, sal_Bool bDirection )
             throw(com::sun::star::uno::RuntimeException);
-    LineBreakResults SAL_CALL getLineBreak( const rtl::OUString& Text, sal_Int32 nStartPos,
-        const com::sun::star::lang::Locale& nLocale, sal_Int32 nMinBreakPos,
-        const LineBreakHyphenationOptions& hOptions, const LineBreakUserOptions& bOptions )
+    LineBreakResults SAL_CALL getLineBreak( const rtl::OUString& Text, sal_Int32 nStartPos, 
+        const com::sun::star::lang::Locale& nLocale, sal_Int32 nMinBreakPos, 
+        const LineBreakHyphenationOptions& hOptions, const LineBreakUserOptions& bOptions ) 
         throw(com::sun::star::uno::RuntimeException);
 
 protected:
diff --git a/i18npool/inc/breakiterator_ctl.hxx b/i18npool/inc/breakiterator_ctl.hxx
index 17661614ab7b..2a7b0d2f8e7e 100644
--- a/i18npool/inc/breakiterator_ctl.hxx
+++ b/i18npool/inc/breakiterator_ctl.hxx
@@ -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
@@ -32,9 +32,9 @@
 
 namespace com { namespace sun { namespace star { namespace i18n {
 
-//  ----------------------------------------------------
-//  class BreakIterator_CTL
-//  ----------------------------------------------------
+//	----------------------------------------------------
+//	class BreakIterator_CTL
+//	----------------------------------------------------
 class BreakIterator_CTL : public BreakIterator_Unicode
 {
 public:
@@ -46,19 +46,19 @@ public:
     virtual sal_Int32 SAL_CALL nextCharacters(const rtl::OUString& text, sal_Int32 start,
         const lang::Locale& rLocale, sal_Int16 nCharacterIteratorMode, sal_Int32 count,
         sal_Int32& nDone) throw(com::sun::star::uno::RuntimeException);
-    virtual LineBreakResults SAL_CALL getLineBreak( const rtl::OUString& Text, sal_Int32 nStartPos,
-        const com::sun::star::lang::Locale& nLocale, sal_Int32 nMinBreakPos,
-        const LineBreakHyphenationOptions& hOptions, const LineBreakUserOptions& bOptions )
+    virtual LineBreakResults SAL_CALL getLineBreak( const rtl::OUString& Text, sal_Int32 nStartPos, 
+        const com::sun::star::lang::Locale& nLocale, sal_Int32 nMinBreakPos, 
+        const LineBreakHyphenationOptions& hOptions, const LineBreakUserOptions& bOptions ) 
         throw(com::sun::star::uno::RuntimeException);
 protected:
     rtl::OUString cachedText; // for cell index
     sal_Int32* nextCellIndex;
     sal_Int32* previousCellIndex;
     sal_Int32 cellIndexSize;
-
+    
     virtual void SAL_CALL makeIndex(const rtl::OUString& text, sal_Int32 pos) throw(com::sun::star::uno::RuntimeException);
 };
 
-} } } }
+} } } } 
 
 #endif
diff --git a/i18npool/inc/breakiterator_th.hxx b/i18npool/inc/breakiterator_th.hxx
index cba8bd2440de..b3a2ce321df9 100644
--- a/i18npool/inc/breakiterator_th.hxx
+++ b/i18npool/inc/breakiterator_th.hxx
@@ -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
@@ -30,9 +30,9 @@
 
 namespace com { namespace sun { namespace star { namespace i18n {
 
-//  ----------------------------------------------------
-//  class BreakIterator_th
-//  ----------------------------------------------------
+//	----------------------------------------------------
+//	class BreakIterator_th
+//	----------------------------------------------------
 class BreakIterator_th : public BreakIterator_CTL
 {
 public:
@@ -43,6 +43,6 @@ protected:
     void SAL_CALL makeIndex(const rtl::OUString& text, sal_Int32 pos) throw(com::sun::star::uno::RuntimeException);
 };
 
-} } } }
+} } } } 
 
 #endif // _I18N_BREAKITERATOR_TH_HXX_
diff --git a/i18npool/inc/breakiterator_unicode.hxx b/i18npool/inc/breakiterator_unicode.hxx
index 53600c0cb3ae..3e9e23f1aaa1 100644
--- a/i18npool/inc/breakiterator_unicode.hxx
+++ b/i18npool/inc/breakiterator_unicode.hxx
@@ -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
@@ -38,45 +38,45 @@ namespace com { namespace sun { namespace star { namespace i18n {
 #define LOAD_SENTENCE_BREAKITERATOR     2
 #define LOAD_LINE_BREAKITERATOR         3
 
-//  ----------------------------------------------------
-//  class BreakIterator_Unicode
-//  ----------------------------------------------------
+//	----------------------------------------------------
+//	class BreakIterator_Unicode
+//	----------------------------------------------------
 class BreakIterator_Unicode : public BreakIteratorImpl
 {
 public:
     BreakIterator_Unicode();
     ~BreakIterator_Unicode();
 
-    virtual sal_Int32 SAL_CALL previousCharacters( const rtl::OUString& Text, sal_Int32 nStartPos,
-        const com::sun::star::lang::Locale& nLocale, sal_Int16 nCharacterIteratorMode, sal_Int32 nCount,
+    virtual sal_Int32 SAL_CALL previousCharacters( const rtl::OUString& Text, sal_Int32 nStartPos, 
+        const com::sun::star::lang::Locale& nLocale, sal_Int16 nCharacterIteratorMode, sal_Int32 nCount, 
         sal_Int32& nDone ) throw(com::sun::star::uno::RuntimeException);
-    virtual sal_Int32 SAL_CALL nextCharacters( const rtl::OUString& Text, sal_Int32 nStartPos,
-        const com::sun::star::lang::Locale& rLocale, sal_Int16 nCharacterIteratorMode, sal_Int32 nCount,
+    virtual sal_Int32 SAL_CALL nextCharacters( const rtl::OUString& Text, sal_Int32 nStartPos, 
+        const com::sun::star::lang::Locale& rLocale, sal_Int16 nCharacterIteratorMode, sal_Int32 nCount, 
         sal_Int32& nDone ) throw(com::sun::star::uno::RuntimeException);
 
-    virtual Boundary SAL_CALL previousWord( const rtl::OUString& Text, sal_Int32 nStartPos,
+    virtual Boundary SAL_CALL previousWord( const rtl::OUString& Text, sal_Int32 nStartPos, 
         const com::sun::star::lang::Locale& nLocale, sal_Int16 WordType) throw(com::sun::star::uno::RuntimeException);
-    virtual Boundary SAL_CALL nextWord( const rtl::OUString& Text, sal_Int32 nStartPos,
+    virtual Boundary SAL_CALL nextWord( const rtl::OUString& Text, sal_Int32 nStartPos, 
         const com::sun::star::lang::Locale& nLocale, sal_Int16 WordType) throw(com::sun::star::uno::RuntimeException);
-    virtual Boundary SAL_CALL getWordBoundary( const rtl::OUString& Text, sal_Int32 nPos,
-        const com::sun::star::lang::Locale& nLocale, sal_Int16 WordType, sal_Bool bDirection )
+    virtual Boundary SAL_CALL getWordBoundary( const rtl::OUString& Text, sal_Int32 nPos, 
+        const com::sun::star::lang::Locale& nLocale, sal_Int16 WordType, sal_Bool bDirection ) 
         throw(com::sun::star::uno::RuntimeException);
 
-    virtual sal_Int32 SAL_CALL beginOfSentence( const rtl::OUString& Text, sal_Int32 nStartPos,
+    virtual sal_Int32 SAL_CALL beginOfSentence( const rtl::OUString& Text, sal_Int32 nStartPos, 
         const com::sun::star::lang::Locale& nLocale ) throw(com::sun::star::uno::RuntimeException);
-    virtual sal_Int32 SAL_CALL endOfSentence( const rtl::OUString& Text, sal_Int32 nStartPos,
+    virtual sal_Int32 SAL_CALL endOfSentence( const rtl::OUString& Text, sal_Int32 nStartPos, 
         const com::sun::star::lang::Locale& nLocale ) throw(com::sun::star::uno::RuntimeException);
 
-    virtual LineBreakResults SAL_CALL getLineBreak( const rtl::OUString& Text, sal_Int32 nStartPos,
-        const com::sun::star::lang::Locale& nLocale, sal_Int32 nMinBreakPos,
-        const LineBreakHyphenationOptions& hOptions, const LineBreakUserOptions& bOptions )
+    virtual LineBreakResults SAL_CALL getLineBreak( const rtl::OUString& Text, sal_Int32 nStartPos, 
+        const com::sun::star::lang::Locale& nLocale, sal_Int32 nMinBreakPos, 
+        const LineBreakHyphenationOptions& hOptions, const LineBreakUserOptions& bOptions ) 
         throw(com::sun::star::uno::RuntimeException);
 
     //XServiceInfo
     virtual rtl::OUString SAL_CALL getImplementationName() throw( com::sun::star::uno::RuntimeException );
-    virtual sal_Bool SAL_CALL supportsService(const rtl::OUString& ServiceName)
+    virtual sal_Bool SAL_CALL supportsService(const rtl::OUString& ServiceName) 
         throw( com::sun::star::uno::RuntimeException );
-    virtual com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL getSupportedServiceNames()
+    virtual com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL getSupportedServiceNames() 
         throw( com::sun::star::uno::RuntimeException );
 
 protected:
@@ -86,17 +86,17 @@ protected:
     struct BI_Data {
         UnicodeString aICUText;
         icu::BreakIterator *aBreakIterator;
-
+        
         BI_Data() : aICUText(), aBreakIterator(NULL) {}
-    } character, word, sentence, line, *icuBI;
+    } character, word, sentence, line, *icuBI; 
 
     com::sun::star::lang::Locale aLocale;
     sal_Int16 aBreakType, aWordType;
 
-    void SAL_CALL loadICUBreakIterator(const com::sun::star::lang::Locale& rLocale,
+    void SAL_CALL loadICUBreakIterator(const com::sun::star::lang::Locale& rLocale, 
         sal_Int16 rBreakType, sal_Int16 rWordType, const sal_Char* name, const rtl::OUString& rText) throw(com::sun::star::uno::RuntimeException);
 };
 
-} } } }
+} } } } 
 
 #endif
diff --git a/i18npool/inc/bullet.h b/i18npool/inc/bullet.h
index 6a0b945d2de0..ce76cedebfd6 100644
--- a/i18npool/inc/bullet.h
+++ b/i18npool/inc/bullet.h
@@ -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
@@ -28,226 +28,226 @@
 namespace com { namespace sun { namespace star { namespace i18n {
 
 static sal_Unicode table_AIUFullWidth_ja_JP[] = {
-    0x30A2, // KATAKANA LETTER A
-    0x30A4, // KATAKANA LETTER I
-    0x30A6, // KATAKANA LETTER U
-    0x30A8, // KATAKANA LETTER E
-    0x30AA, // KATAKANA LETTER O
-    0x30AB, // KATAKANA LETTER KA
-    0x30AD, // KATAKANA LETTER KI
-    0x30AF, // KATAKANA LETTER KU
-    0x30B1, // KATAKANA LETTER KE
-    0x30B3, // KATAKANA LETTER KO
-    0x30B5, // KATAKANA LETTER SA
-    0x30B7, // KATAKANA LETTER SI
-    0x30B9, // KATAKANA LETTER SU
-    0x30BB, // KATAKANA LETTER SE
-    0x30BD, // KATAKANA LETTER SO
-    0x30BF, // KATAKANA LETTER TA
-    0x30C1, // KATAKANA LETTER TI
-    0x30C4, // KATAKANA LETTER TU
-    0x30C6, // KATAKANA LETTER TE
-    0x30C8, // KATAKANA LETTER TO
-    0x30CA, // KATAKANA LETTER NA
-    0x30CB, // KATAKANA LETTER NI
-    0x30CC, // KATAKANA LETTER NU
-    0x30CD, // KATAKANA LETTER NE
-    0x30CE, // KATAKANA LETTER NO
-    0x30CF, // KATAKANA LETTER HA
-    0x30D2, // KATAKANA LETTER HI
-    0x30D5, // KATAKANA LETTER HU
-    0x30D8, // KATAKANA LETTER HE
-    0x30DB, // KATAKANA LETTER HO
-    0x30DE, // KATAKANA LETTER MA
-    0x30DF, // KATAKANA LETTER MI
-    0x30E0, // KATAKANA LETTER MU
-    0x30E1, // KATAKANA LETTER ME
-    0x30E2, // KATAKANA LETTER MO
-    0x30E4, // KATAKANA LETTER YA
-    0x30E6, // KATAKANA LETTER YU
-    0x30E8, // KATAKANA LETTER YO
-    0x30E9, // KATAKANA LETTER RA
-    0x30EA, // KATAKANA LETTER RI
-    0x30EB, // KATAKANA LETTER RU
-    0x30EC, // KATAKANA LETTER RE
-    0x30ED, // KATAKANA LETTER RO
-    0x30EF, // KATAKANA LETTER WA
-    0x30F2, // KATAKANA LETTER WO
-    0x30F3  // KATAKANA LETTER N
+    0x30A2,	// KATAKANA LETTER A
+    0x30A4,	// KATAKANA LETTER I
+    0x30A6,	// KATAKANA LETTER U
+    0x30A8,	// KATAKANA LETTER E
+    0x30AA,	// KATAKANA LETTER O
+    0x30AB,	// KATAKANA LETTER KA
+    0x30AD,	// KATAKANA LETTER KI
+    0x30AF,	// KATAKANA LETTER KU
+    0x30B1,	// KATAKANA LETTER KE
+    0x30B3,	// KATAKANA LETTER KO
+    0x30B5,	// KATAKANA LETTER SA
+    0x30B7,	// KATAKANA LETTER SI
+    0x30B9,	// KATAKANA LETTER SU
+    0x30BB,	// KATAKANA LETTER SE
+    0x30BD,	// KATAKANA LETTER SO
+    0x30BF,	// KATAKANA LETTER TA
+    0x30C1,	// KATAKANA LETTER TI
+    0x30C4,	// KATAKANA LETTER TU
+    0x30C6,	// KATAKANA LETTER TE
+    0x30C8,	// KATAKANA LETTER TO
+    0x30CA,	// KATAKANA LETTER NA
+    0x30CB,	// KATAKANA LETTER NI
+    0x30CC,	// KATAKANA LETTER NU
+    0x30CD,	// KATAKANA LETTER NE
+    0x30CE,	// KATAKANA LETTER NO
+    0x30CF,	// KATAKANA LETTER HA
+    0x30D2,	// KATAKANA LETTER HI
+    0x30D5,	// KATAKANA LETTER HU
+    0x30D8,	// KATAKANA LETTER HE
+    0x30DB,	// KATAKANA LETTER HO
+    0x30DE,	// KATAKANA LETTER MA
+    0x30DF,	// KATAKANA LETTER MI
+    0x30E0,	// KATAKANA LETTER MU
+    0x30E1,	// KATAKANA LETTER ME
+    0x30E2,	// KATAKANA LETTER MO
+    0x30E4,	// KATAKANA LETTER YA
+    0x30E6,	// KATAKANA LETTER YU
+    0x30E8,	// KATAKANA LETTER YO
+    0x30E9,	// KATAKANA LETTER RA
+    0x30EA,	// KATAKANA LETTER RI
+    0x30EB,	// KATAKANA LETTER RU
+    0x30EC,	// KATAKANA LETTER RE
+    0x30ED,	// KATAKANA LETTER RO
+    0x30EF,	// KATAKANA LETTER WA
+    0x30F2,	// KATAKANA LETTER WO
+    0x30F3	// KATAKANA LETTER N
 };
 
 static sal_Unicode table_AIUHalfWidth_ja_JP[] = {
-    0xFF71, // HALFWIDTH KATAKANA LETTER A
-    0xFF72, // HALFWIDTH KATAKANA LETTER I
-    0xFF73, // HALFWIDTH KATAKANA LETTER U
-    0xFF74, // HALFWIDTH KATAKANA LETTER E
-    0xFF75, // HALFWIDTH KATAKANA LETTER O
-    0xFF76, // HALFWIDTH KATAKANA LETTER KA
-    0xFF77, // HALFWIDTH KATAKANA LETTER KI
-    0xFF78, // HALFWIDTH KATAKANA LETTER KU
-    0xFF79, // HALFWIDTH KATAKANA LETTER KE
-    0xFF7A, // HALFWIDTH KATAKANA LETTER KO
-    0xFF7B, // HALFWIDTH KATAKANA LETTER SA
-    0xFF7C, // HALFWIDTH KATAKANA LETTER SI
-    0xFF7D, // HALFWIDTH KATAKANA LETTER SU
-    0xFF7E, // HALFWIDTH KATAKANA LETTER SE
-    0xFF7F, // HALFWIDTH KATAKANA LETTER SO
-    0xFF80, // HALFWIDTH KATAKANA LETTER TA
-    0xFF81, // HALFWIDTH KATAKANA LETTER TI
-    0xFF82, // HALFWIDTH KATAKANA LETTER TU
-    0xFF83, // HALFWIDTH KATAKANA LETTER TE
-    0xFF84, // HALFWIDTH KATAKANA LETTER TO
-    0xFF85, // HALFWIDTH KATAKANA LETTER NA
-    0xFF86, // HALFWIDTH KATAKANA LETTER NI
-    0xFF87, // HALFWIDTH KATAKANA LETTER NU
-    0xFF88, // HALFWIDTH KATAKANA LETTER NE
-    0xFF89, // HALFWIDTH KATAKANA LETTER NO
-    0xFF8A, // HALFWIDTH KATAKANA LETTER HA
-    0xFF8B, // HALFWIDTH KATAKANA LETTER HI
-    0xFF8C, // HALFWIDTH KATAKANA LETTER HU
-    0xFF8D, // HALFWIDTH KATAKANA LETTER HE
-    0xFF8E, // HALFWIDTH KATAKANA LETTER HO
-    0xFF8F, // HALFWIDTH KATAKANA LETTER MA
-    0xFF90, // HALFWIDTH KATAKANA LETTER MI
-    0xFF91, // HALFWIDTH KATAKANA LETTER MU
-    0xFF92, // HALFWIDTH KATAKANA LETTER ME
-    0xFF93, // HALFWIDTH KATAKANA LETTER MO
-    0xFF94, // HALFWIDTH KATAKANA LETTER YA
-    0xFF95, // HALFWIDTH KATAKANA LETTER YU
-    0xFF96, // HALFWIDTH KATAKANA LETTER YO
-    0xFF97, // HALFWIDTH KATAKANA LETTER RA
-    0xFF98, // HALFWIDTH KATAKANA LETTER RI
-    0xFF99, // HALFWIDTH KATAKANA LETTER RU
-    0xFF9A, // HALFWIDTH KATAKANA LETTER RE
-    0xFF9B, // HALFWIDTH KATAKANA LETTER RO
-    0xFF9C, // HALFWIDTH KATAKANA LETTER WA
-    0xFF66, // HALFWIDTH KATAKANA LETTER WO
-    0xFF9D  // HALFWIDTH KATAKANA LETTER N
+    0xFF71,	// HALFWIDTH KATAKANA LETTER A
+    0xFF72,	// HALFWIDTH KATAKANA LETTER I
+    0xFF73,	// HALFWIDTH KATAKANA LETTER U
+    0xFF74,	// HALFWIDTH KATAKANA LETTER E
+    0xFF75,	// HALFWIDTH KATAKANA LETTER O
+    0xFF76,	// HALFWIDTH KATAKANA LETTER KA
+    0xFF77,	// HALFWIDTH KATAKANA LETTER KI
+    0xFF78,	// HALFWIDTH KATAKANA LETTER KU
+    0xFF79,	// HALFWIDTH KATAKANA LETTER KE
+    0xFF7A,	// HALFWIDTH KATAKANA LETTER KO
+    0xFF7B,	// HALFWIDTH KATAKANA LETTER SA
+    0xFF7C,	// HALFWIDTH KATAKANA LETTER SI
+    0xFF7D,	// HALFWIDTH KATAKANA LETTER SU
+    0xFF7E,	// HALFWIDTH KATAKANA LETTER SE
+    0xFF7F,	// HALFWIDTH KATAKANA LETTER SO
+    0xFF80,	// HALFWIDTH KATAKANA LETTER TA
+    0xFF81,	// HALFWIDTH KATAKANA LETTER TI
+    0xFF82,	// HALFWIDTH KATAKANA LETTER TU
+    0xFF83,	// HALFWIDTH KATAKANA LETTER TE
+    0xFF84,	// HALFWIDTH KATAKANA LETTER TO
+    0xFF85,	// HALFWIDTH KATAKANA LETTER NA
+    0xFF86,	// HALFWIDTH KATAKANA LETTER NI
+    0xFF87,	// HALFWIDTH KATAKANA LETTER NU
+    0xFF88,	// HALFWIDTH KATAKANA LETTER NE
+    0xFF89,	// HALFWIDTH KATAKANA LETTER NO
+    0xFF8A,	// HALFWIDTH KATAKANA LETTER HA
+    0xFF8B,	// HALFWIDTH KATAKANA LETTER HI
+    0xFF8C,	// HALFWIDTH KATAKANA LETTER HU
+    0xFF8D,	// HALFWIDTH KATAKANA LETTER HE
+    0xFF8E,	// HALFWIDTH KATAKANA LETTER HO
+    0xFF8F,	// HALFWIDTH KATAKANA LETTER MA
+    0xFF90,	// HALFWIDTH KATAKANA LETTER MI
+    0xFF91,	// HALFWIDTH KATAKANA LETTER MU
+    0xFF92,	// HALFWIDTH KATAKANA LETTER ME
+    0xFF93,	// HALFWIDTH KATAKANA LETTER MO
+    0xFF94,	// HALFWIDTH KATAKANA LETTER YA
+    0xFF95,	// HALFWIDTH KATAKANA LETTER YU
+    0xFF96,	// HALFWIDTH KATAKANA LETTER YO
+    0xFF97,	// HALFWIDTH KATAKANA LETTER RA
+    0xFF98,	// HALFWIDTH KATAKANA LETTER RI
+    0xFF99,	// HALFWIDTH KATAKANA LETTER RU
+    0xFF9A,	// HALFWIDTH KATAKANA LETTER RE
+    0xFF9B,	// HALFWIDTH KATAKANA LETTER RO
+    0xFF9C,	// HALFWIDTH KATAKANA LETTER WA
+    0xFF66,	// HALFWIDTH KATAKANA LETTER WO
+    0xFF9D	// HALFWIDTH KATAKANA LETTER N
 };
 
 static sal_Unicode table_IROHAFullWidth_ja_JP[] = {
-    0x30A4, // KATAKANA LETTER I
-    0x30ED, // KATAKANA LETTER RO
-    0x30CF, // KATAKANA LETTER HA
-    0x30CB, // KATAKANA LETTER NI
-    0x30DB, // KATAKANA LETTER HO
-    0x30D8, // KATAKANA LETTER HE
-    0x30C8, // KATAKANA LETTER TO
-    0x30C1, // KATAKANA LETTER TI
-    0x30EA, // KATAKANA LETTER RI
-    0x30CC, // KATAKANA LETTER NU
-    0x30EB, // KATAKANA LETTER RU
-    0x30F2, // KATAKANA LETTER WO
-    0x30EF, // KATAKANA LETTER WA
-    0x30AB, // KATAKANA LETTER KA
-    0x30E8, // KATAKANA LETTER YO
-    0x30BF, // KATAKANA LETTER TA
-    0x30EC, // KATAKANA LETTER RE
-    0x30BD, // KATAKANA LETTER SO
-    0x30C4, // KATAKANA LETTER TU
-    0x30CD, // KATAKANA LETTER NE
-    0x30CA, // KATAKANA LETTER NA
-    0x30E9, // KATAKANA LETTER RA
-    0x30E0, // KATAKANA LETTER MU
-    0x30A6, // KATAKANA LETTER U
-    0x30F0, // KATAKANA LETTER WI
-    0x30CE, // KATAKANA LETTER NO
-    0x30AA, // KATAKANA LETTER O
-    0x30AF, // KATAKANA LETTER KU
-    0x30E4, // KATAKANA LETTER YA
-    0x30DE, // KATAKANA LETTER MA
-    0x30B1, // KATAKANA LETTER KE
-    0x30D5, // KATAKANA LETTER HU
-    0x30B3, // KATAKANA LETTER KO
-    0x30A8, // KATAKANA LETTER E
-    0x30C6, // KATAKANA LETTER TE
-    0x30A2, // KATAKANA LETTER A
-    0x30B5, // KATAKANA LETTER SA
-    0x30AD, // KATAKANA LETTER KI
-    0x30E6, // KATAKANA LETTER YU
-    0x30E1, // KATAKANA LETTER ME
-    0x30DF, // KATAKANA LETTER MI
-    0x30B7, // KATAKANA LETTER SI
-    0x30F1, // KATAKANA LETTER WE
-    0x30D2, // KATAKANA LETTER HI
-    0x30E2, // KATAKANA LETTER MO
-    0x30BB, // KATAKANA LETTER SE
-    0x30B9, // KATAKANA LETTER SU
-    0x30F3  // KATAKANA LETTER N
+    0x30A4,	// KATAKANA LETTER I
+    0x30ED,	// KATAKANA LETTER RO
+    0x30CF,	// KATAKANA LETTER HA
+    0x30CB,	// KATAKANA LETTER NI
+    0x30DB,	// KATAKANA LETTER HO
+    0x30D8,	// KATAKANA LETTER HE
+    0x30C8,	// KATAKANA LETTER TO
+    0x30C1,	// KATAKANA LETTER TI
+    0x30EA,	// KATAKANA LETTER RI
+    0x30CC,	// KATAKANA LETTER NU
+    0x30EB,	// KATAKANA LETTER RU
+    0x30F2,	// KATAKANA LETTER WO
+    0x30EF,	// KATAKANA LETTER WA
+    0x30AB,	// KATAKANA LETTER KA
+    0x30E8,	// KATAKANA LETTER YO
+    0x30BF,	// KATAKANA LETTER TA
+    0x30EC,	// KATAKANA LETTER RE
+    0x30BD,	// KATAKANA LETTER SO
+    0x30C4,	// KATAKANA LETTER TU
+    0x30CD,	// KATAKANA LETTER NE
+    0x30CA,	// KATAKANA LETTER NA
+    0x30E9,	// KATAKANA LETTER RA
+    0x30E0,	// KATAKANA LETTER MU
+    0x30A6,	// KATAKANA LETTER U
+    0x30F0,	// KATAKANA LETTER WI
+    0x30CE,	// KATAKANA LETTER NO
+    0x30AA,	// KATAKANA LETTER O
+    0x30AF,	// KATAKANA LETTER KU
+    0x30E4,	// KATAKANA LETTER YA
+    0x30DE,	// KATAKANA LETTER MA
+    0x30B1,	// KATAKANA LETTER KE
+    0x30D5,	// KATAKANA LETTER HU
+    0x30B3,	// KATAKANA LETTER KO
+    0x30A8,	// KATAKANA LETTER E
+    0x30C6,	// KATAKANA LETTER TE
+    0x30A2,	// KATAKANA LETTER A
+    0x30B5,	// KATAKANA LETTER SA
+    0x30AD,	// KATAKANA LETTER KI
+    0x30E6,	// KATAKANA LETTER YU
+    0x30E1,	// KATAKANA LETTER ME
+    0x30DF,	// KATAKANA LETTER MI
+    0x30B7,	// KATAKANA LETTER SI
+    0x30F1,	// KATAKANA LETTER WE
+    0x30D2,	// KATAKANA LETTER HI
+    0x30E2,	// KATAKANA LETTER MO
+    0x30BB,	// KATAKANA LETTER SE
+    0x30B9,	// KATAKANA LETTER SU
+    0x30F3	// KATAKANA LETTER N
 };
 
 static sal_Unicode table_IROHAHalfWidth_ja_JP[] = {
-    0xFF72, // HALFWIDTH KATAKANA LETTER I
-    0xFF9B, // HALFWIDTH KATAKANA LETTER RO
-    0xFF8A, // HALFWIDTH KATAKANA LETTER HA
-    0xFF86, // HALFWIDTH KATAKANA LETTER NI
-    0xFF8E, // HALFWIDTH KATAKANA LETTER HO
-    0xFF8D, // HALFWIDTH KATAKANA LETTER HE
-    0xFF84, // HALFWIDTH KATAKANA LETTER TO
-    0xFF81, // HALFWIDTH KATAKANA LETTER TI
-    0xFF98, // HALFWIDTH KATAKANA LETTER RI
-    0xFF87, // HALFWIDTH KATAKANA LETTER NU
-    0xFF99, // HALFWIDTH KATAKANA LETTER RU
-    0xFF66, // HALFWIDTH KATAKANA LETTER WO
-    0xFF9C, // HALFWIDTH KATAKANA LETTER WA
-    0xFF76, // HALFWIDTH KATAKANA LETTER KA
-    0xFF96, // HALFWIDTH KATAKANA LETTER YO
-    0xFF80, // HALFWIDTH KATAKANA LETTER TA
-    0xFF9A, // HALFWIDTH KATAKANA LETTER RE
-    0xFF7F, // HALFWIDTH KATAKANA LETTER SO
-    0xFF82, // HALFWIDTH KATAKANA LETTER TU
-    0xFF88, // HALFWIDTH KATAKANA LETTER NE
-    0xFF85, // HALFWIDTH KATAKANA LETTER NA
-    0xFF97, // HALFWIDTH KATAKANA LETTER RA
-    0xFF91, // HALFWIDTH KATAKANA LETTER MU
-    0xFF73, // HALFWIDTH KATAKANA LETTER U
-    0x30F0, // KATAKANA LETTER WI
-    0xFF89, // HALFWIDTH KATAKANA LETTER NO
-    0xFF75, // HALFWIDTH KATAKANA LETTER O
-    0xFF78, // HALFWIDTH KATAKANA LETTER KU
-    0xFF94, // HALFWIDTH KATAKANA LETTER YA
-    0xFF8F, // HALFWIDTH KATAKANA LETTER MA
-    0xFF79, // HALFWIDTH KATAKANA LETTER KE
-    0xFF8C, // HALFWIDTH KATAKANA LETTER HU
-    0xFF7A, // HALFWIDTH KATAKANA LETTER KO
-    0xFF74, // HALFWIDTH KATAKANA LETTER E
-    0xFF83, // HALFWIDTH KATAKANA LETTER TE
-    0xFF71, // HALFWIDTH KATAKANA LETTER A
-    0xFF7B, // HALFWIDTH KATAKANA LETTER SA
-    0xFF77, // HALFWIDTH KATAKANA LETTER KI
-    0xFF95, // HALFWIDTH KATAKANA LETTER YU
-    0xFF92, // HALFWIDTH KATAKANA LETTER ME
-    0xFF90, // HALFWIDTH KATAKANA LETTER MI
-    0xFF7C, // HALFWIDTH KATAKANA LETTER SI
-    0x30F1, // KATAKANA LETTER WE
-    0xFF8B, // HALFWIDTH KATAKANA LETTER HI
-    0xFF93, // HALFWIDTH KATAKANA LETTER MO
-    0xFF7E, // HALFWIDTH KATAKANA LETTER SE
-    0xFF7D, // HALFWIDTH KATAKANA LETTER SU
-    0xFF9D  // HALFWIDTH KATAKANA LETTER N
+    0xFF72,	// HALFWIDTH KATAKANA LETTER I
+    0xFF9B,	// HALFWIDTH KATAKANA LETTER RO
+    0xFF8A,	// HALFWIDTH KATAKANA LETTER HA
+    0xFF86,	// HALFWIDTH KATAKANA LETTER NI
+    0xFF8E,	// HALFWIDTH KATAKANA LETTER HO
+    0xFF8D,	// HALFWIDTH KATAKANA LETTER HE
+    0xFF84,	// HALFWIDTH KATAKANA LETTER TO
+    0xFF81,	// HALFWIDTH KATAKANA LETTER TI
+    0xFF98,	// HALFWIDTH KATAKANA LETTER RI
+    0xFF87,	// HALFWIDTH KATAKANA LETTER NU
+    0xFF99,	// HALFWIDTH KATAKANA LETTER RU
+    0xFF66,	// HALFWIDTH KATAKANA LETTER WO
+    0xFF9C,	// HALFWIDTH KATAKANA LETTER WA
+    0xFF76,	// HALFWIDTH KATAKANA LETTER KA
+    0xFF96,	// HALFWIDTH KATAKANA LETTER YO
+    0xFF80,	// HALFWIDTH KATAKANA LETTER TA
+    0xFF9A,	// HALFWIDTH KATAKANA LETTER RE
+    0xFF7F,	// HALFWIDTH KATAKANA LETTER SO
+    0xFF82,	// HALFWIDTH KATAKANA LETTER TU
+    0xFF88,	// HALFWIDTH KATAKANA LETTER NE
+    0xFF85,	// HALFWIDTH KATAKANA LETTER NA
+    0xFF97,	// HALFWIDTH KATAKANA LETTER RA
+    0xFF91,	// HALFWIDTH KATAKANA LETTER MU
+    0xFF73,	// HALFWIDTH KATAKANA LETTER U
+    0x30F0,	// KATAKANA LETTER WI
+    0xFF89,	// HALFWIDTH KATAKANA LETTER NO
+    0xFF75,	// HALFWIDTH KATAKANA LETTER O
+    0xFF78,	// HALFWIDTH KATAKANA LETTER KU
+    0xFF94,	// HALFWIDTH KATAKANA LETTER YA
+    0xFF8F,	// HALFWIDTH KATAKANA LETTER MA
+    0xFF79,	// HALFWIDTH KATAKANA LETTER KE
+    0xFF8C,	// HALFWIDTH KATAKANA LETTER HU
+    0xFF7A,	// HALFWIDTH KATAKANA LETTER KO
+    0xFF74,	// HALFWIDTH KATAKANA LETTER E
+    0xFF83,	// HALFWIDTH KATAKANA LETTER TE
+    0xFF71,	// HALFWIDTH KATAKANA LETTER A
+    0xFF7B,	// HALFWIDTH KATAKANA LETTER SA
+    0xFF77,	// HALFWIDTH KATAKANA LETTER KI
+    0xFF95,	// HALFWIDTH KATAKANA LETTER YU
+    0xFF92,	// HALFWIDTH KATAKANA LETTER ME
+    0xFF90,	// HALFWIDTH KATAKANA LETTER MI
+    0xFF7C,	// HALFWIDTH KATAKANA LETTER SI
+    0x30F1,	// KATAKANA LETTER WE
+    0xFF8B,	// HALFWIDTH KATAKANA LETTER HI
+    0xFF93,	// HALFWIDTH KATAKANA LETTER MO
+    0xFF7E,	// HALFWIDTH KATAKANA LETTER SE
+    0xFF7D,	// HALFWIDTH KATAKANA LETTER SU
+    0xFF9D	// HALFWIDTH KATAKANA LETTER N
 };
 
 static sal_Unicode table_CircledNumber[] = {
-    0x2460, // CIRCLED DIGIT ONE
-    0x2461, // CIRCLED DIGIT TWO
-    0x2462, // CIRCLED DIGIT THREE
-    0x2463, // CIRCLED DIGIT FOUR
-    0x2464, // CIRCLED DIGIT FIVE
-    0x2465, // CIRCLED DIGIT SIX
-    0x2466, // CIRCLED DIGIT SEVEN
-    0x2467, // CIRCLED DIGIT EIGHT
-    0x2468, // CIRCLED DIGIT NINE
-    0x2469, // CIRCLED NUMBER TEN
-    0x246A, // CIRCLED NUMBER ELEVEN
-    0x246B, // CIRCLED NUMBER TWELVE
-    0x246C, // CIRCLED NUMBER THIRTEEN
-    0x246D, // CIRCLED NUMBER FOURTEEN
-    0x246E, // CIRCLED NUMBER FIFTEEN
-    0x246F, // CIRCLED NUMBER SIXTEEN
-    0x2470, // CIRCLED NUMBER SEVENTEEN
-    0x2471, // CIRCLED NUMBER EIGHTEEN
-    0x2472, // CIRCLED NUMBER NINETEEN
-    0x2473  // CIRCLED NUMBER TWENTY
+    0x2460,	// CIRCLED DIGIT ONE
+    0x2461,	// CIRCLED DIGIT TWO
+    0x2462,	// CIRCLED DIGIT THREE
+    0x2463,	// CIRCLED DIGIT FOUR
+    0x2464,	// CIRCLED DIGIT FIVE
+    0x2465,	// CIRCLED DIGIT SIX
+    0x2466,	// CIRCLED DIGIT SEVEN
+    0x2467,	// CIRCLED DIGIT EIGHT
+    0x2468,	// CIRCLED DIGIT NINE
+    0x2469,	// CIRCLED NUMBER TEN
+    0x246A,	// CIRCLED NUMBER ELEVEN
+    0x246B,	// CIRCLED NUMBER TWELVE
+    0x246C,	// CIRCLED NUMBER THIRTEEN
+    0x246D,	// CIRCLED NUMBER FOURTEEN
+    0x246E,	// CIRCLED NUMBER FIFTEEN
+    0x246F,	// CIRCLED NUMBER SIXTEEN
+    0x2470,	// CIRCLED NUMBER SEVENTEEN
+    0x2471,	// CIRCLED NUMBER EIGHTEEN
+    0x2472,	// CIRCLED NUMBER NINETEEN
+    0x2473	// CIRCLED NUMBER TWENTY
 };
 
 static sal_Unicode table_HangulJamo_ko[] = {
diff --git a/i18npool/inc/calendarImpl.hxx b/i18npool/inc/calendarImpl.hxx
index 8ba8d6caec34..50b195f14fed 100644
--- a/i18npool/inc/calendarImpl.hxx
+++ b/i18npool/inc/calendarImpl.hxx
@@ -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
@@ -35,14 +35,14 @@
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <vector>
 
-//  ----------------------------------------------------
-//  class CalendarImpl
-//  ----------------------------------------------------
+//	----------------------------------------------------
+//	class CalendarImpl
+//	----------------------------------------------------
 
 namespace com { namespace sun { namespace star { namespace i18n {
 
 class CalendarImpl : public cppu::WeakImplHelper2
-<
+< 
     com::sun::star::i18n::XExtendedCalendar,
     com::sun::star::lang::XServiceInfo
 >
@@ -91,7 +91,7 @@ public:
 
 private:
     struct lookupTableItem {
-    lookupTableItem(const rtl::OUString& _uniqueID, com::sun::star::uno::Reference < com::sun::star::i18n::XExtendedCalendar >& _xCalendar) :
+    lookupTableItem(const rtl::OUString& _uniqueID, com::sun::star::uno::Reference < com::sun::star::i18n::XExtendedCalendar >& _xCalendar) : 
         uniqueID(_uniqueID), xCalendar(_xCalendar) {}
     rtl::OUString uniqueID;
     com::sun::star::uno::Reference < com::sun::star::i18n::XExtendedCalendar > xCalendar;
diff --git a/i18npool/inc/calendar_gregorian.hxx b/i18npool/inc/calendar_gregorian.hxx
index 2d32c7a75348..2d7a15344789 100644
--- a/i18npool/inc/calendar_gregorian.hxx
+++ b/i18npool/inc/calendar_gregorian.hxx
@@ -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
@@ -32,9 +32,9 @@
 
 #include "warnings_guard_unicode_calendar.h"
 
-//  ----------------------------------------------------
-//  class Calendar_gregorian
-//  ----------------------------------------------------
+//	----------------------------------------------------
+//	class Calendar_gregorian
+//	----------------------------------------------------
 
 namespace com { namespace sun { namespace star { namespace i18n {
 
@@ -124,9 +124,9 @@ private:
     bool getCombinedOffset( sal_Int32 & o_nOffset, sal_Int16 nParentFieldIndex, sal_Int16 nChildFieldIndex ) const;
 };
 
-//  ----------------------------------------------------
-//  class Calendar_hanja
-//  ----------------------------------------------------
+//	----------------------------------------------------
+//	class Calendar_hanja
+//	----------------------------------------------------
 class Calendar_hanja : public Calendar_gregorian
 {
 public:
@@ -136,9 +136,9 @@ public:
     virtual rtl::OUString SAL_CALL getDisplayName(sal_Int16 nCalendarDisplayIndex, sal_Int16 nIdx, sal_Int16 nNameType) throw(com::sun::star::uno::RuntimeException);
 };
 
-//  ----------------------------------------------------
-//  class Calendar_gengou
-//  ----------------------------------------------------
+//	----------------------------------------------------
+//	class Calendar_gengou
+//	----------------------------------------------------
 class Calendar_gengou : public Calendar_gregorian
 {
 public:
@@ -146,9 +146,9 @@ public:
     Calendar_gengou();
 };
 
-//  ----------------------------------------------------
-//  class Calendar_ROC
-//  ----------------------------------------------------
+//	----------------------------------------------------
+//	class Calendar_ROC
+//	----------------------------------------------------
 class Calendar_ROC : public Calendar_gregorian
 {
 public:
@@ -156,9 +156,9 @@ public:
     Calendar_ROC();
 };
 
-//  ----------------------------------------------------
-//  class Calendar_buddhist
-//  ----------------------------------------------------
+//	----------------------------------------------------
+//	class Calendar_buddhist
+//	----------------------------------------------------
 class Calendar_buddhist : public Calendar_gregorian
 {
 public:
diff --git a/i18npool/inc/calendar_hijri.hxx b/i18npool/inc/calendar_hijri.hxx
index d9f4be232671..1f5d56f9390a 100644
--- a/i18npool/inc/calendar_hijri.hxx
+++ b/i18npool/inc/calendar_hijri.hxx
@@ -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
@@ -30,9 +30,9 @@
 #include "calendar_gregorian.hxx"
 
 
-//  ----------------------------------------------------
-//  class Calendar_hijri
-//  ----------------------------------------------------
+//	----------------------------------------------------
+//	class Calendar_hijri
+//	----------------------------------------------------
 
 namespace com { namespace sun { namespace star { namespace i18n {
 
@@ -53,7 +53,7 @@ protected:
     // Synodic Period (mean time between 2 successive new moon: 29d, 12 hr, 44min, 3sec
     static const double SynPeriod;
 
-    static const double SynMonth;           // Solar days in a year/SynPeriod
+    static const double SynMonth;			// Solar days in a year/SynPeriod
 
     // Julian day on Jan 1, 1900
     static const double jd1900;
@@ -63,11 +63,11 @@ protected:
     static const sal_Int32 GregRef;
 
     // Local time (Saudi Arabia)
-    static const double SA_TimeZone;        // Time Zone
+    static const double SA_TimeZone;		// Time Zone
 
     // Period between 1.30pm - 6:30pm
     static const double EveningPeriod;
-
+    
     // "Leap" years
     static const sal_Int32 LeapYear[];
 
diff --git a/i18npool/inc/calendar_jewish.hxx b/i18npool/inc/calendar_jewish.hxx
index 23e207389bc0..90018152fdb7 100644
--- a/i18npool/inc/calendar_jewish.hxx
+++ b/i18npool/inc/calendar_jewish.hxx
@@ -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
@@ -29,9 +29,9 @@
 
 #include "calendar_gregorian.hxx"
 
-//  ----------------------------------------------------
-//  class Calendar_jewish
-//  ----------------------------------------------------
+//	----------------------------------------------------
+//	class Calendar_jewish
+//	----------------------------------------------------
 
 namespace com { namespace sun { namespace star { namespace i18n {
 
diff --git a/i18npool/inc/cclass_cjk.hxx b/i18npool/inc/cclass_cjk.hxx
index 9619d5f7d39c..3de3d03dd071 100644
--- a/i18npool/inc/cclass_cjk.hxx
+++ b/i18npool/inc/cclass_cjk.hxx
@@ -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
@@ -31,17 +31,17 @@
 
 namespace com { namespace sun { namespace star { namespace i18n {
 
-#define MAXLEN  31      // Define max length for CJK number
+#define MAXLEN 	31		// Define max length for CJK number
 
-#define ZERO        0x0030  // Define unicode zero
-#define ONE     0x0031  // Define unicode one
+#define ZERO		0x0030	// Define unicode zero
+#define ONE		0x0031	// Define unicode one
 
 class cclass_CJK : public cclass_Unicode {
 public:
     cclass_CJK( const com::sun::star::uno::Reference < com::sun::star::lang::XMultiServiceFactory >& rxMSF );
     ~cclass_CJK();
     i18n::ParseResult SAL_CALL parsePredefinedToken(
-        sal_Int32 nTokenType,
+        sal_Int32 nTokenType, 
         const rtl::OUString& Text,
         sal_Int32 nPos,
         const com::sun::star::lang::Locale& rLocale,
@@ -55,8 +55,8 @@ protected:
     sal_Int32 size;
     rtl::OUString number;
     sal_Unicode *text;
-    sal_Int32 textPos;
-
+    sal_Int32 textPos;	
+    
     sal_Unicode *Upper;
     sal_Unicode *Base;
     sal_Unicode *Plus;
@@ -90,6 +90,6 @@ CCLASS_CJK(cclass_ko)
 #endif
 #undef CCLASS_CJK
 
-} } } }
+} } } } 
 
 #endif
diff --git a/i18npool/inc/cclass_unicode.hxx b/i18npool/inc/cclass_unicode.hxx
index 60f28748b584..7f94d90d7295 100644
--- a/i18npool/inc/cclass_unicode.hxx
+++ b/i18npool/inc/cclass_unicode.hxx
@@ -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
@@ -47,26 +47,26 @@ public:
     cclass_Unicode(com::sun::star::uno::Reference < com::sun::star::lang::XMultiServiceFactory > xSMgr );
     ~cclass_Unicode();
 
-    virtual rtl::OUString SAL_CALL toUpper( const rtl::OUString& Text, sal_Int32 nPos, sal_Int32 nCount,
+    virtual rtl::OUString SAL_CALL toUpper( const rtl::OUString& Text, sal_Int32 nPos, sal_Int32 nCount, 
         const com::sun::star::lang::Locale& rLocale ) throw(com::sun::star::uno::RuntimeException);
-    virtual rtl::OUString SAL_CALL toLower( const rtl::OUString& Text, sal_Int32 nPos, sal_Int32 nCount,
+    virtual rtl::OUString SAL_CALL toLower( const rtl::OUString& Text, sal_Int32 nPos, sal_Int32 nCount, 
         const com::sun::star::lang::Locale& rLocale ) throw(com::sun::star::uno::RuntimeException);
-    virtual rtl::OUString SAL_CALL toTitle( const rtl::OUString& Text, sal_Int32 nPos, sal_Int32 nCount,
+    virtual rtl::OUString SAL_CALL toTitle( const rtl::OUString& Text, sal_Int32 nPos, sal_Int32 nCount, 
         const com::sun::star::lang::Locale& rLocale ) throw(com::sun::star::uno::RuntimeException);
     virtual sal_Int16 SAL_CALL getType( const rtl::OUString& Text, sal_Int32 nPos )  throw(com::sun::star::uno::RuntimeException);
-    virtual sal_Int16 SAL_CALL getCharacterDirection( const rtl::OUString& Text, sal_Int32 nPos )
+    virtual sal_Int16 SAL_CALL getCharacterDirection( const rtl::OUString& Text, sal_Int32 nPos ) 
         throw(com::sun::star::uno::RuntimeException);
     virtual sal_Int16 SAL_CALL getScript( const rtl::OUString& Text, sal_Int32 nPos ) throw(com::sun::star::uno::RuntimeException);
-    virtual sal_Int32 SAL_CALL getCharacterType( const rtl::OUString& text, sal_Int32 nPos,
+    virtual sal_Int32 SAL_CALL getCharacterType( const rtl::OUString& text, sal_Int32 nPos, 
         const com::sun::star::lang::Locale& rLocale ) throw(com::sun::star::uno::RuntimeException);
-    virtual sal_Int32 SAL_CALL getStringType( const rtl::OUString& text, sal_Int32 nPos, sal_Int32 nCount,
+    virtual sal_Int32 SAL_CALL getStringType( const rtl::OUString& text, sal_Int32 nPos, sal_Int32 nCount, 
         const com::sun::star::lang::Locale& rLocale ) throw(com::sun::star::uno::RuntimeException);
-    virtual ParseResult SAL_CALL parseAnyToken( const rtl::OUString& Text, sal_Int32 nPos,
-        const com::sun::star::lang::Locale& rLocale, sal_Int32 nStartCharFlags, const rtl::OUString& userDefinedCharactersStart,
+    virtual ParseResult SAL_CALL parseAnyToken( const rtl::OUString& Text, sal_Int32 nPos, 
+        const com::sun::star::lang::Locale& rLocale, sal_Int32 nStartCharFlags, const rtl::OUString& userDefinedCharactersStart, 
         sal_Int32 nContCharFlags, const rtl::OUString& userDefinedCharactersCont ) throw(com::sun::star::uno::RuntimeException);
-    virtual ParseResult SAL_CALL parsePredefinedToken( sal_Int32 nTokenType, const rtl::OUString& Text,
-        sal_Int32 nPos, const com::sun::star::lang::Locale& rLocale, sal_Int32 nStartCharFlags,
-        const rtl::OUString& userDefinedCharactersStart, sal_Int32 nContCharFlags,
+    virtual ParseResult SAL_CALL parsePredefinedToken( sal_Int32 nTokenType, const rtl::OUString& Text, 
+        sal_Int32 nPos, const com::sun::star::lang::Locale& rLocale, sal_Int32 nStartCharFlags, 
+        const rtl::OUString& userDefinedCharactersStart, sal_Int32 nContCharFlags, 
         const rtl::OUString& userDefinedCharactersCont ) throw(com::sun::star::uno::RuntimeException);
 
     //XServiceInfo
@@ -97,51 +97,51 @@ private:
         ssStop
     };
 
-    static const sal_uInt8      nDefCnt;
-    static const UPT_FLAG_TYPE  pDefaultParserTable[];
-    static const sal_Int32      pParseTokensType[];
+    static const sal_uInt8		nDefCnt;
+    static const UPT_FLAG_TYPE	pDefaultParserTable[];
+    static const sal_Int32		pParseTokensType[];
 
     /// Flag values of table.
-    static const UPT_FLAG_TYPE  TOKEN_ILLEGAL;
-    static const UPT_FLAG_TYPE  TOKEN_CHAR;
-    static const UPT_FLAG_TYPE  TOKEN_CHAR_BOOL;
-    static const UPT_FLAG_TYPE  TOKEN_CHAR_WORD;
-    static const UPT_FLAG_TYPE  TOKEN_CHAR_VALUE;
-    static const UPT_FLAG_TYPE  TOKEN_CHAR_STRING;
-    static const UPT_FLAG_TYPE  TOKEN_CHAR_DONTCARE;
-    static const UPT_FLAG_TYPE  TOKEN_BOOL;
-    static const UPT_FLAG_TYPE  TOKEN_WORD;
-    static const UPT_FLAG_TYPE  TOKEN_WORD_SEP;
-    static const UPT_FLAG_TYPE  TOKEN_VALUE;
-    static const UPT_FLAG_TYPE  TOKEN_VALUE_SEP;
-    static const UPT_FLAG_TYPE  TOKEN_VALUE_EXP;
-    static const UPT_FLAG_TYPE  TOKEN_VALUE_SIGN;
-    static const UPT_FLAG_TYPE  TOKEN_VALUE_EXP_VALUE;
-    static const UPT_FLAG_TYPE  TOKEN_VALUE_DIGIT;
-    static const UPT_FLAG_TYPE  TOKEN_NAME_SEP;
-    static const UPT_FLAG_TYPE  TOKEN_STRING_SEP;
-    static const UPT_FLAG_TYPE  TOKEN_EXCLUDED;
+    static const UPT_FLAG_TYPE	TOKEN_ILLEGAL;
+    static const UPT_FLAG_TYPE	TOKEN_CHAR;
+    static const UPT_FLAG_TYPE	TOKEN_CHAR_BOOL;
+    static const UPT_FLAG_TYPE	TOKEN_CHAR_WORD;
+    static const UPT_FLAG_TYPE	TOKEN_CHAR_VALUE;
+    static const UPT_FLAG_TYPE	TOKEN_CHAR_STRING;
+    static const UPT_FLAG_TYPE	TOKEN_CHAR_DONTCARE;
+    static const UPT_FLAG_TYPE	TOKEN_BOOL;
+    static const UPT_FLAG_TYPE	TOKEN_WORD;
+    static const UPT_FLAG_TYPE	TOKEN_WORD_SEP;
+    static const UPT_FLAG_TYPE	TOKEN_VALUE;
+    static const UPT_FLAG_TYPE	TOKEN_VALUE_SEP;
+    static const UPT_FLAG_TYPE	TOKEN_VALUE_EXP;
+    static const UPT_FLAG_TYPE	TOKEN_VALUE_SIGN;
+    static const UPT_FLAG_TYPE	TOKEN_VALUE_EXP_VALUE;
+    static const UPT_FLAG_TYPE	TOKEN_VALUE_DIGIT;
+    static const UPT_FLAG_TYPE	TOKEN_NAME_SEP;
+    static const UPT_FLAG_TYPE	TOKEN_STRING_SEP;
+    static const UPT_FLAG_TYPE	TOKEN_EXCLUDED;
 
     /// If and where c occurs in pStr
-    static  const sal_Unicode*  StrChr( const sal_Unicode* pStr, sal_Unicode c );
+    static	const sal_Unicode*	StrChr( const sal_Unicode* pStr, sal_Unicode c );
 
 
     com::sun::star::uno::Reference < com::sun::star::lang::XMultiServiceFactory > xMSF;
 
     /// used for parser only
-    com::sun::star::lang::Locale    aParserLocale;
+    com::sun::star::lang::Locale	aParserLocale;
     com::sun::star::uno::Reference < XLocaleData > xLocaleData;
     com::sun::star::uno::Reference < com::sun::star::i18n::XNativeNumberSupplier > xNatNumSup;
     rtl::OUString             aStartChars;
     rtl::OUString             aContChars;
-    UPT_FLAG_TYPE*              pTable;
-    UPT_FLAG_TYPE*              pStart;
-    UPT_FLAG_TYPE*              pCont;
-    sal_Int32                   nStartTypes;
-    sal_Int32                   nContTypes;
-    ScanState                   eState;
-    sal_Unicode                 cGroupSep;
-    sal_Unicode                 cDecimalSep;
+    UPT_FLAG_TYPE*				pTable;
+    UPT_FLAG_TYPE*				pStart;
+    UPT_FLAG_TYPE*				pCont;
+    sal_Int32					nStartTypes;
+    sal_Int32					nContTypes;
+    ScanState					eState;
+    sal_Unicode					cGroupSep;
+    sal_Unicode					cDecimalSep;
 
     /// Get corresponding KParseTokens flag for a character
     sal_Int32 getParseTokensType( const sal_Unicode* aStr, sal_Int32 nPos );
@@ -183,6 +183,6 @@ private:
 
 };
 
-} } } }
+} } } } 
 
 #endif
diff --git a/i18npool/inc/chaptercollator.hxx b/i18npool/inc/chaptercollator.hxx
index e47fbd184c26..cd5ff7551b17 100644
--- a/i18npool/inc/chaptercollator.hxx
+++ b/i18npool/inc/chaptercollator.hxx
@@ -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
@@ -53,7 +53,7 @@ public:
     virtual com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL getSupportedServiceNames() throw( com::sun::star::uno::RuntimeException );
 
 private :
-    // CharacterClassification Implementation
+    // CharacterClassification Implementation 
     com::sun::star::uno::Reference< XCharacterClassification > cclass;
 };
 
diff --git a/i18npool/inc/characterclassificationImpl.hxx b/i18npool/inc/characterclassificationImpl.hxx
index 0292507a379a..73cf4da6b7d2 100644
--- a/i18npool/inc/characterclassificationImpl.hxx
+++ b/i18npool/inc/characterclassificationImpl.hxx
@@ -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
@@ -46,36 +46,36 @@ public:
     CharacterClassificationImpl( const com::sun::star::uno::Reference < com::sun::star::lang::XMultiServiceFactory >& rxMSF );
     virtual ~CharacterClassificationImpl();
 
-    virtual rtl::OUString SAL_CALL toUpper( const rtl::OUString& Text,
-        sal_Int32 nPos, sal_Int32 nCount, const com::sun::star::lang::Locale& rLocale )
+    virtual rtl::OUString SAL_CALL toUpper( const rtl::OUString& Text, 
+        sal_Int32 nPos, sal_Int32 nCount, const com::sun::star::lang::Locale& rLocale ) 
         throw(com::sun::star::uno::RuntimeException);
-    virtual rtl::OUString SAL_CALL toLower( const rtl::OUString& Text,
+    virtual rtl::OUString SAL_CALL toLower( const rtl::OUString& Text, 
         sal_Int32 nPos, sal_Int32 nCount, const com::sun::star::lang::Locale& rLocale )
         throw(com::sun::star::uno::RuntimeException);
-    virtual rtl::OUString SAL_CALL toTitle( const rtl::OUString& Text, sal_Int32 nPos,
-        sal_Int32 nCount, const com::sun::star::lang::Locale& rLocale )
+    virtual rtl::OUString SAL_CALL toTitle( const rtl::OUString& Text, sal_Int32 nPos, 
+        sal_Int32 nCount, const com::sun::star::lang::Locale& rLocale ) 
         throw(com::sun::star::uno::RuntimeException);
-    virtual sal_Int16 SAL_CALL getType( const rtl::OUString& Text, sal_Int32 nPos )
+    virtual sal_Int16 SAL_CALL getType( const rtl::OUString& Text, sal_Int32 nPos )  
         throw(com::sun::star::uno::RuntimeException);
-    virtual sal_Int16 SAL_CALL getCharacterDirection( const rtl::OUString& Text, sal_Int32 nPos )
+    virtual sal_Int16 SAL_CALL getCharacterDirection( const rtl::OUString& Text, sal_Int32 nPos ) 
         throw(com::sun::star::uno::RuntimeException);
-    virtual sal_Int16 SAL_CALL getScript( const rtl::OUString& Text, sal_Int32 nPos )
+    virtual sal_Int16 SAL_CALL getScript( const rtl::OUString& Text, sal_Int32 nPos ) 
         throw(com::sun::star::uno::RuntimeException);
-    virtual sal_Int32 SAL_CALL getCharacterType( const rtl::OUString& text, sal_Int32 nPos,
-        const com::sun::star::lang::Locale& rLocale )
+    virtual sal_Int32 SAL_CALL getCharacterType( const rtl::OUString& text, sal_Int32 nPos, 
+        const com::sun::star::lang::Locale& rLocale ) 
         throw(com::sun::star::uno::RuntimeException);
-    virtual sal_Int32 SAL_CALL getStringType( const rtl::OUString& text, sal_Int32 nPos,
-        sal_Int32 nCount, const com::sun::star::lang::Locale& rLocale )
+    virtual sal_Int32 SAL_CALL getStringType( const rtl::OUString& text, sal_Int32 nPos, 
+        sal_Int32 nCount, const com::sun::star::lang::Locale& rLocale ) 
         throw(com::sun::star::uno::RuntimeException);
     virtual ParseResult SAL_CALL parseAnyToken( const rtl::OUString& Text, sal_Int32 nPos,
-        const com::sun::star::lang::Locale& rLocale, sal_Int32 nStartCharFlags,
-        const rtl::OUString& userDefinedCharactersStart, sal_Int32 nContCharFlags,
-        const rtl::OUString& userDefinedCharactersCont )
+        const com::sun::star::lang::Locale& rLocale, sal_Int32 nStartCharFlags, 
+        const rtl::OUString& userDefinedCharactersStart, sal_Int32 nContCharFlags, 
+        const rtl::OUString& userDefinedCharactersCont ) 
         throw(com::sun::star::uno::RuntimeException);
-    virtual ParseResult SAL_CALL parsePredefinedToken( sal_Int32 nTokenType,
-        const rtl::OUString& Text, sal_Int32 nPos, const com::sun::star::lang::Locale& rLocale,
-        sal_Int32 nStartCharFlags, const rtl::OUString& userDefinedCharactersStart,
-        sal_Int32 nContCharFlags, const rtl::OUString& userDefinedCharactersCont )
+    virtual ParseResult SAL_CALL parsePredefinedToken( sal_Int32 nTokenType, 
+        const rtl::OUString& Text, sal_Int32 nPos, const com::sun::star::lang::Locale& rLocale, 
+        sal_Int32 nStartCharFlags, const rtl::OUString& userDefinedCharactersStart, 
+        sal_Int32 nContCharFlags, const rtl::OUString& userDefinedCharactersCont ) 
         throw(com::sun::star::uno::RuntimeException);
 
     //XServiceInfo
@@ -88,15 +88,15 @@ public:
 
 private:
     struct lookupTableItem {
-        lookupTableItem(const com::sun::star::lang::Locale& rLocale, const rtl::OUString& rName,
-        com::sun::star::uno::Reference < XCharacterClassification >& rxCI) :
+        lookupTableItem(const com::sun::star::lang::Locale& rLocale, const rtl::OUString& rName, 
+        com::sun::star::uno::Reference < XCharacterClassification >& rxCI) : 
         aLocale(rLocale), aName(rName), xCI(rxCI) {};
         com::sun::star::lang::Locale aLocale;
         rtl::OUString aName;
         com::sun::star::uno::Reference < XCharacterClassification > xCI;
         sal_Bool SAL_CALL equals(const com::sun::star::lang::Locale& rLocale) {
-        return aLocale.Language == rLocale.Language &&
-            aLocale.Country == rLocale.Country &&
+        return aLocale.Language == rLocale.Language && 
+            aLocale.Country == rLocale.Country && 
             aLocale.Variant == rLocale.Variant;
         };
     };
diff --git a/i18npool/inc/chartonum.hxx b/i18npool/inc/chartonum.hxx
index 5f2e8fdd55e5..d65ed525ad9b 100644
--- a/i18npool/inc/chartonum.hxx
+++ b/i18npool/inc/chartonum.hxx
@@ -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
@@ -57,5 +57,5 @@ TRANSLITERATION_CHARTONUM(_th)
 #undef TRANSLITERATION_CHARTONUM
 
 } } } }
-
+        
 #endif // _L10N_TRANSLITERATION_CHARTONUM_HXX_
diff --git a/i18npool/inc/collatorImpl.hxx b/i18npool/inc/collatorImpl.hxx
index 7e4192553183..6e801db4b913 100644
--- a/i18npool/inc/collatorImpl.hxx
+++ b/i18npool/inc/collatorImpl.hxx
@@ -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
@@ -62,7 +62,7 @@ public:
     virtual sal_Int32 SAL_CALL compareString( const rtl::OUString& s1,
         const rtl::OUString& s2) throw(com::sun::star::uno::RuntimeException);
 
-    virtual sal_Int32 SAL_CALL loadDefaultCollator( const lang::Locale& rLocale,  sal_Int32 collatorOptions)
+    virtual sal_Int32 SAL_CALL loadDefaultCollator( const lang::Locale& rLocale,  sal_Int32 collatorOptions) 
         throw(com::sun::star::uno::RuntimeException);
 
     virtual sal_Int32 SAL_CALL loadCollatorAlgorithm(  const rtl::OUString& impl, const lang::Locale& rLocale,
@@ -90,7 +90,7 @@ private :
         rtl::OUString algorithm;
         rtl::OUString service;
         com::sun::star::uno::Reference < XCollator > xC;
-        lookupTableItem(const lang::Locale& rLocale, const rtl::OUString& _algorithm, const rtl::OUString& _service,
+        lookupTableItem(const lang::Locale& rLocale, const rtl::OUString& _algorithm, const rtl::OUString& _service, 
         com::sun::star::uno::Reference < XCollator >& _xC) : aLocale(rLocale), algorithm(_algorithm), service(_service), xC(_xC) {}
         sal_Bool SAL_CALL equals(const lang::Locale& rLocale, const rtl::OUString& _algorithm) {
         return aLocale.Language == rLocale.Language &&
@@ -107,7 +107,7 @@ private :
     // lang::Locale Data
     com::sun::star::uno::Reference < XLocaleData > localedata;
 
-    sal_Bool SAL_CALL createCollator(const lang::Locale& rLocale, const rtl::OUString& serviceName,
+    sal_Bool SAL_CALL createCollator(const lang::Locale& rLocale, const rtl::OUString& serviceName, 
         const rtl::OUString& rSortAlgorithm) throw(com::sun::star::uno::RuntimeException);
     void SAL_CALL loadCachedCollator(const lang::Locale& rLocale, const rtl::OUString& rSortAlgorithm)
         throw(com::sun::star::uno::RuntimeException);
diff --git a/i18npool/inc/collator_unicode.hxx b/i18npool/inc/collator_unicode.hxx
index 312f41cb1793..59f7f91384b4 100644
--- a/i18npool/inc/collator_unicode.hxx
+++ b/i18npool/inc/collator_unicode.hxx
@@ -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
@@ -59,7 +59,7 @@ public:
 
 
     // following 4 methods are implemented in collatorImpl.
-    sal_Int32 SAL_CALL loadDefaultCollator( const lang::Locale&,  sal_Int32)
+    sal_Int32 SAL_CALL loadDefaultCollator( const lang::Locale&,  sal_Int32) 
         throw(com::sun::star::uno::RuntimeException) {throw com::sun::star::uno::RuntimeException();}
     void SAL_CALL loadCollatorAlgorithmWithEndUserOption( const rtl::OUString&, const lang::Locale&,
         const com::sun::star::uno::Sequence< sal_Int32 >&) throw(com::sun::star::uno::RuntimeException) {throw com::sun::star::uno::RuntimeException();}
diff --git a/i18npool/inc/defaultnumberingprovider.hxx b/i18npool/inc/defaultnumberingprovider.hxx
index 1d9a319ac12c..55cc82aede9c 100644
--- a/i18npool/inc/defaultnumberingprovider.hxx
+++ b/i18npool/inc/defaultnumberingprovider.hxx
@@ -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
diff --git a/i18npool/inc/i18npool/i18npooldllapi.h b/i18npool/inc/i18npool/i18npooldllapi.h
index 581352ef3fa2..8b7e08336b69 100644
--- a/i18npool/inc/i18npool/i18npooldllapi.h
+++ b/i18npool/inc/i18npool/i18npooldllapi.h
@@ -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
@@ -27,15 +27,15 @@
 
 #ifndef INCLUDED_I18NPOOL_I18NPOOLDLLAPI_H
 #define INCLUDED_I18NPOOL_I18NPOOLDLLAPI_H
-
+                                                                                                                             
 #include "sal/types.h"
-
+                                                                                                                             
 #if defined(I18NPOOL_DLLIMPLEMENTATION)
 #define I18NPOOL_DLLPUBLIC  SAL_DLLPUBLIC_EXPORT
 #else
 #define I18NPOOL_DLLPUBLIC  SAL_DLLPUBLIC_IMPORT
 #endif
 #define I18NPOOL_DLLPRIVATE SAL_DLLPRIVATE
-
+                                                                                                                             
 #endif /* INCLUDED_I18NPOOL_I18NPOOLDLLAPI_H */
 
diff --git a/i18npool/inc/i18npool/lang.h b/i18npool/inc/i18npool/lang.h
index 52e4e51d7a41..fd6a08afa033 100644
--- a/i18npool/inc/i18npool/lang.h
+++ b/i18npool/inc/i18npool/lang.h
@@ -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
@@ -64,7 +64,7 @@
    Language Identifier Constants and Strings
    http://msdn2.microsoft.com/en-us/library/ms776294.aspx
 
-   Hey, yet another list, maybe this one will not move around? It seems to be
+   Hey, yet another list, maybe this one will not move around? It seems to be 
    quite complete..
    Language Identifier Constants and Strings (Windows)
    http://msdn.microsoft.com/en-us/library/dd318693(VS.85).aspx
diff --git a/i18npool/inc/i18npool/mslangid.hxx b/i18npool/inc/i18npool/mslangid.hxx
index 61f526a7f370..03350e1042a1 100644
--- a/i18npool/inc/i18npool/mslangid.hxx
+++ b/i18npool/inc/i18npool/mslangid.hxx
@@ -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
diff --git a/i18npool/inc/i18npool/paper.hxx b/i18npool/inc/i18npool/paper.hxx
index 76aebbe473d5..e8c0119b8953 100644
--- a/i18npool/inc/i18npool/paper.hxx
+++ b/i18npool/inc/i18npool/paper.hxx
@@ -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
diff --git a/i18npool/inc/indexentrysupplier.hxx b/i18npool/inc/indexentrysupplier.hxx
index 11395cce8bf6..c8d99be98bc4 100644
--- a/i18npool/inc/indexentrysupplier.hxx
+++ b/i18npool/inc/indexentrysupplier.hxx
@@ -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
@@ -33,10 +33,10 @@
 
 namespace com { namespace sun { namespace star { namespace i18n {
 
-//  ----------------------------------------------------
-//  class IndexEntrySupplier
-//  ----------------------------------------------------
-class IndexEntrySupplier : public cppu::WeakImplHelper2
+//	----------------------------------------------------
+//	class IndexEntrySupplier
+//	----------------------------------------------------
+class IndexEntrySupplier : public cppu::WeakImplHelper2 
 <
     com::sun::star::i18n::XExtendedIndexEntrySupplier,
     com::sun::star::lang::XServiceInfo
@@ -46,50 +46,50 @@ public:
     IndexEntrySupplier( const com::sun::star::uno::Reference < com::sun::star::lang::XMultiServiceFactory >& rxMSF );
 
     // Methods
-    virtual com::sun::star::uno::Sequence < com::sun::star::lang::Locale > SAL_CALL getLocaleList()
+    virtual com::sun::star::uno::Sequence < com::sun::star::lang::Locale > SAL_CALL getLocaleList() 
         throw (com::sun::star::uno::RuntimeException);
 
-    virtual com::sun::star::uno::Sequence < rtl::OUString > SAL_CALL getAlgorithmList(
+    virtual com::sun::star::uno::Sequence < rtl::OUString > SAL_CALL getAlgorithmList( 
         const com::sun::star::lang::Locale& rLocale )
         throw (com::sun::star::uno::RuntimeException);
 
-    virtual sal_Bool SAL_CALL loadAlgorithm(
+    virtual sal_Bool SAL_CALL loadAlgorithm( 
         const com::sun::star::lang::Locale& rLocale,
-        const rtl::OUString& SortAlgorithm, sal_Int32 collatorOptions )
+        const rtl::OUString& SortAlgorithm, sal_Int32 collatorOptions ) 
         throw (com::sun::star::uno::RuntimeException);
 
     virtual sal_Bool SAL_CALL usePhoneticEntry(
-        const com::sun::star::lang::Locale& rLocale )
+        const com::sun::star::lang::Locale& rLocale ) 
         throw (com::sun::star::uno::RuntimeException);
 
     virtual rtl::OUString SAL_CALL getPhoneticCandidate( const rtl::OUString& IndexEntry,
-        const com::sun::star::lang::Locale& rLocale )
+        const com::sun::star::lang::Locale& rLocale ) 
         throw (com::sun::star::uno::RuntimeException);
 
     virtual rtl::OUString SAL_CALL getIndexKey( const rtl::OUString& IndexEntry,
-        const rtl::OUString& PhoneticEntry, const com::sun::star::lang::Locale& rLocale )
+        const rtl::OUString& PhoneticEntry, const com::sun::star::lang::Locale& rLocale ) 
         throw (com::sun::star::uno::RuntimeException);
 
     virtual sal_Int16 SAL_CALL compareIndexEntry( const rtl::OUString& IndexEntry1,
         const rtl::OUString& PhoneticEntry1, const com::sun::star::lang::Locale& rLocale1,
-        const rtl::OUString& IndexEntry2, const ::rtl::OUString& PhoneticEntry2,
+        const rtl::OUString& IndexEntry2, const ::rtl::OUString& PhoneticEntry2, 
         const com::sun::star::lang::Locale& rLocale2 )
         throw (com::sun::star::uno::RuntimeException);
 
     virtual rtl::OUString SAL_CALL getIndexCharacter( const rtl::OUString& IndexEntry,
-        const com::sun::star::lang::Locale& rLocale, const rtl::OUString& SortAlgorithm )
+        const com::sun::star::lang::Locale& rLocale, const rtl::OUString& SortAlgorithm ) 
         throw (com::sun::star::uno::RuntimeException);
 
     virtual rtl::OUString SAL_CALL getIndexFollowPageWord( sal_Bool MorePages,
-        const com::sun::star::lang::Locale& rLocale )
+        const com::sun::star::lang::Locale& rLocale ) 
         throw (com::sun::star::uno::RuntimeException);
 
     //XServiceInfo
-    virtual rtl::OUString SAL_CALL getImplementationName()
+    virtual rtl::OUString SAL_CALL getImplementationName() 
         throw( com::sun::star::uno::RuntimeException );
-    virtual sal_Bool SAL_CALL supportsService(const rtl::OUString& ServiceName)
+    virtual sal_Bool SAL_CALL supportsService(const rtl::OUString& ServiceName) 
         throw( com::sun::star::uno::RuntimeException );
-    virtual com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL getSupportedServiceNames()
+    virtual com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL getSupportedServiceNames() 
         throw( com::sun::star::uno::RuntimeException );
 
 private:
@@ -105,6 +105,6 @@ protected:
     rtl::OUString aSortAlgorithm;
 };
 
-} } } }
+} } } } 
 
 #endif
diff --git a/i18npool/inc/indexentrysupplier_asian.hxx b/i18npool/inc/indexentrysupplier_asian.hxx
index 42ab05eda04d..0619f7286e25 100644
--- a/i18npool/inc/indexentrysupplier_asian.hxx
+++ b/i18npool/inc/indexentrysupplier_asian.hxx
@@ -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
@@ -33,33 +33,33 @@
 
 namespace com { namespace sun { namespace star { namespace i18n {
 
-//  ----------------------------------------------------
-//  class IndexEntrySupplier_asian
-//  ----------------------------------------------------
+//	----------------------------------------------------
+//	class IndexEntrySupplier_asian
+//	----------------------------------------------------
 
 class IndexEntrySupplier_asian : public IndexEntrySupplier_Common {
 public:
     IndexEntrySupplier_asian( const com::sun::star::uno::Reference < com::sun::star::lang::XMultiServiceFactory >& rxMSF );
     ~IndexEntrySupplier_asian();
 
-    rtl::OUString SAL_CALL getIndexCharacter( const rtl::OUString& rIndexEntry,
-            const com::sun::star::lang::Locale& rLocale, const rtl::OUString& rAlgorithm )
+    rtl::OUString SAL_CALL getIndexCharacter( const rtl::OUString& rIndexEntry, 
+            const com::sun::star::lang::Locale& rLocale, const rtl::OUString& rAlgorithm ) 
             throw (com::sun::star::uno::RuntimeException);
-    rtl::OUString SAL_CALL getIndexKey( const rtl::OUString& rIndexEntry,
-            const rtl::OUString& rPhoneticEntry, const com::sun::star::lang::Locale& rLocale)
+    rtl::OUString SAL_CALL getIndexKey( const rtl::OUString& rIndexEntry, 
+            const rtl::OUString& rPhoneticEntry, const com::sun::star::lang::Locale& rLocale) 
             throw (com::sun::star::uno::RuntimeException);
     sal_Int16 SAL_CALL compareIndexEntry(
-            const rtl::OUString& rIndexEntry1, const rtl::OUString& rPhoneticEntry1,
+            const rtl::OUString& rIndexEntry1, const rtl::OUString& rPhoneticEntry1, 
             const com::sun::star::lang::Locale& rLocale1,
-            const rtl::OUString& rIndexEntry2, const rtl::OUString& rPhoneticEntry2,
+            const rtl::OUString& rIndexEntry2, const rtl::OUString& rPhoneticEntry2, 
             const com::sun::star::lang::Locale& rLocale2 )
             throw (com::sun::star::uno::RuntimeException);
     rtl::OUString SAL_CALL getPhoneticCandidate( const rtl::OUString& rIndexEntry,
-            const com::sun::star::lang::Locale& rLocale )
+            const com::sun::star::lang::Locale& rLocale ) 
             throw (com::sun::star::uno::RuntimeException);
 private:
     oslModule hModule;
 };
 
-} } } }
+} } } } 
 #endif
diff --git a/i18npool/inc/indexentrysupplier_common.hxx b/i18npool/inc/indexentrysupplier_common.hxx
index eae97f019237..0562d63c79e9 100644
--- a/i18npool/inc/indexentrysupplier_common.hxx
+++ b/i18npool/inc/indexentrysupplier_common.hxx
@@ -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
@@ -35,11 +35,11 @@
 
 namespace com { namespace sun { namespace star { namespace i18n {
 
-//  ----------------------------------------------------
-//  class IndexEntrySupplier_Common
-//  ----------------------------------------------------
+//	----------------------------------------------------
+//	class IndexEntrySupplier_Common
+//	----------------------------------------------------
 
-class IndexEntrySupplier_Common : public cppu::WeakImplHelper2
+class IndexEntrySupplier_Common : public cppu::WeakImplHelper2 
 <
     com::sun::star::i18n::XExtendedIndexEntrySupplier,
     com::sun::star::lang::XServiceInfo
@@ -49,33 +49,33 @@ public:
     IndexEntrySupplier_Common( const com::sun::star::uno::Reference < com::sun::star::lang::XMultiServiceFactory >& rxMSF );
     ~IndexEntrySupplier_Common();
 
-    virtual com::sun::star::uno::Sequence < com::sun::star::lang::Locale > SAL_CALL getLocaleList()
+    virtual com::sun::star::uno::Sequence < com::sun::star::lang::Locale > SAL_CALL getLocaleList() 
         throw (com::sun::star::uno::RuntimeException);
 
-    virtual com::sun::star::uno::Sequence < rtl::OUString > SAL_CALL getAlgorithmList(
+    virtual com::sun::star::uno::Sequence < rtl::OUString > SAL_CALL getAlgorithmList( 
         const com::sun::star::lang::Locale& rLocale )
         throw (com::sun::star::uno::RuntimeException);
 
     virtual sal_Bool SAL_CALL usePhoneticEntry(
-        const com::sun::star::lang::Locale& rLocale )
+        const com::sun::star::lang::Locale& rLocale ) 
         throw (com::sun::star::uno::RuntimeException);
 
     virtual rtl::OUString SAL_CALL getPhoneticCandidate( const rtl::OUString& IndexEntry,
-        const com::sun::star::lang::Locale& rLocale )
+        const com::sun::star::lang::Locale& rLocale ) 
         throw (com::sun::star::uno::RuntimeException);
 
-    virtual sal_Bool SAL_CALL loadAlgorithm(
+    virtual sal_Bool SAL_CALL loadAlgorithm( 
         const com::sun::star::lang::Locale& rLocale,
-        const rtl::OUString& SortAlgorithm, sal_Int32 collatorOptions )
+        const rtl::OUString& SortAlgorithm, sal_Int32 collatorOptions ) 
         throw (com::sun::star::uno::RuntimeException);
 
     virtual rtl::OUString SAL_CALL getIndexKey( const rtl::OUString& IndexEntry,
-        const rtl::OUString& PhoneticEntry, const com::sun::star::lang::Locale& rLocale )
+        const rtl::OUString& PhoneticEntry, const com::sun::star::lang::Locale& rLocale ) 
         throw (com::sun::star::uno::RuntimeException);
 
     virtual sal_Int16 SAL_CALL compareIndexEntry( const rtl::OUString& IndexEntry1,
         const rtl::OUString& PhoneticEntry1, const com::sun::star::lang::Locale& rLocale1,
-        const rtl::OUString& IndexEntry2, const ::rtl::OUString& PhoneticEntry2,
+        const rtl::OUString& IndexEntry2, const ::rtl::OUString& PhoneticEntry2, 
         const com::sun::star::lang::Locale& rLocale2 )
         throw (com::sun::star::uno::RuntimeException);
 
@@ -84,15 +84,15 @@ public:
         throw (com::sun::star::uno::RuntimeException);
 
     virtual rtl::OUString SAL_CALL getIndexFollowPageWord( sal_Bool MorePages,
-        const com::sun::star::lang::Locale& rLocale )
+        const com::sun::star::lang::Locale& rLocale ) 
         throw (com::sun::star::uno::RuntimeException);
 
     //XServiceInfo
-    virtual rtl::OUString SAL_CALL getImplementationName()
+    virtual rtl::OUString SAL_CALL getImplementationName() 
         throw( com::sun::star::uno::RuntimeException );
-    virtual sal_Bool SAL_CALL supportsService(const rtl::OUString& ServiceName)
+    virtual sal_Bool SAL_CALL supportsService(const rtl::OUString& ServiceName) 
         throw( com::sun::star::uno::RuntimeException );
-    virtual com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL getSupportedServiceNames()
+    virtual com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL getSupportedServiceNames() 
         throw( com::sun::star::uno::RuntimeException );
 
 protected:
@@ -100,7 +100,7 @@ protected:
     sal_Bool usePhonetic;
     CollatorImpl *collator;
     const rtl::OUString& SAL_CALL getEntry( const rtl::OUString& IndexEntry,
-        const rtl::OUString& PhoneticEntry, const com::sun::star::lang::Locale& rLocale )
+        const rtl::OUString& PhoneticEntry, const com::sun::star::lang::Locale& rLocale ) 
         throw (com::sun::star::uno::RuntimeException);
     com::sun::star::lang::Locale aLocale;
     rtl::OUString aAlgorithm;
diff --git a/i18npool/inc/indexentrysupplier_default.hxx b/i18npool/inc/indexentrysupplier_default.hxx
index eae78f5c576d..8a99625e83cb 100644
--- a/i18npool/inc/indexentrysupplier_default.hxx
+++ b/i18npool/inc/indexentrysupplier_default.hxx
@@ -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
@@ -33,26 +33,26 @@ namespace com { namespace sun { namespace star { namespace i18n {
 
 class Index;
 
-//  ----------------------------------------------------
-//  class IndexEntrySupplier_Unicode
-//  ----------------------------------------------------
+//	----------------------------------------------------
+//	class IndexEntrySupplier_Unicode
+//	----------------------------------------------------
 class IndexEntrySupplier_Unicode : public IndexEntrySupplier_Common {
 public:
     IndexEntrySupplier_Unicode( const com::sun::star::uno::Reference < com::sun::star::lang::XMultiServiceFactory >& rxMSF );
     ~IndexEntrySupplier_Unicode();
 
-    virtual sal_Bool SAL_CALL loadAlgorithm(
+    virtual sal_Bool SAL_CALL loadAlgorithm( 
         const com::sun::star::lang::Locale& rLocale,
-        const rtl::OUString& SortAlgorithm, sal_Int32 collatorOptions )
+        const rtl::OUString& SortAlgorithm, sal_Int32 collatorOptions ) 
         throw (com::sun::star::uno::RuntimeException);
 
     virtual rtl::OUString SAL_CALL getIndexKey( const rtl::OUString& IndexEntry,
-        const rtl::OUString& PhoneticEntry, const com::sun::star::lang::Locale& rLocale )
+        const rtl::OUString& PhoneticEntry, const com::sun::star::lang::Locale& rLocale ) 
         throw (com::sun::star::uno::RuntimeException);
 
     virtual sal_Int16 SAL_CALL compareIndexEntry( const rtl::OUString& IndexEntry1,
         const rtl::OUString& PhoneticEntry1, const com::sun::star::lang::Locale& rLocale1,
-        const rtl::OUString& IndexEntry2, const ::rtl::OUString& PhoneticEntry2,
+        const rtl::OUString& IndexEntry2, const ::rtl::OUString& PhoneticEntry2, 
         const com::sun::star::lang::Locale& rLocale2 )
         throw (com::sun::star::uno::RuntimeException);
 
@@ -86,7 +86,7 @@ public:
 #define MAX_KEYS 0xff
 #define MAX_TABLES 20
 
-class Index
+class Index 
 {
 public:
     Index(const com::sun::star::uno::Reference < com::sun::star::lang::XMultiServiceFactory >& rxMSF);
diff --git a/i18npool/inc/indexentrysupplier_ja_phonetic.hxx b/i18npool/inc/indexentrysupplier_ja_phonetic.hxx
index 3b5faa823153..9f8cc7dee644 100644
--- a/i18npool/inc/indexentrysupplier_ja_phonetic.hxx
+++ b/i18npool/inc/indexentrysupplier_ja_phonetic.hxx
@@ -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
@@ -32,9 +32,9 @@
 
 namespace com { namespace sun { namespace star { namespace i18n {
 
-//  ----------------------------------------------------
-//  class IndexEntrySupplier_ja_phonetic
-//  ----------------------------------------------------
+//	----------------------------------------------------
+//	class IndexEntrySupplier_ja_phonetic
+//	----------------------------------------------------
 
 class IndexEntrySupplier_ja_phonetic : public IndexEntrySupplier_Common {
 public:
@@ -71,5 +71,5 @@ INDEXENTRYSUPPLIER_JA_PHONETIC( ja_phonetic_alphanumeric_first_by_consonant )
 INDEXENTRYSUPPLIER_JA_PHONETIC( ja_phonetic_alphanumeric_last_by_syllable )
 INDEXENTRYSUPPLIER_JA_PHONETIC( ja_phonetic_alphanumeric_last_by_consonant )
 
-} } } }
+} } } } 
 #endif
diff --git a/i18npool/inc/inputsequencechecker.hxx b/i18npool/inc/inputsequencechecker.hxx
index 84d1b4938d1b..1be2af078478 100644
--- a/i18npool/inc/inputsequencechecker.hxx
+++ b/i18npool/inc/inputsequencechecker.hxx
@@ -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
@@ -37,9 +37,9 @@
 
 namespace com { namespace sun { namespace star { namespace i18n {
 
-//  ----------------------------------------------------
-//  class InputSequenceCheckerImpl
-//  ----------------------------------------------------
+//	----------------------------------------------------
+//	class InputSequenceCheckerImpl
+//	----------------------------------------------------
 class InputSequenceCheckerImpl : public cppu::WeakImplHelper2
 <
     com::sun::star::i18n::XExtendedInputSequenceChecker,
@@ -59,7 +59,7 @@ public:
 
     //XServiceInfo
     virtual rtl::OUString SAL_CALL getImplementationName() throw( com::sun::star::uno::RuntimeException );
-    virtual sal_Bool SAL_CALL supportsService(const rtl::OUString& ServiceName)
+    virtual sal_Bool SAL_CALL supportsService(const rtl::OUString& ServiceName) 
         throw( com::sun::star::uno::RuntimeException );
     virtual com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL getSupportedServiceNames()
         throw( com::sun::star::uno::RuntimeException );
@@ -85,6 +85,6 @@ private :
     sal_Char* SAL_CALL getLanguageByScripType(sal_Unicode cChar, sal_Unicode nChar);
 };
 
-} } } }
+} } } } 
 
 #endif // _I18N_BREAKITERATOR_HXX_
diff --git a/i18npool/inc/inputsequencechecker_hi.hxx b/i18npool/inc/inputsequencechecker_hi.hxx
index 4f0e4a7e2cb6..1bcdf18b54ab 100644
--- a/i18npool/inc/inputsequencechecker_hi.hxx
+++ b/i18npool/inc/inputsequencechecker_hi.hxx
@@ -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
@@ -29,14 +29,14 @@
 
 #include <inputsequencechecker.hxx>
 
-namespace com {
-namespace sun {
-namespace star {
+namespace com { 
+namespace sun { 
+namespace star { 
 namespace i18n {
 
-//  ----------------------------------------------------
-//  class InputSequenceChecker_hi
-//  ----------------------------------------------------
+//	----------------------------------------------------
+//	class InputSequenceChecker_hi
+//	----------------------------------------------------
 class InputSequenceChecker_hi : public InputSequenceCheckerImpl
 {
 public:
@@ -50,6 +50,6 @@ public:
         sal_Unicode inputChar, sal_Int16 inputCheckMode) throw(com::sun::star::uno::RuntimeException);
 };
 
-} } } }
+} } } } 
 
 #endif
diff --git a/i18npool/inc/inputsequencechecker_th.hxx b/i18npool/inc/inputsequencechecker_th.hxx
index 979740626682..1f1872393c84 100644
--- a/i18npool/inc/inputsequencechecker_th.hxx
+++ b/i18npool/inc/inputsequencechecker_th.hxx
@@ -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
@@ -31,9 +31,9 @@
 
 namespace com { namespace sun { namespace star { namespace i18n {
 
-//  ----------------------------------------------------
-//  class InputSequenceChecker_th
-//  ----------------------------------------------------
+//	----------------------------------------------------
+//	class InputSequenceChecker_th
+//	----------------------------------------------------
 class InputSequenceChecker_th : public InputSequenceCheckerImpl
 {
 public:
@@ -47,6 +47,6 @@ public:
         sal_Unicode inputChar, sal_Int16 inputCheckMode) throw(com::sun::star::uno::RuntimeException);
 };
 
-} } } }
+} } } } 
 
 #endif // _I18N_BREAKITERATOR_HXX_
diff --git a/i18npool/inc/localedata.hxx b/i18npool/inc/localedata.hxx
index 327d0f5bd55b..d65ba6a420b5 100644
--- a/i18npool/inc/localedata.hxx
+++ b/i18npool/inc/localedata.hxx
@@ -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
diff --git a/i18npool/inc/nativenumbersupplier.hxx b/i18npool/inc/nativenumbersupplier.hxx
index 9054f0b67851..cacebd8888cf 100644
--- a/i18npool/inc/nativenumbersupplier.hxx
+++ b/i18npool/inc/nativenumbersupplier.hxx
@@ -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
@@ -38,7 +38,7 @@ namespace com { namespace sun { namespace star { namespace i18n {
 //      ----------------------------------------------------
 //      class NativeNumberSupplier
 //      ----------------------------------------------------
-class NativeNumberSupplier : public cppu::WeakImplHelper2
+class NativeNumberSupplier : public cppu::WeakImplHelper2 
 <
         com::sun::star::i18n::XNativeNumberSupplier,
         com::sun::star::lang::XServiceInfo
@@ -52,24 +52,24 @@ public:
                 const ::com::sun::star::lang::Locale& aLocale, sal_Int16 nNativeNumberMode )
                 throw (::com::sun::star::uno::RuntimeException);
 
-        virtual sal_Bool SAL_CALL isValidNatNum( const ::com::sun::star::lang::Locale& aLocale,
+        virtual sal_Bool SAL_CALL isValidNatNum( const ::com::sun::star::lang::Locale& aLocale, 
                 sal_Int16 nNativeNumberMode )
                 throw (::com::sun::star::uno::RuntimeException);
 
         virtual ::com::sun::star::i18n::NativeNumberXmlAttributes SAL_CALL convertToXmlAttributes(
-                const ::com::sun::star::lang::Locale& aLocale, sal_Int16 nNativeNumberMode )
+                const ::com::sun::star::lang::Locale& aLocale, sal_Int16 nNativeNumberMode ) 
                 throw (::com::sun::star::uno::RuntimeException);
 
-        virtual sal_Int16 SAL_CALL convertFromXmlAttributes(
+        virtual sal_Int16 SAL_CALL convertFromXmlAttributes( 
                 const ::com::sun::star::i18n::NativeNumberXmlAttributes& aAttr )
                 throw (::com::sun::star::uno::RuntimeException);
 
         //XServiceInfo
-        virtual rtl::OUString SAL_CALL getImplementationName()
+        virtual rtl::OUString SAL_CALL getImplementationName() 
                 throw( com::sun::star::uno::RuntimeException );
-        virtual sal_Bool SAL_CALL supportsService(const rtl::OUString& ServiceName)
+        virtual sal_Bool SAL_CALL supportsService(const rtl::OUString& ServiceName) 
                 throw( com::sun::star::uno::RuntimeException );
-        virtual com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL getSupportedServiceNames()
+        virtual com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL getSupportedServiceNames() 
                 throw( com::sun::star::uno::RuntimeException );
 
         // following methods are not for XNativeNumberSupplier, they are for calling from transliterations
@@ -86,6 +86,6 @@ private:
         sal_Bool useOffset;
 };
 
-} } } }
+} } } } 
 
 #endif
diff --git a/i18npool/inc/numberformatcode.hxx b/i18npool/inc/numberformatcode.hxx
index eeefba3a7c27..04c126067781 100644
--- a/i18npool/inc/numberformatcode.hxx
+++ b/i18npool/inc/numberformatcode.hxx
@@ -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
diff --git a/i18npool/inc/numtochar.hxx b/i18npool/inc/numtochar.hxx
index 8c8f307d9c1d..27e83c3e5445 100644
--- a/i18npool/inc/numtochar.hxx
+++ b/i18npool/inc/numtochar.hxx
@@ -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
@@ -58,5 +58,5 @@ TRANSLITERATION_NUMTOCHAR(Halfwidth)
 #undef TRANSLITERATION_NUMTOCHAR
 
 } } } }
-
+        
 #endif // _L10N_TRANSLITERATION_NUMTOCHAR_HXX_
diff --git a/i18npool/inc/numtotext_cjk.hxx b/i18npool/inc/numtotext_cjk.hxx
index 9d266af17774..98654192a7db 100644
--- a/i18npool/inc/numtotext_cjk.hxx
+++ b/i18npool/inc/numtotext_cjk.hxx
@@ -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
diff --git a/i18npool/inc/ordinalsuffix.hxx b/i18npool/inc/ordinalsuffix.hxx
index 4be7bbe74ff3..e91b5eceaf62 100644
--- a/i18npool/inc/ordinalsuffix.hxx
+++ b/i18npool/inc/ordinalsuffix.hxx
@@ -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
@@ -34,7 +34,7 @@
 namespace com { namespace sun { namespace star { namespace i18n {
 
 class OrdinalSuffix : public cppu::WeakImplHelper2
-<
+< 
     XOrdinalSuffix,
     com::sun::star::lang::XServiceInfo
 >
diff --git a/i18npool/inc/pch/precompiled_i18npool.cxx b/i18npool/inc/pch/precompiled_i18npool.cxx
index 5abba95233d3..52d75a1eb97c 100644
--- a/i18npool/inc/pch/precompiled_i18npool.cxx
+++ b/i18npool/inc/pch/precompiled_i18npool.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
diff --git a/i18npool/inc/pch/precompiled_i18npool.hxx b/i18npool/inc/pch/precompiled_i18npool.hxx
index dd53267e0b0d..b738f21a7379 100644
--- a/i18npool/inc/pch/precompiled_i18npool.hxx
+++ b/i18npool/inc/pch/precompiled_i18npool.hxx
@@ -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
diff --git a/i18npool/inc/scripttypedetector.hxx b/i18npool/inc/scripttypedetector.hxx
index 3ae841a4175b..04e0c7c7e430 100644
--- a/i18npool/inc/scripttypedetector.hxx
+++ b/i18npool/inc/scripttypedetector.hxx
@@ -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
@@ -32,9 +32,9 @@
 #include <com/sun/star/i18n/XScriptTypeDetector.hpp>
 #include <cppuhelper/implbase2.hxx> // helper for implementations
 
-//  ----------------------------------------------------
-//  class ScriptTypeDetector
-//  ----------------------------------------------------
+//	----------------------------------------------------
+//	class ScriptTypeDetector
+//	----------------------------------------------------
 class ScriptTypeDetector : public cppu::WeakImplHelper2
 <
     ::com::sun::star::i18n::XScriptTypeDetector,
diff --git a/i18npool/inc/servicename.hxx b/i18npool/inc/servicename.hxx
index 605a9e2e5390..a56319f19640 100644
--- a/i18npool/inc/servicename.hxx
+++ b/i18npool/inc/servicename.hxx
@@ -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
@@ -24,7 +24,7 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-/*
+/* 
 Service Name
   com.sun.star.i18n.Transliteration     ... dispatching UNO object and generic methods
   com.sun.star.i18n.Transliteration.u2l ... upper to lower
@@ -43,12 +43,12 @@ Implementation Name
   com.sun.star.i18n.Transliteration.u2l
   com.sun.star.i18n.Transliteration.l2u
   com.sun.star.i18n.Transliteration.caseignore
-  For these there services above,
+  For these there services above, 
 
          com.sun.star.i18n.Transliteration.ja_JP
                                             ^^^^^
                         Locale name
-
+                                            
   For com.sun.star.i18n.l10n.Transliteration service,
          com.sun.star.i18n.Transliteration.HALFWIDTH_FULLWIDTH,
          com.sun.star.i18n.Transliteration.FULLWIDTH_HALFWIDTH,
@@ -59,7 +59,7 @@ Implementation Name
 
           ... These objects above can be used in every Locale context.
 
-*/
+*/          
 
 
 #ifndef _I18N_SERVICENAME_HXX_
@@ -67,20 +67,20 @@ Implementation Name
 
 
 
-#define TRLT_SERVICELNAME "com.sun.star.i18n.Transliteration"
-#define TRLT_SERVICELNAME_PREFIX TRLT_SERVICELNAME "."
-#define TRLT_SERVICELNAME_U2L   TRLT_SERVICELNAME_PREFIX "u2l"
-#define TRLT_SERVICELNAME_L2U   TRLT_SERVICELNAME_PREFIX "l2u"
-#define TRLT_SERVICELNAME_CASEIGNORE TRLT_SERVICELNAME_PREFIX "caseignore"
-#define TRLT_SERVICELNAME_L10N  TRLT_SERVICELNAME_PREFIX "l10n"
+#define	TRLT_SERVICELNAME "com.sun.star.i18n.Transliteration"
+#define	TRLT_SERVICELNAME_PREFIX TRLT_SERVICELNAME "."
+#define	TRLT_SERVICELNAME_U2L	TRLT_SERVICELNAME_PREFIX "u2l"
+#define	TRLT_SERVICELNAME_L2U	TRLT_SERVICELNAME_PREFIX "l2u"
+#define	TRLT_SERVICELNAME_CASEIGNORE TRLT_SERVICELNAME_PREFIX "caseignore"
+#define	TRLT_SERVICELNAME_L10N	TRLT_SERVICELNAME_PREFIX "l10n"
 
-#define TRLT_IMPLNAME "com.sun.star.i18n.Transliteration"
-#define TRLT_IMPLNAME_PREFIX_LEN    34
-#define TRLT_IMPLNAME_PREFIX "com.sun.star.i18n.Transliteration."
-//                1...5...901...5...901...5...901..4  --> 34
+#define	TRLT_IMPLNAME "com.sun.star.i18n.Transliteration"
+#define	TRLT_IMPLNAME_PREFIX_LEN	34
+#define	TRLT_IMPLNAME_PREFIX "com.sun.star.i18n.Transliteration."
+//	 		      1...5...901...5...901...5...901..4  --> 34
 
-#define TRLT_IMPLNAME_L10N  TRLT_IMPLNAME_PREFIX "l10n"
-#define TRLT_IMPLNAME_FH  TRLT_IMPLNAME_PREFIX "FULLWIDTH_HALFWIDTH" // for test
-#define TRLT_IMPLNAME_Ja_JP TRLT_IMPLNAME_PREFIX "ja_JP"
+#define	TRLT_IMPLNAME_L10N  TRLT_IMPLNAME_PREFIX "l10n"
+#define	TRLT_IMPLNAME_FH  TRLT_IMPLNAME_PREFIX "FULLWIDTH_HALFWIDTH" // for test
+#define	TRLT_IMPLNAME_Ja_JP TRLT_IMPLNAME_PREFIX "ja_JP"
 
 #endif
diff --git a/i18npool/inc/textToPronounce_zh.hxx b/i18npool/inc/textToPronounce_zh.hxx
index e1452606d28f..17528aba766b 100644
--- a/i18npool/inc/textToPronounce_zh.hxx
+++ b/i18npool/inc/textToPronounce_zh.hxx
@@ -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
@@ -38,7 +38,7 @@ protected:
         oslModule hModule;
         sal_uInt16 **idx;
         const sal_Unicode* SAL_CALL getPronounce(const sal_Unicode ch);
-
+    
 public:
         TextToPronounce_zh(const sal_Char* func_name);
         ~TextToPronounce_zh();
@@ -53,12 +53,12 @@ public:
         equals( const rtl::OUString & str1, sal_Int32 pos1, sal_Int32 nCount1, sal_Int32 & nMatch1, const rtl::OUString & str2, sal_Int32 pos2, sal_Int32 nCount2, sal_Int32 & nMatch2)
         throw (com::sun::star::uno::RuntimeException);
 
-        rtl::OUString SAL_CALL
-        transliterateChar2String( sal_Unicode inChar)
+        rtl::OUString SAL_CALL 
+        transliterateChar2String( sal_Unicode inChar) 
         throw(com::sun::star::uno::RuntimeException);
 
-        sal_Unicode SAL_CALL
-        transliterateChar2Char( sal_Unicode inChar)
+        sal_Unicode SAL_CALL 
+        transliterateChar2Char( sal_Unicode inChar) 
         throw(com::sun::star::uno::RuntimeException,
             com::sun::star::i18n::MultipleCharsOutputException);
 };
diff --git a/i18npool/inc/textconversion.hxx b/i18npool/inc/textconversion.hxx
index 9cdc8a9b75e2..140d17edc27f 100644
--- a/i18npool/inc/textconversion.hxx
+++ b/i18npool/inc/textconversion.hxx
@@ -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
@@ -50,42 +50,42 @@ public:
         TextConversion();
         ~TextConversion();
         // Methods
-        virtual com::sun::star::i18n::TextConversionResult SAL_CALL
-        getConversions( const ::rtl::OUString& aText, sal_Int32 nStartPos, sal_Int32 nLength,
-            const ::com::sun::star::lang::Locale& aLocale, sal_Int16 nTextConversionType,
-            sal_Int32 nTextConversionOptions )
+        virtual com::sun::star::i18n::TextConversionResult SAL_CALL 
+        getConversions( const ::rtl::OUString& aText, sal_Int32 nStartPos, sal_Int32 nLength, 
+            const ::com::sun::star::lang::Locale& aLocale, sal_Int16 nTextConversionType, 
+            sal_Int32 nTextConversionOptions ) 
             throw(  com::sun::star::uno::RuntimeException,
                     com::sun::star::lang::IllegalArgumentException,
                     com::sun::star::lang::NoSupportException ) = 0;
-        virtual rtl::OUString SAL_CALL
-        getConversion( const ::rtl::OUString& aText, sal_Int32 nStartPos, sal_Int32 nLength,
-            const ::com::sun::star::lang::Locale& aLocale, sal_Int16 nTextConversionType,
-            sal_Int32 nTextConversionOptions )
+        virtual rtl::OUString SAL_CALL 
+        getConversion( const ::rtl::OUString& aText, sal_Int32 nStartPos, sal_Int32 nLength, 
+            const ::com::sun::star::lang::Locale& aLocale, sal_Int16 nTextConversionType, 
+            sal_Int32 nTextConversionOptions ) 
             throw(  com::sun::star::uno::RuntimeException,
                     com::sun::star::lang::IllegalArgumentException,
                     com::sun::star::lang::NoSupportException ) = 0;
-        virtual rtl::OUString SAL_CALL
-        getConversionWithOffset( const ::rtl::OUString& aText, sal_Int32 nStartPos, sal_Int32 nLength,
-            const ::com::sun::star::lang::Locale& aLocale, sal_Int16 nTextConversionType,
-            sal_Int32 nTextConversionOptions, com::sun::star::uno::Sequence< sal_Int32 >& offset )
+        virtual rtl::OUString SAL_CALL 
+        getConversionWithOffset( const ::rtl::OUString& aText, sal_Int32 nStartPos, sal_Int32 nLength, 
+            const ::com::sun::star::lang::Locale& aLocale, sal_Int16 nTextConversionType, 
+            sal_Int32 nTextConversionOptions, com::sun::star::uno::Sequence< sal_Int32 >& offset ) 
             throw(  com::sun::star::uno::RuntimeException,
                     com::sun::star::lang::IllegalArgumentException,
                     com::sun::star::lang::NoSupportException ) = 0;
-        virtual sal_Bool SAL_CALL
+        virtual sal_Bool SAL_CALL 
         interactiveConversion(const ::com::sun::star::lang::Locale& aLocale,
-            sal_Int16 nTextConversionType, sal_Int32 nTextConversionOptions )
+            sal_Int16 nTextConversionType, sal_Int32 nTextConversionOptions ) 
             throw(  com::sun::star::uno::RuntimeException,
                     com::sun::star::lang::IllegalArgumentException,
                     com::sun::star::lang::NoSupportException ) = 0;
 
     //XServiceInfo
-    rtl::OUString SAL_CALL
-        getImplementationName()
+    rtl::OUString SAL_CALL 
+        getImplementationName() 
             throw( com::sun::star::uno::RuntimeException );
-    sal_Bool SAL_CALL
-        supportsService(const rtl::OUString& ServiceName)
+    sal_Bool SAL_CALL 
+        supportsService(const rtl::OUString& ServiceName) 
             throw( com::sun::star::uno::RuntimeException );
-    com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL
+    com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL 
         getSupportedServiceNames()
             throw( com::sun::star::uno::RuntimeException );
 protected :
@@ -110,31 +110,31 @@ public:
     TextConversion_ko( const com::sun::star::uno::Reference < com::sun::star::lang::XMultiServiceFactory >& rxMSF );
 
         // Methods
-        com::sun::star::i18n::TextConversionResult SAL_CALL
-        getConversions( const ::rtl::OUString& aText, sal_Int32 nStartPos, sal_Int32 nLength,
-            const ::com::sun::star::lang::Locale& aLocale, sal_Int16 nTextConversionType,
-            sal_Int32 nTextConversionOptions )
+        com::sun::star::i18n::TextConversionResult SAL_CALL 
+        getConversions( const ::rtl::OUString& aText, sal_Int32 nStartPos, sal_Int32 nLength, 
+            const ::com::sun::star::lang::Locale& aLocale, sal_Int16 nTextConversionType, 
+            sal_Int32 nTextConversionOptions ) 
             throw(  com::sun::star::uno::RuntimeException,
                     com::sun::star::lang::IllegalArgumentException,
                     com::sun::star::lang::NoSupportException );
-        rtl::OUString SAL_CALL
-        getConversion( const ::rtl::OUString& aText, sal_Int32 nStartPos, sal_Int32 nLength,
-            const ::com::sun::star::lang::Locale& aLocale, sal_Int16 nTextConversionType,
-            sal_Int32 nTextConversionOptions )
+        rtl::OUString SAL_CALL 
+        getConversion( const ::rtl::OUString& aText, sal_Int32 nStartPos, sal_Int32 nLength, 
+            const ::com::sun::star::lang::Locale& aLocale, sal_Int16 nTextConversionType, 
+            sal_Int32 nTextConversionOptions ) 
             throw(  com::sun::star::uno::RuntimeException,
                     com::sun::star::lang::IllegalArgumentException,
                     com::sun::star::lang::NoSupportException );
-        rtl::OUString SAL_CALL
-        getConversionWithOffset( const ::rtl::OUString& aText, sal_Int32 nStartPos, sal_Int32 nLength,
-            const ::com::sun::star::lang::Locale& aLocale, sal_Int16 nTextConversionType,
-            sal_Int32 nTextConversionOptions, com::sun::star::uno::Sequence< sal_Int32 >& offset )
+        rtl::OUString SAL_CALL 
+        getConversionWithOffset( const ::rtl::OUString& aText, sal_Int32 nStartPos, sal_Int32 nLength, 
+            const ::com::sun::star::lang::Locale& aLocale, sal_Int16 nTextConversionType, 
+            sal_Int32 nTextConversionOptions, com::sun::star::uno::Sequence< sal_Int32 >& offset ) 
             throw(  com::sun::star::uno::RuntimeException,
                     com::sun::star::lang::IllegalArgumentException,
                     com::sun::star::lang::NoSupportException );
-        sal_Bool SAL_CALL
+        sal_Bool SAL_CALL 
         interactiveConversion(const ::com::sun::star::lang::Locale& aLocale,
             sal_Int16 nTextConversionType,
-            sal_Int32 nTextConversionOptions )
+            sal_Int32 nTextConversionOptions ) 
             throw(  com::sun::star::uno::RuntimeException,
                     com::sun::star::lang::IllegalArgumentException,
                     com::sun::star::lang::NoSupportException );
@@ -146,7 +146,7 @@ private :
         com::sun::star::uno::Reference < com::sun::star::linguistic2::XConversionDictionaryList > xCDL;
         sal_Int32 maxLeftLength;
         sal_Int32 maxRightLength;
-        com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL
+        com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL 
             getCharConversions(const rtl::OUString& aText, sal_Int32 nStartPos, sal_Int32 nLength, sal_Bool toHanja);
 };
 
@@ -166,38 +166,38 @@ public:
     TextConversion_zh( const com::sun::star::uno::Reference < com::sun::star::lang::XMultiServiceFactory >& rxMSF );
 
         // Methods
-        com::sun::star::i18n::TextConversionResult SAL_CALL
-        getConversions( const ::rtl::OUString& aText, sal_Int32 nStartPos, sal_Int32 nLength,
-            const ::com::sun::star::lang::Locale& aLocale, sal_Int16 nTextConversionType,
-            sal_Int32 nTextConversionOptions )
+        com::sun::star::i18n::TextConversionResult SAL_CALL 
+        getConversions( const ::rtl::OUString& aText, sal_Int32 nStartPos, sal_Int32 nLength, 
+            const ::com::sun::star::lang::Locale& aLocale, sal_Int16 nTextConversionType, 
+            sal_Int32 nTextConversionOptions ) 
             throw(  com::sun::star::uno::RuntimeException,
                     com::sun::star::lang::IllegalArgumentException,
                     com::sun::star::lang::NoSupportException );
-        rtl::OUString SAL_CALL
-        getConversion( const ::rtl::OUString& aText, sal_Int32 nStartPos, sal_Int32 nLength,
-            const ::com::sun::star::lang::Locale& aLocale, sal_Int16 nTextConversionType,
-            sal_Int32 nTextConversionOptions )
+        rtl::OUString SAL_CALL 
+        getConversion( const ::rtl::OUString& aText, sal_Int32 nStartPos, sal_Int32 nLength, 
+            const ::com::sun::star::lang::Locale& aLocale, sal_Int16 nTextConversionType, 
+            sal_Int32 nTextConversionOptions ) 
             throw(  com::sun::star::uno::RuntimeException,
                     com::sun::star::lang::IllegalArgumentException,
                     com::sun::star::lang::NoSupportException );
-        rtl::OUString SAL_CALL
-        getConversionWithOffset( const ::rtl::OUString& aText, sal_Int32 nStartPos, sal_Int32 nLength,
-            const ::com::sun::star::lang::Locale& aLocale, sal_Int16 nTextConversionType,
-            sal_Int32 nTextConversionOptions, com::sun::star::uno::Sequence< sal_Int32 >& offset )
+        rtl::OUString SAL_CALL 
+        getConversionWithOffset( const ::rtl::OUString& aText, sal_Int32 nStartPos, sal_Int32 nLength, 
+            const ::com::sun::star::lang::Locale& aLocale, sal_Int16 nTextConversionType, 
+            sal_Int32 nTextConversionOptions, com::sun::star::uno::Sequence< sal_Int32 >& offset ) 
             throw(  com::sun::star::uno::RuntimeException,
                     com::sun::star::lang::IllegalArgumentException,
                     com::sun::star::lang::NoSupportException );
-        sal_Bool SAL_CALL
+        sal_Bool SAL_CALL 
         interactiveConversion(const ::com::sun::star::lang::Locale& aLocale,
             sal_Int16 nTextConversionType,
-            sal_Int32 nTextConversionOptions )
+            sal_Int32 nTextConversionOptions ) 
             throw(  com::sun::star::uno::RuntimeException,
                     com::sun::star::lang::IllegalArgumentException,
                     com::sun::star::lang::NoSupportException );
 private :
         // user defined dictionary list
         com::sun::star::uno::Reference < com::sun::star::linguistic2::XConversionDictionaryList > xCDL;
-        rtl::OUString SAL_CALL getWordConversion(const ::rtl::OUString& aText,
+        rtl::OUString SAL_CALL getWordConversion(const ::rtl::OUString& aText, 
             sal_Int32 nStartPos, sal_Int32 nLength, sal_Bool toSChinese, sal_Int32 nConversionOptions, com::sun::star::uno::Sequence <sal_Int32>& offset);
         rtl:: OUString SAL_CALL getCharConversion(const rtl:: OUString& aText, sal_Int32 nStartPos, sal_Int32 nLength, sal_Bool toSChinese, sal_Int32 nConversionOptions);
         com::sun::star::lang::Locale aLocale;
diff --git a/i18npool/inc/textconversionImpl.hxx b/i18npool/inc/textconversionImpl.hxx
index cd7a15778a78..03312e26cac2 100644
--- a/i18npool/inc/textconversionImpl.hxx
+++ b/i18npool/inc/textconversionImpl.hxx
@@ -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
@@ -34,9 +34,9 @@
 
 namespace com { namespace sun { namespace star { namespace i18n {
 
-//  ----------------------------------------------------
-//  class TextConversion
-//  ----------------------------------------------------
+//	----------------------------------------------------
+//	class TextConversion
+//	----------------------------------------------------
 class TextConversionImpl : public cppu::WeakImplHelper2
 <
     com::sun::star::i18n::XExtendedTextConversion,
@@ -47,42 +47,42 @@ public:
     TextConversionImpl( const com::sun::star::uno::Reference < com::sun::star::lang::XMultiServiceFactory >& rxMSF ) : xMSF(rxMSF) {};
 
         // Methods
-        com::sun::star::i18n::TextConversionResult SAL_CALL
-        getConversions( const ::rtl::OUString& aText, sal_Int32 nStartPos, sal_Int32 nLength,
-            const ::com::sun::star::lang::Locale& aLocale, sal_Int16 nTextConversionType,
-            sal_Int32 nTextConversionOptions )
+        com::sun::star::i18n::TextConversionResult SAL_CALL 
+        getConversions( const ::rtl::OUString& aText, sal_Int32 nStartPos, sal_Int32 nLength, 
+            const ::com::sun::star::lang::Locale& aLocale, sal_Int16 nTextConversionType, 
+            sal_Int32 nTextConversionOptions ) 
             throw(  com::sun::star::uno::RuntimeException,
                     com::sun::star::lang::IllegalArgumentException,
                     com::sun::star::lang::NoSupportException );
-        rtl::OUString SAL_CALL
-        getConversion( const ::rtl::OUString& aText, sal_Int32 nStartPos, sal_Int32 nLength,
-            const ::com::sun::star::lang::Locale& aLocale, sal_Int16 nTextConversionType,
-            sal_Int32 nTextConversionOptions )
+        rtl::OUString SAL_CALL 
+        getConversion( const ::rtl::OUString& aText, sal_Int32 nStartPos, sal_Int32 nLength, 
+            const ::com::sun::star::lang::Locale& aLocale, sal_Int16 nTextConversionType, 
+            sal_Int32 nTextConversionOptions ) 
             throw(  com::sun::star::uno::RuntimeException,
                     com::sun::star::lang::IllegalArgumentException,
                     com::sun::star::lang::NoSupportException );
-        rtl::OUString SAL_CALL
-        getConversionWithOffset( const ::rtl::OUString& aText, sal_Int32 nStartPos, sal_Int32 nLength,
-            const ::com::sun::star::lang::Locale& aLocale, sal_Int16 nTextConversionType,
-            sal_Int32 nTextConversionOptions, com::sun::star::uno::Sequence< sal_Int32 >& offset )
+        rtl::OUString SAL_CALL 
+        getConversionWithOffset( const ::rtl::OUString& aText, sal_Int32 nStartPos, sal_Int32 nLength, 
+            const ::com::sun::star::lang::Locale& aLocale, sal_Int16 nTextConversionType, 
+            sal_Int32 nTextConversionOptions, com::sun::star::uno::Sequence< sal_Int32 >& offset ) 
             throw(  com::sun::star::uno::RuntimeException,
                     com::sun::star::lang::IllegalArgumentException,
                     com::sun::star::lang::NoSupportException );
-        sal_Bool SAL_CALL
+        sal_Bool SAL_CALL 
         interactiveConversion( const ::com::sun::star::lang::Locale& aLocale,
-            sal_Int16 nTextConversionType, sal_Int32 nTextConversionOptions )
+            sal_Int16 nTextConversionType, sal_Int32 nTextConversionOptions ) 
             throw(  com::sun::star::uno::RuntimeException,
                     com::sun::star::lang::IllegalArgumentException,
                     com::sun::star::lang::NoSupportException );
 
     //XServiceInfo
-    rtl::OUString SAL_CALL
-        getImplementationName()
+    rtl::OUString SAL_CALL 
+        getImplementationName() 
             throw( com::sun::star::uno::RuntimeException );
-    sal_Bool SAL_CALL
-        supportsService(const rtl::OUString& ServiceName)
+    sal_Bool SAL_CALL 
+        supportsService(const rtl::OUString& ServiceName) 
             throw( com::sun::star::uno::RuntimeException );
-    com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL
+    com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL 
         getSupportedServiceNames()
             throw( com::sun::star::uno::RuntimeException );
 private :
diff --git a/i18npool/inc/texttonum.hxx b/i18npool/inc/texttonum.hxx
index c9018f69a334..e5fd295d7ee3 100644
--- a/i18npool/inc/texttonum.hxx
+++ b/i18npool/inc/texttonum.hxx
@@ -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
diff --git a/i18npool/inc/transliterationImpl.hxx b/i18npool/inc/transliterationImpl.hxx
index a50d7cd4e98e..1dd26afeb514 100644
--- a/i18npool/inc/transliterationImpl.hxx
+++ b/i18npool/inc/transliterationImpl.hxx
@@ -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
@@ -64,13 +64,13 @@ public:
         throw(com::sun::star::uno::RuntimeException) ;
     virtual void SAL_CALL loadModuleNew( const com::sun::star::uno::Sequence< TransliterationModulesNew >& modName,
         const com::sun::star::lang::Locale& rLocale ) throw(com::sun::star::uno::RuntimeException) ;
-    virtual void SAL_CALL loadModuleByImplName( const rtl::OUString& implName,
+    virtual void SAL_CALL loadModuleByImplName( const rtl::OUString& implName, 
         const com::sun::star::lang::Locale& rLocale ) throw(com::sun::star::uno::RuntimeException);
     virtual void SAL_CALL loadModulesByImplNames(const com::sun::star::uno::Sequence< rtl::OUString >& modNamelist,
         const com::sun::star::lang::Locale& rLocale) throw(com::sun::star::uno::RuntimeException);
 
-    virtual com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL getAvailableModules(
-        const com::sun::star::lang::Locale& rLocale, sal_Int16 sType )
+    virtual com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL getAvailableModules( 
+        const com::sun::star::lang::Locale& rLocale, sal_Int16 sType ) 
         throw(com::sun::star::uno::RuntimeException);
 
     virtual rtl::OUString SAL_CALL transliterate( const rtl::OUString& inStr, sal_Int32 startPos, sal_Int32 nCount,
@@ -84,21 +84,21 @@ public:
         throw(com::sun::star::uno::RuntimeException) ;
     virtual rtl::OUString SAL_CALL transliterateChar2String( sal_Unicode inChar )
         throw(com::sun::star::uno::RuntimeException) ;
-    virtual sal_Unicode SAL_CALL transliterateChar2Char( sal_Unicode inChar )
+    virtual sal_Unicode SAL_CALL transliterateChar2Char( sal_Unicode inChar ) 
         throw(com::sun::star::i18n::MultipleCharsOutputException,
                 com::sun::star::uno::RuntimeException) ;
 
 /*
     virtual void SAL_CALL createCascadeInstance( const com::sun::star::uno::Sequence< rtl::OUString >& modNamelist,
         const com::sun::star::lang::Locale& rLocale ) throw(com::sun::star::uno::RuntimeException) ;
-    virtual rtl::OUString SAL_CALL folding_reverse( const rtl::OUString& inStr, sal_Int32 startPos,
+    virtual rtl::OUString SAL_CALL folding_reverse( const rtl::OUString& inStr, sal_Int32 startPos, 
         sal_Int32 nCount ) throw(com::sun::star::uno::RuntimeException);
     virtual sal_Int32 SAL_CALL transliterateMatch( const rtl::OUString& content, sal_Int32 pos1, sal_Int32 nCount1,
-        const rtl::OUString& pattern, sal_Int32 pos2, sal_Int32 nCount2 )
+        const rtl::OUString& pattern, sal_Int32 pos2, sal_Int32 nCount2 ) 
         throw(com::sun::star::uno::RuntimeException);
 */
-    virtual sal_Bool SAL_CALL equals( const rtl::OUString& str1, sal_Int32 pos1, sal_Int32 nCount1,
-        sal_Int32& nMatch1, const rtl::OUString& str2, sal_Int32 pos2, sal_Int32 nCount2, sal_Int32& nMatch2 )
+    virtual sal_Bool SAL_CALL equals( const rtl::OUString& str1, sal_Int32 pos1, sal_Int32 nCount1, 
+        sal_Int32& nMatch1, const rtl::OUString& str2, sal_Int32 pos2, sal_Int32 nCount2, sal_Int32& nMatch2 ) 
         throw(com::sun::star::uno::RuntimeException);
     virtual com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL transliterateRange( const rtl::OUString& str1,
         const rtl::OUString& str2 ) throw(com::sun::star::uno::RuntimeException) ;
@@ -134,13 +134,13 @@ private:
     };
     static TransBody lastTransBody;
 
-    virtual sal_Bool SAL_CALL loadModuleByName( const rtl::OUString& implName,
-        com::sun::star::uno::Reference<com::sun::star::i18n::XExtendedTransliteration> & body, const com::sun::star::lang::Locale& rLocale)
+    virtual sal_Bool SAL_CALL loadModuleByName( const rtl::OUString& implName, 
+        com::sun::star::uno::Reference<com::sun::star::i18n::XExtendedTransliteration> & body, const com::sun::star::lang::Locale& rLocale) 
         throw(com::sun::star::uno::RuntimeException);
 
     void clear();
 
-    void loadBody( ::rtl::OUString &implName,
+    void loadBody( ::rtl::OUString &implName, 
         ::com::sun::star::uno::Reference< ::com::sun::star::i18n::XExtendedTransliteration >& body )
         throw (::com::sun::star::uno::RuntimeException);
 
diff --git a/i18npool/inc/transliteration_Ignore.hxx b/i18npool/inc/transliteration_Ignore.hxx
index 68201ca5901c..a3044fc06a1d 100644
--- a/i18npool/inc/transliteration_Ignore.hxx
+++ b/i18npool/inc/transliteration_Ignore.hxx
@@ -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
@@ -50,30 +50,30 @@ public:
 
         // This method is shared.
         sal_Bool SAL_CALL
-        equals( const rtl::OUString& str1, sal_Int32 pos1, sal_Int32 nCount1, sal_Int32& nMatch1,
+        equals( const rtl::OUString& str1, sal_Int32 pos1, sal_Int32 nCount1, sal_Int32& nMatch1, 
             const rtl::OUString& str2, sal_Int32 pos2, sal_Int32 nCount2, sal_Int32& nMatch2 )
         throw(com::sun::star::uno::RuntimeException);
 
         // This method is implemented in sub class if needed. Otherwise, the method implemented in this class will be used.
-        com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL
-        transliterateRange( const rtl::OUString& str1, const rtl::OUString& str2 )
+        com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL 
+        transliterateRange( const rtl::OUString& str1, const rtl::OUString& str2 ) 
         throw(com::sun::star::uno::RuntimeException);
 
 
         // Methods which are shared.
         sal_Int16 SAL_CALL getType(  ) throw(com::sun::star::uno::RuntimeException);
-
-        rtl::OUString SAL_CALL
-        transliterate( const rtl::OUString& inStr, sal_Int32 startPos, sal_Int32 nCount, com::sun::star::uno::Sequence< sal_Int32 >& offset  )
+    
+        rtl::OUString SAL_CALL 
+        transliterate( const rtl::OUString& inStr, sal_Int32 startPos, sal_Int32 nCount, com::sun::star::uno::Sequence< sal_Int32 >& offset  ) 
         throw(com::sun::star::uno::RuntimeException);
 
-        virtual sal_Unicode SAL_CALL
-        transliterateChar2Char( sal_Unicode inChar)
+        virtual sal_Unicode SAL_CALL 
+        transliterateChar2Char( sal_Unicode inChar) 
         throw(com::sun::star::uno::RuntimeException,
             com::sun::star::i18n::MultipleCharsOutputException);
 
-        com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL
-        transliterateRange( const rtl::OUString& str1, const rtl::OUString& str2, XTransliteration& t1, XTransliteration& t2 )
+        com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL 
+        transliterateRange( const rtl::OUString& str1, const rtl::OUString& str2, XTransliteration& t1, XTransliteration& t2 ) 
         throw(com::sun::star::uno::RuntimeException);
 
 protected:
diff --git a/i18npool/inc/transliteration_Numeric.hxx b/i18npool/inc/transliteration_Numeric.hxx
index 76ffd3661a8a..97319b0541d3 100644
--- a/i18npool/inc/transliteration_Numeric.hxx
+++ b/i18npool/inc/transliteration_Numeric.hxx
@@ -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
@@ -44,7 +44,7 @@ public:
 
         // Methods which are shared.
         virtual sal_Int16 SAL_CALL getType(  ) throw(::com::sun::star::uno::RuntimeException);
-
+    
         virtual ::rtl::OUString SAL_CALL
         folding( const ::rtl::OUString& inStr, sal_Int32 startPos, sal_Int32 nCount, ::com::sun::star::uno::Sequence< sal_Int32 >& offset )
         throw(::com::sun::star::uno::RuntimeException);
@@ -53,7 +53,7 @@ public:
         equals( const ::rtl::OUString& str1, sal_Int32 pos1, sal_Int32 nCount1, sal_Int32& nMatch1, const ::rtl::OUString& str2, sal_Int32 pos2, sal_Int32 nCount2, sal_Int32& nMatch2 )
         throw(::com::sun::star::uno::RuntimeException);
 
-        virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL
+        virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL 
         transliterateRange( const ::rtl::OUString& str1, const ::rtl::OUString& str2 )
         throw(::com::sun::star::uno::RuntimeException);
 protected:
@@ -62,9 +62,9 @@ protected:
         sal_Unicode* table;
         sal_Bool recycleSymbol;
 private:
-        rtl::OUString SAL_CALL
+        rtl::OUString SAL_CALL 
         transliterateBullet( const rtl::OUString& inStr, sal_Int32 startPos, sal_Int32 nCount,
-        com::sun::star::uno::Sequence< sal_Int32 >& offset )
+        com::sun::star::uno::Sequence< sal_Int32 >& offset ) 
         throw(com::sun::star::uno::RuntimeException);
 };
 
diff --git a/i18npool/inc/transliteration_OneToOne.hxx b/i18npool/inc/transliteration_OneToOne.hxx
index dbe37a1ebe05..d0bee5114f0e 100644
--- a/i18npool/inc/transliteration_OneToOne.hxx
+++ b/i18npool/inc/transliteration_OneToOne.hxx
@@ -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
@@ -37,29 +37,29 @@ typedef sal_Unicode (*TransFunc)(const sal_Unicode);
 class transliteration_OneToOne : public transliteration_commonclass
 {
 public:
-        rtl::OUString SAL_CALL
-        transliterate( const rtl::OUString& inStr, sal_Int32 startPos, sal_Int32 nCount, com::sun::star::uno::Sequence< sal_Int32 >& offset  )
+        rtl::OUString SAL_CALL 
+        transliterate( const rtl::OUString& inStr, sal_Int32 startPos, sal_Int32 nCount, com::sun::star::uno::Sequence< sal_Int32 >& offset  ) 
         throw(com::sun::star::uno::RuntimeException);
 
-        sal_Unicode SAL_CALL
+        sal_Unicode SAL_CALL 
         transliterateChar2Char( sal_Unicode inChar)
-        throw(com::sun::star::uno::RuntimeException,
+        throw(com::sun::star::uno::RuntimeException, 
         com::sun::star::i18n::MultipleCharsOutputException);
 
         // Methods which are shared.
         sal_Int16 SAL_CALL getType() throw(com::sun::star::uno::RuntimeException);
-
+    
         rtl::OUString SAL_CALL
         folding( const rtl::OUString& inStr, sal_Int32 startPos, sal_Int32 nCount, com::sun::star::uno::Sequence< sal_Int32 >& offset)
         throw(com::sun::star::uno::RuntimeException);
 
         sal_Bool SAL_CALL
-        equals( const rtl::OUString& str1, sal_Int32 pos1, sal_Int32 nCount1, sal_Int32& nMatch1,
+        equals( const rtl::OUString& str1, sal_Int32 pos1, sal_Int32 nCount1, sal_Int32& nMatch1, 
             const rtl::OUString& str2, sal_Int32 pos2, sal_Int32 nCount2, sal_Int32& nMatch2 )
         throw(com::sun::star::uno::RuntimeException);
 
-        com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL
-        transliterateRange( const rtl::OUString& str1, const rtl::OUString& str2 )
+        com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL 
+        transliterateRange( const rtl::OUString& str1, const rtl::OUString& str2 ) 
         throw(com::sun::star::uno::RuntimeException);
 
 protected:
diff --git a/i18npool/inc/transliteration_body.hxx b/i18npool/inc/transliteration_body.hxx
index 3d474a0a53dc..010388a96d4b 100644
--- a/i18npool/inc/transliteration_body.hxx
+++ b/i18npool/inc/transliteration_body.hxx
@@ -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,7 +56,7 @@ public:
         com::sun::star::uno::Sequence< sal_Int32 >& offset) throw(com::sun::star::uno::RuntimeException);
 
     sal_Bool SAL_CALL equals(
-        const rtl::OUString& str1, sal_Int32 pos1, sal_Int32 nCount1, sal_Int32& nMatch1,
+        const rtl::OUString& str1, sal_Int32 pos1, sal_Int32 nCount1, sal_Int32& nMatch1, 
         const rtl::OUString& str2, sal_Int32 pos2, sal_Int32 nCount2, sal_Int32& nMatch2 )
         throw(com::sun::star::uno::RuntimeException);
 
diff --git a/i18npool/inc/transliteration_caseignore.hxx b/i18npool/inc/transliteration_caseignore.hxx
index 493a01c46f18..4016922fb4d8 100644
--- a/i18npool/inc/transliteration_caseignore.hxx
+++ b/i18npool/inc/transliteration_caseignore.hxx
@@ -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
@@ -44,7 +44,7 @@ public:
     throw(com::sun::star::uno::RuntimeException);
 
     com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL transliterateRange(
-        const rtl::OUString& str1, const rtl::OUString& str2 )
+        const rtl::OUString& str1, const rtl::OUString& str2 ) 
     throw(com::sun::star::uno::RuntimeException);
 
     sal_Bool SAL_CALL equals(
@@ -65,9 +65,9 @@ public:
 protected:
     TransliterationModules moduleLoaded;
 private:
-    sal_Int32 SAL_CALL compare(
-        const rtl::OUString& str1, sal_Int32 pos1, sal_Int32 nCount1, sal_Int32& nMatch1,
-        const rtl::OUString& str2, sal_Int32 pos2, sal_Int32 nCount2, sal_Int32& nMatch2)
+    sal_Int32 SAL_CALL compare( 
+        const rtl::OUString& str1, sal_Int32 pos1, sal_Int32 nCount1, sal_Int32& nMatch1, 
+        const rtl::OUString& str2, sal_Int32 pos2, sal_Int32 nCount2, sal_Int32& nMatch2) 
     throw(com::sun::star::uno::RuntimeException);
 };
 
diff --git a/i18npool/inc/transliteration_commonclass.hxx b/i18npool/inc/transliteration_commonclass.hxx
index 57de252f1721..4ef8692dec26 100644
--- a/i18npool/inc/transliteration_commonclass.hxx
+++ b/i18npool/inc/transliteration_commonclass.hxx
@@ -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
@@ -95,12 +95,12 @@ public:
         transliterateRange( const rtl::OUString& str1, const rtl::OUString& str2 )
         throw(com::sun::star::uno::RuntimeException) = 0;
 
-        virtual sal_Int32 SAL_CALL
-        compareSubstring( const rtl::OUString& s1, sal_Int32 off1, sal_Int32 len1, const rtl::OUString& s2, sal_Int32 off2, sal_Int32 len2)
+        virtual sal_Int32 SAL_CALL 
+        compareSubstring( const rtl::OUString& s1, sal_Int32 off1, sal_Int32 len1, const rtl::OUString& s2, sal_Int32 off2, sal_Int32 len2) 
         throw(com::sun::star::uno::RuntimeException);
 
-        virtual sal_Int32 SAL_CALL
-        compareString( const rtl::OUString& s1, const rtl::OUString& s2)
+        virtual sal_Int32 SAL_CALL 
+        compareString( const rtl::OUString& s1, const rtl::OUString& s2) 
         throw(com::sun::star::uno::RuntimeException);
 
         //XServiceInfo
diff --git a/i18npool/inc/warnings_guard_unicode_brkiter.h b/i18npool/inc/warnings_guard_unicode_brkiter.h
index 50ede3b3bab9..3d29ad88fffc 100644
--- a/i18npool/inc/warnings_guard_unicode_brkiter.h
+++ b/i18npool/inc/warnings_guard_unicode_brkiter.h
@@ -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
diff --git a/i18npool/inc/warnings_guard_unicode_calendar.h b/i18npool/inc/warnings_guard_unicode_calendar.h
index 8ea632da2bc5..ab68bc5f96f8 100644
--- a/i18npool/inc/warnings_guard_unicode_calendar.h
+++ b/i18npool/inc/warnings_guard_unicode_calendar.h
@@ -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
diff --git a/i18npool/inc/warnings_guard_unicode_tblcoll.h b/i18npool/inc/warnings_guard_unicode_tblcoll.h
index 4c4b80e58324..1bf4bd575e8b 100644
--- a/i18npool/inc/warnings_guard_unicode_tblcoll.h
+++ b/i18npool/inc/warnings_guard_unicode_tblcoll.h
@@ -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
diff --git a/i18npool/inc/wtt.h b/i18npool/inc/wtt.h
index a299f38093ba..77d544dc6061 100644
--- a/i18npool/inc/wtt.h
+++ b/i18npool/inc/wtt.h
@@ -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
@@ -33,42 +33,42 @@ namespace com { namespace sun { namespace star { namespace i18n {
  * Thai character type definition.
  */
 
-#define CT_CTRL     0       // Control character
-#define CT_NON      1       // Non-composible
-#define CT_CONS     2       // Consonant
-#define CT_LV       3       // Leading vowel
-#define CT_FV1      4       // Following vowel
-#define CT_FV2      5       // Following vowel
-#define CT_FV3      6
-#define CT_BV1      7       // Below vowel
-#define CT_BV2      8
-#define CT_BD       9       // Below diacritic
-#define CT_TONE     10      // Tone
-#define CT_AD1      11      // Above diacritic
-#define CT_AD2      12
-#define CT_AD3      13
-#define CT_AV1      14      // Above vowel
-#define CT_AV2      15
-#define CT_AV3      16
+#define CT_CTRL		0		// Control character
+#define CT_NON		1		// Non-composible
+#define CT_CONS		2		// Consonant
+#define CT_LV		3		// Leading vowel
+#define CT_FV1		4		// Following vowel
+#define CT_FV2		5		// Following vowel
+#define CT_FV3		6
+#define CT_BV1		7		// Below vowel
+#define CT_BV2		8
+#define CT_BD		9		// Below diacritic
+#define CT_TONE		10		// Tone
+#define CT_AD1		11		// Above diacritic
+#define CT_AD2		12
+#define CT_AD3		13
+#define CT_AV1		14		// Above vowel
+#define CT_AV2		15
+#define CT_AV3		16
 
-#define MAX_CT      17
+#define MAX_CT		17
 
-static const sal_uInt16 thaiCT[128] = {     // Thai character type
-    CT_NON, CT_CONS, CT_CONS, CT_CONS, CT_CONS,CT_CONS, CT_CONS, CT_CONS,       //0E00
+static const sal_uInt16 thaiCT[128] = {		// Thai character type
+    CT_NON, CT_CONS, CT_CONS, CT_CONS, CT_CONS,CT_CONS, CT_CONS, CT_CONS,		//0E00
     CT_CONS, CT_CONS, CT_CONS, CT_CONS, CT_CONS, CT_CONS, CT_CONS, CT_CONS,
-    CT_CONS, CT_CONS, CT_CONS, CT_CONS, CT_CONS, CT_CONS, CT_CONS, CT_CONS,     //0E10
+    CT_CONS, CT_CONS, CT_CONS, CT_CONS, CT_CONS, CT_CONS, CT_CONS, CT_CONS,		//0E10
     CT_CONS, CT_CONS, CT_CONS, CT_CONS, CT_CONS, CT_CONS, CT_CONS, CT_CONS,
-    CT_CONS, CT_CONS, CT_CONS, CT_CONS, CT_FV3, CT_CONS, CT_FV3, CT_CONS,       //0E20
+    CT_CONS, CT_CONS, CT_CONS, CT_CONS, CT_FV3, CT_CONS, CT_FV3, CT_CONS,		//0E20
     CT_CONS, CT_CONS, CT_CONS, CT_CONS, CT_CONS, CT_CONS, CT_CONS, CT_NON,
-    CT_FV1, CT_AV2, CT_FV1, CT_FV1, CT_AV1, CT_AV3, CT_AV2, CT_AV3,         //0E30
+    CT_FV1, CT_AV2, CT_FV1, CT_FV1, CT_AV1, CT_AV3, CT_AV2, CT_AV3,			//0E30
     CT_BV1, CT_BV2, CT_BD, CT_NON, CT_NON, CT_NON, CT_NON, CT_NON,
-    CT_LV, CT_LV, CT_LV, CT_LV, CT_LV, CT_FV2, CT_NON, CT_AD2,          //0E40
+    CT_LV, CT_LV, CT_LV, CT_LV, CT_LV, CT_FV2, CT_NON, CT_AD2,			//0E40
     CT_TONE, CT_TONE, CT_TONE, CT_TONE, CT_AD1, CT_AD1, CT_AD3, CT_NON,
-    CT_NON, CT_NON, CT_NON, CT_NON, CT_NON, CT_NON, CT_NON, CT_NON,         //0E50
+    CT_NON, CT_NON, CT_NON, CT_NON, CT_NON, CT_NON, CT_NON, CT_NON,			//0E50
     CT_NON, CT_NON, CT_NON, CT_NON, CT_NON, CT_NON, CT_NON, CT_CTRL };
 
 #define getCharType(x) ((x >= 0x0E00 && x < 0x0E60) ? thaiCT[x - 0x0E00] : CT_NON)
 
-} } } }
+} } } } 
 
 #endif // _I18N_WTT_H_
diff --git a/i18npool/inc/xdictionary.hxx b/i18npool/inc/xdictionary.hxx
index 99a52b6ea1b0..68662dbcb0ec 100644
--- a/i18npool/inc/xdictionary.hxx
+++ b/i18npool/inc/xdictionary.hxx
@@ -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
@@ -37,15 +37,15 @@ namespace com { namespace sun { namespace star { namespace i18n {
 // Whether to use cell boundary code, currently unused but prepared.
 #define USE_CELL_BOUNDARY_CODE 0
 
-#define CACHE_MAX 32        // max cache structure number
-#define DEFAULT_SIZE 256    // for boundary size, to avoid alloc and release memory
+#define CACHE_MAX 32		// max cache structure number
+#define DEFAULT_SIZE 256	// for boundary size, to avoid alloc and release memory
 
 // cache structure.
 struct WordBreakCache {
-    sal_Int32 length;       // contents length saved here.
-    sal_Unicode *contents;      // seperated segment contents.
-    sal_Int32* wordboundary;        // word boundaries in segments.
-    sal_Int32 size;         // size of wordboundary
+    sal_Int32 length;		// contents length saved here.
+    sal_Unicode *contents;		// seperated segment contents.
+    sal_Int32* wordboundary;     	// word boundaries in segments.
+    sal_Int32 size;			// size of wordboundary
 
     WordBreakCache();
     sal_Bool equals(const sal_Unicode *str, Boundary& boundary);    // checking cached string
diff --git a/i18npool/source/breakiterator/breakiteratorImpl.cxx b/i18npool/source/breakiterator/breakiteratorImpl.cxx
index e4e08d42df43..f203eae25c90 100644
--- a/i18npool/source/breakiterator/breakiteratorImpl.cxx
+++ b/i18npool/source/breakiterator/breakiteratorImpl.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
@@ -65,7 +65,7 @@ sal_Int32 SAL_CALL BreakIteratorImpl::nextCharacters( const OUString& Text, sal_
         return LBI->nextCharacters( Text, nStartPos, rLocale, nCharacterIteratorMode, nCount, nDone);
 }
 
-sal_Int32 SAL_CALL BreakIteratorImpl::previousCharacters( const OUString& Text, sal_Int32 nStartPos,
+sal_Int32 SAL_CALL BreakIteratorImpl::previousCharacters( const OUString& Text, sal_Int32 nStartPos, 
         const Locale& rLocale, sal_Int16 nCharacterIteratorMode, sal_Int32 nCount, sal_Int32& nDone )
         throw(RuntimeException)
 {
@@ -270,14 +270,14 @@ static sal_Int32 SAL_CALL iterateCodePoints(const OUString& Text, sal_Int32 &nSt
         } else {
             ch = Text.iterateCodePoints(&nStartPos, inc);
             // Fix for #i80436#.
-            // erAck: 2009-06-30T21:52+0200  This logic looks somewhat
-            // suspicious as if it cures a symptom.. anyway, had to add
-            // nStartPos < Text.getLength() to silence the (correct) assertion
-            // in rtl_uString_iterateCodePoints() if Text was one character
+            // erAck: 2009-06-30T21:52+0200  This logic looks somewhat 
+            // suspicious as if it cures a symptom.. anyway, had to add 
+            // nStartPos < Text.getLength() to silence the (correct) assertion 
+            // in rtl_uString_iterateCodePoints() if Text was one character 
             // (codepoint) only, made up of a surrogate pair.
             //if (inc > 0 && nStartPos < Text.getLength())
             //    ch = Text.iterateCodePoints(&nStartPos, 0);
-            // With surrogates, nStartPos may actually point behind string
+            // With surrogates, nStartPos may actually point behind string  
             // now, even if inc is only +1
             if (inc > 0)
                 ch = (nStartPos < nLen ? Text.iterateCodePoints(&nStartPos, 0) : 0);
@@ -340,7 +340,7 @@ sal_Int32  SAL_CALL BreakIteratorImpl::previousScript( const OUString& Text,
             else if (nStartPos == 0) {
                 if (numberOfChange > 0)
                     numberOfChange--;
-                if (nStartPos > 0)
+                if (nStartPos > 0) 
                     Text.iterateCodePoints(&nStartPos, -1);
                 else
                     return -1;
@@ -487,7 +487,7 @@ sal_Int16  BreakIteratorImpl::getScriptClass(sal_uInt32 currentChar)
                 nRet = ScriptType::WEAK;
             // workaround for Coptic
             else if ( 0x2C80 <= currentChar && 0x2CE3 >= currentChar)
-                nRet = ScriptType::LATIN;
+                nRet = ScriptType::LATIN;            
             else {
                 UBlockCode block=ublock_getCode(currentChar);
                 sal_uInt16 i;
@@ -549,7 +549,7 @@ BreakIteratorImpl::getLocaleSpecificBreakIterator(const Locale& rLocale) throw (
             sal_Int32 v = rLocale.Variant.getLength();
             OUStringBuffer aBuf(l+c+v+3);
 
-            if ((l > 0 && c > 0 && v > 0 &&
+            if ((l > 0 && c > 0 && v > 0 && 
                     // load service with name <base>_<lang>_<country>_<varian>
                     createLocaleSpecificBreakIterator(aBuf.append(rLocale.Language).append(under).append(
                                     rLocale.Country).append(under).append(rLocale.Variant).makeStringAndClear())) ||
@@ -557,13 +557,13 @@ BreakIteratorImpl::getLocaleSpecificBreakIterator(const Locale& rLocale) throw (
                     // load service with name <base>_<lang>_<country>
                     createLocaleSpecificBreakIterator(aBuf.append(rLocale.Language).append(under).append(
                                     rLocale.Country).makeStringAndClear())) ||
-                (l > 0 && c > 0 && rLocale.Language.compareToAscii("zh") == 0 &&
+                (l > 0 && c > 0 && rLocale.Language.compareToAscii("zh") == 0 && 
                                     (rLocale.Country.compareToAscii("HK") == 0 ||
                                     rLocale.Country.compareToAscii("MO") == 0) &&
                     // if the country code is HK or MO, one more step to try TW.
                     createLocaleSpecificBreakIterator(aBuf.append(rLocale.Language).append(under).appendAscii(
                                     "TW").makeStringAndClear())) ||
-                (l > 0 &&
+                (l > 0 && 
                     // load service with name <base>_<lang>
                     createLocaleSpecificBreakIterator(rLocale.Language)) ||
                     // load default service with name <base>_Unicode
diff --git a/i18npool/source/breakiterator/breakiterator_cjk.cxx b/i18npool/source/breakiterator/breakiterator_cjk.cxx
index 16d7d1337538..775fdaaf368a 100644
--- a/i18npool/source/breakiterator/breakiterator_cjk.cxx
+++ b/i18npool/source/breakiterator/breakiterator_cjk.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
@@ -43,38 +43,38 @@ namespace com { namespace sun { namespace star { namespace i18n {
 //      class BreakIterator_CJK
 //      ----------------------------------------------------;
 
-BreakIterator_CJK::BreakIterator_CJK() :
+BreakIterator_CJK::BreakIterator_CJK() : 
     dict( NULL ),
     hangingCharacters()
 {
         cBreakIterator = "com.sun.star.i18n.BreakIterator_CJK";
 }
 
-Boundary SAL_CALL
-BreakIterator_CJK::previousWord(const OUString& text, sal_Int32 anyPos,
+Boundary SAL_CALL 
+BreakIterator_CJK::previousWord(const OUString& text, sal_Int32 anyPos, 
         const lang::Locale& nLocale, sal_Int16 wordType) throw(RuntimeException)
 {
         if (dict) {
             result = dict->previousWord(text, anyPos, wordType);
             // #109813# for non-CJK, single character word, fallback to ICU breakiterator.
-            if (result.endPos - result.startPos != 1 ||
+            if (result.endPos - result.startPos != 1 || 
                     getScriptType(text, result.startPos) == ScriptType::ASIAN)
                 return result;
             result = BreakIterator_Unicode::getWordBoundary(text, result.startPos, nLocale, wordType, true);
-            if (result.endPos < anyPos)
+            if (result.endPos < anyPos) 
                 return result;
         }
         return BreakIterator_Unicode::previousWord(text, anyPos, nLocale, wordType);
 }
 
-Boundary SAL_CALL
-BreakIterator_CJK::nextWord(const OUString& text, sal_Int32 anyPos,
+Boundary SAL_CALL 
+BreakIterator_CJK::nextWord(const OUString& text, sal_Int32 anyPos, 
         const lang::Locale& nLocale, sal_Int16 wordType) throw(RuntimeException)
 {
         if (dict) {
             result = dict->nextWord(text, anyPos, wordType);
             // #109813# for non-CJK, single character word, fallback to ICU breakiterator.
-            if (result.endPos - result.startPos != 1 ||
+            if (result.endPos - result.startPos != 1 || 
                     getScriptType(text, result.startPos) == ScriptType::ASIAN)
                 return result;
             result = BreakIterator_Unicode::getWordBoundary(text, result.startPos, nLocale, wordType, true);
@@ -84,15 +84,15 @@ BreakIterator_CJK::nextWord(const OUString& text, sal_Int32 anyPos,
         return BreakIterator_Unicode::nextWord(text, anyPos, nLocale, wordType);
 }
 
-Boundary SAL_CALL
-BreakIterator_CJK::getWordBoundary( const OUString& text, sal_Int32 anyPos,
-        const lang::Locale& nLocale, sal_Int16 wordType, sal_Bool bDirection )
+Boundary SAL_CALL 
+BreakIterator_CJK::getWordBoundary( const OUString& text, sal_Int32 anyPos, 
+        const lang::Locale& nLocale, sal_Int16 wordType, sal_Bool bDirection ) 
         throw(RuntimeException)
 {
         if (dict) {
             result = dict->getWordBoundary(text, anyPos, wordType, bDirection);
             // #109813# for non-CJK, single character word, fallback to ICU breakiterator.
-            if (result.endPos - result.startPos != 1 ||
+            if (result.endPos - result.startPos != 1 || 
                     getScriptType(text, result.startPos) == ScriptType::ASIAN)
                 return result;
         }
diff --git a/i18npool/source/breakiterator/breakiterator_ctl.cxx b/i18npool/source/breakiterator/breakiterator_ctl.cxx
index cc174084198e..6da7b2833acd 100644
--- a/i18npool/source/breakiterator/breakiterator_ctl.cxx
+++ b/i18npool/source/breakiterator/breakiterator_ctl.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
@@ -31,7 +31,7 @@
 #include <com/sun/star/i18n/CharacterIteratorMode.hpp>
 #include <breakiterator_ctl.hxx>
 
-#include <string.h> // for memset
+#include <string.h>	// for memset
 
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::lang;
@@ -71,7 +71,7 @@ sal_Int32 SAL_CALL BreakIterator_CTL::previousCharacters( const OUString& Text,
 {
     if (nCharacterIteratorMode == CharacterIteratorMode::SKIPCELL ) {
         nDone = 0;
-        if (nStartPos > 0) {    // for others to skip cell.
+        if (nStartPos > 0) { 	// for others to skip cell.
         makeIndex(Text, nStartPos);
 
         if (nextCellIndex[nStartPos-1] == 0) // not a CTL character
@@ -81,7 +81,7 @@ sal_Int32 SAL_CALL BreakIterator_CTL::previousCharacters( const OUString& Text,
             nCount--; nDone++;
             nStartPos = previousCellIndex[nStartPos - 1];
         }
-        } else
+        } else 
         nStartPos = 0;
     } else { // for BS to delete one char.
         nDone = (nStartPos > nCount) ? nCount : nStartPos;
@@ -91,7 +91,7 @@ sal_Int32 SAL_CALL BreakIterator_CTL::previousCharacters( const OUString& Text,
     return nStartPos;
 }
 
-sal_Int32 SAL_CALL BreakIterator_CTL::nextCharacters(const OUString& Text,
+sal_Int32 SAL_CALL BreakIterator_CTL::nextCharacters(const OUString& Text, 
     sal_Int32 nStartPos, const lang::Locale& rLocale,
     sal_Int16 nCharacterIteratorMode, sal_Int32 nCount, sal_Int32& nDone)
     throw(RuntimeException)
diff --git a/i18npool/source/breakiterator/breakiterator_th.cxx b/i18npool/source/breakiterator/breakiterator_th.cxx
index cbbcd510379b..77ff283190ed 100644
--- a/i18npool/source/breakiterator/breakiterator_th.cxx
+++ b/i18npool/source/breakiterator/breakiterator_th.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
@@ -30,7 +30,7 @@
 #include <breakiterator_th.hxx>
 #include <wtt.h>
 
-#include <string.h> // for memset
+#include <string.h>	// for memset
 
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::lang;
@@ -38,9 +38,9 @@ using namespace ::rtl;
 
 namespace com { namespace sun { namespace star { namespace i18n {
 
-//  ----------------------------------------------------
-//  class Breakiterator_th
-//  ----------------------------------------------------;
+//	----------------------------------------------------
+//	class Breakiterator_th
+//	----------------------------------------------------;
 BreakIterator_th::BreakIterator_th()
 {
     cBreakIterator = "com.sun.star.i18n.BreakIterator_th";
@@ -57,9 +57,9 @@ BreakIterator_th::~BreakIterator_th()
  * cell composition states
  */
 
-#define ST_COM  1   // Compose the following character with leading char and display in the same cell
-#define ST_NXT  2   // display the following character in the next cell
-#define ST_NDP  3   // non-display
+#define ST_COM	1	// Compose the following character with leading char and display in the same cell
+#define ST_NXT	2	// display the following character in the next cell
+#define ST_NDP	3	// non-display
 
 static const sal_Int16 thaiCompRel[MAX_CT][MAX_CT] = {
     //  C  N  C  L  F  F  F  B  B  B  T  A  A  A  A  A  A
@@ -112,7 +112,7 @@ static sal_Int32 SAL_CALL getACell(const sal_Unicode *text, sal_Int32 pos, sal_I
     return curr;
 }
 
-#define is_Thai(c)  (0x0e00 <= c && c <= 0x0e7f) // Unicode definition for Thai
+#define is_Thai(c)	(0x0e00 <= c && c <= 0x0e7f) // Unicode definition for Thai
 
 void SAL_CALL BreakIterator_th::makeIndex(const OUString& Text, sal_Int32 nStartPos)
     throw(RuntimeException)
diff --git a/i18npool/source/breakiterator/breakiterator_unicode.cxx b/i18npool/source/breakiterator/breakiterator_unicode.cxx
index d7242d180d85..8825096551b8 100644
--- a/i18npool/source/breakiterator/breakiterator_unicode.cxx
+++ b/i18npool/source/breakiterator/breakiterator_unicode.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
@@ -90,7 +90,7 @@ class OOoRuleBasedBreakIterator : public RuleBasedBreakIterator {
             setBreakType(type);
         };
         OOoRuleBasedBreakIterator(UDataMemory* image,
-                UErrorCode &status) :
+                UErrorCode &status) : 
             RuleBasedBreakIterator(image, status) { };
 
 };
@@ -104,7 +104,7 @@ void SAL_CALL BreakIterator_Unicode::loadICUBreakIterator(const com::sun::star::
     sal_Int16 breakType = 0;
     switch (rBreakType) {
         case LOAD_CHARACTER_BREAKITERATOR: icuBI=&character; breakType = 3; break;
-        case LOAD_WORD_BREAKITERATOR: icuBI=&word;
+        case LOAD_WORD_BREAKITERATOR: icuBI=&word; 
             switch (rWordType) {
                 case WordType::ANYWORD_IGNOREWHITESPACES: breakType = 0; rule=wordRule = "edit_word"; break;
                 case WordType::DICTIONARY_WORD: breakType = 1; rule=wordRule = "dict_word"; break;
@@ -131,7 +131,7 @@ void SAL_CALL BreakIterator_Unicode::loadICUBreakIterator(const com::sun::star::
             OOoRuleBasedBreakIterator *rbi = NULL;
 
             if (breakRules.getLength() > breakType && breakRules[breakType].getLength() > 0) {
-                rbi = new OOoRuleBasedBreakIterator(udata_open("OpenOffice", "brk",
+                rbi = new OOoRuleBasedBreakIterator(udata_open("OpenOffice", "brk", 
                     OUStringToOString(breakRules[breakType], RTL_TEXTENCODING_ASCII_US).getStr(), &status), status);
             } else {
                 status = U_ZERO_ERROR;
@@ -197,7 +197,7 @@ void SAL_CALL BreakIterator_Unicode::loadICUBreakIterator(const com::sun::star::
         }
     }
 
-    if (newBreak || icuBI->aICUText.compare(UnicodeString(reinterpret_cast<const UChar *>(rText.getStr()), rText.getLength()))) {   // UChar != sal_Unicode in MinGW
+    if (newBreak || icuBI->aICUText.compare(UnicodeString(reinterpret_cast<const UChar *>(rText.getStr()), rText.getLength()))) {	// UChar != sal_Unicode in MinGW
         icuBI->aICUText=UnicodeString(reinterpret_cast<const UChar *>(rText.getStr()), rText.getLength());
         icuBI->aBreakIterator->setText(icuBI->aICUText);
     }
@@ -380,8 +380,8 @@ LineBreakResults SAL_CALL BreakIterator_Unicode::getLineBreak(
                 Boundary wBoundary = getWordBoundary( Text, nStartPos, rLocale,
                                                 WordType::DICTIONARY_WORD, false);
                 uno::Reference< linguistic2::XHyphenatedWord > aHyphenatedWord;
-                aHyphenatedWord = hOptions.rHyphenator->hyphenate(Text.copy(wBoundary.startPos,
-                    wBoundary.endPos - wBoundary.startPos), rLocale,
+                aHyphenatedWord = hOptions.rHyphenator->hyphenate(Text.copy(wBoundary.startPos, 
+                    wBoundary.endPos - wBoundary.startPos), rLocale, 
                     (sal_Int16) (hOptions.hyphenIndex - wBoundary.startPos), hOptions.aHyphenationOptions);
                 if (aHyphenatedWord.is()) {
                     lbr.rHyphenatedWord = aHyphenatedWord;
diff --git a/i18npool/source/breakiterator/gendict.cxx b/i18npool/source/breakiterator/gendict.cxx
index fe2758602ee4..2506fe322360 100644
--- a/i18npool/source/breakiterator/gendict.cxx
+++ b/i18npool/source/breakiterator/gendict.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
@@ -46,8 +46,8 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv)
 
     if (argc < 3) exit(-1);
 
-    sfp = fopen(argv[1], "rb"); // open the source file for read;
-    if (sfp == NULL)
+    sfp = fopen(argv[1], "rb");	// open the source file for read;
+    if (sfp == NULL) 
     {
         printf("Open the dictionary source file failed.");
         return -1;
@@ -92,7 +92,7 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv)
 
         i=0;
         Ostr.iterateCodePoints(&i, 1);
-        if (len == i) continue; // skip one character word
+        if (len == i) continue;	// skip one character word
 
         if (*u != current) {
         if (*u < current)
@@ -107,8 +107,8 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv)
         lenArray[lenArrayCount++] = lenArrayCurr;
 
         exist[u[0]] = sal_True;
-        for (i = 1; i < len; i++) {     // start from second character,
-        exist[u[i]] = sal_True;     // since the first character is captured in charArray.
+        for (i = 1; i < len; i++) {		// start from second character, 
+        exist[u[i]] = sal_True; 	// since the first character is captured in charArray.
         lenArrayCurr++;
         if ((count++) % 0x10 == 0)
             fprintf(cfp, "\n\t");
@@ -119,7 +119,7 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv)
     charArray[current+1] = lenArrayCount;
     fprintf(cfp, "\n};\n");
 
-    // generate lenArray
+    // generate lenArray 
     fprintf(cfp, "static const sal_Int32 lenArray[] = {\n\t");
     count = 1;
     fprintf(cfp, "0x%x, ", 0); // insert one slat for skipping 0 in index2 array.
@@ -202,4 +202,4 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv)
     fclose(cfp);
 
     return 0;
-}   // End of main
+}	// End of main
diff --git a/i18npool/source/breakiterator/xdictionary.cxx b/i18npool/source/breakiterator/xdictionary.cxx
index aba69b5e9a21..93c95d16075b 100644
--- a/i18npool/source/breakiterator/xdictionary.cxx
+++ b/i18npool/source/breakiterator/xdictionary.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
@@ -111,7 +111,7 @@ xdictionary::xdictionary(const sal_Char *lang) :
 xdictionary::~xdictionary() {
         osl_unloadModule(hModule);
         for (sal_Int32 i = 0; i < CACHE_MAX; i++) {
-            if (cache[i].size > 0) {
+            if (cache[i].size > 0) {    
                 delete cache[i].contents;
                 delete cache[i].wordboundary;
             }
@@ -173,7 +173,7 @@ WordBreakCache::WordBreakCache() :
     wordboundary( NULL ),
     size( 0 )
 {
-}
+}    
 
 /*
  * Compare two unicode string,
@@ -195,7 +195,7 @@ sal_Bool WordBreakCache::equals(const sal_Unicode* str, Boundary& boundary) {
  * @param pos : Position of the given character.
  * @return true if CJK.
  */
-sal_Bool xdictionary::seekSegment(const rtl::OUString &rText, sal_Int32 pos,
+sal_Bool xdictionary::seekSegment(const rtl::OUString &rText, sal_Int32 pos, 
     Boundary& segBoundary)
 {
     sal_Int32 indexUtf16;
@@ -227,7 +227,7 @@ sal_Bool xdictionary::seekSegment(const rtl::OUString &rText, sal_Int32 pos,
 }
 
 #define KANJA       1
-#define KATAKANA    2
+#define KATAKANA    2   
 #define HIRAKANA    3
 
 static sal_Int16 JapaneseCharType(sal_Unicode c)
@@ -255,7 +255,7 @@ WordBreakCache& xdictionary::getCache(const sal_Unicode *text, Boundary& wordBou
                 delete aCache.wordboundary;
                 aCache.size = len;
             }
-            else
+            else 
                 aCache.size = len > DEFAULT_SIZE ? len : DEFAULT_SIZE;
             aCache.contents = new sal_Unicode[aCache.size + 1];
             aCache.wordboundary = new sal_Int32[aCache.size + 2];
diff --git a/i18npool/source/calendar/calendarImpl.cxx b/i18npool/source/calendar/calendarImpl.cxx
index 2d09d047c7cb..82e36faa6aa2 100644
--- a/i18npool/source/calendar/calendarImpl.cxx
+++ b/i18npool/source/calendar/calendarImpl.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
@@ -70,7 +70,7 @@ CalendarImpl::loadCalendar(const OUString& uniqueID, const Locale& rLocale ) thr
 {
     Reference < XExtendedCalendar > xOldCalendar( xCalendar );  // backup
     sal_Int32 i;
-
+    
     for (i = 0; i < sal::static_int_cast<sal_Int32>(lookupTable.size()); i++) {
         lookupTableItem *listItem = lookupTable[i];
         if (uniqueID == listItem->uniqueID) {
@@ -290,7 +290,7 @@ CalendarImpl::isValid() throw(RuntimeException)
         throw ERROR ;
 }
 
-OUString SAL_CALL
+OUString SAL_CALL 
 CalendarImpl::getDisplayString( sal_Int32 nCalendarDisplayCode, sal_Int16 nNativeNumberMode )
     throw (RuntimeException)
 {
diff --git a/i18npool/source/calendar/calendar_gregorian.cxx b/i18npool/source/calendar/calendar_gregorian.cxx
index 727a6f601ba3..91be195728af 100644
--- a/i18npool/source/calendar/calendar_gregorian.cxx
+++ b/i18npool/source/calendar/calendar_gregorian.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
@@ -146,24 +146,24 @@ Calendar_gregorian::init(Era *_eraArray)
 {
         cCalendar = "com.sun.star.i18n.Calendar_gregorian";
 
-        // #i102356# With icu::Calendar::createInstance(UErrorCode) in a Thai
-        // th_TH system locale we accidentally used a Buddhist calendar. Though
-        // the ICU documentation says that should be the case only for
-        // th_TH_TRADITIONAL (and ja_JP_TRADITIONAL Gengou), a plain th_TH
-        // already triggers that behavior, ja_JP does not. Strange enough,
-        // passing a th_TH locale to the calendar creation doesn't trigger
+        // #i102356# With icu::Calendar::createInstance(UErrorCode) in a Thai 
+        // th_TH system locale we accidentally used a Buddhist calendar. Though 
+        // the ICU documentation says that should be the case only for 
+        // th_TH_TRADITIONAL (and ja_JP_TRADITIONAL Gengou), a plain th_TH 
+        // already triggers that behavior, ja_JP does not. Strange enough, 
+        // passing a th_TH locale to the calendar creation doesn't trigger 
         // this.
         // See also http://userguide.icu-project.org/datetime/calendar
 
-        // Whatever ICU offers as the default calendar for a locale, ensure we
+        // Whatever ICU offers as the default calendar for a locale, ensure we 
         // have a Gregorian calendar as requested.
 
-        /* XXX: with the current implementation the aLocale member variable is
+        /* XXX: with the current implementation the aLocale member variable is 
          * not set prior to loading a calendar from locale data. This
-         * creates an empty (root) locale for ICU, but at least the correct
-         * calendar is used. The language part must not be NULL (respectively
-         * not all, language and country and variant), otherwise the current
-         * default locale would be used again and the calendar keyword ignored.
+         * creates an empty (root) locale for ICU, but at least the correct 
+         * calendar is used. The language part must not be NULL (respectively 
+         * not all, language and country and variant), otherwise the current 
+         * default locale would be used again and the calendar keyword ignored. 
          * */
         icu::Locale aIcuLocale( "", NULL, NULL, "calendar=gregorian");
 
@@ -212,7 +212,7 @@ Calendar_hanja::getDisplayName( sal_Int16 displayIndex, sal_Int16 idx, sal_Int16
 void SAL_CALL
 Calendar_hanja::loadCalendar( const OUString& /*uniqueID*/, const com::sun::star::lang::Locale& rLocale ) throw(RuntimeException)
 {
-        // Since this class could be called by service name 'hanja_yoil', we have to
+        // Since this class could be called by service name 'hanja_yoil', we have to 
         // rename uniqueID to get right calendar defined in locale data.
         Calendar_gregorian::loadCalendar(OUString::createFromAscii("hanja"), rLocale);
 }
@@ -429,7 +429,7 @@ bool Calendar_gregorian::getDSTOffset( sal_Int32 & o_nOffset ) const
 void Calendar_gregorian::submitFields() throw(com::sun::star::uno::RuntimeException)
 {
     for (sal_Int16 fieldIndex = 0; fieldIndex < FIELD_INDEX_COUNT; fieldIndex++)
-    {
+    { 
         if (fieldSet & (1 << fieldIndex))
         {
             switch (fieldIndex)
@@ -602,7 +602,7 @@ void Calendar_gregorian::setValue() throw(RuntimeException)
                 nDST1 = 0;
         }
 
-        // The original submission, may lead to a different zone/DST and
+        // The original submission, may lead to a different zone/DST and 
         // different date.
         submitFields();
         DUMP_ICU_CAL_MSG(("%s\n","setValue() after original submission"));
@@ -625,11 +625,11 @@ void Calendar_gregorian::setValue() throw(RuntimeException)
                 // is not what we want.
                 // Resubmit all values, this time including DST => date 01:00
                 // Similar for zone differences.
-                // If already the first full submission with nZone0 and nDST0
-                // lead to date-1 23:00, the original submission was based on
-                // that date if it wasn't a full date (nDST0 set, nDST1 not
-                // set, nDST2==nDST1). If it was January 1st without year we're
-                // even off by one year now. Resubmit all values including new
+                // If already the first full submission with nZone0 and nDST0 
+                // lead to date-1 23:00, the original submission was based on 
+                // that date if it wasn't a full date (nDST0 set, nDST1 not 
+                // set, nDST2==nDST1). If it was January 1st without year we're 
+                // even off by one year now. Resubmit all values including new 
                 // DST => date 00:00.
 
                 // Set field values accordingly in case they were used.
@@ -798,7 +798,7 @@ Calendar_gregorian::isValid() throw(RuntimeException)
 // NatNum3              NatNum3/3/3/3   NatNum3/3/3/3   NatNum3/3/3/3   NatNum3/3/3/3
 // NatNum4                                                              NatNum9/9/11/11
 
-static sal_Int16 SAL_CALL NatNumForCalendar(const com::sun::star::lang::Locale& aLocale,
+static sal_Int16 SAL_CALL NatNumForCalendar(const com::sun::star::lang::Locale& aLocale, 
         sal_Int32 nCalendarDisplayCode, sal_Int16 nNativeNumberMode, sal_Int16 value )
 {
     sal_Bool isShort = ((nCalendarDisplayCode == CalendarDisplayCode::SHORT_YEAR ||
@@ -811,7 +811,7 @@ static sal_Int16 SAL_CALL NatNumForCalendar(const com::sun::star::lang::Locale&
 
     if (isChinese || isJapanese || isKorean) {
         switch (nNativeNumberMode) {
-            case NativeNumberMode::NATNUM1:
+            case NativeNumberMode::NATNUM1: 
                 if (!isShort)
                     nNativeNumberMode = isJapanese ? NativeNumberMode::NATNUM4 : NativeNumberMode::NATNUM7;
                 break;
@@ -834,27 +834,27 @@ static sal_Int16 SAL_CALL NatNumForCalendar(const com::sun::star::lang::Locale&
 static sal_Int32 SAL_CALL DisplayCode2FieldIndex(sal_Int32 nCalendarDisplayCode)
 {
     switch( nCalendarDisplayCode ) {
-        case CalendarDisplayCode::SHORT_DAY:
-        case CalendarDisplayCode::LONG_DAY:
+        case CalendarDisplayCode::SHORT_DAY: 
+        case CalendarDisplayCode::LONG_DAY: 
             return CalendarFieldIndex::DAY_OF_MONTH;
-        case CalendarDisplayCode::SHORT_DAY_NAME:
-        case CalendarDisplayCode::LONG_DAY_NAME:
+        case CalendarDisplayCode::SHORT_DAY_NAME: 
+        case CalendarDisplayCode::LONG_DAY_NAME: 
             return CalendarFieldIndex::DAY_OF_WEEK;
-        case CalendarDisplayCode::SHORT_QUARTER:
-        case CalendarDisplayCode::LONG_QUARTER:
-        case CalendarDisplayCode::SHORT_MONTH:
-        case CalendarDisplayCode::LONG_MONTH:
-        case CalendarDisplayCode::SHORT_MONTH_NAME:
-        case CalendarDisplayCode::LONG_MONTH_NAME:
+        case CalendarDisplayCode::SHORT_QUARTER: 
+        case CalendarDisplayCode::LONG_QUARTER: 
+        case CalendarDisplayCode::SHORT_MONTH: 
+        case CalendarDisplayCode::LONG_MONTH: 
+        case CalendarDisplayCode::SHORT_MONTH_NAME: 
+        case CalendarDisplayCode::LONG_MONTH_NAME: 
             return CalendarFieldIndex::MONTH;
-        case CalendarDisplayCode::SHORT_YEAR:
-        case CalendarDisplayCode::LONG_YEAR:
+        case CalendarDisplayCode::SHORT_YEAR: 
+        case CalendarDisplayCode::LONG_YEAR: 
             return CalendarFieldIndex::YEAR;
-        case CalendarDisplayCode::SHORT_ERA:
-        case CalendarDisplayCode::LONG_ERA:
+        case CalendarDisplayCode::SHORT_ERA: 
+        case CalendarDisplayCode::LONG_ERA: 
             return CalendarFieldIndex::ERA;
-        case CalendarDisplayCode::SHORT_YEAR_AND_ERA:
-        case CalendarDisplayCode::LONG_YEAR_AND_ERA:
+        case CalendarDisplayCode::SHORT_YEAR_AND_ERA: 
+        case CalendarDisplayCode::LONG_YEAR_AND_ERA: 
             return CalendarFieldIndex::YEAR;
         default:
             return 0;
@@ -957,7 +957,7 @@ Calendar_gregorian::getDisplayName( sal_Int16 displayIndex, sal_Int16 idx, sal_I
 }
 
 // Methods in XExtendedCalendar
-OUString SAL_CALL
+OUString SAL_CALL 
 Calendar_gregorian::getDisplayString( sal_Int32 nCalendarDisplayCode, sal_Int16 nNativeNumberMode )
         throw (RuntimeException)
 {
@@ -975,7 +975,7 @@ Calendar_gregorian::getDisplayString( sal_Int32 nCalendarDisplayCode, sal_Int16
         // number of months, divide by 4 and then use that result to divide the
         // actual month value.
         if ( quarter > 3 )
-            quarter = 3;
+            quarter = 3;    
         quarter = sal::static_int_cast<sal_Int16>( quarter +
             ((nCalendarDisplayCode == CalendarDisplayCode::SHORT_QUARTER) ?
             reservedWords::QUARTER1_ABBREVIATION : reservedWords::QUARTER1_WORD) );
@@ -986,23 +986,23 @@ Calendar_gregorian::getDisplayString( sal_Int32 nCalendarDisplayCode, sal_Int16
         // having that comment triggers alarm ;-)
         sal_Char aStr[10];
         switch( nCalendarDisplayCode ) {
-            case CalendarDisplayCode::SHORT_MONTH:
+            case CalendarDisplayCode::SHORT_MONTH: 
                 value += 1;     // month is zero based
                 // fall thru
-            case CalendarDisplayCode::SHORT_DAY:
+            case CalendarDisplayCode::SHORT_DAY: 
                 sprintf(aStr, "%d", value);     // #100211# - checked
                 break;
-            case CalendarDisplayCode::LONG_YEAR:
+            case CalendarDisplayCode::LONG_YEAR: 
                 if (aCalendar.Name.equalsAscii("gengou"))
                     sprintf(aStr, "%02d", value);     // #100211# - checked
                 else
                     sprintf(aStr, "%d", value);     // #100211# - checked
                 break;
-            case CalendarDisplayCode::LONG_MONTH:
+            case CalendarDisplayCode::LONG_MONTH: 
                 value += 1;     // month is zero based
                 sprintf(aStr, "%02d", value);   // #100211# - checked
                 break;
-            case CalendarDisplayCode::SHORT_YEAR:
+            case CalendarDisplayCode::SHORT_YEAR: 
                 // Take last 2 digits, or only one if vallue<10, for example,
                 // in case of the Gengou calendar.
                 if (value < 100)
@@ -1010,28 +1010,28 @@ Calendar_gregorian::getDisplayString( sal_Int32 nCalendarDisplayCode, sal_Int16
                 else
                     sprintf(aStr, "%02d", value % 100); // #100211# - checked
                 break;
-            case CalendarDisplayCode::LONG_DAY:
+            case CalendarDisplayCode::LONG_DAY: 
                 sprintf(aStr, "%02d", value);   // #100211# - checked
                 break;
 
-            case CalendarDisplayCode::SHORT_DAY_NAME:
+            case CalendarDisplayCode::SHORT_DAY_NAME: 
                 return getDisplayName(CalendarDisplayIndex::DAY, value, 0);
-            case CalendarDisplayCode::LONG_DAY_NAME:
+            case CalendarDisplayCode::LONG_DAY_NAME: 
                 return getDisplayName(CalendarDisplayIndex::DAY, value, 1);
-            case CalendarDisplayCode::SHORT_MONTH_NAME:
+            case CalendarDisplayCode::SHORT_MONTH_NAME: 
                 return getDisplayName(CalendarDisplayIndex::MONTH, value, 0);
-            case CalendarDisplayCode::LONG_MONTH_NAME:
+            case CalendarDisplayCode::LONG_MONTH_NAME: 
                 return getDisplayName(CalendarDisplayIndex::MONTH, value, 1);
-            case CalendarDisplayCode::SHORT_ERA:
+            case CalendarDisplayCode::SHORT_ERA: 
                 return getDisplayName(CalendarDisplayIndex::ERA, value, 0);
-            case CalendarDisplayCode::LONG_ERA:
+            case CalendarDisplayCode::LONG_ERA: 
                 return getDisplayName(CalendarDisplayIndex::ERA, value, 1);
 
-            case CalendarDisplayCode::SHORT_YEAR_AND_ERA:
+            case CalendarDisplayCode::SHORT_YEAR_AND_ERA: 
                 return  getDisplayString( CalendarDisplayCode::SHORT_ERA, nNativeNumberMode ) +
                     getDisplayString( CalendarDisplayCode::SHORT_YEAR, nNativeNumberMode );
 
-            case CalendarDisplayCode::LONG_YEAR_AND_ERA:
+            case CalendarDisplayCode::LONG_YEAR_AND_ERA: 
                 return  getDisplayString( CalendarDisplayCode::LONG_ERA, nNativeNumberMode ) +
                     getDisplayString( CalendarDisplayCode::LONG_YEAR, nNativeNumberMode );
 
@@ -1058,12 +1058,12 @@ Calendar_gregorian::getDisplayString( sal_Int32 nCalendarDisplayCode, sal_Int16
 }
 
 // Methods in XExtendedCalendar
-OUString SAL_CALL
+OUString SAL_CALL 
 Calendar_buddhist::getDisplayString( sal_Int32 nCalendarDisplayCode, sal_Int16 nNativeNumberMode )
         throw (RuntimeException)
 {
     // make year and era in different order for year before and after 0.
-    if ((nCalendarDisplayCode == CalendarDisplayCode::LONG_YEAR_AND_ERA ||
+    if ((nCalendarDisplayCode == CalendarDisplayCode::LONG_YEAR_AND_ERA || 
                 nCalendarDisplayCode == CalendarDisplayCode::SHORT_YEAR_AND_ERA) &&
             getValue(CalendarFieldIndex::ERA) == 0) {
         if (nCalendarDisplayCode == CalendarDisplayCode::LONG_YEAR_AND_ERA)
diff --git a/i18npool/source/calendar/calendar_hijri.cxx b/i18npool/source/calendar/calendar_hijri.cxx
index dcf651098574..87f540e4037d 100644
--- a/i18npool/source/calendar/calendar_hijri.cxx
+++ b/i18npool/source/calendar/calendar_hijri.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
@@ -46,23 +46,23 @@ using namespace ::rtl;
 //static UErrorCode status; // status is shared in all calls to Calendar, it has to be reset for each call.
 
 // radians per degree (pi/180)
-const double Calendar_hijri::RadPerDeg      = 0.01745329251994329577;
+const double Calendar_hijri::RadPerDeg		= 0.01745329251994329577;
 
 // Synodic Period (mean time between 2 successive new moon: 29d, 12 hr, 44min, 3sec
-const double Calendar_hijri::SynPeriod      = 29.53058868;
-const double Calendar_hijri::SynMonth       = 365.25/29.53058868;   // Solar days in a year/SynPeriod
+const double Calendar_hijri::SynPeriod		= 29.53058868;
+const double Calendar_hijri::SynMonth		= 365.25/29.53058868;	// Solar days in a year/SynPeriod
 
 // Julian day on Jan 1, 1900
-const double Calendar_hijri::jd1900     = 2415020.75933;
+const double Calendar_hijri::jd1900		= 2415020.75933;
 
 // Reference point: March 26, 2001 == 1422 Hijri == 1252 Synodial month from 1900
-const sal_Int32 Calendar_hijri::SynRef      = 1252;
-const sal_Int32 Calendar_hijri::GregRef     = 1422;
+const sal_Int32 Calendar_hijri::SynRef		= 1252;
+const sal_Int32 Calendar_hijri::GregRef		= 1422;
 
 // Local time specific to Saudi Arabia
-const double Calendar_hijri::SA_TimeZone    = 3.0;
+const double Calendar_hijri::SA_TimeZone	= 3.0;
 
-const double Calendar_hijri::EveningPeriod  = 6.0;
+const double Calendar_hijri::EveningPeriod	= 6.0;
 
 const sal_Int32 Calendar_hijri::LeapYear[] = {
     2, 5, 7, 10, 13, 16, 18, 21, 24, 26, 29
@@ -73,7 +73,7 @@ Calendar_hijri::Calendar_hijri()
     cCalendar = "com.sun.star.i18n.Calendar_hijri";
 }
 
-#define FIELDS  ((1 << CalendarFieldIndex::ERA) | (1 << CalendarFieldIndex::YEAR) | (1 << CalendarFieldIndex::MONTH) | (1 << CalendarFieldIndex::DAY_OF_MONTH))
+#define FIELDS  ((1 << CalendarFieldIndex::ERA) | (1 << CalendarFieldIndex::YEAR) | (1 << CalendarFieldIndex::MONTH) | (1 << CalendarFieldIndex::DAY_OF_MONTH)) 
 
 // map field value from hijri calendar to gregorian calendar
 void Calendar_hijri::mapToGregorian() throw(RuntimeException)
@@ -119,7 +119,7 @@ void Calendar_hijri::mapFromGregorian() throw(RuntimeException)
 // This function returns the Julian date/time of the Nth new moon since
 // January 1900.  The synodic month is passed as parameter.
 //
-// Adapted from "Astronomical  Formulae for Calculators" by
+// Adapted from "Astronomical  Formulae for Calculators" by 
 // Jean Meeus, Third Edition, Willmann-Bell, 1985.
 //
 double
@@ -127,7 +127,7 @@ Calendar_hijri::NewMoon(sal_Int32 n)
 {
     double jd, t, t2, t3, k, ma, sa, tf, xtra;
     k = n;
-    t = k/1236.85;  // Time in Julian centuries from 1900 January 0.5
+    t = k/1236.85;	// Time in Julian centuries from 1900 January 0.5
     t2 = t * t;
     t3 = t2 * t;
 
@@ -135,17 +135,17 @@ Calendar_hijri::NewMoon(sal_Int32 n)
     jd =  jd1900
         + SynPeriod * k
         - 0.0001178 * t2
-        - 0.000000155 * t3
+        - 0.000000155 * t3 
         + 0.00033 * sin(RadPerDeg * (166.56 + 132.87 * t - 0.009173 * t2));
 
     // Sun's mean anomaly in radian
     sa =  RadPerDeg * (359.2242
-                + 29.10535608 * k
+                + 29.10535608 * k 
                 - 0.0000333 * t2
                 - 0.00000347 * t3);
 
     // Moon's mean anomaly
-    ma =  RadPerDeg * (306.0253
+    ma =  RadPerDeg * (306.0253 
                 + 385.81691806 * k
                 + 0.0107306 * t2
                 + 0.00001236 * t3);
@@ -183,7 +183,7 @@ void
 Calendar_hijri::getHijri(sal_Int32 *day, sal_Int32 *month, sal_Int32 *year)
 {
     double prevday;
-//  double dayfraction;
+//	double dayfraction;
     sal_Int32 syndiff;
     sal_Int32 newsyn;
     double newjd;
@@ -212,7 +212,7 @@ Calendar_hijri::getHijri(sal_Int32 *day, sal_Int32 *month, sal_Int32 *year)
 
     // Round up the day
     *day = (sal_Int32)(((sal_Int32)julday) - newjd + 0.5);
-    *month =  (syndiff % 12) + 1;
+    *month =  (syndiff % 12) + 1; 
 
     // currently not supported
     //dayOfYear = (sal_Int32)(month * SynPeriod + day);
diff --git a/i18npool/source/calendar/calendar_jewish.cxx b/i18npool/source/calendar/calendar_jewish.cxx
index 34ad13f1d384..db8888a771a9 100644
--- a/i18npool/source/calendar/calendar_jewish.cxx
+++ b/i18npool/source/calendar/calendar_jewish.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
@@ -137,17 +137,17 @@ sal_Int32 LastDayOfHebrewMonth(sal_Int32 month, sal_Int32 year) {
     else
         return 30;
 }
-
+  
 
 class HebrewDate {
 private:
     sal_Int32 year;   // 1...
     sal_Int32 month;  // 1..LastMonthOfHebrewYear(year)
     sal_Int32 day;    // 1..LastDayOfHebrewMonth(month, year)
-
+  
 public:
     HebrewDate(sal_Int32 m, sal_Int32 d, sal_Int32 y) { month = m; day = d; year = y; }
-
+  
     HebrewDate(sal_Int32 d) { // Computes the Hebrew date from the absolute date.
     year = (d + HebrewEpoch) / 366; // Approximation from below.
     // Search forward for year from the approximation.
@@ -163,7 +163,7 @@ public:
     // Calculate the day by subtraction.
     day = d - HebrewDate(month, 1, year) + 1;
     }
-
+  
     operator int() { // Computes the absolute date of Hebrew date.
     sal_Int32 DayInYear = day; // Days so far this month.
     if (month < 7) { // Before Tishri, so add days in prior months
@@ -190,13 +190,13 @@ public:
         (HebrewCalendarElapsedDays(year)// Days in prior years.
          + HebrewEpoch));         // Days elapsed before absolute date 1.
     }
-
+  
     sal_Int32 GetMonth() { return month; }
     sal_Int32 GetDay() { return day; }
     sal_Int32 GetYear() { return year; }
-
+  
 };
-
+  
 //  Gregorian dates
 
 int LastDayOfGregorianMonth(int month, int year) {
@@ -222,7 +222,7 @@ private:
     int year;   // 1...
     int month;  // 1 == January, ..., 12 == December
     int day;    // 1..LastDayOfGregorianMonth(month, year)
-
+  
 public:
     GregorianDate(int m, int d, int y) { month = m; day = d; year = y; }
 
@@ -271,8 +271,8 @@ void Calendar_jewish::mapFromGregorian() throw(RuntimeException)
     fieldValue[CalendarFieldIndex::YEAR] = (sal_Int16)(hd.GetYear() <= 0 ? 1 - hd.GetYear() : hd.GetYear());
 }
 
-#define FIELDS  ((1 << CalendarFieldIndex::ERA) | (1 << CalendarFieldIndex::YEAR) | (1 << CalendarFieldIndex::MONTH) | (1 << CalendarFieldIndex::DAY_OF_MONTH))
-// map field value from other calendar to gregorian calendar, it should be implemented.
+#define FIELDS  ((1 << CalendarFieldIndex::ERA) | (1 << CalendarFieldIndex::YEAR) | (1 << CalendarFieldIndex::MONTH) | (1 << CalendarFieldIndex::DAY_OF_MONTH)) 
+// map field value from other calendar to gregorian calendar, it should be implemented. 
 void Calendar_jewish::mapToGregorian() throw(RuntimeException)
 {
     if (fieldSet & FIELDS) {
@@ -291,7 +291,7 @@ void Calendar_jewish::mapToGregorian() throw(RuntimeException)
 }
 
 // Methods in XExtendedCalendar
-OUString SAL_CALL
+OUString SAL_CALL 
 Calendar_jewish::getDisplayString( sal_Int32 nCalendarDisplayCode, sal_Int16 nNativeNumberMode )
     throw (RuntimeException)
 {
diff --git a/i18npool/source/characterclassification/cclass_unicode.cxx b/i18npool/source/characterclassification/cclass_unicode.cxx
index 045512e61258..bdecfb2032c1 100644
--- a/i18npool/source/characterclassification/cclass_unicode.cxx
+++ b/i18npool/source/characterclassification/cclass_unicode.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
@@ -41,9 +41,9 @@ using namespace ::com::sun::star::lang;
 using namespace ::rtl;
 
 namespace com { namespace sun { namespace star { namespace i18n {
-//  ----------------------------------------------------
-//  class cclass_Unicode
-//  ----------------------------------------------------;
+//	----------------------------------------------------
+//	class cclass_Unicode
+//	----------------------------------------------------;
 
 cclass_Unicode::cclass_Unicode( uno::Reference < XMultiServiceFactory > xSMgr ) : xMSF( xSMgr ),
         pTable( NULL ),
@@ -92,7 +92,7 @@ cclass_Unicode::toLower( const OUString& Text, sal_Int32 nPos, sal_Int32 nCount,
 OUString SAL_CALL
 cclass_Unicode::toTitle( const OUString& Text, sal_Int32 nPos, sal_Int32 nCount, const Locale& rLocale ) throw(RuntimeException) {
     sal_Int32 len = Text.getLength();
-    if (nPos >= len)
+    if (nPos >= len) 
         return OUString();
     if (nCount + nPos > len)
         nCount = len - nPos;
@@ -101,11 +101,11 @@ cclass_Unicode::toTitle( const OUString& Text, sal_Int32 nPos, sal_Int32 nCount,
     rtl_uString* pStr = x_rtl_uString_new_WithLength( nCount, 1 );
     sal_Unicode* out = pStr->buffer;
     BreakIteratorImpl brk(xMSF);
-    Boundary bdy = brk.getWordBoundary(Text, nPos, rLocale,
+    Boundary bdy = brk.getWordBoundary(Text, nPos, rLocale, 
                 WordType::ANYWORD_IGNOREWHITESPACES, sal_True);
     for (sal_Int32 i = nPos; i < nCount + nPos; i++, out++) {
         if (i >= bdy.endPos)
-            bdy = brk.nextWord(Text, bdy.endPos, rLocale,
+            bdy = brk.nextWord(Text, bdy.endPos, rLocale, 
                         WordType::ANYWORD_IGNOREWHITESPACES);
         *out = (i == bdy.startPos) ?
             trans->transliterateChar2Char(Text[i]) : Text[i];
@@ -137,7 +137,7 @@ cclass_Unicode::getScript( const OUString& Text, sal_Int32 nPos ) throw(RuntimeE
 }
 
 
-sal_Int32 SAL_CALL
+sal_Int32 SAL_CALL 
 cclass_Unicode::getCharType( const OUString& Text, sal_Int32* nPos, sal_Int32 increment) {
     using namespace ::com::sun::star::i18n::KCharacterType;
 
diff --git a/i18npool/source/characterclassification/cclass_unicode_parser.cxx b/i18npool/source/characterclassification/cclass_unicode_parser.cxx
index 2abd7eb90539..0e4c72db4f0e 100644
--- a/i18npool/source/characterclassification/cclass_unicode_parser.cxx
+++ b/i18npool/source/characterclassification/cclass_unicode_parser.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
@@ -38,7 +38,7 @@
 #include <com/sun/star/i18n/XLocaleData.hpp>
 #include <com/sun/star/i18n/NativeNumberMode.hpp>
 
-#include <string.h>     // memcpy()
+#include <string.h>		// memcpy()
 
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::lang;
@@ -46,25 +46,25 @@ using namespace ::rtl;
 
 namespace com { namespace sun { namespace star { namespace i18n {
 
-const UPT_FLAG_TYPE cclass_Unicode::TOKEN_ILLEGAL       = 0x00000000;
-const UPT_FLAG_TYPE cclass_Unicode::TOKEN_CHAR          = 0x00000001;
-const UPT_FLAG_TYPE cclass_Unicode::TOKEN_CHAR_BOOL = 0x00000002;
-const UPT_FLAG_TYPE cclass_Unicode::TOKEN_CHAR_WORD = 0x00000004;
-const UPT_FLAG_TYPE cclass_Unicode::TOKEN_CHAR_VALUE    = 0x00000008;
-const UPT_FLAG_TYPE cclass_Unicode::TOKEN_CHAR_STRING   = 0x00000010;
+const UPT_FLAG_TYPE cclass_Unicode::TOKEN_ILLEGAL		= 0x00000000;
+const UPT_FLAG_TYPE cclass_Unicode::TOKEN_CHAR			= 0x00000001;
+const UPT_FLAG_TYPE cclass_Unicode::TOKEN_CHAR_BOOL	= 0x00000002;
+const UPT_FLAG_TYPE cclass_Unicode::TOKEN_CHAR_WORD	= 0x00000004;
+const UPT_FLAG_TYPE cclass_Unicode::TOKEN_CHAR_VALUE	= 0x00000008;
+const UPT_FLAG_TYPE cclass_Unicode::TOKEN_CHAR_STRING	= 0x00000010;
 const UPT_FLAG_TYPE cclass_Unicode::TOKEN_CHAR_DONTCARE= 0x00000020;
-const UPT_FLAG_TYPE cclass_Unicode::TOKEN_BOOL          = 0x00000040;
-const UPT_FLAG_TYPE cclass_Unicode::TOKEN_WORD          = 0x00000080;
-const UPT_FLAG_TYPE cclass_Unicode::TOKEN_WORD_SEP      = 0x00000100;
-const UPT_FLAG_TYPE cclass_Unicode::TOKEN_VALUE     = 0x00000200;
-const UPT_FLAG_TYPE cclass_Unicode::TOKEN_VALUE_SEP = 0x00000400;
-const UPT_FLAG_TYPE cclass_Unicode::TOKEN_VALUE_EXP = 0x00000800;
-const UPT_FLAG_TYPE cclass_Unicode::TOKEN_VALUE_SIGN    = 0x00001000;
-const UPT_FLAG_TYPE cclass_Unicode::TOKEN_VALUE_EXP_VALUE   = 0x00002000;
-const UPT_FLAG_TYPE cclass_Unicode::TOKEN_VALUE_DIGIT   = 0x00004000;
-const UPT_FLAG_TYPE cclass_Unicode::TOKEN_NAME_SEP      = 0x20000000;
-const UPT_FLAG_TYPE cclass_Unicode::TOKEN_STRING_SEP    = 0x40000000;
-const UPT_FLAG_TYPE cclass_Unicode::TOKEN_EXCLUDED      = 0x80000000;
+const UPT_FLAG_TYPE cclass_Unicode::TOKEN_BOOL			= 0x00000040;
+const UPT_FLAG_TYPE cclass_Unicode::TOKEN_WORD			= 0x00000080;
+const UPT_FLAG_TYPE cclass_Unicode::TOKEN_WORD_SEP		= 0x00000100;
+const UPT_FLAG_TYPE cclass_Unicode::TOKEN_VALUE		= 0x00000200;
+const UPT_FLAG_TYPE cclass_Unicode::TOKEN_VALUE_SEP	= 0x00000400;
+const UPT_FLAG_TYPE cclass_Unicode::TOKEN_VALUE_EXP	= 0x00000800;
+const UPT_FLAG_TYPE cclass_Unicode::TOKEN_VALUE_SIGN	= 0x00001000;
+const UPT_FLAG_TYPE cclass_Unicode::TOKEN_VALUE_EXP_VALUE	= 0x00002000;
+const UPT_FLAG_TYPE cclass_Unicode::TOKEN_VALUE_DIGIT	= 0x00004000;
+const UPT_FLAG_TYPE cclass_Unicode::TOKEN_NAME_SEP		= 0x20000000;
+const UPT_FLAG_TYPE cclass_Unicode::TOKEN_STRING_SEP	= 0x40000000;
+const UPT_FLAG_TYPE cclass_Unicode::TOKEN_EXCLUDED		= 0x80000000;
 
 #define TOKEN_DIGIT_FLAGS (TOKEN_CHAR_VALUE | TOKEN_VALUE | TOKEN_VALUE_EXP | TOKEN_VALUE_EXP_VALUE | TOKEN_VALUE_DIGIT)
 
@@ -75,7 +75,7 @@ const UPT_FLAG_TYPE cclass_Unicode::pDefaultParserTable[ nDefCnt ] =
 {
 // (...) == Calc formula compiler specific, commented out and modified
 
-    /* \0 */    TOKEN_EXCLUDED,
+    /* \0 */	TOKEN_EXCLUDED,
                 TOKEN_ILLEGAL,
                 TOKEN_ILLEGAL,
                 TOKEN_ILLEGAL,
@@ -84,9 +84,9 @@ const UPT_FLAG_TYPE cclass_Unicode::pDefaultParserTable[ nDefCnt ] =
                 TOKEN_ILLEGAL,
                 TOKEN_ILLEGAL,
                 TOKEN_ILLEGAL,
-    /*  9 \t */ TOKEN_CHAR_DONTCARE | TOKEN_WORD_SEP | TOKEN_VALUE_SEP,     // (TOKEN_ILLEGAL)
+    /*  9 \t */	TOKEN_CHAR_DONTCARE | TOKEN_WORD_SEP | TOKEN_VALUE_SEP,		// (TOKEN_ILLEGAL)
                 TOKEN_ILLEGAL,
-    /* 11 \v */ TOKEN_CHAR_DONTCARE | TOKEN_WORD_SEP | TOKEN_VALUE_SEP,     // (TOKEN_ILLEGAL)
+    /* 11 \v */	TOKEN_CHAR_DONTCARE | TOKEN_WORD_SEP | TOKEN_VALUE_SEP,		// (TOKEN_ILLEGAL)
                 TOKEN_ILLEGAL,
                 TOKEN_ILLEGAL,
                 TOKEN_ILLEGAL,
@@ -107,111 +107,111 @@ const UPT_FLAG_TYPE cclass_Unicode::pDefaultParserTable[ nDefCnt ] =
                 TOKEN_ILLEGAL,
                 TOKEN_ILLEGAL,
                 TOKEN_ILLEGAL,
-    /*  32   */ TOKEN_CHAR_DONTCARE | TOKEN_WORD_SEP | TOKEN_VALUE_SEP,
-    /*  33 ! */ TOKEN_CHAR | TOKEN_WORD_SEP | TOKEN_VALUE_SEP,
-    /*  34 " */ TOKEN_CHAR_STRING | TOKEN_STRING_SEP,
-    /*  35 # */ TOKEN_CHAR | TOKEN_WORD_SEP | TOKEN_VALUE_SEP,  // (TOKEN_WORD_SEP)
-    /*  36 $ */ TOKEN_CHAR | TOKEN_WORD_SEP | TOKEN_VALUE_SEP,  // (TOKEN_CHAR_WORD | TOKEN_WORD)
-    /*  37 % */ TOKEN_CHAR | TOKEN_WORD_SEP | TOKEN_VALUE_SEP,  // (TOKEN_VALUE)
-    /*  38 & */ TOKEN_CHAR | TOKEN_WORD_SEP | TOKEN_VALUE_SEP,
-    /*  39 ' */ TOKEN_NAME_SEP,
-    /*  40 ( */ TOKEN_CHAR | TOKEN_WORD_SEP | TOKEN_VALUE_SEP,
-    /*  41 ) */ TOKEN_CHAR | TOKEN_WORD_SEP | TOKEN_VALUE_SEP,
-    /*  42 * */ TOKEN_CHAR | TOKEN_WORD_SEP | TOKEN_VALUE_SEP,
-    /*  43 + */ TOKEN_CHAR | TOKEN_WORD_SEP | TOKEN_VALUE_SEP | TOKEN_VALUE_EXP | TOKEN_VALUE_SIGN,
-    /*  44 , */ TOKEN_CHAR | TOKEN_WORD_SEP | TOKEN_VALUE_SEP,  // (TOKEN_CHAR_VALUE | TOKEN_VALUE)
-    /*  45 - */ TOKEN_CHAR | TOKEN_WORD_SEP | TOKEN_VALUE_SEP | TOKEN_VALUE_EXP | TOKEN_VALUE_SIGN,
-    /*  46 . */ TOKEN_CHAR | TOKEN_WORD_SEP | TOKEN_VALUE_SEP,  // (TOKEN_WORD | TOKEN_CHAR_VALUE | TOKEN_VALUE)
-    /*  47 / */ TOKEN_CHAR | TOKEN_WORD_SEP | TOKEN_VALUE_SEP,
+    /*  32   */	TOKEN_CHAR_DONTCARE | TOKEN_WORD_SEP | TOKEN_VALUE_SEP,
+    /*  33 ! */	TOKEN_CHAR | TOKEN_WORD_SEP | TOKEN_VALUE_SEP,
+    /*  34 " */	TOKEN_CHAR_STRING | TOKEN_STRING_SEP,
+    /*  35 # */	TOKEN_CHAR | TOKEN_WORD_SEP | TOKEN_VALUE_SEP,	// (TOKEN_WORD_SEP)
+    /*  36 $ */	TOKEN_CHAR | TOKEN_WORD_SEP | TOKEN_VALUE_SEP,	// (TOKEN_CHAR_WORD | TOKEN_WORD)
+    /*  37 % */	TOKEN_CHAR | TOKEN_WORD_SEP | TOKEN_VALUE_SEP,	// (TOKEN_VALUE)
+    /*  38 & */	TOKEN_CHAR | TOKEN_WORD_SEP | TOKEN_VALUE_SEP,
+    /*  39 ' */	TOKEN_NAME_SEP,
+    /*  40 ( */	TOKEN_CHAR | TOKEN_WORD_SEP | TOKEN_VALUE_SEP,
+    /*  41 ) */	TOKEN_CHAR | TOKEN_WORD_SEP | TOKEN_VALUE_SEP,
+    /*  42 * */	TOKEN_CHAR | TOKEN_WORD_SEP | TOKEN_VALUE_SEP,
+    /*  43 + */	TOKEN_CHAR | TOKEN_WORD_SEP | TOKEN_VALUE_SEP | TOKEN_VALUE_EXP | TOKEN_VALUE_SIGN,
+    /*  44 , */	TOKEN_CHAR | TOKEN_WORD_SEP | TOKEN_VALUE_SEP,	// (TOKEN_CHAR_VALUE | TOKEN_VALUE)
+    /*  45 - */	TOKEN_CHAR | TOKEN_WORD_SEP | TOKEN_VALUE_SEP | TOKEN_VALUE_EXP | TOKEN_VALUE_SIGN,
+    /*  46 . */	TOKEN_CHAR | TOKEN_WORD_SEP | TOKEN_VALUE_SEP,	// (TOKEN_WORD | TOKEN_CHAR_VALUE | TOKEN_VALUE)
+    /*  47 / */	TOKEN_CHAR | TOKEN_WORD_SEP | TOKEN_VALUE_SEP,
     //for ( i = 48; i < 58; i++ )
-    /*  48 0 */ TOKEN_DIGIT_FLAGS | TOKEN_WORD,
-    /*  49 1 */ TOKEN_DIGIT_FLAGS | TOKEN_WORD,
-    /*  50 2 */ TOKEN_DIGIT_FLAGS | TOKEN_WORD,
-    /*  51 3 */ TOKEN_DIGIT_FLAGS | TOKEN_WORD,
-    /*  52 4 */ TOKEN_DIGIT_FLAGS | TOKEN_WORD,
-    /*  53 5 */ TOKEN_DIGIT_FLAGS | TOKEN_WORD,
-    /*  54 6 */ TOKEN_DIGIT_FLAGS | TOKEN_WORD,
-    /*  55 7 */ TOKEN_DIGIT_FLAGS | TOKEN_WORD,
-    /*  56 8 */ TOKEN_DIGIT_FLAGS | TOKEN_WORD,
-    /*  57 9 */ TOKEN_DIGIT_FLAGS | TOKEN_WORD,
-    /*  58 : */ TOKEN_CHAR | TOKEN_WORD_SEP | TOKEN_VALUE_SEP,  // (TOKEN_WORD)
-    /*  59 ; */ TOKEN_CHAR | TOKEN_WORD_SEP | TOKEN_VALUE_SEP,
-    /*  60 < */ TOKEN_CHAR_BOOL | TOKEN_WORD_SEP | TOKEN_VALUE_SEP,
-    /*  61 = */ TOKEN_CHAR | TOKEN_BOOL | TOKEN_WORD_SEP | TOKEN_VALUE_SEP,
-    /*  62 > */ TOKEN_CHAR_BOOL | TOKEN_BOOL | TOKEN_WORD_SEP | TOKEN_VALUE_SEP,
-    /*  63 ? */ TOKEN_CHAR | TOKEN_WORD_SEP | TOKEN_VALUE_SEP,  // (TOKEN_CHAR_WORD | TOKEN_WORD)
-    /*  64 @ */ TOKEN_CHAR | TOKEN_WORD_SEP | TOKEN_VALUE_SEP,  // (TOKEN_ILLEGAL // UNUSED)
+    /*  48 0 */	TOKEN_DIGIT_FLAGS | TOKEN_WORD,
+    /*  49 1 */	TOKEN_DIGIT_FLAGS | TOKEN_WORD,
+    /*  50 2 */	TOKEN_DIGIT_FLAGS | TOKEN_WORD,
+    /*  51 3 */	TOKEN_DIGIT_FLAGS | TOKEN_WORD,
+    /*  52 4 */	TOKEN_DIGIT_FLAGS | TOKEN_WORD,
+    /*  53 5 */	TOKEN_DIGIT_FLAGS | TOKEN_WORD,
+    /*  54 6 */	TOKEN_DIGIT_FLAGS | TOKEN_WORD,
+    /*  55 7 */	TOKEN_DIGIT_FLAGS | TOKEN_WORD,
+    /*  56 8 */	TOKEN_DIGIT_FLAGS | TOKEN_WORD,
+    /*  57 9 */	TOKEN_DIGIT_FLAGS | TOKEN_WORD,
+    /*  58 : */	TOKEN_CHAR | TOKEN_WORD_SEP | TOKEN_VALUE_SEP,	// (TOKEN_WORD)
+    /*  59 ; */	TOKEN_CHAR | TOKEN_WORD_SEP | TOKEN_VALUE_SEP,
+    /*  60 < */	TOKEN_CHAR_BOOL | TOKEN_WORD_SEP | TOKEN_VALUE_SEP,
+    /*  61 = */	TOKEN_CHAR | TOKEN_BOOL | TOKEN_WORD_SEP | TOKEN_VALUE_SEP,
+    /*  62 > */	TOKEN_CHAR_BOOL | TOKEN_BOOL | TOKEN_WORD_SEP | TOKEN_VALUE_SEP,
+    /*  63 ? */	TOKEN_CHAR | TOKEN_WORD_SEP | TOKEN_VALUE_SEP,	// (TOKEN_CHAR_WORD | TOKEN_WORD)
+    /*  64 @ */	TOKEN_CHAR | TOKEN_WORD_SEP | TOKEN_VALUE_SEP,	// (TOKEN_ILLEGAL // UNUSED)
     //for ( i = 65; i < 91; i++ )
-    /*  65 A */ TOKEN_CHAR_WORD | TOKEN_WORD,
-    /*  66 B */ TOKEN_CHAR_WORD | TOKEN_WORD,
-    /*  67 C */ TOKEN_CHAR_WORD | TOKEN_WORD,
-    /*  68 D */ TOKEN_CHAR_WORD | TOKEN_WORD,
-    /*  69 E */ TOKEN_CHAR_WORD | TOKEN_WORD,
-    /*  70 F */ TOKEN_CHAR_WORD | TOKEN_WORD,
-    /*  71 G */ TOKEN_CHAR_WORD | TOKEN_WORD,
-    /*  72 H */ TOKEN_CHAR_WORD | TOKEN_WORD,
-    /*  73 I */ TOKEN_CHAR_WORD | TOKEN_WORD,
-    /*  74 J */ TOKEN_CHAR_WORD | TOKEN_WORD,
-    /*  75 K */ TOKEN_CHAR_WORD | TOKEN_WORD,
-    /*  76 L */ TOKEN_CHAR_WORD | TOKEN_WORD,
-    /*  77 M */ TOKEN_CHAR_WORD | TOKEN_WORD,
-    /*  78 N */ TOKEN_CHAR_WORD | TOKEN_WORD,
-    /*  79 O */ TOKEN_CHAR_WORD | TOKEN_WORD,
-    /*  80 P */ TOKEN_CHAR_WORD | TOKEN_WORD,
-    /*  81 Q */ TOKEN_CHAR_WORD | TOKEN_WORD,
-    /*  82 R */ TOKEN_CHAR_WORD | TOKEN_WORD,
-    /*  83 S */ TOKEN_CHAR_WORD | TOKEN_WORD,
-    /*  84 T */ TOKEN_CHAR_WORD | TOKEN_WORD,
-    /*  85 U */ TOKEN_CHAR_WORD | TOKEN_WORD,
-    /*  86 V */ TOKEN_CHAR_WORD | TOKEN_WORD,
-    /*  87 W */ TOKEN_CHAR_WORD | TOKEN_WORD,
-    /*  88 X */ TOKEN_CHAR_WORD | TOKEN_WORD,
-    /*  89 Y */ TOKEN_CHAR_WORD | TOKEN_WORD,
-    /*  90 Z */ TOKEN_CHAR_WORD | TOKEN_WORD,
-    /*  91 [ */ TOKEN_CHAR | TOKEN_WORD_SEP | TOKEN_VALUE_SEP,  // (TOKEN_ILLEGAL // UNUSED)
-    /*  92 \ */ TOKEN_CHAR | TOKEN_WORD_SEP | TOKEN_VALUE_SEP,  // (TOKEN_ILLEGAL // UNUSED)
-    /*  93 ] */ TOKEN_CHAR | TOKEN_WORD_SEP | TOKEN_VALUE_SEP,  // (TOKEN_ILLEGAL // UNUSED)
-    /*  94 ^ */ TOKEN_CHAR | TOKEN_WORD_SEP | TOKEN_VALUE_SEP,
-    /*  95 _ */ TOKEN_CHAR_WORD | TOKEN_WORD,
-    /*  96 ` */ TOKEN_CHAR | TOKEN_WORD_SEP | TOKEN_VALUE_SEP,  // (TOKEN_ILLEGAL // UNUSED)
+    /*  65 A */	TOKEN_CHAR_WORD | TOKEN_WORD,
+    /*  66 B */	TOKEN_CHAR_WORD | TOKEN_WORD,
+    /*  67 C */	TOKEN_CHAR_WORD | TOKEN_WORD,
+    /*  68 D */	TOKEN_CHAR_WORD | TOKEN_WORD,
+    /*  69 E */	TOKEN_CHAR_WORD | TOKEN_WORD,
+    /*  70 F */	TOKEN_CHAR_WORD | TOKEN_WORD,
+    /*  71 G */	TOKEN_CHAR_WORD | TOKEN_WORD,
+    /*  72 H */	TOKEN_CHAR_WORD | TOKEN_WORD,
+    /*  73 I */	TOKEN_CHAR_WORD | TOKEN_WORD,
+    /*  74 J */	TOKEN_CHAR_WORD | TOKEN_WORD,
+    /*  75 K */	TOKEN_CHAR_WORD | TOKEN_WORD,
+    /*  76 L */	TOKEN_CHAR_WORD | TOKEN_WORD,
+    /*  77 M */	TOKEN_CHAR_WORD | TOKEN_WORD,
+    /*  78 N */	TOKEN_CHAR_WORD | TOKEN_WORD,
+    /*  79 O */	TOKEN_CHAR_WORD | TOKEN_WORD,
+    /*  80 P */	TOKEN_CHAR_WORD | TOKEN_WORD,
+    /*  81 Q */	TOKEN_CHAR_WORD | TOKEN_WORD,
+    /*  82 R */	TOKEN_CHAR_WORD | TOKEN_WORD,
+    /*  83 S */	TOKEN_CHAR_WORD | TOKEN_WORD,
+    /*  84 T */	TOKEN_CHAR_WORD | TOKEN_WORD,
+    /*  85 U */	TOKEN_CHAR_WORD | TOKEN_WORD,
+    /*  86 V */	TOKEN_CHAR_WORD | TOKEN_WORD,
+    /*  87 W */	TOKEN_CHAR_WORD | TOKEN_WORD,
+    /*  88 X */	TOKEN_CHAR_WORD | TOKEN_WORD,
+    /*  89 Y */	TOKEN_CHAR_WORD | TOKEN_WORD,
+    /*  90 Z */	TOKEN_CHAR_WORD | TOKEN_WORD,
+    /*  91 [ */	TOKEN_CHAR | TOKEN_WORD_SEP | TOKEN_VALUE_SEP,	// (TOKEN_ILLEGAL // UNUSED)
+    /*  92 \ */	TOKEN_CHAR | TOKEN_WORD_SEP | TOKEN_VALUE_SEP,	// (TOKEN_ILLEGAL // UNUSED)
+    /*  93 ] */	TOKEN_CHAR | TOKEN_WORD_SEP | TOKEN_VALUE_SEP,	// (TOKEN_ILLEGAL // UNUSED)
+    /*  94 ^ */	TOKEN_CHAR | TOKEN_WORD_SEP | TOKEN_VALUE_SEP,
+    /*  95 _ */	TOKEN_CHAR_WORD | TOKEN_WORD,
+    /*  96 ` */	TOKEN_CHAR | TOKEN_WORD_SEP | TOKEN_VALUE_SEP,	// (TOKEN_ILLEGAL // UNUSED)
     //for ( i = 97; i < 123; i++ )
-    /*  97 a */ TOKEN_CHAR_WORD | TOKEN_WORD,
-    /*  98 b */ TOKEN_CHAR_WORD | TOKEN_WORD,
-    /*  99 c */ TOKEN_CHAR_WORD | TOKEN_WORD,
-    /* 100 d */ TOKEN_CHAR_WORD | TOKEN_WORD,
-    /* 101 e */ TOKEN_CHAR_WORD | TOKEN_WORD,
-    /* 102 f */ TOKEN_CHAR_WORD | TOKEN_WORD,
-    /* 103 g */ TOKEN_CHAR_WORD | TOKEN_WORD,
-    /* 104 h */ TOKEN_CHAR_WORD | TOKEN_WORD,
-    /* 105 i */ TOKEN_CHAR_WORD | TOKEN_WORD,
-    /* 106 j */ TOKEN_CHAR_WORD | TOKEN_WORD,
-    /* 107 k */ TOKEN_CHAR_WORD | TOKEN_WORD,
-    /* 108 l */ TOKEN_CHAR_WORD | TOKEN_WORD,
-    /* 109 m */ TOKEN_CHAR_WORD | TOKEN_WORD,
-    /* 110 n */ TOKEN_CHAR_WORD | TOKEN_WORD,
-    /* 111 o */ TOKEN_CHAR_WORD | TOKEN_WORD,
-    /* 112 p */ TOKEN_CHAR_WORD | TOKEN_WORD,
-    /* 113 q */ TOKEN_CHAR_WORD | TOKEN_WORD,
-    /* 114 r */ TOKEN_CHAR_WORD | TOKEN_WORD,
-    /* 115 s */ TOKEN_CHAR_WORD | TOKEN_WORD,
-    /* 116 t */ TOKEN_CHAR_WORD | TOKEN_WORD,
-    /* 117 u */ TOKEN_CHAR_WORD | TOKEN_WORD,
-    /* 118 v */ TOKEN_CHAR_WORD | TOKEN_WORD,
-    /* 119 w */ TOKEN_CHAR_WORD | TOKEN_WORD,
-    /* 120 x */ TOKEN_CHAR_WORD | TOKEN_WORD,
-    /* 121 y */ TOKEN_CHAR_WORD | TOKEN_WORD,
-    /* 122 z */ TOKEN_CHAR_WORD | TOKEN_WORD,
-    /* 123 { */ TOKEN_CHAR | TOKEN_WORD_SEP | TOKEN_VALUE_SEP,  // (TOKEN_ILLEGAL // UNUSED)
-    /* 124 | */ TOKEN_CHAR | TOKEN_WORD_SEP | TOKEN_VALUE_SEP,  // (TOKEN_ILLEGAL // UNUSED)
-    /* 125 } */ TOKEN_CHAR | TOKEN_WORD_SEP | TOKEN_VALUE_SEP,  // (TOKEN_ILLEGAL // UNUSED)
-    /* 126 ~ */ TOKEN_CHAR | TOKEN_WORD_SEP | TOKEN_VALUE_SEP,  // (TOKEN_ILLEGAL // UNUSED)
-    /* 127   */ TOKEN_CHAR | TOKEN_WORD_SEP | TOKEN_VALUE_SEP   // (TOKEN_ILLEGAL // UNUSED)
+    /*  97 a */	TOKEN_CHAR_WORD | TOKEN_WORD,
+    /*  98 b */	TOKEN_CHAR_WORD | TOKEN_WORD,
+    /*  99 c */	TOKEN_CHAR_WORD | TOKEN_WORD,
+    /* 100 d */	TOKEN_CHAR_WORD | TOKEN_WORD,
+    /* 101 e */	TOKEN_CHAR_WORD | TOKEN_WORD,
+    /* 102 f */	TOKEN_CHAR_WORD | TOKEN_WORD,
+    /* 103 g */	TOKEN_CHAR_WORD | TOKEN_WORD,
+    /* 104 h */	TOKEN_CHAR_WORD | TOKEN_WORD,
+    /* 105 i */	TOKEN_CHAR_WORD | TOKEN_WORD,
+    /* 106 j */	TOKEN_CHAR_WORD | TOKEN_WORD,
+    /* 107 k */	TOKEN_CHAR_WORD | TOKEN_WORD,
+    /* 108 l */	TOKEN_CHAR_WORD | TOKEN_WORD,
+    /* 109 m */	TOKEN_CHAR_WORD | TOKEN_WORD,
+    /* 110 n */	TOKEN_CHAR_WORD | TOKEN_WORD,
+    /* 111 o */	TOKEN_CHAR_WORD | TOKEN_WORD,
+    /* 112 p */	TOKEN_CHAR_WORD | TOKEN_WORD,
+    /* 113 q */	TOKEN_CHAR_WORD | TOKEN_WORD,
+    /* 114 r */	TOKEN_CHAR_WORD | TOKEN_WORD,
+    /* 115 s */	TOKEN_CHAR_WORD | TOKEN_WORD,
+    /* 116 t */	TOKEN_CHAR_WORD | TOKEN_WORD,
+    /* 117 u */	TOKEN_CHAR_WORD | TOKEN_WORD,
+    /* 118 v */	TOKEN_CHAR_WORD | TOKEN_WORD,
+    /* 119 w */	TOKEN_CHAR_WORD | TOKEN_WORD,
+    /* 120 x */	TOKEN_CHAR_WORD | TOKEN_WORD,
+    /* 121 y */	TOKEN_CHAR_WORD | TOKEN_WORD,
+    /* 122 z */	TOKEN_CHAR_WORD | TOKEN_WORD,
+    /* 123 { */	TOKEN_CHAR | TOKEN_WORD_SEP | TOKEN_VALUE_SEP,	// (TOKEN_ILLEGAL // UNUSED)
+    /* 124 | */	TOKEN_CHAR | TOKEN_WORD_SEP | TOKEN_VALUE_SEP,	// (TOKEN_ILLEGAL // UNUSED)
+    /* 125 } */	TOKEN_CHAR | TOKEN_WORD_SEP | TOKEN_VALUE_SEP,	// (TOKEN_ILLEGAL // UNUSED)
+    /* 126 ~ */	TOKEN_CHAR | TOKEN_WORD_SEP | TOKEN_VALUE_SEP,	// (TOKEN_ILLEGAL // UNUSED)
+    /* 127   */	TOKEN_CHAR | TOKEN_WORD_SEP | TOKEN_VALUE_SEP	// (TOKEN_ILLEGAL // UNUSED)
 };
 
 
 const sal_Int32 cclass_Unicode::pParseTokensType[ nDefCnt ] =
 {
-    /* \0 */    KParseTokens::ASC_OTHER,
+    /* \0 */	KParseTokens::ASC_OTHER,
                 KParseTokens::ASC_CONTROL,
                 KParseTokens::ASC_CONTROL,
                 KParseTokens::ASC_CONTROL,
@@ -220,9 +220,9 @@ const sal_Int32 cclass_Unicode::pParseTokensType[ nDefCnt ] =
                 KParseTokens::ASC_CONTROL,
                 KParseTokens::ASC_CONTROL,
                 KParseTokens::ASC_CONTROL,
-    /*  9 \t */ KParseTokens::ASC_CONTROL,
+    /*  9 \t */	KParseTokens::ASC_CONTROL,
                 KParseTokens::ASC_CONTROL,
-    /* 11 \v */ KParseTokens::ASC_CONTROL,
+    /* 11 \v */	KParseTokens::ASC_CONTROL,
                 KParseTokens::ASC_CONTROL,
                 KParseTokens::ASC_CONTROL,
                 KParseTokens::ASC_CONTROL,
@@ -243,105 +243,105 @@ const sal_Int32 cclass_Unicode::pParseTokensType[ nDefCnt ] =
                 KParseTokens::ASC_CONTROL,
                 KParseTokens::ASC_CONTROL,
                 KParseTokens::ASC_CONTROL,
-    /*  32   */ KParseTokens::ASC_OTHER,
-    /*  33 ! */ KParseTokens::ASC_OTHER,
-    /*  34 " */ KParseTokens::ASC_OTHER,
-    /*  35 # */ KParseTokens::ASC_OTHER,
-    /*  36 $ */ KParseTokens::ASC_DOLLAR,
-    /*  37 % */ KParseTokens::ASC_OTHER,
-    /*  38 & */ KParseTokens::ASC_OTHER,
-    /*  39 ' */ KParseTokens::ASC_OTHER,
-    /*  40 ( */ KParseTokens::ASC_OTHER,
-    /*  41 ) */ KParseTokens::ASC_OTHER,
-    /*  42 * */ KParseTokens::ASC_OTHER,
-    /*  43 + */ KParseTokens::ASC_OTHER,
-    /*  44 , */ KParseTokens::ASC_OTHER,
-    /*  45 - */ KParseTokens::ASC_OTHER,
-    /*  46 . */ KParseTokens::ASC_DOT,
-    /*  47 / */ KParseTokens::ASC_OTHER,
+    /*  32   */	KParseTokens::ASC_OTHER,
+    /*  33 ! */	KParseTokens::ASC_OTHER,
+    /*  34 " */	KParseTokens::ASC_OTHER,
+    /*  35 # */	KParseTokens::ASC_OTHER,
+    /*  36 $ */	KParseTokens::ASC_DOLLAR,
+    /*  37 % */	KParseTokens::ASC_OTHER,
+    /*  38 & */	KParseTokens::ASC_OTHER,
+    /*  39 ' */	KParseTokens::ASC_OTHER,
+    /*  40 ( */	KParseTokens::ASC_OTHER,
+    /*  41 ) */	KParseTokens::ASC_OTHER,
+    /*  42 * */	KParseTokens::ASC_OTHER,
+    /*  43 + */	KParseTokens::ASC_OTHER,
+    /*  44 , */	KParseTokens::ASC_OTHER,
+    /*  45 - */	KParseTokens::ASC_OTHER,
+    /*  46 . */	KParseTokens::ASC_DOT,
+    /*  47 / */	KParseTokens::ASC_OTHER,
     //for ( i = 48; i < 58; i++ )
-    /*  48 0 */ KParseTokens::ASC_DIGIT,
-    /*  49 1 */ KParseTokens::ASC_DIGIT,
-    /*  50 2 */ KParseTokens::ASC_DIGIT,
-    /*  51 3 */ KParseTokens::ASC_DIGIT,
-    /*  52 4 */ KParseTokens::ASC_DIGIT,
-    /*  53 5 */ KParseTokens::ASC_DIGIT,
-    /*  54 6 */ KParseTokens::ASC_DIGIT,
-    /*  55 7 */ KParseTokens::ASC_DIGIT,
-    /*  56 8 */ KParseTokens::ASC_DIGIT,
-    /*  57 9 */ KParseTokens::ASC_DIGIT,
-    /*  58 : */ KParseTokens::ASC_COLON,
-    /*  59 ; */ KParseTokens::ASC_OTHER,
-    /*  60 < */ KParseTokens::ASC_OTHER,
-    /*  61 = */ KParseTokens::ASC_OTHER,
-    /*  62 > */ KParseTokens::ASC_OTHER,
-    /*  63 ? */ KParseTokens::ASC_OTHER,
-    /*  64 @ */ KParseTokens::ASC_OTHER,
+    /*  48 0 */	KParseTokens::ASC_DIGIT,
+    /*  49 1 */	KParseTokens::ASC_DIGIT,
+    /*  50 2 */	KParseTokens::ASC_DIGIT,
+    /*  51 3 */	KParseTokens::ASC_DIGIT,
+    /*  52 4 */	KParseTokens::ASC_DIGIT,
+    /*  53 5 */	KParseTokens::ASC_DIGIT,
+    /*  54 6 */	KParseTokens::ASC_DIGIT,
+    /*  55 7 */	KParseTokens::ASC_DIGIT,
+    /*  56 8 */	KParseTokens::ASC_DIGIT,
+    /*  57 9 */	KParseTokens::ASC_DIGIT,
+    /*  58 : */	KParseTokens::ASC_COLON,
+    /*  59 ; */	KParseTokens::ASC_OTHER,
+    /*  60 < */	KParseTokens::ASC_OTHER,
+    /*  61 = */	KParseTokens::ASC_OTHER,
+    /*  62 > */	KParseTokens::ASC_OTHER,
+    /*  63 ? */	KParseTokens::ASC_OTHER,
+    /*  64 @ */	KParseTokens::ASC_OTHER,
     //for ( i = 65; i < 91; i++ )
-    /*  65 A */ KParseTokens::ASC_UPALPHA,
-    /*  66 B */ KParseTokens::ASC_UPALPHA,
-    /*  67 C */ KParseTokens::ASC_UPALPHA,
-    /*  68 D */ KParseTokens::ASC_UPALPHA,
-    /*  69 E */ KParseTokens::ASC_UPALPHA,
-    /*  70 F */ KParseTokens::ASC_UPALPHA,
-    /*  71 G */ KParseTokens::ASC_UPALPHA,
-    /*  72 H */ KParseTokens::ASC_UPALPHA,
-    /*  73 I */ KParseTokens::ASC_UPALPHA,
-    /*  74 J */ KParseTokens::ASC_UPALPHA,
-    /*  75 K */ KParseTokens::ASC_UPALPHA,
-    /*  76 L */ KParseTokens::ASC_UPALPHA,
-    /*  77 M */ KParseTokens::ASC_UPALPHA,
-    /*  78 N */ KParseTokens::ASC_UPALPHA,
-    /*  79 O */ KParseTokens::ASC_UPALPHA,
-    /*  80 P */ KParseTokens::ASC_UPALPHA,
-    /*  81 Q */ KParseTokens::ASC_UPALPHA,
-    /*  82 R */ KParseTokens::ASC_UPALPHA,
-    /*  83 S */ KParseTokens::ASC_UPALPHA,
-    /*  84 T */ KParseTokens::ASC_UPALPHA,
-    /*  85 U */ KParseTokens::ASC_UPALPHA,
-    /*  86 V */ KParseTokens::ASC_UPALPHA,
-    /*  87 W */ KParseTokens::ASC_UPALPHA,
-    /*  88 X */ KParseTokens::ASC_UPALPHA,
-    /*  89 Y */ KParseTokens::ASC_UPALPHA,
-    /*  90 Z */ KParseTokens::ASC_UPALPHA,
-    /*  91 [ */ KParseTokens::ASC_OTHER,
-    /*  92 \ */ KParseTokens::ASC_OTHER,
-    /*  93 ] */ KParseTokens::ASC_OTHER,
-    /*  94 ^ */ KParseTokens::ASC_OTHER,
-    /*  95 _ */ KParseTokens::ASC_UNDERSCORE,
-    /*  96 ` */ KParseTokens::ASC_OTHER,
+    /*  65 A */	KParseTokens::ASC_UPALPHA,
+    /*  66 B */	KParseTokens::ASC_UPALPHA,
+    /*  67 C */	KParseTokens::ASC_UPALPHA,
+    /*  68 D */	KParseTokens::ASC_UPALPHA,
+    /*  69 E */	KParseTokens::ASC_UPALPHA,
+    /*  70 F */	KParseTokens::ASC_UPALPHA,
+    /*  71 G */	KParseTokens::ASC_UPALPHA,
+    /*  72 H */	KParseTokens::ASC_UPALPHA,
+    /*  73 I */	KParseTokens::ASC_UPALPHA,
+    /*  74 J */	KParseTokens::ASC_UPALPHA,
+    /*  75 K */	KParseTokens::ASC_UPALPHA,
+    /*  76 L */	KParseTokens::ASC_UPALPHA,
+    /*  77 M */	KParseTokens::ASC_UPALPHA,
+    /*  78 N */	KParseTokens::ASC_UPALPHA,
+    /*  79 O */	KParseTokens::ASC_UPALPHA,
+    /*  80 P */	KParseTokens::ASC_UPALPHA,
+    /*  81 Q */	KParseTokens::ASC_UPALPHA,
+    /*  82 R */	KParseTokens::ASC_UPALPHA,
+    /*  83 S */	KParseTokens::ASC_UPALPHA,
+    /*  84 T */	KParseTokens::ASC_UPALPHA,
+    /*  85 U */	KParseTokens::ASC_UPALPHA,
+    /*  86 V */	KParseTokens::ASC_UPALPHA,
+    /*  87 W */	KParseTokens::ASC_UPALPHA,
+    /*  88 X */	KParseTokens::ASC_UPALPHA,
+    /*  89 Y */	KParseTokens::ASC_UPALPHA,
+    /*  90 Z */	KParseTokens::ASC_UPALPHA,
+    /*  91 [ */	KParseTokens::ASC_OTHER,
+    /*  92 \ */	KParseTokens::ASC_OTHER,
+    /*  93 ] */	KParseTokens::ASC_OTHER,
+    /*  94 ^ */	KParseTokens::ASC_OTHER,
+    /*  95 _ */	KParseTokens::ASC_UNDERSCORE,
+    /*  96 ` */	KParseTokens::ASC_OTHER,
     //for ( i = 97; i < 123; i++ )
-    /*  97 a */ KParseTokens::ASC_LOALPHA,
-    /*  98 b */ KParseTokens::ASC_LOALPHA,
-    /*  99 c */ KParseTokens::ASC_LOALPHA,
-    /* 100 d */ KParseTokens::ASC_LOALPHA,
-    /* 101 e */ KParseTokens::ASC_LOALPHA,
-    /* 102 f */ KParseTokens::ASC_LOALPHA,
-    /* 103 g */ KParseTokens::ASC_LOALPHA,
-    /* 104 h */ KParseTokens::ASC_LOALPHA,
-    /* 105 i */ KParseTokens::ASC_LOALPHA,
-    /* 106 j */ KParseTokens::ASC_LOALPHA,
-    /* 107 k */ KParseTokens::ASC_LOALPHA,
-    /* 108 l */ KParseTokens::ASC_LOALPHA,
-    /* 109 m */ KParseTokens::ASC_LOALPHA,
-    /* 110 n */ KParseTokens::ASC_LOALPHA,
-    /* 111 o */ KParseTokens::ASC_LOALPHA,
-    /* 112 p */ KParseTokens::ASC_LOALPHA,
-    /* 113 q */ KParseTokens::ASC_LOALPHA,
-    /* 114 r */ KParseTokens::ASC_LOALPHA,
-    /* 115 s */ KParseTokens::ASC_LOALPHA,
-    /* 116 t */ KParseTokens::ASC_LOALPHA,
-    /* 117 u */ KParseTokens::ASC_LOALPHA,
-    /* 118 v */ KParseTokens::ASC_LOALPHA,
-    /* 119 w */ KParseTokens::ASC_LOALPHA,
-    /* 120 x */ KParseTokens::ASC_LOALPHA,
-    /* 121 y */ KParseTokens::ASC_LOALPHA,
-    /* 122 z */ KParseTokens::ASC_LOALPHA,
-    /* 123 { */ KParseTokens::ASC_OTHER,
-    /* 124 | */ KParseTokens::ASC_OTHER,
-    /* 125 } */ KParseTokens::ASC_OTHER,
-    /* 126 ~ */ KParseTokens::ASC_OTHER,
-    /* 127   */ KParseTokens::ASC_OTHER
+    /*  97 a */	KParseTokens::ASC_LOALPHA,
+    /*  98 b */	KParseTokens::ASC_LOALPHA,
+    /*  99 c */	KParseTokens::ASC_LOALPHA,
+    /* 100 d */	KParseTokens::ASC_LOALPHA,
+    /* 101 e */	KParseTokens::ASC_LOALPHA,
+    /* 102 f */	KParseTokens::ASC_LOALPHA,
+    /* 103 g */	KParseTokens::ASC_LOALPHA,
+    /* 104 h */	KParseTokens::ASC_LOALPHA,
+    /* 105 i */	KParseTokens::ASC_LOALPHA,
+    /* 106 j */	KParseTokens::ASC_LOALPHA,
+    /* 107 k */	KParseTokens::ASC_LOALPHA,
+    /* 108 l */	KParseTokens::ASC_LOALPHA,
+    /* 109 m */	KParseTokens::ASC_LOALPHA,
+    /* 110 n */	KParseTokens::ASC_LOALPHA,
+    /* 111 o */	KParseTokens::ASC_LOALPHA,
+    /* 112 p */	KParseTokens::ASC_LOALPHA,
+    /* 113 q */	KParseTokens::ASC_LOALPHA,
+    /* 114 r */	KParseTokens::ASC_LOALPHA,
+    /* 115 s */	KParseTokens::ASC_LOALPHA,
+    /* 116 t */	KParseTokens::ASC_LOALPHA,
+    /* 117 u */	KParseTokens::ASC_LOALPHA,
+    /* 118 v */	KParseTokens::ASC_LOALPHA,
+    /* 119 w */	KParseTokens::ASC_LOALPHA,
+    /* 120 x */	KParseTokens::ASC_LOALPHA,
+    /* 121 y */	KParseTokens::ASC_LOALPHA,
+    /* 122 z */	KParseTokens::ASC_LOALPHA,
+    /* 123 { */	KParseTokens::ASC_OTHER,
+    /* 124 | */	KParseTokens::ASC_OTHER,
+    /* 125 } */	KParseTokens::ASC_OTHER,
+    /* 126 ~ */	KParseTokens::ASC_OTHER,
+    /* 127   */	KParseTokens::ASC_OTHER
 };
 
 
@@ -490,58 +490,58 @@ void cclass_Unicode::initParserTable( const Locale& rLocale, sal_Int32 startChar
 
         if ( !(nStartTypes & ASC_UPALPHA) )
             for ( i = 65; i < 91; i++ )
-                pTable[i] &= ~TOKEN_CHAR_WORD;  // not allowed as start character
+                pTable[i] &= ~TOKEN_CHAR_WORD;	// not allowed as start character
         if ( !(nContTypes & ASC_UPALPHA) )
             for ( i = 65; i < 91; i++ )
-                pTable[i] &= ~TOKEN_WORD;       // not allowed as cont character
+                pTable[i] &= ~TOKEN_WORD;		// not allowed as cont character
 
         if ( !(nStartTypes & ASC_LOALPHA) )
             for ( i = 97; i < 123; i++ )
-                pTable[i] &= ~TOKEN_CHAR_WORD;  // not allowed as start character
+                pTable[i] &= ~TOKEN_CHAR_WORD;	// not allowed as start character
         if ( !(nContTypes & ASC_LOALPHA) )
             for ( i = 97; i < 123; i++ )
-                pTable[i] &= ~TOKEN_WORD;       // not allowed as cont character
+                pTable[i] &= ~TOKEN_WORD;		// not allowed as cont character
 
         if ( nStartTypes & ASC_DIGIT )
             for ( i = 48; i < 58; i++ )
-                pTable[i] |= TOKEN_CHAR_WORD;   // allowed as start character
+                pTable[i] |= TOKEN_CHAR_WORD;	// allowed as start character
         if ( !(nContTypes & ASC_DIGIT) )
             for ( i = 48; i < 58; i++ )
-                pTable[i] &= ~TOKEN_WORD;       // not allowed as cont character
+                pTable[i] &= ~TOKEN_WORD;		// not allowed as cont character
 
         if ( !(nStartTypes & ASC_UNDERSCORE) )
-            pTable[95] &= ~TOKEN_CHAR_WORD;     // not allowed as start character
+            pTable[95] &= ~TOKEN_CHAR_WORD;		// not allowed as start character
         if ( !(nContTypes & ASC_UNDERSCORE) )
-            pTable[95] &= ~TOKEN_WORD;          // not allowed as cont character
+            pTable[95] &= ~TOKEN_WORD;			// not allowed as cont character
 
         if ( nStartTypes & ASC_DOLLAR )
-            pTable[36] |= TOKEN_CHAR_WORD;      // allowed as start character
+            pTable[36] |= TOKEN_CHAR_WORD;		// allowed as start character
         if ( nContTypes & ASC_DOLLAR )
-            pTable[36] |= TOKEN_WORD;           // allowed as cont character
+            pTable[36] |= TOKEN_WORD;			// allowed as cont character
 
         if ( nStartTypes & ASC_DOT )
-            pTable[46] |= TOKEN_CHAR_WORD;      // allowed as start character
+            pTable[46] |= TOKEN_CHAR_WORD;		// allowed as start character
         if ( nContTypes & ASC_DOT )
-            pTable[46] |= TOKEN_WORD;           // allowed as cont character
+            pTable[46] |= TOKEN_WORD;			// allowed as cont character
 
         if ( nStartTypes & ASC_COLON )
-            pTable[58] |= TOKEN_CHAR_WORD;      // allowed as start character
+            pTable[58] |= TOKEN_CHAR_WORD;		// allowed as start character
         if ( nContTypes & ASC_COLON )
-            pTable[58] |= TOKEN_WORD;           // allowed as cont character
+            pTable[58] |= TOKEN_WORD;			// allowed as cont character
 
         if ( nStartTypes & ASC_CONTROL )
             for ( i = 1; i < 32; i++ )
-                pTable[i] |= TOKEN_CHAR_WORD;   // allowed as start character
+                pTable[i] |= TOKEN_CHAR_WORD;	// allowed as start character
         if ( nContTypes & ASC_CONTROL )
             for ( i = 1; i < 32; i++ )
-                pTable[i] |= TOKEN_WORD;        // allowed as cont character
+                pTable[i] |= TOKEN_WORD;		// allowed as cont character
 
         if ( nStartTypes & ASC_ANY_BUT_CONTROL )
             for ( i = 32; i < nDefCnt; i++ )
-                pTable[i] |= TOKEN_CHAR_WORD;   // allowed as start character
+                pTable[i] |= TOKEN_CHAR_WORD;	// allowed as start character
         if ( nContTypes & ASC_ANY_BUT_CONTROL )
             for ( i = 32; i < nDefCnt; i++ )
-                pTable[i] |= TOKEN_WORD;        // allowed as cont character
+                pTable[i] |= TOKEN_WORD;		// allowed as cont character
 
     }
 
@@ -738,7 +738,7 @@ void cclass_Unicode::parseText( ParseResult& r, const OUString& rText, sal_Int32
         if ( nMask & TOKEN_EXCLUDED )
             eState = ssBounce;
         if ( bMightBeWord )
-        {   // only relevant for ssGetValue fall back
+        {	// only relevant for ssGetValue fall back
             if ( eState == ssGetChar || eState == ssRewindFromValue ||
                     eState == ssIgnoreLeadingInRewind )
                 bMightBeWord = ((nMask & TOKEN_CHAR_WORD) != 0);
@@ -755,7 +755,7 @@ void cclass_Unicode::parseText( ParseResult& r, const OUString& rText, sal_Int32
             {
                 if ( (nMask & TOKEN_CHAR_VALUE) && eState != ssRewindFromValue
                         && eState != ssIgnoreLeadingInRewind )
-                {   //! must be first, may fall back to ssGetWord via bMightBeWord
+                {	//! must be first, may fall back to ssGetWord via bMightBeWord
                     eState = ssGetValue;
                     if ( nMask & TOKEN_VALUE_DIGIT )
                     {
@@ -783,14 +783,14 @@ void cclass_Unicode::parseText( ParseResult& r, const OUString& rText, sal_Int32
                     eState = ssGetWordFirstChar;
                     bQuote = true;
                     pSym++;
-                    nParseTokensType = 0;   // will be taken of first real character
+                    nParseTokensType = 0;	// will be taken of first real character
                     r.TokenType = KParseType::SINGLE_QUOTE_NAME;
                 }
                 else if ( nMask & TOKEN_CHAR_STRING )
                 {
                     eState = ssGetString;
                     pSym++;
-                    nParseTokensType = 0;   // will be taken of first real character
+                    nParseTokensType = 0;	// will be taken of first real character
                     r.TokenType = KParseType::DOUBLE_QUOTE_STRING;
                 }
                 else if ( nMask & TOKEN_CHAR_DONTCARE )
@@ -801,7 +801,7 @@ void cclass_Unicode::parseText( ParseResult& r, const OUString& rText, sal_Int32
                             eState = ssIgnoreLeadingInRewind;
                         r.LeadingWhiteSpace++;
                         pSym++;
-                        nParseTokensType = 0;   // wait until real character
+                        nParseTokensType = 0;	// wait until real character
                         bMightBeWord = true;
                     }
                     else
@@ -813,12 +813,12 @@ void cclass_Unicode::parseText( ParseResult& r, const OUString& rText, sal_Int32
                     r.TokenType = KParseType::BOOLEAN;
                 }
                 else if ( nMask & TOKEN_CHAR )
-                {   //! must be last
+                {	//! must be last
                     eState = ssStop;
                     r.TokenType = KParseType::ONE_SINGLE_CHAR;
                 }
                 else
-                    eState = ssBounce;      // not known
+                    eState = ssBounce;		// not known
             }
             break;
             case ssGetValue :
@@ -846,9 +846,9 @@ void cclass_Unicode::parseText( ParseResult& r, const OUString& rText, sal_Int32
                 {
                     UPT_FLAG_TYPE nNext = getFlags( pTextStart, pSrc - pTextStart );
                     if ( nNext & TOKEN_VALUE_EXP )
-                        ;   // keep it going
+                        ;	// keep it going
                     else if ( bMightBeWord && ((nNext & TOKEN_WORD) || !*pSrc) )
-                    {   // might be a numerical name (1.2efg)
+                    {	// might be a numerical name (1.2efg)
                         eState = ssGetWord;
                         r.TokenType = KParseType::IDENTNAME;
                     }
@@ -861,9 +861,9 @@ void cclass_Unicode::parseText( ParseResult& r, const OUString& rText, sal_Int32
                     {
                         UPT_FLAG_TYPE nNext = getFlags( pTextStart, pSrc - pTextStart );
                         if ( nNext & TOKEN_VALUE_EXP_VALUE )
-                            ;   // keep it going
+                            ;	// keep it going
                         else if ( bMightBeWord && ((nNext & TOKEN_WORD) || !*pSrc) )
-                        {   // might be a numerical name (1.2e+fg)
+                        {	// might be a numerical name (1.2e+fg)
                             eState = ssGetWord;
                             r.TokenType = KParseType::IDENTNAME;
                         }
@@ -871,7 +871,7 @@ void cclass_Unicode::parseText( ParseResult& r, const OUString& rText, sal_Int32
                             eState = ssStopBack;
                     }
                     else if ( bMightBeWord )
-                    {   // might be a numerical name (1.2+fg)
+                    {	// might be a numerical name (1.2+fg)
                         eState = ssGetWord;
                         r.TokenType = KParseType::IDENTNAME;
                     }
@@ -879,7 +879,7 @@ void cclass_Unicode::parseText( ParseResult& r, const OUString& rText, sal_Int32
                         eState = ssStopBack;
                 }
                 else if ( bMightBeWord && (nMask & TOKEN_WORD) )
-                {   // might be a numerical name (1995.A1)
+                {	// might be a numerical name (1995.A1)
                     eState = ssGetWord;
                     r.TokenType = KParseType::IDENTNAME;
                 }
@@ -893,13 +893,13 @@ void cclass_Unicode::parseText( ParseResult& r, const OUString& rText, sal_Int32
             case ssGetWord :
             {
                 if ( nMask & TOKEN_WORD )
-                    ;   // keep it going
+                    ;	// keep it going
                 else if ( nMask & TOKEN_NAME_SEP )
                 {
                     if ( bQuote )
                     {
                         if ( cLast == '\\' )
-                        {   // escaped
+                        {	// escaped
                             aSymbol += OUString( pSym, pSrc - pSym - 2 );
                             aSymbol += OUString( &c, 1);
                         }
@@ -914,7 +914,7 @@ void cclass_Unicode::parseText( ParseResult& r, const OUString& rText, sal_Int32
                         eState = ssStopBack;
                 }
                 else if ( bQuote )
-                    ;   // keep it going
+                    ;	// keep it going
                 else
                     eState = ssStopBack;
             }
@@ -924,13 +924,13 @@ void cclass_Unicode::parseText( ParseResult& r, const OUString& rText, sal_Int32
                 if ( nMask & TOKEN_STRING_SEP )
                 {
                     if ( cLast == '\\' )
-                    {   // escaped
+                    {	// escaped
                         aSymbol += OUString( pSym, pSrc - pSym - 2 );
                         aSymbol += OUString( &c, 1);
                     }
                     else if ( c == *pSrc &&
                             !(nContTypes & KParseTokens::TWO_DOUBLE_QUOTES_BREAK_STRING) )
-                    {   // "" => literal " escaped
+                    {	// "" => literal " escaped
                         aSymbol += OUString( pSym, pSrc - pSym );
                         pSrc++;
                     }
@@ -946,7 +946,7 @@ void cclass_Unicode::parseText( ParseResult& r, const OUString& rText, sal_Int32
             case ssGetBool :
             {
                 if ( (nMask & TOKEN_BOOL) )
-                    eState = ssStop;    // maximum 2: <, >, <>, <=, >=
+                    eState = ssStop;	// maximum 2: <, >, <>, <=, >=
                 else
                     eState = ssStopBack;
             }
@@ -976,9 +976,9 @@ void cclass_Unicode::parseText( ParseResult& r, const OUString& rText, sal_Int32
             {
                 if ( (r.TokenType & (KParseType::ASC_NUMBER | KParseType::UNI_NUMBER))
                         && (nTokenType & KParseType::IDENTNAME) && bMightBeWord )
-                    ;   // keep a number that might be a word
+                    ;	// keep a number that might be a word
                 else if ( r.LeadingWhiteSpace == (pSrc - pTextStart) )
-                    ;   // keep ignored white space
+                    ;	// keep ignored white space
                 else if ( !r.TokenType && eState == ssGetValue && (nMask & TOKEN_VALUE_SEP) )
                     ;   // keep uncertain value
                 else
@@ -990,7 +990,7 @@ void cclass_Unicode::parseText( ParseResult& r, const OUString& rText, sal_Int32
                 eState = ssStopBack;
             }
             if ( eState == ssStopBack )
-            {   // put back
+            {	// put back
                 pSrc--;
                 bMightBeWord = bMightBeWordLast;
                 eState = ssStop;
@@ -1056,7 +1056,7 @@ void cclass_Unicode::parseText( ParseResult& r, const OUString& rText, sal_Int32
     else if ( r.TokenType & (KParseType::SINGLE_QUOTE_NAME | KParseType::DOUBLE_QUOTE_STRING) )
     {
         if ( pSym < pSrc )
-        {   //! open quote
+        {	//! open quote
             aSymbol += OUString( pSym, pSrc - pSym );
             r.TokenType |= KParseType::MISSING_QUOTE;
         }
diff --git a/i18npool/source/characterclassification/characterclassificationImpl.cxx b/i18npool/source/characterclassification/characterclassificationImpl.cxx
index 5665bf654194..7328a86ff9d3 100644
--- a/i18npool/source/characterclassification/characterclassificationImpl.cxx
+++ b/i18npool/source/characterclassification/characterclassificationImpl.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
@@ -53,7 +53,7 @@ CharacterClassificationImpl::~CharacterClassificationImpl() {
 
 
 OUString SAL_CALL
-CharacterClassificationImpl::toUpper( const OUString& Text, sal_Int32 nPos,
+CharacterClassificationImpl::toUpper( const OUString& Text, sal_Int32 nPos, 
         sal_Int32 nCount, const Locale& rLocale ) throw(RuntimeException)
 {
         return getLocaleSpecificCharacterClassification(rLocale)->toUpper(Text, nPos, nCount, rLocale);
@@ -67,14 +67,14 @@ CharacterClassificationImpl::toLower( const OUString& Text, sal_Int32 nPos,
 }
 
 OUString SAL_CALL
-CharacterClassificationImpl::toTitle( const OUString& Text, sal_Int32 nPos,
+CharacterClassificationImpl::toTitle( const OUString& Text, sal_Int32 nPos, 
         sal_Int32 nCount, const Locale& rLocale ) throw(RuntimeException)
 {
         return getLocaleSpecificCharacterClassification(rLocale)->toTitle(Text, nPos, nCount, rLocale);
 }
 
 sal_Int16 SAL_CALL
-CharacterClassificationImpl::getType( const OUString& Text, sal_Int32 nPos )
+CharacterClassificationImpl::getType( const OUString& Text, sal_Int32 nPos ) 
         throw(RuntimeException)
 {
         if (xUCI.is())
@@ -108,7 +108,7 @@ CharacterClassificationImpl::getCharacterType( const OUString& Text, sal_Int32 n
 }
 
 sal_Int32 SAL_CALL
-CharacterClassificationImpl::getStringType( const OUString& Text, sal_Int32 nPos,
+CharacterClassificationImpl::getStringType( const OUString& Text, sal_Int32 nPos, 
         sal_Int32 nCount, const Locale& rLocale ) throw(RuntimeException)
 {
         return getLocaleSpecificCharacterClassification(rLocale)->getStringType(Text, nPos, nCount, rLocale);
@@ -178,8 +178,8 @@ CharacterClassificationImpl::getLocaleSpecificCharacterClassification(const Loca
 
             static sal_Unicode under = (sal_Unicode)'_';
             static OUString tw(OUString::createFromAscii("TW"));
-            sal_Int32 l = rLocale.Language.getLength();
-            sal_Int32 c = rLocale.Country.getLength();
+            sal_Int32 l = rLocale.Language.getLength(); 
+            sal_Int32 c = rLocale.Country.getLength(); 
             sal_Int32 v = rLocale.Variant.getLength();
             OUStringBuffer aBuf(l+c+v+3);
 
@@ -188,16 +188,16 @@ CharacterClassificationImpl::getLocaleSpecificCharacterClassification(const Loca
                     createLocaleSpecificCharacterClassification(aBuf.append(rLocale.Language).append(under).append(
                                     rLocale.Country).append(under).append(rLocale.Variant).makeStringAndClear(), rLocale)) ||
                     // load service with name <base>_<lang>_<country>
-                (l > 0 && c > 0 &&
+                (l > 0 && c > 0 && 
                     createLocaleSpecificCharacterClassification(aBuf.append(rLocale.Language).append(under).append(
                                     rLocale.Country).makeStringAndClear(), rLocale)) ||
-                (l > 0 && c > 0 && rLocale.Language.compareToAscii("zh") == 0 &&
+                (l > 0 && c > 0 && rLocale.Language.compareToAscii("zh") == 0 && 
                                     (rLocale.Country.compareToAscii("HK") == 0 ||
                                     rLocale.Country.compareToAscii("MO") == 0) &&
                     // if the country code is HK or MO, one more step to try TW.
                     createLocaleSpecificCharacterClassification(aBuf.append(rLocale.Language).append(under).append(
                                     tw).makeStringAndClear(), rLocale)) ||
-                (l > 0 &&
+                (l > 0 && 
                     // load service with name <base>_<lang>
                     createLocaleSpecificCharacterClassification(rLocale.Language, rLocale))) {
                 return cachedItem->xCI;
diff --git a/i18npool/source/characterclassification/scripttypedetector.cxx b/i18npool/source/characterclassification/scripttypedetector.cxx
index cb90e99075e1..33471543d68f 100644
--- a/i18npool/source/characterclassification/scripttypedetector.cxx
+++ b/i18npool/source/characterclassification/scripttypedetector.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
diff --git a/i18npool/source/collator/chaptercollator.cxx b/i18npool/source/collator/chaptercollator.cxx
index 946053c1adee..024e64f8461a 100644
--- a/i18npool/source/collator/chaptercollator.cxx
+++ b/i18npool/source/collator/chaptercollator.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
diff --git a/i18npool/source/collator/collatorImpl.cxx b/i18npool/source/collator/collatorImpl.cxx
index bdd28a255d07..1fb568b225c4 100644
--- a/i18npool/source/collator/collatorImpl.cxx
+++ b/i18npool/source/collator/collatorImpl.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
diff --git a/i18npool/source/collator/collator_unicode.cxx b/i18npool/source/collator/collator_unicode.cxx
index 2494829968d6..a6946b984f44 100644
--- a/i18npool/source/collator/collator_unicode.cxx
+++ b/i18npool/source/collator/collator_unicode.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
@@ -62,13 +62,13 @@ sal_Int32 SAL_CALL
 Collator_Unicode::compareSubstring( const OUString& str1, sal_Int32 off1, sal_Int32 len1,
     const OUString& str2, sal_Int32 off2, sal_Int32 len2) throw(RuntimeException)
 {
-    return collator->compare(reinterpret_cast<const UChar *>(str1.getStr()) + off1, len1, reinterpret_cast<const UChar *>(str2.getStr()) + off2, len2); // UChar != sal_Unicode in MinGW
+    return collator->compare(reinterpret_cast<const UChar *>(str1.getStr()) + off1, len1, reinterpret_cast<const UChar *>(str2.getStr()) + off2, len2);	// UChar != sal_Unicode in MinGW
 }
 
 sal_Int32 SAL_CALL
 Collator_Unicode::compareString( const OUString& str1, const OUString& str2) throw(RuntimeException)
 {
-    return collator->compare(reinterpret_cast<const UChar *>(str1.getStr()), reinterpret_cast<const UChar *>(str2.getStr()));   // UChar != sal_Unicode in MinGW
+    return collator->compare(reinterpret_cast<const UChar *>(str1.getStr()), reinterpret_cast<const UChar *>(str2.getStr()));	// UChar != sal_Unicode in MinGW
 }
 
 extern "C" { static void SAL_CALL thisModule() {} }
@@ -81,7 +81,7 @@ Collator_Unicode::loadCollatorAlgorithm(const OUString& rAlgorithm, const lang::
         UErrorCode status = U_ZERO_ERROR;
         OUString rule = LocaleData().getCollatorRuleByAlgorithm(rLocale, rAlgorithm);
         if (rule.getLength() > 0) {
-            collator = new RuleBasedCollator(reinterpret_cast<const UChar *>(rule.getStr()), status);   // UChar != sal_Unicode in MinGW
+            collator = new RuleBasedCollator(reinterpret_cast<const UChar *>(rule.getStr()), status);	// UChar != sal_Unicode in MinGW
             if (! U_SUCCESS(status)) throw RuntimeException();
         }
         if (!collator && OUString::createFromAscii(LOCAL_RULE_LANGS).indexOf(rLocale.Language) >= 0) {
@@ -97,9 +97,9 @@ Collator_Unicode::loadCollatorAlgorithm(const OUString& rAlgorithm, const lang::
                 if (rLocale.Language.equalsAscii("zh")) {
                     OUString func_base = aBuf.makeStringAndClear();
                     if (OUString::createFromAscii("TW HK MO").indexOf(rLocale.Country) >= 0)
-                        func=(const sal_uInt8* (*)()) osl_getFunctionSymbol(hModule,
+                        func=(const sal_uInt8* (*)()) osl_getFunctionSymbol(hModule, 
                                     (func_base + OUString::createFromAscii("TW_") + rAlgorithm).pData);
-                    if (!func)
+                    if (!func) 
                         func=(const sal_uInt8* (*)()) osl_getFunctionSymbol(hModule, (func_base + rAlgorithm).pData);
                 } else {
                     if (rLocale.Language.equalsAscii("ja")) {
diff --git a/i18npool/source/collator/gencoll_rule.cxx b/i18npool/source/collator/gencoll_rule.cxx
index 09c1da0729ec..19d8cb4e635f 100644
--- a/i18npool/source/collator/gencoll_rule.cxx
+++ b/i18npool/source/collator/gencoll_rule.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
@@ -85,8 +85,8 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv)
 
     if (argc < 4) exit(-1);
 
-    fp = fopen(argv[1], "rb");  // open the source file for read;
-    if (fp == NULL)
+    fp = fopen(argv[1], "rb");	// open the source file for read;
+    if (fp == NULL) 
         printf("Open the rule source file failed.");
 
 
@@ -112,10 +112,10 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv)
 
     UErrorCode status = U_ZERO_ERROR;
     //UParseError parseError;
-    //UCollator *coll = ucol_openRules(Obuf.getStr(), Obuf.getLength(), UCOL_OFF,
+    //UCollator *coll = ucol_openRules(Obuf.getStr(), Obuf.getLength(), UCOL_OFF, 
     //        UCOL_DEFAULT_STRENGTH, &parseError, &status);
 
-    RuleBasedCollator *coll = new RuleBasedCollator(reinterpret_cast<const UChar *>(Obuf.getStr()), status);    // UChar != sal_Unicode in MinGW
+    RuleBasedCollator *coll = new RuleBasedCollator(reinterpret_cast<const UChar *>(Obuf.getStr()), status);	// UChar != sal_Unicode in MinGW
 
     if (U_SUCCESS(status)) {
 
@@ -137,4 +137,4 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv)
         delete coll;
 
     return U_SUCCESS(status) ? 0 : 1;
-}   // End of main
+}	// End of main
diff --git a/i18npool/source/defaultnumberingprovider/defaultnumberingprovider.cxx b/i18npool/source/defaultnumberingprovider/defaultnumberingprovider.cxx
index 751116160ebe..bd735384fcad 100644
--- a/i18npool/source/defaultnumberingprovider/defaultnumberingprovider.cxx
+++ b/i18npool/source/defaultnumberingprovider/defaultnumberingprovider.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
@@ -68,17 +68,17 @@ static sal_Unicode table_Alphabet_ar[] = {
 };
 
 static sal_Unicode table_Alphabet_th[] = {
-    0x0E01, 0x0E02, 0x0E04, 0x0E07,
+    0x0E01, 0x0E02, 0x0E04, 0x0E07, 
     0x0E08, 0x0E09, 0x0E0A, 0x0E0B, 0x0E0C, 0x0E0D, 0x0E0E, 0x0E0F,
-    0x0E10, 0x0E11, 0x0E12, 0x0E13, 0x0E14, 0x0E15, 0x0E16, 0x0E17,
+    0x0E10, 0x0E11, 0x0E12, 0x0E13, 0x0E14, 0x0E15, 0x0E16, 0x0E17, 
     0x0E18, 0x0E19, 0x0E1A, 0x0E1B, 0x0E1C, 0x0E1D, 0x0E1E, 0x0E1F,
-    0x0E20, 0x0E21, 0x0E22, 0x0E23, 0x0E24, 0x0E25, 0x0E26, 0x0E27,
+    0x0E20, 0x0E21, 0x0E22, 0x0E23, 0x0E24, 0x0E25, 0x0E26, 0x0E27, 
     0x0E28, 0x0E29, 0x0E2A, 0x0E2B, 0x0E2C, 0x0E2D, 0x0E2E
 };
 
 static sal_Unicode table_Alphabet_he[] = {
     0x05D0, 0x05D1, 0x05D2, 0x05D3, 0x05D4, 0x05D5, 0x05D6, 0x05D7,
-    0x05D8, 0x05D9, 0x05DB, 0x05DC, 0x05DE, 0x05E0, 0x05E1, 0x05E2,
+    0x05D8, 0x05D9, 0x05DB, 0x05DC, 0x05DE, 0x05E0, 0x05E1, 0x05E2, 
     0x05E4, 0x05E6, 0x05E7, 0x05E8, 0x05E9, 0x05EA
 };
 
@@ -121,23 +121,23 @@ static sal_Unicode table_Alphabet_my[] = {
 };
 
 // Bulgarian Cyrillic upper case letters
-static sal_Unicode table_CyrillicUpperLetter_bg[] = {
+static sal_Unicode table_CyrillicUpperLetter_bg[] = { 
     0x0410, 0x0411, 0x0412, 0x0413, 0x0414, 0x0415, 0x0416, 0x0417, 0x0418,
     0x041A, 0x041B, 0x041C, 0x041D, 0x041E, 0x041F, 0x0420, 0x0421, 0x0422,
     0x0423, 0x0424, 0x0425, 0x0426, 0x0427, 0x0428, 0x0429, 0x042A, 0x042E,
-    0x042F
+    0x042F 
 };
 
 // Bulgarian cyrillic lower case letters
-static sal_Unicode table_CyrillicLowerLetter_bg[] = {
+static sal_Unicode table_CyrillicLowerLetter_bg[] = { 
     0x0430, 0x0431, 0x0432, 0x0433, 0x0434, 0x0435, 0x0436, 0x0437, 0x0438,
     0x043A, 0x043B, 0x043C, 0x043D, 0x043E, 0x043F, 0x0440, 0x0441, 0x0442,
     0x0443, 0x0444, 0x0445, 0x0446, 0x0447, 0x0448, 0x0449, 0x044A, 0x044E,
-    0x044F
+    0x044F 
 };
 
 // Russian Cyrillic upper letters
-static sal_Unicode table_CyrillicUpperLetter_ru[] = {
+static sal_Unicode table_CyrillicUpperLetter_ru[] = { 
     0x0410, 0x0411, 0x0412, 0x0413, 0x0414, 0x0415, 0x0416, 0x0417,
     0x0418, 0x041A, 0x041B, 0x041C, 0x041D, 0x041E, 0x041F, 0x0420,
     0x0421, 0x0422, 0x0423, 0x0424, 0x0425, 0x0426, 0x0427, 0x0428,
@@ -145,7 +145,7 @@ static sal_Unicode table_CyrillicUpperLetter_ru[] = {
 };
 
 // Russian cyrillic lower letters
-static sal_Unicode table_CyrillicLowerLetter_ru[] = {
+static sal_Unicode table_CyrillicLowerLetter_ru[] = { 
     0x0430, 0x0431, 0x0432, 0x0433, 0x0434, 0x0435, 0x0436, 0x0437,
     0x0438, 0x043A, 0x043B, 0x043C, 0x043D, 0x043E, 0x043F, 0x0440,
     0x0441, 0x0442, 0x0443, 0x0444, 0x0445, 0x0446, 0x0447, 0x0448,
@@ -153,17 +153,17 @@ static sal_Unicode table_CyrillicLowerLetter_ru[] = {
 };
 
 // Serbian Cyrillic upper letters
-static sal_Unicode table_CyrillicUpperLetter_sr[] = {
-    0x0410, 0x0411, 0x0412, 0x0413, 0x0414, 0x0402, 0x0415, 0x0416,
-    0x0417, 0x0418, 0x0408, 0x041A, 0x041B, 0x0409, 0x041C, 0x041D,
+static sal_Unicode table_CyrillicUpperLetter_sr[] = { 
+    0x0410, 0x0411, 0x0412, 0x0413, 0x0414, 0x0402, 0x0415, 0x0416, 
+    0x0417, 0x0418, 0x0408, 0x041A, 0x041B, 0x0409, 0x041C, 0x041D, 
     0x040A, 0x041E, 0x041F, 0x0420, 0x0421, 0x0422, 0x040B, 0x0423,
     0x0424, 0x0425, 0x0426, 0x0427, 0x040F, 0x0428
 };
 
 // Serbian cyrillic lower letters
-static sal_Unicode table_CyrillicLowerLetter_sr[] = {
+static sal_Unicode table_CyrillicLowerLetter_sr[] = { 
     0x0430, 0x0431, 0x0432, 0x0433, 0x0434, 0x0452, 0x0435, 0x0436,
-    0x0437, 0x0438, 0x0458, 0x043A, 0x043B, 0x0459, 0x043C, 0x043D,
+    0x0437, 0x0438, 0x0458, 0x043A, 0x043B, 0x0459, 0x043C, 0x043D, 
     0x045A, 0x043E, 0x043F, 0x0440, 0x0441, 0x0442, 0x045B, 0x0443,
     0x0444, 0x0445, 0x0446, 0x0447, 0x045F, 0x0448
 };
@@ -184,12 +184,12 @@ static sal_Unicode upperLetter[] = {
 static sal_Unicode lowerLetter[] = {
     0x61, 0x62, 0x63, 0x64, 0x65, 0x66, 0x67, 0x68, 0x69,
     0x6A, 0x6B, 0x6C, 0x6D, 0x6E, 0x6F, 0x70, 0x71, 0x72,
-    0x73, 0x74, 0x75, 0x76, 0x77, 0x78, 0x79, 0x7A
+    0x73, 0x74, 0x75, 0x76, 0x77, 0x78, 0x79, 0x7A 
 };
 
 DefaultNumberingProvider::DefaultNumberingProvider( const Reference < XMultiServiceFactory >& xMSF ) : xSMgr(xMSF),translit(NULL)
 {
-
+        
 }
 
 DefaultNumberingProvider::~DefaultNumberingProvider()
@@ -320,11 +320,11 @@ void lcl_formatChars2( sal_Unicode table_capital[], sal_Unicode table_small[], i
      // string representation of n is appended to s.
      // if A=='A' then 0=>A, 1=>B, ..., 25=>Z, 26=>Aa, 27=>Ab, ...
 
-     if( n>=tableSize )
+     if( n>=tableSize ) 
      {
           lcl_formatChars2( table_capital, table_small, tableSize, (n-tableSize)/tableSize, s );
           s += OUString::valueOf( table_small[ n % tableSize ] );
-     } else
+     } else 
           s += OUString::valueOf( table_capital[ n % tableSize ] );
 }
 
diff --git a/i18npool/source/indexentry/data/indexdata_alphanumeric.h b/i18npool/source/indexentry/data/indexdata_alphanumeric.h
index db3979d84ca4..a5ef1e175a3a 100644
--- a/i18npool/source/indexentry/data/indexdata_alphanumeric.h
+++ b/i18npool/source/indexentry/data/indexdata_alphanumeric.h
@@ -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
@@ -43,5 +43,5 @@ static sal_Unicode idxStr[] = {
     0x44, 0x4E, 0x4F, 0x4F, 0x4F, 0x4F, 0x4F, 0x00, 0x4F, 0x55, 0x55, 0x55, 0x55, 0x59, 0x54, 0x53,   // D0-DF
     0x41, 0x41, 0x41, 0x41, 0x41, 0x41, 0x41, 0x43, 0x45, 0x45, 0x45, 0x45, 0x49, 0x49, 0x49, 0x49,   // E0-EF
     0x44, 0x4E, 0x4F, 0x4F, 0x4F, 0x4F, 0x4F, 0x00, 0x4F, 0x55, 0x55, 0x55, 0x55, 0x59, 0x54, 0x59,   // F0-FF
-
+    
 };
diff --git a/i18npool/source/indexentry/data/indexdata_ja_phonetic.h b/i18npool/source/indexentry/data/indexdata_ja_phonetic.h
index a09a35ec1478..17e67e05b332 100644
--- a/i18npool/source/indexentry/data/indexdata_ja_phonetic.h
+++ b/i18npool/source/indexentry/data/indexdata_ja_phonetic.h
@@ -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
diff --git a/i18npool/source/indexentry/genindex_data.cxx b/i18npool/source/indexentry/genindex_data.cxx
index 91f9725f493f..89d2127036f5 100644
--- a/i18npool/source/indexentry/genindex_data.cxx
+++ b/i18npool/source/indexentry/genindex_data.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
@@ -48,7 +48,7 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv)
 
     if (argc < 4) exit(-1);
 
-    fp = fopen(argv[1], "rb");  // open the source file for read;
+    fp = fopen(argv[1], "rb");	// open the source file for read;
     if (fp == NULL) {
         printf("Open the rule source file failed.");
         return 1;
@@ -163,4 +163,4 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv)
 
     fclose(fp);
     return 0;
-}   // End of main
+}	// End of main
diff --git a/i18npool/source/indexentry/indexentrysupplier.cxx b/i18npool/source/indexentry/indexentrysupplier.cxx
index 3321559e478f..f36068530e03 100644
--- a/i18npool/source/indexentry/indexentrysupplier.cxx
+++ b/i18npool/source/indexentry/indexentrysupplier.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
@@ -124,7 +124,7 @@ sal_Bool SAL_CALL IndexEntrySupplier::createLocaleSpecificIndexEntrySupplier(con
 Reference < com::sun::star::i18n::XExtendedIndexEntrySupplier > SAL_CALL
 IndexEntrySupplier::getLocaleSpecificIndexEntrySupplier(const Locale& rLocale, const OUString& rSortAlgorithm) throw (RuntimeException)
 {
-        if (xIES.is() && rSortAlgorithm == aSortAlgorithm && rLocale.Language == aLocale.Language &&
+        if (xIES.is() && rSortAlgorithm == aSortAlgorithm && rLocale.Language == aLocale.Language && 
                 rLocale.Country == aLocale.Country && rLocale.Variant == aLocale.Variant)
             return xIES;
         else if (xMSF.is()) {
@@ -180,7 +180,7 @@ OUString SAL_CALL IndexEntrySupplier::getIndexFollowPageWord( sal_Bool bMorePage
         Sequence< OUString > aFollowPageWords = LocaleData().getFollowPageWords(rLocale);
 
         return (bMorePages && aFollowPageWords.getLength() > 1) ?
-            aFollowPageWords[1] : (aFollowPageWords.getLength() > 0 ?
+            aFollowPageWords[1] : (aFollowPageWords.getLength() > 0 ? 
             aFollowPageWords[0] : OUString());
 }
 
diff --git a/i18npool/source/indexentry/indexentrysupplier_asian.cxx b/i18npool/source/indexentry/indexentrysupplier_asian.cxx
index cbe55a9832e0..2e2f8155dc0c 100644
--- a/i18npool/source/indexentry/indexentrysupplier_asian.cxx
+++ b/i18npool/source/indexentry/indexentrysupplier_asian.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
@@ -58,7 +58,7 @@ IndexEntrySupplier_asian::~IndexEntrySupplier_asian()
     if (hModule) osl_unloadModule(hModule);
 }
 
-OUString SAL_CALL
+OUString SAL_CALL 
 IndexEntrySupplier_asian::getIndexCharacter( const OUString& rIndexEntry,
     const Locale& rLocale, const OUString& rAlgorithm ) throw (RuntimeException)
 {
@@ -69,7 +69,7 @@ IndexEntrySupplier_asian::getIndexCharacter( const OUString& rIndexEntry,
         sal_uInt16** (*func)(sal_Int16*)=NULL;
         if (rLocale.Language.equalsAscii("zh") && OUString::createFromAscii("TW HK MO").indexOf(rLocale.Country) >= 0)
             func=(sal_uInt16** (*)(sal_Int16*))osl_getFunctionSymbol(hModule, (get+rLocale.Language+OUString::createFromAscii("_TW_")+rAlgorithm).pData);
-        if (!func)
+        if (!func) 
             func=(sal_uInt16** (*)(sal_Int16*))osl_getFunctionSymbol(hModule, (get+rLocale.Language+OUString('_')+rAlgorithm).pData);
         if (func) {
             sal_Int16 max_index;
@@ -81,20 +81,20 @@ IndexEntrySupplier_asian::getIndexCharacter( const OUString& rIndexEntry,
                     return idx[2] ? OUString(&idx[2][address]) : OUString(address);
                 }
             }
-        }
+        } 
     }
     // using alphanumeric index for non-define stirng
     return OUString(&idxStr[(ch & 0xFFFFFF00) ? 0 : ch], 1);
 }
 
-OUString SAL_CALL
-IndexEntrySupplier_asian::getIndexKey( const OUString& rIndexEntry,
+OUString SAL_CALL 
+IndexEntrySupplier_asian::getIndexKey( const OUString& rIndexEntry, 
     const OUString& rPhoneticEntry, const Locale& rLocale) throw (RuntimeException)
 {
     return getIndexCharacter(getEntry(rIndexEntry, rPhoneticEntry, rLocale), rLocale, aAlgorithm);
 }
 
-sal_Int16 SAL_CALL
+sal_Int16 SAL_CALL 
 IndexEntrySupplier_asian::compareIndexEntry(
     const OUString& rIndexEntry1, const OUString& rPhoneticEntry1, const Locale& rLocale1,
     const OUString& rIndexEntry2, const OUString& rPhoneticEntry2, const Locale& rLocale2 )
@@ -112,7 +112,7 @@ IndexEntrySupplier_asian::compareIndexEntry(
     return sal::static_int_cast< sal_Int16 >(result); // result in { -1, 0, 1 }
 }
 
-OUString SAL_CALL
+OUString SAL_CALL 
 IndexEntrySupplier_asian::getPhoneticCandidate( const OUString& rIndexEntry,
         const Locale& rLocale ) throw (RuntimeException)
 {
@@ -123,7 +123,7 @@ IndexEntrySupplier_asian::getPhoneticCandidate( const OUString& rIndexEntry,
             func_name=(OUString::createFromAscii("TW HK MO").indexOf(rLocale.Country) >= 0) ?  "get_zh_zhuyin" : "get_zh_pinyin";
         else if (rLocale.Language.equalsAscii("ko"))
             func_name="get_ko_phonetic";
-        if (func_name)
+        if (func_name) 
             func=(sal_uInt16 **(*)(sal_Int16*))osl_getFunctionSymbol(hModule, OUString::createFromAscii(func_name).pData);
         if (func) {
             OUStringBuffer candidate;
@@ -138,9 +138,9 @@ IndexEntrySupplier_asian::getPhoneticCandidate( const OUString& rIndexEntry,
                         address = idx[1][address + (ch & 0xFF)];
                         if (i > 0 && rLocale.Language.equalsAscii("zh"))
                             candidate.appendAscii(" ");
-                        if (idx[2])
+                        if (idx[2]) 
                             candidate.append(&idx[2][address]);
-                        else
+                        else 
                             candidate.append(address);
                     } else
                         candidate.appendAscii(" ");
diff --git a/i18npool/source/indexentry/indexentrysupplier_common.cxx b/i18npool/source/indexentry/indexentrysupplier_common.cxx
index 24964906c18b..f3a00e36e523 100644
--- a/i18npool/source/indexentry/indexentrysupplier_common.cxx
+++ b/i18npool/source/indexentry/indexentrysupplier_common.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
@@ -111,7 +111,7 @@ OUString SAL_CALL IndexEntrySupplier_Common::getIndexFollowPageWord( sal_Bool,
     throw RuntimeException();
 }
 
-const OUString& SAL_CALL
+const OUString& SAL_CALL 
 IndexEntrySupplier_Common::getEntry( const OUString& IndexEntry,
     const OUString& PhoneticEntry, const lang::Locale& rLocale ) throw (RuntimeException)
 {
diff --git a/i18npool/source/indexentry/indexentrysupplier_default.cxx b/i18npool/source/indexentry/indexentrysupplier_default.cxx
index 7de3f540eaa7..0f63172babb5 100644
--- a/i18npool/source/indexentry/indexentrysupplier_default.cxx
+++ b/i18npool/source/indexentry/indexentrysupplier_default.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
@@ -74,7 +74,7 @@ sal_Int16 SAL_CALL IndexEntrySupplier_Unicode::compareIndexEntry(
             index->getIndexWeight(getEntry(rIndexEntry2, rPhoneticEntry2, rLocale2));
     if (result == 0)
         return IndexEntrySupplier_Common::compareIndexEntry(
-                    rIndexEntry1, rPhoneticEntry1, rLocale1,
+                    rIndexEntry1, rPhoneticEntry1, rLocale1, 
                     rIndexEntry2, rPhoneticEntry2, rLocale2);
     return result > 0 ? 1 : -1;
 }
@@ -134,14 +134,14 @@ sal_Int16 Index::compare(sal_Unicode c1, sal_Unicode c2)
 sal_Int16 Index::getIndexWeight(const OUString& rIndexEntry)
 {
     sal_Int32 startPos=0;
-    if (skipping_chars.getLength() > 0)
+    if (skipping_chars.getLength() > 0) 
         while (skipping_chars.indexOf(rIndexEntry[startPos]) >= 0)
             startPos++;
     if (mkey_count > 0) {
         for (sal_Int16 i = 0; i < mkey_count; i++) {
             sal_Int32 len = keys[mkeys[i]].mkey.getLength();
             if (collator->compareSubstring(rIndexEntry, startPos, len,
-                                    keys[mkeys[i]].mkey, 0, len) == 0)
+                                    keys[mkeys[i]].mkey, 0, len) == 0) 
                 return mkeys[i];
         }
     }
@@ -176,7 +176,7 @@ void Index::makeIndexKeys(const lang::Locale &rLocale, const OUString &algorithm
     OUString keyStr = LocaleData().getIndexKeysByAlgorithm(rLocale, algorithm);
 
     if (!keyStr.getLength()) {
-        keyStr = LocaleData().getIndexKeysByAlgorithm(LOCALE_EN,
+        keyStr = LocaleData().getIndexKeysByAlgorithm(LOCALE_EN, 
                     LocaleData().getDefaultIndexAlgorithm(LOCALE_EN));
         if (!keyStr)
             throw RuntimeException();
@@ -263,7 +263,7 @@ void Index::init(const lang::Locale &rLocale, const OUString& algorithm) throw (
     Sequence< UnicodeScript > scriptList = LocaleData().getUnicodeScripts( rLocale );
 
     if (scriptList.getLength() == 0) {
-        scriptList = LocaleData().getUnicodeScripts(LOCALE_EN);
+        scriptList = LocaleData().getUnicodeScripts(LOCALE_EN); 
         if (scriptList.getLength() == 0)
             throw RuntimeException();
     }
diff --git a/i18npool/source/indexentry/indexentrysupplier_ja_phonetic.cxx b/i18npool/source/indexentry/indexentrysupplier_ja_phonetic.cxx
index bfc23d100ea3..0ea7b7e0f60f 100644
--- a/i18npool/source/indexentry/indexentrysupplier_ja_phonetic.cxx
+++ b/i18npool/source/indexentry/indexentrysupplier_ja_phonetic.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
@@ -38,7 +38,7 @@ using namespace ::rtl;
 namespace com { namespace sun { namespace star { namespace i18n {
 
 OUString SAL_CALL IndexEntrySupplier_ja_phonetic::getIndexCharacter( const OUString& rIndexEntry,
-    const lang::Locale& /*rLocale*/, const OUString& /*rSortAlgorithm*/ )
+    const lang::Locale& /*rLocale*/, const OUString& /*rSortAlgorithm*/ ) 
     throw (com::sun::star::uno::RuntimeException)
 {
     sal_Unicode ch=rIndexEntry.toChar();
@@ -53,13 +53,13 @@ OUString SAL_CALL IndexEntrySupplier_ja_phonetic::getIndexCharacter( const OUStr
 }
 
 OUString SAL_CALL IndexEntrySupplier_ja_phonetic::getIndexKey( const OUString& IndexEntry,
-    const OUString& PhoneticEntry, const lang::Locale& rLocale )
+    const OUString& PhoneticEntry, const lang::Locale& rLocale ) 
     throw (com::sun::star::uno::RuntimeException)
 {
     return getIndexCharacter( PhoneticEntry.getLength() > 0 ? PhoneticEntry : IndexEntry, rLocale, OUString());
 }
 
-sal_Int16 SAL_CALL IndexEntrySupplier_ja_phonetic::compareIndexEntry(
+sal_Int16 SAL_CALL IndexEntrySupplier_ja_phonetic::compareIndexEntry( 
     const OUString& IndexEntry1, const OUString& PhoneticEntry1, const lang::Locale& rLocale1,
     const OUString& IndexEntry2, const OUString& PhoneticEntry2, const lang::Locale& rLocale2 )
     throw (com::sun::star::uno::RuntimeException)
@@ -70,7 +70,7 @@ sal_Int16 SAL_CALL IndexEntrySupplier_ja_phonetic::compareIndexEntry(
 
     if (result == 0)
         return IndexEntrySupplier_Common::compareIndexEntry(
-                    IndexEntry1, PhoneticEntry1, rLocale1,
+                    IndexEntry1, PhoneticEntry1, rLocale1, 
                     IndexEntry2, PhoneticEntry2, rLocale2);
     return result;
 }
diff --git a/i18npool/source/inputchecker/inputsequencechecker.cxx b/i18npool/source/inputchecker/inputsequencechecker.cxx
index 946cdd07064d..7214d29b17c7 100644
--- a/i18npool/source/inputchecker/inputsequencechecker.cxx
+++ b/i18npool/source/inputchecker/inputsequencechecker.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
@@ -59,7 +59,7 @@ InputSequenceCheckerImpl::~InputSequenceCheckerImpl()
         lookupTable.clear();
 }
 
-sal_Bool SAL_CALL
+sal_Bool SAL_CALL 
 InputSequenceCheckerImpl::checkInputSequence(const OUString& Text, sal_Int32 nStartPos,
         sal_Unicode inputChar, sal_Int16 inputCheckMode) throw(RuntimeException)
 {
@@ -74,7 +74,7 @@ InputSequenceCheckerImpl::checkInputSequence(const OUString& Text, sal_Int32 nSt
             return sal_True; // not a checkable languages.
 }
 
-sal_Int32 SAL_CALL
+sal_Int32 SAL_CALL 
 InputSequenceCheckerImpl::correctInputSequence(OUString& Text, sal_Int32 nStartPos,
         sal_Unicode inputChar, sal_Int16 inputCheckMode) throw(RuntimeException)
 {
@@ -102,7 +102,7 @@ InputSequenceCheckerImpl::getLanguageByScripType(sal_Unicode cChar, sal_Unicode
 {
     sal_Int16 type = unicode::getUnicodeScriptType( cChar, typeList, UnicodeScript_kScriptCount );
 
-    if (type != UnicodeScript_kScriptCount &&
+    if (type != UnicodeScript_kScriptCount && 
             type == unicode::getUnicodeScriptType( nChar, typeList, UnicodeScript_kScriptCount )) {
         switch(type) {
             case UnicodeScript_kThai:           return (sal_Char*)"th";
@@ -128,7 +128,7 @@ InputSequenceCheckerImpl::getInputSequenceChecker(sal_Char* rLanguage) throw (Ru
             }
 
             Reference < uno::XInterface > xI = xMSF->createInstance(
-                        OUString::createFromAscii("com.sun.star.i18n.InputSequenceChecker_") +
+                        OUString::createFromAscii("com.sun.star.i18n.InputSequenceChecker_") + 
                         OUString::createFromAscii(rLanguage));
 
             if ( xI.is() ) {
diff --git a/i18npool/source/inputchecker/inputsequencechecker_hi.cxx b/i18npool/source/inputchecker/inputsequencechecker_hi.cxx
index a265ef0a651e..80854cf869cb 100644
--- a/i18npool/source/inputchecker/inputsequencechecker_hi.cxx
+++ b/i18npool/source/inputchecker/inputsequencechecker_hi.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
@@ -32,9 +32,9 @@
 
 using namespace rtl;
 
-namespace com {
-namespace sun {
-namespace star {
+namespace com { 
+namespace sun { 
+namespace star { 
 namespace i18n {
 
 InputSequenceChecker_hi::InputSequenceChecker_hi()
@@ -46,24 +46,24 @@ InputSequenceChecker_hi::~InputSequenceChecker_hi()
 {
 }
 /* Non-Defined Class type */
-#define __ND        0
+#define __ND		0
 
 /*
  * Devanagari character type definitions
  */
 #define __UP  1  // ChandraBindu & Anuswar
-#define __NP  2  // Visarg
-#define __IV    3  // Independant Vowels
-#define __CN    4  // Consonants except _CK & _RC
-#define __CK    5  // Consonants that can be followed by Nukta
-#define __RC    6  // Ra
-#define __NM    7  // Matra
-#define __RM    8  // Ra + HAL
-#define __IM    9  // Choti I Matra
-#define __HL    10 // HAL
-#define __NK    11 // Nukta
-#define __VD    12 // Vedic
-#define __HD    13 // Hindu Numerals
+#define	__NP  2  // Visarg
+#define __IV	3  // Independant Vowels
+#define __CN	4  // Consonants except _CK & _RC 
+#define __CK	5  // Consonants that can be followed by Nukta
+#define __RC	6  // Ra
+#define __NM	7  // Matra
+#define __RM	8  // Ra + HAL
+#define __IM	9  // Choti I Matra
+#define __HL	10 // HAL
+#define __NK	11 // Nukta
+#define __VD	12 // Vedic
+#define __HD	13 // Hindu Numerals
 
 /*
  * Devanagari character type table
@@ -118,11 +118,11 @@ sal_Bool _DEV_Composible[2][2] = {
 #define getCharType(x) \
     ((x >= 0x0900 && x < 0x097f) ? devaCT[x - 0x0900] : __ND)
 
-sal_Bool SAL_CALL
-InputSequenceChecker_hi::checkInputSequence(const OUString& Text,
+sal_Bool SAL_CALL 
+InputSequenceChecker_hi::checkInputSequence(const OUString& Text, 
                                             sal_Int32       nStartPos,
-                                            sal_Unicode     inputChar,
-                                            sal_Int16       inputCheckMode)
+                                            sal_Unicode     inputChar, 
+                                            sal_Int16       inputCheckMode) 
   throw(com::sun::star::uno::RuntimeException)
 {
     sal_Unicode currentChar = Text[nStartPos];
@@ -132,16 +132,16 @@ InputSequenceChecker_hi::checkInputSequence(const OUString& Text,
     return (_DEV_Composible[inputCheckMode][dev_cell_check[ch2][ch1]]);
 }
 
-sal_Int32 SAL_CALL
-InputSequenceChecker_hi::correctInputSequence(OUString& Text,
+sal_Int32 SAL_CALL 
+InputSequenceChecker_hi::correctInputSequence(OUString& Text, 
                                             sal_Int32       nStartPos,
-                                            sal_Unicode     inputChar,
-                                            sal_Int16       inputCheckMode)
+                                            sal_Unicode     inputChar, 
+                                            sal_Int16       inputCheckMode) 
   throw(com::sun::star::uno::RuntimeException)
 {
     if (checkInputSequence(Text, nStartPos, inputChar, inputCheckMode))
         Text = Text.replaceAt(++nStartPos, 0, OUString(inputChar));
-    else
+    else 
         nStartPos=Text.getLength();
     return nStartPos;
 }
diff --git a/i18npool/source/inputchecker/inputsequencechecker_th.cxx b/i18npool/source/inputchecker/inputsequencechecker_th.cxx
index d4956c9758ea..75c7f34e5cf8 100644
--- a/i18npool/source/inputchecker/inputsequencechecker_th.cxx
+++ b/i18npool/source/inputchecker/inputsequencechecker_th.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
@@ -46,34 +46,34 @@ InputSequenceChecker_th::~InputSequenceChecker_th()
 
 /* Table for Thai Cell Manipulation */
 sal_Char _TAC_celltype_inputcheck[17][17] = {
-/* Cn */ /*  0,   1,   2,   3,   4,   5,   6,   7,   8,   9,   A,   B,   C,   D,   E,   F       */
-/* Cn-1 00 */{  'X', 'A', 'A', 'A', 'A', 'A', 'A', 'R', 'R', 'R', 'R', 'R', 'R', 'R', 'R', 'R', 'R' },
-     /* 10 */{  'X', 'A', 'A', 'A', 'S', 'S', 'A', 'R', 'R', 'R', 'R', 'R', 'R', 'R', 'R', 'R', 'R' },
-     /* 20 */{  'X', 'A', 'A', 'A', 'A', 'S', 'A', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C' },
-     /* 30 */{  'X', 'S', 'A', 'S', 'S', 'S', 'S', 'R', 'R', 'R', 'R', 'R', 'R', 'R', 'R', 'R', 'R' },
-     /* 40 */{  'X', 'A', 'A', 'A', 'A', 'S', 'A', 'R', 'R', 'R', 'R', 'R', 'R', 'R', 'R', 'R', 'R' },
-     /* 50 */{  'X', 'A', 'A', 'A', 'A', 'S', 'A', 'R', 'R', 'R', 'R', 'R', 'R', 'R', 'R', 'R', 'R' },
-     /* 60 */{  'X', 'A', 'A', 'A', 'S', 'A', 'S', 'R', 'R', 'R', 'R', 'R', 'R', 'R', 'R', 'R', 'R' },
-     /* 70 */{  'X', 'A', 'A', 'A', 'A', 'S', 'A', 'R', 'R', 'R', 'C', 'C', 'R', 'R', 'R', 'R', 'R' },
-     /* 80 */{  'X', 'A', 'A', 'A', 'S', 'S', 'A', 'R', 'R', 'R', 'C', 'R', 'R', 'R', 'R', 'R', 'R' },
-     /* 90 */{  'X', 'A', 'A', 'A', 'S', 'S', 'A', 'R', 'R', 'R', 'R', 'R', 'R', 'R', 'R', 'R', 'R' },
-     /* A0 */{  'X', 'A', 'A', 'A', 'A', 'A', 'A', 'R', 'R', 'R', 'R', 'R', 'R', 'R', 'R', 'R', 'R' },
-     /* B0 */{  'X', 'A', 'A', 'A', 'S', 'S', 'A', 'R', 'R', 'R', 'R', 'R', 'R', 'R', 'R', 'R', 'R' },
-     /* C0 */{  'X', 'A', 'A', 'A', 'S', 'S', 'A', 'R', 'R', 'R', 'R', 'R', 'R', 'R', 'R', 'R', 'R' },
-     /* D0 */{  'X', 'A', 'A', 'A', 'S', 'S', 'A', 'R', 'R', 'R', 'R', 'R', 'R', 'R', 'R', 'R', 'R' },
-     /* E0 */{  'X', 'A', 'A', 'A', 'S', 'S', 'A', 'R', 'R', 'R', 'C', 'C', 'R', 'R', 'R', 'R', 'R' },
-     /* F0 */{  'X', 'A', 'A', 'A', 'S', 'S', 'A', 'R', 'R', 'R', 'C', 'R', 'R', 'R', 'R', 'R', 'R' },
+/* Cn */ /*	 0,   1,   2,   3,   4,   5,   6,   7,   8,   9,   A,   B,   C,   D,   E,   F	    */
+/* Cn-1 00 */{	'X', 'A', 'A', 'A', 'A', 'A', 'A', 'R', 'R', 'R', 'R', 'R', 'R', 'R', 'R', 'R', 'R' },
+     /* 10 */{	'X', 'A', 'A', 'A', 'S', 'S', 'A', 'R', 'R', 'R', 'R', 'R', 'R', 'R', 'R', 'R', 'R' },
+     /* 20 */{	'X', 'A', 'A', 'A', 'A', 'S', 'A', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C' },
+     /*	30 */{	'X', 'S', 'A', 'S', 'S', 'S', 'S', 'R', 'R', 'R', 'R', 'R', 'R', 'R', 'R', 'R', 'R' },
+     /* 40 */{	'X', 'A', 'A', 'A', 'A', 'S', 'A', 'R', 'R', 'R', 'R', 'R', 'R', 'R', 'R', 'R', 'R' },
+     /* 50 */{	'X', 'A', 'A', 'A', 'A', 'S', 'A', 'R', 'R', 'R', 'R', 'R', 'R', 'R', 'R', 'R', 'R' },
+     /* 60 */{	'X', 'A', 'A', 'A', 'S', 'A', 'S', 'R', 'R', 'R', 'R', 'R', 'R', 'R', 'R', 'R', 'R' },
+     /* 70 */{	'X', 'A', 'A', 'A', 'A', 'S', 'A', 'R', 'R', 'R', 'C', 'C', 'R', 'R', 'R', 'R', 'R' },
+     /* 80 */{	'X', 'A', 'A', 'A', 'S', 'S', 'A', 'R', 'R', 'R', 'C', 'R', 'R', 'R', 'R', 'R', 'R' },
+     /* 90 */{	'X', 'A', 'A', 'A', 'S', 'S', 'A', 'R', 'R', 'R', 'R', 'R', 'R', 'R', 'R', 'R', 'R' },
+     /* A0 */{	'X', 'A', 'A', 'A', 'A', 'A', 'A', 'R', 'R', 'R', 'R', 'R', 'R', 'R', 'R', 'R', 'R' },
+     /* B0 */{	'X', 'A', 'A', 'A', 'S', 'S', 'A', 'R', 'R', 'R', 'R', 'R', 'R', 'R', 'R', 'R', 'R' },
+     /* C0 */{	'X', 'A', 'A', 'A', 'S', 'S', 'A', 'R', 'R', 'R', 'R', 'R', 'R', 'R', 'R', 'R', 'R' },
+     /* D0 */{	'X', 'A', 'A', 'A', 'S', 'S', 'A', 'R', 'R', 'R', 'R', 'R', 'R', 'R', 'R', 'R', 'R' },
+     /* E0 */{	'X', 'A', 'A', 'A', 'S', 'S', 'A', 'R', 'R', 'R', 'C', 'C', 'R', 'R', 'R', 'R', 'R' },
+     /* F0 */{	'X', 'A', 'A', 'A', 'S', 'S', 'A', 'R', 'R', 'R', 'C', 'R', 'R', 'R', 'R', 'R', 'R' },
          { 'X', 'A', 'A', 'A', 'S', 'S', 'A', 'R', 'R', 'R', 'C', 'R', 'C', 'R', 'R', 'R', 'R' }
 };
 
 sal_Bool _TAC_Composible[3][5] = {
-        /*  'A',    'C',        'S',        'R',        'X'   */
-/* Mode 0 */    {sal_True,  sal_True,   sal_True,   sal_True,   sal_True}, // PASSTHROUGH = 0
-/* Mode 1 */    {sal_True,  sal_True,   sal_True,   sal_False,      sal_True}, // BASIC = 1
-/* Mode 2 */    {sal_True,  sal_True,   sal_False,      sal_False,      sal_True}  // STRICT = 2
+        /*  'A',	'C',		'S',		'R',		'X'   */
+/* Mode 0 */    {sal_True,	sal_True,	sal_True,	sal_True,	sal_True}, // PASSTHROUGH = 0
+/* Mode 1 */    {sal_True,	sal_True,	sal_True,	sal_False,  	sal_True}, // BASIC = 1
+/* Mode 2 */    {sal_True,	sal_True,	sal_False,  	sal_False,  	sal_True}  // STRICT = 2
 };
 
-static sal_Bool SAL_CALL check(sal_Unicode ch1, sal_Unicode ch2, sal_Int16 inputCheckMode)
+static sal_Bool SAL_CALL check(sal_Unicode ch1, sal_Unicode ch2, sal_Int16 inputCheckMode) 
 {
     sal_Int16  composible_class;
     switch (_TAC_celltype_inputcheck[getCharType(ch1)][getCharType(ch2)]) {
@@ -87,18 +87,18 @@ static sal_Bool SAL_CALL check(sal_Unicode ch1, sal_Unicode ch2, sal_Int16 input
     return (_TAC_Composible[inputCheckMode][composible_class]);
 }
 
-sal_Bool SAL_CALL
+sal_Bool SAL_CALL 
 InputSequenceChecker_th::checkInputSequence(const OUString& Text, sal_Int32 nStartPos,
     sal_Unicode inputChar, sal_Int16 inputCheckMode) throw(com::sun::star::uno::RuntimeException)
 {
     return check(Text[nStartPos], inputChar, inputCheckMode);
 }
 
-sal_Int32 SAL_CALL
-InputSequenceChecker_th::correctInputSequence(OUString& Text,
+sal_Int32 SAL_CALL 
+InputSequenceChecker_th::correctInputSequence(OUString& Text, 
                                             sal_Int32       nStartPos,
-                                            sal_Unicode     inputChar,
-                                            sal_Int16       inputCheckMode)
+                                            sal_Unicode     inputChar, 
+                                            sal_Int16       inputCheckMode) 
   throw(com::sun::star::uno::RuntimeException)
 {
 /* 9 rules for input sequence correction, see issue i42661 for detail,
@@ -127,10 +127,10 @@ http://www.openoffice.org/issues/show_bug.cgi?id=42661
     else if (nStartPos > 0 && getCharType(Text[nStartPos-1]) == CT_CONS) {
         sal_uInt16 t1=getCharType(Text[nStartPos]), t2=getCharType(inputChar);
         if ( (CT_ABV(t1) && CT_ABV(t2)) || // 1.
-                (t1==CT_TONE && t2==CT_TONE) )// 2.
+                (t1==CT_TONE && t2==CT_TONE) )// 2. 
             Text = Text.replaceAt(nStartPos, 1, OUString(inputChar));
-        else if ( (t1==CT_TONE && CT_ABV(t2)) ||  // 5.
-                (t1==CT_FV1 && t2==CT_TONE) ||  // 6.
+        else if ( (t1==CT_TONE && CT_ABV(t2)) ||  // 5. 
+                (t1==CT_FV1 && t2==CT_TONE) ||  // 6. 
                 (Text[nStartPos]==0x0E4C && CT_ABV1(t2)) ) // 8.
             Text = Text.replaceAt(nStartPos++, 0, OUString(inputChar));
         else
@@ -139,8 +139,8 @@ http://www.openoffice.org/issues/show_bug.cgi?id=42661
         sal_uInt16 t1=getCharType(Text[nStartPos-1]), t2=getCharType(Text[nStartPos]), t3=getCharType(inputChar);
         if (CT_ABV(t1) && t2==CT_TONE && t3==CT_TONE) // 3.
             Text = Text.replaceAt(nStartPos, 1, OUString(inputChar));
-        else if ( (CT_ABV(t1) && t2==CT_TONE && CT_ABV(t3)) || // 4.
-                (t1==CT_TONE && t2==CT_FV1 && t3==CT_TONE) || // 7.
+        else if ( (CT_ABV(t1) && t2==CT_TONE && CT_ABV(t3)) || // 4. 
+                (t1==CT_TONE && t2==CT_FV1 && t3==CT_TONE) || // 7. 
                 (CT_ABV1(t1) && Text[nStartPos]==0x0E4C && CT_ABV1(t3)) ) // 9.
             Text = Text.replaceAt(nStartPos-1, 1, OUString(inputChar));
         else
diff --git a/i18npool/source/isolang/insys.cxx b/i18npool/source/isolang/insys.cxx
index 65d78ef8efe4..d67d9b3d1908 100644
--- a/i18npool/source/isolang/insys.cxx
+++ b/i18npool/source/isolang/insys.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
diff --git a/i18npool/source/isolang/inunx.cxx b/i18npool/source/isolang/inunx.cxx
index 5450f8b24c66..f32637e3ee1b 100644
--- a/i18npool/source/isolang/inunx.cxx
+++ b/i18npool/source/isolang/inunx.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
diff --git a/i18npool/source/isolang/inwnt.cxx b/i18npool/source/isolang/inwnt.cxx
index 2e07e8ea1322..d614e2feea3b 100644
--- a/i18npool/source/isolang/inwnt.cxx
+++ b/i18npool/source/isolang/inwnt.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
@@ -29,6 +29,8 @@
 
 #include <sal/config.h>
 
+#define WINVER 0x0500
+
 #ifdef _MSC_VER
 #pragma warning(push,1) // disable warnings within system headers
 #endif
diff --git a/i18npool/source/isolang/isolang.cxx b/i18npool/source/isolang/isolang.cxx
index 357be80a69ea..2ebe2e42ea6c 100644
--- a/i18npool/source/isolang/isolang.cxx
+++ b/i18npool/source/isolang/isolang.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
diff --git a/i18npool/source/isolang/langid.pl b/i18npool/source/isolang/langid.pl
index 8035178b7bb5..354e18d7eb1f 100755
--- a/i18npool/source/isolang/langid.pl
+++ b/i18npool/source/isolang/langid.pl
@@ -4,7 +4,7 @@ if 0;
 #*************************************************************************
 #
 # 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
diff --git a/i18npool/source/isolang/mslangid.cxx b/i18npool/source/isolang/mslangid.cxx
index a03d24e6fcdb..9b8573fb8913 100644
--- a/i18npool/source/isolang/mslangid.cxx
+++ b/i18npool/source/isolang/mslangid.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
@@ -443,7 +443,7 @@ LanguageType MsLangId::getReplacementForObsoleteLanguage( LanguageType nLang )
             nLang = LANGUAGE_LUXEMBOURGISH_LUXEMBOURG;
             break;
 
-        // The following are not strictly obsolete but should be mapped to a
+        // The following are not strictly obsolete but should be mapped to a 
         // replacement locale when encountered.
 
         // no_NO is an alias for nb_NO
@@ -451,7 +451,7 @@ LanguageType MsLangId::getReplacementForObsoleteLanguage( LanguageType nLang )
             nLang = LANGUAGE_NORWEGIAN_BOKMAL;
             break;
 
-        // #i94435# A Spanish variant that differs only in collation details we
+        // #i94435# A Spanish variant that differs only in collation details we 
         // do not support.
         case LANGUAGE_SPANISH_DATED:
             nLang = LANGUAGE_SPANISH_MODERN;
diff --git a/i18npool/source/localedata/LocaleNode.cxx b/i18npool/source/localedata/LocaleNode.cxx
index 7a520047637d..4548df532aee 100644
--- a/i18npool/source/localedata/LocaleNode.cxx
+++ b/i18npool/source/localedata/LocaleNode.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
@@ -258,7 +258,7 @@ void LocaleNode :: generateCode (const OFileWriter &of) const
                 pParameterName);
     }
     // write empty data if error
-    of.writeParameter( pParameterName, aVal);
+    of.writeParameter( pParameterName, aVal); 
     sal_Int32 nLen = aVal.getLength();
     if (nLen < nMinLen)
     {
@@ -293,7 +293,7 @@ void LocaleNode :: generateCode (const OFileWriter &of) const
         ++nError;
         fprintf( stderr, "Error: node %s not found.\n", pNodeName);
         // write empty data if error
-        of.writeParameter( pParameterName, aVal);
+        of.writeParameter( pParameterName, aVal); 
     }
     return aVal;
 }
@@ -493,7 +493,7 @@ void LCCTYPENode::generateCode (const OFileWriter &of) const
     if (aDoubleQuoteStart == aDoubleQuoteEnd)
         fprintf( stderr, "Warning: %s\n",
                 "DoubleQuotationStart equals DoubleQuotationEnd. Not necessarily an error, but unusual.");
-    /* TODO: should equalness of single and double quotes be an error? Would
+    /* TODO: should equalness of single and double quotes be an error? Would 
      * need to adapt quite some locales' data. */
     if (aQuoteStart == aDoubleQuoteStart)
         fprintf( stderr, "Warning: %s\n",
@@ -569,7 +569,7 @@ void LCFormatNode::generateCode (const OFileWriter &of) const
         OUString aUsage;
         OUString aType;
         OUString aFormatIndex;
-        //      currNode -> print();
+        //		currNode -> print();
         const Attr *  currNodeAttr = currNode->getAttr();
         //printf ("getLen() = %d\n", currNode->getAttr()->getLength());
 
@@ -651,11 +651,11 @@ void LCFormatNode::generateCode (const OFileWriter &of) const
                 // Currency formats should be something like [C]###0;-[C]###0
                 // and not parenthesized [C]###0;([C]###0) if not en_US.
                 case cssi::NumberFormatIndex::CURRENCY_1000INT :
-                case cssi::NumberFormatIndex::CURRENCY_1000INT_RED :
-                case cssi::NumberFormatIndex::CURRENCY_1000DEC2 :
-                case cssi::NumberFormatIndex::CURRENCY_1000DEC2_RED :
-                case cssi::NumberFormatIndex::CURRENCY_1000DEC2_CCC :
-                case cssi::NumberFormatIndex::CURRENCY_1000DEC2_DASHED :
+                case cssi::NumberFormatIndex::CURRENCY_1000INT_RED :  
+                case cssi::NumberFormatIndex::CURRENCY_1000DEC2 :  
+                case cssi::NumberFormatIndex::CURRENCY_1000DEC2_RED :  
+                case cssi::NumberFormatIndex::CURRENCY_1000DEC2_CCC :  
+                case cssi::NumberFormatIndex::CURRENCY_1000DEC2_DASHED :  
                     if (strcmp( of.getLocale(), "en_US") != 0)
                     {
                         OUString aCode( n->getValue());
@@ -1269,10 +1269,10 @@ void LCCalendarNode::generateCode (const OFileWriter &of) const
         } else {
             for(j = 0; j < nbOfDays[i]; j++) {
                 of.writeAsciiString("\tdayID");
-                of.writeInt(i); of.writeInt(j); of.writeAsciiString(",\n");
+                of.writeInt(i);	of.writeInt(j);	of.writeAsciiString(",\n");
                 of.writeAsciiString("\tdayDefaultAbbrvName");
-                of.writeInt(i); of.writeInt(j); of.writeAsciiString(",\n");
-                of.writeAsciiString("\tdayDefaultFullName");of.writeInt(i); of.writeInt(j); of.writeAsciiString(",\n");
+                of.writeInt(i);	of.writeInt(j);	of.writeAsciiString(",\n");
+                of.writeAsciiString("\tdayDefaultFullName");of.writeInt(i);	of.writeInt(j);	of.writeAsciiString(",\n");
             }
         }
         if (nbOfMonths[i] == 0) {
@@ -1294,13 +1294,13 @@ void LCCalendarNode::generateCode (const OFileWriter &of) const
             of.writeInt(i); of.writeAsciiString(",\n");
         } else {
             for(j = 0; j < nbOfEras[i]; j++) {
-                of.writeAsciiString("\teraID"); of.writeInt(i); of.writeInt(j); of.writeAsciiString(",\n");
+                of.writeAsciiString("\teraID");	of.writeInt(i);	of.writeInt(j);	of.writeAsciiString(",\n");
                 of.writeAsciiString("\teraDefaultAbbrvName");of.writeInt(i);of.writeInt(j);of.writeAsciiString(",\n");
                 of.writeAsciiString("\teraDefaultFullName");of.writeInt(i);of.writeInt(j);of.writeAsciiString(",\n");
             }
         }
-        of.writeAsciiString("\tstartDayOfWeek");of.writeInt(i); of.writeAsciiString(",\n");
-        of.writeAsciiString("\tminimalDaysInFirstWeek");of.writeInt(i); of.writeAsciiString(",\n");
+        of.writeAsciiString("\tstartDayOfWeek");of.writeInt(i);	of.writeAsciiString(",\n");
+        of.writeAsciiString("\tminimalDaysInFirstWeek");of.writeInt(i);	of.writeAsciiString(",\n");
     }
 
     of.writeAsciiString("};\n\n");
@@ -1365,7 +1365,7 @@ void LCCurrencyNode :: generateCode (const OFileWriter &of) const
         of.writeParameter("currencySymbol", str, nbOfCurrencies);
         str = calNode -> findNode ("BankSymbol") -> getValue();
         of.writeParameter("bankSymbol", str, nbOfCurrencies);
-        // BankSymbol currently must be ISO 4217. May change later if
+        // BankSymbol currently must be ISO 4217. May change later if 
         // application always uses CurrencyID instead of BankSymbol.
         if (!bLegacy && !isIso4217(str))
             incError( "BankSymbol is not ISO 4217");
diff --git a/i18npool/source/localedata/LocaleNode.hxx b/i18npool/source/localedata/LocaleNode.hxx
index bf1bd1a9c4ab..a20e749de4c8 100644
--- a/i18npool/source/localedata/LocaleNode.hxx
+++ b/i18npool/source/localedata/LocaleNode.hxx
@@ -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
diff --git a/i18npool/source/localedata/data/dz_BT.xml b/i18npool/source/localedata/data/dz_BT.xml
index 6bb1d8951064..7b21b633d5fe 100644
--- a/i18npool/source/localedata/data/dz_BT.xml
+++ b/i18npool/source/localedata/data/dz_BT.xml
@@ -118,7 +118,7 @@
       <FormatCode>[NatNum1]"སྤྱི་ལོ" YYYY "ཟླ་" M "ཚེས་" DD</FormatCode>
       <DefaultName></DefaultName>
     </FormatElement>
-    <!-- Time format was originally "ཆུ་ཚོད་" HH "སྐར་མ་" MM "སྐར་ཆ་་" SS -->
+    <!-- Time format was originally "ཆུ་ཚོད་" HH "སྐར་མ་" MM "སྐར་ཆ་་" SS -->            
     <!-- Replaced with HH:MM:SS until more information is available -->
     <FormatElement msgid="TimeFormatskey1" default="false" type="short" usage="TIME"  formatindex="39">
       <FormatCode>HH:MM</FormatCode>
@@ -249,7 +249,7 @@
       <DefaultName></DefaultName>
     </FormatElement>
     <FormatElement msgid="PercentFormatskey1" default="true" type="short" usage="PERCENT_NUMBER"  formatindex="8">
-      <!-- Percentage formats other than % sign are not possible in 2.0  0 "བརྒྱ་ཆ་་" is replaced by % -->
+      <!-- Percentage formats other than % sign are not possible in 2.0  0 "བརྒྱ་ཆ་་" is replaced by % -->            
       <FormatCode>[NatNum1]0%</FormatCode>
       <DefaultName></DefaultName>
     </FormatElement>
@@ -297,7 +297,7 @@
       <DaysOfWeek>
         <Day>
           <DayID>sun</DayID>
-          <DefaultAbbrvName>ཟླ་   </DefaultAbbrvName>
+          <DefaultAbbrvName>ཟླ་	</DefaultAbbrvName>
           <DefaultFullName>གཟའ་ཟླ་བ་</DefaultFullName>
         </Day>
         <Day>
@@ -449,7 +449,7 @@
    </LC_NumberingLevel>
    <LC_OutLineNumberingLevel>
     <OutlineStyle>
-    <OutLineNumberingLevel Prefix=" " NumType="4" Suffix=" " BulletChar="0020"  BulletFontName=""            ParentNumbering="0"    LeftMargin="0" SymbolTextDistance="50" FirstLineOffset="0" />
+    <OutLineNumberingLevel Prefix=" " NumType="4" Suffix=" " BulletChar="0020"  BulletFontName=""            ParentNumbering="0" 	LeftMargin="0" SymbolTextDistance="50" FirstLineOffset="0" />
     <OutLineNumberingLevel Prefix=" " NumType="4" Suffix=" " BulletChar="0020"  BulletFontName=""            ParentNumbering="1" LeftMargin="50" SymbolTextDistance="50" FirstLineOffset="0" />
     <OutLineNumberingLevel Prefix=" " NumType="4" Suffix=" " BulletChar="0020"  BulletFontName=""            ParentNumbering="2" LeftMargin="100" SymbolTextDistance="50" FirstLineOffset="0" />
     <OutLineNumberingLevel Prefix=" " NumType="4" Suffix=" " BulletChar="0020"  BulletFontName=""            ParentNumbering="3" LeftMargin="150" SymbolTextDistance="50" FirstLineOffset="0" />
diff --git a/i18npool/source/localedata/data/fa_IR.xml b/i18npool/source/localedata/data/fa_IR.xml
index 95a64f392c4d..b5e7380e4a34 100644
--- a/i18npool/source/localedata/data/fa_IR.xml
+++ b/i18npool/source/localedata/data/fa_IR.xml
@@ -307,7 +307,7 @@
       </StartDayOfWeek>
       <MinimalDaysInFirstWeek>1</MinimalDaysInFirstWeek>
     </Calendar>
-
+    
     <Calendar unoid="gregorian" default="false">
       <DaysOfWeek>
         <Day>
diff --git a/i18npool/source/localedata/filewriter.cxx b/i18npool/source/localedata/filewriter.cxx
index 04af1e091954..c9f115e16873 100644
--- a/i18npool/source/localedata/filewriter.cxx
+++ b/i18npool/source/localedata/filewriter.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
diff --git a/i18npool/source/localedata/localedata.cxx b/i18npool/source/localedata/localedata.cxx
index 34f4f6bbb520..7384bee2af99 100644
--- a/i18npool/source/localedata/localedata.cxx
+++ b/i18npool/source/localedata/localedata.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
@@ -429,13 +429,13 @@ oslGenericFunction SAL_CALL lcl_LookupTableHelper::getFunctionSymbolByName(
             if ( module->loadRelative(&thisModule, aBuf.makeStringAndClear()) )
             {
                 ::osl::MutexGuard aGuard( maMutex );
-                LocaleDataLookupTableItem* pNewItem = 0;
+                LocaleDataLookupTableItem* pNewItem = 0; 
                 maLookupTable.push_back(pNewItem = new LocaleDataLookupTableItem(aLibTable[i].pLib, module, aLibTable[i].pLocale ));
                 OSL_ASSERT( pOutCachedItem );
                 if( pOutCachedItem )
                 {
                     (*pOutCachedItem) = new LocaleDataLookupTableItem( *pNewItem );
-                    return module->getFunctionSymbol(
+                    return module->getFunctionSymbol( 
                         aBuf.appendAscii(pFunction).append(under).
                         appendAscii((*pOutCachedItem)->localeName).makeStringAndClear());
                 }
@@ -853,7 +853,7 @@ LocaleData::hasPhonetic( const Locale& rLocale ) throw(RuntimeException)
         return sal_False;
 }
 
-sal_Unicode ** SAL_CALL
+sal_Unicode ** SAL_CALL 
 LocaleData::getIndexArrayForAlgorithm(const Locale& rLocale, const OUString& algorithm)
 {
         sal_Int16 indexCount = 0;
diff --git a/i18npool/source/localedata/saxparser.cxx b/i18npool/source/localedata/saxparser.cxx
index 9787b9c810a6..6ebdec19fcd0 100644
--- a/i18npool/source/localedata/saxparser.cxx
+++ b/i18npool/source/localedata/saxparser.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
@@ -144,7 +144,7 @@ class TestDocumentHandler :
 {
 public:
     TestDocumentHandler(const char* locale, const char* outFile ) :
-      rootNode(0), nError(0), nbOfCurrencies(0), nbOfCalendars(0), nbOfFormatElements(0),
+      rootNode(0), nError(0), nbOfCurrencies(0), nbOfCalendars(0), nbOfFormatElements(0), 
       nbOfTransliterations(0), nbOfCollations(0), nbOfDays(50), nbOfMonths(50), nbOfEras(10),
       flag(-1), of(outFile, locale), isStartDayOfWeek(false), foundDefaultName(false),
       foundVariant(false), openElement(false)
@@ -393,7 +393,7 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv)
         // create and connect the document handler to the parser
         TestDocumentHandler *pDocHandler = new TestDocumentHandler( argv[1], argv[3]);
 
-        Reference < XDocumentHandler >  rDocHandler( (XDocumentHandler *) pDocHandler );
+        Reference < XDocumentHandler >	rDocHandler( (XDocumentHandler *) pDocHandler );
         Reference< XEntityResolver > rEntityResolver( (XEntityResolver *) pDocHandler );
 
         rParser->setDocumentHandler( rDocHandler );
@@ -402,7 +402,7 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv)
         // create the input stream
         InputSource source;
         source.aInputStream = createStreamFromFile( argv[2] );
-        source.sSystemId    = OUString::createFromAscii( argv[2] );
+        source.sSystemId 	= OUString::createFromAscii( argv[2] );
 
         try
         {
diff --git a/i18npool/source/nativenumber/data/numberchar.h b/i18npool/source/nativenumber/data/numberchar.h
index 542bf8a81b85..a16fd7bbb593 100644
--- a/i18npool/source/nativenumber/data/numberchar.h
+++ b/i18npool/source/nativenumber/data/numberchar.h
@@ -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
@@ -29,41 +29,41 @@
 
 namespace com { namespace sun { namespace star { namespace i18n {
 
-static const sal_Int16 NumberChar_HalfWidth     = 0;
-static const sal_Int16 NumberChar_FullWidth     = 1;
-static const sal_Int16 NumberChar_Lower_zh  = 2;
-static const sal_Int16 NumberChar_Upper_zh  = 3;
-static const sal_Int16 NumberChar_Upper_zh_TW   = 4;
-static const sal_Int16 NumberChar_Modern_ja     = 5;
+static const sal_Int16 NumberChar_HalfWidth 	= 0;
+static const sal_Int16 NumberChar_FullWidth 	= 1;
+static const sal_Int16 NumberChar_Lower_zh 	= 2;
+static const sal_Int16 NumberChar_Upper_zh 	= 3;
+static const sal_Int16 NumberChar_Upper_zh_TW 	= 4;
+static const sal_Int16 NumberChar_Modern_ja 	= 5;
 static const sal_Int16 NumberChar_Traditional_ja= 6;
-static const sal_Int16 NumberChar_Lower_ko  = 7;
-static const sal_Int16 NumberChar_Upper_ko  = 8;
-static const sal_Int16 NumberChar_Hangul_ko     = 9;
-static const sal_Int16 NumberChar_Indic_ar  = 10;
+static const sal_Int16 NumberChar_Lower_ko 	= 7;
+static const sal_Int16 NumberChar_Upper_ko 	= 8;
+static const sal_Int16 NumberChar_Hangul_ko 	= 9;
+static const sal_Int16 NumberChar_Indic_ar 	= 10;
 static const sal_Int16 NumberChar_EastIndic_ar  = 11;
-static const sal_Int16 NumberChar_hi        = 12;
-static const sal_Int16 NumberChar_th        = 13;
-static const sal_Int16 NumberChar_or        = 14;
-static const sal_Int16 NumberChar_mr        = 15;
-static const sal_Int16 NumberChar_bn        = 16;
-static const sal_Int16 NumberChar_pa        = 17;
-static const sal_Int16 NumberChar_gu        = 18;
-static const sal_Int16 NumberChar_ta        = 19;
-static const sal_Int16 NumberChar_te        = 20;
-static const sal_Int16 NumberChar_kn        = 21;
-static const sal_Int16 NumberChar_ml        = 22;
-static const sal_Int16 NumberChar_lo        = 23;
-static const sal_Int16 NumberChar_bo        = 24;
-static const sal_Int16 NumberChar_my        = 25;
-static const sal_Int16 NumberChar_km        = 26;
-static const sal_Int16 NumberChar_mn        = 27;
-static const sal_Int16 NumberChar_he        = 28;
-static const sal_Int16 NumberChar_ne        = 29;
-static const sal_Int16 NumberChar_dz        = 30;
-static const sal_Int16 NumberChar_Count     = 31;
+static const sal_Int16 NumberChar_hi 		= 12;
+static const sal_Int16 NumberChar_th 		= 13;
+static const sal_Int16 NumberChar_or 		= 14;
+static const sal_Int16 NumberChar_mr 		= 15;
+static const sal_Int16 NumberChar_bn 		= 16;
+static const sal_Int16 NumberChar_pa 		= 17;
+static const sal_Int16 NumberChar_gu 		= 18;
+static const sal_Int16 NumberChar_ta 		= 19;
+static const sal_Int16 NumberChar_te 		= 20;
+static const sal_Int16 NumberChar_kn 		= 21;
+static const sal_Int16 NumberChar_ml 		= 22;
+static const sal_Int16 NumberChar_lo 		= 23;
+static const sal_Int16 NumberChar_bo 		= 24;
+static const sal_Int16 NumberChar_my 		= 25;
+static const sal_Int16 NumberChar_km 		= 26;
+static const sal_Int16 NumberChar_mn 		= 27;
+static const sal_Int16 NumberChar_he 		= 28;
+static const sal_Int16 NumberChar_ne 		= 29;
+static const sal_Int16 NumberChar_dz 		= 30;
+static const sal_Int16 NumberChar_Count 	= 31;
 
 static sal_Unicode NumberChar[][10] = {
-//  0   1   2   3   4   5   6   7   8   9
+//	0	1	2	3	4	5	6	7	8	9
     { 0x0030, 0x0031, 0x0032, 0x0033, 0x0034, 0x0035, 0x0036, 0x0037, 0x0038, 0x0039 }, // Half Width (Ascii)
     { 0xFF10, 0xFF11, 0xFF12, 0xFF13, 0xFF14, 0xFF15, 0xFF16, 0xFF17, 0xFF18, 0xFF19 }, // Full Width
     { 0x3007, 0x4E00, 0x4E8c, 0x4E09, 0x56DB, 0x4E94, 0x516D, 0x4E03, 0x516B, 0x4E5D }, // Chinese Lower
@@ -146,7 +146,7 @@ static sal_Unicode MinusChar[] = {
     0x2212, // Est. Arabic Indic
     0x0000, // Indic
     0x0000, // Thai
-    0x0000, // Oriya
+    0x0000, // Oriya 
     0x0000, // Marathi
     0x0000, // Bengali
     0x0000, // Punjabi
@@ -180,7 +180,7 @@ static sal_uInt16 SeparatorChar[] = {
     0x066C, // Est. Arabic Indic
     0x0000, // Indic
     0x0000, // Thai
-    0x0000, // Oriya
+    0x0000, // Oriya 
     0x0000, // Marathi
     0x0000, // Bengali
     0x0000, // Punjabi
@@ -199,44 +199,44 @@ static sal_uInt16 SeparatorChar[] = {
     0x0000, // Dzongkha
 };
 
-#define NUMBER_ZERO     NumberChar[NumberChar_HalfWidth][0] // 0x0030
-#define NUMBER_ONE      NumberChar[NumberChar_HalfWidth][1]     // 0x0031
-#define NUMBER_NINE     NumberChar[NumberChar_HalfWidth][9]     // 0x0039
-#define isNumber(n)     ( NUMBER_ZERO <= n && n <= NUMBER_NINE )
-#define isDecimal(n)    ( n == DecimalChar[NumberChar_HalfWidth] )
-#define isMinus(n)      ( n == MinusChar[NumberChar_HalfWidth] )
+#define NUMBER_ZERO     NumberChar[NumberChar_HalfWidth][0]	// 0x0030
+#define NUMBER_ONE  	NumberChar[NumberChar_HalfWidth][1]     // 0x0031
+#define NUMBER_NINE  	NumberChar[NumberChar_HalfWidth][9]     // 0x0039
+#define isNumber(n) 	( NUMBER_ZERO <= n && n <= NUMBER_NINE )
+#define isDecimal(n) 	( n == DecimalChar[NumberChar_HalfWidth] )
+#define isMinus(n) 	    ( n == MinusChar[NumberChar_HalfWidth] )
 #define isSeparator(n)  ( n == SeparatorChar[NumberChar_HalfWidth] )
 
-const sal_Int16 Multiplier_Lower_zh     = 0;
-const sal_Int16 Multiplier_Upper_zh     = 1;
-const sal_Int16 Multiplier_Lower_zh_TW  = 2;
-const sal_Int16 Multiplier_Upper_zh_TW  = 3;
-const sal_Int16 Multiplier_Lower_ko     = 4;
-const sal_Int16 Multiplier_Hangul_ko    = 5;
-const sal_Int16 Multiplier_Modern_ja    = 6;
+const sal_Int16 Multiplier_Lower_zh 	= 0;
+const sal_Int16 Multiplier_Upper_zh 	= 1;
+const sal_Int16 Multiplier_Lower_zh_TW 	= 2;
+const sal_Int16 Multiplier_Upper_zh_TW 	= 3;
+const sal_Int16 Multiplier_Lower_ko 	= 4;
+const sal_Int16 Multiplier_Hangul_ko 	= 5;
+const sal_Int16 Multiplier_Modern_ja 	= 6;
 const sal_Int16 Multiplier_Traditional_ja = 7;
-const sal_Int16 Multiplier_Count    = 8;
+const sal_Int16 Multiplier_Count	= 8;
 
-const sal_Int16 ExponentCount_6_CJK     = 6;
+const sal_Int16 ExponentCount_6_CJK 	= 6;
 
 static sal_Int16 MultiplierExponent_6_CJK[ExponentCount_6_CJK] = {
-        12,     8,  4,  3,  2,  1
+        12, 	8, 	4, 	3, 	2, 	1
 };
 static sal_Unicode MultiplierChar_6_CJK[][ExponentCount_6_CJK] = {
-    {0x5146, 0x4EBF, 0x4E07, 0x5343, 0x767E, 0x5341},   // S. Chinese Lower
-    {0x5146, 0x4EBF, 0x4E07, 0x4EDF, 0x4F70, 0x62FE},   // S. Chinese Upper
-    {0x5146, 0x5104, 0x842C, 0x5343, 0x767E, 0x5341},   // T. Chinese Lower
-    {0x5146, 0x5104, 0x842C, 0x4EDF, 0x4F70, 0x62FE},   // T. Chinese & Korean Upper
-    {0x5146, 0x5104, 0x4E07, 0x5343, 0x767E, 0x5341},   // Korean Lower
-    {0xC870, 0xC5B5, 0xB9CC, 0xCC9C, 0xBC31, 0xC2ED},   // Korean Hangul
-    {0x5146, 0x5104, 0x4E07, 0x5343, 0x767E, 0x5341},   // Japanese Modern
-    {0x5146, 0x5104, 0x842C, 0x9621, 0x767E, 0x62FE}    // Japanese Traditional
+    {0x5146, 0x4EBF, 0x4E07, 0x5343, 0x767E, 0x5341},	// S. Chinese Lower
+    {0x5146, 0x4EBF, 0x4E07, 0x4EDF, 0x4F70, 0x62FE},	// S. Chinese Upper
+    {0x5146, 0x5104, 0x842C, 0x5343, 0x767E, 0x5341},	// T. Chinese Lower
+    {0x5146, 0x5104, 0x842C, 0x4EDF, 0x4F70, 0x62FE},	// T. Chinese & Korean Upper
+    {0x5146, 0x5104, 0x4E07, 0x5343, 0x767E, 0x5341},	// Korean Lower
+    {0xC870, 0xC5B5, 0xB9CC, 0xCC9C, 0xBC31, 0xC2ED},	// Korean Hangul
+    {0x5146, 0x5104, 0x4E07, 0x5343, 0x767E, 0x5341},	// Japanese Modern
+    {0x5146, 0x5104, 0x842C, 0x9621, 0x767E, 0x62FE}	// Japanese Traditional
 };
 
-const sal_Int16 ExponentCount_2_CJK     = 2;
+const sal_Int16 ExponentCount_2_CJK 	= 2;
 
 static sal_Int16 MultiplierExponent_2_CJK[ExponentCount_2_CJK] = {
-        8,  4,
+        8, 	4,
 };
 
 static sal_Unicode MultiplierChar_2_CJK[][ExponentCount_2_CJK] = {
@@ -250,20 +250,20 @@ static sal_Unicode MultiplierChar_2_CJK[][ExponentCount_2_CJK] = {
     {0x5104, 0x842C}  // Japanese Traditional
 };
 
-const sal_Int16 ExponentCount_7_CJK     = 7;
+const sal_Int16 ExponentCount_7_CJK 	= 7;
 
 static sal_Int16 MultiplierExponent_7_CJK[ExponentCount_7_CJK] = {
-        16, 12,     8,  4,  3,  2,  1
+        16,	12, 	8, 	4, 	3, 	2, 	1
 };
 static sal_Unicode MultiplierChar_7_CJK[][ExponentCount_7_CJK] = {
-    {0x4EAC, 0x5146, 0x4EBF, 0x4E07, 0x5343, 0x767E, 0x5341},   // S. Chinese Lower
-    {0x4EAC, 0x5146, 0x4EBF, 0x4E07, 0x4EDF, 0x4F70, 0x62FE},   // S. Chinese Upper
-    {0x4EAC, 0x5146, 0x5104, 0x842C, 0x5343, 0x767E, 0x5341},   // T. Chinese Lower
-    {0x4EAC, 0x5146, 0x5104, 0x842C, 0x4EDF, 0x4F70, 0x62FE},   // T. Chinese & Korean Upper
-    {0x4EAC, 0x5146, 0x5104, 0x4E07, 0x5343, 0x767E, 0x5341},   // Korean Lower
-    {0x4EAC, 0xC870, 0xC5B5, 0xB9CC, 0xCC9C, 0xBC31, 0xC2ED},   // Korean Hangul
-    {0x4EAC, 0x5146, 0x5104, 0x4E07, 0x5343, 0x767E, 0x5341},   // Japanese Modern
-    {0x4EAC, 0x5146, 0x5104, 0x842C, 0x9621, 0x767E, 0x62FE}    // Japanese Traditional
+    {0x4EAC, 0x5146, 0x4EBF, 0x4E07, 0x5343, 0x767E, 0x5341},	// S. Chinese Lower
+    {0x4EAC, 0x5146, 0x4EBF, 0x4E07, 0x4EDF, 0x4F70, 0x62FE},	// S. Chinese Upper
+    {0x4EAC, 0x5146, 0x5104, 0x842C, 0x5343, 0x767E, 0x5341},	// T. Chinese Lower
+    {0x4EAC, 0x5146, 0x5104, 0x842C, 0x4EDF, 0x4F70, 0x62FE},	// T. Chinese & Korean Upper
+    {0x4EAC, 0x5146, 0x5104, 0x4E07, 0x5343, 0x767E, 0x5341},	// Korean Lower
+    {0x4EAC, 0xC870, 0xC5B5, 0xB9CC, 0xCC9C, 0xBC31, 0xC2ED},	// Korean Hangul
+    {0x4EAC, 0x5146, 0x5104, 0x4E07, 0x5343, 0x767E, 0x5341},	// Japanese Modern
+    {0x4EAC, 0x5146, 0x5104, 0x842C, 0x9621, 0x767E, 0x62FE}	// Japanese Traditional
 };
 
 typedef struct {
diff --git a/i18npool/source/nativenumber/nativenumbersupplier.cxx b/i18npool/source/nativenumber/nativenumbersupplier.cxx
index 53d6e037b0f9..d5193fb7281c 100644
--- a/i18npool/source/nativenumber/nativenumbersupplier.cxx
+++ b/i18npool/source/nativenumber/nativenumbersupplier.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
@@ -73,7 +73,7 @@ namespace com { namespace sun { namespace star { namespace i18n {
 
 OUString SAL_CALL getHebrewNativeNumberString(const OUString& aNumberString, sal_Bool useGeresh);
 
-OUString SAL_CALL AsciiToNativeChar( const OUString& inStr, sal_Int32 startPos, sal_Int32 nCount,
+OUString SAL_CALL AsciiToNativeChar( const OUString& inStr, sal_Int32 startPos, sal_Int32 nCount, 
         Sequence< sal_Int32 >& offset, sal_Bool useOffset, sal_Int16 number ) throw(RuntimeException)
 {
         const sal_Unicode *src = inStr.getStr() + startPos;
@@ -89,7 +89,7 @@ OUString SAL_CALL AsciiToNativeChar( const OUString& inStr, sal_Int32 startPos,
                 if (i > 0 && isNumber(src[i-1]) && isSeparator(ch))
                     newStr->buffer[i] = SeparatorChar[number] ? SeparatorChar[number] : ch;
                 else
-                    newStr->buffer[i] = isDecimal(ch) ? (DecimalChar[number] ? DecimalChar[number] : ch) :
+                    newStr->buffer[i] = isDecimal(ch) ? (DecimalChar[number] ? DecimalChar[number] : ch) : 
                             isMinus(ch) ? (MinusChar[number] ? MinusChar[number] : ch) : ch;
             }
             else
@@ -151,7 +151,7 @@ sal_Bool SAL_CALL AsciiToNative_numberMaker(const sal_Unicode *str, sal_Int32 be
             for (sal_Int16 i = 1; i <= number->exponentCount; i++) {
                 sal_Int32 tmp = len - (i == number->exponentCount ? 0 : number->multiplierExponent[i]);
                 if (tmp > 0) {
-                    printPower |= AsciiToNative_numberMaker(str, begin, tmp, dst, count,
+                    printPower |= AsciiToNative_numberMaker(str, begin, tmp, dst, count, 
                         (i == number->exponentCount ? -1 : i), offset, useOffset, startPos, number, numberChar);
                     begin += tmp;
                     len -= tmp;
@@ -178,10 +178,10 @@ OUString SAL_CALL AsciiToNative( const OUString& inStr, sal_Int32 startPos, sal_
         sal_Int32 strLen = inStr.getLength() - startPos;
         sal_Unicode *numberChar = NumberChar[number->number];
 
-        if (nCount > strLen)
+        if (nCount > strLen) 
             nCount = strLen;
 
-        if (nCount > 0) {
+        if (nCount > 0) { 
             const sal_Unicode *str = inStr.getStr() + startPos;
             rtl_uString *newStr = x_rtl_uString_new_WithLength(nCount * 2);
             rtl_uString *srcStr = x_rtl_uString_new_WithLength(nCount); // for keeping number without comma
@@ -270,7 +270,7 @@ static void SAL_CALL NativeToAscii_numberMaker(sal_Int16 max, sal_Int16 prev, co
                 shift = end = 0;
                 if (curr >= max)
                     max = curr;
-                else if (curr > prev)
+                else if (curr > prev) 
                     shift = max - curr;
                 else
                     end = curr;
@@ -289,7 +289,7 @@ static void SAL_CALL NativeToAscii_numberMaker(sal_Int16 max, sal_Int16 prev, co
                     }
                     max = curr;
                 }
-                NativeToAscii_numberMaker(max, curr, str, i, nCount, dst,
+                NativeToAscii_numberMaker(max, curr, str, i, nCount, dst, 
                         count, offset, useOffset, numberChar, multiplierChar);
                 return;
             } else
@@ -303,15 +303,15 @@ static void SAL_CALL NativeToAscii_numberMaker(sal_Int16 max, sal_Int16 prev, co
         }
 }
 
-static OUString SAL_CALL NativeToAscii(const OUString& inStr,
+static OUString SAL_CALL NativeToAscii(const OUString& inStr, 
         sal_Int32 startPos, sal_Int32 nCount, Sequence< sal_Int32 >& offset, sal_Bool useOffset ) throw(RuntimeException)
 {
         sal_Int32 strLen = inStr.getLength() - startPos;
 
-        if (nCount > strLen)
+        if (nCount > strLen) 
             nCount = strLen;
 
-        if (nCount > 0) {
+        if (nCount > 0) { 
             const sal_Unicode *str = inStr.getStr() + startPos;
             rtl_uString *newStr = x_rtl_uString_new_WithLength(nCount * MultiplierExponent_7_CJK[0] + 1);
             if (useOffset)
@@ -342,20 +342,20 @@ static OUString SAL_CALL NativeToAscii(const OUString& inStr,
                 } else {
                     if ((index = numberChar.indexOf(str[i])) >= 0)
                         newStr->buffer[count] = sal::static_int_cast<sal_Unicode>( (index % 10) + NUMBER_ZERO );
-                    else if ((index = separatorChar.indexOf(str[i])) >= 0 &&
+                    else if ((index = separatorChar.indexOf(str[i])) >= 0 && 
                             (i < nCount-1 && (numberChar.indexOf(str[i+1]) >= 0 ||
                                             multiplierChar.indexOf(str[i+1]) >= 0)))
                         newStr->buffer[count] = SeparatorChar[NumberChar_HalfWidth];
                     else if ((index = decimalChar.indexOf(str[i])) >= 0 &&
                             (i < nCount-1 && (numberChar.indexOf(str[i+1]) >= 0 ||
                                             multiplierChar.indexOf(str[i+1]) >= 0)))
-                        // Only when decimal point is followed by numbers,
+                        // Only when decimal point is followed by numbers, 
                         // it will be convert to ASCII decimal point
                         newStr->buffer[count] = DecimalChar[NumberChar_HalfWidth];
                     else if ((index = minusChar.indexOf(str[i])) >= 0 &&
                             (i < nCount-1 && (numberChar.indexOf(str[i+1]) >= 0 ||
                                             multiplierChar.indexOf(str[i+1]) >= 0)))
-                        // Only when minus is followed by numbers,
+                        // Only when minus is followed by numbers, 
                         // it will be convert to ASCII minus sign
                         newStr->buffer[count] = MinusChar[NumberChar_HalfWidth];
                     else
@@ -574,8 +574,8 @@ OUString SAL_CALL NativeNumberSupplier::getNativeNumberString(const OUString& aN
         }
 
         if (number || num >= 0) {
-            if (!aLocale.Language.equals(rLocale.Language) ||
-                    !aLocale.Country.equals(rLocale.Country) ||
+            if (!aLocale.Language.equals(rLocale.Language) || 
+                    !aLocale.Country.equals(rLocale.Country) || 
                     !aLocale.Variant.equals(rLocale.Variant)) {
                 LocaleDataItem item = LocaleData().getLocaleItem( rLocale );
                 aLocale = rLocale;
@@ -593,7 +593,7 @@ OUString SAL_CALL NativeNumberSupplier::getNativeNumberString(const OUString& aN
             if (number)
                 return AsciiToNative( aNumberString, 0, aNumberString.getLength(), offset, useOffset, number );
             else if (num == NumberChar_he)
-                return getHebrewNativeNumberString(aNumberString,
+                return getHebrewNativeNumberString(aNumberString, 
                                 nNativeNumberMode == NativeNumberMode::NATNUM2);
             else
                 return AsciiToNativeChar(aNumberString, 0, aNumberString.getLength(), offset, useOffset, num);
@@ -854,7 +854,7 @@ void makeHebrewNumber(sal_Int64 value, OUStringBuffer& output, sal_Bool isLast,
         if (useGeresh) {
             if (nbOfChar > 1)   // a number is written as more than one character
                 output.insert(output.getLength() - 1, gershayim);
-            else if (nbOfChar == 1) // a number is written as a single character
+            else if (nbOfChar == 1) // a number is written as a single character 
                 output.append(geresh);
         }
     }
diff --git a/i18npool/source/numberformatcode/numberformatcode.cxx b/i18npool/source/numberformatcode/numberformatcode.cxx
index 8f5f926cc728..b4d1907dcbb3 100644
--- a/i18npool/source/numberformatcode/numberformatcode.cxx
+++ b/i18npool/source/numberformatcode/numberformatcode.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
@@ -53,7 +53,7 @@ NumberFormatCodeMapper::~NumberFormatCodeMapper()
 NumberFormatCodeMapper::getDefault( sal_Int16 formatType, sal_Int16 formatUsage, const ::com::sun::star::lang::Locale& rLocale ) throw(::com::sun::star::uno::RuntimeException)
 {
 
-    ::rtl::OUString elementType = mapElementTypeShortToString(formatType);
+    ::rtl::OUString elementType	= mapElementTypeShortToString(formatType);
     ::rtl::OUString elementUsage = mapElementUsageShortToString(formatUsage);
 
     getFormats( rLocale );
@@ -158,9 +158,9 @@ NumberFormatCodeMapper::getAllFormatCodes( const ::com::sun::star::lang::Locale&
 
 void NumberFormatCodeMapper::setupLocale( const ::com::sun::star::lang::Locale& rLocale )
 {
-    if ( aLocale.Country    != rLocale.Country
-      || aLocale.Language   != rLocale.Language
-      || aLocale.Variant    != rLocale.Variant )
+    if ( aLocale.Country	!= rLocale.Country
+      || aLocale.Language	!= rLocale.Language
+      || aLocale.Variant	!= rLocale.Variant )
     {
         bFormatsValid = sal_False;
         aLocale = rLocale;
diff --git a/i18npool/source/ordinalsuffix/ordinalsuffix.cxx b/i18npool/source/ordinalsuffix/ordinalsuffix.cxx
index b577d72c5d0e..378a95b88753 100644
--- a/i18npool/source/ordinalsuffix/ordinalsuffix.cxx
+++ b/i18npool/source/ordinalsuffix/ordinalsuffix.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
diff --git a/i18npool/source/paper/paper.cxx b/i18npool/source/paper/paper.cxx
index e94efa6e06c5..009d7b2c3cca 100644
--- a/i18npool/source/paper/paper.cxx
+++ b/i18npool/source/paper/paper.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
@@ -186,7 +186,7 @@ bool PaperInfo::doSloppyFit()
 
 bool PaperInfo::sloppyEqual(const PaperInfo &rOther) const
 {
-    return
+    return 
     (
       (labs(m_nPaperWidth - rOther.m_nPaperWidth) < MAXSLOPPY) &&
       (labs(m_nPaperHeight - rOther.m_nPaperHeight) < MAXSLOPPY)
@@ -333,13 +333,13 @@ PaperInfo PaperInfo::getSystemDefaultPaper()
         for ( size_t i = 0; i < nTabSize; ++i )
         {
             if (i == PAPER_USER) continue;
-
+            
             //glibc stores sizes as integer mm units, and so is inaccurate. To
             //find a standard paper size we calculate the standard paper sizes
             //into equally inaccurate mm and compare
             long width = (aDinTab[i].m_nWidth + 50) / 100;
             long height = (aDinTab[i].m_nHeight + 50) / 100;
-
+    
             if (width == w.word/100 && height == h.word/100)
             {
                 w.word = aDinTab[i].m_nWidth;
@@ -396,7 +396,7 @@ PaperInfo::PaperInfo(long nPaperWidth, long nPaperHeight)
 {
     for ( size_t i = 0; i < nTabSize; ++i )
     {
-        if (
+        if ( 
              (nPaperWidth == aDinTab[i].m_nWidth) &&
              (nPaperHeight == aDinTab[i].m_nHeight)
            )
@@ -420,7 +420,7 @@ Paper PaperInfo::fromPSName(const rtl::OString &rName)
 
     for ( size_t i = 0; i < nTabSize; ++i )
     {
-        if (aDinTab[i].m_pPSName &&
+        if (aDinTab[i].m_pPSName && 
           !rtl_str_compareIgnoreAsciiCase(aDinTab[i].m_pPSName, rName.getStr()))
         {
             return static_cast<Paper>(i);
diff --git a/i18npool/source/registerservices/registerservices.cxx b/i18npool/source/registerservices/registerservices.cxx
index 280e12dfe4f7..10413cebd783 100644
--- a/i18npool/source/registerservices/registerservices.cxx
+++ b/i18npool/source/registerservices/registerservices.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
@@ -404,16 +404,16 @@ static const struct InstancesArray {
         &InputSequenceChecker_th_CreateInstance },
     {   "com.sun.star.i18n.InputSequenceChecker_hi",
         "com.sun.star.i18n.InputSequenceChecker_hi",
-        &InputSequenceChecker_hi_CreateInstance },
+        &InputSequenceChecker_hi_CreateInstance },  
     {   "com.sun.star.i18n.TextConversion",
         "com.sun.star.i18n.TextConversion",
-        &TextConversionImpl_CreateInstance },
+        &TextConversionImpl_CreateInstance },  
     {   "com.sun.star.i18n.TextConversion_ko",
         "com.sun.star.i18n.TextConversion_ko",
-        &TextConversion_ko_CreateInstance },
+        &TextConversion_ko_CreateInstance },  
     {   "com.sun.star.i18n.TextConversion_zh",
         "com.sun.star.i18n.TextConversion_zh",
-        &TextConversion_zh_CreateInstance },
+        &TextConversion_zh_CreateInstance },  
     {   TRLT_SERVICELNAME,
         TRLT_IMPLNAME ,
         &TransliterationImpl_CreateInstance },
@@ -554,7 +554,7 @@ static const struct InstancesArray {
     {   "com.sun.star.i18n.OrdinalSuffix",
         "com.sun.star.i18n.OrdinalSuffix",
         & OrdinalSuffix_CreateInstance },
-
+ 
     {   TRLT_SERVICELNAME_L10N,
         TRLT_IMPLNAME_PREFIX  "FULLWIDTHKATAKANA_HALFWIDTHKATAKANA",
         &fullwidthKatakanaToHalfwidthKatakana_CreateInstance },
diff --git a/i18npool/source/search/levdis.cxx b/i18npool/source/search/levdis.cxx
index aa889a6d3581..a158ce2d762b 100644
--- a/i18npool/source/search/levdis.cxx
+++ b/i18npool/source/search/levdis.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
diff --git a/i18npool/source/search/levdis.hxx b/i18npool/source/search/levdis.hxx
index b61b731ea664..f2630612559e 100644
--- a/i18npool/source/search/levdis.hxx
+++ b/i18npool/source/search/levdis.hxx
@@ -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
diff --git a/i18npool/source/search/textsearch.cxx b/i18npool/source/search/textsearch.cxx
index dea4eca2a618..40a832004544 100644
--- a/i18npool/source/search/textsearch.cxx
+++ b/i18npool/source/search/textsearch.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
@@ -127,7 +127,7 @@ void TextSearch::setOptions( const SearchOptions& rOptions ) throw( RuntimeExcep
                     aSrchPara.Locale);
     }
     else if( xTranslit.is() )
-        xTranslit = 0;
+        xTranslit = 0; 
 
     // Create Transliteration for 2<->1, 2<->2 transliteration
     if ( aSrchPara.transliterateFlags & COMPLEX_TRANS_MASK )
@@ -172,7 +172,7 @@ void TextSearch::setOptions( const SearchOptions& rOptions ) throw( RuntimeExcep
     sSrchStr2 = xTranslit2->transliterateString2String(
             aSrchPara.searchString, 0, aSrchPara.searchString.getLength());
 
-    // When start or end of search string is a complex script type, we need to
+    // When start or end of search string is a complex script type, we need to 
     // make sure the result boundary is not located in the middle of cell.
     checkCTLStart = (xBreak.is() && (xBreak->getScriptType(sSrchStr, 0) ==
                 ScriptType::COMPLEX));
@@ -186,7 +186,7 @@ void TextSearch::setOptions( const SearchOptions& rOptions ) throw( RuntimeExcep
 
         pRegExp = new Regexpr( aSrchPara, xTranslit );
     }
-    else
+    else 
     {
         if ( aSrchPara.algorithmType == SearchAlgorithms_APPROXIMATE )
         {
@@ -543,7 +543,7 @@ sal_Int32 TextSearch::GetDiff( const sal_Unicode cChr ) const
 {
     TextSearchJumpTable *pJump;
     OUString sSearchKey;
-
+    
     if ( bUsePrimarySrchStr ) {
       pJump = pJumpTable;
       sSearchKey = sSrchStr;
diff --git a/i18npool/source/search/textsearch.hxx b/i18npool/source/search/textsearch.hxx
index 383b78e769b0..6093cc717257 100644
--- a/i18npool/source/search/textsearch.hxx
+++ b/i18npool/source/search/textsearch.hxx
@@ -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
@@ -31,7 +31,7 @@
 
 #include <com/sun/star/util/XTextSearch.hpp>
 #include <com/sun/star/i18n/XBreakIterator.hpp>
-#include <cppuhelper/implbase2.hxx>     // helper for implementations
+#include <cppuhelper/implbase2.hxx>		// helper for implementations
 #include <com/sun/star/i18n/XExtendedTransliteration.hpp>
 #include <com/sun/star/i18n/XCharacterClassification.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
@@ -42,9 +42,9 @@ class Regexpr;
 class WLevDistance;
 typedef ::std::map< sal_Unicode, sal_Int32 > TextSearchJumpTable;
 
-//  ----------------------------------------------------
-//  class SearchClass
-//  ----------------------------------------------------
+//	----------------------------------------------------
+//	class SearchClass
+//	----------------------------------------------------
 class TextSearch: public cppu::WeakImplHelper2
 <
     ::com::sun::star::util::XTextSearch,
@@ -77,7 +77,7 @@ class TextSearch: public cppu::WeakImplHelper2
     TextSearchJumpTable* pJumpTable;
     TextSearchJumpTable* pJumpTable2;
     bool bIsForwardTab;
-    bool bUsePrimarySrchStr;
+    bool bUsePrimarySrchStr;  
     void MakeForwardTab();
     void MakeForwardTab2();
     void MakeBackwardTab();
@@ -150,5 +150,5 @@ public:
                 throw( ::com::sun::star::uno::RuntimeException );
 };
 
-
+ 
 #endif
diff --git a/i18npool/source/textconversion/genconv_dict.cxx b/i18npool/source/textconversion/genconv_dict.cxx
index 3b3e5d4e9c0a..28f4d3b77181 100644
--- a/i18npool/source/textconversion/genconv_dict.cxx
+++ b/i18npool/source/textconversion/genconv_dict.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
@@ -53,8 +53,8 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv)
     if (argc < 4) exit(-1);
 
 
-    sfp = fopen(argv[2], "rb"); // open the source file for read;
-    if (sfp == NULL)
+    sfp = fopen(argv[2], "rb");	// open the source file for read;
+    if (sfp == NULL) 
     {
         printf("Open the dictionary source file failed.");
         return -1;
@@ -131,7 +131,7 @@ void make_hhc_char(FILE *sfp, FILE *cfp)
 
     fprintf(cfp, "\nstatic const com::sun::star::i18n::Hangul_Index Hangul2HanjaIndex[] = {\n");
     for (i = 0; i < count; i++)
-        fprintf(cfp, "\t{ 0x%04x, 0x%04x, 0x%02x },\n",
+        fprintf(cfp, "\t{ 0x%04x, 0x%04x, 0x%02x },\n", 
                         Hangul2HanjaData[i][0],
                         Hangul2HanjaData[i][1],
                         Hangul2HanjaData[i][2]);
diff --git a/i18npool/source/textconversion/textconversion.cxx b/i18npool/source/textconversion/textconversion.cxx
index 51bd7a4c1bf4..e3c5d7994476 100644
--- a/i18npool/source/textconversion/textconversion.cxx
+++ b/i18npool/source/textconversion/textconversion.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
@@ -60,9 +60,9 @@ static void* nullFunc()
 }
 
 oslGenericFunction SAL_CALL
-TextConversion::getFunctionBySymbol(const sal_Char* func)
+TextConversion::getFunctionBySymbol(const sal_Char* func) 
 {
-    if (hModule)
+    if (hModule) 
         return osl_getFunctionSymbol(hModule, OUString::createFromAscii(func).pData);
     else
         return reinterpret_cast< oslGenericFunction >(nullFunc);
diff --git a/i18npool/source/textconversion/textconversionImpl.cxx b/i18npool/source/textconversion/textconversionImpl.cxx
index 1e433737efe7..b393b0be656c 100644
--- a/i18npool/source/textconversion/textconversionImpl.cxx
+++ b/i18npool/source/textconversion/textconversionImpl.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
@@ -76,8 +76,8 @@ TextConversionImpl::getConversionWithOffset( const OUString& aText, sal_Int32 nS
     return xTC->getConversionWithOffset(aText, nStartPos, nLength, rLocale, nConversionType, nConversionOptions, offset);
 }
 
-sal_Bool SAL_CALL
-TextConversionImpl::interactiveConversion( const Locale& rLocale, sal_Int16 nTextConversionType, sal_Int32 nTextConversionOptions )
+sal_Bool SAL_CALL 
+TextConversionImpl::interactiveConversion( const Locale& rLocale, sal_Int16 nTextConversionType, sal_Int32 nTextConversionOptions ) 
     throw(  RuntimeException, IllegalArgumentException, NoSupportException )
 {
     getLocaleSpecificTextConversion(rLocale);
@@ -96,7 +96,7 @@ TextConversionImpl::getLocaleSpecificTextConversion(const Locale& rLocale) throw
         aLocale = rLocale;
 
         Reference < XInterface > xI;
-
+        
         xI = xMSF->createInstance(
             OUString::createFromAscii("com.sun.star.i18n.TextConversion_") + aLocale.Language);
 
@@ -109,7 +109,7 @@ TextConversionImpl::getLocaleSpecificTextConversion(const Locale& rLocale) throw
                 OUString::createFromAscii("com.sun.star.i18n.TextConversion_") + aLocale.Language +
                 OUString::createFromAscii("_") + aLocale.Country +
                 OUString::createFromAscii("_") + aLocale.Variant);
-
+        
         if (xI.is())
             xI->queryInterface( getCppuType((const Reference< XTextConversion>*)0) ) >>= xTC;
         else if (xTC.is())
diff --git a/i18npool/source/textconversion/textconversion_ko.cxx b/i18npool/source/textconversion/textconversion_ko.cxx
index 862076501153..8318cc32e345 100644
--- a/i18npool/source/textconversion/textconversion_ko.cxx
+++ b/i18npool/source/textconversion/textconversion_ko.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
@@ -46,13 +46,13 @@ using namespace rtl;
 namespace com { namespace sun { namespace star { namespace i18n {
 
 #define SCRIPT_OTHERS   0
-#define SCRIPT_HANJA    1
+#define SCRIPT_HANJA    1 
 #define SCRIPT_HANGUL   2
 
 TextConversion_ko::TextConversion_ko( const Reference < XMultiServiceFactory >& xMSF )
 {
     Reference < XInterface > xI;
-
+    
     xI = xMSF->createInstance(
         OUString::createFromAscii("com.sun.star.i18n.ConversionDictionary_ko"));
 
@@ -64,13 +64,13 @@ TextConversion_ko::TextConversion_ko( const Reference < XMultiServiceFactory >&
 
     if ( xI.is() )
         xI->queryInterface( getCppuType((const Reference< XConversionDictionaryList>*)0) ) >>= xCDL;
-
+    
     maxLeftLength = maxRightLength = 1;
 
     // get maximum length of word in dictionary
     if (xCDL.is()) {
-        Locale loc(OUString::createFromAscii("ko"),
-                    OUString::createFromAscii("KR"),
+        Locale loc(OUString::createFromAscii("ko"), 
+                    OUString::createFromAscii("KR"), 
                     OUString());
         maxLeftLength = xCDL->queryMaxCharCount(loc,
                         ConversionDictionaryType::HANGUL_HANJA,
@@ -123,7 +123,7 @@ sal_Int16 SAL_CALL checkScriptType(sal_Unicode c)
     return (i < scriptListCount && block >= scriptList[i].from) ? scriptList[i].script : SCRIPT_OTHERS;
 }
 
-Sequence< OUString > SAL_CALL
+Sequence< OUString > SAL_CALL 
 TextConversion_ko::getCharConversions(const OUString& aText, sal_Int32 nStartPos, sal_Int32 nLength, sal_Bool toHanja)
 {
     sal_Unicode ch;
@@ -167,7 +167,7 @@ TextConversion_ko::getCharConversions(const OUString& aText, sal_Int32 nStartPos
 
             if (address != 0xFFFF)
                 newStr->buffer[count++] = address;
-            else
+            else 
                 break;
         }
         if (count > 0) {
@@ -252,25 +252,25 @@ TextConversion_ko::getConversions( const OUString& aText, sal_Int32 nStartPos, s
                     if (len > 1) {
                         try {
                             if (xCDL.is())
-                                result.Candidates = xCDL->queryConversions(aText, start + nStartPos, len,
+                                result.Candidates = xCDL->queryConversions(aText, start + nStartPos, len, 
                                     aLocale, ConversionDictionaryType::HANGUL_HANJA, eDirection, nConversionOptions); // user dictionary
                         }
                         catch ( NoSupportException & ) {
-                            // clear reference (when there is no user dictionary) in order
-                            // to not always have to catch this exception again
+                            // clear reference (when there is no user dictionary) in order 
+                            // to not always have to catch this exception again 
                             // in further calls. (save time)
                             xCDL = 0;
                         }
                         catch (...) {
-                            // catch all other exceptions to allow
+                            // catch all other exceptions to allow 
                             // querying the system dictionary in the next line
                         }
-                        if (xCD.is() && toHanja) { // System dictionary would not do Hanja_to_Hangul conversion.
+                        if (xCD.is() && toHanja) { // System dictionary would not do Hanja_to_Hangul conversion. 
                             candidates = xCD->getConversions(aText, start + nStartPos, len, eDirection, nConversionOptions);
                             result.Candidates += candidates;
                         }
                     } else if (! toHanja) { // do whole word character 2 character conversion for Hanja to Hangul conversion
-                        result.Candidates = getCharConversions(aText, nStartPos + start, length - start, toHanja);
+                        result.Candidates = getCharConversions(aText, nStartPos + start, length - start, toHanja); 
                         if (result.Candidates.hasElements())
                             len = result.Candidates[0].getLength();
                     }
@@ -333,8 +333,8 @@ TextConversion_ko::getConversionWithOffset( const OUString& aText, sal_Int32 nSt
     return getConversion(aText, nStartPos, nLength, rLocale, nConversionType, nConversionOptions);
 }
 
-sal_Bool SAL_CALL
-TextConversion_ko::interactiveConversion( const Locale& /*rLocale*/, sal_Int16 /*nTextConversionType*/, sal_Int32 /*nTextConversionOptions*/ )
+sal_Bool SAL_CALL 
+TextConversion_ko::interactiveConversion( const Locale& /*rLocale*/, sal_Int16 /*nTextConversionType*/, sal_Int32 /*nTextConversionOptions*/ ) 
     throw(  RuntimeException, IllegalArgumentException, NoSupportException )
 {
     return sal_True;
diff --git a/i18npool/source/textconversion/textconversion_zh.cxx b/i18npool/source/textconversion/textconversion_zh.cxx
index 2c0682d93205..16172dc9b3fb 100644
--- a/i18npool/source/textconversion/textconversion_zh.cxx
+++ b/i18npool/source/textconversion/textconversion_zh.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
@@ -67,7 +67,7 @@ sal_Unicode SAL_CALL getOneCharConversion(sal_Unicode ch, const sal_Unicode* Dat
     }
 }
 
-OUString SAL_CALL
+OUString SAL_CALL 
 TextConversion_zh::getCharConversion(const OUString& aText, sal_Int32 nStartPos, sal_Int32 nLength, sal_Bool toSChinese, sal_Int32 nConversionOptions)
 {
     const sal_Unicode *Data;
@@ -86,12 +86,12 @@ TextConversion_zh::getCharConversion(const OUString& aText, sal_Int32 nStartPos,
 
     rtl_uString * newStr = x_rtl_uString_new_WithLength( nLength ); // defined in x_rtl_ustring.h
     for (sal_Int32 i = 0; i < nLength; i++)
-        newStr->buffer[i] =
+        newStr->buffer[i] = 
             getOneCharConversion(aText[nStartPos+i], Data, Index);
     return OUString( newStr->buffer, nLength);
 }
 
-OUString SAL_CALL
+OUString SAL_CALL 
 TextConversion_zh::getWordConversion(const OUString& aText, sal_Int32 nStartPos, sal_Int32 nLength, sal_Bool toSChinese, sal_Int32 nConversionOptions, Sequence<sal_Int32>& offset)
 {
     sal_Int32 dictLen = 0;
@@ -133,23 +133,23 @@ TextConversion_zh::getWordConversion(const OUString& aText, sal_Int32 nStartPos,
         for (; len > 0 && ! found; len--) {
             OUString word = aText.copy(nStartPos + currPos, len);
             sal_Int32 current = 0;
-            // user dictionary
+            // user dictionary 
             if (xCDL.is()) {
                 Sequence < OUString > conversions;
                 try {
-                    conversions = xCDL->queryConversions(word, 0, len,
-                            aLocale, ConversionDictionaryType::SCHINESE_TCHINESE,
+                    conversions = xCDL->queryConversions(word, 0, len, 
+                            aLocale, ConversionDictionaryType::SCHINESE_TCHINESE, 
                             /*toSChinese ?*/ ConversionDirection_FROM_LEFT /*: ConversionDirection_FROM_RIGHT*/,
-                            nConversionOptions);
+                            nConversionOptions); 
                 }
                 catch ( NoSupportException & ) {
-                    // clear reference (when there is no user dictionary) in order
-                    // to not always have to catch this exception again
+                    // clear reference (when there is no user dictionary) in order 
+                    // to not always have to catch this exception again 
                     // in further calls. (save time)
                     xCDL = 0;
                 }
                 catch (...) {
-                    // catch all other exceptions to allow
+                    // catch all other exceptions to allow 
                     // querying the system dictionary in the next line
                 }
                 if (conversions.getLength() > 0) {
@@ -157,7 +157,7 @@ TextConversion_zh::getWordConversion(const OUString& aText, sal_Int32 nStartPos,
                         if (word.getLength() != conversions[0].getLength())
                             one2one=sal_False;
                         while (current < conversions[0].getLength()) {
-                            offset[count] = nStartPos + currPos + (current *
+                            offset[count] = nStartPos + currPos + (current * 
                                     word.getLength() / conversions[0].getLength());
                             newStr->buffer[count++] = conversions[0][current++];
                         }
@@ -241,7 +241,7 @@ TextConversion_zh::getConversion( const OUString& aText, sal_Int32 nStartPos, sa
     const Locale& rLocale, sal_Int16 nConversionType, sal_Int32 nConversionOptions)
     throw(  RuntimeException, IllegalArgumentException, NoSupportException )
 {
-    if (rLocale.Language.equalsAscii("zh") &&
+    if (rLocale.Language.equalsAscii("zh") &&  
             ( nConversionType == TextConversionType::TO_SCHINESE ||
             nConversionType == TextConversionType::TO_TCHINESE) ) {
 
@@ -250,13 +250,13 @@ TextConversion_zh::getConversion( const OUString& aText, sal_Int32 nStartPos, sa
 
         if (nConversionOptions & TextConversionOption::CHARACTER_BY_CHARACTER)
             // char to char dictionary
-            return getCharConversion(aText, nStartPos, nLength, toSChinese, nConversionOptions);
+            return getCharConversion(aText, nStartPos, nLength, toSChinese, nConversionOptions); 
         else {
             Sequence <sal_Int32> offset;
             // word to word dictionary
             return  getWordConversion(aText, nStartPos, nLength, toSChinese, nConversionOptions, offset);
         }
-    } else
+    } else 
         throw NoSupportException(); // Conversion type is not supported in this service.
 }
 
@@ -265,7 +265,7 @@ TextConversion_zh::getConversionWithOffset( const OUString& aText, sal_Int32 nSt
     const Locale& rLocale, sal_Int16 nConversionType, sal_Int32 nConversionOptions, Sequence<sal_Int32>& offset)
     throw(  RuntimeException, IllegalArgumentException, NoSupportException )
 {
-    if (rLocale.Language.equalsAscii("zh") &&
+    if (rLocale.Language.equalsAscii("zh") &&  
             ( nConversionType == TextConversionType::TO_SCHINESE ||
             nConversionType == TextConversionType::TO_TCHINESE) ) {
 
@@ -275,19 +275,19 @@ TextConversion_zh::getConversionWithOffset( const OUString& aText, sal_Int32 nSt
         if (nConversionOptions & TextConversionOption::CHARACTER_BY_CHARACTER) {
             offset.realloc(0);
             // char to char dictionary
-            return getCharConversion(aText, nStartPos, nLength, toSChinese, nConversionOptions);
+            return getCharConversion(aText, nStartPos, nLength, toSChinese, nConversionOptions); 
         } else {
             if (offset.getLength() < 2*nLength)
                 offset.realloc(2*nLength);
             // word to word dictionary
             return  getWordConversion(aText, nStartPos, nLength, toSChinese, nConversionOptions, offset);
         }
-    } else
+    } else 
         throw NoSupportException(); // Conversion type is not supported in this service.
 }
 
-sal_Bool SAL_CALL
-TextConversion_zh::interactiveConversion( const Locale& /*rLocale*/, sal_Int16 /*nTextConversionType*/, sal_Int32 /*nTextConversionOptions*/ )
+sal_Bool SAL_CALL 
+TextConversion_zh::interactiveConversion( const Locale& /*rLocale*/, sal_Int16 /*nTextConversionType*/, sal_Int32 /*nTextConversionOptions*/ ) 
     throw(  RuntimeException, IllegalArgumentException, NoSupportException )
 {
     return sal_False;
diff --git a/i18npool/source/transliteration/chartonum.cxx b/i18npool/source/transliteration/chartonum.cxx
index 7fced835f289..d32504ed68db 100644
--- a/i18npool/source/transliteration/chartonum.cxx
+++ b/i18npool/source/transliteration/chartonum.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
diff --git a/i18npool/source/transliteration/data/numberchar.h b/i18npool/source/transliteration/data/numberchar.h
index 7bc0c50fc35d..6e6a4411a096 100644
--- a/i18npool/source/transliteration/data/numberchar.h
+++ b/i18npool/source/transliteration/data/numberchar.h
@@ -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
@@ -29,24 +29,24 @@
 
 namespace com { namespace sun { namespace star { namespace i18n {
 
-static const sal_Int16 NumberChar_HalfWidth     = 0;
-static const sal_Int16 NumberChar_FullWidth     = 1;
-static const sal_Int16 NumberChar_Lower_zh  = 2;
-static const sal_Int16 NumberChar_Upper_zh  = 3;
-static const sal_Int16 NumberChar_Upper_zh_TW   = 4;
-static const sal_Int16 NumberChar_Modern_ja     = 5;
+static const sal_Int16 NumberChar_HalfWidth 	= 0;
+static const sal_Int16 NumberChar_FullWidth 	= 1;
+static const sal_Int16 NumberChar_Lower_zh 	= 2;
+static const sal_Int16 NumberChar_Upper_zh 	= 3;
+static const sal_Int16 NumberChar_Upper_zh_TW 	= 4;
+static const sal_Int16 NumberChar_Modern_ja 	= 5;
 static const sal_Int16 NumberChar_Traditional_ja= 6;
-static const sal_Int16 NumberChar_Lower_ko  = 7;
-static const sal_Int16 NumberChar_Upper_ko  = 8;
-static const sal_Int16 NumberChar_Hangul_ko     = 9;
-static const sal_Int16 NumberChar_Indic_ar  = 10;
+static const sal_Int16 NumberChar_Lower_ko 	= 7;
+static const sal_Int16 NumberChar_Upper_ko 	= 8;
+static const sal_Int16 NumberChar_Hangul_ko 	= 9;
+static const sal_Int16 NumberChar_Indic_ar 	= 10;
 static const sal_Int16 NumberChar_EastIndic_ar  = 11;
-static const sal_Int16 NumberChar_Indic_hi  = 12;
-static const sal_Int16 NumberChar_th        = 13;
-static const sal_Int16 NumberChar_Count     = 14;
+static const sal_Int16 NumberChar_Indic_hi 	= 12;
+static const sal_Int16 NumberChar_th 		= 13;
+static const sal_Int16 NumberChar_Count 	= 14;
 
 static const sal_Unicode NumberChar[][10] = {
-//  0   1   2   3   4   5   6   7   8   9
+//	0	1	2	3	4	5	6	7	8	9
     { 0x0030, 0x0031, 0x0032, 0x0033, 0x0034, 0x0035, 0x0036, 0x0037, 0x0038, 0x0039 }, // Half Width (Ascii)
     { 0xFF10, 0xFF11, 0xFF12, 0xFF13, 0xFF14, 0xFF15, 0xFF16, 0xFF17, 0xFF18, 0xFF19 }, // Full Width
     { 0x3007, 0x4E00, 0x4E8c, 0x4E09, 0x56DB, 0x4E94, 0x516D, 0x4E03, 0x516B, 0x4E5D }, // Chinese Lower
@@ -103,48 +103,48 @@ static sal_Unicode MinusChar[] = {
 };
 #endif
 
-#define NUMBER_ZERO     NumberChar[NumberChar_HalfWidth][0] // 0x0030
-#define NUMBER_ONE      NumberChar[NumberChar_HalfWidth][1]     // 0x0031
-#define NUMBER_NINE     NumberChar[NumberChar_HalfWidth][9]     // 0x0039
+#define NUMBER_ZERO     NumberChar[NumberChar_HalfWidth][0]	// 0x0030
+#define NUMBER_ONE  	NumberChar[NumberChar_HalfWidth][1]     // 0x0031
+#define NUMBER_NINE  	NumberChar[NumberChar_HalfWidth][9]     // 0x0039
 #define NUMBER_DECIMAL  DecimalChar[0]
-#define NUMBER_MINUS    MinusChar[0]
-#define isNumber(n)     ( NUMBER_ZERO <= n && n <= NUMBER_NINE )
-#define isDecimal(n)    ( n == NUMBER_DECIMAL )
-#define isMinus(n)  ( n == NUMBER_MINUS )
+#define NUMBER_MINUS  	MinusChar[0]
+#define isNumber(n) 	( NUMBER_ZERO <= n && n <= NUMBER_NINE )
+#define isDecimal(n) 	( n == NUMBER_DECIMAL )
+#define isMinus(n) 	( n == NUMBER_MINUS )
 
-const sal_Int16 Multiplier_Lower_zh     = 0;
-const sal_Int16 Multiplier_Upper_zh     = 1;
-const sal_Int16 Multiplier_Lower_zh_TW  = 2;
-const sal_Int16 Multiplier_Upper_zh_TW  = 3;
-const sal_Int16 Multiplier_Hangul_ko    = 4;
-const sal_Int16 Multiplier_Modern_ja    = 5;
+const sal_Int16 Multiplier_Lower_zh 	= 0;
+const sal_Int16 Multiplier_Upper_zh 	= 1;
+const sal_Int16 Multiplier_Lower_zh_TW 	= 2;
+const sal_Int16 Multiplier_Upper_zh_TW 	= 3;
+const sal_Int16 Multiplier_Hangul_ko 	= 4;
+const sal_Int16 Multiplier_Modern_ja 	= 5;
 const sal_Int16 Multiplier_Traditional_ja = 6;
-const sal_Int16 Multiplier_Count    = 7;
+const sal_Int16 Multiplier_Count	= 7;
 
-const sal_Int16 ExponentCount_CJK   = 6;
+const sal_Int16 ExponentCount_CJK 	= 6;
 
 // not used
 #if 0
 static sal_Int16 MultiplierExponent_CJK[ExponentCount_CJK] = {
-        12,     8,  4,  3,  2,  1
+        12, 	8, 	4, 	3, 	2, 	1
 };
 static sal_Unicode MultiplierChar_CJK[][ExponentCount_CJK] = {
-    0x5146, 0x4EBF, 0x4E07, 0x5343, 0x767E, 0x5341, // S. Chinese Lower
-    0x5146, 0x4EBF, 0x4E07, 0x4EDF, 0x4F70, 0x62FE, // S. Chinese Upper
-    0x5146, 0x5104, 0x842C, 0x5343, 0x767E, 0x5341, // T. Chinese & Korean Lower
-    0x5146, 0x5104, 0x842C, 0x4EDF, 0x4F70, 0x62FE, // T. Chinese & Korean Upper
-    0xC870, 0xC5B5, 0xB9CC, 0xCC9C, 0xBC31, 0xC2ED, // Korean Hangul
-    0x5146, 0x5104, 0x4E07, 0x5343, 0x767E, 0x5341, // Japanese Modern
-    0x5146, 0x5104, 0x842C, 0x9621, 0x767E, 0x62FE, // Japanese Traditional
+    0x5146, 0x4EBF, 0x4E07, 0x5343, 0x767E, 0x5341,	// S. Chinese Lower
+    0x5146, 0x4EBF, 0x4E07, 0x4EDF, 0x4F70, 0x62FE,	// S. Chinese Upper
+    0x5146, 0x5104, 0x842C, 0x5343, 0x767E, 0x5341,	// T. Chinese & Korean Lower
+    0x5146, 0x5104, 0x842C, 0x4EDF, 0x4F70, 0x62FE,	// T. Chinese & Korean Upper
+    0xC870, 0xC5B5, 0xB9CC, 0xCC9C, 0xBC31, 0xC2ED,	// Korean Hangul
+    0x5146, 0x5104, 0x4E07, 0x5343, 0x767E, 0x5341,	// Japanese Modern
+    0x5146, 0x5104, 0x842C, 0x9621, 0x767E, 0x62FE,	// Japanese Traditional
 };
 #endif
 
-const sal_Int16 ExponentCount_short_CJK     = 2;
+const sal_Int16 ExponentCount_short_CJK 	= 2;
 
 // not used
 #if 0
 static sal_Int16 MultiplierExponent_short_CJK[ExponentCount_short_CJK] = {
-        8,  4,
+        8, 	4,
 };
 
 static sal_Unicode MultiplierChar_short_CJK[][ExponentCount_short_CJK] = {
diff --git a/i18npool/source/transliteration/fullwidthToHalfwidth.cxx b/i18npool/source/transliteration/fullwidthToHalfwidth.cxx
index 95cf1ef4a237..4806309b776c 100644
--- a/i18npool/source/transliteration/fullwidthToHalfwidth.cxx
+++ b/i18npool/source/transliteration/fullwidthToHalfwidth.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
@@ -56,7 +56,7 @@ fullwidthToHalfwidth::fullwidthToHalfwidth()
  * The output is a reference of OUString. You MUST delete this object when you do not need to use it any more
  * The output string contains a transliterated string only, not whole string.
  */
-OUString SAL_CALL
+OUString SAL_CALL 
 fullwidthToHalfwidth::transliterate( const OUString& inStr, sal_Int32 startPos, sal_Int32 nCount, Sequence< sal_Int32 >& offset )
   throw(RuntimeException)
 {
@@ -70,7 +70,7 @@ fullwidthToHalfwidth::transliterate( const OUString& inStr, sal_Int32 startPos,
     return tmp;
 }
 
-sal_Unicode SAL_CALL
+sal_Unicode SAL_CALL 
 fullwidthToHalfwidth::transliterateChar2Char( sal_Unicode inChar)
   throw(RuntimeException, MultipleCharsOutputException)
 {
@@ -91,7 +91,7 @@ fullwidthKatakanaToHalfwidthKatakana::fullwidthKatakanaToHalfwidthKatakana()
 /**
  * Transliterate fullwidth katakana to halfwidth katakana.
  */
-OUString SAL_CALL
+OUString SAL_CALL 
 fullwidthKatakanaToHalfwidthKatakana::transliterate( const OUString& inStr, sal_Int32 startPos, sal_Int32 nCount, Sequence< sal_Int32 >& offset )
   throw(RuntimeException)
 {
@@ -105,7 +105,7 @@ fullwidthKatakanaToHalfwidthKatakana::transliterate( const OUString& inStr, sal_
     return tmp;
 }
 
-sal_Unicode SAL_CALL
+sal_Unicode SAL_CALL 
 fullwidthKatakanaToHalfwidthKatakana::transliterateChar2Char( sal_Unicode inChar )
   throw(RuntimeException, MultipleCharsOutputException)
 {
@@ -126,7 +126,7 @@ fullwidthToHalfwidthLikeASC::fullwidthToHalfwidthLikeASC()
 /**
  * Transliterate fullwidth to halfwidth like Excel's ASC function.
  */
-OUString SAL_CALL
+OUString SAL_CALL 
 fullwidthToHalfwidthLikeASC::transliterate( const OUString& inStr, sal_Int32 startPos, sal_Int32 nCount, Sequence< sal_Int32 >& offset )
   throw(RuntimeException)
 {
@@ -141,7 +141,7 @@ fullwidthToHalfwidthLikeASC::transliterate( const OUString& inStr, sal_Int32 sta
     return tmp;
 }
 
-sal_Unicode SAL_CALL
+sal_Unicode SAL_CALL 
 fullwidthToHalfwidthLikeASC::transliterateChar2Char( sal_Unicode inChar )
   throw(RuntimeException, MultipleCharsOutputException)
 {
diff --git a/i18npool/source/transliteration/halfwidthToFullwidth.cxx b/i18npool/source/transliteration/halfwidthToFullwidth.cxx
index 7786d269d218..d0e1203e3304 100644
--- a/i18npool/source/transliteration/halfwidthToFullwidth.cxx
+++ b/i18npool/source/transliteration/halfwidthToFullwidth.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
@@ -51,7 +51,7 @@ halfwidthToFullwidth::halfwidthToFullwidth()
     implementationName = "com.sun.star.i18n.Transliteration.HALFWIDTH_FULLWIDTH";
 }
 
-OUString SAL_CALL
+OUString SAL_CALL 
 halfwidthToFullwidth::transliterate( const OUString& inStr, sal_Int32 startPos, sal_Int32 nCount, Sequence< sal_Int32 >& offset )
   throw(RuntimeException)
 {
@@ -65,7 +65,7 @@ halfwidthToFullwidth::transliterate( const OUString& inStr, sal_Int32 startPos,
     return widthfolding::compose_ja_voiced_sound_marks ( newStr, 0, newStr.getLength(), offset, _useOffset );
 }
 
-sal_Unicode SAL_CALL
+sal_Unicode SAL_CALL 
 halfwidthToFullwidth::transliterateChar2Char( sal_Unicode inChar)
   throw(RuntimeException, MultipleCharsOutputException)
 {
@@ -81,7 +81,7 @@ halfwidthKatakanaToFullwidthKatakana::halfwidthKatakanaToFullwidthKatakana()
     implementationName = "com.sun.star.i18n.Transliteration.HALFWIDTHKATAKANA_FULLWIDTHKATAKANA";
 }
 
-OUString SAL_CALL
+OUString SAL_CALL 
 halfwidthKatakanaToFullwidthKatakana::transliterate( const OUString& inStr, sal_Int32 startPos, sal_Int32 nCount, Sequence< sal_Int32 >& offset )
   throw(RuntimeException)
 {
@@ -95,7 +95,7 @@ halfwidthKatakanaToFullwidthKatakana::transliterate( const OUString& inStr, sal_
     return widthfolding::compose_ja_voiced_sound_marks ( newStr, 0, newStr.getLength(), offset, _useOffset );
 }
 
-sal_Unicode SAL_CALL
+sal_Unicode SAL_CALL 
 halfwidthKatakanaToFullwidthKatakana::transliterateChar2Char( sal_Unicode inChar)
   throw(RuntimeException, MultipleCharsOutputException)
 {
@@ -111,7 +111,7 @@ halfwidthToFullwidthLikeJIS::halfwidthToFullwidthLikeJIS()
     implementationName = "com.sun.star.i18n.Transliteration.HALFWIDTH_FULLWIDTH_LIKE_JIS";
 }
 
-OUString SAL_CALL
+OUString SAL_CALL 
 halfwidthToFullwidthLikeJIS::transliterate( const OUString& inStr, sal_Int32 startPos, sal_Int32 nCount, Sequence< sal_Int32 >& offset )
   throw(RuntimeException)
 {
@@ -125,7 +125,7 @@ halfwidthToFullwidthLikeJIS::transliterate( const OUString& inStr, sal_Int32 sta
     return widthfolding::compose_ja_voiced_sound_marks ( newStr, 0, newStr.getLength(), offset, _useOffset, WIDTHFOLDNIG_DONT_USE_COMBINED_VU );
 }
 
-sal_Unicode SAL_CALL
+sal_Unicode SAL_CALL 
 halfwidthToFullwidthLikeJIS::transliterateChar2Char( sal_Unicode inChar)
   throw(RuntimeException, MultipleCharsOutputException)
 {
diff --git a/i18npool/source/transliteration/hiraganaToKatakana.cxx b/i18npool/source/transliteration/hiraganaToKatakana.cxx
index ef59e1845767..aee8c937f9b4 100644
--- a/i18npool/source/transliteration/hiraganaToKatakana.cxx
+++ b/i18npool/source/transliteration/hiraganaToKatakana.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
diff --git a/i18npool/source/transliteration/ignoreBaFa_ja_JP.cxx b/i18npool/source/transliteration/ignoreBaFa_ja_JP.cxx
index a67841d2e4d6..7f7d9e2c5d3a 100644
--- a/i18npool/source/transliteration/ignoreBaFa_ja_JP.cxx
+++ b/i18npool/source/transliteration/ignoreBaFa_ja_JP.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
diff --git a/i18npool/source/transliteration/ignoreHyuByu_ja_JP.cxx b/i18npool/source/transliteration/ignoreHyuByu_ja_JP.cxx
index 8e7f03b54d17..9b90c5502a4e 100644
--- a/i18npool/source/transliteration/ignoreHyuByu_ja_JP.cxx
+++ b/i18npool/source/transliteration/ignoreHyuByu_ja_JP.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
diff --git a/i18npool/source/transliteration/ignoreIandEfollowedByYa_ja_JP.cxx b/i18npool/source/transliteration/ignoreIandEfollowedByYa_ja_JP.cxx
index 833f060be638..e6a113178ec0 100644
--- a/i18npool/source/transliteration/ignoreIandEfollowedByYa_ja_JP.cxx
+++ b/i18npool/source/transliteration/ignoreIandEfollowedByYa_ja_JP.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
@@ -41,7 +41,7 @@ using namespace rtl;
 
 namespace com { namespace sun { namespace star { namespace i18n {
 
-OneToOneMappingTable_t IandE[] = {
+OneToOneMappingTable_t IandE[] = {      
     MAKE_PAIR( 0x30A3, 0x0000 ),  // KATAKANA LETTER SMALL I
     MAKE_PAIR( 0x30A4, 0x0000 ),  // KATAKANA LETTER I
     MAKE_PAIR( 0x30A7, 0x0000 ),  // KATAKANA LETTER SMALL E
@@ -80,13 +80,13 @@ OneToOneMappingTable_t IandE[] = {
 
 
 
-OUString SAL_CALL
+OUString SAL_CALL 
 ignoreIandEfollowedByYa_ja_JP::folding( const OUString& inStr, sal_Int32 startPos, sal_Int32 nCount, Sequence< sal_Int32 >& offset )
   throw(RuntimeException)
 {
     // Create a string buffer which can hold nCount + 1 characters.
     // The reference count is 0 now.
-    rtl_uString * newStr = x_rtl_uString_new_WithLength( nCount ); // defined in x_rtl_ustring.h
+    rtl_uString * newStr = x_rtl_uString_new_WithLength( nCount ); // defined in x_rtl_ustring.h  
     sal_Unicode * dst = newStr->buffer;
     const sal_Unicode * src = inStr.getStr() + startPos;
 
@@ -99,7 +99,7 @@ ignoreIandEfollowedByYa_ja_JP::folding( const OUString& inStr, sal_Int32 startPo
         position = startPos;
     }
 
-    //
+    // 
     sal_Unicode previousChar = *src ++;
     sal_Unicode currentChar;
 
diff --git a/i18npool/source/transliteration/ignoreIterationMark_ja_JP.cxx b/i18npool/source/transliteration/ignoreIterationMark_ja_JP.cxx
index f6a11e11229d..8f0e8e79def1 100644
--- a/i18npool/source/transliteration/ignoreIterationMark_ja_JP.cxx
+++ b/i18npool/source/transliteration/ignoreIterationMark_ja_JP.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
@@ -93,7 +93,7 @@ OneToOneMappingTable_t ignoreIterationMark_ja_JP_mappingTable[] = {
 };
 
 
-OUString SAL_CALL
+OUString SAL_CALL 
 ignoreIterationMark_ja_JP::folding( const OUString& inStr, sal_Int32 startPos, sal_Int32 nCount, Sequence< sal_Int32 >& offset )
   throw(RuntimeException)
 {
@@ -101,7 +101,7 @@ ignoreIterationMark_ja_JP::folding( const OUString& inStr, sal_Int32 startPos, s
 
     // Create a string buffer which can hold nCount + 1 characters.
     // The reference count is 0 now.
-    rtl_uString * newStr = x_rtl_uString_new_WithLength( nCount ); // defined in x_rtl_ustring.h
+    rtl_uString * newStr = x_rtl_uString_new_WithLength( nCount ); // defined in x_rtl_ustring.h  
     sal_Unicode * dst = newStr->buffer;
     const sal_Unicode * src = inStr.getStr() + startPos;
 
@@ -114,7 +114,7 @@ ignoreIterationMark_ja_JP::folding( const OUString& inStr, sal_Int32 startPos, s
         position = startPos;
     }
 
-    //
+    // 
     sal_Unicode previousChar = *src ++;
     sal_Unicode currentChar;
 
diff --git a/i18npool/source/transliteration/ignoreKana.cxx b/i18npool/source/transliteration/ignoreKana.cxx
index 103bf9de5e3a..dd7f7c01b54d 100644
--- a/i18npool/source/transliteration/ignoreKana.cxx
+++ b/i18npool/source/transliteration/ignoreKana.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
diff --git a/i18npool/source/transliteration/ignoreKiKuFollowedBySa_ja_JP.cxx b/i18npool/source/transliteration/ignoreKiKuFollowedBySa_ja_JP.cxx
index 39b2e7a384cc..8bcf4f372182 100644
--- a/i18npool/source/transliteration/ignoreKiKuFollowedBySa_ja_JP.cxx
+++ b/i18npool/source/transliteration/ignoreKiKuFollowedBySa_ja_JP.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
@@ -40,13 +40,13 @@ using namespace rtl;
 
 namespace com { namespace sun { namespace star { namespace i18n {
 
-OUString SAL_CALL
+OUString SAL_CALL 
 ignoreKiKuFollowedBySa_ja_JP::folding( const OUString& inStr, sal_Int32 startPos, sal_Int32 nCount, Sequence< sal_Int32 >& offset )
   throw(RuntimeException)
 {
     // Create a string buffer which can hold nCount + 1 characters.
     // The reference count is 0 now.
-    rtl_uString * newStr = x_rtl_uString_new_WithLength( nCount ); // defined in x_rtl_ustring.h
+    rtl_uString * newStr = x_rtl_uString_new_WithLength( nCount ); // defined in x_rtl_ustring.h  
     sal_Unicode * dst = newStr->buffer;
     const sal_Unicode * src = inStr.getStr() + startPos;
 
@@ -59,7 +59,7 @@ ignoreKiKuFollowedBySa_ja_JP::folding( const OUString& inStr, sal_Int32 startPos
         position = startPos;
     }
 
-    //
+    // 
     sal_Unicode previousChar = *src ++;
     sal_Unicode currentChar;
 
diff --git a/i18npool/source/transliteration/ignoreMiddleDot_ja_JP.cxx b/i18npool/source/transliteration/ignoreMiddleDot_ja_JP.cxx
index 818014e2c0c6..e918d3b033ce 100644
--- a/i18npool/source/transliteration/ignoreMiddleDot_ja_JP.cxx
+++ b/i18npool/source/transliteration/ignoreMiddleDot_ja_JP.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
@@ -36,7 +36,7 @@
 
 namespace com { namespace sun { namespace star { namespace i18n {
 
-sal_Unicode
+sal_Unicode 
 ignoreMiddleDot_ja_JP_translator (const sal_Unicode c)
 {
     switch (c) {
diff --git a/i18npool/source/transliteration/ignoreMinusSign_ja_JP.cxx b/i18npool/source/transliteration/ignoreMinusSign_ja_JP.cxx
index 2dc8a172223b..bbb41fdb2ab1 100644
--- a/i18npool/source/transliteration/ignoreMinusSign_ja_JP.cxx
+++ b/i18npool/source/transliteration/ignoreMinusSign_ja_JP.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
@@ -36,7 +36,7 @@
 
 namespace com { namespace sun { namespace star { namespace i18n {
 
-sal_Unicode
+sal_Unicode 
 ignoreMinusSign_ja_JP_translator (const sal_Unicode c)
 {
     switch (c) {
diff --git a/i18npool/source/transliteration/ignoreProlongedSoundMark_ja_JP.cxx b/i18npool/source/transliteration/ignoreProlongedSoundMark_ja_JP.cxx
index 86048284d5b7..2bd501116f8b 100644
--- a/i18npool/source/transliteration/ignoreProlongedSoundMark_ja_JP.cxx
+++ b/i18npool/source/transliteration/ignoreProlongedSoundMark_ja_JP.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
@@ -232,7 +232,7 @@ static sal_Unicode table_normalwidth[] = {
     //  0x0000,   // 0x30fc KATAKANA-HIRAGANA PROLONGED SOUND MARK
     //  0x0000,   // 0x30fd KATAKANA ITERATION MARK
     //  0x0000,   // 0x30fe KATAKANA VOICED ITERATION MARK
-    //  0x0000    // 0x30ff
+    //  0x0000    // 0x30ff 
 };
 
 static sal_Unicode table_halfwidth[] = {
@@ -302,13 +302,13 @@ static sal_Unicode table_halfwidth[] = {
 };
 
 
-OUString SAL_CALL
+OUString SAL_CALL 
 ignoreProlongedSoundMark_ja_JP::folding( const OUString& inStr, sal_Int32 startPos, sal_Int32 nCount, Sequence< sal_Int32 >& offset )
   throw(RuntimeException)
 {
     // Create a string buffer which can hold nCount + 1 characters.
     // The reference count is 0 now.
-    rtl_uString * newStr = x_rtl_uString_new_WithLength( nCount ); // defined in x_rtl_ustring.h
+    rtl_uString * newStr = x_rtl_uString_new_WithLength( nCount ); // defined in x_rtl_ustring.h  
     sal_Unicode * dst = newStr->buffer;
     const sal_Unicode * src = inStr.getStr() + startPos;
 
@@ -322,7 +322,7 @@ ignoreProlongedSoundMark_ja_JP::folding( const OUString& inStr, sal_Int32 startP
         position = startPos;
     }
 
-    //
+    // 
     sal_Unicode previousChar = *src ++;
     sal_Unicode currentChar;
 
diff --git a/i18npool/source/transliteration/ignoreSeZe_ja_JP.cxx b/i18npool/source/transliteration/ignoreSeZe_ja_JP.cxx
index 2554e2b672d3..8de438e55fce 100644
--- a/i18npool/source/transliteration/ignoreSeZe_ja_JP.cxx
+++ b/i18npool/source/transliteration/ignoreSeZe_ja_JP.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
diff --git a/i18npool/source/transliteration/ignoreSeparator_ja_JP.cxx b/i18npool/source/transliteration/ignoreSeparator_ja_JP.cxx
index 2a4fd0683864..59fc8856f53f 100644
--- a/i18npool/source/transliteration/ignoreSeparator_ja_JP.cxx
+++ b/i18npool/source/transliteration/ignoreSeparator_ja_JP.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
@@ -36,7 +36,7 @@
 
 namespace com { namespace sun { namespace star { namespace i18n {
 
-OneToOneMappingTable_t ignoreSeparatorTable[] = {
+OneToOneMappingTable_t ignoreSeparatorTable[] = {       
     MAKE_PAIR( 0x0021, 0xFFFF ),  // EXCLAMATION MARK
     MAKE_PAIR( 0x0023, 0xFFFF ),  // NUMBER SIGN
     MAKE_PAIR( 0x0024, 0xFFFF ),  // DOLLAR SIGN
@@ -84,7 +84,7 @@ OneToOneMappingTable_t ignoreSeparatorTable[] = {
     MAKE_PAIR( 0x301D, 0xFFFF ),  // REVERSED DOUBLE PRIME
     MAKE_PAIR( 0x301E, 0xFFFF ),  // DOUBLE PRIME QUOTATION MARK
     MAKE_PAIR( 0x301F, 0xFFFF ),  // LOW DOUBLE PRIME QUOTATION MARK
-    MAKE_PAIR( 0x3030, 0xFFFF ),  // WAVY DASH
+    MAKE_PAIR( 0x3030, 0xFFFF ),  // WAVY DASH 
     MAKE_PAIR( 0x30FB, 0xFFFF ),  // KATAKANA MIDDLE DOT
     MAKE_PAIR( 0x30FC, 0xFFFF ),  // KATAKANA-HIRAHANA PROLONGED SOUND MARK
     MAKE_PAIR( 0xFF01, 0xFFFF ),  // FULLWIDTH EXCLAMATION MARK
diff --git a/i18npool/source/transliteration/ignoreSize_ja_JP.cxx b/i18npool/source/transliteration/ignoreSize_ja_JP.cxx
index 373a8b32df6e..f06c729fbbae 100644
--- a/i18npool/source/transliteration/ignoreSize_ja_JP.cxx
+++ b/i18npool/source/transliteration/ignoreSize_ja_JP.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
@@ -43,7 +43,7 @@ using namespace rtl;
 
 namespace com { namespace sun { namespace star { namespace i18n {
 
-OUString SAL_CALL
+OUString SAL_CALL 
 ignoreSize_ja_JP::folding( const OUString& inStr, sal_Int32 startPos, sal_Int32 nCount, Sequence< sal_Int32 >& offset )
   throw(RuntimeException)
 {
@@ -52,7 +52,7 @@ ignoreSize_ja_JP::folding( const OUString& inStr, sal_Int32 startPos, sal_Int32
 }
 
 
-Sequence< OUString > SAL_CALL
+Sequence< OUString > SAL_CALL 
 ignoreSize_ja_JP::transliterateRange( const OUString& str1, const OUString& str2 )
   throw(RuntimeException)
 {
diff --git a/i18npool/source/transliteration/ignoreSpace_ja_JP.cxx b/i18npool/source/transliteration/ignoreSpace_ja_JP.cxx
index c0d33e5ac1ef..274c85858d42 100644
--- a/i18npool/source/transliteration/ignoreSpace_ja_JP.cxx
+++ b/i18npool/source/transliteration/ignoreSpace_ja_JP.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
diff --git a/i18npool/source/transliteration/ignoreTiJi_ja_JP.cxx b/i18npool/source/transliteration/ignoreTiJi_ja_JP.cxx
index 58e4cab48a83..67228613c389 100644
--- a/i18npool/source/transliteration/ignoreTiJi_ja_JP.cxx
+++ b/i18npool/source/transliteration/ignoreTiJi_ja_JP.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
diff --git a/i18npool/source/transliteration/ignoreTraditionalKana_ja_JP.cxx b/i18npool/source/transliteration/ignoreTraditionalKana_ja_JP.cxx
index dcbb4d03f437..18dac6420258 100644
--- a/i18npool/source/transliteration/ignoreTraditionalKana_ja_JP.cxx
+++ b/i18npool/source/transliteration/ignoreTraditionalKana_ja_JP.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
@@ -36,7 +36,7 @@
 
 namespace com { namespace sun { namespace star { namespace i18n {
 
-sal_Unicode
+sal_Unicode 
 ignoreTraditionalKana_ja_JP_translator (const sal_Unicode c)
 {
 
diff --git a/i18npool/source/transliteration/ignoreTraditionalKanji_ja_JP.cxx b/i18npool/source/transliteration/ignoreTraditionalKanji_ja_JP.cxx
index 2d2a3a1bdf13..f8e66c16cd58 100644
--- a/i18npool/source/transliteration/ignoreTraditionalKanji_ja_JP.cxx
+++ b/i18npool/source/transliteration/ignoreTraditionalKanji_ja_JP.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
diff --git a/i18npool/source/transliteration/ignoreWidth.cxx b/i18npool/source/transliteration/ignoreWidth.cxx
index 494963c39d3f..a32787f1338e 100644
--- a/i18npool/source/transliteration/ignoreWidth.cxx
+++ b/i18npool/source/transliteration/ignoreWidth.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
diff --git a/i18npool/source/transliteration/ignoreZiZu_ja_JP.cxx b/i18npool/source/transliteration/ignoreZiZu_ja_JP.cxx
index 42e454e73941..a3f519d5bbdf 100644
--- a/i18npool/source/transliteration/ignoreZiZu_ja_JP.cxx
+++ b/i18npool/source/transliteration/ignoreZiZu_ja_JP.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
@@ -36,7 +36,7 @@
 
 namespace com { namespace sun { namespace star { namespace i18n {
 
-sal_Unicode
+sal_Unicode 
 ignoreZiZu_ja_JP_translator (const sal_Unicode c)
 {
 
diff --git a/i18npool/source/transliteration/katakanaToHiragana.cxx b/i18npool/source/transliteration/katakanaToHiragana.cxx
index fd821af5bf5b..d1d65e00a5c3 100644
--- a/i18npool/source/transliteration/katakanaToHiragana.cxx
+++ b/i18npool/source/transliteration/katakanaToHiragana.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
diff --git a/i18npool/source/transliteration/largeToSmall_ja_JP.cxx b/i18npool/source/transliteration/largeToSmall_ja_JP.cxx
index f53981cca01e..0dccfd83b8ea 100644
--- a/i18npool/source/transliteration/largeToSmall_ja_JP.cxx
+++ b/i18npool/source/transliteration/largeToSmall_ja_JP.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
@@ -45,9 +45,9 @@ namespace com { namespace sun { namespace star { namespace i18n {
 // ftp://ftp.unicode.org/Public/3.0-Update/UnicodeData-3.0.0.html
 // http://charts.unicode.org/Web/U3040.html Hiragana (U+3040..U+309F)
 // http://charts.unicode.org/Web/U30A0.html Katakana (U+30A0..U+30FF)
-// http://charts.unicode.org/Web/UFF00.html
+// http://charts.unicode.org/Web/UFF00.html 
 
-OneToOneMappingTable_t large2small[] = {
+OneToOneMappingTable_t large2small[] = {        
     MAKE_PAIR( 0x3041, 0x3042 ),  // HIRAGANA LETTER SMALL A --> HIRAGANA LETTER A
     MAKE_PAIR( 0x3043, 0x3044 ),  // HIRAGANA LETTER SMALL I --> HIRAGANA LETTER I
     MAKE_PAIR( 0x3045, 0x3046 ),  // HIRAGANA LETTER SMALL U --> HIRAGANA LETTER U
diff --git a/i18npool/source/transliteration/numtochar.cxx b/i18npool/source/transliteration/numtochar.cxx
index 5742ddf04926..fdf523060559 100644
--- a/i18npool/source/transliteration/numtochar.cxx
+++ b/i18npool/source/transliteration/numtochar.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
diff --git a/i18npool/source/transliteration/numtotext_cjk.cxx b/i18npool/source/transliteration/numtotext_cjk.cxx
index af33702ec57a..f30bc3d58b9d 100644
--- a/i18npool/source/transliteration/numtotext_cjk.cxx
+++ b/i18npool/source/transliteration/numtotext_cjk.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
diff --git a/i18npool/source/transliteration/smallToLarge_ja_JP.cxx b/i18npool/source/transliteration/smallToLarge_ja_JP.cxx
index 9b054dfb972a..40bde028e061 100644
--- a/i18npool/source/transliteration/smallToLarge_ja_JP.cxx
+++ b/i18npool/source/transliteration/smallToLarge_ja_JP.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
@@ -45,9 +45,9 @@ namespace com { namespace sun { namespace star { namespace i18n {
 // ftp://ftp.unicode.org/Public/3.0-Update/UnicodeData-3.0.0.html
 // http://charts.unicode.org/Web/U3040.html Hiragana (U+3040..U+309F)
 // http://charts.unicode.org/Web/U30A0.html Katakana (U+30A0..U+30FF)
-// http://charts.unicode.org/Web/UFF00.html
+// http://charts.unicode.org/Web/UFF00.html 
 
-OneToOneMappingTable_t small2large[] = {
+OneToOneMappingTable_t small2large[] = {        
     MAKE_PAIR( 0x3041, 0x3042 ),  // HIRAGANA LETTER SMALL A --> HIRAGANA LETTER A
     MAKE_PAIR( 0x3043, 0x3044 ),  // HIRAGANA LETTER SMALL I --> HIRAGANA LETTER I
     MAKE_PAIR( 0x3045, 0x3046 ),  // HIRAGANA LETTER SMALL U --> HIRAGANA LETTER U
diff --git a/i18npool/source/transliteration/textToPronounce_zh.cxx b/i18npool/source/transliteration/textToPronounce_zh.cxx
index 38c5d75931f2..63759f16fefa 100644
--- a/i18npool/source/transliteration/textToPronounce_zh.cxx
+++ b/i18npool/source/transliteration/textToPronounce_zh.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
@@ -102,7 +102,7 @@ TextToPronounce_zh::transliterateChar2Char( sal_Unicode inChar) throw(RuntimeExc
 sal_Bool SAL_CALL
 TextToPronounce_zh::equals( const OUString & str1, sal_Int32 pos1, sal_Int32 nCount1, sal_Int32 & nMatch1,
         const OUString & str2, sal_Int32 pos2, sal_Int32 nCount2, sal_Int32 & nMatch2)
-        throw (RuntimeException)
+        throw (RuntimeException) 
 {
     sal_Int32 realCount;
     int i;  // loop variable
diff --git a/i18npool/source/transliteration/texttonum.cxx b/i18npool/source/transliteration/texttonum.cxx
index 1d801bca569a..a20be40b7e5f 100644
--- a/i18npool/source/transliteration/texttonum.cxx
+++ b/i18npool/source/transliteration/texttonum.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
diff --git a/i18npool/source/transliteration/transliterationImpl.cxx b/i18npool/source/transliteration/transliterationImpl.cxx
index dfadecfd5eb7..b0745a6e6e86 100644
--- a/i18npool/source/transliteration/transliterationImpl.cxx
+++ b/i18npool/source/transliteration/transliterationImpl.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
@@ -204,7 +204,7 @@ TransliterationImpl::loadModule( TransliterationModules modType, const Locale& r
 #define TransliterationModules_IGNORE_CASE_MASK (TransliterationModules_IGNORE_CASE | \
                                                 TransliterationModules_IGNORE_WIDTH | \
                                                 TransliterationModules_IGNORE_KANA)
-        sal_Int32 mask = ((modType&TransliterationModules_IGNORE_CASE_MASK) == modType) ?
+        sal_Int32 mask = ((modType&TransliterationModules_IGNORE_CASE_MASK) == modType) ? 
                 TransliterationModules_IGNORE_CASE_MASK : TransliterationModules_IGNORE_MASK;
         for (sal_Int16 i = 0; TMlist[i].tm & mask; i++) {
             if (modType & TMlist[i].tm)
@@ -235,9 +235,9 @@ TransliterationImpl::loadModuleNew( const Sequence < TransliterationModulesNew >
         for (sal_Int16 j = 0; TMlist[j].tmn; j++) {
             if (TMlist[j].tmn == modType[i]) {
                 if (mask == 0)
-                    mask = TMlist[i].tm && (TMlist[i].tm&TransliterationModules_IGNORE_MASK) ?
+                    mask = TMlist[i].tm && (TMlist[i].tm&TransliterationModules_IGNORE_MASK) ? 
                         TransliterationModules_IGNORE_MASK : TransliterationModules_NON_IGNORE_MASK;
-                else if (mask == TransliterationModules_IGNORE_MASK &&
+                else if (mask == TransliterationModules_IGNORE_MASK && 
                         (TMlist[i].tm&TransliterationModules_IGNORE_MASK) == 0)
                     throw ERROR; // could not mess up ignore trans. with non_ignore trans.
                 if (loadModuleByName(OUString::createFromAscii(TMlist[j].implName), bodyCascade[numCascade], rLocale))
@@ -292,10 +292,9 @@ TransliterationImpl::getAvailableModules( const Locale& rLocale, sal_Int16 sType
 
 
 OUString SAL_CALL
-TransliterationImpl::transliterate( const OUString& inStr, sal_Int32 startPos, sal_Int32 nCount,
+TransliterationImpl::transliterate( const OUString& inStr, sal_Int32 startPos, sal_Int32 nCount, 
                     Sequence< sal_Int32 >& offset ) throw(RuntimeException)
 {
-
     if (numCascade == 0)
         return inStr;
 
@@ -478,7 +477,7 @@ TransliterationImpl::equals(
 
     const sal_Unicode *p1 = tmpStr1.getStr();
     const sal_Unicode *p2 = tmpStr2.getStr();
-    sal_Int32 i, nLen = (tmpStr1.getLength() < tmpStr1.getLength() ?
+    sal_Int32 i, nLen = (tmpStr1.getLength() < tmpStr1.getLength() ? 
                         tmpStr1.getLength() : tmpStr2.getLength());
     for (i = 0; i < nLen; ++i, ++p1, ++p2 ) {
         if (*p1 != *p2) {
@@ -489,7 +488,7 @@ TransliterationImpl::equals(
         }
     }
     // i==nLen
-    if ( tmpStr1.getLength() != tmpStr2.getLength() ) {
+    if ( tmpStr1.getLength() != tmpStr2.getLength() ) {   
         // return number of matched code points so far
         nMatch1 = offset1[i-1] + 1;
         nMatch2 = offset2[i-1] + 1;
@@ -590,7 +589,7 @@ TransliterationImpl::clear()
     caseignoreOnly = sal_True;
 }
 
-void TransliterationImpl::loadBody( OUString &implName, Reference<XExtendedTransliteration>& body )
+void TransliterationImpl::loadBody( OUString &implName, Reference<XExtendedTransliteration>& body ) 
     throw (RuntimeException)
 {
     ::osl::MutexGuard guard(lastTransBody.mutex);
@@ -631,7 +630,7 @@ void TransliterationImpl::loadBody( OUString &implName, Reference<XExtendedTrans
 }
 
 sal_Bool SAL_CALL
-TransliterationImpl::loadModuleByName( const OUString& implName,
+TransliterationImpl::loadModuleByName( const OUString& implName, 
         Reference<XExtendedTransliteration>& body, const Locale& rLocale) throw(RuntimeException)
 {
     OUString cname = OUString::createFromAscii(TRLT_IMPLNAME_PREFIX) + implName;
diff --git a/i18npool/source/transliteration/transliteration_Ignore.cxx b/i18npool/source/transliteration/transliteration_Ignore.cxx
index 35e82fc579f7..1fd7edee29cc 100644
--- a/i18npool/source/transliteration/transliteration_Ignore.cxx
+++ b/i18npool/source/transliteration/transliteration_Ignore.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
@@ -103,7 +103,7 @@ transliteration_Ignore::transliterate( const OUString& inStr, sal_Int32 startPos
 }
 
 Sequence< OUString > SAL_CALL
-transliteration_Ignore::transliterateRange( const OUString& str1, const OUString& str2,
+transliteration_Ignore::transliterateRange( const OUString& str1, const OUString& str2, 
         XTransliteration& t1, XTransliteration& t2 ) throw(RuntimeException)
 {
         if (str1.getLength() < 1 || str2.getLength() < 1)
@@ -130,14 +130,14 @@ transliteration_Ignore::transliterateRange( const OUString& str1, const OUString
         return r;
 }
 
-OUString SAL_CALL
-transliteration_Ignore::folding( const OUString& inStr, sal_Int32 startPos,
-    sal_Int32 nCount, Sequence< sal_Int32 >& offset)
+OUString SAL_CALL 
+transliteration_Ignore::folding( const OUString& inStr, sal_Int32 startPos, 
+    sal_Int32 nCount, Sequence< sal_Int32 >& offset) 
     throw(RuntimeException)
 {
     // Create a string buffer which can hold nCount + 1 characters.
     // The reference count is 0 now.
-    rtl_uString * newStr = x_rtl_uString_new_WithLength( nCount ); // defined in x_rtl_ustring.h
+    rtl_uString * newStr = x_rtl_uString_new_WithLength( nCount ); // defined in x_rtl_ustring.h  
     sal_Unicode * dst = newStr->buffer;
     const sal_Unicode * src = inStr.getStr() + startPos;
 
@@ -211,7 +211,7 @@ transliteration_Ignore::folding( const OUString& inStr, sal_Int32 startPos,
     return OUString( newStr ); // defined in rtl/usrting. The reference count is increased from 0 to 1.
 }
 
-sal_Unicode SAL_CALL
+sal_Unicode SAL_CALL 
 transliteration_Ignore::transliterateChar2Char( sal_Unicode inChar) throw(RuntimeException, MultipleCharsOutputException)
 {
     return func ? func( inChar) : table ? (*table)[ inChar ] : inChar;
diff --git a/i18npool/source/transliteration/transliteration_Numeric.cxx b/i18npool/source/transliteration/transliteration_Numeric.cxx
index 95b44200ceac..89947cc9017c 100644
--- a/i18npool/source/transliteration/transliteration_Numeric.cxx
+++ b/i18npool/source/transliteration/transliteration_Numeric.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
@@ -56,7 +56,7 @@ transliteration_Numeric::equals( const OUString& /*str1*/, sal_Int32 /*pos1*/, s
         throw (new RuntimeException());
 }
 
-Sequence< OUString > SAL_CALL
+Sequence< OUString > SAL_CALL 
 transliteration_Numeric::transliterateRange( const OUString& /*str1*/, const OUString& /*str2*/ )
         throw(RuntimeException)
 {
@@ -67,7 +67,7 @@ transliteration_Numeric::transliterateRange( const OUString& /*str1*/, const OUS
 #define isNumber(c) ((c) >= 0x30 && (c) <= 0x39)
 #define NUMBER_ZERO 0x30
 
-OUString SAL_CALL
+OUString SAL_CALL 
 transliteration_Numeric::transliterateBullet( const OUString& inStr, sal_Int32 startPos, sal_Int32 nCount,
         Sequence< sal_Int32 >& offset ) throw(RuntimeException)
 {
@@ -121,7 +121,7 @@ transliteration_Numeric::transliterateBullet( const OUString& inStr, sal_Int32 s
         return OUString( pStr, SAL_NO_ACQUIRE );
 }
 
-OUString SAL_CALL
+OUString SAL_CALL 
 transliteration_Numeric::transliterate( const OUString& inStr, sal_Int32 startPos, sal_Int32 nCount,
         Sequence< sal_Int32 >& offset ) throw(RuntimeException)
 {
@@ -131,7 +131,7 @@ transliteration_Numeric::transliterate( const OUString& inStr, sal_Int32 startPo
             return NativeNumberSupplier(useOffset).getNativeNumberString( inStr.copy(startPos, nCount), aLocale, nNativeNumberMode, offset );
 }
 
-sal_Unicode SAL_CALL
+sal_Unicode SAL_CALL 
 transliteration_Numeric::transliterateChar2Char( sal_Unicode inChar ) throw(RuntimeException, MultipleCharsOutputException)
 {
         if (tableSize) {
diff --git a/i18npool/source/transliteration/transliteration_OneToOne.cxx b/i18npool/source/transliteration/transliteration_OneToOne.cxx
index 9628286f892d..5dfdbf9a9c18 100644
--- a/i18npool/source/transliteration/transliteration_OneToOne.cxx
+++ b/i18npool/source/transliteration/transliteration_OneToOne.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
@@ -45,35 +45,35 @@ sal_Int16 SAL_CALL transliteration_OneToOne::getType() throw(RuntimeException)
 }
 
 OUString SAL_CALL
-transliteration_OneToOne::folding( const OUString& /*inStr*/, sal_Int32 /*startPos*/,
+transliteration_OneToOne::folding( const OUString& /*inStr*/, sal_Int32 /*startPos*/, 
         sal_Int32 /*nCount*/, Sequence< sal_Int32 >& /*offset*/) throw(RuntimeException)
 {
         throw RuntimeException();
 }
 
 sal_Bool SAL_CALL
-transliteration_OneToOne::equals( const OUString& /*str1*/, sal_Int32 /*pos1*/, sal_Int32 /*nCount1*/,
+transliteration_OneToOne::equals( const OUString& /*str1*/, sal_Int32 /*pos1*/, sal_Int32 /*nCount1*/, 
         sal_Int32& /*nMatch1*/, const OUString& /*str2*/, sal_Int32 /*pos2*/, sal_Int32 /*nCount2*/, sal_Int32& /*nMatch2*/ )
         throw(RuntimeException)
 {
     throw RuntimeException();
 }
 
-Sequence< OUString > SAL_CALL
-transliteration_OneToOne::transliterateRange( const OUString& /*str1*/, const OUString& /*str2*/ )
+Sequence< OUString > SAL_CALL 
+transliteration_OneToOne::transliterateRange( const OUString& /*str1*/, const OUString& /*str2*/ ) 
         throw(RuntimeException)
 {
     throw RuntimeException();
 }
 
-OUString SAL_CALL
-transliteration_OneToOne::transliterate( const OUString& inStr, sal_Int32 startPos,
-    sal_Int32 nCount, Sequence< sal_Int32 >& offset)
+OUString SAL_CALL 
+transliteration_OneToOne::transliterate( const OUString& inStr, sal_Int32 startPos, 
+    sal_Int32 nCount, Sequence< sal_Int32 >& offset) 
     throw(RuntimeException)
 {
     // Create a string buffer which can hold nCount + 1 characters.
     // The reference count is 0 now.
-    rtl_uString * newStr = x_rtl_uString_new_WithLength( nCount ); // defined in x_rtl_ustring.h
+    rtl_uString * newStr = x_rtl_uString_new_WithLength( nCount ); // defined in x_rtl_ustring.h  
     sal_Unicode * dst = newStr->buffer;
     const sal_Unicode * src = inStr.getStr() + startPos;
 
@@ -98,7 +98,7 @@ transliteration_OneToOne::transliterate( const OUString& inStr, sal_Int32 startP
     return OUString( newStr ); // defined in rtl/usrting. The reference count is increased from 0 to 1.
 }
 
-sal_Unicode SAL_CALL
+sal_Unicode SAL_CALL 
 transliteration_OneToOne::transliterateChar2Char( sal_Unicode inChar) throw(RuntimeException, MultipleCharsOutputException)
 {
     return func ? func( inChar) : (*table)[ inChar ];
diff --git a/i18npool/source/transliteration/transliteration_body.cxx b/i18npool/source/transliteration/transliteration_body.cxx
index b58347826470..4257b38abcda 100755
--- a/i18npool/source/transliteration/transliteration_body.cxx
+++ b/i18npool/source/transliteration/transliteration_body.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
@@ -35,6 +35,7 @@
 #include <comphelper/processfactory.hxx>
 #include <osl/diagnose.h>
 
+#include <string.h>
 
 #include "characterclassificationImpl.hxx"
 #include "breakiteratorImpl.hxx"
@@ -71,8 +72,8 @@ sal_Bool SAL_CALL Transliteration_body::equals(
     throw RuntimeException();
 }
 
-Sequence< OUString > SAL_CALL
-Transliteration_body::transliterateRange( const OUString& str1, const OUString& str2 )
+Sequence< OUString > SAL_CALL 
+Transliteration_body::transliterateRange( const OUString& str1, const OUString& str2 ) 
     throw( RuntimeException)
 {
     Sequence< OUString > ostr(2);
@@ -94,9 +95,9 @@ static sal_uInt8 lcl_getMappingTypeForToggleCase( sal_uInt8 nMappingType, sal_Un
         const sal_Int16 nType = unicode::getUnicodeType( cChar );
         if (nType & 0x02 /* lower case*/)
             nRes = MappingTypeLowerToUpper;
-        else
+        else 
         {
-            OSL_ENSURE( nType & 0x01 /* upper case */, "uppercase character expected! 'Toggle case' failed?" );
+            // should also work properly for non-upper characters like white spacs, numbers, ...
             nRes = MappingTypeUpperToLower;
         }
     }
@@ -105,10 +106,10 @@ static sal_uInt8 lcl_getMappingTypeForToggleCase( sal_uInt8 nMappingType, sal_Un
 }
 
 
-OUString SAL_CALL
-Transliteration_body::transliterate(
-    const OUString& inStr, sal_Int32 startPos, sal_Int32 nCount,
-    Sequence< sal_Int32 >& offset)
+OUString SAL_CALL 
+Transliteration_body::transliterate( 
+    const OUString& inStr, sal_Int32 startPos, sal_Int32 nCount, 
+    Sequence< sal_Int32 >& offset) 
     throw(RuntimeException)
 {
 #if 0
@@ -253,7 +254,7 @@ Transliteration_body::transliterate(
 #endif
 }
 
-OUString SAL_CALL
+OUString SAL_CALL 
 Transliteration_body::transliterateChar2String( sal_Unicode inChar ) throw(RuntimeException)
 {
         const Mapping &map = casefolding::getValue(&inChar, 0, 1, aLocale, nMappingType);
@@ -268,7 +269,7 @@ Transliteration_body::transliterateChar2String( sal_Unicode inChar ) throw(Runti
         return OUString( pStr, SAL_NO_ACQUIRE );
 }
 
-sal_Unicode SAL_CALL
+sal_Unicode SAL_CALL 
 Transliteration_body::transliterateChar2Char( sal_Unicode inChar ) throw(MultipleCharsOutputException, RuntimeException)
 {
         const Mapping &map = casefolding::getValue(&inChar, 0, 1, aLocale, nMappingType);
@@ -278,7 +279,7 @@ Transliteration_body::transliterateChar2Char( sal_Unicode inChar ) throw(Multipl
 }
 
 OUString SAL_CALL
-Transliteration_body::folding( const OUString& inStr, sal_Int32 startPos, sal_Int32 nCount,
+Transliteration_body::folding( const OUString& inStr, sal_Int32 startPos, sal_Int32 nCount, 
     Sequence< sal_Int32 >& offset) throw(RuntimeException)
 {
     return this->transliterate(inStr, startPos, nCount, offset);
@@ -330,185 +331,143 @@ Transliteration_titlecase::Transliteration_titlecase()
     implementationName = "com.sun.star.i18n.Transliteration.Transliteration_titlecase";
 }
 
-rtl::OUString SAL_CALL Transliteration_titlecase::transliterate(
-    const OUString& inStr, sal_Int32 startPos, sal_Int32 nCount,
-    Sequence< sal_Int32 >& /*offset*/ )
-    throw(RuntimeException)
+#if 0
+struct LigatureData
 {
-    Reference< XMultiServiceFactory > xMSF = ::comphelper::getProcessServiceFactory();
-    CharacterClassificationImpl aCharClassImpl( xMSF );
-
-    // possible problem: the locale is not exactly specific for each word in the text...
-    OUString aRes( aCharClassImpl.toTitle( inStr, startPos, nCount, aLocale ) );
-    return aRes;
-}
-
-Transliteration_sentencecase::Transliteration_sentencecase()
+    sal_uInt32  cChar;
+    sal_Char *  pUtf8Text;
+};
+
+// available Unicode ligatures:
+// http://www.unicode.org/charts
+// http://www.unicode.org/charts/PDF/UFB00.pdf
+static LigatureData aLigatures[] =
 {
-    nMappingType = MappingTypeToTitle;  // though only to be applied to the first word...
-    transliterationName = "sentence(generic)";
-    implementationName = "com.sun.star.i18n.Transliteration.Transliteration_sentencecase";
+    { 0x0FB00,     "ff" },
+    { 0x0FB01,     "fi" },
+    { 0x0FB02,     "fl" },
+    { 0x0FB03,     "ffi" },
+    { 0x0FB04,     "ffl" },
+    { 0x0FB05,     "ft" },
+    { 0x0FB06,     "st" },
+
+    { 0x0FB13,     "\xD5\xB4\xD5\xB6" },     // Armenian small men now
+    { 0x0FB14,     "\xD5\xB4\xD5\xA5" },     // Armenian small men ech
+    { 0x0FB15,     "\xD5\xB4\xD5\xAB" },     // Armenian small men ini
+    { 0x0FB16,     "\xD5\xBE\xD5\xB6" },     // Armenian small vew now
+    { 0x0FB17,     "\xD5\xB4\xD5\xAD" },     // Armenian small men xeh
+    { 0x00000,     "" }
+};
+
+static inline bool lcl_IsLigature( sal_uInt32 cChar )
+{
+    return (0x0FB00 <= cChar && cChar <= 0x0FB06) || (0x0FB13 <= cChar && cChar <= 0x0FB17);
 }
 
-rtl::OUString SAL_CALL Transliteration_sentencecase::transliterate(
-    const OUString& inStr, sal_Int32 startPos, sal_Int32 nCount,
-    Sequence< sal_Int32 >& offset )
-    throw(RuntimeException)
+static rtl::OUString lcl_ResolveLigature( sal_uInt32 cChar )
 {
-    // inspired from Transliteration_body::transliterate
-    sal_Int32 nOffCount = 0, i;
-    bool bPoint = true;
-    if (useOffset)
+    rtl::OUString aRes;
+    if (lcl_IsLigature( cChar ))
     {
-        for( i = 0; i < nCount; ++i ) {
-            sal_Unicode c = inStr.getStr()[ i + startPos ];
-            if( sal_Unicode('.') == c || sal_Unicode('!') == c || sal_Unicode('?') == c ) {
-                bPoint = true;
-                nOffCount++;
-            }
-            else if( unicode::isAlpha( c ) || unicode::isDigit( c ) )
-            {
-                const Mapping* map = 0;
-                if( bPoint && unicode::isLower( c ))
-                {
-                    map = &casefolding::getValue(&c, 0, 1, aLocale, MappingTypeLowerToUpper);
-                    bPoint = false;
-                }
-                else if (!bPoint && unicode::isUpper( c ))
-                {
-                    map = &casefolding::getValue(&c, 0, 1, aLocale, MappingTypeUpperToLower);
-                }
-
-                if(map == 0)
-                {
-                    nOffCount++;
-                }
-                else
-                {
-                    nOffCount += map->nmap;
-                }
-            }
-            else
-            {
-                nOffCount++;
-            }
+        LigatureData *pFound = NULL;
+        LigatureData *pData = aLigatures;
+        while (!pFound && pData->cChar != 0)
+        {
+            if (pData->cChar == cChar)
+                pFound = pData;
+            ++pData;
         }
+        if (pFound)
+            aRes = rtl::OUString( pFound->pUtf8Text, strlen( pFound->pUtf8Text ), RTL_TEXTENCODING_UTF8 );
     }
+    else
+        aRes = rtl::OUString( &cChar, 1 );
+    return aRes;
+}
+#endif // if 0
 
-    bPoint = true;
-    rtl::OUStringBuffer result;
+static rtl::OUString transliterate_titlecase_Impl(
+    const OUString& inStr, sal_Int32 startPos, sal_Int32 nCount, 
+    const Locale &rLocale,
+    Sequence< sal_Int32 >& offset ) 
+    throw(RuntimeException)
+{
+    const OUString aText( inStr.copy( startPos, nCount ) );
 
-    if (useOffset)
+    OUString aRes;
+    if (aText.getLength() > 0)
     {
-        result.ensureCapacity(nOffCount);
-        if ( nOffCount != offset.getLength() )
-            offset.realloc( nOffCount );
-    }
-
-
-    sal_Int32 j = 0;
-    sal_Int32 * pArr = offset.getArray();
-    for(  i = 0; i < nCount; ++i ) {
-        sal_Unicode c = inStr.getStr()[ i + startPos ];
-        if( sal_Unicode('.') == c || sal_Unicode('!') == c || sal_Unicode('?') == c ) {
-            bPoint = true;
-            result.append(c);
-            pArr[j++] = i + startPos;
-        }
-        else if( unicode::isAlpha( c ) || unicode::isDigit( c ) )
-        {
-            const Mapping* map = 0;
-            if( bPoint && unicode::isLower( c ))
-            {
-                map = &casefolding::getValue(&c, 0, 1, aLocale, MappingTypeLowerToUpper);
-            }
-            else if (!bPoint && unicode::isUpper( c ))
-            {
-                map = &casefolding::getValue(&c, 0, 1, aLocale, MappingTypeUpperToLower);
-            }
-
-            if(map == 0)
-            {
-                result.append( c );
-                pArr[j++] = i + startPos;
-            }
-            else
-            {
-                for (sal_Int32 k = 0; k < map->nmap; k++)
-                {
-                    result.append( map->map[k] );
-                    pArr[j++] = i + startPos;
-                }
-            }
-            bPoint = false;
-        }
-        else
+        Reference< XMultiServiceFactory > xMSF = ::comphelper::getProcessServiceFactory();
+        CharacterClassificationImpl aCharClassImpl( xMSF );
+
+        // because aCharClassImpl.toTitle does not handle ligatures or � but will raise 
+        // an exception we need to handle the first chara manually...
+
+        // we don't want to change surrogates by accident, thuse we use proper code point iteration
+        sal_Int32 nPos = 0;
+        sal_uInt32 cFirstChar = aText.iterateCodePoints( &nPos );
+        OUString aResolvedLigature( &cFirstChar, 1 ); //lcl_ResolveLigature( cFirstChar ) );
+        // toUpper can be used to properly resolve ligatures and characters like �
+        aResolvedLigature = aCharClassImpl.toUpper( aResolvedLigature, 0, aResolvedLigature.getLength(), rLocale );
+        // since toTitle will leave all-uppercase text unchanged we first need to
+        // use toLower to bring possible 2nd and following charas in lowercase
+        aResolvedLigature = aCharClassImpl.toLower( aResolvedLigature, 0, aResolvedLigature.getLength(), rLocale );
+        sal_Int32 nResolvedLen = aResolvedLigature.getLength();
+
+        // now we can properly use toTitle to get the expected result for the resolved string.
+        // The rest of the text should just become lowercase.
+        aRes = aCharClassImpl.toTitle( aResolvedLigature, 0, nResolvedLen, rLocale );
+        aRes += aCharClassImpl.toLower( aText, 1, aText.getLength() - 1, rLocale );
+        offset.realloc( aRes.getLength() );
+
+        sal_Int32 *pOffset = offset.getArray();
+        sal_Int32 nLen = offset.getLength();
+        for (sal_Int32 i = 0; i < nLen; ++i)
         {
-            result.append( c );
-            pArr[j++] = i + startPos;
+            sal_Int32 nIdx = 0;
+            if (i >= nResolvedLen)
+                nIdx = i - nResolvedLen + 1;
+            pOffset[i] = nIdx;
         }
     }
-    return result.makeStringAndClear();
+#if OSL_DEBUG_LEVEL > 1
+    const sal_Int32 *pCOffset = offset.getConstArray();
+    (void) pCOffset;
+#endif
+
+    return aRes;
 }
 
-#if 0
-// TL: alternative implemntation try. But breakiterator has its problem too since
-// beginOfSentence does not work as expected with '.'. See comment below.
-// For the time being I will leave this code here as a from-scratch sample if the
-// breakiterator works better at some point...
-rtl::OUString SAL_CALL Transliteration_sentencecase::transliterate(
-    const OUString& inStr, sal_Int32 nStartPos, sal_Int32 nCount,
-    Sequence< sal_Int32 >& /*offset*/ )
+
+// this function expects to be called on a word-by-word basis,
+// namely that startPos points to the first char of the word
+rtl::OUString SAL_CALL Transliteration_titlecase::transliterate( 
+    const OUString& inStr, sal_Int32 startPos, sal_Int32 nCount, 
+    Sequence< sal_Int32 >& offset ) 
     throw(RuntimeException)
 {
-    OUString aRes( inStr.copy( nStartPos, nCount ) );
+    return transliterate_titlecase_Impl( inStr, startPos, nCount, aLocale, offset );
+}
 
-    if (nStartPos >= 0 && nStartPos < inStr.getLength() && nCount > 0)
-    {
-        Reference< XMultiServiceFactory > xMSF = ::comphelper::getProcessServiceFactory();
-        BreakIteratorImpl brk( xMSF );
 
-        sal_Int32 nSentenceStart = -1, nOldSentenceStart = -1;
-        sal_Int32 nPos = nStartPos + nCount - 1;
-        while (nPos >= nStartPos && nPos != -1)
-        {
-            // possible problem: the locale is not exactly specific for each sentence in the text,
-            // but it is the only one we have...
-            nOldSentenceStart = nSentenceStart;
-            nSentenceStart = brk.beginOfSentence( inStr, nPos, aLocale );
-
-            // since the breakiterator completely ignores '.' characvters as end-of-sentence when
-            // the next word is lower case we need to take care of that ourself. The drawback:
-            // la mid-sentence abbreviation like e.g. will now be identified as end-of-sentence. :-(
-            // Well, at least the other product does it in the same way...
-            sal_Int32 nFullStopPos = inStr.lastIndexOf( (sal_Unicode)'.', nPos );
-            nPos = nSentenceStart;
-            if (nFullStopPos > 0 && nFullStopPos > nSentenceStart)
-            {
-                Boundary aBd2 = brk.nextWord( inStr, nFullStopPos, aLocale, WordType::DICTIONARY_WORD );
-                nSentenceStart = aBd2.startPos;
-                nPos = nFullStopPos;
-            }
+Transliteration_sentencecase::Transliteration_sentencecase()
+{
+    nMappingType = MappingTypeToTitle;  // though only to be applied to the first word...
+    transliterationName = "sentence(generic)";
+    implementationName = "com.sun.star.i18n.Transliteration.Transliteration_sentencecase";
+}
 
-            if (nSentenceStart < nOldSentenceStart || nOldSentenceStart == -1)
-            {
-                // the sentence start might be a quotation mark or some kind of bracket, thus
-                // we need the first dictionary word starting or following this position
-    //            Boundary aBd1 = brk.nextWord( inStr, nSentenceStart, aLocale, WordType::DICTIONARY_WORD );
-                Boundary aBd2 = brk.getWordBoundary( inStr, nSentenceStart, aLocale, WordType::DICTIONARY_WORD, true );
-    //            OUString aWord1( inStr.copy( aBd1.startPos, aBd1.endPos - aBd1.startPos + 1 ) );
-                OUString aWord2( inStr.copy( aBd2.startPos, aBd2.endPos - aBd2.startPos + 1 ) );
-            }
-            else
-                break;  // prevent endless loop
 
-            // continue with previous sentence
-            if (nPos != -1)
-                --nPos;
-        }
-    }
-    return aRes;
+// this function expects to be called on a sentence-by-sentence basis,
+// namely that startPos points to the first word (NOT first char!) in the sentence
+rtl::OUString SAL_CALL Transliteration_sentencecase::transliterate( 
+    const OUString& inStr, sal_Int32 startPos, sal_Int32 nCount, 
+    Sequence< sal_Int32 >& offset )
+    throw(RuntimeException)
+{
+    return transliterate_titlecase_Impl( inStr, startPos, nCount, aLocale, offset );
 }
-#endif
+
 
 } } } }
+
diff --git a/i18npool/source/transliteration/transliteration_caseignore.cxx b/i18npool/source/transliteration/transliteration_caseignore.cxx
index ba63127c2d70..b8ae6aa46c89 100644
--- a/i18npool/source/transliteration/transliteration_caseignore.cxx
+++ b/i18npool/source/transliteration/transliteration_caseignore.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
@@ -50,8 +50,8 @@ Transliteration_caseignore::Transliteration_caseignore()
 }
 
 #if 0
-/* NOTE: We had this, derived from Transliteration_caseignore, but it was
- * unused code. Deactivated with #i89580# but left for reference in case
+/* NOTE: We had this, derived from Transliteration_caseignore, but it was 
+ * unused code. Deactivated with #i89580# but left for reference in case 
  * MappingTypeSimpleFolding would be needed at some time.
  */
 Transliteration_simplecaseignore::Transliteration_simplecaseignore()
@@ -63,7 +63,7 @@ Transliteration_simplecaseignore::Transliteration_simplecaseignore()
 }
 #endif
 
-void SAL_CALL
+void SAL_CALL 
 Transliteration_caseignore::loadModule( TransliterationModules modName, const Locale& rLocale )
     throw(RuntimeException)
 {
@@ -79,7 +79,7 @@ sal_Int16 SAL_CALL Transliteration_caseignore::getType() throw(RuntimeException)
 
 
 Sequence< OUString > SAL_CALL
-Transliteration_caseignore::transliterateRange( const OUString& str1, const OUString& str2 )
+Transliteration_caseignore::transliterateRange( const OUString& str1, const OUString& str2 ) 
     throw( RuntimeException)
 {
     if (str1.getLength() != 1 || str2.getLength() != 1)
diff --git a/i18npool/source/transliteration/transliteration_commonclass.cxx b/i18npool/source/transliteration/transliteration_commonclass.cxx
index 278336411ce8..7364207e6f99 100644
--- a/i18npool/source/transliteration/transliteration_commonclass.cxx
+++ b/i18npool/source/transliteration/transliteration_commonclass.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
@@ -56,7 +56,7 @@ void SAL_CALL transliteration_commonclass::loadModule( TransliterationModules /*
 }
 
 
-void SAL_CALL
+void SAL_CALL 
 transliteration_commonclass::loadModuleNew( const Sequence < TransliterationModulesNew >& /*modName*/, const Locale& /*rLocale*/ )
         throw(RuntimeException)
 {
@@ -71,14 +71,14 @@ transliteration_commonclass::loadModuleByImplName( const OUString& /*implName*/,
         throw RuntimeException();
 }
 
-void SAL_CALL
+void SAL_CALL 
 transliteration_commonclass::loadModulesByImplNames(const Sequence< OUString >& /*modNamelist*/, const Locale& /*rLocale*/)
         throw(RuntimeException)
 {
         throw RuntimeException();
 }
 
-Sequence< OUString > SAL_CALL
+Sequence< OUString > SAL_CALL 
 transliteration_commonclass::getAvailableModules( const Locale& /*rLocale*/, sal_Int16 /*sType*/ )
         throw(RuntimeException)
 {
diff --git a/i18npool/xml/ChapterCollator.xml b/i18npool/xml/ChapterCollator.xml
index 48c1f6585d94..54792fd0945f 100644
--- a/i18npool/xml/ChapterCollator.xml
+++ b/i18npool/xml/ChapterCollator.xml
@@ -1,35 +1,35 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE module-description PUBLIC "-//StarOffice//DTD ComponentDescription 1.0//EN" "module-description.dtd">
 <module-description xmlns:xlink="http://www.w3.org/1999/xlink">
-    <module-name>   i18n    </module-name>
+    <module-name>	i18n	</module-name>
     <component-description>
-        <author>    Bustamam Harun  </author>
-        <name>  com.sun.star.i18n.ChapterCollator   </name>
+        <author>	Bustamam Harun	</author>
+        <name>	com.sun.star.i18n.ChapterCollator	</name>
         <description>
     This component provides localized collation algorithm
 </description>
-        <loader-name>   com.sun.star.loader.SharedLibrary   </loader-name>
-        <language>  C++ </language>
+        <loader-name>	com.sun.star.loader.SharedLibrary	</loader-name>
+        <language>	C++	</language>
         <status value="final"/>
-        <supported-service> com.sun.star.i18n.ChapterCollator   </supported-service>
+        <supported-service>	com.sun.star.i18n.ChapterCollator	</supported-service>
         <reference-docu xlink:href="file:///docs/sampledoc.html" xlink:type="simple"/>
-        <type>  com.sun.star.lang.XMultiServiceFactory  </type>
-        <type>  com.sun.star.uno.Reference              </type>
-        <type>  com.sun.star.i18n.XLocaleData           </type>
-        <type>  com.sun.star.i18n.XCollator         </type>
+        <type>	com.sun.star.lang.XMultiServiceFactory	</type>
+        <type>	com.sun.star.uno.Reference				</type>
+        <type>	com.sun.star.i18n.XLocaleData			</type>
+        <type>	com.sun.star.i18n.XCollator			</type>
     </component-description>
-    <project-build-dependency>  cppuhelper  </project-build-dependency>
-    <project-build-dependency>  cppu        </project-build-dependency>
-    <project-build-dependency>  registry    </project-build-dependency>
-    <project-build-dependency>  store       </project-build-dependency>
-    <project-build-dependency>  vos         </project-build-dependency>
-    <project-build-dependency>  sal         </project-build-dependency>
-    <project-build-dependency>  unotools    </project-build-dependency>
-    <runtime-module-dependency> cppuhelper  </runtime-module-dependency>
-    <runtime-module-dependency> cppu        </runtime-module-dependency>
-    <runtime-module-dependency> reg         </runtime-module-dependency>
-    <runtime-module-dependency> store       </runtime-module-dependency>
-    <runtime-module-dependency> vos         </runtime-module-dependency>
-    <runtime-module-dependency> sal         </runtime-module-dependency>
-    <runtime-module-dependency> unotools    </runtime-module-dependency>
+    <project-build-dependency>	cppuhelper	</project-build-dependency>
+    <project-build-dependency>	cppu		</project-build-dependency>
+    <project-build-dependency>	registry	</project-build-dependency>
+    <project-build-dependency>	store		</project-build-dependency>
+    <project-build-dependency>	vos			</project-build-dependency>
+    <project-build-dependency>	sal			</project-build-dependency>
+    <project-build-dependency>	unotools	</project-build-dependency>
+    <runtime-module-dependency>	cppuhelper	</runtime-module-dependency>
+    <runtime-module-dependency>	cppu		</runtime-module-dependency>
+    <runtime-module-dependency>	reg			</runtime-module-dependency>
+    <runtime-module-dependency>	store		</runtime-module-dependency>
+    <runtime-module-dependency>	vos			</runtime-module-dependency>
+    <runtime-module-dependency>	sal			</runtime-module-dependency>
+    <runtime-module-dependency>	unotools	</runtime-module-dependency>
 </module-description>
diff --git a/i18npool/xml/Collator.xml b/i18npool/xml/Collator.xml
index 1b1f6489379b..9da253882fc9 100644
--- a/i18npool/xml/Collator.xml
+++ b/i18npool/xml/Collator.xml
@@ -1,35 +1,35 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE module-description PUBLIC "-//StarOffice//DTD ComponentDescription 1.0//EN" "module-description.dtd">
 <module-description xmlns:xlink="http://www.w3.org/1999/xlink">
-    <module-name>   i18n    </module-name>
+    <module-name>	i18n	</module-name>
     <component-description>
-        <author>    Bustamam Harun  </author>
-        <name>  com.sun.star.i18n.Collator  </name>
+        <author>	Bustamam Harun	</author>
+        <name>	com.sun.star.i18n.Collator	</name>
         <description>
     This component provides localized collation algorithm
 </description>
-        <loader-name>   com.sun.star.loader.SharedLibrary   </loader-name>
-        <language>  C++ </language>
+        <loader-name>	com.sun.star.loader.SharedLibrary	</loader-name>
+        <language>	C++	</language>
         <status value="final"/>
-        <supported-service> com.sun.star.i18n.Collator  </supported-service>
+        <supported-service>	com.sun.star.i18n.Collator	</supported-service>
         <reference-docu xlink:href="file:///docs/sampledoc.html" xlink:type="simple"/>
-        <type>  com.sun.star.lang.XMultiServiceFactory  </type>
-        <type>  com.sun.star.uno.Reference              </type>
-        <type>  com.sun.star.i18n.XLocaleData           </type>
-        <type>  com.sun.star.i18n.XCollator         </type>
+        <type>	com.sun.star.lang.XMultiServiceFactory	</type>
+        <type>	com.sun.star.uno.Reference				</type>
+        <type>	com.sun.star.i18n.XLocaleData			</type>
+        <type>	com.sun.star.i18n.XCollator			</type>
     </component-description>
-    <project-build-dependency>  cppuhelper  </project-build-dependency>
-    <project-build-dependency>  cppu        </project-build-dependency>
-    <project-build-dependency>  registry    </project-build-dependency>
-    <project-build-dependency>  store       </project-build-dependency>
-    <project-build-dependency>  vos         </project-build-dependency>
-    <project-build-dependency>  sal         </project-build-dependency>
-    <project-build-dependency>  unotools    </project-build-dependency>
-    <runtime-module-dependency> cppuhelper  </runtime-module-dependency>
-    <runtime-module-dependency> cppu        </runtime-module-dependency>
-    <runtime-module-dependency> reg         </runtime-module-dependency>
-    <runtime-module-dependency> store       </runtime-module-dependency>
-    <runtime-module-dependency> vos         </runtime-module-dependency>
-    <runtime-module-dependency> sal         </runtime-module-dependency>
-    <runtime-module-dependency> unotools    </runtime-module-dependency>
+    <project-build-dependency>	cppuhelper	</project-build-dependency>
+    <project-build-dependency>	cppu		</project-build-dependency>
+    <project-build-dependency>	registry	</project-build-dependency>
+    <project-build-dependency>	store		</project-build-dependency>
+    <project-build-dependency>	vos			</project-build-dependency>
+    <project-build-dependency>	sal			</project-build-dependency>
+    <project-build-dependency>	unotools	</project-build-dependency>
+    <runtime-module-dependency>	cppuhelper	</runtime-module-dependency>
+    <runtime-module-dependency>	cppu		</runtime-module-dependency>
+    <runtime-module-dependency>	reg			</runtime-module-dependency>
+    <runtime-module-dependency>	store		</runtime-module-dependency>
+    <runtime-module-dependency>	vos			</runtime-module-dependency>
+    <runtime-module-dependency>	sal			</runtime-module-dependency>
+    <runtime-module-dependency>	unotools	</runtime-module-dependency>
 </module-description>
diff --git a/i18npool/xml/IndexEntrySupplier.xml b/i18npool/xml/IndexEntrySupplier.xml
index af0460faa3b4..57575be64df3 100644
--- a/i18npool/xml/IndexEntrySupplier.xml
+++ b/i18npool/xml/IndexEntrySupplier.xml
@@ -9,7 +9,7 @@
     Supplier for creating index entries in a table of alphabetical index
     </description>
         <loader-name>com.sun.star.loader.SharedLibrary</loader-name>
-        <language>  C++ </language>
+        <language>	C++	</language>
         <status value="final"/>
         <supported-service>com.sun.star.i18n.IndexEntrySupplier</supported-service>
         <reference-docu xlink:href="file:///docs/sampledoc.html" xlink:type="simple"/>
diff --git a/i18npool/xml/LocaleData.xml b/i18npool/xml/LocaleData.xml
index 86e7e89dfc69..5a5c172f0c0a 100644
--- a/i18npool/xml/LocaleData.xml
+++ b/i18npool/xml/LocaleData.xml
@@ -9,7 +9,7 @@
     This component provides locale data for I18n Framework
 </description>
         <loader-name>com.sun.star.loader.SharedLibrary</loader-name>
-        <language>  C++ </language>
+        <language>	C++	</language>
         <status value="final"/>
         <supported-service>com.sun.star.i18n.LocaleData</supported-service>
         <reference-docu xlink:href="file:///docs/sampledoc.html" xlink:type="simple"/>
diff --git a/i18nutil/inc/i18nutil/casefolding.hxx b/i18nutil/inc/i18nutil/casefolding.hxx
index 4a8030557b4d..eb8aae31226b 100644
--- a/i18nutil/inc/i18nutil/casefolding.hxx
+++ b/i18nutil/inc/i18nutil/casefolding.hxx
@@ -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
diff --git a/i18nutil/inc/i18nutil/oneToOneMapping.hxx b/i18nutil/inc/i18nutil/oneToOneMapping.hxx
index 53d4285d31af..1727e9664d9a 100644
--- a/i18nutil/inc/i18nutil/oneToOneMapping.hxx
+++ b/i18nutil/inc/i18nutil/oneToOneMapping.hxx
@@ -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
diff --git a/i18nutil/inc/i18nutil/unicode.hxx b/i18nutil/inc/i18nutil/unicode.hxx
index bd52ed5a46dd..b6e876db6126 100644
--- a/i18nutil/inc/i18nutil/unicode.hxx
+++ b/i18nutil/inc/i18nutil/unicode.hxx
@@ -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
diff --git a/i18nutil/inc/i18nutil/widthfolding.hxx b/i18nutil/inc/i18nutil/widthfolding.hxx
index 556a4a319975..c38c9abc7338 100644
--- a/i18nutil/inc/i18nutil/widthfolding.hxx
+++ b/i18nutil/inc/i18nutil/widthfolding.hxx
@@ -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
@@ -46,7 +46,7 @@ public:
 
     static oneToOneMapping& getfullKana2halfKanaTable();
     static oneToOneMapping& gethalfKana2fullKanaTable();
-
+    
     static rtl::OUString decompose_ja_voiced_sound_marks(const rtl::OUString& inStr, sal_Int32 startPos, sal_Int32 nCount, com::sun::star::uno::Sequence< sal_Int32 >& offset, sal_Bool useOffset);
     static sal_Unicode decompose_ja_voiced_sound_marksChar2Char (sal_Unicode inChar);
     static rtl::OUString compose_ja_voiced_sound_marks(const rtl::OUString& inStr, sal_Int32 startPos, sal_Int32 nCount, com::sun::star::uno::Sequence< sal_Int32 >& offset, sal_Bool useOffset, sal_Int32 nFlags = 0 );
diff --git a/i18nutil/inc/i18nutil/x_rtl_ustring.h b/i18nutil/inc/i18nutil/x_rtl_ustring.h
index 028f9718b213..e110b1871897 100644
--- a/i18nutil/inc/i18nutil/x_rtl_ustring.h
+++ b/i18nutil/inc/i18nutil/x_rtl_ustring.h
@@ -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
@@ -37,11 +37,11 @@
 /**
  * Allocates a new <code>rtl_uString</code> which can hold nLen + 1 characters.
  * The reference count is 0. The characters of room is not cleared.
- * This method is similar to rtl_uString_new_WithLength in rtl/ustring.h, but
- * can allocate a new string more efficiently. You need to "acquire" by such as
+ * This method is similar to rtl_uString_new_WithLength in rtl/ustring.h, but 
+ * can allocate a new string more efficiently. You need to "acquire" by such as 
  * OUString( rtl_uString * value ) if you intend to use it for a while.
- * @param   [output] newStr
- * @param   [input]  nLen
+ * @param	[output] newStr
+ * @param	[input]  nLen
  */
 inline void SAL_CALL x_rtl_uString_new_WithLength( rtl_uString ** newStr, sal_Int32 nLen, sal_Int32 _refCount = 0 )
 {
@@ -52,11 +52,11 @@ inline void SAL_CALL x_rtl_uString_new_WithLength( rtl_uString ** newStr, sal_In
   // rtl_uString is defined in rtl/ustring.h as below:
   //typedef struct _rtl_uString
   //{
-  //    sal_Int32       refCount;
-  //    sal_Int32       length;
-  //    sal_Unicode     buffer[1];
+  //    sal_Int32		refCount;
+  //	sal_Int32		length;
+  //	sal_Unicode 	buffer[1];
   //} rtl_uString;
-}
+}	
 
 inline rtl_uString * SAL_CALL x_rtl_uString_new_WithLength( sal_Int32 nLen, sal_Int32 _refCount = 0 )
 {
@@ -64,7 +64,7 @@ inline rtl_uString * SAL_CALL x_rtl_uString_new_WithLength( sal_Int32 nLen, sal_
   newStr->refCount = _refCount;
   newStr->length = nLen;
   return newStr;
-}
+}	
 
 /**
  * Release <code>rtl_uString</code> regardless its reference count.
diff --git a/i18nutil/source/utility/casefolding.cxx b/i18nutil/source/utility/casefolding.cxx
index 8563a44798f0..b6c47b3fde82 100644
--- a/i18nutil/source/utility/casefolding.cxx
+++ b/i18nutil/source/utility/casefolding.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
@@ -48,7 +48,7 @@ static Mapping mapping_0130[] = {{0, 1, {0x0069, 0, 0}},{0, 1, {0x0130, 0, 0}}};
 #define langIs(lang) (aLocale.Language.compareToAscii(lang) == 0)
 
 // only check simple case, there is more complicated case need to be checked.
-#define type_i(ch) ((ch) == 0x0069 || (ch) == 0x006a)
+#define type_i(ch) ((ch) == 0x0069 || (ch) == 0x006a) 
 
 #define cased_letter(ch) (CaseMappingIndex[(ch)>>8] >= 0 && (CaseMappingValue[(CaseMappingIndex[(ch)>>8] << 8) + ((ch)&0xff)].type & CasedLetter))
 
@@ -73,7 +73,7 @@ Mapping& casefolding::getConditionalValue(const sal_Unicode* str, sal_Int32 pos,
             return (langIs("tr") || langIs("az")) ? mapping_0130[0] : mapping_0130[1];
         case 0x0069:
             return (langIs("tr") || langIs("az")) ? mapping_0069[0] : mapping_0069[1];
-        case 0x0049: return langIs("lt") && pos > len && accent_above(str[pos+1]) ? mapping_0049[0] :
+        case 0x0049: return langIs("lt") && pos > len && accent_above(str[pos+1]) ? mapping_0049[0] : 
                     (langIs("tr") || langIs("az")) ? mapping_0049[1] : mapping_0049[2];
         case 0x004a: return langIs("lt") && pos > len && accent_above(str[pos+1]) ? mapping_004a[0] : mapping_004a[1];
         case 0x012e: return langIs("lt") && pos > len && accent_above(str[pos+1]) ? mapping_012e[0] : mapping_012e[1];
diff --git a/i18nutil/source/utility/casefolding_data.h b/i18nutil/source/utility/casefolding_data.h
index ac8b609fb3d2..03076f2eaa8e 100644
--- a/i18nutil/source/utility/casefolding_data.h
+++ b/i18nutil/source/utility/casefolding_data.h
@@ -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
@@ -856,10 +856,10 @@ static Mapping CaseMappingExtra[] = {
 };
 
 /* Following code need special handling
-    0x0069, 0x00CC, 0x00CD, 0x0128, 0x012E, 0x0130, 0x0049, 0x004A, 0x0307, 0x03A3,
+    0x0069, 0x00CC, 0x00CD, 0x0128, 0x012E, 0x0130, 0x0049, 0x004A, 0x0307, 0x03A3, 
 */
 
-} } } }
+} } } } 
 
 #endif
 
diff --git a/i18nutil/source/utility/oneToOneMapping.cxx b/i18nutil/source/utility/oneToOneMapping.cxx
index 2f507be1017f..7efb891f0629 100644
--- a/i18nutil/source/utility/oneToOneMapping.cxx
+++ b/i18nutil/source/utility/oneToOneMapping.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
@@ -39,7 +39,7 @@ oneToOneMapping::~oneToOneMapping()
 {
 }
 
-sal_Unicode oneToOneMapping::find(const sal_Unicode nKey) const
+sal_Unicode oneToOneMapping::find(const sal_Unicode nKey) const 
 {
     if( mpTable )
     {
@@ -110,7 +110,7 @@ void oneToOneMappingWithFlag::makeIndex()
     }
 }
 
-sal_Unicode oneToOneMappingWithFlag::find( const sal_Unicode nKey ) const
+sal_Unicode oneToOneMappingWithFlag::find( const sal_Unicode nKey ) const 
 {
     if( mpTableWF )
     {
diff --git a/i18nutil/source/utility/unicode.cxx b/i18nutil/source/utility/unicode.cxx
index d018d9fcf949..6e1450916e1f 100644
--- a/i18nutil/source/utility/unicode.cxx
+++ b/i18nutil/source/utility/unicode.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
@@ -319,7 +319,7 @@ unicode::getUnicodeScriptType( const sal_Unicode ch, ScriptTypeList* typeList, s
 
 sal_Bool SAL_CALL
 unicode::isUnicodeScriptType( const sal_Unicode ch, sal_Int16 type) {
-    return ch >= UnicodeScriptType[type][UnicodeScriptTypeFrom] &&
+    return ch >= UnicodeScriptType[type][UnicodeScriptTypeFrom] && 
         ch <= UnicodeScriptType[type][UnicodeScriptTypeTo];
 }
 
diff --git a/i18nutil/source/utility/unicode_data.h b/i18nutil/source/utility/unicode_data.h
index 7afd24f3eda8..bf215c2f42b2 100644
--- a/i18nutil/source/utility/unicode_data.h
+++ b/i18nutil/source/utility/unicode_data.h
@@ -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
@@ -653,7 +653,7 @@ static sal_Int8 UnicodeTypeValue[] = {
      1, 2, 1, 2,27,27,27,27,27,27,27, 0, 0, 0, 0, 0,// 2ce0 - 2cef
      0, 0, 0, 0, 0, 0, 0, 0, 0,21,21,21,21,11,21,21,// 2cf0 - 2cff
 
-     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,// 2e00 - 2e0f  Block index 0x27
+     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,// 2e00 - 2e0f	Block index 0x27
      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,// 2e10 - 2e1f
      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,// 2e20 - 2e2f
      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,// 2e30 - 2e3f
@@ -1569,7 +1569,7 @@ static sal_Unicode UnicodeScriptType[][2] = {
     {0x0530, 0x058f}, //  9. Armenian
     {0x0590, 0x05ff}, // 10. Hebrew
     {0x0600, 0x06ff}, // 11. Arabic
-    {0x0700, 0x074f}, // 12. Syriac
+    {0x0700, 0x074f}, // 12. Syriac  
     {0x0780, 0x07bf}, // 13. Thaana
     {0x0900, 0x097f}, // 14. Devanagari
     {0x0980, 0x09ff}, // 15. Bengali
@@ -1584,7 +1584,7 @@ static sal_Unicode UnicodeScriptType[][2] = {
     {0x0e00, 0x0e7f}, // 24. Thai
     {0x0e80, 0x0eff}, // 25. Lao
     {0x0f00, 0x0fff}, // 26. Tibetan
-    {0x1000, 0x109f}, // 27. Myanmar
+    {0x1000, 0x109f}, // 27. Myanmar 
     {0x10a0, 0x10ff}, // 28. Georgian
     {0x1100, 0x11ff}, // 29. Hangul Jamo
     {0x1200, 0x137f}, // 30. Ethiopic
diff --git a/i18nutil/source/utility/widthfolding.cxx b/i18nutil/source/utility/widthfolding.cxx
index 74b29aaa70dd..86cc85219487 100644
--- a/i18nutil/source/utility/widthfolding.cxx
+++ b/i18nutil/source/utility/widthfolding.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
@@ -68,7 +68,7 @@ OUString widthfolding::decompose_ja_voiced_sound_marks (const OUString& inStr, s
   // Prepare pointers of unicode character arrays.
   const sal_Unicode* src = inStr.getStr() + startPos;
   sal_Unicode* dst = newStr->buffer;
-
+  
   // Decomposition: GA --> KA + voice-mark
   while (nCount -- > 0) {
     sal_Unicode c = *src++;
@@ -116,7 +116,7 @@ OUString widthfolding::compose_ja_voiced_sound_marks (const OUString& inStr, sal
   // Create a string buffer which can hold nCount + 1 characters.
   // Its size may become equal to nCount or smaller.
   // The reference count is 0 now.
-  rtl_uString * newStr = x_rtl_uString_new_WithLength( nCount ); // defined in x_rtl_ustring.h
+  rtl_uString * newStr = x_rtl_uString_new_WithLength( nCount ); // defined in x_rtl_ustring.h  
 
   // Prepare pointers of unicode character arrays.
   const sal_Unicode* src = inStr.getStr() + startPos;
@@ -143,7 +143,7 @@ OUString widthfolding::compose_ja_voiced_sound_marks (const OUString& inStr, sal
       position = startPos;
   }
 
-  //
+  // 
   sal_Unicode previousChar = *src ++;
   sal_Unicode currentChar;
 
diff --git a/i18nutil/source/utility/widthfolding_data.h b/i18nutil/source/utility/widthfolding_data.h
index e67f40db904b..7251c9fe92dd 100644
--- a/i18nutil/source/utility/widthfolding_data.h
+++ b/i18nutil/source/utility/widthfolding_data.h
@@ -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
@@ -50,198 +50,198 @@ typedef struct {
 //
 // the combining characters shouldn't be used
 const decomposition_table_entry_t decomposition_table[] = {
-    { 0x0000, 0x0000 }, // 0x3040
-    { 0x0000, 0x0000 }, // 0x3041 HIRAGANA LETTER SMALL A
-    { 0x0000, 0x0000 }, // 0x3042 HIRAGANA LETTER A
-    { 0x0000, 0x0000 }, // 0x3043 HIRAGANA LETTER SMALL I
-    { 0x0000, 0x0000 }, // 0x3044 HIRAGANA LETTER I
-    { 0x0000, 0x0000 }, // 0x3045 HIRAGANA LETTER SMALL U
-    { 0x0000, 0x0000 }, // 0x3046 HIRAGANA LETTER U
-    { 0x0000, 0x0000 }, // 0x3047 HIRAGANA LETTER SMALL E
-    { 0x0000, 0x0000 }, // 0x3048 HIRAGANA LETTER E
-    { 0x0000, 0x0000 }, // 0x3049 HIRAGANA LETTER SMALL O
-    { 0x0000, 0x0000 }, // 0x304a HIRAGANA LETTER O
-    { 0x0000, 0x0000 }, // 0x304b HIRAGANA LETTER KA
-    { 0x304b, 0x309b }, // 0x304c HIRAGANA LETTER GA --> HIRAGANA LETTER KA + COMBINING KATAKANA-HIRAGANA VOICED SOUND MARK
-    { 0x0000, 0x0000 }, // 0x304d HIRAGANA LETTER KI
-    { 0x304d, 0x309b }, // 0x304e HIRAGANA LETTER GI --> HIRAGANA LETTER KI + COMBINING KATAKANA-HIRAGANA VOICED SOUND MARK
-    { 0x0000, 0x0000 }, // 0x304f HIRAGANA LETTER KU
-    { 0x304f, 0x309b }, // 0x3050 HIRAGANA LETTER GU --> HIRAGANA LETTER KU + COMBINING KATAKANA-HIRAGANA VOICED SOUND MARK
-    { 0x0000, 0x0000 }, // 0x3051 HIRAGANA LETTER KE
-    { 0x3051, 0x309b }, // 0x3052 HIRAGANA LETTER GE --> HIRAGANA LETTER KE + COMBINING KATAKANA-HIRAGANA VOICED SOUND MARK
-    { 0x0000, 0x0000 }, // 0x3053 HIRAGANA LETTER KO
-    { 0x3053, 0x309b }, // 0x3054 HIRAGANA LETTER GO --> HIRAGANA LETTER KO + COMBINING KATAKANA-HIRAGANA VOICED SOUND MARK
-    { 0x0000, 0x0000 }, // 0x3055 HIRAGANA LETTER SA
-    { 0x3055, 0x309b }, // 0x3056 HIRAGANA LETTER ZA --> HIRAGANA LETTER SA + COMBINING KATAKANA-HIRAGANA VOICED SOUND MARK
-    { 0x0000, 0x0000 }, // 0x3057 HIRAGANA LETTER SI
-    { 0x3057, 0x309b }, // 0x3058 HIRAGANA LETTER ZI --> HIRAGANA LETTER SI + COMBINING KATAKANA-HIRAGANA VOICED SOUND MARK
-    { 0x0000, 0x0000 }, // 0x3059 HIRAGANA LETTER SU
-    { 0x3059, 0x309b }, // 0x305a HIRAGANA LETTER ZU --> HIRAGANA LETTER SU + COMBINING KATAKANA-HIRAGANA VOICED SOUND MARK
-    { 0x0000, 0x0000 }, // 0x305b HIRAGANA LETTER SE
-    { 0x305b, 0x309b }, // 0x305c HIRAGANA LETTER ZE --> HIRAGANA LETTER SE + COMBINING KATAKANA-HIRAGANA VOICED SOUND MARK
-    { 0x0000, 0x0000 }, // 0x305d HIRAGANA LETTER SO
-    { 0x305d, 0x309b }, // 0x305e HIRAGANA LETTER ZO --> HIRAGANA LETTER SO + COMBINING KATAKANA-HIRAGANA VOICED SOUND MARK
-    { 0x0000, 0x0000 }, // 0x305f HIRAGANA LETTER TA
-    { 0x305f, 0x309b }, // 0x3060 HIRAGANA LETTER DA --> HIRAGANA LETTER TA + COMBINING KATAKANA-HIRAGANA VOICED SOUND MARK
-    { 0x0000, 0x0000 }, // 0x3061 HIRAGANA LETTER TI
-    { 0x3061, 0x309b }, // 0x3062 HIRAGANA LETTER DI --> HIRAGANA LETTER TI + COMBINING KATAKANA-HIRAGANA VOICED SOUND MARK
-    { 0x0000, 0x0000 }, // 0x3063 HIRAGANA LETTER SMALL TU
-    { 0x0000, 0x0000 }, // 0x3064 HIRAGANA LETTER TU
-    { 0x3064, 0x309b }, // 0x3065 HIRAGANA LETTER DU --> HIRAGANA LETTER TU + COMBINING KATAKANA-HIRAGANA VOICED SOUND MARK
-    { 0x0000, 0x0000 }, // 0x3066 HIRAGANA LETTER TE
-    { 0x3066, 0x309b }, // 0x3067 HIRAGANA LETTER DE --> HIRAGANA LETTER TE + COMBINING KATAKANA-HIRAGANA VOICED SOUND MARK
-    { 0x0000, 0x0000 }, // 0x3068 HIRAGANA LETTER TO
-    { 0x3068, 0x309b }, // 0x3069 HIRAGANA LETTER DO --> HIRAGANA LETTER TO + COMBINING KATAKANA-HIRAGANA VOICED SOUND MARK
-    { 0x0000, 0x0000 }, // 0x306a HIRAGANA LETTER NA
-    { 0x0000, 0x0000 }, // 0x306b HIRAGANA LETTER NI
-    { 0x0000, 0x0000 }, // 0x306c HIRAGANA LETTER NU
-    { 0x0000, 0x0000 }, // 0x306d HIRAGANA LETTER NE
-    { 0x0000, 0x0000 }, // 0x306e HIRAGANA LETTER NO
-    { 0x0000, 0x0000 }, // 0x306f HIRAGANA LETTER HA
-    { 0x306f, 0x309b }, // 0x3070 HIRAGANA LETTER BA --> HIRAGANA LETTER HA + COMBINING KATAKANA-HIRAGANA VOICED SOUND MARK
-    { 0x306f, 0x309c }, // 0x3071 HIRAGANA LETTER PA --> HIRAGANA LETTER HA + COMBINING KATAKANA-HIRAGANA SEMI-VOICED SOUND MARK
-    { 0x0000, 0x0000 }, // 0x3072 HIRAGANA LETTER HI
-    { 0x3072, 0x309b }, // 0x3073 HIRAGANA LETTER BI --> HIRAGANA LETTER HI + COMBINING KATAKANA-HIRAGANA VOICED SOUND MARK
-    { 0x3072, 0x309c }, // 0x3074 HIRAGANA LETTER PI --> HIRAGANA LETTER HI + COMBINING KATAKANA-HIRAGANA SEMI-VOICED SOUND MARK
-    { 0x0000, 0x0000 }, // 0x3075 HIRAGANA LETTER HU
-    { 0x3075, 0x309b }, // 0x3076 HIRAGANA LETTER BU --> HIRAGANA LETTER HU + COMBINING KATAKANA-HIRAGANA VOICED SOUND MARK
-    { 0x3075, 0x309c }, // 0x3077 HIRAGANA LETTER PU --> HIRAGANA LETTER HU + COMBINING KATAKANA-HIRAGANA SEMI-VOICED SOUND MARK
-    { 0x0000, 0x0000 }, // 0x3078 HIRAGANA LETTER HE
-    { 0x3078, 0x309b }, // 0x3079 HIRAGANA LETTER BE --> HIRAGANA LETTER HE + COMBINING KATAKANA-HIRAGANA VOICED SOUND MARK
-    { 0x3078, 0x309c }, // 0x307a HIRAGANA LETTER PE --> HIRAGANA LETTER HE + COMBINING KATAKANA-HIRAGANA SEMI-VOICED SOUND MARK
-    { 0x0000, 0x0000 }, // 0x307b HIRAGANA LETTER HO
-    { 0x307b, 0x309b }, // 0x307c HIRAGANA LETTER BO --> HIRAGANA LETTER HO + COMBINING KATAKANA-HIRAGANA VOICED SOUND MARK
-    { 0x307b, 0x309c }, // 0x307d HIRAGANA LETTER PO --> HIRAGANA LETTER HO + COMBINING KATAKANA-HIRAGANA SEMI-VOICED SOUND MARK
-    { 0x0000, 0x0000 }, // 0x307e HIRAGANA LETTER MA
-    { 0x0000, 0x0000 }, // 0x307f HIRAGANA LETTER MI
-    { 0x0000, 0x0000 }, // 0x3080 HIRAGANA LETTER MU
-    { 0x0000, 0x0000 }, // 0x3081 HIRAGANA LETTER ME
-    { 0x0000, 0x0000 }, // 0x3082 HIRAGANA LETTER MO
-    { 0x0000, 0x0000 }, // 0x3083 HIRAGANA LETTER SMALL YA
-    { 0x0000, 0x0000 }, // 0x3084 HIRAGANA LETTER YA
-    { 0x0000, 0x0000 }, // 0x3085 HIRAGANA LETTER SMALL YU
-    { 0x0000, 0x0000 }, // 0x3086 HIRAGANA LETTER YU
-    { 0x0000, 0x0000 }, // 0x3087 HIRAGANA LETTER SMALL YO
-    { 0x0000, 0x0000 }, // 0x3088 HIRAGANA LETTER YO
-    { 0x0000, 0x0000 }, // 0x3089 HIRAGANA LETTER RA
-    { 0x0000, 0x0000 }, // 0x308a HIRAGANA LETTER RI
-    { 0x0000, 0x0000 }, // 0x308b HIRAGANA LETTER RU
-    { 0x0000, 0x0000 }, // 0x308c HIRAGANA LETTER RE
-    { 0x0000, 0x0000 }, // 0x308d HIRAGANA LETTER RO
-    { 0x0000, 0x0000 }, // 0x308e HIRAGANA LETTER SMALL WA
-    { 0x0000, 0x0000 }, // 0x308f HIRAGANA LETTER WA
-    { 0x0000, 0x0000 }, // 0x3090 HIRAGANA LETTER WI
-    { 0x0000, 0x0000 }, // 0x3091 HIRAGANA LETTER WE
-    { 0x0000, 0x0000 }, // 0x3092 HIRAGANA LETTER WO
-    { 0x0000, 0x0000 }, // 0x3093 HIRAGANA LETTER N
-    { 0x3046, 0x309b }, // 0x3094 HIRAGANA LETTER VU --> HIRAGANA LETTER U + COMBINING KATAKANA-HIRAGANA VOICED SOUND MARK
-    { 0x0000, 0x0000 }, // 0x3095
-    { 0x0000, 0x0000 }, // 0x3096
-    { 0x0000, 0x0000 }, // 0x3097
-    { 0x0000, 0x0000 }, // 0x3098
-    { 0x0000, 0x0000 }, // 0x3099 COMBINING KATAKANA-HIRAGANA VOICED SOUND MARK
-    { 0x0000, 0x0000 }, // 0x309a COMBINING KATAKANA-HIRAGANA SEMI-VOICED SOUND MARK
-    { 0x0000, 0x0000 }, // 0x309b KATAKANA-HIRAGANA VOICED SOUND MARK
-    { 0x0000, 0x0000 }, // 0x309c KATAKANA-HIRAGANA SEMI-VOICED SOUND MARK
-    { 0x0000, 0x0000 }, // 0x309d HIRAGANA ITERATION MARK
-    { 0x0000, 0x0000 }, // 0x309e HIRAGANA VOICED ITERATION MARK
-    { 0x0000, 0x0000 }, // 0x309f
-    { 0x0000, 0x0000 }, // 0x30a0
-    { 0x0000, 0x0000 }, // 0x30a1 KATAKANA LETTER SMALL A
-    { 0x0000, 0x0000 }, // 0x30a2 KATAKANA LETTER A
-    { 0x0000, 0x0000 }, // 0x30a3 KATAKANA LETTER SMALL I
-    { 0x0000, 0x0000 }, // 0x30a4 KATAKANA LETTER I
-    { 0x0000, 0x0000 }, // 0x30a5 KATAKANA LETTER SMALL U
-    { 0x0000, 0x0000 }, // 0x30a6 KATAKANA LETTER U
-    { 0x0000, 0x0000 }, // 0x30a7 KATAKANA LETTER SMALL E
-    { 0x0000, 0x0000 }, // 0x30a8 KATAKANA LETTER E
-    { 0x0000, 0x0000 }, // 0x30a9 KATAKANA LETTER SMALL O
-    { 0x0000, 0x0000 }, // 0x30aa KATAKANA LETTER O
-    { 0x0000, 0x0000 }, // 0x30ab KATAKANA LETTER KA
-    { 0x30ab, 0x309b }, // 0x30ac KATAKANA LETTER GA --> KATAKANA LETTER KA + COMBINING KATAKANA-HIRAGANA VOICED SOUND MARK
-    { 0x0000, 0x0000 }, // 0x30ad KATAKANA LETTER KI
-    { 0x30ad, 0x309b }, // 0x30ae KATAKANA LETTER GI --> KATAKANA LETTER KI + COMBINING KATAKANA-HIRAGANA VOICED SOUND MARK
-    { 0x0000, 0x0000 }, // 0x30af KATAKANA LETTER KU
-    { 0x30af, 0x309b }, // 0x30b0 KATAKANA LETTER GU --> KATAKANA LETTER KU + COMBINING KATAKANA-HIRAGANA VOICED SOUND MARK
-    { 0x0000, 0x0000 }, // 0x30b1 KATAKANA LETTER KE
-    { 0x30b1, 0x309b }, // 0x30b2 KATAKANA LETTER GE --> KATAKANA LETTER KE + COMBINING KATAKANA-HIRAGANA VOICED SOUND MARK
-    { 0x0000, 0x0000 }, // 0x30b3 KATAKANA LETTER KO
-    { 0x30b3, 0x309b }, // 0x30b4 KATAKANA LETTER GO --> KATAKANA LETTER KO + COMBINING KATAKANA-HIRAGANA VOICED SOUND MARK
-    { 0x0000, 0x0000 }, // 0x30b5 KATAKANA LETTER SA
-    { 0x30b5, 0x309b }, // 0x30b6 KATAKANA LETTER ZA --> KATAKANA LETTER SA + COMBINING KATAKANA-HIRAGANA VOICED SOUND MARK
-    { 0x0000, 0x0000 }, // 0x30b7 KATAKANA LETTER SI
-    { 0x30b7, 0x309b }, // 0x30b8 KATAKANA LETTER ZI --> KATAKANA LETTER SI + COMBINING KATAKANA-HIRAGANA VOICED SOUND MARK
-    { 0x0000, 0x0000 }, // 0x30b9 KATAKANA LETTER SU
-    { 0x30b9, 0x309b }, // 0x30ba KATAKANA LETTER ZU --> KATAKANA LETTER SU + COMBINING KATAKANA-HIRAGANA VOICED SOUND MARK
-    { 0x0000, 0x0000 }, // 0x30bb KATAKANA LETTER SE
-    { 0x30bb, 0x309b }, // 0x30bc KATAKANA LETTER ZE --> KATAKANA LETTER SE + COMBINING KATAKANA-HIRAGANA VOICED SOUND MARK
-    { 0x0000, 0x0000 }, // 0x30bd KATAKANA LETTER SO
-    { 0x30bd, 0x309b }, // 0x30be KATAKANA LETTER ZO --> KATAKANA LETTER SO + COMBINING KATAKANA-HIRAGANA VOICED SOUND MARK
-    { 0x0000, 0x0000 }, // 0x30bf KATAKANA LETTER TA
-    { 0x30bf, 0x309b }, // 0x30c0 KATAKANA LETTER DA --> KATAKANA LETTER TA + COMBINING KATAKANA-HIRAGANA VOICED SOUND MARK
-    { 0x0000, 0x0000 }, // 0x30c1 KATAKANA LETTER TI
-    { 0x30c1, 0x309b }, // 0x30c2 KATAKANA LETTER DI --> KATAKANA LETTER TI + COMBINING KATAKANA-HIRAGANA VOICED SOUND MARK
-    { 0x0000, 0x0000 }, // 0x30c3 KATAKANA LETTER SMALL TU
-    { 0x0000, 0x0000 }, // 0x30c4 KATAKANA LETTER TU
-    { 0x30c4, 0x309b }, // 0x30c5 KATAKANA LETTER DU --> KATAKANA LETTER TU + COMBINING KATAKANA-HIRAGANA VOICED SOUND MARK
-    { 0x0000, 0x0000 }, // 0x30c6 KATAKANA LETTER TE
-    { 0x30c6, 0x309b }, // 0x30c7 KATAKANA LETTER DE --> KATAKANA LETTER TE + COMBINING KATAKANA-HIRAGANA VOICED SOUND MARK
-    { 0x0000, 0x0000 }, // 0x30c8 KATAKANA LETTER TO
-    { 0x30c8, 0x309b }, // 0x30c9 KATAKANA LETTER DO --> KATAKANA LETTER TO + COMBINING KATAKANA-HIRAGANA VOICED SOUND MARK
-    { 0x0000, 0x0000 }, // 0x30ca KATAKANA LETTER NA
-    { 0x0000, 0x0000 }, // 0x30cb KATAKANA LETTER NI
-    { 0x0000, 0x0000 }, // 0x30cc KATAKANA LETTER NU
-    { 0x0000, 0x0000 }, // 0x30cd KATAKANA LETTER NE
-    { 0x0000, 0x0000 }, // 0x30ce KATAKANA LETTER NO
-    { 0x0000, 0x0000 }, // 0x30cf KATAKANA LETTER HA
-    { 0x30cf, 0x309b }, // 0x30d0 KATAKANA LETTER BA --> KATAKANA LETTER HA + COMBINING KATAKANA-HIRAGANA VOICED SOUND MARK
-    { 0x30cf, 0x309c }, // 0x30d1 KATAKANA LETTER PA --> KATAKANA LETTER HA + COMBINING KATAKANA-HIRAGANA SEMI-VOICED SOUND MARK
-    { 0x0000, 0x0000 }, // 0x30d2 KATAKANA LETTER HI
-    { 0x30d2, 0x309b }, // 0x30d3 KATAKANA LETTER BI --> KATAKANA LETTER HI + COMBINING KATAKANA-HIRAGANA VOICED SOUND MARK
-    { 0x30d2, 0x309c }, // 0x30d4 KATAKANA LETTER PI --> KATAKANA LETTER HI + COMBINING KATAKANA-HIRAGANA SEMI-VOICED SOUND MARK
-    { 0x0000, 0x0000 }, // 0x30d5 KATAKANA LETTER HU
-    { 0x30d5, 0x309b }, // 0x30d6 KATAKANA LETTER BU --> KATAKANA LETTER HU + COMBINING KATAKANA-HIRAGANA VOICED SOUND MARK
-    { 0x30d5, 0x309c }, // 0x30d7 KATAKANA LETTER PU --> KATAKANA LETTER HU + COMBINING KATAKANA-HIRAGANA SEMI-VOICED SOUND MARK
-    { 0x0000, 0x0000 }, // 0x30d8 KATAKANA LETTER HE
-    { 0x30d8, 0x309b }, // 0x30d9 KATAKANA LETTER BE --> KATAKANA LETTER HE + COMBINING KATAKANA-HIRAGANA VOICED SOUND MARK
-    { 0x30d8, 0x309c }, // 0x30da KATAKANA LETTER PE --> KATAKANA LETTER HE + COMBINING KATAKANA-HIRAGANA SEMI-VOICED SOUND MARK
-    { 0x0000, 0x0000 }, // 0x30db KATAKANA LETTER HO
-    { 0x30db, 0x309b }, // 0x30dc KATAKANA LETTER BO --> KATAKANA LETTER HO + COMBINING KATAKANA-HIRAGANA VOICED SOUND MARK
-    { 0x30db, 0x309c }, // 0x30dd KATAKANA LETTER PO --> KATAKANA LETTER HO + COMBINING KATAKANA-HIRAGANA SEMI-VOICED SOUND MARK
-    { 0x0000, 0x0000 }, // 0x30de KATAKANA LETTER MA
-    { 0x0000, 0x0000 }, // 0x30df KATAKANA LETTER MI
-    { 0x0000, 0x0000 }, // 0x30e0 KATAKANA LETTER MU
-    { 0x0000, 0x0000 }, // 0x30e1 KATAKANA LETTER ME
-    { 0x0000, 0x0000 }, // 0x30e2 KATAKANA LETTER MO
-    { 0x0000, 0x0000 }, // 0x30e3 KATAKANA LETTER SMALL YA
-    { 0x0000, 0x0000 }, // 0x30e4 KATAKANA LETTER YA
-    { 0x0000, 0x0000 }, // 0x30e5 KATAKANA LETTER SMALL YU
-    { 0x0000, 0x0000 }, // 0x30e6 KATAKANA LETTER YU
-    { 0x0000, 0x0000 }, // 0x30e7 KATAKANA LETTER SMALL YO
-    { 0x0000, 0x0000 }, // 0x30e8 KATAKANA LETTER YO
-    { 0x0000, 0x0000 }, // 0x30e9 KATAKANA LETTER RA
-    { 0x0000, 0x0000 }, // 0x30ea KATAKANA LETTER RI
-    { 0x0000, 0x0000 }, // 0x30eb KATAKANA LETTER RU
-    { 0x0000, 0x0000 }, // 0x30ec KATAKANA LETTER RE
-    { 0x0000, 0x0000 }, // 0x30ed KATAKANA LETTER RO
-    { 0x0000, 0x0000 }, // 0x30ee KATAKANA LETTER SMALL WA
-    { 0x0000, 0x0000 }, // 0x30ef KATAKANA LETTER WA
-    { 0x0000, 0x0000 }, // 0x30f0 KATAKANA LETTER WI
-    { 0x0000, 0x0000 }, // 0x30f1 KATAKANA LETTER WE
-    { 0x0000, 0x0000 }, // 0x30f2 KATAKANA LETTER WO
-    { 0x0000, 0x0000 }, // 0x30f3 KATAKANA LETTER N
-    { 0x30a6, 0x309b }, // 0x30f4 KATAKANA LETTER VU --> KATAKANA LETTER U + COMBINING KATAKANA-HIRAGANA VOICED SOUND MARK
-    { 0x0000, 0x0000 }, // 0x30f5 KATAKANA LETTER SMALL KA
-    { 0x0000, 0x0000 }, // 0x30f6 KATAKANA LETTER SMALL KE
-    { 0x30ef, 0x309b }, // 0x30f7 KATAKANA LETTER VA --> KATAKANA LETTER WA + COMBINING KATAKANA-HIRAGANA VOICED SOUND MARK
-    { 0x30f0, 0x309b }, // 0x30f8 KATAKANA LETTER VI --> KATAKANA LETTER WI + COMBINING KATAKANA-HIRAGANA VOICED SOUND MARK
-    { 0x30f1, 0x309b }, // 0x30f9 KATAKANA LETTER VE --> KATAKANA LETTER WE + COMBINING KATAKANA-HIRAGANA VOICED SOUND MARK
-    { 0x30f2, 0x309b }, // 0x30fa KATAKANA LETTER VO --> KATAKANA LETTER WO + COMBINING KATAKANA-HIRAGANA VOICED SOUND MARK
-    { 0x0000, 0x0000 }, // 0x30fb KATAKANA MIDDLE DOT
-    { 0x0000, 0x0000 }, // 0x30fc KATAKANA-HIRAGANA PROLONGED SOUND MARK
-    { 0x0000, 0x0000 }, // 0x30fd KATAKANA ITERATION MARK
-    { 0x0000, 0x0000 }, // 0x30fe KATAKANA VOICED ITERATION MARK
-    { 0x0000, 0x0000 }  // 0x30ff
+    { 0x0000, 0x0000 },	// 0x3040
+    { 0x0000, 0x0000 },	// 0x3041 HIRAGANA LETTER SMALL A
+    { 0x0000, 0x0000 },	// 0x3042 HIRAGANA LETTER A
+    { 0x0000, 0x0000 },	// 0x3043 HIRAGANA LETTER SMALL I
+    { 0x0000, 0x0000 },	// 0x3044 HIRAGANA LETTER I
+    { 0x0000, 0x0000 },	// 0x3045 HIRAGANA LETTER SMALL U
+    { 0x0000, 0x0000 },	// 0x3046 HIRAGANA LETTER U
+    { 0x0000, 0x0000 },	// 0x3047 HIRAGANA LETTER SMALL E
+    { 0x0000, 0x0000 },	// 0x3048 HIRAGANA LETTER E
+    { 0x0000, 0x0000 },	// 0x3049 HIRAGANA LETTER SMALL O
+    { 0x0000, 0x0000 },	// 0x304a HIRAGANA LETTER O
+    { 0x0000, 0x0000 },	// 0x304b HIRAGANA LETTER KA
+    { 0x304b, 0x309b },	// 0x304c HIRAGANA LETTER GA --> HIRAGANA LETTER KA + COMBINING KATAKANA-HIRAGANA VOICED SOUND MARK
+    { 0x0000, 0x0000 },	// 0x304d HIRAGANA LETTER KI
+    { 0x304d, 0x309b },	// 0x304e HIRAGANA LETTER GI --> HIRAGANA LETTER KI + COMBINING KATAKANA-HIRAGANA VOICED SOUND MARK
+    { 0x0000, 0x0000 },	// 0x304f HIRAGANA LETTER KU
+    { 0x304f, 0x309b },	// 0x3050 HIRAGANA LETTER GU --> HIRAGANA LETTER KU + COMBINING KATAKANA-HIRAGANA VOICED SOUND MARK
+    { 0x0000, 0x0000 },	// 0x3051 HIRAGANA LETTER KE
+    { 0x3051, 0x309b },	// 0x3052 HIRAGANA LETTER GE --> HIRAGANA LETTER KE + COMBINING KATAKANA-HIRAGANA VOICED SOUND MARK
+    { 0x0000, 0x0000 },	// 0x3053 HIRAGANA LETTER KO
+    { 0x3053, 0x309b },	// 0x3054 HIRAGANA LETTER GO --> HIRAGANA LETTER KO + COMBINING KATAKANA-HIRAGANA VOICED SOUND MARK
+    { 0x0000, 0x0000 },	// 0x3055 HIRAGANA LETTER SA
+    { 0x3055, 0x309b },	// 0x3056 HIRAGANA LETTER ZA --> HIRAGANA LETTER SA + COMBINING KATAKANA-HIRAGANA VOICED SOUND MARK
+    { 0x0000, 0x0000 },	// 0x3057 HIRAGANA LETTER SI
+    { 0x3057, 0x309b },	// 0x3058 HIRAGANA LETTER ZI --> HIRAGANA LETTER SI + COMBINING KATAKANA-HIRAGANA VOICED SOUND MARK
+    { 0x0000, 0x0000 },	// 0x3059 HIRAGANA LETTER SU
+    { 0x3059, 0x309b },	// 0x305a HIRAGANA LETTER ZU --> HIRAGANA LETTER SU + COMBINING KATAKANA-HIRAGANA VOICED SOUND MARK
+    { 0x0000, 0x0000 },	// 0x305b HIRAGANA LETTER SE
+    { 0x305b, 0x309b },	// 0x305c HIRAGANA LETTER ZE --> HIRAGANA LETTER SE + COMBINING KATAKANA-HIRAGANA VOICED SOUND MARK
+    { 0x0000, 0x0000 },	// 0x305d HIRAGANA LETTER SO
+    { 0x305d, 0x309b },	// 0x305e HIRAGANA LETTER ZO --> HIRAGANA LETTER SO + COMBINING KATAKANA-HIRAGANA VOICED SOUND MARK
+    { 0x0000, 0x0000 },	// 0x305f HIRAGANA LETTER TA
+    { 0x305f, 0x309b },	// 0x3060 HIRAGANA LETTER DA --> HIRAGANA LETTER TA + COMBINING KATAKANA-HIRAGANA VOICED SOUND MARK
+    { 0x0000, 0x0000 },	// 0x3061 HIRAGANA LETTER TI
+    { 0x3061, 0x309b },	// 0x3062 HIRAGANA LETTER DI --> HIRAGANA LETTER TI + COMBINING KATAKANA-HIRAGANA VOICED SOUND MARK
+    { 0x0000, 0x0000 },	// 0x3063 HIRAGANA LETTER SMALL TU
+    { 0x0000, 0x0000 },	// 0x3064 HIRAGANA LETTER TU
+    { 0x3064, 0x309b },	// 0x3065 HIRAGANA LETTER DU --> HIRAGANA LETTER TU + COMBINING KATAKANA-HIRAGANA VOICED SOUND MARK
+    { 0x0000, 0x0000 },	// 0x3066 HIRAGANA LETTER TE
+    { 0x3066, 0x309b },	// 0x3067 HIRAGANA LETTER DE --> HIRAGANA LETTER TE + COMBINING KATAKANA-HIRAGANA VOICED SOUND MARK
+    { 0x0000, 0x0000 },	// 0x3068 HIRAGANA LETTER TO
+    { 0x3068, 0x309b },	// 0x3069 HIRAGANA LETTER DO --> HIRAGANA LETTER TO + COMBINING KATAKANA-HIRAGANA VOICED SOUND MARK
+    { 0x0000, 0x0000 },	// 0x306a HIRAGANA LETTER NA
+    { 0x0000, 0x0000 },	// 0x306b HIRAGANA LETTER NI
+    { 0x0000, 0x0000 },	// 0x306c HIRAGANA LETTER NU
+    { 0x0000, 0x0000 },	// 0x306d HIRAGANA LETTER NE
+    { 0x0000, 0x0000 },	// 0x306e HIRAGANA LETTER NO
+    { 0x0000, 0x0000 },	// 0x306f HIRAGANA LETTER HA
+    { 0x306f, 0x309b },	// 0x3070 HIRAGANA LETTER BA --> HIRAGANA LETTER HA + COMBINING KATAKANA-HIRAGANA VOICED SOUND MARK
+    { 0x306f, 0x309c },	// 0x3071 HIRAGANA LETTER PA --> HIRAGANA LETTER HA + COMBINING KATAKANA-HIRAGANA SEMI-VOICED SOUND MARK
+    { 0x0000, 0x0000 },	// 0x3072 HIRAGANA LETTER HI
+    { 0x3072, 0x309b },	// 0x3073 HIRAGANA LETTER BI --> HIRAGANA LETTER HI + COMBINING KATAKANA-HIRAGANA VOICED SOUND MARK
+    { 0x3072, 0x309c },	// 0x3074 HIRAGANA LETTER PI --> HIRAGANA LETTER HI + COMBINING KATAKANA-HIRAGANA SEMI-VOICED SOUND MARK
+    { 0x0000, 0x0000 },	// 0x3075 HIRAGANA LETTER HU
+    { 0x3075, 0x309b },	// 0x3076 HIRAGANA LETTER BU --> HIRAGANA LETTER HU + COMBINING KATAKANA-HIRAGANA VOICED SOUND MARK
+    { 0x3075, 0x309c },	// 0x3077 HIRAGANA LETTER PU --> HIRAGANA LETTER HU + COMBINING KATAKANA-HIRAGANA SEMI-VOICED SOUND MARK
+    { 0x0000, 0x0000 },	// 0x3078 HIRAGANA LETTER HE
+    { 0x3078, 0x309b },	// 0x3079 HIRAGANA LETTER BE --> HIRAGANA LETTER HE + COMBINING KATAKANA-HIRAGANA VOICED SOUND MARK
+    { 0x3078, 0x309c },	// 0x307a HIRAGANA LETTER PE --> HIRAGANA LETTER HE + COMBINING KATAKANA-HIRAGANA SEMI-VOICED SOUND MARK
+    { 0x0000, 0x0000 },	// 0x307b HIRAGANA LETTER HO
+    { 0x307b, 0x309b },	// 0x307c HIRAGANA LETTER BO --> HIRAGANA LETTER HO + COMBINING KATAKANA-HIRAGANA VOICED SOUND MARK
+    { 0x307b, 0x309c },	// 0x307d HIRAGANA LETTER PO --> HIRAGANA LETTER HO + COMBINING KATAKANA-HIRAGANA SEMI-VOICED SOUND MARK
+    { 0x0000, 0x0000 },	// 0x307e HIRAGANA LETTER MA
+    { 0x0000, 0x0000 },	// 0x307f HIRAGANA LETTER MI
+    { 0x0000, 0x0000 },	// 0x3080 HIRAGANA LETTER MU
+    { 0x0000, 0x0000 },	// 0x3081 HIRAGANA LETTER ME
+    { 0x0000, 0x0000 },	// 0x3082 HIRAGANA LETTER MO
+    { 0x0000, 0x0000 },	// 0x3083 HIRAGANA LETTER SMALL YA
+    { 0x0000, 0x0000 },	// 0x3084 HIRAGANA LETTER YA
+    { 0x0000, 0x0000 },	// 0x3085 HIRAGANA LETTER SMALL YU
+    { 0x0000, 0x0000 },	// 0x3086 HIRAGANA LETTER YU
+    { 0x0000, 0x0000 },	// 0x3087 HIRAGANA LETTER SMALL YO
+    { 0x0000, 0x0000 },	// 0x3088 HIRAGANA LETTER YO
+    { 0x0000, 0x0000 },	// 0x3089 HIRAGANA LETTER RA
+    { 0x0000, 0x0000 },	// 0x308a HIRAGANA LETTER RI
+    { 0x0000, 0x0000 },	// 0x308b HIRAGANA LETTER RU
+    { 0x0000, 0x0000 },	// 0x308c HIRAGANA LETTER RE
+    { 0x0000, 0x0000 },	// 0x308d HIRAGANA LETTER RO
+    { 0x0000, 0x0000 },	// 0x308e HIRAGANA LETTER SMALL WA
+    { 0x0000, 0x0000 },	// 0x308f HIRAGANA LETTER WA
+    { 0x0000, 0x0000 },	// 0x3090 HIRAGANA LETTER WI
+    { 0x0000, 0x0000 },	// 0x3091 HIRAGANA LETTER WE
+    { 0x0000, 0x0000 },	// 0x3092 HIRAGANA LETTER WO
+    { 0x0000, 0x0000 },	// 0x3093 HIRAGANA LETTER N
+    { 0x3046, 0x309b },	// 0x3094 HIRAGANA LETTER VU --> HIRAGANA LETTER U + COMBINING KATAKANA-HIRAGANA VOICED SOUND MARK
+    { 0x0000, 0x0000 },	// 0x3095
+    { 0x0000, 0x0000 },	// 0x3096
+    { 0x0000, 0x0000 },	// 0x3097
+    { 0x0000, 0x0000 },	// 0x3098
+    { 0x0000, 0x0000 },	// 0x3099 COMBINING KATAKANA-HIRAGANA VOICED SOUND MARK
+    { 0x0000, 0x0000 },	// 0x309a COMBINING KATAKANA-HIRAGANA SEMI-VOICED SOUND MARK
+    { 0x0000, 0x0000 },	// 0x309b KATAKANA-HIRAGANA VOICED SOUND MARK
+    { 0x0000, 0x0000 },	// 0x309c KATAKANA-HIRAGANA SEMI-VOICED SOUND MARK
+    { 0x0000, 0x0000 },	// 0x309d HIRAGANA ITERATION MARK
+    { 0x0000, 0x0000 },	// 0x309e HIRAGANA VOICED ITERATION MARK
+    { 0x0000, 0x0000 },	// 0x309f
+    { 0x0000, 0x0000 },	// 0x30a0
+    { 0x0000, 0x0000 },	// 0x30a1 KATAKANA LETTER SMALL A
+    { 0x0000, 0x0000 },	// 0x30a2 KATAKANA LETTER A
+    { 0x0000, 0x0000 },	// 0x30a3 KATAKANA LETTER SMALL I
+    { 0x0000, 0x0000 },	// 0x30a4 KATAKANA LETTER I
+    { 0x0000, 0x0000 },	// 0x30a5 KATAKANA LETTER SMALL U
+    { 0x0000, 0x0000 },	// 0x30a6 KATAKANA LETTER U
+    { 0x0000, 0x0000 },	// 0x30a7 KATAKANA LETTER SMALL E
+    { 0x0000, 0x0000 },	// 0x30a8 KATAKANA LETTER E
+    { 0x0000, 0x0000 },	// 0x30a9 KATAKANA LETTER SMALL O
+    { 0x0000, 0x0000 },	// 0x30aa KATAKANA LETTER O
+    { 0x0000, 0x0000 },	// 0x30ab KATAKANA LETTER KA
+    { 0x30ab, 0x309b },	// 0x30ac KATAKANA LETTER GA --> KATAKANA LETTER KA + COMBINING KATAKANA-HIRAGANA VOICED SOUND MARK
+    { 0x0000, 0x0000 },	// 0x30ad KATAKANA LETTER KI
+    { 0x30ad, 0x309b },	// 0x30ae KATAKANA LETTER GI --> KATAKANA LETTER KI + COMBINING KATAKANA-HIRAGANA VOICED SOUND MARK
+    { 0x0000, 0x0000 },	// 0x30af KATAKANA LETTER KU
+    { 0x30af, 0x309b },	// 0x30b0 KATAKANA LETTER GU --> KATAKANA LETTER KU + COMBINING KATAKANA-HIRAGANA VOICED SOUND MARK
+    { 0x0000, 0x0000 },	// 0x30b1 KATAKANA LETTER KE
+    { 0x30b1, 0x309b },	// 0x30b2 KATAKANA LETTER GE --> KATAKANA LETTER KE + COMBINING KATAKANA-HIRAGANA VOICED SOUND MARK
+    { 0x0000, 0x0000 },	// 0x30b3 KATAKANA LETTER KO
+    { 0x30b3, 0x309b },	// 0x30b4 KATAKANA LETTER GO --> KATAKANA LETTER KO + COMBINING KATAKANA-HIRAGANA VOICED SOUND MARK
+    { 0x0000, 0x0000 },	// 0x30b5 KATAKANA LETTER SA
+    { 0x30b5, 0x309b },	// 0x30b6 KATAKANA LETTER ZA --> KATAKANA LETTER SA + COMBINING KATAKANA-HIRAGANA VOICED SOUND MARK
+    { 0x0000, 0x0000 },	// 0x30b7 KATAKANA LETTER SI
+    { 0x30b7, 0x309b },	// 0x30b8 KATAKANA LETTER ZI --> KATAKANA LETTER SI + COMBINING KATAKANA-HIRAGANA VOICED SOUND MARK
+    { 0x0000, 0x0000 },	// 0x30b9 KATAKANA LETTER SU
+    { 0x30b9, 0x309b },	// 0x30ba KATAKANA LETTER ZU --> KATAKANA LETTER SU + COMBINING KATAKANA-HIRAGANA VOICED SOUND MARK
+    { 0x0000, 0x0000 },	// 0x30bb KATAKANA LETTER SE
+    { 0x30bb, 0x309b },	// 0x30bc KATAKANA LETTER ZE --> KATAKANA LETTER SE + COMBINING KATAKANA-HIRAGANA VOICED SOUND MARK
+    { 0x0000, 0x0000 },	// 0x30bd KATAKANA LETTER SO
+    { 0x30bd, 0x309b },	// 0x30be KATAKANA LETTER ZO --> KATAKANA LETTER SO + COMBINING KATAKANA-HIRAGANA VOICED SOUND MARK
+    { 0x0000, 0x0000 },	// 0x30bf KATAKANA LETTER TA
+    { 0x30bf, 0x309b },	// 0x30c0 KATAKANA LETTER DA --> KATAKANA LETTER TA + COMBINING KATAKANA-HIRAGANA VOICED SOUND MARK
+    { 0x0000, 0x0000 },	// 0x30c1 KATAKANA LETTER TI
+    { 0x30c1, 0x309b },	// 0x30c2 KATAKANA LETTER DI --> KATAKANA LETTER TI + COMBINING KATAKANA-HIRAGANA VOICED SOUND MARK
+    { 0x0000, 0x0000 },	// 0x30c3 KATAKANA LETTER SMALL TU
+    { 0x0000, 0x0000 },	// 0x30c4 KATAKANA LETTER TU
+    { 0x30c4, 0x309b },	// 0x30c5 KATAKANA LETTER DU --> KATAKANA LETTER TU + COMBINING KATAKANA-HIRAGANA VOICED SOUND MARK
+    { 0x0000, 0x0000 },	// 0x30c6 KATAKANA LETTER TE
+    { 0x30c6, 0x309b },	// 0x30c7 KATAKANA LETTER DE --> KATAKANA LETTER TE + COMBINING KATAKANA-HIRAGANA VOICED SOUND MARK
+    { 0x0000, 0x0000 },	// 0x30c8 KATAKANA LETTER TO
+    { 0x30c8, 0x309b },	// 0x30c9 KATAKANA LETTER DO --> KATAKANA LETTER TO + COMBINING KATAKANA-HIRAGANA VOICED SOUND MARK
+    { 0x0000, 0x0000 },	// 0x30ca KATAKANA LETTER NA
+    { 0x0000, 0x0000 },	// 0x30cb KATAKANA LETTER NI
+    { 0x0000, 0x0000 },	// 0x30cc KATAKANA LETTER NU
+    { 0x0000, 0x0000 },	// 0x30cd KATAKANA LETTER NE
+    { 0x0000, 0x0000 },	// 0x30ce KATAKANA LETTER NO
+    { 0x0000, 0x0000 },	// 0x30cf KATAKANA LETTER HA
+    { 0x30cf, 0x309b },	// 0x30d0 KATAKANA LETTER BA --> KATAKANA LETTER HA + COMBINING KATAKANA-HIRAGANA VOICED SOUND MARK
+    { 0x30cf, 0x309c },	// 0x30d1 KATAKANA LETTER PA --> KATAKANA LETTER HA + COMBINING KATAKANA-HIRAGANA SEMI-VOICED SOUND MARK
+    { 0x0000, 0x0000 },	// 0x30d2 KATAKANA LETTER HI
+    { 0x30d2, 0x309b },	// 0x30d3 KATAKANA LETTER BI --> KATAKANA LETTER HI + COMBINING KATAKANA-HIRAGANA VOICED SOUND MARK
+    { 0x30d2, 0x309c },	// 0x30d4 KATAKANA LETTER PI --> KATAKANA LETTER HI + COMBINING KATAKANA-HIRAGANA SEMI-VOICED SOUND MARK
+    { 0x0000, 0x0000 },	// 0x30d5 KATAKANA LETTER HU
+    { 0x30d5, 0x309b },	// 0x30d6 KATAKANA LETTER BU --> KATAKANA LETTER HU + COMBINING KATAKANA-HIRAGANA VOICED SOUND MARK
+    { 0x30d5, 0x309c },	// 0x30d7 KATAKANA LETTER PU --> KATAKANA LETTER HU + COMBINING KATAKANA-HIRAGANA SEMI-VOICED SOUND MARK
+    { 0x0000, 0x0000 },	// 0x30d8 KATAKANA LETTER HE
+    { 0x30d8, 0x309b },	// 0x30d9 KATAKANA LETTER BE --> KATAKANA LETTER HE + COMBINING KATAKANA-HIRAGANA VOICED SOUND MARK
+    { 0x30d8, 0x309c },	// 0x30da KATAKANA LETTER PE --> KATAKANA LETTER HE + COMBINING KATAKANA-HIRAGANA SEMI-VOICED SOUND MARK
+    { 0x0000, 0x0000 },	// 0x30db KATAKANA LETTER HO
+    { 0x30db, 0x309b },	// 0x30dc KATAKANA LETTER BO --> KATAKANA LETTER HO + COMBINING KATAKANA-HIRAGANA VOICED SOUND MARK
+    { 0x30db, 0x309c },	// 0x30dd KATAKANA LETTER PO --> KATAKANA LETTER HO + COMBINING KATAKANA-HIRAGANA SEMI-VOICED SOUND MARK
+    { 0x0000, 0x0000 },	// 0x30de KATAKANA LETTER MA
+    { 0x0000, 0x0000 },	// 0x30df KATAKANA LETTER MI
+    { 0x0000, 0x0000 },	// 0x30e0 KATAKANA LETTER MU
+    { 0x0000, 0x0000 },	// 0x30e1 KATAKANA LETTER ME
+    { 0x0000, 0x0000 },	// 0x30e2 KATAKANA LETTER MO
+    { 0x0000, 0x0000 },	// 0x30e3 KATAKANA LETTER SMALL YA
+    { 0x0000, 0x0000 },	// 0x30e4 KATAKANA LETTER YA
+    { 0x0000, 0x0000 },	// 0x30e5 KATAKANA LETTER SMALL YU
+    { 0x0000, 0x0000 },	// 0x30e6 KATAKANA LETTER YU
+    { 0x0000, 0x0000 },	// 0x30e7 KATAKANA LETTER SMALL YO
+    { 0x0000, 0x0000 },	// 0x30e8 KATAKANA LETTER YO
+    { 0x0000, 0x0000 },	// 0x30e9 KATAKANA LETTER RA
+    { 0x0000, 0x0000 },	// 0x30ea KATAKANA LETTER RI
+    { 0x0000, 0x0000 },	// 0x30eb KATAKANA LETTER RU
+    { 0x0000, 0x0000 },	// 0x30ec KATAKANA LETTER RE
+    { 0x0000, 0x0000 },	// 0x30ed KATAKANA LETTER RO
+    { 0x0000, 0x0000 },	// 0x30ee KATAKANA LETTER SMALL WA
+    { 0x0000, 0x0000 },	// 0x30ef KATAKANA LETTER WA
+    { 0x0000, 0x0000 },	// 0x30f0 KATAKANA LETTER WI
+    { 0x0000, 0x0000 },	// 0x30f1 KATAKANA LETTER WE
+    { 0x0000, 0x0000 },	// 0x30f2 KATAKANA LETTER WO
+    { 0x0000, 0x0000 },	// 0x30f3 KATAKANA LETTER N
+    { 0x30a6, 0x309b },	// 0x30f4 KATAKANA LETTER VU --> KATAKANA LETTER U + COMBINING KATAKANA-HIRAGANA VOICED SOUND MARK
+    { 0x0000, 0x0000 },	// 0x30f5 KATAKANA LETTER SMALL KA
+    { 0x0000, 0x0000 },	// 0x30f6 KATAKANA LETTER SMALL KE
+    { 0x30ef, 0x309b },	// 0x30f7 KATAKANA LETTER VA --> KATAKANA LETTER WA + COMBINING KATAKANA-HIRAGANA VOICED SOUND MARK
+    { 0x30f0, 0x309b },	// 0x30f8 KATAKANA LETTER VI --> KATAKANA LETTER WI + COMBINING KATAKANA-HIRAGANA VOICED SOUND MARK
+    { 0x30f1, 0x309b },	// 0x30f9 KATAKANA LETTER VE --> KATAKANA LETTER WE + COMBINING KATAKANA-HIRAGANA VOICED SOUND MARK
+    { 0x30f2, 0x309b },	// 0x30fa KATAKANA LETTER VO --> KATAKANA LETTER WO + COMBINING KATAKANA-HIRAGANA VOICED SOUND MARK
+    { 0x0000, 0x0000 },	// 0x30fb KATAKANA MIDDLE DOT
+    { 0x0000, 0x0000 },	// 0x30fc KATAKANA-HIRAGANA PROLONGED SOUND MARK
+    { 0x0000, 0x0000 },	// 0x30fd KATAKANA ITERATION MARK
+    { 0x0000, 0x0000 },	// 0x30fe KATAKANA VOICED ITERATION MARK
+    { 0x0000, 0x0000 }	// 0x30ff 
 };
 
 
@@ -249,13 +249,13 @@ const decomposition_table_entry_t decomposition_table[] = {
   Halfwidth and Fullwidth Forms (U+FF00..U+FFEF)
   ftp://ftp.unicode.org/Public/3.0-Update/UnicodeData-3.0.0.txt
   ftp://ftp.unicode.org/Public/3.0-Update/UnicodeData-3.0.0.html
-  http://charts.unicode.org/Web/UFF00.html
+  http://charts.unicode.org/Web/UFF00.html 
 */
 
 #define FULL2HALF_NORMAL              0x01
 #define FULL2HALF_ASC_FUNCTION        0x02
-#define FULL2HALF_KATAKANA_ONLY       0x04
-
+#define FULL2HALF_KATAKANA_ONLY       0x04 
+ 
 UnicodePairWithFlag full2half[] = {
     { 0x2015, 0xFF70, FULL2HALF_ASC_FUNCTION },  // HORIZONTAL BAR --> KATAKANA-HIRAGANA PROLONGED SOUND MARK
     { 0x2018, 0x0060, FULL2HALF_ASC_FUNCTION },  // LEFT SINGLE QUOTATION MARK => GRAVE ACCENT
@@ -494,7 +494,7 @@ UnicodePairWithFlag full2half[] = {
 
 /*
  Exceptional conversion table for ASC function
-*/
+*/    
 UnicodePairWithFlag full2halfASCException[] = {
     { 0xFFE5, 0x005C, FULL2HALF_ASC_FUNCTION }  // FULLWIDTH YEN SIGN --> REVERSE SOLIDUS
  };
@@ -506,198 +506,198 @@ UnicodePairWithFlag full2halfASCException[] = {
 */
 
 const sal_Unicode composition_table[][2] = {
-    { 0x0000, 0x0000 }, // 0x3040
-    { 0x0000, 0x0000 }, // 0x3041 HIRAGANA LETTER SMALL A
-    { 0x0000, 0x0000 }, // 0x3042 HIRAGANA LETTER A
-    { 0x0000, 0x0000 }, // 0x3043 HIRAGANA LETTER SMALL I
-    { 0x0000, 0x0000 }, // 0x3044 HIRAGANA LETTER I
-    { 0x0000, 0x0000 }, // 0x3045 HIRAGANA LETTER SMALL U
-    { 0x3094, 0x0000 }, // 0x3046 HIRAGANA LETTER U --> HIRAGANA LETTER VU
-    { 0x0000, 0x0000 }, // 0x3047 HIRAGANA LETTER SMALL E
-    { 0x0000, 0x0000 }, // 0x3048 HIRAGANA LETTER E
-    { 0x0000, 0x0000 }, // 0x3049 HIRAGANA LETTER SMALL O
-    { 0x0000, 0x0000 }, // 0x304a HIRAGANA LETTER O
-    { 0x304c, 0x0000 }, // 0x304b HIRAGANA LETTER KA --> HIRAGANA LETTER GA
-    { 0x0000, 0x0000 }, // 0x304c HIRAGANA LETTER GA
-    { 0x304e, 0x0000 }, // 0x304d HIRAGANA LETTER KI --> HIRAGANA LETTER GI
-    { 0x0000, 0x0000 }, // 0x304e HIRAGANA LETTER GI
-    { 0x3050, 0x0000 }, // 0x304f HIRAGANA LETTER KU --> HIRAGANA LETTER GU
-    { 0x0000, 0x0000 }, // 0x3050 HIRAGANA LETTER GU
-    { 0x3052, 0x0000 }, // 0x3051 HIRAGANA LETTER KE --> HIRAGANA LETTER GE
-    { 0x0000, 0x0000 }, // 0x3052 HIRAGANA LETTER GE
-    { 0x3054, 0x0000 }, // 0x3053 HIRAGANA LETTER KO --> HIRAGANA LETTER GO
-    { 0x0000, 0x0000 }, // 0x3054 HIRAGANA LETTER GO
-    { 0x3056, 0x0000 }, // 0x3055 HIRAGANA LETTER SA --> HIRAGANA LETTER ZA
-    { 0x0000, 0x0000 }, // 0x3056 HIRAGANA LETTER ZA
-    { 0x3058, 0x0000 }, // 0x3057 HIRAGANA LETTER SI --> HIRAGANA LETTER ZI
-    { 0x0000, 0x0000 }, // 0x3058 HIRAGANA LETTER ZI
-    { 0x305a, 0x0000 }, // 0x3059 HIRAGANA LETTER SU --> HIRAGANA LETTER ZU
-    { 0x0000, 0x0000 }, // 0x305a HIRAGANA LETTER ZU
-    { 0x305c, 0x0000 }, // 0x305b HIRAGANA LETTER SE --> HIRAGANA LETTER ZE
-    { 0x0000, 0x0000 }, // 0x305c HIRAGANA LETTER ZE
-    { 0x305e, 0x0000 }, // 0x305d HIRAGANA LETTER SO --> HIRAGANA LETTER ZO
-    { 0x0000, 0x0000 }, // 0x305e HIRAGANA LETTER ZO
-    { 0x3060, 0x0000 }, // 0x305f HIRAGANA LETTER TA --> HIRAGANA LETTER DA
-    { 0x0000, 0x0000 }, // 0x3060 HIRAGANA LETTER DA
-    { 0x3062, 0x0000 }, // 0x3061 HIRAGANA LETTER TI --> HIRAGANA LETTER DI
-    { 0x0000, 0x0000 }, // 0x3062 HIRAGANA LETTER DI
-    { 0x0000, 0x0000 }, // 0x3063 HIRAGANA LETTER SMALL TU
-    { 0x3065, 0x0000 }, // 0x3064 HIRAGANA LETTER TU --> HIRAGANA LETTER DU
-    { 0x0000, 0x0000 }, // 0x3065 HIRAGANA LETTER DU
-    { 0x3067, 0x0000 }, // 0x3066 HIRAGANA LETTER TE --> HIRAGANA LETTER DE
-    { 0x0000, 0x0000 }, // 0x3067 HIRAGANA LETTER DE
-    { 0x3069, 0x0000 }, // 0x3068 HIRAGANA LETTER TO --> HIRAGANA LETTER DO
-    { 0x0000, 0x0000 }, // 0x3069 HIRAGANA LETTER DO
-    { 0x0000, 0x0000 }, // 0x306a HIRAGANA LETTER NA
-    { 0x0000, 0x0000 }, // 0x306b HIRAGANA LETTER NI
-    { 0x0000, 0x0000 }, // 0x306c HIRAGANA LETTER NU
-    { 0x0000, 0x0000 }, // 0x306d HIRAGANA LETTER NE
-    { 0x0000, 0x0000 }, // 0x306e HIRAGANA LETTER NO
-    { 0x3070, 0x3071 }, // 0x306f HIRAGANA LETTER HA --> HIRAGANA LETTER BA or HIRAGANA LETTER PA
-    { 0x0000, 0x0000 }, // 0x3070 HIRAGANA LETTER BA
-    { 0x0000, 0x0000 }, // 0x3071 HIRAGANA LETTER PA
-    { 0x3073, 0x3074 }, // 0x3072 HIRAGANA LETTER HI --> HIRAGANA LETTER BI or HIRAGANA LETTER PI
-    { 0x0000, 0x0000 }, // 0x3073 HIRAGANA LETTER BI
-    { 0x0000, 0x0000 }, // 0x3074 HIRAGANA LETTER PI
-    { 0x3076, 0x3077 }, // 0x3075 HIRAGANA LETTER HU --> HIRAGANA LETTER BU or HIRAGANA LETTER PU
-    { 0x0000, 0x0000 }, // 0x3076 HIRAGANA LETTER BU
-    { 0x0000, 0x0000 }, // 0x3077 HIRAGANA LETTER PU
-    { 0x3079, 0x307a }, // 0x3078 HIRAGANA LETTER HE --> HIRAGANA LETTER BE or HIRAGANA LETTER PE
-    { 0x0000, 0x0000 }, // 0x3079 HIRAGANA LETTER BE
-    { 0x0000, 0x0000 }, // 0x307a HIRAGANA LETTER PE
-    { 0x307c, 0x307d }, // 0x307b HIRAGANA LETTER HO --> HIRAGANA LETTER BO or HIRAGANA LETTER PO
-    { 0x0000, 0x0000 }, // 0x307c HIRAGANA LETTER BO
-    { 0x0000, 0x0000 }, // 0x307d HIRAGANA LETTER PO
-    { 0x0000, 0x0000 }, // 0x307e HIRAGANA LETTER MA
-    { 0x0000, 0x0000 }, // 0x307f HIRAGANA LETTER MI
-    { 0x0000, 0x0000 }, // 0x3080 HIRAGANA LETTER MU
-    { 0x0000, 0x0000 }, // 0x3081 HIRAGANA LETTER ME
-    { 0x0000, 0x0000 }, // 0x3082 HIRAGANA LETTER MO
-    { 0x0000, 0x0000 }, // 0x3083 HIRAGANA LETTER SMALL YA
-    { 0x0000, 0x0000 }, // 0x3084 HIRAGANA LETTER YA
-    { 0x0000, 0x0000 }, // 0x3085 HIRAGANA LETTER SMALL YU
-    { 0x0000, 0x0000 }, // 0x3086 HIRAGANA LETTER YU
-    { 0x0000, 0x0000 }, // 0x3087 HIRAGANA LETTER SMALL YO
-    { 0x0000, 0x0000 }, // 0x3088 HIRAGANA LETTER YO
-    { 0x0000, 0x0000 }, // 0x3089 HIRAGANA LETTER RA
-    { 0x0000, 0x0000 }, // 0x308a HIRAGANA LETTER RI
-    { 0x0000, 0x0000 }, // 0x308b HIRAGANA LETTER RU
-    { 0x0000, 0x0000 }, // 0x308c HIRAGANA LETTER RE
-    { 0x0000, 0x0000 }, // 0x308d HIRAGANA LETTER RO
-    { 0x0000, 0x0000 }, // 0x308e HIRAGANA LETTER SMALL WA
-    { 0x0000, 0x0000 }, // 0x308f HIRAGANA LETTER WA
-    { 0x0000, 0x0000 }, // 0x3090 HIRAGANA LETTER WI
-    { 0x0000, 0x0000 }, // 0x3091 HIRAGANA LETTER WE
-    { 0x0000, 0x0000 }, // 0x3092 HIRAGANA LETTER WO
-    { 0x0000, 0x0000 }, // 0x3093 HIRAGANA LETTER N
-    { 0x0000, 0x0000 }, // 0x3094 HIRAGANA LETTER VU
-    { 0x0000, 0x0000 }, // 0x3095
-    { 0x0000, 0x0000 }, // 0x3096
-    { 0x0000, 0x0000 }, // 0x3097
-    { 0x0000, 0x0000 }, // 0x3098
-    { 0x0000, 0x0000 }, // 0x3099 COMBINING KATAKANA-HIRAGANA VOICED SOUND MARK
-    { 0x0000, 0x0000 }, // 0x309a COMBINING KATAKANA-HIRAGANA SEMI-VOICED SOUND MARK
-    { 0x0000, 0x0000 }, // 0x309b KATAKANA-HIRAGANA VOICED SOUND MARK
-    { 0x0000, 0x0000 }, // 0x309c KATAKANA-HIRAGANA SEMI-VOICED SOUND MARK
-    { 0x0000, 0x0000 }, // 0x309d HIRAGANA ITERATION MARK
-    { 0x0000, 0x0000 }, // 0x309e HIRAGANA VOICED ITERATION MARK
-    { 0x0000, 0x0000 }, // 0x309f
-    { 0x0000, 0x0000 }, // 0x30a0
-    { 0x0000, 0x0000 }, // 0x30a1 KATAKANA LETTER SMALL A
-    { 0x0000, 0x0000 }, // 0x30a2 KATAKANA LETTER A
-    { 0x0000, 0x0000 }, // 0x30a3 KATAKANA LETTER SMALL I
-    { 0x0000, 0x0000 }, // 0x30a4 KATAKANA LETTER I
-    { 0x0000, 0x0000 }, // 0x30a5 KATAKANA LETTER SMALL U
-    { 0x30f4, 0x0000 }, // 0x30a6 KATAKANA LETTER U --> KATAKANA LETTER VU
-    { 0x0000, 0x0000 }, // 0x30a7 KATAKANA LETTER SMALL E
-    { 0x0000, 0x0000 }, // 0x30a8 KATAKANA LETTER E
-    { 0x0000, 0x0000 }, // 0x30a9 KATAKANA LETTER SMALL O
-    { 0x0000, 0x0000 }, // 0x30aa KATAKANA LETTER O
-    { 0x30ac, 0x0000 }, // 0x30ab KATAKANA LETTER KA --> KATAKANA LETTER GA
-    { 0x0000, 0x0000 }, // 0x30ac KATAKANA LETTER GA
-    { 0x30ae, 0x0000 }, // 0x30ad KATAKANA LETTER KI --> KATAKANA LETTER GI
-    { 0x0000, 0x0000 }, // 0x30ae KATAKANA LETTER GI
-    { 0x30b0, 0x0000 }, // 0x30af KATAKANA LETTER KU --> KATAKANA LETTER GU
-    { 0x0000, 0x0000 }, // 0x30b0 KATAKANA LETTER GU
-    { 0x30b2, 0x0000 }, // 0x30b1 KATAKANA LETTER KE --> KATAKANA LETTER GE
-    { 0x0000, 0x0000 }, // 0x30b2 KATAKANA LETTER GE
-    { 0x30b4, 0x0000 }, // 0x30b3 KATAKANA LETTER KO --> KATAKANA LETTER GO
-    { 0x0000, 0x0000 }, // 0x30b4 KATAKANA LETTER GO
-    { 0x30b6, 0x0000 }, // 0x30b5 KATAKANA LETTER SA --> KATAKANA LETTER ZA
-    { 0x0000, 0x0000 }, // 0x30b6 KATAKANA LETTER ZA
-    { 0x30b8, 0x0000 }, // 0x30b7 KATAKANA LETTER SI --> KATAKANA LETTER ZI
-    { 0x0000, 0x0000 }, // 0x30b8 KATAKANA LETTER ZI
-    { 0x30ba, 0x0000 }, // 0x30b9 KATAKANA LETTER SU --> KATAKANA LETTER ZU
-    { 0x0000, 0x0000 }, // 0x30ba KATAKANA LETTER ZU
-    { 0x30bc, 0x0000 }, // 0x30bb KATAKANA LETTER SE --> KATAKANA LETTER ZE
-    { 0x0000, 0x0000 }, // 0x30bc KATAKANA LETTER ZE
-    { 0x30be, 0x0000 }, // 0x30bd KATAKANA LETTER SO --> KATAKANA LETTER ZO
-    { 0x0000, 0x0000 }, // 0x30be KATAKANA LETTER ZO
-    { 0x30c0, 0x0000 }, // 0x30bf KATAKANA LETTER TA --> KATAKANA LETTER DA
-    { 0x0000, 0x0000 }, // 0x30c0 KATAKANA LETTER DA
-    { 0x30c2, 0x0000 }, // 0x30c1 KATAKANA LETTER TI --> KATAKANA LETTER DI
-    { 0x0000, 0x0000 }, // 0x30c2 KATAKANA LETTER DI
-    { 0x0000, 0x0000 }, // 0x30c3 KATAKANA LETTER SMALL TU
-    { 0x30c5, 0x0000 }, // 0x30c4 KATAKANA LETTER TU --> KATAKANA LETTER DU
-    { 0x0000, 0x0000 }, // 0x30c5 KATAKANA LETTER DU
-    { 0x30c7, 0x0000 }, // 0x30c6 KATAKANA LETTER TE --> KATAKANA LETTER DE
-    { 0x0000, 0x0000 }, // 0x30c7 KATAKANA LETTER DE
-    { 0x30c9, 0x0000 }, // 0x30c8 KATAKANA LETTER TO --> KATAKANA LETTER DO
-    { 0x0000, 0x0000 }, // 0x30c9 KATAKANA LETTER DO
-    { 0x0000, 0x0000 }, // 0x30ca KATAKANA LETTER NA
-    { 0x0000, 0x0000 }, // 0x30cb KATAKANA LETTER NI
-    { 0x0000, 0x0000 }, // 0x30cc KATAKANA LETTER NU
-    { 0x0000, 0x0000 }, // 0x30cd KATAKANA LETTER NE
-    { 0x0000, 0x0000 }, // 0x30ce KATAKANA LETTER NO
-    { 0x30d0, 0x30d1 }, // 0x30cf KATAKANA LETTER HA --> KATAKANA LETTER BA or KATAKANA LETTER PA
-    { 0x0000, 0x0000 }, // 0x30d0 KATAKANA LETTER BA
-    { 0x0000, 0x0000 }, // 0x30d1 KATAKANA LETTER PA
-    { 0x30d3, 0x30d4 }, // 0x30d2 KATAKANA LETTER HI --> KATAKANA LETTER BI or KATAKANA LETTER PI
-    { 0x0000, 0x0000 }, // 0x30d3 KATAKANA LETTER BI
-    { 0x0000, 0x0000 }, // 0x30d4 KATAKANA LETTER PI
-    { 0x30d6, 0x30d7 }, // 0x30d5 KATAKANA LETTER HU --> KATAKANA LETTER BU or KATAKANA LETTER PU
-    { 0x0000, 0x0000 }, // 0x30d6 KATAKANA LETTER BU
-    { 0x0000, 0x0000 }, // 0x30d7 KATAKANA LETTER PU
-    { 0x30d9, 0x30da }, // 0x30d8 KATAKANA LETTER HE --> KATAKANA LETTER BE or KATAKANA LETTER PE
-    { 0x0000, 0x0000 }, // 0x30d9 KATAKANA LETTER BE
-    { 0x0000, 0x0000 }, // 0x30da KATAKANA LETTER PE
-    { 0x30dc, 0x30dd }, // 0x30db KATAKANA LETTER HO --> KATAKANA LETTER BO or KATAKANA LETTER PO
-    { 0x0000, 0x0000 }, // 0x30dc KATAKANA LETTER BO
-    { 0x0000, 0x0000 }, // 0x30dd KATAKANA LETTER PO
-    { 0x0000, 0x0000 }, // 0x30de KATAKANA LETTER MA
-    { 0x0000, 0x0000 }, // 0x30df KATAKANA LETTER MI
-    { 0x0000, 0x0000 }, // 0x30e0 KATAKANA LETTER MU
-    { 0x0000, 0x0000 }, // 0x30e1 KATAKANA LETTER ME
-    { 0x0000, 0x0000 }, // 0x30e2 KATAKANA LETTER MO
-    { 0x0000, 0x0000 }, // 0x30e3 KATAKANA LETTER SMALL YA
-    { 0x0000, 0x0000 }, // 0x30e4 KATAKANA LETTER YA
-    { 0x0000, 0x0000 }, // 0x30e5 KATAKANA LETTER SMALL YU
-    { 0x0000, 0x0000 }, // 0x30e6 KATAKANA LETTER YU
-    { 0x0000, 0x0000 }, // 0x30e7 KATAKANA LETTER SMALL YO
-    { 0x0000, 0x0000 }, // 0x30e8 KATAKANA LETTER YO
-    { 0x0000, 0x0000 }, // 0x30e9 KATAKANA LETTER RA
-    { 0x0000, 0x0000 }, // 0x30ea KATAKANA LETTER RI
-    { 0x0000, 0x0000 }, // 0x30eb KATAKANA LETTER RU
-    { 0x0000, 0x0000 }, // 0x30ec KATAKANA LETTER RE
-    { 0x0000, 0x0000 }, // 0x30ed KATAKANA LETTER RO
-    { 0x0000, 0x0000 }, // 0x30ee KATAKANA LETTER SMALL WA
-    { 0x30f7, 0x0000 }, // 0x30ef KATAKANA LETTER WA --> KATAKANA LETTER VA
-    { 0x30f8, 0x0000 }, // 0x30f0 KATAKANA LETTER WI --> KATAKANA LETTER VI
-    { 0x30f9, 0x0000 }, // 0x30f1 KATAKANA LETTER WE --> KATAKANA LETTER VE
-    { 0x30fa, 0x0000 }, // 0x30f2 KATAKANA LETTER WO --> KATAKANA LETTER VO
-    { 0x0000, 0x0000 }, // 0x30f3 KATAKANA LETTER N
-    { 0x0000, 0x0000 }, // 0x30f4 KATAKANA LETTER VU
-    { 0x0000, 0x0000 }, // 0x30f5 KATAKANA LETTER SMALL KA
-    { 0x0000, 0x0000 }, // 0x30f6 KATAKANA LETTER SMALL KE
-    { 0x0000, 0x0000 }, // 0x30f7 KATAKANA LETTER VA
-    { 0x0000, 0x0000 }, // 0x30f8 KATAKANA LETTER VI
-    { 0x0000, 0x0000 }, // 0x30f9 KATAKANA LETTER VE
-    { 0x0000, 0x0000 }, // 0x30fa KATAKANA LETTER VO
-    { 0x0000, 0x0000 }, // 0x30fb KATAKANA MIDDLE DOT
-    { 0x0000, 0x0000 }, // 0x30fc KATAKANA-HIRAGANA PROLONGED SOUND MARK
-    { 0x0000, 0x0000 }, // 0x30fd KATAKANA ITERATION MARK
-    { 0x0000, 0x0000 }, // 0x30fe KATAKANA VOICED ITERATION MARK
-    { 0x0000, 0x0000 }  // 0x30ff
+    { 0x0000, 0x0000 },	// 0x3040
+    { 0x0000, 0x0000 },	// 0x3041 HIRAGANA LETTER SMALL A
+    { 0x0000, 0x0000 },	// 0x3042 HIRAGANA LETTER A
+    { 0x0000, 0x0000 },	// 0x3043 HIRAGANA LETTER SMALL I
+    { 0x0000, 0x0000 },	// 0x3044 HIRAGANA LETTER I
+    { 0x0000, 0x0000 },	// 0x3045 HIRAGANA LETTER SMALL U
+    { 0x3094, 0x0000 },	// 0x3046 HIRAGANA LETTER U --> HIRAGANA LETTER VU
+    { 0x0000, 0x0000 },	// 0x3047 HIRAGANA LETTER SMALL E
+    { 0x0000, 0x0000 },	// 0x3048 HIRAGANA LETTER E
+    { 0x0000, 0x0000 },	// 0x3049 HIRAGANA LETTER SMALL O
+    { 0x0000, 0x0000 },	// 0x304a HIRAGANA LETTER O
+    { 0x304c, 0x0000 },	// 0x304b HIRAGANA LETTER KA --> HIRAGANA LETTER GA
+    { 0x0000, 0x0000 },	// 0x304c HIRAGANA LETTER GA
+    { 0x304e, 0x0000 },	// 0x304d HIRAGANA LETTER KI --> HIRAGANA LETTER GI
+    { 0x0000, 0x0000 },	// 0x304e HIRAGANA LETTER GI
+    { 0x3050, 0x0000 },	// 0x304f HIRAGANA LETTER KU --> HIRAGANA LETTER GU
+    { 0x0000, 0x0000 },	// 0x3050 HIRAGANA LETTER GU
+    { 0x3052, 0x0000 },	// 0x3051 HIRAGANA LETTER KE --> HIRAGANA LETTER GE
+    { 0x0000, 0x0000 },	// 0x3052 HIRAGANA LETTER GE
+    { 0x3054, 0x0000 },	// 0x3053 HIRAGANA LETTER KO --> HIRAGANA LETTER GO
+    { 0x0000, 0x0000 },	// 0x3054 HIRAGANA LETTER GO
+    { 0x3056, 0x0000 },	// 0x3055 HIRAGANA LETTER SA --> HIRAGANA LETTER ZA
+    { 0x0000, 0x0000 },	// 0x3056 HIRAGANA LETTER ZA
+    { 0x3058, 0x0000 },	// 0x3057 HIRAGANA LETTER SI --> HIRAGANA LETTER ZI
+    { 0x0000, 0x0000 },	// 0x3058 HIRAGANA LETTER ZI
+    { 0x305a, 0x0000 },	// 0x3059 HIRAGANA LETTER SU --> HIRAGANA LETTER ZU
+    { 0x0000, 0x0000 },	// 0x305a HIRAGANA LETTER ZU
+    { 0x305c, 0x0000 },	// 0x305b HIRAGANA LETTER SE --> HIRAGANA LETTER ZE
+    { 0x0000, 0x0000 },	// 0x305c HIRAGANA LETTER ZE
+    { 0x305e, 0x0000 },	// 0x305d HIRAGANA LETTER SO --> HIRAGANA LETTER ZO
+    { 0x0000, 0x0000 },	// 0x305e HIRAGANA LETTER ZO
+    { 0x3060, 0x0000 },	// 0x305f HIRAGANA LETTER TA --> HIRAGANA LETTER DA
+    { 0x0000, 0x0000 },	// 0x3060 HIRAGANA LETTER DA
+    { 0x3062, 0x0000 },	// 0x3061 HIRAGANA LETTER TI --> HIRAGANA LETTER DI
+    { 0x0000, 0x0000 },	// 0x3062 HIRAGANA LETTER DI
+    { 0x0000, 0x0000 },	// 0x3063 HIRAGANA LETTER SMALL TU
+    { 0x3065, 0x0000 },	// 0x3064 HIRAGANA LETTER TU --> HIRAGANA LETTER DU
+    { 0x0000, 0x0000 },	// 0x3065 HIRAGANA LETTER DU
+    { 0x3067, 0x0000 },	// 0x3066 HIRAGANA LETTER TE --> HIRAGANA LETTER DE
+    { 0x0000, 0x0000 },	// 0x3067 HIRAGANA LETTER DE
+    { 0x3069, 0x0000 },	// 0x3068 HIRAGANA LETTER TO --> HIRAGANA LETTER DO
+    { 0x0000, 0x0000 },	// 0x3069 HIRAGANA LETTER DO
+    { 0x0000, 0x0000 },	// 0x306a HIRAGANA LETTER NA
+    { 0x0000, 0x0000 },	// 0x306b HIRAGANA LETTER NI
+    { 0x0000, 0x0000 },	// 0x306c HIRAGANA LETTER NU
+    { 0x0000, 0x0000 },	// 0x306d HIRAGANA LETTER NE
+    { 0x0000, 0x0000 },	// 0x306e HIRAGANA LETTER NO
+    { 0x3070, 0x3071 },	// 0x306f HIRAGANA LETTER HA --> HIRAGANA LETTER BA or HIRAGANA LETTER PA
+    { 0x0000, 0x0000 },	// 0x3070 HIRAGANA LETTER BA
+    { 0x0000, 0x0000 },	// 0x3071 HIRAGANA LETTER PA
+    { 0x3073, 0x3074 },	// 0x3072 HIRAGANA LETTER HI --> HIRAGANA LETTER BI or HIRAGANA LETTER PI
+    { 0x0000, 0x0000 },	// 0x3073 HIRAGANA LETTER BI
+    { 0x0000, 0x0000 },	// 0x3074 HIRAGANA LETTER PI
+    { 0x3076, 0x3077 },	// 0x3075 HIRAGANA LETTER HU --> HIRAGANA LETTER BU or HIRAGANA LETTER PU
+    { 0x0000, 0x0000 },	// 0x3076 HIRAGANA LETTER BU
+    { 0x0000, 0x0000 },	// 0x3077 HIRAGANA LETTER PU
+    { 0x3079, 0x307a },	// 0x3078 HIRAGANA LETTER HE --> HIRAGANA LETTER BE or HIRAGANA LETTER PE
+    { 0x0000, 0x0000 },	// 0x3079 HIRAGANA LETTER BE
+    { 0x0000, 0x0000 },	// 0x307a HIRAGANA LETTER PE
+    { 0x307c, 0x307d },	// 0x307b HIRAGANA LETTER HO --> HIRAGANA LETTER BO or HIRAGANA LETTER PO
+    { 0x0000, 0x0000 },	// 0x307c HIRAGANA LETTER BO
+    { 0x0000, 0x0000 },	// 0x307d HIRAGANA LETTER PO
+    { 0x0000, 0x0000 },	// 0x307e HIRAGANA LETTER MA
+    { 0x0000, 0x0000 },	// 0x307f HIRAGANA LETTER MI
+    { 0x0000, 0x0000 },	// 0x3080 HIRAGANA LETTER MU
+    { 0x0000, 0x0000 },	// 0x3081 HIRAGANA LETTER ME
+    { 0x0000, 0x0000 },	// 0x3082 HIRAGANA LETTER MO
+    { 0x0000, 0x0000 },	// 0x3083 HIRAGANA LETTER SMALL YA
+    { 0x0000, 0x0000 },	// 0x3084 HIRAGANA LETTER YA
+    { 0x0000, 0x0000 },	// 0x3085 HIRAGANA LETTER SMALL YU
+    { 0x0000, 0x0000 },	// 0x3086 HIRAGANA LETTER YU
+    { 0x0000, 0x0000 },	// 0x3087 HIRAGANA LETTER SMALL YO
+    { 0x0000, 0x0000 },	// 0x3088 HIRAGANA LETTER YO
+    { 0x0000, 0x0000 },	// 0x3089 HIRAGANA LETTER RA
+    { 0x0000, 0x0000 },	// 0x308a HIRAGANA LETTER RI
+    { 0x0000, 0x0000 },	// 0x308b HIRAGANA LETTER RU
+    { 0x0000, 0x0000 },	// 0x308c HIRAGANA LETTER RE
+    { 0x0000, 0x0000 },	// 0x308d HIRAGANA LETTER RO
+    { 0x0000, 0x0000 },	// 0x308e HIRAGANA LETTER SMALL WA
+    { 0x0000, 0x0000 },	// 0x308f HIRAGANA LETTER WA
+    { 0x0000, 0x0000 },	// 0x3090 HIRAGANA LETTER WI
+    { 0x0000, 0x0000 },	// 0x3091 HIRAGANA LETTER WE
+    { 0x0000, 0x0000 },	// 0x3092 HIRAGANA LETTER WO
+    { 0x0000, 0x0000 },	// 0x3093 HIRAGANA LETTER N
+    { 0x0000, 0x0000 },	// 0x3094 HIRAGANA LETTER VU
+    { 0x0000, 0x0000 },	// 0x3095
+    { 0x0000, 0x0000 },	// 0x3096
+    { 0x0000, 0x0000 },	// 0x3097
+    { 0x0000, 0x0000 },	// 0x3098
+    { 0x0000, 0x0000 },	// 0x3099 COMBINING KATAKANA-HIRAGANA VOICED SOUND MARK
+    { 0x0000, 0x0000 },	// 0x309a COMBINING KATAKANA-HIRAGANA SEMI-VOICED SOUND MARK
+    { 0x0000, 0x0000 },	// 0x309b KATAKANA-HIRAGANA VOICED SOUND MARK
+    { 0x0000, 0x0000 },	// 0x309c KATAKANA-HIRAGANA SEMI-VOICED SOUND MARK
+    { 0x0000, 0x0000 },	// 0x309d HIRAGANA ITERATION MARK
+    { 0x0000, 0x0000 },	// 0x309e HIRAGANA VOICED ITERATION MARK
+    { 0x0000, 0x0000 },	// 0x309f
+    { 0x0000, 0x0000 },	// 0x30a0
+    { 0x0000, 0x0000 },	// 0x30a1 KATAKANA LETTER SMALL A
+    { 0x0000, 0x0000 },	// 0x30a2 KATAKANA LETTER A
+    { 0x0000, 0x0000 },	// 0x30a3 KATAKANA LETTER SMALL I
+    { 0x0000, 0x0000 },	// 0x30a4 KATAKANA LETTER I
+    { 0x0000, 0x0000 },	// 0x30a5 KATAKANA LETTER SMALL U
+    { 0x30f4, 0x0000 },	// 0x30a6 KATAKANA LETTER U --> KATAKANA LETTER VU
+    { 0x0000, 0x0000 },	// 0x30a7 KATAKANA LETTER SMALL E
+    { 0x0000, 0x0000 },	// 0x30a8 KATAKANA LETTER E
+    { 0x0000, 0x0000 },	// 0x30a9 KATAKANA LETTER SMALL O
+    { 0x0000, 0x0000 },	// 0x30aa KATAKANA LETTER O
+    { 0x30ac, 0x0000 },	// 0x30ab KATAKANA LETTER KA --> KATAKANA LETTER GA
+    { 0x0000, 0x0000 },	// 0x30ac KATAKANA LETTER GA
+    { 0x30ae, 0x0000 },	// 0x30ad KATAKANA LETTER KI --> KATAKANA LETTER GI
+    { 0x0000, 0x0000 },	// 0x30ae KATAKANA LETTER GI
+    { 0x30b0, 0x0000 },	// 0x30af KATAKANA LETTER KU --> KATAKANA LETTER GU
+    { 0x0000, 0x0000 },	// 0x30b0 KATAKANA LETTER GU
+    { 0x30b2, 0x0000 },	// 0x30b1 KATAKANA LETTER KE --> KATAKANA LETTER GE
+    { 0x0000, 0x0000 },	// 0x30b2 KATAKANA LETTER GE
+    { 0x30b4, 0x0000 },	// 0x30b3 KATAKANA LETTER KO --> KATAKANA LETTER GO
+    { 0x0000, 0x0000 },	// 0x30b4 KATAKANA LETTER GO
+    { 0x30b6, 0x0000 },	// 0x30b5 KATAKANA LETTER SA --> KATAKANA LETTER ZA
+    { 0x0000, 0x0000 },	// 0x30b6 KATAKANA LETTER ZA
+    { 0x30b8, 0x0000 },	// 0x30b7 KATAKANA LETTER SI --> KATAKANA LETTER ZI
+    { 0x0000, 0x0000 },	// 0x30b8 KATAKANA LETTER ZI
+    { 0x30ba, 0x0000 },	// 0x30b9 KATAKANA LETTER SU --> KATAKANA LETTER ZU
+    { 0x0000, 0x0000 },	// 0x30ba KATAKANA LETTER ZU
+    { 0x30bc, 0x0000 },	// 0x30bb KATAKANA LETTER SE --> KATAKANA LETTER ZE
+    { 0x0000, 0x0000 },	// 0x30bc KATAKANA LETTER ZE
+    { 0x30be, 0x0000 },	// 0x30bd KATAKANA LETTER SO --> KATAKANA LETTER ZO
+    { 0x0000, 0x0000 },	// 0x30be KATAKANA LETTER ZO
+    { 0x30c0, 0x0000 },	// 0x30bf KATAKANA LETTER TA --> KATAKANA LETTER DA
+    { 0x0000, 0x0000 },	// 0x30c0 KATAKANA LETTER DA
+    { 0x30c2, 0x0000 },	// 0x30c1 KATAKANA LETTER TI --> KATAKANA LETTER DI
+    { 0x0000, 0x0000 },	// 0x30c2 KATAKANA LETTER DI
+    { 0x0000, 0x0000 },	// 0x30c3 KATAKANA LETTER SMALL TU
+    { 0x30c5, 0x0000 },	// 0x30c4 KATAKANA LETTER TU --> KATAKANA LETTER DU
+    { 0x0000, 0x0000 },	// 0x30c5 KATAKANA LETTER DU
+    { 0x30c7, 0x0000 },	// 0x30c6 KATAKANA LETTER TE --> KATAKANA LETTER DE
+    { 0x0000, 0x0000 },	// 0x30c7 KATAKANA LETTER DE
+    { 0x30c9, 0x0000 },	// 0x30c8 KATAKANA LETTER TO --> KATAKANA LETTER DO
+    { 0x0000, 0x0000 },	// 0x30c9 KATAKANA LETTER DO
+    { 0x0000, 0x0000 },	// 0x30ca KATAKANA LETTER NA
+    { 0x0000, 0x0000 },	// 0x30cb KATAKANA LETTER NI
+    { 0x0000, 0x0000 },	// 0x30cc KATAKANA LETTER NU
+    { 0x0000, 0x0000 },	// 0x30cd KATAKANA LETTER NE
+    { 0x0000, 0x0000 },	// 0x30ce KATAKANA LETTER NO
+    { 0x30d0, 0x30d1 },	// 0x30cf KATAKANA LETTER HA --> KATAKANA LETTER BA or KATAKANA LETTER PA
+    { 0x0000, 0x0000 },	// 0x30d0 KATAKANA LETTER BA
+    { 0x0000, 0x0000 },	// 0x30d1 KATAKANA LETTER PA
+    { 0x30d3, 0x30d4 },	// 0x30d2 KATAKANA LETTER HI --> KATAKANA LETTER BI or KATAKANA LETTER PI
+    { 0x0000, 0x0000 },	// 0x30d3 KATAKANA LETTER BI
+    { 0x0000, 0x0000 },	// 0x30d4 KATAKANA LETTER PI
+    { 0x30d6, 0x30d7 },	// 0x30d5 KATAKANA LETTER HU --> KATAKANA LETTER BU or KATAKANA LETTER PU
+    { 0x0000, 0x0000 },	// 0x30d6 KATAKANA LETTER BU
+    { 0x0000, 0x0000 },	// 0x30d7 KATAKANA LETTER PU
+    { 0x30d9, 0x30da },	// 0x30d8 KATAKANA LETTER HE --> KATAKANA LETTER BE or KATAKANA LETTER PE
+    { 0x0000, 0x0000 },	// 0x30d9 KATAKANA LETTER BE
+    { 0x0000, 0x0000 },	// 0x30da KATAKANA LETTER PE
+    { 0x30dc, 0x30dd },	// 0x30db KATAKANA LETTER HO --> KATAKANA LETTER BO or KATAKANA LETTER PO
+    { 0x0000, 0x0000 },	// 0x30dc KATAKANA LETTER BO
+    { 0x0000, 0x0000 },	// 0x30dd KATAKANA LETTER PO
+    { 0x0000, 0x0000 },	// 0x30de KATAKANA LETTER MA
+    { 0x0000, 0x0000 },	// 0x30df KATAKANA LETTER MI
+    { 0x0000, 0x0000 },	// 0x30e0 KATAKANA LETTER MU
+    { 0x0000, 0x0000 },	// 0x30e1 KATAKANA LETTER ME
+    { 0x0000, 0x0000 },	// 0x30e2 KATAKANA LETTER MO
+    { 0x0000, 0x0000 },	// 0x30e3 KATAKANA LETTER SMALL YA
+    { 0x0000, 0x0000 },	// 0x30e4 KATAKANA LETTER YA
+    { 0x0000, 0x0000 },	// 0x30e5 KATAKANA LETTER SMALL YU
+    { 0x0000, 0x0000 },	// 0x30e6 KATAKANA LETTER YU
+    { 0x0000, 0x0000 },	// 0x30e7 KATAKANA LETTER SMALL YO
+    { 0x0000, 0x0000 },	// 0x30e8 KATAKANA LETTER YO
+    { 0x0000, 0x0000 },	// 0x30e9 KATAKANA LETTER RA
+    { 0x0000, 0x0000 },	// 0x30ea KATAKANA LETTER RI
+    { 0x0000, 0x0000 },	// 0x30eb KATAKANA LETTER RU
+    { 0x0000, 0x0000 },	// 0x30ec KATAKANA LETTER RE
+    { 0x0000, 0x0000 },	// 0x30ed KATAKANA LETTER RO
+    { 0x0000, 0x0000 },	// 0x30ee KATAKANA LETTER SMALL WA
+    { 0x30f7, 0x0000 },	// 0x30ef KATAKANA LETTER WA --> KATAKANA LETTER VA
+    { 0x30f8, 0x0000 },	// 0x30f0 KATAKANA LETTER WI --> KATAKANA LETTER VI
+    { 0x30f9, 0x0000 },	// 0x30f1 KATAKANA LETTER WE --> KATAKANA LETTER VE
+    { 0x30fa, 0x0000 },	// 0x30f2 KATAKANA LETTER WO --> KATAKANA LETTER VO
+    { 0x0000, 0x0000 },	// 0x30f3 KATAKANA LETTER N
+    { 0x0000, 0x0000 },	// 0x30f4 KATAKANA LETTER VU
+    { 0x0000, 0x0000 },	// 0x30f5 KATAKANA LETTER SMALL KA
+    { 0x0000, 0x0000 },	// 0x30f6 KATAKANA LETTER SMALL KE
+    { 0x0000, 0x0000 },	// 0x30f7 KATAKANA LETTER VA
+    { 0x0000, 0x0000 },	// 0x30f8 KATAKANA LETTER VI
+    { 0x0000, 0x0000 },	// 0x30f9 KATAKANA LETTER VE
+    { 0x0000, 0x0000 },	// 0x30fa KATAKANA LETTER VO
+    { 0x0000, 0x0000 },	// 0x30fb KATAKANA MIDDLE DOT
+    { 0x0000, 0x0000 },	// 0x30fc KATAKANA-HIRAGANA PROLONGED SOUND MARK
+    { 0x0000, 0x0000 },	// 0x30fd KATAKANA ITERATION MARK
+    { 0x0000, 0x0000 },	// 0x30fe KATAKANA VOICED ITERATION MARK
+    { 0x0000, 0x0000 }	// 0x30ff 
 };
 
 
@@ -705,13 +705,13 @@ const sal_Unicode composition_table[][2] = {
   Halfwidth and Fullwidth Forms (U+FF00..U+FFEF)
   ftp://ftp.unicode.org/Public/3.0-Update/UnicodeData-3.0.0.txt
   ftp://ftp.unicode.org/Public/3.0-Update/UnicodeData-3.0.0.html
-  http://charts.unicode.org/Web/UFF00.html
+  http://charts.unicode.org/Web/UFF00.html 
 */
 
 #define HALF2FULL_NORMAL        0x01
 #define HALF2FULL_JIS_FUNCTION  0x02
-#define HALF2FULL_KATAKANA_ONLY 0x04
-
+#define HALF2FULL_KATAKANA_ONLY 0x04 
+ 
 UnicodePairWithFlag half2full[] = {
     { 0x0020, 0x3000, HALF2FULL_NORMAL },  // SPACE --> IDEOGRAPHIC SPACE
     { 0x0021, 0xFF01, HALF2FULL_NORMAL | HALF2FULL_JIS_FUNCTION },  // EXCLAMATION MARK --> FULLWIDTH EXCLAMATION MARK
@@ -945,7 +945,7 @@ UnicodePairWithFlag half2full[] = {
 
 /*
  Exceptional conversion table for JIS function
-*/
+*/    
 UnicodePairWithFlag half2fullJISException[] = {
     { 0x0022, 0x201D, HALF2FULL_JIS_FUNCTION }, // QUOTATION MARK --> RIGHT DOUBLE QUOTATION MARK
     { 0x0027, 0x2019, HALF2FULL_JIS_FUNCTION }, // APOSTROPHE --> RIGHT SINGLE QUOTATION MARK
diff --git a/l10ntools/inc/cfgmerge.hxx b/l10ntools/inc/cfgmerge.hxx
index ae0708f5ff05..8b05f4cf9b30 100644
--- a/l10ntools/inc/cfgmerge.hxx
+++ b/l10ntools/inc/cfgmerge.hxx
@@ -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,7 +56,7 @@ private:
 
     ByteStringHashMap sText;
 public:
-    CfgStackData( const ByteString &rTag, const ByteString &rId )
+    CfgStackData( const ByteString &rTag, const ByteString &rId ) 
             : sTagType( rTag ), sIdentifier( rId ) {};
 
     ByteString &GetTagType() { return sTagType; }
@@ -76,7 +76,7 @@ public:
     CfgStack() : CfgStackList( 10, 10 ) {}
     ~CfgStack();
 
-    ULONG Push( CfgStackData *pStackData );
+    ULONG Push( CfgStackData *pStackData );	
     CfgStackData *Push( const ByteString &rTag, const ByteString &rId );
     CfgStackData *Pop() { return Remove( Count() - 1 ); }
 
@@ -89,7 +89,7 @@ public:
 // class CfgParser
 //
 
-class CfgParser
+class CfgParser 
 {
 protected:
     ByteString sCurrentResTyp;
@@ -103,8 +103,8 @@ protected:
 
     BOOL bLocalize;
 
-    virtual void WorkOnText(
-        ByteString &rText,
+    virtual void WorkOnText( 
+        ByteString &rText, 
         const ByteString &nLangIndex )=0;
 
     virtual void WorkOnRessourceEnd()=0;
@@ -116,11 +116,11 @@ protected:
 private:
     int ExecuteAnalyzedToken( int nToken, char *pToken );
     std::vector<ByteString> aLanguages;
-    void AddText(
-        ByteString &rText,
+    void AddText( 
+        ByteString &rText, 
         const ByteString &rIsoLang,
         const ByteString &rResTyp );
-
+    
 BOOL IsTokenClosed( const ByteString &rToken );
 
 public:
@@ -154,14 +154,14 @@ private:
     ByteString sPath;
     std::vector<ByteString> aLanguages;
 protected:
-    void WorkOnText(
-        ByteString &rText,
+    void WorkOnText( 
+        ByteString &rText, 
         const ByteString &rIsoLang
         );
 
     void WorkOnRessourceEnd();
     void Output( const ByteString& rOutput );
-public:
+public:	
     CfgExport(
         const ByteString &rOutputFile,
         const ByteString &rProject,
@@ -180,14 +180,14 @@ private:
     MergeDataFile *pMergeDataFile;
     std::vector<ByteString> aLanguages;
     ResData *pResData;
-
+    
     BOOL bGerman;
     ByteString sFilename;
     BOOL bEnglish;
 
 protected:
-    void WorkOnText(
-        ByteString &rText,
+    void WorkOnText( 
+        ByteString &rText, 
         const ByteString &nLangIndex );
 
     void WorkOnRessourceEnd();
diff --git a/l10ntools/inc/export.hxx b/l10ntools/inc/export.hxx
index d1474503882f..1b18fbbb5f4e 100644
--- a/l10ntools/inc/export.hxx
+++ b/l10ntools/inc/export.hxx
@@ -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
@@ -24,7 +24,7 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-
+ 
 #ifndef _EXPORT_HXX
 #define _EXPORT_HXX
 
@@ -34,7 +34,7 @@
 #endif
 
 
-// #define MERGE_SOURCE_LANGUAGES <- To merge en-US and de resource
+// #define MERGE_SOURCE_LANGUAGES <- To merge en-US and de resource 
 
 #include <tools/string.hxx>
 #include <tools/list.hxx>
@@ -47,7 +47,7 @@
 #include <iterator> /* std::iterator*/
 #include <set>      /* std::set*/
 #include <vector>   /* std::vector*/
-#include <queue>
+#include <queue>    
 #include <string>
 
 #include <unistd.h>
@@ -55,7 +55,7 @@
 #include <direct.h>
 #endif
 
-#define NO_TRANSLATE_ISO        "x-no-translate"
+#define NO_TRANSLATE_ISO		"x-no-translate"
 
 #define JAPANESE_ISO "ja"
 
@@ -132,20 +132,20 @@ public:
 * Purpose: holds mandatory data to export a single res (used with ResStack)
 ******************************************************************************/
 
-#define ID_LEVEL_NULL       0x0000
-#define ID_LEVEL_AUTOID     0x0001
-#define ID_LEVEL_TEXT       0x0002
-#define ID_LEVEL_FIELDNAME  0x0003
-#define ID_LEVEL_ACCESSPATH 0x0004
+#define ID_LEVEL_NULL		0x0000
+#define ID_LEVEL_AUTOID		0x0001
+#define ID_LEVEL_TEXT		0x0002
+#define ID_LEVEL_FIELDNAME	0x0003
+#define ID_LEVEL_ACCESSPATH	0x0004
 #define ID_LEVEL_IDENTIFIER 0x0005
-#define ID_LEVEL_LISTINDEX  0x0006
+#define ID_LEVEL_LISTINDEX	0x0006
 
 class ResData
 {
 public:
     ~ResData();
     BOOL SetId( const ByteString &rId, USHORT nLevel );
-
+    
     USHORT nWidth;
     USHORT nChildIndex;
     USHORT nIdLevel;
@@ -182,22 +182,22 @@ public:
     ByteStringHashMap aFallbackData;
     ByteStringHashMap aMergedLanguages;
 
-    ExportList  *pStringList;
-    ExportList  *pUIEntries;
-    ExportList  *pItemList;
-    ExportList  *pFilterList;
+    ExportList	*pStringList;
+    ExportList	*pUIEntries;
+    ExportList	*pItemList;
+    ExportList	*pFilterList;
     ExportList  *pPairedList;
-
+ 
     ByteString sPForm;
 
     void Dump();
     void addFallbackData( ByteString& sId , const ByteString& sText );
     bool getFallbackData( ByteString& sId , ByteString& sText);
-
+    
     void addMergedLanguage( ByteString& sLang );
     bool isMerged( ByteString& sLang );
     ResData( const ByteString &rPF, const ByteString &rGId )
-            :
+            : 
             nWidth( 0 ),
             nChildIndex( 0 ),
             nIdLevel( ID_LEVEL_NULL ),
@@ -217,7 +217,7 @@ public:
             sTextTyp( "Text" ),
             pStringList( NULL ),
             pUIEntries( NULL ),
-            pItemList( NULL ),
+            pItemList( NULL ),  
             pFilterList( NULL ),
             pPairedList( NULL ),
             sPForm( rPF )
@@ -226,7 +226,7 @@ public:
         sPForm.EraseAllChars( '\r' );
     };
     ResData( const ByteString &rPF, const ByteString &rGId , const ByteString &rFilename )
-            :
+            : 			
             nChildIndex( 0 ),
             nIdLevel( ID_LEVEL_NULL ),
             bChild( FALSE ),
@@ -246,7 +246,7 @@ public:
             sTextTyp( "Text" ),
             pStringList( NULL ),
             pUIEntries( NULL ),
-            pItemList( NULL ),
+            pItemList( NULL ),  
             pFilterList( NULL ),
             pPairedList( NULL ),
             sPForm( rPF )
@@ -268,19 +268,19 @@ public:
 * Purpose: syntax check and export of *.src, called from lexer
 ******************************************************************************/
 
-#define LIST_NON                    0x0000
-#define LIST_STRING                 0x0001
-#define LIST_FILTER                 0x0002
-#define LIST_ITEM                   0x0004
+#define LIST_NON 					0x0000
+#define LIST_STRING 				0x0001
+#define LIST_FILTER					0x0002
+#define LIST_ITEM					0x0004
 #define LIST_PAIRED                 0x0005
-#define LIST_UIENTRIES              0x0008
-#define STRING_TYP_TEXT             0x0010
-#define STRING_TYP_HELPTEXT         0x0020
-#define STRING_TYP_QUICKHELPTEXT    0x0040
-#define STRING_TYP_TITLE            0x0080
+#define LIST_UIENTRIES				0x0008
+#define STRING_TYP_TEXT				0x0010
+#define	STRING_TYP_HELPTEXT			0x0020
+#define STRING_TYP_QUICKHELPTEXT	0x0040
+#define STRING_TYP_TITLE			0x0080
 
-#define MERGE_MODE_NORMAL           0x0000
-#define MERGE_MODE_LIST             0x0001
+#define MERGE_MODE_NORMAL			0x0000
+#define MERGE_MODE_LIST				0x0001
 
 DECLARE_LIST( ResStack, ResData * )
 // forwards
@@ -290,20 +290,20 @@ class ParserQueue;
 class Export
 {
 private:
-    WordTransformer *pWordTransformer;
+    WordTransformer	*pWordTransformer;
 
-    CharSet aCharSet;                   // used charset in src
+    CharSet	aCharSet;					// used charset in src
 
     SvFileStream aOutput;
+    
+    ResStack aResStack;					// stack for parsing recursive
 
-    ResStack aResStack;                 // stack for parsing recursive
-
-    ByteString sActPForm;               // hold cur. system
+    ByteString sActPForm;				// hold cur. system
 
-    BOOL bDefine;                       // cur. res. in a define?
-    BOOL bNextMustBeDefineEOL;          // define but no \ at lineend
-    ULONG nLevel;                       // res. recursiv? how deep?
-    USHORT nList;                       // cur. res. is String- or FilterList
+    BOOL bDefine;						// cur. res. in a define?
+    BOOL bNextMustBeDefineEOL;			// define but no \ at lineend
+    ULONG nLevel;						// res. recursiv? how deep?
+    USHORT nList;						// cur. res. is String- or FilterList
     ByteString nListLang;
     ULONG nListIndex;
     ULONG nListLevel;
@@ -314,20 +314,20 @@ private:
     BOOL bMergeMode;
     ByteString sMergeSrc;
     ByteString sLastListLine;
-    BOOL bError;                        // any errors while export?
+    BOOL bError;						// any errors while export?
     BOOL bReadOver;
     BOOL bDontWriteOutput;
     ByteString sLastTextTyp;
     static bool isInitialized;
     ByteString sFilename;
-
+    
 
 public:
     ParserQueue* pParseQueue; // public ?
     static ByteString sLanguages; // public ?
     static ByteString sForcedLanguages; // public ?
-
-
+    
+    
     static bool skipProject( ByteString sPrj ) ;
     static void InitLanguages( bool bMergeMode = false );
     static void InitForcedLanguages( bool bMergeMode = false );
@@ -338,19 +338,19 @@ public:
     static void RemoveUTF8ByteOrderMarker( ByteString &rString );
     static bool hasUTF8ByteOrderMarker( const ByteString &rString );
     static void RemoveUTF8ByteOrderMarkerFromFile( const ByteString &rFilename );
-    static bool fileHasUTF8ByteOrderMarker( const ByteString &rString );
+    static bool fileHasUTF8ByteOrderMarker( const ByteString &rString ); 
     static ByteString GetIsoLangByIndex( USHORT nIndex );
     static void QuotHTML( ByteString &rString );
     static bool CopyFile( const ByteString& source , const ByteString& dest );
 
     static void QuotHTMLXRM( ByteString &rString );
     static void UnquotHTML( ByteString &rString );
-
+    
     static const char* GetEnv( const char *pVar );
     static int getCurrentDirectory( rtl::OUString& base_fqurl , rtl::OUString& base );
 
     static bool isSourceLanguage( const ByteString &sLanguage );
-    static bool isAllowed( const ByteString &sLanguage );
+    static bool isAllowed( const ByteString &sLanguage );	
 
     static bool LanguageAllowed( const ByteString &nLanguage );
     static void Languages( std::vector<ByteString>::const_iterator& begin , std::vector<ByteString>::const_iterator& end );
@@ -359,7 +359,7 @@ public:
     static void getCurrentDir( std::string& dir );
 
     static void replaceEncoding( ByteString& rString );
-
+    
     static ByteString GetFallbackLanguage( const ByteString nLanguage );
     static void FillInFallbacks( ResData *pResData );
     static void FillInListFallbacks( ExportList *pList, const ByteString &nSource, const ByteString &nFallback );
@@ -367,7 +367,7 @@ public:
     static BOOL ConvertLineEnds( ByteString sSource, ByteString sDestination );
     static ByteString GetNativeFile( ByteString sSource );
     static DirEntry GetTempFile();
-
+    
     static void DumpExportList( ByteString& sListName , ExportList& aList );
     static ByteString DumpMap( ByteString& sMapName , ByteStringHashMap& aMap );
 
@@ -380,16 +380,16 @@ private:
     BOOL WriteData( ResData *pResData, BOOL bCreateNew = FALSE );// called befor dest. cur ResData
     BOOL WriteExportList( ResData *pResData, ExportList *pExportList,
                         const ByteString &rTyp, BOOL bCreateNew = FALSE );
-
+    
     ByteString MergePairedList( ByteString& sLine , ByteString& sText );
 
-    ByteString FullId();                    // creates cur. GID
-
+    ByteString FullId();					// creates cur. GID
+    
     bool PairedListFallback( ByteString& sText , ResData& aResData );
-
-    ByteString GetPairedListID      ( const ByteString& sText );
-    ByteString GetPairedListString  ( const ByteString& sText );
-    ByteString StripList    ( const ByteString& sText );
+    
+    ByteString GetPairedListID		( const ByteString& sText );
+    ByteString GetPairedListString	( const ByteString& sText );
+    ByteString StripList	( const ByteString& sText );
 
     void UnmergeUTF8( ByteString& sOrig );
     void InsertListEntry( const ByteString &rText, const ByteString &rLine );
@@ -397,7 +397,7 @@ private:
     ByteString GetText( const ByteString &rSource, int nToken );
 
     BOOL PrepareTextToMerge( ByteString &rText, USHORT nTyp,
-        ByteString &nLangIndex, ResData *pResData );
+        ByteString &nLangIndex, ResData *pResData );		
 
     void MergeRest( ResData *pResData, USHORT nMode = MERGE_MODE_NORMAL );
     void ConvertMergeContent( ByteString &rText );
@@ -416,7 +416,7 @@ public:
     ~Export();
 
     void Init();
-    int Execute( int nToken, const char * pToken ); // called from lexer
+    int Execute( int nToken, const char * pToken );	// called from lexer
     void SetError() { bError = TRUE; }
     BOOL GetError() { return bError; }
 };
@@ -445,14 +445,14 @@ private:
 public:
     PFormEntrys( const ByteString &rPForm ) : ByteString( rPForm ) {};
     ByteString Dump();
-    void InsertEntry(
+    void InsertEntry( 
                     const ByteString &nId ,
                     const ByteString &rText,
                     const ByteString &rQuickHelpText,
-                    const ByteString &rTitle
+                    const ByteString &rTitle 
                     )
         {
-
+            
             sText[ nId ] = rText;
             bTextFirst[ nId ] = true;
             sQuickHelpText[ nId ] = rQuickHelpText;
@@ -475,7 +475,7 @@ public:
 
 class MergeDataFile;
 
-class MergeData
+class MergeData 
 {
 friend class MergeDataFile;
 private:
@@ -490,7 +490,7 @@ public:
     ~MergeData();
     PFormEntrys* InsertEntry( const ByteString &rPForm );
     PFormEntrys* GetPFormEntrys( ResData *pResData );
-
+    
     void Insert( const ByteString& rPFO , PFormEntrys* pfEntrys );
     PFormEntrys* GetPFObject( const ByteString& rPFO );
 
@@ -513,28 +513,28 @@ private:
     ByteString sErrorLog;
     SvFileStream aErrLog;
     ByteStringSet aLanguageSet;
-    MergeDataHashMap aMap;
+    MergeDataHashMap aMap;  
     ByteStringHashMap aLanguageMap;
     std::vector<ByteString> aLanguageList;
     ByteStringHashMap aFilenames;
-
+    
 
 public:
     MergeDataFile( const ByteString &rFileName, const ByteString& rFile , BOOL bErrLog, CharSet aCharSet, bool bCaseSensitive = false );
     ~MergeDataFile();
-
-
+    
+    
     std::vector<ByteString> GetLanguages();
     MergeData *GetMergeData( ResData *pResData , bool bCaseSensitve = false );
-
+    
     PFormEntrys *GetPFormEntrys( ResData *pResData );
     PFormEntrys *GetPFormEntrysCaseSensitive( ResData *pResData );
 
     void InsertEntry( const ByteString &rTYP, const ByteString &rGID, const ByteString &rLID,
-                const ByteString &rPFO,
+                const ByteString &rPFO, 
                 const ByteString &nLang , const ByteString &rTEXT,
-                const ByteString &rQHTEXT, const ByteString &rTITLE ,
-                const ByteString &sFilename , bool bCaseSensitive
+                const ByteString &rQHTEXT, const ByteString &rTITLE , 
+                const ByteString &sFilename , bool bCaseSensitive 
                 );
     static USHORT GetLangIndex( USHORT nId );
     static ByteString CreateKey( const ByteString& rTYP , const ByteString& rGID , const ByteString& rLID , const ByteString& rFilename , bool bCaseSensitive = false );
@@ -555,7 +555,7 @@ public:
 class ParserQueue
 {
 public:
-
+    
     ParserQueue( Export& aExportObj );
     ~ParserQueue();
 
@@ -564,12 +564,12 @@ public:
     bool bNextIsM;   // public ?
     bool bLastWasM;   // public ?
     bool bMflag;   // public ?
-
+    
     void Close();
 private:
     // Future / Next
     std::queue<QueueEntry>* aQueueNext;
-    // Current
+    // Current 
     std::queue<QueueEntry>* aQueueCur;
     // Ref
     std::queue<QueueEntry>* aQref;
diff --git a/l10ntools/inc/gsicheck.hxx b/l10ntools/inc/gsicheck.hxx
index fb1eecd38c82..c0c3f7ab48c6 100644
--- a/l10ntools/inc/gsicheck.hxx
+++ b/l10ntools/inc/gsicheck.hxx
@@ -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
@@ -34,7 +34,7 @@
 // class GSILine
 //
 enum LineFormat { FORMAT_GSI, FORMAT_SDF, FORMAT_UNKNOWN };
-
+             
 class GSILine : public ByteString
 {
 private:
diff --git a/l10ntools/inc/helpmerge.hxx b/l10ntools/inc/helpmerge.hxx
index cfa221bc6055..3dcdd6552b2f 100644
--- a/l10ntools/inc/helpmerge.hxx
+++ b/l10ntools/inc/helpmerge.hxx
@@ -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
@@ -42,15 +42,15 @@ private:
     ByteString sHelpFile;
     bool       bUTF8;
     bool       bHasInputList;
-
-/// Copy fallback language String (ENUS,DE) into position of the numeric language iso code
+    
+/// Copy fallback language String (ENUS,DE) into position of the numeric language iso code 
 /// @PRECOND 0 < langIdx_in < MAX_IDX
     static void FillInFallbacks( LangHashMap& rElem_out, ByteString sLangIdx_in );
 
 /// Debugmethod, prints the content of the map to stdout
     static  void Dump(  LangHashMap* rElem_in , const ByteString sKey_in );
 
-/// Debugmethod, prints the content of the map to stdout
+/// Debugmethod, prints the content of the map to stdout    
     static  void Dump(  XMLHashMap* rElem_in ) ;
 
 
@@ -63,13 +63,13 @@ public:
 /// @PRECOND rHelpFile is valid
     static bool CreateSDF( const ByteString &rSDFFile_in, const ByteString &rPrj_in, const ByteString &rRoot_in,
                            const ByteString &sHelpFile, XMLFile *pXmlFile, const ByteString &rGsi1 );
-
+    
     static  void parse_languages( std::vector<ByteString>& aLanguages , MergeDataFile& aMergeDataFile );
 
-/// Method merges the String from the SDFfile into XMLfile. Both Strings must
-/// point to existing files.
+/// Method merges the String from the SDFfile into XMLfile. Both Strings must 
+/// point to existing files. 
     bool Merge( const ByteString &rSDFFile_in, const ByteString &rDestinationFile_in , ByteString& sLanguage , MergeDataFile& aMergeDataFile );
-    bool Merge( const ByteString &rSDFFile, const ByteString &rPathX , const ByteString &rPathY , bool bISO
+    bool Merge( const ByteString &rSDFFile, const ByteString &rPathX , const ByteString &rPathY , bool bISO 
         , const std::vector<ByteString>& aLanguages , MergeDataFile& aMergeDataFile , bool bCreateDir );
 
 private:
diff --git a/l10ntools/inc/inireader.hxx b/l10ntools/inc/inireader.hxx
index 0861290adf9f..175ec30e94f6 100644
--- a/l10ntools/inc/inireader.hxx
+++ b/l10ntools/inc/inireader.hxx
@@ -21,14 +21,14 @@ typedef std::hash_map< string, stringmap* > INImap;
 class INIreader
 {
     private:
-        UErrorCode section_status;
-        UErrorCode parameter_status;
+        UErrorCode section_status;  
+        UErrorCode parameter_status; 
         RegexMatcher* section_match;
         RegexMatcher* parameter_match;
 
-    public:
+    public: 
         INIreader(): section_status   ( U_ZERO_ERROR ) ,
-                     parameter_status ( U_ZERO_ERROR )
+                     parameter_status ( U_ZERO_ERROR ) 
         {
                      section_match   = new RegexMatcher   ( "^\\s*\\[([a-zA-Z0-9]*)\\].*" , 0 , section_status );
                      parameter_match = new RegexMatcher   ( "^\\s*([a-zA-Z0-9]*)\\s*=\\s*([a-zA-Z0-9 ]*).*" , 0 , parameter_status ) ;
@@ -38,9 +38,9 @@ class INIreader
             delete section_match;
             delete parameter_match;
         }
-        // open "filename", fill hash_map with sections / paramaters
+        // open "filename", fill hash_map with sections / paramaters 
         bool read( INImap& myMap , string& filename );
-
+       
     private:
         bool is_section( string& line , string& section_str );
         bool is_parameter( string& line , string& parameter_key , string& parameter_value );
diff --git a/l10ntools/inc/l10ntools/directory.hxx b/l10ntools/inc/l10ntools/directory.hxx
index 6b71f59435f7..53de71b61a4e 100644
--- a/l10ntools/inc/l10ntools/directory.hxx
+++ b/l10ntools/inc/l10ntools/directory.hxx
@@ -48,7 +48,7 @@ class Directory
     Directory( const rtl::OUString sFullPath , const rtl::OUString sEntry ) ;
     Directory( const ByteString sFullPath );
 
-    static bool lessDir ( const Directory& rKey1, const Directory& rKey2 ) ;
+    static bool lessDir ( const Directory& rKey1, const Directory& rKey2 ) ; 
 };
 
 }
diff --git a/l10ntools/inc/lngmerge.hxx b/l10ntools/inc/lngmerge.hxx
index 923da89988b6..d93d60e8aa73 100644
--- a/l10ntools/inc/lngmerge.hxx
+++ b/l10ntools/inc/lngmerge.hxx
@@ -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
@@ -29,12 +29,12 @@
 
 DECLARE_LIST( LngLineList, ByteString * )
 
-#define LNG_OK              0x0000
-#define LNG_FILE_NOTFOUND   0x0001
-#define LNG_COULD_NOT_OPEN  0x0002
-#define SDF_OK              0x0003
-#define SDF_FILE_NOTFOUND   0x0004
-#define SDF_COULD_NOT_OPEN  0x0005
+#define LNG_OK				0x0000
+#define LNG_FILE_NOTFOUND	0x0001
+#define LNG_COULD_NOT_OPEN	0x0002
+#define SDF_OK				0x0003
+#define SDF_FILE_NOTFOUND	0x0004
+#define SDF_COULD_NOT_OPEN	0x0005
 
 //
 // class LngParser
@@ -54,11 +54,11 @@ private:
     void FillInFallbacks( ByteStringHashMap Text );
     bool isNextGroup(  ByteString &sGroup_out , ByteString &sLine_in);
     void ReadLine( const ByteString &sLine_in , ByteStringHashMap &rText_inout );
-    void WriteSDF( SvFileStream &aSDFStream , ByteStringHashMap &rText_inout ,
-                    const ByteString &rPrj ,
+    void WriteSDF( SvFileStream &aSDFStream , ByteStringHashMap &rText_inout ,	
+                    const ByteString &rPrj , 
                     const ByteString &rRoot , const ByteString &sActFileName , const ByteString &sID );
 public:
-    LngParser( const ByteString &rLngFile, BOOL bUTF8, BOOL bULFFormat, bool bQuiet_in );
+    LngParser( const ByteString &rLngFile, BOOL bUTF8, BOOL bULFFormat );
     ~LngParser();
 
     BOOL CreateSDF( const ByteString &rSDFFile, const ByteString &rPrj, const ByteString &rRoot );
diff --git a/l10ntools/inc/pch/precompiled_l10ntools.cxx b/l10ntools/inc/pch/precompiled_l10ntools.cxx
index 3ee4157f7bb3..bfc7c57d3fde 100644
--- a/l10ntools/inc/pch/precompiled_l10ntools.cxx
+++ b/l10ntools/inc/pch/precompiled_l10ntools.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
diff --git a/l10ntools/inc/pch/precompiled_l10ntools.hxx b/l10ntools/inc/pch/precompiled_l10ntools.hxx
index ea5d5ea28683..d5635d2cce0f 100644
--- a/l10ntools/inc/pch/precompiled_l10ntools.hxx
+++ b/l10ntools/inc/pch/precompiled_l10ntools.hxx
@@ -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
diff --git a/l10ntools/inc/srciter.hxx b/l10ntools/inc/srciter.hxx
index 36061346fe16..4e4b1f50d82d 100644
--- a/l10ntools/inc/srciter.hxx
+++ b/l10ntools/inc/srciter.hxx
@@ -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
@@ -38,20 +38,20 @@ class SourceTreeIterator
 private:
     transex::Directory aRootDirectory;
     bool bInExecute;
-
+        
     void ExecuteDirectory( transex::Directory& pDirectory );
 
 protected:
     bool bLocal;
     bool bSkipLinks;
-
+    
 public:
     SourceTreeIterator( const ByteString &rRootDirectory, const ByteString &rVersion , bool bLocal_in = false);
     virtual ~SourceTreeIterator();
 
     BOOL StartExecute();
     void EndExecute();
-
+    
     virtual void OnExecuteDirectory( const rtl::OUString &rDirectory );
 };
 
diff --git a/l10ntools/inc/tagtest.hxx b/l10ntools/inc/tagtest.hxx
index 3e9b03916f4f..40ad4c34b23f 100644
--- a/l10ntools/inc/tagtest.hxx
+++ b/l10ntools/inc/tagtest.hxx
@@ -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
@@ -132,89 +132,89 @@ public:
 };
 
 
-#define TAG_GROUPMASK               0xF000
-#define TAG_GROUPSHIFT              12
-
-#define TAG_GROUP( nTag )           (( nTag & TAG_GROUPMASK ) >> TAG_GROUPSHIFT )
-#define TAG_NOGROUP( nTag )         ( nTag & ~TAG_GROUPMASK )   // ~ = Bitweises NOT
-
-#define TAG_NOMORETAGS              0x0
-
-#define TAG_GROUP_FORMAT            0x1
-#define TAG_ON                      0x100
-#define TAG_BOLDON                  ( TAG_GROUP_FORMAT << TAG_GROUPSHIFT | TAG_ON | 0x001 )
-#define TAG_BOLDOFF                 ( TAG_GROUP_FORMAT << TAG_GROUPSHIFT |          0x001 )
-#define TAG_ITALICON                ( TAG_GROUP_FORMAT << TAG_GROUPSHIFT | TAG_ON | 0x002 )
-#define TAG_ITALICOFF               ( TAG_GROUP_FORMAT << TAG_GROUPSHIFT |          0x002 )
-#define TAG_UNDERLINEON             ( TAG_GROUP_FORMAT << TAG_GROUPSHIFT | TAG_ON | 0x004 )
-#define TAG_UNDERLINEOFF            ( TAG_GROUP_FORMAT << TAG_GROUPSHIFT |          0x004 )
-
-#define TAG_GROUP_NOTALLOWED        0x2
-#define TAG_HELPID                  ( TAG_GROUP_NOTALLOWED << TAG_GROUPSHIFT | 0x001 )
-#define TAG_MODIFY                  ( TAG_GROUP_NOTALLOWED << TAG_GROUPSHIFT | 0x002 )
-#define TAG_REFNR                   ( TAG_GROUP_NOTALLOWED << TAG_GROUPSHIFT | 0x004 )
-
-#define TAG_GROUP_STRUCTURE         0x3
-#define TAG_NAME                    ( TAG_GROUP_STRUCTURE << TAG_GROUPSHIFT | 0x001 )
-#define TAG_HREF                    ( TAG_GROUP_STRUCTURE << TAG_GROUPSHIFT | 0x002 )
-#define TAG_AVIS                    ( TAG_GROUP_STRUCTURE << TAG_GROUPSHIFT | 0x004 )
-#define TAG_AHID                    ( TAG_GROUP_STRUCTURE << TAG_GROUPSHIFT | 0x008 )
-
-#define TAG_TITEL                   ( TAG_GROUP_STRUCTURE << TAG_GROUPSHIFT | 0x020 )
-#define TAG_KEY                     ( TAG_GROUP_STRUCTURE << TAG_GROUPSHIFT | 0x040 )
-#define TAG_INDEX                   ( TAG_GROUP_STRUCTURE << TAG_GROUPSHIFT | 0x080 )
-
-#define TAG_REFSTART                ( TAG_GROUP_STRUCTURE << TAG_GROUPSHIFT | 0x100 )
-
-#define TAG_GRAPHIC                 ( TAG_GROUP_STRUCTURE << TAG_GROUPSHIFT | 0x200 )
-#define TAG_NEXTVERSION             ( TAG_GROUP_STRUCTURE << TAG_GROUPSHIFT | 0x400 )
-
-#define TAG_GROUP_SYSSWITCH         0x4
-#define TAG_WIN                     ( TAG_GROUP_SYSSWITCH << TAG_GROUPSHIFT | 0x001 )
-#define TAG_UNIX                    ( TAG_GROUP_SYSSWITCH << TAG_GROUPSHIFT | 0x002 )
-#define TAG_MAC                     ( TAG_GROUP_SYSSWITCH << TAG_GROUPSHIFT | 0x004 )
-#define TAG_OS2                     ( TAG_GROUP_SYSSWITCH << TAG_GROUPSHIFT | 0x008 )
-
-#define TAG_GROUP_PROGSWITCH        0x5
-#define TAG_WRITER                  ( TAG_GROUP_PROGSWITCH << TAG_GROUPSHIFT | 0x001 )
-#define TAG_CALC                    ( TAG_GROUP_PROGSWITCH << TAG_GROUPSHIFT | 0x002 )
-#define TAG_DRAW                    ( TAG_GROUP_PROGSWITCH << TAG_GROUPSHIFT | 0x004 )
-#define TAG_IMPRESS                 ( TAG_GROUP_PROGSWITCH << TAG_GROUPSHIFT | 0x008 )
-#define TAG_SCHEDULE                ( TAG_GROUP_PROGSWITCH << TAG_GROUPSHIFT | 0x010 )
-#define TAG_IMAGE                   ( TAG_GROUP_PROGSWITCH << TAG_GROUPSHIFT | 0x020 )
-#define TAG_MATH                    ( TAG_GROUP_PROGSWITCH << TAG_GROUPSHIFT | 0x040 )
-#define TAG_CHART                   ( TAG_GROUP_PROGSWITCH << TAG_GROUPSHIFT | 0x080 )
-#define TAG_OFFICE                  ( TAG_GROUP_PROGSWITCH << TAG_GROUPSHIFT | 0x100 )
-
-
-#define TAG_GROUP_META              0x6
-#define TAG_OFFICEFULLNAME          ( TAG_GROUP_META << TAG_GROUPSHIFT | 0x001 )
-#define TAG_OFFICENAME              ( TAG_GROUP_META << TAG_GROUPSHIFT | 0x002 )
-#define TAG_OFFICEPATH              ( TAG_GROUP_META << TAG_GROUPSHIFT | 0x004 )
-#define TAG_OFFICEVERSION           ( TAG_GROUP_META << TAG_GROUPSHIFT | 0x008 )
-#define TAG_PORTALNAME              ( TAG_GROUP_META << TAG_GROUPSHIFT | 0x010 )
-#define TAG_PORTALFULLNAME          ( TAG_GROUP_META << TAG_GROUPSHIFT | 0x020 )
-#define TAG_PORTALPATH              ( TAG_GROUP_META << TAG_GROUPSHIFT | 0x040 )
-#define TAG_PORTALVERSION           ( TAG_GROUP_META << TAG_GROUPSHIFT | 0x080 )
-#define TAG_PORTALSHORTNAME         ( TAG_GROUP_META << TAG_GROUPSHIFT | 0x100 )
+#define TAG_GROUPMASK				0xF000
+#define TAG_GROUPSHIFT				12
+
+#define TAG_GROUP( nTag )			(( nTag & TAG_GROUPMASK ) >> TAG_GROUPSHIFT )
+#define TAG_NOGROUP( nTag )			( nTag & ~TAG_GROUPMASK )	// ~ = Bitweises NOT
+
+#define TAG_NOMORETAGS				0x0
+
+#define TAG_GROUP_FORMAT			0x1
+#define TAG_ON						0x100
+#define TAG_BOLDON					( TAG_GROUP_FORMAT << TAG_GROUPSHIFT | TAG_ON | 0x001 )
+#define TAG_BOLDOFF					( TAG_GROUP_FORMAT << TAG_GROUPSHIFT |          0x001 )
+#define TAG_ITALICON				( TAG_GROUP_FORMAT << TAG_GROUPSHIFT | TAG_ON | 0x002 )
+#define TAG_ITALICOFF				( TAG_GROUP_FORMAT << TAG_GROUPSHIFT |          0x002 )
+#define TAG_UNDERLINEON				( TAG_GROUP_FORMAT << TAG_GROUPSHIFT | TAG_ON | 0x004 )
+#define TAG_UNDERLINEOFF			( TAG_GROUP_FORMAT << TAG_GROUPSHIFT |          0x004 )
+
+#define TAG_GROUP_NOTALLOWED		0x2
+#define TAG_HELPID					( TAG_GROUP_NOTALLOWED << TAG_GROUPSHIFT | 0x001 )
+#define TAG_MODIFY					( TAG_GROUP_NOTALLOWED << TAG_GROUPSHIFT | 0x002 )
+#define TAG_REFNR					( TAG_GROUP_NOTALLOWED << TAG_GROUPSHIFT | 0x004 )
+
+#define TAG_GROUP_STRUCTURE			0x3
+#define TAG_NAME					( TAG_GROUP_STRUCTURE << TAG_GROUPSHIFT | 0x001 )
+#define TAG_HREF					( TAG_GROUP_STRUCTURE << TAG_GROUPSHIFT | 0x002 )
+#define TAG_AVIS					( TAG_GROUP_STRUCTURE << TAG_GROUPSHIFT | 0x004 )
+#define TAG_AHID					( TAG_GROUP_STRUCTURE << TAG_GROUPSHIFT | 0x008 )
+
+#define TAG_TITEL					( TAG_GROUP_STRUCTURE << TAG_GROUPSHIFT | 0x020 )
+#define TAG_KEY						( TAG_GROUP_STRUCTURE << TAG_GROUPSHIFT | 0x040 )
+#define TAG_INDEX					( TAG_GROUP_STRUCTURE << TAG_GROUPSHIFT | 0x080 )
+
+#define TAG_REFSTART				( TAG_GROUP_STRUCTURE << TAG_GROUPSHIFT | 0x100 )
+
+#define TAG_GRAPHIC					( TAG_GROUP_STRUCTURE << TAG_GROUPSHIFT | 0x200 )
+#define TAG_NEXTVERSION				( TAG_GROUP_STRUCTURE << TAG_GROUPSHIFT | 0x400 )
+
+#define TAG_GROUP_SYSSWITCH			0x4
+#define TAG_WIN						( TAG_GROUP_SYSSWITCH << TAG_GROUPSHIFT | 0x001 )
+#define TAG_UNIX					( TAG_GROUP_SYSSWITCH << TAG_GROUPSHIFT | 0x002 )
+#define TAG_MAC						( TAG_GROUP_SYSSWITCH << TAG_GROUPSHIFT | 0x004 )
+#define TAG_OS2						( TAG_GROUP_SYSSWITCH << TAG_GROUPSHIFT | 0x008 )
+
+#define TAG_GROUP_PROGSWITCH		0x5
+#define TAG_WRITER					( TAG_GROUP_PROGSWITCH << TAG_GROUPSHIFT | 0x001 )
+#define TAG_CALC					( TAG_GROUP_PROGSWITCH << TAG_GROUPSHIFT | 0x002 )
+#define TAG_DRAW					( TAG_GROUP_PROGSWITCH << TAG_GROUPSHIFT | 0x004 )
+#define TAG_IMPRESS					( TAG_GROUP_PROGSWITCH << TAG_GROUPSHIFT | 0x008 )
+#define TAG_SCHEDULE				( TAG_GROUP_PROGSWITCH << TAG_GROUPSHIFT | 0x010 )
+#define TAG_IMAGE					( TAG_GROUP_PROGSWITCH << TAG_GROUPSHIFT | 0x020 )
+#define TAG_MATH					( TAG_GROUP_PROGSWITCH << TAG_GROUPSHIFT | 0x040 )
+#define TAG_CHART					( TAG_GROUP_PROGSWITCH << TAG_GROUPSHIFT | 0x080 )
+#define TAG_OFFICE					( TAG_GROUP_PROGSWITCH << TAG_GROUPSHIFT | 0x100 )
+
+
+#define TAG_GROUP_META				0x6
+#define TAG_OFFICEFULLNAME			( TAG_GROUP_META << TAG_GROUPSHIFT | 0x001 )
+#define TAG_OFFICENAME				( TAG_GROUP_META << TAG_GROUPSHIFT | 0x002 )
+#define TAG_OFFICEPATH				( TAG_GROUP_META << TAG_GROUPSHIFT | 0x004 )
+#define TAG_OFFICEVERSION			( TAG_GROUP_META << TAG_GROUPSHIFT | 0x008 )
+#define TAG_PORTALNAME				( TAG_GROUP_META << TAG_GROUPSHIFT | 0x010 )
+#define TAG_PORTALFULLNAME			( TAG_GROUP_META << TAG_GROUPSHIFT | 0x020 )
+#define TAG_PORTALPATH				( TAG_GROUP_META << TAG_GROUPSHIFT | 0x040 )
+#define TAG_PORTALVERSION			( TAG_GROUP_META << TAG_GROUPSHIFT | 0x080 )
+#define TAG_PORTALSHORTNAME			( TAG_GROUP_META << TAG_GROUPSHIFT | 0x100 )
 
 
 #define TAG_GROUP_SINGLE            0x7
 #define TAG_REFINSERT               ( TAG_GROUP_SINGLE << TAG_GROUPSHIFT | 0x001 )
 
 
-#define TAG_GROUP_MULTI             0x8
-#define TAG_END                     ( TAG_GROUP_MULTI << TAG_GROUPSHIFT | 0x010 )
-#define TAG_ELSE                    ( TAG_GROUP_MULTI << TAG_GROUPSHIFT | 0x020 )
-#define TAG_AEND                    ( TAG_GROUP_MULTI << TAG_GROUPSHIFT | 0x040 )
-#define TAG_VERSIONEND              ( TAG_GROUP_MULTI << TAG_GROUPSHIFT | 0x080 )
-#define TAG_ENDGRAPHIC              ( TAG_GROUP_MULTI << TAG_GROUPSHIFT | 0x100 )
+#define TAG_GROUP_MULTI				0x8
+#define TAG_END						( TAG_GROUP_MULTI << TAG_GROUPSHIFT | 0x010 )
+#define TAG_ELSE					( TAG_GROUP_MULTI << TAG_GROUPSHIFT | 0x020 )
+#define TAG_AEND					( TAG_GROUP_MULTI << TAG_GROUPSHIFT | 0x040 )
+#define TAG_VERSIONEND				( TAG_GROUP_MULTI << TAG_GROUPSHIFT | 0x080 )
+#define TAG_ENDGRAPHIC				( TAG_GROUP_MULTI << TAG_GROUPSHIFT | 0x100 )
 
-#define TAG_GROUP_MISC              0x9
-#define TAG_COMMONSTART             ( TAG_GROUP_MISC << TAG_GROUPSHIFT | 0x001 )
-#define TAG_COMMONEND               ( TAG_GROUP_MISC << TAG_GROUPSHIFT | 0x002 )
+#define TAG_GROUP_MISC				0x9
+#define TAG_COMMONSTART				( TAG_GROUP_MISC << TAG_GROUPSHIFT | 0x001 )
+#define TAG_COMMONEND				( TAG_GROUP_MISC << TAG_GROUPSHIFT | 0x002 )
 
-#define TAG_UNKNOWN_TAG             ( TAG_GROUP_MULTI << TAG_GROUPSHIFT | 0x800 )
+#define TAG_UNKNOWN_TAG				( TAG_GROUP_MULTI << TAG_GROUPSHIFT | 0x800 )
 
 DECLARE_LIST( TokenListImpl, TokenInfo* )
 
@@ -233,31 +233,31 @@ public:
     TokenList() : TokenListImpl(){};
     ~TokenList(){ Clear(); };
 
-    void        Clear()
+    void		Clear()
         {
             for ( ULONG i = 0 ; i < Count() ; i++ )
                 delete TokenListImpl::GetObject( i );
             TokenListImpl::Clear();
         }
-    void        Insert( TokenInfo p, ULONG nIndex = LIST_APPEND )
+    void		Insert( TokenInfo p, ULONG nIndex = LIST_APPEND )
         { TokenListImpl::Insert( new TokenInfo(p), nIndex ); }
-/*    TokenInfo     Remove( ULONG nIndex )
+/*    TokenInfo		Remove( ULONG nIndex )
         {
             TokenInfo aT = GetObject( nIndex );
             delete TokenListImpl::GetObject( nIndex );
             TokenListImpl::Remove( nIndex );
             return aT;
         }*/
-//    TokenInfo     Remove( TokenInfo p ){ return Remove( GetPos( p ) ); }
-//    TokenInfo     GetCurObject() const { return *TokenListImpl::GetCurObject(); }
-    TokenInfo&      GetObject( ULONG nIndex ) const
+//    TokenInfo		Remove( TokenInfo p ){ return Remove( GetPos( p ) ); }
+//    TokenInfo		GetCurObject() const { return *TokenListImpl::GetCurObject(); }
+    TokenInfo&		GetObject( ULONG nIndex ) const
         {
-//          if ( TokenListImpl::GetObject(nIndex) )
+//			if ( TokenListImpl::GetObject(nIndex) )
                 return *TokenListImpl::GetObject(nIndex);
-//          else
-//              return TokenInfo();
+//			else
+//				return TokenInfo();
         }
-/*    ULONG     GetPos( const TokenInfo p ) const
+/*    ULONG		GetPos( const TokenInfo p ) const
         {
             for ( ULONG i = 0 ; i < Count() ; i++ )
                 if ( p == GetObject( i ) )
@@ -266,7 +266,7 @@ public:
         }*/
 
     TokenList( const TokenList& rList );
-/*      {
+/*		{
             for ( ULONG i = 0 ; i < rList.Count() ; i++ )
             {
                 Insert( rList.GetObject( i ), LIST_APPEND );
@@ -362,8 +362,8 @@ class TokenParser
 public:
     TokenParser();
     void Parse( const String &aCode, ParserMessageList* pList );
-//  ParserMessageList& GetErrors(){ return aErrorList; }
-//  BOOL HasErrors(){ return ( aErrorList.Count() > 0 ); }
+//	ParserMessageList& GetErrors(){ return aErrorList; }
+//	BOOL HasErrors(){ return ( aErrorList.Count() > 0 ); }
     TokenList& GetTokenList(){ return aParser.GetTokenList(); }
 };
 
@@ -380,11 +380,11 @@ public:
     void CheckReference( GSILine *aReference );
     void CheckTestee( GSILine *aTestee, BOOL bHasSourceLine, BOOL bFixTags );
 
-//  ParserMessageList& GetReferenceErrors(){ return aReferenceParser.GetErrors(); }
-//  BOOL HasReferenceErrors(){ return aReferenceParser.HasErrors(); }
+//	ParserMessageList& GetReferenceErrors(){ return aReferenceParser.GetErrors(); }
+//	BOOL HasReferenceErrors(){ return aReferenceParser.HasErrors(); }
 
-//  ParserMessageList& GetTesteeErrors(){ return aTesteeParser.GetErrors(); }
-//  BOOL HasTesteeErrors(){ return aTesteeParser.HasErrors(); }
+//	ParserMessageList& GetTesteeErrors(){ return aTesteeParser.GetErrors(); }
+//	BOOL HasTesteeErrors(){ return aTesteeParser.HasErrors(); }
 
     ParserMessageList& GetCompareWarnings(){ return aCompareWarningList; }
     BOOL HasCompareWarnings(){ return ( aCompareWarningList.Count() > 0 ); }
diff --git a/l10ntools/inc/tokens.h b/l10ntools/inc/tokens.h
index 12a06fa45ccf..199e8f9f00a2 100644
--- a/l10ntools/inc/tokens.h
+++ b/l10ntools/inc/tokens.h
@@ -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
@@ -28,82 +28,82 @@
 #ifndef _TOKENS_H
 #define _TOKENS_H
 
+/*------------------------------------------------------					*/
 /*------------------------------------------------------                    */
-/*------------------------------------------------------                    */
-/* Tokens for parsing src files                                             */
+/* Tokens for parsing src files												*/
 /*------------------------------------------------------                    */
 /*------------------------------------------------------                    */
-#define IGNOREDTOKENS       400         /* #include | #pragma | //... | ... */
-#define COMMEND             401         /*...                               */
-#define DEFINEDRES          402         /* Text = {                         */
-#define ANYTOKEN            404         /* XYZ                              */
-#define UNKNOWNTOKEN        405         /* XYZ[ \t]$                        */
-#define UNKNOWNCONSTRUCTION 406         /* XYZ ( xxx, yyy, zzz )            */
-#define UNKNOWNCHAR         407         /* .                                */
+#define IGNOREDTOKENS		400	        /* #include | #pragma | //... | ... */
+#define COMMEND				401			/*...								*/
+#define DEFINEDRES			402			/* Text = { 	                    */
+#define ANYTOKEN			404			/* XYZ                              */
+#define UNKNOWNTOKEN		405			/* XYZ[ \t]$                        */
+#define UNKNOWNCONSTRUCTION	406			/* XYZ ( xxx, yyy, zzz )            */
+#define UNKNOWNCHAR			407			/* .                                */
 /*------------------------------------------------------                    */
 /* prev. tokens will not be executed                                        */
-#define FILTER_LEVEL        500
+#define FILTER_LEVEL		500
 /* following tokens will be executed                                        */
 /*------------------------------------------------------                    */
-#define CONDITION           501         /* #if... | #endif ... | ...        */
-#define EMPTYLINE           502         /*                                  */
-#define RESSOURCE           503         /* Menu MID_TEST                    */
-#define RESSOURCEEXPR       504         /* Menu ( MID_TEST + .. )           */
-#define SMALRESSOURCE       505         /* PageItem {                       */
-#define TEXTLINE            506         /* TEXT = "hhh"                     */
-#define LONGTEXTLINE        507         /* TEXT = "hhh" TEST "HHH" ...      */
-#define TEXT                508         /* "Something like this"            */
-#define LEVELUP             509         /* {                                */
-#define LEVELDOWN           510         /* };                               */
-#define APPFONTMAPPING      511         /* MAP_APPFONT(10,10)               */
-#define ASSIGNMENT          512         /* Somathing = Anything             */
-#define LISTASSIGNMENT      513         /* ...List [xyz]=...                */
-#define LISTTEXT            514         /* < "Text" ... >                   */
-#define RSCDEFINE           515         /* #define MY_TEXT                  */
-#define RSCDEFINELEND       516         /*                                  */
-#define NEWTEXTINRES        517         /* ### Achtung : Ne...              */
-#define UIENTRIES           518         /* UIEntries = {                    */
-#define PRAGMA              519         /* #pragma ...                      */
-#define _LISTTEXT           521         /* { "Text" ... }                   */
-#define TEXTREFID           522         /* Text = 12345                     */
-#define LISTRESID           523         /* < 12345; ... >                   */
-#define _LISTRESID          523         /* { 12345; ... }                   */
+#define CONDITION			501 		/* #if... | #endif ... | ...        */
+#define EMPTYLINE			502 		/*                                  */
+#define	RESSOURCE			503			/* Menu MID_TEST                    */
+#define	RESSOURCEEXPR		504			/* Menu ( MID_TEST + .. )           */
+#define SMALRESSOURCE   	505 		/* PageItem {                       */
+#define TEXTLINE			506 		/* TEXT = "hhh"                     */
+#define LONGTEXTLINE		507			/* TEXT = "hhh" TEST "HHH" ...      */
+#define TEXT				508			/* "Something like this"            */
+#define LEVELUP				509			/* {                                */
+#define LEVELDOWN			510			/* };                               */
+#define APPFONTMAPPING		511			/* MAP_APPFONT(10,10)               */
+#define ASSIGNMENT			512			/* Somathing = Anything             */
+#define LISTASSIGNMENT		513 		/* ...List [xyz]=...                */
+#define LISTTEXT			514 		/* < "Text" ... >                   */
+#define RSCDEFINE			515			/* #define MY_TEXT                  */
+#define RSCDEFINELEND		516			/*                                  */
+#define	NEWTEXTINRES		517			/* ### Achtung : Ne... 				*/
+#define	UIENTRIES			518			/* UIEntries = {					*/
+#define PRAGMA				519			/* #pragma ...						*/
+#define _LISTTEXT			521 		/* { "Text" ... }                   */
+#define TEXTREFID			522 		/* Text = 12345                     */
+#define LISTRESID			523			/* < 12345; ... >                   */
+#define _LISTRESID			523			/* { 12345; ... }                   */
 #define NORMDEFINE          524         /* #define ...                      */
+/*------------------------------------------------------					*/
 /*------------------------------------------------------                    */
-/*------------------------------------------------------                    */
-/* Tokens for parsing cfg files                                             */
+/* Tokens for parsing cfg files												*/
 /*------------------------------------------------------                    */
 /*------------------------------------------------------                    */
-#define CFG_TAG                     501
-#define CFG_TEXT_START              505
-#define CFG_TEXT_END                506
-#define CFG_TEXTCHAR                507
-#define CFG_CLOSETAG                508
-#define CFG_UNKNOWNTAG              509
-#define CFG_TOKEN_PACKAGE           600
-#define CFG_TOKEN_COMPONENT         601
-#define CFG_TOKEN_CONFIGNAME        602
-#define CFG_TOKEN_TEMPLATE          603
-#define CFG_TOKEN_OORNAME           604
-#define CFG_TOKEN_OORVALUE          605
-#define CFG_TOKEN_NO_TRANSLATE      606
+#define CFG_TAG						501
+#define CFG_TEXT_START				505
+#define CFG_TEXT_END				506
+#define CFG_TEXTCHAR				507
+#define CFG_CLOSETAG				508
+#define CFG_UNKNOWNTAG				509
+#define CFG_TOKEN_PACKAGE			600
+#define CFG_TOKEN_COMPONENT			601
+#define CFG_TOKEN_CONFIGNAME		602
+#define CFG_TOKEN_TEMPLATE			603
+#define CFG_TOKEN_OORNAME			604
+#define CFG_TOKEN_OORVALUE			605
+#define CFG_TOKEN_NO_TRANSLATE		606
 
+/*------------------------------------------------------					*/
 /*------------------------------------------------------                    */
+/* Tokens for parsing xrm files												*/
 /*------------------------------------------------------                    */
-/* Tokens for parsing xrm files                                             */
 /*------------------------------------------------------                    */
-/*------------------------------------------------------                    */
-#define XRM_README_START            501
-#define XRM_README_END              502
-#define XRM_SECTION_START           503
-#define XRM_SECTION_END             504
-#define XRM_PARAGRAPH_START         505
-#define XRM_PARAGRAPH_END           506
-#define XRM_TEXT_START              507
-#define XRM_TEXT_END                508
-#define XRM_LIST_START              509
-#define XRM_LIST_END                510
-#define XML_TEXTCHAR                600
-
+#define XRM_README_START			501
+#define XRM_README_END				502
+#define XRM_SECTION_START			503
+#define XRM_SECTION_END				504
+#define XRM_PARAGRAPH_START			505
+#define XRM_PARAGRAPH_END  			506
+#define XRM_TEXT_START  			507
+#define XRM_TEXT_END	  			508
+#define XRM_LIST_START  			509
+#define XRM_LIST_END	  			510
+#define XML_TEXTCHAR				600
 
+ 
 #endif
diff --git a/l10ntools/inc/treeconfig.hxx b/l10ntools/inc/treeconfig.hxx
index 96d693b0d376..d61300401a85 100644
--- a/l10ntools/inc/treeconfig.hxx
+++ b/l10ntools/inc/treeconfig.hxx
@@ -9,14 +9,14 @@ class Treeconfig
 {
 
     private:
-        INIreader   inireader;
+        INIreader   inireader;    
         INImap      map;
         bool        has_config_file;
         void getCurrentDir( string& dir );
         bool isConfigFilePresent();
 
     public:
-
+    
         Treeconfig() : has_config_file( false ) { parseConfig(); }
         // read the config file, returns true in case a config file had been found
         bool parseConfig();
diff --git a/l10ntools/inc/utf8conv.hxx b/l10ntools/inc/utf8conv.hxx
index e4f8fbe4fd51..47aff4397489 100644
--- a/l10ntools/inc/utf8conv.hxx
+++ b/l10ntools/inc/utf8conv.hxx
@@ -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
diff --git a/l10ntools/inc/wtranode.hxx b/l10ntools/inc/wtranode.hxx
index af01a4b29d5c..2fa8faee17f0 100644
--- a/l10ntools/inc/wtranode.hxx
+++ b/l10ntools/inc/wtranode.hxx
@@ -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
@@ -40,61 +40,61 @@ typedef UINT8 BRANCH_T;
 
 
 
-const BRANCH_T C_BR_ALPHABASE   =  4;
+const BRANCH_T C_BR_ALPHABASE 	=  4;
 const BRANCH_T C_NR_OF_BRANCHES = 34;
 
 
 
 
-/** @task
+/**	@task
     This is a node of the parsing-tree which implements the fuctionality of
     class WordTransTree.
     WordTransTree is dependant of this class, but NOT the other way!
 **/
-class WTT_Node  // WordTransTree-Node
+class WTT_Node	// WordTransTree-Node
 {
   public:
     enum E_TokenType
     {
-//      no_token = 0,
+//		no_token = 0,
         token_to_keep,
         token_to_replace
     };
 
     // LIFECYCLE
                         WTT_Node(
-                            UINT8               i_nValue,   // Own branch-value.
-                            WTT_Node *          i_pDefaultBranch,
-                            WTT_Node *          i_pDefaultBranchForAlphas );
-    void                SetBranch(
+                            UINT8				i_nValue,	// Own branch-value.
+                            WTT_Node *			i_pDefaultBranch,
+                            WTT_Node *			i_pDefaultBranchForAlphas );
+    void				SetBranch(
                             UINT8               i_cBranch,
-                            WTT_Node *          i_pNode );
-    void                SetAsTokenToReplace(
-                            const ByteString &  i_sReplaceString );
+                            WTT_Node *			i_pNode );
+    void				SetAsTokenToReplace(
+                            const ByteString &	i_sReplaceString );
                         ~WTT_Node();
 
     // OPERATIONS
-    WTT_Node *          GetNextNode(
-                            UINT8               i_cBranch ); /// [0 .. C_NR_OF_BRANCHES-1], sonst GPF !!!
+    WTT_Node *			GetNextNode(
+                            UINT8				i_cBranch ); /// [0 .. C_NR_OF_BRANCHES-1], sonst GPF !!!
 
     // INQUIRY
-    E_TokenType         TokenType() const;
+    E_TokenType			TokenType() const;
     UINT8               Value() const;
-    BOOL                IsOnDeleting() const;
-    const ByteString &  ReplaceString() const;
+    BOOL				IsOnDeleting() const;
+    const ByteString &	ReplaceString() const;
 
   private:
     // DATA
-    UINT8               nValue;
-    E_TokenType         eType;
-    ByteString          sReplaceString;
-    WTT_Node *          aBranches[C_NR_OF_BRANCHES];    // Mostly DYN pointers.
-    char                bIsOnDeleting;
+    UINT8				nValue;
+    E_TokenType			eType;
+    ByteString 			sReplaceString;
+    WTT_Node *			aBranches[C_NR_OF_BRANCHES];	// Mostly DYN pointers.
+    char				bIsOnDeleting;
 };
 
 
 inline WTT_Node *
-WTT_Node::GetNextNode(UINT8 i_cBranch)
+WTT_Node::GetNextNode(UINT8	i_cBranch)
     { return aBranches[i_cBranch]; }
 inline WTT_Node::E_TokenType
 WTT_Node::TokenType() const
diff --git a/l10ntools/inc/wtratree.hxx b/l10ntools/inc/wtratree.hxx
index 6fd33a7cb413..9680d6e2ca8e 100644
--- a/l10ntools/inc/wtratree.hxx
+++ b/l10ntools/inc/wtratree.hxx
@@ -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
@@ -35,8 +35,8 @@
     // Parameters
 #include <tools/string.hxx>
 
-const INT16     C_NR_OF_WTT_RESULTS = 5;
-const INT16     C_NR_OF_POSSIBLE_CHARS = 256;
+const INT16		C_NR_OF_WTT_RESULTS = 5;
+const INT16    	C_NR_OF_POSSIBLE_CHARS = 256;
 
 
 typedef unsigned char u_char;
@@ -46,7 +46,7 @@ typedef const char * constr;
 class WTT_Node;
 
 
-/** @task
+/**	@task
     This class implements the functionality, that class WordTransformer
     offers.
     WordTransformer is dependant of this class, but NOT the other way!
@@ -62,68 +62,68 @@ class WordTransTree
     };
 
 
-    //  LIFECYCLE
+    //	LIFECYCLE
                         WordTransTree(
-                            CharSet             i_nWorkingCharSet = RTL_TEXTENCODING_MS_1252);
-    void                SetCharSet(
-                            CharSet             i_nWorkingCharSet);
+                            CharSet				i_nWorkingCharSet = RTL_TEXTENCODING_MS_1252);
+    void				SetCharSet(
+                            CharSet				i_nWorkingCharSet);
                         ~WordTransTree();
 
-    void                AddWordPair(
-                            const ByteString &      i_sOldString,
-                            const ByteString &      i_sReplaceString );
+    void				AddWordPair(
+                            const ByteString &		i_sOldString,
+                            const ByteString &		i_sReplaceString );
 
     // OPERATIONS
-    void                InitTransformation(
-                            const char *        i_sInput,               /// [!=0], a range of i_nInputLength must be valid memory for read.
-                            UINT32              i_nInputLength,
-                            UINT32              i_nOutputMaxLength = STRING_MAXLEN - 12 );
-    E_Result            TransformNextToken();
+    void				InitTransformation(
+                            const char *		i_sInput,               /// [!=0], a range of i_nInputLength must be valid memory for read.
+                            UINT32				i_nInputLength,
+                            UINT32				i_nOutputMaxLength = STRING_MAXLEN - 12 );
+    E_Result			TransformNextToken();
 
     // INQUIRY
-    BOOL                TextEndReached() const;
-    const char *        Output() const;
+    BOOL				TextEndReached() const;
+    const char *		Output() const;
 
         // These 3 functions are valid between two calls of
         //   TransformNextToken():
-    E_Result            CurResult() const;
-    ByteString          CurReplacedString() const;
-    ByteString          CurReplacingString() const;
-    char                CurHotkey() const;
+    E_Result			CurResult() const;
+    ByteString 			CurReplacedString() const;
+    ByteString	 		CurReplacingString() const;
+    char 				CurHotkey() const;
 
   private:
     // SERVICE FUNCTONS
-    UINT8               CalculateBranch(
-                            u_char              i_cInputChar ) const;
+    UINT8	  			CalculateBranch(
+                            u_char 				i_cInputChar ) const;
 
-    void                Handle_Hotkey();
-    void                Handle_TokenToKeep();
-    void                Handle_TokenToTransform();
+    void				Handle_Hotkey();
+    void				Handle_TokenToKeep();
+    void				Handle_TokenToTransform();
 
     // DATA
         // Fixed data
-    const u_char *      sInput;
+    const u_char *		sInput;
     UINT32              nInputLength;
-    const u_char *      pInputEnd;
+    const u_char *		pInputEnd;
 
-    u_char *            sOutput;                // DYN
-    UINT32              nOutputMaxLength;
+    u_char *			sOutput;				// DYN
+    UINT32				nOutputMaxLength;
 
-    WTT_Node *          dpParsingTreeTop;       // DYN
-    WTT_Node *          pUnknownAlpha;
-    u_char              cChar2Branch[C_NR_OF_POSSIBLE_CHARS];
-    u_char              c_AE, c_OE, c_UE, c_ae, c_oe, c_ue;
+    WTT_Node *			dpParsingTreeTop;		// DYN
+    WTT_Node *			pUnknownAlpha;
+    u_char		 		cChar2Branch[C_NR_OF_POSSIBLE_CHARS];
+    u_char		 		c_AE, c_OE, c_UE, c_ae, c_oe, c_ue;
 
         // Working data
-    const u_char *      pInputCurTokenStart;
-    const u_char *      pInputPosition;
-    u_char *            pOutputPosition;
-    WTT_Node *          pCurParseNode;
+    const u_char *		pInputCurTokenStart;
+    const u_char *		pInputPosition;
+    u_char *			pOutputPosition;
+    WTT_Node *			pCurParseNode;
 
         // Data which are valid only after a completed call to TransformNextToken()
-    E_Result            eCurResult;
-    u_char              cCurHotkey;             // Letter wich is used as hotkey
-    u_char              cCurHotkeySign;         // Letter which is used to assign hotkey ('~'or '&') .
+    E_Result			eCurResult;
+    u_char				cCurHotkey;            	// Letter wich is used as hotkey
+    u_char				cCurHotkeySign;       	// Letter which is used to assign hotkey ('~'or '&') .
 };
 
 
diff --git a/l10ntools/inc/xmlparse.hxx b/l10ntools/inc/xmlparse.hxx
index 69e74a83ec47..fa69c686358f 100644
--- a/l10ntools/inc/xmlparse.hxx
+++ b/l10ntools/inc/xmlparse.hxx
@@ -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
@@ -51,19 +51,19 @@ using namespace ::rtl;
 using namespace std;
 
 #include <hash_map> /* std::hashmap*/
-#include <deque>    /* std::deque*/
+#include <deque>	/* std::deque*/
 #include <iterator> /* std::iterator*/
-#include <list>     /* std::list*/
-#include <vector>   /* std::vector*/
-#define XML_NODE_TYPE_FILE          0x001
-#define XML_NODE_TYPE_ELEMENT       0x002
-#define XML_NODE_TYPE_DATA          0x003
-#define XML_NODE_TYPE_COMMENT       0x004
-#define XML_NODE_TYPE_DEFAULT       0x005
-#define MAX_LANGUAGES               99
+#include <list>		/* std::list*/
+#include <vector>	/* std::vector*/
+#define XML_NODE_TYPE_FILE			0x001                      
+#define XML_NODE_TYPE_ELEMENT		0x002
+#define XML_NODE_TYPE_DATA			0x003
+#define XML_NODE_TYPE_COMMENT		0x004
+#define XML_NODE_TYPE_DEFAULT		0x005
+#define MAX_LANGUAGES				99
 
 
-//#define TESTDRIVER        /* use xml2gsi testclass */
+//#define TESTDRIVER		/* use xml2gsi testclass */
 //-------------------------------------------------------------------------
 
 /** Holds data of Attributes
@@ -72,25 +72,25 @@ class XMLAttribute : public String
 {
 private:
     String sValue;
-
+    
 public:
     /// creates an attribute
-    XMLAttribute(
-        const String &rName,    // attributes name
-        const String &rValue    // attributes data
-    )
+    XMLAttribute( 
+        const String &rName, 	// attributes name
+        const String &rValue	// attributes data 
+    ) 
                 : String( rName ), sValue( rValue ) {}
 
     /// getting value of an attribue
     const String &GetValue() { return sValue; }
-
+    
     void setValue(const String &rValue){sValue=rValue;}
 
     /// returns true if two attributes are equal and have the same value
-    BOOL IsEqual(
-        const XMLAttribute &rAttribute  // the attribute which has to be equal
+    BOOL IsEqual( 
+        const XMLAttribute &rAttribute	// the attribute which has to be equal
     )
-    {
+    { 
         return (( rAttribute == *this ) && ( rAttribute.sValue == sValue ));
     }
 };
@@ -148,18 +148,18 @@ private:
     static int dbgcnt;
     //int         nParentPos;
 protected:
-    XMLParentNode( XMLParentNode *pPar )
-                : XMLChildNode( pPar ), pChildList( NULL )
+    XMLParentNode( XMLParentNode *pPar ) 
+                : XMLChildNode( pPar ), pChildList( NULL ) 
               {
               }
     XMLParentNode(): pChildList(NULL){
     }
     /// Copyconstructor
     XMLParentNode( const XMLParentNode& );
-
+    
     XMLParentNode& operator=(const XMLParentNode& obj);
     virtual ~XMLParentNode();
-
+    
 
 public:
     virtual USHORT GetNodeType() = 0;
@@ -168,21 +168,21 @@ public:
     XMLChildNodeList *GetChildList() { return pChildList; }
 
     /// adds a new child
-    void AddChild(
-        XMLChildNode *pChild    /// the new child
+    void AddChild( 
+        XMLChildNode *pChild  	/// the new child
     );
 
-    void AddChild(
-        XMLChildNode *pChild , int pos  /// the new child
+    void AddChild( 
+        XMLChildNode *pChild , int pos 	/// the new child
     );
-
+    
     virtual int GetPosition( ByteString id );
     int RemoveChild( XMLElement *pRefElement );
     void RemoveAndDeleteAllChilds();
 
     /// returns a child element which matches the given one
     XMLElement *GetChildElement(
-        XMLElement *pRefElement // the reference elelement
+        XMLElement *pRefElement	// the reference elelement
     );
 };
 
@@ -190,19 +190,19 @@ public:
 
 DECLARE_LIST( XMLStringList, XMLElement* )
 
-/// Mapping numeric Language code <-> XML Element
+/// Mapping numeric Language code <-> XML Element 
 typedef std::hash_map< ByteString ,XMLElement* , hashByteString,equalByteString > LangHashMap;
 
 /// Mapping XML Element string identifier <-> Language Map
-typedef std::hash_map<ByteString , LangHashMap* ,
-                      hashByteString,equalByteString>                   XMLHashMap;
+typedef std::hash_map<ByteString , LangHashMap* , 
+                      hashByteString,equalByteString>					XMLHashMap;
 
 /// Mapping iso alpha string code <-> iso numeric code
-typedef std::hash_map<ByteString, int, hashByteString,equalByteString>  HashMap;
+typedef std::hash_map<ByteString, int, hashByteString,equalByteString>	HashMap;
 
-/// Mapping XML tag names <-> have localizable strings
-typedef std::hash_map<ByteString , BOOL ,
-                      hashByteString,equalByteString>                   TagMap;
+/// Mapping XML tag names <-> have localizable strings 
+typedef std::hash_map<ByteString , BOOL , 
+                      hashByteString,equalByteString>					TagMap;
 
 /** Holds information of a XML file, is root node of tree
  */
@@ -212,52 +212,52 @@ class XMLFile : public XMLParentNode
 {
 public:
     XMLFile() ;
-    XMLFile(
+    XMLFile( 
                 const String &rFileName // the file name, empty if created from memory stream
     );
     XMLFile( const XMLFile& obj ) ;
     ~XMLFile();
-
-    ByteString* GetGroupID(std::deque<ByteString> &groupid);
-    void        Print( XMLNode *pCur = NULL, USHORT nLevel = 0 );
+    
+    ByteString*	GetGroupID(std::deque<ByteString> &groupid);
+    void 		Print( XMLNode *pCur = NULL, USHORT nLevel = 0 );
     virtual void SearchL10NElements( XMLParentNode *pCur, int pos = 0 );
-    void        Extract( XMLFile *pCur = NULL );
-    void        View();
-//  void static Signal_handler(int signo);//void*,oslSignalInfo * pInfo);
-    void        showType(XMLParentNode* node);
+    void		Extract( XMLFile *pCur = NULL );
+    void		View();
+//	void static Signal_handler(int signo);//void*,oslSignalInfo * pInfo);
+    void		showType(XMLParentNode* node);
 
     XMLHashMap* GetStrings(){return XMLStrings;}
-    BOOL        Write( ByteString &rFilename );
-    BOOL        Write( ofstream &rStream , XMLNode *pCur = NULL );
+    BOOL 		Write( ByteString &rFilename );
+    BOOL 		Write( ofstream &rStream , XMLNode *pCur = NULL );
 
     bool        CheckExportStatus( XMLParentNode *pCur = NULL );// , int pos = 0 );
 
     XMLFile&    operator=(const XMLFile& obj);
-
-    virtual USHORT  GetNodeType();
+    
+    virtual USHORT 	GetNodeType();
 
     /// returns file name
     const String &GetName() { return sFileName; }
     void          SetName( const String &rFilename ) { sFileName = rFilename; }
     void          SetFullName( const String &rFullFilename ) { sFullName = rFullFilename; }
     const std::vector<ByteString> getOrder(){ return order; }
-
+    
 protected:
     // writes a string as UTF8 with dos line ends to a given stream
     void        WriteString( ofstream &rStream, const String &sString );
-
+    
     // quotes the given text for writing to a file
-    void        QuotHTML( String &rString );
+    void 		QuotHTML( String &rString );
 
-    void        InsertL10NElement( XMLElement* pElement);
+    void		InsertL10NElement( XMLElement* pElement);
 
     // DATA
-    String      sFileName;
+    String 		sFileName;
     String      sFullName;
 
     const ByteString ID,OLDREF,XML_LANG;
 
-    TagMap      nodes_localize;
+    TagMap		nodes_localize;
     XMLHashMap* XMLStrings;
 
     std::vector <ByteString> order;
@@ -272,31 +272,31 @@ public:
     static void         QuotHTML( String &rString );
 
     /// UnQuot the XML characters and restore \n \t
-    static void         UnQuotHTML  ( String &rString );
-
-    /// Return the numeric iso language code
-    //USHORT                GetLangByIsoLang( const ByteString &rIsoLang );
+    static void         UnQuotHTML  ( String &rString );  
 
+    /// Return the numeric iso language code 
+    //USHORT		        GetLangByIsoLang( const ByteString &rIsoLang );
+    
     /// Return the alpha strings representation
-    ByteString          GetIsoLangByIndex( USHORT nIndex );
-
-    static XMLUtil&     Instance();
+    ByteString	        GetIsoLangByIndex( USHORT nIndex );
+    
+    static XMLUtil&     Instance(); 
     ~XMLUtil();
 
     void         dump();
 
 private:
-    /// Mapping iso alpha string code <-> iso numeric code
+    /// Mapping iso alpha string code <-> iso numeric code 
     HashMap      lMap;
 
-    /// Mapping iso numeric code      <-> iso alpha string code
-    ByteString   isoArray[MAX_LANGUAGES];
+    /// Mapping iso numeric code      <-> iso alpha string code 	
+    ByteString	 isoArray[MAX_LANGUAGES];
 
     static void UnQuotData( String &rString );
     static void UnQuotTags( String &rString );
 
-    XMLUtil();
-    XMLUtil(const XMLUtil&);
+    XMLUtil();				
+    XMLUtil(const XMLUtil&);	
 
 };
 
@@ -311,37 +311,37 @@ class XMLElement : public XMLParentNode
 private:
     String sElementName;
     XMLAttributeList *pAttributes;
-    ByteString   project,
+    ByteString 	 project,
                  filename,
                  id,
                  sOldRef,
                  resourceType,
                  languageId;
     int          nPos;
-
+    
 protected:
     void Print(XMLNode *pCur, OUStringBuffer& buffer , bool rootelement);
 public:
     /// create a element node
     XMLElement(){}
-    XMLElement(
-        const String &rName,    // the element name
-        XMLParentNode *Parent   // parent node of this element
-    ):          XMLParentNode( Parent ),
-                sElementName( rName ),
+    XMLElement( 
+        const String &rName, 	// the element name
+        XMLParentNode *Parent 	// parent node of this element
+    ):			XMLParentNode( Parent ), 
+                sElementName( rName ), 
                 pAttributes( NULL ),
-                project(""),
-                filename(""),
-                id(""),
-                sOldRef(""),
-                resourceType(""),
+                project(""), 
+                filename(""), 
+                id(""), 
+                sOldRef(""), 
+                resourceType(""), 
                 languageId(""),
                 nPos(0)
                    {
                 }
     ~XMLElement();
     XMLElement(const XMLElement&);
-
+    
     XMLElement& operator=(const XMLElement& obj);
     /// returns node type XML_NODE_ELEMENT
     virtual USHORT GetNodeType();
@@ -358,15 +358,15 @@ public:
     void ChangeLanguageTag( const String &rValue );
     // Return a ASCII String representation of this object
     OString ToOString();
-
+    
     // Return a Unicode String representation of this object
     OUString ToOUString();
-
-    bool    Equals(OUString refStr);
+    
+    bool	Equals(OUString refStr);
 
     /// returns a attribute
     XMLAttribute *GetAttribute(
-        const String &rName // the attribute name
+        const String &rName	// the attribute name
     );
     void SetProject         ( ByteString prj        ){ project = prj;        }
     void SetFileName        ( ByteString fn         ){ filename = fn;        }
@@ -374,10 +374,10 @@ public:
     void SetResourceType    ( ByteString rt         ){ resourceType = rt;    }
     void SetLanguageId      ( ByteString lid        ){ languageId = lid;     }
     void SetPos             ( int nPos_in           ){ nPos = nPos_in;       }
-    void SetOldRef          ( ByteString sOldRef_in ){ sOldRef = sOldRef_in; }
+    void SetOldRef          ( ByteString sOldRef_in ){ sOldRef = sOldRef_in; }    
 
     virtual int        GetPos()         { return nPos;         }
-    ByteString GetProject()     { return project;      }
+    ByteString GetProject()     { return project;      } 
     ByteString GetFileName()    { return filename;     }
     ByteString GetId()          { return id;           }
     ByteString GetOldref()      { return sOldRef;      }
@@ -399,20 +399,20 @@ private:
 
 public:
     /// create a data node
-    XMLData(
-        const String &rData,    // the initial data
-        XMLParentNode *Parent   // the parent node of this data, typically a element node
-    )
-                : XMLChildNode( Parent ), sData( rData ) , isNewCreated ( false ){}
-    XMLData(
-        const String &rData,    // the initial data
-        XMLParentNode *Parent,  // the parent node of this data, typically a element node
+    XMLData( 
+        const String &rData, 	// the initial data
+        XMLParentNode *Parent	// the parent node of this data, typically a element node 
+    ) 
+                : XMLChildNode( Parent ), sData( rData ) , isNewCreated ( false ){}	
+    XMLData( 
+        const String &rData, 	// the initial data
+        XMLParentNode *Parent,	// the parent node of this data, typically a element node 
         bool newCreated
-    )
-                : XMLChildNode( Parent ), sData( rData ) , isNewCreated ( newCreated ){}
-
+    ) 
+                : XMLChildNode( Parent ), sData( rData ) , isNewCreated ( newCreated ){}	
+    
     XMLData(const XMLData& obj);
-
+    
     XMLData& operator=(const XMLData& obj);
     virtual USHORT GetNodeType();
 
@@ -421,12 +421,12 @@ public:
 
     bool isNew() { return isNewCreated; }
     /// adds new character data to the existing one
-    void AddData(
-        const String &rData // the new data
-    );
-
-
-
+    void AddData( 
+        const String &rData	// the new data
+    ); 
+    
+    
+    
 };
 
 //-------------------------------------------------------------------------
@@ -441,17 +441,17 @@ private:
 public:
     /// create a comment node
     XMLComment(
-        const String &rComment, // the comment
-        XMLParentNode *Parent   // the parent node of this comemnt, typically a element node
+        const String &rComment,	// the comment
+        XMLParentNode *Parent	// the parent node of this comemnt, typically a element node
     )
                 : XMLChildNode( Parent ), sComment( rComment ) {}
 
     virtual USHORT GetNodeType();
 
     XMLComment( const XMLComment& obj );
-
+    
     XMLComment& operator=(const XMLComment& obj);
-
+    
     /// returns the comment
     const String &GetComment()  { return sComment; }
 };
@@ -468,15 +468,15 @@ private:
 public:
     /// create a comment node
     XMLDefault(
-        const String &rDefault, // the comment
-        XMLParentNode *Parent   // the parent node of this comemnt, typically a element node
+        const String &rDefault,	// the comment
+        XMLParentNode *Parent	// the parent node of this comemnt, typically a element node
     )
                 : XMLChildNode( Parent ), sDefault( rDefault ) {}
 
     XMLDefault(const XMLDefault& obj);
 
     XMLDefault& operator=(const XMLDefault& obj);
-
+    
     /// returns node type XML_NODE_TYPE_COMMENT
     virtual USHORT GetNodeType();
 
@@ -489,17 +489,17 @@ public:
 /** struct for error information, used by class SimpleXMLParser
  */
 struct XMLError {
-    XML_Error eCode;    // the error code
-    ULONG nLine;        // error line number
-    ULONG nColumn;      // error column number
-    String sMessage;    // readable error message
+    XML_Error eCode;	// the error code
+    ULONG nLine;       	// error line number
+    ULONG nColumn;		// error column number
+    String sMessage;   	// readable error message
 };
 
 //-------------------------------------------------------------------------
 
 /** validating xml parser, creates a document tree with xml nodes
  */
-
+ 
 
 class SimpleXMLParser
 {
@@ -510,21 +510,21 @@ private:
     XMLFile *pXMLFile;
     XMLParentNode *pCurNode;
     XMLData *pCurData;
-
-
+ 
+    
     static void StartElementHandler( void *userData, const XML_Char *name, const XML_Char **atts );
     static void EndElementHandler( void *userData, const XML_Char *name );
     static void CharacterDataHandler( void *userData, const XML_Char *s, int len );
     static void CommentHandler( void *userData, const XML_Char *data );
     static void DefaultHandler( void *userData, const XML_Char *s, int len );
-
-
+    
+    
     void StartElement( const XML_Char *name, const XML_Char **atts );
     void EndElement( const XML_Char *name );
     void CharacterData( const XML_Char *s, int len );
     void Comment( const XML_Char *data );
     void Default( const XML_Char *s, int len );
-
+    
 
 public:
     /// creates a new parser
@@ -532,15 +532,15 @@ public:
     ~SimpleXMLParser();
 
     /// parse a file, returns NULL on criticall errors
-    XMLFile *Execute(
+    XMLFile *Execute( 
         const String &rFullFileName,
-        const String &rFileName,    // the file name
+        const String &rFileName,	// the file name
         XMLFile *pXMLFileIn         // the XMLFile
     );
 
     /// parse a memory stream, returns NULL on criticall errors
-    XMLFile *Execute(
-        SvMemoryStream *pStream // the stream
+    XMLFile *Execute( 
+        SvMemoryStream *pStream	// the stream
     );
 
     /// returns an error struct
diff --git a/l10ntools/inc/xmlutil.hxx b/l10ntools/inc/xmlutil.hxx
index 812f50b85c45..18038402c749 100644
--- a/l10ntools/inc/xmlutil.hxx
+++ b/l10ntools/inc/xmlutil.hxx
@@ -1,9 +1,9 @@
-#define ENGLISH_US              1
-#define ENGLISH_US_ISO          "en-US"
-#define ENGLISH_US_PROPERTY     "en_US"
-#define ENGLISH_US_INDEX            1
-#define GERMAN_DE               4
-#define GERMAN_DE_ISO           "x-german"
-#define GERMAN_DE_INDEX             3
+#define ENGLISH_US				1
+#define ENGLISH_US_ISO			"en-US"
+#define ENGLISH_US_PROPERTY		"en_US"
+#define ENGLISH_US_INDEX			1
+#define GERMAN_DE				4
+#define GERMAN_DE_ISO			"x-german"
+#define GERMAN_DE_INDEX				3
 #define GERMAN_ISO2                     "de-DE"
 
diff --git a/l10ntools/inc/xrmmerge.hxx b/l10ntools/inc/xrmmerge.hxx
index e8c3d322c92b..eb66d8c1abd1 100644
--- a/l10ntools/inc/xrmmerge.hxx
+++ b/l10ntools/inc/xrmmerge.hxx
@@ -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
@@ -80,7 +80,7 @@ public:
 
 //
 // class XRMResOutputParser
-//
+// 
 
 class XRMResOutputParser : public XRMResParser
 {
@@ -136,7 +136,7 @@ private:
     ByteString sFilename;
     ResData *pResData;
     std::vector<ByteString> aLanguages;
-
+    
 protected:
     void WorkOnText(
         const ByteString &rOpenTag,
diff --git a/l10ntools/java/jpropex/build.xml b/l10ntools/java/jpropex/build.xml
index d74fb3975d0f..9dd6555d2723 100755
--- a/l10ntools/java/jpropex/build.xml
+++ b/l10ntools/java/jpropex/build.xml
@@ -2,17 +2,17 @@
 <!--
 
   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
-
+ 
   This file is part of OpenOffice.org.
-
+ 
   OpenOffice.org is free software: you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License version 3
   only, as published by the Free Software Foundation.
-
+ 
   OpenOffice.org is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
@@ -23,7 +23,7 @@
   version 3 along with OpenOffice.org.  If not, see
   <http://www.openoffice.org/license.html>
   for a copy of the LGPLv3 License.
-
+ 
 -->
 <project name="jpropex" default="main" basedir=".">
 
diff --git a/l10ntools/java/jpropex/java/JPropEx.java b/l10ntools/java/jpropex/java/JPropEx.java
index be59d7f29479..6d389c4082d8 100644
--- a/l10ntools/java/jpropex/java/JPropEx.java
+++ b/l10ntools/java/jpropex/java/JPropEx.java
@@ -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
@@ -43,7 +43,7 @@ public class JPropEx
     private boolean isQuiet             = false;
     private final String resourceType   = "javaproperties";
     private final String sourceLanguage = "en-US";
-
+    
     static final int JAVA_TYPE      = 0;
     static final int JAVA_ENUS_TYPE = 1;
     static final int EXTENSION_TYPE = 2;
@@ -52,23 +52,23 @@ public class JPropEx
     {
         //data = new SdfData();
     }
-
+    
     public JPropEx( String args[] )
     {
         super();
         parseArguments( args );
         testCL();
         //testArguments();
-        if( inputSdfFileArg != null && inputSdfFileArg.length() > 0 )
-            merge();
+        if( inputSdfFileArg != null && inputSdfFileArg.length() > 0 ) 
+            merge(); 
         else
             extract();
-    }
+    } 
 
     private String getSimpleArg( String[] args , int x )
     {
         if( x < args.length ) x++;
-        else
+        else 
         {
             System.err.println("ERROR: Missing arg for "+args[ x ]+"\n");
             help();
@@ -91,7 +91,7 @@ public class JPropEx
     private void testCL()
     {
         if( inputFileArg.length()>0 && ( ( pathPrefixArg.length()>0 && pathPostfixArg.length()>0 ) || outputFileArg.length()>0 ) && projectArg.length()>0 && rootArg.length()>0 && langsArg.size()>0 )
-            if( ( inputSdfFileArg.length()>0 && ( outputFileArg.length()>0 ||  ( pathPrefixArg.length()>0 && pathPostfixArg.length()>0 ) ) ) ||  ( inputFileArg.length()>0 && outputFileArg.length()>0 ) )
+            if( ( inputSdfFileArg.length()>0 && ( outputFileArg.length()>0 ||  ( pathPrefixArg.length()>0 && pathPostfixArg.length()>0 ) ) ) ||  ( inputFileArg.length()>0 && outputFileArg.length()>0 ) )  
                     return;
         System.out.println("ERROR: Strange parameters!");
         help();
@@ -105,7 +105,7 @@ public class JPropEx
         System.out.println("Extract:\njpropex -p reportbuilder -r ../../../../../../.. -i Title-Function.properties -o new.sdf -l en-US");
         System.out.println("Merge: use either ( -x path -y more_path ) or ( -o ) and ( -i filename ) or ( -i @filename ). @filename contains a list with files");
         System.out.println("jpropex -p reportbuilder -r ../../../../../../.. -x ../../../../../../../unxlngx6.pro/class/com/sun/star/report/function/metadata -y ivo -i @abc -l all -lf en-US,de,fr,pt -m ../../../../../../../common.pro/misc/reportbuilder/java/com/sun/star/report/function/metadata/localize.sdf");
-        System.out.println("jpropex -p reportbuilder -r ../../../../../../.. -x ../../../../../../../unxlngx6.pro/class/com/sun/star/report/function/metadata -y ivo -i @abc -l all -lf en-US,de,fr,pt -m ../../../../../../../common.pro/misc/reportbuilder/java/com/sun/star/report/function/metadata/localize.sdf");
+        System.out.println("jpropex -p reportbuilder -r ../../../../../../.. -x ../../../../../../../unxlngx6.pro/class/com/sun/star/report/function/metadata -y ivo -i @abc -l all -lf en-US,de,fr,pt -m ../../../../../../../common.pro/misc/reportbuilder/java/com/sun/star/report/function/metadata/localize.sdf");        
         System.out.println("jpropex -p reportbuilder -r ../../../../../../.. -o ../../../../../../../unxlngx6.pro/class/com/sun/star/report/function/metadata/ -i Title-Function.properties -l all -lf en-US,de,fr,pt -m ../../../../../../../common.pro/misc/reportbuilder/java/com/sun/star/report/function/metadata/localize.sdf");
         System.out.println("jpropex -p reportbuilder -r ../../../../../../.. -x ../../../../../../../unxlngx6.pro/class/com/sun/star/report/function/metadata -y ivooo -i Title-Function.properties -l all -lf en-US,de,fr,pt -m ../../../../../../../common.pro/misc/reportbuilder/java/com/sun/star/report/function/metadata/localize.sdf");
         System.exit( -1 );
@@ -115,7 +115,7 @@ public class JPropEx
     {
         SdfData data = new SdfData();
         java.util.Properties prop = loadProp( inputFileArg );
-
+       
         // Get a prototype that already contains the most common settings
         SdfEntity dolly = prepareSdfObj( inputFileArg );
         String key;
@@ -128,27 +128,30 @@ public class JPropEx
             currentStr  = (SdfEntity)   dolly.clone();
             // Set the new LID and the string text
             currentStr.setLid( key );
-            value            = prop.getProperty( key , "" );
+            value            = prop.getProperty( key , "" ); 
             //if( value.equals("") )  System.err.println("Warning: in file "+inputFileArg+" the string with the key "+key+" has a empty string!");
             str = (prop.getProperty( key )).replaceAll("\t" , " " );    // remove tab
             str = str.replaceAll("\n"," ");                             // remove return
-            currentStr.setText( str );
+            currentStr.setText( str );     
             if( str.length() > 0 )
                 data.add( currentStr );
         }
         data.write( outputFileArg );
     }
-
+    
     private SdfEntity prepareSdfObj( String filename )
     {
         String path = makeAbs( filename );
         //String path = makeAbs( inputFileArg );
         path = path.replace( rootArg + "/" , "" );
         path = path.replace("/","\\");
-        return new SdfEntity( projectArg , path , "" /* dummy1 */ , resourceType , "", "" , "" , "" , "" /* dummy2 */ ,
-                              sourceLanguage , "",  "" , ""  , "" , "2002-02-02 02:02:02" );
+        // TODO: Make this static
+        java.text.SimpleDateFormat dateformat = new java.text.SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        String date = dateformat.format( new Date() );
+        return new SdfEntity( projectArg , path , "0" /* dummy1 */ , resourceType , "", "" , "" , "" , "0" /* dummy2 */ , 
+                              sourceLanguage , "",  "" , ""  , "" , date );
     }
-
+    
     private void merge()
     {
         SdfData data = getSdfData();
@@ -165,7 +168,7 @@ public class JPropEx
             mergeFile( inputFileArg , data , true );
         }
     }
-
+    
     private Vector readFileList( String filename )
     {
         Vector lines = new Vector();
@@ -180,9 +183,9 @@ public class JPropEx
             System.out.println("ERROR: Can't open file '"+filename.substring( 1 )+"'");
             System.exit( -1 );
         }
-        return lines;
+        return lines; 
     }
-
+   
     private void mergeFile( String filename , SdfData data , boolean isSingleFile )
     {
         int type = detectFormat( filename );
@@ -195,7 +198,7 @@ public class JPropEx
             props.put( (String)e.nextElement() , new java.util.Properties() );
         }
         // Get a prototype that already contains the most common settings
-
+        
         SdfEntity dolly = prepareSdfObj( filename );
         String key;
         String sourceString;
@@ -214,7 +217,7 @@ public class JPropEx
                 curEntity   = (SdfEntity) curStr.clone();
                 curLang     = (String)    lang.nextElement();
                 curEntity.setLangid( curLang );
-                mergedEntity = data.get( curEntity );
+                mergedEntity = data.get( curEntity ); 
                 if( mergedEntity == null )
                 {
                     // in case there is no translation then fallback to the en-US source string
@@ -246,7 +249,7 @@ public class JPropEx
         // use of -x <path> -y <more_path>
         // -> <path>/<lang>/<more_path>
         if( pathPrefixArg != null && pathPrefixArg.length()>0 && pathPostfixArg != null && pathPostfixArg.length()>0 )
-        {
+        {    
             path = new StringBuffer().append( pathPrefixArg ).append( "/" ).append( lcLang ).append( "/" ).append( pathPostfixArg ).append( "/" ).toString();
             name += formatFilename( filename , filenameIdx , lang , type );
         }
@@ -302,7 +305,7 @@ public class JPropEx
             System.exit( -1 );
         }
     }
-
+    
     // we have different types of properties in the source code
     // each needs a different file nameing scheme
     private int detectFormat( String filename )
@@ -313,16 +316,16 @@ public class JPropEx
            return JAVA_ENUS_TYPE;
        else if( filename.endsWith( ".properties" ) )
            return JAVA_TYPE;
-
+       
        // Can not detect, exit
        System.err.println("ERROR: Invalid file name. Only allowed (case sensitive!)  *_en_US.properties , *_en_us.properties or *.properties\n");
        System.exit(-1);
        return JAVA_TYPE;    // dummy
     }
-
+    
     private String formatFilename( String filename , int filenameIdx , String lang , int type )
     {
-
+       
         if( !lang.equals( "en-US" ) )
         {
             // Parse iso code
@@ -342,8 +345,8 @@ public class JPropEx
             switch( type )
             {
                 // -> de_DE
-                case EXTENSION_TYPE:
-                    lang  =  langpart1.toLowerCase();
+                case EXTENSION_TYPE: 
+                    lang  =  langpart1.toLowerCase(); 
                     if( langpart2.length() > 0 )                    // -> en_US
                         lang += "_" + langpart2.toUpperCase();
                     else                                            // -> de_DE
@@ -382,16 +385,16 @@ public class JPropEx
     {
         Vector langs = new Vector();
 
-        if( ((String)langsArg.get( 0 )).equalsIgnoreCase( "all" ) ) // for "-l all" use all languages found in the -m sdf file
+        if( ((String)langsArg.get( 0 )).equalsIgnoreCase( "all" ) ) // for "-l all" use all languages found in the -m sdf file 
             langs.addAll( data.getLanguages() );
         else
             langs.addAll( langsArg );              // use the langs giving by -l
 
-        if( forcedLangsArg != null )
+        if( forcedLangsArg != null ) 
             langs.addAll( forcedLangsArg );
-
+        
         return removeDupes( langs );
-    }
+    } 
     private Vector removeDupes( Vector vec )
     {
         Collection coll = new LinkedHashSet( vec );
@@ -412,7 +415,7 @@ public class JPropEx
     }
     private void parseArguments( String[] args )
     {
-
+        
         if( args.length == 0 )
         {
             System.out.println("ERROR: No args???");
@@ -421,7 +424,7 @@ public class JPropEx
         }
         for( int x = 0; x < args.length ; x++ )
         {
-            if( args[ x ].equalsIgnoreCase("-i") )
+            if( args[ x ].equalsIgnoreCase("-i") ) 
             {
                 // Input resource file
                 inputFileArg = getSimpleArg( args , x );
@@ -469,7 +472,7 @@ public class JPropEx
             }
             else if( args[ x ].equalsIgnoreCase("-qq") )
             {
-                isQuiet = true;
+                isQuiet = true; 
             }
         }
     }
@@ -477,7 +480,7 @@ public class JPropEx
     {
         File file;
         try
-        {
+        {    
             file = new File( path );
             return file.getCanonicalPath();
         }catch( IOException e )
@@ -489,12 +492,12 @@ public class JPropEx
     }
 /*    private boolean testArguments()
     {
-        // nice merge
-        if( inputSdfFileArg != null && inputSdfFileArg.length()>0 )
+        // nice merge 
+        if( inputSdfFileArg != null && inputSdfFileArg.length()>0 ) 
             // nice merge
             return  projectArg != null  && rootArg != null && inputFileArg != null && pathPrefixArg != null && pathPostfixArg != null && langsArg != null &&
                     projectArg.length()>0 && rootArg.length()>0 && inputFileArg.length()>0 && pathPrefixArg.length()>0 && pathPostfixArg.length()>0 && langsArg.size()>0 ;
-        else
+        else 
             // nice extract
             return  projectArg != null && rootArg != null && inputFileArg != null && outputFileArg != null && langsArg != null &&
                     projectArg.length()>0 && rootArg.length()>0 && inputFileArg.length()>0 && outputFileArg.length()>0 && langsArg.size()>0;
diff --git a/l10ntools/java/jpropex/java/Main.java b/l10ntools/java/jpropex/java/Main.java
index 23dc477ddec3..d16d04b0644b 100644
--- a/l10ntools/java/jpropex/java/Main.java
+++ b/l10ntools/java/jpropex/java/Main.java
@@ -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
@@ -26,9 +26,9 @@
  ************************************************************************/
 
 
-class Main
+class Main 
 {
-
+    
     public static void main( String args[] )
     {
         JPropEx jpropex = new JPropEx( args );
diff --git a/l10ntools/java/jpropex/java/NoLocalizeFilter.java b/l10ntools/java/jpropex/java/NoLocalizeFilter.java
index 989ee64bfc86..c6058a46c3b6 100644
--- a/l10ntools/java/jpropex/java/NoLocalizeFilter.java
+++ b/l10ntools/java/jpropex/java/NoLocalizeFilter.java
@@ -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
@@ -33,13 +33,13 @@ import java.util.regex.*;
 public class NoLocalizeFilter extends FilterInputStream
 {
     InputStream in;
-    Pattern p = Pattern.compile("#[\\s]*x-no-translate");
+    Pattern p = Pattern.compile("#[\\s]*x-no-translate");            
 
     public NoLocalizeFilter( InputStream in ) {
         super(in);
         this.in = in;
     }
-    public int read(byte[] b, int off, int len) throws IOException
+    public int read(byte[] b, int off, int len) throws IOException 
     {
         String search = new String( b );
         Matcher m = p.matcher( search );
diff --git a/l10ntools/java/jpropex/java/OrderedHashMap.java b/l10ntools/java/jpropex/java/OrderedHashMap.java
index a462d598b307..dd8c87ec57a5 100644
--- a/l10ntools/java/jpropex/java/OrderedHashMap.java
+++ b/l10ntools/java/jpropex/java/OrderedHashMap.java
@@ -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
@@ -29,13 +29,13 @@
 import java.util.*;
 
 // LinkedHashMap implrementation
-public class OrderedHashMap
+public class OrderedHashMap 
 {
     private HashMap hm = new HashMap();
     private LinkedList list  = new LinkedList();
 
     public Iterator    iterator()   { return list.iterator(); }
-
+    
     public boolean isEmpty()        { return hm.isEmpty(); }
     public Object get( Object key ) { return hm.get( key ); }
     public Object get( int index )  { return hm.get( list.get( index ) ); }
diff --git a/l10ntools/java/jpropex/java/SdfData.java b/l10ntools/java/jpropex/java/SdfData.java
index 6f79909df1b2..d63cffec6540 100644
--- a/l10ntools/java/jpropex/java/SdfData.java
+++ b/l10ntools/java/jpropex/java/SdfData.java
@@ -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
@@ -34,7 +34,7 @@ public class SdfData
     private String          filename;
     private OrderedHashMap  ohm;
     private LinkedHashSet   languagesFound;
-
+    
     public SdfData()
     {
         languagesFound  = new LinkedHashSet();
@@ -43,7 +43,7 @@ public class SdfData
     }
     public SdfData( String filename )
     {
-        this();
+        this(); 
         this.filename = filename;
     }
 
@@ -65,7 +65,7 @@ public class SdfData
 
     public void read()
     {
-        BufferedReader in;
+        BufferedReader in; 
         try
         {
             in = new BufferedReader( new FileReader( filename ) );
diff --git a/l10ntools/java/jpropex/java/SdfEntity.java b/l10ntools/java/jpropex/java/SdfEntity.java
index c2f6a5d788b1..0be5723cc8d6 100644
--- a/l10ntools/java/jpropex/java/SdfEntity.java
+++ b/l10ntools/java/jpropex/java/SdfEntity.java
@@ -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
@@ -42,23 +42,23 @@ public class SdfEntity implements Cloneable{
     private String quickhelptext= new String("");
     private String title        = new String("");
     private String date         = new String("");
-
-    public static int PROJECT_POS       = 0;
-    public static int SOURCE_FILE_POS   = 1;
-    public static int DUMMY1_POS        = 2;
-    public static int RESOURCE_TYPE_POS = 3;
-    public static int GID_POS           = 4;
-    public static int LID_POS           = 5;
-    public static int HELPID_POS        = 6;
-    public static int PLATFORM_POS      = 7;
-    public static int DUMMY2_POS        = 8;
-    public static int LANGID_POS        = 9;
-    public static int TEXT_POS          = 10;
-    public static int HELPTEXT_POS      = 11;
-    public static int QUICKHELPTEXT_POS = 12;
-    public static int TITLE_POS         = 13;
-    public static int DATE_POS          = 14;
-
+    
+    public static int PROJECT_POS 		= 0;
+    public static int SOURCE_FILE_POS	= 1;
+    public static int DUMMY1_POS		= 2;
+    public static int RESOURCE_TYPE_POS	= 3;
+    public static int GID_POS			= 4;
+    public static int LID_POS			= 5;
+    public static int HELPID_POS		= 6;
+    public static int PLATFORM_POS		= 7;
+    public static int DUMMY2_POS		= 8;
+    public static int LANGID_POS		= 9;
+    public static int TEXT_POS			= 10;
+    public static int HELPTEXT_POS		= 11;
+    public static int QUICKHELPTEXT_POS	= 12;
+    public static int TITLE_POS			= 13;
+    public static int DATE_POS			= 14;
+    
     public Object clone()
     {
         try
@@ -79,43 +79,43 @@ public class SdfEntity implements Cloneable{
     }
     public SdfEntity(String project, String source_file, String dummy1, String resource_type, String gid, String lid, String helpid, String platform, String dummy2, String langid, String text, String helptext, String quickhelptext, String title , String date) {
         super();
-        this.project        = project;
-        this.source_file    = source_file;
-        this.dummy1         = dummy1;
-        this.resource_type  = resource_type;
-        this.gid            = gid;
-        this.lid            = lid;
-        this.helpid         = helpid;
-        this.platform       = platform;
-        this.dummy2         = dummy2;
-        this.langid         = langid;
-        this.text           = text;
-        this.helptext       = helptext;
-        this.quickhelptext  = quickhelptext;
-        this.title          = title;
-        this.date           = date;
+        this.project 		= project;
+        this.source_file 	= source_file;
+        this.dummy1 		= dummy1;
+        this.resource_type 	= resource_type;
+        this.gid 			= gid;
+        this.lid 			= lid;
+        this.helpid 		= helpid;
+        this.platform 		= platform;
+        this.dummy2 		= dummy2;
+        this.langid 		= langid;
+        this.text 			= text;
+        this.helptext 		= helptext;
+        this.quickhelptext 	= quickhelptext;
+        this.title 			= title;
+        this.date 			= date;
     }
 
     public void setProperties( String line ){
-
+    
         if( line != null )
         {
-            String[] splitted       = line.split("\t",15);
-            setProject(         splitted[ SdfEntity.PROJECT_POS ]       );
-            setSource_file(     splitted[ SdfEntity.SOURCE_FILE_POS ]   );
-            setDummy1(          splitted[ SdfEntity.DUMMY1_POS ]        );
-            setResource_type(   splitted[ SdfEntity.RESOURCE_TYPE_POS ] );
-            setGid(             splitted[ SdfEntity.GID_POS ]           );
-            setLid(             splitted[ SdfEntity.LID_POS ]           );
-            setHelpid(          splitted[ SdfEntity.HELPID_POS ]        );
-            setPlatform(        splitted[ SdfEntity.PLATFORM_POS ]      );
-            setDummy2(          splitted[ SdfEntity.DUMMY2_POS ]        );
-            setLangid(          splitted[ SdfEntity.LANGID_POS ]        );
-            setText(            splitted[ SdfEntity.TEXT_POS ]          );
-            setHelptext(        splitted[ SdfEntity.HELPTEXT_POS ]      );
-            setQuickhelptext(   splitted[ SdfEntity.QUICKHELPTEXT_POS ] );
-            setTitle(           splitted[ SdfEntity.TITLE_POS ]         );
-            setDate(            splitted[ SdfEntity.DATE_POS ]          );
+            String[] splitted		= line.split("\t",15);
+            setProject( 		splitted[ SdfEntity.PROJECT_POS ] 		);
+            setSource_file( 	splitted[ SdfEntity.SOURCE_FILE_POS ] 	);
+            setDummy1( 			splitted[ SdfEntity.DUMMY1_POS ] 		);
+            setResource_type(	splitted[ SdfEntity.RESOURCE_TYPE_POS ] );
+            setGid( 			splitted[ SdfEntity.GID_POS ] 			);
+            setLid( 			splitted[ SdfEntity.LID_POS ] 			);
+            setHelpid( 			splitted[ SdfEntity.HELPID_POS ] 		);
+            setPlatform( 		splitted[ SdfEntity.PLATFORM_POS ] 		);
+            setDummy2( 			splitted[ SdfEntity.DUMMY2_POS ] 		);
+            setLangid( 			splitted[ SdfEntity.LANGID_POS ] 		);
+            setText( 			splitted[ SdfEntity.TEXT_POS ] 			);
+            setHelptext( 		splitted[ SdfEntity.HELPTEXT_POS ] 		);
+            setQuickhelptext(	splitted[ SdfEntity.QUICKHELPTEXT_POS ] );
+            setTitle( 			splitted[ SdfEntity.TITLE_POS ] 		);
+            setDate(			splitted[ SdfEntity.DATE_POS ]			);
         }
     }
 
@@ -133,7 +133,7 @@ public class SdfEntity implements Cloneable{
     public String getId(){
         return new StringBuffer( project ).append( gid ).append( lid ).append( source_file ).append( resource_type ).append( platform ).append( helpid ).append( langid ).toString();
     }
-
+    
     public String getDummy1() {
         return dummy1;
     }
@@ -251,6 +251,6 @@ public class SdfEntity implements Cloneable{
     public void setDate(String date) {
         this.date = date;
     }
-
-
+    
+    
 }
diff --git a/l10ntools/java/l10nconv/build.xml b/l10ntools/java/l10nconv/build.xml
index 7103ff05d58f..6667630e8dca 100755
--- a/l10ntools/java/l10nconv/build.xml
+++ b/l10ntools/java/l10nconv/build.xml
@@ -2,23 +2,23 @@
 <!--
 
   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
-
+ 
   This file is part of OpenOffice.org.
-
+ 
   OpenOffice.org is free software: you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License version 3
   only, as published by the Free Software Foundation.
-
+ 
   OpenOffice.org is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   GNU Lesser General Public License version 3 for more details
   (a copy is included in the LICENSE file that accompanied this code).
-
+ 
   You should have received a copy of the GNU Lesser General Public License
   version 3 along with OpenOffice.org.  If not, see
   <http://www.openoffice.org/license.html>
diff --git a/l10ntools/java/l10nconv/java/com/sun/star/tooling/DirtyTags/DirtyTagWrapCheck.java b/l10ntools/java/l10nconv/java/com/sun/star/tooling/DirtyTags/DirtyTagWrapCheck.java
index 7338e8d6a669..7a9b1fed5ebf 100755
--- a/l10ntools/java/l10nconv/java/com/sun/star/tooling/DirtyTags/DirtyTagWrapCheck.java
+++ b/l10ntools/java/l10nconv/java/com/sun/star/tooling/DirtyTags/DirtyTagWrapCheck.java
@@ -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
@@ -26,7 +26,7 @@
  ************************************************************************/
 /*
  * Created on 2005
- *  by Christian Schmidt
+ *	by Christian Schmidt
  */
 package com.sun.star.tooling.DirtyTags;
 
@@ -42,7 +42,7 @@ public class DirtyTagWrapCheck {
     static String line="";
     public static void main(String[] args) {
         try {
-            File fi = new File("D:\\Testfiles\\KID_helpcontent.sdf");//Copy of
+            File fi = new File("D:\\Testfiles\\KID_helpcontent.sdf");//Copy of 
             FileReader fr = new FileReader(fi);
             BufferedReader br = new BufferedReader(fr);
 
@@ -68,15 +68,15 @@ public class DirtyTagWrapCheck {
              }
             System.out.println("Fertig "+readCounter+" "+missCounter+" "+lineErrorCounter);
         } catch (FileNotFoundException e) {
-            //
+            // 
             e.printStackTrace();
         } catch (IOException e) {
-            //
+            // 
             e.printStackTrace();
         } catch (DirtyTagWrapper.TagWrapperException e) {
             System.out.println(e.getMessage()+"\n"+line+"\n");
-
+            
         }
-
+      
     }
 }
diff --git a/l10ntools/java/l10nconv/java/com/sun/star/tooling/DirtyTags/DirtyTagWrapper.java b/l10ntools/java/l10nconv/java/com/sun/star/tooling/DirtyTags/DirtyTagWrapper.java
index 6b76b75b75d6..cb64f3381fdc 100755
--- a/l10ntools/java/l10nconv/java/com/sun/star/tooling/DirtyTags/DirtyTagWrapper.java
+++ b/l10ntools/java/l10nconv/java/com/sun/star/tooling/DirtyTags/DirtyTagWrapper.java
@@ -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
@@ -26,7 +26,7 @@
  ************************************************************************/
 /*
  * Created on 2005
- *  by Christian Schmidt
+ *	by Christian Schmidt
  */
 package com.sun.star.tooling.DirtyTags;
 
@@ -35,12 +35,12 @@ import java.util.ArrayList;
 
 /**
  * Solves the problem with translating strings from the
- * Star-Office Help. This Strings contain XML snippets
+ * Star-Office Help. This Strings contain XML snippets 
  * (that means parts of an xml dokument). I call them 'dirty'
  * because the start of a tag (<) and the and of an tag (>)
- * are quoted by a single backslash(\<.....\>). This is done
+ * are quoted by a single backslash(\<.....\>). This is done 
  * because the text out of th tags should not contain '<' and '>'
- * as Entity references (&lt; or &gt;) but as readable signs.
+ * as Entity references (&lt; or &gt;) but as readable signs. 
  * This is for translation purposes.
  * Because translators get mad while find out the really translatable
  * parts between all the markup information, the XLIFF Specification
@@ -48,20 +48,20 @@ import java.util.ArrayList;
  * special tags (<ept>, <bpt>).
  * This Class has two static methods that do the wrapping and unwrapping
  * NOTE: this won't work with not 'dirty' Strings.
- *
+ * 
  * @author Christian Schmidt 2005
  *
  */
 public class DirtyTagWrapper {
-
+    
     private static boolean doWrap=true;
     public static void setWrapping(boolean doWrap){
         DirtyTagWrapper.doWrap=doWrap;
     }
-
+   
     /**
      * Unwraps the 'dirty' parts of a String from ept and bpt tags
-     *
+     * 
      * @param checkString The String to unwrap
      * @return the unwrapped String
      */
@@ -85,11 +85,11 @@ public class DirtyTagWrapper {
         String returnString = new String(returnBuffer);
         return returnString;
     }
-
-
+    
+    
     /**
      * Wrap the dirty parts of a string
-     *
+     * 
      * @param checkString The String to check if there are dirty Parts to wrap
      * @return A String with wrapped dirty parts
      * @throws TagWrapperException
@@ -99,11 +99,11 @@ public class DirtyTagWrapper {
         // if no wrapping should be done return the given string
         if(!doWrap) return checkString;
         // let's wrap
-        String[] parts=null;
+        String[] parts=null; 
         int idx=0;
         //split the string at tag ends
         String[] parts2 = checkString.split("\\\\>");
-
+   
         ArrayList tagString =new ArrayList();
         // put the while splitting lost parts to the end of the single strings
         for(int j=0;j<parts2.length-1;j++){
@@ -113,10 +113,10 @@ public class DirtyTagWrapper {
         if (checkString.endsWith("\\>")){
             parts2[parts2.length-1]+="\\>";
         }
-        // split the leading text from the real tag string (<...>)
+        // split the leading text from the real tag string (<...>) 
         for(int j=0;j<parts2.length;j++){
 
-            //is it just a tag
+            //is it just a tag 
             if(parts2[j].startsWith("\\<")){
                 tagString.add(parts2[j]);
              // or is it a tag with leading text?
@@ -126,12 +126,12 @@ public class DirtyTagWrapper {
                 tagString.add(parts2[j].substring(0,(parts2[j].indexOf("\\<"))));
                 // ...and the tag
                 tagString.add(parts2[j].substring(parts2[j].indexOf("\\<")));
-
+                
             }else{
                 //no tag...must be text only
                 tagString.add(parts2[j]);
             }
-
+            
         }
         ArrayList tagNames=new ArrayList();
         String item="";
@@ -148,7 +148,7 @@ public class DirtyTagWrapper {
                     isStandalone=true;
                 }
                 item=item.substring(start,end);
-
+                
                 if(item.indexOf(" ")>0){
                    item=item.substring(0,item.indexOf(" "));
                 }
@@ -171,9 +171,9 @@ public class DirtyTagWrapper {
             }else {
                 tagType.add("StartTag");
             }
-
+            
         }
-
+   
         ArrayList tagList=new ArrayList();
         for(int i=0;i<tagNames.size();i++){
             tagList.add(new Tag(
@@ -190,7 +190,7 @@ public class DirtyTagWrapper {
         while(tagList.size()>0){
             try{
                 start=new TagPair(tagList);
-                returnBuffer.append(start.getWrapped());
+                returnBuffer.append(start.getWrapped()); 
             }catch(TagPair.TagPairConstructionException e){
                 throw (new DirtyTagWrapper()).new TagWrapperException(e);
             }
@@ -206,43 +206,43 @@ public class DirtyTagWrapper {
 
         /**
          * Create a new Instance of TagWrapperException
-         *
-         *
+         * 
+         * 
          */
         public TagWrapperException() {
             super();
-            //
+            // 
         }
 
         /**
          * Create a new Instance of TagWrapperException
-         *
+         * 
          * @param arg0
          */
         public TagWrapperException(String arg0) {
             super(arg0);
-            //
+            // 
         }
 
         /**
          * Create a new Instance of TagWrapperException
-         *
+         * 
          * @param arg0
          * @param arg1
          */
         public TagWrapperException(String arg0, Throwable arg1) {
             super(arg0, arg1);
-            //
+            // 
         }
 
         /**
          * Create a new Instance of TagWrapperException
-         *
+         * 
          * @param arg0
          */
         public TagWrapperException(Throwable arg0) {
             super(arg0);
-            //
+            // 
         }
 
     }
diff --git a/l10ntools/java/l10nconv/java/com/sun/star/tooling/DirtyTags/Tag.java b/l10ntools/java/l10nconv/java/com/sun/star/tooling/DirtyTags/Tag.java
index 223885571007..b052289653e2 100755
--- a/l10ntools/java/l10nconv/java/com/sun/star/tooling/DirtyTags/Tag.java
+++ b/l10ntools/java/l10nconv/java/com/sun/star/tooling/DirtyTags/Tag.java
@@ -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
@@ -26,7 +26,7 @@
  ************************************************************************/
 /*
  * Created on 2005
- *  by Christian Schmidt
+ *	by Christian Schmidt
  */
 package com.sun.star.tooling.DirtyTags;
 
@@ -49,23 +49,23 @@ public class Tag {
 
     /**
      * Create a new Instance of Tag
-     *
+     * 
      * @param tagType
      * @param tagName
      * @param tagString
      */
     public Tag(String tagType, String tagName, String tagString) {
-
+        
         this.tagType=tagType;
         this.tagName=tagName;
         this.tagString=tagString;
-
+        
         tagNames=new ExtMap();
         tagNames.put("link","name");
         tagNames.put("caption","xml-lang");
         tagNames.put("alt","xml-lang");
     }
-
+    
     public String getWrappedTagString() throws IOException{
         if(this.canHaveTranslateableContent()){
             return this.wrapTagStringIntern();
@@ -73,7 +73,7 @@ public class Tag {
             return xmlString(this.tagString);
         }
     }
-
+    
     private final String xmlString( final String string) throws java.io.IOException {
         if (string == null)
             return string; // ""
@@ -84,7 +84,7 @@ public class Tag {
                  str=str.substring(0, i)+"&amp;"+str.substring(i+1);
                  continue;
              }
-
+    
              if(str.charAt(i)=='<'){
                  str=str.substring(0, i)+"&lt;"+str.substring(i+1);
                  continue;
@@ -113,23 +113,23 @@ public class Tag {
      */
     private boolean canHaveTranslateableContent() {
         return (tagNames.containsKey(this.tagName));
-
+        
     }
 
     /**
      * @throws IOException
-     *
+     * 
      */
     private String wrapTagStringIntern() throws IOException {
-
-
+        
+    
         String[] split=this.tagString.split("=");
         int length=split.length;
         // no attribute found;
         if (length==0) return xmlString(tagString);
         else{
             int i=0;
-
+            
             while(i<length-1/*the last part can only contain an attribute value*/){
                 String attributeName = split[i].trim();
                 if(split[i]. indexOf("</sub>")<0) split[i]=xmlString(split[i]);
@@ -139,7 +139,7 @@ public class Tag {
                 if((value=translateableAttributeValue(this.tagName)).equals(attributeName)){
                     int valueStart=0;
                     int valueEnd=0;
-
+                    
                     // get the value to the found attribute name
                     // it must either be surrounded by '"'...
                     if((valueStart=split[i].indexOf('"'))>=0){
@@ -156,7 +156,7 @@ public class Tag {
                     }
                     //ok we found the border of a value that might be translated
                     //now we wrap it with the tags
-
+                    
                     split[i]=xmlString(split[i].substring(0,valueStart+1))+"<sub>"+xmlString(split[i].substring(valueStart+1,valueEnd))+"</sub>"+xmlString(split[i].substring(valueEnd));
 
                 }
@@ -165,14 +165,14 @@ public class Tag {
             // we have the wrapped parts, now we put them together
             int j=0;
             for(j=0;j<split.length-1;j++){
-                wrappedString+=(split[j]+"=");
+                wrappedString+=(split[j]+"=");   
             }
             wrappedString+=split[j];
 //            System.out.println(this.tagString);
 //            System.out.println(wrappedString);
             return wrappedString;
         }
-
+        
     }
 
 
@@ -189,20 +189,20 @@ public class Tag {
 
     /**
      * Create a new Instance of Tag
-     *
-     *
+     * 
+     * 
      */
     public Tag(String tagString) {
         this(extractTagType(extractTagName(tagString)),extractTagName(tagString),tagString);
     }
-
+    
     private static String extractTagName(String tagString){
-
+        
         int start=tagString.indexOf('<')+1;
         int end=tagString.lastIndexOf('\\');
         if(start>=0&&end>0){
             tagString=tagString.substring(start,end);
-
+            
             if(tagString.indexOf(" ")>0){
                tagString=tagString.substring(0,tagString.indexOf(" "));
             }
@@ -241,6 +241,6 @@ public class Tag {
     public String getTagType() {
         return this.tagType;
     }
-
+    
 
 }
diff --git a/l10ntools/java/l10nconv/java/com/sun/star/tooling/DirtyTags/TagPair.java b/l10ntools/java/l10nconv/java/com/sun/star/tooling/DirtyTags/TagPair.java
index cc362a96e740..d82390161ec2 100755
--- a/l10ntools/java/l10nconv/java/com/sun/star/tooling/DirtyTags/TagPair.java
+++ b/l10ntools/java/l10nconv/java/com/sun/star/tooling/DirtyTags/TagPair.java
@@ -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
@@ -26,7 +26,7 @@
  ************************************************************************/
 /*
  * Created on 2005
- *  by Christian Schmidt
+ *	by Christian Schmidt
  */
 package com.sun.star.tooling.DirtyTags;
 
@@ -41,7 +41,7 @@ import java.util.Iterator;
  */
 public class TagPair {
 
-
+    
     private Tag startTag=Tag.EMPTYTAG;
     private Tag endTag=Tag.EMPTYTAG;
     private String startingText="";
@@ -58,7 +58,7 @@ public class TagPair {
 
         /**
          * Create a new Instance of TagPairConstructionException
-         *
+         * 
          * @param string
          */
         public TagPairConstructionException(String string) {
@@ -66,11 +66,11 @@ public class TagPair {
         }
 
     }
-
+    
     /**
      * Create a new Instance of TagPair
-     *
-     *
+     * 
+     * 
      */
     public TagPair() {
 
@@ -79,14 +79,14 @@ public class TagPair {
 
     /**
      * Create a new Instance of TagPair
-     *
-     * Find matching tags in tagList, create a TagPair of it, create
+     * 
+     * Find matching tags in tagList, create a TagPair of it, create 
      * tagPairs from the content in the tagPair and remove all used
-     * tags from tagList. The rest of the tagList starts after the
+     * tags from tagList. The rest of the tagList starts after the 
      * endTag of this TagPair.
-     *
+     * 
      * @param tagList a List of the tags to check
-     *
+     * 
      * @throws TagPairConstructionException
      */
     public TagPair(ArrayList tagList) throws TagPairConstructionException {
@@ -98,12 +98,12 @@ public class TagPair {
         Tag tag=(Tag)tagList.get(0);
         tagList.remove(0);
 
-
+        
         if("Text".equals(tag.getTagType())){
-            // is this Text the only content
+            // is this Text the only content 
             // of this Tag ?
             if(tagList.size()==0){
-                //yes...then it is the starting Text of this TagPair
+                //yes...then it is the starting Text of this TagPair 
                 this.startingText=tag.getTagString();
                 return;
             }else{
@@ -124,7 +124,7 @@ public class TagPair {
                 //is this the end tag?
                 if((tag=(Tag)iter.next()).getTagName().equals('/'+this.startTag.getTagName())&&equivalentTagCounter==0){
                     //found the corresponding end tag
-
+                    
                     //this TagPair is complete
                     //so it needs an id
                     this.id=TagPair.ElementCounter++;
@@ -135,8 +135,8 @@ public class TagPair {
                     break;
                 }else{
                     // tag is not the end tag
-                    // so it is between the start and the end tag
-                    // and belongs to the content
+                    // so it is between the start and the end tag 
+                    // and belongs to the content 
                    // but first check if it has the same name as the current tag
                     if(tag.getTagName().equals(this.startTag.getTagName())){
                         // if this is a start tag like the current start tag
@@ -150,17 +150,17 @@ public class TagPair {
                             equivalentTagCounter--;
                         }
                     }
-
+                    
                     contentList.add(tag);
                 }
             }
             //found the end tag ?
             //no...
             if (this.endTag.getTagType()==""){
-
+                
                 throw new TagPairConstructionException("ERROR: Missing end tag ("+
                         this.startTag.getTagString()+").");
-            //...yes
+            //...yes            
             }else{
                 //We need to check whether the content is starting or ending with text
                 //...check starting with text
@@ -186,7 +186,7 @@ public class TagPair {
             this.endTag=new Tag("EndOfStandAlone","","");
             createEnclosedTags(contentList);
         }
-
+ 
     }
 
     /**
@@ -198,9 +198,9 @@ public class TagPair {
             //create the inner TagPairs
             this.enclosedTags.add(new TagPair(contentList));
         }
-
+        
     }
-
+    
     public String toString(){
         StringBuffer outString= new StringBuffer(this.startTag.toString());
         TagPair help=new TagPair();
@@ -217,28 +217,28 @@ public class TagPair {
         outString.append(this.endTag.toString());
         return new String(outString);
     }
-
+    
     public String getWrapped() throws IOException{
         Iterator iter=enclosedTags.iterator();
         StringBuffer returnBuffer=new StringBuffer();
-
+        
             returnBuffer.append(wrap(this.startTag)+xmlString(this.startingText));
             while(iter.hasNext()){
                 returnBuffer.append(((TagPair)iter.next()).getWrapped());
             }
             returnBuffer.append(xmlString(this.endingText)+wrap(this.endTag));
-
-
-
+       
+            
+       
         return new String(returnBuffer);
     }
-
+    
     private String wrap(Tag tag) throws IOException{
         String string="";
         //can be a start tag
         if(tag.getTagType().startsWith("Start")){
             return new String("<bpt id='"+this.id+"'>"+tag.getWrappedTagString()+"</bpt>");
-        //...or a end tag
+        //...or a end tag      
         }else if (tag.getTagType().startsWith("End")){
             //maybe the end tag of a Start and end tag
 //            if("EndOfStandAlone".equals(tag.getTagType())){
@@ -247,7 +247,7 @@ public class TagPair {
                 string=tag.getWrappedTagString();
                 return new String("<ept id='"+this.id+"'>"+string+"</ept>");
 //            }
-
+            
         //...or text
         }else{
             return xmlString(tag.getTagString());
@@ -255,7 +255,7 @@ public class TagPair {
     }
     /**
      * Replaces all characters that mustn't be in XLIFF PCdata
-     *
+     * 
      * @param string the string to check
      * @return the checked string with all characters replaced
      * @throws java.io.IOException
@@ -270,7 +270,7 @@ public class TagPair {
                  str=str.substring(0, i)+"&amp;"+str.substring(i+1);
                  continue;
              }
-
+    
              if(str.charAt(i)=='<'){
                  str=str.substring(0, i)+"&lt;"+str.substring(i+1);
                  continue;
@@ -296,12 +296,12 @@ public class TagPair {
     }
 
     /**
-     *
+     * 
      */
     public static void resetCounter() {
-        TagPair.ElementCounter=1;
-
+        TagPair.ElementCounter=1; 
+        
     }
-
+    
 
 }
diff --git a/l10ntools/java/l10nconv/java/com/sun/star/tooling/converter/Convert.java b/l10ntools/java/l10nconv/java/com/sun/star/tooling/converter/Convert.java
index d6fddfd049ae..0ec343b1f3a8 100755
--- a/l10ntools/java/l10nconv/java/com/sun/star/tooling/converter/Convert.java
+++ b/l10ntools/java/l10nconv/java/com/sun/star/tooling/converter/Convert.java
@@ -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
@@ -26,7 +26,7 @@
  ************************************************************************/
 /*
  * the main Class
- *
+ * 
  * Command Line arguments are reviewed
  * and a Converter is constructed
  */
@@ -42,32 +42,32 @@ import com.sun.star.tooling.DirtyTags.DirtyTagWrapper;
 
 /**
  * The main class of the converter tool
- *
+ * 
  * The converter tool is command line based.
  * Its classes allow the converting between the
  * file formats sdf, gsi and <a href="http://www.oasis-open.org/committees/xliff/documents/cs-xliff-core-1.1-20031031.htm">xliff</a>.
- *
+ * 
  * Those file formats are used in localization
  * of Star-Office and Open-Office.
- *
- * Information about the whole localization process can be found in
+ * 
+ * Information about the whole localization process can be found in 
  * <a href="http://ded-1.germany.sun.com/webcontent/guidelines/pdf/L10NSO8.pdf">http://ded-1.germany.sun.com/webcontent/guidelines/pdf/L10NSO8.pdf</a>
- *
+ * 
  * @author Christian Schmidt 2005
- *
+ *  
  */
 public class Convert {
 
     private static Calendar     cal;
-
+     
     private static final String EMPTY              = "";
-
+    
     /**
      * The name of the  file containing the debug information
      * that where found while converting (every output goes here too)
      */
     private static String       dbgName            = EMPTY;
-
+    
     /**
      * the character that separates the extension from the file name
      */
@@ -95,7 +95,7 @@ public class Convert {
     private static File secondSource;
 
     //private static final char   pathSeperator      = '\\';
-
+    
     /**
      * The language that should be the source language
      * that means the language to translate from
@@ -111,7 +111,7 @@ public class Convert {
      * the type of the source file (sdf,xliff,...)
      */
     private static String       sourceType         = EMPTY;
-
+    
     /**
      * The time when converting started
      */
@@ -133,7 +133,7 @@ public class Convert {
     private static String       targetType         = EMPTY;
 
     /**
-     * Store the current version ID and number of this tool
+     * Store the current version ID and number of this tool 
      */
     final static String         version            = " Prod.20050710:1255 ";
 
@@ -143,19 +143,19 @@ public class Convert {
     private static String secondSourceName=EMPTY;
     /**
      * Indicate whether strings in xliff files should
-     * be wrapped with ept/bpt or sub tags to enable translation tools
+     * be wrapped with ept/bpt or sub tags to enable translation tools 
      * to synchronize source language string with there translation
-     *
+     * 
      * @see <a href="http://ded-1.germany.sun.com/webcontent/guidelines/pdf/L10NSO8.pdf">http://ded-1.germany.sun.com/webcontent/guidelines/pdf/L10NSO8.pdf</a>
      */
     private static boolean doWrap=true;
 
 
-
+    
             public static void main(String[] args) throws IOException, Exception {
                 try{
-
-                    //go, parse and check the command line parameters
+        
+                    //go, parse and check the command line parameters 
                     ParameterChecker.checkClParameters(args);
                     ParameterChecker.createContentOfClParameters();
                     //Initialize the tagWrapper
@@ -170,12 +170,12 @@ public class Convert {
                     printPreamble();
                     //do the job
                     conv.convert();
-
+            
                     showStatistic();
-
+            
                     //close log, debug...
                     OutputHandler.closeAll();
-
+                
                 } catch(Exception e){
                     System.out.print("An EXCEPTION occured, please check your commad line settings \n"+e.getMessage());
                     System.exit(-1);
@@ -194,7 +194,7 @@ public class Convert {
         final String ls = System.getProperty("line.separator");
         System.out
                 .println(
-
+    
                 "File Converting Tool 'converter' Version "
                         + Convert.version
                         + ls
@@ -220,13 +220,13 @@ public class Convert {
                         + "-nw              disable the wrapping with ept/bpt tags." + ls
                         + ls
                         + "The created files were stored in the SourceFile Path if nothing else is given. " + ls
-                        + "The extension is '.xliff','.sdf' depending on the source file and '.log' " + ls
+                        + "The extension is '.xliff','.sdf' depending on the source file and '.log' " + ls 
                         + "for the logfile." + ls);
     }
 
     /**
      * show the parameters the converter starts with
-     *
+     * 
      * @throws IOException
      */
     final private static void printPreamble() throws IOException {
@@ -245,7 +245,7 @@ public class Convert {
 
     /**
      * show some statistic data
-     *
+     * 
      * @throws IOException
      */
     final private static void showStatistic() throws IOException {
@@ -265,9 +265,9 @@ public class Convert {
     /**
      * Get the extensiion of a file name
      * (sdf,xliff,gsi)
-     *
+     * 
      * @param sourceString     the file name
-     * @return                 the extension
+     * @return                 the extension 
      */
     static protected String extractExtension(String sourceString) {
         String ext = sourceString.substring(sourceString
@@ -291,16 +291,16 @@ public class Convert {
 //    }
 
     /**
-     *
+     *  
      */
     public Convert() {
     }
 
     /**
-     *
-     * Verify a parameter array and create content useable by the programm
+     * 
+     * Verify a parameter array and create content useable by the programm 
      * from the switches and attributes set at command line
-     *
+     * 
      * @author Christian Schmidt 2005
      */
     private static class ParameterChecker {
@@ -316,13 +316,13 @@ public class Convert {
 
         /**
          * Create a new Instance of ParameterChecker
-         *
-         *
+         * 
+         * 
          */
         public ParameterChecker(){};
         /**
          * Checks the command line parameters
-         *
+         * 
          * @param args          the parameters to check and to parse
          * @throws IOException
          */
@@ -350,54 +350,54 @@ public class Convert {
                 if (!source.exists())
                     throw new IOException("ERROR:Can not find Source File '"
                             + sourceName + "'. Aborting...");
-
+                
     //            String name=source.getName();
     //            String parent=source.getParent();
     //            String path=source.getPath();
-
+                
                 filePath = (source.getParent()==null)?"":source.getParent()+File.separator; //extractPath(sourceName);
                 fileName = source.getName().substring(0,source.getName().lastIndexOf(extensionSeperator));
-
+    
                 for (int i = 1; i < args.length; i++) {
-
-
+    
+    
                         if ("-s".equals(args[i])) {
                             if (args.length > i + 1) {
                                 sourceLanguage = args[++i];
-
+    
                             } else {
                                 throw new ConverterException(
                                         "missing argument for -s source language");
                             }
                             continue;
                         }
-
+    
                         if ("-S".equals(args[i])) {
                             if (args.length > i + 1) {
                                 sourceType = args[++i];
                                 if (args.length > i +1 &&!args[i+1].startsWith("-")) {
                                     secondSourceName = args[++i];
                                 }
-
+    
                             } else {
                                 throw new ConverterException(
                                         "missing argument for -S  source type");
                             }
                             continue;
                         }
-
+    
                         if ("-T".equals(args[i])) {
                             if (args.length > i + 1) {
                                 targetType = args[++i];
-
-
+                                
+    
                             } else {
                                 throw new ConverterException(
                                         "missing argument for -T  target type");
                             }
                             continue;
                         }
-
+    
                         if ("-l".equals(args[i])) {
                             OutputHandler.doLog = true;
                             if (args.length > i + 1
@@ -408,27 +408,27 @@ public class Convert {
                             }
                             continue;
                         }
-
+    
                         if ("-o".equals(args[i])) {
                             overwrite = true;
                             continue;
                         }
-
+                        
                         if ("-nw".equals(args[i])) {
                             doWrap = false;
                             continue;
                         }
-
+    
                         if ("-h".equals(args[i])) {
                             printHelp();
                             System.exit(0);
                         }
-
+    
                         if ("-dbg".equals(args[i])) {
                             OutputHandler.doDebug = true;
                             continue;
                         }
-
+    
                         if ("-t".equals(args[i])) {
                             if (args.length > i + 1) {
                                 TargetLanguage = args[++i];
@@ -438,7 +438,7 @@ public class Convert {
                             }
                             continue;
                         }
-
+    
                         if (i == 1 && !args[i].startsWith("-")) { //target file
                             // found
                             targetName = args[i];
@@ -449,7 +449,7 @@ public class Convert {
                         throw new ConverterException("unknown Attribute: "
                                 + args[i]);
 
-
+                
                 }//end for
             } catch (ConverterException e) {
                 OutputHandler.out("ERROR: "+e.getMessage());
@@ -462,9 +462,9 @@ public class Convert {
         }//end checkClParameters
 
         /**
-         * Creates the appropriate content of what ever data
+         * Creates the appropriate content of what ever data 
          * we found in the command line
-         *
+         *  
          * @throws IOException
          */
         private static void createContentOfClParameters() throws IOException {
@@ -498,16 +498,16 @@ public class Convert {
                         throw new ConverterException("Source type is missing");
                     }
                 }
-
+                
                 if(sourceType.equalsIgnoreCase("gsi")){
-
+                    
                     if(EMPTY.equals(Convert.secondSourceName)){
                         Convert.secondSourceName=filePath+fileName+".sdf";
                     }
                     //secondSource=new File(Convert.secondSourceName);
-
+                    
                 }
-
+                
                 if (EMPTY.equals(sourceName)) {
                     sourceName = filePath + fileName + "." + sourceType;
                 }
@@ -537,12 +537,12 @@ public class Convert {
                     OutputHandler.out("ERROR: \nSource '"+Convert.sourceName+"' and \nTarget'"+targetName+"' are the same");
                     System.exit(0);
                 }
-
-
+                
+                
             } catch (ConverterException e) {
-                OutputHandler.out(e.getMessage());
+                OutputHandler.out(e.getMessage());   
             }
-
+            
         }
 
     }
diff --git a/l10ntools/java/l10nconv/java/com/sun/star/tooling/converter/Converter.java b/l10ntools/java/l10nconv/java/com/sun/star/tooling/converter/Converter.java
index ad846ae88295..ff6c20dd99e3 100755
--- a/l10ntools/java/l10nconv/java/com/sun/star/tooling/converter/Converter.java
+++ b/l10ntools/java/l10nconv/java/com/sun/star/tooling/converter/Converter.java
@@ -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
@@ -52,11 +52,11 @@ import org.xml.sax.XMLReader;
 import org.xml.sax.helpers.DefaultHandler;
 
 /**
- *
+ *  
  * This class handles the creating of the source to read from,
  * the target to write to and the appropriate DataHandler
- *
- * @author Christian Schmidt 2005
+ * 
+ * @author Christian Schmidt 2005 
  */
 public final class Converter {
 
@@ -66,7 +66,7 @@ public final class Converter {
     private final static String         CHARSET        = new String("UTF-8");
 
     private static final String EMPTY          = new String("");
-
+    
     /**
      * The DataHandler use to connect reader and writer
      */
@@ -76,13 +76,13 @@ public final class Converter {
      * Counting the lines written by a writer
      */
     private static int          lineCounter;
-
+    
     /**
      * The target to write to
      */
     private static DataWriter   theTargetWriter;
-
-
+    
+    
     /**
      * Overwrite existing files
      */
@@ -106,7 +106,7 @@ public final class Converter {
     /**
      * the Type of the Target file(SDF,GSI,XLIFF)
      */
-    private String              targetType;
+    private String              targetType;   
     /**
      * The writer that handles the output
      */
@@ -116,7 +116,7 @@ public final class Converter {
      * The sourceLanguage
      */
     String                      sourceLanguage = "en-US";
-
+    
     /**
      * The targetLanguage
      */
@@ -145,7 +145,7 @@ public final class Converter {
 
     /**
      * Creates a new instance of Converter
-     *
+     *  
      * @param sourceType        the type of the sourceFile
      * @param sourceString      the name of the sourceFile
      * @param SourceLanguage    the ISO Id of the sourceLanguage
@@ -197,7 +197,7 @@ public final class Converter {
 
     /**
      * Do the converting from the source file format to the target file format
-     *
+     * 
      * @throws IOException
      */
     public final void convert() throws IOException {
@@ -214,12 +214,12 @@ public final class Converter {
         }
 
     }
-
+    
 
     /**
-     *
+     * 
      * Encapsulate the reading from an GSI file
-     *
+     * 
      * @author Christian Schmidt 2005
      *
      */
@@ -227,7 +227,7 @@ public final class Converter {
         DataReader theSourceReader;
         /**
          * Create a new Instance of GSISource
-         *
+         * 
          * @throws IOException
          * @throws Exception
          */
@@ -238,7 +238,7 @@ public final class Converter {
         }
 
         public void convertTo(Target t) {
-
+            
             try {
                 theTargetWriter = t.getWriter();
                 while (handler.fillDataFrom(theSourceReader)) {
@@ -257,19 +257,19 @@ public final class Converter {
 
     }
     /**
-     *
+     * 
      * Encapsulate to write to a GSI file
-     *
+     * 
      * @author Christian Schmidt 2005
      *
      */
     private class GSITarget implements Target {
 
         File target;
-
+        
         /**
          * Create a new Instance of GSITarget
-         *
+         * 
          * @throws FileNotFoundException
          * @throws IOException
          */
@@ -281,17 +281,17 @@ public final class Converter {
         }
 
         public DataWriter getWriter() {
-
+            
             return theTargetWriter;
         }
 
     }
     /**
-     *
+     * 
      * Encapsulate the reading from an SDF file
-     *
+     * 
      * @author Christian Schmidt 2005
-     *
+     * 
      */
     private final class SDFSource implements Source {
 
@@ -337,7 +337,7 @@ public final class Converter {
 
         /**
          * Create a new Instance of SDFTarget
-         *
+         * 
          * @throws IOException
          */
         public SDFTarget() throws IOException {
@@ -358,16 +358,16 @@ public final class Converter {
 
     /**
      * The interface for all convertable sources
-     *
+     * 
      * @author Christian Schmidt 2005
      *
      */
     private interface Source {
-
+        
         DataReader Source=null;
         /**
          * Convert this. to the designated target
-         * @param target the target of the converting
+         * @param target the target of the converting  
          * @throws IOException
          */
         abstract void convertTo(Target target) throws IOException;
@@ -375,7 +375,7 @@ public final class Converter {
 
     /**
      * The interface for all creatable targets
-     *
+     * 
      * @author Christian Schmidt 2005
      *
      */
@@ -388,8 +388,8 @@ public final class Converter {
         /**
          * Get the writer
          * this target uses to write the
-         * data in the correct format.
-         *
+         * data in the correct format. 
+         * 
          * @return the used DataWriter
          */
         abstract DataWriter getWriter();
@@ -406,8 +406,8 @@ public final class Converter {
 
         /**
          * Create a new Instance of XLIFFSource
-         *
-         *
+         * 
+         * 
          */
         public XLIFFSource() {
 
@@ -434,8 +434,8 @@ public final class Converter {
                     SAXParser parser=factory.newSAXParser();
                     XMLReader xliffreader=parser.getXMLReader();
 
-
-
+                    
+                    
 //                    XMLReader xliffreader = XMLReaderFactory
 //                            .createXMLReader("org.apache.crimson.parser.XMLReaderImpl");
                     xliffreader.setErrorHandler(contentHandler);
@@ -445,7 +445,7 @@ public final class Converter {
                     xliffreader.setEntityResolver(res);
                     /*
                      * a second possibility to resolve an extern entity (DTD)
-                     *
+                     * 
                      * xliffreader.setFeature("xml.org/sax/features/validation",true);
                      * xliffreader.setEntityResolver(new EntityResolver() {
                      * public InputSource resolveEntity(java.lang.String
@@ -455,7 +455,7 @@ public final class Converter {
                      * return new InputSource(new ByteArrayInputStream( " <?xml
                      * version='1.0' encoding='UTF-8'?>" .getBytes())); else
                      * return null; } });
-                     *
+                     *  
                      */
 
                     xliffreader.parse(sourceString);
@@ -490,7 +490,7 @@ public final class Converter {
     }
     /**
      * Encapsulate writing to a XLIFF file
-     *
+     * 
      * @author Christian Schmidt 2005
      *
      */
@@ -499,7 +499,7 @@ public final class Converter {
 
         /**
          * Create a new Instance of XLIFFTarget
-         *
+         * 
          * @throws FileNotFoundException
          * @throws IOException
          */
diff --git a/l10ntools/java/l10nconv/java/com/sun/star/tooling/converter/ConverterException.java b/l10ntools/java/l10nconv/java/com/sun/star/tooling/converter/ConverterException.java
index 0b630978098d..cfa664dcaad8 100755
--- a/l10ntools/java/l10nconv/java/com/sun/star/tooling/converter/ConverterException.java
+++ b/l10ntools/java/l10nconv/java/com/sun/star/tooling/converter/ConverterException.java
@@ -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
@@ -26,7 +26,7 @@
  ************************************************************************/
 /*
  * a simple exception
- * just to seperate
+ * just to seperate 
  * it from other
  * exceptions
  */
@@ -34,14 +34,14 @@ package com.sun.star.tooling.converter;
 
 /**
  * @author Christian Schmidt
- *
+ *  
  * Thrown if an error occurs during converting from one file format to another
  * that does not belong to an other exception
  */
 public class ConverterException extends Exception {
 
     /**
-     *
+     *  
      */
     public ConverterException() {
         super();
diff --git a/l10ntools/java/l10nconv/java/com/sun/star/tooling/converter/DataHandler.java b/l10ntools/java/l10nconv/java/com/sun/star/tooling/converter/DataHandler.java
index fcc95905d3be..308462c8440b 100755
--- a/l10ntools/java/l10nconv/java/com/sun/star/tooling/converter/DataHandler.java
+++ b/l10ntools/java/l10nconv/java/com/sun/star/tooling/converter/DataHandler.java
@@ -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
@@ -28,8 +28,8 @@
  * DataHandler.java
  *
  * take the data from the reader
- * and put it to the Writer
- *
+ * and put it to the Writer 
+ * 
  */
 
 package com.sun.star.tooling.converter;
@@ -37,17 +37,17 @@ package com.sun.star.tooling.converter;
 import java.util.*;
 
 /**
- * Handle the Data to get it from the Source
- * readable to the Target
- *
+ * Handle the Data to get it from the Source 
+ * readable to the Target 
+ * 
  * @author Christian Schmidt
  */
 public class DataHandler {
 
     /**
-     * An arrays that holds the names that will be
+     * An arrays that holds the names that will be 
      * keys for the HashMap containing the data
-     *
+     * 
      */
     private final String[]      dataNames = { "BlockNr", "Project",
             "SourceFile", "Dummy", "ResType", "GID", "LID", "HID", "Platform",
@@ -58,7 +58,7 @@ public class DataHandler {
     private static final String EMPTY     = new String("");
 
     /**
-     * The HashMap containing the data
+     * The HashMap containing the data 
      */
     private final Map           data      = new ExtMap(dataNames, null);
 
@@ -68,7 +68,7 @@ public class DataHandler {
 
     /**
      * fill the data from the desired source
-     *
+     * 
      * @param source where to get the data from
      * @return true if data is read and false if null is read
      * @throws IOException
@@ -81,20 +81,20 @@ public class DataHandler {
 
         line = source.getData();
         if (line == null){
-
+            
             return false;
-        }else{
-
+        }else{   
+        
             this.data.putAll(line);
             return true;
         }
-
+       
 
     }
 
     /**
      * fill this data with the inData
-     *
+     * 
      * @param inData the data to handle by this handler
      */
     public void fillDataWith(Map inData) {
@@ -109,7 +109,7 @@ public class DataHandler {
 
     /**
      * The designated output is filled with the content of this handler
-     *
+     * 
      * @param output an array of Maps [0] should hold the source language data [1] the target language data
      * @throws java.io.IOException
      */
@@ -127,7 +127,7 @@ public class DataHandler {
     }
     /**
      * The designated output is filled with the content of this handler
-     *
+     * 
      * @param output a Map that should hold the source language data and the target language data
      * @throws java.io.IOException
      */
diff --git a/l10ntools/java/l10nconv/java/com/sun/star/tooling/converter/DataReader.java b/l10ntools/java/l10nconv/java/com/sun/star/tooling/converter/DataReader.java
index d6bb2ed85d73..de23f35a02d0 100755
--- a/l10ntools/java/l10nconv/java/com/sun/star/tooling/converter/DataReader.java
+++ b/l10ntools/java/l10nconv/java/com/sun/star/tooling/converter/DataReader.java
@@ -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
@@ -33,14 +33,14 @@ import java.util.*;
  * Gets Line counting from LineNumberReader all Converter Reader classes inherit
  * from this.
  * The abstract parent class of all converter reader classes
- *
+ * 
  * @author Christian Schmidt
  */
 abstract public class DataReader extends LineNumberReader {
 
     /**
      * Creates a new instance of DataReader
-     *
+     * 
      * @param isr
      *            InputStreamReader used as Source for this class
      */
@@ -49,22 +49,22 @@ abstract public class DataReader extends LineNumberReader {
     }
 
     /**
-
+     
      * @throws java.io.IOException
      * @throws ConverterException
-     *
+     * 
      * TODO this should no longer use an array as return type better a Map
-     *
+     *  
      */
     /**
      * The next block of the SDF file is reviewed and the Line including the
      * source language and the Line including the target Language are given back
      * in an array
-     *
-     *
+     * 
+     * 
      * @return    A Map including the source language
-     *            and the target Language content are given back
-     *
+     *            and the target Language content are given back 
+     * 
      * @throws java.io.IOException
      * @throws ConverterException
      */
diff --git a/l10ntools/java/l10nconv/java/com/sun/star/tooling/converter/DataWriter.java b/l10ntools/java/l10nconv/java/com/sun/star/tooling/converter/DataWriter.java
index 497bb54bbdb8..9263e1fbaa1e 100755
--- a/l10ntools/java/l10nconv/java/com/sun/star/tooling/converter/DataWriter.java
+++ b/l10ntools/java/l10nconv/java/com/sun/star/tooling/converter/DataWriter.java
@@ -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
@@ -39,12 +39,12 @@ import java.io.OutputStreamWriter;
 
 /**
  * The abstract parent class of all converter writer classes
- *
+ * 
  * @author Christian Schmidt
  */
 abstract public class DataWriter extends OutputStreamWriter {
     protected final String seperator = new String("|");
-
+    
     /**
      * the char sequence used as line seperator
      */
@@ -54,7 +54,7 @@ abstract public class DataWriter extends OutputStreamWriter {
     /** Creates a new instance of DataWriter */
     /**
      * @param bos the buffered output stream holding the data
-     * @param encoding the encoding to use for read from bos
+     * @param encoding the encoding to use for read from bos 
      * @throws java.io.UnsupportedEncodingException
      */
     public DataWriter(BufferedOutputStream bos, String encoding)
@@ -66,16 +66,16 @@ abstract public class DataWriter extends OutputStreamWriter {
 
     /**
      * get the data that should be written from the DataHandler
-     *
+     *  
      * @param handler the DataHandler having the data
      * @throws java.io.IOException
      */
     abstract protected void getDataFrom(DataHandler handler)
             throws java.io.IOException;
-
+    
     /**
      * write the Data
-     *
+     * 
      * @throws java.io.IOException
      */
     abstract protected void writeData() throws java.io.IOException;
diff --git a/l10ntools/java/l10nconv/java/com/sun/star/tooling/converter/ExtMap.java b/l10ntools/java/l10nconv/java/com/sun/star/tooling/converter/ExtMap.java
index a26665e1629e..51bed4c08169 100755
--- a/l10ntools/java/l10nconv/java/com/sun/star/tooling/converter/ExtMap.java
+++ b/l10ntools/java/l10nconv/java/com/sun/star/tooling/converter/ExtMap.java
@@ -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
@@ -36,14 +36,14 @@ import java.util.Map;
 
 /**
  * @author Christian Schmidt
- *
+ * 
  * Create a Hash Map from two Arrays
- *
+ *  
  */
 public class ExtMap extends HashMap {
 
     /**
-     *
+     *  
      */
     public ExtMap() {
         super();
diff --git a/l10ntools/java/l10nconv/java/com/sun/star/tooling/converter/FileMaker.java b/l10ntools/java/l10nconv/java/com/sun/star/tooling/converter/FileMaker.java
index 600687c41d29..131c10bd8c20 100755
--- a/l10ntools/java/l10nconv/java/com/sun/star/tooling/converter/FileMaker.java
+++ b/l10ntools/java/l10nconv/java/com/sun/star/tooling/converter/FileMaker.java
@@ -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
@@ -25,10 +25,10 @@
  *
  ************************************************************************/
 /*
- * creates new files
+ * creates new files 
  * checks if they exist or
  * can be overwritten
- *
+ * 
  */
 package com.sun.star.tooling.converter;
 
@@ -37,17 +37,17 @@ import java.io.IOException;
 
 /**
  * Creates new files only if the file  does not yet exist
- * or overwriting is allowed
- *
+ * or overwriting is allowed 
+ * 
  * @author Christian Schmidt 2005
- *
+ *  
  */
 public final class FileMaker {
 
     /**
      * Create a new file if overwriting is not alowed
      * ask if existing files should be overwritten
-     *
+     * 
      * @param fileName the files name to overwrite
      * @param overwrite indicates wether the file can be overwritten
      * @return the File created from the fileName
diff --git a/l10ntools/java/l10nconv/java/com/sun/star/tooling/converter/GSIReader.java b/l10ntools/java/l10nconv/java/com/sun/star/tooling/converter/GSIReader.java
index 398fcc9b686b..638e61441f23 100755
--- a/l10ntools/java/l10nconv/java/com/sun/star/tooling/converter/GSIReader.java
+++ b/l10ntools/java/l10nconv/java/com/sun/star/tooling/converter/GSIReader.java
@@ -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
@@ -26,7 +26,7 @@
  ************************************************************************/
 /*
  * Created on 2005
- *  by Christian Schmidt
+ *	by Christian Schmidt
  */
 package com.sun.star.tooling.converter;
 
@@ -42,7 +42,7 @@ import com.sun.star.tooling.languageResolver.LanguageResolver.LanguageResolvingE
 
 /**
  * @author Christian Schmidt 2005
- *
+ * 
  */
 public class GSIReader extends DataReader {
     /**
@@ -102,7 +102,7 @@ public class GSIReader extends DataReader {
 
     /**
      * Create a new Instance of GSIReader
-     *
+     * 
      * @param source
      *            the file to read from
      * @param sourceLanguage
@@ -127,10 +127,10 @@ public class GSIReader extends DataReader {
 
     /**
      * Read the next GSIBlock and return the data
-     *
-     * @return A Map containing the data of the read GSIBlock the keys for the language depending data are the language id (numeric) the
+     * 
+     * @return A Map containing the data of the read GSIBlock the keys for the language depending data are the language id (numeric) the 
      * single language  are acessible with the keys "BlockNr", "resType", "languageNr", "status","content".
-     *
+     * 
      * @throws IOException
      */
     public Map getGSIData() throws IOException {
@@ -147,7 +147,7 @@ public class GSIReader extends DataReader {
 
         while (useBuffer || (line = readLine()) != null) {
 
-
+            
 
             if (useBuffer) {
                 GSILine = GSILineBuffer;
@@ -214,7 +214,7 @@ public class GSIReader extends DataReader {
                 OutputHandler.out("\n\n");
                 OutputHandler.out("GSI Blocks    :         " + this.blockCounter);
                 OutputHandler.out("GSI Lines     :         " + this.lineCounter);
-
+            
                 return null;
             }else{
                 lastLineFound = true;
@@ -230,7 +230,7 @@ public class GSIReader extends DataReader {
 
     /**
      * Split a GSILine to single fields
-     *
+     * 
      * @param line
      *            The line to split
      * @return An array containing the contents of the columns in the given line
diff --git a/l10ntools/java/l10nconv/java/com/sun/star/tooling/converter/GSIWriter.java b/l10ntools/java/l10nconv/java/com/sun/star/tooling/converter/GSIWriter.java
index 0f7aee811569..b5819f783d1c 100755
--- a/l10ntools/java/l10nconv/java/com/sun/star/tooling/converter/GSIWriter.java
+++ b/l10ntools/java/l10nconv/java/com/sun/star/tooling/converter/GSIWriter.java
@@ -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
@@ -37,7 +37,7 @@ import com.sun.star.tooling.languageResolver.LanguageResolver.LanguageResolvingE
  */
 public class GSIWriter  extends DataWriter {
     /**
-     * The seperator used to seperate GSI columns
+     * The seperator used to seperate GSI columns 
      */
     final String seperator=new String("($$)");
 
@@ -66,7 +66,7 @@ public class GSIWriter  extends DataWriter {
      * A map holding the  content of an GSI Line contianing the source and the target language
      */
     private ExtMap outData=new ExtMap(outLineNames, null);
-
+    
     private static final String EMPTY          = new String("");
     /**
      * The sourceLanguage to use
@@ -76,7 +76,7 @@ public class GSIWriter  extends DataWriter {
      * The sourceLanguage to use
      */
     private String targetLanguage;
-
+    
     /**
      * GSILines have a special Line End
      */
@@ -87,29 +87,29 @@ public class GSIWriter  extends DataWriter {
      * The blockNr of the current line
      */
     private String blockNr;
-
-
-
+    
+    
+    
 
     /**
      * Create a new Instance of GSIWriter
-     *
+     * 
      * @param bos       the Buffered Output Stream to write to
      * @param charset   the used charset
      * @throws java.io.UnsupportedEncodingException
      */
     public GSIWriter(BufferedOutputStream bos,String charset) throws java.io.UnsupportedEncodingException {
         super(bos,charset);
+        
 
-
-
+        
     }
-
+    
     /* (non-Javadoc)
      * @see com.sun.star.tooling.converter.DataWriter#writeData()
      */
     public final void writeData() throws java.io.IOException {
-
+        
         StringBuffer buffer=new StringBuffer("");
         if(this.sourceLanguage==null&&this.targetLanguage==null){
             LanguageResolver lang =new LanguageResolver();
@@ -117,13 +117,13 @@ public class GSIWriter  extends DataWriter {
                 this.sourceLanguage=lang.getNrFromISO((String)outData.get("SourceLanguageID"));
                 this.targetLanguage=lang.getNrFromISO((String)outData.get("TargetLanguageID"));
             } catch (LanguageResolvingException e) {
-
+                
                 OutputHandler.out(e.getMessage());
                 System.exit(0);
             }
         }
-
-
+        
+        
         this.blockNr=(String)outData.get("BlockNr");
         // get the values of the found fields
         //create the gsi lines
@@ -133,7 +133,7 @@ public class GSIWriter  extends DataWriter {
         buffer.append(getSourceLine("HText"));
         buffer.append(getSourceLine("QText"));
         buffer.append(getSourceLine("Title"));
-
+        
         //now the target language line
         // put them together for output
         buffer.append(getTargetLine("Text"));
@@ -142,9 +142,9 @@ public class GSIWriter  extends DataWriter {
         buffer.append(getTargetLine("Title"));
         //ok...put all to disk;
         this.write(buffer.toString());
-
+        
     }
-
+    
     /**
      * Create a line containing the source string from the data
      * @param resType
@@ -171,14 +171,14 @@ public class GSIWriter  extends DataWriter {
             // seperate the fields with ($$)
             buffer.append(this.seperator);
             buffer.append(outData.get(resString));
-
+           
             // this line is full
             // so close it with '! cr lf'
             buffer.append(GSIWriter.lineEnd);
             Converter.countLine();
             return buffer;
         }
-
+    
     }
     /**
      * Create a line containing the target string from the data
@@ -205,30 +205,30 @@ public class GSIWriter  extends DataWriter {
             // seperate the fields with ($$)
             buffer.append(this.seperator);
             buffer.append(outData.get(resString));
-
+            
             // this line is full
             // so close it with '! cr lf'
             buffer.append(GSIWriter.lineEnd);
             Converter.countLine();
             return buffer;
         }
-
+    
     }
-
+        
 
     /* (non-Javadoc)
      * @see com.sun.star.tooling.converter.DataWriter#writeData(java.util.Map[])
      */
     protected void writeData(Map[] data) throws IOException {
         // TODO redesign DataHandler in the way that this is not nessesary any more
-
+        
     }
 
     /* (non-Javadoc)
      * @see com.sun.star.tooling.converter.DataWriter#getDataFrom(com.sun.star.tooling.converter.DataHandler)
      */
     protected void getDataFrom(DataHandler handler) throws IOException {
-
+        
         handler.putDataTo(this.outData);
     }
 
@@ -236,8 +236,8 @@ public class GSIWriter  extends DataWriter {
      * @see com.sun.star.tooling.converter.DataWriter#getDatafrom(com.sun.star.tooling.converter.DataHandler)
      */
     protected void getDatafrom(DataHandler handler) throws IOException {
-
+        
         handler.putDataTo(this.outData);
-
+        
     }
 }
diff --git a/l10ntools/java/l10nconv/java/com/sun/star/tooling/converter/GSIandSDFMerger.java b/l10ntools/java/l10nconv/java/com/sun/star/tooling/converter/GSIandSDFMerger.java
index 526f3ca75640..01133229210e 100755
--- a/l10ntools/java/l10nconv/java/com/sun/star/tooling/converter/GSIandSDFMerger.java
+++ b/l10ntools/java/l10nconv/java/com/sun/star/tooling/converter/GSIandSDFMerger.java
@@ -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
@@ -26,7 +26,7 @@
  ************************************************************************/
 /*
  * Created on 2005
- *  by Christian Schmidt
+ *	by Christian Schmidt
  */
 package com.sun.star.tooling.converter;
 
@@ -37,15 +37,15 @@ import java.util.Map;
 
 /**
  * Merge GSIFiles back to to the original (!) SDFFile
- *
- *
+ * 
+ * 
  * @author Christian Schmidt 2005
  *
  */
 public class GSIandSDFMerger extends SDFReader {
-
+    
     int lineCounter=0;
-
+    
     GSIReader gsiReader;
 
     private Map temp=new HashMap();
@@ -59,11 +59,11 @@ public class GSIandSDFMerger extends SDFReader {
     private int count;
     /**
      * Merge the GSIFile back to the original(!) SDFFile
-     *
+     * 
      * @param source the file to read from
      * @param sourceLanguage the source language in the source file
      * @param targetLanguage the target language in the source file
-     * @param charset   the charset of the files
+     * @param charset   the charset of the files 
      * @throws java.io.IOException
      * @throws Exception
      */
@@ -77,7 +77,7 @@ public class GSIandSDFMerger extends SDFReader {
         gsiReader=new GSIReader(source,sourceLanguage,targetLanguage,charset);
 
     }
-
+    
     /* (non-Javadoc)
      * @see com.sun.star.tooling.converter.DataReader#getData()
      */
@@ -90,15 +90,15 @@ public class GSIandSDFMerger extends SDFReader {
             OutputHandler.out("Blocks merged :         "+this.lineCounter);
         }
         return temp;
-
+        
     }
-
+    
     /**
      * Read each block of the GSIFile and check whether there is a matching
-     * block in the SDFFile. Match depends on the BlockNr and BlockId.
-     *
+     * block in the SDFFile. Match depends on the BlockNr and BlockId.  
+     * 
      * @return A Map that contains the source language content
-     *          and  the target language content.
+     *          and  the target language content. 
      * @throws IOException
      * @throws ConverterException
      */
@@ -107,7 +107,7 @@ public class GSIandSDFMerger extends SDFReader {
 
         try {
             //System.out.println("Start...");
-
+            
             if (dontLoadGSI||(gsiBlock=gsiReader.getGSIData())!=null){
                 dontLoadGSI=false;
                 //check if we must update this block
@@ -115,14 +115,14 @@ public class GSIandSDFMerger extends SDFReader {
                 if((sdfBlock = super.getData())!=null){
 
                     if(((String)sdfBlock.get("BlockNr")).equals((String)gsiBlock.get("BlockNr"))){
-
+                          
                         gsiBlock.remove(EMPTY);
                          //if the target language string is empty this may be caused by an error in the source sdf File
                          //I don't want to overwrite a possibly correct translation with an empty string
                          // so remove the target part from the gsiBlock
                         Map mp=(Map)gsiBlock.get(gsiReader.targetLanguage);
                         if (mp.size()!=0&&!((String)mp.get("TargetText")).equals("")){
-
+                            
                              // target language part in this gsiBlock
 //                             if(((String)mp.get("TargetText")).equals("")){
 //                                 gsiBlock.remove(targetLanguage);
@@ -131,16 +131,16 @@ public class GSIandSDFMerger extends SDFReader {
                              lineCounter++;
                              Map helpMap = (Map)gsiBlock.get(super.targetLanguage);//"ja"
                              sdfBlock.putAll(helpMap);
-                             skip=false;
+                             skip=false; 
                         }else{
                             //no target language part in this gsiBlock
                              skip=true;
 //
 //                             return null;
-                         }
+                         } 
                     }else{
 //                        skip=true;
-//
+//                        
 //                    // we cant match this gsi block to the current sdf block
                       // try matching the next sdf block with this gsi line
                        dontLoadGSI=true;
@@ -148,17 +148,17 @@ public class GSIandSDFMerger extends SDFReader {
                 }
                 return sdfBlock;
             }
-
+            
         } catch (IOException e) {
-
+            
             e.printStackTrace();
         }
         return null;
     }
+    
 
 
-
-
-
+   
+   
 
 }
diff --git a/l10ntools/java/l10nconv/java/com/sun/star/tooling/converter/LineErrorException.java b/l10ntools/java/l10nconv/java/com/sun/star/tooling/converter/LineErrorException.java
index 26ce5a6518eb..7f87e99fee37 100755
--- a/l10ntools/java/l10nconv/java/com/sun/star/tooling/converter/LineErrorException.java
+++ b/l10ntools/java/l10nconv/java/com/sun/star/tooling/converter/LineErrorException.java
@@ -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
@@ -26,7 +26,7 @@
  ************************************************************************/
 /*
  * Exception for errors in
- * SDFLines
+ * SDFLines 
  */
 package com.sun.star.tooling.converter;
 
@@ -34,7 +34,7 @@ package com.sun.star.tooling.converter;
 /**
  * This Exeption is thrown if a DataReader finds an error in a read Line
  * f. e. wrong column number
- *
+ * 
  * @author Christian Schmidt 2005
  *
  */
@@ -42,11 +42,11 @@ public class LineErrorException extends Exception {
 
      public int tokenCount;
     /**
-     *
+     *  
      */
     public LineErrorException() {
         super();
-
+        
     }
 
     /**
@@ -54,7 +54,7 @@ public class LineErrorException extends Exception {
      */
     public LineErrorException(String arg0) {
         super(arg0);
-
+       
     }
 
     /**
@@ -62,7 +62,7 @@ public class LineErrorException extends Exception {
      */
     public LineErrorException(Throwable arg0) {
         super(arg0);
-
+      
     }
 
     /**
@@ -71,8 +71,8 @@ public class LineErrorException extends Exception {
      */
     public LineErrorException(String arg0, Throwable arg1) {
         super(arg0, arg1);
-
+        
     }
-
+    
 
 }
 \ No newline at end of file
diff --git a/l10ntools/java/l10nconv/java/com/sun/star/tooling/converter/OutputHandler.java b/l10ntools/java/l10nconv/java/com/sun/star/tooling/converter/OutputHandler.java
index 997a522acedb..a874839a99a7 100755
--- a/l10ntools/java/l10nconv/java/com/sun/star/tooling/converter/OutputHandler.java
+++ b/l10ntools/java/l10nconv/java/com/sun/star/tooling/converter/OutputHandler.java
@@ -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
@@ -26,7 +26,7 @@
  ************************************************************************/
 /*
  * Creates logfile and file for debug information
- *
+ * 
  */
 package com.sun.star.tooling.converter;
 
@@ -34,11 +34,11 @@ import java.io.BufferedWriter;
 import java.io.IOException;
 
 /**
- * Handle the whole output during converting process except the converted files.
- * Write output to logfiles and to screen depending on switches given
+ * Handle the whole output during converting process except the converted files. 
+ * Write output to logfiles and to screen depending on switches given 
  * at command line.
  * @author Christian Schmidt 2005
- *
+ *  
  */
 public class OutputHandler {
 
@@ -67,7 +67,7 @@ public class OutputHandler {
     /**
      * Write the data to screen and if the switches were set to
      * logfile and debugfile
-     *
+     * 
      * @param out the String to write
      */
     final static void out(String out) {
@@ -100,9 +100,9 @@ public class OutputHandler {
     }
 
     /**
-     * write the data to log file and if the switch is set
+     * write the data to log file and if the switch is set 
      * to the debug file
-     *
+     * 
      * @param out the String to write
      */
     final static void log(String out) {
@@ -127,7 +127,7 @@ public class OutputHandler {
 
     /**
      * write the string to the debug file
-     *
+     * 
      * @param out the String to write
      * @throws IOException
      */
@@ -145,7 +145,7 @@ public class OutputHandler {
 
     /**
      * Set a new value to indicate whether a debug file should be written or not
-     *
+     * 
      * @param doDebug
      *            The debug value to set.
      */
@@ -153,16 +153,16 @@ public class OutputHandler {
         OutputHandler.doDebug = doDebug;
     }
 
-    //  /**
-    //   * @return Returns the doDebug.
-    //   */
-    //  private static boolean isDebug() {
-    //      return doDebug;
-    //  }
+    //	/**
+    //	 * @return Returns the doDebug.
+    //	 */
+    //	private static boolean isDebug() {
+    //		return doDebug;
+    //	}
 
     /**
-     * Set the debug file to write to.
-     *
+     * Set the debug file to write to. 
+     * 
      * @param dbgFile
      *            The debug File to use.
      */
diff --git a/l10ntools/java/l10nconv/java/com/sun/star/tooling/converter/ResTypeResolver.java b/l10ntools/java/l10nconv/java/com/sun/star/tooling/converter/ResTypeResolver.java
index 585f69fe2c88..7466660c1a9d 100755
--- a/l10ntools/java/l10nconv/java/com/sun/star/tooling/converter/ResTypeResolver.java
+++ b/l10ntools/java/l10nconv/java/com/sun/star/tooling/converter/ResTypeResolver.java
@@ -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
@@ -26,7 +26,7 @@
  ************************************************************************/
 /*
  * Created on 2005
- *  by Christian Schmidt
+ *	by Christian Schmidt
  */
 package com.sun.star.tooling.converter;
 
@@ -35,7 +35,7 @@ import java.util.Map;
 /**
  * Helps resolving restype descriptors used outside the tool to
  * restype descriptors used by this  tool
- *
+ * 
  * @author Christian Schmidt 2005
  *
  */
@@ -44,20 +44,20 @@ public class ResTypeResolver {
     final static String[] outFields={"res","res-quickhelp","res-help","res-title"};
     final static Map internKeys=new ExtMap(inFields,outFields);
     final static Map externKeys=new ExtMap(outFields,inFields);
-
+    
     /**
      * Get the intern key depending to the given extern key
-     *
+     * 
      * @param externKey the externKey {"res","res-quickhelp","res-help","title"}
      * @return the depending intern key
      */
     public static String getInternKey(String externKey){
         return (String)externKeys.get(externKey);
     }
-
+    
     /**
      * Get the extern key to the given intern key
-     *
+     * 
      * @param internKey the internal key
      * @return the external key
      */
diff --git a/l10ntools/java/l10nconv/java/com/sun/star/tooling/converter/Resolver.java b/l10ntools/java/l10nconv/java/com/sun/star/tooling/converter/Resolver.java
index 557731fe88f1..88f2235e0995 100755
--- a/l10ntools/java/l10nconv/java/com/sun/star/tooling/converter/Resolver.java
+++ b/l10ntools/java/l10nconv/java/com/sun/star/tooling/converter/Resolver.java
@@ -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
@@ -51,7 +51,7 @@ public class Resolver implements EntityResolver {
 
     /**
      * Allow the application to resolve external entities.
-     *
+     * 
      * The Parser will call this method before opening any external entity
      * except the top-level document entity (including the external DTD subset,
      * external entities referenced within the DTD, and external entities
@@ -59,11 +59,11 @@ public class Resolver implements EntityResolver {
      * the parser resolve the entity itself, that it use an alternative URI, or
      * that it use an entirely different input source.
      */
-
+    
     /* (non-Javadoc)
      * @see org.xml.sax.EntityResolver#resolveEntity(java.lang.String, java.lang.String)
      */
-
+    
     public InputSource resolveEntity(String publicId, String systemId)
             throws SAXException, IOException {
 
diff --git a/l10ntools/java/l10nconv/java/com/sun/star/tooling/converter/SDFReader.java b/l10ntools/java/l10nconv/java/com/sun/star/tooling/converter/SDFReader.java
index 9e47ae73c719..9b5d0ac41c2a 100755
--- a/l10ntools/java/l10nconv/java/com/sun/star/tooling/converter/SDFReader.java
+++ b/l10ntools/java/l10nconv/java/com/sun/star/tooling/converter/SDFReader.java
@@ -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
@@ -27,7 +27,7 @@
 /*
  * SDFReader.java
  *
- *
+ * 
  */
 
 package com.sun.star.tooling.converter;
@@ -39,25 +39,25 @@ import java.io.InputStreamReader;
 import java.text.DecimalFormat;
 import java.util.*;
 
-/**
- *
- * SDFReader is a FileReader that knows about
+/**  
+ * 
+ * SDFReader is a FileReader that knows about 
  * the content of SDFFiles
- *
- * A SDFBlock is read of the given file. A SDFBlock
- * consists of all SDFLines that are traanslations of the
+ * 
+ * A SDFBlock is read of the given file. A SDFBlock 
+ * consists of all SDFLines that are traanslations of the 
  * same String and the SDFLine containing the source string
  * itself. SDFFile lines are read and checked whether they
- * have the allowed column count and  don't contain illeagal
+ * have the allowed column count and  don't contain illeagal 
  * characters (like most unprintable characters below 0x00df).
- * If the given source language is not found in the first
- * block of SDFLines a ConverterException is thrown at runtime.
+ * If the given source language is not found in the first 
+ * block of SDFLines a ConverterException is thrown at runtime. 
  * If the given target language is "" (that means not given)
- * the first language that is not the given source language
+ * the first language that is not the given source language 
  * is taken for target language. The found values are returned in HashMaps that
  * use the following keys:
  * <br/>
- *  "BlockNr" originally coming from reading the sdf file, contains 'block nr in sdf file'+'-'+'hash value of the sdf id fields'.<br/>
+ *  "BlockNr" originally coming from reading the sdf file, contains 'block nr in sdf file'+'-'+'hash value of the sdf id fields'.<br/> 
  *  "Project"  first column in sdf file format.<br/>
  *  "SourceFile" second column in sdf file format.<br/>
  *  "Dummy" third column in sdf file format.<br/>
@@ -67,20 +67,20 @@ import java.util.*;
  *  "HID" 7. column in sdf file format.<br/>
  *  "Platform" 8. column in sdf file format. <br/>
  *  "Width", 9. column in sdf file format.<br/>
- *  "SourceLanguageID" 10. column in sdf file format(in the line with the source language).<br/>
+ *  "SourceLanguageID" 10. column in sdf file format(in the line with the source language).<br/> 
  *  "SourceText"  11. column in sdf file format(in the line with the source language).<br/>
  *  "SourceHText" 12. column in sdf file format(in the line with the source language).<br/>
  *  "SourceQText" 13. column in sdf file format(in the line with the source language).<br/>
- *  "SourceTitle" 14. column in sdf file format(in the line with the source language).<br/>
+ *  "SourceTitle" 14. column in sdf file format(in the line with the source language).<br/> 
  *  "TargetLanguageID" 10. column in sdf file format (in the line with the target language).<br/>
  *  "TargetText" 11. column in sdf file format (in the line with the target language).<br/>
  *  "TargetHText" 12. column in sdf file format (in the line with the target language).<br/>
  *  "TargetQText"  13. column in sdf file format (in the line with the target language).<br/>
  *  "TargetTitle", 14. column in sdf file format (in the line with the target language).<br/>
  *  "TimeStamp" 15. column in sdf file format.<br/>
- *
+ *  
  * @author Christian Schmidt 2005
- *
+ * 
  */
 
 public class SDFReader extends DataReader {
@@ -132,7 +132,7 @@ public class SDFReader extends DataReader {
      * language line
      */
     private Map[]         data            = { sourceMap, targetMap };
-
+    
     /**
      * The Id of the current SDFBlock
      */
@@ -142,7 +142,7 @@ public class SDFReader extends DataReader {
      * The SDF file to read from
      */
     private File          sourceFile;
-
+    
     /**
      * The language in the source file that should be handelt as source language
      */
@@ -152,12 +152,12 @@ public class SDFReader extends DataReader {
      * The language in the source file that should be handelt as target language
      */
     protected String      targetLanguage;
-
+    
     /**
      * A counter holding the number of blocks just read
      * from this file
      */
-    private long           blockNr         = 0;// If we use Integer, more then numbers greater than 128k would be signed
+    private long           blockNr         = 0;// If we use Integer, more then numbers greater than 128k would be signed 
 
     /**
      * A counter holding the number of skipped lines that means
@@ -166,18 +166,18 @@ public class SDFReader extends DataReader {
     private int           skippedLines    = 0;
 
     /**
-     * This switch is set for indicating that all source file lines
+     * This switch is set for indicating that all source file lines 
      * are read and no lines remain buffered. Finding this like 'true'
-     * means the source file is finished
+     * means the source file is finished 
      */
     private boolean       endIt           = false;
 
     /**
-     * Indicates whether the targetLanguage is found in this source file so far
+     * Indicates whether the targetLanguage is found in this source file so far 
      */
     private boolean       foundTarget     = false;
     /**
-     * Indicates whether the sourceLanguage is found in this source file so far
+     * Indicates whether the sourceLanguage is found in this source file so far 
      */
     private boolean       foundSource     = false;
 
@@ -213,7 +213,7 @@ public class SDFReader extends DataReader {
      * Counts the blocks without targetLanguage
      */
     private int           targetLangMiss;
-
+    
     /**
      * Counts the blocks without sourceLanguage
      */
@@ -237,12 +237,12 @@ public class SDFReader extends DataReader {
 
     /**
      * Create a new Instance of SDFREader
-     *
-     * @param source                the file to read from
+     * 
+     * @param source                the file to read from 
      * @param sourceLanguage        the sourceLanguage (must not be empty)
      * @param targetLanguage        the targetLanguage
      * @param charset               the charset used to read source
-     * @throws java.io.IOException
+     * @throws java.io.IOException     
      * @throws Exception
      */
     public SDFReader(File source, String sourceLanguage, String targetLanguage,
@@ -260,7 +260,7 @@ public class SDFReader extends DataReader {
             if ((splitLine = split(line)) != null){
                 this.CurrentBlockId = getSDFBlockId(splitLine);
                 this.CurrentBlockHash=this.CurrentBlockId.hashCode();
-                //found the first
+                //found the first 
                 this.blockNr++;
                 }
             this.splittedLineBuffer = splitLine;
@@ -268,12 +268,12 @@ public class SDFReader extends DataReader {
         reset();
 
     }
-
+    
     /* (non-Javadoc)
      * @see com.sun.star.tooling.converter.DataReader#getData()
      */
     public Map getData()throws IOException {
-
+        
         Map map=new HashMap();
 //        do {
             this.skip=false;
@@ -287,17 +287,17 @@ public class SDFReader extends DataReader {
             }else{
                 map.putAll(help[1]);
                 map.putAll(help[0]);
-
+                
             }
-//        }while(this.skip=true);
+//        }while(this.skip=true); 
         return map;
     }
 
 
     /**
-     * Read a Block from the sdf file and return
+     * Read a Block from the sdf file and return 
      * @return a Map[] where [0] holds the source and [1] the target language data.
-     *
+     * 
      * @throws java.io.IOException
      */
     public Map[] readBlock() throws java.io.IOException {
@@ -317,13 +317,13 @@ public class SDFReader extends DataReader {
                     line = this.lineBuffer;
                     splittedLine = this.splittedLineBuffer;
                     this.SDFMap = new ExtMap(SDFReader.fieldnames, splittedLine);
-
+                    
                     try {
                         checkLanguage(splittedLine);
                     } catch (ConverterException e) {
                         throw e;
                     }finally{
-
+                    
                         useBuffer = false;
                     }
                 } else {
@@ -358,7 +358,7 @@ public class SDFReader extends DataReader {
                              * we found the next block , but do we have the
                              * target text?
                              */
-
+                            
                             if (!foundTarget) {
                                 createTargetLine();
                             }
@@ -402,7 +402,7 @@ public class SDFReader extends DataReader {
                 }
 
             } catch (LineErrorException e) {
-
+                
                 OutputHandler.log(e.getMessage());
                 this.skippedLines++;
             } catch (ConverterException e) {
@@ -442,7 +442,7 @@ public class SDFReader extends DataReader {
     }
 
     /**
-     *
+     * 
      */
     private void createTargetLine() {
         targetLangMiss++;
@@ -466,7 +466,7 @@ public class SDFReader extends DataReader {
     /**
      * Show the statistic information got while
      * reading the file
-     *
+     * 
      * @throws IOException
      */
     private void showStat() throws IOException {
@@ -493,13 +493,13 @@ public class SDFReader extends DataReader {
     }
 
     /**
-     * Check the current line  whether the source language
+     * Check the current line  whether the source language 
      * or target language is in it
-     *
+     * 
      * @throws ConverterException if a not needed language or no target language is found
-     *              in this block
+     *              in this block 
      * @throws IOException
-     *
+     *  
      */
     final private void checkLanguage(String[] splittedLine)
             throws ConverterException, IOException {
@@ -509,7 +509,7 @@ public class SDFReader extends DataReader {
         if (!foundSource && this.sourceLanguage.equals(langID)) {
 //          found the next source language line
             this.data[0] = new ExtMap(SDFReader.sourceLineNames, splittedLine);
-
+             
 //            this.data[0].put("BlockNr", Integer.toHexString(blockNr));
 //            this.data[0].put("BlockHash", Integer.toHexString(this.CurrentBlockHash));
             this.data[0].put("BlockNr", blockNrFormatter.format(blockNr)+'-'+Integer.toHexString(this.CurrentBlockHash));
@@ -533,7 +533,7 @@ public class SDFReader extends DataReader {
                                 + this.sourceLanguage + " ");
                         OutputHandler.out("Target Language is: "
                                 + this.targetLanguage + " ");
-                        OutputHandler.out(EMPTY);
+                        OutputHandler.out(EMPTY);                        
                         System.out.println("Start");
 
                     } else {
@@ -572,8 +572,8 @@ public class SDFReader extends DataReader {
     }
 
     /**
-     * split the SDFLine in its columns
-     *
+     * split the SDFLine in its columns 
+     * 
      * @param   line the current SDFLine
      * @return  the splitted SDFLine as array of String
      *          or null if an error occours
@@ -592,9 +592,9 @@ public class SDFReader extends DataReader {
     /**
      * create a block Id from a splitted SDFLine
      * the blockId consists of the column one to eight of an SDF File
-     *
+     * 
      * @param splitLine    the line to create a block id from
-     * @return the blockId as String
+     * @return the blockId as String 
      */
     private String getSDFBlockId(String[] splitLine) {
         StringBuffer BlockId = new StringBuffer("");
@@ -610,11 +610,11 @@ public class SDFReader extends DataReader {
 
     /**
      * Check if there are not allowed characters in this line
-     *
+     * 
      * @param line      the SDFLine to check
      * @return          if everything, ok the original
      *                   else the wrong character as String
-     *
+     *  
      * @throws java.io.IOException
      */
     private String check(String line) throws java.io.IOException {
diff --git a/l10ntools/java/l10nconv/java/com/sun/star/tooling/converter/SDFWriter.java b/l10ntools/java/l10nconv/java/com/sun/star/tooling/converter/SDFWriter.java
index 4c79cd113f6f..d66b21ce90f3 100755
--- a/l10ntools/java/l10nconv/java/com/sun/star/tooling/converter/SDFWriter.java
+++ b/l10ntools/java/l10nconv/java/com/sun/star/tooling/converter/SDFWriter.java
@@ -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
@@ -27,7 +27,7 @@
 /*
  * SDFWriter.java
  *
- *
+ * 
  */
 
 package com.sun.star.tooling.converter;
@@ -35,8 +35,8 @@ import java.io.*;
 import java.util.Map;
 
 /**
- * Write data to a SDFFile
- *
+ * Write data to a SDFFile 
+ * 
  * @author Christian Schmidt 2005
  *
  */
@@ -57,7 +57,7 @@ public class SDFWriter  extends DataWriter {
      * an array of the SDF files column names if the source and the target language is in
      */
     final static String[]    outLineNames= {"BlockNr","Project","SourceFile","Dummy","ResType","GID","LID","HID","Platform","Width","SourceLanguageID","SourceText","SourceHText","SourceQText","SourceTitle","TargetLanguageID","TargetText","TargetHText","TargetQText","TargetTitle","TimeStamp"};
-
+    
     /**
      * A Map holding the source language line content
      */
@@ -80,31 +80,31 @@ public class SDFWriter  extends DataWriter {
      * The language to translate to
      */
     private String targetLanguage;
-
+    
 //    private boolean SourceIsFirst=false;
-
-
-
-
+    
+    
+    
+    
     /**
      * Create a new Instance of SDFWriter
-     *
+     * 
      * @param bos BufferedWriter to write to
      * @param charset the charset to use to write
      * @throws java.io.UnsupportedEncodingException
      */
     public SDFWriter(BufferedOutputStream bos,String charset) throws java.io.UnsupportedEncodingException {
         super(bos,charset);
-
+ 
     }
-
+    
     /* (non-Javadoc)
      * @see com.sun.star.tooling.converter.DataWriter#writeData()
      */
     public final void writeData() throws java.io.IOException {
-
+        
         StringBuffer buffer=new StringBuffer("");
-
+        
         // get the values of the found fields
         //create the two sdf lines
 
@@ -120,7 +120,7 @@ public class SDFWriter  extends DataWriter {
                 // so close it with lf
                 buffer.append(lineEnd);
                 Converter.countLine();
-            }
+            } 
         }
         // is there a target line with anything in the strings?
         if (!(outData.get("TargetLanguageID")==null||((outData.get("TargetTitle").equals("")&&outData.get("TargetText").equals("")&&outData.get("TargetHText").equals("")&&outData.get("TargetQText").equals(""))))){
@@ -136,13 +136,13 @@ public class SDFWriter  extends DataWriter {
                     //so close it with lf
                     buffer.append(lineEnd);
                     Converter.countLine();
-                }
+                } 
             }
         }
         this.write(buffer.toString());
-
+        
     }
-
+    
 
 
     /* (non-Javadoc)
@@ -150,14 +150,14 @@ public class SDFWriter  extends DataWriter {
      */
     protected void writeData(Map[] data) throws IOException {
         // TODO redesign DataHandler in the way that this is not nessesary any more
-
+        
     }
 
     /* (non-Javadoc)
      * @see com.sun.star.tooling.converter.DataWriter#getDataFrom(com.sun.star.tooling.converter.DataHandler)
      */
     protected void getDataFrom(DataHandler handler) throws IOException {
-
+        
         handler.putDataTo(this.outData);
     }
 
@@ -165,8 +165,8 @@ public class SDFWriter  extends DataWriter {
      * @see com.sun.star.tooling.converter.DataWriter#getDatafrom(com.sun.star.tooling.converter.DataHandler)
      */
     protected void getDatafrom(DataHandler handler) throws IOException {
-
+        
         handler.putDataTo(this.outData);
-
+        
     }
 }
diff --git a/l10ntools/java/l10nconv/java/com/sun/star/tooling/converter/XLIFFReader.java b/l10ntools/java/l10nconv/java/com/sun/star/tooling/converter/XLIFFReader.java
index 76d14bd98569..88242070a538 100755
--- a/l10ntools/java/l10nconv/java/com/sun/star/tooling/converter/XLIFFReader.java
+++ b/l10ntools/java/l10nconv/java/com/sun/star/tooling/converter/XLIFFReader.java
@@ -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
@@ -27,7 +27,7 @@
 /*
  * XLIFFReader.java
  *
- *
+ * 
  */
 package com.sun.star.tooling.converter;
 
@@ -47,13 +47,13 @@ import org.xml.sax.helpers.DefaultHandler;
 /**
  * Parse the given file and extract the content needed.
  * <br/>
- * This Reader understands the parts of the
+ * This Reader understands the parts of the 
  * <a href="http://www.oasis-open.org/committees/xliff/documents/cs-xliff-core-1.1-20031031.htm">xliff</a> spezification used to translate
  *  the strings in Star-Office and Open-Office.
  *  <br/>
  *  The given file is parsed and the content is stored in a HashMap with those keys:
  *  <br/>
- *  "BlockNr" originally coming from reading the sdf file, contains 'block nr in sdf file'+'-'+'hash value of the sdf id fields'.<br/>
+ *  "BlockNr" originally coming from reading the sdf file, contains 'block nr in sdf file'+'-'+'hash value of the sdf id fields'.<br/> 
  *   "Project"  first column in sdf file format.<br/>
  *  "SourceFile" second column in sdf file format.<br/>
  *  "Dummy" third column in sdf file format.<br/>
@@ -63,11 +63,11 @@ import org.xml.sax.helpers.DefaultHandler;
  *  "HID" 7. column in sdf file format.<br/>
  *  "Platform" 8. column in sdf file format. <br/>
  *  "Width", 9. column in sdf file format.<br/>
- *  "SourceLanguageID" 10. column in sdf file format(in the line with the source language).<br/>
+ *  "SourceLanguageID" 10. column in sdf file format(in the line with the source language).<br/> 
  *  "SourceText"  11. column in sdf file format(in the line with the source language).<br/>
  *  "SourceHText" 12. column in sdf file format(in the line with the source language).<br/>
  *  "SourceQText" 13. column in sdf file format(in the line with the source language).<br/>
- *  "SourceTitle" 14. column in sdf file format(in the line with the source language).<br/>
+ *  "SourceTitle" 14. column in sdf file format(in the line with the source language).<br/> 
  *  "TargetLanguageID" 10. column in sdf file format (in the line with the target language).<br/>
  *  "TargetText" 11. column in sdf file format (in the line with the target language).<br/>
  *  "TargetHText" 12. column in sdf file format (in the line with the target language).<br/>
@@ -81,7 +81,7 @@ import org.xml.sax.helpers.DefaultHandler;
 public class XLIFFReader extends DefaultHandler {
 
     /**
-     * A String array holding the keys used by the HashMap holding the Data
+     * A String array holding the keys used by the HashMap holding the Data  
      */
     private final String[]      dataNames     = { "BlockNr", "Project",
             "SourceFile", "Dummy", "ResType", "GID", "LID", "HID", "Platform",
@@ -90,7 +90,7 @@ public class XLIFFReader extends DefaultHandler {
             "TargetHText", "TargetQText", "TargetTitle", "TimeStamp" };
 
     /**
-     * Used to index in the data array
+     * Used to index in the data array 
      */
     static int                  index         = 0;
 
@@ -100,7 +100,7 @@ public class XLIFFReader extends DefaultHandler {
     private Map                 moveData      = new ExtMap();
 
     /**
-     * A Map that holds  yet incomplete data
+     * A Map that holds  yet incomplete data 
      * until all depending transunits are found
      */
     private Hashtable           DataStore     = new Hashtable();
@@ -128,7 +128,7 @@ public class XLIFFReader extends DefaultHandler {
 
     /**
      * data holds the information created while parsing
-     *
+     *  
      */
     private String[]            data          = new String[26];
 
@@ -164,7 +164,7 @@ public class XLIFFReader extends DefaultHandler {
     private String              targetLanguage;
 
     /**
-     * indicates whether this is the first Transunit
+     * indicates whether this is the first Transunit 
      */
     private boolean             isFirst       = true;
 
@@ -269,7 +269,7 @@ public class XLIFFReader extends DefaultHandler {
      * Index for the Found Parts Counter in the data array
      */
     private static final int FOUND_PARTS_COUNTER_IDX = 18;
-
+    
     /**
      * used to find the matching ISO or RFC3066 language code
      */
@@ -281,8 +281,8 @@ public class XLIFFReader extends DefaultHandler {
 
     /**
      * Create a new Instance of XLIFFReader
-     *
-     * @param handler the DataHandler to use
+     * 
+     * @param handler the DataHandler to use 
      * @param target the target used
      * @throws IOException
      */
@@ -291,21 +291,21 @@ public class XLIFFReader extends DefaultHandler {
         this.handler = handler;
         this.target = target;
     }
-
+    
     /**
      * Create a new Instance of XLIFFReader
-     *
-     * @param handler the DataHandler to use
+     * 
+     * @param handler the DataHandler to use 
      * @param target the target used
      * @param doBlockCompleteCheck indicates whether every single transunit should be returned or the whole block data is to be collected
-     *
+     *  
      * @throws IOException
      */
     public XLIFFReader(DataHandler handler, DataWriter target,boolean doBlockCompleteCheck) throws IOException {
         this(handler, target);
         this.languageResolver = new LanguageResolver();
         this.doBlockCompleteCheck=doBlockCompleteCheck;
-
+        
     }
 
     /**
@@ -374,7 +374,7 @@ public class XLIFFReader extends DefaultHandler {
 
             storeIt=true;
             return;
-
+            
         }
         if (qName.equals("target")) {
             if ((resType = data[RESTYPE_IDX]) == null) {
@@ -382,7 +382,7 @@ public class XLIFFReader extends DefaultHandler {
             } else {
                 if ("res".equals(resType)) {
                     index = TARGET_TEXT_IDX;
-
+                    
                     storeIt = true;
                     return;
                 }
@@ -393,13 +393,13 @@ public class XLIFFReader extends DefaultHandler {
                 //                }
                 if ("res-QuickHelp".equals(resType)) {
                     index = TARGET_QUICKHELP_TEXT_IDX;
-
+                    
                     storeIt = true;
                     return;
                 }
                 if ("res-Title".equals(resType)) {
                     index = TARGET_TITLE_TEXT_IDX;
-
+                    
                     storeIt = true;
                     return;
                 }
@@ -412,7 +412,7 @@ public class XLIFFReader extends DefaultHandler {
             } else {
                 if ("res".equals(resType)) {
                     index = SOURCE_TEXT_IDX;
-
+                    
                     storeIt = true;
                     return;
                 }
@@ -450,7 +450,7 @@ public class XLIFFReader extends DefaultHandler {
         if (qName.equals("trans-unit")) {
             String id = attrs.getValue("id");
             if ((DataStore.get(id)) != null) {
-                //TODO arraycopy might not be nessessary
+                //TODO arraycopy might not be nessessary 
                 System.arraycopy((String[]) DataStore.get(id), 0, data, 0,
                         data.length);
                 int help = (new Integer(data[FOUND_PARTS_COUNTER_IDX])).intValue(); //found one more part
@@ -468,7 +468,7 @@ public class XLIFFReader extends DefaultHandler {
         }
 
         if (qName.equals("context")) {
-
+            
             String value = attrs.getValue("context-type");
 
             if ("SourceHelpText".equals(value)) {
@@ -570,7 +570,7 @@ public class XLIFFReader extends DefaultHandler {
      * @see org.xml.sax.ErrorHandler#fatalError(org.xml.sax.SAXParseException)
      */
     public void fatalError(SAXParseException e) throws SAXParseException {
-
+     
         OutputHandler.log("PARSE ERROR in line " + e.getLineNumber() + ", "
                 + e.getMessage() );
 
@@ -585,9 +585,9 @@ public class XLIFFReader extends DefaultHandler {
     }
 
     /**
-     * Put the Data to the DataHandler
+     * Put the Data to the DataHandler  
      * tell the Writer to write it
-     *
+     *  
      * @throws SAXException
      */
     public void showData() throws SAXException {
@@ -627,10 +627,10 @@ public class XLIFFReader extends DefaultHandler {
         initData();
     }
 
-
+    
     /**
      * put the data in an Map in the format that
-     * DataHandler can handle it
+     * DataHandler can handle it 
      */
     final public void moveData() {
 
@@ -685,16 +685,16 @@ public class XLIFFReader extends DefaultHandler {
     /**
      * complete means all depending parts have been found esp. all res types
      * that belong to the same SDF Line
-     *
+     * 
      * @return true if the data is complete
-     *
+     *  
      */
     final public boolean isComplete() {
-
+        
         if(!doBlockCompleteCheck){
             return true;
         }
-
+       
         String sParts;
         if (data[FOUND_PARTS_COUNTER_IDX] == EMPTY)
             data[FOUND_PARTS_COUNTER_IDX] = "1"; //this is the first part
@@ -713,7 +713,7 @@ public class XLIFFReader extends DefaultHandler {
     /**
      * show the user that it is going
      * on by printing dots on the screen
-     *
+     * 
      */
     private void makeDot() {
         int count = 0;
@@ -725,7 +725,7 @@ public class XLIFFReader extends DefaultHandler {
 
     /**
      * show the statistic data found while parse this file
-     *
+     * 
      * @throws IOException
      */
     final void showStatistic() throws IOException {
diff --git a/l10ntools/java/l10nconv/java/com/sun/star/tooling/converter/XLIFFWriter.java b/l10ntools/java/l10nconv/java/com/sun/star/tooling/converter/XLIFFWriter.java
index d7b6160dcc95..15a618b0d6d6 100755
--- a/l10ntools/java/l10nconv/java/com/sun/star/tooling/converter/XLIFFWriter.java
+++ b/l10ntools/java/l10nconv/java/com/sun/star/tooling/converter/XLIFFWriter.java
@@ -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
@@ -25,11 +25,11 @@
  *
  ************************************************************************/
 /*
- *
+ * 
  /*
  * XLIFFWriter.java
  *
- *
+ * 
  */
 
 package com.sun.star.tooling.converter;
@@ -42,8 +42,8 @@ import com.sun.star.tooling.languageResolver.LanguageResolver;
 import com.sun.star.tooling.languageResolver.LanguageResolver.LanguageResolvingException;
 
 /**
- * Write the Data to a wellformed XLIFF File
- *
+ * Write the Data to a wellformed XLIFF File 
+ * 
  * @author Christian Schmidt
  */
 public class XLIFFWriter extends DataWriter {
@@ -71,32 +71,32 @@ public class XLIFFWriter extends DataWriter {
             "SourceQText", "SourceTitle", "TargetLanguageID", "TargetText",
             "TargetHText", "TargetQText", "TargetTitle", "TimeStamp" };
     /**
-     * An Map holding the source and target content
+     * An Map holding the source and target content 
      */
     private final Map data = new ExtMap(outLineNames, null);
 
 
     /**
-     * Indicates if this is the first Transunit to write
+     * Indicates if this is the first Transunit to write 
      */
     boolean isFirst = true;
-
+    
     LanguageResolver languageResolver;
 
-
+    
     /**
      * Create a new Instance of XLIFFWriter
-     *
+     * 
      * @param bos the Buffered Output Stream to write to
      * @param charset the charset to use
-     * @throws IOException
+     * @throws IOException 
      */
     public XLIFFWriter(BufferedOutputStream bos, String charset)
             throws IOException {
         super(bos, charset);
         this.languageResolver =new LanguageResolver();
-
-
+        
+        
     }
 
     /* (non-Javadoc)
@@ -107,8 +107,8 @@ public class XLIFFWriter extends DataWriter {
     }
 
     /**
-     * check if the item is an empty String
-     *
+     * check if the item is an empty String 
+     * 
      * @param item the string to check
      * @return true if it is not empty, false if it is empty
      */
@@ -120,7 +120,7 @@ public class XLIFFWriter extends DataWriter {
 
     /**
      * Replaces all characters that mustn't be in XLIFF PCdata
-     *
+     * 
      * @param string the string to check
      * @return the checked string with all characters replaced
      * @throws java.io.IOException
@@ -129,17 +129,17 @@ public class XLIFFWriter extends DataWriter {
         if (string == null)
             return string; // ""
         String str = string;
-//      str = str.replaceAll("&", "&amp;");
-//      str = str.replaceAll("<", "&lt;");
-//      str = str.replaceAll(">", "&gt;");
-//      str = str.replaceAll("\"", "&quot;");
-//      str = str.replaceAll("'", "&apos;");
+//		str = str.replaceAll("&", "&amp;");
+//		str = str.replaceAll("<", "&lt;");
+//		str = str.replaceAll(">", "&gt;");
+//		str = str.replaceAll("\"", "&quot;");
+//		str = str.replaceAll("'", "&apos;");
          for(int i=0;i<str.length();i++){
              if(str.charAt(i)=='&'){
                  str=str.substring(0, i)+"&amp;"+str.substring(i+1);
                  continue;
              }
-
+    
              if(str.charAt(i)=='<'){
                  str=str.substring(0, i)+"&lt;"+str.substring(i+1);
                  continue;
@@ -178,30 +178,30 @@ public class XLIFFWriter extends DataWriter {
      */
     public void writeData() throws IOException {
         if (isFirst) {
-
+            
             writeHeader();
             isFirst = false;
         }
         try{
             writeTransUnit();
         }catch(DirtyTagWrapper.TagWrapperException e){
-
+            
         }
     }
 
     /**
      * Write the XLIFFFiles header
-     *
+     * 
      * @throws IOException
      */
-    private void writeHeader() throws IOException {
+    private void writeHeader() throws IOException { 
 
         this.write(getHeader());
     }
 
     /**
      * Write the XLIFFFiles Trailer
-     *
+     * 
      * @throws IOException
      */
     private void writeTrailer() throws IOException {
@@ -210,20 +210,20 @@ public class XLIFFWriter extends DataWriter {
 
     /**
      * Write the next TransUnit
-     *
+     * 
      * @throws IOException
      */
     private void writeTransUnit() throws IOException, DirtyTagWrapper.TagWrapperException {
         try{
             StringBuffer writeBuffer = new StringBuffer(1000);
-
+    
             StringBuffer allLinesEnd = new StringBuffer(200);
             String sRessource = "";
             int parts = 0;
             if (data == null) {
                 OutputHandler.out("error");// TBD Exception
             }
-
+            
             if (!(this.data.get("SourceText").equals("") || this.data.get(
                     "SourceText").equals(" "))) {
                 parts++;
@@ -243,10 +243,10 @@ public class XLIFFWriter extends DataWriter {
             if (!(this.data.get("SourceText").equals("") || this.data.get(
                     "SourceText").equals(" "))) {
                 sRessource = "res"; // normal TEXT source
-
+                
                 allLinesEnd
                         .append("\t\t\t\t<context-group name=\"StarOffice Attributes\">\n");
-
+                
                 if (isUsed((String) this.data.get("ResType")))
                     allLinesEnd
                             .append("\t\t\t\t\t<context context-type=\"DBType\">"
@@ -299,7 +299,7 @@ public class XLIFFWriter extends DataWriter {
                             + "</context>\n");
                 allLinesEnd.append("\t\t\t\t</context-group>\n"
                         + "\t\t\t</trans-unit>\n");
-
+    
                 writeBuffer.append("\t\t\t<trans-unit id=\""
                         + this.data.get("BlockNr") + ":" + parts + "\" restype=\""
                         + sRessource + "\" translate=\"yes\">\n");
@@ -308,7 +308,7 @@ public class XLIFFWriter extends DataWriter {
                             + languageResolver.getRFCFromISO((String)this.data.get("SourceLanguageID")) + "\">"
                             + DirtyTagWrapper.wrapString((String) this.data.get("SourceText"))
                             + "</source>\n");
-
+    
                 if (isUsed((String) this.data.get("TargetText")))
                     writeBuffer
                             .append("\t\t\t\t<target state=\"to_translate\" xml:lang=\""
@@ -318,7 +318,7 @@ public class XLIFFWriter extends DataWriter {
                                             .get("TargetText")) + "</target>\n");
                 writeBuffer.append(allLinesEnd);
                 Converter.countLine();
-
+    
             }
             // if(!(this.data.get("SourceHText").equals("")||this.data.get("SourceHText").equals("
             // "))){
@@ -336,7 +336,7 @@ public class XLIFFWriter extends DataWriter {
             // writeBuffer.append(allLinesEnd);
             // Converter.countLine();
             // }
-
+    
             if (!(this.data.get("SourceQText").equals("") || this.data.get(
                     "SourceQText").equals(" "))) {
                 sRessource = "res-QuickHelp"; // Source is OuickHelp
@@ -359,11 +359,11 @@ public class XLIFFWriter extends DataWriter {
                 writeBuffer.append(allLinesEnd);
                 Converter.countLine();
             }
-
+    
             if (!(this.data.get("SourceTitle").equals("") || this.data.get(
                     "SourceTitle").equals(" "))) {
                 sRessource = "res-Title"; // Source is Title
-
+                
                 writeBuffer.append("\t\t\t<trans-unit id=\""
                         + this.data.get("BlockNr") + ":" + parts + "\" restype=\""
                         + sRessource + "\" translate=\"yes\">\n");// always translate
@@ -389,8 +389,8 @@ public class XLIFFWriter extends DataWriter {
     }
 
     /**
-     * Create the XLIFFFiles Header
-     *
+     * Create the XLIFFFiles Header 
+     * 
      * @return the header as string
      * @throws java.io.UnsupportedEncodingException
      */
@@ -399,18 +399,18 @@ public class XLIFFWriter extends DataWriter {
                 (getProcessingInstructionTag() + getDTDLine()
                         + openVersionLine() + openFileLine() + getHeaderTag() + openBodyTag())
                         .getBytes(), "UTF8");
-
+        
     }
 
     /**
      * Create the XLIFFFiles Trailer
-     *
+     * 
      * @return the trailer as string
      */
     private String getTrailer() {
         return closeBodyTag() + closeFileLine() + closeVersionLine();
     }
-
+    
     /**
      * Create the Processing Instruction Tag used by this XLIFFFile
      * @return the Processing Instruction Tag used by this XLIFFFile
@@ -439,7 +439,7 @@ public class XLIFFWriter extends DataWriter {
 
     /**
      * Create the beginning of the line holding the version of this XIFFFile
-     *
+     * 
      * @return a string  with the beginning of the line holding the version of this XIFFFile
      */
     private String openVersionLine() {
@@ -447,7 +447,7 @@ public class XLIFFWriter extends DataWriter {
     }
     /**
      * Create the ending of the line holding the version of this XIFFFile
-     *
+     * 
      * @return a string  with the ending of the line holding the version of this XIFFFile
      */
     private String closeVersionLine() {
@@ -455,11 +455,11 @@ public class XLIFFWriter extends DataWriter {
     }
     /**
      * Create the beginning of the line holding the file tag of this XIFFFile
-     *
+     * 
      * @return a string  with the beginning of the file tag of this XIFFFile
      */
     private String openFileLine() {
-
+        
             String FileTagStart = "\t<file";
             String FileDataType = " datatype=\"STAROFFICE\"";
             String FileDate = " date=\"" + this.data.get("TimeStamp") + "\"";
@@ -478,11 +478,11 @@ public class XLIFFWriter extends DataWriter {
             String FileTagEnd = ">";
             return FileTagStart + FileDataType + FileDate + FileOriginal
                 + FileSourceLanguage + FileTargetLanguage + FileTagEnd;
-
+        
     }
     /**
      * Create the ending of the line holding the file tag of this XIFFFile
-     *
+     * 
      * @return a string  with the ending of the file tag of this XIFFFile
      */
     private String closeFileLine() {
@@ -497,7 +497,7 @@ public class XLIFFWriter extends DataWriter {
     }
     /**
      * Create the begining of the line holding the body tag of this XIFFFile
-     *
+     * 
      * @return a string  with the begining of the body tag of this XIFFFile
      */
     private String openBodyTag() {
@@ -505,7 +505,7 @@ public class XLIFFWriter extends DataWriter {
     }
     /**
      * Create the ending of the line holding the body tag of this XIFFFile
-     *
+     * 
      * @return a string  with the ending of the body tag of this XIFFFile
      */
     private String closeBodyTag() {
@@ -514,7 +514,7 @@ public class XLIFFWriter extends DataWriter {
 
     /*
      * (non-Javadoc)
-     *
+     * 
      * @see com.sun.star.tooling.converter.DataWriter#writeData(java.util.Map[])
      */
     protected void writeData(Map[] data) throws IOException {
@@ -524,9 +524,9 @@ public class XLIFFWriter extends DataWriter {
 
     /*
      * (non-Javadoc)
-     *
+     * 
      * @see com.sun.star.tooling.converter.DataWriter#getDataFrom(com.sun.star.tooling.converter.DataHandler)
      */
-    protected void getDataFrom(DataHandler handler) {   }
+    protected void getDataFrom(DataHandler handler) {	}
 
 }
diff --git a/l10ntools/java/l10nconv/java/com/sun/star/tooling/languageResolver/LanguageResolver.java b/l10ntools/java/l10nconv/java/com/sun/star/tooling/languageResolver/LanguageResolver.java
index 4015c3acd2a7..5dbc8b68b32d 100755
--- a/l10ntools/java/l10nconv/java/com/sun/star/tooling/languageResolver/LanguageResolver.java
+++ b/l10ntools/java/l10nconv/java/com/sun/star/tooling/languageResolver/LanguageResolver.java
@@ -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
@@ -26,7 +26,7 @@
  ************************************************************************/
 /*
  * Created on 2005
- *  by Christian Schmidt
+ *	by Christian Schmidt
  */
 package com.sun.star.tooling.languageResolver;
 
@@ -40,7 +40,7 @@ import java.util.ListIterator;
 /**
  * Translate language codes into another format
  * between ISO, RFC3066 and numeric
- *
+ * 
  * @author Christian Schmidt 2005
  *
  */
@@ -49,21 +49,21 @@ public class LanguageResolver {
     private final static int LANGID     =0;
     private final static int LANGNAME   =1;
     private final static int RFC3066    =3;
-
+    
     ArrayList languages=new ArrayList();
-
+    
 //    public static void main(String[] args){
 //        try {
 //            LanguageResolver lr=new LanguageResolver();
 //        } catch (IOException e) {
-//            //
+//            // 
 //            e.printStackTrace();
 //        }
 //    }
-
+    
     /**
      * Create a new Instance of LanguageResolver
-     *
+     * 
      * @throws IOException
      */
     public LanguageResolver() throws IOException{
@@ -71,16 +71,16 @@ public class LanguageResolver {
         ClassLoader cl = this.getClass().getClassLoader();
         InputStream in = cl.getResourceAsStream(lang);
         BufferedReader languageTable= new BufferedReader(new InputStreamReader(in));
-
+        
         String line;
-
+        
         while((line=(languageTable.readLine()))!=null){
             languages.add(line.split(","));
         }
     }
     /**
      * Get the numeric value of the given ISO Language Code
-     *
+     * 
      * @param isoCode the ISO Language Code to find
      * @return numeric value of the given isoCode
      * @throws LanguageResolvingException if the Language ISO Code is not known
@@ -94,12 +94,12 @@ public class LanguageResolver {
                 if(line[ISO].equals(isoCode)) return line[LANGID];
             }
             throw new LanguageResolvingException("Can not find ISO Code: "+isoCode );
-
+        
     }
-
+    
     /**
      * Get the ISO Language Code corresponding with the given Language ID
-     *
+     * 
      * @param ID the numeric language id to find
      * @return the ISO Language Code corresponding with the given Language ID
      * @throws LanguageResolvingException if the Language ID is not known
@@ -114,10 +114,10 @@ public class LanguageResolver {
         }
         throw new LanguageResolvingException("Can not find Language Id: "+ID );
     }
-
+    
     /**
      * Get the RFC3066 value of the given ISO Language Code
-     *
+     * 
      * @param isoCode the ISO Language Code to find
      * @return RFC3066 value of the given isoCode
      * @throws LanguageResolvingException if the Language ISO Code is not known
@@ -132,10 +132,10 @@ public class LanguageResolver {
         }
         throw new LanguageResolvingException("Can not find ISO Code: "+isoCode );
     }
-
+    
     /**
      * Get the ISO Language Code corresponding with the given RFC3066 code
-     *
+     * 
      * @param RFC RFC3066 language id to find
      * @return the ISO Language Code corresponding with the given RFC3066 code
      * @throws LanguageResolvingException if the RFC3066 code is not known
@@ -150,22 +150,22 @@ public class LanguageResolver {
         }
         throw new LanguageResolvingException("Can not find Language Id: "+RFC );
     }
-
-
+    
+    
     /**
-     * This Exception is thrown if a Language Identfier is unknown
-     *
+     * This Exception is thrown if a Language Identfier is unknown 
+     * 
      * @author Christian Schmidt 2005
      *
      */
     public class LanguageResolvingException extends Exception {
 
         /**
-         *
+         * 
          */
         public LanguageResolvingException() {
             super();
-            //
+            // 
         }
 
         /**
@@ -173,7 +173,7 @@ public class LanguageResolver {
          */
         public LanguageResolvingException(String arg0) {
             super(arg0);
-            //
+            // 
         }
 
         /**
@@ -182,7 +182,7 @@ public class LanguageResolver {
          */
         public LanguageResolvingException(String arg0, Throwable arg1) {
             super(arg0, arg1);
-            //
+            // 
         }
 
         /**
@@ -190,7 +190,7 @@ public class LanguageResolver {
          */
         public LanguageResolvingException(Throwable arg0) {
             super(arg0);
-            //
+            // 
         }
 
     }
diff --git a/l10ntools/java/receditor/build.xml b/l10ntools/java/receditor/build.xml
index 4a88f61e4fc5..dacfe8eec1b6 100755
--- a/l10ntools/java/receditor/build.xml
+++ b/l10ntools/java/receditor/build.xml
@@ -2,23 +2,23 @@
 <!--
 
   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
-
+ 
   This file is part of OpenOffice.org.
-
+ 
   OpenOffice.org is free software: you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License version 3
   only, as published by the Free Software Foundation.
-
+ 
   OpenOffice.org is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   GNU Lesser General Public License version 3 for more details
   (a copy is included in the LICENSE file that accompanied this code).
-
+ 
   You should have received a copy of the GNU Lesser General Public License
   version 3 along with OpenOffice.org.  If not, see
   <http://www.openoffice.org/license.html>
diff --git a/l10ntools/java/receditor/java/transex3/controller/EditorController.java b/l10ntools/java/receditor/java/transex3/controller/EditorController.java
index 38462d665304..1b5f54556836 100644
--- a/l10ntools/java/receditor/java/transex3/controller/EditorController.java
+++ b/l10ntools/java/receditor/java/transex3/controller/EditorController.java
@@ -26,18 +26,18 @@ public class EditorController {
     public final String[] RESTYPES = { ".src",".hrc",".xcu",".xrm",".xhp" };
     public final String   RECFILE  =   ".recommand";
     // Editor View
-    static transex3.view.Editor aEditor                 = null;
+    static transex3.view.Editor	aEditor					= null;
     // Editor Model
-    static Vector   sdfstrings                  = new Vector();
-    static HashMap hashedsdfstrings         = new HashMap();
+    static Vector	sdfstrings					= new Vector();
+    static HashMap hashedsdfstrings			= new HashMap();
     int oldindex = 0;
-    //HashMap hashedfilenames               = new HashMap();
+    //HashMap hashedfilenames				= new HashMap();
     // Search for source Strings
     public String fetchSourceStrings( String rootdir ){
 
         //String outputfile = "h:\\workspace\\recommandEditor\\null2";
         File tempfile = null;
-
+        
         try {
             tempfile = File.createTempFile( "receditor" , "tmp" );
         } catch (IOException e1) {
@@ -45,7 +45,7 @@ public class EditorController {
             System.err.println("Can not create temp file\n");
             e1.printStackTrace();
         }
-
+        
         String outputfile = tempfile.getAbsolutePath();
         try
         {
@@ -78,17 +78,17 @@ public class EditorController {
                     findRecommandFiles( aFileArray[ cnt ] , list);
                 else if( aFileArray[ cnt ].isFile() && isRecommandFile( aFileArray[ cnt ] ) )
                     list.add( aFileArray[ cnt ]);
-            }
+            }		
         }
     }
     private boolean isResourceType( File aFile ){
-        String filename     = aFile.getName();
-        boolean isResType   = false;
+        String filename 	= aFile.getName();
+        boolean isResType 	= false;
         for(int cnt = 0; cnt < RESTYPES.length ; cnt++){
             if( filename.endsWith( RESTYPES[ cnt ] ) )
                     isResType = true;
         }
-        return isResType;
+        return isResType;			
     }
     private boolean isRecommandFile( File aFile ){
         return aFile.getName().endsWith( RECFILE );
@@ -105,15 +105,15 @@ public class EditorController {
     // Add all data to view
     void updateData(){
         JTable recTable =transex3.controller.EditorController.aEditor.getRectable();
-
+                
         SdfString aSdfString = (SdfString) sdfstrings.get( oldindex );
         Vector newStrings = new Vector();
         for ( int n = 1; n < recTable.getRowCount() ; n++ ){
-            String lang     = (String) recTable.getValueAt(n , 0 );
-            String text     = (String) recTable.getValueAt(n , 1 );
-            String htext    = (String) recTable.getValueAt(n , 2 );
-            String qhtext   = (String) recTable.getValueAt(n , 3 );
-            String ttext    = (String) recTable.getValueAt(n , 4 );
+            String lang 	= (String) recTable.getValueAt(n , 0 );
+            String text 	= (String) recTable.getValueAt(n , 1 );
+            String htext	= (String) recTable.getValueAt(n , 2 );
+            String qhtext 	= (String) recTable.getValueAt(n , 3 );
+            String ttext 	= (String) recTable.getValueAt(n , 4 );
             if( lang != null && text != null ){
                 //System.out.println("Data "+ lang + " " + text );
                 SdfEntity aSdfEntity = new SdfEntity();
@@ -129,7 +129,7 @@ public class EditorController {
     }
 
     public void initView(){
-        Object[][]  sourceStringData = new Object[ sdfstrings.size() ][ 4 ];
+        Object[][]	sourceStringData = new Object[ sdfstrings.size() ][ 4 ];
         Object[][] firstData = new Object[100][5];
         // Set the files
         Iterator aIter = sdfstrings.iterator();
@@ -161,11 +161,11 @@ public class EditorController {
             counter++;
         }
         // Set the source srtings
-
-
+        
+        
         //aEditor = new transex3.view.Editor( sourceStringData , filedata.toArray() );
         aEditor = new transex3.view.Editor( sourceStringData , firstData );
-
+        
         aEditor.setBounds(100,100,800,900);
         aEditor.setDefaultCloseOperation( WindowConstants.DISPOSE_ON_CLOSE );
         aEditor.setVisible(true);
@@ -175,7 +175,7 @@ public class EditorController {
                 System.exit( 0 );
             }
         });
-
+        
         aEditor.getMiExit().addActionListener( new ActionListener(){
             public void actionPerformed( ActionEvent e ){
                 System.exit( 0 );
@@ -219,8 +219,8 @@ public class EditorController {
             public void tableChanged( TableModelEvent e ){
                 //System.out.println( e );
             }});
-
-
+        
+    
         aEditor.getRectable().getSelectionModel().addListSelectionListener( new  ListSelectionListener(){
             public void valueChanged( ListSelectionEvent e ){
                 JTable aTable = aEditor.getRectable();
@@ -237,29 +237,29 @@ public class EditorController {
                 //System.out.println("Selected = " +e.getFirstIndex()+"\n");
                 JTable table =transex3.controller.EditorController.aEditor.getTable();
                 JTable recTable =transex3.controller.EditorController.aEditor.getRectable();
-                SdfString aSdfString;
+                SdfString aSdfString;	
                 JTable aTable = aEditor.getRectable();
                 if(  aTable.getSelectedRow() != -1 && aTable.getSelectedColumn() != -1 )
                     aTable.getCellEditor( aTable.getSelectedRow(), aTable.getSelectedColumn() ).stopCellEditing();
-
+             
                 updateData();
                 clearAllRows( recTable );
-
+    
                 aSdfString = (SdfString) sdfstrings.get( table.getSelectedRow() );
                 recTable.setValueAt( "en-US" , 0, 0 );
-                recTable.setValueAt( aSdfString.getSourceString().getText()          , 0, 1 );
+                recTable.setValueAt( aSdfString.getSourceString().getText() 		 , 0, 1 );
                 recTable.setValueAt( aSdfString.getSourceString().getHelptext()      , 0, 2 );
                 recTable.setValueAt( aSdfString.getSourceString().getQuickhelptext() , 0, 3 );
-                recTable.setValueAt( aSdfString.getSourceString().getTitle()         , 0, 4 );
+                recTable.setValueAt( aSdfString.getSourceString().getTitle() 		 , 0, 4 );
                 Vector values = aSdfString.getLanguageStrings();
                 for( int n = 0; n < values.size() ; n++ )
                 {
                     SdfEntity aEntity = (SdfEntity) values.get( n );
-                    recTable.setValueAt( aEntity.getLangid()        , n+1 , 0 );
-                    recTable.setValueAt( aEntity.getText()          , n+1 , 1 );
-                    recTable.setValueAt( aEntity.getHelptext()      , n+1 , 2 );
-                    recTable.setValueAt( aEntity.getQuickhelptext() , n+1 , 3 );
-                    recTable.setValueAt( aEntity.getTitle()         , n+1 , 4 );
+                    recTable.setValueAt( aEntity.getLangid() 		, n+1 , 0 );
+                    recTable.setValueAt( aEntity.getText()   		, n+1 , 1 );
+                    recTable.setValueAt( aEntity.getHelptext()		, n+1 , 2 );
+                    recTable.setValueAt( aEntity.getQuickhelptext()	, n+1 , 3 );
+                    recTable.setValueAt( aEntity.getTitle()  		, n+1 , 4 );
                 }
                 oldindex = table.getSelectedRow();
             }
@@ -280,13 +280,13 @@ public class EditorController {
     }
     // Connect recommand strings with source strings
     public void readStrings( String sourcefiles , Vector recfiles ) {
-        BufferedReader aBR              = null;
+        BufferedReader aBR 				= null;
         try {
             //System.out.println("DBG: sourcefiles = " +sourcefiles);
             aBR = new BufferedReader( new FileReader( sourcefiles ) );
             String current = aBR.readLine();
-            SdfString aSdfString            = null;
-            SdfEntity aSdfEntity            = null;
+            SdfString aSdfString	 		= null;
+            SdfEntity aSdfEntity 			= null;
             while( current != null ){
                 aSdfEntity = new SdfEntity();
                 aSdfEntity.setProperties( current );
@@ -296,11 +296,11 @@ public class EditorController {
                 //System.out.println("Put ID '"+aSdfString.getId()+"'");
                 sdfstrings.add( aSdfString );
                 current = aBR.readLine();
-
+                
             }
             Iterator aIter=recfiles.iterator();
             File aFile;
-            BufferedReader aBR2             = null;
+            BufferedReader aBR2				= null;
             //System.out.println("Connecting strings");
             while( aIter.hasNext() ){
                 aFile = (File) aIter.next();
@@ -310,13 +310,13 @@ public class EditorController {
                 while ( current2 != null ){
                     SdfEntity aEntity = new SdfEntity();
                     aEntity.setProperties( current2 );
-
+                                        
                     if( hashedsdfstrings.containsKey( aEntity.getId() ) )
                     {
                         aSdfString = (SdfString) hashedsdfstrings.get( aEntity.getId() );
                         aSdfString.addLanguageString( aEntity );
                     }
-                    else
+                    else 
                     {
                         System.out.println("DBG: Can't find source string '"+aEntity.getId()+"'" );
                     }
@@ -329,6 +329,6 @@ public class EditorController {
         } catch ( IOException e){
             e.printStackTrace();
         }
-
+        
     }
 }
diff --git a/l10ntools/java/receditor/java/transex3/controller/Main.java b/l10ntools/java/receditor/java/transex3/controller/Main.java
index e8dd06ce9f85..3e37eafe8a2f 100644
--- a/l10ntools/java/receditor/java/transex3/controller/Main.java
+++ b/l10ntools/java/receditor/java/transex3/controller/Main.java
@@ -1,7 +1,7 @@
 package transex3.controller;
 
 public class Main {
-
+    
     public static void main( String args[] ){
         EditorController aEditor = new EditorController();
         aEditor.initInitialStrings();
diff --git a/l10ntools/java/receditor/java/transex3/model/ResourceFile.java b/l10ntools/java/receditor/java/transex3/model/ResourceFile.java
index 51fabb3a4b7a..4d6aad33894b 100644
--- a/l10ntools/java/receditor/java/transex3/model/ResourceFile.java
+++ b/l10ntools/java/receditor/java/transex3/model/ResourceFile.java
@@ -3,13 +3,13 @@ package transex3.model;
 import java.util.*;
 
 public class ResourceFile {
-    Vector      sdfStrings      = new Vector();
-    HashMap     sdfHashMap      = new HashMap();
-    String filepathid           = null;
-    String modulename           = null;
-    String filename             = null;
-
-
+    Vector 		sdfStrings		= new Vector();
+    HashMap		sdfHashMap		= new HashMap();
+    String filepathid			= null;		
+    String modulename			= null;
+    String filename				= null;
+    
+    
     public String getModuleName(){
         return modulename;
     }
@@ -19,7 +19,7 @@ public class ResourceFile {
     public String getFileName(){
         return filename;
     }
-/*  public List readSoureStrings( java.io.File aSdfFile ){
+/*	public List readSoureStrings( java.io.File aSdfFile ){
         List sdfList=null;
         return sdfList;
     };*/
@@ -33,13 +33,13 @@ public class ResourceFile {
         if( filename == null )
             filename = aSdfstring.getFileName();
     }
-
-
+        
+    
     public void ParseString( String aSourceString ){
-        //sourceString          = new SdfEntity();
-        SdfEntity aSdfEntity    = new SdfEntity();
+        //sourceString 			= new SdfEntity();
+        SdfEntity aSdfEntity 	= new SdfEntity();
         aSdfEntity.setProperties( aSourceString );
-        SdfString sdfstring     = null;
+        SdfString sdfstring		= null; 
         if( sdfHashMap.containsKey( aSdfEntity.getFileId() ) ){
             sdfstring = (SdfString) sdfHashMap.get( aSdfEntity.getFileId() );
         }
@@ -49,8 +49,8 @@ public class ResourceFile {
             addString( sdfstring );
         }
         sdfstring.addLanguageString( aSdfEntity );
-
-
+        
+        
     }
     /*public void ParseSdfFile( java.util.Vector aSdfList ){
         ListIterator aLI = aSdfList.listIterator();
@@ -62,7 +62,7 @@ public class ResourceFile {
             aSdfEntity = new SdfEntity();
             aSdfEntity.setProperties( (String) aLI.next() );
             SdfString aString;
-
+            
             if( sdfHashMap.containsKey( aSdfEntity.getFileId() ) )
                 aString = (SdfString) sdfHashMap.get( aSdfEntity.getFileId() );
             else
@@ -72,6 +72,6 @@ public class ResourceFile {
             }
             aString.addLanguageString( aSdfEntity );
         }
-
+        
     }*/
 }
diff --git a/l10ntools/java/receditor/java/transex3/model/SdfEntity.java b/l10ntools/java/receditor/java/transex3/model/SdfEntity.java
index 4b293421fd28..222a4627c51f 100644
--- a/l10ntools/java/receditor/java/transex3/model/SdfEntity.java
+++ b/l10ntools/java/receditor/java/transex3/model/SdfEntity.java
@@ -16,62 +16,62 @@ public class SdfEntity {
     private String quickhelptext;
     private String title;
     private String date;
-
-    public static int PROJECT_POS       = 0;
-    public static int SOURCE_FILE_POS   = 1;
-    public static int DUMMY1_POS        = 2;
-    public static int RESOURCE_TYPE_POS = 3;
-    public static int GID_POS           = 4;
-    public static int LID_POS           = 5;
-    public static int HELPID_POS        = 6;
-    public static int PLATFORM_POS      = 7;
-    public static int DUMMY2_POS        = 8;
-    public static int LANGID_POS        = 9;
-    public static int TEXT_POS          = 10;
-    public static int HELPTEXT_POS      = 11;
-    public static int QUICKHELPTEXT_POS = 12;
-    public static int TITLE_POS         = 13;
-    public static int DATE_POS          = 14;
-
+    
+    public static int PROJECT_POS 		= 0;
+    public static int SOURCE_FILE_POS	= 1;
+    public static int DUMMY1_POS		= 2;
+    public static int RESOURCE_TYPE_POS	= 3;
+    public static int GID_POS			= 4;
+    public static int LID_POS			= 5;
+    public static int HELPID_POS		= 6;
+    public static int PLATFORM_POS		= 7;
+    public static int DUMMY2_POS		= 8;
+    public static int LANGID_POS		= 9;
+    public static int TEXT_POS			= 10;
+    public static int HELPTEXT_POS		= 11;
+    public static int QUICKHELPTEXT_POS	= 12;
+    public static int TITLE_POS			= 13;
+    public static int DATE_POS			= 14;
+    
     public SdfEntity(){}
     public SdfEntity(String project, String source_file, String dummy1, String resource_type, String gid, String lid, String helpid, String platform, String dummy2, String langid, String text, String helptext, String quickhelptext, String title , String date) {
         super();
-        this.project        = project;
-        this.source_file    = source_file;
-        this.dummy1         = dummy1;
-        this.resource_type  = resource_type;
-        this.gid            = gid;
-        this.lid            = lid;
-        this.helpid         = helpid;
-        this.platform       = platform;
-        this.dummy2         = dummy2;
-        this.langid         = langid;
-        this.text           = text;
-        this.helptext       = helptext;
-        this.quickhelptext  = quickhelptext;
-        this.title          = title;
-        this.date           = date;
+        this.project 		= project;
+        this.source_file 	= source_file;
+        this.dummy1 		= dummy1;
+        this.resource_type 	= resource_type;
+        this.gid 			= gid;
+        this.lid 			= lid;
+        this.helpid 		= helpid;
+        this.platform 		= platform;
+        this.dummy2 		= dummy2;
+        this.langid 		= langid;
+        this.text 			= text;
+        this.helptext 		= helptext;
+        this.quickhelptext 	= quickhelptext;
+        this.title 			= title;
+        this.date 			= date;
     }
 
     public void setProperties( String line ){
-
-        String[] splitted       = line.split("\t");
-
-        setProject(         splitted[ SdfEntity.PROJECT_POS ]       );
-        setSource_file(     splitted[ SdfEntity.SOURCE_FILE_POS ]   );
-        setDummy1(          splitted[ SdfEntity.DUMMY1_POS ]        );
-        setResource_type(   splitted[ SdfEntity.RESOURCE_TYPE_POS ] );
-        setGid(             splitted[ SdfEntity.GID_POS ]           );
-        setLid(             splitted[ SdfEntity.LID_POS ]           );
-        setHelpid(          splitted[ SdfEntity.HELPID_POS ]        );
-        setPlatform(        splitted[ SdfEntity.PLATFORM_POS ]      );
-        setDummy2(          splitted[ SdfEntity.DUMMY2_POS ]        );
-        setLangid(          splitted[ SdfEntity.LANGID_POS ]        );
-        setText(            splitted[ SdfEntity.TEXT_POS ]          );
-        setHelptext(        splitted[ SdfEntity.HELPTEXT_POS ]      );
-        setQuickhelptext(   splitted[ SdfEntity.QUICKHELPTEXT_POS ] );
-        setTitle(           splitted[ SdfEntity.TITLE_POS ]         );
-        setDate(            splitted[ SdfEntity.DATE_POS ]          );
+    
+        String[] splitted		= line.split("\t");
+        
+        setProject( 		splitted[ SdfEntity.PROJECT_POS ] 		);
+        setSource_file( 	splitted[ SdfEntity.SOURCE_FILE_POS ] 	);
+        setDummy1( 			splitted[ SdfEntity.DUMMY1_POS ] 		);
+        setResource_type(	splitted[ SdfEntity.RESOURCE_TYPE_POS ] );
+        setGid( 			splitted[ SdfEntity.GID_POS ] 			);
+        setLid( 			splitted[ SdfEntity.LID_POS ] 			);
+        setHelpid( 			splitted[ SdfEntity.HELPID_POS ] 		);
+        setPlatform( 		splitted[ SdfEntity.PLATFORM_POS ] 		);
+        setDummy2( 			splitted[ SdfEntity.DUMMY2_POS ] 		);
+        setLangid( 			splitted[ SdfEntity.LANGID_POS ] 		);
+        setText( 			splitted[ SdfEntity.TEXT_POS ] 			);
+        setHelptext( 		splitted[ SdfEntity.HELPTEXT_POS ] 		);
+        setQuickhelptext(	splitted[ SdfEntity.QUICKHELPTEXT_POS ] );
+        setTitle( 			splitted[ SdfEntity.TITLE_POS ] 		);
+        setDate(			splitted[ SdfEntity.DATE_POS ]			);
     }
 
     public String getFileId(){
@@ -88,7 +88,7 @@ public class SdfEntity {
     public String getId(){
         return project+gid+lid+source_file+resource_type+platform+helpid;
     }
-
+    
     public String getDummy1() {
         return dummy1;
     }
@@ -206,6 +206,6 @@ public class SdfEntity {
     public void setDate(String date) {
         this.date = date;
     }
-
-
+    
+    
 }
diff --git a/l10ntools/java/receditor/java/transex3/model/SdfString.java b/l10ntools/java/receditor/java/transex3/model/SdfString.java
index 7eec2151b7c3..c61331dac035 100644
--- a/l10ntools/java/receditor/java/transex3/model/SdfString.java
+++ b/l10ntools/java/receditor/java/transex3/model/SdfString.java
@@ -2,26 +2,26 @@ package transex3.model;
 import java.util.*;
 import java.io.*;
 public class SdfString {
-    private SdfEntity sourceString                  = null;
-    //private java.util.HashMap languageStrings     = new HashMap();
-    private Vector languageList                     = new Vector();
-    private String id                               = null;
-    private String fileid                           = null;
-    private String filename                         = null;
-    private String modulename                       = null;
-    private String filepath                         = null;
-
+    private SdfEntity sourceString					= null;
+    //private java.util.HashMap languageStrings		= new HashMap();
+    private Vector languageList						= new Vector();
+    private String id								= null;
+    private String fileid							= null;
+    private String filename							= null;
+    private String modulename						= null;
+    private String filepath							= null;
+    
     /*public HashMap getLanguageStrings() {
         return languageStrings;
     }*/
     public Vector getLanguageStrings() {
         return languageList;
     }
-
+    
     public void setLanguageStrings(Vector languageStrings) {
         this.languageList = languageStrings;
     }
-
+    
     public void addSourceString( SdfEntity aSdfEntity )
     {
         if( id == null )
@@ -84,7 +84,7 @@ public class SdfString {
 
     public String getFileName() {
         return filename;
-    }
+    } 
 
     public void setFileName(String filename) {
         this.filename = filename;
@@ -125,36 +125,36 @@ public class SdfString {
                 Iterator aIter = languageList.iterator();
                 while( aIter.hasNext() ){
                     SdfEntity aEntity = (SdfEntity)aIter.next();
-                    aBW.write( sourceString.getProject()+"\t"   );
-                    aBW.write( sourceString.getSource_file()+"\t"   );
-                    aBW.write( sourceString.getDummy1()+"\t"    );
+                    aBW.write( sourceString.getProject()+"\t" 	);
+                    aBW.write( sourceString.getSource_file()+"\t"	);
+                    aBW.write( sourceString.getDummy1()+"\t"  	);
                     aBW.write( sourceString.getResource_type()+"\t" );
-                    aBW.write( sourceString.getGid()+"\t"       );
-                    aBW.write( sourceString.getLid()+"\t"       );
-                    aBW.write( sourceString.getHelpid()+"\t"    );
+                    aBW.write( sourceString.getGid()+"\t"  		);
+                    aBW.write( sourceString.getLid()+"\t"  		);
+                    aBW.write( sourceString.getHelpid()+"\t"  	);
                     aBW.write( sourceString.getPlatform()+"\t"  );
-                    aBW.write( sourceString.getDummy2()+"\t"    );
-                    if( aEntity.getLangid() == null )
+                    aBW.write( sourceString.getDummy2()+"\t"  	);
+                    if( aEntity.getLangid() == null ) 
                         aBW.write( "\t"  );
                     else
                         aBW.write( aEntity.getLangid()+"\t"    );
                     if( aEntity.getText() == null )
                         aBW.write( "\t"  );
                     else
-                        aBW.write( aEntity.getText()+"\t"           );
+                        aBW.write( aEntity.getText()+"\t"   		);
                     if( aEntity.getHelptext() == null )
                         aBW.write( "\t"  );
                     else
-                        aBW.write( aEntity.getHelptext()+"\t"       );
+                        aBW.write( aEntity.getHelptext()+"\t"  		);
                     if( aEntity.getQuickhelptext() == null )
                         aBW.write( "\t"  );
                     else
-                        aBW.write( aEntity.getQuickhelptext()+"\t"  );
+                        aBW.write( aEntity.getQuickhelptext()+"\t" 	);
                     if( aEntity.getTitle() == null )
                         aBW.write( "\t"  );
-                    else
-                        aBW.write( aEntity.getTitle()+"\t"          );
-                    aBW.write( "2002-02-02 02:02:02\n"          );
+                    else						
+                        aBW.write( aEntity.getTitle()+"\t"   		);
+                    aBW.write( "2002-02-02 02:02:02\n"   		);
                 }
                 aBW.close();
             }
diff --git a/l10ntools/java/receditor/java/transex3/view/Editor.java b/l10ntools/java/receditor/java/transex3/view/Editor.java
index f46a82a11a2b..ca41bd12fb42 100644
--- a/l10ntools/java/receditor/java/transex3/view/Editor.java
+++ b/l10ntools/java/receditor/java/transex3/view/Editor.java
@@ -3,34 +3,34 @@ import javax.swing.*;
 import java.awt.*;
 
 public class Editor extends JFrame{
-    Object[]    columnnames     = { "File" , "GID" , "LID" , "String" };
+    Object[] 	columnnames		= { "File" , "GID" , "LID" , "String" };
     Object[]    stringcolnames  = { "Language", "Text", "Helptext" , "Quickhelptext","Title"};
-    //Object[][]    data            = new Object[4][1];//{  { "a " }, { "v " }, { "v " } , { "a " } };
-    JTable      table           = null;
-    JTable      rectable        = null;
-    JComboBox   cBox            = null;
-    JMenuBar    menubar         = null;
-    JMenu       filemenu        = null;
-    JMenuItem   miNew           = null;
-    JMenuItem   miSave          = null;
-    JMenuItem   miExit          = null;
-    //JButton     button            = null;
-
+    //Object[][] 	data			= new Object[4][1];//{  { "a " }, { "v " }, { "v " } , { "a " } };
+    JTable 		table 			= null;
+    JTable 		rectable		= null;
+    JComboBox 	cBox			= null;
+    JMenuBar    menubar			= null;
+    JMenu 		filemenu		= null;
+    JMenuItem   miNew			= null;
+    JMenuItem   miSave			= null;
+    JMenuItem   miExit			= null;
+    //JButton     button			= null;
+    
     public Editor( Object[][] tabledata , Object[][] firstdata ){
-        table                   = new JTable( tabledata , columnnames );
-        rectable                = new SdfTable( firstdata , stringcolnames );
-        menubar                 = new JMenuBar();
-        filemenu                = new JMenu("File");
-        //miNew                 = new JMenuItem("New");
-        miSave                  = new JMenuItem("Save");
-        miExit                  = new JMenuItem("Exit");
-        //button                    = new JButton("Edit");
+        table 					= new JTable( tabledata , columnnames );
+        rectable				= new SdfTable( firstdata , stringcolnames );
+        menubar 				= new JMenuBar();
+        filemenu 				= new JMenu("File");
+        //miNew					= new JMenuItem("New");
+        miSave					= new JMenuItem("Save");
+        miExit					= new JMenuItem("Exit");
+        //button					= new JButton("Edit");
         //filemenu.add( miNew   );
         filemenu.add( miSave  );
         filemenu.add( miExit  );
         menubar.add( filemenu );
-
-        Container contentPane   = getContentPane();
+        
+        Container contentPane 	= getContentPane();
         //contentPane.add( new ControlPanel() , BorderLayout.NORTH );
         contentPane.add( menubar , BorderLayout.NORTH );
         //JPanel aPanel = new JPanel( new FlowLayout( FlowLayout.CENTER) );
@@ -44,7 +44,7 @@ public class Editor extends JFrame{
         //contentPane.add( new JScrollPane( rectable ), BorderLayout.SOUTH );
         //contentPane.add( new JScrollPane( rectable ), BorderLayout.SOUTH );
         this.repaint();
-
+        
     }
 
     public JTable getRectable() {
@@ -86,11 +86,11 @@ public class Editor extends JFrame{
     public void setMiSave(JMenuItem miSave) {
         this.miSave = miSave;
     }
-
+    
     /*public void setTableData(){
-
+        
     }*/
-
+    
 }
 
 //class ControlPanel extends JPanel{}
diff --git a/l10ntools/java/receditor/java/transex3/view/SdfTable.java b/l10ntools/java/receditor/java/transex3/view/SdfTable.java
index f0cc7bd84a34..50a20a3e95b1 100644
--- a/l10ntools/java/receditor/java/transex3/view/SdfTable.java
+++ b/l10ntools/java/receditor/java/transex3/view/SdfTable.java
@@ -9,9 +9,9 @@ class SdfTable extends JTable{
     }
     //@Override
     public boolean isCellEditable(int row, int col) {
-        if( row == 0 && col == 0 || row == 0 && col == 1 || row == 0 && col == 2 || row == 0 && col == 3 || row == 0 && col == 4 )
+        if( row == 0 && col == 0 || row == 0 && col == 1 || row == 0 && col == 2 || row == 0 && col == 3 || row == 0 && col == 4 ) 
             return false;
-        else
+        else 
             return true;
     }
     /*public String getTableId() {
@@ -20,5 +20,5 @@ class SdfTable extends JTable{
     public void setTableId(String tableId) {
         this.tableId = tableId;
     }*/
-
+    
 }
 \ No newline at end of file
diff --git a/l10ntools/layout/layoutparse.cxx b/l10ntools/layout/layoutparse.cxx
index 6bb839a9409e..9051c818e62b 100644
--- a/l10ntools/layout/layoutparse.cxx
+++ b/l10ntools/layout/layoutparse.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
@@ -35,13 +35,13 @@ LayoutXMLFile::LayoutXMLFile( bool mergeMode )
     , mMergeMode( mergeMode )
 {
 }
-
+    
 void
 LayoutXMLFile::SearchL10NElements( XMLParentNode* pCur, int )
 {
     if ( !pCur )
         pCur = this;
-
+            
     /* Recurse int children, SearchL10NElements does not do that for us.  */
     if ( XMLChildNodeList* lst = pCur->GetChildList() )
         for ( ULONG i = 0; i < lst->Count(); i++ )
@@ -68,7 +68,7 @@ void
 LayoutXMLFile::HandleElement( XMLElement* element )
 {
     std::vector<XMLAttribute*> interesting = interestingAttributes( element->GetAttributeList() );
-
+    
     if ( interesting.size() )
     {
         std::vector<XMLAttribute*>::iterator i = interesting.begin();
@@ -121,7 +121,7 @@ BOOL LayoutXMLFile::Write( ByteString &aFilename )
 
     if ( aFilename.Len() )
     {
-        ofstream aFStream( aFilename.GetBuffer() , ios::out | ios::trunc );
+        ofstream aFStream( aFilename.GetBuffer() , ios::out | ios::trunc ); 
         if ( !aFStream )
             fprintf( stderr, "ERROR: cannot open file:%s\n", aFilename.GetBuffer() );
         else
diff --git a/l10ntools/layout/layoutparse.hxx b/l10ntools/layout/layoutparse.hxx
index cd24f091d318..f1220d1def04 100644
--- a/l10ntools/layout/layoutparse.hxx
+++ b/l10ntools/layout/layoutparse.hxx
@@ -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
diff --git a/l10ntools/layout/tralay.cxx b/l10ntools/layout/tralay.cxx
index 72fd1a1d8c5e..0a485013b766 100644
--- a/l10ntools/layout/tralay.cxx
+++ b/l10ntools/layout/tralay.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
@@ -53,7 +53,7 @@ class TranslateLayout : public Application
 {
     ByteString mGid1;
     ByteString mLanguage;
-    ByteString mLocalize;
+    ByteString mLocalize; 
     ByteString mOutput;
     ByteString mProject;
     ByteString mRoot;
@@ -270,7 +270,7 @@ void TranslateLayout::MergeLanguage( ByteString const& language )
         fprintf(stderr, "error: parsing: %s\n", xmlFile.GetBuffer() );
         return;
     }
-
+    
     layoutXml->Extract();
     insertMarker( layoutXml, xmlFile );
 
@@ -286,7 +286,7 @@ void TranslateLayout::MergeLanguage( ByteString const& language )
             if ( XMLElement* element = ( *languageMap )[ "en-US" ] )
                 translateElement( element, language, &resData, mergeData );
     }
-
+    
 #ifndef WNT
     ByteString outFile = "/dev/stdout";
 #else
diff --git a/l10ntools/prj/d.lst b/l10ntools/prj/d.lst
index 0b6a43444613..53c846832fca 100644
--- a/l10ntools/prj/d.lst
+++ b/l10ntools/prj/d.lst
@@ -47,6 +47,14 @@ mkdir: %_DEST%\bin%_EXT%\help\com\sun\star\help
 ..\scripts\localize %_DEST%\bin%_EXT%\localize
 ..\scripts\fast_merge.pl %_DEST%\bin%_EXT%\fast_merge.pl
 ..\scripts\keyidGen.pl %_DEST%\bin%_EXT%\keyidGen.pl
+..\scripts\tool\const.py %_DEST%\bin%_EXT%\const.py
+..\scripts\tool\l10ntool.py %_DEST%\bin%_EXT%\l10ntool.py
+..\scripts\tool\xtxex.py  %_DEST%\bin%_EXT%\xtxex.py
+..\scripts\tool\sdf.py %_DEST%\bin%_EXT%\sdf.py
+..\scripts\tool\xhtex.py %_DEST%\bin%_EXT%\xhtex.py
+..\scripts\tool\pseudo.py %_DEST%\bin%_EXT%\pseudo.py
+..\scripts\xtxex %_DEST%\bin%_EXT%\xtxex
+..\scripts\xhtex %_DEST%\bin%_EXT%\xhtex
 
 ..\inc\export.hxx %_DEST%\inc%_EXT%\l10ntools\export.hxx
 ..\inc\l10ntools\directory.hxx %_DEST%\inc%_EXT%\l10ntools\directory.hxx
diff --git a/l10ntools/scripts/fast_merge.pl b/l10ntools/scripts/fast_merge.pl
index 5dc63cf95d79..e9c36d02a11a 100644
--- a/l10ntools/scripts/fast_merge.pl
+++ b/l10ntools/scripts/fast_merge.pl
@@ -4,7 +4,7 @@ eval 'exec perl -wS $0 ${1+"$@"}'
 #*************************************************************************
 #
 # 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
@@ -68,7 +68,7 @@ read_sdf_file_names();
 init();
 my $reference;
 my $path ;
-my $localize_file;
+my $localize_file; 
 while( hasLines() )
 {
     @current = ();
@@ -76,7 +76,7 @@ while( hasLines() )
     {
         push @current , $_;
     }
-
+    
     $reference = getNextIdentifier( );
 
     @current = ();
@@ -145,13 +145,13 @@ sub init
         print "Open file '$file'\n";
     }
 }
-
-# get the next module/file
+    
+# get the next module/file 
 sub getNextIdentifier
 {
     my @sorted = sort {
         return $a->module.$a->dir cmp $b->module.$b->dir;
-    } @current ;
+    } @current ; 
     return shift @sorted;
 }
 
@@ -276,7 +276,7 @@ sub write_lines
             $last_localize_file = $localize_file;
         }
     }
-}
+}    
 sub add_to_buffer
 {
     my $plainline;
diff --git a/l10ntools/scripts/keyidGen.pl b/l10ntools/scripts/keyidGen.pl
index 2a4ac5caefc3..fcc8cceda08e 100644
--- a/l10ntools/scripts/keyidGen.pl
+++ b/l10ntools/scripts/keyidGen.pl
@@ -4,7 +4,7 @@ eval 'exec perl -S $0 ${1+"$@"}'
 #*************************************************************************
 #
 # 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
@@ -121,7 +121,7 @@ sub makenumber
         $h = int( $h / $order );
     }
     die "makenumber failed because number is too big (this cannot be so this is a strange error)" if $h > 0;
-
+    
     return reverse $result;
 }
 
@@ -130,7 +130,7 @@ sub makekidstr
 {
     $kid = shift;
     $str = shift;
-
+    
     if ( $str ne "" )
     {
         # special handling for strings starting with font descriptions like {&Tahoma8} (win system integration)
@@ -171,7 +171,7 @@ sub get_options {
     while ($arg = shift @ARGV) {
         $arg =~ /^-dbimport$/  and $dbimport = 1 and next;
         $arg =~ /^-help$/  and $help = 1 and next; #show help
-
+        
         if ( !$has_infile )
         {
             $infile = $arg;
diff --git a/l10ntools/scripts/localize.pl b/l10ntools/scripts/localize.pl
index 4b7040d6583d..3c53bab46263 100644
--- a/l10ntools/scripts/localize.pl
+++ b/l10ntools/scripts/localize.pl
@@ -2,11 +2,11 @@
 eval 'exec perl -wS $0 ${1+"$@"}'
     if 0;
 
-
+    
 #*************************************************************************
 #
 # 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
@@ -29,7 +29,7 @@ eval 'exec perl -wS $0 ${1+"$@"}'
 # for a copy of the LGPLv3 License.
 #
 #*************************************************************************
-
+   
 use strict;
 use Getopt::Long;
 use IO::Handle;
@@ -43,7 +43,7 @@ use Cwd;
 my $CVS_BINARY = "/usr/bin/cvs";
 # ver 1.1
 #
-#### module lookup
+#### module lookup 
 #use lib ("$ENV{SOLARENV}/bin/modules", "$ENV{COMMON_ENV_TOOLS}/modules");
 
 #### module lookup
@@ -77,7 +77,7 @@ my $force_ooo_module = '0';
 my %is_ooo_module;
 my %is_so_module;
 
-         #         (                           leftpart                                                     )            (           rightpart                    )
+         #         (                           leftpart                                                     )            (           rightpart                    )    
          #            prj      file      dummy     type       gid       lid      helpid    pform     width      lang       text    helptext  qhelptext   title    timestamp
 my $sdf_regex  = "((([^\t]*)\t([^\t]*)\t([^\t]*)\t([^\t]*)\t([^\t]*)\t([^\t]*)\t([^\t]*)\t([^\t]*)\t([^\t]*))\t([^\t]*)\t(([^\t]*)\t([^\t]*)\t([^\t]*)\t([^\t]*)\t)([^\t]*))";
 my $file_types = "(src|hrc|xcs|xcu|lng|ulf|xrm|xhp|xcd|xgf|xxl|xrb)";
@@ -102,20 +102,20 @@ else
 #%sl_modules = fetch_sourcelanguage_dirlist();
 
 
-if   ( $mode eq "merge"    )    {
+if   ( $mode eq "merge"    )    {   
     if ( ! $no_gsicheck ){
         merge_gsicheck();
     }
-    splitfile( $sdffile );
+    splitfile( $sdffile );      
     if ( ! $no_gsicheck ){
         unlink $sdffile;             # remove temp file!
     }
 }
-elsif( $mode eq "extract"  )    {
+elsif( $mode eq "extract"  )    {   
     collectfiles( $outputfile );
 }
-else                            {
-    usage();
+else                            {  
+    usage();                    
 }
 
 exit(0);
@@ -138,13 +138,13 @@ sub splitfile{
     #print STDOUT "Open File $sdffile\n";
     open MYFILE , "< $sdffile"
     or die "Can't open '$sdffile'\n";
-
+    
 #    my %lang_hash;
     my %string_hash_ooo;
     my %string_hash_so;
     my %so_modules;
     $so_modules{ "extras_full" } = "TRUE";
-
+    
     while( <MYFILE>){
          if( /$sdf_regex/ ){
             my $line           = defined $_ ? $_ : '';
@@ -155,17 +155,17 @@ sub splitfile{
             my $lid            = defined $8 ? $8 : '';
             my $lang           = defined $12 ? $12 : '';
             my $plattform      = defined $10 ? $10 : '';
-            my $helpid         = defined $9 ? $9 : '';
+            my $helpid         = defined $9 ? $9 : ''; 
             next if( $prj eq "binfilter" );     # Don't merge strings into binfilter module
             chomp( $line );
-
+           
             if( is_openoffice_module( $prj ) )
             {
-                $string_hash_ooo { $lang }{ "$prj\t$file\t$type\t$gid\t$lid\t$helpid\t$plattform\t$lang" } = $line;
+                $string_hash_ooo { $lang }{ "$prj\t$file\t$type\t$gid\t$lid\t$helpid\t$plattform\t$lang" } = $line; 
             }
             else
             {
-                $string_hash_so{ $lang }{ "$prj\t$file\t$type\t$gid\t$lid\t$helpid\t$plattform\t$lang" } = $line;
+                $string_hash_so{ $lang }{ "$prj\t$file\t$type\t$gid\t$lid\t$helpid\t$plattform\t$lang" } = $line; 
             }
         }
     }
@@ -181,10 +181,10 @@ sub splitfile{
 
     #print "$so_l10n_path\n";
     #print "$ooo_l10n_path\n";
-
+    
     write_sdf( \%string_hash_so , $so_l10n_path );
     write_sdf( \%string_hash_ooo , $ooo_l10n_path );
-
+   
 }
 sub check_modules_scm
 {
@@ -194,7 +194,7 @@ sub check_modules_scm
     my $last_dir        = getcwd();
     chdir $src_path ;
     my @modules         = <*/.svn/entries>;
-
+    
     foreach my $module ( @modules )
     {
         #print "$module \n";
@@ -202,9 +202,9 @@ sub check_modules_scm
         {
             while( <FILE> )
             {
-
+                
                 my @path = split ( "/" , $module ) ;
-
+                
                 if( /svn.services.openoffice.org/ )
                 {
                     my $mod = $path[ 0 ];
@@ -219,7 +219,7 @@ sub check_modules_scm
                     # print "$module -> so ";
                     #$so_lookup_hash{ $mod } = "true";
                 }
-                #else
+                #else 
                 #{
                 #    print "ERROR: Is $module a SO or OOo module? Can not parese the $module/.svn/entries file ... please check mwsfinnish/merge/splitsdf.pl line 280\n";
                 # exit -1;
@@ -241,7 +241,7 @@ sub check_modules_scm
 #    my $output  = `$command`;
 #    my $rc = $? << 8;
 #    if ( $output eq "" || $rc < 0 ){
-#        print STDERR "ERROR: Can not fetch cvs alias list, please login to the cvs server and press at the password prompt just return\ncvs -d:pserver:anoncvs\@anoncvs.services.openoffice.org:/cvs login\n";
+#        print STDERR "ERROR: Can not fetch cvs alias list, please login to the cvs server and press at the password prompt just return\ncvs -d:pserver:anoncvs\@anoncvs.services.openoffice.org:/cvs login\n"; 
 #        exit ( -1 );
 #    }
 #    my @list = split /\n/ , $output ;
@@ -267,13 +267,13 @@ sub is_openoffice_module
 sub write_sdf
 {
     my $string_hash         = shift;
-    my $l10n_file           = shift;
-
+    my $l10n_file           = shift; 
+    
     foreach my $lang( keys( %{ $string_hash } ) )
     {
         my @sdf_file;
-        next , if( $lang eq "en-US" );
-
+        next , if( $lang eq "en-US" ); 
+        
         mkdir $l10n_file."/$lang";
         # mkdir!!!!
         my $current_l10n_file = $l10n_file."/$lang/localize.sdf";
@@ -289,10 +289,10 @@ sub write_sdf
                     my $gid            = defined $7 ? $7 : '';
                     my $lid            = defined $8 ? $8 : '';
                     my $lang           = defined $12 ? $12 : '';
-                    my $plattform      = defined $10 ? $10 : '';
+                    my $plattform      = defined $10 ? $10 : ''; 
                     my $helpid         = defined $9 ? $9 : '';
-
-                    chomp( $line );
+            
+                    chomp( $line );    
                     if ( defined $string_hash->{ $lang }{ "$prj\t$file\t$type\t$gid\t$lid\t$helpid\t$plattform\t$lang" } )
                     {
                         # Changed String!
@@ -309,13 +309,13 @@ sub write_sdf
         }
         close( DESTFILE );
         #Now just append the enw strings
-        #FIXME!!! Implement insertion in the correct order
+        #FIXME!!! Implement insertion in the correct order 
         foreach my $key ( keys ( %{ $string_hash->{ $lang } } ) )
         {
             push @sdf_file , $string_hash->{ $lang }{ $key } , if ( defined $string_hash->{ $lang }{ $key } );
             #print "WARNING: Not defined = ".$string_hash->{ $lang }{ $key }."\n", if( ! defined  $string_hash->{ $lang }{ $key } );
         }
-
+        
         # Write the new file
         my ( $TMPFILE , $tmpfile ) = File::Temp::tempfile();
         if( open DESTFILE , "+> $tmpfile " ){
@@ -325,12 +325,12 @@ sub write_sdf
             }
             close ( DESTFILE );
             if( move( $current_l10n_file , $current_l10n_file.".backup" ) ){
-                if( copy( $tmpfile , $current_l10n_file ) ){
-                    unlink $l10n_file.".backup";
+                if( copy( $tmpfile , $current_l10n_file ) ){ 
+                    unlink $l10n_file.".backup";  
                  } else { print STDERR "Can't open/create '$l10n_file', original file is renamed to $l10n_file.backup\n"; }
             } else { print STDERR "Can't open/create '$l10n_file'\n"; }
          }else{
-            print STDERR "WARNING: Can't open/create '$l10n_file'\n";
+            print STDERR "WARNING: Can't open/create '$l10n_file'\n";  
          }
          unlink $tmpfile;
      }
@@ -339,7 +339,7 @@ sub write_sdf
 #########################################################
 
 sub get_license_header{
-    return
+    return 
 "#\n".
 "#    ####    ###     #   #   ###   #####    #####  ####   #####  #####  \n".
 "#    #   #  #   #    ##  #  #   #    #      #      #   #    #      #    \n".
@@ -381,7 +381,7 @@ sub merge_gsicheck{
     my $command = '';
     my ( $TMPHANDLE , $tmpfile ) = File::Temp::tempfile();
     close ( $TMPHANDLE );
-
+    
     $command = "$ENV{WRAPCMD} " if( $ENV{WRAPCMD} );
     $command .= "$ENV{SOLARVER}/$ENV{INPATH}/bin/gsicheck";
 
@@ -395,7 +395,7 @@ sub merge_gsicheck{
         print STDOUT "### The file $errfile have been written containing the errors in your sdf file. Those lines will not be merged: ###\n\n";
         print STDOUT "$output\n";
         print STDOUT "################\n";
-
+       
     }else{
         # Remove the 0 Byte file
         unlink $errfile;
@@ -405,10 +405,10 @@ sub merge_gsicheck{
 #########################################################
 # find search function
 sub wanted
-{
+{ 
     my $file = $File::Find::name;
     if( -f $file && $file =~ /.*localize.sdf$/ && !( $file =~ /.*\.svn.*/ ) ) {
-        push   @sdfparticles , $file;
+        push   @sdfparticles , $file; 
         if( $bVerbose eq "1" ) { print STDOUT "$file\n"; }
         else { print ".";  }
     }
@@ -443,46 +443,46 @@ sub add_paths
             {
                 push @sdfparticles , "$ooo_l10n_dir/$lang/localize.sdf";
             }
-            else { #print "WARNING: $loc_file not found ....\n";
+            else { #print "WARNING: $loc_file not found ....\n"; 
             }
         }
-
+   
     }
 }
 sub collectfiles{
-    print STDOUT "### Localize\n";
-    my $localizehash_ref;
+    print STDOUT "### Localize\n"; 
+    my $localizehash_ref;  
     my ( $bAll , $bUseLocalize, $langhash_ref , $bHasSourceLanguage , $bFakeEnglish ) = parseLanguages();
-
+    
     # Enable autoflush on STDOUT
-    # $| = 1;
+    # $| = 1; 
     STDOUT->autoflush( 1 );
 
     ### Search sdf particles
     #print STDOUT "### Searching sdf particles\n";
     my $working_path = getcwd();
     chdir $ENV{SOURCE_ROOT_DIR}, if defined $ENV{SOURCE_ROOT_DIR};
-    #chdir $srcpath;
+    #chdir $srcpath;         
     #find ( { wanted => \&wanted , follow => 1 }, getcwd() );
     #chdir $working_path;
     add_paths( $langhash_ref );
-    #my $nFound  = $#sdfparticles +1;
+    #my $nFound  = $#sdfparticles +1; 
     #print "\n    $nFound files found !\n";
 
     my ( $LOCALIZEPARTICLE , $localizeSDF ) = File::Temp::tempfile();
-    close( $LOCALIZEPARTICLE );
+    close( $LOCALIZEPARTICLE ); 
 
     my ( $ALLPARTICLES_MERGED , $particleSDF_merged )     = File::Temp::tempfile();
-    close( $ALLPARTICLES_MERGED );
+    close( $ALLPARTICLES_MERGED ); 
     my ( $LOCALIZE_LOG , $my_localize_log ) = File::Temp::tempfile();
     close( $LOCALIZE_LOG );
-
+    
     ## Get the localize en-US extract
     if( $bAll || $bUseLocalize ){
         print "### Fetching source language strings\n";
         my $command = "";
         my $args    = "";
-
+        
         if( $ENV{WRAPCMD} ){
             $command = $ENV{WRAPCMD}.$binpath."localize_sl";
         }else{
@@ -492,7 +492,7 @@ sub collectfiles{
         # -e
         # if ( -x $command ){
         if( $command ){
-            if( !$bVerbose  ){ $args .= " -QQ "; }
+            if( !$bVerbose  ){ $args .= " "; }
             $args .= " -e -f $localizeSDF -l ";
             my $bFlag="";
             if( $bAll ) {$args .= " en-US";}
@@ -502,36 +502,36 @@ sub collectfiles{
                 push @list , $isokey;
                 if( $langhash_ref->{ $isokey } ne "" ){
                     push @list , $langhash_ref->{ $isokey };
-                }
+                } 
               }
               remove_duplicates( \@list );
               foreach my $isokey ( @list ){
                 switch :{
-                       ( $isokey=~ /^en-US$/i  )
-                        && do{
+                       ( $isokey=~ /^en-US$/i  ) 
+                        && do{  
                                 if( $bFlag eq "TRUE" ){ $args .= ",en-US"; }
-                                else {
-                                    $args .= "en-US";  $bFlag = "TRUE";
+                                else {     
+                                    $args .= "en-US";  $bFlag = "TRUE"; 
                                  }
                               };
-
+                                        
                     } #switch
                 } #foreach
-              } # if
+              } # if 
         } # if
         if ( $bVerbose ) { print STDOUT $command.$args."\n"; }
-
+        
         my $rc = system( $command.$args );
 
         if( $rc < 0 ){    print STDERR "ERROR: localize rc = $rc\n"; exit( -1 ); }
         ( $localizehash_ref )  = read_file( $localizeSDF , $langhash_ref );
-
+     
     }
     ## Get sdf particles
 #*****************
-    open ALLPARTICLES_MERGED , "+>> $particleSDF_merged"
-    or die "Can't open $particleSDF_merged";
-
+    open ALLPARTICLES_MERGED , "+>> $particleSDF_merged" 
+    or die "Can't open $particleSDF_merged"; 
+    
     ## Fill fackback hash
     my( $fallbackhashhash_ref ) = fetch_fallback( \@sdfparticles , $localizeSDF ,  $langhash_ref );
     my %block;
@@ -556,9 +556,9 @@ sub collectfiles{
                             my $gid            = defined $7 ? $7 : '';
                             my $lid            = defined $8 ? $8 : '';
                             my $lang           = defined $12 ? $12 : '';
-                            my $plattform      = defined $10 ? $10 : '';
+                            my $plattform      = defined $10 ? $10 : ''; 
                             my $helpid         = defined $9 ? $9 : '';
-
+                            
                             chomp( $line );
 
                             if ( $lang eq $cur_lang ){
@@ -574,12 +574,12 @@ sub collectfiles{
             }
 
             foreach my $line ( keys( %{$fallbackhashhash_ref->{ $cur_lang } } )) {
-                if( #$cur_lang ne "de" &&
+                if( #$cur_lang ne "de" && 
                     $cur_lang ne "en-US" ){
                     print ALLPARTICLES_MERGED ( $fallbackhashhash_ref->{ $cur_lang }{ $line }, "\n" );
                 }
              }
-        }
+        } 
     } else {
         foreach my $currentfile ( @sdfparticles ){
             if ( open MYFILE , "< $currentfile" ) {
@@ -591,18 +591,18 @@ sub collectfiles{
         }
     }
     close ALLPARTICLES_MERGED;
-#***************
-
+#***************    
+    
     # Hash of array
     my %output;
     my @order;
-
+    
     ## Join both
     if( $outputfile ){
         if( open DESTFILE , "+> $outputfile" ){
-            if( !open LOCALIZEPARTICLE ,  "< $localizeSDF" ) { print STDERR "ERROR: Can't open file $localizeSDF\n"; }
+            if( !open LOCALIZEPARTICLE ,  "< $localizeSDF" ) { print STDERR "ERROR: Can't open file $localizeSDF\n"; } 
             if( !open ALLPARTICLES_MERGED , "< $particleSDF_merged" ) { print STDERR "ERROR: Can't open file $particleSDF_merged\n"; }
-
+                
             # Insert localize
             my $extract_date="";
             while ( <LOCALIZEPARTICLE> ){
@@ -618,16 +618,16 @@ sub collectfiles{
                     my $gid            = defined $7 ? $7 : '';
                     my $lid            = defined $8 ? $8 : '';
                     #my $lang           = defined $12 ? $12 : '';
-                    my $plattform      = defined $10 ? $10 : '';
+                    my $plattform      = defined $10 ? $10 : ''; 
                     my $helpid         = defined $9 ? $9 : '';
-
-
+ 
+                    
                     if( $use_default_date )
                     {
-                        $extract_date = "$default_date\n" ;
+                        $extract_date = "$default_date\n" ; 
                     }
-                    elsif( $extract_date eq "" ) {
-                        $extract_date = $timestamp ;
+                    elsif( $extract_date eq "" ) {  
+                        $extract_date = $timestamp ; 
                         $extract_date =~ tr/\r\n//d;
                         $extract_date .= "\n";
                     }
@@ -635,18 +635,18 @@ sub collectfiles{
                     if( $bAll ){ print DESTFILE $leftpart."\t".$lang."\t".$rightpart.$extract_date ; }
                     else {
                         foreach my $sLang ( keys( %{ $langhash_ref } ) ){
-                            if( $sLang=~ /all/i )                       {
+                            if( $sLang=~ /all/i )                       {  
                                 push @{ $output{ $prj.$gid.$lid.$file.$type.$plattform.$helpid } } ,  $leftpart."\t".$lang."\t".$rightpart.$extract_date ;
-                                #print DESTFILE $leftpart."\t".$lang."\t".$rightpart.$extract_date;
+                                #print DESTFILE $leftpart."\t".$lang."\t".$rightpart.$extract_date;  
                             }
-                            #if( $sLang eq "de" && $lang eq "de" )       {
+                            #if( $sLang eq "de" && $lang eq "de" )       {  
                             #    push @{ $output{ $prj.$gid.$lid.$file.$type.$plattform.$helpid } } ,  $leftpart."\t".$lang."\t".$rightpart.$extract_date ;
-                                #print DESTFILE $leftpart."\t".$lang."\t".$rightpart.$extract_date;
+                                #print DESTFILE $leftpart."\t".$lang."\t".$rightpart.$extract_date;  
                                 #}
-                            if( $sLang eq "en-US" && $lang eq "en-US" ) {
+                            if( $sLang eq "en-US" && $lang eq "en-US" ) {  
                                 push @order , $prj.$gid.$lid.$file.$type.$plattform.$helpid;
                                 if( !$bFakeEnglish ){ push @{ $output{ $prj.$gid.$lid.$file.$type.$plattform.$helpid } } ,  $leftpart."\t".$lang."\t".$rightpart.$extract_date ; }
-                                #print DESTFILE $leftpart."\t".$lang."\t".$rightpart.$extract_date;
+                                #print DESTFILE $leftpart."\t".$lang."\t".$rightpart.$extract_date;  
                             }
 
                         }
@@ -668,22 +668,22 @@ sub collectfiles{
                     my $gid            = defined $7 ? $7 : '';
                     my $lid            = defined $8 ? $8 : '';
                     #my $lang           = defined $12 ? $12 : '';
-                    my $plattform      = defined $10 ? $10 : '';
+                    my $plattform      = defined $10 ? $10 : ''; 
                     my $helpid         = defined $9 ? $9 : '';
-
-
+ 
+                    
                     if( $use_default_date )
                     {
-                        $extract_date = "$default_date\n" ;
+                        $extract_date = "$default_date\n" ; 
                     }
-                    elsif( $extract_date eq "" )
-                    {
-                        $extract_date = $timestamp;
+                    elsif( $extract_date eq "" ) 
+                    { 
+                        $extract_date = $timestamp; 
                     }
 
-                    if( ! ( $prj =~ /binfilter/i ) ) {
-                        push @{ $output{ $prj.$gid.$lid.$file.$type.$plattform.$helpid } } , $leftpart."\t".$lang."\t".$rightpart.$extract_date ;
-                        #print DESTFILE $leftpart."\t".$lang."\t".$rightpart.$extract_date ;
+                    if( ! ( $prj =~ /binfilter/i ) ) { 
+                        push @{ $output{ $prj.$gid.$lid.$file.$type.$plattform.$helpid } } , $leftpart."\t".$lang."\t".$rightpart.$extract_date ; 
+                        #print DESTFILE $leftpart."\t".$lang."\t".$rightpart.$extract_date ; 
                     }
                  }
             }
@@ -695,8 +695,8 @@ sub collectfiles{
                         print DESTFILE $line;
                     }
                 }
-            }
-
+            } 
+        
         }else { print STDERR "Can't open $outputfile";}
     }
     close DESTFILE;
@@ -704,9 +704,9 @@ sub collectfiles{
     close ALLPARTICLES_MERGED;
     chdir $working_path;
 
-    #print STDOUT "DBG: \$localizeSDF $localizeSDF \$particleSDF_merged $particleSDF_merged\n";
+    #print STDOUT "DBG: \$localizeSDF $localizeSDF \$particleSDF_merged $particleSDF_merged\n";    
     unlink $localizeSDF , $particleSDF_merged ,  $my_localize_log;
-
+    
     #sort_outfile( $outputfile );
     #remove_obsolete( $outputfile ) , if $bHasSourceLanguage ne "";
     }
@@ -717,7 +717,7 @@ sub remove_obsolete{
     my @lines;
     my $enusleftpart;
     my @good_lines;
-
+    
     print STDOUT "### Removing obsolete strings\n";
 
     # Kick out all strings without en-US reference
@@ -731,11 +731,11 @@ sub remove_obsolete{
                 my $type           = defined $6 ? $6 : '';
                 my $gid            = defined $7 ? $7 : '';
                 my $lid            = defined $8 ? $8 : '';
-                my $plattform      = defined $10 ? $10 : '';
+                my $plattform      = defined $10 ? $10 : ''; 
                 my $helpid         = defined $9 ? $9 : '';
-
+                
                 my $leftpart = $prj.$gid.$lid.$file.$type.$plattform.$helpid;
-
+                
                 if( $language eq "en-US" ){                 # source string found, 1. entry
                     $enusleftpart = $leftpart;
                     push @good_lines , $line;
@@ -751,12 +751,12 @@ sub remove_obsolete{
                     #else{
                     #    print STDERR "OUT:  \$enusleftpart=$enusleftpart \$leftpart=$leftpart \$line=$line\n";
                     #}
-                }
+                }            
             }
-        }
+        }    
         close SORTEDFILE;
     } else { print STDERR "ERROR: Can't open file $outfile\n";}
-
+    
     # Write file
     if ( open ( SORTEDFILE , "> $outfile" ) ){
         foreach my $newline ( @good_lines ) {
@@ -772,24 +772,24 @@ sub sort_outfile{
         print STDOUT "### Sorting ... $outfile ...";
         my @lines;
         my @sorted_lines;
-
-
+        
+        
         #if ( open ( SORTEDFILE , "< $outputfile" ) ){
         if ( open ( SORTEDFILE , "< $outfile" ) ){
             my $line;
             while ( <SORTEDFILE> ){
                 $line = $_;
-                if( $line =~ /^[^\#]/ ){
-                    push @lines , $line;
+                if( $line =~ /^[^\#]/ ){ 
+                    push @lines , $line; 
                 }
             }
             close SORTEDFILE;
             @sorted_lines = sort {
-                my $xa_lang          = "";
+                my $xa_lang          = "";      
                 my $xa_left_part    = "";
                 my $xa_right_part    = "";
                 my $xa_timestamp     = "";
-                my $xb_lang          = "";
+                my $xb_lang          = "";      
                 my $xb_left_part    = "";
                 my $xb_right_part    = "";
                 my $xb_timestamp     = "";
@@ -797,7 +797,7 @@ sub sort_outfile{
                 my $xb               = "";
                 my @alist;
                 my @blist;
-
+                
                 if( $a=~ /$sdf_regex/ ){
                     $xa_left_part       = defined $2 ? $2 : '';
                     $xa_lang           = defined $12 ? $12 : '';
@@ -812,7 +812,7 @@ sub sort_outfile{
                     $xb_left_part = remove_last_column( $xb_left_part );
 
 
-                }
+                } 
                 if( (  $xa_left_part cmp $xb_left_part ) == 0 ){         # Left part equal
                      if( ( $xa_lang cmp $xb_lang ) == 0 ){               # Lang equal
                          return ( $xa_right_part cmp $xb_right_part );   # Right part compare
@@ -821,18 +821,18 @@ sub sort_outfile{
                     elsif( $xb_lang eq "en-US" ) { return 1;  }        # en-US wins
                     else { return $xa_lang cmp $xb_lang; }             # lang compare
                 }
-                else {
+                else { 
                     return $xa_left_part cmp $xb_left_part;        # Left part compare
                 }
             } @lines;
-
+            
             if ( open ( SORTEDFILE , "> $outfile" ) ){
                 print SORTEDFILE get_license_header();
                 foreach my $newline ( @sorted_lines ) {
                     print SORTEDFILE $newline;
                     #print STDOUT $newline;
-                }
-            }
+                }            
+            } 
             close SORTEDFILE;
         } else { print STDERR "WARNING: Can't open file $outfile\n";}
     print "done\n";
@@ -848,18 +848,18 @@ sub remove_last_column{
 
 #########################################################
 sub rename_language{
-    my $fallbackhashhash_ref    = shift;
+    my $fallbackhashhash_ref    = shift; 
     my $cur_fallback            = shift;
     my $cur_lang                = shift;
     my $line;
-
+      
     foreach my $key( keys ( %{ $fallbackhashhash_ref->{ $cur_fallback } } ) ){
         $line = $fallbackhashhash_ref->{ $cur_fallback }{ $key };
         if( $line =~ /$sdf_regex/ ){
             my $leftpart       = defined $2 ? $2 : '';
             my $lang           = defined $12 ? $12 : '';
             my $rightpart      = defined $13 ? $13 : '';
-
+                
             $fallbackhashhash_ref->{ $cur_lang }{ $key } = $leftpart."\t".$cur_lang."\t".$rightpart;
         }
     }
@@ -877,35 +877,35 @@ sub remove_duplicates{
 sub fetch_fallback{
     my $sdfparticleslist_ref   = shift;
     my $localizeSDF            = shift;
-    my $langhash_ref           = shift;
+    my $langhash_ref           = shift; 
     my %fallbackhashhash;
     my $cur_lang;
     my @langlist;
-
+    
     foreach my $key ( keys ( %{ $langhash_ref } ) ){
         $cur_lang = $langhash_ref->{ $key };
         if ( $cur_lang ne "" ) {
             push @langlist , $cur_lang;
         }
     }
-    remove_duplicates( \@langlist );
-    foreach  $cur_lang ( @langlist ){
+    remove_duplicates( \@langlist ); 
+    foreach  $cur_lang ( @langlist ){ 
         if( $cur_lang eq "en-US" ){
             read_fallbacks_from_source( $localizeSDF , $cur_lang , \%fallbackhashhash );
         }
     }
-
+    
     # remove de / en-US
     my @tmplist;
     foreach $cur_lang( @langlist ){
         if(  $cur_lang ne "en-US" ){
            push @tmplist , $cur_lang;
-
+ 
         }
     }
     @langlist = @tmplist;
-    if ( $#langlist +1 ){
-        read_fallbacks_from_particles( $sdfparticleslist_ref , \@langlist , \%fallbackhashhash );
+    if ( $#langlist +1 ){ 
+        read_fallbacks_from_particles( $sdfparticleslist_ref , \@langlist , \%fallbackhashhash ); 
 
     }
     return (\%fallbackhashhash);
@@ -913,27 +913,27 @@ sub fetch_fallback{
 
 #########################################################
 sub write_file{
-
+  
     my $localizeFile = shift;
     my $index_ref    = shift;
-
+    
     if( open DESTFILE , "+> $localizeFile" ){
         foreach my $key( %{ $index_ref } ){
             print DESTFILE ($index_ref->{ $key }, "\n" );
         }
         close DESTFILE;
     }else {
-      print STDERR "Can't open/create '$localizeFile'";
+      print STDERR "Can't open/create '$localizeFile'";  
     }
 }
 
 #########################################################
 sub read_file{
-
+    
     my $sdffile         = shift;
     my $langhash_ref    = shift;
     my %block           = ();
-
+    
     open MYFILE , "< $sdffile"
         or die "Can't open '$sdffile'\n";
         while( <MYFILE>){
@@ -947,7 +947,7 @@ sub read_file{
             my $plattform      = defined $10 ? $10 : '';
             my $lang           = defined $12 ? $12 : '';
             my $helpid         = defined $9 ? $9 : '';
-
+            
             foreach my $isolang ( keys ( %{ $langhash_ref } ) ){
                 if( $isolang=~ /$lang/i || $isolang=~ /all/i ) { $block{$prj.$gid.$lid.$file.$type.$plattform.$helpid } =  $line ; }
             }
@@ -958,7 +958,7 @@ sub read_file{
 
 #########################################################
 sub read_fallbacks_from_particles{
-
+    
     my $sdfparticleslist_ref    = shift;
     my $isolanglist_ref         = shift;
     my $fallbackhashhash_ref    = shift;
@@ -974,14 +974,14 @@ sub read_fallbacks_from_particles{
                     my $gid            = defined $7 ? $7 : '';
                     my $lid            = defined $8 ? $8 : '';
                     my $lang           = defined $12 ? $12 : '';
-                    my $plattform      = defined $10 ? $10 : '';
+                    my $plattform      = defined $10 ? $10 : ''; 
                     my $helpid         = defined $9 ? $9 : '';
-
+                          
                     chomp( $line );
-
+             
                     foreach my $isolang ( @{$isolanglist_ref}  ){
-                        if( $isolang=~ /$lang/i ) {
-                            $fallbackhashhash_ref->{ $isolang }{ $prj.$gid.$lid.$file.$type.$plattform.$helpid } =  $line ;
+                        if( $isolang=~ /$lang/i ) { 
+                            $fallbackhashhash_ref->{ $isolang }{ $prj.$gid.$lid.$file.$type.$plattform.$helpid } =  $line ; 
                         }
                     }
                 }
@@ -992,15 +992,15 @@ sub read_fallbacks_from_particles{
 
 #########################################################
 sub read_fallbacks_from_source{
-
+    
     my $sdffile                 = shift;
     my $isolang                 = shift;
     my $fallbackhashhash_ref    = shift;
     my $block_ref;
-    # read fallback for single file
+    # read fallback for single file 
     open MYFILE , "< $sdffile"
         or die "Can't open '$sdffile'\n";
-
+    
     while( <MYFILE>){
           if( /$sdf_regex/ ){
             my $line           = defined $_ ? $_ : '';
@@ -1012,9 +1012,9 @@ sub read_fallbacks_from_source{
             my $helpid         = defined $9 ? $9 : '';
             my $lang           = defined $12 ? $12 : '';
             my $plattform      = defined $10 ? $10 : '';
-
-            chomp( $line );
-            if( $isolang=~ /$lang/i ) { $fallbackhashhash_ref->{ $isolang }{ $prj.$gid.$lid.$file.$type.$plattform.$helpid } =  $line ;
+            
+            chomp( $line ); 
+            if( $isolang=~ /$lang/i ) { $fallbackhashhash_ref->{ $isolang }{ $prj.$gid.$lid.$file.$type.$plattform.$helpid } =  $line ; 
             }
         }
     }
@@ -1030,7 +1030,7 @@ sub parseLanguages{
     my %langhash;
     my $iso="";
     my $fallback="";
-
+  
     #### -l all
     if(   $languages=~ /all/ ){
         $bAll = "TRUE";
@@ -1043,13 +1043,13 @@ sub parseLanguages{
             if( $lang=~ /([a-zA-Z]{2,3}(-[a-zA-Z\-]*)*)(=([a-zA-Z]{2,3}(-[a-zA-Z\-]*)*))?/ ){
                 $iso        = $1;
                 $fallback   = $4;
-
+                
                 if( ( $iso && $iso=~ /(en-US)/i )  || ( $fallback && $fallback=~ /(en-US)/i ) ) {
                     $bUseLocalize = "TRUE";
                 }
                 if( ( $iso && $iso=~ /(en-US)/i ) ) {
                     $bHasSourceLanguage = "TRUE";
-                }
+                } 
              if( $fallback ) { $langhash{ $iso } = $fallback;   }
              else            { $langhash{ $iso } = "";          }
             }
@@ -1067,11 +1067,11 @@ sub parseLanguages{
             }
             if( ( $iso && $iso=~ /(en-US)/i )  ) {
                 $bHasSourceLanguage = "TRUE";
-            }
+            } 
 
              if( $fallback ) { $langhash{ $iso } = $fallback;   }
              else            { $langhash{ $iso } = "";          }
-        }
+        }    
     }
     # HACK en-US always needed!
     if( !$bHasSourceLanguage ){
@@ -1085,15 +1085,15 @@ sub parseLanguages{
 
 #########################################################
 sub parse_options{
-
+ 
     my $help;
     my $merge;
     my $extract;
-    my $success = GetOptions('f=s' => \$sdffile , 'l=s' => \$languages , 's=s' => \$srcpath ,  'h' => \$help , 'v' => \$bVerbose ,
+    my $success = GetOptions('f=s' => \$sdffile , 'l=s' => \$languages , 's=s' => \$srcpath ,  'h' => \$help , 'v' => \$bVerbose , 
                              'm' => \$merge , 'e' => \$extract , 'x' => \$no_sort , 'd' => \$use_default_date , 'c' => \$create_dirs ,
                              'n' => \$no_gsicheck , 'o' => \$force_ooo_module );
     $outputfile = $sdffile;
-
+    
     #print STDOUT "DBG: lang = $languages\n";
     if( !$srcpath ){
         $srcpath = "$ENV{SRC_ROOT}";
@@ -1113,7 +1113,7 @@ sub parse_options{
     }
     if( $merge && $sdffile && ! ( -r $sdffile)){
         print STDERR "Can't open file '$sdffile'\n";
-        exit(1);
+        exit(1);    
     }
     if( !( $languages=~ /[a-zA-Z]{2,3}(-[a-zA-Z\-]*)*(=[a-zA-Z]{2,3}(-[a-zA-Z\-]*)*)?(,[a-zA-Z]{2,3}(-[a-zA-Z\-]*)*(=[a-zA-Z]{2,3}(-[a-zA-Z\-]*)*)?)*/ ) ){
         print STDERR "Please check the -l iso code\n";
@@ -1137,7 +1137,7 @@ sub usage{
     print STDERR "Options:\n";
     print STDERR "    -h              help\n";
     print STDERR "    -m              Merge mode\n";
-    print STDERR "    -e              Extract mode\n";
+    print STDERR "    -e              Extract mode\n"; 
     print STDERR "    -f <sdffile>    To split a big SDF file into particles\n";
     print STDERR "       <outputfile> To collect and join all particles to one big file\n";
     print STDERR "    -s <sourceroot> Path to the modules, if no \$SRC_ROOT is set\n";
@@ -1146,7 +1146,7 @@ sub usage{
     print STDERR "    -c              Create needed directories\n";
     print STDERR "    -g              Sort sdf file before mergeing\n";
     print STDERR "    -h              File with localize.sdf's\n!";
-    print STDERR "    -n              No gsicheck\n";
+    print STDERR "    -n              No gsicheck\n"; 
     print STDERR "    -i              Module to merge\n";
     print STDERR "    -o              force using ooo localization from the l10n module instead of l10n_so; \n";
     print STDERR "                    useful if the type can't be detected by the .svn tags; \n";
@@ -1174,4 +1174,4 @@ sub usage{
 #            my $quickhelptext  = defined $16 ? $16 : '';
 #            my $title          = defined $17 ? $17 : '';
 #            my $timestamp      = defined $18 ? $18 : '';
-
+ 
diff --git a/l10ntools/scripts/localize_old.pl b/l10ntools/scripts/localize_old.pl
index d6b66d6bb535..e2b5027828f0 100755
--- a/l10ntools/scripts/localize_old.pl
+++ b/l10ntools/scripts/localize_old.pl
@@ -2,11 +2,11 @@
 eval 'exec perl -wS $0 ${1+"$@"}'
     if 0;
 
-
+    
 #*************************************************************************
 #
 # 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
@@ -29,7 +29,7 @@ eval 'exec perl -wS $0 ${1+"$@"}'
 # for a copy of the LGPLv3 License.
 #
 #*************************************************************************
-
+   
 use strict;
 use Getopt::Long;
 use IO::Handle;
@@ -41,7 +41,7 @@ use Cwd;
 
 # ver 1.1
 #
-#### module lookup
+#### module lookup 
 #use lib ("$ENV{SOLARENV}/bin/modules", "$ENV{COMMON_ENV_TOOLS}/modules");
 
 #### module lookup
@@ -67,7 +67,7 @@ my $languages;
 #my %sl_modules;     # Contains all modules where en-US and de is source language
 my $use_default_date = '0';
 
-         #         (                           leftpart                                                     )            (           rightpart                    )
+         #         (                           leftpart                                                     )            (           rightpart                    )    
          #            prj      file      dummy     type       gid       lid      helpid    pform     width      lang       text    helptext  qhelptext   title    timestamp
 my $sdf_regex  = "((([^\t]*)\t([^\t]*)\t([^\t]*)\t([^\t]*)\t([^\t]*)\t([^\t]*)\t([^\t]*)\t([^\t]*)\t([^\t]*))\t([^\t]*)\t(([^\t]*)\t([^\t]*)\t([^\t]*)\t([^\t]*)\t)([^\t]*))";
 my $file_types = "(src|hrc|xcs|xcu|lng|ulf|xrm|xhp|xcd|xgf|xxl|xrb)";
@@ -80,16 +80,16 @@ parse_options();
 #%sl_modules = fetch_sourcelanguage_dirlist();
 
 
-if   ( $mode eq "merge"    )    {
+if   ( $mode eq "merge"    )    {   
     merge_gsicheck();
-    splitfile( $sdffile );
+    splitfile( $sdffile );      
     unlink $sdffile;             # remove temp file!
 }
-elsif( $mode eq "extract"  )    {
+elsif( $mode eq "extract"  )    {   
     collectfiles( $outputfile );
 }
-else                            {
-    usage();
+else                            {  
+    usage();                    
 }
 
 exit(0);
@@ -112,7 +112,7 @@ sub splitfile{
     #print STDOUT "Open File $sdffile\n";
     open MYFILE , "< $sdffile"
     or die "Can't open '$sdffile'\n";
-
+    
     while( <MYFILE>){
          if( /$sdf_regex/ ){
             my $line           = defined $_ ? $_ : '';
@@ -123,32 +123,32 @@ sub splitfile{
             my $lid            = defined $8 ? $8 : '';
             my $lang           = defined $12 ? $12 : '';
             my $plattform      = defined $10 ? $10 : '';
-            my $helpid         = defined $9 ? $9 : '';
-
+            my $helpid         = defined $9 ? $9 : ''; 
+           
             next if( $prj eq "binfilter" );     # Don't merge strings into binfilter module
             chomp( $line );
             $currentFile  = $srcpath . '\\' . $prj . '\\' . $file;
             $currentFile  =~ s/\\/\//g;
-
+ 
             $cur_sdffile = $currentFile;
             #if( $cur_sdffile =~ /\.$file_types[\s]*$/ ){
                 $cur_sdffile =~ s/\/[^\/]*\.$file_types[\s]*$/\/localize.sdf/;
-            #}
-
+            #} 
+             
             # Set default date
             if( $line =~ /(.*)\t[^\t\$]*$/ ){
                 $line = $1."\t".$default_date;
             }
-
+     
             if( $start ){
                 $start='';
                 $lastFile = $currentFile; # ?
                 $last_sdffile = $cur_sdffile;
-            }
+            }    
 
             if( $lang eq "en-US" ){}
             elsif( $cur_sdffile eq $last_sdffile )
-            {
+            { 
                 $block{ "$prj\t$file\t$type\t$gid\t$lid\t$helpid\t$plattform\t$lang" } =  $line ;
             }
             else
@@ -157,8 +157,8 @@ sub splitfile{
                 $lastFile = $currentFile; #?
                 $last_sdffile = $cur_sdffile;
                 %block = ();
-                #if( ! $lang eq "en-US"  ) {
-                $block{ "$prj\t$file\t$type\t$gid\t$lid\t$helpid\t$plattform\t$lang" } =  $line ;
+                #if( ! $lang eq "en-US"  ) {  
+                $block{ "$prj\t$file\t$type\t$gid\t$lid\t$helpid\t$plattform\t$lang" } =  $line ; 
                 #}
 
             }
@@ -173,7 +173,7 @@ sub splitfile{
 #########################################################
 
 sub writesdf{
-
+        
     my $lastFile        = shift;
     my $blockhash_ref   = shift;
     my $localizeFile    = $lastFile;
@@ -187,7 +187,7 @@ sub writesdf{
         }
         if( open DESTFILE , "< $localizeFile" ){
 
-        #or die "Can't open/create '\$localizeFile'";
+        #or die "Can't open/create '\$localizeFile'";  
 
         #### Build hash
         while(<DESTFILE>){
@@ -199,15 +199,15 @@ sub writesdf{
             my $gid            = defined $7 ? $7 : '';
             my $lid            = defined $8 ? $8 : '';
             my $lang           = defined $12 ? $12 : '';
-            my $plattform      = defined $10 ? $10 : '';
+            my $plattform      = defined $10 ? $10 : ''; 
             my $helpid         = defined $9 ? $9 : '';
-
-            chomp( $line );
+            
+            chomp( $line );    
             $index{ "$prj\t$file\t$type\t$gid\t$lid\t$helpid\t$plattform\t$lang" } =  $line ;
-
+            
          } #else { print STDOUT "writesdf REGEX kaputt $_\n";}
 
-        }
+        }      
         close( DESTFILE );
     }
     #### Copy new strings
@@ -226,7 +226,7 @@ sub writesdf{
         }
     }
 
-    #### Write file
+    #### Write file  
 
     if( !$bVerbose ){ print STDOUT "."; }
     if( $isDirty eq "TRUE" ){
@@ -248,12 +248,12 @@ sub writesdf{
                 }
                 close DESTFILE;
                 if( move( $localizeFile , $localizeFile.".backup" ) ){
-                    if( copy( $tmpfile , $localizeFile ) ){
+                    if( copy( $tmpfile , $localizeFile ) ){ 
                         unlink $localizeFile.".backup";
                     } else { print STDERR "Can't open/create '$localizeFile', original file is renamed to  $localizeFile.backup\n"; }
                 } else { print STDERR "Can't open/create '$localizeFile'\n"; }
             }else{
-                print STDERR "WARNING: Can't open/create '$localizeFile'\n";
+                print STDERR "WARNING: Can't open/create '$localizeFile'\n";  
             }
             unlink $tmpfile;
         }
@@ -264,7 +264,7 @@ sub writesdf{
 }
 
 sub get_license_header{
-    return
+    return 
 "#\n".
 "#    ####    ###     #   #   ###   #####    #####  ####   #####  #####  \n".
 "#    #   #  #   #    ##  #  #   #    #      #      #   #    #      #    \n".
@@ -308,7 +308,7 @@ sub merge_gsicheck{
     my ( $TMPHANDLE2 , $tmpfile2 ) = File::Temp::tempfile();
     close ( $TMPHANDLE );
     close ( $TMPHANDLE2 );
-
+   
     unlink $tmpfile2;
     my $output2 = `cat $sdffile | sort > $tmpfile2`;
     my $rc2 = $? << 8;
@@ -316,7 +316,7 @@ sub merge_gsicheck{
         printf("ERROR: Failed -> cat $sdffile | sort > $tmpfile2\n$output2\n");
         exit( -1 );
     }
-
+    
 #    if( $ENV{WRAPCMD} ){
 #        $command = "$ENV{WRAPCMD} gsicheck";
 #    }else{
@@ -331,7 +331,7 @@ sub merge_gsicheck{
 #        print STDOUT "### The file $errfile have been written containing the errors in your sdf file. Those lines will not be merged: ###\n\n";
 #        print STDOUT "$output\n";
 #        print STDOUT "################\n";
-#
+#       
 #    }else{
 #        # Remove the 0 Byte file
 #        unlink $errfile;
@@ -341,47 +341,47 @@ sub merge_gsicheck{
 }
 #########################################################
 sub collectfiles{
-    print STDOUT "### Localize\n";
+    print STDOUT "### Localize\n"; 
     my @sdfparticles;
-    my $localizehash_ref;
+    my $localizehash_ref;  
     my ( $bAll , $bUseLocalize, $langhash_ref , $bHasSourceLanguage , $bFakeEnglish ) = parseLanguages();
-
+    
     # Enable autoflush on STDOUT
-    # $| = 1;
+    # $| = 1; 
     STDOUT->autoflush( 1 );
 
     ### Search sdf particles
     print STDOUT "### Searching sdf particles\n";
     my $working_path = getcwd();
-    chdir $srcpath;
-    find sub {
+    chdir $srcpath;         
+    find sub { 
         my $file = $File::Find::name;
         if( -f && $file =~ /.*localize.sdf$/ ) {
-            push   @sdfparticles , $file;
+            push   @sdfparticles , $file; 
             if( $bVerbose eq "1" ) { print STDOUT "$file\n"; }
             else { print ".";  }
-
+    
          }
     } , getcwd() ;#"."; #$srcpath;
     chdir $working_path;
 
-    my $nFound  = $#sdfparticles +1;
+    my $nFound  = $#sdfparticles +1; 
     print "\n    $nFound files found !\n";
 
     my ( $LOCALIZEPARTICLE , $localizeSDF ) = File::Temp::tempfile();
-    close( $LOCALIZEPARTICLE );
+    close( $LOCALIZEPARTICLE ); 
 
     my ( $ALLPARTICLES_MERGED , $particleSDF_merged )     = File::Temp::tempfile();
-    close( $ALLPARTICLES_MERGED );
+    close( $ALLPARTICLES_MERGED ); 
     my ( $LOCALIZE_LOG , $my_localize_log ) = File::Temp::tempfile();
     close( $LOCALIZE_LOG );
-
+    
     ## Get the localize de,en-US extract
     if( $bAll || $bUseLocalize ){
         print "### Fetching source language strings\n";
         my $command = "";
         my $args    = "";
-
+        
         if( $ENV{WRAPCMD} ){
             $command = "$ENV{WRAPCMD} localize_sl";
         }else{
@@ -401,45 +401,45 @@ sub collectfiles{
                 push @list , $isokey;
                 if( $langhash_ref->{ $isokey } ne "" ){
                     push @list , $langhash_ref->{ $isokey };
-                }
+                } 
               }
               remove_duplicates( \@list );
               foreach my $isokey ( @list ){
                 switch :{
-                    #( $isokey=~ /^de$/i  )
+                    #( $isokey=~ /^de$/i  ) 
                     #    && do{
                     #            if( $bFlag eq "TRUE" ){ $args .= ",de"; }
-                    #            else  {
-                    #                $args .=  "de";  $bFlag = "TRUE";
+                    #            else  {     
+                    #                $args .=  "de";  $bFlag = "TRUE"; 
                     #             }
                     #          };
-                        ( $isokey=~ /^en-US$/i  )
-                        && do{
+                        ( $isokey=~ /^en-US$/i  ) 
+                        && do{  
                                 if( $bFlag eq "TRUE" ){ $args .= ",en-US"; }
-                                else {
-                                    $args .= "en-US";  $bFlag = "TRUE";
+                                else {     
+                                    $args .= "en-US";  $bFlag = "TRUE"; 
                                  }
                               };
-
+                                        
                     } #switch
                 } #foreach
-              } # if
+              } # if 
         } # if
         if ( $bVerbose ) { print STDOUT $command.$args."\n"; }
-
+        
         my $rc = system( $command.$args );
 
         #my $output = `$command.$args`;
         #my $rc = $? << 8;
-
+        
         if( $rc < 0 ){    print STDERR "ERROR: localize rc = $rc\n"; exit( -1 ); }
         ( $localizehash_ref )  = read_file( $localizeSDF , $langhash_ref );
-
+     
     }
     ## Get sdf particles
-   open ALLPARTICLES_MERGED , "+>> $particleSDF_merged"
-    or die "Can't open $particleSDF_merged";
-
+   open ALLPARTICLES_MERGED , "+>> $particleSDF_merged" 
+    or die "Can't open $particleSDF_merged"; 
+    
     ## Fill fackback hash
     my( $fallbackhashhash_ref ) = fetch_fallback( \@sdfparticles , $localizeSDF ,  $langhash_ref );
 #    my( $fallbackhashhash_ref ) = fetch_fallback( \@sdfparticles , $localizeSDF , $langhash_ref );
@@ -465,9 +465,9 @@ sub collectfiles{
                             my $gid            = defined $7 ? $7 : '';
                             my $lid            = defined $8 ? $8 : '';
                             my $lang           = defined $12 ? $12 : '';
-                            my $plattform      = defined $10 ? $10 : '';
+                            my $plattform      = defined $10 ? $10 : ''; 
                             my $helpid         = defined $9 ? $9 : '';
-
+                            
                             chomp( $line );
 
                             if ( $lang eq $cur_lang ){
@@ -483,12 +483,12 @@ sub collectfiles{
             }
 
             foreach my $line ( keys( %{$fallbackhashhash_ref->{ $cur_lang } } )) {
-                if( #$cur_lang ne "de" &&
+                if( #$cur_lang ne "de" && 
                     $cur_lang ne "en-US" ){
                     print ALLPARTICLES_MERGED ( $fallbackhashhash_ref->{ $cur_lang }{ $line }, "\n" );
                 }
              }
-        }
+        } 
     } else {
         foreach my $currentfile ( @sdfparticles ){
             if ( open MYFILE , "< $currentfile" ) {
@@ -500,18 +500,18 @@ sub collectfiles{
         }
     }
     close ALLPARTICLES_MERGED;
-
-
+    
+    
     # Hash of array
     my %output;
     my @order;
-
+    
     ## Join both
     if( $outputfile ){
         if( open DESTFILE , "+> $outputfile" ){
-            if( !open LOCALIZEPARTICLE ,  "< $localizeSDF" ) { print STDERR "ERROR: Can't open file $localizeSDF\n"; }
+            if( !open LOCALIZEPARTICLE ,  "< $localizeSDF" ) { print STDERR "ERROR: Can't open file $localizeSDF\n"; } 
             if( !open ALLPARTICLES_MERGED , "< $particleSDF_merged" ) { print STDERR "ERROR: Can't open file $particleSDF_merged\n"; }
-
+                
             # Insert localize
             my $extract_date="";
             while ( <LOCALIZEPARTICLE> ){
@@ -527,16 +527,16 @@ sub collectfiles{
                     my $gid            = defined $7 ? $7 : '';
                     my $lid            = defined $8 ? $8 : '';
                     #my $lang           = defined $12 ? $12 : '';
-                    my $plattform      = defined $10 ? $10 : '';
+                    my $plattform      = defined $10 ? $10 : ''; 
                     my $helpid         = defined $9 ? $9 : '';
-
-
+ 
+                    
                     if( $use_default_date )
                     {
-                        $extract_date = "$default_date\n" ;
+                        $extract_date = "$default_date\n" ; 
                     }
-                    elsif( $extract_date eq "" ) {
-                        $extract_date = $timestamp ;
+                    elsif( $extract_date eq "" ) {  
+                        $extract_date = $timestamp ; 
                         $extract_date =~ tr/\r\n//d;
                         $extract_date .= "\n";
                     }
@@ -544,18 +544,18 @@ sub collectfiles{
                     if( $bAll ){ print DESTFILE $leftpart."\t".$lang."\t".$rightpart.$extract_date ; }
                     else {
                         foreach my $sLang ( keys( %{ $langhash_ref } ) ){
-                            if( $sLang=~ /all/i )                       {
+                            if( $sLang=~ /all/i )                       {  
                                 push @{ $output{ $prj.$gid.$lid.$file.$type.$plattform.$helpid } } ,  $leftpart."\t".$lang."\t".$rightpart.$extract_date ;
-                                #print DESTFILE $leftpart."\t".$lang."\t".$rightpart.$extract_date;
+                                #print DESTFILE $leftpart."\t".$lang."\t".$rightpart.$extract_date;  
                             }
-                            #if( $sLang eq "de" && $lang eq "de" )       {
+                            #if( $sLang eq "de" && $lang eq "de" )       {  
                             #    push @{ $output{ $prj.$gid.$lid.$file.$type.$plattform.$helpid } } ,  $leftpart."\t".$lang."\t".$rightpart.$extract_date ;
-                                #print DESTFILE $leftpart."\t".$lang."\t".$rightpart.$extract_date;
+                                #print DESTFILE $leftpart."\t".$lang."\t".$rightpart.$extract_date;  
                                 #}
-                            if( $sLang eq "en-US" && $lang eq "en-US" ) {
+                            if( $sLang eq "en-US" && $lang eq "en-US" ) {  
                                 push @order , $prj.$gid.$lid.$file.$type.$plattform.$helpid;
                                 if( !$bFakeEnglish ){ push @{ $output{ $prj.$gid.$lid.$file.$type.$plattform.$helpid } } ,  $leftpart."\t".$lang."\t".$rightpart.$extract_date ; }
-                                #print DESTFILE $leftpart."\t".$lang."\t".$rightpart.$extract_date;
+                                #print DESTFILE $leftpart."\t".$lang."\t".$rightpart.$extract_date;  
                             }
 
                         }
@@ -577,22 +577,22 @@ sub collectfiles{
                     my $gid            = defined $7 ? $7 : '';
                     my $lid            = defined $8 ? $8 : '';
                     #my $lang           = defined $12 ? $12 : '';
-                    my $plattform      = defined $10 ? $10 : '';
+                    my $plattform      = defined $10 ? $10 : ''; 
                     my $helpid         = defined $9 ? $9 : '';
-
-
+ 
+                    
                     if( $use_default_date )
                     {
-                        $extract_date = "$default_date\n" ;
+                        $extract_date = "$default_date\n" ; 
                     }
-                    elsif( $extract_date eq "" )
-                    {
-                        $extract_date = $timestamp;
+                    elsif( $extract_date eq "" ) 
+                    { 
+                        $extract_date = $timestamp; 
                     }
 
-                    if( ! ( $prj =~ /binfilter/i ) ) {
-                        push @{ $output{ $prj.$gid.$lid.$file.$type.$plattform.$helpid } } , $leftpart."\t".$lang."\t".$rightpart.$extract_date ;
-                        #print DESTFILE $leftpart."\t".$lang."\t".$rightpart.$extract_date ;
+                    if( ! ( $prj =~ /binfilter/i ) ) { 
+                        push @{ $output{ $prj.$gid.$lid.$file.$type.$plattform.$helpid } } , $leftpart."\t".$lang."\t".$rightpart.$extract_date ; 
+                        #print DESTFILE $leftpart."\t".$lang."\t".$rightpart.$extract_date ; 
                     }
                  }
             }
@@ -604,17 +604,17 @@ sub collectfiles{
                         print DESTFILE $line;
                     }
                 }
-            }
-
+            } 
+        
         }else { print STDERR "Can't open $outputfile";}
     }
     close DESTFILE;
     close LOCALIZEPARTICLE;
     close ALLPARTICLES_MERGED;
-
-    #print STDOUT "DBG: \$localizeSDF $localizeSDF \$particleSDF_merged $particleSDF_merged\n";
+    
+    #print STDOUT "DBG: \$localizeSDF $localizeSDF \$particleSDF_merged $particleSDF_merged\n";    
     unlink $localizeSDF , $particleSDF_merged ,  $my_localize_log;
-
+    
     #sort_outfile( $outputfile );
     #remove_obsolete( $outputfile ) , if $bHasSourceLanguage ne "";
     }
@@ -625,7 +625,7 @@ sub remove_obsolete{
     my @lines;
     my $enusleftpart;
     my @good_lines;
-
+    
     print STDOUT "### Removing obsolete strings\n";
 
     # Kick out all strings without en-US reference
@@ -639,11 +639,11 @@ sub remove_obsolete{
                 my $type           = defined $6 ? $6 : '';
                 my $gid            = defined $7 ? $7 : '';
                 my $lid            = defined $8 ? $8 : '';
-                my $plattform      = defined $10 ? $10 : '';
+                my $plattform      = defined $10 ? $10 : ''; 
                 my $helpid         = defined $9 ? $9 : '';
-
+                
                 my $leftpart = $prj.$gid.$lid.$file.$type.$plattform.$helpid;
-
+                
                 if( $language eq "en-US" ){                 # source string found, 1. entry
                     $enusleftpart = $leftpart;
                     push @good_lines , $line;
@@ -659,12 +659,12 @@ sub remove_obsolete{
                     #else{
                     #    print STDERR "OUT:  \$enusleftpart=$enusleftpart \$leftpart=$leftpart \$line=$line\n";
                     #}
-                }
+                }            
             }
-        }
+        }    
         close SORTEDFILE;
     } else { print STDERR "ERROR: Can't open file $outfile\n";}
-
+    
     # Write file
     if ( open ( SORTEDFILE , "> $outfile" ) ){
         foreach my $newline ( @good_lines ) {
@@ -680,24 +680,24 @@ sub sort_outfile{
         print STDOUT "### Sorting ... $outfile ...";
         my @lines;
         my @sorted_lines;
-
-
+        
+        
         #if ( open ( SORTEDFILE , "< $outputfile" ) ){
         if ( open ( SORTEDFILE , "< $outfile" ) ){
             my $line;
             while ( <SORTEDFILE> ){
                 $line = $_;
-                if( $line =~ /^[^\#]/ ){
-                    push @lines , $line;
+                if( $line =~ /^[^\#]/ ){ 
+                    push @lines , $line; 
                 }
             }
             close SORTEDFILE;
             @sorted_lines = sort {
-                my $xa_lang          = "";
+                my $xa_lang          = "";      
                 my $xa_left_part    = "";
                 my $xa_right_part    = "";
                 my $xa_timestamp     = "";
-                my $xb_lang          = "";
+                my $xb_lang          = "";      
                 my $xb_left_part    = "";
                 my $xb_right_part    = "";
                 my $xb_timestamp     = "";
@@ -705,7 +705,7 @@ sub sort_outfile{
                 my $xb               = "";
                 my @alist;
                 my @blist;
-
+                
                 if( $a=~ /$sdf_regex/ ){
                     $xa_left_part       = defined $2 ? $2 : '';
                     $xa_lang           = defined $12 ? $12 : '';
@@ -720,7 +720,7 @@ sub sort_outfile{
                     $xb_left_part = remove_last_column( $xb_left_part );
 
 
-                }
+                } 
                 if( (  $xa_left_part cmp $xb_left_part ) == 0 ){         # Left part equal
                      if( ( $xa_lang cmp $xb_lang ) == 0 ){               # Lang equal
                          return ( $xa_right_part cmp $xb_right_part );   # Right part compare
@@ -729,18 +729,18 @@ sub sort_outfile{
                     elsif( $xb_lang eq "en-US" ) { return 1;  }        # en-US wins
                     else { return $xa_lang cmp $xb_lang; }             # lang compare
                 }
-                else {
+                else { 
                     return $xa_left_part cmp $xb_left_part;        # Left part compare
                 }
             } @lines;
-
+            
             if ( open ( SORTEDFILE , "> $outfile" ) ){
                 print SORTEDFILE get_license_header();
                 foreach my $newline ( @sorted_lines ) {
                     print SORTEDFILE $newline;
                     #print STDOUT $newline;
-                }
-            }
+                }            
+            } 
             close SORTEDFILE;
         } else { print STDERR "WARNING: Can't open file $outfile\n";}
     print "done\n";
@@ -756,18 +756,18 @@ sub remove_last_column{
 
 #########################################################
 sub rename_language{
-    my $fallbackhashhash_ref    = shift;
+    my $fallbackhashhash_ref    = shift; 
     my $cur_fallback            = shift;
     my $cur_lang                = shift;
     my $line;
-
+      
     foreach my $key( keys ( %{ $fallbackhashhash_ref->{ $cur_fallback } } ) ){
         $line = $fallbackhashhash_ref->{ $cur_fallback }{ $key };
         if( $line =~ /$sdf_regex/ ){
             my $leftpart       = defined $2 ? $2 : '';
             my $lang           = defined $12 ? $12 : '';
             my $rightpart      = defined $13 ? $13 : '';
-
+                
             $fallbackhashhash_ref->{ $cur_lang }{ $key } = $leftpart."\t".$cur_lang."\t".$rightpart;
         }
     }
@@ -785,35 +785,35 @@ sub remove_duplicates{
 sub fetch_fallback{
     my $sdfparticleslist_ref   = shift;
     my $localizeSDF            = shift;
-    my $langhash_ref           = shift;
+    my $langhash_ref           = shift; 
     my %fallbackhashhash;
     my $cur_lang;
     my @langlist;
-
+    
     foreach my $key ( keys ( %{ $langhash_ref } ) ){
         $cur_lang = $langhash_ref->{ $key };
         if ( $cur_lang ne "" ) {
             push @langlist , $cur_lang;
         }
     }
-    remove_duplicates( \@langlist );
-    foreach  $cur_lang ( @langlist ){
+    remove_duplicates( \@langlist ); 
+    foreach  $cur_lang ( @langlist ){ 
         if( $cur_lang eq "en-US" ){
             read_fallbacks_from_source( $localizeSDF , $cur_lang , \%fallbackhashhash );
         }
     }
-
+    
     # remove de / en-US
     my @tmplist;
     foreach $cur_lang( @langlist ){
         if(  $cur_lang ne "en-US" ){
            push @tmplist , $cur_lang;
-
+ 
         }
     }
     @langlist = @tmplist;
-    if ( $#langlist +1 ){
-        read_fallbacks_from_particles( $sdfparticleslist_ref , \@langlist , \%fallbackhashhash );
+    if ( $#langlist +1 ){ 
+        read_fallbacks_from_particles( $sdfparticleslist_ref , \@langlist , \%fallbackhashhash ); 
 
     }
     return (\%fallbackhashhash);
@@ -821,27 +821,27 @@ sub fetch_fallback{
 
 #########################################################
 sub write_file{
-
+  
     my $localizeFile = shift;
     my $index_ref    = shift;
-
+    
     if( open DESTFILE , "+> $localizeFile" ){
         foreach my $key( %{ $index_ref } ){
             print DESTFILE ($index_ref->{ $key }, "\n" );
         }
         close DESTFILE;
     }else {
-      print STDERR "Can't open/create '$localizeFile'";
+      print STDERR "Can't open/create '$localizeFile'";  
     }
 }
 
 #########################################################
 sub read_file{
-
+    
     my $sdffile         = shift;
     my $langhash_ref    = shift;
     my %block           = ();
-
+    
     open MYFILE , "< $sdffile"
         or die "Can't open '$sdffile'\n";
         while( <MYFILE>){
@@ -855,7 +855,7 @@ sub read_file{
             my $plattform      = defined $10 ? $10 : '';
             my $lang           = defined $12 ? $12 : '';
             my $helpid         = defined $9 ? $9 : '';
-
+            
             foreach my $isolang ( keys ( %{ $langhash_ref } ) ){
                 if( $isolang=~ /$lang/i || $isolang=~ /all/i ) { $block{$prj.$gid.$lid.$file.$type.$plattform.$helpid } =  $line ; }
             }
@@ -866,7 +866,7 @@ sub read_file{
 
 #########################################################
 sub read_fallbacks_from_particles{
-
+    
     my $sdfparticleslist_ref    = shift;
     my $isolanglist_ref         = shift;
     my $fallbackhashhash_ref    = shift;
@@ -882,14 +882,14 @@ sub read_fallbacks_from_particles{
                     my $gid            = defined $7 ? $7 : '';
                     my $lid            = defined $8 ? $8 : '';
                     my $lang           = defined $12 ? $12 : '';
-                    my $plattform      = defined $10 ? $10 : '';
+                    my $plattform      = defined $10 ? $10 : ''; 
                     my $helpid         = defined $9 ? $9 : '';
-
+                          
                     chomp( $line );
-
+             
                     foreach my $isolang ( @{$isolanglist_ref}  ){
-                        if( $isolang=~ /$lang/i ) {
-                            $fallbackhashhash_ref->{ $isolang }{ $prj.$gid.$lid.$file.$type.$plattform.$helpid } =  $line ;
+                        if( $isolang=~ /$lang/i ) { 
+                            $fallbackhashhash_ref->{ $isolang }{ $prj.$gid.$lid.$file.$type.$plattform.$helpid } =  $line ; 
                         }
                     }
                 }
@@ -900,15 +900,15 @@ sub read_fallbacks_from_particles{
 
 #########################################################
 sub read_fallbacks_from_source{
-
+    
     my $sdffile                 = shift;
     my $isolang                 = shift;
     my $fallbackhashhash_ref    = shift;
     my $block_ref;
-    # read fallback for single file
+    # read fallback for single file 
     open MYFILE , "< $sdffile"
         or die "Can't open '$sdffile'\n";
-
+    
     while( <MYFILE>){
           if( /$sdf_regex/ ){
             my $line           = defined $_ ? $_ : '';
@@ -920,9 +920,9 @@ sub read_fallbacks_from_source{
             my $helpid         = defined $9 ? $9 : '';
             my $lang           = defined $12 ? $12 : '';
             my $plattform      = defined $10 ? $10 : '';
-
-            chomp( $line );
-            if( $isolang=~ /$lang/i ) { $fallbackhashhash_ref->{ $isolang }{ $prj.$gid.$lid.$file.$type.$plattform.$helpid } =  $line ;
+            
+            chomp( $line ); 
+            if( $isolang=~ /$lang/i ) { $fallbackhashhash_ref->{ $isolang }{ $prj.$gid.$lid.$file.$type.$plattform.$helpid } =  $line ; 
             }
         }
     }
@@ -938,7 +938,7 @@ sub parseLanguages{
     my %langhash;
     my $iso="";
     my $fallback="";
-
+  
     #### -l all
     if(   $languages=~ /all/ ){
         $bAll = "TRUE";
@@ -951,13 +951,13 @@ sub parseLanguages{
             if( $lang=~ /([a-zA-Z]{2,3}(-[a-zA-Z\-]*)*)(=([a-zA-Z]{2,3}(-[a-zA-Z\-]*)*))?/ ){
                 $iso        = $1;
                 $fallback   = $4;
-
+                
                 if( ( $iso && $iso=~ /(en-US)/i )  || ( $fallback && $fallback=~ /(en-US)/i ) ) {
                     $bUseLocalize = "TRUE";
                 }
                 if( ( $iso && $iso=~ /(en-US)/i ) ) {
                     $bHasSourceLanguage = "TRUE";
-                }
+                } 
              if( $fallback ) { $langhash{ $iso } = $fallback;   }
              else            { $langhash{ $iso } = "";          }
             }
@@ -975,11 +975,11 @@ sub parseLanguages{
             }
             if( ( $iso && $iso=~ /(en-US)/i )  ) {
                 $bHasSourceLanguage = "TRUE";
-            }
+            } 
 
              if( $fallback ) { $langhash{ $iso } = $fallback;   }
              else            { $langhash{ $iso } = "";          }
-        }
+        }    
     }
     # HACK en-US always needed!
     if( !$bHasSourceLanguage ){
@@ -993,14 +993,14 @@ sub parseLanguages{
 
 #########################################################
 sub parse_options{
-
+ 
     my $help;
     my $merge;
     my $extract;
-    my $success = GetOptions('f=s' => \$sdffile , 'l=s' => \$languages , 's=s' => \$srcpath ,  'h' => \$help , 'v' => \$bVerbose ,
+    my $success = GetOptions('f=s' => \$sdffile , 'l=s' => \$languages , 's=s' => \$srcpath ,  'h' => \$help , 'v' => \$bVerbose , 
                              'm' => \$merge , 'e' => \$extract , 'x' => \$no_sort , 'd' => \$use_default_date );
     $outputfile = $sdffile;
-
+    
     #print STDOUT "DBG: lang = $languages\n";
     if( !$srcpath ){
         #$srcpath = "$ENV{SRC_ROOT}";
@@ -1016,7 +1016,7 @@ sub parse_options{
     }
     if( $merge && $sdffile && ! ( -r $sdffile)){
         print STDERR "Can't open file '$sdffile'\n";
-        exit(1);
+        exit(1);    
     }
     if( !( $languages=~ /[a-zA-Z]{2,3}(-[a-zA-Z\-]*)*(=[a-zA-Z]{2,3}(-[a-zA-Z\-]*)*)?(,[a-zA-Z]{2,3}(-[a-zA-Z\-]*)*(=[a-zA-Z]{2,3}(-[a-zA-Z\-]*)*)?)*/ ) ){
         print STDERR "Please check the -l iso code\n";
@@ -1037,7 +1037,7 @@ sub usage{
     print STDERR "Options:\n";
     print STDERR "    -h              help\n";
     print STDERR "    -m              Merge mode\n";
-    print STDERR "    -e              Extract mode\n";
+    print STDERR "    -e              Extract mode\n"; 
     print STDERR "    -f <sdffile>    To split a big SDF file into particles\n";
     print STDERR "       <outputfile> To collect and join all particles to one big file\n";
     print STDERR "    -s <sourceroot> Path to the modules, if no \$SRC_ROOT is set\n";
@@ -1067,4 +1067,4 @@ sub usage{
 #            my $quickhelptext  = defined $16 ? $16 : '';
 #            my $title          = defined $17 ? $17 : '';
 #            my $timestamp      = defined $18 ? $18 : '';
-
+ 
diff --git a/transex3/java/jpropex/makefile.mk b/l10ntools/scripts/tool/const.py
index f86d2c830025..2d514eabdab6 100755..100644
--- a/transex3/java/jpropex/makefile.mk
+++ b/l10ntools/scripts/tool/const.py
@@ -25,12 +25,15 @@
 #
 #*************************************************************************
 
+# Pseudo const
+class _const:
+    class ConstError(TypeError): pass
+    def __setattr__(self, name, value):
+        if self.__dict__.has_key(name):
+            raise self.ConstError, "Can't rebind const(%s)"%name
+        self.__dict__[name] = value
 
-PRJ=../..
-PRJNAME=transex3
-TARGET=jpropex
+import sys
+sys.modules[__name__] = _const()
 
-.INCLUDE : ant.mk
-
-ALLTAR : ANTBUILD
 
diff --git a/l10ntools/scripts/tool/l10ntool.py b/l10ntools/scripts/tool/l10ntool.py
new file mode 100644
index 000000000000..70d88674f07b
--- /dev/null
+++ b/l10ntools/scripts/tool/l10ntool.py
@@ -0,0 +1,211 @@
+#*************************************************************************
+#
+# 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
+#
+# This file is part of OpenOffice.org.
+#
+# OpenOffice.org is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License version 3
+# only, as published by the Free Software Foundation.
+#
+# OpenOffice.org is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser General Public License version 3 for more details
+# (a copy is included in the LICENSE file that accompanied this code).
+#
+# You should have received a copy of the GNU Lesser General Public License
+# version 3 along with OpenOffice.org.  If not, see
+# <http://www.openoffice.org/license.html>
+# for a copy of the LGPLv3 License.
+#
+#*************************************************************************
+
+from optparse import OptionParser
+from sdf import SdfData
+from pseudo import PseudoSet
+
+import sys
+import os
+import shutil
+
+class AbstractL10nTool:
+    _options            = {}
+    _args               = ""
+    _resource_type      = "" 
+    _source_language    = "en-US"
+   
+    ##### Implement these abstract methods
+
+    ##### Nameing scheme for the output files
+    def get_outputfile_format_str(self):
+        # filename,fileNoExt,language,extension,pathPrefix,pathPostFix,path
+        #return "{path}/{fileNoExt}_{language}.{extension}"
+        return self._options.pattern
+
+    ################################# Merge single files ###########################################
+
+    ##### Merge a single file
+    def merge_file(self, inputfilename, outputfilename, parsed_file_ref, lang, is_forced_lang, sdfdata):
+        pass
+
+    ##### Helper for parse-once-use-often like parsing a xml file is needed implement it here
+    def parse_file(self, filename):
+        return None
+
+    ################### Merge one big file containing all strings in all languages #################
+    def merge_one_big_file(self, inputfile, outputfilename, parsed_file_ref, lang, sdfdata):
+        pass
+
+    ################### Extract a single File ######################################################
+    def extract_file(self, inputfile):
+        pass
+    
+    ################################################################################################
+    
+    def format_outputfile(self, filename, language):
+        extension = filename[filename.rfind('.')+1:]
+        file = filename[:filename.rfind('.')]
+    
+        # Python 2.3.x friendly
+        return self.get_outputfile_format_str().replace('[', '%(').replace(']',')s') % \
+                { 'filename': filename, 'fileNoExt': file, 'language': language, 'extension': extension, 'path_prefix': self._options.path_prefix,
+                  'path_postfix': self._options.path_postfix, 'path': self.get_path() }
+
+        #return self.get_outputfile_format_str().replace('[', '{').replace(']','}').format(
+        #       filename=filename, fileNoExt=file, language=language, extension=extension, path_prefix=self._options.path_prefix,
+        #       path_postfix=self._options.path_postfix, path=self.get_path())
+
+    def get_path(self):
+        if self._options.outputfile.find('/') == -1:
+            return ""
+        else:
+            return self._options.outputfile[:self._options.outputfile.rfind('/')]
+            
+    def merge(self,  sdfdata):
+        langset,forcedset, foundset = PseudoSet(), PseudoSet() , PseudoSet()
+
+        if self._options.languages:       
+            langset = PseudoSet(self._options.languages)  
+        if self._options.forcedlanguages: 
+            forcedset = PseudoSet(self._options.forcedlanguages) 
+        if sdfdata.get_languages_found_in_sdf(): 
+            foundset = sdfdata.get_languages_found_in_sdf() 
+    
+        if self.has_multi_inputfiles(): 
+            filelist = self.read_inputfile_list()
+        else:
+            filelist = self._options.inputfile
+            
+        for inputfile in filelist:
+            ref = self.parse_file(inputfile)
+            # Don't write that files if there is no l10n present
+            if ((langset & foundset) - forcedset):  # all langs given and found in sdf without enforced 
+                [self.merge_file(inputfile,self.format_outputfile(inputfile, lang), ref, lang, False, sdfdata) for lang in ((langset & foundset) - forcedset)]
+            # Always write those files even if there is no l10n available
+            if forcedset: # all enforced langs
+                [self.merge_file(inputfile, self.format_outputfile(inputfile, lang), ref, lang, True, sdfdata)  for lang in forcedset]
+            # In case a big file have to be written
+            if ((langset & foundset) | forcedset): # all langs given ,found in sdf and enforced ones
+                self.merge_one_big_file(inputfile, self.format_outputfile(inputfile, lang), ref, ((langset & foundset) | forcedset), sdfdata)
+    
+    def has_multi_inputfiles(self): 
+        return self._options.inputfile[0] == '@'
+
+    def copy_file(self, inputfilename, outputfilename):
+        try:
+            shutil.copy(inputfilename, outputfilename)
+        except IOError:
+            print "ERROR: Can not copy file '" + inputfilename + "' to " + "'" + outputfilename + "'"
+            sys.exit(-1)
+    
+    def extract(self):
+        try:
+            f = open(self._options.outputfile, "w+")
+            f.write(self.extract_file(self._options.inputfile))
+        except IOError:
+            print "ERROR: Can not write file " + self._options.outputfile
+        else:
+            f.close()
+            
+    # Parse the common options
+    def parse_options(self):
+        parser = OptionParser()
+        parser.add_option("-i", "--inputfile",       dest="inputfile",       metavar="FILE", help="resource file to read"         )
+        parser.add_option("-o", "--outputfile",      dest="outputfile",      metavar="FILE", help="extracted sdf or merged file"  )
+        parser.add_option("-m", "--inputsdffile",    dest="input_sdf_file",  metavar="FILE", help="merge this sdf file"           )
+        parser.add_option("-x", "--pathprefix",      dest="path_prefix",     metavar="PATH", help=""                              )
+        parser.add_option("-y", "--pathpostfix",     dest="path_postfix",    metavar="PATH", help=""                              )
+        parser.add_option("-p", "--projectname",     dest="project_name",    metavar="NAME", help=""                              )
+        parser.add_option("-r", "--projectroot",     dest="project_root",    metavar="PATH", help=""                              )
+        parser.add_option("-f", "--forcedlanguages", dest="forcedlanguages", metavar="ISOCODE[,ISOCODE]", help="Always merge those langs even if no l10n is available for those langs" )
+        parser.add_option("-l", "--languages",       dest="languages",       metavar="ISOCODE[,ISOCODE]", help="Merge those langs if l10n is found for each")
+        parser.add_option("-s", "--pattern",         dest="pattern",         metavar="", help=""                                  )        
+        parser.add_option("-q", "--quiet",           action="store_true",    dest="quietmode", help="",default=False)
+        (self._options, self.args) = parser.parse_args()
+        
+        # -l "de,pr,pt-BR" => [ "de" , "pt" , "pt-BR" ]
+        parse_complex_arg = lambda arg: arg.split(",")
+        
+        if self._options.forcedlanguages: 
+            self._options.forcedlanguages = parse_complex_arg(self._options.forcedlanguages) 
+        if self._options.languages:       
+            self._options.languages = parse_complex_arg(self._options.languages) 
+        self.test_options()
+        
+    def __init__(self):
+        self.parse_options()
+        if self._options.input_sdf_file != None and len(self._options.input_sdf_file):
+            sdfdata = SdfData(self._options.input_sdf_file)
+            sdfdata.read()
+            self.merge(sdfdata)
+        else:
+            self.extract()
+
+    def make_dirs(self, filename):
+        dir = filename[:filename.rfind('/')]
+        if os.path.exists(dir):
+            if os.path.isfile(dir):
+                print "ERROR: There is a file '"+dir+"' where I want create a directory"
+                sys.exit(-1)
+            else:
+                return
+        else:
+            try:
+                os.makedirs(dir)
+            except IOError:
+                print "Error: Can not create dir " + dir
+                sys.exit(-1)
+            
+    def test_options(self):
+        opt = self._options
+        is_valid = lambda x: x != None and len(x) > 0
+        return  is_valid(opt.project_root) and is_valid(opt.project_name) and is_valid(opt.languages) and \
+                ( is_valid(opt.inputfile) and (( is_valid(opt.path_prefix) and is_valid(opt.path_postfix) ) or is_valid(opt.outputfile)) and \
+                ( ( is_valid(opt.input_sdf_file) and ( is_valid(opt.outputfile) or  ( is_valid(opt.path_prefix) and is_valid(opt.path_postfix) ) or \
+                ( is_valid(opt.inputfile) and is_valid(opt.outputFile)) ))))
+        print "Strange options ..."
+        sys.exit( -1 )
+                     
+    def read_inputfile_list(self):
+        if self.has_multi_inputfiles():
+            lines = []
+            try:
+                f = open(self._options.inputfile[1:], "r")
+                lines = [line.strip('\n') for line in f.readlines()]
+            except IOError:
+                print "ERROR: Can not read file list " + self._options.inputfile[2:]
+                sys.exit(-1)
+            else:
+                f.close()
+            return lines
+        
+    def get_filename_string(self, inputfile):
+        absfile = os.path.realpath(os.path.abspath(inputfile))
+        absroot = os.path.realpath(os.path.abspath(self._options.project_root)) 
+        return absfile[len(absroot)+1:].replace('/','\\')
+    
diff --git a/l10ntools/scripts/tool/pseudo.py b/l10ntools/scripts/tool/pseudo.py
new file mode 100644
index 000000000000..0956325e31db
--- /dev/null
+++ b/l10ntools/scripts/tool/pseudo.py
@@ -0,0 +1,184 @@
+#*************************************************************************
+#
+# 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
+#
+# This file is part of OpenOffice.org.
+#
+# OpenOffice.org is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License version 3
+# only, as published by the Free Software Foundation.
+#
+# OpenOffice.org is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser General Public License version 3 for more details
+# (a copy is included in the LICENSE file that accompanied this code).
+#
+# You should have received a copy of the GNU Lesser General Public License
+# version 3 along with OpenOffice.org.  If not, see
+# <http://www.openoffice.org/license.html>
+# for a copy of the LGPLv3 License.
+#
+#*************************************************************************
+
+# to support macosx baseline machines from Cretaceous period 
+
+# incomplete set() class implementation of Python 2.4
+class PseudoSet:
+    _list = []
+   
+    def __str__(self):
+        return str(self._list)
+
+    def __init__(self, newlist=[]):
+        self._list = self._remove_dupes(newlist)
+
+    def __or__(self, other):
+        tmplist = []
+        if self._list != None and other != None:
+            tmplist.extend(self._list)
+            tmplist.extend(other)
+            return PseudoSet(self._remove_dupes(tmplist))
+        else:
+            print "__or__(None)"
+
+    def __sub__(self,other):
+        tmplist = []
+        if self._list != None and other != None:
+            tmplist.extend(self._list)
+            [tmplist.remove(key) for key in other if key in tmplist]
+        else:
+            print "__sub__(none)"
+        return PseudoSet(tmplist)
+
+    def __and__(self, other):
+        tmplist = []
+        if other != None and self._list != None:
+            [tmplist.append(key) for key in self._list if key in other]
+            return PseudoSet(tmplist)
+        else:
+            print "__and__(None)"
+                    
+    def __iter__(self):
+        return self._list.__iter__()
+    
+    def __items__(self):
+        return self._list.items()
+
+    def __keys__(self):
+        return keys(self._list)
+
+    def _remove_dupes(self, list):
+        tmpdict = {} 
+        for key in list:
+            tmpdict[key] = 1
+        return tmpdict.keys()
+
+# incomplete OrderedDict() class implementation 
+class PseudoOrderedDict(dict):
+    _keylist        = []
+    _valuelist      = []
+    
+    def __init__(self, defaults={}):
+        dict.__init__(self)
+        for n,v in defaults.items():
+            self[n] = v
+
+    def __setitem__(self, key, value):
+        self._keylist.append(key)
+        self._valuelist.append(value)
+        return dict.__setitem__(self, key, value)
+        
+    def __delattr__(self, key):
+        self._keylist.__delattr__(key)
+        self._valuelist.__delattr__(dict[key])
+        return dict.__delattr__(self, key)
+
+    def __delitem__(self, key):
+        self._keylist.__delitem__(key)
+        self._valuelist.__delitem__(dict[key])
+        return dict.__delitem__(self, key)
+        
+    def __iter__(self):
+        raise NotImplementedError("__iter__")
+    
+    def __iterkeys__(self):
+        return self._keylist
+    
+    def iteritems(self):
+        #return self._valuelist
+        return zip(self._keylist, self._valuelist)
+   
+    def items(self):
+        return zip(self._keylist,self._valuelist)
+
+    def __keys__(self):
+        return self._keylist
+
+    def keys(self):
+        return self._keylist
+
+    def __keysattr__(self):
+        return self._keylist
+    
+    def pop(self, key):
+        self._keylist.pop(key)
+        self._valuelist.pop(key)
+        return dict.__pop__(self, key)
+    
+    def popitem(self):
+        raise NotImplementedError("popitem")
+    
+def _testdriver_set():
+    list, list1 = [] ,[]
+    list.append("a")
+    list.append("b")
+    list.append("c")
+
+    list1.append("a")
+    list1.append("b")
+    list1.append("d")
+    list1.append("e")
+    list1.append("e")
+
+    if "a" in list:
+        print "YEAH!"
+
+    a = PseudoSet(list)
+    b = PseudoSet(list1)
+
+    print "a="+str(a)
+    print "b="+str(b)
+    print "a|b=" + str(a|b)
+    print "a="+str(a)
+    print "b="+str(b)
+    print "a&b=" + str(a&b)
+    print "a="+str(a)
+    print "b="+str(b)
+    print "a-b" + str(a-b)
+
+    for key in a:
+        print key
+
+def _testdriver_dict():
+    d = PseudoOrderedDict()
+    d["a"] = 1
+    d["b"] = 2
+    d["c"] = 3
+    d["d"] = 4
+    d["e"] = 5
+    d["f"] = 6
+
+    print "a="+str(d["a"])
+    print "e="+str(d["e"])
+    for key,value in d.iteritems():
+        print "d["+key+"]="+str(d[key])
+        print "key="+str(key)+" value="+str(value)
+
+    print "keys="+str(d.keys())
+
+#_testdriver_dict()
diff --git a/l10ntools/scripts/tool/sdf.py b/l10ntools/scripts/tool/sdf.py
new file mode 100644
index 000000000000..96afbed1452c
--- /dev/null
+++ b/l10ntools/scripts/tool/sdf.py
@@ -0,0 +1,170 @@
+#*************************************************************************
+#
+# 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
+#
+# This file is part of OpenOffice.org.
+#
+# OpenOffice.org is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License version 3
+# only, as published by the Free Software Foundation.
+#
+# OpenOffice.org is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser General Public License version 3 for more details
+# (a copy is included in the LICENSE file that accompanied this code).
+#
+# You should have received a copy of the GNU Lesser General Public License
+# version 3 along with OpenOffice.org.  If not, see
+# <http://www.openoffice.org/license.html>
+# for a copy of the LGPLv3 License.
+#
+#*************************************************************************
+
+from pseudo import PseudoSet,PseudoOrderedDict
+from time import gmtime, strftime
+
+class SdfData:
+    _filename        = "";
+    _dict            = PseudoOrderedDict()
+    _languages_found = [];
+    
+    def __init__ (self, filename=""):
+        self._filename = filename
+    
+    def __getitem__(self, key):
+        if self._dict.has_key(key):
+            return self._dict[key]
+        else:
+            return None
+    
+    def has_key(self, key):
+        return self._dict.has_key(key)
+    
+    def __setitem__(self, key, value):
+        self._dict[key] = value
+    
+    def get_languages_found_in_sdf(self):
+        return PseudoSet(self._languages_found)
+
+    def read(self):
+        try:
+            f = open(self._filename, "r")
+            lines = [line.rstrip('\n') for line in f.readlines()] 
+        except IOError:
+            print "ERROR: Trying to read "+ self._filename
+            raise
+        else:
+            f.close()
+        for line in lines:        
+            entity = SdfEntity()
+            entity.set_properties(line)
+            self._dict[entity.get_id()] = entity
+            self._languages_found.append(entity.langid)
+
+    def write(self, filename):
+        try:
+            f = open(filename, "w+") 
+            for value in self._dict.itervalues():
+                #f.write( repr(value)+"\n" )
+                f.write(value + "\n")
+        except IOError:
+            print "ERROR: Trying to write " + filename
+            raise
+        else:
+            f.close()
+
+import sys
+class SdfEntity: 
+    # Sdf format columns
+    project         = ""
+    source_file     = ""
+    dummy1          = ""
+    resource_type   = ""
+    gid             = ""
+    lid             = ""
+    helpid          = ""
+    platform        = ""
+    dummy2          = ""
+    langid          = ""
+    text            = ""
+    helptext        = ""
+    quickhelptext   = ""
+    title           = ""
+    date            = ""
+    
+    import const
+    const._PROJECT_POS         = 0
+    const._SOURCE_FILE_POS     = 1
+    const._DUMMY1_POS          = 2
+    const._RESOURCE_TYPE_POS   = 3
+    const._GID_POS             = 4
+    const._LID_POS             = 5
+    const._HELPID_POS          = 6
+    const._PLATFORM_POS        = 7
+    const._DUMMY2_POS          = 8
+    const._LANGID_POS          = 9
+    const._TEXT_POS            = 10
+    const._HELPTEXT_POS        = 11
+    const._QUICKHELPTEXT_POS   = 12
+    const._TITLE_POS           = 13
+    const._DATE_POS            = 14
+        
+    def __init__(self, project="", source_file="", dummy1="0", resource_type="", gid="", lid="", helpid="", platform="", dummy2="0", langid="", 
+                       text="", helptext="", quickhelptext="", title="", date=""):
+        self.project        = project;
+        self.source_file    = source_file;
+        self.dummy1         = dummy1;
+        self.resource_type  = resource_type;
+        self.gid            = gid;
+        self.lid            = lid;
+        self.helpid         = helpid;
+        self.platform       = platform;
+        self.dummy2         = dummy2;
+        self.langid         = langid;
+        self.text           = text;
+        self.helptext       = helptext;
+        self.quickhelptext  = quickhelptext;
+        self.title          = title;
+        if date != "":
+            self.date = date;
+        else:
+            self.date = strftime("%Y-%m-%d %H:%M:%S",gmtime())
+
+
+    def set_properties(self, line):
+        splitted = line.split("\t")
+        if len(splitted) == 15:
+            self.project        = splitted[ self.const._PROJECT_POS ]             
+            self.source_file    = splitted[ self.const._SOURCE_FILE_POS ]     
+            self.dummy1         = splitted[ self.const._DUMMY1_POS ]         
+            self.resource_type  = splitted[ self.const._RESOURCE_TYPE_POS ] 
+            self.gid            = splitted[ self.const._GID_POS ]             
+            self.lid            = splitted[ self.const._LID_POS ]             
+            self.helpid         = splitted[ self.const._HELPID_POS ]         
+            self.platform       = splitted[ self.const._PLATFORM_POS ]         
+            self.dummy2         = splitted[ self.const._DUMMY2_POS ]         
+            self.langid         = splitted[ self.const._LANGID_POS ]         
+            self.text           = splitted[ self.const._TEXT_POS ]             
+            self.helptext       = splitted[ self.const._HELPTEXT_POS ]         
+            self.quickhelptext  = splitted[ self.const._QUICKHELPTEXT_POS ] 
+            self.title          = splitted[ self.const._TITLE_POS ]         
+            self.date           = splitted[ self.const._DATE_POS ]            
+
+    def get_file_id(self):
+        return self.project + "\\" + self.source_file
+    
+    def get_resource_path(self):
+            return self.source_file[0:self.source_file.rfind( "\\" )-1]
+    
+    def __str__(self):
+        return ''.join([self.project, "\t", self.source_file, "\t", self.dummy1, "\t", self.resource_type, "\t" , 
+            self.gid, "\t", self.lid, "\t", self.helpid, "\t", self.platform, "\t", self.dummy2, "\t" , self.langid, 
+            "\t", self.text, "\t", self.helptext, "\t", self.quickhelptext, "\t" , self.title, "\t", self.date ])
+    
+    def get_id(self):
+        return ''.join([self.project, self.gid, self.lid, self.source_file, self.resource_type, self.platform, self.helpid, self.langid])
diff --git a/l10ntools/scripts/tool/xhtex.py b/l10ntools/scripts/tool/xhtex.py
new file mode 100644
index 000000000000..c427a7feccdd
--- /dev/null
+++ b/l10ntools/scripts/tool/xhtex.py
@@ -0,0 +1,135 @@
+#*************************************************************************
+#
+# 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
+#
+# This file is part of OpenOffice.org.
+#
+# OpenOffice.org is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License version 3
+# only, as published by the Free Software Foundation.
+#
+# OpenOffice.org is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser General Public License version 3 for more details
+# (a copy is included in the LICENSE file that accompanied this code).
+#
+# You should have received a copy of the GNU Lesser General Public License
+# version 3 along with OpenOffice.org.  If not, see
+# <http://www.openoffice.org/license.html>
+# for a copy of the LGPLv3 License.
+#
+#*************************************************************************
+
+from l10ntool import AbstractL10nTool
+from sdf import SdfEntity
+import sys
+import xml.dom.minidom
+
+class Xhtex(AbstractL10nTool):
+    _resource_type = "xht" 
+    _sdfdata       = ()
+    _lang          = ""
+   
+    # Extract methods
+    def extract_topic(self, list, inputfile):
+        topics = []
+        for elem in list:                        
+            if elem.childNodes[0].nodeType == elem.TEXT_NODE and len(elem.childNodes[0].data.strip()):
+                topics.append(self.prepare_sdf_line(id=elem.getAttribute("id").strip(), text=elem.childNodes[0].data, inputfile=inputfile))            
+        return topics
+            
+    def extract_title(self, list, inputfile):
+        titles = []
+        for elem in list:
+            if len(elem.getAttribute("title").strip()):
+                titles.append(self.prepare_sdf_line(id=elem.getAttribute("id").strip(), text=elem.getAttribute("title").strip(), inputfile=inputfile))
+        return titles
+    
+    # Merge methods
+    def merge_topic(self, list, sdfdata, lang, inputfilename, dom):
+        for elem in list:
+            if elem.childNodes[0].nodeType == elem.TEXT_NODE and elem.getAttribute("id").strip():
+                obj = self.prepare_sdf_line(inputfile=inputfilename, lang=lang, id=elem.getAttribute("id").strip())
+                if sdfdata[obj.get_id()]:
+                    elem.childNodes[0].data = str(sdfdata[obj.get_id()].text)  
+                
+    def merge_title(self, list, sdfdata, lang, inputfilename):
+        for elem in list:
+            obj = self.prepare_sdf_line(inputfile=inputfilename, lang=lang, id=elem.getAttribute("id").strip())
+            if elem.getAttribute("id").strip() and sdfdata[obj.get_id()]: 
+                elem.setAttribute("title", str(sdfdata[obj.get_id()].text))
+
+    # L10N tool       
+    def __init__(self):
+        AbstractL10nTool.__init__(self)
+        
+    def parse_file(self, filename):
+        document = ""
+        try:
+            f = open(filename, "r+")
+            document = f.read()
+        except IOError:
+            print "ERROR: Can not read file " + filename
+            sys.exit(-1)
+        else:
+            f.close()
+        return xml.dom.minidom.parseString(document)
+
+        
+    def merge_file(self, inputfilename, outputfilename, parsed_file_ref, lang,is_forced_lang, sdfdata):
+        if lang == "en-US":             
+            mod_outputfilename = outputfilename.replace("_en-US",'')            
+            self.make_dirs(mod_outputfilename)
+            self.copy_file(inputfilename, mod_outputfilename)
+            return
+        dom = parsed_file_ref.cloneNode(True)
+        #dom = self.parse_file(inputfilename)    # in case cloneNode is buggy just parse it always
+                
+        self.merge_topic(dom.getElementsByTagName("topic"), sdfdata, lang, inputfilename, dom)
+        self.merge_title(dom.getElementsByTagName("node"), sdfdata, lang, inputfilename)
+        self.merge_title(dom.getElementsByTagName("help_section"), sdfdata, lang, inputfilename)
+        self.make_dirs(outputfilename)
+        try:
+            f = open(outputfilename, "w+")
+            str = dom.toxml()
+            f.write(str)
+        except IOError:
+            print "ERROR: Can not write file " + outputfilename
+            sys.exit(-1)
+        else:
+            f.close()
+    
+    ##### Helper for parse-once-use-often like parsing a xml file is needed implement it here
+    def parse_file(self, filename):
+        document = ""
+        try:
+            f = open(filename,"r+")
+            document = f.read()
+        except IOError:
+            print "ERROR: Can not read file " + filename
+        else:
+            f.close()        
+        return xml.dom.minidom.parseString(document)
+    
+    ##### Extract a single File
+    def extract_file(self, inputfile):
+        sdf_data = []
+        dom = self.parse_file(inputfile)        
+        sdf_data.extend(self.extract_topic(dom.getElementsByTagName("topic"), inputfile))
+        sdf_data.extend(self.extract_title(dom.getElementsByTagName("help_section"), inputfile))
+        sdf_data.extend(self.extract_title(dom.getElementsByTagName("node"), inputfile))        
+        return ''.join([str(line)+"\n" for line in sdf_data])                      
+
+    def prepare_sdf_line(self, inputfile="", lang="" , id="" , text=""):
+        if lang == "":
+            lang = self._source_language
+        return SdfEntity(project=self._options.project_name, source_file=self.get_filename_string(inputfile),
+                         resource_type=self._resource_type, gid=id, lid="", langid=lang,text=text)
+        
+run = Xhtex()
+ 
diff --git a/l10ntools/scripts/tool/xtxex.py b/l10ntools/scripts/tool/xtxex.py
new file mode 100644
index 000000000000..96912754b7df
--- /dev/null
+++ b/l10ntools/scripts/tool/xtxex.py
@@ -0,0 +1,94 @@
+#*************************************************************************
+#
+# 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
+#
+# This file is part of OpenOffice.org.
+#
+# OpenOffice.org is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License version 3
+# only, as published by the Free Software Foundation.
+#
+# OpenOffice.org is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser General Public License version 3 for more details
+# (a copy is included in the LICENSE file that accompanied this code).
+#
+# You should have received a copy of the GNU Lesser General Public License
+# version 3 along with OpenOffice.org.  If not, see
+# <http://www.openoffice.org/license.html>
+# for a copy of the LGPLv3 License.
+#
+#*************************************************************************
+
+from l10ntool import AbstractL10nTool
+from sdf import SdfEntity
+import sys
+import shutil 
+
+class Xtxex(AbstractL10nTool):
+    _resource_type       = "xtx" 
+       
+    def __init__(self):
+        AbstractL10nTool.__init__(self)
+        
+    def merge_file(self, inputfilename, outputfilename, parsed_file_ref, lang, is_forced_lang, sdfdata): 
+        # Special handling for en-US files
+        if lang == "en-US":             
+            mod_outputfilename = outputfilename
+            # mod here if needed
+            self.copy_file(inputfilename, mod_outputfilename)
+            return      
+        # merge usual lang
+        sdfline = self.prepare_sdf_line(inputfilename,lang)
+        if sdfdata.has_key(sdfline.get_id()):
+            line = sdfdata[sdfline.get_id()].text.replace("\\n", '\n')
+            self.make_dirs(outputfilename)
+            try:
+                f = open(outputfilename, "w+")
+                f.write(line)
+            except IOError:
+                print "ERROR: Can not write file " + outputfilename
+                sys.exit(-1)
+            else:
+                f.close()
+            return        
+        # no sdf data found then copy en-US source file
+        if is_forced_lang:
+            self.copy_file(inputfilename, outputfilename)
+               
+    ##### Extract a single File
+    def extract_file(self, inputfile):
+        lines = []
+        try:
+            f = open(inputfile, "r")
+            lines = f.readlines()
+        except IOError:
+            print "ERROR: Can not open file " + inputfile
+            sys.exit(-1)
+        else:
+            f.close()
+        # remove legal header
+        lines = [line for line in lines if len(line) > 0 and not line[0] == '#']        
+        # escape all returns
+        lines = [line.replace('\n', "\\n") for line in lines]
+        line = ''.join(lines)
+        test = str(line)
+        if len(test.strip()):
+            sdf_entity = self.prepare_sdf_line(inputfile);
+            sdf_entity.text = line
+            return str(sdf_entity)
+        else:
+            return ""
+
+    def prepare_sdf_line(self, inputfile="", lang=""):
+        if lang == "":
+            lang = self._source_language
+        return SdfEntity(project=self._options.project_name, source_file=self.get_filename_string(inputfile),
+                          resource_type=self._resource_type, gid="none", lid="none", langid=lang,text="")
+         
+run = Xtxex()
diff --git a/l10ntools/scripts/xhtex b/l10ntools/scripts/xhtex
new file mode 100755
index 000000000000..ca307cf2d4a4
--- /dev/null
+++ b/l10ntools/scripts/xhtex
@@ -0,0 +1,46 @@
+#!/bin/sh
+#*************************************************************************
+#
+# 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
+#
+# This file is part of OpenOffice.org.
+#
+# OpenOffice.org is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License version 3
+# only, as published by the Free Software Foundation.
+#
+# OpenOffice.org is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser General Public License version 3 for more details
+# (a copy is included in the LICENSE file that accompanied this code).
+#
+# You should have received a copy of the GNU Lesser General Public License
+# version 3 along with OpenOffice.org.  If not, see
+# <http://www.openoffice.org/license.html>
+# for a copy of the LGPLv3 License.
+#
+#*************************************************************************
+
+if [ x${SOLARENV}x = xx ]; then
+    echo No environment found, please use 'setsolar'
+exit 1
+fi
+
+if [ ${GUI} = "WNT" ]; then
+if [ x${SOLARVER}x = xx -o x${UPDMINOREXT}x = xx  ]; then
+    exec python $SOLARVERSION/$INPATH/bin/xhtex.py "$@"
+else
+    exec python $SOLARVERSION/$INPATH/bin$UPDMINOREXT/xhtex.py "$@"
+fi
+else
+if [ x${SOLARVER}x = xx -o x${UPDMINOREXT}x = xx  ]; then
+    exec python  -B $SOLARVERSION/$INPATH/bin/xhtex.py "$@"
+else
+    exec python  -B $SOLARVERSION/$INPATH/bin$UPDMINOREXT/xhtex.py "$@"
+fi
+fi
diff --git a/l10ntools/scripts/xtxex b/l10ntools/scripts/xtxex
new file mode 100755
index 000000000000..fb54c1aee36c
--- /dev/null
+++ b/l10ntools/scripts/xtxex
@@ -0,0 +1,47 @@
+#!/bin/sh
+#*************************************************************************
+#
+# 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
+#
+# This file is part of OpenOffice.org.
+#
+# OpenOffice.org is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License version 3
+# only, as published by the Free Software Foundation.
+#
+# OpenOffice.org is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser General Public License version 3 for more details
+# (a copy is included in the LICENSE file that accompanied this code).
+#
+# You should have received a copy of the GNU Lesser General Public License
+# version 3 along with OpenOffice.org.  If not, see
+# <http://www.openoffice.org/license.html>
+# for a copy of the LGPLv3 License.
+#
+#*************************************************************************
+
+if [ x${SOLARENV}x = xx ]; then
+    echo No environment found, please use 'setsolar'
+exit 1
+fi
+
+if [ ${GUI} = "WNT" ]; then
+if [ x${SOLARVER}x = xx -o x${UPDMINOREXT}x = xx  ]; then
+    exec python $SOLARVERSION/$INPATH/bin/xtxex.py "$@"
+else
+    exec python $SOLARVERSION/$INPATH/bin$UPDMINOREXT/xtxex.py "$@"
+fi
+else
+if [ x${SOLARVER}x = xx -o x${UPDMINOREXT}x = xx  ]; then
+    exec python -B  $SOLARVERSION/$INPATH/bin/xtxex.py "$@"
+else
+    exec python -B $SOLARVERSION/$INPATH/bin$UPDMINOREXT/xtxex.py "$@"
+fi
+fi
+
diff --git a/l10ntools/source/cfglex.l b/l10ntools/source/cfglex.l
index cc92632620be..3fc3aa5b965c 100644
--- a/l10ntools/source/cfglex.l
+++ b/l10ntools/source/cfglex.l
@@ -169,10 +169,6 @@ main( int argc, char* argv[])
 	FILE *pFile;
 
 	pOutput = GetOutputFile( argc, argv );
-	if( !isQuiet() ){
-        fprintf( stdout, "\nCfgEx 0.9 Copyright 2000, 2010 Oracle and/or its affiliates. All Rights Reserved.\n" );
-	    fprintf( stdout, "===================================================================================\n" );
-    }
 
     if ( !pOutput ) {
 		fprintf( stdout, "Syntax: CFGEX[-p Prj][-r PrjRoot]-i FileIn [-o FileOut][-m DataBase][-e][-b][-u][-f][-d DoneFile][-g[:dtd] ][-L l1,l2,...]\n" );
@@ -181,7 +177,6 @@ main( int argc, char* argv[])
 		fprintf( stdout, " FileIn:   Source files (*.src)\n" );
 		fprintf( stdout, " FileOut:  Destination file (*.*)\n" );
 		fprintf( stdout, " DataBase: Mergedata (*.sdf)\n" );
-		fprintf( stdout, " -QQ: quiet output\n" );
         fprintf( stdout, " -e: Disable writing errorlog\n" );
 		fprintf( stdout, " -b: Break when Token \"HelpText\" found in source\n" );
 		fprintf( stdout, " -u: [english] and [german] are allowed, Id is Taken from DataBase \n" );
@@ -213,20 +208,10 @@ main( int argc, char* argv[])
 	nRetValue = GetError();
 	EndCfgExport();
 
-	if( !isQuiet() ){
-        fprintf( stdout, "\n===================================\n\n" );
-    }
     
     removeTempFile();
 /* return error level */
 	return nRetValue;
 }
 
-/*"<!--"[^"-->"]*"-->" {
-	bText = 0;
-	WorkOnTokenSet( COMMEND, yytext );
-}*/
-/*"<!"[^\-].*\>	{
-	bText = 0;
-	WorkOnTokenSet( CFG_TAG, yytext );
-}*/
+
diff --git a/l10ntools/source/cfgmerge.cxx b/l10ntools/source/cfgmerge.cxx
index 170c2922d9ce..06a4da8de91f 100644
--- a/l10ntools/source/cfgmerge.cxx
+++ b/l10ntools/source/cfgmerge.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
@@ -41,17 +41,17 @@ extern "C" { int yyerror( char * ); }
 extern "C" { int YYWarning( char * ); }
 
 // defines to parse command line
-#define STATE_NON       0x0001
-#define STATE_INPUT     0x0002
-#define STATE_OUTPUT    0x0003
-#define STATE_PRJ       0x0004
-#define STATE_ROOT      0x0005
-#define STATE_MERGESRC  0x0006
-#define STATE_ERRORLOG  0x0007
-#define STATE_UTF8      0x0008
-#define STATE_LANGUAGES 0X0009
-#define STATE_ISOCODE99 0x000A
-#define STATE_FORCE     0x000B
+#define STATE_NON  		0x0001
+#define STATE_INPUT		0x0002
+#define STATE_OUTPUT	0x0003
+#define STATE_PRJ		0x0004
+#define STATE_ROOT		0x0005
+#define STATE_MERGESRC	0x0006
+#define STATE_ERRORLOG	0x0007
+#define STATE_UTF8		0x0008
+#define STATE_LANGUAGES	0X0009
+#define STATE_ISOCODE99	0x000A
+#define STATE_FORCE		0x000B
 
 // set of global variables
 BOOL bEnableExport;
@@ -59,7 +59,6 @@ BOOL bMergeMode;
 BOOL bErrorLog;
 BOOL bForce;
 BOOL bUTF8;
-bool bQuiet;
 ByteString sPrj;
 ByteString sPrjRoot;
 ByteString sInputFileName;
@@ -83,7 +82,6 @@ extern char *GetOutputFile( int argc, char* argv[])
     bErrorLog       = TRUE;
     bForce          = FALSE;
     bUTF8           = TRUE;
-    bQuiet          = false;
     sPrj            = "";
     sPrjRoot        = "";
     sInputFileName  = "";
@@ -96,7 +94,7 @@ extern char *GetOutputFile( int argc, char* argv[])
     for( int i = 1; i < argc; i++ ) {
         ByteString sSwitch( argv[ i ] );
         sSwitch.ToUpperAscii();
-
+        
         if ( sSwitch == "-I" ) {
             nState = STATE_INPUT; // next token specifies source file
         }
@@ -128,9 +126,6 @@ extern char *GetOutputFile( int argc, char* argv[])
             nState = STATE_FORCE;
             bForce = TRUE;
         }
-        else if ( sSwitch == "-QQ" ) {
-            bQuiet = true;
-        }
         else if ( sSwitch == "-L" ) {
             nState = STATE_LANGUAGES;
         }
@@ -140,7 +135,7 @@ extern char *GetOutputFile( int argc, char* argv[])
         else {
             switch ( nState ) {
                 case STATE_NON: {
-                    return NULL;    // no valid command line
+                    return NULL;	// no valid command line
                 }
                 case STATE_INPUT: {
                     sInputFileName = argv[ i ];
@@ -153,7 +148,7 @@ extern char *GetOutputFile( int argc, char* argv[])
                 break;
                 case STATE_PRJ: {
                     sPrj = ByteString( argv[ i ]);
-//                  sPrj.ToLowerAscii(); // the project
+//					sPrj.ToLowerAscii(); // the project
                 }
                 break;
                 case STATE_ROOT: {
@@ -184,10 +179,6 @@ extern char *GetOutputFile( int argc, char* argv[])
     // command line is not valid
     return NULL;
 }
-int isQuiet(){
-    if( bQuiet )    return 1;
-    else            return 0;
-}
 /*****************************************************************************/
 int InitCfgExport( char *pOutput , char* pFilename )
 /*****************************************************************************/
@@ -199,9 +190,9 @@ int InitCfgExport( char *pOutput , char* pFilename )
 
     if ( bMergeMode )
         pParser = new CfgMerge( sMergeSrc, sOutputFile, sFilename );
-      else if ( sOutputFile.Len())
+      else if ( sOutputFile.Len()) 
         pParser = new CfgExport( sOutputFile, sPrj, sActFileName );
-
+    
     return 1;
 }
 
@@ -222,7 +213,7 @@ void removeTempFile(){
 }
 extern const char* getFilename()
 {
-    return sInputFileName.GetBuffer();
+    return sInputFileName.GetBuffer(); 
 }
 /*****************************************************************************/
 extern FILE *GetCfgFile()
@@ -247,7 +238,7 @@ extern FILE *GetCfgFile()
         if ( !pFile ){
             fprintf( stderr, "Error: Could not open file %s\n",
                 sInputFileName.GetBuffer());
-            exit( 13 );
+            exit( -13 );
         }
         else {
             // this is a valid file which can be opened, so
@@ -261,11 +252,9 @@ extern FILE *GetCfgFile()
 
             // create file name, beginnig with project root
             // (e.g.: source\ui\src\menue.src)
-//          printf("sFullEntry = %s\n",sFullEntry.GetBuffer());
+//			printf("sFullEntry = %s\n",sFullEntry.GetBuffer());
             sActFileName = sFullEntry.Copy( sPrjEntry.Len() + 1 );
-//            printf("sActFileName = %s\n",sActFileName.GetBuffer());
-            if( !bQuiet )
-                fprintf( stdout, "\nProcessing File %s ...\n", sInputFileName.GetBuffer());
+//            printf("sActFileName = %s\n",sActFileName.GetBuffer());    
 
             sActFileName.SearchAndReplaceAll( "/", "\\" );
 
@@ -306,12 +295,12 @@ int GetError()
 //
 
 CfgStackData* CfgStack::Push( const ByteString &rTag, const ByteString &rId )
-{
-    CfgStackData *pD = new CfgStackData( rTag, rId );
-    Insert( pD, LIST_APPEND );
-    return pD;
+{ 
+    CfgStackData *pD = new CfgStackData( rTag, rId ); 
+    Insert( pD, LIST_APPEND ); 
+    return pD; 
 }
-
+            
 //
 // class CfgStack
 //
@@ -587,7 +576,7 @@ int CfgParser::Execute( int nToken, char * pToken )
 void CfgParser::Error( const ByteString &rError )
 /*****************************************************************************/
 {
-//  ByteString sError( rError );
+//	ByteString sError( rError );
 //    sError.Append("Error: In file ");
 //    sError.Append( sActFileName );
     yyerror(( char * ) rError.GetBuffer());
@@ -615,7 +604,7 @@ CfgOutputParser::CfgOutputParser( const ByteString &rOutputFile )
         Error( sError );
         delete pOutputStream;
         pOutputStream = NULL;
-        exit( 13 );
+        exit( -13 );
     }
 }
 
@@ -668,7 +657,7 @@ void CfgExport::WorkOnRessourceEnd()
             ByteString sFallback = pStackData->sText[ ByteString("en-US") ];
 
             //if ( pStackData->sText[ ByteString("en-US") ].Len())
-            //  sFallback = pStackData->sText[ ByteString("en-US") ];
+            //	sFallback = pStackData->sText[ ByteString("en-US") ];
 
             ByteString sLocalId = pStackData->sIdentifier;
             ByteString sGroupId;
@@ -740,7 +729,7 @@ CfgMerge::CfgMerge(
 {
     if ( rMergeSource.Len()){
         pMergeDataFile = new MergeDataFile(
-        rMergeSource, sInputFileName  , bErrorLog, RTL_TEXTENCODING_MS_1252, true );
+        rMergeSource, sInputFileName  , bErrorLog, RTL_TEXTENCODING_MS_1252, true ); 
         if( Export::sLanguages.EqualsIgnoreCaseAscii("ALL") ){
             Export::SetLanguages( pMergeDataFile->GetLanguages() );
             aLanguages = pMergeDataFile->GetLanguages();
@@ -786,7 +775,7 @@ void CfgMerge::WorkOnText(
         }
 
         //if ( nLangIndex.EqualsIgnoreCaseAscii("de") )
-        //  bGerman = TRUE;
+        //	bGerman = TRUE;
         if (( nLangIndex.EqualsIgnoreCaseAscii("en-US") ))
             bEnglish = TRUE;
 
@@ -794,11 +783,11 @@ void CfgMerge::WorkOnText(
         if ( pEntrys ) {
             ByteString sContent;
             pEntrys->GetText( sContent, STRING_TYP_TEXT, nLangIndex );
-
+            
             if ( Export::isAllowed( nLangIndex ) &&
                 ( sContent != "-" ) && ( sContent.Len()))
             {
-#ifdef MERGE_SOURCE_LANGUAGES
+#ifdef MERGE_SOURCE_LANGUAGES 
                     if( nLangIndex.EqualsIgnoreCaseAscii("de") || nLangIndex.EqualsIgnoreCaseAscii("en-US") )
                         rText = sContent;
 #endif
@@ -817,9 +806,9 @@ void CfgMerge::Output( const ByteString& rOutput )
 }
 
 ULONG CfgStack::Push( CfgStackData *pStackData )
-{
-    Insert( pStackData, LIST_APPEND );
-    return Count() - 1;
+{ 
+    Insert( pStackData, LIST_APPEND ); 
+    return Count() - 1; 
 }
 
 /*****************************************************************************/
@@ -837,13 +826,13 @@ void CfgMerge::WorkOnRessourceEnd()
 
                 ByteString sContent;
                 pEntrys->GetText( sContent, STRING_TYP_TEXT, sCur , TRUE );
-                if (
+                if ( 
                     // (!sCur.EqualsIgnoreCaseAscii("de") )    &&
                     ( !sCur.EqualsIgnoreCaseAscii("en-US") ) &&
 
                     ( sContent != "-" ) && ( sContent.Len()))
                 {
-
+                    
                     ByteString sText = sContent;
                     Export::QuotHTML( sText );
 
diff --git a/l10ntools/source/directory.cxx b/l10ntools/source/directory.cxx
index a36f8bd2361f..17b3aa63da2f 100644
--- a/l10ntools/source/directory.cxx
+++ b/l10ntools/source/directory.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
@@ -34,7 +34,7 @@
 #include <vector>
 #include <algorithm>
 
-namespace transex
+namespace transex 
 {
 
 Directory::Directory( const rtl::OUString sFullpath ) : bSkipLinks( false )
@@ -56,16 +56,16 @@ Directory::Directory( const ByteString sFullPath ) : bSkipLinks( false )
 
 bool Directory::lessDir ( const Directory& rKey1, const Directory& rKey2 )
 {
-    rtl::OUString sName1( ( static_cast< Directory >( rKey1 ) ).getDirectoryName() );
-    rtl::OUString sName2( ( static_cast< Directory >( rKey2 ) ).getDirectoryName() );
-
+    rtl::OUString sName1( ( static_cast< Directory >( rKey1 ) ).getDirectoryName() ); 
+    rtl::OUString sName2( ( static_cast< Directory >( rKey2 ) ).getDirectoryName() ); 
+            
     return sName1.compareTo( sName2 ) < 0 ;
 }
 
 
 void Directory::dump()
 {
-
+   
     for( std::vector< transex::File >::iterator iter = aFileVec.begin() ; iter != aFileVec.end() ; ++iter )
     {
         std::cout << "FILE " << rtl::OUStringToOString( (*iter).getFullName().getStr() , RTL_TEXTENCODING_UTF8 , (*iter).getFullName().getLength() ).getStr() << "\n";
@@ -75,7 +75,7 @@ void Directory::dump()
     {
         std::cout << "DIR " << rtl::OUStringToOString( (*iter).getFullName().getStr() , RTL_TEXTENCODING_UTF8 , (*iter).getFullName().getLength() ).getStr() << "\n";
     }
-
+    
 }
 
 void Directory::scanSubDir( int nLevels )
@@ -115,14 +115,14 @@ void Directory::readDirectory ( const rtl::OUString& sFullpath )
 
     rtl::OString sFullpathext = rtl::OUStringToOString( sFullpath , RTL_TEXTENCODING_UTF8 , sFullpath.getLength() );
     const char *dirname = sFullpathext.getStr();
-
+    
     // Get the proper directory path
     sprintf(szDir, "%s\\*", dirname);
-
+        
     // Get the first file
     hList = FindFirstFile(szDir, &FileData);
     if (hList == INVALID_HANDLE_VALUE)
-    {
+    { 
         //FindClose(hList);
         //printf("No files found %s\n", szDir ); return;
     }
@@ -131,7 +131,7 @@ void Directory::readDirectory ( const rtl::OUString& sFullpath )
         fFinished = FALSE;
         while (!fFinished)
         {
-
+            
             sprintf(szSubDir, "%s\\%s", dirname, FileData.cFileName);
             rtl::OString myfile( FileData.cFileName );
             rtl::OString mydir( szSubDir );
@@ -142,14 +142,14 @@ void Directory::readDirectory ( const rtl::OUString& sFullpath )
                      (strcmp(FileData.cFileName, "..") != 0 ) )
                 {
                     //sprintf(szSubDir, "%s\\%s", dirname, FileData.cFileName);
-                    transex::Directory aDir(    rtl::OStringToOUString( mydir , RTL_TEXTENCODING_UTF8 , mydir.getLength() ),
+                    transex::Directory aDir(	rtl::OStringToOUString( mydir , RTL_TEXTENCODING_UTF8 , mydir.getLength() ),
                                                 rtl::OStringToOUString( myfile , RTL_TEXTENCODING_UTF8 , myfile.getLength() ) );
                     aDirVec.push_back( aDir );
                 }
             }
             else
             {
-                transex::File aFile(    rtl::OStringToOUString( mydir , RTL_TEXTENCODING_UTF8 , mydir.getLength() ),
+                transex::File aFile(	rtl::OStringToOUString( mydir , RTL_TEXTENCODING_UTF8 , mydir.getLength() ),
                                         rtl::OStringToOUString( myfile , RTL_TEXTENCODING_UTF8 , myfile.getLength() ) );
                 aFileVec.push_back( aFile );
             }
@@ -164,7 +164,7 @@ void Directory::readDirectory ( const rtl::OUString& sFullpath )
     }
 
     FindClose(hList);
-
+    
     ::std::sort( aFileVec.begin() , aFileVec.end() , File::lessFile );
     ::std::sort( aDirVec.begin()  , aDirVec.end()  , Directory::lessDir  );
 }
@@ -195,33 +195,33 @@ void Directory::readDirectory( const rtl::OUString& sFullpath )
     rtl::OString   sFullpathext = rtl::OUStringToOString( sFullpath , RTL_TEXTENCODING_UTF8 , sFullpath.getLength() ).getStr();
     //printf("%s\n",sFullpathext.getStr());
     const char*    path         = sFullpathext.getStr();
-
+   
     // stat
     if( stat( path  , &statbuf ) < 0 ){   printf("warning: Can not stat %s" , path ); return; }// error }
-
+    
     if( S_ISDIR(statbuf.st_mode ) == 0 ) {  return; }// error }   return; // not dir
 
     if( (dir = opendir( path ) ) == NULL  ) {printf("readerror 2 in %s \n",path); return; } // error } return; // error
     dirholder aHolder(dir);
-
+    
     sFullpathext += rtl::OString( "/" );
 
     const rtl::OString sDot ( "." ) ;
     const rtl::OString sDDot( ".." );
-
+    
     if ( chdir( path ) == -1 ) { printf("chdir error in %s \n",path); return; } // error
-
+    
     while(  ( dirp = readdir( dir ) ) != NULL )
     {
         rtl::OString sEntryName(  dirp->d_name );
 
         if( sEntryName.equals( sDot )  || sEntryName.equals( sDDot ) )
             continue;
-
+            
         // add dir entry
         rtl::OString sEntity = sFullpathext;
         sEntity += sEntryName;
-
+        
         // stat new entry
         if( lstat( sEntity.getStr() , &statbuf2 ) < 0 )
         {
@@ -233,31 +233,31 @@ void Directory::readDirectory( const rtl::OUString& sFullpath )
         switch( statbuf2.st_mode & S_IFMT )
         {
             case S_IFREG:
-                        {
+                        {   
                             rtl::OString sFile = sFullpathext;
                             sFile += sEntryName ;
-                            transex::File aFile( rtl::OStringToOUString( sEntity , RTL_TEXTENCODING_UTF8 , sEntity.getLength() ) ,
-                                                 rtl::OStringToOUString( sEntryName , RTL_TEXTENCODING_UTF8 , sEntryName.getLength() )
+                            transex::File aFile( rtl::OStringToOUString( sEntity , RTL_TEXTENCODING_UTF8 , sEntity.getLength() ) , 
+                                                 rtl::OStringToOUString( sEntryName , RTL_TEXTENCODING_UTF8 , sEntryName.getLength() )               
                                                );
 
-                            aFileVec.push_back( aFile ) ;
-                            break;
-                         }
+                            aFileVec.push_back( aFile ) ;   
+                            break; 
+                         }  
             case S_IFLNK:
-                        {
+                        {   
                             if( bSkipLinks )    break;
                         }
             case S_IFDIR:
-                        {
+                        {   
                             rtl::OString sDir = sFullpathext;
                             sDir += sEntryName ;
 
-                            transex::Directory aDir(
+                            transex::Directory aDir( 
                                                      rtl::OStringToOUString( sEntity , RTL_TEXTENCODING_UTF8 , sEntity.getLength() ) ,
-                                                     rtl::OStringToOUString( sEntryName , RTL_TEXTENCODING_UTF8 , sEntryName.getLength() )
-                                                   ) ;
-                            aDirVec.push_back( aDir ) ;
-                            break;
+                                                     rtl::OStringToOUString( sEntryName , RTL_TEXTENCODING_UTF8 , sEntryName.getLength() )               
+                                                   ) ; 
+                            aDirVec.push_back( aDir ) ;     
+                            break; 
                          }
         }
     }
diff --git a/l10ntools/source/export.cxx b/l10ntools/source/export.cxx
index 59f29525eda4..f7273a0deb75 100644
--- a/l10ntools/source/export.cxx
+++ b/l10ntools/source/export.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
@@ -41,17 +41,17 @@ extern "C" { int YYWarning( char * ); }
 Export *pExport = 0L;
 
 // defines to parse command line
-#define STATE_NON       0x0001
-#define STATE_INPUT     0x0002
-#define STATE_OUTPUT    0x0003
-#define STATE_PRJ       0x0004
-#define STATE_ROOT      0x0005
-#define STATE_MERGESRC  0x0006
-#define STATE_ERRORLOG  0x0007
-#define STATE_BREAKHELP 0x0008
-#define STATE_UNMERGE   0x0009
-#define STATE_UTF8      0x000A
-#define STATE_LANGUAGES 0X000B
+#define STATE_NON  		0x0001
+#define STATE_INPUT		0x0002
+#define STATE_OUTPUT	0x0003
+#define STATE_PRJ		0x0004
+#define STATE_ROOT		0x0005
+#define STATE_MERGESRC	0x0006
+#define STATE_ERRORLOG	0x0007
+#define STATE_BREAKHELP	0x0008
+#define STATE_UNMERGE	0x0009
+#define STATE_UTF8		0x000A
+#define STATE_LANGUAGES	0X000B
 
 // set of global variables
 DECLARE_LIST( FileList, ByteString * )
@@ -62,7 +62,6 @@ BOOL bErrorLog;
 BOOL bBreakWhenHelpText;
 BOOL bUnmerge;
 BOOL bUTF8;
-bool bQuiet;
 ByteString sPrj;
 ByteString sPrjRoot;
 ByteString sActFileName;
@@ -98,14 +97,13 @@ extern char *GetOutputFile( int argc, char* argv[])
     Export::sForcedLanguages = "";
     sTempFile = "";
     pTempFile = NULL;
-    bQuiet = false;
     USHORT nState = STATE_NON;
     BOOL bInput = FALSE;
 
     // parse command line
     for( int i = 1; i < argc; i++ ) {
         ByteString sSwitch( argv[ i ] );
-
+        
         if (sSwitch == "-i"  || sSwitch == "-I" ) {
             nState = STATE_INPUT; // next tokens specifies source files
         }
@@ -115,9 +113,6 @@ extern char *GetOutputFile( int argc, char* argv[])
         else if (sSwitch == "-p"  || sSwitch == "-P" ) {
             nState = STATE_PRJ; // next token specifies the cur. project
         }
-        else if (sSwitch == "-qq"  || sSwitch == "-QQ" ) {
-            bQuiet = true;
-        }
 
         else if (sSwitch == "-r"  || sSwitch == "-R" ) {
             nState = STATE_ROOT; // next token specifies path to project root
@@ -152,7 +147,7 @@ extern char *GetOutputFile( int argc, char* argv[])
         else {
             switch ( nState ) {
                 case STATE_NON: {
-                    return NULL;    // no valid command line
+                    return NULL;	// no valid command line
                 }
                 case STATE_INPUT: {
                     aInputFileList.Insert( new ByteString( argv[ i ]), LIST_APPEND );
@@ -196,12 +191,6 @@ extern char *GetOutputFile( int argc, char* argv[])
     return NULL;
 }
 /*****************************************************************************/
-int isQuiet(){
-/*****************************************************************************/
-   if( bQuiet ) return 1;
-   else         return 0;
-}
-/*****************************************************************************/
 int InitExport( char *pOutput , char* pFilename )
 /*****************************************************************************/
 {
@@ -260,7 +249,7 @@ extern FILE *GetNextFile()
 
         sTempFile = sFileName;
         Export::RemoveUTF8ByteOrderMarkerFromFile( sFileName );
-
+        
         // able to open file?
         FILE *pFile = fopen( sFileName.GetBuffer(), "r" );
         if ( !pFile )
@@ -282,11 +271,10 @@ extern FILE *GetNextFile()
             // (e.g.: source\ui\src\menue.src)
             sActFileName = sFullEntry.Copy( sPrjEntry.Len() + 1 );
 
-            if( !bQuiet ) fprintf( stdout, "\nProcessing File %s ...\n", sOrigFile.GetBuffer());
 
             sActFileName.SearchAndReplaceAll( "/", "\\" );
             sFile = sActFileName;
-
+            
             if ( pExport ) {
                 // create instance of class export
                 pExport->Init();
@@ -300,7 +288,7 @@ extern FILE *GetNextFile()
 }
 
 int Parse( int nTyp, const char *pTokenText ){
-    pExport->Execute( nTyp , pTokenText );
+    pExport->Execute( nTyp , pTokenText );    
     return 1;
 }
 void Close(){
@@ -357,12 +345,12 @@ void ResData::Dump(){
     ByteString f("sText");
 
     Export::DumpMap( f , sText );
-
-    if( pStringList )   Export::DumpExportList( a , *pStringList );
-    if( pUIEntries )    Export::DumpExportList( b , *pUIEntries );
-    if( pFilterList )   Export::DumpExportList( c , *pFilterList );
-    if( pItemList )     Export::DumpExportList( d , *pItemList );
-    if( pPairedList )   Export::DumpExportList( e , *pPairedList );
+    
+    if( pStringList )	Export::DumpExportList( a , *pStringList );
+    if( pUIEntries )	Export::DumpExportList( b , *pUIEntries );
+    if( pFilterList )	Export::DumpExportList( c , *pFilterList );
+    if( pItemList )		Export::DumpExportList( d , *pItemList );
+    if( pPairedList )	Export::DumpExportList( e , *pPairedList );
     printf("\n");
 }
 
@@ -445,7 +433,7 @@ Export::Export( const ByteString &rOutput, BOOL bWrite,
     (void) rPrj;
     (void) rPrjRoot;
     (void) rFile;
-
+    
     if( !isInitialized ) InitLanguages();
     // used when export is enabled
 
@@ -525,7 +513,7 @@ void Export::Init()
 Export::~Export()
 /*****************************************************************************/
 {
-    if( pParseQueue )
+    if( pParseQueue ) 
         delete pParseQueue;
     // close output stream
     if ( bEnableExport )
@@ -548,10 +536,10 @@ Export::~Export()
 int Export::Execute( int nToken, const char * pToken )
 /*****************************************************************************/
 {
-
+    
     ByteString sToken( pToken );
     ByteString sOrig( sToken );
-/*  printf("+---------------\n");
+/*	printf("+---------------\n");
     printf("sToken = %s\n",sToken.GetBuffer());
     printf("nToken = %d\n",nToken);
     printf("+---------------\n"); */
@@ -590,11 +578,11 @@ int Export::Execute( int nToken, const char * pToken )
     {
         // no res. exists at cur. level so return
         if ( bMergeMode )
-            WriteToMerged( sOrig , false );
+            WriteToMerged( sOrig , false );		
         return 0;
     }
     // #define NO_LOCALIZE_EXPORT
-    if( bSkipFile ){
+    if( bSkipFile ){  
         if ( bMergeMode ) {
             WriteToMerged( sOrig , false );
         }
@@ -648,7 +636,7 @@ int Export::Execute( int nToken, const char * pToken )
         USHORT nOpen = 0;
         USHORT nClose = 0;
         BOOL bReadOver1 = FALSE;
-        USHORT i = 0;
+        USHORT i = 0; 
         for ( i = 0; i < sToken.Len(); i++ ) {
             if ( sToken.GetChar( i ) == '\"' )
                 bReadOver1 = !bReadOver1;
@@ -668,7 +656,7 @@ int Export::Execute( int nToken, const char * pToken )
             bExecuteDown = TRUE;
     }
     switch ( nToken ) {
-
+        
         case NORMDEFINE:
                         //printf("sToken = '%s'",sToken.GetBuffer());
                         while( sToken.SearchAndReplace( "\r", " " ) != STRING_NOTFOUND ) {};
@@ -679,11 +667,11 @@ int Export::Execute( int nToken, const char * pToken )
                             return 0;
                         }
                         if ( bMergeMode )
-                          WriteToMerged( sOrig , false );
-
+                          WriteToMerged( sOrig , false );     
+                            
                         return 0;
-
-
+                        
+ 
         case RSCDEFINE:
             bDefine = TRUE; // res. defined in macro
 
@@ -724,7 +712,7 @@ int Export::Execute( int nToken, const char * pToken )
             pResData->SetId( sId, ID_LEVEL_IDENTIFIER );
             if ( sCondition.Len()) {
                 ByteString sEmpty( "" );
-                Execute( CONDITION, sEmpty.GetBufferAccess());  // execute the
+                Execute( CONDITION, sEmpty.GetBufferAccess()); 	// execute the
                                                                   // precomp.
                                                                 // condition
                 sEmpty.ReleaseBufferAccess();
@@ -800,7 +788,7 @@ int Export::Execute( int nToken, const char * pToken )
                 else
                     nListLevel--;
             }
-        }
+        } 
         break;
         case ASSIGNMENT: {
             bDontWriteOutput = FALSE;
@@ -819,7 +807,7 @@ int Export::Execute( int nToken, const char * pToken )
             }
             else if ( sKey == "STRINGLIST" ) {
                 //if ( bUnmerge ){
-                //  ( sOrig.SearchAndReplace( "=", "[ de ] =" ));
+                //	( sOrig.SearchAndReplace( "=", "[ de ] =" ));
                 //}
 
                 pResData->bList = TRUE;
@@ -831,7 +819,7 @@ int Export::Execute( int nToken, const char * pToken )
             }
             else if ( sKey == "FILTERLIST" ) {
                 //if ( bUnmerge ){
-                //  ( sOrig.SearchAndReplace( "=", "[ de ] =" ));
+                //	( sOrig.SearchAndReplace( "=", "[ de ] =" ));
                 //}
                 pResData->bList = TRUE;
                 nList = LIST_FILTER;
@@ -842,7 +830,7 @@ int Export::Execute( int nToken, const char * pToken )
             }
             else if ( sKey == "UIENTRIES" ) {
                 //if ( bUnmerge ){
-                //  ( sOrig.SearchAndReplace( "=", "[ de ] =" ));}
+                //	( sOrig.SearchAndReplace( "=", "[ de ] =" ));}
                 pResData->bList = TRUE;
                 nList = LIST_UIENTRIES;
                 //ByteString sLang("en-US" , RTL_TEXTENCODING_ASCII_US );
@@ -857,7 +845,7 @@ int Export::Execute( int nToken, const char * pToken )
                 Parse( LEVELUP, "" );
             }
             //if ( bUnmerge && ( nListLang.EqualsIgnoreCaseAscii("de") || nListLang.EqualsIgnoreCaseAscii("en-US") ) && ListExists( pResData, nList ))
-            //  bDontWriteOutput = TRUE;
+            //	bDontWriteOutput = TRUE;
          }
         break;
         case UIENTRIES:
@@ -870,7 +858,7 @@ int Export::Execute( int nToken, const char * pToken )
             nPos = sTmpToken.ToLowerAscii().Search("[en-us]=");
             if( nPos != STRING_NOTFOUND ) {
                 //if ( bUnmerge ){
-                //  ( sOrig.SearchAndReplace( "=", "[ de ] =" ));
+                //	( sOrig.SearchAndReplace( "=", "[ de ] =" ));
                 //}
                 ByteString sKey = sTmpToken.Copy( 0 , nPos );
                 sKey.EraseAllChars( ' ' );
@@ -919,7 +907,7 @@ int Export::Execute( int nToken, const char * pToken )
                     nListIndex = 0;
                     nListLevel = 0;
                 }
-                /*if ( bUnmerge && ( nListLang.EqualsIgnoreCaseAscii( "de" )
+                /*if ( bUnmerge && ( nListLang.EqualsIgnoreCaseAscii( "de" )  
                     || nListLang.EqualsIgnoreCaseAscii("en-US" ) )
                     && ListExists( pResData, nList ))
                     bDontWriteOutput = TRUE;*/
@@ -934,7 +922,7 @@ int Export::Execute( int nToken, const char * pToken )
                 else if ( sKey == "FILTERLIST" )
                     nList = LIST_FILTER;
                 else if ( sKey == "PAIREDLIST" )
-                    nList = LIST_PAIRED;                // abcd
+                    nList = LIST_PAIRED;				// abcd
                 else if ( sKey == "ITEMLIST" )
                     nList = LIST_ITEM;
                 else if ( sKey == "UIENTRIES" )
@@ -1001,11 +989,11 @@ int Export::Execute( int nToken, const char * pToken )
                         ( sKey == "UINAME" ))
                     {
                         //if ( bUnmerge && sToken.GetToken( 0, '=' ).Search( "[" ) == STRING_NOTFOUND )
-                        //  ( sOrig.SearchAndReplace( "=", "[ de ] =" ));
-
+                        //	( sOrig.SearchAndReplace( "=", "[ de ] =" ));
+                        
                         SetChildWithText();
                         //if ( nLangIndex.EqualsIgnoreCaseAscii("en-US") )
-                        if ( Export::isSourceLanguage( nLangIndex ) )
+                        if ( Export::isSourceLanguage( nLangIndex ) )						
                             pResData->SetId( sText, ID_LEVEL_TEXT );
 
                         pResData->bText = TRUE;
@@ -1013,7 +1001,7 @@ int Export::Execute( int nToken, const char * pToken )
                         if ( bMergeMode ) {
                             PrepareTextToMerge( sOrig, STRING_TYP_TEXT, nLangIndex, pResData );
                             //if ( bUnmerge )
-                            //  pResData->sText[ nLangIndex ] = sText;
+                            //	pResData->sText[ nLangIndex ] = sText;
                         }
                         else {
                             if ( pResData->sText[ nLangIndex ].Len()) {
@@ -1026,8 +1014,8 @@ int Export::Execute( int nToken, const char * pToken )
                     }
                     else if ( sKey == "HELPTEXT" ) {
                         //if ( bUnmerge && sToken.GetToken( 0, '=' ).Search( "[" ) == STRING_NOTFOUND ){
-                        //  ( sOrig.SearchAndReplace( "=", "[ de ] =" ));
-                        //  }
+                        //	( sOrig.SearchAndReplace( "=", "[ de ] =" ));
+                        //	}
                         SetChildWithText();
                         pResData->bHelpText = TRUE;
                         if ( bBreakWhenHelpText ) {
@@ -1039,7 +1027,7 @@ int Export::Execute( int nToken, const char * pToken )
                         if ( bMergeMode )
                             PrepareTextToMerge( sOrig, STRING_TYP_HELPTEXT, nLangIndex, pResData );
                             //if ( bUnmerge )
-                            //  pResData->sHelpText[ nLangIndex ] = sText;
+                            //	pResData->sHelpText[ nLangIndex ] = sText;
                         else {
                             if ( pResData->sHelpText[ nLangIndex ].Len()) {
                                 ByteString sError( "Language " );
@@ -1051,14 +1039,14 @@ int Export::Execute( int nToken, const char * pToken )
                     }
                     else if ( sKey == "QUICKHELPTEXT" ) {
                         //if ( bUnmerge && sToken.GetToken( 0, '=' ).Search( "[" ) == STRING_NOTFOUND ){
-                        //  ( sOrig.SearchAndReplace( "=", "[ de ] =" ));
-                        //  }
+                        //	( sOrig.SearchAndReplace( "=", "[ de ] =" ));
+                        //	}
                         SetChildWithText();
                         pResData->bQuickHelpText = TRUE;
                         if ( bMergeMode )
                             PrepareTextToMerge( sOrig, STRING_TYP_QUICKHELPTEXT, nLangIndex, pResData );
                             //if ( bUnmerge )
-                            //  pResData->sQuickHelpText[ nLangIndex ] = sText;
+                            //	pResData->sQuickHelpText[ nLangIndex ] = sText;
                         else {
                             if ( pResData->sQuickHelpText[ nLangIndex ].Len()) {
                                 ByteString sError( "Language " );
@@ -1070,14 +1058,14 @@ int Export::Execute( int nToken, const char * pToken )
                     }
                     else if ( sKey == "TITLE" ) {
                         //if ( bUnmerge && sToken.GetToken( 0, '=' ).Search( "[" ) == STRING_NOTFOUND ){
-                        //  ( sOrig.SearchAndReplace( "=", "[ de ] =" ));
-                        //  }
+                        //	( sOrig.SearchAndReplace( "=", "[ de ] =" ));
+                        //	}
                         SetChildWithText();
                         pResData->bTitle = TRUE;
                         if ( bMergeMode )
                             PrepareTextToMerge( sOrig, STRING_TYP_TITLE, nLangIndex, pResData );
                             //if ( bUnmerge )
-                            //  pResData->sTitle[ nLangIndex ] = sText;
+                            //	pResData->sTitle[ nLangIndex ] = sText;
                         else {
                             if ( pResData->sTitle[ nLangIndex ].Len()) {
                                 ByteString sError( "Language " );
@@ -1220,10 +1208,10 @@ int Export::Execute( int nToken, const char * pToken )
         }
     if ( bWriteToMerged ) {
         // the current token must be written to dest. without merging
-
+        
         if( bDefine && sOrig.Len() > 2 ){
             for( USHORT n = 0 ; n < sOrig.Len() ; n++ ){
-                if( sOrig.GetChar( n ) == '\n' && sOrig.GetChar( n-1 ) != '\\'){
+                if( sOrig.GetChar( n ) == '\n' && sOrig.GetChar( n-1 ) != '\\'){    
                     sOrig.Insert('\\' , n++ );
                 }
             }
@@ -1281,11 +1269,11 @@ BOOL Export::ListExists( ResData *pResData, USHORT nLst )
 /*****************************************************************************/
 {
     switch ( nLst ) {
-        case LIST_STRING: return pResData->pStringList != NULL;
+        case LIST_STRING: return pResData->pStringList != NULL; 
         case LIST_FILTER: return pResData->pFilterList != NULL;
-        case LIST_ITEM: return pResData->pItemList != NULL;
-        case LIST_PAIRED: return pResData->pPairedList != NULL;
-        case LIST_UIENTRIES: return pResData->pUIEntries != NULL;
+        case LIST_ITEM: return pResData->pItemList != NULL; 
+        case LIST_PAIRED: return pResData->pPairedList != NULL; 
+        case LIST_UIENTRIES: return pResData->pUIEntries != NULL; 
     }
     return FALSE;
 }
@@ -1305,23 +1293,23 @@ BOOL Export::WriteData( ResData *pResData, BOOL bCreateNew )
 /*    ByteStringHashMap::iterator pos3 = pResData->sText.begin();
     ByteStringHashMap::iterator end3 = pResData->sText.end();
     for(;pos3!=end3;++pos3){
-
+        
         printf("[%s]=%s\n", pos3->first.GetBuffer(), pos3->second.GetBuffer() );
     }*/
-       // mandatory to export: en-US
-
+       // mandatory to export: en-US 
+    
      if (( //pResData->sText[ ByteString("de") ].Len() &&
         ( pResData->sText[ SOURCE_LANGUAGE ].Len()))
         ||
         ( //pResData->sHelpText[ ByteString("de") ].Len() &&
-        (  pResData->sHelpText[ SOURCE_LANGUAGE ].Len()))
+        (  pResData->sHelpText[ SOURCE_LANGUAGE ].Len()))                                                                                                             
         ||
         ( //pResData->sQuickHelpText[ ByteString("de") ].Len() &&
         (  pResData->sQuickHelpText[ SOURCE_LANGUAGE ].Len()))
          ||
         ( //pResData->sTitle[ ByteString("de") ].Len() &&
         (  pResData->sTitle[ SOURCE_LANGUAGE ].Len())))
-
+           
        {
         FillInFallbacks( pResData );
 
@@ -1406,27 +1394,27 @@ BOOL Export::WriteData( ResData *pResData, BOOL bCreateNew )
                     sOutput += pResData->sResTyp; sOutput += "\t";
                     sOutput += sGID; sOutput += "\t";
                     sOutput += sLID; sOutput += "\t";
-                    sOutput += pResData->sHelpId; sOutput   += "\t";
-                    sOutput += pResData->sPForm; sOutput    += "\t";
+                    sOutput += pResData->sHelpId; sOutput	+= "\t";
+                    sOutput += pResData->sPForm; sOutput	+= "\t";
                     sOutput += ByteString::CreateFromInt64( pResData->nWidth ); sOutput += "\t";
                     sOutput += sCur; sOutput += "\t";
+                    
 
-
-                    sOutput += sXText; sOutput  += "\t";
+                    sOutput += sXText; sOutput	+= "\t";
                     sOutput += sXHText; sOutput += "\t";
                     sOutput += sXQHText; sOutput+= "\t";
                     sOutput += sXTitle; sOutput += "\t";
                     sOutput += sTimeStamp;
-
-                 // if( !sCur.EqualsIgnoreCaseAscii("de") ||( sCur.EqualsIgnoreCaseAscii("de") && !Export::isMergingGermanAllowed( sProject ) ) )
+                      
+                 // if( !sCur.EqualsIgnoreCaseAscii("de") ||( sCur.EqualsIgnoreCaseAscii("de") && !Export::isMergingGermanAllowed( sProject ) ) ) 
                     aOutput.WriteLine( sOutput );
                 }
 
                 if ( bCreateNew ) {
-                    pResData->sText[ sCur ]         = "";
-                    pResData->sHelpText[ sCur ]     = "";
+                    pResData->sText[ sCur ]			= "";
+                    pResData->sHelpText[ sCur ]		= "";
                     pResData->sQuickHelpText[ sCur ]= "";
-                    pResData->sTitle[ sCur ]        = "";
+                    pResData->sTitle[ sCur ]		= "";
                 }
             }
     }
@@ -1517,25 +1505,25 @@ BOOL Export::WriteExportList( ResData *pResData, ExportList *pExportList,
                   //(*pEntry)[ ByteString("de") ].Len() &&
                      (*pEntry)[ SOURCE_LANGUAGE ].Len() )
                     //||
-                     //     (*pEntry)[ ByteString("en") ].Len()))
+                     // 	(*pEntry)[ ByteString("en") ].Len()))
                 {
                     if ( bEnableExport )
                     {
                         ByteString sText((*pEntry)[ SOURCE_LANGUAGE ] );
-
+                        
                         // Strip PairList Line String
                         if( rTyp.EqualsIgnoreCaseAscii("pairedlist") ){
                             sLID = GetPairedListID( sText );
                             if ((*pEntry)[ sCur ].Len())
                                 sText = (*pEntry)[ sCur ];
-                            sText = GetPairedListString( sText );
+                            sText = GetPairedListString( sText ); 
                         }
                         else{
                             //if ((*pEntry)[ sCur ].Len()){
-                            //  if( sCur.EqualsIgnoreCaseAscii("de") ){
-                            //      sText = StripList( (*pEntry)[ sCur ] );
-                            //  }
-                            //  else
+                            //	if( sCur.EqualsIgnoreCaseAscii("de") ){
+                            //		sText = StripList( (*pEntry)[ sCur ] );
+                            //	}
+                            //	else
                                     sText = StripList( (*pEntry)[ sCur ] );
                                     if( sText == "\\\"" )
                                         sText = "\"";
@@ -1554,7 +1542,7 @@ BOOL Export::WriteExportList( ResData *pResData, ExportList *pExportList,
 
                         sOutput += sText; sOutput += "\t\t\t\t";
                         sOutput += sTimeStamp;
-
+                        
                         //if( !sCur.EqualsIgnoreCaseAscii("de") ||( sCur.EqualsIgnoreCaseAscii("de") && !Export::isMergingGermanAllowed( sProject ) ) )
                         aOutput.WriteLine( sOutput );
 
@@ -1638,7 +1626,7 @@ void Export::InsertListEntry( const ByteString &rText, const ByteString &rLine )
         pList = pResData->pUIEntries;
         if ( !pList ) {
             pResData->pUIEntries = new ExportList();
-            pList = pResData->pUIEntries;
+            pList = pResData->pUIEntries; 
             nListIndex = 0;
         }
     }
@@ -1651,13 +1639,13 @@ void Export::InsertListEntry( const ByteString &rText, const ByteString &rLine )
         pList->Insert( pNew, LIST_APPEND );
     }
     ExportListEntry *pCurEntry = pList->GetObject( nListIndex );
-
+    
     // For paired list use the line to set proper lid
     if( nList == LIST_PAIRED ){
         (*pCurEntry)[ nListLang ] = rLine;
     }else
         (*pCurEntry)[ nListLang ] = rText;
-
+    
     // Remember en-US fallback string, so each list has the same amount of elements
     //if ( nListLang.EqualsIgnoreCaseAscii("en-US")  ) {
     if ( Export::isSourceLanguage( nListLang ) ) {
@@ -1679,7 +1667,7 @@ void Export::InsertListEntry( const ByteString &rText, const ByteString &rLine )
         }
         // new fallback
     }
-
+    
     //if ( nListLang.EqualsIgnoreCaseAscii("en-US")  ) {
     if ( Export::isSourceLanguage( nListLang ) ) {
         if( nList == LIST_PAIRED ){
@@ -1687,7 +1675,7 @@ void Export::InsertListEntry( const ByteString &rText, const ByteString &rLine )
         }
         else
             (*pCurEntry)[ SOURCE_LANGUAGE ] = rLine;
-
+        
         pList->NewSourceLanguageListEntry();
     }
 
@@ -1723,9 +1711,9 @@ void Export::CleanValue( ByteString &rValue )
 /*****************************************************************************/
 ByteString Export::GetText( const ByteString &rSource, int nToken )
 /*****************************************************************************/
-#define TXT_STATE_NON   0x000
-#define TXT_STATE_TEXT  0x001
-#define TXT_STATE_MACRO 0x002
+#define TXT_STATE_NON  	0x000
+#define TXT_STATE_TEXT	0x001
+#define TXT_STATE_MACRO	0x002
 {
     ByteString sReturn;
     switch ( nToken ) {
@@ -1813,31 +1801,31 @@ void Export::WriteToMerged( const ByteString &rText , bool bSDFContent )
         while ( sText.SearchAndReplace( " \n", "\n" ) != STRING_NOTFOUND ) {};
         if( pParseQueue->bNextIsM && bSDFContent && sText.Len() > 2 ){
             for( USHORT n = 0 ; n < sText.Len() ; n++ ){
-                if( sText.GetChar( n ) == '\n' && sText.GetChar( n-1 ) != '\\'){
+                if( sText.GetChar( n ) == '\n' && sText.GetChar( n-1 ) != '\\'){    
                     sText.Insert('\\' , n++ );
-
+                    
                 }
             }
         }
-        else if( pParseQueue->bLastWasM && sText.Len() > 2 ){
+        else if( pParseQueue->bLastWasM && sText.Len() > 2 ){ 
             for( USHORT n = 0 ; n < sText.Len() ; n++ ){
-                if( sText.GetChar( n ) == '\n' && sText.GetChar( n-1 ) != '\\'){
+                if( sText.GetChar( n ) == '\n' && sText.GetChar( n-1 ) != '\\'){    
                     sText.Insert('\\' , n++ );
                 }
                 if( sText.GetChar( n ) == '\n' )pParseQueue->bMflag=true;
             }
         }
-        else if( pParseQueue->bCurrentIsM && bSDFContent && sText.Len() > 2 ){
+        else if( pParseQueue->bCurrentIsM && bSDFContent && sText.Len() > 2 ){ 
             for( USHORT n = 0 ; n < sText.Len() ; n++ ){
-                if( sText.GetChar( n ) == '\n' && sText.GetChar( n-1 ) != '\\'){
+                if( sText.GetChar( n ) == '\n' && sText.GetChar( n-1 ) != '\\'){    
                     sText.Insert('\\' , n++ );
                     pParseQueue->bMflag=true;
                 }
             }
         }
-        else if( pParseQueue->bMflag ){
+        else if( pParseQueue->bMflag ){ 
             for( USHORT n = 1 ; n < sText.Len() ; n++ ){
-                if( sText.GetChar( n ) == '\n' && sText.GetChar( n-1 ) != '\\'){
+                if( sText.GetChar( n ) == '\n' && sText.GetChar( n-1 ) != '\\'){    
                     sText.Insert('\\' , n++ );
                 }
             }
@@ -1845,12 +1833,12 @@ void Export::WriteToMerged( const ByteString &rText , bool bSDFContent )
         for ( USHORT i = 0; i < sText.Len(); i++ ) {
             if ( sText.GetChar( i ) != '\n' ){
                 aOutput.Write( ByteString( sText.GetChar( i )).GetBuffer(), 1 );
-
+                
             }
             else{
                 aOutput.WriteLine( ByteString());
             }
-
+            
         }
     }
 }
@@ -1971,8 +1959,8 @@ BOOL Export::PrepareTextToMerge( ByteString &rText, USHORT nTyp,
                     //ByteString a("pCurEntry");
                     //Export::DumpMap( a , *pCurEntry );
                     rText = (*pCurEntry)[ SOURCE_LANGUAGE ];
-                    if( nTyp == LIST_PAIRED ){
-                        pResData->addMergedLanguage( nLangIndex );
+                    if( nTyp == LIST_PAIRED ){ 
+                        pResData->addMergedLanguage( nLangIndex );						
                     }
                 }
             }
@@ -2003,10 +1991,10 @@ BOOL Export::PrepareTextToMerge( ByteString &rText, USHORT nTyp,
                 sLastListLine += sTmp;
             }
             if ( pResData->sResTyp.EqualsIgnoreCaseAscii( "pairedlist" ) ){
-               pResData->sId = GetPairedListID( sLastListLine );
+               pResData->sId = GetPairedListID( sLastListLine ); 
             }
             else pResData->sId = ByteString::CreateFromInt32( nListIndex );
-
+            
             if ( pResData->sGId.Len())
                 pResData->sGId += ".";
             pResData->sGId += sOldId;
@@ -2069,7 +2057,7 @@ BOOL Export::PrepareTextToMerge( ByteString &rText, USHORT nTyp,
     // search for merge data
     if ( !pMergeDataFile ){
         pMergeDataFile = new MergeDataFile( sMergeSrc, sFile , bErrorLog, aCharSet);//, bUTF8 );
-
+        
         // Init Languages
         ByteString sTmp = Export::sLanguages;
         if( sTmp.ToUpperAscii().Equals("ALL") )
@@ -2077,12 +2065,12 @@ BOOL Export::PrepareTextToMerge( ByteString &rText, USHORT nTyp,
         else if( !isInitialized )InitLanguages();
 
     }
-//  printf("*************DUMPING****************\n");
-//  printf("%s\n",pMergeDataFile->Dump().GetBuffer());
-//  printf("*************DUMPING****************\n");
-
-//  printf("Dumping ResData\n");
-//  pResData->Dump();
+//	printf("*************DUMPING****************\n");
+//	printf("%s\n",pMergeDataFile->Dump().GetBuffer());
+//	printf("*************DUMPING****************\n");
+    
+//	printf("Dumping ResData\n");
+//	pResData->Dump();
     PFormEntrys *pEntrys = pMergeDataFile->GetPFormEntrys( pResData );
     //printf("Dumping pEntrys\n");
     //if( pEntrys ) pEntrys->Dump();
@@ -2100,7 +2088,7 @@ BOOL Export::PrepareTextToMerge( ByteString &rText, USHORT nTyp,
     //if ( !sContent.Len() && ( ! nLangIndex.EqualsIgnoreCaseAscii("en-US") )) {
     if ( !sContent.Len() && ( ! Export::isSourceLanguage( nLangIndex ) )) {
         rText = sOrigText;
-        return FALSE; // no data found
+        return FALSE; // no data found   
     }
 
     //if ( nLangIndex.EqualsIgnoreCaseAscii("en-US") ) {
@@ -2134,7 +2122,7 @@ void Export::MergeRest( ResData *pResData, USHORT nMode )
 
     if ( !pMergeDataFile ){
         pMergeDataFile = new MergeDataFile( sMergeSrc, sFile ,bErrorLog, aCharSet);//, bUTF8 );
-
+  
         // Init Languages
         ByteString sTmp = Export::sLanguages;
         if( sTmp.ToUpperAscii().Equals("ALL") )
@@ -2145,10 +2133,10 @@ void Export::MergeRest( ResData *pResData, USHORT nMode )
     switch ( nMode ) {
         case MERGE_MODE_NORMAL : {
             PFormEntrys *pEntry = pMergeDataFile->GetPFormEntrys( pResData );
-
+             
             bool bWriteNoSlash = false;
             if ( pEntry && pResData->bText ) {
-
+                
                 BOOL bAddSemikolon = FALSE;
                 BOOL bFirst = TRUE;
                 ByteString sCur;
@@ -2194,7 +2182,7 @@ void Export::MergeRest( ResData *pResData, USHORT nMode )
                         WriteToMerged( sOutput , true );
                     }
                 }
-
+      
 
                 if ( bAddSemikolon ) {
                     ByteString sOutput( ";" );
@@ -2300,7 +2288,7 @@ void Export::MergeRest( ResData *pResData, USHORT nMode )
             if ( pResData->bList ) {
                 //printf("Dumping ResData\n");
                 //pResData->Dump();
-
+                
                 bool bPairedList = false;
                 ByteString sOldId = pResData->sId;
                 ByteString sOldGId = pResData->sGId;
@@ -2322,17 +2310,17 @@ void Export::MergeRest( ResData *pResData, USHORT nMode )
                     }
                     ByteString sCur;
                     for( unsigned int n = 0; n < aLanguages.size(); n++ ){
-                        sCur = aLanguages[ n ];
+                        sCur = aLanguages[ n ];				
                         USHORT nIdx = 1;
-
-                        // Set matching pairedlist identifier
+                        
+                        // Set matching pairedlist identifier 
                         if( bPairedList && pResData->pPairedList && ( nIdx == 1 ) ){
                             ExportListEntry* pListE = ( ExportListEntry* ) pResData->pPairedList->GetObject( nIdx-1 );
                             pResData->sId = GetPairedListID ( (*pListE)[ SOURCE_LANGUAGE ] );
-                        }
+                        } 
                         else
                             pResData->sId = ByteString("1");
-
+                        
                         PFormEntrys *pEntrys;
                         ULONG nLIndex = 0;
                         ULONG nMaxIndex = 0;
@@ -2348,24 +2336,24 @@ void Export::MergeRest( ResData *pResData, USHORT nMode )
                                 bText = pEntrys->GetTransex3Text( sText , STRING_TYP_TEXT, SOURCE_LANGUAGE , FALSE );
 
                             // Use fallback, if data is missing in sdf file
-                            //if( !bText && pResData->sResTyp.Equals( "pairedlist" ) ){
-                            if( !bText && bPairedList ){
-                                if( pResData->isMerged( sCur ) ) break;
+                            //if( !bText && pResData->sResTyp.Equals( "pairedlist" ) ){ 
+                            if( !bText && bPairedList ){ 
+                                if( pResData->isMerged( sCur ) ) break; 
                                 const ByteString sPlist("pairedlist");
                                 ByteString sKey = MergeDataFile::CreateKey( sPlist , pResData->sGId , pResData->sId , sFilename );
                                 bText = pResData->getFallbackData( sKey , sText );
                             }else if ( !bText ){// new fallback
-                                if( pResData->isMerged( sCur ) ) break;
+                                if( pResData->isMerged( sCur ) ) break; 
                                 const ByteString sPlist("list");
                                 ByteString sKey = MergeDataFile::CreateKey( sPlist , pResData->sGId , pResData->sId , sFilename );
                                 bText = pResData->getFallbackData( sKey , sText );
                             } // new fallback
 
                             if ( bText && sText.Len()) {
-                                //if( pEntrys ) pEntrys->Dump();
+                                //if( pEntrys ) pEntrys->Dump();							
                                 if ( nIdx == 1 ) {
                                     ByteString sHead;
-                                    if ( bNextMustBeDefineEOL )
+                                    if ( bNextMustBeDefineEOL ) 
                                         sHead = "\\\n\t";
                                     sHead += sSpace;
                                     switch ( nT ) {
@@ -2392,7 +2380,7 @@ void Export::MergeRest( ResData *pResData, USHORT nMode )
                                     WriteToMerged( sHead , true);
                                 }
                                 ByteString sLine;
-                                if ( pList && pList->GetObject( nLIndex ))
+                                if ( pList && pList->GetObject( nLIndex )) 
                                     sLine = ( *pList->GetObject( nLIndex ))[ SOURCE_LANGUAGE ];
                                 if ( !sLine.Len())
                                     sLine = sLastListLine;
@@ -2410,7 +2398,7 @@ void Export::MergeRest( ResData *pResData, USHORT nMode )
 
                                 USHORT nStart, nEnd;
                                 nStart = sLine.Search( "\"" );
-
+                            
                                 ByteString sPostFix;
                                 if( !bPairedList ){
                                     nEnd = sLine.SearchBackward( '\"' );
@@ -2440,8 +2428,8 @@ void Export::MergeRest( ResData *pResData, USHORT nMode )
                                 sText1 += "\t";
                                 //printf("Writing '%s'\n",sText1.GetBuffer());
                                 WriteToMerged( sText1 ,true );
-
-                                // Set matching pairedlist identifier
+                               
+                                // Set matching pairedlist identifier 
                                 if ( bPairedList ){
                                     nIdx++;
                                     ExportListEntry* pListE = ( ExportListEntry* ) pResData->pPairedList->GetObject( ( nIdx ) -1 );
@@ -2496,7 +2484,7 @@ void Export::MergeRest( ResData *pResData, USHORT nMode )
             if ( pList )
                 nMaxIndex = pList->GetSourceLanguageListEntryCount();
             ByteString sLine;
-            if ( pList && pList->GetObject( nListIndex ))
+            if ( pList && pList->GetObject( nListIndex )) 
                 sLine = ( *pList->GetObject( nListIndex ))[ SOURCE_LANGUAGE ];
             if ( !sLine.Len())
                 sLine = sLastListLine;
@@ -2512,7 +2500,7 @@ void Export::MergeRest( ResData *pResData, USHORT nMode )
                 }
             }
 
-            while( PrepareTextToMerge( sLine, nList, nListLang, pResData ) && ( nListIndex <= nMaxIndex )) {
+            while( PrepareTextToMerge( sLine, nList, nListLang, pResData ) && ( nListIndex <= nMaxIndex )) { 
                 ByteString sText( "\t" );
                 sText += sLine;
                 sText += " ;";
@@ -2521,7 +2509,7 @@ void Export::MergeRest( ResData *pResData, USHORT nMode )
                     sText += "\t";
                 WriteToMerged( sText ,false );
                 nListIndex++;
-                if ( pList && pList->GetObject( nListIndex ))
+                if ( pList && pList->GetObject( nListIndex )) 
                     sLine = ( *pList->GetObject( nListIndex ))[ SOURCE_LANGUAGE ];
                 if ( !sLine.Len())
                     sLine = sLastListLine;
@@ -2613,7 +2601,7 @@ void ParserQueue::Push( const QueueEntry& aEntry ){
             aQref = aQueueCur;
             aQueueCur = aQueueNext;
             aQueueNext = aQref;
-        }
+        }       
     }
 }
 
@@ -2631,19 +2619,19 @@ void ParserQueue::Close(){
 };
 void ParserQueue::Pop( std::queue<QueueEntry>& aQueue ){
     while( !aQueue.empty() ){
-        QueueEntry aEntry = aQueue.front();
+        QueueEntry aEntry = aQueue.front(); 
         aQueue.pop();
         aExport.Execute( aEntry.nTyp , (char*) aEntry.sLine.GetBuffer() );
     }
 }
 ParserQueue::ParserQueue( Export& aExportObj )
-        :
-          bCurrentIsM( false ),
-          bNextIsM( false ) ,
+        :  
+          bCurrentIsM( false ), 
+          bNextIsM( false ) , 
           bLastWasM( false ),
           bMflag( false ) ,
           aExport( aExportObj ) ,
-          bStart( false ) ,
+          bStart( false ) , 
           bStartNext( false )
 {
           aQueueNext = new std::queue<QueueEntry>;
diff --git a/l10ntools/source/export2.cxx b/l10ntools/source/export2.cxx
index fc8f823b7deb..02ca874c439a 100644
--- a/l10ntools/source/export2.cxx
+++ b/l10ntools/source/export2.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
@@ -107,7 +107,7 @@ void Export::DumpExportList( ByteString& sListName , ExportList& aList ){
 ByteString Export::DumpMap( ByteString& sMapName , ByteStringHashMap& aMap ){
     ByteStringHashMap::const_iterator idbg;
     ByteString sReturn;
-
+    
     if( sMapName.Len() )
         printf("MapName %s\n", sMapName.GetBuffer());
     if( aMap.size() < 1 ) return ByteString();
@@ -127,14 +127,14 @@ void Export::SetLanguages( std::vector<ByteString> val ){
     isInitialized = true;
 }
 /*****************************************************************************/
-std::vector<ByteString> Export::GetLanguages(){
+std::vector<ByteString> Export::GetLanguages(){ 
 /*****************************************************************************/
-    return aLanguages;
+    return aLanguages; 
 }
 /*****************************************************************************/
-std::vector<ByteString> Export::GetForcedLanguages(){
+std::vector<ByteString> Export::GetForcedLanguages(){ 
 /*****************************************************************************/
-    return aForcedLanguages;
+    return aForcedLanguages; 
 }
 std::vector<ByteString> Export::aLanguages       = std::vector<ByteString>();
 std::vector<ByteString> Export::aForcedLanguages = std::vector<ByteString>();
@@ -158,7 +158,7 @@ void Export::QuotHTMLXRM( ByteString &rString )
                 i++;
             }
         }
-
+      
         if ( i < rString.Len()) {
             switch ( rString.GetChar( i )) {
                 case '<':
@@ -268,13 +268,13 @@ void Export::RemoveUTF8ByteOrderMarker( ByteString &rString ){
 
 bool Export::hasUTF8ByteOrderMarker( const ByteString &rString ){
     // Byte order marker signature
-
+    
     const unsigned char c1 =  0xEF;
     const unsigned char c2 =  0xBB;
     const unsigned char c3 =  0xBF;
 
     const char bom[ 3 ] = { c1 , c2 , c3 };
-
+    
     return      rString.Len() >= 3 &&
                 rString.GetChar( 0 ) == bom[ 0 ] &&
                 rString.GetChar( 1 ) == bom[ 1 ] &&
@@ -324,15 +324,15 @@ void Export::RemoveUTF8ByteOrderMarkerFromFile( const ByteString &rFilename ){
 }
 
 // Merge it into source code!
-//bool Export::isMergingGermanAllowed( const ByteString& rPrj ){
+//bool Export::isMergingGermanAllowed( const ByteString& rPrj ){  
 //    (void) rPrj;
-//  return true;
-/*  static ByteStringBoolHashMap aHash;
-
+//	return true;
+/*	static ByteStringBoolHashMap aHash;
+    
     if( aHash.find( rPrj ) != aHash.end() ){
         return aHash[ rPrj ];
     }
-
+    
     ByteString sFile = Export::GetEnv( "SRC_ROOT" ) ;
     sFile.Append("/");
     sFile.Append( rPrj );
@@ -365,7 +365,7 @@ bool Export::CopyFile( const ByteString& source , const ByteString& dest )
         fclose( IN_FILE );
         return false;
     }
-
+   
     while( fgets( buf , BUFFERSIZE , IN_FILE ) != NULL )
     {
         if( fputs( buf , OUT_FILE ) == EOF )
@@ -385,7 +385,7 @@ bool Export::CopyFile( const ByteString& source , const ByteString& dest )
     }
     fclose ( IN_FILE );
     fclose ( OUT_FILE );
-
+    
     return true;
 }
 
@@ -464,7 +464,7 @@ void Export::InitForcedLanguages( bool bMergeMode ){
     for ( USHORT x = 0; x < sForcedLanguages.GetTokenCount( ',' ); x++ ){
         sTmp = sForcedLanguages.GetToken( x, ',' ).GetToken( 0, '=' );
         sTmp.EraseLeadingAndTrailingChars();
-        if( bMergeMode && isAllowed( sTmp ) ){}
+        if( bMergeMode && isAllowed( sTmp ) ){} 
         else if( !( (sTmp.GetChar(0)=='x' || sTmp.GetChar(0)=='X') && sTmp.GetChar(1)=='-' ) )
             aForcedLanguages.push_back( sTmp );
     }
@@ -485,8 +485,8 @@ void Export::replaceEncoding( ByteString& rString )
 
     for( xub_StrLen idx = 0; idx <= rString.Len()-8 ; idx++ )
     {
-        if( rString.GetChar( idx )   == '&' &&
-            rString.GetChar( idx+1 ) == '#' &&
+        if( rString.GetChar( idx )   == '&' && 
+            rString.GetChar( idx+1 ) == '#' && 
             rString.GetChar( idx+2 ) == 'x' &&
             rString.GetChar( idx+7 ) == ';' )
         {
@@ -500,7 +500,7 @@ void Export::replaceEncoding( ByteString& rString )
             rString = sTmp;
          }
     }
-}
+}        
 
 /*****************************************************************************/
 void Export::FillInFallbacks( ResData *pResData )
@@ -510,18 +510,18 @@ void Export::FillInFallbacks( ResData *pResData )
     for( unsigned int n = 0; n < aLanguages.size(); n++ ){
         sCur = aLanguages[ n ];
         if( isAllowed( sCur )  ){
-            ByteString nFallbackIndex = GetFallbackLanguage( sCur );
+            ByteString nFallbackIndex = GetFallbackLanguage( sCur );		
             if( nFallbackIndex.Len() ){
                 if ( !pResData->sText[ sCur ].Len())
-                    pResData->sText[ sCur ] =
+                    pResData->sText[ sCur ] = 
                         pResData->sText[ nFallbackIndex ];
 
                 if ( !pResData->sHelpText[ sCur ].Len())
-                    pResData->sHelpText[ sCur ] =
+                    pResData->sHelpText[ sCur ] = 
                         pResData->sHelpText[ nFallbackIndex ];
 
                 if ( !pResData->sQuickHelpText[ sCur ].Len())
-                    pResData->sQuickHelpText[ sCur ] =
+                    pResData->sQuickHelpText[ sCur ] = 
                         pResData->sQuickHelpText[ nFallbackIndex ];
 
                 if ( !pResData->sTitle[ sCur ].Len())
@@ -531,11 +531,11 @@ void Export::FillInFallbacks( ResData *pResData )
                 if ( pResData->pStringList )
                     FillInListFallbacks(
                         pResData->pStringList, sCur, nFallbackIndex );
-
+                
                 if ( pResData->pPairedList )
                     FillInListFallbacks(
                         pResData->pPairedList, sCur, nFallbackIndex );
-
+                
                 if ( pResData->pFilterList )
                     FillInListFallbacks(
                         pResData->pFilterList, sCur, nFallbackIndex );
@@ -550,13 +550,13 @@ void Export::FillInFallbacks( ResData *pResData )
             }
         }
     }
-}
+}        
 
 /*****************************************************************************/
 void Export::FillInListFallbacks(
     ExportList *pList, const ByteString &nSource, const ByteString &nFallback )
 /*****************************************************************************/
-{
+{ 
 
     for ( ULONG i = 0; i < pList->Count(); i++ ) {
         ExportListEntry *pEntry = pList->GetObject( i );
@@ -572,10 +572,10 @@ void Export::FillInListFallbacks(
 ByteString Export::GetTimeStamp()
 /*****************************************************************************/
 {
-//  return "xx.xx.xx";
+//	return "xx.xx.xx";
     char buf[20];
     Time aTime;
-
+        
     snprintf(buf, sizeof(buf), "%8d %02d:%02d:%02d", int(Date().GetDate()),
         int(aTime.GetHour()), int(aTime.GetMin()), int(aTime.GetSec()));
     return ByteString(buf);
@@ -670,15 +670,15 @@ void Export::getRandomName( const ByteString& sPrefix , ByteString& sRandStr , c
 
     static sal_uInt64 value;
     char     buffer[RAND_NAME_LENGTH];
-
-    TimeValue           tv;
-    sal_uInt64          v;
-    int                 i;
+    
+    TimeValue			tv;
+    sal_uInt64			v;
+    int					i;
 
     osl_getSystemTime( &tv );
-    oslProcessInfo  proInfo;
+    oslProcessInfo	proInfo;
     osl_getProcessInfo( 0 , osl_Process_IDENTIFIER , &proInfo );
-
+    
     value += ((sal_uInt64) ( tv.Nanosec / 1000 ) << 16) ^ ( tv.Nanosec / 1000 ) ^ proInfo.Ident;
 
     v = value;
@@ -688,7 +688,7 @@ void Export::getRandomName( const ByteString& sPrefix , ByteString& sRandStr , c
         buffer[i] = LETTERS[v % COUNT_OF_LETTERS];
         v        /= COUNT_OF_LETTERS;
     }
-
+    
     sRandStr.Append( buffer , RAND_NAME_LENGTH );
     sRandStr.Append( sPostfix );
 }
@@ -704,23 +704,23 @@ DirEntry Export::GetTempFile()
 /*****************************************************************************/
 {
     rtl::OUString* sTempFilename = new rtl::OUString();
-
+    
     // Create a temp file
     int nRC = osl::FileBase::createTempFile( 0 , 0 , sTempFilename );
     if( nRC ) printf(" osl::FileBase::createTempFile RC = %d",nRC);
-
+    
     String strTmp( *sTempFilename  );
-
+    
     INetURLObject::DecodeMechanism eMechanism = INetURLObject::DECODE_TO_IURI;
-    String sDecodedStr = INetURLObject::decode( strTmp , '%' , eMechanism );
+    String sDecodedStr = INetURLObject::decode( strTmp , '%' , eMechanism ); 
     ByteString sTmp( sDecodedStr , RTL_TEXTENCODING_UTF8 );
-
+    
 #if defined(WNT) || defined(OS2)
     sTmp.SearchAndReplace("file:///","");
     sTmp.SearchAndReplaceAll('/','\\');
 #else
     // Set file permission to 644
-     const sal_uInt64 nPerm = osl_File_Attribute_OwnRead | osl_File_Attribute_OwnWrite |
+     const sal_uInt64 nPerm = osl_File_Attribute_OwnRead | osl_File_Attribute_OwnWrite | 
                              osl_File_Attribute_GrpRead | osl_File_Attribute_OthRead ;
 
     nRC = osl::File::setAttributes( *sTempFilename , nPerm );
diff --git a/l10ntools/source/file.cxx b/l10ntools/source/file.cxx
index c6e177ce9c15..44809287d098 100644
--- a/l10ntools/source/file.cxx
+++ b/l10ntools/source/file.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
@@ -32,7 +32,7 @@
 
 namespace transex
 {
-
+    
 File::File( const rtl::OUString sFile )
 {
     sFileName = sFile;
@@ -46,9 +46,9 @@ File::File( const rtl::OUString sFullPath , const rtl::OUString sFile )
 
 bool File::lessFile ( const File& rKey1, const File& rKey2 )
 {
-    rtl::OUString sName1( ( static_cast< File >( rKey1 ) ).getFileName() );
-    rtl::OUString sName2( ( static_cast< File >( rKey2 ) ).getFileName() );
-
+    rtl::OUString sName1( ( static_cast< File >( rKey1 ) ).getFileName() ); 
+    rtl::OUString sName2( ( static_cast< File >( rKey2 ) ).getFileName() ); 
+            
     return sName1.compareTo( sName2 ) < 0 ;
 }
 
diff --git a/l10ntools/source/filter/merge/FCFGMerge.java b/l10ntools/source/filter/merge/FCFGMerge.java
index 2c2f35b66d1b..378f7de05439 100644
--- a/l10ntools/source/filter/merge/FCFGMerge.java
+++ b/l10ntools/source/filter/merge/FCFGMerge.java
@@ -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
diff --git a/l10ntools/source/filter/merge/Merger.java b/l10ntools/source/filter/merge/Merger.java
index 3125732733f8..cb8579ff0647 100644
--- a/l10ntools/source/filter/merge/Merger.java
+++ b/l10ntools/source/filter/merge/Merger.java
@@ -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,7 +79,7 @@ public class Merger
     private static final java.lang.String PROP_LANGUAGEPACK    = "languagepack"             ; // <= cmdline
 
     private static final java.lang.String PROP_ITEMS           = "items"                    ; // <= pkg cfg files!
-
+    
     //___________________________________________
     // member
 
@@ -109,7 +109,7 @@ public class Merger
     private java.util.Vector m_lFilters;
     private java.util.Vector m_lLoaders;
     private java.util.Vector m_lHandlers;
-
+    
     //___________________________________________
     // interface
 
@@ -149,7 +149,7 @@ public class Merger
             m_lTypes = new java.util.Vector();
             //m_aLog.setWarning("Fragment list of types is missing. Parameter \"items\" seems to be invalid.");
         }
-
+        
         try
         {
             ConfigHelper aFcfg = new ConfigHelper(m_aCfg.getString(PROP_FCFG), null);
@@ -300,10 +300,10 @@ public class Merger
             m_aLog.setWarning("List of fragments is empty!? Will be ignored ...");
             return;
         }
-
+        
         java.util.Enumeration  pFragments = lFragments.elements();
         java.lang.String       sExtXcu    = m_aCfg.getString(PROP_EXTENSION_XCU);
-
+        
         for (int tabs=0; tabs<nPrettyTabs; ++tabs)
             sBuffer.append("\t");
         sBuffer.append("<node oor:name=\""+sSetName+"\">\n");
@@ -319,7 +319,7 @@ public class Merger
         java.lang.String sEncoding   = "UTF-8";
         if (bDebug)
             sEncoding = "UTF-8Special";
-
+        
         while(pFragments.hasMoreElements())
         {
             java.lang.String sFragment = (java.lang.String)pFragments.nextElement();
@@ -349,7 +349,7 @@ public class Merger
             // on such errors :-)
             m_aLog.setDetailedInfo("merge fragment \""+aFragment.getPath()+"\" ...");
             FileHelper.readEncodedBufferFromFile(aFragment, sEncoding, sBuffer);
-
+            
             sBuffer.append("\n");
         }
 
diff --git a/l10ntools/source/filter/utils/AnalyzeStartupLog.java b/l10ntools/source/filter/utils/AnalyzeStartupLog.java
index 60444338b67b..bbedca3bb700 100644
--- a/l10ntools/source/filter/utils/AnalyzeStartupLog.java
+++ b/l10ntools/source/filter/utils/AnalyzeStartupLog.java
@@ -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
diff --git a/l10ntools/source/filter/utils/Cache.java b/l10ntools/source/filter/utils/Cache.java
index f4120b2140cc..f6f0b25c22f9 100644
--- a/l10ntools/source/filter/utils/Cache.java
+++ b/l10ntools/source/filter/utils/Cache.java
@@ -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
@@ -372,7 +372,7 @@ public class Cache
          *          <li>...</li>
          *      </ul>
          */
-
+         
         System.out.println("TODO: must be adapted to java 1.3 :-(");
         System.exit(-1);
 //TODO_JAVA        aFactory.setExpandEntityReferences(false);
@@ -2144,7 +2144,7 @@ public class Cache
             java.util.HashMap  lFilterUINames = (java.util.HashMap)aFilter.get(PROPNAME_UINAME);
             java.util.HashMap  lTypeUINames   = (java.util.HashMap)aType.get(PROPNAME_UINAME);
             java.util.HashMap  lPatchUINames  = new java.util.HashMap();
-
+            
             java.util.Iterator pUINames = lTypeUINames.keySet().iterator();
             while(pUINames.hasNext())
             {
@@ -2152,7 +2152,7 @@ public class Cache
                 java.lang.String sValue  = (java.lang.String)lTypeUINames.get(sLocale);
                 lPatchUINames.put(sLocale, sValue);
             }
-
+            
             pUINames = lFilterUINames.keySet().iterator();
             while(pUINames.hasNext())
             {
@@ -2161,7 +2161,7 @@ public class Cache
                 lPatchUINames.put(sFilter+":"+sLocale, sValue);
             }
             aType.put(PROPNAME_UINAME, lPatchUINames);
-
+            
             // set generic filter service wrapper for our own native filters!
             // By the way: The format types of such filters can be detected by our
             // generic detector too.
@@ -2192,11 +2192,11 @@ public class Cache
             int     flags1     = ((java.lang.Integer)aFilter.get(PROPNAME_FLAGS)).intValue();
             java.lang.String sDocSrv = (java.lang.String)aFilter.get(PROPNAME_DOCUMENTSERVICE);
             if (sDocSrv.length()>0)// without a doc service its not a real filter - its a graphic filter!
-            {
+            {    
                 boolean preferred1 = ((flags1 & FLAGVAL_PREFERRED) == FLAGVAL_PREFERRED);
                 if (preferred1)
                     lPreferredFilters.add(aFilter);
-
+    
                 java.lang.String sAlreadyRegisteredFilter = (java.lang.String)aType.get(PROPNAME_PREFERREDFILTER);
                 // no registration => set this filter as "any possible one"!
                 if (sAlreadyRegisteredFilter.length() < 1)
@@ -2206,7 +2206,7 @@ public class Cache
                     java.util.HashMap aAlreadyRegisteredFilter = (java.util.HashMap)m_lFilters.get(sAlreadyRegisteredFilter);
                     int               flags2                   = ((java.lang.Integer)aAlreadyRegisteredFilter.get(PROPNAME_FLAGS)).intValue();
                     boolean           preferred2               = ((flags2 & FLAGVAL_PREFERRED) == FLAGVAL_PREFERRED);
-
+    
                     // two preferred filters for the same type! => error
                     if (preferred1 && preferred2)
                     {
@@ -2223,7 +2223,7 @@ public class Cache
                         aType.put(PROPNAME_PREFERREDFILTER, sFilter);
                 }
             }
-
+            
             // create the new combined filter flag if required
             if (bCreateCombineFilterFlag)
             {
diff --git a/l10ntools/source/filter/utils/ConfigHelper.java b/l10ntools/source/filter/utils/ConfigHelper.java
index a357b36fc5d1..af70ef99b731 100644
--- a/l10ntools/source/filter/utils/ConfigHelper.java
+++ b/l10ntools/source/filter/utils/ConfigHelper.java
@@ -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
@@ -176,7 +176,7 @@ public class ConfigHelper extends java.util.Properties
             throw new java.util.NoSuchElementException("The requested config value \""+sProp+"\" does not exists!");
         return new java.lang.Boolean(sValue).booleanValue();
     }
-
+    
     public synchronized boolean getBoolean(java.lang.String sProp   ,
                                            boolean          bDefault)
     {
diff --git a/l10ntools/source/filter/utils/FileHelper.java b/l10ntools/source/filter/utils/FileHelper.java
index 38019cf628df..94b0ee96fe61 100644
--- a/l10ntools/source/filter/utils/FileHelper.java
+++ b/l10ntools/source/filter/utils/FileHelper.java
@@ -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
@@ -64,7 +64,7 @@ public class FileHelper
     {
         System.out.println("TODO: must be adapted to java 1.3 :-(");
         System.exit(-1);
-/*TODO_JAVA
+/*TODO_JAVA        
         try
         {
             sFileURL = aSystemPath.toURI().toURL().toString();
@@ -73,7 +73,7 @@ public class FileHelper
         {
             sFileURL = null;
         }
-*/
+*/        
         java.lang.String sFileURL = null;
 
         // problem of java: file URL's are coded with 1 slash instead of 2 or 3 ones!
@@ -143,7 +143,7 @@ public class FileHelper
     {
         System.out.println("TODO: must be adapted to java 1.3 :-(");
         System.exit(-1);
-
+        
         java.lang.String sFileURL = FileHelper.getFileURLFromSystemPath(aSystemPath);
         java.lang.String sBaseURL = FileHelper.getFileURLFromSystemPath(aBasePath  );
 
@@ -260,7 +260,7 @@ public class FileHelper
     public static java.lang.String convertName2FileName(String sName)
     {
         int    i       = 0;
-        int    nLength = sName.length();
+        int    nLength = sName.length(); 
         char[] lBuffer = sName.toCharArray();
 
         java.lang.StringBuffer sNewName = new java.lang.StringBuffer(nLength);
@@ -403,7 +403,7 @@ public class FileHelper
             FileHelper.readAndCheckUTF8File(aFile,sBuffer);
             return;
         }
-
+        
         java.io.FileInputStream   aByteStream    = new java.io.FileInputStream(aFile.getAbsolutePath());
         java.io.InputStreamReader aEncodedReader = new java.io.InputStreamReader(aByteStream, sEncoding);
         char[]                    aEncodedBuffer = new char[4096];
@@ -442,18 +442,18 @@ public class FileHelper
     {
         return (char)((nByte1*0x40000)+(nByte2*0x1000)+(nByte3*0x40)+nByte4);
     }
-
+                    
     //___________________________________________
     private static int impl_readAndCheckNextByte(byte[] aBuffer    ,
                                                  int    nBufPos    ,
                                                  int    nBufLength ,
                                                  int    nMinRange  ,
                                                  int    nMaxRange  )
-        throws java.lang.Exception
+        throws java.lang.Exception                                                     
     {
         if (nBufPos>=nBufLength)
             throw new java.lang.Exception("impl_readAndCheckNextByte()\nEnd of buffer reached.");
-
+            
         int nByte = aBuffer[nBufPos] & 0xFF;
         if (
             (nByte < nMinRange) ||
@@ -462,14 +462,14 @@ public class FileHelper
         {
             throw new java.lang.Exception("impl_readAndCheckNextByte()\nByte does not fit the specified range.");
         }
-
+        
         return nByte;
     }
-
+    
     //___________________________________________
     public static void readAndCheckUTF8File(java.io.File           aFile  ,
                                             java.lang.StringBuffer sBuffer)
-        throws java.io.IOException
+        throws java.io.IOException                                    
     {
         java.io.FileInputStream aByteStream     = new java.io.FileInputStream(aFile.getAbsolutePath());
         byte[]                  aBuffer         = new byte[4096];
@@ -510,7 +510,7 @@ public class FileHelper
                 nByte_1    = nByteOrg_1;
                 /*
                     Table 3-6. Well-Formed UTF-8 Byte Sequences
-
+                    
                     ============================================================================
                     Nr.     Code Points             1st Byte    2nd Byte    3rd Byte    4th Byte
                     ============================================================================
@@ -698,26 +698,26 @@ public class FileHelper
                 // <- DEBUG !
             }
         }
-
+        
         }
         catch(java.lang.Throwable ex)
         {
             // -> DEBUG !
             FileHelper.logEncodingData(sLog, nUTF8, nByteOrg_1, nByteOrg_2, nByteOrg_3, nByteOrg_4, nByte_1, nByte_2, nByte_3, nByte_4, nEncodingType);
-
+    
             java.io.File     aDir  = new java.io.File(aFile.getParent());
             java.lang.String sDump = aFile.getName();
             java.io.File     aDump = FileHelper.createUniqueFile(aDir, sDump, "dump");
             FileHelper.writeEncodedBufferToFile(aDump, "UTF-8", false, sLog);
             // <- DEBUG !
-
+            
             java.lang.String sMsg = "File '"+aFile.getPath()+"' is not encoded right as UTF-8.";
             throw new java.io.IOException(sMsg);
         }
-
+        
         aByteStream.close();
     }
-
+    
     //___________________________________________
 
     /** writes the given string buffer into the specified file
@@ -753,10 +753,10 @@ public class FileHelper
 
         java.lang.String sTemp = sBuffer.toString();
         aEncodedWriter.write(sTemp, 0, sTemp.length());
-
+        
         aEncodedWriter.flush();
         aEncodedWriter.close();
-
+        
         if (!aFile.exists())
             throw new java.io.IOException("File \""+aFile.getAbsolutePath()+"\" not written correctly.");
     }
diff --git a/l10ntools/source/filter/utils/Logger.java b/l10ntools/source/filter/utils/Logger.java
index 2d5ed631cd69..4c3112eabd6c 100644
--- a/l10ntools/source/filter/utils/Logger.java
+++ b/l10ntools/source/filter/utils/Logger.java
@@ -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
diff --git a/l10ntools/source/filter/utils/MalformedCommandLineException.java b/l10ntools/source/filter/utils/MalformedCommandLineException.java
index e4ea0f95d99c..601e2d152572 100644
--- a/l10ntools/source/filter/utils/MalformedCommandLineException.java
+++ b/l10ntools/source/filter/utils/MalformedCommandLineException.java
@@ -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
diff --git a/l10ntools/source/filter/utils/XMLHelper.java b/l10ntools/source/filter/utils/XMLHelper.java
index 175d04ebacef..8a262e374bfa 100644
--- a/l10ntools/source/filter/utils/XMLHelper.java
+++ b/l10ntools/source/filter/utils/XMLHelper.java
@@ -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
@@ -766,7 +766,7 @@ public class XMLHelper
      *  @param  sPackage
      *          name of the configuration package.
      *
-     *  @param  bLanguagepack
+     *  @param  bLanguagepack     
      *          force creation of a special header,
      *          which is needed for language packs only.
      *
@@ -811,7 +811,7 @@ public class XMLHelper
             sHeader.append(sPackage);
             sHeader.append("\">\n");
         }
-
+        
         return sHeader.toString();
     }
 
diff --git a/l10ntools/source/gsicheck.cxx b/l10ntools/source/gsicheck.cxx
index 1ec9827a753d..bde2037693b5 100644
--- a/l10ntools/source/gsicheck.cxx
+++ b/l10ntools/source/gsicheck.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
@@ -197,7 +197,7 @@ GSILine::GSILine( const ByteString &rLine, ULONG nLine )
         }
         if ( nPos != STRING_NOTFOUND )
         {
-//          ByteString aStatus = sTmp.Copy( nStart, nPos - nStart );     // ext int ...
+//        	ByteString aStatus = sTmp.Copy( nStart, nPos - nStart );     // ext int ...
             nStart = nPos + 4;  // + length of the delemiter
         }
         if ( nPos != STRING_NOTFOUND )
@@ -276,7 +276,7 @@ void GSILine::ReassembleLine()
         else
             PrintError( "Cannot reassemble GSI line (internal Error).", "Line format", "", FALSE, GetLineNumber(), GetUniqId() );
     }
-    else
+    else 
         PrintError( "Cannot reassemble line of unknown type (internal Error).", "Line format", "", FALSE, GetLineNumber(), GetUniqId() );
 }
 
@@ -452,7 +452,7 @@ BOOL GSIBlock::IsUTF8( const ByteString &aTestee, BOOL bFixTags, USHORT &nErrorP
             nAfterID = nAfterID + aDelimiter.Len();
         }
         else if ( ( aID.GetChar(6) == '*' ) && aID.Equals( aDelimiter, 7, aDelimiter.Len() ) )
-        {   // New KeyId     6 Letters, digits and spechial chars followed by '*delimiter' to indicate translation in progress
+        {   // New KeyId     6 Letters, digits and spechial chars followed by '*delimiter' to indicate translation in progress 
             bNewId = TRUE;
             nErrorPos = 1;
             aID = aID.Copy( 0, 6 );
@@ -460,7 +460,7 @@ BOOL GSIBlock::IsUTF8( const ByteString &aTestee, BOOL bFixTags, USHORT &nErrorP
             nAfterID = nAfterID + aDelimiter.Len();
         }
         else if ( aID.GetTokenCount( '.' ) > 1 )
-        {   // test for old KeyIDs       5 to 6 digits followed by a dot   '44373.'
+        {	// test for old KeyIDs       5 to 6 digits followed by a dot   '44373.'
             bNewId = FALSE;
             nErrorPos = 1;
             aID = aID.GetToken( 0, '.' );
@@ -1107,7 +1107,7 @@ int _cdecl main( int argc, char *argv[] )
                             }
                             if ( pReferenceLine->GetLineFormat() != FORMAT_UNKNOWN )
                             {
-                                if ( pReferenceLine->GetUniqId() == aId && pReferenceLine->GetLanguageId().Equals( aSourceLang ) )
+                                if ( pReferenceLine->GetUniqId() == aId && pReferenceLine->GetLanguageId().Equals( aSourceLang ) ) 
                                 {
                                     pBlock->SetReferenceLine( pReferenceLine );
                                     pReferenceLine = NULL;
@@ -1115,7 +1115,7 @@ int _cdecl main( int argc, char *argv[] )
                                 else if ( pReferenceLine->GetUniqId() > aId )
                                 {
 //                                    if ( pGSILine->GetLanguageId() == aSourceLang )
-//                                      PrintError( "No reference line found. Entry is new in source file", "File format", "", bPrintContext, pGSILine->GetLineNumber(), aId );
+//                    		            PrintError( "No reference line found. Entry is new in source file", "File format", "", bPrintContext, pGSILine->GetLineNumber(), aId );
                                     bContinueSearching = FALSE;
                                 }
                                 else
diff --git a/l10ntools/source/gsiconv.cxx b/l10ntools/source/gsiconv.cxx
index b2e470f604ea..570a1999a0ca 100644
--- a/l10ntools/source/gsiconv.cxx
+++ b/l10ntools/source/gsiconv.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
@@ -34,9 +34,9 @@
 // local includes
 #include "utf8conv.hxx"
 
-#define GSI_FILE_UNKNOWN        0x0000
-#define GSI_FILE_OLDSTYLE       0x0001
-#define GSI_FILE_L10NFRAMEWORK  0x0002
+#define GSI_FILE_UNKNOWN		0x0000
+#define GSI_FILE_OLDSTYLE		0x0001
+#define GSI_FILE_L10NFRAMEWORK	0x0002
 
 /*****************************************************************************/
 USHORT GetGSIFileType( SvStream &rStream )
@@ -109,7 +109,7 @@ ByteString GetGSILineLangId( const ByteString &rLine, USHORT nFileType )
 
 /*****************************************************************************/
 void ConvertGSILine( BOOL bToUTF8, ByteString &rLine,
-        rtl_TextEncoding nEncoding, USHORT nFileType )
+        rtl_TextEncoding nEncoding,	USHORT nFileType )
 /*****************************************************************************/
 {
     switch ( nFileType ) {
@@ -314,19 +314,19 @@ int _cdecl main( int argc, char *argv[] )
             ByteString sCharset( argv[ 3 ] );
             sCharset.ToUpperAscii();
 
-            if      ( sCharset == "MS_932" )    nEncoding = RTL_TEXTENCODING_MS_932;
-            else if ( sCharset == "MS_936" )    nEncoding = RTL_TEXTENCODING_MS_936;
-            else if ( sCharset == "MS_949" )    nEncoding = RTL_TEXTENCODING_MS_949;
-            else if ( sCharset == "MS_950" )    nEncoding = RTL_TEXTENCODING_MS_950;
-            else if ( sCharset == "MS_1250" )   nEncoding = RTL_TEXTENCODING_MS_1250;
-            else if ( sCharset == "MS_1251" )   nEncoding = RTL_TEXTENCODING_MS_1251;
-            else if ( sCharset == "MS_1252" )   nEncoding = RTL_TEXTENCODING_MS_1252;
-            else if ( sCharset == "MS_1253" )   nEncoding = RTL_TEXTENCODING_MS_1253;
-            else if ( sCharset == "MS_1254" )   nEncoding = RTL_TEXTENCODING_MS_1254;
-            else if ( sCharset == "MS_1255" )   nEncoding = RTL_TEXTENCODING_MS_1255;
-            else if ( sCharset == "MS_1256" )   nEncoding = RTL_TEXTENCODING_MS_1256;
-            else if ( sCharset == "MS_1257" )   nEncoding = RTL_TEXTENCODING_MS_1257;
-            else if ( sCharset == "UTF8" )      nEncoding = RTL_TEXTENCODING_UTF8;
+            if 		( sCharset == "MS_932" ) 	nEncoding = RTL_TEXTENCODING_MS_932;
+            else if ( sCharset == "MS_936" ) 	nEncoding = RTL_TEXTENCODING_MS_936;
+            else if ( sCharset == "MS_949" ) 	nEncoding = RTL_TEXTENCODING_MS_949;
+            else if ( sCharset == "MS_950" ) 	nEncoding = RTL_TEXTENCODING_MS_950;
+            else if ( sCharset == "MS_1250" ) 	nEncoding = RTL_TEXTENCODING_MS_1250;
+            else if ( sCharset == "MS_1251" ) 	nEncoding = RTL_TEXTENCODING_MS_1251;
+            else if ( sCharset == "MS_1252" ) 	nEncoding = RTL_TEXTENCODING_MS_1252;
+            else if ( sCharset == "MS_1253" ) 	nEncoding = RTL_TEXTENCODING_MS_1253;
+            else if ( sCharset == "MS_1254" ) 	nEncoding = RTL_TEXTENCODING_MS_1254;
+            else if ( sCharset == "MS_1255" ) 	nEncoding = RTL_TEXTENCODING_MS_1255;
+            else if ( sCharset == "MS_1256" ) 	nEncoding = RTL_TEXTENCODING_MS_1256;
+            else if ( sCharset == "MS_1257" ) 	nEncoding = RTL_TEXTENCODING_MS_1257;
+            else if ( sCharset == "UTF8" )		nEncoding = RTL_TEXTENCODING_UTF8;
 
             else {
                 Help();
diff --git a/l10ntools/source/help/HelpCompiler.cxx b/l10ntools/source/help/HelpCompiler.cxx
index 79e41d37ea3f..66c7d2a673bb 100644
--- a/l10ntools/source/help/HelpCompiler.cxx
+++ b/l10ntools/source/help/HelpCompiler.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
@@ -49,8 +49,8 @@ static void impl_sleep( sal_uInt32 nSec )
     osl::Thread::wait( aTime );
 }
 
-HelpCompiler::HelpCompiler(StreamTable &in_streamTable, const fs::path &in_inputFile,
-    const fs::path &in_src, const fs::path &in_resEmbStylesheet,
+HelpCompiler::HelpCompiler(StreamTable &in_streamTable, const fs::path &in_inputFile, 
+    const fs::path &in_src, const fs::path &in_resEmbStylesheet, 
     const std::string &in_module, const std::string &in_lang, bool in_bExtensionMode)
     : streamTable(in_streamTable), inputFile(in_inputFile),
     src(in_src), module(in_module), lang(in_lang), resEmbStylesheet(in_resEmbStylesheet),
@@ -59,7 +59,7 @@ HelpCompiler::HelpCompiler(StreamTable &in_streamTable, const fs::path &in_input
     xmlKeepBlanksDefaultValue = 0;
 }
 
-xmlDocPtr HelpCompiler::getSourceDocument(const fs::path &filePath)
+xmlDocPtr HelpCompiler::getSourceDocument(const fs::path &filePath) 
 {
     static const char *params[4 + 1];
     static xsltStylesheetPtr cur = NULL;
@@ -79,7 +79,7 @@ xmlDocPtr HelpCompiler::getSourceDocument(const fs::path &filePath)
         {
             static std::string fsroot('\'' + src.toUTF8() + '\'');
             static std::string esclang('\'' + lang + '\'');
-
+            
             xmlSubstituteEntitiesDefault(1);
             xmlLoadExtDtdDefaultValue = 1;
             cur = xsltParseStylesheetFile((const xmlChar *)resEmbStylesheet.native_file_string().c_str());
@@ -157,7 +157,7 @@ xmlNodePtr HelpCompiler::clone(xmlNodePtr node, const std::string& appl)
     while (n != NULL)
     {
         bool isappl = false;
-        if ( (!strcmp((const char*)n->name, "switchinline")) ||
+        if ( (!strcmp((const char*)n->name, "switchinline")) || 
              (!strcmp((const char*)n->name, "switch")) )
         {
             xmlChar *select = xmlGetProp(n, (xmlChar*)"select");
@@ -171,7 +171,7 @@ xmlNodePtr HelpCompiler::clone(xmlNodePtr node, const std::string& appl)
         if (isappl)
         {
             xmlNodePtr caseNode = n->xmlChildrenNode;
-            if (appl == "DEFAULT")
+            if (appl == "DEFAULT") 
             {
                 while (caseNode)
                 {
@@ -239,7 +239,7 @@ public:
 private:
     HashSet extendedHelpText;
 public:
-    myparser(const std::string &indocumentId, const std::string &infileName,
+    myparser(const std::string &indocumentId, const std::string &infileName, 
         const std::string &intitle) : documentId(indocumentId), fileName(infileName),
         title(intitle)
     {
@@ -294,7 +294,7 @@ void myparser::traverse( xmlNodePtr parentNode )
     xmlNodePtr test ;
     for (test = parentNode->xmlChildrenNode; test; test = test->next)
     {
-        if (fileName.empty() && !strcmp((const char*)test->name, "filename"))
+        if (fileName.empty() && !strcmp((const char*)test->name, "filename")) 
         {
             xmlNodePtr node = test->xmlChildrenNode;
             if (xmlNodeIsText(node))
@@ -338,7 +338,7 @@ void myparser::traverse( xmlNodePtr parentNode )
                 else
                     continue;
             }
-            else if (branch.compare("index") == 0)
+            else if (branch.compare("index") == 0) 
             {
                 LinkedList ll;
 
@@ -353,7 +353,7 @@ void myparser::traverse( xmlNodePtr parentNode )
                     {
                         embedded = std::string((const char*)embeddedxml);
                         xmlFree (embeddedxml);
-                        std::transform (embedded.begin(), embedded.end(),
+                        std::transform (embedded.begin(), embedded.end(), 
                             embedded.begin(), tolower);
                     }
 
@@ -378,7 +378,7 @@ void myparser::traverse( xmlNodePtr parentNode )
                 if (!ll.empty())
                     (*keywords)[anchor] = ll;
             }
-            else if (branch.compare("contents") == 0)
+            else if (branch.compare("contents") == 0) 
             {
                 // currently not used
             }
@@ -482,7 +482,7 @@ bool HelpCompiler::compile( void ) throw( HelpProcessingException )
                        << "\" in file" << src.native_file_string().c_str() << std::endl;
             throw HelpProcessingException( HELPPROCESSING_GENERAL_ERROR, aStrStream.str() );
         }
-
+        
     } // end iteration over all applications
 
     streamTable.document_id = documentId;
@@ -521,8 +521,8 @@ namespace fs
     void create_directory(const fs::path indexDirName)
     {
         HCDBG(
-            std::cerr << "creating " <<
-            rtl::OUStringToOString(indexDirName.data, RTL_TEXTENCODING_UTF8).getStr()
+            std::cerr << "creating " << 
+            rtl::OUStringToOString(indexDirName.data, RTL_TEXTENCODING_UTF8).getStr() 
             << std::endl
            );
         osl::Directory::createPath(indexDirName.data);
@@ -560,7 +560,7 @@ namespace fs
                 osl::FileStatus aStatus(osl_FileStatus_Mask_FileName | osl_FileStatus_Mask_Attributes);
                 while (aDir.getNextItem(aItem) == ::osl::FileBase::E_None)
                 {
-                    if (osl::FileBase::E_None == aItem.getFileStatus(aStatus) &&
+                    if (osl::FileBase::E_None == aItem.getFileStatus(aStatus) && 
                         aStatus.isValid(osl_FileStatus_Mask_FileName | osl_FileStatus_Mask_Attributes))
                     {
                         rtl::OUString suFilename = aStatus.getFileName();
@@ -568,7 +568,7 @@ namespace fs
                         suFullFileURL += _suDirURL;
                         suFullFileURL += rtl::OUString::createFromAscii("/");
                         suFullFileURL += suFilename;
-
+                        
                         if (aStatus.getFileType() == osl::FileStatus::Directory)
                             removeRecursive(suFullFileURL);
                         else
diff --git a/l10ntools/source/help/HelpCompiler.hxx b/l10ntools/source/help/HelpCompiler.hxx
index e300fe26f16d..ef5f3b703e6c 100644
--- a/l10ntools/source/help/HelpCompiler.hxx
+++ b/l10ntools/source/help/HelpCompiler.hxx
@@ -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
@@ -112,13 +112,13 @@ namespace fs
         path operator/(const std::string &in) const
         {
             path ret(*this);
-            HCDBG(std::cerr << "orig was " <<
+            HCDBG(std::cerr << "orig was " << 
                 rtl::OUStringToOString(ret.data, RTL_TEXTENCODING_UTF8).getStr() << std::endl);
             rtl::OString tmp(in.c_str());
             rtl::OUString ustrSystemPath(rtl::OStringToOUString(tmp, getThreadTextEncoding()));
             ret.data += rtl::OUString(sal_Unicode('/'));
             ret.data += ustrSystemPath;
-            HCDBG(std::cerr << "final is " <<
+            HCDBG(std::cerr << "final is " << 
                 rtl::OUStringToOString(ret.data, RTL_TEXTENCODING_UTF8).getStr() << std::endl);
             return ret;
         }
@@ -238,26 +238,26 @@ public:
     Stringtable *default_helptexts;
     xmlDocPtr default_doc;
 
-    StreamTable() :
-        appl_hidlist(NULL), appl_keywords(NULL), appl_helptexts(NULL), appl_doc(NULL),
-        default_hidlist(NULL), default_keywords(NULL), default_helptexts(NULL), default_doc(NULL)
+    StreamTable() : 
+        appl_hidlist(NULL), appl_keywords(NULL), appl_helptexts(NULL), appl_doc(NULL), 
+        default_hidlist(NULL), default_keywords(NULL), default_helptexts(NULL), default_doc(NULL) 
     {}
     void dropdefault()
     {
         delete default_hidlist;
         delete default_keywords;
         delete default_helptexts;
-        if (default_doc) xmlFreeDoc(default_doc);
+        if (default_doc) xmlFreeDoc(default_doc); 
     }
     void dropappl()
     {
         delete appl_hidlist;
         delete appl_keywords;
         delete appl_helptexts;
-        if (appl_doc) xmlFreeDoc(appl_doc);
+        if (appl_doc) xmlFreeDoc(appl_doc); 
     }
     ~StreamTable()
-    {
+    { 
         dropappl();
         dropdefault();
     }
@@ -265,10 +265,10 @@ public:
 
 struct HelpProcessingException
 {
-    HelpProcessingErrorClass        m_eErrorClass;
-    std::string                     m_aErrorMsg;
-    std::string                     m_aXMLParsingFile;
-    int                             m_nXMLParsingLine;
+    HelpProcessingErrorClass		m_eErrorClass;
+    std::string						m_aErrorMsg;
+    std::string						m_aXMLParsingFile;
+    int								m_nXMLParsingLine;
 
     HelpProcessingException( HelpProcessingErrorClass eErrorClass, const std::string& aErrorMsg )
         : m_eErrorClass( eErrorClass )
@@ -284,7 +284,7 @@ struct HelpProcessingException
 
 class HelpCompiler
 {
-public:
+public: 
     HelpCompiler(StreamTable &streamTable,
                 const fs::path &in_inputFile,
                 const fs::path &in_src,
@@ -293,7 +293,7 @@ public:
                 const std::string &in_lang,
                 bool in_bExtensionMode);
     bool compile( void ) throw (HelpProcessingException);
-    void addEntryToJarFile(const std::string &prefix,
+    void addEntryToJarFile(const std::string &prefix, 
         const std::string &entryName, const std::string &bytesToAdd);
     void addEntryToJarFile(const std::string &prefix,
                 const std::string &entryName, const HashSet &bytesToAdd);
diff --git a/l10ntools/source/help/HelpFileDocument.java b/l10ntools/source/help/HelpFileDocument.java
index 15e62d6c6c52..2396be650c8a 100644
--- a/l10ntools/source/help/HelpFileDocument.java
+++ b/l10ntools/source/help/HelpFileDocument.java
@@ -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
@@ -54,14 +54,14 @@ public class HelpFileDocument
         }
         return aReader;
     }
-
+    
     /** Makes a document for a File.
     */
     public static Document Document( String aModule, File aCaptionFile, File aContentFile )
         throws java.io.FileNotFoundException, java.io.UnsupportedEncodingException {
         Document doc = new Document();
 
-        // Add the path of the file as a field named "path".  Use a field that is
+        // Add the path of the file as a field named "path".  Use a field that is 
         // indexed (i.e. searchable), but don't tokenize the field into words.
         File aFile = aCaptionFile != null ? aCaptionFile : aContentFile;
         if( aFile != null )
@@ -69,7 +69,7 @@ public class HelpFileDocument
             String aPath = "#HLP#" + aModule + "/" + aFile.getName();
             doc.add(new Field("path", aPath, Field.Store.YES, Field.Index.UN_TOKENIZED));
         }
-
+        
         // Add the caption of the file to a field named "caption".  Specify a Reader,
         // so that the text of the file is tokenized and indexed, but not stored.
         doc.add( new Field( "caption", getReaderForFile( aCaptionFile ) ) );
@@ -77,7 +77,7 @@ public class HelpFileDocument
         // Add the contents of the file to a field named "content".  Specify a Reader,
         // so that the text of the file is tokenized and indexed, but not stored.
         doc.add( new Field( "content", getReaderForFile( aContentFile ) ) );
-
+        
         // return the document
         return doc;
     }
diff --git a/l10ntools/source/help/HelpIndexerTool.java b/l10ntools/source/help/HelpIndexerTool.java
index 2a49f964d48f..ba91987b028f 100644
--- a/l10ntools/source/help/HelpIndexerTool.java
+++ b/l10ntools/source/help/HelpIndexerTool.java
@@ -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
@@ -51,7 +51,7 @@ public class HelpIndexerTool
     {
     }
 
-
+    
     /**
      * @param args the command line arguments
      */
@@ -165,7 +165,7 @@ public class HelpIndexerTool
             aSrcDirStr = aDirToZipStr;
         File aCaptionFilesDir = new File( aSrcDirStr + File.separator + "caption" );
         File aContentFilesDir = new File( aSrcDirStr + File.separator + "content" );
-
+        
         try
         {
             Date start = new Date();
diff --git a/l10ntools/source/help/HelpLinker.cxx b/l10ntools/source/help/HelpLinker.cxx
index 94139f89de1e..bc0f187a0335 100644
--- a/l10ntools/source/help/HelpLinker.cxx
+++ b/l10ntools/source/help/HelpLinker.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
@@ -50,15 +50,15 @@
 class IndexerPreProcessor
 {
 private:
-    std::string             m_aModuleName;
-    fs::path                m_fsIndexBaseDir;
-    fs::path                m_fsCaptionFilesDirName;
-    fs::path                m_fsContentFilesDirName;
+    std::string				m_aModuleName;
+    fs::path				m_fsIndexBaseDir;
+    fs::path				m_fsCaptionFilesDirName;
+    fs::path				m_fsContentFilesDirName;
 
-    xsltStylesheetPtr       m_xsltStylesheetPtrCaption;
-    xsltStylesheetPtr       m_xsltStylesheetPtrContent;
+    xsltStylesheetPtr		m_xsltStylesheetPtrCaption;
+    xsltStylesheetPtr		m_xsltStylesheetPtrContent;
 
-public:
+public: 
     IndexerPreProcessor( const std::string& aModuleName, const fs::path& fsIndexBaseDir,
          const fs::path& idxCaptionStylesheet, const fs::path& idxContentStylesheet );
     ~IndexerPreProcessor();
@@ -245,9 +245,9 @@ class HelpLinker
 {
 public:
     void main(std::vector<std::string> &args,
-//      std::string* pExtensionPath = NULL, const rtl::OUString* pOfficeHelpPath = NULL )
-              std::string* pExtensionPath = NULL,
-              std::string* pDestination = NULL,
+//		std::string* pExtensionPath = NULL, const rtl::OUString* pOfficeHelpPath = NULL )
+              std::string* pExtensionPath = NULL, 
+              std::string* pDestination = NULL, 
               const rtl::OUString* pOfficeHelpPath = NULL )
 
             throw( HelpProcessingException );
@@ -283,7 +283,7 @@ private:
     void initIndexerPreProcessor();
     void link() throw( HelpProcessingException );
     void addBookmark( DB* dbBase, FILE* pFile_DBHelp, std::string thishid,
-        const std::string& fileB, const std::string& anchorB,
+        const std::string& fileB, const std::string& anchorB, 
         const std::string& jarfileB, const std::string& titleB );
 #if 0
     /**
@@ -305,7 +305,7 @@ namespace URLEncoder
     {
         const char *good = "!$&'()*+,-.=@_";
         static const char hex[17] = "0123456789ABCDEF";
-
+    
         std::string result;
         for (size_t i=0; i < rIn.length(); ++i)
         {
@@ -353,7 +353,7 @@ void HelpLinker::addBookmark( DB* dbBase, FILE* pFile_DBHelp, std::string thishi
     dataB[i++] = static_cast<unsigned char>(fileLen);
     for (size_t j = 0; j < fileB.length(); ++j)
         dataB[i++] = fileB[j];
-    if (!anchorB.empty())
+    if (!anchorB.empty()) 
     {
         dataB[i++] = '#';
         for (size_t j = 0; j < anchorB.length(); ++j)
@@ -393,7 +393,7 @@ void HelpLinker::initIndexerPreProcessor()
 }
 
 /**
-*
+* 
 */
 void HelpLinker::link() throw( HelpProcessingException )
 {
@@ -434,7 +434,7 @@ void HelpLinker::link() throw( HelpProcessingException )
 #ifndef DBHELP_ONLY
     fs::path helpTextFileName(indexDirParentName / (mod + ".ht"));
     db_create(&helpText,0,0);
-    helpText->open(helpText, NULL, helpTextFileName.native_file_string().c_str(), NULL, DB_BTREE,
+    helpText->open(helpText, NULL, helpTextFileName.native_file_string().c_str(), NULL, DB_BTREE, 
         DB_CREATE | DB_TRUNCATE, 0644);
 #endif
 
@@ -446,7 +446,7 @@ void HelpLinker::link() throw( HelpProcessingException )
 #ifndef DBHELP_ONLY
     fs::path dbBaseFileName(indexDirParentName / (mod + ".db"));
     db_create(&dbBase,0,0);
-    dbBase->open(dbBase, NULL, dbBaseFileName.native_file_string().c_str(), NULL, DB_BTREE,
+    dbBase->open(dbBase, NULL, dbBaseFileName.native_file_string().c_str(), NULL, DB_BTREE, 
         DB_CREATE | DB_TRUNCATE, 0644);
 #endif
 
@@ -458,7 +458,7 @@ void HelpLinker::link() throw( HelpProcessingException )
     DB* keyWord(0);
     fs::path keyWordFileName(indexDirParentName / (mod + ".key"));
     db_create(&keyWord,0,0);
-    keyWord->open(keyWord, NULL, keyWordFileName.native_file_string().c_str(), NULL, DB_BTREE,
+    keyWord->open(keyWord, NULL, keyWordFileName.native_file_string().c_str(), NULL, DB_BTREE, 
         DB_CREATE | DB_TRUNCATE, 0644);
 #endif
 
@@ -491,7 +491,7 @@ void HelpLinker::link() throw( HelpProcessingException )
     if( !bExtensionMode )
     {
 #ifndef OS2 // YD @TODO@ crashes libc runtime :-(
-        std::cout << "Making " << outputFile.native_file_string() <<
+        std::cout << "Making " << outputFile.native_file_string() << 
             " from " << helpFiles.size() << " input files" << std::endl;
 #endif
     }
@@ -505,7 +505,7 @@ void HelpLinker::link() throw( HelpProcessingException )
             std::cout << ".";
             std::cout.flush();
         }
-
+         
         // process one file
         // streamTable contains the streams in the hzip file
         StreamTable streamTable;
@@ -537,8 +537,8 @@ void HelpLinker::link() throw( HelpProcessingException )
             langsourceRoot.append('/' + lang + '/');
             xhpFile = fs::path(xhpFileName, fs::native);
         }
-
-        HelpCompiler hc( streamTable, xhpFile, langsourceRoot,
+         
+        HelpCompiler hc( streamTable, xhpFile, langsourceRoot, 
             embeddStylesheet, module, lang, bExtensionMode );
 
         HCDBG(std::cerr << "before compile of " << xhpFileName << std::endl);
@@ -548,7 +548,7 @@ void HelpLinker::link() throw( HelpProcessingException )
         if (!success && !bExtensionMode)
         {
             std::stringstream aStrStream;
-            aStrStream <<
+            aStrStream << 
                 "\nERROR: compiling help particle '"
                     << xhpFileName
                     << "' for language '"
@@ -627,13 +627,13 @@ void HelpLinker::link() throw( HelpProcessingException )
                 // std::cerr << hzipFileName << std::endl;
                 const LinkedList& ll = enumer->second;
                 LinkedList::const_iterator aOtherEnd = ll.end();
-                for (LinkedList::const_iterator llIter = ll.begin();
+                for (LinkedList::const_iterator llIter = ll.begin(); 
                     llIter != aOtherEnd; ++llIter)
                 {
                         helpKeyword.insert(*llIter, totalId);
                 }
             }
-
+                
         }
 
         // and last the helptexts
@@ -686,7 +686,7 @@ void HelpLinker::link() throw( HelpProcessingException )
             if (document)
             {
                 std::string temp = module;
-                std::transform (temp.begin(), temp.end(), temp.begin(), tolower);
+                std::transform (temp.begin(), temp.end(), temp.begin(), tolower); 
                 m_pIndexerPreProcessor->processDocument(document, URLEncoder::encode(documentPath) );
             }
         }
@@ -695,7 +695,7 @@ void HelpLinker::link() throw( HelpProcessingException )
     if( !bExtensionMode )
         std::cout << std::endl;
 
-    }   // try
+    }	// try
     catch( HelpProcessingException& )
     {
         // catch HelpProcessingException to avoid locking data bases
@@ -758,7 +758,7 @@ void HelpLinker::link() throw( HelpProcessingException )
 
 
 void HelpLinker::main( std::vector<std::string> &args,
-                       std::string* pExtensionPath, std::string* pDestination,
+                       std::string* pExtensionPath, std::string* pDestination,  
                        const rtl::OUString* pOfficeHelpPath )
     throw( HelpProcessingException )
 {
@@ -799,7 +799,7 @@ void HelpLinker::main( std::vector<std::string> &args,
         if (args[i].compare("-src") == 0)
         {
             ++i;
-            if (i >= args.size())
+            if (i >= args.size()) 
             {
                 std::stringstream aStrStream;
                 aStrStream << "sourceroot missing" << std::endl;
@@ -809,7 +809,7 @@ void HelpLinker::main( std::vector<std::string> &args,
             if( !bExtensionMode )
                 sourceRoot = fs::path(args[i], fs::native);
         }
-        else if (args[i].compare("-sty") == 0)
+        else if (args[i].compare("-sty") == 0) 
         {
             ++i;
             if (i >= args.size())
@@ -820,11 +820,11 @@ void HelpLinker::main( std::vector<std::string> &args,
             }
 
             embeddStylesheet = fs::path(args[i], fs::native);
-        }
-        else if (args[i].compare("-zipdir") == 0)
+        } 
+        else if (args[i].compare("-zipdir") == 0) 
         {
             ++i;
-            if (i >= args.size())
+            if (i >= args.size()) 
             {
                 std::stringstream aStrStream;
                 aStrStream << "idxtemp missing" << std::endl;
@@ -832,11 +832,11 @@ void HelpLinker::main( std::vector<std::string> &args,
             }
 
             zipdir = fs::path(args[i], fs::native);
-        }
-        else if (args[i].compare("-idxcaption") == 0)
+        } 
+        else if (args[i].compare("-idxcaption") == 0) 
         {
             ++i;
-            if (i >= args.size())
+            if (i >= args.size()) 
             {
                 std::stringstream aStrStream;
                 aStrStream << "idxcaption stylesheet missing" << std::endl;
@@ -844,11 +844,11 @@ void HelpLinker::main( std::vector<std::string> &args,
             }
 
             idxCaptionStylesheet = fs::path(args[i], fs::native);
-        }
-        else if (args[i].compare("-idxcontent") == 0)
+        } 
+        else if (args[i].compare("-idxcontent") == 0) 
         {
             ++i;
-            if (i >= args.size())
+            if (i >= args.size()) 
             {
                 std::stringstream aStrStream;
                 aStrStream << "idxcontent stylesheet missing" << std::endl;
@@ -868,8 +868,8 @@ void HelpLinker::main( std::vector<std::string> &args,
             }
 
             outputFile = fs::path(args[i], fs::native);
-        }
-        else if (args[i].compare("-mod") == 0)
+        } 
+        else if (args[i].compare("-mod") == 0) 
         {
             ++i;
             if (i >= args.size())
@@ -880,7 +880,7 @@ void HelpLinker::main( std::vector<std::string> &args,
             }
 
             module = args[i];
-        }
+        } 
         else if (args[i].compare("-lang") == 0)
         {
             ++i;
@@ -892,7 +892,7 @@ void HelpLinker::main( std::vector<std::string> &args,
             }
 
             lang = args[i];
-        }
+        } 
         else if (args[i].compare("-hid") == 0)
         {
             ++i;
@@ -904,7 +904,7 @@ void HelpLinker::main( std::vector<std::string> &args,
             }
 
             hid = args[i];
-        }
+        } 
         else if (args[i].compare("-add") == 0)
         {
             std::string addFile, addFileUnderPath;
@@ -928,7 +928,7 @@ void HelpLinker::main( std::vector<std::string> &args,
             if (!addFileUnderPath.empty() && !addFile.empty())
                 additionalFiles[addFileUnderPath] = addFile;
         }
-        else
+        else 
             helpFiles.push_back(args[i]);
         ++i;
     }
@@ -1054,7 +1054,7 @@ extern "C" void StructuredXMLErrorFunction(void *userData, xmlErrorPtr error)
     GpXMLParsingException = pException;
 
     // Reset error handler
-    xmlSetStructuredErrorFunc( NULL, NULL );
+    xmlSetStructuredErrorFunc( NULL, NULL ); 
 }
 
 HelpProcessingErrorInfo& HelpProcessingErrorInfo::operator=( const struct HelpProcessingException& e )
@@ -1115,7 +1115,7 @@ HELPLINKER_DLLPUBLIC bool compileExtensionHelp
     std::string aStdStrDestination = pDestination;
 
     // Set error handler
-    xmlSetStructuredErrorFunc( NULL, (xmlStructuredErrorFunc)StructuredXMLErrorFunction );
+    xmlSetStructuredErrorFunc( NULL, (xmlStructuredErrorFunc)StructuredXMLErrorFunction ); 
     try
     {
         HelpLinker* pHelpLinker = new HelpLinker();
@@ -1137,7 +1137,7 @@ HELPLINKER_DLLPUBLIC bool compileExtensionHelp
         bSuccess = false;
     }
     // Reset error handler
-    xmlSetStructuredErrorFunc( NULL, NULL );
+    xmlSetStructuredErrorFunc( NULL, NULL ); 
 
     // i83624: Tree files
     ::rtl::OUString aTreeFileURL = aExtensionLanguageRoot;
@@ -1146,7 +1146,7 @@ HELPLINKER_DLLPUBLIC bool compileExtensionHelp
     osl::FileBase::RC rcGet = osl::DirectoryItem::get( aTreeFileURL, aTreeFileItem );
     osl::FileStatus aFileStatus( FileStatusMask_FileSize );
     if( rcGet == osl::FileBase::E_None &&
-        aTreeFileItem.getFileStatus( aFileStatus ) == osl::FileBase::E_None &&
+        aTreeFileItem.getFileStatus( aFileStatus ) == osl::FileBase::E_None && 
         aFileStatus.isValid( FileStatusMask_FileSize ) )
     {
         sal_uInt64 ret, len = aFileStatus.getFileSize();
@@ -1169,7 +1169,7 @@ HELPLINKER_DLLPUBLIC bool compileExtensionHelp
             bSuccess = false;
         }
 
-        XML_ParserFree( parser );
+        XML_ParserFree( parser );		
         delete[] s;
     }
 
diff --git a/l10ntools/source/help/compilehelp.hxx b/l10ntools/source/help/compilehelp.hxx
index 9c59083bf038..abc70da54a38 100644
--- a/l10ntools/source/help/compilehelp.hxx
+++ b/l10ntools/source/help/compilehelp.hxx
@@ -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
@@ -44,17 +44,17 @@
 enum HelpProcessingErrorClass
 {
     HELPPROCESSING_NO_ERROR,
-    HELPPROCESSING_GENERAL_ERROR,       // Missing files, options etc.
-    HELPPROCESSING_INTERNAL_ERROR,      // Unexpected problems
-    HELPPROCESSING_XMLPARSING_ERROR     // Errors thrown by libxml
+    HELPPROCESSING_GENERAL_ERROR,		// Missing files, options etc.
+    HELPPROCESSING_INTERNAL_ERROR,		// Unexpected problems
+    HELPPROCESSING_XMLPARSING_ERROR		// Errors thrown by libxml
 };
 
 struct HelpProcessingErrorInfo
 {
-    HelpProcessingErrorClass        m_eErrorClass;
-    rtl::OUString                   m_aErrorMsg;
-    rtl::OUString                   m_aXMLParsingFile;
-    sal_Int32                       m_nXMLParsingLine;
+    HelpProcessingErrorClass		m_eErrorClass;
+    rtl::OUString					m_aErrorMsg;
+    rtl::OUString					m_aXMLParsingFile;
+    sal_Int32						m_nXMLParsingLine;
 
     HelpProcessingErrorInfo( void )
         : m_eErrorClass( HELPPROCESSING_NO_ERROR )
diff --git a/l10ntools/source/helpex.cxx b/l10ntools/source/helpex.cxx
index 49a59266a85d..702062ddbe25 100644
--- a/l10ntools/source/helpex.cxx
+++ b/l10ntools/source/helpex.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
@@ -34,18 +34,18 @@
 #include "helpmerge.hxx"
 
 // defines to parse command line
-#define STATE_NON               0x0001
-#define STATE_INPUT             0x0002
-#define STATE_OUTPUT            0x0003
-#define STATE_PRJ               0x0004
-#define STATE_ROOT              0x0005
-#define STATE_SDFFILE           0x0006
-#define STATE_ERRORLOG          0x0007
-#define STATE_BREAKHELP         0x0008
-#define STATE_UNMERGE           0x0009
-#define STATE_UTF8              0x000A
-#define STATE_LANGUAGES         0x000B
-#define STATE_FORCE_LANGUAGES   0x000C
+#define STATE_NON  		        0x0001
+#define STATE_INPUT		        0x0002
+#define STATE_OUTPUT	        0x0003
+#define STATE_PRJ		        0x0004
+#define STATE_ROOT		        0x0005
+#define STATE_SDFFILE	        0x0006
+#define STATE_ERRORLOG	        0x0007
+#define STATE_BREAKHELP	        0x0008
+#define STATE_UNMERGE	        0x0009
+#define STATE_UTF8		        0x000A
+#define STATE_LANGUAGES	        0x000B
+#define STATE_FORCE_LANGUAGES   0x000C 
 #define STATE_OUTPUTX           0xfe
 #define STATE_OUTPUTY           0xff
 
@@ -61,7 +61,6 @@ ByteString sOutputFile;
 ByteString sOutputFileX;
 ByteString sOutputFileY;
 ByteString sSDFFile;
-bool bQuiet;
 
 /*****************************************************************************/
 BOOL ParseCommandLine( int argc, char* argv[])
@@ -73,7 +72,6 @@ BOOL ParseCommandLine( int argc, char* argv[])
     bUTF8 = TRUE;
     sPrj = "";
     sPrjRoot = "";
-    bQuiet = false;
     Export::sLanguages = "";
     Export::sForcedLanguages = "";
 
@@ -98,9 +96,9 @@ BOOL ParseCommandLine( int argc, char* argv[])
             nState = STATE_PRJ; // next token specifies the cur. project
         }
          else if ( ByteString( argv[ i ]).ToUpperAscii() == "-LF" ) {
-            nState = STATE_FORCE_LANGUAGES;
+            nState = STATE_FORCE_LANGUAGES; 
         }
-
+       
         else if ( ByteString( argv[ i ]).ToUpperAscii() == "-R" ) {
             nState = STATE_ROOT; // next token specifies path to project root
         }
@@ -111,9 +109,6 @@ BOOL ParseCommandLine( int argc, char* argv[])
             nState = STATE_ERRORLOG;
             bErrorLog = FALSE;
         }
-        else if ( ByteString( argv[ i ] ).ToUpperAscii() == "-QQ" ) {
-            bQuiet = true;
-        }
         else if ( ByteString( argv[ i ]).ToUpperAscii() == "-UTF8" ) {
             nState = STATE_UTF8;
             bUTF8 = TRUE;
@@ -128,7 +123,7 @@ BOOL ParseCommandLine( int argc, char* argv[])
         else {
             switch ( nState ) {
                 case STATE_NON: {
-                    return FALSE;   // no valid command line
+                    return FALSE;	// no valid command line
                 }
                 //break;
                 case STATE_INPUT: {
@@ -150,7 +145,7 @@ BOOL ParseCommandLine( int argc, char* argv[])
                 break;
                 case STATE_PRJ: {
                     sPrj = argv[ i ];
-//                  sPrj.ToLowerAscii(); // the project
+//					sPrj.ToLowerAscii(); // the project
                 }
                 break;
                 case STATE_ROOT: {
@@ -188,13 +183,12 @@ BOOL ParseCommandLine( int argc, char* argv[])
 void Help()
 /*****************************************************************************/
 {
-    fprintf( stdout, "Syntax: HELPEX[-p Prj][-r PrjRoot]-i FileIn ( -o FileOut | -x path -y relfile )[-m DataBase][-e][-b][-u][-L l1,l2,...][-QQ] -LF l1,l2 \n" );
+    fprintf( stdout, "Syntax: HELPEX[-p Prj][-r PrjRoot]-i FileIn ( -o FileOut | -x path -y relfile )[-m DataBase][-e][-b][-u][-L l1,l2,...] -LF l1,l2 \n" );
     fprintf( stdout, " Prj:      Project\n" );
     fprintf( stdout, " PrjRoot:  Path to project root (..\\.. etc.)\n" );
     fprintf( stdout, " FileIn:   Source file (*.lng)\n" );
     fprintf( stdout, " FileOut:  Destination file (*.*)\n" );
     fprintf( stdout, " DataBase: Mergedata (*.sdf)\n" );
-    fprintf( stdout, " -QQ: quiet output\n" );
     fprintf( stdout, " -L: Restrict the handled languages. l1,l2,... are elements of (en-US,fr,de...)\n" );
     fprintf( stdout, "     A fallback language can be defined like this: l1=f1.\n" );
     fprintf( stdout, "     f1, f2,... are also elements of (en-US,fr,de...)\n" );
@@ -222,19 +216,19 @@ int _cdecl main( int argc, char *argv[] )
     //sal_uInt32 startfull = Export::startMessure();
 
     bool hasInputList = sInputFile.GetBuffer()[0]=='@';
-//    printf("x = %s , y = %s , o = %s\n", sOutputFileX.GetBuffer(),  sOutputFileY.GetBuffer() , sOutputFile.GetBuffer() );
+//    printf("x = %s , y = %s , o = %s\n", sOutputFileX.GetBuffer(),  sOutputFileY.GetBuffer() , sOutputFile.GetBuffer() ); 
     bool hasNoError = true;
-
+    
     if ( sOutputFile.Len() ){                                               // Merge single file ?
         //printf("DBG: Inputfile = %s\n",sInputFile.GetBuffer());
         HelpParser aParser( sInputFile, bUTF8 , false );
-
+        
         if ( bMergeMode )
         {
-
+            
             //sal_uInt64 startreadloc = Export::startMessure();
-            MergeDataFile aMergeDataFile( sSDFFile, sInputFile , FALSE, RTL_TEXTENCODING_MS_1252 );
-            //MergeDataFile aMergeDataFile( sSDFFile, sInputFile , FALSE, RTL_TEXTENCODING_MS_1252, false );
+            MergeDataFile aMergeDataFile( sSDFFile, sInputFile , FALSE, RTL_TEXTENCODING_MS_1252 ); 
+            //MergeDataFile aMergeDataFile( sSDFFile, sInputFile , FALSE, RTL_TEXTENCODING_MS_1252, false ); 
             //Export::stopMessure( ByteString("read localize.sdf") , startreadloc );
 
             hasNoError = aParser.Merge( sSDFFile, sOutputFile , Export::sLanguages , aMergeDataFile );
@@ -243,14 +237,14 @@ int _cdecl main( int argc, char *argv[] )
             hasNoError = aParser.CreateSDF( sOutputFile, sPrj, sPrjRoot, sInputFile, new XMLFile( '0' ), "help" );
     }else if ( sOutputFileX.Len() && sOutputFileY.Len() && hasInputList ) {  // Merge multiple files ?
         if ( bMergeMode ){
-
+            
             ifstream aFStream( sInputFile.Copy( 1 , sInputFile.Len() ).GetBuffer() , ios::in );
-
+                                                                                                                  
             if( !aFStream ){
                 cerr << "ERROR: - helpex - Can't open the file " << sInputFile.Copy( 1 , sInputFile.Len() ).GetBuffer() << "\n";
                 exit(-1);
             }
-
+        
             vector<ByteString> filelist;
             rtl::OStringBuffer filename;
             sal_Char aChar;
@@ -261,24 +255,24 @@ int _cdecl main( int argc, char *argv[] )
                 else
                     filename.append( aChar );
             }
-            if( filename.getLength() > 0 )
+            if( filename.getLength() > 0 ) 
                 filelist.push_back( ByteString ( filename.makeStringAndClear().getStr() ) );
-
+            
             aFStream.close();
             ByteString sHelpFile(""); // dummy
             //MergeDataFile aMergeDataFile( sSDFFile, sHelpFile , FALSE, RTL_TEXTENCODING_MS_1252, false );
-            MergeDataFile aMergeDataFile( sSDFFile, sHelpFile , FALSE, RTL_TEXTENCODING_MS_1252 );
+            MergeDataFile aMergeDataFile( sSDFFile, sHelpFile , FALSE, RTL_TEXTENCODING_MS_1252 ); 
 
             //aMergeDataFile.Dump();
             std::vector<ByteString> aLanguages;
             HelpParser::parse_languages( aLanguages , aMergeDataFile );
-
+            
             bool bCreateDir = true;
             for( vector<ByteString>::iterator pos = filelist.begin() ; pos != filelist.end() ; ++pos )
             {
-                sHelpFile = *pos;
+                sHelpFile = *pos;   
                 cout << ".";cout.flush();
-
+                
                 HelpParser aParser( sHelpFile , bUTF8 , true );
                 hasNoError = aParser.Merge( sSDFFile , sOutputFileX , sOutputFileY , true , aLanguages , aMergeDataFile , bCreateDir );
                 bCreateDir = false;
@@ -286,11 +280,11 @@ int _cdecl main( int argc, char *argv[] )
         }
     } else
         cerr << "helpex ERROR: Wrong input parameters!\n";
-
+    
     //Export::stopMessure( ByteString("full cycle") , startfull );
     if( hasNoError )
         return 0;
-    else
+    else 
         return 1;
 }
 #endif
diff --git a/l10ntools/source/helpmerge.cxx b/l10ntools/source/helpmerge.cxx
index 0ab7e6eb5c2e..19f7c4a94fb9 100644
--- a/l10ntools/source/helpmerge.cxx
+++ b/l10ntools/source/helpmerge.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
@@ -123,14 +123,14 @@ bool HelpParser::CreateSDF(
     const ByteString &rSDFFile_in, const ByteString &rPrj_in,const ByteString &rRoot_in,
     const ByteString &sHelpFile, XMLFile *pXmlFile, const ByteString &rGsi1){
     // GSI File constants
-    static const String GSI_SEQUENCE1( String::CreateFromAscii("\t0\t") );
-    static const String GSI_SEQUENCE2( String::CreateFromAscii("\t\t\t0\t")     );
-    static const String GSI_TAB      ( String::CreateFromAscii("\t")            );
-    static const String GSI_SEQUENCE4( String::CreateFromAscii("\t\t\t\t")      );
-    static const String ret          ( String::CreateFromAscii("\n")            );
-    static const String ret_char     ( String::CreateFromAscii("")              );
-    static const String tab          ( String::CreateFromAscii("\t")            );
-    static const String tab_char     ( String::CreateFromAscii("")              );
+    static const String GSI_SEQUENCE1( String::CreateFromAscii("\t0\t")	);
+    static const String GSI_SEQUENCE2( String::CreateFromAscii("\t\t\t0\t")		);
+    static const String GSI_TAB      ( String::CreateFromAscii("\t")			);
+    static const String GSI_SEQUENCE4( String::CreateFromAscii("\t\t\t\t")		);
+    static const String ret			 ( String::CreateFromAscii("\n")			);
+    static const String ret_char	 ( String::CreateFromAscii("")				);
+    static const String tab			 ( String::CreateFromAscii("\t")			);
+    static const String tab_char	 ( String::CreateFromAscii("")				);
 
     SimpleXMLParser aParser;
     String sUsedTempFile;
@@ -159,7 +159,7 @@ bool HelpParser::CreateSDF(
 
     String strFullPath( fullFilePath.GetBuffer() , RTL_TEXTENCODING_ASCII_US );
 
-    //printf( "%s\n", fullFilePath.GetBuffer() );
+    //printf( "%s\n", fullFilePath.GetBuffer() ); 
     std::auto_ptr <XMLFile> file ( aParser.Execute( strFullPath , sXmlFile, pXmlFile ) );
 
     if(file.get() == NULL){
@@ -181,17 +181,6 @@ bool HelpParser::CreateSDF(
 
     ByteString sActFileName = makeAbsolutePath( sHelpFile , rRoot_in );
 
-/*    DirEntry aEntry( String( sHelpFile, RTL_TEXTENCODING_ASCII_US ));
-    aEntry.ToAbs();
-    String sFullEntry = aEntry.GetFull();
-    aEntry += DirEntry( String( "..", RTL_TEXTENCODING_ASCII_US ));
-    aEntry += DirEntry( rRoot_in );
-    ByteString sPrjEntry( aEntry.GetFull(), gsl_getSystemTextEncoding());
-    ByteString sActFileName(
-    sFullEntry.Copy( sPrjEntry.Len() + 1 ), gsl_getSystemTextEncoding());
-
-    sActFileName.SearchAndReplaceAll( "/", "\\" );
-*/
     XMLHashMap*  aXMLStrHM   = file->GetStrings();
     LangHashMap* pElem;
     XMLElement*  pXMLElement  = NULL;
@@ -227,7 +216,7 @@ bool HelpParser::CreateSDF(
                 FillInFallbacks( *pElem , sCur );
             }
             pXMLElement = (*pElem)[ sCur ];
-
+              
             if( pXMLElement != NULL )
             {
                 OUString data = pXMLElement->ToOUString();
@@ -237,22 +226,22 @@ bool HelpParser::CreateSDF(
 
                 data = OUString( sTmp );
                 sBuffer.append( sOUPrj );
-                sBuffer.append( GSI_TAB );              //"\t";
+                sBuffer.append( GSI_TAB );				//"\t";
                 if ( rRoot_in.Len())
                     sBuffer.append( sOUActFileName );
-                   sBuffer.append( GSI_SEQUENCE1 );     //"\t0\t";
-                   sBuffer.append( sOUGsi1 );               //"help";
+                   sBuffer.append( GSI_SEQUENCE1 );		//"\t0\t";
+                   sBuffer.append( sOUGsi1 );		        //"help";
                    sBuffer.append( GSI_TAB );              //"\t";
-                ByteString sID = posm->first;           // ID
+                ByteString sID = posm->first;			// ID
                 sBuffer.append( OUString( sID.GetBuffer() , sID.Len() , RTL_TEXTENCODING_UTF8 ) );
                 sBuffer.append( GSI_TAB ); //"\t";
                    ByteString sOldRef = pXMLElement->GetOldref(); // oldref
                 sBuffer.append( OUString(sOldRef.GetBuffer() , sOldRef.Len() , RTL_TEXTENCODING_UTF8 ) );
-                   sBuffer.append( GSI_SEQUENCE2 );     //"\t\t\t0\t";
+                   sBuffer.append( GSI_SEQUENCE2 );		//"\t\t\t0\t";
                 sBuffer.append( OUString( sCur.GetBuffer() , sCur.Len() , RTL_TEXTENCODING_UTF8 ) );
-                   sBuffer.append( GSI_TAB );               //"\t";
+                   sBuffer.append( GSI_TAB );				//"\t";
                 sBuffer.append( data );
-                  sBuffer.append( GSI_SEQUENCE4 );      //"\t\t\t\t";
+                  sBuffer.append( GSI_SEQUENCE4 );		//"\t\t\t\t";
                 sBuffer.append( sOUTimeStamp );
                 ByteString sOut( sBuffer.makeStringAndClear().getStr() , RTL_TEXTENCODING_UTF8 );
                 //if( !sCur.EqualsIgnoreCaseAscii("de") ||( sCur.EqualsIgnoreCaseAscii("de") && !Export::isMergingGermanAllowed( rPrj_in ) ) )
@@ -262,11 +251,11 @@ bool HelpParser::CreateSDF(
                 pXMLElement=NULL;
             }else fprintf(stdout,"\nDBG: NullPointer in HelpParser::CreateSDF , Language %s\n",sCur.GetBuffer() );
         }
-
+    
     }
     //Dump(aXMLStrHM);
     aSDFStream.Close();
-
+    
     if( !sUsedTempFile.EqualsIgnoreCaseAscii( "" ) ){
         DirEntry aTempFile( sUsedTempFile );
         aTempFile.Kill();
@@ -288,13 +277,13 @@ ByteString HelpParser::makeAbsolutePath( const ByteString& sHelpFile , const Byt
     sActFileName.SearchAndReplaceAll( "/", "\\" );
     return sActFileName;
 }
-bool HelpParser::Merge( const ByteString &rSDFFile, const ByteString &rDestinationFile  ,
+bool HelpParser::Merge( const ByteString &rSDFFile, const ByteString &rDestinationFile  , 
         ByteString& sLanguage , MergeDataFile& aMergeDataFile )
 {
 
     (void) rSDFFile;
     bool hasNoError = true;
-
+    
     SimpleXMLParser aParser;
 
     String sUsedTempFile;
@@ -316,7 +305,7 @@ bool HelpParser::Merge( const ByteString &rSDFFile, const ByteString &rDestinati
     OUString sOUHelpFile( sXmlFile );
     String fullFilePath;
     DirEntry aFile( sXmlFile );
-
+ 
     XMLFile* xmlfile = ( aParser.Execute( aFile.GetFull() , sOUHelpFile, new XMLFile( '0' ) ) );
     printf("Dest file %s\n",rDestinationFile.GetBuffer());
     hasNoError = MergeSingleFile( xmlfile , aMergeDataFile , sLanguage , rDestinationFile );
@@ -337,13 +326,13 @@ bool ByteStringLess( const ByteString& rKey1, const ByteString& rKey2 )  {
 
 void HelpParser::parse_languages( std::vector<ByteString>& aLanguages , MergeDataFile& aMergeDataFile ){
     std::vector<ByteString> aTmp;
-
-    const ByteString DE     ("de");
-    const ByteString ENUS   ("en-US");
+    
+    const ByteString DE		("de");
+    const ByteString ENUS	("en-US");
     static const ByteString ALL( "ALL" );
 
     Export::InitLanguages( false );
-
+    
     if( Export::sLanguages.EqualsIgnoreCaseAscii( ALL ) )
     {
         aLanguages = aMergeDataFile.GetLanguages();
@@ -374,8 +363,8 @@ bool HelpParser::Merge(
     const std::vector<ByteString>& aLanguages , MergeDataFile& aMergeDataFile , bool bCreateDir )
 {
 
-
-    (void) rSDFFile ;
+    
+    (void) rSDFFile ; 
     bool hasNoError = true;
     SimpleXMLParser aParser;
     String sUsedTempFile;
@@ -397,7 +386,7 @@ bool HelpParser::Merge(
         sXmlFile = String( sHelpFile , RTL_TEXTENCODING_ASCII_US );
     }
 
-
+    
     OUString sOUHelpFile( sXmlFile );
       String fullFilePath;
     DirEntry aFile( sXmlFile );
@@ -416,20 +405,20 @@ bool HelpParser::Merge(
     ByteString sCur;
     for( unsigned int n = 0; n < aLanguages.size(); n++ ){
         sCur = aLanguages[ n ];
-
+        
         ByteString sFilepath;
-        if( bISO )  sFilepath = GetOutpath( rPathX , sCur , rPathY );
+        if( bISO )	sFilepath = GetOutpath( rPathX , sCur , rPathY );
         else        sFilepath = rPathX;
         if( bCreateDir ) MakeDir( sFilepath );
-
+            
         XMLFile* file = new XMLFile( *xmlfile );
         sFilepath.Append( sHelpFile );
-        hasNoError = MergeSingleFile( file , aMergeDataFile , sCur , sFilepath );
+        hasNoError = MergeSingleFile( file , aMergeDataFile , sCur , sFilepath );			
         delete file;
-
-        if( !hasNoError ) return false;         // Stop on error
+        
+        if( !hasNoError ) return false;			// Stop on error
      }
-
+       
     if( !sUsedTempFile.EqualsIgnoreCaseAscii( "" ) )
     {
         DirEntry aTempFile( sUsedTempFile );
@@ -443,47 +432,47 @@ bool HelpParser::MergeSingleFile( XMLFile* file , MergeDataFile& aMergeDataFile
                                   ByteString sPath )
 {
     file->Extract();
-
+    
        XMLHashMap*   aXMLStrHM     = file->GetStrings();
     LangHashMap*  aLangHM;
-    static  ResData pResData( "","","");
+    static	ResData	pResData( "","","");
     pResData.sResTyp   = "help";
 
     ByteString sTmp             = Export::sLanguages;
-
+    
     sTmp.EraseLeadingAndTrailingChars();
-
+    
     for(XMLHashMap::iterator pos=aXMLStrHM->begin();pos!=aXMLStrHM->end();++pos)    // Merge every l10n related string
     {
-
+        
         aLangHM             = pos->second;
         //printf("*********************DUMPING HASHMAP***************************************");
         //Dump( aXMLStrHM );
         //printf("DBG: sHelpFile = %s\n",sHelpFile.GetBuffer() );
-
+        
         pResData.sGId      =  pos->first;
         pResData.sFilename  =  sHelpFile;
 
         ProcessHelp( aLangHM , sLanguage, &pResData , aMergeDataFile );
      }
 
-
+    
     // Init temp and target file
     ByteString sTempFile;
     ByteString sTargetFile( sPath );
     ByteString sTempFileCopy;
-
+    
     static const ByteString INPATH = Export::GetEnv( "INPATH" );
     Export::getRandomName( sPath , sTempFile , INPATH );
       Export::getRandomName( sPath , sTempFileCopy , INPATH );
     // Write in the temp file
-    bool hasNoError = file->Write ( sTempFile );
+    bool hasNoError = file->Write ( sTempFile ); 
     if( !hasNoError )
     {
         cerr << "ERROR: file->Write failed\n";
         return false;
     }
-
+    
     DirEntry aTmp( sTempFile );
     DirEntry aTmp2( sTempFileCopy );
     DirEntry aTar( sTargetFile );
@@ -501,8 +490,8 @@ bool HelpParser::MergeSingleFile( XMLFile* file , MergeDataFile& aMergeDataFile
             return false;
         }
     }
-    //remove( sTargetFile.GetBuffer() );
-
+    //remove( sTargetFile.GetBuffer() ); 
+    
     FileStat aFSTest( aTar );
     if( aFSTest.GetSize() < 1 )
     {
@@ -544,7 +533,7 @@ bool HelpParser::MergeSingleFile( XMLFile* file , MergeDataFile& aMergeDataFile
 
         //cout << "mv2 " << sTempFileCopy.GetBuffer() << " " << sTargetFile.GetBuffer() << "\n";
         //cout << "rc -> " << rc << " filesize -> " << aFS.GetSize() << "\n";
-
+ 
 // Windows rename returns -1 if the file already exits
 //#ifdef WNT
 //        if( aFS.GetSize() < 1 )
@@ -558,13 +547,13 @@ bool HelpParser::MergeSingleFile( XMLFile* file , MergeDataFile& aMergeDataFile
             if( aFS.GetSize() < 1 )
                 aTar.Kill();
             return false;
-        }
+        }           
     }
     aTmp.Kill();
     aTmp2.Kill();
-
+ 
     return true;
-}
+}		
 
 ByteString HelpParser::GetOutpath( const ByteString& rPathX , const ByteString& sCur , const ByteString& rPathY ){
     ByteString testpath = rPathX;
@@ -617,7 +606,7 @@ void HelpParser::ProcessHelp( LangHashMap* aLangHM , const ByteString& sCur , Re
 #ifdef MERGE_SOURCE_LANGUAGES
     if( true ){                  // Merge en-US!
 #else
-    if( !sCur.EqualsIgnoreCaseAscii("en-US") ){
+    if( !sCur.EqualsIgnoreCaseAscii("en-US") ){   
 #endif
         pXMLElement = (*aLangHM)[ "en-US" ];
         if( pXMLElement == NULL )
@@ -631,12 +620,12 @@ void HelpParser::ProcessHelp( LangHashMap* aLangHM , const ByteString& sCur , Re
             pResData->sId     =  sLId;
 
             pEntrys = aMergeDataFile.GetPFormEntrys( pResData );
-            if( pEntrys != NULL)
+            if( pEntrys != NULL) 
             {
                 ByteString sNewText;
                 pEntrys->GetText( sNewText, STRING_TYP_TEXT, sCur , true );
                 sNewdata = String(  sNewText , RTL_TEXTENCODING_UTF8 );
-                if ( sNewdata.Len())
+                if ( sNewdata.Len()) 
                 {
                     if( pXMLElement != NULL )
                     {
@@ -645,7 +634,7 @@ void HelpParser::ProcessHelp( LangHashMap* aLangHM , const ByteString& sCur , Re
                         pXMLElement->AddChild( data );
                         aLangHM->erase( sCur );
                     }
-                }
+                } 
             }else if( pResData == NULL ){fprintf(stdout,"Can't find GID=%s LID=%s TYP=%s\n",pResData->sGId.GetBuffer(),pResData->sId.GetBuffer(),pResData->sResTyp.GetBuffer());}
             pXMLElement->ChangeLanguageTag( String( sCur , RTL_TEXTENCODING_ASCII_US) );
         }
@@ -661,7 +650,7 @@ void HelpParser::Process( LangHashMap* aLangHM , const ByteString& sCur , ResDat
     XMLParentNode *parent     = NULL;
     XMLDefault    *xmldefault = NULL;
 
-    short         curLang     = 0;
+    short		  curLang     = 0;
     String        sNewdata;
     bool          isFallback  = false;
     ByteString sLId;
@@ -672,7 +661,7 @@ void HelpParser::Process( LangHashMap* aLangHM , const ByteString& sCur , ResDat
 #ifdef MERGE_SOURCE_LANGUAGES
     if( true ){                  // Merge en-US!
 #else
-    if( !sCur.EqualsIgnoreCaseAscii("en-US") ){
+    if( !sCur.EqualsIgnoreCaseAscii("en-US") ){   
 #endif
         pXMLElement = (*aLangHM)[ sCur ];
         if( pXMLElement == NULL )
@@ -688,12 +677,12 @@ void HelpParser::Process( LangHashMap* aLangHM , const ByteString& sCur , ResDat
             pResData->sId     =  sLId;
 
             pEntrys = aMergeDataFile.GetPFormEntrys( pResData );
-            if( pEntrys != NULL)
+            if( pEntrys != NULL) 
             {
                 ByteString sNewText;
                 pEntrys->GetText( sNewText, STRING_TYP_TEXT, sCur , true );
                 sNewdata = String(  sNewText , RTL_TEXTENCODING_UTF8 );
-                if ( sNewdata.Len())
+                if ( sNewdata.Len()) 
                 {
                     printf("Entries found\n");
                     if( pXMLElement != NULL )
diff --git a/l10ntools/source/inireader.cxx b/l10ntools/source/inireader.cxx
index 63f902a5a1da..cd2e017026f8 100644
--- a/l10ntools/source/inireader.cxx
+++ b/l10ntools/source/inireader.cxx
@@ -11,8 +11,8 @@ namespace transex3
 
 bool INIreader::read( INImap& myMap , string& filename )
 {
-    ifstream aFStream( filename.c_str() );
-    if( aFStream && aFStream.is_open())
+    ifstream aFStream( filename.c_str() ); 
+    if( aFStream && aFStream.is_open())		
     {
         string line;
         string section;
@@ -27,7 +27,7 @@ bool INIreader::read( INImap& myMap , string& filename )
             }
             else if( is_section( line , section ) )
             {
-                //cerr << "[" << section << "]\n";
+                //cerr << "[" << section << "]\n"; 
                 myvalues = new stringmap();
                 myMap[ section ] = myvalues ;
             }
@@ -47,9 +47,9 @@ bool INIreader::read( INImap& myMap , string& filename )
             }
         }
 
-        if( aFStream.is_open() )
+        if( aFStream.is_open() ) 
             aFStream.close();
-
+        
         return true;
     }
     else
@@ -64,7 +64,7 @@ bool INIreader::is_section( string& line , string& section_str )
     // Error in regex ?
     check_status( section_status );
     UnicodeString target( line.c_str() , line.length() );
-
+    
     section_match->reset( target );
     check_status( section_status );
 
@@ -74,7 +74,7 @@ bool INIreader::is_section( string& line , string& section_str )
         UnicodeString result(  section_match->group( 1 , section_status) );
         check_status( section_status );
         toStlString( result , section_str );
-
+        
         return true;
     }
     return false;
@@ -85,21 +85,21 @@ bool INIreader::is_parameter( string& line , string& parameter_key , string& par
     // Error in regex ?
     check_status( parameter_status );
     UnicodeString target( line.c_str() , line.length() );
-
+    
     parameter_match->reset( target );
     check_status( parameter_status );
 
     if( parameter_match->find() )
     {
         check_status( parameter_status );
-
+        
         UnicodeString result1(  parameter_match->group( 1 , parameter_status) );
         check_status( parameter_status );
         toStlString( result1 , parameter_key );
         UnicodeString result2(  parameter_match->group( 2 , parameter_status) );
         check_status( parameter_status );
         toStlString( result2 , parameter_value );
-
+        
         return true;
     }
     return false;
@@ -108,7 +108,7 @@ bool INIreader::is_parameter( string& line , string& parameter_key , string& par
 void INIreader::check_status( UErrorCode status )
 {
     if( U_FAILURE( status) )
-    {
+    {   
         cerr << "Error in or while using regex: " << u_errorName( status ) << "\n";
         exit(-1);
     }
@@ -116,7 +116,7 @@ void INIreader::check_status( UErrorCode status )
 
 void INIreader::toStlString( const UnicodeString& str , string& stl_str)
 {
-         // convert to string
+         // convert to string 
         char* buffer = new char[ str.length()*3 ];
         str.extract( 0 , str.length() , buffer );
         stl_str = string( buffer );
diff --git a/l10ntools/source/lngex.cxx b/l10ntools/source/lngex.cxx
index c593b85d4932..c14131a817fa 100644
--- a/l10ntools/source/lngex.cxx
+++ b/l10ntools/source/lngex.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
@@ -33,18 +33,18 @@
 #include "lngmerge.hxx"
 
 // defines to parse command line
-#define STATE_NON       0x0001
-#define STATE_INPUT     0x0002
-#define STATE_OUTPUT    0x0003
-#define STATE_PRJ       0x0004
-#define STATE_ROOT      0x0005
-#define STATE_MERGESRC  0x0006
-#define STATE_ERRORLOG  0x0007
-#define STATE_BREAKHELP 0x0008
-#define STATE_UNMERGE   0x0009
-#define STATE_UTF8      0x000A
-#define STATE_ULF       0x000B
-#define STATE_LANGUAGES 0x000C
+#define STATE_NON  		0x0001
+#define STATE_INPUT		0x0002
+#define STATE_OUTPUT	0x0003
+#define STATE_PRJ		0x0004
+#define STATE_ROOT		0x0005
+#define STATE_MERGESRC	0x0006
+#define STATE_ERRORLOG	0x0007
+#define STATE_BREAKHELP	0x0008
+#define STATE_UNMERGE	0x0009
+#define STATE_UTF8		0x000A
+#define STATE_ULF		0x000B
+#define STATE_LANGUAGES	0x000C
 
 // set of global variables
 ByteString sInputFile;
@@ -53,7 +53,6 @@ BOOL bMergeMode;
 BOOL bErrorLog;
 BOOL bUTF8;
 BOOL bULF; // ULF = Unicode Language File
-bool bQuiet;
 ByteString sPrj;
 ByteString sPrjRoot;
 ByteString sOutputFile;
@@ -68,11 +67,10 @@ BOOL ParseCommandLine( int argc, char* argv[])
     bErrorLog = TRUE;
     bUTF8 = TRUE;
     bULF = FALSE;
-    bQuiet = false;
     sPrj = "";
     sPrjRoot = "";
     Export::sLanguages = "";
-
+    
     USHORT nState = STATE_NON;
     BOOL bInput = FALSE;
 
@@ -92,9 +90,6 @@ BOOL ParseCommandLine( int argc, char* argv[])
         else if ( sSwitch == "-R" ) {
             nState = STATE_ROOT; // next token specifies path to project root
         }
-        else if ( sSwitch == "-QQ" ) {
-            bQuiet = true;
-        }
         else if ( sSwitch == "-M" ) {
             nState = STATE_MERGESRC; // next token specifies the merge database
         }
@@ -106,11 +101,11 @@ BOOL ParseCommandLine( int argc, char* argv[])
             nState = STATE_UTF8;
             bUTF8 = TRUE;
         }
-/*      else if ( sSwitch == "-NOUTF8" ) {
+/*		else if ( sSwitch == "-NOUTF8" ) {
             nState = STATE_UTF8;
             bUTF8 = FALSE;
         }*/
-/*      else if ( sSwitch == "-ULF" ) {
+/*		else if ( sSwitch == "-ULF" ) {
             nState = STATE_ULF;
             bULF = TRUE;
         }*/
@@ -120,7 +115,7 @@ BOOL ParseCommandLine( int argc, char* argv[])
         else {
             switch ( nState ) {
                 case STATE_NON: {
-                    return FALSE;   // no valid command line
+                    return FALSE;	// no valid command line
                 }
                 //break;
                 case STATE_INPUT: {
@@ -134,7 +129,7 @@ BOOL ParseCommandLine( int argc, char* argv[])
                 break;
                 case STATE_PRJ: {
                     sPrj = argv[ i ];
-//                  sPrj.ToLowerAscii(); // the project
+//					sPrj.ToLowerAscii(); // the project
                 }
                 break;
                 case STATE_ROOT: {
@@ -170,16 +165,12 @@ BOOL ParseCommandLine( int argc, char* argv[])
 void Help()
 /*****************************************************************************/
 {
-    //fprintf( stdout, "Syntax:ULFEX[-p Prj][-r PrjRoot]-i FileIn -o FileOut[-m DataBase][-e][-b][-u][-NOUTF8][-ULF][-L l1,l2,...]\n" );
     fprintf( stdout, "Syntax:ULFEX[-p Prj][-r PrjRoot]-i FileIn -o FileOut[-m DataBase][-L l1,l2,...]\n" );
     fprintf( stdout, " Prj:      Project\n" );
     fprintf( stdout, " PrjRoot:  Path to project root (..\\.. etc.)\n" );
     fprintf( stdout, " FileIn:   Source file (*.lng)\n" );
     fprintf( stdout, " FileOut:  Destination file (*.*)\n" );
     fprintf( stdout, " DataBase: Mergedata (*.sdf)\n" );
-    fprintf( stdout, " -QQ: quite output\n" );
-    //fprintf( stdout, " -NOUTF8: disable UTF8 as language independent encoding\n" );
-    //fprintf( stdout, " -ULF: enables Unicode Language File format, leads to UTF8 encoded version of lng files" );
     fprintf( stdout, " -L: Restrict the handled languages. l1,l2,... are elements of (de,en-US...)\n" );
     fprintf( stdout, "     A fallback language can be defined like this: l1=f1.\n" );
     fprintf( stdout, "     f1, f2,... are also elements of (de,en-US...)\n" );
@@ -199,25 +190,16 @@ int _cdecl main( int argc, char *argv[] )
         Help();
         return 1;
     }
-    if( !bQuiet ){
-        fprintf( stdout, "\nUlfEx 1 Copyright 2000, 2010 Oracle and/or its affiliates. All Rights Reserved.\n" );
-        fprintf( stdout, "=================================================================================\n" );
-        fprintf( stdout, "\nProcessing File %s ...\n", sInputFile.GetBuffer());
-    }else
-    {
         fprintf(stdout, ".");
-        fflush( stdout );
-    }
+        fflush( stdout ); 
 
     if ( sOutputFile.Len()) {
-        LngParser aParser( sInputFile, bUTF8, bULF , bQuiet );
+        LngParser aParser( sInputFile, bUTF8, bULF );
         if ( bMergeMode )
             aParser.Merge( sMergeSrc, sOutputFile , sPrj );
         else
             aParser.CreateSDF( sOutputFile, sPrj, sPrjRoot );
     }
 
-    if( !bQuiet ) fprintf( stdout, "\n=================================================\n\n" );
-
     return 0;
 }
diff --git a/l10ntools/source/lngmerge.cxx b/l10ntools/source/lngmerge.cxx
index 5f40a4346f53..1032c127a8b4 100644
--- a/l10ntools/source/lngmerge.cxx
+++ b/l10ntools/source/lngmerge.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
@@ -38,15 +38,14 @@ using namespace std;
 // class LngParser
 //
 /*****************************************************************************/
-LngParser::LngParser( const ByteString &rLngFile, BOOL bUTF8, BOOL bULFFormat , bool bQuiet_in )
+LngParser::LngParser( const ByteString &rLngFile, BOOL bUTF8, BOOL bULFFormat )
 /*****************************************************************************/
                 :
                 nError( LNG_OK ),
                 pLines( NULL ),
                 sSource( rLngFile ),
                 bDBIsUTF8( bUTF8 ),
-                bULF( bULFFormat ),
-                bQuiet( bQuiet_in )
+                bULF( bULFFormat )
 {
     pLines = new LngLineList( 100, 100 );
     DirEntry aEntry( String( sSource, RTL_TEXTENCODING_ASCII_US ));
@@ -54,15 +53,15 @@ LngParser::LngParser( const ByteString &rLngFile, BOOL bUTF8, BOOL bULFFormat ,
         SvFileStream aStream( String( sSource, RTL_TEXTENCODING_ASCII_US ), STREAM_STD_READ );
         if ( aStream.IsOpen()) {
             ByteString sLine;
-            bool bFirstLine = true;
+            bool bFirstLine = true;			
             while ( !aStream.IsEof()) {
                 aStream.ReadLine( sLine );
-
+                
                 if( bFirstLine ){       // Always remove UTF8 BOM from the first line
                     Export::RemoveUTF8ByteOrderMarker( sLine );
                     bFirstLine = false;
                 }
-
+                
                 pLines->Insert( new ByteString( sLine ), LIST_APPEND );
             }
         }
@@ -89,7 +88,7 @@ void LngParser::FillInFallbacks( ByteStringHashMap Text )
     ByteString sCur;
     for( unsigned int n = 0; n < aLanguages.size(); n++ ){
         sCur = aLanguages[ n ];
-
+        
         if( Export::isAllowed( sCur ) ){
             ByteString sFallbackLang = Export::GetFallbackLanguage( sCur );
             if( sFallbackLang.Len() ){
@@ -113,7 +112,7 @@ BOOL LngParser::CreateSDF(
     if ( !aSDFStream.IsOpen()) {
         nError = SDF_COULD_NOT_OPEN;
     }
-    aSDFStream.SetStreamCharSet( RTL_TEXTENCODING_UTF8 );
+    aSDFStream.SetStreamCharSet( RTL_TEXTENCODING_UTF8 );	
     nError = SDF_OK;
     DirEntry aEntry( String( sSource, RTL_TEXTENCODING_ASCII_US ));
     aEntry.ToAbs();
@@ -133,11 +132,11 @@ BOOL LngParser::CreateSDF(
     ByteString sLine;
 
     while( nPos < pLines->Count() ){
-        sLine = *pLines->GetObject( nPos++ );
+        sLine = *pLines->GetObject( nPos++ );    
         while( nPos < pLines->Count() && !isNextGroup( sGroup , sLine ) ){
             ReadLine( sLine , Text );
             sID = sGroup;
-            sLine = *pLines->GetObject( nPos++ );
+            sLine = *pLines->GetObject( nPos++ );    
         };
         if( bStart ){
             bStart = false;
@@ -145,18 +144,18 @@ BOOL LngParser::CreateSDF(
         }
         else {
 
-            WriteSDF( aSDFStream , Text , rPrj , rRoot , sActFileName , sID );
+            WriteSDF( aSDFStream , Text , rPrj , rRoot , sActFileName , sID );    
         }
     }
     aSDFStream.Close();
     return true;
 }
 
- void LngParser::WriteSDF( SvFileStream &aSDFStream , ByteStringHashMap &rText_inout ,
+ void LngParser::WriteSDF( SvFileStream &aSDFStream , ByteStringHashMap &rText_inout ,	
      const ByteString &rPrj , const ByteString &rRoot ,
      const ByteString &sActFileName , const ByteString &sID )
  {
-
+     
     BOOL bExport = true;
     if ( bExport ) {
            ByteString sTimeStamp( Export::GetTimeStamp());
@@ -164,10 +163,10 @@ BOOL LngParser::CreateSDF(
         FillInFallbacks( rText_inout );
         for( unsigned int n = 0; n < aLanguages.size(); n++ ){
             sCur = aLanguages[ n ];
-            ByteString sAct = rText_inout[ sCur ];
+            ByteString sAct = rText_inout[ sCur ];	
             if ( !sAct.Len() && sCur.Len() )
                 sAct = rText_inout[ ByteString("en-US") ];
-
+            
             ByteString sOutput( rPrj ); sOutput += "\t";
             if ( rRoot.Len())
                 sOutput += sActFileName;
@@ -201,7 +200,7 @@ BOOL LngParser::CreateSDF(
     sLang.EraseTrailingChars( ' ' );
     ByteString sText = sLine_in.GetToken( 1, '\"' ).GetToken( 0, '\"' );
     if( sLang.Len() )
-        rText_inout[ sLang ] = sText;
+        rText_inout[ sLang ] = sText;   
  }
 
 /*****************************************************************************/
@@ -222,7 +221,7 @@ BOOL LngParser::Merge(
 
     MergeDataFile aMergeDataFile( rSDFFile, sSource , FALSE, RTL_TEXTENCODING_MS_1252);//, bDBIsUTF8 );
     ByteString sTmp( Export::sLanguages );
-    if( sTmp.ToUpperAscii().Equals("ALL") )
+    if( sTmp.ToUpperAscii().Equals("ALL") ) 
         Export::SetLanguages( aMergeDataFile.GetLanguages() );
     aLanguages = Export::GetLanguages();
 
@@ -295,7 +294,7 @@ BOOL LngParser::Merge(
 
                         if ( sNewText.Len()) {
                             ByteString *pLine = pLines->GetObject( nPos );
-
+                            
                                 ByteString sText1( sLang );
                                 sText1 += " = \"";
                                 sText1 += sNewText;
@@ -322,10 +321,10 @@ BOOL LngParser::Merge(
         if ( nLastLangPos ) {
             for( unsigned int n = 0; n < aLanguages.size(); n++ ){
                 sCur = aLanguages[ n ];
-                if(   //( !sCur.EqualsIgnoreCaseAscii("de") ||
-                      //( sCur.EqualsIgnoreCaseAscii("de") && Export::isMergingGermanAllowed( rPrj ) ) )
+                if(   //( !sCur.EqualsIgnoreCaseAscii("de") || 
+                      //( sCur.EqualsIgnoreCaseAscii("de") && Export::isMergingGermanAllowed( rPrj ) ) ) 
                     !sCur.EqualsIgnoreCaseAscii("en-US") && !Text[ sCur ].Len() && pEntrys ){
-
+                    
                     ByteString sNewText;
                     pEntrys->GetText( sNewText, STRING_TYP_TEXT, sCur, TRUE );
                     if (( sNewText.Len()) &&
diff --git a/l10ntools/source/localize.cxx b/l10ntools/source/localize.cxx
index 6cecb0972cb7..db1fb6de9486 100644
--- a/l10ntools/source/localize.cxx
+++ b/l10ntools/source/localize.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
@@ -49,14 +49,12 @@ namespace transex3
 //
 // SourceTreeLocalizer
 //
-
+ 
 const char *ExeTable[][5] = {
     { "src", "transex3", "  -UTF8 -e", "negative", "noiso" },
     { "hrc", "transex3", "  -UTF8 -e", "positive", "noiso" },
-    //{ "src", "transex3", "-UTF8 -e", "negative", "noiso" },
-    //{ "hrc", "transex3", "-UTF8 -e", "positive", "noiso" },
-
-    //{ "lng", "lngex", "-UTF8 -e", "negative", "noiso" },
+    { "tree", "xhtex", "", "negative", "noiso" },
+    { "xtx", "xtxex", "", "negative", "noiso" },
     { "ulf", "ulfex", " -e", "negative", "noiso" },
     { "xrb", "xmlex", "-UTF8 -e", "negative", "iso" },
     { "xxl", "xmlex", "-UTF8 -e", "negative", "iso" },
@@ -123,9 +121,9 @@ const char *PositiveList[] = {
 const char PRJ_DIR_NAME[] = "prj";
 const char DLIST_NAME[] = "d.lst";
 
-#define LOCALIZE_NONE       0x0000
-#define LOCALIZE_EXTRACT    0x0001
-#define LOCALIZE_MERGE      0x0002
+#define LOCALIZE_NONE		0x0000
+#define LOCALIZE_EXTRACT	0x0001
+#define LOCALIZE_MERGE		0x0002
 
 class SourceTreeLocalizer : public SourceTreeIterator
 {
@@ -134,16 +132,15 @@ private:
     USHORT nMode;
 
     ByteString sLanguageRestriction;
-
+   
     ByteString sOutputFile;
-    bool bQuiet2;
 
     int nFileCnt;
-
+    
     const ByteString GetProjectName( BOOL bAbs = FALSE );
     const ByteString GetProjectRootRel();
-
-
+    
+        
     BOOL CheckNegativeList( const ByteString &rFileName );
     BOOL CheckPositiveList( const ByteString &rFileName );
 
@@ -169,11 +166,11 @@ private:
     );
 
 public:
-    SourceTreeLocalizer( const ByteString &rRoot, const ByteString &rVersion , bool bLocal , bool bQuiet2_in , bool skip_links );
+    SourceTreeLocalizer( const ByteString &rRoot, const ByteString &rVersion , bool bLocal , bool skip_links );
     ~SourceTreeLocalizer();
-
+    
     ByteString getSourceLanguages( ByteString sLanguageRestriction , ByteString sCommand );
-
+    
     void SetLanguageRestriction( const ByteString& rRestrictions )
         { sLanguageRestriction = rRestrictions; }
     int getFileCnt();
@@ -185,11 +182,10 @@ public:
 
 /*****************************************************************************/
 SourceTreeLocalizer::SourceTreeLocalizer(
-    const ByteString &rRoot, const ByteString &rVersion, bool bLocal_in , bool bQuiet2_in , bool skip_links )
+    const ByteString &rRoot, const ByteString &rVersion, bool bLocal_in , bool skip_links )
 /*****************************************************************************/
                 : SourceTreeIterator( rRoot, rVersion , bLocal_in ),
                 nMode( LOCALIZE_NONE ),
-                bQuiet2( bQuiet2_in ),
                 nFileCnt( 0 )
 {
         bSkipLinks  = skip_links ;
@@ -241,13 +237,13 @@ const ByteString SourceTreeLocalizer::GetProjectRootRel()
     if( sCur.SearchAndReplace( sProjectRoot, "" ) == STRING_NOTFOUND )
         return "";
 
-    ByteString sDelimiter(
+    ByteString sDelimiter( 
         DirEntry::GetAccessDelimiter(), RTL_TEXTENCODING_ASCII_US );
 
     sCur.SearchAndReplaceAll( sDelimiter, "/" );
     sCur.EraseLeadingChars( '/' );
     ULONG nCount = sCur.GetTokenCount( '/' );
-
+    
     ByteString sProjectRootRel;
     for ( ULONG i = 0; i < nCount; i++ ) {
         if ( sProjectRootRel.Len())
@@ -267,9 +263,9 @@ bool skipProject( ByteString sPrj )
 }
 
 /*****************************************************************************/
-void SourceTreeLocalizer::WorkOnFile(
+void SourceTreeLocalizer::WorkOnFile( 
     const ByteString &rFileName, const ByteString &rExecutable,
-    const ByteString &rParameter )
+    const ByteString &rParameter ) 
 /*****************************************************************************/
 {
         String sFull( rFileName, RTL_TEXTENCODING_ASCII_US );
@@ -282,7 +278,7 @@ void SourceTreeLocalizer::WorkOnFile(
         aPath.SetCWD();
 
         ByteString sPrj( GetProjectName());
-        if ( sPrj.Len() && !skipProject( sPrj ) )
+        if ( sPrj.Len() && !skipProject( sPrj ) ) 
         {
             ByteString sRoot( GetProjectRootRel());
 
@@ -308,7 +304,7 @@ void SourceTreeLocalizer::WorkOnFile(
             sExecutable += sDel ;
             sExecutable += rExecutable ;
 
-
+           
         ByteString sCommand( sExecutable );
         sCommand += " ";
         sCommand += rParameter;
@@ -324,10 +320,7 @@ void SourceTreeLocalizer::WorkOnFile(
             sCommand += " -l ";
         sCommand += getSourceLanguages( sLanguageRestriction , sCommand );
         }
-
-        if( bQuiet2 ){
-                sCommand +=" -QQ ";
-            }
+            
             //printf("DBG: %s\n",sCommand.GetBuffer());
             if (system(sCommand.GetBuffer()) == -1)
                 fprintf(stderr, "%s failed\n", sCommand.GetBuffer());
@@ -346,7 +339,7 @@ void SourceTreeLocalizer::WorkOnFile(
             aSDFIn.Close();
 
             aTemp.Kill();
-
+        
         }
         // reset current working directory
         aOldCWD.SetCWD();
@@ -360,7 +353,7 @@ ByteString SourceTreeLocalizer::getSourceLanguages( ByteString sLanguageRestrict
     }
     else if( sCommand.Search("xmlex") != STRING_NOTFOUND ){
         sLanguageRestriction_inout.Assign( ByteString("en-US") );
-    }
+    } 
     return sLanguageRestriction_inout;
 }
 
@@ -371,7 +364,7 @@ BOOL SourceTreeLocalizer::CheckNegativeList( const ByteString &rFileName )
     ULONG nIndex = 0;
     BOOL bReturn  = TRUE;
 
-    ByteString sDelimiter(
+    ByteString sDelimiter( 
         DirEntry::GetAccessDelimiter(), RTL_TEXTENCODING_ASCII_US );
 
     ByteString sFileName( rFileName );
@@ -400,7 +393,7 @@ BOOL SourceTreeLocalizer::CheckPositiveList( const ByteString &rFileName )
     ULONG nIndex = 0;
     BOOL bReturn  = FALSE;
 
-    ByteString sDelimiter(
+    ByteString sDelimiter( 
         DirEntry::GetAccessDelimiter(), RTL_TEXTENCODING_ASCII_US );
 
     ByteString sFileName( rFileName );
@@ -423,7 +416,7 @@ BOOL SourceTreeLocalizer::CheckPositiveList( const ByteString &rFileName )
 }
 
 /*****************************************************************************/
-void SourceTreeLocalizer::WorkOnFileType(
+void SourceTreeLocalizer::WorkOnFileType( 
     const ByteString &rDirectory, const ByteString &rExtension,
     const ByteString &rExecutable, const ByteString &rParameter,
     const ByteString &rCollectMode
@@ -466,14 +459,14 @@ void SourceTreeLocalizer::WorkOnDirectory( const ByteString &rDirectory )
     ByteString sCollectMode( ExeTable[ nIndex ][ 3 ] );
 
     while( !sExtension.Equals( "NULL" )) {
-        WorkOnFileType(
-            rDirectory,
+        WorkOnFileType( 
+            rDirectory,	
             sExtension,
             sExecutable,
             sParameter,
             sCollectMode
         );
-
+            
         nIndex++;
 
         sExtension = ExeTable[ nIndex ][ 0 ];
@@ -487,7 +480,6 @@ void SourceTreeLocalizer::OnExecuteDirectory( const rtl::OUString &aDirectory )
 {
     ByteString rDirectory( rtl::OUStringToOString( aDirectory , RTL_TEXTENCODING_UTF8 , aDirectory.getLength() ) ) ;
     if ( nMode == LOCALIZE_NONE ){
-        if( !bQuiet2 ) fprintf( stdout, "%s\n", rDirectory.GetBuffer());
     }
     else
         WorkOnDirectory( rDirectory );
@@ -498,10 +490,10 @@ BOOL SourceTreeLocalizer::Extract( const ByteString &rDestinationFile )
 /*****************************************************************************/
 {
     nMode = LOCALIZE_EXTRACT;
-
+    
     aSDF.Open( String( rDestinationFile , RTL_TEXTENCODING_ASCII_US ) , STREAM_STD_WRITE );
     aSDF.SetLineDelimiter( LINEEND_CRLF );
-
+    
     BOOL bReturn = aSDF.IsOpen();
     if ( bReturn ) {
         aSDF.Seek( STREAM_SEEK_TO_END );
@@ -517,10 +509,10 @@ BOOL SourceTreeLocalizer::Extract( const ByteString &rDestinationFile )
 }
 
 /*****************************************************************************/
-BOOL SourceTreeLocalizer::MergeSingleFile(
-    const ByteString &rPrj,
-    const ByteString &rFile,
-    const ByteString &rSDFFile
+BOOL SourceTreeLocalizer::MergeSingleFile( 
+    const ByteString &rPrj, 
+    const ByteString &rFile, 
+    const ByteString &rSDFFile 
 )
 /*****************************************************************************/
 {
@@ -532,7 +524,7 @@ BOOL SourceTreeLocalizer::MergeSingleFile(
     DirEntry aEntry( String( sRoot, RTL_TEXTENCODING_ASCII_US ));
     aEntry += DirEntry( String( rPrj, RTL_TEXTENCODING_ASCII_US ));
 
-    ByteString sDelimiter(
+    ByteString sDelimiter( 
         DirEntry::GetAccessDelimiter(), RTL_TEXTENCODING_ASCII_US );
 
     ByteString sCur( rFile );
@@ -543,13 +535,12 @@ BOOL SourceTreeLocalizer::MergeSingleFile(
     ByteString sFile( aEntry.GetFull(), RTL_TEXTENCODING_ASCII_US );
 
     ByteString sBCur( aEntry.GetFull(), RTL_TEXTENCODING_ASCII_US );
-    if( !bQuiet2 ) fprintf( stdout, "##### %s #####\n", sBCur.GetBuffer());
 
     ULONG nIndex = 0;
     ByteString sExtension( aEntry.GetExtension(), RTL_TEXTENCODING_ASCII_US );
     ByteString sCandidate( ExeTable[ nIndex ][ 0 ] );
 
-    while( !sCandidate.Equals ("NULL") && !sCandidate.Equals(sExtension) )
+    while( !sCandidate.Equals ("NULL") && !sCandidate.Equals(sExtension) ) 
         sCandidate = ExeTable[ ++nIndex ][ 0 ];
 
     if ( !sCandidate.Equals( "NULL" ) ) {
@@ -568,10 +559,10 @@ BOOL SourceTreeLocalizer::MergeSingleFile(
                     found=TRUE;
                 }
             }
-            if(!found)  return TRUE;
-
-        }
-
+            if(!found)	return TRUE;
+        
+        } 
+    
         DirEntry aOut( Export::GetTempFile() );
         ByteString sOutput;
         if( sOutputFile.Len() == 0 )
@@ -591,9 +582,6 @@ BOOL SourceTreeLocalizer::MergeSingleFile(
             sCommand += " -l ";
             sCommand += sLanguageRestriction;
         }
-        if( bQuiet2 ){
-            sCommand +=" -QQ ";
-        }
 
         DirEntry aPath( aEntry.GetPath());
         DirEntry aOldCWD;
@@ -603,11 +591,10 @@ BOOL SourceTreeLocalizer::MergeSingleFile(
             fprintf(stderr, "%s failed\n", sCommand.GetBuffer());
         nFileCnt++;
         printf(".");
-        //if( bQuiet2 ){ printf("."); }
         SvFileStream aInStream( aOut.GetFull(), STREAM_READ );
         if ( !aInStream.IsOpen()) {
-            fprintf( stderr,
-                "ERROR: Unable to open file %s for reading!\n",
+            fprintf( stderr, 
+                "ERROR: Unable to open file %s for reading!\n", 
                 sOutput.GetBuffer());
         }
         else {
@@ -622,12 +609,12 @@ BOOL SourceTreeLocalizer::MergeSingleFile(
                 ByteString test2(myStr2,RTL_TEXTENCODING_ASCII_US);
                 fprintf( stderr,"ERROR: Unable to open file %s for modification!\n", test2.GetBuffer());
                 aInStream.Close();
-            }
-
+            }                                                
+            
             else {
-                ByteString sLine;
+                ByteString sLine; 
                 aOutStream.SetLineDelimiter( LINEEND_LF );
-
+                
                 aInStream.ReadLine( sLine );
                 while ( !aInStream.IsEof()) {
                     aOutStream.WriteLine( sLine );
@@ -635,26 +622,26 @@ BOOL SourceTreeLocalizer::MergeSingleFile(
                 }
                 aInStream.Close();
                 aOutStream.Close();
-
-
-                    DirEntry myTempFile(ByteString(myStr2,RTL_TEXTENCODING_ASCII_US));      // xxx_tmp ->
+                
+                                    
+                    DirEntry myTempFile(ByteString(myStr2,RTL_TEXTENCODING_ASCII_US));		// xxx_tmp ->
                     DirEntry myFile(ByteString(aEntry.GetFull(),RTL_TEXTENCODING_ASCII_US));// xxx
 
                     DirEntry oldFile(ByteString(aEntry.GetFull(),RTL_TEXTENCODING_ASCII_US));
-
+                    
                     if(oldFile.Kill()==ERRCODE_NONE){
                         if(myTempFile.MoveTo(myFile)!=ERRCODE_NONE){
-                            fprintf( stderr, "ERROR: Can't rename file %s\n",ByteString(myStr2,RTL_TEXTENCODING_ASCII_US).GetBuffer());
+                            fprintf( stderr, "ERROR: Can't rename file %s\n",ByteString(myStr2,RTL_TEXTENCODING_ASCII_US).GetBuffer());	
                         }
-                    }
+                    }    
                     else{
                         fprintf( stderr, "ERROR: Can't remove file %s\n",ByteString(aEntry.GetFull(),RTL_TEXTENCODING_ASCII_US).GetBuffer());
                     }
                 } // else
-
+                
                 aOldCWD.SetCWD();
                 aOut.Kill();
-            }   // else
+            }	// else
         }
     return TRUE;
 }
@@ -677,7 +664,7 @@ BOOL SourceTreeLocalizer::ExecuteMerge( )
     ByteString sInpath(".");
     sInpath += Export::GetEnv("INPATH");
     ByteString sBlank("");
-
+    
     sOutputFileName.SearchAndReplaceAll( sInpath , sBlank );
 
     String sDel = DirEntry::GetAccessDelimiter();
@@ -688,7 +675,7 @@ BOOL SourceTreeLocalizer::ExecuteMerge( )
     }
     ByteStringBoolHashMap aFileHM;
     // Read all possible files
-    while ( !aSDF.IsEof()) {
+    while ( !aSDF.IsEof()) {                    
         aSDF.ReadLine( sLine );
         sFileName = sLine.GetToken( 0, '\t' );
         sFileName += "#";
@@ -701,7 +688,7 @@ BOOL SourceTreeLocalizer::ExecuteMerge( )
         aSDF.Seek( 0 );
         aFile.Open( aEntry.GetFull(), STREAM_STD_WRITE |STREAM_TRUNC );
 
-        while ( !aSDF.IsEof()) {
+        while ( !aSDF.IsEof()) {                    
             aSDF.ReadLine( sLine );
             sFileName = sLine.GetToken( 0, '\t' );
             sFileName += "#";
@@ -711,19 +698,19 @@ BOOL SourceTreeLocalizer::ExecuteMerge( )
                     aFile.WriteLine( sLine );
             }
         }
-        if ( aFile.IsOpen())
+        if ( aFile.IsOpen()) 
             aFile.Close();
-
+        
         ByteString sPrj( sFileKey.GetToken( 0, '#' ));
         ByteString sFile( sFileKey.GetToken( 1, '#' ));
         ByteString sSDFFile( aFile.GetFileName(), RTL_TEXTENCODING_ASCII_US );
 
         //printf("localize test sPrj = %s , sFile = %s , sSDFFile = %s sOutputFileName = %s\n",sPrj.GetBuffer(), sFile.GetBuffer() , sSDFFile.GetBuffer() , sOutputFileName.GetBuffer() );
-
+        
         // Test
         bLocal = true;
         // Test
-
+        
         if( bLocal ){
             USHORT nPos = sFile.SearchBackward( '\\' );
             ByteString sTmp = sFile.Copy( nPos+1 , sFile.Len()-nPos-1 );
@@ -733,7 +720,7 @@ BOOL SourceTreeLocalizer::ExecuteMerge( )
                     if ( !MergeSingleFile( sPrj, sFile, sSDFFile ))
                         bReturn = FALSE;
             }else{
-                bMerged = true;
+                bMerged = true;	
                 //printf("MergeSingleFile('%s','%s','%s')\n",sPrj.GetBuffer(),sFile.GetBuffer(),sSDFFile.GetBuffer());
                 if ( !MergeSingleFile( sPrj, sFile, sSDFFile ))
                     bReturn = FALSE;
@@ -742,8 +729,8 @@ BOOL SourceTreeLocalizer::ExecuteMerge( )
     }
     aEntry.Kill();
     // If Outputfile not included in the SDF file copy it without merge
-
-    if( bLocal && !bMerged ){
+    
+    if( bLocal && !bMerged ){ 
         DirEntry aSourceFile( sOutputFileName.GetBuffer() );
         FSysError aErr = aSourceFile.CopyTo( DirEntry ( sOutputFile.GetBuffer() ) , FSYS_ACTION_COPYFILE );
         if( aErr != FSYS_ERR_OK ){
@@ -762,50 +749,49 @@ BOOL SourceTreeLocalizer::Merge( const ByteString &rSourceFile , const ByteStrin
     nMode = LOCALIZE_MERGE;
     aSDF.Open( String( rSourceFile, RTL_TEXTENCODING_ASCII_US ),
         STREAM_STD_READ );
-
+    
     BOOL bReturn = aSDF.IsOpen();
     if ( bReturn ) {
         bReturn = ExecuteMerge();
-//      aSDF.Close();
+//		aSDF.Close();
     }
-    aSDF.Close();
+    aSDF.Close();	  
     nMode = LOCALIZE_NONE;
     return bReturn;
 }
 
-}
+} 
 using namespace transex3;
 
-#define STATE_NONE      0x0000
-#define STATE_EXPORT    0x0001
-#define STATE_MERGE     0x0002
-#define STATE_ISOCODE   0x0003
-#define STATE_LANGUAGES 0x0004
-#define STATE_FILENAME  0x0005
-#define STATE_OUTPUT    0x0006
+#define STATE_NONE		0x0000
+#define STATE_EXPORT	0x0001
+#define STATE_MERGE		0x0002
+#define STATE_ISOCODE	0x0003
+#define STATE_LANGUAGES	0x0004
+#define STATE_FILENAME	0x0005
+#define STATE_OUTPUT	0x0006
 
 /*****************************************************************************/
 void Help()
 /*****************************************************************************/
 {
-    fprintf( stdout,
+    fprintf( stdout, 
         "localize (c)2001 by Sun Microsystems\n"
         "====================================\n" );
     fprintf( stdout,
         "As part of the L10N framework, localize extracts and merges translations\n"
         "out of and into the whole source tree.\n\n"
-        "Syntax: localize -e -l en-US -f FileName [-QQ]\n"
+        "Syntax: localize -e -l en-US -f FileName \n"
         "Parameter:\n"
         "\t-e: Extract mode\n"
         "\tFileName: Output file when extract mode, input file when merge mode\n"
         "\tl1...ln: supported languages (\"all\" for all languages).\n"
-        "\tQQ: quiet output)"
     );
 
     fprintf( stdout,
         "Valid language codes for l1...ln and f1...fn are:\n" );
     fprintf( stdout,
-        "\nExample 1:\n"
+        "\nExample 1:\n" 
         "==========\n"
         "localize -e -l en-US -f MyFile\n\n"
         "All strings will be extracted for language de and language en-US.\n"
@@ -842,15 +828,12 @@ int _cdecl main( int argc, char *argv[] )
 
     BOOL bExport    = FALSE;
     BOOL bMerge     = FALSE;
-    bool bQuiet     = false;
-    bool bQuiet2    = false;
     bool bSkipLinks = false;
-
+    
     ByteString sLanguages;
     ByteString sFileName;
     ByteString sOutput;
 
-    bQuiet2 = true;
     bExport = TRUE;
 
     for( int i = 1; i < argc; i++ ) {
@@ -859,26 +842,21 @@ int _cdecl main( int argc, char *argv[] )
 
         if ( sSwitch.Equals( "-E" )) {
             nState = STATE_EXPORT;
-            if ( bMerge )
+            if ( bMerge ) 
                 return Error();
             bExport = TRUE;
         }
-        else if( sSwitch.Equals( "-Q" )) {
-            bQuiet = true;
-        }
         else if ( sSwitch.Equals( "-I" ) )
             nState = STATE_ISOCODE;
         else if ( sSwitch.Equals( "-L" ) )
             nState = STATE_LANGUAGES;
         else if ( sSwitch.Equals( "-F" ) )
             nState = STATE_FILENAME;
-        else if ( sSwitch.Equals( "-QQ" ))
-            bQuiet2 = true;
         else if ( ByteString( argv[ i ]).ToUpperAscii().Equals( "-O" ) )
             nState = STATE_OUTPUT;
         else {
             switch ( nState ) {
-                case STATE_NONE:
+                case STATE_NONE: 
                     return Error();
                 case STATE_OUTPUT:
                     if ( sOutput.Len())
@@ -928,7 +906,7 @@ int _cdecl main( int argc, char *argv[] )
     aEntry.ToAbs();
     String sFullEntry = aEntry.GetFull();
     ByteString sFileABS( aEntry.GetFull(), gsl_getSystemTextEncoding());
-    //printf("B %s\nA %s\n",rDestinationFile.GetBuffer(), sFile.GetBuffer());
+    //printf("B %s\nA %s\n",rDestinationFile.GetBuffer(), sFile.GetBuffer()); 
     sFileName = sFileABS;
 
     Treeconfig treeconfig;
@@ -937,8 +915,8 @@ int _cdecl main( int argc, char *argv[] )
     if( hasPwd ) cout << "Found special path!\n";
 
     string minor_ext;
-    bool has_minor_ext;
-
+    bool has_minor_ext; 
+    
     if( Export::GetEnv("UPDMINOREXT") != NULL )
     {
         minor_ext     = string( Export::GetEnv("UPDMINOREXT") );
@@ -951,15 +929,15 @@ int _cdecl main( int argc, char *argv[] )
     for( vector<string>::iterator iter = repos.begin(); iter != repos.end() ; ++iter )
     {
         string curRepository;
-        if( has_minor_ext )
+        if( has_minor_ext ) 
             curRepository = string( Export::GetEnv("SOURCE_ROOT_DIR") ) + "/" + *iter + minor_ext;
         else
             curRepository = string( Export::GetEnv("SOURCE_ROOT_DIR") ) + "/" + *iter;
         cout << "Localizing repository " << curRepository << "\n";
-        SourceTreeLocalizer aIter( ByteString( curRepository.c_str() ) , sVersion , (sOutput.Len() > 0) , bQuiet2 , bSkipLinks );
-        aIter.SetLanguageRestriction( sLanguages );
+        SourceTreeLocalizer aIter( ByteString( curRepository.c_str() ) , sVersion , (sOutput.Len() > 0) , bSkipLinks );
+        aIter.SetLanguageRestriction( sLanguages );	 
         if ( bExport ){
-            if( bQuiet2 ){ /*printf("");*/fflush( stdout );}
+            fflush( stdout );
             if( *iter == "ooo" )
                 aIter.Extract( sFileName );
             else
@@ -969,7 +947,7 @@ int _cdecl main( int argc, char *argv[] )
                 sFileNameWithExt += ByteString( (*iter).c_str() );
                 aIter.Extract( sFileNameWithExt );
             }
-            if( bQuiet2 ){ printf("\n%d files found!\n",aIter.GetFileCnt());}
+            printf("\n%d files found!\n",aIter.GetFileCnt());
         }
     }
     if( hasPwd )
@@ -977,14 +955,14 @@ int _cdecl main( int argc, char *argv[] )
         string pwd;
         Export::getCurrentDir( pwd );
         cout << "Localizing repository " << pwd << "\n";
-        SourceTreeLocalizer aIter( ByteString( pwd.c_str() ) , sVersion , (sOutput.Len() > 0) , bQuiet2 , bSkipLinks );
-        aIter.SetLanguageRestriction( sLanguages );
+        SourceTreeLocalizer aIter( ByteString( pwd.c_str() ) , sVersion , (sOutput.Len() > 0) , bSkipLinks );
+        aIter.SetLanguageRestriction( sLanguages );	 
         if ( bExport ){
-            if( bQuiet2 ){ /*printf("");*/fflush( stdout );}
+            fflush( stdout );
             aIter.Extract( sFileName );
-            if( bQuiet2 ){ printf("\n%d files found!\n",aIter.GetFileCnt());}
+            printf("\n%d files found!\n",aIter.GetFileCnt());
         }
-
+ 
     }
 
     return 0;
diff --git a/l10ntools/source/merge.cxx b/l10ntools/source/merge.cxx
index eb68215c791e..07455c9954cc 100644
--- a/l10ntools/source/merge.cxx
+++ b/l10ntools/source/merge.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
@@ -57,13 +57,13 @@ BOOL PFormEntrys::GetTransex3Text( ByteString &rReturn,
     ByteString test( rReturn );
     for( USHORT idx = 0; idx < rReturn.Len(); idx++ )
     {
-        if( rReturn.GetChar( idx ) == '\"' && ( idx >= 1 )  &&  rReturn.GetChar( idx-1 ) == '\\' )
-        {
+        if( rReturn.GetChar( idx ) == '\"' && ( idx >= 1 )  &&  rReturn.GetChar( idx-1 ) == '\\' )  
+        {  
             rReturn.Erase( idx-1 , 1 );
         }
     }
     //if( !rReturn.Equals( test ) )
-    //    printf("*CHANGED******************\n%s\n%s\n",test.GetBuffer(),rReturn.GetBuffer());
+    //    printf("*CHANGED******************\n%s\n%s\n",test.GetBuffer(),rReturn.GetBuffer()); 
     return rc;
 }
 /*****************************************************************************/
@@ -73,7 +73,7 @@ BOOL PFormEntrys::GetText( ByteString &rReturn,
 {
 
     /*printf("DBG: PFormEntrys::GetText(nId=%s)\n",nLangIndex.GetBuffer() );
-
+    
             // DEBUG******************
             ByteStringHashMap::const_iterator idbg;
             std::cout << "HASHKEYS : \n";
@@ -111,7 +111,7 @@ BOOL PFormEntrys::GetText( ByteString &rReturn,
             bTitleFirst[ nLangIndex ] = FALSE;
             break;
     }
-    //printf("Returning '%s'\n",rReturn.GetBuffer());
+    //printf("Returning '%s'\n",rReturn.GetBuffer()); 
     return bReturn;
 }
 
@@ -130,15 +130,15 @@ MergeData::~MergeData()
 PFormEntrys* MergeData::GetPFormEntrys( ResData *pResData )
 /*****************************************************************************/
 {
-
+    
     (void) pResData;    // FIXME
-        if( aMap.find( ByteString("HACK") ) != aMap.end() ){
+        if( aMap.find( ByteString("HACK") ) != aMap.end() ){ 
             return aMap[ ByteString("HACK") ];
         }
-        else{
-            return 0;
+        else{ 
+            return 0; 
         }
-}
+} 
 
 void MergeData::Insert( const ByteString& rPFO , PFormEntrys* pfEntrys ){
     (void) rPFO;    // FIXME
@@ -147,9 +147,9 @@ void MergeData::Insert( const ByteString& rPFO , PFormEntrys* pfEntrys ){
 }
 ByteString MergeData::Dump(){
     ByteString sRet( "MergeData\n" );
-
+    
     printf("MergeData sTyp = %s , sGid = %s , sLid =%s , sFilename = %s\n",sTyp.GetBuffer(),sGID.GetBuffer(),sLID.GetBuffer(), sFilename.GetBuffer() );
-
+    
     PFormEntrysHashMap::const_iterator idbg;
     for( idbg = aMap.begin() ; idbg != aMap.end(); ++idbg ){
         printf("aMap[ %s ] = " ,idbg->first.GetBuffer());
@@ -159,7 +159,7 @@ ByteString MergeData::Dump(){
     printf("\n") ;
     return sRet;
 }
-
+    
 PFormEntrys* MergeData::GetPFObject( const ByteString& rPFO ){
     if( aMap.find( ByteString("HACK") ) != aMap.end() ){
         return aMap[ rPFO ];
@@ -178,7 +178,7 @@ PFormEntrys *MergeData::InsertEntry( const ByteString &rPForm )
     aMap.insert( PFormEntrysHashMap::value_type( rPForm , pFEntrys ) );
     return pFEntrys;
 }
-
+ 
 /*****************************************************************************/
 BOOL MergeData::operator==( ResData *pData )
 /*****************************************************************************/
@@ -187,7 +187,7 @@ BOOL MergeData::operator==( ResData *pData )
     sResTyp_upper.ToUpperAscii();
     ByteString sTyp_upper( sTyp );
     sTyp_upper.ToUpperAscii();
-
+    
     return (( pData->sId == sLID ) &&
             ( pData->sGId == sGID ) &&
             ( sResTyp_upper  ==  sTyp_upper )
@@ -198,19 +198,19 @@ BOOL MergeData::operator==( ResData *pData )
 // class MergeDataFile
 //
 
-#define FFORMAT_UNKNOWN 0x0000
-#define FFORMAT_NEW     0x0001
-#define FFORMAT_OLD     0x0002
+#define FFORMAT_UNKNOWN	0x0000
+#define FFORMAT_NEW		0x0001
+#define FFORMAT_OLD		0x0002
 
 /*****************************************************************************/
 MergeDataFile::MergeDataFile( const ByteString &rFileName, const ByteString& sFile ,BOOL bErrLog,
-//                          CharSet aCharSet, BOOL bUTF8 , bool bCaseSensitive )
+//							CharSet aCharSet, BOOL bUTF8 , bool bCaseSensitive )
                             CharSet aCharSet, bool bCaseSensitive )
 
 /*****************************************************************************/
                 : bErrorLog( bErrLog )
 {
-
+    
     SvFileStream aInputStream( String( rFileName, RTL_TEXTENCODING_ASCII_US ), STREAM_STD_READ );
     aInputStream.SetStreamCharSet( aCharSet );
     ByteString sLine;
@@ -224,9 +224,9 @@ MergeDataFile::MergeDataFile( const ByteString &rFileName, const ByteString& sFi
     ByteString sQHTEXT;
     ByteString sTITLE;
     ByteString sHACK("HACK");
-
+    
     const ByteString sEmpty("");
-
+    
     if( !aInputStream.IsOpen() ) {
         printf("Warning : Can't open %s\n", rFileName.GetBuffer());
         //exit( -1 );
@@ -242,9 +242,9 @@ MergeDataFile::MergeDataFile( const ByteString &rFileName, const ByteString& sFi
             // Skip all wrong filenames
             ByteString filename = sLine.GetToken( 1 , '\t' );
             filename = filename.Copy( filename.SearchCharBackward( "\\" )+1 , filename.Len() );
-
+             
             if( sFile.Equals( sEmpty ) || ( !sFile.Equals( sEmpty ) && filename.Equals( sFile )  ) )
-            {
+            { 
               xub_StrLen rIdx = 0;
               sTYP = sLine.GetToken( 3, '\t', rIdx );
               sGID = sLine.GetToken( 0, '\t', rIdx ); // 4
@@ -274,7 +274,7 @@ MergeDataFile::MergeDataFile( const ByteString &rFileName, const ByteString& sFi
                     aLanguageList.push_back( nLANG );
                   } else
                     aLANG = lit->first;
-
+                  
                   InsertEntry( sTYP, sGID, sLID, sPFO, aLANG, sTEXT, sQHTEXT, sTITLE , filename , bCaseSensitive );
                 }
             }
@@ -333,7 +333,7 @@ void MergeDataFile::WriteError( const ByteString &rLine )
     else
         fprintf( stderr, "%s\n", rLine.GetBuffer());
 }
-std::vector<ByteString> MergeDataFile::GetLanguages(){
+std::vector<ByteString> MergeDataFile::GetLanguages(){ 
     return aLanguageList;
 }
 
@@ -353,7 +353,7 @@ MergeData *MergeDataFile::GetMergeData( ResData *pResData , bool bCaseSensitive
     pResData->sId = sLID;
     //printf("MergeData:: Search gid=%s lid=%s filename=%s \n", pResData->sGId.GetBuffer(),pResData->sId.GetBuffer(),pResData->sFilename.GetBuffer()  );
     ByteString sKey = CreateKey( pResData->sResTyp , pResData->sGId , pResData->sId , pResData->sFilename , bCaseSensitive );
-
+    
     //printf("DBG: Searching [%s]\n",sKey.GetBuffer());
     if( aMap.find( sKey ) != aMap.end() ){
         pResData->sGId = sOldG;
@@ -411,7 +411,7 @@ void MergeDataFile::InsertEntry(
         aFilenames.insert (ByteStringHashMap::value_type (aFilename, aFilename));
     } else
         aFilename = fit->first;
-
+    
     // search for MergeData
 
     ByteString sKey = CreateKey( rTYP , rGID , rLID , aFilename , bCaseSensitive );
@@ -419,7 +419,7 @@ void MergeDataFile::InsertEntry(
     mit = aMap.find( sKey );
     if( mit != aMap.end() ){
         pData = mit->second;
-    }else{
+    }else{ 
         pData = new MergeData( rTYP, rGID, rLID, aFilename );
         aMap.insert( MergeDataHashMap::value_type( sKey, pData ) );
     }
@@ -428,22 +428,22 @@ void MergeDataFile::InsertEntry(
     PFormEntrys *pFEntrys = 0;
 
     // search for PFormEntrys
-
+    
     pFEntrys = pData->GetPFObject( rPFO );
     if( !pFEntrys ){
         // create new PFormEntrys, cause no one exists with current properties
         pFEntrys = new PFormEntrys( rPFO );
         pData->Insert( rPFO , pFEntrys );
-    }
+    } 
 
     // finaly insert the cur string
 
     pFEntrys->InsertEntry( nLANG , rTEXT, rQHTEXT, rTITLE );
-
+    
     //printf("DBG: MergeDataFile::Insert[]=( sKey=%s,nLang=%s,rTEXT=%s)\n",sKey2.GetBuffer(),nLANG.GetBuffer(),rTEXT.GetBuffer());
 }
 ByteString MergeDataFile::CreateKey( const ByteString& rTYP , const ByteString& rGID , const ByteString& rLID , const ByteString& rFilename , bool bCaseSensitive ){
-
+    
     ByteString sKey( rTYP );
     sKey.Append( '-'        );
     sKey.Append( rGID       );
@@ -451,9 +451,9 @@ ByteString MergeDataFile::CreateKey( const ByteString& rTYP , const ByteString&
     sKey.Append( rLID       );
     sKey.Append( '-'        );
     sKey.Append( rFilename  );
-
+    
     if( bCaseSensitive ) return sKey;         // officecfg case sensitive identifier
-    else return sKey.ToUpperAscii();
+    else return sKey.ToUpperAscii(); 
 }
 
 
diff --git a/l10ntools/source/srciter.cxx b/l10ntools/source/srciter.cxx
index e928a244efe6..4c3b303abd79 100644
--- a/l10ntools/source/srciter.cxx
+++ b/l10ntools/source/srciter.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
@@ -40,7 +40,7 @@
 SourceTreeIterator::SourceTreeIterator(
     const ByteString &rRootDirectory, const ByteString &rVersion , bool bLocal_in )
 /*****************************************************************************/
-                : bInExecute( FALSE ) , bLocal( bLocal_in )
+                : bInExecute( FALSE ) , bLocal( bLocal_in ) 
 {
     (void) rVersion ;
 
@@ -62,7 +62,7 @@ void SourceTreeIterator::ExecuteDirectory( transex::Directory& aDirectory )
 {
     if ( bInExecute ) {
         rtl::OUString sDirName = aDirectory.getDirectoryName();
-
+        
         static rtl::OUString WCARD1 ( rtl::OUString::createFromAscii( "unxlng" ) );
         static rtl::OUString WCARD2 ( rtl::OUString::createFromAscii( "unxsol" ) );
         static rtl::OUString WCARD3 ( rtl::OUString::createFromAscii( "wntmsc" ) );
@@ -71,20 +71,20 @@ void SourceTreeIterator::ExecuteDirectory( transex::Directory& aDirectory )
         static rtl::OUString WCARD6 ( rtl::OUString::createFromAscii( "unxubt" ) );
         static rtl::OUString WCARD7 ( rtl::OUString::createFromAscii( ".svn" ) );
 
-
+        
         if( sDirName.indexOf( WCARD1 , 0 ) > -1 ||
             sDirName.indexOf( WCARD2 , 0 ) > -1 ||
             sDirName.indexOf( WCARD3 , 0 ) > -1 ||
             sDirName.indexOf( WCARD4 , 0 ) > -1 ||
             sDirName.indexOf( WCARD5 , 0 ) > -1 ||
             sDirName.indexOf( WCARD6 , 0 ) > -1 ||
-            sDirName.indexOf( WCARD7 , 0 ) > -1
-           )    return;
+            sDirName.indexOf( WCARD7 , 0 ) > -1 
+           )	return;
         //printf("**** %s \n", OUStringToOString( sDirName , RTL_TEXTENCODING_UTF8 , sDirName.getLength() ).getStr() );
-
+       
         rtl::OUString sDirNameTmp = aDirectory.getFullName();
         ByteString sDirNameTmpB( rtl::OUStringToOString( sDirNameTmp , RTL_TEXTENCODING_UTF8 , sDirName.getLength() ).getStr() );
-
+        
 #ifdef WNT
         sDirNameTmpB.Append( ByteString("\\no_localization") );
 #else
@@ -92,13 +92,13 @@ void SourceTreeIterator::ExecuteDirectory( transex::Directory& aDirectory )
 #endif
         //printf("**** %s \n", OUStringToOString( sDirNameTmp , RTL_TEXTENCODING_UTF8 , sDirName.getLength() ).getStr() );
 
-        DirEntry aDE( sDirNameTmpB.GetBuffer() );
+        DirEntry aDE( sDirNameTmpB.GetBuffer() ); 
         if( aDE.Exists() )
         {
             //printf("#### no_localization file found ... skipping");
             return;
         }
-
+ 
         aDirectory.setSkipLinks( bSkipLinks );
         aDirectory.readDirectory();
         OnExecuteDirectory( aDirectory.getFullName() );
@@ -112,7 +112,7 @@ void SourceTreeIterator::ExecuteDirectory( transex::Directory& aDirectory )
 BOOL SourceTreeIterator::StartExecute()
 /*****************************************************************************/
 {
-
+        
     bInExecute = TRUE;                  // FIXME
     ExecuteDirectory( aRootDirectory );
 
diff --git a/l10ntools/source/srclex.l b/l10ntools/source/srclex.l
index 473da8b5d511..eb2b6af78b34 100644
--- a/l10ntools/source/srclex.l
+++ b/l10ntools/source/srclex.l
@@ -259,10 +259,6 @@ main( int argc, char* argv[])
 	FILE *pFile;
     
 	pOutput = GetOutputFile( argc, argv );
-	if( !isQuiet() ){ 
-        fprintf( stdout, "\nTransEx 3.1 Copyright 2000, 2010 Oracle and/or its affiliates. All Rights Reserved.\n" );
-	    fprintf( stdout, "=====================================================================================\n" );
-    }
 
     if ( !pOutput ) {
 		fprintf( stdout, "Syntax:TRANSEX[-p Prj][-r PrjRoot]-i FileIn...[-o FileOut][-m DataBase][-e][-b][-u][-L l1,l2,...]\n" );
@@ -301,8 +297,6 @@ main( int argc, char* argv[])
 	nRetValue = GetError();
 	EndExport();
 
-	if( !isQuiet() ) fprintf( stdout, "\n===================================\n\n" ); 
-
 	/* return error level */
 	return nRetValue;
 }
diff --git a/l10ntools/source/tagtest.cxx b/l10ntools/source/tagtest.cxx
index c382aaa7272d..da2cca195429 100644
--- a/l10ntools/source/tagtest.cxx
+++ b/l10ntools/source/tagtest.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
@@ -36,9 +36,9 @@
 
 #include "gsicheck.hxx"
 
-#define HAS_FLAG( nFlags, nFlag )       ( ( nFlags & nFlag ) != 0 )
-#define SET_FLAG( nFlags, nFlag )       ( nFlags |= nFlag )
-#define RESET_FLAG( nFlags, nFlag )     ( nFlags &= ~nFlag )    // ~ = Bitweises NOT
+#define HAS_FLAG( nFlags, nFlag )		( ( nFlags & nFlag ) != 0 )
+#define SET_FLAG( nFlags, nFlag )		( nFlags |= nFlag )
+#define RESET_FLAG( nFlags, nFlag )		( nFlags &= ~nFlag )	// ~ = Bitweises NOT
 
 
 
@@ -95,7 +95,7 @@ void TokenInfo::SplitTag( ParserMessageList &rErrorList )
     String aDelims( String::CreateFromAscii( " \\=>/" ) );
     String aPortion;
     String aValue;      // store the value of a property
-    ByteString aName;   // store the name of a property/tag
+    ByteString aName;   // store the name of a property/tag 
     BOOL bCheckName = FALSE;
     BOOL bCheckEmpty = FALSE;
     sal_Unicode cDelim;
@@ -111,7 +111,7 @@ void TokenInfo::SplitTag( ParserMessageList &rErrorList )
         aPortion = aTokenString.Copy( nLastPos, nCheckPos-nLastPos );
 
         if ( aTokenString.GetChar( nCheckPos ) == '\\' )
-            nCheckPos++;
+            nCheckPos++;         
 
         cDelim = aTokenString.GetChar( nCheckPos );
         nCheckPos++;
@@ -128,7 +128,7 @@ void TokenInfo::SplitTag( ParserMessageList &rErrorList )
                     case ' ':  aState = TC_HAS_TAG_NAME;
                                bCheckName = TRUE;
                                break;
-                    case '/':
+                    case '/':  
                         {
                             if ( aPortion.Len() == 0 )
                             {
@@ -215,7 +215,7 @@ void TokenInfo::SplitTag( ParserMessageList &rErrorList )
             case TC_INSIDE_STRING:
                 switch ( cDelim )
                 {
-                    case '\"':
+                    case '\"': 
                         {
                             aState = TC_PROP_FINISHED;
                             aValue += aPortion;
@@ -235,7 +235,7 @@ void TokenInfo::SplitTag( ParserMessageList &rErrorList )
                             }
                         }
                                break;
-                    default:
+                    default:   
                         {
                             aState = TC_INSIDE_STRING;
                             aValue += aPortion;
@@ -335,7 +335,7 @@ void TokenInfo::SplitTag( ParserMessageList &rErrorList )
             else
             {
                 aName = ByteString( aPortion, RTL_TEXTENCODING_UTF8 );
-                // "a-zA-Z_-.0-9"
+                // "a-zA-Z_-.0-9" 
                 xub_StrLen nCount;
                 BOOL bBroken = FALSE;
                 const sal_Char* aBuf = aName.GetBuffer();
@@ -395,7 +395,7 @@ BOOL TokenInfo::IsPropertyRelevant( const ByteString &aName, const String &aValu
         return FALSE;
     if ( aTagName.EqualsAscii( "image" ) && (aName.Equals( "width" ) || aName.Equals( "height" )) )
         return FALSE;
-
+    
     return TRUE;
 }
 
@@ -437,10 +437,10 @@ BOOL TokenInfo::IsPropertyInvariant( const ByteString &aName, const String &aVal
 BOOL TokenInfo::IsPropertyFixable( const ByteString &aName ) const
 {
     // name everything that is allowed to be fixed automatically here
-    if ( (aTagName.EqualsAscii( "ahelp" ) && aName.Equals( "hid" ))
-      || (aTagName.EqualsAscii( "link" ) && aName.Equals( "href" ))
-      || (aTagName.EqualsAscii( "alt" ) && aName.Equals( "id" ))
-      || (aTagName.EqualsAscii( "variable" ) && aName.Equals( "id" ))
+    if ( (aTagName.EqualsAscii( "ahelp" ) && aName.Equals( "hid" )) 
+      || (aTagName.EqualsAscii( "link" ) && aName.Equals( "href" )) 
+      || (aTagName.EqualsAscii( "alt" ) && aName.Equals( "id" )) 
+      || (aTagName.EqualsAscii( "variable" ) && aName.Equals( "id" )) 
       || (aTagName.EqualsAscii( "image" ) && aName.Equals( "src" ))
       || (aTagName.EqualsAscii( "image" ) && aName.Equals( "id" ) ))
         return TRUE;
@@ -513,7 +513,7 @@ BOOL TokenInfo::MatchesTranslation( TokenInfo& rInfo, BOOL bGenErrors, ParserMes
         }
     }
 
-    // if we reach here eather
+    // if we reach here eather 
     //   the tags match completely or
     //   the tags match but not the properties and we generated errors for that
     return TRUE;
@@ -578,7 +578,7 @@ struct Tag
 static const Tag aKnownTags[] =
 {
 /*  commenting oldstyle tags
-//  { "<#GROUP_FORMAT>", TAG_GROUP_FORMAT },
+//	{ "<#GROUP_FORMAT>", TAG_GROUP_FORMAT },
     { "<#BOLD>", TAG_BOLDON },
     { "<#/BOLD>", TAG_BOLDOFF },
     { "<#ITALIC>", TAG_ITALICON },
@@ -586,12 +586,12 @@ static const Tag aKnownTags[] =
     { "<#UNDER>", TAG_UNDERLINEON },
     { "<#/UNDER>", TAG_UNDERLINEOFF },
 
-//  { "<#GROUP_NOTALLOWED>", TAG_GROUP_NOTALLOWED },
+//	{ "<#GROUP_NOTALLOWED>", TAG_GROUP_NOTALLOWED },
     { "<#HELPID>", TAG_HELPID },
     { "<#MODIFY>", TAG_MODIFY },
     { "<#REFNR>", TAG_REFNR },
 
-//  { "<#GROUP_STRUCTURE>", TAG_GROUP_STRUCTURE },
+//	{ "<#GROUP_STRUCTURE>", TAG_GROUP_STRUCTURE },
     { "<#NAME>", TAG_NAME },
     { "<#HREF>", TAG_HREF },
     { "<#AVIS>", TAG_AVIS },
@@ -607,13 +607,13 @@ static const Tag aKnownTags[] =
     { "<#GRAPHIC>", TAG_GRAPHIC },
     { "<#NEXTVERSION>", TAG_NEXTVERSION },
 
-    //  { "<#GROUP_SYSSWITCH>", TAG_GROUP_SYSSWITCH },
+    //	{ "<#GROUP_SYSSWITCH>", TAG_GROUP_SYSSWITCH },
     { "<#WIN>", TAG_WIN },
     { "<#UNIX>", TAG_UNIX },
     { "<#MAC>", TAG_MAC },
     { "<#OS2>", TAG_OS2 },
 
-//  { "<#GROUP_PROGSWITCH>", TAG_GROUP_PROGSWITCH },
+//	{ "<#GROUP_PROGSWITCH>", TAG_GROUP_PROGSWITCH },
     { "<#WRITER>", TAG_WRITER },
     { "<#CALC>", TAG_CALC },
     { "<#DRAW>", TAG_DRAW },
@@ -624,7 +624,7 @@ static const Tag aKnownTags[] =
     { "<#CHART>", TAG_CHART },
     { "<#OFFICE>", TAG_OFFICE },
   */
-//  { "<#TAG_GROUP_META>", TAG_GROUP_META },
+//	{ "<#TAG_GROUP_META>", TAG_GROUP_META },
     { "$[officefullname]", TAG_OFFICEFULLNAME },
     { "$[officename]", TAG_OFFICENAME },
     { "$[officepath]", TAG_OFFICEPATH },
@@ -635,10 +635,10 @@ static const Tag aKnownTags[] =
     { "$[portalversion]", TAG_PORTALVERSION },
     { "$[portalshortname]", TAG_PORTALSHORTNAME },
 /*  commenting oldstyle tags
-//  { "<#TAG_GROUP_SINGLE>", TAG_GROUP_SINGLE },
+//	{ "<#TAG_GROUP_SINGLE>", TAG_GROUP_SINGLE },
     { "<#REFINSERT>", TAG_REFINSERT },
 
-//  { "<#GROUP_MULTI>", TAG_GROUP_MULTI },
+//	{ "<#GROUP_MULTI>", TAG_GROUP_MULTI },
     { "<#END>", TAG_END },
     { "<#ELSE>", TAG_ELSE },
     { "<#VERSIONEND>", TAG_VERSIONEND },
@@ -741,7 +741,7 @@ TokenInfo SimpleParser::GetNextToken( ParserMessageList &rErrorList )
 
 String SimpleParser::GetNextTokenString( ParserMessageList &rErrorList, USHORT &rTagStartPos )
 {
-//  USHORT nStyle1StartPos = aSource.SearchAscii( "<#", nPos );
+//	USHORT nStyle1StartPos = aSource.SearchAscii( "<#", nPos );
     USHORT nStyle2StartPos = aSource.SearchAscii( "$[", nPos );
     USHORT nStyle3StartPos = aSource.SearchAscii( "\\<", nPos );
     USHORT nStyle4StartPos = aSource.SearchAscii( "\\\\", nPos );    // this is only to kick out quoted backslashes
@@ -762,8 +762,8 @@ String SimpleParser::GetNextTokenString( ParserMessageList &rErrorList, USHORT &
         return GetNextTokenString( rErrorList, rTagStartPos );
     }
 
-/*  if ( nStyle1StartPos < nStyle2StartPos && nStyle1StartPos <= nStyle3StartPos )  // <= to make sure our spechial tags are recognized before all others
-    {   // test for <# ... > style tokens
+/*	if ( nStyle1StartPos < nStyle2StartPos && nStyle1StartPos <= nStyle3StartPos )  // <= to make sure our spechial tags are recognized before all others
+    {	// test for <# ... > style tokens
         USHORT nEndPos = aSource.SearchAscii( ">", nStyle1StartPos );
         if ( nEndPos == STRING_NOTFOUND )
         {   // Token is incomplete. Skip start and search for better ones
@@ -775,7 +775,7 @@ String SimpleParser::GetNextTokenString( ParserMessageList &rErrorList, USHORT &
         return aSource.Copy( nStyle1StartPos, nEndPos-nStyle1StartPos +1 ).ToUpperAscii();
     }
     else*/ if ( nStyle2StartPos < nStyle3StartPos )
-    {   // test for $[ ... ] style tokens
+    {	// test for $[ ... ] style tokens
         USHORT nEndPos = aSource.SearchAscii( "]", nStyle2StartPos);
         if ( nEndPos == STRING_NOTFOUND )
         {   // Token is incomplete. Skip start and search for better ones
@@ -787,7 +787,7 @@ String SimpleParser::GetNextTokenString( ParserMessageList &rErrorList, USHORT &
         return aSource.Copy( nStyle2StartPos, nEndPos-nStyle2StartPos +1 );
     }
     else
-    {   // test for \< ... \> style tokens
+    {	// test for \< ... \> style tokens
         USHORT nEndPos = aSource.SearchAscii( "\\>", nStyle3StartPos);
         USHORT nQuotedBackPos = aSource.SearchAscii( "\\\\", nStyle3StartPos );    // this is only to kick out quoted backslashes
         while ( nQuotedBackPos <= nEndPos && nQuotedBackPos != STRING_NOTFOUND )
@@ -876,7 +876,7 @@ void TokenParser::Parse( const String &aCode, ParserMessageList* pList )
                     ParseError( 17, "<#UNDER> expected before <#/UNDER>.", aTag );
                 }
                 break;
-/*          case TAG_MISSPARENTHESIS:
+/*			case TAG_MISSPARENTHESIS:
                 {
                     ParseError( 14, "missing closing parenthesis '>'", aTag );
                 }
@@ -1293,7 +1293,7 @@ void TokenParser::TagRef()
                     TokenId aThisToken = aTag.nId;
                     match( aTag, aTag );
                     if ( aThisToken != TAG_NAME )
-                    {   // TAG_NAME has no TAG_END
+                    {	// TAG_NAME has no TAG_END
                         SET_FLAG( nActiveRefTypes, TAG_NOGROUP( aThisToken ) );
                         Paragraph();
                         match( aTag, TAG_END );
diff --git a/l10ntools/source/treeconfig.cxx b/l10ntools/source/treeconfig.cxx
index 137492c39a50..3f1dec9ded71 100644
--- a/l10ntools/source/treeconfig.cxx
+++ b/l10ntools/source/treeconfig.cxx
@@ -20,7 +20,7 @@ namespace transex3
 {
 
 bool Treeconfig::parseConfig(){
-
+    
     string source_config_file = string( static_cast<ByteString>( Export::GetEnv("SOURCE_ROOT_DIR") ).GetBuffer() );
     if( source_config_file.empty() )
     {
@@ -43,7 +43,7 @@ bool Treeconfig::parseConfig(){
 // if you are in some misc place like /tmp then return true
 // => the application can decide what to do in case the function returns true thus how to handle pwd() path
 bool Treeconfig::getActiveRepositories( vector<string>& active_repos ){
-
+    
     bool isPresent = isConfigFilePresent();
     bool hasPath   = false;
     string pwd;
@@ -65,7 +65,7 @@ bool Treeconfig::getActiveRepositories( vector<string>& active_repos ){
     }
     else                              // I am NOT within SOURCE_ROOT_DIR
         hasPath = true;
-
+    
     if( isPresent )
     {
         hasPath = false;                // if config_file is present don't care about pwd
@@ -110,11 +110,11 @@ bool Treeconfig::isConfigFilePresent()
 {
     string config_file = Export::GetEnv( "SOURCE_ROOT_DIR" );
     config_file += "/source_config";
-
+    
     struct stat status;
     if( stat( config_file.c_str() , &status ) < 0 )
     {
-        return false;
+        return false; 
     }
 #ifdef WNT
     return ( status.st_mode & _S_IFREG ) && ( _access( config_file.c_str() , 4 ) >= 0 ) ;
diff --git a/l10ntools/source/utf8conv.cxx b/l10ntools/source/utf8conv.cxx
index 23642a29c88a..542fb5c4119e 100644
--- a/l10ntools/source/utf8conv.cxx
+++ b/l10ntools/source/utf8conv.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
@@ -33,13 +33,13 @@
 // class UTF8Converter
 //
 
-#define MAX_CONV_BUFFER_SIZE    0xFF00
+#define MAX_CONV_BUFFER_SIZE	0xFF00
 
-#define TO_CVTFLAGS     (RTL_TEXTTOUNICODE_FLAGS_UNDEFINED_MAPTOPRIVATE |\
+#define TO_CVTFLAGS		(RTL_TEXTTOUNICODE_FLAGS_UNDEFINED_MAPTOPRIVATE |\
                           RTL_TEXTTOUNICODE_FLAGS_MBUNDEFINED_DEFAULT |\
                           RTL_TEXTTOUNICODE_FLAGS_INVALID_DEFAULT)
 
-#define FROM_CVTFLAGS   (RTL_UNICODETOTEXT_FLAGS_UNDEFINED_DEFAULT |\
+#define FROM_CVTFLAGS  	(RTL_UNICODETOTEXT_FLAGS_UNDEFINED_DEFAULT |\
                              RTL_UNICODETOTEXT_FLAGS_INVALID_DEFAULT |\
                             RTL_UNICODETOTEXT_FLAGS_UNDEFINED_REPLACE |\
                             RTL_UNICODETOTEXT_FLAGS_PRIVATE_MAPTO0)
diff --git a/l10ntools/source/wtranode.cxx b/l10ntools/source/wtranode.cxx
index 47fadc5d17f7..1d5b0a0ec4f5 100644
--- a/l10ntools/source/wtranode.cxx
+++ b/l10ntools/source/wtranode.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
@@ -35,13 +35,13 @@
 // NOT FULLY DECLARED SERVICES
 
 
-const ByteString    sEmptyString("");
+const ByteString	sEmptyString("");
 
 
-WTT_Node::WTT_Node( UINT8      i_nValue,
+WTT_Node::WTT_Node( UINT8	   i_nValue,
                     WTT_Node * i_pDefaultBranch,
                     WTT_Node * i_pDefaultBranchForAlphas )
-    :   nValue(i_nValue),
+    :	nValue(i_nValue),
         eType(token_to_keep),
         sReplaceString(sEmptyString),
         // aBranches,
@@ -60,7 +60,7 @@ WTT_Node::WTT_Node( UINT8      i_nValue,
 
 void
 WTT_Node::SetBranch( UINT8      i_cBranch,
-                     WTT_Node * i_pNode )
+                     WTT_Node *	i_pNode )
 {
     if (i_cBranch < C_NR_OF_BRANCHES)
     {
@@ -79,7 +79,7 @@ WTT_Node::~WTT_Node()
 {
     // Delete the tree hanging below this node:
 
-    bIsOnDeleting = TRUE;   // Avoid double deleting of multiple used nodes.
+    bIsOnDeleting = TRUE;	// Avoid double deleting of multiple used nodes.
 
     for (int i = 0; i < C_NR_OF_BRANCHES; i++)
     {
diff --git a/l10ntools/source/wtratree.cxx b/l10ntools/source/wtratree.cxx
index 28adf7c7142b..2d5e0de2d953 100644
--- a/l10ntools/source/wtratree.cxx
+++ b/l10ntools/source/wtratree.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
@@ -48,25 +48,25 @@
 #include "wtranode.hxx"
 
 
-const BRANCH_T  BR_END          = 0;
-const BRANCH_T  BR_NONALPHA     = 1;
-const BRANCH_T  BR_HOTKEY       = 2;
-const BRANCH_T  BR_BACKSLASH    = 3;
-const BRANCH_T  BR_ALPHABASE    = 4;    /// @ATTENTION  All branches not valid for words must be smaller than this value!
-const BRANCH_T  BR_AE           = 30;
-const BRANCH_T  BR_OE           = 31;
-const BRANCH_T  BR_UE           = 32;
-const BRANCH_T  BR_SZ           = 33;
-const BRANCH_T  BR_MAX          = 34;   /// @ATTENTION  Must be updated always!
+const BRANCH_T	BR_END			= 0;
+const BRANCH_T	BR_NONALPHA     = 1;
+const BRANCH_T	BR_HOTKEY       = 2;
+const BRANCH_T	BR_BACKSLASH    = 3;
+const BRANCH_T	BR_ALPHABASE    = 4;   	/// @ATTENTION  All branches not valid for words must be smaller than this value!
+const BRANCH_T	BR_AE           = 30;
+const BRANCH_T	BR_OE           = 31;
+const BRANCH_T	BR_UE           = 32;
+const BRANCH_T	BR_SZ           = 33;
+const BRANCH_T	BR_MAX          = 34;	/// @ATTENTION  Must be updated always!
 
-const BRANCH_T  BR_START        = 0;
+const BRANCH_T	BR_START 		= 0;
 
 
 
 
 
 WordTransTree::WordTransTree(CharSet  i_nWorkingCharSet)
-    :   sInput(0),
+    :	sInput(0),
         nInputLength(0),
         pInputEnd(0),
         sOutput(0),
@@ -85,7 +85,7 @@ WordTransTree::WordTransTree(CharSet  i_nWorkingCharSet)
         cCurHotkeySign(u_char('~'))
 {
     // Initialize parsing tree:
-    pUnknownAlpha = new WTT_Node(BR_ALPHABASE,0,0); // This will be deleted as part of the parsing tree.
+    pUnknownAlpha = new WTT_Node(BR_ALPHABASE,0,0);	// This will be deleted as part of the parsing tree.
     for ( UINT8 i = BR_ALPHABASE; i < C_NR_OF_BRANCHES; i++)
     {
         pUnknownAlpha->SetBranch(i,pUnknownAlpha);
@@ -162,8 +162,8 @@ WordTransTree::~WordTransTree()
 }
 
 void
-WordTransTree::AddWordPair( const ByteString &      i_sOldString,
-                            const ByteString &      i_sReplaceString )
+WordTransTree::AddWordPair(	const ByteString &		i_sOldString,
+                            const ByteString &		i_sReplaceString )
 {
     if (i_sOldString.Len() == 0)
         return;
@@ -184,14 +184,14 @@ WordTransTree::AddWordPair( const ByteString &      i_sOldString,
             pCurParseNode->SetBranch(cBranch,pBranch);
         }
         pCurParseNode = pBranch;
-    }   // end for
+    }	// end for
     pCurParseNode->SetAsTokenToReplace(i_sReplaceString);
 }
 
 void
-WordTransTree::InitTransformation( const char * i_sInput,
-                                   UINT32       i_nInputLength,
-                                   UINT32       i_nOutputMaxLength )
+WordTransTree::InitTransformation( const char *	i_sInput,
+                                   UINT32		i_nInputLength,
+                                   UINT32		i_nOutputMaxLength )
 {
     sInput = (const u_char *)i_sInput;
     nInputLength = i_nInputLength;
@@ -210,7 +210,7 @@ WordTransTree::InitTransformation( const char * i_sInput,
     pOutputPosition = sOutput;
 }
 
-/** pInputCurTokenStart and CurParseNode are updated just when
+/**	pInputCurTokenStart and CurParseNode are updated just when
     starting this function. After its end they must not be changed
     till this functon is called again.
     Outside this function pInputPositon and pOutputPosition are both
@@ -244,20 +244,20 @@ WordTransTree::TransformNextToken()
                 // Logic of the following. There are 9 possible cases -
                 // A = alphabetic letter, NA = non alphabetic, TB = token begin,
                 // Eot = end of text:
-                //   1. A~A          set hotkey to following letter, continue
-                //   2. A~NA         token end
-                //   3. A~Eot        token end
-                //   4. NA~A         token end
-                //   5. NA~NA        continue
-                //   6. A~Eof        continue
-                //   7. TB~A         set hotkey to following letter, continue
-                //   8. TB~NA        continue
-                //   9. TB~Eot       continue
+                //	 1.	A~A          set hotkey to following letter, continue
+                //	 2.	A~NA         token end
+                //	 3.	A~Eot        token end
+                //	 4.	NA~A         token end
+                //	 5.	NA~NA        continue
+                //	 6.	A~Eof        continue
+                //	 7.	TB~A         set hotkey to following letter, continue
+                //	 8.	TB~NA        continue
+                //	 9.	TB~Eot       continue
 
                 // bNext and Prev are true, if there are alphabetic letters:
                 BOOL bNext =  pInputPosition + 1 != pInputEnd
                                     ?   CalculateBranch(pInputPosition[1]) >= BR_ALPHABASE
-                                    :   FALSE;
+                                    : 	FALSE;
                 BOOL bPrev = pCurParseNode->Value() >= BR_ALPHABASE;
 
                 if ( bNext && (bPrev || pCurParseNode == dpParsingTreeTop) )
@@ -271,7 +271,7 @@ WordTransTree::TransformNextToken()
                 }
 
                 // Case 2.,3.,4. :
-                //  so this should be handled as an end of a token.
+                // 	so this should be handled as an end of a token.
             }
             if (pCurParseNode->TokenType() == WTT_Node::token_to_keep)
             {
@@ -282,9 +282,9 @@ WordTransTree::TransformNextToken()
             {
                 Handle_TokenToTransform();
                 return eCurResult;
-            }   // endif (pCurParseNode->TokenType() == WTT_Node::token_to_keep)
-        }   // endif (pBranch == 0) else
-    }   // end for
+            }	// endif (pCurParseNode->TokenType() == WTT_Node::token_to_keep)
+        } 	// endif (pBranch == 0) else
+    }	// end for
 
     // If here, the text end is reached
     if (pCurParseNode->TokenType() == WTT_Node::token_to_keep)
@@ -308,7 +308,7 @@ WordTransTree::CurReplacingString() const
 void
 WordTransTree::Handle_Hotkey()
 {
-    if (cCurHotkey == 0)    // Avoid to replace the first found hotkey by
+    if (cCurHotkey == 0) 	// Avoid to replace the first found hotkey by
                             //   a later one - though this shouldn't happen anyway.
     {
         cCurHotkey = (pInputPosition+1) != pInputEnd ? pInputPosition[1] : 0;
@@ -335,8 +335,8 @@ WordTransTree::Handle_TokenToTransform()
 
     // Find position of hotkey in replace-string:
     USHORT nHotkeyPos = bHaveHotkey
-                            ?   rReplace.Search(char(cCurHotkey))
-                            :   STRING_NOTFOUND;
+                            ?	rReplace.Search(char(cCurHotkey))
+                            :	STRING_NOTFOUND;
     if (nHotkeyPos == STRING_NOTFOUND && bHaveHotkey)
     {
         if (cCurHotkey < 128)
@@ -346,7 +346,7 @@ WordTransTree::Handle_TokenToTransform()
             else
                 nHotkeyPos = rReplace.Search(tolower(char(cCurHotkey)));
         }
-        else    // cCurHotkey >= 128
+        else	// cCurHotkey >= 128
         {
             if (cCurHotkey == c_ae)
                 nHotkeyPos = rReplace.Search(char(c_AE));
@@ -360,14 +360,14 @@ WordTransTree::Handle_TokenToTransform()
                 nHotkeyPos = rReplace.Search(char(c_oe));
             else if (cCurHotkey == c_UE)
                 nHotkeyPos = rReplace.Search(char(c_ue));
-        }   // endif (cCurHotkey < 128) else
+        }	// endif (cCurHotkey < 128) else
 
         if (nHotkeyPos == STRING_NOTFOUND)
         {
             eCurResult = HOTKEY_LOST;
             bHaveHotkey = FALSE;
         }
-    }   // endif (nHotkeyPos == STRING_NOT_FOUND && bHaveHotkey)
+    } 	// endif (nHotkeyPos == STRING_NOT_FOUND && bHaveHotkey)
 
 
     UINT32 nOutputTokenLength = rReplace.Len() + (bHaveHotkey ? 1 : 0);
@@ -391,15 +391,15 @@ WordTransTree::Handle_TokenToTransform()
 
     // Convert first letter into upper if necessary:
     u_char cInStart = CalculateBranch(*pInputCurTokenStart) == BR_HOTKEY
-                            ?   pInputCurTokenStart[1]
-                            :   pInputCurTokenStart[0] ;
+                            ? 	pInputCurTokenStart[1]
+                            :	pInputCurTokenStart[0] ;
     u_char * pOutStart = nHotkeyPos == 0
-                            ?   pOutputPosition + 1
-                            :   pOutputPosition ;
+                            ? 	pOutputPosition + 1
+                            :	pOutputPosition ;
     if (isupper(cInStart) || cInStart > 127)
     {   // Possibly cInStart is upper character:
         if (isupper(cInStart) || cInStart == c_AE || cInStart == c_OE || cInStart == c_UE)
-        {   // Surely cInStart is upper character:
+        {	// Surely cInStart is upper character:
             u_char cOutStart = *pOutStart;
             if (cOutStart < 128)
                 *pOutStart = toupper(cOutStart);
@@ -410,7 +410,7 @@ WordTransTree::Handle_TokenToTransform()
             else if (cOutStart == c_ue)
                 *pOutStart = c_UE;
         }
-    }   // endif (isupper(cInStart) || cInStart > 127)
+    }  	// endif (isupper(cInStart) || cInStart > 127)
 
     pOutputPosition += nOutputTokenLength;
     *pOutputPosition = '\0';
diff --git a/l10ntools/source/xgfconv.cxx b/l10ntools/source/xgfconv.cxx
index 54b92fb3c1c2..2e1f02d32ec7 100644
--- a/l10ntools/source/xgfconv.cxx
+++ b/l10ntools/source/xgfconv.cxx
@@ -21,7 +21,7 @@ int _cdecl main( int argc, char *argv[] )
 
     ByteString sInput( argv[ 1 ] );
     ByteString sOutput( argv[ 2 ] );
-
+    
     SvFileStream aInput( String( sInput, RTL_TEXTENCODING_ASCII_US ), STREAM_STD_READ );
     if ( !aInput.IsOpen()) {
         fprintf( stderr, "ERROR: Unable to open input file!\n" );
@@ -47,7 +47,7 @@ int _cdecl main( int argc, char *argv[] )
         CharSet aCharSet = Export::GetCharSet( nLangId );
         if ( aCharSet != 0xFFFF && sText.Len()) {
             sText = UTF8Converter::ConvertToUTF8( sText, aCharSet );
-            ByteString sOutput = sFile;
+            ByteString sOutput = sFile; 
             sOutput += "\t";
             sOutput += sText;
             if ( !bFirst ) {
diff --git a/l10ntools/source/xmlparse.cxx b/l10ntools/source/xmlparse.cxx
index 14b5944488a9..58a2b922af19 100644
--- a/l10ntools/source/xmlparse.cxx
+++ b/l10ntools/source/xmlparse.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
@@ -47,14 +47,14 @@ using namespace osl;
 //
 // class XMLChildNode
 //
-
+ 
 /*****************************************************************************/
-XMLChildNode::XMLChildNode( XMLParentNode *pPar )
+XMLChildNode::XMLChildNode( XMLParentNode *pPar ) 
 /*****************************************************************************/
-                : pParent( pPar )
-{
+                : pParent( pPar ) 
+{ 
     if ( pParent )
-        pParent->AddChild( this );
+        pParent->AddChild( this ); 
 }
 
 
@@ -100,13 +100,13 @@ XMLParentNode::XMLParentNode( const XMLParentNode& obj)
             pNode = obj.pChildList->GetObject( i );
             if( pNode != NULL){
                 switch(pNode->GetNodeType()){
-                    case XML_NODE_TYPE_ELEMENT:
-                        AddChild( new XMLElement( *static_cast<XMLElement* >(pNode) ) ); break;
-                    case XML_NODE_TYPE_DATA:
+                    case XML_NODE_TYPE_ELEMENT: 
+                        AddChild( new XMLElement( *static_cast<XMLElement* >(pNode) ) ); break; 
+                    case XML_NODE_TYPE_DATA:    
                         AddChild( new XMLData   ( *static_cast<XMLData* >   (pNode) ) ); break;
-                    case XML_NODE_TYPE_COMMENT:
+                    case XML_NODE_TYPE_COMMENT: 
                         AddChild( new XMLComment( *static_cast<XMLComment* >(pNode) ) ); break;
-                    case XML_NODE_TYPE_DEFAULT:
+                    case XML_NODE_TYPE_DEFAULT: 
                         AddChild( new XMLDefault( *static_cast<XMLDefault* >(pNode) ) ); break;
                     default:    fprintf(stdout,"XMLParentNode::XMLParentNode( const XMLParentNode& obj) strange obj");
                 }
@@ -154,11 +154,11 @@ void XMLParentNode::AddChild( XMLChildNode *pChild , int pos )
 /*****************************************************************************/
 int XMLParentNode::GetPosition( ByteString id ){
 /*****************************************************************************/
-    XMLElement* a;
+    XMLElement* a;    
 
     static const ByteString sEnusStr = ByteString(String::CreateFromAscii(ENGLISH_US_ISO).ToLowerAscii() , RTL_TEXTENCODING_ASCII_US ).ToLowerAscii();
     static const ByteString sDeStr   = ByteString(String::CreateFromAscii(GERMAN_ISO2).ToLowerAscii()    , RTL_TEXTENCODING_ASCII_US ).ToLowerAscii();
-
+    
     if ( pChildList ){
         for ( ULONG i = 0; i < pChildList->Count(); i++ ) {
             XMLChildNode *pChild = pChildList->GetObject( i );
@@ -198,24 +198,24 @@ int XMLParentNode::RemoveChild( XMLElement *pRefElement )
                 elemLID.ToLowerAscii();
                 ByteString pRefLID( pRefElement->GetLanguageId() );
                 pRefLID.ToLowerAscii();
-                if ( elemid.Equals(pRefElement->GetId())
-                    && elemLID.Equals( pRefLID ) )
+                if ( elemid.Equals(pRefElement->GetId()) 
+                    && elemLID.Equals( pRefLID ) ) 
                 {
                     if( pRefElement->ToOString().compareTo( a->ToOString() )==0 ){
                         pChildList->Remove( i );
                         delete a; // Test
                         return i;
                     }
-                }
+                }                  
             }
-
+    
         }
     }
     return -1;
 }
 
 /*****************************************************************************/
-void XMLParentNode::RemoveAndDeleteAllChilds(){
+void XMLParentNode::RemoveAndDeleteAllChilds(){	
 /*****************************************************************************/
     if ( pChildList ) {
         for ( ULONG i = 0; i < pChildList->Count(); i++ )
@@ -231,8 +231,8 @@ XMLElement *XMLParentNode::GetChildElement( XMLElement *pRefElement )
     for ( ULONG i = 0; i < pChildList->Count(); i++ ) {
         XMLChildNode *pChild = pChildList->GetObject( i );
         if ( pChild->GetNodeType() == XML_NODE_TYPE_ELEMENT )
-            if ((( XMLElement * ) pChild )->GetName() ==
-                pRefElement->GetName())
+            if ((( XMLElement * ) pChild )->GetName() == 
+                pRefElement->GetName()) 
             {
                 XMLAttributeList *pList = pRefElement->GetAttributeList();
                 if ( !pList )
@@ -241,8 +241,8 @@ XMLElement *XMLParentNode::GetChildElement( XMLElement *pRefElement )
                 BOOL bMatch = FALSE;
                 for ( ULONG j = 0; j < pList->Count() && bMatch; j++ ) {
                     XMLAttribute *pAttribute = pList->GetObject( j );
-                    XMLAttribute *pCandidate =
-                        (( XMLElement * ) pChild )->GetAttribute(
+                    XMLAttribute *pCandidate = 
+                        (( XMLElement * ) pChild )->GetAttribute( 
                             *pAttribute );
                     if ( !pCandidate || !pAttribute->IsEqual( *pCandidate ))
                         bMatch = FALSE;
@@ -272,11 +272,11 @@ BOOL XMLFile::Write( ByteString &aFilename )
 
     if ( aFilename.Len()) {
         // retry harder if there is a NFS problem,
-        for( int x = 1 ; x < 3 ; x++ ){ // this looks strange...yes!
-            ofstream aFStream( aFilename.GetBuffer() , ios::out | ios::trunc );
+        for( int x = 1 ; x < 3 ; x++ ){	// this looks strange...yes!        
+            ofstream aFStream( aFilename.GetBuffer() , ios::out | ios::trunc ); 
 
-            if( !aFStream )     // From time to time the stream can not be opened the first time on NFS volumes,
-            {                   // I wasn't able to track this down. I think this is an NFS issue .....
+            if( !aFStream )		// From time to time the stream can not be opened the first time on NFS volumes, 
+            {					// I wasn't able to track this down. I think this is an NFS issue .....
                 //cerr << "ERROR: - helpex - Can't write to tempfile " << aFilename.GetBuffer() << " No#" << x << "\n";
                 TimeValue aTime;
                 aTime.Seconds = 3;
@@ -289,11 +289,11 @@ BOOL XMLFile::Write( ByteString &aFilename )
                 // write out
                 Write( aFStream );
                 aFStream.close();
-
+                
                 // check!
-                DirEntry aTarget( aFilename );
-                FileStat aFileStat( aTarget );
-
+                DirEntry aTarget( aFilename );   
+                FileStat aFileStat( aTarget );  
+                
                 if( aFileStat.GetSize() < 1 )
                 {
                     //retry
@@ -309,7 +309,7 @@ BOOL XMLFile::Write( ByteString &aFilename )
         }
         cerr << "ERROR: - helpex - Can't create file " << aFilename.GetBuffer() << "\nPossible reason: Disk full ? Mounted NFS volume broken ? Wrong permissions ?\n";
         exit( -1 );
-    }
+    } 
     cerr << "ERROR: - helpex - Empty file name\n";
     exit( -1 );
 }
@@ -328,7 +328,7 @@ BOOL XMLFile::Write( ofstream &rStream , XMLNode *pCur )
     XMLUtil& xmlutil = XMLUtil::Instance();
     (void) xmlutil;
 
-    if ( !pCur )
+    if ( !pCur )                
         Write( rStream, this );
     else {
         switch( pCur->GetNodeType()) {
@@ -363,7 +363,7 @@ BOOL XMLFile::Write( ofstream &rStream , XMLNode *pCur )
                     rStream << "</";
                     WriteString( rStream, pElement->GetName());
                     rStream << ">";
-                   }
+                   }				   
             }
             break;
             case XML_NODE_TYPE_DATA: {
@@ -377,24 +377,24 @@ BOOL XMLFile::Write( ofstream &rStream , XMLNode *pCur )
                 XMLComment *pComment = ( XMLComment * ) pCur;
                 rStream << "<!--";
                 WriteString( rStream, pComment->GetComment());
-                rStream << "-->";
+                rStream << "-->"; 
             }
-            break;
+            break;  
             case XML_NODE_TYPE_DEFAULT: {
                 XMLDefault *pDefault = ( XMLDefault * ) pCur;
                 WriteString( rStream, pDefault->GetDefault());
             }
-            break;
+            break;  
         }
     }
-    return TRUE;
-}
+    return TRUE; 
+} 
 
 
 void XMLFile::Print( XMLNode *pCur, USHORT nLevel )
 {
 
-    if ( !pCur )
+    if ( !pCur ) 
         Print( this );
     else {
         switch( pCur->GetNodeType()) {
@@ -411,8 +411,8 @@ void XMLFile::Print( XMLNode *pCur, USHORT nLevel )
                 if ( pElement->GetAttributeList())
                     for ( ULONG j = 0; j < pElement->GetAttributeList()->Count(); j++ ){
                         ByteString aAttrName( *pElement->GetAttributeList()->GetObject( j ), RTL_TEXTENCODING_UTF8 );
-                        if( !aAttrName.EqualsIgnoreCaseAscii( XML_LANG ) ) {
-                            fprintf( stdout, " %s=\"%s\"",
+                        if( !aAttrName.EqualsIgnoreCaseAscii( XML_LANG ) ) { 
+                            fprintf( stdout, " %s=\"%s\"", 
                                 aAttrName.GetBuffer(),
                                 ByteString( pElement->GetAttributeList()->GetObject( j )->GetValue(),
                                     RTL_TEXTENCODING_UTF8 ).GetBuffer());
@@ -425,7 +425,7 @@ void XMLFile::Print( XMLNode *pCur, USHORT nLevel )
                     for ( ULONG k = 0; k < pElement->GetChildList()->Count(); k++ )
                         Print( pElement->GetChildList()->GetObject( k ), nLevel + 1 );
                     fprintf( stdout, "</%s>", ByteString( pElement->GetName(), RTL_TEXTENCODING_UTF8 ).GetBuffer());
-                }
+                }				   
             }
             break;
             case XML_NODE_TYPE_DATA: {
@@ -451,8 +451,8 @@ XMLFile::~XMLFile()
 {
     if( XMLStrings != NULL ){
         XMLHashMap::iterator pos = XMLStrings->begin();
-        for( ; pos != XMLStrings->end() ; ++pos ){
-            delete pos->second;             // Check and delete content also ?
+        for( ; pos != XMLStrings->end() ; ++pos ){				
+            delete pos->second;				// Check and delete content also ?
         }
         delete XMLStrings;
         XMLStrings = NULL;
@@ -461,15 +461,15 @@ XMLFile::~XMLFile()
 /*****************************************************************************/
 XMLFile::XMLFile( const String &rFileName ) // the file name, empty if created from memory stream
 /*****************************************************************************/
-                : XMLParentNode( NULL ),
-                  sFileName    ( rFileName ),
+                : XMLParentNode( NULL ), 
+                  sFileName    ( rFileName ), 
                   ID           ( "id" ),
                   OLDREF       ( "oldref" ),
                   XML_LANG     ( "xml-lang" ),
                   XMLStrings   ( NULL )
-
+                  
 {
-//  nodes_localize.insert( TagMap::value_type(ByteString(String::CreateFromAscii("bookmark_value"),RTL_TEXTENCODING_ASCII_US) , TRUE) );
+//	nodes_localize.insert( TagMap::value_type(ByteString(String::CreateFromAscii("bookmark_value"),RTL_TEXTENCODING_ASCII_US) , TRUE) );
     nodes_localize.insert( TagMap::value_type(ByteString(String::CreateFromAscii("bookmark"),RTL_TEXTENCODING_ASCII_US) , TRUE) );
     nodes_localize.insert( TagMap::value_type(ByteString(String::CreateFromAscii("variable"),RTL_TEXTENCODING_ASCII_US) , TRUE) );
     nodes_localize.insert( TagMap::value_type(ByteString(String::CreateFromAscii("paragraph"),RTL_TEXTENCODING_ASCII_US) , TRUE) );
@@ -483,9 +483,9 @@ void XMLFile::Extract( XMLFile *pCur )
 /*****************************************************************************/
 {
     if( XMLStrings != NULL ) delete XMLStrings; // Elements ?
-
+    
     XMLStrings = new XMLHashMap();
-       if ( !pCur )
+       if ( !pCur ) 
         SearchL10NElements( this );
     else {
         if( pCur->GetNodeType()==XML_NODE_TYPE_FILE) {
@@ -501,11 +501,11 @@ void XMLFile::View(){
     for(XMLHashMap::iterator pos=XMLStrings->begin(); pos!=XMLStrings->end();++pos){
         fprintf(stdout,"\nid=%s\n",(pos->first).GetBuffer());
         LangHashMap* elem=pos->second;
-        for(LangHashMap::iterator pos2=elem->begin(); pos2!=elem->end();++pos2){
+        for(LangHashMap::iterator pos2=elem->begin(); pos2!=elem->end();++pos2){	
             fprintf( stdout,"\nlanguage=%s\n",(pos2->first).GetBuffer() );
             cur=pos2->second;
             fprintf(stdout,"\n%s\n",((XMLElement*)cur)->ToOString().getStr());
-
+            
         }
     }
 }
@@ -519,15 +519,15 @@ void XMLFile::InsertL10NElement( XMLElement* pElement ){
     if( pElement->GetAttributeList() != NULL ){
         for ( ULONG j = 0; j < pElement->GetAttributeList()->Count(); j++ ){
             tmpStr=ByteString( *pElement->GetAttributeList()->GetObject( j ),RTL_TEXTENCODING_UTF8 );
-            if( tmpStr.CompareTo(ID)==COMPARE_EQUAL  ){ // Get the "id" Attribute
+            if( tmpStr.CompareTo(ID)==COMPARE_EQUAL  ){	// Get the "id" Attribute
                 id = ByteString( pElement->GetAttributeList()->GetObject( j )->GetValue(),RTL_TEXTENCODING_UTF8 );
             }
-            if( tmpStr.CompareTo( XML_LANG ) == COMPARE_EQUAL ){    // Get the "xml-lang" Attribute
+            if( tmpStr.CompareTo( XML_LANG ) == COMPARE_EQUAL ){	// Get the "xml-lang" Attribute
                 language = ByteString( pElement->GetAttributeList()->GetObject( j )->GetValue(),RTL_TEXTENCODING_UTF8 );
             }
 
         }
-    }else{
+    }else{ 
         fprintf(stdout,"XMLFile::InsertL10NElement: No AttributeList found");
         fprintf(stdout,"++++++++++++++++++++++++++++++++++++++++++++++++++");
         Print( pElement , 0 );
@@ -535,12 +535,12 @@ void XMLFile::InsertL10NElement( XMLElement* pElement ){
     }
 
     XMLHashMap::iterator pos = XMLStrings->find( id );
-    if( pos == XMLStrings->end() ){             // No instanze , create new one
+    if( pos == XMLStrings->end() ){				// No instanze , create new one
         elem = new LangHashMap();
         (*elem)[ language ]=pElement;
         XMLStrings->insert( XMLHashMap::value_type( id , elem ) );
         order.push_back( id );
-    }else{                                  // Already there
+    }else{									// Already there 
         elem=pos->second;
         if ( (*elem)[ language ] )
         {
@@ -559,22 +559,22 @@ void XMLFile::showType(XMLParentNode* node){
         case XML_NODE_TYPE_COMMENT: fprintf(stdout,"COMMENT\n") ;break;
         case XML_NODE_TYPE_DATA:    fprintf(stdout,"DATA\n")    ;break;
         case XML_NODE_TYPE_DEFAULT: fprintf(stdout,"DEFAULT\n") ;break;
-        default: break;
+        default: break;	
     }
 }
-XMLFile::XMLFile()
+XMLFile::XMLFile() 
 /*****************************************************************************/
-                : XMLParentNode( NULL ),
+                : XMLParentNode( NULL ), 
                   ID           ( "id" ),
                   OLDREF       ( "oldref" ),
                   XML_LANG     ( "xml-lang" ),
                   XMLStrings   ( NULL ){};
 
 
-XMLFile::XMLFile( const XMLFile& obj )
+XMLFile::XMLFile( const XMLFile& obj ) 
 /*****************************************************************************/
-                : XMLParentNode( obj ),
-                  sFileName    ( obj.sFileName ),
+                : XMLParentNode( obj ), 
+                  sFileName    ( obj.sFileName ), 
                   ID           ( "id" ),
                   OLDREF       ( "oldref" ),
                   XML_LANG     ( "xml-lang" ),
@@ -584,7 +584,7 @@ XMLFile::XMLFile( const XMLFile& obj )
     {
         nodes_localize  =obj.nodes_localize;
         order           =obj.order;
-
+        
     }
 }
 /*****************************************************************************/
@@ -593,26 +593,26 @@ XMLFile& XMLFile::operator=(const XMLFile& obj){
     if( this!=&obj ){
 
         XMLParentNode::operator=(obj);
-
+        
         nodes_localize  =obj.nodes_localize;
         order           =obj.order;
-
+        
         if( XMLStrings )    delete XMLStrings;
-
+        
         if( obj.XMLStrings )
         {
-            XMLStrings = new XMLHashMap();
+            XMLStrings = new XMLHashMap(); 
             for( XMLHashMap::iterator pos = obj.XMLStrings->begin() ; pos != obj.XMLStrings->end() ; ++pos )
             {
                 LangHashMap* elem=pos->second;
                 LangHashMap* newelem = new LangHashMap();
-                for(LangHashMap::iterator pos2=elem->begin(); pos2!=elem->end();++pos2){
+                for(LangHashMap::iterator pos2=elem->begin(); pos2!=elem->end();++pos2){	
                     (*newelem)[ pos2->first ] = new XMLElement( *pos2->second );
                     printf("*");
                 }
                 (*XMLStrings)[ pos->first ] = newelem;
             }
-        }
+        }                                                                                                                                    
     }
     printf("done!\n");
     return *this;
@@ -625,8 +625,8 @@ void XMLFile::SearchL10NElements( XMLParentNode *pCur , int pos)
 {
     static const ByteString LOCALIZE("localize");
     static const ByteString THEID("id");
-    bool bInsert    = true;
-    if ( !pCur )
+    bool bInsert	= true;
+    if ( !pCur ) 
         SearchL10NElements( this  );
     else {
         switch( pCur->GetNodeType()) {
@@ -643,21 +643,21 @@ void XMLFile::SearchL10NElements( XMLParentNode *pCur , int pos)
             case XML_NODE_TYPE_ELEMENT: {
                 XMLElement *pElement = ( XMLElement * ) pCur;
                 ByteString sName(pElement->GetName(),RTL_TEXTENCODING_ASCII_US);
-                ByteString language,tmpStrVal,oldref;
+                ByteString language,tmpStrVal,oldref;					
                 if ( pElement->GetAttributeList()){
                     for ( ULONG j = 0 , cnt = pElement->GetAttributeList()->Count(); j < cnt && bInsert; j++ ){
                         const ByteString tmpStr( *pElement->GetAttributeList()->GetObject( j ),RTL_TEXTENCODING_UTF8 );
-                        if( tmpStr.CompareTo(THEID)==COMPARE_EQUAL  ){  // Get the "id" Attribute
+                        if( tmpStr.CompareTo(THEID)==COMPARE_EQUAL  ){	// Get the "id" Attribute
                             tmpStrVal=ByteString( pElement->GetAttributeList()->GetObject( j )->GetValue(),RTL_TEXTENCODING_UTF8 );
                             //printf("Checking id = %s\n",tmpStrVal.GetBuffer() );
                         }
-                        if( tmpStr.CompareTo(LOCALIZE)==COMPARE_EQUAL  ){   // Get the "localize" Attribute
+                        if( tmpStr.CompareTo(LOCALIZE)==COMPARE_EQUAL  ){	// Get the "localize" Attribute
                             bInsert=false;
                         }
-                        if( tmpStr.CompareTo(XML_LANG)==COMPARE_EQUAL ){    // Get the "xml-lang" Attribute
+                        if( tmpStr.CompareTo(XML_LANG)==COMPARE_EQUAL ){	// Get the "xml-lang" Attribute
                             language=ByteString( pElement->GetAttributeList()->GetObject( j )->GetValue(),RTL_TEXTENCODING_UTF8 );
                         }
-                        if( tmpStr.CompareTo(OLDREF)==COMPARE_EQUAL ){  // Get the "oldref" Attribute
+                        if( tmpStr.CompareTo(OLDREF)==COMPARE_EQUAL ){	// Get the "oldref" Attribute
                             oldref=ByteString( pElement->GetAttributeList()->GetObject( j )->GetValue(),RTL_TEXTENCODING_UTF8 );
                         }
                     }
@@ -666,13 +666,13 @@ void XMLFile::SearchL10NElements( XMLParentNode *pCur , int pos)
                     pElement->SetOldRef     ( oldref  );
                     pElement->SetPos( pos );
                 }
-
-                if ( bInsert && ( nodes_localize.find( sName.ToLowerAscii() ) != nodes_localize.end() ) )
+                        
+                if ( bInsert && ( nodes_localize.find( sName.ToLowerAscii() ) != nodes_localize.end() ) )									
                     InsertL10NElement(pElement);
                 else if ( bInsert && pElement->GetChildList() ){
                     for ( ULONG k = 0; k < pElement->GetChildList()->Count(); k++ )
                         SearchL10NElements( (XMLParentNode*) pElement->GetChildList()->GetObject( k ) , k);
-                }
+                }				   
             }
             break;
             case XML_NODE_TYPE_DATA: {
@@ -699,8 +699,8 @@ bool XMLFile::CheckExportStatus( XMLParentNode *pCur )
     const ByteString DEPRECATED("DEPRECATED");
 
     const ByteString TOPIC("topic");
-    bool bInsert    = true;
-    if ( !pCur )
+    bool bInsert	= true;
+    if ( !pCur ) 
         CheckExportStatus( this );
     else {
         switch( pCur->GetNodeType()) {
@@ -735,7 +735,7 @@ bool XMLFile::CheckExportStatus( XMLParentNode *pCur )
                 else if ( pElement->GetChildList() ){
                     for ( ULONG k = 0; k < pElement->GetChildList()->Count(); k++ )
                         CheckExportStatus( (XMLParentNode*) pElement->GetChildList()->GetObject( k ) );//, k);
-                }
+                }				   
             }
             break;
         }
@@ -753,18 +753,18 @@ USHORT XMLElement::GetNodeType()
 /*****************************************************************************/
 XMLElement::XMLElement(const XMLElement& obj)
 /*****************************************************************************/
-    :
-                XMLParentNode   ( obj ),
-                sElementName    ( obj.sElementName ),
+    :  		
+                XMLParentNode   ( obj ),    
+                sElementName    ( obj.sElementName ), 
                 pAttributes     ( NULL ),
-                project         ( obj.project ),
-                filename        ( obj.filename ),
-                id              ( obj.id ),
-                sOldRef         ( obj.sOldRef ),
-                resourceType    ( obj.resourceType ),
+                project         ( obj.project ), 
+                filename        ( obj.filename ), 
+                id              ( obj.id ), 
+                sOldRef         ( obj.sOldRef ), 
+                resourceType    ( obj.resourceType ), 
                 languageId      ( obj.languageId ),
-                nPos            ( obj.nPos )
-
+                nPos            ( obj.nPos )    
+     
 {
     if ( obj.pAttributes ){
         pAttributes = new XMLAttributeList();
@@ -778,12 +778,12 @@ XMLElement& XMLElement::operator=(const XMLElement& obj){
 /*****************************************************************************/
     if( this!=&obj ){
         XMLParentNode::operator=(obj);
-        sElementName    =obj.sElementName;
-        project         =obj.project;
-        filename        =obj.filename;
-        id              =obj.id;
-        sOldRef         =obj.sOldRef;
-        resourceType    =obj.resourceType;
+        sElementName    =obj.sElementName; 
+        project         =obj.project; 
+        filename        =obj.filename; 
+        id              =obj.id; 
+        sOldRef         =obj.sOldRef; 
+        resourceType    =obj.resourceType; 
         languageId      =obj.languageId;
         nPos            =obj.nPos;
 
@@ -823,9 +823,9 @@ void XMLElement::ChangeLanguageTag( const String &rValue ){
         }
     }
     XMLChildNode* pNode  = NULL;
-    XMLElement*   pElem  = NULL;
+    XMLElement*   pElem  = NULL;  
     XMLChildNodeList* pCList = GetChildList();
-
+    
     if( pCList != NULL ){
         for ( ULONG i = 0; i < pCList->Count(); i++ ){
             pNode = pCList->GetObject( i );
@@ -841,14 +841,14 @@ void XMLElement::ChangeLanguageTag( const String &rValue ){
     }
 }
 /*****************************************************************************/
-XMLAttribute *XMLElement::GetAttribute( const String &rName )
+XMLAttribute *XMLElement::GetAttribute( const String &rName	)
 /*****************************************************************************/
 {
     if ( pAttributes )
         for ( ULONG i = 0; i < pAttributes->Count(); i++ )
             if ( *pAttributes->GetObject( i ) == rName )
                 return pAttributes->GetObject( i );
-
+    
     return NULL;
 }
 
@@ -859,13 +859,13 @@ XMLElement::~XMLElement()
     if ( pAttributes ) {
         for ( ULONG i = 0; i < pAttributes->Count(); i++ )
             delete pAttributes->GetObject( i );
-
+    
         delete pAttributes;
         pAttributes = NULL;
     }
 }
 /*****************************************************************************/
-bool    XMLElement::Equals(OUString refStr){
+bool	XMLElement::Equals(OUString refStr){
 /*****************************************************************************/
     return  refStr.equals( ToOUString() );
 }
@@ -893,7 +893,7 @@ OUString XMLElement::ToOUString(){
     delete buffer;
     return result;
 }
-/*****************************************************************************/
+/*****************************************************************************/		
 void XMLElement::Print(XMLNode *pCur, OUStringBuffer& buffer , bool rootelement ){
 /*****************************************************************************/
     //YD FIXME somewhere COMMENT is defined as 4!
@@ -910,7 +910,7 @@ void XMLElement::Print(XMLNode *pCur, OUStringBuffer& buffer , bool rootelement
                         tmp=pElement->GetChildList()->GetObject( k );
                         Print( tmp, buffer , false);
                     }
-                }
+                }			   
             }
         }
         else{
@@ -918,20 +918,20 @@ void XMLElement::Print(XMLNode *pCur, OUStringBuffer& buffer , bool rootelement
         switch( pCur->GetNodeType()) {
             case XML_NODE_TYPE_ELEMENT: {
                 XMLElement *pElement = ( XMLElement * ) pCur;
-
+                
                 if(  !pElement->GetName().EqualsIgnoreCaseAscii( _COMMENT ) ){
-                    buffer.append( OUString::createFromAscii("\\<") );
+                    buffer.append( OUString::createFromAscii("\\<") ); 
                     buffer.append( pElement->GetName() );
                     if ( pElement->GetAttributeList()){
                         for ( ULONG j = 0; j < pElement->GetAttributeList()->Count(); j++ ){
-
+                        
                             OUString aAttrName( *pElement->GetAttributeList()->GetObject( j ) );
                             if( !aAttrName.equalsIgnoreAsciiCase( XML_LANG ) ) {
                                 buffer.append( OUString::createFromAscii(" ") );
                                 buffer.append( aAttrName );
                                 buffer.append( OUString::createFromAscii("=") );
                                 buffer.append( OUString::createFromAscii("\\\"") );
-                                buffer.append( pElement->GetAttributeList()->GetObject( j )->GetValue() );
+                                buffer.append( pElement->GetAttributeList()->GetObject( j )->GetValue() ); 
                                 buffer.append( OUString::createFromAscii("\\\"") );
                             }
                         }
@@ -948,8 +948,8 @@ void XMLElement::Print(XMLNode *pCur, OUStringBuffer& buffer , bool rootelement
                         buffer.append( OUString::createFromAscii("\\</") );
                         buffer.append( pElement->GetName() );
                         buffer.append( OUString::createFromAscii("\\>") );
-                    }
-                }
+                    } 
+                }     
             }
             break;
             case XML_NODE_TYPE_DATA: {
@@ -960,7 +960,7 @@ void XMLElement::Print(XMLNode *pCur, OUStringBuffer& buffer , bool rootelement
             break;
             case XML_NODE_TYPE_COMMENT: {
                 XMLComment *pComment = ( XMLComment * ) pCur;
-                buffer.append( OUString::createFromAscii("<!--") );
+                buffer.append( OUString::createFromAscii("<!--") ); 
                 buffer.append( pComment->GetComment() );
                 buffer.append( OUString::createFromAscii("-->") );
             }
@@ -985,10 +985,10 @@ void XMLElement::Print(XMLNode *pCur, OUStringBuffer& buffer , bool rootelement
 /*****************************************************************************/
 XMLData::XMLData(const XMLData& obj)
 /*****************************************************************************/
-    : XMLChildNode( obj ),
-      sData( obj.sData ) ,
+    : XMLChildNode( obj ), 
+      sData( obj.sData ) , 
       isNewCreated ( obj.isNewCreated ){}
-
+     
 /*****************************************************************************/
 XMLData& XMLData::operator=(const XMLData& obj){
 /*****************************************************************************/
@@ -1000,9 +1000,9 @@ XMLData& XMLData::operator=(const XMLData& obj){
     return *this;
 }
 /*****************************************************************************/
-void XMLData::AddData( const String &rData) {
+void XMLData::AddData( const String &rData) { 
 /*****************************************************************************/
-    sData += rData;
+    sData += rData; 
 }
 
 /*****************************************************************************/
@@ -1025,12 +1025,12 @@ USHORT XMLComment::GetNodeType()
 /*****************************************************************************/
 XMLComment::XMLComment(const XMLComment& obj)
 /*****************************************************************************/
-    : XMLChildNode( obj ),
+    : XMLChildNode( obj ), 
       sComment( obj.sComment ){}
-
+     
 /*****************************************************************************/
 XMLComment& XMLComment::operator=(const XMLComment& obj){
-/*****************************************************************************/
+/*****************************************************************************/	
     if( this!=&obj ){
         XMLChildNode::operator=( obj );
         sComment        = obj.sComment;
@@ -1051,9 +1051,9 @@ USHORT XMLDefault::GetNodeType()
 /*****************************************************************************/
 XMLDefault::XMLDefault(const XMLDefault& obj)
 /*****************************************************************************/
-    : XMLChildNode( obj ),
+    : XMLChildNode( obj ), 
       sDefault( obj.sDefault){}
-
+     
 /*****************************************************************************/
 XMLDefault& XMLDefault::operator=(const XMLDefault& obj){
 /*****************************************************************************/
@@ -1094,7 +1094,7 @@ SimpleXMLParser::~SimpleXMLParser()
 }
 
 /*****************************************************************************/
-void SimpleXMLParser::StartElementHandler(
+void SimpleXMLParser::StartElementHandler( 
     void *userData, const XML_Char *name, const XML_Char **atts )
 /*****************************************************************************/
 {
@@ -1103,7 +1103,7 @@ void SimpleXMLParser::StartElementHandler(
 
 
 /*****************************************************************************/
-void SimpleXMLParser::EndElementHandler(
+void SimpleXMLParser::EndElementHandler( 
     void *userData, const XML_Char *name )
 /*****************************************************************************/
 {
@@ -1111,7 +1111,7 @@ void SimpleXMLParser::EndElementHandler(
 }
 
 /*****************************************************************************/
-void SimpleXMLParser::CharacterDataHandler(
+void SimpleXMLParser::CharacterDataHandler( 
     void *userData, const XML_Char *s, int len )
 /*****************************************************************************/
 {
@@ -1119,7 +1119,7 @@ void SimpleXMLParser::CharacterDataHandler(
 }
 
 /*****************************************************************************/
-void SimpleXMLParser::CommentHandler(
+void SimpleXMLParser::CommentHandler( 
     void *userData, const XML_Char *data )
 /*****************************************************************************/
 {
@@ -1127,7 +1127,7 @@ void SimpleXMLParser::CommentHandler(
 }
 
 /*****************************************************************************/
-void SimpleXMLParser::DefaultHandler(
+void SimpleXMLParser::DefaultHandler( 
     void *userData, const XML_Char *s, int len )
 /*****************************************************************************/
 {
@@ -1135,7 +1135,7 @@ void SimpleXMLParser::DefaultHandler(
 }
 
 /*****************************************************************************/
-void SimpleXMLParser::StartElement(
+void SimpleXMLParser::StartElement( 
     const XML_Char *name, const XML_Char **atts )
 /*****************************************************************************/
 {
@@ -1147,9 +1147,9 @@ void SimpleXMLParser::StartElement(
     int i = 0;
     while( atts[i] ) {
         pElement->AddAttribute(
-            String( XML_CHAR_TO_OUSTRING( atts[ i ] )),
-            String( XML_CHAR_TO_OUSTRING( atts[ i + 1 ] )));
-        i += 2;
+            String( XML_CHAR_TO_OUSTRING( atts[ i ] )), 
+            String( XML_CHAR_TO_OUSTRING( atts[ i + 1 ] ))); 
+        i += 2;	
     }
 }
 
@@ -1167,7 +1167,7 @@ void SimpleXMLParser::EndElement( const XML_Char *name )
 }
 
 /*****************************************************************************/
-void SimpleXMLParser::CharacterData(
+void SimpleXMLParser::CharacterData( 
     const XML_Char *s, int len )
 /*****************************************************************************/
 {
@@ -1193,20 +1193,20 @@ void SimpleXMLParser::Comment(
 }
 
 /*****************************************************************************/
-void SimpleXMLParser::Default(
+void SimpleXMLParser::Default( 
     const XML_Char *s, int len )
 /*****************************************************************************/
 {
     pCurData = NULL;
-    new XMLDefault(
-        String( XML_CHAR_N_TO_OUSTRING( s, len )), pCurNode );
+    new XMLDefault( 
+        String( XML_CHAR_N_TO_OUSTRING( s, len )), pCurNode ); 
 }
 
 /*****************************************************************************/
 XMLFile *SimpleXMLParser::Execute( const String &rFullFileName , const String &rFileName, XMLFile* pXMLFileIn )
 /*****************************************************************************/
 {
-//  printf("DBG: SimpleXMLParser::Execute( %s )", ByteString( rFileName , RTL_TEXTENCODING_ASCII_US ).GetBuffer() );
+//	printf("DBG: SimpleXMLParser::Execute( %s )", ByteString( rFileName , RTL_TEXTENCODING_ASCII_US ).GetBuffer() );
     aErrorInformation.eCode = XML_ERROR_NONE;
     aErrorInformation.nLine = 0;
     aErrorInformation.nColumn = 0;
@@ -1238,8 +1238,8 @@ XMLFile *SimpleXMLParser::Execute( SvMemoryStream *pStream )
     if ( !pXMLFile )
         pXMLFile = new XMLFile( String());
 
-    pCurNode = pXMLFile;
-    pCurData = NULL;
+    pCurNode = pXMLFile;	   
+    pCurData = NULL; 
 
     ULONG nPos = pStream->Tell();
     pStream->Seek( STREAM_SEEK_TO_END );
@@ -1263,7 +1263,7 @@ XMLFile *SimpleXMLParser::Execute( SvMemoryStream *pStream )
         aErrorInformation.nColumn = XML_GetErrorColumnNumber( aParser );
 
         aErrorInformation.sMessage = String::CreateFromAscii( "ERROR: " );
-        if ( pXMLFile->GetName().Len())
+        if ( pXMLFile->GetName().Len()) 
             aErrorInformation.sMessage += pXMLFile->GetName();
         else
             aErrorInformation.sMessage += String::CreateFromAscii( "XML-File" );
@@ -1338,15 +1338,15 @@ void XMLUtil::QuotHTML( String &rString )
                              //case '\'': sReturn += "\'";i++;break;
                              //case '&' : sRetrun += "&";i++;break;
                              default:   sReturn.append( SLASH );break;
-
+ 
                            }
                           }
-                        break;
-
-                case '<':
-                    sReturn.append( QLT );
+                        break; 
+                        
+                case '<':   
+                    sReturn.append( QLT );                                         
                     break;
-
+                
                 case '>':
                     sReturn.append( QGT );
                     break;
@@ -1355,7 +1355,7 @@ void XMLUtil::QuotHTML( String &rString )
                     sReturn.append( QQUOT );
                     break;
 
-/*              case '\'':
+/*				case '\'':
                     sReturn += "&apos;";
                     break;
 */
@@ -1363,7 +1363,7 @@ void XMLUtil::QuotHTML( String &rString )
                     if (
                           ( ( i + 4 ) < rString.Len()) &&
                           ( String( rString.Copy( i, 5 ) ).Equals( QAMP ) )
-                       )
+                       ) 
                         sReturn.append( rString.GetChar( i ) );
                     else
                         sReturn.append( QAMP );
@@ -1379,7 +1379,7 @@ void XMLUtil::QuotHTML( String &rString )
 }
 
 void XMLUtil::UnQuotHTML( String &rString ){
-    UnQuotData( rString );
+    UnQuotData( rString ); 
 }
 
 void XMLUtil::UnQuotData( String &rString_in ){
@@ -1434,7 +1434,7 @@ void XMLUtil::dump(){
     }
 }
 /*****************************************************************************/
-XMLUtil&  XMLUtil::Instance(){
+XMLUtil&  XMLUtil::Instance(){ 
 /*****************************************************************************/
     static XMLUtil instance;
     return instance;
diff --git a/l10ntools/source/xrmlex.l b/l10ntools/source/xrmlex.l
index 4770a851c741..6229525d7e84 100644
--- a/l10ntools/source/xrmlex.l
+++ b/l10ntools/source/xrmlex.l
@@ -180,10 +180,6 @@ main( int argc, char* argv[])
 	FILE *pFile;
 
 	pOutput = GetOutputFile( argc, argv );
-    if( !isQuiet() ){
-        fprintf( stdout, "\nXrmEx 0.9 Copyright 2000, 2010 Oracle and/or its affiliates. All Rights Reserved.\n" );
-	    fprintf( stdout, "===================================================================================\n" );
-    }
 
 	if ( !pOutput ) {
 		fprintf( stdout, "Syntax: XRMEX[-p Prj][-r PrjRoot]-i FileIn [-o FileOut][-m DataBase][-e][-b][-u][-NOUTF8][-L l1,l2,...]\n" );
@@ -222,7 +218,6 @@ main( int argc, char* argv[])
 	nRetValue = GetError();
 	EndXrmExport();
 
-	if( !isQuiet() ) fprintf( stdout, "\n===================================\n\n" );
     removeTempFile();
 	/* return error level */
 	return nRetValue;
diff --git a/l10ntools/source/xrmmerge.cxx b/l10ntools/source/xrmmerge.cxx
index b77f75ea04e5..7138ae6d8b07 100644
--- a/l10ntools/source/xrmmerge.cxx
+++ b/l10ntools/source/xrmmerge.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
@@ -45,23 +45,22 @@ extern "C" { int yyerror( char * ); }
 extern "C" { int YYWarning( char * ); }
 
 // defines to parse command line
-#define STATE_NON       0x0001
-#define STATE_INPUT     0x0002
-#define STATE_OUTPUT    0x0003
-#define STATE_PRJ       0x0004
-#define STATE_ROOT      0x0005
-#define STATE_MERGESRC  0x0006
-#define STATE_ERRORLOG  0x0007
-#define STATE_UTF8      0x000B
-#define STATE_LANGUAGES 0x000C
-#define STATE_ISOCODE99 0x000D
+#define STATE_NON  		0x0001
+#define STATE_INPUT		0x0002
+#define STATE_OUTPUT	0x0003
+#define STATE_PRJ		0x0004
+#define STATE_ROOT		0x0005
+#define STATE_MERGESRC	0x0006
+#define STATE_ERRORLOG	0x0007
+#define STATE_UTF8		0x000B
+#define STATE_LANGUAGES	0x000C
+#define STATE_ISOCODE99	0x000D
 
 // set of global variables
 BOOL bEnableExport;
 BOOL bMergeMode;
 BOOL bErrorLog;
 BOOL bUTF8;
-bool bQuiet;
 ByteString sPrj;
 ByteString sPrjRoot;
 ByteString sInputFileName;
@@ -87,7 +86,6 @@ extern char *GetOutputFile( int argc, char* argv[])
     sInputFileName = "";
     sActFileName = "";
     Export::sLanguages = "";
-    bQuiet = false;
     USHORT nState = STATE_NON;
     BOOL bInput = FALSE;
 
@@ -108,9 +106,6 @@ extern char *GetOutputFile( int argc, char* argv[])
         else if ( ByteString( argv[ i ] ).ToUpperAscii() == "-M" ) {
             nState = STATE_MERGESRC; // next token specifies the merge database
         }
-        else if ( ByteString( argv[ i ] ).ToUpperAscii() == "-QQ" ) {
-            bQuiet = true;
-        }
         else if ( ByteString( argv[ i ] ).ToUpperAscii() == "-E" ) {
             nState = STATE_ERRORLOG;
             bErrorLog = FALSE;
@@ -132,7 +127,7 @@ extern char *GetOutputFile( int argc, char* argv[])
         else {
             switch ( nState ) {
                 case STATE_NON: {
-                    return NULL;    // no valid command line
+                    return NULL;	// no valid command line
                 }
                 case STATE_INPUT: {
                     sInputFileName = argv[ i ];
@@ -189,7 +184,7 @@ int InitXrmExport( char *pOutput , char* pFilename)
     ByteString sOutput( pOutput );
     ByteString sFilename( pFilename );
     Export::InitLanguages( false );
-
+ 
     if ( bMergeMode )
         pParser = new XRMResMerge( sMergeSrc, sOutputFile, sFilename );
       else if ( sOutputFile.Len()) {
@@ -199,10 +194,6 @@ int InitXrmExport( char *pOutput , char* pFilename)
     return 1;
 }
 
-int isQuiet(){
-    if( bQuiet )    return 1;
-    else            return 0;
-}
 /*****************************************************************************/
 int EndXrmExport()
 /*****************************************************************************/
@@ -252,8 +243,6 @@ extern FILE *GetXrmFile()
             // (e.g.: source\ui\src\menue.src)
             sActFileName = sFullEntry.Copy( sPrjEntry.Len() + 1 );
 
-            if( !bQuiet )
-                fprintf( stdout, "\nProcessing File %s ...\n", sInputFileName.GetBuffer());
 
             sActFileName.SearchAndReplaceAll( "/", "\\" );
 
@@ -333,7 +322,7 @@ int XRMResParser::Execute( int nToken, char * pToken )
             sGID += ".";
             sGID += GetAttribute( rToken, "id" );
             //sLocalized = "1";
-
+            
             //sLocalized = "X:";
             sLocalized = true;
         break;
@@ -346,12 +335,12 @@ int XRMResParser::Execute( int nToken, char * pToken )
             sLID = "";
             sGID += ".";
             sGID += GetAttribute( rToken, "id" );
-//          if ( GetAttribute( rToken, "localized" ) == "false" )
-//              sLocalized += "0";
+//			if ( GetAttribute( rToken, "localized" ) == "false" )
+//				sLocalized += "0";
 //                sLocalized = false;
-//          else
-//              sLocalized += "1";
-                sLocalized = true;
+//			else
+//				sLocalized += "1";
+                sLocalized = true;				
         break;
 
         case XRM_PARAGRAPH_END: {
@@ -456,9 +445,9 @@ void XRMResParser::ConvertStringToDBFormat( ByteString &rString )
     do {
         sResult = rString;
         rString.EraseLeadingChars( _LF );
-    //  rString.EraseLeadingChars( ' ' );
+    //	rString.EraseLeadingChars( ' ' );
         rString.EraseLeadingChars( '\t' );
-    //  rString.EraseTrailingChars( ' ' );
+    //	rString.EraseTrailingChars( ' ' );
         rString.EraseTrailingChars( '\t' );
     } while ( sResult != rString );
 
@@ -564,7 +553,7 @@ void XRMResExport::EndOfText(
 )
 /*****************************************************************************/
 {
-
+    
     (void) rOpenTag;        // FIXME
     (void) rCloseTag;       // FIXME
 
@@ -573,7 +562,7 @@ void XRMResExport::EndOfText(
         char cSearch = 0x00;
         ByteString sSearch( cSearch );
 
-     // if ( !pResData->sText[ ByteString("en-US") ].Len() )
+     //	if ( !pResData->sText[ ByteString("en-US") ].Len() ) 
     //        pResData->sText[ ByteString("en-US") ] = pResData->sText[ ByteString("de") ];
 
         Export::FillInFallbacks( pResData );
@@ -582,7 +571,7 @@ void XRMResExport::EndOfText(
         ByteString sCur;
         for( unsigned int n = 0; n < aLanguages.size(); n++ ){
             sCur = aLanguages[ n ];
-
+        
             ByteString sAct = pResData->sText[ sCur ];
                 //Export::UnquotHTML( sAct );
                 sAct.EraseAllChars( 0x0A );
@@ -591,15 +580,15 @@ void XRMResExport::EndOfText(
                 sOutput += sPath;
                 sOutput += "\t0\t";
                 sOutput += "readmeitem\t";
-                sOutput += pResData->sId;
+                sOutput += pResData->sId; 
                 // USE LID AS GID OR MERGE DON'T WORK
-                //sOutput += pResData->sGId;
+                //sOutput += pResData->sGId; 
                 sOutput += "\t";
-                sOutput += pResData->sId;
+                sOutput += pResData->sId; 
                 sOutput += "\t\t\t0\t";
                 sOutput += sCur;
                 sOutput += "\t";
-
+                
                 sOutput += sAct; sOutput += "\t\t\t\t";
                 sOutput += sTimeStamp;
 
@@ -657,7 +646,7 @@ void XRMResMerge::WorkOnText(
     if ( pMergeDataFile ) {
         if ( !pResData ) {
             ByteString sPlatform( "" );
-//          pResData = new ResData( sPlatform, GetGID() , sFilename );
+//			pResData = new ResData( sPlatform, GetGID() , sFilename );
             pResData = new ResData( sPlatform, GetLID() , sFilename );
             pResData->sId = GetLID();
 
@@ -667,7 +656,7 @@ void XRMResMerge::WorkOnText(
         PFormEntrys *pEntrys = pMergeDataFile->GetPFormEntrys( pResData );
             if ( pEntrys ) {
                 ByteString sContent;
-                if ( Export::isAllowed( sLang ) &&
+                if ( Export::isAllowed( sLang ) && 
                     ( pEntrys->GetText(
                         sContent, STRING_TYP_TEXT, sLang )) &&
                     ( sContent != "-" ) && ( sContent.Len()))
diff --git a/o3tl/inc/o3tl/cow_wrapper.hxx b/o3tl/inc/o3tl/cow_wrapper.hxx
index 9f9248922917..e2e694f77ef1 100644
--- a/o3tl/inc/o3tl/cow_wrapper.hxx
+++ b/o3tl/inc/o3tl/cow_wrapper.hxx
@@ -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
@@ -59,12 +59,12 @@ namespace o3tl
     {
         typedef oslInterlockedCount ref_count_t;
         static void incrementCount( ref_count_t& rCount ) { osl_incrementInterlockedCount(&rCount); }
-        static bool decrementCount( ref_count_t& rCount )
-        {
+        static bool decrementCount( ref_count_t& rCount ) 
+        { 
             if( rCount == 1 ) // caller is already the only/last reference
                 return false;
             else
-                return osl_decrementInterlockedCount(&rCount) != 0;
+                return osl_decrementInterlockedCount(&rCount) != 0; 
         }
     };
 
@@ -177,13 +177,13 @@ void cow_wrapper_client::queryUnmodified() const
          */
         struct impl_t : private boost::noncopyable
         {
-            impl_t() :
+            impl_t() : 
                 m_value(),
                 m_ref_count(1)
             {
             }
 
-            explicit impl_t( const T& v ) :
+            explicit impl_t( const T& v ) : 
                 m_value(v),
                 m_ref_count(1)
             {
@@ -207,14 +207,14 @@ void cow_wrapper_client::queryUnmodified() const
 
         /** Default-construct wrapped type instance
          */
-        cow_wrapper() :
+        cow_wrapper() : 
             m_pimpl( new impl_t() )
         {
         }
 
         /** Copy-construct wrapped type instance from given object
          */
-        explicit cow_wrapper( const value_type& r ) :
+        explicit cow_wrapper( const value_type& r ) : 
             m_pimpl( new impl_t(r) )
         {
         }
@@ -240,7 +240,7 @@ void cow_wrapper_client::queryUnmodified() const
 
             release();
             m_pimpl = rSrc.m_pimpl;
-
+            
             return *this;
         }
 
@@ -253,7 +253,7 @@ void cow_wrapper_client::queryUnmodified() const
                 release();
                 m_pimpl = pimpl;
             }
-
+            
             return m_pimpl->m_value;
         }
 
@@ -273,14 +273,14 @@ void cow_wrapper_client::queryUnmodified() const
         {
             std::swap(m_pimpl, r.m_pimpl);
         }
-
-        pointer           operator->()       { return &make_unique(); }
+        
+        pointer		      operator->()       { return &make_unique(); }
         value_type&       operator*()        { return make_unique(); }
         const_pointer     operator->() const { return &m_pimpl->m_value; }
         const value_type& operator*()  const { return m_pimpl->m_value; }
 
         pointer           get()       { return &make_unique(); }
-        const_pointer     get() const { return &m_pimpl->m_value; }
+        const_pointer	  get() const { return &m_pimpl->m_value; }
 
         /// true, if both cow_wrapper internally share the same object
         bool              same_object( const cow_wrapper& rOther ) const
@@ -293,25 +293,25 @@ void cow_wrapper_client::queryUnmodified() const
     };
 
 
-    template<class T, class P> inline bool operator==( const cow_wrapper<T,P>& a,
+    template<class T, class P> inline bool operator==( const cow_wrapper<T,P>& a, 
                                                        const cow_wrapper<T,P>& b )
     {
         return a.same_object(b) ? true : *a == *b;
     }
 
-    template<class T, class P> inline bool operator!=( const cow_wrapper<T,P>& a,
+    template<class T, class P> inline bool operator!=( const cow_wrapper<T,P>& a, 
                                                        const cow_wrapper<T,P>& b )
     {
         return a.same_object(b) ? false : *a != *b;
     }
 
-    template<class A, class B, class P> inline bool operator<( const cow_wrapper<A,P>& a,
+    template<class A, class B, class P> inline bool operator<( const cow_wrapper<A,P>& a, 
                                                                const cow_wrapper<B,P>& b )
     {
         return *a < *b;
     }
 
-    template<class T, class P> inline void swap( cow_wrapper<T,P>& a,
+    template<class T, class P> inline void swap( cow_wrapper<T,P>& a, 
                                                  cow_wrapper<T,P>& b )
     {
         a.swap(b);
diff --git a/o3tl/inc/o3tl/heap_ptr.hxx b/o3tl/inc/o3tl/heap_ptr.hxx
index 581a2062fa5a..10a2488a6775 100644
--- a/o3tl/inc/o3tl/heap_ptr.hxx
+++ b/o3tl/inc/o3tl/heap_ptr.hxx
@@ -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
@@ -104,7 +104,7 @@ class heap_ptr
     const T &           operator*() const;
     T &                 operator*();
     const T *           operator->() const;
-    T *                 operator->();
+    T *			        operator->();
 
     /// True, if pHeapObject != 0.
 #ifndef __SUNPRO_CC
@@ -122,33 +122,33 @@ class heap_ptr
         Such, multiple assignment of the same pointer to the same
         instance of heap_ptr<> is possible (though not recommended).
     */
-    void                reset(
+    void		        reset(
                             T *                 pass_heapObject );
     /** @return     An object on the heap that must be deleted by the caller,
                     or 0.
 
         @postcond   get() == 0;
     */
-    T *                 release();
+    T *	  	            release();
     void                swap(
                             self &              io_other );
 
     /// True, if pHeapObject != 0.
-    bool                is() const;
-    const T *           get() const;
-    T *                 get();
+    bool			    is() const;
+    const T *		    get() const;
+    T *			        get();
 
   private:
     // Forbidden functions:
                           heap_ptr( const self & );   /// Prevent copies.
-    self &              operator=( const self & );  /// Prevent copies.
+    self &		        operator=( const self & );  /// Prevent copies.
 
     /// @attention Does not set ->pHeapObject = 0.
-      void              internal_delete();
+      void			    internal_delete();
 
   // DATA
     /// Will be deleted, when *this is destroyed.
-    T *                 pHeapObject;
+    T *		            pHeapObject;
 };
 
 
diff --git a/o3tl/inc/o3tl/lazy_update.hxx b/o3tl/inc/o3tl/lazy_update.hxx
index 92c434772afb..d546c0e8010c 100644
--- a/o3tl/inc/o3tl/lazy_update.hxx
+++ b/o3tl/inc/o3tl/lazy_update.hxx
@@ -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
@@ -102,13 +102,13 @@ output( myValue.getOutValue() );
             void               setInValue( input_type const& rIn ) { Functor::m_bCacheDirty = true; m_aInput = rIn; }
             input_type const&  getInValue()  const                 { return m_aInput; }
             output_type const& getOutValue() const                 { return implUpdateValue(m_aInput); }
-
+        
             input_type& operator*()  { Functor::m_bCacheDirty = true; return m_aInput;  }
             input_type* operator->() { Functor::m_bCacheDirty = true; return &m_aInput; }
 
             output_type const& operator*() const  { return implUpdateValue(m_aInput);  }
             output_type const* operator->() const { return &implUpdateValue(m_aInput); }
-
+        
         private:
             input_type m_aInput;
         };
@@ -179,25 +179,25 @@ output( myValue.getOutValue() );
 
     // -----------------------------------------------------------------------------------------------------
 
-    // partial specializations for the three LAZYUPDATE_* tags
+    // partial specializations for the three LAZYUPDATE_* tags 
 
     template< typename InputType, typename OutputType > class LazyUpdate<InputType,
                                                                          OutputType,
-                                                                         LAZYUPDATE_DIRECT_TAG> :
-        public detail::LazyUpdateImpl<InputType,
-                                      OutputType,
-                                      detail::DefaultFunctor<InputType, OutputType> >
+                                                                         LAZYUPDATE_DIRECT_TAG> : 
+        public detail::LazyUpdateImpl<InputType, 
+                                      OutputType, 
+                                      detail::DefaultFunctor<InputType, OutputType> > 
     {
     public:
         LazyUpdate() {}
-        explicit LazyUpdate( InputType const& rIn ) :
-            detail::LazyUpdateImpl<InputType,
-                                   OutputType,
-                                   detail::DefaultFunctor<InputType, OutputType> >(
+        explicit LazyUpdate( InputType const& rIn ) : 
+            detail::LazyUpdateImpl<InputType, 
+                                   OutputType, 
+                                   detail::DefaultFunctor<InputType, OutputType> >( 
                                        rIn,
                                        detail::LazyUpdateImpl<
-                                            InputType,
-                                            OutputType,
+                                            InputType, 
+                                            OutputType, 
                                             detail::DefaultFunctor<InputType, OutputType> >::UNARY_CONSTRUCTOR_TAG )
         {}
     };
@@ -206,29 +206,29 @@ output( myValue.getOutValue() );
 
     template< typename InputType, typename OutputType > class LazyUpdate<InputType,
                                                                          OutputType,
-                                                                         LAZYUPDATE_FUNCTION_TAG> :
-        public detail::LazyUpdateImpl<InputType,
-                                      OutputType,
+                                                                         LAZYUPDATE_FUNCTION_TAG> : 
+        public detail::LazyUpdateImpl<InputType, 
+                                      OutputType, 
                                       detail::FunctionPointer<
-                                          InputType,
+                                          InputType, 
                                           OutputType,
                                           OutputType (*)( InputType const& ) > >
     {
     public:
         explicit LazyUpdate( OutputType (*pFunc)( InputType const& ) ) :
-            detail::LazyUpdateImpl<InputType,
-                                   OutputType,
+            detail::LazyUpdateImpl<InputType, 
+                                   OutputType, 
                                    detail::FunctionPointer<
-                                       InputType,
+                                       InputType, 
                                        OutputType,
                                        OutputType (*)( InputType const& )> >(pFunc)
         {}
         LazyUpdate( OutputType (*pFunc)( InputType const& ),
                     InputType const& rIn ) :
-            detail::LazyUpdateImpl<InputType,
-                                   OutputType,
+            detail::LazyUpdateImpl<InputType, 
+                                   OutputType, 
                                    detail::FunctionPointer<
-                                       InputType,
+                                       InputType, 
                                        OutputType,
                                        OutputType (*)( InputType const& )> >(pFunc,rIn)
         {}
@@ -238,29 +238,29 @@ output( myValue.getOutValue() );
 
     template< typename InputType, typename OutputType > class LazyUpdate<InputType,
                                                                          OutputType,
-                                                                         LAZYUPDATE_FUNCTOR_TAG> :
-        public detail::LazyUpdateImpl<InputType,
-                                      OutputType,
+                                                                         LAZYUPDATE_FUNCTOR_TAG> : 
+        public detail::LazyUpdateImpl<InputType, 
+                                      OutputType, 
                                       detail::FunctionPointer<
-                                          InputType,
+                                          InputType, 
                                           OutputType,
                                           boost::function1<OutputType,InputType> > >
     {
     public:
         explicit LazyUpdate( boost::function1<OutputType,InputType> const& rFunc ) :
-            detail::LazyUpdateImpl<InputType,
-                                   OutputType,
+            detail::LazyUpdateImpl<InputType, 
+                                   OutputType, 
                                    detail::FunctionPointer<
-                                       InputType,
+                                       InputType, 
                                        OutputType,
                                        boost::function1<OutputType,InputType> > >(rFunc)
         {}
         LazyUpdate( boost::function1<OutputType,InputType> const& rFunc,
                     InputType const& rIn ) :
-            detail::LazyUpdateImpl<InputType,
-                                   OutputType,
+            detail::LazyUpdateImpl<InputType, 
+                                   OutputType, 
                                    detail::FunctionPointer<
-                                       InputType,
+                                       InputType, 
                                        OutputType,
                                        boost::function1<OutputType,InputType> > >(rFunc,rIn)
         {}
diff --git a/o3tl/inc/o3tl/range.hxx b/o3tl/inc/o3tl/range.hxx
index a4519b881fa8..fce51cb70504 100644
--- a/o3tl/inc/o3tl/range.hxx
+++ b/o3tl/inc/o3tl/range.hxx
@@ -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
diff --git a/o3tl/inc/o3tl/vector_pool.hxx b/o3tl/inc/o3tl/vector_pool.hxx
index 19fc3d6d74c4..9f80e3bc555e 100644
--- a/o3tl/inc/o3tl/vector_pool.hxx
+++ b/o3tl/inc/o3tl/vector_pool.hxx
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2008 by Sun Microsystems, Inc.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -38,14 +38,14 @@ namespace o3tl
 {
     namespace detail
     {
-        template<typename ValueType, class Container> class simple_pool_impl :
+        template<typename ValueType, class Container> class simple_pool_impl : 
             public Container
         {
             typedef typename Container::value_type value_type;
             std::ptrdiff_t mnFirstFreeIndex;
 
         public:
-            simple_pool_impl() :
+            simple_pool_impl() : 
                 mnFirstFreeIndex(-1)
             {}
 
@@ -102,7 +102,7 @@ namespace o3tl
                 {}
 
                 ValueType      value;
-                std::ptrdiff_t nextFree;
+                std::ptrdiff_t nextFree; 
             };
         };
     }
@@ -123,8 +123,8 @@ myPool[nIdx] = myVal;
 myPool.free(nIdx);
         </pre>
      */
-    template<typename ValueType> struct vector_pool :
-        public detail::simple_pool_impl<ValueType,
+    template<typename ValueType> struct vector_pool : 
+        public detail::simple_pool_impl<ValueType, 
                                        std::vector<typename detail::struct_from_value<ValueType>::type > >
     {};
 }
diff --git a/o3tl/qa/cow_wrapper_clients.cxx b/o3tl/qa/cow_wrapper_clients.cxx
index 8c8c3eac04e1..723c781a7ee2 100644
--- a/o3tl/qa/cow_wrapper_clients.cxx
+++ b/o3tl/qa/cow_wrapper_clients.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
@@ -49,7 +49,7 @@ cow_wrapper_client2::cow_wrapper_client2() : maImpl()
 {
 }
 
-cow_wrapper_client2::cow_wrapper_client2( int nVal ) :
+cow_wrapper_client2::cow_wrapper_client2( int nVal ) : 
     maImpl( cow_wrapper_client2_impl(nVal) )
 {
 }
@@ -58,7 +58,7 @@ cow_wrapper_client2::~cow_wrapper_client2()
 {
 }
 
-cow_wrapper_client2::cow_wrapper_client2( const cow_wrapper_client2& rSrc ) :
+cow_wrapper_client2::cow_wrapper_client2( const cow_wrapper_client2& rSrc ) : 
     maImpl(rSrc.maImpl)
 {
 }
@@ -80,34 +80,34 @@ int  cow_wrapper_client2::queryUnmodified() const
     return maImpl->getValue();
 }
 
-void cow_wrapper_client2::makeUnique()
-{
-    maImpl.make_unique();
+void cow_wrapper_client2::makeUnique() 
+{ 
+    maImpl.make_unique(); 
 }
-bool cow_wrapper_client2::is_unique() const
-{
-    return maImpl.is_unique();
+bool cow_wrapper_client2::is_unique() const 
+{ 
+    return maImpl.is_unique(); 
 }
 oslInterlockedCount cow_wrapper_client2::use_count() const
-{
-    return maImpl.use_count();
+{ 
+    return maImpl.use_count(); 
 }
 void cow_wrapper_client2::swap( cow_wrapper_client2& r )
-{
-    o3tl::swap(maImpl, r.maImpl);
-}
+{ 
+    o3tl::swap(maImpl, r.maImpl); 
+} 
 
 bool cow_wrapper_client2::operator==( const cow_wrapper_client2& rRHS ) const
-{
-    return maImpl == rRHS.maImpl;
+{ 
+    return maImpl == rRHS.maImpl; 
 }
 bool cow_wrapper_client2::operator!=( const cow_wrapper_client2& rRHS ) const
-{
-    return maImpl != rRHS.maImpl;
+{ 
+    return maImpl != rRHS.maImpl; 
 }
-bool cow_wrapper_client2::operator<( const cow_wrapper_client2& rRHS ) const
-{
-    return maImpl < rRHS.maImpl;
+bool cow_wrapper_client2::operator<( const cow_wrapper_client2& rRHS ) const 
+{ 
+    return maImpl < rRHS.maImpl; 
 }
 
 // ---------------------------------------------------------------------------
@@ -116,7 +116,7 @@ cow_wrapper_client3::cow_wrapper_client3() : maImpl()
 {
 }
 
-cow_wrapper_client3::cow_wrapper_client3( int nVal ) :
+cow_wrapper_client3::cow_wrapper_client3( int nVal ) : 
     maImpl( cow_wrapper_client2_impl(nVal) )
 {
 }
@@ -125,7 +125,7 @@ cow_wrapper_client3::~cow_wrapper_client3()
 {
 }
 
-cow_wrapper_client3::cow_wrapper_client3( const cow_wrapper_client3& rSrc ) :
+cow_wrapper_client3::cow_wrapper_client3( const cow_wrapper_client3& rSrc ) : 
     maImpl(rSrc.maImpl)
 {
 }
@@ -147,34 +147,34 @@ int  cow_wrapper_client3::queryUnmodified() const
     return maImpl->getValue();
 }
 
-void cow_wrapper_client3::makeUnique()
-{
-    maImpl.make_unique();
+void cow_wrapper_client3::makeUnique() 
+{ 
+    maImpl.make_unique(); 
 }
-bool cow_wrapper_client3::is_unique() const
-{
-    return maImpl.is_unique();
+bool cow_wrapper_client3::is_unique() const 
+{ 
+    return maImpl.is_unique(); 
 }
 oslInterlockedCount cow_wrapper_client3::use_count() const
-{
-    return maImpl.use_count();
+{ 
+    return maImpl.use_count(); 
 }
 void cow_wrapper_client3::swap( cow_wrapper_client3& r )
-{
-    o3tl::swap(maImpl, r.maImpl);
-}
+{ 
+    o3tl::swap(maImpl, r.maImpl); 
+} 
 
 bool cow_wrapper_client3::operator==( const cow_wrapper_client3& rRHS ) const
-{
-    return maImpl == rRHS.maImpl;
+{ 
+    return maImpl == rRHS.maImpl; 
 }
 bool cow_wrapper_client3::operator!=( const cow_wrapper_client3& rRHS ) const
-{
-    return maImpl != rRHS.maImpl;
+{ 
+    return maImpl != rRHS.maImpl; 
 }
-bool cow_wrapper_client3::operator<( const cow_wrapper_client3& rRHS ) const
-{
-    return maImpl < rRHS.maImpl;
+bool cow_wrapper_client3::operator<( const cow_wrapper_client3& rRHS ) const 
+{ 
+    return maImpl < rRHS.maImpl; 
 }
 
 } // namespace o3tltests
diff --git a/o3tl/qa/cow_wrapper_clients.hxx b/o3tl/qa/cow_wrapper_clients.hxx
index 26e5d1adf2e3..74fef0f69948 100644
--- a/o3tl/qa/cow_wrapper_clients.hxx
+++ b/o3tl/qa/cow_wrapper_clients.hxx
@@ -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
@@ -52,7 +52,7 @@ public:
     void makeUnique() { maImpl.make_unique(); }
     bool is_unique() const { return maImpl.is_unique(); }
     oslInterlockedCount use_count() const { return maImpl.use_count(); }
-    void swap( cow_wrapper_client1& r ) { o3tl::swap(maImpl, r.maImpl); }
+    void swap( cow_wrapper_client1& r ) { o3tl::swap(maImpl, r.maImpl); } 
 
     bool operator==( const cow_wrapper_client1& rRHS ) const { return maImpl == rRHS.maImpl; }
     bool operator!=( const cow_wrapper_client1& rRHS ) const { return maImpl != rRHS.maImpl; }
diff --git a/o3tl/qa/export.map b/o3tl/qa/export.map
index 3308588ef6f8..0dbbcc5a7372 100644
--- a/o3tl/qa/export.map
+++ b/o3tl/qa/export.map
@@ -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
diff --git a/o3tl/qa/test-heap_ptr.cxx b/o3tl/qa/test-heap_ptr.cxx
index fe2f78eec8af..665875a9ef24 100644
--- a/o3tl/qa/test-heap_ptr.cxx
+++ b/o3tl/qa/test-heap_ptr.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
diff --git a/o3tl/qa/test-range.cxx b/o3tl/qa/test-range.cxx
index 31cf2aec7c10..50c536f0eab9 100644
--- a/o3tl/qa/test-range.cxx
+++ b/o3tl/qa/test-range.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
diff --git a/o3tl/qa/test-vector_pool.cxx b/o3tl/qa/test-vector_pool.cxx
index 4efaebdd3414..e39b4481d8ee 100644
--- a/o3tl/qa/test-vector_pool.cxx
+++ b/o3tl/qa/test-vector_pool.cxx
@@ -55,8 +55,8 @@ public:
         CPPUNIT_ASSERT_MESSAGE("allocator value semantics 3 after fragmentation", aPool.get(nIdx3) == 2 );
     }
 
-    // Change the following lines only, if you add, remove or rename
-    // member functions of the current class,
+    // Change the following lines only, if you add, remove or rename 
+    // member functions of the current class, 
     // because these macros are need by auto register mechanism.
 
     CPPUNIT_TEST_SUITE(vector_pool_test);
diff --git a/padmin/source/adddlg.cxx b/padmin/source/adddlg.cxx
index 0f398c7e480a..a5518c36e8ea 100644
--- a/padmin/source/adddlg.cxx
+++ b/padmin/source/adddlg.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
@@ -152,7 +152,7 @@ void APChooseDriverPage::updateDrivers( bool bRefresh, const rtl::OUString& rSel
 
     std::list< rtl::OUString > aDrivers;
     psp::PPDParser::getKnownPPDDrivers( aDrivers, bRefresh );
-
+    
     rtl::OUString aSelectDriver( psp::PPDParser::getPPDPrinterName( rSelectDriver ) );
 
     rtl::OUString aSelectedEntry;
@@ -269,7 +269,7 @@ IMPL_LINK( APChooseDriverPage, ClickBtnHdl, PushButton*, pButton )
                 std::list< rtl::OUString > aDirs;
                 // get only psprint's directories, not eventual system dirs
                 psp::getPrinterPathList( aDirs, NULL );
-                std::list< rtl::OUString >::iterator dir;
+                std::list< rtl::OUString >::iterator dir;                
                 for( dir = aDirs.begin(); dir != aDirs.end(); ++dir )
                 {
                     ::std::list< String > aFiles;
@@ -387,9 +387,9 @@ APCommandPage::APCommandPage( AddPrinterDialog* pParent, DeviceKind::type eKind
     }
     switch( m_eKind )
     {
-        case DeviceKind::Printer:   CommandStore::getPrintCommands( aCommands );break;
-        case DeviceKind::Fax:       CommandStore::getFaxCommands( aCommands );break;
-        case DeviceKind::Pdf:       CommandStore::getPdfCommands( aCommands );break;
+        case DeviceKind::Printer:	CommandStore::getPrintCommands( aCommands );break;
+        case DeviceKind::Fax:		CommandStore::getFaxCommands( aCommands );break;
+        case DeviceKind::Pdf:		CommandStore::getPdfCommands( aCommands );break;
     }
     // adjust height of command text and help button
     Rectangle aPosSize( m_aCommandTxt.GetPosPixel(), m_aCommandTxt.GetSizePixel() );
@@ -432,9 +432,9 @@ APCommandPage::~APCommandPage()
     aCommands.push_back( aLastCommand );
     switch( m_eKind )
     {
-        case DeviceKind::Printer:   CommandStore::setPrintCommands( aCommands );break;
-        case DeviceKind::Fax:       CommandStore::setFaxCommands( aCommands );break;
-        case DeviceKind::Pdf:       CommandStore::setPdfCommands( aCommands );break;
+        case DeviceKind::Printer:	CommandStore::setPrintCommands( aCommands );break;
+        case DeviceKind::Fax:		CommandStore::setFaxCommands( aCommands );break;
+        case DeviceKind::Pdf:		CommandStore::setPdfCommands( aCommands );break;
     }
 }
 
@@ -545,11 +545,11 @@ APOldPrinterPage::APOldPrinterPage( AddPrinterDialog* pParent )
         String aUPrinter( AddPrinterDialog::uniquePrinterName( String( aPrinter, aEncoding ) ) );
 
         PrinterInfo aInfo;
-        aInfo.m_aDriverName     = String( aNewDriver, aEncoding );
-        aInfo.m_pParser         = pParser;
+        aInfo.m_aDriverName		= String( aNewDriver, aEncoding );
+        aInfo.m_pParser			= pParser;
         aInfo.m_aContext.setParser( pParser );
-        aInfo.m_aPrinterName    = aUPrinter;
-        aInfo.m_aCommand        = String( aCommand, aEncoding );
+        aInfo.m_aPrinterName	= aUPrinter;
+        aInfo.m_aCommand		= String( aCommand, aEncoding );
 
         // read the printer settings
         ByteString aGroup( aDriver );
diff --git a/padmin/source/adddlg.hxx b/padmin/source/adddlg.hxx
index 6cf545e130db..425f749accef 100644
--- a/padmin/source/adddlg.hxx
+++ b/padmin/source/adddlg.hxx
@@ -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
@@ -38,7 +38,7 @@
 #include "vcl/combobox.hxx"
 #include "vcl/printerinfomanager.hxx"
 
-namespace padmin
+namespace padmin 
 {
 
 class AddPrinterDialog;
@@ -47,12 +47,12 @@ namespace DeviceKind { enum type { Printer, Fax, Pdf }; }
 
 class APTabPage : public TabPage
 {
-    String              m_aTitle;
+    String				m_aTitle;
 protected:
-    AddPrinterDialog*   m_pParent;
+    AddPrinterDialog*	m_pParent;
 public:
     APTabPage( AddPrinterDialog* pParent, const ResId& rResId );
-
+    
     // returns false if information is incomplete or invalid
     virtual bool check() = 0;
     virtual void fill( ::psp::PrinterInfo& rInfo ) = 0;
@@ -61,11 +61,11 @@ public:
 
 class APChooseDevicePage : public APTabPage
 {
-    RadioButton             m_aPrinterBtn;
-    RadioButton             m_aFaxBtn;
-    RadioButton             m_aPDFBtn;
-    RadioButton             m_aOldBtn;
-    FixedText               m_aOverTxt;
+    RadioButton				m_aPrinterBtn;
+    RadioButton				m_aFaxBtn;
+    RadioButton				m_aPDFBtn;
+    RadioButton				m_aOldBtn;
+    FixedText				m_aOverTxt;
 public:
     APChooseDevicePage( AddPrinterDialog* pParent );
     ~APChooseDevicePage();
@@ -74,72 +74,72 @@ public:
     bool isFax() { return m_aFaxBtn.IsChecked(); }
     bool isPDF() { return m_aPDFBtn.IsChecked(); }
     bool isOld() { return m_aOldBtn.IsChecked(); }
-
-
+    
+    
     virtual bool check();
     virtual void fill( ::psp::PrinterInfo& rInfo );
 };
 
 class APChooseDriverPage : public APTabPage
 {
-    FixedText               m_aDriverTxt;
-    DelListBox              m_aDriverBox;
-    PushButton              m_aAddBtn;
-    PushButton              m_aRemBtn;
+    FixedText				m_aDriverTxt;
+    DelListBox				m_aDriverBox;
+    PushButton				m_aAddBtn;
+    PushButton				m_aRemBtn;
 
-    String                  m_aRemStr;
-    String                  m_aLastPrinterName;
+    String					m_aRemStr;
+    String					m_aLastPrinterName;
 
     DECL_LINK( ClickBtnHdl, PushButton* );
     DECL_LINK( DelPressedHdl, ListBox* );
-
+    
     void updateDrivers( bool bRefresh = false, const rtl::OUString& rSelectDriver = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "SGENPRT" ) ) );
 public:
     APChooseDriverPage( AddPrinterDialog* pParent );
     ~APChooseDriverPage();
-
+    
     virtual bool check();
     virtual void fill( ::psp::PrinterInfo& rInfo );
 };
 
 class APNamePage : public APTabPage
 {
-    FixedText               m_aNameTxt;
-    Edit                    m_aNameEdt;
-    CheckBox                m_aDefaultBox;
-    CheckBox                m_aFaxSwallowBox;
+    FixedText				m_aNameTxt;
+    Edit					m_aNameEdt;
+    CheckBox				m_aDefaultBox;
+    CheckBox				m_aFaxSwallowBox;
 public:
     APNamePage( AddPrinterDialog* pParent, const String& rInitName, DeviceKind::type eKind );
     ~APNamePage();
 
-    bool isDefault() { return m_aDefaultBox.IsChecked(); }
+    bool isDefault() { return m_aDefaultBox.IsChecked(); }	
     bool isFaxSwallow() { return m_aFaxSwallowBox.IsChecked(); }
 
     void setText( const String& rText ) { m_aNameEdt.SetText( rText ); }
-
+    
     virtual bool check();
     virtual void fill( ::psp::PrinterInfo& rInfo );
 };
 
 class APCommandPage : public APTabPage
 {
-    FixedText               m_aCommandTxt;
-    ComboBox                m_aCommandBox;
-    PushButton              m_aHelpBtn;
-    String                  m_aHelpTxt;
-    FixedText               m_aPdfDirTxt;
-    Edit                    m_aPdfDirEdt;
-    PushButton              m_aPdfDirBtn;
+    FixedText				m_aCommandTxt;
+    ComboBox				m_aCommandBox;
+    PushButton				m_aHelpBtn;
+    String					m_aHelpTxt;
+    FixedText				m_aPdfDirTxt;
+    Edit					m_aPdfDirEdt;
+    PushButton				m_aPdfDirBtn;
 
-    DeviceKind::type        m_eKind;
+    DeviceKind::type		m_eKind;
 
     DECL_LINK( ClickBtnHdl, PushButton* );
     DECL_LINK( ModifyHdl, ComboBox* );
 public:
-
+    
     APCommandPage( AddPrinterDialog* pParent, DeviceKind::type eKind );
     ~APCommandPage();
-
+    
     virtual bool check();
     virtual void fill( ::psp::PrinterInfo& rInfo );
 
@@ -148,17 +148,17 @@ public:
 
 class APOldPrinterPage : public APTabPage
 {
-    FixedText                           m_aOldPrinterTxt;
-    MultiListBox                        m_aOldPrinterBox;
-    PushButton                          m_aSelectAllBtn;
+    FixedText							m_aOldPrinterTxt;
+    MultiListBox						m_aOldPrinterBox;
+    PushButton							m_aSelectAllBtn;
 
-    ::std::list< ::psp::PrinterInfo >   m_aOldPrinters;
+    ::std::list< ::psp::PrinterInfo >	m_aOldPrinters;
 
     DECL_LINK( ClickBtnHdl, PushButton* );
 public:
     APOldPrinterPage( AddPrinterDialog* pParent );
     ~APOldPrinterPage();
-
+    
     virtual bool check();
     virtual void fill( ::psp::PrinterInfo& rInfo );
 
@@ -167,9 +167,9 @@ public:
 
 class APFaxDriverPage : public APTabPage
 {
-    FixedText               m_aFaxTxt;
-    RadioButton             m_aDefBtn;
-    RadioButton             m_aSelectBtn;
+    FixedText				m_aFaxTxt;
+    RadioButton				m_aDefBtn;
+    RadioButton				m_aSelectBtn;
 public:
     APFaxDriverPage( AddPrinterDialog* pParent );
     ~APFaxDriverPage();
@@ -182,10 +182,10 @@ public:
 
 class APPdfDriverPage : public APTabPage
 {
-    FixedText               m_aPdfTxt;
-    RadioButton             m_aDefBtn;
-    RadioButton             m_aDistBtn;
-    RadioButton             m_aSelectBtn;
+    FixedText				m_aPdfTxt;
+    RadioButton				m_aDefBtn;
+    RadioButton				m_aDistBtn;
+    RadioButton				m_aSelectBtn;
 public:
     APPdfDriverPage( AddPrinterDialog* pParent );
     ~APPdfDriverPage();
@@ -199,37 +199,37 @@ public:
 
 class AddPrinterDialog : public ModalDialog
 {
-    CancelButton            m_aCancelPB;
-    PushButton              m_aPrevPB;
-    PushButton              m_aNextPB;
-    OKButton                m_aFinishPB;
-    FixedLine               m_aLine;
-    TitleImage              m_aTitleImage;
-
-    ::psp::PrinterInfo      m_aPrinter;
-
-    APTabPage*              m_pCurrentPage;
-
-    APChooseDevicePage*     m_pChooseDevicePage;
-    APCommandPage*          m_pCommandPage;
-    APChooseDriverPage*     m_pChooseDriverPage;
-    APNamePage*             m_pNamePage;
-    APOldPrinterPage*       m_pOldPrinterPage;
-    APFaxDriverPage*        m_pFaxDriverPage;
-    APChooseDriverPage*     m_pFaxSelectDriverPage;
-    APNamePage*             m_pFaxNamePage;
-    APCommandPage*          m_pFaxCommandPage;
-    APPdfDriverPage*        m_pPdfDriverPage;
-    APChooseDriverPage*     m_pPdfSelectDriverPage;
-    APNamePage*             m_pPdfNamePage;
-    APCommandPage*          m_pPdfCommandPage;
-
+    CancelButton			m_aCancelPB;
+    PushButton				m_aPrevPB;
+    PushButton				m_aNextPB;
+    OKButton				m_aFinishPB;
+    FixedLine				m_aLine;
+    TitleImage				m_aTitleImage;
+
+    ::psp::PrinterInfo		m_aPrinter;
+    
+    APTabPage*				m_pCurrentPage;
+    
+    APChooseDevicePage*		m_pChooseDevicePage;
+    APCommandPage*			m_pCommandPage;
+    APChooseDriverPage*		m_pChooseDriverPage;
+    APNamePage*				m_pNamePage;
+    APOldPrinterPage*		m_pOldPrinterPage;
+    APFaxDriverPage*		m_pFaxDriverPage;
+    APChooseDriverPage*		m_pFaxSelectDriverPage;
+    APNamePage*				m_pFaxNamePage;
+    APCommandPage*			m_pFaxCommandPage;
+    APPdfDriverPage*		m_pPdfDriverPage;
+    APChooseDriverPage*		m_pPdfSelectDriverPage;
+    APNamePage*				m_pPdfNamePage;
+    APCommandPage*			m_pPdfCommandPage;
+    
     DECL_LINK( ClickBtnHdl, PushButton* );
 
     void advance();
     void back();
     void addPrinter();
-
+    
     void updateSettings();
     virtual void DataChanged( const DataChangedEvent& rEv );
 
diff --git a/padmin/source/cmddlg.cxx b/padmin/source/cmddlg.cxx
index 76d181fb8e5e..842bc4f7c84e 100644
--- a/padmin/source/cmddlg.cxx
+++ b/padmin/source/cmddlg.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
@@ -54,8 +54,8 @@ void CommandStore::getSystemPrintCommands( ::std::list< String >& rCommands )
         bOnce = true;
         PrinterInfoManager::get().getSystemPrintCommands( aSysCommands );
     }
-
-    ::std::list< OUString >::const_iterator it;
+    
+    ::std::list< OUString >::const_iterator it;	
     for( it = aSysCommands.begin(); it != aSysCommands.end(); ++it )
         rCommands.push_back( *it );
 }
@@ -72,7 +72,7 @@ void CommandStore::getSystemPdfCommands( ::std::list< String >& rCommands )
         FILE* pPipe;
         String aCommand;
         rtl_TextEncoding aEncoding = osl_getThreadTextEncoding();
-
+        
         pPipe = popen( "which gs 2>/dev/null", "r" );
         if( pPipe )
         {
@@ -155,7 +155,7 @@ void CommandStore::setCommands(
     rConfig.SetGroup( pGroup );
     ::std::list< String >::const_iterator it, loop;
     ::std::list< String > aWriteList;
-
+    
     int nWritten = 0;
     for( it = rCommands.begin(); it != rCommands.end(); ++it )
     {
@@ -219,7 +219,7 @@ void CommandStore::setFaxCommands( const ::std::list< String >& rCommands )
     ::std::list< String > aSysCmds;
     setCommands( FAX_PERSISTENCE_GROUP, rCommands, aSysCmds );
 }
-
+    
 
 RTSCommandPage::RTSCommandPage( RTSDialog* pParent ) :
         TabPage( &pParent->m_aTabControl, PaResId( RID_RTS_COMMANDPAGE ) ),
@@ -260,7 +260,7 @@ RTSCommandPage::RTSCommandPage( RTSDialog* pParent ) :
     CommandStore::getPdfCommands( m_aPdfCommands );
 
     m_aPrinterName.SetText( m_pParent->m_aPrinter );
-
+    
     m_aCommandsCB.SetDoubleClickHdl( LINK( this, RTSCommandPage, DoubleClickHdl ) );
     m_aCommandsCB.SetSelectHdl( LINK( this, RTSCommandPage, SelectHdl ) );
     m_aCommandsCB.SetModifyHdl( LINK( this, RTSCommandPage, ModifyHdl ) );
@@ -308,7 +308,7 @@ RTSCommandPage::RTSCommandPage( RTSDialog* pParent ) :
             m_bWasExternalDialog = true;
         }
     }
-
+    
     m_aQuickCB.Enable( m_aExternalCB.IsChecked() );
 
     String aString( m_aConnectedTo.GetText() );
@@ -328,14 +328,14 @@ void RTSCommandPage::save()
     bool bHaveFax = m_aConfigureBox.GetSelectEntryPos() == m_nFaxEntry ? true : false;
     bool bHavePdf = m_aConfigureBox.GetSelectEntryPos() == m_nPdfEntry ? true : false;
     ::std::list< String >::iterator it;
-
+    
     String aFeatures;
     sal_Int32 nIndex = 0;
     String aOldPdfPath;
     bool bOldFaxSwallow = false;
     bool bFaxSwallow = m_aFaxSwallowBox.IsChecked() ? true : false;
     bool bOldExternalDialog = false, bExternalDialog = m_aExternalCB.IsChecked() ? true : false;
-
+    
     while( nIndex != -1 )
     {
         OUString aToken( m_pParent->m_aJobData.m_aFeatures.getToken( 0, ',', nIndex ) );
@@ -396,24 +396,24 @@ void RTSCommandPage::save()
         ;
     if( it == pList->end() )
         pList->push_back( aCommand );
-
-    if( aCommand != String( m_pParent->m_aJobData.m_aCommand )              ||
+    
+    if( aCommand != String( m_pParent->m_aJobData.m_aCommand )		        ||
         aQuickCommand != String( m_pParent->m_aJobData.m_aQuickCommand )    ||
-        ( m_bWasFax && ! bHaveFax )                                         ||
-        ( ! m_bWasFax && bHaveFax )                                         ||
-        ( m_bWasPdf && ! bHavePdf )                                         ||
-        ( ! m_bWasPdf && bHavePdf )                                         ||
+        ( m_bWasFax && ! bHaveFax )									        ||
+        ( ! m_bWasFax && bHaveFax )									        ||
+        ( m_bWasPdf && ! bHavePdf )									        ||
+        ( ! m_bWasPdf && bHavePdf )									        ||
         ( bHavePdf && aOldPdfPath != m_aPdfDirectoryEdit.GetText() )        ||
         ( bHaveFax && bFaxSwallow != bOldFaxSwallow )                       ||
         ( m_bWasExternalDialog && ! bExternalDialog )                       ||
         ( ! m_bWasExternalDialog && bExternalDialog )
         )
     {
-        m_pParent->m_aJobData.m_aCommand        = aCommand;
+        m_pParent->m_aJobData.m_aCommand	    = aCommand;
         m_pParent->m_aJobData.m_aQuickCommand   = aQuickCommand;
-        m_pParent->m_aJobData.m_aFeatures       = aFeatures;
-
-        PrinterInfoManager::get().changePrinterInfo( m_pParent->m_aPrinter, m_pParent->m_aJobData );
+        m_pParent->m_aJobData.m_aFeatures	    = aFeatures;
+        
+        PrinterInfoManager::get().changePrinterInfo( m_pParent->m_aPrinter, m_pParent->m_aJobData );		
     }
     CommandStore::setPrintCommands( m_aPrinterCommands );
     CommandStore::setFaxCommands( m_aFaxCommands );
@@ -437,7 +437,7 @@ IMPL_LINK( RTSCommandPage, SelectHdl, Control*, pBox )
     {
         m_aRemovePB.Enable( TRUE );
     }
-
+    
     return 0;
 }
 
@@ -495,7 +495,7 @@ IMPL_LINK( RTSCommandPage, ModifyHdl, Edit*, pEdit )
 {
     if( pEdit == &m_aCommandsCB )
         m_aRemovePB.Enable( m_aCommandsCB.GetEntryPos( m_aCommandsCB.GetText() ) != LISTBOX_ENTRY_NOTFOUND );
-
+    
     return 0;
 }
 
diff --git a/padmin/source/cmddlg.hxx b/padmin/source/cmddlg.hxx
index 9e6d12cf4277..c5257ec8d63d 100644
--- a/padmin/source/cmddlg.hxx
+++ b/padmin/source/cmddlg.hxx
@@ -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
@@ -52,64 +52,64 @@ class CommandStore
     static void getSystemPrintCommands( ::std::list< String >& rCommands );
     static void getSystemPdfCommands( ::std::list< String >& rCommands );
     static void setCommands( const char* pGroup, const ::std::list< String >& rCommands, const ::std::list< String >& rSysCommands );
-
+    
 public:
     static void getPrintCommands( ::std::list< String >& rCommands );
     static void getFaxCommands( ::std::list< String >& rCommands );
     static void getPdfCommands( ::std::list< String >& rCommands );
-
+    
     static void setPrintCommands( const ::std::list< String >& rCommands );
     static void setFaxCommands( const ::std::list< String >& rCommands );
     static void setPdfCommands( const ::std::list< String >& rCommands );
 };
-
+    
 class RTSCommandPage : public TabPage
 {
 private:
-    RTSDialog*                      m_pParent;
-
-    ComboBox                        m_aCommandsCB;
+    RTSDialog*						m_pParent;
+    
+    ComboBox     					m_aCommandsCB;
     CheckBox                        m_aExternalCB;
     FixedText                       m_aQuickFT;
     ComboBox                        m_aQuickCB;
-    FixedLine                       m_aCommandTitle;
-    FixedText                       m_aPrinterName;
-    FixedText                       m_aConnectedTo;
-    FixedLine                       m_aPrinterFL;
-
-    FixedText                       m_aConfigureText;
-    ListBox                         m_aConfigureBox;
-    USHORT                          m_nPrinterEntry;
-    USHORT                          m_nFaxEntry;
-    USHORT                          m_nPdfEntry;
-    FixedText                       m_aPdfDirectoryText;
-    PushButton                      m_aPdfDirectoryButton;
-    Edit                            m_aPdfDirectoryEdit;
-    CheckBox                        m_aFaxSwallowBox;
-
-    PushButton                      m_aHelpButton;
-    PushButton                      m_aRemovePB;
-
-    ::std::list< String >           m_aPrinterCommands;
-    ::std::list< String >           m_aFaxCommands;
-    ::std::list< String >           m_aPdfCommands;
-
-    String                          m_aFaxHelp;
-    String                          m_aPrinterHelp;
-    String                          m_aPdfHelp;
-
-    bool                            m_bWasFax;
-    bool                            m_bWasPdf;
+    FixedLine     					m_aCommandTitle;
+    FixedText    					m_aPrinterName;
+    FixedText    					m_aConnectedTo;
+    FixedLine     					m_aPrinterFL;
+        
+    FixedText						m_aConfigureText;
+    ListBox							m_aConfigureBox;
+    USHORT							m_nPrinterEntry;
+    USHORT							m_nFaxEntry;
+    USHORT							m_nPdfEntry;
+    FixedText						m_aPdfDirectoryText;
+    PushButton						m_aPdfDirectoryButton;
+    Edit							m_aPdfDirectoryEdit;
+    CheckBox						m_aFaxSwallowBox;
+        
+    PushButton						m_aHelpButton;
+    PushButton						m_aRemovePB;
+
+    ::std::list< String >			m_aPrinterCommands;
+    ::std::list< String >			m_aFaxCommands;
+    ::std::list< String >			m_aPdfCommands;
+        
+    String							m_aFaxHelp;
+    String							m_aPrinterHelp;
+    String							m_aPdfHelp;
+
+    bool							m_bWasFax;
+    bool							m_bWasPdf;
     bool                            m_bWasExternalDialog;
-
+        
     DECL_LINK( DoubleClickHdl, ComboBox* );
     DECL_LINK( ClickBtnHdl, Button* );
     DECL_LINK( SelectHdl, Control* );
     DECL_LINK( ModifyHdl, Edit* );
-
+        
     void ConnectCommand();
     void UpdateCommands();
-
+        
 public:
     RTSCommandPage( RTSDialog* );
     ~RTSCommandPage();
diff --git a/padmin/source/desktopcontext.cxx b/padmin/source/desktopcontext.cxx
index 25db25bfaa31..55de504793fd 100644
--- a/padmin/source/desktopcontext.cxx
+++ b/padmin/source/desktopcontext.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
diff --git a/padmin/source/desktopcontext.hxx b/padmin/source/desktopcontext.hxx
index 13dcdd4c0105..0c100aed7923 100644
--- a/padmin/source/desktopcontext.hxx
+++ b/padmin/source/desktopcontext.hxx
@@ -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
diff --git a/padmin/source/fontentry.cxx b/padmin/source/fontentry.cxx
index f67d2c0d18d6..5a781d54cf0c 100644
--- a/padmin/source/fontentry.cxx
+++ b/padmin/source/fontentry.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
@@ -187,35 +187,35 @@ String FontNameDlg::fillFontEntry( FastPrintFontInfo& rInfo, const String& rFile
     bool bWeight = true, bItalic = true, bWidth = true;
     switch( rInfo.m_eWeight )
     {
-        case weight::Thin:          aEntry.AppendAscii( ", " ); aEntry.Append( aThinTxt ); break;
-        case weight::UltraLight:    aEntry.AppendAscii( ", " ); aEntry.Append( aUltraLightTxt ); break;
-        case weight::Light:         aEntry.AppendAscii( ", " ); aEntry.Append( aLightTxt ); break;
-        case weight::SemiLight:     aEntry.AppendAscii( ", " ); aEntry.Append( aSemiLightTxt ); break;
-        case weight::SemiBold:      aEntry.AppendAscii( ", " ); aEntry.Append( aSemiBoldTxt ); break;
-        case weight::Bold:          aEntry.AppendAscii( ", " ); aEntry.Append( aBoldTxt ); break;
-        case weight::UltraBold:     aEntry.AppendAscii( ", " ); aEntry.Append( aUltraBoldTxt ); break;
+        case weight::Thin:			aEntry.AppendAscii( ", " ); aEntry.Append( aThinTxt ); break;
+        case weight::UltraLight:	aEntry.AppendAscii( ", " ); aEntry.Append( aUltraLightTxt ); break;
+        case weight::Light:			aEntry.AppendAscii( ", " ); aEntry.Append( aLightTxt ); break;
+        case weight::SemiLight:		aEntry.AppendAscii( ", " ); aEntry.Append( aSemiLightTxt ); break;
+        case weight::SemiBold:		aEntry.AppendAscii( ", " ); aEntry.Append( aSemiBoldTxt ); break;
+        case weight::Bold:			aEntry.AppendAscii( ", " ); aEntry.Append( aBoldTxt ); break;
+        case weight::UltraBold:		aEntry.AppendAscii( ", " ); aEntry.Append( aUltraBoldTxt ); break;
         default:
             bWeight = false;
             break;
     }
     switch( rInfo.m_eItalic )
     {
-        case italic::Oblique:       aEntry.AppendAscii( ", " ); aEntry.Append( aObliqueTxt ); break;
-        case italic::Italic:        aEntry.AppendAscii( ", " ); aEntry.Append( aItalicTxt ); break;
+        case italic::Oblique:		aEntry.AppendAscii( ", " ); aEntry.Append( aObliqueTxt ); break;
+        case italic::Italic:		aEntry.AppendAscii( ", " ); aEntry.Append( aItalicTxt ); break;
         default:
             bItalic = false;
             break;
     }
     switch( rInfo.m_eWidth )
     {
-        case width::UltraCondensed: aEntry.AppendAscii( ", " ); aEntry.Append( aUltraCondensedTxt ); break;
-        case width::ExtraCondensed: aEntry.AppendAscii( ", " ); aEntry.Append( aExtraCondensedTxt ); break;
-        case width::Condensed:      aEntry.AppendAscii( ", " ); aEntry.Append( aCondensedTxt ); break;
-        case width::SemiCondensed:  aEntry.AppendAscii( ", " ); aEntry.Append( aSemiCondensedTxt ); break;
-        case width::SemiExpanded:   aEntry.AppendAscii( ", " ); aEntry.Append( aSemiExpandedTxt ); break;
-        case width::Expanded:       aEntry.AppendAscii( ", " ); aEntry.Append( aExpandedTxt ); break;
-        case width::ExtraExpanded:  aEntry.AppendAscii( ", " ); aEntry.Append( aExtraExpandedTxt ); break;
-        case width::UltraExpanded:  aEntry.AppendAscii( ", " ); aEntry.Append( aUltraExpandedTxt ); break;
+        case width::UltraCondensed:	aEntry.AppendAscii( ", " ); aEntry.Append( aUltraCondensedTxt ); break;
+        case width::ExtraCondensed:	aEntry.AppendAscii( ", " ); aEntry.Append( aExtraCondensedTxt ); break;
+        case width::Condensed:		aEntry.AppendAscii( ", " ); aEntry.Append( aCondensedTxt ); break;
+        case width::SemiCondensed:	aEntry.AppendAscii( ", " ); aEntry.Append( aSemiCondensedTxt ); break;
+        case width::SemiExpanded:	aEntry.AppendAscii( ", " ); aEntry.Append( aSemiExpandedTxt ); break;
+        case width::Expanded:		aEntry.AppendAscii( ", " ); aEntry.Append( aExpandedTxt ); break;
+        case width::ExtraExpanded:	aEntry.AppendAscii( ", " ); aEntry.Append( aExtraExpandedTxt ); break;
+        case width::UltraExpanded:	aEntry.AppendAscii( ", " ); aEntry.Append( aUltraExpandedTxt ); break;
         default:
             bWidth = false;
             break;
@@ -507,10 +507,10 @@ bool FontImportDialog::queryOverwriteFile( const ::rtl::OUString& rFile )
     int nResult = aQueryBox.Execute();
     switch( nResult )
     {
-        case BUTTONID_YES:      bRet = true; break;
-        case BUTTONID_NO:       bRet = false; break;
-        case 20:                bRet = m_bOverwriteAll = true; break;
-        case 21:                bRet = false; m_bOverwriteNone = true; break;
+        case BUTTONID_YES:		bRet = true; break;
+        case BUTTONID_NO:		bRet = false; break;
+        case 20:				bRet = m_bOverwriteAll = true; break;
+        case 21:				bRet = false; m_bOverwriteNone = true; break;
     }
 
     return bRet;
diff --git a/padmin/source/fontentry.hxx b/padmin/source/fontentry.hxx
index c9585564be9f..483ab0432daa 100644
--- a/padmin/source/fontentry.hxx
+++ b/padmin/source/fontentry.hxx
@@ -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
@@ -47,52 +47,52 @@ namespace padmin {
         public ModalDialog,
         public ::psp::PrintFontManager::ImportFontCallback
     {
-        OKButton                            m_aOKBtn;
-        CancelButton                        m_aCancelBtn;
-        PushButton                          m_aSelectAllBtn;
-        ListBox                             m_aNewFontsBox;
-        FixedLine                           m_aFromFL;
-        Edit                                m_aFromDirEdt;
-        PushButton                          m_aFromBtn;
-        CheckBox                            m_aSubDirsBox;
-        FixedLine                           m_aTargetOptFL;
-        CheckBox                            m_aLinkOnlyBox;
-        FixedText                           m_aFixedText;
-        bool                                m_bOverwriteAll;
-        bool                                m_bOverwriteNone;
-        ProgressDialog*                     m_pProgress;
-        int                                 m_nFont;
-
-        String                              m_aImportOperation;
-        String                              m_aOverwriteQueryText;
-        String                              m_aOverwriteAllText;
-        String                              m_aOverwriteNoneText;
-        String                              m_aNoAfmText;
-        String                              m_aAfmCopyFailedText;
-        String                              m_aFontCopyFailedText;
-        String                              m_aNoWritableFontsDirText;
-        String                              m_aFontsImportedText;
+        OKButton							m_aOKBtn;
+        CancelButton						m_aCancelBtn;
+        PushButton							m_aSelectAllBtn;
+        ListBox								m_aNewFontsBox;
+        FixedLine							m_aFromFL;
+        Edit								m_aFromDirEdt;
+        PushButton							m_aFromBtn;
+        CheckBox							m_aSubDirsBox;
+        FixedLine							m_aTargetOptFL;
+        CheckBox							m_aLinkOnlyBox;
+        FixedText							m_aFixedText;
+        bool								m_bOverwriteAll;
+        bool								m_bOverwriteNone;
+        ProgressDialog*						m_pProgress;
+        int									m_nFont;
+        
+        String								m_aImportOperation;
+        String								m_aOverwriteQueryText;
+        String								m_aOverwriteAllText;
+        String								m_aOverwriteNoneText;
+        String								m_aNoAfmText;
+        String								m_aAfmCopyFailedText;
+        String								m_aFontCopyFailedText;
+        String								m_aNoWritableFontsDirText;
+        String								m_aFontsImportedText;
 
         ::std::hash_map< ::rtl::OString, ::std::list< ::psp::FastPrintFontInfo >, ::rtl::OStringHash >
                                             m_aNewFonts;
-
-        Timer                               m_aRefreshTimer;
+        
+        Timer								m_aRefreshTimer;
         DECL_LINK( RefreshTimeoutHdl, void* );
 
-
-        ::psp::PrintFontManager&            m_rFontManager;
-
+        
+        ::psp::PrintFontManager&			m_rFontManager;
+        
         DECL_LINK( ClickBtnHdl, Button* );
         DECL_LINK( ModifyHdl, Edit* );
         DECL_LINK( ToggleHdl, CheckBox* );
-
+        
         // implement ImportFontCallback
         virtual void importFontsFailed( ::psp::PrintFontManager::ImportFontCallback::FailCondition eReason );
         virtual void progress( const ::rtl::OUString& rFile );
         virtual bool queryOverwriteFile( const ::rtl::OUString& rFile );
         virtual void importFontFailed( const ::rtl::OUString& rFile, ::psp::PrintFontManager::ImportFontCallback::FailCondition eReason );
         virtual bool isCanceled();
-
+        
         void copyFonts();
         void fillFontBox();
     public:
@@ -103,19 +103,19 @@ namespace padmin {
     class FontNameDlg : public ModalDialog
     {
     private:
-        OKButton                    m_aOKButton;
-        PushButton                  m_aRenameButton;
-        PushButton                  m_aRemoveButton;
-        PushButton                  m_aImportButton;
+        OKButton           			m_aOKButton;
+        PushButton					m_aRenameButton;
+        PushButton         			m_aRemoveButton;
+        PushButton					m_aImportButton;
+        
+        DelListBox            		m_aFontBox;		
+        FixedText          			m_aFixedText;
 
-        DelListBox                  m_aFontBox;
-        FixedText                   m_aFixedText;
+        String						m_aRenameString;
+        String						m_aRenameTTCString;
+        String						m_aNoRenameString;
 
-        String                      m_aRenameString;
-        String                      m_aRenameTTCString;
-        String                      m_aNoRenameString;
-
-        ::psp::PrintFontManager&    m_rFontManager;
+        ::psp::PrintFontManager&	m_rFontManager;
 
         // maps fontID to XLFD
         ::std::hash_map< ::psp::fontID, String >
@@ -124,7 +124,7 @@ namespace padmin {
     public:
         FontNameDlg( Window* );
         ~FontNameDlg();
-
+        
         DECL_LINK( ClickBtnHdl, Button* );
         DECL_LINK( DelPressedHdl, ListBox* );
         DECL_LINK( SelectHdl, ListBox* );
diff --git a/padmin/source/helper.cxx b/padmin/source/helper.cxx
index b81d37df5cb1..4b7f09411ec0 100644
--- a/padmin/source/helper.cxx
+++ b/padmin/source/helper.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
@@ -57,7 +57,7 @@ using namespace com::sun::star::ui::dialogs;
 #define MAX_PATH 1024
 
 /*
- *  PaResId
+ *	PaResId
  */
 
 ResId padmin::PaResId( sal_uInt32 nId )
@@ -66,8 +66,8 @@ ResId padmin::PaResId( sal_uInt32 nId )
     if( ! pPaResMgr )
     {
         ::com::sun::star::lang::Locale aLocale;
-//      LanguageType nLang = LANGUAGE_SYSTEM;
-
+//		LanguageType nLang = LANGUAGE_SYSTEM;
+       
         utl::OConfigurationNode aNode =
             utl::OConfigurationTreeRoot::tryCreateWithServiceFactory(
                     vcl::unohelper::GetMultiServiceFactory(),
@@ -97,7 +97,7 @@ ResId padmin::PaResId( sal_uInt32 nId )
 }
 
 /*
- *  FindFiles
+ *	FindFiles
  */
 
 void padmin::FindFiles( const String& rDirectory, ::std::list< String >& rResult, const String& rSuffixes, bool bRecursive )
@@ -112,7 +112,7 @@ void padmin::FindFiles( const String& rDirectory, ::std::list< String >& rResult
     DirectoryItem aItem;
     while( aDir.getNextItem( aItem ) == FileBase::E_None )
     {
-        FileStatus aStatus( FileStatusMask_FileName         |
+        FileStatus aStatus( FileStatusMask_FileName			|
                             FileStatusMask_Type
                             );
         if( aItem.getFileStatus( aStatus ) == FileBase::E_None )
@@ -150,7 +150,7 @@ void padmin::FindFiles( const String& rDirectory, ::std::list< String >& rResult
                     aSubFile.appendAscii( "/", 1 );
                     aSubFile.append( *it );
                     rResult.push_back( aSubFile.makeStringAndClear() );
-                }
+                }   
             }
         }
     }
@@ -158,7 +158,7 @@ void padmin::FindFiles( const String& rDirectory, ::std::list< String >& rResult
 }
 
 /*
- *  DelMultiListBox
+ *	DelMultiListBox
  */
 
 long DelMultiListBox::Notify( NotifyEvent& rEvent )
@@ -178,7 +178,7 @@ long DelMultiListBox::Notify( NotifyEvent& rEvent )
 }
 
 /*
- *  DelListBox
+ *	DelListBox
  */
 
 long DelListBox::Notify( NotifyEvent& rEvent )
@@ -198,7 +198,7 @@ long DelListBox::Notify( NotifyEvent& rEvent )
 }
 
 /*
- *  QueryString
+ *	QueryString
  */
 
 QueryString::QueryString( Window* pParent, String& rQuery, String& rRet, const ::std::list< String >& rChoices ) :
@@ -248,7 +248,7 @@ IMPL_LINK( QueryString, ClickBtnHdl, Button*, pButton )
 }
 
 /*
- *  AreYouSure
+ *	AreYouSure
  */
 
 BOOL padmin::AreYouSure( Window* pParent, int nRid )
@@ -261,7 +261,7 @@ BOOL padmin::AreYouSure( Window* pParent, int nRid )
 }
 
 /*
- *  getPadminRC
+ *	getPadminRC
  */
 
 static Config* pRC = NULL;
diff --git a/padmin/source/helper.hxx b/padmin/source/helper.hxx
index 636241b826a6..381c436fa0f0 100644
--- a/padmin/source/helper.hxx
+++ b/padmin/source/helper.hxx
@@ -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
@@ -54,14 +54,14 @@ namespace padmin
 {
 class DelMultiListBox : public MultiListBox
 {
-    Link            m_aDelPressedLink;
+    Link			m_aDelPressedLink;
 public:
     DelMultiListBox( Window* pParent, const ResId& rResId ) :
             MultiListBox( pParent, rResId ) {}
     ~DelMultiListBox() {}
-
+    
     virtual long Notify( NotifyEvent& rEvent );
-
+    
     Link setDelPressedLink( const Link& rLink )
     {
         Link aOldLink( m_aDelPressedLink );
@@ -73,14 +73,14 @@ public:
 
 class DelListBox : public ListBox
 {
-    Link            m_aDelPressedLink;
+    Link			m_aDelPressedLink;
 public:
     DelListBox( Window* pParent, const ResId& rResId ) :
                 ListBox( pParent, rResId ) {}
     ~DelListBox() {}
-
+    
     virtual long Notify( NotifyEvent& rEvent );
-
+    
     Link setDelPressedLink( const Link& rLink )
     {
         Link aOldLink( m_aDelPressedLink );
@@ -97,13 +97,13 @@ private:
     CancelButton m_aCancelButton;
     FixedText    m_aFixedText;
     Edit         m_aEdit;
-    ComboBox     m_aComboBox;
-
+    ComboBox	 m_aComboBox;
+    
     String&      m_rReturnValue;
-    bool         m_bUseEdit;
-
+    bool		 m_bUseEdit;
+    
     DECL_LINK( ClickBtnHdl, Button* );
-
+    
 public:
     QueryString( Window*, String &, String &, const ::std::list< String >& rChoices = ::std::list<String>() );
     // parent window, Query text, initial value
diff --git a/padmin/source/newppdlg.cxx b/padmin/source/newppdlg.cxx
index e1760c28db30..d87651d4c980 100644
--- a/padmin/source/newppdlg.cxx
+++ b/padmin/source/newppdlg.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
diff --git a/padmin/source/newppdlg.hxx b/padmin/source/newppdlg.hxx
index 5b4aa9f755eb..d1cbe1385903 100644
--- a/padmin/source/newppdlg.hxx
+++ b/padmin/source/newppdlg.hxx
@@ -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
@@ -40,37 +40,37 @@
 namespace psp { class PPDParser; }
 
 namespace padmin {
-
+    
     class PPDImportDialog : public ModalDialog
     {
-        OKButton            m_aOKBtn;
-        CancelButton        m_aCancelBtn;
-        FixedText           m_aPathTxt;
-        ComboBox            m_aPathBox;
-        PushButton          m_aSearchBtn;
-        FixedText           m_aDriverTxt;
-        MultiListBox        m_aDriverLB;
-
-        FixedLine           m_aPathGroup;
-        FixedLine           m_aDriverGroup;
-
-        String              m_aLoadingPPD;
-
+        OKButton			m_aOKBtn;
+        CancelButton		m_aCancelBtn;
+        FixedText			m_aPathTxt;
+        ComboBox			m_aPathBox;
+        PushButton			m_aSearchBtn;
+        FixedText			m_aDriverTxt;
+        MultiListBox		m_aDriverLB;
+        
+        FixedLine			m_aPathGroup;
+        FixedLine			m_aDriverGroup;
+        
+        String				m_aLoadingPPD;
+        
         DECL_LINK( ClickBtnHdl, PushButton* );
         DECL_LINK( SelectHdl, ComboBox* );
         DECL_LINK( ModifyHdl, ComboBox* );
-
+        
         void Import();
-
+        
         std::list< rtl::OUString >  m_aImportedFiles;
     public:
         PPDImportDialog( Window* pParent );
         ~PPDImportDialog();
-
+        
         const std::list< rtl::OUString >& getImportedFiles() const
         { return m_aImportedFiles; }
     };
-
-} // namespace
+    
+} // namespace 
 
 #endif // _NEWPPDLG_HXX
diff --git a/padmin/source/padialog.cxx b/padmin/source/padialog.cxx
index 583e14c06caa..b5c665398452 100644
--- a/padmin/source/padialog.cxx
+++ b/padmin/source/padialog.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
@@ -126,7 +126,7 @@ void PADialog::Init()
     // #i79787# initially ensure printer discovery has ended
     m_rPIManager.checkPrintersChanged( true );
     m_aCUPSCB.Check( m_rPIManager.isCUPSDisabled() );
-
+    
     UpdateDevice();
     UpdateText();
 
@@ -371,7 +371,7 @@ public:
     {}
     virtual ~SpaPrinterController()
     {}
-
+    
     virtual int getPageCount() const { return 1; }
     virtual Sequence< PropertyValue > getPageParameters( int i_nPage ) const;
     virtual void printPage( int i_nPage ) const;
@@ -381,22 +381,22 @@ public:
 Sequence< PropertyValue > SpaPrinterController::getPageParameters( int ) const
 {
     Sequence< PropertyValue > aRet( 1 );
-
+    
     Size aPageSize( getPrinter()->GetPaperSizePixel() );
     aPageSize = getPrinter()->PixelToLogic( aPageSize, MapMode( MAP_100TH_MM ) );
-
+    
     awt::Size aSize;
     aSize.Width = aPageSize.Width();
     aSize.Height = aPageSize.Height();
     aRet[0].Value = makeAny(aSize);
-
+    
     return aRet;
 }
 
 void SpaPrinterController::printPage( int ) const
 {
     const double DELTA = 5.0;
-
+    
     boost::shared_ptr<Printer> pPrinter( getPrinter() );
 
     PrinterInfo aInfo( psp::PrinterInfoManager::get().getPrinterInfo( pPrinter->GetName() ) );
@@ -706,7 +706,7 @@ void PADialog::RenameDevice()
 void PADialog::UpdateDevice()
 {
     m_aDevicesLB.Clear();
-
+    
     m_rPIManager.listPrinters( m_aPrinters );
     ::std::list< OUString >::iterator it;
     for( it = m_aPrinters.begin(); it != m_aPrinters.end(); ++it )
diff --git a/padmin/source/padialog.hrc b/padmin/source/padialog.hrc
index 2f238592231a..bd53ebdeb7b9 100644
--- a/padmin/source/padialog.hrc
+++ b/padmin/source/padialog.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
@@ -33,7 +33,7 @@
 #define RID_PA_BTN_STD                      2
 #define RID_PA_BTN_DEL                      3
 #define RID_PA_LB_DEV                       4
-#define RID_PA_FL_PRINTERS                   5
+#define RID_PA_FL_PRINTERS                	 5
 #define RID_PA_BTN_CONF                     6
 #define RID_PA_BTN_RENAME                   7
 #define RID_PA_TESTPAGE                     8
@@ -50,7 +50,7 @@
 #define RID_PA_BTN_ADD                      19
 #define RID_PA_BTN_ADDFONTS                 20
 #define RID_PA_STR_RENAME                   21
-#define RID_PA_FL_SEPBUTTON                 22
+#define RID_PA_FL_SEPBUTTON				    22
 #define RID_PA_FL_CUPSUSAGE                 23
 #define RID_PA_CB_CUPSUSAGE                 23
 
@@ -59,7 +59,7 @@
 #define RID_STRQRY_EDT_NEWNAME        2
 #define RID_STRQRY_BTN_OK             3
 #define RID_STRQRY_BTN_CANCEL         4
-#define RID_STRQRY_BOX_NEWNAME         5
+#define RID_STRQRY_BOX_NEWNAME		   5
 
 #define RID_PPDIMPORT_DLG          1004
 #define RID_PPDIMP_BTN_OK             1
@@ -103,37 +103,37 @@
 #define RID_FNTNM_BTN_REMOVE               3
 #define RID_FNTNM_LB_FONTS                 4
 #define RID_FNTNM_BTN_IMPORT               5
-#define RID_FNTNM_BTN_RENAME                6
-#define RID_FNTNM_STR_RENAME                7
-#define RID_FNTNM_STR_TTCRENAME         8
-#define RID_FNTNM_STR_NOTRENAMABLE          9
-
-#define RID_TXT_REFETCH                 1031
-
-#define RID_BXT_TESTPAGE                1034
-#define RID_BXT_ENVIRONMENT             1035
-
-#define RID_YOU_SURE                    1040
-
-#define RID_ERR_REMOVEDRIVERFAILED          1041
-
-#define RID_BUTTERFLY                   1047
-
-#define RID_COMMAND_TXT_MODIFY              1049
-#define RID_COMMAND_TXT_ADDENTRY            1050
-#define RID_ERR_REMOVESGENPRT               1051
-#define RID_PA_TXT_NOWRITE              1052
-#define RID_DOUBLEFONTFILE              1053
-#define RID_INVALIDFONTPATH             1054
-#define RID_TESTPAGESAVE                1055
-#define RID_FNTNM_FONTNAME_TXT          1056
-#define RID_FNTNM_NOFONT_TXT            1057
-#define RID_QUERY_REMOVEDRIVER          1058
-#define RID_QUERY_REMOVEPRINTER         1059
-#define RID_QUERY_REMOVEFONTFROMLIST        1060
-#define RID_QUERY_DRIVERUSED            1062
-#define RID_ERR_REMOVEDEFAULTDRIVER         1063
-#define RID_ERR_WRITEFONTSDIR           1064
+#define RID_FNTNM_BTN_RENAME				6
+#define RID_FNTNM_STR_RENAME				7
+#define RID_FNTNM_STR_TTCRENAME			8
+#define RID_FNTNM_STR_NOTRENAMABLE			9
+
+#define RID_TXT_REFETCH            		1031
+
+#define RID_BXT_TESTPAGE           		1034
+#define RID_BXT_ENVIRONMENT        		1035
+
+#define RID_YOU_SURE               		1040
+
+#define RID_ERR_REMOVEDRIVERFAILED			1041
+
+#define RID_BUTTERFLY              		1047
+
+#define RID_COMMAND_TXT_MODIFY        		1049
+#define RID_COMMAND_TXT_ADDENTRY      		1050
+#define RID_ERR_REMOVESGENPRT 				1051
+#define RID_PA_TXT_NOWRITE         		1052
+#define RID_DOUBLEFONTFILE         		1053
+#define RID_INVALIDFONTPATH        		1054
+#define RID_TESTPAGESAVE           		1055
+#define RID_FNTNM_FONTNAME_TXT     		1056
+#define RID_FNTNM_NOFONT_TXT       		1057
+#define RID_QUERY_REMOVEDRIVER     		1058
+#define RID_QUERY_REMOVEPRINTER    		1059
+#define RID_QUERY_REMOVEFONTFROMLIST		1060
+#define RID_QUERY_DRIVERUSED       		1062
+#define RID_ERR_REMOVEDEFAULTDRIVER 		1063
+#define RID_ERR_WRITEFONTSDIR      		1064
 
 #define RID_FONTIMPORT_DIALOG                   1065
 #define RID_FIMP_BTN_OK                         1
@@ -143,7 +143,7 @@
 #define RID_FIMP_FL_FROM                        5
 #define RID_FIMP_BTN_SELECTALL                  6
 #define RID_FIMP_BOX_NEWFONTS                   7
-#define RID_FIMP_TXT_HELP                        8
+#define RID_FIMP_TXT_HELP						 8
 #define RID_FIMP_STR_IMPORTOP                   9
 #define RID_FIMP_STR_QUERYOVERWRITE             10
 #define RID_FIMP_STR_OVERWRITEALL               11
@@ -153,49 +153,49 @@
 #define RID_FIMP_STR_FONTCOPYFAILED             15
 #define RID_FIMP_STR_NOWRITEABLEFONTSDIR        16
 #define RID_FIMP_STR_NUMBEROFFONTSIMPORTED      17
-#define RID_FIMP_BOX_LINKONLY                    18
-#define RID_FIMP_BOX_SUBDIRS                     19
-#define RID_FIMP_FL_TARGETOPTS                   20
+#define RID_FIMP_BOX_LINKONLY					 18
+#define RID_FIMP_BOX_SUBDIRS					 19
+#define RID_FIMP_FL_TARGETOPTS					 20
 
-#define RID_TXT_IMPORTTITLE                      1066
+#define RID_TXT_IMPORTTITLE                 	 1066
 #define RID_TXT_FONTS2IMPORT                    1067
-#define RID_TXT_TESTPAGE_MODEL                   1068
-#define RID_TXT_TESTPAGE_QUEUE                   1069
-#define RID_TXT_TESTPAGE_DATE                    1070
-#define RID_TXT_TESTPAGE_TIME                    1071
+#define RID_TXT_TESTPAGE_MODEL              	 1068
+#define RID_TXT_TESTPAGE_QUEUE              	 1069
+#define RID_TXT_TESTPAGE_DATE               	 1070
+#define RID_TXT_TESTPAGE_TIME               	 1071
 #define RID_TXT_PRINTERALREADYEXISTS            1072
-#define RID_TXT_PRINTERWITHOUTCOMMAND            1073
+#define RID_TXT_PRINTERWITHOUTCOMMAND       	 1073
 #define RID_TXT_PRINTERADDFAILED                1074
-#define RID_TXT_DRIVERDOESNOTEXIST               1075
+#define RID_TXT_DRIVERDOESNOTEXIST          	 1075
 #define RID_TXT_TESTPAGE_COMMENT                1076
-#define RID_TXT_TESTPAGE_NAME                    1077
-
-#define RID_TXT_FONT_ITALIC                  1078
-#define RID_TXT_FONT_OBLIQUE                     1079
-#define RID_TXT_FONT_THIN                        1080
-#define RID_TXT_FONT_ULTRALIGHT              1081
-#define RID_TXT_FONT_LIGHT                       1082
-#define RID_TXT_FONT_SEMILIGHT                   1083
-#define RID_TXT_FONT_SEMIBOLD                    1084
-#define RID_TXT_FONT_BOLD                        1085
-#define RID_TXT_FONT_ULTRABOLD                   1086
-#define RID_TXT_FONT_ULTRACONDENSED          1087
-#define RID_TXT_FONT_EXTRACONDENSED          1088
-#define RID_TXT_FONT_CONDENSED                   1089
+#define RID_TXT_TESTPAGE_NAME               	 1077
+
+#define RID_TXT_FONT_ITALIC				 	 1078
+#define RID_TXT_FONT_OBLIQUE					 1079
+#define RID_TXT_FONT_THIN						 1080
+#define RID_TXT_FONT_ULTRALIGHT				 1081
+#define RID_TXT_FONT_LIGHT						 1082
+#define RID_TXT_FONT_SEMILIGHT					 1083
+#define RID_TXT_FONT_SEMIBOLD					 1084
+#define RID_TXT_FONT_BOLD						 1085
+#define RID_TXT_FONT_ULTRABOLD					 1086
+#define RID_TXT_FONT_ULTRACONDENSED			 1087
+#define RID_TXT_FONT_EXTRACONDENSED			 1088
+#define RID_TXT_FONT_CONDENSED					 1089
 #define RID_TXT_FONT_SEMICONDENSED              1090
-#define RID_TXT_FONT_SEMIEXPANDED                1091
-#define RID_TXT_FONT_EXPANDED                    1092
-#define RID_TXT_FONT_EXTRAEXPANDED               1093
-#define RID_TXT_FONT_ULTRAEXPANDED               1094
-#define RID_TXT_FONT_REGULAR                     1095
+#define RID_TXT_FONT_SEMIEXPANDED				 1091
+#define RID_TXT_FONT_EXPANDED					 1092
+#define RID_TXT_FONT_EXTRAEXPANDED				 1093
+#define RID_TXT_FONT_ULTRAEXPANDED				 1094
+#define RID_TXT_FONT_REGULAR				 	 1095
 
-#define RID_BMP_SMALL_PRINTER                    1096
+#define RID_BMP_SMALL_PRINTER					 1096
 #define RID_BMP_SMALL_PRINTER_HC                 1097
-#define RID_BMP_SMALL_FAX                        1098
+#define RID_BMP_SMALL_FAX					 	 1098
 #define RID_BMP_SMALL_FAX_HC                     1099
-#define RID_BMP_SMALL_PDF                        1100
+#define RID_BMP_SMALL_PDF						 1100
 #define RID_BMP_SMALL_PDF_HC                     1101
-#define RID_BMP_PRINTER                          1102
+#define RID_BMP_PRINTER					 	     1102
 #define RID_BMP_PRINTER_HC                       1103
 
 #define RID_AFMERROR_OK                         1300
@@ -229,7 +229,7 @@
 #define RID_ADDP_BTN_PREV                       4
 #define RID_ADDP_LINE                           5
 #define RID_ADDP_CTRL_TITLE                     6
-#define RID_ADDP_STR_TITLE                       127
+#define RID_ADDP_STR_TITLE						 127
 
 #define RID_ADDP_PAGE_CHOOSEDEV                 2001
 #define RID_ADDP_CHDEV_TXT_OVER                 1
diff --git a/padmin/source/padialog.hxx b/padmin/source/padialog.hxx
index 2a8285f8af88..a3064eda1df9 100644
--- a/padmin/source/padialog.hxx
+++ b/padmin/source/padialog.hxx
@@ -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
@@ -49,52 +49,52 @@ namespace psp { class PrinterInfoManager; }
 class Printer;
 
 namespace padmin {
-
+    
     class PADialog : public ModalDialog
     {
     private:
-        DelListBox                          m_aDevicesLB;
-        PushButton                          m_aConfPB;
-        PushButton                          m_aRenamePB;
-        PushButton                          m_aStdPB;
-        PushButton                          m_aRemPB;
-        PushButton                          m_aTestPagePB;
-        FixedLine                           m_aPrintersFL;
-        FixedText                           m_aDriverTxt;
-        FixedText                           m_aDriver;
-        FixedText                           m_aLocationTxt;
-        FixedText                           m_aLocation;
-        FixedText                           m_aCommandTxt;
-        FixedText                           m_aCommand;
-        FixedText                           m_aCommentTxt;
-        FixedText                           m_aComment;
-
+        DelListBox       					m_aDevicesLB;
+        PushButton    						m_aConfPB;
+        PushButton    						m_aRenamePB;
+        PushButton    						m_aStdPB;		
+        PushButton    						m_aRemPB;
+        PushButton    						m_aTestPagePB;
+        FixedLine      						m_aPrintersFL;
+        FixedText							m_aDriverTxt;
+        FixedText							m_aDriver;
+        FixedText							m_aLocationTxt;
+        FixedText							m_aLocation;
+        FixedText							m_aCommandTxt;
+        FixedText							m_aCommand;
+        FixedText							m_aCommentTxt;
+        FixedText							m_aComment;
+        
         FixedLine                           m_aCUPSFL;
         CheckBox                            m_aCUPSCB;
 
-        FixedLine                           m_aSepButtonFL;
-        PushButton                          m_aAddPB;
-        PushButton                          m_aFontsPB;
-        CancelButton                        m_aCancelButton;
+        FixedLine							m_aSepButtonFL;
+        PushButton							m_aAddPB;
+        PushButton							m_aFontsPB;
+        CancelButton  						m_aCancelButton;
 
-        String                              m_aDefPrt;
-        String                              m_aRenameStr;
+        String								m_aDefPrt;
+        String								m_aRenameStr;
 
-        ::psp::PrinterInfoManager&          m_rPIManager;
-        ::std::list< ::rtl::OUString >      m_aPrinters;
-
-        Image                               m_aPrinterImg;
-        Image                               m_aFaxImg;
-        Image                               m_aPdfImg;
+        ::psp::PrinterInfoManager&			m_rPIManager;
+        ::std::list< ::rtl::OUString >		m_aPrinters;
 
+        Image								m_aPrinterImg;
+        Image								m_aFaxImg;
+        Image								m_aPdfImg;
+        
         DECL_LINK( ClickBtnHdl, PushButton* );
         DECL_LINK( DoubleClickHdl, ListBox* );
         DECL_LINK( SelectHdl, ListBox* );
         DECL_LINK( DelPressedHdl, ListBox* );
-
+        
         PADialog( Window*,  BOOL );
         void Init();
-
+        
         void UpdateDefPrt();
         void UpdateText();
         void UpdateDevice();
@@ -104,14 +104,14 @@ namespace padmin {
         void RenameDevice();
         void PrintTestPage();
         void updateSettings();
-
+        
         virtual long Notify( NotifyEvent& rEv );
         virtual void DataChanged( const DataChangedEvent& rEv );
-
+        
         String getSelectedDevice();
     public:
         ~PADialog();
-
+        
         static PADialog* Create( Window*,  BOOL );
     };
 
diff --git a/padmin/source/padialog.src b/padmin/source/padialog.src
index 8834bba3226c..0cd2d40567fb 100644
--- a/padmin/source/padialog.src
+++ b/padmin/source/padialog.src
@@ -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
@@ -164,7 +164,7 @@ ModalDialog RID_PADIALOG
         Size = MAP_APPFONT( 168, 8 );
         Text [ en-US ] = "Disable CUPS Support";
     };
-
+    
     FixedLine RID_PA_FL_SEPBUTTON
     {
         Pos = MAP_APPFONT( 0, 176 );
@@ -265,7 +265,7 @@ ModalDialog RID_PADIALOG
         Size = MAP_APPFONT( 60, 12 );
         Text [ en-US ] = "Test ~Page";
     };
-
+    
     PushButton RID_PA_BTN_FONTS
     {
         Pos = MAP_APPFONT( 80, 181 );
@@ -284,7 +284,7 @@ ModalDialog RID_PADIALOG
         Text [ en-US ] = "Default printer";
     };
     String RID_PA_STR_RENAME
-    {
+    {		
         Text [ en-US ] = "Rename";
     };
     Text [ en-US ] = "Printer Administration";
@@ -820,19 +820,19 @@ TabPage RID_ADDP_PAGE_CHOOSEDEV
         Pos = MAP_APPFONT ( 40, 40 );
         Size = MAP_APPFONT( 180, 10 );
         Text [ en-US ] = "Add a ~printer";
-    };
+    };	
     RadioButton RID_ADDP_CHDEV_BTN_FAX
     {
         Pos = MAP_APPFONT ( 40, 50 );
         Size = MAP_APPFONT( 180, 10 );
         Text [ en-US ] = "Connect a fa~x device";
-    };
+    };	
     RadioButton RID_ADDP_CHDEV_BTN_PDF
     {
         Pos = MAP_APPFONT ( 40, 60 );
         Size = MAP_APPFONT( 180, 10 );
         Text [ en-US ] = "Connect a P~DF converter";
-    };
+    };	
     RadioButton RID_ADDP_CHDEV_BTN_OLD
     {
         Pos = MAP_APPFONT ( 40, 70 );
diff --git a/padmin/source/pamain.cxx b/padmin/source/pamain.cxx
index f46a2c8a3149..8b945c0a9e04 100644
--- a/padmin/source/pamain.cxx
+++ b/padmin/source/pamain.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
@@ -58,9 +58,9 @@ using namespace comphelper;
 class MyApp : public Application
 {
 public:
-    void            Main();
-    virtual USHORT  Exception( USHORT nError );
-
+    void			Main();
+    virtual USHORT	Exception( USHORT nError );
+    
     static void ReadStringHook( String& );
 };
 
@@ -113,7 +113,7 @@ void MyApp::Main()
     catch( com::sun::star::uno::Exception& rExc)
     {
     }
-
+    
     if( ! xFactory.is() )
     {
         fprintf( stderr, "Could not bootstrap UNO, installation must be in disorder. Exiting.\n" );
@@ -125,7 +125,7 @@ void MyApp::Main()
         new DesktopContext( com::sun::star::uno::getCurrentContext() ) );
 
     /*
-     *  Create UCB.
+     *	Create UCB.
      */
     Sequence< Any > aArgs( 2 );
     aArgs[ 0 ] <<= OUString::createFromAscii( UCB_CONFIGURATION_KEY1_LOCAL );
@@ -142,11 +142,11 @@ void MyApp::Main()
         exit( 1 );
     }
 #endif
-
+    
     /*
-     * Initialize the Java UNO AccessBridge if accessibility is turned on
+     * Initialize the Java UNO AccessBridge if accessibility is turned on 
      */
-
+     
     if( Application::GetSettings().GetMiscSettings().GetEnableATToolSupport() )
     {
         BOOL bQuitApp;
@@ -157,7 +157,7 @@ void MyApp::Main()
 
     // initialize test-tool library (if available)
     tools::InitTestToolLib();
-
+    
     ResMgr::SetReadStringHook( MyApp::ReadStringHook );
 
     pPADialog = PADialog::Create( NULL , FALSE );
diff --git a/padmin/source/progress.cxx b/padmin/source/progress.cxx
index 03ef67db8da9..e2c70a2b72bb 100644
--- a/padmin/source/progress.cxx
+++ b/padmin/source/progress.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
diff --git a/padmin/source/progress.hxx b/padmin/source/progress.hxx
index 552a049c3572..1b684bf4d786 100644
--- a/padmin/source/progress.hxx
+++ b/padmin/source/progress.hxx
@@ -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
@@ -38,26 +38,26 @@ namespace padmin {
 
     class ProgressDialog : public ModelessDialog
     {
-        FixedText                       maOperation;
-        FixedText                       maFilename;
-        FixedText                       maProgressTxt;
-        CancelButton                    maCancelButton;
-        ProgressBar                     maProgressBar;
-
+        FixedText						maOperation;
+        FixedText						maFilename;
+        FixedText						maProgressTxt;
+        CancelButton					maCancelButton;
+        ProgressBar			            maProgressBar;
+        
         int mnMax, mnMin;
         BOOL mbCanceled;
-
+        
     public:
         ProgressDialog( Window*, BOOL bCancelable = TRUE, int nMin = 0, int nMax = 100 );
         ~ProgressDialog();
-
+        
         DECL_LINK( ClickBtnHdl, Button* );
-
+        
         void setValue( int nValue );
         void setRange( int nMin, int nMax ) { mnMin = nMin; mnMax = nMax; }
         void startOperation( const String& );
         void setFilename( const String& );
-
+        
         BOOL isCanceled() { return mbCanceled; }
     };
 
diff --git a/padmin/source/prtsetup.cxx b/padmin/source/prtsetup.cxx
index 17d28515e540..a1671902a014 100644
--- a/padmin/source/prtsetup.cxx
+++ b/padmin/source/prtsetup.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
@@ -49,12 +49,12 @@ void RTSDialog::insertAllPPDValues( ListBox& rBox, const PPDParser* pParser, con
     const PPDValue* pValue = NULL;
     USHORT nPos = 0;
     String aOptionText;
-
+    
     for( int i = 0; i < pKey->countValues(); i++ )
     {
         pValue = pKey->getValue( i );
         aOptionText = pParser->translateOption( pKey->getKey(), pValue->m_aOption) ;
-
+        
         if( m_aJobData.m_aContext.checkConstraints( pKey, pValue ) )
         {
             if( rBox.GetEntryPos( (void*)pValue ) == LISTBOX_ENTRY_NOTFOUND )
@@ -172,8 +172,8 @@ IMPL_LINK( RTSDialog, ActivatePage, TabControl*, pTabCtrl )
     {
         switch( nId )
         {
-            case RID_RTS_PAPERPAGE:     m_pPaperPage->update();break;
-            case RID_RTS_DEVICEPAGE:    m_pDevicePage->update();break;
+            case RID_RTS_PAPERPAGE:		m_pPaperPage->update();break;
+            case RID_RTS_DEVICEPAGE:	m_pDevicePage->update();break;
             default: break;
         }
     }
@@ -195,9 +195,9 @@ IMPL_LINK( RTSDialog, ClickButton, Button*, pButton )
         }
         if( m_pDevicePage )
         {
-            m_aJobData.m_nColorDepth    = m_pDevicePage->getDepth();
-            m_aJobData.m_nColorDevice   = m_pDevicePage->getColorDevice();
-            m_aJobData.m_nPSLevel       = m_pDevicePage->getLevel();
+            m_aJobData.m_nColorDepth	= m_pDevicePage->getDepth();
+            m_aJobData.m_nColorDevice	= m_pDevicePage->getColorDevice();
+            m_aJobData.m_nPSLevel		= m_pDevicePage->getLevel();
         }
         if( m_pOtherPage )
             // write other settings
@@ -205,7 +205,7 @@ IMPL_LINK( RTSDialog, ClickButton, Button*, pButton )
         if( m_pCommandPage )
             // write command settings
             m_pCommandPage->save();
-
+    
         EndDialog( 1 );
     }
     else if( pButton == &m_aCancelButton )
@@ -224,7 +224,7 @@ RTSPaperPage::RTSPaperPage( RTSDialog* pParent ) :
         TabPage( & pParent->m_aTabControl, PaResId( RID_RTS_PAPERPAGE ) ),
 
         m_pParent( pParent ),
-
+        
         m_aPaperText( this, PaResId( RID_RTS_PAPER_PAPER_TXT ) ),
         m_aPaperBox( this, PaResId( RID_RTS_PAPER_PAPER_BOX ) ),
         m_aOrientText( this, PaResId( RID_RTS_PAPER_ORIENTATION_TXT ) ),
@@ -242,7 +242,7 @@ RTSPaperPage::RTSPaperPage( RTSDialog* pParent ) :
     FreeResource();
 
     USHORT nPos = 0;
-
+    
     m_aOrientBox.InsertEntry( PORTRAIT_STRING );
     m_aOrientBox.InsertEntry( LSCAPE_STRING );
     // duplex
@@ -268,13 +268,13 @@ RTSPaperPage::~RTSPaperPage()
 
 void RTSPaperPage::update()
 {
-    const PPDKey* pKey      = NULL;
-
+    const PPDKey* pKey		= NULL;
+    
     // orientation
     m_aOrientBox.SelectEntry(
         m_pParent->m_aJobData.m_eOrientation == orientation::Landscape
         ? LSCAPE_STRING : PORTRAIT_STRING );
-
+        
     // duplex
     if( m_pParent->m_aJobData.m_pParser &&
         (pKey = m_pParent->m_aJobData.m_pParser->getKey( String( RTL_CONSTASCII_USTRINGPARAM( "Duplex" ) ) )) )
@@ -392,7 +392,7 @@ RTSDevicePage::RTSDevicePage( RTSDialog* pParent ) :
         m_aLevelBox.SelectEntry( m_pParent->m_aFromDriverString );
     else
         m_aLevelBox.SelectEntry( String::CreateFromInt32( m_pParent->m_aJobData.m_nPSLevel ) );
-
+    
     m_aDepthBox.SelectEntry( String::CreateFromInt32( m_pParent->m_aJobData.m_nColorDepth ).AppendAscii( " Bit" ) );
 
     // fill ppd boxes
@@ -401,10 +401,10 @@ RTSDevicePage::RTSDevicePage( RTSDialog* pParent ) :
         for( int i = 0; i < m_pParent->m_aJobData.m_pParser->getKeys(); i++ )
         {
             const PPDKey* pKey = m_pParent->m_aJobData.m_pParser->getKey( i );
-            if( pKey->isUIKey()                                 &&
-                ! pKey->getKey().EqualsAscii( "PageSize" )      &&
-                ! pKey->getKey().EqualsAscii( "InputSlot" )     &&
-                ! pKey->getKey().EqualsAscii( "PageRegion" )    &&
+            if( pKey->isUIKey()									&&
+                ! pKey->getKey().EqualsAscii( "PageSize" )		&&
+                ! pKey->getKey().EqualsAscii( "InputSlot" )		&&
+                ! pKey->getKey().EqualsAscii( "PageRegion" )	&&
                 ! pKey->getKey().EqualsAscii( "Duplex" )
                 )
             {
@@ -533,10 +533,10 @@ void RTSOtherPage::initValues()
                         nMarginBottom );
     }
 
-    nMarginLeft     += m_pParent->m_aJobData.m_nLeftMarginAdjust;
-    nMarginRight    += m_pParent->m_aJobData.m_nRightMarginAdjust;
-    nMarginTop      += m_pParent->m_aJobData.m_nTopMarginAdjust;
-    nMarginBottom   += m_pParent->m_aJobData.m_nBottomMarginAdjust;
+    nMarginLeft		+= m_pParent->m_aJobData.m_nLeftMarginAdjust;
+    nMarginRight	+= m_pParent->m_aJobData.m_nRightMarginAdjust;
+    nMarginTop		+= m_pParent->m_aJobData.m_nTopMarginAdjust;
+    nMarginBottom	+= m_pParent->m_aJobData.m_nBottomMarginAdjust;
 
     m_aLeftLB.SetValue( nMarginLeft, FUNIT_POINT );
     m_aRightLB.SetValue( nMarginRight, FUNIT_POINT );
@@ -564,10 +564,10 @@ void RTSOtherPage::save()
                         nMarginBottom );
     }
 
-    m_pParent->m_aJobData.m_nLeftMarginAdjust   = m_aLeftLB.GetValue( FUNIT_POINT ) - nMarginLeft;
-    m_pParent->m_aJobData.m_nRightMarginAdjust  = m_aRightLB.GetValue( FUNIT_POINT ) - nMarginRight;
-    m_pParent->m_aJobData.m_nTopMarginAdjust    = m_aTopLB.GetValue( FUNIT_POINT ) - nMarginTop;
-    m_pParent->m_aJobData.m_nBottomMarginAdjust = m_aBottomLB.GetValue( FUNIT_POINT ) - nMarginBottom;
+    m_pParent->m_aJobData.m_nLeftMarginAdjust	= m_aLeftLB.GetValue( FUNIT_POINT ) - nMarginLeft;
+    m_pParent->m_aJobData.m_nRightMarginAdjust	= m_aRightLB.GetValue( FUNIT_POINT ) - nMarginRight;
+    m_pParent->m_aJobData.m_nTopMarginAdjust	= m_aTopLB.GetValue( FUNIT_POINT ) - nMarginTop;
+    m_pParent->m_aJobData.m_nBottomMarginAdjust	= m_aBottomLB.GetValue( FUNIT_POINT ) - nMarginBottom;
     m_pParent->m_aJobData.m_aComment = m_aCommentEdt.GetText();
 }
 
@@ -582,7 +582,7 @@ IMPL_LINK( RTSOtherPage, ClickBtnHdl, Button*, pButton )
             m_pParent->m_aJobData.m_nTopMarginAdjust =
             m_pParent->m_aJobData.m_nBottomMarginAdjust = 0;
 
-        initValues();
+        initValues();		
     }
     return 0;
 }
@@ -590,7 +590,7 @@ IMPL_LINK( RTSOtherPage, ClickBtnHdl, Button*, pButton )
 // ------------------------------------------------------------------
 
 /*
- *  RTSFontSubstPage
+ *	RTSFontSubstPage
  */
 
 RTSFontSubstPage::RTSFontSubstPage( RTSDialog* pParent ) :
@@ -729,18 +729,18 @@ IMPL_LINK( RTSFontSubstPage, ClickBtnHdl, Button*, pButton )
 
 class RTSPWDialog : public ModalDialog
 {
-    FixedText       m_aText;
-    FixedText       m_aUserText;
-    Edit            m_aUserEdit;
-    FixedText       m_aPassText;
-    Edit            m_aPassEdit;
-
-    OKButton        m_aOKButton;
-    CancelButton    m_aCancelButton;
+    FixedText		m_aText;
+    FixedText		m_aUserText;
+    Edit			m_aUserEdit;
+    FixedText		m_aPassText;
+    Edit			m_aPassEdit;
+
+    OKButton		m_aOKButton;
+    CancelButton	m_aCancelButton;
 public:
     RTSPWDialog( const OString& rServer, const OString& rUserName, Window* pParent );
     ~RTSPWDialog();
-
+    
     OString getUserName() const;
     OString getPassword() const;
 };
@@ -803,7 +803,7 @@ extern "C" {
     bool Sal_authenticateQuery( const OString& rServer, OString& rUserName, OString& rPassword )
     {
         bool bRet = false;
-
+        
         RTSPWDialog aDialog( rServer, rUserName, NULL );
         if( aDialog.Execute() )
         {
diff --git a/padmin/source/prtsetup.hxx b/padmin/source/prtsetup.hxx
index 65288f738482..0f55e55f7e50 100644
--- a/padmin/source/prtsetup.hxx
+++ b/padmin/source/prtsetup.hxx
@@ -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
@@ -58,95 +58,95 @@ class RTSDialog : public TabDialog
     friend class RTSOtherPage;
     friend class RTSFontSubstPage;
     friend class RTSCommandPage;
-
-    ::psp::PrinterInfo      m_aJobData;
-    String                  m_aPrinter;
-
+    
+    ::psp::PrinterInfo		m_aJobData;
+    String					m_aPrinter;
+    
     // controls
-    TabControl              m_aTabControl;
-    OKButton                m_aOKButton;
-    CancelButton            m_aCancelButton;
-
+    TabControl				m_aTabControl;
+    OKButton				m_aOKButton;
+    CancelButton			m_aCancelButton;
+    
     // pages
-    RTSPaperPage*           m_pPaperPage;
-    RTSDevicePage*          m_pDevicePage;
-    RTSOtherPage*           m_pOtherPage;
-    RTSFontSubstPage*       m_pFontSubstPage;
-    RTSCommandPage*         m_pCommandPage;
-
+    RTSPaperPage*			m_pPaperPage;
+    RTSDevicePage*			m_pDevicePage;
+    RTSOtherPage*			m_pOtherPage;
+    RTSFontSubstPage*		m_pFontSubstPage;
+    RTSCommandPage*			m_pCommandPage;
+    
     // some resources
-    String                  m_aInvalidString;
-    String                  m_aFromDriverString;
-
+    String					m_aInvalidString;
+    String					m_aFromDriverString;
+        
     DECL_LINK( ActivatePage, TabControl* );
     DECL_LINK( ClickButton, Button* );
-
+        
     // helper functions
     void insertAllPPDValues( ListBox&, const psp::PPDParser*, const psp::PPDKey* );
 public:
     RTSDialog( const ::psp::PrinterInfo& rJobData, const String& rPrinter, bool bAllPages, Window* pParent = NULL );
     ~RTSDialog();
-
+        
     const ::psp::PrinterInfo& getSetup() const { return m_aJobData; }
 };
-
+    
 class RTSPaperPage : public TabPage
 {
-    RTSDialog*          m_pParent;
-
-    FixedText           m_aPaperText;
-    ListBox             m_aPaperBox;
-
-    FixedText           m_aOrientText;
-    ListBox             m_aOrientBox;
-
-    FixedText           m_aDuplexText;
-    ListBox             m_aDuplexBox;
-
-    FixedText           m_aSlotText;
-    ListBox             m_aSlotBox;
-
+    RTSDialog*			m_pParent;
+        
+    FixedText			m_aPaperText;
+    ListBox				m_aPaperBox;
+        
+    FixedText			m_aOrientText;
+    ListBox				m_aOrientBox;
+        
+    FixedText			m_aDuplexText;
+    ListBox				m_aDuplexBox;
+        
+    FixedText			m_aSlotText;
+    ListBox				m_aSlotBox;
+        
     DECL_LINK( SelectHdl, ListBox* );
 public:
     RTSPaperPage( RTSDialog* );
     ~RTSPaperPage();
-
+        
     void update();
-
+        
     String getOrientation() { return m_aOrientBox.GetSelectEntry(); }
 };
 
 class RTSDevicePage : public TabPage
 {
-    RTSDialog*          m_pParent;
-
-    String              m_aSpaceColor;
-    String              m_aSpaceGray;
-
-    FixedText           m_aPPDKeyText;
-    ListBox             m_aPPDKeyBox;
-
-    FixedText           m_aPPDValueText;
-    ListBox             m_aPPDValueBox;
-
-    FixedText           m_aLevelText;
-    ListBox             m_aLevelBox;
-
-    FixedText           m_aSpaceText;
-    ListBox             m_aSpaceBox;
-
-    FixedText           m_aDepthText;
-    ListBox             m_aDepthBox;
-
+    RTSDialog*			m_pParent;
+        
+    String				m_aSpaceColor;
+    String				m_aSpaceGray;
+        
+    FixedText			m_aPPDKeyText;
+    ListBox				m_aPPDKeyBox;
+        
+    FixedText			m_aPPDValueText;
+    ListBox				m_aPPDValueBox;
+        
+    FixedText			m_aLevelText;
+    ListBox				m_aLevelBox;
+        
+    FixedText			m_aSpaceText;
+    ListBox				m_aSpaceBox;
+        
+    FixedText			m_aDepthText;
+    ListBox				m_aDepthBox;
+        
     void FillValueBox( const ::psp::PPDKey* );
-
+        
     DECL_LINK( SelectHdl, ListBox* );
 public:
     RTSDevicePage( RTSDialog* );
     ~RTSDevicePage();
-
+        
     void update();
-
+        
     ULONG getLevel() { return m_aLevelBox.GetSelectEntry().ToInt32(); }
     ULONG getDepth() { return m_aDepthBox.GetSelectEntry().ToInt32(); }
     ULONG getColorDevice()
@@ -155,48 +155,48 @@ public:
         return aSpace == m_aSpaceColor ? 1 : ( aSpace == m_aSpaceGray ? -1 : 0 );
     }
 };
-
+    
 class RTSOtherPage : public TabPage
 {
-    RTSDialog*          m_pParent;
-
-    FixedText           m_aLeftTxt;
-    MetricField         m_aLeftLB;
-    FixedText           m_aTopTxt;
-    MetricField         m_aTopLB;
-    FixedText           m_aRightTxt;
-    MetricField         m_aRightLB;
-    FixedText           m_aBottomTxt;
-    MetricField         m_aBottomLB;
-    FixedText           m_aCommentTxt;
-    Edit                m_aCommentEdt;
-    PushButton          m_aDefaultBtn;
-
+    RTSDialog*			m_pParent;
+        
+    FixedText			m_aLeftTxt;
+    MetricField			m_aLeftLB;
+    FixedText			m_aTopTxt;
+    MetricField			m_aTopLB;
+    FixedText			m_aRightTxt;
+    MetricField			m_aRightLB;
+    FixedText			m_aBottomTxt;
+    MetricField			m_aBottomLB;
+    FixedText			m_aCommentTxt;
+    Edit				m_aCommentEdt;
+    PushButton			m_aDefaultBtn;
+        
     void initValues();
-
+        
     DECL_LINK( ClickBtnHdl, Button *);
-
+        
 public:
     RTSOtherPage( RTSDialog* );
     ~RTSOtherPage();
-
+        
     void save();
 };
 
 class RTSFontSubstPage : public TabPage
 {
-    RTSDialog*          m_pParent;
+    RTSDialog*			m_pParent;
 
-    FixedText           m_aSubstitutionsText;
-    DelMultiListBox     m_aSubstitutionsBox;
-    FixedText           m_aFromFontText;
-    ComboBox            m_aFromFontBox;
-    FixedText           m_aToFontText;
-    ListBox             m_aToFontBox;
+    FixedText			m_aSubstitutionsText;
+    DelMultiListBox		m_aSubstitutionsBox;
+    FixedText			m_aFromFontText;
+    ComboBox			m_aFromFontBox;
+    FixedText			m_aToFontText;
+    ListBox				m_aToFontBox;
 
-    PushButton          m_aAddButton;
-    PushButton          m_aRemoveButton;
-    CheckBox            m_aEnableBox;
+    PushButton			m_aAddButton;
+    PushButton			m_aRemoveButton;
+    CheckBox			m_aEnableBox;
 
     DECL_LINK( ClickBtnHdl, Button* );
     DECL_LINK( SelectHdl, ListBox* );
@@ -207,7 +207,7 @@ public:
     RTSFontSubstPage( RTSDialog* );
     ~RTSFontSubstPage();
 };
-
-} // namespace
+    
+} // namespace 
 
 #endif // _PAD_PRTSETUP_HXX
diff --git a/padmin/source/rtsetup.hrc b/padmin/source/rtsetup.hrc
index 30439088de8e..9fa500a4a329 100644
--- a/padmin/source/rtsetup.hrc
+++ b/padmin/source/rtsetup.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
@@ -28,93 +28,93 @@
 #ifndef _PAD_RTSETUP_HRC_
 #define _PAD_RTSETUP_HRC_
 
-#define RID_RTS_RTSDIALOG                   4001
-#define RID_RTS_RTSDIALOG_INVALID_TXT       1
-#define RID_RTS_RTSDIALOG_FROMDRIVER_TXT    2
-#define RID_RTS_RTSDIALOG_TABCONTROL        3
+#define RID_RTS_RTSDIALOG					4001
+#define RID_RTS_RTSDIALOG_INVALID_TXT		1
+#define RID_RTS_RTSDIALOG_FROMDRIVER_TXT	2
+#define RID_RTS_RTSDIALOG_TABCONTROL		3
 
-#define RID_RTS_OTHERPAGE                   4002
-#define RID_RTS_OTHER_LEFTMARGIN_TXT        1
-#define RID_RTS_OTHER_LEFTMARGIN_BOX        2
-#define RID_RTS_OTHER_TOPMARGIN_TXT     3
-#define RID_RTS_OTHER_TOPMARGIN_BOX     4
-#define RID_RTS_OTHER_RIGHTMARGIN_TXT       5
-#define RID_RTS_OTHER_RIGHTMARGIN_BOX       6
-#define RID_RTS_OTHER_BOTTOMMARGIN_TXT      7
-#define RID_RTS_OTHER_BOTTOMMARGIN_BOX      8
-#define RID_RTS_OTHER_COMMENT_TXT           9
-#define RID_RTS_OTHER_COMMENT_EDT           10
-#define RID_RTS_OTHER_DEFAULT_BTN           11
+#define RID_RTS_OTHERPAGE					4002
+#define RID_RTS_OTHER_LEFTMARGIN_TXT 		1
+#define RID_RTS_OTHER_LEFTMARGIN_BOX		2
+#define RID_RTS_OTHER_TOPMARGIN_TXT		3
+#define RID_RTS_OTHER_TOPMARGIN_BOX		4
+#define RID_RTS_OTHER_RIGHTMARGIN_TXT		5
+#define RID_RTS_OTHER_RIGHTMARGIN_BOX		6
+#define RID_RTS_OTHER_BOTTOMMARGIN_TXT		7
+#define RID_RTS_OTHER_BOTTOMMARGIN_BOX		8
+#define RID_RTS_OTHER_COMMENT_TXT			9
+#define RID_RTS_OTHER_COMMENT_EDT			10
+#define RID_RTS_OTHER_DEFAULT_BTN			11
 
-#define RID_RTS_DEVICEPAGE                  4003
-#define RID_RTS_DEVICE_COLOR_TXT            1
-#define RID_RTS_DEVICE_GRAY_TXT         2
-#define RID_RTS_DEVICE_PPDKEY_TXT           3
-#define RID_RTS_DEVICE_PPDKEY_BOX           4
-#define RID_RTS_DEVICE_PPDVALUE_TXT     5
-#define RID_RTS_DEVICE_PPDVALUE_BOX     6
-#define RID_RTS_DEVICE_LEVEL_TXT            7
-#define RID_RTS_DEVICE_LEVEL_BOX            8
-#define RID_RTS_DEVICE_SPACE_TXT            9
-#define RID_RTS_DEVICE_SPACE_BOX            10
-#define RID_RTS_DEVICE_DEPTH_TXT            11
-#define RID_RTS_DEVICE_DEPTH_BOX            12
-#define RID_RTS_DEVICE_COMPRESS_BOX     13
+#define RID_RTS_DEVICEPAGE					4003
+#define RID_RTS_DEVICE_COLOR_TXT			1
+#define RID_RTS_DEVICE_GRAY_TXT			2
+#define RID_RTS_DEVICE_PPDKEY_TXT			3
+#define RID_RTS_DEVICE_PPDKEY_BOX			4
+#define RID_RTS_DEVICE_PPDVALUE_TXT		5
+#define RID_RTS_DEVICE_PPDVALUE_BOX		6
+#define RID_RTS_DEVICE_LEVEL_TXT			7
+#define RID_RTS_DEVICE_LEVEL_BOX			8
+#define RID_RTS_DEVICE_SPACE_TXT			9
+#define RID_RTS_DEVICE_SPACE_BOX			10
+#define RID_RTS_DEVICE_DEPTH_TXT			11
+#define RID_RTS_DEVICE_DEPTH_BOX			12
+#define RID_RTS_DEVICE_COMPRESS_BOX		13
 
-#define RID_RTS_PAPERPAGE                   4004
-#define RID_RTS_PAPER_PAPER_TXT         1
-#define RID_RTS_PAPER_PAPER_BOX         2
-#define RID_RTS_PAPER_ORIENTATION_TXT       3
-#define RID_RTS_PAPER_ORIENTATION_BOX       4
-#define RID_RTS_PAPER_DUPLEX_TXT            5
-#define RID_RTS_PAPER_DUPLEX_BOX            6
-#define RID_RTS_PAPER_SLOT_TXT              7
-#define RID_RTS_PAPER_SLOT_BOX              8
+#define RID_RTS_PAPERPAGE					4004
+#define RID_RTS_PAPER_PAPER_TXT			1
+#define RID_RTS_PAPER_PAPER_BOX			2
+#define RID_RTS_PAPER_ORIENTATION_TXT		3
+#define RID_RTS_PAPER_ORIENTATION_BOX		4
+#define RID_RTS_PAPER_DUPLEX_TXT			5
+#define RID_RTS_PAPER_DUPLEX_BOX			6
+#define RID_RTS_PAPER_SLOT_TXT				7
+#define RID_RTS_PAPER_SLOT_BOX				8
 
-#define RID_RTS_FONTSUBSTPAGE               4005
-#define RID_RTS_FS_SUBST_TXT                1
-#define RID_RTS_FS_SUBST_BOX                2
-#define RID_RTS_FS_FROM_TXT             3
-#define RID_RTS_FS_FROM_BOX             4
-#define RID_RTS_FS_TO_TXT                   5
-#define RID_RTS_FS_TO_BOX                   6
-#define RID_RTS_FS_ADD_BTN                  7
-#define RID_RTS_FS_REMOVE_BTN               8
-#define RID_RTS_FS_ENABLE_BTN               9
+#define RID_RTS_FONTSUBSTPAGE				4005
+#define RID_RTS_FS_SUBST_TXT				1
+#define RID_RTS_FS_SUBST_BOX				2
+#define RID_RTS_FS_FROM_TXT				3
+#define RID_RTS_FS_FROM_BOX				4
+#define RID_RTS_FS_TO_TXT					5
+#define RID_RTS_FS_TO_BOX					6
+#define RID_RTS_FS_ADD_BTN					7
+#define RID_RTS_FS_REMOVE_BTN				8
+#define RID_RTS_FS_ENABLE_BTN				9
 
 #define RID_RTS_COMMANDPAGE                4006
-#define RID_RTS_CMD_TXT_PRTNAME         1
-#define RID_RTS_CMD_TXT_CONNECT         2
-#define RID_RTS_CMD_FL_DEFAULT              3
-#define RID_RTS_CMD_BTN_HELP                4
-#define RID_RTS_CMD_CB_COMMANDS         5
-#define RID_RTS_CMD_FL_INSTALL              6
-#define RID_RTS_CMD_TXT_CONFIGURE           7
-#define RID_RTS_CMD_LB_CONFIGURE            8
-#define RID_RTS_CMD_STR_CONFIGURE_PRINTER   9
-#define RID_RTS_CMD_STR_CONFIGURE_FAX       10
-#define RID_RTS_CMD_STR_CONFIGURE_PDF       11
-#define RID_RTS_CMD_STR_PRINTERHELP     12
-#define RID_RTS_CMD_STR_FAXHELP         13
-#define RID_RTS_CMD_STR_PDFHELP         14
-#define RID_RTS_CMD_BTN_REMOVE              15
-#define RID_RTS_CMD_EDT_PDFDIR              16
-#define RID_RTS_CMD_BTN_PDFDIR              17
-#define RID_RTS_CMD_TXT_PDFDIR              18
-#define RID_RTS_CMD_BOX_SWALLOWFAXNO        19
+#define RID_RTS_CMD_TXT_PRTNAME			1
+#define RID_RTS_CMD_TXT_CONNECT			2
+#define RID_RTS_CMD_FL_DEFAULT				3
+#define RID_RTS_CMD_BTN_HELP				4
+#define RID_RTS_CMD_CB_COMMANDS			5
+#define RID_RTS_CMD_FL_INSTALL		   		6
+#define RID_RTS_CMD_TXT_CONFIGURE			7
+#define RID_RTS_CMD_LB_CONFIGURE			8
+#define RID_RTS_CMD_STR_CONFIGURE_PRINTER	9
+#define RID_RTS_CMD_STR_CONFIGURE_FAX		10
+#define RID_RTS_CMD_STR_CONFIGURE_PDF		11
+#define RID_RTS_CMD_STR_PRINTERHELP		12
+#define RID_RTS_CMD_STR_FAXHELP			13
+#define RID_RTS_CMD_STR_PDFHELP			14
+#define RID_RTS_CMD_BTN_REMOVE				15
+#define RID_RTS_CMD_EDT_PDFDIR				16
+#define RID_RTS_CMD_BTN_PDFDIR				17
+#define RID_RTS_CMD_TXT_PDFDIR				18
+#define RID_RTS_CMD_BOX_SWALLOWFAXNO		19
 #define RID_RTS_CMD_CB_EXTERNAL             20
 #define RID_RTS_CMD_FT_QUICKCMD             21
 #define RIT_RTS_CMD_CB_QUICKCMD             22
 
-#define RID_TXT_QUERYFAXNUMBER              4007
+#define RID_TXT_QUERYFAXNUMBER				4007
 
-#define RID_RTS_PWDIALOG                    4008
-#define RID_RTS_PWDIALOG_TXT                1
-#define RID_RTS_PWDIALOG_USER_TXT           2
-#define RID_RTS_PWDIALOG_USER_EDT           3
-#define RID_RTS_PWDIALOG_PASS_TXT           4
-#define RID_RTS_PWDIALOG_PASS_EDT           5
-#define RID_RTS_PWDIALOG_OK_BTN         6
-#define RID_RTS_PWDIALOG_CANCEL_BTN     7
+#define RID_RTS_PWDIALOG					4008
+#define RID_RTS_PWDIALOG_TXT				1
+#define RID_RTS_PWDIALOG_USER_TXT			2
+#define RID_RTS_PWDIALOG_USER_EDT			3
+#define RID_RTS_PWDIALOG_PASS_TXT			4
+#define RID_RTS_PWDIALOG_PASS_EDT			5
+#define RID_RTS_PWDIALOG_OK_BTN			6
+#define RID_RTS_PWDIALOG_CANCEL_BTN		7
 
 #endif
diff --git a/padmin/source/rtsetup.src b/padmin/source/rtsetup.src
index e04374a72245..d439928220ae 100644
--- a/padmin/source/rtsetup.src
+++ b/padmin/source/rtsetup.src
@@ -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
@@ -337,7 +337,7 @@ TabPage RID_RTS_COMMANDPAGE
     {
         Text [ en-US ] = "PDF converter";
     };
-
+    
     ListBox RID_RTS_CMD_LB_CONFIGURE
     {
         DropDown = true;
diff --git a/padmin/source/spadmin.sh b/padmin/source/spadmin.sh
index 31ab4382fe52..26a720e6a447 100644
--- a/padmin/source/spadmin.sh
+++ b/padmin/source/spadmin.sh
@@ -2,7 +2,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
@@ -34,7 +34,7 @@ export SAL_ENABLE_FILE_LOCKING
 sd_cwd="`pwd`"
 if [ -h "$0" ] ; then
     sd_basename=`basename "$0"`
-     sd_script=`ls -l "$0" | sed "s/.*${sd_basename} -> //g"`
+     sd_script=`ls -l "$0" | sed "s/.*${sd_basename} -> //g"` 
     cd "`dirname "$0"`"
     cd "`dirname "$sd_script"`"
 else
diff --git a/padmin/source/titlectrl.cxx b/padmin/source/titlectrl.cxx
index 450780dce1e3..b47f8dc45f67 100644
--- a/padmin/source/titlectrl.cxx
+++ b/padmin/source/titlectrl.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
diff --git a/padmin/source/titlectrl.hxx b/padmin/source/titlectrl.hxx
index 75c8d3eeeceb..dfbffa8d5d0d 100644
--- a/padmin/source/titlectrl.hxx
+++ b/padmin/source/titlectrl.hxx
@@ -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
@@ -36,13 +36,13 @@ namespace padmin
 
 class TitleImage : public Control
 {
-    Image               m_aImage;
-    String              m_aText;
-    Color               m_aBGColor;
-    Point               m_aImagePos;
-    Point               m_aTextPos;
+    Image				m_aImage;
+    String				m_aText;
+    Color				m_aBGColor;
+    Point				m_aImagePos;
+    Point				m_aTextPos;
 
-    bool                m_bArranged;
+    bool				m_bArranged;
 
     void arrange();
 public:
diff --git a/regexp/inc/pch/precompiled_regexp.cxx b/regexp/inc/pch/precompiled_regexp.cxx
index 2adcb54dccdb..a46f36ebff9b 100644
--- a/regexp/inc/pch/precompiled_regexp.cxx
+++ b/regexp/inc/pch/precompiled_regexp.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
diff --git a/regexp/inc/pch/precompiled_regexp.hxx b/regexp/inc/pch/precompiled_regexp.hxx
index 5b02201128a6..d6be348157e9 100644
--- a/regexp/inc/pch/precompiled_regexp.hxx
+++ b/regexp/inc/pch/precompiled_regexp.hxx
@@ -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
diff --git a/regexp/orig/regex.c b/regexp/orig/regex.c
index b429eabbcf13..6cde9f4435d5 100644
--- a/regexp/orig/regex.c
+++ b/regexp/orig/regex.c
@@ -24,7 +24,7 @@
   #pragma alloca
 #endif
 
-#undef  _GNU_SOURCE
+#undef	_GNU_SOURCE
 #define _GNU_SOURCE
 
 #ifdef HAVE_CONFIG_H
@@ -134,18 +134,18 @@ char *realloc ();
 #   include <string.h>
 #   ifndef bzero
 #    ifndef _LIBC
-#     define bzero(s, n)    (memset (s, '\0', n), (s))
+#     define bzero(s, n)	(memset (s, '\0', n), (s))
 #    else
-#     define bzero(s, n)    __bzero (s, n)
+#     define bzero(s, n)	__bzero (s, n)
 #    endif
 #   endif
 #  else
 #   include <strings.h>
 #   ifndef memcmp
-#    define memcmp(s1, s2, n)   bcmp (s1, s2, n)
+#    define memcmp(s1, s2, n)	bcmp (s1, s2, n)
 #   endif
 #   ifndef memcpy
-#    define memcpy(d, s, n) (bcopy (s, d, n), (d))
+#    define memcpy(d, s, n)	(bcopy (s, d, n), (d))
 #   endif
 #  endif
 # endif
@@ -311,8 +311,8 @@ init_syntax_once ()
 # define REGEX_ALLOCATE alloca
 
 /* Assumes a `char *destination' variable.  */
-# define REGEX_REALLOCATE(source, osize, nsize)             \
-  (destination = (char *) alloca (nsize),               \
+# define REGEX_REALLOCATE(source, osize, nsize)				\
+  (destination = (char *) alloca (nsize),				\
    memcpy (destination, source, osize))
 
 /* No need to do anything to free, after alloca.  */
@@ -324,11 +324,11 @@ init_syntax_once ()
 
 #if defined REL_ALLOC && defined REGEX_MALLOC
 
-# define REGEX_ALLOCATE_STACK(size)             \
+# define REGEX_ALLOCATE_STACK(size)				\
   r_alloc (&failure_stack_ptr, (size))
-# define REGEX_REALLOCATE_STACK(source, osize, nsize)       \
+# define REGEX_REALLOCATE_STACK(source, osize, nsize)		\
   r_re_alloc (&failure_stack_ptr, (nsize))
-# define REGEX_FREE_STACK(ptr)                  \
+# define REGEX_FREE_STACK(ptr)					\
   r_alloc_free (&failure_stack_ptr)
 
 #else /* not using relocating allocator */
@@ -343,7 +343,7 @@ init_syntax_once ()
 
 #  define REGEX_ALLOCATE_STACK alloca
 
-#  define REGEX_REALLOCATE_STACK(source, osize, nsize)          \
+#  define REGEX_REALLOCATE_STACK(source, osize, nsize)			\
    REGEX_REALLOCATE (source, osize, nsize)
 /* No need to explicitly free anything.  */
 #  define REGEX_FREE_STACK(arg)
@@ -355,7 +355,7 @@ init_syntax_once ()
 /* True if `size1' is non-NULL and PTR is pointing anywhere inside
    `string1' or just past its end.  This works if PTR is NULL, which is
    a good thing.  */
-#define FIRST_STRING_P(ptr)                     \
+#define FIRST_STRING_P(ptr) 					\
   (size1 && string1 <= (ptr) && (ptr) <= string1 + size1)
 
 /* (Re)Allocate N items of type T using malloc, or fail.  */
@@ -501,19 +501,19 @@ typedef enum
            bytes of number.  */
   set_number_at,
 
-  wordchar, /* Matches any word-constituent character.  */
-  notwordchar,  /* Matches any char that is not a word-constituent.  */
+  wordchar,	/* Matches any word-constituent character.  */
+  notwordchar,	/* Matches any char that is not a word-constituent.  */
 
-  wordbeg,  /* Succeeds if at word beginning.  */
-  wordend,  /* Succeeds if at word end.  */
+  wordbeg,	/* Succeeds if at word beginning.  */
+  wordend,	/* Succeeds if at word end.  */
 
-  wordbound,    /* Succeeds if at a word boundary.  */
-  notwordbound  /* Succeeds if not at a word boundary.  */
+  wordbound,	/* Succeeds if at a word boundary.  */
+  notwordbound	/* Succeeds if not at a word boundary.  */
 
 #ifdef emacs
-  ,before_dot,  /* Succeeds if before point.  */
-  at_dot,   /* Succeeds if at point.  */
-  after_dot,    /* Succeeds if after point.  */
+  ,before_dot,	/* Succeeds if before point.  */
+  at_dot,	/* Succeeds if at point.  */
+  after_dot,	/* Succeeds if after point.  */
 
     /* Matches any character whose syntax is specified.  Followed by
            a byte which contains a syntax code, e.g., Sword.  */
@@ -528,29 +528,29 @@ typedef enum
 
 /* Store NUMBER in two contiguous bytes starting at DESTINATION.  */
 
-#define STORE_NUMBER(destination, number)               \
-  do {                                  \
-    (destination)[0] = (number) & 0377;                 \
-    (destination)[1] = (number) >> 8;                   \
+#define STORE_NUMBER(destination, number)				\
+  do {									\
+    (destination)[0] = (number) & 0377;					\
+    (destination)[1] = (number) >> 8;					\
   } while (0)
 
 /* Same as STORE_NUMBER, except increment DESTINATION to
    the byte after where the number is stored.  Therefore, DESTINATION
    must be an lvalue.  */
 
-#define STORE_NUMBER_AND_INCR(destination, number)          \
-  do {                                  \
-    STORE_NUMBER (destination, number);                 \
-    (destination) += 2;                         \
+#define STORE_NUMBER_AND_INCR(destination, number)			\
+  do {									\
+    STORE_NUMBER (destination, number);					\
+    (destination) += 2;							\
   } while (0)
 
 /* Put into DESTINATION a number stored in two contiguous bytes starting
    at SOURCE.  */
 
-#define EXTRACT_NUMBER(destination, source)             \
-  do {                                  \
-    (destination) = *(source) & 0377;                   \
-    (destination) += SIGN_EXTEND_CHAR (*((source) + 1)) << 8;       \
+#define EXTRACT_NUMBER(destination, source)				\
+  do {									\
+    (destination) = *(source) & 0377;					\
+    (destination) += SIGN_EXTEND_CHAR (*((source) + 1)) << 8;		\
   } while (0)
 
 #ifdef DEBUG
@@ -575,10 +575,10 @@ extract_number (dest, source)
 /* Same as EXTRACT_NUMBER, except increment SOURCE to after the number.
    SOURCE must be an lvalue.  */
 
-#define EXTRACT_NUMBER_AND_INCR(destination, source)            \
-  do {                                  \
-    EXTRACT_NUMBER (destination, source);               \
-    (source) += 2;                          \
+#define EXTRACT_NUMBER_AND_INCR(destination, source)			\
+  do {									\
+    EXTRACT_NUMBER (destination, source);				\
+    (source) += 2; 							\
   } while (0)
 
 #ifdef DEBUG
@@ -622,9 +622,9 @@ static int debug;
 # define DEBUG_PRINT2(x1, x2) if (debug) printf (x1, x2)
 # define DEBUG_PRINT3(x1, x2, x3) if (debug) printf (x1, x2, x3)
 # define DEBUG_PRINT4(x1, x2, x3, x4) if (debug) printf (x1, x2, x3, x4)
-# define DEBUG_PRINT_COMPILED_PATTERN(p, s, e)              \
+# define DEBUG_PRINT_COMPILED_PATTERN(p, s, e) 				\
   if (debug) print_partial_compiled_pattern (s, e)
-# define DEBUG_PRINT_DOUBLE_STRING(w, s1, sz1, s2, sz2)         \
+# define DEBUG_PRINT_DOUBLE_STRING(w, s1, sz1, s2, sz2)			\
   if (debug) print_double_string (w, s1, sz1, s2, sz2)
 
 
@@ -1015,55 +1015,55 @@ weak_alias (__re_set_syntax, re_set_syntax)
 
 static const char re_error_msgid[] =
   {
-#define REG_NOERROR_IDX 0
-    gettext_noop ("Success")    /* REG_NOERROR */
+#define REG_NOERROR_IDX	0
+    gettext_noop ("Success")	/* REG_NOERROR */
     "\0"
 #define REG_NOMATCH_IDX (REG_NOERROR_IDX + sizeof "Success")
-    gettext_noop ("No match")   /* REG_NOMATCH */
+    gettext_noop ("No match")	/* REG_NOMATCH */
     "\0"
-#define REG_BADPAT_IDX  (REG_NOMATCH_IDX + sizeof "No match")
+#define REG_BADPAT_IDX	(REG_NOMATCH_IDX + sizeof "No match")
     gettext_noop ("Invalid regular expression") /* REG_BADPAT */
     "\0"
 #define REG_ECOLLATE_IDX (REG_BADPAT_IDX + sizeof "Invalid regular expression")
     gettext_noop ("Invalid collation character") /* REG_ECOLLATE */
     "\0"
-#define REG_ECTYPE_IDX  (REG_ECOLLATE_IDX + sizeof "Invalid collation character")
+#define REG_ECTYPE_IDX	(REG_ECOLLATE_IDX + sizeof "Invalid collation character")
     gettext_noop ("Invalid character class name") /* REG_ECTYPE */
     "\0"
-#define REG_EESCAPE_IDX (REG_ECTYPE_IDX + sizeof "Invalid character class name")
+#define REG_EESCAPE_IDX	(REG_ECTYPE_IDX + sizeof "Invalid character class name")
     gettext_noop ("Trailing backslash") /* REG_EESCAPE */
     "\0"
-#define REG_ESUBREG_IDX (REG_EESCAPE_IDX + sizeof "Trailing backslash")
+#define REG_ESUBREG_IDX	(REG_EESCAPE_IDX + sizeof "Trailing backslash")
     gettext_noop ("Invalid back reference") /* REG_ESUBREG */
     "\0"
-#define REG_EBRACK_IDX  (REG_ESUBREG_IDX + sizeof "Invalid back reference")
-    gettext_noop ("Unmatched [ or [^")  /* REG_EBRACK */
+#define REG_EBRACK_IDX	(REG_ESUBREG_IDX + sizeof "Invalid back reference")
+    gettext_noop ("Unmatched [ or [^")	/* REG_EBRACK */
     "\0"
-#define REG_EPAREN_IDX  (REG_EBRACK_IDX + sizeof "Unmatched [ or [^")
+#define REG_EPAREN_IDX	(REG_EBRACK_IDX + sizeof "Unmatched [ or [^")
     gettext_noop ("Unmatched ( or \\(") /* REG_EPAREN */
     "\0"
-#define REG_EBRACE_IDX  (REG_EPAREN_IDX + sizeof "Unmatched ( or \\(")
+#define REG_EBRACE_IDX	(REG_EPAREN_IDX + sizeof "Unmatched ( or \\(")
     gettext_noop ("Unmatched \\{") /* REG_EBRACE */
     "\0"
-#define REG_BADBR_IDX   (REG_EBRACE_IDX + sizeof "Unmatched \\{")
+#define REG_BADBR_IDX	(REG_EBRACE_IDX + sizeof "Unmatched \\{")
     gettext_noop ("Invalid content of \\{\\}") /* REG_BADBR */
     "\0"
-#define REG_ERANGE_IDX  (REG_BADBR_IDX + sizeof "Invalid content of \\{\\}")
-    gettext_noop ("Invalid range end")  /* REG_ERANGE */
+#define REG_ERANGE_IDX	(REG_BADBR_IDX + sizeof "Invalid content of \\{\\}")
+    gettext_noop ("Invalid range end")	/* REG_ERANGE */
     "\0"
-#define REG_ESPACE_IDX  (REG_ERANGE_IDX + sizeof "Invalid range end")
+#define REG_ESPACE_IDX	(REG_ERANGE_IDX + sizeof "Invalid range end")
     gettext_noop ("Memory exhausted") /* REG_ESPACE */
     "\0"
-#define REG_BADRPT_IDX  (REG_ESPACE_IDX + sizeof "Memory exhausted")
+#define REG_BADRPT_IDX	(REG_ESPACE_IDX + sizeof "Memory exhausted")
     gettext_noop ("Invalid preceding regular expression") /* REG_BADRPT */
     "\0"
-#define REG_EEND_IDX    (REG_BADRPT_IDX + sizeof "Invalid preceding regular expression")
+#define REG_EEND_IDX	(REG_BADRPT_IDX + sizeof "Invalid preceding regular expression")
     gettext_noop ("Premature end of regular expression") /* REG_EEND */
     "\0"
-#define REG_ESIZE_IDX   (REG_EEND_IDX + sizeof "Premature end of regular expression")
+#define REG_ESIZE_IDX	(REG_EEND_IDX + sizeof "Premature end of regular expression")
     gettext_noop ("Regular expression too big") /* REG_ESIZE */
     "\0"
-#define REG_ERPAREN_IDX (REG_ESIZE_IDX + sizeof "Regular expression too big")
+#define REG_ERPAREN_IDX	(REG_ESIZE_IDX + sizeof "Regular expression too big")
     gettext_noop ("Unmatched ) or \\)") /* REG_ERPAREN */
   };
 
@@ -1165,7 +1165,7 @@ typedef struct
 {
   fail_stack_elt_t *stack;
   unsigned long int size;
-  unsigned long int avail;      /* Offset of next open position.  */
+  unsigned long int avail;		/* Offset of next open position.  */
 } fail_stack_type;
 
 #else /* not INT_IS_16BIT */
@@ -1190,7 +1190,7 @@ typedef struct
 {
   fail_stack_elt_t *stack;
   unsigned size;
-  unsigned avail;           /* Offset of next open position.  */
+  unsigned avail;			/* Offset of next open position.  */
 } fail_stack_type;
 
 #endif /* INT_IS_16BIT */
@@ -1204,23 +1204,23 @@ typedef struct
    Do `return -2' if the alloc fails.  */
 
 #ifdef MATCH_MAY_ALLOCATE
-# define INIT_FAIL_STACK()                      \
-  do {                                  \
-    fail_stack.stack = (fail_stack_elt_t *)             \
+# define INIT_FAIL_STACK()						\
+  do {									\
+    fail_stack.stack = (fail_stack_elt_t *)				\
       REGEX_ALLOCATE_STACK (INIT_FAILURE_ALLOC * sizeof (fail_stack_elt_t)); \
                                     \
-    if (fail_stack.stack == NULL)                   \
-      return -2;                            \
+    if (fail_stack.stack == NULL)					\
+      return -2;							\
                                     \
-    fail_stack.size = INIT_FAILURE_ALLOC;               \
-    fail_stack.avail = 0;                       \
+    fail_stack.size = INIT_FAILURE_ALLOC;				\
+    fail_stack.avail = 0;						\
   } while (0)
 
 # define RESET_FAIL_STACK()  REGEX_FREE_STACK (fail_stack.stack)
 #else
-# define INIT_FAIL_STACK()                      \
-  do {                                  \
-    fail_stack.avail = 0;                       \
+# define INIT_FAIL_STACK()						\
+  do {									\
+    fail_stack.avail = 0;						\
   } while (0)
 
 # define RESET_FAIL_STACK()
@@ -1234,46 +1234,46 @@ typedef struct
 
    REGEX_REALLOCATE_STACK requires `destination' be declared.   */
 
-#define DOUBLE_FAIL_STACK(fail_stack)                   \
-  ((fail_stack).size > (unsigned) (re_max_failures * MAX_FAILURE_ITEMS) \
-   ? 0                                  \
-   : ((fail_stack).stack = (fail_stack_elt_t *)             \
-        REGEX_REALLOCATE_STACK ((fail_stack).stack,             \
-          (fail_stack).size * sizeof (fail_stack_elt_t),        \
-          ((fail_stack).size << 1) * sizeof (fail_stack_elt_t)),    \
+#define DOUBLE_FAIL_STACK(fail_stack)					\
+  ((fail_stack).size > (unsigned) (re_max_failures * MAX_FAILURE_ITEMS)	\
+   ? 0									\
+   : ((fail_stack).stack = (fail_stack_elt_t *)				\
+        REGEX_REALLOCATE_STACK ((fail_stack).stack, 			\
+          (fail_stack).size * sizeof (fail_stack_elt_t),		\
+          ((fail_stack).size << 1) * sizeof (fail_stack_elt_t)),	\
                                     \
-      (fail_stack).stack == NULL                    \
-      ? 0                               \
-      : ((fail_stack).size <<= 1,                   \
+      (fail_stack).stack == NULL					\
+      ? 0								\
+      : ((fail_stack).size <<= 1, 					\
          1)))
 
 
 /* Push pointer POINTER on FAIL_STACK.
    Return 1 if was able to do so and 0 if ran out of memory allocating
    space to do so.  */
-#define PUSH_PATTERN_OP(POINTER, FAIL_STACK)                \
-  ((FAIL_STACK_FULL ()                          \
-    && !DOUBLE_FAIL_STACK (FAIL_STACK))                 \
-   ? 0                                  \
-   : ((FAIL_STACK).stack[(FAIL_STACK).avail++].pointer = POINTER,   \
+#define PUSH_PATTERN_OP(POINTER, FAIL_STACK)				\
+  ((FAIL_STACK_FULL ()							\
+    && !DOUBLE_FAIL_STACK (FAIL_STACK))					\
+   ? 0									\
+   : ((FAIL_STACK).stack[(FAIL_STACK).avail++].pointer = POINTER,	\
       1))
 
 /* Push a pointer value onto the failure stack.
    Assumes the variable `fail_stack'.  Probably should only
    be called from within `PUSH_FAILURE_POINT'.  */
-#define PUSH_FAILURE_POINTER(item)                  \
+#define PUSH_FAILURE_POINTER(item)					\
   fail_stack.stack[fail_stack.avail++].pointer = (unsigned char *) (item)
 
 /* This pushes an integer-valued item onto the failure stack.
    Assumes the variable `fail_stack'.  Probably should only
    be called from within `PUSH_FAILURE_POINT'.  */
-#define PUSH_FAILURE_INT(item)                  \
+#define PUSH_FAILURE_INT(item)					\
   fail_stack.stack[fail_stack.avail++].integer = (item)
 
 /* Push a fail_stack_elt_t value onto the failure stack.
    Assumes the variable `fail_stack'.  Probably should only
    be called from within `PUSH_FAILURE_POINT'.  */
-#define PUSH_FAILURE_ELT(item)                  \
+#define PUSH_FAILURE_ELT(item)					\
   fail_stack.stack[fail_stack.avail++] =  (item)
 
 /* These three POP... operations complement the three PUSH... operations.
@@ -1301,83 +1301,83 @@ typedef struct
 
    Does `return FAILURE_CODE' if runs out of memory.  */
 
-#define PUSH_FAILURE_POINT(pattern_place, string_place, failure_code)   \
-  do {                                  \
-    char *destination;                          \
-    /* Must be int, so when we don't save any registers, the arithmetic \
-       of 0 + -1 isn't done as unsigned.  */                \
-    /* Can't be int, since there is not a shred of a guarantee that int \
-       is wide enough to hold a value of something to which pointer can \
-       be assigned */                           \
-    active_reg_t this_reg;                      \
+#define PUSH_FAILURE_POINT(pattern_place, string_place, failure_code)	\
+  do {									\
+    char *destination;							\
+    /* Must be int, so when we don't save any registers, the arithmetic	\
+       of 0 + -1 isn't done as unsigned.  */				\
+    /* Can't be int, since there is not a shred of a guarantee that int	\
+       is wide enough to hold a value of something to which pointer can	\
+       be assigned */							\
+    active_reg_t this_reg;						\
                                         \
-    DEBUG_STATEMENT (failure_id++);                 \
-    DEBUG_STATEMENT (nfailure_points_pushed++);             \
-    DEBUG_PRINT2 ("\nPUSH_FAILURE_POINT #%u:\n", failure_id);       \
+    DEBUG_STATEMENT (failure_id++);					\
+    DEBUG_STATEMENT (nfailure_points_pushed++);				\
+    DEBUG_PRINT2 ("\nPUSH_FAILURE_POINT #%u:\n", failure_id);		\
     DEBUG_PRINT2 ("  Before push, next avail: %d\n", (fail_stack).avail);\
     DEBUG_PRINT2 ("                     size: %d\n", (fail_stack).size);\
                                     \
-    DEBUG_PRINT2 ("  slots needed: %ld\n", NUM_FAILURE_ITEMS);      \
-    DEBUG_PRINT2 ("     available: %d\n", REMAINING_AVAIL_SLOTS);   \
+    DEBUG_PRINT2 ("  slots needed: %ld\n", NUM_FAILURE_ITEMS);		\
+    DEBUG_PRINT2 ("     available: %d\n", REMAINING_AVAIL_SLOTS);	\
                                     \
-    /* Ensure we have enough space allocated for what we will push.  */ \
-    while (REMAINING_AVAIL_SLOTS < NUM_FAILURE_ITEMS)           \
-      {                                 \
-        if (!DOUBLE_FAIL_STACK (fail_stack))                \
-          return failure_code;                      \
+    /* Ensure we have enough space allocated for what we will push.  */	\
+    while (REMAINING_AVAIL_SLOTS < NUM_FAILURE_ITEMS)			\
+      {									\
+        if (!DOUBLE_FAIL_STACK (fail_stack))				\
+          return failure_code;						\
                                     \
-        DEBUG_PRINT2 ("\n  Doubled stack; size now: %d\n",      \
-               (fail_stack).size);              \
+        DEBUG_PRINT2 ("\n  Doubled stack; size now: %d\n",		\
+               (fail_stack).size);				\
         DEBUG_PRINT2 ("  slots available: %d\n", REMAINING_AVAIL_SLOTS);\
-      }                                 \
+      }									\
                                     \
-    /* Push the info, starting with the registers.  */          \
-    DEBUG_PRINT1 ("\n");                        \
+    /* Push the info, starting with the registers.  */			\
+    DEBUG_PRINT1 ("\n");						\
                                     \
-    if (1)                              \
+    if (1)								\
       for (this_reg = lowest_active_reg; this_reg <= highest_active_reg; \
-       this_reg++)                          \
-    {                               \
-      DEBUG_PRINT2 ("  Pushing reg: %lu\n", this_reg);      \
-      DEBUG_STATEMENT (num_regs_pushed++);              \
+       this_reg++)							\
+    {								\
+      DEBUG_PRINT2 ("  Pushing reg: %lu\n", this_reg);		\
+      DEBUG_STATEMENT (num_regs_pushed++);				\
                                     \
-      DEBUG_PRINT2 ("    start: %p\n", regstart[this_reg]);     \
-      PUSH_FAILURE_POINTER (regstart[this_reg]);            \
+      DEBUG_PRINT2 ("    start: %p\n", regstart[this_reg]);		\
+      PUSH_FAILURE_POINTER (regstart[this_reg]);			\
                                     \
-      DEBUG_PRINT2 ("    end: %p\n", regend[this_reg]);     \
-      PUSH_FAILURE_POINTER (regend[this_reg]);          \
+      DEBUG_PRINT2 ("    end: %p\n", regend[this_reg]);		\
+      PUSH_FAILURE_POINTER (regend[this_reg]);			\
                                     \
-      DEBUG_PRINT2 ("    info: %p\n      ",             \
-            reg_info[this_reg].word.pointer);       \
-      DEBUG_PRINT2 (" match_null=%d",               \
-            REG_MATCH_NULL_STRING_P (reg_info[this_reg]));  \
-      DEBUG_PRINT2 (" active=%d", IS_ACTIVE (reg_info[this_reg]));  \
-      DEBUG_PRINT2 (" matched_something=%d",            \
-            MATCHED_SOMETHING (reg_info[this_reg]));    \
-      DEBUG_PRINT2 (" ever_matched=%d",             \
-            EVER_MATCHED_SOMETHING (reg_info[this_reg]));   \
-      DEBUG_PRINT1 ("\n");                      \
-      PUSH_FAILURE_ELT (reg_info[this_reg].word);           \
-    }                               \
+      DEBUG_PRINT2 ("    info: %p\n      ",				\
+            reg_info[this_reg].word.pointer);		\
+      DEBUG_PRINT2 (" match_null=%d",				\
+            REG_MATCH_NULL_STRING_P (reg_info[this_reg]));	\
+      DEBUG_PRINT2 (" active=%d", IS_ACTIVE (reg_info[this_reg]));	\
+      DEBUG_PRINT2 (" matched_something=%d",			\
+            MATCHED_SOMETHING (reg_info[this_reg]));	\
+      DEBUG_PRINT2 (" ever_matched=%d",				\
+            EVER_MATCHED_SOMETHING (reg_info[this_reg]));	\
+      DEBUG_PRINT1 ("\n");						\
+      PUSH_FAILURE_ELT (reg_info[this_reg].word);			\
+    }								\
                                     \
     DEBUG_PRINT2 ("  Pushing  low active reg: %ld\n", lowest_active_reg);\
-    PUSH_FAILURE_INT (lowest_active_reg);               \
+    PUSH_FAILURE_INT (lowest_active_reg);				\
                                     \
     DEBUG_PRINT2 ("  Pushing high active reg: %ld\n", highest_active_reg);\
-    PUSH_FAILURE_INT (highest_active_reg);              \
+    PUSH_FAILURE_INT (highest_active_reg);				\
                                     \
-    DEBUG_PRINT2 ("  Pushing pattern %p:\n", pattern_place);        \
-    DEBUG_PRINT_COMPILED_PATTERN (bufp, pattern_place, pend);       \
-    PUSH_FAILURE_POINTER (pattern_place);               \
+    DEBUG_PRINT2 ("  Pushing pattern %p:\n", pattern_place);		\
+    DEBUG_PRINT_COMPILED_PATTERN (bufp, pattern_place, pend);		\
+    PUSH_FAILURE_POINTER (pattern_place);				\
                                     \
-    DEBUG_PRINT2 ("  Pushing string %p: `", string_place);      \
+    DEBUG_PRINT2 ("  Pushing string %p: `", string_place);		\
     DEBUG_PRINT_DOUBLE_STRING (string_place, string1, size1, string2,   \
-                 size2);                \
-    DEBUG_PRINT1 ("'\n");                       \
-    PUSH_FAILURE_POINTER (string_place);                \
+                 size2);				\
+    DEBUG_PRINT1 ("'\n");						\
+    PUSH_FAILURE_POINTER (string_place);				\
                                     \
-    DEBUG_PRINT2 ("  Pushing failure id: %u\n", failure_id);        \
-    DEBUG_PUSH (failure_id);                        \
+    DEBUG_PRINT2 ("  Pushing failure id: %u\n", failure_id);		\
+    DEBUG_PUSH (failure_id);						\
   } while (0)
 
 /* This is the number of items that are pushed and popped on the stack
@@ -1398,10 +1398,10 @@ typedef struct
 #define MAX_FAILURE_ITEMS (5 * NUM_REG_ITEMS + NUM_NONREG_ITEMS)
 
 /* We actually push this many items.  */
-#define NUM_FAILURE_ITEMS               \
-  (((0                          \
-     ? 0 : highest_active_reg - lowest_active_reg + 1)  \
-    * NUM_REG_ITEMS)                    \
+#define NUM_FAILURE_ITEMS				\
+  (((0							\
+     ? 0 : highest_active_reg - lowest_active_reg + 1)	\
+    * NUM_REG_ITEMS)					\
    + NUM_NONREG_ITEMS)
 
 /* How many items can still be added to the stack without overflowing it.  */
@@ -1421,73 +1421,73 @@ typedef struct
    `pend', `string1', `size1', `string2', and `size2'.  */
 
 #define POP_FAILURE_POINT(str, pat, low_reg, high_reg, regstart, regend, reg_info)\
-{                                   \
-  DEBUG_STATEMENT (unsigned failure_id;)                \
-  active_reg_t this_reg;                        \
-  const unsigned char *string_temp;                 \
+{									\
+  DEBUG_STATEMENT (unsigned failure_id;)				\
+  active_reg_t this_reg;						\
+  const unsigned char *string_temp;					\
                                     \
-  assert (!FAIL_STACK_EMPTY ());                    \
+  assert (!FAIL_STACK_EMPTY ());					\
                                     \
-  /* Remove failure points and point to how many regs pushed.  */   \
-  DEBUG_PRINT1 ("POP_FAILURE_POINT:\n");                \
-  DEBUG_PRINT2 ("  Before pop, next avail: %d\n", fail_stack.avail);    \
-  DEBUG_PRINT2 ("                    size: %d\n", fail_stack.size); \
+  /* Remove failure points and point to how many regs pushed.  */	\
+  DEBUG_PRINT1 ("POP_FAILURE_POINT:\n");				\
+  DEBUG_PRINT2 ("  Before pop, next avail: %d\n", fail_stack.avail);	\
+  DEBUG_PRINT2 ("                    size: %d\n", fail_stack.size);	\
                                     \
-  assert (fail_stack.avail >= NUM_NONREG_ITEMS);            \
+  assert (fail_stack.avail >= NUM_NONREG_ITEMS);			\
                                     \
-  DEBUG_POP (&failure_id);                      \
-  DEBUG_PRINT2 ("  Popping failure id: %u\n", failure_id);      \
+  DEBUG_POP (&failure_id);						\
+  DEBUG_PRINT2 ("  Popping failure id: %u\n", failure_id);		\
                                     \
-  /* If the saved string location is NULL, it came from an      \
-     on_failure_keep_string_jump opcode, and we want to throw away the  \
-     saved NULL, thus retaining our current position in the string.  */ \
-  string_temp = POP_FAILURE_POINTER ();                 \
-  if (string_temp != NULL)                      \
-    str = (const char *) string_temp;                   \
+  /* If the saved string location is NULL, it came from an		\
+     on_failure_keep_string_jump opcode, and we want to throw away the	\
+     saved NULL, thus retaining our current position in the string.  */	\
+  string_temp = POP_FAILURE_POINTER ();					\
+  if (string_temp != NULL)						\
+    str = (const char *) string_temp;					\
                                     \
-  DEBUG_PRINT2 ("  Popping string %p: `", str);             \
-  DEBUG_PRINT_DOUBLE_STRING (str, string1, size1, string2, size2);  \
-  DEBUG_PRINT1 ("'\n");                         \
+  DEBUG_PRINT2 ("  Popping string %p: `", str);				\
+  DEBUG_PRINT_DOUBLE_STRING (str, string1, size1, string2, size2);	\
+  DEBUG_PRINT1 ("'\n");							\
                                     \
-  pat = (unsigned char *) POP_FAILURE_POINTER ();           \
-  DEBUG_PRINT2 ("  Popping pattern %p:\n", pat);            \
-  DEBUG_PRINT_COMPILED_PATTERN (bufp, pat, pend);           \
+  pat = (unsigned char *) POP_FAILURE_POINTER ();			\
+  DEBUG_PRINT2 ("  Popping pattern %p:\n", pat);			\
+  DEBUG_PRINT_COMPILED_PATTERN (bufp, pat, pend);			\
                                     \
-  /* Restore register info.  */                     \
-  high_reg = (active_reg_t) POP_FAILURE_INT ();             \
-  DEBUG_PRINT2 ("  Popping high active reg: %ld\n", high_reg);      \
+  /* Restore register info.  */						\
+  high_reg = (active_reg_t) POP_FAILURE_INT ();				\
+  DEBUG_PRINT2 ("  Popping high active reg: %ld\n", high_reg);		\
                                     \
-  low_reg = (active_reg_t) POP_FAILURE_INT ();              \
-  DEBUG_PRINT2 ("  Popping  low active reg: %ld\n", low_reg);       \
+  low_reg = (active_reg_t) POP_FAILURE_INT ();				\
+  DEBUG_PRINT2 ("  Popping  low active reg: %ld\n", low_reg);		\
                                     \
-  if (1)                                \
-    for (this_reg = high_reg; this_reg >= low_reg; this_reg--)      \
-      {                                 \
-    DEBUG_PRINT2 ("    Popping reg: %ld\n", this_reg);      \
+  if (1)								\
+    for (this_reg = high_reg; this_reg >= low_reg; this_reg--)		\
+      {									\
+    DEBUG_PRINT2 ("    Popping reg: %ld\n", this_reg);		\
                                     \
-    reg_info[this_reg].word = POP_FAILURE_ELT ();           \
-    DEBUG_PRINT2 ("      info: %p\n",               \
-              reg_info[this_reg].word.pointer);         \
+    reg_info[this_reg].word = POP_FAILURE_ELT ();			\
+    DEBUG_PRINT2 ("      info: %p\n",				\
+              reg_info[this_reg].word.pointer);			\
                                     \
-    regend[this_reg] = (const char *) POP_FAILURE_POINTER ();   \
-    DEBUG_PRINT2 ("      end: %p\n", regend[this_reg]);     \
+    regend[this_reg] = (const char *) POP_FAILURE_POINTER ();	\
+    DEBUG_PRINT2 ("      end: %p\n", regend[this_reg]);		\
                                     \
-    regstart[this_reg] = (const char *) POP_FAILURE_POINTER (); \
-    DEBUG_PRINT2 ("      start: %p\n", regstart[this_reg]);     \
-      }                                 \
-  else                                  \
-    {                                   \
+    regstart[this_reg] = (const char *) POP_FAILURE_POINTER ();	\
+    DEBUG_PRINT2 ("      start: %p\n", regstart[this_reg]);		\
+      }									\
+  else									\
+    {									\
       for (this_reg = highest_active_reg; this_reg > high_reg; this_reg--) \
-    {                               \
-      reg_info[this_reg].word.integer = 0;              \
-      regend[this_reg] = 0;                     \
-      regstart[this_reg] = 0;                   \
-    }                               \
-      highest_active_reg = high_reg;                    \
-    }                                   \
+    {								\
+      reg_info[this_reg].word.integer = 0;				\
+      regend[this_reg] = 0;						\
+      regstart[this_reg] = 0;					\
+    }								\
+      highest_active_reg = high_reg;					\
+    }									\
                                     \
-  set_regs_matched_done = 0;                        \
-  DEBUG_STATEMENT (nfailure_points_popped++);               \
+  set_regs_matched_done = 0;						\
+  DEBUG_STATEMENT (nfailure_points_popped++);				\
 } /* POP_FAILURE_POINT */
 
 
@@ -1530,21 +1530,21 @@ typedef union
 /* Call this when have matched a real character; it sets `matched' flags
    for the subexpressions which we are currently inside.  Also records
    that those subexprs have matched.  */
-#define SET_REGS_MATCHED()                      \
-  do                                    \
-    {                                   \
-      if (!set_regs_matched_done)                   \
-    {                               \
-      active_reg_t r;                       \
-      set_regs_matched_done = 1;                    \
-      for (r = lowest_active_reg; r <= highest_active_reg; r++) \
-        {                               \
-          MATCHED_SOMETHING (reg_info[r])               \
-        = EVER_MATCHED_SOMETHING (reg_info[r])          \
-        = 1;                            \
-        }                               \
-    }                               \
-    }                                   \
+#define SET_REGS_MATCHED()						\
+  do									\
+    {									\
+      if (!set_regs_matched_done)					\
+    {								\
+      active_reg_t r;						\
+      set_regs_matched_done = 1;					\
+      for (r = lowest_active_reg; r <= highest_active_reg; r++)	\
+        {								\
+          MATCHED_SOMETHING (reg_info[r])				\
+        = EVER_MATCHED_SOMETHING (reg_info[r])			\
+        = 1;							\
+        }								\
+    }								\
+    }									\
   while (0)
 
 /* Registers are set to a sentinel when they haven't yet matched.  */
@@ -1579,18 +1579,18 @@ static reg_errcode_t compile_range _RE_ARGS ((const char **p_ptr,
    string passed to us by the user to an unsigned char that we can use
    as an array index (in, e.g., `translate').  */
 #ifndef PATFETCH
-# define PATFETCH(c)                            \
-  do {if (p == pend) return REG_EEND;                   \
-    c = (unsigned char) *p++;                       \
-    if (translate) c = (unsigned char) translate[c];            \
+# define PATFETCH(c)							\
+  do {if (p == pend) return REG_EEND;					\
+    c = (unsigned char) *p++;						\
+    if (translate) c = (unsigned char) translate[c];			\
   } while (0)
 #endif
 
 /* Fetch the next character in the uncompiled pattern, with no
    translation.  */
-#define PATFETCH_RAW(c)                         \
-  do {if (p == pend) return REG_EEND;                   \
-    c = (unsigned char) *p++;                       \
+#define PATFETCH_RAW(c)							\
+  do {if (p == pend) return REG_EEND;					\
+    c = (unsigned char) *p++; 						\
   } while (0)
 
 /* Go backwards one character in the pattern.  */
@@ -1613,34 +1613,34 @@ static reg_errcode_t compile_range _RE_ARGS ((const char **p_ptr,
 #define INIT_BUF_SIZE  32
 
 /* Make sure we have at least N more bytes of space in buffer.  */
-#define GET_BUFFER_SPACE(n)                     \
-    while ((unsigned long) (b - bufp->buffer + (n)) > bufp->allocated)  \
+#define GET_BUFFER_SPACE(n)						\
+    while ((unsigned long) (b - bufp->buffer + (n)) > bufp->allocated)	\
       EXTEND_BUFFER ()
 
 /* Make sure we have one more byte of buffer space and then add C to it.  */
-#define BUF_PUSH(c)                         \
-  do {                                  \
-    GET_BUFFER_SPACE (1);                       \
-    *b++ = (unsigned char) (c);                     \
+#define BUF_PUSH(c)							\
+  do {									\
+    GET_BUFFER_SPACE (1);						\
+    *b++ = (unsigned char) (c);						\
   } while (0)
 
 
 /* Ensure we have two more bytes of buffer space and then append C1 and C2.  */
-#define BUF_PUSH_2(c1, c2)                      \
-  do {                                  \
-    GET_BUFFER_SPACE (2);                       \
-    *b++ = (unsigned char) (c1);                    \
-    *b++ = (unsigned char) (c2);                    \
+#define BUF_PUSH_2(c1, c2)						\
+  do {									\
+    GET_BUFFER_SPACE (2);						\
+    *b++ = (unsigned char) (c1);					\
+    *b++ = (unsigned char) (c2);					\
   } while (0)
 
 
 /* As with BUF_PUSH_2, except for three bytes.  */
-#define BUF_PUSH_3(c1, c2, c3)                      \
-  do {                                  \
-    GET_BUFFER_SPACE (3);                       \
-    *b++ = (unsigned char) (c1);                    \
-    *b++ = (unsigned char) (c2);                    \
-    *b++ = (unsigned char) (c3);                    \
+#define BUF_PUSH_3(c1, c2, c3)						\
+  do {									\
+    GET_BUFFER_SPACE (3);						\
+    *b++ = (unsigned char) (c1);					\
+    *b++ = (unsigned char) (c2);					\
+    *b++ = (unsigned char) (c3);					\
   } while (0)
 
 
@@ -1685,29 +1685,29 @@ static reg_errcode_t compile_range _RE_ARGS ((const char **p_ptr,
    reset the pointers that pointed into the old block to point to the
    correct places in the new one.  If extending the buffer results in it
    being larger than MAX_BUF_SIZE, then flag memory exhausted.  */
-#define EXTEND_BUFFER()                         \
-  do {                                  \
-    unsigned char *old_buffer = bufp->buffer;               \
-    if (bufp->allocated == MAX_BUF_SIZE)                \
-      return REG_ESIZE;                         \
-    bufp->allocated <<= 1;                      \
-    if (bufp->allocated > MAX_BUF_SIZE)                 \
-      bufp->allocated = MAX_BUF_SIZE;                   \
+#define EXTEND_BUFFER()							\
+  do { 									\
+    unsigned char *old_buffer = bufp->buffer;				\
+    if (bufp->allocated == MAX_BUF_SIZE) 				\
+      return REG_ESIZE;							\
+    bufp->allocated <<= 1;						\
+    if (bufp->allocated > MAX_BUF_SIZE)					\
+      bufp->allocated = MAX_BUF_SIZE; 					\
     bufp->buffer = (unsigned char *) REALLOC (bufp->buffer, bufp->allocated);\
-    if (bufp->buffer == NULL)                       \
-      return REG_ESPACE;                        \
-    /* If the buffer moved, move all the pointers into it.  */      \
-    if (old_buffer != bufp->buffer)                 \
-      {                                 \
-        b = (b - old_buffer) + bufp->buffer;                \
-        begalt = (begalt - old_buffer) + bufp->buffer;          \
-        if (fixup_alt_jump)                     \
+    if (bufp->buffer == NULL)						\
+      return REG_ESPACE;						\
+    /* If the buffer moved, move all the pointers into it.  */		\
+    if (old_buffer != bufp->buffer)					\
+      {									\
+        b = (b - old_buffer) + bufp->buffer;				\
+        begalt = (begalt - old_buffer) + bufp->buffer;			\
+        if (fixup_alt_jump)						\
           fixup_alt_jump = (fixup_alt_jump - old_buffer) + bufp->buffer;\
-        if (laststart)                          \
-          laststart = (laststart - old_buffer) + bufp->buffer;      \
-        if (pending_exact)                      \
-          pending_exact = (pending_exact - old_buffer) + bufp->buffer;  \
-      }                                 \
+        if (laststart)							\
+          laststart = (laststart - old_buffer) + bufp->buffer;		\
+        if (pending_exact)						\
+          pending_exact = (pending_exact - old_buffer) + bufp->buffer;	\
+      }									\
   } while (0)
 
 
@@ -1742,7 +1742,7 @@ typedef struct
 {
   compile_stack_elt_t *stack;
   unsigned size;
-  unsigned avail;           /* Offset of next open position.  */
+  unsigned avail;			/* Offset of next open position.  */
 } compile_stack_type;
 
 
@@ -1762,20 +1762,20 @@ typedef struct
 
 
 /* Get the next unsigned number in the uncompiled pattern.  */
-#define GET_UNSIGNED_NUMBER(num)                    \
-  { if (p != pend)                          \
-     {                                  \
-       PATFETCH (c);                            \
-       while (ISDIGIT (c))                      \
-         {                              \
-           if (num < 0)                         \
-              num = 0;                          \
-           num = num * 10 + c - '0';                    \
-           if (p == pend)                       \
-              break;                            \
-           PATFETCH (c);                        \
-         }                              \
-       }                                \
+#define GET_UNSIGNED_NUMBER(num) 					\
+  { if (p != pend)							\
+     {									\
+       PATFETCH (c); 							\
+       while (ISDIGIT (c)) 						\
+         { 								\
+           if (num < 0)							\
+              num = 0;							\
+           num = num * 10 + c - '0'; 					\
+           if (p == pend) 						\
+              break; 							\
+           PATFETCH (c);						\
+         } 								\
+       } 								\
     }
 
 #if defined _LIBC || WIDE_CHAR_SUPPORT
@@ -1797,12 +1797,12 @@ typedef struct
 #else
 # define CHAR_CLASS_MAX_LENGTH  6 /* Namely, `xdigit'.  */
 
-# define IS_CHAR_CLASS(string)                      \
-   (STREQ (string, "alpha") || STREQ (string, "upper")          \
-    || STREQ (string, "lower") || STREQ (string, "digit")       \
-    || STREQ (string, "alnum") || STREQ (string, "xdigit")      \
-    || STREQ (string, "space") || STREQ (string, "print")       \
-    || STREQ (string, "punct") || STREQ (string, "graph")       \
+# define IS_CHAR_CLASS(string)						\
+   (STREQ (string, "alpha") || STREQ (string, "upper")			\
+    || STREQ (string, "lower") || STREQ (string, "digit")		\
+    || STREQ (string, "alnum") || STREQ (string, "xdigit")		\
+    || STREQ (string, "space") || STREQ (string, "print")		\
+    || STREQ (string, "punct") || STREQ (string, "graph")		\
     || STREQ (string, "cntrl") || STREQ (string, "blank"))
 #endif
 
@@ -1838,14 +1838,14 @@ regex_grow_registers (num_regs)
 {
   if (num_regs > regs_allocated_size)
     {
-      RETALLOC_IF (regstart,     num_regs, const char *);
-      RETALLOC_IF (regend,   num_regs, const char *);
+      RETALLOC_IF (regstart,	 num_regs, const char *);
+      RETALLOC_IF (regend,	 num_regs, const char *);
       RETALLOC_IF (old_regstart, num_regs, const char *);
-      RETALLOC_IF (old_regend,   num_regs, const char *);
+      RETALLOC_IF (old_regend,	 num_regs, const char *);
       RETALLOC_IF (best_regstart, num_regs, const char *);
-      RETALLOC_IF (best_regend,  num_regs, const char *);
-      RETALLOC_IF (reg_info,     num_regs, register_info_type);
-      RETALLOC_IF (reg_dummy,    num_regs, const char *);
+      RETALLOC_IF (best_regend,	 num_regs, const char *);
+      RETALLOC_IF (reg_info,	 num_regs, register_info_type);
+      RETALLOC_IF (reg_dummy,	 num_regs, const char *);
       RETALLOC_IF (reg_info_dummy, num_regs, register_info_type);
 
       regs_allocated_size = num_regs;
@@ -1877,7 +1877,7 @@ static boolean group_in_compile_stack _RE_ARGS ((compile_stack_type
    examined nor set.  */
 
 /* Return, freeing storage we allocated.  */
-#define FREE_STACK_RETURN(value)        \
+#define FREE_STACK_RETURN(value)		\
   return (free (compile_stack.stack), value)
 
 static reg_errcode_t
@@ -2365,7 +2365,7 @@ regex_compile (pattern, size, syntax, bufp)
                   SET_LIST_BIT (ch);
                           }
                         had_char_class = true;
-#endif  /* libc || wctype.h */
+#endif	/* libc || wctype.h */
                       }
                     else
                       {
@@ -2557,7 +2557,7 @@ regex_compile (pattern, size, syntax, bufp)
               break;
 
 
-            case '|':                   /* `\|'.  */
+            case '|':					/* `\|'.  */
               if (syntax & RE_LIMITED_OPS || syntax & RE_NO_BK_VBAR)
                 goto normal_backslash;
             handle_alt:
@@ -3224,7 +3224,7 @@ re_compile_fastmap (bufp)
 
   INIT_FAIL_STACK ();
   bzero (fastmap, 1 << BYTEWIDTH);  /* Assume nothing's valid.  */
-  bufp->fastmap_accurate = 1;       /* It will be when we're done.  */
+  bufp->fastmap_accurate = 1;	    /* It will be when we're done.  */
   bufp->can_be_null = 0;
 
   while (1)
@@ -3422,7 +3422,7 @@ re_compile_fastmap (bufp)
 
           if (succeed_n_p)
             {
-              EXTRACT_NUMBER_AND_INCR (k, p);   /* Skip the n.  */
+              EXTRACT_NUMBER_AND_INCR (k, p);	/* Skip the n.  */
               succeed_n_p = false;
         }
 
@@ -3627,7 +3627,7 @@ re_search_2 (bufp, string1, size1, string2, size2, startpos, range, regs, stop)
          the first null string.  */
       if (fastmap && startpos < total_size && !bufp->can_be_null)
     {
-      if (range > 0)    /* Searching forwards.  */
+      if (range > 0)	/* Searching forwards.  */
         {
           register const char *d;
           register int lim = 0;
@@ -3651,7 +3651,7 @@ re_search_2 (bufp, string1, size1, string2, size2, startpos, range, regs, stop)
 
           startpos += irange - range;
         }
-      else              /* Searching backwards.  */
+      else				/* Searching backwards.  */
         {
           register char c = (size1 == 0 || startpos >= size1
                                  ? string2[startpos - size1]
@@ -3703,9 +3703,9 @@ weak_alias (__re_search_2, re_search_2)
 
 /* This converts PTR, a pointer into one of the search strings `string1'
    and `string2' into an offset from the beginning of that string.  */
-#define POINTER_TO_OFFSET(ptr)          \
-  (FIRST_STRING_P (ptr)             \
-   ? ((regoff_t) ((ptr) - string1))     \
+#define POINTER_TO_OFFSET(ptr)			\
+  (FIRST_STRING_P (ptr)				\
+   ? ((regoff_t) ((ptr) - string1))		\
    : ((regoff_t) ((ptr) - string2 + size1)))
 
 /* Macros for dealing with the split strings in re_match_2.  */
@@ -3714,15 +3714,15 @@ weak_alias (__re_search_2, re_search_2)
 
 /* Call before fetching a character with *d.  This switches over to
    string2 if necessary.  */
-#define PREFETCH()                          \
-  while (d == dend)                             \
-    {                                   \
-      /* End of string2 => fail.  */                    \
-      if (dend == end_match_2)                      \
-        goto fail;                          \
-      /* End of string1 => advance to string2.  */          \
-      d = string2;                              \
-      dend = end_match_2;                       \
+#define PREFETCH()							\
+  while (d == dend)						    	\
+    {									\
+      /* End of string2 => fail.  */					\
+      if (dend == end_match_2) 						\
+        goto fail;							\
+      /* End of string1 => advance to string2.  */ 			\
+      d = string2;						        \
+      dend = end_match_2;						\
     }
 
 
@@ -3736,35 +3736,35 @@ weak_alias (__re_search_2, re_search_2)
    two special cases to check for: if past the end of string1, look at
    the first character in string2; and if before the beginning of
    string2, look at the last character in string1.  */
-#define WORDCHAR_P(d)                           \
-  (SYNTAX ((d) == end1 ? *string2                   \
-           : (d) == string2 - 1 ? *(end1 - 1) : *(d))           \
+#define WORDCHAR_P(d)							\
+  (SYNTAX ((d) == end1 ? *string2					\
+           : (d) == string2 - 1 ? *(end1 - 1) : *(d))			\
    == Sword)
 
 /* Disabled due to a compiler bug -- see comment at case wordbound */
 #if 0
 /* Test if the character before D and the one at D differ with respect
    to being word-constituent.  */
-#define AT_WORD_BOUNDARY(d)                     \
-  (AT_STRINGS_BEG (d) || AT_STRINGS_END (d)             \
+#define AT_WORD_BOUNDARY(d)						\
+  (AT_STRINGS_BEG (d) || AT_STRINGS_END (d)				\
    || WORDCHAR_P (d - 1) != WORDCHAR_P (d))
 #endif
 
 /* Free everything we malloc.  */
 #ifdef MATCH_MAY_ALLOCATE
 # define FREE_VAR(var) if (var) REGEX_FREE (var); var = NULL
-# define FREE_VARIABLES()                       \
-  do {                                  \
-    REGEX_FREE_STACK (fail_stack.stack);                \
-    FREE_VAR (regstart);                        \
-    FREE_VAR (regend);                          \
-    FREE_VAR (old_regstart);                        \
-    FREE_VAR (old_regend);                      \
-    FREE_VAR (best_regstart);                       \
-    FREE_VAR (best_regend);                     \
-    FREE_VAR (reg_info);                        \
-    FREE_VAR (reg_dummy);                       \
-    FREE_VAR (reg_info_dummy);                      \
+# define FREE_VARIABLES()						\
+  do {									\
+    REGEX_FREE_STACK (fail_stack.stack);				\
+    FREE_VAR (regstart);						\
+    FREE_VAR (regend);							\
+    FREE_VAR (old_regstart);						\
+    FREE_VAR (old_regend);						\
+    FREE_VAR (best_regstart);						\
+    FREE_VAR (best_regend);						\
+    FREE_VAR (reg_info);						\
+    FREE_VAR (reg_dummy);						\
+    FREE_VAR (reg_info_dummy);						\
   } while (0)
 #else
 # define FREE_VARIABLES() ((void)0) /* Do nothing!  But inhibit gcc warning. */
@@ -4364,7 +4364,7 @@ re_match_2_internal (bufp, string1, size1, string2, size2, pos, regs, stop)
       DEBUG_PRINT3 ("EXECUTING start_memory %d (%d):\n", *p, p[1]);
 
           /* Find out if this group can match the empty string.  */
-      p1 = p;       /* To send to group_match_null_string_p.  */
+      p1 = p;		/* To send to group_match_null_string_p.  */
 
           if (REG_MATCH_NULL_STRING_P (reg_info[*p]) == MATCH_NULL_UNSET_VALUE)
             REG_MATCH_NULL_STRING_P (reg_info[*p])
@@ -4880,7 +4880,7 @@ re_match_2_internal (bufp, string1, size1, string2, size2, pos, regs, stop)
           }
           }
       }
-      p -= 2;       /* Point at relative address again.  */
+      p -= 2;		/* Point at relative address again.  */
       if ((re_opcode_t) p[-1] != pop_failure_jump)
         {
           p[-1] = (unsigned char) jump;
@@ -4924,9 +4924,9 @@ re_match_2_internal (bufp, string1, size1, string2, size2, pos, regs, stop)
 
         /* Unconditionally jump (without popping any failure points).  */
         case jump:
-      EXTRACT_NUMBER_AND_INCR (mcnt, p);    /* Get the amount to jump.  */
+      EXTRACT_NUMBER_AND_INCR (mcnt, p);	/* Get the amount to jump.  */
           DEBUG_PRINT2 ("EXECUTING jump %d ", mcnt);
-      p += mcnt;                /* Do the jump.  */
+      p += mcnt;				/* Do the jump.  */
 #ifdef _LIBC
           DEBUG_PRINT2 ("(to %p).\n", p);
 #else
@@ -5231,7 +5231,7 @@ re_match_2_internal (bufp, string1, size1, string2, size2, pos, regs, stop)
 
   FREE_VARIABLES ();
 
-  return -1;                    /* Failure to match.  */
+  return -1;         			/* Failure to match.  */
 } /* re_match_2 */
 
 /* Subroutine definitions for re_match_2.  */
@@ -5331,7 +5331,7 @@ group_match_null_string_p (p, end, reg_info)
               if (!alt_match_null_string_p (p1, p1 + mcnt, reg_info))
                 return false;
 
-              p1 += mcnt;   /* Get past the n-th alternative.  */
+              p1 += mcnt;	/* Get past the n-th alternative.  */
             } /* if mcnt > 0 */
           break;
 
diff --git a/regexp/orig/regex.h b/regexp/orig/regex.h
index ecabcb030c93..37e3176bb6b0 100644
--- a/regexp/orig/regex.h
+++ b/regexp/orig/regex.h
@@ -172,33 +172,33 @@ extern reg_syntax_t re_syntax_options;
 /* [[[begin syntaxes]]] */
 #define RE_SYNTAX_EMACS 0
 
-#define RE_SYNTAX_AWK                           \
-  (RE_BACKSLASH_ESCAPE_IN_LISTS   | RE_DOT_NOT_NULL         \
-   | RE_NO_BK_PARENS              | RE_NO_BK_REFS           \
-   | RE_NO_BK_VBAR                | RE_NO_EMPTY_RANGES          \
-   | RE_DOT_NEWLINE       | RE_CONTEXT_INDEP_ANCHORS        \
+#define RE_SYNTAX_AWK							\
+  (RE_BACKSLASH_ESCAPE_IN_LISTS   | RE_DOT_NOT_NULL			\
+   | RE_NO_BK_PARENS              | RE_NO_BK_REFS			\
+   | RE_NO_BK_VBAR                | RE_NO_EMPTY_RANGES			\
+   | RE_DOT_NEWLINE		  | RE_CONTEXT_INDEP_ANCHORS		\
    | RE_UNMATCHED_RIGHT_PAREN_ORD | RE_NO_GNU_OPS)
 
-#define RE_SYNTAX_GNU_AWK                       \
-  ((RE_SYNTAX_POSIX_EXTENDED | RE_BACKSLASH_ESCAPE_IN_LISTS | RE_DEBUG) \
+#define RE_SYNTAX_GNU_AWK						\
+  ((RE_SYNTAX_POSIX_EXTENDED | RE_BACKSLASH_ESCAPE_IN_LISTS | RE_DEBUG)	\
    & ~(RE_DOT_NOT_NULL | RE_INTERVALS | RE_CONTEXT_INDEP_OPS))
 
-#define RE_SYNTAX_POSIX_AWK                         \
-  (RE_SYNTAX_POSIX_EXTENDED | RE_BACKSLASH_ESCAPE_IN_LISTS      \
-   | RE_INTERVALS       | RE_NO_GNU_OPS)
+#define RE_SYNTAX_POSIX_AWK 						\
+  (RE_SYNTAX_POSIX_EXTENDED | RE_BACKSLASH_ESCAPE_IN_LISTS		\
+   | RE_INTERVALS	    | RE_NO_GNU_OPS)
 
-#define RE_SYNTAX_GREP                          \
-  (RE_BK_PLUS_QM              | RE_CHAR_CLASSES             \
-   | RE_HAT_LISTS_NOT_NEWLINE | RE_INTERVALS                \
+#define RE_SYNTAX_GREP							\
+  (RE_BK_PLUS_QM              | RE_CHAR_CLASSES				\
+   | RE_HAT_LISTS_NOT_NEWLINE | RE_INTERVALS				\
    | RE_NEWLINE_ALT)
 
-#define RE_SYNTAX_EGREP                         \
-  (RE_CHAR_CLASSES        | RE_CONTEXT_INDEP_ANCHORS            \
-   | RE_CONTEXT_INDEP_OPS | RE_HAT_LISTS_NOT_NEWLINE            \
-   | RE_NEWLINE_ALT       | RE_NO_BK_PARENS             \
+#define RE_SYNTAX_EGREP							\
+  (RE_CHAR_CLASSES        | RE_CONTEXT_INDEP_ANCHORS			\
+   | RE_CONTEXT_INDEP_OPS | RE_HAT_LISTS_NOT_NEWLINE			\
+   | RE_NEWLINE_ALT       | RE_NO_BK_PARENS				\
    | RE_NO_BK_VBAR)
 
-#define RE_SYNTAX_POSIX_EGREP                       \
+#define RE_SYNTAX_POSIX_EGREP						\
   (RE_SYNTAX_EGREP | RE_INTERVALS | RE_NO_BK_BRACES)
 
 /* P1003.2/D11.2, section 4.20.7.1, lines 5078ff.  */
@@ -207,32 +207,32 @@ extern reg_syntax_t re_syntax_options;
 #define RE_SYNTAX_SED RE_SYNTAX_POSIX_BASIC
 
 /* Syntax bits common to both basic and extended POSIX regex syntax.  */
-#define _RE_SYNTAX_POSIX_COMMON                     \
-  (RE_CHAR_CLASSES | RE_DOT_NEWLINE      | RE_DOT_NOT_NULL      \
+#define _RE_SYNTAX_POSIX_COMMON						\
+  (RE_CHAR_CLASSES | RE_DOT_NEWLINE      | RE_DOT_NOT_NULL		\
    | RE_INTERVALS  | RE_NO_EMPTY_RANGES)
 
-#define RE_SYNTAX_POSIX_BASIC                       \
+#define RE_SYNTAX_POSIX_BASIC						\
   (_RE_SYNTAX_POSIX_COMMON | RE_BK_PLUS_QM)
 
 /* Differs from ..._POSIX_BASIC only in that RE_BK_PLUS_QM becomes
    RE_LIMITED_OPS, i.e., \? \+ \| are not recognized.  Actually, this
    isn't minimal, since other operators, such as \`, aren't disabled.  */
-#define RE_SYNTAX_POSIX_MINIMAL_BASIC                   \
+#define RE_SYNTAX_POSIX_MINIMAL_BASIC					\
   (_RE_SYNTAX_POSIX_COMMON | RE_LIMITED_OPS)
 
-#define RE_SYNTAX_POSIX_EXTENDED                    \
-  (_RE_SYNTAX_POSIX_COMMON | RE_CONTEXT_INDEP_ANCHORS           \
-   | RE_CONTEXT_INDEP_OPS  | RE_NO_BK_BRACES                \
-   | RE_NO_BK_PARENS       | RE_NO_BK_VBAR              \
+#define RE_SYNTAX_POSIX_EXTENDED					\
+  (_RE_SYNTAX_POSIX_COMMON | RE_CONTEXT_INDEP_ANCHORS			\
+   | RE_CONTEXT_INDEP_OPS  | RE_NO_BK_BRACES				\
+   | RE_NO_BK_PARENS       | RE_NO_BK_VBAR				\
    | RE_UNMATCHED_RIGHT_PAREN_ORD)
 
 /* Differs from ..._POSIX_EXTENDED in that RE_CONTEXT_INVALID_OPS
    replaces RE_CONTEXT_INDEP_OPS and RE_NO_BK_REFS is added.  */
-#define RE_SYNTAX_POSIX_MINIMAL_EXTENDED                \
-  (_RE_SYNTAX_POSIX_COMMON  | RE_CONTEXT_INDEP_ANCHORS          \
-   | RE_CONTEXT_INVALID_OPS | RE_NO_BK_BRACES               \
-   | RE_NO_BK_PARENS        | RE_NO_BK_REFS             \
-   | RE_NO_BK_VBAR      | RE_UNMATCHED_RIGHT_PAREN_ORD)
+#define RE_SYNTAX_POSIX_MINIMAL_EXTENDED				\
+  (_RE_SYNTAX_POSIX_COMMON  | RE_CONTEXT_INDEP_ANCHORS			\
+   | RE_CONTEXT_INVALID_OPS | RE_NO_BK_BRACES				\
+   | RE_NO_BK_PARENS        | RE_NO_BK_REFS				\
+   | RE_NO_BK_VBAR	    | RE_UNMATCHED_RIGHT_PAREN_ORD)
 /* [[[end syntaxes]]] */
 
 /* Maximum number of duplicates an interval can allow.  Some systems
@@ -283,31 +283,31 @@ extern reg_syntax_t re_syntax_options;
 typedef enum
 {
 #ifdef _XOPEN_SOURCE
-  REG_ENOSYS = -1,  /* This will never happen for this implementation.  */
+  REG_ENOSYS = -1,	/* This will never happen for this implementation.  */
 #endif
 
-  REG_NOERROR = 0,  /* Success.  */
-  REG_NOMATCH,      /* Didn't find a match (for regexec).  */
+  REG_NOERROR = 0,	/* Success.  */
+  REG_NOMATCH,		/* Didn't find a match (for regexec).  */
 
   /* POSIX regcomp return error codes.  (In the order listed in the
      standard.)  */
-  REG_BADPAT,       /* Invalid pattern.  */
-  REG_ECOLLATE,     /* Not implemented.  */
-  REG_ECTYPE,       /* Invalid character class name.  */
-  REG_EESCAPE,      /* Trailing backslash.  */
-  REG_ESUBREG,      /* Invalid back reference.  */
-  REG_EBRACK,       /* Unmatched left bracket.  */
-  REG_EPAREN,       /* Parenthesis imbalance.  */
-  REG_EBRACE,       /* Unmatched \{.  */
-  REG_BADBR,        /* Invalid contents of \{\}.  */
-  REG_ERANGE,       /* Invalid range end.  */
-  REG_ESPACE,       /* Ran out of memory.  */
-  REG_BADRPT,       /* No preceding re for repetition op.  */
+  REG_BADPAT,		/* Invalid pattern.  */
+  REG_ECOLLATE,		/* Not implemented.  */
+  REG_ECTYPE,		/* Invalid character class name.  */
+  REG_EESCAPE,		/* Trailing backslash.  */
+  REG_ESUBREG,		/* Invalid back reference.  */
+  REG_EBRACK,		/* Unmatched left bracket.  */
+  REG_EPAREN,		/* Parenthesis imbalance.  */
+  REG_EBRACE,		/* Unmatched \{.  */
+  REG_BADBR,		/* Invalid contents of \{\}.  */
+  REG_ERANGE,		/* Invalid range end.  */
+  REG_ESPACE,		/* Ran out of memory.  */
+  REG_BADRPT,		/* No preceding re for repetition op.  */
 
   /* Error codes we've added.  */
-  REG_EEND,     /* Premature end.  */
-  REG_ESIZE,        /* Compiled pattern bigger than 2^16 bytes.  */
-  REG_ERPAREN       /* Unmatched ) or \); not returned from regcomp.  */
+  REG_EEND,		/* Premature end.  */
+  REG_ESIZE,		/* Compiled pattern bigger than 2^16 bytes.  */
+  REG_ERPAREN		/* Unmatched ) or \); not returned from regcomp.  */
 } reg_errcode_t;
 
 /* This data structure represents a compiled pattern.  Before calling
@@ -529,7 +529,7 @@ extern void regfree _RE_ARGS ((regex_t *__preg));
 
 #ifdef __cplusplus
 }
-#endif  /* C++ */
+#endif	/* C++ */
 
 #endif /* regex.h */
 
diff --git a/regexp/source/reclass.cxx b/regexp/source/reclass.cxx
index b376c2d05881..5d99073e6129 100644
--- a/regexp/source/reclass.cxx
+++ b/regexp/source/reclass.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
@@ -96,11 +96,11 @@
 
 
 // Macros
-#define INIT_COMPILE_STACK_SIZE     32
-#define INIT_BUF_SIZE           ((1 << BYTEWIDTH)/BYTEWIDTH)
-#define MAX_BUF_SIZE            65535L
-#define NO_HIGHEST_ACTIVE_REG       (1 << BYTEWIDTH)
-#define NO_LOWEST_ACTIVE_REG        (NO_HIGHEST_ACTIVE_REG + 1)
+#define INIT_COMPILE_STACK_SIZE		32
+#define INIT_BUF_SIZE			((1 << BYTEWIDTH)/BYTEWIDTH)
+#define MAX_BUF_SIZE			65535L
+#define NO_HIGHEST_ACTIVE_REG		(1 << BYTEWIDTH)
+#define NO_LOWEST_ACTIVE_REG		(NO_HIGHEST_ACTIVE_REG + 1)
 
 /* Since we have one byte reserved for the register number argument to
    {start,stop}_memory, the maximum number of groups we can report
@@ -146,8 +146,8 @@
 # define REGEX_ALLOCATE alloca
 
 /* Assumes a `char *destination' variable.  */
-# define REGEX_REALLOCATE(source, osize, nsize)             \
-  (destination = (char *) alloca (nsize),               \
+# define REGEX_REALLOCATE(source, osize, nsize)				\
+  (destination = (char *) alloca (nsize),				\
    memcpy (destination, source, osize))
 
 /* No need to do anything to free, after alloca.  */
@@ -168,7 +168,7 @@
 
 # define REGEX_ALLOCATE_STACK alloca
 
-# define REGEX_REALLOCATE_STACK(source, osize, nsize)           \
+# define REGEX_REALLOCATE_STACK(source, osize, nsize)			\
    REGEX_REALLOCATE (source, osize, nsize)
 /* No need to explicitly free anything.  */
 # define REGEX_FREE_STACK(arg)
@@ -183,7 +183,7 @@
   if (addr) RETALLOC((addr), (n), t); else (addr) = TALLOC ((n), t)
 #define REGEX_TALLOC(n, t) ((t *) REGEX_ALLOCATE ((n) * sizeof (t)))
 
-#define BYTEWIDTH 16    /* In bits (assuming sizeof(sal_Unicode)*8) */
+#define BYTEWIDTH 16	/* In bits (assuming sizeof(sal_Unicode)*8) */
 
 
 #define CHAR_CLASS_MAX_LENGTH 256
@@ -191,7 +191,7 @@
 /* Fetch the next character in the uncompiled pattern, with no
    translation.  */
 #define PATFETCH_RAW(c)                                                 \
-    do {                                \
+    do {								\
         if (p == pend) return REG_EEND;                         \
         c = (sal_Unicode) *p++;                                 \
     } while (0)
@@ -199,11 +199,11 @@
 /* Go backwards one character in the pattern.  */
 #define PATUNFETCH p--
 
-#define FREE_STACK_RETURN(value)                    \
+#define FREE_STACK_RETURN(value)					\
     return(free(compile_stack.stack), value)
 
-#define GET_BUFFER_SPACE(n)                     \
-    while ((sal_uInt32)(b - bufp->buffer + (n)) > bufp->allocated)  \
+#define GET_BUFFER_SPACE(n)						\
+    while ((sal_uInt32)(b - bufp->buffer + (n)) > bufp->allocated)	\
         EXTEND_BUFFER()
 
 /* Extend the buffer by twice its current size via realloc and
@@ -218,9 +218,9 @@
     bufp->allocated <<= 1;                                              \
     if (bufp->allocated > MAX_BUF_SIZE)                                 \
       bufp->allocated = MAX_BUF_SIZE;                                   \
-    bufp->buffer = (sal_Unicode *) realloc(bufp->buffer,        \
-                       bufp->allocated *        \
-                       sizeof(sal_Unicode));    \
+    bufp->buffer = (sal_Unicode *) realloc(bufp->buffer,		\
+                       bufp->allocated * 		\
+                       sizeof(sal_Unicode));	\
     if (bufp->buffer == NULL)                                           \
       return REG_ESPACE;                                                \
     /* If the buffer moved, move all the pointers into it.  */          \
@@ -236,16 +236,16 @@
       }                                                                 \
   } while (0)
 
-#define BUF_PUSH(c)                         \
-    do {                                \
-        GET_BUFFER_SPACE(1);                    \
-        *b++ = (sal_Unicode)(c);                \
+#define BUF_PUSH(c)							\
+    do {								\
+        GET_BUFFER_SPACE(1);					\
+        *b++ = (sal_Unicode)(c);				\
     } while(0)
 
 /* Ensure we have two more bytes of buffer space and then append C1 and C2.  */
 #define BUF_PUSH_2(c1, c2)                                              \
   do {                                                                  \
-    GET_BUFFER_SPACE(2);                        \
+    GET_BUFFER_SPACE(2);						\
     *b++ = (sal_Unicode) (c1);                                          \
     *b++ = (sal_Unicode) (c2);                                          \
   } while (0)
@@ -253,7 +253,7 @@
 /* As with BUF_PUSH_2, except for three bytes.  */
 #define BUF_PUSH_3(c1, c2, c3)                                          \
   do {                                                                  \
-    GET_BUFFER_SPACE(3);                        \
+    GET_BUFFER_SPACE(3);						\
     *b++ = (sal_Unicode) (c1);                                          \
     *b++ = (sal_Unicode) (c2);                                          \
     *b++ = (sal_Unicode) (c3);                                          \
@@ -261,11 +261,11 @@
 
 /* Store a jump with opcode OP at LOC to location TO.  We store a
    relative address offset by the three bytes the jump itself occupies.  */
-#define STORE_JUMP(op, loc, to)                     \
+#define STORE_JUMP(op, loc, to)						\
     store_op1(op, loc, (int) ((to) - (loc) - 3))
 
 /* Likewise, for a two-argument jump.  */
-#define STORE_JUMP2(op, loc, to, arg)                   \
+#define STORE_JUMP2(op, loc, to, arg)					\
     store_op2(op, loc, (int) ((to) - (loc) - 3), arg)
 
 /* Store NUMBER in two contiguous sal_Unicode starting at DESTINATION.  */
@@ -277,7 +277,7 @@ Regexpr::store_number( sal_Unicode * destination, sal_Int32 number )
   (destination)[0] = sal_Unicode((number) & 0xffff);
   (destination)[1] = sal_Unicode((number) >> 16);
 }
-
+    
 /* Same as STORE_NUMBER, except increment DESTINATION to
    the byte after where the number is stored.  Therefore, DESTINATION
    must be an lvalue.  */
@@ -299,11 +299,11 @@ inline void Regexpr::extract_number( sal_Int32 & dest, sal_Unicode *source )
 }
 
 /* Like `STORE_JUMP', but for inserting.  Assume `b' is the buffer end.  */
-#define INSERT_JUMP(op, loc, to)                    \
+#define INSERT_JUMP(op, loc, to)					\
     insert_op1(op, loc, (sal_Int32) ((to) - (loc) - 3), b)
 
 /* Like `STORE_JUMP2', but for inserting.  Assume `b' is the buffer end.  */
-#define INSERT_JUMP2(op, loc, to, arg)                  \
+#define INSERT_JUMP2(op, loc, to, arg)					\
     insert_op2(op, loc, (sal_Int32) ((to) - (loc) - 3), arg, b)
 
 #define STREQ(s1, s2) (rtl_ustr_compare((s1), (s2)) ? (0) : (1))
@@ -317,45 +317,45 @@ inline void Regexpr::extract_number( sal_Int32 & dest, sal_Unicode *source )
 /* Get the next unsigned number in the uncompiled pattern.  */
 #define GET_UNSIGNED_NUMBER(num) {                                      \
     if (p != pend) {                                                \
-        PATFETCH_RAW(c);                    \
-        while (c >= (sal_Unicode)'0' && c <= (sal_Unicode)'9') {    \
+        PATFETCH_RAW(c);					\
+        while (c >= (sal_Unicode)'0' && c <= (sal_Unicode)'9') {	\
             if (num < 0)                                    \
                 num = 0;                                \
-            num = num * 10 + c - (sal_Unicode)'0';      \
-            if (p == pend)                  \
-                break;                  \
-            PATFETCH_RAW(c);                \
+            num = num * 10 + c - (sal_Unicode)'0';		\
+            if (p == pend)					\
+                break;					\
+            PATFETCH_RAW(c);				\
         }                                                       \
     }                                                               \
 }
 
 /* Get the next hex number in the uncompiled pattern.  */
-#define GET_HEX_NUMBER(num) {                                       \
+#define GET_HEX_NUMBER(num) {                                      	\
     if (p != pend) {                                                \
-        sal_Bool stop = false;                  \
-        sal_Int16 hexcnt = 1;                   \
-        PATFETCH_RAW(c);                    \
-        while ( (c >= (sal_Unicode)'0' && c <= (sal_Unicode)'9') || (c >= (sal_Unicode)'a' && c <= (sal_Unicode)'f') || (c >= (sal_Unicode)'A' && c <= (sal_Unicode)'F') ) {    \
+        sal_Bool stop = false;					\
+        sal_Int16 hexcnt = 1;					\
+        PATFETCH_RAW(c);					\
+        while ( (c >= (sal_Unicode)'0' && c <= (sal_Unicode)'9') || (c >= (sal_Unicode)'a' && c <= (sal_Unicode)'f') || (c >= (sal_Unicode)'A' && c <= (sal_Unicode)'F') ) {	\
             if (num < 0)                                    \
                 num = 0;                                \
             if ( c >= (sal_Unicode)'0' && c <= (sal_Unicode)'9' ) \
-                num = num * 16 + c - (sal_Unicode)'0';      \
+                num = num * 16 + c - (sal_Unicode)'0';		\
             else if ( c >= (sal_Unicode)'a' && c <= (sal_Unicode)'f' ) \
-                num = num * 16 + (10 + c - (sal_Unicode)'a');       \
-            else                        \
-                num = num * 16 + (10 + c - (sal_Unicode)'A');       \
-            if (p == pend || hexcnt == 4) {         \
-                stop = true;                \
-                break;                  \
-            }                       \
-            PATFETCH_RAW(c);                \
-            hexcnt++;                   \
+                num = num * 16 + (10 + c - (sal_Unicode)'a');		\
+            else						\
+                num = num * 16 + (10 + c - (sal_Unicode)'A');		\
+            if (p == pend || hexcnt == 4) {			\
+                stop = true;				\
+                break;					\
+            }						\
+            PATFETCH_RAW(c);				\
+            hexcnt++;					\
         }                                                       \
                                     \
-        if ( ! stop ) {                     \
-            PATUNFETCH;                 \
-            hexcnt--;                   \
-        }                           \
+        if ( ! stop ) {						\
+            PATUNFETCH;					\
+            hexcnt--;					\
+        }							\
         if ( hexcnt > 4 || (num < 0 || num > 0xffff) ) num = -1;\
     }                                                               \
 }
@@ -368,16 +368,16 @@ inline void Regexpr::extract_number( sal_Int32 & dest, sal_Unicode *source )
 # define INIT_FAILURE_ALLOC 5
 #endif
 
-#define INIT_FAIL_STACK()                       \
-  do {                                  \
-    fail_stack.stack = (fail_stack_elt_t *)             \
+#define INIT_FAIL_STACK()						\
+  do {									\
+    fail_stack.stack = (fail_stack_elt_t *)				\
       REGEX_ALLOCATE_STACK (INIT_FAILURE_ALLOC * sizeof (fail_stack_elt_t)); \
                                     \
-    if (fail_stack.stack == NULL)                   \
-      return -2;                            \
+    if (fail_stack.stack == NULL)					\
+      return -2;							\
                                     \
-    fail_stack.size = INIT_FAILURE_ALLOC;               \
-    fail_stack.avail = 0;                       \
+    fail_stack.size = INIT_FAILURE_ALLOC;				\
+    fail_stack.avail = 0;						\
   } while (0)
 
 #define RESET_FAIL_STACK()  REGEX_FREE_STACK (fail_stack.stack)
@@ -389,17 +389,17 @@ inline void Regexpr::extract_number( sal_Int32 & dest, sal_Unicode *source )
 
    REGEX_REALLOCATE_STACK requires `destination' be declared.   */
 
-#define DOUBLE_FAIL_STACK(fail_stack)                   \
-  ((fail_stack).size > (sal_uInt32) (re_max_failures * MAX_FAILURE_ITEMS)   \
-   ? 0                                  \
-   : ((fail_stack).stack = (fail_stack_elt_t *)             \
-        REGEX_REALLOCATE_STACK ((fail_stack).stack,             \
-          (fail_stack).size * sizeof (fail_stack_elt_t),        \
-          ((fail_stack).size << 1) * sizeof (fail_stack_elt_t)),    \
+#define DOUBLE_FAIL_STACK(fail_stack)					\
+  ((fail_stack).size > (sal_uInt32) (re_max_failures * MAX_FAILURE_ITEMS)	\
+   ? 0									\
+   : ((fail_stack).stack = (fail_stack_elt_t *)				\
+        REGEX_REALLOCATE_STACK ((fail_stack).stack, 			\
+          (fail_stack).size * sizeof (fail_stack_elt_t),		\
+          ((fail_stack).size << 1) * sizeof (fail_stack_elt_t)),	\
                                     \
-      (fail_stack).stack == NULL                    \
-      ? 0                               \
-      : ((fail_stack).size <<= 1,                   \
+      (fail_stack).stack == NULL					\
+      ? 0								\
+      : ((fail_stack).size <<= 1, 					\
          1)))
 
 
@@ -415,13 +415,13 @@ inline void Regexpr::extract_number( sal_Int32 & dest, sal_Unicode *source )
    for the subexpressions which we are currently inside.  Also records
    that those subexprs have matched.  */
 #define SET_REGS_MATCHED()                                              \
-  do {                                  \
-      if (!set_regs_matched_done) {                 \
-          sal_uInt32 r;                         \
+  do {									\
+      if (!set_regs_matched_done) {					\
+          sal_uInt32 r;							\
           set_regs_matched_done = 1;                                    \
-          for (r = lowest_active_reg; r <= highest_active_reg; r++) {   \
-              MATCHED_SOMETHING(reg_info[r])                \
-                = EVER_MATCHED_SOMETHING(reg_info[r])           \
+          for (r = lowest_active_reg; r <= highest_active_reg; r++) {	\
+              MATCHED_SOMETHING(reg_info[r])				\
+                = EVER_MATCHED_SOMETHING(reg_info[r])			\
                 = 1;                                                    \
             }                                                           \
         }                                                               \
@@ -526,7 +526,7 @@ Regexpr::iswordend(const sal_Unicode *d, sal_Unicode *string, sal_Int32 ssize)
 
 #define PUSH_FAILURE_POINT(pattern_place, string_place, failure_code)   \
   do {                                                                  \
-    char *destination;                          \
+    char *destination;							\
     /* Must be int, so when we don't save any registers, the arithmetic \
        of 0 + -1 isn't done as unsigned.  */                            \
     /* Can't be int, since there is not a shred of a guarantee that int \
@@ -702,10 +702,10 @@ Regexpr::at_endline_loc_p(const sal_Unicode *p, const sal_Unicode * /* pend */ )
   return(
      /* Before a subexpression?  */
      *next == (sal_Unicode)')'
-     // (next_backslash && next_next && *next_next == (sal_Unicode)')')
+     //	(next_backslash && next_next && *next_next == (sal_Unicode)')')
      /* Before an alternative?  */
      || *next == (sal_Unicode)'|' );
-  //    || (next_backslash && next_next && *next_next == (sal_Unicode)'|'));
+  //	|| (next_backslash && next_next && *next_next == (sal_Unicode)'|'));
 }
 
 reg_errcode_t
@@ -795,7 +795,7 @@ Regexpr::Regexpr( const ::com::sun::star::util::SearchOptions & rOptions,
 
 Regexpr::~Regexpr()
 {
-  //    translit->remove();
+  //	translit->remove();
   if( bufp )
     {
       if( bufp->buffer )
@@ -864,10 +864,10 @@ Regexpr::re_search(struct re_registers *regs, sal_Int32 pOffset)
     }
 
     // If search match from startpos to startpos+range
-    else if (range > 0) {   // Forward string search
+    else if (range > 0) {	// Forward string search
       range--;
       startpos++;
-    } else {        // Reverse string search
+    } else {		// Reverse string search
       range++;
       startpos--;
     }
@@ -1424,7 +1424,7 @@ Regexpr::regex_compile()
     break;
 
 
-      case (sal_Unicode)'|':            /* `\|'.
+      case (sal_Unicode)'|':			/* `\|'.
                          * */
     goto normal_backslash;
       handle_alt:
@@ -1628,7 +1628,7 @@ Regexpr::regex_compile()
       case (sal_Unicode)'?':
     goto normal_backslash;
 
-      case (sal_Unicode)'x':        // Unicode char
+      case (sal_Unicode)'x':		// Unicode char
     {
       sal_Int32 UniChar = -1;
 
@@ -1639,11 +1639,11 @@ Regexpr::regex_compile()
     }
     // break;   // unreachable - see goto above
 
-      case (sal_Unicode)'<':        // begin Word boundary
+      case (sal_Unicode)'<':		// begin Word boundary
     BUF_PUSH(wordbeg);
     break;
 
-      case (sal_Unicode)'>':        // end Word boundary
+      case (sal_Unicode)'>': 		// end Word boundary
     BUF_PUSH(wordend);
     break;
 
@@ -1962,18 +1962,18 @@ Regexpr::common_op_match_null_string_p(sal_Unicode **p, sal_Unicode *end, regist
 /* Free everything we malloc.  */
 #ifdef MATCH_MAY_ALLOCATE
 # define FREE_VAR(var) if (var) REGEX_FREE (var); var = NULL
-# define FREE_VARIABLES()                       \
-  do {                                  \
-    REGEX_FREE_STACK (fail_stack.stack);                \
-    FREE_VAR (regstart);                        \
-    FREE_VAR (regend);                          \
-    FREE_VAR (old_regstart);                        \
-    FREE_VAR (old_regend);                      \
-    FREE_VAR (best_regstart);                       \
-    FREE_VAR (best_regend);                     \
-    FREE_VAR (reg_info);                        \
-    FREE_VAR (reg_dummy);                       \
-    FREE_VAR (reg_info_dummy);                      \
+# define FREE_VARIABLES()						\
+  do {									\
+    REGEX_FREE_STACK (fail_stack.stack);				\
+    FREE_VAR (regstart);						\
+    FREE_VAR (regend);							\
+    FREE_VAR (old_regstart);						\
+    FREE_VAR (old_regend);						\
+    FREE_VAR (best_regstart);						\
+    FREE_VAR (best_regend);						\
+    FREE_VAR (reg_info);						\
+    FREE_VAR (reg_dummy);						\
+    FREE_VAR (reg_info_dummy);						\
   } while (0)
 #else
 # define FREE_VARIABLES() ((void)0) /* Do nothing!  But inhibit gcc warning. */
@@ -2206,7 +2206,7 @@ Regexpr::re_match2(struct re_registers *regs, sal_Int32 pos, sal_Int32 range)
           return(-2);
         }
       }
-    } else {    // num_regs is negative
+    } else {	// num_regs is negative
       FREE_VARIABLES ();
       return(-2);
     }
@@ -2318,7 +2318,7 @@ Regexpr::re_match2(struct re_registers *regs, sal_Int32 pos, sal_Int32 range)
     case start_memory:
 
       /* Find out if this group can match the empty string.  */
-      p1 = p;       /* To send to group_match_null_string_p.  */
+      p1 = p;		/* To send to group_match_null_string_p.  */
 
       if (REG_MATCH_NULL_STRING_P(reg_info[*p]) == MATCH_NULL_UNSET_VALUE)
     REG_MATCH_NULL_STRING_P(reg_info[*p]) = group_match_null_string_p(&p1, pend, reg_info);
@@ -2548,7 +2548,7 @@ Regexpr::re_match2(struct re_registers *regs, sal_Int32 pos, sal_Int32 range)
       /* endline is the dual of begline.  */
     case endline:
 
-      if (AT_STRINGS_END(d))    {
+      if (AT_STRINGS_END(d))	{
     if (!bufp->not_eol) break;
       } else if (*d == '\n' && bufp->newline_anchor) {
     break;
@@ -2745,7 +2745,7 @@ Regexpr::re_match2(struct re_registers *regs, sal_Int32 pos, sal_Int32 range)
       }
     }
       }
-      p -= 2;       /* Point at relative address again.  */
+      p -= 2;		/* Point at relative address again.  */
       if ((re_opcode_t) p[-1] != pop_failure_jump) {
     p[-1] = (sal_Unicode) jump;
     goto unconditional_jump;
@@ -2781,8 +2781,8 @@ Regexpr::re_match2(struct re_registers *regs, sal_Int32 pos, sal_Int32 range)
 
     /* Unconditionally jump (without popping any failure points).  */
     case jump:
-      extract_number_and_incr(mcnt, p); /* Get the amount to jump.  */
-      p += mcnt;                /* Do the jump.  */
+      extract_number_and_incr(mcnt, p);	/* Get the amount to jump.  */
+      p += mcnt;				/* Do the jump.  */
       break;
 
       /* We need this opcode so we can detect where alternatives end
@@ -2920,7 +2920,7 @@ Regexpr::re_match2(struct re_registers *regs, sal_Int32 pos, sal_Int32 range)
 
   FREE_VARIABLES ();
 
-  return(-1);                   /* Failure to match.  */
+  return(-1);         			/* Failure to match.  */
 } /* re_match2 */
 
 /* Set the bit for character C in a list.  */
diff --git a/regexp/source/reclass.hxx b/regexp/source/reclass.hxx
index e97c87019341..510429cb26db 100644
--- a/regexp/source/reclass.hxx
+++ b/regexp/source/reclass.hxx
@@ -311,12 +311,12 @@ typedef union
 
 class Regexpr
 {
-    ::com::sun::star::uno::Reference<
+    ::com::sun::star::uno::Reference< 
     ::com::sun::star::i18n::XExtendedTransliteration > translit;
 
     const sal_Unicode *line;                // line to search in
     sal_Int32   linelen;            // length of search string
-
+    
     sal_Unicode *pattern;           // RE pattern to match
     sal_Int32   patsize;            // Length of pattern
 
@@ -337,7 +337,7 @@ class Regexpr
     sal_uInt32 num_regs_pushed;
 
     sal_uInt32 re_max_failures;
-
+    
     /* Registers are set to a sentinel when they haven't yet matched.  */
     sal_Unicode reg_unset_dummy;
 
@@ -347,29 +347,29 @@ class Regexpr
     inline void extract_number(sal_Int32 & dest, sal_Unicode *source);
     inline void extract_number_and_incr(sal_Int32 & destination, sal_Unicode *& source);
 
-    sal_Bool group_match_null_string_p(sal_Unicode **p, sal_Unicode *end,
+    sal_Bool group_match_null_string_p(sal_Unicode **p, sal_Unicode *end, 
                        register_info_type *reg_info);
-    sal_Bool alt_match_null_string_p(sal_Unicode *p, sal_Unicode *end,
+    sal_Bool alt_match_null_string_p(sal_Unicode *p, sal_Unicode *end, 
                      register_info_type *reg_info);
 
-    sal_Bool common_op_match_null_string_p(sal_Unicode **p, sal_Unicode *end,
+    sal_Bool common_op_match_null_string_p(sal_Unicode **p, sal_Unicode *end, 
                        register_info_type *reg_info);
-    sal_Int32 bcmp_translate(const sal_Unicode *s1,
+    sal_Int32 bcmp_translate(const sal_Unicode *s1, 
                  const sal_Unicode *s2, sal_Int32 len);
 
     sal_Int32 regcomp(void);
     sal_Int32 regex_compile(void);
     inline void store_op1(re_opcode_t op, sal_Unicode *loc, sal_Int32 arg);
     inline void store_op2(re_opcode_t op, sal_Unicode *loc, sal_Int32 arg1, sal_Int32 arg2);
-    void insert_op1(re_opcode_t op, sal_Unicode *loc, sal_Int32 arg,
+    void insert_op1(re_opcode_t op, sal_Unicode *loc, sal_Int32 arg, 
             sal_Unicode *end);
-    void insert_op2(re_opcode_t op, sal_Unicode *loc, sal_Int32 arg1,
+    void insert_op2(re_opcode_t op, sal_Unicode *loc, sal_Int32 arg1, 
             sal_Int32 arg2, sal_Unicode *end);
     sal_Bool at_begline_loc_p(const sal_Unicode *local_pattern,
                   const sal_Unicode *p);
     sal_Bool at_endline_loc_p(const sal_Unicode *p, const sal_Unicode *pend);
     reg_errcode_t compile_range(sal_Unicode range_begin, sal_Unicode range_end, sal_Unicode *b);
-    sal_Bool group_in_compile_stack(compile_stack_type compile_stack,
+    sal_Bool group_in_compile_stack(compile_stack_type compile_stack, 
                     sal_uInt32 regnum);
     sal_Int32 re_match2(struct re_registers *regs, sal_Int32 pos, sal_Int32 range);
 
@@ -379,10 +379,10 @@ class Regexpr
 
 public:
     // constructors
-    Regexpr( const ::com::sun::star::util::SearchOptions & rOptions,
+    Regexpr( const ::com::sun::star::util::SearchOptions & rOptions, 
             ::com::sun::star::uno::Reference<
             ::com::sun::star::i18n::XExtendedTransliteration > XTrans );
-
+    
     // destructor
     ~Regexpr();
 
diff --git a/rsc/inc/pch/precompiled_rsc.cxx b/rsc/inc/pch/precompiled_rsc.cxx
index ca6005d3aed8..68b43d19d007 100644
--- a/rsc/inc/pch/precompiled_rsc.cxx
+++ b/rsc/inc/pch/precompiled_rsc.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
diff --git a/rsc/inc/pch/precompiled_rsc.hxx b/rsc/inc/pch/precompiled_rsc.hxx
index 829e1e736b93..845f364930bb 100644
--- a/rsc/inc/pch/precompiled_rsc.hxx
+++ b/rsc/inc/pch/precompiled_rsc.hxx
@@ -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
diff --git a/rsc/inc/rscall.h b/rsc/inc/rscall.h
index e556758054b8..a7bc88d34ce6 100644
--- a/rsc/inc/rscall.h
+++ b/rsc/inc/rscall.h
@@ -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
@@ -35,74 +35,74 @@
 #include <rtl/alloc.h>
 
 /******************* T y p e s *******************************************/
-typedef char * CLASS_DATA;  // Zeiger auf die Daten einer Klasse
+typedef char * CLASS_DATA;	// Zeiger auf die Daten einer Klasse
 
-/******************* C l a s s e s   F o r w a r d s *********************/
+/******************* C l a s s e s	 F o r w a r d s *********************/
 class RscCompiler;
 class RscTop;
 class RscTypCont;
 class RscIncList;
 
 /******************* G l o b a l   V a r i a b l e s *********************/
-extern ByteString*  pStdParType;
-extern ByteString*  pStdPar1;
-extern ByteString*  pStdPar2;
-extern ByteString*  pWinParType;
-extern ByteString*  pWinPar1;
-extern ByteString*  pWinPar2;
-extern sal_uInt32       nRefDeep;
-extern sal_uInt32       nRsc_XYMAPMODEId;
-extern sal_uInt32       nRsc_WHMAPMODEId;
-extern sal_uInt32       nRsc_X;
-extern sal_uInt32       nRsc_Y;
-extern sal_uInt32       nRsc_WIDTH;
-extern sal_uInt32       nRsc_HEIGHT;
-extern sal_uInt32       nRsc_DELTALANG;
-extern sal_uInt32       nRsc_DELTASYSTEM;
-extern sal_uInt32       nRsc_EXTRADATA;
+extern ByteString*	pStdParType;
+extern ByteString*	pStdPar1;
+extern ByteString*	pStdPar2;
+extern ByteString*	pWinParType;
+extern ByteString*	pWinPar1;
+extern ByteString*	pWinPar2;
+extern sal_uInt32		nRefDeep;
+extern sal_uInt32		nRsc_XYMAPMODEId;
+extern sal_uInt32		nRsc_WHMAPMODEId;
+extern sal_uInt32		nRsc_X;
+extern sal_uInt32		nRsc_Y;
+extern sal_uInt32		nRsc_WIDTH;
+extern sal_uInt32		nRsc_HEIGHT;
+extern sal_uInt32		nRsc_DELTALANG;
+extern sal_uInt32		nRsc_DELTASYSTEM;
+extern sal_uInt32		nRsc_EXTRADATA;
 extern AtomContainer*   pHS;
 
 /******************* D e f i n e s ***************************************/
 
-#define HELP_FLAG         0x0001  // Hilfe anzeigen
-#define NOPREPRO_FLAG     0x0002  // kein Preprozesor
-#define NOSYNTAX_FLAG     0x0004  // keine Syntaxanalyse
-#define NOLINK_FLAG       0x0008  // nicht linken
-#define NORESFILE_FLAG    0x0010  // keine .res-Datei erzeugen
-#define DEFINE_FLAG       0x0020  // es wurde Definitionen angegeben
-#define INCLUDE_FLAG      0x0040  // der Include-Pfad wurde erweitert
-#define MSCPREPRO_FLAG    0x0080  // spezial Preprozessor
+#define HELP_FLAG		  0x0001  // Hilfe anzeigen
+#define NOPREPRO_FLAG	  0x0002  // kein Preprozesor
+#define NOSYNTAX_FLAG	  0x0004  // keine Syntaxanalyse
+#define NOLINK_FLAG 	  0x0008  // nicht linken
+#define NORESFILE_FLAG	  0x0010  // keine .res-Datei erzeugen
+#define DEFINE_FLAG 	  0x0020  // es wurde Definitionen angegeben
+#define INCLUDE_FLAG	  0x0040  // der Include-Pfad wurde erweitert
+#define MSCPREPRO_FLAG	  0x0080  // spezial Preprozessor
 #define PRINTSYNTAX_FLAG  0x0100  // Syntax ausgeben
-#define PRELOAD_FLAG      0x0200  // Alle Ressourcen Preloaden
-#define SMART_FLAG        0x0400  // abgekuertze Name
+#define PRELOAD_FLAG	  0x0200  // Alle Ressourcen Preloaden
+#define SMART_FLAG		  0x0400  // abgekuertze Name
 #define SRSDEFAULT_FLAG   0x1000  // immer der Default geschrieben
 #define NOSYSRESTEST_FLAG 0x2000  // ueberprueft nicht die Richtigkeit von (bmp, ico, cur)
 
 
 /******************* T y p e s *******************************************/
-enum RSCCLASS_TYPE  { RSCCLASS_BOOL, RSCCLASS_STRING, RSCCLASS_NUMBER,
+enum RSCCLASS_TYPE	{ RSCCLASS_BOOL, RSCCLASS_STRING, RSCCLASS_NUMBER,
                         RSCCLASS_CONST, RSCCLASS_COMPLEX, RSCCLASS_ENUMARRAY };
 
 typedef void (* VarEnumCallbackProc)( void * pData, RSCCLASS_TYPE, Atom );
 
 /******************* S t r u c t s ***************************************/
 struct RSCINST {
-    RscTop *    pClass;
-    CLASS_DATA  pData;
+    RscTop *	pClass;
+    CLASS_DATA	pData;
 
                 RSCINST(){ pClass = NULL; pData = NULL; }
                 RSCINST( RscTop * pCl, CLASS_DATA pClassData ){
                     pClass = pCl;
                     pData = pClassData;
                 }
-    BOOL        IsInst() const { return( pData != NULL ); }
+    BOOL		IsInst() const { return( pData != NULL ); }
 };
 
 /********************** S U B I N F O S T R U C T ************************/
 struct SUBINFO_STRUCT {
     SUBINFO_STRUCT(){ nPos = 0; pClass = NULL; };
-    RscId        aId;    // Identifier der Resource
-    sal_uInt32   nPos;   // Position der Resource
+    RscId	     aId;	 // Identifier der Resource
+    sal_uInt32	 nPos;	 // Position der Resource
     RscTop *     pClass; // Klasse des Eintrages
 };
 
diff --git a/rsc/inc/rscarray.hxx b/rsc/inc/rscarray.hxx
index e47c11e03777..43c8f065c37e 100644
--- a/rsc/inc/rscarray.hxx
+++ b/rsc/inc/rscarray.hxx
@@ -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
@@ -36,17 +36,17 @@ class RscEnum;
 /******************* R s c A r r a y ************************************/
 class RscInstNode : public IdNode
 {
-    sal_uInt32  nTypeId;
+    sal_uInt32	nTypeId;
 protected:
     using NameNode::Search;
 public:
-    RSCINST aInst;
+    RSCINST	aInst;
     RscInstNode( sal_uInt32 nId );
     ~RscInstNode();
-    virtual sal_uInt32  GetId() const;
+    virtual sal_uInt32	GetId() const;
     RscInstNode *   Left() const { return (RscInstNode *)pLeft  ; };
     RscInstNode *   Right() const{ return (RscInstNode *)pRight ; };
-    RscInstNode *   Search( sal_uInt32 nId ) const
+    RscInstNode *	Search( sal_uInt32 nId ) const
                     {
                         return (RscInstNode *)IdNode::Search( nId );
                     }
@@ -54,7 +54,7 @@ public:
 
 struct RscArrayInst
 {
-    RscInstNode *   pNode;
+    RscInstNode *	pNode;
 };
 
 /* Der Baum wird ueber die Werte des Enums sortiert, nicht ueber
@@ -73,7 +73,7 @@ public:
                     RscArray( Atom nId, sal_uInt32 nTypId,
                                 RscTop * pSuper, RscEnum * pTypeClass );
                     ~RscArray();
-    virtual RSCCLASS_TYPE   GetClassType() const;
+    virtual RSCCLASS_TYPE	GetClassType() const;
 
     void            SetTypeClass( RscEnum * pClass )
                     {
@@ -93,7 +93,7 @@ public:
     sal_uInt32          Size(){ return( nSize ); };
 
     BOOL            IsConsistent( const RSCINST & rInst, RscInconsList * pList );
-    virtual void    SetToDefault( const RSCINST & rInst );
+    virtual void	SetToDefault( const RSCINST & rInst );
     BOOL            IsDefault( const RSCINST & rInst );
     BOOL            IsValueDefault( const RSCINST & rInst, CLASS_DATA pDef );
 
@@ -104,7 +104,7 @@ public:
                               RscTypCont * pTC, sal_uInt32 nTab, const char * );
     ERRTYPE         WriteRc( const RSCINST & rInst, RscWriteRc & aMem,
                              RscTypCont * pTC, sal_uInt32, BOOL bExtra );
-    virtual void    WriteRcAccess( FILE * fOutput, RscTypCont * pTC,
+    virtual void	WriteRcAccess( FILE * fOutput, RscTypCont * pTC,
                                     const char * );
 };
 
@@ -130,7 +130,7 @@ class RscLangArray : public RscArray
 public:
                     RscLangArray( Atom nId, sal_uInt32 nTypId,
                                 RscTop * pSuper, RscEnum * pTypeClass );
-    virtual RSCCLASS_TYPE   GetClassType() const;
+    virtual RSCCLASS_TYPE	GetClassType() const;
 };
 
 #endif //_RSCARRAY
diff --git a/rsc/inc/rscclass.hxx b/rsc/inc/rscclass.hxx
index 67cc59628fd0..ba0334fabee5 100644
--- a/rsc/inc/rscclass.hxx
+++ b/rsc/inc/rscclass.hxx
@@ -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
@@ -101,9 +101,9 @@ public:
                              RscTypCont * pTC, sal_uInt32, BOOL bExtra );
     void            WriteSyntax( FILE * fOutput, RscTypCont * pTC );
 
-    void            WriteRcAccess( FILE * fOutput, RscTypCont * pTC,
+    void			WriteRcAccess( FILE * fOutput, RscTypCont * pTC,
                                 const char * );
-    void            WriteRcCtor( FILE * fOutput, RscTypCont * pTC );
+    void			WriteRcCtor( FILE * fOutput, RscTypCont * pTC );
 };
 
 class RscSysDepend : public RscClass
diff --git a/rsc/inc/rscclobj.hxx b/rsc/inc/rscclobj.hxx
index 34bc38350399..724fb2c0da1f 100644
--- a/rsc/inc/rscclobj.hxx
+++ b/rsc/inc/rscclobj.hxx
@@ -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
@@ -57,7 +57,7 @@ protected:
 
 public:
     using NameNode::Insert;
-
+    
                 ObjNode( const RscId & rId, CLASS_DATA pData, ULONG lKey );
     ObjNode *   DelObjNode( RscTop * pClass, ULONG lFileKey );
     sal_uInt32      GetId() const;
diff --git a/rsc/inc/rscconst.hxx b/rsc/inc/rscconst.hxx
index 70612310fbab..773afd233a0a 100644
--- a/rsc/inc/rscconst.hxx
+++ b/rsc/inc/rscconst.hxx
@@ -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
@@ -46,15 +46,15 @@ public:
                     RscConst( Atom nId, sal_uInt32 nTypId );
                     ~RscConst();
     virtual RSCCLASS_TYPE   GetClassType() const;
-    sal_uInt32          GetEntryCount() const { return nEntries; }
+    sal_uInt32			GetEntryCount() const { return nEntries; }
                     // Die erlaubten Werte werden gesetzt
     ERRTYPE         SetConstant( Atom nVarName, INT32 lValue );
     Atom            GetConstant( sal_uInt32 nPos );
-    BOOL            GetConstValue( Atom nConstId, INT32 * pVal ) const;
-    BOOL            GetValueConst( INT32 nValue, Atom  * pConstId ) const;
+    BOOL			GetConstValue( Atom nConstId, INT32 * pVal ) const;
+    BOOL			GetValueConst( INT32 nValue, Atom  * pConstId ) const;
     sal_uInt32          GetConstPos( Atom nConstId );
-    virtual void    WriteSyntax( FILE * fOutput, RscTypCont * pTC );
-    virtual void    WriteRcAccess( FILE * fOutput, RscTypCont * pTC,
+    virtual void	WriteSyntax( FILE * fOutput, RscTypCont * pTC );
+    virtual void	WriteRcAccess( FILE * fOutput, RscTypCont * pTC,
                                     const char * );
 };
 
@@ -64,13 +64,13 @@ class RscEnum : public RscConst {
         sal_uInt32  nValue; // Position der Konstanten im Array
         BOOL    bDflt;  // Ist Default
     };
-    sal_uInt32          nSize;
+    sal_uInt32			nSize;
 public:
                     RscEnum( Atom nId, sal_uInt32 nTypId );
     RSCINST         Create( RSCINST * pInst, const RSCINST & rDfltInst, BOOL );
     sal_uInt32          Size(){ return nSize; }
 
-    virtual void    SetToDefault( const RSCINST & rInst )
+    virtual void	SetToDefault( const RSCINST & rInst )
                     {
                         ((RscEnumInst*)rInst.pData)->bDflt = TRUE;
                     }
@@ -103,7 +103,7 @@ public:
     RscLangEnum();
 
     void Init( RscNameTable& rNames );
-
+    
     Atom AddLanguage( const char* pLang, RscNameTable& rNames );
 };
 
diff --git a/rsc/inc/rsccont.hxx b/rsc/inc/rsccont.hxx
index 49d2600d91df..478d29955550 100644
--- a/rsc/inc/rsccont.hxx
+++ b/rsc/inc/rsccont.hxx
@@ -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
@@ -61,7 +61,7 @@ protected:
                                   RscTypCont * pTC, sal_uInt32 nTab, const char * );
     ERRTYPE         ContWriteRc( const RSCINST & rInst, RscWriteRc & aMem,
                                  RscTypCont * pTC, sal_uInt32, BOOL bExtra );
-    void            ContWriteRcAccess( FILE * fOutput, RscTypCont * pTC,
+    void			ContWriteRcAccess( FILE * fOutput, RscTypCont * pTC,
                                         const char *, BOOL nWriteSize );
 public:
                     RscBaseCont( Atom nId, sal_uInt32 nTypId,
@@ -90,8 +90,8 @@ public:
     SUBINFO_STRUCT  GetInfoEle( const RSCINST & rInst, sal_uInt32 nPos );
     ERRTYPE         SetString( const RSCINST &, const char * pStr );
     ERRTYPE         SetNumber( const RSCINST &, INT32 lValue );
-    ERRTYPE         SetBool( const RSCINST & rInst, BOOL bValue );
-    ERRTYPE         SetConst( const RSCINST & rInst, Atom nValueId,
+    ERRTYPE 		SetBool( const RSCINST & rInst, BOOL bValue );
+    ERRTYPE 		SetConst( const RSCINST & rInst, Atom nValueId,
                               INT32 nValue );
     ERRTYPE         SetRef( const RSCINST & rInst, const RscId & rRefId );
 
@@ -99,7 +99,7 @@ public:
     sal_uInt32          Size(){ return( nSize ); };
 
     BOOL            IsConsistent( const RSCINST & rInst, RscInconsList * pList );
-    void            SetToDefault( const RSCINST & rInst );
+    void			SetToDefault( const RSCINST & rInst );
     BOOL            IsDefault( const RSCINST & rInst );
     BOOL            IsValueDefault( const RSCINST & rInst, CLASS_DATA pDef );
 
@@ -136,7 +136,7 @@ public:
                              BOOL bNoId = TRUE );
     ERRTYPE         WriteRc( const RSCINST & rInst, RscWriteRc & aMem,
                              RscTypCont * pTC, sal_uInt32, BOOL bExtra );
-    void            WriteRcAccess( FILE * fOutput, RscTypCont * pTC,
+    void			WriteRcAccess( FILE * fOutput, RscTypCont * pTC,
                                     const char * );
 };
 
diff --git a/rsc/inc/rscdb.hxx b/rsc/inc/rscdb.hxx
index 1d5af35de9ff..3b6a235c892b 100644
--- a/rsc/inc/rscdb.hxx
+++ b/rsc/inc/rscdb.hxx
@@ -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
@@ -31,7 +31,7 @@
 #include <rscall.h>
 #include <rsckey.hxx>
 #include <rscconst.hxx>
-#include <rscflag.hxx>
+#include <rscflag.hxx> 
 #include <rscrange.hxx>
 #include <rscstr.hxx>
 #include <rscarray.hxx>
@@ -48,9 +48,9 @@ class RscCmdLine;
 
 struct WriteRcContext
 {
-    FILE *              fOutput;
-    rtl::OString        aOutputRc;
-    rtl::OString        aOutputSysList;
+    FILE *				fOutput;
+    rtl::OString		aOutputRc;
+    rtl::OString		aOutputSysList;
     RscCmdLine*         pCmdLine;
 };
 
@@ -61,299 +61,300 @@ DECLARE_LIST( RscBaseList, RscTop * )
 // Tabelle fuer Systemabhaengige Resourcen
 struct RscSysEntry
 {
-    sal_uInt32      nKey;
-    sal_uInt32      nRscTyp;
-    ByteString  aFileName;
-    sal_uInt32      nTyp;
-    sal_uInt32      nRefId;
+    sal_uInt32		nKey;
+    sal_uInt32		nRscTyp;
+    ByteString	aFileName;
+    sal_uInt32		nTyp;
+    sal_uInt32		nRefId;
 };
 DECLARE_LIST( RscSysList, RscSysEntry * )
 
 class RscTypCont
 {
-    CharSet             nSourceCharSet;
-    sal_uInt32              nMachineId;         // Globaler Maschinentyp
-    RSCBYTEORDER_TYPE   nByteOrder;         // Intel oder
-    ByteString          aLanguage;          // output language
-    std::vector< sal_uInt32 > aLangFallbacks;   // language fallback list (entry 0 is language itself)
-    ByteString          aSearchPath;        // Suchen der Bitmap, Icon, Pointer
-    ByteString          aSysSearchPath;     // aSearchPath plus language specific paths
-    sal_uInt32              nUniqueId;          // eindeutiger Id fuer Systemresourcen
-    ULONG               nFilePos;           // Position in der Datei ( MTF )
-    sal_uInt32              nPMId;              // eindeutiger Id fuer PM-Rseourcefile
+    CharSet 			nSourceCharSet;
+    sal_uInt32				nMachineId; 		// Globaler Maschinentyp
+    RSCBYTEORDER_TYPE	nByteOrder; 		// Intel oder
+    ByteString			aLanguage;			// output language
+    std::vector< sal_uInt32 > aLangFallbacks;	// language fallback list (entry 0 is language itself)
+    ByteString			aSearchPath;		// Suchen der Bitmap, Icon, Pointer
+    ByteString			aSysSearchPath;		// aSearchPath plus language specific paths
+    sal_uInt32				nUniqueId;			// eindeutiger Id fuer Systemresourcen
+    ULONG				nFilePos;			// Position in der Datei ( MTF )
+    sal_uInt32				nPMId;				// eindeutiger Id fuer PM-Rseourcefile
                                             // muss groesser als RSC_VERSIONCONTROL_ID sein
-    RscTop  *           pRoot;              // Zeiger auf die Wurzel vom Typenbaum
-    RSCINST             aVersion;           // Versionskontrollinstanz
+    RscTop	*			pRoot;				// Zeiger auf die Wurzel vom Typenbaum
+    RSCINST 			aVersion;			// Versionskontrollinstanz
 
-    RscBaseList         aBaseLst;           // Liste der einfachen Resourceklasse
-    RscSysList          aSysLst;            // Liste der Systemresourcen
+    RscBaseList 		aBaseLst;			// Liste der einfachen Resourceklasse
+    RscSysList			aSysLst;			// Liste der Systemresourcen
 
-    Atom                nWinBitVarId;       // Name der Winbitvariablen
-    Atom                nBorderId;
-    Atom                nHideId;
-    Atom                nClipChildrenId;
-    Atom                nSizeableId;
-    Atom                nMoveableId;
-    Atom                nMinimizeId;
-    Atom                nMaximizeId;
-    Atom                nCloseableId;
-    Atom                nAppId;
-    Atom                nTabstopId;
-    Atom                nGroupId;
-    Atom                nSysmodalId;
-    Atom                nLeftId;
-    Atom                nCenterId;
-    Atom                nRightId;
-    Atom                nTopId;
-    Atom                nVCenterId;
-    Atom                nBottomId;
-    Atom                nHScrollId;
-    Atom                nVScrollId;
-    Atom                nSortId;
-    Atom                nDefaultId;
-    Atom                nSVLookId;
-    Atom                nRepeatId;
-    Atom                nDropDownId;
-    Atom                nPassWordId;
-    Atom                nReadOnlyId;
-    Atom                nAutoSizeId;
-    Atom                nSpinId;
-    Atom                nTabControlId;
-    Atom                nSimpleModeId;
-    Atom                nDragId;
-    Atom                nScrollId;
-    Atom                nZoomableId;
-    Atom                nHideWhenDeactivateId;
-    Atom                nAutoHScrollId;
-    Atom                nAutoVScrollId;
-    Atom                nDDExtraWidthId;
-    Atom                nWordBreakId;
-    Atom                nLeftLabelId;
-    Atom                nHasLinesId;
-    Atom                nHasButtonsId;
-    Atom                nRectStyleId;
-    Atom                nLineSpacingId;
-    Atom                nSmallStyleId;
-    Atom                nEnableResizingId;
-    Atom                nDockableId;
-    Atom                nScaleId;
-    Atom                nIgnoreTabId;
-    Atom                nNoSplitDrawId;
-    Atom                nTopImageId;
-    Atom                nNoLabelId;
-    Atom                nVertId;
-    Atom                nSingleLineId;
-    Atom                nSysWinId;
+    Atom				nWinBitVarId;		// Name der Winbitvariablen
+    Atom				nBorderId;
+    Atom				nHideId;
+    Atom				nClipChildrenId;
+    Atom				nSizeableId;
+    Atom				nMoveableId;
+    Atom				nMinimizeId;
+    Atom				nMaximizeId;
+    Atom				nCloseableId;
+    Atom				nStdPopupId;
+    Atom				nAppId;
+    Atom				nTabstopId;
+    Atom				nGroupId;
+    Atom				nSysmodalId;
+    Atom				nLeftId;
+    Atom				nCenterId;
+    Atom				nRightId;
+    Atom				nTopId;
+    Atom				nVCenterId;
+    Atom				nBottomId;
+    Atom				nHScrollId;
+    Atom				nVScrollId;
+    Atom				nSortId;
+    Atom				nDefaultId;
+    Atom				nSVLookId;
+    Atom				nRepeatId;
+    Atom				nDropDownId;
+    Atom				nPassWordId;
+    Atom				nReadOnlyId;
+    Atom				nAutoSizeId;
+    Atom				nSpinId;
+    Atom				nTabControlId;
+    Atom				nSimpleModeId;
+    Atom				nDragId;
+    Atom				nScrollId;
+    Atom				nZoomableId;
+    Atom				nHideWhenDeactivateId;
+    Atom				nAutoHScrollId;
+    Atom				nAutoVScrollId;
+    Atom				nDDExtraWidthId;
+    Atom				nWordBreakId;
+    Atom				nLeftLabelId;
+    Atom				nHasLinesId;
+    Atom				nHasButtonsId;
+    Atom				nRectStyleId;
+    Atom				nLineSpacingId;
+    Atom				nSmallStyleId;
+    Atom				nEnableResizingId;
+    Atom				nDockableId;
+    Atom				nScaleId;
+    Atom				nIgnoreTabId;
+    Atom				nNoSplitDrawId;
+    Atom				nTopImageId;
+    Atom				nNoLabelId;
+    Atom				nVertId;
+    Atom				nSingleLineId;
+    Atom				nSysWinId;
 
-    void        Init();         // Initialisiert Klassen und Tabelle
-    void        SETCONST( RscConst *, const char *, UINT32 );
-    void        SETCONST( RscConst *, Atom, UINT32 );
-    RscEnum *   InitLangType();
-    RscEnum *   InitFieldUnitsType();
-    RscEnum *   InitTimeFieldFormat();
-    RscEnum *   InitColor();
-    RscEnum *   InitMapUnit();
-    RscEnum *   InitKey();
-    RscEnum *   InitTriState();
-    RscEnum *   InitMessButtons();
-    RscEnum *   InitMessDefButton();
-    RscTupel *  InitGeometry();
-    RscArray *  InitLangGeometry( RscTupel * pGeo );
-    RscArray *  InitSystemGeometry( RscTupel * pGeo );
-    RscCont  *  InitStringList();
-    RscArray *  InitLangStringList( RscCont * pStrLst );
-    RscTupel *  InitStringTupel();
-    RscTupel *  InitStringLongTupel();
-    RscCont  *  InitStringTupelList( RscTupel * pStringTupel );
-    RscCont  *  InitStringLongTupelList( RscTupel * pStringLongTupel );
-    RscArray *  InitLangStringTupelList( RscCont * pStrTupelLst );
-    RscArray *  InitLangStringLongTupelList( RscCont * pStrLongTupelLst );
+    void		Init(); 		// Initialisiert Klassen und Tabelle
+    void		SETCONST( RscConst *, const char *, UINT32 );
+    void		SETCONST( RscConst *, Atom, UINT32 );
+    RscEnum *	InitLangType();
+    RscEnum *	InitFieldUnitsType();
+    RscEnum *	InitTimeFieldFormat();
+    RscEnum *	InitColor();
+    RscEnum *	InitMapUnit();
+    RscEnum *	InitKey();
+    RscEnum *	InitTriState();
+    RscEnum *	InitMessButtons();
+    RscEnum *	InitMessDefButton();
+    RscTupel *	InitGeometry();
+    RscArray *	InitLangGeometry( RscTupel * pGeo );
+    RscArray *	InitSystemGeometry( RscTupel * pGeo );
+    RscCont  *	InitStringList();
+    RscArray *	InitLangStringList( RscCont * pStrLst );
+    RscTupel *	InitStringTupel();
+    RscTupel *	InitStringLongTupel();
+    RscCont  *	InitStringTupelList( RscTupel * pStringTupel );
+    RscCont  *	InitStringLongTupelList( RscTupel * pStringLongTupel );
+    RscArray *	InitLangStringTupelList( RscCont * pStrTupelLst );
+    RscArray *	InitLangStringLongTupelList( RscCont * pStrLongTupelLst );
 
-    RscTop *    InitClassMgr();
-    RscTop *    InitClassString( RscTop * pSuper );
-    RscTop *    InitClassBitmap( RscTop * pSuper );
-    RscTop *    InitClassColor( RscTop * pSuper, RscEnum * pColor );
-    RscTop *    InitClassImage( RscTop * pSuper, RscTop *pClassBitmap,
+    RscTop *	InitClassMgr();
+    RscTop *	InitClassString( RscTop * pSuper );
+    RscTop *	InitClassBitmap( RscTop * pSuper );
+    RscTop *	InitClassColor( RscTop * pSuper, RscEnum * pColor );
+    RscTop *	InitClassImage( RscTop * pSuper, RscTop *pClassBitmap,
                                 RscTop * pClassColor );
-    RscTop *    InitClassImageList( RscTop * pSuper, RscTop *pClassBitmap,
+    RscTop *	InitClassImageList( RscTop * pSuper, RscTop *pClassBitmap,
                                     RscTop * pClassColor, RscCont * pStrLst );
-    RscTop *    InitClassWindow( RscTop * pSuper, RscEnum * pMapUnit,
+    RscTop *	InitClassWindow( RscTop * pSuper, RscEnum * pMapUnit,
                                  RscArray * pLangGeo );
-    RscTop *    InitClassSystemWindow( RscTop * pSuper );
-    RscTop *    InitClassWorkWindow( RscTop * pSuper );
-    RscTop *    InitClassModalDialog( RscTop * pSuper );
-    RscTop *    InitClassModelessDialog( RscTop * pSuper );
-    RscTop *    InitClassControl( RscTop * pSuper );
-    RscTop *    InitClassCheckBox( RscTop * pSuper );
-    RscTop *    InitClassPushButton( RscTop * pSuper );
-    RscTop *    InitClassTriStateBox( RscTop * pSuper, RscEnum * pTriState );
-    RscTop *    InitClassMenuButton( RscTop * pSuper, RscTop * pClasMenu );
-    RscTop *    InitClassImageButton( RscTop * pSuper, RscTop * pClassImage,
+    RscTop *	InitClassSystemWindow( RscTop * pSuper );
+    RscTop *	InitClassWorkWindow( RscTop * pSuper );
+    RscTop *	InitClassModalDialog( RscTop * pSuper );
+    RscTop *	InitClassModelessDialog( RscTop * pSuper );
+    RscTop *	InitClassControl( RscTop * pSuper );
+    RscTop *	InitClassCheckBox( RscTop * pSuper );
+    RscTop *	InitClassPushButton( RscTop * pSuper );
+    RscTop *	InitClassTriStateBox( RscTop * pSuper, RscEnum * pTriState );
+    RscTop *	InitClassMenuButton( RscTop * pSuper, RscTop * pClasMenu );
+    RscTop *	InitClassImageButton( RscTop * pSuper, RscTop * pClassImage,
                                     RscEnum * pTriState );
-    RscTop *    InitClassEdit( RscTop * pSuper );
-    RscTop *    InitClassMultiLineEdit( RscTop * pSuper );
-    RscTop *    InitClassScrollBar( RscTop * pSuper );
-    RscTop *    InitClassListBox( RscTop * pSuper, RscArray * pStrLst );
-    RscTop *    InitClassMultiListBox( RscTop * pSuper );
-    RscTop *    InitClassComboBox( RscTop * pSuper, RscArray * pStrLst );
-    RscTop *    InitClassFixedText( RscTop * pSuper );
-    RscTop *    InitClassFixedBitmap( RscTop * pSuper, RscTop * pClassBitmap );
-    RscTop *    InitClassFixedImage( RscTop * pSuper, RscTop * pClassImage );
-    RscTop *    InitClassRadioButton( RscTop * pSuper );
-    RscTop *    InitClassImageRadioButton( RscTop * pSuper, RscTop * pClassImage );
-    RscTop *    InitClassKeyCode( RscTop * pSuper, RscEnum * pKey );
-    RscTop *    InitClassAccelItem( RscTop * pSuper, RscTop * pKeyCode );
-    RscTop *    InitClassAccel( RscTop * pSuper, RscTop * pClassAccelItem );
-    RscTop *    InitClassMenuItem( RscTop * pSuper, RscTop * pClassBitmap,
+    RscTop *	InitClassEdit( RscTop * pSuper );
+    RscTop *	InitClassMultiLineEdit( RscTop * pSuper );
+    RscTop *	InitClassScrollBar( RscTop * pSuper );
+    RscTop *	InitClassListBox( RscTop * pSuper, RscArray * pStrLst );
+    RscTop *	InitClassMultiListBox( RscTop * pSuper );
+    RscTop *	InitClassComboBox( RscTop * pSuper, RscArray * pStrLst );
+    RscTop *	InitClassFixedText( RscTop * pSuper );
+    RscTop *	InitClassFixedBitmap( RscTop * pSuper, RscTop * pClassBitmap );
+    RscTop *	InitClassFixedImage( RscTop * pSuper, RscTop * pClassImage );
+    RscTop *	InitClassRadioButton( RscTop * pSuper );
+    RscTop *	InitClassImageRadioButton( RscTop * pSuper, RscTop * pClassImage );
+    RscTop *	InitClassKeyCode( RscTop * pSuper, RscEnum * pKey );
+    RscTop *	InitClassAccelItem( RscTop * pSuper, RscTop * pKeyCode );
+    RscTop *	InitClassAccel( RscTop * pSuper, RscTop * pClassAccelItem );
+    RscTop *	InitClassMenuItem( RscTop * pSuper, RscTop * pClassBitmap,
                                    RscTop * pClassKeyCode );
-    RscTop *    InitClassMenu( RscTop * pSuper, RscTop * pMenuItem );
-    RscTop *    InitClassMessBox( RscTop * pSuper,
+    RscTop *	InitClassMenu( RscTop * pSuper, RscTop * pMenuItem );
+    RscTop *	InitClassMessBox( RscTop * pSuper,
                                   RscEnum * pMessButtons,
                                   RscEnum * pMessDefButton );
-    RscTop *    InitClassSplitter( RscTop * pSuper );
-    RscTop *    InitClassSplitWindow( RscTop * pSuper );
-    RscTop *    InitClassTime( RscTop * pSuper );
-    RscTop *    InitClassDate( RscTop * pSuper );
+    RscTop *	InitClassSplitter( RscTop * pSuper );
+    RscTop *	InitClassSplitWindow( RscTop * pSuper );
+    RscTop *	InitClassTime( RscTop * pSuper );
+    RscTop *	InitClassDate( RscTop * pSuper );
 
-    RscTop *    InitClassPatternFormatter( RscTop * pSuper );
-    RscTop *    InitClassNumericFormatter( RscTop * pSuper );
-    RscTop *    InitClassMetricFormatter( RscTop * pSuper,
+    RscTop *	InitClassPatternFormatter( RscTop * pSuper );
+    RscTop *	InitClassNumericFormatter( RscTop * pSuper );
+    RscTop *	InitClassMetricFormatter( RscTop * pSuper,
                                           RscEnum * pFieldUnits );
-    RscTop *    InitClassCurrencyFormatter( RscTop * pSuper,
+    RscTop *	InitClassCurrencyFormatter( RscTop * pSuper,
                                             RscEnum * pFieldUnits );
-    RscTop *    InitClassDateFormatter( RscTop * pSuper, RscTop * pClassDate );
-    RscTop *    InitClassTimeFormatter( RscTop * pSuper, RscTop * pClassTime,
+    RscTop *	InitClassDateFormatter( RscTop * pSuper, RscTop * pClassDate );
+    RscTop *	InitClassTimeFormatter( RscTop * pSuper, RscTop * pClassTime,
                                         RscEnum * pTimeFieldFormat );
 
-    RscTop *    InitClassSpinField( RscTop * pSuper );
-    RscTop *    InitClassPatternField( RscTop * pSuper );
-    RscTop *    InitClassNumericField( RscTop * pSuper );
-    RscTop *    InitClassMetricField( RscTop * pSuper );
-    RscTop *    InitClassCurrencyField( const char * pClassName, sal_uInt32 nRT,
+    RscTop *	InitClassSpinField( RscTop * pSuper );
+    RscTop *	InitClassPatternField( RscTop * pSuper );
+    RscTop *	InitClassNumericField( RscTop * pSuper );
+    RscTop *	InitClassMetricField( RscTop * pSuper );
+    RscTop *	InitClassCurrencyField( const char * pClassName, sal_uInt32 nRT,
                                         RscTop * pSuper );
-    RscTop *    InitClassDateField( RscTop * pSuper, RscTop * pClassDate );
-    RscTop *    InitClassTimeField( RscTop * pSuper, RscTop * pClassTime );
-    RscTop *    InitClassPatternBox( RscTop * pSuper );
-    RscTop *    InitClassNumericBox( RscTop * pSuper );
-    RscTop *    InitClassMetricBox( RscTop * pSuper );
-    RscTop *    InitClassCurrencyBox( const char * pClassName, sal_uInt32 nRT,
+    RscTop *	InitClassDateField( RscTop * pSuper, RscTop * pClassDate );
+    RscTop *	InitClassTimeField( RscTop * pSuper, RscTop * pClassTime );
+    RscTop *	InitClassPatternBox( RscTop * pSuper );
+    RscTop *	InitClassNumericBox( RscTop * pSuper );
+    RscTop *	InitClassMetricBox( RscTop * pSuper );
+    RscTop *	InitClassCurrencyBox( const char * pClassName, sal_uInt32 nRT,
                                         RscTop * pSuper );
-    RscTop *    InitClassDateBox( RscTop * pSuper, RscTop * pClassDate );
-    RscTop *    InitClassTimeBox( RscTop * pSuper, RscTop * pClassTime );
+    RscTop *	InitClassDateBox( RscTop * pSuper, RscTop * pClassDate );
+    RscTop *	InitClassTimeBox( RscTop * pSuper, RscTop * pClassTime );
 
-    RscTop *    InitClassDockingWindow( RscTop * pSuper,
+    RscTop *	InitClassDockingWindow( RscTop * pSuper,
                                         RscEnum * pMapUnit );
-    RscTop *    InitClassToolBoxItem( RscTop * pSuper, RscTop * pClassBitmap,
+    RscTop *	InitClassToolBoxItem( RscTop * pSuper, RscTop * pClassBitmap,
                                       RscTop * pClassImage,
                                       RscEnum * pTriState );
-    RscTop *    InitClassToolBox( RscTop * pSuper, RscTop * pClassToolBoxItem,
+    RscTop *	InitClassToolBox( RscTop * pSuper, RscTop * pClassToolBoxItem,
                                   RscTop * pClassImageList );
-    RscTop *    InitClassStatusBar( RscTop * pSuper );
-    RscTop *    InitClassMoreButton( RscTop * pSuper, RscEnum * pMapUnit );
-    RscTop *    InitClassFloatingWindow( RscTop * pSuper,
+    RscTop *	InitClassStatusBar( RscTop * pSuper );
+    RscTop *	InitClassMoreButton( RscTop * pSuper, RscEnum * pMapUnit );
+    RscTop *	InitClassFloatingWindow( RscTop * pSuper,
                                          RscEnum * pMapUnit );
-    RscTop *    InitClassTabControlItem( RscTop * pSuper,
+    RscTop *	InitClassTabControlItem( RscTop * pSuper,
                                          RscTop * pClassTabPage );
-    RscTop *    InitClassTabControl(  RscTop * pSuper,
+    RscTop *	InitClassTabControl(  RscTop * pSuper,
                                      RscTop * pClassTabControlItem );
-    RscTop *    InitClassSfxStyleFamilyItem( RscTop * pSuper,
+    RscTop *	InitClassSfxStyleFamilyItem( RscTop * pSuper,
                                              RscTop * pClassBitmap,
                                              RscTop * pClassImage,
                                              RscArray * pStrLst );
-    RscTop *    InitClassSfxTemplateDialog(  RscTop * pSuper,
+    RscTop *	InitClassSfxTemplateDialog(  RscTop * pSuper,
                                              RscTop * pStyleFamily );
-    RscTop *    InitClassSfxSlotInfo( RscTop * pSuper );
+    RscTop *	InitClassSfxSlotInfo( RscTop * pSuper );
 
-    void        InsWinBit( RscTop * pClass, const ByteString & rName,
+    void		InsWinBit( RscTop * pClass, const ByteString & rName,
                            Atom nVal );
-    void        WriteInc( FILE * fOutput, ULONG lKey );
+    void		WriteInc( FILE * fOutput, ULONG lKey );
 
 public:
-    RscBool             aBool;
-    RscRange            aShort;
-    RscRange            aUShort;
-    RscLongRange        aLong;
-    RscLongEnumRange    aEnumLong;
-    RscIdRange          aIdUShort;
-    RscIdRange          aIdNoZeroUShort;
-    RscBreakRange       aNoZeroShort;
-    RscRange            a1to12Short;
-    RscRange            a0to23Short;
-    RscRange            a1to31Short;
-    RscRange            a0to59Short;
-    RscRange            a0to99Short;
-    RscRange            a0to9999Short;
-    RscIdRange          aIdLong;
-    RscString           aString;
-    RscFlag             aWinBits;
-    RscLangEnum         aLangType;
-    RscLangArray        aLangString;
-    RscLangArray        aLangShort;
+    RscBool 			aBool;
+    RscRange			aShort;
+    RscRange			aUShort;
+    RscLongRange		aLong;
+    RscLongEnumRange	aEnumLong;
+    RscIdRange			aIdUShort;
+    RscIdRange			aIdNoZeroUShort;
+    RscBreakRange		aNoZeroShort;
+    RscRange			a1to12Short;
+    RscRange			a0to23Short;
+    RscRange			a1to31Short;
+    RscRange			a0to59Short;
+    RscRange			a0to99Short;
+    RscRange			a0to9999Short;
+    RscIdRange			aIdLong;
+    RscString			aString;
+    RscFlag 			aWinBits;
+    RscLangEnum 		aLangType;
+    RscLangArray		aLangString;
+    RscLangArray		aLangShort;
 
-    Atom                nAcceleratorType;
+    Atom				nAcceleratorType;
 
-    RscError*           pEH;        // Fehlerhandler
-    RscNameTable        aNmTb;      // Tabelle fuer Namen
-    RscFileTab          aFileTab;   // Tabelle der Dateinamen
-    sal_uInt32              nFlags;
-    std::map<sal_uInt64, ULONG> aIdTranslator; //Ordnet Resourcetypen und Id's einen Id zu
+    RscError*			pEH;		// Fehlerhandler
+    RscNameTable		aNmTb;		// Tabelle fuer Namen
+    RscFileTab			aFileTab;	// Tabelle der Dateinamen
+    sal_uInt32				nFlags;
+    std::map<sal_uInt64, ULONG>	aIdTranslator; //Ordnet Resourcetypen und Id's einen Id zu
                                        //(unter PM), oder eine Dateiposition (MTF)
 
     RscTypCont( RscError *, RSCBYTEORDER_TYPE, const ByteString & rSearchPath, sal_uInt32 nFlags );
     ~RscTypCont();
-
+    
     Atom AddLanguage( const char* );
 
-    BOOL            IsPreload() const
+    BOOL			IsPreload() const
                     { return (nFlags & PRELOAD_FLAG) ? TRUE : FALSE; }
-    BOOL            IsSmart() const
+    BOOL			IsSmart() const
                     { return (nFlags & SMART_FLAG) ? TRUE : FALSE; }
-    BOOL            IsSysResTest() const
+    BOOL			IsSysResTest() const
                     { return (nFlags & NOSYSRESTEST_FLAG) ? FALSE : TRUE; }
-    BOOL            IsSrsDefault() const
+    BOOL			IsSrsDefault() const
                     { return (nFlags & SRSDEFAULT_FLAG) ? TRUE : FALSE; }
-    ByteString      ChangeLanguage( const ByteString& rNewLang );
-    const std::vector< sal_uInt32 >& GetFallbacks() const
+    ByteString		ChangeLanguage( const ByteString& rNewLang );
+    const std::vector< sal_uInt32 >& GetFallbacks() const 
     { return aLangFallbacks; }
 
     RSCBYTEORDER_TYPE GetByteOrder() const { return nByteOrder; }
-    CharSet         GetSourceCharSet() const { return nSourceCharSet; }
-    CharSet         SetSourceCharSet( CharSet aCharSet )
+    CharSet 		GetSourceCharSet() const { return nSourceCharSet; }
+    CharSet			SetSourceCharSet( CharSet aCharSet )
     {
         CharSet aOld = nSourceCharSet;
         nSourceCharSet = aCharSet;
         return aOld;
     }
-    void            SetSearchPath( const ByteString & rStr) { aSearchPath = rStr; }
-    ByteString      GetSearchPath() const { return aSearchPath; }
-    void            SetSysSearchPath( const ByteString& rStr ) { aSysSearchPath = rStr; }
-    ByteString      GetSysSearchPath() const { return aSysSearchPath; }
-    void        InsertType( RscTop * pType )
+    void			SetSearchPath( const ByteString & rStr) { aSearchPath = rStr; }
+    ByteString		GetSearchPath() const { return aSearchPath; }
+    void			SetSysSearchPath( const ByteString& rStr ) { aSysSearchPath = rStr; }
+    ByteString		GetSysSearchPath() const { return aSysSearchPath; }
+    void		InsertType( RscTop * pType )
                 {
                     aBaseLst.Insert( pType, LIST_APPEND );
                 }
-    RscTop  *   SearchType( Atom nTypId );
-    RscTop  *   Search( Atom typ );
-    CLASS_DATA  Search( Atom typ, const RscId & rId );
-    void        Delete( Atom typ, const RscId & rId );
+    RscTop	*	SearchType( Atom nTypId );
+    RscTop	*	Search( Atom typ );
+    CLASS_DATA	Search( Atom typ, const RscId & rId );
+    void		Delete( Atom typ, const RscId & rId );
                 // loescht alle Resourceobjekte diese Datei
-    void        Delete( ULONG lFileKey );
-    RscTop  *   GetRoot()         { return( pRoot ); };
-    sal_uInt32      PutSysName( sal_uInt32 nRscTyp, char * pName, sal_uInt32 nConst,
+    void		Delete( ULONG lFileKey );
+    RscTop	*	GetRoot()		  { return( pRoot ); };
+    sal_uInt32		PutSysName( sal_uInt32 nRscTyp, char * pName, sal_uInt32 nConst,
                             sal_uInt32 nId, BOOL bFirst );
-    void        ClearSysNames();
-    ERRTYPE     WriteRc( WriteRcContext& rContext );
-    void        WriteSrc( FILE * fOutput, ULONG nFileIndex,
+    void		ClearSysNames();
+    ERRTYPE 	WriteRc( WriteRcContext& rContext );
+    void		WriteSrc( FILE * fOutput, ULONG nFileIndex,
                           CharSet nCharSet, BOOL bName = TRUE );
-    ERRTYPE     WriteHxx( FILE * fOutput, ULONG nFileKey);
-    ERRTYPE     WriteCxx( FILE * fOutput, ULONG nFileKey,
+    ERRTYPE 	WriteHxx( FILE * fOutput, ULONG nFileKey);
+    ERRTYPE 	WriteCxx( FILE * fOutput, ULONG nFileKey,
                           const ByteString & rHxxName );
-    void        WriteSyntax( FILE * fOutput );
-    void        WriteRcCtor( FILE * fOutput );
-    void        FillNameIdList( REResourceList * pList, ULONG lFileKey );
-    BOOL        MakeConsistent( RscInconsList * pList );
-    sal_uInt32      PutTranslatorKey( sal_uInt64 nKey );
-    void        IncFilePos( ULONG nOffset ){ nFilePos += nOffset; }
+    void		WriteSyntax( FILE * fOutput );
+    void		WriteRcCtor( FILE * fOutput );
+    void		FillNameIdList( REResourceList * pList, ULONG lFileKey );
+    BOOL		MakeConsistent( RscInconsList * pList );
+    sal_uInt32		PutTranslatorKey( sal_uInt64 nKey );
+    void		IncFilePos( ULONG nOffset ){ nFilePos += nOffset; }
 };
 
 #endif
diff --git a/rsc/inc/rscdef.hxx b/rsc/inc/rscdef.hxx
index a21b03685325..717bff08d9e8 100644
--- a/rsc/inc/rscdef.hxx
+++ b/rsc/inc/rscdef.hxx
@@ -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
@@ -38,27 +38,27 @@ class RscFileTab;
 class RscDefine;
 
 /*********** R s c E x p r e s s i o n ***********************************/
-#define RSCEXP_LONG     0
-#define RSCEXP_EXP      1
-#define RSCEXP_DEF      2
-#define RSCEXP_NOTHING  3
+#define RSCEXP_LONG 	0
+#define RSCEXP_EXP		1
+#define RSCEXP_DEF		2
+#define RSCEXP_NOTHING	3
 
 class RscExpType
 {
 public:
     union {
         RscExpression * pExp;
-        RscDefine     * pDef;
+        RscDefine	  * pDef;
         struct {
-             short           nHi;
+             short			 nHi;
              unsigned short  nLo;
         } aLong;
     } aExp;
     char cType;
     char cUnused;
-    BOOL IsNumber()    const { return( RSCEXP_LONG     == cType ); }
-    BOOL IsExpression()const { return( RSCEXP_EXP      == cType ); }
-    BOOL IsDefinition()const { return( RSCEXP_DEF      == cType ); }
+    BOOL IsNumber()    const { return( RSCEXP_LONG	   == cType ); }
+    BOOL IsExpression()const { return( RSCEXP_EXP	   == cType ); }
+    BOOL IsDefinition()const { return( RSCEXP_DEF	   == cType ); }
     BOOL IsNothing()   const { return( RSCEXP_NOTHING  == cType ); }
     void SetLong( INT32 lValue ){
             aExp.aLong.nHi = (short)(lValue >> 16);
@@ -76,21 +76,21 @@ public:
 /*********** R s c I d ***************************************************/
 class RscId
 {
-    static      BOOL bNames;// FALSE, bei den Namenoperation nur Zahlen
+    static		BOOL bNames;// FALSE, bei den Namenoperation nur Zahlen
 public:
-    RscExpType  aExp;       // Zahl, Define oder Ausdruck
-    INT32   GetNumber() const;
-    void    Create( const RscExpType & rExpType );
-    void    Create(){ aExp.cType = RSCEXP_NOTHING; }
+    RscExpType	aExp;		// Zahl, Define oder Ausdruck
+    INT32	GetNumber() const;
+    void	Create( const RscExpType & rExpType );
+    void	Create(){ aExp.cType = RSCEXP_NOTHING; }
 
-            RscId() { Create();                         }
+            RscId() { Create(); 						}
 
             RscId( RscDefine * pEle );
             RscId( INT32 lNumber )
-                    { aExp.SetLong( lNumber );          }
+                    { aExp.SetLong( lNumber );			}
 
             RscId( const RscExpType & rExpType )
-                    { Create( rExpType );               }
+                    { Create( rExpType );				}
 
             void Destroy();
 
@@ -104,17 +104,17 @@ public:
 
     static BOOL    IsSetNames();
     static void    SetNames( BOOL bSet = TRUE );
-    operator         INT32() const;   // Gibt Nummer zurueck
-    ByteString     GetName()  const;   // Gibt den Namen des Defines zurueck
-    ByteString     GetMacro()  const;  // Gibt das Macro zurueck
-    BOOL    operator <  ( const RscId& rRscId ) const;
-    BOOL    operator >  ( const RscId& rRscId ) const;
-    BOOL    operator == ( const RscId& rRscId ) const;
-    BOOL    operator <=  ( const RscId& rRscId ) const
+    operator	     INT32() const;   // Gibt Nummer zurueck
+    ByteString	   GetName()  const;   // Gibt den Namen des Defines zurueck
+    ByteString	   GetMacro()  const;  // Gibt das Macro zurueck
+    BOOL	operator <	( const RscId& rRscId ) const;
+    BOOL	operator >	( const RscId& rRscId ) const;
+    BOOL	operator == ( const RscId& rRscId ) const;
+    BOOL	operator <=  ( const RscId& rRscId ) const
             { return !(operator > ( rRscId )); }
-    BOOL    operator >= ( const RscId& rRscId ) const
+    BOOL	operator >= ( const RscId& rRscId ) const
             { return !(operator < ( rRscId )); }
-    BOOL    IsId() const { return !aExp.IsNothing(); }
+    BOOL	IsId() const { return !aExp.IsNothing(); }
 };
 
 /*********** R s c D e f i n e *******************************************/
@@ -125,10 +125,10 @@ friend class RscDefineList;
 friend class RscDefTree;
 friend class RscExpression;
 friend class RscId;
-    ULONG           lFileKey;   // zu welcher Datei gehoert das Define
-    sal_uInt32          nRefCount;  // Wieviele Referenzen auf dieses Objekt
-    INT32           lId;        // Identifier
-    RscExpression * pExp;       // Ausdruck
+    ULONG			lFileKey;	// zu welcher Datei gehoert das Define
+    sal_uInt32			nRefCount;	// Wieviele Referenzen auf dieses Objekt
+    INT32			lId;		// Identifier
+    RscExpression * pExp;		// Ausdruck
 protected:
 
             RscDefine( ULONG lFileKey, const ByteString & rDefName,
@@ -136,21 +136,21 @@ protected:
             RscDefine( ULONG lFileKey, const ByteString & rDefName,
                        RscExpression * pExpression );
             ~RscDefine();
-    void    IncRef(){ nRefCount++; }
-    sal_uInt32  GetRefCount() const    { return nRefCount; }
-    void    DecRef();
-    void    DefineToNumber();
-    void    SetName( const ByteString & rNewName ){ aName = rNewName; }
-    void    ChangeMacro( RscExpression * pExpression );
-    void    ChangeMacro( INT32 lIdentifier );
-
+    void	IncRef(){ nRefCount++; }
+    sal_uInt32	GetRefCount() const    { return nRefCount; }
+    void	DecRef();
+    void	DefineToNumber();
+    void	SetName( const ByteString & rNewName ){ aName = rNewName; }
+    void	ChangeMacro( RscExpression * pExpression );
+    void	ChangeMacro( INT32 lIdentifier );
+    
     using StringNode::Search;
 public:
     RscDefine * Search( const char * );
-    ULONG       GetFileKey() const { return lFileKey; }
-    BOOL        Evaluate();
-    INT32       GetNumber() const  { return lId;      }
-    ByteString  GetMacro();
+    ULONG		GetFileKey() const { return lFileKey; }
+    BOOL		Evaluate();
+    INT32		GetNumber() const  { return lId;	  }
+    ByteString	GetMacro();
 };
 
 DECLARE_LIST( RscSubDefList, RscDefine * )
@@ -164,34 +164,34 @@ private:
                      INT32 lDefId, ULONG lPos );
     RscDefine * New( ULONG lFileKey, const ByteString & rDefName,
                      RscExpression * pExpression, ULONG lPos );
-    BOOL        Befor( const RscDefine * pFree, const RscDefine * pDepend );
-    BOOL        Remove( RscDefine * pDef );
-    BOOL        Remove( ULONG nIndex );
-    BOOL        Remove();
+    BOOL		Befor( const RscDefine * pFree, const RscDefine * pDepend );
+    BOOL		Remove( RscDefine * pDef );
+    BOOL		Remove( ULONG nIndex );
+    BOOL		Remove();
 public:
-    void        WriteAll( FILE * fOutput );
+    void		WriteAll( FILE * fOutput );
 };
 
 /*********** R s c E x p r e s s i o n ***********************************/
 class RscExpression {
 friend class RscFileTab;
-    char        cOperation;
-    RscExpType  aLeftExp;
-    RscExpType  aRightExp;
+    char		cOperation;
+    RscExpType	aLeftExp;
+    RscExpType	aRightExp;
 public:
                 RscExpression( RscExpType aLE, char cOp,
                                RscExpType aRE );
                 ~RscExpression();
-    BOOL        Evaluate( INT32 * pValue );
-    ByteString  GetMacro();
+    BOOL		Evaluate( INT32 * pValue );
+    ByteString	GetMacro();
 };
 
 /********************** R S C F I L E ************************************/
 class RscDepend {
-    ULONG            lKey;
+    ULONG			 lKey;
 public:
             RscDepend( ULONG lIncKey ){ lKey = lIncKey; };
-    ULONG   GetFileKey(){ return lKey; }
+    ULONG	GetFileKey(){ return lKey; }
 };
 DECLARE_LIST( RscDependList, RscDepend * )
 
@@ -199,22 +199,22 @@ DECLARE_LIST( RscDependList, RscDepend * )
 class RscFile : public RscDependList
 {
 friend class RscFileTab;
-    BOOL            bIncFile;   // Ist es eine Include-Datei
+    BOOL			bIncFile;	// Ist es eine Include-Datei
 public:
-    BOOL            bLoaded;    // Ist die Datei geladen
-    BOOL            bScanned;   // Wurde Datei nach Inclide abgesucht
-    BOOL            bDirty;     // Dirty-Flag
-    ByteString      aFileName;  // Name der Datei
-    ByteString      aPathName;  // Pfad und Name der Datei
-    RscDefineList   aDefLst;    // Liste der Defines
+    BOOL			bLoaded;	// Ist die Datei geladen
+    BOOL			bScanned;	// Wurde Datei nach Inclide abgesucht
+    BOOL			bDirty; 	// Dirty-Flag
+    ByteString		aFileName;	// Name der Datei
+    ByteString		aPathName;	// Pfad und Name der Datei
+    RscDefineList	aDefLst;	// Liste der Defines
 
                     RscFile();
                     ~RscFile();
-    BOOL            InsertDependFile( ULONG lDepFile, ULONG lPos );
-    void            RemoveDependFile( ULONG lDepFile );
-    BOOL            Depend( ULONG lDepend, ULONG lFree );
-    void            SetIncFlag(){ bIncFile = TRUE; };
-    BOOL            IsIncFile(){  return bIncFile; };
+    BOOL			InsertDependFile( ULONG lDepFile, ULONG lPos );
+    void			RemoveDependFile( ULONG lDepFile );
+    BOOL			Depend( ULONG lDepend, ULONG lFree );
+    void			SetIncFlag(){ bIncFile = TRUE; };
+    BOOL			IsIncFile(){  return bIncFile; };
 };
 
 DECLARE_UNIQUEINDEX( RscSubFileTab, RscFile * )
@@ -226,16 +226,16 @@ public:
     static BOOL Evaluate( RscDefine * pDef );
                 RscDefTree(){ pDefRoot = NULL; }
                 ~RscDefTree();
-    void        Remove();
-    BOOL        Evaluate();
+    void		Remove();
+    BOOL		Evaluate();
     RscDefine * Search( const char * pName );
-    void        Insert( RscDefine * pDef );
-    void        Remove( RscDefine * pDef );
+    void		Insert( RscDefine * pDef );
+    void		Remove( RscDefine * pDef );
 };
 
 class RscFileTab : public RscSubFileTab {
     RscDefTree aDefTree;
-    ULONG       Find( const ByteString & rName );
+    ULONG		Find( const ByteString & rName );
 public:
                 RscFileTab();
                 ~RscFileTab();
@@ -244,10 +244,10 @@ public:
     RscDefine * FindDef( const ByteString& rStr ) { return FindDef( rStr.GetBuffer() ); }
     RscDefine * FindDef( ULONG lKey, const ByteString & );
 
-    BOOL        Depend( ULONG lDepend, ULONG lFree );
-    BOOL        TestDef( ULONG lFileKey, ULONG lPos,
+    BOOL		Depend( ULONG lDepend, ULONG lFree );
+    BOOL		TestDef( ULONG lFileKey, ULONG lPos,
                          const RscDefine * pDefDec );
-    BOOL        TestDef( ULONG lFileKey, ULONG lPos,
+    BOOL		TestDef( ULONG lFileKey, ULONG lPos,
                          const RscExpression * pExpDec );
 
     RscDefine * NewDef( ULONG lKey, const ByteString & rDefName,
@@ -255,8 +255,8 @@ public:
     RscDefine * NewDef( ULONG lKey, const ByteString & rDefName,
                         RscExpression *, ULONG lPos );
 
-    BOOL        ChangeDef( const ByteString & rDefName, INT32 lId );
-    BOOL        ChangeDef( const ByteString & rDefName, RscExpression * );
+    BOOL		ChangeDef( const ByteString & rDefName, INT32 lId );
+    BOOL		ChangeDef( const ByteString & rDefName, RscExpression * );
 
     BOOL IsDefUsed( const ByteString & );
     void DeleteDef( const ByteString & );
diff --git a/rsc/inc/rscerror.h b/rsc/inc/rscerror.h
index f3a4428127f3..4d12b79466fe 100644
--- a/rsc/inc/rscerror.h
+++ b/rsc/inc/rscerror.h
@@ -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
@@ -32,85 +32,85 @@
 #endif
 
 /****************** D E F I N I T I O N S ********************************/
-/******************* R e t u r n   E r r o r s         *******************/
-#define ERR_OK              0xFFFFFFFF
-
-#define ERR_ERROR           0x0100
-#define ERR_UNKNOWN_METHOD  0x0101  // Return
-#define ERR_OPENFILE        0x0102  // Return
-#define ERR_NOCHAR          0x0103  // Return
-#define ERR_NORSCINST       0x0104  // Return
-#define ERR_USAGE           0x0105  //
-#define ERR_NOINPUT         0x0106  // Return
-#define ERR_UNKNOWNSW       0x0107  //
-#define ERR_REFTODEEP       0x0108  // Return
-#define ERR_FILEFORMAT      0x0109  // Return
-#define ERR_FILESIZE        0x010A  // Return
-#define ERR_RENAMEFILE      0x010B  // Return
-#define ERR_NOIMAGE         0x010C  // Return
-
-#define ERR_RSCRANGE        0x0200  // Return
-#define ERR_RSCRANGE_OUTDEFSET  (ERR_RSCRANGE +1 )
-
-#define ERR_RSCENUM         0x0210  // Return
-#define ERR_RSCFLAG         0x0220  // Return
-#define ERR_RSCCONT         0x0240  // Return
-#define ERR_CONT_INVALIDPOS     (ERR_RSCCONT +1 ) // Return
-#define ERR_CONT_INVALIDTYPE    (ERR_RSCCONT +2 ) // Return
-
-#define ERR_RSCCMPED        0x0250
-#define ERR_RSCINST         0x0260
-#define ERR_RSCINST_NOVARNAME   (ERR_RSCINST +1 ) // Return
+/******************* R e t u r n   E r r o r s		   *******************/
+#define ERR_OK				0xFFFFFFFF
+
+#define ERR_ERROR			0x0100
+#define ERR_UNKNOWN_METHOD	0x0101	// Return
+#define ERR_OPENFILE		0x0102	// Return
+#define ERR_NOCHAR			0x0103	// Return
+#define ERR_NORSCINST		0x0104	// Return
+#define ERR_USAGE			0x0105	//
+#define ERR_NOINPUT 		0x0106	// Return
+#define ERR_UNKNOWNSW		0x0107	//
+#define ERR_REFTODEEP		0x0108	// Return
+#define ERR_FILEFORMAT		0x0109	// Return
+#define ERR_FILESIZE		0x010A	// Return
+#define ERR_RENAMEFILE		0x010B	// Return
+#define ERR_NOIMAGE			0x010C	// Return
+
+#define ERR_RSCRANGE		0x0200	// Return
+#define ERR_RSCRANGE_OUTDEFSET	(ERR_RSCRANGE +1 )
+
+#define ERR_RSCENUM 		0x0210	// Return
+#define ERR_RSCFLAG 		0x0220	// Return
+#define ERR_RSCCONT 		0x0240	// Return
+#define ERR_CONT_INVALIDPOS 	(ERR_RSCCONT +1 ) // Return
+#define ERR_CONT_INVALIDTYPE	(ERR_RSCCONT +2 ) // Return
+
+#define ERR_RSCCMPED		0x0250
+#define ERR_RSCINST 		0x0260
+#define ERR_RSCINST_NOVARNAME	(ERR_RSCINST +1 ) // Return
 #define ERR_RSCINST_RESERVEDNAME (ERR_RSCINST +2 ) // Return
 
-#define ERR_LEX             0x0270
-#define ERR_YACC            0x0280  //
-#define ERR_DOUBLEID            (ERR_YACC    +1 ) //
-#define ERR_FALSETYPE           (ERR_YACC    +2 ) //
-#define ERR_NOVARIABLENAME      (ERR_YACC    +3 ) //
-#define ERR_USHORTRANGE         (ERR_YACC    +4 ) //
-#define ERR_IDRANGE             (ERR_YACC    +5 ) //
-#define ERR_NOCOPYOBJ           (ERR_YACC    +6 ) //
-#define ERR_REFNOTALLOWED       (ERR_YACC    +7 ) // Return
-#define ERR_DOUBLEDEFINE        (ERR_YACC    +8 ) //
-#define ERR_COPYNOTALLOWED      (ERR_YACC    +9 ) //
-#define ERR_IDEXPECTED          (ERR_YACC    +10) //
-#define ERR_ZERODIVISION        (ERR_YACC    +11) //
-#define ERR_PRAGMA              (ERR_YACC    +12) //
-#define ERR_DECLAREDEFINE       (ERR_YACC    +13) //
-#define ERR_NOTUPELNAME         (ERR_YACC    +14) //
-#define ERR_NOTYPE              (ERR_YACC    +15) //
-
-#define ERR_RSCARRAY         0x02A0  // Return
-#define ERR_ARRAY_INVALIDINDEX  (ERR_RSCARRAY +1 ) // Return
-
-#define ERR_ERROREND                0x1000
-
-#define ERR_WARNINGSTART        0x1001
-#define WRN_LOCALID             (ERR_WARNINGSTART +1 )
-#define WRN_GLOBALID            (ERR_WARNINGSTART +2 )
-#define WRN_SUBINMEMBER         (ERR_WARNINGSTART +3 )
-#define WRN_CONT_NOID           (ERR_WARNINGSTART +4 )
-#define WRN_STR_REFNOTFOUND     (ERR_WARNINGSTART +5 )
-#define WRN_MGR_REFNOTFOUND     (ERR_WARNINGSTART +6 )
-#define WRN_CONT_DOUBLEID       (ERR_WARNINGSTART +7 )
-
-#define ERR_WARNINGEND      0x2000
+#define ERR_LEX 			0x0270
+#define ERR_YACC			0x0280	//
+#define ERR_DOUBLEID			(ERR_YACC	 +1 ) //
+#define ERR_FALSETYPE			(ERR_YACC	 +2 ) //
+#define ERR_NOVARIABLENAME		(ERR_YACC	 +3 ) //
+#define ERR_USHORTRANGE 		(ERR_YACC	 +4 ) //
+#define ERR_IDRANGE 			(ERR_YACC	 +5 ) //
+#define ERR_NOCOPYOBJ			(ERR_YACC	 +6 ) //
+#define ERR_REFNOTALLOWED		(ERR_YACC	 +7 ) // Return
+#define ERR_DOUBLEDEFINE		(ERR_YACC	 +8 ) //
+#define ERR_COPYNOTALLOWED		(ERR_YACC	 +9 ) //
+#define ERR_IDEXPECTED			(ERR_YACC	 +10) //
+#define ERR_ZERODIVISION		(ERR_YACC	 +11) //
+#define ERR_PRAGMA				(ERR_YACC	 +12) //
+#define ERR_DECLAREDEFINE		(ERR_YACC	 +13) //
+#define ERR_NOTUPELNAME 		(ERR_YACC	 +14) //
+#define ERR_NOTYPE				(ERR_YACC	 +15) //
+
+#define ERR_RSCARRAY		 0x02A0  // Return
+#define ERR_ARRAY_INVALIDINDEX	(ERR_RSCARRAY +1 ) // Return
+
+#define ERR_ERROREND				0x1000
+
+#define ERR_WARNINGSTART		0x1001
+#define WRN_LOCALID 			(ERR_WARNINGSTART +1 )
+#define WRN_GLOBALID			(ERR_WARNINGSTART +2 )
+#define WRN_SUBINMEMBER 		(ERR_WARNINGSTART +3 )
+#define WRN_CONT_NOID			(ERR_WARNINGSTART +4 )
+#define WRN_STR_REFNOTFOUND 	(ERR_WARNINGSTART +5 )
+#define WRN_MGR_REFNOTFOUND 	(ERR_WARNINGSTART +6 )
+#define WRN_CONT_DOUBLEID		(ERR_WARNINGSTART +7 )
+
+#define ERR_WARNINGEND		0x2000
 
 class ERRTYPE {
-    sal_uInt32  nError;
+    sal_uInt32	nError;
 public:
-    ERRTYPE()                { nError = ERR_OK; }
-    ERRTYPE( sal_uInt32 nErr )   { nError = nErr; }
+    ERRTYPE()				 { nError = ERR_OK; }
+    ERRTYPE( sal_uInt32 nErr )	 { nError = nErr; }
     ERRTYPE( const ERRTYPE & rErr ) { nError = rErr.nError; };
     ERRTYPE& operator = ( const ERRTYPE & rError );
     operator  sal_uInt32() const { return( nError ); }
-    BOOL IsError() const     { return( nError <= ERR_ERROREND ); }
-    BOOL IsOk() const        { return( !IsError() ); }
-    BOOL IsWarning() const   {
+    BOOL IsError() const	 { return( nError <= ERR_ERROREND ); }
+    BOOL IsOk() const		 { return( !IsError() ); }
+    BOOL IsWarning() const	 {
         return( nError >= ERR_WARNINGSTART && nError <= ERR_WARNINGEND );
     };
-    void    Clear(){ nError = ERR_OK; }
+    void	Clear(){ nError = ERR_OK; }
 };
 
 /****************** R s c E r r o r **************************************/
@@ -126,7 +126,7 @@ enum RscVerbosity
 
 class RscError
 {
-    FILE *  fListing;
+    FILE *	fListing;
     RscVerbosity m_verbosity;
 
     void WriteError( const ERRTYPE& rError, const char * pMessage );
@@ -135,27 +135,27 @@ class RscError
     void ErrorFormat( const ERRTYPE& rError, RscTop * pClass,
                       const RscId & aId );
 public:
-    sal_uInt32  nErrors;// Anzahl der Fehler
+    sal_uInt32	nErrors;// Anzahl der Fehler
                     RscError( RscVerbosity _verbosity ) {
                         fListing = NULL;
                         nErrors = 0;
                         m_verbosity = _verbosity;
                     };
-    void            SetListFile( FILE * fList ){
+    void			SetListFile( FILE * fList ){
                         fListing = fList;
                     };
-    FILE *          GetListFile(){
+    FILE *			GetListFile(){
                         return fListing;
                     };
     RscVerbosity    GetVerbosity() const { return m_verbosity; }
-    virtual void    StdOut( const char *, const RscVerbosity _verbosityLevel = RscVerbosityNormal );
-    virtual void    StdErr( const char * );
-    virtual void    LstOut( const char * );
-    virtual void    Error( const ERRTYPE& rError, RscTop* pClass, const RscId &aId,
+    virtual void	StdOut( const char *, const RscVerbosity _verbosityLevel = RscVerbosityNormal );
+    virtual void	StdErr( const char * );
+    virtual void	LstOut( const char * );
+    virtual void	Error( const ERRTYPE& rError, RscTop* pClass, const RscId &aId,
                            const char * pMessage = NULL );
     // Dieser Fehler sollte nur im Compilermodus auftreten,
     // das Programm wird mit exit() verlassen
-    virtual void    FatalError( const ERRTYPE& rError, const RscId &aId,
+    virtual void	FatalError( const ERRTYPE& rError, const RscId &aId,
                                 const char * pMessage = NULL );
 };
 
diff --git a/rsc/inc/rscflag.hxx b/rsc/inc/rscflag.hxx
index d517e0e0d2b3..61d0ca7c83c5 100644
--- a/rsc/inc/rscflag.hxx
+++ b/rsc/inc/rscflag.hxx
@@ -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
@@ -46,7 +46,7 @@ public:
                                   BOOL bOwnClass, Atom nConsId );
     sal_uInt32          Size();
 
-    virtual void    SetToDefault( const RSCINST & rInst );
+    virtual void	SetToDefault( const RSCINST & rInst );
     BOOL            IsDefault( const RSCINST & rInst );
     BOOL            IsDefault( const RSCINST & rInst, Atom nConstId );
 
diff --git a/rsc/inc/rschash.hxx b/rsc/inc/rschash.hxx
index bb8b4670b11b..617295ba9f0c 100644
--- a/rsc/inc/rschash.hxx
+++ b/rsc/inc/rschash.hxx
@@ -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
@@ -40,14 +40,14 @@ class AtomContainer
     Atom m_nNextID;
     std::hash_map< rtl::OString, Atom, rtl::OStringHash > m_aStringToID;
     std::hash_map< Atom, rtl::OString > m_aIDToString;
-
+    
     public:
     AtomContainer();
     ~AtomContainer();
-
+    
     Atom getID( const rtl::OString& rStr, bool bOnlyIfExists = false );
-    const rtl::OString& getString( Atom nAtom );
-
+    const rtl::OString& getString( Atom nAtom ); 
+    
 };
 
 #endif // _RSCHASH_HXX
diff --git a/rsc/inc/rscinst.hxx b/rsc/inc/rscinst.hxx
index 6cdfac1173e7..ae809b62635f 100644
--- a/rsc/inc/rscinst.hxx
+++ b/rsc/inc/rscinst.hxx
@@ -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
@@ -31,7 +31,7 @@
 #include <rscerror.h>
 #include <rsctools.hxx>
 
-/******************* C l a s s e s   F o r w a r d s *********************/
+/******************* C l a s s e s	 F o r w a r d s *********************/
 class RscTypCont;
 class RscCmdLine;
 class REResourceList;
@@ -39,7 +39,7 @@ class RscTop;
 class RscInstCopy;
 
 /******************* F u n c t i o n   F o r w a r d s *******************/
-Atom HashId( const char * );          // Gibt zu einem String eine HashId
+Atom HashId( const char * );		  // Gibt zu einem String eine HashId
 const char * GetHashString( Atom ); // Gibt zu einer Atom einen String
                                       // NULL, wenn kein Eintrag vorhanden
 
@@ -48,81 +48,81 @@ const char * GetHashString( Atom ); // Gibt zu einer Atom einen String
 /****************** C L A S S E S ****************************************/
 class RscInst
 {
-    void            MakeCopy( RSCINST aCopyInst );
-    static RSCINST  GetSysLangInst( RSCINST & rInst );
+    void			MakeCopy( RSCINST aCopyInst );
+    static RSCINST	GetSysLangInst( RSCINST & rInst );
 public:
-    RSCINST     aInst;
+    RSCINST 	aInst;
 
                 RscInst();
                 RscInst( const RscInst & rInst );
                 RscInst( RSCINST aTmpI );
-    RscInst&    operator =  ( const RscInst& rRscInst );
+    RscInst&	operator =	( const RscInst& rRscInst );
                 ~RscInst();
-    void        OverWrite( RscInstCopy & rInst );
-    BOOL        IsInst() const { return( aInst.IsInst() ); }
+    void		OverWrite( RscInstCopy & rInst );
+    BOOL		IsInst() const { return( aInst.IsInst() ); }
 
                 // Listen Methoden
-    ERRTYPE     SetElement( const RscId & rName, RscInstCopy & rInst );
-    ERRTYPE     SetPosEle( sal_uInt32 nPos, RscInstCopy & rInst );
-    ERRTYPE     SetPosRscId( sal_uInt32 nPos, const RscId & rId );
-    SUBINFO_STRUCT  GetInfoEle( sal_uInt32 nPos );
-    sal_uInt32      GetCount();
-    RscInst     GetElement( RscTop * pClass, const RscId & rName );
-    RscInst     GetPosEle( sal_uInt32 nPos );
-    ERRTYPE     MovePosEle( sal_uInt32 nDestPos, sal_uInt32 nSourcePos );
-    ERRTYPE     DeleteElement( RscTop * pClass, const RscId & rName );
-    ERRTYPE     DeletePosEle( sal_uInt32 nPos );
-
-    ERRTYPE     SetVar( Atom nVarName, RscInstCopy & rInst );
-    ERRTYPE     SetConst( Atom nVarName, Atom nConstId );
-    ERRTYPE     SetBool( Atom nVarName, BOOL );
+    ERRTYPE 	SetElement( const RscId & rName, RscInstCopy & rInst );
+    ERRTYPE 	SetPosEle( sal_uInt32 nPos, RscInstCopy & rInst );
+    ERRTYPE 	SetPosRscId( sal_uInt32 nPos, const RscId & rId );
+    SUBINFO_STRUCT	GetInfoEle( sal_uInt32 nPos );
+    sal_uInt32		GetCount();
+    RscInst 	GetElement( RscTop * pClass, const RscId & rName );
+    RscInst 	GetPosEle( sal_uInt32 nPos );
+    ERRTYPE 	MovePosEle( sal_uInt32 nDestPos, sal_uInt32 nSourcePos );
+    ERRTYPE 	DeleteElement( RscTop * pClass, const RscId & rName );
+    ERRTYPE 	DeletePosEle( sal_uInt32 nPos );
+
+    ERRTYPE 	SetVar( Atom nVarName, RscInstCopy & rInst );
+    ERRTYPE 	SetConst( Atom nVarName, Atom nConstId );
+    ERRTYPE 	SetBool( Atom nVarName, BOOL );
 
     // Hack fuer X, Y, Width, Height
     static ERRTYPE SetCorrectValues( RSCINST & rInst, RSCINST & rVarInst,
                                     INT32 lValue, sal_uInt32 nTupelIdx );
-    ERRTYPE     SetNumber( Atom nVarName, INT32 );
+    ERRTYPE 	SetNumber( Atom nVarName, INT32 );
 
-    ERRTYPE     SetString( Atom nVarName, const char * );
-    ERRTYPE     SetConst( Atom nConstId );
-    ERRTYPE     SetBool( BOOL );
-    ERRTYPE     SetNumber( INT32 );
-    ERRTYPE     SetString( const char * );
-    ERRTYPE     SetRef( const RscId & rRscId );
-    ERRTYPE     SetDefault( Atom nVarName );
+    ERRTYPE 	SetString( Atom nVarName, const char * );
+    ERRTYPE 	SetConst( Atom nConstId );
+    ERRTYPE 	SetBool( BOOL );
+    ERRTYPE 	SetNumber( INT32 );
+    ERRTYPE 	SetString( const char * );
+    ERRTYPE 	SetRef( const RscId & rRscId );
+    ERRTYPE 	SetDefault( Atom nVarName );
 
-    RscInst     GetVar( Atom nVarName );
-    Atom        GetConst( Atom nVarName = InvalidAtom );
-    sal_uInt32      GetConstPos( Atom nVarName = InvalidAtom );
-    BOOL        GetBool( Atom nVarName = InvalidAtom );
+    RscInst 	GetVar( Atom nVarName );
+    Atom		GetConst( Atom nVarName = InvalidAtom );
+    sal_uInt32		GetConstPos( Atom nVarName = InvalidAtom );
+    BOOL		GetBool( Atom nVarName = InvalidAtom );
 
     // Hack fuer X, Y, Width, Height
     static INT32 GetCorrectValues( RSCINST & rInst, RSCINST & rVarInst,
                                     sal_uInt32 nTupelIdx );
-    INT32       GetNumber( Atom nVarName = InvalidAtom );
+    INT32		GetNumber( Atom nVarName = InvalidAtom );
 
     const char *GetString( Atom nVarName = InvalidAtom );
-    RscId       GetRef();
-    BOOL        IsDefault( Atom nVarName );
-    BOOL        IsConsistent( RscInconsList * pList );
-
-    Atom        GetClassEnum( Atom nVarName, sal_uInt32 nPos );
-    Atom        GetClassEnum( sal_uInt32 nPos );
-    RscTop *    GetClassType(){ return aInst.pClass; };
-    Atom        GetClassName();
-    void        EnumClassVariables( void * pData, VarEnumCallbackProc ) const;
-    ERRTYPE     WriteRc( RscWriteRc & aMem );
+    RscId		GetRef();
+    BOOL		IsDefault( Atom nVarName );
+    BOOL		IsConsistent( RscInconsList * pList );
+
+    Atom		GetClassEnum( Atom nVarName, sal_uInt32 nPos );
+    Atom		GetClassEnum( sal_uInt32 nPos );
+    RscTop *	GetClassType(){ return aInst.pClass; };
+    Atom		GetClassName();
+    void		EnumClassVariables( void * pData, VarEnumCallbackProc ) const;
+    ERRTYPE 	WriteRc( RscWriteRc & aMem );
 };
 
 class RscInstCopy : public RscInst {
-    void        MakeCopy( RSCINST aCopyInst );
+    void		MakeCopy( RSCINST aCopyInst );
 public:
                 RscInstCopy();
                 RscInstCopy( const RscInstCopy & rInst );
                 RscInstCopy( const RscInst & rInst );
                 RscInstCopy( RSCINST aTmpI );
                 RscInstCopy( RscTop * pNewType, const RscInst & rInst );
-    RscInstCopy&    operator =  ( const RscInstCopy & rRscInst );
-    RscInstCopy&    operator =  ( const RscInst & rRscInst );
+    RscInstCopy&	operator =	( const RscInstCopy & rRscInst );
+    RscInstCopy&	operator =	( const RscInst & rRscInst );
                 ~RscInstCopy();
 };
 
@@ -132,44 +132,44 @@ friend class RscHrc;
 friend class RscSrc;
 friend class RscInst;
 
-    RscCmdLine  * pCmdLine;
-    RscTypCont  * pTC;
+    RscCmdLine	* pCmdLine;
+    RscTypCont	* pTC;
     LanguageType   nLangType;
 public:
                 RscDataBase( RscError * );
                 ~RscDataBase();
 
-//  void        SetLanguage( LanguageType nTyp ) { nLangType = nTyp; }
-    void        SetLanguage( Atom nId );
-    Atom        GetLanguage() const;
+//	void		SetLanguage( LanguageType nTyp ) { nLangType = nTyp; }
+    void		SetLanguage( Atom nId );
+    Atom		GetLanguage() const;
 
-    ByteString  GetPath() const;
-    void        SetPath( const ByteString & rPath );
+    ByteString	GetPath() const;
+    void		SetPath( const ByteString & rPath );
                 // Konvertiert einen Namen in einen Typ
-    RscTop*     GetClassType( Atom nClassName );
+    RscTop* 	GetClassType( Atom nClassName );
                 // Instanz einer Klasse erzeugen
-    BOOL        MakeConsistent( RscInconsList * pList );
+    BOOL		MakeConsistent( RscInconsList * pList );
                 // Array mit Dateinamen
     RscFileTab* GetFileTab();
                 // Eine Dateinamen-Instanz holen
-    RscFile *   GetFileStruct( ULONG lKey );
+    RscFile *	GetFileStruct( ULONG lKey );
 
-    ULONG       AddSrcFile( const ByteString & rFileName );
-    ULONG       AddHrcFile( const ByteString & rFileName );
+    ULONG		AddSrcFile( const ByteString & rFileName );
+    ULONG		AddHrcFile( const ByteString & rFileName );
                 // Traegt die Include-Dateien in die Abhaengigkeitsliste
                 // von lFileKey ein
-    void        ScanForIncFiles( ULONG lFileKey );
-    void        RemoveFile( ULONG lKey );
+    void		ScanForIncFiles( ULONG lFileKey );
+    void		RemoveFile( ULONG lKey );
 
                 // Suche ueber alle DEFINES
     RscDefine * FindDef( const ByteString & rName );
-    ULONG       GetFileKey( const ByteString & rFileName );
+    ULONG		GetFileKey( const ByteString & rFileName );
 };
 
 class RscHrc
 {
 protected:
-    ULONG         lFileKey; // Index der Instanz
+    ULONG		  lFileKey; // Index der Instanz
     RscDataBase * pDataBase;// Datenbasis
 public:
 
@@ -178,43 +178,43 @@ public:
                 ~RscHrc();
 
                 // Daten von Datei uebernehmen
-    ERRTYPE     ReadFile();
+    ERRTYPE 	ReadFile();
 
-    ULONG       GetFileKey() const { return lFileKey; }
+    ULONG		GetFileKey() const { return lFileKey; }
 
-    void        SetDirty( BOOL bSet );
-    BOOL        IsDirty();
-    void        SetPathName( const ByteString & );
-    ByteString  GetPathName();
-    void        SetFileName( const ByteString & );
-    ByteString  GetFileName();
+    void		SetDirty( BOOL bSet );
+    BOOL		IsDirty();
+    void		SetPathName( const ByteString & );
+    ByteString	GetPathName();
+    void		SetFileName( const ByteString & );
+    ByteString	GetFileName();
 
                 //Depend-Datei anhaengen
-    void        InsertDepend( ULONG lKey, ULONG lPos );
+    void		InsertDepend( ULONG lKey, ULONG lPos );
 
                 // DefineList holen
     RscDefineList * GetDefineList();
                 // Suche ueber all DEFINES im Zugriff
     RscDefine * FindDef( const ByteString & rName );
-    ERRTYPE     NewDef( const ByteString & rMacroName, INT32 lValue,
+    ERRTYPE 	NewDef( const ByteString & rMacroName, INT32 lValue,
                         ULONG lPos );
-    ERRTYPE     NewDef( const ByteString & rMacroName, const ByteString & rMacro,
+    ERRTYPE 	NewDef( const ByteString & rMacroName, const ByteString & rMacro,
                         ULONG lPos );
-    ERRTYPE     ChangeDef( const ByteString & rMacroName, INT32 lValue );
-    ERRTYPE     ChangeDef( const ByteString & rMacroName,
+    ERRTYPE 	ChangeDef( const ByteString & rMacroName, INT32 lValue );
+    ERRTYPE 	ChangeDef( const ByteString & rMacroName,
                            const ByteString & rMacro );
-    BOOL        IsDefUsed( const ByteString & );
-    void        DeleteDef( const ByteString & rMacroName );
-    ERRTYPE     ChangeDefName( const ByteString & rMacroName,
+    BOOL		IsDefUsed( const ByteString & );
+    void		DeleteDef( const ByteString & rMacroName );
+    ERRTYPE 	ChangeDefName( const ByteString & rMacroName,
                                const ByteString & rNewName );
 
                 // Dateinamen-Instanz holen
-    RscFile *   GetFileStruct();
+    RscFile *	GetFileStruct();
                 //Abhaengigkeitsliste holen holen
     RscDependList *   GetDependList();
 
                 // Datei schreiben
-    ERRTYPE     WriteFile();
+    ERRTYPE 	WriteFile();
 };
 
 class RscSrc : public RscHrc {
@@ -226,7 +226,7 @@ public:
 
     RscInstCopy CreateRscInst( RscTop * pClass );
                 // Instanz loeschen
-    ERRTYPE     DeleteRscInst( RscTop * pClass, const RscId & rInstName );
+    ERRTYPE 	DeleteRscInst( RscTop * pClass, const RscId & rInstName );
                 // Datenbasis nach Define Veraenderung wiederherstellen
     //Instanz global zur Verfuegung stellen
     ERRTYPE SetRscInst( const RscId & rInstName, RscInstCopy & );
@@ -234,11 +234,11 @@ public:
     RscInst GetRscInst( RscTop* pClass, const RscId & rInstName );
 
     // Namen und Identifier Liste fuellen
-    void    FillNameIdList( REResourceList * pList );
+    void	FillNameIdList( REResourceList * pList );
 
             // C++ Resourcekonstruktor schreiben
     ERRTYPE WriteCxxFile( const ByteString &, const ByteString & rHxxName );
-    ERRTYPE WriteHxxFile( const ByteString & );     // C++ Klasskopf schreiben
+    ERRTYPE WriteHxxFile( const ByteString & ); 	// C++ Klasskopf schreiben
 };
 
 #endif //_RSCINST_HXX
diff --git a/rsc/inc/rsckey.hxx b/rsc/inc/rsckey.hxx
index 717be1009154..57cb912eb49a 100644
--- a/rsc/inc/rsckey.hxx
+++ b/rsc/inc/rsckey.hxx
@@ -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
diff --git a/rsc/inc/rsclst.hxx b/rsc/inc/rsclst.hxx
index 89e4bfda2402..f6e436fbc8f8 100644
--- a/rsc/inc/rsclst.hxx
+++ b/rsc/inc/rsclst.hxx
@@ -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
@@ -41,27 +41,27 @@ class REResourceList : public RESubResourceList
 {
 protected:
     REResourceList*  pParent;
-    RscId            aRscId;    //Id und Name des Resourceobjektes
-    ByteString       aClassName;
-    BOOL             bVisible;
+    RscId			 aRscId;	//Id und Name des Resourceobjektes
+    ByteString		 aClassName;
+    BOOL			 bVisible;
 
 public:
                      REResourceList();
                      REResourceList( REResourceList * pParentList,
                                      ByteString& rClassName,
                                      const RscId & rResourceID,
-                                     BOOL   bVisible = FALSE );
+                                     BOOL	bVisible = FALSE );
                      ~REResourceList();
 
-    REResourceList*  GetParent()     { return pParent; }
-    ByteString       GetObjName()    { return aRscId.GetName(); }
-    ByteString       GetClassName()  { return aClassName; }
-    RscId            GetRscId()      { return aRscId; }
-    void             SetRscId( const RscId & rId ){ aRscId = rId; }
+    REResourceList*  GetParent()	 { return pParent; }
+    ByteString		 GetObjName()	 { return aRscId.GetName(); }
+    ByteString		 GetClassName()  { return aClassName; }
+    RscId			 GetRscId() 	 { return aRscId; }
+    void			 SetRscId( const RscId & rId ){ aRscId = rId; }
 
-    void             SetVisible( BOOL bVis )
+    void			 SetVisible( BOOL bVis )
                                      { bVisible = bVis; }
-    BOOL             IsVisible()     { return bVisible; }
+    BOOL			 IsVisible()	 { return bVisible; }
 };
 
 #endif // _RSCLST_HXX
diff --git a/rsc/inc/rscmgr.hxx b/rsc/inc/rscmgr.hxx
index b8c0e43031ee..a6bac40a3cb1 100644
--- a/rsc/inc/rscmgr.hxx
+++ b/rsc/inc/rscmgr.hxx
@@ -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
@@ -41,11 +41,11 @@ class RscMgr : public RscClass {
         void Create(){ aRefId.Create(); bDflt = TRUE; }
         void Destroy(){ aRefId.Destroy(); }
     };
-    ERRTYPE         IsToDeep( const RSCINST & rInst, sal_uInt32 nDeep = 0 );
+    ERRTYPE			IsToDeep( const RSCINST & rInst, sal_uInt32 nDeep = 0 );
 public:
                     RscMgr( Atom nId, sal_uInt32 nTypId, RscTop * pSuperCl );
 
-    void            SetToDefault( const RSCINST & rInst );
+    void			SetToDefault( const RSCINST & rInst );
     BOOL            IsDefault( const RSCINST & rInst );
     BOOL            IsValueDefault( const RSCINST & rInst, CLASS_DATA pDef );
 
@@ -71,7 +71,7 @@ public:
                                     RscTypCont * pTC, const RscId & rId );
     ERRTYPE         WriteCxx( const RSCINST & rInst, FILE * fOutput,
                               RscTypCont * pTC, const RscId & rId );
-    BOOL            IsConsistent( const RSCINST & rInst,
+    BOOL    		IsConsistent( const RSCINST & rInst,
                                   RscInconsList * pList = NULL );
     ERRTYPE         GetRef( const RSCINST & rInst, RscId * );
     ERRTYPE         SetRef( const RSCINST & rInst, const RscId & rRefId );
diff --git a/rsc/inc/rscpar.hxx b/rsc/inc/rscpar.hxx
index 989ec924550c..82fc398c1b11 100644
--- a/rsc/inc/rscpar.hxx
+++ b/rsc/inc/rscpar.hxx
@@ -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
@@ -35,53 +35,53 @@ class RscTypCont;
 class RscExpression;
 /*********** R s c F i l e I n s t ***************************************/
 
-#define READBUFFER_MAX  256
+#define READBUFFER_MAX	256
 class RscFileInst
 {
-    ERRTYPE             aFirstError;// Erster Fehler
-    sal_uInt32              nErrorLine; // Zeile des ersten Fehlers
-    sal_uInt32              nErrorPos;  // Position des ersten Fehlers
-    BOOL                bIncLine;   // Muss Zeilennummer incrementiert werden
-    sal_uInt32              nLineNo;    // Zeile in der Eingabedatei
-    ULONG               lFileIndex; // Index auf Eingabedatei
-    ULONG               lSrcIndex;  // Index auf Basisdatei
-    FILE *              fInputFile; // Eingabedatei
-    char *              pInput;     // Lesepuffer
-    sal_uInt32              nInputBufLen; // Laenge des Lesepuffers
-    sal_uInt32              nInputPos;  // Position im Lesepuffer
-    sal_uInt32              nInputEndPos;// Ende im Lesepuffer
-    char *              pLine;      // Zeile
-    sal_uInt32              nLineBufLen;//Lange des Zeilenpuffres
-    sal_uInt32              nScanPos;   // Position in der Zeile
-    int                 cLastChar;
-    BOOL                bEof;
+    ERRTYPE 			aFirstError;// Erster Fehler
+    sal_uInt32				nErrorLine; // Zeile des ersten Fehlers
+    sal_uInt32				nErrorPos;	// Position des ersten Fehlers
+    BOOL				bIncLine;	// Muss Zeilennummer incrementiert werden
+    sal_uInt32				nLineNo;	// Zeile in der Eingabedatei
+    ULONG				lFileIndex; // Index auf Eingabedatei
+    ULONG				lSrcIndex;	// Index auf Basisdatei
+    FILE *				fInputFile; // Eingabedatei
+    char *				pInput; 	// Lesepuffer
+    sal_uInt32				nInputBufLen; // Laenge des Lesepuffers
+    sal_uInt32				nInputPos;	// Position im Lesepuffer
+    sal_uInt32				nInputEndPos;// Ende im Lesepuffer
+    char *				pLine;		// Zeile
+    sal_uInt32				nLineBufLen;//Lange des Zeilenpuffres
+    sal_uInt32				nScanPos;	// Position in der Zeile
+    int 				cLastChar;
+    BOOL				bEof;
 
 public:
-    RscTypCont *        pTypCont;
-    void    Init();  // ctor initialisieren
+    RscTypCont *		pTypCont;
+    void	Init();  // ctor initialisieren
             RscFileInst( RscTypCont * pTC, ULONG lIndexSrc,
                          ULONG lFileIndex, FILE * fFile );
             RscFileInst( RscTypCont * pTC, ULONG lIndexSrc,
                          ULONG lFileIndex, const ByteString & );
             ~RscFileInst();
-    BOOL    IsEof() const { return bEof; }
-    void    SetFileIndex( ULONG lFIndex ) { lFileIndex = lFIndex;  }
-    ULONG   GetFileIndex()                { return( lFileIndex );  }
-    ULONG   GetSrcIndex()                 { return( lSrcIndex );   }
-    void    SetLineNo( sal_uInt32 nLine )     { nLineNo = nLine;       }
-    sal_uInt32  GetLineNo()                   { return( nLineNo );     }
-    sal_uInt32  GetScanPos()                  { return( nScanPos );    }
-    char *  GetLine()                     { return( pLine );       }
-    int     GetChar();
-    int     GetFastChar() { return pLine[ nScanPos ] ?
+    BOOL	IsEof() const { return bEof; }
+    void	SetFileIndex( ULONG lFIndex ) { lFileIndex = lFIndex;  }
+    ULONG	GetFileIndex()				  { return( lFileIndex );  }
+    ULONG	GetSrcIndex()				  { return( lSrcIndex );   }
+    void	SetLineNo( sal_uInt32 nLine )	  { nLineNo = nLine;	   }
+    sal_uInt32	GetLineNo() 				  { return( nLineNo );	   }
+    sal_uInt32	GetScanPos()				  { return( nScanPos );    }
+    char *	GetLine()					  { return( pLine );	   }
+    int 	GetChar();
+    int 	GetFastChar() { return pLine[ nScanPos ] ?
                                 pLine[ nScanPos++ ] : GetChar();
                           }
-    void    GetNewLine();
+    void	GetNewLine();
             // Fehlerbehandlung
-    void    SetError( ERRTYPE aError );
-    ERRTYPE GetError()                    { return aFirstError;    }
-    sal_uInt32  GetErrorLine()                { return nErrorLine;     }
-    sal_uInt32  GetErrorPos()                 { return nErrorPos;      }
+    void	SetError( ERRTYPE aError );
+    ERRTYPE GetError()					  { return aFirstError;    }
+    sal_uInt32	GetErrorLine()				  { return nErrorLine;	   }
+    sal_uInt32	GetErrorPos()				  { return nErrorPos;	   }
 };
 
 /******************* F u n c t i o n *************************************/
diff --git a/rsc/inc/rscrange.hxx b/rsc/inc/rscrange.hxx
index 96559037e51f..066c112a0011 100644
--- a/rsc/inc/rscrange.hxx
+++ b/rsc/inc/rscrange.hxx
@@ -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
@@ -68,7 +68,7 @@ public:
                               RscTypCont * pTC, sal_uInt32 nTab, const char * );
     ERRTYPE         WriteRc( const RSCINST &, RscWriteRc & aMem,
                              RscTypCont * pTC, sal_uInt32, BOOL bExtra );
-    void            WriteRcAccess( FILE * fOutput, RscTypCont * pTC,
+    void			WriteRcAccess( FILE * fOutput, RscTypCont * pTC,
                                     const char * );
 };
 
@@ -109,7 +109,7 @@ public:
                               RscTypCont * pTC, sal_uInt32 nTab, const char * );
     ERRTYPE         WriteRc( const RSCINST &, RscWriteRc & aMem,
                              RscTypCont * pTC, sal_uInt32, BOOL bExtra );
-    void            WriteRcAccess( FILE * fOutput, RscTypCont * pTC,
+    void			WriteRcAccess( FILE * fOutput, RscTypCont * pTC,
                                     const char * );
 
 };
@@ -164,7 +164,7 @@ public:
     ERRTYPE         WriteRc( const RSCINST &, RscWriteRc & aMem,
                              RscTypCont * pTC, sal_uInt32, BOOL bExtra );
     BOOL            IsConsistent( const RSCINST & rInst, RscInconsList * pList );
-    void            WriteRcAccess( FILE * fOutput, RscTypCont * pTC,
+    void			WriteRcAccess( FILE * fOutput, RscTypCont * pTC,
                                     const char * );
 
 };
@@ -190,7 +190,7 @@ public:
                     };
     void            WriteSrc( const RSCINST &, FILE * fOutput,
                               RscTypCont * pTC, sal_uInt32 nTab, const char * );
-    void            WriteRcAccess( FILE * fOutput, RscTypCont * pTC,
+    void			WriteRcAccess( FILE * fOutput, RscTypCont * pTC,
                                     const char * );
 
 };
diff --git a/rsc/inc/rscrsc.hxx b/rsc/inc/rscrsc.hxx
index c2b0a70a1b66..7e8190911a59 100644
--- a/rsc/inc/rscrsc.hxx
+++ b/rsc/inc/rscrsc.hxx
@@ -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
@@ -44,49 +44,49 @@ class DirEntry;
 
 /****************** T Y P E S ********************************************/
 
-#define MAX_INPUTFILES  100
-#define MAX_SYMBOLS     10
-#define MAX_INCLUDES    10
+#define MAX_INPUTFILES	100
+#define MAX_SYMBOLS 	10
+#define MAX_INCLUDES	10
 
 /****************** R s c C m d L i n e **********************************/
 class RscCmdLine
 {
-    void        Init();
+    void		Init();
 
 public:
-
-    RscStrList          aInputList;     // Liste der Quelldateien
-    RscStrList          aSymbolList;    // Liste der Symbole
-    ByteString          aPath;          // Liste der Pfade
-    RSCBYTEORDER_TYPE   nByteOrder;
-    unsigned short      nCommands;      // Steuerbits
-    ByteString          aOutputLst;     // Name der List-Ausgabedatei
-    ByteString          aOutputSrs;     // Name der Srs-Ausgabedatei
-    ByteString          aOutputSrc;     // Name der Src-Ausgabedatei
-    ByteString          aOutputRcCtor;  // Name der Ctor-Ausgabedatei
-    ByteString          aOutputCxx;     // Name der Cxx-Ausgabedatei
-    ByteString          aOutputHxx;     // Name der Hxx-Ausgabedatei
-    ByteString          aTouchFile;     // create this file when done in rsc2
-    ByteString          aILDir;
+    
+    RscStrList			aInputList; 	// Liste der Quelldateien
+    RscStrList			aSymbolList;	// Liste der Symbole
+    ByteString			aPath;		    // Liste der Pfade
+    RSCBYTEORDER_TYPE	nByteOrder;
+    unsigned short		nCommands;		// Steuerbits
+    ByteString			aOutputLst; 	// Name der List-Ausgabedatei
+    ByteString			aOutputSrs; 	// Name der Srs-Ausgabedatei
+    ByteString			aOutputSrc; 	// Name der Src-Ausgabedatei
+    ByteString			aOutputRcCtor;	// Name der Ctor-Ausgabedatei
+    ByteString			aOutputCxx; 	// Name der Cxx-Ausgabedatei
+    ByteString			aOutputHxx; 	// Name der Hxx-Ausgabedatei
+    ByteString			aTouchFile;		// create this file when done in rsc2
+    ByteString			aILDir;
 
     struct OutputFile
     {
-        ByteString                   aLangName;         // language name
-        ByteString                   aOutputRc;         // target file
-        ByteString                   aLangSearchPath;   // language specific search path
-        ::std::list< ByteString >    aSysSearchDirs;    // pathes to search for images
-
+        ByteString			         aLangName;			// language name
+        ByteString			         aOutputRc;			// target file
+        ByteString			         aLangSearchPath;	// language specific search path
+        ::std::list< ByteString >    aSysSearchDirs;    // pathes to search for images         
+        
         OutputFile() {}
     };
-
-    std::list<OutputFile>                                   m_aOutputFiles;
+    
+    std::list<OutputFile>						            m_aOutputFiles;
     std::list< std::pair< rtl::OString, rtl::OString > >    m_aReplacements;
 
                     RscCmdLine( int argc, char ** argv, RscError * pEH );
                     RscCmdLine();
 
                     ~RscCmdLine();
-
+                        
   ::rtl::OString     substitutePaths( const ::rtl::OString& rIn );
 };
 /****************** R s c ************************************************/
@@ -96,43 +96,43 @@ struct WriteRcContext;
 class RscCompiler
 {
 private:
-    RscStrList      aTmpFileList;   // Liste der Tmp-Dateien
-    ByteString      aTmpOutputHxx;  // Name der TempHxx-Ausgabedatei
-    ByteString      aTmpOutputCxx;  // Name der TempCxx-Ausgabedatei
-    ByteString      aTmpOutputRcCtor; // Name der Temp Ctor-Ausgabedatei
-    ByteString      aTmpOutputSrc;  // Name der TempSrc-Ausgabedatei
-
-    void            CreateResFile( const char * pRc );
-    void            Append( const ByteString& rOutputSrs, const ByteString& rTmpFile );
-    void            OpenInput( const ByteString& rInput );
-
-    bool            GetImageFilePath( const RscCmdLine::OutputFile& rOutputFile,
+    RscStrList		aTmpFileList;	// Liste der Tmp-Dateien
+    ByteString		aTmpOutputHxx;	// Name der TempHxx-Ausgabedatei
+    ByteString		aTmpOutputCxx;	// Name der TempCxx-Ausgabedatei
+    ByteString		aTmpOutputRcCtor; // Name der Temp Ctor-Ausgabedatei
+    ByteString		aTmpOutputSrc;	// Name der TempSrc-Ausgabedatei
+
+    void			CreateResFile( const char * pRc );
+    void			Append( const ByteString& rOutputSrs, const ByteString& rTmpFile );
+    void			OpenInput( const ByteString& rInput );
+    
+    bool 			GetImageFilePath( const RscCmdLine::OutputFile& rOutputFile,
                                        const WriteRcContext& rContext,
-                                    const ByteString& rBaseFileName,
+                                    const ByteString& rBaseFileName, 
                                     ByteString& rImagePath,
                                     FILE* pSysListFile );
-    void            PreprocessSrsFile( const RscCmdLine::OutputFile& rOutputFile,
+    void			PreprocessSrsFile( const RscCmdLine::OutputFile& rOutputFile,
                                           const WriteRcContext& rContext,
-                                         const DirEntry& rSrsInPath,
+                                         const DirEntry& rSrsInPath, 
                                          const DirEntry& rSrsOutPath );
 
 public:
-    RscTypCont*     pTC;        // String und Id-Verwalter
-    RscCmdLine*     pCL;        // Kommandozeile
-    FILE *          fListing;   // Ausgabedatei fuer Listings
-    FILE *          fExitFile;  // bei Abbruch muss diese Datei geschlossen werden
+    RscTypCont* 	pTC;		// String und Id-Verwalter
+    RscCmdLine* 	pCL;		// Kommandozeile
+    FILE *			fListing;	// Ausgabedatei fuer Listings
+    FILE *			fExitFile;	// bei Abbruch muss diese Datei geschlossen werden
 
                     RscCompiler( RscCmdLine *, RscTypCont * );
                     ~RscCompiler();
 
-    ERRTYPE         Start();
-    ByteString      GetTmpFileName();   // Die Dateien werden geloescht
+    ERRTYPE 		Start();
+    ByteString		GetTmpFileName();	// Die Dateien werden geloescht
 
                     // Include Statements lesen
-    ERRTYPE         IncludeParser( ULONG lFileKey );
-    ERRTYPE         ParseOneFile( ULONG lFileKey, const RscCmdLine::OutputFile* pOutputFile, const WriteRcContext* pContext );
-    ERRTYPE         Link();
-    void            EndCompile();
+    ERRTYPE 		IncludeParser( ULONG lFileKey );
+    ERRTYPE 		ParseOneFile( ULONG lFileKey, const RscCmdLine::OutputFile* pOutputFile, const WriteRcContext* pContext );
+    ERRTYPE 		Link();
+    void			EndCompile();
 };
 
 #endif //_RSCRSC_HXX
diff --git a/rsc/inc/rscsfx.hxx b/rsc/inc/rscsfx.hxx
index 830bbcf37baa..c04b38ed0787 100644
--- a/rsc/inc/rscsfx.hxx
+++ b/rsc/inc/rscsfx.hxx
@@ -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
@@ -27,13 +27,13 @@
 #ifndef _RSCSFX_HXX
 #define _RSCSFX_HXX
 
-// StarView     (RSC_NOTYPE) bis (RSC_NOTYPE + 0x190)
-// Sfx          (RSC_NOTYPE + 0x200) bis (RSC_NOTYPE + 0x20F)
+// StarView 	(RSC_NOTYPE) bis (RSC_NOTYPE + 0x190)
+// Sfx 			(RSC_NOTYPE + 0x200) bis (RSC_NOTYPE + 0x20F)
 #define RSC_SFX_STYLE_FAMILIES     (0x100 + 0x201)
 #define RSC_SFX_STYLE_FAMILY_ITEM  (0x100 + 0x202)
 #define RSC_SFX_SLOT_INFO          (0x100 + 0x203)
-// StarMoney    (RSC_NOTYPE + 0x210) bis (RSC_NOTYPE + 0x22F)
-// Public       (RSC_NOTYPE + 0x300) bis (RSC_NOTYPE + 0x3FF)
+// StarMoney	(RSC_NOTYPE + 0x210) bis (RSC_NOTYPE + 0x22F)
+// Public   	(RSC_NOTYPE + 0x300) bis (RSC_NOTYPE + 0x3FF)
 
 //========== S F X =======================================
 enum SfxStyleFamily { SFX_STYLE_FAMILY_CHAR    = 1,
diff --git a/rsc/inc/rscstr.hxx b/rsc/inc/rscstr.hxx
index 6d32a437b09e..6b993a14449a 100644
--- a/rsc/inc/rscstr.hxx
+++ b/rsc/inc/rscstr.hxx
@@ -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
@@ -41,7 +41,7 @@ class RscString : public RscTop
         BOOL    bDflt;  // Ist Default
         RscId   aRefId; // ReferenzName
     };
-    sal_uInt32  nSize;
+    sal_uInt32	nSize;
 public:
                     RscString( Atom nId, sal_uInt32 nTypId );
     virtual RSCCLASS_TYPE   GetClassType() const;
@@ -54,7 +54,7 @@ public:
                     // Der zulaessige Bereich wird gesetzt
     void            Destroy( const RSCINST & rInst );
     sal_uInt32          Size(){ return nSize; }
-    void            SetToDefault( const RSCINST & rInst )
+    void			SetToDefault( const RSCINST & rInst )
                     {
                         ((RscStringInst*)rInst.pData)->bDflt = TRUE;
                     }
@@ -72,7 +72,7 @@ public:
                               RscTypCont * pTC, sal_uInt32 nTab, const char * );
     ERRTYPE         WriteRc( const RSCINST &, RscWriteRc & aMem,
                              RscTypCont * pTC, sal_uInt32, BOOL bExtra );
-    virtual void    WriteRcAccess( FILE * fOutput, RscTypCont * pTC,
+    virtual void	WriteRcAccess( FILE * fOutput, RscTypCont * pTC,
                                     const char * );
 };
 
diff --git a/rsc/inc/rsctools.hxx b/rsc/inc/rsctools.hxx
index 3a3eff653cd7..86c78a95ae2c 100644
--- a/rsc/inc/rsctools.hxx
+++ b/rsc/inc/rsctools.hxx
@@ -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
@@ -44,7 +44,7 @@ enum COMPARE { LESS = -1, EQUAL = 0, GREATER = 1 };
 enum RSCBYTEORDER_TYPE { RSC_BIGENDIAN, RSC_LITTLEENDIAN, RSC_SYSTEMENDIAN };
 
 /******************* M A K R O S *****************************************/
-#define ALIGNED_SIZE( nSize )                               \
+#define ALIGNED_SIZE( nSize )								\
             (nSize + sizeof( void * ) -1) / sizeof( void * ) * sizeof( void * )
 /******************* F u n c t i o n   F o r w a r d s *******************/
 ByteString GetTmpFileName();
@@ -73,38 +73,38 @@ public:
 /****************** R s c P t r P t r ************************************/
 class RscPtrPtr
 {
-    sal_uInt32  nCount;
-    void **         pMem;
+    sal_uInt32	nCount;
+    void ** 		pMem;
 public:
                     RscPtrPtr();
                     ~RscPtrPtr();
-    void            Reset();
-    sal_uInt32  Append( void * );
-    sal_uInt32  Append( char * pStr ){
+    void			Reset();
+    sal_uInt32	Append( void * );
+    sal_uInt32	Append( char * pStr ){
                         return( Append( (void *)pStr ) );
                     };
-    sal_uInt32  GetCount(){ return( nCount ); };
-    void *          GetEntry( sal_uInt32 nEle );
-    void **         GetBlock(){ return( pMem ); };
+    sal_uInt32	GetCount(){ return( nCount ); };
+    void *			GetEntry( sal_uInt32 nEle );
+    void ** 		GetBlock(){ return( pMem ); };
 };
 
 /****************** R s c W r i t e R c **********************************/
 class RscWriteRc
 {
-    sal_uInt32              nLen;
-    BOOL                bSwap;
-    RSCBYTEORDER_TYPE   nByteOrder;
-    char *              pMem;
-    char *              GetPointer( sal_uInt32 nSize );
+    sal_uInt32				nLen;
+    BOOL				bSwap;
+    RSCBYTEORDER_TYPE	nByteOrder;
+    char *				pMem;
+    char *				GetPointer( sal_uInt32 nSize );
 public:
                 RscWriteRc( RSCBYTEORDER_TYPE nOrder = RSC_SYSTEMENDIAN );
                 ~RscWriteRc();
-    sal_uInt32      IncSize( sal_uInt32 nSize );// gibt die vorherige Groesse
-    void *      GetBuffer()
+    sal_uInt32		IncSize( sal_uInt32 nSize );// gibt die vorherige Groesse
+    void *		GetBuffer()
                 {
                     return GetPointer( 0 );
                 }
-    sal_uInt16  GetShort( sal_uInt32 nPos )
+    sal_uInt16	GetShort( sal_uInt32 nPos )
                 {
                     sal_uInt16 nVal = 0;
                     char* pFrom = GetPointer(nPos);
@@ -113,7 +113,7 @@ public:
                     *pTo++ = *pFrom++;
                     return bSwap ? SWAPSHORT( nVal ) : nVal;
                 }
-    sal_uInt32  GetLong( sal_uInt32 nPos )
+    sal_uInt32	GetLong( sal_uInt32 nPos )
                 {
                     sal_uInt32 nVal = 0;
                     char* pFrom = GetPointer(nPos);
@@ -124,14 +124,14 @@ public:
                     *pTo++ = *pFrom++;
                     return bSwap ? SWAPLONG( nVal ) : nVal;
                 }
-    char *      GetUTF8( sal_uInt32 nPos )
+    char *		GetUTF8( sal_uInt32 nPos )
                 {
                     return GetPointer( nPos );
                 }
 
 
     RSCBYTEORDER_TYPE GetByteOrder() const { return nByteOrder; }
-    sal_uInt32      Size(){ return( nLen ); };
+    sal_uInt32		Size(){ return( nLen ); };
     void        Put( sal_uInt64 lVal )
                 {
                     union
@@ -151,7 +151,7 @@ public:
                         Put( aVal32[1] );
                     }
                 }
-    void        Put( sal_Int32 lVal )
+    void		Put( sal_Int32 lVal )
                 {
                     union
                     {
@@ -171,14 +171,14 @@ public:
                         Put( aVal16[1] );
                     }
                 }
-    void        Put( sal_uInt32 nValue )
+    void		Put( sal_uInt32 nValue )
                 { Put( (sal_Int32)nValue ); }
-    void        Put( sal_uInt16 nValue );
-    void        Put( sal_Int16 nValue )
+    void		Put( sal_uInt16 nValue );
+    void		Put( sal_Int16 nValue )
                 { Put( (sal_uInt16)nValue ); }
-    void        PutUTF8( char * pData );
+    void		PutUTF8( char * pData );
 
-    void        PutAt( sal_uInt32 nPos, INT32 lVal )
+    void		PutAt( sal_uInt32 nPos, INT32 lVal )
                 {
                     union
                     {
@@ -202,11 +202,11 @@ public:
                 {
                     PutAt( nPos, (INT32)lVal);
                 }
-    void        PutAt( sal_uInt32 nPos, short nVal )
+    void		PutAt( sal_uInt32 nPos, short nVal )
                 {
                     PutAt( nPos, (sal_uInt16)nVal );
                 }
-    void        PutAt( sal_uInt32 nPos, sal_uInt16 nVal )
+    void		PutAt( sal_uInt32 nPos, sal_uInt16 nVal )
                 {
                     if( bSwap )
                         nVal = SWAPSHORT( nVal );
diff --git a/rsc/inc/rsctop.hxx b/rsc/inc/rsctop.hxx
index 85aa06614574..4a7f1e6c1c67 100644
--- a/rsc/inc/rsctop.hxx
+++ b/rsc/inc/rsctop.hxx
@@ -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
@@ -34,50 +34,50 @@
 
 /****************** T Y P E S ********************************************/
 typedef sal_uInt32 RSCVAR;
-#define VAR_POINTER     0x0001
-#define VAR_HIDDEN      0x0002
-#define VAR_NODATAINST  0x0004
-#define VAR_NORC        0x0008
-#define VAR_SVDYNAMIC   0x0010
-#define VAR_NOENUM      0x0020
-#define VAR_EXTENDABLE  0x0040  /* Auch die Ableitung einer Klasse kann angegeben werden */
+#define VAR_POINTER 	0x0001
+#define VAR_HIDDEN		0x0002
+#define VAR_NODATAINST	0x0004
+#define VAR_NORC		0x0008
+#define VAR_SVDYNAMIC	0x0010
+#define VAR_NOENUM		0x0020
+#define VAR_EXTENDABLE	0x0040	/* Auch die Ableitung einer Klasse kann angegeben werden */
 
 /****************** C L A S S E S ****************************************/
 /******************* R s c C l a s s *************************************/
 class RscTop : public RefNode
 {
-    RscTop *        pSuperClass;
-    RSCINST         aDfltInst;
-    sal_uInt32          nTypId;
-    RscTop *        pRefClass;
+    RscTop *		pSuperClass;
+    RSCINST 		aDfltInst;
+    sal_uInt32			nTypId;
+    RscTop *		pRefClass;
 
 protected:
                     RscTop( Atom nId, sal_uInt32 nTypIdent,
                             RscTop * pSuperCl = NULL );
 
 public:
-    ByteString      aCallPar1;      // Klassenaufruf ohne Typen bis ResId
-    ByteString      aCallPar2;      // Klassenaufruf ohne Typen ab ResId
-    ByteString      aCallParType;   // Klassenaufruf mit Typen
+    ByteString		aCallPar1;		// Klassenaufruf ohne Typen bis ResId
+    ByteString		aCallPar2;		// Klassenaufruf ohne Typen ab ResId
+    ByteString		aCallParType;	// Klassenaufruf mit Typen
 
-            void    SetSuperClass( RscTop * pClass )
+            void	SetSuperClass( RscTop * pClass )
                     {
                         pSuperClass = pClass;
                     }
             RscTop* GetSuperClass() const
                     { return pSuperClass; }
                     // Gibt den Typidentifier zurueck
-            sal_uInt32  GetTypId() const
+            sal_uInt32	GetTypId() const
                     { return nTypId; };
                     // Gibt die Oberklasse zurueck
-            BOOL    InHierarchy( RscTop * pClass );
-            BOOL    IsCodeWriteable() const
+            BOOL	InHierarchy( RscTop * pClass );
+            BOOL	IsCodeWriteable() const
                     {
                         return( 0 != aCallParType.Len() );
                     }
-            void    SetCallPar( const ByteString & rPar1, const ByteString & rPar2,
+            void	SetCallPar( const ByteString & rPar1, const ByteString & rPar2,
                                 const ByteString & rParType );
-            void    SetRefClass( RscTop * pRef ) { pRefClass = pRef; }
+            void	SetRefClass( RscTop * pRef ) { pRefClass = pRef; }
             RscTop* GetRefClass() const { return pRefClass; }
     virtual RSCCLASS_TYPE GetClassType() const = 0;
             RSCINST GetDefault();
@@ -86,14 +86,14 @@ public:
                     // Da die Klassen gegenseitige Abhaengigkeiten
                     // aufweisen koennen, kann man im dtor nicht davon
                     // ausgehen, dass alle Klassenzeiger noch gueltig sind
-    virtual void    Pre_dtor();
+    virtual void	Pre_dtor();
 
-    virtual Atom    GetConstant( sal_uInt32 );
+    virtual Atom	GetConstant( sal_uInt32 );
 
-    virtual RscTop *    GetTypeClass() const;
+    virtual RscTop *	GetTypeClass() const;
 
                     // Gibt die Groesse der Klasse in Bytes
-    virtual sal_uInt32  Size();
+    virtual sal_uInt32	Size();
 
                     // Gibt die Referenz zurueck
     virtual ERRTYPE GetRef( const RSCINST & rInst, RscId * );
@@ -108,7 +108,7 @@ public:
                                  Atom nDataBaseName = InvalidAtom );
 
                     // Zaehlt alle Variablen auf
-    virtual void    EnumVariables( void * pData, VarEnumCallbackProc );
+    virtual void	EnumVariables( void * pData, VarEnumCallbackProc );
 
                     // Liefert Instanz der Variablen zurueck
                     // pData, pClass im return koennen NULL sein
@@ -187,38 +187,38 @@ public:
                             const RSCINST & rDefInst, BOOL bOwnClass = FALSE );
 
                     // Instanz zerstoeren
-    virtual void    Destroy( const RSCINST & rInst );
+    virtual void	Destroy( const RSCINST & rInst );
 
                     // prueft auf konsistenz
-    virtual BOOL    IsConsistent( const RSCINST & rInst,
+    virtual BOOL	IsConsistent( const RSCINST & rInst,
                                   RscInconsList * pList = NULL );
 
                     // Alles auf Default setzen
-    virtual void    SetToDefault( const RSCINST & rInst );
+    virtual void	SetToDefault( const RSCINST & rInst );
 
                     // Ist Eingabe = Default
-    virtual BOOL    IsDefault( const RSCINST & rInst );
+    virtual BOOL	IsDefault( const RSCINST & rInst );
 
                     // Gleiche Werte auf Default setzen
-    virtual BOOL    IsValueDefault( const RSCINST & rInst, CLASS_DATA pDef );
+    virtual BOOL	IsValueDefault( const RSCINST & rInst, CLASS_DATA pDef );
 
                     // Instanz auf Default setzen
-    virtual void    SetDefault( const RSCINST & rInst, Atom nVarId );
+    virtual void	SetDefault( const RSCINST & rInst, Atom nVarId );
 
                     // Default zu einer Variablen holen
     virtual RSCINST GetDefault( Atom nVarId );
 
-    virtual void    Delete( const RSCINST & rInst, RscTop * pClass,
+    virtual void	Delete( const RSCINST & rInst, RscTop * pClass,
                             const RscId & rId );
 
-    virtual void    DeletePos( const RSCINST & rInst, sal_uInt32 nPos );
+    virtual void	DeletePos( const RSCINST & rInst, sal_uInt32 nPos );
 
                     // Schreibt den Kopf und das Ende einer Resource
                     // Script Datei
-    virtual void    WriteSrcHeader( const RSCINST & rInst, FILE * fOutput,
+    virtual void	WriteSrcHeader( const RSCINST & rInst, FILE * fOutput,
                                     RscTypCont * pTC, sal_uInt32 nTab,
                                     const RscId & aId, const char * );
-    virtual void    WriteSrc( const RSCINST & rInst, FILE * fOutput,
+    virtual void	WriteSrc( const RSCINST & rInst, FILE * fOutput,
                               RscTypCont * pTC, sal_uInt32 nTab,const char * );
     virtual ERRTYPE WriteRcHeader( const RSCINST & rInst, RscWriteRc & aMem,
                                    RscTypCont * pTC, const RscId & aId,
@@ -239,9 +239,9 @@ public:
             void WriteSyntaxHeader( FILE * fOutput, RscTypCont * pTC  );
     virtual void WriteSyntax( FILE * fOutput, RscTypCont * pTC );
 
-    virtual void    WriteRcAccess( FILE * fOutput, RscTypCont * pTC,
+    virtual void	WriteRcAccess( FILE * fOutput, RscTypCont * pTC,
                                     const char * );
-    virtual void    WriteRcCtor( FILE * fOutput, RscTypCont * pTC );
+    virtual void	WriteRcCtor( FILE * fOutput, RscTypCont * pTC );
 };
 
 #endif //_RSCTOP_HXX
diff --git a/rsc/inc/rsctree.hxx b/rsc/inc/rsctree.hxx
index 0ee0f3b5056f..b3e54337264e 100644
--- a/rsc/inc/rsctree.hxx
+++ b/rsc/inc/rsctree.hxx
@@ -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
@@ -34,51 +34,51 @@
 class BiNode
 {
 protected:
-    BiNode*     pLeft;    // left subtree
-    BiNode*     pRight;   // right subtree
+    BiNode* 	pLeft;	  // left subtree
+    BiNode* 	pRight;   // right subtree
 
 public:
 
                          // Wandelt eine doppelt verkettete Liste in
                          // einen binaeren Baum um
-            BiNode *    ChangeDLListBTree( BiNode * pList );
+            BiNode *	ChangeDLListBTree( BiNode * pList );
 
                         BiNode();
-    virtual             ~BiNode();
+    virtual 			~BiNode();
 
 
                         // Wandelt einen binaeren Baum in eine doppelt
                         // verkettete Liste um
                         BiNode* ChangeBTreeDLList();
 
-            BiNode *    Left() const { return pLeft  ; };
-            BiNode *    Right() const{ return pRight ; };
-            void        EnumNodes( Link aLink ) const;
+            BiNode *	Left() const { return pLeft  ; };
+            BiNode *	Right() const{ return pRight ; };
+            void		EnumNodes( Link aLink ) const;
 };
 
 /*************************************************************************/
 class NameNode : public BiNode
 {
-    void                SubOrderTree( NameNode * pOrderNode );
+    void				SubOrderTree( NameNode * pOrderNode );
 
 protected:
                         // pCmp ist Zeiger auf Namen
-            NameNode*   Search( const void * pCmp ) const;
+            NameNode*	Search( const void * pCmp ) const;
 
 public:
-            NameNode*   Left() const { return (NameNode *)pLeft  ; };
-            NameNode*   Right() const{ return (NameNode *)pRight ; };
-            NameNode*   Search( const NameNode * pName ) const;
+            NameNode*	Left() const { return (NameNode *)pLeft  ; };
+            NameNode*	Right() const{ return (NameNode *)pRight ; };
+            NameNode*	Search( const NameNode * pName ) const;
                         // insert a new node in the b-tree
-            BOOL        Insert( NameNode * pTN, sal_uInt32 * nDepth );
-            BOOL        Insert( NameNode* pTN );
-    virtual COMPARE     Compare( const NameNode * ) const;
-    virtual COMPARE     Compare( const void * ) const;
-            NameNode*   SearchParent( const NameNode * ) const;
+            BOOL		Insert( NameNode * pTN, sal_uInt32 * nDepth );
+            BOOL		Insert( NameNode* pTN );
+    virtual COMPARE 	Compare( const NameNode * ) const;
+    virtual COMPARE 	Compare( const void * ) const;
+            NameNode*	SearchParent( const NameNode * ) const;
                         // return ist neue Root
-            NameNode*   Remove( NameNode * );
-            void        OrderTree();
-            BOOL        IsOrderTree() const;
+            NameNode*	Remove( NameNode * );
+            void		OrderTree();
+            BOOL		IsOrderTree() const;
 
 };
 
@@ -92,8 +92,8 @@ protected:
 
 public:
 
-    IdNode*         Search( sal_uInt32 nTypName ) const;
-    virtual sal_uInt32  GetId() const;
+    IdNode* 		Search( sal_uInt32 nTypName ) const;
+    virtual sal_uInt32	GetId() const;
 };
 
 /*************************************************************************/
@@ -105,14 +105,14 @@ class StringNode : public NameNode
 protected:
     using NameNode::Search;
 
-    ByteString      aName;
+    ByteString		aName;
 
 public:
                     StringNode(){};
                     StringNode( const ByteString & rStr ) { aName = rStr; }
 
-    StringNode*     Search( const char * ) const;
-    ByteString      GetName() const { return aName; }
+    StringNode* 	Search( const char * ) const;
+    ByteString		GetName() const { return aName; }
 };
 
 #endif // _RSCTREE_HXX
diff --git a/rsc/inc/vclrsc.hxx b/rsc/inc/vclrsc.hxx
index 19677171dcb2..6ffd93388d3e 100644
--- a/rsc/inc/vclrsc.hxx
+++ b/rsc/inc/vclrsc.hxx
@@ -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
@@ -39,132 +39,137 @@
 typedef sal_Int64 WinBits;
 
 // Window-Bits fuer Window
-#define WB_CLIPCHILDREN         ((WinBits)0x00000001)
-#define WB_DIALOGCONTROL        ((WinBits)0x00000002)
-#define WB_NODIALOGCONTROL      ((WinBits)0x00000004)
-#define WB_BORDER               ((WinBits)0x00000008)
-#define WB_NOBORDER             ((WinBits)0x00000010)
-#define WB_SIZEABLE             ((WinBits)0x00000020)
-#define WB_3DLOOK               ((WinBits)0x00000040)
-#define WB_AUTOSIZE             ((WinBits)0x00000080)
+#define WB_CLIPCHILDREN 		((WinBits)0x00000001)
+#define WB_DIALOGCONTROL		((WinBits)0x00000002)
+#define WB_NODIALOGCONTROL		((WinBits)0x00000004)
+#define WB_BORDER				((WinBits)0x00000008)
+#define WB_NOBORDER 			((WinBits)0x00000010)
+#define WB_SIZEABLE 			((WinBits)0x00000020)
+#define WB_3DLOOK				((WinBits)0x00000040)
+#define WB_AUTOSIZE 			((WinBits)0x00000080)
 
 // Window-Bits fuer SystemWindows
-#define WB_MOVEABLE             ((WinBits)0x00000100)
-#define WB_ROLLABLE             ((WinBits)0x00000200)
-#define WB_CLOSEABLE            ((WinBits)0x00000400)
-#define WB_STANDALONE           ((WinBits)0x00000800)
-#define WB_APP                  ((WinBits)0x00001000)
-#define WB_PINABLE              ((WinBits)0x00002000)
-#define WB_SYSTEMWINDOW         ((WinBits)0x40000000)
-#define WB_SIZEMOVE             (WB_SIZEABLE | WB_MOVEABLE)
+#define WB_MOVEABLE 			((WinBits)0x00000100)
+#define WB_ROLLABLE 			((WinBits)0x00000200)
+#define WB_CLOSEABLE			((WinBits)0x00000400)
+#define WB_STANDALONE			((WinBits)0x00000800)
+#define WB_APP					((WinBits)0x00001000)
+#define WB_PINABLE				((WinBits)0x00002000)
+#define WB_SYSTEMWINDOW 		((WinBits)0x40000000)
+#define WB_SIZEMOVE 			(WB_SIZEABLE | WB_MOVEABLE)
 
 // Standard-Window-Bits fuer ChildWindows
-#define WB_TABSTOP              ((WinBits)0x00000100)
-#define WB_NOTABSTOP            ((WinBits)0x00000200)
-#define WB_GROUP                ((WinBits)0x00000400)
-#define WB_NOGROUP              ((WinBits)0x00000800)
-#define WB_HORZ                 ((WinBits)0x00001000)
-#define WB_VERT                 ((WinBits)0x00002000)
-#define WB_LEFT                 ((WinBits)0x00004000)
-#define WB_CENTER               ((WinBits)0x00008000)
-#define WB_RIGHT                ((WinBits)0x00010000)
-#define WB_TOP                  ((WinBits)0x00020000)
-#define WB_VCENTER              ((WinBits)0x00040000)
-#define WB_BOTTOM               ((WinBits)0x00080000)
-#define WB_DRAG                 ((WinBits)0x00100000)
-#define WB_SPIN                 ((WinBits)0x00200000)
-#define WB_REPEAT               ((WinBits)0x00400000)
-#define WB_NOPOINTERFOCUS       ((WinBits)0x00800000)
-#define WB_WORDBREAK            ((WinBits)0x01000000)
-#define WB_NOLABEL              ((WinBits)0x02000000)
-#define WB_SORT                 ((WinBits)0x04000000)
-#define WB_DROPDOWN             ((WinBits)0x08000000)
-#define WB_AUTOHSCROLL          ((WinBits)0x10000000)
-#define WB_DOCKABLE             ((WinBits)0x20000000)
+#define WB_TABSTOP				((WinBits)0x00000100)
+#define WB_NOTABSTOP			((WinBits)0x00000200)
+#define WB_GROUP				((WinBits)0x00000400)
+#define WB_NOGROUP				((WinBits)0x00000800)
+#define WB_HORZ 				((WinBits)0x00001000)
+#define WB_VERT 				((WinBits)0x00002000)
+#define WB_LEFT 				((WinBits)0x00004000)
+#define WB_CENTER				((WinBits)0x00008000)
+#define WB_RIGHT				((WinBits)0x00010000)
+#define WB_TOP					((WinBits)0x00020000)
+#define WB_VCENTER				((WinBits)0x00040000)
+#define WB_BOTTOM				((WinBits)0x00080000)
+#define WB_DRAG 				((WinBits)0x00100000)
+#define WB_SPIN 				((WinBits)0x00200000)
+#define WB_REPEAT				((WinBits)0x00400000)
+#define WB_NOPOINTERFOCUS		((WinBits)0x00800000)
+#define WB_WORDBREAK			((WinBits)0x01000000)
+#define WB_NOLABEL				((WinBits)0x02000000)
+#define WB_SORT 				((WinBits)0x04000000)
+#define WB_DROPDOWN 			((WinBits)0x08000000)
+#define WB_AUTOHSCROLL			((WinBits)0x10000000)
+#define WB_DOCKABLE 			((WinBits)0x20000000)
 #define WB_AUTOVSCROLL          ((WinBits)0x40000000)
 
-#define WB_HIDE                 ((WinBits)0x80000000)
-#define WB_HSCROLL              WB_HORZ
-#define WB_VSCROLL              WB_VERT
-#define WB_TOPIMAGE             WB_TOP
+#define WB_HIDE 				((WinBits)0x80000000)
+
+// system floating window
+#define WB_POPUP                ((WinBits)0x20000000)
+
+#define WB_HSCROLL				WB_HORZ
+#define WB_VSCROLL				WB_VERT
+#define WB_TOPIMAGE 			WB_TOP
 
 // Window-Bits for PushButtons
-#define WB_DEFBUTTON            ((WinBits)0x10000000)
-#define WB_NOLIGHTBORDER        ((WinBits)0x20000000)
-#define WB_RECTSTYLE            ((WinBits)0x08000000)
-#define WB_SMALLSTYLE           ((WinBits)0x04000000)
+#define WB_DEFBUTTON			((WinBits)0x10000000)
+#define WB_NOLIGHTBORDER		((WinBits)0x20000000)
+#define WB_RECTSTYLE			((WinBits)0x08000000)
+#define WB_SMALLSTYLE			((WinBits)0x04000000)
 
 // Window-Bits for FixedText
-#define WB_INFO                 ((WinBits)0x20000000)
-#define WB_PATHELLIPSIS         ((WinBits)0x00100000)
+#define WB_INFO 				((WinBits)0x20000000)
+#define WB_PATHELLIPSIS 		((WinBits)0x00100000)
 
 // Window-Bits for Edit
-#define WB_PASSWORD             ((WinBits)0x01000000)
-#define WB_READONLY             ((WinBits)0x02000000)
-#define WB_NOHIDESELECTION      ((WinBits)SAL_CONST_INT64(0x1000000000))
+#define WB_PASSWORD 			((WinBits)0x01000000)
+#define WB_READONLY 			((WinBits)0x02000000)
+#define WB_NOHIDESELECTION		((WinBits)SAL_CONST_INT64(0x1000000000))
 
 // Window-Bits for MultiLineEdit
-#define WB_IGNORETAB            ((WinBits)0x20000000)
+#define WB_IGNORETAB			((WinBits)0x20000000)
 
 // Window-Bits for ListBox and MultiListBox
-#define WB_SIMPLEMODE           ((WinBits)0x20000000)
+#define WB_SIMPLEMODE			((WinBits)0x20000000)
 
 // Window-Bits for FixedBitmap
-#define WB_FAST                 ((WinBits)0x04000000)
-#define WB_SCALE                ((WinBits)0x08000000)
-#define WB_TOPLEFTVISIBLE       ((WinBits)0x10000000)
+#define WB_FAST 				((WinBits)0x04000000)
+#define WB_SCALE				((WinBits)0x08000000)
+#define WB_TOPLEFTVISIBLE		((WinBits)0x10000000)
 
 // Window-Bits for ToolBox
-#define WB_LINESPACING          ((WinBits)0x01000000)
-#define WB_SCROLL               ((WinBits)0x02000000)
+#define WB_LINESPACING			((WinBits)0x01000000)
+#define WB_SCROLL				((WinBits)0x02000000)
 
 // Window-Bits for TabControl
-#define WB_SINGLELINE           ((WinBits)0x02000000)
+#define WB_SINGLELINE			((WinBits)0x02000000)
 
 // Window-Bits for DockingWindows
-#define WB_DOCKBORDER           ((WinBits)0x00001000)
+#define WB_DOCKBORDER			((WinBits)0x00001000)
 
 // Window-Bits for SplitWindow
-#define WB_NOSPLITDRAW          ((WinBits)0x01000000)
-#define WB_FLATSPLITDRAW        ((WinBits)0x02000000)
+#define WB_NOSPLITDRAW			((WinBits)0x01000000)
+#define WB_FLATSPLITDRAW		((WinBits)0x02000000)
 
 // Window-Bits for MessageBoxen
-#define WB_OK                   ((WinBits)0x00100000)
-#define WB_OK_CANCEL            ((WinBits)0x00200000)
-#define WB_YES_NO               ((WinBits)0x00400000)
-#define WB_YES_NO_CANCEL        ((WinBits)0x00800000)
-#define WB_RETRY_CANCEL         ((WinBits)0x01000000)
-#define WB_DEF_OK               ((WinBits)0x02000000)
-#define WB_DEF_CANCEL           ((WinBits)0x04000000)
-#define WB_DEF_RETRY            ((WinBits)0x08000000)
-#define WB_DEF_YES              ((WinBits)0x10000000)
-#define WB_DEF_NO               ((WinBits)0x20000000)
+#define WB_OK					((WinBits)0x00100000)
+#define WB_OK_CANCEL			((WinBits)0x00200000)
+#define WB_YES_NO				((WinBits)0x00400000)
+#define WB_YES_NO_CANCEL		((WinBits)0x00800000)
+#define WB_RETRY_CANCEL 		((WinBits)0x01000000)
+#define WB_DEF_OK				((WinBits)0x02000000)
+#define WB_DEF_CANCEL			((WinBits)0x04000000)
+#define WB_DEF_RETRY			((WinBits)0x08000000)
+#define WB_DEF_YES				((WinBits)0x10000000)
+#define WB_DEF_NO				((WinBits)0x20000000)
 #define WB_ABORT_RETRY_IGNORE  ((WinBits)SAL_CONST_INT64(0x1000000000))
 #define WB_DEF_IGNORE          ((WinBits)SAL_CONST_INT64(0x2000000000))
 
 // Standard-WinBits
-#define WB_STDWORK              (WB_SIZEMOVE | WB_CLOSEABLE)
-#define WB_STDMDI               (WB_CLOSEABLE)
-#define WB_STDDOCKWIN           (WB_DOCKABLE | WB_MOVEABLE | WB_CLOSEABLE)
-#define WB_STDFLOATWIN          (WB_SIZEMOVE | WB_CLOSEABLE | WB_ROLLABLE)
-#define WB_STDDIALOG            (WB_MOVEABLE | WB_CLOSEABLE)
-#define WB_STDMODELESS          (WB_STDDIALOG)
-#define WB_STDMODAL             (WB_STDDIALOG)
-#define WB_STDTABDIALOG         (WB_STDDIALOG)
-#define WB_STDTABCONTROL        0
+#define WB_STDWORK				(WB_SIZEMOVE | WB_CLOSEABLE)
+#define WB_STDMDI				(WB_CLOSEABLE)
+#define WB_STDDOCKWIN			(WB_DOCKABLE | WB_MOVEABLE | WB_CLOSEABLE)
+#define WB_STDFLOATWIN			(WB_SIZEMOVE | WB_CLOSEABLE | WB_ROLLABLE)
+#define WB_STDDIALOG			(WB_MOVEABLE | WB_CLOSEABLE)
+#define WB_STDMODELESS			(WB_STDDIALOG)
+#define WB_STDMODAL 			(WB_STDDIALOG)
+#define WB_STDTABDIALOG 		(WB_STDDIALOG)
+#define WB_STDTABCONTROL		0
+#define WB_STDPOPUP				(WB_BORDER | WB_POPUP | WB_SYSTEMWINDOW | WB_3DLOOK | WB_DIALOGCONTROL)
 
 // For TreeListBox
-#define WB_HASBUTTONS           ((WinBits)0x00800000)
-#define WB_HASLINES             ((WinBits)0x01000000)
-#define WB_HASLINESATROOT       ((WinBits)0x02000000)
+#define WB_HASBUTTONS			((WinBits)0x00800000)
+#define WB_HASLINES 			((WinBits)0x01000000)
+#define WB_HASLINESATROOT		((WinBits)0x02000000)
 
 // --------------
 // - Help-Types -
 // --------------
 
 // from vcl/inc/help.hxx
-#define OOO_HELP_INDEX          ((ULONG)0xFFFFFFFF)
-#define OOO_HELP_HELPONHELP     ((ULONG)0xFFFFFFFE)
+#define OOO_HELP_INDEX			((ULONG)0xFFFFFFFF)
+#define OOO_HELP_HELPONHELP 	((ULONG)0xFFFFFFFE)
 
 // --------------
 // - FieldTypes -
@@ -173,7 +178,7 @@ typedef sal_Int64 WinBits;
 // from vcl/inc/fldunit.hxx
 enum FieldUnit { FUNIT_NONE, FUNIT_MM, FUNIT_CM, FUNIT_M, FUNIT_KM,
                  FUNIT_TWIP, FUNIT_POINT, FUNIT_PICA,
-                 FUNIT_INCH, FUNIT_FOOT, FUNIT_MILE, FUNIT_CUSTOM,
+                 FUNIT_INCH, FUNIT_FOOT, FUNIT_MILE, FUNIT_CHAR, FUNIT_LINE, FUNIT_CUSTOM,
                  FUNIT_PERCENT, FUNIT_100TH_MM };
 
 
@@ -191,15 +196,15 @@ enum TimeFieldFormat {TIMEF_NONE, TIMEF_SEC, TIMEF_100TH_SEC, TIMEF_SEC_CS, Time
 #include <com/sun/star/awt/Key.hpp>
 #include <com/sun/star/awt/KeyGroup.hpp>
 
-#define KEY_CODE        ((sal_uInt16)0x0FFF)
+#define KEY_CODE		((sal_uInt16)0x0FFF)
 
 // Modifier-Tasten
-#define KEY_SHIFT       ((sal_uInt16)0x1000)
-#define KEY_MOD1        ((sal_uInt16)0x2000)
-#define KEY_MOD2        ((sal_uInt16)0x4000)
-#define KEY_MOD3        ((sal_uInt16)0x8000)
-#define KEY_MODTYPE     ((sal_uInt16)0xF000)
-#define KEY_ALLMODTYPE  ((sal_uInt16)0xF000)
+#define KEY_SHIFT		((sal_uInt16)0x1000)
+#define KEY_MOD1		((sal_uInt16)0x2000)
+#define KEY_MOD2		((sal_uInt16)0x4000)
+#define KEY_MOD3		((sal_uInt16)0x8000)
+#define KEY_MODTYPE 	((sal_uInt16)0xF000)
+#define KEY_ALLMODTYPE	((sal_uInt16)0xF000)
 
 
 // from vcl/inc/vclenum.hxx
@@ -242,13 +247,13 @@ enum MapUnit { MAP_100TH_MM, MAP_10TH_MM, MAP_MM, MAP_CM,
 // from vcl/inc/toolbox.hxx
 typedef sal_uInt16 ToolBoxItemBits;
 
-#define TIB_CHECKABLE           ((ToolBoxItemBits)0x0001)
-#define TIB_RADIOCHECK          ((ToolBoxItemBits)0x0002)
-#define TIB_AUTOCHECK           ((ToolBoxItemBits)0x0004)
-#define TIB_LEFT                ((ToolBoxItemBits)0x0008)
-#define TIB_AUTOSIZE            ((ToolBoxItemBits)0x0010)
-#define TIB_DROPDOWN            ((ToolBoxItemBits)0x0020)
-#define TIB_REPEAT              ((ToolBoxItemBits)0x0040)
+#define TIB_CHECKABLE			((ToolBoxItemBits)0x0001)
+#define TIB_RADIOCHECK			((ToolBoxItemBits)0x0002)
+#define TIB_AUTOCHECK			((ToolBoxItemBits)0x0004)
+#define TIB_LEFT				((ToolBoxItemBits)0x0008)
+#define TIB_AUTOSIZE			((ToolBoxItemBits)0x0010)
+#define TIB_DROPDOWN			((ToolBoxItemBits)0x0020)
+#define TIB_REPEAT				((ToolBoxItemBits)0x0040)
 
 enum ButtonType { BUTTON_SYMBOL, BUTTON_TEXT, BUTTON_SYMBOLTEXT };
 
@@ -288,12 +293,12 @@ enum MenuItemType { MENUITEM_DONTKNOW, MENUITEM_STRING, MENUITEM_IMAGE,
 
 typedef sal_uInt16 MenuItemBits;
 
-#define MIB_CHECKABLE           ((MenuItemBits)0x0001)
-#define MIB_RADIOCHECK          ((MenuItemBits)0x0002)
-#define MIB_AUTOCHECK           ((MenuItemBits)0x0004)
-#define MIB_ABOUT               ((MenuItemBits)0x0008)
-#define MIB_HELP                ((MenuItemBits)0x0010)
-#define MIB_POPUPSELECT         ((MenuItemBits)0x0020)
+#define MIB_CHECKABLE			((MenuItemBits)0x0001)
+#define MIB_RADIOCHECK			((MenuItemBits)0x0002)
+#define MIB_AUTOCHECK			((MenuItemBits)0x0004)
+#define MIB_ABOUT				((MenuItemBits)0x0008)
+#define MIB_HELP				((MenuItemBits)0x0010)
+#define MIB_POPUPSELECT 		((MenuItemBits)0x0020)
 
 // ----------------
 // - Symbol-Types -
@@ -301,45 +306,45 @@ typedef sal_uInt16 MenuItemBits;
 
 // from vcl/inc/symbol.hxx
 typedef sal_uInt16 SymbolType;
-#define SYMBOL_DONTKNOW         ((SymbolType)0)
-#define SYMBOL_IMAGE            ((SymbolType)1)
-#define SYMBOL_ARROW_UP         ((SymbolType)2)
-#define SYMBOL_ARROW_DOWN       ((SymbolType)3)
-#define SYMBOL_ARROW_LEFT       ((SymbolType)4)
-#define SYMBOL_ARROW_RIGHT      ((SymbolType)5)
-#define SYMBOL_SPIN_UP          ((SymbolType)6)
-#define SYMBOL_SPIN_DOWN        ((SymbolType)7)
-#define SYMBOL_SPIN_LEFT        ((SymbolType)8)
-#define SYMBOL_SPIN_RIGHT       ((SymbolType)9)
-#define SYMBOL_FIRST            ((SymbolType)10)
-#define SYMBOL_LAST             ((SymbolType)11)
-#define SYMBOL_PREV             ((SymbolType)12)
-#define SYMBOL_NEXT             ((SymbolType)13)
-#define SYMBOL_PAGEUP           ((SymbolType)14)
-#define SYMBOL_PAGEDOWN         ((SymbolType)15)
-#define SYMBOL_PLAY             ((SymbolType)16)
-#define SYMBOL_REVERSEPLAY      ((SymbolType)17)
-#define SYMBOL_RECORD           ((SymbolType)18)
-#define SYMBOL_STOP             ((SymbolType)19)
-#define SYMBOL_PAUSE            ((SymbolType)20)
-#define SYMBOL_WINDSTART        ((SymbolType)21)
-#define SYMBOL_WINDEND          ((SymbolType)22)
-#define SYMBOL_WINDBACKWARD     ((SymbolType)23)
-#define SYMBOL_WINDFORWARD      ((SymbolType)24)
-#define SYMBOL_CLOSE            ((SymbolType)25)
-#define SYMBOL_ROLLUP           ((SymbolType)26)
-#define SYMBOL_ROLLDOWN         ((SymbolType)27)
-#define SYMBOL_CHECKMARK        ((SymbolType)28)
-#define SYMBOL_RADIOCHECKMARK   ((SymbolType)29)
-#define SYMBOL_SPIN_UPDOWN      ((SymbolType)30)
-#define SYMBOL_FLOAT            ((SymbolType)31)
-#define SYMBOL_DOCK             ((SymbolType)32)
-#define SYMBOL_HIDE             ((SymbolType)33)
-#define SYMBOL_HELP             ((SymbolType)34)
-#define SYMBOL_OS2CLOSE         ((SymbolType)35)
-#define SYMBOL_OS2FLOAT         ((SymbolType)36)
-#define SYMBOL_OS2HIDE          ((SymbolType)37)
-
-#define SYMBOL_NOSYMBOL         (SYMBOL_DONTKNOW)
+#define SYMBOL_DONTKNOW 		((SymbolType)0)
+#define SYMBOL_IMAGE			((SymbolType)1)
+#define SYMBOL_ARROW_UP 		((SymbolType)2)
+#define SYMBOL_ARROW_DOWN		((SymbolType)3)
+#define SYMBOL_ARROW_LEFT		((SymbolType)4)
+#define SYMBOL_ARROW_RIGHT		((SymbolType)5)
+#define SYMBOL_SPIN_UP			((SymbolType)6)
+#define SYMBOL_SPIN_DOWN		((SymbolType)7)
+#define SYMBOL_SPIN_LEFT		((SymbolType)8)
+#define SYMBOL_SPIN_RIGHT		((SymbolType)9)
+#define SYMBOL_FIRST			((SymbolType)10)
+#define SYMBOL_LAST 			((SymbolType)11)
+#define SYMBOL_PREV 			((SymbolType)12)
+#define SYMBOL_NEXT 			((SymbolType)13)
+#define SYMBOL_PAGEUP			((SymbolType)14)
+#define SYMBOL_PAGEDOWN 		((SymbolType)15)
+#define SYMBOL_PLAY 			((SymbolType)16)
+#define SYMBOL_REVERSEPLAY		((SymbolType)17)
+#define SYMBOL_RECORD			((SymbolType)18)
+#define SYMBOL_STOP 			((SymbolType)19)
+#define SYMBOL_PAUSE			((SymbolType)20)
+#define SYMBOL_WINDSTART		((SymbolType)21)
+#define SYMBOL_WINDEND			((SymbolType)22)
+#define SYMBOL_WINDBACKWARD 	((SymbolType)23)
+#define SYMBOL_WINDFORWARD		((SymbolType)24)
+#define SYMBOL_CLOSE			((SymbolType)25)
+#define SYMBOL_ROLLUP			((SymbolType)26)
+#define SYMBOL_ROLLDOWN 		((SymbolType)27)
+#define SYMBOL_CHECKMARK		((SymbolType)28)
+#define SYMBOL_RADIOCHECKMARK	((SymbolType)29)
+#define SYMBOL_SPIN_UPDOWN		((SymbolType)30)
+#define SYMBOL_FLOAT			((SymbolType)31)
+#define SYMBOL_DOCK 			((SymbolType)32)
+#define SYMBOL_HIDE 			((SymbolType)33)
+#define SYMBOL_HELP 			((SymbolType)34)
+#define SYMBOL_OS2CLOSE 		((SymbolType)35)
+#define SYMBOL_OS2FLOAT 		((SymbolType)36)
+#define SYMBOL_OS2HIDE			((SymbolType)37)
+
+#define SYMBOL_NOSYMBOL 		(SYMBOL_DONTKNOW)
 
 #endif
diff --git a/rsc/source/misc/rscdbl.cxx b/rsc/source/misc/rscdbl.cxx
index 591f6b3fd4f6..d32cc31b7968 100644
--- a/rsc/source/misc/rscdbl.cxx
+++ b/rsc/source/misc/rscdbl.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
@@ -38,18 +38,18 @@
 
 /*************************************************************************
 |*
-|*    RscTypCont::FillNameIdList()
+|*	  RscTypCont::FillNameIdList()
 |*
-|*    Beschreibung
-|*    Ersterstellung    MM 07.05.91
-|*    Letzte Aenderung  MM 30.05.91
+|*	  Beschreibung
+|*	  Ersterstellung	MM 07.05.91
+|*	  Letzte Aenderung	MM 30.05.91
 |*
 *************************************************************************/
 REResourceList * InsertList( Atom nClassName, const RscId& rId,
                              REResourceList * pList ){
-    REResourceList  *   pSubList;
-    const char *                pStrClass;
-    ByteString          aStrClass;
+    REResourceList	*	pSubList;
+    const char *				pStrClass;
+    ByteString			aStrClass;
 
     pStrClass = pHS->getString( nClassName ).getStr();
     if( pStrClass )
@@ -65,10 +65,10 @@ REResourceList * InsertList( Atom nClassName, const RscId& rId,
 
 void FillSubList( RSCINST & rInst, REResourceList * pList )
 {
-    sal_uInt32      nCount, i;
-    SUBINFO_STRUCT  aInfo;
+    sal_uInt32		nCount, i;
+    SUBINFO_STRUCT	aInfo;
     REResourceList* pSubList;
-    RSCINST         aTmpI;
+    RSCINST 		aTmpI;
 
     nCount = rInst.pClass->GetCount( rInst );
     for( i = 0; i < nCount; i++ ){
@@ -85,7 +85,7 @@ void FillListObj( ObjNode * pObjNode, RscTop * pRscTop,
 {
     if( pObjNode ){
         if( pObjNode->GetFileKey() == lFileKey ){
-            RSCINST         aTmpI;
+            RSCINST 		aTmpI;
             REResourceList* pSubList;
 
             FillListObj( (ObjNode*)pObjNode->Left(), pRscTop,
diff --git a/rsc/source/misc/rsclst.cxx b/rsc/source/misc/rsclst.cxx
index ee2d4a14f328..8f7e6eb296e2 100644
--- a/rsc/source/misc/rsclst.cxx
+++ b/rsc/source/misc/rsclst.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
@@ -42,7 +42,7 @@ REResourceList :: REResourceList( REResourceList* pParentList,
 {
     pParent    = pParentList;
     aClassName = rClassName;
-    aRscId     = rResourceID;
+    aRscId	   = rResourceID;
     bVisible   = bVis;
 }
 
diff --git a/rsc/source/parser/erscerr.cxx b/rsc/source/parser/erscerr.cxx
index 158aea21b6e3..a0f1dfe8b22a 100644
--- a/rsc/source/parser/erscerr.cxx
+++ b/rsc/source/parser/erscerr.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
@@ -41,11 +41,11 @@
 
 /*************************************************************************
 |*
-|*    ERRTYPE::operator = ;
+|*	  ERRTYPE::operator = ;
 |*
-|*    Beschreibung
-|*    Ersterstellung    MM 25.09.91
-|*    Letzte Aenderung  MM 25.09.91
+|*	  Beschreibung
+|*	  Ersterstellung	MM 25.09.91
+|*	  Letzte Aenderung	MM 25.09.91
 |*
 *************************************************************************/
 ERRTYPE& ERRTYPE::operator = ( const ERRTYPE & rError )
@@ -59,11 +59,11 @@ ERRTYPE& ERRTYPE::operator = ( const ERRTYPE & rError )
 
 /*************************************************************************
 |*
-|*    RscError::StdOut();
+|*	  RscError::StdOut();
 |*
-|*    Beschreibung
-|*    Ersterstellung    MM 06.05.91
-|*    Letzte Aenderung  MM 06.05.91
+|*	  Beschreibung
+|*	  Ersterstellung	MM 06.05.91
+|*	  Letzte Aenderung	MM 06.05.91
 |*
 *************************************************************************/
 void RscError::StdOut( const char * pStr, const RscVerbosity _verbosityLevel )
@@ -79,11 +79,11 @@ void RscError::StdOut( const char * pStr, const RscVerbosity _verbosityLevel )
 
 /*************************************************************************
 |*
-|*    RscError::StdErr();
+|*	  RscError::StdErr();
 |*
-|*    Beschreibung
-|*    Ersterstellung    PL 11/07/2001
-|*    Letzte Aenderung  PL 11/07/2001
+|*	  Beschreibung
+|*	  Ersterstellung	PL 11/07/2001
+|*	  Letzte Aenderung	PL 11/07/2001
 |*
 *************************************************************************/
 void RscError::StdErr( const char * pStr )
@@ -96,11 +96,11 @@ void RscError::StdErr( const char * pStr )
 
 /*************************************************************************
 |*
-|*    RscError::LstOut();
+|*	  RscError::LstOut();
 |*
-|*    Beschreibung
-|*    Ersterstellung    MM 06.05.91
-|*    Letzte Aenderung  MM 06.05.91
+|*	  Beschreibung
+|*	  Ersterstellung	MM 06.05.91
+|*	  Letzte Aenderung	MM 06.05.91
 |*
 *************************************************************************/
 void RscError::LstOut( const char * pStr ){
@@ -110,11 +110,11 @@ void RscError::LstOut( const char * pStr ){
 
 /*************************************************************************
 |*
-|*    RscError::StdLstOut();
+|*	  RscError::StdLstOut();
 |*
-|*    Beschreibung
-|*    Ersterstellung    MM 06.05.91
-|*    Letzte Aenderung  MM 06.05.91
+|*	  Beschreibung
+|*	  Ersterstellung	MM 06.05.91
+|*	  Letzte Aenderung	MM 06.05.91
 |*
 *************************************************************************/
 void RscError::StdLstOut( const char * pStr ){
@@ -124,11 +124,11 @@ void RscError::StdLstOut( const char * pStr ){
 
 /*************************************************************************
 |*
-|*    RscError::StdLstErr();
+|*	  RscError::StdLstErr();
 |*
-|*    Beschreibung
-|*    Ersterstellung    PL 11/07/2001
-|*    Letzte Aenderung  PL 11/07/2001
+|*	  Beschreibung
+|*	  Ersterstellung	PL 11/07/2001
+|*	  Letzte Aenderung	PL 11/07/2001
 |*
 *************************************************************************/
 void RscError::StdLstErr( const char * pStr ){
@@ -138,11 +138,11 @@ void RscError::StdLstErr( const char * pStr ){
 
 /*************************************************************************
 |*
-|*    RscError::WriteError();
+|*	  RscError::WriteError();
 |*
-|*    Beschreibung
-|*    Ersterstellung    MM 06.05.91
-|*    Letzte Aenderung  MM 06.05.91
+|*	  Beschreibung
+|*	  Ersterstellung	MM 06.05.91
+|*	  Letzte Aenderung	MM 06.05.91
 |*
 *************************************************************************/
 void RscError::WriteError( const ERRTYPE& rError, const char * pMessage )
@@ -202,7 +202,7 @@ void RscError::WriteError( const ERRTYPE& rError, const char * pMessage )
         case ERR_USAGE:
             StdLstOut( "Copyright (C) 2000, 2010 Oracle and/or its affiliates.\n" );
             {
-                char    buf[40];
+                char	buf[40];
 
                 StdLstOut( "DataVersion: " );
                 sprintf( buf, "%d.%d\n\n",
@@ -407,11 +407,11 @@ void RscError::WriteError( const ERRTYPE& rError, const char * pMessage )
 
 /*************************************************************************
 |*
-|*    RscErrorFormat()
+|*	  RscErrorFormat()
 |*
-|*    Beschreibung
-|*    Ersterstellung    MM 06.05.91
-|*    Letzte Aenderung  MM 06.05.91
+|*	  Beschreibung
+|*	  Ersterstellung	MM 06.05.91
+|*	  Letzte Aenderung	MM 06.05.91
 |*
 *************************************************************************/
 void RscError::ErrorFormat( const ERRTYPE& rError, RscTop * pClass,
@@ -469,11 +469,11 @@ void RscError::ErrorFormat( const ERRTYPE& rError, RscTop * pClass,
 
 /*************************************************************************
 |*
-|*    RscError::Error()
+|*	  RscError::Error()
 |*
-|*    Beschreibung
-|*    Ersterstellung    MM 06.05.91
-|*    Letzte Aenderung  MM 06.05.91
+|*	  Beschreibung
+|*	  Ersterstellung	MM 06.05.91
+|*	  Letzte Aenderung	MM 06.05.91
 |*
 *************************************************************************/
 void RscError::Error( const ERRTYPE& rError, RscTop * pClass,
@@ -492,11 +492,11 @@ void RscError::Error( const ERRTYPE& rError, RscTop * pClass,
 
 /*************************************************************************
 |*
-|*    RscError::FatalError();
+|*	  RscError::FatalError();
 |*
-|*    Beschreibung
-|*    Ersterstellung    MM 06.05.91
-|*    Letzte Aenderung  MM 06.05.91
+|*	  Beschreibung
+|*	  Ersterstellung	MM 06.05.91
+|*	  Letzte Aenderung	MM 06.05.91
 |*
 *************************************************************************/
 void RscError::FatalError( const ERRTYPE& rError, const RscId &aId,
diff --git a/rsc/source/parser/rscdb.cxx b/rsc/source/parser/rscdb.cxx
index 97d23d4e3b53..a097a7a88c75 100644
--- a/rsc/source/parser/rscdb.cxx
+++ b/rsc/source/parser/rscdb.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
@@ -29,7 +29,7 @@
 #include "precompiled_rsc.hxx"
 /****************** I N C L U D E S **************************************/
 // C and C++ Includes.
-#include <ctype.h>      // isdigit(), isalpha()
+#include <ctype.h>		// isdigit(), isalpha()
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
@@ -50,11 +50,11 @@ using namespace rtl;
 
 /*************************************************************************
 |*
-|*    RscTypCont :: RscTypCont
+|*	  RscTypCont :: RscTypCont
 |*
-|*    Beschreibung      RES.DOC
-|*    Ersterstellung    MM 22.03.90
-|*    Letzte Aenderung  MM 27.06.90
+|*	  Beschreibung		RES.DOC
+|*	  Ersterstellung	MM 22.03.90
+|*	  Letzte Aenderung	MM 27.06.90
 |*
 *************************************************************************/
 RscTypCont :: RscTypCont( RscError * pErrHdl,
@@ -143,7 +143,7 @@ ByteString RscTypCont::ChangeLanguage( const ByteString& rNewLang )
         aCountry = aLang.getToken( 0, '-', nIndex );
     if( nIndex != -1 )
         aVariant = aLang.copy( nIndex );
-
+    
     bool bAppendEnUsFallback =
         ! (rNewLang.EqualsIgnoreCaseAscii( "en-US" ) ||
            rNewLang.EqualsIgnoreCaseAscii( "x-no-translate" ) );
@@ -157,7 +157,7 @@ ByteString RscTypCont::ChangeLanguage( const ByteString& rNewLang )
     {
         aLangFallbacks.push_back(getLangIdAndShortenLocale( this, aLg, aCountry, aVariant ) );
     } while( aLg.getLength() );
-
+    
     if( bAppendEnUsFallback )
     {
         aLg = "en";
@@ -181,11 +181,11 @@ Atom RscTypCont::AddLanguage( const char* pLang )
 
 /*************************************************************************
 |*
-|*    RscTypCont :: ~RscTypCont
+|*	  RscTypCont :: ~RscTypCont
 |*
-|*    Beschreibung      RES.DOC
-|*    Ersterstellung    MM 22.03.90
-|*    Letzte Aenderung  MM 27.06.90
+|*	  Beschreibung		RES.DOC
+|*	  Ersterstellung	MM 22.03.90
+|*	  Letzte Aenderung	MM 27.06.90
 |*
 *************************************************************************/
 void DestroyNode( RscTop * pRscTop, ObjNode * pObjNode ){
@@ -230,7 +230,7 @@ void Pre_dtorTree( RscTop * pRscTop ){
 }
 
 RscTypCont :: ~RscTypCont(){
-    RscTop  *       pRscTmp;
+    RscTop	*		pRscTmp;
     RscSysEntry   * pSysEntry;
 
     // Alle Unterbaeume loeschen
@@ -281,7 +281,7 @@ void RscTypCont::ClearSysNames()
 
 //=======================================================================
 RscTop * RscTypCont::SearchType( Atom nId )
-/*  [Beschreibung]
+/*	[Beschreibung]
 
     Sucht eine Basistyp nId;
 */
@@ -289,9 +289,9 @@ RscTop * RscTypCont::SearchType( Atom nId )
     if( nId == InvalidAtom )
         return NULL;
 
-#define ELSE_IF( a )                \
-    else if( a.GetId() == nId ) \
-        return &a;                  \
+#define ELSE_IF( a )				\
+    else if( a.GetId() == nId )	\
+        return &a;					\
 
     if( aBool.GetId() == nId )
         return &aBool;
@@ -327,11 +327,11 @@ RscTop * RscTypCont::SearchType( Atom nId )
 
 /*************************************************************************
 |*
-|*    RscTypCont :: Search
+|*	  RscTypCont :: Search
 |*
-|*    Beschreibung      RES.DOC
-|*    Ersterstellung    MM 22.03.90
-|*    Letzte Aenderung  MM 27.06.90
+|*	  Beschreibung		RES.DOC
+|*	  Ersterstellung	MM 22.03.90
+|*	  Letzte Aenderung	MM 27.06.90
 |*
 *************************************************************************/
 RscTop * RscTypCont :: Search( Atom nRT ){
@@ -340,7 +340,7 @@ RscTop * RscTypCont :: Search( Atom nRT ){
 
 CLASS_DATA RscTypCont :: Search( Atom nRT, const RscId & rId ){
     ObjNode *pObjNode;
-    RscTop  *pRscTop;
+    RscTop	*pRscTop;
 
     if( NULL != (pRscTop = Search( nRT )) ){
         if( NULL != (pObjNode = pRscTop->GetObjNode( rId )) ){
@@ -352,16 +352,16 @@ CLASS_DATA RscTypCont :: Search( Atom nRT, const RscId & rId ){
 
 /*************************************************************************
 |*
-|*    RscTypCont :: Delete()
+|*	  RscTypCont :: Delete()
 |*
-|*    Beschreibung
-|*    Ersterstellung    MM 10.07.91
-|*    Letzte Aenderung  MM 10.07.91
+|*	  Beschreibung
+|*	  Ersterstellung	MM 10.07.91
+|*	  Letzte Aenderung	MM 10.07.91
 |*
 *************************************************************************/
 void RscTypCont :: Delete( Atom nRT, const RscId & rId ){
-    ObjNode *   pObjNode;
-    RscTop  *   pRscTop;
+    ObjNode *	pObjNode;
+    RscTop	*	pRscTop;
 
     if( NULL != (pRscTop = Search( nRT )) ){
         if( NULL != (pObjNode = pRscTop->GetObjNode()) ){
@@ -385,18 +385,18 @@ void RscTypCont :: Delete( Atom nRT, const RscId & rId ){
 
 /*************************************************************************
 |*
-|*    RscTypCont :: PutSysName()
+|*	  RscTypCont :: PutSysName()
 |*
-|*    Beschreibung      RES.DOC
-|*    Ersterstellung    MM 22.03.90
-|*    Letzte Aenderung  MM 27.06.90
+|*	  Beschreibung		RES.DOC
+|*	  Ersterstellung	MM 22.03.90
+|*	  Letzte Aenderung	MM 27.06.90
 |*
 *************************************************************************/
 sal_uInt32 RscTypCont :: PutSysName( sal_uInt32 nRscTyp, char * pFileName,
                                  sal_uInt32 nConst, sal_uInt32 nId, BOOL bFirst )
 {
-    RscSysEntry *   pSysEntry;
-    BOOL            bId1 = FALSE;
+    RscSysEntry *	pSysEntry;
+    BOOL			bId1 = FALSE;
 
     pSysEntry = aSysLst.First();
     while( pSysEntry )
@@ -433,11 +433,11 @@ sal_uInt32 RscTypCont :: PutSysName( sal_uInt32 nRscTyp, char * pFileName,
 
 /*************************************************************************
 |*
-|*    RscTypCont :: WriteInc
+|*	  RscTypCont :: WriteInc
 |*
-|*    Beschreibung      RES.DOC
-|*    Ersterstellung    MM 21.06.90
-|*    Letzte Aenderung  MM 21.06.90
+|*	  Beschreibung		RES.DOC
+|*	  Ersterstellung	MM 21.06.90
+|*	  Letzte Aenderung	MM 21.06.90
 |*
 *************************************************************************/
 void RscTypCont :: WriteInc( FILE * fOutput, ULONG lFileKey )
@@ -460,8 +460,8 @@ void RscTypCont :: WriteInc( FILE * fOutput, ULONG lFileKey )
     }
     else
     {
-        RscDepend *     pDep;
-        RscFile   *     pFile;
+        RscDepend * 	pDep;
+        RscFile   * 	pFile;
 
         pFName = aFileTab.Get( lFileKey );
         if( pFName )
@@ -487,11 +487,11 @@ void RscTypCont :: WriteInc( FILE * fOutput, ULONG lFileKey )
 
 /*************************************************************************
 |*
-|*    RscTypCont :: Methoden die ueber all Knoten laufen
+|*	  RscTypCont :: Methoden die ueber all Knoten laufen
 |*
-|*    Beschreibung      RES.DOC
-|*    Ersterstellung    MM 22.03.90
-|*    Letzte Aenderung  MM 09.12.91
+|*	  Beschreibung		RES.DOC
+|*	  Ersterstellung	MM 22.03.90
+|*	  Letzte Aenderung	MM 09.12.91
 |*
 *************************************************************************/
 
@@ -499,11 +499,11 @@ class RscEnumerateObj
 {
 friend class RscEnumerateRef;
 private:
-    ERRTYPE     aError;     // Enthaelt den ersten Fehler
+    ERRTYPE 	aError; 	// Enthaelt den ersten Fehler
     RscTypCont* pTypCont;
-    FILE *      fOutput;    // AusgabeDatei
-    ULONG       lFileKey;   // Welche src-Datei
-    RscTop *    pClass;
+    FILE *		fOutput;	// AusgabeDatei
+    ULONG		lFileKey;	// Welche src-Datei
+    RscTop *	pClass;
 
     DECL_LINK( CallBackWriteRc, ObjNode * );
     DECL_LINK( CallBackWriteSrc, ObjNode * );
@@ -541,16 +541,16 @@ public:
 
 /*************************************************************************
 |*
-|*    RscEnumerateObj :: CallBackWriteRc
+|*	  RscEnumerateObj :: CallBackWriteRc
 |*
-|*    Beschreibung
-|*    Ersterstellung    MM 09.12.91
-|*    Letzte Aenderung  MM 09.12.91
+|*	  Beschreibung
+|*	  Ersterstellung	MM 09.12.91
+|*	  Letzte Aenderung	MM 09.12.91
 |*
 *************************************************************************/
 IMPL_LINK( RscEnumerateObj, CallBackWriteRc, ObjNode *, pObjNode )
 {
-    RscWriteRc      aMem( pTypCont->GetByteOrder() );
+    RscWriteRc		aMem( pTypCont->GetByteOrder() );
 
     aError = pClass->WriteRcHeader( RSCINST( pClass, pObjNode->GetRscObj() ),
                                      aMem, pTypCont,
@@ -564,11 +564,11 @@ IMPL_LINK( RscEnumerateObj, CallBackWriteRc, ObjNode *, pObjNode )
 
 /*************************************************************************
 |*
-|*    RscEnumerateObj :: CallBackWriteSrc
+|*	  RscEnumerateObj :: CallBackWriteSrc
 |*
-|*    Beschreibung
-|*    Ersterstellung    MM 09.12.91
-|*    Letzte Aenderung  MM 09.12.91
+|*	  Beschreibung
+|*	  Ersterstellung	MM 09.12.91
+|*	  Letzte Aenderung	MM 09.12.91
 |*
 *************************************************************************/
 IMPL_LINK_INLINE_START( RscEnumerateObj, CallBackWriteSrc, ObjNode *, pObjNode )
@@ -585,11 +585,11 @@ IMPL_LINK_INLINE_END( RscEnumerateObj, CallBackWriteSrc, ObjNode *, pObjNode )
 
 /*************************************************************************
 |*
-|*    RscEnumerateObj :: CallBackWriteCxx
+|*	  RscEnumerateObj :: CallBackWriteCxx
 |*
-|*    Beschreibung
-|*    Ersterstellung    MM 09.12.91
-|*    Letzte Aenderung  MM 09.12.91
+|*	  Beschreibung
+|*	  Ersterstellung	MM 09.12.91
+|*	  Letzte Aenderung	MM 09.12.91
 |*
 *************************************************************************/
 IMPL_LINK_INLINE_START( RscEnumerateObj, CallBackWriteCxx, ObjNode *, pObjNode )
@@ -604,11 +604,11 @@ IMPL_LINK_INLINE_END( RscEnumerateObj, CallBackWriteCxx, ObjNode *, pObjNode )
 
 /*************************************************************************
 |*
-|*    RscEnumerateObj :: CallBackWriteHxx
+|*	  RscEnumerateObj :: CallBackWriteHxx
 |*
-|*    Beschreibung
-|*    Ersterstellung    MM 09.12.91
-|*    Letzte Aenderung  MM 09.12.91
+|*	  Beschreibung
+|*	  Ersterstellung	MM 09.12.91
+|*	  Letzte Aenderung	MM 09.12.91
 |*
 *************************************************************************/
 IMPL_LINK_INLINE_START( RscEnumerateObj, CallBackWriteHxx, ObjNode *, pObjNode )
@@ -623,21 +623,21 @@ IMPL_LINK_INLINE_END( RscEnumerateObj, CallBackWriteHxx, ObjNode *, pObjNode )
 
 /*************************************************************************
 |*
-|*    RscEnumerateObj :: WriteRcFile
+|*	  RscEnumerateObj :: WriteRcFile
 |*
-|*    Beschreibung
-|*    Ersterstellung    MM 09.12.91
-|*    Letzte Aenderung  MM 09.12.91
+|*	  Beschreibung
+|*	  Ersterstellung	MM 09.12.91
+|*	  Letzte Aenderung	MM 09.12.91
 |*
 *************************************************************************/
 void RscEnumerateObj :: WriteRcFile( RscWriteRc & rMem, FILE * fOut ){
     // Definition der Struktur, aus denen die Resource aufgebaut ist
     /*
     struct RSHEADER_TYPE{
-        sal_uInt32          nId;        // Identifier der Resource
-        sal_uInt32          nRT;        // Resource Typ
-        sal_uInt32          nGlobOff;   // Globaler Offset
-        sal_uInt32          nLocalOff;  // Lokaler Offset
+        sal_uInt32			nId;		// Identifier der Resource
+        sal_uInt32			nRT;		// Resource Typ
+        sal_uInt32			nGlobOff;	// Globaler Offset
+        sal_uInt32			nLocalOff;	// Lokaler Offset
     } aHeader;
     */
 
@@ -677,7 +677,7 @@ void RscEnumerateObj :: WriteRcFile( RscWriteRc & rMem, FILE * fOut ){
 class RscEnumerateRef
 {
 private:
-    RscTop *        pRoot;
+    RscTop *		pRoot;
 
     DECL_LINK( CallBackWriteRc, RscTop * );
     DECL_LINK( CallBackWriteSrc, RscTop * );
@@ -693,7 +693,7 @@ public:
             {
                 aEnumObj.pTypCont = pTC;
                 aEnumObj.fOutput  = fOutput;
-                pRoot             = pR;
+                pRoot			  = pR;
             }
     ERRTYPE WriteRc()
     {
@@ -729,13 +729,13 @@ public:
         return aEnumObj.aError;
     }
 
-    void    WriteSyntax()
+    void	WriteSyntax()
             {
                 pRoot->EnumNodes( LINK( this, RscEnumerateRef,
                                         CallBackWriteSyntax ) );
             }
 
-    void    WriteRcCtor()
+    void	WriteRcCtor()
             {
                 pRoot->EnumNodes( LINK( this, RscEnumerateRef,
                                         CallBackWriteRcCtor ) );
@@ -744,11 +744,11 @@ public:
 
 /*************************************************************************
 |*
-|*    RscRscEnumerateRef :: CallBack...
+|*	  RscRscEnumerateRef :: CallBack...
 |*
-|*    Beschreibung
-|*    Ersterstellung    MM 09.12.91
-|*    Letzte Aenderung  MM 09.12.91
+|*	  Beschreibung
+|*	  Ersterstellung	MM 09.12.91
+|*	  Letzte Aenderung	MM 09.12.91
 |*
 *************************************************************************/
 IMPL_LINK_INLINE_START( RscEnumerateRef, CallBackWriteRc, RscTop *, pRef )
@@ -792,17 +792,17 @@ IMPL_LINK_INLINE_END( RscEnumerateRef, CallBackWriteRcCtor, RscTop *, pRef )
 
 /*************************************************************************
 |*
-|*    RscTypCont :: WriteRc
+|*	  RscTypCont :: WriteRc
 |*
-|*    Beschreibung      RES.DOC
-|*    Ersterstellung    MM 22.03.90
-|*    Letzte Aenderung  MM 22.07.91
+|*	  Beschreibung		RES.DOC
+|*	  Ersterstellung	MM 22.03.90
+|*	  Letzte Aenderung	MM 22.07.91
 |*
 *************************************************************************/
 
 ERRTYPE RscTypCont::WriteRc( WriteRcContext& rContext )
 {
-    ERRTYPE       aError;
+    ERRTYPE 	  aError;
     RscEnumerateRef aEnumRef( this, pRoot, rContext.fOutput );
 
     aIdTranslator.clear();
@@ -815,23 +815,23 @@ ERRTYPE RscTypCont::WriteRc( WriteRcContext& rContext )
     RscWriteRc aMem( nByteOrder );
     aVersion.pClass->WriteRcHeader( aVersion, aMem, this, RscId( RSCVERSION_ID ), 0, TRUE );
     aEnumRef.aEnumObj.WriteRcFile( aMem, rContext.fOutput );
-
+        
     return aError;
 }
 
 /*************************************************************************
 |*
-|*    RscTypCont :: WriteSrc
+|*	  RscTypCont :: WriteSrc
 |*
-|*    Beschreibung      RES.DOC
-|*    Ersterstellung    MM 22.03.90
-|*    Letzte Aenderung  MM 27.06.90
+|*	  Beschreibung		RES.DOC
+|*	  Ersterstellung	MM 22.03.90
+|*	  Letzte Aenderung	MM 27.06.90
 |*
 *************************************************************************/
 void RscTypCont :: WriteSrc( FILE * fOutput, ULONG nFileKey,
                              CharSet /*nCharSet*/, BOOL bName )
 {
-    RscFile     *   pFName;
+    RscFile 	*	pFName;
     RscEnumerateRef aEnumRef( this, pRoot, fOutput );
 
     unsigned char aUTF8BOM[3] = { 0xef, 0xbb, 0xbf };
@@ -879,11 +879,11 @@ void RscTypCont :: WriteSrc( FILE * fOutput, ULONG nFileKey,
 
 /*************************************************************************
 |*
-|*    RscTypCont :: WriteHxx
+|*	  RscTypCont :: WriteHxx
 |*
-|*    Beschreibung
-|*    Ersterstellung    MM 30.05.91
-|*    Letzte Aenderung  MM 30.05.91
+|*	  Beschreibung
+|*	  Ersterstellung	MM 30.05.91
+|*	  Letzte Aenderung	MM 30.05.91
 |*
 *************************************************************************/
 ERRTYPE RscTypCont :: WriteHxx( FILE * fOutput, ULONG nFileKey )
@@ -924,11 +924,11 @@ ERRTYPE RscTypCont :: WriteHxx( FILE * fOutput, ULONG nFileKey )
     fprintf( fOutput, "#include <svtools/svmedit.hxx>\n" );
 
     RscEnumerateRef aEnumRef( this, pRoot, fOutput );
-    ERRTYPE         aError;
+    ERRTYPE 		aError;
 
     if( NOFILE_INDEX == nFileKey )
     {
-        RscFile     *   pFName;
+        RscFile 	*	pFName;
 
         pFName = aFileTab.First();
         while( pFName  )
@@ -945,18 +945,18 @@ ERRTYPE RscTypCont :: WriteHxx( FILE * fOutput, ULONG nFileKey )
 
 /*************************************************************************
 |*
-|*    RscTypCont :: WriteCxx
+|*	  RscTypCont :: WriteCxx
 |*
-|*    Beschreibung
-|*    Ersterstellung    MM 30.05.91
-|*    Letzte Aenderung  MM 30.05.91
+|*	  Beschreibung
+|*	  Ersterstellung	MM 30.05.91
+|*	  Letzte Aenderung	MM 30.05.91
 |*
 *************************************************************************/
 ERRTYPE RscTypCont::WriteCxx( FILE * fOutput, ULONG nFileKey,
                               const ByteString & rHxxName )
 {
     RscEnumerateRef aEnumRef( this, pRoot, fOutput );
-    ERRTYPE         aError;
+    ERRTYPE 		aError;
     fprintf( fOutput, "#include <string.h>\n" );
     WriteInc( fOutput, nFileKey );
     if( rHxxName.Len() )
@@ -965,7 +965,7 @@ ERRTYPE RscTypCont::WriteCxx( FILE * fOutput, ULONG nFileKey,
 
     if( NOFILE_INDEX == nFileKey )
     {
-        RscFile     *   pFName;
+        RscFile 	*	pFName;
 
         pFName = aFileTab.First();
         while( pFName  )
@@ -982,11 +982,11 @@ ERRTYPE RscTypCont::WriteCxx( FILE * fOutput, ULONG nFileKey,
 
 /*************************************************************************
 |*
-|*    RscTypCont :: WriteSyntax
+|*	  RscTypCont :: WriteSyntax
 |*
-|*    Beschreibung
-|*    Ersterstellung    MM 30.05.91
-|*    Letzte Aenderung  MM 30.05.91
+|*	  Beschreibung
+|*	  Ersterstellung	MM 30.05.91
+|*	  Letzte Aenderung	MM 30.05.91
 |*
 *************************************************************************/
 void RscTypCont::WriteSyntax( FILE * fOutput )
@@ -1009,11 +1009,11 @@ void RscTypCont::WriteRcCtor
 
 /*************************************************************************
 |*
-|*    RscTypCont :: Delete()
+|*	  RscTypCont :: Delete()
 |*
-|*    Beschreibung
-|*    Ersterstellung    MM 09.12.91
-|*    Letzte Aenderung  MM 09.12.91
+|*	  Beschreibung
+|*	  Ersterstellung	MM 09.12.91
+|*	  Letzte Aenderung	MM 09.12.91
 |*
 *************************************************************************/
 class RscDel
@@ -1048,11 +1048,11 @@ void RscTypCont :: Delete( ULONG lFileKey ){
 
 /*************************************************************************
 |*
-|*    RscTypCont :: MakeConsistent()
+|*	  RscTypCont :: MakeConsistent()
 |*
-|*    Beschreibung
-|*    Ersterstellung    MM 23.09.91
-|*    Letzte Aenderung  MM 23.09.91
+|*	  Beschreibung
+|*	  Ersterstellung	MM 23.09.91
+|*	  Letzte Aenderung	MM 23.09.91
 |*
 *************************************************************************/
 BOOL IsInstConsistent( ObjNode * pObjNode, RscTop * pRscTop,
diff --git a/rsc/source/parser/rscibas.cxx b/rsc/source/parser/rscibas.cxx
index 1a896c897e27..793e884b2bd5 100644
--- a/rsc/source/parser/rscibas.cxx
+++ b/rsc/source/parser/rscibas.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
@@ -72,9 +72,9 @@ void RscTypCont::SETCONST( RscConst * pClass, Atom nName, UINT32 nVal )
 
 /****************** C O D E **********************************************/
 /*************************************************************************
-|*    RscTypCont::InitLangType()
+|*	  RscTypCont::InitLangType()
 |*
-|*    Beschreibung
+|*	  Beschreibung
 *************************************************************************/
 
 typedef std::hash_map< rtl::OString, sal_uInt32, rtl::OStringHash > langmap;
@@ -92,13 +92,13 @@ void RscLangEnum::Init( RscNameTable& rNames )
 {
     SetConstant( rNames.Put( "SYSTEM", CONSTNAME, (long)LANGUAGE_SYSTEM ), LANGUAGE_SYSTEM );
     SetConstant( rNames.Put( "DONTKNOW", CONSTNAME, LANGUAGE_DONTKNOW ), LANGUAGE_DONTKNOW );
-
+    
     sal_Int32 nIndex = 0;
     mnLangId = 0x400; // stay away from selfdefined...
     char csep = '-';
     const MsLangId::IsoLangEntry* pLangEntry;
     ByteString aCountry, aLang;
-
+    
     while ( NULL != ( pLangEntry = MsLangId::getIsoLangEntry( nIndex )) && ( pLangEntry->mnLang != LANGUAGE_DONTKNOW ))
     {
 #if OSL_DEBUG_LEVEL > 2
@@ -173,7 +173,7 @@ void RscLangEnum::Init( RscNameTable& rNames )
             nTokenCounter++;
         }
     }
-
+    
     SetConstant( rNames.Put( "LANGUAGE_USER1", CONSTNAME, LANGUAGE_USER1 ), LANGUAGE_USER1 );
     SetConstant( rNames.Put( "LANGUAGE_USER2", CONSTNAME, LANGUAGE_USER2 ), LANGUAGE_USER2 );
     SetConstant( rNames.Put( "LANGUAGE_USER3", CONSTNAME, LANGUAGE_USER3 ), LANGUAGE_USER3 );
@@ -213,11 +213,11 @@ RscEnum * RscTypCont::InitLangType()
 
 /*************************************************************************
 |*
-|*    RscTypCont::InitFieldUnitsType()
+|*	  RscTypCont::InitFieldUnitsType()
 |*
-|*    Beschreibung
-|*    Ersterstellung    MM 22.03.91
-|*    Letzte Aenderung  MM 27.06.91
+|*	  Beschreibung
+|*	  Ersterstellung	MM 22.03.91
+|*	  Letzte Aenderung	MM 27.06.91
 |*
 *************************************************************************/
 RscEnum * RscTypCont::InitFieldUnitsType()
@@ -237,6 +237,9 @@ RscEnum * RscTypCont::InitFieldUnitsType()
     SETCONST( pFieldUnits, "FUNIT_FOOT", FUNIT_FOOT );
     SETCONST( pFieldUnits, "FUNIT_MILE", FUNIT_MILE );
     SETCONST( pFieldUnits, "FUNIT_CUSTOM", FUNIT_CUSTOM );
+    // Amelia : adds two units ,"char" and "line"
+    SETCONST( pFieldUnits, "FUNIT_CHAR", FUNIT_CHAR );
+    SETCONST( pFieldUnits, "FUNIT_LINE", FUNIT_LINE );
     SETCONST( pFieldUnits, "FUNIT_PERCENT", FUNIT_PERCENT );
 
     return pFieldUnits;
@@ -244,11 +247,11 @@ RscEnum * RscTypCont::InitFieldUnitsType()
 
 /*************************************************************************
 |*
-|*    RscTypCont::InitTimeFieldFormat()
+|*	  RscTypCont::InitTimeFieldFormat()
 |*
-|*    Beschreibung
-|*    Ersterstellung    MM 22.03.91
-|*    Letzte Aenderung  MM 27.06.91
+|*	  Beschreibung
+|*	  Ersterstellung	MM 22.03.91
+|*	  Letzte Aenderung	MM 27.06.91
 |*
 *************************************************************************/
 RscEnum * RscTypCont::InitTimeFieldFormat()
@@ -266,11 +269,11 @@ RscEnum * RscTypCont::InitTimeFieldFormat()
 
 /*************************************************************************
 |*
-|*    RscTypCont::InitColor()
+|*	  RscTypCont::InitColor()
 |*
-|*    Beschreibung
-|*    Ersterstellung    MM 24.05.91
-|*    Letzte Aenderung  MM 24.05.91
+|*	  Beschreibung
+|*	  Ersterstellung	MM 24.05.91
+|*	  Letzte Aenderung	MM 24.05.91
 |*
 *************************************************************************/
 RscEnum * RscTypCont::InitColor(){
@@ -299,11 +302,11 @@ RscEnum * RscTypCont::InitColor(){
 
 /*************************************************************************
 |*
-|*    RscTypCont::InitMapUnit()
+|*	  RscTypCont::InitMapUnit()
 |*
-|*    Beschreibung
-|*    Ersterstellung    MM 24.05.91
-|*    Letzte Aenderung  MM 24.05.91
+|*	  Beschreibung
+|*	  Ersterstellung	MM 24.05.91
+|*	  Letzte Aenderung	MM 24.05.91
 |*
 *************************************************************************/
 RscEnum * RscTypCont::InitMapUnit(){
@@ -329,11 +332,11 @@ RscEnum * RscTypCont::InitMapUnit(){
 
 /*************************************************************************
 |*
-|*    RscTypCont::InitKey()
+|*	  RscTypCont::InitKey()
 |*
-|*    Beschreibung
-|*    Ersterstellung    MM 24.05.91
-|*    Letzte Aenderung  MM 24.05.91
+|*	  Beschreibung
+|*	  Ersterstellung	MM 24.05.91
+|*	  Letzte Aenderung	MM 24.05.91
 |*
 *************************************************************************/
 RscEnum * RscTypCont::InitKey(){
@@ -453,11 +456,11 @@ RscEnum * RscTypCont::InitKey(){
 
 /*************************************************************************
 |*
-|*    RscTypCont::InitTriState()
+|*	  RscTypCont::InitTriState()
 |*
-|*    Beschreibung
-|*    Ersterstellung    MM 26.11.91
-|*    Letzte Aenderung  MM 26.11.91
+|*	  Beschreibung
+|*	  Ersterstellung	MM 26.11.91
+|*	  Letzte Aenderung	MM 26.11.91
 |*
 *************************************************************************/
 RscEnum * RscTypCont::InitTriState(){
@@ -473,11 +476,11 @@ RscEnum * RscTypCont::InitTriState(){
 
 /*************************************************************************
 |*
-|*    RscTypCont::InitMessButtons()
+|*	  RscTypCont::InitMessButtons()
 |*
-|*    Beschreibung
-|*    Ersterstellung    MM 24.05.91
-|*    Letzte Aenderung  MM 24.05.91
+|*	  Beschreibung
+|*	  Ersterstellung	MM 24.05.91
+|*	  Letzte Aenderung	MM 24.05.91
 |*
 *************************************************************************/
 RscEnum * RscTypCont::InitMessButtons()
@@ -495,11 +498,11 @@ RscEnum * RscTypCont::InitMessButtons()
 
 /*************************************************************************
 |*
-|*    RscTypCont::InitMessDefButton()
+|*	  RscTypCont::InitMessDefButton()
 |*
-|*    Beschreibung
-|*    Ersterstellung    MM 24.05.91
-|*    Letzte Aenderung  MM 24.05.91
+|*	  Beschreibung
+|*	  Ersterstellung	MM 24.05.91
+|*	  Letzte Aenderung	MM 24.05.91
 |*
 *************************************************************************/
 RscEnum * RscTypCont::InitMessDefButton(){
@@ -518,17 +521,17 @@ RscEnum * RscTypCont::InitMessDefButton(){
 
 /*************************************************************************
 |*
-|*    RscTypCont::InitGeometry()
+|*	  RscTypCont::InitGeometry()
 |*
-|*    Beschreibung
-|*    Ersterstellung    MM 24.05.91
-|*    Letzte Aenderung  MM 24.05.91
+|*	  Beschreibung
+|*	  Ersterstellung	MM 24.05.91
+|*	  Letzte Aenderung	MM 24.05.91
 |*
 *************************************************************************/
 RscTupel * RscTypCont::InitGeometry()
 {
-    RscTop *    pTupel;
-    Atom        nId;
+    RscTop *	pTupel;
+    Atom		nId;
 
     // Clientvariablen einfuegen
     pTupel = new RscTupel( pHS->getID( "TupelDeltaSystem" ),
@@ -547,11 +550,11 @@ RscTupel * RscTypCont::InitGeometry()
 
 /*************************************************************************
 |*
-|*    RscTypCont::InitLangGeometry()
+|*	  RscTypCont::InitLangGeometry()
 |*
-|*    Beschreibung
-|*    Ersterstellung    MM 24.05.91
-|*    Letzte Aenderung  MM 24.05.91
+|*	  Beschreibung
+|*	  Ersterstellung	MM 24.05.91
+|*	  Letzte Aenderung	MM 24.05.91
 |*
 *************************************************************************/
 RscArray * RscTypCont::InitLangGeometry( RscTupel * pGeo )
@@ -561,11 +564,11 @@ RscArray * RscTypCont::InitLangGeometry( RscTupel * pGeo )
 
 /*************************************************************************
 |*
-|*    RscTypCont::InitStringList()
+|*	  RscTypCont::InitStringList()
 |*
-|*    Beschreibung
-|*    Ersterstellung    MM 24.05.91
-|*    Letzte Aenderung  MM 24.05.91
+|*	  Beschreibung
+|*	  Ersterstellung	MM 24.05.91
+|*	  Letzte Aenderung	MM 24.05.91
 |*
 *************************************************************************/
 RscCont * RscTypCont::InitStringList()
@@ -580,11 +583,11 @@ RscCont * RscTypCont::InitStringList()
 
 /*************************************************************************
 |*
-|*    RscTypCont::InitLangStringList()
+|*	  RscTypCont::InitLangStringList()
 |*
-|*    Beschreibung
-|*    Ersterstellung    MM 24.05.91
-|*    Letzte Aenderung  MM 24.05.91
+|*	  Beschreibung
+|*	  Ersterstellung	MM 24.05.91
+|*	  Letzte Aenderung	MM 24.05.91
 |*
 *************************************************************************/
 RscArray * RscTypCont::InitLangStringList( RscCont * pStrLst )
@@ -595,17 +598,17 @@ RscArray * RscTypCont::InitLangStringList( RscCont * pStrLst )
 
 /*************************************************************************
 |*
-|*    RscTypCont::InitStringTupel()
+|*	  RscTypCont::InitStringTupel()
 |*
-|*    Beschreibung
-|*    Ersterstellung    MM 24.05.91
-|*    Letzte Aenderung  MM 24.05.91
+|*	  Beschreibung
+|*	  Ersterstellung	MM 24.05.91
+|*	  Letzte Aenderung	MM 24.05.91
 |*
 *************************************************************************/
 RscTupel * RscTypCont::InitStringTupel()
 {
-    RscTop *    pTupel;
-    Atom        nId;
+    RscTop *	pTupel;
+    Atom		nId;
 
     // Clientvariablen einfuegen
     pTupel = new RscTupel( pHS->getID( "CharsTupel" ), RSC_NOTYPE, NULL );
@@ -619,17 +622,17 @@ RscTupel * RscTypCont::InitStringTupel()
 
 /*************************************************************************
 |*
-|*    RscTypCont::InitStringLongTupel()
+|*	  RscTypCont::InitStringLongTupel()
 |*
-|*    Beschreibung
-|*    Ersterstellung    MM 18.07.94
-|*    Letzte Aenderung  MM 18.07.94
+|*	  Beschreibung
+|*	  Ersterstellung	MM 18.07.94
+|*	  Letzte Aenderung	MM 18.07.94
 |*
 *************************************************************************/
 RscTupel * RscTypCont::InitStringLongTupel()
 {
-    RscTop *    pTupel;
-    Atom        nId;
+    RscTop *	pTupel;
+    Atom		nId;
 
     // Clientvariablen einfuegen
     pTupel = new RscTupel( pHS->getID( "CharsLongTupel" ), RSC_NOTYPE, NULL );
@@ -643,11 +646,11 @@ RscTupel * RscTypCont::InitStringLongTupel()
 
 /*************************************************************************
 |*
-|*    RscTypCont::InitStringTupelList()
+|*	  RscTypCont::InitStringTupelList()
 |*
-|*    Beschreibung
-|*    Ersterstellung    MM 24.05.91
-|*    Letzte Aenderung  MM 24.05.91
+|*	  Beschreibung
+|*	  Ersterstellung	MM 24.05.91
+|*	  Letzte Aenderung	MM 24.05.91
 |*
 *************************************************************************/
 RscCont * RscTypCont::InitStringTupelList( RscTupel * pTupelString )
@@ -662,11 +665,11 @@ RscCont * RscTypCont::InitStringTupelList( RscTupel * pTupelString )
 
 /*************************************************************************
 |*
-|*    RscTypCont::InitStringLongTupelList()
+|*	  RscTypCont::InitStringLongTupelList()
 |*
-|*    Beschreibung
-|*    Ersterstellung    MM 24.05.91
-|*    Letzte Aenderung  MM 24.05.91
+|*	  Beschreibung
+|*	  Ersterstellung	MM 24.05.91
+|*	  Letzte Aenderung	MM 24.05.91
 |*
 *************************************************************************/
 RscCont * RscTypCont::InitStringLongTupelList( RscTupel * pStringLong )
@@ -681,11 +684,11 @@ RscCont * RscTypCont::InitStringLongTupelList( RscTupel * pStringLong )
 
 /*************************************************************************
 |*
-|*    RscTypCont::InitLangStringTupelList()
+|*	  RscTypCont::InitLangStringTupelList()
 |*
-|*    Beschreibung
-|*    Ersterstellung    MM 24.05.91
-|*    Letzte Aenderung  MM 24.05.91
+|*	  Beschreibung
+|*	  Ersterstellung	MM 24.05.91
+|*	  Letzte Aenderung	MM 24.05.91
 |*
 *************************************************************************/
 RscArray * RscTypCont::InitLangStringTupelList( RscCont * pStrTupelLst )
@@ -696,11 +699,11 @@ RscArray * RscTypCont::InitLangStringTupelList( RscCont * pStrTupelLst )
 
 /*************************************************************************
 |*
-|*    RscTypCont::InitLangStringLongTupelList()
+|*	  RscTypCont::InitLangStringLongTupelList()
 |*
-|*    Beschreibung
-|*    Ersterstellung    MM 24.05.91
-|*    Letzte Aenderung  MM 24.05.91
+|*	  Beschreibung
+|*	  Ersterstellung	MM 24.05.91
+|*	  Letzte Aenderung	MM 24.05.91
 |*
 *************************************************************************/
 RscArray * RscTypCont::InitLangStringLongTupelList( RscCont * pStrLongTupelLst )
diff --git a/rsc/source/parser/rscicpx.cxx b/rsc/source/parser/rscicpx.cxx
index 625417769f45..ccebdb8bbbdd 100644
--- a/rsc/source/parser/rscicpx.cxx
+++ b/rsc/source/parser/rscicpx.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
@@ -46,7 +46,7 @@
 #include <yyrscyacc.hxx>
 
 /*************************************************************************
-|*    RscTypCont::InsWinBit()
+|*	  RscTypCont::InsWinBit()
 *************************************************************************/
 void RscTypCont::InsWinBit( RscTop * pClass, const ByteString & rName,
                             Atom nVal )
@@ -63,17 +63,17 @@ void RscTypCont::InsWinBit( RscTop * pClass, const ByteString & rName,
                          VAR_NODATAINST, 0, nWinBitVarId );
 }
 
-#define INS_WINBIT( pClass, WinBit )        \
+#define INS_WINBIT( pClass, WinBit )		\
     InsWinBit( pClass, #WinBit, n##WinBit##Id );
 
 /*************************************************************************
-|*    RscTypCont::InitClassMgr()
+|*	  RscTypCont::InitClassMgr()
 *************************************************************************/
 RscTop * RscTypCont::InitClassMgr()
 {
-    RscTop      *   pClassMgr;
-    RscBaseCont *   pClass;
-    Atom            nId;
+    RscTop		*	pClassMgr;
+    RscBaseCont *	pClass;
+    Atom			nId;
 
     aBaseLst.Insert( pClass =
         new RscBaseCont( InvalidAtom, RSC_NOTYPE, NULL, FALSE ),
@@ -86,7 +86,7 @@ RscTop * RscTypCont::InitClassMgr()
 
     // Variablen anlegen
     {
-        RscContWriteSrc *   pCont;
+        RscContWriteSrc *	pCont;
 
         // Variablen anlegen
         aBaseLst.Insert(
@@ -106,11 +106,11 @@ RscTop * RscTypCont::InitClassMgr()
 }
 
 /*************************************************************************
-|*    RscTypCont::InitClassString()
+|*	  RscTypCont::InitClassString()
 *************************************************************************/
 RscTop * RscTypCont::InitClassString( RscTop * pSuper ){
-    Atom        nId;
-    RscTop *    pClassString;
+    Atom		nId;
+    RscTop *	pClassString;
 
     nId = pHS->getID( "String" );
     pClassString = new RscClass( nId, RSC_STRING, pSuper );
@@ -124,11 +124,11 @@ RscTop * RscTypCont::InitClassString( RscTop * pSuper ){
 }
 
 /*************************************************************************
-|*    RscTypCont::InitClassBitmap()
+|*	  RscTypCont::InitClassBitmap()
 *************************************************************************/
 RscTop * RscTypCont::InitClassBitmap( RscTop * pSuper ){
-    Atom        nId;
-    RscTop *    pClassBitmap;
+    Atom		nId;
+    RscTop *	pClassBitmap;
 
     nId = pHS->getID( "Bitmap" );
     pClassBitmap = new RscSysDepend( nId, RSC_BITMAP, pSuper );
@@ -144,11 +144,11 @@ RscTop * RscTypCont::InitClassBitmap( RscTop * pSuper ){
 }
 
 /*************************************************************************
-|*    RscTypCont::InitClassColor()
+|*	  RscTypCont::InitClassColor()
 *************************************************************************/
 RscTop * RscTypCont::InitClassColor( RscTop * pSuper, RscEnum * pColor ){
-    Atom        nId;
-    RscTop *    pClassColor;
+    Atom		nId;
+    RscTop *	pClassColor;
 
     // Klasse anlegen
     nId = pHS->getID( "Color" );
@@ -170,13 +170,13 @@ RscTop * RscTypCont::InitClassColor( RscTop * pSuper, RscEnum * pColor ){
 }
 
 /*************************************************************************
-|*    RscTypCont::InitClassImage()
+|*	  RscTypCont::InitClassImage()
 *************************************************************************/
 RscTop * RscTypCont::InitClassImage( RscTop * pSuper, RscTop * pClassBitmap,
                                      RscTop * pClassColor )
 {
-    Atom        nId;
-    RscTop *    pClassImage;
+    Atom		nId;
+    RscTop *	pClassImage;
 
     // Klasse anlegen
     nId = pHS->getID( "Image" );
@@ -197,13 +197,13 @@ RscTop * RscTypCont::InitClassImage( RscTop * pSuper, RscTop * pClassBitmap,
 }
 
 /*************************************************************************
-|*    RscTypCont::InitClassImageList()
+|*	  RscTypCont::InitClassImageList()
 *************************************************************************/
 RscTop * RscTypCont::InitClassImageList( RscTop * pSuper, RscTop * /*pClassBitmap*/,
                                          RscTop * pClassColor, RscCont * pStrLst )
 {
-    Atom        nId;
-    RscTop *    pClassImageList;
+    Atom		nId;
+    RscTop *	pClassImageList;
 
     // Klasse anlegen
     nId = pHS->getID( "ImageList" );
@@ -217,14 +217,14 @@ RscTop * RscTypCont::InitClassImageList( RscTop * pSuper, RscTop * /*pClassBitma
     nId = aNmTb.Put( "MaskColor", VARNAME );
     pClassImageList->SetVariable( nId, pClassColor, NULL,
                                   VAR_SVDYNAMIC, RSC_IMAGELIST_MASKCOLOR );
-
+    
     RscCont * pCont = new RscCont( pHS->getID( "USHORT *" ), RSC_NOTYPE );
     pCont->SetTypeClass( &aIdUShort );
     aBaseLst.Insert( pCont, LIST_APPEND );
     nId = aNmTb.Put( "IdList", VARNAME );
     pClassImageList->SetVariable( nId, pCont, NULL, 0,
                                       RSC_IMAGELIST_IDLIST );
-
+                                      
     nId = aNmTb.Put( "FileList", VARNAME );
     pClassImageList->SetVariable( nId, pStrLst );
 
@@ -235,13 +235,13 @@ RscTop * RscTypCont::InitClassImageList( RscTop * pSuper, RscTop * /*pClassBitma
 }
 
 /*************************************************************************
-|*    RscTypCont::InitClassWindow()
+|*	  RscTypCont::InitClassWindow()
 *************************************************************************/
 RscTop * RscTypCont::InitClassWindow( RscTop * pSuper, RscEnum * pMapUnit,
                                  RscArray * pLangGeo )
 {
-    Atom        nId;
-    RscTop *    pClassWindow;
+    Atom		nId;
+    RscTop *	pClassWindow;
 
     // Klasse anlegen
     nId = pHS->getID( "Window" );
@@ -251,9 +251,9 @@ RscTop * RscTypCont::InitClassWindow( RscTop * pSuper, RscEnum * pMapUnit,
 
     // Variablen anlegen
     {
-        RscFlag *   pFlag;
+        RscFlag *	pFlag;
         RscClient * pClient;
-        Atom        nVarId, nDisableId, nOutputSizeId;
+        Atom		nVarId, nDisableId, nOutputSizeId;
 
         aBaseLst.Insert( pFlag = new RscFlag( pHS->getID( "FlagWndExtra" ),
                                               RSC_NOTYPE ),
@@ -312,7 +312,7 @@ RscTop * RscTypCont::InitClassWindow( RscTop * pSuper, RscEnum * pMapUnit,
     nRsc_WIDTH = nId = aNmTb.Put( "_Width", VARNAME );
     pClassWindow->SetVariable( nId, &aLong, NULL, 0, WINDOW_WIDTH  );
     nRsc_HEIGHT = nId = aNmTb.Put( "_Height", VARNAME );
-    pClassWindow->SetVariable( nId, &aLong, NULL, 0, WINDOW_HEIGHT  );
+    pClassWindow->SetVariable( nId, &aLong, NULL, 0, WINDOW_HEIGHT	);
 
     nRsc_DELTALANG = nId = aNmTb.Put( "DeltaLang", VARNAME );
     pClassWindow->SetVariable( nId, pLangGeo, NULL, VAR_NORC | VAR_NOENUM);
@@ -349,12 +349,12 @@ RscTop * RscTypCont::InitClassWindow( RscTop * pSuper, RscEnum * pMapUnit,
 }
 
 /*************************************************************************
-|*    RscTypCont::InitClassSystemWindow()
+|*	  RscTypCont::InitClassSystemWindow()
 *************************************************************************/
 RscTop * RscTypCont::InitClassSystemWindow( RscTop * pSuper )
 {
-    Atom        nId;
-    RscTop *    pClassSystemWindow;
+    Atom		nId;
+    RscTop *	pClassSystemWindow;
 
     // Klasse anlegen
     nId = pHS->getID( "SystemWindow" );
@@ -374,12 +374,12 @@ RscTop * RscTypCont::InitClassSystemWindow( RscTop * pSuper )
 }
 
 /*************************************************************************
-|*    RscTypCont::InitClassWorkWindow()
+|*	  RscTypCont::InitClassWorkWindow()
 *************************************************************************/
 RscTop * RscTypCont::InitClassWorkWindow( RscTop * pSuper )
 {
-    Atom        nId;
-    RscTop *    pClassWorkWindow;
+    Atom		nId;
+    RscTop *	pClassWorkWindow;
 
     // Klasse anlegen
     nId = pHS->getID( "WorkWindow" );
@@ -390,7 +390,7 @@ RscTop * RscTypCont::InitClassWorkWindow( RscTop * pSuper )
 
     // Variablen anlegen
     {
-        Atom        nVarId;
+        Atom		nVarId;
         RscEnum   * pShow;
 
         aBaseLst.Insert( pShow = new RscEnum( pHS->getID( "EnumShowState" ),
@@ -411,12 +411,12 @@ RscTop * RscTypCont::InitClassWorkWindow( RscTop * pSuper )
 }
 
 /*************************************************************************
-|*    RscTypCont::InitClassDialogBox()
+|*	  RscTypCont::InitClassDialogBox()
 *************************************************************************/
 RscTop * RscTypCont::InitClassModalDialog( RscTop * pSuper )
 {
-    Atom        nId;
-    RscTop *    pClassDialog;
+    Atom		nId;
+    RscTop *	pClassDialog;
 
     // Klasse anlegen
     nId = pHS->getID( "ModalDialog" );
@@ -430,12 +430,12 @@ RscTop * RscTypCont::InitClassModalDialog( RscTop * pSuper )
 }
 
 /*************************************************************************
-|*    RscTypCont::InitClassModelessDialog()
+|*	  RscTypCont::InitClassModelessDialog()
 *************************************************************************/
 RscTop * RscTypCont::InitClassModelessDialog( RscTop * pSuper )
 {
-    Atom        nId;
-    RscTop *    pClassDialog;
+    Atom		nId;
+    RscTop *	pClassDialog;
 
     // Klasse anlegen
     nId = pHS->getID( "ModelessDialog" );
@@ -447,12 +447,12 @@ RscTop * RscTypCont::InitClassModelessDialog( RscTop * pSuper )
 }
 
 /*************************************************************************
-|*    RscTypCont::InitClassControl()
+|*	  RscTypCont::InitClassControl()
 *************************************************************************/
 RscTop * RscTypCont::InitClassControl( RscTop * pSuper )
 {
-    Atom        nId;
-    RscTop *    pClassControl;
+    Atom		nId;
+    RscTop *	pClassControl;
 
     // Klasse anlegen
     nId = pHS->getID( "Control" );
@@ -467,12 +467,12 @@ RscTop * RscTypCont::InitClassControl( RscTop * pSuper )
 }
 
 /*************************************************************************
-|*    RscTypCont::InitClassCheckBox()
+|*	  RscTypCont::InitClassCheckBox()
 *************************************************************************/
 RscTop * RscTypCont::InitClassCheckBox( RscTop * pSuper )
 {
-    Atom        nId;
-    RscTop *    pClassCheckBox;
+    Atom		nId;
+    RscTop *	pClassCheckBox;
 
     // Klasse anlegen
     nId = pHS->getID( "CheckBox" );
@@ -485,7 +485,7 @@ RscTop * RscTypCont::InitClassCheckBox( RscTop * pSuper )
     INS_WINBIT( pClassCheckBox, Top )
     INS_WINBIT( pClassCheckBox, VCenter )
     INS_WINBIT( pClassCheckBox, Bottom )
-
+    
     nId = aNmTb.Put( "Check", VARNAME );
     pClassCheckBox->SetVariable( nId, &aBool );
 
@@ -493,12 +493,12 @@ RscTop * RscTypCont::InitClassCheckBox( RscTop * pSuper )
 }
 
 /*************************************************************************
-|*    RscTypCont::InitClassPushButton()
+|*	  RscTypCont::InitClassPushButton()
 *************************************************************************/
 RscTop * RscTypCont::InitClassPushButton( RscTop * pSuper )
 {
-    Atom        nId;
-    RscTop *    pClassPushButton;
+    Atom		nId;
+    RscTop *	pClassPushButton;
 
     // Klasse anlegen
     nId = pHS->getID( "PushButton" );
@@ -515,13 +515,13 @@ RscTop * RscTypCont::InitClassPushButton( RscTop * pSuper )
 }
 
 /*************************************************************************
-|*    RscTypCont::InitClassTriStateBox()
+|*	  RscTypCont::InitClassTriStateBox()
 *************************************************************************/
 RscTop * RscTypCont::InitClassTriStateBox( RscTop * pSuper,
                                            RscEnum * pTriState )
 {
-    Atom        nId;
-    RscTop *    pClassTriStateBox;
+    Atom		nId;
+    RscTop *	pClassTriStateBox;
 
     nId = pHS->getID( "TriStateBox" );
     pClassTriStateBox = new RscClass( nId, RSC_TRISTATEBOX, pSuper );
@@ -538,13 +538,13 @@ RscTop * RscTypCont::InitClassTriStateBox( RscTop * pSuper,
 }
 
 /*************************************************************************
-|*    RscTypCont::InitClassMenuButton()
+|*	  RscTypCont::InitClassMenuButton()
 *************************************************************************/
 RscTop * RscTypCont::InitClassMenuButton( RscTop * pSuper,
                                            RscTop * pClassMenu )
 {
-    Atom        nId;
-    RscTop *    pClassMenuButton;
+    Atom		nId;
+    RscTop *	pClassMenuButton;
 
     nId = pHS->getID( "MenuButton" );
     pClassMenuButton = new RscClass( nId, RSC_MENUBUTTON, pSuper );
@@ -561,14 +561,14 @@ RscTop * RscTypCont::InitClassMenuButton( RscTop * pSuper,
 
 
 /*************************************************************************
-|*    RscTypCont::InitClassImageButton()
+|*	  RscTypCont::InitClassImageButton()
 *************************************************************************/
 RscTop * RscTypCont::InitClassImageButton( RscTop * pSuper,
                                            RscTop * pClassImage,
                                            RscEnum * pTriState )
 {
-    Atom        nId;
-    RscTop *    pClassImageButton;
+    Atom		nId;
+    RscTop *	pClassImageButton;
 
     // Klasse anlegen
     nId = pHS->getID( "ImageButton" );
@@ -584,7 +584,7 @@ RscTop * RscTypCont::InitClassImageButton( RscTop * pSuper,
     }
     // Variablen anlegen
     {
-        Atom        nVarId;
+        Atom		nVarId;
         RscEnum   * pSymbol;
 
         aBaseLst.Insert( pSymbol = new RscEnum( pHS->getID( "EnumSymbolButton" ),
@@ -632,15 +632,15 @@ RscTop * RscTypCont::InitClassImageButton( RscTop * pSuper,
 }
 
 /*************************************************************************
-|*    RscTypCont::InitClassEdit()
+|*	  RscTypCont::InitClassEdit()
 *************************************************************************/
 RscTop * RscTypCont::InitClassEdit( RscTop * pSuper )
 {
-    Atom        nId;
-    RscTop *    pClassEdit;
+    Atom		nId;
+    RscTop *	pClassEdit;
 
     // Klasse anlegen
-    nId                     = pHS->getID( "Edit" );
+    nId 					= pHS->getID( "Edit" );
     pClassEdit = new RscClass( nId, RSC_EDIT, pSuper );
     pClassEdit->SetCallPar( *pWinPar1, *pWinPar2, *pWinParType );
     aNmTb.Put( nId, CLASSNAME, pClassEdit );
@@ -658,12 +658,12 @@ RscTop * RscTypCont::InitClassEdit( RscTop * pSuper )
 }
 
 /*************************************************************************
-|*    RscTypCont::InitClassMultiLineedit()
+|*	  RscTypCont::InitClassMultiLineedit()
 *************************************************************************/
 RscTop * RscTypCont::InitClassMultiLineEdit( RscTop * pSuper )
 {
-    Atom        nId;
-    RscTop *    pClassMultiLineEdit;
+    Atom		nId;
+    RscTop *	pClassMultiLineEdit;
 
     // Klasse anlegen
     nId = pHS->getID( "MultiLineEdit" );
@@ -681,12 +681,12 @@ RscTop * RscTypCont::InitClassMultiLineEdit( RscTop * pSuper )
 }
 
 /*************************************************************************
-|*    RscTypCont::InitClassScrollBar()
+|*	  RscTypCont::InitClassScrollBar()
 *************************************************************************/
 RscTop * RscTypCont::InitClassScrollBar( RscTop * pSuper )
 {
-    Atom        nId;
-    RscTop *    pClassScrollBar;
+    Atom		nId;
+    RscTop *	pClassScrollBar;
 
     // Klasse anlegen
     nId = pHS->getID( "ScrollBar" );
@@ -698,11 +698,11 @@ RscTop * RscTypCont::InitClassScrollBar( RscTop * pSuper )
     nId = aNmTb.Put( "MinPos", VARNAME );
     pClassScrollBar->SetVariable( nId, &aShort );
     {
-        RSCINST     aDfltI;
+        RSCINST 	aDfltI;
 
         aDfltI = aShort.Create( NULL, RSCINST(), FALSE );
         aDfltI.pClass->SetNumber( aDfltI, 100 );
-//      aDfltI.pClass->MakeDefault( aDfltI );
+//		aDfltI.pClass->MakeDefault( aDfltI );
 
         nId = aNmTb.Put( "MaxPos", VARNAME );
         pClassScrollBar->SetVariable( nId, &aShort, &aDfltI );
@@ -710,21 +710,21 @@ RscTop * RscTypCont::InitClassScrollBar( RscTop * pSuper )
     nId = aNmTb.Put( "ThumbPos", VARNAME );
     pClassScrollBar->SetVariable( nId, &aShort );
     {
-        RSCINST     aDfltI;
+        RSCINST 	aDfltI;
 
         aDfltI = aShort.Create( NULL, RSCINST(), FALSE );
         aDfltI.pClass->SetNumber( aDfltI, 1 );
-//      aDfltI.pClass->MakeDefault( aDfltI );
+//		aDfltI.pClass->MakeDefault( aDfltI );
 
         nId = aNmTb.Put( "PageSize", VARNAME);
         pClassScrollBar->SetVariable( nId, &aShort, &aDfltI  );
     }
     {
-        RSCINST     aDfltI;
+        RSCINST 	aDfltI;
 
         aDfltI = aShort.Create( NULL, RSCINST(), FALSE );
         aDfltI.pClass->SetNumber( aDfltI, 1 );
-//      aDfltI.pClass->MakeDefault( aDfltI );
+//		aDfltI.pClass->MakeDefault( aDfltI );
         nId = aNmTb.Put( "LineSize", VARNAME );
         pClassScrollBar->SetVariable( nId, &aShort, &aDfltI );
     }
@@ -739,12 +739,12 @@ RscTop * RscTypCont::InitClassScrollBar( RscTop * pSuper )
 }
 
 /*************************************************************************
-|*    RscTypCont::InitClassListBox()
+|*	  RscTypCont::InitClassListBox()
 *************************************************************************/
 RscTop * RscTypCont::InitClassListBox( RscTop * pSuper, RscArray * pStrLst )
 {
-    Atom        nId;
-    RscTop *    pClassListBox;
+    Atom		nId;
+    RscTop *	pClassListBox;
 
     // Klasse anlegen
     nId = pHS->getID( "ListBox" );
@@ -774,12 +774,12 @@ RscTop * RscTypCont::InitClassListBox( RscTop * pSuper, RscArray * pStrLst )
 }
 
 /*************************************************************************
-|*    RscTypCont::InitClassMultiListBox()
+|*	  RscTypCont::InitClassMultiListBox()
 *************************************************************************/
 RscTop * RscTypCont::InitClassMultiListBox( RscTop * pSuper )
 {
-    Atom        nId;
-    RscTop *    pClassMultiListBox;
+    Atom		nId;
+    RscTop *	pClassMultiListBox;
 
     // Klasse anlegen
     nId = pHS->getID( "MultiListBox" );
@@ -793,12 +793,12 @@ RscTop * RscTypCont::InitClassMultiListBox( RscTop * pSuper )
 }
 
 /*************************************************************************
-|*    RscTypCont::InitClassComboBox()
+|*	  RscTypCont::InitClassComboBox()
 *************************************************************************/
 RscTop * RscTypCont::InitClassComboBox( RscTop * pSuper, RscArray * pStrLst )
 {
-    Atom        nId;
-    RscTop *    pClassComboBox;
+    Atom		nId;
+    RscTop *	pClassComboBox;
 
     // Klasse anlegen
     nId = pHS->getID( "ComboBox" );
@@ -822,12 +822,12 @@ RscTop * RscTypCont::InitClassComboBox( RscTop * pSuper, RscArray * pStrLst )
 }
 
 /*************************************************************************
-|*    RscTypCont::InitClassFixedText()
+|*	  RscTypCont::InitClassFixedText()
 *************************************************************************/
 RscTop * RscTypCont::InitClassFixedText( RscTop * pSuper )
 {
-    Atom        nId;
-    RscTop *    pClassFixedText;
+    Atom		nId;
+    RscTop *	pClassFixedText;
 
     // Klasse anlegen
     nId = pHS->getID( "FixedText" );
@@ -850,12 +850,12 @@ RscTop * RscTypCont::InitClassFixedText( RscTop * pSuper )
 }
 
 /*************************************************************************
-|*    RscTypCont::InitClassFixedBitmap()
+|*	  RscTypCont::InitClassFixedBitmap()
 *************************************************************************/
 RscTop * RscTypCont::InitClassFixedBitmap( RscTop * pSuper, RscTop * pClassBitmap )
 {
-    Atom        nId;
-    RscTop *    pClassFixedBitmap;
+    Atom		nId;
+    RscTop *	pClassFixedBitmap;
 
     // Klasse anlegen
     nId = pHS->getID( "FixedBitmap" );
@@ -873,12 +873,12 @@ RscTop * RscTypCont::InitClassFixedBitmap( RscTop * pSuper, RscTop * pClassBitma
 }
 
 /*************************************************************************
-|*    RscTypCont::InitClassFixedImage()
+|*	  RscTypCont::InitClassFixedImage()
 *************************************************************************/
 RscTop * RscTypCont::InitClassFixedImage( RscTop * pSuper, RscTop * pClassImage )
 {
-    Atom        nId;
-    RscTop *    pClassFixedImage;
+    Atom		nId;
+    RscTop *	pClassFixedImage;
 
     // Klasse anlegen
     nId = pHS->getID( "FixedImage" );
@@ -894,12 +894,12 @@ RscTop * RscTypCont::InitClassFixedImage( RscTop * pSuper, RscTop * pClassImage
 }
 
 /*************************************************************************
-|*    RscTypCont::InitClassImageRadioButton()
+|*	  RscTypCont::InitClassImageRadioButton()
 *************************************************************************/
 RscTop * RscTypCont::InitClassRadioButton( RscTop * pSuper )
 {
-    Atom        nId;
-    RscTop *    pClassRadioButton;
+    Atom		nId;
+    RscTop *	pClassRadioButton;
 
     // Klasse anlegen
     nId = pHS->getID( "RadioButton" );
@@ -912,7 +912,7 @@ RscTop * RscTypCont::InitClassRadioButton( RscTop * pSuper )
     INS_WINBIT( pClassRadioButton, Top )
     INS_WINBIT( pClassRadioButton, VCenter )
     INS_WINBIT( pClassRadioButton, Bottom )
-
+    
     nId = aNmTb.Put( "Check", VARNAME );
     pClassRadioButton->SetVariable( nId, &aBool );
 
@@ -920,12 +920,12 @@ RscTop * RscTypCont::InitClassRadioButton( RscTop * pSuper )
 }
 
 /*************************************************************************
-|*    RscTypCont::InitClassImageRadioButton()
+|*	  RscTypCont::InitClassImageRadioButton()
 *************************************************************************/
 RscTop * RscTypCont::InitClassImageRadioButton( RscTop * pSuper, RscTop * pClassImage )
 {
-    Atom        nId;
-    RscTop *    pClassImageRadioButton;
+    Atom		nId;
+    RscTop *	pClassImageRadioButton;
 
     // Klasse anlegen
     nId = pHS->getID( "ImageRadioButton" );
@@ -942,12 +942,12 @@ RscTop * RscTypCont::InitClassImageRadioButton( RscTop * pSuper, RscTop * pClass
 }
 
 /*************************************************************************
-|*    RscTypCont::InitClassKeyCode()
+|*	  RscTypCont::InitClassKeyCode()
 *************************************************************************/
 RscTop * RscTypCont::InitClassKeyCode( RscTop * pSuper, RscEnum * pKey )
 {
-    Atom        nId;
-    RscTop *    pClassKeyCode;
+    Atom		nId;
+    RscTop *	pClassKeyCode;
 
     // Klasse anlegen
     nId = pHS->getID( "KeyCode" );
@@ -959,9 +959,9 @@ RscTop * RscTypCont::InitClassKeyCode( RscTop * pSuper, RscEnum * pKey )
     pClassKeyCode->SetVariable( nId, pKey );
 
     {
-        RscFlag *   pFlag;
+        RscFlag *	pFlag;
         RscClient * pClient;
-        Atom        nVarId, nShiftId, nMod1Id, nMod2Id;
+        Atom		nVarId, nShiftId, nMod1Id, nMod2Id;
 
         aBaseLst.Insert( pFlag = new RscFlag( pHS->getID( "FlagKeyModifier" ),
                                               RSC_NOTYPE ),
@@ -1007,7 +1007,7 @@ RscTop * RscTypCont::InitClassKeyCode( RscTop * pSuper, RscEnum * pKey )
                                    VAR_NODATAINST, 0, nVarId );
     }
     {
-        Atom        nVarId;
+        Atom		nVarId;
         RscEnum   * pKeyFunc;
 
         aBaseLst.Insert( pKeyFunc = new RscEnum( pHS->getID( "EnumKeyFunc" ),
@@ -1042,13 +1042,13 @@ RscTop * RscTypCont::InitClassKeyCode( RscTop * pSuper, RscEnum * pKey )
 }
 
 /*************************************************************************
-|*    RscTypCont::InitClassAccelItem()
+|*	  RscTypCont::InitClassAccelItem()
 *************************************************************************/
 RscTop * RscTypCont::InitClassAccelItem( RscTop * pSuper,
                                                                                 RscTop * pClassKeyCode )
 {
-    Atom        nId;
-    RscTop *    pClassAccelItem;
+    Atom		nId;
+    RscTop *	pClassAccelItem;
 
     // Klasse anlegen
     nId = pHS->getID( "AcceleratorItem" );
@@ -1068,12 +1068,12 @@ RscTop * RscTypCont::InitClassAccelItem( RscTop * pSuper,
 }
 
 /*************************************************************************
-|*    RscTypCont::InitClassAccelm()
+|*	  RscTypCont::InitClassAccelm()
 *************************************************************************/
 RscTop * RscTypCont::InitClassAccel( RscTop * pSuper, RscTop * pClassAccelItem )
 {
-    Atom        nId;
-    RscTop *    pClassAccel;
+    Atom		nId;
+    RscTop *	pClassAccel;
 
     // Klasse anlegen
     nId = pHS->getID( "Accelerator" );
@@ -1100,14 +1100,14 @@ RscTop * RscTypCont::InitClassAccel( RscTop * pSuper, RscTop * pClassAccelItem )
 }
 
 /*************************************************************************
-|*    RscTypCont::InitClassMenuItem()
+|*	  RscTypCont::InitClassMenuItem()
 *************************************************************************/
 RscTop * RscTypCont::InitClassMenuItem( RscTop * pSuper,
                                         RscTop * pClassBitmap,
                                                                                 RscTop * pClassKeyCode )
 {
-    Atom        nId;
-    RscTop *    pClassMenuItem;
+    Atom		nId;
+    RscTop *	pClassMenuItem;
 
     // Klasse anlegen
     nId = pHS->getID( "MenuItem" );
@@ -1122,10 +1122,10 @@ RscTop * RscTypCont::InitClassMenuItem( RscTop * pSuper,
     pClassMenuItem->SetVariable( nId, &aIdNoZeroUShort, NULL, 0,
                                  RSC_MENUITEM_ID );
     {
-        RscFlag *   pFlag;
+        RscFlag *	pFlag;
         RscClient * pClient;
-        Atom        nVarId, nAutoCheckId, nRadioCheckId;
-        Atom        nCheckableId, nAboutId, nHelpId;
+        Atom		nVarId, nAutoCheckId, nRadioCheckId;
+        Atom		nCheckableId, nAboutId, nHelpId;
 
         aBaseLst.Insert( pFlag = new RscFlag( pHS->getID( "FlagMenuState" ),
                                               RSC_NOTYPE ),
@@ -1220,13 +1220,13 @@ RscTop * RscTypCont::InitClassMenuItem( RscTop * pSuper,
 }
 
 /*************************************************************************
-|*    RscTypCont::InitClassMenu()
+|*	  RscTypCont::InitClassMenu()
 *************************************************************************/
 RscTop * RscTypCont::InitClassMenu( RscTop * pSuper,
                                     RscTop * pClassMenuItem )
 {
-    Atom        nId;
-    RscTop *    pClassMenu;
+    Atom		nId;
+    RscTop *	pClassMenu;
 
     // Klasse anlegen
     nId = pHS->getID( "Menu" );
@@ -1255,14 +1255,14 @@ RscTop * RscTypCont::InitClassMenu( RscTop * pSuper,
 }
 
 /*************************************************************************
-|*    RscTypCont::InitClassMessageBox()
+|*	  RscTypCont::InitClassMessageBox()
 *************************************************************************/
 RscTop * RscTypCont::InitClassMessBox( RscTop * pSuper,
                                        RscEnum * pMessButtons,
                                        RscEnum * pMessDefButton )
 {
-    Atom        nId;
-    RscTop *    pClassMessBox;
+    Atom		nId;
+    RscTop *	pClassMessBox;
 
     // Klasse anlegen
     nId = pHS->getID( "MessBox" );
@@ -1290,12 +1290,12 @@ RscTop * RscTypCont::InitClassMessBox( RscTop * pSuper,
 }
 
 /*************************************************************************
-|*    RscTypCont::InitClassSplitter()
+|*	  RscTypCont::InitClassSplitter()
 *************************************************************************/
 RscTop * RscTypCont::InitClassSplitter( RscTop * pSuper )
 {
-    Atom        nId;
-    RscTop *    pClassSplitter;
+    Atom		nId;
+    RscTop *	pClassSplitter;
 
     // Klasse anlegen
     nId = pHS->getID( "Splitter" );
@@ -1311,12 +1311,12 @@ RscTop * RscTypCont::InitClassSplitter( RscTop * pSuper )
 }
 
 /*************************************************************************
-|*    RscTypCont::InitClassSplitWindow()
+|*	  RscTypCont::InitClassSplitWindow()
 *************************************************************************/
 RscTop * RscTypCont::InitClassSplitWindow( RscTop * pSuper )
 {
-    Atom        nId;
-    RscTop *    pClassSplitWindow;
+    Atom		nId;
+    RscTop *	pClassSplitWindow;
 
     // Klasse anlegen
     nId = pHS->getID( "SplitWindow" );
@@ -1332,12 +1332,12 @@ RscTop * RscTypCont::InitClassSplitWindow( RscTop * pSuper )
 }
 
 /*************************************************************************
-|*    RscTypCont::InitClassTime()
+|*	  RscTypCont::InitClassTime()
 *************************************************************************/
 RscTop * RscTypCont::InitClassTime( RscTop * pSuper )
 {
-    Atom        nId;
-    RscTop *    pClassTime;
+    Atom		nId;
+    RscTop *	pClassTime;
 
     // Klasse anlegen
     nId = pHS->getID( "Time" );
@@ -1348,7 +1348,7 @@ RscTop * RscTypCont::InitClassTime( RscTop * pSuper )
 
     // Variablen anlegen
     nId = aNmTb.Put( "Hour", VARNAME );
-    pClassTime->SetVariable( nId, &a0to23Short, NULL, 0, TIME_HOUR  );
+    pClassTime->SetVariable( nId, &a0to23Short, NULL, 0, TIME_HOUR	);
 
     nId = aNmTb.Put( "Minute", VARNAME );
     pClassTime->SetVariable( nId, &a0to59Short, NULL, 0, TIME_MINUTE  );
@@ -1363,12 +1363,12 @@ RscTop * RscTypCont::InitClassTime( RscTop * pSuper )
 }
 
 /*************************************************************************
-|*    RscTypCont::InitClassDate()
+|*	  RscTypCont::InitClassDate()
 *************************************************************************/
 RscTop * RscTypCont::InitClassDate( RscTop * pSuper )
 {
-    Atom        nId;
-    RscTop *    pClassDate;
+    Atom		nId;
+    RscTop *	pClassDate;
 
     // Klasse anlegen
     nId = pHS->getID( "Date" );
@@ -1391,12 +1391,12 @@ RscTop * RscTypCont::InitClassDate( RscTop * pSuper )
 }
 
 /*************************************************************************
-|*    RscTypCont::InitClassPatternFormatter()
+|*	  RscTypCont::InitClassPatternFormatter()
 *************************************************************************/
 RscTop * RscTypCont::InitClassPatternFormatter( RscTop * pSuper )
 {
-    Atom        nId;
-    RscTop *    pClassPattern;
+    Atom		nId;
+    RscTop *	pClassPattern;
 
     // Klasse anlegen
     nId = pHS->getID( "PatternFormatter" );
@@ -1418,12 +1418,12 @@ RscTop * RscTypCont::InitClassPatternFormatter( RscTop * pSuper )
 }
 
 /*************************************************************************
-|*    RscTypCont::InitClassNumericFormatter()
+|*	  RscTypCont::InitClassNumericFormatter()
 *************************************************************************/
 RscTop * RscTypCont::InitClassNumericFormatter( RscTop * pSuper )
 {
-    Atom        nId;
-    RscTop *    pClassNumeric;
+    Atom		nId;
+    RscTop *	pClassNumeric;
 
     // Klasse anlegen
     nId = pHS->getID( "NumericFormatter" );
@@ -1454,13 +1454,13 @@ RscTop * RscTypCont::InitClassNumericFormatter( RscTop * pSuper )
 }
 
 /*************************************************************************
-|*    RscTypCont::InitClassMetricFormatter()
+|*	  RscTypCont::InitClassMetricFormatter()
 *************************************************************************/
 RscTop * RscTypCont::InitClassMetricFormatter( RscTop * pSuper,
                                                                                         RscEnum * pFieldUnits )
 {
-    Atom        nId;
-    RscTop *    pClassMetric;
+    Atom		nId;
+    RscTop *	pClassMetric;
 
     // Klasse anlegen
     nId = pHS->getID( "MetricFormatter" );
@@ -1479,15 +1479,15 @@ RscTop * RscTypCont::InitClassMetricFormatter( RscTop * pSuper,
 }
 
 /*************************************************************************
-|*    RscTypCont::InitClassCurrencyFormatter()
+|*	  RscTypCont::InitClassCurrencyFormatter()
 *************************************************************************/
 RscTop * RscTypCont::InitClassCurrencyFormatter
 (
     RscTop * pSuper,
     RscEnum * /* pFieldUnits */)
 {
-    Atom        nId;
-    RscTop *    pClassCurrency;
+    Atom		nId;
+    RscTop *	pClassCurrency;
 
     // Klasse anlegen
     nId = pHS->getID( "CurrencyFormatter" );
@@ -1498,13 +1498,13 @@ RscTop * RscTypCont::InitClassCurrencyFormatter
 }
 
 /*************************************************************************
-|*    RscTypCont::InitClassDateFormatter()
+|*	  RscTypCont::InitClassDateFormatter()
 *************************************************************************/
 RscTop * RscTypCont::InitClassDateFormatter( RscTop * pSuper,
                         RscTop * pClassDate )
 {
-    Atom        nId;
-    RscTop *    pClassDateF;
+    Atom		nId;
+    RscTop *	pClassDateF;
 
     // Klasse anlegen
     nId = pHS->getID( "DateFormatter" );
@@ -1532,14 +1532,14 @@ RscTop * RscTypCont::InitClassDateFormatter( RscTop * pSuper,
 }
 
 /*************************************************************************
-|*    RscTypCont::InitClassTimeFormatter()
+|*	  RscTypCont::InitClassTimeFormatter()
 *************************************************************************/
 RscTop * RscTypCont::InitClassTimeFormatter( RscTop * pSuper,
                         RscTop * pClassTime,
                         RscEnum * pTimeFieldFormat )
 {
-    Atom        nId;
-    RscTop *    pClassTimeF;
+    Atom		nId;
+    RscTop *	pClassTimeF;
 
     // Klasse anlegen
     nId = pHS->getID( "TimeFormatter" );
@@ -1570,12 +1570,12 @@ RscTop * RscTypCont::InitClassTimeFormatter( RscTop * pSuper,
 }
 
 /*************************************************************************
-|*    RscTypCont::InitClassSpinField()
+|*	  RscTypCont::InitClassSpinField()
 *************************************************************************/
 RscTop * RscTypCont::InitClassSpinField( RscTop * pSuper )
 {
-    Atom        nId;
-    RscTop *    pClassSpinField;
+    Atom		nId;
+    RscTop *	pClassSpinField;
 
     // Klasse anlegen
     nId = pHS->getID( "SpinField" );
@@ -1591,12 +1591,12 @@ RscTop * RscTypCont::InitClassSpinField( RscTop * pSuper )
 }
 
 /*************************************************************************
-|*    RscTypCont::InitClassPatternField()
+|*	  RscTypCont::InitClassPatternField()
 *************************************************************************/
 RscTop * RscTypCont::InitClassPatternField( RscTop * pSuper )
 {
-    Atom        nId;
-    RscTop *    pClassPatternField;
+    Atom		nId;
+    RscTop *	pClassPatternField;
 
     // Klasse anlegen
     nId = pHS->getID( "PatternField" );
@@ -1609,12 +1609,12 @@ RscTop * RscTypCont::InitClassPatternField( RscTop * pSuper )
 }
 
 /*************************************************************************
-|*    RscTypCont::InitClassNumericField()
+|*	  RscTypCont::InitClassNumericField()
 *************************************************************************/
 RscTop * RscTypCont::InitClassNumericField( RscTop * pSuper )
 {
-    Atom        nId;
-    RscTop *    pClassNumericField;
+    Atom		nId;
+    RscTop *	pClassNumericField;
 
     // Klasse anlegen
     nId = pHS->getID( "NumericField" );
@@ -1637,12 +1637,12 @@ RscTop * RscTypCont::InitClassNumericField( RscTop * pSuper )
 }
 
 /*************************************************************************
-|*    RscTypCont::InitClassMetricField()
+|*	  RscTypCont::InitClassMetricField()
 *************************************************************************/
 RscTop * RscTypCont::InitClassMetricField( RscTop * pSuper )
 {
-    Atom        nId;
-    RscTop *    pClassMetricField;
+    Atom		nId;
+    RscTop *	pClassMetricField;
 
     // Klasse anlegen
     nId = pHS->getID( "MetricField" );
@@ -1666,7 +1666,7 @@ RscTop * RscTypCont::InitClassMetricField( RscTop * pSuper )
 }
 
 /*************************************************************************
-|*    RscTypCont::InitClassCurrencyField()
+|*	  RscTypCont::InitClassCurrencyField()
 *************************************************************************/
 RscTop * RscTypCont::InitClassCurrencyField
 (
@@ -1675,8 +1675,8 @@ RscTop * RscTypCont::InitClassCurrencyField
     RscTop * pSuper
 )
 {
-    Atom        nId;
-    RscTop *    pClassCurrencyField;
+    Atom		nId;
+    RscTop *	pClassCurrencyField;
 
     // Klasse anlegen
     nId = pHS->getID( pClassName );
@@ -1700,12 +1700,12 @@ RscTop * RscTypCont::InitClassCurrencyField
 }
 
 /*************************************************************************
-|*    RscTypCont::InitClassDateField()
+|*	  RscTypCont::InitClassDateField()
 *************************************************************************/
 RscTop * RscTypCont::InitClassDateField( RscTop * pSuper, RscTop * pClassDate )
 {
-    Atom        nId;
-    RscTop *    pClassDateField;
+    Atom		nId;
+    RscTop *	pClassDateField;
 
     // Klasse anlegen
     nId = pHS->getID( "DateField" );
@@ -1724,12 +1724,12 @@ RscTop * RscTypCont::InitClassDateField( RscTop * pSuper, RscTop * pClassDate )
 }
 
 /*************************************************************************
-|*    RscTypCont::InitClassTimeField()
+|*	  RscTypCont::InitClassTimeField()
 *************************************************************************/
 RscTop * RscTypCont::InitClassTimeField( RscTop * pSuper, RscTop * pClassTime )
 {
-    Atom        nId;
-    RscTop *    pClassTimeField;
+    Atom		nId;
+    RscTop *	pClassTimeField;
 
     // Klasse anlegen
     nId = pHS->getID( "TimeField" );
@@ -1748,12 +1748,12 @@ RscTop * RscTypCont::InitClassTimeField( RscTop * pSuper, RscTop * pClassTime )
 }
 
 /*************************************************************************
-|*    RscTypCont::InitClassPatternBox()
+|*	  RscTypCont::InitClassPatternBox()
 *************************************************************************/
 RscTop * RscTypCont::InitClassPatternBox( RscTop * pSuper )
 {
-    Atom        nId;
-    RscTop *    pClassPatternBox;
+    Atom		nId;
+    RscTop *	pClassPatternBox;
 
     // Klasse anlegen
     nId = pHS->getID( "PatternBox" );
@@ -1766,12 +1766,12 @@ RscTop * RscTypCont::InitClassPatternBox( RscTop * pSuper )
 }
 
 /*************************************************************************
-|*    RscTypCont::InitClassNumericBox()
+|*	  RscTypCont::InitClassNumericBox()
 *************************************************************************/
 RscTop * RscTypCont::InitClassNumericBox( RscTop * pSuper )
 {
-    Atom        nId;
-    RscTop *    pClassNumericBox;
+    Atom		nId;
+    RscTop *	pClassNumericBox;
 
     // Klasse anlegen
     nId = pHS->getID( "NumericBox" );
@@ -1786,12 +1786,12 @@ RscTop * RscTypCont::InitClassNumericBox( RscTop * pSuper )
 }
 
 /*************************************************************************
-|*    RscTypCont::InitClassMetricBox()
+|*	  RscTypCont::InitClassMetricBox()
 *************************************************************************/
 RscTop * RscTypCont::InitClassMetricBox( RscTop * pSuper )
 {
-    Atom        nId;
-    RscTop *    pClassMetricBox;
+    Atom		nId;
+    RscTop *	pClassMetricBox;
 
     // Klasse anlegen
     nId = pHS->getID( "MetricBox" );
@@ -1806,7 +1806,7 @@ RscTop * RscTypCont::InitClassMetricBox( RscTop * pSuper )
 }
 
 /*************************************************************************
-|*    RscTypCont::InitClassCurrencyBox()
+|*	  RscTypCont::InitClassCurrencyBox()
 *************************************************************************/
 RscTop * RscTypCont::InitClassCurrencyBox
 (
@@ -1815,8 +1815,8 @@ RscTop * RscTypCont::InitClassCurrencyBox
     RscTop * pSuper
 )
 {
-    Atom        nId;
-    RscTop *    pClassCurrencyBox;
+    Atom		nId;
+    RscTop *	pClassCurrencyBox;
 
     // Klasse anlegen
     nId = pHS->getID( pClassName );
@@ -1831,13 +1831,13 @@ RscTop * RscTypCont::InitClassCurrencyBox
 }
 
 /*************************************************************************
-|*    RscTypCont::InitClassDateBox()
+|*	  RscTypCont::InitClassDateBox()
 *************************************************************************/
 RscTop * RscTypCont::InitClassDateBox( RscTop * pSuper,
                                        RscTop * /*pClassDate*/ )
 {
-    Atom        nId;
-    RscTop *    pClassDateBox;
+    Atom		nId;
+    RscTop *	pClassDateBox;
 
     // Klasse anlegen
     nId = pHS->getID( "DateBox" );
@@ -1852,13 +1852,13 @@ RscTop * RscTypCont::InitClassDateBox( RscTop * pSuper,
 }
 
 /*************************************************************************
-|*    RscTypCont::InitClassTimeBox()
+|*	  RscTypCont::InitClassTimeBox()
 *************************************************************************/
 RscTop * RscTypCont::InitClassTimeBox( RscTop * pSuper,
                                        RscTop * /*pClassTime*/ )
 {
-    Atom        nId;
-    RscTop *    pClassTimeBox;
+    Atom		nId;
+    RscTop *	pClassTimeBox;
 
     // Klasse anlegen
     nId = pHS->getID( "TimeBox" );
@@ -1873,13 +1873,13 @@ RscTop * RscTypCont::InitClassTimeBox( RscTop * pSuper,
 }
 
 /*************************************************************************
-|*    RscTypCont::InitClassDockWindow()
+|*	  RscTypCont::InitClassDockWindow()
 *************************************************************************/
 RscTop * RscTypCont::InitClassDockingWindow( RscTop * pSuper,
                                              RscEnum * pMapUnit )
 {
-    Atom        nId;
-    RscTop *    pClassDockWindow;
+    Atom		nId;
+    RscTop *	pClassDockWindow;
 
     // Klasse anlegen
     nId = pHS->getID( "DockingWindow" );
@@ -1890,7 +1890,7 @@ RscTop * RscTypCont::InitClassDockingWindow( RscTop * pSuper,
     // Variablen anlegen
     nId = aNmTb.Put( "_FloatingPosMapMode", VARNAME );
     pClassDockWindow->SetVariable( nId, pMapUnit, NULL, 0,
-                                   RSC_DOCKINGWINDOW_XYMAPMODE  );
+                                   RSC_DOCKINGWINDOW_XYMAPMODE	);
     nId = aNmTb.Put( "_FloatingPosX", VARNAME );
     pClassDockWindow->SetVariable( nId, &aShort, NULL, 0,
                                    RSC_DOCKINGWINDOW_X );
@@ -1913,15 +1913,15 @@ RscTop * RscTypCont::InitClassDockingWindow( RscTop * pSuper,
 }
 
 /*************************************************************************
-|*    RscTypCont::InitClassToolBoxItem()
+|*	  RscTypCont::InitClassToolBoxItem()
 *************************************************************************/
 RscTop * RscTypCont::InitClassToolBoxItem( RscTop * pSuper,
                                            RscTop * pClassBitmap,
                                            RscTop * pClassImage,
                                            RscEnum * pTriState )
 {
-    Atom        nId;
-    RscTop *    pClassToolBoxItem;
+    Atom		nId;
+    RscTop *	pClassToolBoxItem;
 
     // Klasse anlegen
     nId = pHS->getID( "ToolBoxItem" );
@@ -1946,12 +1946,12 @@ RscTop * RscTypCont::InitClassToolBoxItem( RscTop * pSuper,
         // Variable einfuegen
         nId = aNmTb.Put( "Type", VARNAME );
         pClassToolBoxItem->SetVariable( nId, pEnum, NULL, 0,
-                                  RSC_TOOLBOXITEM_TYPE  );
+                                  RSC_TOOLBOXITEM_TYPE	);
     }
     {
-        RscFlag *   pFlag;
+        RscFlag *	pFlag;
         RscClient * pClient;
-        Atom        l_nVarId, l_nAutoCheckId, l_nRadioCheckId, l_nCheckableId, l_nLeftId, l_nAutoSizeId, l_nDropDownId;
+        Atom		l_nVarId, l_nAutoCheckId, l_nRadioCheckId, l_nCheckableId, l_nLeftId, l_nAutoSizeId, l_nDropDownId;
 
         aBaseLst.Insert( pFlag = new RscFlag( pHS->getID( "FlagToolBoxState" ),
                                               RSC_NOTYPE ),
@@ -2016,7 +2016,7 @@ RscTop * RscTypCont::InitClassToolBoxItem( RscTop * pSuper,
     }
     nId = aNmTb.Put( "HelpID", VARNAME );
     pClassToolBoxItem->SetVariable( nId, &aIdLong, NULL, 0,
-                                    RSC_TOOLBOXITEM_HELPID  );
+                                    RSC_TOOLBOXITEM_HELPID	);
     nId = aNmTb.Put( "Text", VARNAME );
     pClassToolBoxItem->SetVariable( nId, &aLangString, NULL, 0,
                                     RSC_TOOLBOXITEM_TEXT );
@@ -2050,14 +2050,14 @@ RscTop * RscTypCont::InitClassToolBoxItem( RscTop * pSuper,
 }
 
 /*************************************************************************
-|*    RscTypCont::InitClassToolBox()
+|*	  RscTypCont::InitClassToolBox()
 *************************************************************************/
 RscTop * RscTypCont::InitClassToolBox( RscTop * pSuper,
                                        RscTop * pClassToolBoxItem,
                                        RscTop * pClassImageList )
 {
-    Atom        nId;
-    RscTop *    pClassToolBox;
+    Atom		nId;
+    RscTop *	pClassToolBox;
 
     // Klasse anlegen
     nId = pHS->getID( "ToolBox" );
@@ -2102,7 +2102,7 @@ RscTop * RscTypCont::InitClassToolBox( RscTop * pSuper,
                                 RSC_TOOLBOX_LINECOUNT  );
     nId = aNmTb.Put( "FloatingLines", VARNAME );
     pClassToolBox->SetVariable( nId, &aUShort, NULL, 0,
-                                RSC_TOOLBOX_FLOATLINES  );
+                                RSC_TOOLBOX_FLOATLINES	);
     nId = aNmTb.Put( "Customize", VARNAME );
     pClassToolBox->SetVariable( nId, &aBool, NULL, 0,
                                 RSC_TOOLBOX_CUSTOMIZE );
@@ -2138,12 +2138,12 @@ RscTop * RscTypCont::InitClassToolBox( RscTop * pSuper,
 }
 
 /*************************************************************************
-|*    RscTypCont::InitClassStatusBar()
+|*	  RscTypCont::InitClassStatusBar()
 *************************************************************************/
 RscTop * RscTypCont::InitClassStatusBar( RscTop * pSuper )
 {
-    Atom        nId;
-    RscTop *    pClassStatusBar;
+    Atom		nId;
+    RscTop *	pClassStatusBar;
 
     // Klasse anlegen
     nId = pHS->getID( "StatusBar" );
@@ -2159,12 +2159,12 @@ RscTop * RscTypCont::InitClassStatusBar( RscTop * pSuper )
 }
 
 /*************************************************************************
-|*    RscTypCont::InitClassMoreButton()
+|*	  RscTypCont::InitClassMoreButton()
 *************************************************************************/
 RscTop * RscTypCont::InitClassMoreButton( RscTop * pSuper, RscEnum * pMapUnit )
 {
-    Atom        nId;
-    RscTop *    pClassMoreButton;
+    Atom		nId;
+    RscTop *	pClassMoreButton;
 
     // Klasse anlegen
     nId = pHS->getID( "MoreButton" );
@@ -2187,13 +2187,13 @@ RscTop * RscTypCont::InitClassMoreButton( RscTop * pSuper, RscEnum * pMapUnit )
 }
 
 /*************************************************************************
-|*    RscTypCont::InitClassFloatingWindow()
+|*	  RscTypCont::InitClassFloatingWindow()
 *************************************************************************/
 RscTop * RscTypCont::InitClassFloatingWindow( RscTop * pSuper,
                                               RscEnum * pMapUnit )
 {
-    Atom        nId;
-    RscTop *    pClassFloatingWindow;
+    Atom		nId;
+    RscTop *	pClassFloatingWindow;
 
     // Klasse anlegen
     nId = pHS->getID( "FloatingWindow" );
@@ -2218,18 +2218,19 @@ RscTop * RscTypCont::InitClassFloatingWindow( RscTop * pSuper,
     INS_WINBIT(pClassFloatingWindow,Zoomable)
     INS_WINBIT(pClassFloatingWindow,HideWhenDeactivate)
     INS_WINBIT(pClassFloatingWindow,EnableResizing)
+    INS_WINBIT(pClassFloatingWindow,StdPopup)
 
     return pClassFloatingWindow;
 }
 
 /*************************************************************************
-|*    RscTypCont::InitClassTabControlItem()
+|*	  RscTypCont::InitClassTabControlItem()
 *************************************************************************/
 RscTop * RscTypCont::InitClassTabControlItem( RscTop * pSuper,
                                               RscTop * /*pClassTabPage*/ )
 {
-    Atom        nId;
-    RscTop *    pClassTabControlItem;
+    Atom		nId;
+    RscTop *	pClassTabControlItem;
 
     // Klasse anlegen
     nId = pHS->getID( "PageItem" );
@@ -2251,13 +2252,13 @@ RscTop * RscTypCont::InitClassTabControlItem( RscTop * pSuper,
 }
 
 /*************************************************************************
-|*    RscTypCont::InitClassTabControl()
+|*	  RscTypCont::InitClassTabControl()
 *************************************************************************/
 RscTop * RscTypCont::InitClassTabControl( RscTop * pSuper,
                                           RscTop * pClassTabControlItem )
 {
-    Atom        nId;
-    RscTop *    pClassTabControl;
+    Atom		nId;
+    RscTop *	pClassTabControl;
 
     // Klasse anlegen
     nId = pHS->getID( "TabControl" );
@@ -2285,15 +2286,15 @@ RscTop * RscTypCont::InitClassTabControl( RscTop * pSuper,
 }
 
 /*************************************************************************
-|*    RscTypCont::InitClassSfxFamilyStyleItem()
+|*	  RscTypCont::InitClassSfxFamilyStyleItem()
 *************************************************************************/
 RscTop * RscTypCont::InitClassSfxStyleFamilyItem( RscTop * pSuper,
                                                   RscTop * pClassBitmap,
                                                   RscTop * pClassImage,
                                                   RscArray * pStrLst )
 {
-    Atom        nId;
-    RscTop *    pClassSfxFamilyStyleItem;
+    Atom		nId;
+    RscTop *	pClassSfxFamilyStyleItem;
 
     // Klasse anlegen
     nId = pHS->getID( "SfxStyleFamilyItem" );
@@ -2335,13 +2336,13 @@ RscTop * RscTypCont::InitClassSfxStyleFamilyItem( RscTop * pSuper,
 }
 
 /*************************************************************************
-|*    RscTypCont::InitClassSfxTemplateDialogm()
+|*	  RscTypCont::InitClassSfxTemplateDialogm()
 *************************************************************************/
 RscTop * RscTypCont::InitClassSfxTemplateDialog( RscTop * pSuper,
                                                  RscTop * pClassFamilyStyleItem )
 {
-    Atom        nId;
-    RscTop *    pClassSfxTemplateDialog;
+    Atom		nId;
+    RscTop *	pClassSfxTemplateDialog;
 
     // Klasse anlegen
     nId = pHS->getID( "SfxStyleFamilies" );
@@ -2365,12 +2366,12 @@ RscTop * RscTypCont::InitClassSfxTemplateDialog( RscTop * pSuper,
 }
 
 /*************************************************************************
-|*    RscTypCont::InitClassSfxSlotInfo()
+|*	  RscTypCont::InitClassSfxSlotInfo()
 *************************************************************************/
 RscTop * RscTypCont::InitClassSfxSlotInfo( RscTop * pSuper )
 {
-    Atom        nId;
-    RscTop *    pClassSfxSlotInfo;
+    Atom		nId;
+    RscTop *	pClassSfxSlotInfo;
 
     // Klasse anlegen
     nId = pHS->getID( "SfxSlotInfo" );
diff --git a/rsc/source/parser/rscinit.cxx b/rsc/source/parser/rscinit.cxx
index a763b92f0bb1..7a57b4e5263a 100644
--- a/rsc/source/parser/rscinit.cxx
+++ b/rsc/source/parser/rscinit.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
@@ -54,7 +54,7 @@
 #include <yyrscyacc.hxx>
 
 /****************** M a c r o s ******************************************/
-#define INS_WINBIT( pClass, WinBit )        \
+#define INS_WINBIT( pClass, WinBit )		\
     InsWinBit( pClass, #WinBit, n##WinBit##Id );
 
 /****************** C O D E **********************************************/
@@ -82,117 +82,117 @@ void NameToVerCtrl( RSCINST & aVersion, RscTop * pClass,
 
 /*************************************************************************
 |*
-|*    RscTypCont::Init()
+|*	  RscTypCont::Init()
 |*
-|*    Beschreibung
-|*    Ersterstellung    MM 22.03.91
-|*    Letzte Aenderung  MM 27.06.91
+|*	  Beschreibung
+|*	  Ersterstellung	MM 22.03.91
+|*	  Letzte Aenderung	MM 27.06.91
 |*
 *************************************************************************/
 void RscTypCont::Init()
 {
-    RscEnum *   pFieldUnits;
-    RscEnum *   pTimeFieldFormat;
-    RscEnum *   pColor;
-    RscEnum *   pMapUnit;
-    RscEnum *   pKey;
-    RscEnum *   pTriState;
-    RscEnum *   pMessButtons;
-    RscEnum *   pMessDefButton;
-    RscTupel *  pGeometry;
-    RscArray *  pLangGeometry;
-    RscCont  *  pStringList;
-    RscArray *  pLangStringList;
-    RscTupel *  pStringTupel;
-    RscTupel *  pStringLongTupel;
-    RscCont  *  pStringTupelList;
-    RscCont  *  pStringLongTupelList;
-    RscArray *  pLangStringTupelList;
-    RscArray *  pLangStringLongTupelList;
-
-    RscTop   *  pClassMgr;
-    RscTop   *  pClassString;
-    RscTop   *  pClassStringArray;
-    RscTop   *  pClassBitmap;
-    RscTop   *  pClassColor;
-    RscTop   *  pClassImage;
-    RscTop   *  pClassImageList;
-    RscTop   *  pClassWindow;
-    RscTop   *  pClassSystemWindow;
-    RscTop   *  pClassWorkWindow;
-    RscTop   *  pClassDialog;
-    RscTop   *  pClassModalDialog;
-    RscTop   *  pClassModelessDialog;
-    RscTop   *  pClassControl;
-    RscTop   *  pClassButton;
-    RscTop   *  pClassCheckBox;
-    RscTop   *  pClassPushButton;
-    RscTop   *  pClassOKButton;
-    RscTop   *  pClassCancelButton;
-    RscTop   *  pClassHelpButton;
-    RscTop   *  pClassRadioButton;
-    RscTop   *  pClassImageRadioButton;
-    RscTop   *  pClassImageButton;
-    RscTop   *  pClassTriStateBox;
-    RscTop   *  pClassEdit;
-    RscTop   *  pClassMultiLineEdit;
-    RscTop   *  pClassScrollBar;
-    RscTop   *  pClassListBox;
-    RscTop   *  pClassMultiListBox;
-    RscTop   *  pClassComboBox;
-    RscTop   *  pClassFixedText;
-    RscTop   *  pClassFixedBitmap;
-    RscTop   *  pClassFixedImage;
-    RscTop   *  pClassGroupBox;
-    RscTop   *  pClassKeyCode;
-    RscTop   *  pLangClassKeyCode;
-    RscTop   *  pClassAccelItem;
-    RscTop   *  pClassAccel;
-    RscTop   *  pClassMenuItem;
-    RscTop   *  pClassMenu;
-    RscTop   *  pClassMenuButton;
-    RscTop   *  pClassMessBox;
-    RscTop   *  pClassInfoBox;
-    RscTop   *  pClassWarningBox;
-    RscTop   *  pClassErrorBox;
-    RscTop   *  pClassQueryBox;
-    RscTop   *  pClassSplitter;
-    RscTop   *  pClassSplitWindow;
-    RscTop   *  pClassSpinButton;
-    RscTop   *  pClassTime;
-    RscTop   *  pClassDate;
-    RscTop   *  pClassSpinField;
-    RscTop   *  pClassPatternField;
-    RscTop   *  pClassNumericField;
-    RscTop   *  pClassMetricField;
-    RscTop   *  pClassCurrencyField;
-    RscTop   *  pClassLongCurrencyField;
-    RscTop   *  pClassDateField;
-    RscTop   *  pClassTimeField;
-    RscTop   *  pClassPatternBox;
-    RscTop   *  pClassNumericBox;
-    RscTop   *  pClassMetricBox;
-    RscTop   *  pClassCurrencyBox;
-    RscTop   *  pClassLongCurrencyBox;
-    RscTop   *  pClassDateBox;
-    RscTop   *  pClassTimeBox;
-    RscTop   *  pClassDockingWindow;
-    RscTop   *  pClassToolBoxItem;
-    RscTop   *  pClassToolBox;
-    RscTop   *  pClassStatusBar;
-    RscTop   *  pClassMoreButton;
-    RscTop   *  pClassFloatingWindow;
-    RscTop   *  pClassTabPage;
-    RscTop   *  pClassTabDialog;
-    RscTop   *  pClassTabControlItem;
-    RscTop   *  pClassTabControl;
-    RscTop   *  pClassFixedLine;
-    RscTop   *  pClassScrollBarBox;
-    RscTop *    pClassSfxStyleFamilyItem;
-    RscTop *    pClassSfxTemplateDialog;
-    RscTop *    pClassSfxSlotInfo;
-
-    Atom        nId;
+    RscEnum *	pFieldUnits;
+    RscEnum *	pTimeFieldFormat;
+    RscEnum *	pColor;
+    RscEnum *	pMapUnit;
+    RscEnum *	pKey;
+    RscEnum *	pTriState;
+    RscEnum *	pMessButtons;
+    RscEnum *	pMessDefButton;
+    RscTupel *	pGeometry;
+    RscArray *	pLangGeometry;
+    RscCont  *	pStringList;
+    RscArray *	pLangStringList;
+    RscTupel *	pStringTupel;
+    RscTupel *	pStringLongTupel;
+    RscCont  *	pStringTupelList;
+    RscCont  *	pStringLongTupelList;
+    RscArray *	pLangStringTupelList;
+    RscArray *	pLangStringLongTupelList;
+
+    RscTop	 *	pClassMgr;
+    RscTop	 *	pClassString;
+    RscTop	 *	pClassStringArray;
+    RscTop	 *	pClassBitmap;
+    RscTop	 *	pClassColor;
+    RscTop	 *	pClassImage;
+    RscTop	 *	pClassImageList;
+    RscTop	 *	pClassWindow;
+    RscTop	 *	pClassSystemWindow;
+    RscTop	 *	pClassWorkWindow;
+    RscTop	 *	pClassDialog;
+    RscTop	 *	pClassModalDialog;
+    RscTop	 *	pClassModelessDialog;
+    RscTop	 *	pClassControl;
+    RscTop	 *	pClassButton;
+    RscTop	 *	pClassCheckBox;
+    RscTop	 *	pClassPushButton;
+    RscTop	 *	pClassOKButton;
+    RscTop	 *	pClassCancelButton;
+    RscTop	 *	pClassHelpButton;
+    RscTop	 *	pClassRadioButton;
+    RscTop	 *	pClassImageRadioButton;
+    RscTop	 *	pClassImageButton;
+    RscTop	 *	pClassTriStateBox;
+    RscTop	 *	pClassEdit;
+    RscTop	 *	pClassMultiLineEdit;
+    RscTop	 *	pClassScrollBar;
+    RscTop	 *	pClassListBox;
+    RscTop	 *	pClassMultiListBox;
+    RscTop	 *	pClassComboBox;
+    RscTop	 *	pClassFixedText;
+    RscTop	 *	pClassFixedBitmap;
+    RscTop	 *	pClassFixedImage;
+    RscTop	 *	pClassGroupBox;
+    RscTop	 *	pClassKeyCode;
+    RscTop	 *	pLangClassKeyCode;
+    RscTop	 *	pClassAccelItem;
+    RscTop	 *	pClassAccel;
+    RscTop	 *	pClassMenuItem;
+    RscTop	 *	pClassMenu;
+    RscTop	 *	pClassMenuButton;
+    RscTop	 *	pClassMessBox;
+    RscTop	 *	pClassInfoBox;
+    RscTop	 *	pClassWarningBox;
+    RscTop	 *	pClassErrorBox;
+    RscTop	 *	pClassQueryBox;
+    RscTop	 *	pClassSplitter;
+    RscTop	 *	pClassSplitWindow;
+    RscTop	 *	pClassSpinButton;
+    RscTop	 *	pClassTime;
+    RscTop	 *	pClassDate;
+    RscTop	 *	pClassSpinField;
+    RscTop	 *	pClassPatternField;
+    RscTop	 *	pClassNumericField;
+    RscTop	 *	pClassMetricField;
+    RscTop	 *	pClassCurrencyField;
+    RscTop	 *	pClassLongCurrencyField;
+    RscTop	 *	pClassDateField;
+    RscTop	 *	pClassTimeField;
+    RscTop	 *	pClassPatternBox;
+    RscTop	 *	pClassNumericBox;
+    RscTop	 *	pClassMetricBox;
+    RscTop	 *	pClassCurrencyBox;
+    RscTop	 *	pClassLongCurrencyBox;
+    RscTop	 *	pClassDateBox;
+    RscTop	 *	pClassTimeBox;
+    RscTop	 *	pClassDockingWindow;
+    RscTop	 *	pClassToolBoxItem;
+    RscTop	 *	pClassToolBox;
+    RscTop	 *	pClassStatusBar;
+    RscTop	 *	pClassMoreButton;
+    RscTop	 *	pClassFloatingWindow;
+    RscTop	 *	pClassTabPage;
+    RscTop	 *	pClassTabDialog;
+    RscTop	 *	pClassTabControlItem;
+    RscTop	 *	pClassTabControl;
+    RscTop	 *	pClassFixedLine;
+    RscTop	 *	pClassScrollBarBox;
+    RscTop *	pClassSfxStyleFamilyItem;
+    RscTop *	pClassSfxTemplateDialog;
+    RscTop *	pClassSfxSlotInfo;
+
+    Atom		nId;
 
     aNmTb.SetSort( FALSE );
 {
@@ -223,7 +223,7 @@ void RscTypCont::Init()
     aNmTb.Put( "ZoomInOutputSize",   INZOOMOUTPUTSIZE,(long)0    );
     aNmTb.Put( "FloatingPos",        FLOATINGPOS,    (long)0     );
 }
-    /********** B A S I S   T Y P E N ************************************/
+    /********** B A S I S	T Y P E N ************************************/
 {
     /********** S H O R T ************************************************/
     aShort.SetRange( -32768, 32767 );
@@ -262,132 +262,134 @@ void RscTypCont::Init()
     nWinBitVarId = aNmTb.Put( "_WinBits", VARNAME );
 
     // Windows
-    nBorderId       = pHS->getID( "WB_BORDER" );
+    nBorderId		= pHS->getID( "WB_BORDER" );
     aWinBits.SetConstant( nBorderId, sal::static_int_cast<INT32>(WB_BORDER) );
-    nHideId         = pHS->getID( "WB_HIDE" );
+    nHideId 		= pHS->getID( "WB_HIDE" );
     aWinBits.SetConstant( nHideId, sal::static_int_cast<INT32>(WB_HIDE) );
     nClipChildrenId = pHS->getID( "WB_CLIPCHILDREN" );
     aWinBits.SetConstant( nClipChildrenId, sal::static_int_cast<INT32>(WB_CLIPCHILDREN) );
-    nSizeableId     = pHS->getID( "WB_SIZEABLE" );
+    nSizeableId 	= pHS->getID( "WB_SIZEABLE" );
     aWinBits.SetConstant( nSizeableId, sal::static_int_cast<INT32>(WB_SIZEABLE) );
-    nMoveableId     = pHS->getID( "WB_MOVEABLE" );
+    nMoveableId 	= pHS->getID( "WB_MOVEABLE" );
     aWinBits.SetConstant( nMoveableId, sal::static_int_cast<INT32>(WB_MOVEABLE) );
-    nMinimizeId     = pHS->getID( "WB_MINABLE" );
+    nMinimizeId 	= pHS->getID( "WB_MINABLE" );
     aWinBits.SetConstant( nMinimizeId, 0 /*WB_MINABLE*/ );
-    nMaximizeId     = pHS->getID( "WB_MAXABLE" );
+    nMaximizeId 	= pHS->getID( "WB_MAXABLE" );
     aWinBits.SetConstant( nMaximizeId, 0 /*WB_MAXABLE*/ );
-    nCloseableId    = pHS->getID( "WB_CLOSEABLE" );
+    nCloseableId	= pHS->getID( "WB_CLOSEABLE" );
     aWinBits.SetConstant( nCloseableId, sal::static_int_cast<INT32>(WB_CLOSEABLE) );
-    nAppId          = pHS->getID( "WB_APP" );
+    nAppId			= pHS->getID( "WB_APP" );
     aWinBits.SetConstant( nAppId, sal::static_int_cast<INT32>(WB_APP) );
-    nTabstopId      = pHS->getID( "WB_TABSTOP" );
+    nTabstopId		= pHS->getID( "WB_TABSTOP" );
     aWinBits.SetConstant( nTabstopId, sal::static_int_cast<INT32>(WB_TABSTOP) );
-    nGroupId        = pHS->getID( "WB_GROUP" );
+    nGroupId		= pHS->getID( "WB_GROUP" );
     aWinBits.SetConstant( nGroupId, sal::static_int_cast<INT32>(WB_GROUP) );
-    nSysmodalId     = pHS->getID( "WB_SYSMODAL" );
+    nSysmodalId 	= pHS->getID( "WB_SYSMODAL" );
     aWinBits.SetConstant( nSysmodalId, 0 /*WB_SYSMODAL*/ );
 }
 {
-    nLeftId         = pHS->getID( "WB_LEFT" );
+    nLeftId 		= pHS->getID( "WB_LEFT" );
     aWinBits.SetConstant( nLeftId, sal::static_int_cast<INT32>(WB_LEFT) );
-    nCenterId       = pHS->getID( "WB_CENTER" );
+    nCenterId		= pHS->getID( "WB_CENTER" );
     aWinBits.SetConstant( nCenterId, sal::static_int_cast<INT32>(WB_CENTER) );
-    nRightId        = pHS->getID( "WB_RIGHT" );
+    nRightId		= pHS->getID( "WB_RIGHT" );
     aWinBits.SetConstant( nRightId, sal::static_int_cast<INT32>(WB_RIGHT) );
-    nTopId          = pHS->getID( "WB_TOP" );
+    nTopId 		    = pHS->getID( "WB_TOP" );
     aWinBits.SetConstant( nTopId, sal::static_int_cast<INT32>(WB_TOP) );
-    nVCenterId      = pHS->getID( "WB_VCENTER" );
+    nVCenterId		= pHS->getID( "WB_VCENTER" );
     aWinBits.SetConstant( nVCenterId, sal::static_int_cast<INT32>(WB_VCENTER) );
-    nBottomId       = pHS->getID( "WB_BOTTOM" );
+    nBottomId		= pHS->getID( "WB_BOTTOM" );
     aWinBits.SetConstant( nBottomId, sal::static_int_cast<INT32>(WB_BOTTOM) );
-    nHScrollId      = pHS->getID( "WB_HSCROLL" );
+    nHScrollId		= pHS->getID( "WB_HSCROLL" );
     aWinBits.SetConstant( nHScrollId, sal::static_int_cast<INT32>(WB_HSCROLL) );
-    nVScrollId      = pHS->getID( "WB_VSCROLL" );
+    nVScrollId		= pHS->getID( "WB_VSCROLL" );
     aWinBits.SetConstant( nVScrollId, sal::static_int_cast<INT32>(WB_VSCROLL) );
-    nSortId         = pHS->getID( "WB_SORT" );
+    nSortId 		= pHS->getID( "WB_SORT" );
     aWinBits.SetConstant( nSortId, sal::static_int_cast<INT32>(WB_SORT) );
-    nDefaultId          = pHS->getID( "WB_DEFBUTTON" );
+    nDefaultId			= pHS->getID( "WB_DEFBUTTON" );
     aWinBits.SetConstant( nDefaultId, sal::static_int_cast<INT32>(WB_DEFBUTTON) );
-    nRepeatId           = pHS->getID( "WB_REPEAT" );
+    nRepeatId			= pHS->getID( "WB_REPEAT" );
     aWinBits.SetConstant( nRepeatId, sal::static_int_cast<INT32>(WB_REPEAT) );
-    nSVLookId           = pHS->getID( "WB_SVLOOK" );
+    nSVLookId			= pHS->getID( "WB_SVLOOK" );
     aWinBits.SetConstant( nSVLookId, sal::static_int_cast<INT32>(WB_3DLOOK) );
-    nDropDownId         = pHS->getID( "WB_DROPDOWN" );
+    nDropDownId 		= pHS->getID( "WB_DROPDOWN" );
     aWinBits.SetConstant( nDropDownId, sal::static_int_cast<INT32>(WB_DROPDOWN) );
-    nPassWordId         = pHS->getID( "WB_PASSWORD" );
+    nPassWordId 		= pHS->getID( "WB_PASSWORD" );
     aWinBits.SetConstant( nPassWordId, sal::static_int_cast<INT32>(WB_PASSWORD) );
-    nReadOnlyId         = pHS->getID( "WB_READONLY" );
+    nReadOnlyId 		= pHS->getID( "WB_READONLY" );
     aWinBits.SetConstant( nReadOnlyId, sal::static_int_cast<INT32>(WB_READONLY) );
-    nAutoSizeId         = pHS->getID( "WB_AUTOSIZE" );
+    nAutoSizeId 		= pHS->getID( "WB_AUTOSIZE" );
     aWinBits.SetConstant( nAutoSizeId, sal::static_int_cast<INT32>(WB_AUTOSIZE) );
-    nSpinId             = pHS->getID( "WB_SPIN" );
+    nSpinId 			= pHS->getID( "WB_SPIN" );
     aWinBits.SetConstant( nSpinId, sal::static_int_cast<INT32>(WB_SPIN) );
-    nTabControlId       = pHS->getID( "WB_DIALOGCONTROL" );
+    nTabControlId		= pHS->getID( "WB_DIALOGCONTROL" );
     aWinBits.SetConstant( nTabControlId, sal::static_int_cast<INT32>(WB_DIALOGCONTROL) );
-    nSimpleModeId       = pHS->getID( "WB_SIMPLEMODE" );
+    nSimpleModeId		= pHS->getID( "WB_SIMPLEMODE" );
     aWinBits.SetConstant( nSimpleModeId, sal::static_int_cast<INT32>(WB_SIMPLEMODE) );
-    nDragId             = pHS->getID( "WB_DRAG" );
+    nDragId 			= pHS->getID( "WB_DRAG" );
     aWinBits.SetConstant( nDragId, sal::static_int_cast<INT32>(WB_DRAG) );
-    nScrollId           = pHS->getID( "WB_SCROLL" );
+    nScrollId			= pHS->getID( "WB_SCROLL" );
     aWinBits.SetConstant( nScrollId, sal::static_int_cast<INT32>(WB_SCROLL) );
-    nZoomableId         = pHS->getID( "WB_ZOOMABLE" );
+    nZoomableId 		= pHS->getID( "WB_ZOOMABLE" );
     aWinBits.SetConstant( nZoomableId, sal::static_int_cast<INT32>(WB_ROLLABLE) );
     nHideWhenDeactivateId = pHS->getID( "WB_HIDEWHENDEACTIVATE" );
     aWinBits.SetConstant( nHideWhenDeactivateId, 0 /*WB_HIDEWHENDEACTIVATE*/ );
-    nAutoHScrollId      = pHS->getID( "WB_AUTOHSCROLL" );
+    nAutoHScrollId		= pHS->getID( "WB_AUTOHSCROLL" );
     aWinBits.SetConstant( nAutoHScrollId, sal::static_int_cast<INT32>(WB_AUTOHSCROLL) );
-    nAutoVScrollId      = pHS->getID( "WB_AUTOVSCROLL" );
+    nAutoVScrollId		= pHS->getID( "WB_AUTOVSCROLL" );
     aWinBits.SetConstant( nAutoVScrollId, sal::static_int_cast<INT32>(WB_AUTOVSCROLL) );
-    nDDExtraWidthId     = pHS->getID( "WB_DDEXTRAWIDTH" );
+    nDDExtraWidthId 	= pHS->getID( "WB_DDEXTRAWIDTH" );
     aWinBits.SetConstant( nDDExtraWidthId, 0 /*WB_DDEXTRAWIDTH*/ );
-    nWordBreakId        = pHS->getID( "WB_WORDBREAK" );
+    nWordBreakId		= pHS->getID( "WB_WORDBREAK" );
     aWinBits.SetConstant( nWordBreakId, sal::static_int_cast<INT32>(WB_WORDBREAK) );
-    nLeftLabelId        = pHS->getID( "WB_LEFTLABEL" );
+    nLeftLabelId		= pHS->getID( "WB_LEFTLABEL" );
     aWinBits.SetConstant( nLeftLabelId, 0 /*WB_LEFTLABEL*/ );
-    nHasLinesId         = pHS->getID( "WB_HASLINES" );
+    nHasLinesId 		= pHS->getID( "WB_HASLINES" );
     aWinBits.SetConstant( nHasLinesId, sal::static_int_cast<INT32>(WB_HASLINES) );
-    nHasButtonsId       = pHS->getID( "WB_HASBUTTONS" );
+    nHasButtonsId		= pHS->getID( "WB_HASBUTTONS" );
     aWinBits.SetConstant( nHasButtonsId, sal::static_int_cast<INT32>(WB_HASBUTTONS) );
-    nRectStyleId        = pHS->getID( "WB_RECTSTYLE" );
+    nRectStyleId		= pHS->getID( "WB_RECTSTYLE" );
     aWinBits.SetConstant( nRectStyleId, sal::static_int_cast<INT32>(WB_RECTSTYLE) );
-    nLineSpacingId      = pHS->getID( "WB_LINESPACING" );
+    nLineSpacingId		= pHS->getID( "WB_LINESPACING" );
     aWinBits.SetConstant( nLineSpacingId, sal::static_int_cast<INT32>(WB_LINESPACING) );
-    nSmallStyleId       = pHS->getID( "WB_SMALLSTYLE" );
+    nSmallStyleId		= pHS->getID( "WB_SMALLSTYLE" );
     aWinBits.SetConstant( nSmallStyleId, sal::static_int_cast<INT32>(WB_SMALLSTYLE) );
-    nEnableResizingId   = pHS->getID( "WB_ENABLERESIZING" );
+    nEnableResizingId	= pHS->getID( "WB_ENABLERESIZING" );
     aWinBits.SetConstant( nEnableResizingId, 0 /*WB_ENABLERESIZING*/ );
-    nDockableId         = pHS->getID( "WB_DOCKABLE" );
+    nDockableId 		= pHS->getID( "WB_DOCKABLE" );
     aWinBits.SetConstant( nDockableId, sal::static_int_cast<INT32>(WB_DOCKABLE) );
-    nScaleId            = pHS->getID( "WB_SCALE" );
+    nScaleId			= pHS->getID( "WB_SCALE" );
     aWinBits.SetConstant( nScaleId, sal::static_int_cast<INT32>(WB_SCALE) );
-    nIgnoreTabId        = pHS->getID( "WB_IGNORETAB" );
+    nIgnoreTabId		= pHS->getID( "WB_IGNORETAB" );
     aWinBits.SetConstant( nIgnoreTabId, sal::static_int_cast<INT32>(WB_IGNORETAB) );
-    nNoSplitDrawId      = pHS->getID( "WB_NOSPLITDRAW" );
+    nNoSplitDrawId		= pHS->getID( "WB_NOSPLITDRAW" );
     aWinBits.SetConstant( nNoSplitDrawId, sal::static_int_cast<INT32>(WB_NOSPLITDRAW) );
-    nTopImageId         = pHS->getID( "WB_TOPIMAGE" );
+    nTopImageId 		= pHS->getID( "WB_TOPIMAGE" );
     aWinBits.SetConstant( nTopImageId, sal::static_int_cast<INT32>(WB_TOPIMAGE) );
-    nNoLabelId          = pHS->getID( "WB_NOLABEL" );
+    nNoLabelId			= pHS->getID( "WB_NOLABEL" );
     aWinBits.SetConstant( nNoLabelId, sal::static_int_cast<INT32>(WB_NOLABEL) );
-    nVertId             = pHS->getID( "WB_VERT" );
+    nVertId				= pHS->getID( "WB_VERT" );
     aWinBits.SetConstant( nVertId, sal::static_int_cast<INT32>(WB_VERT) );
-    nSingleLineId       = pHS->getID( "WB_SINGLELINE" );
+    nSingleLineId		= pHS->getID( "WB_SINGLELINE" );
     aWinBits.SetConstant( nSingleLineId, sal::static_int_cast<INT32>(WB_SINGLELINE) );
     nSysWinId           = pHS->getID( "WB_SYSTEMWINDOW" );
     aWinBits.SetConstant( nSysWinId, sal::static_int_cast<INT32>(WB_SYSTEMWINDOW) );
+    nStdPopupId			= pHS->getID( "WB_STDPOPUP" );
+    aWinBits.SetConstant( nStdPopupId, sal::static_int_cast<INT32>(WB_STDPOPUP) );
 }
 {
     /********** I n i t   B a s i c   T y p e s **************************/
     InitLangType();
     aBaseLst.Insert( pFieldUnits = InitFieldUnitsType(), LIST_APPEND );
     aBaseLst.Insert( pTimeFieldFormat = InitTimeFieldFormat(), LIST_APPEND );
-    aBaseLst.Insert( pColor   = InitColor(), LIST_APPEND             );
-    aBaseLst.Insert( pMapUnit       = InitMapUnit(),       LIST_APPEND );
-    aBaseLst.Insert( pKey           = InitKey(),           LIST_APPEND );
-    aBaseLst.Insert( pTriState      = InitTriState(),      LIST_APPEND );
-    aBaseLst.Insert( pMessButtons   = InitMessButtons(),   LIST_APPEND );
+    aBaseLst.Insert( pColor   = InitColor(), LIST_APPEND			 );
+    aBaseLst.Insert( pMapUnit		= InitMapUnit(),	   LIST_APPEND );
+    aBaseLst.Insert( pKey			= InitKey(),		   LIST_APPEND );
+    aBaseLst.Insert( pTriState		= InitTriState(),	   LIST_APPEND );
+    aBaseLst.Insert( pMessButtons	= InitMessButtons(),   LIST_APPEND );
     aBaseLst.Insert( pMessDefButton = InitMessDefButton(), LIST_APPEND );
 
-    aBaseLst.Insert( pGeometry      = InitGeometry(),           LIST_APPEND );
+    aBaseLst.Insert( pGeometry		= InitGeometry(),			LIST_APPEND );
     aBaseLst.Insert( pLangGeometry = InitLangGeometry( pGeometry ),
                      LIST_APPEND );
     aBaseLst.Insert( pStringList = InitStringList(), LIST_APPEND );
@@ -904,7 +906,7 @@ void RscTypCont::Init()
     pClassFixedLine->SetCallPar( *pWinPar1, *pWinPar2, *pWinParType );
 
     INS_WINBIT(pClassFixedLine,Vert)
-
+    
     aNmTb.Put( nId, CLASSNAME, pClassFixedLine );
     pRoot->Insert( pClassFixedLine );
 
diff --git a/rsc/source/parser/rsckey.cxx b/rsc/source/parser/rsckey.cxx
index 4a42bea138bf..b43a1c6e9c19 100644
--- a/rsc/source/parser/rsckey.cxx
+++ b/rsc/source/parser/rsckey.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
diff --git a/rsc/source/parser/rsclex.cxx b/rsc/source/parser/rsclex.cxx
index e0df5de254f9..2cfcb81f2132 100644
--- a/rsc/source/parser/rsclex.cxx
+++ b/rsc/source/parser/rsclex.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
@@ -63,13 +63,13 @@ const char* StringContainer::putString( const char* pString )
 }
 
 /*************************************************************************/
-int             c;
-BOOL            bLastInclude;// War letztes Symbol INCLUDE
-RscFileInst*    pFI;
-RscTypCont*     pTC;
+int 			c;
+BOOL			bLastInclude;// War letztes Symbol INCLUDE
+RscFileInst*	pFI;
+RscTypCont* 	pTC;
 RscExpression * pExp;
 struct KeyVal {
-    int     nKeyWord;
+    int 	nKeyWord;
     YYSTYPE aYYSType;
 } aKeyVal[ 1 ];
 BOOL bTargetDefined;
@@ -79,8 +79,8 @@ StringContainer* pStringContainer = NULL;
 
 /****************** C O D E **********************************************/
 UINT32 GetNumber(){
-    UINT32  l = 0;
-    UINT32  nLog = 10;
+    UINT32	l = 0;
+    UINT32	nLog = 10;
 
     if( '0' == c ){
         c = pFI->GetFastChar();
@@ -116,10 +116,10 @@ UINT32 GetNumber(){
 }
 
 int MakeToken( YYSTYPE * pTokenVal ){
-    int             c1;
-    char *          pStr;
+    int 			c1;
+    char *			pStr;
 
-    while( TRUE ){  // Kommentare und Leerzeichen ueberlesen
+    while( TRUE ){	// Kommentare und Leerzeichen ueberlesen
         while( isspace( c ) )
             c = pFI->GetFastChar();
         if( '/' == c ){
@@ -203,7 +203,7 @@ int MakeToken( YYSTYPE * pTokenVal ){
     }
 
     if( isalpha (c) || (c == '_') ){
-        Atom        nHashId;
+        Atom		nHashId;
         OStringBuffer aBuf( 256 );
 
         while( isalnum (c) || (c == '_') || (c == '-') )
@@ -215,12 +215,12 @@ int MakeToken( YYSTYPE * pTokenVal ){
         nHashId = pHS->getID( aBuf.getStr(), true );
         if( InvalidAtom != nHashId )
         {
-            KEY_STRUCT  aKey;
-
+            KEY_STRUCT	aKey;
+            
             // Suche nach dem Schluesselwort
             if( pTC->aNmTb.Get( nHashId, &aKey ) )
             {
-
+                
                 // Schluesselwort gefunden
                 switch( aKey.nTyp )
                 {
@@ -242,7 +242,7 @@ int MakeToken( YYSTYPE * pTokenVal ){
                     default:
                         pTokenVal->value = aKey.yylval;
                 };
-
+                
                 return( aKey.nTyp );
             }
             else
@@ -251,16 +251,16 @@ int MakeToken( YYSTYPE * pTokenVal ){
                 return( SYMBOL );
             }
         }
-        else{       // Symbol
+        else{		// Symbol
             RscDefine  * pDef;
-
+            
             pDef = pTC->aFileTab.FindDef( aBuf.getStr() );
             if( pDef ){
                 pTokenVal->defineele = pDef;
-
+                
                 return( RSCDEFINE );
             }
-
+            
             pTokenVal->string = const_cast<char*>(pStringContainer->putString( aBuf.getStr() ));
             return( SYMBOL );
         }
@@ -326,10 +326,10 @@ void yyerror( char* pMessage )
 /****************** parser start function ********************************/
 void InitParser( RscFileInst * pFileInst )
 {
-    pTC = pFileInst->pTypCont;          // Datenkontainer setzten
+    pTC = pFileInst->pTypCont;			// Datenkontainer setzten
     pFI = pFileInst;
     pStringContainer = new StringContainer();
-    pExp = NULL;                //fuer MacroParser
+    pExp = NULL;				//fuer MacroParser
     bTargetDefined = FALSE;
 
     // Anfangszeichen initialisieren
@@ -348,19 +348,19 @@ void EndParser(){
 
     if( pExp )
         delete pExp;
-    pTC      = NULL;
-    pFI      = NULL;
-    pExp     = NULL;
+    pTC 	 = NULL;
+    pFI 	 = NULL;
+    pExp	 = NULL;
 
 }
 
 void IncludeParser( RscFileInst * pFileInst )
 {
-    int           nToken;   // Wert des Tokens
-    YYSTYPE       aYYSType; // Daten des Tokens
-    RscFile     * pFName;   // Filestruktur
-    ULONG         lKey;     // Fileschluessel
-    RscTypCont  * pTypCon  = pFileInst->pTypCont;
+    int 		  nToken;	// Wert des Tokens
+    YYSTYPE 	  aYYSType; // Daten des Tokens
+    RscFile 	* pFName;	// Filestruktur
+    ULONG		  lKey; 	// Fileschluessel
+    RscTypCont	* pTypCon  = pFileInst->pTypCont;
 
     pFName = pTypCon->aFileTab.Get( pFileInst->GetFileIndex() );
     InitParser( pFileInst );
@@ -408,7 +408,7 @@ ERRTYPE parser( RscFileInst * pFileInst )
 
 RscExpression * MacroParser( RscFileInst & rFileInst )
 {
-    ERRTYPE       aError;
+    ERRTYPE 	  aError;
     RscExpression * pExpression;
 
     InitParser( &rFileInst );
diff --git a/rsc/source/parser/rsclex.hxx b/rsc/source/parser/rsclex.hxx
index 06c04f4126a3..1ee5bd7b074f 100644
--- a/rsc/source/parser/rsclex.hxx
+++ b/rsc/source/parser/rsclex.hxx
@@ -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
@@ -33,7 +33,7 @@
 // a buffer for unique strings
 class StringContainer
 {
-    std::hash_set< rtl::OString, rtl::OStringHash >     m_aStrings;
+    std::hash_set< rtl::OString, rtl::OStringHash >		m_aStrings;
 public:
     StringContainer() {}
     ~StringContainer() {}
@@ -77,9 +77,9 @@ class ObjectStack {
 
         const RSCINST & Top  ()     { return pRoot->aInst; }
         BOOL        IsEmpty()   { return( pRoot == NULL ); }
-        void        IncTupelRec() { pRoot->nTupelRec++; }
-        void        DecTupelRec() { pRoot->nTupelRec--; }
-        sal_uInt32  TupelRecCount() const { return pRoot->nTupelRec; }
+        void		IncTupelRec() { pRoot->nTupelRec++; }
+        void		DecTupelRec() { pRoot->nTupelRec--; }
+        sal_uInt32	TupelRecCount() const { return pRoot->nTupelRec; }
         void        Push( RSCINST aInst )
                     {
                         Node* pTmp;
@@ -125,4 +125,4 @@ extern RscTypCont*              pTC;
 extern RscFileInst *            pFI;
 extern RscExpression *          pExp;
 extern ObjectStack              S;
-extern StringContainer*         pStringContainer;
+extern StringContainer*			pStringContainer;
diff --git a/rsc/source/parser/rscpar.cxx b/rsc/source/parser/rscpar.cxx
index 22606e2f8bf2..0f9d984999fd 100644
--- a/rsc/source/parser/rscpar.cxx
+++ b/rsc/source/parser/rscpar.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
@@ -37,11 +37,11 @@
 /****************** C O D E **********************************************/
 /*************************************************************************
 |*
-|*    RscFileInst::Init()
+|*	  RscFileInst::Init()
 |*
-|*    Beschreibung
-|*    Ersterstellung    MM 05.11.91
-|*    Letzte Aenderung  MM 17.02.93
+|*	  Beschreibung
+|*	  Ersterstellung	MM 05.11.91
+|*	  Letzte Aenderung	MM 17.02.93
 |*
 *************************************************************************/
 void RscFileInst::Init()
@@ -57,11 +57,11 @@ void RscFileInst::Init()
 
 /*************************************************************************
 |*
-|*    RscFileInst::RscFileInst()
+|*	  RscFileInst::RscFileInst()
 |*
-|*    Beschreibung
-|*    Ersterstellung    MM 06.06.91
-|*    Letzte Aenderung  MM 06.06.91
+|*	  Beschreibung
+|*	  Ersterstellung	MM 06.06.91
+|*	  Letzte Aenderung	MM 06.06.91
 |*
 *************************************************************************/
 RscFileInst::RscFileInst( RscTypCont * pTC, ULONG lIndexSrc,
@@ -76,33 +76,33 @@ RscFileInst::RscFileInst( RscTypCont * pTC, ULONG lIndexSrc,
 
     //Status: Zeiger am Ende des Lesepuffers
     nInputPos = nInputEndPos = nInputBufLen = READBUFFER_MAX;
-    pInput    = (char *)rtl_allocateMemory( nInputBufLen );
+    pInput	  = (char *)rtl_allocateMemory( nInputBufLen );
 }
 
 RscFileInst::RscFileInst( RscTypCont * pTC, ULONG lIndexSrc,
                           ULONG lFIndex, const ByteString& rBuf )
 {
-    pTypCont     = pTC;
+    pTypCont	 = pTC;
     Init();
-    lFileIndex   = lFIndex;
-    lSrcIndex    = lIndexSrc;
-    fInputFile   = NULL;
-    nInputPos    = 0;
+    lFileIndex	 = lFIndex;
+    lSrcIndex	 = lIndexSrc;
+    fInputFile	 = NULL;
+    nInputPos	 = 0;
     nInputEndPos = rBuf.Len();
 
     // Muss groesser sein wegen Eingabeende bei nInputBufLen < nInputEndPos
     nInputBufLen = nInputEndPos +1;
-    pInput       = (char *)rtl_allocateMemory( nInputBufLen +100 );
+    pInput		 = (char *)rtl_allocateMemory( nInputBufLen +100 );
     memcpy( pInput, rBuf.GetBuffer(), nInputEndPos );
 }
 
 /*************************************************************************
 |*
-|*    RscFileInst::~RscFileInst()
+|*	  RscFileInst::~RscFileInst()
 |*
-|*    Beschreibung
-|*    Ersterstellung    MM 06.06.91
-|*    Letzte Aenderung  MM 06.06.91
+|*	  Beschreibung
+|*	  Ersterstellung	MM 06.06.91
+|*	  Letzte Aenderung	MM 06.06.91
 |*
 *************************************************************************/
 RscFileInst::~RscFileInst(){
@@ -114,11 +114,11 @@ RscFileInst::~RscFileInst(){
 
 /*************************************************************************
 |*
-|*    RscFileInst::GetChar()
+|*	  RscFileInst::GetChar()
 |*
-|*    Beschreibung
-|*    Ersterstellung    MM 01.06.91
-|*    Letzte Aenderung  MM 09.08.91
+|*	  Beschreibung
+|*	  Ersterstellung	MM 01.06.91
+|*	  Letzte Aenderung	MM 09.08.91
 |*
 *************************************************************************/
 int RscFileInst::GetChar()
@@ -140,11 +140,11 @@ int RscFileInst::GetChar()
 
 /*************************************************************************
 |*
-|*    RscFileInst::GetNewLine()
+|*	  RscFileInst::GetNewLine()
 |*
-|*    Beschreibung
-|*    Ersterstellung    MM 06.06.91
-|*    Letzte Aenderung  MM 06.06.91
+|*	  Beschreibung
+|*	  Ersterstellung	MM 06.06.91
+|*	  Letzte Aenderung	MM 06.06.91
 |*
 *************************************************************************/
 void RscFileInst::GetNewLine()
@@ -221,11 +221,11 @@ END:
 
 /*************************************************************************
 |*
-|*    RscFileInst::SetError()
+|*	  RscFileInst::SetError()
 |*
-|*    Beschreibung
-|*    Ersterstellung    MM 05.11.91
-|*    Letzte Aenderung  MM 05.11.91
+|*	  Beschreibung
+|*	  Ersterstellung	MM 05.11.91
+|*	  Letzte Aenderung	MM 05.11.91
 |*
 *************************************************************************/
 void RscFileInst::SetError( ERRTYPE aError )
@@ -233,7 +233,7 @@ void RscFileInst::SetError( ERRTYPE aError )
     if( aError.IsOk() )
     {
         aFirstError = aError;
-        nErrorLine  = GetLineNo();
-        nErrorPos   = GetScanPos() -1;
+        nErrorLine	= GetLineNo();
+        nErrorPos	= GetScanPos() -1;
     };
 };
diff --git a/rsc/source/parser/rscyacc.cxx b/rsc/source/parser/rscyacc.cxx
index 89891581d9ba..37b618aff49e 100644
--- a/rsc/source/parser/rscyacc.cxx
+++ b/rsc/source/parser/rscyacc.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
@@ -44,10 +44,10 @@
 #include "rsclex.hxx"
 
 /************** V a r i a b l e n ****************************************/
-ObjectStack                     S;
-RscTop *                        pCurClass;
-sal_uInt32                      nCurMask;
-char                            szErrBuf[ 100 ];
+ObjectStack 					S;
+RscTop *						pCurClass;
+sal_uInt32						nCurMask;
+char							szErrBuf[ 100 ];
 
 /************** H i l f s F u n k t i o n e n ****************************/
 RSCINST GetVarInst( const RSCINST & rInst, const char * pVarName )
@@ -111,7 +111,7 @@ void SetString( const RSCINST & rInst, const char * pVarName, const char * pStr
 RscId MakeRscId( RscExpType aExpType )
 {
     if( !aExpType.IsNothing() ){
-        INT32       lValue;
+        INT32		lValue;
 
         if( !aExpType.Evaluate( &lValue ) )
             pTC->pEH->Error( ERR_ZERODIVISION, NULL, RscId() );
@@ -247,16 +247,16 @@ RSCINST GetFirstTupelEle( const RSCINST & rTop )
 /************** Y a c c   C o d e ****************************************/
 //#define YYDEBUG 1
 
-#define TYPE_Atom             0
-#define TYPE_RESID                1
+#define TYPE_Atom 			  0
+#define TYPE_RESID				  1
 
 #ifdef UNX
-#define YYMAXDEPTH              2000
+#define YYMAXDEPTH				2000
 #else
 #ifdef W30
-#define YYMAXDEPTH              300
+#define YYMAXDEPTH				300
 #else
-#define YYMAXDEPTH              800
+#define YYMAXDEPTH				800
 #endif
 #endif
 
diff --git a/rsc/source/prj/gui.cxx b/rsc/source/prj/gui.cxx
index 67d86a8b35cf..53e5da0f2c5c 100644
--- a/rsc/source/prj/gui.cxx
+++ b/rsc/source/prj/gui.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
@@ -34,13 +34,13 @@
 #include <rscrsc.hxx>
 #include <rscdb.hxx>
 
-/*************** G l o b a l e   V a r i a b l e n **********************/
+/*************** G l o b a l e	 V a r i a b l e n **********************/
 static RscCompiler * pRscCompiler = NULL;
 /****************************************************************/
-/*                                                              */
-/*  Function    :   ExitProgram()                               */
-/*                                                              */
-/*  Description :   Gibt die Temporaeren Dateien frei.          */
+/*																*/
+/*	Function	:	ExitProgram()								*/
+/*																*/
+/*	Description :	Gibt die Temporaeren Dateien frei.			*/
 /****************************************************************/
 #if defined( UNX ) || ( defined( OS2 ) && ( defined( TCPP ) || defined ( GCC )) ) ||  defined (WTC) || defined (MTW) || defined(__MINGW32__)
         void ExitProgram( void ){
@@ -81,10 +81,10 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv) {
     fprintf( stderr, "debugging %s\n", argv[0] );
 #endif
 
-    ERRTYPE     aError;
+    ERRTYPE 	aError;
 
     InitRscCompiler();
-    RscError*   pErrHdl    = new RscError( lcl_determineVerbosity( argc, argv ) );
+    RscError*	pErrHdl    = new RscError( lcl_determineVerbosity( argc, argv ) );
 #ifdef MTW
     RscCmdLine* pCmdLine   = new RscCmdLine( argc, (char **)argv, pErrHdl );
 #else
diff --git a/rsc/source/prj/start.cxx b/rsc/source/prj/start.cxx
index a2841dd9765b..ecdde6a17b43 100644
--- a/rsc/source/prj/start.cxx
+++ b/rsc/source/prj/start.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
@@ -59,9 +59,9 @@
 
 /*************** C O D E ************************************************/
 /****************************************************************/
-/*                                                              */
-/*  Function    :   fuer Ansi kompatibilitaet                   */
-/*                                                              */
+/*																*/
+/*	Function	:	fuer Ansi kompatibilitaet					*/
+/*																*/
 /****************************************************************/
 #ifdef UNX
 #define P_WAIT 0
@@ -85,9 +85,9 @@
 #endif
 
 /*************************************************************************
-|*    CallPrePro()
+|*	  CallPrePro()
 |*
-|*    Beschreibung
+|*	  Beschreibung
 *************************************************************************/
 static BOOL CallPrePro( const ByteString& rPrePro,
                         const ByteString& rInput,
@@ -95,12 +95,12 @@ static BOOL CallPrePro( const ByteString& rPrePro,
                         RscPtrPtr * pCmdLine,
                         BOOL bResponse )
 {
-    RscPtrPtr       aNewCmdL;   // Kommandozeile
-    RscPtrPtr       aRespCmdL;   // Kommandozeile
-    RscPtrPtr *     pCmdL = &aNewCmdL;
-    int             i, nExit;
-    FILE*           fRspFile = NULL;
-    ByteString      aRspFileName;
+    RscPtrPtr		aNewCmdL;	// Kommandozeile
+    RscPtrPtr		aRespCmdL;	 // Kommandozeile
+    RscPtrPtr * 	pCmdL = &aNewCmdL;
+    int			    i, nExit;
+    FILE*			fRspFile = NULL;
+    ByteString		aRspFileName;
 
     if( bResponse )
     {
@@ -200,19 +200,19 @@ static BOOL CallPrePro( const ByteString& rPrePro,
 
 
 /*************************************************************************
-|*    CallRsc2
+|*	  CallRsc2
 |*
-|*    Beschreibung
+|*	  Beschreibung
 *************************************************************************/
 static BOOL CallRsc2( ByteString aRsc2Name,
                       RscStrList * pInputList,
                       ByteString aSrsName,
                       RscPtrPtr * pCmdLine )
 {
-    int             i, nExit;
-    ByteString*     pString;
-    ByteString      aRspFileName;   // Response-Datei
-    FILE *          fRspFile;       // Response-Datei
+    int 			i, nExit;
+    ByteString* 	pString;
+    ByteString		aRspFileName;	// Response-Datei
+    FILE *			fRspFile;		// Response-Datei
 
     aRspFileName = ::GetTmpFileName();
     fRspFile = fopen( aRspFileName.GetBuffer(), "w" );
@@ -275,7 +275,7 @@ static BOOL CallRsc2( ByteString aRsc2Name,
         fclose( fRspFile );
     };
 
-    RscPtrPtr       aNewCmdL;       // Kommandozeile
+    RscPtrPtr		aNewCmdL;		// Kommandozeile
     aNewCmdL.Append( rsc_strdup( aRsc2Name.GetBuffer() ) );
     ByteString aTmpStr( '@' );
     aTmpStr += aRspFileName;
@@ -316,33 +316,33 @@ static BOOL CallRsc2( ByteString aRsc2Name,
 
 /*************************************************************************
 |*
-|*    main()
+|*	  main()
 |*
-|*    Beschreibung
-|*    Ersterstellung    MM 05.09.91
-|*    Letzte Aenderung  MM 05.09.91
+|*	  Beschreibung
+|*	  Ersterstellung	MM 05.09.91
+|*	  Letzte Aenderung	MM 05.09.91
 |*
 *************************************************************************/
 SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv)
 {
-    BOOL            bPrePro  = TRUE;
-    BOOL            bResFile = TRUE;
-    BOOL            bHelp    = FALSE;
-    BOOL            bError   = FALSE;
-    BOOL            bResponse = FALSE;
-    ByteString      aSolarbin(getenv("SOLARBINDIR"));
-    ByteString      aDelim("/");
-    ByteString      aPrePro; //( aSolarbin + aDelim + ByteString("rscpp"));
-    ByteString      aRsc2Name; //(  aSolarbin + aDelim + ByteString("rsc2"));
-    ByteString      aSrsName;
-    ByteString      aResName;
-    RscStrList      aInputList;
-    RscStrList      aTmpList;
-    char *          pStr;
-    char **         ppStr;
-    RscPtrPtr       aCmdLine;       // Kommandozeile
-    sal_uInt32      i;
-    ByteString*     pString;
+    BOOL			bPrePro  = TRUE;
+    BOOL			bResFile = TRUE;
+    BOOL			bHelp	 = FALSE;
+    BOOL			bError	 = FALSE;
+    BOOL			bResponse = FALSE;
+    ByteString		aSolarbin(getenv("SOLARBINDIR"));
+    ByteString		aDelim("/");
+    ByteString		aPrePro; //( aSolarbin + aDelim + ByteString("rscpp"));
+    ByteString		aRsc2Name; //(  aSolarbin + aDelim + ByteString("rsc2"));
+    ByteString		aSrsName;
+    ByteString		aResName;
+    RscStrList		aInputList;
+    RscStrList		aTmpList;
+    char *			pStr;
+    char ** 		ppStr;
+    RscPtrPtr		aCmdLine;		// Kommandozeile
+    sal_uInt32		i;
+    ByteString* 	pString;
 
     aPrePro = aSolarbin;
     aPrePro += aDelim;
@@ -414,7 +414,7 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv)
 
     if( aInputList.Count() )
     {
-        /* build the output file names          */
+        /* build the output file names			*/
         if( ! aResName.Len() )
             aResName = OutputFile( *aInputList.First(), "res" );
         if( ! bSetSrs )
diff --git a/rsc/source/res/rscall.cxx b/rsc/source/res/rscall.cxx
index d04903ea8692..bd73a6fc220e 100644
--- a/rsc/source/res/rscall.cxx
+++ b/rsc/source/res/rscall.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
@@ -37,26 +37,26 @@
 #include <rscall.h>
 #include <rsckey.hxx>
 
-Atom    nRsc_XYMAPMODEId = InvalidAtom;
-Atom    nRsc_WHMAPMODEId = InvalidAtom;
-Atom    nRsc_X = InvalidAtom;
-Atom    nRsc_Y = InvalidAtom;
-Atom    nRsc_WIDTH = InvalidAtom;
-Atom    nRsc_HEIGHT = InvalidAtom;
-Atom    nRsc_DELTALANG = InvalidAtom;
-Atom    nRsc_DELTASYSTEM = InvalidAtom;
-Atom    nRsc_EXTRADATA = InvalidAtom;
+Atom	nRsc_XYMAPMODEId = InvalidAtom;
+Atom	nRsc_WHMAPMODEId = InvalidAtom;
+Atom	nRsc_X = InvalidAtom;
+Atom	nRsc_Y = InvalidAtom;
+Atom	nRsc_WIDTH = InvalidAtom;
+Atom	nRsc_HEIGHT = InvalidAtom;
+Atom	nRsc_DELTALANG = InvalidAtom;
+Atom	nRsc_DELTASYSTEM = InvalidAtom;
+Atom	nRsc_EXTRADATA = InvalidAtom;
 
 void InitRscCompiler()
 {
-    pStdParType      = new ByteString( "( const ResId & rResId, BOOL" );
-    pStdPar1         = new ByteString( '(' );
-    pStdPar2         = new ByteString( '(' );
+    pStdParType 	 = new ByteString( "( const ResId & rResId, BOOL" );
+    pStdPar1		 = new ByteString( '(' );
+    pStdPar2		 = new ByteString( '(' );
 
-    pWinParType      = new ByteString( "( Window * pParent, const ResId & rResId, BOOL" );
-    pWinPar1         = new ByteString( "( pParent," );
-    pWinPar2         = new ByteString( "( this," );
-    nRefDeep         = 10;
+    pWinParType 	 = new ByteString( "( Window * pParent, const ResId & rResId, BOOL" );
+    pWinPar1		 = new ByteString( "( pParent," );
+    pWinPar2		 = new ByteString( "( this," );
+    nRefDeep		 = 10;
     nRsc_XYMAPMODEId = InvalidAtom;
     nRsc_WHMAPMODEId = InvalidAtom;
     pHS = new AtomContainer();
diff --git a/rsc/source/res/rscarray.cxx b/rsc/source/res/rscarray.cxx
index 5e9023a83e83..e7207c86c518 100644
--- a/rsc/source/res/rscarray.cxx
+++ b/rsc/source/res/rscarray.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
diff --git a/rsc/source/res/rscclass.cxx b/rsc/source/res/rscclass.cxx
index 877d11afee83..15b44ec9168a 100644
--- a/rsc/source/res/rscclass.cxx
+++ b/rsc/source/res/rscclass.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
@@ -46,11 +46,11 @@
 /****************** R s c C l a s s **************************************/
 /*************************************************************************
 |*
-|*    RscClass::RscClass()
+|*	  RscClass::RscClass()
 |*
-|*    Beschreibung
-|*    Ersterstellung    MM 25.05.91
-|*    Letzte Aenderung  MM 25.05.91
+|*	  Beschreibung
+|*	  Ersterstellung	MM 25.05.91
+|*	  Letzte Aenderung	MM 25.05.91
 |*
 *************************************************************************/
 RscClass::RscClass( Atom nId, sal_uInt32 nTypeId, RscTop * pSuperCl )
@@ -64,16 +64,16 @@ RscClass::RscClass( Atom nId, sal_uInt32 nTypeId, RscTop * pSuperCl )
 
 /*************************************************************************
 |*
-|*    RscClass::Pre_dtor()
+|*	  RscClass::Pre_dtor()
 |*
-|*    Beschreibung
-|*    Ersterstellung    MM 25.05.91
-|*    Letzte Aenderung  MM 25.05.91
+|*	  Beschreibung
+|*	  Ersterstellung	MM 25.05.91
+|*	  Letzte Aenderung	MM 25.05.91
 |*
 *************************************************************************/
 void RscClass::Pre_dtor()
 {
-    sal_uInt32  i;
+    sal_uInt32	i;
 
     RscTop::Pre_dtor();
 
@@ -92,11 +92,11 @@ void RscClass::Pre_dtor()
 
 /*************************************************************************
 |*
-|*    RscClass::~RscClass()
+|*	  RscClass::~RscClass()
 |*
-|*    Beschreibung
-|*    Ersterstellung    MM 25.05.91
-|*    Letzte Aenderung  MM 25.05.91
+|*	  Beschreibung
+|*	  Ersterstellung	MM 25.05.91
+|*	  Letzte Aenderung	MM 25.05.91
 |*
 *************************************************************************/
 RscClass::~RscClass()
@@ -107,11 +107,11 @@ RscClass::~RscClass()
 
 /*************************************************************************
 |*
-|*    RscClass::GetClassType()
+|*	  RscClass::GetClassType()
 |*
-|*    Beschreibung
-|*    Ersterstellung    MM 25.05.91
-|*    Letzte Aenderung  MM 25.05.91
+|*	  Beschreibung
+|*	  Ersterstellung	MM 25.05.91
+|*	  Letzte Aenderung	MM 25.05.91
 |*
 *************************************************************************/
 RSCCLASS_TYPE RscClass::GetClassType() const
@@ -121,11 +121,11 @@ RSCCLASS_TYPE RscClass::GetClassType() const
 
 /*************************************************************************
 |*
-|*    RscClass::GetInstData()
+|*	  RscClass::GetInstData()
 |*
-|*    Beschreibung
-|*    Ersterstellung    MM 15.04.91
-|*    Letzte Aenderung  MM 15.04.91
+|*	  Beschreibung
+|*	  Ersterstellung	MM 15.04.91
+|*	  Letzte Aenderung	MM 15.04.91
 |*
 *************************************************************************/
 RSCINST RscClass::GetInstData
@@ -175,9 +175,9 @@ RSCINST RscClass::GetInstData
 
 /*************************************************************************
 |*
-|*    RscClass::GetInstDflt()
+|*	  RscClass::GetInstDflt()
 |*
-|*    Beschreibung
+|*	  Beschreibung
 |*
 *************************************************************************/
 CLASS_DATA RscClass::GetDfltData( sal_uInt32 nEle )
@@ -190,11 +190,11 @@ CLASS_DATA RscClass::GetDfltData( sal_uInt32 nEle )
 
 /*************************************************************************
 |*
-|*    RscClass::SetVarDflt()
+|*	  RscClass::SetVarDflt()
 |*
-|*    Beschreibung
-|*    Ersterstellung    MM 22.07.91
-|*    Letzte Aenderung  MM 22.07.91
+|*	  Beschreibung
+|*	  Ersterstellung	MM 22.07.91
+|*	  Letzte Aenderung	MM 22.07.91
 |*
 *************************************************************************/
 void RscClass::SetVarDflt( CLASS_DATA pData, sal_uInt32 nEle, BOOL bSet )
@@ -210,24 +210,24 @@ void RscClass::SetVarDflt( CLASS_DATA pData, sal_uInt32 nEle, BOOL bSet )
 
 /*************************************************************************
 |*
-|*    RscClass::IsDflt()
+|*	  RscClass::IsDflt()
 |*
-|*    Beschreibung
-|*    Ersterstellung    MM 22.07.91
-|*    Letzte Aenderung  MM 08.01.92
+|*	  Beschreibung
+|*	  Ersterstellung	MM 22.07.91
+|*	  Letzte Aenderung	MM 08.01.92
 |*
 *************************************************************************/
 BOOL RscClass::IsDflt( CLASS_DATA pData, sal_uInt32 nEle )
 {
-    RscClassInst *  pClass;
-    BOOL            bRet;
+    RscClassInst *	pClass;
+    BOOL			bRet;
 
     pClass = (RscClassInst *)(pData + nSuperSize );
     if( pClass->nVarDflt & ((ULONG)1 << nEle) )
         bRet = TRUE;
     else
         bRet = FALSE;
-/*  {
+/*	{
         //Variablenname ist Default
         RSCINST aTmpI;
 
@@ -241,11 +241,11 @@ BOOL RscClass::IsDflt( CLASS_DATA pData, sal_uInt32 nEle )
 
 /*************************************************************************
 |*
-|*    RscClass::Create()
+|*	  RscClass::Create()
 |*
-|*    Beschreibung
-|*    Ersterstellung    MM 03.04.91
-|*    Letzte Aenderung  MM 03.04.91
+|*	  Beschreibung
+|*	  Ersterstellung	MM 03.04.91
+|*	  Letzte Aenderung	MM 03.04.91
 |*
 *************************************************************************/
 RSCINST RscClass::Create
@@ -255,8 +255,8 @@ RSCINST RscClass::Create
     BOOL bOwnClass
 )
 {
-    sal_uInt32  i;
-    CLASS_DATA  * ppData;
+    sal_uInt32	i;
+    CLASS_DATA	* ppData;
     RSCINST aInst;
     RSCINST aMemInst, aDfltI;
 
@@ -314,14 +314,14 @@ RSCINST RscClass::Create
 
 /*************************************************************************
 |*
-|*    RscClass::Destroy()
+|*	  RscClass::Destroy()
 |*
-|*    Beschreibung
+|*	  Beschreibung
 |*
 *************************************************************************/
 void RscClass::Destroy( const RSCINST & rInst )
 {
-    sal_uInt32  i;
+    sal_uInt32	i;
 
     RscTop::Destroy( rInst );
 
@@ -348,9 +348,9 @@ void RscClass::Destroy( const RSCINST & rInst )
 
 /*************************************************************************
 |*
-|*    RscClass::SetVariable()
+|*	  RscClass::SetVariable()
 |*
-|*    Beschreibung
+|*	  Beschreibung
 |*
 *************************************************************************/
 ERRTYPE RscClass::SetVariable
@@ -372,11 +372,11 @@ ERRTYPE RscClass::SetVariable
             rtl_allocateMemory( ((nEntries +1)
                             * sizeof( VARTYPE_STRUCT )) );
 
-    pVarTypeList[ nEntries ].nVarName       = nVarName;
-    pVarTypeList[ nEntries ].nMask          = nMask;
-    pVarTypeList[ nEntries ].pClass         = pClass;
-    pVarTypeList[ nEntries ].nOffset        = nSize;
-    pVarTypeList[ nEntries ].nDataBaseName  = nDataBaseName;
+    pVarTypeList[ nEntries ].nVarName		= nVarName;
+    pVarTypeList[ nEntries ].nMask			= nMask;
+    pVarTypeList[ nEntries ].pClass 		= pClass;
+    pVarTypeList[ nEntries ].nOffset		= nSize;
+    pVarTypeList[ nEntries ].nDataBaseName	= nDataBaseName;
     if( pDflt )
         pVarTypeList[ nEntries ].pDefault = pDflt->pData;
     else
@@ -410,9 +410,9 @@ ERRTYPE RscClass::SetVariable
 
 /*************************************************************************
 |*
-|*    RscClass::EnumVariable()
+|*	  RscClass::EnumVariable()
 |*
-|*    Beschreibung
+|*	  Beschreibung
 |*
 *************************************************************************/
 void RscClass::EnumVariables( void * pData, VarEnumCallbackProc pProc )
@@ -430,9 +430,9 @@ void RscClass::EnumVariables( void * pData, VarEnumCallbackProc pProc )
 
 /*************************************************************************
 |*
-|*    RscClass::GetVariable()
+|*	  RscClass::GetVariable()
 |*
-|*    Beschreibung
+|*	  Beschreibung
 |*
 *************************************************************************/
 RSCINST RscClass::GetVariable
@@ -444,7 +444,7 @@ RSCINST RscClass::GetVariable
     RscTop * pCreateClass
 )
 {
-    sal_uInt32  i = 0;
+    sal_uInt32	i = 0;
     RSCINST aTmpI;
 
     while( i < nEntries && pVarTypeList[ i ].nVarName != nVarName )
@@ -492,7 +492,7 @@ RSCINST RscClass::GetVariable
                 }
                 else
                 {
-                    CLASS_DATA  * ppData
+                    CLASS_DATA	* ppData
                         = (CLASS_DATA *)(rInst.pData + pVarTypeList[ i ].nOffset);
                     aTmpI = aTmpI.pClass->Create( NULL, aDefInst );
                     *ppData = aTmpI.pData;
@@ -510,9 +510,9 @@ RSCINST RscClass::GetVariable
 
 /*************************************************************************
 |*
-|*    RscClass::GetCopyVar()
+|*	  RscClass::GetCopyVar()
 |*
-|*    Beschreibung
+|*	  Beschreibung
 |*
 *************************************************************************/
 RSCINST RscClass::GetCopyVar
@@ -521,7 +521,7 @@ RSCINST RscClass::GetCopyVar
     Atom nVarName
 )
 {
-    sal_uInt32  i = 0;
+    sal_uInt32	i = 0;
     RSCINST aVarI;
 
     while( i < nEntries && pVarTypeList[ i ].nVarName != nVarName )
@@ -554,16 +554,16 @@ RSCINST RscClass::GetCopyVar
 
 /*************************************************************************
 |*
-|*    RscClass::IsConsistent()
+|*	  RscClass::IsConsistent()
 |*
-|*    Beschreibung
+|*	  Beschreibung
 |*
 *************************************************************************/
 BOOL RscClass::IsConsistent( const RSCINST & rInst, RscInconsList * pList )
 {
-    sal_uInt32  i = 0;
+    sal_uInt32	i = 0;
     RSCINST aTmpI;
-    BOOL    bRet;
+    BOOL	bRet;
 
     bRet = RscTop::IsConsistent( rInst, pList );
 
@@ -584,16 +584,16 @@ BOOL RscClass::IsConsistent( const RSCINST & rInst, RscInconsList * pList )
 
 /*************************************************************************
 |*
-|*    RscClass::SetToDefault()
+|*	  RscClass::SetToDefault()
 |*
-|*    Beschreibung
+|*	  Beschreibung
 |*
 *************************************************************************/
 void RscClass::SetToDefault( const RSCINST & rInst )
 {
-    sal_uInt32  i;
+    sal_uInt32	i;
     RSCINST aTmpI;
-    RscClassInst *  pClass;
+    RscClassInst *	pClass;
 
     pClass = (RscClassInst *)(rInst.pData + nSuperSize );
 
@@ -615,14 +615,14 @@ void RscClass::SetToDefault( const RSCINST & rInst )
 
 /*************************************************************************
 |*
-|*    RscClass::IsDefault()
+|*	  RscClass::IsDefault()
 |*
-|*    Beschreibung
+|*	  Beschreibung
 |*
 *************************************************************************/
 BOOL RscClass::IsDefault( const RSCINST & rInst )
 {
-    sal_uInt32  i;
+    sal_uInt32	i;
     RSCINST aTmpI;
 
     for( i = 0; i < nEntries; i++ )
@@ -639,14 +639,14 @@ BOOL RscClass::IsDefault( const RSCINST & rInst )
 
 /*************************************************************************
 |*
-|*    RscClass::GetDefault()
+|*	  RscClass::GetDefault()
 |*
-|*    Beschreibung
+|*	  Beschreibung
 |*
 *************************************************************************/
 RSCINST RscClass::GetDefault( Atom nVarId )
 {
-    sal_uInt32  i;
+    sal_uInt32	i;
 
     i = 0;
     while( i < nEntries && pVarTypeList[ i ].nVarName != nVarId )
@@ -665,9 +665,9 @@ RSCINST RscClass::GetDefault( Atom nVarId )
 
 /*************************************************************************
 |*
-|*    RscClass::IsValueDflt()
+|*	  RscClass::IsValueDflt()
 |*
-|*    Beschreibung
+|*	  Beschreibung
 |*
 *************************************************************************/
 BOOL RscClass::IsValueDflt( CLASS_DATA pData, sal_uInt32 nEle )
@@ -692,14 +692,14 @@ BOOL RscClass::IsValueDflt( CLASS_DATA pData, sal_uInt32 nEle )
 
 /*************************************************************************
 |*
-|*    RscClass::IsValueDefault()
+|*	  RscClass::IsValueDefault()
 |*
-|*    Beschreibung
+|*	  Beschreibung
 |*
 *************************************************************************/
 BOOL RscClass::IsValueDefault( const RSCINST & rInst, CLASS_DATA pDef )
 {
-    sal_uInt32  i = 0;
+    sal_uInt32	i = 0;
     RSCINST aTmpI;
     RSCINST aDfltI;
 
@@ -734,14 +734,14 @@ BOOL RscClass::IsValueDefault( const RSCINST & rInst, CLASS_DATA pDef )
 
 /*************************************************************************
 |*
-|*    RscClass::SetDefault()
+|*	  RscClass::SetDefault()
 |*
-|*    Beschreibung
+|*	  Beschreibung
 |*
 *************************************************************************/
 void RscClass::SetDefault( const RSCINST & rInst, Atom nVarName )
 {
-    sal_uInt32  i = 0;
+    sal_uInt32	i = 0;
     RSCINST aTmpI;
 
     while( i < nEntries && pVarTypeList[ i ].nVarName != nVarName )
@@ -765,9 +765,9 @@ void RscClass::SetDefault( const RSCINST & rInst, Atom nVarName )
 
 /*************************************************************************
 |*
-|*    RscClass::WriteSrc()
+|*	  RscClass::WriteSrc()
 |*
-|*    Beschreibung
+|*	  Beschreibung
 |*
 *************************************************************************/
 void RscClass::WriteSrc
@@ -779,7 +779,7 @@ void RscClass::WriteSrc
     const char * pVarName
 )
 {
-    sal_uInt32  i = 0, n = 0;
+    sal_uInt32	i = 0, n = 0;
     RSCINST aTmpI;
 
     RscTop::WriteSrc( rInst, fOutput, pTC, nTab, pVarName );
@@ -792,7 +792,7 @@ void RscClass::WriteSrc
             if( nRsc_XYMAPMODEId == pVarTypeList[ i ].nVarName
               || nRsc_WHMAPMODEId == pVarTypeList[ i ].nVarName )
             {
-                if( !IsDflt( rInst.pData, i )     //MapUnit
+                if( !IsDflt( rInst.pData, i )	  //MapUnit
                   || !IsDflt( rInst.pData, i+1 )  //X, Width
                   || !IsDflt( rInst.pData, i+2 ) )//Y, Height
                 {// ein Wert ist nicht Default
@@ -853,9 +853,9 @@ void RscClass::WriteSrc
 
 /*************************************************************************
 |*
-|*    RscClass::WriteInstRc()
+|*	  RscClass::WriteInstRc()
 |*
-|*    Beschreibung
+|*	  Beschreibung
 |*
 *************************************************************************/
 INT32 RscClass::GetCorrectValues
@@ -897,7 +897,7 @@ ERRTYPE RscClass::WriteInstRc
     sal_uInt32 i = 0;
     ERRTYPE aError;
     RSCINST aTmpI;
-    sal_uInt32  nMaskOff = 0;// Offset um Maskenfeld zu addressieren
+    sal_uInt32	nMaskOff = 0;// Offset um Maskenfeld zu addressieren
 
     // Wenn eine Variable Maskierung hat, dann Maskenfeld
     for( i = 0; i < nEntries; i++ )
@@ -980,9 +980,9 @@ ERRTYPE RscClass::WriteInstRc
 
 /*************************************************************************
 |*
-|*    RscClass::WriteRc()
+|*	  RscClass::WriteRc()
 |*
-|*    Beschreibung
+|*	  Beschreibung
 |*
 *************************************************************************/
 ERRTYPE RscClass::WriteRc
@@ -1005,9 +1005,9 @@ ERRTYPE RscClass::WriteRc
 
 /*************************************************************************
 |*
-|*    RscClass::WriteSyntax()
+|*	  RscClass::WriteSyntax()
 |*
-|*    Beschreibung
+|*	  Beschreibung
 |*
 *************************************************************************/
 void RscClass::WriteSyntax( FILE * fOutput, RscTypCont * pTC )
@@ -1094,9 +1094,9 @@ void RscClass::WriteRcCtor( FILE * fOutput, RscTypCont * pTC )
 
 /*************************************************************************
 |*
-|*    RscSysDepend::RscSysDepend()
+|*	  RscSysDepend::RscSysDepend()
 |*
-|*    Beschreibung
+|*	  Beschreibung
 |*
 *************************************************************************/
 RscSysDepend::RscSysDepend( Atom nId, sal_uInt32 nTypeId, RscTop * pSuper )
@@ -1105,17 +1105,17 @@ RscSysDepend::RscSysDepend( Atom nId, sal_uInt32 nTypeId, RscTop * pSuper )
 
 /*************************************************************************
 |*
-|*    RscSysDepend::WriteRc()
+|*	  RscSysDepend::WriteRc()
 |*
-|*    Beschreibung
+|*	  Beschreibung
 |*
 *************************************************************************/
 ERRTYPE RscSysDepend::WriteSysDependRc( const RSCINST & rInst, RscWriteRc & rMem,
                 RscTypCont * pTC, sal_uInt32 nDeep, BOOL bExtra, BOOL bFirst )
 {
-    sal_uInt32  nId = 0xFFFFFFFF;
-    ERRTYPE     aError;
-    RSCINST     aFileName;
+    sal_uInt32	nId = 0xFFFFFFFF;
+    ERRTYPE 	aError;
+    RSCINST 	aFileName;
 
     //Instanz mit dem Dateinamen "FILENAME" holen
     aFileName = RscClass::GetCopyVar( rInst, pHS->getID( "FILE", true ) );
@@ -1146,15 +1146,15 @@ ERRTYPE RscSysDepend::WriteSysDependRc( const RSCINST & rInst, RscWriteRc & rMem
 
 /*************************************************************************
 |*
-|*    RscSysDepend::WriteRc()
+|*	  RscSysDepend::WriteRc()
 |*
-|*    Beschreibung
+|*	  Beschreibung
 |*
 *************************************************************************/
 ERRTYPE RscSysDepend::WriteRc( const RSCINST & rInst, RscWriteRc & rMem,
                             RscTypCont * pTC, sal_uInt32 nDeep, BOOL bExtra )
 {
-    ERRTYPE     aError = RscClass::WriteRc( rInst, rMem, pTC, nDeep, bExtra );
+    ERRTYPE 	aError = RscClass::WriteRc( rInst, rMem, pTC, nDeep, bExtra );
 
     if( this == rInst.pClass )
         // nur wenn es eigen Klasse ist
@@ -1164,9 +1164,9 @@ ERRTYPE RscSysDepend::WriteRc( const RSCINST & rInst, RscWriteRc & rMem,
 
 /*************************************************************************
 |*
-|*    RscFirstSysDepend::RscFirstSysDepend()
+|*	  RscFirstSysDepend::RscFirstSysDepend()
 |*
-|*    Beschreibung
+|*	  Beschreibung
 |*
 *************************************************************************/
 RscFirstSysDepend::RscFirstSysDepend( Atom nId, sal_uInt32 nTypeId,
@@ -1176,9 +1176,9 @@ RscFirstSysDepend::RscFirstSysDepend( Atom nId, sal_uInt32 nTypeId,
 
 /*************************************************************************
 |*
-|*    RscFirstSysDepend::WriteRc()
+|*	  RscFirstSysDepend::WriteRc()
 |*
-|*    Beschreibung
+|*	  Beschreibung
 |*
 *************************************************************************/
 ERRTYPE RscFirstSysDepend::WriteRc( const RSCINST & rInst, RscWriteRc & rMem,
@@ -1191,9 +1191,9 @@ ERRTYPE RscFirstSysDepend::WriteRc( const RSCINST & rInst, RscWriteRc & rMem,
 
 /*************************************************************************
 |*
-|*    RscTupel::RscTupel()
+|*	  RscTupel::RscTupel()
 |*
-|*    Beschreibung
+|*	  Beschreibung
 |*
 *************************************************************************/
 RscTupel::RscTupel( Atom nId, sal_uInt32 nTypeId, RscTop * pSuper )
@@ -1202,9 +1202,9 @@ RscTupel::RscTupel( Atom nId, sal_uInt32 nTypeId, RscTop * pSuper )
 
 /*************************************************************************
 |*
-|*    RscTupel::GetTupelVar()
+|*	  RscTupel::GetTupelVar()
 |*
-|*    Beschreibung
+|*	  Beschreibung
 |*
 *************************************************************************/
 RSCINST RscTupel::GetTupelVar( const RSCINST & rInst, sal_uInt32 nPos,
@@ -1220,16 +1220,16 @@ RSCINST RscTupel::GetTupelVar( const RSCINST & rInst, sal_uInt32 nPos,
 
 /*************************************************************************
 |*
-|*    RscTupel::WriteSrc()
+|*	  RscTupel::WriteSrc()
 |*
-|*    Beschreibung
+|*	  Beschreibung
 |*
 *************************************************************************/
 void RscTupel::WriteSrc( const RSCINST & rInst, FILE * fOutput,
                          RscTypCont * pTC, sal_uInt32 nTab,
                          const char * pVarName )
 {
-    sal_uInt32  i = 0;
+    sal_uInt32	i = 0;
     RSCINST aTmpI;
 
     RscTop::WriteSrc( rInst, fOutput, pTC, nTab, pVarName );
diff --git a/rsc/source/res/rscclobj.cxx b/rsc/source/res/rscclobj.cxx
index b2632a73857c..250129a0fdde 100644
--- a/rsc/source/res/rscclobj.cxx
+++ b/rsc/source/res/rscclobj.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
diff --git a/rsc/source/res/rscconst.cxx b/rsc/source/res/rscconst.cxx
index 3961cbd539de..6c5796193cc5 100644
--- a/rsc/source/res/rscconst.cxx
+++ b/rsc/source/res/rscconst.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
@@ -408,7 +408,7 @@ ERRTYPE RscEnum::WriteRc( const RSCINST & rInst, RscWriteRc & aMem,
     return( ERR_OK );
 }
 
-RscLangEnum::RscLangEnum()
+RscLangEnum::RscLangEnum() 
         : RscEnum( pHS->getID( "LangEnum" ), RSC_NOTYPE ),
           mnLangId( 0x400 )
 {
diff --git a/rsc/source/res/rsccont.cxx b/rsc/source/res/rsccont.cxx
index 072c5feaa31d..38e0c5745bfa 100644
--- a/rsc/source/res/rsccont.cxx
+++ b/rsc/source/res/rsccont.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
@@ -43,11 +43,11 @@
 /****************** E N T R Y S T R U C T ********************************/
 /*************************************************************************
 |*
-|*    ENTRYSTRUCT::Destroy()
+|*	  ENTRYSTRUCT::Destroy()
 |*
-|*    Beschreibung
-|*    Ersterstellung    MM 06.08.91
-|*    Letzte Aenderung  MM 06.08.91
+|*	  Beschreibung
+|*	  Ersterstellung	MM 06.08.91
+|*	  Letzte Aenderung	MM 06.08.91
 |*
 *************************************************************************/
 void ENTRY_STRUCT::Destroy()
@@ -62,11 +62,11 @@ void ENTRY_STRUCT::Destroy()
 /****************** R s c B a s e C o n t ********************************/
 /*************************************************************************
 |*
-|*    RscBaseCont::RscBaseCont()
+|*	  RscBaseCont::RscBaseCont()
 |*
-|*    Beschreibung
-|*    Ersterstellung    MM 25.05.91
-|*    Letzte Aenderung  MM 25.05.91
+|*	  Beschreibung
+|*	  Ersterstellung	MM 25.05.91
+|*	  Letzte Aenderung	MM 25.05.91
 |*
 *************************************************************************/
 RscBaseCont::RscBaseCont( Atom nId, sal_uInt32 nTypeId, RscTop * pSuper,
@@ -83,11 +83,11 @@ RscBaseCont::RscBaseCont( Atom nId, sal_uInt32 nTypeId, RscTop * pSuper,
 
 /*************************************************************************
 |*
-|*    RscBaseCont::~RscBaseCont()
+|*	  RscBaseCont::~RscBaseCont()
 |*
-|*    Beschreibung
-|*    Ersterstellung    MM 25.05.91
-|*    Letzte Aenderung  MM 25.05.91
+|*	  Beschreibung
+|*	  Ersterstellung	MM 25.05.91
+|*	  Letzte Aenderung	MM 25.05.91
 |*
 *************************************************************************/
 RscBaseCont::~RscBaseCont()
@@ -96,11 +96,11 @@ RscBaseCont::~RscBaseCont()
 
 /*************************************************************************
 |*
-|*    RscBaseCont::GetClassType()
+|*	  RscBaseCont::GetClassType()
 |*
-|*    Beschreibung
-|*    Ersterstellung    MM 25.05.91
-|*    Letzte Aenderung  MM 25.05.91
+|*	  Beschreibung
+|*	  Ersterstellung	MM 25.05.91
+|*	  Letzte Aenderung	MM 25.05.91
 |*
 *************************************************************************/
 RSCCLASS_TYPE RscBaseCont::GetClassType() const
@@ -110,16 +110,16 @@ RSCCLASS_TYPE RscBaseCont::GetClassType() const
 
 /*************************************************************************
 |*
-|*    DestroyElements()
+|*	  DestroyElements()
 |*
-|*    Beschreibung
-|*    Ersterstellung    MM 26.04.91
-|*    Letzte Aenderung  MM 26.04.91
+|*	  Beschreibung
+|*	  Ersterstellung	MM 26.04.91
+|*	  Letzte Aenderung	MM 26.04.91
 |*
 *************************************************************************/
 void RscBaseCont::DestroyElements( RscBaseContInst * pClassData )
 {
-    sal_uInt32  i = 0;
+    sal_uInt32	i = 0;
 
     if( pClassData->nEntries ){
         for( i = 0; i < pClassData->nEntries; i++ ){
@@ -133,17 +133,17 @@ void RscBaseCont::DestroyElements( RscBaseContInst * pClassData )
 
 /*************************************************************************
 |*
-|*    RscBaseCont::Create()
+|*	  RscBaseCont::Create()
 |*
-|*    Beschreibung
-|*    Ersterstellung    MM 26.04.91
-|*    Letzte Aenderung  MM 26.04.91
+|*	  Beschreibung
+|*	  Ersterstellung	MM 26.04.91
+|*	  Letzte Aenderung	MM 26.04.91
 |*
 *************************************************************************/
 RSCINST RscBaseCont::Create( RSCINST * pInst, const RSCINST & rDflt,
                              BOOL bOwnClass )
 {
-    sal_uInt32  i = 0;
+    sal_uInt32	i = 0;
     RSCINST aInst;
     RscBaseContInst * pClassData;
 
@@ -164,8 +164,8 @@ RSCINST RscBaseCont::Create( RSCINST * pInst, const RSCINST & rDflt,
     pClassData->bDflt = TRUE;
 
     if( bOwnClass ){
-        RscBaseContInst *   pDfltClassData;
-        RSCINST         aDfltI;
+        RscBaseContInst *	pDfltClassData;
+        RSCINST 		aDfltI;
 
         pDfltClassData = (RscBaseContInst *)(rDflt.pData + nOffInstData);
 
@@ -190,11 +190,11 @@ RSCINST RscBaseCont::Create( RSCINST * pInst, const RSCINST & rDflt,
 
 /*************************************************************************
 |*
-|*    RscBaseCont::Destroy()
+|*	  RscBaseCont::Destroy()
 |*
-|*    Beschreibung
-|*    Ersterstellung    MM 25.05.91
-|*    Letzte Aenderung  MM 25.05.91
+|*	  Beschreibung
+|*	  Ersterstellung	MM 25.05.91
+|*	  Letzte Aenderung	MM 25.05.91
 |*
 *************************************************************************/
 void RscBaseCont::Destroy( const RSCINST & rInst ){
@@ -208,17 +208,17 @@ void RscBaseCont::Destroy( const RSCINST & rInst ){
 
 /*************************************************************************
 |*
-|*    RscBaseCont::SearchEle()
+|*	  RscBaseCont::SearchEle()
 |*
-|*    Beschreibung
-|*    Ersterstellung    MM 17.05.91
-|*    Letzte Aenderung  MM 17.05.91
+|*	  Beschreibung
+|*	  Ersterstellung	MM 17.05.91
+|*	  Letzte Aenderung	MM 17.05.91
 |*
 *************************************************************************/
 RSCINST RscBaseCont::SearchElePos( const RSCINST & rInst, const RscId & rEleName,
                                    RscTop * pClass, sal_uInt32 nPos )
 {
-    sal_uInt32  i = 0;
+    sal_uInt32	i = 0;
     RscBaseContInst * pClassData;
 
     pClassData = (RscBaseContInst *)(rInst.pData + nOffInstData);
@@ -239,11 +239,11 @@ RSCINST RscBaseCont::SearchElePos( const RSCINST & rInst, const RscId & rEleName
 
 /*************************************************************************
 |*
-|*    RscBaseCont::SearchEle()
+|*	  RscBaseCont::SearchEle()
 |*
-|*    Beschreibung
-|*    Ersterstellung    MM 17.05.91
-|*    Letzte Aenderung  MM 17.05.91
+|*	  Beschreibung
+|*	  Ersterstellung	MM 17.05.91
+|*	  Letzte Aenderung	MM 17.05.91
 |*
 *************************************************************************/
 RSCINST RscBaseCont::SearchEle( const RSCINST & rInst, const RscId & rEleName,
@@ -254,11 +254,11 @@ RSCINST RscBaseCont::SearchEle( const RSCINST & rInst, const RscId & rEleName,
 
 /*************************************************************************
 |*
-|*    RscBaseCont::GetElement()
+|*	  RscBaseCont::GetElement()
 |*
-|*    Beschreibung
-|*    Ersterstellung    MM 26.04.91
-|*    Letzte Aenderung  MM 26.04.91
+|*	  Beschreibung
+|*	  Ersterstellung	MM 26.04.91
+|*	  Letzte Aenderung	MM 26.04.91
 |*
 *************************************************************************/
 ERRTYPE RscBaseCont::GetElement( const RSCINST & rInst, const RscId & rEleName,
@@ -266,8 +266,8 @@ ERRTYPE RscBaseCont::GetElement( const RSCINST & rInst, const RscId & rEleName,
                                  const RSCINST & rCreateInst, RSCINST * pGetInst )
 {
     RscBaseContInst * pClassData;
-    RSCINST           aTmpI;
-    ERRTYPE           aError;
+    RSCINST 		  aTmpI;
+    ERRTYPE 		  aError;
 
     if( !bNoId && !rEleName.IsId() )
         aError = WRN_CONT_NOID;
@@ -336,11 +336,11 @@ ERRTYPE RscBaseCont::GetElement( const RSCINST & rInst, const RscId & rEleName,
 
 /*************************************************************************
 |*
-|*    RscBaseCont::GetCount()
+|*	  RscBaseCont::GetCount()
 |*
-|*    Beschreibung
-|*    Ersterstellung    MM 08.05.91
-|*    Letzte Aenderung  MM 08.05.91
+|*	  Beschreibung
+|*	  Ersterstellung	MM 08.05.91
+|*	  Letzte Aenderung	MM 08.05.91
 |*
 *************************************************************************/
 sal_uInt32 RscBaseCont::GetCount( const RSCINST & rInst ){
@@ -352,11 +352,11 @@ sal_uInt32 RscBaseCont::GetCount( const RSCINST & rInst ){
 
 /*************************************************************************
 |*
-|*    RscBaseCont::GetPosEle()
+|*	  RscBaseCont::GetPosEle()
 |*
-|*    Beschreibung
-|*    Ersterstellung    MM 08.05.91
-|*    Letzte Aenderung  MM 08.05.91
+|*	  Beschreibung
+|*	  Ersterstellung	MM 08.05.91
+|*	  Letzte Aenderung	MM 08.05.91
 |*
 *************************************************************************/
 RSCINST RscBaseCont::GetPosEle( const RSCINST & rInst, sal_uInt32 nPos ){
@@ -371,11 +371,11 @@ RSCINST RscBaseCont::GetPosEle( const RSCINST & rInst, sal_uInt32 nPos ){
 
 /*************************************************************************
 |*
-|*    RscBaseCont::MovePosEle()
+|*	  RscBaseCont::MovePosEle()
 |*
-|*    Beschreibung
-|*    Ersterstellung    MM 23.10.91
-|*    Letzte Aenderung  MM 23.10.91
+|*	  Beschreibung
+|*	  Ersterstellung	MM 23.10.91
+|*	  Letzte Aenderung	MM 23.10.91
 |*
 *************************************************************************/
 ERRTYPE RscBaseCont::MovePosEle( const RSCINST & rInst, sal_uInt32 nDestPos,
@@ -388,8 +388,8 @@ ERRTYPE RscBaseCont::MovePosEle( const RSCINST & rInst, sal_uInt32 nDestPos,
 
     if( (nDestPos < pClassData->nEntries) && (nSourcePos < pClassData->nEntries) ){
         ENTRY_STRUCT aEntry;
-        int          nInc = 1;
-        sal_uInt32       i = 0;
+        int		     nInc = 1;
+        sal_uInt32		 i = 0;
 
         // Quelle Merken
         aEntry = pClassData->pEntries[ nSourcePos ];
@@ -410,18 +410,18 @@ ERRTYPE RscBaseCont::MovePosEle( const RSCINST & rInst, sal_uInt32 nDestPos,
 
 /*************************************************************************
 |*
-|*    RscBaseCont::SetPosRscId()
+|*	  RscBaseCont::SetPosRscId()
 |*
-|*    Beschreibung
-|*    Ersterstellung    MM 30.09.91
-|*    Letzte Aenderung  MM 30.09.91
+|*	  Beschreibung
+|*	  Ersterstellung	MM 30.09.91
+|*	  Letzte Aenderung	MM 30.09.91
 |*
 *************************************************************************/
 ERRTYPE RscBaseCont::SetPosRscId( const RSCINST & rInst, sal_uInt32 nPos,
                                   const RscId & rId ){
     RscBaseContInst * pClassData;
-    RSCINST           aTmpI;
-    ERRTYPE           aError;
+    RSCINST 		  aTmpI;
+    ERRTYPE 		  aError;
 
     pClassData = (RscBaseContInst *)(rInst.pData + nOffInstData);
 
@@ -441,22 +441,22 @@ ERRTYPE RscBaseCont::SetPosRscId( const RSCINST & rInst, sal_uInt32 nPos,
 
 /*************************************************************************
 |*
-|*    RscBaseCont::GetInfoEle()
+|*	  RscBaseCont::GetInfoEle()
 |*
-|*    Beschreibung
-|*    Ersterstellung    MM 08.05.91
-|*    Letzte Aenderung  MM 08.05.91
+|*	  Beschreibung
+|*	  Ersterstellung	MM 08.05.91
+|*	  Letzte Aenderung	MM 08.05.91
 |*
 *************************************************************************/
 SUBINFO_STRUCT RscBaseCont::GetInfoEle( const RSCINST & rInst, sal_uInt32 nPos ){
     RscBaseContInst * pClassData;
-    SUBINFO_STRUCT  aInfo;
+    SUBINFO_STRUCT	aInfo;
 
     pClassData = (RscBaseContInst *)(rInst.pData + nOffInstData);
 
     if( nPos < pClassData->nEntries ){
-        aInfo.aId    = pClassData->pEntries[ nPos ].aName;
-        aInfo.nPos   = nPos;
+        aInfo.aId	 = pClassData->pEntries[ nPos ].aName;
+        aInfo.nPos	 = nPos;
         aInfo.pClass = pClassData->pEntries[ nPos ].aInst.pClass;
     }
     return( aInfo );
@@ -464,11 +464,11 @@ SUBINFO_STRUCT RscBaseCont::GetInfoEle( const RSCINST & rInst, sal_uInt32 nPos )
 
 /*************************************************************************
 |*
-|*    RscBaseCont::SetString()
+|*	  RscBaseCont::SetString()
 |*
-|*    Beschreibung
-|*    Ersterstellung    MM 29.04.91
-|*    Letzte Aenderung  MM 29.04.91
+|*	  Beschreibung
+|*	  Ersterstellung	MM 29.04.91
+|*	  Letzte Aenderung	MM 29.04.91
 |*
 *************************************************************************/
 ERRTYPE RscBaseCont::SetString( const RSCINST & rInst, const char * pStr )
@@ -476,7 +476,7 @@ ERRTYPE RscBaseCont::SetString( const RSCINST & rInst, const char * pStr )
     RscBaseContInst * pClassData;
     RSCINST aTmpI;
     ERRTYPE aError;
-    char    *pTmpStr;
+    char	*pTmpStr;
 
     pClassData = (RscBaseContInst *)(rInst.pData + nOffInstData);
 
@@ -506,18 +506,18 @@ else
 
 /*************************************************************************
 |*
-|*    RscBaseCont::SetNumber()
+|*	  RscBaseCont::SetNumber()
 |*
-|*    Beschreibung
-|*    Ersterstellung    MM 12.06.91
-|*    Letzte Aenderung  MM 12.06.91
+|*	  Beschreibung
+|*	  Ersterstellung	MM 12.06.91
+|*	  Letzte Aenderung	MM 12.06.91
 |*
 *************************************************************************/
 ERRTYPE RscBaseCont::SetNumber( const RSCINST & rInst, INT32 lValue ){
     RscBaseContInst * pClassData;
     RSCINST aTmpI;
     ERRTYPE aError;
-    INT32   lNumber;
+    INT32	lNumber;
 
     pClassData = (RscBaseContInst *)(rInst.pData + nOffInstData);
 
@@ -555,7 +555,7 @@ ERRTYPE RscBaseCont::SetBool
     RscBaseContInst * pClassData;
     RSCINST aTmpI;
     ERRTYPE aError;
-    BOOL    bBool;
+    BOOL	bBool;
 
     pClassData = (RscBaseContInst *)(rInst.pData + nOffInstData);
 
@@ -595,7 +595,7 @@ ERRTYPE RscBaseCont::SetConst
     RscBaseContInst * pClassData;
     RSCINST aTmpI;
     ERRTYPE aError;
-    Atom    nConst;
+    Atom	nConst;
 
     pClassData = (RscBaseContInst *)(rInst.pData + nOffInstData);
 
@@ -625,18 +625,18 @@ else
 
 /*************************************************************************
 |*
-|*    RscBaseCont::SetRef()
+|*	  RscBaseCont::SetRef()
 |*
-|*    Beschreibung
-|*    Ersterstellung    MM 02.12.91
-|*    Letzte Aenderung  MM 02.12.91
+|*	  Beschreibung
+|*	  Ersterstellung	MM 02.12.91
+|*	  Letzte Aenderung	MM 02.12.91
 |*
 *************************************************************************/
 ERRTYPE RscBaseCont::SetRef( const RSCINST & rInst, const RscId & rRefId ){
     RscBaseContInst * pClassData;
     RSCINST aTmpI;
     ERRTYPE aError;
-    RscId   aId;
+    RscId	aId;
 
     pClassData = (RscBaseContInst *)(rInst.pData + nOffInstData);
 
@@ -666,17 +666,17 @@ else
 
 /*************************************************************************
 |*
-|*    RscBaseCont::IsConsistent()
+|*	  RscBaseCont::IsConsistent()
 |*
-|*    Beschreibung
-|*    Ersterstellung    MM 23.09.91
-|*    Letzte Aenderung  MM 23.09.91
+|*	  Beschreibung
+|*	  Ersterstellung	MM 23.09.91
+|*	  Letzte Aenderung	MM 23.09.91
 |*
 *************************************************************************/
 BOOL RscBaseCont::IsConsistent( const RSCINST & rInst, RscInconsList * pList ){
-    sal_uInt32  i = 0;
+    sal_uInt32	i = 0;
     RscBaseContInst * pClassData;
-    BOOL    bRet;
+    BOOL	bRet;
 
     bRet = RscTop::IsConsistent( rInst, pList );
 
@@ -700,7 +700,7 @@ BOOL RscBaseCont::IsConsistent( const RSCINST & rInst, RscInconsList * pList ){
                  bRet = FALSE;
                  if( pList )
                      pList->Insert( new RscInconsistent(
-                         pClassData->pEntries[ i    ].aName,
+                         pClassData->pEntries[ i	].aName,
                          pClassData->pEntries[ i +1 ].aName ) );
              };
         }
@@ -714,16 +714,16 @@ BOOL RscBaseCont::IsConsistent( const RSCINST & rInst, RscInconsList * pList ){
 
 /*************************************************************************
 |*
-|*    RscBaseCont::SetToDefault()
+|*	  RscBaseCont::SetToDefault()
 |*
-|*    Beschreibung
-|*    Ersterstellung    MM 25.04.91
-|*    Letzte Aenderung  MM 25.04.91
+|*	  Beschreibung
+|*	  Ersterstellung	MM 25.04.91
+|*	  Letzte Aenderung	MM 25.04.91
 |*
 *************************************************************************/
 void RscBaseCont::SetToDefault( const RSCINST & rInst )
 {
-    sal_uInt32  i = 0;
+    sal_uInt32	i = 0;
     RscBaseContInst * pClassData;
 
     pClassData = (RscBaseContInst *)(rInst.pData + nOffInstData);
@@ -739,15 +739,15 @@ void RscBaseCont::SetToDefault( const RSCINST & rInst )
 
 /*************************************************************************
 |*
-|*    RscBaseCont::IsDefault()
+|*	  RscBaseCont::IsDefault()
 |*
-|*    Beschreibung
-|*    Ersterstellung    MM 25.04.91
-|*    Letzte Aenderung  MM 25.04.91
+|*	  Beschreibung
+|*	  Ersterstellung	MM 25.04.91
+|*	  Letzte Aenderung	MM 25.04.91
 |*
 *************************************************************************/
 BOOL RscBaseCont::IsDefault( const RSCINST & rInst ){
-    sal_uInt32  i = 0;
+    sal_uInt32	i = 0;
     RscBaseContInst * pClassData;
 
     pClassData = (RscBaseContInst *)(rInst.pData + nOffInstData);
@@ -768,11 +768,11 @@ BOOL RscBaseCont::IsDefault( const RSCINST & rInst ){
 
 /*************************************************************************
 |*
-|*    RscBaseCont::IsValueDefault()
+|*	  RscBaseCont::IsValueDefault()
 |*
-|*    Beschreibung
-|*    Ersterstellung    MM 25.04.91
-|*    Letzte Aenderung  MM 15.01.92
+|*	  Beschreibung
+|*	  Ersterstellung	MM 25.04.91
+|*	  Letzte Aenderung	MM 15.01.92
 |*
 *************************************************************************/
 BOOL RscBaseCont::IsValueDefault( const RSCINST & rInst, CLASS_DATA pDef )
@@ -792,17 +792,17 @@ BOOL RscBaseCont::IsValueDefault( const RSCINST & rInst, CLASS_DATA pDef )
 
 /*************************************************************************
 |*
-|*    RscBaseCont::Delete()
+|*	  RscBaseCont::Delete()
 |*
-|*    Beschreibung
-|*    Ersterstellung    MM 12.06.91
-|*    Letzte Aenderung  MM 12.06.91
+|*	  Beschreibung
+|*	  Ersterstellung	MM 12.06.91
+|*	  Letzte Aenderung	MM 12.06.91
 |*
 *************************************************************************/
 void RscBaseCont::Delete( const RSCINST & rInst, RscTop * pClass,
                           const RscId & rId )
 {
-    sal_uInt32  i = 0;
+    sal_uInt32	i = 0;
     RscBaseContInst * pClassData;
 
     pClassData = (RscBaseContInst *)(rInst.pData + nOffInstData);
@@ -821,16 +821,16 @@ void RscBaseCont::Delete( const RSCINST & rInst, RscTop * pClass,
 
 /*************************************************************************
 |*
-|*    RscBaseCont::DeletePos()
+|*	  RscBaseCont::DeletePos()
 |*
-|*    Beschreibung
-|*    Ersterstellung    MM 12.06.91
-|*    Letzte Aenderung  MM 12.06.91
+|*	  Beschreibung
+|*	  Ersterstellung	MM 12.06.91
+|*	  Letzte Aenderung	MM 12.06.91
 |*
 *************************************************************************/
 void RscBaseCont::DeletePos( const RSCINST & rInst, sal_uInt32 nPos ){
-    RscBaseContInst *   pClassData;
-    sal_uInt32              i = 0;
+    RscBaseContInst *	pClassData;
+    sal_uInt32				i = 0;
 
     pClassData = (RscBaseContInst *)(rInst.pData + nOffInstData);
 
@@ -848,18 +848,18 @@ void RscBaseCont::DeletePos( const RSCINST & rInst, sal_uInt32 nPos ){
 
 /*************************************************************************
 |*
-|*    RscBaseCont::ContWriteSrc()
+|*	  RscBaseCont::ContWriteSrc()
 |*
-|*    Beschreibung
-|*    Ersterstellung    MM 26.04.91
-|*    Letzte Aenderung  MM 26.04.91
+|*	  Beschreibung
+|*	  Ersterstellung	MM 26.04.91
+|*	  Letzte Aenderung	MM 26.04.91
 |*
 *************************************************************************/
 void RscBaseCont::ContWriteSrc( const RSCINST & rInst, FILE * fOutput,
                                 RscTypCont * pTC, sal_uInt32 nTab,
                                 const char * pVarName )
 {
-    sal_uInt32  i = 0, t = 0;
+    sal_uInt32	i = 0, t = 0;
     RscBaseContInst * pClassData;
 
     pClassData = (RscBaseContInst *)(rInst.pData + nOffInstData);
@@ -878,19 +878,19 @@ void RscBaseCont::ContWriteSrc( const RSCINST & rInst, FILE * fOutput,
 
 /*************************************************************************
 |*
-|*    RscBaseCont::ContWriteRc()
+|*	  RscBaseCont::ContWriteRc()
 |*
-|*    Beschreibung
-|*    Ersterstellung    MM 26.04.91
-|*    Letzte Aenderung  MM 26.04.91
+|*	  Beschreibung
+|*	  Ersterstellung	MM 26.04.91
+|*	  Letzte Aenderung	MM 26.04.91
 |*
 *************************************************************************/
 ERRTYPE RscBaseCont::ContWriteRc( const RSCINST & rInst, RscWriteRc & rMem,
                               RscTypCont * pTC, sal_uInt32 nDeep, BOOL bExtra )
 {
-    sal_uInt32        i = 0;
+    sal_uInt32		  i = 0;
     RscBaseContInst * pClassData;
-    ERRTYPE       aError;
+    ERRTYPE 	  aError;
 
     if( bExtra || bNoId )
     { // Nur Subresourcen schreiben, wenn bExtra == TRUE
@@ -940,11 +940,11 @@ void RscBaseCont::ContWriteRcAccess
 
 /*************************************************************************
 |*
-|*    RscBaseCont::WriteSrc()
+|*	  RscBaseCont::WriteSrc()
 |*
-|*    Beschreibung
-|*    Ersterstellung    MM 26.04.91
-|*    Letzte Aenderung  MM 26.04.91
+|*	  Beschreibung
+|*	  Ersterstellung	MM 26.04.91
+|*	  Letzte Aenderung	MM 26.04.91
 |*
 *************************************************************************/
 void RscBaseCont::WriteSrc( const RSCINST & rInst, FILE * fOutput,
@@ -957,17 +957,17 @@ void RscBaseCont::WriteSrc( const RSCINST & rInst, FILE * fOutput,
 
 /*************************************************************************
 |*
-|*    RscBaseCont::WriteRc()
+|*	  RscBaseCont::WriteRc()
 |*
-|*    Beschreibung
-|*    Ersterstellung    MM 26.04.91
-|*    Letzte Aenderung  MM 26.04.91
+|*	  Beschreibung
+|*	  Ersterstellung	MM 26.04.91
+|*	  Letzte Aenderung	MM 26.04.91
 |*
 *************************************************************************/
 ERRTYPE RscBaseCont::WriteRc( const RSCINST & rInst, RscWriteRc & rMem,
                               RscTypCont * pTC, sal_uInt32 nDeep, BOOL bExtra )
 {
-    ERRTYPE       aError;
+    ERRTYPE 	  aError;
 
     aError = RscTop::WriteRc( rInst, rMem, pTC, nDeep, bExtra );
     if( aError.IsOk() )
@@ -978,19 +978,19 @@ ERRTYPE RscBaseCont::WriteRc( const RSCINST & rInst, RscWriteRc & rMem,
 
 /*************************************************************************
 |*
-|*    RscBaseCont::WriteHxx()
+|*	  RscBaseCont::WriteHxx()
 |*
-|*    Beschreibung
-|*    Ersterstellung    MM 26.04.91
-|*    Letzte Aenderung  MM 26.04.91
+|*	  Beschreibung
+|*	  Ersterstellung	MM 26.04.91
+|*	  Letzte Aenderung	MM 26.04.91
 |*
 *************************************************************************/
 ERRTYPE RscBaseCont::WriteHxx( const RSCINST & rInst, FILE * fOutput,
                                RscTypCont * pTC, const RscId & rRscId )
 {
-    sal_uInt32        i = 0;
+    sal_uInt32		  i = 0;
     RscBaseContInst * pClassData;
-    ERRTYPE       aError;
+    ERRTYPE 	  aError;
 
     aError = RscTop::WriteHxx( rInst, fOutput, pTC, rRscId );
 
@@ -1013,19 +1013,19 @@ ERRTYPE RscBaseCont::WriteHxx( const RSCINST & rInst, FILE * fOutput,
 
 /*************************************************************************
 |*
-|*    RscBaseCont::WriteCxx()
+|*	  RscBaseCont::WriteCxx()
 |*
-|*    Beschreibung
-|*    Ersterstellung    MM 26.04.91
-|*    Letzte Aenderung  MM 26.04.91
+|*	  Beschreibung
+|*	  Ersterstellung	MM 26.04.91
+|*	  Letzte Aenderung	MM 26.04.91
 |*
 *************************************************************************/
 ERRTYPE RscBaseCont::WriteCxx( const RSCINST & rInst, FILE * fOutput,
                                RscTypCont * pTC, const RscId & rRscId )
 {
-    sal_uInt32        i = 0;
+    sal_uInt32		  i = 0;
     RscBaseContInst * pClassData;
-    ERRTYPE       aError;
+    ERRTYPE 	  aError;
 
     aError = RscTop::WriteCxx( rInst, fOutput, pTC, rRscId );
 
@@ -1049,11 +1049,11 @@ ERRTYPE RscBaseCont::WriteCxx( const RSCINST & rInst, FILE * fOutput,
 /*************** R s c C o n t W r i t e S r c ***************************/
 /*************************************************************************
 |*
-|*    RscContWriteSrc::RscContWriteSrc()
+|*	  RscContWriteSrc::RscContWriteSrc()
 |*
-|*    Beschreibung
-|*    Ersterstellung    MM 08.05.91
-|*    Letzte Aenderung  MM 08.05.91
+|*	  Beschreibung
+|*	  Ersterstellung	MM 08.05.91
+|*	  Letzte Aenderung	MM 08.05.91
 |*
 *************************************************************************/
 RscContWriteSrc::RscContWriteSrc( Atom nId, sal_uInt32 nTypeId,
@@ -1063,18 +1063,18 @@ RscContWriteSrc::RscContWriteSrc( Atom nId, sal_uInt32 nTypeId,
 
 /*************************************************************************
 |*
-|*    RscContWriteSrc::WriteSrc()
+|*	  RscContWriteSrc::WriteSrc()
 |*
-|*    Beschreibung
-|*    Ersterstellung    MM 08.05.91
-|*    Letzte Aenderung  MM 08.05.91
+|*	  Beschreibung
+|*	  Ersterstellung	MM 08.05.91
+|*	  Letzte Aenderung	MM 08.05.91
 |*
 *************************************************************************/
 void RscContWriteSrc::WriteSrc( const RSCINST & rInst, FILE * fOutput,
                                 RscTypCont * pTC, sal_uInt32 nTab,
                                 const char * pVarName )
 {
-    sal_uInt32  i;
+    sal_uInt32	i;
 
     RscTop::WriteSrc( rInst, fOutput, pTC, nTab, pVarName );
 
@@ -1093,11 +1093,11 @@ void RscContWriteSrc::WriteSrc( const RSCINST & rInst, FILE * fOutput,
 /*************** R s c C o n t *******************************************/
 /*************************************************************************
 |*
-|*    RscCont::RscCont()
+|*	  RscCont::RscCont()
 |*
-|*    Beschreibung
-|*    Ersterstellung    MM 08.05.91
-|*    Letzte Aenderung  MM 08.05.91
+|*	  Beschreibung
+|*	  Ersterstellung	MM 08.05.91
+|*	  Letzte Aenderung	MM 08.05.91
 |*
 *************************************************************************/
 RscCont::RscCont( Atom nId, sal_uInt32 nTypeId, RscTop * pSuper, BOOL bNoIdent )
@@ -1106,11 +1106,11 @@ RscCont::RscCont( Atom nId, sal_uInt32 nTypeId, RscTop * pSuper, BOOL bNoIdent )
 
 /*************************************************************************
 |*
-|*    RscCont::WriteRc()
+|*	  RscCont::WriteRc()
 |*
-|*    Beschreibung
-|*    Ersterstellung    MM 08.05.91
-|*    Letzte Aenderung  MM 08.05.91
+|*	  Beschreibung
+|*	  Ersterstellung	MM 08.05.91
+|*	  Letzte Aenderung	MM 08.05.91
 |*
 *************************************************************************/
 ERRTYPE RscCont::WriteRc( const RSCINST & rInst, RscWriteRc & rMem,
@@ -1144,11 +1144,11 @@ void RscCont::WriteRcAccess
 
 /*************************************************************************
 |*
-|*    RscContExtraData::RscContExtraData()
+|*	  RscContExtraData::RscContExtraData()
 |*
-|*    Beschreibung
-|*    Ersterstellung    MM 08.05.91
-|*    Letzte Aenderung  MM 08.05.91
+|*	  Beschreibung
+|*	  Ersterstellung	MM 08.05.91
+|*	  Letzte Aenderung	MM 08.05.91
 |*
 *************************************************************************/
 RscContExtraData::RscContExtraData( Atom nId, sal_uInt32 nTypeId,
@@ -1158,11 +1158,11 @@ RscContExtraData::RscContExtraData( Atom nId, sal_uInt32 nTypeId,
 
 /*************************************************************************
 |*
-|*    RscContExtraData::WriteRc()
+|*	  RscContExtraData::WriteRc()
 |*
-|*    Beschreibung
-|*    Ersterstellung    MM 08.05.91
-|*    Letzte Aenderung  MM 08.05.91
+|*	  Beschreibung
+|*	  Ersterstellung	MM 08.05.91
+|*	  Letzte Aenderung	MM 08.05.91
 |*
 *************************************************************************/
 ERRTYPE RscContExtraData::WriteRc( const RSCINST & rInst, RscWriteRc & rMem,
diff --git a/rsc/source/res/rscflag.cxx b/rsc/source/res/rscflag.cxx
index e742b806408e..710c0e490c5c 100644
--- a/rsc/source/res/rscflag.cxx
+++ b/rsc/source/res/rscflag.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
@@ -383,7 +383,7 @@ void RscFlag::WriteSrc( const RSCINST & rInst, FILE * fOutput,
 ERRTYPE RscFlag::WriteRc( const RSCINST & rInst, RscWriteRc & aMem,
                           RscTypCont *, sal_uInt32, BOOL )
 {
-    INT32   lVal = 0;
+    INT32	lVal = 0;
     sal_uInt32  i = 0, Flag = 0, nIndex = 0;
 
     Flag = 1;
diff --git a/rsc/source/res/rscmgr.cxx b/rsc/source/res/rscmgr.cxx
index 3e3d29372fe7..b3725c6557e1 100644
--- a/rsc/source/res/rscmgr.cxx
+++ b/rsc/source/res/rscmgr.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
@@ -43,11 +43,11 @@
 /****************** R s c M g r ******************************************/
 /*************************************************************************
 |*
-|*    RscMgr::RscMgr()
+|*	  RscMgr::RscMgr()
 |*
-|*    Beschreibung
-|*    Ersterstellung    MM 26.04.91
-|*    Letzte Aenderung  MM 26.04.91
+|*	  Beschreibung
+|*	  Ersterstellung	MM 26.04.91
+|*	  Letzte Aenderung	MM 26.04.91
 |*
 *************************************************************************/
 RscMgr::RscMgr( Atom nId, sal_uInt32 nTypeId, RscTop * pSuperCl )
@@ -57,11 +57,11 @@ RscMgr::RscMgr( Atom nId, sal_uInt32 nTypeId, RscTop * pSuperCl )
 
 /*************************************************************************
 |*
-|*    RscMgr::Size()
+|*	  RscMgr::Size()
 |*
-|*    Beschreibung
-|*    Ersterstellung    MM 26.04.91
-|*    Letzte Aenderung  MM 26.04.91
+|*	  Beschreibung
+|*	  Ersterstellung	MM 26.04.91
+|*	  Letzte Aenderung	MM 26.04.91
 |*
 *************************************************************************/
 sal_uInt32 RscMgr::Size()
@@ -71,11 +71,11 @@ sal_uInt32 RscMgr::Size()
 
 /*************************************************************************
 |*
-|*    RscMgr::Create()
+|*	  RscMgr::Create()
 |*
-|*    Beschreibung
-|*    Ersterstellung    MM 03.04.91
-|*    Letzte Aenderung  MM 03.04.91
+|*	  Beschreibung
+|*	  Ersterstellung	MM 03.04.91
+|*	  Letzte Aenderung	MM 03.04.91
 |*
 *************************************************************************/
 RSCINST RscMgr::Create( RSCINST * pInst, const RSCINST & rDflt, BOOL bOwnClass ){
@@ -106,11 +106,11 @@ RSCINST RscMgr::Create( RSCINST * pInst, const RSCINST & rDflt, BOOL bOwnClass )
 
 /*************************************************************************
 |*
-|*    RscMgr::Destroy()
+|*	  RscMgr::Destroy()
 |*
-|*    Beschreibung
-|*    Ersterstellung    MM 21.06.91
-|*    Letzte Aenderung  MM 21.06.91
+|*	  Beschreibung
+|*	  Ersterstellung	MM 21.06.91
+|*	  Letzte Aenderung	MM 21.06.91
 |*
 *************************************************************************/
 void RscMgr::Destroy( const RSCINST & rInst ){
@@ -124,11 +124,11 @@ void RscMgr::Destroy( const RSCINST & rInst ){
 
 /*************************************************************************
 |*
-|*    RscMgr::SetToDefault()
+|*	  RscMgr::SetToDefault()
 |*
-|*    Beschreibung
-|*    Ersterstellung    MM 12.06.91
-|*    Letzte Aenderung  MM 12.06.91
+|*	  Beschreibung
+|*	  Ersterstellung	MM 12.06.91
+|*	  Letzte Aenderung	MM 12.06.91
 |*
 *************************************************************************/
 void RscMgr::SetToDefault( const RSCINST & rInst )
@@ -143,11 +143,11 @@ void RscMgr::SetToDefault( const RSCINST & rInst )
 
 /*************************************************************************
 |*
-|*    RscMgr::IsDefault()
+|*	  RscMgr::IsDefault()
 |*
-|*    Beschreibung
-|*    Ersterstellung    MM 12.06.91
-|*    Letzte Aenderung  MM 12.06.91
+|*	  Beschreibung
+|*	  Ersterstellung	MM 12.06.91
+|*	  Letzte Aenderung	MM 12.06.91
 |*
 *************************************************************************/
 BOOL RscMgr::IsDefault( const RSCINST & rInst ){
@@ -162,11 +162,11 @@ BOOL RscMgr::IsDefault( const RSCINST & rInst ){
 
 /*************************************************************************
 |*
-|*    RscMgr::IsValueDefault()
+|*	  RscMgr::IsValueDefault()
 |*
-|*    Beschreibung
-|*    Ersterstellung    MM 12.06.91
-|*    Letzte Aenderung  MM 12.06.91
+|*	  Beschreibung
+|*	  Ersterstellung	MM 12.06.91
+|*	  Letzte Aenderung	MM 12.06.91
 |*
 *************************************************************************/
 BOOL RscMgr::IsValueDefault( const RSCINST & rInst, CLASS_DATA pDef ){
@@ -191,11 +191,11 @@ BOOL RscMgr::IsValueDefault( const RSCINST & rInst, CLASS_DATA pDef ){
 
 /*************************************************************************
 |*
-|*    RscMgr::WriteSrcHeader()
+|*	  RscMgr::WriteSrcHeader()
 |*
-|*    Beschreibung
-|*    Ersterstellung    MM 08.04.91
-|*    Letzte Aenderung  MM 08.04.91
+|*	  Beschreibung
+|*	  Ersterstellung	MM 08.04.91
+|*	  Letzte Aenderung	MM 08.04.91
 |*
 *************************************************************************/
 void RscMgr::WriteSrcHeader( const RSCINST & rInst, FILE * fOutput,
@@ -203,7 +203,7 @@ void RscMgr::WriteSrcHeader( const RSCINST & rInst, FILE * fOutput,
                              const RscId & rId, const char * pVarName )
 {
     RscMgrInst * pClassData;
-    sal_uInt32       i;
+    sal_uInt32		 i;
 
     pClassData = (RscMgrInst *)(rInst.pData + RscClass::Size());
 
@@ -231,11 +231,11 @@ void RscMgr::WriteSrcHeader( const RSCINST & rInst, FILE * fOutput,
 
 /*************************************************************************
 |*
-|*    RscMgr::WriteSrc()
+|*	  RscMgr::WriteSrc()
 |*
-|*    Beschreibung
-|*    Ersterstellung    MM 08.04.91
-|*    Letzte Aenderung  MM 08.04.91
+|*	  Beschreibung
+|*	  Ersterstellung	MM 08.04.91
+|*	  Letzte Aenderung	MM 08.04.91
 |*
 *************************************************************************/
 void RscMgr::WriteSrc( const RSCINST &, FILE *, RscTypCont *, sal_uInt32,
@@ -245,20 +245,20 @@ void RscMgr::WriteSrc( const RSCINST &, FILE *, RscTypCont *, sal_uInt32,
 
 /*************************************************************************
 |*
-|*    RscMgr::WriteRcHeader()
+|*	  RscMgr::WriteRcHeader()
 |*
-|*    Beschreibung
-|*    Ersterstellung    MM 15.04.91
-|*    Letzte Aenderung  MM 15.04.91
+|*	  Beschreibung
+|*	  Ersterstellung	MM 15.04.91
+|*	  Letzte Aenderung	MM 15.04.91
 |*
 *************************************************************************/
 ERRTYPE RscMgr::WriteRcHeader( const RSCINST & rInst, RscWriteRc & rMem,
                                RscTypCont * pTC, const RscId &rId,
                                sal_uInt32 nDeep, BOOL bExtra )
 {
-    RscMgrInst *    pClassData;
-    ERRTYPE         aError;
-    ObjNode *       pObjNode = NULL;
+    RscMgrInst *	pClassData;
+    ERRTYPE 		aError;
+    ObjNode *		pObjNode = NULL;
 
     pClassData = (RscMgrInst *)(rInst.pData + RscClass::Size());
 
@@ -285,8 +285,8 @@ ERRTYPE RscMgr::WriteRcHeader( const RSCINST & rInst, RscWriteRc & rMem,
     {
         if( pObjNode )
         {
-            RSCINST     aRefI;
-            RscTop *    pTmpRefClass = rInst.pClass->GetRefClass();
+            RSCINST 	aRefI;
+            RscTop *	pTmpRefClass = rInst.pClass->GetRefClass();
 
             aRefI = RSCINST( rInst.pClass, pObjNode->GetRscObj() );
             if( pTmpRefClass == rInst.pClass )
@@ -304,8 +304,8 @@ ERRTYPE RscMgr::WriteRcHeader( const RSCINST & rInst, RscWriteRc & rMem,
         }
         else
         {
-            sal_uInt32          nOldSize;
-            sal_uInt32          nLocalSize;
+            sal_uInt32			nOldSize;
+            sal_uInt32			nLocalSize;
 
             nOldSize = rMem.IncSize( 16 /*sizeof( RSHEADER_TYPE )*/ );
 
@@ -323,10 +323,10 @@ ERRTYPE RscMgr::WriteRcHeader( const RSCINST & rInst, RscWriteRc & rMem,
             /*
             // Definition der Struktur, aus denen die Resource aufgebaut ist
             struct RSHEADER_TYPE{
-                RESOURCE_TYPE   nRT;        // Resource Typ
-                sal_uInt32          nRT;        // Resource Typ
-                sal_uInt32          nGlobOff;   // Globaler Offset
-                sal_uInt32          nLocalOff;  // Lokaler Offset
+                RESOURCE_TYPE	nRT;		// Resource Typ
+                sal_uInt32			nRT;		// Resource Typ
+                sal_uInt32			nGlobOff;	// Globaler Offset
+                sal_uInt32			nLocalOff;	// Lokaler Offset
             };
             */
             sal_uInt32 nID = rId;
@@ -342,11 +342,11 @@ ERRTYPE RscMgr::WriteRcHeader( const RSCINST & rInst, RscWriteRc & rMem,
 
 /*************************************************************************
 |*
-|*    RscMgr::WriteRc()
+|*	  RscMgr::WriteRc()
 |*
-|*    Beschreibung
-|*    Ersterstellung    MM 26.04.91
-|*    Letzte Aenderung  MM 26.04.91
+|*	  Beschreibung
+|*	  Ersterstellung	MM 26.04.91
+|*	  Letzte Aenderung	MM 26.04.91
 |*
 *************************************************************************/
 ERRTYPE RscMgr::WriteRc( const RSCINST &, RscWriteRc &,
@@ -396,19 +396,19 @@ static ByteString MakeName( RscTypCont * pTypCon, RscTop * pClass,
 
 /*************************************************************************
 |*
-|*    RscMgr::WriteHxxHeader()
+|*	  RscMgr::WriteHxxHeader()
 |*
-|*    Beschreibung
-|*    Ersterstellung    MM 29.05.91
-|*    Letzte Aenderung  MM 29.05.91
+|*	  Beschreibung
+|*	  Ersterstellung	MM 29.05.91
+|*	  Letzte Aenderung	MM 29.05.91
 |*
 *************************************************************************/
 ERRTYPE RscMgr::WriteHxxHeader( const RSCINST & rInst, FILE * fOutput,
                                 RscTypCont * pTC, const RscId &rId )
 {
-    RscMgrInst *    pClassData;
-    ERRTYPE         aError;
-    ObjNode *       pObjNode = NULL;
+    RscMgrInst *	pClassData;
+    ERRTYPE 		aError;
+    ObjNode *		pObjNode = NULL;
 
     pClassData = (RscMgrInst *)(rInst.pData + RscClass::Size());
 
@@ -417,7 +417,7 @@ ERRTYPE RscMgr::WriteHxxHeader( const RSCINST & rInst, FILE * fOutput,
         pObjNode = rInst.pClass->GetObjNode( pClassData->aRefId );
         if( !pObjNode && pTC )
         {
-            ByteString  aMsg( pHS->getString( rInst.pClass->GetId() ).getStr() );
+            ByteString	aMsg( pHS->getString( rInst.pClass->GetId() ).getStr() );
             aMsg += ' ';
             aMsg += pClassData->aRefId.GetName();
             aError = WRN_MGR_REFNOTFOUND;
@@ -427,7 +427,7 @@ ERRTYPE RscMgr::WriteHxxHeader( const RSCINST & rInst, FILE * fOutput,
 
     if( pObjNode )
     {
-        RSCINST     aRefI;
+        RSCINST 	aRefI;
 
         aRefI = RSCINST( rInst.pClass, pObjNode->GetRscObj() );
         aError = aRefI.pClass->WriteHxxHeader( aRefI, fOutput, pTC,
@@ -465,11 +465,11 @@ ERRTYPE RscMgr::WriteHxxHeader( const RSCINST & rInst, FILE * fOutput,
 
 /*************************************************************************
 |*
-|*    RscMgr::WriteHxx()
+|*	  RscMgr::WriteHxx()
 |*
-|*    Beschreibung
-|*    Ersterstellung    MM 29.05.91
-|*    Letzte Aenderung  MM 29.05.91
+|*	  Beschreibung
+|*	  Ersterstellung	MM 29.05.91
+|*	  Letzte Aenderung	MM 29.05.91
 |*
 *************************************************************************/
 ERRTYPE RscMgr::WriteHxx( const RSCINST & rInst, FILE * fOutput,
@@ -484,19 +484,19 @@ ERRTYPE RscMgr::WriteHxx( const RSCINST & rInst, FILE * fOutput,
 
 /*************************************************************************
 |*
-|*    RscClass::WriteCxxHeader()
+|*	  RscClass::WriteCxxHeader()
 |*
-|*    Beschreibung
-|*    Ersterstellung    MM 29.05.91
-|*    Letzte Aenderung  MM 29.05.91
+|*	  Beschreibung
+|*	  Ersterstellung	MM 29.05.91
+|*	  Letzte Aenderung	MM 29.05.91
 |*
 *************************************************************************/
 ERRTYPE RscMgr::WriteCxxHeader( const RSCINST & rInst, FILE * fOutput,
                                 RscTypCont * pTC, const RscId & rId )
 {
-    RscMgrInst *    pClassData;
-    ERRTYPE         aError;
-    ObjNode *       pObjNode = NULL;
+    RscMgrInst *	pClassData;
+    ERRTYPE 		aError;
+    ObjNode *		pObjNode = NULL;
 
     pClassData = (RscMgrInst *)(rInst.pData + RscClass::Size());
 
@@ -505,7 +505,7 @@ ERRTYPE RscMgr::WriteCxxHeader( const RSCINST & rInst, FILE * fOutput,
         pObjNode = rInst.pClass->GetObjNode( pClassData->aRefId );
         if( !pObjNode && pTC )
         {
-            ByteString  aMsg( pHS->getString( rInst.pClass->GetId() ).getStr() );
+            ByteString	aMsg( pHS->getString( rInst.pClass->GetId() ).getStr() );
             aMsg += ' ';
             aMsg += pClassData->aRefId.GetName();
             aError = WRN_MGR_REFNOTFOUND;
@@ -515,7 +515,7 @@ ERRTYPE RscMgr::WriteCxxHeader( const RSCINST & rInst, FILE * fOutput,
 
     if( pObjNode )
     {
-        RSCINST     aRefI;
+        RSCINST 	aRefI;
 
         aRefI = RSCINST( rInst.pClass, pObjNode->GetRscObj() );
         aError = aRefI.pClass->WriteCxxHeader( aRefI, fOutput, pTC,
@@ -566,11 +566,11 @@ ERRTYPE RscMgr::WriteCxxHeader( const RSCINST & rInst, FILE * fOutput,
 
 /*************************************************************************
 |*
-|*    RscClass::WriteCxx()
+|*	  RscClass::WriteCxx()
 |*
-|*    Beschreibung
-|*    Ersterstellung    MM 29.05.91
-|*    Letzte Aenderung  MM 29.05.91
+|*	  Beschreibung
+|*	  Ersterstellung	MM 29.05.91
+|*	  Letzte Aenderung	MM 29.05.91
 |*
 *************************************************************************/
 ERRTYPE RscMgr::WriteCxx( const RSCINST & rInst, FILE * fOutput,
@@ -586,16 +586,16 @@ ERRTYPE RscMgr::WriteCxx( const RSCINST & rInst, FILE * fOutput,
 
 /*************************************************************************
 |*
-|*    RscArray::IsConsistent()
+|*	  RscArray::IsConsistent()
 |*
-|*    Beschreibung
-|*    Ersterstellung    MM 23.09.91
-|*    Letzte Aenderung  MM 23.09.91
+|*	  Beschreibung
+|*	  Ersterstellung	MM 23.09.91
+|*	  Letzte Aenderung	MM 23.09.91
 |*
 *************************************************************************/
 BOOL RscMgr::IsConsistent( const RSCINST & rInst, RscInconsList * pList )
 {
-    BOOL    bRet;
+    BOOL	bRet;
     RscMgrInst * pClassData;
 
     bRet = RscClass::IsConsistent( rInst, pList );
@@ -618,11 +618,11 @@ BOOL RscMgr::IsConsistent( const RSCINST & rInst, RscInconsList * pList )
 
 /*************************************************************************
 |*
-|*    RscMgr::GetRef()
+|*	  RscMgr::GetRef()
 |*
-|*    Beschreibung
-|*    Ersterstellung    MM 15.05.91
-|*    Letzte Aenderung  MM 15.05.91
+|*	  Beschreibung
+|*	  Ersterstellung	MM 15.05.91
+|*	  Letzte Aenderung	MM 15.05.91
 |*
 *************************************************************************/
 ERRTYPE RscMgr::GetRef( const RSCINST & rInst, RscId * pRscId ){
@@ -635,20 +635,20 @@ ERRTYPE RscMgr::GetRef( const RSCINST & rInst, RscId * pRscId ){
 
 /*************************************************************************
 |*
-|*    RscMgr::IsToDeep()
+|*	  RscMgr::IsToDeep()
 |*
-|*    Beschreibung
-|*    Ersterstellung    MM 15.05.91
-|*    Letzte Aenderung  MM 15.05.91
+|*	  Beschreibung
+|*	  Ersterstellung	MM 15.05.91
+|*	  Letzte Aenderung	MM 15.05.91
 |*
 *************************************************************************/
 ERRTYPE RscMgr::IsToDeep( const RSCINST & rInst, sal_uInt32 nDeep )
 {
-    RscMgrInst *    pClassData;
-    RscId           aOldId, aId;
-    ERRTYPE         aError;
-    RSCINST         aTmpI = rInst;
-    ObjNode *       pObjNode;
+    RscMgrInst *	pClassData;
+    RscId			aOldId, aId;
+    ERRTYPE 		aError;
+    RSCINST 		aTmpI = rInst;
+    ObjNode *		pObjNode;
 
     pClassData = (RscMgrInst *)(rInst.pData + RscClass::Size());
 
@@ -671,7 +671,7 @@ ERRTYPE RscMgr::IsToDeep( const RSCINST & rInst, sal_uInt32 nDeep )
     if( nDeep >= nRefDeep )
     {
         pClassData->aRefId = aOldId;
-        aError             = ERR_REFTODEEP;
+        aError			   = ERR_REFTODEEP;
     }
 
     return( aError );
@@ -679,19 +679,19 @@ ERRTYPE RscMgr::IsToDeep( const RSCINST & rInst, sal_uInt32 nDeep )
 
 /*************************************************************************
 |*
-|*    RscMgr::SetRef()
+|*	  RscMgr::SetRef()
 |*
-|*    Beschreibung
-|*    Ersterstellung    MM 15.05.91
-|*    Letzte Aenderung  MM 15.05.91
+|*	  Beschreibung
+|*	  Ersterstellung	MM 15.05.91
+|*	  Letzte Aenderung	MM 15.05.91
 |*
 *************************************************************************/
 ERRTYPE RscMgr::SetRef( const RSCINST & rInst, const RscId & rRefId )
 {
-    RscMgrInst *    pClassData;
-    RscId           aOldId, aId;
-    ERRTYPE         aError;
-    RSCINST         aTmpI = rInst;
+    RscMgrInst *	pClassData;
+    RscId			aOldId, aId;
+    ERRTYPE 		aError;
+    RSCINST 		aTmpI = rInst;
 
     if( rRefId.IsId() &&
       ((rRefId.GetNumber() < 1) || (rRefId.GetNumber() > 0x7FFF)) )
diff --git a/rsc/source/res/rscrange.cxx b/rsc/source/res/rscrange.cxx
index 5ade3936bdf8..2853a8de6f84 100644
--- a/rsc/source/res/rscrange.cxx
+++ b/rsc/source/res/rscrange.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
@@ -45,11 +45,11 @@
 /****************** R s c R a n g e **************************************/
 /*************************************************************************
 |*
-|*    RscRange::RscRange()
+|*	  RscRange::RscRange()
 |*
-|*    Beschreibung
-|*    Ersterstellung    MM 03.04.91
-|*    Letzte Aenderung  MM 03.04.91
+|*	  Beschreibung
+|*	  Ersterstellung	MM 03.04.91
+|*	  Letzte Aenderung	MM 03.04.91
 |*
 *************************************************************************/
 RscRange::RscRange( Atom nId, sal_uInt32 nTypeId )
@@ -61,11 +61,11 @@ RscRange::RscRange( Atom nId, sal_uInt32 nTypeId )
 
 /*************************************************************************
 |*
-|*    RscRange::GetClassType()
+|*	  RscRange::GetClassType()
 |*
-|*    Beschreibung
-|*    Ersterstellung    MM 03.04.91
-|*    Letzte Aenderung  MM 03.04.91
+|*	  Beschreibung
+|*	  Ersterstellung	MM 03.04.91
+|*	  Letzte Aenderung	MM 03.04.91
 |*
 *************************************************************************/
 RSCCLASS_TYPE RscRange::GetClassType() const
@@ -75,11 +75,11 @@ RSCCLASS_TYPE RscRange::GetClassType() const
 
 /*************************************************************************
 |*
-|*    RscRange::SetRange()
+|*	  RscRange::SetRange()
 |*
-|*    Beschreibung
-|*    Ersterstellung    MM 03.04.91
-|*    Letzte Aenderung  MM 03.04.91
+|*	  Beschreibung
+|*	  Ersterstellung	MM 03.04.91
+|*	  Letzte Aenderung	MM 03.04.91
 |*
 *************************************************************************/
 ERRTYPE RscRange::SetRange( INT32 nMinimum, INT32 nMaximum )
@@ -100,11 +100,11 @@ ERRTYPE RscRange::SetRange( INT32 nMinimum, INT32 nMaximum )
 
 /*************************************************************************
 |*
-|*    RscRange::IsValueDefault()
+|*	  RscRange::IsValueDefault()
 |*
-|*    Beschreibung
-|*    Ersterstellung    MM 15.02.92
-|*    Letzte Aenderung  MM 15.02.92
+|*	  Beschreibung
+|*	  Ersterstellung	MM 15.02.92
+|*	  Letzte Aenderung	MM 15.02.92
 |*
 *************************************************************************/
 BOOL RscRange::IsValueDefault( const RSCINST & rInst, CLASS_DATA pDef )
@@ -123,11 +123,11 @@ BOOL RscRange::IsValueDefault( const RSCINST & rInst, CLASS_DATA pDef )
 
 /*************************************************************************
 |*
-|*    RscRange::SetNumber()
+|*	  RscRange::SetNumber()
 |*
-|*    Beschreibung
-|*    Ersterstellung    MM 03.04.91
-|*    Letzte Aenderung  MM 03.04.91
+|*	  Beschreibung
+|*	  Ersterstellung	MM 03.04.91
+|*	  Letzte Aenderung	MM 03.04.91
 |*
 *************************************************************************/
 ERRTYPE RscRange::SetNumber( const RSCINST & rInst, INT32 nValue )
@@ -141,11 +141,11 @@ ERRTYPE RscRange::SetNumber( const RSCINST & rInst, INT32 nValue )
 
 /*************************************************************************
 |*
-|*    RscRange::GetNumber()
+|*	  RscRange::GetNumber()
 |*
-|*    Beschreibung
-|*    Ersterstellung    MM 22.04.91
-|*    Letzte Aenderung  MM 22.04.91
+|*	  Beschreibung
+|*	  Ersterstellung	MM 22.04.91
+|*	  Letzte Aenderung	MM 22.04.91
 |*
 *************************************************************************/
 ERRTYPE RscRange::GetNumber( const RSCINST & rInst, INT32 * pN )
@@ -156,11 +156,11 @@ ERRTYPE RscRange::GetNumber( const RSCINST & rInst, INT32 * pN )
 
 /*************************************************************************
 |*
-|*    RscRange::Create()
+|*	  RscRange::Create()
 |*
-|*    Beschreibung
-|*    Ersterstellung    MM 03.04.91
-|*    Letzte Aenderung  MM 03.04.91
+|*	  Beschreibung
+|*	  Ersterstellung	MM 03.04.91
+|*	  Letzte Aenderung	MM 03.04.91
 |*
 *************************************************************************/
 RSCINST RscRange::Create( RSCINST * pInst, const RSCINST & rDflt,
@@ -195,11 +195,11 @@ RSCINST RscRange::Create( RSCINST * pInst, const RSCINST & rDflt,
 
 /*************************************************************************
 |*
-|*    RscRange::WriteSrc()
+|*	  RscRange::WriteSrc()
 |*
-|*    Beschreibung
-|*    Ersterstellung    MM 08.04.91
-|*    Letzte Aenderung  MM 08.04.91
+|*	  Beschreibung
+|*	  Ersterstellung	MM 08.04.91
+|*	  Letzte Aenderung	MM 08.04.91
 |*
 *************************************************************************/
 void RscRange::WriteSrc( const RSCINST & rInst, FILE * fOutput,
@@ -210,11 +210,11 @@ void RscRange::WriteSrc( const RSCINST & rInst, FILE * fOutput,
 
 /*************************************************************************
 |*
-|*    RscRange::WriteRc()
+|*	  RscRange::WriteRc()
 |*
-|*    Beschreibung
-|*    Ersterstellung    MM 15.04.91
-|*    Letzte Aenderung  MM 15.04.91
+|*	  Beschreibung
+|*	  Ersterstellung	MM 15.04.91
+|*	  Letzte Aenderung	MM 15.04.91
 |*
 *************************************************************************/
 ERRTYPE RscRange::WriteRc( const RSCINST & rInst, RscWriteRc & aMem,
@@ -255,11 +255,11 @@ void RscRange::WriteRcAccess
 /****************** R s c L o n g R a n g e ******************************/
 /*************************************************************************
 |*
-|*    RscLongRange::RscLongRange()
+|*	  RscLongRange::RscLongRange()
 |*
-|*    Beschreibung
-|*    Ersterstellung    MM 18.07.94
-|*    Letzte Aenderung  MM 18.07.94
+|*	  Beschreibung
+|*	  Ersterstellung	MM 18.07.94
+|*	  Letzte Aenderung	MM 18.07.94
 |*
 *************************************************************************/
 RscLongRange::RscLongRange( Atom nId, sal_uInt32 nTypeId )
@@ -271,11 +271,11 @@ RscLongRange::RscLongRange( Atom nId, sal_uInt32 nTypeId )
 
 /*************************************************************************
 |*
-|*    RscLongRange::GetClassType()
+|*	  RscLongRange::GetClassType()
 |*
-|*    Beschreibung
-|*    Ersterstellung    MM 18.07.94
-|*    Letzte Aenderung  MM 18.07.94
+|*	  Beschreibung
+|*	  Ersterstellung	MM 18.07.94
+|*	  Letzte Aenderung	MM 18.07.94
 |*
 *************************************************************************/
 RSCCLASS_TYPE RscLongRange::GetClassType() const
@@ -285,11 +285,11 @@ RSCCLASS_TYPE RscLongRange::GetClassType() const
 
 /*************************************************************************
 |*
-|*    RscLongRange::SetRange()
+|*	  RscLongRange::SetRange()
 |*
-|*    Beschreibung
-|*    Ersterstellung    MM 18.07.94
-|*    Letzte Aenderung  MM 18.07.94
+|*	  Beschreibung
+|*	  Ersterstellung	MM 18.07.94
+|*	  Letzte Aenderung	MM 18.07.94
 |*
 *************************************************************************/
 ERRTYPE RscLongRange::SetRange( INT32 nMinimum, INT32 nMaximum )
@@ -310,11 +310,11 @@ ERRTYPE RscLongRange::SetRange( INT32 nMinimum, INT32 nMaximum )
 
 /*************************************************************************
 |*
-|*    RscLongRange::IsValueDefault()
+|*	  RscLongRange::IsValueDefault()
 |*
-|*    Beschreibung
-|*    Ersterstellung    MM 15.02.92
-|*    Letzte Aenderung  MM 15.02.92
+|*	  Beschreibung
+|*	  Ersterstellung	MM 15.02.92
+|*	  Letzte Aenderung	MM 15.02.92
 |*
 *************************************************************************/
 BOOL RscLongRange::IsValueDefault( const RSCINST & rInst, CLASS_DATA pDef )
@@ -329,11 +329,11 @@ BOOL RscLongRange::IsValueDefault( const RSCINST & rInst, CLASS_DATA pDef )
 
 /*************************************************************************
 |*
-|*    RscLongRange::SetNumber()
+|*	  RscLongRange::SetNumber()
 |*
-|*    Beschreibung
-|*    Ersterstellung    MM 18.07.94
-|*    Letzte Aenderung  MM 18.07.94
+|*	  Beschreibung
+|*	  Ersterstellung	MM 18.07.94
+|*	  Letzte Aenderung	MM 18.07.94
 |*
 *************************************************************************/
 ERRTYPE RscLongRange::SetNumber( const RSCINST & rInst, INT32 nValue )
@@ -348,11 +348,11 @@ ERRTYPE RscLongRange::SetNumber( const RSCINST & rInst, INT32 nValue )
 
 /*************************************************************************
 |*
-|*    RscLongRange::GetNumber()
+|*	  RscLongRange::GetNumber()
 |*
-|*    Beschreibung
-|*    Ersterstellung    MM 22.04.91
-|*    Letzte Aenderung  MM 22.04.91
+|*	  Beschreibung
+|*	  Ersterstellung	MM 22.04.91
+|*	  Letzte Aenderung	MM 22.04.91
 |*
 *************************************************************************/
 ERRTYPE RscLongRange::GetNumber( const RSCINST & rInst, INT32 * pN )
@@ -364,11 +364,11 @@ ERRTYPE RscLongRange::GetNumber( const RSCINST & rInst, INT32 * pN )
 
 /*************************************************************************
 |*
-|*    RscLongRange::Create()
+|*	  RscLongRange::Create()
 |*
-|*    Beschreibung
-|*    Ersterstellung    MM 18.07.94
-|*    Letzte Aenderung  MM 18.07.94
+|*	  Beschreibung
+|*	  Ersterstellung	MM 18.07.94
+|*	  Letzte Aenderung	MM 18.07.94
 |*
 *************************************************************************/
 RSCINST RscLongRange::Create( RSCINST * pInst, const RSCINST & rDflt,
@@ -391,7 +391,7 @@ RSCINST RscLongRange::Create( RSCINST * pInst, const RSCINST & rDflt,
         memmove( aInst.pData, rDflt.pData, sizeof( RscLongRangeInst ) );
     else
     {
-        INT32   lDflt;
+        INT32	lDflt;
         if( 0L >= nMin && 0L <= nMax )
             lDflt = 0;
         else
@@ -406,11 +406,11 @@ RSCINST RscLongRange::Create( RSCINST * pInst, const RSCINST & rDflt,
 
 /*************************************************************************
 |*
-|*    RscLongRange::WriteSrc()
+|*	  RscLongRange::WriteSrc()
 |*
-|*    Beschreibung
-|*    Ersterstellung    MM 18.07.94
-|*    Letzte Aenderung  MM 18.07.94
+|*	  Beschreibung
+|*	  Ersterstellung	MM 18.07.94
+|*	  Letzte Aenderung	MM 18.07.94
 |*
 *************************************************************************/
 void RscLongRange::WriteSrc( const RSCINST & rInst, FILE * fOutput,
@@ -423,11 +423,11 @@ void RscLongRange::WriteSrc( const RSCINST & rInst, FILE * fOutput,
 
 /*************************************************************************
 |*
-|*    RscLongRange::WriteRc()
+|*	  RscLongRange::WriteRc()
 |*
-|*    Beschreibung
-|*    Ersterstellung    MM 18.07.94
-|*    Letzte Aenderung  MM 18.04.94
+|*	  Beschreibung
+|*	  Ersterstellung	MM 18.07.94
+|*	  Letzte Aenderung	MM 18.04.94
 |*
 *************************************************************************/
 ERRTYPE RscLongRange::WriteRc( const RSCINST & rInst, RscWriteRc & aMem,
@@ -456,9 +456,9 @@ void RscLongRange::WriteRcAccess
 
 /****************** R s c L o n g E n u m R a n g e *********************/
 /*************************************************************************
-|*    RscLongEnumRange::RscLongEnumRange()
+|*	  RscLongEnumRange::RscLongEnumRange()
 |*
-|*    Beschreibung
+|*	  Beschreibung
 *************************************************************************/
 RscLongEnumRange::RscLongEnumRange( Atom nId, sal_uInt32 nTypeId )
                         : RscLongRange( nId, nTypeId )
@@ -466,9 +466,9 @@ RscLongEnumRange::RscLongEnumRange( Atom nId, sal_uInt32 nTypeId )
 }
 
 /*************************************************************************
-|*    RscLongEnumRange::SetConst()
+|*	  RscLongEnumRange::SetConst()
 |*
-|*    Beschreibung
+|*	  Beschreibung
 *************************************************************************/
 ERRTYPE RscLongEnumRange::SetConst( const RSCINST & rInst, Atom /*nConst*/,
                                     INT32 nValue )
@@ -479,11 +479,11 @@ ERRTYPE RscLongEnumRange::SetConst( const RSCINST & rInst, Atom /*nConst*/,
 /****************** R s c I d R a n g e **********************************/
 /*************************************************************************
 |*
-|*    RscIdRange::RscIdRange()
+|*	  RscIdRange::RscIdRange()
 |*
-|*    Beschreibung
-|*    Ersterstellung    MM 03.04.91
-|*    Letzte Aenderung  MM 03.04.91
+|*	  Beschreibung
+|*	  Ersterstellung	MM 03.04.91
+|*	  Letzte Aenderung	MM 03.04.91
 |*
 *************************************************************************/
 RscIdRange::RscIdRange( Atom nId, sal_uInt32 nTypeId )
@@ -495,11 +495,11 @@ RscIdRange::RscIdRange( Atom nId, sal_uInt32 nTypeId )
 
 /*************************************************************************
 |*
-|*    RscIdRange::RscIdRange()
+|*	  RscIdRange::RscIdRange()
 |*
-|*    Beschreibung
-|*    Ersterstellung    MM 03.04.91
-|*    Letzte Aenderung  MM 03.04.91
+|*	  Beschreibung
+|*	  Ersterstellung	MM 03.04.91
+|*	  Letzte Aenderung	MM 03.04.91
 |*
 *************************************************************************/
 RSCCLASS_TYPE RscIdRange::GetClassType() const
@@ -509,11 +509,11 @@ RSCCLASS_TYPE RscIdRange::GetClassType() const
 
 /*************************************************************************
 |*
-|*    RscIdRange::Create()
+|*	  RscIdRange::Create()
 |*
-|*    Beschreibung
-|*    Ersterstellung    MM 03.04.91
-|*    Letzte Aenderung  MM 03.04.91
+|*	  Beschreibung
+|*	  Ersterstellung	MM 03.04.91
+|*	  Letzte Aenderung	MM 03.04.91
 |*
 *************************************************************************/
 RSCINST RscIdRange::Create( RSCINST * pInst, const RSCINST & rDflt, BOOL bOwnClass ){
@@ -551,11 +551,11 @@ RSCINST RscIdRange::Create( RSCINST * pInst, const RSCINST & rDflt, BOOL bOwnCla
 
 /*************************************************************************
 |*
-|*    RscIdRange::Destroy()
+|*	  RscIdRange::Destroy()
 |*
-|*    Beschreibung
-|*    Ersterstellung    MM 22.11.91
-|*    Letzte Aenderung  MM 22.11.91
+|*	  Beschreibung
+|*	  Ersterstellung	MM 22.11.91
+|*	  Letzte Aenderung	MM 22.11.91
 |*
 *************************************************************************/
 void RscIdRange :: Destroy( const RSCINST & rInst ){
@@ -564,11 +564,11 @@ void RscIdRange :: Destroy( const RSCINST & rInst ){
 
 /*************************************************************************
 |*
-|*    RscIdRange::IsValueDefault()
+|*	  RscIdRange::IsValueDefault()
 |*
-|*    Beschreibung
-|*    Ersterstellung    MM 15.01.92
-|*    Letzte Aenderung  MM 15.01.92
+|*	  Beschreibung
+|*	  Ersterstellung	MM 15.01.92
+|*	  Letzte Aenderung	MM 15.01.92
 |*
 *************************************************************************/
 BOOL RscIdRange::IsValueDefault( const RSCINST & rInst, CLASS_DATA pDef ){
@@ -589,11 +589,11 @@ BOOL RscIdRange::IsValueDefault( const RSCINST & rInst, CLASS_DATA pDef ){
 
 /*************************************************************************
 |*
-|*    RscIdRange::SetNumber()
+|*	  RscIdRange::SetNumber()
 |*
-|*    Beschreibung
-|*    Ersterstellung    MM 25.11.91
-|*    Letzte Aenderung  MM 25.11.91
+|*	  Beschreibung
+|*	  Ersterstellung	MM 25.11.91
+|*	  Letzte Aenderung	MM 25.11.91
 |*
 *************************************************************************/
 ERRTYPE RscIdRange::SetNumber( const RSCINST & rInst, INT32 nValue )
@@ -608,11 +608,11 @@ ERRTYPE RscIdRange::SetNumber( const RSCINST & rInst, INT32 nValue )
 
 /*************************************************************************
 |*
-|*    RscIdRange::GetNumber()
+|*	  RscIdRange::GetNumber()
 |*
-|*    Beschreibung
-|*    Ersterstellung    MM 25.11.91
-|*    Letzte Aenderung  MM 25.11.91
+|*	  Beschreibung
+|*	  Ersterstellung	MM 25.11.91
+|*	  Letzte Aenderung	MM 25.11.91
 |*
 *************************************************************************/
 ERRTYPE RscIdRange::GetNumber( const RSCINST & rInst, INT32 * plValue ){
@@ -622,11 +622,11 @@ ERRTYPE RscIdRange::GetNumber( const RSCINST & rInst, INT32 * plValue ){
 
 /*************************************************************************
 |*
-|*    RscIdRange::SetRef()
+|*	  RscIdRange::SetRef()
 |*
-|*    Beschreibung
-|*    Ersterstellung    MM 22.11.91
-|*    Letzte Aenderung  MM 22.11.91
+|*	  Beschreibung
+|*	  Ersterstellung	MM 22.11.91
+|*	  Letzte Aenderung	MM 22.11.91
 |*
 *************************************************************************/
 ERRTYPE RscIdRange::SetRef( const RSCINST & rInst, const RscId & rRscId ){
@@ -646,11 +646,11 @@ ERRTYPE RscIdRange::SetRef( const RSCINST & rInst, const RscId & rRscId ){
 
 /*************************************************************************
 |*
-|*    RscIdRange::GetRef()
+|*	  RscIdRange::GetRef()
 |*
-|*    Beschreibung
-|*    Ersterstellung    MM 22.11.91
-|*    Letzte Aenderung  MM 22.11.91
+|*	  Beschreibung
+|*	  Ersterstellung	MM 22.11.91
+|*	  Letzte Aenderung	MM 22.11.91
 |*
 *************************************************************************/
 ERRTYPE RscIdRange::GetRef( const RSCINST & rInst, RscId * pRscId ){
@@ -661,11 +661,11 @@ ERRTYPE RscIdRange::GetRef( const RSCINST & rInst, RscId * pRscId ){
 
 /*************************************************************************
 |*
-|*    RscIdRange::WriteSrc()
+|*	  RscIdRange::WriteSrc()
 |*
-|*    Beschreibung
-|*    Ersterstellung    MM 22.11.91
-|*    Letzte Aenderung  MM 25.11.91
+|*	  Beschreibung
+|*	  Ersterstellung	MM 22.11.91
+|*	  Letzte Aenderung	MM 25.11.91
 |*
 *************************************************************************/
 void RscIdRange::WriteSrc( const RSCINST & rInst, FILE * fOutput,
@@ -676,11 +676,11 @@ void RscIdRange::WriteSrc( const RSCINST & rInst, FILE * fOutput,
 
 /*************************************************************************
 |*
-|*    RscIdRange::WriteRc()
+|*	  RscIdRange::WriteRc()
 |*
-|*    Beschreibung
-|*    Ersterstellung    MM 25.11.91
-|*    Letzte Aenderung  MM 25.11.91
+|*	  Beschreibung
+|*	  Ersterstellung	MM 25.11.91
+|*	  Letzte Aenderung	MM 25.11.91
 |*
 *************************************************************************/
 ERRTYPE RscIdRange::WriteRc( const RSCINST & rInst, RscWriteRc & aMem,
@@ -708,11 +708,11 @@ void RscIdRange::WriteRcAccess
 
 /*************************************************************************
 |*
-|*    RscIdRange::IsConsistent()
+|*	  RscIdRange::IsConsistent()
 |*
-|*    Beschreibung
-|*    Ersterstellung    MM 22.11.91
-|*    Letzte Aenderung  MM 22.11.91
+|*	  Beschreibung
+|*	  Ersterstellung	MM 22.11.91
+|*	  Letzte Aenderung	MM 22.11.91
 |*
 *************************************************************************/
 BOOL RscIdRange::IsConsistent( const RSCINST & rInst, RscInconsList * pList )
@@ -731,11 +731,11 @@ BOOL RscIdRange::IsConsistent( const RSCINST & rInst, RscInconsList * pList )
 /****************** R s c B o o l ****************************************/
 /*************************************************************************
 |*
-|*    RscBool::RscBool()
+|*	  RscBool::RscBool()
 |*
-|*    Beschreibung
-|*    Ersterstellung    MM 29.04.91
-|*    Letzte Aenderung  MM 29.04.91
+|*	  Beschreibung
+|*	  Ersterstellung	MM 29.04.91
+|*	  Letzte Aenderung	MM 29.04.91
 |*
 *************************************************************************/
 RscBool::RscBool( Atom nId, sal_uInt32 nTypeId )
@@ -746,11 +746,11 @@ RscBool::RscBool( Atom nId, sal_uInt32 nTypeId )
 
 /*************************************************************************
 |*
-|*    RscBool::GetClassType()
+|*	  RscBool::GetClassType()
 |*
-|*    Beschreibung
-|*    Ersterstellung    MM 29.04.91
-|*    Letzte Aenderung  MM 29.04.91
+|*	  Beschreibung
+|*	  Ersterstellung	MM 29.04.91
+|*	  Letzte Aenderung	MM 29.04.91
 |*
 *************************************************************************/
 RSCCLASS_TYPE  RscBool::GetClassType() const
@@ -760,11 +760,11 @@ RSCCLASS_TYPE  RscBool::GetClassType() const
 
 /*************************************************************************
 |*
-|*    RscBool::WriteSrc()
+|*	  RscBool::WriteSrc()
 |*
-|*    Beschreibung
-|*    Ersterstellung    MM 29.04.91
-|*    Letzte Aenderung  MM 29.04.91
+|*	  Beschreibung
+|*	  Ersterstellung	MM 29.04.91
+|*	  Letzte Aenderung	MM 29.04.91
 |*
 *************************************************************************/
 void RscBool::WriteSrc( const RSCINST & rInst, FILE * fOutput,
@@ -795,11 +795,11 @@ void RscBool::WriteRcAccess
 /****************** R s c B r e a k R a n g e ****************************/
 /*************************************************************************
 |*
-|*    RscBreakRange::SetNumber()
+|*	  RscBreakRange::SetNumber()
 |*
-|*    Beschreibung
-|*    Ersterstellung    MM 24.06.91
-|*    Letzte Aenderung  MM 24.06.91
+|*	  Beschreibung
+|*	  Ersterstellung	MM 24.06.91
+|*	  Letzte Aenderung	MM 24.06.91
 |*
 *************************************************************************/
 RscBreakRange :: RscBreakRange( Atom nId, sal_uInt32 nTypeId )
@@ -810,11 +810,11 @@ RscBreakRange :: RscBreakRange( Atom nId, sal_uInt32 nTypeId )
 
 /*************************************************************************
 |*
-|*    RscBreakRange::SetNumber()
+|*	  RscBreakRange::SetNumber()
 |*
-|*    Beschreibung
-|*    Ersterstellung    MM 24.06.91
-|*    Letzte Aenderung  MM 24.06.91
+|*	  Beschreibung
+|*	  Ersterstellung	MM 24.06.91
+|*	  Letzte Aenderung	MM 24.06.91
 |*
 *************************************************************************/
 ERRTYPE RscBreakRange::SetNumber( const RSCINST & rInst, INT32 nValue ){
@@ -826,18 +826,18 @@ ERRTYPE RscBreakRange::SetNumber( const RSCINST & rInst, INT32 nValue ){
 
 /*************************************************************************
 |*
-|*    RscBreakRange::Create()
+|*	  RscBreakRange::Create()
 |*
-|*    Beschreibung
-|*    Ersterstellung    MM 24.06.91
-|*    Letzte Aenderung  MM 24.06.91
+|*	  Beschreibung
+|*	  Ersterstellung	MM 24.06.91
+|*	  Letzte Aenderung	MM 24.06.91
 |*
 *************************************************************************/
 RSCINST RscBreakRange::Create( RSCINST * pInst, const RSCINST & rDflt,
                                BOOL bOwnClass )
 {
     RSCINST aInst;
-    INT32   l;
+    INT32	l;
 
     aInst = RscRange::Create( pInst, rDflt, bOwnClass );
 
diff --git a/rsc/source/res/rscstr.cxx b/rsc/source/res/rscstr.cxx
index 6bf25cf4dd58..f5e98a1639a8 100644
--- a/rsc/source/res/rscstr.cxx
+++ b/rsc/source/res/rscstr.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
@@ -45,11 +45,11 @@
 /****************** R s c S t r i n g ************************************/
 /*************************************************************************
 |*
-|*    RscString::RscString()
+|*	  RscString::RscString()
 |*
-|*    Beschreibung
-|*    Ersterstellung    MM 25.04.91
-|*    Letzte Aenderung  MM 25.04.91
+|*	  Beschreibung
+|*	  Ersterstellung	MM 25.04.91
+|*	  Letzte Aenderung	MM 25.04.91
 |*
 *************************************************************************/
 RscString::RscString( Atom nId, sal_uInt32 nTypeId )
@@ -61,11 +61,11 @@ RscString::RscString( Atom nId, sal_uInt32 nTypeId )
 
 /*************************************************************************
 |*
-|*    RscString::GetClassType()
+|*	  RscString::GetClassType()
 |*
-|*    Beschreibung
-|*    Ersterstellung    MM 25.04.91
-|*    Letzte Aenderung  MM 25.04.91
+|*	  Beschreibung
+|*	  Ersterstellung	MM 25.04.91
+|*	  Letzte Aenderung	MM 25.04.91
 |*
 *************************************************************************/
 RSCCLASS_TYPE RscString::GetClassType() const
@@ -75,15 +75,15 @@ RSCCLASS_TYPE RscString::GetClassType() const
 
 /*************************************************************************
 |*
-|*    RscString::SetNumber()
+|*	  RscString::SetNumber()
 |*
-|*    Beschreibung
-|*    Ersterstellung    MM 25.04.91
-|*    Letzte Aenderung  MM 25.04.91
+|*	  Beschreibung
+|*	  Ersterstellung	MM 25.04.91
+|*	  Letzte Aenderung	MM 25.04.91
 |*
 *************************************************************************/
 ERRTYPE RscString::SetString( const RSCINST & rInst, const char * pStr ){
-    char    * pTmp;
+    char	* pTmp;
     ERRTYPE aError;
 
     if( aError.IsOk() ){
@@ -96,7 +96,7 @@ ERRTYPE RscString::SetString( const RSCINST & rInst, const char * pStr ){
         }
 
         if( pStr ){
-            sal_uInt32  nLen = strlen( pStr ) +1;
+            sal_uInt32	nLen = strlen( pStr ) +1;
             pTmp = (char *)rtl_allocateMemory( nLen );
             memcpy( pTmp, pStr, nLen );
         };
@@ -109,11 +109,11 @@ ERRTYPE RscString::SetString( const RSCINST & rInst, const char * pStr ){
 
 /*************************************************************************
 |*
-|*    RscString::GetString()
+|*	  RscString::GetString()
 |*
-|*    Beschreibung
-|*    Ersterstellung    MM 25.04.91
-|*    Letzte Aenderung  MM 25.04.91
+|*	  Beschreibung
+|*	  Ersterstellung	MM 25.04.91
+|*	  Letzte Aenderung	MM 25.04.91
 |*
 *************************************************************************/
 ERRTYPE RscString::GetString( const RSCINST & rInst, char ** ppStr ){
@@ -123,11 +123,11 @@ ERRTYPE RscString::GetString( const RSCINST & rInst, char ** ppStr ){
 
 /*************************************************************************
 |*
-|*    RscString::GetRef()
+|*	  RscString::GetRef()
 |*
-|*    Beschreibung
-|*    Ersterstellung    MM 22.07.91
-|*    Letzte Aenderung  MM 22.07.91
+|*	  Beschreibung
+|*	  Ersterstellung	MM 22.07.91
+|*	  Letzte Aenderung	MM 22.07.91
 |*
 *************************************************************************/
 ERRTYPE RscString::GetRef( const RSCINST & rInst, RscId * pRscId ){
@@ -137,11 +137,11 @@ ERRTYPE RscString::GetRef( const RSCINST & rInst, RscId * pRscId ){
 
 /*************************************************************************
 |*
-|*    RscString::SetRef()
+|*	  RscString::SetRef()
 |*
-|*    Beschreibung
-|*    Ersterstellung    MM 15.05.91
-|*    Letzte Aenderung  MM 15.05.91
+|*	  Beschreibung
+|*	  Ersterstellung	MM 15.05.91
+|*	  Letzte Aenderung	MM 15.05.91
 |*
 *************************************************************************/
 ERRTYPE RscString::SetRef( const RSCINST & rInst, const RscId & rRefId ){
@@ -157,11 +157,11 @@ ERRTYPE RscString::SetRef( const RSCINST & rInst, const RscId & rRefId ){
 
 /*************************************************************************
 |*
-|*    RscString::Create()
+|*	  RscString::Create()
 |*
-|*    Beschreibung
-|*    Ersterstellung    MM 25.04.91
-|*    Letzte Aenderung  MM 25.04.91
+|*	  Beschreibung
+|*	  Ersterstellung	MM 25.04.91
+|*	  Letzte Aenderung	MM 25.04.91
 |*
 *************************************************************************/
 RSCINST RscString::Create( RSCINST * pInst, const RSCINST & rDflt,
@@ -196,11 +196,11 @@ RSCINST RscString::Create( RSCINST * pInst, const RSCINST & rDflt,
 
 /*************************************************************************
 |*
-|*    RscString::Destroy()
+|*	  RscString::Destroy()
 |*
-|*    Beschreibung
-|*    Ersterstellung    MM 15.05.91
-|*    Letzte Aenderung  MM 15.05.91
+|*	  Beschreibung
+|*	  Ersterstellung	MM 15.05.91
+|*	  Letzte Aenderung	MM 15.05.91
 |*
 *************************************************************************/
 void RscString::Destroy( const RSCINST & rInst ){
@@ -211,15 +211,15 @@ void RscString::Destroy( const RSCINST & rInst ){
 
 /*************************************************************************
 |*
-|*    RscString::IsValueDefault()
+|*	  RscString::IsValueDefault()
 |*
-|*    Beschreibung
-|*    Ersterstellung    MM 15.01.92
-|*    Letzte Aenderung  MM 15.01.92
+|*	  Beschreibung
+|*	  Ersterstellung	MM 15.01.92
+|*	  Letzte Aenderung	MM 15.01.92
 |*
 *************************************************************************/
 BOOL RscString::IsValueDefault( const RSCINST & rInst, CLASS_DATA pDef ){
-    RscStringInst * pData    = (RscStringInst*)rInst.pData;
+    RscStringInst * pData	 = (RscStringInst*)rInst.pData;
     RscStringInst * pDefData = (RscStringInst*)pDef;
 
     if( pDef ){
@@ -263,11 +263,11 @@ BOOL RscString::IsValueDefault( const RSCINST & rInst, CLASS_DATA pDef ){
 
 /*************************************************************************
 |*
-|*    RscString::WriteSrc()
+|*	  RscString::WriteSrc()
 |*
-|*    Beschreibung
-|*    Ersterstellung    MM 25.04.91
-|*    Letzte Aenderung  MM 25.04.91
+|*	  Beschreibung
+|*	  Ersterstellung	MM 25.04.91
+|*	  Letzte Aenderung	MM 25.04.91
 |*
 *************************************************************************/
 void RscString::WriteSrc( const RSCINST & rInst, FILE * fOutput,
@@ -283,8 +283,8 @@ void RscString::WriteSrc( const RSCINST & rInst, FILE * fOutput,
         RscStringInst * pStrI = ((RscStringInst *)rInst.pData);
         if(  pStrI->pStr ){
             //char *  pChangeTab = RscChar::GetChangeTab();
-            sal_uInt32  n = 0;
-            sal_uInt32  nPos, nSlashPos;
+            sal_uInt32	n = 0;
+            sal_uInt32	nPos, nSlashPos;
 
             do {
                 fputc( '\"', fOutput );
@@ -311,22 +311,22 @@ void RscString::WriteSrc( const RSCINST & rInst, FILE * fOutput,
 
 /*************************************************************************
 |*
-|*    RscString::WriteRc()
+|*	  RscString::WriteRc()
 |*
-|*    Beschreibung
-|*    Ersterstellung    MM 15.04.91
-|*    Letzte Aenderung  MM 15.04.91
+|*	  Beschreibung
+|*	  Ersterstellung	MM 15.04.91
+|*	  Letzte Aenderung	MM 15.04.91
 |*
 *************************************************************************/
 ERRTYPE RscString::WriteRc( const RSCINST & rInst, RscWriteRc & rMem,
                             RscTypCont * pTC, sal_uInt32 nDeep, BOOL bExtra )
 {
     ERRTYPE aError;
-    ObjNode *       pObjNode = NULL;
+    ObjNode *		pObjNode = NULL;
 
 
     if( ((RscStringInst *)rInst.pData)->aRefId.IsId() ){
-        RscId   aId( ((RscStringInst *)rInst.pData)->aRefId );
+        RscId	aId( ((RscStringInst *)rInst.pData)->aRefId );
         RSCINST aTmpI;
 
         aTmpI.pClass = pRefClass;
@@ -348,7 +348,7 @@ ERRTYPE RscString::WriteRc( const RSCINST & rInst, RscWriteRc & rMem,
                 {
                     if( pTC )
                     {
-                        ByteString  aMsg( pHS->getString( pRefClass->GetId() ).getStr() );
+                        ByteString	aMsg( pHS->getString( pRefClass->GetId() ).getStr() );
                         aMsg += ' ';
                         aMsg += aId.GetName();
                         aError = WRN_STR_REFNOTFOUND;
@@ -365,7 +365,7 @@ ERRTYPE RscString::WriteRc( const RSCINST & rInst, RscWriteRc & rMem,
     {
         if( pObjNode )
         {
-            RSCINST     aRefI;
+            RSCINST 	aRefI;
 
             aRefI = RSCINST( pRefClass, pObjNode->GetRscObj() );
             aError = aRefI.pClass->WriteRc( aRefI, rMem, pTC, nDeep, bExtra );
diff --git a/rsc/source/res/rsctop.cxx b/rsc/source/res/rsctop.cxx
index 4b7887ebf298..9ca348ab8027 100644
--- a/rsc/source/res/rsctop.cxx
+++ b/rsc/source/res/rsctop.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
@@ -40,11 +40,11 @@
 /****************** R s c T o p ******************************************/
 /*************************************************************************
 |*
-|*    RscTop::RscTop()
+|*	  RscTop::RscTop()
 |*
-|*    Beschreibung
-|*    Ersterstellung    MM 03.06.91
-|*    Letzte Aenderung  MM 03.06.91
+|*	  Beschreibung
+|*	  Ersterstellung	MM 03.06.91
+|*	  Letzte Aenderung	MM 03.06.91
 |*
 *************************************************************************/
 RscTop::RscTop( Atom nId, sal_uInt32 nTypIdent, RscTop * pSuperCl )
@@ -60,11 +60,11 @@ RscTop::RscTop( Atom nId, sal_uInt32 nTypIdent, RscTop * pSuperCl )
 
 /*************************************************************************
 |*
-|*    RscTop::SetCallPar()
+|*	  RscTop::SetCallPar()
 |*
-|*    Beschreibung
-|*    Ersterstellung    MM 29.10.91
-|*    Letzte Aenderung  MM 29.10.91
+|*	  Beschreibung
+|*	  Ersterstellung	MM 29.10.91
+|*	  Letzte Aenderung	MM 29.10.91
 |*
 *************************************************************************/
 void RscTop::SetCallPar( const ByteString & rPar1, const ByteString & rPar2,
@@ -77,11 +77,11 @@ void RscTop::SetCallPar( const ByteString & rPar1, const ByteString & rPar2,
 
 /*************************************************************************
 |*
-|*    RscTop::GetDefault()
+|*	  RscTop::GetDefault()
 |*
-|*    Beschreibung
-|*    Ersterstellung    MM 29.10.91
-|*    Letzte Aenderung  MM 29.10.91
+|*	  Beschreibung
+|*	  Ersterstellung	MM 29.10.91
+|*	  Letzte Aenderung	MM 29.10.91
 |*
 *************************************************************************/
 RSCINST RscTop::GetDefault()
@@ -93,11 +93,11 @@ RSCINST RscTop::GetDefault()
 
 /*************************************************************************
 |*
-|*    RscTop::Pre_dtor()
+|*	  RscTop::Pre_dtor()
 |*
-|*    Beschreibung
-|*    Ersterstellung    MM 19.06.91
-|*    Letzte Aenderung  MM 19.06.91
+|*	  Beschreibung
+|*	  Ersterstellung	MM 19.06.91
+|*	  Letzte Aenderung	MM 19.06.91
 |*
 *************************************************************************/
 void RscTop :: Pre_dtor(){
@@ -110,24 +110,24 @@ void RscTop :: Pre_dtor(){
 
 /*************************************************************************
 |*
-|*    RscTop::GetConstant()
+|*	  RscTop::GetConstant()
 |*
-|*    Beschreibung
-|*    Ersterstellung    MM 29.10.91
-|*    Letzte Aenderung  MM 29.10.91
+|*	  Beschreibung
+|*	  Ersterstellung	MM 29.10.91
+|*	  Letzte Aenderung	MM 29.10.91
 |*
 *************************************************************************/
-Atom    RscTop :: GetConstant( sal_uInt32 ){
+Atom	RscTop :: GetConstant( sal_uInt32 ){
     return InvalidAtom;
 }
 
 /*************************************************************************
 |*
-|*    RscTop::GetIndexType()
+|*	  RscTop::GetIndexType()
 |*
-|*    Beschreibung
-|*    Ersterstellung    MM 29.10.91
-|*    Letzte Aenderung  MM 29.10.91
+|*	  Beschreibung
+|*	  Ersterstellung	MM 29.10.91
+|*	  Letzte Aenderung	MM 29.10.91
 |*
 *************************************************************************/
 RscTop * RscTop::GetTypeClass() const
@@ -140,11 +140,11 @@ RscTop * RscTop::GetTypeClass() const
 
 /*************************************************************************
 |*
-|*    RscTop::Size()
+|*	  RscTop::Size()
 |*
-|*    Beschreibung
-|*    Ersterstellung    MM 29.10.91
-|*    Letzte Aenderung  MM 29.10.91
+|*	  Beschreibung
+|*	  Ersterstellung	MM 29.10.91
+|*	  Letzte Aenderung	MM 29.10.91
 |*
 *************************************************************************/
 sal_uInt32 RscTop :: Size()
@@ -157,11 +157,11 @@ sal_uInt32 RscTop :: Size()
 
 /*************************************************************************
 |*
-|*    RscTop::GetRef()
+|*	  RscTop::GetRef()
 |*
-|*    Beschreibung
-|*    Ersterstellung    MM 29.10.91
-|*    Letzte Aenderung  MM 29.10.91
+|*	  Beschreibung
+|*	  Ersterstellung	MM 29.10.91
+|*	  Letzte Aenderung	MM 29.10.91
 |*
 *************************************************************************/
 ERRTYPE RscTop :: GetRef( const RSCINST & rInst, RscId * pRscId ){
@@ -173,11 +173,11 @@ ERRTYPE RscTop :: GetRef( const RSCINST & rInst, RscId * pRscId ){
 
 /*************************************************************************
 |*
-|*    RscTop::InHierarchy()
+|*	  RscTop::InHierarchy()
 |*
-|*    Beschreibung
-|*    Ersterstellung    MM 17.05.91
-|*    Letzte Aenderung  MM 17.05.91
+|*	  Beschreibung
+|*	  Ersterstellung	MM 17.05.91
+|*	  Letzte Aenderung	MM 17.05.91
 |*
 *************************************************************************/
 BOOL RscTop::InHierarchy( RscTop * pClass ){
@@ -190,11 +190,11 @@ BOOL RscTop::InHierarchy( RscTop * pClass ){
 
 /*************************************************************************
 |*
-|*    RscTop::SetVariable()
+|*	  RscTop::SetVariable()
 |*
-|*    Beschreibung
-|*    Ersterstellung    MM 29.10.91
-|*    Letzte Aenderung  MM 29.10.91
+|*	  Beschreibung
+|*	  Ersterstellung	MM 29.10.91
+|*	  Letzte Aenderung	MM 29.10.91
 |*
 *************************************************************************/
 ERRTYPE RscTop::SetVariable( Atom nVarName, RscTop * pClass,
@@ -211,11 +211,11 @@ ERRTYPE RscTop::SetVariable( Atom nVarName, RscTop * pClass,
 
 /*************************************************************************
 |*
-|*    RscTop::EnumVariable()
+|*	  RscTop::EnumVariable()
 |*
-|*    Beschreibung
-|*    Ersterstellung    MM 03.02.93
-|*    Letzte Aenderung  MM 03.02.93
+|*	  Beschreibung
+|*	  Ersterstellung	MM 03.02.93
+|*	  Letzte Aenderung	MM 03.02.93
 |*
 *************************************************************************/
 void RscTop::EnumVariables( void * pData, VarEnumCallbackProc pProc )
@@ -226,11 +226,11 @@ void RscTop::EnumVariables( void * pData, VarEnumCallbackProc pProc )
 
 /*************************************************************************
 |*
-|*    RscTop::GetVariable()
+|*	  RscTop::GetVariable()
 |*
-|*    Beschreibung
-|*    Ersterstellung    MM 29.10.91
-|*    Letzte Aenderung  MM 29.10.91
+|*	  Beschreibung
+|*	  Ersterstellung	MM 29.10.91
+|*	  Letzte Aenderung	MM 29.10.91
 |*
 *************************************************************************/
 RSCINST RscTop::GetVariable
@@ -251,11 +251,11 @@ RSCINST RscTop::GetVariable
 
 /*************************************************************************
 |*
-|*    RscTop::GetCopyVar()
+|*	  RscTop::GetCopyVar()
 |*
-|*    Beschreibung
-|*    Ersterstellung    MM 29.10.91
-|*    Letzte Aenderung  MM 29.10.91
+|*	  Beschreibung
+|*	  Ersterstellung	MM 29.10.91
+|*	  Letzte Aenderung	MM 29.10.91
 |*
 *************************************************************************/
 RSCINST RscTop::GetCopyVar( const RSCINST & rInst, Atom nVarName )
@@ -269,11 +269,11 @@ RSCINST RscTop::GetCopyVar( const RSCINST & rInst, Atom nVarName )
 
 /*************************************************************************
 |*
-|*    RscTop::GetTupelVar()
+|*	  RscTop::GetTupelVar()
 |*
-|*    Beschreibung
-|*    Ersterstellung    MM 29.10.91
-|*    Letzte Aenderung  MM 29.10.91
+|*	  Beschreibung
+|*	  Ersterstellung	MM 29.10.91
+|*	  Letzte Aenderung	MM 29.10.91
 |*
 *************************************************************************/
 RSCINST RscTop::GetTupelVar( const RSCINST & rInst, sal_uInt32 nPos,
@@ -287,11 +287,11 @@ RSCINST RscTop::GetTupelVar( const RSCINST & rInst, sal_uInt32 nPos,
 
 /*************************************************************************
 |*
-|*    RscTop::GetElement()
+|*	  RscTop::GetElement()
 |*
-|*    Beschreibung
-|*    Ersterstellung    MM 29.10.91
-|*    Letzte Aenderung  MM 29.10.91
+|*	  Beschreibung
+|*	  Ersterstellung	MM 29.10.91
+|*	  Letzte Aenderung	MM 29.10.91
 |*
 *************************************************************************/
 ERRTYPE RscTop::GetElement( const RSCINST & rInst, const RscId & rEleName,
@@ -309,11 +309,11 @@ ERRTYPE RscTop::GetElement( const RSCINST & rInst, const RscId & rEleName,
 
 /*************************************************************************
 |*
-|*    RscTop::GetArrayEle()
+|*	  RscTop::GetArrayEle()
 |*
-|*    Beschreibung
-|*    Ersterstellung    MM 29.10.91
-|*    Letzte Aenderung  MM 29.10.91
+|*	  Beschreibung
+|*	  Ersterstellung	MM 29.10.91
+|*	  Letzte Aenderung	MM 29.10.91
 |*
 *************************************************************************/
 ERRTYPE RscTop::GetArrayEle
@@ -332,11 +332,11 @@ ERRTYPE RscTop::GetArrayEle
 
 /*************************************************************************
 |*
-|*    RscTop::GetValueEle()
+|*	  RscTop::GetValueEle()
 |*
-|*    Beschreibung
-|*    Ersterstellung    MM 29.10.91
-|*    Letzte Aenderung  MM 29.10.91
+|*	  Beschreibung
+|*	  Ersterstellung	MM 29.10.91
+|*	  Letzte Aenderung	MM 29.10.91
 |*
 *************************************************************************/
 ERRTYPE RscTop::GetValueEle
@@ -355,11 +355,11 @@ ERRTYPE RscTop::GetValueEle
 
 /*************************************************************************
 |*
-|*    RscTop::SearchEle()
+|*	  RscTop::SearchEle()
 |*
-|*    Beschreibung
-|*    Ersterstellung    MM 29.10.91
-|*    Letzte Aenderung  MM 29.10.91
+|*	  Beschreibung
+|*	  Ersterstellung	MM 29.10.91
+|*	  Letzte Aenderung	MM 29.10.91
 |*
 *************************************************************************/
 RSCINST RscTop::SearchEle( const RSCINST & rInst, const RscId & rEleName,
@@ -374,11 +374,11 @@ RSCINST RscTop::SearchEle( const RSCINST & rInst, const RscId & rEleName,
 
 /*************************************************************************
 |*
-|*    RscTop::GetPosEle()
+|*	  RscTop::GetPosEle()
 |*
-|*    Beschreibung
-|*    Ersterstellung    MM 29.10.91
-|*    Letzte Aenderung  MM 29.10.91
+|*	  Beschreibung
+|*	  Ersterstellung	MM 29.10.91
+|*	  Letzte Aenderung	MM 29.10.91
 |*
 *************************************************************************/
 RSCINST RscTop::GetPosEle( const RSCINST & rInst, sal_uInt32 nPos ){
@@ -391,11 +391,11 @@ RSCINST RscTop::GetPosEle( const RSCINST & rInst, sal_uInt32 nPos ){
 
 /*************************************************************************
 |*
-|*    RscTop::MovePosEle()
+|*	  RscTop::MovePosEle()
 |*
-|*    Beschreibung
-|*    Ersterstellung    MM 29.10.91
-|*    Letzte Aenderung  MM 29.10.91
+|*	  Beschreibung
+|*	  Ersterstellung	MM 29.10.91
+|*	  Letzte Aenderung	MM 29.10.91
 |*
 *************************************************************************/
 ERRTYPE RscTop::MovePosEle( const RSCINST & rInst, sal_uInt32 nDestPos,
@@ -410,11 +410,11 @@ ERRTYPE RscTop::MovePosEle( const RSCINST & rInst, sal_uInt32 nDestPos,
 
 /*************************************************************************
 |*
-|*    RscTop::SetPosRscId()
+|*	  RscTop::SetPosRscId()
 |*
-|*    Beschreibung
-|*    Ersterstellung    MM 29.10.91
-|*    Letzte Aenderung  MM 29.10.91
+|*	  Beschreibung
+|*	  Ersterstellung	MM 29.10.91
+|*	  Letzte Aenderung	MM 29.10.91
 |*
 *************************************************************************/
 ERRTYPE RscTop::SetPosRscId( const RSCINST & rInst, sal_uInt32 nPos,
@@ -429,11 +429,11 @@ ERRTYPE RscTop::SetPosRscId( const RSCINST & rInst, sal_uInt32 nPos,
 
 /*************************************************************************
 |*
-|*    RscTop::GetInfoEle()
+|*	  RscTop::GetInfoEle()
 |*
-|*    Beschreibung
-|*    Ersterstellung    MM 29.10.91
-|*    Letzte Aenderung  MM 29.10.91
+|*	  Beschreibung
+|*	  Ersterstellung	MM 29.10.91
+|*	  Letzte Aenderung	MM 29.10.91
 |*
 *************************************************************************/
 SUBINFO_STRUCT RscTop::GetInfoEle( const RSCINST & rInst, sal_uInt32 nPos ){
@@ -446,14 +446,14 @@ SUBINFO_STRUCT RscTop::GetInfoEle( const RSCINST & rInst, sal_uInt32 nPos ){
 
 /*************************************************************************
 |*
-|*    RscTop::GetCount()
+|*	  RscTop::GetCount()
 |*
-|*    Beschreibung
-|*    Ersterstellung    MM 29.10.91
-|*    Letzte Aenderung  MM 29.10.91
+|*	  Beschreibung
+|*	  Ersterstellung	MM 29.10.91
+|*	  Letzte Aenderung	MM 29.10.91
 |*
 *************************************************************************/
-sal_uInt32  RscTop::GetCount( const RSCINST & rInst ){
+sal_uInt32	RscTop::GetCount( const RSCINST & rInst ){
     if( pSuperClass )
         return pSuperClass->GetCount( rInst );
     else
@@ -462,11 +462,11 @@ sal_uInt32  RscTop::GetCount( const RSCINST & rInst ){
 
 /*************************************************************************
 |*
-|*    RscTop::SetNumber()
+|*	  RscTop::SetNumber()
 |*
-|*    Beschreibung
-|*    Ersterstellung    MM 29.10.91
-|*    Letzte Aenderung  MM 29.10.91
+|*	  Beschreibung
+|*	  Ersterstellung	MM 29.10.91
+|*	  Letzte Aenderung	MM 29.10.91
 |*
 *************************************************************************/
 ERRTYPE RscTop::SetNumber( const RSCINST & rInst, INT32 lValue ){
@@ -479,11 +479,11 @@ ERRTYPE RscTop::SetNumber( const RSCINST & rInst, INT32 lValue ){
 
 /*************************************************************************
 |*
-|*    RscTop::SetBool()
+|*	  RscTop::SetBool()
 |*
-|*    Beschreibung
-|*    Ersterstellung    MM 29.10.91
-|*    Letzte Aenderung  MM 29.10.91
+|*	  Beschreibung
+|*	  Ersterstellung	MM 29.10.91
+|*	  Letzte Aenderung	MM 29.10.91
 |*
 *************************************************************************/
 ERRTYPE RscTop::SetBool( const RSCINST & rInst, BOOL bValue ){
@@ -496,11 +496,11 @@ ERRTYPE RscTop::SetBool( const RSCINST & rInst, BOOL bValue ){
 
 /*************************************************************************
 |*
-|*    RscTop::SetConst()
+|*	  RscTop::SetConst()
 |*
-|*    Beschreibung
-|*    Ersterstellung    MM 29.10.91
-|*    Letzte Aenderung  MM 29.10.91
+|*	  Beschreibung
+|*	  Ersterstellung	MM 29.10.91
+|*	  Letzte Aenderung	MM 29.10.91
 |*
 *************************************************************************/
 ERRTYPE RscTop::SetConst( const RSCINST & rInst, Atom nId, INT32 nVal )
@@ -513,11 +513,11 @@ ERRTYPE RscTop::SetConst( const RSCINST & rInst, Atom nId, INT32 nVal )
 
 /*************************************************************************
 |*
-|*    RscTop::SetNotConst()
+|*	  RscTop::SetNotConst()
 |*
-|*    Beschreibung
-|*    Ersterstellung    MM 29.10.91
-|*    Letzte Aenderung  MM 29.10.91
+|*	  Beschreibung
+|*	  Ersterstellung	MM 29.10.91
+|*	  Letzte Aenderung	MM 29.10.91
 |*
 *************************************************************************/
 ERRTYPE RscTop::SetNotConst( const RSCINST & rInst, Atom nId ){
@@ -530,11 +530,11 @@ ERRTYPE RscTop::SetNotConst( const RSCINST & rInst, Atom nId ){
 
 /*************************************************************************
 |*
-|*    RscTop::SetString()
+|*	  RscTop::SetString()
 |*
-|*    Beschreibung
-|*    Ersterstellung    MM 29.10.91
-|*    Letzte Aenderung  MM 29.10.91
+|*	  Beschreibung
+|*	  Ersterstellung	MM 29.10.91
+|*	  Letzte Aenderung	MM 29.10.91
 |*
 *************************************************************************/
 ERRTYPE RscTop::SetString( const RSCINST & rInst, const char * pStr ){
@@ -547,11 +547,11 @@ ERRTYPE RscTop::SetString( const RSCINST & rInst, const char * pStr ){
 
 /*************************************************************************
 |*
-|*    RscTop::GetNumber()
+|*	  RscTop::GetNumber()
 |*
-|*    Beschreibung
-|*    Ersterstellung    MM 29.10.91
-|*    Letzte Aenderung  MM 29.10.91
+|*	  Beschreibung
+|*	  Ersterstellung	MM 29.10.91
+|*	  Letzte Aenderung	MM 29.10.91
 |*
 *************************************************************************/
 ERRTYPE RscTop::GetNumber( const RSCINST & rInst, INT32 * pN ){
@@ -564,11 +564,11 @@ ERRTYPE RscTop::GetNumber( const RSCINST & rInst, INT32 * pN ){
 
 /*************************************************************************
 |*
-|*    RscTop::GetBool()
+|*	  RscTop::GetBool()
 |*
-|*    Beschreibung
-|*    Ersterstellung    MM 29.10.91
-|*    Letzte Aenderung  MM 29.10.91
+|*	  Beschreibung
+|*	  Ersterstellung	MM 29.10.91
+|*	  Letzte Aenderung	MM 29.10.91
 |*
 *************************************************************************/
 ERRTYPE RscTop::GetBool( const RSCINST & rInst, BOOL * pB ){
@@ -581,11 +581,11 @@ ERRTYPE RscTop::GetBool( const RSCINST & rInst, BOOL * pB ){
 
 /*************************************************************************
 |*
-|*    RscTop::GetCont()
+|*	  RscTop::GetCont()
 |*
-|*    Beschreibung
-|*    Ersterstellung    MM 29.10.91
-|*    Letzte Aenderung  MM 29.10.91
+|*	  Beschreibung
+|*	  Ersterstellung	MM 29.10.91
+|*	  Letzte Aenderung	MM 29.10.91
 |*
 *************************************************************************/
 ERRTYPE RscTop::GetConst( const RSCINST & rInst, Atom * pH ){
@@ -598,11 +598,11 @@ ERRTYPE RscTop::GetConst( const RSCINST & rInst, Atom * pH ){
 
 /*************************************************************************
 |*
-|*    RscTop::GetString()
+|*	  RscTop::GetString()
 |*
-|*    Beschreibung
-|*    Ersterstellung    MM 29.10.91
-|*    Letzte Aenderung  MM 29.10.91
+|*	  Beschreibung
+|*	  Ersterstellung	MM 29.10.91
+|*	  Letzte Aenderung	MM 29.10.91
 |*
 *************************************************************************/
 ERRTYPE RscTop::GetString( const RSCINST & rInst, char ** ppStr ){
@@ -615,11 +615,11 @@ ERRTYPE RscTop::GetString( const RSCINST & rInst, char ** ppStr ){
 
 /*************************************************************************
 |*
-|*    RscTop::Create()
+|*	  RscTop::Create()
 |*
-|*    Beschreibung
-|*    Ersterstellung    MM 17.05.91
-|*    Letzte Aenderung  MM 17.07.91
+|*	  Beschreibung
+|*	  Ersterstellung	MM 17.05.91
+|*	  Letzte Aenderung	MM 17.07.91
 |*
 *************************************************************************/
 RSCINST RscTop::Create( RSCINST * pInst, const RSCINST & rDefInst, BOOL bOwnRange )
@@ -636,28 +636,28 @@ RSCINST RscTop::Create( RSCINST * pInst, const RSCINST & rDefInst, BOOL bOwnRang
 
 /*************************************************************************
 |*
-|*    RscTop::Destroy()
+|*	  RscTop::Destroy()
 |*
-|*    Beschreibung
-|*    Ersterstellung    MM 29.10.91
-|*    Letzte Aenderung  MM 29.10.91
+|*	  Beschreibung
+|*	  Ersterstellung	MM 29.10.91
+|*	  Letzte Aenderung	MM 29.10.91
 |*
 *************************************************************************/
-void    RscTop::Destroy( const RSCINST & rInst ){
+void	RscTop::Destroy( const RSCINST & rInst ){
     if( pSuperClass )
         pSuperClass->Destroy( rInst );
 }
 
 /*************************************************************************
 |*
-|*    RscTop::IsConsistent()
+|*	  RscTop::IsConsistent()
 |*
-|*    Beschreibung
-|*    Ersterstellung    MM 29.10.91
-|*    Letzte Aenderung  MM 29.10.91
+|*	  Beschreibung
+|*	  Ersterstellung	MM 29.10.91
+|*	  Letzte Aenderung	MM 29.10.91
 |*
 *************************************************************************/
-BOOL    RscTop::IsConsistent( const RSCINST & rInst,
+BOOL	RscTop::IsConsistent( const RSCINST & rInst,
                               RscInconsList * pList )
 {
     if( pSuperClass )
@@ -668,14 +668,14 @@ BOOL    RscTop::IsConsistent( const RSCINST & rInst,
 
 /*************************************************************************
 |*
-|*    RscTop::SetToDefault()
+|*	  RscTop::SetToDefault()
 |*
-|*    Beschreibung
-|*    Ersterstellung    MM 29.10.91
-|*    Letzte Aenderung  MM 29.10.91
+|*	  Beschreibung
+|*	  Ersterstellung	MM 29.10.91
+|*	  Letzte Aenderung	MM 29.10.91
 |*
 *************************************************************************/
-void    RscTop::SetToDefault( const RSCINST & rInst )
+void	RscTop::SetToDefault( const RSCINST & rInst )
 {
     if( pSuperClass )
         pSuperClass->SetToDefault( rInst );
@@ -683,14 +683,14 @@ void    RscTop::SetToDefault( const RSCINST & rInst )
 
 /*************************************************************************
 |*
-|*    RscTop::IsDefault()
+|*	  RscTop::IsDefault()
 |*
-|*    Beschreibung
-|*    Ersterstellung    MM 29.10.91
-|*    Letzte Aenderung  MM 29.10.91
+|*	  Beschreibung
+|*	  Ersterstellung	MM 29.10.91
+|*	  Letzte Aenderung	MM 29.10.91
 |*
 *************************************************************************/
-BOOL    RscTop::IsDefault( const RSCINST & rInst ){
+BOOL	RscTop::IsDefault( const RSCINST & rInst ){
     if( pSuperClass )
         return pSuperClass->IsDefault( rInst );
     else
@@ -699,14 +699,14 @@ BOOL    RscTop::IsDefault( const RSCINST & rInst ){
 
 /*************************************************************************
 |*
-|*    RscTop::IsValueDefault()
+|*	  RscTop::IsValueDefault()
 |*
-|*    Beschreibung
-|*    Ersterstellung    MM 29.10.91
-|*    Letzte Aenderung  MM 29.10.91
+|*	  Beschreibung
+|*	  Ersterstellung	MM 29.10.91
+|*	  Letzte Aenderung	MM 29.10.91
 |*
 *************************************************************************/
-BOOL    RscTop::IsValueDefault( const RSCINST & rInst, CLASS_DATA pDef ){
+BOOL	RscTop::IsValueDefault( const RSCINST & rInst, CLASS_DATA pDef ){
     if( pSuperClass )
         return pSuperClass->IsValueDefault( rInst, pDef );
     else
@@ -715,25 +715,25 @@ BOOL    RscTop::IsValueDefault( const RSCINST & rInst, CLASS_DATA pDef ){
 
 /*************************************************************************
 |*
-|*    RscTop::SetDefault()
+|*	  RscTop::SetDefault()
 |*
-|*    Beschreibung
-|*    Ersterstellung    MM 29.10.91
-|*    Letzte Aenderung  MM 29.10.91
+|*	  Beschreibung
+|*	  Ersterstellung	MM 29.10.91
+|*	  Letzte Aenderung	MM 29.10.91
 |*
 *************************************************************************/
-void    RscTop::SetDefault( const RSCINST & rInst, Atom nVarId ){
+void	RscTop::SetDefault( const RSCINST & rInst, Atom nVarId ){
     if( pSuperClass )
         pSuperClass->SetDefault( rInst, nVarId );
 }
 
 /*************************************************************************
 |*
-|*    RscTop::GetDefault()
+|*	  RscTop::GetDefault()
 |*
-|*    Beschreibung
-|*    Ersterstellung    MM 29.10.91
-|*    Letzte Aenderung  MM 29.10.91
+|*	  Beschreibung
+|*	  Ersterstellung	MM 29.10.91
+|*	  Letzte Aenderung	MM 29.10.91
 |*
 *************************************************************************/
 RSCINST RscTop::GetDefault( Atom nVarId ){
@@ -746,14 +746,14 @@ RSCINST RscTop::GetDefault( Atom nVarId ){
 
 /*************************************************************************
 |*
-|*    RscTop::Delete()
+|*	  RscTop::Delete()
 |*
-|*    Beschreibung
-|*    Ersterstellung    MM 29.10.91
-|*    Letzte Aenderung  MM 29.10.91
+|*	  Beschreibung
+|*	  Ersterstellung	MM 29.10.91
+|*	  Letzte Aenderung	MM 29.10.91
 |*
 *************************************************************************/
-void    RscTop::Delete( const RSCINST & rInst, RscTop * pClass,
+void	RscTop::Delete( const RSCINST & rInst, RscTop * pClass,
                 const RscId & rId )
 {
     if( pSuperClass )
@@ -762,14 +762,14 @@ void    RscTop::Delete( const RSCINST & rInst, RscTop * pClass,
 
 /*************************************************************************
 |*
-|*    RscTop::DeletePos()
+|*	  RscTop::DeletePos()
 |*
-|*    Beschreibung
-|*    Ersterstellung    MM 29.10.91
-|*    Letzte Aenderung  MM 29.10.91
+|*	  Beschreibung
+|*	  Ersterstellung	MM 29.10.91
+|*	  Letzte Aenderung	MM 29.10.91
 |*
 *************************************************************************/
-void    RscTop::DeletePos( const RSCINST & rInst, sal_uInt32 nPos )
+void	RscTop::DeletePos( const RSCINST & rInst, sal_uInt32 nPos )
 {
     if( pSuperClass )
         pSuperClass->DeletePos( rInst, nPos );
@@ -777,11 +777,11 @@ void    RscTop::DeletePos( const RSCINST & rInst, sal_uInt32 nPos )
 
 /*************************************************************************
 |*
-|*    RscTop::SetRef()
+|*	  RscTop::SetRef()
 |*
-|*    Beschreibung
-|*    Ersterstellung    MM 18.09.91
-|*    Letzte Aenderung  MM 18.09.91
+|*	  Beschreibung
+|*	  Ersterstellung	MM 18.09.91
+|*	  Letzte Aenderung	MM 18.09.91
 |*
 *************************************************************************/
 ERRTYPE RscTop::SetRef( const RSCINST & rInst, const RscId & rRefId ){
@@ -793,11 +793,11 @@ ERRTYPE RscTop::SetRef( const RSCINST & rInst, const RscId & rRefId ){
 
 /*************************************************************************
 |*
-|*    RscTop::WriteHxxHeader()
+|*	  RscTop::WriteHxxHeader()
 |*
-|*    Beschreibung
-|*    Ersterstellung    MM 29.05.91
-|*    Letzte Aenderung  MM 29.05.91
+|*	  Beschreibung
+|*	  Ersterstellung	MM 29.05.91
+|*	  Letzte Aenderung	MM 29.05.91
 |*
 *************************************************************************/
 ERRTYPE RscTop::WriteHxxHeader( const RSCINST & rInst, FILE * fOutput,
@@ -811,11 +811,11 @@ ERRTYPE RscTop::WriteHxxHeader( const RSCINST & rInst, FILE * fOutput,
 
 /*************************************************************************
 |*
-|*    RscTop::WriteHxx()
+|*	  RscTop::WriteHxx()
 |*
-|*    Beschreibung
-|*    Ersterstellung    MM 29.05.91
-|*    Letzte Aenderung  MM 29.05.91
+|*	  Beschreibung
+|*	  Ersterstellung	MM 29.05.91
+|*	  Letzte Aenderung	MM 29.05.91
 |*
 *************************************************************************/
 ERRTYPE RscTop::WriteHxx( const RSCINST & rInst, FILE * fOutput,
@@ -828,11 +828,11 @@ ERRTYPE RscTop::WriteHxx( const RSCINST & rInst, FILE * fOutput,
 
 /*************************************************************************
 |*
-|*    RscTop::WriteCxxHeader()
+|*	  RscTop::WriteCxxHeader()
 |*
-|*    Beschreibung
-|*    Ersterstellung    MM 29.05.91
-|*    Letzte Aenderung  MM 29.05.91
+|*	  Beschreibung
+|*	  Ersterstellung	MM 29.05.91
+|*	  Letzte Aenderung	MM 29.05.91
 |*
 *************************************************************************/
 ERRTYPE RscTop::WriteCxxHeader( const RSCINST & rInst, FILE * fOutput,
@@ -846,11 +846,11 @@ ERRTYPE RscTop::WriteCxxHeader( const RSCINST & rInst, FILE * fOutput,
 
 /*************************************************************************
 |*
-|*    RscTop::WriteCxx()
+|*	  RscTop::WriteCxx()
 |*
-|*    Beschreibung
-|*    Ersterstellung    MM 29.05.91
-|*    Letzte Aenderung  MM 29.05.91
+|*	  Beschreibung
+|*	  Ersterstellung	MM 29.05.91
+|*	  Letzte Aenderung	MM 29.05.91
 |*
 *************************************************************************/
 ERRTYPE RscTop::WriteCxx( const RSCINST & rInst, FILE * fOutput,
@@ -863,11 +863,11 @@ ERRTYPE RscTop::WriteCxx( const RSCINST & rInst, FILE * fOutput,
 
 /*************************************************************************
 |*
-|*    RscTop::WriteSrcHeader()
+|*	  RscTop::WriteSrcHeader()
 |*
-|*    Beschreibung
-|*    Ersterstellung    MM 08.04.91
-|*    Letzte Aenderung  MM 08.04.91
+|*	  Beschreibung
+|*	  Ersterstellung	MM 08.04.91
+|*	  Letzte Aenderung	MM 08.04.91
 |*
 *************************************************************************/
 void RscTop::WriteSrcHeader( const RSCINST & rInst, FILE * fOutput,
@@ -882,11 +882,11 @@ void RscTop::WriteSrcHeader( const RSCINST & rInst, FILE * fOutput,
 
 /*************************************************************************
 |*
-|*    RscTop::WriteSrc()
+|*	  RscTop::WriteSrc()
 |*
-|*    Beschreibung
-|*    Ersterstellung    MM 08.04.91
-|*    Letzte Aenderung  MM 08.04.91
+|*	  Beschreibung
+|*	  Ersterstellung	MM 08.04.91
+|*	  Letzte Aenderung	MM 08.04.91
 |*
 *************************************************************************/
 void RscTop::WriteSrc( const RSCINST & rInst, FILE * fOutput,
@@ -898,11 +898,11 @@ void RscTop::WriteSrc( const RSCINST & rInst, FILE * fOutput,
 
 /*************************************************************************
 |*
-|*    RscTop::WriteRcHeader()
+|*	  RscTop::WriteRcHeader()
 |*
-|*    Beschreibung
-|*    Ersterstellung    MM 12.04.91
-|*    Letzte Aenderung  MM 12.04.91
+|*	  Beschreibung
+|*	  Ersterstellung	MM 12.04.91
+|*	  Letzte Aenderung	MM 12.04.91
 |*
 *************************************************************************/
 ERRTYPE RscTop::WriteRcHeader( const RSCINST & rInst, RscWriteRc & rMem,
@@ -918,11 +918,11 @@ ERRTYPE RscTop::WriteRcHeader( const RSCINST & rInst, RscWriteRc & rMem,
 
 /*************************************************************************
 |*
-|*    RscTop::WriteRc()
+|*	  RscTop::WriteRc()
 |*
-|*    Beschreibung
-|*    Ersterstellung    MM 08.04.91
-|*    Letzte Aenderung  MM 08.04.91
+|*	  Beschreibung
+|*	  Ersterstellung	MM 08.04.91
+|*	  Letzte Aenderung	MM 08.04.91
 |*
 *************************************************************************/
 ERRTYPE RscTop::WriteRc( const RSCINST & rInst, RscWriteRc & rMem,
@@ -937,11 +937,11 @@ ERRTYPE RscTop::WriteRc( const RSCINST & rInst, RscWriteRc & rMem,
 
 /*************************************************************************
 |*
-|*    RscTop::WriteSyntaxHeader()
+|*	  RscTop::WriteSyntaxHeader()
 |*
-|*    Beschreibung
-|*    Ersterstellung    MM 29.05.91
-|*    Letzte Aenderung  MM 29.05.91
+|*	  Beschreibung
+|*	  Ersterstellung	MM 29.05.91
+|*	  Letzte Aenderung	MM 29.05.91
 |*
 *************************************************************************/
 void RscTop::WriteSyntaxHeader( FILE * fOutput, RscTypCont * pTC )
@@ -956,11 +956,11 @@ void RscTop::WriteSyntaxHeader( FILE * fOutput, RscTypCont * pTC )
 
 /*************************************************************************
 |*
-|*    RscTop::WriteSyntax()
+|*	  RscTop::WriteSyntax()
 |*
-|*    Beschreibung
-|*    Ersterstellung    MM 29.05.91
-|*    Letzte Aenderung  MM 29.05.91
+|*	  Beschreibung
+|*	  Ersterstellung	MM 29.05.91
+|*	  Letzte Aenderung	MM 29.05.91
 |*
 *************************************************************************/
 void RscTop::WriteSyntax( FILE * fOutput, RscTypCont * pTC )
diff --git a/rsc/source/rsc/rsc.cxx b/rsc/source/rsc/rsc.cxx
index 40d589aea359..b6c02187c504 100644
--- a/rsc/source/rsc/rsc.cxx
+++ b/rsc/source/rsc/rsc.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
@@ -28,7 +28,7 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_rsc.hxx"
 /****************************************************************/
-/*                  Include File                                */
+/*					Include File								*/
 /****************************************************************/
 
 #include <stdlib.h>
@@ -71,37 +71,37 @@
 #include <rtl/tencinfo.h>
 #include <rtl/textenc.h>
 
-#include <vector>
+#include <vector> 
 
 
 using namespace rtl;
 
 /*************** F o r w a r d s *****************************************/
-/*************** G l o b a l e   V a r i a b l e n **********************/
-ByteString*     pStdParType  = NULL;
-ByteString*     pStdPar1     = NULL;
-ByteString*     pStdPar2     = NULL;
-ByteString*     pWinParType  = NULL;
-ByteString*     pWinPar1     = NULL;
-ByteString*     pWinPar2     = NULL;
-sal_uInt32      nRefDeep     = 10;
+/*************** G l o b a l e	 V a r i a b l e n **********************/
+ByteString* 	pStdParType  = NULL;
+ByteString* 	pStdPar1	 = NULL;
+ByteString* 	pStdPar2	 = NULL;
+ByteString* 	pWinParType  = NULL;
+ByteString* 	pWinPar1	 = NULL;
+ByteString* 	pWinPar2	 = NULL;
+sal_uInt32		nRefDeep	 = 10;
 AtomContainer*  pHS          = NULL;
 
 
 /*************** R s c C m d L i n e ************************************/
 /*************************************************************************
 |*
-|*    RscCmdLine::Init()
+|*	  RscCmdLine::Init()
 |*
-|*    Beschreibung      Kommandozeile interpretierten
-|*    Ersterstellung    MM 03.05.91
-|*    Letzte Aenderung  MM 03.05.91
+|*	  Beschreibung		Kommandozeile interpretierten
+|*	  Ersterstellung	MM 03.05.91
+|*	  Letzte Aenderung	MM 03.05.91
 |*
 *************************************************************************/
 void RscCmdLine::Init()
 {
-    nCommands       = 0;
-    nByteOrder      = RSC_BIGENDIAN;
+    nCommands		= 0;
+    nByteOrder		= RSC_BIGENDIAN;
 
     DirEntry aEntry;
     aPath = ByteString( aEntry.GetFull(), RTL_TEXTENCODING_ASCII_US ); //Immer im Aktuellen Pfad suchen
@@ -111,11 +111,11 @@ void RscCmdLine::Init()
 
 /*************************************************************************
 |*
-|*    RscCmdLine::RscCmdLine()
+|*	  RscCmdLine::RscCmdLine()
 |*
-|*    Beschreibung      Kommandozeile interpretierten
-|*    Ersterstellung    MM 13.02.91
-|*    Letzte Aenderung  MM 13.02.91
+|*	  Beschreibung		Kommandozeile interpretierten
+|*	  Ersterstellung	MM 13.02.91
+|*	  Letzte Aenderung	MM 13.02.91
 |*
 *************************************************************************/
 RscCmdLine::RscCmdLine()
@@ -125,21 +125,21 @@ RscCmdLine::RscCmdLine()
 
 /*************************************************************************
 |*
-|*    RscCmdLine::RscCmdLine()
+|*	  RscCmdLine::RscCmdLine()
 |*
-|*    Beschreibung      Kommandozeile interpretierten
-|*    Ersterstellung    MM 13.02.91
-|*    Letzte Aenderung  MM 13.02.91
+|*	  Beschreibung		Kommandozeile interpretierten
+|*	  Ersterstellung	MM 13.02.91
+|*	  Letzte Aenderung	MM 13.02.91
 |*
 *************************************************************************/
 RscCmdLine::RscCmdLine( int argc, char ** argv, RscError * pEH )
 {
-    char *          pStr;
-    char **         ppStr;
-    RscPtrPtr       aCmdLine;       // Kommandozeile
-    ByteString      aString;
-    sal_uInt32      i;
-    BOOL            bOutputSrsIsSet = FALSE;
+    char *			pStr;
+    char ** 		ppStr;
+    RscPtrPtr		aCmdLine;		// Kommandozeile
+    ByteString		aString;
+    sal_uInt32		i;
+    BOOL			bOutputSrsIsSet = FALSE;
 
     Init(); // Defaults setzen
 
@@ -147,7 +147,7 @@ RscCmdLine::RscCmdLine( int argc, char ** argv, RscError * pEH )
     if( pStr )
         pEH->FatalError( ERR_OPENFILE, RscId(), pStr );
 
-    /* check the inputted switches       */
+    /* check the inputted switches		 */
     ppStr  = (char **)aCmdLine.GetBlock();
     ppStr++;
     i = 1;
@@ -195,10 +195,10 @@ RscCmdLine::RscCmdLine( int argc, char ** argv, RscError * pEH )
                     ;
                 if( *pEqual )
                 {
-                    const ByteString    aSPath( pEqual + 1 );
-                    DirEntry            aSDir( String( aSPath, RTL_TEXTENCODING_ASCII_US ) );
-
-                    m_aReplacements.push_back( std::pair< OString, OString >( OString( (*ppStr)+4, pEqual - *ppStr - 4 ),
+                    const ByteString 	aSPath( pEqual + 1 );
+                    DirEntry			aSDir( String( aSPath, RTL_TEXTENCODING_ASCII_US ) );
+                
+                    m_aReplacements.push_back( std::pair< OString, OString >( OString( (*ppStr)+4, pEqual - *ppStr - 4 ), 
                                                                               ByteString( aSDir.GetFull(), RTL_TEXTENCODING_ASCII_US ) ) );
                 }
             }
@@ -238,14 +238,14 @@ RscCmdLine::RscCmdLine( int argc, char ** argv, RscError * pEH )
             }
             else if( !rsc_strnicmp( (*ppStr) + 1, "lip=", 4 ) )
             {  // additional language specific include for system dependent files
-                const ByteString    aSysSearchDir( (*ppStr)+5 );
-                DirEntry            aSysDir( String( aSysSearchDir, RTL_TEXTENCODING_ASCII_US ) );
-
+                const ByteString 	aSysSearchDir( (*ppStr)+5 );
+                DirEntry			aSysDir( String( aSysSearchDir, RTL_TEXTENCODING_ASCII_US ) );
+                
                 m_aOutputFiles.back().aSysSearchDirs.push_back( ByteString( aSysDir.GetFull(), RTL_TEXTENCODING_ASCII_US ) );
-
+                
                 if( m_aOutputFiles.back().aLangSearchPath.Len() )
                     m_aOutputFiles.back().aLangSearchPath.Append( ByteString( DirEntry::GetSearchDelimiter(), RTL_TEXTENCODING_ASCII_US ) );
-
+                
                 m_aOutputFiles.back().aLangSearchPath.Append( aSysSearchDir );
             }
             else if( !rsc_strnicmp( (*ppStr) + 1, "fp=", 3 ) )
@@ -335,16 +335,16 @@ RscCmdLine::RscCmdLine( int argc, char ** argv, RscError * pEH )
 
 /*************************************************************************
 |*
-|*    RscCmdLine::~RscCmdLine()
+|*	  RscCmdLine::~RscCmdLine()
 |*
-|*    Beschreibung      dtor
-|*    Ersterstellung    MM 13.02.91
-|*    Letzte Aenderung  MM 13.02.91
+|*	  Beschreibung		dtor
+|*	  Ersterstellung	MM 13.02.91
+|*	  Letzte Aenderung	MM 13.02.91
 |*
 *************************************************************************/
 RscCmdLine::~RscCmdLine()
 {
-    ByteString  *pString;
+    ByteString	*pString;
 
     while( NULL != (pString = aInputList.Remove( (ULONG)0 )) )
         delete pString;
@@ -354,7 +354,7 @@ RscCmdLine::~RscCmdLine()
 
 /*************************************************************************
 |*
-|*    RscCmdLine::substitutePaths()
+|*	  RscCmdLine::substitutePaths()
 |*
 *************************************************************************/
 
@@ -390,21 +390,21 @@ OString RscCmdLine::substitutePaths( const OString& rIn )
 
 /*************** R s c C o m p i l e r **********************************/
 /****************************************************************/
-/*                                                              */
-/*  RscCompiler :: RscCompiler(int argc, char **argv)           */
-/*                                                              */
-/*  Parameters  :   argc - number of parameters on command line */
-/*                  argv - arry of pointers to input parameters */
-/*                                                              */
-/*  Description :   main calling routine. Calls functions to    */
-/*  check and assign the input parameters. It then builds the   */
-/*  command line to call the Glockenspiel preprocessor          */
+/*																*/
+/*	RscCompiler :: RscCompiler(int argc, char **argv)			*/
+/*																*/
+/*	Parameters	:	argc - number of parameters on command line */
+/*					argv - arry of pointers to input parameters */
+/*																*/
+/*	Description :	main calling routine. Calls functions to	*/
+/*	check and assign the input parameters. It then builds the	*/
+/*	command line to call the Glockenspiel preprocessor			*/
 /****************************************************************/
 
 RscCompiler::RscCompiler( RscCmdLine * pLine, RscTypCont * pTypCont )
 {
-    fListing      = NULL;
-    fExitFile     = NULL;
+    fListing	  = NULL;
+    fExitFile	  = NULL;
 
     //Kommandozeile setzen, TypContainer setzen
     pCL = pLine;
@@ -420,11 +420,11 @@ RscCompiler::RscCompiler( RscCmdLine * pLine, RscTypCont * pTypCont )
 
 /*************************************************************************
 |*
-|*    RscCompiler :: RscCompiler()
+|*	  RscCompiler :: RscCompiler()
 |*
-|*    Beschreibung
-|*    Ersterstellung    MM 07.02.91
-|*    Letzte Aenderung  MM 07.02.91
+|*	  Beschreibung
+|*	  Ersterstellung	MM 07.02.91
+|*	  Letzte Aenderung	MM 07.02.91
 |*
 *************************************************************************/
 RscCompiler::~RscCompiler()
@@ -459,18 +459,18 @@ RscCompiler::~RscCompiler()
 
 /*************************************************************************
 |*
-|*    RscCompiler::Start()
+|*	  RscCompiler::Start()
 |*
-|*    Beschreibung      Datei in Kommandozeile aendern
-|*    Ersterstellung    MM 13.02.91
-|*    Letzte Aenderung  MM 13.02.91
+|*	  Beschreibung		Datei in Kommandozeile aendern
+|*	  Ersterstellung	MM 13.02.91
+|*	  Letzte Aenderung	MM 13.02.91
 |*
 *************************************************************************/
 ERRTYPE RscCompiler::Start()
 {
-    ERRTYPE         aError;
-    ByteString*     pString;
-    RscFile*        pFName;
+    ERRTYPE 		aError;
+    ByteString* 	pString;
+    RscFile*		pFName;
 
     if( PRINTSYNTAX_FLAG & pCL->nCommands )
     {
@@ -543,11 +543,11 @@ printf( "khg\n" );
 }
 /*************************************************************************
 |*
-|*    RscCmdLine::EndCompile()
+|*	  RscCmdLine::EndCompile()
 |*
-|*    Beschreibung      Datei in Kommandozeile aendern
-|*    Ersterstellung    MM 13.02.91
-|*    Letzte Aenderung  MM 13.02.91
+|*	  Beschreibung		Datei in Kommandozeile aendern
+|*	  Ersterstellung	MM 13.02.91
+|*	  Letzte Aenderung	MM 13.02.91
 |*
 *************************************************************************/
 void RscCompiler::EndCompile()
@@ -559,11 +559,11 @@ void RscCompiler::EndCompile()
         pTC->pEH->StdOut( ".\n", RscVerbosityVerbose );
 
         // kopiere von TMP auf richtigen Namen
-        unlink( pCL->aOutputSrs.GetBuffer() );   // Zieldatei loeschen
+        unlink( pCL->aOutputSrs.GetBuffer() );	 // Zieldatei loeschen
         if( !(pCL->nCommands & NOSYNTAX_FLAG) )
         {
-            FILE        * foutput;
-            RscFile     * pFN;
+            FILE		* foutput;
+            RscFile 	* pFN;
 
             if( NULL == (foutput = fopen( pCL->aOutputSrs.GetBuffer(), "w" )) )
                 pTC->pEH->FatalError( ERR_OPENFILE, RscId(), pCL->aOutputSrs.GetBuffer() );
@@ -593,7 +593,7 @@ void RscCompiler::EndCompile()
         pTC->pEH->StdOut( ".\n", RscVerbosityVerbose );
 
         // kopiere von TMP auf richtigen Namen
-        unlink( pCL->aOutputHxx.GetBuffer() );   // Zieldatei loeschen
+        unlink( pCL->aOutputHxx.GetBuffer() );	 // Zieldatei loeschen
         Append( pCL->aOutputHxx, aTmpOutputHxx );
         unlink( aTmpOutputHxx.GetBuffer() );// TempDatei  loeschen
         aTmpOutputHxx = ByteString();
@@ -606,7 +606,7 @@ void RscCompiler::EndCompile()
         pTC->pEH->StdOut( ".\n", RscVerbosityVerbose );
 
         // kopiere von TMP auf richtigen Namen
-        unlink( pCL->aOutputCxx.GetBuffer() );   // Zieldatei loeschen
+        unlink( pCL->aOutputCxx.GetBuffer() );	 // Zieldatei loeschen
         Append( pCL->aOutputCxx, aTmpOutputCxx );
         unlink( aTmpOutputCxx.GetBuffer() );// TempDatei  loeschen
         aTmpOutputCxx = ByteString();
@@ -619,7 +619,7 @@ void RscCompiler::EndCompile()
         pTC->pEH->StdOut( ".\n", RscVerbosityVerbose );
 
         // kopiere von TMP auf richtigen Namen
-        unlink( pCL->aOutputRcCtor.GetBuffer() );   // Zieldatei loeschen
+        unlink( pCL->aOutputRcCtor.GetBuffer() );	// Zieldatei loeschen
         Append( pCL->aOutputRcCtor, aTmpOutputRcCtor );
         unlink( aTmpOutputRcCtor.GetBuffer() );// TempDatei  loeschen
         aTmpOutputRcCtor = ByteString();
@@ -628,7 +628,7 @@ void RscCompiler::EndCompile()
     if( aTmpOutputSrc.Len() )
     {
         // kopiere von TMP auf richtigen Namen
-        unlink( pCL->aOutputSrc.GetBuffer() );   // Zieldatei loeschen
+        unlink( pCL->aOutputSrc.GetBuffer() );	 // Zieldatei loeschen
         Append( pCL->aOutputSrc, aTmpOutputSrc );
         unlink( aTmpOutputSrc.GetBuffer() );// TempDatei  loeschen
         aTmpOutputSrc = ByteString();
@@ -649,18 +649,18 @@ void RscCompiler::EndCompile()
 
 /*************************************************************************
 |*
-|*    RscCompiler::IncludeParser()
+|*	  RscCompiler::IncludeParser()
 |*
-|*    Beschreibung
-|*    Ersterstellung    MM 21.06.91
-|*    Letzte Aenderung  MM 21.06.91
+|*	  Beschreibung
+|*	  Ersterstellung	MM 21.06.91
+|*	  Letzte Aenderung	MM 21.06.91
 |*
 *************************************************************************/
 ERRTYPE RscCompiler :: IncludeParser( ULONG lFileKey )
 {
-    FILE            * finput;
-    RscFile         * pFName;
-    ERRTYPE           aError;
+    FILE			* finput;
+    RscFile 		* pFName;
+    ERRTYPE 		  aError;
 
     pFName = pTC->aFileTab.Get( lFileKey );
     if( !pFName )
@@ -676,10 +676,10 @@ ERRTYPE RscCompiler :: IncludeParser( ULONG lFileKey )
         }
         else
         {
-            RscFile         * pFNTmp;
-            ByteString        aPathName;
-            RscDepend       * pDep;
-            RscFileInst       aFileInst( pTC, lFileKey, lFileKey, finput );
+            RscFile 		* pFNTmp;
+            ByteString		  aPathName;
+            RscDepend		* pDep;
+            RscFileInst 	  aFileInst( pTC, lFileKey, lFileKey, finput );
 
             pFName->bScanned = TRUE;
             ::IncludeParser( &aFileInst );
@@ -717,20 +717,20 @@ ERRTYPE RscCompiler :: IncludeParser( ULONG lFileKey )
 
 /*************************************************************************
 |*
-|*    RscCompiler :: ParseOneFile()
+|*	  RscCompiler :: ParseOneFile()
 |*
-|*    Beschreibung
-|*    Ersterstellung    MM 26.06.91
-|*    Letzte Aenderung  MM 26.06.91
+|*	  Beschreibung
+|*	  Ersterstellung	MM 26.06.91
+|*	  Letzte Aenderung	MM 26.06.91
 |*
 *************************************************************************/
-ERRTYPE RscCompiler :: ParseOneFile( ULONG lFileKey,
+ERRTYPE RscCompiler :: ParseOneFile( ULONG lFileKey, 
                                      const RscCmdLine::OutputFile* pOutputFile,
                                       const WriteRcContext* pContext )
 {
-    FILE *              finput = NULL;
-    ERRTYPE             aError;
-    RscFile           * pFName;
+    FILE *				finput = NULL;
+    ERRTYPE 			aError;
+    RscFile 		  * pFName;
 
     pFName = pTC->aFileTab.Get( lFileKey );
     if( !pFName )
@@ -753,20 +753,20 @@ ERRTYPE RscCompiler :: ParseOneFile( ULONG lFileKey,
             pFName->bLoaded = FALSE; //bei Fehler nicht geladenen
         else
         {
-            String      aTmpName( ::GetTmpFileName(), RTL_TEXTENCODING_ASCII_US );
-            DirEntry    aTmpPath( aTmpName ), aSrsPath( String( pFName->aPathName.GetBuffer(), RTL_TEXTENCODING_ASCII_US ) );
-
+            String 		aTmpName( ::GetTmpFileName(), RTL_TEXTENCODING_ASCII_US );
+            DirEntry	aTmpPath( aTmpName ), aSrsPath( String( pFName->aPathName.GetBuffer(), RTL_TEXTENCODING_ASCII_US ) );
+    
             aTmpPath.ToAbs();
             aSrsPath.ToAbs();
-
+            
             if( pContext && pOutputFile )
                 PreprocessSrsFile( *pOutputFile, *pContext, aSrsPath, aTmpPath );
             else
                 aSrsPath.CopyTo( aTmpPath, FSYS_ACTION_COPYFILE );
-
+                
             ByteString aParseFile( aTmpPath.GetFull(), RTL_TEXTENCODING_ASCII_US );
             finput = fopen( aParseFile.GetBuffer(), "r" );
-
+            
             if( !finput )
             {
                 pTC->pEH->Error( ERR_OPENFILE, NULL, RscId(), pFName->aPathName.GetBuffer() );
@@ -775,18 +775,18 @@ ERRTYPE RscCompiler :: ParseOneFile( ULONG lFileKey,
             else
             {
                 RscFileInst aFileInst( pTC, lFileKey, lFileKey, finput );
-
+                
                 pTC->pEH->StdOut( "reading file ", RscVerbosityVerbose );
                 pTC->pEH->StdOut( aParseFile.GetBuffer(), RscVerbosityVerbose );
                 pTC->pEH->StdOut( " ", RscVerbosityVerbose );
-
+                
                 aError = ::parser( &aFileInst );
                 if( aError.IsError() )
                     pTC->Delete( lFileKey );//Resourceobjekte loeschen
                 pTC->pEH->StdOut( "\n", RscVerbosityVerbose );
                 fclose( finput );
             };
-
+            
             aTmpPath.Kill();
         };
     };
@@ -796,11 +796,11 @@ ERRTYPE RscCompiler :: ParseOneFile( ULONG lFileKey,
 
 /*************************************************************************
 |*
-|*    RscCompiler :: Link()
+|*	  RscCompiler :: Link()
 |*
-|*    Beschreibung
-|*    Ersterstellung    MM 07.02.91
-|*    Letzte Aenderung  MM 07.02.91
+|*	  Beschreibung
+|*	  Ersterstellung	MM 07.02.91
+|*	  Letzte Aenderung	MM 07.02.91
 |*
 *************************************************************************/
 
@@ -815,9 +815,9 @@ static OString do_prefix( const char* pPrefix, const OUString& rFile )
 
 ERRTYPE RscCompiler::Link()
 {
-    FILE *      foutput;
-    ERRTYPE     aError;
-    RscFile*    pFName;
+    FILE *		foutput;
+    ERRTYPE 	aError;
+    RscFile*	pFName;
 
 #ifdef UNX
 #define PATHSEP '/'
@@ -828,7 +828,7 @@ ERRTYPE RscCompiler::Link()
     if( !(pCL->nCommands & NOLINK_FLAG) )
     {
         ::std::list<RscCmdLine::OutputFile>::const_iterator it;
-
+        
         for( it = pCL->m_aOutputFiles.begin(); it != pCL->m_aOutputFiles.end(); ++it )
         {
             // cleanup nodes
@@ -841,7 +841,7 @@ ERRTYPE RscCompiler::Link()
                     pFName->bLoaded = FALSE;
                 }
             }
-
+                       
             // rc-Datei schreiben
             ByteString aDir( it->aOutputRc );
             aDir.SetToken( aDir.GetTokenCount( PATHSEP )-1, PATHSEP, ByteString() );
@@ -857,7 +857,7 @@ ERRTYPE RscCompiler::Link()
             // work dir for absolute Urls
             OUString aCWD, aTmpUrl;
             osl_getProcessWorkingDir( &aCWD.pData );
-
+            
             // get two temp file urls
             OString aRcTmp, aSysListTmp, aSysList;
             OUString aSysPath, aUrlDir;
@@ -890,7 +890,7 @@ ERRTYPE RscCompiler::Link()
                 if( osl_getAbsoluteFileURL( aCWD.pData, aTmpUrl.pData, &aUrlDir.pData ) != osl_File_E_None )
                     pTC->pEH->FatalError( ERR_OPENFILE, RscId(), do_prefix( "absolute url", aTmpUrl ) );
             }
-
+            
             if( osl_getSystemPathFromFileURL( aUrlDir.pData, &aSysPath.pData ) != osl_File_E_None )
                 pTC->pEH->FatalError( ERR_OPENFILE, RscId(), do_prefix( "sys path conversion", aUrlDir ) );
 
@@ -943,8 +943,8 @@ ERRTYPE RscCompiler::Link()
 #endif
             pTC->SetSysSearchPath( aSysSearchPath );
 
-            WriteRcContext  aContext;
-
+            WriteRcContext	aContext;
+            
             aContext.fOutput = foutput;
             aContext.aOutputRc = it->aOutputRc;
             aContext.aOutputSysList = aSysListTmp;
@@ -954,11 +954,11 @@ ERRTYPE RscCompiler::Link()
             if( aContext.aOutputSysList.getLength() )
             {
                 FILE* pSysListFile = fopen( aContext.aOutputSysList.getStr(), "wb" );
-
+                
                 if( !pSysListFile )
                     pTC->pEH->FatalError( ERR_OPENFILE, RscId(), aContext.aOutputSysList.getStr() );
                 else
-                    fclose( pSysListFile );
+                    fclose( pSysListFile ); 
             }
 
             // parse files for specific language
@@ -970,9 +970,9 @@ ERRTYPE RscCompiler::Link()
                     pTC->aFileTab.Seek( pFName );
                 }
             };
-
+            
             aError = pTC->WriteRc( aContext );
-
+            
             fclose( foutput );
             fExitFile = NULL;
             unlink( it->aOutputRc.GetBuffer() );
@@ -986,11 +986,11 @@ ERRTYPE RscCompiler::Link()
             }
             else
             {
-#ifdef UNX
+#ifdef UNX			
                 chmod( it->aOutputRc.GetBuffer(), S_IRWXU | S_IRWXG | S_IROTH );
 #endif
             }
-
+            
             unlink( aSysList.getStr() );
             if( rename( aSysListTmp.getStr(), aSysList.getStr() ) )
             {
@@ -1002,7 +1002,7 @@ ERRTYPE RscCompiler::Link()
             }
             else
             {
-#ifdef UNX
+#ifdef UNX			
                 chmod( aSysList.getStr(), S_IRWXU | S_IRWXG | S_IROTH );
 #endif
             }
@@ -1095,12 +1095,12 @@ ERRTYPE RscCompiler::Link()
 }
 
 /********************************************************************/
-/*                                                                  */
-/*  Function    :   Append( )                                       */
-/*                                                                  */
-/*  Parameters  :   psw     - pointer to a preprocessor switch      */
-/*                                                                  */
-/*  Description :   appends text files                              */
+/*																	*/
+/*	Function	:	Append( )										*/
+/*																	*/
+/*	Parameters	:	psw 	- pointer to a preprocessor switch		*/
+/*																	*/
+/*	Description :	appends text files								*/
 /********************************************************************/
 void RscCompiler::Append( const ByteString& rOutputSrs,
                           const ByteString& rTmpFile )
@@ -1115,11 +1115,11 @@ void RscCompiler::Append( const ByteString& rOutputSrs,
 }
 
 /********************************************************************/
-/*                                                                  */
-/*  Function    :   GetTmpFileName()                                */
-/*                                                                  */
-/*  Description :   Packt einen Dateinamen in Tmp-Dateiliste.       */
-/*                                                                  */
+/*																	*/
+/*	Function	:	GetTmpFileName()								*/
+/*																	*/
+/*	Description :	Packt einen Dateinamen in Tmp-Dateiliste.		*/
+/*																	*/
 /********************************************************************/
 ByteString RscCompiler::GetTmpFileName()
 {
@@ -1131,17 +1131,17 @@ ByteString RscCompiler::GetTmpFileName()
 }
 
 /********************************************************************/
-/*                                                                  */
-/*  Function    :   BOOL openinput()                                */
-/*                                                                  */
-/*  Description :   Check to see if the input file exists and can   */
-/*  be opened for reading.                                          */
+/*																	*/
+/*	Function	:	BOOL openinput()								*/
+/*																	*/
+/*	Description :	Check to see if the input file exists and can	*/
+/*	be opened for reading.											*/
 /********************************************************************/
 
 void RscCompiler::OpenInput( const ByteString& rInput )
 {
     FILE *fp;
-                        /* try to open the input file               */
+                        /* try to open the input file				*/
     if( NULL == (fp = fopen( rInput.GetBuffer(), "r")))
         pTC->pEH->FatalError( ERR_OPENFILE, RscId(), rInput.GetBuffer() );
 
@@ -1150,22 +1150,22 @@ void RscCompiler::OpenInput( const ByteString& rInput )
 
 /*************************************************************************
 |*
-|*    GetImageFilePath()
+|*	  GetImageFilePath()
 |*
 |*************************************************************************/
 
 bool RscCompiler::GetImageFilePath( const RscCmdLine::OutputFile& rOutputFile,
                                        const WriteRcContext& rContext,
-                                    const ByteString& rBaseFileName,
+                                    const ByteString& rBaseFileName, 
                                     ByteString& rImagePath,
                                     FILE* pSysListFile )
 {
-    ::std::list< ByteString >                   aFileNames;
-    bool                                        bFound = false;
-
-    ByteString  aFileName( rBaseFileName );
+    ::std::list< ByteString >					aFileNames;
+    bool       									bFound = false;
+    
+    ByteString 	aFileName( rBaseFileName );
     aFileNames.push_back( aFileName += ".png" );
-
+    
     aFileName = rBaseFileName;
     aFileNames.push_back( aFileName += ".bmp" );
 
@@ -1174,26 +1174,26 @@ bool RscCompiler::GetImageFilePath( const RscCmdLine::OutputFile& rOutputFile,
     while( ( aFileIter != aFileNames.end() ) && !bFound )
     {
         ::std::list< ByteString >::const_iterator aDirIter( rOutputFile.aSysSearchDirs.begin() );
-
+    
         while( ( aDirIter != rOutputFile.aSysSearchDirs.end() ) && !bFound )
         {
-            const DirEntry  aPath( String( *aDirIter, RTL_TEXTENCODING_ASCII_US ) );
-            DirEntry        aRelPath( aPath );
-            DirEntry        aAbsPath( aRelPath += DirEntry( String( *aFileIter, RTL_TEXTENCODING_ASCII_US ) ) );
-
+            const DirEntry	aPath( String( *aDirIter, RTL_TEXTENCODING_ASCII_US ) );
+            DirEntry 		aRelPath( aPath );
+            DirEntry 		aAbsPath( aRelPath += DirEntry( String( *aFileIter, RTL_TEXTENCODING_ASCII_US ) ) );
+            
             aAbsPath.ToAbs();
             const FileStat aFS( aAbsPath.GetFull() );
-
+            
 #if OSL_DEBUG_LEVEL > 1
             fprintf( stderr, "Searching image: %s\n", ByteString( aRelPath.GetFull(), RTL_TEXTENCODING_ASCII_US ).GetBuffer() );
 #endif
 
             if( aFS.IsKind( FSYS_KIND_FILE ) )
             {
-                std::list< std::pair< OString, OString > >::const_iterator  aReplIter( rContext.pCmdLine->m_aReplacements.begin() );
-                String                                                      aStr( aRelPath.GetFull() );
-                OString                                                     aRelPathStr( aStr.GetBuffer(), aStr.Len(), RTL_TEXTENCODING_ASCII_US );
-
+                std::list< std::pair< OString, OString > >::const_iterator 	aReplIter( rContext.pCmdLine->m_aReplacements.begin() );
+                String														aStr( aRelPath.GetFull() );
+                OString														aRelPathStr( aStr.GetBuffer(), aStr.Len(), RTL_TEXTENCODING_ASCII_US );
+                
                 while( ( aReplIter != rContext.pCmdLine->m_aReplacements.end() ) && !bFound )
                 {
                     ByteString aSearch( aReplIter->second );
@@ -1202,43 +1202,43 @@ bool RscCompiler::GetImageFilePath( const RscCmdLine::OutputFile& rOutputFile,
                     aSearchIn.ToLowerAscii();
                     if( aSearchIn.Search( aSearch ) == 0 )
                     {
-                        sal_Int32       nCopyPos = aReplIter->second.getLength(), nLength = aRelPathStr.getLength();
-                        const sal_Char* pChars = aRelPathStr.getStr();
-
+                        sal_Int32 		nCopyPos = aReplIter->second.getLength(), nLength = aRelPathStr.getLength();
+                        const sal_Char*	pChars = aRelPathStr.getStr();
+                        
                         while( ( nCopyPos < nLength ) && ( pChars[ nCopyPos ] == '/' || pChars[ nCopyPos ] == '\\' || pChars[ nCopyPos ] == ':' ) )
                         {
                             ++nCopyPos;
                         }
-
+                        
                         if( nCopyPos < nLength )
                             rImagePath = aRelPathStr.copy( nCopyPos ).replace( '\\', '/' );
-
+                                                        
                         bFound = true;
                     }
-
+                    
                     ++aReplIter;
                 }
-
+                
                 if( bFound && pSysListFile )
                 {
-                    DirEntry    aSysPath( String( *aDirIter, RTL_TEXTENCODING_ASCII_US ) );
-                    String      aSysPathFull( ( aSysPath += DirEntry( String( *aFileIter, RTL_TEXTENCODING_ASCII_US ) ) ).GetFull() );
-                    OString     aSysPathStr( aSysPathFull.GetBuffer(), aSysPathFull.Len(), RTL_TEXTENCODING_ASCII_US );
-
+                    DirEntry	aSysPath( String( *aDirIter, RTL_TEXTENCODING_ASCII_US ) );
+                    String		aSysPathFull( ( aSysPath += DirEntry( String( *aFileIter, RTL_TEXTENCODING_ASCII_US ) ) ).GetFull() );
+                    OString		aSysPathStr( aSysPathFull.GetBuffer(), aSysPathFull.Len(), RTL_TEXTENCODING_ASCII_US );
+                    
                     fprintf( pSysListFile, "%s\n", rContext.pCmdLine->substitutePaths( aSysPathStr ).getStr() );
                 }
-
+        
 #if OSL_DEBUG_LEVEL > 1
                 fprintf( stderr, "ImagePath to add: %s\n", rImagePath.GetBuffer() );
 #endif
             }
-
+            
             ++aDirIter;
         }
-
+        
         ++aFileIter;
     }
-
+    
     return bFound;
 }
 
@@ -1246,60 +1246,60 @@ bool RscCompiler::GetImageFilePath( const RscCmdLine::OutputFile& rOutputFile,
 
 void RscCompiler::PreprocessSrsFile( const RscCmdLine::OutputFile& rOutputFile,
                                         const WriteRcContext& rContext,
-                                       const DirEntry& rSrsInPath,
+                                       const DirEntry& rSrsInPath, 
                                        const DirEntry& rSrsOutPath )
 {
-    SvFileStream                aIStm( rSrsInPath.GetFull(), STREAM_READ );
-    SvFileStream                aOStm( rSrsOutPath.GetFull(), STREAM_WRITE | STREAM_TRUNC );
+    SvFileStream 				aIStm( rSrsInPath.GetFull(), STREAM_READ );
+    SvFileStream 				aOStm( rSrsOutPath.GetFull(), STREAM_WRITE | STREAM_TRUNC );
     ::std::vector< ByteString > aMissingImages;
-    FILE*                       pSysListFile = rContext.aOutputSysList.getLength() ? fopen( rContext.aOutputSysList.getStr(), "ab" ) : NULL;
-    bool                        bRet = true;
+    FILE* 						pSysListFile = rContext.aOutputSysList.getLength() ? fopen( rContext.aOutputSysList.getStr(), "ab" ) : NULL;
+    bool						bRet = true;
 
     if( !aIStm.GetError() && !aOStm.GetError() )
     {
         ByteString aLine, aFilePath;
-
+                            
         while( aIStm.ReadLine( aLine ) )
         {
             if( ( aLine.GetTokenCount( '=' ) == 2 ) &&
                 ( aLine.GetToken( 0, '=' ).Search( "File" ) != STRING_NOTFOUND ) )
             {
                 ByteString aBaseFileName( aLine.GetToken( 1, '"' ).GetToken( 0, '.' ) );
-
+                
                 if( GetImageFilePath( rOutputFile, rContext, aBaseFileName, aFilePath, pSysListFile ) )
                     ( ( aLine = "File = \"" ) += aFilePath ) += "\";";
                 else
                     aMissingImages.push_back( aBaseFileName );
-
+            
                 aOStm.WriteLine( aLine );
             }
             else if( aLine.Search( "ImageList" ) != STRING_NOTFOUND )
             {
                 ::std::vector< ::std::pair< ByteString, sal_Int32 > > aEntryVector;
-
+                
                 aOStm.WriteLine( aLine );
-
+            
                 if( aLine.Search( ';' ) == STRING_NOTFOUND )
                 {
                     const sal_uInt32 nImgListStartPos = aIStm.Tell();
-
+                    
                     do
                     {
                         if( !aIStm.ReadLine( aLine ) )
                             break;
                     }
                     while( aLine.Search( "Prefix" ) == STRING_NOTFOUND );
-
+                
                     const ByteString aPrefix( aLine.GetToken( 1, '"' ) );
                     aIStm.Seek( nImgListStartPos );
-
+    
                     do
                     {
                         if (!aIStm.ReadLine( aLine ) )
                             break;
                     }
                     while( aLine.Search( "IdList" ) == STRING_NOTFOUND );
-
+                
                     // scan all ids and collect images
                     while( aLine.Search( '}' ) == STRING_NOTFOUND )
                     {
@@ -1312,25 +1312,25 @@ void RscCompiler::PreprocessSrsFile( const RscCmdLine::OutputFile& rOutputFile,
 
                         if( aLine.IsNumericAscii() )
                         {
-                            ByteString  aBaseFileName( aPrefix );
-                            sal_Int32   nNumber = atoi( aLine.GetBuffer() );
+                            ByteString 	aBaseFileName( aPrefix );
+                            sal_Int32	nNumber = atoi( aLine.GetBuffer() );
 
                             if( nNumber < 10000 )
                                 aBaseFileName += ByteString::CreateFromInt32( 0 );
-
+                                
                             if( GetImageFilePath( rOutputFile, rContext, aBaseFileName += aLine , aFilePath, pSysListFile ) )
                                 aEntryVector.push_back( ::std::make_pair< ByteString, sal_Int32 >( aFilePath, nNumber ) );
                             else
                                 aMissingImages.push_back( aBaseFileName );
                         }
                     }
-
+                    
                     const sal_uInt32 nImgListEndPos = aIStm.Tell();
                     aIStm.Seek( nImgListStartPos );
                     while( aIStm.Tell() < nImgListEndPos )
                     {
                         aIStm.ReadLine( aLine );
-
+                        
                         if( aLine.Search( "IdList" ) != STRING_NOTFOUND )
                         {
                             while( aLine.Search( '}' ) == STRING_NOTFOUND )
@@ -1339,21 +1339,21 @@ void RscCompiler::PreprocessSrsFile( const RscCmdLine::OutputFile& rOutputFile,
                         else
                             aOStm.WriteLine( aLine );
                     }
-
+                    
                     aOStm.WriteLine( "FileList = {" );
-
+                    
                     for( sal_uInt32 i = 0; i < aEntryVector.size(); ++i )
                     {
                         ByteString aEntryString( "< \"" );
-
+                        
                         aEntryString += aEntryVector[ i ].first;
                         aEntryString += "\"; ";
                         aEntryString += ByteString::CreateFromInt32( aEntryVector[ i ].second );
                         aEntryString += "; >;";
-
+                        
                         aOStm.WriteLine( aEntryString );
                     }
-
+                    
                     aOStm.WriteLine( "};" );
                    }
                 else
@@ -1365,22 +1365,22 @@ void RscCompiler::PreprocessSrsFile( const RscCmdLine::OutputFile& rOutputFile,
     }
     else
         bRet = false;
-
+        
     if( aMissingImages.size() > 0 )
     {
         ByteString aImagesStr;
-
+        
         for( sal_uInt32 i = 0; i < aMissingImages.size(); ++i )
         {
             if( i )
                 aImagesStr += ' ';
-
+                
             aImagesStr += aMissingImages[ i ];
         }
-
+    
         pTC->pEH->FatalError( ERR_NOIMAGE, RscId(), aImagesStr.GetBuffer() );
     }
-
+    
     if( pSysListFile )
         fclose( pSysListFile );
 }
diff --git a/rsc/source/rscpp/cpp.h b/rsc/source/rscpp/cpp.h
index 11327d4fb9d1..2f0ec47c0413 100644
--- a/rsc/source/rscpp/cpp.h
+++ b/rsc/source/rscpp/cpp.h
@@ -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
@@ -37,12 +37,12 @@ extern FILE *pCppOut;                                   /* BP */
 #if OSL_DEBUG_LEVEL > 1
 extern FILE *pDefOut;                                   /* ER */
 #ifdef EVALDEFS
-#define NEVALBUF        2048
+#define NEVALBUF		2048
 #endif
 #endif
 
 /* limit for reading commandfiles */
-#define PARALIMIT       100
+#define	PARALIMIT		100
 
 #ifndef EOS
 /*
@@ -61,20 +61,20 @@ extern FILE *pDefOut;                                   /* ER */
 #define TOK_SEP         0x1E            /* Token concatenation delim.   */
 #define COM_SEP         0x1F            /* Magic comment separator      */
 
-#ifdef  EBCDIC
-#define HT              0x05            /* horizontal tab               */
-#define NL              0x15            /* new line                     */
-#define CR              0x0D            /* carriage return              */
-#define DEL             0x07
+#ifdef 	EBCDIC
+#define HT				0x05			/* horizontal tab				*/
+#define NL				0x15			/* new line						*/
+#define CR				0x0D			/* carriage return				*/
+#define DEL				0x07
 #else
-#define HT              0x09            /* horizontal tab               */
-#define NL              0x0A            /* new line                     */
-#define CR              0x0D            /* carriage return              */
-#define DEL             0x7F
+#define HT				0x09			/* horizontal tab				*/
+#define NL				0x0A			/* new line						*/
+#define CR				0x0D			/* carriage return				*/
+#define DEL				0x7F
 #endif
 
 
-#ifdef  SOLAR
+#ifdef 	SOLAR
 #define MAC_PARM        0x01            /* Macro formals start here     */
 #else
 /*
@@ -84,7 +84,7 @@ extern FILE *pDefOut;                                   /* ER */
  * value is reserved for string substitution.
  */
 
-#define MAC_PARM        DEL             /* Macro formals start here     */
+#define MAC_PARM        DEL				/* Macro formals start here     */
 #if PAR_MAC >= 33
         assertion fails -- PAR_MAC is not less than 33
 #endif
@@ -277,11 +277,11 @@ extern char     *workp;                 /* Free space in work           */
 #if OSL_DEBUG_LEVEL > 1
 extern int      debug;                  /* Debug level                  */
 /* ER dump & evaluate #define's */
-extern int      bDumpDefs;              /* TRUE if #define's dump req.  */
-extern int      bIsInEval;              /* TRUE if #define dumping now  */
+extern int      bDumpDefs;				/* TRUE if #define's dump req.  */
+extern int		bIsInEval;				/* TRUE if #define dumping now  */
 #ifdef EVALDEFS
-extern char     EvalBuf[NEVALBUF + 1];  /* evaluation buffer            */
-extern int      nEvalOff;               /* offset to free buffer pos    */
+extern char		EvalBuf[NEVALBUF + 1];	/* evaluation buffer            */
+extern int		nEvalOff;				/* offset to free buffer pos	*/
 #endif
 #endif
 extern int      keepcomments;           /* Don't remove comments if set */
diff --git a/rsc/source/rscpp/cpp1.c b/rsc/source/rscpp/cpp1.c
index 1eb7561a2db0..6688a79119a4 100644
--- a/rsc/source/rscpp/cpp1.c
+++ b/rsc/source/rscpp/cpp1.c
@@ -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
@@ -34,7 +34,7 @@ FILE *pCppOut = NULL;
 FILE *pCppIn  = NULL;
 
 #if OSL_DEBUG_LEVEL > 1
-FILE *pDefOut = NULL;       /* ER  evtl. #define's dump */
+FILE *pDefOut = NULL;		/* ER  evtl. #define's dump */
 #endif
 
 #ifdef B200
@@ -69,9 +69,9 @@ FILEINFO        *infile = NULL;         /* Current input file           */
 int             debug;                  /* TRUE if debugging now        */
 int             bDumpDefs;              /* TRUE if #define's dump req.  */
 #ifdef EVALDEFS
-int             bIsInEval;              /* TRUE if #define eval now     */
-char            EvalBuf[NEVALBUF + 1];  /* evaluation buffer            */
-int             nEvalOff = 0;           /* offset to free buffer pos    */
+int				bIsInEval;				/* TRUE if #define eval now		*/
+char			EvalBuf[NEVALBUF + 1];	/* evaluation buffer			*/
+int				nEvalOff = 0;			/* offset to free buffer pos	*/
 #endif
 #endif
 /*
@@ -348,7 +348,7 @@ nRunde++;
         default:
             exit(IO_ERROR);             /* Can't happen                 */
         }
-/*      if ( pfargv )
+/*		if ( pfargv )
         {
             for ( j=0;j++;j < PARALIMIT )
             {
diff --git a/rsc/source/rscpp/cpp2.c b/rsc/source/rscpp/cpp2.c
index 68d1d2dc72ba..a0980f204795 100644
--- a/rsc/source/rscpp/cpp2.c
+++ b/rsc/source/rscpp/cpp2.c
@@ -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
diff --git a/rsc/source/rscpp/cpp3.c b/rsc/source/rscpp/cpp3.c
index e9c03cdd4874..b0cd87114507 100644
--- a/rsc/source/rscpp/cpp3.c
+++ b/rsc/source/rscpp/cpp3.c
@@ -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
diff --git a/rsc/source/rscpp/cpp4.c b/rsc/source/rscpp/cpp4.c
index b8f90ab4f7ed..1b7461d5d4fb 100644
--- a/rsc/source/rscpp/cpp4.c
+++ b/rsc/source/rscpp/cpp4.c
@@ -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
diff --git a/rsc/source/rscpp/cpp5.c b/rsc/source/rscpp/cpp5.c
index 70f05543c465..fb2c57c4abe2 100644
--- a/rsc/source/rscpp/cpp5.c
+++ b/rsc/source/rscpp/cpp5.c
@@ -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
@@ -25,16 +25,16 @@
  *
  ************************************************************************/
 
-#include    <stdio.h>
-#include    <ctype.h>
-#include    "cppdef.h"
-#include    "cpp.h"
+#include	<stdio.h>
+#include	<ctype.h>
+#include	"cppdef.h"
+#include	"cpp.h"
 
 /*
  * Evaluate an #if expression.
  */
 
-static char *opname[] = {       /* For debug and error messages */
+static char	*opname[] = {		/* For debug and error messages	*/
 "end of expression", "val", "id",
   "+",   "-",  "*",  "/",  "%",
   "<<", ">>",  "&",  "|",  "^",
@@ -46,133 +46,133 @@ static char *opname[] = {       /* For debug and error messages */
 /*
  * opdope[] has the operator precedence:
  *     Bits
- *    7 Unused (so the value is always positive)
- *  6-2 Precedence (000x .. 017x)
- *  1-0 Binary op. flags:
- *      01  The binop flag should be set/cleared when this op is seen.
- *      10  The new value of the binop flag.
+ *	  7	Unused (so the value is always positive)
+ *	6-2	Precedence (000x .. 017x)
+ *	1-0	Binary op. flags:
+ *	    01	The binop flag should be set/cleared when this op is seen.
+ *	    10	The new value of the binop flag.
  * Note:  Expected, New binop
- * constant 0   1   Binop, end, or ) should follow constants
- * End of line  1   0   End may not be preceeded by an operator
- * binary   1   0   Binary op follows a value, value follows.
- * unary    0   0   Unary op doesn't follow a value, value follows
- *   (      0   0   Doesn't follow value, value or unop follows
- *   )      1   1   Follows value.  Op follows.
+ * constant	0	1	Binop, end, or ) should follow constants
+ * End of line	1	0	End may not be preceeded by an operator
+ * binary	1	0	Binary op follows a value, value follows.
+ * unary	0	0	Unary op doesn't follow a value, value follows
+ *   (		0	0	Doesn't follow value, value or unop follows
+ *   )		1	1	Follows value.  Op follows.
  */
 
-static char opdope[OP_MAX] = {
-  0001,                 /* End of expression        */
-  0002,                 /* Digit            */
-  0000,                 /* Letter (identifier)      */
-  0141, 0141, 0151, 0151, 0151,     /* ADD, SUB, MUL, DIV, MOD  */
-  0131, 0131, 0101, 0071, 0071,     /* ASL, ASR, AND,  OR, XOR  */
-  0111, 0111, 0121, 0121, 0121, 0121,   /*  EQ,  NE,  LT,  LE,  GE,  GT */
-  0061, 0051, 0041, 0041, 0031,     /* ANA, ORO, QUE, COL, CMA  */
+static char	opdope[OP_MAX] = {
+  0001,					/* End of expression		*/
+  0002,					/* Digit			*/
+  0000,					/* Letter (identifier)		*/
+  0141, 0141, 0151, 0151, 0151,		/* ADD, SUB, MUL, DIV, MOD	*/
+  0131, 0131, 0101, 0071, 0071,		/* ASL, ASR, AND,  OR, XOR	*/
+  0111, 0111, 0121, 0121, 0121,	0121,	/*  EQ,  NE,  LT,  LE,  GE,  GT	*/
+  0061, 0051, 0041, 0041, 0031,		/* ANA, ORO, QUE, COL, CMA	*/
 /*
  * Unary op's follow
  */
-  0160, 0160, 0160, 0160,       /* NEG, PLU, COM, NOT       */
-  0170, 0013, 0023,         /* LPA, RPA, END        */
+  0160, 0160, 0160, 0160,		/* NEG, PLU, COM, NOT		*/
+  0170, 0013, 0023,			/* LPA, RPA, END		*/
 };
 /*
  * OP_QUE and OP_RPA have alternate precedences:
  */
-#define OP_RPA_PREC 0013
-#define OP_QUE_PREC 0034
+#define	OP_RPA_PREC	0013
+#define OP_QUE_PREC	0034
 
 /*
  * S_ANDOR and S_QUEST signal "short-circuit" boolean evaluation, so that
- *  #if FOO != 0 && 10 / FOO ...
+ *	#if FOO != 0 && 10 / FOO ...
  * doesn't generate an error message.  They are stored in optab.skip.
  */
-#define S_ANDOR     2
-#define S_QUEST     1
+#define S_ANDOR		2
+#define S_QUEST		1
 
 typedef struct optab {
-    char    op;         /* Operator         */
-    char    prec;           /* Its precedence       */
-    char    skip;           /* Short-circuit: TRUE to skip  */
+    char	op;			/* Operator			*/
+    char	prec;			/* Its precedence		*/
+    char	skip;			/* Short-circuit: TRUE to skip	*/
 } OPTAB;
-static int  evalue;         /* Current value from evallex() */
+static int	evalue;			/* Current value from evallex()	*/
 
-#ifdef  nomacargs
+#ifdef	nomacargs
 FILE_LOCAL int
 isbinary(op)
-register int    op;
+register int	op;
 {
     return (op >= FIRST_BINOP && op <= LAST_BINOP);
 }
 
 FILE_LOCAL int
 isunary(op)
-register int    op;
+register int	op;
 {
     return (op >= FIRST_UNOP && op <= LAST_UNOP);
 }
 #else
-#define isbinary(op)    (op >= FIRST_BINOP && op <= LAST_BINOP)
-#define isunary(op) (op >= FIRST_UNOP  && op <= LAST_UNOP)
+#define	isbinary(op)	(op >= FIRST_BINOP && op <= LAST_BINOP)
+#define	isunary(op)	(op >= FIRST_UNOP  && op <= LAST_UNOP)
 #endif
 
 /*
  * The following definitions are used to specify basic variable sizes.
  */
 
-#ifndef S_CHAR
-#define S_CHAR      (sizeof (char))
+#ifndef	S_CHAR
+#define	S_CHAR		(sizeof (char))
 #endif
-#ifndef S_SINT
-#define S_SINT      (sizeof (short int))
+#ifndef	S_SINT
+#define	S_SINT		(sizeof (short int))
 #endif
-#ifndef S_INT
-#define S_INT       (sizeof (int))
+#ifndef	S_INT
+#define	S_INT		(sizeof (int))
 #endif
-#ifndef S_LINT
-#define S_LINT      (sizeof (long int))
+#ifndef	S_LINT
+#define	S_LINT		(sizeof (long int))
 #endif
-#ifndef S_FLOAT
-#define S_FLOAT     (sizeof (float))
+#ifndef	S_FLOAT
+#define	S_FLOAT		(sizeof (float))
 #endif
-#ifndef S_DOUBLE
-#define S_DOUBLE    (sizeof (double))
+#ifndef	S_DOUBLE
+#define	S_DOUBLE	(sizeof (double))
 #endif
-#ifndef S_PCHAR
-#define S_PCHAR     (sizeof (char *))
+#ifndef	S_PCHAR
+#define	S_PCHAR		(sizeof (char *))
 #endif
-#ifndef S_PSINT
-#define S_PSINT     (sizeof (short int *))
+#ifndef	S_PSINT
+#define	S_PSINT		(sizeof (short int *))
 #endif
-#ifndef S_PINT
-#define S_PINT      (sizeof (int *))
+#ifndef	S_PINT
+#define	S_PINT		(sizeof (int *))
 #endif
-#ifndef S_PLINT
-#define S_PLINT     (sizeof (long int *))
+#ifndef	S_PLINT
+#define	S_PLINT		(sizeof (long int *))
 #endif
-#ifndef S_PFLOAT
-#define S_PFLOAT    (sizeof (float *))
+#ifndef	S_PFLOAT
+#define	S_PFLOAT	(sizeof (float *))
 #endif
-#ifndef S_PDOUBLE
-#define S_PDOUBLE   (sizeof (double *))
+#ifndef	S_PDOUBLE
+#define	S_PDOUBLE	(sizeof (double *))
 #endif
-#ifndef S_PFPTR
-#define S_PFPTR     (sizeof (int (*)()))
+#ifndef	S_PFPTR
+#define S_PFPTR		(sizeof (int (*)()))
 #endif
 
 typedef struct types {
-    short   type;           /* This is the bit if       */
-    char    *name;          /* this is the token word   */
+    short	type;			/* This is the bit if		*/
+    char	*name;			/* this is the token word	*/
 } TYPES;
 
 static TYPES basic_types[] = {
-    { T_CHAR,   "char",     },
-    { T_INT,    "int",      },
-    { T_FLOAT,  "float",    },
-    { T_DOUBLE, "double",   },
-    { T_SHORT,  "short",    },
-    { T_LONG,   "long",     },
-    { T_SIGNED, "signed",   },
-    { T_UNSIGNED,   "unsigned", },
-    { 0,        NULL,       },  /* Signal end       */
+    { T_CHAR,	"char",		},
+    { T_INT,	"int",		},
+    { T_FLOAT,	"float",	},
+    { T_DOUBLE,	"double",	},
+    { T_SHORT,	"short",	},
+    { T_LONG,	"long",		},
+    { T_SIGNED,	"signed",	},
+    { T_UNSIGNED,	"unsigned",	},
+    { 0,		NULL,		},	/* Signal end		*/
 };
 
 /*
@@ -183,24 +183,24 @@ static short test_table[] = {
     T_FLOAT | T_DOUBLE | T_CHAR | T_INT,
     T_FLOAT | T_DOUBLE | T_SIGNED | T_UNSIGNED,
     T_LONG  | T_SHORT  | T_CHAR,
-    0                       /* end marker   */
+    0						/* end marker	*/
 };
 
 /*
  * The order of this table is important -- it is also referenced by
  * the command line processor to allow run-time overriding of the
  * built-in size values.  The order must not be changed:
- *  char, short, int, long, float, double (func pointer)
+ *	char, short, int, long, float, double (func pointer)
  */
 SIZES size_table[] = {
-    { T_CHAR,   S_CHAR,     S_PCHAR     },  /* char     */
-    { T_SHORT,  S_SINT,     S_PSINT     },  /* short int    */
-    { T_INT,    S_INT,      S_PINT      },  /* int      */
-    { T_LONG,   S_LINT,     S_PLINT     },  /* long     */
-    { T_FLOAT,  S_FLOAT,    S_PFLOAT    },  /* float    */
-    { T_DOUBLE, S_DOUBLE,   S_PDOUBLE   },  /* double   */
-    { T_FPTR,   0,      S_PFPTR     },  /* int (*())    */
-    { 0,    0,      0       },  /* End of table */
+    { T_CHAR,	S_CHAR,		S_PCHAR		},	/* char		*/
+    { T_SHORT,	S_SINT,		S_PSINT		},	/* short int	*/
+    { T_INT,	S_INT,		S_PINT		},	/* int		*/
+    { T_LONG,	S_LINT,		S_PLINT		},	/* long		*/
+    { T_FLOAT,	S_FLOAT,	S_PFLOAT	},	/* float	*/
+    { T_DOUBLE,	S_DOUBLE,	S_PDOUBLE	},	/* double	*/
+    { T_FPTR,	0,		S_PFPTR		},	/* int (*()) 	*/
+    { 0,	0,		0		},	/* End of table	*/
 };
 
 
@@ -217,49 +217,49 @@ eval()
  * Evaluate an expression.  Straight-forward operator precedence.
  * This is called from control() on encountering an #if statement.
  * It calls the following routines:
- * evallex  Lexical analyser -- returns the type and value of
- *      the next input token.
- * evaleval Evaluate the current operator, given the values on
- *      the value stack.  Returns a pointer to the (new)
- *      value stack.
+ * evallex	Lexical analyser -- returns the type and value of
+ *		the next input token.
+ * evaleval	Evaluate the current operator, given the values on
+ *		the value stack.  Returns a pointer to the (new)
+ *		value stack.
  * For compatiblity with older cpp's, this return returns 1 (TRUE)
  * if a syntax error is detected.
  */
 {
-    register int    op;     /* Current operator     */
-    register int    *valp;      /* -> value vector      */
-    register OPTAB  *opp;       /* Operator stack       */
-    int     prec;       /* Op precedence        */
-    int     binop;      /* Set if binary op. needed */
-    int     op1;        /* Operand from stack       */
-    int     skip;       /* For short-circuit testing    */
-    int     value[NEXP];    /* Value stack          */
-    OPTAB       opstack[NEXP];  /* Operand stack        */
+    register int	op;		/* Current operator		*/
+    register int	*valp;		/* -> value vector		*/
+    register OPTAB	*opp;		/* Operator stack		*/
+    int		prec;		/* Op precedence		*/
+    int		binop;		/* Set if binary op. needed	*/
+    int		op1;		/* Operand from stack		*/
+    int		skip;		/* For short-circuit testing	*/
+    int		value[NEXP];	/* Value stack			*/
+    OPTAB		opstack[NEXP];	/* Operand stack		*/
 #ifndef ZTC  /* BP */
     extern int  *evaleval();    /* Does actual evaluation   */
 #endif
     valp = value;
     opp = opstack;
-    opp->op = OP_END;       /* Mark bottom of stack     */
-    opp->prec = opdope[OP_END]; /* And its precedence       */
-    opp->skip = 0;          /* Not skipping now     */
+    opp->op = OP_END;		/* Mark bottom of stack		*/
+    opp->prec = opdope[OP_END];	/* And its precedence		*/
+    opp->skip = 0;			/* Not skipping now		*/
     binop = 0;
-again:  ;
-#ifdef  DEBUG_EVAL
+again:	;
+#ifdef	DEBUG_EVAL
     fprintf( pCppOut, "In #if at again: skip = %d, binop = %d, line is: %s",
         opp->skip, binop, infile->bptr);
 #endif
     if ((op = evallex(opp->skip)) == OP_SUB && binop == 0)
-        op = OP_NEG;            /* Unary minus      */
+        op = OP_NEG;			/* Unary minus		*/
     else if (op == OP_ADD && binop == 0)
-        op = OP_PLU;            /* Unary plus       */
+        op = OP_PLU;			/* Unary plus		*/
     else if (op == OP_FAIL)
-        return (1);             /* Error in evallex */
-#ifdef  DEBUG_EVAL
+        return (1);				/* Error in evallex	*/
+#ifdef	DEBUG_EVAL
     fprintf( pCppOut, "op = %s, opdope = %03o, binop = %d, skip = %d\n",
         opname[op], opdope[op], binop, opp->skip);
 #endif
-    if (op == DIG) {            /* Value?       */
+    if (op == DIG) {			/* Value?		*/
         if (binop != 0) {
         cerror("misplaced constant in #if", NULLST);
         return (1);
@@ -269,7 +269,7 @@ again:  ;
         return (1);
         }
         else {
-#ifdef  DEBUG_EVAL
+#ifdef	DEBUG_EVAL
         fprintf( pCppOut, "pushing %d onto value stack[%d]\n",
             evalue, valp - value);
 #endif
@@ -289,7 +289,7 @@ again:  ;
     }
     binop = (prec & 2) >> 1;
     for (;;) {
-#ifdef  DEBUG_EVAL
+#ifdef	DEBUG_EVAL
         fprintf( pCppOut, "op %s, prec %d., stacked op %s, prec %d, skip %d\n",
         opname[op], prec, opname[opp->op], opp->prec, opp->skip);
 #endif
@@ -298,7 +298,7 @@ again:  ;
             prec = OP_RPA_PREC;
         else if (op == OP_QUE)
             prec = OP_QUE_PREC;
-        op1 = opp->skip;        /* Save skip for test   */
+        op1 = opp->skip;		/* Save skip for test	*/
         /*
          * Push operator onto op. stack.
          */
@@ -310,24 +310,24 @@ again:  ;
         }
         opp->op = (char)op;
         opp->prec = (char)prec;
-        skip = (valp[-1] != 0);     /* Short-circuit tester */
+        skip = (valp[-1] != 0);		/* Short-circuit tester	*/
         /*
          * Do the short-circuit stuff here.  Short-circuiting
          * stops automagically when operators are evaluated.
          */
         if ((op == OP_ANA && !skip)
          || (op == OP_ORO && skip))
-            opp->skip = S_ANDOR;    /* And/or skip starts   */
-        else if (op == OP_QUE)      /* Start of ?: operator */
+            opp->skip = S_ANDOR;	/* And/or skip starts	*/
+        else if (op == OP_QUE)		/* Start of ?: operator	*/
             opp->skip = (char)((op1 & S_ANDOR) | ((!skip) ? S_QUEST : 0));
-        else if (op == OP_COL) {    /* : inverts S_QUEST    */
+        else if (op == OP_COL) {	/* : inverts S_QUEST	*/
             opp->skip = (char)((op1 & S_ANDOR)
                   | (((op1 & S_QUEST) != 0) ? 0 : S_QUEST));
         }
-        else {              /* Other ops leave  */
-            opp->skip = (char)op1;      /*  skipping unchanged. */
+        else {				/* Other ops leave	*/
+            opp->skip = (char)op1;		/*  skipping unchanged.	*/
         }
-#ifdef  DEBUG_EVAL
+#ifdef	DEBUG_EVAL
         fprintf( pCppOut, "stacking %s, valp[-1] == %d at %s",
             opname[op], valp[-1], infile->bptr);
         dumpstack(opstack, opp, value, valp);
@@ -338,27 +338,27 @@ again:  ;
          * Pop operator from op. stack and evaluate it.
          * End of stack and '(' are specials.
          */
-        skip = opp->skip;           /* Remember skip value  */
-        switch ((op1 = opp->op)) {      /* Look at stacked op   */
-        case OP_END:            /* Stack end marker */
+        skip = opp->skip;			/* Remember skip value	*/
+        switch ((op1 = opp->op)) {		/* Look at stacked op	*/
+        case OP_END:			/* Stack end marker	*/
         if (op == OP_EOE)
-            return (valp[-1]);      /* Finished ok.     */
-        goto again;         /* Read another op. */
+            return (valp[-1]);		/* Finished ok.		*/
+        goto again;			/* Read another op.	*/
 
-        case OP_LPA:            /* ( on stack       */
-        if (op != OP_RPA) {     /* Matches ) on input   */
+        case OP_LPA:			/* ( on stack		*/
+        if (op != OP_RPA) {		/* Matches ) on input	*/
             cerror("unbalanced paren's, op is \"%s\"", opname[op]);
             return (1);
         }
-        opp--;              /* Unstack it       */
-        /* goto again;          -- Fall through     */
+        opp--;				/* Unstack it		*/
+        /* goto again;			-- Fall through		*/
 
         case OP_QUE:
-        goto again;         /* Evaluate true expr.  */
+        goto again;			/* Evaluate true expr.	*/
 
-        case OP_COL:            /* : on stack.      */
-        opp--;              /* Unstack :        */
-        if (opp->op != OP_QUE) {    /* Matches ? on stack?  */
+        case OP_COL:			/* : on stack.		*/
+        opp--;				/* Unstack :		*/
+        if (opp->op != OP_QUE) {	/* Matches ? on stack?	*/
             cerror("Misplaced '?' or ':', previous operator is %s",
                    opname[(int)opp->op]);
             return (1);
@@ -366,19 +366,19 @@ again:  ;
         /*
          * Evaluate op1.
          */
-        default:                /* Others:      */
-        opp--;              /* Unstack the operator */
-#ifdef  DEBUG_EVAL
+        default:				/* Others:		*/
+        opp--;				/* Unstack the operator	*/
+#ifdef	DEBUG_EVAL
         fprintf( pCppOut, "Stack before evaluation of %s\n", opname[op1]);
         dumpstack(opstack, opp, value, valp);
 #endif
         valp = evaleval(valp, op1, skip);
-#ifdef  DEBUG_EVAL
+#ifdef	DEBUG_EVAL
         fprintf( pCppOut, "Stack after evaluation\n");
         dumpstack(opstack, opp, value, valp);
 #endif
-        }                   /* op1 switch end   */
-    }                   /* Stack unwind loop    */
+        }					/* op1 switch end	*/
+    }					/* Stack unwind loop	*/
 }
 
 FILE_LOCAL int
@@ -387,20 +387,20 @@ evallex(int skip)
  * Return next eval operator or value.  Called from eval().  It
  * calls a special-purpose routines for 'char' strings and
  * numeric values:
- * evalchar called to evaluate 'x'
- * evalnum  called to evaluate numbers.
+ * evalchar	called to evaluate 'x'
+ * evalnum	called to evaluate numbers.
  */
 {
-    register int    c, c1, t;
+    register int	c, c1, t;
 
-again:  do {                    /* Collect the token    */
+again:  do {					/* Collect the token	*/
         c = skipws();
         if ((c = macroid(c)) == EOF_CHAR || c == '\n') {
         unget();
-        return (OP_EOE);        /* End of expression    */
+        return (OP_EOE);		/* End of expression	*/
         }
     } while ((t = type[c]) == LET && catenate());
-    if (t == INV) {             /* Total nonsense   */
+    if (t == INV) {				/* Total nonsense	*/
         if (!skip) {
         if (isascii(c) && isprint(c))
             cierror("illegal character '%c' in #if", c);
@@ -409,38 +409,38 @@ again:  do {                    /* Collect the token    */
         }
         return (OP_FAIL);
     }
-    else if (t == QUO) {            /* ' or "       */
-        if (c == '\'') {            /* Character constant   */
-        evalue = evalchar(skip);    /* Somewhat messy   */
-#ifdef  DEBUG_EVAL
+    else if (t == QUO) {			/* ' or "		*/
+        if (c == '\'') {			/* Character constant	*/
+        evalue = evalchar(skip);	/* Somewhat messy	*/
+#ifdef	DEBUG_EVAL
         fprintf( pCppOut, "evalchar returns %d.\n", evalue);
 #endif
-        return (DIG);           /* Return a value   */
+        return (DIG);			/* Return a value	*/
         }
         cerror("Can't use a string in an #if", NULLST);
         return (OP_FAIL);
     }
-    else if (t == LET) {            /* ID must be a macro   */
-        if (streq(token, "defined")) {  /* Or defined name  */
+    else if (t == LET) {			/* ID must be a macro	*/
+        if (streq(token, "defined")) {	/* Or defined name	*/
         c1 = c = skipws();
-        if (c == '(')           /* Allow defined(name)  */
+        if (c == '(')			/* Allow defined(name)	*/
             c = skipws();
         if (type[c] == LET) {
             evalue = (lookid(c) != NULL);
-            if (c1 != '('       /* Need to balance  */
-             || skipws() == ')')    /* Did we balance?  */
-            return (DIG);       /* Parsed ok        */
+            if (c1 != '('		/* Need to balance	*/
+             || skipws() == ')')	/* Did we balance?	*/
+            return (DIG);		/* Parsed ok		*/
         }
         cerror("Bad #if ... defined() syntax", NULLST);
         return (OP_FAIL);
         }
-        else if (streq(token, "sizeof"))    /* New sizeof hackery   */
-        return (dosizeof());        /* Gets own routine */
+        else if (streq(token, "sizeof"))	/* New sizeof hackery	*/
+        return (dosizeof());		/* Gets own routine	*/
         /*
          * The Draft ANSI C Standard says that an undefined symbol
          * in an #if has the value zero.  We are a bit pickier,
          * warning except where the programmer was careful to write
-         *      #if defined(foo) ? foo : 0
+         * 		#if defined(foo) ? foo : 0
          */
 #ifdef STRICT_UNDEF
         if (!skip)
@@ -449,9 +449,9 @@ again:  do {                    /* Collect the token    */
         evalue = 0;
         return (DIG);
     }
-    else if (t == DIG) {            /* Numbers are harder   */
+    else if (t == DIG) {			/* Numbers are harder	*/
         evalue = evalnum(c);
-#ifdef  DEBUG_EVAL
+#ifdef	DEBUG_EVAL
         fprintf( pCppOut, "evalnum returns %d.\n", evalue);
 #endif
     }
@@ -459,7 +459,7 @@ again:  do {                    /* Collect the token    */
         /*
          * Process a possible multi-byte lexeme.
          */
-        c1 = cget();            /* Peek at next char    */
+        c1 = cget();			/* Peek at next char	*/
         switch (c) {
         case '!':
         if (c1 == '=')
@@ -467,7 +467,7 @@ again:  do {                    /* Collect the token    */
         break;
 
         case '=':
-        if (c1 != '=') {        /* Can't say a=b in #if */
+        if (c1 != '=') {		/* Can't say a=b in #if	*/
             unget();
             cerror("= not allowed in #if", NULLST);
             return (OP_FAIL);
@@ -489,7 +489,7 @@ again:  do {                    /* Collect the token    */
         break;
 
         case '\\':
-        if (c1 == '\n')         /* Multi-line if    */
+        if (c1 == '\n')			/* Multi-line if	*/
             goto again;
         cerror("Unexpected \\ in #if", NULLST);
         return (OP_FAIL);
@@ -504,15 +504,15 @@ dosizeof()
 /*
  * Process the sizeof (basic type) operation in an #if string.
  * Sets evalue to the size and returns
- *  DIG     success
- *  OP_FAIL     bad parse or something.
+ *	DIG		success
+ *	OP_FAIL		bad parse or something.
  */
 {
-    register int    c;
-    register TYPES  *tp;
-    register SIZES  *sizp;
-    register short  *testp;
-    short       typecode;
+    register int	c;
+    register TYPES	*tp;
+    register SIZES	*sizp;
+    register short	*testp;
+    short		typecode;
 
     if ((c = skipws()) != '(')
         goto nogood;
@@ -522,23 +522,23 @@ dosizeof()
     typecode = 0;
     while (0 != (c = skipws())) {
         if ((c = macroid(c)) == EOF_CHAR || c == '\n')
-        goto nogood;            /* End of line is a bug */
-        else if (c == '(') {        /* thing (*)() func ptr */
+        goto nogood;			/* End of line is a bug	*/
+        else if (c == '(') {		/* thing (*)() func ptr	*/
         if (skipws() == '*'
-         && skipws() == ')') {      /* We found (*)     */
-            if (skipws() != '(')    /* Let () be optional   */
+         && skipws() == ')') {		/* We found (*)		*/
+            if (skipws() != '(')	/* Let () be optional	*/
             unget();
             else if (skipws() != ')')
             goto nogood;
-            typecode |= T_FPTR;     /* Function pointer */
+            typecode |= T_FPTR;		/* Function pointer	*/
         }
-        else {              /* Junk is a bug    */
+        else {				/* Junk is a bug	*/
             goto nogood;
         }
         }
-        else if (type[c] != LET)        /* Exit if not a type   */
+        else if (type[c] != LET)		/* Exit if not a type	*/
         break;
-        else if (!catenate()) {     /* Maybe combine tokens */
+        else if (!catenate()) {		/* Maybe combine tokens	*/
         /*
          * Look for this unexpandable token in basic_types.
          * The code accepts "int long" as well as "long int"
@@ -553,7 +553,7 @@ dosizeof()
             cerror("#if sizeof, unknown type \"%s\"", token);
             return (OP_FAIL);
         }
-        typecode |= tp->type;       /* Or in the type bit   */
+        typecode |= tp->type;		/* Or in the type bit	*/
         }
     }
     /*
@@ -563,7 +563,7 @@ dosizeof()
         typecode |= T_PTR;
         c = skipws();
     }
-    if (c == ')') {             /* Last syntax check    */
+    if (c == ')') {				/* Last syntax check	*/
         for (testp = test_table; *testp != 0; testp++) {
         if (!bittest(typecode & *testp)) {
             cerror("#if ... sizeof: illegal type combination", NULLST);
@@ -572,13 +572,13 @@ dosizeof()
         }
         /*
          * We assume that all function pointers are the same size:
-         *      sizeof (int (*)()) == sizeof (float (*)())
+         *		sizeof (int (*)()) == sizeof (float (*)())
          * We assume that signed and unsigned don't change the size:
-         *      sizeof (signed int) == (sizeof unsigned int)
+         *		sizeof (signed int) == (sizeof unsigned int)
          */
-        if ((typecode & T_FPTR) != 0)   /* Function pointer */
+        if ((typecode & T_FPTR) != 0)	/* Function pointer	*/
         typecode = T_FPTR | T_PTR;
-        else {              /* Var or var * datum   */
+        else {				/* Var or var * datum	*/
         typecode &= ~(T_SIGNED | T_UNSIGNED);
         if ((typecode & (T_SHORT | T_LONG)) != 0)
             typecode &= ~T_INT;
@@ -596,12 +596,12 @@ dosizeof()
             ? sizp->psize : sizp->size;
             return (DIG);
         }
-        }                   /* We shouldn't fail    */
+        }					/* We shouldn't fail	*/
         cierror("#if ... sizeof: bug, unknown type code 0x%x", typecode);
         return (OP_FAIL);
     }
 
-nogood: unget();
+nogood:	unget();
     cerror("#if ... sizeof() syntax error", NULLST);
     return (OP_FAIL);
 }
@@ -629,9 +629,9 @@ evalnum(int c)
  * the unsigned suffix, but only returns a signed int value.
  */
 {
-    register int    value;
-    register int    base;
-    register int    c1;
+    register int	value;
+    register int	base;
+    register int	c1;
 
     if (c != '0')
         base = 10;
@@ -646,7 +646,7 @@ evalnum(int c)
         if (isascii(c) && isupper(c1))
         c1 = tolower(c1);
 #ifdef EBCDIC
-        if (c1 <= 'f')
+        if (c1 <= 'f') 
 #else
         if (c1 >= 'a')
 #endif
@@ -658,7 +658,7 @@ evalnum(int c)
         value += c1;
         c = cget();
     }
-    if (c == 'u' || c == 'U')   /* Unsigned nonsense        */
+    if (c == 'u' || c == 'U')	/* Unsigned nonsense		*/
         c = cget();
     unget();
     return (value);
@@ -670,18 +670,18 @@ evalchar(int skip)
  * Get a character constant
  */
 {
-    register int    c;
-    register int    value;
-    register int    count;
+    register int	c;
+    register int	value;
+    register int	count;
 
     instring = TRUE;
     if ((c = cget()) == '\\') {
         switch ((c = cget())) {
-        case 'a':               /* New in Standard  */
+        case 'a':				/* New in Standard	*/
 #if ('a' == '\a' || '\a' == ALERT)
-        value = ALERT;          /* Use predefined value */
+        value = ALERT;			/* Use predefined value	*/
 #else
-        value = '\a';           /* Use compiler's value */
+        value = '\a';			/* Use compiler's value	*/
 #endif
         break;
 
@@ -705,15 +705,15 @@ evalchar(int skip)
         value = '\t';
         break;
 
-        case 'v':               /* New in Standard  */
+        case 'v':				/* New in Standard	*/
 #if ('v' == '\v' || '\v' == VT)
-        value = VT;         /* Use predefined value */
+        value = VT;			/* Use predefined value	*/
 #else
-        value = '\v';           /* Use compiler's value */
+        value = '\v';			/* Use compiler's value	*/
 #endif
         break;
 
-        case 'x':               /* '\xFF'       */
+        case 'x':				/* '\xFF'		*/
         count = 3;
         value = 0;
         while ((((c = get()) >= '0' && c <= '9')
@@ -782,12 +782,12 @@ evaleval(int* valp, int op, int skip)
  * evaleval() returns the new pointer to the top of the value stack.
  */
 {
-    register int    v1, v2 = 0;
+    register int	v1, v2 = 0;
 
     if (isbinary(op))
         v2 = *--valp;
     v1 = *--valp;
-#ifdef  DEBUG_EVAL
+#ifdef	DEBUG_EVAL
     fprintf( pCppOut, "%s op %s", (isbinary(op)) ? "binary" : "unary",
         opname[op]);
     if (isbinary(op))
@@ -908,12 +908,12 @@ evaleval(int* valp, int op, int skip)
     return (valp);
 }
 
-#ifdef  DEBUG_EVAL
+#ifdef	DEBUG_EVAL
 dumpstack(opstack, opp, value, valp)
-OPTAB       opstack[NEXP];  /* Operand stack        */
-register OPTAB  *opp;       /* Operator stack       */
-int     value[NEXP];    /* Value stack          */
-register int    *valp;      /* -> value vector      */
+OPTAB		opstack[NEXP];	/* Operand stack		*/
+register OPTAB	*opp;		/* Operator stack		*/
+int		value[NEXP];	/* Value stack			*/
+register int	*valp;		/* -> value vector		*/
 {
     fprintf( pCppOut, "index op prec skip name -- op stack at %s", infile->bptr);
     while (opp > opstack) {
diff --git a/rsc/source/rscpp/cpp6.c b/rsc/source/rscpp/cpp6.c
index fd2a2a9a0dd7..70c3b9a00976 100644
--- a/rsc/source/rscpp/cpp6.c
+++ b/rsc/source/rscpp/cpp6.c
@@ -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
@@ -660,7 +660,7 @@ void dumpdef(char *why)
         register DEFBUF         **syp;
         FILE *pRememberOut = NULL;
 
-        if ( bDumpDefs )    /*ER */
+        if ( bDumpDefs )	/*ER */
         {
             pRememberOut = pCppOut;
             pCppOut = pDefOut;
@@ -730,7 +730,7 @@ void dumpadef(char *why, register DEFBUF *dp)
                 EVALTYPE valEval;
 
                 bIsInEval = 1;
-                infile = NULL;          /* start from scrap */
+                infile = NULL;			/* start from scrap */
                 line = 0;
                 wrongline = 0;
                 *token = EOS;
@@ -740,7 +740,7 @@ void dumpadef(char *why, register DEFBUF *dp)
                 strcpy( file->buffer, dp->repl );
                 fprintf( pCppOut, " ===> ");
                 nEvalOff = 0;
-                cppmain();              /* get() frees also *file */
+                cppmain();				/* get() frees also *file */
                 valEval = 0;
                 if ( 0 == evaluate( EvalBuf, &valEval ) )
                 {
@@ -872,8 +872,8 @@ newline:
             }
         }
 #if (HOST == SYS_UNIX)
-/*ER*/  if (c == '\r')
-/*ER*/      return get();                       /* DOS fuck             */
+/*ER*/	if (c == '\r')
+/*ER*/		return get();						/* DOS fuck				*/
 #endif
         if (c == '\n')                          /* Maintain current     */
             ++line;                             /* line counter         */
@@ -983,7 +983,7 @@ newline:
         }
         else if (c == '\f' || c == VT)          /* Form Feed, Vertical  */
             c = ' ';                            /* Tab are whitespace   */
-        else if (c == 0xef)                     /* eat up UTF-8 BOM */
+        else if (c == 0xef)						/* eat up UTF-8 BOM */
         {
             if((c = get()) == 0xbb)
             {
diff --git a/rsc/source/rscpp/cppdef.h b/rsc/source/rscpp/cppdef.h
index cdbf07766c8f..47b27adc531a 100644
--- a/rsc/source/rscpp/cppdef.h
+++ b/rsc/source/rscpp/cppdef.h
@@ -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
@@ -292,7 +292,7 @@
  * NINCLUDE     The number of directories that may be specified
  *              on a per-system basis, or by the -I option.
  * BLK_NEST     The number of nested #if's permitted.
- * NFWORK       FileNameWorkBuffer (added by erAck, was NWORK)
+ * NFWORK		FileNameWorkBuffer (added by erAck, was NWORK)
  */
 
 #ifndef IDMAX
@@ -312,7 +312,7 @@
  da wir bald 10 Sprachen haben werden gleich ordentlich reingehauen.. */
 #define NWORK                   128000
 #define NBUFF                   NWORK
-#define NFWORK                  1024
+#define NFWORK					1024
 #define NEXP                    128
 #define NINCLUDE        100
 #define NPARMWORK               (NWORK * 2)
@@ -321,7 +321,7 @@
 
 #ifndef ALERT
 #ifdef EBCDIC
-#define ALERT                   '\057'
+#define ALERT					'\057'
 #else
 #define ALERT                   '\007'          /* '\a' is "Bell"       */
 #endif
diff --git a/rsc/source/rscpp/cppmain.c b/rsc/source/rscpp/cppmain.c
index 3060a6d6be9a..cff7f6cd7734 100644
--- a/rsc/source/rscpp/cppmain.c
+++ b/rsc/source/rscpp/cppmain.c
@@ -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
diff --git a/rsc/source/tools/rscchar.cxx b/rsc/source/tools/rscchar.cxx
index c23022e4222e..3fd3942d465d 100644
--- a/rsc/source/tools/rscchar.cxx
+++ b/rsc/source/tools/rscchar.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
@@ -55,9 +55,9 @@
 *************************************************************************/
 char * RscChar::MakeUTF8( char * pStr, UINT16 nTextEncoding )
 {
-    sal_Size        nMaxUniCodeBuf = strlen( pStr ) + 1;
-    char *          pOrgStr = new char[ nMaxUniCodeBuf ];
-    sal_uInt32      nOrgLen = 0;
+    sal_Size		nMaxUniCodeBuf = strlen( pStr ) + 1;  
+    char *			pOrgStr = new char[ nMaxUniCodeBuf ];
+    sal_uInt32		nOrgLen = 0;
 
     if( nMaxUniCodeBuf * 6 > 0x0FFFFF )
         RscExit( 10 );
@@ -158,12 +158,12 @@ char * RscChar::MakeUTF8( char * pStr, UINT16 nTextEncoding )
         pStr++;
     }
 
-    sal_Unicode *   pUniCode = new sal_Unicode[ nMaxUniCodeBuf ];
+    sal_Unicode *	pUniCode = new sal_Unicode[ nMaxUniCodeBuf ];
     rtl_TextToUnicodeConverter hConv = rtl_createTextToUnicodeConverter( nTextEncoding );
 
     sal_uInt32 nInfo;
     sal_Size   nSrcCvtBytes;
-    sal_Size nUniSize = rtl_convertTextToUnicode( hConv, 0,
+    sal_Size nUniSize = rtl_convertTextToUnicode( hConv, 0, 
                                                 pOrgStr, nOrgLen,
                                                 pUniCode, nMaxUniCodeBuf,
                                                 RTL_TEXTTOUNICODE_FLAGS_UNDEFINED_DEFAULT
@@ -176,9 +176,9 @@ char * RscChar::MakeUTF8( char * pStr, UINT16 nTextEncoding )
     rtl_destroyTextToUnicodeConverter( hConv );
 
     hConv = rtl_createUnicodeToTextConverter( RTL_TEXTENCODING_UTF8 );
-    // factor fo 6 is the maximum size of an UNICODE character as utf8
+    // factor fo 6 is the maximum size of an UNICODE character as utf8 
     char * pUtf8 = (char *)rtl_allocateMemory( nUniSize * 6 );
-    rtl_convertUnicodeToText( hConv, 0,
+    rtl_convertUnicodeToText( hConv, 0, 
                             pUniCode, nUniSize,
                             pUtf8, nUniSize * 6,
                             RTL_UNICODETOTEXT_FLAGS_UNDEFINED_DEFAULT
diff --git a/rsc/source/tools/rscdef.cxx b/rsc/source/tools/rscdef.cxx
index eb714bbcc3c2..ec669ad63af4 100644
--- a/rsc/source/tools/rscdef.cxx
+++ b/rsc/source/tools/rscdef.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
@@ -38,24 +38,24 @@ BOOL RscId::bNames = TRUE;
 
 /*************************************************************************
 |*
-|*    static RscId::SetNames
-|*    static RscId::SetNoNames
+|*	  static RscId::SetNames
+|*	  static RscId::SetNoNames
 |*
-|*    Beschreibung
-|*    Ersterstellung    MM 26.06.91
-|*    Letzte Aenderung  MM 26.06.91
+|*	  Beschreibung
+|*	  Ersterstellung	MM 26.06.91
+|*	  Letzte Aenderung	MM 26.06.91
 |*
 *************************************************************************/
 void RscId::SetNames( BOOL bSet )  { bNames = bSet;  }
-BOOL RscId::IsSetNames()           { return bNames;  }
+BOOL RscId::IsSetNames()		   { return bNames;  }
 
 /*************************************************************************
 |*
-|*    RscId::GetNumber
+|*	  RscId::GetNumber
 |*
-|*    Beschreibung
-|*    Ersterstellung    MM 17.05.91
-|*    Letzte Aenderung  MM 17.05.91
+|*	  Beschreibung
+|*	  Ersterstellung	MM 17.05.91
+|*	  Letzte Aenderung	MM 17.05.91
 |*
 *************************************************************************/
 INT32 RscId::GetNumber() const{
@@ -66,11 +66,11 @@ INT32 RscId::GetNumber() const{
 
 /*************************************************************************
 |*
-|*    RscId::Create()
+|*	  RscId::Create()
 |*
-|*    Beschreibung
-|*    Ersterstellung    MM 01.11.91
-|*    Letzte Aenderung  MM 01.11.91
+|*	  Beschreibung
+|*	  Ersterstellung	MM 01.11.91
+|*	  Letzte Aenderung	MM 01.11.91
 |*
 *************************************************************************/
 void RscId::Create( const RscExpType & rExpType )
@@ -88,11 +88,11 @@ void RscId::Create( const RscExpType & rExpType )
 
 /*************************************************************************
 |*
-|*    RscId::Destroy()
+|*	  RscId::Destroy()
 |*
-|*    Beschreibung
-|*    Ersterstellung    MM 01.11.91
-|*    Letzte Aenderung  MM 01.11.91
+|*	  Beschreibung
+|*	  Ersterstellung	MM 01.11.91
+|*	  Letzte Aenderung	MM 01.11.91
 |*
 *************************************************************************/
 void RscId::Destroy(){
@@ -103,11 +103,11 @@ void RscId::Destroy(){
 
 /*************************************************************************
 |*
-|*    RscId::RscId()
+|*	  RscId::RscId()
 |*
-|*    Beschreibung
-|*    Ersterstellung    MM 01.11.91
-|*    Letzte Aenderung  MM 01.11.91
+|*	  Beschreibung
+|*	  Ersterstellung	MM 01.11.91
+|*	  Letzte Aenderung	MM 01.11.91
 |*
 *************************************************************************/
 RscId::RscId( const RscId& rRscId ){
@@ -118,11 +118,11 @@ RscId::RscId( const RscId& rRscId ){
 
 /*************************************************************************
 |*
-|*    RscId::RscId()
+|*	  RscId::RscId()
 |*
-|*    Beschreibung
-|*    Ersterstellung    MM 01.11.91
-|*    Letzte Aenderung  MM 25.11.91
+|*	  Beschreibung
+|*	  Ersterstellung	MM 01.11.91
+|*	  Letzte Aenderung	MM 25.11.91
 |*
 *************************************************************************/
 RscId::RscId( RscDefine * pDef ){
@@ -135,11 +135,11 @@ RscId::RscId( RscDefine * pDef ){
 
 /*************************************************************************
 |*
-|*    RscId:: =
+|*	  RscId:: =
 |*
-|*    Beschreibung
-|*    Ersterstellung    MM 01.11.91
-|*    Letzte Aenderung  MM 01.11.91
+|*	  Beschreibung
+|*	  Ersterstellung	MM 01.11.91
+|*	  Letzte Aenderung	MM 01.11.91
 |*
 *************************************************************************/
 RscId& RscId::operator = ( const RscId& rRscId ){
@@ -152,11 +152,11 @@ RscId& RscId::operator = ( const RscId& rRscId ){
 
 /*************************************************************************
 |*
-|*    RscId::operator ==
+|*	  RscId::operator ==
 |*
-|*    Beschreibung
-|*    Ersterstellung    MM 16.05.91
-|*    Letzte Aenderung  MM 16.05.91
+|*	  Beschreibung
+|*	  Ersterstellung	MM 16.05.91
+|*	  Letzte Aenderung	MM 16.05.91
 |*
 *************************************************************************/
 BOOL RscId::operator == ( const RscId& rRscId ) const
@@ -166,11 +166,11 @@ BOOL RscId::operator == ( const RscId& rRscId ) const
 
 /*************************************************************************
 |*
-|*    RscId::operator <
+|*	  RscId::operator <
 |*
-|*    Beschreibung
-|*    Ersterstellung    MM 16.05.91
-|*    Letzte Aenderung  MM 16.05.91
+|*	  Beschreibung
+|*	  Ersterstellung	MM 16.05.91
+|*	  Letzte Aenderung	MM 16.05.91
 |*
 *************************************************************************/
 BOOL RscId::operator < ( const RscId& rRscId ) const
@@ -180,11 +180,11 @@ BOOL RscId::operator < ( const RscId& rRscId ) const
 
 /*************************************************************************
 |*
-|*    RscId::operator >
+|*	  RscId::operator >
 |*
-|*    Beschreibung
-|*    Ersterstellung    MM 16.05.91
-|*    Letzte Aenderung  MM 16.05.91
+|*	  Beschreibung
+|*	  Ersterstellung	MM 16.05.91
+|*	  Letzte Aenderung	MM 16.05.91
 |*
 *************************************************************************/
 BOOL RscId::operator > ( const RscId& rRscId ) const
@@ -194,11 +194,11 @@ BOOL RscId::operator > ( const RscId& rRscId ) const
 
 /*************************************************************************
 |*
-|*    RscId::INT32()
+|*	  RscId::INT32()
 |*
-|*    Beschreibung
-|*    Ersterstellung    MM 16.05.91
-|*    Letzte Aenderung  MM 16.05.91
+|*	  Beschreibung
+|*	  Ersterstellung	MM 16.05.91
+|*	  Letzte Aenderung	MM 16.05.91
 |*
 *************************************************************************/
 RscId::operator INT32() const
@@ -208,11 +208,11 @@ RscId::operator INT32() const
 
 /*************************************************************************
 |*
-|*    RscId::GetNames()
+|*	  RscId::GetNames()
 |*
-|*    Beschreibung
-|*    Ersterstellung    MM 16.05.91
-|*    Letzte Aenderung  MM 25.11.91
+|*	  Beschreibung
+|*	  Ersterstellung	MM 16.05.91
+|*	  Letzte Aenderung	MM 25.11.91
 |*
 *************************************************************************/
 ByteString RscId::GetName() const
@@ -232,11 +232,11 @@ ByteString RscId::GetName() const
 
 /*************************************************************************
 |*
-|*    RscId::GetMacro()
+|*	  RscId::GetMacro()
 |*
-|*    Beschreibung
-|*    Ersterstellung    MM 01.11.91
-|*    Letzte Aenderung  MM 25.11.91
+|*	  Beschreibung
+|*	  Ersterstellung	MM 01.11.91
+|*	  Letzte Aenderung	MM 25.11.91
 |*
 *************************************************************************/
 ByteString RscId::GetMacro() const
@@ -254,11 +254,11 @@ ByteString RscId::GetMacro() const
 /****************** R s c D e f i n e ************************************/
 /*************************************************************************
 |*
-|*    RscDefine::RscDefine()
+|*	  RscDefine::RscDefine()
 |*
-|*    Beschreibung
-|*    Ersterstellung    MM 01.11.91
-|*    Letzte Aenderung  MM 01.11.91
+|*	  Beschreibung
+|*	  Ersterstellung	MM 01.11.91
+|*	  Letzte Aenderung	MM 01.11.91
 |*
 *************************************************************************/
 RscDefine::RscDefine( ULONG lKey, const ByteString & rDefName, INT32 lDefId )
@@ -266,8 +266,8 @@ RscDefine::RscDefine( ULONG lKey, const ByteString & rDefName, INT32 lDefId )
 {
     nRefCount = 0;
     lFileKey  = lKey;
-    lId       = lDefId;
-    pExp      = NULL;
+    lId 	  = lDefId;
+    pExp	  = NULL;
 }
 
 RscDefine::RscDefine( ULONG lKey, const ByteString & rDefName,
@@ -277,16 +277,16 @@ RscDefine::RscDefine( ULONG lKey, const ByteString & rDefName,
     nRefCount = 0;
     lFileKey  = lKey;
     pExpression->Evaluate( &lId );
-    pExp      = pExpression;
+    pExp	  = pExpression;
 }
 
 /*************************************************************************
 |*
-|*    RscDefine::~RscDefine()
+|*	  RscDefine::~RscDefine()
 |*
-|*    Beschreibung
-|*    Ersterstellung    MM 01.11.91
-|*    Letzte Aenderung  MM 01.11.91
+|*	  Beschreibung
+|*	  Ersterstellung	MM 01.11.91
+|*	  Letzte Aenderung	MM 01.11.91
 |*
 *************************************************************************/
 RscDefine::~RscDefine(){
@@ -298,11 +298,11 @@ RscDefine::~RscDefine(){
 
 /*************************************************************************
 |*
-|*    RscDefine::DecRef()
+|*	  RscDefine::DecRef()
 |*
-|*    Beschreibung
-|*    Ersterstellung    MM 01.11.91
-|*    Letzte Aenderung  MM 01.11.91
+|*	  Beschreibung
+|*	  Ersterstellung	MM 01.11.91
+|*	  Letzte Aenderung	MM 01.11.91
 |*
 *************************************************************************/
 void RscDefine::DecRef(){
@@ -314,11 +314,11 @@ void RscDefine::DecRef(){
 
 /*************************************************************************
 |*
-|*    RscDefine::DefineToNumber()
+|*	  RscDefine::DefineToNumber()
 |*
-|*    Beschreibung
-|*    Ersterstellung    MM 07.11.91
-|*    Letzte Aenderung  MM 07.11.91
+|*	  Beschreibung
+|*	  Ersterstellung	MM 07.11.91
+|*	  Letzte Aenderung	MM 07.11.91
 |*
 *************************************************************************/
 void RscDefine::DefineToNumber()
@@ -331,11 +331,11 @@ void RscDefine::DefineToNumber()
 
 /*************************************************************************
 |*
-|*    RscDefine::ChangeMacro()
+|*	  RscDefine::ChangeMacro()
 |*
-|*    Beschreibung
-|*    Ersterstellung    MM 04.11.91
-|*    Letzte Aenderung  MM 04.11.91
+|*	  Beschreibung
+|*	  Ersterstellung	MM 04.11.91
+|*	  Letzte Aenderung	MM 04.11.91
 |*
 *************************************************************************/
 void RscDefine::ChangeMacro( RscExpression * pExpression ){
@@ -355,15 +355,15 @@ void RscDefine::ChangeMacro( INT32 lIdentifier ){
 
 /*************************************************************************
 |*
-|*    RscDefine::Evaluate()
+|*	  RscDefine::Evaluate()
 |*
-|*    Beschreibung
-|*    Ersterstellung    MM 01.11.91
-|*    Letzte Aenderung  MM 01.11.91
+|*	  Beschreibung
+|*	  Ersterstellung	MM 01.11.91
+|*	  Letzte Aenderung	MM 01.11.91
 |*
 *************************************************************************/
 BOOL RscDefine::Evaluate(){
-    BOOL    bRet = TRUE;
+    BOOL	bRet = TRUE;
 
     if( pExp )
         bRet = !pExp->Evaluate( &lId );
@@ -373,11 +373,11 @@ BOOL RscDefine::Evaluate(){
 
 /*************************************************************************
 |*
-|*    RscDefine::Search()
+|*	  RscDefine::Search()
 |*
-|*    Beschreibung
-|*    Ersterstellung    MM 11.11.91
-|*    Letzte Aenderung  MM 11.11.91
+|*	  Beschreibung
+|*	  Ersterstellung	MM 11.11.91
+|*	  Letzte Aenderung	MM 11.11.91
 |*
 *************************************************************************/
 RscDefine * RscDefine::Search( const char * pStr ){
@@ -386,11 +386,11 @@ RscDefine * RscDefine::Search( const char * pStr ){
 
 /*************************************************************************
 |*
-|*    RscDefine::GetMacro()
+|*	  RscDefine::GetMacro()
 |*
-|*    Beschreibung
-|*    Ersterstellung    MM 01.11.91
-|*    Letzte Aenderung  MM 01.11.91
+|*	  Beschreibung
+|*	  Ersterstellung	MM 01.11.91
+|*	  Letzte Aenderung	MM 01.11.91
 |*
 *************************************************************************/
 ByteString RscDefine::GetMacro()
@@ -403,11 +403,11 @@ ByteString RscDefine::GetMacro()
 /****************** R s c D e f i n e L i s t ****************************/
 /*************************************************************************
 |*
-|*    RscDefineList::New()
+|*	  RscDefineList::New()
 |*
-|*    Beschreibung
-|*    Ersterstellung    MM 04.11.91
-|*    Letzte Aenderung  MM 04.11.91
+|*	  Beschreibung
+|*	  Ersterstellung	MM 04.11.91
+|*	  Letzte Aenderung	MM 04.11.91
 |*
 *************************************************************************/
 RscDefine * RscDefineList::New( ULONG lFileKey, const ByteString & rDefName,
@@ -435,11 +435,11 @@ RscDefine * RscDefineList::New( ULONG lFileKey, const ByteString & rDefName,
 
 /*************************************************************************
 |*
-|*    RscDefineList::Remove()
+|*	  RscDefineList::Remove()
 |*
-|*    Beschreibung
-|*    Ersterstellung    MM 04.11.91
-|*    Letzte Aenderung  MM 04.11.91
+|*	  Beschreibung
+|*	  Ersterstellung	MM 04.11.91
+|*	  Letzte Aenderung	MM 04.11.91
 |*
 *************************************************************************/
 BOOL RscDefineList::Remove( RscDefine * pDef ){
@@ -476,11 +476,11 @@ BOOL RscDefineList::Remove(){
 
 /*************************************************************************
 |*
-|*    RscDefineList::Befor()
+|*	  RscDefineList::Befor()
 |*
-|*    Beschreibung
-|*    Ersterstellung    MM 12.11.91
-|*    Letzte Aenderung  MM 12.11.91
+|*	  Beschreibung
+|*	  Ersterstellung	MM 12.11.91
+|*	  Letzte Aenderung	MM 12.11.91
 |*
 *************************************************************************/
 BOOL RscDefineList::Befor( const RscDefine * pFree,
@@ -505,11 +505,11 @@ BOOL RscDefineList::Befor( const RscDefine * pFree,
 
 /*************************************************************************
 |*
-|*    RscDefineList::WriteAll()
+|*	  RscDefineList::WriteAll()
 |*
-|*    Beschreibung
-|*    Ersterstellung    MM 28.10.91
-|*    Letzte Aenderung  MM 28.10.91
+|*	  Beschreibung
+|*	  Ersterstellung	MM 28.10.91
+|*	  Letzte Aenderung	MM 28.10.91
 |*
 *************************************************************************/
 void RscDefineList::WriteAll( FILE * fOutput )
@@ -528,11 +528,11 @@ void RscDefineList::WriteAll( FILE * fOutput )
 /****************** R s c E x p T y p e **********************************/
 /*************************************************************************
 |*
-|*    RscExpType::Evaluate()
+|*	  RscExpType::Evaluate()
 |*
-|*    Beschreibung
-|*    Ersterstellung    MM 01.11.91
-|*    Letzte Aenderung  MM 01.11.91
+|*	  Beschreibung
+|*	  Ersterstellung	MM 01.11.91
+|*	  Letzte Aenderung	MM 01.11.91
 |*
 *************************************************************************/
 BOOL RscExpType::Evaluate( INT32 * plValue ) const{
@@ -553,11 +553,11 @@ BOOL RscExpType::Evaluate( INT32 * plValue ) const{
 
 /*************************************************************************
 |*
-|*    RscExpType::GetMacro()
+|*	  RscExpType::GetMacro()
 |*
-|*    Beschreibung
-|*    Ersterstellung    MM 01.11.91
-|*    Letzte Aenderung  MM 01.11.91
+|*	  Beschreibung
+|*	  Ersterstellung	MM 01.11.91
+|*	  Letzte Aenderung	MM 01.11.91
 |*
 *************************************************************************/
 void RscExpType::GetMacro( ByteString & rStr ) const
@@ -578,11 +578,11 @@ void RscExpType::GetMacro( ByteString & rStr ) const
 /****************** R s c E x p r e s s i o n ****************************/
 /*************************************************************************
 |*
-|*    RscExpression::RscExpression()
+|*	  RscExpression::RscExpression()
 |*
-|*    Beschreibung
-|*    Ersterstellung    MM 01.11.91
-|*    Letzte Aenderung  MM 01.11.91
+|*	  Beschreibung
+|*	  Ersterstellung	MM 01.11.91
+|*	  Letzte Aenderung	MM 01.11.91
 |*
 *************************************************************************/
 RscExpression::RscExpression( RscExpType aLE, char cOp, RscExpType aRE )
@@ -598,11 +598,11 @@ RscExpression::RscExpression( RscExpType aLE, char cOp, RscExpType aRE )
 
 /*************************************************************************
 |*
-|*    RscExpression::~RscExpression()
+|*	  RscExpression::~RscExpression()
 |*
-|*    Beschreibung
-|*    Ersterstellung    MM 01.11.91
-|*    Letzte Aenderung  MM 01.11.91
+|*	  Beschreibung
+|*	  Ersterstellung	MM 01.11.91
+|*	  Letzte Aenderung	MM 01.11.91
 |*
 *************************************************************************/
 RscExpression::~RscExpression(){
@@ -619,11 +619,11 @@ RscExpression::~RscExpression(){
 
 /*************************************************************************
 |*
-|*    RscExpression::Evaluate()
+|*	  RscExpression::Evaluate()
 |*
-|*    Beschreibung
-|*    Ersterstellung    MM 01.11.91
-|*    Letzte Aenderung  MM 01.11.91
+|*	  Beschreibung
+|*	  Ersterstellung	MM 01.11.91
+|*	  Letzte Aenderung	MM 01.11.91
 |*
 *************************************************************************/
 BOOL RscExpression::Evaluate( INT32 * plValue ){
@@ -658,11 +658,11 @@ BOOL RscExpression::Evaluate( INT32 * plValue ){
 
 /*************************************************************************
 |*
-|*    RscExpression::GetMacro()
+|*	  RscExpression::GetMacro()
 |*
-|*    Beschreibung
-|*    Ersterstellung    MM 01.11.91
-|*    Letzte Aenderung  MM 01.11.91
+|*	  Beschreibung
+|*	  Ersterstellung	MM 01.11.91
+|*	  Letzte Aenderung	MM 01.11.91
 |*
 *************************************************************************/
 ByteString RscExpression::GetMacro()
@@ -704,27 +704,27 @@ ByteString RscExpression::GetMacro()
 /****************** R s c F i l e ****************************************/
 /*************************************************************************
 |*
-|*    RscFile::RscFile()
+|*	  RscFile::RscFile()
 |*
-|*    Beschreibung
-|*    Ersterstellung    MM 04.11.91
-|*    Letzte Aenderung  MM 04.11.91
+|*	  Beschreibung
+|*	  Ersterstellung	MM 04.11.91
+|*	  Letzte Aenderung	MM 04.11.91
 |*
 *************************************************************************/
 RscFile :: RscFile(){
     bLoaded  = FALSE;
     bIncFile = FALSE;
-    bDirty   = FALSE;
+    bDirty	 = FALSE;
     bScanned = FALSE;
 }
 
 /*************************************************************************
 |*
-|*    RscFile::~RscFile()
+|*	  RscFile::~RscFile()
 |*
-|*    Beschreibung
-|*    Ersterstellung    MM 04.11.91
-|*    Letzte Aenderung  MM 04.11.91
+|*	  Beschreibung
+|*	  Ersterstellung	MM 04.11.91
+|*	  Letzte Aenderung	MM 04.11.91
 |*
 *************************************************************************/
 RscFile :: ~RscFile(){
@@ -743,13 +743,13 @@ RscFile :: ~RscFile(){
 
 /*************************************************************************
 |*
-|*    RscFile::Depend()
+|*	  RscFile::Depend()
 |*
-|*    Beschreibung      Diese Methode gibt TRUE zurueck, wenn lDepend
-|*                      existiert und hinter lFree steht, oder wenn
-|*                      lDepend nicht existiert.
-|*    Ersterstellung    MM 12.11.91
-|*    Letzte Aenderung  MM 12.11.91
+|*	  Beschreibung		Diese Methode gibt TRUE zurueck, wenn lDepend
+|*						existiert und hinter lFree steht, oder wenn
+|*						lDepend nicht existiert.
+|*	  Ersterstellung	MM 12.11.91
+|*	  Letzte Aenderung	MM 12.11.91
 |*
 *************************************************************************/
 BOOL RscFile::Depend( ULONG lDepend, ULONG lFree ){
@@ -773,11 +773,11 @@ BOOL RscFile::Depend( ULONG lDepend, ULONG lFree ){
 
 /*************************************************************************
 |*
-|*    RscFile::InsertDependFile()
+|*	  RscFile::InsertDependFile()
 |*
-|*    Beschreibung
-|*    Ersterstellung    MM 06.01.92
-|*    Letzte Aenderung  MM 06.01.92
+|*	  Beschreibung
+|*	  Ersterstellung	MM 06.01.92
+|*	  Letzte Aenderung	MM 06.01.92
 |*
 *************************************************************************/
 BOOL RscFile :: InsertDependFile( ULONG lIncFile, ULONG lPos )
@@ -804,11 +804,11 @@ BOOL RscFile :: InsertDependFile( ULONG lIncFile, ULONG lPos )
 
 /*************************************************************************
 |*
-|*    RscFile::RemoveDependFile()
+|*	  RscFile::RemoveDependFile()
 |*
-|*    Beschreibung
-|*    Ersterstellung    MM 18.11.91
-|*    Letzte Aenderung  MM 18.11.91
+|*	  Beschreibung
+|*	  Ersterstellung	MM 18.11.91
+|*	  Letzte Aenderung	MM 18.11.91
 |*
 *************************************************************************/
 void RscFile :: RemoveDependFile( ULONG lDepFile )
@@ -828,11 +828,11 @@ void RscFile :: RemoveDependFile( ULONG lDepFile )
 /****************** R s c D e f T r e e **********************************/
 /*************************************************************************
 |*
-|*    RscDefTree::~RscDefTree()
+|*	  RscDefTree::~RscDefTree()
 |*
-|*    Beschreibung
-|*    Ersterstellung    MM 12.11.91
-|*    Letzte Aenderung  MM 12.11.91
+|*	  Beschreibung
+|*	  Ersterstellung	MM 12.11.91
+|*	  Letzte Aenderung	MM 12.11.91
 |*
 *************************************************************************/
 RscDefTree::~RscDefTree(){
@@ -841,11 +841,11 @@ RscDefTree::~RscDefTree(){
 
 /*************************************************************************
 |*
-|*    RscDefTree::Remove()
+|*	  RscDefTree::Remove()
 |*
-|*    Beschreibung
-|*    Ersterstellung    MM 12.11.91
-|*    Letzte Aenderung  MM 12.11.91
+|*	  Beschreibung
+|*	  Ersterstellung	MM 12.11.91
+|*	  Letzte Aenderung	MM 12.11.91
 |*
 *************************************************************************/
 void RscDefTree::Remove(){
@@ -859,11 +859,11 @@ void RscDefTree::Remove(){
 
 /*************************************************************************
 |*
-|*    RscDefTree::~Search()
+|*	  RscDefTree::~Search()
 |*
-|*    Beschreibung
-|*    Ersterstellung    MM 12.11.91
-|*    Letzte Aenderung  MM 12.11.91
+|*	  Beschreibung
+|*	  Ersterstellung	MM 12.11.91
+|*	  Letzte Aenderung	MM 12.11.91
 |*
 *************************************************************************/
 RscDefine * RscDefTree::Search( const char * pName ){
@@ -874,11 +874,11 @@ RscDefine * RscDefTree::Search( const char * pName ){
 
 /*************************************************************************
 |*
-|*    RscDefTree::Insert()
+|*	  RscDefTree::Insert()
 |*
-|*    Beschreibung
-|*    Ersterstellung    MM 12.11.91
-|*    Letzte Aenderung  MM 12.11.91
+|*	  Beschreibung
+|*	  Ersterstellung	MM 12.11.91
+|*	  Letzte Aenderung	MM 12.11.91
 |*
 *************************************************************************/
 void RscDefTree::Insert( RscDefine * pDef ){
@@ -891,11 +891,11 @@ void RscDefTree::Insert( RscDefine * pDef ){
 
 /*************************************************************************
 |*
-|*    RscDefTree::Remove()
+|*	  RscDefTree::Remove()
 |*
-|*    Beschreibung
-|*    Ersterstellung    MM 12.11.91
-|*    Letzte Aenderung  MM 12.11.91
+|*	  Beschreibung
+|*	  Ersterstellung	MM 12.11.91
+|*	  Letzte Aenderung	MM 12.11.91
 |*
 *************************************************************************/
 void RscDefTree::Remove( RscDefine * pDef ){
@@ -908,11 +908,11 @@ void RscDefTree::Remove( RscDefine * pDef ){
 
 /*************************************************************************
 |*
-|*    RscDefTree::Evaluate()
+|*	  RscDefTree::Evaluate()
 |*
-|*    Beschreibung
-|*    Ersterstellung    MM 12.11.91
-|*    Letzte Aenderung  MM 12.11.91
+|*	  Beschreibung
+|*	  Ersterstellung	MM 12.11.91
+|*	  Letzte Aenderung	MM 12.11.91
 |*
 *************************************************************************/
 BOOL RscDefTree::Evaluate( RscDefine * pDef ){
@@ -932,11 +932,11 @@ BOOL RscDefTree::Evaluate(){
 /****************** R s c F i l e T a b **********************************/
 /*************************************************************************
 |*
-|*    RscFileTab::RscFileTab()
+|*	  RscFileTab::RscFileTab()
 |*
-|*    Beschreibung
-|*    Ersterstellung    MM 07.11.91
-|*    Letzte Aenderung  MM 07.11.91
+|*	  Beschreibung
+|*	  Ersterstellung	MM 07.11.91
+|*	  Letzte Aenderung	MM 07.11.91
 |*
 *************************************************************************/
 RscFileTab::RscFileTab(){
@@ -944,11 +944,11 @@ RscFileTab::RscFileTab(){
 
 /*************************************************************************
 |*
-|*    RscFileTab::~RscFileTab()
+|*	  RscFileTab::~RscFileTab()
 |*
-|*    Beschreibung
-|*    Ersterstellung    MM 04.11.91
-|*    Letzte Aenderung  MM 04.11.91
+|*	  Beschreibung
+|*	  Ersterstellung	MM 04.11.91
+|*	  Letzte Aenderung	MM 04.11.91
 |*
 *************************************************************************/
 RscFileTab :: ~RscFileTab(){
@@ -966,11 +966,11 @@ RscFileTab :: ~RscFileTab(){
 
 /*************************************************************************
 |*
-|*    RscFileTab::Find()
+|*	  RscFileTab::Find()
 |*
-|*    Beschreibung
-|*    Ersterstellung    MM 16.05.91
-|*    Letzte Aenderung  MM 16.05.91
+|*	  Beschreibung
+|*	  Ersterstellung	MM 16.05.91
+|*	  Letzte Aenderung	MM 16.05.91
 |*
 *************************************************************************/
 ULONG  RscFileTab :: Find( const ByteString & rName )
@@ -989,11 +989,11 @@ ULONG  RscFileTab :: Find( const ByteString & rName )
 
 /*************************************************************************
 |*
-|*    RscFileTab::FindDef()
+|*	  RscFileTab::FindDef()
 |*
-|*    Beschreibung
-|*    Ersterstellung    MM 30.10.91
-|*    Letzte Aenderung  MM 01.11.91
+|*	  Beschreibung
+|*	  Ersterstellung	MM 30.10.91
+|*	  Letzte Aenderung	MM 01.11.91
 |*
 *************************************************************************/
 RscDefine * RscFileTab::FindDef( const char * pName ){
@@ -1002,16 +1002,16 @@ RscDefine * RscFileTab::FindDef( const char * pName ){
 
 /*************************************************************************
 |*
-|*    RscFileTab::FindDef()
+|*	  RscFileTab::FindDef()
 |*
-|*    Beschreibung
-|*    Ersterstellung    MM 30.10.91
-|*    Letzte Aenderung  MM 01.11.91
+|*	  Beschreibung
+|*	  Ersterstellung	MM 30.10.91
+|*	  Letzte Aenderung	MM 01.11.91
 |*
 *************************************************************************/
 RscDefine * RscFileTab::FindDef( ULONG lFileKey, const ByteString & rName )
 {
-    RscDefine   * pDef = FindDef( rName );
+    RscDefine	* pDef = FindDef( rName );
 
     if( pDef )
         //befindet sich das DEFINE in einer Include-Datei in der
@@ -1023,11 +1023,11 @@ RscDefine * RscFileTab::FindDef( ULONG lFileKey, const ByteString & rName )
 
 /*************************************************************************
 |*
-|*    RscFileTab::Depend()
+|*	  RscFileTab::Depend()
 |*
-|*    Beschreibung
-|*    Ersterstellung    MM 08.11.91
-|*    Letzte Aenderung  MM 08.11.91
+|*	  Beschreibung
+|*	  Ersterstellung	MM 08.11.91
+|*	  Letzte Aenderung	MM 08.11.91
 |*
 *************************************************************************/
 BOOL RscFileTab::Depend( ULONG lDepend, ULONG lFree ){
@@ -1048,11 +1048,11 @@ BOOL RscFileTab::Depend( ULONG lDepend, ULONG lFree ){
 
 /*************************************************************************
 |*
-|*    RscFileTab::TestDef()
+|*	  RscFileTab::TestDef()
 |*
-|*    Beschreibung
-|*    Ersterstellung    MM 14.01.92
-|*    Letzte Aenderung  MM 14.01.92
+|*	  Beschreibung
+|*	  Ersterstellung	MM 14.01.92
+|*	  Letzte Aenderung	MM 14.01.92
 |*
 *************************************************************************/
 BOOL RscFileTab::TestDef( ULONG lFileKey, ULONG lPos,
@@ -1072,11 +1072,11 @@ BOOL RscFileTab::TestDef( ULONG lFileKey, ULONG lPos,
 
 /*************************************************************************
 |*
-|*    RscFileTab::TestDef()
+|*	  RscFileTab::TestDef()
 |*
-|*    Beschreibung
-|*    Ersterstellung    MM 14.01.92
-|*    Letzte Aenderung  MM 14.01.92
+|*	  Beschreibung
+|*	  Ersterstellung	MM 14.01.92
+|*	  Letzte Aenderung	MM 14.01.92
 |*
 *************************************************************************/
 BOOL RscFileTab::TestDef( ULONG lFileKey, ULONG lPos,
@@ -1106,11 +1106,11 @@ BOOL RscFileTab::TestDef( ULONG lFileKey, ULONG lPos,
 
 /*************************************************************************
 |*
-|*    RscFileTab::NewDef()
+|*	  RscFileTab::NewDef()
 |*
-|*    Beschreibung
-|*    Ersterstellung    MM 04.11.91
-|*    Letzte Aenderung  MM 04.11.91
+|*	  Beschreibung
+|*	  Ersterstellung	MM 04.11.91
+|*	  Letzte Aenderung	MM 04.11.91
 |*
 *************************************************************************/
 RscDefine * RscFileTab::NewDef( ULONG lFileKey, const ByteString & rDefName,
@@ -1134,11 +1134,11 @@ RscDefine * RscFileTab::NewDef( ULONG lFileKey, const ByteString & rDefName,
 
 /*************************************************************************
 |*
-|*    RscFileTab::NewDef()
+|*	  RscFileTab::NewDef()
 |*
-|*    Beschreibung
-|*    Ersterstellung    MM 04.11.91
-|*    Letzte Aenderung  MM 04.11.91
+|*	  Beschreibung
+|*	  Ersterstellung	MM 04.11.91
+|*	  Letzte Aenderung	MM 04.11.91
 |*
 *************************************************************************/
 RscDefine * RscFileTab::NewDef( ULONG lFileKey, const ByteString & rDefName,
@@ -1170,11 +1170,11 @@ RscDefine * RscFileTab::NewDef( ULONG lFileKey, const ByteString & rDefName,
 
 /*************************************************************************
 |*
-|*    RscFileTab::IsDefUsed()
+|*	  RscFileTab::IsDefUsed()
 |*
-|*    Beschreibung
-|*    Ersterstellung    MM 22.11.91
-|*    Letzte Aenderung  MM 22.11.91
+|*	  Beschreibung
+|*	  Ersterstellung	MM 22.11.91
+|*	  Letzte Aenderung	MM 22.11.91
 |*
 *************************************************************************/
 BOOL RscFileTab::IsDefUsed( const ByteString & rDefName )
@@ -1189,11 +1189,11 @@ BOOL RscFileTab::IsDefUsed( const ByteString & rDefName )
 
 /*************************************************************************
 |*
-|*    RscFileTab::DeleteDef()
+|*	  RscFileTab::DeleteDef()
 |*
-|*    Beschreibung
-|*    Ersterstellung    MM 11.11.91
-|*    Letzte Aenderung  MM 11.11.91
+|*	  Beschreibung
+|*	  Ersterstellung	MM 11.11.91
+|*	  Letzte Aenderung	MM 11.11.91
 |*
 *************************************************************************/
 void RscFileTab::DeleteDef( const ByteString & rDefName )
@@ -1212,11 +1212,11 @@ void RscFileTab::DeleteDef( const ByteString & rDefName )
 
 /*************************************************************************
 |*
-|*    RscFileTab::ChangeDef()
+|*	  RscFileTab::ChangeDef()
 |*
-|*    Beschreibung
-|*    Ersterstellung    MM 04.11.91
-|*    Letzte Aenderung  MM 11.11.91
+|*	  Beschreibung
+|*	  Ersterstellung	MM 04.11.91
+|*	  Letzte Aenderung	MM 11.11.91
 |*
 *************************************************************************/
 BOOL RscFileTab::ChangeDef( const ByteString & rDefName, INT32 lId )
@@ -1233,11 +1233,11 @@ BOOL RscFileTab::ChangeDef( const ByteString & rDefName, INT32 lId )
 
 /*************************************************************************
 |*
-|*    RscFileTab::ChangeDef()
+|*	  RscFileTab::ChangeDef()
 |*
-|*    Beschreibung
-|*    Ersterstellung    MM 04.11.91
-|*    Letzte Aenderung  MM 11.11.91
+|*	  Beschreibung
+|*	  Ersterstellung	MM 04.11.91
+|*	  Letzte Aenderung	MM 11.11.91
 |*
 *************************************************************************/
 BOOL RscFileTab::ChangeDef( const ByteString & rDefName,
@@ -1245,7 +1245,7 @@ BOOL RscFileTab::ChangeDef( const ByteString & rDefName,
 {
     RscDefine * pDef = FindDef( rDefName );
     RscFile   * pFile;
-    ULONG       lPos = 0;
+    ULONG		lPos = 0;
 
     if( pDef ){
         pFile = GetFile( pDef->GetFileKey() );
@@ -1268,11 +1268,11 @@ BOOL RscFileTab::ChangeDef( const ByteString & rDefName,
 
 /*************************************************************************
 |*
-|*    RscFileTab::ChangeDefName()
+|*	  RscFileTab::ChangeDefName()
 |*
-|*    Beschreibung
-|*    Ersterstellung    MM 04.11.91
-|*    Letzte Aenderung  MM 04.11.91
+|*	  Beschreibung
+|*	  Ersterstellung	MM 04.11.91
+|*	  Letzte Aenderung	MM 04.11.91
 |*
 *************************************************************************/
 BOOL RscFileTab::ChangeDefName( const ByteString & rDefName,
@@ -1296,15 +1296,15 @@ BOOL RscFileTab::ChangeDefName( const ByteString & rDefName,
 
 /*************************************************************************
 |*
-|*    RscFileTab::DeleteFileContext()
+|*	  RscFileTab::DeleteFileContext()
 |*
-|*    Beschreibung
-|*    Ersterstellung    MM 09.12.91
-|*    Letzte Aenderung  MM 09.12.91
+|*	  Beschreibung
+|*	  Ersterstellung	MM 09.12.91
+|*	  Letzte Aenderung	MM 09.12.91
 |*
 *************************************************************************/
 void RscFileTab :: DeleteFileContext( ULONG lFileKey ){
-    RscFile     * pFName;
+    RscFile 	* pFName;
 
     pFName = GetFile( lFileKey );
     if( pFName ){
@@ -1321,15 +1321,15 @@ void RscFileTab :: DeleteFileContext( ULONG lFileKey ){
 
 /*************************************************************************
 |*
-|*    RscFileTab::DeleteFile()
+|*	  RscFileTab::DeleteFile()
 |*
-|*    Beschreibung
-|*    Ersterstellung    MM 16.05.91
-|*    Letzte Aenderung  MM 16.05.91
+|*	  Beschreibung
+|*	  Ersterstellung	MM 16.05.91
+|*	  Letzte Aenderung	MM 16.05.91
 |*
 *************************************************************************/
 void RscFileTab :: DeleteFile( ULONG lFileKey ){
-    RscFile     * pFName;
+    RscFile 	* pFName;
 
     //Defines freigeben
     DeleteFileContext( lFileKey );
@@ -1348,17 +1348,17 @@ void RscFileTab :: DeleteFile( ULONG lFileKey ){
 
 /*************************************************************************
 |*
-|*    RscFileTab::NewCodeFile()
+|*	  RscFileTab::NewCodeFile()
 |*
-|*    Beschreibung
-|*    Ersterstellung    MM 16.05.91
-|*    Letzte Aenderung  MM 16.05.91
+|*	  Beschreibung
+|*	  Ersterstellung	MM 16.05.91
+|*	  Letzte Aenderung	MM 16.05.91
 |*
 *************************************************************************/
 ULONG  RscFileTab :: NewCodeFile( const ByteString & rName )
 {
-    ULONG       lKey;
-    RscFile *   pFName;
+    ULONG		lKey;
+    RscFile *	pFName;
 
     lKey = Find( rName );
     if( UNIQUEINDEX_ENTRY_NOTFOUND == lKey )
@@ -1374,17 +1374,17 @@ ULONG  RscFileTab :: NewCodeFile( const ByteString & rName )
 
 /*************************************************************************
 |*
-|*    RscFileTab::NewIncFile()
+|*	  RscFileTab::NewIncFile()
 |*
-|*    Beschreibung
-|*    Ersterstellung    MM 16.05.91
-|*    Letzte Aenderung  MM 16.05.91
+|*	  Beschreibung
+|*	  Ersterstellung	MM 16.05.91
+|*	  Letzte Aenderung	MM 16.05.91
 |*
 *************************************************************************/
 ULONG  RscFileTab :: NewIncFile( const ByteString & rName,
                                  const ByteString & rPath )
 {
-    ULONG         lKey;
+    ULONG		  lKey;
     RscFile * pFName;
 
     lKey = Find( rName );
diff --git a/rsc/source/tools/rschash.cxx b/rsc/source/tools/rschash.cxx
index dc7d898fde7a..c2a2754d5277 100644
--- a/rsc/source/tools/rschash.cxx
+++ b/rsc/source/tools/rschash.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
@@ -49,10 +49,10 @@ Atom AtomContainer::getID( const OString& rStr, bool bOnlyIfExists )
         m_aStringToID.find( aKey );
     if( it != m_aStringToID.end() )
         return it->second;
-
+    
     if( bOnlyIfExists )
         return InvalidAtom;
-
+    
     Atom aRet = m_nNextID;
     m_aStringToID[ aKey ] = m_nNextID;
     m_aIDToString[ m_nNextID ] = rStr;
diff --git a/rsc/source/tools/rsctools.cxx b/rsc/source/tools/rsctools.cxx
index 9904cd20d4e7..e63d4045dcf7 100644
--- a/rsc/source/tools/rsctools.cxx
+++ b/rsc/source/tools/rsctools.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
@@ -60,12 +60,12 @@ using namespace rtl;
 /****************** C o d e **********************************************/
 /*************************************************************************
 |*
-|*    rsc_strnicmp()
+|*	  rsc_strnicmp()
 |*
-|*    Beschreibung      Vergleicht zwei Strings Case-Unabhaengig bis zu
-|*                      einer bestimmten Laenge
-|*    Ersterstellung    MM 13.02.91
-|*    Letzte Aenderung  MM 13.02.91
+|*	  Beschreibung		Vergleicht zwei Strings Case-Unabhaengig bis zu
+|*						einer bestimmten Laenge
+|*	  Ersterstellung	MM 13.02.91
+|*	  Letzte Aenderung	MM 13.02.91
 |*
 *************************************************************************/
 int rsc_strnicmp( const char *string1, const char *string2, size_t count )
@@ -90,11 +90,11 @@ int rsc_strnicmp( const char *string1, const char *string2, size_t count )
 
 /*************************************************************************
 |*
-|*    rsc_strnicmp()
+|*	  rsc_strnicmp()
 |*
-|*    Beschreibung      Vergleicht zwei Strings Case-Unabhaengig
-|*    Ersterstellung    MM 13.02.91
-|*    Letzte Aenderung  MM 13.02.91
+|*	  Beschreibung		Vergleicht zwei Strings Case-Unabhaengig
+|*	  Ersterstellung	MM 13.02.91
+|*	  Letzte Aenderung	MM 13.02.91
 |*
 *************************************************************************/
 int rsc_stricmp( const char *string1, const char *string2 ){
@@ -123,13 +123,13 @@ char* rsc_strdup( const char* pStr )
 
 /*************************************************************************
 |*
-|*    GetTmpFileName()
+|*	  GetTmpFileName()
 |*
-|*    Beschreibung      Gibt einen String eines eindeutigen Dateinamens
-|*                      zurueck. Der Speicher fuer den String wird mit
-|*                      malloc allokiert
-|*    Ersterstellung    MM 13.02.91
-|*    Letzte Aenderung  MH 13.10.97
+|*	  Beschreibung		Gibt einen String eines eindeutigen Dateinamens
+|*						zurueck. Der Speicher fuer den String wird mit
+|*						malloc allokiert
+|*	  Ersterstellung	MM 13.02.91
+|*	  Letzte Aenderung	MH 13.10.97
 |*
 *************************************************************************/
 ByteString GetTmpFileName()
@@ -141,19 +141,19 @@ ByteString GetTmpFileName()
 }
 
 /********************************************************************/
-/*                                                                  */
-/*  Function    :   Append( )                                       */
-/*                                                                  */
-/*  Parameters  :   psw     - pointer to a preprocessor switch      */
-/*                                                                  */
-/*  Description :   appends text files                              */
+/*																	*/
+/*	Function	:	Append( )										*/
+/*																	*/
+/*	Parameters	:	psw 	- pointer to a preprocessor switch		*/
+/*																	*/
+/*	Description :	appends text files								*/
 /********************************************************************/
 BOOL Append( FILE * fDest, ByteString aTmpFile )
 {
 #define MAX_BUF 4096
-    char    szBuf[ MAX_BUF ];
-    int     nItems;
-    FILE    *fSource;
+    char	szBuf[ MAX_BUF ];
+    int	    nItems;
+    FILE	*fSource;
 
     fSource = fopen( aTmpFile.GetBuffer(), "rb" );
     if( !fDest || !fSource ){
@@ -186,13 +186,13 @@ BOOL Append( ByteString aOutputSrs, ByteString aTmpFile )
 
 /*************************************************************************
 |*
-|*    InputFile
+|*	  InputFile
 |*
-|*    Beschreibung      Haengt Extension an, wenn keine da ist
-|*    Parameter:        pInput, der Input-Dateiname.
-|*                      pExt, die Extension des Ausgabenamens
-|*    Ersterstellung    MM 13.02.91
-|*    Letzte Aenderung  MM 28.06.91
+|*	  Beschreibung		Haengt Extension an, wenn keine da ist
+|*	  Parameter:		pInput, der Input-Dateiname.
+|*						pExt, die Extension des Ausgabenamens
+|*	  Ersterstellung	MM 13.02.91
+|*	  Letzte Aenderung	MM 28.06.91
 |*
 *************************************************************************/
 ByteString InputFile ( const char * pInput, const char * pExt )
@@ -211,19 +211,19 @@ ByteString InputFile ( const char * pInput, const char * pExt )
 
 /*************************************************************************
 |*
-|*    OutputFile
+|*	  OutputFile
 |*
-|*    Beschreibung      Ersetzt Extension durch eine andere
-|*    Parameter:        input, der Input-Dateiname.
-|*                      pExt, die Extension des Ausgabenamens
-|*    Ersterstellung    MM 13.02.91
-|*    Letzte Aenderung  MM 28.06.91
+|*	  Beschreibung		Ersetzt Extension durch eine andere
+|*	  Parameter:		input, der Input-Dateiname.
+|*						pExt, die Extension des Ausgabenamens
+|*	  Ersterstellung	MM 13.02.91
+|*	  Letzte Aenderung	MM 28.06.91
 |*
 *************************************************************************/
 ByteString OutputFile ( ByteString aInput, const char * pExt )
 {
-    UniString   aUniInput( aInput, RTL_TEXTENCODING_ASCII_US );
-    DirEntry    aFileName( aUniInput );
+    UniString	aUniInput( aInput, RTL_TEXTENCODING_ASCII_US );
+    DirEntry	aFileName( aUniInput );
 
     UniString aExt( pExt, RTL_TEXTENCODING_ASCII_US );
     aFileName.SetExtension( aExt );
@@ -233,19 +233,19 @@ ByteString OutputFile ( ByteString aInput, const char * pExt )
 
 /*************************************************************************
 |*
-|*    ::ResonseFile()
+|*	  ::ResonseFile()
 |*
-|*    Beschreibung      Kommandozeile aufbereiten
-|*    Ersterstellung    MM 05.09.91
-|*    Letzte Aenderung  MM 05.09.91
+|*	  Beschreibung		Kommandozeile aufbereiten
+|*	  Ersterstellung	MM 05.09.91
+|*	  Letzte Aenderung	MM 05.09.91
 |*
 *************************************************************************/
 char * ResponseFile( RscPtrPtr * ppCmd, char ** ppArgv, sal_uInt32 nArgc )
 {
-    FILE    *fFile;
-    int     nItems;
-    char    szBuffer[4096];       // file buffer
-    sal_uInt32  i;
+    FILE	*fFile;
+    int 	nItems;
+    char	szBuffer[4096]; 	  // file buffer
+    sal_uInt32	i;
     bool bInQuotes = false;
 
     // Programmname
@@ -295,11 +295,11 @@ char * ResponseFile( RscPtrPtr * ppCmd, char ** ppArgv, sal_uInt32 nArgc )
 /*************** R s c P t r P t r **************************************/
 /*************************************************************************
 |*
-|*    RscPtrPtr :: RscPtrPtr()
+|*	  RscPtrPtr :: RscPtrPtr()
 |*
-|*    Beschreibung      Eine Tabelle mit Zeigern
-|*    Ersterstellung    MM 13.02.91
-|*    Letzte Aenderung  MM 13.02.91
+|*	  Beschreibung		Eine Tabelle mit Zeigern
+|*	  Ersterstellung	MM 13.02.91
+|*	  Letzte Aenderung	MM 13.02.91
 |*
 *************************************************************************/
 RscPtrPtr :: RscPtrPtr(){
@@ -309,12 +309,12 @@ RscPtrPtr :: RscPtrPtr(){
 
 /*************************************************************************
 |*
-|*    RscPtrPtr :: ~RscPtrPtr()
+|*	  RscPtrPtr :: ~RscPtrPtr()
 |*
-|*    Beschreibung      Zerst�rt eine Tabelle mit Zeigern, die Zeiger werde
-|*                      ebenfalls freigegebn
-|*    Ersterstellung    MM 13.02.91
-|*    Letzte Aenderung  MM 13.02.91
+|*	  Beschreibung		Zerst�rt eine Tabelle mit Zeigern, die Zeiger werde
+|*						ebenfalls freigegebn
+|*	  Ersterstellung	MM 13.02.91
+|*	  Letzte Aenderung	MM 13.02.91
 |*
 *************************************************************************/
 RscPtrPtr :: ~RscPtrPtr(){
@@ -323,11 +323,11 @@ RscPtrPtr :: ~RscPtrPtr(){
 
 /*************************************************************************
 |*
-|*    RscPtrPtr :: Reset()
+|*	  RscPtrPtr :: Reset()
 |*
-|*    Beschreibung
-|*    Ersterstellung    MM 03.05.91
-|*    Letzte Aenderung  MM 03.05.91
+|*	  Beschreibung
+|*	  Ersterstellung	MM 03.05.91
+|*	  Letzte Aenderung	MM 03.05.91
 |*
 *************************************************************************/
 void RscPtrPtr :: Reset(){
@@ -346,11 +346,11 @@ void RscPtrPtr :: Reset(){
 
 /*************************************************************************
 |*
-|*    RscPtrPtr :: Append()
+|*	  RscPtrPtr :: Append()
 |*
-|*    Beschreibung      Haengt einen Eintrag an.
-|*    Ersterstellung    MM 13.02.91
-|*    Letzte Aenderung  MM 13.02.91
+|*	  Beschreibung		Haengt einen Eintrag an.
+|*	  Ersterstellung	MM 13.02.91
+|*	  Letzte Aenderung	MM 13.02.91
 |*
 *************************************************************************/
 sal_uInt32 RscPtrPtr :: Append( void * pBuffer ){
@@ -366,11 +366,11 @@ sal_uInt32 RscPtrPtr :: Append( void * pBuffer ){
 
 /*************************************************************************
 |*
-|*    RscPtrPtr :: GetEntry()
+|*	  RscPtrPtr :: GetEntry()
 |*
-|*    Beschreibung      Liefert einen Eintrag, NULL wenn nicht vorhanden.
-|*    Ersterstellung    MM 13.02.91
-|*    Letzte Aenderung  MM 13.02.91
+|*	  Beschreibung		Liefert einen Eintrag, NULL wenn nicht vorhanden.
+|*	  Ersterstellung	MM 13.02.91
+|*	  Letzte Aenderung	MM 13.02.91
 |*
 *************************************************************************/
 void * RscPtrPtr :: GetEntry( sal_uInt32 nEntry ){
@@ -382,17 +382,17 @@ void * RscPtrPtr :: GetEntry( sal_uInt32 nEntry ){
 /****************** R S C W R I T E R C **********************************/
 /*************************************************************************
 |*
-|*    RscWriteRc :: RscWriteRc()
+|*	  RscWriteRc :: RscWriteRc()
 |*
-|*    Beschreibung
-|*    Ersterstellung    MM 15.04.91
-|*    Letzte Aenderung  MM 15.04.91
+|*	  Beschreibung
+|*	  Ersterstellung	MM 15.04.91
+|*	  Letzte Aenderung	MM 15.04.91
 |*
 *************************************************************************/
 RscWriteRc::RscWriteRc( RSCBYTEORDER_TYPE nOrder )
 {
-    short               nSwapTest = 1;
-    RSCBYTEORDER_TYPE   nMachineOrder;
+    short				nSwapTest = 1;
+    RSCBYTEORDER_TYPE	nMachineOrder;
 
     bSwap = FALSE;
     if( nOrder != RSC_SYSTEMENDIAN )
@@ -410,11 +410,11 @@ RscWriteRc::RscWriteRc( RSCBYTEORDER_TYPE nOrder )
 
 /*************************************************************************
 |*
-|*    RscWriteRc :: ~RscWriteRc()
+|*	  RscWriteRc :: ~RscWriteRc()
 |*
-|*    Beschreibung
-|*    Ersterstellung    MM 15.04.91
-|*    Letzte Aenderung  MM 15.04.91
+|*	  Beschreibung
+|*	  Ersterstellung	MM 15.04.91
+|*	  Letzte Aenderung	MM 15.04.91
 |*
 *************************************************************************/
 RscWriteRc :: ~RscWriteRc()
@@ -425,11 +425,11 @@ RscWriteRc :: ~RscWriteRc()
 
 /*************************************************************************
 |*
-|*    RscWriteRc :: IncSize()
+|*	  RscWriteRc :: IncSize()
 |*
-|*    Beschreibung
-|*    Ersterstellung    MM 15.04.91
-|*    Letzte Aenderung  MM 15.04.91
+|*	  Beschreibung
+|*	  Ersterstellung	MM 15.04.91
+|*	  Letzte Aenderung	MM 15.04.91
 |*
 *************************************************************************/
 sal_uInt32 RscWriteRc :: IncSize( sal_uInt32 nSize )
@@ -442,11 +442,11 @@ sal_uInt32 RscWriteRc :: IncSize( sal_uInt32 nSize )
 
 /*************************************************************************
 |*
-|*    RscWriteRc :: GetPointer()
+|*	  RscWriteRc :: GetPointer()
 |*
-|*    Beschreibung
-|*    Ersterstellung    MM 15.04.91
-|*    Letzte Aenderung  MM 15.04.91
+|*	  Beschreibung
+|*	  Ersterstellung	MM 15.04.91
+|*	  Letzte Aenderung	MM 15.04.91
 |*
 *************************************************************************/
 char * RscWriteRc :: GetPointer( sal_uInt32 nSize )
@@ -459,16 +459,16 @@ char * RscWriteRc :: GetPointer( sal_uInt32 nSize )
 
 /*************************************************************************
 |*
-|*    RscWriteRc :: Put()
+|*	  RscWriteRc :: Put()
 |*
-|*    Beschreibung
-|*    Ersterstellung    MM 15.04.91
-|*    Letzte Aenderung  MM 15.04.91
+|*	  Beschreibung
+|*	  Ersterstellung	MM 15.04.91
+|*	  Letzte Aenderung	MM 15.04.91
 |*
 *************************************************************************/
 void RscWriteRc :: Put( sal_uInt16 nVal )
 {
-    sal_uInt32  nOldLen;
+    sal_uInt32	nOldLen;
 
     nOldLen = IncSize( sizeof( nVal ) );
     PutAt( nOldLen, nVal );
@@ -480,12 +480,12 @@ void RscWriteRc :: PutUTF8( char * pStr )
     if( pStr )
         nStrLen = strlen( pStr );
 
-    sal_uInt32  n = nStrLen +1;
+    sal_uInt32	n = nStrLen +1;
     if( n % 2 )
         // align to 2
         n++;
 
-    sal_uInt32  nOldLen = IncSize( n );
+    sal_uInt32	nOldLen = IncSize( n );
     rtl_copyMemory( GetPointer( nOldLen ), pStr, nStrLen );
     // 0 terminated
     pMem[ nOldLen + nStrLen ] = '\0';
diff --git a/rsc/source/tools/rsctree.cxx b/rsc/source/tools/rsctree.cxx
index 991e32aa580c..a2902baff2d2 100644
--- a/rsc/source/tools/rsctree.cxx
+++ b/rsc/source/tools/rsctree.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
@@ -43,11 +43,11 @@
 /****************** B i N o d e ******************************************/
 /*************************************************************************
 |*
-|*    BiNode::BiNode()
+|*	  BiNode::BiNode()
 |*
-|*    Beschreibung      NAME.DOC
-|*    Ersterstellung    MM 07.02.91
-|*    Letzte Aenderung  MM 07.02.91
+|*	  Beschreibung		NAME.DOC
+|*	  Ersterstellung	MM 07.02.91
+|*	  Letzte Aenderung	MM 07.02.91
 |*
 *************************************************************************/
 BiNode::BiNode(){
@@ -56,11 +56,11 @@ BiNode::BiNode(){
 
 /*************************************************************************
 |*
-|*    BiNode::~BiNode()
+|*	  BiNode::~BiNode()
 |*
-|*    Beschreibung
-|*    Ersterstellung    MM 07.02.91
-|*    Letzte Aenderung  MM 07.02.91
+|*	  Beschreibung
+|*	  Ersterstellung	MM 07.02.91
+|*	  Letzte Aenderung	MM 07.02.91
 |*
 *************************************************************************/
 BiNode::~BiNode(){
@@ -68,11 +68,11 @@ BiNode::~BiNode(){
 
 /*************************************************************************
 |*
-|*    BiNode::EnumNodes()
+|*	  BiNode::EnumNodes()
 |*
-|*    Beschreibung
-|*    Ersterstellung    MM 07.02.91
-|*    Letzte Aenderung  MM 07.02.91
+|*	  Beschreibung
+|*	  Ersterstellung	MM 07.02.91
+|*	  Letzte Aenderung	MM 07.02.91
 |*
 *************************************************************************/
 void BiNode::EnumNodes( Link aLink ) const{
@@ -85,11 +85,11 @@ void BiNode::EnumNodes( Link aLink ) const{
 
 /*************************************************************************
 |*
-|*    BiNode::ChangeDLListBTree()
+|*	  BiNode::ChangeDLListBTree()
 |*
-|*    Beschreibung
-|*    Ersterstellung    MM 11.01.91
-|*    Letzte Aenderung  MM 11.01.91
+|*	  Beschreibung
+|*	  Ersterstellung	MM 11.01.91
+|*	  Letzte Aenderung	MM 11.01.91
 |*
 *************************************************************************/
 BiNode * BiNode::ChangeDLListBTree( BiNode * pList ){
@@ -111,7 +111,7 @@ BiNode * BiNode::ChangeDLListBTree( BiNode * pList ){
         else
             pList = (BiNode *)0;
 
-        if( NULL != (pTmp = pMiddle->Left()) )  // rechten Zeiger auf Null
+        if( NULL != (pTmp = pMiddle->Left()) )	// rechten Zeiger auf Null
             pTmp->pRight = (BiNode *)0;
 
         // linken Zeiger auf Null
@@ -128,16 +128,16 @@ BiNode * BiNode::ChangeDLListBTree( BiNode * pList ){
 
 /*************************************************************************
 |*
-|*    BiNode::ChangeBTreeDLList()
+|*	  BiNode::ChangeBTreeDLList()
 |*
-|*    Beschreibung
-|*    Ersterstellung    MM 11.01.91
-|*    Letzte Aenderung  MM 11.01.91
+|*	  Beschreibung
+|*	  Ersterstellung	MM 11.01.91
+|*	  Letzte Aenderung	MM 11.01.91
 |*
 *************************************************************************/
 BiNode * BiNode::ChangeBTreeDLList(){
     BiNode * pList;
-    BiNode * pLL_RN;    // linke Liste rechter Knoten
+    BiNode * pLL_RN;	// linke Liste rechter Knoten
 
     if( Right() ){
         pList = Right()->ChangeBTreeDLList();
@@ -158,11 +158,11 @@ BiNode * BiNode::ChangeBTreeDLList(){
 /****************** N a m e N o d e **************************************/
 /*************************************************************************
 |*
-|*    NameNode::Remove()
+|*	  NameNode::Remove()
 |*
-|*    Beschreibung
-|*    Ersterstellung    MM 10.07.91
-|*    Letzte Aenderung  MM 10.07.91
+|*	  Beschreibung
+|*	  Ersterstellung	MM 10.07.91
+|*	  Letzte Aenderung	MM 10.07.91
 |*
 *************************************************************************/
 NameNode * NameNode::Remove( NameNode * pRemove ){
@@ -201,11 +201,11 @@ NameNode * NameNode::Remove( NameNode * pRemove ){
 
 /*************************************************************************
 |*
-|*    NameNode::Compare
+|*	  NameNode::Compare
 |*
-|*    Beschreibung
-|*    Ersterstellung    MM 10.07.91
-|*    Letzte Aenderung  MM 13.07.91
+|*	  Beschreibung
+|*	  Ersterstellung	MM 10.07.91
+|*	  Letzte Aenderung	MM 13.07.91
 |*
 *************************************************************************/
 COMPARE NameNode::Compare( const NameNode * pCompare ) const{
@@ -228,11 +228,11 @@ COMPARE NameNode::Compare( const void * pCompare ) const{
 
 /*************************************************************************
 |*
-|*    NameNode::SearchParent
+|*	  NameNode::SearchParent
 |*
-|*    Beschreibung
-|*    Ersterstellung    MM 10.07.91
-|*    Letzte Aenderung  MM 10.07.91
+|*	  Beschreibung
+|*	  Ersterstellung	MM 10.07.91
+|*	  Letzte Aenderung	MM 10.07.91
 |*
 *************************************************************************/
 NameNode* NameNode::SearchParent( const NameNode * pSearch ) const{
@@ -260,11 +260,11 @@ NameNode* NameNode::SearchParent( const NameNode * pSearch ) const{
 
 /*************************************************************************
 |*
-|*    NameNode::Search
+|*	  NameNode::Search
 |*
-|*    Beschreibung
-|*    Ersterstellung    MM 21.03.90
-|*    Letzte Aenderung  MM 27.06.90
+|*	  Beschreibung
+|*	  Ersterstellung	MM 21.03.90
+|*	  Letzte Aenderung	MM 27.06.90
 |*
 *************************************************************************/
 NameNode* NameNode::Search( const NameNode * pSearch ) const{
@@ -309,11 +309,11 @@ NameNode* NameNode::Search( const void * pSearch ) const{
 
 /*************************************************************************
 |*
-|*    NameNode::Insert()
+|*	  NameNode::Insert()
 |*
-|*    Beschreibung      NAME.DOC
-|*    Ersterstellung    MM 11.01.91
-|*    Letzte Aenderung  MM 11.01.91
+|*	  Beschreibung		NAME.DOC
+|*	  Ersterstellung	MM 11.01.91
+|*	  Letzte Aenderung	MM 11.01.91
 |*
 *************************************************************************/
 BOOL NameNode::Insert( NameNode * pTN, sal_uInt32* pnDepth ){
@@ -327,7 +327,7 @@ BOOL NameNode::Insert( NameNode * pTN, sal_uInt32* pnDepth ){
     *pnDepth += 1;
     if( nCmp == GREATER ){
         if( Left() )
-            bRet =  ((NameNode *)Left())->Insert( pTN, pnDepth );
+            bRet =	((NameNode *)Left())->Insert( pTN, pnDepth );
         else
             pLeft = pTN;
     }
@@ -344,19 +344,19 @@ BOOL NameNode::Insert( NameNode * pTN, sal_uInt32* pnDepth ){
 
 /*************************************************************************
 |*
-|*    NameNode::Insert()
+|*	  NameNode::Insert()
 |*
-|*    Beschreibung      NAME.DOC
-|*    Ersterstellung    MM 21.03.90
-|*    Letzte Aenderung  MM 11.01.91
+|*	  Beschreibung		NAME.DOC
+|*	  Ersterstellung	MM 21.03.90
+|*	  Letzte Aenderung	MM 11.01.91
 |*
 *************************************************************************/
 BOOL NameNode::Insert( NameNode * pTN ){
 // insert a node in the tree.
 // if the node with the same name is in, return FALSE and no insert.
 // if not return true.
-    sal_uInt32  nDepth = 0;
-    BOOL        bRet;
+    sal_uInt32	nDepth = 0;
+    BOOL		bRet;
 
     bRet = Insert( pTN, &nDepth );
     if( bRet ){
@@ -373,11 +373,11 @@ BOOL NameNode::Insert( NameNode * pTN ){
 
 /*************************************************************************
 |*
-|*    NameNode::OrderTree()
+|*	  NameNode::OrderTree()
 |*
-|*    Beschreibung
-|*    Ersterstellung    MM 23.09.91
-|*    Letzte Aenderung  MM 23.09.91
+|*	  Beschreibung
+|*	  Ersterstellung	MM 23.09.91
+|*	  Letzte Aenderung	MM 23.09.91
 |*
 *************************************************************************/
 void NameNode::OrderTree(){
@@ -404,20 +404,20 @@ void NameNode::SubOrderTree( NameNode * pOrderNode ){
 
 /*************************************************************************
 |*
-|*    NameNode::IdOrderTree()
+|*	  NameNode::IdOrderTree()
 |*
-|*    Beschreibung
-|*    Ersterstellung    MM 15.11.91
-|*    Letzte Aenderung  MM 15.11.91
+|*	  Beschreibung
+|*	  Ersterstellung	MM 15.11.91
+|*	  Letzte Aenderung	MM 15.11.91
 |*
 *************************************************************************/
 class OrderCtrl {
-    BOOL       bOrder;
+    BOOL	   bOrder;
     NameNode * pName;
     DECL_LINK( CallBackFunc, NameNode * );
 public:
             OrderCtrl() { bOrder = FALSE; pName = NULL; }
-    BOOL    IsOrder( const NameNode * pRoot )
+    BOOL	IsOrder( const NameNode * pRoot )
     {
             bOrder = TRUE;
             pName  = NULL;
@@ -443,11 +443,11 @@ BOOL NameNode::IsOrderTree() const{
 /****************** I d N o d e ******************************************/
 /*************************************************************************
 |*
-|*    IdNode::Search()
+|*	  IdNode::Search()
 |*
-|*    Beschreibung
-|*    Ersterstellung    MM 06.11.91
-|*    Letzte Aenderung  MM 06.11.91
+|*	  Beschreibung
+|*	  Ersterstellung	MM 06.11.91
+|*	  Letzte Aenderung	MM 06.11.91
 |*
 *************************************************************************/
 IdNode * IdNode::Search( sal_uInt32 nTypeName ) const{
@@ -456,11 +456,11 @@ IdNode * IdNode::Search( sal_uInt32 nTypeName ) const{
 
 /*************************************************************************
 |*
-|*    IdNode::Compare()
+|*	  IdNode::Compare()
 |*
-|*    Beschreibung
-|*    Ersterstellung    MM 06.11.91
-|*    Letzte Aenderung  MM 06.11.91
+|*	  Beschreibung
+|*	  Ersterstellung	MM 06.11.91
+|*	  Letzte Aenderung	MM 06.11.91
 |*
 *************************************************************************/
 COMPARE IdNode::Compare( const NameNode * pSearch ) const
@@ -486,11 +486,11 @@ COMPARE IdNode::Compare( const void * pSearch ) const{
 
 /*************************************************************************
 |*
-|*    IdNode::GetId()
+|*	  IdNode::GetId()
 |*
-|*    Beschreibung
-|*    Ersterstellung    MM 23.09.91
-|*    Letzte Aenderung  MM 23.09.91
+|*	  Beschreibung
+|*	  Ersterstellung	MM 23.09.91
+|*	  Letzte Aenderung	MM 23.09.91
 |*
 *************************************************************************/
 sal_uInt32 IdNode::GetId() const
@@ -500,11 +500,11 @@ sal_uInt32 IdNode::GetId() const
 
 /*************************************************************************
 |*
-|*    StringNode::Search()
+|*	  StringNode::Search()
 |*
-|*    Beschreibung
-|*    Ersterstellung    MM 06.11.91
-|*    Letzte Aenderung  MM 06.11.91
+|*	  Beschreibung
+|*	  Ersterstellung	MM 06.11.91
+|*	  Letzte Aenderung	MM 06.11.91
 |*
 *************************************************************************/
 StringNode * StringNode::Search( const char * pSearch ) const{
@@ -513,11 +513,11 @@ StringNode * StringNode::Search( const char * pSearch ) const{
 
 /*************************************************************************
 |*
-|*    StringNode::Compare()
+|*	  StringNode::Compare()
 |*
-|*    Beschreibung
-|*    Ersterstellung    MM 06.11.91
-|*    Letzte Aenderung  MM 06.11.91
+|*	  Beschreibung
+|*	  Ersterstellung	MM 06.11.91
+|*	  Letzte Aenderung	MM 06.11.91
 |*
 *************************************************************************/
 COMPARE StringNode::Compare( const NameNode * pSearch ) const
diff --git a/sax/inc/sax/dllapi.h b/sax/inc/sax/dllapi.h
index e9aca11fb0bd..220ea28d6b41 100644
--- a/sax/inc/sax/dllapi.h
+++ b/sax/inc/sax/dllapi.h
@@ -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
diff --git a/sax/inc/sax/fastattribs.hxx b/sax/inc/sax/fastattribs.hxx
index 9a968982d39e..d6c9e9ff007b 100644
--- a/sax/inc/sax/fastattribs.hxx
+++ b/sax/inc/sax/fastattribs.hxx
@@ -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
@@ -58,7 +58,7 @@ struct UnknownAttribute
 typedef std::map< sal_Int32, ::rtl::OString > FastAttributeMap;
 typedef std::vector< UnknownAttribute > UnknownAttributeList;
 
-class SAX_DLLPUBLIC FastAttributeList : public ::cppu::WeakImplHelper1< ::com::sun::star::xml::sax::XFastAttributeList >
+class SAX_DLLPUBLIC FastAttributeList : public ::cppu::WeakImplHelper1< ::com::sun::star::xml::sax::XFastAttributeList > 
 {
 public:
     FastAttributeList( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastTokenHandler >& xTokenHandler );
diff --git a/sax/inc/sax/fshelper.hxx b/sax/inc/sax/fshelper.hxx
index f816e3edc1c3..e9dba33974a5 100644
--- a/sax/inc/sax/fshelper.hxx
+++ b/sax/inc/sax/fshelper.hxx
@@ -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
@@ -52,16 +52,16 @@ class SAX_DLLPUBLIC FastSerializerHelper
 public:
 
     FastSerializerHelper( const ::com::sun::star::uno::Reference< ::com::sun::star::io::XOutputStream >& xOutputStream );
-
+    
     ~FastSerializerHelper();
-
+    
     void startElement(const char* elementName, ...);
     void singleElement(const char* elementName, ...);
     void endElement(const char* elementName);
 
     void startElementV(sal_Int32 elementTokenId, va_list args);
     void singleElementV(sal_Int32 elementTokenId, va_list args);
-
+    
     inline void startElement(sal_Int32 elementTokenId, ...)
         { va_list args; va_start( args, elementTokenId ); startElementV( elementTokenId, args ); va_end( args ); }
     inline void singleElement(sal_Int32 elementTokenId, ...)
@@ -73,7 +73,7 @@ public:
     void endElement(sal_Int32 elementTokenId);
     inline void endElementNS(sal_Int32 namespaceTokenId, sal_Int32 elementTokenId)
         { endElement( FSNS( namespaceTokenId, elementTokenId ) ); }
-
+        
     void singleElement(const char* elementName, XFastAttributeListRef xAttrList);
     inline void singleElement(sal_Int32 elementTokenId, XFastAttributeListRef xAttrList)
         { singleElementV(elementTokenId, xAttrList); }
@@ -82,7 +82,7 @@ public:
         { singleElementV(FSNS( namespaceTokenId, elementTokenId), xAttrList); }
 
     void startElementV(sal_Int32 elementTokenId, XFastAttributeListRef xAttrList);
-    inline void startElementNS(sal_Int32 namespaceTokenId, sal_Int32 elementTokenId, XFastAttributeListRef xAttrList)
+    inline void startElementNS(sal_Int32 namespaceTokenId, sal_Int32 elementTokenId, XFastAttributeListRef xAttrList) 
         { startElementV( FSNS( namespaceTokenId, elementTokenId ), xAttrList ); }
 
     FastSerializerHelper* write(const char* value);
@@ -98,7 +98,7 @@ public:
     FastSerializerHelper* writeId(sal_Int32 tokenId);
 
     ::com::sun::star::uno::Reference< ::com::sun::star::io::XOutputStream > getOutputStream();
-
+    
     FastAttributeList *createAttrList();
 
     void mark();
diff --git a/sax/inc/sax/parser/saxparser.hxx b/sax/inc/sax/parser/saxparser.hxx
index dde71accd680..8a2b3d090f59 100644
--- a/sax/inc/sax/parser/saxparser.hxx
+++ b/sax/inc/sax/parser/saxparser.hxx
@@ -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,7 +79,7 @@ public:
 
     const SaxParserRef& getParser() const { return mxParser; }
 private:
-    SaxParserRef    mxParser;
+    SaxParserRef	mxParser;
 };
 
 // --------------------------------------------------------------------
@@ -118,7 +118,7 @@ public:
 
     /** is called for characters betwen elements in the xml stream.
         Default implementation calls Characters() on the topmost contex.
-        @param pCharacters The characters in utf-8 encoding
+        @param pCharacters The characters in utf-8 encoding	
         @param nLength the size in bytes of the utf-8 string
     */
     virtual void Characters( const sal_Char *pCharacters, sal_uInt32 nLength );
diff --git a/sax/inc/sax/tools/attributemap.hxx b/sax/inc/sax/tools/attributemap.hxx
index ea8f55a9b626..6987b0b923ff 100644
--- a/sax/inc/sax/tools/attributemap.hxx
+++ b/sax/inc/sax/tools/attributemap.hxx
@@ -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
diff --git a/sax/inc/sax/tools/converter.hxx b/sax/inc/sax/tools/converter.hxx
index 4b65c1dc83b2..c50c253479d1 100644
--- a/sax/inc/sax/tools/converter.hxx
+++ b/sax/inc/sax/tools/converter.hxx
@@ -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
@@ -64,7 +64,7 @@ class SAX_DLLPUBLIC Converter
 {
 public:
     /** convert string to measure using optional min and max values*/
-    static bool convertMeasure( sal_Int32& rValue,
+    static bool convertMeasure(	sal_Int32& rValue, 
                                 const ::rtl::OUString& rString,
                                 sal_Int16 nTargetUnit = ::com::sun::star::util::MeasureUnit::MM_100TH,
                                 sal_Int32 nMin = SAL_MIN_INT32,
@@ -131,7 +131,7 @@ public:
 
     /** convert string to double number (using ::rtl::math) and DO convert from
         source unit to target unit. */
-    static bool convertDouble(  double& rValue,
+    static bool convertDouble(	double& rValue,
                                 const ::rtl::OUString& rString,
                                 sal_Int16 nSourceUnit,
                                 sal_Int16 nTargetUnit );
@@ -205,4 +205,4 @@ public:
 
 }
 
-#endif  //  _SAX_CONVERTER_HXX
+#endif	//  _SAX_CONVERTER_HXX
diff --git a/sax/inc/sax/tools/saxobject.hxx b/sax/inc/sax/tools/saxobject.hxx
index 56b901d9579f..d43a8c955eee 100644
--- a/sax/inc/sax/tools/saxobject.hxx
+++ b/sax/inc/sax/tools/saxobject.hxx
@@ -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
diff --git a/sax/inc/sax/tools/tokenmap.hxx b/sax/inc/sax/tools/tokenmap.hxx
index 42add0690e9a..11b3b62bab26 100644
--- a/sax/inc/sax/tools/tokenmap.hxx
+++ b/sax/inc/sax/tools/tokenmap.hxx
@@ -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
diff --git a/sax/inc/xml2utf.hxx b/sax/inc/xml2utf.hxx
index 1a0640f5a687..a848749d2a7f 100644
--- a/sax/inc/xml2utf.hxx
+++ b/sax/inc/xml2utf.hxx
@@ -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
@@ -26,17 +26,17 @@
  ************************************************************************/
 
 // TODO: Woher?
-#define Max( a, b )     (((a)>(b)) ? (a) : (b) )
-#define Min( a, b )     (((a)<(b)) ? (a) : (b) )
+#define Max( a, b )		(((a)>(b)) ? (a) : (b) )
+#define Min( a, b )		(((a)<(b)) ? (a) : (b) )
 
 /*
-*
+* 
 * Text2UnicodeConverter
 *
 **/
 namespace sax_expatwrap {
-
-class Text2UnicodeConverter
+    
+class Text2UnicodeConverter 
 {
 
 public:
@@ -49,11 +49,11 @@ public:
 private:
     void init( rtl_TextEncoding encoding );
 
-    rtl_TextToUnicodeConverter  m_convText2Unicode;
-    rtl_TextToUnicodeContext    m_contextText2Unicode;
-    sal_Bool                    m_bCanContinue;
-    sal_Bool                    m_bInitialized;
-    rtl_TextEncoding            m_rtlEncoding;
+    rtl_TextToUnicodeConverter 	m_convText2Unicode;
+    rtl_TextToUnicodeContext   	m_contextText2Unicode;
+    sal_Bool					m_bCanContinue;
+    sal_Bool					m_bInitialized;
+    rtl_TextEncoding			m_rtlEncoding;
     ::com::sun::star::uno::Sequence<sal_Int8> m_seqSource;
 };
 
@@ -62,7 +62,7 @@ private:
 * Unicode2TextConverter
 *
 **-----------------------------------------*/
-class Unicode2TextConverter
+class Unicode2TextConverter 
 {
 public:
     Unicode2TextConverter( rtl_TextEncoding encoding );
@@ -78,12 +78,12 @@ public:
 private:
     void init( rtl_TextEncoding encoding );
 
-    rtl_UnicodeToTextConverter  m_convUnicode2Text;
-    rtl_UnicodeToTextContext    m_contextUnicode2Text;
-    sal_Bool                    m_bCanContinue;
-    sal_Bool                    m_bInitialized;
-    rtl_TextEncoding            m_rtlEncoding;
-    ::com::sun::star::uno::Sequence<sal_Unicode>        m_seqSource;
+    rtl_UnicodeToTextConverter 	m_convUnicode2Text;
+    rtl_UnicodeToTextContext   	m_contextUnicode2Text;
+    sal_Bool					m_bCanContinue;
+    sal_Bool					m_bInitialized;
+    rtl_TextEncoding			m_rtlEncoding;
+    ::com::sun::star::uno::Sequence<sal_Unicode>		m_seqSource;
 };
 
 
@@ -103,15 +103,15 @@ public:
         {}
 
     ~XMLFile2UTFConverter();
-
+    
     void setInputStream( ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream > &r ) { m_in = r; }
     void setEncoding( const ::rtl::OString &s ) { m_sEncoding = s; }
 
 
-
+    
     // @param nMaxToRead The number of chars, that should be read. Note that this is no exact number. There
     //                   may be returned less or more bytes than ordered.
-    sal_Int32 readAndConvert( ::com::sun::star::uno::Sequence<sal_Int8> &seq , sal_Int32 nMaxToRead )
+    sal_Int32 readAndConvert( ::com::sun::star::uno::Sequence<sal_Int8> &seq , sal_Int32 nMaxToRead ) 
         throw ( ::com::sun::star::io::IOException,
                 ::com::sun::star::io::NotConnectedException ,
                 ::com::sun::star::io::BufferSizeExceededException ,
@@ -132,16 +132,16 @@ private:
 
     // When encoding attribute is within the text (in the first line), it is removed.
     void removeEncoding( ::com::sun::star::uno::Sequence<sal_Int8> &seq );
-
+    
     // Initializes decoding depending on m_sEncoding setting
     void initializeDecoding();
 private:
     ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >  m_in;
-
+        
     sal_Bool m_bStarted;
     ::rtl::OString m_sEncoding;
 
     Text2UnicodeConverter *m_pText2Unicode;
-    Unicode2TextConverter *m_pUnicode2Text;
+    Unicode2TextConverter *m_pUnicode2Text;	
 };
 }
diff --git a/sax/qa/cppunit/version.map b/sax/qa/cppunit/version.map
index 3308588ef6f8..0dbbcc5a7372 100644
--- a/sax/qa/cppunit/version.map
+++ b/sax/qa/cppunit/version.map
@@ -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
diff --git a/sax/source/expatwrap/attrlistimpl.cxx b/sax/source/expatwrap/attrlistimpl.cxx
index 114eb653f648..931c5cff5149 100644
--- a/sax/source/expatwrap/attrlistimpl.cxx
+++ b/sax/source/expatwrap/attrlistimpl.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
@@ -46,9 +46,9 @@ struct TagAttribute
         {}
     TagAttribute( const OUString &aName, const OUString &aType , const OUString &aValue )
     {
-        this->sName     = aName;
-        this->sType     = aType;
-        this->sValue    = aValue;
+        this->sName 	= aName;
+        this->sType 	= aType;
+        this->sValue 	= aValue;
     }
 
     OUString sName;
@@ -153,7 +153,7 @@ AttributeList::~AttributeList()
 }
 
 
-void AttributeList::addAttribute(   const OUString &sName ,
+void AttributeList::addAttribute( 	const OUString &sName ,
                                         const OUString &sType ,
                                         const OUString &sValue )
 {
diff --git a/sax/source/expatwrap/attrlistimpl.hxx b/sax/source/expatwrap/attrlistimpl.hxx
index aaf6cf84b359..25b5629b9b68 100644
--- a/sax/source/expatwrap/attrlistimpl.hxx
+++ b/sax/source/expatwrap/attrlistimpl.hxx
@@ -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
@@ -73,7 +73,7 @@ public:
 
     // XCloneable
     virtual ::com::sun::star::uno::Reference< XCloneable > SAL_CALL
-        createClone()   throw(::com::sun::star::uno::RuntimeException);
+        createClone()	throw(::com::sun::star::uno::RuntimeException);
 
 private:
     struct AttributeList_impl *m_pImpl;
diff --git a/sax/source/expatwrap/factory.hxx b/sax/source/expatwrap/factory.hxx
index c6a566781044..8980f21133fd 100644
--- a/sax/source/expatwrap/factory.hxx
+++ b/sax/source/expatwrap/factory.hxx
@@ -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
@@ -29,6 +29,6 @@ Reference< XInterface > SAL_CALL SaxWriter_CreateInstance(
     const Reference< XMultiServiceFactory > & rSMgr ) throw (Exception);
 OUString SaxWriter_getServiceName() throw();
 OUString SaxWriter_getImplementationName() throw();
-Sequence< OUString >    SaxWriter_getSupportedServiceNames(void) throw();
+Sequence< OUString > 	SaxWriter_getSupportedServiceNames(void) throw();
 }
 
diff --git a/sax/source/expatwrap/sax_expat.cxx b/sax/source/expatwrap/sax_expat.cxx
index 4ffebfa3590d..abe192388f80 100644
--- a/sax/source/expatwrap/sax_expat.cxx
+++ b/sax/source/expatwrap/sax_expat.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
@@ -61,7 +61,7 @@ using namespace ::com::sun::star::io;
 #include "xml2utf.hxx"
 
 namespace sax_expatwrap {
-
+    
 // Useful macros for correct String conversion depending on the choosen expat-mode
 #ifdef XML_UNICODE
 OUString XmlNChar2OUString( const XML_Char *p , int nLen )
@@ -95,7 +95,7 @@ OUString XmlChar2OUString( const XML_Char *p )
      }
      else return OUString();
 }
-
+    
 
 #define XML_CHAR_TO_OUSTRING(x) XmlChar2OUString(x)
 #define XML_CHAR_N_TO_USTRING(x,n) XmlNChar2OUString(x,n)
@@ -106,9 +106,9 @@ OUString XmlChar2OUString( const XML_Char *p )
 
 
 /*
-* The following macro encapsulates any call to an event handler.
+* The following macro encapsulates any call to an event handler. 
 * It ensures, that exceptions thrown by the event handler are
-* treated properly.
+* treated properly. 
 */
 #define CALL_ELEMENT_HANDLER_AND_CARE_FOR_EXCEPTIONS(pThis,call) \
     if( ! pThis->bExceptionWasThrown ) { \
@@ -137,8 +137,8 @@ OUString XmlChar2OUString( const XML_Char *p )
     }\
     ((void)0)
 
-#define IMPLEMENTATION_NAME "com.sun.star.comp.extensions.xml.sax.ParserExpat"
-#define SERVICE_NAME        "com.sun.star.xml.sax.Parser"
+#define IMPLEMENTATION_NAME	"com.sun.star.comp.extensions.xml.sax.ParserExpat"
+#define SERVICE_NAME		"com.sun.star.xml.sax.Parser"
 
 class SaxExpatParser_Impl;
 
@@ -150,25 +150,25 @@ class SaxExpatParser :
                 XServiceInfo
                           >
 {
-
-public:
+    
+public:	
     SaxExpatParser();
     ~SaxExpatParser();
-
+    
 public:
 
     // The implementation details
-    static Sequence< OUString >     getSupportedServiceNames_Static(void) throw ();
+    static Sequence< OUString > 	getSupportedServiceNames_Static(void) throw ();
 
 public:
     // The SAX-Parser-Interface
-    virtual void SAL_CALL parseStream(  const InputSource& structSource)
-        throw ( SAXException,
-                IOException,
+    virtual void SAL_CALL parseStream(	const InputSource& structSource)
+        throw (	SAXException, 
+                IOException, 
                 RuntimeException);
-    virtual void SAL_CALL setDocumentHandler(const Reference< XDocumentHandler > & xHandler)
+    virtual void SAL_CALL setDocumentHandler(const Reference< XDocumentHandler > & xHandler) 
         throw (RuntimeException);
-
+    
     virtual void SAL_CALL setErrorHandler(const Reference< XErrorHandler > & xHandler)
         throw (RuntimeException);
     virtual void SAL_CALL setDTDHandler(const Reference < XDTDHandler > & xHandler)
@@ -176,8 +176,8 @@ public:
     virtual void SAL_CALL setEntityResolver(const Reference<  XEntityResolver >& xResolver)
         throw (RuntimeException);
 
-    virtual void SAL_CALL setLocale( const Locale &locale )                     throw (RuntimeException);
-
+    virtual void SAL_CALL setLocale( const Locale &locale ) 					throw (RuntimeException);
+    
 public: // XServiceInfo
     OUString                     SAL_CALL getImplementationName() throw ();
     Sequence< OUString >         SAL_CALL getSupportedServiceNames(void) throw ();
@@ -185,16 +185,16 @@ public: // XServiceInfo
 
 private:
 
-    SaxExpatParser_Impl         *m_pImpl;
-
+    SaxExpatParser_Impl 		*m_pImpl;
+    
 };
 
 //--------------------------------------
-// the extern interface
+// the extern interface 
 //---------------------------------------
 Reference< XInterface > SAL_CALL SaxExpatParser_CreateInstance(
     const Reference< XMultiServiceFactory  >  & ) throw(Exception)
-{
+{	
     SaxExpatParser *p = new SaxExpatParser;
 
     return Reference< XInterface > ( (OWeakObject * ) p );
@@ -202,7 +202,7 @@ Reference< XInterface > SAL_CALL SaxExpatParser_CreateInstance(
 
 
 
-Sequence< OUString >    SaxExpatParser::getSupportedServiceNames_Static(void) throw ()
+Sequence< OUString > 	SaxExpatParser::getSupportedServiceNames_Static(void) throw ()
 {
     Sequence<OUString> aRet(1);
     aRet.getArray()[0] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(SERVICE_NAME) );
@@ -218,8 +218,8 @@ Sequence< OUString >    SaxExpatParser::getSupportedServiceNames_Static(void) th
 // Entity binds all information neede for a single file
 struct Entity
 {
-    InputSource         structSource;
-    XML_Parser          pParser;
+    InputSource			structSource;
+    XML_Parser			pParser;	
     XMLFile2UTFConverter converter;
 };
 
@@ -227,22 +227,22 @@ struct Entity
 class SaxExpatParser_Impl
 {
 public: // module scope
-    Mutex               aMutex;
+    Mutex				aMutex;
 
-    Reference< XDocumentHandler >   rDocumentHandler;
+    Reference< XDocumentHandler >	rDocumentHandler;
     Reference< XExtendedDocumentHandler > rExtendedDocumentHandler;
-
-    Reference< XErrorHandler >  rErrorHandler;
-    Reference< XDTDHandler >    rDTDHandler;
+    
+    Reference< XErrorHandler > 	rErrorHandler;
+    Reference< XDTDHandler > 	rDTDHandler;
     Reference< XEntityResolver > rEntityResolver;
-    Reference < XLocator >      rDocumentLocator;
+    Reference < XLocator >		rDocumentLocator;
 
 
-    Reference < XAttributeList >    rAttrList;
-    AttributeList   *pAttrList;
+    Reference < XAttributeList >	rAttrList;
+    AttributeList	*pAttrList;
 
-    // External entity stack
-    vector<struct Entity>   vecEntity;
+    // External entity stack 
+    vector<struct Entity> 	vecEntity;
     void pushEntity( const struct Entity &entity )
         { vecEntity.push_back( entity ); }
     void popEntity()
@@ -251,38 +251,38 @@ public: // module scope
         { return vecEntity.back(); }
 
 
-    // Exception cannot be thrown through the C-XmlParser (possible resource leaks),
+    // Exception cannot be thrown through the C-XmlParser (possible resource leaks), 
     // therefor the exception must be saved somewhere.
-    SAXParseException   exception;
+    SAXParseException 	exception;
     RuntimeException    rtexception;
-    sal_Bool            bExceptionWasThrown;
+    sal_Bool 			bExceptionWasThrown;
     sal_Bool            bRTExceptionWasThrown;
 
-    Locale              locale;
+    Locale				locale;
 
-public:
+public:	
     // the C-Callbacks for the expat parser
     void static callbackStartElement(void *userData, const XML_Char *name , const XML_Char **atts);
     void static callbackEndElement(void *userData, const XML_Char *name);
     void static callbackCharacters( void *userData , const XML_Char *s , int nLen );
-    void static callbackProcessingInstruction(  void *userData ,
-                                                const XML_Char *sTarget ,
+    void static callbackProcessingInstruction( 	void *userData , 
+                                                const XML_Char *sTarget , 
                                                 const XML_Char *sData );
 
-    void static callbackUnparsedEntityDecl( void *userData ,
+    void static callbackUnparsedEntityDecl(	void *userData , 
                                               const XML_Char *entityName,
                                               const XML_Char *base,
                                               const XML_Char *systemId,
                                               const XML_Char *publicId,
                                               const XML_Char *notationName);
-
-    void static callbackNotationDecl(   void *userData,
+                                              
+    void static callbackNotationDecl(	void *userData,
                                         const XML_Char *notationName,
                                         const XML_Char *base,
                                         const XML_Char *systemId,
                                         const XML_Char *publicId);
 
-    int static callbackExternalEntityRef(   XML_Parser parser,
+    int static callbackExternalEntityRef(	XML_Parser parser,
                                             const XML_Char *openEntityNames,
                                             const XML_Char *base,
                                             const XML_Char *systemId,
@@ -321,7 +321,7 @@ extern "C"
     {
         SaxExpatParser_Impl::callbackProcessingInstruction(userData,sTarget,sData );
     }
-    static void call_callbackUnparsedEntityDecl(void *userData ,
+    static void call_callbackUnparsedEntityDecl(void *userData , 
                                                   const XML_Char *entityName,
                                                 const XML_Char *base,
                                                 const XML_Char *systemId,
@@ -381,9 +381,9 @@ class LocatorImpl :
 public:
     LocatorImpl( SaxExpatParser_Impl *p )
     {
-        m_pParser    = p;
+        m_pParser 	 = p;
     }
-
+    
 public: //XLocator
     virtual sal_Int32 SAL_CALL getColumnNumber(void) throw ()
     {
@@ -419,7 +419,7 @@ public: //XLocator
 private:
 
     SaxExpatParser_Impl *m_pParser;
-};
+};		
 
 
 
@@ -430,19 +430,19 @@ SaxExpatParser::SaxExpatParser(  )
 
     LocatorImpl *pLoc = new LocatorImpl( m_pImpl );
     m_pImpl->rDocumentLocator = Reference< XLocator > ( pLoc );
-
+     
     // performance-Improvment. Reference is needed when calling the startTag callback.
     // Handing out the same object with every call is allowed (see sax-specification)
     m_pImpl->pAttrList = new AttributeList;
     m_pImpl->rAttrList = Reference< XAttributeList > ( m_pImpl->pAttrList );
-
+    
     m_pImpl->bExceptionWasThrown = sal_False;
     m_pImpl->bRTExceptionWasThrown = sal_False;
 }
 
 SaxExpatParser::~SaxExpatParser()
 {
-    delete m_pImpl;
+    delete m_pImpl;	
 }
 
 
@@ -450,17 +450,17 @@ SaxExpatParser::~SaxExpatParser()
 *
 * parseStream does Parser-startup initializations. The SaxExpatParser_Impl::parse() method does
 * the file-specific initialization work. (During a parser run, external files may be opened)
-*
+* 
 ****************/
-void SaxExpatParser::parseStream(   const InputSource& structSource)
-    throw (SAXException,
-           IOException,
+void SaxExpatParser::parseStream(	const InputSource& structSource)
+    throw (SAXException, 
+           IOException, 
            RuntimeException)
 {
     // Only one text at one time
     MutexGuard guard( m_pImpl->aMutex );
-
-
+    
+    
     struct Entity entity;
     entity.structSource = structSource;
 
@@ -474,9 +474,9 @@ void SaxExpatParser::parseStream(   const InputSource& structSource)
     if( entity.structSource.sEncoding.getLength() )
     {
         entity.converter.setEncoding(
-            OUStringToOString( entity.structSource.sEncoding , RTL_TEXTENCODING_ASCII_US ) );
+            OUStringToOString( entity.structSource.sEncoding , RTL_TEXTENCODING_ASCII_US ) );	
     }
-
+    
     // create parser with proper encoding
     entity.pParser = XML_ParserCreate( 0 );
     if( ! entity.pParser )
@@ -485,28 +485,28 @@ void SaxExpatParser::parseStream(   const InputSource& structSource)
                             Reference< XInterface > (), Any() );
     }
 
-    // set all necessary C-Callbacks
+    // set all necessary C-Callbacks 
     XML_SetUserData( entity.pParser , m_pImpl );
-    XML_SetElementHandler(  entity.pParser ,
-                            call_callbackStartElement ,
+    XML_SetElementHandler( 	entity.pParser , 
+                            call_callbackStartElement , 
                             call_callbackEndElement );
     XML_SetCharacterDataHandler( entity.pParser , call_callbackCharacters );
-    XML_SetProcessingInstructionHandler(entity.pParser ,
+    XML_SetProcessingInstructionHandler(entity.pParser , 
                                         call_callbackProcessingInstruction );
-    XML_SetUnparsedEntityDeclHandler(   entity.pParser,
+    XML_SetUnparsedEntityDeclHandler( 	entity.pParser,
                                         call_callbackUnparsedEntityDecl );
     XML_SetNotationDeclHandler( entity.pParser, call_callbackNotationDecl );
-    XML_SetExternalEntityRefHandler(    entity.pParser,
-                                        call_callbackExternalEntityRef);
-    XML_SetUnknownEncodingHandler( entity.pParser,  call_callbackUnknownEncoding ,0);
-
+    XML_SetExternalEntityRefHandler( 	entity.pParser, 
+                                        call_callbackExternalEntityRef);	
+    XML_SetUnknownEncodingHandler( entity.pParser, 	call_callbackUnknownEncoding ,0);
+    
     if( m_pImpl->rExtendedDocumentHandler.is() ) {
 
         // These handlers just delegate calls to the ExtendedHandler. If no extended handler is
         // given, these callbacks can be ignored
         XML_SetDefaultHandlerExpand( entity.pParser, call_callbackDefault );
         XML_SetCommentHandler( entity.pParser, call_callbackComment );
-        XML_SetCdataSectionHandler(     entity.pParser ,
+        XML_SetCdataSectionHandler( 	entity.pParser , 
                                         call_callbackStartCDATA ,
                                          call_callbackEndCDATA );
     }
@@ -526,17 +526,17 @@ void SaxExpatParser::parseStream(   const InputSource& structSource)
 
         // finish document
         if( m_pImpl->rDocumentHandler.is() ) {
-            m_pImpl->rDocumentHandler->endDocument();
+            m_pImpl->rDocumentHandler->endDocument();	
         }
     }
-//      catch( SAXParseException &e )
-//  {
-//      m_pImpl->popEntity();
-//          XML_ParserFree( entity.pParser );
+//  	catch( SAXParseException &e ) 
+// 	{
+// 		m_pImpl->popEntity();
+//  		XML_ParserFree( entity.pParser );
 //        Any aAny;
 //        aAny <<= e;
-//          throw SAXException( e.Message, e.Context, aAny );
-//      }
+//  		throw SAXException( e.Message, e.Context, aAny );
+//  	}
     catch( SAXException & )
     {
         m_pImpl->popEntity();
@@ -559,15 +559,15 @@ void SaxExpatParser::parseStream(   const InputSource& structSource)
     m_pImpl->popEntity();
     XML_ParserFree( entity.pParser );
 }
-
-void SaxExpatParser::setDocumentHandler(const Reference< XDocumentHandler > & xHandler)
+                                                                                
+void SaxExpatParser::setDocumentHandler(const Reference< XDocumentHandler > & xHandler) 
     throw (RuntimeException)
 {
     m_pImpl->rDocumentHandler = xHandler;
     m_pImpl->rExtendedDocumentHandler =
         Reference< XExtendedDocumentHandler >( xHandler , UNO_QUERY );
 }
-
+                                                                    
 void SaxExpatParser::setErrorHandler(const Reference< XErrorHandler > & xHandler)
     throw (RuntimeException)
 {
@@ -587,9 +587,9 @@ void SaxExpatParser::setEntityResolver(const Reference < XEntityResolver > & xRe
 }
 
 
-void SaxExpatParser::setLocale( const Locale & locale ) throw (RuntimeException)
+void SaxExpatParser::setLocale( const Locale & locale )	throw (RuntimeException)
 {
-    m_pImpl->locale = locale;
+    m_pImpl->locale = locale;	
 }
 
 // XServiceInfo
@@ -614,7 +614,7 @@ sal_Bool SaxExpatParser::supportsService(const OUString& ServiceName) throw ()
 // XServiceInfo
 Sequence< OUString > SaxExpatParser::getSupportedServiceNames(void) throw ()
 {
-
+    
     Sequence<OUString> seq(1);
     seq.getArray()[0] = OUString::createFromAscii( SERVICE_NAME );
     return seq;
@@ -697,7 +697,7 @@ OUString getErrorMessage( XML_Error xmlE, OUString sSystemId , sal_Int32 nLine )
         Message = OUString::createFromAscii( "external entity reference" );
     }
     else if( XML_ERROR_NOT_STANDALONE == xmlE ) {
-        Message = OUString::createFromAscii( "not standalone" );
+        Message = OUString::createFromAscii( "not standalone" );	
     }
 
     OUString str = OUString::createFromAscii( "[" );
@@ -723,21 +723,21 @@ void SaxExpatParser_Impl::parse( )
     while( nRead ) {
         nRead = getEntity().converter.readAndConvert( seqOut , nBufSize );
 
-        if( ! nRead ) {
-            XML_Parse( getEntity().pParser ,
-                                   ( const char * ) seqOut.getArray() ,
-                                   0 ,
-                                   1 );
+        if( ! nRead ) {				
+            XML_Parse( getEntity().pParser , 
+                                   ( const char * ) seqOut.getArray() , 
+                                   0 , 
+                                   1 );	
             break;
-        }
+        }		
 
         sal_Bool bContinue = ( XML_Parse( getEntity().pParser ,
                                                 (const char *) seqOut.getArray(),
                                                 nRead,
                                                 0 ) != 0 );
-
+        
         if( ! bContinue || this->bExceptionWasThrown ) {
-
+            
             if ( this->bRTExceptionWasThrown )
                 throw rtexception;
 
@@ -746,16 +746,16 @@ void SaxExpatParser_Impl::parse( )
             OUString sSystemId = rDocumentLocator->getSystemId();
             sal_Int32 nLine = rDocumentLocator->getLineNumber();
 
-            SAXParseException aExcept(
-                getErrorMessage(xmlE , sSystemId, nLine) ,
-                Reference< XInterface >(),
+            SAXParseException aExcept( 	
+                getErrorMessage(xmlE , sSystemId, nLine) , 
+                Reference< XInterface >(), 
                 Any( &exception , getCppuType( &exception) ),
                 rDocumentLocator->getPublicId(),
                 rDocumentLocator->getSystemId(),
                 rDocumentLocator->getLineNumber(),
                 rDocumentLocator->getColumnNumber()
                 );
-
+            
             if( rErrorHandler.is() ) {
 
                 // error handler is set, so the handler may throw the exception
@@ -776,33 +776,33 @@ void SaxExpatParser_Impl::parse( )
 // The C-Callbacks
 //
 //-----------------------------------------
-void SaxExpatParser_Impl::callbackStartElement( void *pvThis ,
-                                                const XML_Char *pwName ,
+void SaxExpatParser_Impl::callbackStartElement( void *pvThis , 
+                                                const XML_Char *pwName , 
                                                 const XML_Char **awAttributes )
 {
     // in case of two concurrent threads, there is only the danger of an leak,
     // which is neglectable for one string
     static OUString g_CDATA( RTL_CONSTASCII_USTRINGPARAM( "CDATA" ) );
-
+    
     SaxExpatParser_Impl *pImpl = ((SaxExpatParser_Impl*)pvThis);
-
+    
     if( pImpl->rDocumentHandler.is() ) {
 
         int i = 0;
-        pImpl->pAttrList->clear();
-
+        pImpl->pAttrList->clear(); 
+        
         while( awAttributes[i] ) {
             OSL_ASSERT( awAttributes[i+1] );
             pImpl->pAttrList->addAttribute(
-                XML_CHAR_TO_OUSTRING( awAttributes[i] ) ,
+                XML_CHAR_TO_OUSTRING( awAttributes[i] ) , 
                 g_CDATA ,  // expat doesn't know types
                 XML_CHAR_TO_OUSTRING( awAttributes[i+1] ) );
-            i +=2;
+            i +=2;	
         }
 
         CALL_ELEMENT_HANDLER_AND_CARE_FOR_EXCEPTIONS(
-            pImpl ,
-            rDocumentHandler->startElement( XML_CHAR_TO_OUSTRING( pwName ) ,
+            pImpl , 
+            rDocumentHandler->startElement( XML_CHAR_TO_OUSTRING( pwName ) , 
                                             pImpl->rAttrList ) );
     }
 }
@@ -810,7 +810,7 @@ void SaxExpatParser_Impl::callbackStartElement( void *pvThis ,
 void SaxExpatParser_Impl::callbackEndElement( void *pvThis , const XML_Char *pwName  )
 {
     SaxExpatParser_Impl  *pImpl = ((SaxExpatParser_Impl*)pvThis);
-
+    
     if( pImpl->rDocumentHandler.is() ) {
         CALL_ELEMENT_HANDLER_AND_CARE_FOR_EXCEPTIONS( pImpl,
                 rDocumentHandler->endElement( XML_CHAR_TO_OUSTRING( pwName ) ) );
@@ -823,22 +823,22 @@ void SaxExpatParser_Impl::callbackCharacters( void *pvThis , const XML_Char *s ,
     SaxExpatParser_Impl *pImpl = ((SaxExpatParser_Impl*)pvThis);
 
     if( pImpl->rDocumentHandler.is() ) {
-        CALL_ELEMENT_HANDLER_AND_CARE_FOR_EXCEPTIONS( pImpl ,
+        CALL_ELEMENT_HANDLER_AND_CARE_FOR_EXCEPTIONS( pImpl , 
                 rDocumentHandler->characters( XML_CHAR_N_TO_USTRING(s,nLen) ) );
     }
 }
 
-void SaxExpatParser_Impl::callbackProcessingInstruction(    void *pvThis,
-                                                    const XML_Char *sTarget ,
+void SaxExpatParser_Impl::callbackProcessingInstruction(	void *pvThis,
+                                                    const XML_Char *sTarget , 
                                                     const XML_Char *sData )
 {
     SaxExpatParser_Impl *pImpl = ((SaxExpatParser_Impl*)pvThis);
     if( pImpl->rDocumentHandler.is() ) {
-        CALL_ELEMENT_HANDLER_AND_CARE_FOR_EXCEPTIONS(
+        CALL_ELEMENT_HANDLER_AND_CARE_FOR_EXCEPTIONS( 
                     pImpl ,
                     rDocumentHandler->processingInstruction( XML_CHAR_TO_OUSTRING( sTarget ),
                     XML_CHAR_TO_OUSTRING( sData ) ) );
-    }
+    }	
 }
 
 
@@ -852,30 +852,30 @@ void SaxExpatParser_Impl::callbackUnparsedEntityDecl(void *pvThis ,
     SaxExpatParser_Impl *pImpl = ((SaxExpatParser_Impl*)pvThis);
     if( pImpl->rDTDHandler.is() ) {
         CALL_ELEMENT_HANDLER_AND_CARE_FOR_EXCEPTIONS(
-            pImpl ,
+            pImpl , 
             rDTDHandler->unparsedEntityDecl(
-                XML_CHAR_TO_OUSTRING( entityName ),
+                XML_CHAR_TO_OUSTRING( entityName ), 
                 XML_CHAR_TO_OUSTRING( publicId ) ,
                 XML_CHAR_TO_OUSTRING( systemId ) ,
                 XML_CHAR_TO_OUSTRING( notationName ) ) );
     }
 }
-
-void SaxExpatParser_Impl::callbackNotationDecl( void *pvThis,
+                                              
+void SaxExpatParser_Impl::callbackNotationDecl(	void *pvThis,
                                                 const XML_Char *notationName,
                                                 const XML_Char * /*base*/,
                                                 const XML_Char *systemId,
                                                 const XML_Char *publicId)
 {
     SaxExpatParser_Impl *pImpl = ((SaxExpatParser_Impl*)pvThis);
-    if( pImpl->rDTDHandler.is() ) {
+    if( pImpl->rDTDHandler.is() ) {		
         CALL_ELEMENT_HANDLER_AND_CARE_FOR_EXCEPTIONS( pImpl,
-                rDTDHandler->notationDecl(  XML_CHAR_TO_OUSTRING( notationName ) ,
+                rDTDHandler->notationDecl( 	XML_CHAR_TO_OUSTRING( notationName ) ,
                                             XML_CHAR_TO_OUSTRING( publicId ) ,
                                             XML_CHAR_TO_OUSTRING( systemId ) ) );
     }
 
-}
+}										
 
 
 
@@ -890,7 +890,7 @@ int SaxExpatParser_Impl::callbackExternalEntityRef( XML_Parser parser,
     SaxExpatParser_Impl *pImpl = ((SaxExpatParser_Impl*)XML_GetUserData( parser ));
 
     struct Entity entity;
-
+    
     if( pImpl->rEntityResolver.is() ) {
         try
         {
@@ -945,7 +945,7 @@ int SaxExpatParser_Impl::callbackExternalEntityRef( XML_Parser parser,
         }
 
         pImpl->popEntity();
-
+        
         XML_ParserFree( entity.pParser );
     }
 
@@ -957,7 +957,7 @@ int SaxExpatParser_Impl::callbackUnknownEncoding(void * /*encodingHandlerData*/,
                                                  XML_Encoding * /*info*/)
 {
     return 0;
-}
+}					  							
 
 void SaxExpatParser_Impl::callbackDefault( void *pvThis,  const XML_Char *s,  int len)
 {
@@ -1002,9 +1002,9 @@ void SaxExpatParser_Impl::callErrorHandler( SaxExpatParser_Impl *pImpl ,
         pImpl->bExceptionWasThrown = sal_True;
     }
     catch( SAXException & ex ) {
-        pImpl->exception = SAXParseException(
-                                    ex.Message,
-                                    ex.Context,
+        pImpl->exception = SAXParseException( 
+                                    ex.Message, 
+                                    ex.Context, 
                                     ex.WrappedException,
                                     pImpl->rDocumentLocator->getPublicId(),
                                     pImpl->rDocumentLocator->getSystemId(),
@@ -1012,7 +1012,7 @@ void SaxExpatParser_Impl::callErrorHandler( SaxExpatParser_Impl *pImpl ,
                                     pImpl->rDocumentLocator->getColumnNumber()
                              );
         pImpl->bExceptionWasThrown = sal_True;
-    }
+    }		
 }
 
 void SaxExpatParser_Impl::callbackEndCDATA( void *pvThis )
@@ -1025,7 +1025,7 @@ void SaxExpatParser_Impl::callbackEndCDATA( void *pvThis )
 }
 using namespace sax_expatwrap;
 
-extern "C"
+extern "C" 
 {
 
 void SAL_CALL component_getImplementationEnvironment(
@@ -1044,16 +1044,16 @@ sal_Bool SAL_CALL component_writeInfo(
         {
             Reference< XRegistryKey > xKey(
                 reinterpret_cast< XRegistryKey * >( pRegistryKey ) );
-
+            
             Reference< XRegistryKey > xNewKey = xKey->createKey(
                 OUString::createFromAscii( "/" IMPLEMENTATION_NAME "/UNO/SERVICES" ) );
             xNewKey->createKey( OUString::createFromAscii( SERVICE_NAME ) );
-
+    
             xNewKey = xKey->createKey( OUString::createFromAscii("/") +
                                        SaxWriter_getImplementationName()+
                                        OUString::createFromAscii( "/UNO/SERVICES" ) );
             xNewKey->createKey( SaxWriter_getServiceName() );
-
+            
             return sal_True;
         }
         catch (InvalidRegistryException &)
@@ -1069,15 +1069,15 @@ void * SAL_CALL component_getFactory(
     const sal_Char * pImplName, void * pServiceManager, void * /*pRegistryKey*/ )
 {
     void * pRet = 0;
-
+    
     if (pServiceManager )
     {
         Reference< XSingleServiceFactory > xRet;
         Reference< XMultiServiceFactory > xSMgr =
             reinterpret_cast< XMultiServiceFactory * > ( pServiceManager );
-
+        
         OUString aImplementationName = OUString::createFromAscii( pImplName );
-
+        
         if (aImplementationName ==
             OUString( RTL_CONSTASCII_USTRINGPARAM( IMPLEMENTATION_NAME  ) ) )
         {
@@ -1098,10 +1098,10 @@ void * SAL_CALL component_getFactory(
             pRet = xRet.get();
         }
     }
-
+    
     return pRet;
 }
-
+        
 
 }
 
diff --git a/sax/source/expatwrap/saxwriter.cxx b/sax/source/expatwrap/saxwriter.cxx
index 92d53700aa86..b2f26c6e79a2 100644
--- a/sax/source/expatwrap/saxwriter.cxx
+++ b/sax/source/expatwrap/saxwriter.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
@@ -83,40 +83,40 @@ namespace sax_expatwrap {
 ****/
 //  inline sal_Int32 CalcXMLLen( const Sequence<sal_Int8> & seq , sal_Bool bConvertAll ) throw()
 //  {
-//      sal_Int32 nLen = 0;
-//      const sal_Int8 *pArray = seq.getConstArray();
-
-//      for( int i = 0 ; i < seq.getLength() ; i ++ ) {
-
-//          sal_Int8 c = pArray[i];
-//          switch( c )
-//          {
-//          case '&':       // resemble to &amp;
-//              nLen +=5;
-//              break;
-//          case '<':       // &lt;
-//          case '>':       // &gt;
-//              nLen +=4;
-//              break;
-//          case 39:        // 39 == ''', &apos;
-//          case '"':       // &quot;
-//          case 13:        // &#x0d;
-//              nLen += 6;
-//              break;
-
-//          case 10:        // &#x0a;
-//          case 9:         // &#x09;
-//              if( bConvertAll )
-//              {
-//                  nLen += 6;        //
-//              }
-//              break;
-//          default:
-//              nLen ++;
-//          }
-//      }
-
-//      return nLen;
+//  	sal_Int32 nLen = 0;
+//  	const sal_Int8 *pArray = seq.getConstArray();
+
+//  	for( int i = 0 ; i < seq.getLength() ; i ++ ) {
+
+//  		sal_Int8 c = pArray[i];
+//  		switch( c )
+//  		{
+//  		case '&':       // resemble to &amp;
+//  			nLen +=5;
+//  			break;
+//  		case '<':       // &lt;
+//  		case '>':       // &gt;
+//  			nLen +=4;
+//  			break;
+//  		case 39:        // 39 == ''', &apos;
+//  		case '"':       // &quot;
+//  		case 13:        // &#x0d;
+//  			nLen += 6;
+//  			break;
+
+//  		case 10:        // &#x0a;
+//  		case 9:         // &#x09;
+//  			if( bConvertAll )
+//  			{
+//  				nLen += 6;		  //
+//  			}
+//  			break;
+//  		default:
+//  			nLen ++;
+//  		}
+//  	}
+
+//  	return nLen;
 //  }
 
 enum SaxInvalidCharacterError
@@ -128,13 +128,13 @@ enum SaxInvalidCharacterError
 
 class SaxWriterHelper
 {
-    Reference< XOutputStream >  m_out;
-    Sequence < sal_Int8 >       m_Sequence;
-    sal_Int8*                   mp_Sequence;
+    Reference< XOutputStream >	m_out;
+    Sequence < sal_Int8 >		m_Sequence;
+    sal_Int8*					mp_Sequence;
 
-    sal_Int32                   nLastLineFeedPos; // is negative after writing a sequence
-    sal_uInt32                  nCurrentPos;
-    sal_Bool                    m_bStartElementFinished;
+    sal_Int32					nLastLineFeedPos; // is negative after writing a sequence
+    sal_uInt32					nCurrentPos;
+    sal_Bool					m_bStartElementFinished;
 
 
     inline sal_uInt32 writeSequence() throw( SAXException );
@@ -351,7 +351,7 @@ inline sal_Bool SaxWriterHelper::convertToXML( const sal_Unicode * pStr,
                         else
                         {
                             memcpy( &(pTarget[rPos]) , "&quot;" , 6 );
-                            rPos += 6;        // &quot;
+                            rPos += 6;		  // &quot;
                         }
                     }
                     break;
@@ -635,7 +635,7 @@ inline SaxInvalidCharacterError SaxWriterHelper::startElement(const rtl::OUStrin
             nCurrentPos = writeSequence();
     }
 
-    m_bStartElementFinished = sal_False;    // because the '>' character is not added,
+    m_bStartElementFinished = sal_False;	// because the '>' character is not added,
                                             // because it is possible, that the "/>"
                                             // characters have to add
     return eRet;
@@ -838,7 +838,7 @@ inline sal_Int32 calcXMLByteLength( const sal_Unicode *pStr, sal_Int32 nStrLen,
                 case 9:         // &#x09;
                     if( bNormalizeWhitespace )
                     {
-                        nOutputLength += 6;       //
+                        nOutputLength += 6;		  //
                     }
                     else
                     {
@@ -1003,9 +1003,9 @@ private:
     void writeSequence( const Sequence<sal_Int8> & seq );
     sal_Int32 getIndentPrefixLength( sal_Int32 nFirstLineBreakOccurence ) throw();
 
-    Reference< XOutputStream >  m_out;
-    Sequence < sal_Int8 >       m_seqStartElement;
-    SaxWriterHelper*            mp_SaxWriterHelper;
+    Reference< XOutputStream > 	m_out;
+    Sequence < sal_Int8 > 		m_seqStartElement;
+    SaxWriterHelper*			mp_SaxWriterHelper;
 
     // Status information
     sal_Bool m_bDocStarted : 1;
@@ -1037,7 +1037,7 @@ OUString SaxWriter_getImplementationName() throw()
     return OUString::createFromAscii( "com.sun.star.extensions.xml.sax.Writer" );
 }
 
-Sequence< OUString >    SaxWriter_getSupportedServiceNames(void) throw()
+Sequence< OUString > 	SaxWriter_getSupportedServiceNames(void) throw()
 {
     Sequence<OUString> aRet(1);
     aRet.getArray()[0] = SaxWriter_getServiceName();
@@ -1095,7 +1095,7 @@ Sequence< OUString > SAXWriter::getSupportedServiceNames(void) throw ()
 
 
 
-void SAXWriter::startDocument()                     throw(SAXException, RuntimeException )
+void SAXWriter::startDocument()						throw(SAXException, RuntimeException )
 {
     if( m_bDocStarted || ! m_out.is() || !mp_SaxWriterHelper ) {
         throw SAXException();
@@ -1105,7 +1105,7 @@ void SAXWriter::startDocument()                     throw(SAXException, RuntimeE
 }
 
 
-void SAXWriter::endDocument(void)                   throw(SAXException, RuntimeException)
+void SAXWriter::endDocument(void) 					throw(SAXException, RuntimeException)
 {
     if( ! m_bDocStarted )
     {
@@ -1204,7 +1204,7 @@ void SAXWriter::startElement(const OUString& aName, const Reference< XAttributeL
     }
 }
 
-void SAXWriter::endElement(const OUString& aName)   throw (SAXException, RuntimeException)
+void SAXWriter::endElement(const OUString& aName) 	throw (SAXException, RuntimeException)
 {
     if( ! m_bDocStarted ) {
         throw SAXException ();
@@ -1240,7 +1240,7 @@ void SAXWriter::endElement(const OUString& aName)   throw (SAXException, Runtime
     }
 }
 
-void SAXWriter::characters(const OUString& aChars)  throw(SAXException, RuntimeException)
+void SAXWriter::characters(const OUString& aChars) 	throw(SAXException, RuntimeException)
 {
     if( ! m_bDocStarted )
     {
@@ -1410,7 +1410,7 @@ void SAXWriter::comment(const OUString& sComment) throw(SAXException, RuntimeExc
 }
 
 
-void SAXWriter::allowLineBreak( )   throw ( SAXException , RuntimeException)
+void SAXWriter::allowLineBreak( ) 	throw ( SAXException , RuntimeException)
 {
     if( ! m_bDocStarted || m_bAllowLineBreak ) {
         throw SAXException();
diff --git a/sax/source/expatwrap/xml2utf.cxx b/sax/source/expatwrap/xml2utf.cxx
index bbd72b2a0d8b..416a526c9426 100644
--- a/sax/source/expatwrap/xml2utf.cxx
+++ b/sax/source/expatwrap/xml2utf.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
@@ -52,7 +52,7 @@ sal_Int32 XMLFile2UTFConverter::readAndConvert( Sequence<sal_Int8> &seq , sal_In
         throw NotConnectedException();
     }
     if( ! m_bStarted ) {
-        nMaxToRead = Max( 512 , nMaxToRead );   // it should be possible to find the encoding attribute
+        nMaxToRead = Max( 512 , nMaxToRead );  	// it should be possible to find the encoding attribute
                                                  // within the first 512 bytes == 128 chars in UCS-4
     }
 
@@ -104,7 +104,7 @@ sal_Int32 XMLFile2UTFConverter::readAndConvert( Sequence<sal_Int8> &seq , sal_In
                 m_pText2Unicode->canContinue() && m_pUnicode2Text->canContinue() ) {
 
                 Sequence<sal_Unicode> seqUnicode = m_pText2Unicode->convert( seq );
-                seq = m_pUnicode2Text->convert( seqUnicode.getConstArray(), seqUnicode.getLength() );
+                seq = m_pUnicode2Text->convert(	seqUnicode.getConstArray(),	seqUnicode.getLength() );
             }
 
             if( ! m_bStarted )
@@ -172,7 +172,7 @@ void XMLFile2UTFConverter::removeEncoding( Sequence<sal_Int8> &seq )
                                 &( seq.getArray()[nStop+1]) ,
                                 seq.getLength() - nStop -1);
                 seq.realloc( seq.getLength() - ( nStop+1 - nFound ) );
-//              str = String( (char * ) seq.getArray() , seq.getLen() );
+//				str = String( (char * ) seq.getArray() , seq.getLen() );
             }
         }
     }
@@ -302,7 +302,7 @@ sal_Bool XMLFile2UTFConverter::scanForEncoding( Sequence< sal_Int8 > &seq )
 
         m_sEncoding = "utf-16";
     }
-    else if( 0xEF == pSource[0] &&
+    else if( 0xEF == pSource[0] && 
              0xBB == pSource[1] &&
              0xBF == pSource[2] )
     {
@@ -383,7 +383,7 @@ void Text2UnicodeConverter::init( rtl_TextEncoding encoding )
     m_bCanContinue = sal_True;
     m_bInitialized = sal_True;
 
-    m_convText2Unicode  = rtl_createTextToUnicodeConverter(encoding);
+    m_convText2Unicode 	= rtl_createTextToUnicodeConverter(encoding);
     m_contextText2Unicode = rtl_createTextToUnicodeContext( m_convText2Unicode );
     m_rtlEncoding = encoding;
 }
@@ -392,13 +392,13 @@ void Text2UnicodeConverter::init( rtl_TextEncoding encoding )
 Sequence<sal_Unicode> Text2UnicodeConverter::convert( const Sequence<sal_Int8> &seqText )
 {
     sal_uInt32 uiInfo;
-    sal_Size nSrcCvtBytes   = 0;
-    sal_Size nTargetCount   = 0;
+    sal_Size nSrcCvtBytes 	= 0;
+    sal_Size nTargetCount 	= 0;
     sal_Size nSourceCount   = 0;
 
     // the whole source size
-    sal_Int32   nSourceSize = seqText.getLength() + m_seqSource.getLength();
-    Sequence<sal_Unicode>   seqUnicode ( nSourceSize );
+    sal_Int32 	nSourceSize = seqText.getLength() + m_seqSource.getLength();
+    Sequence<sal_Unicode> 	seqUnicode ( nSourceSize );
 
     const sal_Int8 *pbSource = seqText.getConstArray();
     sal_Int8 *pbTempMem = 0;
@@ -417,7 +417,7 @@ Sequence<sal_Unicode> Text2UnicodeConverter::convert( const Sequence<sal_Int8> &
     while( sal_True ) {
 
         /* All invalid characters are transformed to the unicode undefined char */
-        nTargetCount +=     rtl_convertTextToUnicode(
+        nTargetCount += 	rtl_convertTextToUnicode(
                                     m_convText2Unicode,
                                     m_contextText2Unicode,
                                     ( const sal_Char * ) &( pbSource[nSourceCount] ),
@@ -512,7 +512,7 @@ Sequence<sal_Int8> Unicode2TextConverter::convert(const sal_Unicode *puSource ,
     // which most often used as the target.
     sal_Int32 nSeqSize =  nSourceSize * 3;
 
-    Sequence<sal_Int8>  seqText( nSeqSize );
+    Sequence<sal_Int8> 	seqText( nSeqSize );
     sal_Char *pTarget = (sal_Char *) seqText.getArray();
     while( sal_True ) {
 
@@ -561,7 +561,7 @@ void Unicode2TextConverter::init( rtl_TextEncoding encoding )
     m_bCanContinue = sal_True;
     m_bInitialized = sal_True;
 
-    m_convUnicode2Text  = rtl_createUnicodeToTextConverter( encoding );
+    m_convUnicode2Text 	= rtl_createUnicodeToTextConverter( encoding );
     m_contextUnicode2Text = rtl_createUnicodeToTextContext( m_convUnicode2Text );
     m_rtlEncoding = encoding;
 };
diff --git a/sax/source/fastparser/facreg.cxx b/sax/source/fastparser/facreg.cxx
index 1916a9740f1a..8022be967fc6 100644
--- a/sax/source/fastparser/facreg.cxx
+++ b/sax/source/fastparser/facreg.cxx
@@ -16,16 +16,16 @@ namespace sax_fastparser
 {
 
 //--------------------------------------
-// the extern interface
+// the extern interface 
 //---------------------------------------
 Reference< XInterface > SAL_CALL FastSaxParser_CreateInstance( const Reference< XMultiServiceFactory  >  & ) throw(Exception)
-{
+{	
     FastSaxParser *p = new FastSaxParser;
     return Reference< XInterface > ( (OWeakObject * ) p );
 }
 
 Reference< XInterface > SAL_CALL FastSaxSerializer_CreateInstance( const Reference< XMultiServiceFactory  >  & ) throw(Exception)
-{
+{	
     FastSaxSerializer *p = new FastSaxSerializer;
     return Reference< XInterface > ( (OWeakObject * ) p );
 }
@@ -57,7 +57,7 @@ sal_Bool SAL_CALL component_writeInfo(
             Reference< XRegistryKey > xNewKey1( xKey->createKey(
                 OUString::createFromAscii( "/" SERIALIZER_IMPLEMENTATION_NAME "/UNO/SERVICES" ) ) );
             xNewKey1->createKey( OUString::createFromAscii( SERIALIZER_SERVICE_NAME ) );
-
+                
             return sal_True;
         }
         catch (InvalidRegistryException &)
@@ -78,7 +78,7 @@ void * SAL_CALL component_getFactory( const sal_Char * pImplName, void * pServic
         Reference< XMultiServiceFactory > xSMgr( reinterpret_cast< XMultiServiceFactory * > ( pServiceManager ) );
 
         OUString aImplementationName( OUString::createFromAscii( pImplName ) );
-
+        
         if (aImplementationName == OUString( RTL_CONSTASCII_USTRINGPARAM( PARSER_IMPLEMENTATION_NAME  ) ) )
         {
             xRet = createSingleFactory( xSMgr, aImplementationName,
diff --git a/sax/source/fastparser/fastparser.cxx b/sax/source/fastparser/fastparser.cxx
index 1a4cc9278e1e..0fbaae070c7c 100644
--- a/sax/source/fastparser/fastparser.cxx
+++ b/sax/source/fastparser/fastparser.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
@@ -60,11 +60,11 @@ namespace sax_fastparser {
 
 struct SaxContextImpl
 {
-    Reference< XFastContextHandler >    mxContext;
-    sal_uInt32      mnNamespaceCount;
-    sal_Int32       mnElementToken;
-    OUString        maNamespace;
-    OUString        maElementName;
+    Reference< XFastContextHandler >	mxContext;
+    sal_uInt32		mnNamespaceCount;
+    sal_Int32		mnElementToken;
+    OUString		maNamespace;
+    OUString		maElementName;
 
     SaxContextImpl() { mnNamespaceCount = 0; mnElementToken = 0; }
     SaxContextImpl( const SaxContextImplPtr& p ) { mnNamespaceCount = p->mnNamespaceCount; mnElementToken = p->mnElementToken; maNamespace = p->maNamespace; }
@@ -74,9 +74,9 @@ struct SaxContextImpl
 
 struct NamespaceDefine
 {
-    OString     maPrefix;
-    sal_Int32   mnToken;
-    OUString    maNamespaceURL;
+    OString		maPrefix;
+    sal_Int32	mnToken;
+    OUString	maNamespaceURL;
 
     NamespaceDefine( const OString& rPrefix, sal_Int32 nToken, const OUString& rNamespaceURL ) : maPrefix( rPrefix ), mnToken( nToken ), maNamespaceURL( rNamespaceURL ) {}
 };
@@ -437,7 +437,7 @@ void FastSaxParser::splitName( const XML_Char *pwName, const XML_Char *&rpPrefix
 * the file-specific initialization work. (During a parser run, external files may be opened)
 *
 ****************/
-void FastSaxParser::parseStream( const InputSource& maStructSource) throw (SAXException, IOException, RuntimeException)
+void FastSaxParser::parseStream( const InputSource& maStructSource)	throw (SAXException, IOException, RuntimeException)
 {
     // Only one text at one time
     MutexGuard guard( maMutex );
@@ -450,7 +450,7 @@ void FastSaxParser::parseStream( const InputSource& maStructSource) throw (SAXEx
 
     entity.maConverter.setInputStream( entity.maStructSource.aInputStream );
     if( entity.maStructSource.sEncoding.getLength() )
-        entity.maConverter.setEncoding( OUStringToOString( entity.maStructSource.sEncoding, RTL_TEXTENCODING_ASCII_US ) );
+        entity.maConverter.setEncoding(	OUStringToOString( entity.maStructSource.sEncoding, RTL_TEXTENCODING_ASCII_US ) );
 
     // create parser with proper encoding
     entity.mpParser = XML_ParserCreate( 0 );
@@ -459,7 +459,7 @@ void FastSaxParser::parseStream( const InputSource& maStructSource) throw (SAXEx
 
     // set all necessary C-Callbacks
     XML_SetUserData( entity.mpParser, this );
-    XML_SetElementHandler( entity.mpParser, call_callbackStartElement, call_callbackEndElement );
+    XML_SetElementHandler( entity.mpParser,	call_callbackStartElement, call_callbackEndElement );
     XML_SetCharacterDataHandler( entity.mpParser, call_callbackCharacters );
     XML_SetExternalEntityRefHandler( entity.mpParser, call_callbackExternalEntityRef );
 
diff --git a/sax/source/fastparser/fastparser.hxx b/sax/source/fastparser/fastparser.hxx
index a0331fe4035a..a006c403815b 100644
--- a/sax/source/fastparser/fastparser.hxx
+++ b/sax/source/fastparser/fastparser.hxx
@@ -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
@@ -89,7 +89,7 @@ struct Entity : public ParserData
 
     ::std::stack< SaxContextImplPtr >       maContextStack;
     ::std::vector< NamespaceDefineRef >     maNamespaceDefines;
-
+    
     explicit Entity( const ParserData& rData );
     ~Entity();
 };
diff --git a/sax/source/tools/converter.cxx b/sax/source/tools/converter.cxx
index 5df3044bd6d3..057cae6aeaf4 100644
--- a/sax/source/tools/converter.cxx
+++ b/sax/source/tools/converter.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
@@ -57,7 +57,7 @@ const sal_Int8 XML_MAXDIGITSCOUNT_DATETIME = 6;
 #define XML_NULLDATE "NullDate"
 
 /** convert string to measure using optional min and max values*/
-bool Converter::convertMeasure( sal_Int32& rValue,
+bool Converter::convertMeasure(	sal_Int32& rValue,
                                 const OUString& rString,
                                 sal_Int16 nTargetUnit /* = MeasureUnit::MM_100TH */,
                                 sal_Int32 nMin /* = SAL_MIN_INT32 */,
@@ -307,16 +307,16 @@ void Converter::convertMeasure( OUStringBuffer& rBuffer,
             OSL_ENSURE( MeasureUnit::INCH == nTargetUnit,"output unit not supported for twip values" );
         case MeasureUnit::MM:
             // 0.01mm = 0.57twip (exactly)
-            nMul = 25400;   // 25.4 * 1000
-            nDiv = 1440;    // 72 * 20;
+            nMul = 25400;	// 25.4 * 1000
+            nDiv = 1440;	// 72 * 20;
             nFac = 100;
             psUnit = gpsMM;
             break;
 
         case MeasureUnit::CM:
             // 0.001cm = 0.57twip (exactly)
-            nMul = 25400;   // 2.54 * 10000
-            nDiv = 1440;    // 72 * 20;
+            nMul = 25400;	// 2.54 * 10000
+            nDiv = 1440;	// 72 * 20;
             nFac = 1000;
             psUnit = gpsCM;
             break;
@@ -335,7 +335,7 @@ void Converter::convertMeasure( OUStringBuffer& rBuffer,
                         "output unit not supported for twip values" );
             // 0.0001in = 0.144twip (exactly)
             nMul = 100000;
-            nDiv = 1440;    // 72 * 20;
+            nDiv = 1440;	// 72 * 20;
             nFac = 10000;
             psUnit = gpsINCH;
             break;
@@ -372,7 +372,7 @@ void Converter::convertMeasure( OUStringBuffer& rBuffer,
             case MeasureUnit::CM:
                 // 0.001mm = 1 mm/100 (exactly)
                 nMul = 10;
-                nDiv = 1;   // 72 * 20;
+                nDiv = 1;	// 72 * 20;
                 nFac = 10*nFac2;
                 psUnit = gpsCM;
                 break;
@@ -572,7 +572,7 @@ void Converter::convertNumber( OUStringBuffer& rBuffer, sal_Int32 nNumber )
 }
 
 /** convert string to number with optional min and max values */
-bool Converter::convertNumber(  sal_Int32& rValue,
+bool Converter::convertNumber(	sal_Int32& rValue,
                                 const OUString& rString,
                                 sal_Int32 nMin, sal_Int32 nMax )
 {
@@ -1650,7 +1650,7 @@ const
 
 const
   sal_uInt8 aBase64DecodeTable[]  =
-    {                                            62,255,255,255, 63, // 43-47
+    {											 62,255,255,255, 63, // 43-47
 //                                                +               /
 
      52, 53, 54, 55, 56, 57, 58, 59, 60, 61,255,255,255,  0,255,255, // 48-63
@@ -1824,9 +1824,9 @@ void Converter::clearUndefinedChars(rtl::OUString& rTarget, const rtl::OUString&
     {
         sal_Unicode cChar = rSource[i];
         if (!(cChar < 0x0020) ||
-            (cChar == 0x0009) ||        // TAB
-            (cChar == 0x000A) ||        // LF
-            (cChar == 0x000D))          // legal character
+            (cChar == 0x0009) ||		// TAB
+            (cChar == 0x000A) ||		// LF
+            (cChar == 0x000D))			// legal character
             sBuffer.append(cChar);
     }
     rTarget = sBuffer.makeStringAndClear();
diff --git a/sax/source/tools/fastattribs.cxx b/sax/source/tools/fastattribs.cxx
index 4bf9d55c75b8..a91aadc128c9 100644
--- a/sax/source/tools/fastattribs.cxx
+++ b/sax/source/tools/fastattribs.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
diff --git a/sax/source/tools/fastserializer.cxx b/sax/source/tools/fastserializer.cxx
index b0318516b72c..6b0736d264d2 100644
--- a/sax/source/tools/fastserializer.cxx
+++ b/sax/source/tools/fastserializer.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
@@ -97,12 +97,12 @@ namespace sax_fastparser {
         }
         return sBuf.makeStringAndClear();
     }
-
+    
     void FastSaxSerializer::write( const OUString& s )
     {
         OString sOutput( OUStringToOString( s, RTL_TEXTENCODING_UTF8 ) );
-        writeBytes( Sequence< sal_Int8 >(
-                    reinterpret_cast< const sal_Int8*>( sOutput.getStr() ),
+        writeBytes( Sequence< sal_Int8 >( 
+                    reinterpret_cast< const sal_Int8*>( sOutput.getStr() ), 
                     sOutput.getLength() ) );
     }
 
@@ -111,7 +111,7 @@ namespace sax_fastparser {
         if (!mxOutputStream.is())
             return;
     }
-
+    
     void SAL_CALL FastSaxSerializer::writeId( ::sal_Int32 nElement )
     {
         if( HAS_NAMESPACE( nElement ) ) {
@@ -149,11 +149,11 @@ namespace sax_fastparser {
             write(Namespace);
             writeBytes(aColon);
         }
-
+        
         write(Name);
-
+        
         writeFastAttributeList(Attribs);
-
+            
         writeBytes(aClosingBracket);
     }
 
@@ -183,9 +183,9 @@ namespace sax_fastparser {
             write(Namespace);
             writeBytes(aColon);
         }
-
+        
         write(Name);
-
+        
         writeBytes(aClosingBracket);
     }
 
@@ -216,11 +216,11 @@ namespace sax_fastparser {
             write(Namespace);
             writeBytes(aColon);
         }
-
+        
         write(Name);
 
         writeFastAttributeList(Attribs);
-
+            
         writeBytes(aSlashAndClosingBracket);
     }
 
@@ -232,7 +232,7 @@ namespace sax_fastparser {
 
         write( aChars );
     }
-
+    
     void SAL_CALL FastSaxSerializer::setOutputStream( const ::com::sun::star::uno::Reference< ::com::sun::star::io::XOutputStream >& xOutputStream )
         throw (::com::sun::star::uno::RuntimeException)
     {
@@ -258,7 +258,7 @@ namespace sax_fastparser {
             write(escapeXml(pAttr[i].Value));
             writeBytes(aQuote);
         }
-
+        
         Sequence< FastAttribute > aFastAttrSeq = Attribs->getFastAttributes();
         const FastAttribute *pFastAttr = aFastAttrSeq.getConstArray();
         sal_Int32 nFastAttrLength = aFastAttrSeq.getLength();
@@ -268,11 +268,11 @@ namespace sax_fastparser {
 
             sal_Int32 nToken = pFastAttr[j].Token;
             writeId(nToken);
-
+            
             writeBytes(aEqualSignAndQuote);
-
+    
             write(escapeXml(Attribs->getValue(pFastAttr[j].Token)));
-
+            
             writeBytes(aQuote);
         }
     }
@@ -356,7 +356,7 @@ namespace sax_fastparser {
     {
         merge( maData, maPostponed, true );
         maPostponed.realloc( 0 );
-
+        
         return maData;
     }
 
diff --git a/sax/source/tools/fastserializer.hxx b/sax/source/tools/fastserializer.hxx
index a98a0ff7a67d..a616f692449f 100644
--- a/sax/source/tools/fastserializer.hxx
+++ b/sax/source/tools/fastserializer.hxx
@@ -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
@@ -39,8 +39,8 @@
 #include "sax/dllapi.h"
 #include "sax/fshelper.hxx"
 
-#define SERIALIZER_IMPLEMENTATION_NAME  "com.sun.star.comp.extensions.xml.sax.FastSerializer"
-#define SERIALIZER_SERVICE_NAME     "com.sun.star.xml.sax.FastSerializer"
+#define SERIALIZER_IMPLEMENTATION_NAME	"com.sun.star.comp.extensions.xml.sax.FastSerializer"
+#define SERIALIZER_SERVICE_NAME		"com.sun.star.xml.sax.FastSerializer"
 
 namespace sax_fastparser {
 
@@ -53,8 +53,8 @@ public:
     ::com::sun::star::uno::Reference< ::com::sun::star::io::XOutputStream > getOutputStream() {return mxOutputStream;}
 
     // The implementation details
-    static ::com::sun::star::uno::Sequence< ::rtl::OUString >   getSupportedServiceNames_Static(void);
-    static ::rtl::OUString                                      getImplementationName_Static();
+    static ::com::sun::star::uno::Sequence< ::rtl::OUString > 	getSupportedServiceNames_Static(void);
+    static ::rtl::OUString 				                        getImplementationName_Static();
 
     // XFastSerializer
     virtual void SAL_CALL startDocument(  ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException);
@@ -138,7 +138,7 @@ private:
         void prepend( const Int8Sequence &rWhat );
         void append( const Int8Sequence &rWhat );
         void postpone( const Int8Sequence &rWhat );
-
+        
     private:
         static void merge( Int8Sequence &rTop, const Int8Sequence &rMerge, bool bAppend );
     };
diff --git a/sax/source/tools/fshelper.cxx b/sax/source/tools/fshelper.cxx
index 743f499fb4f0..035382858da1 100644
--- a/sax/source/tools/fshelper.cxx
+++ b/sax/source/tools/fshelper.cxx
@@ -72,7 +72,7 @@ void FastSerializerHelper::endElement(const char* elementName)
 {
     mpSerializer->endUnknownElement(::rtl::OUString(), ::rtl::OUString::createFromAscii(elementName));
 }
-
+    
 void FastSerializerHelper::startElementV(sal_Int32 elementTokenId, va_list args)
 {
     FastAttributeList* pAttrList = new FastAttributeList( mxTokenHandler );
@@ -101,8 +101,8 @@ void FastSerializerHelper::singleElementV(sal_Int32 elementTokenId, va_list args
         if (nName == FSEND)
             break;
         const char* pValue = va_arg(args, const char*);
-        if  (pValue)
-            pAttrList->add(nName, pValue);
+        if 	(pValue)
+            pAttrList->add(nName, pValue);	
     }
 
     const com::sun::star::uno::Reference<com::sun::star::xml::sax::XFastAttributeList> xAttrList(pAttrList);
@@ -122,7 +122,7 @@ void FastSerializerHelper::startElementV(sal_Int32 elementTokenId, XFastAttribut
 
 void FastSerializerHelper::singleElement(const char* elementName, XFastAttributeListRef xAttrList)
 {
-    mpSerializer->singleUnknownElement(::rtl::OUString(), ::rtl::OUString::createFromAscii(elementName), xAttrList);
+    mpSerializer->singleUnknownElement(::rtl::OUString(), ::rtl::OUString::createFromAscii(elementName), xAttrList);	
 }
 
 void FastSerializerHelper::singleElementV(sal_Int32 elementTokenId, XFastAttributeListRef xAttrList)
@@ -196,6 +196,6 @@ FastAttributeList * FastSerializerHelper::createAttrList()
 {
     return new FastAttributeList( mxTokenHandler );
 }
-
+    
 
 }
diff --git a/sax/test/sax/factory.hxx b/sax/test/sax/factory.hxx
index 4ab5553a8b78..1f5647f1ffc3 100644
--- a/sax/test/sax/factory.hxx
+++ b/sax/test/sax/factory.hxx
@@ -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
@@ -30,7 +30,7 @@ namespace sax_test {
 Reference< XInterface > SAL_CALL OSaxWriterTest_CreateInstance(
     const Reference< XMultiServiceFactory > & rSMgr ) throw ( Exception );
 OUString    OSaxWriterTest_getServiceName( ) throw();
-OUString    OSaxWriterTest_getImplementationName( ) throw();
+OUString 	OSaxWriterTest_getImplementationName( ) throw();
 Sequence<OUString> OSaxWriterTest_getSupportedServiceNames( ) throw();
 }
 #define BUILD_ERROR(expr, Message)\
@@ -51,7 +51,7 @@ Sequence<OUString> OSaxWriterTest_getSupportedServiceNames( ) throw();
                        OStringToOUString( str.makeStringAndClear() , RTL_TEXTENCODING_ASCII_US ); \
         }\
         ((void)0)
-
+        
 
 #define WARNING_ASSERT(expr, Message) \
         if( ! (expr) ) { \
diff --git a/sax/test/sax/testsax.cxx b/sax/test/sax/testsax.cxx
index b51f4cb59181..54a7610e5589 100644
--- a/sax/test/sax/testsax.cxx
+++ b/sax/test/sax/testsax.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
@@ -74,18 +74,18 @@ public:
     virtual void SAL_CALL testInvariant(
         const OUString& TestName,
         const Reference < XInterface >& TestObject)
-        throw ( IllegalArgumentException, RuntimeException);
+        throw (	IllegalArgumentException, RuntimeException);
 
     virtual sal_Int32 SAL_CALL test(
         const OUString& TestName,
         const Reference < XInterface >& TestObject,
         sal_Int32 hTestHandle)
-        throw ( IllegalArgumentException,RuntimeException);
+        throw (	IllegalArgumentException,RuntimeException);
 
-    virtual sal_Bool SAL_CALL testPassed(void) throw (  RuntimeException);
-    virtual Sequence< OUString > SAL_CALL getErrors(void)               throw (RuntimeException);
-    virtual Sequence< Any > SAL_CALL getErrorExceptions(void)       throw (RuntimeException);
-    virtual Sequence< OUString > SAL_CALL getWarnings(void)                 throw (RuntimeException);
+    virtual sal_Bool SAL_CALL testPassed(void) throw (	RuntimeException);
+    virtual Sequence< OUString > SAL_CALL getErrors(void) 				throw (RuntimeException);
+    virtual Sequence< Any > SAL_CALL getErrorExceptions(void) 		throw (RuntimeException);
+    virtual Sequence< OUString > SAL_CALL getWarnings(void) 				throw (RuntimeException);
 
 private:
     void testSimple( const Reference < XParser > &r );
@@ -95,9 +95,9 @@ private:
     void testPerformance( const Reference < XParser > &rParser );
 
 private:
-    Sequence<Any>       m_seqExceptions;
-    Sequence<OUString>      m_seqErrors;
-    Sequence<OUString>      m_seqWarnings;
+    Sequence<Any>  		m_seqExceptions;
+    Sequence<OUString> 		m_seqErrors;
+    Sequence<OUString> 		m_seqWarnings;
     Reference < XMultiServiceFactory > m_rFactory;
 };
 
@@ -120,7 +120,7 @@ OUString     OSaxParserTest_getServiceName( ) throw ()
     return OUString( RTL_CONSTASCII_USTRINGPARAM("test.com.sun.star.xml.sax.Parser" ));
 }
 
-OUString    OSaxParserTest_getImplementationName( ) throw ()
+OUString 	OSaxParserTest_getImplementationName( ) throw ()
 {
     return OUString( RTL_CONSTASCII_USTRINGPARAM("test.extensions.xml.sax.Parser"));
 }
@@ -140,7 +140,7 @@ Sequence<OUString> OSaxParserTest_getSupportedServiceNames( ) throw ()
 void OSaxParserTest::testInvariant(
     const OUString& TestName,
     const Reference < XInterface >& TestObject )
-    throw ( IllegalArgumentException, RuntimeException)
+    throw (	IllegalArgumentException, RuntimeException)
 {
     if( OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.xml.sax.Parser")) == TestName ) {
         Reference < XParser > parser( TestObject , UNO_QUERY );
@@ -154,7 +154,7 @@ sal_Int32 OSaxParserTest::test(
     const OUString& TestName,
     const Reference < XInterface >& TestObject,
     sal_Int32 hTestHandle)
-    throw ( IllegalArgumentException, RuntimeException)
+    throw (	IllegalArgumentException, RuntimeException)
 {
     if( OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.xml.sax.Parser")) == TestName )  {
         try
@@ -208,25 +208,25 @@ sal_Int32 OSaxParserTest::test(
 
 
 
-sal_Bool OSaxParserTest::testPassed(void)                                       throw (RuntimeException)
+sal_Bool OSaxParserTest::testPassed(void) 										throw (RuntimeException)
 {
     return m_seqErrors.getLength() == 0;
 }
 
 
-Sequence< OUString > OSaxParserTest::getErrors(void)                            throw (RuntimeException)
+Sequence< OUString > OSaxParserTest::getErrors(void) 							throw (RuntimeException)
 {
     return m_seqErrors;
 }
 
 
-Sequence< Any > OSaxParserTest::getErrorExceptions(void)                    throw (RuntimeException)
+Sequence< Any > OSaxParserTest::getErrorExceptions(void) 					throw (RuntimeException)
 {
     return m_seqExceptions;
 }
 
 
-Sequence< OUString > OSaxParserTest::getWarnings(void)                      throw (RuntimeException)
+Sequence< OUString > OSaxParserTest::getWarnings(void) 						throw (RuntimeException)
 {
     return m_seqWarnings;
 }
@@ -472,19 +472,19 @@ public:
     int m_iWhitespaceCount;
     int m_iCharCount;
     sal_Bool m_bPrint;
-
+    
     Reference < XMultiServiceFactory > m_xSMgr;
     Reference < XLocator > m_rLocator;
 };
-
-
-void OSaxParserTest::testSimple(    const Reference < XParser > &rParser )
+    
+    
+void OSaxParserTest::testSimple( 	const Reference < XParser > &rParser )
 {
 
     char TestString[] = "<!DOCTYPE personnel [\n"
                         "<!ENTITY testInternal \"internal Test!\">\n"
                         "<!ENTITY test SYSTEM \"external_entity.xml\">\n"
-                        "]>\n"
+                        "]>\n"						
                         "<personnel>\n"
                         "<person> fjklsfdklsdfkl\n"
                         "fjklsfdklsdfkl\n"
@@ -500,37 +500,37 @@ void OSaxParserTest::testSimple(    const Reference < XParser > &rParser )
                         "</HUHU>\n"
                         "</person>\n"
                         "</personnel>\n\n\n";
-
+    
     Sequence< sal_Int8> seqBytes( strlen( TestString ) );
     memcpy( seqBytes.getArray() , TestString , strlen( TestString ) );
 
-
+    
     Reference< XInputStream > rInStream;
     OUString sInput;
     rInStream = createStreamFromSequence( seqBytes , m_rFactory );
     sInput = OUString( OUString( RTL_CONSTASCII_USTRINGPARAM("internal")) );
-
+    
     if( rParser.is() ) {
         InputSource source;
 
         source.aInputStream = rInStream;
-        source.sSystemId    = sInput;
-
+        source.sSystemId 	= sInput;
+        
         TestDocumentHandler *pDocHandler = new TestDocumentHandler( m_rFactory , sal_False );
         Reference < XDocumentHandler > rDocHandler( (XDocumentHandler *) pDocHandler , UNO_QUERY );
         Reference< XEntityResolver >
             rEntityResolver( (XEntityResolver *) pDocHandler , UNO_QUERY );
-
+    
         rParser->setDocumentHandler( rDocHandler );
         rParser->setEntityResolver( rEntityResolver );
 
         try
         {
             rParser->parseStream( source );
-            ERROR_ASSERT( pDocHandler->m_iElementCount      == 4 , "wrong element count"    );
-            ERROR_ASSERT( pDocHandler->m_iAttributeCount    == 2 , "wrong attribut count"   );
-            ERROR_ASSERT( pDocHandler->m_iCharCount         == 130 , "wrong char count"     );
-            ERROR_ASSERT( pDocHandler->m_iWhitespaceCount   == 0, "wrong whitespace count" );
+            ERROR_ASSERT( pDocHandler->m_iElementCount 		== 4 , "wrong element count" 	);
+            ERROR_ASSERT( pDocHandler->m_iAttributeCount 	== 2 , "wrong attribut count" 	);
+            ERROR_ASSERT( pDocHandler->m_iCharCount 		== 130 , "wrong char count" 	);
+            ERROR_ASSERT( pDocHandler->m_iWhitespaceCount 	== 0, "wrong whitespace count" );
         }
         catch( SAXParseException & e )
         {
@@ -539,8 +539,8 @@ void OSaxParserTest::testSimple(    const Reference < XParser > &rParser )
         }
         catch( SAXException & e )
         {
-            OString o1 = OUStringToOString(e.Message, RTL_TEXTENCODING_UTF8 );
-            BUILD_ERROR( 1 , o1.getStr() );
+            OString o1 = OUStringToOString(e.Message, RTL_TEXTENCODING_UTF8 );			
+            BUILD_ERROR( 1 , o1.getStr() );				
         }
         catch( Exception & e )
         {
@@ -557,7 +557,7 @@ void OSaxParserTest::testSimple(    const Reference < XParser > &rParser )
 void OSaxParserTest::testNamespaces( const Reference < XParser > &rParser )
 {
 
-    char TestString[] =
+    char TestString[] = 
     "<?xml version='1.0'?>\n"
       "<!-- all elements here are explicitly in the HTML namespace -->\n"
       "<html:html xmlns:html='http://www.w3.org/TR/REC-html40'>\n"
@@ -569,49 +569,49 @@ void OSaxParserTest::testNamespaces( const Reference < XParser > &rParser )
     Sequence<sal_Int8> seqBytes( strlen( TestString ) );
     memcpy( seqBytes.getArray() , TestString , strlen( TestString ) );
 
-
+    
     Reference< XInputStream >  rInStream;
     OUString sInput;
 
     rInStream = createStreamFromSequence( seqBytes , m_rFactory );
     sInput = OUString( RTL_CONSTASCII_USTRINGPARAM( "internal" ));
-
+    
     if( rParser.is() ) {
         InputSource source;
 
         source.aInputStream = rInStream;
-        source.sSystemId    = sInput;
-
+        source.sSystemId 	= sInput;
+        
         TestDocumentHandler *pDocHandler = new TestDocumentHandler( m_rFactory , sal_False );
         Reference < XDocumentHandler > rDocHandler( (XDocumentHandler *) pDocHandler , UNO_QUERY );
-        Reference< XEntityResolver >    rEntityResolver(
+        Reference< XEntityResolver >	rEntityResolver(
             (XEntityResolver *) pDocHandler , UNO_QUERY );
-
+    
         rParser->setDocumentHandler( rDocHandler );
         rParser->setEntityResolver( rEntityResolver );
 
         try
         {
             rParser->parseStream( source );
-            ERROR_ASSERT( pDocHandler->m_iElementCount      == 6 , "wrong element count"    );
-            ERROR_ASSERT( pDocHandler->m_iAttributeCount    == 2 , "wrong attribut count"   );
-            ERROR_ASSERT( pDocHandler->m_iCharCount         == 33, "wrong char count"       );
-            ERROR_ASSERT( pDocHandler->m_iWhitespaceCount   == 0 , "wrong whitespace count" );
+            ERROR_ASSERT( pDocHandler->m_iElementCount 		== 6 , "wrong element count" 	);
+            ERROR_ASSERT( pDocHandler->m_iAttributeCount 	== 2 , "wrong attribut count" 	);
+            ERROR_ASSERT( pDocHandler->m_iCharCount 		== 33, "wrong char count" 		);
+            ERROR_ASSERT( pDocHandler->m_iWhitespaceCount 	== 0 , "wrong whitespace count" );
         }
         catch( Exception & e ) {
-            OString o1 = OUStringToOString(e.Message, RTL_TEXTENCODING_UTF8 );
-            BUILD_ERROR( 1 , o1.getStr() );
+            OString o1 = OUStringToOString(e.Message, RTL_TEXTENCODING_UTF8 );			
+            BUILD_ERROR( 1 , o1.getStr() );				
         }
         catch( ... )
         {
             BUILD_ERROR( 1 , "unknown exception" );
         }
-    }
+    }  	
 }
 
 void OSaxParserTest::testEncoding( const Reference < XParser > &rParser )
 {
-    char TestString[] =
+    char TestString[] = 
     "<?xml version='1.0' encoding=\"iso-8859-1\"?>\n"
       "<!-- all elements here are explicitly in the HTML namespace -->\n"
       "<html:html xmlns:html='http://www.w3.org/TR/REC-html40'>\n"
@@ -623,23 +623,23 @@ void OSaxParserTest::testEncoding( const Reference < XParser > &rParser )
     Sequence<sal_Int8> seqBytes( strlen( TestString ) );
     memcpy( seqBytes.getArray() , TestString , strlen( TestString ) );
 
-
+    
     Reference< XInputStream > rInStream;
     OUString sInput;
 
     rInStream = createStreamFromSequence( seqBytes , m_rFactory );
     sInput = OUString( RTL_CONSTASCII_USTRINGPARAM("internal") );
-
+    
     if( rParser.is() ) {
         InputSource source;
 
         source.aInputStream = rInStream;
-        source.sSystemId    = sInput;
-
+        source.sSystemId 	= sInput;
+        
         TestDocumentHandler *pDocHandler = new TestDocumentHandler( m_rFactory , sal_False );
         Reference < XDocumentHandler > rDocHandler( (XDocumentHandler *) pDocHandler , UNO_QUERY );
         Reference< XEntityResolver >  rEntityResolver( (XEntityResolver *) pDocHandler , UNO_QUERY );
-
+    
         rParser->setDocumentHandler( rDocHandler );
         rParser->setEntityResolver( rEntityResolver );
         try
@@ -648,8 +648,8 @@ void OSaxParserTest::testEncoding( const Reference < XParser > &rParser )
         }
         catch( Exception & e )
         {
-            OString o1 = OUStringToOString(e.Message, RTL_TEXTENCODING_UTF8 );
-            BUILD_ERROR( 1 , o1.getStr() );
+            OString o1 = OUStringToOString(e.Message, RTL_TEXTENCODING_UTF8 );			
+            BUILD_ERROR( 1 , o1.getStr() );				
         }
         catch ( ... )
         {
@@ -658,24 +658,24 @@ void OSaxParserTest::testEncoding( const Reference < XParser > &rParser )
     }
 }
 
-void OSaxParserTest::testFile( const Reference < XParser > & rParser )
+void OSaxParserTest::testFile( const Reference < XParser > & rParser ) 
 {
-
+        
     Reference< XInputStream > rInStream = createStreamFromFile( "testsax.xml" , m_rFactory );
     OUString sInput = OUString( RTL_CONSTASCII_USTRINGPARAM( "testsax.xml" ) );
 
-
+    
     if( rParser.is() && rInStream.is() ) {
         InputSource source;
 
         source.aInputStream = rInStream;
-        source.sSystemId    = sInput;
-
+        source.sSystemId 	= sInput;
+        
         TestDocumentHandler *pDocHandler = new TestDocumentHandler( m_rFactory , sal_True );
         Reference < XDocumentHandler > rDocHandler( (XDocumentHandler *) pDocHandler , UNO_QUERY );
-        Reference < XEntityResolver >   rEntityResolver( (XEntityResolver *) pDocHandler , UNO_QUERY );
-        Reference < XErrorHandler > rErrorHandler( ( XErrorHandler * )pDocHandler , UNO_QUERY );
-
+        Reference < XEntityResolver >	rEntityResolver( (XEntityResolver *) pDocHandler , UNO_QUERY );
+        Reference < XErrorHandler >	rErrorHandler( ( XErrorHandler * )pDocHandler , UNO_QUERY );
+        
         rParser->setDocumentHandler( rDocHandler );
         rParser->setEntityResolver( rEntityResolver );
         rParser->setErrorHandler( rErrorHandler );
@@ -692,34 +692,34 @@ void OSaxParserTest::testFile( const Reference < XParser > & rParser )
                 SAXParseException *pEx;
                 if( any.getValueType() == getCppuType( &e ) ) {
                     pEx = ( SAXParseException * ) any.getValue();
-                    OString o1 = OUStringToOString(pEx->Message, RTL_TEXTENCODING_UTF8 );
-                    printf( "%s\n" , o1.getStr()  );
+                    OString o1 = OUStringToOString(pEx->Message, RTL_TEXTENCODING_UTF8 );			
+                    printf( "%s\n" , o1.getStr()  );	
                     any = pEx->WrappedException;
                 }
                 else {
-                    break;
+                    break;	
                 }
             }
         }
         catch( SAXException & e )
         {
-            OString o1 = OUStringToOString(e.Message, RTL_TEXTENCODING_UTF8 );
+            OString o1 = OUStringToOString(e.Message, RTL_TEXTENCODING_UTF8 );			
             BUILD_ERROR( 1 , o1.getStr() );
-
+                
         }
         catch( Exception & e ) {
             printf( "normal exception ! %s\n", e.Message );
         }
         catch ( ... )
         {
-            printf( "any exception !!!!\n" );
+            printf( "any exception !!!!\n" );	
         }
-    }
+    }	
 }
 
-void OSaxParserTest::testPerformance( const Reference < XParser > & rParser )
+void OSaxParserTest::testPerformance( const Reference < XParser > & rParser ) 
 {
-
+        
     Reference < XInputStream > rInStream =
         createStreamFromFile( "testPerformance.xml" , m_rFactory );
     OUString sInput = OUString( RTL_CONSTASCII_USTRINGPARAM( "testperformance.xml") );
@@ -728,13 +728,13 @@ void OSaxParserTest::testPerformance( const Reference < XParser > & rParser )
         InputSource source;
 
         source.aInputStream = rInStream;
-        source.sSystemId    = sInput;
-
+        source.sSystemId 	= sInput;
+        
         TestDocumentHandler *pDocHandler = new TestDocumentHandler( m_rFactory , sal_False );
         Reference < XDocumentHandler > rDocHandler( (XDocumentHandler *) pDocHandler , UNO_QUERY );
         Reference < XEntityResolver > rEntityResolver( (XEntityResolver *) pDocHandler , UNO_QUERY );
-        Reference < XErrorHandler > rErrorHandler( ( XErrorHandler * )pDocHandler , UNO_QUERY );
-
+        Reference < XErrorHandler >	rErrorHandler( ( XErrorHandler * )pDocHandler , UNO_QUERY );
+        
         rParser->setDocumentHandler( rDocHandler );
         rParser->setEntityResolver( rEntityResolver );
         rParser->setErrorHandler( rErrorHandler );
@@ -745,12 +745,12 @@ void OSaxParserTest::testPerformance( const Reference < XParser > & rParser )
             osl_getSystemTime( &aStartTime );
             rParser->parseStream( source );
             osl_getSystemTime( &aEndTime );
-
+            
             double fStart = (double)aStartTime.Seconds + ((double)aStartTime.Nanosec / 1000000000.0);
             double fEnd = (double)aEndTime.Seconds + ((double)aEndTime.Nanosec / 1000000000.0);
-
+            
             printf( "Performance reading : %g s\n" , fEnd - fStart );
-
+            
         }
         catch( SAXParseException &e ) {
             Any any;
@@ -760,24 +760,24 @@ void OSaxParserTest::testPerformance( const Reference < XParser > & rParser )
                     SAXParseException ex;
                     any >>= ex;
                     OString o = OUStringToOString( ex.Message , RTL_TEXTENCODING_ASCII_US );
-                    printf( "%s\n" , o.getStr()  );
+                    printf( "%s\n" , o.getStr()  );	
                     any <<= ex.WrappedException;
                 }
                 else {
-                    break;
+                    break;	
                 }
             }
         }
         catch( SAXException &e  ) {
             OString o = OUStringToOString( e.Message , RTL_TEXTENCODING_ASCII_US );
-            printf( "%s\n" , o.getStr()  );
-
+            printf( "%s\n" , o.getStr()  );	
+                
         }
         catch( ... )
         {
-            printf( "any exception !!!!\n" );
+            printf( "any exception !!!!\n" );	
         }
-    }
+    }	
 }
 }
 using namespace sax_test;
@@ -825,7 +825,7 @@ sal_Bool SAL_CALL component_writeInfo(
             OSL_ENSURE( sal_False, "### InvalidRegistryException!" );
         }
     }
-
+    
     return sal_False;
 }
 
@@ -833,13 +833,13 @@ void * SAL_CALL component_getFactory(
     const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey )
 {
     void * pRet = 0;
-
+    
     if (pServiceManager )
     {
         Reference< XSingleServiceFactory > xRet;
         Reference< XMultiServiceFactory > xSMgr =
             reinterpret_cast< XMultiServiceFactory * > ( pServiceManager );
-
+        
         OUString aImplementationName = OUString::createFromAscii( pImplName );
 
 
@@ -861,7 +861,7 @@ void * SAL_CALL component_getFactory(
             pRet = xRet.get();
         }
     }
-
+    
     return pRet;
 }
 
diff --git a/sax/test/sax/testwriter.cxx b/sax/test/sax/testwriter.cxx
index 27c8559d51d4..1ffbbbf6e4b8 100644
--- a/sax/test/sax/testwriter.cxx
+++ b/sax/test/sax/testwriter.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
@@ -117,20 +117,20 @@ public:
     virtual void SAL_CALL testInvariant(
         const OUString& TestName,
         const Reference < XInterface >& TestObject)
-        throw  (    IllegalArgumentException,
+        throw  (	IllegalArgumentException,
                     RuntimeException);
 
     virtual sal_Int32 SAL_CALL test(
         const OUString& TestName,
         const Reference < XInterface >& TestObject,
         sal_Int32 hTestHandle)
-        throw  (    IllegalArgumentException,RuntimeException);
+        throw  (	IllegalArgumentException,RuntimeException);
 
     virtual sal_Bool SAL_CALL testPassed(void)
-        throw  (    RuntimeException);
-    virtual Sequence< OUString > SAL_CALL getErrors(void)               throw  (RuntimeException);
-    virtual Sequence< Any > SAL_CALL getErrorExceptions(void)       throw  (RuntimeException);
-    virtual Sequence< OUString > SAL_CALL getWarnings(void)             throw  (RuntimeException);
+        throw  (	RuntimeException);
+    virtual Sequence< OUString > SAL_CALL getErrors(void) 				throw  (RuntimeException);
+    virtual Sequence< Any > SAL_CALL getErrorExceptions(void) 		throw  (RuntimeException);
+    virtual Sequence< OUString > SAL_CALL getWarnings(void) 			throw  (RuntimeException);
 
 private:
     void testSimple( const Reference< XExtendedDocumentHandler > &r );
@@ -140,9 +140,9 @@ private:
     void writeParagraph( const Reference< XExtendedDocumentHandler > &r , const OUString & s);
 
 private:
-    Sequence<Any>       m_seqExceptions;
-    Sequence<OUString>      m_seqErrors;
-    Sequence<OUString>      m_seqWarnings;
+    Sequence<Any>  		m_seqExceptions;
+    Sequence<OUString> 		m_seqErrors;
+    Sequence<OUString> 		m_seqWarnings;
     Reference < XMultiServiceFactory > m_rFactory;
 
 };
@@ -151,7 +151,7 @@ private:
 
 /*----------------------------------------
 *
-*   Attributlist implementation
+* 	Attributlist implementation
 *
 *----------------------------------------*/
 struct AttributeListImpl_impl;
@@ -188,9 +188,9 @@ struct TagAttribute
                   const OUString &sType ,
                   const OUString &sValue )
     {
-        this->sName     = sName;
-        this->sType     = sType;
-        this->sValue    = sValue;
+        this->sName 	= sName;
+        this->sType 	= sType;
+        this->sValue 	= sValue;
     }
 
     OUString sName;
@@ -287,7 +287,7 @@ AttributeListImpl::~AttributeListImpl()
 }
 
 
-void AttributeListImpl::addAttribute(   const OUString &sName ,
+void AttributeListImpl::addAttribute( 	const OUString &sName ,
                                         const OUString &sType ,
                                         const OUString &sValue )
 {
@@ -327,7 +327,7 @@ OUString     OSaxWriterTest_getServiceName( ) throw  ()
     return OUString( RTL_CONSTASCII_USTRINGPARAM("test.com.sun.star.xml.sax.Writer"));
 }
 
-OUString    OSaxWriterTest_getImplementationName( ) throw  ()
+OUString 	OSaxWriterTest_getImplementationName( ) throw  ()
 {
     return OUString( RTL_CONSTASCII_USTRINGPARAM("test.extensions.xml.sax.Writer"));
 }
@@ -345,7 +345,7 @@ Sequence<OUString> OSaxWriterTest_getSupportedServiceNames( ) throw  ()
 
 void OSaxWriterTest::testInvariant( const OUString& TestName,
                                     const Reference < XInterface >& TestObject )
-    throw  (    IllegalArgumentException, RuntimeException)
+    throw  (	IllegalArgumentException, RuntimeException)
 {
     if( OUString::createFromAscii("com.sun.star.xml.sax.Writer") == TestName ) {
         Reference< XDocumentHandler > doc( TestObject , UNO_QUERY );
@@ -366,7 +366,7 @@ sal_Int32 OSaxWriterTest::test(
     const OUString& TestName,
     const Reference < XInterface >& TestObject,
     sal_Int32 hTestHandle)
-    throw  (    IllegalArgumentException,RuntimeException)
+    throw  (	IllegalArgumentException,RuntimeException)
 {
     if( OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.xml.sax.Writer")) == TestName )
     {
@@ -418,7 +418,7 @@ sal_Int32 OSaxWriterTest::test(
 
 
 
-sal_Bool OSaxWriterTest::testPassed(void)                   throw  (RuntimeException)
+sal_Bool OSaxWriterTest::testPassed(void)					throw  (RuntimeException)
 {
     return m_seqErrors.getLength() == 0;
 }
@@ -430,13 +430,13 @@ Sequence< OUString > OSaxWriterTest::getErrors(void) throw  (RuntimeException)
 }
 
 
-Sequence< Any > OSaxWriterTest::getErrorExceptions(void)                    throw  (RuntimeException)
+Sequence< Any > OSaxWriterTest::getErrorExceptions(void) 					throw  (RuntimeException)
 {
     return m_seqExceptions;
 }
 
 
-Sequence< OUString > OSaxWriterTest::getWarnings(void)                      throw  (RuntimeException)
+Sequence< OUString > OSaxWriterTest::getWarnings(void) 						throw  (RuntimeException)
 {
     return m_seqWarnings;
 }
@@ -488,7 +488,7 @@ void OSaxWriterTest::testSimple( const Reference< XExtendedDocumentHandler > &r
 
     pList->addAttribute( OUString( RTL_CONSTASCII_USTRINGPARAM("Arg1" )),
                          OUString( RTL_CONSTASCII_USTRINGPARAM("CDATA")) ,
-                         OUString( RTL_CONSTASCII_USTRINGPARAM("bla\n   u")) );
+                         OUString( RTL_CONSTASCII_USTRINGPARAM("bla\n	u")) );
     pList->addAttribute( OUString( RTL_CONSTASCII_USTRINGPARAM("Arg2")) ,
                          OUString( RTL_CONSTASCII_USTRINGPARAM("CDATA")) ,
                          OUString( RTL_CONSTASCII_USTRINGPARAM("blub")) );
diff --git a/sax/test/saxdemo.cxx b/sax/test/saxdemo.cxx
index 6023f09ac948..ffd8bf129ed1 100644
--- a/sax/test/saxdemo.cxx
+++ b/sax/test/saxdemo.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
@@ -293,9 +293,9 @@ struct TagAttribute
                   const OUString &sType ,
                   const OUString &sValue )
     {
-        this->sName     = sName;
-        this->sType     = sType;
-        this->sValue    = sValue;
+        this->sName 	= sName;
+        this->sType 	= sType;
+        this->sValue 	= sValue;
     }
 
     OUString sName;
@@ -392,7 +392,7 @@ AttributeListImpl::~AttributeListImpl()
 }
 
 
-void AttributeListImpl::addAttribute(   const OUString &sName ,
+void AttributeListImpl::addAttribute( 	const OUString &sName ,
                                         const OUString &sType ,
                                         const OUString &sValue )
 {
@@ -549,7 +549,7 @@ int main (int argc, char **argv)
         // create and connect the document handler to the parser
         TestDocumentHandler *pDocHandler = new TestDocumentHandler( );
 
-        Reference < XDocumentHandler >  rDocHandler( (XDocumentHandler *) pDocHandler );
+        Reference < XDocumentHandler >	rDocHandler( (XDocumentHandler *) pDocHandler );
         Reference< XEntityResolver > rEntityResolver( (XEntityResolver *) pDocHandler );
 
         rParser->setDocumentHandler( rDocHandler );
@@ -558,7 +558,7 @@ int main (int argc, char **argv)
         // create the input stream
         InputSource source;
         source.aInputStream = createStreamFromFile( argv[1] );
-        source.sSystemId    = OUString::createFromAscii( argv[1] );
+        source.sSystemId 	= OUString::createFromAscii( argv[1] );
 
         try
         {
@@ -598,7 +598,7 @@ int main (int argc, char **argv)
 
         pList->addAttribute( OUString( RTL_CONSTASCII_USTRINGPARAM("Arg1" )),
                              OUString( RTL_CONSTASCII_USTRINGPARAM("CDATA")) ,
-                             OUString( RTL_CONSTASCII_USTRINGPARAM("foo\n   u")) );
+                             OUString( RTL_CONSTASCII_USTRINGPARAM("foo\n	u")) );
         pList->addAttribute( OUString( RTL_CONSTASCII_USTRINGPARAM("Arg2")) ,
                              OUString( RTL_CONSTASCII_USTRINGPARAM("CDATA")) ,
                              OUString( RTL_CONSTASCII_USTRINGPARAM("foo2")) );
diff --git a/sax/test/testcomponent.cxx b/sax/test/testcomponent.cxx
index f22366092b67..cef75e8786e9 100644
--- a/sax/test/testcomponent.cxx
+++ b/sax/test/testcomponent.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
diff --git a/sot/inc/absdev.hxx b/sot/inc/absdev.hxx
index 3d251d98e0b6..9e52ccd31c3b 100644
--- a/sot/inc/absdev.hxx
+++ b/sot/inc/absdev.hxx
@@ -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
@@ -39,8 +39,8 @@ protected:
     JobSetup * pJobSetup;
 public:
     virtual ~AbstractDeviceData() {}
-    virtual AbstractDeviceData *    Copy() const = 0;
-    virtual BOOL                    Equals( const AbstractDeviceData & ) const = 0;
+    virtual AbstractDeviceData *	Copy() const = 0;
+    virtual BOOL					Equals( const AbstractDeviceData & ) const = 0;
 
     JobSetup * GetJobSetup() const { return pJobSetup; }
 };
diff --git a/sot/inc/agg.hxx b/sot/inc/agg.hxx
index 2f8cc7587458..85e7510f69ae 100644
--- a/sot/inc/agg.hxx
+++ b/sot/inc/agg.hxx
@@ -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
@@ -39,10 +39,10 @@ struct SvAggregate
     union
     {
         SotFactory * pFact;
-        SotObject * pObj;
+        SotObject *	pObj;
     };
-    BOOL    bFactory;
-    BOOL    bMainObj; // TRUE, das Objekt, welches das casting steuert
+    BOOL	bFactory;
+    BOOL	bMainObj; // TRUE, das Objekt, welches das casting steuert
 
     SvAggregate()
         : pFact( NULL )
diff --git a/sot/inc/clsids.hxx b/sot/inc/clsids.hxx
index a64df510dd07..54bdb2be0bdd 100644
--- a/sot/inc/clsids.hxx
+++ b/sot/inc/clsids.hxx
@@ -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
diff --git a/sot/inc/filelist.hxx b/sot/inc/filelist.hxx
index 4c6c55534319..ca4e8adb351f 100644
--- a/sot/inc/filelist.hxx
+++ b/sot/inc/filelist.hxx
@@ -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
@@ -35,34 +35,34 @@ class FileStringList;
 
 class SOT_DLLPUBLIC FileList : public SvDataCopyStream
 {
-    FileStringList*     pStrList;
+    FileStringList*		pStrList;
 
 protected:
 
     // SvData-Methoden
-    virtual void        Load( SvStream& );
-    virtual void        Save( SvStream& );
-    virtual void        Assign( const SvDataCopyStream& );
+    virtual	void		Load( SvStream& );
+    virtual	void		Save( SvStream& );
+    virtual	void		Assign( const SvDataCopyStream& );
 
     // Liste loeschen;
     void ClearAll( void );
 
 public:
-
+        
     TYPEINFO();
                         FileList();
                         ~FileList();
 
     // Zuweisungsoperator
-    FileList&           operator=( const FileList& rFileList );
+    FileList&			operator=( const FileList& rFileList );
 
 
     // Im-/Export
-    SOT_DLLPUBLIC friend SvStream&  operator<<( SvStream& rOStm, const FileList& rFileList );
-    SOT_DLLPUBLIC friend SvStream&  operator>>( SvStream& rIStm, FileList& rFileList );
+    SOT_DLLPUBLIC friend SvStream&	operator<<( SvStream& rOStm, const FileList& rFileList );
+    SOT_DLLPUBLIC friend SvStream&	operator>>( SvStream& rIStm, FileList& rFileList );
 
     // Clipboard, D&D usw.
-    static ULONG        GetFormat();
+    static ULONG		GetFormat();
 
 
     // Liste fuellen/abfragen
@@ -70,7 +70,7 @@ public:
     String GetFile( ULONG i ) const;
     ULONG Count( void ) const;
 
-};
+};	
 
 #endif // _FILELIST_HXX
 
diff --git a/sot/inc/pch/precompiled_sot.cxx b/sot/inc/pch/precompiled_sot.cxx
index fea8683f8074..06500aad08d3 100644
--- a/sot/inc/pch/precompiled_sot.cxx
+++ b/sot/inc/pch/precompiled_sot.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
diff --git a/sot/inc/pch/precompiled_sot.hxx b/sot/inc/pch/precompiled_sot.hxx
index 4edee1275640..6359763847d4 100644
--- a/sot/inc/pch/precompiled_sot.hxx
+++ b/sot/inc/pch/precompiled_sot.hxx
@@ -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
diff --git a/sot/inc/sot/exchange.hxx b/sot/inc/sot/exchange.hxx
index dc67e72a4f82..b6c1ac97a9bd 100644
--- a/sot/inc/sot/exchange.hxx
+++ b/sot/inc/sot/exchange.hxx
@@ -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
@@ -64,7 +64,7 @@ struct DataFlavorEx : public ::com::sun::star::datatransfer::DataFlavor
 };
 
 typedef ::std::vector< ::com::sun::star::datatransfer::DataFlavor > DataFlavorVector;
-typedef ::std::vector< DataFlavorEx >                               _DataFlavorExVector;
+typedef ::std::vector< DataFlavorEx >								_DataFlavorExVector;
 
 // JP 23.03.2001 - this struct is only for "hide" the STD of the vetor,
 // because our makefile filter all this symbols and so nowbody can use
@@ -73,8 +73,8 @@ struct DataFlavorExVector : public _DataFlavorExVector
 {
 };
 
-typedef ::std::list< ::com::sun::star::datatransfer::DataFlavor >   DataFlavorList;
-typedef ::std::list< DataFlavorEx >                                 DataFlavorExList;
+typedef ::std::list< ::com::sun::star::datatransfer::DataFlavor >	DataFlavorList;
+typedef ::std::list< DataFlavorEx >									DataFlavorExList;
 
 SOT_DLLPUBLIC sal_Bool IsFormatSupported( const DataFlavorExVector& rDataFlavorExVector,
                             ULONG nId );
@@ -97,73 +97,73 @@ SOT_DLLPUBLIC sal_Bool IsFormatSupported( const DataFlavorExVector& rDataFlavorE
 #define FORMAT_RTF              10
 
 // Source-Options
-#define EXCHG_SOURCE_MOVEABLE       ((USHORT)0x0001)
-#define EXCHG_SOURCE_COPYABLE       ((USHORT)0x0002)
-#define EXCHG_SOURCE_LINKABLE       ((USHORT)0x0004)
-#define EXCHG_SOURCE_PRINTABLE      ((USHORT)0x0008)
-#define EXCHG_SOURCE_DISCARDABLE    ((USHORT)0x0010)
-#define EXCHG_SOURCE_ALL            ((USHORT)0x001F)
-#define EXCHG_SOURCE_DEF_COPYABLE   ((USHORT)0x0020)
+#define EXCHG_SOURCE_MOVEABLE		((USHORT)0x0001)
+#define EXCHG_SOURCE_COPYABLE		((USHORT)0x0002)
+#define EXCHG_SOURCE_LINKABLE		((USHORT)0x0004)
+#define EXCHG_SOURCE_PRINTABLE		((USHORT)0x0008)
+#define EXCHG_SOURCE_DISCARDABLE	((USHORT)0x0010)
+#define EXCHG_SOURCE_ALL			((USHORT)0x001F)
+#define EXCHG_SOURCE_DEF_COPYABLE	((USHORT)0x0020)
 
 // Aktionen
-#define EXCHG_ACTION_MASK                       ((USHORT)0x00FF)
+#define EXCHG_ACTION_MASK						((USHORT)0x00FF)
 #define EXCHG_INOUT_ACTION_NONE                 ((USHORT)com::sun::star::datatransfer::dnd::DNDConstants::ACTION_NONE)
-#define EXCHG_IN_ACTION_DEFAULT                 EXCHG_INOUT_ACTION_NONE
+#define EXCHG_IN_ACTION_DEFAULT					EXCHG_INOUT_ACTION_NONE
 #define EXCHG_IN_ACTION_MOVE                    ((USHORT)com::sun::star::datatransfer::dnd::DNDConstants::ACTION_MOVE)
 #define EXCHG_IN_ACTION_COPY                    ((USHORT)com::sun::star::datatransfer::dnd::DNDConstants::ACTION_COPY)
 #define EXCHG_IN_ACTION_LINK                    ((USHORT)com::sun::star::datatransfer::dnd::DNDConstants::ACTION_LINK)
-#define EXCHG_INOUT_ACTION_PRINT                ((USHORT)8)
-#define EXCHG_INOUT_ACTION_DISCARD              ((USHORT)16)
-#define EXCHG_OUT_ACTION_INSERT_OBJ             ((USHORT)17)
-#define EXCHG_OUT_ACTION_INSERT_BOOKMARK        ((USHORT)18)
-#define EXCHG_OUT_ACTION_INSERT_FILELINK        ((USHORT)19)
-#define EXCHG_OUT_ACTION_INSERT_FILE            ((USHORT)20)
+#define EXCHG_INOUT_ACTION_PRINT				((USHORT)8)
+#define EXCHG_INOUT_ACTION_DISCARD				((USHORT)16)
+#define EXCHG_OUT_ACTION_INSERT_OBJ     		((USHORT)17)
+#define EXCHG_OUT_ACTION_INSERT_BOOKMARK    	((USHORT)18)
+#define EXCHG_OUT_ACTION_INSERT_FILELINK    	((USHORT)19)
+#define EXCHG_OUT_ACTION_INSERT_FILE			((USHORT)20)
 #define EXCHG_OUT_ACTION_INSERT_FILELIST        ((USHORT)21)
 #define EXCHG_OUT_ACTION_INSERT_IMAGEMAP        ((USHORT)22)
-#define EXCHG_OUT_ACTION_INSERT_OLE             ((USHORT)23)
+#define EXCHG_OUT_ACTION_INSERT_OLE	            ((USHORT)23)
 #define EXCHG_OUT_ACTION_INSERT_INTERACTIVE     ((USHORT)24)
-#define EXCHG_OUT_ACTION_INSERT_URLBUTTON       ((USHORT)25)
-#define EXCHG_OUT_ACTION_INSERT_CHAOSOBJ        ((USHORT)26) // OBSOLET ab 500.b  ?
-#define EXCHG_OUT_ACTION_REPLACE_OBJ            ((USHORT)27)
+#define EXCHG_OUT_ACTION_INSERT_URLBUTTON     	((USHORT)25)
+#define EXCHG_OUT_ACTION_INSERT_CHAOSOBJ		((USHORT)26) // OBSOLET ab 500.b  ?
+#define EXCHG_OUT_ACTION_REPLACE_OBJ 			((USHORT)27)
 #define EXCHG_OUT_ACTION_REPLACE_LINK           ((USHORT)28)
 #define EXCHG_OUT_ACTION_REPLACE_IMAGEMAP       ((USHORT)29)
 #define EXCHG_OUT_ACTION_GET_ATTRIBUTES         ((USHORT)30)
-#define EXCHG_OUT_ACTION_UPLOAD                 ((USHORT)31)  // OBSOLET ab 500.b ?
-#define EXCHG_OUT_ACTION_MOVE_FILE              ((USHORT)32)
-#define EXCHG_OUT_ACTION_MOVE_FILELIST          ((USHORT)33)
-#define EXCHG_OUT_ACTION_UPDATE_RANGE           ((USHORT)34)
-#define EXCHG_OUT_ACTION_INSERT_PRIVATE         ((USHORT)35)
-#define EXCHG_OUT_ACTION_INSERT_HTML            ((USHORT)36)
-#define EXCHG_OUT_ACTION_MOVE_PRIVATE           ((USHORT)37)
-#define EXCHG_OUT_ACTION_INSERT_STRING          ((USHORT)38)
-#define EXCHG_OUT_ACTION_INSERT_DRAWOBJ         ((USHORT)39)
-#define EXCHG_OUT_ACTION_INSERT_SVXB            ((USHORT)40)
-#define EXCHG_OUT_ACTION_INSERT_GDIMETAFILE     ((USHORT)41)
-#define EXCHG_OUT_ACTION_INSERT_BITMAP          ((USHORT)42)
-#define EXCHG_OUT_ACTION_INSERT_DDE             ((USHORT)43)
-#define EXCHG_OUT_ACTION_INSERT_HYPERLINK       ((USHORT)44)
-#define EXCHG_OUT_ACTION_REPLACE_DRAWOBJ        ((USHORT)45)
-#define EXCHG_OUT_ACTION_REPLACE_SVXB           ((USHORT)46)
+#define EXCHG_OUT_ACTION_UPLOAD   				((USHORT)31)  // OBSOLET ab 500.b ?
+#define EXCHG_OUT_ACTION_MOVE_FILE				((USHORT)32)
+#define EXCHG_OUT_ACTION_MOVE_FILELIST        	((USHORT)33)
+#define EXCHG_OUT_ACTION_UPDATE_RANGE        	((USHORT)34)
+#define EXCHG_OUT_ACTION_INSERT_PRIVATE			((USHORT)35)
+#define EXCHG_OUT_ACTION_INSERT_HTML			((USHORT)36)
+#define EXCHG_OUT_ACTION_MOVE_PRIVATE			((USHORT)37)
+#define EXCHG_OUT_ACTION_INSERT_STRING			((USHORT)38)
+#define EXCHG_OUT_ACTION_INSERT_DRAWOBJ			((USHORT)39)
+#define EXCHG_OUT_ACTION_INSERT_SVXB			((USHORT)40)
+#define EXCHG_OUT_ACTION_INSERT_GDIMETAFILE		((USHORT)41)
+#define EXCHG_OUT_ACTION_INSERT_BITMAP			((USHORT)42)
+#define EXCHG_OUT_ACTION_INSERT_DDE				((USHORT)43)
+#define EXCHG_OUT_ACTION_INSERT_HYPERLINK		((USHORT)44)
+#define EXCHG_OUT_ACTION_REPLACE_DRAWOBJ      	((USHORT)45)
+#define EXCHG_OUT_ACTION_REPLACE_SVXB      		((USHORT)46)
 #define EXCHG_OUT_ACTION_REPLACE_GDIMETAFILE    ((USHORT)47)
-#define EXCHG_OUT_ACTION_REPLACE_BITMAP         ((USHORT)48)
-#define EXCHG_OUT_ACTION_REPLACE_GRAPH          ((USHORT)49)
-#define EXCHG_OUT_ACTION_INSERT_GRAPH           ((USHORT)50)
-#define EXCHG_OUT_ACTION_INSERT_MSGATTACH       ((USHORT)51)  // obsolet ab 500.b ?
-#define EXCHG_OUT_ACTION_COPY_CHAOSOBJ          ((USHORT)52)
-#define EXCHG_OUT_ACTION_MOVE_CHAOSOBJ          ((USHORT)53)
-#define EXCHG_OUT_ACTION_COPY_MSGATTACH         ((USHORT)54)
-#define EXCHG_OUT_ACTION_COPY_BOOKMARK          ((USHORT)55)
-#define EXCHG_OUT_ACTION_COPY_FILE              ((USHORT)56)
-
-#define EXCHG_OUT_ACTION_FLAG_CREATE_THEME      ((USHORT)0x0100)
-#define EXCHG_OUT_ACTION_FLAG_KEEP_POSSIZE      ((USHORT)0x0200)
-#define EXCHG_OUT_ACTION_FLAG_INSERT_IMAGEMAP   ((USHORT)0x0400)
-#define EXCHG_OUT_ACTION_FLAG_REPLACE_IMAGEMAP  ((USHORT)0x0800)
-#define EXCHG_OUT_ACTION_FLAG_FILL              ((USHORT)0x1000)
-#define EXCHG_OUT_ACTION_FLAG_INSERT_TARGETURL  ((USHORT)0x2000)
+#define EXCHG_OUT_ACTION_REPLACE_BITMAP    		((USHORT)48)
+#define EXCHG_OUT_ACTION_REPLACE_GRAPH			((USHORT)49)
+#define EXCHG_OUT_ACTION_INSERT_GRAPH			((USHORT)50)
+#define EXCHG_OUT_ACTION_INSERT_MSGATTACH		((USHORT)51)  // obsolet ab 500.b ?
+#define EXCHG_OUT_ACTION_COPY_CHAOSOBJ			((USHORT)52)
+#define EXCHG_OUT_ACTION_MOVE_CHAOSOBJ			((USHORT)53)
+#define EXCHG_OUT_ACTION_COPY_MSGATTACH			((USHORT)54)
+#define EXCHG_OUT_ACTION_COPY_BOOKMARK    		((USHORT)55)
+#define EXCHG_OUT_ACTION_COPY_FILE				((USHORT)56)
+
+#define EXCHG_OUT_ACTION_FLAG_CREATE_THEME		((USHORT)0x0100)
+#define EXCHG_OUT_ACTION_FLAG_KEEP_POSSIZE		((USHORT)0x0200)
+#define EXCHG_OUT_ACTION_FLAG_INSERT_IMAGEMAP	((USHORT)0x0400)
+#define EXCHG_OUT_ACTION_FLAG_REPLACE_IMAGEMAP	((USHORT)0x0800)
+#define EXCHG_OUT_ACTION_FLAG_FILL				((USHORT)0x1000)
+#define EXCHG_OUT_ACTION_FLAG_INSERT_TARGETURL	((USHORT)0x2000)
 
 // Ziele
-#define EXCHG_DEST_DOC_OLEOBJ               1
+#define EXCHG_DEST_DOC_OLEOBJ				1
 #define EXCHG_DEST_CHARTDOC_OLEOBJ          2
 #define EXCHG_DEST_DOC_TEXTFRAME            3
 #define EXCHG_DEST_DOC_GRAPHOBJ             4
@@ -188,21 +188,21 @@ class SvGlobalName;
 class SOT_DLLPUBLIC SotExchange
 {
 public:
-    static ULONG    RegisterFormat( const ::com::sun::star::datatransfer::DataFlavor& rFlavor );
-    static ULONG    RegisterFormatName( const String& rName );
-    static ULONG    RegisterFormatMimeType( const String& rMimeType );
-
-    static ULONG    GetFormat( const ::com::sun::star::datatransfer::DataFlavor& rFlavor );
-    static String   GetFormatName( ULONG nFormat );
-    static sal_Bool GetFormatDataFlavor( ULONG nFormat, ::com::sun::star::datatransfer::DataFlavor& rFlavor );
-    static String   GetFormatMimeType( ULONG nFormat );
+    static ULONG	RegisterFormat( const ::com::sun::star::datatransfer::DataFlavor& rFlavor );
+    static ULONG	RegisterFormatName( const String& rName );
+    static ULONG 	RegisterFormatMimeType( const String& rMimeType );
+
+    static ULONG	GetFormat( const ::com::sun::star::datatransfer::DataFlavor& rFlavor );
+    static String	GetFormatName( ULONG nFormat );
+    static sal_Bool	GetFormatDataFlavor( ULONG nFormat, ::com::sun::star::datatransfer::DataFlavor& rFlavor );
+    static String 	GetFormatMimeType( ULONG nFormat );
     static BOOL     IsInternal( const SvGlobalName& );
-    static ULONG    GetFormatIdFromMimeType( const String& rMimeType );
+    static ULONG 	GetFormatIdFromMimeType( const String& rMimeType );
 
     // bestimme die SotFormatStringId von dem registrierten Format
     //JP 12.11.98: diese 3 Methoden sind ab sofort ueberfluessig, da
-    //              die ClipboardIds statisch sind und aequivalent zur
-    //              SotFormatStringId ist!
+    //				die ClipboardIds statisch sind und aequivalent zur
+    //				SotFormatStringId ist!
     static SotFormatStringId GetFormatStringId( ULONG nFormat )
         { return nFormat; }
     static SotFormatStringId GetFormatStringId( const String& rName )
@@ -211,7 +211,7 @@ public:
         { return nId; }
 
     // same for XTransferable interface
-    static USHORT   GetExchangeAction(
+    static USHORT 	GetExchangeAction(
         // XTransferable
         const DataFlavorExVector& rDataFlavorExVector,
         // Ziel der Aktion (EXCHG_DEST_*)
@@ -230,7 +230,7 @@ public:
         const ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::XTransferable >* pxTransferable = NULL );
 
     // same for XTransferable interface
-    static USHORT   GetExchangeAction(
+    static USHORT 	GetExchangeAction(
         // XTransferable
         const ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::XTransferable >& rxTransferable,
         // Ziel der Aktion (EXCHG_DEST_*)
diff --git a/sot/inc/sot/factory.hxx b/sot/inc/sot/factory.hxx
index 08dd21a88aa5..0720a39da043 100644
--- a/sot/inc/sot/factory.hxx
+++ b/sot/inc/sot/factory.hxx
@@ -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
@@ -58,22 +58,22 @@ protected:
     virtual             ~SotFactory();
 public:
                         TYPEINFO();
-    static  void        DeInit();
+    static	void		DeInit();
     static  void        IncSvObjectCount( SotObject * = NULL );
     static  void        DecSvObjectCount( SotObject * = NULL );
     static  UINT32      GetSvObjectCount();
     static  void        TestInvariant();
 
-    static  const SotFactory *      Find( const SvGlobalName & );
-    static  const SotFactoryList *  GetFactoryList();
+    static  const SotFactory * 		Find( const SvGlobalName & );
+    static  const SotFactoryList *	GetFactoryList();
 
             SotFactory( const SvGlobalName &,
                        const String & rClassName, CreateInstanceType );
 
     void                PutSuperClass( const SotFactory * );
     virtual void *      CreateInstance( SotObject ** ppObj = NULL ) const;
-    void *              CastAndAddRef( SotObject * ) const;
-    void *              AggCastAndAddRef( SotObject * ) const;
+    void *				CastAndAddRef( SotObject * ) const;
+    void * 				AggCastAndAddRef( SotObject * ) const;
 
     BOOL                Is( const SotFactory * pSuperClass ) const;
     const SotFactory *  GetSuper( USHORT nPos ) const
diff --git a/sot/inc/sot/formats.hxx b/sot/inc/sot/formats.hxx
index c9d7a3e69d78..c50d2ccec335 100644
--- a/sot/inc/sot/formats.hxx
+++ b/sot/inc/sot/formats.hxx
@@ -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
@@ -46,111 +46,111 @@
 #endif
 #include <sot/exchange.hxx>
 
-#define SOT_FORMAT_SYSTEM_START                 ((ULONG)0)
-#define SOT_FORMAT_STRING                       ((ULONG)FORMAT_STRING)
-#define SOT_FORMAT_BITMAP                       ((ULONG)FORMAT_BITMAP)
-#define SOT_FORMAT_GDIMETAFILE                  ((ULONG)FORMAT_GDIMETAFILE)
-#define SOT_FORMAT_PRIVATE                      ((ULONG)FORMAT_PRIVATE)
-#define SOT_FORMAT_FILE                         ((ULONG)FORMAT_FILE)
-#define SOT_FORMAT_FILE_LIST                    ((ULONG)FORMAT_FILE_LIST)
-#define SOT_FORMAT_RTF                          ((ULONG)FORMAT_RTF)
+#define SOT_FORMAT_SYSTEM_START					((ULONG)0)
+#define SOT_FORMAT_STRING           			((ULONG)FORMAT_STRING)
+#define SOT_FORMAT_BITMAP           			((ULONG)FORMAT_BITMAP)
+#define SOT_FORMAT_GDIMETAFILE          		((ULONG)FORMAT_GDIMETAFILE)
+#define SOT_FORMAT_PRIVATE              		((ULONG)FORMAT_PRIVATE)
+#define SOT_FORMAT_FILE                 		((ULONG)FORMAT_FILE)
+#define SOT_FORMAT_FILE_LIST            		((ULONG)FORMAT_FILE_LIST)
+#define SOT_FORMAT_RTF                  		((ULONG)FORMAT_RTF)
 
-#define SOT_FORMATSTR_ID_DRAWING                ((ULONG)11)
-#define SOT_FORMATSTR_ID_SVXB                   ((ULONG)12)
-#define SOT_FORMATSTR_ID_SVIM                   ((ULONG)13)
-#define SOT_FORMATSTR_ID_XFA                    ((ULONG)14)
-#define SOT_FORMATSTR_ID_EDITENGINE             ((ULONG)15)
-#define SOT_FORMATSTR_ID_INTERNALLINK_STATE     ((ULONG)16)
-#define SOT_FORMATSTR_ID_SOLK                   ((ULONG)17)
-#define SOT_FORMATSTR_ID_NETSCAPE_BOOKMARK      ((ULONG)18)
-#define SOT_FORMATSTR_ID_TREELISTBOX            ((ULONG)19)
-#define SOT_FORMATSTR_ID_NATIVE                 ((ULONG)20)
-#define SOT_FORMATSTR_ID_OWNERLINK              ((ULONG)21)
-#define SOT_FORMATSTR_ID_STARSERVER             ((ULONG)22)
-#define SOT_FORMATSTR_ID_STAROBJECT             ((ULONG)23)
-#define SOT_FORMATSTR_ID_APPLETOBJECT           ((ULONG)24)
-#define SOT_FORMATSTR_ID_PLUGIN_OBJECT          ((ULONG)25)
-#define SOT_FORMATSTR_ID_STARWRITER_30          ((ULONG)26)
-#define SOT_FORMATSTR_ID_STARWRITER_40          ((ULONG)27)
-#define SOT_FORMATSTR_ID_STARWRITER_50          ((ULONG)28)
-#define SOT_FORMATSTR_ID_STARWRITERWEB_40       ((ULONG)29)
-#define SOT_FORMATSTR_ID_STARWRITERWEB_50       ((ULONG)30)
-#define SOT_FORMATSTR_ID_STARWRITERGLOB_40      ((ULONG)31)
-#define SOT_FORMATSTR_ID_STARWRITERGLOB_50      ((ULONG)32)
-#define SOT_FORMATSTR_ID_STARDRAW               ((ULONG)33)
-#define SOT_FORMATSTR_ID_STARDRAW_40            ((ULONG)34)
-#define SOT_FORMATSTR_ID_STARIMPRESS_50         ((ULONG)35)
-#define SOT_FORMATSTR_ID_STARDRAW_50            ((ULONG)36)
-#define SOT_FORMATSTR_ID_STARCALC               ((ULONG)37)
-#define SOT_FORMATSTR_ID_STARCALC_40            ((ULONG)38)
-#define SOT_FORMATSTR_ID_STARCALC_50            ((ULONG)39)
-#define SOT_FORMATSTR_ID_STARCHART              ((ULONG)40)
-#define SOT_FORMATSTR_ID_STARCHART_40           ((ULONG)41)
-#define SOT_FORMATSTR_ID_STARCHART_50           ((ULONG)42)
-#define SOT_FORMATSTR_ID_STARIMAGE              ((ULONG)43)
-#define SOT_FORMATSTR_ID_STARIMAGE_40           ((ULONG)44)
-#define SOT_FORMATSTR_ID_STARIMAGE_50           ((ULONG)45)
-#define SOT_FORMATSTR_ID_STARMATH               ((ULONG)46)
-#define SOT_FORMATSTR_ID_STARMATH_40            ((ULONG)47)
-#define SOT_FORMATSTR_ID_STARMATH_50            ((ULONG)48)
-#define SOT_FORMATSTR_ID_STAROBJECT_PAINTDOC    ((ULONG)49)
-#define SOT_FORMATSTR_ID_FILLED_AREA            ((ULONG)50)
-#define SOT_FORMATSTR_ID_HTML                   ((ULONG)51)
-#define SOT_FORMATSTR_ID_HTML_SIMPLE            ((ULONG)52)
-#define SOT_FORMATSTR_ID_CHAOS                  ((ULONG)53)
-#define SOT_FORMATSTR_ID_CNT_MSGATTACHFILE      ((ULONG)54)
-#define SOT_FORMATSTR_ID_BIFF_5                 ((ULONG)55)
-#define SOT_FORMATSTR_ID_BIFF__5                ((ULONG)56)
-#define SOT_FORMATSTR_ID_SYLK                   ((ULONG)57)
-#define SOT_FORMATSTR_ID_SYLK_BIGCAPS           ((ULONG)58)
-#define SOT_FORMATSTR_ID_LINK                   ((ULONG)59)
-#define SOT_FORMATSTR_ID_DIF                    ((ULONG)60)
-#define SOT_FORMATSTR_ID_STARDRAW_TABBAR        ((ULONG)61)
-#define SOT_FORMATSTR_ID_SONLK                  ((ULONG)62)
-#define SOT_FORMATSTR_ID_MSWORD_DOC             ((ULONG)63)
-#define SOT_FORMATSTR_ID_STAR_FRAMESET_DOC      ((ULONG)64)
-#define SOT_FORMATSTR_ID_OFFICE_DOC             ((ULONG)65)
-#define SOT_FORMATSTR_ID_NOTES_DOCINFO          ((ULONG)66)
-#define SOT_FORMATSTR_ID_NOTES_HNOTE            ((ULONG)67)
-#define SOT_FORMATSTR_ID_NOTES_NATIVE           ((ULONG)68)
-#define SOT_FORMATSTR_ID_SFX_DOC                ((ULONG)69)
-#define SOT_FORMATSTR_ID_EVDF                   ((ULONG)70)
-#define SOT_FORMATSTR_ID_ESDF                   ((ULONG)71)
-#define SOT_FORMATSTR_ID_IDF                    ((ULONG)72)
-#define SOT_FORMATSTR_ID_EFTP                   ((ULONG)73)
-#define SOT_FORMATSTR_ID_EFD                    ((ULONG)74)
-#define SOT_FORMATSTR_ID_SVX_FORMFIELDEXCH      ((ULONG)75)
-#define SOT_FORMATSTR_ID_EXTENDED_TABBAR        ((ULONG)76)
-#define SOT_FORMATSTR_ID_SBA_DATAEXCHANGE       ((ULONG)77)
-#define SOT_FORMATSTR_ID_SBA_FIELDDATAEXCHANGE  ((ULONG)78)
-#define SOT_FORMATSTR_ID_SBA_PRIVATE_URL        ((ULONG)79)
-#define SOT_FORMATSTR_ID_SBA_TABED              ((ULONG)80)
-#define SOT_FORMATSTR_ID_SBA_TABID              ((ULONG)81)
-#define SOT_FORMATSTR_ID_SBA_JOIN               ((ULONG)82)
-#define SOT_FORMATSTR_ID_OBJECTDESCRIPTOR       ((ULONG)83)
-#define SOT_FORMATSTR_ID_LINKSRCDESCRIPTOR      ((ULONG)84)
-#define SOT_FORMATSTR_ID_EMBED_SOURCE           ((ULONG)85)
-#define SOT_FORMATSTR_ID_LINK_SOURCE            ((ULONG)86)
-#define SOT_FORMATSTR_ID_EMBEDDED_OBJ           ((ULONG)87)
-#define SOT_FORMATSTR_ID_FILECONTENT            ((ULONG)88)
-#define SOT_FORMATSTR_ID_FILEGRPDESCRIPTOR      ((ULONG)89)
-#define SOT_FORMATSTR_ID_FILENAME               ((ULONG)90)
-#define SOT_FORMATSTR_ID_SD_OLE                 ((ULONG)91)
-#define SOT_FORMATSTR_ID_EMBEDDED_OBJ_OLE       ((ULONG)92)
-#define SOT_FORMATSTR_ID_EMBED_SOURCE_OLE       ((ULONG)93)
-#define SOT_FORMATSTR_ID_OBJECTDESCRIPTOR_OLE   ((ULONG)94)
-#define SOT_FORMATSTR_ID_LINKSRCDESCRIPTOR_OLE  ((ULONG)95)
-#define SOT_FORMATSTR_ID_LINK_SOURCE_OLE        ((ULONG)96)
-#define SOT_FORMATSTR_ID_SBA_CTRLDATAEXCHANGE   ((ULONG)97)
-#define SOT_FORMATSTR_ID_OUTPLACE_OBJ           ((ULONG)98)
-#define SOT_FORMATSTR_ID_CNT_OWN_CLIP           ((ULONG)99)
-#define SOT_FORMATSTR_ID_INET_IMAGE             ((ULONG)100)
-#define SOT_FORMATSTR_ID_NETSCAPE_IMAGE         ((ULONG)101)
-#define SOT_FORMATSTR_ID_SBA_FORMEXCHANGE       ((ULONG)102)
-#define SOT_FORMATSTR_ID_SBA_REPORTEXCHANGE     ((ULONG)103)
+#define SOT_FORMATSTR_ID_DRAWING				((ULONG)11)
+#define SOT_FORMATSTR_ID_SVXB					((ULONG)12)
+#define SOT_FORMATSTR_ID_SVIM					((ULONG)13)
+#define SOT_FORMATSTR_ID_XFA					((ULONG)14)
+#define SOT_FORMATSTR_ID_EDITENGINE				((ULONG)15)
+#define SOT_FORMATSTR_ID_INTERNALLINK_STATE   	((ULONG)16)
+#define SOT_FORMATSTR_ID_SOLK 					((ULONG)17)
+#define SOT_FORMATSTR_ID_NETSCAPE_BOOKMARK		((ULONG)18)
+#define SOT_FORMATSTR_ID_TREELISTBOX			((ULONG)19)
+#define SOT_FORMATSTR_ID_NATIVE					((ULONG)20)
+#define SOT_FORMATSTR_ID_OWNERLINK				((ULONG)21)
+#define SOT_FORMATSTR_ID_STARSERVER				((ULONG)22)
+#define SOT_FORMATSTR_ID_STAROBJECT				((ULONG)23)
+#define SOT_FORMATSTR_ID_APPLETOBJECT			((ULONG)24)
+#define SOT_FORMATSTR_ID_PLUGIN_OBJECT			((ULONG)25)
+#define SOT_FORMATSTR_ID_STARWRITER_30			((ULONG)26)
+#define SOT_FORMATSTR_ID_STARWRITER_40			((ULONG)27)
+#define SOT_FORMATSTR_ID_STARWRITER_50			((ULONG)28)
+#define SOT_FORMATSTR_ID_STARWRITERWEB_40		((ULONG)29)
+#define SOT_FORMATSTR_ID_STARWRITERWEB_50		((ULONG)30)
+#define SOT_FORMATSTR_ID_STARWRITERGLOB_40		((ULONG)31)
+#define SOT_FORMATSTR_ID_STARWRITERGLOB_50		((ULONG)32)
+#define SOT_FORMATSTR_ID_STARDRAW				((ULONG)33)
+#define SOT_FORMATSTR_ID_STARDRAW_40			((ULONG)34)
+#define SOT_FORMATSTR_ID_STARIMPRESS_50			((ULONG)35)
+#define SOT_FORMATSTR_ID_STARDRAW_50			((ULONG)36)
+#define SOT_FORMATSTR_ID_STARCALC				((ULONG)37)
+#define SOT_FORMATSTR_ID_STARCALC_40			((ULONG)38)
+#define SOT_FORMATSTR_ID_STARCALC_50			((ULONG)39)
+#define SOT_FORMATSTR_ID_STARCHART				((ULONG)40)
+#define SOT_FORMATSTR_ID_STARCHART_40			((ULONG)41)
+#define SOT_FORMATSTR_ID_STARCHART_50			((ULONG)42)
+#define SOT_FORMATSTR_ID_STARIMAGE				((ULONG)43)
+#define SOT_FORMATSTR_ID_STARIMAGE_40			((ULONG)44)
+#define SOT_FORMATSTR_ID_STARIMAGE_50			((ULONG)45)
+#define SOT_FORMATSTR_ID_STARMATH				((ULONG)46)
+#define SOT_FORMATSTR_ID_STARMATH_40			((ULONG)47)
+#define SOT_FORMATSTR_ID_STARMATH_50			((ULONG)48)
+#define SOT_FORMATSTR_ID_STAROBJECT_PAINTDOC	((ULONG)49)
+#define SOT_FORMATSTR_ID_FILLED_AREA			((ULONG)50)
+#define SOT_FORMATSTR_ID_HTML					((ULONG)51)
+#define SOT_FORMATSTR_ID_HTML_SIMPLE			((ULONG)52)
+#define SOT_FORMATSTR_ID_CHAOS					((ULONG)53)
+#define SOT_FORMATSTR_ID_CNT_MSGATTACHFILE 		((ULONG)54)
+#define SOT_FORMATSTR_ID_BIFF_5					((ULONG)55)
+#define SOT_FORMATSTR_ID_BIFF__5 				((ULONG)56)
+#define SOT_FORMATSTR_ID_SYLK					((ULONG)57)
+#define SOT_FORMATSTR_ID_SYLK_BIGCAPS			((ULONG)58)
+#define SOT_FORMATSTR_ID_LINK					((ULONG)59)
+#define SOT_FORMATSTR_ID_DIF					((ULONG)60)
+#define SOT_FORMATSTR_ID_STARDRAW_TABBAR		((ULONG)61)
+#define SOT_FORMATSTR_ID_SONLK					((ULONG)62)
+#define SOT_FORMATSTR_ID_MSWORD_DOC 			((ULONG)63)
+#define SOT_FORMATSTR_ID_STAR_FRAMESET_DOC 		((ULONG)64)
+#define SOT_FORMATSTR_ID_OFFICE_DOC 			((ULONG)65)
+#define SOT_FORMATSTR_ID_NOTES_DOCINFO			((ULONG)66)
+#define SOT_FORMATSTR_ID_NOTES_HNOTE			((ULONG)67)
+#define SOT_FORMATSTR_ID_NOTES_NATIVE			((ULONG)68)
+#define SOT_FORMATSTR_ID_SFX_DOC				((ULONG)69)
+#define SOT_FORMATSTR_ID_EVDF					((ULONG)70)
+#define SOT_FORMATSTR_ID_ESDF					((ULONG)71)
+#define SOT_FORMATSTR_ID_IDF					((ULONG)72)
+#define SOT_FORMATSTR_ID_EFTP					((ULONG)73)
+#define SOT_FORMATSTR_ID_EFD					((ULONG)74)
+#define SOT_FORMATSTR_ID_SVX_FORMFIELDEXCH		((ULONG)75)
+#define SOT_FORMATSTR_ID_EXTENDED_TABBAR		((ULONG)76)
+#define SOT_FORMATSTR_ID_SBA_DATAEXCHANGE		((ULONG)77)
+#define SOT_FORMATSTR_ID_SBA_FIELDDATAEXCHANGE 	((ULONG)78)
+#define SOT_FORMATSTR_ID_SBA_PRIVATE_URL		((ULONG)79)
+#define SOT_FORMATSTR_ID_SBA_TABED				((ULONG)80)
+#define SOT_FORMATSTR_ID_SBA_TABID				((ULONG)81)
+#define SOT_FORMATSTR_ID_SBA_JOIN				((ULONG)82)
+#define SOT_FORMATSTR_ID_OBJECTDESCRIPTOR		((ULONG)83)
+#define SOT_FORMATSTR_ID_LINKSRCDESCRIPTOR		((ULONG)84)
+#define SOT_FORMATSTR_ID_EMBED_SOURCE			((ULONG)85)
+#define SOT_FORMATSTR_ID_LINK_SOURCE			((ULONG)86)
+#define SOT_FORMATSTR_ID_EMBEDDED_OBJ			((ULONG)87)
+#define SOT_FORMATSTR_ID_FILECONTENT			((ULONG)88)
+#define SOT_FORMATSTR_ID_FILEGRPDESCRIPTOR	   	((ULONG)89)
+#define SOT_FORMATSTR_ID_FILENAME				((ULONG)90)
+#define SOT_FORMATSTR_ID_SD_OLE					((ULONG)91)
+#define SOT_FORMATSTR_ID_EMBEDDED_OBJ_OLE		((ULONG)92)
+#define SOT_FORMATSTR_ID_EMBED_SOURCE_OLE		((ULONG)93)
+#define SOT_FORMATSTR_ID_OBJECTDESCRIPTOR_OLE	((ULONG)94)
+#define SOT_FORMATSTR_ID_LINKSRCDESCRIPTOR_OLE	((ULONG)95)
+#define SOT_FORMATSTR_ID_LINK_SOURCE_OLE		((ULONG)96)
+#define SOT_FORMATSTR_ID_SBA_CTRLDATAEXCHANGE	((ULONG)97)
+#define SOT_FORMATSTR_ID_OUTPLACE_OBJ			((ULONG)98)
+#define SOT_FORMATSTR_ID_CNT_OWN_CLIP			((ULONG)99)
+#define SOT_FORMATSTR_ID_INET_IMAGE				((ULONG)100)
+#define SOT_FORMATSTR_ID_NETSCAPE_IMAGE			((ULONG)101)
+#define SOT_FORMATSTR_ID_SBA_FORMEXCHANGE		((ULONG)102)
+#define SOT_FORMATSTR_ID_SBA_REPORTEXCHANGE		((ULONG)103)
 #define SOT_FORMATSTR_ID_UNIFORMRESOURCELOCATOR ((ULONG)104)
-#define SOT_FORMATSTR_ID_STARCHARTDOCUMENT_50   ((ULONG)105)
-#define SOT_FORMATSTR_ID_GRAPHOBJ               ((ULONG)106)
+#define SOT_FORMATSTR_ID_STARCHARTDOCUMENT_50	((ULONG)105)
+#define SOT_FORMATSTR_ID_GRAPHOBJ				((ULONG)106)
 #define SOT_FORMATSTR_ID_STARWRITER_60          ((ULONG)107)
 #define SOT_FORMATSTR_ID_STARWRITERWEB_60       ((ULONG)108)
 #define SOT_FORMATSTR_ID_STARWRITERGLOB_60      ((ULONG)109)
@@ -159,12 +159,12 @@
 #define SOT_FORMATSTR_ID_STARCALC_60            ((ULONG)112)
 #define SOT_FORMATSTR_ID_STARCHART_60           ((ULONG)113)
 #define SOT_FORMATSTR_ID_STARMATH_60            ((ULONG)114)
-#define SOT_FORMATSTR_ID_WMF                    ((ULONG)115)
+#define SOT_FORMATSTR_ID_WMF					((ULONG)115)
 #define SOT_FORMATSTR_ID_DBACCESS_QUERY         ((ULONG)116)
 #define SOT_FORMATSTR_ID_DBACCESS_TABLE         ((ULONG)117)
 #define SOT_FORMATSTR_ID_DBACCESS_COMMAND       ((ULONG)118)
 #define SOT_FORMATSTR_ID_DIALOG_60              ((ULONG)119)
-#define SOT_FORMATSTR_ID_EMF                    ((ULONG)120)
+#define SOT_FORMATSTR_ID_EMF					((ULONG)120)
 #define SOT_FORMATSTR_ID_BIFF_8                 ((ULONG)121)
 #define SOT_FORMATSTR_ID_BMP                    ((ULONG)122)
 #define SOT_FORMATSTR_ID_HTML_NO_COMMENT        ((ULONG)123)
diff --git a/sot/inc/sot/object.hxx b/sot/inc/sot/object.hxx
index db2ac3b30ffc..9803ae69fe7a 100644
--- a/sot/inc/sot/object.hxx
+++ b/sot/inc/sot/object.hxx
@@ -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
@@ -170,7 +170,7 @@ SotFactory * ClassName::ClassFactory()                                     \
     {                                                                     \
         *ppFactory = new FactoryName( GlobalName,                         \
             String::CreateFromAscii( RTL_CONSTASCII_STRINGPARAM( #ClassName ) ), \
-                                 ClassName::CreateInstance );             \
+                                 ClassName::CreateInstance );			  \
     }                                                                     \
     return *ppFactory;                                                    \
 }                                                                         \
@@ -207,7 +207,7 @@ SotFactory * ClassName::ClassFactory()                                     \
     {                                                                     \
         *ppFactory = new FactoryName( GlobalName,                         \
             String::CreateFromAscii( RTL_CONSTASCII_STRINGPARAM( #ClassName ) ), \
-                                ClassName::CreateInstance );                \
+                                ClassName::CreateInstance );				\
         (*ppFactory)->PutSuperClass( Super1::ClassFactory() );            \
     }                                                                     \
     return *ppFactory;                                                    \
@@ -249,7 +249,7 @@ SotFactory * ClassName::ClassFactory()                                     \
     {                                                                     \
         *ppFactory = new FactoryName( GlobalName,                         \
             String::CreateFromAscii( RTL_CONSTASCII_STRINGPARAM( #ClassName ) ), \
-                                 ClassName::CreateInstance );             \
+                                 ClassName::CreateInstance );			  \
         (*ppFactory)->PutSuperClass( Super1::ClassFactory() );            \
         (*ppFactory)->PutSuperClass( Super2::ClassFactory() );            \
     }                                                                     \
diff --git a/sot/inc/sot/sotdata.hxx b/sot/inc/sot/sotdata.hxx
index 8d8775b5e181..c09fa0cc1087 100644
--- a/sot/inc/sot/sotdata.hxx
+++ b/sot/inc/sot/sotdata.hxx
@@ -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
@@ -45,13 +45,13 @@ class SotObjectList;
 
 struct SotData_Impl
 {
-    UINT32              nSvObjCount;
-    SotObjectList *     pObjectList;
-    SotFactoryList *    pFactoryList;
-    SotFactory *        pSotObjectFactory;
-    SotFactory *        pSotStorageStreamFactory;
-    SotFactory *        pSotStorageFactory;
-    List*               pDataFlavorList;
+    UINT32				nSvObjCount;
+    SotObjectList *		pObjectList;
+    SotFactoryList *	pFactoryList;
+    SotFactory *		pSotObjectFactory;
+    SotFactory *		pSotStorageStreamFactory;
+    SotFactory *		pSotStorageFactory;
+    List*				pDataFlavorList;
     SotData_Impl();
 };
 
diff --git a/sot/inc/sot/sotdllapi.h b/sot/inc/sot/sotdllapi.h
index 032fef762715..35463c8ad638 100644
--- a/sot/inc/sot/sotdllapi.h
+++ b/sot/inc/sot/sotdllapi.h
@@ -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
@@ -27,15 +27,15 @@
 
 #ifndef INCLUDED_SOTDLLAPI_H
 #define INCLUDED_SOTDLLAPI_H
-
+                                                                                                                             
 #include "sal/types.h"
-
+                                                                                                                             
 #if defined(SOT_DLLIMPLEMENTATION)
 #define SOT_DLLPUBLIC  SAL_DLLPUBLIC_EXPORT
 #else
 #define SOT_DLLPUBLIC  SAL_DLLPUBLIC_IMPORT
 #endif
 #define SOT_DLLPRIVATE SAL_DLLPRIVATE
-
+                                                                                                                             
 #endif /* INCLUDED_SOTDLLAPI_H */
 
diff --git a/sot/inc/sot/sotref.hxx b/sot/inc/sot/sotref.hxx
index ae03032e286e..7f59066b7df9 100644
--- a/sot/inc/sot/sotref.hxx
+++ b/sot/inc/sot/sotref.hxx
@@ -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
@@ -59,7 +59,7 @@ class ClassName##Ref                                                      \
 SV_IMPL_REF(ClassName)                                                    \
 inline ClassName##Ref::ClassName##Ref( const SotObjectRef & r )           \
 {                                                                         \
-    pObj = (ClassName *)ClassName::ClassFactory()->CastAndAddRef( &r );   \
+    pObj = (ClassName *)ClassName::ClassFactory()->CastAndAddRef( &r );	  \
 }                                                                         \
 inline ClassName##Ref::ClassName##Ref( SotObject * pObjP )                \
 {                                                                         \
diff --git a/sot/inc/sot/storage.hxx b/sot/inc/sot/storage.hxx
index 572e100c7299..aa24c6217e8b 100644
--- a/sot/inc/sot/storage.hxx
+++ b/sot/inc/sot/storage.hxx
@@ -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
@@ -45,11 +45,11 @@
 #endif
 #include "sot/sotdllapi.h"
 
-#define STORAGE_FAILIFTHERE     0x02
-#define STORAGE_TRANSACTED      0x04
-#define STORAGE_PRIORITY        0x08
-#define STORAGE_DELETEONRELEASE 0x10
-#define STORAGE_CONVERT         0x20
+#define STORAGE_FAILIFTHERE		0x02
+#define STORAGE_TRANSACTED		0x04
+#define STORAGE_PRIORITY		0x08
+#define STORAGE_DELETEONRELEASE	0x10
+#define STORAGE_CONVERT			0x20
 #define STORAGE_UNPACKED_MODE   0x40
 #define STORAGE_DISKSPANNED_MODE   0x80
 #define STORAGE_CREATE_UNPACKED 0x44
@@ -86,14 +86,14 @@ public:
                         SO2_DECL_INVARIANT()
 
     using SvStream::SyncSvStream;
-    virtual void        SyncSvStream();
-    void                SyncSysStream() { SvStream::SyncSysStream(); }
+    virtual void 		SyncSvStream();
+    void 				SyncSysStream() { SvStream::SyncSysStream(); }
 
     virtual void        ResetError();
 
     virtual void        SetSize( ULONG nNewSize );
-    UINT32              GetSize() const;
-    BOOL                CopyTo( SotStorageStream * pDestStm );
+    UINT32				GetSize() const;
+    BOOL				CopyTo( SotStorageStream * pDestStm );
     virtual BOOL        Commit();
     virtual BOOL        Revert();
     BOOL                SetProperty( const String& rName, const ::com::sun::star::uno::Any& rValue );
@@ -130,11 +130,11 @@ friend class ::binfilter::SvStorage;
     BOOL        m_bIsRoot:1,  // z.B.: File-Storage
                 m_bDelStm:1;
     ByteString  m_aKey;           // aKey.Len != 0  -> Verschluesselung
-    long        m_nVersion;
+    long 		m_nVersion;
 
 protected:
                         ~SotStorage();
-   void                 CreateStorage( BOOL bUCBStorage, StreamMode, StorageMode );
+   void 				CreateStorage( BOOL bUCBStorage, StreamMode, StorageMode );
 public:
                         SotStorage( const String &,
                                    StreamMode = STREAM_STD_READWRITE,
@@ -154,7 +154,7 @@ public:
                         SO2_DECL_INVARIANT()
 
     SvMemoryStream *    CreateMemoryStream();
-    const SvStream *    GetSvStream();
+    const SvStream *	GetSvStream();
 
     static BOOL         IsStorageFile( const String & rFileName );
     static BOOL         IsStorageFile( SvStream* pStream );
@@ -166,11 +166,11 @@ public:
     void                SetKey( const ByteString& rKey );
     const ByteString &  GetKey() const { return m_aKey; }
 
-    void                SetVersion( long nVers )
+    void				SetVersion( long nVers )
                         {
                             m_nVersion = nVers;
                         }
-    long                GetVersion() const
+    long				GetVersion() const
                         {
                             return m_nVersion;
                         }
@@ -186,7 +186,7 @@ public:
 
     BOOL                IsRoot() const              { return m_bIsRoot; }
     void                SignAsRoot( BOOL b = TRUE ) { m_bIsRoot = b; }
-    void                SetDeleteStream( BOOL bDelete ) { m_bDelStm = bDelete; }
+    void				SetDeleteStream( BOOL bDelete ) { m_bDelStm = bDelete; }
 
                         // eigener Datenbereich
     virtual void        SetClass( const SvGlobalName & rClass,
@@ -216,10 +216,10 @@ public:
     SotStorageStream *  OpenEncryptedSotStream( const String & rEleName, const ByteString& rKey,
                                     StreamMode = STREAM_STD_READWRITE,
                                     StorageMode = 0 );
-    SotStorage *        OpenSotStorage( const String & rEleName,
+    SotStorage *		OpenSotStorage( const String & rEleName,
                                     StreamMode = STREAM_STD_READWRITE,
                                     StorageMode = STORAGE_TRANSACTED );
-    SotStorage *        OpenUCBStorage( const String & rEleName,
+    SotStorage *		OpenUCBStorage( const String & rEleName,
                                     StreamMode = STREAM_STD_READWRITE,
                                     StorageMode = STORAGE_TRANSACTED );
     SotStorage *        OpenOLEStorage( const String & rEleName,
@@ -239,23 +239,23 @@ public:
     virtual BOOL        MoveTo( const String & rEleName, SotStorage * pDest,
                                 const String & rNewName );
 
-    SvStream*           GetTargetSvStream() const;
+    SvStream*			GetTargetSvStream() const;
     BOOL                SetProperty( const String& rName, const ::com::sun::star::uno::Any& rValue );
     BOOL                GetProperty( const String& rName, ::com::sun::star::uno::Any& rValue );
     BOOL                GetProperty( const String& rEleName, const String& rName, ::com::sun::star::uno::Any& rValue );
-    BOOL                IsOLEStorage() const;
+    BOOL				IsOLEStorage() const;
     static BOOL         IsOLEStorage( const String & rFileName );
     static BOOL         IsOLEStorage( SvStream* pStream );
 
     // this is temporary HACK, _MUST_ be removed before release
     ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >
                         GetUNOAPIDuplicate( const String& rEleName, sal_Int32 nUNOStorageMode );
-    void                RemoveUNOStorageHolder( UNOStorageHolder* pHolder );
+    void				RemoveUNOStorageHolder( UNOStorageHolder* pHolder );
 
     static SotStorage*  OpenOLEStorage( const com::sun::star::uno::Reference < com::sun::star::embed::XStorage >& xStorage,
                                     const String& rEleName, StreamMode = STREAM_STD_READWRITE );
     static sal_Int32    GetFormatID( const com::sun::star::uno::Reference < com::sun::star::embed::XStorage >& xStorage );
-    static sal_Int32    GetVersion( const com::sun::star::uno::Reference < com::sun::star::embed::XStorage >& xStorage );
+    static sal_Int32	GetVersion( const com::sun::star::uno::Reference < com::sun::star::embed::XStorage >& xStorage );
 };
 
 #ifndef SOT_DECL_SOTSTORAGE_DEFINED
diff --git a/sot/inc/stg.hxx b/sot/inc/stg.hxx
index 84373e26d596..9caccbdb1395 100644
--- a/sot/inc/stg.hxx
+++ b/sot/inc/stg.hxx
@@ -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
@@ -65,9 +65,9 @@ class StgStrm;
 class SvGlobalName;
 struct ClsId
 {
-    INT32   n1;
-    INT16   n2, n3;
-    UINT8   n4, n5, n6, n7, n8, n9, n10, n11;
+    INT32	n1;
+    INT16	n2, n3;
+    UINT8	n4, n5, n6, n7, n8, n9, n10, n11;
 };
 
 class SOT_DLLPUBLIC StorageBase : public SvRefBase
@@ -88,7 +88,7 @@ public:
     ULONG           GetError() const;
     BOOL            Good() const          { return BOOL( m_nError == SVSTREAM_OK ); }
     StreamMode      GetMode() const  { return m_nMode;  }
-    void            SetAutoCommit( BOOL bSet )
+    void			SetAutoCommit( BOOL bSet )
                     { m_bAutoCommit = bSet; }
 };
 
@@ -290,7 +290,7 @@ public:
     BOOL                        SetProperty( const String& rName, const ::com::sun::star::uno::Any& rValue );
     BOOL                        GetProperty( const String& rName, ::com::sun::star::uno::Any& rValue );
 
-    SvStream*                   GetModifySvStream();
+    SvStream*					GetModifySvStream();
 
     ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream > GetXInputStream() const;
 };
@@ -312,21 +312,21 @@ public:
     static BOOL                 IsStorageFile( SvStream* );
     static BOOL                 IsStorageFile( const String& rName );
     static BOOL                 IsDiskSpannedFile( SvStream* );
-    static String               GetLinkedFile( SvStream& );
-    static String               CreateLinkFile( const String& rName );
+    static String				GetLinkedFile( SvStream& );
+    static String				CreateLinkFile( const String& rName );
 
                                 UCBStorage( const ::ucbhelper::Content& rContent, const String& rName, StreamMode nMode, BOOL bDirect = TRUE, BOOL bIsRoot = TRUE );
-                                UCBStorage( const String& rName,
-                                            StreamMode nMode,
-                                            BOOL bDirect = TRUE,
+                                UCBStorage( const String& rName, 
+                                            StreamMode nMode, 
+                                            BOOL bDirect = TRUE, 
                                             BOOL bIsRoot = TRUE );
 
-                                UCBStorage( const String& rName,
-                                            StreamMode nMode,
-                                            BOOL bDirect,
-                                            BOOL bIsRoot,
-                                            BOOL bIsRepair,
-                                            ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XProgressHandler >
+                                UCBStorage( const String& rName, 
+                                            StreamMode nMode, 
+                                            BOOL bDirect, 
+                                            BOOL bIsRoot, 
+                                            BOOL bIsRepair, 
+                                            ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XProgressHandler > 
                                                 xProgressHandler );
 
                                 UCBStorage( UCBStorage_Impl* );
@@ -378,17 +378,17 @@ public:
     virtual BOOL                Equals( const BaseStorage& rStream ) const;
     BOOL                        SetProperty( const String& rName, const ::com::sun::star::uno::Any& rValue );
     BOOL                        GetProperty( const String& rName, ::com::sun::star::uno::Any& rValue );
-    BOOL                        GetProperty( const String& rEleName, const String& rName, ::com::sun::star::uno::Any& rValue );
+    BOOL                		GetProperty( const String& rEleName, const String& rName, ::com::sun::star::uno::Any& rValue );
 
     // HACK to avoid incompatible build, can be done since this feature is only for development
     // should be removed before release
     UNOStorageHolderList* GetUNOStorageHolderList();
-
+    
 //#if _SOLAR__PRIVATE
     UCBStorageElement_Impl*     FindElement_Impl( const String& rName ) const;
     BOOL                        CopyStorageElement_Impl( UCBStorageElement_Impl& rElement,
                                     BaseStorage* pDest, const String& rNew ) const;
-    BaseStorage*                OpenStorage_Impl( const String & rEleName,
+    BaseStorage*        		OpenStorage_Impl( const String & rEleName,
                                        StreamMode, BOOL bDirect, BOOL bForceUCBStorage );
 //#endif
 
diff --git a/sot/inc/storinfo.hxx b/sot/inc/storinfo.hxx
index dab1f6d4540e..e314e5db67e8 100644
--- a/sot/inc/storinfo.hxx
+++ b/sot/inc/storinfo.hxx
@@ -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
diff --git a/sot/qa/complex/olesimplestorage/OLESimpleStorageUnitTest.java b/sot/qa/complex/olesimplestorage/OLESimpleStorageUnitTest.java
index 054480d377d1..7a05078f6a6b 100644
--- a/sot/qa/complex/olesimplestorage/OLESimpleStorageUnitTest.java
+++ b/sot/qa/complex/olesimplestorage/OLESimpleStorageUnitTest.java
@@ -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
@@ -35,12 +35,12 @@ import com.sun.star.uno.UnoRuntime;
 
 public class OLESimpleStorageUnitTest extends ComplexTestCase {
     private XMultiServiceFactory m_xMSF = null;
-
+    
     public String[] getTestMethodNames() {
         return new String[] {
             "ExecuteTest01"};
     }
-
+    
     public String getTestObjectName() {
         return "OLESimpleStorageUnitTest";
     }
@@ -55,11 +55,11 @@ public class OLESimpleStorageUnitTest extends ComplexTestCase {
             failed ( "Cannot create service factory!" );
         }
     }
-
+    
     public void after () {
         m_xMSF = null;
     }
-
+    
     public void ExecuteTest01() {
         OLESimpleStorageTest aTest = new Test01( m_xMSF, log );
         assure( "Test01 failed!", aTest.test() );
diff --git a/sot/qa/complex/olesimplestorage/Test01.java b/sot/qa/complex/olesimplestorage/Test01.java
index c9010e61231a..b1dc4f86c2e5 100644
--- a/sot/qa/complex/olesimplestorage/Test01.java
+++ b/sot/qa/complex/olesimplestorage/Test01.java
@@ -18,13 +18,13 @@ public class Test01 implements OLESimpleStorageTest
     TestHelper m_aTestHelper = null;
     final int pStreamCnt = 5;
     final int pBytesCnt = 10;
-
+      
     public Test01 ( XMultiServiceFactory xMSF, LogWriter aLogWriter )
     {
         m_xMSF = xMSF;
         m_aTestHelper = new TestHelper (aLogWriter, "Test01: ");
     }
-
+    
     public boolean test ()
     {
         try
@@ -33,7 +33,7 @@ public class Test01 implements OLESimpleStorageTest
             Object oTempFile = m_xMSF.createInstance ( "com.sun.star.io.TempFile" );
             XTempFile xTempFile = (XTempFile) UnoRuntime.queryInterface ( XTempFile.class, oTempFile );
             m_aTestHelper.Message ( "A new temporary stream created." );
-
+            
             //create OLESimpleStorage based on it
             Object pArgs[] = new Object[2];
             pArgs[0] = (Object) xTempFile;
@@ -41,7 +41,7 @@ public class Test01 implements OLESimpleStorageTest
             Object oOLESimpleStorage = m_xMSF.createInstanceWithArguments ( "com.sun.star.embed.OLESimpleStorage", pArgs );
             XOLESimpleStorage xOLESimpleStorage = (XOLESimpleStorage) UnoRuntime.queryInterface ( XOLESimpleStorage.class, oOLESimpleStorage );
             m_aTestHelper.Message ( "OLESimpleStorage based on XStream created." );
-
+            
             //fill it with some streams
             Object oStream[] = new Object[pStreamCnt];
             byte pBytesIn[][][] = new byte [pStreamCnt][1][pBytesCnt];
@@ -67,7 +67,7 @@ public class Test01 implements OLESimpleStorageTest
                     m_aTestHelper.Message ( "Substream " + i + " inserted." );
                 }
             }
-
+            
             //commit the storage and close it
             xOLESimpleStorage.commit ();
             m_aTestHelper.Message ( "Storage commited." );
@@ -79,20 +79,20 @@ public class Test01 implements OLESimpleStorageTest
                 xTempStream[i].getOutputStream ().closeOutput ();
             }
             m_aTestHelper.Message ( "Storage closed." );
-
+            
             //open the same stream with the constructor for inputstream
             pArgs[0] = (Object)xTempFile.getInputStream ();
             oOLESimpleStorage = m_xMSF.createInstanceWithArguments ( "com.sun.star.embed.OLESimpleStorage", pArgs );
             xOLESimpleStorage = (XOLESimpleStorage)UnoRuntime.queryInterface ( XOLESimpleStorage.class, oOLESimpleStorage );
             m_aTestHelper.Message ( "Storage reopened, based on XInputStream." );
-
+            
             //check that all the streams contain correct information
             m_aTestHelper.Message ( "Checking data contained in all the substreams..." );
             for ( int i = 0; i < pStreamCnt; ++i )
             {
                 if ( xOLESimpleStorage.hasByName (sSubStreamPrefix + i) )
                 {
-                    xTempStream[i] = (XTempFile)UnoRuntime.queryInterface (
+                    xTempStream[i] = (XTempFile)UnoRuntime.queryInterface ( 
                     XTempFile.class, xOLESimpleStorage.getByName (sSubStreamPrefix + i) );
                     xTempStream[i].seek (0);
                     xTempStream[i].getInputStream ().readBytes (pBytesIn[i], pBytesIn[i][0].length + 1 );
@@ -103,7 +103,7 @@ public class Test01 implements OLESimpleStorageTest
                             m_aTestHelper.Error ( "Stream " + i + " byte " + j + ": INCORRECT DATA!");
                             return false;
                         }
-                        else
+                        else 
                         {
                             m_aTestHelper.Message ( "Stream " + i + " byte " + j + ":  CORRECT." );
                         }
diff --git a/sot/qa/complex/olesimplestorage/TestHelper.java b/sot/qa/complex/olesimplestorage/TestHelper.java
index 4b29ed15e393..090da15c84c1 100644
--- a/sot/qa/complex/olesimplestorage/TestHelper.java
+++ b/sot/qa/complex/olesimplestorage/TestHelper.java
@@ -6,19 +6,19 @@ public class TestHelper
 {
     LogWriter m_aLogWriter;
     String m_sTestPrefix;
-
+    
     /** Creates a new instance of TestHelper */
     public TestHelper ( LogWriter aLogWriter, String sTestPrefix )
     {
         m_aLogWriter = aLogWriter;
         m_sTestPrefix = sTestPrefix;
     }
-
+    
     public void Error ( String sError )
     {
         m_aLogWriter.println ( m_sTestPrefix + "Error: " + sError );
     }
-
+    
     public void Message ( String sMessage )
     {
         m_aLogWriter.println ( m_sTestPrefix + sMessage );
diff --git a/sot/source/base/exchange.cxx b/sot/source/base/exchange.cxx
index 67c2b64f105f..c63367601e12 100644
--- a/sot/source/base/exchange.cxx
+++ b/sot/source/base/exchange.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
@@ -55,9 +55,9 @@ using namespace::com::sun::star::datatransfer;
 */
 struct DataFlavorRepresentation
 {
-    const char*                         pMimeType;
-    const char*                         pName;
-    const ::com::sun::star::uno::Type*  pType;
+    const char*							pMimeType;
+    const char*							pName;
+    const ::com::sun::star::uno::Type*	pType;
 };
 
 // -----------------------------------------------------------------------------
@@ -70,113 +70,113 @@ namespace
         {
             static const DataFlavorRepresentation aInstance[] =
             {
-            /*  0 SOT_FORMAT_SYSTEM_START*/                 { "", "", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
-            /*  1 SOT_FORMAT_STRING*/                       { "text/plain;charset=utf-16", "Text", &::getCppuType( (const ::rtl::OUString*) 0 ) },
-            /*  2 SOT_FORMAT_BITMAP*/                       { "application/x-openoffice-bitmap;windows_formatname=\"Bitmap\"", "Bitmap", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
-            /*  3 SOT_FORMAT_GDIMETAFILE*/                  { "application/x-openoffice-gdimetafile;windows_formatname=\"GDIMetaFile\"", "GDIMetaFile", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
-            /*  4 SOT_FORMAT_PRIVATE*/                      { "application/x-openoffice-private;windows_formatname=\"Private\"", "Private", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
-            /*  5 SOT_FORMAT_FILE*/                         { "application/x-openoffice-file;windows_formatname=\"FileName\"", "FileName", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
-            /*  6 SOT_FORMAT_FILE_LIST*/                    { "application/x-openoffice-filelist;windows_formatname=\"FileList\"", "FileList", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
-            /*  7 EMPTY*/                                   { "", "", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
-            /*  8 EMPTY*/                                   { "", "", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
-            /*  9 EMPTY*/                                   { "", "", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
-            /* 10 SOT_FORMAT_RTF*/                          { "text/richtext", "Rich Text Format", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
-            /* 11 SOT_FORMATSTR_ID_DRAWING*/                { "application/x-openoffice-drawing;windows_formatname=\"Drawing Format\"", "Drawing Format", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
-            /* 12 SOT_FORMATSTR_ID_SVXB*/                   { "application/x-openoffice-svxb;windows_formatname=\"SVXB (StarView Bitmap/Animation)\"", "SVXB (StarView Bitmap/Animation)", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
-            /* 13 SOT_FORMATSTR_ID_SVIM*/                   { "application/x-openoffice-svim;windows_formatname=\"SVIM (StarView ImageMap)\"", "SVIM (StarView ImageMap)", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
-            /* 14 SOT_FORMATSTR_ID_XFA*/                    { "application/x-openoffice-xfa;windows_formatname=\"XFA (XOutDev FillAttr)\"", "XFA (XOutDev FillAttr)", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
-            /* 15 SOT_FORMATSTR_ID_EDITENGINE*/             { "application/x-openoffice-editengine;windows_formatname=\"EditEngineFormat\"", "EditEngineFormat", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
-            /* 16 SOT_FORMATSTR_ID_INTERNALLINK_STATE*/     { "application/x-openoffice-internallink-state;windows_formatname=\"StatusInfo vom SvxInternalLink\"", "StatusInfo vom SvxInternalLink", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
-            /* 17 SOT_FORMATSTR_ID_SOLK*/                   { "application/x-openoffice-solk;windows_formatname=\"SOLK (StarOffice Link)\"", "SOLK (StarOffice Link)", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
-            /* 18 SOT_FORMATSTR_ID_NETSCAPE_BOOKMARK*/      { "application/x-openoffice-netscape-bookmark;windows_formatname=\"Netscape Bookmark\"", "Netscape Bookmark", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
-            /* 19 SOT_FORMATSTR_ID_TREELISTBOX*/            { "application/x-openoffice-treelistbox;windows_formatname=\"SV_LBOX_DD_FORMAT\"", "SV_LBOX_DD_FORMAT", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
-            /* 20 SOT_FORMATSTR_ID_NATIVE*/                 { "application/x-openoffice-native;windows_formatname=\"Native\"", "Native", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
-            /* 21 SOT_FORMATSTR_ID_OWNERLINK*/              { "application/x-openoffice-ownerlink;windows_formatname=\"OwnerLink\"", "OwnerLink", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
-            /* 22 SOT_FORMATSTR_ID_STARSERVER*/             { "application/x-openoffice-starserver;windows_formatname=\"StarServerFormat\"", "StarServerFormat", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
-            /* 23 SOT_FORMATSTR_ID_STAROBJECT*/             { "application/x-openoffice-starobject;windows_formatname=\"StarObjectFormat\"", "StarObjectFormat", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
-            /* 24 SOT_FORMATSTR_ID_APPLETOBJECT*/           { "application/x-openoffice-appletobject;windows_formatname=\"Applet Object\"", "Applet Object", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
-            /* 25 SOT_FORMATSTR_ID_PLUGIN_OBJECT*/          { "application/x-openoffice-plugin-object;windows_formatname=\"PlugIn Object\"", "PlugIn Object", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
-            /* 26 SOT_FORMATSTR_ID_STARWRITER_30*/          { "application/x-openoffice-starwriter-30;windows_formatname=\"StarWriter 3.0\"", "StarWriter 3.0", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
-            /* 27 SOT_FORMATSTR_ID_STARWRITER_40*/          { "application/x-openoffice-starwriter-40;windows_formatname=\"StarWriter 4.0\"", "StarWriter 4.0", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
-            /* 28 SOT_FORMATSTR_ID_STARWRITER_50*/          { "application/x-openoffice-starwriter-50;windows_formatname=\"StarWriter 5.0\"", "StarWriter 5.0", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
-            /* 29 SOT_FORMATSTR_ID_STARWRITERWEB_40*/       { "application/x-openoffice-starwriterweb-40;windows_formatname=\"StarWriter/Web 4.0\"", "StarWriter/Web 4.0", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
-            /* 30 SOT_FORMATSTR_ID_STARWRITERWEB_50*/       { "application/x-openoffice-starwriterweb-50;windows_formatname=\"StarWriter/Web 5.0\"", "StarWriter/Web 5.0", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
-            /* 31 SOT_FORMATSTR_ID_STARWRITERGLOB_40*/      { "application/x-openoffice-starwriterglob-40;windows_formatname=\"StarWriter/Global 4.0\"", "StarWriter/Global 4.0", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
-            /* 32 SOT_FORMATSTR_ID_STARWRITERGLOB_50*/      { "application/x-openoffice-starwriterglob-50;windows_formatname=\"StarWriter/Global 5.0\"", "StarWriter/Global 5.0", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
-            /* 33 SOT_FORMATSTR_ID_STARDRAW*/               { "application/x-openoffice-stardraw;windows_formatname=\"StarDrawDocument\"", "StarDrawDocument", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
-            /* 34 SOT_FORMATSTR_ID_STARDRAW_40*/            { "application/x-openoffice-stardraw-40;windows_formatname=\"StarDrawDocument 4.0\"", "StarDrawDocument 4.0", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
-            /* 35 SOT_FORMATSTR_ID_STARIMPRESS_50*/         { "application/x-openoffice-starimpress-50;windows_formatname=\"StarImpress 5.0\"", "StarImpress 5.0", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
-            /* 36 SOT_FORMATSTR_ID_STARDRAW_50*/            { "application/x-openoffice-stardraw-50;windows_formatname=\"StarDraw 5.0\"", "StarDraw 5.0", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
-            /* 37 SOT_FORMATSTR_ID_STARCALC*/               { "application/x-openoffice-starcalc;windows_formatname=\"StarCalcDocument\"", "StarCalcDocument", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
-            /* 38 SOT_FORMATSTR_ID_STARCALC_40*/            { "application/x-openoffice-starcalc-40;windows_formatname=\"StarCalc 4.0\"", "StarCalc 4.0", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
-            /* 39 SOT_FORMATSTR_ID_STARCALC_50*/            { "application/x-openoffice-starcalc-50;windows_formatname=\"StarCalc 5.0\"", "StarCalc 5.0", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
-            /* 40 SOT_FORMATSTR_ID_STARCHART*/              { "application/x-openoffice-starchart;windows_formatname=\"StarChartDocument\"", "StarChartDocument", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
-            /* 41 SOT_FORMATSTR_ID_STARCHART_40*/           { "application/x-openoffice-starchart-40;windows_formatname=\"StarChartDocument 4.0\"", "StarChartDocument 4.0", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
-            /* 42 SOT_FORMATSTR_ID_STARCHART_50*/           { "application/x-openoffice-starchart-50;windows_formatname=\"StarChart 5.0\"", "StarChart 5.0", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
-            /* 43 SOT_FORMATSTR_ID_STARIMAGE*/              { "application/x-openoffice-starimage;windows_formatname=\"StarImageDocument\"", "StarImageDocument", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
-            /* 44 SOT_FORMATSTR_ID_STARIMAGE_40*/           { "application/x-openoffice-starimage-40;windows_formatname=\"StarImageDocument 4.0\"", "StarImageDocument 4.0", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
-            /* 45 SOT_FORMATSTR_ID_STARIMAGE_50*/           { "application/x-openoffice-starimage-50;windows_formatname=\"StarImage 5.0\"", "StarImage 5.0", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
-            /* 46 SOT_FORMATSTR_ID_STARMATH*/               { "application/x-openoffice-starmath;windows_formatname=\"StarMath\"", "StarMath", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
-            /* 47 SOT_FORMATSTR_ID_STARMATH_40*/            { "application/x-openoffice-starmath-40;windows_formatname=\"StarMathDocument 4.0\"", "StarMathDocument 4.0", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
-            /* 48 SOT_FORMATSTR_ID_STARMATH_50*/            { "application/x-openoffice-starmath-50;windows_formatname=\"StarMath 5.0\"", "StarMath 5.0", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
-            /* 49 SOT_FORMATSTR_ID_STAROBJECT_PAINTDOC*/    { "application/x-openoffice-starobject-paintdoc;windows_formatname=\"StarObjectPaintDocument\"", "StarObjectPaintDocument", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
-            /* 50 SOT_FORMATSTR_ID_FILLED_AREA*/            { "application/x-openoffice-filled-area;windows_formatname=\"FilledArea\"", "FilledArea", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
-            /* 51 SOT_FORMATSTR_ID_HTML*/                   { "text/html", "HTML (HyperText Markup Language)", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
-            /* 52 SOT_FORMATSTR_ID_HTML_SIMPLE*/            { "application/x-openoffice-html-simple;windows_formatname=\"HTML Format\"", "HTML Format", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
-            /* 53 SOT_FORMATSTR_ID_CHAOS*/                  { "application/x-openoffice-chaos;windows_formatname=\"FORMAT_CHAOS\"", "FORMAT_CHAOS", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
-            /* 54 SOT_FORMATSTR_ID_CNT_MSGATTACHFILE*/      { "application/x-openoffice-cnt-msgattachfile;windows_formatname=\"CNT_MSGATTACHFILE_FORMAT\"", "CNT_MSGATTACHFILE_FORMAT", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
-            /* 55 SOT_FORMATSTR_ID_BIFF_5*/                 { "application/x-openoffice-biff5;windows_formatname=\"Biff5\"", "Biff5", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
-            /* 56 SOT_FORMATSTR_ID_BIFF__5*/                { "application/x-openoffice-biff-5;windows_formatname=\"Biff 5\"", "Biff 5", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
-            /* 57 SOT_FORMATSTR_ID_SYLK*/                   { "application/x-openoffice-sylk;windows_formatname=\"Sylk\"", "Sylk", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
-            /* 58 SOT_FORMATSTR_ID_SYLK_BIGCAPS*/           { "application/x-openoffice-sylk-bigcaps;windows_formatname=\"SYLK\"", "SYLK", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
-            /* 59 SOT_FORMATSTR_ID_LINK*/                   { "application/x-openoffice-link;windows_formatname=\"Link\"", "Link", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
-            /* 60 SOT_FORMATSTR_ID_DIF*/                    { "application/x-openoffice-dif;windows_formatname=\"DIF\"", "DIF", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
-            /* 61 SOT_FORMATSTR_ID_STARDRAW_TABBAR*/        { "application/x-openoffice-stardraw-tabbar;windows_formatname=\"StarDraw TabBar\"", "StarDraw TabBar", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
-            /* 62 SOT_FORMATSTR_ID_SONLK*/                  { "application/x-openoffice-sonlk;windows_formatname=\"SONLK (StarOffice Navi Link)\"", "SONLK (StarOffice Navi Link)", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
-            /* 63 SOT_FORMATSTR_ID_MSWORD_DOC*/             { "application/msword", "MSWordDoc", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
-            /* 64 SOT_FORMATSTR_ID_STAR_FRAMESET_DOC*/      { "application/x-openoffice-star-frameset-doc;windows_formatname=\"StarFrameSetDocument\"", "StarFrameSetDocument", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
-            /* 65 SOT_FORMATSTR_ID_OFFICE_DOC*/             { "application/x-openoffice-office-doc;windows_formatname=\"OfficeDocument\"", "OfficeDocument", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
-            /* 66 SOT_FORMATSTR_ID_NOTES_DOCINFO*/          { "application/x-openoffice-notes-docinfo;windows_formatname=\"NotesDocInfo\"", "NotesDocInfo", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
-            /* 67 SOT_FORMATSTR_ID_NOTES_HNOTE*/            { "application/x-openoffice-notes-hnote;windows_formatname=\"NoteshNote\"", "NoteshNote", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
-            /* 68 SOT_FORMATSTR_ID_NOTES_NATIVE*/           { "application/x-openoffice-notes-native;windows_formatname=\"Native\"", "Native", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
-            /* 69 SOT_FORMATSTR_ID_SFX_DOC*/                { "application/x-openoffice-sfx-doc;windows_formatname=\"SfxDocument\"", "SfxDocument", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
-            /* 70 SOT_FORMATSTR_ID_EVDF*/                   { "application/x-openoffice-evdf;windows_formatname=\"EVDF (Explorer View Dummy Format)\"", "EVDF (Explorer View Dummy Format)", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
-            /* 71 SOT_FORMATSTR_ID_ESDF*/                   { "application/x-openoffice-esdf;windows_formatname=\"ESDF (Explorer Search Dummy Format)\"", "ESDF (Explorer Search Dummy Format)", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
-            /* 72 SOT_FORMATSTR_ID_IDF*/                    { "application/x-openoffice-idf;windows_formatname=\"IDF (Iconview Dummy Format)\"", "IDF (Iconview Dummy Format)", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
-            /* 73 SOT_FORMATSTR_ID_EFTP*/                   { "application/x-openoffice-eftp;windows_formatname=\"EFTP (Explorer Ftp File)\"", "EFTP (Explorer Ftp File)", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
-            /* 74 SOT_FORMATSTR_ID_EFD*/                    { "application/x-openoffice-efd;windows_formatname=\"EFD (Explorer Ftp Dir)\"", "EFD (Explorer Ftp Dir)", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
-            /* 75 SOT_FORMATSTR_ID_SVX_FORMFIELDEXCH*/      { "application/x-openoffice-svx-formfieldexch;windows_formatname=\"SvxFormFieldExch\"", "SvxFormFieldExch", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
-            /* 76 SOT_FORMATSTR_ID_EXTENDED_TABBAR*/        { "application/x-openoffice-extended-tabbar;windows_formatname=\"ExtendedTabBar\"", "ExtendedTabBar", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
-            /* 77 SOT_FORMATSTR_ID_SBA_DATAEXCHANGE*/       { "application/x-openoffice-sba-dataexchange;windows_formatname=\"SBA-DATAFORMAT\"", "SBA-DATAFORMAT", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
-            /* 78 SOT_FORMATSTR_ID_SBA_FIELDDATAEXCHANGE*/  { "application/x-openoffice-sba-fielddataexchange;windows_formatname=\"SBA-FIELDFORMAT\"", "SBA-FIELDFORMAT", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
-            /* 79 SOT_FORMATSTR_ID_SBA_PRIVATE_URL*/        { "application/x-openoffice-sba-private-url;windows_formatname=\"SBA-PRIVATEURLFORMAT\"", "SBA-PRIVATEURLFORMAT", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
-            /* 80 SOT_FORMATSTR_ID_SBA_TABED*/              { "application/x-openofficesba-tabed;windows_formatname=\"Tabed\"", "Tabed", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
-            /* 81 SOT_FORMATSTR_ID_SBA_TABID*/              { "application/x-openoffice-sba-tabid;windows_formatname=\"Tabid\"", "Tabid", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
-            /* 82 SOT_FORMATSTR_ID_SBA_JOIN*/               { "application/x-openoffice-sba-join;windows_formatname=\"SBA-JOINFORMAT\"", "SBA-JOINFORMAT", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
-            /* 83 SOT_FORMATSTR_ID_OBJECTDESCRIPTOR*/       { "application/x-openoffice-objectdescriptor-xml;windows_formatname=\"Star Object Descriptor (XML)\"", "Star Object Descriptor (XML)", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
-            /* 84 SOT_FORMATSTR_ID_LINKSRCDESCRIPTOR*/      { "application/x-openoffice-linksrcdescriptor-xml;windows_formatname=\"Star Link Source Descriptor (XML)\"", "Star Link Source Descriptor (XML)", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
-            /* 85 SOT_FORMATSTR_ID_EMBED_SOURCE*/           { "application/x-openoffice-embed-source-xml;windows_formatname=\"Star Embed Source (XML)\"", "Star Embed Source (XML)", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
-            /* 86 SOT_FORMATSTR_ID_LINK_SOURCE*/            { "application/x-openoffice-link-source-xml;windows_formatname=\"Star Link Source (XML)\"", "Star Link Source (XML)", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
-            /* 87 SOT_FORMATSTR_ID_EMBEDDED_OBJ*/           { "application/x-openoffice-embedded-obj-xml;windows_formatname=\"Star Embedded Object (XML)\"", "Star Embedded Object (XML)", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
-            /* 88 SOT_FORMATSTR_ID_FILECONTENT*/            { "application/x-openoffice-filecontent;windows_formatname=\"FileContents\"", "FileContents", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
-            /* 89 SOT_FORMATSTR_ID_FILEGRPDESCRIPTOR*/      { "application/x-openoffice-filegrpdescriptor;windows_formatname=\"FileGroupDescriptor\"", "FileGroupDescriptor", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
-            /* 90 SOT_FORMATSTR_ID_FILENAME*/               { "application/x-openoffice-filename;windows_formatname=\"FileName\"", "FileName", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
-            /* 91 SOT_FORMATSTR_ID_SD_OLE*/                 { "application/x-openoffice-sd-ole;windows_formatname=\"SD-OLE\"", "SD-OLE", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
-            /* 92 SOT_FORMATSTR_ID_EMBEDDED_OBJ_OLE*/       { "application/x-openoffice-embedded-obj-ole;windows_formatname=\"Embedded Object\"", "Embedded Object", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
-            /* 93 SOT_FORMATSTR_ID_EMBED_SOURCE_OLE*/       { "application/x-openoffice-embed-source-ole;windows_formatname=\"Embed Source\"", "Embed Source", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
-            /* 94 SOT_FORMATSTR_ID_OBJECTDESCRIPTOR_OLE*/   { "application/x-openoffice-objectdescriptor-ole;windows_formatname=\"Object Descriptor\"", "Object Descriptor", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
-            /* 95 SOT_FORMATSTR_ID_LINKSRCDESCRIPTOR_OLE*/  { "application/x-openoffice-linkdescriptor-ole;windows_formatname=\"Link Source Descriptor\"", "Link Source Descriptor", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
-            /* 96 SOT_FORMATSTR_ID_LINK_SOURCE_OLE*/        { "application/x-openoffice-link-source-ole;windows_formatname=\"Link Source\"", "Link Source", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
-            /* 97 SOT_FORMATSTR_ID_SBA_CTRLDATAEXCHANGE*/   { "application/x-openoffice-sba-ctrldataexchange;windows_formatname=\"SBA-CTRLFORMAT\"", "SBA-CTRLFORMAT", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
-            /* 98 SOT_FORMATSTR_ID_OUTPLACE_OBJ*/           { "application/x-openoffice-outplace-obj;windows_formatname=\"OutPlace Object\"", "OutPlace Object", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
-            /* 99 SOT_FORMATSTR_ID_CNT_OWN_CLIP*/           { "application/x-openoffice-cnt-own-clip;windows_formatname=\"CntOwnClipboard\"", "CntOwnClipboard", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
-            /*100 SOT_FORMATSTR_ID_INET_IMAGE*/             { "application/x-openoffice-inet-image;windows_formatname=\"SO-INet-Image\"", "SO-INet-Image", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
-            /*101 SOT_FORMATSTR_ID_NETSCAPE_IMAGE*/         { "application/x-openoffice-netscape-image;windows_formatname=\"Netscape Image Format\"", "Netscape Image Format", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
-            /*102 SOT_FORMATSTR_ID_SBA_FORMEXCHANGE*/       { "application/x-openoffice-sba-formexchange;windows_formatname=\"SBA_FORMEXCHANGE\"", "SBA_FORMEXCHANGE", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
-            /*103 SOT_FORMATSTR_ID_SBA_REPORTEXCHANGE*/     { "application/x-openoffice-sba-reportexchange;windows_formatname=\"SBA_REPORTEXCHANGE\"", "SBA_REPORTEXCHANGE", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
-            /*104 SOT_FORMATSTR_ID_UNIFORMRESOURCELOCATOR*/ { "application/x-openoffice-uniformresourcelocator;windows_formatname=\"UniformResourceLocator\"", "UniformResourceLocator", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
-            /*105 SOT_FORMATSTR_ID_STARCHARTDOCUMENT_50*/   { "application/x-openoffice-starchartdocument-50;windows_formatname=\"StarChartDocument 5.0\"", "StarChartDocument 5.0", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
-            /*106 SOT_FORMATSTR_ID_GRAPHOBJ*/               { "application/x-openoffice-graphobj;windows_formatname=\"Graphic Object\"", "Graphic Object", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
+            /*  0 SOT_FORMAT_SYSTEM_START*/					{ "", "", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
+            /*  1 SOT_FORMAT_STRING*/						{ "text/plain;charset=utf-16", "Text", &::getCppuType( (const ::rtl::OUString*) 0 ) },
+            /*  2 SOT_FORMAT_BITMAP*/						{ "application/x-openoffice-bitmap;windows_formatname=\"Bitmap\"", "Bitmap", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
+            /*  3 SOT_FORMAT_GDIMETAFILE*/					{ "application/x-openoffice-gdimetafile;windows_formatname=\"GDIMetaFile\"", "GDIMetaFile", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
+            /*  4 SOT_FORMAT_PRIVATE*/						{ "application/x-openoffice-private;windows_formatname=\"Private\"", "Private", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
+            /*  5 SOT_FORMAT_FILE*/							{ "application/x-openoffice-file;windows_formatname=\"FileName\"", "FileName", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
+            /*  6 SOT_FORMAT_FILE_LIST*/					{ "application/x-openoffice-filelist;windows_formatname=\"FileList\"", "FileList", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
+            /*  7 EMPTY*/									{ "", "", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
+            /*  8 EMPTY*/									{ "", "", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
+            /*  9 EMPTY*/									{ "", "", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
+            /* 10 SOT_FORMAT_RTF*/							{ "text/richtext", "Rich Text Format", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
+            /* 11 SOT_FORMATSTR_ID_DRAWING*/				{ "application/x-openoffice-drawing;windows_formatname=\"Drawing Format\"", "Drawing Format", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
+            /* 12 SOT_FORMATSTR_ID_SVXB*/					{ "application/x-openoffice-svxb;windows_formatname=\"SVXB (StarView Bitmap/Animation)\"", "SVXB (StarView Bitmap/Animation)", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
+            /* 13 SOT_FORMATSTR_ID_SVIM*/					{ "application/x-openoffice-svim;windows_formatname=\"SVIM (StarView ImageMap)\"", "SVIM (StarView ImageMap)", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
+            /* 14 SOT_FORMATSTR_ID_XFA*/					{ "application/x-openoffice-xfa;windows_formatname=\"XFA (XOutDev FillAttr)\"", "XFA (XOutDev FillAttr)", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
+            /* 15 SOT_FORMATSTR_ID_EDITENGINE*/				{ "application/x-openoffice-editengine;windows_formatname=\"EditEngineFormat\"", "EditEngineFormat", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
+            /* 16 SOT_FORMATSTR_ID_INTERNALLINK_STATE*/		{ "application/x-openoffice-internallink-state;windows_formatname=\"StatusInfo vom SvxInternalLink\"", "StatusInfo vom SvxInternalLink", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
+            /* 17 SOT_FORMATSTR_ID_SOLK*/					{ "application/x-openoffice-solk;windows_formatname=\"SOLK (StarOffice Link)\"", "SOLK (StarOffice Link)", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
+            /* 18 SOT_FORMATSTR_ID_NETSCAPE_BOOKMARK*/		{ "application/x-openoffice-netscape-bookmark;windows_formatname=\"Netscape Bookmark\"", "Netscape Bookmark", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
+            /* 19 SOT_FORMATSTR_ID_TREELISTBOX*/			{ "application/x-openoffice-treelistbox;windows_formatname=\"SV_LBOX_DD_FORMAT\"", "SV_LBOX_DD_FORMAT", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
+            /* 20 SOT_FORMATSTR_ID_NATIVE*/					{ "application/x-openoffice-native;windows_formatname=\"Native\"", "Native", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
+            /* 21 SOT_FORMATSTR_ID_OWNERLINK*/				{ "application/x-openoffice-ownerlink;windows_formatname=\"OwnerLink\"", "OwnerLink", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
+            /* 22 SOT_FORMATSTR_ID_STARSERVER*/				{ "application/x-openoffice-starserver;windows_formatname=\"StarServerFormat\"", "StarServerFormat", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
+            /* 23 SOT_FORMATSTR_ID_STAROBJECT*/				{ "application/x-openoffice-starobject;windows_formatname=\"StarObjectFormat\"", "StarObjectFormat", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
+            /* 24 SOT_FORMATSTR_ID_APPLETOBJECT*/			{ "application/x-openoffice-appletobject;windows_formatname=\"Applet Object\"", "Applet Object", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
+            /* 25 SOT_FORMATSTR_ID_PLUGIN_OBJECT*/			{ "application/x-openoffice-plugin-object;windows_formatname=\"PlugIn Object\"", "PlugIn Object", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
+            /* 26 SOT_FORMATSTR_ID_STARWRITER_30*/			{ "application/x-openoffice-starwriter-30;windows_formatname=\"StarWriter 3.0\"", "StarWriter 3.0", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
+            /* 27 SOT_FORMATSTR_ID_STARWRITER_40*/			{ "application/x-openoffice-starwriter-40;windows_formatname=\"StarWriter 4.0\"", "StarWriter 4.0", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
+            /* 28 SOT_FORMATSTR_ID_STARWRITER_50*/			{ "application/x-openoffice-starwriter-50;windows_formatname=\"StarWriter 5.0\"", "StarWriter 5.0", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
+            /* 29 SOT_FORMATSTR_ID_STARWRITERWEB_40*/		{ "application/x-openoffice-starwriterweb-40;windows_formatname=\"StarWriter/Web 4.0\"", "StarWriter/Web 4.0", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
+            /* 30 SOT_FORMATSTR_ID_STARWRITERWEB_50*/		{ "application/x-openoffice-starwriterweb-50;windows_formatname=\"StarWriter/Web 5.0\"", "StarWriter/Web 5.0", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
+            /* 31 SOT_FORMATSTR_ID_STARWRITERGLOB_40*/		{ "application/x-openoffice-starwriterglob-40;windows_formatname=\"StarWriter/Global 4.0\"", "StarWriter/Global 4.0", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
+            /* 32 SOT_FORMATSTR_ID_STARWRITERGLOB_50*/		{ "application/x-openoffice-starwriterglob-50;windows_formatname=\"StarWriter/Global 5.0\"", "StarWriter/Global 5.0", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
+            /* 33 SOT_FORMATSTR_ID_STARDRAW*/				{ "application/x-openoffice-stardraw;windows_formatname=\"StarDrawDocument\"", "StarDrawDocument", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
+            /* 34 SOT_FORMATSTR_ID_STARDRAW_40*/			{ "application/x-openoffice-stardraw-40;windows_formatname=\"StarDrawDocument 4.0\"", "StarDrawDocument 4.0", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
+            /* 35 SOT_FORMATSTR_ID_STARIMPRESS_50*/			{ "application/x-openoffice-starimpress-50;windows_formatname=\"StarImpress 5.0\"", "StarImpress 5.0", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
+            /* 36 SOT_FORMATSTR_ID_STARDRAW_50*/			{ "application/x-openoffice-stardraw-50;windows_formatname=\"StarDraw 5.0\"", "StarDraw 5.0", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
+            /* 37 SOT_FORMATSTR_ID_STARCALC*/				{ "application/x-openoffice-starcalc;windows_formatname=\"StarCalcDocument\"", "StarCalcDocument", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
+            /* 38 SOT_FORMATSTR_ID_STARCALC_40*/			{ "application/x-openoffice-starcalc-40;windows_formatname=\"StarCalc 4.0\"", "StarCalc 4.0", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
+            /* 39 SOT_FORMATSTR_ID_STARCALC_50*/			{ "application/x-openoffice-starcalc-50;windows_formatname=\"StarCalc 5.0\"", "StarCalc 5.0", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
+            /* 40 SOT_FORMATSTR_ID_STARCHART*/				{ "application/x-openoffice-starchart;windows_formatname=\"StarChartDocument\"", "StarChartDocument", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
+            /* 41 SOT_FORMATSTR_ID_STARCHART_40*/			{ "application/x-openoffice-starchart-40;windows_formatname=\"StarChartDocument 4.0\"", "StarChartDocument 4.0", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
+            /* 42 SOT_FORMATSTR_ID_STARCHART_50*/			{ "application/x-openoffice-starchart-50;windows_formatname=\"StarChart 5.0\"", "StarChart 5.0", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
+            /* 43 SOT_FORMATSTR_ID_STARIMAGE*/				{ "application/x-openoffice-starimage;windows_formatname=\"StarImageDocument\"", "StarImageDocument", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
+            /* 44 SOT_FORMATSTR_ID_STARIMAGE_40*/			{ "application/x-openoffice-starimage-40;windows_formatname=\"StarImageDocument 4.0\"", "StarImageDocument 4.0", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
+            /* 45 SOT_FORMATSTR_ID_STARIMAGE_50*/			{ "application/x-openoffice-starimage-50;windows_formatname=\"StarImage 5.0\"", "StarImage 5.0", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
+            /* 46 SOT_FORMATSTR_ID_STARMATH*/				{ "application/x-openoffice-starmath;windows_formatname=\"StarMath\"", "StarMath", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
+            /* 47 SOT_FORMATSTR_ID_STARMATH_40*/			{ "application/x-openoffice-starmath-40;windows_formatname=\"StarMathDocument 4.0\"", "StarMathDocument 4.0", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
+            /* 48 SOT_FORMATSTR_ID_STARMATH_50*/			{ "application/x-openoffice-starmath-50;windows_formatname=\"StarMath 5.0\"", "StarMath 5.0", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
+            /* 49 SOT_FORMATSTR_ID_STAROBJECT_PAINTDOC*/	{ "application/x-openoffice-starobject-paintdoc;windows_formatname=\"StarObjectPaintDocument\"", "StarObjectPaintDocument", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
+            /* 50 SOT_FORMATSTR_ID_FILLED_AREA*/			{ "application/x-openoffice-filled-area;windows_formatname=\"FilledArea\"", "FilledArea", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
+            /* 51 SOT_FORMATSTR_ID_HTML*/					{ "text/html", "HTML (HyperText Markup Language)", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
+            /* 52 SOT_FORMATSTR_ID_HTML_SIMPLE*/			{ "application/x-openoffice-html-simple;windows_formatname=\"HTML Format\"", "HTML Format", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
+            /* 53 SOT_FORMATSTR_ID_CHAOS*/					{ "application/x-openoffice-chaos;windows_formatname=\"FORMAT_CHAOS\"", "FORMAT_CHAOS", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
+            /* 54 SOT_FORMATSTR_ID_CNT_MSGATTACHFILE*/		{ "application/x-openoffice-cnt-msgattachfile;windows_formatname=\"CNT_MSGATTACHFILE_FORMAT\"", "CNT_MSGATTACHFILE_FORMAT", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
+            /* 55 SOT_FORMATSTR_ID_BIFF_5*/					{ "application/x-openoffice-biff5;windows_formatname=\"Biff5\"", "Biff5", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
+            /* 56 SOT_FORMATSTR_ID_BIFF__5*/				{ "application/x-openoffice-biff-5;windows_formatname=\"Biff 5\"", "Biff 5", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
+            /* 57 SOT_FORMATSTR_ID_SYLK*/					{ "application/x-openoffice-sylk;windows_formatname=\"Sylk\"", "Sylk", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
+            /* 58 SOT_FORMATSTR_ID_SYLK_BIGCAPS*/			{ "application/x-openoffice-sylk-bigcaps;windows_formatname=\"SYLK\"", "SYLK", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
+            /* 59 SOT_FORMATSTR_ID_LINK*/					{ "application/x-openoffice-link;windows_formatname=\"Link\"", "Link", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
+            /* 60 SOT_FORMATSTR_ID_DIF*/					{ "application/x-openoffice-dif;windows_formatname=\"DIF\"", "DIF", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
+            /* 61 SOT_FORMATSTR_ID_STARDRAW_TABBAR*/		{ "application/x-openoffice-stardraw-tabbar;windows_formatname=\"StarDraw TabBar\"", "StarDraw TabBar", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
+            /* 62 SOT_FORMATSTR_ID_SONLK*/					{ "application/x-openoffice-sonlk;windows_formatname=\"SONLK (StarOffice Navi Link)\"", "SONLK (StarOffice Navi Link)", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
+            /* 63 SOT_FORMATSTR_ID_MSWORD_DOC*/				{ "application/msword", "MSWordDoc", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
+            /* 64 SOT_FORMATSTR_ID_STAR_FRAMESET_DOC*/		{ "application/x-openoffice-star-frameset-doc;windows_formatname=\"StarFrameSetDocument\"", "StarFrameSetDocument", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
+            /* 65 SOT_FORMATSTR_ID_OFFICE_DOC*/				{ "application/x-openoffice-office-doc;windows_formatname=\"OfficeDocument\"", "OfficeDocument", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
+            /* 66 SOT_FORMATSTR_ID_NOTES_DOCINFO*/			{ "application/x-openoffice-notes-docinfo;windows_formatname=\"NotesDocInfo\"", "NotesDocInfo", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
+            /* 67 SOT_FORMATSTR_ID_NOTES_HNOTE*/			{ "application/x-openoffice-notes-hnote;windows_formatname=\"NoteshNote\"", "NoteshNote", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
+            /* 68 SOT_FORMATSTR_ID_NOTES_NATIVE*/			{ "application/x-openoffice-notes-native;windows_formatname=\"Native\"", "Native", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
+            /* 69 SOT_FORMATSTR_ID_SFX_DOC*/				{ "application/x-openoffice-sfx-doc;windows_formatname=\"SfxDocument\"", "SfxDocument", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
+            /* 70 SOT_FORMATSTR_ID_EVDF*/					{ "application/x-openoffice-evdf;windows_formatname=\"EVDF (Explorer View Dummy Format)\"", "EVDF (Explorer View Dummy Format)", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
+            /* 71 SOT_FORMATSTR_ID_ESDF*/					{ "application/x-openoffice-esdf;windows_formatname=\"ESDF (Explorer Search Dummy Format)\"", "ESDF (Explorer Search Dummy Format)", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
+            /* 72 SOT_FORMATSTR_ID_IDF*/					{ "application/x-openoffice-idf;windows_formatname=\"IDF (Iconview Dummy Format)\"", "IDF (Iconview Dummy Format)", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
+            /* 73 SOT_FORMATSTR_ID_EFTP*/					{ "application/x-openoffice-eftp;windows_formatname=\"EFTP (Explorer Ftp File)\"", "EFTP (Explorer Ftp File)", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
+            /* 74 SOT_FORMATSTR_ID_EFD*/					{ "application/x-openoffice-efd;windows_formatname=\"EFD (Explorer Ftp Dir)\"", "EFD (Explorer Ftp Dir)", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
+            /* 75 SOT_FORMATSTR_ID_SVX_FORMFIELDEXCH*/		{ "application/x-openoffice-svx-formfieldexch;windows_formatname=\"SvxFormFieldExch\"", "SvxFormFieldExch", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
+            /* 76 SOT_FORMATSTR_ID_EXTENDED_TABBAR*/		{ "application/x-openoffice-extended-tabbar;windows_formatname=\"ExtendedTabBar\"", "ExtendedTabBar", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
+            /* 77 SOT_FORMATSTR_ID_SBA_DATAEXCHANGE*/		{ "application/x-openoffice-sba-dataexchange;windows_formatname=\"SBA-DATAFORMAT\"", "SBA-DATAFORMAT", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
+            /* 78 SOT_FORMATSTR_ID_SBA_FIELDDATAEXCHANGE*/	{ "application/x-openoffice-sba-fielddataexchange;windows_formatname=\"SBA-FIELDFORMAT\"", "SBA-FIELDFORMAT", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
+            /* 79 SOT_FORMATSTR_ID_SBA_PRIVATE_URL*/		{ "application/x-openoffice-sba-private-url;windows_formatname=\"SBA-PRIVATEURLFORMAT\"", "SBA-PRIVATEURLFORMAT", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
+            /* 80 SOT_FORMATSTR_ID_SBA_TABED*/				{ "application/x-openofficesba-tabed;windows_formatname=\"Tabed\"", "Tabed", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
+            /* 81 SOT_FORMATSTR_ID_SBA_TABID*/				{ "application/x-openoffice-sba-tabid;windows_formatname=\"Tabid\"", "Tabid", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
+            /* 82 SOT_FORMATSTR_ID_SBA_JOIN*/				{ "application/x-openoffice-sba-join;windows_formatname=\"SBA-JOINFORMAT\"", "SBA-JOINFORMAT", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
+            /* 83 SOT_FORMATSTR_ID_OBJECTDESCRIPTOR*/		{ "application/x-openoffice-objectdescriptor-xml;windows_formatname=\"Star Object Descriptor (XML)\"", "Star Object Descriptor (XML)", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
+            /* 84 SOT_FORMATSTR_ID_LINKSRCDESCRIPTOR*/		{ "application/x-openoffice-linksrcdescriptor-xml;windows_formatname=\"Star Link Source Descriptor (XML)\"", "Star Link Source Descriptor (XML)", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
+            /* 85 SOT_FORMATSTR_ID_EMBED_SOURCE*/			{ "application/x-openoffice-embed-source-xml;windows_formatname=\"Star Embed Source (XML)\"", "Star Embed Source (XML)", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
+            /* 86 SOT_FORMATSTR_ID_LINK_SOURCE*/			{ "application/x-openoffice-link-source-xml;windows_formatname=\"Star Link Source (XML)\"", "Star Link Source (XML)", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
+            /* 87 SOT_FORMATSTR_ID_EMBEDDED_OBJ*/			{ "application/x-openoffice-embedded-obj-xml;windows_formatname=\"Star Embedded Object (XML)\"", "Star Embedded Object (XML)", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
+            /* 88 SOT_FORMATSTR_ID_FILECONTENT*/			{ "application/x-openoffice-filecontent;windows_formatname=\"FileContents\"", "FileContents", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
+            /* 89 SOT_FORMATSTR_ID_FILEGRPDESCRIPTOR*/		{ "application/x-openoffice-filegrpdescriptor;windows_formatname=\"FileGroupDescriptor\"", "FileGroupDescriptor", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
+            /* 90 SOT_FORMATSTR_ID_FILENAME*/				{ "application/x-openoffice-filename;windows_formatname=\"FileName\"", "FileName", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
+            /* 91 SOT_FORMATSTR_ID_SD_OLE*/					{ "application/x-openoffice-sd-ole;windows_formatname=\"SD-OLE\"", "SD-OLE", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
+            /* 92 SOT_FORMATSTR_ID_EMBEDDED_OBJ_OLE*/		{ "application/x-openoffice-embedded-obj-ole;windows_formatname=\"Embedded Object\"", "Embedded Object", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
+            /* 93 SOT_FORMATSTR_ID_EMBED_SOURCE_OLE*/		{ "application/x-openoffice-embed-source-ole;windows_formatname=\"Embed Source\"", "Embed Source", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
+            /* 94 SOT_FORMATSTR_ID_OBJECTDESCRIPTOR_OLE*/	{ "application/x-openoffice-objectdescriptor-ole;windows_formatname=\"Object Descriptor\"", "Object Descriptor", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
+            /* 95 SOT_FORMATSTR_ID_LINKSRCDESCRIPTOR_OLE*/	{ "application/x-openoffice-linkdescriptor-ole;windows_formatname=\"Link Source Descriptor\"", "Link Source Descriptor", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
+            /* 96 SOT_FORMATSTR_ID_LINK_SOURCE_OLE*/		{ "application/x-openoffice-link-source-ole;windows_formatname=\"Link Source\"", "Link Source", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
+            /* 97 SOT_FORMATSTR_ID_SBA_CTRLDATAEXCHANGE*/	{ "application/x-openoffice-sba-ctrldataexchange;windows_formatname=\"SBA-CTRLFORMAT\"", "SBA-CTRLFORMAT", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
+            /* 98 SOT_FORMATSTR_ID_OUTPLACE_OBJ*/			{ "application/x-openoffice-outplace-obj;windows_formatname=\"OutPlace Object\"", "OutPlace Object", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
+            /* 99 SOT_FORMATSTR_ID_CNT_OWN_CLIP*/			{ "application/x-openoffice-cnt-own-clip;windows_formatname=\"CntOwnClipboard\"", "CntOwnClipboard", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
+            /*100 SOT_FORMATSTR_ID_INET_IMAGE*/				{ "application/x-openoffice-inet-image;windows_formatname=\"SO-INet-Image\"", "SO-INet-Image", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
+            /*101 SOT_FORMATSTR_ID_NETSCAPE_IMAGE*/			{ "application/x-openoffice-netscape-image;windows_formatname=\"Netscape Image Format\"", "Netscape Image Format", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
+            /*102 SOT_FORMATSTR_ID_SBA_FORMEXCHANGE*/		{ "application/x-openoffice-sba-formexchange;windows_formatname=\"SBA_FORMEXCHANGE\"", "SBA_FORMEXCHANGE", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
+            /*103 SOT_FORMATSTR_ID_SBA_REPORTEXCHANGE*/		{ "application/x-openoffice-sba-reportexchange;windows_formatname=\"SBA_REPORTEXCHANGE\"", "SBA_REPORTEXCHANGE", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
+            /*104 SOT_FORMATSTR_ID_UNIFORMRESOURCELOCATOR*/	{ "application/x-openoffice-uniformresourcelocator;windows_formatname=\"UniformResourceLocator\"", "UniformResourceLocator", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
+            /*105 SOT_FORMATSTR_ID_STARCHARTDOCUMENT_50*/	{ "application/x-openoffice-starchartdocument-50;windows_formatname=\"StarChartDocument 5.0\"", "StarChartDocument 5.0", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
+            /*106 SOT_FORMATSTR_ID_GRAPHOBJ*/				{ "application/x-openoffice-graphobj;windows_formatname=\"Graphic Object\"", "Graphic Object", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
             /*107 SOT_FORMATSTR_ID_STARWRITER_60*/          { MIMETYPE_VND_SUN_XML_WRITER_ASCII, "Writer 6.0", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
             /*108 SOT_FORMATSTR_ID_STARWRITERWEB_60*/       { MIMETYPE_VND_SUN_XML_WRITER_WEB_ASCII, "Writer/Web 6.0", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
             /*109 SOT_FORMATSTR_ID_STARWRITERGLOB_60*/      { MIMETYPE_VND_SUN_XML_WRITER_GLOBAL_ASCII, "Writer/Global 6.0", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
@@ -185,12 +185,12 @@ namespace
             /*112 SOT_FORMATSTR_ID_STARCALC_60*/            { MIMETYPE_VND_SUN_XML_CALC_ASCII, "Calc 6.0", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
             /*113 SOT_FORMATSTR_ID_STARCHART_60*/           { MIMETYPE_VND_SUN_XML_CHART_ASCII, "Chart 6.0", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
             /*114 SOT_FORMATSTR_ID_STARMATH_60*/            { MIMETYPE_VND_SUN_XML_MATH_ASCII, "Math 6.0", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
-            /*115 SOT_FORMATSTR_ID_WMF*/                    { "application/x-openoffice-wmf;windows_formatname=\"Image WMF\"", "Windows MetaFile", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
+            /*115 SOT_FORMATSTR_ID_WMF*/					{ "application/x-openoffice-wmf;windows_formatname=\"Image WMF\"", "Windows MetaFile", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
             /*116 SOT_FORMATSTR_ID_DBACCESS_QUERY*/         { "application/x-openoffice-dbaccess-query;windows_formatname=\"Data source Query Object\"", "Data source Query Object", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
             /*117 SOT_FORMATSTR_ID_DBACCESS_TABLE*/         { "application/x-openoffice-dbaccess-table;windows_formatname=\"Data source Table\"", "Data source Table", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
             /*118 SOT_FORMATSTR_ID_DBACCESS_COMMAND*/       { "application/x-openoffice-dbaccess-command;windows_formatname=\"SQL query\"", "SQL query", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
             /*119 SOT_FORMATSTR_ID_DIALOG_60*/              { "application/vnd.sun.xml.dialog", "Dialog 6.0", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
-            /*120 SOT_FORMATSTR_ID_EMF*/                    { "application/x-openoffice-emf;windows_formatname=\"Image EMF\"", "Windows Enhanced MetaFile", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
+            /*120 SOT_FORMATSTR_ID_EMF*/					{ "application/x-openoffice-emf;windows_formatname=\"Image EMF\"", "Windows Enhanced MetaFile", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
             /*121 SOT_FORMATSTR_ID_BIFF_8*/                 { "application/x-openoffice-biff-8;windows_formatname=\"Biff8\"", "Biff8", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
             /*122 SOT_FORMATSTR_ID_BMP*/                    { "image/bmp", "Windows Bitmap", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
             /*123 SOT_FORMATSTR_ID_HTML_NO_COMMENT */       { "application/x-openoffice-html-no-comment;windows_formatname=\"HTML Format\"", "HTML (no comment)", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
@@ -210,7 +210,7 @@ namespace
             /*137 SOT_FORMATSTR_ID_STARCHART_8_TEMPLATE*/           { MIMETYPE_OASIS_OPENDOCUMENT_CHART_TEMPLATE_ASCII, "Chart 8 Template", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
             /*138 SOT_FORMATSTR_ID_STARMATH_8_TEMPLATE*/            { MIMETYPE_OASIS_OPENDOCUMENT_FORMULA_TEMPLATE_ASCII, "Math 8 Template", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
             /*139 SOT_FORMATSTR_ID_STARBASE_8*/            { MIMETYPE_OASIS_OPENDOCUMENT_DATABASE_ASCII, "StarBase 8", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
-            /*140 SOT_FORMAT_GDIMETAFILE*/                  { "application/x-openoffice-highcontrast-gdimetafile;windows_formatname=\"GDIMetaFile\"", "High Contrast GDIMetaFile", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
+            /*140 SOT_FORMAT_GDIMETAFILE*/					{ "application/x-openoffice-highcontrast-gdimetafile;windows_formatname=\"GDIMetaFile\"", "High Contrast GDIMetaFile", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
             };
         return &aInstance[0];
         }
@@ -484,8 +484,8 @@ ULONG SotExchange::GetFormat( const DataFlavor& rFlavor )
 *************************************************************************/
 String SotExchange::GetFormatName( ULONG nFormat )
 {
-    DataFlavor  aFlavor;
-    String      aRet;
+    DataFlavor	aFlavor;
+    String		aRet;
 
     if( GetFormatDataFlavor( nFormat, aFlavor ) )
         aRet = aFlavor.HumanPresentableName;
diff --git a/sot/source/base/factory.cxx b/sot/source/base/factory.cxx
index 4934f99e78c6..1602ef65dec4 100644
--- a/sot/source/base/factory.cxx
+++ b/sot/source/base/factory.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
diff --git a/sot/source/base/filelist.cxx b/sot/source/base/filelist.cxx
index 4f854add304d..81a897155aa2 100644
--- a/sot/source/base/filelist.cxx
+++ b/sot/source/base/filelist.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
@@ -101,7 +101,7 @@ ULONG FileList::GetFormat()
 
 /******************************************************************************
 |*
-|*  virtuelle SvData-Methoden
+|*	virtuelle SvData-Methoden
 |*
 \******************************************************************************/
 
@@ -122,7 +122,7 @@ void FileList::Assign( const SvDataCopyStream& rCopyStream )
 
 /******************************************************************************
 |*
-|*  Stream-Operatoren
+|*	Stream-Operatoren
 |*
 \******************************************************************************/
 
@@ -133,24 +133,24 @@ void FileList::Assign( const SvDataCopyStream& rCopyStream )
 
 SvStream& operator<<( SvStream& rOStm, const FileList& /*rFileList*/ )
 {
-    OSL_ENSURE(false, "Not implemented!");
+    OSL_ENSURE(false, "Not implemented!");    	    
     return rOStm;
 }
 
-/* #i28176#
+/* #i28176# 
    The Windows clipboard bridge now provides a double '\0'
-   terminated list of file names for format SOT_FORMAT_FILE_LIST
+   terminated list of file names for format SOT_FORMAT_FILE_LIST 
    instead of the original Windows Sv_DROPFILES structure. All strings
-   in this list are UTF16 strings. Shell link files will be already
+   in this list are UTF16 strings. Shell link files will be already 
    resolved by the Windows clipboard bridge.*/
 SvStream& operator>>( SvStream& rIStm, FileList& rFileList )
 {
     rFileList.ClearAll();
     rFileList.pStrList = new FileStringList();
-
+    
     String aStr;
     sal_uInt16 c;
-
+    
     while (!rIStm.IsEof())
     {
         aStr.Erase();
@@ -169,13 +169,13 @@ SvStream& operator>>( SvStream& rIStm, FileList& rFileList )
 
         // append the filepath
         rFileList.AppendFile(aStr);
-    }
+    }    						
     return rIStm;
 }
 
 /******************************************************************************
 |*
-|*  Liste fuellen/abfragen
+|*	Liste fuellen/abfragen
 |*
 \******************************************************************************/
 
diff --git a/sot/source/base/formats.cxx b/sot/source/base/formats.cxx
index baddde6e716f..26baa1fb05f8 100644
--- a/sot/source/base/formats.cxx
+++ b/sot/source/base/formats.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
@@ -46,14 +46,14 @@ using namespace::com::sun::star::datatransfer;
 
 struct SotAction_Impl
 {
-    ULONG   nFormatId;          // Clipboard Id
-    USHORT  nAction;            // Action Id
-    BYTE    nContextCheckId;    // additional check of content in clipboard
+    ULONG 	nFormatId;			// Clipboard Id
+    USHORT	nAction;			// Action Id
+    BYTE 	nContextCheckId;	// additional check of content in clipboard
 };
 
 
 // define a context check Id for every formatid
-#define FILEGRPDSC_ONLY_URL     1
+#define FILEGRPDSC_ONLY_URL		1
 
 /*
     Fuer jedes Ziel existiert in der Tabelle genau ein SotDestinationEntry_Impl.
@@ -68,11 +68,11 @@ struct SotAction_Impl
 
 struct SotDestinationEntry_Impl
 {
-    USHORT                  nDestination;
-    const SotAction_Impl*   aDefaultActions;
-    const SotAction_Impl*   aMoveActions;
-    const SotAction_Impl*   aCopyActions;
-    const SotAction_Impl*   aLinkActions;
+    USHORT					nDestination;
+    const SotAction_Impl*	aDefaultActions;
+    const SotAction_Impl*	aMoveActions;
+    const SotAction_Impl*	aCopyActions;
+    const SotAction_Impl*	aLinkActions;
 };
 
 
@@ -92,7 +92,7 @@ struct SotDestinationEntry_Impl
 */
 
 #define EXCHG_EMPYT_ARRAY                                                 \
-static SotAction_Impl __READONLY_DATA aEmptyArr[] =                       \
+static SotAction_Impl __READONLY_DATA aEmptyArr[] =			              \
     {                                                                     \
         { 0xffff, 0, 0 }                                                  \
     };
@@ -172,8 +172,8 @@ static SotAction_Impl __READONLY_DATA aEXCHG_DEST_DOC_TEXTFRAME_Def[] =     \
         { SOT_FORMATSTR_ID_HTML_SIMPLE, EXCHG_IN_ACTION_COPY, 0 },             \
         { SOT_FORMAT_STRING, EXCHG_IN_ACTION_COPY, 0 },                        \
         { SOT_FORMATSTR_ID_SONLK, EXCHG_IN_ACTION_COPY, 0 },                   \
-        { SOT_FORMATSTR_ID_INET_IMAGE, EXCHG_IN_ACTION_COPY, 0 },               \
-        { SOT_FORMATSTR_ID_NETSCAPE_IMAGE, EXCHG_IN_ACTION_COPY, 0 },           \
+        { SOT_FORMATSTR_ID_INET_IMAGE, EXCHG_IN_ACTION_COPY, 0 },       		\
+        { SOT_FORMATSTR_ID_NETSCAPE_IMAGE, EXCHG_IN_ACTION_COPY, 0 },   		\
         { SOT_FORMAT_FILE_LIST, EXCHG_IN_ACTION_COPY, 0 },                     \
         { SOT_FORMAT_FILE, EXCHG_IN_ACTION_COPY, 0 },                          \
         { SOT_FORMATSTR_ID_SOLK, EXCHG_IN_ACTION_COPY, 0 },       \
@@ -202,7 +202,7 @@ static SotAction_Impl __READONLY_DATA aEXCHG_DEST_DOC_TEXTFRAME_Move[] =    \
         { SOT_FORMATSTR_ID_HTML_NO_COMMENT, EXCHG_OUT_ACTION_INSERT_HTML| EXCHG_OUT_ACTION_FLAG_INSERT_IMAGEMAP | EXCHG_OUT_ACTION_FLAG_INSERT_TARGETURL, 0 },\
         { SOT_FORMATSTR_ID_HTML_SIMPLE, EXCHG_OUT_ACTION_INSERT_HTML| EXCHG_OUT_ACTION_FLAG_INSERT_IMAGEMAP | EXCHG_OUT_ACTION_FLAG_INSERT_TARGETURL, 0 },\
         { SOT_FORMAT_RTF, EXCHG_IN_ACTION_COPY| EXCHG_OUT_ACTION_FLAG_INSERT_IMAGEMAP | EXCHG_OUT_ACTION_FLAG_INSERT_TARGETURL, 0 },\
-        { SOT_FORMATSTR_ID_NETSCAPE_IMAGE, EXCHG_IN_ACTION_COPY | EXCHG_OUT_ACTION_FLAG_INSERT_TARGETURL, 0 },          \
+        { SOT_FORMATSTR_ID_NETSCAPE_IMAGE, EXCHG_IN_ACTION_COPY | EXCHG_OUT_ACTION_FLAG_INSERT_TARGETURL, 0 },   		\
         { SOT_FORMAT_STRING, EXCHG_OUT_ACTION_INSERT_STRING| EXCHG_OUT_ACTION_FLAG_INSERT_IMAGEMAP | EXCHG_OUT_ACTION_FLAG_INSERT_TARGETURL, 0 },\
         { SOT_FORMAT_GDIMETAFILE, EXCHG_OUT_ACTION_INSERT_GDIMETAFILE| EXCHG_OUT_ACTION_FLAG_INSERT_IMAGEMAP | EXCHG_OUT_ACTION_FLAG_INSERT_TARGETURL, 0 },\
         { SOT_FORMAT_BITMAP, EXCHG_OUT_ACTION_INSERT_BITMAP| EXCHG_OUT_ACTION_FLAG_INSERT_IMAGEMAP | EXCHG_OUT_ACTION_FLAG_INSERT_TARGETURL, 0 },\
@@ -231,7 +231,7 @@ static SotAction_Impl __READONLY_DATA aEXCHG_DEST_DOC_TEXTFRAME_Copy[] =    \
         { SOT_FORMATSTR_ID_HTML_NO_COMMENT, EXCHG_OUT_ACTION_INSERT_HTML| EXCHG_OUT_ACTION_FLAG_INSERT_IMAGEMAP | EXCHG_OUT_ACTION_FLAG_INSERT_TARGETURL, 0 },\
         { SOT_FORMATSTR_ID_HTML_SIMPLE, EXCHG_OUT_ACTION_INSERT_HTML| EXCHG_OUT_ACTION_FLAG_INSERT_IMAGEMAP | EXCHG_OUT_ACTION_FLAG_INSERT_TARGETURL, 0 },\
         { SOT_FORMAT_RTF, EXCHG_IN_ACTION_COPY| EXCHG_OUT_ACTION_FLAG_INSERT_IMAGEMAP | EXCHG_OUT_ACTION_FLAG_INSERT_TARGETURL, 0 },\
-        { SOT_FORMATSTR_ID_NETSCAPE_IMAGE, EXCHG_IN_ACTION_COPY | EXCHG_OUT_ACTION_FLAG_INSERT_TARGETURL, 0 },          \
+        { SOT_FORMATSTR_ID_NETSCAPE_IMAGE, EXCHG_IN_ACTION_COPY | EXCHG_OUT_ACTION_FLAG_INSERT_TARGETURL, 0 },   		\
         { SOT_FORMAT_STRING, EXCHG_OUT_ACTION_INSERT_STRING| EXCHG_OUT_ACTION_FLAG_INSERT_IMAGEMAP | EXCHG_OUT_ACTION_FLAG_INSERT_TARGETURL, 0 },\
         { SOT_FORMATSTR_ID_NETSCAPE_BOOKMARK, EXCHG_OUT_ACTION_INSERT_HYPERLINK | EXCHG_OUT_ACTION_FLAG_INSERT_IMAGEMAP | EXCHG_OUT_ACTION_FLAG_INSERT_TARGETURL, 0 },\
         { SOT_FORMATSTR_ID_FILEGRPDESCRIPTOR, EXCHG_OUT_ACTION_INSERT_HYPERLINK | EXCHG_OUT_ACTION_FLAG_INSERT_IMAGEMAP | EXCHG_OUT_ACTION_FLAG_INSERT_TARGETURL, FILEGRPDSC_ONLY_URL },\
@@ -274,8 +274,8 @@ static SotAction_Impl __READONLY_DATA aEXCHG_DEST_DOC_TEXTFRAME_WEB_Def[] =
         { SOT_FORMATSTR_ID_HTML_SIMPLE, EXCHG_IN_ACTION_COPY, 0 },             \
         { SOT_FORMAT_STRING, EXCHG_IN_ACTION_COPY, 0 },                        \
         { SOT_FORMATSTR_ID_SONLK, EXCHG_IN_ACTION_COPY, 0 },                   \
-        { SOT_FORMATSTR_ID_INET_IMAGE, EXCHG_IN_ACTION_COPY, 0 },               \
-        { SOT_FORMATSTR_ID_NETSCAPE_IMAGE, EXCHG_IN_ACTION_COPY, 0 },           \
+        { SOT_FORMATSTR_ID_INET_IMAGE, EXCHG_IN_ACTION_COPY, 0 },       		\
+        { SOT_FORMATSTR_ID_NETSCAPE_IMAGE, EXCHG_IN_ACTION_COPY, 0 },   		\
         { SOT_FORMAT_FILE_LIST, EXCHG_IN_ACTION_COPY, 0 },                     \
         { SOT_FORMAT_FILE, EXCHG_IN_ACTION_COPY, 0 },                          \
         { SOT_FORMATSTR_ID_SOLK, EXCHG_IN_ACTION_COPY, 0 },       \
@@ -295,7 +295,7 @@ static SotAction_Impl __READONLY_DATA aEXCHG_DEST_DOC_TEXTFRAME_WEB_Move[] =
         { SOT_FORMATSTR_ID_HTML_NO_COMMENT, EXCHG_OUT_ACTION_INSERT_HTML| EXCHG_OUT_ACTION_FLAG_INSERT_IMAGEMAP | EXCHG_OUT_ACTION_FLAG_INSERT_TARGETURL, 0 },\
         { SOT_FORMATSTR_ID_HTML_SIMPLE, EXCHG_OUT_ACTION_INSERT_HTML| EXCHG_OUT_ACTION_FLAG_INSERT_IMAGEMAP | EXCHG_OUT_ACTION_FLAG_INSERT_TARGETURL, 0 },\
         { SOT_FORMAT_RTF, EXCHG_IN_ACTION_COPY| EXCHG_OUT_ACTION_FLAG_INSERT_IMAGEMAP | EXCHG_OUT_ACTION_FLAG_INSERT_TARGETURL, 0 },\
-        { SOT_FORMATSTR_ID_NETSCAPE_IMAGE, EXCHG_IN_ACTION_COPY | EXCHG_OUT_ACTION_FLAG_INSERT_TARGETURL, 0 },          \
+        { SOT_FORMATSTR_ID_NETSCAPE_IMAGE, EXCHG_IN_ACTION_COPY | EXCHG_OUT_ACTION_FLAG_INSERT_TARGETURL, 0 },   		\
         { SOT_FORMAT_STRING, EXCHG_OUT_ACTION_INSERT_STRING| EXCHG_OUT_ACTION_FLAG_INSERT_IMAGEMAP | EXCHG_OUT_ACTION_FLAG_INSERT_TARGETURL, 0 },\
         { SOT_FORMAT_GDIMETAFILE, EXCHG_OUT_ACTION_INSERT_GDIMETAFILE| EXCHG_OUT_ACTION_FLAG_INSERT_IMAGEMAP | EXCHG_OUT_ACTION_FLAG_INSERT_TARGETURL, 0 },\
         { SOT_FORMAT_BITMAP, EXCHG_OUT_ACTION_INSERT_BITMAP| EXCHG_OUT_ACTION_FLAG_INSERT_IMAGEMAP | EXCHG_OUT_ACTION_FLAG_INSERT_TARGETURL, 0 },\
@@ -318,7 +318,7 @@ static SotAction_Impl __READONLY_DATA aEXCHG_DEST_DOC_TEXTFRAME_WEB_Copy[] =
         { SOT_FORMATSTR_ID_HTML_NO_COMMENT, EXCHG_OUT_ACTION_INSERT_HTML| EXCHG_OUT_ACTION_FLAG_INSERT_IMAGEMAP | EXCHG_OUT_ACTION_FLAG_INSERT_TARGETURL, 0 },\
         { SOT_FORMATSTR_ID_HTML_SIMPLE, EXCHG_OUT_ACTION_INSERT_HTML| EXCHG_OUT_ACTION_FLAG_INSERT_IMAGEMAP | EXCHG_OUT_ACTION_FLAG_INSERT_TARGETURL, 0 },\
         { SOT_FORMAT_RTF, EXCHG_IN_ACTION_COPY| EXCHG_OUT_ACTION_FLAG_INSERT_IMAGEMAP | EXCHG_OUT_ACTION_FLAG_INSERT_TARGETURL, 0 },\
-        { SOT_FORMATSTR_ID_NETSCAPE_IMAGE, EXCHG_IN_ACTION_COPY | EXCHG_OUT_ACTION_FLAG_INSERT_TARGETURL, 0 },          \
+        { SOT_FORMATSTR_ID_NETSCAPE_IMAGE, EXCHG_IN_ACTION_COPY | EXCHG_OUT_ACTION_FLAG_INSERT_TARGETURL, 0 },   		\
         { SOT_FORMAT_STRING, EXCHG_OUT_ACTION_INSERT_STRING| EXCHG_OUT_ACTION_FLAG_INSERT_IMAGEMAP | EXCHG_OUT_ACTION_FLAG_INSERT_TARGETURL, 0 },\
         { SOT_FORMATSTR_ID_NETSCAPE_BOOKMARK, EXCHG_OUT_ACTION_INSERT_HYPERLINK | EXCHG_OUT_ACTION_FLAG_INSERT_IMAGEMAP | EXCHG_OUT_ACTION_FLAG_INSERT_TARGETURL, 0 },\
         { SOT_FORMATSTR_ID_FILEGRPDESCRIPTOR, EXCHG_OUT_ACTION_INSERT_HYPERLINK | EXCHG_OUT_ACTION_FLAG_INSERT_IMAGEMAP | EXCHG_OUT_ACTION_FLAG_INSERT_TARGETURL, FILEGRPDSC_ONLY_URL },\
@@ -792,7 +792,7 @@ static SotAction_Impl __READONLY_DATA aEXCHG_DEST_SWDOC_FREE_AREA_Def[] =   \
         { SOT_FORMATSTR_ID_HTML_SIMPLE, EXCHG_IN_ACTION_COPY, 0 },             \
         { SOT_FORMAT_RTF, EXCHG_IN_ACTION_COPY, 0 },                           \
         { SOT_FORMATSTR_ID_SVIM, EXCHG_IN_ACTION_COPY, 0 },                    \
-        { SOT_FORMATSTR_ID_NETSCAPE_IMAGE, EXCHG_IN_ACTION_COPY, 0 },           \
+        { SOT_FORMATSTR_ID_NETSCAPE_IMAGE, EXCHG_IN_ACTION_COPY, 0 },   		\
         { SOT_FORMAT_STRING, EXCHG_IN_ACTION_COPY, 0 },                        \
         { SOT_FORMATSTR_ID_NETSCAPE_BOOKMARK, EXCHG_IN_ACTION_COPY, 0 },       \
         { SOT_FORMATSTR_ID_FILEGRPDESCRIPTOR, EXCHG_IN_ACTION_COPY, FILEGRPDSC_ONLY_URL },       \
@@ -853,7 +853,7 @@ static SotAction_Impl __READONLY_DATA aEXCHG_DEST_SWDOC_FREE_AREA_Copy[] =  \
         { SOT_FORMATSTR_ID_HTML_NO_COMMENT, EXCHG_OUT_ACTION_INSERT_HTML | EXCHG_OUT_ACTION_FLAG_INSERT_IMAGEMAP | EXCHG_OUT_ACTION_FLAG_INSERT_TARGETURL, 0 },\
         { SOT_FORMATSTR_ID_HTML_SIMPLE, EXCHG_OUT_ACTION_INSERT_HTML | EXCHG_OUT_ACTION_FLAG_INSERT_IMAGEMAP | EXCHG_OUT_ACTION_FLAG_INSERT_TARGETURL, 0 },\
         { SOT_FORMAT_RTF, EXCHG_IN_ACTION_COPY | EXCHG_OUT_ACTION_FLAG_INSERT_TARGETURL, 0 },                           \
-        { SOT_FORMATSTR_ID_NETSCAPE_IMAGE, EXCHG_IN_ACTION_COPY | EXCHG_OUT_ACTION_FLAG_INSERT_TARGETURL, 0 },          \
+        { SOT_FORMATSTR_ID_NETSCAPE_IMAGE, EXCHG_IN_ACTION_COPY | EXCHG_OUT_ACTION_FLAG_INSERT_TARGETURL, 0 },   		\
         { SOT_FORMAT_STRING, EXCHG_OUT_ACTION_INSERT_STRING | EXCHG_OUT_ACTION_FLAG_INSERT_TARGETURL, 0 },              \
         { SOT_FORMATSTR_ID_NETSCAPE_BOOKMARK, EXCHG_OUT_ACTION_INSERT_HYPERLINK | EXCHG_OUT_ACTION_FLAG_INSERT_IMAGEMAP | EXCHG_OUT_ACTION_FLAG_INSERT_TARGETURL, 0 },\
         { SOT_FORMATSTR_ID_FILEGRPDESCRIPTOR, EXCHG_OUT_ACTION_INSERT_HYPERLINK | EXCHG_OUT_ACTION_FLAG_INSERT_IMAGEMAP | EXCHG_OUT_ACTION_FLAG_INSERT_TARGETURL, FILEGRPDSC_ONLY_URL },\
@@ -897,7 +897,7 @@ static SotAction_Impl __READONLY_DATA aEXCHG_DEST_SWDOC_FREE_AREA_WEB_Def[] =
         { SOT_FORMATSTR_ID_HTML_SIMPLE, EXCHG_IN_ACTION_COPY, 0 },             \
         { SOT_FORMAT_RTF, EXCHG_IN_ACTION_COPY, 0 },                           \
         { SOT_FORMATSTR_ID_SVIM, EXCHG_IN_ACTION_COPY, 0 },                    \
-        { SOT_FORMATSTR_ID_NETSCAPE_IMAGE, EXCHG_IN_ACTION_COPY, 0 },           \
+        { SOT_FORMATSTR_ID_NETSCAPE_IMAGE, EXCHG_IN_ACTION_COPY, 0 },   		\
         { SOT_FORMAT_STRING, EXCHG_IN_ACTION_COPY, 0 },                        \
         { SOT_FORMATSTR_ID_NETSCAPE_BOOKMARK, EXCHG_IN_ACTION_COPY, 0 },       \
         { SOT_FORMATSTR_ID_FILEGRPDESCRIPTOR, EXCHG_IN_ACTION_COPY, FILEGRPDSC_ONLY_URL },       \
@@ -937,7 +937,7 @@ static SotAction_Impl __READONLY_DATA aEXCHG_DEST_SWDOC_FREE_AREA_WEB_Copy[] =
         { SOT_FORMATSTR_ID_HTML_NO_COMMENT, EXCHG_OUT_ACTION_INSERT_HTML | EXCHG_OUT_ACTION_FLAG_INSERT_IMAGEMAP | EXCHG_OUT_ACTION_FLAG_INSERT_TARGETURL, 0 },\
         { SOT_FORMATSTR_ID_HTML_SIMPLE, EXCHG_OUT_ACTION_INSERT_HTML | EXCHG_OUT_ACTION_FLAG_INSERT_IMAGEMAP | EXCHG_OUT_ACTION_FLAG_INSERT_TARGETURL, 0 },\
         { SOT_FORMAT_RTF, EXCHG_IN_ACTION_COPY | EXCHG_OUT_ACTION_FLAG_INSERT_TARGETURL, 0 },                           \
-        { SOT_FORMATSTR_ID_NETSCAPE_IMAGE, EXCHG_IN_ACTION_COPY | EXCHG_OUT_ACTION_FLAG_INSERT_TARGETURL, 0 },          \
+        { SOT_FORMATSTR_ID_NETSCAPE_IMAGE, EXCHG_IN_ACTION_COPY | EXCHG_OUT_ACTION_FLAG_INSERT_TARGETURL, 0 },   		\
         { SOT_FORMAT_STRING, EXCHG_OUT_ACTION_INSERT_STRING | EXCHG_OUT_ACTION_FLAG_INSERT_TARGETURL, 0 },              \
         { SOT_FORMATSTR_ID_NETSCAPE_BOOKMARK, EXCHG_OUT_ACTION_INSERT_HYPERLINK | EXCHG_OUT_ACTION_FLAG_INSERT_IMAGEMAP | EXCHG_OUT_ACTION_FLAG_INSERT_TARGETURL, 0 },\
         { SOT_FORMATSTR_ID_FILEGRPDESCRIPTOR, EXCHG_OUT_ACTION_INSERT_HYPERLINK | EXCHG_OUT_ACTION_FLAG_INSERT_IMAGEMAP | EXCHG_OUT_ACTION_FLAG_INSERT_TARGETURL, FILEGRPDSC_ONLY_URL },\
@@ -1144,16 +1144,16 @@ static SotAction_Impl __READONLY_DATA aEXCHG_DEST_SDDOC_FREE_AREA_Link[] =  \
 
 /*  */
 
-#define IMPL_DATA_ARRAY_1                                                 \
+#define IMPL_DATA_ARRAY_1				                                  \
 EXCHG_EMPYT_ARRAY                                                         \
 EXCHG_DEST_DOC_OLEOBJ_ARRAY                                               \
 EXCHG_DEST_CHARTDOC_OLEOBJ_ARRAY                                          \
 EXCHG_DEST_DOC_TEXTFRAME_ARRAY                                            \
 EXCHG_DEST_DOC_GRAPHOBJ_ARRAY                                             \
-EXCHG_DEST_DOC_LNKD_GRAPHOBJ_ARRAY                                        \
+EXCHG_DEST_DOC_LNKD_GRAPHOBJ_ARRAY										  \
 EXCHG_DEST_DOC_TEXTFRAME_WEB_ARRAY
 
-#define IMPL_DATA_ARRAY_2                                                 \
+#define IMPL_DATA_ARRAY_2				                                  \
 EXCHG_DEST_DOC_GRAPH_W_IMAP_ARRAY                                         \
 EXCHG_DEST_DOC_LNKD_GRAPH_W_IMAP_ARRAY                                    \
 EXCHG_DEST_DOC_IMAPREGION_ARRAY                                           \
@@ -1164,9 +1164,9 @@ EXCHG_DEST_DOC_GROUPOBJ_ARRAY                                             \
 EXCHG_DEST_SWDOC_FREE_AREA_ARRAY                                          \
 EXCHG_DEST_SCDOC_FREE_AREA_ARRAY                                          \
 EXCHG_DEST_SDDOC_FREE_AREA_ARRAY                                          \
-EXCHG_DEST_SWDOC_FREE_AREA_WEB_ARRAY                                      \
+EXCHG_DEST_SWDOC_FREE_AREA_WEB_ARRAY									  \
 
-#define IMPL_DATA_ARRAY_3                                                 \
+#define IMPL_DATA_ARRAY_3				                                  \
 static SotDestinationEntry_Impl __READONLY_DATA aDestinationArray[] =     \
 {                                                                         \
     { EXCHG_DEST_DOC_OLEOBJ,                                              \
@@ -1259,18 +1259,18 @@ static SotDestinationEntry_Impl __READONLY_DATA aDestinationArray[] =     \
         aEXCHG_DEST_SDDOC_FREE_AREA_Copy,                                 \
         aEXCHG_DEST_SDDOC_FREE_AREA_Link                                  \
     },                                                                    \
-    { EXCHG_DEST_DOC_TEXTFRAME_WEB,                                       \
+    { EXCHG_DEST_DOC_TEXTFRAME_WEB,								  		  \
         aEXCHG_DEST_DOC_TEXTFRAME_WEB_Def,                                \
         aEXCHG_DEST_DOC_TEXTFRAME_WEB_Move,                               \
         aEXCHG_DEST_DOC_TEXTFRAME_WEB_Copy,                               \
-        aEXCHG_DEST_DOC_TEXTFRAME_WEB_Link                                \
-    },                                                                    \
-    { EXCHG_DEST_SWDOC_FREE_AREA_WEB,                                     \
-        aEXCHG_DEST_SWDOC_FREE_AREA_WEB_Def,                              \
+        aEXCHG_DEST_DOC_TEXTFRAME_WEB_Link	                              \
+    },																	  \
+    { EXCHG_DEST_SWDOC_FREE_AREA_WEB,									  \
+        aEXCHG_DEST_SWDOC_FREE_AREA_WEB_Def,						  	  \
         aEXCHG_DEST_SWDOC_FREE_AREA_WEB_Move,                             \
         aEXCHG_DEST_SWDOC_FREE_AREA_WEB_Copy,                             \
         aEXCHG_DEST_SWDOC_FREE_AREA_WEB_Link                              \
-    },                                                                    \
+    },																	  \
     {                                                                     \
         0xffff, 0, 0, 0, 0                                                \
     }                                                                     \
@@ -1285,9 +1285,9 @@ static SotDestinationEntry_Impl __READONLY_DATA aDestinationArray[] =     \
 
 sal_Bool IsFormatSupported( const DataFlavorExVector& rDataFlavorExVector, ULONG nId )
 {
-    DataFlavorExVector::iterator    aIter( ( (DataFlavorExVector&) rDataFlavorExVector ).begin() );
-    DataFlavorExVector::iterator    aEnd( ( (DataFlavorExVector&) rDataFlavorExVector ).end() );
-    sal_Bool                        bRet = sal_False;
+    DataFlavorExVector::iterator	aIter( ( (DataFlavorExVector&) rDataFlavorExVector ).begin() );
+    DataFlavorExVector::iterator	aEnd( ( (DataFlavorExVector&) rDataFlavorExVector ).end() );
+    sal_Bool						bRet = sal_False;
 
     while( aIter != aEnd )
     {
@@ -1309,8 +1309,8 @@ rEntry
 #endif
 )
 {
-    DataFlavor  aFlavor;
-    BOOL        bRet = TRUE;
+    DataFlavor	aFlavor;
+    BOOL		bRet = TRUE;
 
     try
     {
@@ -1325,7 +1325,7 @@ rEntry
                 {
                     bRet = FALSE;
 
-                    if( SotExchange::GetFormatDataFlavor( SOT_FORMATSTR_ID_FILECONTENT, aFlavor ) &&
+                    if(	SotExchange::GetFormatDataFlavor( SOT_FORMATSTR_ID_FILECONTENT, aFlavor ) &&
                         (*pxTransferable)->isDataFlavorSupported( aFlavor ) &&
                         SotExchange::GetFormatDataFlavor( rEntry.nFormatId, aFlavor ) &&
                         (*pxTransferable)->isDataFlavorSupported( aFlavor ) )
@@ -1378,9 +1378,9 @@ static USHORT GetTransferableAction_Impl(
     {
         if( rDataFlavorExVector.size() )
         {
-            DataFlavor              aFlavor;
-            const SotAction_Impl*   pArrayStart = pArray;
-            ULONG                   nId = pArray->nFormatId;
+            DataFlavor				aFlavor;
+            const SotAction_Impl*	pArrayStart = pArray;
+            ULONG					nId = pArray->nFormatId;
 
 #if OSL_DEBUG_LEVEL > 1
 // used for testing a specific format - change in the debugger the value
@@ -1404,7 +1404,7 @@ static USHORT GetTransferableAction_Impl(
                 {
                     if( pxTransferable && (*pxTransferable).is() && ( SOT_FORMAT_FILE_LIST == rFormat ) )
                     {
-                        if( IsFormatSupported( rDataFlavorExVector, SOT_FORMAT_FILE ) )
+                        if(	IsFormatSupported( rDataFlavorExVector, SOT_FORMAT_FILE ) )
                         {
                             DataFlavor aFileListFlavor;
                             SotExchange::GetFormatDataFlavor( SOT_FORMAT_FILE_LIST, aFileListFlavor );
@@ -1412,9 +1412,9 @@ static USHORT GetTransferableAction_Impl(
 
                             if( aAny.hasValue() )
                             {
-                                Sequence< sal_Int8 >    aSeq; aAny >>= aSeq;
-                                SvMemoryStream          aMemStm( (void*) aSeq.getConstArray(), aSeq.getLength(), STREAM_READ );
-                                FileList                aFileList;
+                                Sequence< sal_Int8 >	aSeq; aAny >>= aSeq;
+                                SvMemoryStream			aMemStm( (void*) aSeq.getConstArray(), aSeq.getLength(), STREAM_READ );
+                                FileList				aFileList;
 
                                 aMemStm >> aFileList;
 
@@ -1513,7 +1513,7 @@ USHORT SotExchange::GetExchangeAction( const DataFlavorExVector& rDataFlavorExVe
                         rFormat, nOnlyTestFormat, pxTransferable );
                     if ( nUserAction )
                         return nUserAction;
-                }
+                }        
                 rDefaultAction = (EXCHG_IN_ACTION_LINK & nSourceOptions);
                 if( rDefaultAction )
                 {
@@ -1584,8 +1584,8 @@ USHORT SotExchange::GetExchangeAction(
 
             for( sal_Int32 i = 0; i < aFlavors.getLength(); i++ )
             {
-                DataFlavorEx        aFlavorEx;
-                const DataFlavor&   rFlavor = aFlavors[ i ];
+                DataFlavorEx		aFlavorEx;
+                const DataFlavor&	rFlavor = aFlavors[ i ];
 
                 aFlavorEx.MimeType = rFlavor.MimeType;
                 aFlavorEx.HumanPresentableName = rFlavor.HumanPresentableName;
@@ -1628,9 +1628,9 @@ USHORT SotExchange::GetExchangeAction(
 USHORT SotExchange::IsChart(  const SvGlobalName& rName )
 {
     USHORT nRet=0;
-//  if ( rName == SvGlobalName( SO3_SCH_CLASSID_8 ) )
-//      nRet = SOFFICE_FILEFORMAT_8;
-//  else
+//	if ( rName == SvGlobalName( SO3_SCH_CLASSID_8 ) )
+//		nRet = SOFFICE_FILEFORMAT_8;
+//	else 
     if ( rName == SvGlobalName( SO3_SCH_CLASSID_60 ) )
         nRet = SOFFICE_FILEFORMAT_60;
     else if ( rName == SvGlobalName( SO3_SCH_CLASSID_50 ) )
@@ -1646,9 +1646,9 @@ USHORT SotExchange::IsChart(  const SvGlobalName& rName )
 USHORT SotExchange::IsMath(  const SvGlobalName& rName )
 {
     USHORT nRet=0;
-//  if ( rName == SvGlobalName( SO3_SM_CLASSID_8 ) )
-//      nRet = SOFFICE_FILEFORMAT_8;
-//  else
+//	if ( rName == SvGlobalName( SO3_SM_CLASSID_8 ) )
+//		nRet = SOFFICE_FILEFORMAT_8;
+//	else
     if ( rName == SvGlobalName( SO3_SM_CLASSID_60 ) )
         nRet = SOFFICE_FILEFORMAT_60;
     else if ( rName == SvGlobalName( SO3_SM_CLASSID_50 ) )
diff --git a/sot/source/base/object.cxx b/sot/source/base/object.cxx
index 403a1c6bb61d..d2c49aa20579 100644
--- a/sot/source/base/object.cxx
+++ b/sot/source/base/object.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
@@ -61,7 +61,7 @@ SO2_IMPL_INVARIANT(SotObject)
 /*************************************************************************
 |*  SotObject::TestMemberObjRef()
 |*
-|*  Beschreibung:
+|*	Beschreibung:
 *************************************************************************/
 void SotObject::TestMemberObjRef( BOOL /*bFree*/ )
 {
@@ -70,7 +70,7 @@ void SotObject::TestMemberObjRef( BOOL /*bFree*/ )
 /*************************************************************************
 |*  SotObject::TestMemberObjRef()
 |*
-|*  Beschreibung:
+|*	Beschreibung:
 *************************************************************************/
 #ifdef TEST_INVARIANT
 void SotObject::TestMemberInvariant( BOOL /*bPrint*/ )
@@ -89,7 +89,7 @@ SotObject::SotObject()
     , nOwnerLockCount( 0 )
     , bOwner      ( TRUE )
     , bSVObject   ( FALSE )
-    , bInClose    ( FALSE )
+    , bInClose	  ( FALSE )
 {
     SotFactory::IncSvObjectCount( this );
 }
@@ -131,12 +131,12 @@ BOOL SotObject::IsSvObject() const
 /*************************************************************************
 |*    SotObject::QueryDelete()
 |*
-|*    Beschreibung: Bei allen aggregierten Objekte muss der RefCount auf
-|*                  0 gehen, damit das Gesammt-Objekt zerstoert wird. Das
-|*                  zerst�ren von Teilen ist verboten. Da der Aggregator
-|*                  (oder Cast-Verwalter) den Zaehler der aggregierten
-|*                  Objekte um 1 erhoeht, muss dies bei der Berechnung
-|*                  des 0-RefCounts beruecksichtigt werden.
+|*    Beschreibung:	Bei allen aggregierten Objekte muss der RefCount auf
+|*					0 gehen, damit das Gesammt-Objekt zerstoert wird. Das
+|*					zerst�ren von Teilen ist verboten. Da der Aggregator
+|*					(oder Cast-Verwalter) den Zaehler der aggregierten
+|*					Objekte um 1 erhoeht, muss dies bei der Berechnung
+|*					des 0-RefCounts beruecksichtigt werden.
 *************************************************************************/
 BOOL SotObject::ShouldDelete()
 {
@@ -384,21 +384,21 @@ SotObject * SotObject::GetMainObj() const
 //=========================================================================
 USHORT SotObject::FuzzyLock
 (
-    BOOL bLock,         /* TRUE, lock. FALSE, unlock. */
-    BOOL /*bIntern*/,   /* TRUE, es handelt sich um einen internen Lock.
+    BOOL bLock,		    /* TRUE, lock. FALSE, unlock. */
+    BOOL /*bIntern*/,	/* TRUE, es handelt sich um einen internen Lock.
                            FALSE, der Lock kam von aussen (Ole2, Ipc2) */
-    BOOL bClose         /* TRUE, Close aufrufen wenn letzte Lock */
+    BOOL bClose		    /* TRUE, Close aufrufen wenn letzte Lock */
 )
-/*  [Beschreibung]
+/*	[Beschreibung]
 
     Erlaubte Parameterkombinationen:
-    ( TRUE,  TRUE,  *     ) ->  interner Lock.
-    ( FALSE, TRUE,  TRUE  ) ->  interner Unlock mit Close,
+    ( TRUE,  TRUE,  *     )	->	interner Lock.
+    ( FALSE, TRUE,  TRUE  )	->	interner Unlock mit Close,
                                  wenn LockCount() == 0
-    ( TRUE,  FALSE, *     ) ->  externer Lock.
-    ( FALSE, FALSE, TRUE  ) ->  externer Unlock mit Close,
+    ( TRUE,  FALSE, *	  )	->	externer Lock.
+    ( FALSE, FALSE, TRUE  )	->	externer Unlock mit Close,
                                  wenn LockCount() == 0
-    ( FALSE, FALSE, FALSE ) ->  externer Unlock
+    ( FALSE, FALSE, FALSE )	->	externer Unlock
 
     F"ur !Owner() wird der Aufruf an das externe Objekt weitergeleitet.
      F"ur diese muss das <IOleItemContainer>-Interface zur Vef"ugung stehen.
@@ -431,9 +431,9 @@ USHORT SotObject::FuzzyLock
 //=========================================================================
 void SotObject::OwnerLock
 (
-    BOOL bLock      /* TRUE, lock. FALSE, unlock. */
+    BOOL bLock		/* TRUE, lock. FALSE, unlock. */
 )
-/*  [Beschreibung]
+/*	[Beschreibung]
 
     Wenn der OwnerLock auf Null dekrementiert, dann wird die Methode
     DoClose gerufen. Dies geschieht unabh"angig vom Lock. bzw. RefCount.
diff --git a/sot/source/sdstor/stg.cxx b/sot/source/sdstor/stg.cxx
index 1c749aa05cb8..4a0378b1735d 100644
--- a/sot/source/sdstor/stg.cxx
+++ b/sot/source/sdstor/stg.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
@@ -440,7 +440,7 @@ Storage::Storage( UCBStorageStream& rStrm, BOOL bDirect )
         pEntry = NULL;
         return;
     }
-
+    
     if( pStream->IsWritable() )
         m_nMode = STREAM_READ | STREAM_WRITE;
 
diff --git a/sot/source/sdstor/stgavl.cxx b/sot/source/sdstor/stgavl.cxx
index 3542a965da33..19096b9e6375 100644
--- a/sot/source/sdstor/stgavl.cxx
+++ b/sot/source/sdstor/stgavl.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
@@ -342,7 +342,7 @@ BOOL StgAvlNode::Remove( StgAvlNode** pRoot, StgAvlNode* pDel, BOOL bDel )
             delete pDel;
         // Rebalance the tree the hard way
         // OS 22.09.95: Auf MD's Wunsch auskommentiert wg. Absturz
-/*      StgAvlNode* pNew = NULL;
+/*		StgAvlNode* pNew = NULL;
         while( *pRoot )
         {
             StgAvlNode* p = Rem( pRoot, *pRoot, FALSE );
diff --git a/sot/source/sdstor/stgavl.hxx b/sot/source/sdstor/stgavl.hxx
index 66f424888e6d..bc8181682640 100644
--- a/sot/source/sdstor/stgavl.hxx
+++ b/sot/source/sdstor/stgavl.hxx
@@ -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
@@ -48,9 +48,9 @@ private:
     void   StgEnum( short& );
     static StgAvlNode* Rem( StgAvlNode**, StgAvlNode*, BOOL );
 protected:
-    short nId;                          // iterator ID
-    short nBalance;                     // indicates tree balance
-    StgAvlNode* pLeft, *pRight;         // leaves
+    short nId;						  	// iterator ID
+    short nBalance;						// indicates tree balance
+    StgAvlNode* pLeft, *pRight; 		// leaves
     StgAvlNode();
 public:
     virtual ~StgAvlNode();
@@ -64,9 +64,9 @@ public:
 // The iterator class provides single stepping through an AVL tree.
 
 class StgAvlIterator {
-    StgAvlNode* pRoot;                  // root entry (parent)
-    short       nCount;                 // tree size
-    short       nCur;                   // current element
+    StgAvlNode* pRoot;					// root entry (parent)
+    short 	    nCount;					// tree size
+    short		nCur;					// current element
     StgAvlNode* Find( short );
 public:
     StgAvlIterator( StgAvlNode* );
diff --git a/sot/source/sdstor/stgcache.cxx b/sot/source/sdstor/stgcache.cxx
index 88a8187ee9dd..d5817b89900d 100644
--- a/sot/source/sdstor/stgcache.cxx
+++ b/sot/source/sdstor/stgcache.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
@@ -61,8 +61,8 @@ typedef std::hash_map
 #pragma warning( disable: 4786 )
 #endif
 
-//#define   CHECK_DIRTY 1
-//#define   READ_AFTER_WRITE 1
+//#define	CHECK_DIRTY 1
+//#define	READ_AFTER_WRITE 1
 
 ////////////////////////////// class StgPage /////////////////////////////
 // This class implements buffer functionality. The cache will always return
diff --git a/sot/source/sdstor/stgcache.hxx b/sot/source/sdstor/stgcache.hxx
index 5379f837b8b1..503dcc2e56e9 100644
--- a/sot/source/sdstor/stgcache.hxx
+++ b/sot/source/sdstor/stgcache.hxx
@@ -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
@@ -45,40 +45,40 @@ class StgDirEntry;
 class StorageBase;
 
 class StgCache {
-    StgPage* pCur;                          // top of LRU list
-    StgPage* pElem1;                        // top of ordered list
-    ULONG nError;                           // error code
-    INT32 nPages;                           // size of data area in pages
-    USHORT nRef;                            // reference count
-    void * pLRUCache;                       // hash table of cached objects
-    short nPageSize;                        // page size of the file
-    UCBStorageStream* pStorageStream;       // holds reference to UCB storage stream
-
-    void Erase( StgPage* );                 // delete a cache element
-    void InsertToLRU( StgPage* );           // insert into LRU list
-    void InsertToOrdered( StgPage* );       // insert into ordered list
-    StgPage* Create( INT32 );               // create a cached page
+    StgPage* pCur;							// top of LRU list
+    StgPage* pElem1;						// top of ordered list
+    ULONG nError;							// error code
+    INT32 nPages;							// size of data area in pages
+    USHORT nRef;							// reference count
+    void * pLRUCache;						// hash table of cached objects
+    short nPageSize;						// page size of the file
+    UCBStorageStream* pStorageStream;		// holds reference to UCB storage stream
+    
+    void Erase( StgPage* );					// delete a cache element
+    void InsertToLRU( StgPage* );			// insert into LRU list
+    void InsertToOrdered( StgPage* );		// insert into ordered list
+    StgPage* Create( INT32 );				// create a cached page
 protected:
-    SvStream* pStrm;                        // physical stream
-    BOOL  bMyStream;                        // TRUE: delete stream in dtor
-    BOOL  bFile;                            // TRUE: file stream
-    INT32 Page2Pos( INT32 );                // page address --> file position
-    INT32 Pos2Page( INT32 );                // file position --> page address
+    SvStream* pStrm;						// physical stream
+    BOOL  bMyStream;						// TRUE: delete stream in dtor
+    BOOL  bFile;							// TRUE: file stream
+    INT32 Page2Pos( INT32 );				// page address --> file position
+    INT32 Pos2Page( INT32 );				// file position --> page address
 public:
     StgCache();
     ~StgCache();
-    void  IncRef()                      { nRef++;           }
-    USHORT DecRef()                     { return --nRef;    }
+    void  IncRef()						{ nRef++;			}
+    USHORT DecRef()						{ return --nRef;	}
     void  SetPhysPageSize( short );
-    INT32 GetPhysPages()                { return nPages;    }
-    short GetPhysPageSize()             { return nPageSize; }
-    SvStream* GetStrm()                 { return pStrm;     }
+    INT32 GetPhysPages()				{ return nPages;	}
+    short GetPhysPageSize()				{ return nPageSize; }
+    SvStream* GetStrm()	  				{ return pStrm;  	}
     void  SetStrm( SvStream*, BOOL );
     void  SetStrm( UCBStorageStream* );
-    BOOL  IsWritable()                  { return pStrm->IsWritable(); }
-    BOOL  Good()                        { return BOOL( nError == SVSTREAM_OK ); }
+    BOOL  IsWritable()					{ return pStrm->IsWritable(); }
+    BOOL  Good()						{ return BOOL( nError == SVSTREAM_OK ); }
     BOOL  Bad()                         { return BOOL( nError != SVSTREAM_OK ); }
-    ULONG GetError()                    { return nError;    }
+    ULONG GetError()					{ return nError; 	}
     void  MoveError( StorageBase& );
     void  SetError( ULONG );
     void  ResetError();
@@ -87,32 +87,32 @@ public:
     BOOL  Read( INT32 nPage, void* pBuf, INT32 nPages );
     BOOL  Write( INT32 nPage, void* pBuf, INT32 nPages );
     BOOL  SetSize( INT32 nPages );
-    StgPage* Find( INT32 );                 // find a cached page
-    StgPage* Get( INT32, BOOL );            // get a cached page
-    StgPage* Copy( INT32, INT32=STG_FREE ); // copy a page
-    BOOL Commit( StgDirEntry* = NULL );     // flush all pages
-    void Revert( StgDirEntry* = NULL );     // revert dirty pages
-    void Clear();                           // clear the cache
+    StgPage* Find( INT32 );					// find a cached page
+    StgPage* Get( INT32, BOOL );			// get a cached page
+    StgPage* Copy( INT32, INT32=STG_FREE );	// copy a page
+    BOOL Commit( StgDirEntry* = NULL );		// flush all pages
+    void Revert( StgDirEntry* = NULL );		// revert dirty pages
+    void Clear();							// clear the cache
 };
 
 class StgPage {
     friend class StgCache;
-    StgCache* pCache;                       // the cache
-    StgPage *pNext1, *pLast1;               // LRU chain
-    StgPage *pNext2, *pLast2;               // ordered chain
-    StgDirEntry* pOwner;                    // owner
-    INT32   nPage;                          // page #
-    BYTE*   pData;                          // nPageSize characters
-    short   nData;                          // size of this page
-    BOOL    bDirty;                         // dirty flag
+    StgCache* pCache;						// the cache
+    StgPage *pNext1, *pLast1;				// LRU chain
+    StgPage *pNext2, *pLast2;				// ordered chain
+    StgDirEntry* pOwner;					// owner
+    INT32	nPage;							// page #
+    BYTE*	pData;							// nPageSize characters
+    short	nData;							// size of this page
+    BOOL	bDirty;							// dirty flag
     StgPage( StgCache*, short );
     ~StgPage();
 public:
-    void  SetDirty()                    { bDirty = TRUE;            }
-    INT32 GetPage()                     { return nPage;             }
-    void* GetData()                     { return pData;             }
-    short GetSize()                     { return nData;             }
-    void  SetOwner( StgDirEntry* p )    { pOwner = p;               }
+    void  SetDirty()					{ bDirty = TRUE; 	 		}
+    INT32 GetPage()						{ return nPage;				}
+    void* GetData()						{ return pData; 	 		}
+    short GetSize()						{ return nData; 	 		}
+    void  SetOwner( StgDirEntry* p )	{ pOwner = p;				}
     // routines for accessing FAT pages
     // Assume that the data is a FAT page and get/put FAT data.
     INT32 GetPage( short nOff )
@@ -126,7 +126,7 @@ public:
         return n;
 #endif
     }
-    void  SetPage( short, INT32 );      // put an element
+    void  SetPage( short, INT32 );		// put an element
 };
 
 #endif
diff --git a/sot/source/sdstor/stgdir.cxx b/sot/source/sdstor/stgdir.cxx
index f093dc60cbe7..07a8849c3bf7 100644
--- a/sot/source/sdstor/stgdir.cxx
+++ b/sot/source/sdstor/stgdir.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
@@ -70,24 +70,24 @@ StgDirEntry::StgDirEntry( const StgEntry& r ) : StgAvlNode(), aEntry( r )
 
 void StgDirEntry::InitMembers()
 {
-    aSave       = aEntry;
-    pUp         =
-    pDown       = NULL;
-    ppRoot      = NULL;
-    pStgStrm    = NULL;
-    pCurStrm    =
-    pTmpStrm    = NULL;
-    nPos        =
-    nEntry      =
-    nRefCnt     = 0;
-    nMode       = STREAM_READ;
-    bDirect     = TRUE;
-    bInvalid    =
-    bCreated    =
-    bRenamed    =
-    bRemoved    =
-    bTemp       =
-    bDirty      =
+    aSave 		= aEntry;
+    pUp 		=
+    pDown  		= NULL;
+    ppRoot 		= NULL;
+    pStgStrm 	= NULL;
+    pCurStrm	=
+    pTmpStrm	= NULL;
+    nPos		=
+    nEntry 		=
+    nRefCnt 	= 0;
+    nMode  		= STREAM_READ;
+    bDirect 	= TRUE;
+    bInvalid	=
+    bCreated	=
+    bRenamed 	=
+    bRemoved	=
+    bTemp  		=
+    bDirty 		=
     bZombie     = FALSE;
 }
 
@@ -271,7 +271,7 @@ void StgDirEntry::OpenStream( StgIo& rIo, BOOL bForceBig )
     {
         // This entry has invalid data, so delete that data
         SetSize( 0L );
-//      bRemoved = bInvalid = FALSE;
+//		bRemoved = bInvalid = FALSE;
     }
     nPos = 0;
 }
@@ -285,7 +285,7 @@ void StgDirEntry::Close()
 {
     delete pTmpStrm;
     pTmpStrm = NULL;
-//  nRefCnt  = 0;
+//	nRefCnt	 = 0;
     bInvalid = bTemp;
 }
 
@@ -625,7 +625,7 @@ BOOL StgDirEntry::Strm2Tmp()
             pTmpStrm = new StgTmpStrm;
             if( pTmpStrm->GetError() == SVSTREAM_OK && pTmpStrm->Copy( *pCurStrm ) )
                 return TRUE;
-            n = 1;  // indicates error
+            n = 1;	// indicates error
         }
         else
         {
@@ -750,7 +750,7 @@ BOOL StgDirEntry::IsContained( StgDirEntry* pStg )
 
 void StgDirEntry::Invalidate( BOOL bDel )
 {
-//  nRefCnt = 0;
+//	nRefCnt = 0;
     if( bDel )
         bRemoved = bInvalid = TRUE;
     switch( aEntry.GetType() )
@@ -826,7 +826,7 @@ void StgDirStrm::SetupEntry( INT32 n, StgDirEntry* pUpper )
         // better it is
         if( !pUpper )
             pCur->aEntry.SetType( STG_ROOT );
-
+        
         INT32 nLeft = pCur->aEntry.GetLeaf( STG_LEFT );
         INT32 nRight = pCur->aEntry.GetLeaf( STG_RIGHT );
         // substorage?
diff --git a/sot/source/sdstor/stgdir.hxx b/sot/source/sdstor/stgdir.hxx
index 3ef510a12e50..8a3ab23f9283 100644
--- a/sot/source/sdstor/stgdir.hxx
+++ b/sot/source/sdstor/stgdir.hxx
@@ -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
@@ -42,43 +42,43 @@ class StgDirEntry : public StgAvlNode
 {
     friend class StgIterator;
     friend class StgDirStrm;
-    StgEntry     aSave;                     // original dir entry
-    StgDirEntry*  pUp;                      // parent directory
-    StgDirEntry*  pDown;                    // child directory for storages
-    StgDirEntry** ppRoot;                   // root of TOC tree
-    StgStrm*     pStgStrm;                  // storage stream
-    StgTmpStrm*  pTmpStrm;                  // temporary stream
-    StgTmpStrm*  pCurStrm;                  // temp stream after commit
-    INT32        nEntry;                    // entry # in TOC stream (temp)
-    INT32        nPos;                      // current position
-    BOOL         bDirty;                    // dirty directory entry
-    BOOL         bCreated;                  // newly created entry
-    BOOL         bRemoved;                  // removed per Invalidate()
-    BOOL         bRenamed;                  // renamed
-    void         InitMembers();             // ctor helper
+    StgEntry	 aSave;						// original dir entry
+    StgDirEntry*  pUp;						// parent directory
+    StgDirEntry*  pDown;					// child directory for storages
+    StgDirEntry** ppRoot;					// root of TOC tree
+    StgStrm*     pStgStrm; 	                // storage stream
+    StgTmpStrm*	 pTmpStrm;					// temporary stream
+    StgTmpStrm*  pCurStrm;					// temp stream after commit
+    INT32		 nEntry;					// entry # in TOC stream (temp)
+    INT32		 nPos;						// current position
+    BOOL		 bDirty;					// dirty directory entry
+    BOOL		 bCreated;					// newly created entry
+    BOOL		 bRemoved;					// removed per Invalidate()
+    BOOL		 bRenamed;					// renamed
+    void		 InitMembers();				// ctor helper
     virtual short Compare( const StgAvlNode* ) const;
-    BOOL         StoreStream( StgIo& );     // store the stream
-    BOOL         StoreStreams( StgIo& );    // store all streams
-    void         RevertAll();               // revert the whole tree
-    BOOL         Strm2Tmp();                // copy stgstream to temp file
-    BOOL         Tmp2Strm();                // copy temp file to stgstream
+    BOOL		 StoreStream( StgIo& );		// store the stream
+    BOOL		 StoreStreams( StgIo& );	// store all streams
+    void		 RevertAll();				// revert the whole tree
+    BOOL		 Strm2Tmp();				// copy stgstream to temp file
+    BOOL		 Tmp2Strm();				// copy temp file to stgstream
 public:
-    StgEntry     aEntry;                    // entry data
-    INT32        nRefCnt;                   // reference count
-    StreamMode   nMode;                     // open mode
-    BOOL         bTemp;                     // TRUE: delete on dir flush
-    BOOL         bDirect;                   // TRUE: direct mode
+    StgEntry 	 aEntry;					// entry data
+    INT32  		 nRefCnt;					// reference count
+    StreamMode   nMode;             		// open mode
+    BOOL		 bTemp;						// TRUE: delete on dir flush
+    BOOL		 bDirect; 		  			// TRUE: direct mode
     BOOL         bZombie;                   // TRUE: Removed From StgIo
-    BOOL         bInvalid;                  // TRUE: invalid entry
+    BOOL		 bInvalid;					// TRUE: invalid entry
     StgDirEntry( const void*, BOOL * pbOk );
     StgDirEntry( const StgEntry& );
     ~StgDirEntry();
 
-    void Invalidate( BOOL=FALSE );          // invalidate all open entries
-    void Enum( INT32& );                    // enumerate entries for iteration
-    void DelTemp( BOOL );                   // delete temporary entries
-    BOOL Store( StgDirStrm& );              // save entry into dir strm
-    BOOL IsContained( StgDirEntry* );       // check if subentry
+    void Invalidate( BOOL=FALSE ); 			// invalidate all open entries
+    void Enum( INT32& );					// enumerate entries for iteration
+    void DelTemp( BOOL );					// delete temporary entries
+    BOOL Store( StgDirStrm& );				// save entry into dir strm
+    BOOL IsContained( StgDirEntry* );		// check if subentry
 
     void SetDirty()  { bDirty = TRUE;     }
     BOOL IsDirty();
@@ -87,7 +87,7 @@ public:
     BOOL Commit();
     BOOL Revert();
 
-    void  OpenStream( StgIo&, BOOL=FALSE );     // set up an approbiate stream
+    void  OpenStream( StgIo&, BOOL=FALSE );		// set up an approbiate stream
     void  Close();
     INT32 GetSize();
     BOOL  SetSize( INT32 );
@@ -102,15 +102,15 @@ public:
 class StgDirStrm : public StgDataStrm
 {
     friend class StgIterator;
-    StgDirEntry* pRoot;                         // root of dir tree
-    short        nEntries;                      // entries per page
-    void         SetupEntry( INT32, StgDirEntry* );
+    StgDirEntry* pRoot;							// root of dir tree
+    short 		 nEntries;						// entries per page
+    void		 SetupEntry( INT32, StgDirEntry* );
 public:
     StgDirStrm( StgIo& );
     ~StgDirStrm();
-    virtual BOOL SetSize( INT32 );              // change the size
-    BOOL         Store();
-    void*        GetEntry( INT32 n, BOOL=FALSE );// get an entry
+    virtual BOOL SetSize( INT32 );				// change the size
+    BOOL		 Store();
+    void*	     GetEntry( INT32 n, BOOL=FALSE );// get an entry
     StgDirEntry* GetRoot() { return pRoot; }
     StgDirEntry* Find( StgDirEntry&, const String& );
     StgDirEntry* Create( StgDirEntry&, const String&, StgEntryType );
diff --git a/sot/source/sdstor/stgelem.cxx b/sot/source/sdstor/stgelem.cxx
index 46d7f1803140..545ddeef219e 100644
--- a/sot/source/sdstor/stgelem.cxx
+++ b/sot/source/sdstor/stgelem.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
@@ -110,20 +110,20 @@ BOOL StgHeader::Load( SvStream& r )
 {
     r.Seek( 0L );
     r.Read( cSignature, 8 );
-    r >> aClsId                     // 08 Class ID
-      >> nVersion                   // 1A version number
-      >> nByteOrder                 // 1C Unicode byte order indicator
-      >> nPageSize                  // 1E 1 << nPageSize = block size
-      >> nDataPageSize;             // 20 1 << this size == data block size
+    r >> aClsId						// 08 Class ID
+      >> nVersion 					// 1A version number
+      >> nByteOrder 				// 1C Unicode byte order indicator
+      >> nPageSize 					// 1E 1 << nPageSize = block size
+      >> nDataPageSize;				// 20 1 << this size == data block size
     r.SeekRel( 10 );
-    r >> nFATSize                   // 2C total number of FAT pages
-      >> nTOCstrm                   // 30 starting page for the TOC stream
-      >> nReserved                  // 34
-      >> nThreshold                 // 38 minimum file size for big data
-      >> nDataFAT                   // 3C page # of 1st data FAT block
-      >> nDataFATSize               // 40 # of data FATpages
-      >> nMasterChain               // 44 chain to the next master block
-      >> nMaster;                   // 48 # of additional master blocks
+    r >> nFATSize					// 2C total number of FAT pages
+      >> nTOCstrm 					// 30 starting page for the TOC stream
+      >> nReserved 					// 34
+      >> nThreshold  				// 38 minimum file size for big data
+      >> nDataFAT 					// 3C page # of 1st data FAT block
+      >> nDataFATSize				// 40 # of data FATpages
+      >> nMasterChain 				// 44 chain to the next master block
+      >> nMaster;					// 48 # of additional master blocks
     for( short i = 0; i < 109; i++ )
         r >> nMasterFAT[ i ];
     return r.GetErrorCode() == ERRCODE_NONE;
@@ -136,19 +136,19 @@ BOOL StgHeader::Store( StgIo& rIo )
     SvStream& r = *rIo.GetStrm();
     r.Seek( 0L );
     r.Write( cSignature, 8 + 16 );
-    r << nVersion                   // 1A version number
-      << nByteOrder                 // 1C Unicode byte order indicator
-      << nPageSize                  // 1E 1 << nPageSize = block size
-      << nDataPageSize              // 20 1 << this size == data block size
+    r << nVersion 					// 1A version number
+      << nByteOrder 				// 1C Unicode byte order indicator
+      << nPageSize 					// 1E 1 << nPageSize = block size
+      << nDataPageSize 				// 20 1 << this size == data block size
       << (INT32) 0 << (INT32) 0 << (INT16) 0
-      << nFATSize                   // 2C total number of FAT pages
-      << nTOCstrm                   // 30 starting page for the TOC stream
-      << nReserved                  // 34
-      << nThreshold                 // 38 minimum file size for big data
-      << nDataFAT                   // 3C page # of 1st data FAT block
-      << nDataFATSize               // 40 # of data FAT pages
-      << nMasterChain               // 44 chain to the next master block
-      << nMaster;                   // 48 # of additional master blocks
+      << nFATSize					// 2C total number of FAT pages
+      << nTOCstrm 					// 30 starting page for the TOC stream
+      << nReserved 					// 34
+      << nThreshold  				// 38 minimum file size for big data
+      << nDataFAT 					// 3C page # of 1st data FAT block
+      << nDataFATSize				// 40 # of data FAT pages
+      << nMasterChain 				// 44 chain to the next master block
+      << nMaster;					// 48 # of additional master blocks
     for( short i = 0; i < 109; i++ )
         r << nMasterFAT[ i ];
     bDirty = !rIo.Good();
@@ -283,7 +283,7 @@ BOOL StgEntry::SetName( const String& rName )
     // I don't know the locale, so en_US is hopefully fine
     aName = ToUpperUnicode( rName );
     aName.Erase( 31 );
-
+    
     int i;
     for( i = 0; i < aName.Len() && i < 32; i++ )
         nName[ i ] = rName.GetChar( sal_uInt16( i ));
@@ -353,7 +353,7 @@ short StgEntry::Compare( const StgEntry& r ) const
     else return nRes;
     */
     sal_Int32 nRes = r.nNameLen - nNameLen;
-    if( !nRes )
+    if( !nRes ) 
         nRes = r.aName.CompareTo( aName );
     return (short)nRes;
     //return aName.CompareTo( r.aName );
@@ -366,22 +366,22 @@ BOOL StgEntry::Load( const void* pFrom )
 {
     SvMemoryStream r( (sal_Char*) pFrom, 128, STREAM_READ );
     for( short i = 0; i < 32; i++ )
-        r >> nName[ i ];            // 00 name as WCHAR
-    r >> nNameLen                   // 40 size of name in bytes including 00H
-      >> cType                      // 42 entry type
-      >> cFlags                     // 43 0 or 1 (tree balance?)
-      >> nLeft                      // 44 left node entry
-      >> nRight                     // 48 right node entry
-      >> nChild                     // 4C 1st child entry if storage
-      >> aClsId                     // 50 class ID (optional)
-      >> nFlags                     // 60 state flags(?)
-      >> nMtime[ 0 ]                // 64 modification time
-      >> nMtime[ 1 ]                // 64 modification time
-      >> nAtime[ 0 ]                // 6C creation and access time
-      >> nAtime[ 1 ]                // 6C creation and access time
-      >> nPage1                     // 74 starting block (either direct or translated)
-      >> nSize                      // 78 file size
-      >> nUnknown;                  // 7C unknown
+        r >> nName[ i ];			// 00 name as WCHAR
+    r >> nNameLen 					// 40 size of name in bytes including 00H
+      >> cType 						// 42 entry type
+      >> cFlags						// 43 0 or 1 (tree balance?)
+      >> nLeft						// 44 left node entry
+      >> nRight						// 48 right node entry
+      >> nChild						// 4C 1st child entry if storage
+      >> aClsId						// 50 class ID (optional)
+      >> nFlags						// 60 state flags(?)
+      >> nMtime[ 0 ]				// 64 modification time
+      >> nMtime[ 1 ]				// 64 modification time
+      >> nAtime[ 0 ] 				// 6C creation and access time
+      >> nAtime[ 1 ] 				// 6C creation and access time
+      >> nPage1						// 74 starting block (either direct or translated)
+      >> nSize 						// 78 file size
+      >> nUnknown;					// 7C unknown
 
     UINT16 n = nNameLen;
     if( n )
@@ -405,21 +405,21 @@ void StgEntry::Store( void* pTo )
 {
     SvMemoryStream r( (sal_Char *)pTo, 128, STREAM_WRITE );
     for( short i = 0; i < 32; i++ )
-        r << nName[ i ];            // 00 name as WCHAR
-    r << nNameLen                   // 40 size of name in bytes including 00H
-      << cType                      // 42 entry type
-      << cFlags                     // 43 0 or 1 (tree balance?)
-      << nLeft                      // 44 left node entry
-      << nRight                     // 48 right node entry
-      << nChild                     // 4C 1st child entry if storage;
-      << aClsId                     // 50 class ID (optional)
-      << nFlags                     // 60 state flags(?)
-      << nMtime[ 0 ]                // 64 modification time
-      << nMtime[ 1 ]                // 64 modification time
-      << nAtime[ 0 ]                // 6C creation and access time
-      << nAtime[ 1 ]                // 6C creation and access time
-      << nPage1                     // 74 starting block (either direct or translated)
-      << nSize                      // 78 file size
-      << nUnknown;                  // 7C unknown
+        r << nName[ i ];			// 00 name as WCHAR
+    r << nNameLen 					// 40 size of name in bytes including 00H
+      << cType 						// 42 entry type
+      << cFlags						// 43 0 or 1 (tree balance?)
+      << nLeft						// 44 left node entry
+      << nRight						// 48 right node entry
+      << nChild						// 4C 1st child entry if storage;
+      << aClsId						// 50 class ID (optional)
+      << nFlags						// 60 state flags(?)
+      << nMtime[ 0 ]				// 64 modification time
+      << nMtime[ 1 ]				// 64 modification time
+      << nAtime[ 0 ] 				// 6C creation and access time
+      << nAtime[ 1 ] 				// 6C creation and access time
+      << nPage1						// 74 starting block (either direct or translated)
+      << nSize 						// 78 file size
+      << nUnknown;					// 7C unknown
 }
 
diff --git a/sot/source/sdstor/stgelem.hxx b/sot/source/sdstor/stgelem.hxx
index 7a5b7bc52b26..430377f5ed0f 100644
--- a/sot/source/sdstor/stgelem.hxx
+++ b/sot/source/sdstor/stgelem.hxx
@@ -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
@@ -46,121 +46,121 @@ SvStream& operator<<( SvStream&, const ClsId& );
 
 class StgHeader
 {
-    BYTE    cSignature[ 8 ];            // 00 signature (see below)
-    ClsId   aClsId;                     // 08 Class ID
-    INT32   nVersion;                   // 18 version number
-    UINT16  nByteOrder;                 // 1C Unicode byte order indicator
-    INT16   nPageSize;                  // 1E 1 << nPageSize = block size
-    INT16   nDataPageSize;              // 20 1 << this size == data block size
-    BYTE    bDirty;                     // 22 internal dirty flag
-    BYTE    cReserved[ 9 ];             // 23
-    INT32   nFATSize;                   // 2C total number of FAT pages
-    INT32   nTOCstrm;                   // 30 starting page for the TOC stream
-    INT32   nReserved;                  // 34
-    INT32   nThreshold;                 // 38 minimum file size for big data
-    INT32   nDataFAT;                   // 3C page # of 1st data FAT block
-    INT32   nDataFATSize;               // 40 # of data fat blocks
-    INT32   nMasterChain;               // 44 chain to the next master block
-    INT32   nMaster;                    // 48 # of additional master blocks
-    INT32   nMasterFAT[ 109 ];          // 4C first 109 master FAT pages
+    BYTE 	cSignature[ 8 ];			// 00 signature (see below)
+    ClsId	aClsId;						// 08 Class ID
+    INT32	nVersion;					// 18 version number
+    UINT16	nByteOrder;					// 1C Unicode byte order indicator
+    INT16	nPageSize;					// 1E 1 << nPageSize = block size
+    INT16	nDataPageSize;				// 20 1 << this size == data block size
+    BYTE	bDirty;						// 22 internal dirty flag
+    BYTE	cReserved[ 9 ];				// 23
+    INT32	nFATSize; 					// 2C total number of FAT pages
+    INT32	nTOCstrm;					// 30 starting page for the TOC stream
+    INT32	nReserved;					// 34
+    INT32	nThreshold;					// 38 minimum file size for big data
+    INT32	nDataFAT;					// 3C page # of 1st data FAT block
+    INT32	nDataFATSize;				// 40 # of data fat blocks
+    INT32	nMasterChain;				// 44 chain to the next master block
+    INT32	nMaster;					// 48 # of additional master blocks
+    INT32	nMasterFAT[ 109 ];			// 4C first 109 master FAT pages
 public:
     StgHeader();
-    void  Init();                       // initialize the header
+    void  Init();						// initialize the header
     BOOL  Load( StgIo& );
     BOOL  Load( SvStream& );
     BOOL  Store( StgIo& );
-    BOOL  Check();                      // check the signature and version
-    short GetByteOrder() const          { return nByteOrder;    }
-    INT32 GetTOCStart() const           { return nTOCstrm;      }
+    BOOL  Check();						// check the signature and version
+    short GetByteOrder() const			{ return nByteOrder;	}
+    INT32 GetTOCStart() const			{ return nTOCstrm;		}
     void  SetTOCStart( INT32 n );
-    INT32 GetDataFATStart() const       { return nDataFAT;      }
+    INT32 GetDataFATStart() const		{ return nDataFAT;		}
     void  SetDataFATStart( INT32 n );
-    INT32 GetDataFATSize() const        { return nDataFATSize;  }
+    INT32 GetDataFATSize() const		{ return nDataFATSize; 	}
     void  SetDataFATSize( INT32 n );
-    INT32 GetThreshold() const          { return nThreshold;    }
-    short GetPageSize() const           { return nPageSize;     }
-    short GetDataPageSize() const       { return nDataPageSize; }
-    INT32 GetFATSize() const            { return nFATSize;      }
+    INT32 GetThreshold() const			{ return nThreshold;	}
+    short GetPageSize() const			{ return nPageSize;		}
+    short GetDataPageSize() const		{ return nDataPageSize;	}
+    INT32 GetFATSize() const			{ return nFATSize;		}
     void  SetFATSize( INT32 n );
-    INT32 GetFATChain() const           { return nMasterChain;  }
+    INT32 GetFATChain() const			{ return nMasterChain;	}
     void  SetFATChain( INT32 n );
-    INT32 GetMasters() const            { return nMaster;       }
+    INT32 GetMasters() const			{ return nMaster;		}
     void  SetMasters( INT32 n );
-    short GetFAT1Size() const           { return 109;           }
-    const ClsId& GetClassId() const     { return aClsId;        }
+    short GetFAT1Size() const			{ return 109;			}
+    const ClsId& GetClassId() const		{ return aClsId;		}
     void  SetClassId( const ClsId& );
     INT32 GetFATPage( short ) const;
     void  SetFATPage( short, INT32 );
 };
 
-enum StgEntryType {                     // dir entry types:
-    STG_EMPTY     = 0,
+enum StgEntryType {						// dir entry types:
+    STG_EMPTY	  = 0,
     STG_STORAGE   = 1,
     STG_STREAM    = 2,
     STG_LOCKBYTES = 3,
     STG_PROPERTY  = 4,
-    STG_ROOT      = 5
+    STG_ROOT	  = 5
 };
 
-enum StgEntryRef {                      // reference blocks:
-    STG_LEFT      = 0,                  // left
-    STG_RIGHT     = 1,                  // right
-    STG_CHILD     = 2,                  // child
-    STG_DATA      = 3                   // data start
+enum StgEntryRef {						// reference blocks:
+    STG_LEFT	  = 0,					// left
+    STG_RIGHT	  = 1,					// right
+    STG_CHILD	  = 2,					// child
+    STG_DATA	  = 3					// data start
 };
 
-enum StgEntryTime {                     // time codes:
-    STG_MODIFIED  = 0,                  // last modification
-    STG_ACCESSED  = 1                   // last access
+enum StgEntryTime {						// time codes:
+    STG_MODIFIED  = 0,					// last modification
+    STG_ACCESSED  = 1					// last access
 };
 
 class StgStream;
 
 #define STGENTRY_SIZE 128
 
-class StgEntry {                        // directory enty
-    UINT16  nName[ 32 ];                // 00 name as WCHAR
-    INT16   nNameLen;                   // 40 size of name in bytes including 00H
-    BYTE    cType;                      // 42 entry type
-    BYTE    cFlags;                     // 43 0 or 1 (tree balance?)
-    INT32   nLeft;                      // 44 left node entry
-    INT32   nRight;                     // 48 right node entry
-    INT32   nChild;                     // 4C 1st child entry if storage
-    ClsId   aClsId;                     // 50 class ID (optional)
-    INT32   nFlags;                     // 60 state flags(?)
-    INT32   nMtime[ 2 ];                // 64 modification time
-    INT32   nAtime[ 2 ];                // 6C creation and access time
-    INT32   nPage1;                     // 74 starting block (either direct or translated)
-    INT32   nSize;                      // 78 file size
-    INT32   nUnknown;                   // 7C unknown
-    String  aName;                      // Name as Compare String (ascii, upper)
+class StgEntry {						// directory enty
+    UINT16	nName[ 32 ];				// 00 name as WCHAR
+    INT16	nNameLen;					// 40 size of name in bytes including 00H
+    BYTE	cType;						// 42 entry type
+    BYTE	cFlags;						// 43 0 or 1 (tree balance?)
+    INT32	nLeft;						// 44 left node entry
+    INT32	nRight;						// 48 right node entry
+    INT32	nChild;						// 4C 1st child entry if storage
+    ClsId	aClsId;						// 50 class ID (optional)
+    INT32	nFlags;						// 60 state flags(?)
+    INT32	nMtime[ 2 ];				// 64 modification time
+    INT32	nAtime[ 2 ];				// 6C creation and access time
+    INT32	nPage1;						// 74 starting block (either direct or translated)
+    INT32	nSize;						// 78 file size
+    INT32	nUnknown;					// 7C unknown
+    String	aName;		                // Name as Compare String (ascii, upper)
 public:
-    BOOL    Init();                     // initialize the data
-    BOOL    SetName( const String& );   // store a name (ASCII, up to 32 chars)
-    void    GetName( String& rName ) const;
+    BOOL	Init();						// initialize the data
+    BOOL	SetName( const String& );	// store a name (ASCII, up to 32 chars)
+    void	GetName( String& rName ) const;
                                         // fill in the name
-    short   Compare( const StgEntry& ) const;   // compare two entries
-    BOOL    Load( const void* );
+    short	Compare( const StgEntry& ) const;	// compare two entries
+    BOOL	Load( const void* );
     void    Store( void* );
-    StgEntryType GetType() const        { return (StgEntryType) cType;  }
+    StgEntryType GetType() const		{ return (StgEntryType) cType;	}
     INT32   GetStartPage() const        { return nPage1; }
-    void    SetType( StgEntryType t )   { cType = (BYTE) t;             }
-    BYTE    GetFlags() const            { return cFlags;                }
-    void    SetFlags( BYTE c )          { cFlags = c;                   }
-    INT32   GetSize() const             { return nSize;                 }
-    void    SetSize( INT32 n )          { nSize = n;                    }
-    const   ClsId& GetClassId() const   { return aClsId;                }
-    void    SetClassId( const ClsId& );
-    INT32   GetLeaf( StgEntryRef ) const;
-    void    SetLeaf( StgEntryRef, INT32 );
-    const   INT32* GetTime( StgEntryTime ) const;
-    void    SetTime( StgEntryTime, INT32* );
+    void	SetType( StgEntryType t )	{ cType = (BYTE) t;				}
+    BYTE	GetFlags() const			{ return cFlags;				}
+    void	SetFlags( BYTE c )			{ cFlags = c;					}
+    INT32	GetSize() const				{ return nSize;					}
+    void	SetSize( INT32 n )			{ nSize = n;					}
+    const   ClsId& GetClassId() const  	{ return aClsId;				}
+    void	SetClassId( const ClsId& );
+    INT32	GetLeaf( StgEntryRef ) const;
+    void	SetLeaf( StgEntryRef, INT32 );
+    const	INT32* GetTime( StgEntryTime ) const;
+    void	SetTime( StgEntryTime, INT32* );
 };
 
 
-#define STG_FREE    -1L                 // page is free
-#define STG_EOF     -2L                 // page is last page in chain
-#define STG_FAT     -3L                 // page is FAT page
-#define STG_MASTER  -4L                 // page is master FAT page
+#define STG_FREE	-1L					// page is free
+#define	STG_EOF		-2L					// page is last page in chain
+#define	STG_FAT		-3L					// page is FAT page
+#define	STG_MASTER	-4L					// page is master FAT page
 
 #endif
diff --git a/sot/source/sdstor/stgio.cxx b/sot/source/sdstor/stgio.cxx
index 00dd454233e2..67c5d752b3e0 100644
--- a/sot/source/sdstor/stgio.cxx
+++ b/sot/source/sdstor/stgio.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
@@ -158,7 +158,7 @@ class EasyFat
 
 public:
     EasyFat( StgIo & rIo, StgStrm *pFatStream, INT32 nPSize );
-    ~EasyFat() { delete pFat; delete pFree; }
+    ~EasyFat() { delete[] pFat; delete[] pFree; }
     INT32 GetPageSize() { return nPageSize; }
     INT32 Count() { return nPages; }
     INT32 operator[]( INT32 nOffset ) { return pFat[ nOffset ]; }
@@ -256,11 +256,11 @@ Validator::Validator( StgIo &rIoP )
 {
     ULONG nErr = nError = FAT_OK;
 
-    if( ( nErr = ValidateMasterFATs() ) != FAT_OK )
+    if(	( nErr = ValidateMasterFATs() ) != FAT_OK )
         nError = nErr;
-    else if(    ( nErr = ValidateDirectoryEntries() ) != FAT_OK )
+    else if(	( nErr = ValidateDirectoryEntries() ) != FAT_OK )
         nError = nErr;
-    else if(    ( nErr = FindUnrefedChains()) != FAT_OK )
+    else if(	( nErr = FindUnrefedChains()) != FAT_OK )
         nError = nErr;
 }
 
@@ -324,7 +324,7 @@ ULONG Validator::ValidateDirectoryEntries()
         return nErr;
     // TOC
     nErr = aFat.Mark(
-        rIo.aHdr.GetTOCStart(), -1, -2 );
+        rIo.aHdr.GetTOCStart(),	-1, -2 );
     return nErr;
 }
 
@@ -379,10 +379,10 @@ ULONG StgIo::ValidateFATs()
             ErrorLink::get().Call( &aArg );
             bCopied = TRUE;
         }
-//      DBG_ASSERT( nErr == FAT_OK ,"Storage kaputt");
+//		DBG_ASSERT( nErr == FAT_OK ,"Storage kaputt");
         return nErr;
     }
-//  DBG_ERROR("Validiere nicht (kein FileStorage)");
+//	DBG_ERROR("Validiere nicht (kein FileStorage)");
     return FAT_OK;
 }
 
diff --git a/sot/source/sdstor/stgio.hxx b/sot/source/sdstor/stgio.hxx
index db1c00b8d521..de0859aff42b 100644
--- a/sot/source/sdstor/stgio.hxx
+++ b/sot/source/sdstor/stgio.hxx
@@ -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
@@ -57,21 +57,21 @@ struct StgLinkArg
 };
 
 class StgIo : public StgCache {
-    void SetupStreams();            // load all internal streams
+    void SetupStreams();			// load all internal streams
     BOOL         bCopied;
 public:
     StgIo();
    ~StgIo();
-    StgHeader    aHdr;              // storage file header
-    StgFATStrm*  pFAT;              // FAT stream
-    StgDirStrm*  pTOC;              // TOC stream
-    StgDataStrm* pDataFAT;          // small data FAT stream
-    StgDataStrm* pDataStrm;         // small data stream
-    short        GetDataPageSize(); // get the logical data page size
-    BOOL Load();                    // load a storage file
-    BOOL Init();                    // set up an empty file
-    BOOL CommitAll();               // commit everything (root commit)
-
+    StgHeader    aHdr;				// storage file header
+    StgFATStrm*  pFAT;				// FAT stream
+    StgDirStrm*  pTOC;				// TOC stream
+    StgDataStrm* pDataFAT;			// small data FAT stream
+    StgDataStrm* pDataStrm;			// small data stream
+    short	  	 GetDataPageSize();	// get the logical data page size
+    BOOL Load();					// load a storage file
+    BOOL Init();					// set up an empty file
+    BOOL CommitAll();				// commit everything (root commit)
+    
     static void SetErrorLink( const Link& );
     static const Link& GetErrorLink();
     ULONG ValidateFATs( );
diff --git a/sot/source/sdstor/stgole.cxx b/sot/source/sdstor/stgole.cxx
index 148f1e87585c..cadac1eb79c7 100644
--- a/sot/source/sdstor/stgole.cxx
+++ b/sot/source/sdstor/stgole.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
@@ -31,7 +31,7 @@
 #include "rtl/string.h"
 #include "rtl/string.h"
 #include "stgole.hxx"
-#include "storinfo.hxx"     // Read/WriteClipboardFormat()
+#include "storinfo.hxx"		// Read/WriteClipboardFormat()
 
 #include <tools/debug.hxx>
 #if defined(_MSC_VER) && (_MSC_VER>=1400)
@@ -118,7 +118,7 @@ BOOL StgCompObjStream::Load()
     aUserName.Erase();
     if( GetError() != SVSTREAM_OK )
         return FALSE;
-    Seek( 8L );     // skip the first part
+    Seek( 8L );		// skip the first part
     INT32 nMarker = 0;
     *this >> nMarker;
     if( nMarker == -1L )
@@ -132,7 +132,7 @@ BOOL StgCompObjStream::Load()
         if( Read( p, nLen1 ) == (ULONG) nLen1 )
         {
             aUserName = nLen1 ? String( p, gsl_getSystemTextEncoding() ) : String();
-/*          // Now we can read the CB format
+/*			// Now we can read the CB format
             INT32 nLen2 = 0;
             *this >> nLen2;
             if( nLen2 > 0 )
@@ -167,15 +167,15 @@ BOOL StgCompObjStream::Store()
         return FALSE;
     Seek( 0L );
     ByteString aAsciiUserName( aUserName, RTL_TEXTENCODING_ASCII_US );
-    *this << (INT16) 1          // Version?
+    *this << (INT16) 1			// Version?
               << (INT16) -2                     // 0xFFFE = Byte Order Indicator
-              << (INT32) 0x0A03         // Windows 3.10
+              << (INT32) 0x0A03			// Windows 3.10
               << (INT32) -1L
-              << aClsId             // Class ID
+              << aClsId				// Class ID
               << (INT32) (aAsciiUserName.Len() + 1)
               << (const char *)aAsciiUserName.GetBuffer()
-              << (UINT8) 0;             // string terminator
-/*  // determine the clipboard format string
+              << (UINT8) 0;				// string terminator
+/*	// determine the clipboard format string
     String aCbFmt;
     if( nCbFormat > FORMAT_GDIMETAFILE )
     aCbFmt = Exchange::GetFormatName( nCbFormat );
@@ -184,13 +184,13 @@ BOOL StgCompObjStream::Store()
                << (const char*) aCbFmt
                << (UINT8) 0;
     else if( nCbFormat )
-         *this << (INT32) -1            // for Windows
+         *this << (INT32) -1	   		// for Windows
                 << (INT32) nCbFormat;
     else
-        *this << (INT32) 0;         // no clipboard format
+        *this << (INT32) 0;			// no clipboard format
 */
     WriteClipboardFormat( *this, nCbFormat );
-    *this << (INT32) 0;             // terminator
+    *this << (INT32) 0;				// terminator
     Commit();
     return BOOL( GetError() == SVSTREAM_OK );
 }
@@ -219,11 +219,11 @@ BOOL StgOleStream::Store()
     if( GetError() != SVSTREAM_OK )
         return FALSE;
     Seek( 0L );
-    *this << (INT32) 0x02000001         // OLE version, format
-          << (INT32) nFlags             // Object flags
-          << (INT32) 0                  // Update Options
-          << (INT32) 0                  // reserved
-          << (INT32) 0;                 // Moniker 1
+    *this << (INT32) 0x02000001			// OLE version, format
+          << (INT32) nFlags				// Object flags
+          << (INT32) 0					// Update Options
+          << (INT32) 0					// reserved
+          << (INT32) 0;			   		// Moniker 1
     Commit();
     return BOOL( GetError() == SVSTREAM_OK );
 }
diff --git a/sot/source/sdstor/stgole.hxx b/sot/source/sdstor/stgole.hxx
index 346f21035f06..259cde7bccb8 100644
--- a/sot/source/sdstor/stgole.hxx
+++ b/sot/source/sdstor/stgole.hxx
@@ -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
diff --git a/sot/source/sdstor/stgstrms.cxx b/sot/source/sdstor/stgstrms.cxx
index 07711133bf4b..cc25b9e31760 100644
--- a/sot/source/sdstor/stgstrms.cxx
+++ b/sot/source/sdstor/stgstrms.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
@@ -106,7 +106,7 @@ INT32 StgFAT::FindBlock( INT32& nPgs )
     INT32 nMaxStart = STG_EOF, nMaxLen = 0x7FFFFFFFL;
     INT32 nTmpStart = STG_EOF, nTmpLen = 0;
     INT32 nPages    = rStrm.GetSize() >> 2;
-    BOOL bFound     = FALSE;
+    BOOL bFound 	= FALSE;
     StgPage* pPg = NULL;
     short nEntry = 0;
     for( INT32 i = 0; i < nPages; i++, nEntry++ )
@@ -525,7 +525,7 @@ INT32 StgFATStrm::GetPage( short nOff, BOOL bMake, USHORT *pnMasterAlloc )
     USHORT nBlocks = nOff / nMasterCount;
     // Offset in letzter Masterpage
     nOff = nOff % nMasterCount;
-
+    
     StgPage* pOldPage = 0;
     StgPage* pMaster = 0;
     INT32 nFAT = rIo.aHdr.GetFATChain();
diff --git a/sot/source/sdstor/stgstrms.hxx b/sot/source/sdstor/stgstrms.hxx
index 9b09f51db43f..a53d08ba0e99 100644
--- a/sot/source/sdstor/stgstrms.hxx
+++ b/sot/source/sdstor/stgstrms.hxx
@@ -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
@@ -42,14 +42,14 @@ class StgDirEntry;
 // storage stream, which then holds the FAT for small data allocations.
 
 class StgFAT
-{                                       // FAT allocator
-    StgStrm& rStrm;                     // underlying stream
-    INT32 nMaxPage;                     // highest page allocated so far
-    short nPageSize;                    // physical page size
-    short nEntries;                     // FAT entries per page
-    short nOffset;                      // current offset within page
-    INT32 nLimit;                       // search limit recommendation
-    BOOL  bPhys;                        // TRUE: physical FAT
+{										// FAT allocator
+    StgStrm& rStrm;						// underlying stream
+    INT32 nMaxPage;						// highest page allocated so far
+    short nPageSize;					// physical page size
+    short nEntries;						// FAT entries per page
+    short nOffset;						// current offset within page
+    INT32 nLimit;						// search limit recommendation
+    BOOL  bPhys;						// TRUE: physical FAT
     StgPage* GetPhysPage( INT32 nPage );
     BOOL  MakeChain( INT32 nStart, INT32 nPages );
     BOOL  InitNew( INT32 nPage1 );
@@ -67,33 +67,33 @@ public:
 // and accessing the data on a physical basis. It uses the built-in
 // FAT class for the page allocations.
 
-class StgStrm {                         // base class for all streams
+class StgStrm {							// base class for all streams
 protected:
-    StgIo& rIo;                         // I/O system
-    StgFAT* pFat;                       // FAT stream for allocations
-    StgDirEntry* pEntry;                // dir entry (for ownership)
-    INT32 nStart;                       // 1st data page
-    INT32 nSize;                        // stream size in bytes
-    INT32 nPos;                         // current byte position
-    INT32 nPage;                        // current logical page
-    short nOffset;                      // offset into current page
-    short nPageSize;                    // logical page size
+    StgIo& rIo;							// I/O system
+    StgFAT* pFat;						// FAT stream for allocations
+    StgDirEntry* pEntry;				// dir entry (for ownership)
+    INT32 nStart;						// 1st data page
+    INT32 nSize;						// stream size in bytes
+    INT32 nPos;							// current byte position
+    INT32 nPage;						// current logical page
+    short nOffset;						// offset into current page
+    short nPageSize;					// logical page size
     BOOL  Copy( INT32 nFrom, INT32 nBytes );
     StgStrm( StgIo& );
 public:
     virtual ~StgStrm();
-    StgIo&  GetIo()     { return rIo;    }
-    INT32   GetPos()    { return nPos;   }
-    INT32   GetStart()  { return nStart; }
-    INT32   GetSize()   { return nSize;  }
-    INT32   GetPage()   { return nPage;  }
+    StgIo&  GetIo()		{ return rIo;	 }
+    INT32   GetPos()	{ return nPos;   }
+    INT32	GetStart()	{ return nStart; }
+    INT32	GetSize()	{ return nSize;	 }
+    INT32   GetPage()	{ return nPage;  }
     short   GetPageSize() { return nPageSize; }
-    INT32   GetPages();
-    short   GetOffset() { return nOffset;}
+    INT32	GetPages();
+    short	GetOffset()	{ return nOffset;}
     void    SetEntry( StgDirEntry& );
     virtual BOOL SetSize( INT32 );
     virtual BOOL Pos2Page( INT32 nBytePos );
-    virtual INT32 Read( void*, INT32 )        { return 0; }
+    virtual INT32 Read( void*, INT32 ) 		  { return 0; }
     virtual INT32 Write( const void*, INT32 ) { return 0; }
     virtual StgPage* GetPhysPage( INT32 nBytePos, BOOL bForce = FALSE );
     virtual BOOL IsSmallStrm() { return FALSE; }
@@ -103,7 +103,7 @@ public:
 // Since this access is implemented as a StgStrm, we can use the
 // FAT allocator.
 
-class StgFATStrm : public StgStrm {     // the master FAT stream
+class StgFATStrm : public StgStrm {		// the master FAT stream
     virtual BOOL Pos2Page( INT32 nBytePos );
     BOOL  SetPage( short, INT32 );
 public:
@@ -118,9 +118,9 @@ public:
 // The stream has a size increment which normally is 1, but which can be
 // set to any value is you want the size to be incremented by certain values.
 
-class StgDataStrm : public StgStrm      // a physical data stream
+class StgDataStrm : public StgStrm		// a physical data stream
 {
-    short nIncr;                        // size adjust increment
+    short nIncr;						// size adjust increment
     void Init( INT32 nBgn, INT32 nLen );
 public:
     StgDataStrm( StgIo&, INT32 nBgn, INT32 nLen=-1 );
@@ -137,9 +137,9 @@ public:
 // is also a StgStream. The start of the FAT is in the header at DataRootPage,
 // the stream itself is pointed to by the root entry (it holds start & size).
 
-class StgSmallStrm : public StgStrm     // a logical data stream
+class StgSmallStrm : public StgStrm		// a logical data stream
 {
-    StgStrm* pData;                     // the data stream
+    StgStrm* pData;						// the data stream
     void Init( INT32 nBgn, INT32 nLen );
 public:
     StgSmallStrm( StgIo&, INT32 nBgn, INT32 nLen );
diff --git a/sot/source/sdstor/storage.cxx b/sot/source/sdstor/storage.cxx
index 136abb29a98e..b3849ee342a0 100644
--- a/sot/source/sdstor/storage.cxx
+++ b/sot/source/sdstor/storage.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
@@ -166,7 +166,7 @@ SotStorageStream::~SotStorageStream()
 |*    SotStorageStream::SyncSvStream()
 |*
 |*    Beschreibung: Der SvStream wird auf den Zustand des Standard-Streams
-|*                  gesetzt. Der Puffer des SvStreams wird weggeworfen.
+|*	  				gesetzt. Der Puffer des SvStreams wird weggeworfen.
 *************************************************************************/
 void SotStorageStream::SyncSvStream()
 {
@@ -487,12 +487,12 @@ void SotStorage::TestMemberInvariant( BOOL /*bPrint*/ )
 |*    Letzte Aenderung  MM 23.06.94
 |*
 *************************************************************************/
-#define INIT_SotStorage()                   \
+#define INIT_SotStorage()            		\
     : m_pOwnStg( NULL )                       \
     , m_pStorStm( NULL )                      \
-    , m_nError( SVSTREAM_OK )               \
-    , m_bIsRoot( FALSE )                    \
-    , m_bDelStm( FALSE )                        \
+    , m_nError( SVSTREAM_OK )         		\
+    , m_bIsRoot( FALSE )              		\
+    , m_bDelStm( FALSE )						\
     , m_nVersion( SOFFICE_FILEFORMAT_CURRENT )
 
 SotStorage::SotStorage()
diff --git a/sot/source/sdstor/storinfo.cxx b/sot/source/sdstor/storinfo.cxx
index 2aaaadd5a151..d73dd20c9263 100644
--- a/sot/source/sdstor/storinfo.cxx
+++ b/sot/source/sdstor/storinfo.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
diff --git a/sot/source/sdstor/ucbstorage.cxx b/sot/source/sdstor/ucbstorage.cxx
index ea3b656272db..6d40bbf0c030 100644
--- a/sot/source/sdstor/ucbstorage.cxx
+++ b/sot/source/sdstor/ucbstorage.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
diff --git a/sot/source/sdstor/unostorageholder.cxx b/sot/source/sdstor/unostorageholder.cxx
index 55c205557648..2c11ab0cb8de 100644
--- a/sot/source/sdstor/unostorageholder.cxx
+++ b/sot/source/sdstor/unostorageholder.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
@@ -126,7 +126,7 @@ void SAL_CALL UNOStorageHolder::commited( const lang::EventObject& /*aEvent*/ )
         throw uno::RuntimeException();
 
     m_xStorage->copyToStorage( xTempStorage );
-
+    
     uno::Reference< lang::XComponent > xComp( xTempStorage, uno::UNO_QUERY );
     if ( !xComp.is() )
         throw uno::RuntimeException();
@@ -156,7 +156,7 @@ void SAL_CALL UNOStorageHolder::commited( const lang::EventObject& /*aEvent*/ )
     uno::Any aMediaType;
     if ( rTempStorage->GetProperty( ::rtl::OUString::createFromAscii( "MediaType" ), aMediaType ) )
         m_rSotStorage->SetProperty( ::rtl::OUString::createFromAscii( "MediaType" ), aMediaType );
-
+    
     m_rSotStorage->Commit();
 }
 
@@ -185,7 +185,7 @@ void SAL_CALL UNOStorageHolder::disposing( const lang::EventObject& /*Source*/ )
 
     if ( m_rSotStorage.Is() )
         m_rSotStorage = NULL;
-
+    
     if ( m_pParentStorage )
     {
         SotStorage* pTmp = m_pParentStorage;
diff --git a/sot/source/sdstor/unostorageholder.hxx b/sot/source/sdstor/unostorageholder.hxx
index 5e70804745a8..87a56bdc653b 100644
--- a/sot/source/sdstor/unostorageholder.hxx
+++ b/sot/source/sdstor/unostorageholder.hxx
@@ -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
@@ -35,14 +35,14 @@
 #include <sot/storage.hxx>
 
 class SotStorage;
-class UNOStorageHolder : public ::cppu::WeakImplHelper1<
+class UNOStorageHolder : public ::cppu::WeakImplHelper1< 
                           ::com::sun::star::embed::XTransactionListener >
 
 {
-    SotStorage* m_pParentStorage;                   // parent storage
-    SotStorageRef m_rSotStorage;                    // original substorage
-    ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage > m_xStorage;   // duplicate storage
-    ::utl::TempFile* m_pTempFile;                   // temporary file used by duplicate storage
+    SotStorage* m_pParentStorage;					// parent storage
+    SotStorageRef m_rSotStorage;					// original substorage
+    ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage > m_xStorage;	// duplicate storage
+    ::utl::TempFile* m_pTempFile;					// temporary file used by duplicate storage
 
 public:
     UNOStorageHolder( SotStorage& aParentStorage,
diff --git a/sot/source/unoolestorage/register.cxx b/sot/source/unoolestorage/register.cxx
index 00326333546d..301a7a938486 100644
--- a/sot/source/unoolestorage/register.cxx
+++ b/sot/source/unoolestorage/register.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
@@ -48,7 +48,7 @@ SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment( const
 SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * /*pRegistryKey*/ )
 {
     void * pRet = 0;
-
+    
     ::rtl::OUString aImplName( ::rtl::OUString::createFromAscii( pImplName ) );
     uno::Reference< lang::XSingleServiceFactory > xFactory;
 
@@ -59,13 +59,13 @@ SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory( const sal_Char * pImp
                                             OLESimpleStorage::impl_staticCreateSelfInstance,
                                             OLESimpleStorage::impl_staticGetSupportedServiceNames() );
     }
-
+        
     if ( xFactory.is() )
     {
         xFactory->acquire();
         pRet = xFactory.get();
     }
-
+    
     return pRet;
 }
 
@@ -79,7 +79,7 @@ SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL component_writeInfo( void * /*pServiceMan
 
             uno::Reference< registry::XRegistryKey >  xNewKey;
 
-            xNewKey = xKey->createKey( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("/") ) +
+            xNewKey = xKey->createKey( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("/") ) + 
                                         OLESimpleStorage::impl_staticGetImplementationName() +
                                         ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "/UNO/SERVICES") )  );
 
diff --git a/sot/source/unoolestorage/xolesimplestorage.cxx b/sot/source/unoolestorage/xolesimplestorage.cxx
index 1780e45c5ed6..59b3148833a3 100644
--- a/sot/source/unoolestorage/xolesimplestorage.cxx
+++ b/sot/source/unoolestorage/xolesimplestorage.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
@@ -71,7 +71,7 @@ OLESimpleStorage::~OLESimpleStorage()
         dispose();
     } catch( uno::Exception& )
     {}
-
+    
     if ( m_pListenersContainer )
     {
         delete m_pListenersContainer;
@@ -189,7 +189,7 @@ void OLESimpleStorage::InsertNameAccessToStorage_Impl( BaseStorage* pStorage, ::
         pStorage->ResetError();
         throw io::IOException(); // TODO
     }
-
+    
     try
     {
         uno::Sequence< ::rtl::OUString > aElements = xNameAccess->getElementNames();
@@ -216,7 +216,7 @@ void OLESimpleStorage::InsertNameAccessToStorage_Impl( BaseStorage* pStorage, ::
 }
 
 //____________________________________________________________________________________________________
-//  XInitialization
+//	XInitialization
 //____________________________________________________________________________________________________
 
 void SAL_CALL OLESimpleStorage::initialize( const uno::Sequence< uno::Any >& aArguments )
@@ -242,7 +242,7 @@ void SAL_CALL OLESimpleStorage::initialize( const uno::Sequence< uno::Any >& aAr
         if ( !( aArguments[1] >>= m_bNoTemporaryCopy ) )
             throw lang::IllegalArgumentException(); // TODO:
     }
-
+    
     if ( m_bNoTemporaryCopy )
     {
         // TODO: ???
@@ -265,14 +265,14 @@ void SAL_CALL OLESimpleStorage::initialize( const uno::Sequence< uno::Any >& aAr
     }
     else
     {
-        uno::Reference < io::XStream > xTempFile(
+        uno::Reference < io::XStream > xTempFile( 
                 m_xFactory->createInstance( ::rtl::OUString::createFromAscii( "com.sun.star.io.TempFile" ) ),
                 uno::UNO_QUERY_THROW );
         uno::Reference < io::XSeekable > xTempSeek( xTempFile, uno::UNO_QUERY_THROW );
         uno::Reference< io::XOutputStream > xTempOut = xTempFile->getOutputStream();
         if ( !xTempOut.is() )
             throw uno::RuntimeException();
-
+    
         if ( xInputStream.is() )
         {
             try
@@ -294,7 +294,7 @@ void SAL_CALL OLESimpleStorage::initialize( const uno::Sequence< uno::Any >& aAr
             // not sure that the storage flashes the stream on commit
             m_xStream = xStream;
             m_xTempStream = xTempFile;
-
+        
             uno::Reference< io::XSeekable > xSeek( xStream, uno::UNO_QUERY_THROW );
             xSeek->seek( 0 );
             uno::Reference< io::XInputStream > xInpStream = xStream->getInputStream();
@@ -304,7 +304,7 @@ void SAL_CALL OLESimpleStorage::initialize( const uno::Sequence< uno::Any >& aAr
             ::comphelper::OStorageHelper::CopyInputToOutput( xInpStream, xTempOut );
             xTempOut->flush();
             xTempSeek->seek( 0 );
-
+    
             m_pStream = ::utl::UcbStreamHelper::CreateStream( xTempFile, sal_False );
         }
         else
@@ -319,7 +319,7 @@ void SAL_CALL OLESimpleStorage::initialize( const uno::Sequence< uno::Any >& aAr
 
 
 //____________________________________________________________________________________________________
-//  XNameContainer
+//	XNameContainer
 //____________________________________________________________________________________________________
 
 // --------------------------------------------------------------------------------
@@ -363,7 +363,7 @@ void SAL_CALL OLESimpleStorage::insertByName( const ::rtl::OUString& aName, cons
         throw;
     }
     catch( container::ElementExistException& )
-    {
+    {	
         throw;
     }
     catch( uno::Exception& e )
@@ -390,7 +390,7 @@ void SAL_CALL OLESimpleStorage::removeByName( const ::rtl::OUString& aName )
 
     if ( !m_bNoTemporaryCopy && !m_xStream.is() )
         throw lang::WrappedTargetException(); // io::IOException(); // TODO
-
+    
     if ( !m_pStorage->IsContained( aName ) )
         throw container::NoSuchElementException(); // TODO:
 
@@ -463,7 +463,7 @@ uno::Any SAL_CALL OLESimpleStorage::getByName( const ::rtl::OUString& aName )
     {
         BaseStorage* pStrg = m_pStorage->OpenStorage( aName );
         m_pStorage->ResetError();
-        if ( !pStrg )
+        if ( !pStrg ) 
             throw io::IOException();
 
         SvStream* pStream = ::utl::UcbStreamHelper::CreateStream( xTempFile, sal_False ); // do not close the original stream
@@ -480,7 +480,7 @@ uno::Any SAL_CALL OLESimpleStorage::getByName( const ::rtl::OUString& aName )
 
         if ( !bSuccess )
             throw uno::RuntimeException();
-
+        
         uno::Sequence< uno::Any > aArgs( 2 );
         aArgs[0] <<= xInputStream; // allow readonly access only
         aArgs[1] <<= (sal_Bool)sal_True; // do not create copy
@@ -555,7 +555,7 @@ uno::Sequence< ::rtl::OUString > SAL_CALL OLESimpleStorage::getElementNames()
 
       if ( !m_pStorage )
         throw uno::RuntimeException();
-
+    
     SvStorageInfoList aList;
     m_pStorage->FillInfoList( &aList );
 
@@ -632,7 +632,7 @@ sal_Bool SAL_CALL OLESimpleStorage::hasElements()
 }
 
 //____________________________________________________________________________________________________
-//  XComponent
+//	XComponent
 //____________________________________________________________________________________________________
 
 // --------------------------------------------------------------------------------
@@ -690,7 +690,7 @@ void SAL_CALL OLESimpleStorage::removeEventListener(
 }
 
 //____________________________________________________________________________________________________
-//  XTransactedObject
+//	XTransactedObject
 //____________________________________________________________________________________________________
 
 // --------------------------------------------------------------------------------
@@ -709,7 +709,7 @@ void SAL_CALL OLESimpleStorage::commit()
 
     if ( !m_bNoTemporaryCopy && !m_xStream.is() )
         throw io::IOException(); // TODO
-
+    
     if ( !m_pStorage->Commit() || m_pStorage->GetError() )
     {
         m_pStorage->ResetError();
@@ -735,18 +735,18 @@ void SAL_CALL OLESimpleStorage::revert()
 
     if ( !m_bNoTemporaryCopy && !m_xStream.is() )
         throw io::IOException(); // TODO
-
+    
     if ( !m_pStorage->Revert() || m_pStorage->GetError() )
     {
         m_pStorage->ResetError();
         throw io::IOException(); // TODO
     }
-
+    
     UpdateOriginal_Impl();
 }
 
 //____________________________________________________________________________________________________
-//  XClassifiedObject
+//	XClassifiedObject
 //____________________________________________________________________________________________________
 
 uno::Sequence< sal_Int8 > SAL_CALL OLESimpleStorage::getClassID()
@@ -778,7 +778,7 @@ void SAL_CALL OLESimpleStorage::setClassInfo( const uno::Sequence< sal_Int8 >& /
 }
 
 //____________________________________________________________________________________________________
-//  XServiceInfo
+//	XServiceInfo
 //____________________________________________________________________________________________________
 
 // --------------------------------------------------------------------------------
diff --git a/sot/source/unoolestorage/xolesimplestorage.hxx b/sot/source/unoolestorage/xolesimplestorage.hxx
index c9f1b5c68b0a..a614beadb4a0 100644
--- a/sot/source/unoolestorage/xolesimplestorage.hxx
+++ b/sot/source/unoolestorage/xolesimplestorage.hxx
@@ -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
@@ -46,7 +46,7 @@
 #include <stg.hxx>
 
 
-class OLESimpleStorage  : public ::cppu::WeakImplHelper3
+class OLESimpleStorage	: public ::cppu::WeakImplHelper3
     < ::com::sun::star::embed::XOLESimpleStorage
                 , ::com::sun::star::lang::XInitialization
                 , ::com::sun::star::lang::XServiceInfo >
@@ -64,7 +64,7 @@ class OLESimpleStorage  : public ::cppu::WeakImplHelper3
     ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > m_xFactory;
 
     sal_Bool m_bNoTemporaryCopy;
-
+    
     void UpdateOriginal_Impl();
 
     static void InsertInputStreamToStorage_Impl( BaseStorage* pStorage, ::rtl::OUString aName, const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& xInputStream )
@@ -87,7 +87,7 @@ public:
 
 
     //____________________________________________________________________________________________________
-    //  XInitialization
+    //	XInitialization
     //____________________________________________________________________________________________________
 
     virtual void SAL_CALL initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments )
@@ -95,7 +95,7 @@ public:
                 ::com::sun::star::uno::RuntimeException);
 
     //____________________________________________________________________________________________________
-    //  XNameContainer
+    //	XNameContainer
     //____________________________________________________________________________________________________
 
     virtual void SAL_CALL insertByName( const ::rtl::OUString& aName, const ::com::sun::star::uno::Any& aElement )
@@ -133,7 +133,7 @@ public:
         throw ( ::com::sun::star::uno::RuntimeException );
 
     //____________________________________________________________________________________________________
-    //  XComponent
+    //	XComponent
     //____________________________________________________________________________________________________
 
     virtual void SAL_CALL dispose()
@@ -148,7 +148,7 @@ public:
         throw ( ::com::sun::star::uno::RuntimeException );
 
     //____________________________________________________________________________________________________
-    //  XTransactedObject
+    //	XTransactedObject
     //____________________________________________________________________________________________________
 
     virtual void SAL_CALL commit()
@@ -162,7 +162,7 @@ public:
                 ::com::sun::star::uno::RuntimeException );
 
     //____________________________________________________________________________________________________
-    //  XClassifiedObject
+    //	XClassifiedObject
     //____________________________________________________________________________________________________
 
     virtual ::com::sun::star::uno::Sequence< ::sal_Int8 > SAL_CALL getClassID()
@@ -177,7 +177,7 @@ public:
                 ::com::sun::star::uno::RuntimeException );
 
     //____________________________________________________________________________________________________
-    //  XServiceInfo
+    //	XServiceInfo
     //____________________________________________________________________________________________________
 
     virtual ::rtl::OUString SAL_CALL getImplementationName()
diff --git a/sot/workben/testsot.cxx b/sot/workben/testsot.cxx
index 0bdc3113870f..658f5baddba2 100644
--- a/sot/workben/testsot.cxx
+++ b/sot/workben/testsot.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
diff --git a/svl/inc/PasswordHelper.hxx b/svl/inc/PasswordHelper.hxx
index da9bc5da99ea..a7b262d92179 100644
--- a/svl/inc/PasswordHelper.hxx
+++ b/svl/inc/PasswordHelper.hxx
@@ -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
@@ -36,7 +36,7 @@ class String;
 
 class SvPasswordHelper
 {
-    static void     GetHashPassword(com::sun::star::uno::Sequence <sal_Int8>& rPassHash, const sal_Char* pPass, sal_uInt32 nLen);
+    static void		GetHashPassword(com::sun::star::uno::Sequence <sal_Int8>& rPassHash, const sal_Char* pPass, sal_uInt32 nLen);
     static void     GetHashPasswordLittleEndian(com::sun::star::uno::Sequence<sal_Int8>& rPassHash, const String& sPass);
     static void     GetHashPasswordBigEndian(com::sun::star::uno::Sequence<sal_Int8>& rPassHash, const String& sPass);
 
diff --git a/svl/inc/adrparse.hxx b/svl/inc/adrparse.hxx
index f2a85b9cacd5..ab735ee241cd 100644
--- a/svl/inc/adrparse.hxx
+++ b/svl/inc/adrparse.hxx
@@ -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
diff --git a/svl/inc/broadcast.hxx b/svl/inc/broadcast.hxx
index 2acddb5e4f6b..93b0a8ff9aef 100644
--- a/svl/inc/broadcast.hxx
+++ b/svl/inc/broadcast.hxx
@@ -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
@@ -43,23 +43,23 @@ friend class SvtListenerBase;
 friend class SvtListenerIter;
     SvtListenerBase* pRoot;
 
-    const SvtBroadcaster&   operator=(const SvtBroadcaster &); // verboten
+    const SvtBroadcaster&	operator=(const SvtBroadcaster &); // verboten
 
 protected:
-    void                    Forward( SvtBroadcaster& rBC,
+    void					Forward( SvtBroadcaster& rBC,
                                      const SfxHint& rHint );
-    virtual void            ListenersGone();
+    virtual void			ListenersGone();
 
 public:
                             TYPEINFO();
 
                             SvtBroadcaster();
                             SvtBroadcaster( const SvtBroadcaster &rBC );
-    virtual                 ~SvtBroadcaster();
+    virtual 				~SvtBroadcaster();
 
-    void                    Broadcast( const SfxHint &rHint );
+    void					Broadcast( const SfxHint &rHint );
 
-    BOOL                    HasListeners() const { return 0 != pRoot; }
+    BOOL					HasListeners() const { return 0 != pRoot; }
 };
 
 
diff --git a/svl/inc/cntnrsrt.hxx b/svl/inc/cntnrsrt.hxx
index 48ebef50ea58..a17b2aa3dc66 100644
--- a/svl/inc/cntnrsrt.hxx
+++ b/svl/inc/cntnrsrt.hxx
@@ -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
@@ -30,87 +30,87 @@
 #if 0
 ***********************************************************************
 *
-*   Hier folgt die Beschreibung fuer die exportierten Makros:
+*	Hier folgt die Beschreibung fuer die exportierten Makros:
 *
-*       DECLARE_CONTAINER_SORT( ClassName, Type )
-*       IMPL_CONTAINER_SORT( ClassName, Type, SortFunc )
+*		DECLARE_CONTAINER_SORT( ClassName, Type )
+*		IMPL_CONTAINER_SORT( ClassName, Type, SortFunc )
 *
-*       Definiert eine von Container abgeleitete Klasse "ClassName",
-*       in der die Elemente des Typs "Type" sortiert enthalten sind.
-*       Dazu muss einer Funktion "SortFunc" definiert sein, die als
-*       Paramter zwei "const Type&" erwartet und 0 zurueckgibt, wenn
-*       beide gleich sind, -1 wenn der erste Paramter kleiner ist als
-*       der zweite und +1 wenn der erste Paramter groesser ist als
-*       der zweite.
+*		Definiert eine von Container abgeleitete Klasse "ClassName",
+*		in der die Elemente des Typs "Type" sortiert enthalten sind.
+*		Dazu muss einer Funktion "SortFunc" definiert sein, die als
+*		Paramter zwei "const Type&" erwartet und 0 zurueckgibt, wenn
+*		beide gleich sind, -1 wenn der erste Paramter kleiner ist als
+* 		der zweite und +1 wenn der erste Paramter groesser ist als
+*		der zweite.
 *
-*       Die Zugriffs-Methoden entsprechen in etwa denen der Container-
-*       Klasse, mit Ausnahme von Insert, DeleteAndDestroy und Seek_Entry,
-*       der den SV-Pointer-Arrays entsprechen.
+*		Die Zugriffs-Methoden entsprechen in etwa denen der Container-
+*		Klasse, mit Ausnahme von Insert, DeleteAndDestroy und Seek_Entry,
+*		der den SV-Pointer-Arrays entsprechen.
 *
-*       DECLARE_CONTAINER_SORT_DEL( ClassName, Type )
-*       IMPL_CONTAINER_SORT( ClassName, Type, SortFunc )
+*		DECLARE_CONTAINER_SORT_DEL( ClassName, Type )
+*		IMPL_CONTAINER_SORT( ClassName, Type, SortFunc )
 *
-*       Wie DECLARE_CONTAINER_SORT, nur dass beim Aufruf des Destruktors
-*       alle im Conatiner vorhandenen Objekte geloescht werden.
+*		Wie DECLARE_CONTAINER_SORT, nur dass beim Aufruf des Destruktors
+*		alle im Conatiner vorhandenen Objekte geloescht werden.
 *
 #endif
 
 #include <tools/contnr.hxx>
 
-#define DECLARE_CONTAINER_SORT_COMMON( ClassName, Type )                        \
-    ClassName( const ClassName& );                                          \
-    ClassName& operator =( const ClassName& );                              \
-public:                                                                     \
-    using Container::Count;                                                 \
+#define DECLARE_CONTAINER_SORT_COMMON( ClassName, Type )						\
+    ClassName( const ClassName& );											\
+    ClassName& operator =( const ClassName& );								\
+public:                                       								\
+    using Container::Count;                    								\
                                                                             \
-    ClassName( USHORT  InitSize, USHORT  ReSize ) :                         \
-        Container( CONTAINER_MAXBLOCKSIZE, InitSize, ReSize )   {}          \
+    ClassName( USHORT  InitSize, USHORT  ReSize ) :							\
+        Container( CONTAINER_MAXBLOCKSIZE, InitSize, ReSize )	{}			\
                                                                             \
-    BOOL Insert( Type* pObj );                                              \
+    BOOL Insert( Type* pObj );												\
                                                                                \
-    Type *Remove( ULONG nPos )                                              \
-        { return (Type *)Container::Remove( nPos ); }                       \
+    Type *Remove( ULONG nPos ) 												\
+        { return (Type *)Container::Remove( nPos ); }						\
                                                                             \
-    Type *Remove( Type* pObj );                                             \
+    Type *Remove( Type* pObj );												\
                                                                                \
-    void DeleteAndDestroy( ULONG nPos )                                     \
-    {                                                                       \
-        Type *pObj = Remove( nPos );                                        \
-        if( pObj )                                                          \
-            delete pObj;                                                    \
-    }                                                                       \
+    void DeleteAndDestroy( ULONG nPos )										\
+    {                                  										\
+        Type *pObj = Remove( nPos );   										\
+        if( pObj )                     										\
+            delete pObj;               										\
+    }                                  										\
                                                                                \
-    void DeleteAndDestroy()                                                 \
-        { while( Count() ) DeleteAndDestroy( 0 ); }                         \
+    void DeleteAndDestroy()													\
+        { while( Count() ) DeleteAndDestroy( 0 ); }							\
                                                                             \
-    Type* GetObject( ULONG nPos ) const                                     \
-        { return (Type *)Container::GetObject( nPos ); }                    \
+    Type* GetObject( ULONG nPos ) const										\
+        { return (Type *)Container::GetObject( nPos ); }					\
                                                                             \
-    Type* operator[]( ULONG nPos ) const                                    \
-        { return GetObject(nPos); }                                         \
+    Type* operator[]( ULONG nPos ) const 									\
+        { return GetObject(nPos); }											\
                                                                             \
-    BOOL Seek_Entry( const Type *pObj, ULONG* pPos ) const;                 \
+    BOOL Seek_Entry( const Type *pObj, ULONG* pPos ) const;					\
                                                                             \
-    ULONG GetPos( const Type* pObj ) const;                                 \
+    ULONG GetPos( const Type* pObj ) const;									\
 
 
-#define DECLARE_CONTAINER_SORT( ClassName, Type )                           \
-class ClassName : private Container                                         \
-{                                                                           \
-    DECLARE_CONTAINER_SORT_COMMON( ClassName, Type )                        \
-    ~ClassName() {}                                                         \
-};                                                                          \
+#define DECLARE_CONTAINER_SORT( ClassName, Type )							\
+class ClassName : private Container											\
+{																			\
+    DECLARE_CONTAINER_SORT_COMMON( ClassName, Type )						\
+    ~ClassName() {} 														\
+};																			\
 
 
-#define DECLARE_CONTAINER_SORT_DEL( ClassName, Type )                           \
-class ClassName : private Container                                         \
-{                                                                           \
-    DECLARE_CONTAINER_SORT_COMMON( ClassName, Type )                            \
-    ~ClassName() { DeleteAndDestroy(); }                                    \
-};                                                                          \
+#define DECLARE_CONTAINER_SORT_DEL( ClassName, Type )							\
+class ClassName : private Container											\
+{																			\
+    DECLARE_CONTAINER_SORT_COMMON( ClassName, Type )							\
+    ~ClassName() { DeleteAndDestroy(); }									\
+};																			\
 
 
-#define IMPL_CONTAINER_SORT( ClassName, Type, SortFunc )                    \
+#define IMPL_CONTAINER_SORT( ClassName, Type, SortFunc )					\
 BOOL ClassName::Insert( Type *pObj )                                        \
 {                                                                           \
     ULONG nPos;                                                             \
@@ -149,14 +149,14 @@ BOOL ClassName::Seek_Entry( const Type* pObj, ULONG* pPos ) const           \
         while( nU <= nO )                                                   \
         {                                                                   \
             nM = nU + ( nO - nU ) / 2;                                      \
-            int nCmp = SortFunc( *GetObject(nM), *pObj );                   \
+            int nCmp = SortFunc( *GetObject(nM), *pObj );				    \
                                                                             \
-            if( 0 == nCmp )                                                 \
+            if( 0 == nCmp )                              					\
             {                                                               \
                 if( pPos ) *pPos = nM;                                      \
                 return TRUE;                                                \
             }                                                               \
-            else if( nCmp < 0 )                                             \
+            else if( nCmp < 0 )                       						\
                 nU = nM + 1;                                                \
             else if( nM == 0 )                                              \
             {                                                               \
diff --git a/svl/inc/cntwids.hrc b/svl/inc/cntwids.hrc
index 01a965c38652..90986e3aa6c6 100644
--- a/svl/inc/cntwids.hrc
+++ b/svl/inc/cntwids.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
@@ -40,8 +40,8 @@
 #define WID_CHAOS_START 500
 
 //FUNC MSG
-#define WID_MARK_THREAD_MARKED              (499)
-#define WID_MARK_THREAD_UNMARKED            (498)
+#define WID_MARK_THREAD_MARKED				(499)
+#define WID_MARK_THREAD_UNMARKED			(498)
 
 // ARGS
 #define WID_DUMMY_ARG1                      (WID_CHAOS_START +  0)
@@ -295,7 +295,7 @@
 #define WID_TRANSFER                        (WID_CHAOS_START + 149)
 
 // PROP ALL
-#define WID_KEYWORDS                        (WID_CHAOS_START + 150)
+#define WID_KEYWORDS	                    (WID_CHAOS_START + 150)
 #define WID_IS_PROTECTED                    (WID_CHAOS_START + 151)
 
 // PROP SEARCH
@@ -412,7 +412,7 @@
 #define WID_ALL_START2                      (WID_CHAOS_START + 212)
 #define WID_REAL_NAME                       (WID_CHAOS_START + 212)
 #define WID_FLAG_UPDATE_ON_OPEN             (WID_CHAOS_START + 213)
-#define WID_ACTION_LIST                     (WID_CHAOS_START + 214)
+#define WID_ACTION_LIST	                   	(WID_CHAOS_START + 214)
 #define WID_EDIT_STRING                     (WID_CHAOS_START + 215)
 #define WID_SET_AS_DEFAULT                  (WID_CHAOS_START + 216)
 #define WID_ALL_END2                        (WID_CHAOS_START + 216)
@@ -434,7 +434,7 @@
 #define WID_FSYS_START                      (WID_CHAOS_START + 224)
 #define WID_FSYS_VALUE_FOLDER               (WID_CHAOS_START + 224)
 #define WID_FSYS_SHOW_EXTENSION             (WID_CHAOS_START + 225)
-#define WID_VALUE_ADDED_MODE                (WID_CHAOS_START + 226)
+#define WID_VALUE_ADDED_MODE          		(WID_CHAOS_START + 226)
 #define WID_FSYS_DUMMY3                     (WID_CHAOS_START + 227)
 #define WID_FSYS_DUMMY4                     (WID_CHAOS_START + 228)
 #define WID_FSYS_END                        (WID_CHAOS_START + 228)
@@ -452,11 +452,11 @@
 //////////////////////////////////////////////////////////////////////////
 
 // PROP FOLDER
-#define WID_FOLDER_START2                   (WID_CHAOS_START + 233)
+#define WID_FOLDER_START2              		(WID_CHAOS_START + 233)
 #define WID_USER_SORT_CRITERIUM             (WID_CHAOS_START + 233)
 #define WID_HEADER_CONFIG                   (WID_CHAOS_START + 234)
 #define WID_GROUPVIEW_CONFIG                (WID_CHAOS_START + 235)
-#define WID_FLD_WEBVIEW_TEMPLATE            (WID_CHAOS_START + 236)
+#define WID_FLD_WEBVIEW_TEMPLATE			(WID_CHAOS_START + 236)
 // eigene Iconpositionen fuer den Explorer, da er noch
 // keinen eigenen View-Storage hat
 #define WID_VIEW_ICON_POS_GRPWIN            (WID_CHAOS_START + 237)
@@ -467,36 +467,36 @@
 
 // PROP FOLDER (VIEW)
 #define WID_VIEW3_START                     (WID_CHAOS_START + 239)
-#define WID_FLD_FONT                        (WID_CHAOS_START + 239)
+#define WID_FLD_FONT                  	    (WID_CHAOS_START + 239)
 #define WID_FLD_WEBVIEW_USE_GLOBAL          (WID_CHAOS_START + 240)
 #define WID_VIEW3_DUMMY2                    (WID_CHAOS_START + 241)
 #define WID_VIEW3_DUMMY3                    (WID_CHAOS_START + 242)
 #define WID_VIEW3_END                       (WID_CHAOS_START + 242)
 
 // PROP FTP
-#define WID_FTP_ACCOUNT                     (WID_CHAOS_START + 243)
+#define WID_FTP_ACCOUNT						(WID_CHAOS_START + 243)
 
 // PROP FOLDER
-#define WID_STORE_MARKED                    (WID_CHAOS_START + 244)
+#define WID_STORE_MARKED					(WID_CHAOS_START + 244)
 
 // REPLICATION ( Currently only here to have file compatibility between
 //               SO51 Client and SO51 Server, for which the functionality
 //               first shall be implemented ).
-#define WID_REPLICATION_1                   (WID_CHAOS_START + 245)
-#define WID_REPLICATION_2                   (WID_CHAOS_START + 246)
-#define WID_REPLICATION_3                   (WID_CHAOS_START + 247)
-#define WID_REPLICATION_4                   (WID_CHAOS_START + 248)
-#define WID_REPLICATION_5                   (WID_CHAOS_START + 249)
+#define WID_REPLICATION_1					(WID_CHAOS_START + 245)
+#define WID_REPLICATION_2					(WID_CHAOS_START + 246)
+#define WID_REPLICATION_3					(WID_CHAOS_START + 247)
+#define WID_REPLICATION_4					(WID_CHAOS_START + 248)
+#define WID_REPLICATION_5					(WID_CHAOS_START + 249)
 
 // PROP SEARCH
-#define WID_SEARCH_INDIRECTIONS             (WID_CHAOS_START + 250)
+#define WID_SEARCH_INDIRECTIONS				(WID_CHAOS_START + 250)
 
 // PROP ALL
-#define WID_SEND_FORMATS                    (WID_CHAOS_START + 251)
-#define WID_SEND_COPY_TARGET                (WID_CHAOS_START + 252)
+#define WID_SEND_FORMATS					(WID_CHAOS_START + 251)
+#define WID_SEND_COPY_TARGET				(WID_CHAOS_START + 252)
 
 // FUNC ALL
-#define WID_TRANSFER_RESULT                 (WID_CHAOS_START + 253)
+#define WID_TRANSFER_RESULT					(WID_CHAOS_START + 253)
 
 // END
 #define WID_CHAOS_END                       (WID_CHAOS_START + 253)
diff --git a/svl/inc/converter.hxx b/svl/inc/converter.hxx
index 062feafe6f29..8833c9c15429 100644
--- a/svl/inc/converter.hxx
+++ b/svl/inc/converter.hxx
@@ -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
@@ -34,7 +34,7 @@ class SvDbaseConverter
 {
 public:
     SVL_DLLPUBLIC static INT32 ConvertPrecisionToDbase(INT32 _nLen, INT32 _nScale);
-    SVL_DLLPUBLIC static INT32 ConvertPrecisionToOdbc(INT32 _nLen, INT32 _nScale);
+    SVL_DLLPUBLIC static INT32 ConvertPrecisionToOdbc(INT32 _nLen, INT32 _nScale);	
 };
 
 #endif //_CONVERTER_HXX_
diff --git a/svl/inc/filenotation.hxx b/svl/inc/filenotation.hxx
index 65f28659e056..0d5c05bdcc97 100644
--- a/svl/inc/filenotation.hxx
+++ b/svl/inc/filenotation.hxx
@@ -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
@@ -42,8 +42,8 @@ namespace svt
     class SVL_DLLPUBLIC OFileNotation
     {
     protected:
-        ::rtl::OUString     m_sSystem;
-        ::rtl::OUString     m_sFileURL;
+        ::rtl::OUString		m_sSystem;
+        ::rtl::OUString		m_sFileURL;
 
     public:
         enum NOTATION
@@ -58,13 +58,13 @@ namespace svt
         ::rtl::OUString get(NOTATION _eOutputNotation);
 
     private:
-        SVL_DLLPRIVATE void construct( const ::rtl::OUString& _rUrlOrPath );
+        SVL_DLLPRIVATE void	construct( const ::rtl::OUString& _rUrlOrPath );
         SVL_DLLPRIVATE bool    implInitWithSystemNotation( const ::rtl::OUString& _rSystemPath );
         SVL_DLLPRIVATE bool    implInitWithURLNotation( const ::rtl::OUString& _rURL );
     };
 
 //.........................................................................
-}   // namespace svt
+}	// namespace svt
 //.........................................................................
 
 #endif // SVTOOLS_FILENOTATION_HXX
diff --git a/svl/inc/folderrestriction.hxx b/svl/inc/folderrestriction.hxx
index 66a99a4d49d1..d437b37a083f 100644
--- a/svl/inc/folderrestriction.hxx
+++ b/svl/inc/folderrestriction.hxx
@@ -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
diff --git a/svl/inc/fstathelper.hxx b/svl/inc/fstathelper.hxx
index 17fa62c5bbeb..38855b25f7e1 100644
--- a/svl/inc/fstathelper.hxx
+++ b/svl/inc/fstathelper.hxx
@@ -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
@@ -39,13 +39,13 @@ namespace FStatHelper {
 
 /** Return the modified time and date stamp for this URL.
 
-    @param URL  the asking URL
+    @param URL	the asking URL
 
     @param pDate if unequal 0, the function set the date stamp
 
     @param pTime if unequal 0, the function set the time stamp
 
-    @return     it was be able to get the date/time stamp
+    @return 	it was be able to get the date/time stamp
 */
 SVL_DLLPUBLIC sal_Bool GetModifiedDateTimeOfFile( const UniString& rURL,
                                     Date* pDate, Time* pTime );
diff --git a/svl/inc/inetdef.hxx b/svl/inc/inetdef.hxx
index 533530838700..4b1f126ca2b1 100644
--- a/svl/inc/inetdef.hxx
+++ b/svl/inc/inetdef.hxx
@@ -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
diff --git a/svl/inc/inetmsg.hxx b/svl/inc/inetmsg.hxx
index bcfc4ad714ad..9ea9b9be70ac 100644
--- a/svl/inc/inetmsg.hxx
+++ b/svl/inc/inetmsg.hxx
@@ -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
diff --git a/svl/inc/inetstrm.hxx b/svl/inc/inetstrm.hxx
index efb6c35a1b68..5d55264de83e 100644
--- a/svl/inc/inetstrm.hxx
+++ b/svl/inc/inetstrm.hxx
@@ -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
diff --git a/svl/inc/instrm.hxx b/svl/inc/instrm.hxx
index d7585c13c3b7..77d6e38676c8 100644
--- a/svl/inc/instrm.hxx
+++ b/svl/inc/instrm.hxx
@@ -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
diff --git a/svl/inc/listener.hxx b/svl/inc/listener.hxx
index 3107f5ceee56..17437ef9feea 100644
--- a/svl/inc/listener.hxx
+++ b/svl/inc/listener.hxx
@@ -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
@@ -41,23 +41,23 @@ class SVL_DLLPUBLIC SvtListener
     friend class SvtListenerBase;
     SvtListenerBase *pBrdCastLst;
 
-    const SvtListener&  operator=(const SvtListener &); // n.i., ist verboten
+    const SvtListener&	operator=(const SvtListener &); // n.i., ist verboten
 
 public:
     TYPEINFO();
 
                         SvtListener();
                         SvtListener( const SvtListener &rCopy );
-    virtual             ~SvtListener();
+    virtual 			~SvtListener();
 
-    BOOL                StartListening( SvtBroadcaster& rBroadcaster );
-    BOOL                EndListening( SvtBroadcaster& rBroadcaster );
-    void                EndListeningAll();
-    BOOL                IsListening( SvtBroadcaster& rBroadcaster ) const;
+    BOOL				StartListening( SvtBroadcaster& rBroadcaster );
+    BOOL				EndListening( SvtBroadcaster& rBroadcaster );
+    void				EndListeningAll();
+    BOOL				IsListening( SvtBroadcaster& rBroadcaster ) const;
 
-    BOOL                HasBroadcaster() const { return 0 != pBrdCastLst; }
+    BOOL 				HasBroadcaster() const { return 0 != pBrdCastLst; }
 
-    virtual void        Notify( SvtBroadcaster& rBC, const SfxHint& rHint );
+    virtual void		Notify( SvtBroadcaster& rBC, const SfxHint& rHint );
 };
 
 
diff --git a/svl/inc/listeneriter.hxx b/svl/inc/listeneriter.hxx
index 3bfb6380acaa..507d0af0d556 100644
--- a/svl/inc/listeneriter.hxx
+++ b/svl/inc/listeneriter.hxx
@@ -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
@@ -47,7 +47,7 @@ class SVL_DLLPUBLIC SvtListenerIter
     // at the same time.
     static SvtListenerIter *pListenerIters;
     SvtListenerIter *pNxtIter;
-    TypeId aSrchId;             // fuer First/Next - suche diesen Type
+    TypeId aSrchId;				// fuer First/Next - suche diesen Type
 
     SVL_DLLPRIVATE static void RemoveListener( SvtListenerBase& rDel,
                                                SvtListenerBase* pNext );
@@ -56,19 +56,19 @@ public:
     SvtListenerIter( SvtBroadcaster& );
     ~SvtListenerIter();
 
-    const SvtBroadcaster& GetBroadcaster() const    { return rRoot; }
-          SvtBroadcaster& GetBroadcaster()          { return rRoot; }
+    const SvtBroadcaster& GetBroadcaster() const	{ return rRoot; }
+          SvtBroadcaster& GetBroadcaster() 			{ return rRoot; }
 
-    SvtListener* GoNext();          // to the next
-    SvtListener* GoPrev();          // to the previous
+    SvtListener* GoNext();			// to the next
+    SvtListener* GoPrev();			// to the previous
 
-    SvtListener* GoStart();         // to the start of the list
-    SvtListener* GoEnd();           // to the end of the list
+    SvtListener* GoStart(); 		// to the start of the list
+    SvtListener* GoEnd();			// to the end of the list
 
-    SvtListener* GoRoot();          // to the root
-    SvtListener* GetCurr() const;   // returns the current
+    SvtListener* GoRoot(); 			// to the root
+    SvtListener* GetCurr() const;	// returns the current
 
-    int IsChanged() const       { return pDelNext != pAkt; }
+    int IsChanged() const 		{ return pDelNext != pAkt; }
 
     SvtListener* First( TypeId nType );
     SvtListener* Next();
diff --git a/svl/inc/lngmisc.hxx b/svl/inc/lngmisc.hxx
index d85de673c4c9..e218f282588a 100644
--- a/svl/inc/lngmisc.hxx
+++ b/svl/inc/lngmisc.hxx
@@ -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
@@ -35,8 +35,8 @@
 
 ///////////////////////////////////////////////////////////////////////////
 
-#define SVT_SOFT_HYPHEN ((sal_Unicode) 0x00AD)
-#define SVT_HARD_HYPHEN ((sal_Unicode) 0x2011)
+#define SVT_SOFT_HYPHEN	((sal_Unicode) 0x00AD)
+#define SVT_HARD_HYPHEN	((sal_Unicode) 0x2011)
 
 // the non-breaking space
 #define SVT_HARD_SPACE  ((sal_Unicode) 0x00A0)
@@ -58,13 +58,13 @@ inline BOOL IsControlChar( sal_Unicode cChar )
 
 inline BOOL HasHyphens( const rtl::OUString &rTxt )
 {
-    return  rTxt.indexOf( SVT_SOFT_HYPHEN ) != -1  ||
+    return	rTxt.indexOf( SVT_SOFT_HYPHEN ) != -1  ||
             rTxt.indexOf( SVT_HARD_HYPHEN ) != -1;
 }
 
-SVL_DLLPUBLIC INT32 GetNumControlChars( const rtl::OUString &rTxt );
-SVL_DLLPUBLIC BOOL  RemoveHyphens( rtl::OUString &rTxt );
-SVL_DLLPUBLIC BOOL  RemoveControlChars( rtl::OUString &rTxt );
+SVL_DLLPUBLIC INT32	GetNumControlChars( const rtl::OUString &rTxt );
+SVL_DLLPUBLIC BOOL	RemoveHyphens( rtl::OUString &rTxt );
+SVL_DLLPUBLIC BOOL	RemoveControlChars( rtl::OUString &rTxt );
 
 SVL_DLLPUBLIC BOOL  ReplaceControlChars( rtl::OUString &rTxt, sal_Char aRplcChar = ' ' );
 
diff --git a/svl/inc/nfsymbol.hxx b/svl/inc/nfsymbol.hxx
index 8886f0e47f85..e31c5b907447 100644
--- a/svl/inc/nfsymbol.hxx
+++ b/svl/inc/nfsymbol.hxx
@@ -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
diff --git a/svl/inc/numuno.hxx b/svl/inc/numuno.hxx
index 425cff60763d..f088df494637 100644
--- a/svl/inc/numuno.hxx
+++ b/svl/inc/numuno.hxx
@@ -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
@@ -42,7 +42,7 @@ namespace comphelper
 
 //------------------------------------------------------------------
 
-//  SvNumberFormatterServiceObj must be registered as service somewhere
+//	SvNumberFormatterServiceObj must be registered as service somewhere
 
 com::sun::star::uno::Reference<com::sun::star::uno::XInterface> SAL_CALL
     SvNumberFormatterServiceObj_NewInstance(
@@ -51,28 +51,28 @@ com::sun::star::uno::Reference<com::sun::star::uno::XInterface> SAL_CALL
 
 //------------------------------------------------------------------
 
-//  SvNumberFormatsSupplierObj: aggregate to document,
-//  construct with SvNumberFormatter
+//	SvNumberFormatsSupplierObj: aggregate to document,
+//	construct with SvNumberFormatter
 
 class SVL_DLLPUBLIC SvNumberFormatsSupplierObj : public cppu::WeakAggImplHelper2<
                                     com::sun::star::util::XNumberFormatsSupplier,
                                     com::sun::star::lang::XUnoTunnel>
 {
 private:
-    SvNumFmtSuppl_Impl* pImpl;
+    SvNumFmtSuppl_Impl*	pImpl;
 
 public:
                                 SvNumberFormatsSupplierObj();
                                 SvNumberFormatsSupplierObj(SvNumberFormatter* pForm);
-    virtual                     ~SvNumberFormatsSupplierObj();
+    virtual						~SvNumberFormatsSupplierObj();
 
-    void                        SetNumberFormatter(SvNumberFormatter* pNew);
-    SvNumberFormatter*          GetNumberFormatter() const;
+    void						SetNumberFormatter(SvNumberFormatter* pNew);
+    SvNumberFormatter*			GetNumberFormatter() const;
 
                                 // ueberladen, um Attribute im Dokument anzupassen
-    virtual void                NumberFormatDeleted(sal_uInt32 nKey);
+    virtual void				NumberFormatDeleted(sal_uInt32 nKey);
                                 // ueberladen, um evtl. neu zu formatieren
-    virtual void                SettingsChanged();
+    virtual void				SettingsChanged();
 
                                 // XNumberFormatsSupplier
     virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > SAL_CALL
@@ -83,7 +83,7 @@ public:
                                     throw(::com::sun::star::uno::RuntimeException);
 
                                 // XUnoTunnel
-    virtual sal_Int64 SAL_CALL  getSomething( const ::com::sun::star::uno::Sequence<
+    virtual sal_Int64 SAL_CALL	getSomething( const ::com::sun::star::uno::Sequence<
                                     sal_Int8 >& aIdentifier )
                                         throw(::com::sun::star::uno::RuntimeException);
 
diff --git a/svl/inc/outstrm.hxx b/svl/inc/outstrm.hxx
index f80f6f2c9616..921e3fddbfa0 100644
--- a/svl/inc/outstrm.hxx
+++ b/svl/inc/outstrm.hxx
@@ -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
diff --git a/svl/inc/pch/precompiled_svl.cxx b/svl/inc/pch/precompiled_svl.cxx
index 5e606a09f5f8..7499744e9b00 100644
--- a/svl/inc/pch/precompiled_svl.cxx
+++ b/svl/inc/pch/precompiled_svl.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
diff --git a/svl/inc/pch/precompiled_svl.hxx b/svl/inc/pch/precompiled_svl.hxx
index b2ca22672cc6..f061728856cf 100644
--- a/svl/inc/pch/precompiled_svl.hxx
+++ b/svl/inc/pch/precompiled_svl.hxx
@@ -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
@@ -352,7 +352,7 @@
 #include <cppuhelper/weakref.hxx>
 
 #include <osl/conditn.hxx>
-#include <osl/conditn.hxx>
+#include <osl/conditn.hxx> 
 #include <osl/diagnose.h>
 #include <osl/endian.h>
 #include <osl/file.h>
diff --git a/svl/inc/pickerhelper.hxx b/svl/inc/pickerhelper.hxx
index 307031b578d1..12c9912afdd9 100644
--- a/svl/inc/pickerhelper.hxx
+++ b/svl/inc/pickerhelper.hxx
@@ -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
diff --git a/svl/inc/pickerhistory.hxx b/svl/inc/pickerhistory.hxx
index af282e72513d..a210d6ec71dd 100644
--- a/svl/inc/pickerhistory.hxx
+++ b/svl/inc/pickerhistory.hxx
@@ -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
@@ -44,7 +44,7 @@ namespace svt
                 GetTopMostFilePicker( );
 
 //.........................................................................
-}   // namespace svt
+}	// namespace svt
 //.........................................................................
 
 #endif // SVTOOLS_PICKERHISTORY_HXX
diff --git a/svl/inc/pickerhistoryaccess.hxx b/svl/inc/pickerhistoryaccess.hxx
index 1a4e8ced8381..9f4bceab52b1 100644
--- a/svl/inc/pickerhistoryaccess.hxx
+++ b/svl/inc/pickerhistoryaccess.hxx
@@ -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
@@ -47,7 +47,7 @@ namespace svt
         const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _rxPicker );
 
 //.........................................................................
-}   // namespace svt
+}	// namespace svt
 //.........................................................................
 
 #endif // SVTOOLS_PICKERHISTORYACCESS_HXX
diff --git a/svl/inc/poolcach.hxx b/svl/inc/poolcach.hxx
index 949c0aee5bad..4c70b521a94c 100644
--- a/svl/inc/poolcach.hxx
+++ b/svl/inc/poolcach.hxx
@@ -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
@@ -38,10 +38,10 @@ class SfxSetItem;
 
 class SVL_DLLPUBLIC SfxItemPoolCache
 {
-    SfxItemPool             *pPool;
-    SfxItemModifyArr_Impl   *pCache;
-    const SfxItemSet        *pSetToPut;
-    const SfxPoolItem       *pItemToPut;
+    SfxItemPool 			*pPool;
+    SfxItemModifyArr_Impl	*pCache;
+    const SfxItemSet		*pSetToPut;
+    const SfxPoolItem		*pItemToPut;
 
 public:
                             SfxItemPoolCache( SfxItemPool *pPool,
@@ -50,7 +50,7 @@ public:
                                               const SfxItemSet *pPutSet );
                             ~SfxItemPoolCache();
 
-    const SfxSetItem&       ApplyTo( const SfxSetItem& rSetItem, BOOL bNew = FALSE );
+    const SfxSetItem&		ApplyTo( const SfxSetItem& rSetItem, BOOL bNew = FALSE );
 };
 
 
diff --git a/svl/inc/strmadpt.hxx b/svl/inc/strmadpt.hxx
index 76ecf0223543..f33bbed4f0f9 100644
--- a/svl/inc/strmadpt.hxx
+++ b/svl/inc/strmadpt.hxx
@@ -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
diff --git a/svl/inc/stylepool.hxx b/svl/inc/stylepool.hxx
index b820c9442229..99f72fd3ae6e 100644
--- a/svl/inc/stylepool.hxx
+++ b/svl/inc/stylepool.hxx
@@ -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
diff --git a/svl/inc/svl/aeitem.hxx b/svl/inc/svl/aeitem.hxx
index 34029c7563f4..e60ba17d6870 100644
--- a/svl/inc/svl/aeitem.hxx
+++ b/svl/inc/svl/aeitem.hxx
@@ -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
@@ -36,11 +36,11 @@ class SvUShorts;
 
 class SVL_DLLPUBLIC SfxAllEnumItem: public SfxEnumItem
 {
-    SfxAllEnumValueArr*     pValues;
-    SvUShorts*              pDisabledValues;
+    SfxAllEnumValueArr*		pValues;
+    SvUShorts*				pDisabledValues;
 
 protected:
-    USHORT                  _GetPosByValue( USHORT nValue ) const;
+    USHORT					_GetPosByValue( USHORT nValue ) const;
 
 public:
     TYPEINFO();
@@ -53,19 +53,19 @@ public:
                             ~SfxAllEnumItem();
 
     void                    InsertValue( USHORT nValue );
-    void                    InsertValue( USHORT nValue, const XubString &rText );
+    void					InsertValue( USHORT nValue, const XubString &rText );
     void                    RemoveValue( USHORT nValue );
-    void                    RemoveAllValues();
+    void					RemoveAllValues();
 
-    USHORT                  GetPosByValue( USHORT nValue ) const;
+    USHORT					GetPosByValue( USHORT nValue ) const;
 
-    virtual USHORT          GetValueCount() const;
-    virtual USHORT          GetValueByPos( USHORT nPos ) const;
-    virtual XubString       GetValueTextByPos( USHORT nPos ) const;
-    virtual SfxPoolItem*    Clone( SfxItemPool *pPool = 0 ) const;
-    virtual SfxPoolItem*    Create(SvStream &, USHORT nVersion) const;
-    virtual BOOL            IsEnabled( USHORT ) const;
-    void                    DisableValue( USHORT );
+    virtual USHORT			GetValueCount() const;
+    virtual USHORT			GetValueByPos( USHORT nPos ) const;
+    virtual XubString		GetValueTextByPos( USHORT nPos ) const;
+    virtual SfxPoolItem*	Clone( SfxItemPool *pPool = 0 ) const;
+    virtual SfxPoolItem*	Create(SvStream &, USHORT nVersion) const;
+    virtual BOOL			IsEnabled( USHORT ) const;
+    void					DisableValue( USHORT );
 };
 
 #endif
diff --git a/svl/inc/svl/asiancfg.hxx b/svl/inc/svl/asiancfg.hxx
index 4dfac8df524d..f568a9781c49 100644
--- a/svl/inc/svl/asiancfg.hxx
+++ b/svl/inc/svl/asiancfg.hxx
@@ -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
diff --git a/svl/inc/svl/brdcst.hxx b/svl/inc/svl/brdcst.hxx
index b55d78f99540..160b6bfbc13f 100644
--- a/svl/inc/svl/brdcst.hxx
+++ b/svl/inc/svl/brdcst.hxx
@@ -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
@@ -44,31 +44,31 @@ class SVL_DLLPUBLIC SfxBroadcaster
 {
 friend class SfxListener;
 
-    SfxListenerArr_Impl     aListeners;
+    SfxListenerArr_Impl 	aListeners;
 
 private:
-    BOOL         AddListener( SfxListener& rListener );
-    void                    RemoveListener( SfxListener& rListener );
-    const SfxBroadcaster&   operator=(const SfxBroadcaster &); // verboten
+    BOOL		 AddListener( SfxListener& rListener );
+    void					RemoveListener( SfxListener& rListener );
+    const SfxBroadcaster&	operator=(const SfxBroadcaster &); // verboten
 
 protected:
-    void                    Forward(SfxBroadcaster& rBC, const SfxHint& rHint);
-    virtual void            ListenersGone();
+    void					Forward(SfxBroadcaster& rBC, const SfxHint& rHint);
+    virtual void			ListenersGone();
 
 public:
                             TYPEINFO();
 
                             SfxBroadcaster();
                             SfxBroadcaster( const SfxBroadcaster &rBC );
-    virtual                 ~SfxBroadcaster();
+    virtual 				~SfxBroadcaster();
 
-    void                    Broadcast( const SfxHint &rHint );
-    void                    BroadcastDelayed( const SfxHint& rHint );
-    void                    BroadcastInIdle( const SfxHint& rHint );
+    void					Broadcast( const SfxHint &rHint );
+    void					BroadcastDelayed( const SfxHint& rHint );
+    void					BroadcastInIdle( const SfxHint& rHint );
 
-    BOOL                    HasListeners() const;
-    USHORT                  GetListenerCount() const { return aListeners.Count(); }
-    SfxListener*            GetListener( USHORT nNo ) const
+    BOOL					HasListeners() const;
+    USHORT					GetListenerCount() const { return aListeners.Count(); }
+    SfxListener*			GetListener( USHORT nNo ) const
                             { return (SfxListener*) aListeners[nNo]; }
 };
 
diff --git a/svl/inc/svl/cancel.hxx b/svl/inc/svl/cancel.hxx
index d268044a611d..119b0f3062e8 100644
--- a/svl/inc/svl/cancel.hxx
+++ b/svl/inc/svl/cancel.hxx
@@ -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
@@ -51,7 +51,7 @@ typedef SvPtrarr SfxCancellables_Impl;
 class SVL_DLLPUBLIC SfxCancelManager: public SfxBroadcaster
 , public SvWeakBase
 
-/*  [Beschreibung]
+/*	[Beschreibung]
 
     An Instanzen dieser Klasse k"onnen nebenl"aufige Prozesse angemeldet
     werden, um vom Benutzer abbrechbar zu sein. Werden abbrechbare
@@ -70,22 +70,22 @@ class SVL_DLLPUBLIC SfxCancelManager: public SfxBroadcaster
 */
 
 {
-    SfxCancelManager*       _pParent;
-    SfxCancellables_Impl    _aJobs;
+    SfxCancelManager*		_pParent;
+    SfxCancellables_Impl 	_aJobs;
 
 public:
                             SfxCancelManager( SfxCancelManager *pParent = 0 );
                             ~SfxCancelManager();
 
     BOOL                    CanCancel() const;
-    void                    Cancel( BOOL bDeep );
-    SfxCancelManager*       GetParent() const { return _pParent; }
+    void					Cancel( BOOL bDeep );
+    SfxCancelManager*		GetParent() const { return _pParent; }
 
-    void                    InsertCancellable( SfxCancellable *pJob );
-    void                    RemoveCancellable( SfxCancellable *pJob );
-    USHORT                  GetCancellableCount() const
+    void					InsertCancellable( SfxCancellable *pJob );
+    void					RemoveCancellable( SfxCancellable *pJob );
+    USHORT					GetCancellableCount() const
                             { return _aJobs.Count(); }
-    SfxCancellable*         GetCancellable( USHORT nPos ) const
+    SfxCancellable* 		GetCancellable( USHORT nPos ) const
                             { return (SfxCancellable*) _aJobs[nPos]; }
 };
 
@@ -94,7 +94,7 @@ SV_DECL_WEAK( SfxCancelManager )
 
 class SVL_DLLPUBLIC SfxCancellable
 
-/*  [Beschreibung]
+/*	[Beschreibung]
 
     Instanzen dieser Klasse werden immer an einem Cancel-Manager angemeldet,
     der dadurch dem Benutzer signalisieren kann, ob abbrechbare Prozesse
@@ -115,27 +115,27 @@ class SVL_DLLPUBLIC SfxCancellable
 */
 
 {
-    SfxCancelManager*       _pMgr;
-    BOOL                    _bCancelled;
-    String                  _aTitle;
+    SfxCancelManager*		_pMgr;
+    BOOL					_bCancelled;
+    String					_aTitle;
 
 public:
                             SfxCancellable( SfxCancelManager *pMgr,
                                             const String &rTitle )
-                            :   _pMgr( pMgr ),
+                            :	_pMgr( pMgr ),
                                 _bCancelled( FALSE ),
                                 _aTitle( rTitle )
                             { pMgr->InsertCancellable( this ); }
 
-    virtual                 ~SfxCancellable();
+    virtual 				~SfxCancellable();
 
-    void                    SetManager( SfxCancelManager *pMgr );
+    void					SetManager( SfxCancelManager *pMgr );
     SfxCancelManager*       GetManager() const { return _pMgr; }
 
-    virtual void            Cancel();
-    BOOL                    IsCancelled() const { return _bCancelled; }
-    operator                BOOL() const { return _bCancelled; }
-    const String&           GetTitle() const { return _aTitle; }
+    virtual void			Cancel();
+    BOOL					IsCancelled() const { return _bCancelled; }
+    operator 				BOOL() const { return _bCancelled; }
+    const String&			GetTitle() const { return _aTitle; }
 };
 
 #endif
diff --git a/svl/inc/svl/cenumitm.hxx b/svl/inc/svl/cenumitm.hxx
index 42c9d60373db..93be5cc401aa 100644
--- a/svl/inc/svl/cenumitm.hxx
+++ b/svl/inc/svl/cenumitm.hxx
@@ -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
@@ -54,9 +54,9 @@ public:
                                                 const IntlWrapper * = 0)
         const;
 
-    virtual BOOL QueryValue(com::sun::star::uno::Any & rVal, BYTE = 0) const;
+    virtual	BOOL QueryValue(com::sun::star::uno::Any & rVal, BYTE = 0) const;
 
-    virtual BOOL PutValue(const com::sun::star::uno::Any & rVal, BYTE = 0);
+    virtual	BOOL PutValue(const com::sun::star::uno::Any & rVal, BYTE = 0);
 
     virtual USHORT GetValueCount() const = 0;
 
@@ -154,9 +154,9 @@ public:
                                                 const IntlWrapper * = 0)
         const;
 
-    virtual BOOL QueryValue(com::sun::star::uno::Any& rVal, BYTE = 0) const;
+    virtual	BOOL QueryValue(com::sun::star::uno::Any& rVal, BYTE = 0) const;
 
-    virtual BOOL PutValue(const com::sun::star::uno::Any& rVal, BYTE = 0);
+    virtual	BOOL PutValue(const com::sun::star::uno::Any& rVal, BYTE = 0);
 
     virtual SfxPoolItem * Create(SvStream & rStream, USHORT) const;
 
diff --git a/svl/inc/svl/cintitem.hxx b/svl/inc/svl/cintitem.hxx
index 929521d57cb1..d3439864ced1 100644
--- a/svl/inc/svl/cintitem.hxx
+++ b/svl/inc/svl/cintitem.hxx
@@ -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
@@ -64,10 +64,10 @@ public:
                                                 const IntlWrapper * = 0)
         const;
 
-    virtual BOOL QueryValue(com::sun::star::uno::Any& rVal,
+    virtual	BOOL QueryValue(com::sun::star::uno::Any& rVal,
                             BYTE nMemberId = 0) const;
 
-    virtual BOOL PutValue(const com::sun::star::uno::Any& rVal,
+    virtual	BOOL PutValue(const com::sun::star::uno::Any& rVal,
                           BYTE nMemberId = 0);
 
     virtual SfxPoolItem * Create(SvStream & rStream, USHORT) const;
@@ -126,10 +126,10 @@ public:
                                                 const IntlWrapper * = 0)
         const;
 
-    virtual BOOL QueryValue(com::sun::star::uno::Any& rVal,
+    virtual	BOOL QueryValue(com::sun::star::uno::Any& rVal,
                             BYTE nMemberId = 0) const;
 
-    virtual BOOL PutValue(const com::sun::star::uno::Any& rVal,
+    virtual	BOOL PutValue(const com::sun::star::uno::Any& rVal,
                           BYTE nMemberId = 0);
 
     virtual SfxPoolItem * Create(SvStream & rStream, USHORT) const;
@@ -188,10 +188,10 @@ public:
                                                 const IntlWrapper * = 0)
         const;
 
-    virtual BOOL QueryValue(com::sun::star::uno::Any& rVal,
+    virtual	BOOL QueryValue(com::sun::star::uno::Any& rVal,
                             BYTE nMemberId = 0) const;
 
-    virtual BOOL PutValue(const com::sun::star::uno::Any& rVal,
+    virtual	BOOL PutValue(const com::sun::star::uno::Any& rVal,
                           BYTE nMemberId = 0);
 
     virtual SfxPoolItem * Create(SvStream & rStream, USHORT) const;
@@ -250,10 +250,10 @@ public:
                                                 const IntlWrapper * = 0)
         const;
 
-    virtual BOOL QueryValue(com::sun::star::uno::Any& rVal,
+    virtual	BOOL QueryValue(com::sun::star::uno::Any& rVal,
                             BYTE nMemberId = 0) const;
 
-    virtual BOOL PutValue(const com::sun::star::uno::Any& rVal,
+    virtual	BOOL PutValue(const com::sun::star::uno::Any& rVal,
                           BYTE nMemberId = 0);
 
     virtual SfxPoolItem * Create(SvStream & rStream, USHORT) const;
diff --git a/svl/inc/svl/cjkoptions.hxx b/svl/inc/svl/cjkoptions.hxx
index 07310c22994a..b395fa6253d0 100644
--- a/svl/inc/svl/cjkoptions.hxx
+++ b/svl/inc/svl/cjkoptions.hxx
@@ -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
diff --git a/svl/inc/svl/cnclhint.hxx b/svl/inc/svl/cnclhint.hxx
index 17a6627f31b6..63d58b65405b 100644
--- a/svl/inc/svl/cnclhint.hxx
+++ b/svl/inc/svl/cnclhint.hxx
@@ -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
@@ -31,13 +31,13 @@
 #include <svl/cancel.hxx>
 #include <tools/rtti.hxx>
 
-#define SFXCANCELHINT_REMOVED       1
+#define SFXCANCELHINT_REMOVED		1
 
 class SfxCancelHint: public SfxHint
 {
 private:
     SfxCancellable* pCancellable;
-    USHORT          nAction;
+    USHORT			nAction;
 public:
     TYPEINFO();
     SfxCancelHint( SfxCancellable*, USHORT nAction );
diff --git a/svl/inc/svl/cntwall.hxx b/svl/inc/svl/cntwall.hxx
index a7f3dd0111a6..b81fa57626a8 100644
--- a/svl/inc/svl/cntwall.hxx
+++ b/svl/inc/svl/cntwall.hxx
@@ -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
@@ -41,9 +41,9 @@ class SvStream;
 class SVL_DLLPUBLIC CntWallpaperItem : public SfxPoolItem
 {
 private:
-    UniString               _aURL;
-    Color                   _nColor;
-    USHORT                  _nStyle;
+    UniString				_aURL;
+    Color					_nColor;
+    USHORT					_nStyle;
 
 public:
                             TYPEINFO();
@@ -55,23 +55,23 @@ public:
 
     virtual USHORT GetVersion(USHORT) const;
 
-    virtual int             operator==( const SfxPoolItem& ) const;
-    virtual SfxPoolItem*    Create( SvStream&, USHORT nItemVersion ) const;
-    virtual SvStream&       Store( SvStream&, USHORT nItemVersion ) const;
-    virtual SfxPoolItem*    Clone( SfxItemPool* pPool = 0 ) const;
+    virtual	int				operator==( const SfxPoolItem& ) const;
+    virtual SfxPoolItem*	Create( SvStream&, USHORT nItemVersion ) const;
+    virtual SvStream&		Store( SvStream&, USHORT nItemVersion ) const;
+    virtual SfxPoolItem*	Clone( SfxItemPool* pPool = 0 ) const;
 
-    virtual BOOL            QueryValue( com::sun::star::uno::Any& rVal,
+    virtual	BOOL 			QueryValue( com::sun::star::uno::Any& rVal,
                                          BYTE nMemberId = 0 ) const;
-    virtual BOOL            PutValue  ( const com::sun::star::uno::Any& rVal,
+    virtual	BOOL 			PutValue  ( const com::sun::star::uno::Any& rVal,
                                          BYTE nMemberId = 0 );
 
-    void                    SetBitmapURL( const UniString& rURL ) { _aURL = rURL; }
-    void                    SetColor( Color nColor ) { _nColor = nColor; }
-    void                    SetStyle( USHORT nStyle ) { _nStyle = nStyle; }
+    void					SetBitmapURL( const UniString& rURL ) { _aURL = rURL; }
+    void					SetColor( Color nColor ) { _nColor = nColor; }
+    void					SetStyle( USHORT nStyle ) { _nStyle = nStyle; }
 
-    const UniString&        GetBitmapURL() const { return _aURL; }
-    Color                   GetColor() const { return _nColor; }
-    USHORT                  GetStyle() const { return _nStyle; }
+    const UniString&		GetBitmapURL() const { return _aURL; }
+    Color					GetColor() const { return _nColor; }
+    USHORT					GetStyle() const { return _nStyle; }
 };
 
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/svl/inc/svl/ctloptions.hxx b/svl/inc/svl/ctloptions.hxx
index 1f597a293983..8c051dafc114 100644
--- a/svl/inc/svl/ctloptions.hxx
+++ b/svl/inc/svl/ctloptions.hxx
@@ -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
@@ -49,13 +49,13 @@ public:
     virtual ~SvtCTLOptions();
 
     void            SetCTLFontEnabled( sal_Bool _bEnabled );
-    sal_Bool        IsCTLFontEnabled() const;
+    sal_Bool		IsCTLFontEnabled() const;
 
-    void            SetCTLSequenceChecking( sal_Bool _bEnabled );
-    sal_Bool        IsCTLSequenceChecking() const;
+    void			SetCTLSequenceChecking( sal_Bool _bEnabled );
+    sal_Bool		IsCTLSequenceChecking() const;
 
-    void            SetCTLSequenceCheckingRestricted( sal_Bool _bEnable );
-    sal_Bool        IsCTLSequenceCheckingRestricted( void ) const;
+    void			SetCTLSequenceCheckingRestricted( sal_Bool _bEnable );
+    sal_Bool		IsCTLSequenceCheckingRestricted( void ) const;
 
     void            SetCTLSequenceCheckingTypeAndReplace( sal_Bool _bEnable );
     sal_Bool        IsCTLSequenceCheckingTypeAndReplace() const;
@@ -65,8 +65,8 @@ public:
         MOVEMENT_LOGICAL = 0,
         MOVEMENT_VISUAL
     };
-    void            SetCTLCursorMovement( CursorMovement _eMovement );
-    CursorMovement  GetCTLCursorMovement() const;
+    void        	SetCTLCursorMovement( CursorMovement _eMovement );
+    CursorMovement	GetCTLCursorMovement() const;
 
     enum TextNumerals
     {
@@ -75,8 +75,8 @@ public:
         NUMERALS_SYSTEM,
         NUMERALS_CONTEXT
     };
-    void            SetCTLTextNumerals( TextNumerals _eNumerals );
-    TextNumerals    GetCTLTextNumerals() const;
+    void        	SetCTLTextNumerals( TextNumerals _eNumerals );
+    TextNumerals	GetCTLTextNumerals() const;
 
     enum EOption
     {
diff --git a/svl/inc/svl/ctypeitm.hxx b/svl/inc/svl/ctypeitm.hxx
index e83d37b8925e..25323956b155 100644
--- a/svl/inc/svl/ctypeitm.hxx
+++ b/svl/inc/svl/ctypeitm.hxx
@@ -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
@@ -36,14 +36,14 @@ class CntContentTypeItem : public CntUnencodedStringItem
 {
 private:
     INetContentType _eType;
-    XubString       _aPresentation;
+    XubString		_aPresentation;
 
 public:
     TYPEINFO();
 
     CntContentTypeItem();
-    CntContentTypeItem( USHORT nWhich, const XubString& rType );
-    CntContentTypeItem( USHORT nWhich, const INetContentType eType );
+    CntContentTypeItem(	USHORT nWhich, const XubString& rType );
+    CntContentTypeItem(	USHORT nWhich, const INetContentType eType );
     CntContentTypeItem( const CntContentTypeItem& rOrig );
 
     virtual SfxPoolItem* Create( SvStream& rStream,
@@ -68,14 +68,14 @@ public:
                                                  XubString &rText,
                                                  const IntlWrapper* pIntlWrapper = 0 ) const;
 
-    virtual BOOL QueryValue( com::sun::star::uno::Any& rVal,
+    virtual	BOOL QueryValue( com::sun::star::uno::Any& rVal,
                              BYTE nMemberId = 0 ) const;
-    virtual BOOL PutValue  ( const com::sun::star::uno::Any& rVal,
+    virtual	BOOL PutValue  ( const com::sun::star::uno::Any& rVal,
                              BYTE nMemberId = 0);
 
     INetContentType GetEnumValue() const;
 
-    void                  SetValue( const INetContentType eType );
+    void  			  	  SetValue( const INetContentType eType );
 };
 
 #endif /* !_SVTOOLS_CTYPEITM_HXX */
diff --git a/svl/inc/svl/custritm.hxx b/svl/inc/svl/custritm.hxx
index a24135e392c2..85d5bbc4ac36 100644
--- a/svl/inc/svl/custritm.hxx
+++ b/svl/inc/svl/custritm.hxx
@@ -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
@@ -68,10 +68,10 @@ public:
                                                 const IntlWrapper * = 0)
         const;
 
-    virtual BOOL QueryValue(com::sun::star::uno::Any& rVal,
+    virtual	BOOL QueryValue(com::sun::star::uno::Any& rVal,
                             BYTE nMemberId = 0) const;
 
-    virtual BOOL PutValue(const com::sun::star::uno::Any& rVal,
+    virtual	BOOL PutValue(const com::sun::star::uno::Any& rVal,
                           BYTE nMemberId = 0);
 
     virtual SfxPoolItem * Clone(SfxItemPool * = 0) const;
diff --git a/svl/inc/svl/dateitem.hxx b/svl/inc/svl/dateitem.hxx
index 3ae5506d809a..8efd044f5a99 100644
--- a/svl/inc/svl/dateitem.hxx
+++ b/svl/inc/svl/dateitem.hxx
@@ -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
@@ -41,7 +41,7 @@ DBG_NAMEEX(SfxDateTimeItem)
 class SfxDateTimeItem : public SfxPoolItem
 {
 private:
-    DateTime                aDateTime;
+    DateTime				aDateTime;
 
 public:
                             TYPEINFO();
@@ -54,12 +54,12 @@ public:
                             ~SfxDateTimeItem() {
                                 DBG_DTOR(SfxDateTimeItem, 0); }
 
-    virtual int             operator==( const SfxPoolItem& ) const;
+    virtual	int				operator==( const SfxPoolItem& ) const;
     using SfxPoolItem::Compare;
-    virtual int             Compare( const SfxPoolItem &rWith ) const;
-    virtual SfxPoolItem*    Create( SvStream&, USHORT nItemVersion ) const;
-    virtual SvStream&       Store( SvStream&, USHORT nItemVersion ) const;
-    virtual SfxPoolItem*    Clone( SfxItemPool* pPool = 0 ) const;
+    virtual int				Compare( const SfxPoolItem &rWith ) const;
+    virtual SfxPoolItem*	Create( SvStream&, USHORT nItemVersion ) const;
+    virtual SvStream&		Store( SvStream&, USHORT nItemVersion ) const;
+    virtual SfxPoolItem*	Clone( SfxItemPool* pPool = 0 ) const;
 
     virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
                                     SfxMapUnit eCoreMetric,
@@ -68,15 +68,15 @@ public:
                                     const IntlWrapper * pIntlWrapper = 0 )
         const;
 
-    const DateTime&         GetDateTime() const { return aDateTime; }
-    void                    SetDateTime( const DateTime& rDT ) {
+    const DateTime&			GetDateTime() const { return aDateTime; }
+    void					SetDateTime( const DateTime& rDT ) {
                                 DBG_ASSERT( GetRefCount() == 0,
                                             "SetDateTime() with pooled item" );
                                 aDateTime = rDT; }
 
-    virtual BOOL PutValue  ( const com::sun::star::uno::Any& rVal,
+    virtual	BOOL PutValue  ( const com::sun::star::uno::Any& rVal,
                              BYTE nMemberId = 0 );
-    virtual BOOL QueryValue( com::sun::star::uno::Any& rVal,
+    virtual	BOOL QueryValue( com::sun::star::uno::Any& rVal,
                              BYTE nMemberId = 0 ) const;
 };
 
@@ -92,7 +92,7 @@ public:
 
                             ~SfxColumnDateTimeItem() {}
 
-    virtual SfxPoolItem*    Clone( SfxItemPool* pPool = 0 ) const;
+    virtual SfxPoolItem*	Clone( SfxItemPool* pPool = 0 ) const;
 
     virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
                                     SfxMapUnit eCoreMetric,
diff --git a/svl/inc/svl/documentlockfile.hxx b/svl/inc/svl/documentlockfile.hxx
index 071a43861bf8..d1e36df2c228 100644
--- a/svl/inc/svl/documentlockfile.hxx
+++ b/svl/inc/svl/documentlockfile.hxx
@@ -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
diff --git a/svl/inc/svl/eitem.hxx b/svl/inc/svl/eitem.hxx
index bc65db9c31dc..8c9cfe4c0c4c 100644
--- a/svl/inc/svl/eitem.hxx
+++ b/svl/inc/svl/eitem.hxx
@@ -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
diff --git a/svl/inc/svl/filerec.hxx b/svl/inc/svl/filerec.hxx
index d0cc27b94b96..89b3bf02340c 100644
--- a/svl/inc/svl/filerec.hxx
+++ b/svl/inc/svl/filerec.hxx
@@ -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
@@ -39,29 +39,29 @@ SV_DECL_VARARR( SfxUINT32s, UINT32, 8, 8 )
 
 //------------------------------------------------------------------------
 
-#define SFX_BOOL_DONTCARE               BOOL(2)     // Don't-Care-Wert f"ur BOOLs
+#define SFX_BOOL_DONTCARE				BOOL(2) 	// Don't-Care-Wert f"ur BOOLs
 
-#define SFX_REC_PRETAG_EXT              BYTE(0x00)  // Pre-Tag f"ur Extended-Records
-#define SFX_REC_PRETAG_EOR              BYTE(0xFF)  // Pre-Tag f"ur End-Of-Records
+#define SFX_REC_PRETAG_EXT				BYTE(0x00)	// Pre-Tag f"ur Extended-Records
+#define SFX_REC_PRETAG_EOR				BYTE(0xFF)	// Pre-Tag f"ur End-Of-Records
 
-#define SFX_REC_TYPE_NONE               BYTE(0x00)  // unbekannter Record-Typ
-#define SFX_REC_TYPE_FIRST              BYTE(0x01)
-#define SFX_REC_TYPE_SINGLE             BYTE(0x01)  // Single-Content-Record
-#define SFX_REC_TYPE_FIXSIZE            BYTE(0x02)  // Fix-Size-Multi-Content-Record
-#define SFX_REC_TYPE_VARSIZE_RELOC      BYTE(0x03)  // variable Rec-Size
-#define SFX_REC_TYPE_VARSIZE            BYTE(0x04)  // alt (nicht verschiebbar)
-#define SFX_REC_TYPE_MIXTAGS_RELOC      BYTE(0x07)  // Mixed Tag Content-Record
-#define SFX_REC_TYPE_MIXTAGS            BYTE(0x08)  // alt (nicht verschiebbar)
-#define SFX_REC_TYPE_LAST               BYTE(0x08)
-#define SFX_REC_TYPE_MINI                   0x100   // Mini-Record
-#define SFX_REC_TYPE_DRAWENG                0x400   // Drawing-Engine-Record
-#define SFX_REC_TYPE_EOR                    0xF00   // End-Of-Records
+#define SFX_REC_TYPE_NONE				BYTE(0x00)	// unbekannter Record-Typ
+#define SFX_REC_TYPE_FIRST				BYTE(0x01)
+#define SFX_REC_TYPE_SINGLE 			BYTE(0x01)	// Single-Content-Record
+#define SFX_REC_TYPE_FIXSIZE			BYTE(0x02)	// Fix-Size-Multi-Content-Record
+#define SFX_REC_TYPE_VARSIZE_RELOC      BYTE(0x03)	// variable Rec-Size
+#define SFX_REC_TYPE_VARSIZE            BYTE(0x04)	// alt (nicht verschiebbar)
+#define SFX_REC_TYPE_MIXTAGS_RELOC  	BYTE(0x07)	// Mixed Tag Content-Record
+#define SFX_REC_TYPE_MIXTAGS			BYTE(0x08)	// alt (nicht verschiebbar)
+#define SFX_REC_TYPE_LAST				BYTE(0x08)
+#define SFX_REC_TYPE_MINI					0x100	// Mini-Record
+#define SFX_REC_TYPE_DRAWENG				0x400	// Drawing-Engine-Record
+#define SFX_REC_TYPE_EOR					0xF00	// End-Of-Records
 
 //------------------------------------------------------------------------
 
-#define SFX_REC_HEADERSIZE_MINI     4   // Gr"o\se des Mini-Record-Headers
-#define SFX_REC_HEADERSIZE_SINGLE   4   // zzgl. HEADERSIZE_MINI => 8
-#define SFX_REC_HEADERSIZE_MULTI    6   // zzgl. HEADERSIZE_SINGLE => 14
+#define SFX_REC_HEADERSIZE_MINI 	4	// Gr"o\se des Mini-Record-Headers
+#define SFX_REC_HEADERSIZE_SINGLE	4	// zzgl. HEADERSIZE_MINI => 8
+#define SFX_REC_HEADERSIZE_MULTI	6	// zzgl. HEADERSIZE_SINGLE => 14
 
 //------------------------------------------------------------------------
 
@@ -75,7 +75,7 @@ SV_DECL_VARARR( SfxUINT32s, UINT32, 8, 8 )
 
 //------------------------------------------------------------------------
 
-/*  [Fileformat]
+/*	[Fileformat]
 
     Jeder Record beginnt mit einem Byte, dem sogenannten 'Pre-Tag'.
 
@@ -83,14 +83,14 @@ SV_DECL_VARARR( SfxUINT32s, UINT32, 8, 8 )
     Record, dessen Typ durch ein weiteres Byte an Position 5 n�her
     beschrieben wird:
 
-    0x01:       SfxSingleRecord
-    0x02:       SfxMultiFixRecord
-    0x03+0x04:  SfxMultiVarRecord
-    0x07+0x08:  SfxMultiMixRecord
+    0x01:		SfxSingleRecord
+    0x02:		SfxMultiFixRecord
+    0x03+0x04:	SfxMultiVarRecord
+    0x07+0x08:	SfxMultiMixRecord
     (Alle weiteren Record-Typ-Kennungen sind reserviert.)
 
     I.d.R. werden File-Formate schon aus Performance-Gr"unden so aufgebaut,
-    da\s beim Lesen jeweils vorher schon feststeht, welcher Record-Typ
+    da\s beim Lesen	jeweils vorher schon feststeht, welcher Record-Typ
     vorliegt. Diese Kennung dient daher hautps"achlich der "Uberpr"ufung
     und File-Viewern, die das genaue File-Format (unterhalb der Records)
     nicht kennen.
@@ -124,9 +124,9 @@ SV_DECL_VARARR( SfxUINT32s, UINT32, 8, 8 )
 
         Struktur des Mini-Records:
 
-                            1 BYTE          Pre-Tag
-                            3 BYTE          OffsetToEndOfRec
-        OffsetToEndOfRec*   1 BYTE          Content
+                            1 BYTE			Pre-Tag
+                            3 BYTE			OffsetToEndOfRec
+        OffsetToEndOfRec*	1 BYTE			Content
 
     Bei den Extended-Reords folgt auf diesen 4-Byte-Header ein erweiterter
     Header, der zun"achst den o.g. Record-Typ, dann eine Versions-Kennung
@@ -134,13 +134,13 @@ SV_DECL_VARARR( SfxUINT32s, UINT32, 8, 8 )
 
         Struktur des Extended-Records:
 
-                            1 BYTE          Pre-Tag (==0x00)
-                            3 BYTE          OffsetToEndOfRec
-        OffsetToEndOfRec*   1 BYTE          Content
-                            1 BYTE          Record-Type
-                            1 BYTE          Version
-                            2 BYTE          Tag
-        ContentSize*        1 BYTE          Content
+                            1 BYTE			Pre-Tag (==0x00)
+                            3 BYTE			OffsetToEndOfRec
+        OffsetToEndOfRec*	1 BYTE			Content
+                            1 BYTE			Record-Type
+                            1 BYTE			Version
+                            2 BYTE			Tag
+        ContentSize*		1 BYTE			Content
 
         (ContentSize = OffsetToEndOfRec - 8)
 
@@ -151,24 +151,24 @@ SV_DECL_VARARR( SfxUINT32s, UINT32, 8, 8 )
     Der SW-Record-Typ war zuerst vorhanden, mu\ste also 1:1 "ubernommen
     werden. Zum Gl"uck wurden einige Record-Tags nicht verwendet, (Z.B.
     0x00 und 0xFF).
-    =>  1. Byte 0x00 kann als Kennung f"ur erweiterten Record verwendet werden
-    =>  1. Byte 0xFF kann f"ur besondere Zwecke verwendet werden
+    => 	1. Byte 0x00 kann als Kennung f"ur erweiterten Record verwendet werden
+    => 	1. Byte 0xFF kann f"ur besondere Zwecke verwendet werden
 
-    Egal welcher Record-Typ vorliegt, sollte eine Erkennung des Typs, ein
+    Egal welcher Record-Typ	vorliegt, sollte eine Erkennung des Typs, ein
     Auslesen des Headers und ein "uberpspringen des Records m"oglich sein,
     ohne zu"uck-seeken zu m"ussen und ohne "uberfl"ussige Daten lesen zu
     m"ussen.
-    =>  die Bytes 2-4 werden bei allen Records als Offset zum Ende des
+    => 	die Bytes 2-4 werden bei allen Records als Offset zum Ende des
         Records interpretiert, so da\s die Gesamt-Recors-Size sich wie
         folgt berechnet: sizeof(UINT32) + OffsetToEndOfRec
 
     Die Records sollten einfach zu parsen un einheitlich aufgebaut sein.
-    =>  Sie bauen aufeinander auf, so ist z.B. der SfxMiniRecord in jedem
+    => 	Sie bauen aufeinander auf, so ist z.B. der SfxMiniRecord in jedem
         anderen enthalten.
 
     Die Records sollten auch von denen der Drawing Enginge unterscheidbar
     sein. Diese beginnen mit 'DRMD' und 'DRVW'.
-    =>  Mini-Records mit dem Pre-Tag 'D' d"urfen maximal 4MB gro\s sein,
+    =>	Mini-Records mit dem Pre-Tag 'D' d"urfen maximal 4MB gro\s sein,
         um nicht in diesen Kennungs-Bereich zu reichen.
 
     [Erweiterungen]
@@ -188,7 +188,7 @@ SV_DECL_VARARR( SfxUINT32s, UINT32, 8, 8 )
 
 class SVL_DLLPUBLIC SfxMiniRecordWriter
 
-/*  [Beschreibung]
+/*	[Beschreibung]
 
     Mit Instanzen dieser Klasse kann ein einfacher Record in einen Stream
     geschrieben werden, der sich durch ein BYTE-Tag identifiziert, sowie
@@ -206,9 +206,9 @@ class SVL_DLLPUBLIC SfxMiniRecordWriter
 
     [Fileformat]
 
-    1*              BYTE        Content-Tag (!= 0)
-    1*              3-BYTE      OffsetToEndOfRec in Bytes
-    SizeOfContent*  BYTE        Content
+    1*				BYTE  		Content-Tag (!= 0)
+    1*				3-BYTE		OffsetToEndOfRec in Bytes
+    SizeOfContent*	BYTE		Content
 
     [Beispiel]
 
@@ -221,27 +221,27 @@ class SVL_DLLPUBLIC SfxMiniRecordWriter
 
 {
 protected:
-    SvStream*       _pStream;   //  <SvStream>, in dem der Record liegt
-    UINT32          _nStartPos; //  Start-Position des Gesamt-Records im Stream
-    FASTBOOL        _bHeaderOk; /*  TRUE, wenn der Header schon geschrieben ist;
+    SvStream*		_pStream;	//	<SvStream>, in dem der Record liegt
+    UINT32			_nStartPos; //	Start-Position des Gesamt-Records im Stream
+    FASTBOOL		_bHeaderOk; /*	TRUE, wenn der Header schon geschrieben ist;
                                     bei DBG_UTIL wird SFX_BOOL_DONTCARE ver-
                                     wendet, um die Gr"o\se von Fix-Sized-Records
                                     zu pr"ufen. */
-    BYTE            _nPreTag;   //  in den Header zu schreibendes 'Pre-Tag'
+    BYTE			_nPreTag;	//	in den Header zu schreibendes 'Pre-Tag'
 
 public:
-    inline          SfxMiniRecordWriter( SvStream *pStream,
+    inline			SfxMiniRecordWriter( SvStream *pStream,
                                          BYTE nTag );
-    inline          SfxMiniRecordWriter( SvStream *pStream, BYTE nTag,
+    inline			SfxMiniRecordWriter( SvStream *pStream, BYTE nTag,
                                          UINT32 nSize );
 
-    inline          ~SfxMiniRecordWriter();
+    inline			~SfxMiniRecordWriter();
 
     inline SvStream& operator*() const;
 
-    inline void     Reset();
+    inline void		Reset();
 
-    UINT32          Close( FASTBOOL bSeekToEndOfRec = TRUE );
+    UINT32			Close( FASTBOOL bSeekToEndOfRec = TRUE );
 
 private:
                     // not implementend, not allowed
@@ -253,7 +253,7 @@ private:
 
 class SVL_DLLPUBLIC SfxMiniRecordReader
 
-/*  [Beschreibung]
+/*	[Beschreibung]
 
     Mit Instanzen dieser Klasse kann ein einfacher Record aus einem Stream
     gelesen werden, der mit der Klasse <SfxRecordWriter> geschrieben wurde.
@@ -279,41 +279,41 @@ class SVL_DLLPUBLIC SfxMiniRecordReader
 
 {
 protected:
-    SvStream*           _pStream;   //  <SvStream>, aus dem gelesen wird
-    UINT32              _nEofRec;   //  Position direkt hinter dem Record
-    FASTBOOL            _bSkipped;  //  TRUE: der Record wurde explizit geskippt
-    BYTE                _nPreTag;   //  aus dem Header gelesenes Pre-Tag
+    SvStream*			_pStream;	//	<SvStream>, aus dem gelesen wird
+    UINT32				_nEofRec;	//	Position direkt hinter dem Record
+    FASTBOOL			_bSkipped;	//	TRUE: der Record wurde explizit geskippt
+    BYTE				_nPreTag;	//	aus dem Header gelesenes Pre-Tag
 
                         // Drei-Phasen-Ctor f"ur Subklassen
                         SfxMiniRecordReader() {}
-   void                 Construct_Impl( SvStream *pStream, BYTE nTag )
+   void 				Construct_Impl( SvStream *pStream, BYTE nTag )
                         {
                             _pStream = pStream;
                             _bSkipped = FALSE;
                             _nPreTag = nTag;
                         }
-    inline FASTBOOL     SetHeader_Impl( UINT32 nHeader );
+    inline FASTBOOL 	SetHeader_Impl( UINT32 nHeader );
 
                         // als ung"ultig markieren und zur"uck-seeken
-    void                SetInvalid_Impl( UINT32 nRecordStartPos )
+    void				SetInvalid_Impl( UINT32 nRecordStartPos )
                         {
                             _nPreTag = SFX_REC_PRETAG_EOR;
                             _pStream->Seek( nRecordStartPos );
                         }
 
 public:
-    static USHORT       ScanRecordType( SvStream *pStream );
+    static USHORT   	ScanRecordType( SvStream *pStream );
 
                         SfxMiniRecordReader( SvStream *pStream );
                         SfxMiniRecordReader( SvStream *pStream, BYTE nTag );
-    inline              ~SfxMiniRecordReader();
+    inline				~SfxMiniRecordReader();
 
-    inline BYTE         GetTag() const;
-    inline FASTBOOL     IsValid() const;
+    inline BYTE 		GetTag() const;
+    inline FASTBOOL 	IsValid() const;
 
-    inline SvStream&    operator*() const;
+    inline SvStream&	operator*() const;
 
-    inline void         Skip();
+    inline void 		Skip();
 
 private:
                         // not implementend, not allowed
@@ -325,7 +325,7 @@ private:
 
 class SVL_DLLPUBLIC SfxSingleRecordWriter: public SfxMiniRecordWriter
 
-/*  [Beschreibung]
+/*	[Beschreibung]
 
     Mit Instanzen dieser Klasse kann ein Record in einen Stream geschrieben
     werden, dessen einziger Inhalt sich durch ein UINT16-Tag und eine
@@ -343,12 +343,12 @@ class SVL_DLLPUBLIC SfxSingleRecordWriter: public SfxMiniRecordWriter
 
     [Fileformat]
 
-    1*              BYTE        Pre-Tag (!= 0)
-    1*              3-BYTE      OffsetToEndOfRec in Bytes
-    1*              BYTE        Record-Type (==SFX_REC_TYPE_SINGLE)
-    1*              BYTE        Content-Version
-    1*              USHORT      Content-Tag
-    SizeOfContent*  BYTE        Content
+    1*				BYTE  		Pre-Tag (!= 0)
+    1*				3-BYTE		OffsetToEndOfRec in Bytes
+    1*				BYTE		Record-Type (==SFX_REC_TYPE_SINGLE)
+    1*				BYTE		Content-Version
+    1*				USHORT		Content-Tag
+    SizeOfContent*	BYTE		Content
 
     [Beispiel]
 
@@ -372,16 +372,16 @@ public:
                                            UINT16 nTag, BYTE nCurVer,
                                            UINT32 nSize );
 
-    inline void     Reset();
+    inline void		Reset();
 
-    UINT32          Close( FASTBOOL bSeekToEndOfRec = TRUE );
+    UINT32			Close( FASTBOOL bSeekToEndOfRec = TRUE );
 };
 
 //------------------------------------------------------------------------
 
 class SVL_DLLPUBLIC SfxSingleRecordReader: public SfxMiniRecordReader
 
-/*  [Beschreibung]
+/*	[Beschreibung]
 
     Mit Instanzen dieser Klasse kann ein einfacher Record aus einem Stream
     gelesen werden, der mit der Klasse <SfxSingleRecordWriter> geschrieben
@@ -409,38 +409,38 @@ class SVL_DLLPUBLIC SfxSingleRecordReader: public SfxMiniRecordReader
 
 {
 protected:
-    UINT16              _nRecordTag;    // Art des Gesamt-Inhalts
-    BYTE                _nRecordVer;    // Version des Gesamt-Inhalts
-    BYTE                _nRecordType;   // Record Type aus dem Header
+    UINT16				_nRecordTag;	// Art des Gesamt-Inhalts
+    BYTE				_nRecordVer;	// Version des Gesamt-Inhalts
+    BYTE				_nRecordType;	// Record Type aus dem Header
 
                         // Drei-Phasen-Ctor f"ur Subklassen
                         SfxSingleRecordReader() {}
-    void                Construct_Impl( SvStream *pStream )
+    void				Construct_Impl( SvStream *pStream )
                         {
                             SfxMiniRecordReader::Construct_Impl(
                                     pStream, SFX_REC_PRETAG_EXT );
                         }
-    FASTBOOL            FindHeader_Impl( UINT16 nTypes, UINT16 nTag );
+    FASTBOOL			FindHeader_Impl( UINT16 nTypes, UINT16 nTag );
     FASTBOOL            ReadHeader_Impl( USHORT nTypes );
 
 public:
                         SfxSingleRecordReader( SvStream *pStream );
                         SfxSingleRecordReader( SvStream *pStream, USHORT nTag );
 
-    inline UINT16       GetTag() const;
+    inline UINT16		GetTag() const;
 
-    inline BYTE         GetVersion() const;
-    inline FASTBOOL     HasVersion( USHORT nVersion ) const;
+    inline BYTE 		GetVersion() const;
+    inline FASTBOOL 	HasVersion( USHORT nVersion ) const;
 };
 
 //------------------------------------------------------------------------
 
 class SVL_DLLPUBLIC SfxMultiFixRecordWriter: public SfxSingleRecordWriter
 
-/*  [Beschreibung]
+/*	[Beschreibung]
 
     Mit Instanzen dieser Klasse kann ein Record in einen Stream geschrieben
-    werden, der seine eigene L"ange speichert und somit auch von "alteren
+    werden, der seine eigene L"ange speichert und somit	auch von "alteren
     Versionen bzw. Readern, die diesen Record-Type (Tag) nicht kennen,
     "ubersprungen werden kann.
 
@@ -458,15 +458,15 @@ class SVL_DLLPUBLIC SfxMultiFixRecordWriter: public SfxSingleRecordWriter
 
     [Fileformat]
 
-    1*                  BYTE        Pre-Tag (==0)
-    1*                  3-BYTE      OffsetToEndOfRec in Bytes
-    1*                  BYTE        Record-Type (==SFX_REC_TYPE_FIXSIZE)
-    1*                  BYTE        Content-Version
-    1*                  UINT16      Content-Tag
-    1*                  UINT16      NumberOfContents
-    1*                  UINT32      SizeOfEachContent
-    NumberOfContents*   (
-    SizeOfEachContent   BYTE        Content
+    1*					BYTE		Pre-Tag (==0)
+    1*					3-BYTE		OffsetToEndOfRec in Bytes
+    1*					BYTE		Record-Type (==SFX_REC_TYPE_FIXSIZE)
+    1*					BYTE		Content-Version
+    1*					UINT16		Content-Tag
+    1*					UINT16		NumberOfContents
+    1*					UINT32		SizeOfEachContent
+    NumberOfContents*	(
+    SizeOfEachContent	BYTE		Content
                         )
 
     [Beispiel]
@@ -484,11 +484,11 @@ class SVL_DLLPUBLIC SfxMultiFixRecordWriter: public SfxSingleRecordWriter
 
 {
 protected:
-    UINT32          _nContentStartPos;  /*  Startposition des jeweiligen
+    UINT32			_nContentStartPos;	/*	Startposition des jeweiligen
                                             Contents - nur bei DBG_UTIL
                                             und f"ur Subklassen */
-    UINT32          _nContentSize;      //  Gr"o\se jedes Contents
-    UINT16          _nContentCount;     //  jeweilige Anzahl der Contents
+    UINT32			_nContentSize;		//	Gr"o\se jedes Contents
+    UINT16			_nContentCount; 	//	jeweilige Anzahl der Contents
 
                     SfxMultiFixRecordWriter( BYTE nRecordType,
                                              SvStream *pStream,
@@ -499,23 +499,23 @@ public:
                     SfxMultiFixRecordWriter( SvStream *pStream,
                                              UINT16 nTag, BYTE nCurVer,
                                              UINT32 nContentSize );
-    inline          ~SfxMultiFixRecordWriter();
+    inline			~SfxMultiFixRecordWriter();
 
-    inline void     NewContent();
+    inline void 	NewContent();
 
-    inline void     Reset();
+    inline void		Reset();
 
-    UINT32          Close( FASTBOOL bSeekToEndOfRec = TRUE );
+    UINT32			Close( FASTBOOL bSeekToEndOfRec = TRUE );
 };
 
 //------------------------------------------------------------------------
 
 class SVL_DLLPUBLIC SfxMultiVarRecordWriter: public SfxMultiFixRecordWriter
 
-/*  [Beschreibung]
+/*	[Beschreibung]
 
     Mit Instanzen dieser Klasse kann ein Record in einen Stream geschrieben
-    werden, der seine eigene L"ange speichert und somit auch von "alteren
+    werden, der seine eigene L"ange speichert und somit	auch von "alteren
     Versionen bzw. Readern, die diesen Record-Type (Tag) nicht kennen,
     "ubersprungen werden kann.
 
@@ -531,17 +531,17 @@ class SVL_DLLPUBLIC SfxMultiVarRecordWriter: public SfxMultiFixRecordWriter
 
     [Fileformat]
 
-    1*                  BYTE        Pre-Tag (==0)
-    1*                  3-BYTE      OffsetToEndOfRec in Bytes
-    1*                  BYTE        Record-Type (==SFX_FILETYPE_TYPE_VARSIZE)
-    1*                  BYTE        Content-Version
-    1*                  USHORT      Content-Tag
-    1*                  UINT16      NumberOfContents
-    1*                  UINT32      OffsetToOfsTable
-    NumberOfContents*   (
-    ContentSize*        BYTE        Content
+    1*					BYTE		Pre-Tag (==0)
+    1*					3-BYTE		OffsetToEndOfRec in Bytes
+    1*					BYTE		Record-Type (==SFX_FILETYPE_TYPE_VARSIZE)
+    1*					BYTE		Content-Version
+    1*					USHORT		Content-Tag
+    1*					UINT16		NumberOfContents
+    1*					UINT32		OffsetToOfsTable
+    NumberOfContents*	(
+    ContentSize*		BYTE		Content
                         )
-    NumberOfContents*   UINT32      ContentOfs (je per <<8 verschoben)
+    NumberOfContents*	UINT32		ContentOfs (je per <<8 verschoben)
 
     [Beispiel]
 
@@ -558,7 +558,7 @@ class SVL_DLLPUBLIC SfxMultiVarRecordWriter: public SfxMultiFixRecordWriter
 
 {
 protected:
-    SfxUINT32s          _aContentOfs;
+    SfxUINT32s  		_aContentOfs;
     USHORT              _nContentVer;   // nur f"ur SfxMultiMixRecordWriter
 
                         SfxMultiVarRecordWriter( BYTE nRecordType,
@@ -572,21 +572,21 @@ public:
                         SfxMultiVarRecordWriter( SvStream *pStream,
                                                  USHORT nRecordTag,
                                                  BYTE nRecordVer );
-    virtual             ~SfxMultiVarRecordWriter();
+    virtual				~SfxMultiVarRecordWriter();
 
-    void                NewContent();
+    void				NewContent();
 
-    virtual UINT32      Close( FASTBOOL bSeekToEndOfRec = TRUE );
+    virtual UINT32		Close( FASTBOOL bSeekToEndOfRec = TRUE );
 };
 
 //------------------------------------------------------------------------
 
 class SVL_DLLPUBLIC SfxMultiMixRecordWriter: public SfxMultiVarRecordWriter
 
-/*  [Beschreibung]
+/*	[Beschreibung]
 
     Mit Instanzen dieser Klasse kann ein Record in einen Stream geschrieben
-    werden, der seine eigene L"ange speichert und somit auch von "alteren
+    werden, der seine eigene L"ange speichert und somit	auch von "alteren
     Versionen bzw. Readern, die diesen Record-Type (Tag) nicht kennen,
     "ubersprungen werden kann.
 
@@ -601,27 +601,27 @@ class SVL_DLLPUBLIC SfxMultiMixRecordWriter: public SfxMultiVarRecordWriter
 
     [Fileformat]
 
-    1*                  BYTE        Pre-Tag (==0)
-    1*                  3-BYTE      OffsetToEndOfRec in Bytes
-    1*                  BYTE        Record-Type (==SFX_REC_TYPE_MIXTAGS)
-    1*                  BYTE        Content-Version
-    1*                  USHORT      Record-Tag
-    1*                  UINT16      NumberOfContents
-    1*                  UINT32      OffsetToOfsTable
+    1*					BYTE		Pre-Tag (==0)
+    1*					3-BYTE		OffsetToEndOfRec in Bytes
+    1*					BYTE		Record-Type (==SFX_REC_TYPE_MIXTAGS)
+    1*					BYTE		Content-Version
+    1*					USHORT		Record-Tag
+    1*					UINT16		NumberOfContents
+    1*					UINT32		OffsetToOfsTable
     NumberOfContents*   (
     1*                  USHORT      Content-Tag
     ContentSize*        BYTE        Content
                         )
-    NumberOfContents*   UINT32      ( ContentOfs << 8 + Version )
+    NumberOfContents*	UINT32		( ContentOfs << 8 + Version )
 */
 
 {
 public:
-    inline              SfxMultiMixRecordWriter( SvStream *pStream,
+    inline				SfxMultiMixRecordWriter( SvStream *pStream,
                                                  USHORT nRecordTag,
                                                  BYTE nRecordVer );
 
-    void                NewContent( USHORT nTag, BYTE nVersion );
+    void				NewContent( USHORT nTag, BYTE nVersion );
 
 // private: geht nicht, da einige Compiler dann auch vorherige privat machen
     void                NewContent()
@@ -632,7 +632,7 @@ public:
 
 class SVL_DLLPUBLIC SfxMultiRecordReader: public SfxSingleRecordReader
 
-/*  [Beschreibung]
+/*	[Beschreibung]
 
     Mit Instanzen dieser Klasse kann ein aus mehreren Contents bestehender
     Record aus einem Stream gelesen werden, der mit einer der Klassen
@@ -665,30 +665,30 @@ class SVL_DLLPUBLIC SfxMultiRecordReader: public SfxSingleRecordReader
 */
 
 {
-    UINT32              _nStartPos;     //  Start-Position des Records
-    UINT32*             _pContentOfs;   //  Offsets der Startpositionen
-    UINT32              _nContentSize;  //  Size jedes einzelnen / Tabellen-Pos
-    UINT16              _nContentCount; //  Anzahl der Contents im Record
-    UINT16              _nContentNo;    /*  der Index des aktuellen Contents
+    UINT32				_nStartPos;		//	Start-Position des Records
+    UINT32* 			_pContentOfs;	//	Offsets der Startpositionen
+    UINT32				_nContentSize;	//	Size jedes einzelnen / Tabellen-Pos
+    UINT16				_nContentCount; //	Anzahl der Contents im Record
+    UINT16				_nContentNo;	/*	der Index des aktuellen Contents
                                             enth"alt jeweils den Index des
                                             Contents, der beim n"achsten
                                             GetContent() geholt wird */
-    UINT16              _nContentTag;   //  Art-Kennung des aktuellen Contents
-    BYTE                _nContentVer;   //  Versions-Kennung des akt. Contents
+    UINT16				_nContentTag;	//	Art-Kennung des aktuellen Contents
+    BYTE				_nContentVer;	//	Versions-Kennung des akt. Contents
 
-    FASTBOOL            ReadHeader_Impl();
+    FASTBOOL			ReadHeader_Impl();
 
 public:
                         SfxMultiRecordReader( SvStream *pStream );
                         SfxMultiRecordReader( SvStream *pStream, UINT16 nTag );
                         ~SfxMultiRecordReader();
 
-    FASTBOOL            GetContent();
-    inline UINT16       GetContentTag();
-    inline BYTE         GetContentVersion() const;
-    inline FASTBOOL     HasContentVersion( USHORT nVersion ) const;
+    FASTBOOL			GetContent();
+    inline UINT16		GetContentTag();
+    inline BYTE 		GetContentVersion() const;
+    inline FASTBOOL 	HasContentVersion( USHORT nVersion ) const;
 
-    inline UINT32       ContentCount() const;
+    inline UINT32		ContentCount() const;
 };
 
 //=========================================================================
@@ -721,12 +721,12 @@ inline SfxMiniRecordWriter::SfxMiniRecordWriter
 
 inline SfxMiniRecordWriter::SfxMiniRecordWriter
 (
-    SvStream*       pStream,        // Stream, in dem der Record angelegt wird
-    BYTE            nTag,           // Record-Tag zwischen 0x01 und 0xFE
-    UINT32          nSize           // Gr"o\se der Daten in Bytes
+    SvStream*		pStream,		// Stream, in dem der Record angelegt wird
+    BYTE			nTag,			// Record-Tag zwischen 0x01 und 0xFE
+    UINT32			nSize			// Gr"o\se der Daten in Bytes
 )
 
-/*  [Beschreibung]
+/*	[Beschreibung]
 
     Legt in 'pStream' einen 'SfxMiniRecord' an, dessen Content-Gr"o\se
     von vornherein bekannt ist.
@@ -748,7 +748,7 @@ inline SfxMiniRecordWriter::SfxMiniRecordWriter
 
 inline SfxMiniRecordWriter::~SfxMiniRecordWriter()
 
-/*  [Beschreibung]
+/*	[Beschreibung]
 
     Der Dtor der Klasse <SfxMiniRecordWriter> schlie\st den Record
     automatisch, falls <SfxMiniRecordWriter::Close()> nicht bereits
@@ -765,7 +765,7 @@ inline SfxMiniRecordWriter::~SfxMiniRecordWriter()
 
 inline SvStream& SfxMiniRecordWriter::operator*() const
 
-/*  [Beschreibung]
+/*	[Beschreibung]
 
     Dieser Operator liefert den Stream, in dem der Record liegt.
     Der Record darf noch nicht geschlossen worden sein.
@@ -778,7 +778,7 @@ inline SvStream& SfxMiniRecordWriter::operator*() const
 
 //-------------------------------------------------------------------------
 
-inline void SfxMiniRecordWriter::Reset()
+inline void	SfxMiniRecordWriter::Reset()
 {
     _pStream->Seek( _nStartPos + SFX_REC_HEADERSIZE_MINI );
     _bHeaderOk = FALSE;
@@ -820,7 +820,7 @@ inline void SfxMiniRecordReader::Skip()
 
 inline BYTE SfxMiniRecordReader::GetTag() const
 
-/*  [Beschreibung]
+/*	[Beschreibung]
 
     Liefert des aus dem Header gelesene Pre-Tag des Records. Dieses kann
     auch SFX_REC_PRETAG_EXT oder SFX_REC_PRETAG_EOR sein, im
@@ -837,7 +837,7 @@ inline BYTE SfxMiniRecordReader::GetTag() const
 
 inline FASTBOOL SfxMiniRecordReader::IsValid() const
 
-/*  [Beschreibung]
+/*	[Beschreibung]
 
     Hiermit kann abgefragt werden, ob der Record erfolgreich aus dem
     Stream konstruiert werden konnte, der Header also f"ur diesen Record-Typ
@@ -852,7 +852,7 @@ inline FASTBOOL SfxMiniRecordReader::IsValid() const
 
 inline SvStream& SfxMiniRecordReader::operator*() const
 
-/*  [Beschreibung]
+/*	[Beschreibung]
 
     Dieser Operator liefert den Stream in dem der Record liegt.
     Die aktuelle Position des Streams mu\s innerhalb des Records liegen.
@@ -867,7 +867,7 @@ inline SvStream& SfxMiniRecordReader::operator*() const
 
 inline UINT32 SfxSingleRecordWriter::Close( FASTBOOL bSeekToEndOfRec )
 
-//  siehe <SfxMiniRecordWriter::Close(FASTBOOL)>
+//	siehe <SfxMiniRecordWriter::Close(FASTBOOL)>
 
 {
     UINT32 nRet = 0;
@@ -890,13 +890,13 @@ inline UINT32 SfxSingleRecordWriter::Close( FASTBOOL bSeekToEndOfRec )
 #endif
 
     // Record war bereits geschlossen
-//  nRet = 0;
+//	nRet = 0;
     return nRet;
 }
 
 //-------------------------------------------------------------------------
 
-inline void SfxSingleRecordWriter::Reset()
+inline void	SfxSingleRecordWriter::Reset()
 {
     _pStream->Seek( _nStartPos + SFX_REC_HEADERSIZE_MINI +
                                  SFX_REC_HEADERSIZE_SINGLE );
@@ -920,7 +920,7 @@ inline UINT16 SfxSingleRecordReader::GetTag() const
 
 inline BYTE SfxSingleRecordReader::GetVersion() const
 
-/*  [Beschreibung]
+/*	[Beschreibung]
 
     Liefert die Version des aus dem Stream gelesenen Records.
 */
@@ -933,7 +933,7 @@ inline BYTE SfxSingleRecordReader::GetVersion() const
 
 inline FASTBOOL SfxSingleRecordReader::HasVersion( USHORT nVersion ) const
 
-/*  [Beschreibung]
+/*	[Beschreibung]
 
     Stellt fest, ob der aus dem Stream gelese Record in der Version
     'nVersion' oder h"oher vorliegt.
@@ -947,7 +947,7 @@ inline FASTBOOL SfxSingleRecordReader::HasVersion( USHORT nVersion ) const
 
 inline SfxMultiFixRecordWriter::~SfxMultiFixRecordWriter()
 
-/*  [Beschreibung]
+/*	[Beschreibung]
 
     Der Dtor der Klasse <SfxMultiFixRecordWriter> schlie\st den Record
     automatisch, falls <SfxMutiFixRecordWriter::Close()> nicht bereits
@@ -964,7 +964,7 @@ inline SfxMultiFixRecordWriter::~SfxMultiFixRecordWriter()
 
 inline void SfxMultiFixRecordWriter::NewContent()
 
-/*  [Beschreibung]
+/*	[Beschreibung]
 
     Mit dieser Methode wird in den Record ein neuer Content eingef"ugt.
     Jeder, auch der 1. Record mu\s durch Aufruf dieser Methode eingeleitet
@@ -997,9 +997,9 @@ inline void SfxMultiFixRecordWriter::NewContent()
 
 inline SfxMultiMixRecordWriter::SfxMultiMixRecordWriter
 (
-    SvStream*       pStream,    // Stream, in dem der Record angelegt wird
-    USHORT          nRecordTag, // Gesamt-Record-Art-Kennung
-    BYTE            nRecordVer  // Gesamt-Record-Versions-Kennung
+    SvStream*		pStream,	// Stream, in dem der Record angelegt wird
+    USHORT			nRecordTag, // Gesamt-Record-Art-Kennung
+    BYTE			nRecordVer	// Gesamt-Record-Versions-Kennung
 )
 
 /*  [Beschreibung]
@@ -1009,14 +1009,14 @@ inline SfxMultiMixRecordWriter::SfxMultiMixRecordWriter
     Die Gr"o\sen der einzelnen Contents werden automatisch ermittelt.
 */
 
-:   SfxMultiVarRecordWriter( SFX_REC_TYPE_MIXTAGS,
+:	SfxMultiVarRecordWriter( SFX_REC_TYPE_MIXTAGS,
                              pStream, nRecordTag, nRecordVer )
 {
 }
 
 //=========================================================================
 
-inline void SfxMultiFixRecordWriter::Reset()
+inline void	SfxMultiFixRecordWriter::Reset()
 {
     _pStream->Seek( _nStartPos + SFX_REC_HEADERSIZE_MINI +
                                  SFX_REC_HEADERSIZE_SINGLE +
@@ -1028,7 +1028,7 @@ inline void SfxMultiFixRecordWriter::Reset()
 
 inline UINT16 SfxMultiRecordReader::GetContentTag()
 
-/*  [Beschreibung]
+/*	[Beschreibung]
 
     Diese Methode liefert die Art-Kennung des zuletzt mit der Methode
     <SfxMultiRecordReder::GetContent()> ge"offneten Contents.
@@ -1071,7 +1071,7 @@ inline FASTBOOL SfxMultiRecordReader::HasContentVersion( USHORT nVersion ) const
 
 inline UINT32 SfxMultiRecordReader::ContentCount() const
 
-/*  [Beschreibung]
+/*	[Beschreibung]
 
     Diese Methode liefert die Anzahl im Record befindlichen Contents.
 */
diff --git a/svl/inc/svl/flagitem.hxx b/svl/inc/svl/flagitem.hxx
index f7fd52d2e714..69c3190be17a 100644
--- a/svl/inc/svl/flagitem.hxx
+++ b/svl/inc/svl/flagitem.hxx
@@ -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
@@ -42,7 +42,7 @@ DBG_NAMEEX_VISIBILITY(SfxFlagItem, SVL_DLLPUBLIC)
 
 class SVL_DLLPUBLIC SfxFlagItem: public SfxPoolItem
 {
-    USHORT                   nVal;
+    USHORT					 nVal;
 
 public:
                              TYPEINFO();
@@ -54,27 +54,27 @@ public:
                              ~SfxFlagItem() {
                                 DBG_DTOR(SfxFlagItem, 0); }
 
-    virtual BYTE             GetFlagCount() const;
-    virtual XubString        GetFlagText( BYTE nFlag ) const;
+    virtual BYTE			 GetFlagCount() const;
+    virtual XubString		 GetFlagText( BYTE nFlag ) const;
 
-    virtual int              operator==( const SfxPoolItem& ) const;
+    virtual int 			 operator==( const SfxPoolItem& ) const;
     virtual SfxPoolItem*     Create(SvStream &, USHORT nVersion) const;
-    virtual SvStream&        Store(SvStream &, USHORT nItemVersion) const;
+    virtual SvStream&		 Store(SvStream &, USHORT nItemVersion) const;
 
-    virtual SfxPoolItem*     Clone( SfxItemPool *pPool = 0 ) const;
+    virtual SfxPoolItem*	 Clone( SfxItemPool *pPool = 0 ) const;
     virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
                                     SfxMapUnit eCoreMetric,
                                     SfxMapUnit ePresMetric,
                                     XubString &rText,
                                     const IntlWrapper * = 0 ) const;
             USHORT           GetValue() const { return nVal; }
-            void             SetValue( USHORT nNewVal ) {
+            void			 SetValue( USHORT nNewVal ) {
                                  DBG_ASSERT( GetRefCount() == 0, "SetValue() with pooled item" );
                                  nVal = nNewVal;
                              }
-            int              GetFlag( BYTE nFlag ) const {
+            int 			 GetFlag( BYTE nFlag ) const {
                                  return ( (nVal & nSfxFlagVal[nFlag]) != 0 ); }
-            void             SetFlag( BYTE nFlag, int bVal );
+            void			 SetFlag( BYTE nFlag, int bVal );
 };
 
 #endif
diff --git a/svl/inc/svl/globalnameitem.hxx b/svl/inc/svl/globalnameitem.hxx
index 727f06681b45..4c606410bfc2 100644
--- a/svl/inc/svl/globalnameitem.hxx
+++ b/svl/inc/svl/globalnameitem.hxx
@@ -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
@@ -37,7 +37,7 @@
 
 class SVL_DLLPUBLIC SfxGlobalNameItem: public SfxPoolItem
 {
-    SvGlobalName            m_aName;
+    SvGlobalName			m_aName;
 
 public:
                             TYPEINFO();
@@ -45,13 +45,13 @@ public:
                             SfxGlobalNameItem( USHORT nWhich, const SvGlobalName& );
                             ~SfxGlobalNameItem();
 
-    virtual int             operator==( const SfxPoolItem& ) const;
-    virtual SfxPoolItem*    Clone( SfxItemPool *pPool = 0 ) const;
-    SvGlobalName            GetValue() const { return m_aName; }
+    virtual int 			operator==( const SfxPoolItem& ) const;
+    virtual SfxPoolItem*	Clone( SfxItemPool *pPool = 0 ) const;
+    SvGlobalName			GetValue() const { return m_aName; }
 
-    virtual BOOL            PutValue  ( const com::sun::star::uno::Any& rVal,
+    virtual	BOOL 			PutValue  ( const com::sun::star::uno::Any& rVal,
                                         BYTE nMemberId = 0 );
-    virtual BOOL            QueryValue( com::sun::star::uno::Any& rVal,
+    virtual	BOOL 			QueryValue( com::sun::star::uno::Any& rVal,
                                         BYTE nMemberId = 0 ) const;
 };
 
diff --git a/svl/inc/svl/hint.hxx b/svl/inc/svl/hint.hxx
index f8f64fbd759b..ae98b25d1b85 100644
--- a/svl/inc/svl/hint.hxx
+++ b/svl/inc/svl/hint.hxx
@@ -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,13 +56,13 @@ public:
         }
 
 #define IMPL_PTRHINT_AUTODELETE(Name, Type) \
-        TYPEINIT1(Name, SfxHint);   \
+        TYPEINIT1(Name, SfxHint);	\
         Name::Name( Type* pObject, BOOL bOwnedByHint ) \
             { pObj = pObject; bIsOwner = bOwnedByHint; } \
         Name::~Name() { if ( bIsOwner ) delete pObj; }
 
 #define IMPL_PTRHINT(Name, Type) \
-        TYPEINIT1(Name, SfxHint);   \
+        TYPEINIT1(Name, SfxHint);	\
         Name::Name( Type* pObject, BOOL bOwnedByHint ) \
             { pObj = pObject; bIsOwner = bOwnedByHint; } \
         Name::~Name() {}
diff --git a/svl/inc/svl/httpcook.hxx b/svl/inc/svl/httpcook.hxx
index b7b4a3cb0e90..be1c6521cbd4 100644
--- a/svl/inc/svl/httpcook.hxx
+++ b/svl/inc/svl/httpcook.hxx
@@ -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
@@ -133,10 +133,10 @@ enum CntHTTPCookieRequestType
 
 struct CntHTTPCookieRequest
 {
-    const String&            m_rURL;
-    List&                    m_rCookieList;
+    const String& 			 m_rURL;
+    List&         			 m_rCookieList;
     CntHTTPCookieRequestType m_eType;
-    USHORT                   m_nRet;
+    USHORT					 m_nRet;
 
     CntHTTPCookieRequest (
         const String& rURL,
diff --git a/svl/inc/svl/ilstitem.hxx b/svl/inc/svl/ilstitem.hxx
index 6ecc317f7299..fab4a8d2ad70 100644
--- a/svl/inc/svl/ilstitem.hxx
+++ b/svl/inc/svl/ilstitem.hxx
@@ -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
@@ -53,7 +53,7 @@ public:
 
     void                    GetList( SvULongs& rList ) const;
 
-    virtual int             operator==( const SfxPoolItem& ) const;
+    virtual int 			operator==( const SfxPoolItem& ) const;
     virtual SfxPoolItem*    Clone( SfxItemPool *pPool = 0 ) const;
     virtual BOOL            PutValue  ( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 );
     virtual BOOL            QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const;
diff --git a/svl/inc/svl/imageitm.hxx b/svl/inc/svl/imageitm.hxx
index 63dc4c470a55..7d5a841a8e01 100644
--- a/svl/inc/svl/imageitm.hxx
+++ b/svl/inc/svl/imageitm.hxx
@@ -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
@@ -44,8 +44,8 @@ public:
                             SfxImageItem( const SfxImageItem& );
     virtual                 ~SfxImageItem();
 
-    virtual SfxPoolItem*    Clone( SfxItemPool* pPool = 0 ) const;
-    virtual int             operator==( const SfxPoolItem& ) const;
+    virtual SfxPoolItem*	Clone( SfxItemPool* pPool = 0 ) const;
+    virtual int 			operator==( const SfxPoolItem& ) const;
     virtual BOOL            QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const;
     virtual BOOL            PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 );
 
diff --git a/svl/inc/svl/inethist.hxx b/svl/inc/svl/inethist.hxx
index aceac630924f..a6d122752161 100644
--- a/svl/inc/svl/inethist.hxx
+++ b/svl/inc/svl/inethist.hxx
@@ -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
diff --git a/svl/inc/svl/inettype.hxx b/svl/inc/svl/inettype.hxx
index 24318af8fa57..57d357d33f7f 100644
--- a/svl/inc/svl/inettype.hxx
+++ b/svl/inc/svl/inettype.hxx
@@ -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
@@ -233,7 +233,7 @@ enum INetContentType
     CONTENT_TYPE_IMAGE_JPEG,
     CONTENT_TYPE_IMAGE_PCX,
     CONTENT_TYPE_IMAGE_PNG,
-    CONTENT_TYPE_IMAGE_TIFF,
+    CONTENT_TYPE_IMAGE_TIFF,		
     CONTENT_TYPE_IMAGE_BMP,
     CONTENT_TYPE_TEXT_HTML,
     CONTENT_TYPE_TEXT_PLAIN,
diff --git a/svl/inc/svl/intitem.hxx b/svl/inc/svl/intitem.hxx
index f0fff8440518..e6f13126f8cd 100644
--- a/svl/inc/svl/intitem.hxx
+++ b/svl/inc/svl/intitem.hxx
@@ -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
@@ -82,10 +82,10 @@ public:
                                                 const IntlWrapper * = 0)
         const;
 
-    virtual BOOL QueryValue( com::sun::star::uno::Any& rVal,
+    virtual	BOOL QueryValue( com::sun::star::uno::Any& rVal,
                              BYTE nMemberId = 0 ) const;
 
-    virtual BOOL PutValue( const com::sun::star::uno::Any& rVal,
+    virtual	BOOL PutValue( const com::sun::star::uno::Any& rVal,
                            BYTE nMemberId = 0 );
 
     virtual SfxPoolItem * Create(SvStream & rStream, USHORT) const;
diff --git a/svl/inc/svl/isethint.hxx b/svl/inc/svl/isethint.hxx
index 5ad244bfbd00..442281911d74 100644
--- a/svl/inc/svl/isethint.hxx
+++ b/svl/inc/svl/isethint.hxx
@@ -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
@@ -39,16 +39,16 @@ class SfxItemSet;
 
 class SVL_DLLPUBLIC SfxItemSetHint: public SfxHint
 {
-    SfxItemSet*         _pItemSet;
+    SfxItemSet*			_pItemSet;
 
 public:
                         TYPEINFO();
 
                         SfxItemSetHint( SfxItemSet *pItemSet );
                         SfxItemSetHint( const SfxItemSet &rItemSet );
-    virtual             ~SfxItemSetHint();
+    virtual				~SfxItemSetHint();
 
-    const SfxItemSet&   GetItemSet() const { return *_pItemSet; }
+    const SfxItemSet&	GetItemSet() const { return *_pItemSet; }
 };
 
 #endif
diff --git a/svl/inc/svl/itemiter.hxx b/svl/inc/svl/itemiter.hxx
index f80031871caf..9376ee0f30d8 100644
--- a/svl/inc/svl/itemiter.hxx
+++ b/svl/inc/svl/itemiter.hxx
@@ -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
@@ -38,8 +38,8 @@ class SfxItemPool;
 class SVL_DLLPUBLIC SfxItemIter
 {
     // Item-Feld - Start & Ende
-    const SfxItemSet&   _rSet;
-    USHORT              _nStt, _nEnd, _nAkt;
+    const SfxItemSet&	_rSet;
+    USHORT				_nStt, _nEnd, _nAkt;
 
 public:
     SfxItemIter( const SfxItemSet& rSet );
@@ -57,7 +57,7 @@ public:
     const SfxPoolItem* NextItem();
     const SfxPoolItem* PrevItem();
 
-    BOOL               IsAtStart() const { return _nAkt == _nStt; }
+    BOOL			   IsAtStart() const { return _nAkt == _nStt; }
     BOOL               IsAtEnd() const   { return _nAkt == _nEnd; }
 
     USHORT             GetCurPos() const { return _nAkt; }
diff --git a/svl/inc/svl/itempool.hxx b/svl/inc/svl/itempool.hxx
index cbc6b7c4dd11..7483bf69a0c9 100644
--- a/svl/inc/svl/itempool.hxx
+++ b/svl/inc/svl/itempool.hxx
@@ -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
@@ -50,27 +50,27 @@ DBG_NAMEEX(SfxItemPool)
 
 //====================================================================
 
-#define SFX_ITEM_POOLABLE           0x0001
-#define SFX_ITEM_NOT_POOLABLE       0x0002
-
-#define SFX_ITEM_USERFLAG0          0x0100
-#define SFX_ITEM_USERFLAG1          0x0200
-#define SFX_ITEM_USERFLAG2          0x0400
-#define SFX_ITEM_USERFLAG3          0x0800
-#define SFX_ITEM_USERFLAG4          0x1000
-#define SFX_ITEM_USERFLAG5          0x2000
-#define SFX_ITEM_USERFLAG6          0x4000
-#define SFX_ITEM_USERFLAG7          0x8000
-#define SFX_ITEM_USERFLAG8          0x0010
-#define SFX_ITEM_USERFLAG9          0x0020
-#define SFX_ITEM_USERFLAGA          0x0040
-#define SFX_ITEM_USERFLAGB          0x0080
+#define SFX_ITEM_POOLABLE			0x0001
+#define SFX_ITEM_NOT_POOLABLE		0x0002
+
+#define SFX_ITEM_USERFLAG0  		0x0100
+#define SFX_ITEM_USERFLAG1  		0x0200
+#define SFX_ITEM_USERFLAG2  		0x0400
+#define SFX_ITEM_USERFLAG3  		0x0800
+#define SFX_ITEM_USERFLAG4  		0x1000
+#define SFX_ITEM_USERFLAG5  		0x2000
+#define SFX_ITEM_USERFLAG6  		0x4000
+#define SFX_ITEM_USERFLAG7  		0x8000
+#define SFX_ITEM_USERFLAG8  		0x0010
+#define SFX_ITEM_USERFLAG9  		0x0020
+#define SFX_ITEM_USERFLAGA  		0x0040
+#define SFX_ITEM_USERFLAGB  		0x0080
 
 //====================================================================
 
 struct SfxItemInfo
 {
-    USHORT      _nSID;
+    USHORT		_nSID;
     USHORT      _nFlags;
 };
 
@@ -90,7 +90,7 @@ typedef ::std::vector< SfxItemPoolUser* > SfxItemPoolUserVector;
 
 class SVL_DLLPUBLIC SfxItemPool
 
-/*  [Beschreibung]
+/*	[Beschreibung]
 
     Die von dieser Klasse abgeleiteten Klassen dienen der Bereitstellung von
     Defaults von SfxPoolItems und halten konkrete (konstante) Instanzen, die
@@ -107,21 +107,21 @@ class SVL_DLLPUBLIC SfxItemPool
     SVL_DLLPRIVATE void readTheItems(SvStream & rStream, USHORT nCount, USHORT nVersion,
                                      SfxPoolItem * pDefItem, SfxPoolItemArray_Impl ** pArr);
 
-    UniString                       aName;
-    USHORT                          nStart, nEnd;
-    USHORT                          _nFileFormatVersion;
+    UniString						aName;
+    USHORT							nStart, nEnd;
+    USHORT							_nFileFormatVersion;
 #ifdef TF_POOLABLE
-    const SfxItemInfo*              pItemInfos;
+    const SfxItemInfo*				pItemInfos;
 #else
-    USHORT*                         pSlotIds;
+    USHORT* 						pSlotIds;
 #endif
-    SfxItemPool_Impl*               pImp;
-    SfxPoolItem**                   ppStaticDefaults;
-    SfxPoolItem**                   ppPoolDefaults;
-    SfxItemPool*                    pSecondary;
-    SfxItemPool*                    pMaster;
-    USHORT*                         _pPoolRanges;
-    FASTBOOL                        bPersistentRefCounts;
+    SfxItemPool_Impl*				pImp;
+    SfxPoolItem**					ppStaticDefaults;
+    SfxPoolItem**					ppPoolDefaults;
+    SfxItemPool*					pSecondary;
+    SfxItemPool*					pMaster;
+    USHORT*							_pPoolRanges;
+    FASTBOOL						bPersistentRefCounts;
 
 private:
     // ObjectUser section
@@ -137,26 +137,26 @@ public:
 friend class SfxPoolWhichMap;
 
 private:
-    inline  USHORT                  GetIndex_Impl(USHORT nWhich) const;
-    inline  USHORT                  GetSize_Impl() const { return nEnd - nStart + 1; }
+    inline 	USHORT					GetIndex_Impl(USHORT nWhich) const;
+    inline	USHORT					GetSize_Impl() const { return nEnd - nStart + 1; }
 
-    SVL_DLLPRIVATE SvStream&                        Load1_Impl( SvStream &rStream );
-    SVL_DLLPRIVATE FASTBOOL                     IsItemFlag_Impl( USHORT nWhich, USHORT nFlag ) const;
+    SVL_DLLPRIVATE SvStream&						Load1_Impl( SvStream &rStream );
+    SVL_DLLPRIVATE FASTBOOL						IsItemFlag_Impl( USHORT nWhich, USHORT nFlag ) const;
 
 public:
     // fuer dflt. SfxItemSet::CTOR, setze dflt. WhichRanges
-    void                            FillItemIdRanges_Impl( USHORT*& pWhichRanges ) const;
-    const USHORT*                   GetFrozenIdRanges() const
+    void							FillItemIdRanges_Impl( USHORT*& pWhichRanges ) const;
+    const USHORT*					GetFrozenIdRanges() const
                                     { return _pPoolRanges; }
-    FASTBOOL                        IsVer2_Impl() const;
+    FASTBOOL						IsVer2_Impl() const;
 
 #endif
     //---------------------------------------------------------------------
 
 protected:
-    static inline void              SetRefCount( SfxPoolItem& rItem, ULONG n );
-    static inline ULONG             AddRef( const SfxPoolItem& rItem, ULONG n = 1 );
-    static inline ULONG             ReleaseRef( const SfxPoolItem& rItem, ULONG n = 1);
+    static inline void				SetRefCount( SfxPoolItem& rItem, ULONG n );
+    static inline ULONG				AddRef( const SfxPoolItem& rItem, ULONG n = 1 );
+    static inline ULONG				ReleaseRef( const SfxPoolItem& rItem, ULONG n = 1);
 
 public:
                                     SfxItemPool( const SfxItemPool &rPool,
@@ -172,112 +172,112 @@ public:
 #endif
                                                  FASTBOOL bLoadRefCounts = TRUE );
 protected:
-    virtual                         ~SfxItemPool();
+    virtual 						~SfxItemPool();
 public:
     static void Free(SfxItemPool* pPool);
 
-    SfxBroadcaster&                 BC();
+    SfxBroadcaster&					BC();
 
-    void                            SetPoolDefaultItem( const SfxPoolItem& );
-    const SfxPoolItem*              GetPoolDefaultItem( USHORT nWhich ) const;
+    void							SetPoolDefaultItem( const SfxPoolItem& );
+    const SfxPoolItem*       		GetPoolDefaultItem( USHORT nWhich ) const;
     void                            ResetPoolDefaultItem( USHORT nWhich );
 
     void                            SetDefaults( SfxPoolItem **pDefaults );
-    void                            ReleaseDefaults( BOOL bDelete = FALSE );
-    static void                     ReleaseDefaults( SfxPoolItem **pDefaults, USHORT nCount, BOOL bDelete = FALSE );
+    void							ReleaseDefaults( BOOL bDelete = FALSE );
+    static void 					ReleaseDefaults( SfxPoolItem **pDefaults, USHORT nCount, BOOL bDelete = FALSE );
 
-    virtual SfxMapUnit              GetMetric( USHORT nWhich ) const;
-    void                            SetDefaultMetric( SfxMapUnit eNewMetric );
-    virtual SfxItemPresentation     GetPresentation( const SfxPoolItem& rItem,
+    virtual SfxMapUnit				GetMetric( USHORT nWhich ) const;
+    void							SetDefaultMetric( SfxMapUnit eNewMetric );
+    virtual SfxItemPresentation		GetPresentation( const SfxPoolItem&	rItem,
                                         SfxItemPresentation ePresentation,
-                                        SfxMapUnit          ePresentationMetric,
-                                        XubString&              rText,
+                                        SfxMapUnit 			ePresentationMetric,
+                                        XubString&				rText,
                                         const IntlWrapper * pIntlWrapper
                                          = 0 ) const;
-    virtual SfxItemPool*            Clone() const;
-    UniString const &               GetName() const { return aName; }
+    virtual SfxItemPool*			Clone() const;
+    UniString const &				GetName() const { return aName; }
 
-    virtual const SfxPoolItem&      Put( const SfxPoolItem&, USHORT nWhich = 0 );
-    virtual void                    Remove( const SfxPoolItem& );
-    virtual const SfxPoolItem&      GetDefaultItem( USHORT nWhich ) const;
+    virtual const SfxPoolItem&		Put( const SfxPoolItem&, USHORT nWhich = 0 );
+    virtual void					Remove( const SfxPoolItem& );
+    virtual const SfxPoolItem&		GetDefaultItem( USHORT nWhich ) const;
 
-    const SfxPoolItem*              LoadItem( SvStream &rStream,
+    const SfxPoolItem*				LoadItem( SvStream &rStream,
                                               FASTBOOL bDirect = FALSE,
                                               const SfxItemPool *pRefPool = 0 );
-    FASTBOOL                        StoreItem( SvStream &rStream,
+    FASTBOOL						StoreItem( SvStream &rStream,
                                                const SfxPoolItem &rItem,
                                                FASTBOOL bDirect = FALSE ) const;
 
-    USHORT                          GetSurrogate(const SfxPoolItem *) const;
-    const SfxPoolItem *             GetItem(USHORT nWhich, USHORT nSurrogate) const;
-    USHORT                          GetItemCount(USHORT nWhich) const;
-    const SfxPoolItem*              LoadSurrogate(SvStream& rStream,
+    USHORT							GetSurrogate(const SfxPoolItem *) const;
+    const SfxPoolItem *				GetItem(USHORT nWhich, USHORT nSurrogate) const;
+    USHORT							GetItemCount(USHORT nWhich) const;
+    const SfxPoolItem*				LoadSurrogate(SvStream& rStream,
                                             USHORT &rWhich, USHORT nSlotId,
                                             const SfxItemPool* pRefPool = 0 );
-    FASTBOOL                        StoreSurrogate(SvStream& rStream,
+    FASTBOOL						StoreSurrogate(SvStream& rStream,
                                             const SfxPoolItem *pItem ) const;
 
-    virtual SvStream &              Load(SvStream &);
-    virtual SvStream &              Store(SvStream &) const;
-    int                             HasPersistentRefCounts() const {
+    virtual SvStream &				Load(SvStream &);
+    virtual SvStream &				Store(SvStream &) const;
+    int 							HasPersistentRefCounts() const {
                                         return bPersistentRefCounts; }
-    void                            LoadCompleted();
+    void							LoadCompleted();
 
-    USHORT                          GetFirstWhich() const { return nStart; }
-    USHORT                          GetLastWhich() const { return nEnd; }
-    FASTBOOL                        IsInRange( USHORT nWhich ) const {
+    USHORT							GetFirstWhich() const { return nStart; }
+    USHORT							GetLastWhich() const { return nEnd; }
+    FASTBOOL						IsInRange( USHORT nWhich ) const {
                                         return nWhich >= nStart &&
                                                nWhich <= nEnd; }
-    FASTBOOL                        IsInVersionsRange( USHORT nWhich ) const;
-    FASTBOOL                        IsInStoringRange( USHORT nWhich ) const;
-    void                            SetStoringRange( USHORT nFrom, USHORT nTo );
-    void                            SetSecondaryPool( SfxItemPool *pPool );
-    SfxItemPool*                    GetSecondaryPool() const {
+    FASTBOOL						IsInVersionsRange( USHORT nWhich ) const;
+    FASTBOOL						IsInStoringRange( USHORT nWhich ) const;
+    void                			SetStoringRange( USHORT nFrom, USHORT nTo );
+    void							SetSecondaryPool( SfxItemPool *pPool );
+    SfxItemPool*					GetSecondaryPool() const {
                                         return pSecondary; }
-    SfxItemPool*                    GetMasterPool() const {
+    SfxItemPool*					GetMasterPool() const {
                                         return pMaster; }
-    void                            FreezeIdRanges();
+    void							FreezeIdRanges();
 
-    void                            Cleanup();
-    void                            Delete();
+    void							Cleanup();
+    void							Delete();
 
 #ifdef TF_POOLABLE
-    FASTBOOL                        IsItemFlag( USHORT nWhich, USHORT nFlag ) const;
+    FASTBOOL						IsItemFlag( USHORT nWhich, USHORT nFlag ) const;
     FASTBOOL                        IsItemFlag( const SfxPoolItem &rItem, USHORT nFlag ) const
                                     { return IsItemFlag( rItem.Which(), nFlag ); }
     void                            SetItemInfos( const SfxItemInfo *pInfos )
                                     { pItemInfos = pInfos; }
 #else
-    int                             HasMap() const { return 0 != pSlotIds; }
+    int 							HasMap() const { return 0 != pSlotIds; }
     void                            SetMap( USHORT *pNewSlotIds )
                                     { pSlotIds = pNewSlotIds; }
 #endif
     USHORT                          GetWhich( USHORT nSlot, BOOL bDeep = TRUE ) const;
-    USHORT                          GetSlotId( USHORT nWhich, BOOL bDeep = TRUE ) const;
-    USHORT                          GetTrueWhich( USHORT nSlot, BOOL bDeep = TRUE ) const;
-    USHORT                          GetTrueSlotId( USHORT nWhich, BOOL bDeep = TRUE ) const;
+    USHORT							GetSlotId( USHORT nWhich, BOOL bDeep = TRUE ) const;
+    USHORT							GetTrueWhich( USHORT nSlot, BOOL bDeep = TRUE ) const;
+    USHORT							GetTrueSlotId( USHORT nWhich, BOOL bDeep = TRUE ) const;
 
-    void                            SetVersionMap( USHORT nVer,
+    void							SetVersionMap( USHORT nVer,
                                                    USHORT nOldStart, USHORT nOldEnd,
                                                    USHORT *pWhichIdTab );
-    USHORT                          GetNewWhich( USHORT nOldWhich ) const;
-    USHORT                          GetVersion() const;
-    USHORT                          GetFileFormatVersion() const
+    USHORT							GetNewWhich( USHORT nOldWhich ) const;
+    USHORT							GetVersion() const;
+    USHORT							GetFileFormatVersion() const
                                     { return _nFileFormatVersion; }
-    void                            SetFileFormatVersion( USHORT nFileFormatVersion );
-    USHORT                          GetLoadingVersion() const;
-    FASTBOOL                        IsCurrentVersionLoading() const;
+    void    						SetFileFormatVersion( USHORT nFileFormatVersion );
+    USHORT							GetLoadingVersion() const;
+    FASTBOOL						IsCurrentVersionLoading() const;
 
-    static int                      IsWhich(USHORT nId) {
+    static int						IsWhich(USHORT nId) {
                                         return nId && nId <= SFX_WHICH_MAX; }
-    static int                      IsSlot(USHORT nId) {
+    static int						IsSlot(USHORT nId) {
                                         return nId && nId > SFX_WHICH_MAX; }
 
-    static const SfxItemPool*       GetStoringPool();
+    static const SfxItemPool* 		GetStoringPool();
     static void                     SetStoringPool( const SfxItemPool * );
 
 private:
-    const SfxItemPool&              operator=(const SfxItemPool &);   // n.i.!!
+    const SfxItemPool&				operator=(const SfxItemPool &);   // n.i.!!
 };
 
 // --------------- Inline Implementierungen ------------------------------
diff --git a/svl/inc/svl/itemprop.hxx b/svl/inc/svl/itemprop.hxx
index 3a993b47ed47..ddea63d18a76 100644
--- a/svl/inc/svl/itemprop.hxx
+++ b/svl/inc/svl/itemprop.hxx
@@ -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
@@ -65,13 +65,13 @@ struct SfxItemPropertySimpleEntry
         nFlags( 0 ),
         nMemberId( 0 ){}
 
-    SfxItemPropertySimpleEntry(USHORT _nWID, const com::sun::star::uno::Type* _pType,
+    SfxItemPropertySimpleEntry(USHORT _nWID, const com::sun::star::uno::Type* _pType, 
                                long _nFlags, BYTE _nMemberId) :
         nWID(      _nWID ),
         pType(     _pType ),
         nFlags(    _nFlags ),
         nMemberId( _nMemberId ){}
-
+    
     SfxItemPropertySimpleEntry( const SfxItemPropertyMapEntry* pMapEntry ) :
         nWID(      pMapEntry->nWID ),
         pType(     pMapEntry->pType ),
@@ -86,20 +86,20 @@ struct SfxItemPropertyNamedEntry : public SfxItemPropertySimpleEntry
         SfxItemPropertySimpleEntry( rSimpleEntry ),
         sName( rName ){}
 
-};
+};    
 typedef std::vector< SfxItemPropertyNamedEntry > PropertyEntryVector_t;
 class SfxItemPropertyMap_Impl;
 class SVL_DLLPUBLIC SfxItemPropertyMap
 {
     SfxItemPropertyMap_Impl* m_pImpl;
-public:
+public: 
     SfxItemPropertyMap( const SfxItemPropertyMapEntry* pEntries );
     SfxItemPropertyMap( const SfxItemPropertyMap* pSource );
     ~SfxItemPropertyMap();
-
+        
     const SfxItemPropertySimpleEntry*  getByName( const ::rtl::OUString &rName ) const;
     com::sun::star::uno::Sequence< com::sun::star::beans::Property > getProperties() const;
-    com::sun::star::beans::Property getPropertyByName( const ::rtl::OUString rName ) const
+    com::sun::star::beans::Property getPropertyByName( const ::rtl::OUString rName ) const 
         throw( ::com::sun::star::beans::UnknownPropertyException );
     sal_Bool hasPropertyByName( const ::rtl::OUString& rName ) const;
 
@@ -107,7 +107,7 @@ public:
     PropertyEntryVector_t getPropertyEntries() const;
     sal_uInt32 getSize() const;
 
-};
+};    
 /* -----------------------------21.02.00 11:19--------------------------------
 
  ---------------------------------------------------------------------------*/
@@ -116,7 +116,7 @@ class SVL_DLLPUBLIC SfxItemPropertySet
     SfxItemPropertyMap                                                              m_aMap;
     mutable com::sun::star::uno::Reference<com::sun::star::beans::XPropertySetInfo> m_xInfo;
 protected:
-    virtual BOOL            FillItem(SfxItemSet& rSet, USHORT nWhich, BOOL bGetProperty) const;
+    virtual BOOL			FillItem(SfxItemSet& rSet, USHORT nWhich, BOOL bGetProperty) const;
 
 public:
                             SfxItemPropertySet( const SfxItemPropertyMapEntry *pMap ) :
@@ -142,7 +142,7 @@ public:
                                           SfxItemSet& rSet ) const
                                           throw(::com::sun::star::uno::RuntimeException,
                                                   com::sun::star::lang::IllegalArgumentException);
-    void                    setPropertyValue( const ::rtl::OUString& rPropertyName,
+    void					setPropertyValue( const ::rtl::OUString& rPropertyName,
                                             const com::sun::star::uno::Any& aVal,
                                             SfxItemSet& rSet ) const
                                             throw(::com::sun::star::uno::RuntimeException,
diff --git a/svl/inc/svl/itemset.hxx b/svl/inc/svl/itemset.hxx
index 30c4cc411fad..2eb75191cee8 100644
--- a/svl/inc/svl/itemset.hxx
+++ b/svl/inc/svl/itemset.hxx
@@ -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
@@ -32,7 +32,7 @@
 #if STLPORT_VERSION<321
 #include <stdarg.h>
 #else
-#include <cstdarg>  // std::va_list and friends
+#include <cstdarg> 	// std::va_list and friends
 #endif
 #include <svl/poolitem.hxx>
 #include <tools/rtti.hxx>
@@ -51,8 +51,8 @@ typedef SfxPoolItem const** SfxItemArray;
 #ifdef DBG_UTILx
 #define DBG(s) s
 #define _pChildCount(THIS)  (  *(USHORT**)SfxPointerServer::GetServer()->GetPointer(THIS) )
-#define _pChildCountCtor    ( (*(USHORT**)SfxPointerServer::GetServer()->CreatePointer(this)) = new USHORT )
-#define _pChildCountDtor    ( SfxPointerServer::GetServer()->ReleasePointer(this) )
+#define _pChildCountCtor	( (*(USHORT**)SfxPointerServer::GetServer()->CreatePointer(this)) = new USHORT )
+#define _pChildCountDtor	( SfxPointerServer::GetServer()->ReleasePointer(this) )
 #else
 #define DBG(s)
 #endif
@@ -76,7 +76,7 @@ class SVL_DLLPUBLIC SfxItemSet
 {
     friend class SfxItemIter;
 
-    SfxItemPool*                _pPool;         // der verwendete Pool
+    SfxItemPool*				_pPool; 		// der verwendete Pool
     const SfxItemSet*           _pParent;       // Ableitung
     SfxItemArray                _aItems;        // Item-Feld
     USHORT*                     _pWhichRanges;  // Array von Which-Bereichen
@@ -90,25 +90,25 @@ friend class SfxAllItemSet;
 friend const char *DbgCheckItemSet( const void* );
 
 private:
-    SVL_DLLPRIVATE void                     InitRanges_Impl(const USHORT *nWhichPairTable);
-    SVL_DLLPRIVATE void                     InitRanges_Impl(va_list pWhich, USHORT n1, USHORT n2, USHORT n3);
-    SVL_DLLPRIVATE void                     InitRanges_Impl(USHORT nWh1, USHORT nWh2);
+    SVL_DLLPRIVATE void						InitRanges_Impl(const USHORT *nWhichPairTable);
+    SVL_DLLPRIVATE void						InitRanges_Impl(va_list pWhich, USHORT n1, USHORT n2, USHORT n3);
+    SVL_DLLPRIVATE void						InitRanges_Impl(USHORT nWh1, USHORT nWh2);
 
 public:
-    SfxItemArray                GetItems_Impl() const { return _aItems; }
+    SfxItemArray				GetItems_Impl() const { return _aItems; }
 
 #endif
     //---------------------------------------------------------------------
 
 private:
-    const SfxItemSet&           operator=(const SfxItemSet &);   // n.i.!!
+    const SfxItemSet&			operator=(const SfxItemSet &);	 // n.i.!!
 
 protected:
     // Notification-Callback
-    virtual void                Changed( const SfxPoolItem& rOld, const SfxPoolItem& rNew );
+    virtual void				Changed( const SfxPoolItem& rOld, const SfxPoolItem& rNew );
 
     // direkte Put-Methode
-    int                         PutDirect(const SfxPoolItem &rItem);
+    int 						PutDirect(const SfxPoolItem &rItem);
 
 public:
                                 SfxItemSet( const SfxItemSet& );
@@ -119,58 +119,58 @@ public:
                                 SfxItemSet( SfxItemPool&, const USHORT* nWhichPairTable );
     virtual                     ~SfxItemSet();
 
-    virtual SfxItemSet *        Clone(BOOL bItems = TRUE, SfxItemPool *pToPool = 0) const;
+    virtual SfxItemSet *		Clone(BOOL bItems = TRUE, SfxItemPool *pToPool = 0) const;
 
     // Items erfragen
-    USHORT                      Count() const { return _nCount; }
-    USHORT                      TotalCount() const;
+    USHORT						Count() const { return _nCount; }
+    USHORT						TotalCount() const;
 
-    virtual const SfxPoolItem&  Get( USHORT nWhich, BOOL bSrchInParent = TRUE ) const;
-    const SfxPoolItem*          GetItem( USHORT nWhich, BOOL bSrchInParent = TRUE,
+    virtual	const SfxPoolItem&	Get( USHORT nWhich, BOOL bSrchInParent = TRUE ) const;
+    const SfxPoolItem*  		GetItem( USHORT nWhich, BOOL bSrchInParent = TRUE,
                                          TypeId aItemType = 0 ) const;
 
     // Which-Wert des Items an der Position nPos erfragen
-    USHORT                      GetWhichByPos(USHORT nPos) const;
+    USHORT						GetWhichByPos(USHORT nPos) const;
 
     // Item-Status erfragen
-    SfxItemState                GetItemState(   USHORT nWhich,
+    SfxItemState				GetItemState(	USHORT nWhich,
                                                 BOOL bSrchInParent = TRUE,
                                                 const SfxPoolItem **ppItem = 0 ) const;
 
-    virtual void                DisableItem(USHORT nWhich);
-    virtual void                InvalidateItem( USHORT nWhich );
+    virtual void				DisableItem(USHORT nWhich);
+    virtual void				InvalidateItem( USHORT nWhich );
     virtual USHORT              ClearItem( USHORT nWhich = 0);
-    virtual void                ClearInvalidItems( BOOL bHardDefault = FALSE );
-            void                InvalidateAllItems(); HACK(via nWhich = 0)
+    virtual void				ClearInvalidItems( BOOL bHardDefault = FALSE );
+            void 				InvalidateAllItems(); HACK(via nWhich = 0)
 
-    inline void                 SetParent( const SfxItemSet* pNew );
+    inline void 				SetParent( const SfxItemSet* pNew );
 
     // Items hinzufuegen, loeschen etc.
-    virtual const SfxPoolItem*  Put( const SfxPoolItem&, USHORT nWhich );
-    const SfxPoolItem*          Put( const SfxPoolItem& rItem )
+    virtual const SfxPoolItem*	Put( const SfxPoolItem&, USHORT nWhich );
+    const SfxPoolItem*			Put( const SfxPoolItem& rItem )
                                 { return Put(rItem, rItem.Which()); }
-    virtual int                 Put( const SfxItemSet&,
+    virtual int 				Put( const SfxItemSet&,
                                      BOOL bInvalidAsDefault = TRUE );
-    void                        PutExtended( const SfxItemSet&,
+    void						PutExtended( const SfxItemSet&,
                                              SfxItemState eDontCareAs = SFX_ITEM_UNKNOWN,
                                              SfxItemState eDefaultAs = SFX_ITEM_UNKNOWN );
 
-    virtual int                 Set( const SfxItemSet&, BOOL bDeep = TRUE );
+    virtual int 				Set( const SfxItemSet&, BOOL bDeep = TRUE );
 
-    virtual void                Intersect( const SfxItemSet& rSet );
-    virtual void                MergeValues( const SfxItemSet& rSet, BOOL bOverwriteDefaults = FALSE );
-    virtual void                Differentiate( const SfxItemSet& rSet );
-    virtual void                MergeValue( const SfxPoolItem& rItem, BOOL bOverwriteDefaults = FALSE  );
+    virtual void				Intersect( const SfxItemSet& rSet );
+    virtual void				MergeValues( const SfxItemSet& rSet, BOOL bOverwriteDefaults = FALSE );
+    virtual void				Differentiate( const SfxItemSet& rSet );
+    virtual void				MergeValue( const SfxPoolItem& rItem, BOOL bOverwriteDefaults = FALSE  );
 
-    SfxItemPool*                GetPool() const { return _pPool; }
-    const USHORT*               GetRanges() const { return _pWhichRanges; }
-    void                        SetRanges( const USHORT *pRanges );
-    void                        MergeRange( USHORT nFrom, USHORT nTo );
-    const SfxItemSet*           GetParent() const { return _pParent; }
+    SfxItemPool*				GetPool() const { return _pPool; }
+    const USHORT*				GetRanges() const { return _pWhichRanges; }
+    void						SetRanges( const USHORT *pRanges );
+    void						MergeRange( USHORT nFrom, USHORT nTo );
+    const SfxItemSet*			GetParent() const { return _pParent; }
 
-    virtual SvStream &          Load( SvStream &, FASTBOOL bDirect = FALSE,
+    virtual SvStream &			Load( SvStream &, FASTBOOL bDirect = FALSE,
                                       const SfxItemPool *pRefPool = 0 );
-    virtual SvStream &          Store( SvStream &, FASTBOOL bDirect = FALSE ) const;
+    virtual SvStream &			Store( SvStream &, FASTBOOL bDirect = FALSE ) const;
 
     virtual int                 operator==(const SfxItemSet &) const;
 };
@@ -193,19 +193,19 @@ class SVL_DLLPUBLIC SfxAllItemSet: public SfxItemSet
 */
 
 {
-    SfxVoidItem                 aDefault;
-    USHORT                      nFree;
+    SfxVoidItem 				aDefault;
+    USHORT 						nFree;
 
 public:
                                 SfxAllItemSet( SfxItemPool &rPool );
                                 SfxAllItemSet( const SfxItemSet & );
                                 SfxAllItemSet( const SfxAllItemSet & );
 
-    virtual SfxItemSet *        Clone( BOOL bItems = TRUE, SfxItemPool *pToPool = 0 ) const;
-    virtual const SfxPoolItem*  Put( const SfxPoolItem&, USHORT nWhich );
-    const SfxPoolItem*          Put( const SfxPoolItem& rItem )
+    virtual SfxItemSet *		Clone( BOOL bItems = TRUE, SfxItemPool *pToPool = 0 ) const;
+    virtual const SfxPoolItem*	Put( const SfxPoolItem&, USHORT nWhich );
+    const SfxPoolItem*	        Put( const SfxPoolItem& rItem )
     { return Put(rItem, rItem.Which()); }
-    virtual int                 Put( const SfxItemSet&,
+    virtual int 				Put( const SfxItemSet&,
                                      BOOL bInvalidAsDefault = TRUE );
 };
 
diff --git a/svl/inc/svl/languageoptions.hxx b/svl/inc/svl/languageoptions.hxx
index 198455f423b3..b099ca819794 100644
--- a/svl/inc/svl/languageoptions.hxx
+++ b/svl/inc/svl/languageoptions.hxx
@@ -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
@@ -38,9 +38,9 @@
 // class SvtLanguageOptions ----------------------------------------------------
 
 // these defines can be ored
-#define SCRIPTTYPE_LATIN        0x01
-#define SCRIPTTYPE_ASIAN        0x02
-#define SCRIPTTYPE_COMPLEX      0x04
+#define SCRIPTTYPE_LATIN		0x01
+#define SCRIPTTYPE_ASIAN		0x02
+#define SCRIPTTYPE_COMPLEX		0x04
 
 class SvtCJKOptions;
 class SvtCTLOptions;
@@ -48,8 +48,8 @@ class SvtCTLOptions;
 class SVL_DLLPUBLIC SvtLanguageOptions : public ::utl::detail::Options
 {
 private:
-    SvtCJKOptions*  m_pCJKOptions;
-    SvtCTLOptions*  m_pCTLOptions;
+    SvtCJKOptions*	m_pCJKOptions;
+    SvtCTLOptions*	m_pCTLOptions;
 
 public:
     enum EOption
@@ -77,21 +77,21 @@ public:
     ~SvtLanguageOptions();
 
     // CJK options
-    sal_Bool    IsCJKFontEnabled() const;
-    sal_Bool    IsVerticalTextEnabled() const;
-    sal_Bool    IsAsianTypographyEnabled() const;
-    sal_Bool    IsJapaneseFindEnabled() const;
-    sal_Bool    IsRubyEnabled() const;
-    sal_Bool    IsChangeCaseMapEnabled() const;
-    sal_Bool    IsDoubleLinesEnabled() const;
-    sal_Bool    IsEmphasisMarksEnabled() const;
-    sal_Bool    IsVerticalCallOutEnabled() const;
+    sal_Bool	IsCJKFontEnabled() const;
+    sal_Bool	IsVerticalTextEnabled() const;
+    sal_Bool	IsAsianTypographyEnabled() const;
+    sal_Bool	IsJapaneseFindEnabled() const;
+    sal_Bool	IsRubyEnabled() const;
+    sal_Bool	IsChangeCaseMapEnabled() const;
+    sal_Bool	IsDoubleLinesEnabled() const;
+    sal_Bool	IsEmphasisMarksEnabled() const;
+    sal_Bool	IsVerticalCallOutEnabled() const;
     void        SetAll( sal_Bool _bSet );
     sal_Bool    IsAnyEnabled() const;
 
     // CTL options
     void        SetCTLFontEnabled( sal_Bool _bEnabled );
-    sal_Bool    IsCTLFontEnabled() const;
+    sal_Bool	IsCTLFontEnabled() const;
 
     void        SetCTLSequenceChecking( sal_Bool _bEnabled );
     sal_Bool    IsCTLSequenceChecking() const;
@@ -119,7 +119,7 @@ public:
     ~SvtSystemLanguageOptions();
 
     virtual void    Commit();
-    virtual void    Notify( const com::sun::star::uno::Sequence< rtl::OUString >& rPropertyNames );
+    virtual void 	Notify( const com::sun::star::uno::Sequence< rtl::OUString >& rPropertyNames );
 
     LanguageType GetWin16SystemLanguage();
 };
diff --git a/svl/inc/svl/lckbitem.hxx b/svl/inc/svl/lckbitem.hxx
index 2204a57c17d4..d2246cbfb1fb 100644
--- a/svl/inc/svl/lckbitem.hxx
+++ b/svl/inc/svl/lckbitem.hxx
@@ -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
@@ -37,7 +37,7 @@
 
 class SVL_DLLPUBLIC SfxLockBytesItem : public SfxPoolItem
 {
-    SvLockBytesRef          _xVal;
+    SvLockBytesRef			_xVal;
 
 public:
                             TYPEINFO();
@@ -48,16 +48,16 @@ public:
                             SfxLockBytesItem( const SfxLockBytesItem& );
                             ~SfxLockBytesItem();
 
-    virtual int             operator==( const SfxPoolItem& ) const;
-    virtual SfxPoolItem*    Clone( SfxItemPool *pPool = 0 ) const;
-    virtual SfxPoolItem*    Create(SvStream &, USHORT nItemVersion) const;
-    virtual SvStream&       Store(SvStream &, USHORT nItemVersion ) const;
+    virtual int 			operator==( const SfxPoolItem& ) const;
+    virtual SfxPoolItem*	Clone( SfxItemPool *pPool = 0 ) const;
+    virtual SfxPoolItem*	Create(SvStream &, USHORT nItemVersion) const;
+    virtual SvStream&		Store(SvStream &, USHORT nItemVersion ) const;
 
-    SvLockBytes*            GetValue() const { return _xVal; }
+    SvLockBytes*			GetValue() const { return _xVal; }
 
-    virtual BOOL            PutValue  ( const com::sun::star::uno::Any& rVal,
+    virtual	BOOL 			PutValue  ( const com::sun::star::uno::Any& rVal,
                                         BYTE nMemberId = 0 );
-    virtual BOOL            QueryValue( com::sun::star::uno::Any& rVal,
+    virtual	BOOL 			QueryValue( com::sun::star::uno::Any& rVal,
                                         BYTE nMemberId = 0 ) const;
 };
 
diff --git a/svl/inc/svl/lockfilecommon.hxx b/svl/inc/svl/lockfilecommon.hxx
index 03cffa90efd5..257566a25327 100644
--- a/svl/inc/svl/lockfilecommon.hxx
+++ b/svl/inc/svl/lockfilecommon.hxx
@@ -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
@@ -45,7 +45,7 @@
 #define LOCKFILE_LOCALHOST_ID     2
 #define LOCKFILE_EDITTIME_ID      3
 #define LOCKFILE_USERURL_ID       4
-#define LOCKFILE_ENTRYSIZE        5
+#define LOCKFILE_ENTRYSIZE        5 
 
 namespace svt {
 
diff --git a/svl/inc/svl/lstner.hxx b/svl/inc/svl/lstner.hxx
index bc95573228f5..4feaaf02db72 100644
--- a/svl/inc/svl/lstner.hxx
+++ b/svl/inc/svl/lstner.hxx
@@ -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
@@ -48,27 +48,27 @@ class SVL_DLLPUBLIC SfxListener
     SfxBroadcasterArr_Impl aBCs;
 
 private:
-    const SfxListener&  operator=(const SfxListener &); // n.i., ist verboten
+    const SfxListener&	operator=(const SfxListener &); // n.i., ist verboten
 
 public:
     TYPEINFO();
 
                         SfxListener();
                         SfxListener( const SfxListener &rCopy );
-    virtual             ~SfxListener();
+    virtual 			~SfxListener();
 
-    BOOL                StartListening( SfxBroadcaster& rBroadcaster, BOOL bPreventDups = FALSE );
-    BOOL                EndListening( SfxBroadcaster& rBroadcaster, BOOL bAllDups = FALSE );
-    void                EndListening( USHORT nNo );
-    void                EndListeningAll();
-    BOOL                IsListening( SfxBroadcaster& rBroadcaster ) const;
+    BOOL				StartListening( SfxBroadcaster& rBroadcaster, BOOL bPreventDups = FALSE );
+    BOOL				EndListening( SfxBroadcaster& rBroadcaster, BOOL bAllDups = FALSE );
+    void				EndListening( USHORT nNo );
+    void				EndListeningAll();
+    BOOL				IsListening( SfxBroadcaster& rBroadcaster ) const;
 
-    USHORT              GetBroadcasterCount() const
+    USHORT				GetBroadcasterCount() const
                         { return aBCs.Count(); }
-    SfxBroadcaster*     GetBroadcasterJOE( USHORT nNo ) const
+    SfxBroadcaster* 	GetBroadcasterJOE( USHORT nNo ) const
                         { return (SfxBroadcaster*) aBCs.GetObject(nNo); }
 
-    virtual void        Notify( SfxBroadcaster& rBC, const SfxHint& rHint );
+    virtual void		Notify( SfxBroadcaster& rBC, const SfxHint& rHint );
 
 #ifndef _NOTIFY_HXX
     void RemoveBroadcaster_Impl( SfxBroadcaster& rBC );
diff --git a/svl/inc/svl/macitem.hxx b/svl/inc/svl/macitem.hxx
index 48bc55cd1aa0..e7f681133cb7 100644
--- a/svl/inc/svl/macitem.hxx
+++ b/svl/inc/svl/macitem.hxx
@@ -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
@@ -85,15 +85,15 @@ public:
                 ScriptType eType); //  = STARBASIC entfernt
 
     SvxMacro( SjJSbxObjectBase* _pFunctionObject, const String &rSource );
-    ~SvxMacro();    // noetig fuer pFunctionObject
+    ~SvxMacro();	// noetig fuer pFunctionObject
 
-    const String &GetLibName() const        { return aLibName; }
-    const String &GetMacName() const        { return aMacName; }
+    const String &GetLibName() const 		{ return aLibName; }
+    const String &GetMacName() const 		{ return aMacName; }
     String GetLanguage()const;
 
-    ScriptType GetScriptType() const        { return eType; }
+    ScriptType GetScriptType() const 		{ return eType; }
 
-    BOOL HasMacro() const           { return aMacName.Len() ? TRUE : FALSE; }
+    BOOL HasMacro() const 			{ return aMacName.Len() ? TRUE : FALSE; }
 
 #ifdef SOLAR_JAVA
     // JavaScript-Function-Objekt holen
@@ -117,10 +117,10 @@ inline SvxMacro::SvxMacro( SjJSbxObjectBase* _pFunctionObject, const String &rSo
 
 DECLARE_TABLE( _SvxMacroTableDtor, SvxMacro* )
 
-#define SVX_MACROTBL_VERSION31  0
-#define SVX_MACROTBL_VERSION40  1
+#define SVX_MACROTBL_VERSION31	0
+#define SVX_MACROTBL_VERSION40	1
 
-#define SVX_MACROTBL_AKTVERSION SVX_MACROTBL_VERSION40
+#define SVX_MACROTBL_AKTVERSION	SVX_MACROTBL_VERSION40
 
 class SVL_DLLPUBLIC SvxMacroTableDtor : public _SvxMacroTableDtor
 {
@@ -133,10 +133,10 @@ public:
     // loescht alle Eintraege
     void DelDtor();
 
-    SvStream&   Read( SvStream &, USHORT nVersion = SVX_MACROTBL_AKTVERSION );
-    SvStream&   Write( SvStream & ) const;
+    SvStream&	Read( SvStream &, USHORT nVersion = SVX_MACROTBL_AKTVERSION );
+    SvStream&	Write( SvStream & ) const;
 
-    USHORT GetVersion() const       { return SVX_MACROTBL_AKTVERSION; }
+    USHORT GetVersion() const		{ return SVX_MACROTBL_AKTVERSION; }
 };
 
 inline SvxMacroTableDtor::SvxMacroTableDtor( const USHORT nInitSz,
@@ -165,8 +165,8 @@ public:
                                     const IntlWrapper * = 0 ) const;
     virtual SfxPoolItem*    Clone( SfxItemPool *pPool = 0 ) const;
     virtual SfxPoolItem*    Create(SvStream &, USHORT) const;
-    virtual SvStream&       Store(SvStream &, USHORT nItemVersion ) const;
-    virtual USHORT          GetVersion( USHORT nFileFormatVersion ) const;
+    virtual SvStream&		Store(SvStream &, USHORT nItemVersion ) const;
+    virtual USHORT			GetVersion( USHORT nFileFormatVersion ) const;
 
     inline const SvxMacroTableDtor& GetMacroTable() const { return aMacroTable;}
     inline void SetMacroTable( const SvxMacroTableDtor& rTbl ) { aMacroTable = rTbl; }
diff --git a/svl/inc/svl/mailenum.hxx b/svl/inc/svl/mailenum.hxx
index e25fd2cfdcd2..3e328ebdbf93 100644
--- a/svl/inc/svl/mailenum.hxx
+++ b/svl/inc/svl/mailenum.hxx
@@ -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
@@ -74,21 +74,21 @@ enum MailReceiverRole
 
 enum MailAction
 {
-    MAIL_ACTION_DYING,      // Server stirbt
-    MAIL_ACTION_SEND,       // Mail wurde versendet
-    MAIL_ACTION_READ,       // Mail wurde als gelesen gekennzeichnet
-    MAIL_ACTION_REMOVED,    // Mail wurde gel"oscht
-    MAIL_ACTION_UPDATED,    // alle Mails wurden neu eingelesen
-    MAIL_ACTION_NEXT,       // Sprung zur n"achsten Mail
+    MAIL_ACTION_DYING,		// Server stirbt
+    MAIL_ACTION_SEND,		// Mail wurde versendet
+    MAIL_ACTION_READ,		// Mail wurde als gelesen gekennzeichnet
+    MAIL_ACTION_REMOVED,	// Mail wurde gel"oscht
+    MAIL_ACTION_UPDATED,	// alle Mails wurden neu eingelesen
+    MAIL_ACTION_NEXT,		// Sprung zur n"achsten Mail
     MAIL_ACTION_PREV        // Sprung zur vorherigen Mail
 };
 
 // Textformat zum Versenden von Nachrichten ------------------------------
 
-#define TXTFORMAT_ASCII     ((BYTE)0x01)
-#define TXTFORMAT_HTML      ((BYTE)0x02)
-#define TXTFORMAT_RTF       ((BYTE)0x04)
-#define TXTFORMAT_OFFICE    ((BYTE)0x08)
+#define TXTFORMAT_ASCII		((BYTE)0x01)
+#define TXTFORMAT_HTML		((BYTE)0x02)
+#define TXTFORMAT_RTF		((BYTE)0x04)
+#define TXTFORMAT_OFFICE	((BYTE)0x08)
 
 
 #endif
diff --git a/svl/inc/svl/memberid.hrc b/svl/inc/svl/memberid.hrc
index 9f5edeae9ebb..8ff0d914fc99 100644
--- a/svl/inc/svl/memberid.hrc
+++ b/svl/inc/svl/memberid.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
@@ -28,11 +28,11 @@
 #ifndef _MEMBERID_HRC
 #define _MEMBERID_HRC
 
-#define SFX_MEMBERID(nUserData) ( ( (nUserData) >> 20 ) & 0xFF )
-#define SFX_SLOTID(nUserData)   ( (nUserData) & 0xFFFF )
+#define SFX_MEMBERID(nUserData)	( ( (nUserData) >> 20 ) & 0xFF )
+#define SFX_SLOTID(nUserData)	( (nUserData) & 0xFFFF )
 
-#define MID_X       1
-#define MID_Y       2
+#define MID_X		1
+#define MID_Y		2
 #define MID_RECT_LEFT    3
 #define MID_RECT_TOP     4
 #define MID_WIDTH   5
@@ -62,7 +62,7 @@
 #define MID_SEARCH_DELETEDCHARS         15
 #define MID_SEARCH_INSERTEDCHARS        16
 #define MID_SEARCH_TRANSLITERATEFLAGS   17
-#define MID_SEARCH_COMMAND              18
+#define MID_SEARCH_COMMAND          	18
 
 
 #endif
diff --git a/svl/inc/svl/metitem.hxx b/svl/inc/svl/metitem.hxx
index 5e7e792b61e7..3a13fe2e604d 100644
--- a/svl/inc/svl/metitem.hxx
+++ b/svl/inc/svl/metitem.hxx
@@ -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
@@ -44,8 +44,8 @@ public:
                              ~SfxMetricItem() {
                                  DBG_DTOR(SfxMetricItem, 0); }
 
-    virtual int              ScaleMetrics( long lMult, long lDiv );
-    virtual int              HasMetrics() const;
+    virtual int				 ScaleMetrics( long lMult, long lDiv );
+    virtual	int				 HasMetrics() const;
 
 };
 
diff --git a/svl/inc/svl/nfkeytab.hxx b/svl/inc/svl/nfkeytab.hxx
index 7c3fef4b88cc..e6e105a631a9 100644
--- a/svl/inc/svl/nfkeytab.hxx
+++ b/svl/inc/svl/nfkeytab.hxx
@@ -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
diff --git a/svl/inc/svl/nfversi.hxx b/svl/inc/svl/nfversi.hxx
index 3cd8256c90d7..44447b5152e5 100644
--- a/svl/inc/svl/nfversi.hxx
+++ b/svl/inc/svl/nfversi.hxx
@@ -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
@@ -28,35 +28,35 @@
 #ifndef NF_NFVERSI_HXX
 #define NF_NFVERSI_HXX
 
-//      file ID's
+//		file ID's
 
-#define SV_NUMBERFORMATTER_VERSION_SYSTORE      0x0004
-#define SV_NUMBERFORMATTER_VERSION_KEYWORDS     0x0005
-#define SV_NUMBERFORMATTER_VERSION_NEWSTANDARD  0x0006
-#define SV_NUMBERFORMATTER_VERSION_NF_TIME_HH_MMSS00    0x0007
-#define SV_NUMBERFORMATTER_VERSION_NF_DATE_WW   0x0008
-#define SV_NUMBERFORMATTER_VERSION_NEW_CURR     0x0009
-#define SV_NUMBERFORMATTER_VERSION_YEAR2000     0x000a
-#define SV_NUMBERFORMATTER_VERSION_TWODIGITYEAR 0x000b
-#define SV_NUMBERFORMATTER_VERSION_NF_DATETIME_SYS_DDMMYYYY_HHMMSS  0x000c
-#define SV_NUMBERFORMATTER_VERSION_CALENDAR     0x000d
-#define SV_NUMBERFORMATTER_VERSION_ADDITIONAL_I18N_FORMATS  0x000e
+#define SV_NUMBERFORMATTER_VERSION_SYSTORE		0x0004
+#define SV_NUMBERFORMATTER_VERSION_KEYWORDS		0x0005
+#define SV_NUMBERFORMATTER_VERSION_NEWSTANDARD	0x0006
+#define SV_NUMBERFORMATTER_VERSION_NF_TIME_HH_MMSS00	0x0007
+#define SV_NUMBERFORMATTER_VERSION_NF_DATE_WW	0x0008
+#define SV_NUMBERFORMATTER_VERSION_NEW_CURR		0x0009
+#define SV_NUMBERFORMATTER_VERSION_YEAR2000		0x000a
+#define SV_NUMBERFORMATTER_VERSION_TWODIGITYEAR	0x000b
+#define SV_NUMBERFORMATTER_VERSION_NF_DATETIME_SYS_DDMMYYYY_HHMMSS	0x000c
+#define SV_NUMBERFORMATTER_VERSION_CALENDAR		0x000d
+#define SV_NUMBERFORMATTER_VERSION_ADDITIONAL_I18N_FORMATS	0x000e
 
-#define SV_NUMBERFORMATTER_VERSION              0x000e
+#define SV_NUMBERFORMATTER_VERSION				0x000e
 
 // 1 bis 18.01.96
 // 2 ab  19.01.96, TT.MM.JJJJ dazu
 // 3 ab  13.02.96 (nicht emergency) #.##0,00 CCC dazu
 // 4 ab  30.07.97 364i speichern, was SYSTEM wirklich war (vorhandenes
-//                  Dummy-Feld wird benutzt, keine File-Format Aenderung)
+//					Dummy-Feld wird benutzt, keine File-Format Aenderung)
 // 5 ab  07.08.97 nicht-deutsch ist nicht immer englisch
-//                  aeltere nicht-deutsche benutzerdefinierte Formate onLoad
-//                  konvertieren
+//					aeltere nicht-deutsche benutzerdefinierte Formate onLoad
+//					konvertieren
 // 6 ab  17.10.97 neu: Keyword NNN fuer langen Wochentag ohne Separator,
-//                  wird in aelteren Versionen nicht ausgewertet!
-//                  Neue Standard Datumformate, DIN etc.
+//					wird in aelteren Versionen nicht ausgewertet!
+//					Neue Standard Datumformate, DIN etc.
 // 7 ab  25.05.98 StandardFormat [HH]:MM:SS,00 (NF_TIME_HH_MMSS00) fuer
-//                  automatische Eingabe-Erkennung von 100stel Sekunden mit Stunden
+//					automatische Eingabe-Erkennung von 100stel Sekunden mit Stunden
 // 8 ab  19.06.98 StandardFormat WW (NF_DATE_WW) fuer Kalenderwoche
 // 9 ab  17.12.98 neue Waehrungsformate [$DM-xxx]
 // A ab  25.01.99 Year2000 speichern/laden
diff --git a/svl/inc/svl/nranges.hxx b/svl/inc/svl/nranges.hxx
index b04f131d6e89..b61ff4f94cb8 100644
--- a/svl/inc/svl/nranges.hxx
+++ b/svl/inc/svl/nranges.hxx
@@ -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
@@ -35,12 +35,12 @@
 
 #ifndef NUMTYPE
 
-#define NUMTYPE USHORT
+#define NUMTYPE	USHORT
 #define SfxNumRanges SfxUShortRanges
 #include <svl/nranges.hxx>
 
 #undef NUMTYPE
-#define NUMTYPE ULONG
+#define NUMTYPE	ULONG
 #define SfxNumRanges SfxULongRanges
 #include <svl/nranges.hxx>
 
@@ -51,11 +51,11 @@
 
 //========================================================================
 
-#define NUMTYPE_ARG int
+#define NUMTYPE_ARG	int
 
 class SfxNumRanges
 {
-    NUMTYPE*                    _pRanges; // 0-terminated array of NUMTYPE-pairs
+    NUMTYPE*                 	_pRanges; // 0-terminated array of NUMTYPE-pairs
 
 public:
                                 SfxNumRanges() : _pRanges( 0 ) {}
@@ -66,21 +66,21 @@ public:
                                 ~SfxNumRanges()
                                 { delete [] _pRanges; }
 
-    BOOL                        operator == ( const SfxNumRanges & ) const;
-    BOOL                        operator != ( const SfxNumRanges & rRanges ) const
+    BOOL						operator == ( const SfxNumRanges & ) const;
+    BOOL						operator != ( const SfxNumRanges & rRanges ) const
                                 { return !( *this == rRanges ); }
 
-    SfxNumRanges&               operator = ( const SfxNumRanges & );
+    SfxNumRanges&				operator = ( const SfxNumRanges & );
 
-    SfxNumRanges&               operator += ( const SfxNumRanges & );
-    SfxNumRanges&               operator -= ( const SfxNumRanges & );
-    SfxNumRanges&               operator /= ( const SfxNumRanges & );
+    SfxNumRanges&				operator += ( const SfxNumRanges & );
+    SfxNumRanges&				operator -= ( const SfxNumRanges & );
+    SfxNumRanges&				operator /= ( const SfxNumRanges & );
 
-    NUMTYPE                     Count() const;
-    BOOL                        IsEmpty() const
+    NUMTYPE 					Count() const;
+    BOOL						IsEmpty() const
                                 { return !_pRanges || 0 == *_pRanges; }
-    BOOL                        Contains( NUMTYPE n ) const;
-    BOOL                        Intersects( const SfxNumRanges & ) const;
+    BOOL						Contains( NUMTYPE n ) const;
+    BOOL						Intersects( const SfxNumRanges & ) const;
 
                                 operator const NUMTYPE* () const
                                 { return _pRanges; }
diff --git a/svl/inc/svl/ondemand.hxx b/svl/inc/svl/ondemand.hxx
index eedb480857ae..ac6b177dc635 100644
--- a/svl/inc/svl/ondemand.hxx
+++ b/svl/inc/svl/ondemand.hxx
@@ -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
diff --git a/svl/inc/svl/ownlist.hxx b/svl/inc/svl/ownlist.hxx
index 41f6cbff40d1..d15cf6991623 100644
--- a/svl/inc/svl/ownlist.hxx
+++ b/svl/inc/svl/ownlist.hxx
@@ -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
@@ -41,7 +41,7 @@ namespace com { namespace sun { namespace star {
 
 //=========================================================================
 class SvCommand
-/*  [Beschreibung]
+/*	[Beschreibung]
 
     Enth"alt einen String, welcher das Kommando angibt und eine weiteren
     String, der das Argument des Kommandos bildet. W"urde solch ein
@@ -49,8 +49,8 @@ class SvCommand
     aus: Kommando = Argument.
 */
 {
-    String  aCommand;
-    String  aArgument;
+    String	aCommand;
+    String	aArgument;
 public:
                     SvCommand() {}
                     SvCommand( const String & rCommand, const String & rArg )
@@ -77,7 +77,7 @@ public:
 
 //=========================================================================
 class SVL_DLLPUBLIC SvCommandList
-/*  [Beschreibung]
+/*	[Beschreibung]
 
     Die Liste enth"alt Objekte vom Typ SvCommand. Wird ein Objekt
     eingef"ugt, dann wird es kopiert und das neue Objekt wird
@@ -85,9 +85,9 @@ class SVL_DLLPUBLIC SvCommandList
 */
 {
                     PRV_SV_DECL_OWNER_LIST(SvCommandList,SvCommand);
-    SvCommand &     Append( const String & rCommand, const String & rArg );
-    BOOL            AppendCommands( const String & rCmd, USHORT * pEaten );
-    String          GetCommands() const;
+    SvCommand &		Append( const String & rCommand, const String & rArg );
+    BOOL			AppendCommands( const String & rCmd, USHORT * pEaten );
+    String  		GetCommands() const;
 
     BOOL FillFromSequence( const com::sun::star::uno::Sequence < com::sun::star::beans::PropertyValue >& );
     void FillSequence( com::sun::star::uno::Sequence < com::sun::star::beans::PropertyValue >& );
diff --git a/svl/inc/svl/poolitem.hxx b/svl/inc/svl/poolitem.hxx
index c0cf53fb6ded..e371bc50d34b 100644
--- a/svl/inc/svl/poolitem.hxx
+++ b/svl/inc/svl/poolitem.hxx
@@ -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
@@ -59,9 +59,9 @@ namespace com { namespace sun { namespace star { namespace uno { class Any; } }
 
 #define SFX_ITEMS_OLD_MAXREF                0xffef
 #define SFX_ITEMS_MAXREF                    0xfffffffe
-#define SFX_ITEMS_SPECIAL                   0xffffffff
+#define SFX_ITEMS_SPECIAL					0xffffffff
 
-#define CONVERT_TWIPS                       0x80    //Uno-Konvertierung fuer Massangaben (fuer MemberId)
+#define CONVERT_TWIPS 						0x80	//Uno-Konvertierung fuer Massangaben (fuer MemberId)
 
 // -----------------------------------------------------------------------
 
@@ -100,7 +100,7 @@ enum SfxFieldUnit
 {
     SFX_FUNIT_NONE, SFX_FUNIT_MM, SFX_FUNIT_CM, SFX_FUNIT_M, SFX_FUNIT_KM,
     SFX_FUNIT_TWIP, SFX_FUNIT_POINT, SFX_FUNIT_PICA,
-    SFX_FUNIT_INCH, SFX_FUNIT_FOOT, SFX_FUNIT_MILE, SFX_FUNIT_CUSTOM
+    SFX_FUNIT_INCH, SFX_FUNIT_FOOT, SFX_FUNIT_MILE, SFX_FUNIT_CHAR, SFX_FUNIT_LINE, SFX_FUNIT_CUSTOM
 };
 
 enum SfxMapUnit
@@ -144,19 +144,19 @@ enum SfxItemPresentation
 
 typedef USHORT SfxItemState;
 
-#define SFX_ITEM_UNKNOWN    0x0000
+#define	SFX_ITEM_UNKNOWN	0x0000
 
-#define SFX_ITEM_DISABLED   0x0001
-#define SFX_ITEM_READONLY   0x0002
+#define SFX_ITEM_DISABLED	0x0001
+#define SFX_ITEM_READONLY	0x0002
 
 #define SFX_ITEM_DONTCARE   0x0010
-#define SFX_ITEM_DEFAULT    0x0020
-#define SFX_ITEM_SET        0x0030
+#define SFX_ITEM_DEFAULT	0x0020
+#define SFX_ITEM_SET		0x0030
 
 // old stuff - dont use!!!
-#define SFX_ITEM_AVAILABLE  SFX_ITEM_DEFAULT
-#define SFX_ITEM_OFF        SFX_ITEM_DEFAULT
-#define SFX_ITEM_ON         SFX_ITEM_SET
+#define SFX_ITEM_AVAILABLE	SFX_ITEM_DEFAULT
+#define SFX_ITEM_OFF      	SFX_ITEM_DEFAULT
+#define SFX_ITEM_ON			SFX_ITEM_SET
 
 DBG_NAMEEX_VISIBILITY(SfxPoolItem, SVL_DLLPUBLIC)
 DBG_NAMEEX(SfxVoidItem)
@@ -184,11 +184,11 @@ friend class SfxVoidItem;
 
     ULONG                    nRefCount;                    // Referenzzaehler
     USHORT                   nWhich;
-    USHORT                   nKind;
+    USHORT					 nKind;
 
 private:
     inline void              SetRefCount( ULONG n );
-    inline void              SetKind( USHORT n );
+    inline void				 SetKind( USHORT n );
 public:
     inline ULONG             AddRef( ULONG n = 1 ) const;
 private:
@@ -218,7 +218,7 @@ public:
     virtual int              operator==( const SfxPoolItem& ) const = 0;
     int                      operator!=( const SfxPoolItem& rItem ) const
                              { return !(*this == rItem); }
-    virtual int              Compare( const SfxPoolItem &rWith ) const;
+    virtual int				 Compare( const SfxPoolItem &rWith ) const;
     virtual int              Compare( const SfxPoolItem &rWith, const IntlWrapper& rIntlWrapper ) const;
 
     virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePresentation,
@@ -231,15 +231,15 @@ public:
     virtual int              ScaleMetrics( long lMult, long lDiv );
     virtual int              HasMetrics() const;
 
-    virtual BOOL             QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const;
-    virtual BOOL             PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 );
+    virtual	BOOL        	 QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const;
+    virtual	BOOL			 PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 );
 
     virtual SfxPoolItem*     Create( SvStream &, USHORT nItemVersion ) const;
     virtual SvStream&        Store( SvStream &, USHORT nItemVersion ) const;
     virtual SfxPoolItem*     Clone( SfxItemPool *pPool = 0 ) const = 0;
 
     ULONG                    GetRefCount() const { return nRefCount; }
-    inline USHORT            GetKind() const { return nKind; }
+    inline USHORT			 GetKind() const { return nKind; }
 
     /** Read in a Unicode string from a streamed byte string representation.
 
@@ -468,19 +468,19 @@ DECL_PTRHINT(SVL_DLLPUBLIC, SfxPoolItemHint, SfxPoolItem);
 #if 0  /* @@@ NOT USED @@@ */
 class SfxItemChangedHint: public SfxHint
 {
-    const SfxPoolItem&  _rOld;
-    const SfxPoolItem&  _rNew;
+    const SfxPoolItem& 	_rOld;
+    const SfxPoolItem& 	_rNew;
 
 public:
                         TYPEINFO(); \
                         SfxItemChangedHint( const SfxPoolItem &rOld,
                                             const SfxPoolItem &rNew )
-                        :   _rOld( rOld ),
+                        :	_rOld( rOld ),
                             _rNew( rNew )
                         {}
 
-    const SfxPoolItem&  GetOldItem() const { return _rOld; }
-    const SfxPoolItem&  GetNewItem() const { return _rNew; }
+    const SfxPoolItem&	GetOldItem() const { return _rOld; }
+    const SfxPoolItem&	GetNewItem() const { return _rNew; }
 };
 
 #endif /* @@@ NOT USED @@@ */
diff --git a/svl/inc/svl/ptitem.hxx b/svl/inc/svl/ptitem.hxx
index 1911ac997527..61f99f35860f 100644
--- a/svl/inc/svl/ptitem.hxx
+++ b/svl/inc/svl/ptitem.hxx
@@ -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
@@ -39,7 +39,7 @@ DBG_NAMEEX_VISIBILITY(SfxPointItem, SVL_DLLPUBLIC)
 
 class SVL_DLLPUBLIC SfxPointItem: public SfxPoolItem
 {
-    Point                    aVal;
+    Point					 aVal;
 
 public:
                              TYPEINFO();
@@ -56,21 +56,21 @@ public:
                                     XubString &rText,
                                     const IntlWrapper * = 0 ) const;
 
-    virtual int              operator==( const SfxPoolItem& ) const;
+    virtual int 			 operator==( const SfxPoolItem& ) const;
 
     virtual SfxPoolItem*     Clone( SfxItemPool *pPool = 0 ) const;
-    virtual SfxPoolItem*     Create(SvStream &, USHORT nItemVersion) const;
-    virtual SvStream&        Store(SvStream &, USHORT nItemVersion) const;
+    virtual SfxPoolItem*	 Create(SvStream &, USHORT nItemVersion) const;
+    virtual SvStream&		 Store(SvStream &, USHORT nItemVersion) const;
 
-    const Point&             GetValue() const { return aVal; }
-            void             SetValue( const Point& rNewVal ) {
+    const Point&    	 	 GetValue() const { return aVal; }
+            void			 SetValue( const Point& rNewVal ) {
                                  DBG_ASSERT( GetRefCount() == 0, "SetValue() with pooled item" );
                                  aVal = rNewVal;
                              }
 
-    virtual BOOL             QueryValue( com::sun::star::uno::Any& rVal,
+    virtual	BOOL 			 QueryValue( com::sun::star::uno::Any& rVal,
                                           BYTE nMemberId = 0 ) const;
-    virtual BOOL             PutValue( const com::sun::star::uno::Any& rVal,
+    virtual	BOOL 			 PutValue( const com::sun::star::uno::Any& rVal,
                                           BYTE nMemberId = 0 );
 };
 
diff --git a/svl/inc/svl/rectitem.hxx b/svl/inc/svl/rectitem.hxx
index da080ac95e11..d2e15f3c702e 100644
--- a/svl/inc/svl/rectitem.hxx
+++ b/svl/inc/svl/rectitem.hxx
@@ -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
@@ -40,7 +40,7 @@ DBG_NAMEEX_VISIBILITY(SfxRectangleItem, SVL_DLLPUBLIC)
 
 class SVL_DLLPUBLIC SfxRectangleItem: public SfxPoolItem
 {
-    Rectangle                aVal;
+    Rectangle				 aVal;
 
 public:
                              TYPEINFO();
@@ -57,19 +57,19 @@ public:
                                     XubString &rText,
                                     const IntlWrapper * = 0 ) const;
 
-    virtual int              operator==( const SfxPoolItem& ) const;
+    virtual int 			 operator==( const SfxPoolItem& ) const;
     virtual SfxPoolItem*     Clone( SfxItemPool *pPool = 0 ) const;
-    virtual SfxPoolItem*     Create(SvStream &, USHORT nItemVersion) const;
-    virtual SvStream&        Store(SvStream &, USHORT nItemVersion) const;
+    virtual SfxPoolItem*	 Create(SvStream &, USHORT nItemVersion) const;
+    virtual SvStream&		 Store(SvStream &, USHORT nItemVersion) const;
 
-    const Rectangle&         GetValue() const { return aVal; }
-            void             SetValue( const Rectangle& rNewVal ) {
+    const Rectangle&    	 GetValue() const { return aVal; }
+            void			 SetValue( const Rectangle& rNewVal ) {
                                  DBG_ASSERT( GetRefCount() == 0, "SetValue() with pooled item" );
                                  aVal = rNewVal;
                              }
-    virtual BOOL             QueryValue( com::sun::star::uno::Any& rVal,
+    virtual	BOOL 			 QueryValue( com::sun::star::uno::Any& rVal,
                                           BYTE nMemberId = 0 ) const;
-    virtual BOOL             PutValue( const com::sun::star::uno::Any& rVal,
+    virtual	BOOL 			 PutValue( const com::sun::star::uno::Any& rVal,
                                           BYTE nMemberId = 0 );
 };
 
diff --git a/svl/inc/svl/restrictedpaths.hxx b/svl/inc/svl/restrictedpaths.hxx
index 11d57af35ce0..1701344fef36 100644
--- a/svl/inc/svl/restrictedpaths.hxx
+++ b/svl/inc/svl/restrictedpaths.hxx
@@ -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
diff --git a/svl/inc/svl/rngitem.hxx b/svl/inc/svl/rngitem.hxx
index 890c9d4438c0..97e8a7291e5f 100644
--- a/svl/inc/svl/rngitem.hxx
+++ b/svl/inc/svl/rngitem.hxx
@@ -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
@@ -29,7 +29,7 @@
 
 #ifndef NUMTYPE
 
-#define NUMTYPE USHORT
+#define NUMTYPE	USHORT
 #define SfxXRangeItem SfxRangeItem
 #define SfxXRangesItem SfxUShortRangesItem
 #include <svl/rngitem.hxx>
@@ -38,7 +38,7 @@
 #undef SfxXRangesItem
 
 #ifndef _SFXITEMS_HXX
-#define NUMTYPE ULONG
+#define NUMTYPE	ULONG
 #define SfxXRangeItem SfxULongRangeItem
 #define SfxXRangesItem SfxULongRangesItem
 #include <svl/rngitem.hxx>
@@ -60,28 +60,28 @@ class SvStream;
 class SVL_DLLPUBLIC SfxXRangeItem : public SfxPoolItem
 {
 private:
-    NUMTYPE                     nFrom;
-    NUMTYPE                     nTo;
+    NUMTYPE 					nFrom;
+    NUMTYPE 					nTo;
 public:
                                 TYPEINFO();
                                 SfxXRangeItem();
                                 SfxXRangeItem( USHORT nWID, NUMTYPE nFrom, NUMTYPE nTo );
                                 SfxXRangeItem( USHORT nWID, SvStream &rStream );
                                 SfxXRangeItem( const SfxXRangeItem& rItem );
-    virtual int                 operator==( const SfxPoolItem& ) const;
+    virtual int 				operator==( const SfxPoolItem& ) const;
     virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
                                     SfxMapUnit eCoreMetric,
                                     SfxMapUnit ePresMetric,
                                     XubString &rText,
                                     const IntlWrapper * = 0 ) const;
-    virtual SfxPoolItem*        Clone( SfxItemPool *pPool = 0 ) const;
-    inline NUMTYPE&             From() { return nFrom; }
-    inline NUMTYPE              From() const { return nFrom; }
-    inline NUMTYPE&             To() { return nTo; }
-    inline NUMTYPE              To() const { return nTo; }
-    inline BOOL                 HasRange() const { return nTo>nFrom; }
-    virtual SfxPoolItem*        Create( SvStream &, USHORT nVersion ) const;
-    virtual SvStream&           Store( SvStream &, USHORT nItemVersion ) const;
+    virtual SfxPoolItem*    	Clone( SfxItemPool *pPool = 0 ) const;
+    inline NUMTYPE&				From() { return nFrom; }
+    inline NUMTYPE				From() const { return nFrom; }
+    inline NUMTYPE&				To() { return nTo; }
+    inline NUMTYPE				To() const { return nTo; }
+    inline BOOL					HasRange() const { return nTo>nFrom; }
+    virtual SfxPoolItem*		Create( SvStream &, USHORT nVersion ) const;
+    virtual SvStream&			Store( SvStream &, USHORT nItemVersion ) const;
 };
 
 // -----------------------------------------------------------------------
@@ -89,7 +89,7 @@ public:
 class SVL_DLLPUBLIC SfxXRangesItem : public SfxPoolItem
 {
 private:
-    NUMTYPE*                    _pRanges;
+    NUMTYPE*					_pRanges;
 
 public:
                                 TYPEINFO();
@@ -97,17 +97,17 @@ public:
                                 SfxXRangesItem( USHORT nWID, const NUMTYPE *pRanges );
                                 SfxXRangesItem( USHORT nWID, SvStream &rStream );
                                 SfxXRangesItem( const SfxXRangesItem& rItem );
-    virtual                     ~SfxXRangesItem();
-    virtual int                 operator==( const SfxPoolItem& ) const;
+    virtual 					~SfxXRangesItem();
+    virtual int 				operator==( const SfxPoolItem& ) const;
     virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
                                     SfxMapUnit eCoreMetric,
                                     SfxMapUnit ePresMetric,
                                     XubString &rText,
                                     const IntlWrapper * = 0 ) const;
-    virtual SfxPoolItem*        Clone( SfxItemPool *pPool = 0 ) const;
-    inline const NUMTYPE*       GetRanges() const { return _pRanges; }
-    virtual SfxPoolItem*        Create( SvStream &, USHORT nVersion ) const;
-    virtual SvStream&           Store( SvStream &, USHORT nItemVersion ) const;
+    virtual SfxPoolItem*    	Clone( SfxItemPool *pPool = 0 ) const;
+    inline const NUMTYPE*		GetRanges() const { return _pRanges; }
+    virtual SfxPoolItem*		Create( SvStream &, USHORT nVersion ) const;
+    virtual SvStream&			Store( SvStream &, USHORT nItemVersion ) const;
 };
 
 #endif
diff --git a/svl/inc/svl/sfontitm.hxx b/svl/inc/svl/sfontitm.hxx
index e7a6ecb366d0..656a790bf21c 100644
--- a/svl/inc/svl/sfontitm.hxx
+++ b/svl/inc/svl/sfontitm.hxx
@@ -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
@@ -64,7 +64,7 @@ public:
 
     inline SfxFontItem(USHORT nWhich);
 
-    virtual int operator ==(const SfxPoolItem & rItem) const;
+    virtual	int operator ==(const SfxPoolItem & rItem) const;
 
     virtual SfxPoolItem * Create(SvStream & rStream, USHORT) const;
 
diff --git a/svl/inc/svl/sharecontrolfile.hxx b/svl/inc/svl/sharecontrolfile.hxx
index 9ca8eb3222d0..1db849297873 100644
--- a/svl/inc/svl/sharecontrolfile.hxx
+++ b/svl/inc/svl/sharecontrolfile.hxx
@@ -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
diff --git a/svl/inc/svl/slstitm.hxx b/svl/inc/svl/slstitm.hxx
index 0936524c298a..ac42e159309a 100644
--- a/svl/inc/svl/slstitm.hxx
+++ b/svl/inc/svl/slstitm.hxx
@@ -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
@@ -38,7 +38,7 @@ class SfxImpStringList;
 class SVL_DLLPUBLIC SfxStringListItem : public SfxPoolItem
 {
 protected:
-    SfxImpStringList*   pImp;
+    SfxImpStringList*	pImp;
 
 public:
     TYPEINFO();
@@ -49,36 +49,36 @@ public:
     SfxStringListItem( const SfxStringListItem& rItem );
     ~SfxStringListItem();
 
-    List *                  GetList();
+    List *					GetList();
 
-    const List *            GetList() const
+    const List *			GetList() const
     { return SAL_CONST_CAST(SfxStringListItem *, this)->GetList(); }
 
 #ifndef TF_POOLABLE
-    virtual int             IsPoolable() const;
+    virtual int 			IsPoolable() const;
 #endif
 
     // String-Separator: \n
-    virtual void            SetString( const XubString& );
-    virtual XubString       GetString();
+    virtual	void			SetString( const XubString& );
+    virtual XubString		GetString();
 
     void                    SetStringList( const com::sun::star::uno::Sequence< rtl::OUString >& rList );
     void                    GetStringList( com::sun::star::uno::Sequence< rtl::OUString >& rList ) const;
 
-    virtual int             operator==( const SfxPoolItem& ) const;
+    virtual int 			operator==( const SfxPoolItem& ) const;
     virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
                                     SfxMapUnit eCoreMetric,
                                     SfxMapUnit ePresMetric,
                                     XubString &rText,
                                     const IntlWrapper * = 0 ) const;
     virtual SfxPoolItem*    Clone( SfxItemPool *pPool = 0 ) const;
-    virtual SfxPoolItem*    Create( SvStream &, USHORT nVersion ) const;
-    virtual SvStream&       Store( SvStream &, USHORT nItemVersion ) const;
-    void                    Sort( BOOL bAscending = TRUE, List* pParallelList = 0 );
+    virtual SfxPoolItem*	Create( SvStream &, USHORT nVersion ) const;
+    virtual SvStream&		Store( SvStream &, USHORT nItemVersion ) const;
+    void 					Sort( BOOL bAscending = TRUE, List* pParallelList = 0 );
 
-    virtual BOOL            PutValue  ( const com::sun::star::uno::Any& rVal,
+    virtual	BOOL 			PutValue  ( const com::sun::star::uno::Any& rVal,
                                          BYTE nMemberId = 0 );
-    virtual BOOL            QueryValue( com::sun::star::uno::Any& rVal,
+    virtual	BOOL 			QueryValue( com::sun::star::uno::Any& rVal,
                                          BYTE nMemberId = 0 ) const;
 };
 #endif
diff --git a/svl/inc/svl/smplhint.hxx b/svl/inc/svl/smplhint.hxx
index cf705b41c5ae..1490b564cb6d 100644
--- a/svl/inc/svl/smplhint.hxx
+++ b/svl/inc/svl/smplhint.hxx
@@ -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
@@ -31,39 +31,39 @@
 #include <svl/hint.hxx>
 #include <tools/rtti.hxx>
 
-#define SFX_HINT_DYING              0x00000001
-#define SFX_HINT_NAMECHANGED        0x00000002
-#define SFX_HINT_TITLECHANGED       0x00000004
-#define SFX_HINT_DATACHANGED        0x00000008
-#define SFX_HINT_DOCCHANGED         0x00000010
-#define SFX_HINT_UPDATEDONE         0x00000020
-#define SFX_HINT_DEINITIALIZING     0x00000040
-#define SFX_HINT_MODECHANGED        0x00000080
+#define SFX_HINT_DYING				0x00000001
+#define SFX_HINT_NAMECHANGED		0x00000002
+#define SFX_HINT_TITLECHANGED		0x00000004
+#define SFX_HINT_DATACHANGED		0x00000008
+#define SFX_HINT_DOCCHANGED 		0x00000010
+#define SFX_HINT_UPDATEDONE			0x00000020
+#define SFX_HINT_DEINITIALIZING		0x00000040
+#define SFX_HINT_MODECHANGED		0x00000080
     // unused, formerly SFX_HINT_CANCELLABLE
     // unused, formerly SFX_HINT_DATAAVAILABLE
     // unused, formerly SFX_HINT_SAVECOMPLETED
     // unused, formerly SFX_HINT_RELEASEREF
 #define SFX_HINT_COLORS_CHANGED     0x00001000
 #define SFX_HINT_CTL_SETTINGS_CHANGED   0x00002000
-#define SFX_HINT_ACCESSIBILITY_CHANGED  0x00004000
+#define SFX_HINT_ACCESSIBILITY_CHANGED	0x00004000
     // unused, formerly SFX_HINT_VIEWCREATED
-#define SFX_HINT_USER00             0x00010000
-#define SFX_HINT_USER01             0x00020000
-#define SFX_HINT_USER02             0x00040000
-#define SFX_HINT_USER03             0x00080000
-#define SFX_HINT_USER04             0x00100000
-#define SFX_HINT_USER05             0x00200000
-#define SFX_HINT_USER06             0x00400000
-#define SFX_HINT_USER07             0x00800000
-#define SFX_HINT_USER08             0x01000000
-#define SFX_HINT_USER09             0x02000000
-#define SFX_HINT_USER10             0x04000000
-#define SFX_HINT_USER11             0x08000000
-#define SFX_HINT_USER12             0x10000000
-#define SFX_HINT_USER13             0x20000000
+#define SFX_HINT_USER00 			0x00010000
+#define SFX_HINT_USER01 			0x00020000
+#define SFX_HINT_USER02 			0x00040000
+#define SFX_HINT_USER03 			0x00080000
+#define SFX_HINT_USER04 			0x00100000
+#define SFX_HINT_USER05 			0x00200000
+#define SFX_HINT_USER06 			0x00400000
+#define SFX_HINT_USER07 			0x00800000
+#define SFX_HINT_USER08 			0x01000000
+#define SFX_HINT_USER09 			0x02000000
+#define SFX_HINT_USER10 			0x04000000
+#define SFX_HINT_USER11 			0x08000000
+#define SFX_HINT_USER12 			0x10000000
+#define SFX_HINT_USER13 			0x20000000
 #define SFX_HINT_UNDO_OPTIONS_CHANGED 0x40000000
 #define SFX_HINT_USER_OPTIONS_CHANGED 0x80000000
-#define SFX_HINT_ALL                0xFFFFFFFF
+#define SFX_HINT_ALL				0xFFFFFFFF
 
 class SVL_DLLPUBLIC SfxSimpleHint: public SfxHint
 {
@@ -90,7 +90,7 @@ public:
         }
 
 #define IMPL_OBJHINT(Name, Type) \
-        TYPEINIT1(Name, SfxSimpleHint); \
+        TYPEINIT1(Name, SfxSimpleHint);	\
         Name::Name( USHORT nID, const Type& rObject ): \
             SfxSimpleHint( nID ), aObj(rObject) \
             { } \
diff --git a/svl/inc/svl/solar.hrc b/svl/inc/svl/solar.hrc
index 6d13d46ec759..127bad54d562 100644
--- a/svl/inc/svl/solar.hrc
+++ b/svl/inc/svl/solar.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
@@ -30,10 +30,10 @@
 
 // defines ------------------------------------------------------------------
 
-#define OWN_ATTR_VALUE_START                    3900
+#define OWN_ATTR_VALUE_START					3900
 #define OWN_ATTR_VALUE_END                      3988
 
-#define CREATERESMGR_NAME( Name )   #Name
+#define CREATERESMGR_NAME( Name )   #Name 
 #define CREATERESMGR( Name )        ResMgr::CreateResMgr( CREATERESMGR_NAME( Name ) )
 
 #define RID_SFX_START               260
@@ -51,8 +51,8 @@
 #define RID_BASIC_START             (RID_LIB_START+3000)
 #define RID_BASIC_END               (RID_LIB_START+4499)
 
-#define RID_UUI_START               (RID_LIB_START+4500)
-#define RID_UUI_END                 (RID_LIB_START+4599)
+#define RID_UUI_START				(RID_LIB_START+4500)
+#define RID_UUI_END					(RID_LIB_START+4599)
 
 #define RID_HELP_START              (RID_LIB_START+4600)
 #define RID_HELP_END                (RID_LIB_START+4799)
@@ -108,20 +108,20 @@
 #define RID_FORMS_START             (RID_LIB_START+8000)
 #define RID_FORMS_END               (RID_LIB_START+8999)
 
-#define RID_FORMLAYER_START         (RID_LIB_START+9000)
-#define RID_FORMLAYER_END           (RID_LIB_START+9199)
+#define RID_FORMLAYER_START			(RID_LIB_START+9000)
+#define RID_FORMLAYER_END			(RID_LIB_START+9199)
 
-#define RID_DBACCESS_START          (RID_LIB_START+9200)
-#define RID_DBACCESS_END            (RID_LIB_START+9699)
+#define RID_DBACCESS_START			(RID_LIB_START+9200)
+#define RID_DBACCESS_END			(RID_LIB_START+9699)
 
-#define RID_MORE_EXTENSIONS_START   (RID_LIB_START+9700)
-#define RID_MORE_EXTENSIONS_END     (RID_LIB_START+9999)
+#define RID_MORE_EXTENSIONS_START	(RID_LIB_START+9700)
+#define RID_MORE_EXTENSIONS_END		(RID_LIB_START+9999)
 
-#define RID_DB_EXTENSIONS_START     (RID_LIB_START+10000)
-#define RID_DB_EXTENSIONS_END       (RID_LIB_START+10199)
+#define RID_DB_EXTENSIONS_START		(RID_LIB_START+10000)
+#define RID_DB_EXTENSIONS_END		(RID_LIB_START+10199)
 
-#define RID_FILTER_START            (RID_LIB_START+10200)
-#define RID_FILTER_END              (RID_LIB_START+10299)
+#define RID_FILTER_START			(RID_LIB_START+10200)
+#define RID_FILTER_END				(RID_LIB_START+10299)
 
 // do *NOT* add more ranges here, RID_LIB_END is (RID_LIB_START + 10000)
 
@@ -149,11 +149,11 @@
 #define RID_SCH_START                           (RID_OBJ_START+ 512)
 #define RID_SCH_END                             (RID_OBJ_START+ 767)
 
-#define RID_RPT_START                           (RID_OBJ_START+768)
-#define RID_RPT_END                             (RID_OBJ_START+1000)
+#define RID_RPT_START							(RID_OBJ_START+768)
+#define RID_RPT_END								(RID_OBJ_START+1000)
 
-#define RID_FORMULA_START                       (RID_OBJ_START+1001)
-#define RID_FORMULA_END                         (RID_OBJ_START+1200)
+#define RID_FORMULA_START						(RID_OBJ_START+1001)
+#define RID_FORMULA_END							(RID_OBJ_START+1200)
 // Help-Ids --------------------------------------------------------------
 
 #define HID_OK_BUTTON               0
@@ -165,8 +165,8 @@
 #define HID_VCL_START               (HID_START+100)
 #define HID_VCL_END                 (HID_START+150)
 
-#define HID_SVTOOLS_START           (HID_START+200)
-#define HID_SVTOOLS_END             (HID_START+299)
+#define HID_SVTOOLS_START			(HID_START+200)
+#define HID_SVTOOLS_END				(HID_START+299)
 
 #define HID_SFX_START               (HID_START+300)
 #define HID_SFX_END                 (HID_START+999)
@@ -189,17 +189,17 @@
 #define HID_OFA_START               (HID_LIB_START+1760)
 #define HID_OFA_END                 (HID_LIB_START+1999)
 
-#define HID_HELP_START              (HID_LIB_START+2000)
-#define HID_HELP_END                (HID_LIB_START+2050)
+#define HID_HELP_START				(HID_LIB_START+2000)
+#define HID_HELP_END				(HID_LIB_START+2050)
 
-#define HID_CHAOS_START             (HID_LIB_START+2051)
-#define HID_CHAOS_END               (HID_LIB_START+2069)
+#define HID_CHAOS_START				(HID_LIB_START+2051)
+#define HID_CHAOS_END				(HID_LIB_START+2069)
 
-#define HID_UUI_START               (HID_LIB_START+2070)
-#define HID_UUI_END                 (HID_LIB_START+2099)
+#define HID_UUI_START				(HID_LIB_START+2070)
+#define HID_UUI_END					(HID_LIB_START+2099)
 
-#define HID_GOODIES_START           (HID_LIB_START+2100)
-#define HID_GOODIES_END             (HID_LIB_START+2199)
+#define HID_GOODIES_START			(HID_LIB_START+2100)
+#define HID_GOODIES_END				(HID_LIB_START+2199)
 
 #define HID_EDIT_START          (HID_LIB_START+2200)
 #define HID_EDIT_END            (HID_LIB_START+3399)
@@ -207,26 +207,26 @@
 #define HID_CHANNEL_START           (HID_LIB_START+3400)
 #define HID_CHANNEL_END             (HID_LIB_START+3499)
 
-#define HID_SBA_START               (HID_LIB_START+ 3500)
-#define HID_SBA_END                 (HID_LIB_START+ 3999)
+#define HID_SBA_START				(HID_LIB_START+ 3500)
+#define HID_SBA_END					(HID_LIB_START+ 3999)
 
-#define HID_FORMS_START             (HID_LIB_START+4000)
-#define HID_FORMS_END               (HID_LIB_START+4999)
+#define HID_FORMS_START				(HID_LIB_START+4000)
+#define HID_FORMS_END				(HID_LIB_START+4999)
 
-#define HID_DBACCESS_START          (HID_LIB_START+5000)
-#define HID_DBACCESS_END            (HID_LIB_START+5299)
+#define HID_DBACCESS_START			(HID_LIB_START+5000)
+#define HID_DBACCESS_END			(HID_LIB_START+5299)
 
-#define HID_PORTAL_START            (HID_LIB_START+5300)
-#define HID_PORTAL_END              (HID_LIB_START+5599)
+#define HID_PORTAL_START			(HID_LIB_START+5300)
+#define HID_PORTAL_END				(HID_LIB_START+5599)
 
-#define HID_PORTAL_ADMIN_START      (HID_LIB_START+5600)
-#define HID_PORTAL_ADMIN_END        (HID_LIB_START+5999)
+#define HID_PORTAL_ADMIN_START		(HID_LIB_START+5600)
+#define HID_PORTAL_ADMIN_END		(HID_LIB_START+5999)
 
 #define HID_SYNCACCESS_START        (HID_LIB_START+6000)
 #define HID_SYNCACCESS_END          (HID_LIB_START+6099)
 
-#define HID_SVX_EXT0_START          (HID_LIB_START+6100)
-#define HID_SVX_EXT0_END            (HID_LIB_START+6599)
+#define HID_SVX_EXT0_START			(HID_LIB_START+6100)
+#define HID_SVX_EXT0_END			(HID_LIB_START+6599)
 
 #define HID_FRAMEWORK_START         (HID_LIB_START+6600)
 #define HID_FRAMEWORK_END           (HID_LIB_START+6999)
@@ -243,47 +243,47 @@
 #define HID_APP_START               (HID_START+20000)
 #define HID_APP_END                 (HID_START+29999)
 
-#define HID_SW_START                (HID_START+20000)
-#define HID_SW_END                  (HID_START+24999)
+#define HID_SW_START				(HID_START+20000)
+#define HID_SW_END					(HID_START+24999)
 
-#define HID_SC_START                (HID_START+25000)
-#define HID_SC_END                  (HID_START+26999)
+#define HID_SC_START				(HID_START+25000)
+#define HID_SC_END					(HID_START+26999)
 
-#define HID_SD_START                (HID_START+27000)
-#define HID_SD_END                  (HID_START+27999)
+#define HID_SD_START				(HID_START+27000)
+#define HID_SD_END					(HID_START+27999)
 
-#define HID_Sa_START                (HID_START+28000)
-#define HID_Sa_END                  (HID_START+28999)
+#define HID_Sa_START				(HID_START+28000)
+#define HID_Sa_END					(HID_START+28999)
 
-#define HID_Sb_START                (HID_START+29000)
-#define HID_Sb_END                  (HID_START+29999)
+#define HID_Sb_START				(HID_START+29000)
+#define HID_Sb_END					(HID_START+29999)
 
 #define HID_OBJ_START               (HID_START+30000)
 #define HID_OBJ_END                 (HID_START+32767)
 
-#define HID_CUI3_START              (HID_OBJ_START+   0)
-#define HID_CUI3_END                (HID_OBJ_START+ 239)
+#define HID_CUI3_START				(HID_OBJ_START+   0)
+#define HID_CUI3_END				(HID_OBJ_START+ 239)
 
-#define HID_AVMEDIA_START           (HID_OBJ_START+ 240)
-#define HID_AVMEDIA_END             (HID_OBJ_START+ 255)
+#define HID_AVMEDIA_START			(HID_OBJ_START+ 240)
+#define HID_AVMEDIA_END				(HID_OBJ_START+ 255) 
 
-#define HID_SMA_START               (HID_OBJ_START+ 256)
-#define HID_SMA_END                 (HID_OBJ_START+ 511)
+#define HID_SMA_START				(HID_OBJ_START+ 256)
+#define HID_SMA_END					(HID_OBJ_START+ 511)
 
-#define HID_SCH_START               (HID_OBJ_START+ 512)
-#define HID_SCH_END                 (HID_OBJ_START+ 767)
+#define HID_SCH_START				(HID_OBJ_START+ 512)
+#define HID_SCH_END					(HID_OBJ_START+ 767)
 
-#define HID_BASICIDE_START          (HID_OBJ_START+ 768)
-#define HID_BASICIDE_END            (HID_OBJ_START+1023)
+#define HID_BASICIDE_START			(HID_OBJ_START+ 768)
+#define HID_BASICIDE_END			(HID_OBJ_START+1023)
 
-#define HID_SMA2_START              (HID_OBJ_START+1024)
-#define HID_SMA2_END                (HID_OBJ_START+1280)
+#define HID_SMA2_START				(HID_OBJ_START+1024)
+#define HID_SMA2_END				(HID_OBJ_START+1280)
 
-#define HID_FILTER_START            (HID_OBJ_START+1281)
-#define HID_FILTER_END              (HID_OBJ_START+1580)
+#define HID_FILTER_START			(HID_OBJ_START+1281)
+#define HID_FILTER_END				(HID_OBJ_START+1580)
 
-#define HID_LICENSING_START         (HID_OBJ_START+1581)
-#define HID_LICENSING_END           (HID_OBJ_START+1680)
+#define HID_LICENSING_START			(HID_OBJ_START+1581)
+#define HID_LICENSING_END			(HID_OBJ_START+1680)
 
 #define HID_RPT_START               (HID_OBJ_START+1681)
 #define HID_RPT_END                 (HID_OBJ_START+2080)
@@ -291,14 +291,14 @@
 #define HID_FORMULA_START           (HID_OBJ_START+2081)
 #define HID_FORMULA_END             (HID_OBJ_START+2280)
 
-#define HID_EXTENSIONS_START        (HID_OBJ_START+2281)
-#define HID_EXTENSIONS_END          (HID_OBJ_START+2800)
+#define HID_EXTENSIONS_START	    (HID_OBJ_START+2281)
+#define HID_EXTENSIONS_END		    (HID_OBJ_START+2800)
 
 // Slot Ids
 
 #define SID_SFX_START                5000
 #define SID_SFX_END                  8999
-#define SID_DOCKWIN_START            9800
+#define SID_DOCKWIN_START			 9800
 #define SID_DOCKWIN_END              9999
 
 #define SID_LIB_START               10000
@@ -320,20 +320,20 @@
 #define SID_OBJ3_START              (SID_OBJ_START +  768)
 
 #define SID_SMA_START               SID_OBJ2_START
-#define SID_SMA_END                 (SID_SMA_START + 255 )
+#define SID_SMA_END					(SID_SMA_START + 255 )
 #define SID_BASICIDE_START          (SID_OBJ3_START)
-#define SID_BASICIDE_END            (SID_BASICIDE_START + 255)
+#define SID_BASICIDE_END			(SID_BASICIDE_START + 255)
 
-#define SID_SVX_START               SID_LIB_START               // 10000
-#define SID_SVX_END                 (SID_SVX_START + 1499)
+#define SID_SVX_START				SID_LIB_START               // 10000
+#define SID_SVX_END					(SID_SVX_START + 1499)
 #define SID_EDIT_START              (SID_SVX_END + 1)           // 11500
-#define SID_EDIT_END                (SID_EDIT_START + 499)
+#define SID_EDIT_END				(SID_EDIT_START + 499)
 #define SID_OPTIONS_START           (SID_EDIT_END + 1)          // 12000
 #define SID_OPTIONS_END             (SID_OPTIONS_START + 100)
 #define SID_SBA_START               (SID_OPTIONS_END + 1)       // 12101
 #define SID_SBA_END                 (SID_SBA_START + 149)
-#define SID_DBACCESS_START          (SID_SBA_END + 1)           // 12251
-#define SID_DBACCESS_END            (SID_DBACCESS_START + 200)
+#define SID_DBACCESS_START			(SID_SBA_END + 1)           // 12251
+#define SID_DBACCESS_END			(SID_DBACCESS_START	+ 200)
 #define SID_RPTUI_START             (SID_DBACCESS_END + 1)      // 12452
 #define SID_RPTUI_END               (SID_RPTUI_START + 199)
 
diff --git a/svl/inc/svl/srchcfg.hxx b/svl/inc/svl/srchcfg.hxx
index 7f98010c3d08..3e95d0f44b82 100644
--- a/svl/inc/svl/srchcfg.hxx
+++ b/svl/inc/svl/srchcfg.hxx
@@ -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
@@ -67,9 +67,9 @@ public:
     SvxSearchConfig(sal_Bool bEnableNotify = sal_True);
     virtual ~SvxSearchConfig();
 
-    void            Load();
-    virtual void    Commit();
-    virtual void    Notify( const com::sun::star::uno::Sequence<rtl::OUString>& aPropertyNames);
+    void 			Load();
+    virtual void	Commit();
+    virtual void 	Notify( const com::sun::star::uno::Sequence<rtl::OUString>& aPropertyNames);
 
     sal_uInt16                  Count();
     const SvxSearchEngineData&  GetData(sal_uInt16 nPos);
diff --git a/svl/inc/svl/srchdefs.hxx b/svl/inc/svl/srchdefs.hxx
index a6cdf56f8665..f29941514ed4 100644
--- a/svl/inc/svl/srchdefs.hxx
+++ b/svl/inc/svl/srchdefs.hxx
@@ -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
@@ -40,9 +40,9 @@
 #define SEARCH_OPTIONS_SELECTION    ((sal_uInt16)0x0100)
 #define SEARCH_OPTIONS_FAMILIES     ((sal_uInt16)0x0200)
 #define SEARCH_OPTIONS_FORMAT       ((sal_uInt16)0x0400)
-#define SEARCH_OPTIONS_MORE         ((sal_uInt16)0x0800)
-#define SEARCH_OPTIONS_SIMILARITY   ((sal_uInt16)0x1000)
-#define SEARCH_OPTIONS_CONTENT      ((sal_uInt16)0x2000)
+#define SEARCH_OPTIONS_MORE			((sal_uInt16)0x0800)
+#define SEARCH_OPTIONS_SIMILARITY	((sal_uInt16)0x1000)
+#define SEARCH_OPTIONS_CONTENT		((sal_uInt16)0x2000)
 
 
 #endif
diff --git a/svl/inc/svl/srchitem.hxx b/svl/inc/svl/srchitem.hxx
index 3974a8f57b80..be210fa92596 100644
--- a/svl/inc/svl/srchitem.hxx
+++ b/svl/inc/svl/srchitem.hxx
@@ -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
@@ -42,19 +42,19 @@
 // defines ---------------------------------------------------------------
 
 // commands
-#define     SVX_SEARCHCMD_FIND          ((sal_uInt16)0)
-#define     SVX_SEARCHCMD_FIND_ALL      ((sal_uInt16)1)
-#define     SVX_SEARCHCMD_REPLACE       ((sal_uInt16)2)
-#define     SVX_SEARCHCMD_REPLACE_ALL   ((sal_uInt16)3)
+#define		SVX_SEARCHCMD_FIND			((sal_uInt16)0)
+#define		SVX_SEARCHCMD_FIND_ALL		((sal_uInt16)1)
+#define		SVX_SEARCHCMD_REPLACE		((sal_uInt16)2)
+#define		SVX_SEARCHCMD_REPLACE_ALL	((sal_uInt16)3)
 
 // search flags
-#define     SVX_SEARCHIN_FORMULA        ((sal_uInt16)0)
-#define     SVX_SEARCHIN_VALUE          ((sal_uInt16)1)
-#define     SVX_SEARCHIN_NOTE           ((sal_uInt16)2)
-#define     SVX_SEARCHAPP_WRITER        ((sal_uInt16)0)
-#define     SVX_SEARCHAPP_CALC          ((sal_uInt16)1)
-#define     SVX_SEARCHAPP_DRAW          ((sal_uInt16)2)
-#define     SVX_SEARCHAPP_BASE          ((sal_uInt16)3)
+#define		SVX_SEARCHIN_FORMULA		((sal_uInt16)0)
+#define		SVX_SEARCHIN_VALUE			((sal_uInt16)1)
+#define		SVX_SEARCHIN_NOTE			((sal_uInt16)2)
+#define		SVX_SEARCHAPP_WRITER		((sal_uInt16)0)
+#define		SVX_SEARCHAPP_CALC			((sal_uInt16)1)
+#define		SVX_SEARCHAPP_DRAW			((sal_uInt16)2)
+#define		SVX_SEARCHAPP_BASE			((sal_uInt16)3)
 
 // class SvxSearchItem ---------------------------------------------------
 
@@ -62,25 +62,25 @@ class SVL_DLLPUBLIC SvxSearchItem :
         public SfxPoolItem,
         public utl::ConfigItem
 {
-    com::sun::star::util::SearchOptions aSearchOpt;
+    com::sun::star::util::SearchOptions	aSearchOpt;
 
-    SfxStyleFamily  eFamily;            // Vorlagen-Familie
+    SfxStyleFamily	eFamily;			// Vorlagen-Familie
 
-    sal_uInt16      nCommand;           // Kommando (Suchen, Alle Suchen, Ersetzen, Alle Ersetzen)
+    sal_uInt16		nCommand;			// Kommando (Suchen, Alle Suchen, Ersetzen, Alle Ersetzen)
 
     // Calc-Spezifische Daten
-    sal_uInt16      nCellType;          // Suche in Formeln/Werten/Notizen
-    sal_uInt16      nAppFlag;           // Fuer welche Applikation ist der Dialog ueberhaupt
-    sal_Bool        bRowDirection;      // Suchrichtung Zeilenweise/Spaltenweise
-    sal_Bool        bAllTables;         // in alle Tabellen suchen
+    sal_uInt16		nCellType;			// Suche in Formeln/Werten/Notizen
+    sal_uInt16		nAppFlag;   		// Fuer welche Applikation ist der Dialog ueberhaupt
+    sal_Bool		bRowDirection;		// Suchrichtung Zeilenweise/Spaltenweise
+    sal_Bool		bAllTables;			// in alle Tabellen suchen
 
     // Writer-spezifisch
-    sal_Bool        bNotes;
+    sal_Bool		bNotes;
 
-    sal_Bool        bBackward;          // Suche Rueckwaerts
-    sal_Bool        bPattern;           // Suche nach Vorlagen
-    sal_Bool        bContent;           // Suche im Inhalt
-    sal_Bool        bAsianOptions;      // use asian options?
+    sal_Bool		bBackward;          // Suche Rueckwaerts
+    sal_Bool		bPattern;           // Suche nach Vorlagen
+    sal_Bool		bContent;			// Suche im Inhalt
+    sal_Bool		bAsianOptions;		// use asian options?
 
 public:
     TYPEINFO();
@@ -89,9 +89,9 @@ public:
     SvxSearchItem( const SvxSearchItem& rItem );
     virtual ~SvxSearchItem();
 
-    virtual sal_Bool             QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const;
-    virtual sal_Bool             PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 );
-    virtual int              operator == ( const SfxPoolItem& ) const;
+    virtual	sal_Bool        	 QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const;
+    virtual	sal_Bool			 PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 );
+    virtual int 			 operator == ( const SfxPoolItem& ) const;
     virtual SfxPoolItem*     Clone( SfxItemPool *pPool = 0 ) const;
     virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
                                     SfxMapUnit eCoreMetric,
@@ -99,88 +99,88 @@ public:
                                     String &rText, const IntlWrapper * = 0 ) const;
 
     // ConfigItem
-    virtual void            Notify( const com::sun::star::uno::Sequence< rtl::OUString > &rPropertyNames );
-    virtual void            Commit();
+    virtual void 			Notify( const com::sun::star::uno::Sequence< rtl::OUString > &rPropertyNames );
+    virtual void			Commit();
 
-            sal_uInt16      GetCommand() const { return nCommand; }
-            void            SetCommand(sal_uInt16 nNewCommand) { nCommand = nNewCommand; }
+            sal_uInt16		GetCommand() const { return nCommand; }
+            void			SetCommand(sal_uInt16 nNewCommand) { nCommand = nNewCommand; }
 
-    inline  const String    GetSearchString() const;
-    inline  void            SetSearchString(const String& rNewString);
+    inline 	const String	GetSearchString() const;
+    inline 	void			SetSearchString(const String& rNewString);
 
-    inline  const String    GetReplaceString() const;
-    inline  void            SetReplaceString(const String& rNewString);
+    inline 	const String	GetReplaceString() const;
+    inline 	void	   		SetReplaceString(const String& rNewString);
 
-    inline  sal_Bool        GetWordOnly() const;
-            void            SetWordOnly(sal_Bool bNewWordOnly);
+    inline 	sal_Bool		GetWordOnly() const;
+            void			SetWordOnly(sal_Bool bNewWordOnly);
 
-    inline  sal_Bool        GetExact() const;
-            void            SetExact(sal_Bool bNewExact);
+    inline 	sal_Bool		GetExact() const;
+            void			SetExact(sal_Bool bNewExact);
 
-            sal_Bool        GetBackward() const { return bBackward; }
-            void            SetBackward(sal_Bool bNewBackward) { bBackward = bNewBackward; }
+            sal_Bool		GetBackward() const { return bBackward; }
+            void			SetBackward(sal_Bool bNewBackward) { bBackward = bNewBackward; }
 
-    inline sal_Bool         GetSelection() const;
-            void            SetSelection(sal_Bool bNewSelection);
+    inline sal_Bool			GetSelection() const;
+            void			SetSelection(sal_Bool bNewSelection);
 
-    inline  sal_Bool        GetRegExp() const;
-            void            SetRegExp( sal_Bool bVal );
+    inline	sal_Bool		GetRegExp() const;
+            void			SetRegExp( sal_Bool bVal );
 
-            sal_Bool        GetPattern() const { return bPattern; }
-            void            SetPattern(sal_Bool bNewPattern) { bPattern = bNewPattern; }
+            sal_Bool		GetPattern() const { return bPattern; }
+            void			SetPattern(sal_Bool bNewPattern) { bPattern = bNewPattern; }
 
-            sal_Bool        IsContent() const { return bContent; }
-            void            SetContent( sal_Bool bNew ) { bContent = bNew; }
+            sal_Bool		IsContent() const { return bContent; }
+            void			SetContent( sal_Bool bNew ) { bContent = bNew; }
 
-            SfxStyleFamily  GetFamily() const { return eFamily; }
-            void            SetFamily( SfxStyleFamily eNewFamily )
+            SfxStyleFamily	GetFamily() const { return eFamily; }
+            void			SetFamily( SfxStyleFamily eNewFamily )
                                 { eFamily = eNewFamily; }
 
-            sal_Bool        GetRowDirection() const { return bRowDirection; }
-            void            SetRowDirection(sal_Bool bNewRowDirection) { bRowDirection = bNewRowDirection; }
+            sal_Bool		GetRowDirection() const { return bRowDirection; }
+            void			SetRowDirection(sal_Bool bNewRowDirection) { bRowDirection = bNewRowDirection; }
 
-            sal_Bool        IsAllTables() const { return bAllTables; }
-            void            SetAllTables(sal_Bool bNew) { bAllTables = bNew; }
+            sal_Bool		IsAllTables() const { return bAllTables; }
+            void			SetAllTables(sal_Bool bNew) { bAllTables = bNew; }
 
-            sal_uInt16      GetCellType() const { return nCellType; }
-            void            SetCellType(sal_uInt16 nNewCellType) { nCellType = nNewCellType; }
+            sal_uInt16		GetCellType() const { return nCellType; }
+            void			SetCellType(sal_uInt16 nNewCellType) { nCellType = nNewCellType; }
 
-            sal_Bool        GetNotes() const { return bNotes; }
-            void            SetNotes(sal_Bool bNew) { bNotes = bNew; }
+            sal_Bool		GetNotes() const { return bNotes; }
+            void			SetNotes(sal_Bool bNew) { bNotes = bNew; }
 
-            sal_uInt16      GetAppFlag() const { return nAppFlag; }
-            void            SetAppFlag(sal_uInt16 nNewAppFlag) { nAppFlag = nNewAppFlag; }
+            sal_uInt16		GetAppFlag() const { return nAppFlag; }
+            void			SetAppFlag(sal_uInt16 nNewAppFlag) { nAppFlag = nNewAppFlag; }
 
-    inline  sal_Bool        IsLevenshtein() const;
-            void            SetLevenshtein( sal_Bool bVal );
+    inline	sal_Bool 		IsLevenshtein() const;
+            void			SetLevenshtein( sal_Bool bVal );
 
-    inline  sal_Bool        IsLEVRelaxed() const;
-            void            SetLEVRelaxed(sal_Bool bSet);
+    inline	sal_Bool 		IsLEVRelaxed() const;
+            void	        SetLEVRelaxed(sal_Bool bSet);
 
-    inline  sal_uInt16      GetLEVOther() const;
-    inline  void            SetLEVOther(sal_uInt16 nSet);
+    inline	sal_uInt16		GetLEVOther() const;
+    inline	void			SetLEVOther(sal_uInt16 nSet);
 
-    inline  sal_uInt16      GetLEVShorter() const;
-    inline  void            SetLEVShorter(sal_uInt16 nSet);
+    inline	sal_uInt16		GetLEVShorter() const;
+    inline	void			SetLEVShorter(sal_uInt16 nSet);
 
-    inline  sal_uInt16      GetLEVLonger() const;
-    inline  void            SetLEVLonger(sal_uInt16 nSet);
+    inline	sal_uInt16		GetLEVLonger() const;
+    inline	void			SetLEVLonger(sal_uInt16 nSet);
 
-            void            GetFromDescriptor( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XSearchDescriptor > & rDescr );
-            void            SetToDescriptor( ::com::sun::star::uno::Reference< ::com::sun::star::util::XSearchDescriptor > & rDescr );
+            void			GetFromDescriptor( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XSearchDescriptor > & rDescr );
+            void			SetToDescriptor( ::com::sun::star::uno::Reference< ::com::sun::star::util::XSearchDescriptor > & rDescr );
 
     inline const com::sun::star::util::SearchOptions &
                 GetSearchOptions() const;
-    inline void SetSearchOptions( const com::sun::star::util::SearchOptions &rOpt );
+    inline void	SetSearchOptions( const com::sun::star::util::SearchOptions &rOpt );
 
-    inline  sal_Int32       GetTransliterationFlags() const;
-            void            SetTransliterationFlags( sal_Int32 nFlags );
+    inline 	sal_Int32		GetTransliterationFlags() const;
+            void			SetTransliterationFlags( sal_Int32 nFlags );
 
-    inline  sal_Bool        IsMatchFullHalfWidthForms() const;
-    void                    SetMatchFullHalfWidthForms( sal_Bool bVal );
+    inline 	sal_Bool		IsMatchFullHalfWidthForms() const;
+    void					SetMatchFullHalfWidthForms( sal_Bool bVal );
 
-    inline  sal_Bool        IsUseAsianOptions() const           { return bAsianOptions; }
-    inline  void            SetUseAsianOptions( sal_Bool bVal ) { bAsianOptions = bVal; }
+    inline 	sal_Bool		IsUseAsianOptions() const			{ return bAsianOptions; }
+    inline 	void			SetUseAsianOptions( sal_Bool bVal )	{ bAsianOptions = bVal; }
 };
 
 const String SvxSearchItem::GetSearchString() const
diff --git a/svl/inc/svl/stritem.hxx b/svl/inc/svl/stritem.hxx
index 5604eb3de6ed..5d1b45ee8ab3 100644
--- a/svl/inc/svl/stritem.hxx
+++ b/svl/inc/svl/stritem.hxx
@@ -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
diff --git a/svl/inc/svl/style.hrc b/svl/inc/svl/style.hrc
index f49a95e48f67..0dfe5f7c2e7b 100644
--- a/svl/inc/svl/style.hrc
+++ b/svl/inc/svl/style.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
@@ -28,11 +28,11 @@
 #ifndef _SFX_STYLE_HRC
 #define _SFX_STYLE_HRC
 
-#define SFXSTYLEBIT_AUTO     0x0000 // automatisch; Flags kommen von der Applikation
-#define SFXSTYLEBIT_READONLY 0x2000 // benutzte Vorlage (als Suchmaske)
-#define SFXSTYLEBIT_USED     0x4000 // benutzte Vorlage (als Suchmaske)
-#define SFXSTYLEBIT_USERDEF  0x8000 // benutzerdefinierte Vorlage
-#define SFXSTYLEBIT_ALL      0xFFFF // alle Vorlagen
+#define	SFXSTYLEBIT_AUTO	 0x0000	// automatisch; Flags kommen von der Applikation
+#define	SFXSTYLEBIT_READONLY 0x2000	// benutzte Vorlage (als Suchmaske)
+#define	SFXSTYLEBIT_USED	 0x4000	// benutzte Vorlage (als Suchmaske)
+#define	SFXSTYLEBIT_USERDEF	 0x8000	// benutzerdefinierte Vorlage
+#define	SFXSTYLEBIT_ALL		 0xFFFF	// alle Vorlagen
 
 #endif
 
diff --git a/svl/inc/svl/style.hxx b/svl/inc/svl/style.hxx
index b3138309293f..45b3cf54ba80 100644
--- a/svl/inc/svl/style.hxx
+++ b/svl/inc/svl/style.hxx
@@ -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
@@ -93,18 +93,18 @@ class SVL_DLLPUBLIC SfxStyleSheetBase : public comphelper::OWeakTypeObject
     friend class SfxStyleSheetBasePool;
 
 protected:
-    SfxStyleSheetBasePool&  rPool;          // zugehoeriger Pool
-    SfxStyleFamily          nFamily;        // Familie
+    SfxStyleSheetBasePool& 	rPool;			// zugehoeriger Pool
+    SfxStyleFamily 			nFamily;		// Familie
 
-    UniString               aName, aParent, aFollow;
-    rtl::OUString           maDisplayName;
-    String                  aHelpFile;      // Name der Hilfedatei
-    SfxItemSet*             pSet;           // ItemSet
-    USHORT                  nMask;          // Flags
+    UniString				aName, aParent, aFollow;
+    rtl::OUString			maDisplayName;
+    String 					aHelpFile;		// Name der Hilfedatei
+    SfxItemSet* 			pSet;           // ItemSet
+    USHORT  				nMask;			// Flags
 
-    ULONG                   nHelpId;        // Hilfe-ID
+    ULONG 					nHelpId;		// Hilfe-ID
 
-    BOOL                    bMySet;         // TRUE: Set loeschen im dtor
+    BOOL   					bMySet;			// TRUE: Set loeschen im dtor
 
     SfxStyleSheetBase(); // do not use!
     SfxStyleSheetBase( const UniString&, SfxStyleSheetBasePool&, SfxStyleFamily eFam, USHORT mask );
@@ -133,19 +133,19 @@ public:
     virtual BOOL SetParent( const UniString& );
     virtual const UniString& GetFollow() const;
     virtual BOOL SetFollow( const UniString& );
-    virtual BOOL HasFollowSupport() const;      // Default TRUE
-    virtual BOOL HasParentSupport() const;      // Default TRUE
-    virtual BOOL HasClearParentSupport() const; // Default FALSE
-    virtual BOOL IsUsed() const;                // Default TRUE
+    virtual BOOL HasFollowSupport() const;		// Default TRUE
+    virtual BOOL HasParentSupport() const;		// Default TRUE
+    virtual BOOL HasClearParentSupport() const;	// Default FALSE
+    virtual BOOL IsUsed() const;				// Default TRUE
         // Default aus dem Itemset; entweder dem uebergebenen
         // oder aus dem per GetItemSet() zurueckgelieferten Set
     virtual UniString GetDescription();
-    virtual UniString GetDescription( SfxMapUnit eMetric );
+    virtual	UniString GetDescription( SfxMapUnit eMetric );
 
     SfxStyleSheetBasePool& GetPool() { return rPool;   }
     SfxStyleFamily GetFamily() const     { return nFamily; }
-    USHORT   GetMask() const     { return nMask; }
-    void     SetMask( USHORT mask) { nMask = mask; }
+    USHORT 	 GetMask() const     { return nMask; }
+    void	 SetMask( USHORT mask) { nMask = mask; }
     BOOL   IsUserDefined() const
            { return BOOL( ( nMask & SFXSTYLEBIT_USERDEF) != 0 ); }
 
@@ -164,7 +164,7 @@ typedef std::vector< rtl::Reference< SfxStyleSheetBase > > SfxStyles;
 
 class SVL_DLLPUBLIC SfxStyleSheetIterator
 
-/*  [Beschreibung]
+/*	[Beschreibung]
 
     Klasse zum Iterieren und Suchen auf einem SfxStyleSheetBasePool.
 
@@ -185,20 +185,20 @@ public:
 
 protected:
 
-    SfxStyleSheetBasePool*  pBasePool;
-    SfxStyleFamily          nSearchFamily;
-    USHORT                  nMask;
+    SfxStyleSheetBasePool*	pBasePool;
+    SfxStyleFamily 			nSearchFamily;
+    USHORT 					nMask;
     BOOL                    SearchUsed() const { return bSearchUsed; }
 
 private:
-    USHORT                  GetPos(){return nAktPosition;}
-    SVL_DLLPRIVATE BOOL                     IsTrivialSearch();
-    SVL_DLLPRIVATE BOOL                     DoesStyleMatch(SfxStyleSheetBase *pStyle);
+    USHORT 					GetPos(){return nAktPosition;}
+    SVL_DLLPRIVATE BOOL 					IsTrivialSearch();
+    SVL_DLLPRIVATE BOOL 					DoesStyleMatch(SfxStyleSheetBase *pStyle);
 
-    void*                   pImp;
-    SfxStyleSheetBase*      pAktStyle;
-    USHORT                  nAktPosition;
-    BOOL                    bSearchUsed;
+    void*					pImp;
+    SfxStyleSheetBase*		pAktStyle;
+    USHORT 					nAktPosition;
+    BOOL 					bSearchUsed;
 
 friend class SfxStyleSheetBasePool;
 };
@@ -215,19 +215,19 @@ friend class SfxStyleSheetBase;
     SfxStyleSheetBasePool_Impl *pImp;
 
 private:
-    SVL_DLLPRIVATE BOOL                         Load1_Impl( SvStream& );
+    SVL_DLLPRIVATE BOOL 						Load1_Impl( SvStream& );
     SVL_DLLPRIVATE SfxStyleSheetIterator&      GetIterator_Impl();
 protected:
-    String                      aAppName;
-    SfxItemPool&                rPool;
-    SfxStyles                   aStyles;
-    SfxStyleFamily              nSearchFamily;
-    USHORT                      nMask;
+    String 						aAppName;
+    SfxItemPool& 				rPool;
+    SfxStyles	 				aStyles;
+    SfxStyleFamily 				nSearchFamily;
+    USHORT 		 				nMask;
 
-    SfxStyleSheetBase&          Add( SfxStyleSheetBase& );
-    void                        ChangeParent( const UniString&, const UniString&, BOOL bVirtual = TRUE );
-    virtual SfxStyleSheetBase*  Create( const UniString&, SfxStyleFamily, USHORT );
-    virtual SfxStyleSheetBase*  Create( const SfxStyleSheetBase& );
+    SfxStyleSheetBase& 			Add( SfxStyleSheetBase& );
+    void 						ChangeParent( const UniString&, const UniString&, BOOL bVirtual = TRUE );
+    virtual SfxStyleSheetBase* 	Create( const UniString&, SfxStyleFamily, USHORT );
+    virtual SfxStyleSheetBase* 	Create( const SfxStyleSheetBase& );
 
                                 ~SfxStyleSheetBasePool();
 
@@ -235,51 +235,51 @@ public:
                                 SfxStyleSheetBasePool( SfxItemPool& );
                                 SfxStyleSheetBasePool( const SfxStyleSheetBasePool& );
 
-    static String               GetStreamName();
+    static String 				GetStreamName();
 
-    const String&               GetAppName() const { return aAppName;   }
+    const String& 				GetAppName() const { return aAppName; 	}
 
-    SfxItemPool&                GetPool();
-    const SfxItemPool&          GetPool() const;
+    SfxItemPool& 				GetPool();
+    const SfxItemPool& 			GetPool() const;
 
     virtual SfxStyleSheetIterator* CreateIterator(SfxStyleFamily, USHORT nMask);
-    virtual USHORT              Count();
-    virtual SfxStyleSheetBase*  operator[](USHORT nIdx);
+    virtual USHORT 				Count();
+    virtual SfxStyleSheetBase*	operator[](USHORT nIdx);
 
-    virtual SfxStyleSheetBase&  Make(const UniString&,
+    virtual SfxStyleSheetBase& 	Make(const UniString&,
                                      SfxStyleFamily eFam,
                                      USHORT nMask = 0xffff ,
                                      USHORT nPos = 0xffff);
 
     virtual void             Replace(
         SfxStyleSheetBase& rSource, SfxStyleSheetBase& rTarget );
+    
+    virtual void				Remove( SfxStyleSheetBase* );
+    virtual void 				Insert( SfxStyleSheetBase* );
 
-    virtual void                Remove( SfxStyleSheetBase* );
-    virtual void                Insert( SfxStyleSheetBase* );
-
-    virtual void                Clear();
+    virtual void 				Clear();
 
-    SfxStyleSheetBasePool&      operator=( const SfxStyleSheetBasePool& );
-    SfxStyleSheetBasePool&      operator+=( const SfxStyleSheetBasePool& );
+    SfxStyleSheetBasePool& 		operator=( const SfxStyleSheetBasePool& );
+    SfxStyleSheetBasePool& 		operator+=( const SfxStyleSheetBasePool& );
 
-    const SfxStyles&            GetStyles();
-    virtual SfxStyleSheetBase*  First();
-    virtual SfxStyleSheetBase*  Next();
-    virtual SfxStyleSheetBase*  Find( const UniString&, SfxStyleFamily eFam, USHORT n=0xFFFF );
+    const SfxStyles&	 		GetStyles();
+    virtual SfxStyleSheetBase* 	First();
+    virtual SfxStyleSheetBase* 	Next();
+    virtual SfxStyleSheetBase* 	Find( const UniString&, SfxStyleFamily eFam, USHORT n=0xFFFF );
 
     virtual BOOL                SetParent(SfxStyleFamily eFam,
                                           const UniString &rStyle,
                                           const UniString &rParent);
 
-    SfxStyleSheetBase*          Find(const UniString& rStr)
+    SfxStyleSheetBase* 			Find(const UniString& rStr)
                                 { return Find(rStr, nSearchFamily, nMask); }
 
-    void                        SetSearchMask(SfxStyleFamily eFam, USHORT n=0xFFFF );
-    USHORT                      GetSearchMask() const;
-    SfxStyleFamily              GetSearchFamily() const  { return nSearchFamily; }
+    void   						SetSearchMask(SfxStyleFamily eFam, USHORT n=0xFFFF );
+    USHORT 						GetSearchMask() const;
+    SfxStyleFamily 				GetSearchFamily() const  { return nSearchFamily; }
 
-    BOOL                        Load( SvStream& );
-    BOOL                        Store( SvStream&, BOOL bUsed = TRUE );
+    BOOL 						Load( SvStream& );
+    BOOL 						Store( SvStream&, BOOL bUsed = TRUE );
 };
 
 //=========================================================================
@@ -293,12 +293,12 @@ public:
                         SfxStyleSheet( const UniString&, const SfxStyleSheetBasePool&, SfxStyleFamily, USHORT );
                         SfxStyleSheet( const SfxStyleSheet& );
 
-    virtual void        Notify( SfxBroadcaster& rBC, const SfxHint& rHint );
-    virtual BOOL        SetParent( const UniString& );
+    virtual void 		Notify( SfxBroadcaster& rBC, const SfxHint& rHint );
+    virtual BOOL 		SetParent( const UniString& );
 
 protected:
     SfxStyleSheet(); // do not use!
-    virtual             ~SfxStyleSheet();
+    virtual 			~SfxStyleSheet();
 };
 
 //=========================================================================
@@ -313,16 +313,16 @@ protected:
 public:
     SfxStyleSheetPool( SfxItemPool const& );
 
-//  virtual BOOL CopyTo(SfxStyleSheetPool &rDest, const String &rSourceName);
+//	virtual BOOL CopyTo(SfxStyleSheetPool &rDest, const String &rSourceName);
 };
 
 //=========================================================================
 
-#define SFX_STYLESHEET_CREATED       1  // neu
-#define SFX_STYLESHEET_MODIFIED      2  // ver"andert
-#define SFX_STYLESHEET_CHANGED       3  // gel"oscht und neu (ausgetauscht)
-#define SFX_STYLESHEET_ERASED        4  // gel"oscht
-#define SFX_STYLESHEET_INDESTRUCTION 5  // wird gerade entfernt
+#define SFX_STYLESHEET_CREATED		 1	// neu
+#define SFX_STYLESHEET_MODIFIED      2	// ver"andert
+#define SFX_STYLESHEET_CHANGED       3	// gel"oscht und neu (ausgetauscht)
+#define SFX_STYLESHEET_ERASED        4	// gel"oscht
+#define SFX_STYLESHEET_INDESTRUCTION 5	// wird gerade entfernt
 
 #define SFX_STYLESHEETPOOL_CHANGES  1  // Aenderungen, die den Zustand
                                        // des Pools anedern, aber nicht
@@ -339,7 +339,7 @@ public:
     TYPEINFO();
 
                         SfxStyleSheetPoolHint(USHORT nArgHint) :  nHint(nArgHint){}
-    USHORT              GetHint() const
+    USHORT				GetHint() const
                         { return nHint; }
 };
 
@@ -347,7 +347,7 @@ public:
 
 class SVL_DLLPUBLIC SfxStyleSheetHint: public SfxHint
 {
-    SfxStyleSheetBase*  pStyleSh;
+    SfxStyleSheetBase*	pStyleSh;
     USHORT              nHint;
 
 public:
@@ -355,9 +355,9 @@ public:
 
                         SfxStyleSheetHint( USHORT );
                         SfxStyleSheetHint( USHORT, SfxStyleSheetBase& );
-    SfxStyleSheetBase*  GetStyleSheet() const
+    SfxStyleSheetBase*	GetStyleSheet() const
                         { return pStyleSh; }
-    USHORT              GetHint() const
+    USHORT				GetHint() const
                         { return nHint; }
 };
 
diff --git a/svl/inc/svl/svarray.hxx b/svl/inc/svl/svarray.hxx
index 99b2901b95f9..7b7694ce688d 100644
--- a/svl/inc/svl/svarray.hxx
+++ b/svl/inc/svl/svarray.hxx
@@ -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
@@ -31,82 +31,82 @@
 #if 0
 ***********************************************************************
 *
-*   Hier folgt die Beschreibung fuer die exportierten Makros:
+*	Hier folgt die Beschreibung fuer die exportierten Makros:
 *
-*       SV_DECL_VARARR(nm, AE, IS, GS)
-*       SV_IMPL_VARARR( nm, AE )
-*           definiere/implementiere ein Array das einfache Objecte
-*           enthaelt. (Sie werden im Speicher verschoben, koennen also
-*           z.B. keine String sein)
+*		SV_DECL_VARARR(nm, AE, IS, GS)
+*		SV_IMPL_VARARR( nm, AE )
+*			definiere/implementiere ein Array das einfache Objecte
+*			enthaelt. (Sie werden im Speicher verschoben, koennen also
+*			z.B. keine String sein)
 *
-*       SV_DECL_OBJARR(nm, AE, IS, GS)
-*       SV_IMPL_OBJARR( nm, AE )
-*           definiere/implementiere ein Array das Objecte enthaelt.
-*           (Hier koennen es auch Strings sein)
+*		SV_DECL_OBJARR(nm, AE, IS, GS)
+*		SV_IMPL_OBJARR( nm, AE )
+*			definiere/implementiere ein Array das Objecte enthaelt.
+*			(Hier koennen es auch Strings sein)
 *
 *
-*       SV_DECL_PTRARR(nm, AE, IS, GS)
-*       SV_IMPL_PTRARR(nm, AE)
-*           definiere/implementiere ein Array das Pointer haelt. Diese
-*           werden von aussen angelegt und zerstoert. Das IMPL-Makro
-*           wird nur benoetigt, wenn die DeleteAndDestroy Methode genutzt
-*           wird, diese loescht dann die Pointer und ruft deren Destruktoren
+*		SV_DECL_PTRARR(nm, AE, IS, GS)
+*		SV_IMPL_PTRARR(nm, AE)
+*			definiere/implementiere ein Array das Pointer haelt. Diese
+*			werden von aussen angelegt und zerstoert. Das IMPL-Makro
+*			wird nur benoetigt, wenn die DeleteAndDestroy Methode genutzt
+*			wird, diese loescht dann die Pointer und ruft deren Destruktoren
 *
-*       SV_DECL_PTRARR_DEL(nm, AE, IS, GS)
-*       SV_IMPL_PTRARR(nm, AE)
-*           definiere/implementiere ein Array das Pointer haelt. Diese
-*           werden von aussen angelegt und im Destructor zerstoert.
+*		SV_DECL_PTRARR_DEL(nm, AE, IS, GS)
+*		SV_IMPL_PTRARR(nm, AE)
+*			definiere/implementiere ein Array das Pointer haelt. Diese
+*			werden von aussen angelegt und im Destructor zerstoert.
 *
 *
-*       SV_DECL_PTRARR_SORT(nm, AE, IS, GS)
-*       SV_IMPL_PTRARR_SORT( nm,AE )
-*           defieniere/implementiere ein Sort-Array mit Pointern, das nach
-*           Pointern sortiert ist. Basiert auf einem PTRARR
+*		SV_DECL_PTRARR_SORT(nm, AE, IS, GS)
+*		SV_IMPL_PTRARR_SORT( nm,AE )
+*			defieniere/implementiere ein Sort-Array mit Pointern, das nach
+*			Pointern sortiert ist. Basiert auf einem PTRARR
 *
-*       SV_DECL_PTRARR_SORT_DEL(nm, AE, IS, GS)
-*       SV_IMPL_PTRARR_SORT( nm,AE )
-*           defieniere/implementiere ein Sort-Array mit Pointern, das nach
-*           Pointern sortiert ist. Basiert auf einem PTRARR_DEL
+*		SV_DECL_PTRARR_SORT_DEL(nm, AE, IS, GS)
+*		SV_IMPL_PTRARR_SORT( nm,AE )
+*			defieniere/implementiere ein Sort-Array mit Pointern, das nach
+*			Pointern sortiert ist. Basiert auf einem PTRARR_DEL
 *
-*       SV_DECL_PTRARR_SORT(nm, AE, IS, GS)
-*       SV_IMPL_OP_PTRARR_SORT( nm,AE )
-*           defieniere/implementiere ein Sort-Array mit Pointern, das nach
-*           Objecten sortiert ist. Basiert auf einem PTRARR.
-*           Sortierung mit Hilfe der Object-operatoren "<" und "=="
+*		SV_DECL_PTRARR_SORT(nm, AE, IS, GS)
+*		SV_IMPL_OP_PTRARR_SORT( nm,AE )
+*			defieniere/implementiere ein Sort-Array mit Pointern, das nach
+*			Objecten sortiert ist. Basiert auf einem PTRARR.
+*			Sortierung mit Hilfe der Object-operatoren "<" und "=="
 *
-*       SV_DECL_PTRARR_SORT_DEL(nm, AE, IS, GS)
-*       SV_IMPL_OP_PTRARR_SORT( nm,AE )
-*           defieniere/implementiere ein Sort-Array mit Pointern, das nach
-*           Objecten sortiert ist. Basiert auf einem PTRARR_DEL.
-*           Sortierung mit Hilfe der Object-operatoren "<" und "=="
+*		SV_DECL_PTRARR_SORT_DEL(nm, AE, IS, GS)
+*		SV_IMPL_OP_PTRARR_SORT( nm,AE )
+*			defieniere/implementiere ein Sort-Array mit Pointern, das nach
+*			Objecten sortiert ist. Basiert auf einem PTRARR_DEL.
+*			Sortierung mit Hilfe der Object-operatoren "<" und "=="
 *
-*       SV_DECL_VARARR_SORT(nm, AE, IS, GS)
-*       SV_IMPL_VARARR_SORT( nm,AE )
-*           defieniere/implementiere ein Sort-Array mit einfachen Objecten.
-*           Basiert auf einem VARARR.
-*           Sortierung mit Hilfe der Object-operatoren "<" und "=="
+*		SV_DECL_VARARR_SORT(nm, AE, IS, GS)
+*		SV_IMPL_VARARR_SORT( nm,AE )
+*			defieniere/implementiere ein Sort-Array mit einfachen Objecten.
+*			Basiert auf einem VARARR.
+*			Sortierung mit Hilfe der Object-operatoren "<" und "=="
 *
 * JP 23.12.94 neu:
-*       SV_DECL_PTRARR_STACK(nm, AE, IS, GS)
-*           ein Stack mit einem PtrArray als Grundlage.
+*		SV_DECL_PTRARR_STACK(nm, AE, IS, GS)
+*			ein Stack mit einem PtrArray als Grundlage.
 *
 * JP 09.10.96:  vordefinierte Arrays:
-*   VarArr:     SvBools, SvULongs, SvUShorts, SvLongs, SvShorts
-*   PtrArr:     SvStrings, SvStringsDtor
-*   SortArr:    SvStringsSort, SvStringsSortDtor,
-*               SvStringsISort, SvStringsISortDtor
+*	VarArr:		SvBools, SvULongs, SvUShorts, SvLongs, SvShorts
+*	PtrArr:		SvStrings, SvStringsDtor
+*	SortArr:	SvStringsSort, SvStringsSortDtor,
+*				SvStringsISort, SvStringsISortDtor
 ***********************************************************************
 #endif
 
 #include "svl/svldllapi.h"
 
 #ifndef INCLUDED_STRING_H
-#include <string.h>     // memmove()
+#include <string.h> 	// memmove()
 #define INCLUDED_STRING_H
 #endif
 
 #ifndef INCLUDED_LIMITS_H
-#include <limits.h>     // USHRT_MAX
+#include <limits.h> 	// USHRT_MAX
 #define INCLUDED_LIMITS_H
 #endif
 #include <rtl/alloc.h>
@@ -692,7 +692,7 @@ public:\
     void Insert( const AE *pE, USHORT nL );\
     void Remove( USHORT nP, USHORT nL = 1 );\
     void Remove( const AE& aE, USHORT nL = 1 );\
-    USHORT Count() const  {   return nm##_SAR::Count(); }\
+    USHORT Count() const  {   return nm##_SAR::Count();	}\
     const AE* GetData() const { return (const AE*)pData; }\
 \
 /* Das Ende stehe im DECL-Makro !!! */
@@ -860,7 +860,7 @@ void nm::Remove( const AE &aE, USHORT nL )\
         return SvPtrarr::GetPos((const VoidPtr&)aE);\
     }\
     void Remove( AE& aE, USHORT nL = 1 ) { \
-        Remove( (const AE&) aE, nL  );\
+        Remove( (const AE&) aE, nL	);\
     }
 
 #else
@@ -908,7 +908,7 @@ _SV_DECL_PTRARR_SORT(nm, AE, IS, GS, )
 
 #define SV_DECL_PTRARR_SORT_VISIBILITY(nm, AE, IS, GS, vis)\
 _SV_DECL_PTRARR_SORT(nm, AE, IS, GS, vis)
-
+                                                                                                                             
 
 #define _SV_DECL_PTRARR_SORT_DEL(nm, AE, IS, GS, vis)\
 _SV_DECL_PTRARR_SORT_ALG(nm, AE, IS, GS, vis)\
@@ -1050,4 +1050,4 @@ public:\
 #endif
 #endif
 
-#endif  //_SVARRAY_HXX
+#endif	//_SVARRAY_HXX
diff --git a/svl/inc/svl/svdde.hxx b/svl/inc/svl/svdde.hxx
index bb14d0fcdcdf..2d08bf1381b1 100644
--- a/svl/inc/svl/svdde.hxx
+++ b/svl/inc/svl/svdde.hxx
@@ -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
@@ -92,7 +92,7 @@ class SVL_DLLPUBLIC DdeData
 //#if 0 // _SOLAR__PRIVATE
     SVL_DLLPRIVATE void            Lock();
 //#endif
-    void            SetFormat( ULONG nFmt );
+    void			SetFormat( ULONG nFmt );
 
 public:
                     DdeData();
diff --git a/svl/inc/svl/svl.hrc b/svl/inc/svl/svl.hrc
index d63e84f2b91f..7ec7816e1610 100644
--- a/svl/inc/svl/svl.hrc
+++ b/svl/inc/svl/svl.hrc
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2008 by Sun Microsystems, Inc.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -28,133 +28,133 @@
  *
  ************************************************************************/
 #ifndef _SVL_HRC
-#define _SVL_HRC
+#define _SVL_HRC 
 
 #include <svl/solar.hrc>
 
-#define STR_SVT_MIMETYPE_START              (RID_SVL_START)
-#define STR_SVT_MIMETYPE_APP_OCTSTREAM      (STR_SVT_MIMETYPE_START+0)
-#define STR_SVT_MIMETYPE_APP_PDF            (STR_SVT_MIMETYPE_START+1)
-#define STR_SVT_MIMETYPE_APP_RTF            (STR_SVT_MIMETYPE_START+2)
-#define STR_SVT_MIMETYPE_APP_MSWORD         (STR_SVT_MIMETYPE_START+3)
-#define STR_SVT_MIMETYPE_APP_STARCALC       (STR_SVT_MIMETYPE_START+4)
-#define STR_SVT_MIMETYPE_APP_STARCHART      (STR_SVT_MIMETYPE_START+5)
-#define STR_SVT_MIMETYPE_APP_STARDRAW       (STR_SVT_MIMETYPE_START+6)
-#define STR_SVT_MIMETYPE_APP_STARIMAGE      (STR_SVT_MIMETYPE_START+7)
-#define STR_SVT_MIMETYPE_APP_STARMATH       (STR_SVT_MIMETYPE_START+8)
-#define STR_SVT_MIMETYPE_APP_STARWRITER     (STR_SVT_MIMETYPE_START+9)
-#define STR_SVT_MIMETYPE_APP_ZIP            (STR_SVT_MIMETYPE_START+10)
-#define STR_SVT_MIMETYPE_AUDIO_AIFF         (STR_SVT_MIMETYPE_START+11)
-#define STR_SVT_MIMETYPE_AUDIO_BASIC        (STR_SVT_MIMETYPE_START+12)
-#define STR_SVT_MIMETYPE_AUDIO_MIDI         (STR_SVT_MIMETYPE_START+13)
-#define STR_SVT_MIMETYPE_AUDIO_WAV          (STR_SVT_MIMETYPE_START+14)
-#define STR_SVT_MIMETYPE_IMAGE_GIF          (STR_SVT_MIMETYPE_START+15)
-#define STR_SVT_MIMETYPE_IMAGE_JPEG         (STR_SVT_MIMETYPE_START+16)
-#define STR_SVT_MIMETYPE_IMAGE_PCX          (STR_SVT_MIMETYPE_START+17)
-#define STR_SVT_MIMETYPE_IMAGE_BMP          (STR_SVT_MIMETYPE_START+18)
-#define STR_SVT_MIMETYPE_TEXT_HTML          (STR_SVT_MIMETYPE_START+19)
-#define STR_SVT_MIMETYPE_TEXT_PLAIN         (STR_SVT_MIMETYPE_START+20)
-#define STR_SVT_MIMETYPE_TEXT_URL           (STR_SVT_MIMETYPE_START+21)
-#define STR_SVT_MIMETYPE_TEXT_VCARD         (STR_SVT_MIMETYPE_START+22)
-#define STR_SVT_MIMETYPE_VIDEO_VDO          (STR_SVT_MIMETYPE_START+23)
-#define STR_SVT_MIMETYPE_VIDEO_MSVIDEO      (STR_SVT_MIMETYPE_START+24)
-#define STR_SVT_MIMETYPE_X_STARMAIL         (STR_SVT_MIMETYPE_START+25)
-#define STR_SVT_MIMETYPE_X_VRML             (STR_SVT_MIMETYPE_START+26)
-#define STR_SVT_MIMETYPE_APP_STARHELP       (STR_SVT_MIMETYPE_START+27)
-#define STR_SVT_MIMETYPE_APP_STARIMPRESS    (STR_SVT_MIMETYPE_START+28)
-#define STR_SVT_MIMETYPE_APP_SCHED_CMB      (STR_SVT_MIMETYPE_START+29)
-#define STR_SVT_MIMETYPE_APP_SCHED_EVT      (STR_SVT_MIMETYPE_START+30)
-#define STR_SVT_MIMETYPE_APP_SCHED_TASK     (STR_SVT_MIMETYPE_START+31)
-#define STR_SVT_MIMETYPE_APP_SCHED_TVIEW    (STR_SVT_MIMETYPE_START+32)
+#define STR_SVT_MIMETYPE_START				(RID_SVL_START)
+#define STR_SVT_MIMETYPE_APP_OCTSTREAM		(STR_SVT_MIMETYPE_START+0)
+#define STR_SVT_MIMETYPE_APP_PDF			(STR_SVT_MIMETYPE_START+1)
+#define STR_SVT_MIMETYPE_APP_RTF			(STR_SVT_MIMETYPE_START+2)
+#define STR_SVT_MIMETYPE_APP_MSWORD 		(STR_SVT_MIMETYPE_START+3)
+#define STR_SVT_MIMETYPE_APP_STARCALC		(STR_SVT_MIMETYPE_START+4)
+#define STR_SVT_MIMETYPE_APP_STARCHART		(STR_SVT_MIMETYPE_START+5)
+#define STR_SVT_MIMETYPE_APP_STARDRAW		(STR_SVT_MIMETYPE_START+6)
+#define STR_SVT_MIMETYPE_APP_STARIMAGE		(STR_SVT_MIMETYPE_START+7)
+#define STR_SVT_MIMETYPE_APP_STARMATH		(STR_SVT_MIMETYPE_START+8)
+#define STR_SVT_MIMETYPE_APP_STARWRITER 	(STR_SVT_MIMETYPE_START+9)
+#define STR_SVT_MIMETYPE_APP_ZIP			(STR_SVT_MIMETYPE_START+10)
+#define STR_SVT_MIMETYPE_AUDIO_AIFF 		(STR_SVT_MIMETYPE_START+11)
+#define STR_SVT_MIMETYPE_AUDIO_BASIC		(STR_SVT_MIMETYPE_START+12)
+#define STR_SVT_MIMETYPE_AUDIO_MIDI 		(STR_SVT_MIMETYPE_START+13)
+#define STR_SVT_MIMETYPE_AUDIO_WAV			(STR_SVT_MIMETYPE_START+14)
+#define STR_SVT_MIMETYPE_IMAGE_GIF			(STR_SVT_MIMETYPE_START+15)
+#define STR_SVT_MIMETYPE_IMAGE_JPEG 		(STR_SVT_MIMETYPE_START+16)
+#define STR_SVT_MIMETYPE_IMAGE_PCX			(STR_SVT_MIMETYPE_START+17)
+#define STR_SVT_MIMETYPE_IMAGE_BMP			(STR_SVT_MIMETYPE_START+18)
+#define STR_SVT_MIMETYPE_TEXT_HTML			(STR_SVT_MIMETYPE_START+19)
+#define STR_SVT_MIMETYPE_TEXT_PLAIN 		(STR_SVT_MIMETYPE_START+20)
+#define STR_SVT_MIMETYPE_TEXT_URL			(STR_SVT_MIMETYPE_START+21)
+#define STR_SVT_MIMETYPE_TEXT_VCARD 		(STR_SVT_MIMETYPE_START+22)
+#define STR_SVT_MIMETYPE_VIDEO_VDO			(STR_SVT_MIMETYPE_START+23)
+#define STR_SVT_MIMETYPE_VIDEO_MSVIDEO		(STR_SVT_MIMETYPE_START+24)
+#define STR_SVT_MIMETYPE_X_STARMAIL 		(STR_SVT_MIMETYPE_START+25)
+#define STR_SVT_MIMETYPE_X_VRML 			(STR_SVT_MIMETYPE_START+26)
+#define STR_SVT_MIMETYPE_APP_STARHELP		(STR_SVT_MIMETYPE_START+27)
+#define STR_SVT_MIMETYPE_APP_STARIMPRESS	(STR_SVT_MIMETYPE_START+28)
+#define STR_SVT_MIMETYPE_APP_SCHED_CMB		(STR_SVT_MIMETYPE_START+29)
+#define STR_SVT_MIMETYPE_APP_SCHED_EVT		(STR_SVT_MIMETYPE_START+30)
+#define STR_SVT_MIMETYPE_APP_SCHED_TASK 	(STR_SVT_MIMETYPE_START+31)
+#define STR_SVT_MIMETYPE_APP_SCHED_TVIEW	(STR_SVT_MIMETYPE_START+32)
 
-#define STR_SVT_MIMETYPE_CNT_MSG            (STR_SVT_MIMETYPE_START+33)
-#define STR_SVT_MIMETYPE_CNT_DOCUMENT       (STR_SVT_MIMETYPE_START+34)
-#define STR_SVT_MIMETYPE_CNT_POP3BOX        (STR_SVT_MIMETYPE_START+35)
-#define STR_SVT_MIMETYPE_CNT_IMAPBOX        (STR_SVT_MIMETYPE_START+36)
-#define STR_SVT_MIMETYPE_CNT_IMAPFLD        (STR_SVT_MIMETYPE_START+37)
-#define STR_SVT_MIMETYPE_CNT_VIMBOX         (STR_SVT_MIMETYPE_START+38)
-#define STR_SVT_MIMETYPE_CNT_VIMINBOX       (STR_SVT_MIMETYPE_START+39)
-#define STR_SVT_MIMETYPE_CNT_BBBOX          (STR_SVT_MIMETYPE_START+40)
-#define STR_SVT_MIMETYPE_CNT_VIM_BB         (STR_SVT_MIMETYPE_START+41)
-#define STR_SVT_MIMETYPE_CNT_NEWSBOX        (STR_SVT_MIMETYPE_START+42)
-#define STR_SVT_MIMETYPE_CNT_NEWSGRP        (STR_SVT_MIMETYPE_START+43)
-#define STR_SVT_MIMETYPE_CNT_OUTBOX         (STR_SVT_MIMETYPE_START+44)
-#define STR_SVT_MIMETYPE_CNT_FTPBOX         (STR_SVT_MIMETYPE_START+45)
-#define STR_SVT_MIMETYPE_CNT_FTPFLD         (STR_SVT_MIMETYPE_START+46)
-#define STR_SVT_MIMETYPE_CNT_FTPFILE        (STR_SVT_MIMETYPE_START+47)
-#define STR_SVT_MIMETYPE_CNT_FTPLINK        (STR_SVT_MIMETYPE_START+48)
-#define STR_SVT_MIMETYPE_CNT_HTTPBOX        (STR_SVT_MIMETYPE_START+49)
-#define STR_SVT_MIMETYPE_CNT_FSYSBOX        (STR_SVT_MIMETYPE_START+50)
-#define STR_SVT_MIMETYPE_CNT_FSYSFLD        (STR_SVT_MIMETYPE_START+51)
-#define STR_SVT_MIMETYPE_CNT_FSYSFILE       (STR_SVT_MIMETYPE_START+52)
-#define STR_SVT_MIMETYPE_CNT_FSYSURLFILE    (STR_SVT_MIMETYPE_START+53)
-#define STR_SVT_MIMETYPE_CNT_PUBLBOX        (STR_SVT_MIMETYPE_START+54)
-#define STR_SVT_MIMETYPE_CNT_SRCHBOX        (STR_SVT_MIMETYPE_START+55)
-#define STR_SVT_MIMETYPE_CNT_SUBSCRBOX      (STR_SVT_MIMETYPE_START+56)
-#define STR_SVT_MIMETYPE_CNT_BOOKMARK       (STR_SVT_MIMETYPE_START+57)
-#define STR_SVT_MIMETYPE_CNT_CDF            (STR_SVT_MIMETYPE_START+58)
-#define STR_SVT_MIMETYPE_CNT_CDFSUB         (STR_SVT_MIMETYPE_START+59)
-#define STR_SVT_MIMETYPE_CNT_CDFITEM        (STR_SVT_MIMETYPE_START+60)
-#define STR_SVT_MIMETYPE_CNT_STARCHANNEL    (STR_SVT_MIMETYPE_START+61)
-#define STR_SVT_MIMETYPE_CNT_TRASHBOX       (STR_SVT_MIMETYPE_START+62)
-#define STR_SVT_MIMETYPE_CNT_TRASH          (STR_SVT_MIMETYPE_START+63)
-#define STR_SVT_MIMETYPE_CNT_REMOV_VOL      (STR_SVT_MIMETYPE_START+64)
-#define STR_SVT_MIMETYPE_CNT_FIX_VOL        (STR_SVT_MIMETYPE_START+65)
-#define STR_SVT_MIMETYPE_CNT_REM_VOL        (STR_SVT_MIMETYPE_START+66)
-#define STR_SVT_MIMETYPE_CNT_RAM_VOL        (STR_SVT_MIMETYPE_START+67)
-#define STR_SVT_MIMETYPE_CNT_CDROM          (STR_SVT_MIMETYPE_START+68)
-#define STR_SVT_MIMETYPE_CNT_DISK_35        (STR_SVT_MIMETYPE_START+69)
-#define STR_SVT_MIMETYPE_CNT_DISK_525       (STR_SVT_MIMETYPE_START+70)
-#define STR_SVT_MIMETYPE_CNT_TAPEDRIVE      (STR_SVT_MIMETYPE_START+71)
-#define STR_SVT_MIMETYPE_APP_GAL            (STR_SVT_MIMETYPE_START+72)
-#define STR_SVT_MIMETYPE_APP_GAL_THEME      (STR_SVT_MIMETYPE_START+73)
-#define STR_SVT_MIMETYPE_CNT_SEPARATOR      (STR_SVT_MIMETYPE_START+74)
-#define STR_SVT_MIMETYPE_APP_STARW_GLOB     (STR_SVT_MIMETYPE_START+75)
-#define STR_SVT_MIMETYPE_APP_SDM            (STR_SVT_MIMETYPE_START+76)
-#define STR_SVT_MIMETYPE_APP_SMD            (STR_SVT_MIMETYPE_START+77)
-#define STR_SVT_MIMETYPE_APP_STARW_WEB      (STR_SVT_MIMETYPE_START+78)
-#define STR_SVT_MIMETYPE_SCHEDULE           (STR_SVT_MIMETYPE_START+79)
-#define STR_SVT_MIMETYPE_SCHEDULE_EVT       (STR_SVT_MIMETYPE_START+80)
-#define STR_SVT_MIMETYPE_SCHEDULE_TASK      (STR_SVT_MIMETYPE_START+81)
-#define STR_SVT_MIMETYPE_SCHEDULE_FEVT      (STR_SVT_MIMETYPE_START+82)
-#define STR_SVT_MIMETYPE_SCHEDULE_FTASK     (STR_SVT_MIMETYPE_START+83)
-#define STR_SVT_MIMETYPE_FRAMESET           (STR_SVT_MIMETYPE_START+84)
-#define STR_SVT_MIMETYPE_MACRO              (STR_SVT_MIMETYPE_START+85)
-#define STR_SVT_MIMETYPE_CNT_SFSYSFOLDER    (STR_SVT_MIMETYPE_START+86)
-#define STR_SVT_MIMETYPE_CNT_SFSYSFILE      (STR_SVT_MIMETYPE_START+87)
-#define STR_SVT_MIMETYPE_APP_TEMPLATE       (STR_SVT_MIMETYPE_START+88)
-#define STR_SVT_MIMETYPE_IMAGE_GENERIC      (STR_SVT_MIMETYPE_START+89)
-#define STR_SVT_MIMETYPE_APP_MSEXCEL        (STR_SVT_MIMETYPE_START+90)
-#define STR_SVT_MIMETYPE_APP_MSEXCEL_TEMPL  (STR_SVT_MIMETYPE_START+91)
-#define STR_SVT_MIMETYPE_APP_MSPPOINT       (STR_SVT_MIMETYPE_START+92)
-#define STR_SVT_MIMETYPE_TEXT_VCALENDAR     (STR_SVT_MIMETYPE_START+93)
-#define STR_SVT_MIMETYPE_TEXT_ICALENDAR     (STR_SVT_MIMETYPE_START+94)
-#define STR_SVT_MIMETYPE_TEXT_XMLICALENDAR  (STR_SVT_MIMETYPE_START+95)
-#define STR_SVT_MIMETYPE_TEXT_CDE_CALENDAR_APP  (STR_SVT_MIMETYPE_START+96)
-#define STR_SVT_MIMETYPE_INET_MSG_RFC822        (STR_SVT_MIMETYPE_START+97)
-#define STR_SVT_MIMETYPE_INET_MULTI_ALTERNATIVE (STR_SVT_MIMETYPE_START+98)
-#define STR_SVT_MIMETYPE_INET_MULTI_DIGEST      (STR_SVT_MIMETYPE_START+99)
-#define STR_SVT_MIMETYPE_INET_MULTI_PARALLEL    (STR_SVT_MIMETYPE_START+100)
-#define STR_SVT_MIMETYPE_INET_MULTI_RELATED     (STR_SVT_MIMETYPE_START+101)
-#define STR_SVT_MIMETYPE_INET_MULTI_MIXED       (STR_SVT_MIMETYPE_START+102)
-#define STR_SVT_MIMETYPE_APP_IMPRESSPACKED      (STR_SVT_MIMETYPE_START+103)
-#define STR_SVT_MIMETYPE_APP_JAR                (STR_SVT_MIMETYPE_START+104)
-#define STR_SVT_MIMETYPE_IMAGE_PNG              (STR_SVT_MIMETYPE_START+105)
-#define STR_SVT_MIMETYPE_IMAGE_TIFF             (STR_SVT_MIMETYPE_START+106)
+#define STR_SVT_MIMETYPE_CNT_MSG			(STR_SVT_MIMETYPE_START+33)
+#define STR_SVT_MIMETYPE_CNT_DOCUMENT		(STR_SVT_MIMETYPE_START+34)
+#define STR_SVT_MIMETYPE_CNT_POP3BOX		(STR_SVT_MIMETYPE_START+35)
+#define STR_SVT_MIMETYPE_CNT_IMAPBOX		(STR_SVT_MIMETYPE_START+36)
+#define STR_SVT_MIMETYPE_CNT_IMAPFLD		(STR_SVT_MIMETYPE_START+37)
+#define STR_SVT_MIMETYPE_CNT_VIMBOX 		(STR_SVT_MIMETYPE_START+38)
+#define STR_SVT_MIMETYPE_CNT_VIMINBOX		(STR_SVT_MIMETYPE_START+39)
+#define STR_SVT_MIMETYPE_CNT_BBBOX			(STR_SVT_MIMETYPE_START+40)
+#define STR_SVT_MIMETYPE_CNT_VIM_BB 		(STR_SVT_MIMETYPE_START+41)
+#define STR_SVT_MIMETYPE_CNT_NEWSBOX		(STR_SVT_MIMETYPE_START+42)
+#define STR_SVT_MIMETYPE_CNT_NEWSGRP		(STR_SVT_MIMETYPE_START+43)
+#define STR_SVT_MIMETYPE_CNT_OUTBOX 		(STR_SVT_MIMETYPE_START+44)
+#define STR_SVT_MIMETYPE_CNT_FTPBOX 		(STR_SVT_MIMETYPE_START+45)
+#define STR_SVT_MIMETYPE_CNT_FTPFLD 		(STR_SVT_MIMETYPE_START+46)
+#define STR_SVT_MIMETYPE_CNT_FTPFILE		(STR_SVT_MIMETYPE_START+47)
+#define STR_SVT_MIMETYPE_CNT_FTPLINK		(STR_SVT_MIMETYPE_START+48)
+#define STR_SVT_MIMETYPE_CNT_HTTPBOX		(STR_SVT_MIMETYPE_START+49)
+#define STR_SVT_MIMETYPE_CNT_FSYSBOX		(STR_SVT_MIMETYPE_START+50)
+#define STR_SVT_MIMETYPE_CNT_FSYSFLD		(STR_SVT_MIMETYPE_START+51)
+#define STR_SVT_MIMETYPE_CNT_FSYSFILE		(STR_SVT_MIMETYPE_START+52)
+#define STR_SVT_MIMETYPE_CNT_FSYSURLFILE	(STR_SVT_MIMETYPE_START+53)
+#define STR_SVT_MIMETYPE_CNT_PUBLBOX		(STR_SVT_MIMETYPE_START+54)
+#define STR_SVT_MIMETYPE_CNT_SRCHBOX		(STR_SVT_MIMETYPE_START+55)
+#define STR_SVT_MIMETYPE_CNT_SUBSCRBOX		(STR_SVT_MIMETYPE_START+56)
+#define STR_SVT_MIMETYPE_CNT_BOOKMARK		(STR_SVT_MIMETYPE_START+57)
+#define STR_SVT_MIMETYPE_CNT_CDF			(STR_SVT_MIMETYPE_START+58)
+#define STR_SVT_MIMETYPE_CNT_CDFSUB 		(STR_SVT_MIMETYPE_START+59)
+#define STR_SVT_MIMETYPE_CNT_CDFITEM		(STR_SVT_MIMETYPE_START+60)
+#define STR_SVT_MIMETYPE_CNT_STARCHANNEL	(STR_SVT_MIMETYPE_START+61)
+#define STR_SVT_MIMETYPE_CNT_TRASHBOX		(STR_SVT_MIMETYPE_START+62)
+#define STR_SVT_MIMETYPE_CNT_TRASH			(STR_SVT_MIMETYPE_START+63)
+#define STR_SVT_MIMETYPE_CNT_REMOV_VOL		(STR_SVT_MIMETYPE_START+64)
+#define STR_SVT_MIMETYPE_CNT_FIX_VOL		(STR_SVT_MIMETYPE_START+65)
+#define STR_SVT_MIMETYPE_CNT_REM_VOL		(STR_SVT_MIMETYPE_START+66)
+#define STR_SVT_MIMETYPE_CNT_RAM_VOL		(STR_SVT_MIMETYPE_START+67)
+#define STR_SVT_MIMETYPE_CNT_CDROM			(STR_SVT_MIMETYPE_START+68)
+#define STR_SVT_MIMETYPE_CNT_DISK_35		(STR_SVT_MIMETYPE_START+69)
+#define STR_SVT_MIMETYPE_CNT_DISK_525		(STR_SVT_MIMETYPE_START+70)
+#define STR_SVT_MIMETYPE_CNT_TAPEDRIVE		(STR_SVT_MIMETYPE_START+71)
+#define STR_SVT_MIMETYPE_APP_GAL			(STR_SVT_MIMETYPE_START+72)
+#define STR_SVT_MIMETYPE_APP_GAL_THEME		(STR_SVT_MIMETYPE_START+73)
+#define STR_SVT_MIMETYPE_CNT_SEPARATOR		(STR_SVT_MIMETYPE_START+74)
+#define STR_SVT_MIMETYPE_APP_STARW_GLOB 	(STR_SVT_MIMETYPE_START+75)
+#define STR_SVT_MIMETYPE_APP_SDM			(STR_SVT_MIMETYPE_START+76)
+#define STR_SVT_MIMETYPE_APP_SMD			(STR_SVT_MIMETYPE_START+77)
+#define STR_SVT_MIMETYPE_APP_STARW_WEB		(STR_SVT_MIMETYPE_START+78)
+#define STR_SVT_MIMETYPE_SCHEDULE			(STR_SVT_MIMETYPE_START+79)
+#define STR_SVT_MIMETYPE_SCHEDULE_EVT		(STR_SVT_MIMETYPE_START+80)
+#define STR_SVT_MIMETYPE_SCHEDULE_TASK		(STR_SVT_MIMETYPE_START+81)
+#define STR_SVT_MIMETYPE_SCHEDULE_FEVT		(STR_SVT_MIMETYPE_START+82)
+#define STR_SVT_MIMETYPE_SCHEDULE_FTASK 	(STR_SVT_MIMETYPE_START+83)
+#define STR_SVT_MIMETYPE_FRAMESET			(STR_SVT_MIMETYPE_START+84)
+#define STR_SVT_MIMETYPE_MACRO				(STR_SVT_MIMETYPE_START+85)
+#define STR_SVT_MIMETYPE_CNT_SFSYSFOLDER	(STR_SVT_MIMETYPE_START+86)
+#define STR_SVT_MIMETYPE_CNT_SFSYSFILE		(STR_SVT_MIMETYPE_START+87)
+#define STR_SVT_MIMETYPE_APP_TEMPLATE		(STR_SVT_MIMETYPE_START+88)
+#define STR_SVT_MIMETYPE_IMAGE_GENERIC		(STR_SVT_MIMETYPE_START+89)
+#define STR_SVT_MIMETYPE_APP_MSEXCEL		(STR_SVT_MIMETYPE_START+90)
+#define STR_SVT_MIMETYPE_APP_MSEXCEL_TEMPL	(STR_SVT_MIMETYPE_START+91)
+#define STR_SVT_MIMETYPE_APP_MSPPOINT		(STR_SVT_MIMETYPE_START+92)
+#define STR_SVT_MIMETYPE_TEXT_VCALENDAR 	(STR_SVT_MIMETYPE_START+93)
+#define STR_SVT_MIMETYPE_TEXT_ICALENDAR 	(STR_SVT_MIMETYPE_START+94)
+#define STR_SVT_MIMETYPE_TEXT_XMLICALENDAR 	(STR_SVT_MIMETYPE_START+95)
+#define STR_SVT_MIMETYPE_TEXT_CDE_CALENDAR_APP 	(STR_SVT_MIMETYPE_START+96)
+#define STR_SVT_MIMETYPE_INET_MSG_RFC822 		(STR_SVT_MIMETYPE_START+97)
+#define STR_SVT_MIMETYPE_INET_MULTI_ALTERNATIVE	(STR_SVT_MIMETYPE_START+98)
+#define STR_SVT_MIMETYPE_INET_MULTI_DIGEST 		(STR_SVT_MIMETYPE_START+99)
+#define STR_SVT_MIMETYPE_INET_MULTI_PARALLEL 	(STR_SVT_MIMETYPE_START+100)
+#define STR_SVT_MIMETYPE_INET_MULTI_RELATED		(STR_SVT_MIMETYPE_START+101)
+#define STR_SVT_MIMETYPE_INET_MULTI_MIXED 		(STR_SVT_MIMETYPE_START+102)
+#define STR_SVT_MIMETYPE_APP_IMPRESSPACKED		(STR_SVT_MIMETYPE_START+103)
+#define STR_SVT_MIMETYPE_APP_JAR				(STR_SVT_MIMETYPE_START+104)
+#define STR_SVT_MIMETYPE_IMAGE_PNG				(STR_SVT_MIMETYPE_START+105)
+#define STR_SVT_MIMETYPE_IMAGE_TIFF 			(STR_SVT_MIMETYPE_START+106)
 
-#define STR_SVT_MIMETYPE_APP_SXCALC         (STR_SVT_MIMETYPE_START+107)
-#define STR_SVT_MIMETYPE_APP_SXCHART        (STR_SVT_MIMETYPE_START+108)
-#define STR_SVT_MIMETYPE_APP_SXDRAW         (STR_SVT_MIMETYPE_START+109)
-#define STR_SVT_MIMETYPE_APP_SXMATH         (STR_SVT_MIMETYPE_START+110)
-#define STR_SVT_MIMETYPE_APP_SXWRITER       (STR_SVT_MIMETYPE_START+111)
-#define STR_SVT_MIMETYPE_APP_SXIMPRESS      (STR_SVT_MIMETYPE_START+112)
-#define STR_SVT_MIMETYPE_APP_SXGLOBAL       (STR_SVT_MIMETYPE_START+113)
-#define STR_SVT_MIMETYPE_APP_SXIPACKED      (STR_SVT_MIMETYPE_START+114)
-#define STR_SVT_MIMETYPE_END                (STR_SVT_MIMETYPE_APP_SXIPACKED)
+#define STR_SVT_MIMETYPE_APP_SXCALC			(STR_SVT_MIMETYPE_START+107)
+#define STR_SVT_MIMETYPE_APP_SXCHART		(STR_SVT_MIMETYPE_START+108)
+#define STR_SVT_MIMETYPE_APP_SXDRAW			(STR_SVT_MIMETYPE_START+109)
+#define STR_SVT_MIMETYPE_APP_SXMATH			(STR_SVT_MIMETYPE_START+110)
+#define STR_SVT_MIMETYPE_APP_SXWRITER		(STR_SVT_MIMETYPE_START+111)
+#define STR_SVT_MIMETYPE_APP_SXIMPRESS		(STR_SVT_MIMETYPE_START+112)
+#define STR_SVT_MIMETYPE_APP_SXGLOBAL		(STR_SVT_MIMETYPE_START+113)
+#define STR_SVT_MIMETYPE_APP_SXIPACKED		(STR_SVT_MIMETYPE_START+114)
+#define STR_SVT_MIMETYPE_END				(STR_SVT_MIMETYPE_APP_SXIPACKED)
 
-#define STR_COLUM_DT_AUTO                   (STR_SVT_MIMETYPE_END+1)
+#define STR_COLUM_DT_AUTO				    (STR_SVT_MIMETYPE_END+1)
 
-#endif  // #ifndef _SVTOOLS_HRC
+#endif	// #ifndef _SVTOOLS_HRC
 
 // ******************************************************************* EOF
 
diff --git a/svl/inc/svl/svldata.hxx b/svl/inc/svl/svldata.hxx
index 24aef1fdf6d0..9d42b7709558 100644
--- a/svl/inc/svl/svldata.hxx
+++ b/svl/inc/svl/svldata.hxx
@@ -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
@@ -37,7 +37,7 @@ class ImpSvlData
 {
 public:
     const SfxItemPool * pStoringPool;
-    void*           m_pThreadsafeRMs;
+    void*			m_pThreadsafeRMs;
         // one SimpleResMgr for each language for which a resource was requested
         // (When using the 'non-simple' resmgr, the first request for any language wins, any
         // further request for any other language supply the resmgr of the first call.
@@ -50,7 +50,7 @@ private:
 
     ~ImpSvlData();
 
-public:
+public:  
     SimpleResMgr * GetSimpleRM(const ::com::sun::star::lang::Locale& rLocale);
     static ImpSvlData & GetSvlData();
 };
@@ -58,7 +58,7 @@ public:
 //============================================================================
 class SvtSimpleResId
 {
-    String  m_sValue;
+    String	m_sValue;
 
 public:
     SvtSimpleResId(USHORT nId, const ::com::sun::star::lang::Locale aLocale) : m_sValue(ImpSvlData::GetSvlData().GetSimpleRM(aLocale)->ReadString(nId)) { };
diff --git a/svl/inc/svl/svldllapi.h b/svl/inc/svl/svldllapi.h
index 0616a6fa59a9..4ab33a853f13 100644
--- a/svl/inc/svl/svldllapi.h
+++ b/svl/inc/svl/svldllapi.h
@@ -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
diff --git a/svl/inc/svl/svstdarr.hxx b/svl/inc/svl/svstdarr.hxx
index fa3c94034256..2ebd3965cc6e 100644
--- a/svl/inc/svl/svstdarr.hxx
+++ b/svl/inc/svl/svstdarr.hxx
@@ -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
@@ -32,11 +32,11 @@
 *   (die defines setzen sich aus "_SVSTDARR_" und dem Namen des Array
 *    ohne "Sv" zusammen)
 *
-*   VarArr:     SvBools, SvULongs, SvUShorts, SvLongs, SvShorts
-*   PtrArr:     SvStrings, SvStringsDtor
-*   SortArr:    SvStringsSort, SvStringsSortDtor,
-*               SvStringsISort, SvStringsISortDtor,
-*               SvUShortsSort
+*	VarArr:		SvBools, SvULongs, SvUShorts, SvLongs, SvShorts
+*	PtrArr:		SvStrings, SvStringsDtor
+*	SortArr:	SvStringsSort, SvStringsSortDtor,
+*				SvStringsISort, SvStringsISortDtor,
+*				SvUShortsSort
 ***********************************************************************
 #endif
 
@@ -98,7 +98,7 @@ public:
     void Remove( const USHORT nP, USHORT nL = 1 );
     BOOL Seek_Entry( const USHORT aE, USHORT* pP = 0 ) const;
 
-    USHORT Count() const  {   return SvUShorts::Count();    }
+    USHORT Count() const  {   return SvUShorts::Count();	}
     const USHORT* GetData() const { return (const USHORT*)pData; }
 
     const USHORT& operator[](USHORT nP) const {
diff --git a/svl/inc/svl/szitem.hxx b/svl/inc/svl/szitem.hxx
index 31878aa34be5..e20ef1e571c8 100644
--- a/svl/inc/svl/szitem.hxx
+++ b/svl/inc/svl/szitem.hxx
@@ -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
@@ -41,7 +41,7 @@ DBG_NAMEEX(SfxSizeItem)
 class SfxSizeItem : public SfxPoolItem
 {
 private:
-    Size                     aVal;
+    Size					 aVal;
 
 public:
                              TYPEINFO();
@@ -57,18 +57,18 @@ public:
                                     XubString &rText,
                                     const IntlWrapper * = 0 ) const;
 
-    virtual int              operator==( const SfxPoolItem& ) const;
-    virtual BOOL             QueryValue( com::sun::star::uno::Any& rVal,
+    virtual int 			 operator==( const SfxPoolItem& ) const;
+    virtual	BOOL 			 QueryValue( com::sun::star::uno::Any& rVal,
                                           BYTE nMemberId = 0 ) const;
-    virtual BOOL             PutValue( const com::sun::star::uno::Any& rVal,
+    virtual	BOOL 			 PutValue( const com::sun::star::uno::Any& rVal,
                                           BYTE nMemberId = 0 );
 
     virtual SfxPoolItem*     Clone( SfxItemPool *pPool = 0 ) const;
-    virtual SfxPoolItem*     Create(SvStream &, USHORT nItemVersion) const;
-    virtual SvStream&        Store(SvStream &, USHORT nItemVersion) const;
+    virtual SfxPoolItem*	 Create(SvStream &, USHORT nItemVersion) const;
+    virtual SvStream&		 Store(SvStream &, USHORT nItemVersion) const;
 
-    const Size&             GetValue() const { return aVal; }
-    void                    SetValue( const Size& rNewVal ) {
+    const Size&				GetValue() const { return aVal; }
+    void					SetValue( const Size& rNewVal ) {
                                  DBG_ASSERT( GetRefCount() == 0, "SetValue() with pooled item" );
                                  aVal = rNewVal; }
 };
diff --git a/svl/inc/svl/undo.hxx b/svl/inc/svl/undo.hxx
index 5aea03207626..c49ef224a331 100644
--- a/svl/inc/svl/undo.hxx
+++ b/svl/inc/svl/undo.hxx
@@ -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
@@ -38,7 +38,7 @@ class SVL_DLLPUBLIC SfxRepeatTarget
 {
 public:
                         TYPEINFO();
-    virtual             ~SfxRepeatTarget() = 0;
+    virtual 			~SfxRepeatTarget() = 0;
 };
 
 //====================================================================
@@ -49,23 +49,23 @@ class SVL_DLLPUBLIC SfxUndoAction
 public:
                             TYPEINFO();
                             SfxUndoAction();
-    virtual                 ~SfxUndoAction();
+    virtual 				~SfxUndoAction();
 
     virtual BOOL            IsLinked();
     virtual void            SetLinked( BOOL bIsLinked = TRUE );
-    virtual void            Undo();
-    virtual void            Redo();
-    virtual void            Repeat(SfxRepeatTarget&);
-    virtual BOOL            CanRepeat(SfxRepeatTarget&) const;
+    virtual void			Undo();
+    virtual void			Redo();
+    virtual void			Repeat(SfxRepeatTarget&);
+    virtual BOOL			CanRepeat(SfxRepeatTarget&) const;
 
-    virtual BOOL            Merge( SfxUndoAction *pNextAction );
+    virtual BOOL			Merge( SfxUndoAction *pNextAction );
 
-    virtual UniString           GetComment() const;
-    virtual UniString           GetRepeatComment(SfxRepeatTarget&) const;
-    virtual USHORT          GetId() const;
+    virtual UniString			GetComment() const;
+    virtual UniString			GetRepeatComment(SfxRepeatTarget&) const;
+    virtual USHORT			GetId() const;
 
 private:
-    SfxUndoAction&          operator=( const SfxUndoAction& );    // n.i.!!
+    SfxUndoAction&			operator=( const SfxUndoAction& );	  // n.i.!!
 };
 
 //========================================================================
@@ -79,9 +79,9 @@ SV_DECL_PTRARR( SfxUndoActions, SfxUndoAction*, 20, 8 )
 struct SVL_DLLPUBLIC SfxUndoArray
 {
     SfxUndoActions          aUndoActions;
-    USHORT                  nMaxUndoActions;
-    USHORT                  nCurUndoAction;
-    SfxUndoArray            *pFatherUndoArray;
+    USHORT					nMaxUndoActions;
+    USHORT					nCurUndoAction;
+    SfxUndoArray 			*pFatherUndoArray;
                             SfxUndoArray(USHORT nMax=0):
                                 nMaxUndoActions(nMax), nCurUndoAction(0),
                                 pFatherUndoArray(0) {}
@@ -94,7 +94,7 @@ struct SVL_DLLPUBLIC SfxUndoArray
     really really have to! */
 class SVL_DLLPUBLIC SfxListUndoAction : public SfxUndoAction, public SfxUndoArray
 
-/*  [Beschreibung]
+/*	[Beschreibung]
 
     UndoAction zur Klammerung mehrerer Undos in einer UndoAction.
     Diese Actions werden vom SfxUndoManager verwendet. Dort
@@ -110,23 +110,23 @@ class SVL_DLLPUBLIC SfxListUndoAction : public SfxUndoAction, public SfxUndoArra
 
                             SfxListUndoAction( const UniString &rComment,
                                 const UniString rRepeatComment, USHORT Id, SfxUndoArray *pFather);
-    virtual void            Undo();
-    virtual void            Redo();
-    virtual void            Repeat(SfxRepeatTarget&);
-    virtual BOOL            CanRepeat(SfxRepeatTarget&) const;
+    virtual void			Undo();
+    virtual void			Redo();
+    virtual void			Repeat(SfxRepeatTarget&);
+    virtual BOOL			CanRepeat(SfxRepeatTarget&) const;
 
-    virtual BOOL            Merge( SfxUndoAction *pNextAction );
+    virtual BOOL			Merge( SfxUndoAction *pNextAction );
 
-    virtual UniString           GetComment() const;
-    virtual UniString           GetRepeatComment(SfxRepeatTarget&) const;
-    virtual USHORT          GetId() const;
+    virtual UniString			GetComment() const;
+    virtual UniString			GetRepeatComment(SfxRepeatTarget&) const;
+    virtual USHORT			GetId() const;
 
     void SetComment( const UniString& rComment );
 
     private:
 
-    USHORT                  nId;
-    UniString                   aComment, aRepeatComment;
+    USHORT					nId;
+    UniString					aComment, aRepeatComment;
 
 };
 
@@ -136,67 +136,67 @@ class SVL_DLLPUBLIC SfxUndoManager
 {
     friend class SfxLinkUndoAction;
 
-    SfxUndoArray            *pUndoArray;
-    SfxUndoArray            *pActUndoArray;
-    SfxUndoArray            *pFatherUndoArray;
+    SfxUndoArray 			*pUndoArray;
+    SfxUndoArray			*pActUndoArray;
+    SfxUndoArray			*pFatherUndoArray;
 
-    bool                    mbUndoEnabled;
+    bool					mbUndoEnabled;
 public:
                             SfxUndoManager( USHORT nMaxUndoActionCount = 20 );
-    virtual                 ~SfxUndoManager();
+    virtual 				~SfxUndoManager();
 
-    virtual void            SetMaxUndoActionCount( USHORT nMaxUndoActionCount );
-    virtual USHORT          GetMaxUndoActionCount() const;
-    virtual void            Clear();
+    virtual void			SetMaxUndoActionCount( USHORT nMaxUndoActionCount );
+    virtual USHORT			GetMaxUndoActionCount() const;
+    virtual void			Clear();
 
-    virtual void            AddUndoAction( SfxUndoAction *pAction, BOOL bTryMerg=FALSE );
+    virtual void			AddUndoAction( SfxUndoAction *pAction, BOOL bTryMerg=FALSE );
 
-    virtual USHORT          GetUndoActionCount() const;
-    virtual USHORT          GetUndoActionId(USHORT nNo=0) const;
-    virtual UniString       GetUndoActionComment( USHORT nNo=0 ) const;
+    virtual USHORT			GetUndoActionCount() const;
+    virtual USHORT			GetUndoActionId(USHORT nNo=0) const;
+    virtual UniString		GetUndoActionComment( USHORT nNo=0 ) const;
     /** returns the nNo'th undo action from the top */
-    SfxUndoAction*          GetUndoAction( USHORT nNo=0 ) const;
+    SfxUndoAction*			GetUndoAction( USHORT nNo=0 ) const;
 
-    virtual BOOL            Undo( USHORT nCount=1 );
-    virtual void            Undo( SfxUndoAction &rAction );
+    virtual BOOL			Undo( USHORT nCount=1 );
+    virtual void			Undo( SfxUndoAction &rAction );
 
-    virtual USHORT          GetRedoActionCount() const;
-    virtual USHORT          GetRedoActionId(USHORT nNo=0) const;
-    virtual UniString           GetRedoActionComment( USHORT nNo=0 ) const;
+    virtual USHORT			GetRedoActionCount() const;
+    virtual USHORT			GetRedoActionId(USHORT nNo=0) const;
+    virtual UniString			GetRedoActionComment( USHORT nNo=0 ) const;
 
-    virtual BOOL            Redo( USHORT nCount=1 );
-    virtual void            Redo( SfxUndoAction &rAction );
-    virtual void            ClearRedo();
+    virtual BOOL			Redo( USHORT nCount=1 );
+    virtual void			Redo( SfxUndoAction &rAction );
+    virtual	void			ClearRedo();
 
-    virtual USHORT          GetRepeatActionCount() const;
-    virtual UniString           GetRepeatActionComment( SfxRepeatTarget &rTarget, USHORT nNo = 0) const;
-    virtual BOOL            Repeat( SfxRepeatTarget &rTarget, USHORT nFrom=0, USHORT nCount=1 );
-    virtual void            Repeat( SfxRepeatTarget &rTarget, SfxUndoAction &rAction );
-    virtual BOOL            CanRepeat( SfxRepeatTarget &rTarget, USHORT nNo = 0 ) const;
-    virtual BOOL            CanRepeat( SfxRepeatTarget &rTarget, SfxUndoAction &rAction ) const;
+    virtual USHORT			GetRepeatActionCount() const;
+    virtual UniString			GetRepeatActionComment( SfxRepeatTarget &rTarget, USHORT nNo = 0) const;
+    virtual BOOL			Repeat( SfxRepeatTarget &rTarget, USHORT nFrom=0, USHORT nCount=1 );
+    virtual void			Repeat( SfxRepeatTarget &rTarget, SfxUndoAction &rAction );
+    virtual BOOL			CanRepeat( SfxRepeatTarget &rTarget, USHORT nNo = 0 ) const;
+    virtual BOOL			CanRepeat( SfxRepeatTarget &rTarget, SfxUndoAction &rAction ) const;
 
     virtual void            EnterListAction(const UniString &rComment, const UniString& rRepeatComment, USHORT nId=0);
-    virtual void            LeaveListAction();
+    virtual void 			LeaveListAction();
 
     /** clears the redo stack and removes the top undo action */
-    void                    RemoveLastUndoAction();
+    void					RemoveLastUndoAction();
 
     // enables (true) or disables (false) recording of undo actions
     // If undo actions are added while undo is disabled, they are deleted.
     // Disabling undo does not clear the current undo buffer!
-    void                    EnableUndo( bool bEnable );
+    void					EnableUndo( bool bEnable );
 
     // returns true if undo is currently enabled
     // This returns false if undo was disabled using EnableUndo( false ) and
     // also during the runtime of the Undo() and Redo() methods.
-    bool                    IsUndoEnabled() const { return mbUndoEnabled; }
+    bool					IsUndoEnabled() const { return mbUndoEnabled; }
 };
 
 //=========================================================================
 
 class SVL_DLLPUBLIC SfxLinkUndoAction : public SfxUndoAction
 
-/*  [Beschreibung]
+/*	[Beschreibung]
 
     Die SfxLinkUndoAction dient zur Verbindung zweier SfxUndoManager. Die
     im ersten SfxUndoManager eingefuegten SfxUndoAction leiten ihr Undo und Redo
@@ -216,21 +216,21 @@ public:
                             SfxLinkUndoAction(SfxUndoManager *pManager);
                             ~SfxLinkUndoAction();
 
-    virtual void            Undo();
-    virtual void            Redo();
-    virtual BOOL            CanRepeat(SfxRepeatTarget& r) const;
+    virtual void			Undo();
+    virtual void			Redo();
+    virtual BOOL			CanRepeat(SfxRepeatTarget& r) const;
 
-    virtual void            Repeat(SfxRepeatTarget&r);
+    virtual void			Repeat(SfxRepeatTarget&r);
 
-    virtual UniString           GetComment() const;
-    virtual UniString           GetRepeatComment(SfxRepeatTarget&r) const;
-    virtual USHORT          GetId() const;
+    virtual UniString			GetComment() const;
+    virtual UniString			GetRepeatComment(SfxRepeatTarget&r) const;
+    virtual USHORT			GetId() const;
 
-    SfxUndoAction*          GetAction() const { return pAction; }
+    SfxUndoAction*			GetAction() const { return pAction; }
 
 protected:
-    SfxUndoManager          *pUndoManager;
-    SfxUndoAction           *pAction;
+    SfxUndoManager			*pUndoManager;
+    SfxUndoAction			*pAction;
 
 };
 
diff --git a/svl/inc/svl/urlfilter.hxx b/svl/inc/svl/urlfilter.hxx
index d8c053ab573e..f74d300f26a8 100644
--- a/svl/inc/svl/urlfilter.hxx
+++ b/svl/inc/svl/urlfilter.hxx
@@ -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
@@ -48,7 +48,7 @@ inline IUrlFilter::~IUrlFilter() {}
 struct FilterMatch : public ::std::unary_function< bool, WildCard >
 {
 private:
-    const String&   m_rCompareString;
+    const String&	m_rCompareString;
 public:
     FilterMatch( const String& _rCompareString ) : m_rCompareString( _rCompareString ) { }
 
diff --git a/svl/inc/svl/visitem.hxx b/svl/inc/svl/visitem.hxx
index 9e9a0fcf4126..f4e1c8aab559 100644
--- a/svl/inc/svl/visitem.hxx
+++ b/svl/inc/svl/visitem.hxx
@@ -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
@@ -45,7 +45,7 @@ public:
 
     SfxVisibilityItem(USHORT which = 0, sal_Bool bVisible = sal_True):
         SfxPoolItem(which)
-    {
+    { 
         m_nValue.bVisible = bVisible;
         DBG_CTOR(SfxVisibilityItem, 0);
     }
@@ -69,10 +69,10 @@ public:
                                                 const IntlWrapper * = 0)
         const;
 
-    virtual BOOL QueryValue( com::sun::star::uno::Any& rVal,
+    virtual	BOOL QueryValue( com::sun::star::uno::Any& rVal,
                              BYTE nMemberId = 0 ) const;
 
-    virtual BOOL PutValue( const com::sun::star::uno::Any& rVal,
+    virtual	BOOL PutValue( const com::sun::star::uno::Any& rVal,
                            BYTE nMemberId = 0 );
 
     virtual SfxPoolItem * Create(SvStream & rStream, USHORT) const;
diff --git a/svl/inc/svl/zforlist.hxx b/svl/inc/svl/zforlist.hxx
index 5492759d4d36..fc63aa081329 100644
--- a/svl/inc/svl/zforlist.hxx
+++ b/svl/inc/svl/zforlist.hxx
@@ -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
@@ -62,28 +62,28 @@ namespace com { namespace sun { namespace star {
 }}}
 
 
-#define SV_COUNTRY_LANGUAGE_OFFSET  5000    // Max count of formats per country/language
-#define SV_MAX_ANZ_STANDARD_FORMATE  100    // Max count of builtin default formats per CL
+#define SV_COUNTRY_LANGUAGE_OFFSET  5000	// Max count of formats per country/language
+#define SV_MAX_ANZ_STANDARD_FORMATE  100	// Max count of builtin default formats per CL
 
 // Format types
 #ifndef NUMBERFORMAT_ALL
-//  also defined in com/sun/star/util/NumberFormat.hpp
-//! => put in single .idl file and include here
-#define NUMBERFORMAT_ALL             0x000  /// Just for Output of total list, not a real format type
-#define NUMBERFORMAT_DEFINED         0x001  /// Format defined by user
-#define NUMBERFORMAT_DATE            0x002  /// Number as date
-#define NUMBERFORMAT_TIME            0x004  /// Number as time
-#define NUMBERFORMAT_CURRENCY        0x008  /// Number as currency
-#define NUMBERFORMAT_NUMBER          0x010  /// Any "normal" number format
-#define NUMBERFORMAT_SCIENTIFIC      0x020  /// Number as scientific
-#define NUMBERFORMAT_FRACTION        0x040  /// Number as fraction
-#define NUMBERFORMAT_PERCENT         0x080  /// Number as percent
-#define NUMBERFORMAT_TEXT            0x100  /// Text format
-#define NUMBERFORMAT_DATETIME        0x006  /// Number as date and time
-#define NUMBERFORMAT_LOGICAL         0x400  /// Number as boolean value
-#define NUMBERFORMAT_UNDEFINED       0x800  /// Format undefined yet in analyzing
+//	also defined in com/sun/star/util/NumberFormat.hpp
+//!	=> put in single .idl file and include here
+#define NUMBERFORMAT_ALL			 0x000	/// Just for Output of total list, not a real format type
+#define NUMBERFORMAT_DEFINED		 0x001	/// Format defined by user
+#define NUMBERFORMAT_DATE			 0x002	/// Number as date
+#define NUMBERFORMAT_TIME			 0x004	/// Number as time
+#define NUMBERFORMAT_CURRENCY		 0x008	/// Number as currency
+#define NUMBERFORMAT_NUMBER			 0x010	/// Any "normal" number format
+#define NUMBERFORMAT_SCIENTIFIC		 0x020	/// Number as scientific
+#define NUMBERFORMAT_FRACTION		 0x040	/// Number as fraction
+#define NUMBERFORMAT_PERCENT		 0x080	/// Number as percent
+#define NUMBERFORMAT_TEXT			 0x100	/// Text format
+#define NUMBERFORMAT_DATETIME		 0x006	/// Number as date and time
+#define NUMBERFORMAT_LOGICAL		 0x400	/// Number as boolean value
+#define NUMBERFORMAT_UNDEFINED		 0x800	/// Format undefined yet in analyzing
 #endif
-#define NUMBERFORMAT_ENTRY_NOT_FOUND (sal_uInt32)(0xffffffff)   /// MAX_ULONG
+#define NUMBERFORMAT_ENTRY_NOT_FOUND (sal_uInt32)(0xffffffff)	/// MAX_ULONG
 
 
 /** enum values for <method>SvNumberFormatter::GetFormatIndex</method>
@@ -106,81 +106,81 @@ enum NfIndexTableOffset
     NF_NUMERIC_START = 0,
 
     NF_NUMBER_START = NF_NUMERIC_START,
-    NF_NUMBER_STANDARD = NF_NUMBER_START,   // Standard/General
-    NF_NUMBER_INT,                          // 0
-    NF_NUMBER_DEC2,                         // 0.00
-    NF_NUMBER_1000INT,                      // #,##0
-    NF_NUMBER_1000DEC2,                     // #,##0.00
-    NF_NUMBER_SYSTEM,                       // #,##0.00 or whatever is set in System Regional Settings
+    NF_NUMBER_STANDARD = NF_NUMBER_START,	// Standard/General
+    NF_NUMBER_INT,							// 0
+    NF_NUMBER_DEC2,							// 0.00
+    NF_NUMBER_1000INT,						// #,##0
+    NF_NUMBER_1000DEC2,						// #,##0.00
+    NF_NUMBER_SYSTEM,						// #,##0.00 or whatever is set in System Regional Settings
     NF_NUMBER_END = NF_NUMBER_SYSTEM,
 
     NF_SCIENTIFIC_START,
-    NF_SCIENTIFIC_000E000 = NF_SCIENTIFIC_START,    // 0.00E+000
-    NF_SCIENTIFIC_000E00,                           // 0.00E+00
+    NF_SCIENTIFIC_000E000 = NF_SCIENTIFIC_START,	// 0.00E+000
+    NF_SCIENTIFIC_000E00,							// 0.00E+00
     NF_SCIENTIFIC_END = NF_SCIENTIFIC_000E00,
 
     NF_PERCENT_START,
-    NF_PERCENT_INT = NF_PERCENT_START,      // 0%
-    NF_PERCENT_DEC2,                        // 0.00%
+    NF_PERCENT_INT = NF_PERCENT_START,		// 0%
+    NF_PERCENT_DEC2,						// 0.00%
     NF_PERCENT_END = NF_PERCENT_DEC2,
 
     NF_FRACTION_START,
-    NF_FRACTION_1 = NF_FRACTION_START,      // # ?/?
-    NF_FRACTION_2,                          // # ??/??
+    NF_FRACTION_1 = NF_FRACTION_START,		// # ?/?
+    NF_FRACTION_2,							// # ??/??
     NF_FRACTION_END = NF_FRACTION_2,
 
     NF_NUMERIC_END = NF_FRACTION_END,
 
     NF_CURRENCY_START,
     NF_CURRENCY_1000INT = NF_CURRENCY_START,// #,##0 DM
-    NF_CURRENCY_1000DEC2,                   // #,##0.00 DM
-    NF_CURRENCY_1000INT_RED,                // #,##0 DM         negative in red
-    NF_CURRENCY_1000DEC2_RED,               // #,##0.00 DM      negative in red
-    NF_CURRENCY_1000DEC2_CCC,               // #,##0.00 DEM     currency abbreviation
-    NF_CURRENCY_1000DEC2_DASHED,            // #,##0.-- DM
+    NF_CURRENCY_1000DEC2,					// #,##0.00 DM
+    NF_CURRENCY_1000INT_RED,                // #,##0 DM			negative in red
+    NF_CURRENCY_1000DEC2_RED,				// #,##0.00 DM		negative in red
+    NF_CURRENCY_1000DEC2_CCC,				// #,##0.00 DEM		currency abbreviation
+    NF_CURRENCY_1000DEC2_DASHED,			// #,##0.-- DM
     NF_CURRENCY_END = NF_CURRENCY_1000DEC2_DASHED,
 
     NF_DATE_START,
-    NF_DATE_SYSTEM_SHORT = NF_DATE_START,   // 08.10.97
-    NF_DATE_SYSTEM_LONG,                    // Wednesday, 8. October 1997
-    NF_DATE_SYS_DDMMYY,                     // 08.10.97
-    NF_DATE_SYS_DDMMYYYY,                   // 08.10.1997
-    NF_DATE_SYS_DMMMYY,                     // 8. Oct 97
-    NF_DATE_SYS_DMMMYYYY,                   // 8. Oct 1997
-    NF_DATE_DIN_DMMMYYYY,                   // 8. Oct. 1997                 DIN
-    NF_DATE_SYS_DMMMMYYYY,                  // 8. October 1997
-    NF_DATE_DIN_DMMMMYYYY,                  // 8. October 1997              DIN
-    NF_DATE_SYS_NNDMMMYY,                   // Wed, 8. Okt 97
-    NF_DATE_DEF_NNDDMMMYY,                  // Wed 08.Okt 97
-    NF_DATE_SYS_NNDMMMMYYYY,                // Wed, 8. Oktober 1997
-    NF_DATE_SYS_NNNNDMMMMYYYY,              // Wednesday, 8. Oktober 1997
-    NF_DATE_DIN_MMDD,                       // 10-08                        DIN
-    NF_DATE_DIN_YYMMDD,                     // 97-10-08                     DIN
-    NF_DATE_DIN_YYYYMMDD,                   // 1997-10-08                   DIN
-    NF_DATE_SYS_MMYY,                       // 10.97
-    NF_DATE_SYS_DDMMM,                      // 08.Oct
-    NF_DATE_MMMM,                           // October
-    NF_DATE_QQJJ,                           // 4. Quarter 97
-    NF_DATE_WW,                             // week of year
+    NF_DATE_SYSTEM_SHORT = NF_DATE_START,	// 08.10.97
+    NF_DATE_SYSTEM_LONG,					// Wednesday, 8. October 1997
+    NF_DATE_SYS_DDMMYY,		   				// 08.10.97
+    NF_DATE_SYS_DDMMYYYY,	   				// 08.10.1997
+    NF_DATE_SYS_DMMMYY,	   					// 8. Oct 97
+    NF_DATE_SYS_DMMMYYYY,	   				// 8. Oct 1997
+    NF_DATE_DIN_DMMMYYYY,					// 8. Oct. 1997					DIN
+    NF_DATE_SYS_DMMMMYYYY,					// 8. October 1997
+    NF_DATE_DIN_DMMMMYYYY,					// 8. October 1997				DIN
+    NF_DATE_SYS_NNDMMMYY,		 			// Wed, 8. Okt 97
+    NF_DATE_DEF_NNDDMMMYY,		 			// Wed 08.Okt 97
+    NF_DATE_SYS_NNDMMMMYYYY,	   			// Wed, 8. Oktober 1997
+    NF_DATE_SYS_NNNNDMMMMYYYY,	   			// Wednesday, 8. Oktober 1997
+    NF_DATE_DIN_MMDD,		 				// 10-08						DIN
+    NF_DATE_DIN_YYMMDD,		 				// 97-10-08						DIN
+    NF_DATE_DIN_YYYYMMDD,	 				// 1997-10-08					DIN
+    NF_DATE_SYS_MMYY,		   				// 10.97
+    NF_DATE_SYS_DDMMM,						// 08.Oct
+    NF_DATE_MMMM,							// October
+    NF_DATE_QQJJ,							// 4. Quarter 97
+    NF_DATE_WW,								// week of year
     NF_DATE_END = NF_DATE_WW,
 
     NF_TIME_START,
-    NF_TIME_HHMM = NF_TIME_START,           // HH:MM
-    NF_TIME_HHMMSS,                         // HH:MM:SS
-    NF_TIME_HHMMAMPM,                       // HH:MM AM/PM
-    NF_TIME_HHMMSSAMPM,                     // HH:MM:SS AM/PM
-    NF_TIME_HH_MMSS,                        // [HH]:MM:SS
-    NF_TIME_MMSS00,                         // MM:SS,00
-    NF_TIME_HH_MMSS00,                      // [HH]:MM:SS,00
+    NF_TIME_HHMM = NF_TIME_START,			// HH:MM
+    NF_TIME_HHMMSS,							// HH:MM:SS
+    NF_TIME_HHMMAMPM,						// HH:MM AM/PM
+    NF_TIME_HHMMSSAMPM,						// HH:MM:SS AM/PM
+    NF_TIME_HH_MMSS,						// [HH]:MM:SS
+    NF_TIME_MMSS00,							// MM:SS,00
+    NF_TIME_HH_MMSS00,	  					// [HH]:MM:SS,00
     NF_TIME_END = NF_TIME_HH_MMSS00,
 
     NF_DATETIME_START,
-    NF_DATETIME_SYSTEM_SHORT_HHMM = NF_DATETIME_START,  // 08.10.97 01:23
-    NF_DATETIME_SYS_DDMMYYYY_HHMMSS,        // 08.10.1997 01:23:45
+    NF_DATETIME_SYSTEM_SHORT_HHMM = NF_DATETIME_START,	// 08.10.97 01:23
+    NF_DATETIME_SYS_DDMMYYYY_HHMMSS,		// 08.10.1997 01:23:45
     NF_DATETIME_END = NF_DATETIME_SYS_DDMMYYYY_HHMMSS,
 
-    NF_BOOLEAN,                             // BOOLEAN
-    NF_TEXT,                                // @
+    NF_BOOLEAN,								// BOOLEAN
+    NF_TEXT,								// @
     NF_INDEX_TABLE_ENTRIES
 };
 
@@ -230,27 +230,27 @@ typedef ::std::map< sal_uInt32, sal_uInt32 > SvNumberFormatterMergeMap;
  */
 class SVL_DLLPUBLIC NfCurrencyEntry
 {
-    String          aSymbol;            /// currency symbol
-    String          aBankSymbol;        /// currency abbreviation
-    LanguageType    eLanguage;          /// language/country value
-    USHORT          nPositiveFormat;    /// position of symbol
-    USHORT          nNegativeFormat;    /// position of symbol and type and position of negative sign
-    USHORT          nDigits;            /// count of decimal digits
-    sal_Unicode     cZeroChar;          /// which character is used for zeros as last decimal digits
+    String   		aSymbol;			/// currency symbol
+    String			aBankSymbol;		/// currency abbreviation
+    LanguageType	eLanguage;			/// language/country value
+    USHORT			nPositiveFormat;	/// position of symbol
+    USHORT			nNegativeFormat;	/// position of symbol and type and position of negative sign
+    USHORT			nDigits;			/// count of decimal digits
+    sal_Unicode		cZeroChar;			/// which character is used for zeros as last decimal digits
 
                         /// not implemented, prevent usage
                         NfCurrencyEntry( const NfCurrencyEntry& );
                         /// not implemented, prevent usage
-    NfCurrencyEntry&    operator=( const NfCurrencyEntry& );
+    NfCurrencyEntry&	operator=( const NfCurrencyEntry& );
 
 private:
 
 //#if 0 // _SOLAR__PRIVATE
                         // nDecimalFormat := 0, 1, 2
                         // #,##0 or #,##0.00 or #,##0.-- are assigned
-    SVL_DLLPRIVATE void             Impl_BuildFormatStringNumChars( String&,
+    SVL_DLLPRIVATE void				Impl_BuildFormatStringNumChars( String&,
                             const LocaleDataWrapper&, USHORT nDecimalFormat ) const;
-//#endif    // __PRIVATE
+//#endif	// __PRIVATE
 
 public:
 
@@ -264,62 +264,62 @@ public:
                         ~NfCurrencyEntry() {}
 
                         /// Symbols and language identical
-    BOOL                operator==( const NfCurrencyEntry& r ) const;
+    BOOL				operator==( const NfCurrencyEntry& r ) const;
 
                         /// Set this format to be the EURo entry, overwrite other settings
-    void                SetEuro();
-    BOOL                IsEuro() const;
+    void				SetEuro();
+    BOOL				IsEuro() const;
 
                         /** Apply format information (nPositiveFormat,
                              nNegativeFormat, nDigits, cZeroChar) of another format. */
-    void                ApplyVariableInformation( const NfCurrencyEntry& );
+    void				ApplyVariableInformation( const NfCurrencyEntry& );
 
-    const String&       GetSymbol() const           { return aSymbol; }
-    const String&       GetBankSymbol() const       { return aBankSymbol; }
-    LanguageType        GetLanguage() const         { return eLanguage; }
-    USHORT              GetPositiveFormat() const   { return nPositiveFormat; }
-    USHORT              GetNegativeFormat() const   { return nNegativeFormat; }
-    USHORT              GetDigits() const           { return nDigits; }
-    sal_Unicode         GetZeroChar() const         { return cZeroChar; }
+    const String&		GetSymbol() const			{ return aSymbol; }
+    const String&		GetBankSymbol() const		{ return aBankSymbol; }
+    LanguageType		GetLanguage() const			{ return eLanguage; }
+    USHORT				GetPositiveFormat() const	{ return nPositiveFormat; }
+    USHORT				GetNegativeFormat() const	{ return nNegativeFormat; }
+    USHORT				GetDigits() const			{ return nDigits; }
+    sal_Unicode			GetZeroChar() const			{ return cZeroChar; }
 
                         /** [$DM-407] (bBank==FALSE) or [$DEM] (bBank==TRUE)
                             is assigned to rStr, if bBank==FALSE and
                             bWithoutExtension==TRUE only [$DM] */
-    void                BuildSymbolString( String& rStr, BOOL bBank,
+    void				BuildSymbolString( String& rStr, BOOL bBank,
                             BOOL bWithoutExtension = FALSE ) const;
 
                         /** #,##0.00 [$DM-407] is assigned to rStr, separators
-                              from rLoc,    incl. minus sign but without [RED] */
-    void                BuildPositiveFormatString( String& rStr, BOOL bBank,
+                              from rLoc,	incl. minus sign but without [RED] */
+    void				BuildPositiveFormatString( String& rStr, BOOL bBank,
                             const LocaleDataWrapper&, USHORT nDecimalFormat = 1 ) const;
-    void                BuildNegativeFormatString( String& rStr, BOOL bBank,
+    void				BuildNegativeFormatString( String& rStr, BOOL bBank,
                             const LocaleDataWrapper&, USHORT nDecimalFormat = 1 ) const;
 
                         /** [$DM-407] (or [$DEM] if bBank==TRUE)
                             is appended/prepended to rStr, incl. minus sign */
-    void                CompletePositiveFormatString( String& rStr, BOOL bBank,
+    void				CompletePositiveFormatString( String& rStr, BOOL bBank,
                             USHORT nPosiFormat ) const;
-    void                CompleteNegativeFormatString( String& rStr, BOOL bBank,
+    void				CompleteNegativeFormatString( String& rStr, BOOL bBank,
                             USHORT nNegaFormat ) const;
 
                         /// rSymStr is appended/prepended to rStr, incl. minus sign
-    static  void        CompletePositiveFormatString( String& rStr,
+    static	void		CompletePositiveFormatString( String& rStr,
                             const String& rSymStr, USHORT nPosiFormat );
-    static  void        CompleteNegativeFormatString( String& rStr,
+    static	void		CompleteNegativeFormatString( String& rStr,
                             const String& rSymStr, USHORT nNegaFormat );
 
                         /** Representation of a currency (symbol position and
                              negative sign) in other language settings */
-    static  USHORT      GetEffectivePositiveFormat( USHORT nIntlFormat,
+    static	USHORT		GetEffectivePositiveFormat( USHORT nIntlFormat,
                             USHORT nCurrFormat, BOOL bBank );
-    static  USHORT      GetEffectiveNegativeFormat( USHORT nIntlFormat,
+    static	USHORT		GetEffectiveNegativeFormat( USHORT nIntlFormat,
                             USHORT nCurrFormat, BOOL bBank );
 
                         /// General Unicode Euro symbol
-    static inline sal_Unicode   GetEuroSymbol() { return sal_Unicode(0x20AC); }
+    static inline sal_Unicode	GetEuroSymbol() { return sal_Unicode(0x20AC); }
                         /** Platform and CharSet dependent Euro symbol,
                              needed for import/export */
-    static  sal_Char    GetEuroSymbol( rtl_TextEncoding eTextEncoding );
+    static	sal_Char	GetEuroSymbol( rtl_TextEncoding eTextEncoding );
 };
 
 typedef NfCurrencyEntry* NfCurrencyEntryPtr;
@@ -333,15 +333,15 @@ class SvNumberFormatterRegistry_Impl;
 class SVL_DLLPUBLIC SvNumberFormatter
 {
 public:
-    /**
-     * We can't technically have an "infinite" value, so we use an arbitrary
-     * upper precision threshold to represent the "unlimited" precision.
-     */
+    /** 
+     * We can't technically have an "infinite" value, so we use an arbitrary 
+     * upper precision threshold to represent the "unlimited" precision. 
+     */ 
     static const sal_uInt16 UNLIMITED_PRECISION;
 
-    /**
-     * Precision suitable for numbers displayed in input bar, for instance
-     * Calc's formula input bar.
+    /** 
+     * Precision suitable for numbers displayed in input bar, for instance 
+     * Calc's formula input bar. 
      */
     static const sal_uInt16 INPUTSTRING_PRECISION;
 
@@ -659,12 +659,12 @@ public:
         The name Year2000 is kept although the actual functionality is now a
         TwoDigitYearStart which might be in any century.
      */
-    void    SetYear2000( USHORT nVal );
-    USHORT  GetYear2000() const;
-    static  USHORT  GetYear2000Default();
+    void	SetYear2000( USHORT nVal );
+    USHORT	GetYear2000() const;
+    static	USHORT	GetYear2000Default();
 
-    USHORT  ExpandTwoDigitYear( USHORT nYear ) const;
-    inline  static  USHORT  ExpandTwoDigitYear( USHORT nYear, USHORT nTwoDigitYearStart );
+    USHORT	ExpandTwoDigitYear( USHORT nYear ) const;
+    inline	static	USHORT	ExpandTwoDigitYear( USHORT nYear, USHORT nTwoDigitYearStart );
 
     /// DEPRICATED: Return first character of the decimal separator of the current language/country
     sal_Unicode GetDecSep() const { return GetNumDecimalSep().GetChar(0); }
@@ -729,7 +729,7 @@ public:
         @return
             position of default format
      */
-    USHORT  GetCurrencyFormatStrings( NfWSStringsDtor&, const NfCurrencyEntry&,
+    USHORT	GetCurrencyFormatStrings( NfWSStringsDtor&, const NfCurrencyEntry&,
                 BOOL bBank ) const;
 
     /** Whether nFormat is of type NUMBERFORMAT_CURRENCY and the format code
@@ -737,7 +737,7 @@ public:
         If ppEntry is not NULL and exactly one entry is found, a [$xxx-nnn] is
         returned, even if the format code only contains [$xxx] !
      */
-    BOOL    GetNewCurrencySymbolString( sal_uInt32 nFormat, String& rSymbol,
+    BOOL	GetNewCurrencySymbolString( sal_uInt32 nFormat, String& rSymbol,
                 const NfCurrencyEntry** ppEntry = NULL, BOOL* pBank = NULL ) const;
 
     /** Look up the corresponding <type>NfCurrencyEntry</type> matching
@@ -784,7 +784,7 @@ public:
     void GetCompatibilityCurrency( String& rSymbol, String& rAbbrev ) const;
 
     /// Fill rList with the language/country codes that have been allocated
-    void    GetUsedLanguages( SvUShorts& rList );
+    void	GetUsedLanguages( SvUShorts& rList );
 
     /// Fill a <type>NfKeywordIndex</type> table with keywords of a language/country
     void    FillKeywordTable( NfKeywordTable& rKeywords, LanguageType eLang );
@@ -804,34 +804,34 @@ public:
 private:
     ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > xServiceManager;
     ::com::sun::star::lang::Locale aLocale;
-    SvNumberFormatTable aFTable;            // Table of format keys to format entries
-    Table aDefaultFormatKeys;               // Table of default standard to format keys
-    SvNumberFormatTable* pFormatTable;      // For the UI dialog
-    SvNumberFormatterIndexTable* pMergeTable;               // List of indices for merging two formatters
-    CharClass* pCharClass;                  // CharacterClassification
+    SvNumberFormatTable aFTable;			// Table of format keys to format entries
+    Table aDefaultFormatKeys;				// Table of default standard to format keys
+    SvNumberFormatTable* pFormatTable;		// For the UI dialog
+    SvNumberFormatterIndexTable* pMergeTable;				// List of indices for merging two formatters
+    CharClass* pCharClass;					// CharacterClassification
     OnDemandLocaleDataWrapper xLocaleData;  // LocaleData switched between SYSTEM, ENGLISH and other
     OnDemandTransliterationWrapper xTransliteration;    // Transliteration loaded on demand
     OnDemandCalendarWrapper xCalendar;      // Calendar loaded on demand
     OnDemandNativeNumberWrapper xNatNum;    // Native number service loaded on demand
-    ImpSvNumberInputScan* pStringScanner;   // Input string scanner
-    ImpSvNumberformatScan* pFormatScanner;  // Format code string scanner
+    ImpSvNumberInputScan* pStringScanner;	// Input string scanner
+    ImpSvNumberformatScan* pFormatScanner;	// Format code string scanner
     Link aColorLink;                        // User defined color table CallBack
-    sal_uInt32 MaxCLOffset;                     // Max language/country offset used
-    sal_uInt32 nDefaultSystemCurrencyFormat;        // NewCurrency matching SYSTEM locale
+    sal_uInt32 MaxCLOffset;						// Max language/country offset used
+    sal_uInt32 nDefaultSystemCurrencyFormat;		// NewCurrency matching SYSTEM locale
     LanguageType IniLnge;                   // Initialized setting language/country
     LanguageType ActLnge;                   // Current setting language/country
-    NfEvalDateFormat eEvalDateFormat;       // DateFormat evaluation
-    BOOL bNoZero;                           // Zero value suppression
+    NfEvalDateFormat eEvalDateFormat;		// DateFormat evaluation
+    BOOL bNoZero;							// Zero value suppression
 
     // cached locale data items needed almost any time
     String aDecimalSep;
     String aThousandSep;
     String aDateSep;
 
-#ifdef _ZFORLIST_CXX                // ----- private Methoden -----
+#ifdef _ZFORLIST_CXX				// ----- private Methoden -----
 
-    SVL_DLLPRIVATE static BOOL          bCurrencyTableInitialized;
-    SVL_DLLPRIVATE static USHORT            nSystemCurrencyPosition;
+    SVL_DLLPRIVATE static BOOL 			bCurrencyTableInitialized;
+    SVL_DLLPRIVATE static USHORT			nSystemCurrencyPosition;
     SVL_DLLPRIVATE static SvNumberFormatterRegistry_Impl* pFormatterRegistry;
 
     // get the registry, create one if none exists
@@ -889,15 +889,15 @@ private:
 
     // Return the format index of the currency format of the system locale.
     // Format is created if not already present.
-    SVL_DLLPRIVATE sal_uInt32   ImpGetDefaultSystemCurrencyFormat();
+    SVL_DLLPRIVATE sal_uInt32	ImpGetDefaultSystemCurrencyFormat();
 
     // Return the format index of the currency format of the current locale.
     // Format is created if not already present.
-    SVL_DLLPRIVATE sal_uInt32   ImpGetDefaultCurrencyFormat();
+    SVL_DLLPRIVATE sal_uInt32	ImpGetDefaultCurrencyFormat();
 
     // Return the default format for a given type and current locale.
     // May ONLY be called from within GetStandardFormat().
-    SVL_DLLPRIVATE sal_uInt32   ImpGetDefaultFormat( short nType );
+    SVL_DLLPRIVATE sal_uInt32	ImpGetDefaultFormat( short nType );
 
     // Return the index in a sequence of format codes matching an enum of
     // NfIndexTableOffset. If not found 0 is returned. If the sequence doesn't
@@ -1028,4 +1028,4 @@ inline USHORT SvNumberFormatter::ExpandTwoDigitYear(
 
 
 
-#endif  // _ZFORLIST_HXX
+#endif	// _ZFORLIST_HXX
diff --git a/svl/inc/svl/zformat.hxx b/svl/inc/svl/zformat.hxx
index 7c361382796a..2cd575a0637c 100644
--- a/svl/inc/svl/zformat.hxx
+++ b/svl/inc/svl/zformat.hxx
@@ -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
@@ -236,8 +236,8 @@ public:
     // in fact that could be any string used in number formats.
     static void LoadString( SvStream& rStream, String& rStr );
 
-    /**
-     * Get output string from a numeric value that fits the number of
+    /** 
+     * Get output string from a numeric value that fits the number of 
      * characters specified.
      */
     bool GetOutputString( double fNumber, sal_uInt16 nCharCount, String& rOutString ) const;
diff --git a/svl/inc/urihelper.hxx b/svl/inc/urihelper.hxx
index ab2ae5878cc2..488cd3b55549 100644
--- a/svl/inc/urihelper.hxx
+++ b/svl/inc/urihelper.hxx
@@ -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
diff --git a/svl/inc/urlbmk.hxx b/svl/inc/urlbmk.hxx
index 9a37184c8ec1..ceae30f8467d 100644
--- a/svl/inc/urlbmk.hxx
+++ b/svl/inc/urlbmk.hxx
@@ -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
@@ -35,7 +35,7 @@
 
 class INetBookmark
 
-/*  [Beschreibung]
+/*	[Beschreibung]
 
     Diese Klasse stellt ein Bookmark dar, welches aus einer URL und
     einem dazuge"horigen Beschreibungstext besteht.
@@ -45,13 +45,13 @@ class INetBookmark
 */
 
 {
-    String          aUrl;
-    String          aDescr;
+    String			aUrl;
+    String			aDescr;
 
 protected:
 
-    void            SetURL( const String& rS )          { aUrl = rS; }
-    void            SetDescription( const String& rS )  { aDescr = rS; }
+    void 			SetURL( const String& rS )			{ aUrl = rS; }
+    void 			SetDescription( const String& rS )	{ aDescr = rS; }
 
 public:
                     INetBookmark( const String &rUrl, const String &rDescr )
@@ -60,8 +60,8 @@ public:
                     INetBookmark()
                     {}
 
-    const String&   GetURL() const          { return aUrl; }
-    const String&   GetDescription() const  { return aDescr; }
+    const String&	GetURL() const 			{ return aUrl; }
+    const String&	GetDescription() const	{ return aDescr; }
 };
 
 
diff --git a/svl/inc/whiter.hxx b/svl/inc/whiter.hxx
index 83a3e21e2b0e..f273ffadb4cd 100644
--- a/svl/inc/whiter.hxx
+++ b/svl/inc/whiter.hxx
@@ -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
@@ -53,8 +53,8 @@ public:
     USHORT  NextWhich();
     USHORT  PrevWhich();
 
-    USHORT  FirstWhich();
-    USHORT  LastWhich();
+    USHORT	FirstWhich();
+    USHORT	LastWhich();
 };
 
 #endif
diff --git a/svl/inc/xmlement.hxx b/svl/inc/xmlement.hxx
index d2680fbbf404..aa7d78dabdc4 100644
--- a/svl/inc/xmlement.hxx
+++ b/svl/inc/xmlement.hxx
@@ -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
@@ -28,7 +28,7 @@
 #ifndef _SVTOOLS_XMLEMENT_HXX
 #define _SVTOOLS_XMLEMENT_HXX
 
-#ifndef _SAL_TYPES_H
+#ifndef _SAL_TYPES_H 
 #include <sal/types.h>
 #endif
 
@@ -39,5 +39,5 @@ struct SvXMLEnumMapEntry
 };
 
 
-#endif  //  _SVTOOLS_XMLEMENT_HXX
+#endif	//  _SVTOOLS_XMLEMENT_HXX
 
diff --git a/svl/qa/complex/ConfigItems/CheckConfigItems.java b/svl/qa/complex/ConfigItems/CheckConfigItems.java
index 4afa2bf33f55..bdfb0f570621 100644
--- a/svl/qa/complex/ConfigItems/CheckConfigItems.java
+++ b/svl/qa/complex/ConfigItems/CheckConfigItems.java
@@ -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
@@ -44,25 +44,25 @@ public class CheckConfigItems extends ComplexTestCase
 {
     //-------------------------------------------
     // some const
-
+    
     //-------------------------------------------
     // member
-
+    
     /** points to the global uno service manager. */
     private XMultiServiceFactory m_xSmgr = null;
-
+    
     /** implements real config item tests in C++. */
     private XJob m_xTest = null;
-
+        
     //-------------------------------------------
     // test environment
-
+    
     //-------------------------------------------
     /** @short  A function to tell the framework,
                 which test functions are available.
-
+                
         @return All test methods.
-        @todo   Think about selection of tests from outside ...
+        @todo   Think about selection of tests from outside ...     
      */
     public String[] getTestMethodNames()
     {
@@ -79,7 +79,7 @@ public class CheckConfigItems extends ComplexTestCase
 
     //-------------------------------------------
     /** @short  Create the environment for following tests.
-
+    
         @descr  Use either a component loader from desktop or
                 from frame
      */
@@ -88,12 +88,12 @@ public class CheckConfigItems extends ComplexTestCase
     {
         // get uno service manager from global test environment
         m_xSmgr = (XMultiServiceFactory)param.getMSF();
-
+    
         // TODO register helper service
-
+    
         // create module manager
         m_xTest = (XJob)UnoRuntime.queryInterface(
-                    XJob.class,
+                    XJob.class, 
                     m_xSmgr.createInstance("com.sun.star.comp.svl.ConfigItemTest"));
     }
 
@@ -104,7 +104,7 @@ public class CheckConfigItems extends ComplexTestCase
         throws java.lang.Exception
     {
         // TODO deregister helper service
-
+    
         m_xTest = null;
         m_xSmgr = null;
     }
@@ -144,7 +144,7 @@ public class CheckConfigItems extends ComplexTestCase
     {
         impl_triggerTest("checkPrintOptions");
     }
-
+    
     //-------------------------------------------
     /** @todo document me
      */
diff --git a/svl/qa/complex/ConfigItems/helper/AccessibilityOptTest.cxx b/svl/qa/complex/ConfigItems/helper/AccessibilityOptTest.cxx
index 10112c07ac8c..cf828b914981 100644
--- a/svl/qa/complex/ConfigItems/helper/AccessibilityOptTest.cxx
+++ b/svl/qa/complex/ConfigItems/helper/AccessibilityOptTest.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
@@ -24,7 +24,7 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-
+ 
 #include "AccessibilityOptTest.hxx"
 #include "configitems/accessibilityoptions_const.hxx"
 
@@ -60,14 +60,14 @@ void AccessibilityOptTest::impl_checkGetAutoDetectSystemHC()
     sal_Bool bAutoDetectSystemHC;
     sal_Bool bAutoDetectSystemHC_;
 
-    bAutoDetectSystemHC  = aAccessibilityOpt.GetAutoDetectSystemHC();
-    xSet->setPropertyValue( s_sAutoDetectSystemHC, css::uno::makeAny(bAutoDetectSystemHC ? sal_False:sal_True) );
+    bAutoDetectSystemHC  = aAccessibilityOpt.GetAutoDetectSystemHC();	
+    xSet->setPropertyValue( s_sAutoDetectSystemHC, css::uno::makeAny(bAutoDetectSystemHC ? sal_False:sal_True) );	
     ::comphelper::ConfigurationHelper::flush(m_xCfg);
     bAutoDetectSystemHC_ = aAccessibilityOpt.GetAutoDetectSystemHC();
 
     if ( bAutoDetectSystemHC_ == bAutoDetectSystemHC )//old config item will not throw error
         throw css::uno::RuntimeException(
-        ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("GetAutoDetectSystemHC() error!")), 0);
+        ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("GetAutoDetectSystemHC() error!")),	0);
 }
 
 //=============================================================================
@@ -79,13 +79,13 @@ void AccessibilityOptTest::impl_checkGetIsForPagePreviews()
     sal_Bool bIsForPagePreviews_;
 
     bIsForPagePreviews  = aAccessibilityOpt.GetIsForPagePreviews();
-    xSet->setPropertyValue( s_sIsForPagePreviews, css::uno::makeAny(bIsForPagePreviews ? sal_False:sal_True) );
+    xSet->setPropertyValue( s_sIsForPagePreviews, css::uno::makeAny(bIsForPagePreviews ? sal_False:sal_True) );	
     ::comphelper::ConfigurationHelper::flush(m_xCfg);
     bIsForPagePreviews_ = aAccessibilityOpt.GetIsForPagePreviews();
 
     if ( bIsForPagePreviews_ == bIsForPagePreviews )//old config item will not throw error
         throw css::uno::RuntimeException(
-        ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("GetIsForPagePreviews() error!")),  0);
+        ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("GetIsForPagePreviews() error!")),	0);
 }
 
 //=============================================================================
@@ -97,13 +97,13 @@ void AccessibilityOptTest::impl_checkGetIsHelpTipsDisappear()
     sal_Bool bIsHelpTipsDisappear_;
 
     bIsHelpTipsDisappear  = aAccessibilityOpt.GetIsHelpTipsDisappear();
-    xSet->setPropertyValue( s_sIsHelpTipsDisappear, css::uno::makeAny(bIsHelpTipsDisappear ? sal_False:sal_True) );
+    xSet->setPropertyValue( s_sIsHelpTipsDisappear, css::uno::makeAny(bIsHelpTipsDisappear ? sal_False:sal_True) );	
     ::comphelper::ConfigurationHelper::flush(m_xCfg);
     bIsHelpTipsDisappear_ = aAccessibilityOpt.GetIsHelpTipsDisappear();
 
     if ( bIsHelpTipsDisappear_ == bIsHelpTipsDisappear )//old config item will not throw error
         throw css::uno::RuntimeException(
-        ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("GetIsHelpTipsDisappear() error!")),    0);
+        ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("GetIsHelpTipsDisappear() error!")),	0);
 }
 
 //=============================================================================
@@ -115,13 +115,13 @@ void AccessibilityOptTest::impl_checkGetIsAllowAnimatedGraphics()
     sal_Bool bIsAllowAnimatedGraphics_;
 
     bIsAllowAnimatedGraphics  = aAccessibilityOpt.GetIsAllowAnimatedGraphics();
-    xSet->setPropertyValue( s_sIsAllowAnimatedGraphics, css::uno::makeAny(bIsAllowAnimatedGraphics ? sal_False:sal_True) );
+    xSet->setPropertyValue( s_sIsAllowAnimatedGraphics, css::uno::makeAny(bIsAllowAnimatedGraphics ? sal_False:sal_True) );	
     ::comphelper::ConfigurationHelper::flush(m_xCfg);
     bIsAllowAnimatedGraphics_ = aAccessibilityOpt.GetIsAllowAnimatedGraphics();
 
     if ( bIsAllowAnimatedGraphics_ == bIsAllowAnimatedGraphics )//old config item will not throw error
         throw css::uno::RuntimeException(
-        ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("GetIsAllowAnimatedGraphics() error!")),    0);
+        ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("GetIsAllowAnimatedGraphics() error!")),	0);
 }
 
 //=============================================================================
@@ -133,13 +133,13 @@ void AccessibilityOptTest::impl_checkGetIsAllowAnimatedText()
     sal_Bool bIsAllowAnimatedText_;
 
     bIsAllowAnimatedText  = aAccessibilityOpt.GetIsAllowAnimatedText();
-    xSet->setPropertyValue( s_sIsAllowAnimatedText, css::uno::makeAny(bIsAllowAnimatedText ? sal_False:sal_True) );
+    xSet->setPropertyValue( s_sIsAllowAnimatedText, css::uno::makeAny(bIsAllowAnimatedText ? sal_False:sal_True) );	
     ::comphelper::ConfigurationHelper::flush(m_xCfg);
     bIsAllowAnimatedText_ = aAccessibilityOpt.GetIsAllowAnimatedText();
 
     if ( bIsAllowAnimatedText_ == bIsAllowAnimatedText )//old config item will not throw error
         throw css::uno::RuntimeException(
-        ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("GetIsAllowAnimatedText() error!")),    0);
+        ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("GetIsAllowAnimatedText() error!")),	0);
 }
 
 //=============================================================================
@@ -151,13 +151,13 @@ void AccessibilityOptTest::impl_checkGetIsAutomaticFontColor()
     sal_Bool bIsAutomaticFontColor_;
 
     bIsAutomaticFontColor  = aAccessibilityOpt.GetIsAutomaticFontColor();
-    xSet->setPropertyValue( s_sIsAutomaticFontColor, css::uno::makeAny(bIsAutomaticFontColor ? sal_False:sal_True) );
+    xSet->setPropertyValue( s_sIsAutomaticFontColor, css::uno::makeAny(bIsAutomaticFontColor ? sal_False:sal_True) );	
     ::comphelper::ConfigurationHelper::flush(m_xCfg);
     bIsAutomaticFontColor_ = aAccessibilityOpt.GetIsAutomaticFontColor();
 
     if ( bIsAutomaticFontColor_ == bIsAutomaticFontColor )//old config item will not throw error
         throw css::uno::RuntimeException(
-        ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("GetIsAutomaticFontColor() error!")),   0);
+        ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("GetIsAutomaticFontColor() error!")),	0);
 }
 
 //=============================================================================
@@ -169,13 +169,13 @@ void AccessibilityOptTest::impl_checkGetIsSystemFont()
     sal_Bool bIsSystemFont_;
 
     bIsSystemFont  = aAccessibilityOpt.GetIsSystemFont();
-    xSet->setPropertyValue( s_sIsSystemFont, css::uno::makeAny(bIsSystemFont ? sal_False:sal_True) );
+    xSet->setPropertyValue( s_sIsSystemFont, css::uno::makeAny(bIsSystemFont ? sal_False:sal_True) );	
     ::comphelper::ConfigurationHelper::flush(m_xCfg);
     bIsSystemFont_ = aAccessibilityOpt.GetIsSystemFont();
 
     if ( bIsSystemFont_ == bIsSystemFont )//old config item will not throw error
         throw css::uno::RuntimeException(
-        ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("GetIsSystemFont() error!")),   0);
+        ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("GetIsSystemFont() error!")),	0);
 }
 
 //=============================================================================
@@ -193,7 +193,7 @@ void AccessibilityOptTest::impl_checkGetHelpTipSeconds()
 
     if ( nHelpTipSeconds_ == nHelpTipSeconds )//old config item will not throw error
         throw css::uno::RuntimeException(
-        ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("GetHelpTipSeconds() error!")), 0);
+        ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("GetHelpTipSeconds() error!")),	0);
 }
 
 //=============================================================================
@@ -205,13 +205,13 @@ void AccessibilityOptTest::impl_checkIsSelectionInReadonly()
     sal_Bool bIsSelectionInReadonly_;
 
     bIsSelectionInReadonly  = aAccessibilityOpt.IsSelectionInReadonly();
-    xSet->setPropertyValue( s_sIsSelectionInReadonly, css::uno::makeAny(bIsSelectionInReadonly ? sal_False:sal_True) );
+    xSet->setPropertyValue( s_sIsSelectionInReadonly, css::uno::makeAny(bIsSelectionInReadonly ? sal_False:sal_True) );	
     ::comphelper::ConfigurationHelper::flush(m_xCfg);
     bIsSelectionInReadonly_ = aAccessibilityOpt.IsSelectionInReadonly();
 
     if ( bIsSelectionInReadonly_ == bIsSelectionInReadonly )//old config item will not throw error
         throw css::uno::RuntimeException(
-        ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("IsSelectionInReadonly() error!")), 0);
+        ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("IsSelectionInReadonly() error!")),	0);
 }
 
 //=============================================================================
@@ -228,7 +228,7 @@ void AccessibilityOptTest::impl_checkSetAutoDetectSystemHC()
 
     if ( bAutoDetectSystemHC_ == bAutoDetectSystemHC )//old config item will throw error
         throw css::uno::RuntimeException(
-        ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SetAutoDetectSystemHC() error!")), 0);
+        ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SetAutoDetectSystemHC() error!")),	0);
 }
 
 //=============================================================================
@@ -245,7 +245,7 @@ void AccessibilityOptTest::impl_checkSetIsForPagePreviews()
 
     if ( bIsForPagePreviews_ == bIsForPagePreviews )//old config item will throw error
         throw css::uno::RuntimeException(
-        ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SetIsForPagePreviews() error!")),  0);
+        ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SetIsForPagePreviews() error!")),	0);
 }
 
 //=============================================================================
@@ -262,7 +262,7 @@ void AccessibilityOptTest::impl_checkSetIsHelpTipsDisappear()
 
     if ( bIsHelpTipsDisappear_ == bIsHelpTipsDisappear )//old config item will throw error
         throw css::uno::RuntimeException(
-        ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SetIsHelpTipsDisappear() error!")),    0);
+        ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SetIsHelpTipsDisappear() error!")),	0);
 }
 
 //=============================================================================
@@ -279,7 +279,7 @@ void AccessibilityOptTest::impl_checkSetIsAllowAnimatedGraphics()
 
     if ( bIsAllowAnimatedGraphics_ == bIsAllowAnimatedGraphics )//old config item will throw error
         throw css::uno::RuntimeException(
-        ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SetIsAllowAnimatedGraphics() error!")),    0);
+        ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SetIsAllowAnimatedGraphics() error!")),	0);
 }
 
 //=============================================================================
@@ -296,7 +296,7 @@ void AccessibilityOptTest::impl_checkSetIsAllowAnimatedText()
 
     if ( bIsAllowAnimatedText_ == bIsAllowAnimatedText )//old config item will throw error
         throw css::uno::RuntimeException(
-        ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SetIsAllowAnimatedText() error!")),    0);
+        ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SetIsAllowAnimatedText() error!")),	0);
 }
 
 //=============================================================================
@@ -313,7 +313,7 @@ void AccessibilityOptTest::impl_checkSetIsAutomaticFontColor()
 
     if ( bIsAutomaticFontColor_ == bIsAutomaticFontColor )//old config item will throw error
         throw css::uno::RuntimeException(
-        ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SetIsAutomaticFontColor() error!")),   0);
+        ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SetIsAutomaticFontColor() error!")),	0);
 }
 
 //=============================================================================
@@ -330,7 +330,7 @@ void AccessibilityOptTest::impl_checkSetIsSystemFont()
 
     if ( bIsSystemFont_ == bIsSystemFont )//old config item will throw error
         throw css::uno::RuntimeException(
-        ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SetIsSystemFont() error!")),   0);
+        ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SetIsSystemFont() error!")),	0);
 }
 
 //=============================================================================
@@ -347,7 +347,7 @@ void AccessibilityOptTest::impl_checkSetHelpTipSeconds()
 
     if ( nHelpTipSeconds_ == nHelpTipSeconds )//old config item will throw error
         throw css::uno::RuntimeException(
-        ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SetHelpTipSeconds() error!")), 0);
+        ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SetHelpTipSeconds() error!")),	0);
 }
 
 //=============================================================================
@@ -364,12 +364,12 @@ void AccessibilityOptTest::impl_checkSetSelectionInReadonly()
 
     if ( bIsSelectionInReadonly_ == bIsSelectionInReadonly )//old config item will throw error
         throw css::uno::RuntimeException(
-        ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SetSelectionInReadonly() error!")),    0);
+        ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SetSelectionInReadonly() error!")),	0);
 }
 
 //=============================================================================
 void AccessibilityOptTest::impl_checkAccessibilityOptions()
-{
+{	
     impl_checkGetAutoDetectSystemHC();
     impl_checkGetIsForPagePreviews();
     impl_checkGetIsHelpTipsDisappear();
diff --git a/svl/qa/complex/ConfigItems/helper/AccessibilityOptTest.hxx b/svl/qa/complex/ConfigItems/helper/AccessibilityOptTest.hxx
index cf2146f54e49..1b0b208221d3 100644
--- a/svl/qa/complex/ConfigItems/helper/AccessibilityOptTest.hxx
+++ b/svl/qa/complex/ConfigItems/helper/AccessibilityOptTest.hxx
@@ -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
@@ -62,7 +62,7 @@ private:
     void impl_checkSetHelpTipSeconds();
     void impl_checkSetSelectionInReadonly();
 
-private:
+private:	
     css::uno::Reference< css::container::XNameAccess > m_xCfg;
     SvtAccessibilityOptions aAccessibilityOpt;
 };
diff --git a/svl/qa/complex/ConfigItems/helper/ConfigItemTest.cxx b/svl/qa/complex/ConfigItems/helper/ConfigItemTest.cxx
index f9840605a6d5..380716ca4d6a 100644
--- a/svl/qa/complex/ConfigItems/helper/ConfigItemTest.cxx
+++ b/svl/qa/complex/ConfigItems/helper/ConfigItemTest.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
@@ -53,7 +53,7 @@ static const ::rtl::OUString TEST_HELPBOOKMARKS         = ::rtl::OUString::creat
 static const ::rtl::OUString TEST_ACCESSIBILITYOPTIONS  = ::rtl::OUString::createFromAscii("checkAccessibilityOptions");
 static const ::rtl::OUString TEST_PRINTOPTIONS          = ::rtl::OUString::createFromAscii("checkPrintOptions");
 static const ::rtl::OUString TEST_USEROPTIONS           = ::rtl::OUString::createFromAscii("checkUserOptions");
-
+    
 //=============================================================================
 class ConfigItemTest : public ::cppu::WeakImplHelper2< css::task::XJob         ,
                                                         css::lang::XServiceInfo >
@@ -62,7 +62,7 @@ class ConfigItemTest : public ::cppu::WeakImplHelper2< css::task::XJob         ,
     // interface
     public:
         explicit ConfigItemTest(const css::uno::Reference< css::uno::XComponentContext >& xContext);
-
+    
         // css::task::XJob
         virtual css::uno::Any SAL_CALL execute(const css::uno::Sequence< css::beans::NamedValue >& lArguments)
             throw (css::uno::RuntimeException         ,
@@ -72,27 +72,27 @@ class ConfigItemTest : public ::cppu::WeakImplHelper2< css::task::XJob         ,
         // css::lang::XServiceInfo
         virtual ::rtl::OUString SAL_CALL getImplementationName()
             throw (css::uno::RuntimeException);
-
+    
         virtual ::sal_Bool SAL_CALL supportsService(const ::rtl::OUString& sServiceName)
             throw (css::uno::RuntimeException);
-
+    
         virtual css::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames()
             throw (css::uno::RuntimeException);
-
+    
     //-------------------------------------------------------------------------
     // internal
     private:
         ConfigItemTest(ConfigItemTest &); // not defined
         virtual ~ConfigItemTest() {}
         void operator=(ConfigItemTest &); // not defined
-
+    
     //-------------------------------------------------------------------------
     // helper for registration !
     public:
         static ::rtl::OUString SAL_CALL st_getImplementationName();
         static css::uno::Sequence< ::rtl::OUString > SAL_CALL st_getSupportedServiceNames();
         static css::uno::Reference< css::uno::XInterface > SAL_CALL st_create(const css::uno::Reference< css::uno::XComponentContext >& XContext);
-
+        
     //-------------------------------------------------------------------------
     // member
     private:
diff --git a/svl/qa/complex/ConfigItems/helper/HistoryOptTest.cxx b/svl/qa/complex/ConfigItems/helper/HistoryOptTest.cxx
index 4f8e2159847d..6f56833b268b 100644
--- a/svl/qa/complex/ConfigItems/helper/HistoryOptTest.cxx
+++ b/svl/qa/complex/ConfigItems/helper/HistoryOptTest.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
@@ -24,7 +24,7 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-
+ 
 #include "HistoryOptTest.hxx"
 #include <unotools/historyoptions_const.hxx>
 
@@ -130,7 +130,7 @@ void HistoryOptTest::impl_testHistory(EHistoryType eHistory ,
             ( ! impl_existsItemAtIndex(nFirstItem , 1))
            )
             throw css::uno::Exception(MESSAGE_WRONG_ORDER, 0);
-
+        
         for (i=0; i<nSecondItem; ++i)
         {
             ::sal_Int32 nExpectedIndex = (c-1)-i;
@@ -146,10 +146,10 @@ void HistoryOptTest::impl_testHistory(EHistoryType eHistory ,
 
         if ( ! impl_existsItemAtIndex(nNewestItem, 0))
             throw css::uno::Exception(MESSAGE_WRONG_ORDER, 0);
-
+        
         if (impl_existsItem(nOldestItem))
             throw css::uno::Exception(MESSAGE_UNEXPECTED_ITEM, 0);
-
+        
         // e) Check if decreasing list size will remove oldest items.
         //    Note: impl_setSize() will make sure that 3 items exists only.
         //    Otherwhise it throws an exception. If we further check
@@ -184,17 +184,17 @@ void HistoryOptTest::impl_clearList()
 
     if (nCount != 0)
         throw css::uno::Exception(MESSAGE_CLEAR_FAILED, 0);
-
+    
     css::uno::Reference< css::container::XNameAccess > xList;
     xList  = impl_getItemList();
     nCount = xList->getElementNames().getLength();
-
+    
     if (nCount != 0)
         throw css::uno::Exception(MESSAGE_CLEAR_FAILED, 0);
-
+    
     xList  = impl_getOrderList();
     nCount = xList->getElementNames().getLength();
-
+    
     if (nCount != 0)
         throw css::uno::Exception(MESSAGE_CLEAR_FAILED, 0);
 }
@@ -209,7 +209,7 @@ void HistoryOptTest::impl_setSize(::sal_Int32 nSize)
     ::sal_Int32 nCheck = m_aConfigItem.GetSize(m_eList);
     if (nCheck != nSize)
         throw css::uno::Exception(MESSAGE_SETSIZE_FAILED, 0);
-
+    
     // b) current size of used XCU lists reflects the current state of
     //    history list and not max size. So it can be less then size !
     css::uno::Reference< css::container::XNameAccess > xList;
@@ -278,7 +278,7 @@ void HistoryOptTest::impl_appendItem(::sal_Int32 nItem)
     {
         const ::comphelper::SequenceAsHashMap aItem(lItems[i]);
         const ::rtl::OUString&                sCheck = aItem.getUnpackedValueOrDefault(s_sURL, ::rtl::OUString());
-
+    
         bFound = sCheck.equals(sURL);
         if (bFound)
             break;
@@ -293,12 +293,12 @@ void HistoryOptTest::impl_appendItem(::sal_Int32 nItem)
         css::uno::Reference< css::container::XNameAccess > xItemList = impl_getItemList();
         css::uno::Reference< css::container::XNameAccess > xItem     ;
         xItemList->getByName(sURL) >>= xItem;
-
+    
         bFound = xItem.is();
     }
     catch(const css::container::NoSuchElementException&)
         {}
-
+    
     return bFound;
 }
 
@@ -327,23 +327,23 @@ void HistoryOptTest::impl_appendItem(::sal_Int32 nItem)
         css::uno::Reference< css::container::XNameAccess > xItemList = impl_getItemList();
         css::uno::Reference< css::container::XNameAccess > xItem     ;
         xItemList->getByName(sURL) >>= xItem;
-
+    
         bFound = xItem.is();
     }
     catch(const css::container::NoSuchElementException&)
         {}
-
+        
     if ( ! bFound)
         return sal_False;
     bFound = sal_False;
-
+    
     try
     {
         const ::rtl::OUString                              sOrder     = ::rtl::OUString::valueOf(nIndex);
         css::uno::Reference< css::container::XNameAccess > xOrderList = impl_getOrderList();
         css::uno::Reference< css::container::XNameAccess > xOrder     ;
         xOrderList->getByName(sOrder) >>= xOrder;
-
+    
         if (xOrder.is())
         {
             xOrder->getByName(s_sHistoryItemRef) >>= sCheck;
@@ -352,7 +352,7 @@ void HistoryOptTest::impl_appendItem(::sal_Int32 nItem)
     }
     catch(const css::container::NoSuchElementException&)
         {}
-
+        
     return bFound;
 }
 
@@ -362,10 +362,10 @@ css::uno::Reference< css::container::XNameAccess > HistoryOptTest::impl_getItemL
     css::uno::Reference< css::container::XNameAccess > xHistory = impl_getNewHistory();
     css::uno::Reference< css::container::XNameAccess > xList    ;
     xHistory->getByName (s_sItemList) >>= xList;
-
+    
     if ( ! xList.is())
         throw css::uno::Exception(MESSAGE_MISS_ITEMLIST, 0);
-
+    
     return xList;
 }
 
@@ -375,10 +375,10 @@ css::uno::Reference< css::container::XNameAccess > HistoryOptTest::impl_getOrder
     css::uno::Reference< css::container::XNameAccess > xHistory = impl_getNewHistory();
     css::uno::Reference< css::container::XNameAccess > xList    ;
     xHistory->getByName (s_sOrderList) >>= xList;
-
+    
     if ( ! xList.is())
         throw css::uno::Exception(MESSAGE_MISS_ORDERLIST, 0);
-
+    
     return xList;
 }
 
@@ -402,11 +402,11 @@ css::uno::Reference< css::container::XNameAccess > HistoryOptTest::impl_getNewHi
         case ePICKLIST :
                 m_xHistoriesXCU->getByName(s_sPickList) >>= xHistory;
                 break;
-
+        
         case eHISTORY :
                 m_xHistoriesXCU->getByName(s_sURLHistory) >>= xHistory;
                 break;
-
+        
         case eHELPBOOKMARKS :
                 m_xHistoriesXCU->getByName(s_sHelpBookmarks) >>= xHistory;
                 break;
@@ -414,7 +414,7 @@ css::uno::Reference< css::container::XNameAccess > HistoryOptTest::impl_getNewHi
 
     if ( ! xHistory.is())
         throw css::uno::Exception(MESSAGE_MISS_HISTORY, 0);
-
+    
     return xHistory;
 }
 
@@ -438,11 +438,11 @@ css::uno::Reference< css::container::XNameAccess > HistoryOptTest::impl_getOldHi
         case ePICKLIST :
                 m_xCommonXCU->getByName(s_sPickList) >>= xHistory;
                 break;
-
+        
         case eHISTORY :
                 m_xCommonXCU->getByName(s_sURLHistory) >>= xHistory;
                 break;
-
+        
         case eHELPBOOKMARKS :
                 m_xCommonXCU->getByName(s_sHelpBookmarks) >>= xHistory;
                 break;
@@ -475,13 +475,13 @@ void HistoryOptTest::impl_clearList(const ::rtl::OUString& sList)
 
     if (xListAccess.is())
     {
-        xListAccess->getByName(s_sItemList)  >>= xItemOrder  ;
-        sFileList = xItemOrder->getElementNames();
+        xListAccess->getByName(s_sItemList)  >>= xItemOrder  ;				
+        sFileList = xItemOrder->getElementNames();  
         for(sal_Int32 i=0; i<sFileList.getLength(); ++i)
             xItemOrder->removeByName(sFileList[i]);
 
         xListAccess->getByName(s_sOrderList) >>= xItemOrder ;
-        sFileList = xItemOrder->getElementNames();
+        sFileList = xItemOrder->getElementNames();  
         for(sal_Int32 j=0; j<sFileList.getLength(); ++j)
             xItemOrder->removeByName(sFileList[j]);
 
@@ -493,7 +493,7 @@ void HistoryOptTest::impl_clearList(const ::rtl::OUString& sList)
 }
 
 //=============================================================================
-// use configuration API (not ConfigItem!) to verify the results within XML !
+// use configuration API (not ConfigItem!) to verify the results within XML ! 
 sal_Bool HistoryOptTest::impl_isListEmpty(const ::rtl::OUString& sList)
 {
     css::uno::Reference< css::container::XNameAccess > xListAccess;
@@ -525,7 +525,7 @@ sal_Bool HistoryOptTest::impl_isListEmpty(const ::rtl::OUString& sList)
 }
 
 //=============================================================================
-// append a item: use configuration API (not ConfigItem!) to verify the results within XML !
+// append a item: use configuration API (not ConfigItem!) to verify the results within XML ! 
 void HistoryOptTest::impl_appendItem(const ::rtl::OUString& sList)
 {//to do...
 }
@@ -546,7 +546,7 @@ void HistoryOptTest::impl_checkGetSize(const ::rtl::OUString& sList)
         xSet->setPropertyValue(s_sPickListSize, css::uno::makeAny(nSize+1));
         ::comphelper::ConfigurationHelper::flush(m_xCommonXCU);
 
-        nSize_ = aHistoryOpt.GetSize(ePICKLIST);
+        nSize_ = aHistoryOpt.GetSize(ePICKLIST); 
         if (nSize_ == nSize)
             throw css::uno::RuntimeException(
             ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("GetSize(ePICKLIST) error!")), 0);
@@ -559,7 +559,7 @@ void HistoryOptTest::impl_checkGetSize(const ::rtl::OUString& sList)
         xSet->setPropertyValue(s_sURLHistorySize, css::uno::makeAny(nSize+1));
         ::comphelper::ConfigurationHelper::flush(m_xCommonXCU);
 
-        nSize_ = aHistoryOpt.GetSize(eHISTORY);
+        nSize_ = aHistoryOpt.GetSize(eHISTORY); 
 
         if (nSize_ == nSize)
             throw css::uno::RuntimeException(
@@ -573,7 +573,7 @@ void HistoryOptTest::impl_checkGetSize(const ::rtl::OUString& sList)
         xSet->setPropertyValue(s_sHelpBookmarksSize, css::uno::makeAny(nSize+1));
         ::comphelper::ConfigurationHelper::flush(m_xCommonXCU);
 
-        nSize_ = aHistoryOpt.GetSize(eHELPBOOKMARKS);
+        nSize_ = aHistoryOpt.GetSize(eHELPBOOKMARKS); 
 
         if (nSize_ == nSize)
             throw css::uno::RuntimeException(
@@ -650,7 +650,7 @@ void HistoryOptTest::impl_checkClear(const ::rtl::OUString& sList)
         if ( !impl_isListEmpty(s_sHelpBookmarks) )
             throw css::uno::RuntimeException(
             ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Clear(eHELPBOOKMARKS) error!")), 0);
-    }
+    }	
 }
 
 //=============================================================================
@@ -660,7 +660,7 @@ void HistoryOptTest::impl_checkGetList(const ::rtl::OUString& sList)
     if (sList.equalsAscii("PickList"))
     {
         impl_clearList(s_sPickList);
-        aHistoryOpt.AppendItem( ePICKLIST  ,
+        aHistoryOpt.AppendItem( ePICKLIST  , 
             ::rtl::OUString::createFromAscii("file:///c/test1"),
             ::rtl::OUString::createFromAscii(""),
             ::rtl::OUString::createFromAscii(""),
@@ -675,7 +675,7 @@ void HistoryOptTest::impl_checkGetList(const ::rtl::OUString& sList)
     else if (sList.equalsAscii("URLHistory"))
     {
         impl_clearList(s_sURLHistory);
-        aHistoryOpt.AppendItem( eHISTORY  ,
+        aHistoryOpt.AppendItem( eHISTORY  , 
             ::rtl::OUString::createFromAscii("file:///c/test1"),
             ::rtl::OUString::createFromAscii(""),
             ::rtl::OUString::createFromAscii(""),
@@ -690,7 +690,7 @@ void HistoryOptTest::impl_checkGetList(const ::rtl::OUString& sList)
     else if (sList.equalsAscii("HelpBookmarks"))
     {
         impl_clearList(s_sHelpBookmarks);
-        aHistoryOpt.AppendItem( eHELPBOOKMARKS  ,
+        aHistoryOpt.AppendItem( eHELPBOOKMARKS  , 
             ::rtl::OUString::createFromAscii("file:///c/test1"),
             ::rtl::OUString::createFromAscii(""),
             ::rtl::OUString::createFromAscii(""),
@@ -700,7 +700,7 @@ void HistoryOptTest::impl_checkGetList(const ::rtl::OUString& sList)
         if ( aHistoryList.getLength()==0 )
             throw css::uno::RuntimeException(
             ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("GetList(eHELPBOOKMARKS) error!")), 0);
-    }
+    }	
 }
 
 void HistoryOptTest::impl_checkAppendItem(const ::rtl::OUString& sList)
@@ -711,13 +711,13 @@ void HistoryOptTest::impl_checkAppendItem(const ::rtl::OUString& sList)
         sal_Int32 nListSize = aHistoryOpt.GetSize(ePICKLIST);
 
         for (sal_Int32 i=0; i<nListSize; ++i)
-            aHistoryOpt.AppendItem( ePICKLIST  ,
+            aHistoryOpt.AppendItem( ePICKLIST  , 
             ::rtl::OUString::valueOf(i),
             ::rtl::OUString::createFromAscii(""),
             ::rtl::OUString::createFromAscii(""),
             ::rtl::OUString::createFromAscii("") );
 
-        aHistoryOpt.AppendItem( ePICKLIST  ,
+        aHistoryOpt.AppendItem( ePICKLIST  , 
             ::rtl::OUString::valueOf(nListSize),
             ::rtl::OUString::createFromAscii(""),
             ::rtl::OUString::createFromAscii(""),
@@ -730,13 +730,13 @@ void HistoryOptTest::impl_checkAppendItem(const ::rtl::OUString& sList)
         sal_Int32 nListSize = aHistoryOpt.GetSize(eHISTORY);
 
         for (sal_Int32 i=0; i<nListSize; ++i)
-            aHistoryOpt.AppendItem( eHISTORY  ,
+            aHistoryOpt.AppendItem( eHISTORY  , 
             ::rtl::OUString::valueOf(i),
             ::rtl::OUString::createFromAscii(""),
             ::rtl::OUString::createFromAscii(""),
             ::rtl::OUString::createFromAscii("") );
 
-        aHistoryOpt.AppendItem( eHISTORY  ,
+        aHistoryOpt.AppendItem( eHISTORY  , 
             ::rtl::OUString::valueOf(nListSize),
             ::rtl::OUString::createFromAscii(""),
             ::rtl::OUString::createFromAscii(""),
@@ -749,17 +749,17 @@ void HistoryOptTest::impl_checkAppendItem(const ::rtl::OUString& sList)
         //sal_Int32 nListSize = aHistoryOpt.GetSize(eHELPBOOKMARKS);
 
         //for (sal_Int32 i=0; i<nListSize; ++i)
-        //  aHistoryOpt.AppendItem( eHELPBOOKMARKS  ,
-        //  ::rtl::OUString::valueOf(i),
-        //  ::rtl::OUString::createFromAscii(""),
-        //  ::rtl::OUString::createFromAscii(""),
-        //  ::rtl::OUString::createFromAscii("") );
-
-        //aHistoryOpt.AppendItem( eHELPBOOKMARKS  ,
-        //  ::rtl::OUString::valueOf(nListSize),
-        //  ::rtl::OUString::createFromAscii(""),
-        //  ::rtl::OUString::createFromAscii(""),
-        //  ::rtl::OUString::createFromAscii("") );
+        //	aHistoryOpt.AppendItem( eHELPBOOKMARKS  , 
+        //	::rtl::OUString::valueOf(i),
+        //	::rtl::OUString::createFromAscii(""),
+        //	::rtl::OUString::createFromAscii(""),
+        //	::rtl::OUString::createFromAscii("") );
+
+        //aHistoryOpt.AppendItem( eHELPBOOKMARKS  , 
+        //	::rtl::OUString::valueOf(nListSize),
+        //	::rtl::OUString::createFromAscii(""),
+        //	::rtl::OUString::createFromAscii(""),
+        //	::rtl::OUString::createFromAscii("") );
     }
 }
 
@@ -788,7 +788,7 @@ void HistoryOptTest::impl_checkURLHistory()
 //=============================================================================
 void HistoryOptTest::impl_checkHelpBookmarks()
 {
-    impl_checkGetSize(s_sHelpBookmarks);
+    impl_checkGetSize(s_sHelpBookmarks);	
     impl_checkSetSize(s_sHelpBookmarks);
 
     impl_checkClear(s_sHelpBookmarks);
diff --git a/svl/qa/complex/ConfigItems/helper/HistoryOptTest.hxx b/svl/qa/complex/ConfigItems/helper/HistoryOptTest.hxx
index 05ea7edb01cc..a0c49c311100 100644
--- a/svl/qa/complex/ConfigItems/helper/HistoryOptTest.hxx
+++ b/svl/qa/complex/ConfigItems/helper/HistoryOptTest.hxx
@@ -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
diff --git a/svl/qa/complex/ConfigItems/helper/PrintOptTest.cxx b/svl/qa/complex/ConfigItems/helper/PrintOptTest.cxx
index 0731aa2a4253..1ce891be7a6b 100644
--- a/svl/qa/complex/ConfigItems/helper/PrintOptTest.cxx
+++ b/svl/qa/complex/ConfigItems/helper/PrintOptTest.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
@@ -24,7 +24,7 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-
+ 
 #include "PrintOptTest.hxx"
 
 #include <com/sun/star/beans/XPropertySet.hpp>
@@ -36,10 +36,10 @@ namespace css = ::com::sun::star;
 
 // using test  only
 #define ROOTNODE_PRINTOPTION                            rtl::OUString::createFromAscii("org.openoffice.Office.Common/Print/Option")
-#define PROPERTYNAME_REDUCETRANSPARENCY                 rtl::OUString::createFromAscii("ReduceTransparency")
-#define PROPERTYNAME_REDUCEDTRANSPARENCYMODE            rtl::OUString::createFromAscii("ReducedTransparencyMode")
-#define PROPERTYNAME_REDUCEGRADIENTS                    rtl::OUString::createFromAscii("ReduceGradients")
-#define PROPERTYNAME_REDUCEDGRADIENTMODE                rtl::OUString::createFromAscii("ReducedGradientMode")
+#define	PROPERTYNAME_REDUCETRANSPARENCY	                rtl::OUString::createFromAscii("ReduceTransparency")
+#define	PROPERTYNAME_REDUCEDTRANSPARENCYMODE	        rtl::OUString::createFromAscii("ReducedTransparencyMode")
+#define	PROPERTYNAME_REDUCEGRADIENTS		            rtl::OUString::createFromAscii("ReduceGradients")
+#define	PROPERTYNAME_REDUCEDGRADIENTMODE		        rtl::OUString::createFromAscii("ReducedGradientMode")
 #define PROPERTYNAME_REDUCEDGRADIENTSTEPCOUNT           rtl::OUString::createFromAscii("ReducedGradientStepCount")
 #define PROPERTYNAME_REDUCEBITMAPS                      rtl::OUString::createFromAscii("ReduceBitmaps")
 #define PROPERTYNAME_REDUCEDBITMAPMODE                  rtl::OUString::createFromAscii("ReducedBitmapMode")
@@ -56,7 +56,7 @@ PrintOptTest::PrintOptTest()
             ::comphelper::ConfigurationHelper::E_STANDARD),
             css::uno::UNO_QUERY);
 
-        if (m_xCfg.is())
+        if (m_xCfg.is())		
         {
             //UniString  sTmp = UniString("printer");
             //xub_StrLen nTokenCount = sTmp.GetTokenCount('/');
@@ -123,7 +123,7 @@ void PrintOptTest::impl_SetReduceTransparency(sal_Bool bState )
     }
 }
 
-sal_Bool PrintOptTest::impl_IsReduceGradients() const
+sal_Bool PrintOptTest::impl_IsReduceGradients() const 
 {
     sal_Bool bRet = sal_False;
     if (m_xNode.is())
@@ -226,7 +226,7 @@ sal_Bool PrintOptTest::impl_IsReduceBitmaps() const
         css::uno::Reference<css::beans::XPropertySet> xSet(m_xNode, css::uno::UNO_QUERY);
         if (xSet.is())
         {
-            xSet->getPropertyValue(PROPERTYNAME_REDUCEBITMAPS) >>= bRet;
+            xSet->getPropertyValue(PROPERTYNAME_REDUCEBITMAPS) >>= bRet; 
         }
     }
     return bRet;
@@ -291,7 +291,7 @@ sal_Int16  PrintOptTest::impl_GetReducedBitmapResolution() const
         if (xSet.is())
         {
             xSet->getPropertyValue(PROPERTYNAME_REDUCEDBITMAPRESOLUTION) >>= nRet;
-        }
+        } 
     }
     return  nRet;
 }
@@ -385,7 +385,7 @@ PrintOptTest::~PrintOptTest()
 
 void PrintOptTest::impl_checkPrint()
 {
-    //test SetReduceTransparency()
+    //test SetReduceTransparency() 
     sal_Bool bNewValue = sal_False;
     sal_Bool bOldValue = sal_False;
     bOldValue = PrintOptTest::impl_IsReduceTransparency();
@@ -401,7 +401,7 @@ void PrintOptTest::impl_checkPrint()
             "the SetReduceTransparency() error!"),
             0);
     }
-
+    
     //test IsReduceTransparemcy()
     bNewValue = bOldValue = sal_False;
     bOldValue = impl_IsReduceTransparency();
@@ -423,7 +423,7 @@ void PrintOptTest::impl_checkPrint()
     nOldMode = nNewMode = 0;
     nOldMode = impl_GetReducedTransparencyMode();
     nNewMode = nOldMode + 1;
-    aPrintOpt.SetReducedTransparencyMode( nNewMode );
+    aPrintOpt.SetReducedTransparencyMode( nNewMode );	
     nNewMode = impl_GetReducedTransparencyMode();
     //if(nNewMode != nOldMode)      // test the old source
     if ( nNewMode == nOldMode ) // test the new source
@@ -458,7 +458,7 @@ void PrintOptTest::impl_checkPrint()
     bNewValue = !bOldValue;
     aPrintOpt.SetReduceGradients(bNewValue);
     bNewValue = impl_IsReduceGradients();
-    //if (bNewValue != bOldValue)   //test the old source
+    //if (bNewValue != bOldValue)   //test the old source 
     if (bNewValue == bOldValue)   //test the new source
     {
         throw css::uno::RuntimeException(
@@ -485,7 +485,7 @@ void PrintOptTest::impl_checkPrint()
             0);
 
     }
-
+    
     //test SetRedecedGradientMode()
     nOldMode = nNewMode = 0;
     nOldMode = this->impl_GetReducedGradientMode();
@@ -518,7 +518,7 @@ void PrintOptTest::impl_checkPrint()
             0);
 
     }
-
+    
     //test the SetReducedGradientStepCount()
     sal_Int16 nNewStepCount;
     sal_Int16 nOldStepCount;
@@ -553,7 +553,7 @@ void PrintOptTest::impl_checkPrint()
             "the GetReduceGradientStepCount() error!"),
             0);
     }
-
+    
     // test the SetReduceBitmaps()
     bNewValue = bOldValue = sal_False;
     bOldValue = this->impl_IsReduceBitmaps();
@@ -585,7 +585,7 @@ void PrintOptTest::impl_checkPrint()
             "the IsReduceBitmaps() error!"),
             0);
     }
-
+    
     // test the SetReduceBitmap()
     nNewMode = nOldMode = 0;
     nOldMode = impl_GetReducedBitmapMode();
@@ -601,7 +601,7 @@ void PrintOptTest::impl_checkPrint()
             "the SetReduceBitmap() error!"),
             0);
     }
-
+    
     // test the SetReduceBitmapMode()
     nNewMode = nOldMode = 0;
     nOldMode = this->impl_GetReducedBitmapMode();
@@ -700,7 +700,7 @@ void PrintOptTest::impl_checkPrint()
             "the IsReducedBitmapIncludesTransparency() error!"),
             0);
     }
-
+    
     // test the SetConvertToGreyscales()
     bNewValue = bOldValue = sal_False;
     bOldValue = this->impl_IsConvertToGreyscales();
@@ -714,10 +714,10 @@ void PrintOptTest::impl_checkPrint()
             rtl::OUString::createFromAscii(
             "null com.sun.star.configuration."
             "the SetConvertToGreyscales() error!"),
-            0);
+            0); 
     }
 
-    // test the IsConvertToGreyscales()
+    // test the IsConvertToGreyscales() 
     bNewValue = bOldValue = sal_False;
     bOldValue = this->impl_IsConvertToGreyscales();
     bNewValue = !bOldValue;
diff --git a/svl/qa/complex/ConfigItems/helper/PrintOptTest.hxx b/svl/qa/complex/ConfigItems/helper/PrintOptTest.hxx
index 7d366dc38090..a65d474b240b 100644
--- a/svl/qa/complex/ConfigItems/helper/PrintOptTest.hxx
+++ b/svl/qa/complex/ConfigItems/helper/PrintOptTest.hxx
@@ -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
@@ -24,7 +24,7 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-
+ 
 #ifndef  SVTOOLS_PRINTOPTTEST_HXX
 #define  SVTOOLS_PRINTOPTTEST_HXX
 
@@ -36,17 +36,17 @@ namespace css = ::com::sun::star;
 class PrintOptTest
 {
 public:
-
+    
     PrintOptTest();
     ~PrintOptTest();
 
     void impl_checkPrint();
 
 private: //members
-
+    
     SvtPrinterOptions aPrintOpt;
-    css::uno::Reference< css::container::XNameAccess > m_xCfg;
-    css::uno::Reference< css::container::XNameAccess > m_xNode;
+    css::uno::Reference< css::container::XNameAccess > m_xCfg; 
+    css::uno::Reference< css::container::XNameAccess > m_xNode; 
 
 private: // methods
     sal_Bool    impl_IsReduceTransparency() const ;
@@ -54,17 +54,17 @@ private: // methods
 
     sal_Int16   impl_GetReducedTransparencyMode() const ;
     void        impl_SetReducedTransparencyMode( sal_Int16 nMode ) ;
-
-    sal_Bool    impl_IsReduceGradients() const ;
+    
+    sal_Bool	impl_IsReduceGradients() const ;
     void        impl_SetReduceGradients( sal_Bool bState ) ;
 
     sal_Int16   impl_GetReducedGradientMode() const ;
     void        impl_SetReducedGradientMode( sal_Int16 nMode ) ;
 
     sal_Int16   impl_GetReducedGradientStepCount() const ;
-    void        impl_SetReducedGradientStepCount( sal_Int16 nStepCount );
+    void        impl_SetReducedGradientStepCount( sal_Int16 nStepCount ); 
 
-    sal_Bool    impl_IsReduceBitmaps() const ;
+    sal_Bool	impl_IsReduceBitmaps() const ;
     void        impl_SetReduceBitmaps( sal_Bool bState ) ;
 
     sal_Int16   impl_GetReducedBitmapMode() const ;
@@ -72,11 +72,11 @@ private: // methods
 
     sal_Int16   impl_GetReducedBitmapResolution() const ;
     void        impl_SetReducedBitmapResolution( sal_Int16 nResolution ) ;
-
-    sal_Bool    impl_IsReducedBitmapIncludesTransparency() const ;
+    
+    sal_Bool	impl_IsReducedBitmapIncludesTransparency() const ;
     void        impl_SetReducedBitmapIncludesTransparency( sal_Bool bState ) ;
 
-    sal_Bool    impl_IsConvertToGreyscales() const;
+    sal_Bool	impl_IsConvertToGreyscales() const;
     void        impl_SetConvertToGreyscales( sal_Bool bState ) ;
 
 };
diff --git a/svl/qa/complex/ConfigItems/helper/UserOptTest.cxx b/svl/qa/complex/ConfigItems/helper/UserOptTest.cxx
index b14d20a76694..d2926a1379a1 100644
--- a/svl/qa/complex/ConfigItems/helper/UserOptTest.cxx
+++ b/svl/qa/complex/ConfigItems/helper/UserOptTest.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
@@ -64,41 +64,41 @@ UserOptTest::~UserOptTest()
 
 void UserOptTest::impl_checkUserData()
 {
-    impl_checkSetCompany( ::rtl::OUString() );
-    impl_checkSetFirstName( ::rtl::OUString() );
-    impl_checkSetLastName( ::rtl::OUString() );
-    impl_checkSetID( ::rtl::OUString() );
-    impl_checkSetStreet( ::rtl::OUString() );
-    impl_checkSetCity( ::rtl::OUString() );
-    impl_checkSetState( ::rtl::OUString() );
-    impl_checkSetZip( ::rtl::OUString() );
+    impl_checkSetCompany( ::rtl::OUString() );    
+    impl_checkSetFirstName( ::rtl::OUString() ); 
+    impl_checkSetLastName( ::rtl::OUString() );    
+    impl_checkSetID( ::rtl::OUString() );       
+    impl_checkSetStreet( ::rtl::OUString() );   
+    impl_checkSetCity( ::rtl::OUString() );   
+    impl_checkSetState( ::rtl::OUString() );     
+    impl_checkSetZip( ::rtl::OUString() );     
     impl_checkSetCountry( ::rtl::OUString() );
     impl_checkSetPosition( ::rtl::OUString() );
-    impl_checkSetTitle( ::rtl::OUString() );
+    impl_checkSetTitle( ::rtl::OUString() );     
     impl_checkSetTelephoneHome( ::rtl::OUString() );
     impl_checkSetTelephoneWork( ::rtl::OUString() );
-    impl_checkSetFax( ::rtl::OUString() );
+    impl_checkSetFax( ::rtl::OUString() ); 
     impl_checkSetEmail( ::rtl::OUString() );
-    //impl_checkSetCustomerNumber( ::rtl::OUString() );
+    //impl_checkSetCustomerNumber( ::rtl::OUString() );  
     impl_checkSetFathersName( ::rtl::OUString() );
     impl_checkSetApartment( ::rtl::OUString() );
 
-    impl_checkSetCompany( ::rtl::OUString::createFromAscii("RedFlag2000") );
-    impl_checkSetFirstName( ::rtl::OUString::createFromAscii("Yan") );
-    impl_checkSetLastName( ::rtl::OUString::createFromAscii("Wu") );
-    impl_checkSetID( ::rtl::OUString::createFromAscii("wuy") );
-    impl_checkSetStreet( ::rtl::OUString::createFromAscii("SouthFifthRing") );
-    impl_checkSetCity( ::rtl::OUString::createFromAscii("Beijing") );
-    impl_checkSetState( ::rtl::OUString::createFromAscii("Beijing") );
-    impl_checkSetZip( ::rtl::OUString::createFromAscii("100176") );
+    impl_checkSetCompany( ::rtl::OUString::createFromAscii("RedFlag2000") );    
+    impl_checkSetFirstName( ::rtl::OUString::createFromAscii("Yan") ); 
+    impl_checkSetLastName( ::rtl::OUString::createFromAscii("Wu") );    
+    impl_checkSetID( ::rtl::OUString::createFromAscii("wuy") );       
+    impl_checkSetStreet( ::rtl::OUString::createFromAscii("SouthFifthRing") );   
+    impl_checkSetCity( ::rtl::OUString::createFromAscii("Beijing") );   
+    impl_checkSetState( ::rtl::OUString::createFromAscii("Beijing") );     
+    impl_checkSetZip( ::rtl::OUString::createFromAscii("100176") );     
     impl_checkSetCountry( ::rtl::OUString::createFromAscii("China") );
     impl_checkSetPosition( ::rtl::OUString::createFromAscii("Engineer") );
-    impl_checkSetTitle( ::rtl::OUString::createFromAscii("Software Engineer") );
+    impl_checkSetTitle( ::rtl::OUString::createFromAscii("Software Engineer") );     
     impl_checkSetTelephoneHome( ::rtl::OUString::createFromAscii("010-51570010") );
     impl_checkSetTelephoneWork( ::rtl::OUString::createFromAscii("010-51570010") );
-    impl_checkSetFax( ::rtl::OUString::createFromAscii("010-51570010") );
+    impl_checkSetFax( ::rtl::OUString::createFromAscii("010-51570010") ); 
     impl_checkSetEmail( ::rtl::OUString::createFromAscii("wuy@redflag2000.cn") );
-    //impl_checkSetCustomerNumber( ::rtl::OUString::createFromAscii("87654321") );
+    //impl_checkSetCustomerNumber( ::rtl::OUString::createFromAscii("87654321") );  
     impl_checkSetFathersName( ::rtl::OUString::createFromAscii("father") );
     impl_checkSetApartment( ::rtl::OUString::createFromAscii("apartment") );
 }
diff --git a/svl/qa/complex/ConfigItems/helper/UserOptTest.hxx b/svl/qa/complex/ConfigItems/helper/UserOptTest.hxx
index 8fc63a58a9cc..a125d1804f95 100644
--- a/svl/qa/complex/ConfigItems/helper/UserOptTest.hxx
+++ b/svl/qa/complex/ConfigItems/helper/UserOptTest.hxx
@@ -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
diff --git a/svl/qa/complex/passwordcontainer/MasterPasswdHandler.java b/svl/qa/complex/passwordcontainer/MasterPasswdHandler.java
index bf6159ee38c5..af48cb5c0dc4 100644
--- a/svl/qa/complex/passwordcontainer/MasterPasswdHandler.java
+++ b/svl/qa/complex/passwordcontainer/MasterPasswdHandler.java
@@ -18,14 +18,14 @@ import com.sun.star.task.XInteractionHandler;
 import com.sun.star.task.MasterPasswordRequest;
 import com.sun.star.uno.UnoRuntime;
 
-public class MasterPasswdHandler extends WeakBase
+public class MasterPasswdHandler extends WeakBase 
         implements XInteractionHandler {
     XInteractionHandler m_xHandler;
-
+    
     public MasterPasswdHandler( XInteractionHandler xHandler ) {
         m_xHandler = xHandler;
     }
-
+    
     public void handle( XInteractionRequest xRequest ) {
         try {
             MasterPasswordRequest aMasterPasswordRequest;
diff --git a/svl/qa/complex/passwordcontainer/PasswordContainerTest.java b/svl/qa/complex/passwordcontainer/PasswordContainerTest.java
index 0f4d97f28d56..f0bdf5da6193 100644
--- a/svl/qa/complex/passwordcontainer/PasswordContainerTest.java
+++ b/svl/qa/complex/passwordcontainer/PasswordContainerTest.java
@@ -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
diff --git a/svl/qa/complex/passwordcontainer/PasswordContainerUnitTest.java b/svl/qa/complex/passwordcontainer/PasswordContainerUnitTest.java
index 2e3bada4d1bc..7d2c30a03b0b 100644
--- a/svl/qa/complex/passwordcontainer/PasswordContainerUnitTest.java
+++ b/svl/qa/complex/passwordcontainer/PasswordContainerUnitTest.java
@@ -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
@@ -32,7 +32,7 @@ import com.sun.star.lang.XMultiServiceFactory;
 
 public class PasswordContainerUnitTest extends ComplexTestCase {
     private XMultiServiceFactory m_xMSF = null;
-
+    
     public String[] getTestMethodNames() {
         return new String[] {
             "ExecuteTest01",
@@ -42,7 +42,7 @@ public class PasswordContainerUnitTest extends ComplexTestCase {
     public String getTestObjectName() {
         return "PasswordContainerUnitTest";
     }
-
+    
     public void before() {
         try {
             m_xMSF = (XMultiServiceFactory) param.getMSF();
@@ -53,11 +53,11 @@ public class PasswordContainerUnitTest extends ComplexTestCase {
             failed ("Cannot create service factory!");
         }
     }
-
+    
     public void after() {
         m_xMSF = null;
     }
-
+    
     public void ExecuteTest01() {
         PasswordContainerTest aTest = new Test01(m_xMSF, log);
         assure("Test01 failed!", aTest.test());
diff --git a/svl/qa/complex/passwordcontainer/Test01.java b/svl/qa/complex/passwordcontainer/Test01.java
index 1ca17c922669..71e887502a86 100644
--- a/svl/qa/complex/passwordcontainer/Test01.java
+++ b/svl/qa/complex/passwordcontainer/Test01.java
@@ -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
@@ -42,23 +42,23 @@ public class Test01 implements PasswordContainerTest {
     XMultiServiceFactory m_xMSF = null;
     XPasswordContainer m_xPasswordContainer = null;
     TestHelper m_aTestHelper = null;
-
+    
     public Test01 ( XMultiServiceFactory xMSF, LogWriter aLogWriter )
     {
         m_xMSF = xMSF;
         m_aTestHelper = new TestHelper (aLogWriter, "Test01: ");
     }
-
+    
     public boolean test() {
         final String sURL = "http://www.openoffice.org";
         final String sUserPre = "OOoUser";
         final String sPwdPre = "Password";
-        final int iUserNum1 = 10;
+        final int iUserNum1 = 10;   
         final int iUserNum2 = 5;
-
+        
         UserRecord aInputUserList1[] = new UserRecord[iUserNum1];
         for(int i = 0; i < iUserNum1; i++) {
-            String sTemp[] = {sPwdPre + "_1_" + i};     // currently one password for one user
+            String sTemp[] = {sPwdPre + "_1_" + i};     // currently one password for one user 
             aInputUserList1[i] = new UserRecord(sUserPre + "_1_" + i, sTemp);
         }
         UserRecord aInputUserList2[] = new UserRecord[iUserNum2];
@@ -72,8 +72,8 @@ public class Test01 implements PasswordContainerTest {
             Object oHandler = m_xMSF.createInstance( "com.sun.star.task.InteractionHandler" );
             XInteractionHandler xHandler = (XInteractionHandler)UnoRuntime.queryInterface(XInteractionHandler.class, oHandler);
             MasterPasswdHandler aMHandler = new MasterPasswdHandler( xHandler );
-
-            // add a set of users and passwords for the same URL for runtime
+            
+            // add a set of users and passwords for the same URL for runtime 
             for(int i = 0; i < iUserNum1; i++) {
                 xContainer.add(sURL, aInputUserList1[i].UserName, aInputUserList1[i].Passwords, aMHandler);
             }
@@ -81,12 +81,12 @@ public class Test01 implements PasswordContainerTest {
                 xContainer.add(sURL, aInputUserList2[i].UserName, aInputUserList2[i].Passwords, aMHandler);
             }
 
-            // remove some of the passwords
+            // remove some of the passwords 
             for (int i = 0; i < iUserNum1; i++) {
                 xContainer.remove(sURL, aInputUserList1[i].UserName);
             }
-
-            // get the result and check it with the expected one
+            
+            // get the result and check it with the expected one 
             UrlRecord aRecord = xContainer.find(sURL, aMHandler);
             if(!aRecord.Url.equals(sURL)) {
                 m_aTestHelper.Error("URL mismatch. Got " + aRecord.Url + "; should be " + sURL);
@@ -96,7 +96,7 @@ public class Test01 implements PasswordContainerTest {
                 m_aTestHelper.Error("User list is not the expected");
                 return false;
             }
-
+            
             // remove the runtime passwords
             aRecord = xContainer.find(sURL, aMHandler);
             for(int i = 0; i < aRecord.UserList.length; i++) {
diff --git a/svl/qa/complex/passwordcontainer/Test02.java b/svl/qa/complex/passwordcontainer/Test02.java
index b77b0fe9bf48..f06954aa606e 100644
--- a/svl/qa/complex/passwordcontainer/Test02.java
+++ b/svl/qa/complex/passwordcontainer/Test02.java
@@ -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
@@ -42,23 +42,23 @@ public class Test02 implements PasswordContainerTest {
     XMultiServiceFactory m_xMSF = null;
     XPasswordContainer m_xPasswordContainer = null;
     TestHelper m_aTestHelper = null;
-
+    
     public Test02 ( XMultiServiceFactory xMSF, LogWriter aLogWriter )
     {
         m_xMSF = xMSF;
         m_aTestHelper = new TestHelper (aLogWriter, "Test02: ");
     }
-
+    
     public boolean test() {
         final String sURL = "http://www.openoffice.org";
         final String sUserPre = "OOoUser";
         final String sPwdPre = "Password";
-        final int iUserNum1 = 10;
+        final int iUserNum1 = 10;   
         final int iUserNum2 = 5;
-
+                
         UserRecord aInputUserList1[] = new UserRecord[iUserNum1];
         for(int i = 0; i < iUserNum1; i++) {
-            String sTemp[] = {sPwdPre + "_1_" + i};     // currently one password for one user
+            String sTemp[] = {sPwdPre + "_1_" + i};     // currently one password for one user 
             aInputUserList1[i] = new UserRecord(sUserPre + "_1_" + i, sTemp);
         }
         UserRecord aInputUserList2[] = new UserRecord[iUserNum2];
@@ -66,7 +66,7 @@ public class Test02 implements PasswordContainerTest {
             String sTemp[] = {sPwdPre + "_2_" + i};
             aInputUserList2[i] = new UserRecord(sUserPre + "_2_" + i, sTemp);
         }
-
+        
         try {
             Object oPasswordContainer = m_xMSF.createInstance("com.sun.star.task.PasswordContainer");
             XPasswordContainer xContainer = (XPasswordContainer)UnoRuntime.queryInterface(XPasswordContainer.class, oPasswordContainer);
@@ -74,23 +74,23 @@ public class Test02 implements PasswordContainerTest {
             XInteractionHandler xHandler = (XInteractionHandler)UnoRuntime.queryInterface(XInteractionHandler.class, oHandler);
             MasterPasswdHandler aMHandler = new MasterPasswdHandler(xHandler);
             XMasterPasswordHandling xMHandling = (XMasterPasswordHandling)UnoRuntime.queryInterface(XMasterPasswordHandling.class, oPasswordContainer);
-
-            // allow the storing of the passwords
+            
+            // allow the storing of the passwords 
             xMHandling.allowPersistentStoring(true);
-
-            // add a set of users and passwords for the same URL persistently
+            
+            // add a set of users and passwords for the same URL persistently 
             for(int i = 0; i < iUserNum1; ++i) {
                 xContainer.addPersistent(sURL, aInputUserList1[i].UserName, aInputUserList1[i].Passwords, aMHandler);
             }
             for(int i = 0; i < iUserNum2; ++i) {
                 xContainer.addPersistent(sURL, aInputUserList2[i].UserName, aInputUserList2[i].Passwords, aMHandler);
             }
-
+            
             // remove some of the passwords
             for(int i = 0; i < iUserNum1; ++i) {
                 xContainer.remove(sURL, aInputUserList1[i].UserName);
             }
-
+            
             // get the result with find() and check it with the expected one
             UrlRecord aRecord = xContainer.find(sURL, aMHandler);
             if(!aRecord.Url.equals(sURL)) {
@@ -101,7 +101,7 @@ public class Test02 implements PasswordContainerTest {
                 m_aTestHelper.Error("User list is not the expected");
                 return false;
             }
-
+            
             // get the result with getAllPersistent() and check
             UrlRecord aRecords[] = xContainer.getAllPersistent(aMHandler);
             if(!aRecords[0].Url.equals(sURL)) {
@@ -112,16 +112,16 @@ public class Test02 implements PasswordContainerTest {
                 m_aTestHelper.Error("User list is not the expected");
                 return false;
             }
-
-            // remove all the persistent passwords
+            
+            // remove all the persistent passwords 
             xContainer.removeAllPersistent();
-
-            // remove the runtime passwords
+            
+            // remove the runtime passwords 
             for(int i = 0; i < aRecords[0].UserList.length; ++i) {
                 xContainer.remove(sURL, aRecords[0].UserList[i].UserName);
             }
-
-            // disallow the storing of the passwords
+            
+            // disallow the storing of the passwords 
             xMHandling.allowPersistentStoring(false);
         } catch(Exception e) {
             m_aTestHelper.Error("Exception: " + e);
diff --git a/svl/qa/complex/passwordcontainer/Test03.java b/svl/qa/complex/passwordcontainer/Test03.java
index 9e38a55893e0..0ebb727b658b 100644
--- a/svl/qa/complex/passwordcontainer/Test03.java
+++ b/svl/qa/complex/passwordcontainer/Test03.java
@@ -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
@@ -42,30 +42,30 @@ public class Test03 implements PasswordContainerTest {
     XMultiServiceFactory m_xMSF = null;
     XPasswordContainer m_xPasswordContainer = null;
     TestHelper m_aTestHelper = null;
-
+    
     public Test03 ( XMultiServiceFactory xMSF, LogWriter aLogWriter )
     {
         m_xMSF = xMSF;
         m_aTestHelper = new TestHelper (aLogWriter, "Test03: ");
     }
-
+    
     public boolean test() {
         final String sURL = "http://www.openoffice.org";
         final String sUserPre = "OOoUser";
         final String sPwdPre = "Password";
-        final int iPersistentUserNum = 10;
+        final int iPersistentUserNum = 10;   
         final int iRuntimeUserNum = 5;
-
+        
         UserRecord aInputUserList[] = new UserRecord[iPersistentUserNum+iRuntimeUserNum];
         for(int i = 0; i < iPersistentUserNum; i++) {
-            String sTemp[] = {sPwdPre + "_1_" + i};     // currently one password for one user
+            String sTemp[] = {sPwdPre + "_1_" + i};     // currently one password for one user 
             aInputUserList[i] = new UserRecord(sUserPre + "_1_" + i, sTemp);
         }
         for(int i = 0; i < iRuntimeUserNum; i++) {
             String sTemp[] = {sPwdPre + "_2_" + i};
             aInputUserList[i+iPersistentUserNum] = new UserRecord(sUserPre + "_2_" + i, sTemp);
         }
-
+        
         try {
             Object oPasswordContainer = m_xMSF.createInstance("com.sun.star.task.PasswordContainer");
             XPasswordContainer xContainer = (XPasswordContainer)UnoRuntime.queryInterface(XPasswordContainer.class, oPasswordContainer);
@@ -73,20 +73,20 @@ public class Test03 implements PasswordContainerTest {
             XInteractionHandler xHandler = (XInteractionHandler)UnoRuntime.queryInterface(XInteractionHandler.class, oHandler);
             MasterPasswdHandler aMHandler = new MasterPasswdHandler(xHandler);
             XMasterPasswordHandling xMHandling = (XMasterPasswordHandling)UnoRuntime.queryInterface(XMasterPasswordHandling.class, oPasswordContainer);
-
-            // allow the storing of the passwords
+            
+            // allow the storing of the passwords 
             xMHandling.allowPersistentStoring(true);
-
-            // add a set of users and passwords for the same URL persistently
+            
+            // add a set of users and passwords for the same URL persistently 
             for(int i = 0; i < iPersistentUserNum; i++) {
                 xContainer.addPersistent(sURL, aInputUserList[i].UserName, aInputUserList[i].Passwords, aMHandler);
             }
-
-            // add a set of users and passwords for the same URL for runtime
+            
+            // add a set of users and passwords for the same URL for runtime 
             for(int i = 0; i < iRuntimeUserNum; i++) {
                 xContainer.add(sURL, aInputUserList[i+iPersistentUserNum].UserName, aInputUserList[i+iPersistentUserNum].Passwords, aMHandler);
             }
-
+            
             // get the result for the URL and check that it contains persistent and runtime passwords
             UrlRecord aRecord = xContainer.find(sURL, aMHandler);
             if(!aRecord.Url.equals(sURL)) {
@@ -97,17 +97,17 @@ public class Test03 implements PasswordContainerTest {
                 m_aTestHelper.Error("User list is not the expected");
                 return false;
             }
-
-            // remove all the persistent passwords
+            
+            // remove all the persistent passwords 
             xContainer.removeAllPersistent();
-
-             // remove the runtime passwords
+            
+             // remove the runtime passwords 
             aRecord = xContainer.find(sURL, aMHandler);
             for(int i = 0; i < aRecord.UserList.length; i++) {
                 xContainer.remove(sURL, aRecord.UserList[i].UserName);
             }
-
-            // disallow the storing of the passwords
+            
+            // disallow the storing of the passwords 
             xMHandling.allowPersistentStoring(false);
         }catch(Exception e){
             m_aTestHelper.Error("Exception: " + e);
diff --git a/svl/qa/complex/passwordcontainer/TestHelper.java b/svl/qa/complex/passwordcontainer/TestHelper.java
index 1971b61098f5..489f25c468ef 100644
--- a/svl/qa/complex/passwordcontainer/TestHelper.java
+++ b/svl/qa/complex/passwordcontainer/TestHelper.java
@@ -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
@@ -34,32 +34,32 @@ import share.LogWriter;
 public class TestHelper {
     LogWriter m_aLogWriter;
     String m_sTestPrefix;
-
+    
     public TestHelper( LogWriter aLogWriter, String sTestPrefix ) {
         m_aLogWriter = aLogWriter;
         m_sTestPrefix = sTestPrefix;
     }
-
+    
     public void Error( String sError ) {
         m_aLogWriter.println( m_sTestPrefix + "Error: " + sError );
     }
-
+    
     public void Message( String sMessage ) {
         m_aLogWriter.println( m_sTestPrefix + sMessage );
     }
-
+    
     public boolean sameLists(UserRecord aUserList1[], UserRecord aUserList2[]) {
         // only works when every name is unique within the list containing it
-
+        
         if(aUserList1.length != aUserList2.length) {
             Message("User list lengths: " + aUserList1.length + " <--> " + aUserList2.length + " respectively ");
             return false;
         }
-
+        
         for(int i = 0; i < aUserList1.length; i++) {
             int j;
             for(j = 0; j < aUserList2.length; j++) {
-                if(!aUserList1[i].UserName.equals(aUserList2[j].UserName))
+                if(!aUserList1[i].UserName.equals(aUserList2[j].UserName)) 
                     continue;
                 if(aUserList1[i].Passwords[0].equals(aUserList2[j].Passwords[0])) {
                     break;
diff --git a/svl/qa/export.map b/svl/qa/export.map
index 7321bbca16ad..f313c44bd7ad 100644
--- a/svl/qa/export.map
+++ b/svl/qa/export.map
@@ -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
diff --git a/svl/qa/test_URIHelper.cxx b/svl/qa/test_URIHelper.cxx
index cdf6b1780884..f0c68c8975b1 100644
--- a/svl/qa/test_URIHelper.cxx
+++ b/svl/qa/test_URIHelper.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
diff --git a/svl/source/config/asiancfg.cxx b/svl/source/config/asiancfg.cxx
index 02da1db70d63..e7829e49b3ae 100644
--- a/svl/source/config/asiancfg.cxx
+++ b/svl/source/config/asiancfg.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
@@ -52,9 +52,9 @@ const sal_Char sEndCharacters[] = "EndCharacters";
 //-----------------------------------------------------------------------------
 struct SvxForbiddenStruct_Impl
 {
-    Locale      aLocale;
-    OUString    sStartChars;
-    OUString    sEndChars;
+    Locale 		aLocale;
+    OUString	sStartChars;
+    OUString	sEndChars;
 };
 //-----------------------------------------------------------------------------
 typedef SvxForbiddenStruct_Impl* SvxForbiddenStruct_ImplPtr;
@@ -63,10 +63,10 @@ SV_IMPL_PTRARR(SvxForbiddenStructArr, SvxForbiddenStruct_ImplPtr);
 //-----------------------------------------------------------------------------
 struct SvxAsianConfig_Impl
 {
-    sal_Bool    bKerningWesternTextOnly;
-    sal_Int16   nCharDistanceCompression;
+    sal_Bool 	bKerningWesternTextOnly;
+    sal_Int16	nCharDistanceCompression;
 
-    SvxForbiddenStructArr   aForbiddenArr;
+    SvxForbiddenStructArr	aForbiddenArr;
 
     SvxAsianConfig_Impl() :
         bKerningWesternTextOnly(sal_True),
@@ -125,8 +125,8 @@ void SvxAsianConfig::Load()
         OUString sStart(sPropPrefix);
         sStart += pNodes[nNode];
         sStart += C2U("/");
-        pNames[nName] = sStart;     pNames[nName++] += C2U("StartCharacters");
-        pNames[nName] = sStart;     pNames[nName++] += C2U("EndCharacters");
+        pNames[nName] = sStart; 	pNames[nName++] += C2U("StartCharacters");
+        pNames[nName] = sStart; 	pNames[nName++] += C2U("EndCharacters");
     }
     Sequence<Any> aNodeValues = GetProperties(aPropNames);
     const Any* pNodeValues = aNodeValues.getConstArray();
@@ -146,7 +146,7 @@ void SvxAsianConfig::Load()
 /* -----------------------------17.01.01 09:57--------------------------------
 
  ---------------------------------------------------------------------------*/
-void    SvxAsianConfig::Notify( const Sequence<OUString>& )
+void 	SvxAsianConfig::Notify( const Sequence<OUString>& )
 {
     Load();
 }
@@ -192,14 +192,14 @@ void SvxAsianConfig::Commit()
 /* -----------------------------16.01.01 15:36--------------------------------
 
  ---------------------------------------------------------------------------*/
-sal_Bool    SvxAsianConfig::IsKerningWesternTextOnly() const
+sal_Bool 	SvxAsianConfig::IsKerningWesternTextOnly() const
 {
     return pImpl->bKerningWesternTextOnly;
 }
 /* -----------------------------16.01.01 15:36--------------------------------
 
  ---------------------------------------------------------------------------*/
-void        SvxAsianConfig::SetKerningWesternTextOnly(sal_Bool bSet)
+void 		SvxAsianConfig::SetKerningWesternTextOnly(sal_Bool bSet)
 {
     pImpl->bKerningWesternTextOnly = bSet;
     SetModified();
@@ -207,14 +207,14 @@ void        SvxAsianConfig::SetKerningWesternTextOnly(sal_Bool bSet)
 /* -----------------------------16.01.01 15:36--------------------------------
 
  ---------------------------------------------------------------------------*/
-sal_Int16   SvxAsianConfig::GetCharDistanceCompression() const
+sal_Int16	SvxAsianConfig::GetCharDistanceCompression() const
 {
     return pImpl->nCharDistanceCompression;
 }
 /* -----------------------------16.01.01 15:36--------------------------------
 
  ---------------------------------------------------------------------------*/
-void        SvxAsianConfig::SetCharDistanceCompression(sal_Int16 nSet)
+void 		SvxAsianConfig::SetCharDistanceCompression(sal_Int16 nSet)
 {
     DBG_ASSERT(nSet >= 0 && nSet < 3, "compression value illegal");
     SetModified();
@@ -236,7 +236,7 @@ uno::Sequence<lang::Locale> SvxAsianConfig::GetStartEndCharLocales()
 /* -----------------------------16.01.01 15:36--------------------------------
 
  ---------------------------------------------------------------------------*/
-sal_Bool    SvxAsianConfig::GetStartEndChars( const Locale& rLocale,
+sal_Bool	SvxAsianConfig::GetStartEndChars( const Locale& rLocale,
                                     OUString& rStartChars,
                                     OUString& rEndChars )
 {
diff --git a/svl/source/config/cjkoptions.cxx b/svl/source/config/cjkoptions.cxx
index cb332ac579f1..bcaf4d801016 100644
--- a/svl/source/config/cjkoptions.cxx
+++ b/svl/source/config/cjkoptions.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
@@ -76,8 +76,8 @@ public:
     SvtCJKOptions_Impl();
     ~SvtCJKOptions_Impl();
 
-    virtual void    Notify( const com::sun::star::uno::Sequence< rtl::OUString >& rPropertyNames );
-    virtual void    Commit();
+    virtual void 	Notify( const com::sun::star::uno::Sequence< rtl::OUString >& rPropertyNames );
+    virtual void	Commit();
     void            Load();
 
     sal_Bool IsLoaded()                         { return bIsLoaded;         }
@@ -102,9 +102,9 @@ public:
 
   -----------------------------------------------------------------------*/
 namespace
-{
-    struct PropertyNames
-        : public rtl::Static< Sequence<OUString>, PropertyNames > {};
+{ 
+    struct PropertyNames 
+        : public rtl::Static< Sequence<OUString>, PropertyNames > {}; 
 }
 
 SvtCJKOptions_Impl::SvtCJKOptions_Impl() :
@@ -223,7 +223,7 @@ void SvtCJKOptions_Impl::Load()
     SvtSystemLanguageOptions aSystemLocaleSettings;
     LanguageType eSystemLanguage = aSystemLocaleSettings.GetWin16SystemLanguage();
     sal_uInt16 nWinScript = SvtLanguageOptions::GetScriptTypeOfLanguage( eSystemLanguage );
-
+    
     sal_uInt16 nScriptType = SvtLanguageOptions::GetScriptTypeOfLanguage(LANGUAGE_SYSTEM);
     if ( !bCJKFont && (( nScriptType & SCRIPTTYPE_ASIAN )||
              ((eSystemLanguage != LANGUAGE_SYSTEM)  && ( nWinScript & SCRIPTTYPE_ASIAN ))))
diff --git a/svl/source/config/ctloptions.cxx b/svl/source/config/ctloptions.cxx
index 983c202cb709..a293bbda3f8d 100644
--- a/svl/source/config/ctloptions.cxx
+++ b/svl/source/config/ctloptions.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
@@ -46,7 +46,7 @@
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::uno;
 
-#define ASCII_STR(s)    rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(s) )
+#define ASCII_STR(s)	rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(s) )
 #define CFG_READONLY_DEFAULT    sal_False
 
 // SvtCJKOptions_Impl ----------------------------------------------------------
@@ -54,17 +54,17 @@ using namespace ::com::sun::star::uno;
 class SvtCTLOptions_Impl : public utl::ConfigItem
 {
 private:
-    sal_Bool                        m_bIsLoaded;
-    sal_Bool                        m_bCTLFontEnabled;
-    sal_Bool                        m_bCTLSequenceChecking;
-    sal_Bool                        m_bCTLRestricted;
+    sal_Bool						m_bIsLoaded;
+    sal_Bool						m_bCTLFontEnabled;
+    sal_Bool						m_bCTLSequenceChecking;
+    sal_Bool						m_bCTLRestricted;
     sal_Bool                        m_bCTLTypeAndReplace;
     SvtCTLOptions::CursorMovement   m_eCTLCursorMovement;
-    SvtCTLOptions::TextNumerals     m_eCTLTextNumerals;
+    SvtCTLOptions::TextNumerals		m_eCTLTextNumerals;
 
     sal_Bool                        m_bROCTLFontEnabled;
     sal_Bool                        m_bROCTLSequenceChecking;
-    sal_Bool                        m_bROCTLRestricted;
+    sal_Bool						m_bROCTLRestricted;
     sal_Bool                        m_bROCTLTypeAndReplace;
     sal_Bool                        m_bROCTLCursorMovement;
     sal_Bool                        m_bROCTLTextNumerals;
@@ -73,19 +73,19 @@ public:
     SvtCTLOptions_Impl();
     ~SvtCTLOptions_Impl();
 
-    virtual void    Notify( const Sequence< rtl::OUString >& _aPropertyNames );
-    virtual void    Commit();
+    virtual void 	Notify( const Sequence< rtl::OUString >& _aPropertyNames );
+    virtual void	Commit();
     void            Load();
 
-    sal_Bool        IsLoaded() { return m_bIsLoaded; }
-    void            SetCTLFontEnabled( sal_Bool _bEnabled );
-    sal_Bool        IsCTLFontEnabled() const { return m_bCTLFontEnabled; }
+    sal_Bool 		IsLoaded() { return m_bIsLoaded; }
+    void			SetCTLFontEnabled( sal_Bool _bEnabled );
+    sal_Bool		IsCTLFontEnabled() const { return m_bCTLFontEnabled; }
 
     void            SetCTLSequenceChecking( sal_Bool _bEnabled );
     sal_Bool        IsCTLSequenceChecking() const { return m_bCTLSequenceChecking;}
 
-    void            SetCTLSequenceCheckingRestricted( sal_Bool _bEnable );
-    sal_Bool        IsCTLSequenceCheckingRestricted( void ) const   { return m_bCTLRestricted; }
+    void			SetCTLSequenceCheckingRestricted( sal_Bool _bEnable );
+    sal_Bool		IsCTLSequenceCheckingRestricted( void ) const	{ return m_bCTLRestricted; }
 
     void            SetCTLSequenceCheckingTypeAndReplace( sal_Bool _bEnable );
     sal_Bool        IsCTLSequenceCheckingTypeAndReplace() const { return m_bCTLTypeAndReplace; }
@@ -94,7 +94,7 @@ public:
     SvtCTLOptions::CursorMovement
                     GetCTLCursorMovement() const { return m_eCTLCursorMovement; }
 
-    void            SetCTLTextNumerals( SvtCTLOptions::TextNumerals _eNumerals );
+    void        	SetCTLTextNumerals( SvtCTLOptions::TextNumerals _eNumerals );
     SvtCTLOptions::TextNumerals
                     GetCTLTextNumerals() const { return m_eCTLTextNumerals; }
 
@@ -103,8 +103,8 @@ public:
 //------------------------------------------------------------------------------
 namespace
 {
-    struct PropertyNames
-        : public rtl::Static< Sequence< rtl::OUString >, PropertyNames > {};
+    struct PropertyNames 
+        : public rtl::Static< Sequence< rtl::OUString >, PropertyNames > {}; 
 }
 //------------------------------------------------------------------------------
 sal_Bool SvtCTLOptions_Impl::IsReadOnly(SvtCTLOptions::EOption eOption) const
@@ -127,16 +127,16 @@ SvtCTLOptions_Impl::SvtCTLOptions_Impl() :
 
     utl::ConfigItem( ASCII_STR("Office.Common/I18N/CTL") ),
 
-    m_bIsLoaded             ( sal_False ),
-    m_bCTLFontEnabled       ( sal_False ),
-    m_bCTLSequenceChecking  ( sal_False ),
-    m_bCTLRestricted        ( sal_False ),
-    m_eCTLCursorMovement    ( SvtCTLOptions::MOVEMENT_LOGICAL ),
+    m_bIsLoaded				( sal_False ),
+    m_bCTLFontEnabled		( sal_False ),
+    m_bCTLSequenceChecking	( sal_False ),
+    m_bCTLRestricted		( sal_False ),
+    m_eCTLCursorMovement	( SvtCTLOptions::MOVEMENT_LOGICAL ),
     m_eCTLTextNumerals      ( SvtCTLOptions::NUMERALS_ARABIC ),
 
     m_bROCTLFontEnabled     ( CFG_READONLY_DEFAULT ),
     m_bROCTLSequenceChecking( CFG_READONLY_DEFAULT ),
-    m_bROCTLRestricted      ( CFG_READONLY_DEFAULT ),
+    m_bROCTLRestricted		( CFG_READONLY_DEFAULT ),
     m_bROCTLCursorMovement  ( CFG_READONLY_DEFAULT ),
     m_bROCTLTextNumerals    ( CFG_READONLY_DEFAULT )
 {
@@ -234,9 +234,9 @@ void SvtCTLOptions_Impl::Commit()
                     pNames[nRealCount] = pOrgNames[nProp];
                     pValues[nRealCount].setValue( &m_bCTLTypeAndReplace, rType );
                     ++nRealCount;
-                }
+                }            
             }
-            break;
+            break;        
         }
     }
     aNames.realloc(nRealCount);
@@ -376,8 +376,8 @@ void SvtCTLOptions_Impl::SetCTLTextNumerals( SvtCTLOptions::TextNumerals _eNumer
 }
 // global ----------------------------------------------------------------
 
-static SvtCTLOptions_Impl*  pCTLOptions = NULL;
-static sal_Int32            nCTLRefCount = 0;
+static SvtCTLOptions_Impl*	pCTLOptions = NULL;
+static sal_Int32			nCTLRefCount = 0;
 namespace { struct CTLMutex : public rtl::Static< osl::Mutex, CTLMutex > {}; }
 
 // class SvtCTLOptions --------------------------------------------------
diff --git a/svl/source/config/itemholder2.cxx b/svl/source/config/itemholder2.cxx
index b0ec824f2b17..b485a334eb2c 100644
--- a/svl/source/config/itemholder2.cxx
+++ b/svl/source/config/itemholder2.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
diff --git a/svl/source/config/itemholder2.hxx b/svl/source/config/itemholder2.hxx
index 9314021b5750..3008cc78b9cd 100644
--- a/svl/source/config/itemholder2.hxx
+++ b/svl/source/config/itemholder2.hxx
@@ -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
diff --git a/svl/source/config/languageoptions.cxx b/svl/source/config/languageoptions.cxx
index 8f9aabd59500..8414b3181fb2 100644
--- a/svl/source/config/languageoptions.cxx
+++ b/svl/source/config/languageoptions.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
@@ -63,7 +63,7 @@ SvtLanguageOptions::~SvtLanguageOptions()
 
     m_pCTLOptions->RemoveListener(this);
     m_pCJKOptions->RemoveListener(this);
-
+    
     delete m_pCJKOptions;
     delete m_pCTLOptions;
 }
@@ -231,7 +231,7 @@ sal_uInt16 SvtLanguageOptions::GetScriptTypeOfLanguage( sal_uInt16 nLang )
 /*-- 27.10.2005 08:18:01---------------------------------------------------
 
   -----------------------------------------------------------------------*/
-SvtSystemLanguageOptions::SvtSystemLanguageOptions() :
+SvtSystemLanguageOptions::SvtSystemLanguageOptions() : 
     utl::ConfigItem( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("System/L10N") ))
 {
     uno::Sequence< rtl::OUString > aPropertyNames(1);
diff --git a/svl/source/config/srchcfg.cxx b/svl/source/config/srchcfg.cxx
index cf9fd1799650..3fabd161a72b 100644
--- a/svl/source/config/srchcfg.cxx
+++ b/svl/source/config/srchcfg.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
@@ -104,9 +104,9 @@ SvxSearchConfig::SvxSearchConfig(sal_Bool bEnableNotify) :
     pImpl(new SvxSearchConfig_Impl)
 {
     if(bEnableNotify)
-    {
+    {        
         //request notifications from the node
-        Sequence<OUString> aEnable(1);
+        Sequence<OUString> aEnable(1); 
         EnableNotification(aEnable);
     }
     Load();
diff --git a/svl/source/filepicker/pickerhelper.cxx b/svl/source/filepicker/pickerhelper.cxx
index 72096c1bc56a..992f2540e472 100644
--- a/svl/source/filepicker/pickerhelper.cxx
+++ b/svl/source/filepicker/pickerhelper.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
@@ -50,16 +50,16 @@ namespace svt
         try
         {
             // does the dialog haver a help URL property?
-            Reference< css::beans::XPropertySet >       xDialogProps( _mxFileDlg, css::uno::UNO_QUERY );
-            Reference< css::beans::XPropertySetInfo >   xInfo;
+            Reference< css::beans::XPropertySet >		xDialogProps( _mxFileDlg, css::uno::UNO_QUERY );
+            Reference< css::beans::XPropertySetInfo >	xInfo;
             if( xDialogProps.is() )
                 xInfo = xDialogProps->getPropertySetInfo( );
 
-            const OUString          sHelpURLPropertyName( RTL_CONSTASCII_USTRINGPARAM( "HelpURL" ) );
+            const OUString			sHelpURLPropertyName( RTL_CONSTASCII_USTRINGPARAM( "HelpURL" ) );
 
             if( xInfo.is() && xInfo->hasPropertyByName( sHelpURLPropertyName ) )
-            {   // yep
-                OUString                sId( RTL_CONSTASCII_USTRINGPARAM( "HID:" ) );
+            {	// yep
+                OUString				sId( RTL_CONSTASCII_USTRINGPARAM( "HID:" ) );
                 sId += OUString::valueOf( _nHelpId );
                 xDialogProps->setPropertyValue( sHelpURLPropertyName, css::uno::makeAny( sId ) );
             }
@@ -76,16 +76,16 @@ namespace svt
         try
         {
             // does the dialog haver a help URL property?
-            Reference< css::beans::XPropertySet >       xDialogProps( _mxFileDlg, css::uno::UNO_QUERY );
-            Reference< css::beans::XPropertySetInfo >   xInfo;
+            Reference< css::beans::XPropertySet >		xDialogProps( _mxFileDlg, css::uno::UNO_QUERY );
+            Reference< css::beans::XPropertySetInfo >	xInfo;
             if( xDialogProps.is() )
                 xInfo = xDialogProps->getPropertySetInfo( );
 
-            const OUString          sHelpURLPropertyName( RTL_CONSTASCII_USTRINGPARAM( "HelpURL" ) );
+            const OUString			sHelpURLPropertyName( RTL_CONSTASCII_USTRINGPARAM( "HelpURL" ) );
 
             if( xInfo.is() && xInfo->hasPropertyByName( sHelpURLPropertyName ) )
-            {   // yep
-                OUString                sId( RTL_CONSTASCII_USTRINGPARAM( "HID:" ) );
+            {	// yep
+                OUString				sId( RTL_CONSTASCII_USTRINGPARAM( "HID:" ) );
                 sId += OUString::valueOf( _nHelpId );
                 xDialogProps->setPropertyValue( sHelpURLPropertyName, css::uno::makeAny( sId ) );
             }
diff --git a/svl/source/filepicker/pickerhistory.cxx b/svl/source/filepicker/pickerhistory.cxx
index 4c372c48163d..3c29e598439f 100644
--- a/svl/source/filepicker/pickerhistory.cxx
+++ b/svl/source/filepicker/pickerhistory.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
@@ -40,8 +40,8 @@ namespace svt
 
     namespace
     {
-        typedef ::com::sun::star::uno::WeakReference< XInterface >  InterfaceAdapter;
-        typedef ::std::vector< InterfaceAdapter  >                  InterfaceArray;
+        typedef ::com::sun::star::uno::WeakReference< XInterface >	InterfaceAdapter;
+        typedef ::std::vector< InterfaceAdapter  >					InterfaceArray;
 
         // ----------------------------------------------------------------
         InterfaceArray& getFolderPickerHistory()
@@ -67,7 +67,7 @@ namespace svt
             // first, check which of the objects we hold in s_aHistory can be removed
             {
                 InterfaceArray aCleanedHistory;
-                for (   InterfaceArray::const_iterator aLoop = _rHistory.begin();
+                for	(	InterfaceArray::const_iterator aLoop = _rHistory.begin();
                         aLoop != _rHistory.end();
                         ++aLoop
                     )
@@ -96,7 +96,7 @@ namespace svt
 
             //=============================================================
             // search the first picker which is still alive ...
-            for (   InterfaceArray::const_reverse_iterator aLoop = _rHistory.rbegin();
+            for	(	InterfaceArray::const_reverse_iterator aLoop = _rHistory.rbegin();
                     ( aLoop != _rHistory.rend() ) && !xTopMostAlive.is();
                     ++aLoop
                 )
@@ -133,6 +133,6 @@ namespace svt
     }
 
 //.........................................................................
-}   // namespace svt
+}	// namespace svt
 //.........................................................................
 
diff --git a/svl/source/filerec/filerec.cxx b/svl/source/filerec/filerec.cxx
index 0d1b06be5d11..4315dad7d033 100644
--- a/svl/source/filerec/filerec.cxx
+++ b/svl/source/filerec/filerec.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
@@ -36,7 +36,7 @@ SV_IMPL_VARARR( SfxUINT32s, UINT32 );
 
 //========================================================================
 
-/*  Die folgenden Makros extrahieren Teilbereiche aus einem UINT32 Wert.
+/*	Die folgenden Makros extrahieren Teilbereiche aus einem UINT32 Wert.
     Diese UINT32-Werte werden anstelle der einzelnen Werte gestreamt,
     um Calls zu sparen.
 */
@@ -52,7 +52,7 @@ SV_IMPL_VARARR( SfxUINT32s, UINT32 );
 
 //-------------------------------------------------------------------------
 
-/*  Die folgenden Makros setzen Teilbereiche zu einem UINT32 Wert zusammen.
+/*	Die folgenden Makros setzen Teilbereiche zu einem UINT32 Wert zusammen.
     Diese UINT32-Werte werden anstelle der einzelnen Werte gestreamt,
     um Calls zu sparen.
 */
@@ -74,7 +74,7 @@ SV_IMPL_VARARR( SfxUINT32s, UINT32 );
 
 UINT32 SfxMiniRecordWriter::Close
 (
-    FASTBOOL    bSeekToEndOfRec     /*  TRUE (default)
+    FASTBOOL	bSeekToEndOfRec 	/*	TRUE (default)
                                         Der Stream wird an das Ende des Records
                                         positioniert.
 
@@ -85,7 +85,7 @@ UINT32 SfxMiniRecordWriter::Close
                                     */
 )
 
-/*  [Beschreibung]
+/*	[Beschreibung]
 
     Diese Methode schlie\st den Record. Dabei wird haupts"achlich der
     Header geschrieben.
@@ -95,7 +95,7 @@ UINT32 SfxMiniRecordWriter::Close
 
     [R"uckgabewert]
 
-    UINT32      != 0
+    UINT32		!= 0
                 Position im Stream, die direkt hinter dem Record liegt.
                 'bSeekToEndOfRecord==TRUE'
                 => R"uckgabewert == aktuelle Stream-Position nach Aufruf
@@ -147,13 +147,13 @@ UINT32 SfxMiniRecordWriter::Close
 
 USHORT SfxMiniRecordReader::ScanRecordType
 (
-    SvStream*   pStream         /*  <SvStream> an dessen aktueller Position
+    SvStream*	pStream 		/*	<SvStream> an dessen aktueller Position
                                     ein Record liegt, dessen Typ erkannt werden
                                     soll.
                                 */
 )
 
-/*  [Beschreibung]
+/*	[Beschreibung]
 
     Mit dieser statischen Methode kann ermittelt werden, ob sich an der
     aktuellen Position in einem Stream ein Record befindet, und der Typ
@@ -175,7 +175,7 @@ USHORT SfxMiniRecordReader::ScanRecordType
 
     [R"uckgabewert]
 
-    USHORT                          SFX_REC_TYPE_EOR
+    USHORT							SFX_REC_TYPE_EOR
                                     An der aktuellen Position des Streams
                                     steht eine End-Of-Records-Kennung.
 
@@ -262,7 +262,7 @@ USHORT SfxMiniRecordReader::ScanRecordType
 
 FASTBOOL SfxMiniRecordReader::SetHeader_Impl( UINT32 nHeader )
 
-/*  [Beschreibung]
+/*	[Beschreibung]
 
     Interne Methode zum nachtr"aglichen Verarbeiten eines extern gelesenen
     Headers. Falls der Header eine End-Of-Records-Kennung darstellt,
@@ -291,13 +291,13 @@ FASTBOOL SfxMiniRecordReader::SetHeader_Impl( UINT32 nHeader )
 
 SfxMiniRecordReader::SfxMiniRecordReader
 (
-    SvStream*       pStream         /*  <SvStream>, an dessen aktueller
+    SvStream*		pStream 		/*	<SvStream>, an dessen aktueller
                                         Position sich ein <SfxMiniRecord>
                                         befindet.
                                     */
 )
 
-/*  [Beschreibung]
+/*	[Beschreibung]
 
     Dieser Ctor liest den Header eines <SfxMiniRecord> ab der aktuellen
     Position von 'pStream'. Da grunds"atzlich fast 4-Byte Kombination ein
@@ -308,7 +308,7 @@ SfxMiniRecordReader::SfxMiniRecordReader
     dann au\serdem unver"andert ist.
 */
 
-:   _pStream( pStream ),
+:	_pStream( pStream ),
     _bSkipped( FALSE )
 {
     // Header einlesen
@@ -333,14 +333,14 @@ SfxMiniRecordReader::SfxMiniRecordReader
 
 SfxMiniRecordReader::SfxMiniRecordReader
 (
-    SvStream*       pStream,        /*  <SvStream>, an dessen aktueller
+    SvStream*		pStream,		/*	<SvStream>, an dessen aktueller
                                         Position sich ein <SfxMiniRecord>
                                         befindet.
                                     */
-    BYTE            nTag            //  Pre-Tag des gew"unschten Records
+    BYTE			nTag			//	Pre-Tag des gew"unschten Records
 )
 
-/*  [Beschreibung]
+/*	[Beschreibung]
 
     Dieser Ctor interpretiert 'pStream' ab der aktuellen Position als
     eine l"uckenlose Folge von, von dieser Klassen-Gruppe interpretierbaren,
@@ -423,18 +423,18 @@ SfxMiniRecordReader::SfxMiniRecordReader
 
 SfxSingleRecordWriter::SfxSingleRecordWriter
 (
-    BYTE            nRecordType,    // f"ur Subklassen
-    SvStream*       pStream,        // Stream, in dem der Record angelegt wird
-    UINT16          nContentTag,    // Inhalts-Art-Kennung
-    BYTE            nContentVer     // Inhalts-Versions-Kennung
+    BYTE			nRecordType,	// f"ur Subklassen
+    SvStream*		pStream,		// Stream, in dem der Record angelegt wird
+    UINT16			nContentTag,	// Inhalts-Art-Kennung
+    BYTE			nContentVer 	// Inhalts-Versions-Kennung
 )
 
-/*  [Beschreibung]
+/*	[Beschreibung]
 
     Interner Ctor f"ur Subklassen.
 */
 
-:   SfxMiniRecordWriter( pStream, SFX_REC_PRETAG_EXT )
+:	SfxMiniRecordWriter( pStream, SFX_REC_PRETAG_EXT )
 {
     // Erweiterten Header hiner den des SfxMiniRec schreiben
     *pStream << SFX_REC_HEADER(nRecordType, nContentTag, nContentVer);
@@ -444,19 +444,19 @@ SfxSingleRecordWriter::SfxSingleRecordWriter
 
 SfxSingleRecordWriter::SfxSingleRecordWriter
 (
-    SvStream*       pStream,        // Stream, in dem der Record angelegt wird
-    UINT16          nContentTag,    // Inhalts-Art-Kennung
-    BYTE            nContentVer     // Inhalts-Versions-Kennung
+    SvStream*		pStream,		// Stream, in dem der Record angelegt wird
+    UINT16			nContentTag,	// Inhalts-Art-Kennung
+    BYTE			nContentVer 	// Inhalts-Versions-Kennung
 )
 
-/*  [Beschreibung]
+/*	[Beschreibung]
 
     Legt in 'pStream' einen 'SfxSingleRecord' an, dessen Content-Gr"o\se
     nicht bekannt ist, sondern nach dam Streamen des Contents errechnet
     werden soll.
 */
 
-:   SfxMiniRecordWriter( pStream, SFX_REC_PRETAG_EXT )
+:	SfxMiniRecordWriter( pStream, SFX_REC_PRETAG_EXT )
 {
     // Erweiterten Header hiner den des SfxMiniRec schreiben
     *pStream << SFX_REC_HEADER( SFX_REC_TYPE_SINGLE, nContentTag, nContentVer);
@@ -466,10 +466,10 @@ SfxSingleRecordWriter::SfxSingleRecordWriter
 
 SfxSingleRecordWriter::SfxSingleRecordWriter
 (
-    SvStream*       pStream,        // Stream, in dem der Record angelegt wird
-    UINT16          nContentTag,    // Inhalts-Art-Kennung
-    BYTE            nContentVer,    // Inhalts-Versions-Kennung
-    UINT32          nContentSize    // Gr"o\se des Inhalts in Bytes
+    SvStream*		pStream,		// Stream, in dem der Record angelegt wird
+    UINT16			nContentTag,	// Inhalts-Art-Kennung
+    BYTE			nContentVer,	// Inhalts-Versions-Kennung
+    UINT32			nContentSize	// Gr"o\se des Inhalts in Bytes
 )
 
 /*  [Beschreibung]
@@ -478,7 +478,7 @@ SfxSingleRecordWriter::SfxSingleRecordWriter
     von vornherein bekannt ist.
 */
 
-:   SfxMiniRecordWriter( pStream, SFX_REC_PRETAG_EXT,
+:	SfxMiniRecordWriter( pStream, SFX_REC_PRETAG_EXT,
                          nContentSize + SFX_REC_HEADERSIZE_SINGLE )
 {
     // Erweiterten Header hinter den des SfxMiniRec schreiben
@@ -522,7 +522,7 @@ inline FASTBOOL SfxSingleRecordReader::ReadHeader_Impl( USHORT nTypes )
 //-------------------------------------------------------------------------
 
 SfxSingleRecordReader::SfxSingleRecordReader( SvStream *pStream )
-:   SfxMiniRecordReader()
+:	SfxMiniRecordReader()
 {
     // Startposition merken, um im Fehlerfall zur"uck-seeken zu k"onnen
     #ifdef DBG_UTIL
@@ -563,11 +563,11 @@ SfxSingleRecordReader::SfxSingleRecordReader( SvStream *pStream, USHORT nTag )
 
 FASTBOOL SfxSingleRecordReader::FindHeader_Impl
 (
-    UINT16      nTypes,     // arithm. Veroderung erlaubter Record-Typen
-    UINT16      nTag        // zu findende Record-Art-Kennung
+    UINT16		nTypes, 	// arithm. Veroderung erlaubter Record-Typen
+    UINT16		nTag		// zu findende Record-Art-Kennung
 )
 
-/*  [Beschreibung]
+/*	[Beschreibung]
 
     Interne Methode zum lesen des Headers des ersten Record, der einem
     der Typen in 'nTypes' entspricht und mit der Art-Kennung 'nTag'
@@ -629,11 +629,11 @@ FASTBOOL SfxSingleRecordReader::FindHeader_Impl
 
 SfxMultiFixRecordWriter::SfxMultiFixRecordWriter
 (
-    BYTE            nRecordType,    // Subklassen Record-Kennung
-    SvStream*       pStream,        // Stream, in dem der Record angelegt wird
-    UINT16          nContentTag,    // Content-Art-Kennung
-    BYTE            nContentVer,    // Content-Versions-Kennung
-    UINT32                          // Gr"o\se jedes einzelnen Contents in Bytes
+    BYTE			nRecordType,	// Subklassen Record-Kennung
+    SvStream*		pStream,		// Stream, in dem der Record angelegt wird
+    UINT16			nContentTag,	// Content-Art-Kennung
+    BYTE			nContentVer,	// Content-Versions-Kennung
+    UINT32			              	// Gr"o\se jedes einzelnen Contents in Bytes
 )
 
 /*  [Beschreibung]
@@ -652,10 +652,10 @@ SfxMultiFixRecordWriter::SfxMultiFixRecordWriter
 
 SfxMultiFixRecordWriter::SfxMultiFixRecordWriter
 (
-    SvStream*       pStream,        // Stream, in dem der Record angelegt wird
-    UINT16          nContentTag,    // Content-Art-Kennung
-    BYTE            nContentVer,    // Content-Versions-Kennung
-    UINT32                          // Gr"o\se jedes einzelnen Contents in Bytes
+    SvStream*		pStream,		// Stream, in dem der Record angelegt wird
+    UINT16			nContentTag,	// Content-Art-Kennung
+    BYTE			nContentVer,	// Content-Versions-Kennung
+    UINT32			             	// Gr"o\se jedes einzelnen Contents in Bytes
 )
 
 /*  [Beschreibung]
@@ -676,7 +676,7 @@ SfxMultiFixRecordWriter::SfxMultiFixRecordWriter
 
 UINT32 SfxMultiFixRecordWriter::Close( FASTBOOL bSeekToEndOfRec )
 
-//  siehe <SfxMiniRecordWriter>
+//	siehe <SfxMiniRecordWriter>
 
 {
     // Header noch nicht geschrieben?
@@ -703,10 +703,10 @@ UINT32 SfxMultiFixRecordWriter::Close( FASTBOOL bSeekToEndOfRec )
 
 SfxMultiVarRecordWriter::SfxMultiVarRecordWriter
 (
-    BYTE            nRecordType,    // Record-Kennung der Subklasse
+    BYTE			nRecordType,	// Record-Kennung der Subklasse
     SvStream*       pStream,        // Stream, in dem der Record angelegt wird
-    UINT16          nRecordTag,     // Gesamt-Art-Kennung
-    BYTE            nRecordVer      // Gesamt-Versions-Kennung
+    UINT16			nRecordTag, 	// Gesamt-Art-Kennung
+    BYTE			nRecordVer		// Gesamt-Versions-Kennung
 )
 
 /*  [Beschreibung]
@@ -724,8 +724,8 @@ SfxMultiVarRecordWriter::SfxMultiVarRecordWriter
 SfxMultiVarRecordWriter::SfxMultiVarRecordWriter
 (
     SvStream*       pStream,        // Stream, in dem der Record angelegt wird
-    UINT16          nRecordTag,     // Gesamt-Art-Kennung
-    BYTE            nRecordVer      // Gesamt-Versions-Kennung
+    UINT16			nRecordTag, 	// Gesamt-Art-Kennung
+    BYTE			nRecordVer		// Gesamt-Versions-Kennung
 )
 
 /*  [Beschreibung]
@@ -751,7 +751,7 @@ SfxMultiVarRecordWriter::SfxMultiVarRecordWriter
 
 SfxMultiVarRecordWriter::~SfxMultiVarRecordWriter()
 
-/*  [Beschreibung]
+/*	[Beschreibung]
 
     Der Dtor der Klasse <SfxMultiVarRecordWriter> schlie\st den Record
     automatisch, falls <SfxMultiVarRecordWriter::Close()> nicht bereits
@@ -768,7 +768,7 @@ SfxMultiVarRecordWriter::~SfxMultiVarRecordWriter()
 
 void SfxMultiVarRecordWriter::FlushContent_Impl()
 
-/*  [Beschreibung]
+/*	[Beschreibung]
 
     Interne Methode zum Abschlie\sen eines einzelnen Contents.
 */
@@ -847,11 +847,11 @@ UINT32 SfxMultiVarRecordWriter::Close( FASTBOOL bSeekToEndOfRec )
 
 void SfxMultiMixRecordWriter::NewContent
 (
-    UINT16      nContentTag,    // Kennung f"ur die Art des Contents
-    BYTE        nContentVer     // Kennung f"ur die Version des Contents
+    UINT16		nContentTag,	// Kennung f"ur die Art des Contents
+    BYTE		nContentVer 	// Kennung f"ur die Version des Contents
 )
 
-/*  [Beschreibung]
+/*	[Beschreibung]
 
     Mit dieser Methode wird in den Record ein neuer Content eingef"ugt
     und dessen Content-Tag sowie dessen Content-Version angegeben. Jeder,
@@ -915,7 +915,7 @@ FASTBOOL SfxMultiRecordReader::ReadHeader_Impl()
 //-------------------------------------------------------------------------
 
 SfxMultiRecordReader::SfxMultiRecordReader( SvStream *pStream )
-:   _pContentOfs( NULL ), _nContentNo(0)
+:	_pContentOfs( NULL ), _nContentNo(0)
 {
     // Position im Stream merken, um im Fehlerfall zur"uck-seeken zu k"onnen
     _nStartPos = pStream->Tell();
@@ -935,7 +935,7 @@ SfxMultiRecordReader::SfxMultiRecordReader( SvStream *pStream )
 //-------------------------------------------------------------------------
 
 SfxMultiRecordReader::SfxMultiRecordReader( SvStream *pStream, UINT16 nTag )
-:   _nContentNo(0)
+:	_nContentNo(0)
 {
     // Position im Stream merken, um im Fehlerfall zur"uck-seeken zu k"onnen
     _nStartPos = pStream->Tell();
@@ -965,7 +965,7 @@ SfxMultiRecordReader::~SfxMultiRecordReader()
 
 FASTBOOL SfxMultiRecordReader::GetContent()
 
-/*  [Beschreibung]
+/*	[Beschreibung]
 
     Positioniert den Stream an den Anfang des n"chsten bzw. beim 1. Aufruf
     auf den Anfang des ersten Contents im Record und liest ggf. dessen
@@ -990,7 +990,7 @@ FASTBOOL SfxMultiRecordReader::GetContent()
 
         // #99366#: correct stream pos in every case;
         // the if clause was added by MT  a long time ago,
-        // maybe to 'repair' other corrupt documents; but this
+        // maybe to 'repair' other corrupt documents; but this 
         // gives errors when writing with 5.1 and reading with current
         // versions, so we decided to remove the if clause (KA-05/17/2002)
         // if ( nNewPos > _pStream->Tell() )
diff --git a/svl/source/fsstor/fsfactory.cxx b/svl/source/fsstor/fsfactory.cxx
index 298b6f555e2a..886e1cef5049 100644
--- a/svl/source/fsstor/fsfactory.cxx
+++ b/svl/source/fsstor/fsfactory.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
@@ -82,12 +82,12 @@ uno::Reference< uno::XInterface > SAL_CALL FSStorageFactory::createInstance()
     if ( !aTempURL.getLength() )
         throw uno::RuntimeException(); // TODO: can not create tempfile
 
-    ::ucbhelper::Content aResultContent(
+    ::ucbhelper::Content aResultContent( 
         aTempURL, uno::Reference< ucb::XCommandEnvironment >() );
 
-    return uno::Reference< uno::XInterface >(
-        static_cast< OWeakObject* >(
-            new FSStorage(  aResultContent,
+    return uno::Reference< uno::XInterface >( 
+        static_cast< OWeakObject* >( 
+            new FSStorage(	aResultContent,
                             embed::ElementModes::READWRITE,
                             uno::Sequence< beans::PropertyValue >(),
                             m_xFactory ) ),
@@ -147,7 +147,7 @@ uno::Reference< uno::XInterface > SAL_CALL FSStorageFactory::createInstanceWithA
     // retrieve mediadescriptor and set storage properties
     uno::Sequence< beans::PropertyValue > aDescr;
     uno::Sequence< beans::PropertyValue > aPropsToSet;
-
+    
     if ( nArgNum >= 3 )
     {
         if( aArguments[2] >>= aDescr )
@@ -191,14 +191,14 @@ uno::Reference< uno::XInterface > SAL_CALL FSStorageFactory::createInstanceWithA
     else if ( !::utl::UCBContentHelper::IsFolder( aURL ) )
         throw io::IOException(); // there is no such folder
 
-    ::ucbhelper::Content aResultContent(
+    ::ucbhelper::Content aResultContent( 
         aURL, uno::Reference< ucb::XCommandEnvironment >() );
 
     // create storage based on source
-    return uno::Reference< uno::XInterface >(
-        static_cast< OWeakObject* >( new FSStorage( aResultContent,
-                                                    nStorageMode,
-                                                    aPropsToSet,
+    return uno::Reference< uno::XInterface >( 
+        static_cast< OWeakObject* >( new FSStorage( aResultContent, 
+                                                    nStorageMode, 
+                                                    aPropsToSet, 
                                                     m_xFactory ) ),
         uno::UNO_QUERY );
 }
@@ -250,7 +250,7 @@ SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL component_writeInfo (
 
         uno::Reference< registry::XRegistryKey > xNewKey;
         xNewKey = xRegistryKey->createKey(
-            ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("/") ) +
+            ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("/") ) + 
             FSStorageFactory::impl_staticGetImplementationName() +
             ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "/UNO/SERVICES")));
 
diff --git a/svl/source/fsstor/fsstorage.cxx b/svl/source/fsstor/fsstorage.cxx
index 73460ef3d277..f5daf0a4bc5c 100644
--- a/svl/source/fsstor/fsstorage.cxx
+++ b/svl/source/fsstor/fsstorage.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
@@ -103,16 +103,16 @@ sal_Bool isLocalFile_Impl( ::rtl::OUString aURL )
 struct FSStorage_Impl
 {
     ::rtl::OUString m_aURL;
-
+    
     ::ucbhelper::Content* m_pContent;
     sal_Int32 m_nMode;
-
+    
     ::cppu::OInterfaceContainerHelper* m_pListenersContainer; // list of listeners
     ::cppu::OTypeCollection* m_pTypeCollection;
 
     uno::Reference< lang::XMultiServiceFactory > m_xFactory;
 
-
+    
     FSStorage_Impl( const ::rtl::OUString& aURL, sal_Int32 nMode, uno::Reference< lang::XMultiServiceFactory > xFactory )
     : m_aURL( aURL )
     , m_pContent( NULL )
@@ -195,7 +195,7 @@ sal_Bool FSStorage::MakeFolderNoUI( const String& rFolder, sal_Bool )
                                  uno::Reference< ucb::XCommandEnvironment >(),
                                  aParent ) )
         return ::utl::UCBContentHelper::MakeFolder( aParent, aTitle, aResultContent, sal_False );
-
+        
     return sal_False;
 }
 
@@ -239,7 +239,7 @@ void FSStorage::CopyStreamToSubStream( const ::rtl::OUString& aSourceURL,
                                                 embed::ElementModes::READWRITE | embed::ElementModes::TRUNCATE );
     if ( !xSubStream.is() )
         throw uno::RuntimeException();
-
+                
     uno::Reference< io::XOutputStream > xDestOutput = xSubStream->getOutputStream();
     if ( !xDestOutput.is() )
         throw uno::RuntimeException();
@@ -274,7 +274,7 @@ void FSStorage::CopyContentToStorage_Impl( ::ucbhelper::Content* pContent, const
             {
                 ::rtl::OUString aSourceURL( xRow->getString( 1 ) );
                 sal_Bool bIsFolder( xRow->getBoolean(2) );
-
+    
                 // TODO/LATER: not sure whether the entry name must be encoded
                 ::rtl::OUString aNewEntryName( INetURLObject( aSourceURL ).getName( INetURLObject::LAST_SEGMENT,
                                                                                     true,
@@ -285,7 +285,7 @@ void FSStorage::CopyContentToStorage_Impl( ::ucbhelper::Content* pContent, const
                                                                                                 embed::ElementModes::READWRITE );
                     if ( !xSubStorage.is() )
                         throw uno::RuntimeException();
-
+    
                     uno::Reference< ucb::XCommandEnvironment > xDummyEnv;
                     ::ucbhelper::Content aSourceContent( aSourceURL, xDummyEnv );
                     CopyContentToStorage_Impl( &aSourceContent, xSubStorage );
@@ -311,7 +311,7 @@ void FSStorage::CopyContentToStorage_Impl( ::ucbhelper::Content* pContent, const
 }
 
 //____________________________________________________________________________________________________
-//  XInterface
+//	XInterface
 //____________________________________________________________________________________________________
 
 //-----------------------------------------------
@@ -320,14 +320,14 @@ uno::Any SAL_CALL FSStorage::queryInterface( const uno::Type& rType )
 {
     uno::Any aReturn;
     aReturn <<= ::cppu::queryInterface
-                (   rType
-                ,   static_cast<lang::XTypeProvider*> ( this )
-                ,   static_cast<embed::XStorage*> ( this )
-                ,   static_cast<embed::XHierarchicalStorageAccess*> ( this )
-                ,   static_cast<container::XNameAccess*> ( this )
-                ,   static_cast<container::XElementAccess*> ( this )
-                ,   static_cast<lang::XComponent*> ( this )
-                ,   static_cast<beans::XPropertySet*> ( this ) );
+                (	rType
+                ,	static_cast<lang::XTypeProvider*> ( this )
+                ,	static_cast<embed::XStorage*> ( this )
+                ,	static_cast<embed::XHierarchicalStorageAccess*> ( this )
+                ,	static_cast<container::XNameAccess*> ( this )
+                ,	static_cast<container::XElementAccess*> ( this )
+                ,	static_cast<lang::XComponent*> ( this )
+                ,	static_cast<beans::XPropertySet*> ( this ) );
 
     if ( aReturn.hasValue() == sal_True )
         return aReturn ;
@@ -348,7 +348,7 @@ void SAL_CALL FSStorage::release() throw()
 }
 
 //____________________________________________________________________________________________________
-//  XTypeProvider
+//	XTypeProvider
 //____________________________________________________________________________________________________
 
 //-----------------------------------------------
@@ -362,10 +362,10 @@ uno::Sequence< uno::Type > SAL_CALL FSStorage::getTypes()
         if ( m_pImpl->m_pTypeCollection == NULL )
         {
             m_pImpl->m_pTypeCollection = new ::cppu::OTypeCollection
-                                (   ::getCppuType( ( const uno::Reference< lang::XTypeProvider >* )NULL )
-                                ,   ::getCppuType( ( const uno::Reference< embed::XStorage >* )NULL )
-                                ,   ::getCppuType( ( const uno::Reference< embed::XHierarchicalStorageAccess >* )NULL )
-                                ,   ::getCppuType( ( const uno::Reference< beans::XPropertySet >* )NULL ) );
+                                (	::getCppuType( ( const uno::Reference< lang::XTypeProvider >* )NULL )
+                                ,	::getCppuType( ( const uno::Reference< embed::XStorage >* )NULL )
+                                ,	::getCppuType( ( const uno::Reference< embed::XHierarchicalStorageAccess >* )NULL )
+                                ,	::getCppuType( ( const uno::Reference< beans::XPropertySet >* )NULL ) );
         }
     }
 
@@ -394,7 +394,7 @@ uno::Sequence< sal_Int8 > SAL_CALL FSStorage::getImplementationId()
 }
 
 //____________________________________________________________________________________________________
-//  XStorage
+//	XStorage
 //____________________________________________________________________________________________________
 
 //-----------------------------------------------
@@ -487,7 +487,7 @@ uno::Reference< io::XStream > SAL_CALL FSStorage::openStreamElement(
             if ( isLocalFile_Impl( aFileURL.GetMainURL( INetURLObject::NO_DECODE ) ) )
             {
                 uno::Reference< ucb::XSimpleFileAccess > xSimpleFileAccess(
-                    m_pImpl->m_xFactory->createInstance(
+                    m_pImpl->m_xFactory->createInstance( 
                         ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.ucb.SimpleFileAccess" ) ) ),
                     uno::UNO_QUERY_THROW );
                 xResult = xSimpleFileAccess->openFileReadWrite( aFileURL.GetMainURL( INetURLObject::NO_DECODE ) );
@@ -505,10 +505,10 @@ uno::Reference< io::XStream > SAL_CALL FSStorage::openStreamElement(
                         delete pStream;
                 }
             }
-
+    
             if ( !xResult.is() )
                 throw io::IOException();
-
+    
             if ( ( nOpenMode & embed::ElementModes::TRUNCATE ) )
             {
                 uno::Reference< io::XTruncate > xTrunc( xResult->getOutputStream(), uno::UNO_QUERY_THROW );
@@ -520,7 +520,7 @@ uno::Reference< io::XStream > SAL_CALL FSStorage::openStreamElement(
             if ( ( nOpenMode & embed::ElementModes::TRUNCATE )
               || !::utl::UCBContentHelper::IsDocument( aFileURL.GetMainURL( INetURLObject::NO_DECODE ) ) )
                 throw io::IOException(); // TODO: access denied
-
+    
             ::ucbhelper::Content aResultContent( aFileURL.GetMainURL( INetURLObject::NO_DECODE ), xDummyEnv );
             uno::Reference< io::XInputStream > xInStream = aResultContent.openStream();
             xResult = static_cast< io::XStream* >( new OFSInputStreamContainer( xInStream ) );
@@ -562,7 +562,7 @@ uno::Reference< io::XStream > SAL_CALL FSStorage::openStreamElement(
 }
 
 //-----------------------------------------------
-uno::Reference< io::XStream > SAL_CALL FSStorage::openEncryptedStreamElement(
+uno::Reference< io::XStream > SAL_CALL FSStorage::openEncryptedStreamElement( 
     const ::rtl::OUString&, sal_Int32, const ::rtl::OUString& )
         throw ( embed::InvalidStorageException,
                 lang::IllegalArgumentException,
@@ -632,8 +632,8 @@ uno::Reference< embed::XStorage > SAL_CALL FSStorage::openStorageElement(
             throw io::IOException(); // there is no such folder
 
         ::ucbhelper::Content aResultContent( aFolderURL.GetMainURL( INetURLObject::NO_DECODE ), xDummyEnv );
-        xResult = uno::Reference< embed::XStorage >(
-                            static_cast< OWeakObject* >( new FSStorage( aResultContent,
+        xResult = uno::Reference< embed::XStorage >( 
+                            static_cast< OWeakObject* >( new FSStorage(	aResultContent,
                                                                         nStorageMode,
                                                                         uno::Sequence< beans::PropertyValue >(),
                                                                         m_pImpl->m_xFactory ) ),
@@ -942,7 +942,7 @@ void SAL_CALL FSStorage::renameElement( const ::rtl::OUString& aElementName, con
 }
 
 //-----------------------------------------------
-void SAL_CALL FSStorage::copyElementTo( const ::rtl::OUString& aElementName,
+void SAL_CALL FSStorage::copyElementTo(	const ::rtl::OUString& aElementName,
                                         const uno::Reference< embed::XStorage >& xDest,
                                         const ::rtl::OUString& aNewName )
         throw ( embed::InvalidStorageException,
@@ -979,7 +979,7 @@ void SAL_CALL FSStorage::copyElementTo( const ::rtl::OUString& aElementName,
             uno::Reference< embed::XStorage > xDestSubStor(
                                     xDest->openStorageElement( aNewName, embed::ElementModes::READWRITE ),
                                     uno::UNO_QUERY_THROW );
-
+    
             CopyContentToStorage_Impl( &aSourceContent, xDestSubStor );
         }
         else if ( ::utl::UCBContentHelper::IsDocument( aOwnURL.GetMainURL( INetURLObject::NO_DECODE ) ) )
@@ -1027,7 +1027,7 @@ void SAL_CALL FSStorage::copyElementTo( const ::rtl::OUString& aElementName,
 }
 
 //-----------------------------------------------
-void SAL_CALL FSStorage::moveElementTo( const ::rtl::OUString& aElementName,
+void SAL_CALL FSStorage::moveElementTo(	const ::rtl::OUString& aElementName,
                                         const uno::Reference< embed::XStorage >& xDest,
                                         const ::rtl::OUString& aNewName )
         throw ( embed::InvalidStorageException,
@@ -1048,7 +1048,7 @@ void SAL_CALL FSStorage::moveElementTo( const ::rtl::OUString& aElementName,
 }
 
 //____________________________________________________________________________________________________
-//  XNameAccess
+//	XNameAccess
 //____________________________________________________________________________________________________
 
 //-----------------------------------------------
@@ -1237,7 +1237,7 @@ sal_Bool SAL_CALL FSStorage::hasElements()
 
     if ( !GetContent() )
         throw io::IOException(); // TODO: error handling
-
+    
     uno::Sequence< ::rtl::OUString > aProps( 1 );
     aProps[0] = ::rtl::OUString::createFromAscii( "TargetURL" );
     ::ucbhelper::ResultSetInclude eInclude = ::ucbhelper::INCLUDE_FOLDERS_AND_DOCUMENTS;
@@ -1255,7 +1255,7 @@ sal_Bool SAL_CALL FSStorage::hasElements()
 
 
 //____________________________________________________________________________________________________
-//  XDisposable
+//	XDisposable
 //____________________________________________________________________________________________________
 
 //-----------------------------------------------
@@ -1308,7 +1308,7 @@ void SAL_CALL FSStorage::removeEventListener(
 }
 
 //____________________________________________________________________________________________________
-//  XPropertySet
+//	XPropertySet
 //____________________________________________________________________________________________________
 
 //-----------------------------------------------
@@ -1433,7 +1433,7 @@ void SAL_CALL FSStorage::removeVetoableChangeListener(
 }
 
 //____________________________________________________________________________________________________
-//  XHierarchicalStorageAccess
+//	XHierarchicalStorageAccess
 //____________________________________________________________________________________________________
 //-----------------------------------------------
 uno::Reference< embed::XExtendedStorageStream > SAL_CALL FSStorage::openStreamElementByHierarchicalName( const ::rtl::OUString& sStreamPath, ::sal_Int32 nOpenMode )
@@ -1479,7 +1479,7 @@ uno::Reference< embed::XExtendedStorageStream > SAL_CALL FSStorage::openStreamEl
             if ( isLocalFile_Impl( aFileURL.GetMainURL( INetURLObject::NO_DECODE ) ) )
             {
                 uno::Reference< ucb::XSimpleFileAccess > xSimpleFileAccess(
-                    m_pImpl->m_xFactory->createInstance(
+                    m_pImpl->m_xFactory->createInstance( 
                         ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.ucb.SimpleFileAccess" ) ) ),
                     uno::UNO_QUERY_THROW );
                 uno::Reference< io::XStream > xStream =
@@ -1504,10 +1504,10 @@ uno::Reference< embed::XExtendedStorageStream > SAL_CALL FSStorage::openStreamEl
                         delete pStream;
                 }
             }
-
+    
             if ( !xResult.is() )
                 throw io::IOException();
-
+    
             if ( ( nOpenMode & embed::ElementModes::TRUNCATE ) )
             {
                 uno::Reference< io::XTruncate > xTrunc( xResult->getOutputStream(), uno::UNO_QUERY_THROW );
@@ -1519,7 +1519,7 @@ uno::Reference< embed::XExtendedStorageStream > SAL_CALL FSStorage::openStreamEl
             if ( ( nOpenMode & embed::ElementModes::TRUNCATE )
               || !::utl::UCBContentHelper::IsDocument( aFileURL.GetMainURL( INetURLObject::NO_DECODE ) ) )
                 throw io::IOException(); // TODO: access denied
-
+    
             ::ucbhelper::Content aResultContent( aFileURL.GetMainURL( INetURLObject::NO_DECODE ), xDummyEnv );
             uno::Reference< io::XInputStream > xInStream = aResultContent.openStream();
             xResult = static_cast< io::XStream* >( new OFSInputStreamContainer( xInStream ) );
diff --git a/svl/source/fsstor/fsstorage.hxx b/svl/source/fsstor/fsstorage.hxx
index 04bd3dead578..2ae22b804e0a 100644
--- a/svl/source/fsstor/fsstorage.hxx
+++ b/svl/source/fsstor/fsstorage.hxx
@@ -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
@@ -45,7 +45,7 @@
 #include <ucbhelper/content.hxx>
 
 struct FSStorage_Impl;
-class FSStorage : public ::com::sun::star::lang::XTypeProvider
+class FSStorage	: public ::com::sun::star::lang::XTypeProvider
                 , public ::com::sun::star::embed::XStorage
                 , public ::com::sun::star::embed::XHierarchicalStorageAccess
                 , public ::com::sun::star::beans::XPropertySet
@@ -58,7 +58,7 @@ protected:
 
 public:
 
-    FSStorage(  const ::ucbhelper::Content& aContent,
+    FSStorage(	const ::ucbhelper::Content& aContent,
                 sal_Int32 nMode,
                 ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > xProperties,
                 ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > xFactory );
@@ -77,10 +77,10 @@ public:
     static sal_Bool MakeFolderNoUI( const String& rFolder, sal_Bool bNewOnly );
 
     //____________________________________________________________________________________________________
-    //  XInterface
+    //	XInterface
     //____________________________________________________________________________________________________
 
-    virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& rType )
+    virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& rType ) 
         throw( ::com::sun::star::uno::RuntimeException );
 
     virtual void SAL_CALL acquire() throw();
@@ -88,7 +88,7 @@ public:
     virtual void SAL_CALL release() throw();
 
     //____________________________________________________________________________________________________
-    //  XTypeProvider
+    //	XTypeProvider
     //____________________________________________________________________________________________________
 
     virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes()
@@ -98,7 +98,7 @@ public:
         throw( ::com::sun::star::uno::RuntimeException );
 
     //____________________________________________________________________________________________________
-    //  XStorage
+    //	XStorage
     //____________________________________________________________________________________________________
 
     virtual void SAL_CALL copyToStorage( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xDest )
@@ -108,7 +108,7 @@ public:
                 ::com::sun::star::embed::StorageWrappedTargetException,
                 ::com::sun::star::uno::RuntimeException );
 
-    virtual ::com::sun::star::uno::Reference< ::com::sun::star::io::XStream > SAL_CALL openStreamElement(
+    virtual ::com::sun::star::uno::Reference< ::com::sun::star::io::XStream > SAL_CALL openStreamElement( 
             const ::rtl::OUString& aStreamName, sal_Int32 nOpenMode )
         throw ( ::com::sun::star::embed::InvalidStorageException,
                 ::com::sun::star::lang::IllegalArgumentException,
@@ -117,7 +117,7 @@ public:
                 ::com::sun::star::embed::StorageWrappedTargetException,
                 ::com::sun::star::uno::RuntimeException );
 
-    virtual ::com::sun::star::uno::Reference< ::com::sun::star::io::XStream > SAL_CALL openEncryptedStreamElement(
+    virtual ::com::sun::star::uno::Reference< ::com::sun::star::io::XStream > SAL_CALL openEncryptedStreamElement( 
             const ::rtl::OUString& aStreamName, sal_Int32 nOpenMode, const ::rtl::OUString& aPass )
         throw ( ::com::sun::star::embed::InvalidStorageException,
                 ::com::sun::star::lang::IllegalArgumentException,
@@ -127,7 +127,7 @@ public:
                 ::com::sun::star::embed::StorageWrappedTargetException,
                 ::com::sun::star::uno::RuntimeException );
 
-    virtual ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage > SAL_CALL openStorageElement(
+    virtual ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage > SAL_CALL openStorageElement( 
             const ::rtl::OUString& aStorName, sal_Int32 nStorageMode )
         throw ( ::com::sun::star::embed::InvalidStorageException,
                 ::com::sun::star::lang::IllegalArgumentException,
@@ -135,7 +135,7 @@ public:
                 ::com::sun::star::embed::StorageWrappedTargetException,
                 ::com::sun::star::uno::RuntimeException );
 
-    virtual ::com::sun::star::uno::Reference< ::com::sun::star::io::XStream > SAL_CALL cloneStreamElement(
+    virtual ::com::sun::star::uno::Reference< ::com::sun::star::io::XStream > SAL_CALL cloneStreamElement( 
             const ::rtl::OUString& aStreamName )
         throw ( ::com::sun::star::embed::InvalidStorageException,
                 ::com::sun::star::lang::IllegalArgumentException,
@@ -144,7 +144,7 @@ public:
                 ::com::sun::star::embed::StorageWrappedTargetException,
                 ::com::sun::star::uno::RuntimeException );
 
-    virtual ::com::sun::star::uno::Reference< ::com::sun::star::io::XStream > SAL_CALL cloneEncryptedStreamElement(
+    virtual ::com::sun::star::uno::Reference< ::com::sun::star::io::XStream > SAL_CALL cloneEncryptedStreamElement( 
             const ::rtl::OUString& aStreamName, const ::rtl::OUString& aPass )
         throw ( ::com::sun::star::embed::InvalidStorageException,
                 ::com::sun::star::lang::IllegalArgumentException,
@@ -200,7 +200,7 @@ public:
                 ::com::sun::star::embed::StorageWrappedTargetException,
                 ::com::sun::star::uno::RuntimeException );
 
-    virtual void SAL_CALL copyElementTo(    const ::rtl::OUString& aElementName,
+    virtual void SAL_CALL copyElementTo(	const ::rtl::OUString& aElementName, 
                                         const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xDest,
                                         const ::rtl::OUString& aNewName )
         throw ( ::com::sun::star::embed::InvalidStorageException,
@@ -211,7 +211,7 @@ public:
                 ::com::sun::star::embed::StorageWrappedTargetException,
                 ::com::sun::star::uno::RuntimeException );
 
-    virtual void SAL_CALL moveElementTo(    const ::rtl::OUString& aElementName,
+    virtual void SAL_CALL moveElementTo(	const ::rtl::OUString& aElementName,
                                         const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xDest,
                                         const ::rtl::OUString& rNewName )
         throw ( ::com::sun::star::embed::InvalidStorageException,
@@ -223,7 +223,7 @@ public:
                 ::com::sun::star::uno::RuntimeException );
 
     //____________________________________________________________________________________________________
-    //  XNameAccess
+    //	XNameAccess
     //____________________________________________________________________________________________________
 
     virtual ::com::sun::star::uno::Any SAL_CALL getByName( const ::rtl::OUString& aName )
@@ -244,7 +244,7 @@ public:
         throw ( ::com::sun::star::uno::RuntimeException );
 
     //____________________________________________________________________________________________________
-    //  XComponent
+    //	XComponent
     //____________________________________________________________________________________________________
 
     virtual void SAL_CALL dispose()
@@ -259,7 +259,7 @@ public:
         throw ( ::com::sun::star::uno::RuntimeException );
 
     //____________________________________________________________________________________________________
-    //  XPropertySet
+    //	XPropertySet
     //____________________________________________________________________________________________________
 
     virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo()
@@ -277,7 +277,7 @@ public:
                 ::com::sun::star::lang::WrappedTargetException,
                 ::com::sun::star::uno::RuntimeException );
 
-    virtual void SAL_CALL addPropertyChangeListener(
+    virtual void SAL_CALL addPropertyChangeListener( 
             const ::rtl::OUString& aPropertyName,
             const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener )
         throw ( ::com::sun::star::beans::UnknownPropertyException,
@@ -304,7 +304,7 @@ public:
                 ::com::sun::star::uno::RuntimeException );
 
     //____________________________________________________________________________________________________
-    //  XHierarchicalStorageAccess
+    //	XHierarchicalStorageAccess
     //____________________________________________________________________________________________________
 
     virtual ::com::sun::star::uno::Reference< ::com::sun::star::embed::XExtendedStorageStream > SAL_CALL openStreamElementByHierarchicalName( const ::rtl::OUString& sStreamPath, ::sal_Int32 nOpenMode )
diff --git a/svl/source/fsstor/oinputstreamcontainer.cxx b/svl/source/fsstor/oinputstreamcontainer.cxx
index ffa86cdb981d..985d61ddcfa2 100644
--- a/svl/source/fsstor/oinputstreamcontainer.cxx
+++ b/svl/source/fsstor/oinputstreamcontainer.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
@@ -95,7 +95,7 @@ uno::Any SAL_CALL OFSInputStreamContainer::queryInterface( const uno::Type& rTyp
         throw( uno::RuntimeException )
 {
     // Attention:
-    //  Don't use mutex or guard in this method!!! Is a method of XInterface.
+    //	Don't use mutex or guard in this method!!! Is a method of XInterface.
 
     uno::Any aReturn;
     if ( m_bSeekable )
@@ -129,7 +129,7 @@ void SAL_CALL OFSInputStreamContainer::release()
 }
 
 //-----------------------------------------------
-sal_Int32 SAL_CALL OFSInputStreamContainer::readBytes( uno::Sequence< sal_Int8 >& aData, sal_Int32 nBytesToRead )
+sal_Int32 SAL_CALL OFSInputStreamContainer::readBytes( uno::Sequence< sal_Int8 >& aData, sal_Int32 nBytesToRead ) 
         throw ( io::NotConnectedException,
                 io::BufferSizeExceededException,
                 io::IOException,
@@ -147,7 +147,7 @@ sal_Int32 SAL_CALL OFSInputStreamContainer::readBytes( uno::Sequence< sal_Int8 >
 }
 
 //-----------------------------------------------
-sal_Int32 SAL_CALL OFSInputStreamContainer::readSomeBytes( uno::Sequence< sal_Int8 >& aData, sal_Int32 nMaxBytesToRead )
+sal_Int32 SAL_CALL OFSInputStreamContainer::readSomeBytes( uno::Sequence< sal_Int8 >& aData, sal_Int32 nMaxBytesToRead ) 
         throw ( io::NotConnectedException,
                 io::BufferSizeExceededException,
                 io::IOException,
@@ -165,7 +165,7 @@ sal_Int32 SAL_CALL OFSInputStreamContainer::readSomeBytes( uno::Sequence< sal_In
 }
 
 //-----------------------------------------------
-void SAL_CALL OFSInputStreamContainer::skipBytes( sal_Int32 nBytesToSkip )
+void SAL_CALL OFSInputStreamContainer::skipBytes( sal_Int32 nBytesToSkip ) 
         throw ( io::NotConnectedException,
                 io::BufferSizeExceededException,
                 io::IOException,
@@ -183,7 +183,7 @@ void SAL_CALL OFSInputStreamContainer::skipBytes( sal_Int32 nBytesToSkip )
 }
 
 //-----------------------------------------------
-sal_Int32 SAL_CALL OFSInputStreamContainer::available(  )
+sal_Int32 SAL_CALL OFSInputStreamContainer::available(  ) 
         throw ( io::NotConnectedException,
                 io::IOException,
                 uno::RuntimeException )
@@ -200,7 +200,7 @@ sal_Int32 SAL_CALL OFSInputStreamContainer::available(  )
 }
 
 //-----------------------------------------------
-void SAL_CALL OFSInputStreamContainer::closeInput(  )
+void SAL_CALL OFSInputStreamContainer::closeInput(  ) 
         throw ( io::NotConnectedException,
                 io::IOException,
                 uno::RuntimeException )
@@ -262,7 +262,7 @@ void SAL_CALL OFSInputStreamContainer::seek( sal_Int64 location )
 
 //-----------------------------------------------
 sal_Int64 SAL_CALL OFSInputStreamContainer::getPosition()
-        throw ( io::IOException,
+        throw ( io::IOException, 
                 uno::RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
diff --git a/svl/source/fsstor/oinputstreamcontainer.hxx b/svl/source/fsstor/oinputstreamcontainer.hxx
index 939eb16c05af..1179b846f526 100644
--- a/svl/source/fsstor/oinputstreamcontainer.hxx
+++ b/svl/source/fsstor/oinputstreamcontainer.hxx
@@ -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
@@ -65,15 +65,15 @@ public:
     virtual void SAL_CALL release() throw();
 
     // XInputStream
-    virtual sal_Int32 SAL_CALL readBytes( ::com::sun::star::uno::Sequence< sal_Int8 >& aData, sal_Int32 nBytesToRead )
+    virtual sal_Int32 SAL_CALL readBytes( ::com::sun::star::uno::Sequence< sal_Int8 >& aData, sal_Int32 nBytesToRead ) 
         throw(::com::sun::star::io::NotConnectedException, ::com::sun::star::io::BufferSizeExceededException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException);
     virtual sal_Int32 SAL_CALL readSomeBytes( ::com::sun::star::uno::Sequence< sal_Int8 >& aData, sal_Int32 nMaxBytesToRead )
         throw(::com::sun::star::io::NotConnectedException, ::com::sun::star::io::BufferSizeExceededException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException);
-    virtual void SAL_CALL skipBytes( sal_Int32 nBytesToSkip )
+    virtual void SAL_CALL skipBytes( sal_Int32 nBytesToSkip ) 
         throw(::com::sun::star::io::NotConnectedException, ::com::sun::star::io::BufferSizeExceededException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException);
-    virtual sal_Int32 SAL_CALL available(  )
+    virtual sal_Int32 SAL_CALL available(  ) 
         throw(::com::sun::star::io::NotConnectedException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException);
-    virtual void SAL_CALL closeInput(  )
+    virtual void SAL_CALL closeInput(  ) 
         throw(::com::sun::star::io::NotConnectedException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException);
 
     //XStream
diff --git a/svl/source/fsstor/ostreamcontainer.cxx b/svl/source/fsstor/ostreamcontainer.cxx
index b9210f685014..893790d394a2 100644
--- a/svl/source/fsstor/ostreamcontainer.cxx
+++ b/svl/source/fsstor/ostreamcontainer.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
@@ -82,11 +82,11 @@ uno::Any SAL_CALL OFSStreamContainer::queryInterface( const uno::Type& rType )
     uno::Any aReturn;
 
     aReturn <<= ::cppu::queryInterface
-                (   rType
-                    ,   static_cast<lang::XTypeProvider*> ( this )
-                    ,   static_cast<io::XStream*> ( this )
-                    ,   static_cast<embed::XExtendedStorageStream*> ( this )
-                    ,   static_cast<lang::XComponent*> ( this ) );
+                (	rType
+                    ,	static_cast<lang::XTypeProvider*> ( this )
+                    ,	static_cast<io::XStream*> ( this )
+                    ,	static_cast<embed::XExtendedStorageStream*> ( this )
+                    ,	static_cast<lang::XComponent*> ( this ) );
 
     if ( aReturn.hasValue() == sal_True )
         return aReturn ;
@@ -94,8 +94,8 @@ uno::Any SAL_CALL OFSStreamContainer::queryInterface( const uno::Type& rType )
     if ( m_xSeekable.is() )
     {
         aReturn <<= ::cppu::queryInterface
-                (   rType
-                    ,   static_cast<io::XSeekable*> ( this ) );
+                (	rType
+                    ,	static_cast<io::XSeekable*> ( this ) );
 
         if ( aReturn.hasValue() == sal_True )
             return aReturn ;
@@ -104,8 +104,8 @@ uno::Any SAL_CALL OFSStreamContainer::queryInterface( const uno::Type& rType )
     if ( m_xInputStream.is() )
     {
         aReturn <<= ::cppu::queryInterface
-                (   rType
-                    ,   static_cast<io::XInputStream*> ( this ) );
+                (	rType
+                    ,	static_cast<io::XInputStream*> ( this ) );
 
         if ( aReturn.hasValue() == sal_True )
             return aReturn ;
@@ -113,8 +113,8 @@ uno::Any SAL_CALL OFSStreamContainer::queryInterface( const uno::Type& rType )
     if ( m_xOutputStream.is() )
     {
         aReturn <<= ::cppu::queryInterface
-                (   rType
-                    ,   static_cast<io::XOutputStream*> ( this ) );
+                (	rType
+                    ,	static_cast<io::XOutputStream*> ( this ) );
 
         if ( aReturn.hasValue() == sal_True )
             return aReturn ;
@@ -122,8 +122,8 @@ uno::Any SAL_CALL OFSStreamContainer::queryInterface( const uno::Type& rType )
     if ( m_xTruncate.is() )
     {
         aReturn <<= ::cppu::queryInterface
-                (   rType
-                    ,   static_cast<io::XTruncate*> ( this ) );
+                (	rType
+                    ,	static_cast<io::XTruncate*> ( this ) );
 
         if ( aReturn.hasValue() == sal_True )
             return aReturn ;
@@ -131,8 +131,8 @@ uno::Any SAL_CALL OFSStreamContainer::queryInterface( const uno::Type& rType )
     if ( m_xAsyncOutputMonitor.is() )
     {
         aReturn <<= ::cppu::queryInterface
-                (   rType
-                    ,   static_cast<io::XAsyncOutputMonitor*> ( this ) );
+                (	rType
+                    ,	static_cast<io::XAsyncOutputMonitor*> ( this ) );
 
         if ( aReturn.hasValue() == sal_True )
             return aReturn ;
@@ -155,7 +155,7 @@ void SAL_CALL OFSStreamContainer::release()
     OWeakObject::release();
 }
 
-//  XTypeProvider
+//	XTypeProvider
 //-----------------------------------------------
 uno::Sequence< uno::Type > SAL_CALL OFSStreamContainer::getTypes()
         throw( uno::RuntimeException )
@@ -167,29 +167,29 @@ uno::Sequence< uno::Type > SAL_CALL OFSStreamContainer::getTypes()
         if ( m_pTypeCollection == NULL )
         {
             ::cppu::OTypeCollection aTypeCollection
-                                    (   ::getCppuType( ( const uno::Reference< lang::XTypeProvider >* )NULL )
-                                    ,   ::getCppuType( ( const uno::Reference< embed::XExtendedStorageStream >* )NULL ) );
+                                    (	::getCppuType( ( const uno::Reference< lang::XTypeProvider >* )NULL )
+                                    ,	::getCppuType( ( const uno::Reference< embed::XExtendedStorageStream >* )NULL ) );
 
             if ( m_xSeekable.is() )
                 aTypeCollection = ::cppu::OTypeCollection
-                                    (   ::getCppuType( ( const uno::Reference< io::XSeekable >* )NULL ),
+                                    (	::getCppuType( ( const uno::Reference< io::XSeekable >* )NULL ),
                                         aTypeCollection.getTypes() );
             if ( m_xInputStream.is() )
                 aTypeCollection = ::cppu::OTypeCollection
-                                    (   ::getCppuType( ( const uno::Reference< io::XInputStream >* )NULL ),
+                                    (	::getCppuType( ( const uno::Reference< io::XInputStream >* )NULL ),
                                         aTypeCollection.getTypes() );
 
             if ( m_xOutputStream.is() )
                 aTypeCollection = ::cppu::OTypeCollection
-                                    (   ::getCppuType( ( const uno::Reference< io::XOutputStream >* )NULL ),
+                                    (	::getCppuType( ( const uno::Reference< io::XOutputStream >* )NULL ),
                                         aTypeCollection.getTypes() );
             if ( m_xTruncate.is() )
                 aTypeCollection = ::cppu::OTypeCollection
-                                    (   ::getCppuType( ( const uno::Reference< io::XTruncate >* )NULL ),
+                                    (	::getCppuType( ( const uno::Reference< io::XTruncate >* )NULL ),
                                         aTypeCollection.getTypes() );
             if ( m_xAsyncOutputMonitor.is() )
                 aTypeCollection = ::cppu::OTypeCollection
-                                    (   ::getCppuType( ( const uno::Reference< io::XAsyncOutputMonitor >* )NULL ),
+                                    (	::getCppuType( ( const uno::Reference< io::XAsyncOutputMonitor >* )NULL ),
                                         aTypeCollection.getTypes() );
 
             m_pTypeCollection = new ::cppu::OTypeCollection( aTypeCollection );
diff --git a/svl/source/fsstor/ostreamcontainer.hxx b/svl/source/fsstor/ostreamcontainer.hxx
index 67fbf88b64c6..15107a0377d9 100644
--- a/svl/source/fsstor/ostreamcontainer.hxx
+++ b/svl/source/fsstor/ostreamcontainer.hxx
@@ -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
@@ -53,12 +53,12 @@ class OFSStreamContainer : public cppu::OWeakObject,
 {
     ::osl::Mutex m_aMutex;
 
-    ::com::sun::star::uno::Reference< ::com::sun::star::io::XStream >               m_xStream;
-    ::com::sun::star::uno::Reference< ::com::sun::star::io::XSeekable >             m_xSeekable;
-    ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >          m_xInputStream;
-    ::com::sun::star::uno::Reference< ::com::sun::star::io::XOutputStream >         m_xOutputStream;
-    ::com::sun::star::uno::Reference< ::com::sun::star::io::XTruncate >             m_xTruncate;
-    ::com::sun::star::uno::Reference< ::com::sun::star::io::XAsyncOutputMonitor >   m_xAsyncOutputMonitor;
+    ::com::sun::star::uno::Reference< ::com::sun::star::io::XStream >				m_xStream;
+    ::com::sun::star::uno::Reference< ::com::sun::star::io::XSeekable >				m_xSeekable;
+    ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >			m_xInputStream;
+    ::com::sun::star::uno::Reference< ::com::sun::star::io::XOutputStream >			m_xOutputStream;
+    ::com::sun::star::uno::Reference< ::com::sun::star::io::XTruncate >				m_xTruncate;
+    ::com::sun::star::uno::Reference< ::com::sun::star::io::XAsyncOutputMonitor >	m_xAsyncOutputMonitor;
 
     sal_Bool m_bDisposed;
     sal_Bool m_bInputClosed;
@@ -72,12 +72,12 @@ public:
     virtual ~OFSStreamContainer();
 
     // XInterface
-    virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& rType )
+    virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& rType ) 
         throw( ::com::sun::star::uno::RuntimeException );
     virtual void SAL_CALL acquire() throw();
     virtual void SAL_CALL release() throw();
 
-    //  XTypeProvider
+    //	XTypeProvider
     virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes()
         throw( ::com::sun::star::uno::RuntimeException );
     virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId()
@@ -98,14 +98,14 @@ public:
     virtual sal_Int64 SAL_CALL getLength() throw (::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException);
 
     // XInputStream
-    virtual sal_Int32 SAL_CALL readBytes( ::com::sun::star::uno::Sequence< sal_Int8 >& aData, sal_Int32 nBytesToRead )
+    virtual sal_Int32 SAL_CALL readBytes( ::com::sun::star::uno::Sequence< sal_Int8 >& aData, sal_Int32 nBytesToRead ) 
         throw(::com::sun::star::io::NotConnectedException, ::com::sun::star::io::BufferSizeExceededException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException);
     virtual sal_Int32 SAL_CALL readSomeBytes( ::com::sun::star::uno::Sequence< sal_Int8 >& aData, sal_Int32 nMaxBytesToRead ) throw(::com::sun::star::io::NotConnectedException, ::com::sun::star::io::BufferSizeExceededException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException);
-    virtual void SAL_CALL skipBytes( sal_Int32 nBytesToSkip )
+    virtual void SAL_CALL skipBytes( sal_Int32 nBytesToSkip ) 
         throw(::com::sun::star::io::NotConnectedException, ::com::sun::star::io::BufferSizeExceededException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException);
-    virtual sal_Int32 SAL_CALL available(  )
+    virtual sal_Int32 SAL_CALL available(  ) 
         throw(::com::sun::star::io::NotConnectedException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException);
-    virtual void SAL_CALL closeInput(  )
+    virtual void SAL_CALL closeInput(  ) 
         throw(::com::sun::star::io::NotConnectedException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException);
 
     // XOutputStream
diff --git a/svl/source/inc/fsfactory.hxx b/svl/source/inc/fsfactory.hxx
index d5e4e1d56373..2ea33e6a28b0 100644
--- a/svl/source/inc/fsfactory.hxx
+++ b/svl/source/inc/fsfactory.hxx
@@ -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
@@ -53,7 +53,7 @@ public:
     static ::rtl::OUString SAL_CALL impl_staticGetImplementationName();
 
     static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL
-        impl_staticCreateSelfInstance(
+        impl_staticCreateSelfInstance( 
             const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceManager );
 
 
diff --git a/svl/source/inc/passwordcontainer.hxx b/svl/source/inc/passwordcontainer.hxx
index 375632801368..9aea602fe000 100644
--- a/svl/source/inc/passwordcontainer.hxx
+++ b/svl/source/inc/passwordcontainer.hxx
@@ -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
@@ -27,8 +27,8 @@
 #ifndef INCLUDED_COMPHELPER_PASSWORDCONTAINER_HXX
 #define INCLUDED_COMPHELPER_PASSWORDCONTAINER_HXX
 
-#include <list>
-#include <vector>
+#include <list> 
+#include <vector> 
 #include <map>
 #include <com/sun/star/task/XPasswordContainer.hpp>
 #include <com/sun/star/task/XUrlContainer.hpp>
@@ -42,7 +42,7 @@
 #include <cppuhelper/typeprovider.hxx>
 #include <cppuhelper/queryinterface.hxx>
 #include <cppuhelper/factory.hxx>
-
+ 
 #include <tools/stream.hxx>
 #include <unotools/configitem.hxx>
 #include <ucbhelper/interactionrequest.hxx>
@@ -56,18 +56,18 @@
 #define PERSISTENT_RECORD     1
 
 //----------------------------------------------------------------------------------
-
-class NamePassRecord
+ 
+class NamePassRecord 
 {
     ::rtl::OUString                                     m_aName;
 
     // there are two lists of passwords, memory passwords and persistent passwords
     sal_Bool                                              m_bHasMemPass;
-    ::std::vector< ::rtl::OUString >                      m_aMemPass;
+    ::std::vector< ::rtl::OUString >                      m_aMemPass; 
 
     // persistent passwords are encrypted in one string
     sal_Bool                                              m_bHasPersPass;
-    ::rtl::OUString                                       m_aPersPass;
+    ::rtl::OUString                                       m_aPersPass; 
 
     void InitArrays( sal_Bool bHasMemoryList, const ::std::vector< ::rtl::OUString >& aMemoryList,
                      sal_Bool bHasPersistentList, const ::rtl::OUString& aPersistentList )
@@ -115,7 +115,7 @@ public:
     {
         InitArrays( bHasMemoryList, aMemoryList, bHasPersistentList, aPersistentList );
     }
-
+        
     NamePassRecord( const NamePassRecord& aRecord )
         : m_aName( aRecord.m_aName )
         , m_bHasMemPass( sal_False )
@@ -123,7 +123,7 @@ public:
     {
         InitArrays( aRecord.m_bHasMemPass, aRecord.m_aMemPass, aRecord.m_bHasPersPass, aRecord.m_aPersPass );
     }
-
+        
     NamePassRecord& operator=( const NamePassRecord& aRecord )
     {
         m_aName = aRecord.m_aName;
@@ -139,7 +139,7 @@ public:
     {
         return m_aName;
     }
-
+    
     sal_Bool HasPasswords( sal_Int8 nStatus ) const
     {
         if ( nStatus == MEMORY_RECORD )
@@ -208,7 +208,7 @@ class StorageItem : public ::utl::ConfigItem {
     sal_Bool            hasEncoded;
     ::rtl::OUString        mEncoded;
 public:
-    StorageItem( PasswordContainer* point, const ::rtl::OUString& path ) :
+    StorageItem( PasswordContainer* point, const ::rtl::OUString& path ) : 
         ConfigItem( path, CONFIG_MODE_IMMEDIATE_UPDATE ),
         mainCont( point ),
         hasEncoded( sal_False )
@@ -218,7 +218,7 @@ public:
         *aNode.getArray() += ::rtl::OUString::createFromAscii( "/Store" );
         EnableNotification( aNode );
     }
-
+    
     PassMap getInfo();
     void update( const ::rtl::OUString& url, const NamePassRecord& rec );
     void remove( const ::rtl::OUString& url, const ::rtl::OUString& rec );
@@ -228,7 +228,7 @@ public:
     void setEncodedMP( const ::rtl::OUString& aResult, sal_Bool bAcceptEnmpty = sal_False );
     void setUseStorage( sal_Bool bUse );
     sal_Bool useStorage();
-
+    
     virtual void            Notify( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyNames );
     virtual void            Commit();
 };
@@ -256,33 +256,33 @@ private:
     ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent > mComponent;
     SysCredentialsConfig mUrlContainer;
 
-    ::com::sun::star::uno::Sequence< ::com::sun::star::task::UserRecord > CopyToUserRecordSequence(
-                                        const ::std::list< NamePassRecord >& original,
-                                        const ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionHandler >& Handler )
+    ::com::sun::star::uno::Sequence< ::com::sun::star::task::UserRecord > CopyToUserRecordSequence( 
+                                        const ::std::list< NamePassRecord >& original, 
+                                        const ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionHandler >& Handler ) 
                                                         throw(::com::sun::star::uno::RuntimeException);
 
-    ::com::sun::star::task::UserRecord CopyToUserRecord(
+    ::com::sun::star::task::UserRecord CopyToUserRecord( 
                                         const NamePassRecord& aRecord,
                                         sal_Bool& io_bTryToDecode,
                                         const ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionHandler >& aHandler );
 
-    ::com::sun::star::uno::Sequence< ::com::sun::star::task::UserRecord > FindUsr(
-                                        const ::std::list< NamePassRecord >& userlist,
-                                        const ::rtl::OUString& name,
+    ::com::sun::star::uno::Sequence< ::com::sun::star::task::UserRecord > FindUsr( 
+                                        const ::std::list< NamePassRecord >& userlist, 
+                                        const ::rtl::OUString& name, 
                                         const ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionHandler >& Handler )
                                                         throw(::com::sun::star::uno::RuntimeException);
-bool createUrlRecord(
-    const PassMap::iterator & rIter,
+bool createUrlRecord( 
+    const PassMap::iterator & rIter, 
     bool bName,
     const ::rtl::OUString & aName,
     const ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionHandler >& aHandler,
-    ::com::sun::star::task::UrlRecord & rRec  )
+    ::com::sun::star::task::UrlRecord & rRec  ) 
         throw( ::com::sun::star::uno::RuntimeException );
 
-::com::sun::star::task::UrlRecord find(
-    const ::rtl::OUString& aURL,
+::com::sun::star::task::UrlRecord find( 
+    const ::rtl::OUString& aURL, 
     const ::rtl::OUString& aName,
-    bool bName, // only needed to support empty user names
+    bool bName, // only needed to support empty user names 
     const ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionHandler >& aHandler  ) throw(::com::sun::star::uno::RuntimeException);
 
     ::rtl::OUString GetDefaultMasterPassword();
@@ -296,9 +296,9 @@ bool createUrlRecord(
 
     void UpdateVector( const ::rtl::OUString& url, ::std::list< NamePassRecord >& toUpdate, NamePassRecord& rec, sal_Bool writeFile )
                                                         throw(::com::sun::star::uno::RuntimeException);
-
-    void PrivateAdd( const ::rtl::OUString& aUrl,
-                              const ::rtl::OUString& aUserName,
+    
+    void PrivateAdd( const ::rtl::OUString& aUrl, 
+                              const ::rtl::OUString& aUserName, 
                               const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPasswords,
                               char  aMode,
                               const ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionHandler >& Handler )
@@ -306,51 +306,51 @@ bool createUrlRecord(
 
     ::std::vector< ::rtl::OUString > DecodePasswords( const ::rtl::OUString& aLine, const ::rtl::OUString& aMasterPassword )
                                                         throw(::com::sun::star::uno::RuntimeException);
-
+    
     ::rtl::OUString EncodePasswords( ::std::vector< ::rtl::OUString > lines, const ::rtl::OUString& aMasterPassword )
                                                         throw(::com::sun::star::uno::RuntimeException);
-
+    
 public:
     PasswordContainer( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& );
     ~PasswordContainer();
 
-    virtual void SAL_CALL add( const ::rtl::OUString& aUrl,
-                               const ::rtl::OUString& aUserName,
+    virtual void SAL_CALL add( const ::rtl::OUString& aUrl, 
+                               const ::rtl::OUString& aUserName, 
                                const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPasswords,
-                               const ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionHandler >& Handler  )
+                               const ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionHandler >& Handler  ) 
                                                         throw(::com::sun::star::uno::RuntimeException);
-
-    virtual void SAL_CALL addPersistent( const ::rtl::OUString& aUrl,
-                                            const ::rtl::OUString& aUserName,
+    
+    virtual void SAL_CALL addPersistent( const ::rtl::OUString& aUrl, 
+                                            const ::rtl::OUString& aUserName, 
                                          const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPasswords,
-                                          const ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionHandler >& Handler  )
+                                          const ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionHandler >& Handler  ) 
                                                         throw(::com::sun::star::uno::RuntimeException);
-
-    virtual ::com::sun::star::task::UrlRecord SAL_CALL
+    
+    virtual ::com::sun::star::task::UrlRecord SAL_CALL 
                             find( const ::rtl::OUString& aUrl,
-                                  const ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionHandler >& Handler  )
+                                  const ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionHandler >& Handler  ) 
                                                         throw(::com::sun::star::uno::RuntimeException);
-
-    virtual ::com::sun::star::task::UrlRecord SAL_CALL
-                            findForName( const ::rtl::OUString& aUrl,
+    
+    virtual ::com::sun::star::task::UrlRecord SAL_CALL 
+                            findForName( const ::rtl::OUString& aUrl, 
                                          const ::rtl::OUString& aUserName,
-                                            const ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionHandler >& Handler  )
+                                            const ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionHandler >& Handler  ) 
                                                         throw(::com::sun::star::uno::RuntimeException);
 
-    virtual void SAL_CALL remove( const ::rtl::OUString& aUrl,
-                                  const ::rtl::OUString& aUserName )
+    virtual void SAL_CALL remove( const ::rtl::OUString& aUrl, 
+                                  const ::rtl::OUString& aUserName ) 
                                                         throw(::com::sun::star::uno::RuntimeException);
 
-    virtual void SAL_CALL removePersistent( const ::rtl::OUString& aUrl,
-                                            const ::rtl::OUString& aUserName )
+    virtual void SAL_CALL removePersistent( const ::rtl::OUString& aUrl, 
+                                            const ::rtl::OUString& aUserName ) 
                                                         throw(::com::sun::star::uno::RuntimeException);
 
     virtual void SAL_CALL removeAllPersistent() throw(::com::sun::star::uno::RuntimeException);
 
-    virtual ::com::sun::star::uno::Sequence< ::com::sun::star::task::UrlRecord > SAL_CALL
+    virtual ::com::sun::star::uno::Sequence< ::com::sun::star::task::UrlRecord > SAL_CALL 
                             getAllPersistent( const ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionHandler >& Handler ) throw(::com::sun::star::uno::RuntimeException);
 
-
+    
     // provide factory
     static ::rtl::OUString SAL_CALL        impl_getStaticImplementationName( ) throw(::com::sun::star::uno::RuntimeException);
     static ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL
@@ -359,7 +359,7 @@ public:
                     impl_createFactory( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& ServiceManager ) throw(::com::sun::star::uno::RuntimeException);
     static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL
                     impl_createInstance( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceManager ) throw( ::com::sun::star::uno::RuntimeException );
-
+    
     // XServiceInfo
     virtual ::rtl::OUString    SAL_CALL    getImplementationName(  ) throw(::com::sun::star::uno::RuntimeException);
     virtual sal_Bool SAL_CALL            supportsService( const ::rtl::OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException);
@@ -370,7 +370,7 @@ public:
     // XEventListener
     virtual void SAL_CALL        disposing( const ::com::sun::star::lang::EventObject& Source )
                                     throw(::com::sun::star::uno::RuntimeException);
-
+    
     // XMasterPasswordHandling
     virtual ::sal_Bool SAL_CALL authorizateWithMasterPassword( const ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionHandler >& xHandler )
         throw (::com::sun::star::uno::RuntimeException);
@@ -404,7 +404,7 @@ public:
 
     const ::rtl::Reference< ucbhelper::InteractionSupplyAuthentication > &
     getAuthenticationSupplier() const { return m_xAuthSupplier; }
-
+    
 };
 
 //----------------------------------------------------------------------------------
diff --git a/svl/source/inc/poolio.hxx b/svl/source/inc/poolio.hxx
index 70122a5b1998..41b07acac7b8 100644
--- a/svl/source/inc/poolio.hxx
+++ b/svl/source/inc/poolio.hxx
@@ -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
@@ -34,19 +34,19 @@
 
 struct SfxPoolVersion_Impl
 {
-    USHORT          _nVer;
-    USHORT          _nStart, _nEnd;
-    USHORT*         _pMap;
+    USHORT			_nVer;
+    USHORT			_nStart, _nEnd;
+    USHORT* 		_pMap;
 
                     SfxPoolVersion_Impl( USHORT nVer, USHORT nStart, USHORT nEnd,
                                          USHORT *pMap )
-                    :   _nVer( nVer ),
+                    :	_nVer( nVer ),
                         _nStart( nStart ),
                         _nEnd( nEnd ),
                         _pMap( pMap )
                     {}
                     SfxPoolVersion_Impl( const SfxPoolVersion_Impl &rOrig )
-                    :   _nVer( rOrig._nVer ),
+                    :	_nVer( rOrig._nVer ),
                         _nStart( rOrig._nStart ),
                         _nEnd( rOrig._nEnd ),
                         _pMap( rOrig._pMap )
@@ -58,7 +58,7 @@ SV_DECL_PTRARR_DEL( SfxPoolVersionArr_Impl, SfxPoolVersion_Impl*, 0, 2 )
 
 struct SfxPoolItemArray_Impl: public SfxPoolItemArrayBase_Impl
 {
-    USHORT  nFirstFree;
+    USHORT	nFirstFree;
 
     SfxPoolItemArray_Impl (USHORT nInitSize = 0)
         : SfxPoolItemArrayBase_Impl( nInitSize ),
@@ -70,18 +70,18 @@ class SfxStyleSheetIterator;
 
 struct SfxItemPool_Impl
 {
-    SfxBroadcaster                  aBC;
-    SfxPoolItemArray_Impl**         ppPoolItems;
-    SfxPoolVersionArr_Impl          aVersions;
-    USHORT                          nVersion;
-    USHORT                          nLoadingVersion;
-    USHORT                          nInitRefCount; // 1, beim Laden ggf. 2
-    USHORT                          nVerStart, nVerEnd; // WhichRange in Versions
-    USHORT                          nStoringStart, nStoringEnd; // zu speichernder Range
-    BYTE                            nMajorVer, nMinorVer; // Pool selbst
+    SfxBroadcaster					aBC;
+    SfxPoolItemArray_Impl**			ppPoolItems;
+    SfxPoolVersionArr_Impl			aVersions;
+    USHORT							nVersion;
+    USHORT							nLoadingVersion;
+    USHORT							nInitRefCount; // 1, beim Laden ggf. 2
+    USHORT							nVerStart, nVerEnd; // WhichRange in Versions
+    USHORT							nStoringStart, nStoringEnd; // zu speichernder Range
+    BYTE							nMajorVer, nMinorVer; // Pool selbst
     SfxMapUnit                      eDefMetric;
-    FASTBOOL                        bInSetItem;
-    FASTBOOL                        bStreaming; // in Load() bzw. Store()
+    FASTBOOL						bInSetItem;
+    FASTBOOL						bStreaming; // in Load() bzw. Store()
 
     SfxItemPool_Impl( USHORT nStart, USHORT nEnd )
         : ppPoolItems (new SfxPoolItemArray_Impl*[ nEnd - nStart + 1])
@@ -162,33 +162,33 @@ struct SfxItemPool_Impl
         } \
     }
 
-#define SFX_ITEMPOOL_VER_MAJOR          BYTE(2)
-#define SFX_ITEMPOOL_VER_MINOR          BYTE(0)
-
-#define SFX_ITEMPOOL_TAG_STARTPOOL_4    USHORT(0x1111)
-#define SFX_ITEMPOOL_TAG_STARTPOOL_5    USHORT(0xBBBB)
-#define SFX_ITEMPOOL_TAG_ITEMPOOL       USHORT(0xAAAA)
-#define SFX_ITEMPOOL_TAG_ITEMS          USHORT(0x2222)
-#define SFX_ITEMPOOL_TAG_ITEM           USHORT(0x7777)
-#define SFX_ITEMPOOL_TAG_SIZES          USHORT(0x3333)
-#define SFX_ITEMPOOL_TAG_DEFAULTS       USHORT(0x4444)
-#define SFX_ITEMPOOL_TAG_VERSIONMAP     USHORT(0x5555)
-#define SFX_ITEMPOOL_TAG_HEADER         USHORT(0x6666)
-#define SFX_ITEMPOOL_TAG_ENDPOOL        USHORT(0xEEEE)
-#define SFX_ITEMPOOL_TAG_TRICK4OLD      USHORT(0xFFFF)
-
-#define SFX_ITEMPOOL_REC                BYTE(0x01)
-#define SFX_ITEMPOOL_REC_HEADER         BYTE(0x10)
-#define SFX_ITEMPOOL_REC_VERSIONMAP     USHORT(0x0020)
-#define SFX_ITEMPOOL_REC_WHICHIDS       USHORT(0x0030)
-#define SFX_ITEMPOOL_REC_ITEMS          USHORT(0x0040)
-#define SFX_ITEMPOOL_REC_DEFAULTS       USHORT(0x0050)
-
-#define SFX_ITEMSET_REC                 BYTE(0x02)
+#define SFX_ITEMPOOL_VER_MAJOR      	BYTE(2)
+#define SFX_ITEMPOOL_VER_MINOR      	BYTE(0)
+
+#define SFX_ITEMPOOL_TAG_STARTPOOL_4	USHORT(0x1111)
+#define SFX_ITEMPOOL_TAG_STARTPOOL_5	USHORT(0xBBBB)
+#define SFX_ITEMPOOL_TAG_ITEMPOOL 		USHORT(0xAAAA)
+#define SFX_ITEMPOOL_TAG_ITEMS			USHORT(0x2222)
+#define SFX_ITEMPOOL_TAG_ITEM			USHORT(0x7777)
+#define SFX_ITEMPOOL_TAG_SIZES			USHORT(0x3333)
+#define SFX_ITEMPOOL_TAG_DEFAULTS		USHORT(0x4444)
+#define SFX_ITEMPOOL_TAG_VERSIONMAP 	USHORT(0x5555)
+#define SFX_ITEMPOOL_TAG_HEADER 		USHORT(0x6666)
+#define SFX_ITEMPOOL_TAG_ENDPOOL		USHORT(0xEEEE)
+#define SFX_ITEMPOOL_TAG_TRICK4OLD  	USHORT(0xFFFF)
+
+#define SFX_ITEMPOOL_REC				BYTE(0x01)
+#define SFX_ITEMPOOL_REC_HEADER 	    BYTE(0x10)
+#define SFX_ITEMPOOL_REC_VERSIONMAP 	USHORT(0x0020)
+#define SFX_ITEMPOOL_REC_WHICHIDS   	USHORT(0x0030)
+#define SFX_ITEMPOOL_REC_ITEMS  		USHORT(0x0040)
+#define SFX_ITEMPOOL_REC_DEFAULTS		USHORT(0x0050)
+
+#define SFX_ITEMSET_REC					BYTE(0x02)
 
 #define SFX_STYLES_REC                  BYTE(0x03)
-#define SFX_STYLES_REC_HEADER       USHORT(0x0010)
-#define SFX_STYLES_REC_STYLES       USHORT(0x0020)
+#define SFX_STYLES_REC_HEADER		USHORT(0x0010)
+#define SFX_STYLES_REC_STYLES		USHORT(0x0020)
 
 //========================================================================
 
diff --git a/svl/source/items/aeitem.cxx b/svl/source/items/aeitem.cxx
index 36445162424b..2095cf630684 100644
--- a/svl/source/items/aeitem.cxx
+++ b/svl/source/items/aeitem.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
@@ -195,7 +195,7 @@ SfxPoolItem* SfxAllEnumItem::Create( SvStream & rStream, USHORT ) const
 
 USHORT SfxAllEnumItem::_GetPosByValue( USHORT nVal ) const
 
-/*  [Beschreibung]
+/*	[Beschreibung]
 
     Im Ggs. zu <SfxEnumItemInterface::GetPosByValue(USHORT)const> liefert
     diese interne Methode bei nicht vorhandenen Values die Position,
diff --git a/svl/source/items/cenumitm.cxx b/svl/source/items/cenumitm.cxx
index c5e1a09ec324..a3d1090b6aaf 100644
--- a/svl/source/items/cenumitm.cxx
+++ b/svl/source/items/cenumitm.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
diff --git a/svl/source/items/cintitem.cxx b/svl/source/items/cintitem.cxx
index dd22ab757fe7..ad78496f3662 100644
--- a/svl/source/items/cintitem.cxx
+++ b/svl/source/items/cintitem.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
diff --git a/svl/source/items/cntwall.cxx b/svl/source/items/cntwall.cxx
index 56632c675d01..4031ed8f24f3 100644
--- a/svl/source/items/cntwall.cxx
+++ b/svl/source/items/cntwall.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
diff --git a/svl/source/items/cstitem.src b/svl/source/items/cstitem.src
index 009fcb19e3c6..87f77ec273de 100644
--- a/svl/source/items/cstitem.src
+++ b/svl/source/items/cstitem.src
@@ -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
diff --git a/svl/source/items/ctypeitm.cxx b/svl/source/items/ctypeitm.cxx
index 576071b56e1c..d76357b6b4d3 100644
--- a/svl/source/items/ctypeitm.cxx
+++ b/svl/source/items/ctypeitm.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
@@ -56,14 +56,14 @@ CntContentTypeItem::CntContentTypeItem()
 }
 
 //----------------------------------------------------------------------------
-CntContentTypeItem::CntContentTypeItem( USHORT which, const XubString& rType )
+CntContentTypeItem::CntContentTypeItem(	USHORT which, const XubString& rType )
 : CntUnencodedStringItem( which, rType ),
   _eType( CONTENT_TYPE_NOT_INIT )
 {
 }
 
 //----------------------------------------------------------------------------
-CntContentTypeItem::CntContentTypeItem( USHORT which,
+CntContentTypeItem::CntContentTypeItem(	USHORT which,
                                         const INetContentType eType )
 : CntUnencodedStringItem( which, INetContentTypes::GetContentType( eType ) ),
   _eType( eType )
diff --git a/svl/source/items/custritm.cxx b/svl/source/items/custritm.cxx
index 9d192cc7e7b8..580b674b4dd1 100644
--- a/svl/source/items/custritm.cxx
+++ b/svl/source/items/custritm.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
diff --git a/svl/source/items/dateitem.cxx b/svl/source/items/dateitem.cxx
index 27170c1d4f6e..08436fcbe3d7 100644
--- a/svl/source/items/dateitem.cxx
+++ b/svl/source/items/dateitem.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
@@ -142,12 +142,12 @@ SfxPoolItem* SfxDateTimeItem::Clone( SfxItemPool* ) const
 
 SfxItemPresentation SfxDateTimeItem::GetPresentation
 (
-    SfxItemPresentation     /*ePresentation*/,
-    SfxMapUnit              /*eCoreMetric*/,
-    SfxMapUnit              /*ePresentationMetric*/,
-    XubString&              rText,
+    SfxItemPresentation 	/*ePresentation*/,
+    SfxMapUnit				/*eCoreMetric*/,
+    SfxMapUnit				/*ePresentationMetric*/,
+    XubString& 				rText,
     const IntlWrapper *   pIntlWrapper
-)   const
+)	const
 {
     DBG_CHKTHIS(SfxDateTimeItem, 0);
     if (aDateTime.IsValid())
@@ -238,12 +238,12 @@ SfxPoolItem* SfxColumnDateTimeItem::Clone( SfxItemPool* ) const
 
 SfxItemPresentation SfxColumnDateTimeItem::GetPresentation
 (
-    SfxItemPresentation     /*ePresentation*/,
-    SfxMapUnit              /*eCoreMetric*/,
-    SfxMapUnit              /*ePresentationMetric*/,
-    XubString&              rText,
+    SfxItemPresentation 	/*ePresentation*/,
+    SfxMapUnit				/*eCoreMetric*/,
+    SfxMapUnit				/*ePresentationMetric*/,
+    XubString& 				rText,
     const IntlWrapper *   pIntlWrapper
-)   const
+)	const
 {
     DBG_ASSERT(pIntlWrapper,
                "SfxColumnDateTimeItem::GetPresentation():"
diff --git a/svl/source/items/eitem.cxx b/svl/source/items/eitem.cxx
index c8b7f3db287f..aa1fede5d3c8 100644
--- a/svl/source/items/eitem.cxx
+++ b/svl/source/items/eitem.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
diff --git a/svl/source/items/flagitem.cxx b/svl/source/items/flagitem.cxx
index 93d88889daef..262144b25799 100644
--- a/svl/source/items/flagitem.cxx
+++ b/svl/source/items/flagitem.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
@@ -89,12 +89,12 @@ SvStream& SfxFlagItem::Store(SvStream &rStream, USHORT) const
 
 SfxItemPresentation SfxFlagItem::GetPresentation
 (
-    SfxItemPresentation     /*ePresentation*/,
-    SfxMapUnit              /*eCoreMetric*/,
-    SfxMapUnit              /*ePresentationMetric*/,
-    XubString&              rText,
+    SfxItemPresentation 	/*ePresentation*/,
+    SfxMapUnit				/*eCoreMetric*/,
+    SfxMapUnit				/*ePresentationMetric*/,
+    XubString& 				rText,
     const IntlWrapper *
-)   const
+)	const
 {
     DBG_CHKTHIS(SfxFlagItem, 0);
     rText.Erase();
diff --git a/svl/source/items/globalnameitem.cxx b/svl/source/items/globalnameitem.cxx
index a0ebd97c89b6..06eee5c8e293 100644
--- a/svl/source/items/globalnameitem.cxx
+++ b/svl/source/items/globalnameitem.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
@@ -53,7 +53,7 @@ SfxGlobalNameItem::SfxGlobalNameItem()
 // -----------------------------------------------------------------------
 
 SfxGlobalNameItem::SfxGlobalNameItem( USHORT nW, const SvGlobalName& rName )
-:   SfxPoolItem( nW ),
+:	SfxPoolItem( nW ),
     m_aName( rName )
 {
 }
diff --git a/svl/source/items/ilstitem.cxx b/svl/source/items/ilstitem.cxx
index 691fa7d131be..6396d2f78ea1 100644
--- a/svl/source/items/ilstitem.cxx
+++ b/svl/source/items/ilstitem.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
diff --git a/svl/source/items/imageitm.cxx b/svl/source/items/imageitm.cxx
index 88c3daa137dc..6cca5521e764 100644
--- a/svl/source/items/imageitm.cxx
+++ b/svl/source/items/imageitm.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
@@ -105,7 +105,7 @@ BOOL SfxImageItem::PutValue( const com::sun::star::uno::Any& rVal, BYTE )
     if (( rVal >>= aSeq ) && ( aSeq.getLength() == 4 ))
     {
         sal_Int16     nVal = sal_Int16();
-        rtl::OUString aURL;
+        rtl::OUString aURL;  
         if ( aSeq[0] >>= nVal )
             SetValue( nVal );
         aSeq[1] >>= pImp->nAngle;
diff --git a/svl/source/items/intitem.cxx b/svl/source/items/intitem.cxx
index 0342af15e8cb..a1c107a9e1a4 100644
--- a/svl/source/items/intitem.cxx
+++ b/svl/source/items/intitem.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
diff --git a/svl/source/items/itemiter.cxx b/svl/source/items/itemiter.cxx
index 57b5dc8e727c..ae508221939c 100644
--- a/svl/source/items/itemiter.cxx
+++ b/svl/source/items/itemiter.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
@@ -62,7 +62,7 @@ SfxItemIter::SfxItemIter( const SfxItemSet& rItemSet )
         for ( _nStt = 0; !*(ppFnd + _nStt ); ++_nStt )
             ; // empty loop
         if ( 1 < _rSet.Count() )
-            for( _nEnd = _rSet.TotalCount(); !*( ppFnd + --_nEnd);  )
+            for( _nEnd = _rSet.TotalCount(); !*( ppFnd + --_nEnd);	)
                 ; // empty loop
         else
             _nEnd = _nStt;
diff --git a/svl/source/items/itempool.cxx b/svl/source/items/itempool.cxx
index 5c5f106a1c36..4c9d77479778 100644
--- a/svl/source/items/itempool.cxx
+++ b/svl/source/items/itempool.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
@@ -113,7 +113,7 @@ SfxBroadcaster& SfxItemPool::BC()
 
 SfxItemPool::SfxItemPool
 (
-    UniString const &   rName,          /* Name des Pools zur Idetifikation
+    UniString const &	rName,          /* Name des Pools zur Idetifikation
                                            im File-Format */
     USHORT              nStartWhich,    /* erste Which-Id des Pools */
     USHORT              nEndWhich,      /* letzte Which-Id des Pools */
@@ -970,7 +970,7 @@ const SfxPoolItem& SfxItemPool::GetDefaultItem( USHORT nWhich ) const
 
 void SfxItemPool::FreezeIdRanges()
 
-/*  [Beschreibung]
+/*	[Beschreibung]
 
     This method should be called at the master pool, when all secondary
     pools are appended to it.
diff --git a/svl/source/items/itemprop.cxx b/svl/source/items/itemprop.cxx
index b3be80bc3d0b..16d17ed9fbfa 100644
--- a/svl/source/items/itemprop.cxx
+++ b/svl/source/items/itemprop.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
@@ -52,7 +52,7 @@ struct equalOUString
     return r1.equals( r2 );
   }
 };
-
+  
 typedef ::std::hash_map< ::rtl::OUString,
                                  SfxItemPropertySimpleEntry,
                                  ::rtl::OUStringHash,
@@ -60,7 +60,7 @@ typedef ::std::hash_map< ::rtl::OUString,
 
 class SfxItemPropertyMap_Impl : public SfxItemPropertyHashMap_t
 {
-public:
+public:    
     mutable uno::Sequence< beans::Property > m_aPropSeq;
 
     SfxItemPropertyMap_Impl(){}
@@ -70,7 +70,7 @@ SfxItemPropertyMap_Impl::SfxItemPropertyMap_Impl( const SfxItemPropertyMap_Impl*
 {
     this->SfxItemPropertyHashMap_t::operator=( *pSource );
     m_aPropSeq = pSource->m_aPropSeq;
-}
+}        
 
 /*-- 16.02.2009 10:03:51---------------------------------------------------
 
@@ -83,7 +83,7 @@ SfxItemPropertyMap::SfxItemPropertyMap( const SfxItemPropertyMapEntry* pEntries
         ::rtl::OUString sEntry(pEntries->pName, pEntries->nNameLen, RTL_TEXTENCODING_ASCII_US );
         (*m_pImpl) [ sEntry ] = pEntries;
         ++pEntries;
-    }
+    }    
 }
 /*-- 16.02.2009 12:46:41---------------------------------------------------
 
@@ -139,14 +139,14 @@ uno::Sequence<beans::Property> SfxItemPropertyMap::getProperties() const
     return m_pImpl->m_aPropSeq;
 }
 /*-- 16.02.2009 11:04:31---------------------------------------------------
-
+    
   -----------------------------------------------------------------------*/
-beans::Property SfxItemPropertyMap::getPropertyByName( const ::rtl::OUString rName ) const
+beans::Property SfxItemPropertyMap::getPropertyByName( const ::rtl::OUString rName ) const 
     throw( beans::UnknownPropertyException )
 {
     SfxItemPropertyHashMap_t::const_iterator aIter = m_pImpl->find(rName);
     if( aIter == m_pImpl->end() )
-        throw UnknownPropertyException();
+        throw UnknownPropertyException();    
     const SfxItemPropertySimpleEntry* pEntry = &aIter->second;
     beans::Property aProp;
     aProp.Name = rName;
@@ -159,7 +159,7 @@ beans::Property SfxItemPropertyMap::getPropertyByName( const ::rtl::OUString rNa
 /*-- 16.02.2009 11:09:16---------------------------------------------------
 
   -----------------------------------------------------------------------*/
-sal_Bool SfxItemPropertyMap::hasPropertyByName( const ::rtl::OUString& rName ) const
+sal_Bool SfxItemPropertyMap::hasPropertyByName( const ::rtl::OUString& rName ) const 
 {
     SfxItemPropertyHashMap_t::const_iterator aIter = m_pImpl->find(rName);
     return aIter != m_pImpl->end();
@@ -188,7 +188,7 @@ PropertyEntryVector_t SfxItemPropertyMap::getPropertyEntries() const
 {
     PropertyEntryVector_t aRet;
     aRet.reserve(m_pImpl->size());
-
+    
     SfxItemPropertyHashMap_t::const_iterator aIt = m_pImpl->begin();
     while( aIt != m_pImpl->end() )
     {
@@ -197,14 +197,14 @@ PropertyEntryVector_t SfxItemPropertyMap::getPropertyEntries() const
         ++aIt;
     }
     return aRet;
-}
+}    
 /*-- 18.02.2009 15:11:06---------------------------------------------------
 
   -----------------------------------------------------------------------*/
 sal_uInt32 SfxItemPropertyMap::getSize() const
 {
     return m_pImpl->size();
-}
+}    
 /*-- 16.02.2009 13:44:54---------------------------------------------------
 
   -----------------------------------------------------------------------*/
@@ -263,7 +263,7 @@ void SfxItemPropertySet::getPropertyValue( const rtl::OUString &rName,
             const SfxItemSet& rSet, Any& rAny ) const
                         throw(RuntimeException, UnknownPropertyException)
 {
-    // detect which-id
+    // detect which-id 
     const SfxItemPropertySimpleEntry* pEntry = m_aMap.getByName( rName );
     if ( !pEntry )
         throw UnknownPropertyException();
@@ -316,7 +316,7 @@ void SfxItemPropertySet::setPropertyValue( const SfxItemPropertySimpleEntry& rEn
             DELETEZ(pNewItem);
             throw IllegalArgumentException();
         }
-        // apply new item
+        // apply new item 
         rSet.Put( *pNewItem, rEntry.nWID );
         delete pNewItem;
     }
@@ -358,7 +358,7 @@ PropertyState SfxItemPropertySet::getPropertyState(const SfxItemPropertySimpleEn
 }
 PropertyState   SfxItemPropertySet::getPropertyState(
     const rtl::OUString& rName, const SfxItemSet& rSet) const
-                                    throw(UnknownPropertyException)
+                                    throw(UnknownPropertyException)  
 {
     PropertyState eRet = PropertyState_DIRECT_VALUE;
 
@@ -427,7 +427,7 @@ Sequence< Property > SAL_CALL
 /*-- 16.02.2009 13:49:27---------------------------------------------------
 
   -----------------------------------------------------------------------*/
-const SfxItemPropertyMap* SfxItemPropertySetInfo::getMap() const
+const SfxItemPropertyMap* SfxItemPropertySetInfo::getMap() const 
 {
     return m_pImpl->m_pOwnMap;
 }
@@ -467,7 +467,7 @@ SfxExtItemPropertySetInfo::SfxExtItemPropertySetInfo(
                 aExtMap( pMap )
 {
     aExtMap.mergeProperties( rPropSeq );
-}
+}    
 /*-- 16.02.2009 12:06:49---------------------------------------------------
 
   -----------------------------------------------------------------------*/
diff --git a/svl/source/items/itemset.cxx b/svl/source/items/itemset.cxx
index a79e5195187a..2a46c24b6d17 100644
--- a/svl/source/items/itemset.cxx
+++ b/svl/source/items/itemset.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
@@ -55,23 +55,23 @@
 
 static const USHORT nInitCount = 10; // einzelne USHORTs => 5 Paare ohne '0'
 #ifdef DBG_UTIL
-static ULONG nRangesCopyCount = 0;   // wie oft wurden Ranges kopiert
+static ULONG nRangesCopyCount = 0;	 // wie oft wurden Ranges kopiert
 #endif
 
 DBG_NAME(SfxItemSet)
 
 //========================================================================
 
-#define NUMTYPE         USHORT
-#define SvNums          SvUShorts
+#define NUMTYPE 		USHORT
+#define SvNums			SvUShorts
 #define SfxNumRanges    SfxUShortRanges
 #include "nranges.cxx"
 #undef NUMTYPE
 #undef SvNums
 #undef SfxNumRanges
 
-#define NUMTYPE         ULONG
-#define SvNums          SvULongs
+#define NUMTYPE 		ULONG
+#define SvNums			SvULongs
 #define SfxNumRanges    SfxULongRanges
 #include "nranges.cxx"
 #undef NUMTYPE
@@ -115,19 +115,19 @@ const sal_Char *DbgCheckItemSet( const void* pVoid )
 
 SfxItemSet::SfxItemSet
 (
-    SfxItemPool&    rPool,          /* der Pool, in dem die SfxPoolItems,
+    SfxItemPool&	rPool,  		/* der Pool, in dem die SfxPoolItems,
                                        welche in dieses SfxItemSet gelangen,
                                        aufgenommen werden sollen */
     BOOL
 #ifdef DBG_UTIL
 #ifdef SFX_ITEMSET_NO_DEFAULT_CTOR
 
-                    bTotalRanges    /* komplette Pool-Ranges uebernehmen,
+                    bTotalRanges	/* komplette Pool-Ranges uebernehmen,
                                        muss auf TRUE gesetzt werden */
 #endif
 #endif
 )
-/*  [Beschreibung]
+/*	[Beschreibung]
 
     Konstruktor fuer ein SfxItemSet mit genau den Which-Bereichen, welche
     dem angegebenen <SfxItemPool> bekannt sind.
@@ -139,15 +139,15 @@ SfxItemSet::SfxItemSet
     keinerlei Items mit Slot-Ids als Which-Werte aufnehmen!
 */
 
-:   _pPool( &rPool ),
+:	_pPool( &rPool ),
     _pParent( 0 ),
     _nCount( 0 )
 {
     DBG_CTOR(SfxItemSet, DbgCheckItemSet);
     DBG_ASSERTWARNING( _pPool == _pPool->GetMasterPool(), "kein Master-Pool" );
     DBG( _pChildCountCtor; *_pChildCount(this) = 0 );
-//  DBG_ASSERT( bTotalRanges || abs( &bTotalRanges - this ) < 1000,
-//              "please use suitable ranges" );
+//	DBG_ASSERT( bTotalRanges || abs( &bTotalRanges - this ) < 1000,
+//				"please use suitable ranges" );
 #ifdef DBG_UTIL
 #ifdef SFX_ITEMSET_NO_DEFAULT_CTOR
     if ( !bTotalRanges )
@@ -300,9 +300,9 @@ SfxItemSet::SfxItemSet( const SfxItemSet& rASet ):
     // Attribute kopieren
     SfxItemArray ppDst = _aItems, ppSrc = rASet._aItems;
     for( USHORT n = nCnt; n; --n, ++ppDst, ++ppSrc )
-        if ( 0 == *ppSrc ||                 // aktueller Default?
-             IsInvalidItem(*ppSrc) ||       // Dont Care?
-             IsStaticDefaultItem(*ppSrc) )  // nicht zu poolende Defaults
+        if ( 0 == *ppSrc || 				// aktueller Default?
+             IsInvalidItem(*ppSrc) ||		// Dont Care?
+             IsStaticDefaultItem(*ppSrc) )	// nicht zu poolende Defaults
             // einfach Pointer kopieren
             *ppDst = *ppSrc;
         else if ( _pPool->IsItemFlag( **ppSrc, SFX_ITEM_POOLABLE ) )
@@ -579,7 +579,7 @@ const SfxPoolItem* SfxItemSet::Put( const SfxPoolItem& rItem, USHORT nWhich )
         {
             // in diesem Bereich
             ppFnd += nWhich - *pPtr;
-            if( *ppFnd )        // schon einer vorhanden
+            if( *ppFnd )		// schon einer vorhanden
             {
                 // selbes Item bereits vorhanden?
                 if ( *ppFnd == &rItem )
@@ -678,12 +678,12 @@ int SfxItemSet::Put( const SfxItemSet& rSet, BOOL bInvalidAsDefault )
 
 void SfxItemSet::PutExtended
 (
-    const SfxItemSet&   rSet,           // Quelle der zu puttenden Items
-    SfxItemState        eDontCareAs,    // was mit DontCare-Items passiert
-    SfxItemState        eDefaultAs      // was mit Default-Items passiert
+    const SfxItemSet&	rSet,			// Quelle der zu puttenden Items
+    SfxItemState		eDontCareAs,	// was mit DontCare-Items passiert
+    SfxItemState		eDefaultAs		// was mit Default-Items passiert
 )
 
-/*  [Beschreibung]
+/*	[Beschreibung]
 
     Diese Methode "ubernimmt die Items aus 'rSet' in '*this'. Die
     Which-Bereiche in '*this', die in 'rSet' nicht vorkommen bleiben unver-
@@ -693,9 +693,9 @@ void SfxItemSet::PutExtended
     (0 Pointer) und Invalid- (-1 Pointer) Items werden je nach Parameter
     ('eDontCareAs' und 'eDefaultAs' behandelt:
 
-    SFX_ITEM_SET:       hart auf Default des Pools gesetzt
-    SFX_ITEM_DEFAULT:   gel"oscht (0 Pointer)
-    SFX_ITEM_DONTCARE:  invalidiert (-1 Pointer)
+    SFX_ITEM_SET:		hart auf Default des Pools gesetzt
+    SFX_ITEM_DEFAULT:	gel"oscht (0 Pointer)
+    SFX_ITEM_DONTCARE:	invalidiert (-1 Pointer)
 
     Alle anderen Werte f"ur 'eDontCareAs' und 'eDefaultAs' sind ung"ultig.
 */
@@ -764,7 +764,7 @@ void SfxItemSet::PutExtended
 // -----------------------------------------------------------------------
 
 void SfxItemSet::MergeRange( USHORT nFrom, USHORT nTo )
-/** <H3>Description</H3>
+/**	<H3>Description</H3>
 
     Expands the ranges of settable items by 'nFrom' to 'nTo'. Keeps state of
     items which are new ranges too.
@@ -785,7 +785,7 @@ void SfxItemSet::MergeRange( USHORT nFrom, USHORT nTo )
 
 void SfxItemSet::SetRanges( const USHORT *pNewRanges )
 
-/** <H3>Description</H3>
+/**	<H3>Description</H3>
 
     Modifies the ranges of settable items. Keeps state of items which
     are new ranges too.
@@ -805,9 +805,9 @@ void SfxItemSet::SetRanges( const USHORT *pNewRanges )
     }
 
     // create new item-array (by iterating through all new ranges)
-    ULONG        nSize = Capacity_Impl(pNewRanges);
+    ULONG		 nSize = Capacity_Impl(pNewRanges);
     SfxItemArray aNewItems = new const SfxPoolItem* [ nSize ];
-    USHORT       n = 0, nNewCount = 0;
+    USHORT		 n = 0, nNewCount = 0;
     if ( _nCount == 0 )
         memset( aNewItems, 0, nSize * sizeof( SfxPoolItem* ) );
     else
@@ -877,10 +877,10 @@ void SfxItemSet::SetRanges( const USHORT *pNewRanges )
 
 int SfxItemSet::Set
 (
-    const SfxItemSet&   rSet,   /*  das SfxItemSet, dessen SfxPoolItems
+    const SfxItemSet&	rSet,	/*	das SfxItemSet, dessen SfxPoolItems
                                     "ubernommen werden sollen */
 
-    BOOL                bDeep   /*  TRUE (default)
+    BOOL				bDeep	/*	TRUE (default)
                                     auch die SfxPoolItems aus den ggf. an
                                     rSet vorhandenen Parents werden direkt
                                     in das SfxItemSet "ubernommen
@@ -890,7 +890,7 @@ int SfxItemSet::Set
                                     rSet werden nicht ber"ucksichtigt */
 )
 
-/*  [Beschreibung]
+/*	[Beschreibung]
 
     Das SfxItemSet nimmt genau die SfxPoolItems an, die auch in
     rSet gesetzt sind und im eigenen <Which-Bereich> liegen. Alle
@@ -904,7 +904,7 @@ int SfxItemSet::Set
 
     [R"uckgabewert]
 
-    int                             TRUE
+    int 							TRUE
                                     es wurden SfxPoolItems "ubernommen
 
                                     FALSE
@@ -943,12 +943,12 @@ int SfxItemSet::Set
 
 const SfxPoolItem* SfxItemSet::GetItem
 (
-    USHORT              nId,            // Slot-Id oder Which-Id des Items
-    BOOL                bSrchInParent,  // TRUE: auch in Parent-ItemSets suchen
-    TypeId              aItemType       // != 0 =>  RTTI Pruefung mit Assertion
-)   const
+    USHORT 				nId,   			// Slot-Id oder Which-Id des Items
+    BOOL 				bSrchInParent,  // TRUE: auch in Parent-ItemSets suchen
+    TypeId 				aItemType       // != 0 =>  RTTI Pruefung mit Assertion
+)	const
 
-/*  [Beschreibung]
+/*	[Beschreibung]
 
     Mit dieser Methode wird der Zugriff auf einzelne Items im
     SfxItemSet wesentlich vereinfacht. Insbesondere wird die Typpr"ufung
@@ -1023,15 +1023,15 @@ const SfxPoolItem& SfxItemSet::Get( USHORT nWhich, BOOL bSrchInParent) const
 #endif
                         return **ppFnd;
                     }
-                    break;          // dann beim Parent suchen
+                    break; 			// dann beim Parent suchen
                 }
                 ppFnd += *(pPtr+1) - *pPtr + 1;
                 pPtr += 2;
             }
         }
 // bis zum Ende vom Such-Bereich: was nun ? zum Parent, oder Default ??
-//      if( !*pPtr )            // bis zum Ende vom Such-Bereich ?
-//      break;
+//		if( !*pPtr )			// bis zum Ende vom Such-Bereich ?
+//		break;
     } while( bSrchInParent && 0 != ( pAktSet = pAktSet->_pParent ));
 
     // dann das Default vom Pool holen und returnen
@@ -1073,13 +1073,13 @@ void SfxItemSet::Intersect( const SfxItemSet& rSet )
 {
     DBG_CHKTHIS(SfxItemSet, DbgCheckItemSet);
     DBG_ASSERT(_pPool, "nicht implementiert ohne Pool");
-    if( !Count() )       // gar keine gesetzt ?
+    if( !Count() )		 // gar keine gesetzt ?
         return;
 
     // loesche alle Items, die im rSet nicht mehr vorhanden sind
     if( !rSet.Count() )
     {
-        ClearItem();        // alles loeschen
+        ClearItem();		// alles loeschen
         return;
     }
 
@@ -1099,7 +1099,7 @@ void SfxItemSet::Intersect( const SfxItemSet& rSet )
         if( n & 1 )
             nSize += ( *(pWh1) - *(pWh1-1) ) + 1;
     }
-    bEqual = *pWh1 == *pWh2;        // auch die 0 abpruefen
+    bEqual = *pWh1 == *pWh2;		// auch die 0 abpruefen
 
     // sind die Bereiche identisch, ist es einfacher zu handhaben !
     if( bEqual )
@@ -1138,7 +1138,7 @@ void SfxItemSet::Intersect( const SfxItemSet& rSet )
                                 ? GetWhichByPos( aIter.GetCurPos() )
                                 : pItem->Which();
             if( 0 == rSet.GetItemState( nWhich, FALSE ) )
-                ClearItem( nWhich );        // loeschen
+                ClearItem( nWhich );		// loeschen
             if( aIter.IsAtEnd() )
                 break;
             pItem = aIter.NextItem();
@@ -1170,7 +1170,7 @@ void SfxItemSet::Differentiate( const SfxItemSet& rSet )
         if( n & 1 )
             nSize += ( *(pWh1) - *(pWh1-1) ) + 1;
     }
-    bEqual = *pWh1 == *pWh2;        // auch die 0 abpruefen
+    bEqual = *pWh1 == *pWh2;		// auch die 0 abpruefen
 
     // sind die Bereiche identisch, ist es einfacher zu handhaben !
     if( bEqual )
@@ -1209,7 +1209,7 @@ void SfxItemSet::Differentiate( const SfxItemSet& rSet )
                                 ? GetWhichByPos( aIter.GetCurPos() )
                                 : pItem->Which();
             if( SFX_ITEM_SET == rSet.GetItemState( nWhich, FALSE ) )
-                ClearItem( nWhich );        // loeschen
+                ClearItem( nWhich );		// loeschen
             if( aIter.IsAtEnd() )
                 break;
             pItem = aIter.NextItem();
@@ -1237,7 +1237,7 @@ default     default     ==      FALSE           -           -           -
 dontcare    default     ==      FALSE           -           -           -
 unknown     default     ==      FALSE           -           -           -
 set         dontcare    ==      FALSE           1.-Item     -1          -
-default     dontcare    ==      FALSE           -           -1          -
+default 	dontcare	==		FALSE			-			-1			-
 dontcare    dontcare    ==      FALSE           -           -           -
 unknown     dontcare    ==      FALSE           -           -           -
 set         unknown     ==      FALSE           1.-Item     -1          -
@@ -1263,7 +1263,7 @@ dontcare    unknown     !=      FALSE           -           -           -
 unknown     unknown     !=      FALSE           -           -           -
 
 set         set         ==      TRUE            -           -           -
-default     set         ==      TRUE            -           2.-Item     2.-Item
+default 	set 		==		TRUE			-			2.-Item 	2.-Item
 dontcare    set         ==      TRUE            -           -           -
 unknown     set         ==      TRUE            -           -           -
 set         default     ==      TRUE            -           -           -
@@ -1271,7 +1271,7 @@ default     default     ==      TRUE            -           -           -
 dontcare    default     ==      TRUE            -           -           -
 unknown     default     ==      TRUE            -           -           -
 set         dontcare    ==      TRUE            -           -           -
-default     dontcare    ==      TRUE            -           -1          -
+default 	dontcare	==		TRUE			-			-1			-
 dontcare    dontcare    ==      TRUE            -           -           -
 unknown     dontcare    ==      TRUE            -           -           -
 set         unknown     ==      TRUE            -           -           -
@@ -1281,7 +1281,7 @@ unknown     unknown     ==      TRUE            -           -           -
 
 set         set         !=      TRUE            1.-Item     -1          -
 default     set         !=      TRUE            -           2.-Item     2.-Item
-dontcare    set         !=      TRUE            -           -           -
+dontcare	set 		!=		TRUE			-			-			-
 unknown     set         !=      TRUE            -           -           -
 set         default     !=      TRUE            -           -           -
 default     default     !=      TRUE            -           -           -
@@ -1345,7 +1345,7 @@ static void MergeItem_Impl( SfxItemPool *_pPool, USHORT &rCount,
                  **ppFnd1 != _pPool->GetDefaultItem( (*ppFnd1)->Which()) )
             {
                 // Entscheidungstabelle: set, dontcare, egal, FALSE
-                // oder:                 set, dontcare, !=, TRUE
+                // oder:				 set, dontcare, !=, TRUE
                 _pPool->Remove( **ppFnd1 );
                 *ppFnd1 = (SfxPoolItem*) -1;
             }
@@ -1457,9 +1457,9 @@ void SfxItemSet::InvalidateItem( USHORT nWhich )
             // in diesem Bereich
             ppFnd += nWhich - *pPtr;
 
-            if( *ppFnd )    // bei mir gesetzt
+            if( *ppFnd )   	// bei mir gesetzt
             {
-                if( (SfxPoolItem*)-1 != *ppFnd )        // noch nicht dontcare !
+                if( (SfxPoolItem*)-1 != *ppFnd )		// noch nicht dontcare !
                 {
                     _pPool->Remove( **ppFnd );
                     *ppFnd = (SfxPoolItem*)-1;
@@ -1500,18 +1500,18 @@ USHORT SfxItemSet::GetWhichByPos( USHORT nPos ) const
 
 SvStream &SfxItemSet::Store
 (
-    SvStream&   rStream,        // Zielstream f"ur normale Items
-    FASTBOOL    bDirect         // TRUE: Items direkt speicher, FALSE: Surrogate
-)   const
+    SvStream&	rStream,		// Zielstream f"ur normale Items
+    FASTBOOL	bDirect 		// TRUE: Items direkt speicher, FALSE: Surrogate
+)	const
 
-/*  [Beschreibung]
+/*	[Beschreibung]
 
     Speichert die <SfxItemSet>-Instanz in den angegebenen Stream. Dabei
     werden die Surrorage der gesetzten <SfxPoolItem>s bzw. ('bDirect==TRUE')
     die gesetzten Items selbst wie folgt im Stream abgelegt:
 
-            USHORT              (Count) Anzahl der gesetzten Items
-    Count*  _pPool->StoreItem()  siehe <SfxItemPool::StoreItem()const>
+            USHORT				(Count) Anzahl der gesetzten Items
+    Count*	_pPool->StoreItem()  siehe <SfxItemPool::StoreItem()const>
 
 
     [Querverweise]
@@ -1566,20 +1566,20 @@ SvStream &SfxItemSet::Store
 
 SvStream &SfxItemSet::Load
 (
-    SvStream&           rStream,    //  Stream, aus dem geladen werden soll
+    SvStream&			rStream,	//	Stream, aus dem geladen werden soll
 
-    FASTBOOL            bDirect,    /*  TRUE
+    FASTBOOL			bDirect,	/*	TRUE
                                         Items werden direkt aus dem Stream
                                         gelesen, nicht "uber Surrogate
 
                                         FALSE (default)
                                         Items werden "uber Surrogate gelesen */
 
-    const SfxItemPool*  pRefPool    /*  Pool, der die Surrogate aufl"osen kann
+    const SfxItemPool*	pRefPool 	/*	Pool, der die Surrogate aufl"osen kann
                                         (z.B. zum Einf"ugen von Dokumenten) */
 )
 
-/*  [Beschreibung]
+/*	[Beschreibung]
 
     Diese Methode l"adt ein <SfxItemSet> aus einem Stream. Falls der
     <SfxItemPool> ohne Ref-Counts geladen wurde, werden die geladenen
@@ -1641,7 +1641,7 @@ SvStream &SfxItemSet::Load
 
 // -----------------------------------------------------------------------
 
-int SfxItemSet::operator==(const SfxItemSet &rCmp) const
+int	SfxItemSet::operator==(const SfxItemSet &rCmp) const
 {
     DBG_CHKTHIS(SfxItemSet, DbgCheckItemSet);
     DBG_CHKOBJ(&rCmp, SfxItemSet, DbgCheckItemSet);
@@ -1739,7 +1739,7 @@ SfxItemSet *SfxItemSet::Clone(BOOL bItems, SfxItemPool *pToPool ) const
 
 // -----------------------------------------------------------------------
 
-int SfxItemSet::PutDirect(const SfxPoolItem &rItem)
+int	SfxItemSet::PutDirect(const SfxPoolItem &rItem)
 {
     DBG_CHKTHIS(SfxItemSet, DbgCheckItemSet);
     SfxItemArray ppFnd = _aItems;
@@ -1756,10 +1756,10 @@ int SfxItemSet::PutDirect(const SfxPoolItem &rItem)
             // in diesem Bereich
             ppFnd += nWhich - *pPtr;
             const SfxPoolItem* pOld = *ppFnd;
-            if( pOld )      // schon einer vorhanden
+            if( pOld )		// schon einer vorhanden
             {
                 if( rItem == **ppFnd )
-                    return FALSE;       // schon vorhanden !
+                    return FALSE;		// schon vorhanden !
                 _pPool->Remove( *pOld );
             }
             else
@@ -1786,7 +1786,7 @@ int SfxItemSet::PutDirect(const SfxPoolItem &rItem)
 // -----------------------------------------------------------------------
 
 SfxAllItemSet::SfxAllItemSet( SfxItemPool &rPool )
-:   SfxItemSet(rPool, (const USHORT*) 0),
+:	SfxItemSet(rPool, (const USHORT*) 0),
     aDefault(0),
     nFree(nInitCount)
 {
@@ -1817,7 +1817,7 @@ SfxAllItemSet::SfxAllItemSet(const SfxAllItemSet &rCopy)
 :   SfxItemSet(rCopy),
     aDefault(0),
     nFree(0)
-/*  [Anmerkung]
+/*	[Anmerkung]
 
     Der mu\s sein, da sonst vom Compiler einer generiert wird, er nimmt
     nicht den Ctor mit der 'const SfxItemSet&'!
@@ -1830,7 +1830,7 @@ SfxAllItemSet::SfxAllItemSet(const SfxAllItemSet &rCopy)
 static USHORT *AddRanges_Impl(
     USHORT *pUS, std::ptrdiff_t nOldSize, USHORT nIncr)
 
-/*  Diese interne Funktion erzeugt ein neues Which-Range-Array, welches von
+/* 	Diese interne Funktion erzeugt ein neues Which-Range-Array, welches von
     dem 'nOldSize'-USHORTs langen 'pUS' kopiert wird und hinten an Platz
     f"ur 'nIncr' neue USHORTs hat. Das terminierende USHORT mit der '0'
     wird weder in 'nOldSize' noch in 'nIncr' mitgez"ahlt, sondern implizit
@@ -2021,7 +2021,7 @@ const SfxPoolItem* SfxAllItemSet::Put( const SfxPoolItem& rItem, USHORT nWhich )
 // -----------------------------------------------------------------------
 
 
-/*  Diese Methode wird forwarded, damit sie nicht durch die anderen
+/*	Diese Methode wird forwarded, damit sie nicht durch die anderen
     Put-Methoden dieser SubClass gehided wird.
 */
 
@@ -2098,7 +2098,7 @@ BOOL SfxAllItemSet::Remove(USHORT nWhich)
             }
             memmove(_aItems + nPos +1, _aItems + nPos,
                     sizeof(SfxPoolItem *) * (nRest - 1));
-            break;          // dann beim Parent suchen
+            break; 			// dann beim Parent suchen
         }
         nPos += *(pPtr+1) - *pPtr + 1;
         pPtr += 2;
diff --git a/svl/source/items/lckbitem.cxx b/svl/source/items/lckbitem.cxx
index f1845fc251ee..5bfddc6c10f8 100644
--- a/svl/source/items/lckbitem.cxx
+++ b/svl/source/items/lckbitem.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
@@ -51,7 +51,7 @@ SfxLockBytesItem::SfxLockBytesItem()
 // -----------------------------------------------------------------------
 
 SfxLockBytesItem::SfxLockBytesItem( USHORT nW, SvLockBytes *pLockBytes )
-:   SfxPoolItem( nW ),
+:	SfxPoolItem( nW ),
     _xVal( pLockBytes )
 {
 }
@@ -59,7 +59,7 @@ SfxLockBytesItem::SfxLockBytesItem( USHORT nW, SvLockBytes *pLockBytes )
 // -----------------------------------------------------------------------
 
 SfxLockBytesItem::SfxLockBytesItem( USHORT nW, SvStream &rStream )
-:   SfxPoolItem( nW )
+:	SfxPoolItem( nW )
 {
     rStream.Seek( 0L );
     _xVal = new SvLockBytes( new SvCacheStream(), TRUE );
@@ -71,7 +71,7 @@ SfxLockBytesItem::SfxLockBytesItem( USHORT nW, SvStream &rStream )
 // -----------------------------------------------------------------------
 
 SfxLockBytesItem::SfxLockBytesItem( const SfxLockBytesItem& rItem )
-:   SfxPoolItem( rItem ),
+:	SfxPoolItem( rItem ),
     _xVal( rItem._xVal )
 {
 }
@@ -98,7 +98,7 @@ SfxPoolItem* SfxLockBytesItem::Clone(SfxItemPool *) const
 
 // -----------------------------------------------------------------------
 
-#define MAX_BUF 32000
+#define MAX_BUF	32000
 
 SfxPoolItem* SfxLockBytesItem::Create( SvStream &rStream, USHORT ) const
 {
diff --git a/svl/source/items/macitem.cxx b/svl/source/items/macitem.cxx
index acaa66839981..fa177502021c 100644
--- a/svl/source/items/macitem.cxx
+++ b/svl/source/items/macitem.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
@@ -210,7 +210,7 @@ int SvxMacroItem::operator==( const SfxPoolItem& rAttr ) const
     {
         const SvxMacro *pOwnMac = rOwn.GetObject(nNo);
         const SvxMacro *pOtherMac = rOther.GetObject(nNo);
-        if (    rOwn.GetKey(pOwnMac) != rOther.GetKey(pOtherMac)  ||
+        if ( 	rOwn.GetKey(pOwnMac) != rOther.GetKey(pOtherMac)  ||
                 pOwnMac->GetLibName() != pOtherMac->GetLibName() ||
                 pOwnMac->GetMacName() != pOtherMac->GetMacName() )
             return FALSE;
@@ -231,11 +231,11 @@ SfxPoolItem* SvxMacroItem::Clone( SfxItemPool* ) const
 SfxItemPresentation SvxMacroItem::GetPresentation
 (
     SfxItemPresentation /*ePres*/,
-    SfxMapUnit          /*eCoreUnit*/,
-    SfxMapUnit          /*ePresUnit*/,
-    XubString&          rText,
+    SfxMapUnit			/*eCoreUnit*/,
+    SfxMapUnit			/*ePresUnit*/,
+    XubString& 			rText,
     const IntlWrapper *
-)   const
+)	const
 {
 /*!!!
     SvxMacroTableDtor& rTbl = (SvxMacroTableDtor&)GetMacroTable();
diff --git a/svl/source/items/nranges.cxx b/svl/source/items/nranges.cxx
index 813c1fec8ebd..8e3b20332fd1 100644
--- a/svl/source/items/nranges.cxx
+++ b/svl/source/items/nranges.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
@@ -34,7 +34,7 @@
 
 #ifdef DBG_UTIL
 
-#define DBG_CHECK_RANGES(NUMTYPE, pArr)                                 \
+#define DBG_CHECK_RANGES(NUMTYPE, pArr)									\
     for ( const NUMTYPE *pRange = pArr; *pRange; pRange += 2 )          \
     {                                                                   \
         DBG_ASSERT( pRange[0] <= pRange[1], "ranges must be sorted" );  \
@@ -61,7 +61,7 @@ inline void Swap_Impl(const NUMTYPE *& rp1, const NUMTYPE *& rp2)
 NUMTYPE InitializeRanges_Impl( NUMTYPE *&rpRanges, va_list pArgs,
                                NUMTYPE nWh1, NUMTYPE nWh2, NUMTYPE nNull )
 
-/** <H3>Description</H3>
+/**	<H3>Description</H3>
 
     Creates an USHORT-ranges-array in 'rpRanges' using 'nWh1' and 'nWh2' as
     first range, 'nNull' as terminator or start of 2nd range and 'pArgs' as
@@ -86,7 +86,7 @@ NUMTYPE InitializeRanges_Impl( NUMTYPE *&rpRanges, va_list pArgs,
                   va_arg( pArgs, NUMTYPE_ARG ) ) ) )
     {
         aNumArr.Insert( nIns, nCnt++ );
-        if ( 0 == (nCnt & 1) )       // 4,6,8, usw.
+        if ( 0 == (nCnt & 1) )		 // 4,6,8, usw.
         {
             DBG_ASSERT( aNumArr[ nCnt-2 ] <= nIns, "Ungueltiger Bereich" );
             nSize += nIns - aNumArr[ nCnt-2 ] + 1;
@@ -108,7 +108,7 @@ NUMTYPE InitializeRanges_Impl( NUMTYPE *&rpRanges, va_list pArgs,
 
 NUMTYPE Count_Impl( const NUMTYPE *pRanges )
 
-/** <H3>Description</H3>
+/**	<H3>Description</H3>
 
     Determines the number of NUMTYPEs in an 0-terminated array of pairs of
     NUMTYPEs. The terminating 0 is not included in the count.
@@ -128,7 +128,7 @@ NUMTYPE Count_Impl( const NUMTYPE *pRanges )
 
 NUMTYPE Capacity_Impl( const NUMTYPE *pRanges )
 
-/** <H3>Description</H3>
+/**	<H3>Description</H3>
 
     Determines the total number of NUMTYPEs described in an 0-terminated
     array of pairs of NUMTYPEs, each representing an range of NUMTYPEs.
@@ -152,7 +152,7 @@ NUMTYPE Capacity_Impl( const NUMTYPE *pRanges )
 
 SfxNumRanges::SfxNumRanges( const SfxNumRanges &rOrig )
 
-/** <H3>Description</H3>
+/**	<H3>Description</H3>
 
     Copy-Ctor.
 */
@@ -172,7 +172,7 @@ SfxNumRanges::SfxNumRanges( const SfxNumRanges &rOrig )
 
 SfxNumRanges::SfxNumRanges( NUMTYPE nWhich1, NUMTYPE nWhich2 )
 
-/** <H3>Description</H3>
+/**	<H3>Description</H3>
 
     Constructs an SfxNumRanges-instance from one range of NUMTYPEs.
 
@@ -191,7 +191,7 @@ SfxNumRanges::SfxNumRanges( NUMTYPE nWhich1, NUMTYPE nWhich2 )
 
 SfxNumRanges::SfxNumRanges( NUMTYPE_ARG nWh0, NUMTYPE_ARG nWh1, NUMTYPE_ARG nNull, ... )
 
-/** <H3>Description</H3>
+/**	<H3>Description</H3>
 
     Constructs an SfxNumRanges-instance from more than one sorted ranges of
     NUMTYPEs terminated with one 0.
@@ -214,7 +214,7 @@ SfxNumRanges::SfxNumRanges( NUMTYPE_ARG nWh0, NUMTYPE_ARG nWh1, NUMTYPE_ARG nNul
 
 SfxNumRanges::SfxNumRanges( const NUMTYPE* pArr )
 
-/** <H3>Description</H3>
+/**	<H3>Description</H3>
 
     Constcurts an SfxNumRanges-instance from an sorted ranges of NUMTYPEs,
     terminates with on 0.
@@ -268,7 +268,7 @@ SfxNumRanges& SfxNumRanges::operator =
     const SfxNumRanges &rRanges
 )
 
-/** <H3>Description</H3>
+/**	<H3>Description</H3>
 
     Assigns ranges from 'rRanges' to '*this'.
 */
@@ -300,7 +300,7 @@ SfxNumRanges& SfxNumRanges::operator +=
     const SfxNumRanges &rRanges
 )
 
-/** <H3>Description</H3>
+/**	<H3>Description</H3>
 
     Merges *this with 'rRanges'.
 
@@ -460,7 +460,7 @@ SfxNumRanges& SfxNumRanges::operator -=
     const SfxNumRanges &rRanges
 )
 
-/** <H3>Description</H3>
+/**	<H3>Description</H3>
 
     Removes 'rRanges' from '*this'.
 
@@ -486,10 +486,10 @@ SfxNumRanges& SfxNumRanges::operator -=
     NUMTYPE nPos1 = 0, nPos2 = 0, nTargetPos = 0;
     while( _pRanges[ nPos1 ] )
     {
-        NUMTYPE l1 = _pRanges[ nPos1 ];      // lower bound of interval 1
-        NUMTYPE u1 = _pRanges[ nPos1+1 ];    // upper bound of interval 1
-        NUMTYPE l2 = rRanges._pRanges[ nPos2 ];      // lower bound of interval 2
-        NUMTYPE u2 = rRanges._pRanges[ nPos2+1 ];    // upper bound of interval 2
+        NUMTYPE l1 = _pRanges[ nPos1 ]; 	 // lower bound of interval 1
+        NUMTYPE u1 = _pRanges[ nPos1+1 ];	 // upper bound of interval 1
+        NUMTYPE l2 = rRanges._pRanges[ nPos2 ]; 	 // lower bound of interval 2
+        NUMTYPE u2 = rRanges._pRanges[ nPos2+1 ];	 // upper bound of interval 2
 
         // boundary cases
         // * subtrahend is empty -> copy the minuend
@@ -661,7 +661,7 @@ SfxNumRanges& SfxNumRanges::operator /=
     const SfxNumRanges &rRanges
 )
 
-/** <H3>Description</H3>
+/**	<H3>Description</H3>
 
     Determines intersection of '*this' with 'rRanges'.
 
@@ -696,10 +696,10 @@ SfxNumRanges& SfxNumRanges::operator /=
     NUMTYPE nPos1 = 0, nPos2 = 0, nTargetPos = 0;
     while( _pRanges[ nPos1 ] != 0 && rRanges._pRanges[ nPos2 ] != 0 )
     {
-        NUMTYPE l1 = _pRanges[ nPos1 ];      // lower bound of interval 1
-        NUMTYPE u1 = _pRanges[ nPos1+1 ];    // upper bound of interval 1
-        NUMTYPE l2 = rRanges._pRanges[ nPos2 ];      // lower bound of interval 2
-        NUMTYPE u2 = rRanges._pRanges[ nPos2+1 ];    // upper bound of interval 2
+        NUMTYPE l1 = _pRanges[ nPos1 ]; 	 // lower bound of interval 1
+        NUMTYPE u1 = _pRanges[ nPos1+1 ];	 // upper bound of interval 1
+        NUMTYPE l2 = rRanges._pRanges[ nPos2 ]; 	 // lower bound of interval 2
+        NUMTYPE u2 = rRanges._pRanges[ nPos2+1 ];	 // upper bound of interval 2
 
         if( u1 < l2 )
         {
@@ -778,7 +778,7 @@ SfxNumRanges& SfxNumRanges::operator /=
 
 BOOL SfxNumRanges::Intersects( const SfxNumRanges &rRanges ) const
 
-/** <H3>Description</H3>
+/**	<H3>Description</H3>
 
     Determines if at least one range in 'rRanges' intersects with one
     range in '*this'.
@@ -822,7 +822,7 @@ BOOL SfxNumRanges::Intersects( const SfxNumRanges &rRanges ) const
 
 NUMTYPE SfxNumRanges::Count() const
 
-/** <H3>Description</H3>
+/**	<H3>Description</H3>
 
     Determines the number of USHORTs in the set described by the ranges
     of USHORTs in '*this'.
@@ -836,7 +836,7 @@ NUMTYPE SfxNumRanges::Count() const
 
 BOOL SfxNumRanges::Contains( NUMTYPE n ) const
 
-/** <H3>Description</H3>
+/**	<H3>Description</H3>
 
     Determines if '*this' contains 'n'.
 */
diff --git a/svl/source/items/poolcach.cxx b/svl/source/items/poolcach.cxx
index b918add10f0f..74172eaa08f3 100644
--- a/svl/source/items/poolcach.cxx
+++ b/svl/source/items/poolcach.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
@@ -47,7 +47,7 @@ DBG_NAME(SfxItemPoolCache)
 struct SfxItemModifyImpl
 {
     const SfxSetItem  *pOrigItem;
-    SfxSetItem        *pPoolItem;
+    SfxSetItem		  *pPoolItem;
 };
 
 SV_DECL_VARARR( SfxItemModifyArr_Impl, SfxItemModifyImpl, 8, 8 )
@@ -114,7 +114,7 @@ const SfxSetItem& SfxItemPoolCache::ApplyTo( const SfxSetItem &rOrigItem, BOOL b
             {
                 rMapEntry.pPoolItem->AddRef(2); // einen davon fuer den Cache
                 if ( bNew )
-                    pPool->Put( rOrigItem );    //! AddRef??
+                    pPool->Put( rOrigItem );	//! AddRef??
             }
             return *rMapEntry.pPoolItem;
         }
@@ -137,7 +137,7 @@ const SfxSetItem& SfxItemPoolCache::ApplyTo( const SfxSetItem &rOrigItem, BOOL b
     // Refernzzaehler anpassen, je einen davon fuer den Cache
     pNewPoolItem->AddRef( pNewPoolItem != &rOrigItem ? 2 : 1 );
     if ( bNew )
-        pPool->Put( rOrigItem );    //! AddRef??
+        pPool->Put( rOrigItem );	//! AddRef??
 
     // die Transformation im Cache eintragen
     SfxItemModifyImpl aModify;
diff --git a/svl/source/items/poolio.cxx b/svl/source/items/poolio.cxx
index 6aeb64d76d1a..ac437ff082f5 100644
--- a/svl/source/items/poolio.cxx
+++ b/svl/source/items/poolio.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
@@ -50,7 +50,7 @@ DBG_NAME(SfxItemPool);
 
 void SfxItemPool::SetStoringPool( const SfxItemPool *pStoringPool )
 
-/*  [Beschreibung]
+/*	[Beschreibung]
 
     Diese Methode setzt den <SfxItemPool>, der gerade gespeichert wird.
     Sie sollte nur in Notf"allen verwendet werden, um z.B. File-Format-
@@ -71,7 +71,7 @@ void SfxItemPool::SetStoringPool( const SfxItemPool *pStoringPool )
 
 const SfxItemPool* SfxItemPool::GetStoringPool()
 
-/*  [Beschreibung]
+/*	[Beschreibung]
 
     Diese Methode liefert den <SfxItemPool>, der gerade gespeichert wird.
     Sie sollte nur in Notf"allen verwendet werden, um z.B. File-Format-
@@ -88,7 +88,7 @@ const SfxItemPool* SfxItemPool::GetStoringPool()
 
 SvStream &SfxItemPool::Store(SvStream &rStream) const
 
-/*  [Beschreibung]
+/*	[Beschreibung]
 
     Der SfxItemPool wird inklusive aller seiner Sekund"arpools mit
     Pool-Defaults und gepoolten Items in dem angegebenen Stream gespeichert.
@@ -98,45 +98,45 @@ SvStream &SfxItemPool::Store(SvStream &rStream) const
     [Fileformat]
 
     ;zun"achst ein Kompatiblit"ats-Header-Block
-    Start:      0x1111  SFX_ITEMPOOL_TAG_STARTPOOLS(_4/_5)
-                BYTE    MAJOR_VER                   ;SfxItemPool-Version
-                BYTE    MINOR_VER                   ;"
-                0xFFFF  SFX_ITEMPOOL_TAG_TRICK4OLD  ;ex. GetVersion()
-                USHORT  0x0000                      ;Pseudo-StyleSheetPool
-                USHORT  0x0000                      ;Pseudo-StyleSheetPool
+    Start:		0x1111	SFX_ITEMPOOL_TAG_STARTPOOLS(_4/_5)
+                BYTE	MAJOR_VER					;SfxItemPool-Version
+                BYTE	MINOR_VER					;"
+                0xFFFF	SFX_ITEMPOOL_TAG_TRICK4OLD  ;ex. GetVersion()
+                USHORT	0x0000						;Pseudo-StyleSheetPool
+                USHORT	0x0000						;Pseudo-StyleSheetPool
 
     ;den ganzen Pool in einen Record
-                record  SfxMiniRecod(SFX_ITEMPOOL_REC)
+                record	SfxMiniRecod(SFX_ITEMPOOL_REC)
 
     ;je ein Header vorweg
-    Header:     record      SfxMiniRecord(SFX_ITEMPOOL_REC_HEADER)
-                USHORT          GetVersion()            ;Which-Ranges etc.
-                String          GetName()               ;Pool-Name
+    Header:		record  	SfxMiniRecord(SFX_ITEMPOOL_REC_HEADER)
+                USHORT			GetVersion()			;Which-Ranges etc.
+                String			GetName()				;Pool-Name
 
     ;die Versions-Map, um WhichIds neuer File-Versionen mappen zu k"onnen
-    Versions:   record      SfxMultiRecord(SFX_ITEMPOOL_REC_VERSIONS, 0)
-                USHORT          OldVersion
-                USHORT          OldStartWhich
-                USHORT          OldEndWhich
+    Versions:	record	    SfxMultiRecord(SFX_ITEMPOOL_REC_VERSIONS, 0)
+                USHORT			OldVersion
+                USHORT			OldStartWhich
+                USHORT			OldEndWhich
                 USHORT[]        NewWhich (OldEndWhich-OldStartWhich+1)
 
     ;jetzt die gepoolten Items (zuerst nicht-SfxSetItems)
-    Items:      record      SfxMultiRecord(SFX_ITEMPOOL_REC_WHICHIDS, 0)
-                content         SlotId, 0
-                USHORT          WhichId
-                USHORT          pItem->GetVersion()
-                USHORT          Array-Size
-                record          SfxMultiRecord(SFX_, 0)
-                content             Surrogate
-                USHORT              RefCount
-                unknown             pItem->Store()
+    Items:  	record      SfxMultiRecord(SFX_ITEMPOOL_REC_WHICHIDS, 0)
+                content 		SlotId, 0
+                USHORT			WhichId
+                USHORT			pItem->GetVersion()
+                USHORT			Array-Size
+                record			SfxMultiRecord(SFX_, 0)
+                content				Surrogate
+                USHORT				RefCount
+                unknown 			pItem->Store()
 
     ;jetzt die gesetzten Pool-Defaults
-    Defaults:   record      SfxMultiRecord(SFX_ITEMPOOL_REC_DEFAULTS, 0)
-                content         SlotId, 0
-                USHORT          WhichId
-                USHORT          pPoolDef->GetVersion()
-                unknown         pPoolDef->Store();
+    Defaults:	record	    SfxMultiRecord(SFX_ITEMPOOL_REC_DEFAULTS, 0)
+                content			SlotId, 0
+                USHORT			WhichId
+                USHORT			pPoolDef->GetVersion()
+                unknown			pPoolDef->Store();
 
     ;dahinter folgt ggf. der Secondary ohne Kompatiblit"ats-Header-Block
 */
@@ -319,7 +319,7 @@ SvStream &SfxItemPool::Store(SvStream &rStream) const
 
 void SfxItemPool::LoadCompleted()
 
-/*  [Beschreibung]
+/*	[Beschreibung]
 
     Wurde der SfxItemPool mit 'bRefCounts' == FALSE geladen, mu\s das
     Laden der Dokumentinhalte mit einem Aufruf dieser Methode beendet
@@ -646,9 +646,9 @@ SvStream &SfxItemPool::Load(SvStream &rStream)
             rStream >> nVersion;
             rStream >> nCount;
             //!SFX_ASSERTWARNING( !nSlotId || !HasMap() ||
-            //!         ( nSlotId == GetSlotId( nWhich, FALSE ) ) ||
-            //!         !GetSlotId( nWhich, FALSE ),
-            //!         nWhich, "Slot/Which mismatch" );
+            //!			( nSlotId == GetSlotId( nWhich, FALSE ) ) ||
+            //!			!GetSlotId( nWhich, FALSE ),
+            //!			nWhich, "Slot/Which mismatch" );
 
             USHORT nIndex = GetIndex_Impl(nWhich);
             SfxPoolItemArray_Impl **ppArr = pImp->ppPoolItems + nIndex;
@@ -698,7 +698,7 @@ SvStream &SfxItemPool::Load(SvStream &rStream)
 
             rStream >> nVersion;
             //!SFX_ASSERTWARNING( !HasMap() || ( nSlotId == GetSlotId( nWhich, FALSE ) ),
-            //!         nWhich, "Slot/Which mismatch" );
+            //!			nWhich, "Slot/Which mismatch" );
 
             // Pool-Default-Item selbst laden
             SfxPoolItem *pItem =
@@ -843,9 +843,9 @@ SvStream &SfxItemPool::Load1_Impl(SvStream &rStream)
                 nWhich = nMappedWhich;
 
             //!SFX_ASSERTWARNING( !nSlot || !HasMap() ||
-            //!         ( nSlot == GetSlotId( nWhich, FALSE ) ) ||
-            //!         !GetSlotId( nWhich, FALSE ),
-            //!         nWhich, "Slot/Which mismatch" );
+            //!			( nSlot == GetSlotId( nWhich, FALSE ) ) ||
+            //!			!GetSlotId( nWhich, FALSE ),
+            //!			nWhich, "Slot/Which mismatch" );
 
             USHORT nIndex = GetIndex_Impl(nWhich);
             ppArr = pImp->ppPoolItems + nIndex;
@@ -1028,13 +1028,13 @@ SvStream &SfxItemPool::Load1_Impl(SvStream &rStream)
 
 const SfxPoolItem* SfxItemPool::LoadSurrogate
 (
-    SvStream&           rStream,    // vor einem Surrogat positionierter Stream
-    USHORT&             rWhich,     // Which-Id des zu ladenden <SfxPoolItem>s
-    USHORT              nSlotId,    // Slot-Id des zu ladenden <SfxPoolItem>s
-    const SfxItemPool*  pRefPool    // <SfxItemPool> in dem das Surrogat gilt
+    SvStream&			rStream,	// vor einem Surrogat positionierter Stream
+    USHORT& 			rWhich, 	// Which-Id des zu ladenden <SfxPoolItem>s
+    USHORT				nSlotId,	// Slot-Id des zu ladenden <SfxPoolItem>s
+    const SfxItemPool*	pRefPool	// <SfxItemPool> in dem das Surrogat gilt
 )
 
-/*  [Beschreibung]
+/*	[Beschreibung]
 
     L"adt Surrogat aus 'rStream' und liefert das dadurch in 'rRefPool'
     repr"asentierte SfxPoolItem zu"ruck. Ist das im Stream befindliche
@@ -1051,14 +1051,14 @@ const SfxPoolItem* SfxItemPool::LoadSurrogate
     nicht in eine Which-Id dieses Pools gemappt werden, wird ebenfalls 0
     zur"uckgeliefert.
 
-    Preconditions:  - Pool mu\s geladen sein
+    Preconditions:	- Pool mu\s geladen sein
                     - LoadCompleted darf noch nicht gerufen worden sein
                     - 'rStream' steht genau an der Position, an der ein
                       Surrogat f"ur ein Item mit der SlotId 'nSlotId' und
                       der WhichId 'rWhichId' mit StoreSurrogate gepeichert
                       wurde
 
-    Postconditions: - 'rStream' ist so positioniert, wie auch StoreSurrogate
+    Postconditions:	- 'rStream' ist so positioniert, wie auch StoreSurrogate
                       sein speichern beendet hatte
                     - konnte ein Item geladen werden, befindet es sich
                       in diesem SfxItemPool
@@ -1155,18 +1155,18 @@ const SfxPoolItem* SfxItemPool::LoadSurrogate
 
 FASTBOOL SfxItemPool::StoreSurrogate
 (
-    SvStream&           rStream,
-    const SfxPoolItem*  pItem
-)   const
+    SvStream&			rStream,
+    const SfxPoolItem* 	pItem
+)	const
 
-/*  [Beschreibung]
+/*	[Beschreibung]
 
     Speichert ein Surrogat f"ur '*pItem' in 'rStream'.
 
 
     [R"uckgabewert]
 
-    FASTBOOL                TRUE
+    FASTBOOL				TRUE
                             es wurde ein echtes Surrogat gespeichert, auch
                             SFX_ITEMS_NULL bei 'pItem==0',
                             SFX_ITEMS_STATICDEFAULT und SFX_ITEMS_POOLDEFAULT
@@ -1237,7 +1237,7 @@ FASTBOOL SfxItemPool::IsInStoringRange( USHORT nWhich ) const
 
 void SfxItemPool::SetStoringRange( USHORT nFrom, USHORT nTo )
 
-/*  [Beschreibung]
+/*	[Beschreibung]
 
     Mit dieser Methode kann der Which-Bereich eingeengt werden, der
     von ItemSets dieses Pool (und dem Pool selbst) gespeichert wird.
@@ -1262,15 +1262,15 @@ void SfxItemPool::SetStoringRange( USHORT nFrom, USHORT nTo )
 
 void SfxItemPool::SetVersionMap
 (
-    USHORT  nVer,               /*  neue Versionsnummer */
+    USHORT 	nVer, 				/* 	neue Versionsnummer */
     USHORT  nOldStart,          /*  alte erste Which-Id */
     USHORT  nOldEnd,            /*  alte letzte Which-Id */
-    USHORT* pOldWhichIdTab      /*  Array mit genau dem Aufbau der Which-Ids
+    USHORT*	pOldWhichIdTab		/* 	Array mit genau dem Aufbau der Which-Ids
                                     der vorhergehenden Version, in denen
                                     die jeweils neue Which-Id steht. */
 )
 
-/*  [Beschreibung]
+/*	[Beschreibung]
 
     Mit dieser Methode k"onnen neue, inkompatible Which-Id-Folgen oder
     Verteilungen realisiert werden. Pools, die noch mit alten Versionen
@@ -1279,8 +1279,8 @@ void SfxItemPool::SetVersionMap
     unter Verlust neuer Attribute geladen werden, da die Map mit dem Pool
     gespeichert wird.
 
-    Precondition:   Pool darf noch nicht geladen sein
-    Postcondition:  Which-Ids aus fr"uheren Versionen k"onnen bei Laden auf
+    Precondition:	Pool darf noch nicht geladen sein
+    Postcondition:	Which-Ids aus fr"uheren Versionen k"onnen bei Laden auf
                     Version 'nVer' gemappt werden
     Laufzeit:       1.5 * new + 10
 
@@ -1353,10 +1353,10 @@ void SfxItemPool::SetVersionMap
 
 USHORT SfxItemPool::GetNewWhich
 (
-    USHORT  nFileWhich      // die aus dem Stream geladene Which-Id
-)   const
+    USHORT	nFileWhich		// die aus dem Stream geladene Which-Id
+)	const
 
-/*  [Beschreibung]
+/*	[Beschreibung]
 
     Diese Methoden rechnet Which-Ids aus einem File-Format in die der
     aktuellen Pool-Version um. Ist das File-Format "alter, werden die vom
@@ -1368,9 +1368,9 @@ USHORT SfxItemPool::GetNewWhich
     Die Berechnung ist nur f"ur Which-Ids definiert, die in der betreffenden
     File-Version unterst"utzt wurden. Dies ist per Assertion abgesichert.
 
-    Precondition:   Pool mu\s geladen sein
-    Postcondition:  unver"andert
-    Laufzeit:       linear(Anzahl der Sekund"arpools) +
+    Precondition:	Pool mu\s geladen sein
+    Postcondition:	unver"andert
+    Laufzeit:		linear(Anzahl der Sekund"arpools) +
                     linear(Differenz zwischen alter und neuer Version)
 
 
@@ -1402,7 +1402,7 @@ USHORT SfxItemPool::GetNewWhich
         {
             SfxPoolVersion_Impl *pVerInfo = pImp->aVersions[nMap-1];
             if ( pVerInfo->_nVer > pImp->nVersion )
-            {   USHORT nOfs;
+            {	USHORT nOfs;
                 USHORT nCount = pVerInfo->_nEnd - pVerInfo->_nStart + 1;
                 for ( nOfs = 0;
                       nOfs <= nCount &&
@@ -1453,14 +1453,14 @@ FASTBOOL SfxItemPool::IsInVersionsRange( USHORT nWhich ) const
 
 FASTBOOL SfxItemPool::IsCurrentVersionLoading() const
 
-/*  [Beschreibung]
+/*	[Beschreibung]
 
     Mit dieser Methode kann festgestellt werden, ob die geladene Pool-Version
     dem aktuellen Pool-Aufbau entspricht.
 
-    Precondition:   Pool mu\s geladen sein
-    Postcondition:  unver"andert
-    Laufzeit:       linear(Anzahl der Sekund"arpools)
+    Precondition:	Pool mu\s geladen sein
+    Postcondition:	unver"andert
+    Laufzeit:		linear(Anzahl der Sekund"arpools)
 
 
     [Querverweise]
@@ -1480,13 +1480,13 @@ FASTBOOL SfxItemPool::IsCurrentVersionLoading() const
 
 USHORT SfxItemPool::GetVersion() const
 
-/*  [Beschreibung]
+/*	[Beschreibung]
 
     Diese Methode liefert die aktuelle Versionsnummer des SfxItemPool-Aufbaus
     (also des Which-Bereichs).
 
-    Precondition:   keine
-    Postcondition:  unver"andert
+    Precondition:	keine
+    Postcondition:	unver"andert
     Laufzeit:       2
 
 
@@ -1512,13 +1512,13 @@ USHORT SfxItemPool::GetVersion() const
 
 USHORT SfxItemPool::GetLoadingVersion() const
 
-/*  [Beschreibung]
+/*	[Beschreibung]
 
     Diese Methode liefert die Versionsnummer des SfxItemPool-Aufbaus
     (also des Which-Bereichs), die bei Laden vorgefunden wurde.
 
-    Precondition:   Pool mu\s geladen sein
-    Postcondition:  unver"andert
+    Precondition:	Pool mu\s geladen sein
+    Postcondition:	unver"andert
     Laufzeit:       2
 
 
@@ -1553,7 +1553,7 @@ FASTBOOL SfxItemPool::IsVer2_Impl() const
 FASTBOOL SfxItemPool::StoreItem( SvStream &rStream, const SfxPoolItem &rItem,
                                  FASTBOOL bDirect ) const
 
-/*  [Beschreibung]
+/*	[Beschreibung]
 
     Speichert das <SfxPoolItem> 'rItem' in den <SvStream> 'rStream'
     entweder als Surrogat ('bDirect == FALSE') oder direkt mit 'rItem.Store()'.
@@ -1563,14 +1563,14 @@ FASTBOOL SfxItemPool::StoreItem( SvStream &rStream, const SfxPoolItem &rItem,
 
     Das Item wird im Stream wie folgt abgelegt:
 
-    USHORT  rItem.Which()
-    USHORT  GetSlotId( rItem.Which() ) bzw. 0 falls nicht verf"urbar
-    USHORT  GetSurrogate( &rItem ) bzw. SFX_ITEM_DIRECT bei '!SFX_ITEM_POOLBLE'
+    USHORT	rItem.Which()
+    USHORT	GetSlotId( rItem.Which() ) bzw. 0 falls nicht verf"urbar
+    USHORT	GetSurrogate( &rItem ) bzw. SFX_ITEM_DIRECT bei '!SFX_ITEM_POOLBLE'
 
     optional (falls 'bDirect == TRUE' oder '!rItem.IsPoolable()':
 
     USHORT  rItem.GetVersion()
-    ULONG   Size
+    ULONG 	Size
     Size    rItem.Store()
 
 
@@ -1601,7 +1601,7 @@ FASTBOOL SfxItemPool::StoreItem( SvStream &rStream, const SfxPoolItem &rItem,
     if ( bDirect || !pPool->StoreSurrogate( rStream, &rItem ) )
     {
         rStream << nItemVersion;
-        rStream << (UINT32) 0L;           // Platz fuer Laenge in Bytes
+        rStream << (UINT32) 0L; 		  // Platz fuer Laenge in Bytes
         ULONG nIStart = rStream.Tell();
         rItem.Store(rStream, nItemVersion);
         ULONG nIEnd = rStream.Tell();
diff --git a/svl/source/items/poolitem.cxx b/svl/source/items/poolitem.cxx
index 77cf3dfff014..c8d7962fa180 100644
--- a/svl/source/items/poolitem.cxx
+++ b/svl/source/items/poolitem.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
@@ -122,8 +122,8 @@ SfxPoolItem::SfxPoolItem( USHORT nW )
 
 // -----------------------------------------------------------------------
 SfxPoolItem::SfxPoolItem( const SfxPoolItem& rCpy )
-    : nRefCount( 0 ),               // wird ja ein neues Object!
-      nWhich( rCpy.Which() )    // Funktion rufen wg. ChkThis()
+    : nRefCount( 0 ),				// wird ja ein neues Object!
+      nWhich( rCpy.Which() )	// Funktion rufen wg. ChkThis()
       , nKind( 0 )
 {
     DBG_CTOR(SfxPoolItem, 0);
@@ -255,14 +255,14 @@ void SfxPoolItem::writeUnicodeString(SvStream & rStream,
 // ------------------------------------------------------------------------
 SfxItemPresentation SfxPoolItem::GetPresentation
 (
-    SfxItemPresentation /*ePresentation*/,       // IN:  wie formatiert werden soll
-    SfxMapUnit          /*eCoreMetric*/,         // IN:  Ma\seinheit des SfxPoolItems
-    SfxMapUnit          /*ePresentationMetric*/, // IN:  Wunsch-Ma\einheit der Darstellung
-    XubString&          /*rText*/,               // OUT: textuelle Darstellung
+    SfxItemPresentation	/*ePresentation*/,       // IN:  wie formatiert werden soll
+    SfxMapUnit			/*eCoreMetric*/,		 // IN:  Ma\seinheit des SfxPoolItems
+    SfxMapUnit			/*ePresentationMetric*/, // IN:  Wunsch-Ma\einheit der Darstellung
+    XubString&			/*rText*/,				 // OUT: textuelle Darstellung
     const IntlWrapper *
-)   const
+) 	const
 
-/*  [Beschreibung]
+/*	[Beschreibung]
 
     "Uber diese virtuelle Methode kann von den SfxPoolItem-Subklassen
     eine textuelle Datstellung des Wertes erhalten werden. Sie sollte
@@ -279,7 +279,7 @@ SfxItemPresentation SfxPoolItem::GetPresentation
 
     [R"uckgabewert]
 
-    SfxItemPresentation     SFX_ITEM_PRESENTATION_NONE
+    SfxItemPresentation		SFX_ITEM_PRESENTATION_NONE
                             es konnte keine Text-Darstellung erzeugt werden
 
                             SFX_ITEM_PRESENTATION_NAMELESS
@@ -340,12 +340,12 @@ rCmp
 // ------------------------------------------------------------------------
 SfxItemPresentation SfxVoidItem::GetPresentation
 (
-    SfxItemPresentation     /*ePresentation*/,
-    SfxMapUnit              /*eCoreMetric*/,
-    SfxMapUnit              /*ePresentationMetric*/,
-    XubString&              rText,
+    SfxItemPresentation 	/*ePresentation*/,
+    SfxMapUnit				/*eCoreMetric*/,
+    SfxMapUnit				/*ePresentationMetric*/,
+    XubString& 				rText,
     const IntlWrapper *
-)   const
+)	const
 {
     DBG_CHKTHIS(SfxVoidItem, 0);
     rText.AssignAscii(RTL_CONSTASCII_STRINGPARAM("Void"));
@@ -394,12 +394,12 @@ int SfxInvalidItem::operator==( const SfxPoolItem& rCmp) const
 // ------------------------------------------------------------------------
 SfxItemPresentation SfxInvalidItem::GetPresentation
 (
-    SfxItemPresentation     ePresentation,
-    SfxMapUnit              eCoreMetric,
-    SfxMapUnit              ePresentationMetric,
-    XubString&              rText,
+    SfxItemPresentation 	ePresentation,
+    SfxMapUnit				eCoreMetric,
+    SfxMapUnit				ePresentationMetric,
+    XubString& 				rText,
     const IntlWrapper *
-)   const
+)	const
 {
     DBG_CHKTHIS(SfxInvalidItem, 0);
     rText.AssignAscii(RTL_CONSTASCII_STRINGPARAM("Invalid"));
diff --git a/svl/source/items/ptitem.cxx b/svl/source/items/ptitem.cxx
index 3c12745e5967..93f7e179001d 100644
--- a/svl/source/items/ptitem.cxx
+++ b/svl/source/items/ptitem.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
@@ -86,12 +86,12 @@ SfxPointItem::SfxPointItem( const SfxPointItem& rItem ) :
 
 SfxItemPresentation SfxPointItem::GetPresentation
 (
-    SfxItemPresentation     /*ePresentation*/,
-    SfxMapUnit              /*eCoreMetric*/,
-    SfxMapUnit              /*ePresentationMetric*/,
-    XubString&              rText,
+    SfxItemPresentation 	/*ePresentation*/,
+    SfxMapUnit				/*eCoreMetric*/,
+    SfxMapUnit				/*ePresentationMetric*/,
+    XubString& 				rText,
     const IntlWrapper *
-)   const
+)	const
 {
     DBG_CHKTHIS(SfxPointItem, 0);
     rText = UniString::CreateFromInt32(aVal.X());
@@ -172,16 +172,16 @@ BOOL SfxPointItem::PutValue( const uno::Any& rVal,
     awt::Point aValue;
     sal_Int32 nVal = 0;
     if ( !nMemberId )
-    {
+    {        
         bRet = ( rVal >>= aValue );
         if( bConvert )
         {
             aValue.X = MM100_TO_TWIP(aValue.X);
             aValue.Y = MM100_TO_TWIP(aValue.Y);
-        }
+        }        
     }
     else
-    {
+    {        
         bRet = ( rVal >>= nVal );
         if( bConvert )
             nVal = MM100_TO_TWIP( nVal );
diff --git a/svl/source/items/rectitem.cxx b/svl/source/items/rectitem.cxx
index 893ac3c125b0..146caa170f6c 100644
--- a/svl/source/items/rectitem.cxx
+++ b/svl/source/items/rectitem.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
@@ -83,12 +83,12 @@ SfxRectangleItem::SfxRectangleItem( const SfxRectangleItem& rItem ) :
 
 SfxItemPresentation SfxRectangleItem::GetPresentation
 (
-    SfxItemPresentation     /*ePresentation*/,
-    SfxMapUnit              /*eCoreMetric*/,
-    SfxMapUnit              /*ePresentationMetric*/,
-    XubString&              rText,
+    SfxItemPresentation 	/*ePresentation*/,
+    SfxMapUnit				/*eCoreMetric*/,
+    SfxMapUnit				/*ePresentationMetric*/,
+    XubString& 				rText,
     const IntlWrapper *
-)   const
+)	const
 {
     DBG_CHKTHIS(SfxRectangleItem, 0);
     rText = UniString::CreateFromInt32(aVal.Top());
diff --git a/svl/source/items/rngitem.cxx b/svl/source/items/rngitem.cxx
index 2f9c58a362f6..0af99e1cd5af 100644
--- a/svl/source/items/rngitem.cxx
+++ b/svl/source/items/rngitem.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
@@ -37,7 +37,7 @@
 #include <svl/rngitem.hxx>
 #include "rngitem_inc.cxx"
 
-#define NUMTYPE sal_uInt32
+#define NUMTYPE	sal_uInt32
 #define SfxXRangeItem SfxULongRangeItem
 #define SfxXRangesItem SfxULongRangesItem
 #include <svl/rngitem.hxx>
diff --git a/svl/source/items/rngitem_inc.cxx b/svl/source/items/rngitem_inc.cxx
index ab8852756f7d..2d9d6614f875 100644
--- a/svl/source/items/rngitem_inc.cxx
+++ b/svl/source/items/rngitem_inc.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
@@ -82,12 +82,12 @@ SfxXRangeItem::SfxXRangeItem( const SfxXRangeItem& rItem ) :
 
 SfxItemPresentation SfxXRangeItem::GetPresentation
 (
-    SfxItemPresentation     /*ePresentation*/,
-    SfxMapUnit              /*eCoreMetric*/,
-    SfxMapUnit              /*ePresentationMetric*/,
-    XubString&              rText,
+    SfxItemPresentation 	/*ePresentation*/,
+    SfxMapUnit				/*eCoreMetric*/,
+    SfxMapUnit				/*ePresentationMetric*/,
+    XubString& 				rText,
     const IntlWrapper *
-)   const
+)	const
 {
     rText = UniString::CreateFromInt64(nFrom);
     rText += ':';
@@ -117,7 +117,7 @@ SfxPoolItem* SfxXRangeItem::Clone(SfxItemPool *) const
 
 SfxPoolItem* SfxXRangeItem::Create(SvStream &rStream, USHORT) const
 {
-    NUMTYPE     nVon, nBis;
+    NUMTYPE		nVon, nBis;
     rStream >> nVon;
     rStream >> nBis;
     return new SfxXRangeItem( Which(), nVon, nBis );
@@ -135,14 +135,14 @@ SvStream& SfxXRangeItem::Store(SvStream &rStream, USHORT) const
 //=========================================================================
 
 SfxXRangesItem::SfxXRangesItem()
-:   _pRanges(0)
+:	_pRanges(0)
 {
 }
 
 //-------------------------------------------------------------------------
 
 SfxXRangesItem::SfxXRangesItem( USHORT nWID, const NUMTYPE *pRanges )
-:   SfxPoolItem( nWID )
+:	SfxPoolItem( nWID )
 {
     NUMTYPE nCount = Count_Impl(pRanges) + 1;
     _pRanges = new NUMTYPE[nCount];
@@ -152,7 +152,7 @@ SfxXRangesItem::SfxXRangesItem( USHORT nWID, const NUMTYPE *pRanges )
 //-------------------------------------------------------------------------
 
 SfxXRangesItem::SfxXRangesItem( USHORT nWID, SvStream &rStream )
-:   SfxPoolItem( nWID )
+:	SfxPoolItem( nWID )
 {
     NUMTYPE nCount;
     rStream >> nCount;
@@ -165,7 +165,7 @@ SfxXRangesItem::SfxXRangesItem( USHORT nWID, SvStream &rStream )
 //-------------------------------------------------------------------------
 
 SfxXRangesItem::SfxXRangesItem( const SfxXRangesItem& rItem )
-:   SfxPoolItem( rItem )
+:	SfxPoolItem( rItem )
 {
     NUMTYPE nCount = Count_Impl(rItem._pRanges) + 1;
     _pRanges = new NUMTYPE[nCount];
diff --git a/svl/source/items/sfontitm.cxx b/svl/source/items/sfontitm.cxx
index e76b3854c6be..bc532319c6d2 100644
--- a/svl/source/items/sfontitm.cxx
+++ b/svl/source/items/sfontitm.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
diff --git a/svl/source/items/sitem.cxx b/svl/source/items/sitem.cxx
index 4a9c0af096ea..1c4bb2e0e1bd 100644
--- a/svl/source/items/sitem.cxx
+++ b/svl/source/items/sitem.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
diff --git a/svl/source/items/slstitm.cxx b/svl/source/items/slstitm.cxx
index ec9757e278a8..eb1d22f1e00d 100644
--- a/svl/source/items/slstitm.cxx
+++ b/svl/source/items/slstitm.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
@@ -45,12 +45,12 @@ TYPEINIT1_AUTOFACTORY(SfxStringListItem, SfxPoolItem);
 class SfxImpStringList
 {
 public:
-    USHORT  nRefCount;
-    List    aList;
+    USHORT	nRefCount;
+    List	aList;
 
             SfxImpStringList() { nRefCount = 1; }
             ~SfxImpStringList();
-    void    Sort( BOOL bAscending, List* );
+    void 	Sort( BOOL bAscending, List* );
 };
 
 //------------------------------------------------------------------------
@@ -223,12 +223,12 @@ int SfxStringListItem::operator==( const SfxPoolItem& rItem ) const
 
 SfxItemPresentation SfxStringListItem::GetPresentation
 (
-    SfxItemPresentation     /*ePresentation*/,
-    SfxMapUnit              /*eCoreMetric*/,
-    SfxMapUnit              /*ePresentationMetric*/,
-    XubString&              rText,
+    SfxItemPresentation 	/*ePresentation*/,
+    SfxMapUnit				/*eCoreMetric*/,
+    SfxMapUnit				/*ePresentationMetric*/,
+    XubString& 				rText,
     const IntlWrapper *
-)   const
+)	const
 {
     rText.AssignAscii(RTL_CONSTASCII_STRINGPARAM("(List)"));
     return SFX_ITEM_PRESENTATION_NONE;
@@ -311,7 +311,7 @@ void SfxStringListItem::SetString( const XubString& rStr )
         // String gehoert der Liste
         pImp->aList.Insert( pStr, LIST_APPEND );
 
-        nStart += nLen + 1 ;    // delimiter ueberspringen
+        nStart += nLen + 1 ;	// delimiter ueberspringen
     } while( nDelimPos != STRING_NOTFOUND );
 
     // Kein Leerstring am Ende
diff --git a/svl/source/items/srchitem.cxx b/svl/source/items/srchitem.cxx
index cc033bc6905e..c2e89d06c8dc 100644
--- a/svl/source/items/srchitem.cxx
+++ b/svl/source/items/srchitem.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
@@ -75,25 +75,25 @@ static Sequence< ::rtl::OUString > lcl_GetNotifyNames()
     // names of transliteration relevant properties
     static const char* aTranslitNames[] =
     {
-        "IsMatchCase",                          //  0
-        "Japanese/IsMatchFullHalfWidthForms",   //  1
-        "Japanese/IsMatchHiraganaKatakana",     //  2
-        "Japanese/IsMatchContractions",         //  3
-        "Japanese/IsMatchMinusDashCho-on",      //  4
-        "Japanese/IsMatchRepeatCharMarks",      //  5
-        "Japanese/IsMatchVariantFormKanji",     //  6
-        "Japanese/IsMatchOldKanaForms",         //  7
-        "Japanese/IsMatch_DiZi_DuZu",           //  8
-        "Japanese/IsMatch_BaVa_HaFa",           //  9
-        "Japanese/IsMatch_TsiThiChi_DhiZi",     // 10
-        "Japanese/IsMatch_HyuIyu_ByuVyu",       // 11
-        "Japanese/IsMatch_SeShe_ZeJe",          // 12
-        "Japanese/IsMatch_IaIya",               // 13
-        "Japanese/IsMatch_KiKu",                // 14
-        "Japanese/IsIgnorePunctuation",         // 15
-        "Japanese/IsIgnoreWhitespace",          // 16
-        "Japanese/IsIgnoreProlongedSoundMark",  // 17
-        "Japanese/IsIgnoreMiddleDot"            // 18
+        "IsMatchCase",							//  0
+        "Japanese/IsMatchFullHalfWidthForms",	//  1
+        "Japanese/IsMatchHiraganaKatakana",		//  2
+        "Japanese/IsMatchContractions",			//  3
+        "Japanese/IsMatchMinusDashCho-on",		//  4
+        "Japanese/IsMatchRepeatCharMarks",		//  5
+        "Japanese/IsMatchVariantFormKanji",		//  6
+        "Japanese/IsMatchOldKanaForms",			//  7
+        "Japanese/IsMatch_DiZi_DuZu",			//  8
+        "Japanese/IsMatch_BaVa_HaFa",			//  9
+        "Japanese/IsMatch_TsiThiChi_DhiZi",		// 10
+        "Japanese/IsMatch_HyuIyu_ByuVyu",		// 11
+        "Japanese/IsMatch_SeShe_ZeJe",			// 12
+        "Japanese/IsMatch_IaIya",				// 13
+        "Japanese/IsMatch_KiKu",				// 14
+        "Japanese/IsIgnorePunctuation",			// 15
+        "Japanese/IsIgnoreWhitespace",			// 16
+        "Japanese/IsIgnoreProlongedSoundMark",	// 17
+        "Japanese/IsIgnoreMiddleDot"			// 18
     };
 
     const int nCount = sizeof( aTranslitNames ) / sizeof( aTranslitNames[0] );
@@ -118,24 +118,24 @@ SvxSearchItem::SvxSearchItem( const sal_uInt16 nId ) :
                           Locale(),
                           2, 2, 2,
                           TransliterationModules_IGNORE_CASE ),
-    eFamily         ( SFX_STYLE_FAMILY_PARA ),
-    nCommand        ( 0 ),
-    nCellType       ( SVX_SEARCHIN_FORMULA ),
-    nAppFlag        ( SVX_SEARCHAPP_WRITER ),
-    bRowDirection   ( sal_True ),
-    bAllTables      ( sal_False ),
-    bNotes          ( sal_False),
-    bBackward       ( sal_False ),
-    bPattern        ( sal_False ),
-    bContent        ( sal_False ),
-    bAsianOptions   ( FALSE )
+    eFamily			( SFX_STYLE_FAMILY_PARA ),
+    nCommand		( 0 ),
+    nCellType		( SVX_SEARCHIN_FORMULA ),
+    nAppFlag		( SVX_SEARCHAPP_WRITER ),
+    bRowDirection	( sal_True ),
+    bAllTables		( sal_False ),
+    bNotes			( sal_False),
+    bBackward		( sal_False ),
+    bPattern		( sal_False ),
+    bContent		( sal_False ),
+    bAsianOptions	( FALSE )
 {
     EnableNotification( lcl_GetNotifyNames() );
 
     SvtSearchOptions aOpt;
 
-    bBackward       = aOpt.IsBackwards();
-    bAsianOptions   = aOpt.IsUseAsianOptions();
+    bBackward 		= aOpt.IsBackwards();
+    bAsianOptions	= aOpt.IsUseAsianOptions();
     bNotes = aOpt.IsNotes();
 
     if (aOpt.IsUseRegularExpression())
@@ -195,21 +195,21 @@ SvxSearchItem::SvxSearchItem( const sal_uInt16 nId ) :
 
 SvxSearchItem::SvxSearchItem( const SvxSearchItem& rItem ) :
 
-    SfxPoolItem ( rItem ),
+    SfxPoolItem	( rItem ),
     ConfigItem( ::rtl::OUString::createFromAscii( CFG_ROOT_NODE ) ),
 
-    aSearchOpt      ( rItem.aSearchOpt ),
-    eFamily         ( rItem.eFamily ),
-    nCommand        ( rItem.nCommand ),
-    nCellType       ( rItem.nCellType ),
-    nAppFlag        ( rItem.nAppFlag ),
-    bRowDirection   ( rItem.bRowDirection ),
-    bAllTables      ( rItem.bAllTables ),
-    bNotes          ( rItem.bNotes),
-    bBackward       ( rItem.bBackward ),
-    bPattern        ( rItem.bPattern ),
-    bContent        ( rItem.bContent ),
-    bAsianOptions   ( rItem.bAsianOptions )
+    aSearchOpt		( rItem.aSearchOpt ),
+    eFamily			( rItem.eFamily ),
+    nCommand		( rItem.nCommand ),
+    nCellType		( rItem.nCellType ),
+    nAppFlag		( rItem.nAppFlag ),
+    bRowDirection	( rItem.bRowDirection ),
+    bAllTables		( rItem.bAllTables ),
+    bNotes			( rItem.bNotes),
+    bBackward		( rItem.bBackward ),
+    bPattern		( rItem.bPattern ),
+    bContent		( rItem.bContent ),
+    bAsianOptions	( rItem.bAsianOptions )
 {
     EnableNotification( lcl_GetNotifyNames() );
 }
@@ -231,15 +231,15 @@ SfxPoolItem* SvxSearchItem::Clone( SfxItemPool *) const
 //! used below
 static BOOL operator == ( const SearchOptions& rItem1, const SearchOptions& rItem2 )
 {
-    return rItem1.algorithmType         == rItem2.algorithmType &&
-           rItem1.searchFlag            == rItem2.searchFlag    &&
-           rItem1.searchString          == rItem2.searchString  &&
-           rItem1.replaceString         == rItem2.replaceString &&
-           //rItem1.Locale              == rItem2.Locale        &&
-           rItem1.changedChars          == rItem2.changedChars  &&
-           rItem1.deletedChars          == rItem2.deletedChars  &&
-           rItem1.insertedChars         == rItem2.insertedChars &&
-           rItem1.transliterateFlags    == rItem2.transliterateFlags;
+    return rItem1.algorithmType 		== rItem2.algorithmType	&&
+           rItem1.searchFlag 			== rItem2.searchFlag	&&
+           rItem1.searchString 			== rItem2.searchString	&&
+           rItem1.replaceString 		== rItem2.replaceString	&&
+           //rItem1.Locale 				== rItem2.Locale		&&
+           rItem1.changedChars 			== rItem2.changedChars	&&
+           rItem1.deletedChars 			== rItem2.deletedChars	&&
+           rItem1.insertedChars 		== rItem2.insertedChars	&&
+           rItem1.transliterateFlags	== rItem2.transliterateFlags;
 }
 
 
@@ -247,18 +247,18 @@ int SvxSearchItem::operator==( const SfxPoolItem& rItem ) const
 {
     DBG_ASSERT( SfxPoolItem::operator==( rItem ), "unequal which or type" );
     const SvxSearchItem &rSItem = (SvxSearchItem &) rItem;
-    return ( nCommand       == rSItem.nCommand )        &&
-           ( bBackward      == rSItem.bBackward )       &&
-           ( bPattern       == rSItem.bPattern )        &&
-           ( bContent       == rSItem.bContent )        &&
-           ( eFamily        == rSItem.eFamily )         &&
-           ( bRowDirection  == rSItem.bRowDirection )   &&
-           ( bAllTables     == rSItem.bAllTables )      &&
-           ( nCellType      == rSItem.nCellType )       &&
-           ( nAppFlag       == rSItem.nAppFlag )        &&
-           ( bAsianOptions  == rSItem.bAsianOptions )   &&
-           ( aSearchOpt     == rSItem.aSearchOpt )      &&
-           ( bNotes         == rSItem.bNotes );
+    return ( nCommand 		== rSItem.nCommand )		&&
+           ( bBackward 		== rSItem.bBackward )		&&
+           ( bPattern 		== rSItem.bPattern )		&&
+           ( bContent 		== rSItem.bContent )		&&
+           ( eFamily 		== rSItem.eFamily )			&&
+           ( bRowDirection 	== rSItem.bRowDirection )	&&
+           ( bAllTables 	== rSItem.bAllTables )		&&
+           ( nCellType 		== rSItem.nCellType )		&&
+           ( nAppFlag 		== rSItem.nAppFlag )		&&
+           ( bAsianOptions	== rSItem.bAsianOptions )	&&
+           ( aSearchOpt     == rSItem.aSearchOpt )		&&
+           ( bNotes			== rSItem.bNotes );
 }
 
 
@@ -267,11 +267,11 @@ int SvxSearchItem::operator==( const SfxPoolItem& rItem ) const
 SfxItemPresentation SvxSearchItem::GetPresentation
 (
     SfxItemPresentation ,
-    SfxMapUnit          ,
-    SfxMapUnit          ,
-    XubString&          ,
+    SfxMapUnit			,
+    SfxMapUnit			,
+    XubString& 			,
     const IntlWrapper *
-)   const
+)	const
 {
     return SFX_ITEM_PRESENTATION_NONE;
 }
diff --git a/svl/source/items/stritem.cxx b/svl/source/items/stritem.cxx
index 6568dc3a99f5..71b2eda031b7 100644
--- a/svl/source/items/stritem.cxx
+++ b/svl/source/items/stritem.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
diff --git a/svl/source/items/style.cxx b/svl/source/items/style.cxx
index 60c622208d53..0501174c8363 100644
--- a/svl/source/items/style.cxx
+++ b/svl/source/items/style.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
@@ -53,8 +53,8 @@
 #include <unotools/syslocale.hxx>
 #include <algorithm>
 
-#define STYLESTREAM             "SfxStyleSheets"
-#define STYLESTREAM_VERSION     USHORT(50)
+#define STYLESTREAM 			"SfxStyleSheets"
+#define STYLESTREAM_VERSION 	USHORT(50)
 
 #ifdef DBG_UTIL
 class DbgStyleSheetReferences
@@ -86,19 +86,19 @@ TYPEINIT1(SfxStyleSheetPoolHint, SfxHint);
 
 SfxStyleSheetHintExtended::SfxStyleSheetHintExtended
 (
-    USHORT              nAction,        // SFX_STYLESHEET_... (s.o.)
+    USHORT				nAction,		// SFX_STYLESHEET_... (s.o.)
     const String&       rOldName
 )
-:   SfxStyleSheetHint( nAction ),
+:	SfxStyleSheetHint( nAction ),
     aName( rOldName )
 {}
 SfxStyleSheetHintExtended::SfxStyleSheetHintExtended
 (
-    USHORT              nAction,        // SFX_STYLESHEET_... (s.o.)
+    USHORT				nAction,		// SFX_STYLESHEET_... (s.o.)
     const String&       rOldName,
-    SfxStyleSheetBase&  rStyleSheet     // geh"ort weiterhin dem Aufrufer
+    SfxStyleSheetBase&	rStyleSheet 	// geh"ort weiterhin dem Aufrufer
 )
-:   SfxStyleSheetHint( nAction, rStyleSheet ),
+:	SfxStyleSheetHint( nAction, rStyleSheet ),
     aName( rOldName )
 {}
 
@@ -106,18 +106,18 @@ SfxStyleSheetHintExtended::SfxStyleSheetHintExtended
 
 SfxStyleSheetHint::SfxStyleSheetHint
 (
-    USHORT              nAction,        // SFX_STYLESHEET_... (s.o.)
-    SfxStyleSheetBase&  rStyleSheet     // geh"ort weiterhin dem Aufrufer
+    USHORT				nAction,		// SFX_STYLESHEET_... (s.o.)
+    SfxStyleSheetBase&	rStyleSheet 	// geh"ort weiterhin dem Aufrufer
 )
-:   pStyleSh( &rStyleSheet ),
+:	pStyleSh( &rStyleSheet ),
     nHint( nAction )
 {}
 
 SfxStyleSheetHint::SfxStyleSheetHint
 (
-    USHORT              nAction     // SFX_STYLESHEET_... (s.o.)
+    USHORT				nAction		// SFX_STYLESHEET_... (s.o.)
 )
-:   pStyleSh( NULL ),
+:	pStyleSh( NULL ),
     nHint( nAction )
 {}
 
@@ -961,7 +961,7 @@ BOOL SfxStyleSheetBasePool::Load( SvStream& rStream )
                 // damit eigene ItemSets untergeschoben werden koennen
                 SfxItemSet& rSet = rSheet.GetItemSet();
                 rSet.ClearItem();
-    //!         SfxItemSet aTmpSet( *pTmpPool );
+    //! 		SfxItemSet aTmpSet( *pTmpPool );
                 /*!aTmpSet*/ rSet.Load( rStream );
                 //! rSet.Put( aTmpSet );
             }
@@ -974,7 +974,7 @@ BOOL SfxStyleSheetBasePool::Load( SvStream& rStream )
             rStream.Seek( nPos );
         }
 
-        //  #72939# only loop through the styles that were really inserted
+        //	#72939# only loop through the styles that were really inserted
         ULONG n = aStyles.size();
 
         //! delete pTmpPool;
@@ -1061,7 +1061,7 @@ BOOL SfxStyleSheetBasePool::Load1_Impl( SvStream& rStream )
             // damit eigene ItemSets untergeschoben werden koennen
             SfxItemSet& rSet = rSheet.GetItemSet();
             rSet.ClearItem();
-//!         SfxItemSet aTmpSet( *pTmpPool );
+//! 		SfxItemSet aTmpSet( *pTmpPool );
             /*!aTmpSet*/ rSet.Load( rStream );
             //! rSet.Put( aTmpSet );
         }
diff --git a/svl/source/items/stylepool.cxx b/svl/source/items/stylepool.cxx
index 8a9f16052a8a..fde27a785c6e 100644
--- a/svl/source/items/stylepool.cxx
+++ b/svl/source/items/stylepool.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
diff --git a/svl/source/items/szitem.cxx b/svl/source/items/szitem.cxx
index 6c5ab66b8422..775b60484140 100644
--- a/svl/source/items/szitem.cxx
+++ b/svl/source/items/szitem.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
@@ -83,12 +83,12 @@ SfxSizeItem::SfxSizeItem( const SfxSizeItem& rItem ) :
 
 SfxItemPresentation SfxSizeItem::GetPresentation
 (
-    SfxItemPresentation     /*ePresentation*/,
-    SfxMapUnit              /*eCoreMetric*/,
-    SfxMapUnit              /*ePresentationMetric*/,
-    XubString&              rText,
+    SfxItemPresentation 	/*ePresentation*/,
+    SfxMapUnit				/*eCoreMetric*/,
+    SfxMapUnit				/*ePresentationMetric*/,
+    XubString& 				rText,
     const IntlWrapper *
-)   const
+)	const
 {
     DBG_CHKTHIS(SfxSizeItem, 0);
     rText = UniString::CreateFromInt32(aVal.Width());
diff --git a/svl/source/items/visitem.cxx b/svl/source/items/visitem.cxx
index 94fdf167496e..1ff01a3ed20d 100644
--- a/svl/source/items/visitem.cxx
+++ b/svl/source/items/visitem.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
diff --git a/svl/source/items/whassert.hxx b/svl/source/items/whassert.hxx
index 9933294b4d86..ae59b9c5781f 100644
--- a/svl/source/items/whassert.hxx
+++ b/svl/source/items/whassert.hxx
@@ -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
@@ -33,18 +33,18 @@
 //------------------------------------------------------------------------
 
 #ifdef DBG_UTIL
-#define SFX_ASSERT( bCondition, nId, sMessage )                             \
-{                                                                           \
-    if ( DbgIsAssert() )                                                    \
-    {                                                                       \
-        if ( !(bCondition) )                                                \
-        {                                                                   \
-            ByteString aMsg( sMessage );                                    \
+#define SFX_ASSERT( bCondition, nId, sMessage ) 							\
+{																			\
+    if ( DbgIsAssert() )													\
+    {																		\
+        if ( !(bCondition) )												\
+        {																	\
+            ByteString aMsg( sMessage );									\
             aMsg.Append(RTL_CONSTASCII_STRINGPARAM("\nwith Id/Pos: "));     \
-            aMsg += ByteString::CreateFromInt32( nId );                     \
-            DbgOut( aMsg.GetBuffer(), DBG_OUT_ERROR, __FILE__, __LINE__);   \
-        }                                                                   \
-    }                                                                       \
+            aMsg += ByteString::CreateFromInt32( nId );						\
+            DbgOut( aMsg.GetBuffer(), DBG_OUT_ERROR, __FILE__, __LINE__);	\
+        }																	\
+    }																		\
 }
 #else
 #define SFX_ASSERT( bCondition, nId, sMessage )
diff --git a/svl/source/items/whiter.cxx b/svl/source/items/whiter.cxx
index ec0e10d8e3d7..fc4d3c8aade3 100644
--- a/svl/source/items/whiter.cxx
+++ b/svl/source/items/whiter.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
diff --git a/svl/source/memtools/svarray.cxx b/svl/source/memtools/svarray.cxx
index b2184442ea0e..cfc7f8be118c 100644
--- a/svl/source/memtools/svarray.cxx
+++ b/svl/source/memtools/svarray.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
@@ -64,13 +64,13 @@ SV_IMPL_VARARR(SvPtrarr,VoidPtr)
 SV_IMPL_VARARR_PLAIN(SvPtrarrPlain,VoidPtr)
 
 USHORT SvPtrarr::GetPos( const VoidPtr& aElement ) const
-{   USHORT n;
+{	USHORT n;
     for( n=0; n < nA && *(GetData()+n) != aElement; ) n++;
     return ( n >= nA ? USHRT_MAX : n );
 }
 
 USHORT SvPtrarrPlain::GetPos( const VoidPtr aElement ) const
-{   USHORT n;
+{	USHORT n;
     for( n=0; n < nA && *(GetData()+n) != aElement; ) n++;
     return ( n >= nA ? USHRT_MAX : n );
 }
diff --git a/svl/source/misc/PasswordHelper.cxx b/svl/source/misc/PasswordHelper.cxx
index 05e9e8a65897..fb53b104990c 100644
--- a/svl/source/misc/PasswordHelper.cxx
+++ b/svl/source/misc/PasswordHelper.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
diff --git a/svl/source/misc/adrparse.cxx b/svl/source/misc/adrparse.cxx
index fc230856ef7d..6bf4e793e840 100644
--- a/svl/source/misc/adrparse.cxx
+++ b/svl/source/misc/adrparse.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
diff --git a/svl/source/misc/documentlockfile.cxx b/svl/source/misc/documentlockfile.cxx
index 0e04a3fd7ae0..d1f3e9158b4e 100644
--- a/svl/source/misc/documentlockfile.cxx
+++ b/svl/source/misc/documentlockfile.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
diff --git a/svl/source/misc/filenotation.cxx b/svl/source/misc/filenotation.cxx
index abec6bb310fc..9c8901844c56 100644
--- a/svl/source/misc/filenotation.cxx
+++ b/svl/source/misc/filenotation.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
@@ -139,6 +139,6 @@ namespace svt
     }
 
 //.........................................................................
-}   // namespace svt
+}	// namespace svt
 //.........................................................................
 
diff --git a/svl/source/misc/folderrestriction.cxx b/svl/source/misc/folderrestriction.cxx
index ae50ed3cd55a..fedafbaff26a 100644
--- a/svl/source/misc/folderrestriction.cxx
+++ b/svl/source/misc/folderrestriction.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
diff --git a/svl/source/misc/fstathelper.cxx b/svl/source/misc/fstathelper.cxx
index 329912f9d997..117624d53e64 100644
--- a/svl/source/misc/fstathelper.cxx
+++ b/svl/source/misc/fstathelper.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
diff --git a/svl/source/misc/inethist.cxx b/svl/source/misc/inethist.cxx
index 28986aca1194..6377a724fd0f 100644
--- a/svl/source/misc/inethist.cxx
+++ b/svl/source/misc/inethist.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
diff --git a/svl/source/misc/inettype.cxx b/svl/source/misc/inettype.cxx
index 0b9efdf22afd..466ce754dbc5 100644
--- a/svl/source/misc/inettype.cxx
+++ b/svl/source/misc/inettype.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
@@ -50,7 +50,7 @@ namespace unnamed_svl_inettype {
 struct MediaTypeEntry
 {
     sal_Char const * m_pTypeName;
-    INetContentType m_eTypeID;
+    INetContentType	m_eTypeID;
     sal_Char const * m_pExtension;
 };
 
@@ -75,7 +75,7 @@ struct TypeNameMapEntry: public UniString
 //============================================================================
 struct ExtensionMapEntry: public UniString
 {
-    INetContentType m_eTypeID;
+    INetContentType	m_eTypeID;
 
     ExtensionMapEntry(const UniString & rExt):
         UniString(rExt), m_eTypeID(CONTENT_TYPE_UNKNOWN) {}
@@ -338,7 +338,7 @@ MediaTypeEntry const aStaticTypeNameMap[CONTENT_TYPE_LAST + 1]
 /** A mapping from type IDs to presentation resource IDs.  Sorted by type ID.
  */
 USHORT const aStaticResourceIDMap[CONTENT_TYPE_LAST + 1]
-    = { STR_SVT_MIMETYPE_APP_OCTSTREAM, // CONTENT_TYPE_UNKNOWN
+    = {	STR_SVT_MIMETYPE_APP_OCTSTREAM, // CONTENT_TYPE_UNKNOWN
         STR_SVT_MIMETYPE_APP_OCTSTREAM, // CONTENT_TYPE_APP_OCTSTREAM
         STR_SVT_MIMETYPE_APP_PDF, // CONTENT_TYPE_APP_PDF
         STR_SVT_MIMETYPE_APP_RTF, // CONTENT_TYPE_APP_RTF
diff --git a/svl/source/misc/lngmisc.cxx b/svl/source/misc/lngmisc.cxx
index 2203cc08458e..6f482277fdc3 100644
--- a/svl/source/misc/lngmisc.cxx
+++ b/svl/source/misc/lngmisc.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
@@ -76,7 +76,7 @@ BOOL RemoveControlChars( OUString &rTxt )
     INT32 nCtrlChars = GetNumControlChars( rTxt );
     if (nCtrlChars)
     {
-        INT32 nLen  = rTxt.getLength();
+        INT32 nLen	= rTxt.getLength();
         INT32 nSize = nLen - nCtrlChars;
         OUStringBuffer aBuf( nSize );
         aBuf.setLength( nSize );
diff --git a/svl/source/misc/lockfilecommon.cxx b/svl/source/misc/lockfilecommon.cxx
index aed62ce30737..10d03799db2b 100644
--- a/svl/source/misc/lockfilecommon.cxx
+++ b/svl/source/misc/lockfilecommon.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
diff --git a/svl/source/misc/mediatyp.src b/svl/source/misc/mediatyp.src
index 333963c1d2d9..0bd3381a1581 100644
--- a/svl/source/misc/mediatyp.src
+++ b/svl/source/misc/mediatyp.src
@@ -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
diff --git a/svl/source/misc/ownlist.cxx b/svl/source/misc/ownlist.cxx
index 9fd767c2253f..04d382b17d44 100644
--- a/svl/source/misc/ownlist.cxx
+++ b/svl/source/misc/ownlist.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
@@ -78,17 +78,17 @@ static void eatSpace(const String & rCmd, USHORT * pIndex)
 //=========================================================================
 BOOL SvCommandList::AppendCommands
 (
-    const String & rCmd,    /* Dieser Text wird in Kommandos umgesetzt */
-    USHORT * pEaten         /* Anzahl der Zeichen, die gelesen wurden */
+    const String & rCmd,	/* Dieser Text wird in Kommandos umgesetzt */
+    USHORT * pEaten			/* Anzahl der Zeichen, die gelesen wurden */
 )
-/*  [Beschreibung]
+/*	[Beschreibung]
 
     Es wird eine Text geparsed und die einzelnen Kommandos werden an
     die Liste angeh"angt.
 
     [R"uckgabewert]
 
-    BOOL        TRUE, der Text wurde korrekt geparsed.
+    BOOL		TRUE, der Text wurde korrekt geparsed.
                 FALSE, der Text wurde nicht korrekt geparsed.
 */
 {
@@ -115,78 +115,78 @@ BOOL SvCommandList::AppendCommands
 
     *pEaten = index;
 
-//      USHORT nPos = 0;
-//      while( nPos < rCmd.Len() )
-//      {
-//          // ein Zeichen ? Dann faengt hier eine Option an
-//          if( isalpha( rCmd[nPos] ) )
-//          {
-//              String aValue;
-//              USHORT nStt = nPos;
-//              register char c;
-
-//              while( nPos < rCmd.Len() &&
-//                      ( isalnum(c=rCmd[nPos]) || '-'==c || '.'==c ) )
-//                  nPos++;
-
-//              String aToken( rCmd.Copy( nStt, nPos-nStt ) );
-
-//              while( nPos < rCmd.Len() &&
-//                      ( !String::IsPrintable( (c=rCmd[nPos]),
-//                      RTL_TEXTENCODING_MS_1252 ) || isspace(c) ) )
-//                  nPos++;
-
-//              // hat die Option auch einen Wert?
-//              if( nPos!=rCmd.Len() && '='==c )
-//              {
-//                  nPos++;
-
-//                  while( nPos < rCmd.Len() &&
-//                          ( !String::IsPrintable( (c=rCmd[nPos]),
-//                          RTL_TEXTENCODING_MS_1252 ) || isspace(c) ) )
-//                      nPos++;
-
-//                  if( nPos != rCmd.Len() )
-//                  {
-//                      USHORT nLen = 0;
-//                      nStt = nPos;
-//                      if( '"' == c )
-//                      {
-//                          nPos++; nStt++;
-//                          while( nPos < rCmd.Len() &&
-//                                  '"' != rCmd[nPos] )
-//                              nPos++, nLen++;
-//                          if( nPos!=rCmd.Len() )
-//                              nPos++;
-//                      }
-//                      else
-//                          // hier sind wir etwas laxer als der
-//                          // Standard und erlauben alles druckbare
-//                          while( nPos < rCmd.Len() &&
-//                                  String::IsPrintable( (c=rCmd[nPos]),
-//                                  RTL_TEXTENCODING_MS_1252 ) &&
-//                                  !isspace( c ) )
-//                              nPos++, nLen++;
-
-//                      if( nLen )
-//                          aValue = rCmd( nStt, nLen );
-//                  }
-//              }
-
-//              SvCommand * pCmd = new SvCommand( aToken, aValue );
-//              aTypes.Insert( pCmd, LIST_APPEND );
-//          }
-//          else
-//              // white space un unerwartete Zeichen ignorieren wie
-//              nPos++;
-//      }
-//      *pEaten = nPos;
+//  	USHORT nPos = 0;
+//  	while( nPos < rCmd.Len() )
+//  	{
+//  		// ein Zeichen ? Dann faengt hier eine Option an
+//    		if( isalpha( rCmd[nPos] ) )
+//  		{
+//  			String aValue;
+//  			USHORT nStt = nPos;
+//  			register char c;
+
+//  			while( nPos < rCmd.Len() &&
+//  					( isalnum(c=rCmd[nPos]) || '-'==c || '.'==c ) )
+//  				nPos++;
+
+//  			String aToken( rCmd.Copy( nStt, nPos-nStt ) );
+
+//  			while( nPos < rCmd.Len() &&
+//  					( !String::IsPrintable( (c=rCmd[nPos]),
+//  					RTL_TEXTENCODING_MS_1252 ) || isspace(c) ) )
+//  				nPos++;
+
+//  			// hat die Option auch einen Wert?
+//  			if( nPos!=rCmd.Len() && '='==c )
+//  			{
+//  				nPos++;
+
+//  				while( nPos < rCmd.Len() &&
+//  					 	( !String::IsPrintable( (c=rCmd[nPos]),
+//  						RTL_TEXTENCODING_MS_1252 ) || isspace(c) ) )
+//  					nPos++;
+
+//  				if( nPos != rCmd.Len() )
+//  				{
+//  					USHORT nLen = 0;
+//  					nStt = nPos;
+//  					if( '"' == c )
+//  					{
+//  						nPos++; nStt++;
+//  						while( nPos < rCmd.Len() &&
+//  					    	 	'"' != rCmd[nPos] )
+//  							nPos++, nLen++;
+//  						if( nPos!=rCmd.Len() )
+//  							nPos++;
+//  					}
+//  					else
+//  						// hier sind wir etwas laxer als der
+//  						// Standard und erlauben alles druckbare
+//  						while( nPos < rCmd.Len() &&
+//  		 				    	String::IsPrintable( (c=rCmd[nPos]),
+//  								RTL_TEXTENCODING_MS_1252 ) &&
+//  								!isspace( c ) )
+//  							nPos++, nLen++;
+
+//  					if( nLen )
+//  						aValue = rCmd( nStt, nLen );
+//  				}
+//  			}
+
+//  			SvCommand * pCmd = new SvCommand( aToken, aValue );
+//  		    aTypes.Insert( pCmd, LIST_APPEND );
+//  		}
+//  		else
+//  			// white space un unerwartete Zeichen ignorieren wie
+//  			nPos++;
+//  	}
+//  	*pEaten = nPos;
     return TRUE;
 }
 
 //=========================================================================
 String SvCommandList::GetCommands() const
-/*  [Beschreibung]
+/*	[Beschreibung]
 
     Die Kommandos in der Liste werden als Text hintereinander, durch ein
     Leerzeichen getrennt geschrieben. Der Text muss nicht genauso
@@ -194,7 +194,7 @@ String SvCommandList::GetCommands() const
 
     [R"uckgabewert]
 
-    String      Die Kommandos werden zur"uckgegeben.
+    String		Die Kommandos werden zur"uckgegeben.
 */
 {
     String aRet;
@@ -217,17 +217,17 @@ String SvCommandList::GetCommands() const
 //=========================================================================
 SvCommand & SvCommandList::Append
 (
-    const String & rCommand,    /* das Kommando */
-    const String & rArg         /* dasArgument des Kommandos */
+    const String & rCommand,	/* das Kommando	*/
+    const String & rArg			/* dasArgument des Kommandos */
 )
-/*  [Beschreibung]
+/*	[Beschreibung]
 
     Es wird eine Objekt vom Typ SvCommand erzeugt und an die Liste
     angeh"angt.
 
     [R"uckgabewert]
 
-    SvCommand &     Das erteugte Objekt wird zur"uckgegeben.
+    SvCommand &		Das erteugte Objekt wird zur"uckgegeben.
 */
 {
     SvCommand * pCmd = new SvCommand( rCommand, rArg );
@@ -238,10 +238,10 @@ SvCommand & SvCommandList::Append
 //=========================================================================
 SvStream & operator >>
 (
-    SvStream & rStm,        /* Stream aus dem gelesen wird */
-    SvCommandList & rThis   /* Die zu f"ullende Liste */
+    SvStream & rStm,     	/* Stream aus dem gelesen wird */
+    SvCommandList & rThis	/* Die zu f"ullende Liste */
 )
-/*  [Beschreibung]
+/*	[Beschreibung]
 
     Die Liste mit ihren Elementen wird gelesen. Das Format ist:
     1. Anzahl der Elemente
@@ -249,7 +249,7 @@ SvStream & operator >>
 
     [R"uckgabewert]
 
-    SvStream &      Der "ubergebene Stream.
+    SvStream &		Der "ubergebene Stream.
 */
 {
     UINT32 nCount = 0;
@@ -269,10 +269,10 @@ SvStream & operator >>
 //=========================================================================
 SvStream & operator <<
 (
-    SvStream & rStm,            /* Stream in den geschrieben wird */
-    const SvCommandList & rThis /* Die zu schreibende Liste */
+    SvStream & rStm,     		/* Stream in den geschrieben wird */
+    const SvCommandList & rThis	/* Die zu schreibende Liste */
 )
-/*  [Beschreibung]
+/*	[Beschreibung]
 
     Die Liste mit ihren Elementen wir geschrieben. Das Format ist:
     1. Anzahl der Elemente
@@ -280,7 +280,7 @@ SvStream & operator <<
 
     [R"uckgabewert]
 
-    SvStream &      Der "ubergebene Stream.
+    SvStream &		Der "ubergebene Stream.
 */
 {
     UINT32 nCount = rThis.aTypes.Count();
diff --git a/svl/source/misc/restrictedpaths.cxx b/svl/source/misc/restrictedpaths.cxx
index 8c6f136f3eee..ac215a140bb8 100644
--- a/svl/source/misc/restrictedpaths.cxx
+++ b/svl/source/misc/restrictedpaths.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
@@ -125,7 +125,7 @@ namespace svt
 
             xub_StrLen nLenApproved = sApprovedURL.Len();
             xub_StrLen nLenChecked  = m_sCheckURL.Len();
-
+            
             if ( nLenApproved > nLenChecked )
             {
                 if ( m_bAllowParent )
diff --git a/svl/source/misc/sharecontrolfile.cxx b/svl/source/misc/sharecontrolfile.cxx
index b7b4f24141dd..0be0a9c3270d 100644
--- a/svl/source/misc/sharecontrolfile.cxx
+++ b/svl/source/misc/sharecontrolfile.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
diff --git a/svl/source/misc/strmadpt.cxx b/svl/source/misc/strmadpt.cxx
index 9811618eb571..97f4869a569f 100644
--- a/svl/source/misc/strmadpt.cxx
+++ b/svl/source/misc/strmadpt.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
@@ -279,7 +279,7 @@ uno::Any SAL_CALL SvLockBytesInputStream::queryInterface(uno::Type const &
 
 //============================================================================
 // virtual
-void SAL_CALL SvLockBytesInputStream::acquire() throw ()
+void SAL_CALL SvLockBytesInputStream::acquire()	throw ()
 {
     OWeakObject::acquire();
 }
@@ -804,10 +804,10 @@ USHORT SvOutputStream::IsA() const
 bool SvDataPipe_Impl::remove(Page * pPage)
 {
     if (
-        pPage != m_pFirstPage ||
+        pPage != m_pFirstPage || 
         m_pReadPage == m_pFirstPage ||
         (
-         !m_aMarks.empty() &&
+         !m_aMarks.empty() && 
          *m_aMarks.begin() < m_pFirstPage->m_nOffset + m_nPageSize
         )
        )
diff --git a/svl/source/misc/svldata.cxx b/svl/source/misc/svldata.cxx
index 35c9fca3aef2..25ac6c6520f3 100644
--- a/svl/source/misc/svldata.cxx
+++ b/svl/source/misc/svldata.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
diff --git a/svl/source/misc/urihelper.cxx b/svl/source/misc/urihelper.cxx
index 46063564193d..e9fe98bcff3b 100644
--- a/svl/source/misc/urihelper.cxx
+++ b/svl/source/misc/urihelper.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
diff --git a/svl/source/notify/brdcst.cxx b/svl/source/notify/brdcst.cxx
index 29983ecedc17..da762d60aea4 100644
--- a/svl/source/notify/brdcst.cxx
+++ b/svl/source/notify/brdcst.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
diff --git a/svl/source/notify/broadcast.cxx b/svl/source/notify/broadcast.cxx
index 0179ceaebc34..5a4dc46d5451 100644
--- a/svl/source/notify/broadcast.cxx
+++ b/svl/source/notify/broadcast.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
@@ -78,7 +78,7 @@ SvtBroadcaster::~SvtBroadcaster()
     if( pLast )
         do {
             pLast->EndListening( *this );
-            if( !HasListeners() )       // all gone ??
+            if( !HasListeners() )		// all gone ??
                 break;
         } while( 0 != ( pLast = aIter.GoNext() ));
 }
@@ -92,20 +92,20 @@ void SvtBroadcaster::Broadcast( const SfxHint &rHint )
     // is anybody to notify?
     if( HasListeners() /* && !IsModifyLocked()*/ )
     {
-//      LockModify();
-//      bInModify = TRUE;
+//		LockModify();
+//		bInModify = TRUE;
 
         SvtListenerIter aIter( *this );
         SvtListener* pLast = aIter.GoStart();
         if( pLast )
             do {
                 pLast->Notify( *this, rHint );
-                if( !HasListeners() )       // all gone ??
+                if( !HasListeners() )		// all gone ??
                     break;
             } while( 0 != ( pLast = aIter.GoNext() ));
 
-//      bInModify = FALSE;
-//      UnlockModify();
+//		bInModify = FALSE;
+//		UnlockModify();
     }
 }
 
@@ -127,20 +127,20 @@ void SvtBroadcaster::Forward( SvtBroadcaster& rBC, const SfxHint& rHint )
     // is anybody to notify?
     if( rBC.HasListeners() /* && !IsModifyLocked()*/ )
     {
-//      LockModify();
-//      bInModify = TRUE;
+//		LockModify();
+//		bInModify = TRUE;
 
         SvtListenerIter aIter( rBC );
         SvtListener* pLast = aIter.GoStart();
         if( pLast )
             do {
                 pLast->Notify( rBC, rHint );
-                if( !rBC.HasListeners() )       // all gone ??
+                if( !rBC.HasListeners() )		// all gone ??
                     break;
             } while( 0 != ( pLast = aIter.GoNext() ));
 
-//      bInModify = FALSE;
-//      UnlockModify();
+//		bInModify = FALSE;
+//		UnlockModify();
     }
 }
 
diff --git a/svl/source/notify/cancel.cxx b/svl/source/notify/cancel.cxx
index ffa5c87a26be..358707f04643 100644
--- a/svl/source/notify/cancel.cxx
+++ b/svl/source/notify/cancel.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
@@ -42,7 +42,7 @@ namespace { struct lclMutex : public rtl::Static< ::vos::OMutex, lclMutex >{}; }
 //=========================================================================
 
 SfxCancelManager::SfxCancelManager( SfxCancelManager *pParent )
-:   _pParent( pParent )
+:	_pParent( pParent )
 {
 }
 
@@ -59,7 +59,7 @@ SfxCancelManager::~SfxCancelManager()
 
 BOOL SfxCancelManager::CanCancel() const
 
-/*  [Beschreibung]
+/*	[Beschreibung]
 
     Liefert TRUE wenn an diesem CancelManager oder an einem Parent
     ein Job l"auft.
@@ -74,7 +74,7 @@ BOOL SfxCancelManager::CanCancel() const
 
 void SfxCancelManager::Cancel( BOOL bDeep )
 
-/*  [Beschreibung]
+/*	[Beschreibung]
 
     Diese Methode markiert alle angemeldeten <SfxCancellable>-Instanzen
     als suspendiert.
@@ -94,7 +94,7 @@ void SfxCancelManager::Cancel( BOOL bDeep )
 
 void SfxCancelManager::InsertCancellable( SfxCancellable *pJob )
 
-/*  [Beschreibung]
+/*	[Beschreibung]
 
     Diese interne Methode tr"agt 'pJob' in die Liste der unterbrechbaren
     Jobs ein und Broadcastet dies. Jeder <SfxCancellable> darf nur
@@ -122,7 +122,7 @@ void SfxCancelManager::InsertCancellable( SfxCancellable *pJob )
 
 void SfxCancelManager::RemoveCancellable( SfxCancellable *pJob )
 
-/*  [Beschreibung]
+/*	[Beschreibung]
 
     Diese interne Methode tr"agt 'pJob' aus die Liste der unterbrechbaren
     Jobs aus und Broadcastet dies. Dieser Aufruf mu\s paarig nach einem
@@ -156,7 +156,7 @@ SfxCancellable::~SfxCancellable()
 
 void SfxCancellable::Cancel()
 
-/*  [Description]
+/*	[Description]
 
     This virtual function is called when the user hits the cancel-button.
     If you overload it, you can stop your activities. Please always call
diff --git a/svl/source/notify/hint.cxx b/svl/source/notify/hint.cxx
index fd596d7663d8..e36f44620d39 100644
--- a/svl/source/notify/hint.cxx
+++ b/svl/source/notify/hint.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
diff --git a/svl/source/notify/isethint.cxx b/svl/source/notify/isethint.cxx
index 23ae3f19b154..1fa38a989de4 100644
--- a/svl/source/notify/isethint.cxx
+++ b/svl/source/notify/isethint.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
@@ -42,13 +42,13 @@ TYPEINIT1(SfxItemSetHint, SfxHint);
 
 SfxItemSetHint::SfxItemSetHint( SfxItemSet *pItemSet )
 
-/*  [Beschreibung]
+/*	[Beschreibung]
 
     Dieser Ctor "ubernimmt das als Parameter "ubergeben <SfxItemSet>,
     das im Dtor gel"oscht wird.
 */
 
-:   _pItemSet( pItemSet )
+:	_pItemSet( pItemSet )
 {
 }
 
@@ -56,12 +56,12 @@ SfxItemSetHint::SfxItemSetHint( SfxItemSet *pItemSet )
 
 SfxItemSetHint::SfxItemSetHint( const SfxItemSet &rItemSet )
 
-/*  [Beschreibung]
+/*	[Beschreibung]
 
     Dieser Ctor kopiert das als Parameter "ubergeben <SfxItemSet>.
 */
 
-:   _pItemSet( rItemSet.Clone() )
+:	_pItemSet( rItemSet.Clone() )
 {
 }
 
diff --git a/svl/source/notify/listener.cxx b/svl/source/notify/listener.cxx
index 0269894bff81..a0107cf43f60 100644
--- a/svl/source/notify/listener.cxx
+++ b/svl/source/notify/listener.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
diff --git a/svl/source/notify/listenerbase.cxx b/svl/source/notify/listenerbase.cxx
index ec899ee9d70b..f470b0083893 100644
--- a/svl/source/notify/listenerbase.cxx
+++ b/svl/source/notify/listenerbase.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
diff --git a/svl/source/notify/listenerbase.hxx b/svl/source/notify/listenerbase.hxx
index 677cffe9b4bd..83b2dbbc7137 100644
--- a/svl/source/notify/listenerbase.hxx
+++ b/svl/source/notify/listenerbase.hxx
@@ -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
@@ -42,14 +42,14 @@ public:
     SvtListenerBase( SvtListener& rLst, SvtBroadcaster& rBroadcaster );
     ~SvtListenerBase();
 
-    SvtListenerBase* GetNext() const        { return pNext; }
-    void SetNext( SvtListenerBase* p )      { pNext = p; }
+    SvtListenerBase* GetNext() const  		{ return pNext; }
+    void SetNext( SvtListenerBase* p ) 		{ pNext = p; }
 
-    SvtBroadcaster* GetBroadcaster() const  { return pBroadcaster; }
-    SvtListener* GetListener() const        { return pListener; }
+    SvtBroadcaster* GetBroadcaster() const	{ return pBroadcaster; }
+    SvtListener* GetListener() const 		{ return pListener; }
 
-    SvtListenerBase* GetLeft() const        { return pLeft; }
-    SvtListenerBase* GetRight() const       { return pRight; }
+    SvtListenerBase* GetLeft() const  		{ return pLeft; }
+    SvtListenerBase* GetRight() const  		{ return pRight; }
 };
 
 
diff --git a/svl/source/notify/listeneriter.cxx b/svl/source/notify/listeneriter.cxx
index 5dda8d0433b4..a0c29f812bcf 100644
--- a/svl/source/notify/listeneriter.cxx
+++ b/svl/source/notify/listeneriter.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
@@ -113,7 +113,7 @@ SvtListener* SvtListenerIter::GoPrev()
 }
 
 
-SvtListener* SvtListenerIter::GoStart()         // zum Anfang des Baums
+SvtListener* SvtListenerIter::GoStart() 		// zum Anfang des Baums
 {
     pAkt = rRoot.pRoot;
     if( pAkt )
@@ -124,7 +124,7 @@ SvtListener* SvtListenerIter::GoStart()         // zum Anfang des Baums
 }
 
 
-SvtListener* SvtListenerIter::GoEnd()           // zum End des Baums
+SvtListener* SvtListenerIter::GoEnd()			// zum End des Baums
 {
     pAkt = pDelNext;
     if( !pAkt )
@@ -179,13 +179,13 @@ SvtListener* SvtListenerIter::Next()
 }
 
 
-SvtListener* SvtListenerIter::GoRoot()      // wieder ab Root anfangen
+SvtListener* SvtListenerIter::GoRoot()		// wieder ab Root anfangen
 {
     pDelNext = pAkt = rRoot.pRoot;
     return pAkt ? pAkt->GetListener() : 0;
 }
 
-SvtListener* SvtListenerIter::GetCurr() const   // returns the current
+SvtListener* SvtListenerIter::GetCurr() const	// returns the current
 {
     return pDelNext ? pDelNext->GetListener() : 0;
 }
diff --git a/svl/source/notify/lstner.cxx b/svl/source/notify/lstner.cxx
index 3f003e6dde8f..c8316759314a 100644
--- a/svl/source/notify/lstner.cxx
+++ b/svl/source/notify/lstner.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
diff --git a/svl/source/notify/smplhint.cxx b/svl/source/notify/smplhint.cxx
index 98eecb91cfe2..9eb0461a0dab 100644
--- a/svl/source/notify/smplhint.cxx
+++ b/svl/source/notify/smplhint.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
diff --git a/svl/source/numbers/nbdll.cxx b/svl/source/numbers/nbdll.cxx
index b93eda3e7f37..0a443b9d1d4d 100644
--- a/svl/source/numbers/nbdll.cxx
+++ b/svl/source/numbers/nbdll.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
diff --git a/svl/source/numbers/numfmuno.cxx b/svl/source/numbers/numfmuno.cxx
index f40b367ae2af..ffc735a3df72 100644
--- a/svl/source/numbers/numfmuno.cxx
+++ b/svl/source/numbers/numfmuno.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
@@ -49,52 +49,52 @@ using namespace com::sun::star;
 
 //------------------------------------------------------------------------
 
-#define SERVICENAME_NUMBERFORMATTER "com.sun.star.util.NumberFormatter"
-#define SERVICENAME_NUMBERSETTINGS  "com.sun.star.util.NumberFormatSettings"
-#define SERVICENAME_NUMBERFORMATS   "com.sun.star.util.NumberFormats"
-#define SERVICENAME_NUMBERFORMAT    "com.sun.star.util.NumberFormatProperties"
+#define SERVICENAME_NUMBERFORMATTER	"com.sun.star.util.NumberFormatter"
+#define SERVICENAME_NUMBERSETTINGS	"com.sun.star.util.NumberFormatSettings"
+#define SERVICENAME_NUMBERFORMATS	"com.sun.star.util.NumberFormats"
+#define SERVICENAME_NUMBERFORMAT	"com.sun.star.util.NumberFormatProperties"
 
 //------------------------------------------------------------------------
 
-#define PROPERTYNAME_FMTSTR     "FormatString"
-#define PROPERTYNAME_LOCALE     "Locale"
-#define PROPERTYNAME_TYPE       "Type"
-#define PROPERTYNAME_COMMENT    "Comment"
-#define PROPERTYNAME_CURREXT    "CurrencyExtension"
-#define PROPERTYNAME_CURRSYM    "CurrencySymbol"
-#define PROPERTYNAME_CURRABB    "CurrencyAbbreviation"
-#define PROPERTYNAME_DECIMALS   "Decimals"
-#define PROPERTYNAME_LEADING    "LeadingZeros"
-#define PROPERTYNAME_NEGRED     "NegativeRed"
-#define PROPERTYNAME_STDFORM    "StandardFormat"
-#define PROPERTYNAME_THOUS      "ThousandsSeparator"
-#define PROPERTYNAME_USERDEF    "UserDefined"
-
-#define PROPERTYNAME_NOZERO     "NoZero"
-#define PROPERTYNAME_NULLDATE   "NullDate"
-#define PROPERTYNAME_STDDEC     "StandardDecimals"
-#define PROPERTYNAME_TWODIGIT   "TwoDigitDateStart"
+#define PROPERTYNAME_FMTSTR		"FormatString"
+#define PROPERTYNAME_LOCALE		"Locale"
+#define PROPERTYNAME_TYPE		"Type"
+#define PROPERTYNAME_COMMENT 	"Comment"
+#define PROPERTYNAME_CURREXT 	"CurrencyExtension"
+#define PROPERTYNAME_CURRSYM 	"CurrencySymbol"
+#define PROPERTYNAME_CURRABB 	"CurrencyAbbreviation"
+#define PROPERTYNAME_DECIMALS	"Decimals"
+#define PROPERTYNAME_LEADING	"LeadingZeros"
+#define PROPERTYNAME_NEGRED		"NegativeRed"
+#define PROPERTYNAME_STDFORM	"StandardFormat"
+#define PROPERTYNAME_THOUS		"ThousandsSeparator"
+#define PROPERTYNAME_USERDEF	"UserDefined"
+
+#define PROPERTYNAME_NOZERO		"NoZero"
+#define PROPERTYNAME_NULLDATE	"NullDate"
+#define PROPERTYNAME_STDDEC		"StandardDecimals"
+#define PROPERTYNAME_TWODIGIT	"TwoDigitDateStart"
 
 //------------------------------------------------------------------------
 
-//  alles ohne Which-ID, Map nur fuer PropertySetInfo
+//	alles ohne Which-ID, Map nur fuer PropertySetInfo
 
 const SfxItemPropertyMapEntry* lcl_GetNumberFormatPropertyMap()
 {
     static SfxItemPropertyMapEntry aNumberFormatPropertyMap_Impl[] =
     {
-        {MAP_CHAR_LEN(PROPERTYNAME_FMTSTR),   0, &getCppuType((rtl::OUString*)0),beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY, 0},
-        {MAP_CHAR_LEN(PROPERTYNAME_LOCALE),   0, &getCppuType((lang::Locale*)0),beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY, 0},
-        {MAP_CHAR_LEN(PROPERTYNAME_TYPE),     0, &getCppuType((sal_Int16*)0),   beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY, 0},
+        {MAP_CHAR_LEN(PROPERTYNAME_FMTSTR),	  0, &getCppuType((rtl::OUString*)0),beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY, 0},
+        {MAP_CHAR_LEN(PROPERTYNAME_LOCALE),	  0, &getCppuType((lang::Locale*)0),beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY, 0},
+        {MAP_CHAR_LEN(PROPERTYNAME_TYPE),	  0, &getCppuType((sal_Int16*)0),	beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY, 0},
         {MAP_CHAR_LEN(PROPERTYNAME_COMMENT),  0, &getCppuType((rtl::OUString*)0),beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY, 0},
         {MAP_CHAR_LEN(PROPERTYNAME_CURREXT),  0, &getCppuType((rtl::OUString*)0),beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY, 0},
         {MAP_CHAR_LEN(PROPERTYNAME_CURRSYM),  0, &getCppuType((rtl::OUString*)0),beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY, 0},
-        {MAP_CHAR_LEN(PROPERTYNAME_DECIMALS), 0, &getCppuType((sal_Int16*)0),   beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY, 0},
-        {MAP_CHAR_LEN(PROPERTYNAME_LEADING),  0, &getCppuType((sal_Int16*)0),   beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY, 0},
-        {MAP_CHAR_LEN(PROPERTYNAME_NEGRED),   0, &getBooleanCppuType(),         beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY, 0},
-        {MAP_CHAR_LEN(PROPERTYNAME_STDFORM),  0, &getBooleanCppuType(),         beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY, 0},
-        {MAP_CHAR_LEN(PROPERTYNAME_THOUS),    0, &getBooleanCppuType(),         beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY, 0},
-        {MAP_CHAR_LEN(PROPERTYNAME_USERDEF),  0, &getBooleanCppuType(),         beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY, 0},
+        {MAP_CHAR_LEN(PROPERTYNAME_DECIMALS), 0, &getCppuType((sal_Int16*)0),	beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY, 0},
+        {MAP_CHAR_LEN(PROPERTYNAME_LEADING),  0, &getCppuType((sal_Int16*)0),	beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY, 0},
+        {MAP_CHAR_LEN(PROPERTYNAME_NEGRED),	  0, &getBooleanCppuType(),			beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY, 0},
+        {MAP_CHAR_LEN(PROPERTYNAME_STDFORM),  0, &getBooleanCppuType(),			beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY, 0},
+        {MAP_CHAR_LEN(PROPERTYNAME_THOUS),	  0, &getBooleanCppuType(),			beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY, 0},
+        {MAP_CHAR_LEN(PROPERTYNAME_USERDEF),  0, &getBooleanCppuType(),			beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY, 0},
         {MAP_CHAR_LEN(PROPERTYNAME_CURRABB),  0, &getCppuType((rtl::OUString*)0),beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY, 0},
         {0,0,0,0,0,0}
     };
@@ -105,10 +105,10 @@ const SfxItemPropertyMapEntry* lcl_GetNumberSettingsPropertyMap()
 {
     static SfxItemPropertyMapEntry aNumberSettingsPropertyMap_Impl[] =
     {
-        {MAP_CHAR_LEN(PROPERTYNAME_NOZERO),   0, &getBooleanCppuType(),         beans::PropertyAttribute::BOUND, 0},
-        {MAP_CHAR_LEN(PROPERTYNAME_NULLDATE), 0, &getCppuType((util::Date*)0),  beans::PropertyAttribute::BOUND, 0},
-        {MAP_CHAR_LEN(PROPERTYNAME_STDDEC),   0, &getCppuType((sal_Int16*)0),   beans::PropertyAttribute::BOUND, 0},
-        {MAP_CHAR_LEN(PROPERTYNAME_TWODIGIT), 0, &getCppuType((sal_Int16*)0),   beans::PropertyAttribute::BOUND, 0},
+        {MAP_CHAR_LEN(PROPERTYNAME_NOZERO),	  0, &getBooleanCppuType(),			beans::PropertyAttribute::BOUND, 0},
+        {MAP_CHAR_LEN(PROPERTYNAME_NULLDATE), 0, &getCppuType((util::Date*)0),	beans::PropertyAttribute::BOUND, 0},
+        {MAP_CHAR_LEN(PROPERTYNAME_STDDEC),	  0, &getCppuType((sal_Int16*)0),	beans::PropertyAttribute::BOUND, 0},
+        {MAP_CHAR_LEN(PROPERTYNAME_TWODIGIT), 0, &getCppuType((sal_Int16*)0),	beans::PropertyAttribute::BOUND, 0},
         {0,0,0,0,0,0}
     };
     return aNumberSettingsPropertyMap_Impl;
@@ -118,13 +118,13 @@ const SfxItemPropertyMapEntry* lcl_GetNumberSettingsPropertyMap()
 
 LanguageType lcl_GetLanguage( const lang::Locale& rLocale )
 {
-    //  empty language -> LANGUAGE_SYSTEM
+    //	empty language -> LANGUAGE_SYSTEM
     if ( rLocale.Language.getLength() == 0 )
         return LANGUAGE_SYSTEM;
 
     LanguageType eRet = MsLangId::convertLocaleToLanguage( rLocale );
     if ( eRet == LANGUAGE_NONE )
-        eRet = LANGUAGE_SYSTEM;         //! or throw an exception?
+        eRet = LANGUAGE_SYSTEM;			//! or throw an exception?
 
     return eRet;
 }
@@ -157,9 +157,9 @@ void SAL_CALL SvNumberFormatterServiceObj::attachNumberFormatsSupplier(
     {
         ::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() );
 
-        SvNumberFormatsSupplierObj* pNew = SvNumberFormatsSupplierObj::getImplementation( _xSupplier );
+        SvNumberFormatsSupplierObj*	pNew = SvNumberFormatsSupplierObj::getImplementation( _xSupplier );
         if (!pNew)
-            throw uno::RuntimeException();      // wrong object
+            throw uno::RuntimeException();		// wrong object
 
         xAutoReleaseOld = xSupplier;
 
@@ -249,7 +249,7 @@ util::Color SAL_CALL SvNumberFormatterServiceObj::queryColorForNumber( sal_Int32
 {
     ::osl::MutexGuard aGuard( m_aMutex );
 
-    util::Color nRet = aDefaultColor;       // color = INT32
+    util::Color nRet = aDefaultColor;		// color = INT32
     SvNumberFormatter* pFormatter = xSupplier.is() ? xSupplier->GetNumberFormatter() : NULL;
     if (pFormatter)
     {
@@ -291,7 +291,7 @@ util::Color SAL_CALL SvNumberFormatterServiceObj::queryColorForString( sal_Int32
 {
     ::osl::MutexGuard aGuard( m_aMutex );
 
-    util::Color nRet = aDefaultColor;       // color = INT32
+    util::Color nRet = aDefaultColor;		// color = INT32
     SvNumberFormatter* pFormatter = xSupplier.is() ? xSupplier->GetNumberFormatter() : NULL;
     if (pFormatter)
     {
@@ -369,7 +369,7 @@ util::Color SAL_CALL SvNumberFormatterServiceObj::queryPreviewColorForNumber(
 {
     ::osl::MutexGuard aGuard( m_aMutex );
 
-    util::Color nRet = aDefaultColor;       // color = INT32
+    util::Color nRet = aDefaultColor;		// color = INT32
     SvNumberFormatter* pFormatter = xSupplier.is() ? xSupplier->GetNumberFormatter() : NULL;
     if (pFormatter)
     {
@@ -493,7 +493,7 @@ sal_Int32 SAL_CALL SvNumberFormatsObj::queryKey( const rtl::OUString& aFormat,
         LanguageType eLang = lcl_GetLanguage( nLocale );
         if (bScan)
         {
-            //! irgendwas muss hier noch passieren...
+            //!	irgendwas muss hier noch passieren...
         }
         nRet = pFormatter->GetEntryKey( aFormat, eLang );
     }
@@ -523,10 +523,10 @@ sal_Int32 SAL_CALL SvNumberFormatsObj::addNew( const rtl::OUString& aFormat,
             nRet = nKey;
         else if (nCheckPos)
         {
-            throw util::MalformedNumberFormatException();       // ungueltiges Format
+            throw util::MalformedNumberFormatException();		// ungueltiges Format
         }
         else
-            throw uno::RuntimeException();                      // anderer Fehler (z.B. schon vorhanden)
+            throw uno::RuntimeException();						// anderer Fehler (z.B. schon vorhanden)
     }
     else
         throw uno::RuntimeException();
@@ -555,10 +555,10 @@ sal_Int32 SAL_CALL SvNumberFormatsObj::addNewConverted( const rtl::OUString& aFo
             nRet = nKey;
         else if (nCheckPos)
         {
-            throw util::MalformedNumberFormatException();       // ungueltiges Format
+            throw util::MalformedNumberFormatException();		// ungueltiges Format
         }
         else
-            throw uno::RuntimeException();                      // anderer Fehler (z.B. schon vorhanden)
+            throw uno::RuntimeException();						// anderer Fehler (z.B. schon vorhanden)
     }
     else
         throw uno::RuntimeException();
@@ -574,7 +574,7 @@ void SAL_CALL SvNumberFormatsObj::removeByKey( sal_Int32 nKey ) throw(uno::Runti
     if (pFormatter)
     {
         pFormatter->DeleteEntry(nKey);
-        rSupplier.NumberFormatDeleted(nKey);        // Benachrichtigung fuers Dokument
+        rSupplier.NumberFormatDeleted(nKey);		// Benachrichtigung fuers Dokument
     }
 }
 
@@ -628,8 +628,8 @@ sal_Int32 SAL_CALL SvNumberFormatsObj::getStandardFormat( sal_Int16 nType, const
     if (pFormatter)
     {
         LanguageType eLang = lcl_GetLanguage( nLocale );
-        //  mask out "defined" bit, so type from an existing number format
-        //  can directly be used for getStandardFormat
+        //	mask out "defined" bit, so type from an existing number format
+        //	can directly be used for getStandardFormat
         nType &= ~NUMBERFORMAT_DEFINED;
         nRet = pFormatter->GetStandardFormat(nType, eLang);
     }
@@ -745,7 +745,7 @@ void SAL_CALL SvNumberFormatObj::setPropertyValue( const rtl::OUString&,
                         lang::IllegalArgumentException, lang::WrappedTargetException,
                         uno::RuntimeException)
 {
-    throw beans::UnknownPropertyException();    //  everything is read-only
+    throw beans::UnknownPropertyException();	//	everything is read-only
 }
 
 uno::Any SAL_CALL SvNumberFormatObj::getPropertyValue( const rtl::OUString& aPropertyName )
@@ -783,7 +783,7 @@ uno::Any SAL_CALL SvNumberFormatObj::getPropertyValue( const rtl::OUString& aPro
         }
         else if (aString.EqualsAscii( PROPERTYNAME_STDFORM ))
         {
-            //! SvNumberformat Member bStandard rausreichen?
+            //!	SvNumberformat Member bStandard rausreichen?
             BOOL bStandard = ( ( nKey % SV_COUNTRY_LANGUAGE_OFFSET ) == 0 );
             aRet.setValue( &bStandard, getBooleanCppuType() );
         }
@@ -899,7 +899,7 @@ uno::Sequence<beans::PropertyValue> SAL_CALL SvNumberFormatObj::getPropertyValue
         String aFmtStr = pFormat->GetFormatstring();
         String aComment = pFormat->GetComment();
         BOOL bStandard = ( ( nKey % SV_COUNTRY_LANGUAGE_OFFSET ) == 0 );
-        //! SvNumberformat Member bStandard rausreichen?
+        //!	SvNumberformat Member bStandard rausreichen?
         BOOL bUserDef = ( ( pFormat->GetType() & NUMBERFORMAT_DEFINED ) != 0 );
         BOOL bThousand, bRed;
         USHORT nDecimals, nLeading;
@@ -948,7 +948,7 @@ void SAL_CALL SvNumberFormatObj::setPropertyValues( const uno::Sequence<beans::P
                                 lang::IllegalArgumentException, lang::WrappedTargetException,
                                 uno::RuntimeException)
 {
-    throw beans::UnknownPropertyException();    //  everything is read-only
+    throw beans::UnknownPropertyException();	//	everything is read-only
 }
 
 // XServiceInfo
@@ -1013,7 +1013,7 @@ void SAL_CALL SvNumberFormatSettingsObj::setPropertyValue( const rtl::OUString&
         String aString = aPropertyName;
         if (aString.EqualsAscii( PROPERTYNAME_NOZERO ))
         {
-            //  operator >>= shouldn't be used for bool (?)
+            //	operator >>= shouldn't be used for bool (?)
             if ( aValue.getValueTypeClass() == uno::TypeClass_BOOLEAN )
                 pFormatter->SetNoZero( *(sal_Bool*)aValue.getValue() );
         }
diff --git a/svl/source/numbers/numfmuno.hxx b/svl/source/numbers/numfmuno.hxx
index 09bc58a0b6ee..9c5f2b26f06e 100644
--- a/svl/source/numbers/numfmuno.hxx
+++ b/svl/source/numbers/numfmuno.hxx
@@ -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
@@ -44,7 +44,7 @@ class SvNumberFormatter;
 class SvNumberFormatsSupplierObj;
 
 
-//  SvNumberFormatterServiceObj wird global als Service angemeldet
+//	SvNumberFormatterServiceObj wird global als Service angemeldet
 
 class SvNumberFormatterServiceObj : public cppu::WeakImplHelper3<
                                         com::sun::star::util::XNumberFormatter,
@@ -57,7 +57,7 @@ private:
 
 public:
                         SvNumberFormatterServiceObj();
-    virtual             ~SvNumberFormatterServiceObj();
+    virtual				~SvNumberFormatterServiceObj();
 
                         // XNumberFormatter
     virtual void SAL_CALL attachNumberFormatsSupplier(
@@ -121,7 +121,7 @@ private:
 
 public:
                     SvNumberFormatsObj(SvNumberFormatsSupplierObj& pParent, ::comphelper::SharedMutex& _rMutex);
-    virtual         ~SvNumberFormatsObj();
+    virtual			~SvNumberFormatsObj();
 
 
                         // XNumberFormats
@@ -182,19 +182,19 @@ class SvNumberFormatObj : public cppu::WeakImplHelper3<
                                         com::sun::star::lang::XServiceInfo>
 {
 private:
-    SvNumberFormatsSupplierObj&         rSupplier;
-    ULONG                               nKey;
+    SvNumberFormatsSupplierObj&	        rSupplier;
+    ULONG						        nKey;
     mutable ::comphelper::SharedMutex   m_aMutex;
 
 public:
     SvNumberFormatObj( SvNumberFormatsSupplierObj& rParent, ULONG nK, const ::comphelper::SharedMutex& _rMutex );
-    virtual         ~SvNumberFormatObj();
+    virtual			~SvNumberFormatObj();
 
                             // XPropertySet
     virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo >
                             SAL_CALL getPropertySetInfo(  )
                                 throw(::com::sun::star::uno::RuntimeException);
-    virtual void SAL_CALL   setPropertyValue( const ::rtl::OUString& aPropertyName,
+    virtual void SAL_CALL	setPropertyValue( const ::rtl::OUString& aPropertyName,
                                     const ::com::sun::star::uno::Any& aValue )
                                 throw(::com::sun::star::beans::UnknownPropertyException,
                                     ::com::sun::star::beans::PropertyVetoException,
@@ -206,25 +206,25 @@ public:
                                 throw(::com::sun::star::beans::UnknownPropertyException,
                                     ::com::sun::star::lang::WrappedTargetException,
                                     ::com::sun::star::uno::RuntimeException);
-    virtual void SAL_CALL   addPropertyChangeListener( const ::rtl::OUString& aPropertyName,
+    virtual void SAL_CALL	addPropertyChangeListener( const ::rtl::OUString& aPropertyName,
                                     const ::com::sun::star::uno::Reference<
                                         ::com::sun::star::beans::XPropertyChangeListener >& xListener )
                                 throw(::com::sun::star::beans::UnknownPropertyException,
                                     ::com::sun::star::lang::WrappedTargetException,
                                     ::com::sun::star::uno::RuntimeException);
-    virtual void SAL_CALL   removePropertyChangeListener( const ::rtl::OUString& aPropertyName,
+    virtual void SAL_CALL	removePropertyChangeListener( const ::rtl::OUString& aPropertyName,
                                     const ::com::sun::star::uno::Reference<
                                         ::com::sun::star::beans::XPropertyChangeListener >& aListener )
                                 throw(::com::sun::star::beans::UnknownPropertyException,
                                     ::com::sun::star::lang::WrappedTargetException,
                                     ::com::sun::star::uno::RuntimeException);
-    virtual void SAL_CALL   addVetoableChangeListener( const ::rtl::OUString& PropertyName,
+    virtual void SAL_CALL	addVetoableChangeListener( const ::rtl::OUString& PropertyName,
                                     const ::com::sun::star::uno::Reference<
                                         ::com::sun::star::beans::XVetoableChangeListener >& aListener )
                                 throw(::com::sun::star::beans::UnknownPropertyException,
                                     ::com::sun::star::lang::WrappedTargetException,
                                     ::com::sun::star::uno::RuntimeException);
-    virtual void SAL_CALL   removeVetoableChangeListener( const ::rtl::OUString& PropertyName,
+    virtual void SAL_CALL	removeVetoableChangeListener( const ::rtl::OUString& PropertyName,
                                     const ::com::sun::star::uno::Reference<
                                         ::com::sun::star::beans::XVetoableChangeListener >& aListener )
                                 throw(::com::sun::star::beans::UnknownPropertyException,
@@ -234,7 +234,7 @@ public:
                             // XPropertyAccess
     virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > SAL_CALL
                             getPropertyValues() throw(::com::sun::star::uno::RuntimeException);
-    virtual void SAL_CALL   setPropertyValues( const ::com::sun::star::uno::Sequence<
+    virtual void SAL_CALL	setPropertyValues( const ::com::sun::star::uno::Sequence<
                                 ::com::sun::star::beans::PropertyValue >& aProps )
                                     throw(::com::sun::star::beans::UnknownPropertyException,
                                             ::com::sun::star::beans::PropertyVetoException,
@@ -262,14 +262,14 @@ private:
 
 public:
                     SvNumberFormatSettingsObj( SvNumberFormatsSupplierObj& rParent, const ::comphelper::SharedMutex& _rMutex);
-    virtual         ~SvNumberFormatSettingsObj();
+    virtual			~SvNumberFormatSettingsObj();
 
 
                             // XPropertySet
     virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo >
                             SAL_CALL getPropertySetInfo(  )
                                 throw(::com::sun::star::uno::RuntimeException);
-    virtual void SAL_CALL   setPropertyValue( const ::rtl::OUString& aPropertyName,
+    virtual void SAL_CALL	setPropertyValue( const ::rtl::OUString& aPropertyName,
                                     const ::com::sun::star::uno::Any& aValue )
                                 throw(::com::sun::star::beans::UnknownPropertyException,
                                     ::com::sun::star::beans::PropertyVetoException,
@@ -281,25 +281,25 @@ public:
                                 throw(::com::sun::star::beans::UnknownPropertyException,
                                     ::com::sun::star::lang::WrappedTargetException,
                                     ::com::sun::star::uno::RuntimeException);
-    virtual void SAL_CALL   addPropertyChangeListener( const ::rtl::OUString& aPropertyName,
+    virtual void SAL_CALL	addPropertyChangeListener( const ::rtl::OUString& aPropertyName,
                                     const ::com::sun::star::uno::Reference<
                                         ::com::sun::star::beans::XPropertyChangeListener >& xListener )
                                 throw(::com::sun::star::beans::UnknownPropertyException,
                                     ::com::sun::star::lang::WrappedTargetException,
                                     ::com::sun::star::uno::RuntimeException);
-    virtual void SAL_CALL   removePropertyChangeListener( const ::rtl::OUString& aPropertyName,
+    virtual void SAL_CALL	removePropertyChangeListener( const ::rtl::OUString& aPropertyName,
                                     const ::com::sun::star::uno::Reference<
                                         ::com::sun::star::beans::XPropertyChangeListener >& aListener )
                                 throw(::com::sun::star::beans::UnknownPropertyException,
                                     ::com::sun::star::lang::WrappedTargetException,
                                     ::com::sun::star::uno::RuntimeException);
-    virtual void SAL_CALL   addVetoableChangeListener( const ::rtl::OUString& PropertyName,
+    virtual void SAL_CALL	addVetoableChangeListener( const ::rtl::OUString& PropertyName,
                                     const ::com::sun::star::uno::Reference<
                                         ::com::sun::star::beans::XVetoableChangeListener >& aListener )
                                 throw(::com::sun::star::beans::UnknownPropertyException,
                                     ::com::sun::star::lang::WrappedTargetException,
                                     ::com::sun::star::uno::RuntimeException);
-    virtual void SAL_CALL   removeVetoableChangeListener( const ::rtl::OUString& PropertyName,
+    virtual void SAL_CALL	removeVetoableChangeListener( const ::rtl::OUString& PropertyName,
                                     const ::com::sun::star::uno::Reference<
                                         ::com::sun::star::beans::XVetoableChangeListener >& aListener )
                                 throw(::com::sun::star::beans::UnknownPropertyException,
diff --git a/svl/source/numbers/numhead.cxx b/svl/source/numbers/numhead.cxx
index adf42fe26f8f..e95a581b76a4 100644
--- a/svl/source/numbers/numhead.cxx
+++ b/svl/source/numbers/numhead.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
@@ -33,15 +33,15 @@
 
 #include "numhead.hxx"
 
-//      ID's fuer Dateien:
-#define SV_NUMID_SIZES                      0x4200
+//		ID's fuer Dateien:
+#define SV_NUMID_SIZES						0x4200
 
 // STATIC DATA -----------------------------------------------------------
 
 //SEG_EOFGLOBALS()
 
 // =======================================================================
-/*                              wird fuer SvNumberformatter nicht gebraucht
+/*								wird fuer SvNumberformatter nicht gebraucht
 //#pragma SEG_FUNCDEF(numhead_01)
 
 SvNumReadHeader::SvNumReadHeader(SvStream& rNewStream) :
@@ -59,7 +59,7 @@ SvNumReadHeader::~SvNumReadHeader()
     ULONG nReadEnd = rStream.Tell();
     DBG_ASSERT( nReadEnd <= nDataEnd, "zuviele Bytes gelesen" );
     if ( nReadEnd != nDataEnd )
-        rStream.Seek(nDataEnd);                     // Rest ueberspringen
+        rStream.Seek(nDataEnd); 					// Rest ueberspringen
 }
 
 //#pragma SEG_FUNCDEF(numhead_03)
@@ -92,11 +92,11 @@ SvNumWriteHeader::~SvNumWriteHeader()
 {
     ULONG nPos = rStream.Tell();
 
-    if ( nPos - nDataPos != nDataSize )             // Default getroffen?
+    if ( nPos - nDataPos != nDataSize )				// Default getroffen?
     {
         nDataSize = nPos - nDataPos;
         rStream.Seek(nDataPos - sizeof(sal_uInt32));
-        rStream << nDataSize;                       // Groesse am Anfang eintragen
+        rStream << nDataSize;						// Groesse am Anfang eintragen
         rStream.Seek(nPos);
     }
 }
@@ -169,7 +169,7 @@ void ImpSvNumMultipleReadHeader::EndEntry()
     ULONG nPos = rStream.Tell();
     DBG_ASSERT( nPos <= nEntryEnd, "zuviel gelesen" );
     if ( nPos != nEntryEnd )
-        rStream.Seek( nEntryEnd );          // Rest ueberspringen
+        rStream.Seek( nEntryEnd );			// Rest ueberspringen
 }
 
 //#pragma SEG_FUNCDEF(numhead_0d)
@@ -221,12 +221,12 @@ ImpSvNumMultipleWriteHeader::~ImpSvNumMultipleWriteHeader()
     rStream << static_cast<sal_uInt32>(aMemStream.Tell());
     rStream.Write( aMemStream.GetData(), aMemStream.Tell() );
 
-    if ( nDataEnd - nDataPos != nDataSize )                 // Default getroffen?
+    if ( nDataEnd - nDataPos != nDataSize )					// Default getroffen?
     {
         nDataSize = nDataEnd - nDataPos;
         ULONG nPos = rStream.Tell();
         rStream.Seek(nDataPos-sizeof(sal_uInt32));
-        rStream << nDataSize;                               // Groesse am Anfang eintragen
+        rStream << nDataSize;								// Groesse am Anfang eintragen
         rStream.Seek(nPos);
     }
 }
diff --git a/svl/source/numbers/numhead.hxx b/svl/source/numbers/numhead.hxx
index 7df06033e0d7..20b1f5398363 100644
--- a/svl/source/numbers/numhead.hxx
+++ b/svl/source/numbers/numhead.hxx
@@ -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
@@ -32,28 +32,28 @@
 
 // -----------------------------------------------------------------------
 
-        //  "Automatischer" Record-Header mit Groessenangabe
+        //	"Automatischer" Record-Header mit Groessenangabe
 
-/*                      wird fuer SvNumberFormatter nicht gebraucht
+/* 						wird fuer SvNumberFormatter nicht gebraucht
 class SvNumReadHeader
 {
 private:
-    SvStream&   rStream;
-    ULONG       nDataEnd;
+    SvStream&	rStream;
+    ULONG		nDataEnd;
 
 public:
     SvNumReadHeader(SvStream& rNewStream);
     ~SvNumReadHeader();
 
-    ULONG   BytesLeft() const;
+    ULONG	BytesLeft() const;
 };
 
 class SvNumWriteHeader
 {
 private:
-    SvStream&   rStream;
-    ULONG       nDataPos;
-    ULONG       nDataSize;
+    SvStream&	rStream;
+    ULONG		nDataPos;
+    ULONG		nDataSize;
 
 public:
     SvNumWriteHeader(SvStream& rNewStream, ULONG nDefault = 0);
@@ -62,43 +62,43 @@ public:
 
 */
 
-        //  Header mit Groessenangaben fuer mehrere Objekte
+        //	Header mit Groessenangaben fuer mehrere Objekte
 
 class ImpSvNumMultipleReadHeader
 {
 private:
-    SvStream&       rStream;
-    char*           pBuf;
-    SvMemoryStream* pMemStream;
-    ULONG           nEndPos;
-    ULONG           nEntryEnd;
+    SvStream&		rStream;
+    char*			pBuf;
+    SvMemoryStream*	pMemStream;
+    ULONG			nEndPos;
+    ULONG			nEntryEnd;
 
 public:
     ImpSvNumMultipleReadHeader(SvStream& rNewStream);
     ~ImpSvNumMultipleReadHeader();
 
-    void    StartEntry();
-    void    EndEntry();
-    ULONG   BytesLeft() const;
+    void	StartEntry();
+    void	EndEntry();
+    ULONG	BytesLeft() const;
 
-    static void Skip( SvStream& );      // komplett ueberspringen
+    static void Skip( SvStream& );		// komplett ueberspringen
 };
 
 class ImpSvNumMultipleWriteHeader
 {
 private:
-    SvStream&       rStream;
-    SvMemoryStream  aMemStream;
-    ULONG           nDataPos;
-    sal_uInt32      nDataSize;
-    ULONG           nEntryStart;
+    SvStream&		rStream;
+    SvMemoryStream	aMemStream;
+    ULONG			nDataPos;
+    sal_uInt32		nDataSize;
+    ULONG			nEntryStart;
 
 public:
     ImpSvNumMultipleWriteHeader(SvStream& rNewStream, ULONG nDefault = 0);
     ~ImpSvNumMultipleWriteHeader();
 
-    void    StartEntry();
-    void    EndEntry();
+    void	StartEntry();
+    void	EndEntry();
 };
 
 #endif
diff --git a/svl/source/numbers/numuno.cxx b/svl/source/numbers/numuno.cxx
index a6208657406e..4d53eccd0e1a 100644
--- a/svl/source/numbers/numuno.cxx
+++ b/svl/source/numbers/numuno.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
@@ -86,18 +86,18 @@ SvNumberFormatter* SvNumberFormatsSupplierObj::GetNumberFormatter() const
 
 void SvNumberFormatsSupplierObj::SetNumberFormatter(SvNumberFormatter* pNew)
 {
-    //  der alte Numberformatter ist ungueltig geworden, nicht mehr darauf zugreifen!
+    //	der alte Numberformatter ist ungueltig geworden, nicht mehr darauf zugreifen!
     pImpl->pFormatter = pNew;
 }
 
 void SvNumberFormatsSupplierObj::NumberFormatDeleted(sal_uInt32)
 {
-    //  Basis-Implementierung tut nix...
+    //	Basis-Implementierung tut nix...
 }
 
 void SvNumberFormatsSupplierObj::SettingsChanged()
 {
-    //  Basis-Implementierung tut nix...
+    //	Basis-Implementierung tut nix...
 }
 
 // XNumberFormatsSupplier
@@ -123,8 +123,8 @@ uno::Reference<util::XNumberFormats> SAL_CALL SvNumberFormatsSupplierObj::getNum
 sal_Int64 SAL_CALL SvNumberFormatsSupplierObj::getSomething(
                 const uno::Sequence<sal_Int8 >& rId ) throw(uno::RuntimeException)
 {
-    if ( rId.getLength() == 16 &&
-          0 == rtl_compareMemory( getUnoTunnelId().getConstArray(),
+    if ( rId.getLength() == 16 && 
+          0 == rtl_compareMemory( getUnoTunnelId().getConstArray(),  
                                     rId.getConstArray(), 16 ) )
     {
         return sal::static_int_cast<sal_Int64>(reinterpret_cast<sal_IntPtr>(this));
diff --git a/svl/source/numbers/supservs.cxx b/svl/source/numbers/supservs.cxx
index 90d41977e974..53c5446f9748 100644
--- a/svl/source/numbers/supservs.cxx
+++ b/svl/source/numbers/supservs.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
@@ -45,7 +45,7 @@ using namespace ::com::sun::star::util;
 using namespace ::vos;
 using namespace ::utl;
 
-#define PERSISTENT_SERVICE_NAME     ::rtl::OUString::createFromAscii("com.sun.star.util.NumberFormatsSupplier");
+#define PERSISTENT_SERVICE_NAME		::rtl::OUString::createFromAscii("com.sun.star.util.NumberFormatsSupplier");
 
 //-------------------------------------------------------------------------
 Reference< XInterface > SAL_CALL SvNumberFormatsSupplierServiceObject_CreateInstance(const Reference< XMultiServiceFactory >& _rxFactory)
@@ -95,7 +95,7 @@ void SAL_CALL SvNumberFormatsSupplierServiceObject::initialize( const Sequence<
         // maybe you already called a method which needed the formatter
         // you should use XMultiServiceFactory::createInstanceWithArguments to avoid that
     if (m_pOwnFormatter)
-    {   // !!! this is only a emergency handling, normally this should not occur !!!
+    {	// !!! this is only a emergency handling, normally this should not occur !!!
         delete m_pOwnFormatter;
         m_pOwnFormatter = NULL;
         SetNumberFormatter(m_pOwnFormatter);
diff --git a/svl/source/numbers/supservs.hxx b/svl/source/numbers/supservs.hxx
index 45f6b3a8e285..126fbdd56803 100644
--- a/svl/source/numbers/supservs.hxx
+++ b/svl/source/numbers/supservs.hxx
@@ -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
@@ -36,25 +36,25 @@
 
 //=========================================================================
 //= SvNumberFormatsSupplierServiceObject - a number formats supplier which
-//=             - can be instantiated as an service
-//=             - supports the ::com::sun::star::io::XPersistObject interface
-//=             - works with it's own SvNumberFormatter instance
-//=             - can be initialized (::com::sun::star::lang::XInitialization)
-//=                 with a specific language (i.e. ::com::sun::star::lang::Locale)
+//=				- can be instantiated as an service
+//=				- supports the ::com::sun::star::io::XPersistObject interface
+//=				- works with it's own SvNumberFormatter instance
+//=				- can be initialized (::com::sun::star::lang::XInitialization)
+//=					with a specific language (i.e. ::com::sun::star::lang::Locale)
 //=========================================================================
 class SvNumberFormatsSupplierServiceObject
             :protected SvNumberFormatsSupplierObj
             ,public ::com::sun::star::lang::XInitialization
             ,public ::com::sun::star::io::XPersistObject
             ,public ::com::sun::star::lang::XServiceInfo
-{   // don't want the Set-/GetNumberFormatter to be accessable from outside
+{	// don't want the Set-/GetNumberFormatter to be accessable from outside
 
     friend ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >
         SAL_CALL SvNumberFormatsSupplierServiceObject_CreateInstance(
             const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >&);
 
 protected:
-    SvNumberFormatter*  m_pOwnFormatter;
+    SvNumberFormatter*	m_pOwnFormatter;
     ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >
                         m_xORB;
 
diff --git a/svl/source/numbers/zforfind.cxx b/svl/source/numbers/zforfind.cxx
index 8c63ed903825..1152d54f0783 100644
--- a/svl/source/numbers/zforfind.cxx
+++ b/svl/source/numbers/zforfind.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
diff --git a/svl/source/numbers/zforfind.hxx b/svl/source/numbers/zforfind.hxx
index 42571f56dd92..51842e26b553 100644
--- a/svl/source/numbers/zforfind.hxx
+++ b/svl/source/numbers/zforfind.hxx
@@ -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
diff --git a/svl/source/numbers/zforlist.cxx b/svl/source/numbers/zforlist.cxx
index 7343a0a9c0e6..17662ae26603 100644
--- a/svl/source/numbers/zforlist.cxx
+++ b/svl/source/numbers/zforlist.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
@@ -78,15 +78,15 @@ using namespace ::com::sun::star::lang;
 #define ZF_STANDARD_DATETIME    50
 #define ZF_STANDARD_SCIENTIFIC  60
 #define ZF_STANDARD_FRACTION    70
-#define ZF_STANDARD_NEWEXTENDED 75
-#define ZF_STANDARD_NEWEXTENDEDMAX  SV_MAX_ANZ_STANDARD_FORMATE-2   // 98
+#define ZF_STANDARD_NEWEXTENDED	75
+#define ZF_STANDARD_NEWEXTENDEDMAX	SV_MAX_ANZ_STANDARD_FORMATE-2	// 98
 #define ZF_STANDARD_LOGICAL     SV_MAX_ANZ_STANDARD_FORMATE-1 //  99
 #define ZF_STANDARD_TEXT        SV_MAX_ANZ_STANDARD_FORMATE   // 100
 
 /* Locale that is set if an unknown locale (from another system) is loaded of
  * legacy documents. Can not be SYSTEM because else, for example, a German "DM"
  * (old currency) is recognized as a date (#53155#). */
-#define UNKNOWN_SUBSTITUTE      LANGUAGE_ENGLISH_US
+#define UNKNOWN_SUBSTITUTE		LANGUAGE_ENGLISH_US
 
 static BOOL bIndexTableInitialized = FALSE;
 static sal_uInt32 __FAR_DATA theIndexTable[NF_INDEX_TABLE_ENTRIES];
@@ -161,13 +161,13 @@ void SvNumberFormatterRegistry_Impl::ConfigurationChanged( utl::ConfigurationBro
 
 SvNumberFormatterRegistry_Impl* SvNumberFormatter::pFormatterRegistry = NULL;
 BOOL SvNumberFormatter::bCurrencyTableInitialized = FALSE;
-namespace
+namespace 
 {
-    struct theCurrencyTable :
-        public rtl::Static< NfCurrencyTable, theCurrencyTable > {};
+    struct theCurrencyTable : 
+        public rtl::Static< NfCurrencyTable, theCurrencyTable > {}; 
 
-    struct theLegacyOnlyCurrencyTable :
-        public rtl::Static< NfCurrencyTable, theLegacyOnlyCurrencyTable > {};
+    struct theLegacyOnlyCurrencyTable : 
+        public rtl::Static< NfCurrencyTable, theLegacyOnlyCurrencyTable > {}; 
 }
 USHORT SvNumberFormatter::nSystemCurrencyPosition = 0;
 SV_IMPL_PTRARR( NfCurrencyTable, NfCurrencyEntry* );
@@ -356,16 +356,16 @@ void SvNumberFormatter::ImpChangeSysCL( LanguageType eLnge, BOOL bLoadingSO5 )
         IniLnge = eLnge;
         ChangeIntl(eLnge);
         SvNumberformat* pEntry = aFTable.First();
-        while (pEntry)                          // delete old formats
+        while (pEntry)							// delete old formats
         {
             pEntry = (SvNumberformat*) aFTable.Remove(aFTable.GetCurKey());
             delete pEntry;
             pEntry = (SvNumberformat*) aFTable.First();
         }
-        ImpGenerateFormats( 0, bLoadingSO5 );   // new standard formats
+        ImpGenerateFormats( 0, bLoadingSO5 );	// new standard formats
     }
     else if ( bLoadingSO5 )
-    {   // delete additional standard formats
+    {	// delete additional standard formats
         sal_uInt32 nKey;
         aFTable.Seek( SV_MAX_ANZ_STANDARD_FORMATE + 1 );
         while ( (nKey = aFTable.GetCurKey()) > SV_MAX_ANZ_STANDARD_FORMATE &&
@@ -480,19 +480,19 @@ BOOL SvNumberFormatter::HasTextFormat(sal_uInt32 F_Index) const
 BOOL SvNumberFormatter::PutEntry(String& rString,
                                  xub_StrLen& nCheckPos,
                                  short& nType,
-                                 sal_uInt32& nKey,          // Formatnummer
+                                 sal_uInt32& nKey,			// Formatnummer
                                  LanguageType eLnge)
 {
     nKey = 0;
-    if (rString.Len() == 0)                             // keinen Leerstring
+    if (rString.Len() == 0) 							// keinen Leerstring
     {
-        nCheckPos = 1;                                  // -> Fehler
+        nCheckPos = 1;									// -> Fehler
         return FALSE;
     }
     if (eLnge == LANGUAGE_DONTKNOW)
         eLnge = IniLnge;
 
-    ChangeIntl(eLnge);                                  // ggfs. austauschen
+    ChangeIntl(eLnge);									// ggfs. austauschen
     LanguageType eLge = eLnge;                          // Umgehung const fuer ConvertMode
     BOOL bCheck = FALSE;
     SvNumberformat* p_Entry = new SvNumberformat(rString,
@@ -500,8 +500,8 @@ BOOL SvNumberFormatter::PutEntry(String& rString,
                                                  pStringScanner,
                                                  nCheckPos,
                                                  eLge);
-    if (nCheckPos == 0)                         // Format ok
-    {                                           // Typvergleich:
+    if (nCheckPos == 0)							// Format ok
+    {											// Typvergleich:
         short eCheckType = p_Entry->GetType();
         if ( eCheckType != NUMBERFORMAT_UNDEFINED)
         {
@@ -513,10 +513,10 @@ BOOL SvNumberFormatter::PutEntry(String& rString,
             p_Entry->SetType(NUMBERFORMAT_DEFINED);
             nType = NUMBERFORMAT_DEFINED;
         }
-        sal_uInt32 CLOffset = ImpGenerateCL(eLge);              // ggfs. neu Standard-
+        sal_uInt32 CLOffset = ImpGenerateCL(eLge);				// ggfs. neu Standard-
                                                         // formate anlegen
         nKey = ImpIsEntry(p_Entry->GetFormatstring(),CLOffset, eLge);
-        if (nKey != NUMBERFORMAT_ENTRY_NOT_FOUND)               // schon vorhanden
+        if (nKey != NUMBERFORMAT_ENTRY_NOT_FOUND)				// schon vorhanden
             delete p_Entry;
         else
         {
@@ -597,13 +597,13 @@ sal_uInt32 SvNumberFormatter::GetIndexPuttingAndConverting( String & rString,
             nKey = nOrig;   // none avaliable, maybe user-defined
         else
             nKey = GetFormatForLanguageIfBuiltIn( nOrig, SvtSysLocale().GetLanguage() );
-
+         
         if (nKey == nOrig)
         {
             // Not a builtin format, convert.
             // The format code string may get modified and adapted to the real
             // language and wouldn't match eSysLnge anymore, do that on a copy.
-            String aTmp( rString);
+            String aTmp( rString);    
             rNewInserted = PutandConvertEntrySystem( aTmp, rCheckPos, rType,
                     nKey, eLnge, SvtSysLocale().GetLanguage());
             if (rCheckPos > 0)
@@ -682,8 +682,8 @@ BOOL SvNumberFormatter::Load( SvStream& rStream )
     SvNumberformat* pEntry;
     sal_uInt32 nPos;
     LanguageType eSaveSysLang, eLoadSysLang;
-    USHORT nSysOnStore, eLge, eDummy;           // Dummy fuer kompatibles Format
-    rStream >> nSysOnStore >> eLge;             // Systemeinstellung aus
+    USHORT nSysOnStore, eLge, eDummy; 			// Dummy fuer kompatibles Format
+    rStream >> nSysOnStore >> eLge;				// Systemeinstellung aus
                                                 // Dokument
     eSaveSysLang = (nVersion < SV_NUMBERFORMATTER_VERSION_SYSTORE ?
         LANGUAGE_SYSTEM : (LanguageType) nSysOnStore);
@@ -695,9 +695,9 @@ BOOL SvNumberFormatter::Load( SvStream& rStream )
     {
         rStream >> eDummy >> eLge;
         eLnge = (LanguageType) eLge;
-        ImpGenerateCL( eLnge, TRUE );           // ggfs. neue Standardformate anlegen
+        ImpGenerateCL( eLnge, TRUE );			// ggfs. neue Standardformate anlegen
 
-        sal_uInt32 nOffset = nPos % SV_COUNTRY_LANGUAGE_OFFSET;     // relativIndex
+        sal_uInt32 nOffset = nPos % SV_COUNTRY_LANGUAGE_OFFSET;		// relativIndex
         BOOL bUserDefined = (nOffset > SV_MAX_ANZ_STANDARD_FORMATE);
         //! HACK! ER 29.07.97 15:15
         // SaveLang wurde bei SYSTEM nicht gespeichert sondern war auch SYSTEM,
@@ -724,7 +724,7 @@ BOOL SvNumberFormatter::Load( SvStream& rStream )
 
         pEntry = new SvNumberformat(*pFormatScanner, eLnge);
         if ( bConversionHack )
-        {   // SYSTEM
+        {	// SYSTEM
             // nVersion < SV_NUMBERFORMATTER_VERSION_SYSTORE
             // nVersion < SV_NUMBERFORMATTER_VERSION_KEYWORDS
             if ( !pConverter )
@@ -765,7 +765,7 @@ BOOL SvNumberFormatter::Load( SvStream& rStream )
             if ( bUserDefined )
             {
                 if ( eSaveSysLang != eLoadSysLang )
-                {   // SYSTEM verschieden
+                {	// SYSTEM verschieden
                     if ( !pConverter )
                         pConverter = new SvNumberFormatter( xServiceManager, eSysLang );
                     if ( nVersion < SV_NUMBERFORMATTER_VERSION_KEYWORDS )
@@ -792,7 +792,7 @@ BOOL SvNumberFormatter::Load( SvStream& rStream )
                             eSaveSysLang, eLoadSysLang, TRUE );
                 }
                 else
-                {   // nicht SYSTEM oder gleiches SYSTEM
+                {	// nicht SYSTEM oder gleiches SYSTEM
                     if ( nVersion < SV_NUMBERFORMATTER_VERSION_KEYWORDS )
                     {
                         LanguageType eLoadLang;
@@ -827,7 +827,7 @@ BOOL SvNumberFormatter::Load( SvStream& rStream )
                 }
             }
         }
-        if ( nOffset == 0 )     // StandardFormat
+        if ( nOffset == 0 )		// StandardFormat
         {
             SvNumberformat* pEnt = aFTable.Get(nPos);
             if (pEnt)
@@ -847,7 +847,7 @@ BOOL SvNumberFormatter::Load( SvStream& rStream )
             UINT16 nY2k;
             rStream >> nY2k;
             if ( nVersion < SV_NUMBERFORMATTER_VERSION_TWODIGITYEAR && nY2k < 100 )
-                nY2k += 1901;       // war vor src513e: 29, jetzt: 1930
+                nY2k += 1901;		// war vor src513e: 29, jetzt: 1930
             SetYear2000( nY2k );
         }
         aHdr.EndEntry();
@@ -901,7 +901,7 @@ BOOL SvNumberFormatter::Save( SvStream& rStream ) const
         }
         pEntry = (SvNumberformat*) pTable->Next();
     }
-    rStream << NUMBERFORMAT_ENTRY_NOT_FOUND;                // EndeKennung
+    rStream << NUMBERFORMAT_ENTRY_NOT_FOUND;				// EndeKennung
 
     // ab SV_NUMBERFORMATTER_VERSION_YEAR2000
     aHdr.StartEntry();
@@ -1031,14 +1031,14 @@ SvNumberFormatTable& SvNumberFormatter::GetFirstEntryTable(
                                                       LanguageType& rLnge)
 {
     short eTypetmp = eType;
-    if (eType == NUMBERFORMAT_ALL)                  // Leere Zelle oder don't care
+    if (eType == NUMBERFORMAT_ALL) 					// Leere Zelle oder don't care
         rLnge = IniLnge;
     else
     {
         SvNumberformat* pFormat = (SvNumberformat*) aFTable.Get(FIndex);
         if (!pFormat)
         {
-//          DBG_ERROR("SvNumberFormatter:: Unbekanntes altes Zahlformat (1)");
+//			DBG_ERROR("SvNumberFormatter:: Unbekanntes altes Zahlformat (1)");
             rLnge = IniLnge;
             eType = NUMBERFORMAT_ALL;
             eTypetmp = eType;
@@ -1070,7 +1070,7 @@ sal_uInt32 SvNumberFormatter::ImpGenerateCL( LanguageType eLnge, BOOL bLoadingSO
     ChangeIntl(eLnge);
     sal_uInt32 CLOffset = ImpGetCLOffset(ActLnge);
     if (CLOffset > MaxCLOffset)
-    {   // new CL combination
+    {	// new CL combination
         if (LocaleDataWrapper::areChecksEnabled())
         {
             Locale aLoadedLocale = xLocaleData->getLoadedLocale();
@@ -1195,7 +1195,7 @@ BOOL SvNumberFormatter::IsNumberFormat(const String& sString,
     const SvNumberformat* pFormat = (SvNumberformat*) aFTable.Get(F_Index);
     if (!pFormat)
     {
-//      DBG_ERROR("SvNumberFormatter:: Unbekanntes altes Zahlformat (2)");
+//		DBG_ERROR("SvNumberFormatter:: Unbekanntes altes Zahlformat (2)");
         ChangeIntl(IniLnge);
         FType = NUMBERFORMAT_NUMBER;
     }
@@ -1210,19 +1210,19 @@ BOOL SvNumberFormatter::IsNumberFormat(const String& sString,
     short RType = FType;
                                                         // Ergebnistyp
                                                         // ohne def-Kennung
-    if (RType == NUMBERFORMAT_TEXT)                         // Zahlzelle ->Stringz.
+    if (RType == NUMBERFORMAT_TEXT)							// Zahlzelle ->Stringz.
         res = FALSE;
     else
         res = pStringScanner->IsNumberFormat(sString, RType, fOutNumber, pFormat);
 
-    if (res && !IsCompatible(FType, RType))     // unpassender Typ
+    if (res && !IsCompatible(FType, RType))		// unpassender Typ
     {
         switch ( RType )
         {
             case NUMBERFORMAT_TIME :
             {
                 if ( pStringScanner->GetDecPos() )
-                {   // 100stel Sekunden
+                {	// 100stel Sekunden
                     if ( pStringScanner->GetAnzNums() > 3 || fOutNumber < 0.0 )
                         F_Index = GetFormatIndex( NF_TIME_HH_MMSS00, ActLnge );
                     else
@@ -1260,7 +1260,7 @@ BOOL SvNumberFormatter::IsCompatible(short eOldType,
                     case NUMBERFORMAT_CURRENCY:
                     case NUMBERFORMAT_SCIENTIFIC:
                     case NUMBERFORMAT_FRACTION:
-//                  case NUMBERFORMAT_LOGICAL:
+//					case NUMBERFORMAT_LOGICAL:
                     case NUMBERFORMAT_DEFINED:
                         return TRUE;
                     default:
@@ -1316,7 +1316,7 @@ sal_uInt32 SvNumberFormatter::ImpGetDefaultFormat( short nType )
     sal_uInt32 nSearch;
     switch( nType )
     {
-        case NUMBERFORMAT_DATE      :
+        case NUMBERFORMAT_DATE		:
             nSearch = CLOffset + ZF_STANDARD_DATE;
         break;
         case NUMBERFORMAT_TIME      :
@@ -1338,7 +1338,7 @@ sal_uInt32 SvNumberFormatter::ImpGetDefaultFormat( short nType )
     if ( !nDefaultFormat )
         nDefaultFormat = NUMBERFORMAT_ENTRY_NOT_FOUND;
     if ( nDefaultFormat == NUMBERFORMAT_ENTRY_NOT_FOUND )
-    {   // look for a defined standard
+    {	// look for a defined standard
         sal_uInt32 nStopKey = CLOffset + SV_COUNTRY_LANGUAGE_OFFSET;
         sal_uInt32 nKey;
         aFTable.Seek( CLOffset );
@@ -1350,16 +1350,16 @@ sal_uInt32 SvNumberFormatter::ImpGetDefaultFormat( short nType )
                             ~NUMBERFORMAT_DEFINED) == nType) )
             {
                 nDefaultFormat = nKey;
-                break;  // while
+                break;	// while
             }
             aFTable.Next();
         }
 
         if ( nDefaultFormat == NUMBERFORMAT_ENTRY_NOT_FOUND )
-        {   // none found, use old fixed standards
+        {	// none found, use old fixed standards
             switch( nType )
             {
-                case NUMBERFORMAT_DATE      :
+                case NUMBERFORMAT_DATE		:
                     nDefaultFormat = CLOffset + ZF_STANDARD_DATE;
                 break;
                 case NUMBERFORMAT_TIME      :
@@ -1396,7 +1396,7 @@ sal_uInt32 SvNumberFormatter::GetStandardFormat( short eType, LanguageType eLnge
             else
                 return ImpGetDefaultCurrencyFormat();
         }
-        case NUMBERFORMAT_DATE      :
+        case NUMBERFORMAT_DATE		:
         case NUMBERFORMAT_TIME      :
         case NUMBERFORMAT_DATETIME  :
         case NUMBERFORMAT_PERCENT   :
@@ -1405,7 +1405,7 @@ sal_uInt32 SvNumberFormatter::GetStandardFormat( short eType, LanguageType eLnge
 
         case NUMBERFORMAT_FRACTION  : return CLOffset + ZF_STANDARD_FRACTION;
         case NUMBERFORMAT_LOGICAL   : return CLOffset + ZF_STANDARD_LOGICAL;
-        case NUMBERFORMAT_TEXT      : return CLOffset + ZF_STANDARD_TEXT;
+        case NUMBERFORMAT_TEXT		: return CLOffset + ZF_STANDARD_TEXT;
         case NUMBERFORMAT_ALL       :
         case NUMBERFORMAT_DEFINED   :
         case NUMBERFORMAT_NUMBER    :
@@ -1453,7 +1453,7 @@ sal_uInt32 SvNumberFormatter::GetStandardFormat( double fNumber, sal_uInt32 nFIn
                 bSign = FALSE;
             double fSeconds = fNumber * 86400;
             if ( floor( fSeconds + 0.5 ) * 100 != floor( fSeconds * 100 + 0.5 ) )
-            {   // mit 100stel Sekunden
+            {	// mit 100stel Sekunden
                 if ( bSign || fSeconds >= 3600 )
                     return GetFormatIndex( NF_TIME_HH_MMSS00, eLnge );
                 else
@@ -1493,14 +1493,14 @@ void SvNumberFormatter::GetInputLineString(const double& fOutNumber,
                                      || eType == NUMBERFORMAT_SCIENTIFIC
                                      || eType == NUMBERFORMAT_FRACTION)
     {
-        if (eType != NUMBERFORMAT_PERCENT)  // spaeter Sonderbehandlung %
+        if (eType != NUMBERFORMAT_PERCENT)	// spaeter Sonderbehandlung %
             eType = NUMBERFORMAT_NUMBER;
         ChangeStandardPrec(INPUTSTRING_PRECISION);
         bPrecChanged = true;
     }
     sal_uInt32 nKey = nFIndex;
     switch ( eType )
-    {   // #61619# immer vierstelliges Jahr editieren
+    {	// #61619# immer vierstelliges Jahr editieren
         case NUMBERFORMAT_DATE :
             nKey = GetFormatIndex( NF_DATE_SYS_DDMMYYYY, eLang );
         break;
@@ -1568,14 +1568,14 @@ BOOL SvNumberFormatter::GetPreviewString(const String& sFormatString,
                                          Color** ppColor,
                                          LanguageType eLnge)
 {
-    if (sFormatString.Len() == 0)                       // keinen Leerstring
+    if (sFormatString.Len() == 0) 						// keinen Leerstring
         return FALSE;
 
     xub_StrLen nCheckPos = STRING_NOTFOUND;
     sal_uInt32 nKey;
     if (eLnge == LANGUAGE_DONTKNOW)
         eLnge = IniLnge;
-    ChangeIntl(eLnge);                          // ggfs. austauschen
+    ChangeIntl(eLnge);							// ggfs. austauschen
     eLnge = ActLnge;
     String sTmpString = sFormatString;
     SvNumberformat* p_Entry = new SvNumberformat(sTmpString,
@@ -1583,12 +1583,12 @@ BOOL SvNumberFormatter::GetPreviewString(const String& sFormatString,
                                                  pStringScanner,
                                                  nCheckPos,
                                                  eLnge);
-    if (nCheckPos == 0)                                 // String ok
+    if (nCheckPos == 0)									// String ok
     {
-        sal_uInt32 CLOffset = ImpGenerateCL(eLnge);             // ggfs. neu Standard-
+        sal_uInt32 CLOffset = ImpGenerateCL(eLnge);				// ggfs. neu Standard-
                                                         // formate anlegen
         nKey = ImpIsEntry(p_Entry->GetFormatstring(),CLOffset, eLnge);
-        if (nKey != NUMBERFORMAT_ENTRY_NOT_FOUND)               // schon vorhanden
+        if (nKey != NUMBERFORMAT_ENTRY_NOT_FOUND)				// schon vorhanden
             GetOutputString(fPreviewNumber,nKey,sOutString,ppColor);
         else
             p_Entry->GetOutputString(fPreviewNumber,sOutString, ppColor);
@@ -1608,7 +1608,7 @@ BOOL SvNumberFormatter::GetPreviewStringGuess( const String& sFormatString,
                                          Color** ppColor,
                                          LanguageType eLnge )
 {
-    if (sFormatString.Len() == 0)                       // keinen Leerstring
+    if (sFormatString.Len() == 0) 						// keinen Leerstring
         return FALSE;
 
     if (eLnge == LANGUAGE_DONTKNOW)
@@ -1622,7 +1622,7 @@ BOOL SvNumberFormatter::GetPreviewStringGuess( const String& sFormatString,
     sal_uInt32 nCLOffset = ImpGenerateCL( eLnge );
     sal_uInt32 nKey = ImpIsEntry( aFormatStringUpper, nCLOffset, eLnge );
     if ( nKey != NUMBERFORMAT_ENTRY_NOT_FOUND )
-    {   // Zielformat vorhanden
+    {	// Zielformat vorhanden
         GetOutputString( fPreviewNumber, nKey, sOutString, ppColor );
         return TRUE;
     }
@@ -1656,14 +1656,14 @@ BOOL SvNumberFormatter::GetPreviewStringGuess( const String& sFormatString,
         {
             if ( nCheckPos > 0 || xTransliteration->isEqual( sFormatString,
                     pEntry->GetFormatstring() ) )
-            {   // other Format
+            {	// other Format
                 delete pEntry;
                 sTmpString = sFormatString;
                 pEntry = new SvNumberformat( sTmpString, pFormatScanner,
                     pStringScanner, nCheckPos, eLnge );
             }
             else
-            {   // verify english
+            {	// verify english
                 xub_StrLen nCheckPos2 = STRING_NOTFOUND;
                 // try other --> english
                 eFormatLang = eLnge;
@@ -1675,7 +1675,7 @@ BOOL SvNumberFormatter::GetPreviewStringGuess( const String& sFormatString,
                 ChangeIntl( eLnge );
                 if ( nCheckPos2 == 0 && !xTransliteration->isEqual( sFormatString,
                         pEntry2->GetFormatstring() ) )
-                {   // other Format
+                {	// other Format
                     delete pEntry;
                     sTmpString = sFormatString;
                     pEntry = new SvNumberformat( sTmpString, pFormatScanner,
@@ -1686,9 +1686,9 @@ BOOL SvNumberFormatter::GetPreviewStringGuess( const String& sFormatString,
         }
     }
 
-    if (nCheckPos == 0)                                 // String ok
+    if (nCheckPos == 0)									// String ok
     {
-        ImpGenerateCL( eLnge );     // ggfs. neu Standardformate anlegen
+        ImpGenerateCL( eLnge );		// ggfs. neu Standardformate anlegen
         pEntry->GetOutputString( fPreviewNumber, sOutString, ppColor );
         delete pEntry;
         return TRUE;
@@ -1728,8 +1728,8 @@ BOOL SvNumberFormatter::GetPreviewString( const String& sFormatString,
             GetOutputString( aNonConstPreview, nKey, sOutString, ppColor);
         else
         {
-            // If the format is valid but not a text format and does not
-            // include a text subformat, an empty string would result. Same as
+            // If the format is valid but not a text format and does not 
+            // include a text subformat, an empty string would result. Same as 
             // in SvNumberFormatter::GetOutputString()
             if (p_Entry->IsTextFormat() || p_Entry->HasTextFormat())
                 p_Entry->GetOutputString( aNonConstPreview, sOutString, ppColor);
@@ -1752,13 +1752,13 @@ BOOL SvNumberFormatter::GetPreviewString( const String& sFormatString,
 sal_uInt32 SvNumberFormatter::TestNewString(const String& sFormatString,
                                       LanguageType eLnge)
 {
-    if (sFormatString.Len() == 0)                       // keinen Leerstring
+    if (sFormatString.Len() == 0) 						// keinen Leerstring
         return NUMBERFORMAT_ENTRY_NOT_FOUND;
 
     xub_StrLen nCheckPos = STRING_NOTFOUND;
     if (eLnge == LANGUAGE_DONTKNOW)
         eLnge = IniLnge;
-    ChangeIntl(eLnge);                                  // ggfs. austauschen
+    ChangeIntl(eLnge);									// ggfs. austauschen
     eLnge = ActLnge;
     sal_uInt32 nRes;
     String sTmpString = sFormatString;
@@ -1767,9 +1767,9 @@ sal_uInt32 SvNumberFormatter::TestNewString(const String& sFormatString,
                                                 pStringScanner,
                                                 nCheckPos,
                                                 eLnge);
-    if (nCheckPos == 0)                                 // String ok
+    if (nCheckPos == 0)									// String ok
     {
-        sal_uInt32 CLOffset = ImpGenerateCL(eLnge);             // ggfs. neu Standard-
+        sal_uInt32 CLOffset = ImpGenerateCL(eLnge);				// ggfs. neu Standard-
                                                         // formate anlegen
         nRes = ImpIsEntry(pEntry->GetFormatstring(),CLOffset, eLnge);
                                                         // schon vorhanden ?
@@ -1788,7 +1788,7 @@ SvNumberformat* SvNumberFormatter::ImpInsertFormat(
     if ( rCode.Index < NF_INDEX_TABLE_ENTRIES &&
             rCode.Usage == ::com::sun::star::i18n::KNumberFormatUsage::CURRENCY &&
             rCode.Index != NF_CURRENCY_1000DEC2_CCC )
-    {   // strip surrounding [$...] on automatic currency
+    {	// strip surrounding [$...] on automatic currency
         if ( aCodeStr.SearchAscii( "[$" ) != STRING_NOTFOUND )
             aCodeStr = SvNumberformat::StripNewCurrencyDelimiters( aCodeStr, FALSE );
         else
@@ -1839,13 +1839,13 @@ SvNumberformat* SvNumberFormatter::ImpInsertFormat(
                 {
                     // These may be dupes of integer versions for locales where
                     // currencies have no decimals like Italian Lira.
-                    case NF_CURRENCY_1000DEC2 :         // NF_CURRENCY_1000INT
-                    case NF_CURRENCY_1000DEC2_RED :     // NF_CURRENCY_1000INT_RED
-                    case NF_CURRENCY_1000DEC2_DASHED :  // NF_CURRENCY_1000INT_RED
+                    case NF_CURRENCY_1000DEC2 :			// NF_CURRENCY_1000INT
+                    case NF_CURRENCY_1000DEC2_RED :		// NF_CURRENCY_1000INT_RED
+                    case NF_CURRENCY_1000DEC2_DASHED :	// NF_CURRENCY_1000INT_RED
                     break;
                     default:
                         if ( !bAfterLoadingSO5 )
-                        {   // If bAfterLoadingSO5 there will definitely be some dupes,
+                        {	// If bAfterLoadingSO5 there will definitely be some dupes,
                             // don't cry. But we need this test for verification of locale
                             // data if not loading old SO5 documents.
                             String aMsg( RTL_CONSTASCII_USTRINGPARAM(
@@ -1974,7 +1974,7 @@ sal_uInt32 SvNumberFormatter::GetFormatSpecialInfo( const String& rFormatString,
     xub_StrLen nCheckPos = 0;
     if (eLnge == LANGUAGE_DONTKNOW)
         eLnge = IniLnge;
-    ChangeIntl(eLnge);                                  // ggfs. austauschen
+    ChangeIntl(eLnge);									// ggfs. austauschen
     eLnge = ActLnge;
     String aTmpStr( rFormatString );
     SvNumberformat* pFormat = new SvNumberformat( aTmpStr,
@@ -2019,7 +2019,7 @@ sal_Int32 SvNumberFormatter::ImpGetFormatCodeIndex(
                 || NF_CURRENCY_END < nTabOff || nTabOff == NF_CURRENCY_1000INT
                 || nTabOff == NF_CURRENCY_1000INT_RED
                 || nTabOff == NF_CURRENCY_1000DEC2_CCC))
-    {   // currency entries with decimals might not exist, e.g. Italian Lira
+    {	// currency entries with decimals might not exist, e.g. Italian Lira
         String aMsg( RTL_CONSTASCII_USTRINGPARAM(
                     "SvNumberFormatter::ImpGetFormatCodeIndex: not found: "));
         aMsg += String::CreateFromInt32( nTabOff );
@@ -2054,7 +2054,7 @@ sal_Int32 SvNumberFormatter::ImpGetFormatCodeIndex(
         }
     }
     else
-    {   // we need at least _some_ format
+    {	// we need at least _some_ format
         rSeq.realloc(1);
         rSeq[0] = ::com::sun::star::i18n::NumberFormatCode();
         String aTmp( '0' );
@@ -2187,7 +2187,7 @@ void SvNumberFormatter::ImpGenerateFormats( sal_uInt32 CLOffset, BOOL bLoadingSO
     }
     BOOL bOldConvertMode = pFormatScanner->GetConvertMode();
     if (bOldConvertMode)
-        pFormatScanner->SetConvertMode(FALSE);      // switch off for this function
+        pFormatScanner->SetConvertMode(FALSE);		// switch off for this function
 
     NumberFormatCodeWrapper aNumberFormatCode( xServiceManager, GetLocale() );
 
@@ -2241,7 +2241,7 @@ void SvNumberFormatter::ImpGenerateFormats( sal_uInt32 CLOffset, BOOL bLoadingSO
     // Boolean
     aFormatCode = pFormatScanner->GetBooleanString();
     pNewFormat = new SvNumberformat( aFormatCode,
-        pFormatScanner, pStringScanner, nCheckPos, ActLnge );
+        pFormatScanner, pStringScanner,	nCheckPos, ActLnge );
     pNewFormat->SetType(NUMBERFORMAT_LOGICAL);
     pNewFormat->SetStandard();
     if ( !aFTable.Insert(
@@ -2353,7 +2353,7 @@ void SvNumberFormatter::ImpGenerateFormats( sal_uInt32 CLOffset, BOOL bLoadingSO
     pNewFormat = ImpInsertFormat( aFormatSeq[nIdx],
         CLOffset + SetIndexTable( NF_CURRENCY_1000DEC2_CCC, ZF_STANDARD_CURRENCY+4 ));
     if ( pNewFormat )
-        pNewFormat->SetUsed(TRUE);      // must be saved for older versions
+        pNewFormat->SetUsed(TRUE);		// must be saved for older versions
     aFormatSeq[nIdx].Default = bDefault;
 
     // #.##0,--   since number formatter version 6
@@ -2406,7 +2406,7 @@ void SvNumberFormatter::ImpGenerateFormats( sal_uInt32 CLOffset, BOOL bLoadingSO
     pNewFormat = ImpInsertFormat( aFormatSeq[nIdx],
         CLOffset + SetIndexTable( NF_DATE_SYS_DDMMYYYY, ZF_STANDARD_DATE+6 ));
     if ( pNewFormat )
-        pNewFormat->SetUsed(TRUE);      // must be saved for older versions
+        pNewFormat->SetUsed(TRUE);		// must be saved for older versions
 
     // DD.MM.YY   def/System, since number formatter version 6
     nIdx = ImpGetFormatCodeIndex( aFormatSeq, NF_DATE_SYS_DDMMYY );
@@ -2578,7 +2578,7 @@ void SvNumberFormatter::ImpGenerateFormats( sal_uInt32 CLOffset, BOOL bLoadingSO
 
      // # ?/?
     aSingleFormatCode.Code = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "# ?/?" ) );
-    String s25( RTL_CONSTASCII_USTRINGPARAM( "# ?/?" ) );           // # ?/?
+    String s25( RTL_CONSTASCII_USTRINGPARAM( "# ?/?" ) );			// # ?/?
     ImpInsertFormat( aSingleFormatCode,
         CLOffset + SetIndexTable( NF_FRACTION_1, ZF_STANDARD_FRACTION ));
 
@@ -2639,11 +2639,11 @@ void SvNumberFormatter::ImpGenerateAdditionalFormats( sal_uInt32 CLOffset,
         if ( nPos - CLOffset >= SV_COUNTRY_LANGUAGE_OFFSET )
         {
             DBG_ERRORFILE( "ImpGenerateAdditionalFormats: too many formats" );
-            break;  // for
+            break;	// for
         }
         if ( pFormatArr[j].Index < NF_INDEX_TABLE_ENTRIES &&
                 pFormatArr[j].Index != NF_CURRENCY_1000DEC2_CCC )
-        {   // Insert only if not already inserted, but internal index must be
+        {	// Insert only if not already inserted, but internal index must be
             // above so ImpInsertFormat can distinguish it.
             sal_Int16 nOrgIndex = pFormatArr[j].Index;
             pFormatArr[j].Index = sal::static_int_cast< sal_Int16 >(
@@ -2713,7 +2713,7 @@ void SvNumberFormatter::GenerateFormat(String& sString,
         eLnge = IniLnge;
     short eType = GetType(nIndex);
     USHORT i;
-    ImpGenerateCL(eLnge);               // ggfs. neu Standard-
+    ImpGenerateCL(eLnge);				// ggfs. neu Standard-
                                     // formate anlegen
     sString.Erase();
 
@@ -2830,7 +2830,7 @@ BOOL SvNumberFormatter::IsUserDefined(const String& sStr,
 {
     if (eLnge == LANGUAGE_DONTKNOW)
         eLnge = IniLnge;
-    sal_uInt32 CLOffset = ImpGenerateCL(eLnge);             // ggfs. neu Standard-
+    sal_uInt32 CLOffset = ImpGenerateCL(eLnge);				// ggfs. neu Standard-
                                                     // formate anlegen
     eLnge = ActLnge;
     sal_uInt32 nKey = ImpIsEntry(sStr, CLOffset, eLnge);
@@ -2847,7 +2847,7 @@ sal_uInt32 SvNumberFormatter::GetEntryKey(const String& sStr,
 {
     if (eLnge == LANGUAGE_DONTKNOW)
         eLnge = IniLnge;
-    sal_uInt32 CLOffset = ImpGenerateCL(eLnge);             // ggfs. neu Standard-
+    sal_uInt32 CLOffset = ImpGenerateCL(eLnge);				// ggfs. neu Standard-
                                                     // formate anlegen
     return ImpIsEntry(sStr, CLOffset, eLnge);
 }
@@ -2902,30 +2902,30 @@ SvNumberFormatterIndexTable* SvNumberFormatter::MergeFormatter(SvNumberFormatter
     while (pFormat)
     {
         nOldKey = rTable.aFTable.GetCurKey();
-        nOffset = nOldKey % SV_COUNTRY_LANGUAGE_OFFSET;     // relativIndex
-        if (nOffset == 0)                                   // 1. Format von CL
+        nOffset = nOldKey % SV_COUNTRY_LANGUAGE_OFFSET;		// relativIndex
+        if (nOffset == 0)									// 1. Format von CL
             nCLOffset = ImpGenerateCL(pFormat->GetLanguage());
 
-        if (nOffset <= SV_MAX_ANZ_STANDARD_FORMATE)     // Std.form.
+        if (nOffset <= SV_MAX_ANZ_STANDARD_FORMATE)		// Std.form.
         {
             nNewKey = nCLOffset + nOffset;
-            if (!aFTable.Get(nNewKey))                  // noch nicht da
+            if (!aFTable.Get(nNewKey))					// noch nicht da
             {
-//              pNewEntry = new SvNumberformat(*pFormat);   // Copy reicht nicht !!!
+//				pNewEntry = new SvNumberformat(*pFormat);	// Copy reicht nicht !!!
                 pNewEntry = new SvNumberformat( *pFormat, *pFormatScanner );
                 if (!aFTable.Insert(nNewKey, pNewEntry))
                     delete pNewEntry;
             }
-            if (nNewKey != nOldKey)                     // neuer Index
+            if (nNewKey != nOldKey)						// neuer Index
             {
                 pNewIndex = new sal_uInt32(nNewKey);
                 if (!pMergeTable->Insert(nOldKey,pNewIndex))
                     delete pNewIndex;
             }
         }
-        else                                            // benutzerdef.
+        else											// benutzerdef.
         {
-//          pNewEntry = new SvNumberformat(*pFormat);   // Copy reicht nicht !!!
+//			pNewEntry = new SvNumberformat(*pFormat);	// Copy reicht nicht !!!
             pNewEntry = new SvNumberformat( *pFormat, *pFormatScanner );
             nNewKey = ImpIsEntry(pNewEntry->GetFormatstring(),
                               nCLOffset,
@@ -2949,7 +2949,7 @@ SvNumberFormatterIndexTable* SvNumberFormatter::MergeFormatter(SvNumberFormatter
                 else
                     pStdFormat->SetLastInsertKey((USHORT) (nNewKey - nCLOffset));
             }
-            if (nNewKey != nOldKey)                     // neuer Index
+            if (nNewKey != nOldKey)						// neuer Index
             {
                 pNewIndex = new sal_uInt32(nNewKey);
                 if (!pMergeTable->Insert(nOldKey,pNewIndex))
@@ -2984,11 +2984,11 @@ sal_uInt32 SvNumberFormatter::GetFormatForLanguageIfBuiltIn( sal_uInt32 nFormat,
     if ( eLnge == LANGUAGE_DONTKNOW )
         eLnge = IniLnge;
     if ( nFormat < SV_COUNTRY_LANGUAGE_OFFSET && eLnge == IniLnge )
-        return nFormat;     // es bleibt wie es ist
-    sal_uInt32 nOffset = nFormat % SV_COUNTRY_LANGUAGE_OFFSET;      // relativIndex
+        return nFormat;		// es bleibt wie es ist
+    sal_uInt32 nOffset = nFormat % SV_COUNTRY_LANGUAGE_OFFSET;		// relativIndex
     if ( nOffset > SV_MAX_ANZ_STANDARD_FORMATE )
-        return nFormat;                 // kein eingebautes Format
-    sal_uInt32 nCLOffset = ImpGenerateCL(eLnge);        // ggbf. generieren
+        return nFormat;					// kein eingebautes Format
+    sal_uInt32 nCLOffset = ImpGenerateCL(eLnge);		// ggbf. generieren
     return nCLOffset + nOffset;
 }
 
@@ -3001,22 +3001,22 @@ sal_uInt32 SvNumberFormatter::GetFormatIndex( NfIndexTableOffset nTabOff,
         return NUMBERFORMAT_ENTRY_NOT_FOUND;
     if ( eLnge == LANGUAGE_DONTKNOW )
         eLnge = IniLnge;
-    sal_uInt32 nCLOffset = ImpGenerateCL(eLnge);        // ggbf. generieren
+    sal_uInt32 nCLOffset = ImpGenerateCL(eLnge);		// ggbf. generieren
     return nCLOffset + theIndexTable[nTabOff];
 }
 
 
 NfIndexTableOffset SvNumberFormatter::GetIndexTableOffset( sal_uInt32 nFormat ) const
 {
-    sal_uInt32 nOffset = nFormat % SV_COUNTRY_LANGUAGE_OFFSET;      // relativIndex
+    sal_uInt32 nOffset = nFormat % SV_COUNTRY_LANGUAGE_OFFSET;		// relativIndex
     if ( nOffset > SV_MAX_ANZ_STANDARD_FORMATE )
-        return NF_INDEX_TABLE_ENTRIES;      // kein eingebautes Format
+        return NF_INDEX_TABLE_ENTRIES;		// kein eingebautes Format
     for ( USHORT j = 0; j < NF_INDEX_TABLE_ENTRIES; j++ )
     {
         if ( theIndexTable[j] == nOffset )
             return (NfIndexTableOffset) j;
     }
-    return NF_INDEX_TABLE_ENTRIES;      // bad luck
+    return NF_INDEX_TABLE_ENTRIES;		// bad luck
 }
 
 
@@ -3223,13 +3223,13 @@ sal_uInt32 SvNumberFormatter::ImpGetDefaultCurrencyFormat()
             if ( pEntry->IsStandard() && (pEntry->GetType() & NUMBERFORMAT_CURRENCY) )
             {
                 nDefaultCurrencyFormat = nKey;
-                break;  // while
+                break;	// while
             }
             aFTable.Next();
         }
 
         if ( nDefaultCurrencyFormat == NUMBERFORMAT_ENTRY_NOT_FOUND )
-        {   // none found, create one
+        {	// none found, create one
             xub_StrLen nCheck;
             short nType;
             NfWSStringsDtor aCurrList;
@@ -3250,7 +3250,7 @@ sal_uInt32 SvNumberFormatter::ImpGetDefaultCurrencyFormat()
             if ( nDefaultCurrencyFormat == NUMBERFORMAT_ENTRY_NOT_FOUND )
                 nDefaultCurrencyFormat = CLOffset + ZF_STANDARD_CURRENCY+3;
             else
-            {   // mark as standard so that it is found next time
+            {	// mark as standard so that it is found next time
                 SvNumberformat* pEntry = aFTable.Get( nDefaultCurrencyFormat );
                 if ( pEntry )
                     pEntry->SetStandard();
@@ -3291,13 +3291,13 @@ inline
         if ( pFoundEntry && pFoundEntry != pData )
         {
             pFoundEntry = NULL;
-            return FALSE;   // break loop, not unique
+            return FALSE;	// break loop, not unique
         }
         if ( nPos == 0 )
-        {   // first entry is SYSTEM
+        {	// first entry is SYSTEM
             pFoundEntry = MatchSystemCurrency();
             if ( pFoundEntry )
-                return FALSE;   // break loop
+                return FALSE;	// break loop
                 // even if there are more matching entries
                 // this one is propably the one we are looking for
             else
@@ -3341,7 +3341,7 @@ BOOL SvNumberFormatter::GetNewCurrencySymbolString( sal_uInt32 nFormat,
                 }
             }
             if ( !rStr.Len() )
-            {   // analog zu BuildSymbolString
+            {	// analog zu BuildSymbolString
                 rStr  = '[';
                 rStr += '$';
                 if ( aSymbol.Search( '-' ) != STRING_NOTFOUND ||
@@ -3478,20 +3478,20 @@ void SvNumberFormatter::GetCompatibilityCurrency( String& rSymbol, String& rAbbr
 
 void lcl_CheckCurrencySymbolPosition( const NfCurrencyEntry& rCurr )
 {
-    short nPos = -1;        // -1:=unknown, 0:=vorne, 1:=hinten
+    short nPos = -1;		// -1:=unknown, 0:=vorne, 1:=hinten
     short nNeg = -1;
     switch ( rCurr.GetPositiveFormat() )
     {
-        case 0:                                         // $1
+        case 0:                                        	// $1
             nPos = 0;
         break;
-        case 1:                                         // 1$
+        case 1:											// 1$
             nPos = 1;
         break;
-        case 2:                                         // $ 1
+        case 2:											// $ 1
             nPos = 0;
         break;
-        case 3:                                         // 1 $
+        case 3:											// 1 $
             nPos = 1;
         break;
         default:
@@ -3501,34 +3501,34 @@ void lcl_CheckCurrencySymbolPosition( const NfCurrencyEntry& rCurr )
     }
     switch ( rCurr.GetNegativeFormat() )
     {
-        case 0:                                         // ($1)
+        case 0:                                        	// ($1)
             nNeg = 0;
         break;
-        case 1:                                         // -$1
+        case 1:                                        	// -$1
             nNeg = 0;
         break;
-        case 2:                                         // $-1
+        case 2:                                        	// $-1
             nNeg = 0;
         break;
-        case 3:                                         // $1-
+        case 3:                                        	// $1-
             nNeg = 0;
         break;
-        case 4:                                         // (1$)
+        case 4:                                        	// (1$)
             nNeg = 1;
         break;
-        case 5:                                         // -1$
+        case 5:                                        	// -1$
             nNeg = 1;
         break;
-        case 6:                                         // 1-$
+        case 6:                                        	// 1-$
             nNeg = 1;
         break;
-        case 7:                                         // 1$-
+        case 7:                                        	// 1$-
             nNeg = 1;
         break;
-        case 8:                                         // -1 $
+        case 8:                                        	// -1 $
             nNeg = 1;
         break;
-        case 9:                                         // -$ 1
+        case 9:                                        	// -$ 1
             nNeg = 0;
         break;
         case 10:                                        // 1 $-
@@ -3537,16 +3537,16 @@ void lcl_CheckCurrencySymbolPosition( const NfCurrencyEntry& rCurr )
         case 11:                                        // $ -1
             nNeg = 0;
         break;
-        case 12 :                                       // $ 1-
+        case 12 : 										// $ 1-
             nNeg = 0;
         break;
-        case 13 :                                       // 1- $
+        case 13 : 										// 1- $
             nNeg = 1;
         break;
-        case 14 :                                       // ($ 1)
+        case 14 : 										// ($ 1)
             nNeg = 0;
         break;
-        case 15 :                                       // (1 $)
+        case 15 :										// (1 $)
             nNeg = 1;
         break;
         default:
@@ -3580,7 +3580,7 @@ void SvNumberFormatter::ImpInitCurrencyTable()
     // racing condition possible:
     // ::osl::MutexGuard aGuard( GetMutex() );
     // while ( !bCurrencyTableInitialized )
-    //      ImpInitCurrencyTable();
+    // 		ImpInitCurrencyTable();
     static BOOL bInitializing = FALSE;
     if ( bCurrencyTableInitialized || bInitializing )
         return ;
@@ -3725,7 +3725,7 @@ USHORT SvNumberFormatter::GetCurrencyFormatStrings( NfWSStringsDtor& rStrArr,
 {
     USHORT nDefault = 0;
     if ( bBank )
-    {   // nur Bankensymbole
+    {	// nur Bankensymbole
         String aPositiveBank, aNegativeBank;
         rCurr.BuildPositiveFormatString( aPositiveBank, TRUE, *xLocaleData, 1 );
         rCurr.BuildNegativeFormatString( aNegativeBank, TRUE, *xLocaleData, 1 );
@@ -3748,7 +3748,7 @@ USHORT SvNumberFormatter::GetCurrencyFormatStrings( NfWSStringsDtor& rStrArr,
         nDefault = rStrArr.Count() - 1;
     }
     else
-    {   // gemischte Formate wie in SvNumberFormatter::ImpGenerateFormats
+    {	// gemischte Formate wie in SvNumberFormatter::ImpGenerateFormats
         // aber keine doppelten, wenn keine Nachkommastellen in Waehrung
         String aPositive, aNegative, aPositiveNoDec, aNegativeNoDec,
             aPositiveDashed, aNegativeDashed;
@@ -3814,7 +3814,7 @@ USHORT SvNumberFormatter::GetCurrencyFormatStrings( NfWSStringsDtor& rStrArr,
 //--- NfCurrencyEntry ----------------------------------------------------
 
 NfCurrencyEntry::NfCurrencyEntry()
-    :   eLanguage( LANGUAGE_DONTKNOW ),
+    :	eLanguage( LANGUAGE_DONTKNOW ),
         nPositiveFormat(3),
         nNegativeFormat(8),
         nDigits(2),
@@ -3825,34 +3825,34 @@ NfCurrencyEntry::NfCurrencyEntry()
 
 NfCurrencyEntry::NfCurrencyEntry( const LocaleDataWrapper& rLocaleData, LanguageType eLang )
 {
-    aSymbol         = rLocaleData.getCurrSymbol();
-    aBankSymbol     = rLocaleData.getCurrBankSymbol();
-    eLanguage       = eLang;
-    nPositiveFormat = rLocaleData.getCurrPositiveFormat();
-    nNegativeFormat = rLocaleData.getCurrNegativeFormat();
-    nDigits         = rLocaleData.getCurrDigits();
-    cZeroChar       = rLocaleData.getCurrZeroChar();
+    aSymbol			= rLocaleData.getCurrSymbol();
+    aBankSymbol		= rLocaleData.getCurrBankSymbol();
+    eLanguage		= eLang;
+    nPositiveFormat	= rLocaleData.getCurrPositiveFormat();
+    nNegativeFormat	= rLocaleData.getCurrNegativeFormat();
+    nDigits			= rLocaleData.getCurrDigits();
+    cZeroChar		= rLocaleData.getCurrZeroChar();
 }
 
 
 NfCurrencyEntry::NfCurrencyEntry( const ::com::sun::star::i18n::Currency & rCurr,
             const LocaleDataWrapper& rLocaleData, LanguageType eLang )
 {
-    aSymbol         = rCurr.Symbol;
-    aBankSymbol     = rCurr.BankSymbol;
-    eLanguage       = eLang;
-    nPositiveFormat = rLocaleData.getCurrPositiveFormat();
-    nNegativeFormat = rLocaleData.getCurrNegativeFormat();
+    aSymbol			= rCurr.Symbol;
+    aBankSymbol		= rCurr.BankSymbol;
+    eLanguage		= eLang;
+    nPositiveFormat	= rLocaleData.getCurrPositiveFormat();
+    nNegativeFormat	= rLocaleData.getCurrNegativeFormat();
     nDigits         = rCurr.DecimalPlaces;
-    cZeroChar       = rLocaleData.getCurrZeroChar();
+    cZeroChar		= rLocaleData.getCurrZeroChar();
 }
 
 
 BOOL NfCurrencyEntry::operator==( const NfCurrencyEntry& r ) const
 {
-    return aSymbol      == r.aSymbol
-        && aBankSymbol  == r.aBankSymbol
-        && eLanguage    == r.eLanguage
+    return aSymbol		== r.aSymbol
+        && aBankSymbol	== r.aBankSymbol
+        && eLanguage	== r.eLanguage
         ;
 }
 
@@ -3861,11 +3861,11 @@ void NfCurrencyEntry::SetEuro()
 {
     aSymbol = NfCurrencyEntry::GetEuroSymbol();
     aBankSymbol.AssignAscii( RTL_CONSTASCII_STRINGPARAM( "EUR" ) );
-    eLanguage       = LANGUAGE_DONTKNOW;
-    nPositiveFormat = 3;
-    nNegativeFormat = 8;
-    nDigits         = 2;
-    cZeroChar       = '0';
+    eLanguage		= LANGUAGE_DONTKNOW;
+    nPositiveFormat	= 3;
+    nNegativeFormat	= 8;
+    nDigits			= 2;
+    cZeroChar		= '0';
 }
 
 
@@ -3880,9 +3880,9 @@ BOOL NfCurrencyEntry::IsEuro() const
 
 void NfCurrencyEntry::ApplyVariableInformation( const NfCurrencyEntry& r )
 {
-    nPositiveFormat = r.nPositiveFormat;
-    nNegativeFormat = r.nNegativeFormat;
-    cZeroChar       = r.cZeroChar;
+    nPositiveFormat	= r.nPositiveFormat;
+    nNegativeFormat	= r.nNegativeFormat;
+    cZeroChar		= r.cZeroChar;
 }
 
 
@@ -3970,13 +3970,13 @@ void NfCurrencyEntry::CompletePositiveFormatString( String& rStr,
 {
     switch( nPositiveFormat )
     {
-        case 0:                                         // $1
+        case 0:                                        	// $1
             rStr.Insert( rSymStr , 0 );
         break;
-        case 1:                                         // 1$
+        case 1:											// 1$
             rStr += rSymStr;
         break;
-        case 2:                                         // $ 1
+        case 2:											// $ 1
         {
             rStr.Insert( ' ', 0 );
             rStr.Insert( rSymStr, 0 );
@@ -4001,64 +4001,64 @@ void NfCurrencyEntry::CompleteNegativeFormatString( String& rStr,
 {
     switch( nNegativeFormat )
     {
-        case 0:                                         // ($1)
+        case 0:                                        	// ($1)
         {
             rStr.Insert( rSymStr, 0);
             rStr.Insert('(',0);
             rStr += ')';
         }
         break;
-        case 1:                                         // -$1
+        case 1:                                        	// -$1
         {
             rStr.Insert( rSymStr, 0);
             rStr.Insert('-',0);
         }
         break;
-        case 2:                                         // $-1
+        case 2:                                        	// $-1
         {
             rStr.Insert('-',0);
             rStr.Insert( rSymStr, 0);
         }
         break;
-        case 3:                                         // $1-
+        case 3:                                        	// $1-
         {
             rStr.Insert( rSymStr, 0);
             rStr += '-';
         }
         break;
-        case 4:                                         // (1$)
+        case 4:                                        	// (1$)
         {
             rStr.Insert('(',0);
             rStr += rSymStr;
             rStr += ')';
         }
         break;
-        case 5:                                         // -1$
+        case 5:                                        	// -1$
         {
             rStr += rSymStr;
             rStr.Insert('-',0);
         }
         break;
-        case 6:                                         // 1-$
+        case 6:                                        	// 1-$
         {
             rStr += '-';
             rStr += rSymStr;
         }
         break;
-        case 7:                                         // 1$-
+        case 7:                                        	// 1$-
         {
             rStr += rSymStr;
             rStr += '-';
         }
         break;
-        case 8:                                         // -1 $
+        case 8:                                        	// -1 $
         {
             rStr += ' ';
             rStr += rSymStr;
             rStr.Insert('-',0);
         }
         break;
-        case 9:                                         // -$ 1
+        case 9:                                        	// -$ 1
         {
             rStr.Insert(' ',0);
             rStr.Insert( rSymStr, 0);
@@ -4080,21 +4080,21 @@ void NfCurrencyEntry::CompleteNegativeFormatString( String& rStr,
             rStr.Insert( aTmp, 0 );
         }
         break;
-        case 12 :                                       // $ 1-
+        case 12 : 										// $ 1-
         {
             rStr.Insert(' ', 0);
             rStr.Insert( rSymStr, 0);
             rStr += '-';
         }
         break;
-        case 13 :                                       // 1- $
+        case 13 : 										// 1- $
         {
             rStr += '-';
             rStr += ' ';
             rStr += rSymStr;
         }
         break;
-        case 14 :                                       // ($ 1)
+        case 14 : 										// ($ 1)
         {
             rStr.Insert(' ',0);
             rStr.Insert( rSymStr, 0);
@@ -4102,7 +4102,7 @@ void NfCurrencyEntry::CompleteNegativeFormatString( String& rStr,
             rStr += ')';
         }
         break;
-        case 15 :                                       // (1 $)
+        case 15 :										// (1 $)
         {
             rStr.Insert('(',0);
             rStr += ' ';
@@ -4131,13 +4131,13 @@ USHORT NfCurrencyEntry::GetEffectivePositiveFormat( USHORT
 #else
         switch ( nIntlFormat )
         {
-            case 0:                                         // $1
+            case 0:                                        	// $1
                 nIntlFormat = 2;                            // $ 1
             break;
-            case 1:                                         // 1$
+            case 1:											// 1$
                 nIntlFormat = 3;                            // 1 $
             break;
-            case 2:                                         // $ 1
+            case 2:											// $ 1
             break;
             case 3:                                         // 1 $
             break;
@@ -4156,30 +4156,30 @@ USHORT NfCurrencyEntry::GetEffectivePositiveFormat( USHORT
 // nur aufrufen, wenn nCurrFormat wirklich mit Klammern ist
 USHORT lcl_MergeNegativeParenthesisFormat( USHORT nIntlFormat, USHORT nCurrFormat )
 {
-    short nSign = 0;        // -1:=Klammer 0:=links, 1:=mitte, 2:=rechts
+    short nSign = 0;		// -1:=Klammer 0:=links, 1:=mitte, 2:=rechts
     switch ( nIntlFormat )
     {
-        case 0:                                         // ($1)
-        case 4:                                         // (1$)
-        case 14 :                                       // ($ 1)
-        case 15 :                                       // (1 $)
+        case 0:                                        	// ($1)
+        case 4:                                        	// (1$)
+        case 14 : 										// ($ 1)
+        case 15 :										// (1 $)
             return nCurrFormat;
-        case 1:                                         // -$1
-        case 5:                                         // -1$
-        case 8:                                         // -1 $
-        case 9:                                         // -$ 1
+        case 1:                                        	// -$1
+        case 5:                                        	// -1$
+        case 8:                                        	// -1 $
+        case 9:                                        	// -$ 1
             nSign = 0;
         break;
-        case 2:                                         // $-1
-        case 6:                                         // 1-$
-        case 11 :                                       // $ -1
-        case 13 :                                       // 1- $
+        case 2:                                        	// $-1
+        case 6:                                        	// 1-$
+        case 11 : 										// $ -1
+        case 13 : 										// 1- $
             nSign = 1;
         break;
-        case 3:                                         // $1-
-        case 7:                                         // 1$-
+        case 3:                                        	// $1-
+        case 7:                                        	// 1$-
         case 10:                                        // 1 $-
-        case 12 :                                       // $ 1-
+        case 12 : 										// $ 1-
             nSign = 2;
         break;
         default:
@@ -4189,7 +4189,7 @@ USHORT lcl_MergeNegativeParenthesisFormat( USHORT nIntlFormat, USHORT nCurrForma
 
     switch ( nCurrFormat )
     {
-        case 0:                                         // ($1)
+        case 0:                                        	// ($1)
             switch ( nSign )
             {
                 case 0:
@@ -4200,7 +4200,7 @@ USHORT lcl_MergeNegativeParenthesisFormat( USHORT nIntlFormat, USHORT nCurrForma
                     return 3;                           // $1-
             }
         break;
-        case 4:                                         // (1$)
+        case 4:                                        	// (1$)
             switch ( nSign )
             {
                 case 0:
@@ -4211,7 +4211,7 @@ USHORT lcl_MergeNegativeParenthesisFormat( USHORT nIntlFormat, USHORT nCurrForma
                     return 7;                           // 1$-
             }
         break;
-        case 14 :                                       // ($ 1)
+        case 14 : 										// ($ 1)
             switch ( nSign )
             {
                 case 0:
@@ -4222,7 +4222,7 @@ USHORT lcl_MergeNegativeParenthesisFormat( USHORT nIntlFormat, USHORT nCurrForma
                     return 12;                          // $ 1-
             }
         break;
-        case 15 :                                       // (1 $)
+        case 15 :										// (1 $)
             switch ( nSign )
             {
                 case 0:
@@ -4249,50 +4249,50 @@ USHORT NfCurrencyEntry::GetEffectiveNegativeFormat( USHORT nIntlFormat,
 #else
         switch ( nIntlFormat )
         {
-            case 0:                                         // ($1)
-//              nIntlFormat = 14;                           // ($ 1)
+            case 0:                                        	// ($1)
+//				nIntlFormat = 14;                           // ($ 1)
                 nIntlFormat = 9;                            // -$ 1
             break;
-            case 1:                                         // -$1
+            case 1:                                        	// -$1
                 nIntlFormat = 9;                            // -$ 1
             break;
-            case 2:                                         // $-1
+            case 2:                                        	// $-1
                 nIntlFormat = 11;                           // $ -1
             break;
-            case 3:                                         // $1-
+            case 3:                                        	// $1-
                 nIntlFormat = 12;                           // $ 1-
             break;
-            case 4:                                         // (1$)
-//              nIntlFormat = 15;                           // (1 $)
+            case 4:                                        	// (1$)
+//				nIntlFormat = 15;                           // (1 $)
                 nIntlFormat = 8;                            // -1 $
             break;
-            case 5:                                         // -1$
+            case 5:                                        	// -1$
                 nIntlFormat = 8;                            // -1 $
             break;
-            case 6:                                         // 1-$
+            case 6:                                        	// 1-$
                 nIntlFormat = 13;                           // 1- $
             break;
-            case 7:                                         // 1$-
+            case 7:                                        	// 1$-
                 nIntlFormat = 10;                           // 1 $-
             break;
-            case 8:                                         // -1 $
+            case 8:                                        	// -1 $
             break;
-            case 9:                                         // -$ 1
+            case 9:                                        	// -$ 1
             break;
             case 10:                                        // 1 $-
             break;
             case 11:                                        // $ -1
             break;
-            case 12 :                                       // $ 1-
+            case 12 : 										// $ 1-
             break;
-            case 13 :                                       // 1- $
+            case 13 : 										// 1- $
             break;
-            case 14 :                                       // ($ 1)
-//              nIntlFormat = 14;                           // ($ 1)
+            case 14 : 										// ($ 1)
+//				nIntlFormat = 14;                           // ($ 1)
                 nIntlFormat = 9;                            // -$ 1
             break;
-            case 15 :                                       // (1 $)
-//              nIntlFormat = 15;                           // (1 $)
+            case 15 :										// (1 $)
+//				nIntlFormat = 15;                           // (1 $)
                 nIntlFormat = 8;                            // -1 $
             break;
             default:
@@ -4305,36 +4305,36 @@ USHORT NfCurrencyEntry::GetEffectiveNegativeFormat( USHORT nIntlFormat,
     {
         switch ( nCurrFormat )
         {
-            case 0:                                         // ($1)
+            case 0:                                        	// ($1)
                 nIntlFormat = lcl_MergeNegativeParenthesisFormat(
                     nIntlFormat, nCurrFormat );
             break;
-            case 1:                                         // -$1
+            case 1:                                        	// -$1
                 nIntlFormat = nCurrFormat;
             break;
-            case 2:                                         // $-1
+            case 2:                                        	// $-1
                 nIntlFormat = nCurrFormat;
             break;
-            case 3:                                         // $1-
+            case 3:                                        	// $1-
                 nIntlFormat = nCurrFormat;
             break;
-            case 4:                                         // (1$)
+            case 4:                                        	// (1$)
                 nIntlFormat = lcl_MergeNegativeParenthesisFormat(
                     nIntlFormat, nCurrFormat );
             break;
-            case 5:                                         // -1$
+            case 5:                                        	// -1$
                 nIntlFormat = nCurrFormat;
             break;
-            case 6:                                         // 1-$
+            case 6:                                        	// 1-$
                 nIntlFormat = nCurrFormat;
             break;
-            case 7:                                         // 1$-
+            case 7:                                        	// 1$-
                 nIntlFormat = nCurrFormat;
             break;
-            case 8:                                         // -1 $
+            case 8:                                        	// -1 $
                 nIntlFormat = nCurrFormat;
             break;
-            case 9:                                         // -$ 1
+            case 9:                                        	// -$ 1
                 nIntlFormat = nCurrFormat;
             break;
             case 10:                                        // 1 $-
@@ -4343,17 +4343,17 @@ USHORT NfCurrencyEntry::GetEffectiveNegativeFormat( USHORT nIntlFormat,
             case 11:                                        // $ -1
                 nIntlFormat = nCurrFormat;
             break;
-            case 12 :                                       // $ 1-
+            case 12 : 										// $ 1-
                 nIntlFormat = nCurrFormat;
             break;
-            case 13 :                                       // 1- $
+            case 13 : 										// 1- $
                 nIntlFormat = nCurrFormat;
             break;
-            case 14 :                                       // ($ 1)
+            case 14 : 										// ($ 1)
                 nIntlFormat = lcl_MergeNegativeParenthesisFormat(
                     nIntlFormat, nCurrFormat );
             break;
-            case 15 :                                       // (1 $)
+            case 15 :										// (1 $)
                 nIntlFormat = lcl_MergeNegativeParenthesisFormat(
                     nIntlFormat, nCurrFormat );
             break;
@@ -4372,23 +4372,23 @@ sal_Char NfCurrencyEntry::GetEuroSymbol( rtl_TextEncoding eTextEncoding )
 {
     switch ( eTextEncoding )
     {
-        case RTL_TEXTENCODING_MS_1252 :         // WNT Ansi
-        case RTL_TEXTENCODING_ISO_8859_1 :      // UNX for use with TrueType fonts
+        case RTL_TEXTENCODING_MS_1252 :			// WNT Ansi
+        case RTL_TEXTENCODING_ISO_8859_1 :		// UNX for use with TrueType fonts
             return '\x80';
-        case RTL_TEXTENCODING_ISO_8859_15 :     // UNX real
+        case RTL_TEXTENCODING_ISO_8859_15 :		// UNX real
             return '\xA4';
-        case RTL_TEXTENCODING_IBM_850 :         // OS2
+        case RTL_TEXTENCODING_IBM_850 :			// OS2
             return '\xD5';
-        case RTL_TEXTENCODING_APPLE_ROMAN :     // MAC
+        case RTL_TEXTENCODING_APPLE_ROMAN :		// MAC
             return '\xDB';
-        default:                                // default system
+        default:								// default system
 #if WNT
             return '\x80';
 #elif OS2
             return '\xD5';
 #elif UNX
-//          return '\xA4';      // #56121# 0xA4 waere korrekt fuer iso-8859-15
-            return '\x80';      // aber Windoze-Code fuer die konvertierten TrueType-Fonts
+//			return '\xA4';		// #56121# 0xA4 waere korrekt fuer iso-8859-15
+            return '\x80';		// aber Windoze-Code fuer die konvertierten TrueType-Fonts
 #else
 #error EuroSymbol is what?
             return '\x80';
diff --git a/svl/source/numbers/zformat.cxx b/svl/source/numbers/zformat.cxx
index 97f06171a4fc..492702ba885a 100644
--- a/svl/source/numbers/zformat.cxx
+++ b/svl/source/numbers/zformat.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
@@ -1823,8 +1823,8 @@ void SvNumberformat::ImpGetOutputStdToPrecision(double& rNumber, String& rOutStr
             rtl_math_StringFormat_G, -3, '.', sal_True );
 }
 #endif
-
-    // We decided to strip trailing zeros unconditionally, since binary
+    
+    // We decided to strip trailing zeros unconditionally, since binary 
     // double-precision rounding error makes it impossible to determine e.g.
     // whether 844.10000000000002273737 is what the user has typed, or the
     // user has typed 844.1 but IEEE 754 represents it that way internally.
@@ -2085,7 +2085,7 @@ BOOL SvNumberformat::GetOutputString(double fNumber,
                         xub_StrLen nLen = OutString.Len();
                         if (!nLen)
                             return false;
-
+        
                         // #i112250# With the 10-decimal limit, small numbers are formatted as "0".
                         // Switch to scientific in that case, too:
                         if (nLen > 11 || (OutString.EqualsAscii("0") && fNumber != 0.0))
diff --git a/svl/source/numbers/zforscan.cxx b/svl/source/numbers/zforscan.cxx
index fb59e4289ad1..c88c6c2ae3cf 100644
--- a/svl/source/numbers/zforscan.cxx
+++ b/svl/source/numbers/zforscan.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
@@ -50,7 +50,7 @@ using namespace svt;
 
 const sal_Unicode cNonBreakingSpace = 0xA0;
 
-namespace
+namespace 
 {
     struct ImplEnglishColors
     {
@@ -83,20 +83,20 @@ ImpSvNumberformatScan::ImpSvNumberformatScan( SvNumberFormatter* pFormatterP )
     pFormatter = pFormatterP;
     bConvertMode = FALSE;
     //! All keywords MUST be UPPERCASE!
-    sKeyword[NF_KEY_E].AssignAscii( RTL_CONSTASCII_STRINGPARAM(     "E" ) );        // Exponent
-    sKeyword[NF_KEY_AMPM].AssignAscii( RTL_CONSTASCII_STRINGPARAM(  "AM/PM" ) );    // AM/PM
-    sKeyword[NF_KEY_AP].AssignAscii( RTL_CONSTASCII_STRINGPARAM(    "A/P" ) );      // AM/PM short
-    sKeyword[NF_KEY_MI].AssignAscii( RTL_CONSTASCII_STRINGPARAM(    "M" ) );        // Minute
-    sKeyword[NF_KEY_MMI].AssignAscii( RTL_CONSTASCII_STRINGPARAM(   "MM" ) );       // Minute 02
-    sKeyword[NF_KEY_S].AssignAscii( RTL_CONSTASCII_STRINGPARAM(     "S" ) );        // Second
-    sKeyword[NF_KEY_SS].AssignAscii( RTL_CONSTASCII_STRINGPARAM(    "SS" ) );       // Second 02
-    sKeyword[NF_KEY_Q].AssignAscii( RTL_CONSTASCII_STRINGPARAM(     "Q" ) );        // Quarter short 'Q'
-    sKeyword[NF_KEY_QQ].AssignAscii( RTL_CONSTASCII_STRINGPARAM(    "QQ" ) );       // Quarter long
-    sKeyword[NF_KEY_NN].AssignAscii( RTL_CONSTASCII_STRINGPARAM(    "NN" ) );       // Day of week short
-    sKeyword[NF_KEY_NNN].AssignAscii( RTL_CONSTASCII_STRINGPARAM(   "NNN" ) );      // Day of week long
-    sKeyword[NF_KEY_NNNN].AssignAscii( RTL_CONSTASCII_STRINGPARAM(  "NNNN" ) );     // Day of week long incl. separator
-    sKeyword[NF_KEY_WW].AssignAscii( RTL_CONSTASCII_STRINGPARAM(    "WW" ) );       // Week of year
-    sKeyword[NF_KEY_CCC].AssignAscii( RTL_CONSTASCII_STRINGPARAM(   "CCC" ) );      // Currency abbreviation
+    sKeyword[NF_KEY_E].AssignAscii( RTL_CONSTASCII_STRINGPARAM( 	"E" ) );		// Exponent
+    sKeyword[NF_KEY_AMPM].AssignAscii( RTL_CONSTASCII_STRINGPARAM( 	"AM/PM" ) );	// AM/PM
+    sKeyword[NF_KEY_AP].AssignAscii( RTL_CONSTASCII_STRINGPARAM( 	"A/P" ) );		// AM/PM short
+    sKeyword[NF_KEY_MI].AssignAscii( RTL_CONSTASCII_STRINGPARAM( 	"M" ) );		// Minute
+    sKeyword[NF_KEY_MMI].AssignAscii( RTL_CONSTASCII_STRINGPARAM( 	"MM" ) );		// Minute 02
+    sKeyword[NF_KEY_S].AssignAscii( RTL_CONSTASCII_STRINGPARAM( 	"S" ) );		// Second
+    sKeyword[NF_KEY_SS].AssignAscii( RTL_CONSTASCII_STRINGPARAM( 	"SS" ) );		// Second 02
+    sKeyword[NF_KEY_Q].AssignAscii( RTL_CONSTASCII_STRINGPARAM( 	"Q" ) );		// Quarter short 'Q'
+    sKeyword[NF_KEY_QQ].AssignAscii( RTL_CONSTASCII_STRINGPARAM( 	"QQ" ) );		// Quarter long
+    sKeyword[NF_KEY_NN].AssignAscii( RTL_CONSTASCII_STRINGPARAM( 	"NN" ) );		// Day of week short
+    sKeyword[NF_KEY_NNN].AssignAscii( RTL_CONSTASCII_STRINGPARAM( 	"NNN" ) );		// Day of week long
+    sKeyword[NF_KEY_NNNN].AssignAscii( RTL_CONSTASCII_STRINGPARAM( 	"NNNN" ) );		// Day of week long incl. separator
+    sKeyword[NF_KEY_WW].AssignAscii( RTL_CONSTASCII_STRINGPARAM( 	"WW" ) );		// Week of year
+    sKeyword[NF_KEY_CCC].AssignAscii( RTL_CONSTASCII_STRINGPARAM( 	"CCC" ) );		// Currency abbreviation
     bKeywordsNeedInit = TRUE;   // locale dependent keywords
     bCompatCurNeedInit = TRUE;  // locale dependent compatibility currency strings
 
@@ -247,15 +247,15 @@ void ImpSvNumberformatScan::SetDependentKeywords()
     sKeyword[NF_KEY_GENERAL] = pCharClass->upper( sNameStandardFormat );
 
     // preset new calendar keywords
-    sKeyword[NF_KEY_AAA].AssignAscii( RTL_CONSTASCII_STRINGPARAM(   "AAA" ) );
-    sKeyword[NF_KEY_AAAA].AssignAscii( RTL_CONSTASCII_STRINGPARAM(  "AAAA" ) );
-    sKeyword[NF_KEY_EC].AssignAscii( RTL_CONSTASCII_STRINGPARAM(    "E" ) );
-    sKeyword[NF_KEY_EEC].AssignAscii( RTL_CONSTASCII_STRINGPARAM(   "EE" ) );
-    sKeyword[NF_KEY_G].AssignAscii( RTL_CONSTASCII_STRINGPARAM(     "G" ) );
-    sKeyword[NF_KEY_GG].AssignAscii( RTL_CONSTASCII_STRINGPARAM(    "GG" ) );
-    sKeyword[NF_KEY_GGG].AssignAscii( RTL_CONSTASCII_STRINGPARAM(   "GGG" ) );
-    sKeyword[NF_KEY_R].AssignAscii( RTL_CONSTASCII_STRINGPARAM(     "R" ) );
-    sKeyword[NF_KEY_RR].AssignAscii( RTL_CONSTASCII_STRINGPARAM(    "RR" ) );
+    sKeyword[NF_KEY_AAA].AssignAscii( RTL_CONSTASCII_STRINGPARAM(	"AAA" ) );
+    sKeyword[NF_KEY_AAAA].AssignAscii( RTL_CONSTASCII_STRINGPARAM(	"AAAA" ) );
+    sKeyword[NF_KEY_EC].AssignAscii( RTL_CONSTASCII_STRINGPARAM(	"E" ) );
+    sKeyword[NF_KEY_EEC].AssignAscii( RTL_CONSTASCII_STRINGPARAM(	"EE" ) );
+    sKeyword[NF_KEY_G].AssignAscii( RTL_CONSTASCII_STRINGPARAM(		"G" ) );
+    sKeyword[NF_KEY_GG].AssignAscii( RTL_CONSTASCII_STRINGPARAM(	"GG" ) );
+    sKeyword[NF_KEY_GGG].AssignAscii( RTL_CONSTASCII_STRINGPARAM(	"GGG" ) );
+    sKeyword[NF_KEY_R].AssignAscii( RTL_CONSTASCII_STRINGPARAM(		"R" ) );
+    sKeyword[NF_KEY_RR].AssignAscii( RTL_CONSTASCII_STRINGPARAM(	"RR" ) );
 
     // Thai T NatNum special. Other locale's small letter 't' results in upper
     // case comparison not matching but length does in conversion mode. Ugly.
@@ -273,31 +273,31 @@ void ImpSvNumberformatScan::SetDependentKeywords()
         case LANGUAGE_GERMAN_LIECHTENSTEIN:
         {
             //! all capital letters
-            sKeyword[NF_KEY_M].AssignAscii( RTL_CONSTASCII_STRINGPARAM(         "M" ) );            // month 1
-            sKeyword[NF_KEY_MM].AssignAscii( RTL_CONSTASCII_STRINGPARAM(        "MM" ) );           // month 01
-            sKeyword[NF_KEY_MMM].AssignAscii( RTL_CONSTASCII_STRINGPARAM(       "MMM" ) );      // month Jan
-            sKeyword[NF_KEY_MMMM].AssignAscii( RTL_CONSTASCII_STRINGPARAM(      "MMMM" ) ); // month Januar
-            sKeyword[NF_KEY_MMMMM].AssignAscii( RTL_CONSTASCII_STRINGPARAM(     "MMMMM" ) );// month J
-            sKeyword[NF_KEY_H].AssignAscii( RTL_CONSTASCII_STRINGPARAM(         "H" ) );            // hour 2
-            sKeyword[NF_KEY_HH].AssignAscii( RTL_CONSTASCII_STRINGPARAM(        "HH" ) );           // hour 02
-            sKeyword[NF_KEY_D].AssignAscii( RTL_CONSTASCII_STRINGPARAM(         "T" ) );
-            sKeyword[NF_KEY_DD].AssignAscii( RTL_CONSTASCII_STRINGPARAM(        "TT" ) );
-            sKeyword[NF_KEY_DDD].AssignAscii( RTL_CONSTASCII_STRINGPARAM(       "TTT" ) );
-            sKeyword[NF_KEY_DDDD].AssignAscii( RTL_CONSTASCII_STRINGPARAM(      "TTTT" ) );
-            sKeyword[NF_KEY_YY].AssignAscii( RTL_CONSTASCII_STRINGPARAM(        "JJ" ) );
-            sKeyword[NF_KEY_YYYY].AssignAscii( RTL_CONSTASCII_STRINGPARAM(      "JJJJ" ) );
-            sKeyword[NF_KEY_BOOLEAN].AssignAscii( RTL_CONSTASCII_STRINGPARAM(   "LOGISCH" ) );
-            sKeyword[NF_KEY_COLOR].AssignAscii( RTL_CONSTASCII_STRINGPARAM(     "FARBE" ) );
-            sKeyword[NF_KEY_BLACK].AssignAscii( RTL_CONSTASCII_STRINGPARAM(     "SCHWARZ" ) );
-            sKeyword[NF_KEY_BLUE].AssignAscii( RTL_CONSTASCII_STRINGPARAM(      "BLAU" ) );
+            sKeyword[NF_KEY_M].AssignAscii( RTL_CONSTASCII_STRINGPARAM( 		"M" ) ); 			// month 1
+            sKeyword[NF_KEY_MM].AssignAscii( RTL_CONSTASCII_STRINGPARAM( 		"MM" ) );			// month 01
+            sKeyword[NF_KEY_MMM].AssignAscii( RTL_CONSTASCII_STRINGPARAM( 		"MMM" ) );		// month Jan
+            sKeyword[NF_KEY_MMMM].AssignAscii( RTL_CONSTASCII_STRINGPARAM( 		"MMMM" ) );	// month Januar
+            sKeyword[NF_KEY_MMMMM].AssignAscii( RTL_CONSTASCII_STRINGPARAM( 	"MMMMM" ) );// month J
+            sKeyword[NF_KEY_H].AssignAscii( RTL_CONSTASCII_STRINGPARAM( 		"H" ) ); 			// hour 2
+            sKeyword[NF_KEY_HH].AssignAscii( RTL_CONSTASCII_STRINGPARAM( 		"HH" ) );			// hour 02
+            sKeyword[NF_KEY_D].AssignAscii( RTL_CONSTASCII_STRINGPARAM( 		"T" ) );
+            sKeyword[NF_KEY_DD].AssignAscii( RTL_CONSTASCII_STRINGPARAM( 		"TT" ) );
+            sKeyword[NF_KEY_DDD].AssignAscii( RTL_CONSTASCII_STRINGPARAM( 		"TTT" ) );
+            sKeyword[NF_KEY_DDDD].AssignAscii( RTL_CONSTASCII_STRINGPARAM( 		"TTTT" ) );
+            sKeyword[NF_KEY_YY].AssignAscii( RTL_CONSTASCII_STRINGPARAM( 		"JJ" ) );
+            sKeyword[NF_KEY_YYYY].AssignAscii( RTL_CONSTASCII_STRINGPARAM( 		"JJJJ" ) );
+            sKeyword[NF_KEY_BOOLEAN].AssignAscii( RTL_CONSTASCII_STRINGPARAM( 	"LOGISCH" ) );
+            sKeyword[NF_KEY_COLOR].AssignAscii( RTL_CONSTASCII_STRINGPARAM( 	"FARBE" ) );
+            sKeyword[NF_KEY_BLACK].AssignAscii( RTL_CONSTASCII_STRINGPARAM( 	"SCHWARZ" ) );
+            sKeyword[NF_KEY_BLUE].AssignAscii( RTL_CONSTASCII_STRINGPARAM( 		"BLAU" ) );
             sKeyword[NF_KEY_GREEN] = UniString( "GR" "\xDC" "N", RTL_TEXTENCODING_ISO_8859_1 );
-            sKeyword[NF_KEY_CYAN].AssignAscii( RTL_CONSTASCII_STRINGPARAM(      "CYAN" ) );
-            sKeyword[NF_KEY_RED].AssignAscii( RTL_CONSTASCII_STRINGPARAM(       "ROT" ) );
-            sKeyword[NF_KEY_MAGENTA].AssignAscii( RTL_CONSTASCII_STRINGPARAM(   "MAGENTA" ) );
-            sKeyword[NF_KEY_BROWN].AssignAscii( RTL_CONSTASCII_STRINGPARAM(     "BRAUN" ) );
-            sKeyword[NF_KEY_GREY].AssignAscii( RTL_CONSTASCII_STRINGPARAM(      "GRAU" ) );
-            sKeyword[NF_KEY_YELLOW].AssignAscii( RTL_CONSTASCII_STRINGPARAM(    "GELB" ) );
-            sKeyword[NF_KEY_WHITE].AssignAscii( RTL_CONSTASCII_STRINGPARAM(     "WEISS" ) );
+            sKeyword[NF_KEY_CYAN].AssignAscii( RTL_CONSTASCII_STRINGPARAM( 		"CYAN" ) );
+            sKeyword[NF_KEY_RED].AssignAscii( RTL_CONSTASCII_STRINGPARAM( 		"ROT" ) );
+            sKeyword[NF_KEY_MAGENTA].AssignAscii( RTL_CONSTASCII_STRINGPARAM( 	"MAGENTA" ) );
+            sKeyword[NF_KEY_BROWN].AssignAscii( RTL_CONSTASCII_STRINGPARAM( 	"BRAUN" ) );
+            sKeyword[NF_KEY_GREY].AssignAscii( RTL_CONSTASCII_STRINGPARAM( 		"GRAU" ) );
+            sKeyword[NF_KEY_YELLOW].AssignAscii( RTL_CONSTASCII_STRINGPARAM( 	"GELB" ) );
+            sKeyword[NF_KEY_WHITE].AssignAscii( RTL_CONSTASCII_STRINGPARAM( 	"WEISS" ) );
         }
         break;
         default:
@@ -321,7 +321,7 @@ void ImpSvNumberformatScan::SetDependentKeywords()
                 case LANGUAGE_FRENCH_CANADIAN   :
                 case LANGUAGE_FRENCH_SWISS      :
                 case LANGUAGE_FRENCH_LUXEMBOURG :
-                case LANGUAGE_FRENCH_MONACO     :
+                case LANGUAGE_FRENCH_MONACO		:
                     sKeyword[NF_KEY_D].AssignAscii( RTL_CONSTASCII_STRINGPARAM( "J" ) );
                     sKeyword[NF_KEY_DD].AssignAscii( RTL_CONSTASCII_STRINGPARAM( "JJ" ) );
                     sKeyword[NF_KEY_DDD].AssignAscii( RTL_CONSTASCII_STRINGPARAM( "JJJ" ) );
@@ -366,7 +366,7 @@ void ImpSvNumberformatScan::SetDependentKeywords()
                 case LANGUAGE_FRENCH_CANADIAN   :
                 case LANGUAGE_FRENCH_SWISS      :
                 case LANGUAGE_FRENCH_LUXEMBOURG :
-                case LANGUAGE_FRENCH_MONACO     :
+                case LANGUAGE_FRENCH_MONACO		:
                 case LANGUAGE_PORTUGUESE           :
                 case LANGUAGE_PORTUGUESE_BRAZILIAN :
                 case LANGUAGE_SPANISH_MODERN      :
@@ -392,8 +392,8 @@ void ImpSvNumberformatScan::SetDependentKeywords()
                     sKeyword[NF_KEY_YY].AssignAscii( RTL_CONSTASCII_STRINGPARAM( "AA" ) );
                     sKeyword[NF_KEY_YYYY].AssignAscii( RTL_CONSTASCII_STRINGPARAM( "AAAA" ) );
                     // must exchange the day of week name code, same as Xcl
-                    sKeyword[NF_KEY_AAA].AssignAscii( RTL_CONSTASCII_STRINGPARAM(   "OOO" ) );
-                    sKeyword[NF_KEY_AAAA].AssignAscii( RTL_CONSTASCII_STRINGPARAM(  "OOOO" ) );
+                    sKeyword[NF_KEY_AAA].AssignAscii( RTL_CONSTASCII_STRINGPARAM(	"OOO" ) );
+                    sKeyword[NF_KEY_AAAA].AssignAscii( RTL_CONSTASCII_STRINGPARAM(	"OOOO" ) );
                 break;
                 case LANGUAGE_DUTCH         :
                 case LANGUAGE_DUTCH_BELGIAN :
@@ -433,17 +433,17 @@ void ImpSvNumberformatScan::SetDependentKeywords()
             // boolean
             sKeyword[NF_KEY_BOOLEAN].AssignAscii( RTL_CONSTASCII_STRINGPARAM( "BOOLEAN" ) );
             // colours
-            sKeyword[NF_KEY_COLOR].AssignAscii( RTL_CONSTASCII_STRINGPARAM(     "COLOR" ) );
-            sKeyword[NF_KEY_BLACK].AssignAscii( RTL_CONSTASCII_STRINGPARAM(     "BLACK" ) );
-            sKeyword[NF_KEY_BLUE].AssignAscii( RTL_CONSTASCII_STRINGPARAM(      "BLUE" ) );
-            sKeyword[NF_KEY_GREEN].AssignAscii( RTL_CONSTASCII_STRINGPARAM(     "GREEN" ) );
-            sKeyword[NF_KEY_CYAN].AssignAscii( RTL_CONSTASCII_STRINGPARAM(      "CYAN" ) );
-            sKeyword[NF_KEY_RED].AssignAscii( RTL_CONSTASCII_STRINGPARAM(       "RED" ) );
-            sKeyword[NF_KEY_MAGENTA].AssignAscii( RTL_CONSTASCII_STRINGPARAM(   "MAGENTA" ) );
-            sKeyword[NF_KEY_BROWN].AssignAscii( RTL_CONSTASCII_STRINGPARAM(     "BROWN" ) );
-            sKeyword[NF_KEY_GREY].AssignAscii( RTL_CONSTASCII_STRINGPARAM(      "GREY" ) );
-            sKeyword[NF_KEY_YELLOW].AssignAscii( RTL_CONSTASCII_STRINGPARAM(    "YELLOW" ) );
-            sKeyword[NF_KEY_WHITE].AssignAscii( RTL_CONSTASCII_STRINGPARAM(     "WHITE" ) );
+            sKeyword[NF_KEY_COLOR].AssignAscii( RTL_CONSTASCII_STRINGPARAM( 	"COLOR" ) );
+            sKeyword[NF_KEY_BLACK].AssignAscii( RTL_CONSTASCII_STRINGPARAM( 	"BLACK" ) );
+            sKeyword[NF_KEY_BLUE].AssignAscii( RTL_CONSTASCII_STRINGPARAM( 		"BLUE" ) );
+            sKeyword[NF_KEY_GREEN].AssignAscii( RTL_CONSTASCII_STRINGPARAM( 	"GREEN" ) );
+            sKeyword[NF_KEY_CYAN].AssignAscii( RTL_CONSTASCII_STRINGPARAM( 		"CYAN" ) );
+            sKeyword[NF_KEY_RED].AssignAscii( RTL_CONSTASCII_STRINGPARAM( 		"RED" ) );
+            sKeyword[NF_KEY_MAGENTA].AssignAscii( RTL_CONSTASCII_STRINGPARAM( 	"MAGENTA" ) );
+            sKeyword[NF_KEY_BROWN].AssignAscii( RTL_CONSTASCII_STRINGPARAM( 	"BROWN" ) );
+            sKeyword[NF_KEY_GREY].AssignAscii( RTL_CONSTASCII_STRINGPARAM( 		"GREY" ) );
+            sKeyword[NF_KEY_YELLOW].AssignAscii( RTL_CONSTASCII_STRINGPARAM( 	"YELLOW" ) );
+            sKeyword[NF_KEY_WHITE].AssignAscii( RTL_CONSTASCII_STRINGPARAM( 	"WHITE" ) );
         }
         break;
     }
@@ -488,7 +488,7 @@ Color* ImpSvNumberformatScan::GetColor(String& sStr)
         if ( j < NF_MAX_DEFAULT_COLORS )
             i = j;
     }
-
+    
     Color* pResult = NULL;
     if (i >= NF_MAX_DEFAULT_COLORS)
     {
@@ -557,12 +557,12 @@ short ImpSvNumberformatScan::GetKeyWord( const String& sSymbol, xub_StrLen nPos
     }
     // new keywords take precedence over old keywords
     if ( !bFound )
-    {   // skip the gap of colors et al between new and old keywords and search on
+    {	// skip the gap of colors et al between new and old keywords and search on
         i = NF_KEY_LASTKEYWORD;
         while ( i > 0 && sString.Search(pKeyword[i]) != 0 )
             i--;
         if ( i > NF_KEY_LASTOLDKEYWORD && sString != pKeyword[i] )
-        {   // found something, but maybe it's something else?
+        {	// found something, but maybe it's something else?
             // e.g. new NNN is found in NNNN, for NNNN we must search on
             short j = i - 1;
             while ( j > 0 && sString.Search(pKeyword[j]) != 0 )
@@ -576,7 +576,7 @@ short ImpSvNumberformatScan::GetKeyWord( const String& sSymbol, xub_StrLen nPos
             LANGUAGE_ENGLISH_US && MsLangId::getRealLanguage( eNewLnge) ==
             LANGUAGE_THAI)
         i = NF_KEY_THAI_T;
-    return i;       // 0 => not found
+    return i;		// 0 => not found
 }
 
 //---------------------------------------------------------------------------
@@ -778,13 +778,13 @@ short ImpSvNumberformatScan::Next_Symbol( const String& rStr,
                                         switch ( cNext )
                                         {
                                             case '+' :
-                                            case '-' :  // E+ E- combine to one symbol
+                                            case '-' :	// E+ E- combine to one symbol
                                                 sSymbol += cNext;
                                                 eType = NF_KEY_E;
                                                 nPos++;
                                             break;
                                             case '0' :
-                                            case '#' :  // scientific E without sign
+                                            case '#' :	// scientific E without sign
                                                 eType = NF_KEY_E;
                                             break;
                                         }
@@ -830,7 +830,7 @@ short ImpSvNumberformatScan::Next_Symbol( const String& rStr,
                 {
                     short nTmpType = GetKeyWord( rStr, nPos-1 );
                     if ( nTmpType )
-                    {   // beginning of keyword, stop scan and put back
+                    {	// beginning of keyword, stop scan and put back
                         eType = NF_SYMBOLTYPE_STRING;
                         eState = SsStop;
                         nPos--;
@@ -843,7 +843,7 @@ short ImpSvNumberformatScan::Next_Symbol( const String& rStr,
                     BOOL bDontStop = FALSE;
                     switch (cToken)
                     {
-                        case '/':                       // AM/PM, A/P
+                        case '/':						// AM/PM, A/P
                         {
                             sal_Unicode cNext = rStr.GetChar(nPos);
                             if ( cNext == 'P' || cNext == 'p' )
@@ -876,7 +876,7 @@ short ImpSvNumberformatScan::Next_Symbol( const String& rStr,
             {
                 eState = SsStop;
                 sSymbol += cToken;
-                nRepPos = (nPos - nStart) - 1;  // everytime > 0!!
+                nRepPos = (nPos - nStart) - 1;	// everytime > 0!!
             }
             break;
             case SsGetBlank:
@@ -887,8 +887,8 @@ short ImpSvNumberformatScan::Next_Symbol( const String& rStr,
             break;
             default:
             break;
-        }                                   // of switch
-    }                                       // of while
+        }									// of switch
+    } 										// of while
     if (eState == SsGetWord)
         eType = NF_SYMBOLTYPE_STRING;
     return eType;
@@ -912,20 +912,20 @@ xub_StrLen ImpSvNumberformatScan::Symbol_Division(const String& rString)
                 sal_Unicode c;
                 if ( nCPos == 0 ||
                     ((c = sString.GetChar(xub_StrLen(nCPos-1))) != '"'
-                            && c != '\\') )         // dm kann durch "dm
-                {                                   // \d geschuetzt werden
+                            && c != '\\') )			// dm kann durch "dm
+                {                   				// \d geschuetzt werden
                     nCurrPos = nCPos;
-                    nCPos = STRING_NOTFOUND;        // Abbruch
+                    nCPos = STRING_NOTFOUND;		// Abbruch
                 }
                 else
-                    nCPos++;                        // weitersuchen
+                    nCPos++;						// weitersuchen
             }
             else
-                nCPos = nQ + 1;                     // weitersuchen
+                nCPos = nQ + 1;						// weitersuchen
         }
     }
     nAnzStrings = 0;
-    BOOL bStar = FALSE;                 // wird bei '*'Detektion gesetzt
+    BOOL bStar = FALSE;					// wird bei '*'Detektion gesetzt
     Reset();
 
     xub_StrLen nPos = 0;
@@ -934,16 +934,16 @@ xub_StrLen ImpSvNumberformatScan::Symbol_Division(const String& rString)
     {
         nTypeArray[nAnzStrings] = Next_Symbol(rString, nPos, sStrArray[nAnzStrings]);
         if (nTypeArray[nAnzStrings] == NF_SYMBOLTYPE_STAR)
-        {                               // Ueberwachung des '*'
+        {								// Ueberwachung des '*'
             if (bStar)
-                return nPos;        // Fehler: doppelter '*'
+                return nPos;		// Fehler: doppelter '*'
             else
                 bStar = TRUE;
         }
         nAnzStrings++;
     }
 
-    return 0;                       // 0 => ok
+    return 0;						// 0 => ok
 }
 
 void ImpSvNumberformatScan::SkipStrings(USHORT& i, xub_StrLen& nPos)
@@ -1005,7 +1005,7 @@ sal_Unicode ImpSvNumberformatScan::PreviousChar(USHORT i)
     if (i > 0 && i < nAnzStrings)
     {
         i--;
-        while (i > 0 && (   nTypeArray[i] == NF_SYMBOLTYPE_EMPTY
+        while (i > 0 && ( 	nTypeArray[i] == NF_SYMBOLTYPE_EMPTY
                          || nTypeArray[i] == NF_SYMBOLTYPE_STRING
                          || nTypeArray[i] == NF_SYMBOLTYPE_STAR
                          || nTypeArray[i] == NF_SYMBOLTYPE_BLANK ) )
@@ -1051,11 +1051,11 @@ BOOL ImpSvNumberformatScan::IsLastBlankBeforeFrac(USHORT i)
                     sStrArray[i].GetChar(0) == ' ')
                 res = FALSE;
         }
-        if (!bStop)                                 // kein '/'
+        if (!bStop)									// kein '/'
             res = FALSE;
     }
     else
-        res = FALSE;                                // kein '/' mehr
+        res = FALSE;								// kein '/' mehr
 
     return res;
 }
@@ -1117,66 +1117,66 @@ xub_StrLen ImpSvNumberformatScan::ScanType(const String&)
         {                                       // keyword
             switch (nTypeArray[i])
             {
-                case NF_KEY_E:                          // E
+                case NF_KEY_E:			 				// E
                     eNewType = NUMBERFORMAT_SCIENTIFIC;
                 break;
-                case NF_KEY_AMPM:                       // AM,A,PM,P
+                case NF_KEY_AMPM:		 				// AM,A,PM,P
                 case NF_KEY_AP:
-                case NF_KEY_H:                          // H
-                case NF_KEY_HH:                         // HH
-                case NF_KEY_S:                          // S
-                case NF_KEY_SS:                         // SS
+                case NF_KEY_H:							// H
+                case NF_KEY_HH:							// HH
+                case NF_KEY_S:							// S
+                case NF_KEY_SS:							// SS
                     eNewType = NUMBERFORMAT_TIME;
                 break;
-                case NF_KEY_M:                          // M
-                case NF_KEY_MM:                         // MM
+                case NF_KEY_M:			 				// M
+                case NF_KEY_MM:			 				// MM
                 {                                       // minute or month
                     USHORT nIndexPre = PreviousKeyword(i);
                     USHORT nIndexNex = NextKeyword(i);
                     sal_Unicode cChar = PreviousChar(i);
-                    if (nIndexPre == NF_KEY_H   ||  // H
-                        nIndexPre == NF_KEY_HH  ||  // HH
-                        nIndexNex == NF_KEY_S   ||  // S
-                        nIndexNex == NF_KEY_SS  ||  // SS
+                    if (nIndexPre == NF_KEY_H	|| 	// H
+                        nIndexPre == NF_KEY_HH	|| 	// HH
+                        nIndexNex == NF_KEY_S	|| 	// S
+                        nIndexNex == NF_KEY_SS	||  // SS
                         cChar == '['  )     // [M
                     {
                         eNewType = NUMBERFORMAT_TIME;
-                        nTypeArray[i] -= 2;         // 6 -> 4, 7 -> 5
+                        nTypeArray[i] -= 2;			// 6 -> 4, 7 -> 5
                     }
                     else
                         eNewType = NUMBERFORMAT_DATE;
                 }
                 break;
-                case NF_KEY_MMM:                // MMM
-                case NF_KEY_MMMM:               // MMMM
-                case NF_KEY_MMMMM:              // MMMMM
-                case NF_KEY_Q:                  // Q
-                case NF_KEY_QQ:                 // QQ
-                case NF_KEY_D:                  // D
-                case NF_KEY_DD:                 // DD
-                case NF_KEY_DDD:                // DDD
-                case NF_KEY_DDDD:               // DDDD
-                case NF_KEY_YY:                 // YY
-                case NF_KEY_YYYY:               // YYYY
-                case NF_KEY_NN:                 // NN
-                case NF_KEY_NNN:                // NNN
-                case NF_KEY_NNNN:               // NNNN
-                case NF_KEY_WW :                // WW
-                case NF_KEY_AAA :               // AAA
-                case NF_KEY_AAAA :              // AAAA
-                case NF_KEY_EC :                // E
-                case NF_KEY_EEC :               // EE
-                case NF_KEY_G :                 // G
-                case NF_KEY_GG :                // GG
-                case NF_KEY_GGG :               // GGG
-                case NF_KEY_R :                 // R
-                case NF_KEY_RR :                // RR
+                case NF_KEY_MMM:				// MMM
+                case NF_KEY_MMMM:				// MMMM
+                case NF_KEY_MMMMM:				// MMMMM
+                case NF_KEY_Q:					// Q
+                case NF_KEY_QQ:					// QQ
+                case NF_KEY_D:					// D
+                case NF_KEY_DD:					// DD
+                case NF_KEY_DDD:				// DDD
+                case NF_KEY_DDDD:				// DDDD
+                case NF_KEY_YY:					// YY
+                case NF_KEY_YYYY:				// YYYY
+                case NF_KEY_NN:					// NN
+                case NF_KEY_NNN:				// NNN
+                case NF_KEY_NNNN:				// NNNN
+                case NF_KEY_WW :				// WW
+                case NF_KEY_AAA :				// AAA
+                case NF_KEY_AAAA :				// AAAA
+                case NF_KEY_EC :				// E
+                case NF_KEY_EEC :				// EE
+                case NF_KEY_G :					// G
+                case NF_KEY_GG :				// GG
+                case NF_KEY_GGG :				// GGG
+                case NF_KEY_R :					// R
+                case NF_KEY_RR :				// RR
                     eNewType = NUMBERFORMAT_DATE;
                 break;
-                case NF_KEY_CCC:                // CCC
+                case NF_KEY_CCC:				// CCC
                     eNewType = NUMBERFORMAT_CURRENCY;
                 break;
-                case NF_KEY_GENERAL:            // Standard
+                case NF_KEY_GENERAL:			// Standard
                     eNewType = NUMBERFORMAT_NUMBER;
                     bHaveGeneral = true;
                 break;
@@ -1220,26 +1220,26 @@ xub_StrLen ImpSvNumberformatScan::ScanType(const String&)
                     if ( i < nAnzStrings-1 &&
                             nTypeArray[i+1] == NF_SYMBOLTYPE_STRING &&
                             sStrArray[i+1].GetChar(0) == '$' )
-                    {   // as of SV_NUMBERFORMATTER_VERSION_NEW_CURR
+                    {	// as of SV_NUMBERFORMATTER_VERSION_NEW_CURR
                         eNewType = NUMBERFORMAT_CURRENCY;
                         bMatchBracket = TRUE;
                     }
                     else if ( i < nAnzStrings-1 &&
                             nTypeArray[i+1] == NF_SYMBOLTYPE_STRING &&
                             sStrArray[i+1].GetChar(0) == '~' )
-                    {   // as of SV_NUMBERFORMATTER_VERSION_CALENDAR
+                    {	// as of SV_NUMBERFORMATTER_VERSION_CALENDAR
                         eNewType = NUMBERFORMAT_DATE;
                         bMatchBracket = TRUE;
                     }
                     else
                     {
                         USHORT nIndexNex = NextKeyword(i);
-                        if (nIndexNex == NF_KEY_H   ||  // H
-                            nIndexNex == NF_KEY_HH  ||  // HH
-                            nIndexNex == NF_KEY_M   ||  // M
-                            nIndexNex == NF_KEY_MM  ||  // MM
-                            nIndexNex == NF_KEY_S   ||  // S
-                            nIndexNex == NF_KEY_SS   )  // SS
+                        if (nIndexNex == NF_KEY_H	|| 	// H
+                            nIndexNex == NF_KEY_HH	|| 	// HH
+                            nIndexNex == NF_KEY_M	|| 	// M
+                            nIndexNex == NF_KEY_MM	|| 	// MM
+                            nIndexNex == NF_KEY_S	|| 	// S
+                            nIndexNex == NF_KEY_SS   )	// SS
                             eNewType = NUMBERFORMAT_TIME;
                         else
                             return nPos;                // Error
@@ -1259,9 +1259,9 @@ xub_StrLen ImpSvNumberformatScan::ScanType(const String&)
         if (eScannedType == NUMBERFORMAT_UNDEFINED)
             eScannedType = eNewType;
         else if (eScannedType == NUMBERFORMAT_TEXT || eNewType == NUMBERFORMAT_TEXT)
-            eScannedType = NUMBERFORMAT_TEXT;               // Text bleibt immer Text
+            eScannedType = NUMBERFORMAT_TEXT;				// Text bleibt immer Text
         else if (eNewType == NUMBERFORMAT_UNDEFINED)
-        {                                           // bleibt wie bisher
+        {											// bleibt wie bisher
         }
         else if (eScannedType != eNewType)
         {
@@ -1274,7 +1274,7 @@ xub_StrLen ImpSvNumberformatScan::ScanType(const String&)
                         case NUMBERFORMAT_TIME:
                             eScannedType = NUMBERFORMAT_DATETIME;
                         break;
-                        case NUMBERFORMAT_FRACTION:         // DD/MM
+                        case NUMBERFORMAT_FRACTION: 		// DD/MM
                         break;
                         default:
                         {
@@ -1293,7 +1293,7 @@ xub_StrLen ImpSvNumberformatScan::ScanType(const String&)
                         case NUMBERFORMAT_DATE:
                             eScannedType = NUMBERFORMAT_DATETIME;
                         break;
-                        case NUMBERFORMAT_FRACTION:         // MM/SS
+                        case NUMBERFORMAT_FRACTION: 		// MM/SS
                         break;
                         default:
                         {
@@ -1312,7 +1312,7 @@ xub_StrLen ImpSvNumberformatScan::ScanType(const String&)
                         case NUMBERFORMAT_TIME:
                         case NUMBERFORMAT_DATE:
                         break;
-                        case NUMBERFORMAT_FRACTION:         // DD/MM
+                        case NUMBERFORMAT_FRACTION: 		// DD/MM
                         break;
                         default:
                         {
@@ -1329,7 +1329,7 @@ xub_StrLen ImpSvNumberformatScan::ScanType(const String&)
                 {
                     switch (eNewType)
                     {
-                        case NUMBERFORMAT_NUMBER:   // nur Zahl nach Prozent
+                        case NUMBERFORMAT_NUMBER:	// nur Zahl nach Prozent
                         break;
                         default:
                             return nPos;
@@ -1340,7 +1340,7 @@ xub_StrLen ImpSvNumberformatScan::ScanType(const String&)
                 {
                     switch (eNewType)
                     {
-                        case NUMBERFORMAT_NUMBER:   // nur Zahl nach E
+                        case NUMBERFORMAT_NUMBER:	// nur Zahl nach E
                         break;
                         default:
                             return nPos;
@@ -1369,7 +1369,7 @@ xub_StrLen ImpSvNumberformatScan::ScanType(const String&)
                 {
                     switch (eNewType)
                     {
-                        case NUMBERFORMAT_NUMBER:           // nur Zahl nach Bruch
+                        case NUMBERFORMAT_NUMBER:			// nur Zahl nach Bruch
                         break;
                         default:
                             return nPos;
@@ -1380,7 +1380,7 @@ xub_StrLen ImpSvNumberformatScan::ScanType(const String&)
                 break;
             }
         }
-        nPos = nPos + sStrArray[i].Len();           // Korrekturposition
+        nPos = nPos + sStrArray[i].Len();			// Korrekturposition
         i++;
         if ( bMatchBracket )
         {   // no type detection inside of matching brackets if [$...], [~...]
@@ -1402,10 +1402,10 @@ xub_StrLen ImpSvNumberformatScan::ScanType(const String&)
 
     if ((eScannedType == NUMBERFORMAT_NUMBER || eScannedType == NUMBERFORMAT_UNDEFINED)
          && nCurrPos != STRING_NOTFOUND && !bHaveGeneral)
-        eScannedType = NUMBERFORMAT_CURRENCY;   // old "automatic" currency
+        eScannedType = NUMBERFORMAT_CURRENCY;	// old "automatic" currency
     if (eScannedType == NUMBERFORMAT_UNDEFINED)
         eScannedType = NUMBERFORMAT_DEFINED;
-    return 0;                               // Alles ok
+    return 0;								// Alles ok
 }
 
 
@@ -1438,19 +1438,19 @@ int ImpSvNumberformatScan::FinalScanGetCalendar( xub_StrLen& nPos, USHORT& i,
             i < nAnzStrings-1 &&
             nTypeArray[i+1] == NF_SYMBOLTYPE_STRING &&
             sStrArray[i+1].GetChar(0) == '~' )
-    {   // [~calendarID]
+    {	// [~calendarID]
         // as of SV_NUMBERFORMATTER_VERSION_CALENDAR
-        nPos = nPos + sStrArray[i].Len();           // [
+        nPos = nPos + sStrArray[i].Len();			// [
         nTypeArray[i] = NF_SYMBOLTYPE_CALDEL;
-        nPos = nPos + sStrArray[++i].Len();     // ~
-        sStrArray[i-1] += sStrArray[i];     // [~
+        nPos = nPos + sStrArray[++i].Len();		// ~
+        sStrArray[i-1] += sStrArray[i];		// [~
         nTypeArray[i] = NF_SYMBOLTYPE_EMPTY;
         rAnzResStrings--;
         if ( ++i >= nAnzStrings )
-            return -1;      // error
-        nPos = nPos + sStrArray[i].Len();           // calendarID
+            return -1;		// error
+        nPos = nPos + sStrArray[i].Len();			// calendarID
         String& rStr = sStrArray[i];
-        nTypeArray[i] = NF_SYMBOLTYPE_CALENDAR; // convert
+        nTypeArray[i] = NF_SYMBOLTYPE_CALENDAR;	// convert
         i++;
         while ( i < nAnzStrings &&
                 sStrArray[i].GetChar(0) != ']' )
@@ -1469,7 +1469,7 @@ int ImpSvNumberformatScan::FinalScanGetCalendar( xub_StrLen& nPos, USHORT& i,
             i++;
         }
         else
-            return -1;      // error
+            return -1;		// error
         return 1;
     }
     return 0;
@@ -1483,7 +1483,7 @@ xub_StrLen ImpSvNumberformatScan::FinalScan( String& rString, String& rComment )
     String sOldDecSep       = pFormatter->GetNumDecimalSep();
     String sOldThousandSep  = pFormatter->GetNumThousandSep();
     String sOldDateSep      = pFormatter->GetDateSep();
-    String sOldTimeSep      = pLoc->getTimeSep();
+    String sOldTimeSep		= pLoc->getTimeSep();
     String sOldTime100SecSep= pLoc->getTime100SecSep();
     String sOldCurSymbol    = GetCurSymbol();
     String sOldCurString    = GetCurString();
@@ -1538,7 +1538,7 @@ xub_StrLen ImpSvNumberformatScan::FinalScan( String& rString, String& rComment )
                         nAnzResStrings--;
                     }
                     break;
-                    case NF_KEY_GENERAL :   // #77026# "General" is the same as "@"
+                    case NF_KEY_GENERAL :	// #77026# "General" is the same as "@"
                     break;
                     default:
                     {
@@ -1550,7 +1550,7 @@ xub_StrLen ImpSvNumberformatScan::FinalScan( String& rString, String& rComment )
                 }
                 nPos = nPos + sStrArray[i].Len();
                 i++;
-            }                                       // of while
+            }										// of while
         }
         break;
         case NUMBERFORMAT_NUMBER:
@@ -1562,21 +1562,21 @@ xub_StrLen ImpSvNumberformatScan::FinalScan( String& rString, String& rComment )
             sal_Unicode cThousandFill = ' ';
             while (i < nAnzStrings)
             {
-                if (eScannedType == NUMBERFORMAT_FRACTION &&    // special case
-                    nTypeArray[i] == NF_SYMBOLTYPE_DEL &&           // # ### #/#
+                if (eScannedType == NUMBERFORMAT_FRACTION &&  	// special case
+                    nTypeArray[i] == NF_SYMBOLTYPE_DEL && 			// # ### #/#
                     StringEqualsChar( sOldThousandSep, ' ' ) && // e.g. France or Sweden
                     StringEqualsChar( sStrArray[i], ' ' ) &&
                     !bFrac                          &&
                     IsLastBlankBeforeFrac(i) )
                 {
-                    nTypeArray[i] = NF_SYMBOLTYPE_STRING;           // del->string
+                    nTypeArray[i] = NF_SYMBOLTYPE_STRING;			// del->string
                 }                                               // kein Taus.p.
 
 
-                if (nTypeArray[i] == NF_SYMBOLTYPE_BLANK    ||
-                    nTypeArray[i] == NF_SYMBOLTYPE_STAR ||
-                    nTypeArray[i] == NF_KEY_CCC         ||  // CCC
-                    nTypeArray[i] == NF_KEY_GENERAL )       // Standard
+                if (nTypeArray[i] == NF_SYMBOLTYPE_BLANK	||
+                    nTypeArray[i] == NF_SYMBOLTYPE_STAR	||
+                    nTypeArray[i] == NF_KEY_CCC			||	// CCC
+                    nTypeArray[i] == NF_KEY_GENERAL )		// Standard
                 {
                     if (nTypeArray[i] == NF_KEY_GENERAL)
                     {
@@ -1588,12 +1588,12 @@ xub_StrLen ImpSvNumberformatScan::FinalScan( String& rString, String& rComment )
                     i++;
                 }
                 else if (nTypeArray[i] == NF_SYMBOLTYPE_STRING ||  // Strings oder
-                         nTypeArray[i] > 0)                     // Keywords
+                         nTypeArray[i] > 0) 					// Keywords
                 {
                     if (eScannedType == NUMBERFORMAT_SCIENTIFIC &&
-                             nTypeArray[i] == NF_KEY_E)         // E+
+                             nTypeArray[i] == NF_KEY_E) 		// E+
                     {
-                        if (bExp)                               // doppelt
+                        if (bExp) 								// doppelt
                             return nPos;
                         bExp = TRUE;
                         nExpPos = i;
@@ -1607,10 +1607,10 @@ xub_StrLen ImpSvNumberformatScan::FinalScan( String& rString, String& rComment )
                     else if (eScannedType == NUMBERFORMAT_FRACTION &&
                              sStrArray[i].GetChar(0) == ' ')
                     {
-                        if (!bBlank && !bFrac)  // nicht doppelt oder hinter /
+                        if (!bBlank && !bFrac)	// nicht doppelt oder hinter /
                         {
-                            if (bDecSep && nCounter > 0)    // Nachkommastellen
-                                return nPos;                // Fehler
+                            if (bDecSep && nCounter > 0)	// Nachkommastellen
+                                return nPos;				// Fehler
                             bBlank = TRUE;
                             nBlankPos = i;
                             nCntPre = nCounter;
@@ -1645,10 +1645,10 @@ xub_StrLen ImpSvNumberformatScan::FinalScan( String& rString, String& rComment )
                         case '0':
                         case '?':
                         {
-                            if (nThousand > 0)                  // #... #
-                                return nPos;                    // Fehler
+                            if (nThousand > 0)					// #... #
+                                return nPos;					// Fehler
                             else if (bFrac && cHere == '0')
-                                return nPos;                    // 0 im Nenner
+                                return nPos;					// 0 im Nenner
                             nTypeArray[i] = NF_SYMBOLTYPE_DIGIT;
                             String& rStr = sStrArray[i];
                             nPos = nPos + rStr.Len();
@@ -1710,20 +1710,20 @@ xub_StrLen ImpSvNumberformatScan::FinalScan( String& rString, String& rComment )
                         case '\'':
                         case ' ':
                         {
-                            sal_Unicode cSep = cHere;   // remember
+                            sal_Unicode cSep = cHere;	// remember
                             if ( StringEqualsChar( sOldThousandSep, cSep ) )
                             {
                                 // previous char with skip empty
                                 sal_Unicode cPre = PreviousChar(i);
                                 sal_Unicode cNext;
                                 if (bExp || bBlank || bFrac)
-                                {   // after E, / or ' '
+                                {	// after E, / or ' '
                                     if ( !StringEqualsChar( sOldThousandSep, ' ' ) )
                                     {
                                         nPos = nPos + sStrArray[i].Len();
                                         nTypeArray[i] = NF_SYMBOLTYPE_EMPTY;
                                         nAnzResStrings--;
-                                        i++;                // eat it
+                                        i++; 				// eat it
                                     }
                                     else
                                         nTypeArray[i] = NF_SYMBOLTYPE_STRING;
@@ -1731,10 +1731,10 @@ xub_StrLen ImpSvNumberformatScan::FinalScan( String& rString, String& rComment )
                                 else if (i > 0 && i < nAnzStrings-1   &&
                                     (cPre == '#' || cPre == '0')      &&
                                     ((cNext = NextChar(i)) == '#' || cNext == '0')
-                                    )                   // #,#
+                                    )					// #,#
                                 {
                                     nPos = nPos + sStrArray[i].Len();
-                                    if (!bThousand)                 // only once
+                                    if (!bThousand)					// only once
                                     {
                                         bThousand = TRUE;
                                         cThousandFill = sStrArray[i+1].GetChar(0);
@@ -1748,9 +1748,9 @@ xub_StrLen ImpSvNumberformatScan::FinalScan( String& rString, String& rComment )
                                 else if (i > 0 && (cPre == '#' || cPre == '0')
                                     && PreviousType(i) == NF_SYMBOLTYPE_DIGIT
                                     && nThousand < FLAG_STANDARD_IN_FORMAT )
-                                {                                   // #,,,,
+                                {									// #,,,,
                                     if ( StringEqualsChar( sOldThousandSep, ' ' ) )
-                                    {   // strange, those French..
+                                    {	// strange, those French..
                                         BOOL bFirst = TRUE;
                                         String& rStr = sStrArray[i];
                                         //  set a hard Non-Breaking Space or ConvertMode
@@ -1758,7 +1758,7 @@ xub_StrLen ImpSvNumberformatScan::FinalScan( String& rString, String& rComment )
                                         while ( i < nAnzStrings
                                             && sStrArray[i] == sOldThousandSep
                                             && StringEqualsChar( sOldThousandSep, NextChar(i) ) )
-                                        {   // last was a space or another space
+                                        {	// last was a space or another space
                                             // is following => separator
                                             nPos = nPos + sStrArray[i].Len();
                                             if ( bFirst )
@@ -1778,7 +1778,7 @@ xub_StrLen ImpSvNumberformatScan::FinalScan( String& rString, String& rComment )
                                         }
                                         if ( i < nAnzStrings-1
                                             && sStrArray[i] == sOldThousandSep )
-                                        {   // something following last space
+                                        {	// something following last space
                                             // => space if currency contained,
                                             // else separator
                                             nPos = nPos + sStrArray[i].Len();
@@ -1823,7 +1823,7 @@ xub_StrLen ImpSvNumberformatScan::FinalScan( String& rString, String& rComment )
                                                 sStrArray[i] == sOldThousandSep);
                                     }
                                 }
-                                else                    // any grsep
+                                else 					// any grsep
                                 {
                                     nTypeArray[i] = NF_SYMBOLTYPE_STRING;
                                     String& rStr = sStrArray[i];
@@ -1843,15 +1843,15 @@ xub_StrLen ImpSvNumberformatScan::FinalScan( String& rString, String& rComment )
                             else if ( StringEqualsChar( sOldDecSep, cSep ) )
                             {
                                 if (bBlank || bFrac)    // . behind / or ' '
-                                    return nPos;        // error
-                                else if (bExp)          // behind E
+                                    return nPos;		// error
+                                else if (bExp)			// behind E
                                 {
                                     nPos = nPos + sStrArray[i].Len();
                                     nTypeArray[i] = NF_SYMBOLTYPE_EMPTY;
                                     nAnzResStrings--;
-                                    i++;                // eat it
+                                    i++; 				// eat it
                                 }
-                                else if (bDecSep)       // any .
+                                else if (bDecSep)		// any .
                                 {
                                     nTypeArray[i] = NF_SYMBOLTYPE_STRING;
                                     String& rStr = sStrArray[i];
@@ -1879,17 +1879,17 @@ xub_StrLen ImpSvNumberformatScan::FinalScan( String& rString, String& rComment )
 
                                     i++;
                                 }
-                            }                           // of else = DecSep
-                            else                        // . without meaning
+                            } 							// of else = DecSep
+                            else						// . without meaning
                             {
                                 if (cSep == ' ' &&
                                     eScannedType == NUMBERFORMAT_FRACTION &&
                                     StringEqualsChar( sStrArray[i], ' ' ) )
                                 {
-                                    if (!bBlank && !bFrac)  // no dups
-                                    {                       // or behind /
+                                    if (!bBlank && !bFrac)	// no dups
+                                    {	                    // or behind /
                                         if (bDecSep && nCounter > 0)// dec.
-                                            return nPos;            // error
+                                            return nPos;			// error
                                         bBlank = TRUE;
                                         nBlankPos = i;
                                         nCntPre = nCounter;
@@ -1924,7 +1924,7 @@ xub_StrLen ImpSvNumberformatScan::FinalScan( String& rString, String& rComment )
                                 if ( i == 0 ||
                                         (nTypeArray[i-1] != NF_SYMBOLTYPE_DIGIT &&
                                          nTypeArray[i-1] != NF_SYMBOLTYPE_EMPTY) )
-                                    return nPos ? nPos : 1; // /? not allowed
+                                    return nPos ? nPos : 1;	// /? not allowed
                                 else if (!bFrac || (bDecSep && nCounter > 0))
                                 {
                                     bFrac = TRUE;
@@ -1934,8 +1934,8 @@ xub_StrLen ImpSvNumberformatScan::FinalScan( String& rString, String& rComment )
                                     nPos = nPos + sStrArray[i].Len();
                                     i++;
                                 }
-                                else                // / doppelt od. , imZaehl
-                                    return nPos;    // Fehler
+                                else 				// / doppelt od. , imZaehl
+                                    return nPos;	// Fehler
                             }
                             else
                             {
@@ -1951,20 +1951,20 @@ xub_StrLen ImpSvNumberformatScan::FinalScan( String& rString, String& rComment )
                                     i < nAnzStrings-1 &&
                                     nTypeArray[i+1] == NF_SYMBOLTYPE_STRING &&
                                     sStrArray[i+1].GetChar(0) == '$' )
-                            {   // [$DM-xxx]
+                            {	// [$DM-xxx]
                                 // ab SV_NUMBERFORMATTER_VERSION_NEW_CURR
-                                nPos = nPos + sStrArray[i].Len();           // [
+                                nPos = nPos + sStrArray[i].Len();			// [
                                 nTypeArray[i] = NF_SYMBOLTYPE_CURRDEL;
-                                nPos = nPos + sStrArray[++i].Len();     // $
-                                sStrArray[i-1] += sStrArray[i];     // [$
+                                nPos = nPos + sStrArray[++i].Len();		// $
+                                sStrArray[i-1] += sStrArray[i];		// [$
                                 nTypeArray[i] = NF_SYMBOLTYPE_EMPTY;
                                 nAnzResStrings--;
                                 if ( ++i >= nAnzStrings )
-                                    return nPos;        // Fehler
-                                nPos = nPos + sStrArray[i].Len();           // DM
+                                    return nPos;		// Fehler
+                                nPos = nPos + sStrArray[i].Len();			// DM
                                 String& rStr = sStrArray[i];
                                 String* pStr = &sStrArray[i];
-                                nTypeArray[i] = NF_SYMBOLTYPE_CURRENCY; // wandeln
+                                nTypeArray[i] = NF_SYMBOLTYPE_CURRENCY;	// wandeln
                                 BOOL bHadDash = FALSE;
                                 i++;
                                 while ( i < nAnzStrings &&
@@ -2002,7 +2002,7 @@ xub_StrLen ImpSvNumberformatScan::FinalScan( String& rString, String& rComment )
                                     i++;
                                 }
                                 else
-                                    return nPos;        // Fehler
+                                    return nPos;		// Fehler
                             }
                             else
                             {
@@ -2012,7 +2012,7 @@ xub_StrLen ImpSvNumberformatScan::FinalScan( String& rString, String& rComment )
                             }
                         }
                         break;
-                        default:                    // andere Dels
+                        default:					// andere Dels
                         {
                             if (eScannedType == NUMBERFORMAT_PERCENT &&
                                     cHere == '%')
@@ -2023,8 +2023,8 @@ xub_StrLen ImpSvNumberformatScan::FinalScan( String& rString, String& rComment )
                             i++;
                         }
                         break;
-                    }                               // of switch (Del)
-                }                                   // of else Del
+                    }								// of switch (Del)
+                }									// of else Del
                 else if ( nTypeArray[i] == NF_SYMBOLTYPE_COMMENT )
                 {
                     String& rStr = sStrArray[i];
@@ -2041,7 +2041,7 @@ xub_StrLen ImpSvNumberformatScan::FinalScan( String& rString, String& rComment )
                     nPos = nPos + sStrArray[i].Len();
                     i++;
                 }
-            }                                       // of while
+            }                                  		// of while
             if (eScannedType == NUMBERFORMAT_FRACTION)
             {
                 if (bFrac)
@@ -2068,13 +2068,13 @@ xub_StrLen ImpSvNumberformatScan::FinalScan( String& rString, String& rComment )
                     if (bBlank)
                         nMaxPos = nBlankPos;
                     else
-                        nMaxPos = 0;                // no grouping
+                        nMaxPos = 0;				// no grouping
                 }
-                else if (bDecSep)                   // decimal separator present
+                else if (bDecSep)					// decimal separator present
                     nMaxPos = nDecPos;
-                else if (bExp)                      // 'E' exponent present
+                else if (bExp)						// 'E' exponent present
                     nMaxPos = nExpPos;
-                else                                // up to end
+                else								// up to end
                     nMaxPos = i;
                 // Insert separators at proper positions.
                 xub_StrLen nCount = 0;
@@ -2128,7 +2128,7 @@ xub_StrLen ImpSvNumberformatScan::FinalScan( String& rString, String& rComment )
                 }
             }
         }
-        break;                                      // of NUMBERFORMAT_NUMBER
+        break;										// of NUMBERFORMAT_NUMBER
         case NUMBERFORMAT_DATE:
         {
             while (i < nAnzStrings)
@@ -2166,7 +2166,7 @@ xub_StrLen ImpSvNumberformatScan::FinalScan( String& rString, String& rComment )
                         else if ( (nCalRet = FinalScanGetCalendar( nPos, i, nAnzResStrings )) != 0 )
                         {
                             if ( nCalRet < 0  )
-                                return nPos;        // error
+                                return nPos;		// error
                         }
                         else
                         {
@@ -2179,45 +2179,45 @@ xub_StrLen ImpSvNumberformatScan::FinalScan( String& rString, String& rComment )
                     case NF_KEY_THAI_T :
                         bThaiT = true;
                         // fall thru
-                    case NF_KEY_M:                          // M
-                    case NF_KEY_MM:                         // MM
-                    case NF_KEY_MMM:                        // MMM
-                    case NF_KEY_MMMM:                       // MMMM
-                    case NF_KEY_MMMMM:                      // MMMMM
-                    case NF_KEY_Q:                          // Q
-                    case NF_KEY_QQ:                         // QQ
-                    case NF_KEY_D:                          // D
-                    case NF_KEY_DD:                         // DD
-                    case NF_KEY_DDD:                        // DDD
-                    case NF_KEY_DDDD:                       // DDDD
-                    case NF_KEY_YY:                         // YY
-                    case NF_KEY_YYYY:                       // YYYY
-                    case NF_KEY_NN:                         // NN
-                    case NF_KEY_NNN:                        // NNN
-                    case NF_KEY_NNNN:                       // NNNN
-                    case NF_KEY_WW :                        // WW
-                    case NF_KEY_AAA :                       // AAA
-                    case NF_KEY_AAAA :                      // AAAA
-                    case NF_KEY_EC :                        // E
-                    case NF_KEY_EEC :                       // EE
-                    case NF_KEY_G :                         // G
-                    case NF_KEY_GG :                        // GG
-                    case NF_KEY_GGG :                       // GGG
-                    case NF_KEY_R :                         // R
-                    case NF_KEY_RR :                        // RR
-                        sStrArray[i] = sKeyword[nTypeArray[i]]; // tTtT -> TTTT
+                    case NF_KEY_M:							// M
+                    case NF_KEY_MM:							// MM
+                    case NF_KEY_MMM:						// MMM
+                    case NF_KEY_MMMM:						// MMMM
+                    case NF_KEY_MMMMM:						// MMMMM
+                    case NF_KEY_Q:							// Q
+                    case NF_KEY_QQ:							// QQ
+                    case NF_KEY_D:							// D
+                    case NF_KEY_DD:							// DD
+                    case NF_KEY_DDD:						// DDD
+                    case NF_KEY_DDDD:						// DDDD
+                    case NF_KEY_YY:							// YY
+                    case NF_KEY_YYYY:						// YYYY
+                    case NF_KEY_NN:							// NN
+                    case NF_KEY_NNN:						// NNN
+                    case NF_KEY_NNNN:						// NNNN
+                    case NF_KEY_WW :						// WW
+                    case NF_KEY_AAA :						// AAA
+                    case NF_KEY_AAAA :						// AAAA
+                    case NF_KEY_EC :						// E
+                    case NF_KEY_EEC :						// EE
+                    case NF_KEY_G :							// G
+                    case NF_KEY_GG :						// GG
+                    case NF_KEY_GGG :						// GGG
+                    case NF_KEY_R :							// R
+                    case NF_KEY_RR :						// RR
+                        sStrArray[i] = sKeyword[nTypeArray[i]];	// tTtT -> TTTT
                         nPos = nPos + sStrArray[i].Len();
                         i++;
                     break;
-                    default:                            // andere Keywords
+                    default:							// andere Keywords
                         nTypeArray[i] = NF_SYMBOLTYPE_STRING;
                         nPos = nPos + sStrArray[i].Len();
                         i++;
                     break;
                 }
-            }                                       // of while
+            }										// of while
         }
-        break;                                      // of NUMBERFORMAT_DATE
+        break;										// of NUMBERFORMAT_DATE
         case NUMBERFORMAT_TIME:
         {
             while (i < nAnzStrings)
@@ -2265,16 +2265,16 @@ xub_StrLen ImpSvNumberformatScan::FinalScan( String& rString, String& rComment )
                                 return nPos;
                             case '[':
                             {
-                                if (bThousand)              // doppelt
+                                if (bThousand)				// doppelt
                                     return nPos;
-                                bThousand = TRUE;           // bei Time frei
+                                bThousand = TRUE;			// bei Time frei
                                 sal_Unicode cChar = pChrCls->upper( NextChar(i) ).GetChar(0);
                                 if ( cChar == cOldKeyH )
-                                    nThousand = 1;      // H
+                                    nThousand = 1;		// H
                                 else if ( cChar == cOldKeyMI )
-                                    nThousand = 2;      // M
+                                    nThousand = 2;		// M
                                 else if ( cChar == cOldKeyS )
-                                    nThousand = 3;      // S
+                                    nThousand = 3;		// S
                                 else
                                     return nPos;
                                 nPos = nPos + sStrArray[i].Len();
@@ -2283,7 +2283,7 @@ xub_StrLen ImpSvNumberformatScan::FinalScan( String& rString, String& rComment )
                             break;
                             case ']':
                             {
-                                if (!bThousand)             // kein [ vorher
+                                if (!bThousand)				// kein [ vorher
                                     return nPos;
                                 nPos = nPos + sStrArray[i].Len();
                                 i++;
@@ -2330,11 +2330,11 @@ xub_StrLen ImpSvNumberformatScan::FinalScan( String& rString, String& rComment )
                         i++;
                     }
                     break;
-                    case NF_KEY_AMPM:                       // AM/PM
-                    case NF_KEY_AP:                         // A/P
+                    case NF_KEY_AMPM:						// AM/PM
+                    case NF_KEY_AP:							// A/P
                     {
-                        bExp = TRUE;                    // missbraucht fuer A/P
-                        sStrArray[i] = sKeyword[nTypeArray[i]]; // tTtT -> TTTT
+                        bExp = TRUE;					// missbraucht fuer A/P
+                        sStrArray[i] = sKeyword[nTypeArray[i]];	// tTtT -> TTTT
                         nPos = nPos + sStrArray[i].Len();
                         i++;
                     }
@@ -2342,19 +2342,19 @@ xub_StrLen ImpSvNumberformatScan::FinalScan( String& rString, String& rComment )
                     case NF_KEY_THAI_T :
                         bThaiT = true;
                         // fall thru
-                    case NF_KEY_MI:                         // M
-                    case NF_KEY_MMI:                        // MM
-                    case NF_KEY_H:                          // H
-                    case NF_KEY_HH:                         // HH
-                    case NF_KEY_S:                          // S
-                    case NF_KEY_SS:                         // SS
+                    case NF_KEY_MI:							// M
+                    case NF_KEY_MMI:						// MM
+                    case NF_KEY_H:							// H
+                    case NF_KEY_HH:							// HH
+                    case NF_KEY_S:							// S
+                    case NF_KEY_SS:							// SS
                     {
-                        sStrArray[i] = sKeyword[nTypeArray[i]]; // tTtT -> TTTT
+                        sStrArray[i] = sKeyword[nTypeArray[i]];	// tTtT -> TTTT
                         nPos = nPos + sStrArray[i].Len();
                         i++;
                     }
                     break;
-                    default:                            // andere Keywords
+                    default:							// andere Keywords
                     {
                         nTypeArray[i] = NF_SYMBOLTYPE_STRING;
                         nPos = nPos + sStrArray[i].Len();
@@ -2362,12 +2362,12 @@ xub_StrLen ImpSvNumberformatScan::FinalScan( String& rString, String& rComment )
                     }
                     break;
                 }
-            }                                       // of while
-            nCntPost = nCounter;                    // Zaehler der Nullen
+            }                   					// of while
+            nCntPost = nCounter;					// Zaehler der Nullen
             if (bExp)
-                nCntExp = 1;                        // merkt AM/PM
+                nCntExp = 1;						// merkt AM/PM
         }
-        break;                                      // of NUMBERFORMAT_TIME
+        break;										// of NUMBERFORMAT_TIME
         case NUMBERFORMAT_DATETIME:
         {
             BOOL bTimePart = FALSE;
@@ -2398,7 +2398,7 @@ xub_StrLen ImpSvNumberformatScan::FinalScan( String& rString, String& rComment )
                         if ( (nCalRet = FinalScanGetCalendar( nPos, i, nAnzResStrings )) != 0 )
                         {
                             if ( nCalRet < 0  )
-                                return nPos;        // error
+                                return nPos;		// error
                         }
                         else
                         {
@@ -2470,55 +2470,55 @@ xub_StrLen ImpSvNumberformatScan::FinalScan( String& rString, String& rComment )
                         }
                     }
                     break;
-                    case NF_KEY_AMPM:                       // AM/PM
-                    case NF_KEY_AP:                         // A/P
+                    case NF_KEY_AMPM:						// AM/PM
+                    case NF_KEY_AP:							// A/P
                     {
                         bTimePart = TRUE;
-                        bExp = TRUE;                    // missbraucht fuer A/P
-                        sStrArray[i] = sKeyword[nTypeArray[i]]; // tTtT -> TTTT
+                        bExp = TRUE;					// missbraucht fuer A/P
+                        sStrArray[i] = sKeyword[nTypeArray[i]];	// tTtT -> TTTT
                         nPos = nPos + sStrArray[i].Len();
                         i++;
                     }
                     break;
-                    case NF_KEY_MI:                         // M
-                    case NF_KEY_MMI:                        // MM
-                    case NF_KEY_H:                          // H
-                    case NF_KEY_HH:                         // HH
-                    case NF_KEY_S:                          // S
-                    case NF_KEY_SS:                         // SS
+                    case NF_KEY_MI:							// M
+                    case NF_KEY_MMI:						// MM
+                    case NF_KEY_H:							// H
+                    case NF_KEY_HH:							// HH
+                    case NF_KEY_S:							// S
+                    case NF_KEY_SS:							// SS
                         bTimePart = TRUE;
-                        sStrArray[i] = sKeyword[nTypeArray[i]]; // tTtT -> TTTT
+                        sStrArray[i] = sKeyword[nTypeArray[i]];	// tTtT -> TTTT
                         nPos = nPos + sStrArray[i].Len();
                         i++;
                     break;
-                    case NF_KEY_M:                          // M
-                    case NF_KEY_MM:                         // MM
-                    case NF_KEY_MMM:                        // MMM
-                    case NF_KEY_MMMM:                       // MMMM
-                    case NF_KEY_MMMMM:                      // MMMMM
-                    case NF_KEY_Q:                          // Q
-                    case NF_KEY_QQ:                         // QQ
-                    case NF_KEY_D:                          // D
-                    case NF_KEY_DD:                         // DD
-                    case NF_KEY_DDD:                        // DDD
-                    case NF_KEY_DDDD:                       // DDDD
-                    case NF_KEY_YY:                         // YY
-                    case NF_KEY_YYYY:                       // YYYY
-                    case NF_KEY_NN:                         // NN
-                    case NF_KEY_NNN:                        // NNN
-                    case NF_KEY_NNNN:                       // NNNN
-                    case NF_KEY_WW :                        // WW
-                    case NF_KEY_AAA :                       // AAA
-                    case NF_KEY_AAAA :                      // AAAA
-                    case NF_KEY_EC :                        // E
-                    case NF_KEY_EEC :                       // EE
-                    case NF_KEY_G :                         // G
-                    case NF_KEY_GG :                        // GG
-                    case NF_KEY_GGG :                       // GGG
-                    case NF_KEY_R :                         // R
-                    case NF_KEY_RR :                        // RR
+                    case NF_KEY_M:							// M
+                    case NF_KEY_MM:							// MM
+                    case NF_KEY_MMM:						// MMM
+                    case NF_KEY_MMMM:						// MMMM
+                    case NF_KEY_MMMMM:						// MMMMM
+                    case NF_KEY_Q:							// Q
+                    case NF_KEY_QQ:							// QQ
+                    case NF_KEY_D:							// D
+                    case NF_KEY_DD:							// DD
+                    case NF_KEY_DDD:						// DDD
+                    case NF_KEY_DDDD:						// DDDD
+                    case NF_KEY_YY:							// YY
+                    case NF_KEY_YYYY:						// YYYY
+                    case NF_KEY_NN:							// NN
+                    case NF_KEY_NNN:						// NNN
+                    case NF_KEY_NNNN:						// NNNN
+                    case NF_KEY_WW :						// WW
+                    case NF_KEY_AAA :						// AAA
+                    case NF_KEY_AAAA :						// AAAA
+                    case NF_KEY_EC :						// E
+                    case NF_KEY_EEC :						// EE
+                    case NF_KEY_G :							// G
+                    case NF_KEY_GG :						// GG
+                    case NF_KEY_GGG :						// GGG
+                    case NF_KEY_R :							// R
+                    case NF_KEY_RR :						// RR
                         bTimePart = FALSE;
-                        sStrArray[i] = sKeyword[nTypeArray[i]]; // tTtT -> TTTT
+                        sStrArray[i] = sKeyword[nTypeArray[i]];	// tTtT -> TTTT
                         nPos = nPos + sStrArray[i].Len();
                         i++;
                     break;
@@ -2528,18 +2528,18 @@ xub_StrLen ImpSvNumberformatScan::FinalScan( String& rString, String& rComment )
                         nPos = nPos + sStrArray[i].Len();
                         i++;
                     break;
-                    default:                            // andere Keywords
+                    default:							// andere Keywords
                         nTypeArray[i] = NF_SYMBOLTYPE_STRING;
                         nPos = nPos + sStrArray[i].Len();
                         i++;
                     break;
                 }
-            }                                       // of while
+            }										// of while
             nCntPost = nCounter;                    // decimals (100th seconds)
             if (bExp)
-                nCntExp = 1;                        // merkt AM/PM
+                nCntExp = 1;						// merkt AM/PM
         }
-        break;                                      // of NUMBERFORMAT_DATETIME
+        break;										// of NUMBERFORMAT_DATETIME
         default:
         break;
     }
@@ -2553,7 +2553,7 @@ xub_StrLen ImpSvNumberformatScan::FinalScan( String& rString, String& rComment )
         SetNatNumModifier(1);
 
     if ( bConvertMode )
-    {   // strings containing keywords of the target locale must be quoted, so
+    {	// strings containing keywords of the target locale must be quoted, so
         // the user sees the difference and is able to edit the format string
         for ( i=0; i < nAnzStrings; i++ )
         {
@@ -2561,9 +2561,9 @@ xub_StrLen ImpSvNumberformatScan::FinalScan( String& rString, String& rComment )
                     sStrArray[i].GetChar(0) != '\"' )
             {
                 if ( bConvertSystemToSystem && eScannedType == NUMBERFORMAT_CURRENCY )
-                {   // don't stringize automatic currency, will be converted
+                {	// don't stringize automatic currency, will be converted
                     if ( sStrArray[i] == sOldCurSymbol )
-                        continue;   // for
+                        continue;	// for
                     // DM might be splitted into D and M
                     if ( sStrArray[i].Len() < sOldCurSymbol.Len() &&
                             pChrCls->toUpper( sStrArray[i], 0, 1 ).GetChar(0) ==
@@ -2586,7 +2586,7 @@ xub_StrLen ImpSvNumberformatScan::FinalScan( String& rString, String& rComment )
                                 nAnzResStrings--;
                             }
                             i = j - 1;
-                            continue;   // for
+                            continue;	// for
                         }
                     }
                 }
@@ -2598,7 +2598,7 @@ xub_StrLen ImpSvNumberformatScan::FinalScan( String& rString, String& rComment )
                     {
                         rStr.Insert( '\"', 0 );
                         rStr += '\"';
-                        break;  // for
+                        break;	// for
                     }
                 }
             }
@@ -2668,9 +2668,9 @@ xub_StrLen ImpSvNumberformatScan::FinalScan( String& rString, String& rComment )
                     else
                         rString += sStrArray[i];
                     if ( RemoveQuotes( sStrArray[i] ) > 0 )
-                    {   // update currency up to quoted string
+                    {	// update currency up to quoted string
                         if ( eScannedType == NUMBERFORMAT_CURRENCY )
-                        {   // dM -> DM  or  DM -> $  in old automatic
+                        {	// dM -> DM  or  DM -> $  in old automatic
                             // currency formats, oh my ..., why did we ever
                             // introduce them?
                             String aTmp( pChrCls->toUpper(
@@ -2703,9 +2703,9 @@ xub_StrLen ImpSvNumberformatScan::FinalScan( String& rString, String& rComment )
                     i++;
                 } while ( i < nAnzStrings && nTypeArray[i] == NF_SYMBOLTYPE_STRING );
                 if ( i < nAnzStrings )
-                    i--;    // enter switch on next symbol again
+                    i--;	// enter switch on next symbol again
                 if ( eScannedType == NUMBERFORMAT_CURRENCY && nStringPos < rString.Len() )
-                {   // same as above, since last RemoveQuotes
+                {	// same as above, since last RemoveQuotes
                     String aTmp( pChrCls->toUpper(
                         sStrArray[iPos], nArrPos,
                         sStrArray[iPos].Len()-nArrPos ) );
@@ -2774,12 +2774,12 @@ xub_StrLen ImpSvNumberformatScan::RemoveQuotes( String& rStr )
 
 xub_StrLen ImpSvNumberformatScan::ScanFormat( String& rString, String& rComment )
 {
-    xub_StrLen res = Symbol_Division(rString);  //lexikalische Analyse
+    xub_StrLen res = Symbol_Division(rString);	//lexikalische Analyse
     if (!res)
         res = ScanType(rString);            // Erkennung des Formattyps
     if (!res)
-        res = FinalScan( rString, rComment );   // Typabhaengige Endanalyse
-    return res;                             // res = Kontrollposition
+        res = FinalScan( rString, rComment );	// Typabhaengige Endanalyse
+    return res;								// res = Kontrollposition
                                             // res = 0 => Format ok
 }
 
diff --git a/svl/source/numbers/zforscan.hxx b/svl/source/numbers/zforscan.hxx
index d623a3f50026..18cb8e06da1b 100644
--- a/svl/source/numbers/zforscan.hxx
+++ b/svl/source/numbers/zforscan.hxx
@@ -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
@@ -50,21 +50,21 @@ public:
 
     ImpSvNumberformatScan( SvNumberFormatter* pFormatter );
     ~ImpSvNumberformatScan();
-    void ChangeIntl();                          // tauscht Keywords aus
+    void ChangeIntl();							// tauscht Keywords aus
 
     void ChangeNullDate(USHORT nDay, USHORT nMonth, USHORT nYear);
                                                 // tauscht Referenzdatum aus
     void ChangeStandardPrec(sal_uInt16 nPrec);  // tauscht Standardprecision aus
 
-    xub_StrLen ScanFormat( String& rString, String& rComment ); // Aufruf der Scan-Analyse
+    xub_StrLen ScanFormat( String& rString, String& rComment );	// Aufruf der Scan-Analyse
 
     void CopyInfo(ImpSvNumberformatInfo* pInfo,
-                     USHORT nAnz);              // Kopiert die FormatInfo
-    USHORT GetAnzResStrings() const             { return nAnzResStrings; }
+                     USHORT nAnz);				// Kopiert die FormatInfo
+    USHORT GetAnzResStrings() const				{ return nAnzResStrings; }
 
-    const CharClass& GetChrCls() const          { return *pFormatter->GetCharClass(); }
-    const LocaleDataWrapper& GetLoc() const     { return *pFormatter->GetLocaleData(); }
-    CalendarWrapper& GetCal() const             { return *pFormatter->GetCalendar(); }
+    const CharClass& GetChrCls() const			{ return *pFormatter->GetCharClass(); }
+    const LocaleDataWrapper& GetLoc() const		{ return *pFormatter->GetLocaleData(); }
+    CalendarWrapper& GetCal() const				{ return *pFormatter->GetCalendar(); }
 
     const String* GetKeywords() const
         {
@@ -84,9 +84,9 @@ public:
     const String& GetColorString() const    { return GetKeywords()[NF_KEY_COLOR]; }
     const String& GetRedString() const      { return GetKeywords()[NF_KEY_RED]; }
     const String& GetBooleanString() const  { return GetKeywords()[NF_KEY_BOOLEAN]; }
-    const String& GetErrorString() const    { return sErrStr; }
+    const String& GetErrorString() const  	{ return sErrStr; }
 
-    Date* GetNullDate() const                   { return pNullDate; }
+    Date* GetNullDate() const					{ return pNullDate; }
     const String& GetStandardName() const
         {
             if ( bKeywordsNeedInit )
@@ -94,8 +94,8 @@ public:
             return sNameStandardFormat;
         }
     sal_uInt16 GetStandardPrec() const          { return nStandardPrec; }
-    const Color& GetRedColor() const            { return StandardColor[4]; }
-    Color* GetColor(String& sStr);          // Setzt Hauptfarben oder
+    const Color& GetRedColor() const			{ return StandardColor[4]; }
+    Color* GetColor(String& sStr);			// Setzt Hauptfarben oder
                                                 // definierte Farben
 
     // the compatibility currency symbol for old automatic currency formats
@@ -152,39 +152,39 @@ public:
                                                 // (fuer zformat.cxx)
 
 
-private:                            // ---- privater Teil
-    NfKeywordTable sKeyword;                    // Schluesselworte der Syntax
+private:							// ---- privater Teil
+    NfKeywordTable sKeyword; 					// Schluesselworte der Syntax
     Color StandardColor[NF_MAX_DEFAULT_COLORS];
                                                 // Array der Standardfarben
-    Date* pNullDate;                            // 30Dec1899
-    String sNameStandardFormat;             // "Standard"
+    Date* pNullDate;							// 30Dec1899
+    String sNameStandardFormat;				// "Standard"
     sal_uInt16 nStandardPrec;                   // default Precision for Standardformat
-    SvNumberFormatter* pFormatter;              // Pointer auf die Formatliste
+    SvNumberFormatter* pFormatter;				// Pointer auf die Formatliste
 
     String sStrArray[NF_MAX_FORMAT_SYMBOLS];    // Array der Symbole
     short nTypeArray[NF_MAX_FORMAT_SYMBOLS];    // Array der Infos
                                                 // externe Infos:
-    USHORT nAnzResStrings;                      // Anzahl der Ergebnissymbole
+    USHORT nAnzResStrings;						// Anzahl der Ergebnissymbole
 #if !(defined SOLARIS && defined X86)
-    short eScannedType;                         // Typ gemaess Scan
+    short eScannedType;							// Typ gemaess Scan
 #else
-    int eScannedType;                           // wg. Optimierung
+    int eScannedType;							// wg. Optimierung
 #endif
-    BOOL bThousand;                             // Mit Tausenderpunkt
-    USHORT nThousand;                           // Zaehlt ....-Folgen
-    USHORT nCntPre;                             // Zaehlt Vorkommastellen
-    USHORT nCntPost;                            // Zaehlt Nachkommastellen
-    USHORT nCntExp;                             // Zaehlt Exp.Stellen, AM/PM
+    BOOL bThousand;								// Mit Tausenderpunkt
+    USHORT nThousand;							// Zaehlt ....-Folgen
+    USHORT nCntPre;								// Zaehlt Vorkommastellen
+    USHORT nCntPost;							// Zaehlt Nachkommastellen
+    USHORT nCntExp;								// Zaehlt Exp.Stellen, AM/PM
                                                 // interne Infos:
-    USHORT nAnzStrings;                         // Anzahl der Symbole
-    USHORT nRepPos;                             // Position eines '*'
-    USHORT nExpPos;                             // interne Position des E
-    USHORT nBlankPos;                           // interne Position des Blank
-    short nDecPos;                              // interne Pos. des ,
-    BOOL bExp;                                  // wird bei Lesen des E gesetzt
-    BOOL bFrac;                                 // wird bei Lesen des / gesetzt
-    BOOL bBlank;                                // wird bei ' '(Fraction) ges.
-    BOOL bDecSep;                               // Wird beim ersten , gesetzt
+    USHORT nAnzStrings;							// Anzahl der Symbole
+    USHORT nRepPos;								// Position eines '*'
+    USHORT nExpPos;								// interne Position des E
+    USHORT nBlankPos;							// interne Position des Blank
+    short nDecPos;								// interne Pos. des ,
+    BOOL bExp;									// wird bei Lesen des E gesetzt
+    BOOL bFrac;									// wird bei Lesen des / gesetzt
+    BOOL bBlank;								// wird bei ' '(Fraction) ges.
+    BOOL bDecSep;								// Wird beim ersten , gesetzt
     mutable BOOL bKeywordsNeedInit;             // Locale dependent keywords need to be initialized
     mutable BOOL bCompatCurNeedInit;            // Locale dependent compatibility currency need to be initialized
     String sCurSymbol;                          // Currency symbol for compatibility format codes
@@ -192,21 +192,21 @@ private:                            // ---- privater Teil
     String sCurAbbrev;                          // Currency abbreviation
     String sErrStr;                             // String fuer Fehlerausgaben
 
-    BOOL bConvertMode;                          // Wird im Convert-Mode gesetzt
+    BOOL bConvertMode;							// Wird im Convert-Mode gesetzt
                                                 // Land/Sprache, in die der
-    LanguageType eNewLnge;                      // gescannte String konvertiert
+    LanguageType eNewLnge;						// gescannte String konvertiert
                                                 // wird (fuer Excel Filter)
                                                 // Land/Sprache, aus der der
-    LanguageType eTmpLnge;                      // gescannte String konvertiert
+    LanguageType eTmpLnge;						// gescannte String konvertiert
                                                 // wird (fuer Excel Filter)
-    BOOL bConvertSystemToSystem;                // Whether the conversion is
+    BOOL bConvertSystemToSystem;				// Whether the conversion is
                                                 // from one system locale to
                                                 // another system locale (in
                                                 // this case the automatic
                                                 // currency symbol is converted
                                                 // too).
 
-    xub_StrLen nCurrPos;                        // Position des Waehrungssymbols
+    xub_StrLen nCurrPos;						// Position des Waehrungssymbols
 
     BYTE nNatNumModifier;                       // Thai T speciality
 
@@ -214,28 +214,28 @@ private:                            // ---- privater Teil
     void InitSpecialKeyword( NfKeywordIndex eIdx ) const;
     void InitCompatCur() const;
 
-#ifdef _ZFORSCAN_CXX                // ----- private Methoden -----
+#ifdef _ZFORSCAN_CXX				// ----- private Methoden -----
     void SetDependentKeywords();
                                                 // Setzt die Sprachabh. Keyw.
     void SkipStrings(USHORT& i,xub_StrLen& nPos);// Ueberspringt StringSymbole
-    USHORT PreviousKeyword(USHORT i);           // Gibt Index des vorangeh.
+    USHORT PreviousKeyword(USHORT i);			// Gibt Index des vorangeh.
                                                 // Schluesselworts oder 0
-    USHORT NextKeyword(USHORT i);               // Gibt Index des naechsten
+    USHORT NextKeyword(USHORT i);				// Gibt Index des naechsten
                                                 // Schluesselworts oder 0
-    sal_Unicode PreviousChar(USHORT i);             // Gibt letzten Buchstaben
+    sal_Unicode PreviousChar(USHORT i);				// Gibt letzten Buchstaben
                                                 // vor der Position,
                                                 // skipt EMPTY, STRING, STAR, BLANK
-    sal_Unicode NextChar(USHORT i);                 // Gibt ersten Buchst. danach
-    short PreviousType( USHORT i );             // Gibt Typ vor Position,
+    sal_Unicode NextChar(USHORT i);					// Gibt ersten Buchst. danach
+    short PreviousType( USHORT i );				// Gibt Typ vor Position,
                                                 // skipt EMPTY
-    BOOL IsLastBlankBeforeFrac(USHORT i);       // True <=> es kommt kein ' '
+    BOOL IsLastBlankBeforeFrac(USHORT i);		// True <=> es kommt kein ' '
                                                 // mehr bis zum '/'
-    void Reset();                               // Reset aller Variablen
+    void Reset();								// Reset aller Variablen
                                                 // vor Analysestart
-    short GetKeyWord( const String& sSymbol,    // determine keyword at nPos
+    short GetKeyWord( const String& sSymbol,	// determine keyword at nPos
         xub_StrLen nPos );                      // return 0 <=> not found
 
-    inline BOOL IsAmbiguousE( short nKey )      // whether nKey is ambiguous E of NF_KEY_E/NF_KEY_EC
+    inline BOOL IsAmbiguousE( short nKey )		// whether nKey is ambiguous E of NF_KEY_E/NF_KEY_EC
         {
             return (nKey == NF_KEY_EC || nKey == NF_KEY_E) &&
                 (GetKeywords()[NF_KEY_EC] == GetKeywords()[NF_KEY_E]);
@@ -248,8 +248,8 @@ private:                            // ---- privater Teil
                         xub_StrLen& nPos,
                       String& sSymbol);       // Naechstes Symbol
     xub_StrLen Symbol_Division(const String& rString);// lexikalische Voranalyse
-    xub_StrLen ScanType(const String& rString); // Analyse des Formattyps
-    xub_StrLen FinalScan( String& rString, String& rComment );  // Endanalyse mit Vorgabe
+    xub_StrLen ScanType(const String& rString);	// Analyse des Formattyps
+    xub_StrLen FinalScan( String& rString, String& rComment );	// Endanalyse mit Vorgabe
                                                 // des Typs
     // -1:= error, return nPos in FinalScan; 0:= no calendar, 1:= calendar found
     int FinalScanGetCalendar( xub_StrLen& nPos, USHORT& i, USHORT& nAnzResStrings );
@@ -272,4 +272,4 @@ private:                            // ---- privater Teil
 
 
 
-#endif  // _ZFORSCAN_HXX
+#endif	// _ZFORSCAN_HXX
diff --git a/svl/source/passwordcontainer/passwordcontainer.cxx b/svl/source/passwordcontainer/passwordcontainer.cxx
index 7db18c65db1f..fd87873c6556 100644
--- a/svl/source/passwordcontainer/passwordcontainer.cxx
+++ b/svl/source/passwordcontainer/passwordcontainer.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
diff --git a/svl/source/passwordcontainer/syscreds.cxx b/svl/source/passwordcontainer/syscreds.cxx
index fc70088bf371..b90b88dd7d16 100644
--- a/svl/source/passwordcontainer/syscreds.cxx
+++ b/svl/source/passwordcontainer/syscreds.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
@@ -30,9 +30,9 @@
 
 using namespace com::sun::star;
 
-SysCredentialsConfigItem::SysCredentialsConfigItem(
-    SysCredentialsConfig * pOwner )
-: utl::ConfigItem( rtl::OUString::createFromAscii( "Office.Common/Passwords" ),
+SysCredentialsConfigItem::SysCredentialsConfigItem( 
+    SysCredentialsConfig * pOwner ) 
+: utl::ConfigItem( rtl::OUString::createFromAscii( "Office.Common/Passwords" ), 
                    CONFIG_MODE_IMMEDIATE_UPDATE ),
   m_bInited( false ),
   m_pOwner( pOwner )
@@ -43,8 +43,8 @@ SysCredentialsConfigItem::SysCredentialsConfigItem(
     EnableNotification( aNode );
 }
 
-//virtual
-void SysCredentialsConfigItem::Notify(
+//virtual 
+void SysCredentialsConfigItem::Notify( 
     const uno::Sequence< rtl::OUString > & /*seqPropertyNames*/ )
 {
     {
@@ -61,7 +61,7 @@ void SysCredentialsConfigItem::Commit()
     // does nothing
 }
 
-uno::Sequence< rtl::OUString >
+uno::Sequence< rtl::OUString > 
 SysCredentialsConfigItem::getSystemCredentialsURLs()
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -69,18 +69,18 @@ SysCredentialsConfigItem::getSystemCredentialsURLs()
     {
         // read config item
         uno::Sequence< ::rtl::OUString > aPropNames( 1 );
-        aPropNames[ 0 ] = rtl::OUString::createFromAscii(
+        aPropNames[ 0 ] = rtl::OUString::createFromAscii( 
             "AuthenticateUsingSystemCredentials" );
-        uno::Sequence< uno::Any > aAnyValues(
+        uno::Sequence< uno::Any > aAnyValues( 
             utl::ConfigItem::GetProperties( aPropNames ) );
 
-        OSL_ENSURE(
-            aAnyValues.getLength() == 1,
+        OSL_ENSURE( 
+            aAnyValues.getLength() == 1, 
             "SysCredentialsConfigItem::getSystemCredentialsURLs: "
             "Error reading config item!" );
 
         uno::Sequence< rtl::OUString > aValues;
-        if ( ( aAnyValues[ 0 ] >>= aValues ) ||
+        if ( ( aAnyValues[ 0 ] >>= aValues ) || 
              ( !aAnyValues[ 0 ].hasValue() ) )
         {
             m_seqURLs = aValues;
@@ -90,7 +90,7 @@ SysCredentialsConfigItem::getSystemCredentialsURLs()
     return m_seqURLs;
 }
 
-void SysCredentialsConfigItem::setSystemCredentialsURLs(
+void SysCredentialsConfigItem::setSystemCredentialsURLs( 
     const uno::Sequence< rtl::OUString > & seqURLList )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -98,8 +98,8 @@ void SysCredentialsConfigItem::setSystemCredentialsURLs(
     // write config item.
     uno::Sequence< rtl::OUString > aPropNames( 1 );
     uno::Sequence< uno::Any > aPropValues( 1 );
-    aPropNames[ 0 ]
-        = ::rtl::OUString::createFromAscii(
+    aPropNames[ 0 ]  
+        = ::rtl::OUString::createFromAscii( 
             "AuthenticateUsingSystemCredentials" );
     aPropValues[ 0 ] <<= seqURLList;
 
@@ -112,17 +112,17 @@ void SysCredentialsConfigItem::setSystemCredentialsURLs(
 
 //============================================================================
 
-namespace
+namespace 
 {
     // TODO: This code is actually copied from svl/source/passwordcontainer.cxx
     bool removeLastSegment( ::rtl::OUString & aURL )
     {
         sal_Int32 aInd = aURL.lastIndexOf( sal_Unicode( '/' ) );
-
+    
         if( aInd > 0  )
         {
             sal_Int32 aPrevInd = aURL.lastIndexOf( sal_Unicode( '/' ), aInd );
-            if ( aURL.indexOf( ::rtl::OUString::createFromAscii( "://" ) )
+            if ( aURL.indexOf( ::rtl::OUString::createFromAscii( "://" ) ) 
                     != aPrevInd - 2 ||
                  aInd != aURL.getLength() - 1 )
             {
@@ -141,8 +141,8 @@ namespace
         {
             ::rtl::OUString aUrl( aURL );
 
-            // each iteration remove last '/...' section from the aUrl
-            // while it's possible, up to the most left '://'
+            // each iteration remove last '/...' section from the aUrl 
+            // while it's possible, up to the most left '://' 
             do
             {
                 // first look for <url>/somename and then look for <url>/somename/...
@@ -185,7 +185,7 @@ void SysCredentialsConfig::initCfg()
     osl::MutexGuard aGuard( m_aMutex );
     if ( !m_bCfgInited )
     {
-        uno::Sequence< rtl::OUString > aURLs(
+        uno::Sequence< rtl::OUString > aURLs( 
             m_aConfigItem.getSystemCredentialsURLs() );
         for ( sal_Int32 n = 0; n < aURLs.getLength(); ++n )
             m_aCfgContainer.insert( aURLs[ n ] );
@@ -228,7 +228,7 @@ rtl::OUString SysCredentialsConfig::find( rtl::OUString const & aURL )
 
     return rtl::OUString();
 }
-
+        
 void SysCredentialsConfig::add( rtl::OUString const & rURL, bool bPersistent )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -263,7 +263,7 @@ void SysCredentialsConfig::remove( rtl::OUString const & rURL )
 uno::Sequence< rtl::OUString > SysCredentialsConfig::list( bool bOnlyPersistent )
 {
     initCfg();
-    sal_Int32 nCount = m_aCfgContainer.size()
+    sal_Int32 nCount = m_aCfgContainer.size() 
                      + ( bOnlyPersistent ? 0 : m_aMemContainer.size() );
     uno::Sequence< rtl::OUString > aResult( nCount );
 
diff --git a/svl/source/passwordcontainer/syscreds.hxx b/svl/source/passwordcontainer/syscreds.hxx
index 247ad31a00e5..caa98075ab04 100644
--- a/svl/source/passwordcontainer/syscreds.hxx
+++ b/svl/source/passwordcontainer/syscreds.hxx
@@ -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
@@ -43,16 +43,16 @@ class SysCredentialsConfigItem : public utl::ConfigItem
         SysCredentialsConfigItem( SysCredentialsConfig * pOwner );
         //virtual ~SysCredentialsConfigItem();
 
-        virtual void Notify(
-            const com::sun::star::uno::Sequence< rtl::OUString > &
+        virtual void Notify( 
+            const com::sun::star::uno::Sequence< rtl::OUString > & 
                 seqPropertyNames );
         virtual void Commit();
 
-        com::sun::star::uno::Sequence< rtl::OUString >
+        com::sun::star::uno::Sequence< rtl::OUString > 
         getSystemCredentialsURLs();
-
-        void setSystemCredentialsURLs(
-            const com::sun::star::uno::Sequence< rtl::OUString > &
+        
+        void setSystemCredentialsURLs( 
+            const com::sun::star::uno::Sequence< rtl::OUString > & 
                 seqURLList );
 
         //bool isSystemCredentialsURL( const rtl::OUString & rURL ) const;
diff --git a/svl/source/svdde/ddecli.cxx b/svl/source/svdde/ddecli.cxx
index 236f57824da2..fca50dfffa88 100644
--- a/svl/source/svdde/ddecli.cxx
+++ b/svl/source/svdde/ddecli.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
@@ -306,7 +306,7 @@ void DdeTransaction::Execute()
     HSZ     hItem = *pName;
     void*   pData = (void*)(const void *)aDdeData;
     DWORD   nData = (DWORD)(long)aDdeData;
-    ULONG   nIntFmt = aDdeData.pImp->nFmt;
+    ULONG  	nIntFmt = aDdeData.pImp->nFmt;
     UINT    nExtFmt  = DdeData::GetExternalFormat( nIntFmt );
     DdeInstData* pInst = ImpGetInstData();
 
@@ -440,7 +440,7 @@ DdePoke::DdePoke( DdeConnection& d, const String& i, const String& rData,
                   long n ) :
             DdeTransaction( d, i, n )
 {
-//  ByteString aByteStr( rData, osl_getThreadTextEncoding() );
+//	ByteString aByteStr( rData, osl_getThreadTextEncoding() );
     aDdeData = DdeData( (void*) rData.GetBuffer(), sizeof(sal_Unicode) * (rData.Len()), CF_TEXT );
     nType = XTYP_POKE;
 }
@@ -460,7 +460,7 @@ DdePoke::DdePoke( DdeConnection& d, const String& i, const DdeData& rData,
 DdeExecute::DdeExecute( DdeConnection& d, const String& rData, long n ) :
                 DdeTransaction( d, String(), n )
 {
-//  ByteString aByteStr( rData, osl_getThreadTextEncoding() );
+//	ByteString aByteStr( rData, osl_getThreadTextEncoding() );
     aDdeData = DdeData( (void*)rData.GetBuffer(), sizeof(sal_Unicode) * (rData.Len() + 1), CF_TEXT );
     nType = XTYP_EXECUTE;
 }
diff --git a/svl/source/svdde/ddedata.cxx b/svl/source/svdde/ddedata.cxx
index ba67d451be34..6f097611d826 100644
--- a/svl/source/svdde/ddedata.cxx
+++ b/svl/source/svdde/ddedata.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
diff --git a/svl/source/svdde/ddedll.cxx b/svl/source/svdde/ddedll.cxx
index a71662dd5e63..39212ea10721 100644
--- a/svl/source/svdde/ddedll.cxx
+++ b/svl/source/svdde/ddedll.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
@@ -30,7 +30,7 @@
 #ifdef WIN
 
 
-#include <sysdep.hxx>   // included svwin.h
+#include <sysdep.hxx>	// included svwin.h
 
 // Statische DLL-Verwaltungs-Variablen
 static HINSTANCE hDLLInst = 0;      // HANDLE der DLL
diff --git a/svl/source/svdde/ddeimp.hxx b/svl/source/svdde/ddeimp.hxx
index 708b2736f9cf..41a9130db978 100644
--- a/svl/source/svdde/ddeimp.hxx
+++ b/svl/source/svdde/ddeimp.hxx
@@ -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
@@ -140,10 +140,10 @@ public:
 
 struct DdeDataImp
 {
-    HDDEDATA        hData;
-    LPBYTE          pData;
-    long            nData;
-    ULONG           nFmt;
+    HDDEDATA		hData;
+    LPBYTE			pData;
+    long			nData;
+    ULONG 			nFmt;
 };
 
 class DdeConnections;
@@ -151,20 +151,20 @@ class DdeServices;
 
 struct DdeInstData
 {
-    USHORT          nRefCount;
-    DdeConnections* pConnections;
+    USHORT			nRefCount;
+    DdeConnections*	pConnections;
     // Server
-    long            hCurConvSvr;
-    ULONG           hDdeInstSvr;
-    short           nInstanceSvr;
-    DdeServices*    pServicesSvr;
+    long 			hCurConvSvr;
+    ULONG			hDdeInstSvr;
+    short			nInstanceSvr;
+    DdeServices*	pServicesSvr;
     // Client
-    ULONG           hDdeInstCli;
-    short           nInstanceCli;
+    ULONG			hDdeInstCli;
+    short			nInstanceCli;
 };
 
 #ifndef SHL_SVDDE
-#define SHL_SVDDE   SHL_SHL2
+#define SHL_SVDDE	SHL_SHL2
 #endif
 
 inline DdeInstData* ImpGetInstData()
diff --git a/svl/source/svdde/ddeinf.cxx b/svl/source/svdde/ddeinf.cxx
index c8c015071a9b..57122aad1c6b 100644
--- a/svl/source/svdde/ddeinf.cxx
+++ b/svl/source/svdde/ddeinf.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
diff --git a/svl/source/svdde/ddeml1.cxx b/svl/source/svdde/ddeml1.cxx
index dd9cc2abdaa7..c6764116cd0d 100644
--- a/svl/source/svdde/ddeml1.cxx
+++ b/svl/source/svdde/ddeml1.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
@@ -124,16 +124,16 @@ inline HDDEDATA ImpDdeMgr::Callback( USHORT nTransactionType,
 
 ImpDdeMgr::ImpDdeMgr()
 {
-    nLastErrInstance    = DMLERR_NO_ERROR;
-    pCallback           = 0;
-    nTransactFilter     = 0;
-    nServiceCount       = 0;
-    pServices           = 0;
-    pAppTable           = 0;
-    pConvTable          = 0;
-    pTransTable         = 0;
-    bServFilterOn       = TRUE;
-    bInSyncTrans        = FALSE;
+    nLastErrInstance	= DMLERR_NO_ERROR;
+    pCallback			= 0;
+    nTransactFilter		= 0;
+    nServiceCount		= 0;
+    pServices			= 0;
+    pAppTable			= 0;
+    pConvTable 			= 0;
+    pTransTable			= 0;
+    bServFilterOn		= TRUE;
+    bInSyncTrans		= FALSE;
 
     CreateServerWnd();
     pData = InitAll();
@@ -150,8 +150,8 @@ ImpDdeMgr::~ImpDdeMgr()
 // Named Shared Mem vom BS loeschen lassen, da nicht bekannt ist,
 // wieviele DDEML-Instanzen die App erzeugt hat, und OS/2
 // keinen App-Referenzzaehler fuer shared mem fuehrt.
-//  if ( pData )
-//      DosFreeMem( pData );
+//	if ( pData )
+//		DosFreeMem( pData );
 }
 
 
@@ -313,7 +313,7 @@ HWND ImpDdeMgr::NextFrameWin( HENUM hEnum )
     {
         WinQueryClassName( hWnd, sizeof(aBuf)-1, (PCH)aBuf );
         // Frame-Window ?
-        if( !strcmp( aBuf, "#1" ) ) // #define WC_FRAME ((PSZ)0xffff0001L)
+        if( !strcmp( aBuf, "#1" ) )	// #define WC_FRAME ((PSZ)0xffff0001L)
             break;
         hWnd = WinGetNextWindow( hEnum );
     }
@@ -419,9 +419,9 @@ HCONVLIST ImpDdeMgr::DdeConnectList( HSZ hszService, HSZ hszTopic,
     {
         HCONV hLastConvInList;
 
-        hCurListId      = hConvList;
+        hCurListId		= hConvList;
         ImpHCONV* pConv = pConvTable;
-        pConv          += (USHORT)hConvList;
+        pConv		   += (USHORT)hConvList;
         if( (USHORT)hConvList >= pData->nMaxConvCount ||pConv->hWndThis==0 )
         {
             nLastErrInstance = DMLERR_INVALIDPARAMETER;
@@ -500,7 +500,7 @@ DDEINIT* ImpDdeMgr::CreateDDEInitData( HWND hWndDestination, HSZ hszService,
 void ImpDdeMgr::MyInitiateDde( HWND hWndSrv, HWND hWndClient,
     HSZ hszService, HSZ hszTopic, CONVCONTEXT* pCC )
 {
-    DDEINIT* pBuf = CreateDDEInitData( hWndSrv, hszService, hszTopic, pCC );
+    DDEINIT* pBuf = CreateDDEInitData( hWndSrv, hszService,	hszTopic, pCC );
     if( pBuf )
     {
         PID pid; TID tid;
@@ -527,7 +527,7 @@ ImpHCONV* ImpDdeMgr::GetFirstServer(ImpDdeMgrData* pData, HCONVLIST hConvList,
         // Startposition
         pPtr += (USHORT)rhConv;
         hConv = rhConv;
-        pPtr++; hConv++;    // auf den naechsten
+        pPtr++; hConv++;	// auf den naechsten
     }
     while( hConv < pData->nMaxConvCount )
     {
@@ -569,12 +569,12 @@ ImpHCONV* ImpDdeMgr::GetLastServer(ImpDdeMgrData* pData, HCONVLIST hConvList,
 // static
 BOOL ImpDdeMgr::CheckConvListId( HCONVLIST hConvListId )
 {
-    HAB hAB = WinQueryAnchorBlock( (HWND)hConvListId );
+    HAB hAB	= WinQueryAnchorBlock( (HWND)hConvListId );
     if( hAB )
         return WinIsWindow( hAB, (HWND)hConvListId );
     return FALSE;
     /*
-    HAB hAB = WinQueryAnchorBlock( (HWND)hConvListId );
+    HAB hAB	= WinQueryAnchorBlock( (HWND)hConvListId );
     if( hAB )
     {
         char aBuf[ 16 ];
@@ -649,7 +649,7 @@ BOOL ImpDdeMgr::DdeDisconnect( HCONV hConv )
 
     pConv->nStatus |= ST_TERMINATED;
 
-    HAB hAB = WinQueryAnchorBlock( pConv->hWndThis );
+    HAB hAB	= WinQueryAnchorBlock( pConv->hWndThis );
     // um die MessageQueue inne Gaenge zu halten
     ULONG nTimerId = WinStartTimer( hAB, 0, 0, 50 );
 
@@ -781,21 +781,21 @@ USHORT ImpDdeMgr::DdeQueryConvInfo(HCONV hConv, ULONG nTransId, CONVINFO* pCI)
         nSize = sizeof(CONVINFO);
     CONVINFO aTempInfo;
     memset( &aTempInfo, 0, sizeof(CONVINFO) );
-    aTempInfo.nSize         = pCI->nSize;
-    aTempInfo.hConvPartner  = pConv->hConvPartner;
-    aTempInfo.hszPartner    = pConv->hszPartner;
-    aTempInfo.hszServiceReq = pConv->hszServiceReq;
-    aTempInfo.hszTopic      = pConv->hszTopic;
-    aTempInfo.nStatus       = pConv->nStatus;
-    aTempInfo.hConvList     = pConv->hConvList;
-    aTempInfo.aConvCtxt     = pConv->aConvContext;
+    aTempInfo.nSize 		= pCI->nSize;
+    aTempInfo.hConvPartner	= pConv->hConvPartner;
+    aTempInfo.hszPartner	= pConv->hszPartner;
+    aTempInfo.hszServiceReq	= pConv->hszServiceReq;
+    aTempInfo.hszTopic		= pConv->hszTopic;
+    aTempInfo.nStatus  		= pConv->nStatus;
+    aTempInfo.hConvList 	= pConv->hConvList;
+    aTempInfo.aConvCtxt 	= pConv->aConvContext;
     if( pTrans )
     {
-        aTempInfo.nUser     = pTrans->nUser;
-        aTempInfo.hszItem   = pTrans->hszItem;
-        aTempInfo.nFormat   = pTrans->nFormat;
-        aTempInfo.nType     = pTrans->nType;
-        aTempInfo.nConvst   = pTrans->nConvst;
+        aTempInfo.nUser 	= pTrans->nUser;
+        aTempInfo.hszItem	= pTrans->hszItem;
+        aTempInfo.nFormat	= pTrans->nFormat;
+        aTempInfo.nType		= pTrans->nType;
+        aTempInfo.nConvst	= pTrans->nConvst;
         aTempInfo.nLastError= pTrans->nLastError;
     }
     memcpy( pCI, &aTempInfo, nSize );
@@ -984,7 +984,7 @@ BOOL ImpDdeMgr::DdePostAdvise( HSZ hszTopic, HSZ hszItem)
                     {
                         // todo: FACK_REQ in Out-Data setzen, wenn pTrans->nType & XTYPF_ACKREQ
                         ////WRITELOG("DdePostAdvise:Sending data/notification")
-                        BOOL bSuccess = MyWinDdePostMsg( hWndClient,
+                        BOOL bSuccess =	MyWinDdePostMsg( hWndClient,
                             hWndServer,WM_DDE_DATA, pOutDDEData, DDEPM_RETRY);
                         if( bSuccess )
                         {
@@ -1373,9 +1373,9 @@ HDDEDATA ImpDdeMgr::DdeClientTransaction(void* pDdeData, ULONG cbData,
 
         // WRITELOG("DdeClientTransaction:Starting sync. trans.")
         pThis->hSyncResponseData = (HDDEDATA)0;
-        pThis->nSyncResponseMsg  = 0;
-        pThis->bInSyncTrans      = TRUE;
-        pThis->nSyncTransId      = nTransId;
+        pThis->nSyncResponseMsg	 = 0;
+        pThis->bInSyncTrans 	 = TRUE;
+        pThis->nSyncTransId		 = nTransId;
         pThis->bSyncAbandonTrans = FALSE;
 
         if ( !MyWinDdePostMsg( hWndServer, hWndClient, nMsg, pOutDDEData,
@@ -1392,7 +1392,7 @@ HDDEDATA ImpDdeMgr::DdeClientTransaction(void* pDdeData, ULONG cbData,
             }
             return FALSE;
         }
-        HAB hAB = WinQueryAnchorBlock( hWndClient );
+        HAB hAB	= WinQueryAnchorBlock( hWndClient );
         ULONG nDummyTimer = WinStartTimer( hAB, 0, 0, 50 );
         ULONG nTimeoutId = TID_USERMAX - nTransId;
         WinStartTimer( hAB, hWndClient, nTimeoutId, nTimeout );
@@ -1431,8 +1431,8 @@ HDDEDATA ImpDdeMgr::DdeClientTransaction(void* pDdeData, ULONG cbData,
         nMsg = pThis->nSyncResponseMsg;
         pThis->hSyncResponseData= 0;
         pThis->nSyncResponseMsg = 0;
-        pThis->bInSyncTrans     = FALSE;
-        pThis->nSyncTransId     = 0;
+        pThis->bInSyncTrans		= FALSE;
+        pThis->nSyncTransId 	= 0;
         if( !pDDEInData && nMsg != WM_TIMER )
         {
             DBG_ASSERT(0,"Dde:No data!");
@@ -1725,14 +1725,14 @@ MRESULT ImpDdeMgr::DdeTerminate( ImpWndProcParams* pParams )
         Client: GetConvHandle( HWNDClient, HWNDSender )
 */
 
-MRESULT ImpDdeMgr::ConvWndProc( HWND hWnd,ULONG nMsg,MPARAM nPar1,MPARAM nPar2 )
+MRESULT	ImpDdeMgr::ConvWndProc( HWND hWnd,ULONG nMsg,MPARAM nPar1,MPARAM nPar2 )
 {
-    ImpWndProcParams    aParams;
+    ImpWndProcParams	aParams;
 
-    MRESULT nRet        = (MRESULT)0;
+    MRESULT nRet 		= (MRESULT)0;
     aParams.hWndReceiver= hWnd;
-    aParams.nPar1       = nPar1;
-    aParams.nPar2       = nPar2;
+    aParams.nPar1		= nPar1;
+    aParams.nPar2		= nPar2;
 
     switch( nMsg )
     {
@@ -1744,40 +1744,40 @@ MRESULT ImpDdeMgr::ConvWndProc( HWND hWnd,ULONG nMsg,MPARAM nPar1,MPARAM nPar2 )
             break;
 #endif
 
-        case WM_DDE_INITIATEACK : nRet = DdeInitiateAck(&aParams);  break;
-        case WM_DDE_ACK         : nRet = DdeAck( &aParams );        break;
-        case WM_DDE_ADVISE      : nRet = DdeAdvise( &aParams );     break;
-        case WM_DDE_DATA        : nRet = DdeData( &aParams );       break;
-        case WM_DDE_EXECUTE     : nRet = DdeExecute( &aParams );    break;
-        case WM_DDE_POKE        : nRet = DdePoke( &aParams );       break;
-        case WM_DDE_REQUEST     : nRet = DdeRequest( &aParams );    break;
-        case WM_DDE_TERMINATE   : nRet = DdeTerminate( &aParams );  break;
-        case WM_DDE_UNADVISE    : nRet = DdeUnadvise( &aParams );   break;
-        case WM_TIMER           : nRet = DdeTimeout( &aParams );    break;
+        case WM_DDE_INITIATEACK	: nRet = DdeInitiateAck(&aParams);	break;
+        case WM_DDE_ACK		 	: nRet = DdeAck( &aParams ); 		break;
+        case WM_DDE_ADVISE	 	: nRet = DdeAdvise( &aParams );		break;
+        case WM_DDE_DATA	 	: nRet = DdeData( &aParams );		break;
+        case WM_DDE_EXECUTE	 	: nRet = DdeExecute( &aParams ); 	break;
+        case WM_DDE_POKE	 	: nRet = DdePoke( &aParams );		break;
+        case WM_DDE_REQUEST	 	: nRet = DdeRequest( &aParams ); 	break;
+        case WM_DDE_TERMINATE	: nRet = DdeTerminate( &aParams );	break;
+        case WM_DDE_UNADVISE 	: nRet = DdeUnadvise( &aParams ); 	break;
+        case WM_TIMER			: nRet = DdeTimeout( &aParams );	break;
     }
     return nRet;
 }
 
-MRESULT ImpDdeMgr::SrvWndProc( HWND hWnd,ULONG nMsg,MPARAM nPar1,MPARAM nPar2 )
+MRESULT	ImpDdeMgr::SrvWndProc( HWND hWnd,ULONG nMsg,MPARAM nPar1,MPARAM nPar2 )
 {
     MRESULT nRet = (MRESULT)0;
 
     ImpWndProcParams aParams;
     aParams.hWndReceiver= hWnd;
-    aParams.nPar1       = nPar1;
-    aParams.nPar2       = nPar2;
+    aParams.nPar1		= nPar1;
+    aParams.nPar2		= nPar2;
 
     switch( nMsg )
     {
 #ifdef DBG_UTIL
-        case WM_DDE_ACK :
+        case WM_DDE_ACK	:
         case WM_DDE_ADVISE :
         case WM_DDE_EXECUTE :
         case WM_DDE_POKE :
         case WM_DDE_REQUEST :
         case WM_DDE_UNADVISE :
         case WM_DDE_DATA :
-        case WM_DDE_INITIATEACK :
+        case WM_DDE_INITIATEACK	:
             DBG_ASSERT(0,"dde:unexpected msg");
             nRet = (MRESULT)TRUE;
             break;
@@ -1804,7 +1804,7 @@ MRESULT ImpDdeMgr::SrvWndProc( HWND hWnd,ULONG nMsg,MPARAM nPar1,MPARAM nPar2 )
 }
 
 
-MRESULT ImpDdeMgr::DdeAck( ImpWndProcParams* pParams )
+MRESULT	ImpDdeMgr::DdeAck( ImpWndProcParams* pParams )
 {
     //WRITELOG("DdeAck:Start")
     HSZ hszItem;
@@ -1970,7 +1970,7 @@ USHORT ImpDdeMgr::SendUnadvises(HCONV hConvServer,USHORT nFormat,BOOL bFree)
 HCONV ImpDdeMgr::CheckIncoming( ImpWndProcParams* pParams, ULONG nTransMask,
     HSZ& rhszItem )
 {
-//  ////WRITELOG("CheckIncoming")
+//	////WRITELOG("CheckIncoming")
     rhszItem = 0;
     DDESTRUCT* pInDDEData = (DDESTRUCT*)(pParams->nPar2);
     if( !pInDDEData )
@@ -1997,14 +1997,14 @@ HCONV ImpDdeMgr::CheckIncoming( ImpWndProcParams* pParams, ULONG nTransMask,
 }
 
 
-MRESULT ImpDdeMgr::DdeAdvise( ImpWndProcParams* pParams )
+MRESULT	ImpDdeMgr::DdeAdvise( ImpWndProcParams* pParams )
 {
     ////WRITELOG("DdeAdvise:Received")
     HSZ hszItem;
-    HCONV hConv           = CheckIncoming(pParams, CBF_FAIL_ADVISES, hszItem);
+    HCONV hConv 		  = CheckIncoming(pParams, CBF_FAIL_ADVISES, hszItem);
     DDESTRUCT* pInDDEData = (DDESTRUCT*)(pParams->nPar2);
-    HWND hWndThis         = pParams->hWndReceiver;
-    HWND hWndClient       = (HWND)pParams->nPar1;
+    HWND hWndThis 		  = pParams->hWndReceiver;
+    HWND hWndClient 	  = (HWND)pParams->nPar1;
     if( !hConv )
     {
         ////WRITELOG("DdeAdvise:Conversation not found")
@@ -2103,13 +2103,13 @@ MRESULT ImpDdeMgr::DdeAdvise( ImpWndProcParams* pParams )
     return (MRESULT)0;
 }
 
-MRESULT ImpDdeMgr::DdeData( ImpWndProcParams* pParams )
+MRESULT	ImpDdeMgr::DdeData( ImpWndProcParams* pParams )
 {
     WRITELOG("DdeData:Received")
     HSZ hszItem;
-    HCONV hConv           = CheckIncoming(pParams, 0, hszItem);
-    HWND hWndThis         = pParams->hWndReceiver;
-    HWND hWndClient       = (HWND)pParams->nPar1;
+    HCONV hConv 		  = CheckIncoming(pParams, 0, hszItem);
+    HWND hWndThis 		  = pParams->hWndReceiver;
+    HWND hWndClient 	  = (HWND)pParams->nPar1;
     DDESTRUCT* pInDDEData = (DDESTRUCT*)(pParams->nPar2);
 #if 0 && defined( OV_DEBUG )
     {
@@ -2238,7 +2238,7 @@ MRESULT ImpDdeMgr::DdeData( ImpWndProcParams* pParams )
     return (MRESULT)0;
 }
 
-MRESULT ImpDdeMgr::DdeExecute( ImpWndProcParams* pParams )
+MRESULT	ImpDdeMgr::DdeExecute( ImpWndProcParams* pParams )
 {
     ////WRITELOG("DdeExecute:Received")
     DDESTRUCT* pInDDEData = (DDESTRUCT*)(pParams->nPar2);
@@ -2291,7 +2291,7 @@ HCONV ImpDdeMgr::ConnectWithClient( HWND hWndClient,
         WinQueryWindowProcess( hWndClient, &pid, &tid );
         DosGiveSharedMem( pDDEData, pid, PAG_READ | PAG_WRITE);
     }
-    HAB hAB = WinQueryAnchorBlock( hWndSrv );
+    HAB hAB	= WinQueryAnchorBlock( hWndSrv );
     WinGetLastError( hAB ); // fehlercode zuruecksetzen
     WinSendMsg(hWndClient,WM_DDE_INITIATEACK,(MPARAM)hWndSrv,(MPARAM)pDDEData);
     if( WinGetLastError( hAB ) )
@@ -2331,11 +2331,11 @@ HCONV ImpDdeMgr::ConnectWithClient( HWND hWndClient,
     return hConv;
 }
 
-MRESULT ImpDdeMgr::DdeInitiate( ImpWndProcParams* pParams )
+MRESULT	ImpDdeMgr::DdeInitiate( ImpWndProcParams* pParams )
 {
     ////WRITELOG("DdeInitiate:Received")
     HWND hWndClient = (HWND)(pParams->nPar1);
-//  BOOL bSameInst = IsSameInstance( hWndClient );
+//	BOOL bSameInst = IsSameInstance( hWndClient );
     BOOL bSameInst = (BOOL)(hWndClient==hWndServer);
     DDEINIT* pDDEData = (DDEINIT*)pParams->nPar2;
 
@@ -2414,7 +2414,7 @@ MRESULT ImpDdeMgr::DdeInitiate( ImpWndProcParams* pParams )
     return (MRESULT)TRUE;
 }
 
-MRESULT ImpDdeMgr::DdeInitiateAck( ImpWndProcParams* pParams )
+MRESULT	ImpDdeMgr::DdeInitiateAck( ImpWndProcParams* pParams )
 {
     ////WRITELOG("DdeInitiateAck:Received")
     DDEINIT* pDDEData = (DDEINIT*)(pParams->nPar2);
@@ -2431,10 +2431,10 @@ MRESULT ImpDdeMgr::DdeInitiateAck( ImpWndProcParams* pParams )
     // Referenz-Count unseres Client-Windows inkrementieren
     IncConversationWndRefCount( hWndThis );
 
-    HWND hWndSrv        = (HWND)(pParams->nPar1);
-    HSZ hszService      = DdeCreateStringHandle( pDDEData->pszAppName, 850 );
-    HSZ hszTopic        = DdeCreateStringHandle( pDDEData->pszTopic, 850 );
-    HSZ hszPartnerApp   = GetAppName( hWndSrv );
+    HWND hWndSrv		= (HWND)(pParams->nPar1);
+    HSZ hszService		= DdeCreateStringHandle( pDDEData->pszAppName, 850 );
+    HSZ hszTopic		= DdeCreateStringHandle( pDDEData->pszTopic, 850 );
+    HSZ hszPartnerApp	= GetAppName( hWndSrv );
 
     hCurConv = CreateConvHandle( pData, pidThis, hWndThis, hWndSrv,
                 hszPartnerApp, hszService, hszTopic, 0 );
@@ -2473,7 +2473,7 @@ MRESULT ImpDdeMgr::DdeInitiateAck( ImpWndProcParams* pParams )
     return (MRESULT)TRUE;
 }
 
-MRESULT ImpDdeMgr::DdePoke( ImpWndProcParams* pParams )
+MRESULT	ImpDdeMgr::DdePoke( ImpWndProcParams* pParams )
 {
     ////WRITELOG("DdePoke:Received")
     HSZ hszItem = 0;
@@ -2509,7 +2509,7 @@ MRESULT ImpDdeMgr::DdePoke( ImpWndProcParams* pParams )
     return (MRESULT)0;
 }
 
-MRESULT ImpDdeMgr::DdeRequest( ImpWndProcParams* pParams )
+MRESULT	ImpDdeMgr::DdeRequest( ImpWndProcParams* pParams )
 {
     ////WRITELOG("DdeRequest:Received")
     HSZ hszItem = 0;
@@ -2554,15 +2554,15 @@ MRESULT ImpDdeMgr::DdeRequest( ImpWndProcParams* pParams )
 }
 
 
-MRESULT ImpDdeMgr::DdeUnadvise( ImpWndProcParams* pParams )
+MRESULT	ImpDdeMgr::DdeUnadvise( ImpWndProcParams* pParams )
 {
     ////WRITELOG("DdeUnadvise:Received")
 
     HSZ hszItem;
-    HCONV hConv           = CheckIncoming( pParams, 0, hszItem );
+    HCONV hConv 		  = CheckIncoming( pParams, 0, hszItem );
     DDESTRUCT* pInDDEData = (DDESTRUCT*)(pParams->nPar2);
-    HWND hWndThis         = pParams->hWndReceiver;
-    HWND hWndClient       = (HWND)pParams->nPar1;
+    HWND hWndThis 		  = pParams->hWndReceiver;
+    HWND hWndClient 	  = (HWND)pParams->nPar1;
     USHORT nClosedTransactions = 0;
     if( hConv )
     {
@@ -2621,16 +2621,16 @@ BOOL ImpDdeMgr::WaitTransState( Transaction* pTrans, ULONG nTransId,
     ////WRITELOG("WaitTransState:Start")
     ImpHCONV* pConv = pConvTable;
     pConv += pTrans->hConvOwner;
-    HAB hAB = WinQueryAnchorBlock( pConv->hWndThis );
+    HAB hAB	= WinQueryAnchorBlock( pConv->hWndThis );
     ULONG nTimerId = WinStartTimer( hAB, 0, 0, 50 );
     QMSG aQueueMsg;
 
-//  while( WinGetMsg( hAB, &aQueueMsg, 0, 0, 0 )    &&
-//          WinIsWindow( hAB, pConv->hWndPartner)   &&
-//          pTrans->nConvst != nNewState )
-//  {
-//      WinDispatchMsg( hAB, &aQueueMsg );
-//  }
+//	while( WinGetMsg( hAB, &aQueueMsg, 0, 0, 0 ) 	&&
+//			WinIsWindow( hAB, pConv->hWndPartner) 	&&
+//			pTrans->nConvst != nNewState )
+//	{
+//		WinDispatchMsg( hAB, &aQueueMsg );
+//	}
 
     BOOL bContinue = TRUE;
     while( bContinue )
diff --git a/svl/source/svdde/ddeml2.cxx b/svl/source/svdde/ddeml2.cxx
index 7de4602d12ff..d27be304c887 100644
--- a/svl/source/svdde/ddeml2.cxx
+++ b/svl/source/svdde/ddeml2.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
@@ -72,9 +72,9 @@ PSZ ImpDdeMgr::AllocAtomName( ATOM hString, ULONG& rBufLen )
 PDDESTRUCT ImpDdeMgr::MakeDDEObject( HWND hwnd, ATOM hItemName,
     USHORT fsStatus, USHORT usFormat, PVOID pabData, ULONG usDataLen )
 {
-    PDDESTRUCT  pddes = 0;
-    ULONG       usItemLen;
-    PULONG      pulSharedObj;
+    PDDESTRUCT	pddes = 0;
+    ULONG		usItemLen;
+    PULONG		pulSharedObj;
     //WRITELOG("MakeDDEObject: Start")
 
     PSZ pItemName = 0;
@@ -125,7 +125,7 @@ APIRET ImpDdeMgr::AllocNamedSharedMem( PPVOID ppBaseAddress, PSZ pName,
     ULONG nElementSize, ULONG nElementCount )
 {
     ULONG nObjSize = (ULONG)(nElementSize * nElementCount );
-    nObjSize += sizeof( ULONG );    // fuer ElementCount am Anfang des Blocks
+    nObjSize += sizeof( ULONG );	// fuer ElementCount am Anfang des Blocks
 
     *ppBaseAddress = 0;
     APIRET nRet = MyDosAllocSharedMem( ppBaseAddress, pName, nObjSize,
@@ -293,9 +293,9 @@ ImpDdeMgrData* ImpDdeMgr::InitAll()
 
     if( pBase )
     {
-        pConvTable  = ImpDdeMgr::GetConvTable( pBase );
+        pConvTable	= ImpDdeMgr::GetConvTable( pBase );
         pTransTable = ImpDdeMgr::GetTransTable( pBase );
-        pAppTable   = ImpDdeMgr::GetAppTable( pBase );
+        pAppTable	= ImpDdeMgr::GetAppTable( pBase );
     }
 
     memset( &aDefaultContext, 0, sizeof(CONVCONTEXT) );
@@ -338,17 +338,17 @@ HCONV ImpDdeMgr::CreateConvHandle( ImpDdeMgrData* pData,
     DdeKeepStringHandle( hszPartner );
     DdeKeepStringHandle( hszServiceReq );
     DdeKeepStringHandle( hszTopic );
-    pPtr->hszPartner    = hszPartner;
+    pPtr->hszPartner	= hszPartner;
     pPtr->hszServiceReq = hszServiceReq;
-    pPtr->hszTopic      = hszTopic;
+    pPtr->hszTopic		= hszTopic;
 
-    pPtr->hWndThis      = hWndMe;
-    pPtr->hWndPartner   = hWndPartner;
-    pPtr->pidOwner      = pidOwner;
-    pPtr->hConvPartner  = (HCONV)0;
-    pPtr->nPrevHCONV    = (USHORT)hPrevHCONV;
-    pPtr->nNextHCONV    = 0;
-    pPtr->nStatus       = ST_CONNECTED;
+    pPtr->hWndThis		= hWndMe;
+    pPtr->hWndPartner	= hWndPartner;
+    pPtr->pidOwner		= pidOwner;
+    pPtr->hConvPartner	= (HCONV)0;
+    pPtr->nPrevHCONV	= (USHORT)hPrevHCONV;
+    pPtr->nNextHCONV	= 0;
+    pPtr->nStatus		= ST_CONNECTED;
 
     pData->nCurConvCount++;
 
@@ -397,7 +397,7 @@ void ImpDdeMgr::FreeConvHandle( ImpDdeMgrData* pBase, HCONV hConv,
 
         DdeFreeStringHandle( pPtr->hszPartner );
         DdeFreeStringHandle( pPtr->hszServiceReq );
-        DdeFreeStringHandle( pPtr->hszTopic );
+        DdeFreeStringHandle( pPtr->hszTopic	);
         if( bDestroyHWndThis )
             DestroyConversationWnd( pPtr->hWndThis );
         memset( pPtr, 0, sizeof(ImpHCONV) );
@@ -544,8 +544,8 @@ ULONG ImpDdeMgr::GetTransaction( ImpDdeMgrData* pBase,
         if( pTrans->hConvOwner )
         {
             if(( pTrans->hConvOwner == hOwner ||
-                 pTrans->hConvOwner == hConvPartner)    &&
-                 pTrans->nFormat == nFormat             &&
+                 pTrans->hConvOwner == hConvPartner)	&&
+                 pTrans->nFormat == nFormat 			&&
                  pTrans->hszItem == hszItem )
             {
                 // gefunden!
@@ -640,7 +640,7 @@ HDDEDATA ImpDdeMgr::DdeCreateDataHandle( void* pSrc, ULONG cb,
     else
         nStatus = 0;
     PDDESTRUCT hData=MakeDDEObject(0,(ATOM)hszItem,nStatus,wFmt,pData,cb);
-//  WRITEDATA(hData)
+//	WRITEDATA(hData)
     if ( !hData )
         ImpDdeMgr::nLastErrInstance = DMLERR_INVALIDPARAMETER;
     return (HDDEDATA)hData;
@@ -752,7 +752,7 @@ void ImpDdeMgr::FreeTransactions( ImpDdeMgrData* pData, HCONV hConvOwner )
         return;
 
     Transaction* pTrans = GetTransTable( pData );
-//  ImpHCONV* pConvTable = GetConvTable( pData );
+//	ImpHCONV* pConvTable = GetConvTable( pData );
     pTrans++;
     for( USHORT nPos=1; nPos < pData->nMaxTransCount; nPos++, pTrans++ )
     {
diff --git a/svl/source/svdde/ddemldeb.cxx b/svl/source/svdde/ddemldeb.cxx
index f921e93d2e9c..af27c1039646 100644
--- a/svl/source/svdde/ddemldeb.cxx
+++ b/svl/source/svdde/ddemldeb.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
diff --git a/svl/source/svdde/ddemldeb.hxx b/svl/source/svdde/ddemldeb.hxx
index 8654bbd3ca65..b200621d39da 100644
--- a/svl/source/svdde/ddemldeb.hxx
+++ b/svl/source/svdde/ddemldeb.hxx
@@ -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
diff --git a/svl/source/svdde/ddemlimp.hxx b/svl/source/svdde/ddemlimp.hxx
index 28c4bf248bbe..165e2f939560 100644
--- a/svl/source/svdde/ddemlimp.hxx
+++ b/svl/source/svdde/ddemlimp.hxx
@@ -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
@@ -33,31 +33,31 @@
 #include <ctype.h>
 #include "ddemlos2.h"
 
-#define DDEMLSERVICETABLE_INISIZE   8
+#define DDEMLSERVICETABLE_INISIZE	8
 
 // Bezeichner der systemglobalen DDEML-Tabelle
-#define DDEMLDATA   "\\SHAREMEM\\OV_DDEML.DAT"
+#define DDEMLDATA	"\\SHAREMEM\\OV_DDEML.DAT"
 
 // vorlaeufig konstante Tabellengroessen
 #define CONVTABLECOUNT      2048    /* max count conversations */
 #define TRANSTABLECOUNT     2048    /*           transactions  */
-#define DDEMLAPPCOUNT       16      /* max count simultaniously running */
+#define DDEMLAPPCOUNT		16      /* max count simultaniously running */
                                     /* ddeml (StarDivision) applications */
 
-#define ST_TERMACKREC       0x8000  /* wird im Conversationhandle gesetzt, */
+#define ST_TERMACKREC		0x8000  /* wird im Conversationhandle gesetzt, */
                                     /* wenn die Partner-App DDE_TERMINATE */
                                     /* bestaetigt hat */
 
-#define XST_TIMEOUT         17      /* Trans. hat Timeout ueberschritten */
-#define XST_WAITING_ACK     18      /* Trans. wartet auf Acknowledge */
-#define XST_WAITING_ADVDATA 19      /* Trans. wartet auf Advise-Daten */
-#define XST_WAITING_REQDATA 20      /* Trans. wartet auf angeforderte Daten */
+#define XST_TIMEOUT			17		/* Trans. hat Timeout ueberschritten */
+#define XST_WAITING_ACK 	18		/* Trans. wartet auf Acknowledge */
+#define XST_WAITING_ADVDATA	19      /* Trans. wartet auf Advise-Daten */
+#define XST_WAITING_REQDATA	20      /* Trans. wartet auf angeforderte Daten */
 
 
 /* User-Flags DDESTRUCT */
-#define IMP_HDATAAPPOWNED   0x8000
+#define IMP_HDATAAPPOWNED	0x8000
 
-#define CONVLISTNAME        "DdeConvListId"
+#define CONVLISTNAME		"DdeConvListId"
 
 #define XTYPF_MASK (XTYPF_NOBLOCK | XTYPF_NODATA | XTYPF_ACKREQ)
 
@@ -70,14 +70,14 @@
 // eines neuen Services gesendet
 // Params: nPar1: hszBaseServName
 //         nPar2: hszInstServName
-#define WM_DDEML_REGISTER               WM_USER+1
+#define WM_DDEML_REGISTER				WM_USER+1
 
 // Msg: WM_DDEML_UNREGISTER
 // Empfaenger: wird allen DDEML-Applikationen nach Deregistrierung
 // eines Services gesendet
 // Params: nPar1: hszBaseServName
 //         nPar2: hszInstServName
-#define WM_DDEML_UNREGISTER             WM_USER+2
+#define WM_DDEML_UNREGISTER				WM_USER+2
 
 //
 //
@@ -85,58 +85,58 @@
 
 struct ImpHCONV
 {
-    HCONV       hConvPartner;
-    HSZ         hszPartner;     // Name of partner application
-    HSZ         hszServiceReq;  // Service name
-    HSZ         hszTopic;       // Topic name
-    USHORT      nStatus;        // ST_* of conversation
-    HCONVLIST   hConvList;      // ConvListId , wenn in ConvList
-    CONVCONTEXT aConvContext;   // Conversation context
+    HCONV		hConvPartner;
+    HSZ			hszPartner;  	// Name of partner application
+    HSZ			hszServiceReq;	// Service name
+    HSZ			hszTopic;		// Topic name
+    USHORT		nStatus;        // ST_* of conversation
+    HCONVLIST	hConvList;      // ConvListId , wenn in ConvList
+    CONVCONTEXT	aConvContext;	// Conversation context
 
     // private
-    HWND        hWndThis;       // 0 == Handle not used
-    HWND        hWndPartner;
-    PID         pidOwner;       // PID des DdeManagers, der
+    HWND		hWndThis;		// 0 == Handle not used
+    HWND		hWndPartner;
+    PID			pidOwner;		// PID des DdeManagers, der
                                 // den Conv-Handle erzeugt hat.
-    USHORT      nPrevHCONV;     // 0 == no previous hConv or not in list
-    USHORT      nNextHCONV;     // 0 == no next hconv or not in list
+    USHORT		nPrevHCONV;		// 0 == no previous hConv or not in list
+    USHORT		nNextHCONV;		// 0 == no next hconv or not in list
 };
 
 struct Transaction
 {
-    HSZ         hszItem;        // Item name
-    USHORT      nFormat;        // Data format
-    USHORT      nType;          // Transaction type (XTYP_*)
+    HSZ			hszItem;		// Item name
+    USHORT		nFormat;		// Data format
+    USHORT		nType;			// Transaction type (XTYP_*)
                                 // XTYP_ADVREQ [|XTYPF_NODATA] == Advise-Loop
-                                //             [|XTYPF_ACKREQ]
+                                // 			   [|XTYPF_ACKREQ]
                                 // XTYP_EXECUTE == laufendes Execute
                                 // XTYP_REQUEST
                                 // XTYP_POKE
                                 // XTYP_ADVSTOP
                                 // XTYP_ADVSTART
-    USHORT      nConvst;        // Conversation state (XST_*)
+    USHORT		nConvst;		// Conversation state (XST_*)
                                 // 0 == idle
                                 // XST_REQSENT (fuer XTYP_ADVREQ)
                                 // XST_TIMEOUT (fuer alle Typen!)
                                 // XST_WAITING (alle ausser XTYP_ADVREQ)
-    USHORT      nLastError;     // last err in transaction
-    ULONG       nUser;          // Userhandle
+    USHORT		nLastError;		// last err in transaction
+    ULONG		nUser;			// Userhandle
     // private
-    HCONV       hConvOwner;     // 0 == Transaction not used
+    HCONV		hConvOwner;		// 0 == Transaction not used
 };
 
 
 struct ImpWndProcParams
 {
-    HWND        hWndReceiver;
-    MPARAM      nPar1;
-    MPARAM      nPar2;
+    HWND		hWndReceiver;
+    MPARAM		nPar1;
+    MPARAM		nPar2;
 };
 
 struct ImpService
 {
-    HSZ         hBaseServName;  // Basis-Name des Service
-    HSZ         hInstServName;  // Basis-Name + DDEML-Server-HWND der App
+    HSZ	   		hBaseServName;	// Basis-Name des Service
+    HSZ			hInstServName;  // Basis-Name + DDEML-Server-HWND der App
 };
 
 class ImpDdeMgr;
@@ -145,27 +145,27 @@ class ImpDdeMgr;
 struct ImpConvWndData
 {
     ImpDdeMgr*  pThis;
-    USHORT      nRefCount;  // Zahl Conversations auf diesem Window
+    USHORT		nRefCount;	// Zahl Conversations auf diesem Window
 };
 
 
 // systemglobale Daten der Library (liegen in named shared memory)
 struct ImpDdeMgrData
 {
-    ULONG       nTotalSize;
-    ULONG       nOffsAppTable;
-    ULONG       nOffsConvTable;
-    ULONG       nOffsTransTable;
-    USHORT      nMaxAppCount;
-    USHORT      nMaxConvCount;
-    USHORT      nMaxTransCount;
-    USHORT      nLastErr;
-    USHORT      nReserved;
-    USHORT      nCurTransCount;
-    USHORT      nCurConvCount;
-    HWND        aAppTable[ 1 ];     // fuer Broadcast-Messages
-    ImpHCONV    aConvTable[ 1 ];
-    Transaction aTransTable[ 1 ];
+    ULONG		nTotalSize;
+    ULONG		nOffsAppTable;
+    ULONG		nOffsConvTable;
+    ULONG		nOffsTransTable;
+    USHORT		nMaxAppCount;
+    USHORT		nMaxConvCount;
+    USHORT		nMaxTransCount;
+    USHORT		nLastErr;
+    USHORT		nReserved;
+    USHORT		nCurTransCount;
+    USHORT		nCurConvCount;
+    HWND		aAppTable[ 1 ];		// fuer Broadcast-Messages
+    ImpHCONV	aConvTable[ 1 ];
+    Transaction	aTransTable[ 1 ];
 };
 
 
@@ -177,67 +177,67 @@ class ImpDdeMgr
     friend void ImpWriteDdeStatus(char*,char*);
     friend void ImpAddHSZ( HSZ, String& );
 
-    static PSZ      AllocAtomName( ATOM hString, ULONG& rBufLen );
+    static PSZ 		AllocAtomName( ATOM hString, ULONG& rBufLen );
     static PDDESTRUCT MakeDDEObject( HWND hwnd, ATOM hItemName,
         USHORT fsStatus, USHORT usFormat, PVOID pabData, ULONG usDataLen );
-    static APIRET   AllocNamedSharedMem( PPVOID ppBaseAddress, PSZ pName,
+    static APIRET	AllocNamedSharedMem( PPVOID ppBaseAddress, PSZ pName,
         ULONG nElementSize, ULONG nElementCount );
 
-    HWND            hWndServer;
-    PID             pidThis;
-    PFNCALLBACK     pCallback;
-    ULONG           nTransactFilter;
-    CONVCONTEXT     aDefaultContext;
-    ImpDdeMgrData*  pData;
-    ImpService*     pServices;
-    USHORT          nServiceCount;
+    HWND			hWndServer;
+    PID				pidThis;
+    PFNCALLBACK		pCallback;
+    ULONG 			nTransactFilter;
+    CONVCONTEXT		aDefaultContext;
+    ImpDdeMgrData*	pData;
+    ImpService*		pServices;
+    USHORT			nServiceCount;
 
-    ImpHCONV*       pConvTable;         // liegt in pData (nicht deleten!)
-    Transaction*    pTransTable;        // liegt in pData (nicht deleten!)
-    HWND*           pAppTable;          // liegt in pData (nicht deleten!)
+    ImpHCONV*		pConvTable;			// liegt in pData (nicht deleten!)
+    Transaction*	pTransTable;		// liegt in pData (nicht deleten!)
+    HWND*			pAppTable;			// liegt in pData (nicht deleten!)
 
-    static ImpHCONV*    GetConvTable( ImpDdeMgrData* );
+    static ImpHCONV* 	GetConvTable( ImpDdeMgrData* );
     static Transaction* GetTransTable( ImpDdeMgrData* );
-    static HWND*        GetAppTable( ImpDdeMgrData* );
+    static HWND* 		GetAppTable( ImpDdeMgrData* );
 
 
-    static HWND     NextFrameWin( HENUM hEnum );
-    void            CreateServerWnd();
-    void            DestroyServerWnd();
-    HWND            CreateConversationWnd();
+    static HWND		NextFrameWin( HENUM hEnum );
+    void			CreateServerWnd();
+    void			DestroyServerWnd();
+    HWND			CreateConversationWnd();
     // Fktn. duerfen nur fuer HCONVs aufgerufen werden, die
     // in der eigenen Applikation erzeugt wurden
-    static void     DestroyConversationWnd( HWND hWndConv );
-    static USHORT   GetConversationWndRefCount( HWND hWndConv );
-    static USHORT   IncConversationWndRefCount( HWND hWndConv );
-
-    MRESULT         SrvWndProc(HWND hWnd,ULONG nMsg,MPARAM nPar1,MPARAM nPar2);
-    MRESULT         ConvWndProc(HWND hWnd,ULONG nMsg,MPARAM nPar1,MPARAM nPar2);
-    void            RegisterDDEMLApp();
-    void            UnregisterDDEMLApp();
-    void            CleanUp();
-    ImpDdeMgrData*  InitAll();
-    static BOOL     MyWinDdePostMsg( HWND, HWND, USHORT, PDDESTRUCT, ULONG );
-    void            MyInitiateDde( HWND hWndServer, HWND hWndClient,
+    static void		DestroyConversationWnd( HWND hWndConv );
+    static USHORT	GetConversationWndRefCount( HWND hWndConv );
+    static USHORT	IncConversationWndRefCount( HWND hWndConv );
+
+    MRESULT			SrvWndProc(HWND hWnd,ULONG nMsg,MPARAM nPar1,MPARAM nPar2);
+    MRESULT			ConvWndProc(HWND hWnd,ULONG nMsg,MPARAM nPar1,MPARAM nPar2);
+    void			RegisterDDEMLApp();
+    void			UnregisterDDEMLApp();
+    void			CleanUp();
+    ImpDdeMgrData*	InitAll();
+    static BOOL		MyWinDdePostMsg( HWND, HWND, USHORT, PDDESTRUCT, ULONG );
+    void			MyInitiateDde( HWND hWndServer, HWND hWndClient,
                         HSZ hszService, HSZ hszTopic, CONVCONTEXT* pCC );
-    DDEINIT*        CreateDDEInitData( HWND hWndDest, HSZ hszService,
+    DDEINIT* 		CreateDDEInitData( HWND hWndDest, HSZ hszService,
                         HSZ hszTopic, CONVCONTEXT* pCC );
     // wenn pDDEData==0, muss pCC gesetzt sein
-    HCONV           ConnectWithClient( HWND hWndClient, HSZ hszPartner,
+    HCONV 			ConnectWithClient( HWND hWndClient, HSZ hszPartner,
                         HSZ hszService, HSZ hszTopic, BOOL bSameInst,
                         DDEINIT* pDDEData, CONVCONTEXT* pCC = 0);
 
-    HCONV           CheckIncoming( ImpWndProcParams*, ULONG nTransMask,
+    HCONV			CheckIncoming( ImpWndProcParams*, ULONG nTransMask,
                         HSZ& rhszItem );
     // fuer Serverbetrieb. Ruft Callback-Fkt fuer alle offenen Advises
     // auf, deren Owner der uebergebene HCONV ist.
     // bFreeTransactions==TRUE: loescht die Transaktionen
     // gibt Anzahl der getrennten Transaktionen zurueck
-    USHORT          SendUnadvises( HCONV hConv,
+    USHORT			SendUnadvises( HCONV hConv,
                        USHORT nFormat, // 0==alle
                        BOOL bFreeTransactions );
 
-    BOOL            WaitTransState(
+    BOOL			WaitTransState(
                         Transaction* pTrans, ULONG nTransId,
                         USHORT nNewState,
                         ULONG nTimeout );
@@ -245,142 +245,142 @@ class ImpDdeMgr
     // DDEML ruft Callback mit XTYP_CONNECT-Transaction nur auf,
     // wenn die App den angeforderten Service registriert hat
     // Standardeinstellung: TRUE
-    BOOL            bServFilterOn;
+    BOOL			bServFilterOn;
 
     // Fehlercode muss noch systemglobal werden (Atom o. ae.)
-    static USHORT   nLastErrInstance; // wenn 0, dann gilt globaler Fehlercode
+    static USHORT	nLastErrInstance; // wenn 0, dann gilt globaler Fehlercode
 
     static ImpDdeMgrData* AccessMgrData();
 
-    static HCONV    CreateConvHandle( ImpDdeMgrData* pBase,
+    static HCONV	CreateConvHandle( ImpDdeMgrData* pBase,
                         PID pidOwner,
                         HWND hWndThis, HWND hWndPartner,
                         HSZ hszPartner, HSZ hszServiceReq, HSZ hszTopic,
                         HCONV hPrevHCONV = 0 );
 
-    static HCONV    IsConvHandleAvailable( ImpDdeMgrData* pBase );
-    static HCONV    GetConvHandle( ImpDdeMgrData* pBase,
+    static HCONV	IsConvHandleAvailable( ImpDdeMgrData* pBase );
+    static HCONV	GetConvHandle( ImpDdeMgrData* pBase,
                         HWND hWndThis, HWND hWndPartner );
-    static void     FreeConvHandle( ImpDdeMgrData*, HCONV,
+    static void		FreeConvHandle( ImpDdeMgrData*, HCONV,
                         BOOL bDestroyHWndThis = TRUE );
 
-    static ULONG    CreateTransaction( ImpDdeMgrData* pBase,
+    static ULONG 	CreateTransaction( ImpDdeMgrData* pBase,
                         HCONV hOwner, HSZ hszItem, USHORT nFormat,
                         USHORT nTransactionType );
-    static ULONG    GetTransaction( ImpDdeMgrData* pBase,
+    static ULONG	GetTransaction( ImpDdeMgrData* pBase,
                         HCONV hOwner, HSZ hszItem, USHORT nFormat );
 
-    static void     FreeTransaction( ImpDdeMgrData*, ULONG nTransId );
+    static void		FreeTransaction( ImpDdeMgrData*, ULONG nTransId );
 
-    BOOL            DisconnectAll();
+    BOOL			DisconnectAll();
     // Transaktionen muessen _vor_ den Konversationen geloescht werden!
-    static void     FreeTransactions( ImpDdeMgrData*, HWND hWndThis,
+    static void		FreeTransactions( ImpDdeMgrData*, HWND hWndThis,
                         HWND hWndPartner );
-    static void     FreeTransactions( ImpDdeMgrData*, HCONV hConvOwner );
+    static void		FreeTransactions( ImpDdeMgrData*, HCONV hConvOwner );
 
-    static void     FreeConversations( ImpDdeMgrData*,HWND hWndThis,
+    static void		FreeConversations( ImpDdeMgrData*,HWND hWndThis,
                         HWND hWndPartner );
 
-    ImpService*     GetService( HSZ hszService );
-    ImpService*     PutService( HSZ hszService );
-    void            BroadcastService( ImpService*, BOOL bRegistered );
+    ImpService* 	GetService( HSZ hszService );
+    ImpService* 	PutService( HSZ hszService );
+    void	   		BroadcastService( ImpService*, BOOL bRegistered );
 
     // rh: Startposition(!) & gefundener Handle
     static ImpHCONV* GetFirstServer( ImpDdeMgrData*, HCONVLIST, HCONV& rh);
     static ImpHCONV* GetLastServer( ImpDdeMgrData*, HCONVLIST, HCONV& );
-    static BOOL     CheckConvListId( HCONVLIST hConvListId );
+    static BOOL 	CheckConvListId( HCONVLIST hConvListId );
 
-    BOOL            IsSameInstance( HWND hWnd );
-    HSZ             GetAppName( HWND hWnd );
+    BOOL			IsSameInstance( HWND hWnd );
+    HSZ				GetAppName( HWND hWnd );
 
 
     // Transactions
-    MRESULT         DdeAck( ImpWndProcParams* pParams );
-    MRESULT         DdeAdvise( ImpWndProcParams* pParams );
-    MRESULT         DdeData( ImpWndProcParams* pParams );
-    MRESULT         DdeExecute( ImpWndProcParams* pParams );
-    MRESULT         DdeInitiate( ImpWndProcParams* pParams );
-    MRESULT         DdeInitiateAck( ImpWndProcParams* pParams );
-    MRESULT         DdePoke( ImpWndProcParams* pParams );
-    MRESULT         DdeRequest( ImpWndProcParams* pParams );
-    MRESULT         DdeTerminate( ImpWndProcParams* pParams );
-    MRESULT         DdeUnadvise( ImpWndProcParams* pParams );
-    MRESULT         DdeRegister( ImpWndProcParams* pParams );
-    MRESULT         DdeUnregister( ImpWndProcParams* pParams );
-    MRESULT         DdeTimeout( ImpWndProcParams* pParams );
-
-    HDDEDATA    Callback(
-        USHORT      nTransactionType,
-        USHORT      nClipboardFormat,
-        HCONV       hConversationHandle,
-        HSZ         hsz1,
-        HSZ         hsz2,
+    MRESULT			DdeAck( ImpWndProcParams* pParams );
+    MRESULT			DdeAdvise( ImpWndProcParams* pParams );
+    MRESULT			DdeData( ImpWndProcParams* pParams );
+    MRESULT			DdeExecute( ImpWndProcParams* pParams );
+    MRESULT			DdeInitiate( ImpWndProcParams* pParams );
+    MRESULT			DdeInitiateAck( ImpWndProcParams* pParams );
+    MRESULT			DdePoke( ImpWndProcParams* pParams );
+    MRESULT			DdeRequest( ImpWndProcParams* pParams );
+    MRESULT			DdeTerminate( ImpWndProcParams* pParams );
+    MRESULT			DdeUnadvise( ImpWndProcParams* pParams );
+    MRESULT			DdeRegister( ImpWndProcParams* pParams );
+    MRESULT			DdeUnregister( ImpWndProcParams* pParams );
+    MRESULT			DdeTimeout( ImpWndProcParams* pParams );
+
+    HDDEDATA	Callback(
+        USHORT		nTransactionType,
+        USHORT		nClipboardFormat,
+        HCONV		hConversationHandle,
+        HSZ			hsz1,
+        HSZ			hsz2,
         HDDEDATA    hData,
-        ULONG       nData1,
-        ULONG       nData2 );
+        ULONG		nData1,
+        ULONG		nData2 );
 
-    HCONV       DdeConnectImp( HSZ hszService,HSZ hszTopic,CONVCONTEXT* pCC);
+    HCONV		DdeConnectImp( HSZ hszService,HSZ hszTopic,CONVCONTEXT* pCC);
 
     // connection data
-    HCONV           hCurConv;       // wird im DdeInitiateAck gesetzt
-    HCONVLIST       hCurListId;     // fuer DdeConnectList
-    USHORT          nPrevConv;      // .... "" ....
-    BOOL            bListConnect;
+    HCONV 			hCurConv;		// wird im DdeInitiateAck gesetzt
+    HCONVLIST   	hCurListId;		// fuer DdeConnectList
+    USHORT			nPrevConv;		// .... "" ....
+    BOOL			bListConnect;
 
     // synchr. transaction data
-    BOOL            bInSyncTrans;
-    ULONG           nSyncTransId;
-    HDDEDATA        hSyncResponseData;
-    ULONG           nSyncResponseMsg; // WM_DDE_ACK, WM_DDE_DATA, WM_TIMER
+    BOOL			bInSyncTrans;
+    ULONG			nSyncTransId;
+    HDDEDATA		hSyncResponseData;
+    ULONG			nSyncResponseMsg; // WM_DDE_ACK, WM_DDE_DATA, WM_TIMER
     // TRUE==nach Ende der synchronen Transaktion eine evtl. benutzte
     // asynchrone Transaktion beenden (typisch synchroner Request auf
     // Advise-Loop)
-    BOOL            bSyncAbandonTrans;
+    BOOL			bSyncAbandonTrans;
 
 public:
                     ImpDdeMgr();
                     ~ImpDdeMgr();
 
-    USHORT          DdeInitialize( PFNCALLBACK pCallbackProc, ULONG nTransactionFilter );
-    USHORT          DdeGetLastError();
+    USHORT			DdeInitialize( PFNCALLBACK pCallbackProc, ULONG nTransactionFilter );
+    USHORT			DdeGetLastError();
 
-    HCONV           DdeConnect( HSZ hszService, HSZ hszTopic, CONVCONTEXT* );
-    HCONVLIST       DdeConnectList( HSZ hszService, HSZ hszTopic,
+    HCONV			DdeConnect( HSZ hszService, HSZ hszTopic, CONVCONTEXT* );
+    HCONVLIST 		DdeConnectList( HSZ hszService, HSZ hszTopic,
                         HCONVLIST hConvList, CONVCONTEXT* );
-    static BOOL     DdeDisconnect( HCONV hConv );
-    static BOOL     DdeDisconnectList( HCONVLIST hConvList );
-    static HCONV    DdeReconnect(HCONV hConv);
-    static HCONV    DdeQueryNextServer(HCONVLIST hConvList, HCONV hConvPrev);
-    static USHORT   DdeQueryConvInfo(HCONV hConv, ULONG idTrans,CONVINFO* pCI);
-    static BOOL     DdeSetUserHandle(HCONV hConv, ULONG id, ULONG hUser);
-    BOOL            DdeAbandonTransaction( HCONV hConv, ULONG idTransaction);
+    static BOOL		DdeDisconnect( HCONV hConv );
+    static BOOL		DdeDisconnectList( HCONVLIST hConvList );
+    static HCONV	DdeReconnect(HCONV hConv);
+    static HCONV 	DdeQueryNextServer(HCONVLIST hConvList, HCONV hConvPrev);
+    static USHORT	DdeQueryConvInfo(HCONV hConv, ULONG idTrans,CONVINFO* pCI);
+    static BOOL		DdeSetUserHandle(HCONV hConv, ULONG id, ULONG hUser);
+    BOOL    		DdeAbandonTransaction( HCONV hConv, ULONG idTransaction);
 
-    BOOL            DdePostAdvise( HSZ hszTopic, HSZ hszItem);
-    BOOL            DdeEnableCallback( HCONV hConv, USHORT wCmd);
+    BOOL    		DdePostAdvise( HSZ hszTopic, HSZ hszItem);
+    BOOL    		DdeEnableCallback( HCONV hConv, USHORT wCmd);
 
-    HDDEDATA        DdeNameService( HSZ hszService, USHORT afCmd);
+    HDDEDATA 		DdeNameService( HSZ hszService, USHORT afCmd);
 
-    static HDDEDATA DdeClientTransaction(void* pData, ULONG cbData,
+    static HDDEDATA	DdeClientTransaction(void* pData, ULONG cbData,
                         HCONV hConv, HSZ hszItem, USHORT wFmt, USHORT wType,
                         ULONG dwTimeout, ULONG* pdwResult);
 
     // Data handles
 
-    HDDEDATA        DdeCreateDataHandle( void* pSrc, ULONG cb, ULONG cbOff,
+    HDDEDATA 		DdeCreateDataHandle( void* pSrc, ULONG cb, ULONG cbOff,
                         HSZ hszItem, USHORT wFmt, USHORT afCmd);
-    static BYTE*    DdeAccessData(HDDEDATA hData, ULONG* pcbDataSize);
-    static BOOL     DdeUnaccessData(HDDEDATA hData);
-    static BOOL     DdeFreeDataHandle(HDDEDATA hData);
+    static BYTE* 	DdeAccessData(HDDEDATA hData, ULONG* pcbDataSize);
+    static BOOL 	DdeUnaccessData(HDDEDATA hData);
+    static BOOL 	DdeFreeDataHandle(HDDEDATA hData);
     static HDDEDATA DdeAddData(HDDEDATA hData,void* pSrc,ULONG cb,ULONG cbOff);
-    static ULONG    DdeGetData(HDDEDATA hData,void* pDst,ULONG cbMax,ULONG cbOff);
+    static ULONG	DdeGetData(HDDEDATA hData,void* pDst,ULONG cbMax,ULONG cbOff);
 
     // String handles
 
-    static HSZ      DdeCreateStringHandle( PSZ pStr, int iCodePage);
-    static ULONG    DdeQueryString(HSZ hsz,PSZ pStr,ULONG cchMax,int iCPage);
-    static BOOL     DdeFreeStringHandle( HSZ hsz );
-    static BOOL     DdeKeepStringHandle( HSZ hsz );
-    static int      DdeCmpStringHandles(HSZ hsz1, HSZ hsz2);
+    static HSZ     	DdeCreateStringHandle( PSZ pStr, int iCodePage);
+    static ULONG   	DdeQueryString(HSZ hsz,PSZ pStr,ULONG cchMax,int iCPage);
+    static BOOL    	DdeFreeStringHandle( HSZ hsz );
+    static BOOL    	DdeKeepStringHandle( HSZ hsz );
+    static int 		DdeCmpStringHandles(HSZ hsz1, HSZ hsz2);
 
     // mit dieser Funktion kann geprueft werden, ob eine
     // Applikation schon eine DDEML-Instanz angelegt hat.
@@ -390,7 +390,7 @@ public:
 
     // gibt TRUE zurueck, wenn mind. ein lebender HCONV
     // von diesem DdeMgr erzeugt wurde
-    BOOL            OwnsConversationHandles();
+    BOOL			OwnsConversationHandles();
 };
 
 // static
diff --git a/svl/source/svdde/ddemlos2.h b/svl/source/svdde/ddemlos2.h
index bdd31e470bcd..8a00aa63ba02 100644
--- a/svl/source/svdde/ddemlos2.h
+++ b/svl/source/svdde/ddemlos2.h
@@ -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
@@ -42,27 +42,27 @@ typedef LHANDLE HSTR;
 #endif
 
 
-typedef ULONG       HCONVLIST;
-typedef ULONG       HCONV;
-typedef ATOM        HSZ;
-typedef DDESTRUCT*  HDDEDATA;
+typedef ULONG		HCONVLIST;
+typedef ULONG		HCONV;
+typedef ATOM		HSZ;
+typedef DDESTRUCT*	HDDEDATA;
 
 struct CONVINFO
 {
-    USHORT      nSize;                  // sizeof(CONVINFO)
-    ULONG       nUser;                  // Userhandle
-    HCONV       hConvPartner;           //
-    HSZ         hszPartner;             // Name der Partnerapp
-    HSZ         hszServiceReq;          // Name des angeforderten Services
-    HSZ         hszTopic;               // -- " -- Topics
-    HSZ         hszItem;                // -- " -- Items
-    USHORT      nFormat;                // Datenformat der akt. Transaktion
-    USHORT      nType;                  // Typ der akt. Transaktion (XTYP_*)
-    USHORT      nStatus;                // ST_* der Konversation
-    USHORT      nConvst;                // XST_* der akt. Transaktion
-    USHORT      nLastError;             // letzter Fehler der Transaktion
-    HCONVLIST   hConvList;              // ConvListId , wenn in ConvList
-    CONVCONTEXT aConvCtxt;              // conversation context
+    USHORT		nSize;					// sizeof(CONVINFO)
+    ULONG		nUser;					// Userhandle
+    HCONV		hConvPartner;			//
+    HSZ			hszPartner;				// Name der Partnerapp
+    HSZ			hszServiceReq;          // Name des angeforderten Services
+    HSZ			hszTopic;               // -- " -- Topics
+    HSZ			hszItem;                // -- " -- Items
+    USHORT		nFormat;				// Datenformat der akt. Transaktion
+    USHORT		nType;					// Typ der akt. Transaktion (XTYP_*)
+    USHORT		nStatus;                // ST_* der Konversation
+    USHORT		nConvst;                // XST_* der akt. Transaktion
+    USHORT		nLastError;				// letzter Fehler der Transaktion
+    HCONVLIST	hConvList;              // ConvListId , wenn in ConvList
+    CONVCONTEXT	aConvCtxt;				// conversation context
 };
 
 /* the following structure is for use with XTYP_WILDCONNECT processing. */
@@ -324,50 +324,50 @@ int     DdeCmpStringHandles(HSZ hsz1, HSZ hsz2);
 
 /* von OS/2 nicht unterstuetzte Win3.1 Clipboard-Formate */
 
-#define CF_NOTSUPPORTED_BASE    0xff00
+#define CF_NOTSUPPORTED_BASE	0xff00
 
 #ifndef CF_DIB
-#define CF_DIB                  CF_NOTSUPPORTED_BASE+1
+#define CF_DIB					CF_NOTSUPPORTED_BASE+1
 #endif
 
 #ifndef CF_DIF
-#define CF_DIF                  CF_NOTSUPPORTED_BASE+2
+#define CF_DIF					CF_NOTSUPPORTED_BASE+2
 #endif
 
 #ifndef CF_DSPMETAFILEPICT
-#define CF_DSPMETAFILEPICT      CF_NOTSUPPORTED_BASE+3
+#define CF_DSPMETAFILEPICT		CF_NOTSUPPORTED_BASE+3
 #endif
 
 #ifndef CF_METAFILEPICT
-#define CF_METAFILEPICT         CF_NOTSUPPORTED_BASE+4
+#define CF_METAFILEPICT			CF_NOTSUPPORTED_BASE+4
 #endif
 
 #ifndef CF_OEMTEXT
-#define CF_OEMTEXT              CF_NOTSUPPORTED_BASE+5
+#define CF_OEMTEXT				CF_NOTSUPPORTED_BASE+5
 #endif
 
 #ifndef CF_OWNERDISPLAY
-#define CF_OWNERDISPLAY         CF_NOTSUPPORTED_BASE+6
+#define CF_OWNERDISPLAY			CF_NOTSUPPORTED_BASE+6
 #endif
 
 #ifndef CF_PENDATA
-#define CF_PENDATA              CF_NOTSUPPORTED_BASE+7
+#define CF_PENDATA				CF_NOTSUPPORTED_BASE+7
 #endif
 
 #ifndef CF_RIFF
-#define CF_RIFF                 CF_NOTSUPPORTED_BASE+8
+#define CF_RIFF					CF_NOTSUPPORTED_BASE+8
 #endif
 
 #ifndef CF_SYLK
-#define CF_SYLK                 CF_NOTSUPPORTED_BASE+9
+#define CF_SYLK					CF_NOTSUPPORTED_BASE+9
 #endif
 
 #ifndef CF_TIFF
-#define CF_TIFF                 CF_NOTSUPPORTED_BASE+10
+#define CF_TIFF					CF_NOTSUPPORTED_BASE+10
 #endif
 
 #ifndef CF_WAVE
-#define CF_WAVE                 CF_NOTSUPPORTED_BASE+11
+#define CF_WAVE					CF_NOTSUPPORTED_BASE+11
 #endif
 
 
diff --git a/svl/source/svdde/ddestrg.cxx b/svl/source/svdde/ddestrg.cxx
index 4f0e2464a276..5288908e5d6a 100644
--- a/svl/source/svdde/ddestrg.cxx
+++ b/svl/source/svdde/ddestrg.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
diff --git a/svl/source/svdde/ddesvr.cxx b/svl/source/svdde/ddesvr.cxx
index c361f259d610..1b7664f6d21f 100644
--- a/svl/source/svdde/ddesvr.cxx
+++ b/svl/source/svdde/ddesvr.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
@@ -1014,7 +1014,7 @@ String DdeService::Formats()
     String      s;
     long        f;
     TCHAR       buf[128];
-    LPCTSTR     p;
+    LPCTSTR		p;
     short       n = 0;
 
     for ( f = aFormats.First(); f; f = aFormats.Next(), n++ )
diff --git a/svl/source/svdde/ddewrap.cxx b/svl/source/svdde/ddewrap.cxx
index 7e75fef55898..bbd8eb746732 100644
--- a/svl/source/svdde/ddewrap.cxx
+++ b/svl/source/svdde/ddewrap.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
@@ -43,9 +43,9 @@
 
 HSZ WINAPI DdeCreateStringHandleW_9x( DWORD idInst, LPCWSTR pszString, int )
 {
-    HSZ     hszResult;
-    LPSTR   pszANSIString;
-    int     nSize;
+    HSZ		hszResult;
+    LPSTR	pszANSIString;
+    int		nSize;
 
     nSize = pszString ? WideCharToMultiByte( CP_ACP, 0, pszString, -1, NULL, 0, NULL, NULL ) : 0;
     pszANSIString = nSize ? (LPSTR)HeapAlloc( GetProcessHeap(), 0, nSize * sizeof(CHAR) ) : NULL;
@@ -65,8 +65,8 @@ HSZ WINAPI DdeCreateStringHandleW_9x( DWORD idInst, LPCWSTR pszString, int )
 
 DWORD WINAPI DdeQueryStringW_9x( DWORD idInst, HSZ hsz, LPWSTR pszString, DWORD cchMax, int )
 {
-    DWORD   dwResult;
-    LPSTR   pszANSIString;
+    DWORD	dwResult;
+    LPSTR	pszANSIString;
 
     pszANSIString = cchMax ? (LPSTR)HeapAlloc( GetProcessHeap(), 0, cchMax * sizeof(CHAR) ) : NULL;
 
diff --git a/svl/source/svdde/ddewrap.hxx b/svl/source/svdde/ddewrap.hxx
index 77d012ccbba5..793d5c972e01 100644
--- a/svl/source/svdde/ddewrap.hxx
+++ b/svl/source/svdde/ddewrap.hxx
@@ -15,9 +15,9 @@ DECLARE_WAPI_FUNC( DdeInitializeW );
 
 
 #ifndef _SVTOOLS_SVDDE_DDEWRAP_CXX_
-#define DdeCreateStringHandleW  lpfnDdeCreateStringHandleW
-#define DdeQueryStringW         lpfnDdeQueryStringW
-#define DdeInitializeW          lpfnDdeInitializeW
+#define DdeCreateStringHandleW	lpfnDdeCreateStringHandleW
+#define DdeQueryStringW			lpfnDdeQueryStringW
+#define DdeInitializeW			lpfnDdeInitializeW
 #endif
 
 
diff --git a/svl/source/svsql/converter.cxx b/svl/source/svsql/converter.cxx
index ee36914289a3..354abdcc7bea 100644
--- a/svl/source/svsql/converter.cxx
+++ b/svl/source/svsql/converter.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
diff --git a/svl/source/undo/undo.cxx b/svl/source/undo/undo.cxx
index fa5eca964a8c..003f8752f68f 100644
--- a/svl/source/undo/undo.cxx
+++ b/svl/source/undo/undo.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
@@ -184,7 +184,7 @@ void SfxUndoManager::SetMaxUndoActionCount( USHORT nMaxUndoActionCount )
     // the number of entries due to a lower nMaxUndoActionCount.
     // Both redo and undo action entries will be removed until we reached the
     // new nMaxUndoActionCount.
-
+    
     long nNumToDelete = pActUndoArray->aUndoActions.Count() - nMaxUndoActionCount;
     if ( nNumToDelete > 0 )
     {
@@ -211,7 +211,7 @@ void SfxUndoManager::SetMaxUndoActionCount( USHORT nMaxUndoActionCount )
                     --nNumToDelete;
                 }
             }
-
+            
             if ( nPos == pActUndoArray->aUndoActions.Count() )
                 break; // Cannot delete more entries
         }
@@ -377,9 +377,9 @@ void SfxUndoManager::RemoveLastUndoAction()
 
 BOOL SfxUndoManager::Undo( USHORT )
 {
-    bool bUndoWasEnabled =  mbUndoEnabled;
+    bool bUndoWasEnabled = 	mbUndoEnabled;
     mbUndoEnabled = false;
-
+    
     BOOL bRet = FALSE;
 
     try
@@ -404,7 +404,7 @@ BOOL SfxUndoManager::Undo( USHORT )
 
 void SfxUndoManager::Undo( SfxUndoAction &rAction )
 {
-    bool bUndoWasEnabled =  mbUndoEnabled;
+    bool bUndoWasEnabled = 	mbUndoEnabled;
     mbUndoEnabled = false;
     try
     {
@@ -444,9 +444,9 @@ USHORT SfxUndoManager::GetRedoActionId( USHORT nNo ) const
 
 BOOL SfxUndoManager::Redo( USHORT )
 {
-    bool bUndoWasEnabled =  mbUndoEnabled;
+    bool bUndoWasEnabled = 	mbUndoEnabled;
     mbUndoEnabled = false;
-
+    
     BOOL bRet = FALSE;
 
     try
@@ -471,7 +471,7 @@ BOOL SfxUndoManager::Redo( USHORT )
 
 void SfxUndoManager::Redo( SfxUndoAction &rAction )
 {
-    bool bUndoWasEnabled =  mbUndoEnabled;
+    bool bUndoWasEnabled = 	mbUndoEnabled;
     mbUndoEnabled = false;
 
     try
@@ -548,7 +548,7 @@ BOOL SfxUndoManager::CanRepeat( SfxRepeatTarget &rTarget, USHORT nNo ) const
 void SfxUndoManager::EnterListAction(
     const XubString& rComment, const XubString &rRepeatComment, USHORT nId )
 
-/*  [Beschreibung]
+/*	[Beschreibung]
 
     Fuegt eine ListUndoAction ein und setzt dessen UndoArray als aktuelles.
 */
@@ -571,7 +571,7 @@ void SfxUndoManager::EnterListAction(
 
 void SfxUndoManager::LeaveListAction()
 
-/*  [Beschreibung]
+/*	[Beschreibung]
 
     Verlaesst die aktuelle ListAction und geht eine Ebene nach oben.
 */
@@ -657,7 +657,7 @@ SfxListUndoAction::SfxListUndoAction
     USHORT Id,
     SfxUndoArray *pFather
 )
-: nId(Id), aComment(rComment), aRepeatComment(rRepeatComment)
+: nId(Id), aComment(rComment), aRepeatComment(rRepeatComment) 
 {
     pFatherUndoArray = pFather;
     nMaxUndoActions = USHRT_MAX;
@@ -709,7 +709,7 @@ BOOL SfxListUndoAction::Merge( SfxUndoAction *pNextAction )
 //------------------------------------------------------------------------
 
 SfxLinkUndoAction::SfxLinkUndoAction(SfxUndoManager *pManager)
-/*  [Beschreibung]
+/*	[Beschreibung]
 
     Richtet eine LinkAction ein, die auf einen weiteren UndoManager zeigt.
     Holt sich als zugehoerige Action des weiteren UndoManagers dessen
diff --git a/svl/source/uno/pathservice.cxx b/svl/source/uno/pathservice.cxx
index 1a3be47713a1..16917d92eabf 100644
--- a/svl/source/uno/pathservice.cxx
+++ b/svl/source/uno/pathservice.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
diff --git a/svl/source/uno/registerservices.cxx b/svl/source/uno/registerservices.cxx
index ab01d308c2da..f34fe118d615 100644
--- a/svl/source/uno/registerservices.cxx
+++ b/svl/source/uno/registerservices.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
@@ -147,5 +147,5 @@ SVL_DLLPUBLIC void* SAL_CALL component_getFactory (
     return pResult;
 }
 
-}   // "C"
+}	// "C"
 
diff --git a/svl/unx/inc/convert.hxx b/svl/unx/inc/convert.hxx
index c2184d5328f0..863b8a977cc7 100644
--- a/svl/unx/inc/convert.hxx
+++ b/svl/unx/inc/convert.hxx
@@ -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
@@ -35,27 +35,27 @@
 class Convert
 {
 public:
-    static void     Swap( long & nValue )
+    static void		Swap( long & nValue )
                     { nValue = SWAPLONG( nValue ); }
-    static void     Swap( ULONG & nValue )
+    static void		Swap( ULONG & nValue )
                     { nValue = SWAPLONG( nValue ); }
-    static void     Swap( short & nValue )
+    static void		Swap( short & nValue )
                     { nValue = SWAPSHORT( nValue ); }
-    static void     Swap( USHORT & nValue )
+    static void		Swap( USHORT & nValue )
                     { nValue = SWAPSHORT( nValue ); }
-    static void     Swap( Point & aPtr )
+    static void		Swap( Point & aPtr )
                     { Swap( aPtr.X() ); Swap( aPtr.Y() ); }
-    static void     Swap( Size & aSize )
+    static void		Swap( Size & aSize )
                     { Swap( aSize.Width() ); Swap( aSize.Height() ); }
-    static void     Swap( Rectangle & rRect )
+    static void		Swap( Rectangle & rRect )
                     { Swap( rRect.Top() ); Swap( rRect.Bottom() );
                       Swap( rRect.Left() ); Swap( rRect.Right() ); }
 /*
-    static USHORT   AnsiFloatSize() const { return 6; }
-    static float    AnsiToFloat( void * pAnsiFloat )
+    static USHORT	AnsiFloatSize() const { return 6; }
+    static float	AnsiToFloat( void * pAnsiFloat )
                     { return 0; }
-    static USHORT   AnsiDoubleSize() const { return 12; }
-    static double   AnsiToDouble( void * pAnsiDouble )
+    static USHORT	AnsiDoubleSize() const { return 12; }
+    static double	AnsiToDouble( void * pAnsiDouble )
                     { return 0; }
 */
 };
diff --git a/svl/unx/source/svdde/ddedummy.cxx b/svl/unx/source/svdde/ddedummy.cxx
index 4f92c80e36f2..b19cffe721dc 100644
--- a/svl/unx/source/svdde/ddedummy.cxx
+++ b/svl/unx/source/svdde/ddedummy.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
@@ -268,10 +268,10 @@ const String& DdeService::GetName() const
   return String::EmptyString();
 }
 
-namespace
-{
-    struct theDdeServices
-        : public rtl::Static< DdeServices, theDdeServices > {};
+namespace 
+{ 
+    struct theDdeServices 
+        : public rtl::Static< DdeServices, theDdeServices > {}; 
 }
 
 DdeServices& DdeService::GetServices()
diff --git a/svtools/bmpmaker/bmp.cxx b/svtools/bmpmaker/bmp.cxx
index 5b473b0289c2..b5de769b4923 100644
--- a/svtools/bmpmaker/bmp.cxx
+++ b/svtools/bmpmaker/bmp.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
@@ -53,13 +53,13 @@ class BmpApp : public BmpCreator
 {
 private:
 
-    String          aOutputFileName;
-    BYTE            cExitCode;
-
-    BOOL            GetCommandOption( const ::std::vector< String >& rArgs, const String& rSwitch, String& rSwitchParam );
-    BOOL            GetCommandOptions( const ::std::vector< String >& rArgs, const String& rSwitch, ::std::vector< String >& rSwitchParams );
+    String	        aOutputFileName;
+    BYTE	        cExitCode;
+                    
+    BOOL	        GetCommandOption( const ::std::vector< String >& rArgs, const String& rSwitch, String& rSwitchParam );
+    BOOL	        GetCommandOptions( const ::std::vector< String >& rArgs, const String& rSwitch, ::std::vector< String >& rSwitchParams );
 
-    void            SetExitCode( BYTE cExit )
+    void	        SetExitCode( BYTE cExit )
                     {
                         if( ( EXIT_NOERROR == cExitCode ) || ( cExit != EXIT_NOERROR ) )
                             cExitCode = cExit;
@@ -96,7 +96,7 @@ BOOL BmpApp::GetCommandOption( const ::std::vector< String >& rArgs, const Strin
 
     for( int i = 0, nCount = rArgs.size(); ( i < nCount ) && !bRet; i++ )
     {
-        String  aTestStr( '-' );
+        String	aTestStr( '-' );
 
         for( int n = 0; ( n < 2 ) && !bRet; n++ )
         {
@@ -128,7 +128,7 @@ BOOL BmpApp::GetCommandOptions( const ::std::vector< String >& rArgs, const Stri
 
     for( int i = 0, nCount = rArgs.size(); ( i < nCount ); i++ )
     {
-        String  aTestStr( '-' );
+        String	aTestStr( '-' );
 
         for( int n = 0; ( n < 2 ) && !bRet; n++ )
         {
@@ -140,7 +140,7 @@ BOOL BmpApp::GetCommandOptions( const ::std::vector< String >& rArgs, const Stri
                     rParams.push_back( rArgs[ i + 1 ] );
                 else
                     rParams.push_back( String() );
-
+            
                 break;
             }
 
@@ -167,7 +167,7 @@ void BmpApp::Message( const String& rText, BYTE cExit )
 // -----------------------------------------------------------------------------
 
 void BmpApp::ShowUsage()
-{
+{   
     Message( String( RTL_CONSTASCII_USTRINGPARAM( "Usage:" ) ), EXIT_NOERROR );
     Message( String( RTL_CONSTASCII_USTRINGPARAM( "    bmp srs_inputfile output_dir lang_dir lang_num -i input_dir [-i input_dir ][-f err_file]" ) ), EXIT_NOERROR );
     Message( String( RTL_CONSTASCII_USTRINGPARAM( "Options:" ) ), EXIT_NOERROR );
@@ -188,13 +188,13 @@ int BmpApp::Start( const ::std::vector< String >& rArgs )
     if( rArgs.size() >= 6 )
     {
         LangInfo                aLangInfo;
-        USHORT                  nCurCmd = 0;
+        USHORT	                nCurCmd = 0;
         const String            aSrsName( rArgs[ nCurCmd++ ] );
         ::std::vector< String > aInDirVector;
-        ByteString              aLangDir;
-
+        ByteString	            aLangDir;
+        
         aOutName = rArgs[ nCurCmd++ ];
-
+        
         aLangDir = ByteString( rArgs[ nCurCmd++ ], RTL_TEXTENCODING_ASCII_US );
         aLangInfo.mnLangNum = static_cast< sal_uInt16 >( rArgs[ nCurCmd++ ].ToInt32() );
 
@@ -210,11 +210,11 @@ int BmpApp::Start( const ::std::vector< String >& rArgs )
         ShowUsage();
         cExitCode = EXIT_COMMONERROR;
     }
-
+    
     if( ( EXIT_NOERROR == cExitCode ) && aOutputFileName.Len() && aOutName.Len() )
     {
-        SvFileStream    aOStm( aOutputFileName, STREAM_WRITE | STREAM_TRUNC );
-        ByteString      aStr( "Successfully generated ImageList(s) in: " );
+        SvFileStream	aOStm( aOutputFileName, STREAM_WRITE | STREAM_TRUNC );
+        ByteString		aStr( "Successfully generated ImageList(s) in: " );
 
         aOStm.WriteLine( aStr.Append( ByteString( aOutName, RTL_TEXTENCODING_UTF8 ) ) );
         aOStm.Close();
@@ -235,7 +235,7 @@ int main( int nArgCount, char* ppArgs[] )
     strcpy( aDisplayVar, "DISPLAY=" );
     putenv( aDisplayVar );
 #endif
-
+    
     ::std::vector< String > aArgs;
     BmpApp                  aBmpApp;
 
@@ -243,6 +243,6 @@ int main( int nArgCount, char* ppArgs[] )
 
     for( int i = 1; i < nArgCount; i++ )
         aArgs.push_back( String( ppArgs[ i ], RTL_TEXTENCODING_ASCII_US ) );
-
+    
     return aBmpApp.Start( aArgs );
 }
diff --git a/svtools/bmpmaker/bmp.hrc b/svtools/bmpmaker/bmp.hrc
index 528b3e4462d9..caf2ad556595 100644
--- a/svtools/bmpmaker/bmp.hrc
+++ b/svtools/bmpmaker/bmp.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
@@ -25,20 +25,20 @@
  *
  ************************************************************************/
 
-#define DLG_PATH    256
+#define	DLG_PATH	256
 
-#define GRP_PATH    1
-#define FT_SRS      1
-#define FT_RES      2
-#define FT_OUT      3
-#define EDT_SRS     1
-#define EDT_RES     2
-#define EDT_OUT     3
-#define BTN_SRS     1
-#define BTN_RES     2
-#define BTN_OUT     3
-#define BTN_OK      1
-#define BTN_CANCEL  1
+#define GRP_PATH	1
+#define	FT_SRS		1
+#define	FT_RES		2
+#define FT_OUT		3
+#define	EDT_SRS		1
+#define	EDT_RES		2
+#define EDT_OUT		3
+#define	BTN_SRS		1
+#define	BTN_RES		2
+#define BTN_OUT		3
+#define BTN_OK		1
+#define BTN_CANCEL	1
 
-#define GRP_LANG    2
-#define LB_LANG     1
+#define GRP_LANG	2
+#define	LB_LANG		1
diff --git a/svtools/bmpmaker/bmp.src b/svtools/bmpmaker/bmp.src
index 7431d2e335a4..40ceed6a8989 100644
--- a/svtools/bmpmaker/bmp.src
+++ b/svtools/bmpmaker/bmp.src
@@ -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
diff --git a/svtools/bmpmaker/bmpcore.cxx b/svtools/bmpmaker/bmpcore.cxx
index 9e134c06a670..edf29c82898f 100644
--- a/svtools/bmpmaker/bmpcore.cxx
+++ b/svtools/bmpmaker/bmpcore.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
@@ -94,10 +94,10 @@ void BmpCreator::ImplCreate( const ::std::vector< DirEntry >& rInDirs,
     if( rInDirs.size() )
     {
         ByteString                  aLine;
-        String                      aInfo, aPrefix, aName( rName ), aString;
-        SvFileStream                aOutStream;
-        BitmapEx                    aTotalBmpEx;
-        DirEntry                    aOutFile( rOut );
+        String 				        aInfo, aPrefix, aName( rName ), aString;
+        SvFileStream		        aOutStream;
+        BitmapEx				    aTotalBmpEx;
+        DirEntry			        aOutFile( rOut );
         ::std::vector< DirEntry >   aInFiles( rInDirs );
         ::std::vector< String >     aNameVector;
         sal_uInt32                  i;
@@ -327,9 +327,9 @@ void BmpCreator::Create( const String& rSRSName,
                          const String& rOutName,
                          const LangInfo& rLang )
 {
-    DirEntry                    aFileName( ImplGetSystemFileName( rSRSName ) ), aOutDir( ImplGetSystemFileName( rOutName ) );
+    DirEntry	                aFileName( ImplGetSystemFileName( rSRSName ) ), aOutDir( ImplGetSystemFileName( rOutName ) );
     ::std::vector< DirEntry >   aInDirs;
-    BOOL                        bDone = FALSE;
+    BOOL		                bDone = FALSE;
 
     aFileName.ToAbs();
     aOutDir.ToAbs();
@@ -359,9 +359,9 @@ void BmpCreator::Create( const String& rSRSName,
         Message( String( RTL_CONSTASCII_USTRINGPARAM( "ERROR: Kein SRS file!" ) ), EXIT_NOSRSFILE );
     else
     {
-        String      aText;
-        ByteString  aByteText;
-        BOOL        bLangDep = FALSE;
+        String		aText;
+        ByteString	aByteText;
+        BOOL		bLangDep = FALSE;
 
         do
         {
@@ -404,7 +404,7 @@ void BmpCreator::Create( const String& rSRSName,
                 bDone = TRUE;
                 ImplCreate( aInDirs, aOutDir, aName, rLang );
             }
-/*          else if( ( rLang.mnLangNum != 49 ) && !bLangDep )
+/*			else if( ( rLang.mnLangNum != 49 ) && !bLangDep )
             {
                 Message( String( RTL_CONSTASCII_USTRINGPARAM( "INFO: ImageList is not language dependent! Nothing to do for this language." ) ) );
                 bDone = TRUE;
diff --git a/svtools/bmpmaker/bmpcore.hxx b/svtools/bmpmaker/bmpcore.hxx
index ece4fa09cf78..6686269c727a 100644
--- a/svtools/bmpmaker/bmpcore.hxx
+++ b/svtools/bmpmaker/bmpcore.hxx
@@ -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
@@ -34,18 +34,18 @@
 #include <vector>
 
 // --------------
-// - Exit codes -
+// - Exit codes	-
 // --------------
 
-#define EXIT_NOERROR                0
-#define EXIT_MISSING_BITMAP         1
-#define EXIT_NOSRSFILE              2
-#define EXIT_NOIMGLIST              3
-#define EXIT_DIMENSIONERROR         4
-#define EXIT_IOERROR                5
-#define EXIT_COMMONERROR            6
-#define EXIT_MISSING_RESOURCE       7
-#define EXIT_COLORDEPTHERROR        8
+#define EXIT_NOERROR			    0
+#define EXIT_MISSING_BITMAP		    1
+#define EXIT_NOSRSFILE			    2
+#define EXIT_NOIMGLIST			    3
+#define EXIT_DIMENSIONERROR		    4
+#define	EXIT_IOERROR			    5
+#define EXIT_COMMONERROR	    	6
+#define EXIT_MISSING_RESOURCE	    7
+#define EXIT_COLORDEPTHERROR	    8
 #define EXIT_MISSING_SOLARSRC_ENV   9
 
 // ------------
@@ -55,7 +55,7 @@
 struct LangInfo
 {
     char    maLangDir[ 257 ];
-    USHORT  mnLangNum;
+    USHORT	mnLangNum;
 };
 
 // --------------
@@ -66,17 +66,17 @@ class BmpCreator
 {
 private:
 
-    Bitmap          aOutBmp;
-    Size            aOneSize;
-    Size            aTotSize;
-    Point           aPos;
-    SvFileStream*   pSRS;
-    ULONG           nTotCount;
-    USHORT          nPos;
-
-    void            ImplCreate( const ::std::vector< DirEntry >& rInDirs,
-                                const DirEntry& rOut,
-                                const String& rName,
+    Bitmap			aOutBmp;
+    Size			aOneSize;
+    Size			aTotSize;
+    Point			aPos;
+    SvFileStream*	pSRS;
+    ULONG			nTotCount;
+    USHORT			nPos;
+
+    void            ImplCreate( const ::std::vector< DirEntry >& rInDirs, 
+                                const DirEntry& rOut, 
+                                const String& rName, 
                                 const LangInfo& rLang );
 
 protected:
@@ -88,9 +88,9 @@ public:
                     BmpCreator();
     virtual         ~BmpCreator();
 
-    void            Create( const String& rSRSName,
+    void			Create( const String& rSRSName, 
                             const ::std::vector< String >& rInDirs,
-                            const String& rOutName,
+                            const String& rOutName, 
                             const LangInfo& rLang );
 };
 
diff --git a/svtools/bmpmaker/bmpsum.cxx b/svtools/bmpmaker/bmpsum.cxx
index 7c264e694a12..574f7f654908 100644
--- a/svtools/bmpmaker/bmpsum.cxx
+++ b/svtools/bmpmaker/bmpsum.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
@@ -58,10 +58,10 @@ private:
 
     sal_uInt32      cExitCode;
 
-    BOOL            GetCommandOption( const ::std::vector< String >& rArgs, const String& rSwitch, String& rSwitchParam );
-    BOOL            GetCommandOptions( const ::std::vector< String >& rArgs, const String& rSwitch, ::std::vector< String >& rSwitchParams );
+    BOOL	        GetCommandOption( const ::std::vector< String >& rArgs, const String& rSwitch, String& rSwitchParam );
+    BOOL	        GetCommandOptions( const ::std::vector< String >& rArgs, const String& rSwitch, ::std::vector< String >& rSwitchParams );
 
-    void            SetExitCode( BYTE cExit )
+    void	        SetExitCode( BYTE cExit )
                     {
                         if( ( EXIT_NOERROR == cExitCode ) || ( cExit != EXIT_NOERROR ) )
                             cExitCode = cExit;
@@ -102,7 +102,7 @@ BOOL BmpSum::GetCommandOption( const ::std::vector< String >& rArgs, const Strin
 
     for( int i = 0, nCount = rArgs.size(); ( i < nCount ) && !bRet; i++ )
     {
-        String  aTestStr( '-' );
+        String	aTestStr( '-' );
 
         for( int n = 0; ( n < 2 ) && !bRet; n++ )
         {
@@ -134,7 +134,7 @@ BOOL BmpSum::GetCommandOptions( const ::std::vector< String >& rArgs, const Stri
 
     for( int i = 0, nCount = rArgs.size(); ( i < nCount ); i++ )
     {
-        String  aTestStr( '-' );
+        String	aTestStr( '-' );
 
         for( int n = 0; ( n < 2 ) && !bRet; n++ )
         {
diff --git a/svtools/bmpmaker/g2g.cxx b/svtools/bmpmaker/g2g.cxx
index 6f4ee0f86279..dbdb9acb1f21 100644
--- a/svtools/bmpmaker/g2g.cxx
+++ b/svtools/bmpmaker/g2g.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
@@ -56,11 +56,11 @@ class G2GApp
 {
 private:
 
-    BYTE            cExitCode;
+    BYTE	        cExitCode;
 
     void            ShowUsage();
-    BOOL            GetCommandOption( const ::std::vector< String >& rArgs, const String& rSwitch, String& rParam );
-    void            SetExitCode( BYTE cExit ) { if( ( EXIT_NOERROR == cExitCode ) || ( cExit != EXIT_NOERROR ) ) cExitCode = cExit; }
+    BOOL	        GetCommandOption( const ::std::vector< String >& rArgs, const String& rSwitch, String& rParam );
+    void	        SetExitCode( BYTE cExit ) { if( ( EXIT_NOERROR == cExitCode ) || ( cExit != EXIT_NOERROR ) ) cExitCode = cExit; }
 
     virtual void    Message( const String& rText, BYTE cExitCode = EXIT_NOERROR );
 
@@ -68,7 +68,7 @@ public:
 
                     G2GApp();
     virtual        ~G2GApp();
-
+                    
     int             Start( const ::std::vector< String >& rArgs );
 };
 
@@ -92,7 +92,7 @@ BOOL G2GApp::GetCommandOption( const ::std::vector< String >& rArgs, const Strin
 
     for( int i = 0, nCount = rArgs.size(); ( i < nCount ) && !bRet; i++ )
     {
-        String  aTestStr( '-' );
+        String	aTestStr( '-' );
 
         for( int n = 0; ( n < 2 ) && !bRet; n++ )
         {
@@ -131,7 +131,7 @@ void G2GApp::Message( const String& rText, BYTE nExitCode )
 // -----------------------------------------------------------------------------
 
 void G2GApp::ShowUsage()
-{
+{   
     Message( String( RTL_CONSTASCII_USTRINGPARAM( "Usage:" ) ) );
     Message( String( RTL_CONSTASCII_USTRINGPARAM( "    g2g inputfile outputfile -format exportformat -filterpath path [ -# RRGGBB ]" ) ) );
     Message( String( RTL_CONSTASCII_USTRINGPARAM( "Options:" ) ) );
@@ -147,16 +147,16 @@ void G2GApp::ShowUsage()
 
 int G2GApp::Start( const ::std::vector< String >& rArgs )
 {
-    int     nCmdCount = rArgs.size();
-    USHORT  nCurCmd = 0;
+    int		nCmdCount = rArgs.size();
+    USHORT	nCurCmd = 0;
 
     cExitCode = EXIT_NOERROR;
 
     if( nCmdCount >= 6 )
     {
         GraphicFilter   aFilter( sal_False );
-        String          aInFile, aOutFile, aFilterStr, aFilterPath, aTransColStr;
-
+        String	        aInFile, aOutFile, aFilterStr, aFilterPath, aTransColStr;
+        
         aInFile = rArgs[ nCurCmd++ ];
         aOutFile = rArgs[ nCurCmd++ ];
         GetCommandOption( rArgs, String( RTL_CONSTASCII_USTRINGPARAM( "format" ) ), aFilterStr );
@@ -180,7 +180,7 @@ int G2GApp::Start( const ::std::vector< String >& rArgs )
                     const GfxLink   aGfxLink;
 
                     aGraphic.SetLink( aGfxLink );
-
+                
                     if( aFilter.ImportGraphic( aGraphic, aInFile, aInStm ) == GRFILTER_OK )
                     {
                         SvFileStream aOutStm( aOutFile, STREAM_WRITE | STREAM_TRUNC );
@@ -225,14 +225,14 @@ int G2GApp::Start( const ::std::vector< String >& rArgs )
                 else
                     Message( String( RTL_CONSTASCII_USTRINGPARAM( "invalid file(s)" ) ), EXIT_INVALID_FILE );
             }
-        }
+        }   
     }
     else
         ShowUsage();
 
     return cExitCode;
 }
-
+    
 // --------
 // - Main -
 // --------
@@ -246,6 +246,6 @@ int main( int nArgCount, char* ppArgs[] )
 
     for( int i = 1; i < nArgCount; i++ )
         aArgs.push_back( String( ppArgs[ i ], RTL_TEXTENCODING_ASCII_US ) );
-
+    
     return aG2GApp.Start( aArgs );
 }
diff --git a/svtools/inc/DocumentInfoPreview.hxx b/svtools/inc/DocumentInfoPreview.hxx
index ae57b1a68b32..9da3e3899827 100644
--- a/svtools/inc/DocumentInfoPreview.hxx
+++ b/svtools/inc/DocumentInfoPreview.hxx
@@ -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
@@ -39,20 +39,20 @@ namespace svtools
 {
     class SVT_DLLPUBLIC ODocumentInfoPreview : public Window
     {
-        SvtExtendedMultiLineEdit_Impl*  m_pEditWin;
-        SvtDocInfoTable_Impl*           m_pInfoTable;
-        com::sun::star::lang::Locale    m_aLocale;
+        SvtExtendedMultiLineEdit_Impl*	m_pEditWin;
+        SvtDocInfoTable_Impl*			m_pInfoTable;
+        com::sun::star::lang::Locale	m_aLocale;
 
     public:
         ODocumentInfoPreview( Window* pParent ,WinBits _nBits);
         virtual ~ODocumentInfoPreview();
 
         virtual void Resize();
-        void    Clear();
-        void    fill(const ::com::sun::star::uno::Reference<
+        void	Clear();
+        void	fill(const ::com::sun::star::uno::Reference<
                   ::com::sun::star::document::XDocumentProperties>& i_xDocProps
                     ,const String& i_rURL);
-        void    InsertEntry( const String& rTitle, const String& rValue );
+        void	InsertEntry( const String& rTitle, const String& rValue );
         void SetAutoScroll(BOOL _bAutoScroll);
     };
 }
diff --git a/svtools/inc/QueryFolderName.hxx b/svtools/inc/QueryFolderName.hxx
index 971b4b26e13e..8892ad397d20 100644
--- a/svtools/inc/QueryFolderName.hxx
+++ b/svtools/inc/QueryFolderName.hxx
@@ -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
@@ -44,21 +44,21 @@ namespace svtools {
 class QueryFolderNameDialog : public ModalDialog
 {
 private:
-    FixedText       aNameText;
-    Edit            aNameEdit;
-    FixedLine       aNameLine;
-    OKButton        aOKBtn;
-    CancelButton    aCancelBtn;
+    FixedText		aNameText;
+    Edit			aNameEdit;
+    FixedLine		aNameLine;
+    OKButton		aOKBtn;
+    CancelButton	aCancelBtn;
 
     DECL_LINK( OKHdl, Button * );
     DECL_LINK( NameHdl, Edit * );
 
 public:
-                    QueryFolderNameDialog(  Window* _pParent,
+                    QueryFolderNameDialog(	Window* _pParent,
                                             const String& rTitle,
                                             const String& rDefaultText,
                                             String* pGroupName = NULL );
-    String          GetName() const { return aNameEdit.GetText(); }
+    String			GetName() const { return aNameEdit.GetText(); }
 };
 
 }
diff --git a/svtools/inc/acceleratorexecute.hxx b/svtools/inc/acceleratorexecute.hxx
index 3ee79e1fca0c..c8f034930a0b 100644
--- a/svtools/inc/acceleratorexecute.hxx
+++ b/svtools/inc/acceleratorexecute.hxx
@@ -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
@@ -84,14 +84,14 @@ namespace svt
 struct TMutexInit
 {
     ::osl::Mutex m_aLock;
-};
-
+};    
+    
 //===============================================
 /**
     @descr  implements a helper, which can be used to
             convert vcl key codes into awt key codes ...
             and reverse.
-
+            
             Further such key code can be triggered.
             Doing so different accelerator
             configurations are merged together; a suitable
diff --git a/svtools/inc/addresstemplate.hxx b/svtools/inc/addresstemplate.hxx
index f29ea2478b4e..efe94562a5d6 100644
--- a/svtools/inc/addresstemplate.hxx
+++ b/svtools/inc/addresstemplate.hxx
@@ -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
@@ -57,23 +57,23 @@ namespace svt
     {
     protected:
         // Controls
-        FixedLine       m_aDatasourceFrame;
-        FixedText       m_aDatasourceLabel;
-        ComboBox        m_aDatasource;
-        PushButton      m_aAdministrateDatasources;
-        FixedText       m_aTableLabel;
-        ComboBox        m_aTable;
+        FixedLine		m_aDatasourceFrame;
+        FixedText		m_aDatasourceLabel;
+        ComboBox		m_aDatasource;
+        PushButton		m_aAdministrateDatasources;
+        FixedText		m_aTableLabel;
+        ComboBox		m_aTable;
 
-        FixedText       m_aFieldsTitle;
-        Window          m_aFieldsFrame;
+        FixedText		m_aFieldsTitle;
+        Window			m_aFieldsFrame;	
 
-        ScrollBar       m_aFieldScroller;
-        OKButton        m_aOK;
-        CancelButton    m_aCancel;
-        HelpButton      m_aHelp;
+        ScrollBar		m_aFieldScroller;
+        OKButton		m_aOK;
+        CancelButton	m_aCancel;
+        HelpButton		m_aHelp;
 
         // string to display for "no selection"
-        const String    m_sNoFieldSelection;
+        const String	m_sNoFieldSelection;
 
         /// the DatabaseContext for selecting data sources
         ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess >
@@ -121,28 +121,28 @@ namespace svt
         ~AddressBookSourceDialog();
 
         // to be used if the object was constructed for editing a field mapping only
-        void        getFieldMapping(
+        void		getFieldMapping(
             ::com::sun::star::uno::Sequence< ::com::sun::star::util::AliasProgrammaticPair >& _rMapping) const;
 
     protected:
-        void    implConstruct();
+        void	implConstruct();
 
         // Window overridables
-        virtual long        PreNotify( NotifyEvent& _rNEvt );
+        virtual long		PreNotify( NotifyEvent& _rNEvt );
 
         // implementations
-        void    implScrollFields(sal_Int32 _nPos, sal_Bool _bAdjustFocus, sal_Bool _bAdjustScrollbar);
-        void    implSelectField(ListBox* _pBox, const String& _rText);
+        void	implScrollFields(sal_Int32 _nPos, sal_Bool _bAdjustFocus, sal_Bool _bAdjustScrollbar);
+        void	implSelectField(ListBox* _pBox, const String& _rText);
 
-        void    initalizeListBox(ListBox* _pList);
-        void    resetTables();
-        void    resetFields();
+        void	initalizeListBox(ListBox* _pList);
+        void	resetTables();
+        void	resetFields();
 
         // fill in the data sources listbox
-        void    initializeDatasources();
+        void	initializeDatasources();
 
         // initialize the dialog from the configuration data
-        void    loadConfiguration();
+        void	loadConfiguration();
 
         DECL_LINK(OnFieldScroll, ScrollBar*);
         DECL_LINK(OnFieldSelect, ListBox*);
@@ -156,7 +156,7 @@ namespace svt
 
 
 // .......................................................................
-}   // namespace svt
+}	// namespace svt
 // .......................................................................
 
 #endif // _SVT_ADDRESSTEMPLATE_HXX_
diff --git a/svtools/inc/apearcfg.hxx b/svtools/inc/apearcfg.hxx
index 8e6018424c4c..ef597f5d4b2d 100644
--- a/svtools/inc/apearcfg.hxx
+++ b/svtools/inc/apearcfg.hxx
@@ -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
@@ -59,20 +59,20 @@ typedef enum { // MUST match the order chosen in ListBox LB_DRAG_MODE in optgdlg
 
 class SVT_DLLPUBLIC SvtTabAppearanceCfg : public utl::ConfigItem
 {
-    short           nLookNFeel          ;
-    short           nDragMode           ;
-    short           nScaleFactor        ;
-    short           nSnapMode           ;
+    short           nLookNFeel			;
+    short           nDragMode			;
+    short           nScaleFactor		;
+    short           nSnapMode			;
     short           nMiddleMouse;
 #if defined( UNX ) || defined ( FS_PRIV_DEBUG )
-    short           nAAMinPixelHeight   ;
+    short			nAAMinPixelHeight	;
 #endif
 
     BOOL            bMenuMouseFollow        ;
     BOOL            bSingleLineTabCtrl      ;
     BOOL            bColoredTabCtrl         ;
 #if defined( UNX ) || defined ( FS_PRIV_DEBUG )
-    BOOL            bFontAntialiasing       ;
+    BOOL			bFontAntialiasing		;
 #endif
 
     static sal_Bool  bInitialized ;
@@ -86,17 +86,17 @@ public:
     virtual void    Commit();
     virtual void Notify( const com::sun::star::uno::Sequence< rtl::OUString >& _rPropertyNames);
 
-    USHORT      GetLookNFeel () const { return nLookNFeel; }
-    void        SetLookNFeel ( USHORT nSet );
+    USHORT		GetLookNFeel () const { return nLookNFeel; }
+    void		SetLookNFeel ( USHORT nSet );
 
-    USHORT      GetDragMode  () const { return nDragMode; }
-    void        SetDragMode  ( USHORT nSet );
+    USHORT		GetDragMode  () const { return nDragMode; }
+    void		SetDragMode  ( USHORT nSet );
 
-    USHORT      GetScaleFactor () const { return nScaleFactor; }
-    void        SetScaleFactor ( USHORT nSet );
+    USHORT		GetScaleFactor () const { return nScaleFactor; }
+    void		SetScaleFactor ( USHORT nSet );
 
-    USHORT      GetSnapMode () const { return nSnapMode; }
-    void        SetSnapMode ( USHORT nSet );
+    USHORT		GetSnapMode () const { return nSnapMode; }
+    void		SetSnapMode ( USHORT nSet );
 
     USHORT      GetMiddleMouseButton () const { return nMiddleMouse; }
     void        SetMiddleMouseButton ( USHORT nSet );
@@ -104,24 +104,24 @@ public:
     void        SetApplicationDefaults ( Application* pApp );
 
     void        SetMenuMouseFollow(BOOL bSet) {bMenuMouseFollow = bSet; SetModified();}
-    BOOL        IsMenuMouseFollow() const{return bMenuMouseFollow;}
+    BOOL		IsMenuMouseFollow() const{return bMenuMouseFollow;}
 
     void        SetSingleLineTabCtrl(BOOL bSet) {bSingleLineTabCtrl = bSet; SetModified();}
     BOOL        IsSingleLineTabCtrl()const {return   bSingleLineTabCtrl;}
 
 #if defined( UNX ) || defined ( FS_PRIV_DEBUG )
-    void        SetFontAntiAliasing( BOOL bSet )    { bFontAntialiasing = bSet; SetModified(); }
-    BOOL        IsFontAntiAliasing() const { return bFontAntialiasing; }
+    void		SetFontAntiAliasing( BOOL bSet )	{ bFontAntialiasing = bSet; SetModified(); }
+    BOOL		IsFontAntiAliasing() const { return bFontAntialiasing; }
 
-    USHORT      GetFontAntialiasingMinPixelHeight( ) const { return nAAMinPixelHeight; }
-    void        SetFontAntialiasingMinPixelHeight( USHORT _nMinHeight ) { nAAMinPixelHeight = _nMinHeight; SetModified(); }
+    USHORT		GetFontAntialiasingMinPixelHeight( ) const { return nAAMinPixelHeight; }
+    void		SetFontAntialiasingMinPixelHeight( USHORT _nMinHeight ) { nAAMinPixelHeight = _nMinHeight; SetModified(); }
 #endif
 
     void        SetColoredTabCtrl(BOOL bSet)   {bColoredTabCtrl = bSet; SetModified();};
     BOOL        IsColoredTabCtrl()const {return     bColoredTabCtrl;}
 
     static sal_Bool IsInitialized()  { return bInitialized; }
-    static void    SetInitialized() { bInitialized = sal_True; }
+    static void	   SetInitialized() { bInitialized = sal_True; }
 };
 
 #endif //  _OFA_APEARCFG_HXX
diff --git a/svtools/inc/asynclink.hxx b/svtools/inc/asynclink.hxx
index 41c6f3e92388..fcc4142dbc1f 100644
--- a/svtools/inc/asynclink.hxx
+++ b/svtools/inc/asynclink.hxx
@@ -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
diff --git a/svtools/inc/calendar.hxx b/svtools/inc/calendar.hxx
index f85887873bb0..a43981abe687 100644
--- a/svtools/inc/calendar.hxx
+++ b/svtools/inc/calendar.hxx
@@ -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
@@ -72,20 +72,20 @@ zwischen den Monaten wechseln.
 
 WinBits
 
-WB_BORDER                   Um das Fenster wird ein Border gezeichnet.
-WB_TABSTOP                  Tastatursteuerung ist moeglich. Der Focus wird
+WB_BORDER					Um das Fenster wird ein Border gezeichnet.
+WB_TABSTOP					Tastatursteuerung ist moeglich. Der Focus wird
                             sich geholt, wenn mit der Maus in das
                             Control geklickt wird.
-WB_QUICKHELPSHOWSDATEINFO   DateInfo auch bei QuickInfo als BalloonHelp zeigen
-WB_BOLDTEXT                 Formatiert wird nach fetten Texten und
+WB_QUICKHELPSHOWSDATEINFO	DateInfo auch bei QuickInfo als BalloonHelp zeigen
+WB_BOLDTEXT 				Formatiert wird nach fetten Texten und
                             DIB_BOLD wird bei AddDateInfo() ausgewertet
-WB_FRAMEINFO                Formatiert wird so, das Frame-Info angezeigt
+WB_FRAMEINFO				Formatiert wird so, das Frame-Info angezeigt
                             werden kann und die FrameColor bei AddDateInfo()
                             ausgewertet wird
-WB_RANGESELECT              Es koennen mehrere Tage selektiert werden, die
+WB_RANGESELECT				Es koennen mehrere Tage selektiert werden, die
                             jedoch alle zusammenhaengend sein muessen
-WB_MULTISELECT              Es koennen mehrere Tage selektiert werden
-WB_WEEKNUMBER               Es werden die Wochentage mit angezeigt
+WB_MULTISELECT				Es koennen mehrere Tage selektiert werden
+WB_WEEKNUMBER				Es werden die Wochentage mit angezeigt
 
 --------------------------------------------------------------------------
 
@@ -156,20 +156,20 @@ oder durch Beendigung einer Selektion ausgeloest.
 // - Calendar-Types -
 // ------------------
 
-#define WB_QUICKHELPSHOWSDATEINFO   ((WinBits)0x00004000)
-#define WB_BOLDTEXT                 ((WinBits)0x00008000)
-#define WB_FRAMEINFO                ((WinBits)0x00010000)
-#define WB_WEEKNUMBER               ((WinBits)0x00020000)
+#define WB_QUICKHELPSHOWSDATEINFO	((WinBits)0x00004000)
+#define WB_BOLDTEXT 				((WinBits)0x00008000)
+#define WB_FRAMEINFO				((WinBits)0x00010000)
+#define WB_WEEKNUMBER				((WinBits)0x00020000)
 // Muss mit den WinBits beim TabBar uebereinstimmen oder mal
 // nach \vcl\inc\wintypes.hxx verlagert werden
 #ifndef WB_RANGESELECT
-#define WB_RANGESELECT              ((WinBits)0x00200000)
+#define WB_RANGESELECT				((WinBits)0x00200000)
 #endif
 #ifndef WB_MULTISELECT
-#define WB_MULTISELECT              ((WinBits)0x00400000)
+#define WB_MULTISELECT				((WinBits)0x00400000)
 #endif
 
-#define DIB_BOLD                    ((USHORT)0x0001)
+#define DIB_BOLD					((USHORT)0x0001)
 
 // ------------
 // - Calendar -
@@ -178,50 +178,50 @@ oder durch Beendigung einer Selektion ausgeloest.
 class SVT_DLLPUBLIC Calendar : public Control
 {
 private:
-    ImplDateTable*  mpDateTable;
-    Table*          mpSelectTable;
-    Table*          mpOldSelectTable;
-    Table*          mpRestoreSelectTable;
-    XubString*      mpDayText[31];
-    XubString       maDayText;
-    XubString       maWeekText;
+    ImplDateTable*	mpDateTable;
+    Table*			mpSelectTable;
+    Table*			mpOldSelectTable;
+    Table*			mpRestoreSelectTable;
+    XubString*		mpDayText[31];
+    XubString		maDayText;
+    XubString		maWeekText;
     CalendarWrapper maCalendarWrapper;
-    Rectangle       maPrevRect;
-    Rectangle       maNextRect;
-    String          maDayOfWeekText;
-    sal_Int32       mnDayOfWeekAry[7];
-    Date            maOldFormatFirstDate;
-    Date            maOldFormatLastDate;
-    Date            maFirstDate;
-    Date            maOldFirstDate;
-    Date            maCurDate;
-    Date            maOldCurDate;
-    Date            maAnchorDate;
-    Date            maDropDate;
-    Color           maSelColor;
-    Color           maOtherColor;
-    Color*          mpStandardColor;
-    Color*          mpSaturdayColor;
-    Color*          mpSundayColor;
-    ULONG           mnDayCount;
-    long            mnDaysOffX;
-    long            mnWeekDayOffY;
-    long            mnDaysOffY;
-    long            mnMonthHeight;
-    long            mnMonthWidth;
-    long            mnMonthPerLine;
-    long            mnLines;
-    long            mnDayWidth;
-    long            mnDayHeight;
-    long            mnWeekWidth;
-    long            mnDummy2;
-    long            mnDummy3;
-    long            mnDummy4;
-    WinBits         mnWinStyle;
-    USHORT          mnFirstYear;
-    USHORT          mnLastYear;
-    USHORT          mnRequestYear;
-    BOOL            mbCalc:1,
+    Rectangle		maPrevRect;
+    Rectangle		maNextRect;
+    String			maDayOfWeekText;
+    sal_Int32		mnDayOfWeekAry[7];
+    Date			maOldFormatFirstDate;
+    Date			maOldFormatLastDate;
+    Date			maFirstDate;
+    Date			maOldFirstDate;
+    Date			maCurDate;
+    Date			maOldCurDate;
+    Date			maAnchorDate;
+    Date			maDropDate;
+    Color			maSelColor;
+    Color			maOtherColor;
+    Color*			mpStandardColor;
+    Color*			mpSaturdayColor;
+    Color*			mpSundayColor;
+    ULONG			mnDayCount;
+    long			mnDaysOffX;
+    long			mnWeekDayOffY;
+    long			mnDaysOffY;
+    long			mnMonthHeight;
+    long			mnMonthWidth;
+    long			mnMonthPerLine;
+    long			mnLines;
+    long			mnDayWidth;
+    long			mnDayHeight;
+    long			mnWeekWidth;
+    long			mnDummy2;
+    long			mnDummy3;
+    long			mnDummy4;
+    WinBits 		mnWinStyle;
+    USHORT			mnFirstYear;
+    USHORT			mnLastYear;
+    USHORT			mnRequestYear;
+    BOOL			mbCalc:1,
                     mbFormat:1,
                     mbDrag:1,
                     mbSelection:1,
@@ -239,47 +239,47 @@ private:
                     mbSelLeft:1,
                     mbAllSel:1,
                     mbDropPos:1;
-    Link            maSelectionChangingHdl;
-    Link            maDateRangeChangedHdl;
-    Link            maRequestDateInfoHdl;
-    Link            maDoubleClickHdl;
-    Link            maSelectHdl;
-    Timer           maDragScrollTimer;
-    USHORT          mnDragScrollHitTest;
+    Link			maSelectionChangingHdl;
+    Link			maDateRangeChangedHdl;
+    Link			maRequestDateInfoHdl;
+    Link			maDoubleClickHdl;
+    Link			maSelectHdl;
+    Timer			maDragScrollTimer;
+    USHORT			mnDragScrollHitTest;
 
 #ifdef _SV_CALENDAR_CXX
     using Control::ImplInitSettings;
     using Window::ImplInit;
-    SVT_DLLPRIVATE void         ImplInit( WinBits nWinStyle );
-    SVT_DLLPRIVATE void         ImplInitSettings();
-    SVT_DLLPRIVATE void         ImplGetWeekFont( Font& rFont ) const;
-    SVT_DLLPRIVATE void         ImplFormat();
+    SVT_DLLPRIVATE void			ImplInit( WinBits nWinStyle );
+    SVT_DLLPRIVATE void			ImplInitSettings();
+    SVT_DLLPRIVATE void			ImplGetWeekFont( Font& rFont ) const;
+    SVT_DLLPRIVATE void			ImplFormat();
     using Window::ImplHitTest;
-    SVT_DLLPRIVATE USHORT           ImplHitTest( const Point& rPos, Date& rDate ) const;
-    SVT_DLLPRIVATE void         ImplDrawSpin( BOOL bDrawPrev = TRUE, BOOL bDrawNext = TRUE );
-    SVT_DLLPRIVATE void         ImplDrawDate( long nX, long nY,
+    SVT_DLLPRIVATE USHORT			ImplHitTest( const Point& rPos, Date& rDate ) const;
+    SVT_DLLPRIVATE void			ImplDrawSpin( BOOL bDrawPrev = TRUE, BOOL bDrawNext = TRUE );
+    SVT_DLLPRIVATE void			ImplDrawDate( long nX, long nY,
                                   USHORT nDay, USHORT nMonth, USHORT nYear,
                                   DayOfWeek eDayOfWeek,
                                   BOOL bBack = TRUE, BOOL bOther = FALSE,
                                   ULONG nToday = 0 );
-    SVT_DLLPRIVATE void         ImplDraw( BOOL bPaint = FALSE );
-    SVT_DLLPRIVATE void         ImplUpdateDate( const Date& rDate );
-    SVT_DLLPRIVATE void         ImplUpdateSelection( Table* pOld );
-    SVT_DLLPRIVATE void         ImplMouseSelect( const Date& rDate, USHORT nHitTest,
+    SVT_DLLPRIVATE void			ImplDraw( BOOL bPaint = FALSE );
+    SVT_DLLPRIVATE void			ImplUpdateDate( const Date& rDate );
+    SVT_DLLPRIVATE void			ImplUpdateSelection( Table* pOld );
+    SVT_DLLPRIVATE void			ImplMouseSelect( const Date& rDate, USHORT nHitTest,
                                      BOOL bMove, BOOL bExpand, BOOL bExtended );
-    SVT_DLLPRIVATE void         ImplUpdate( BOOL bCalcNew = FALSE );
+    SVT_DLLPRIVATE void			ImplUpdate( BOOL bCalcNew = FALSE );
     using Window::ImplScroll;
-    SVT_DLLPRIVATE void         ImplScroll( BOOL bPrev );
-    SVT_DLLPRIVATE void         ImplInvertDropPos();
-    SVT_DLLPRIVATE void         ImplShowMenu( const Point& rPos, const Date& rDate );
-    SVT_DLLPRIVATE void         ImplTracking( const Point& rPos, BOOL bRepeat );
-    SVT_DLLPRIVATE void         ImplEndTracking( BOOL bCancel );
+    SVT_DLLPRIVATE void			ImplScroll( BOOL bPrev );
+    SVT_DLLPRIVATE void			ImplInvertDropPos();
+    SVT_DLLPRIVATE void			ImplShowMenu( const Point& rPos, const Date& rDate );
+    SVT_DLLPRIVATE void			ImplTracking( const Point& rPos, BOOL bRepeat );
+    SVT_DLLPRIVATE void			ImplEndTracking( BOOL bCancel );
     SVT_DLLPRIVATE DayOfWeek    ImplGetWeekStart() const;
 #endif
 
 protected:
-    BOOL            ShowDropPos( const Point& rPos, Date& rDate );
-    void            HideDropPos();
+    BOOL			ShowDropPos( const Point& rPos, Date& rDate );
+    void			HideDropPos();
 
     DECL_STATIC_LINK( Calendar, ScrollHdl, Timer *);
 
@@ -288,25 +288,25 @@ public:
                     Calendar( Window* pParent, const ResId& rResId );
                     ~Calendar();
 
-    virtual void    MouseButtonDown( const MouseEvent& rMEvt );
-    virtual void    MouseButtonUp( const MouseEvent& rMEvt );
-    virtual void    MouseMove( const MouseEvent& rMEvt );
-    virtual void    Tracking( const TrackingEvent& rMEvt );
-    virtual void    KeyInput( const KeyEvent& rKEvt );
-    virtual void    Paint( const Rectangle& rRect );
-    virtual void    Resize();
-    virtual void    GetFocus();
-    virtual void    LoseFocus();
-    virtual void    RequestHelp( const HelpEvent& rHEvt );
-    virtual void    Command( const CommandEvent& rCEvt );
-    virtual void    StateChanged( StateChangedType nStateChange );
-    virtual void    DataChanged( const DataChangedEvent& rDCEvt );
-
-    virtual void    SelectionChanging();
-    virtual void    DateRangeChanged();
-    virtual void    RequestDateInfo();
-    virtual void    DoubleClick();
-    virtual void    Select();
+    virtual void	MouseButtonDown( const MouseEvent& rMEvt );
+    virtual void	MouseButtonUp( const MouseEvent& rMEvt );
+    virtual void	MouseMove( const MouseEvent& rMEvt );
+    virtual void	Tracking( const TrackingEvent& rMEvt );
+    virtual void	KeyInput( const KeyEvent& rKEvt );
+    virtual void	Paint( const Rectangle& rRect );
+    virtual void	Resize();
+    virtual void	GetFocus();
+    virtual void	LoseFocus();
+    virtual void	RequestHelp( const HelpEvent& rHEvt );
+    virtual void	Command( const CommandEvent& rCEvt );
+    virtual void	StateChanged( StateChangedType nStateChange );
+    virtual void	DataChanged( const DataChangedEvent& rDCEvt );
+
+    virtual void	SelectionChanging();
+    virtual void	DateRangeChanged();
+    virtual void	RequestDateInfo();
+    virtual void	DoubleClick();
+    virtual void	Select();
 
     const CalendarWrapper& GetCalendarWrapper() const { return maCalendarWrapper; }
 
@@ -316,68 +316,68 @@ public:
     /// Set how many days of a week must reside in the first week of a year.
     void            SetMinimumNumberOfDaysInWeek( sal_Int16 nDays );
 
-    void            SelectDate( const Date& rDate, BOOL bSelect = TRUE );
-    void            SelectDateRange( const Date& rStartDate, const Date& rEndDate,
+    void			SelectDate( const Date& rDate, BOOL bSelect = TRUE );
+    void			SelectDateRange( const Date& rStartDate, const Date& rEndDate,
                                      BOOL bSelect = TRUE );
-    void            SetNoSelection();
-    BOOL            IsDateSelected( const Date& rDate ) const;
-    ULONG           GetSelectDateCount() const;
-    Date            GetSelectDate( ULONG nIndex = 0 ) const;
-    void            EnableCallEverySelect( BOOL bEvery = TRUE ) { mbAllSel = bEvery; }
-    BOOL            IsCallEverySelectEnabled() const { return mbAllSel; }
-
-    USHORT          GetRequestYear() const { return mnRequestYear; }
-    void            SetCurDate( const Date& rNewDate );
-    Date            GetCurDate() const { return maCurDate; }
-    void            SetFirstDate( const Date& rNewFirstDate );
-    Date            GetFirstDate() const { return maFirstDate; }
-    Date            GetLastDate() const { return GetFirstDate() + mnDayCount; }
-    ULONG           GetDayCount() const { return mnDayCount; }
-    Date            GetFirstMonth() const;
-    Date            GetLastMonth() const;
-    USHORT          GetMonthCount() const;
-    BOOL            GetDate( const Point& rPos, Date& rDate ) const;
-    Rectangle       GetDateRect( const Date& rDate ) const;
-    BOOL            GetDropDate( Date& rDate ) const;
-
-    long            GetCurMonthPerLine() const { return mnMonthPerLine; }
-    long            GetCurLines() const { return mnLines; }
-
-    void            SetStandardColor( const Color& rColor );
-    const Color&    GetStandardColor() const;
-    void            SetSaturdayColor( const Color& rColor );
-    const Color&    GetSaturdayColor() const;
-    void            SetSundayColor( const Color& rColor );
-    const Color&    GetSundayColor() const;
-
-    void            AddDateInfo( const Date& rDate, const XubString& rText,
+    void			SetNoSelection();
+    BOOL			IsDateSelected( const Date& rDate ) const;
+    ULONG			GetSelectDateCount() const;
+    Date			GetSelectDate( ULONG nIndex = 0 ) const;
+    void			EnableCallEverySelect( BOOL bEvery = TRUE ) { mbAllSel = bEvery; }
+    BOOL			IsCallEverySelectEnabled() const { return mbAllSel; }
+
+    USHORT			GetRequestYear() const { return mnRequestYear; }
+    void			SetCurDate( const Date& rNewDate );
+    Date			GetCurDate() const { return maCurDate; }
+    void			SetFirstDate( const Date& rNewFirstDate );
+    Date			GetFirstDate() const { return maFirstDate; }
+    Date			GetLastDate() const { return GetFirstDate() + mnDayCount; }
+    ULONG			GetDayCount() const { return mnDayCount; }
+    Date			GetFirstMonth() const;
+    Date			GetLastMonth() const;
+    USHORT			GetMonthCount() const;
+    BOOL			GetDate( const Point& rPos, Date& rDate ) const;
+    Rectangle		GetDateRect( const Date& rDate ) const;
+    BOOL			GetDropDate( Date& rDate ) const;
+
+    long			GetCurMonthPerLine() const { return mnMonthPerLine; }
+    long			GetCurLines() const { return mnLines; }
+
+    void			SetStandardColor( const Color& rColor );
+    const Color&	GetStandardColor() const;
+    void			SetSaturdayColor( const Color& rColor );
+    const Color&	GetSaturdayColor() const;
+    void			SetSundayColor( const Color& rColor );
+    const Color&	GetSundayColor() const;
+
+    void			AddDateInfo( const Date& rDate, const XubString& rText,
                                  const Color* pTextColor = NULL,
                                  const Color* pFrameColor = NULL,
                                  USHORT nFlags = 0 );
-    void            RemoveDateInfo( const Date& rDate );
-    void            ClearDateInfo();
-    XubString       GetDateInfoText( const Date& rDate );
+    void			RemoveDateInfo( const Date& rDate );
+    void			ClearDateInfo();
+    XubString		GetDateInfoText( const Date& rDate );
 
-    void            StartSelection();
-    void            EndSelection();
+    void			StartSelection();
+    void			EndSelection();
 
-    BOOL            IsTravelSelect() const { return mbTravelSelect; }
-    BOOL            IsScrollDateRangeChanged() const { return mbScrollDateRange; }
-    BOOL            IsSelectLeft() const { return mbSelLeft; }
+    BOOL			IsTravelSelect() const { return mbTravelSelect; }
+    BOOL			IsScrollDateRangeChanged() const { return mbScrollDateRange; }
+    BOOL			IsSelectLeft() const { return mbSelLeft; }
 
-    Size            CalcWindowSizePixel( long nCalcMonthPerLine = 1,
+    Size			CalcWindowSizePixel( long nCalcMonthPerLine = 1,
                                          long nCalcLines = 1 ) const;
 
-    void            SetSelectionChangingHdl( const Link& rLink ) { maSelectionChangingHdl = rLink; }
-    const Link&     GetSelectionChangingHdl() const { return maSelectionChangingHdl; }
-    void            SetDateRangeChangedHdl( const Link& rLink ) { maDateRangeChangedHdl = rLink; }
-    const Link&     GetDateRangeChangedHdl() const { return maDateRangeChangedHdl; }
-    void            SetRequestDateInfoHdl( const Link& rLink ) { maRequestDateInfoHdl = rLink; }
-    const Link&     GetRequestDateInfoHdl() const { return maRequestDateInfoHdl; }
-    void            SetDoubleClickHdl( const Link& rLink ) { maDoubleClickHdl = rLink; }
-    const Link&     GetDoubleClickHdl() const { return maDoubleClickHdl; }
-    void            SetSelectHdl( const Link& rLink ) { maSelectHdl = rLink; }
-    const Link&     GetSelectHdl() const { return maSelectHdl; }
+    void			SetSelectionChangingHdl( const Link& rLink ) { maSelectionChangingHdl = rLink; }
+    const Link& 	GetSelectionChangingHdl() const { return maSelectionChangingHdl; }
+    void			SetDateRangeChangedHdl( const Link& rLink ) { maDateRangeChangedHdl = rLink; }
+    const Link& 	GetDateRangeChangedHdl() const { return maDateRangeChangedHdl; }
+    void			SetRequestDateInfoHdl( const Link& rLink ) { maRequestDateInfoHdl = rLink; }
+    const Link& 	GetRequestDateInfoHdl() const { return maRequestDateInfoHdl; }
+    void			SetDoubleClickHdl( const Link& rLink ) { maDoubleClickHdl = rLink; }
+    const Link& 	GetDoubleClickHdl() const { return maDoubleClickHdl; }
+    void			SetSelectHdl( const Link& rLink ) { maSelectHdl = rLink; }
+    const Link& 	GetSelectHdl() const { return maSelectHdl; }
 };
 
 inline const Color& Calendar::GetStandardColor() const
@@ -454,14 +454,14 @@ class SVT_DLLPUBLIC CalendarField : public DateField
 {
 private:
     ImplCFieldFloatWin* mpFloatWin;
-    Calendar*           mpCalendar;
-    WinBits             mnCalendarStyle;
-    PushButton*         mpTodayBtn;
-    PushButton*         mpNoneBtn;
-    Date                maDefaultDate;
-    BOOL                mbToday;
-    BOOL                mbNone;
-    Link                maSelectHdl;
+    Calendar*			mpCalendar;
+    WinBits 			mnCalendarStyle;
+    PushButton* 		mpTodayBtn;
+    PushButton* 		mpNoneBtn;
+    Date				maDefaultDate;
+    BOOL				mbToday;
+    BOOL				mbNone;
+    Link				maSelectHdl;
 
 #ifdef _SV_CALENDAR_CXX
                         DECL_DLLPRIVATE_LINK( ImplSelectHdl, Calendar* );
@@ -474,28 +474,28 @@ public:
                         CalendarField( Window* pParent, const ResId& rResId );
                         ~CalendarField();
 
-    virtual void        Select();
+    virtual void		Select();
 
-    virtual BOOL        ShowDropDown( BOOL bShow );
-    virtual Calendar*   CreateCalendar( Window* pParent );
-    Calendar*           GetCalendar();
+    virtual BOOL		ShowDropDown( BOOL bShow );
+    virtual Calendar*	CreateCalendar( Window* pParent );
+    Calendar*			GetCalendar();
 
-    void                SetDefaultDate( const Date& rDate ) { maDefaultDate = rDate; }
-    Date                GetDefaultDate() const { return maDefaultDate; }
+    void				SetDefaultDate( const Date& rDate ) { maDefaultDate = rDate; }
+    Date				GetDefaultDate() const { return maDefaultDate; }
 
-    void                EnableToday( BOOL bToday = TRUE ) { mbToday = bToday; }
-    BOOL                IsTodayEnabled() const { return mbToday; }
-    void                EnableNone( BOOL bNone = TRUE ) { mbNone = bNone; }
-    BOOL                IsNoneEnabled() const { return mbNone; }
+    void				EnableToday( BOOL bToday = TRUE ) { mbToday = bToday; }
+    BOOL				IsTodayEnabled() const { return mbToday; }
+    void				EnableNone( BOOL bNone = TRUE ) { mbNone = bNone; }
+    BOOL				IsNoneEnabled() const { return mbNone; }
 
-    void                SetCalendarStyle( WinBits nStyle ) { mnCalendarStyle = nStyle; }
-    WinBits             GetCalendarStyle() const { return mnCalendarStyle; }
+    void				SetCalendarStyle( WinBits nStyle ) { mnCalendarStyle = nStyle; }
+    WinBits 			GetCalendarStyle() const { return mnCalendarStyle; }
 
-    void                SetSelectHdl( const Link& rLink ) { maSelectHdl = rLink; }
-    const Link&         GetSelectHdl() const { return maSelectHdl; }
+    void				SetSelectHdl( const Link& rLink ) { maSelectHdl = rLink; }
+    const Link& 		GetSelectHdl() const { return maSelectHdl; }
 
 protected:
-    virtual void    StateChanged( StateChangedType nStateChange );
+    virtual void	StateChanged( StateChangedType nStateChange );
 };
 
-#endif  // _CALENDAR_HXX
+#endif	// _CALENDAR_HXX
diff --git a/svtools/inc/cliplistener.hxx b/svtools/inc/cliplistener.hxx
index ab20d6d7aa20..40c13cd1f654 100644
--- a/svtools/inc/cliplistener.hxx
+++ b/svtools/inc/cliplistener.hxx
@@ -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
@@ -39,15 +39,15 @@ class Window;
 class SVT_DLLPUBLIC TransferableClipboardListener : public ::cppu::WeakImplHelper1<
                             ::com::sun::star::datatransfer::clipboard::XClipboardListener >
 {
-    Link    aLink;
+    Link	aLink;
 
 public:
             // Link is called with a TransferableDataHelper pointer
             TransferableClipboardListener( const Link& rCallback );
             ~TransferableClipboardListener();
 
-    void    AddRemoveListener( Window* pWin, BOOL bAdd );
-    void    ClearCallbackLink();
+    void	AddRemoveListener( Window* pWin, BOOL bAdd );
+    void	ClearCallbackLink();
 
             // XEventListener
     virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source )
diff --git a/svtools/inc/collatorres.hxx b/svtools/inc/collatorres.hxx
index 63b4e7ef64f3..63b77e79b4a1 100644
--- a/svtools/inc/collatorres.hxx
+++ b/svtools/inc/collatorres.hxx
@@ -7,7 +7,7 @@
 
 class CollatorRessourceData;
 
-class SVT_DLLPUBLIC CollatorRessource
+class SVT_DLLPUBLIC CollatorRessource 
 {
     private:
 
@@ -16,7 +16,7 @@ class SVT_DLLPUBLIC CollatorRessource
     public:
                                 CollatorRessource ();
                                 ~CollatorRessource ();
-        const String&           GetTranslation (const String& r_Algorithm);
+        const String&			GetTranslation (const String& r_Algorithm);
 };
 
 #endif /* SVTOOLS_COLLATORRESSOURCE_HXX */
diff --git a/svtools/inc/contextmenuhelper.hxx b/svtools/inc/contextmenuhelper.hxx
index 54d254309b1e..f6ac1918d61b 100644
--- a/svtools/inc/contextmenuhelper.hxx
+++ b/svtools/inc/contextmenuhelper.hxx
@@ -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
@@ -45,12 +45,12 @@ namespace svt
 /**
     Context menu helper class.
 
-    Fills images and labels for a provided popup menu or
-    com.sun.star.awt.XPopupMenu.
-
+    Fills images and labels for a provided popup menu or 
+    com.sun.star.awt.XPopupMenu. 
+    
     PRECONDITION:
-    All commands must be set via SetItemCommand and are part
-    of the configuration files
+    All commands must be set via SetItemCommand and are part 
+    of the configuration files 
     (see org.openoffice.Office.UI.[Module]Commands.xcu)
 */
 struct ExecuteInfo;
@@ -71,29 +71,29 @@ class SVT_DLLPUBLIC ContextMenuHelper
         // methods to create a popup menu referenced by resource URL
         // NOT IMPLEMENTED YET!
         ::com::sun::star::uno::Reference< ::com::sun::star::awt::XPopupMenu > create( const ::rtl::OUString& aPopupMenuResourceURL );
-
+        
         // method to create and execute a popup menu referenced by a resource URL
         // NOT IMPLEMENTED YET!
         bool createAndExecute( const Point& aPos, const ::rtl::OUString& aPopupMenuResourceURL );
 
     private:
         // asynchronous link to prevent destruction while on stack
-        DECL_STATIC_LINK( ContextMenuHelper, ExecuteHdl_Impl, ExecuteInfo* );
-
+        DECL_STATIC_LINK( ContextMenuHelper, ExecuteHdl_Impl, ExecuteInfo* ); 
+        
         // no copy-ctor and operator=
         ContextMenuHelper( const ContextMenuHelper& );
         const ContextMenuHelper& operator=( const ContextMenuHelper& );
 
         // show context menu and dispatch command automatically
         void            executePopupMenu( const Point& aPos, PopupMenu* pMenu );
-
+        
         // fill image and label for every menu item on the provided menu
         void            completeMenuProperties( Menu* pMenu );
 
         // dispatch provided command
         bool            dispatchCommand( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& xFrame, const ::rtl::OUString& aCommandURL );
 
-
+        
         // methods to retrieve a single command URL dependent value from a
         // ui configuratin manager
         Image           getImageFromCommandURL( const ::rtl::OUString& aCmdURL, bool bHiContrast ) const;
@@ -102,7 +102,7 @@ class SVT_DLLPUBLIC ContextMenuHelper
         // creates an association between current module/controller bound to the
         // provided frame and their ui configuration managers.
         bool            associateUIConfigurationManagers();
-
+        
         // resets associations to create associations again on-demand.
         // Usefull for implementations which recycle frames. Normal
         // implementations can profit from caching and should set
diff --git a/svtools/inc/controldims.hrc b/svtools/inc/controldims.hrc
index 5e26f132897d..f7a5595e982d 100644
--- a/svtools/inc/controldims.hrc
+++ b/svtools/inc/controldims.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
@@ -41,62 +41,62 @@
 //
 
 // Base
-#define RSC_BS_CHARHEIGHT                   8
-#define RSC_BS_CHARWIDTH                    4
+#define RSC_BS_CHARHEIGHT					8
+#define RSC_BS_CHARWIDTH					4
 
 // control dimensions
-#define RSC_CD_PUSHBUTTON_WIDTH             50
-#define RSC_CD_PUSHBUTTON_HEIGHT            14
+#define RSC_CD_PUSHBUTTON_WIDTH				50
+#define RSC_CD_PUSHBUTTON_HEIGHT			14		
 
-#define RSC_CD_FIXEDTEXT_HEIGHT             RSC_BS_CHARHEIGHT
-#define RSC_CD_FIXEDLINE_HEIGHT             RSC_BS_CHARHEIGHT
-#define RSC_CD_FIXEDLINE_WIDTH              RSC_BS_CHARWIDTH    // for vertical FixedLines
+#define RSC_CD_FIXEDTEXT_HEIGHT				RSC_BS_CHARHEIGHT
+#define RSC_CD_FIXEDLINE_HEIGHT				RSC_BS_CHARHEIGHT
+#define RSC_CD_FIXEDLINE_WIDTH				RSC_BS_CHARWIDTH	// for vertical FixedLines
 
-#define RSC_CD_DROPDOWN_HEIGHT              12      // also combobox and dropdown list
-#define RSC_CD_TEXTBOX_HEIGHT               12      // also numeric fields etc.
+#define RSC_CD_DROPDOWN_HEIGHT				12		// also combobox and dropdown list
+#define RSC_CD_TEXTBOX_HEIGHT				12		// also numeric fields etc.
 
-#define RSC_CD_CHECKBOX_HEIGHT              10      // also tristate
-#define RSC_CD_RADIOBUTTON_HEIGHT           10
+#define RSC_CD_CHECKBOX_HEIGHT				10		// also tristate
+#define RSC_CD_RADIOBUTTON_HEIGHT			10
 
 // spacings
-#define RSC_SP_CTRL_X                       6       // controls that are unrelated
-#define RSC_SP_CTRL_Y                       7
-#define RSC_SP_CTRL_GROUP_X                 3       // related controls, or controls in a groupbox
-#define RSC_SP_CTRL_GROUP_Y                 4
-#define RSC_SP_CTRL_DESC_X                  3       // between description text and related control
-#define RSC_SP_CTRL_DESC_Y                  3
+#define RSC_SP_CTRL_X						6		// controls that are unrelated
+#define RSC_SP_CTRL_Y						7
+#define RSC_SP_CTRL_GROUP_X					3		// related controls, or controls in a groupbox
+#define RSC_SP_CTRL_GROUP_Y					4
+#define RSC_SP_CTRL_DESC_X					3		// between description text and related control
+#define RSC_SP_CTRL_DESC_Y					3
 
 // overruled spacings between certain controls
-#define RSC_SP_FLGR_SPACE_X                 6       // between groupings made with FixedLine
-#define RSC_SP_FLGR_SPACE_Y                 4
-#define RSC_SP_GRP_SPACE_X                  6       // between groupings made with GroupBox
-#define RSC_SP_GRP_SPACE_Y                  6
-#define RSC_SP_TXT_SPACE_X                  5       // spacing between text paragraphs
-#define RSC_SP_TXT_SPACE_Y                  7
-#define RSC_SP_CHK_TEXTINDENT               8       // x indent of text aligned to checkbox title
+#define RSC_SP_FLGR_SPACE_X					6		// between groupings made with FixedLine
+#define RSC_SP_FLGR_SPACE_Y					4
+#define RSC_SP_GRP_SPACE_X					6		// between groupings made with GroupBox
+#define RSC_SP_GRP_SPACE_Y					6
+#define RSC_SP_TXT_SPACE_X					5		// spacing between text paragraphs
+#define RSC_SP_TXT_SPACE_Y					7
+#define RSC_SP_CHK_TEXTINDENT				8		// x indent of text aligned to checkbox title
 
 // dialog inner border
-#define RSC_SP_DLG_INNERBORDER_LEFT         6
-#define RSC_SP_DLG_INNERBORDER_TOP          6
-#define RSC_SP_DLG_INNERBORDER_RIGHT        6
-#define RSC_SP_DLG_INNERBORDER_BOTTOM       6
+#define RSC_SP_DLG_INNERBORDER_LEFT			6
+#define RSC_SP_DLG_INNERBORDER_TOP			6
+#define RSC_SP_DLG_INNERBORDER_RIGHT		6
+#define RSC_SP_DLG_INNERBORDER_BOTTOM		6
 
 // tab page inner border
-#define RSC_SP_TBPG_INNERBORDER_LEFT        6       // for tabpage groupings
-#define RSC_SP_TBPG_INNERBORDER_TOP         3
-#define RSC_SP_TBPG_INNERBORDER_RIGHT       6
-#define RSC_SP_TBPG_INNERBORDER_BOTTOM      6
+#define RSC_SP_TBPG_INNERBORDER_LEFT		6		// for tabpage groupings
+#define RSC_SP_TBPG_INNERBORDER_TOP			3
+#define RSC_SP_TBPG_INNERBORDER_RIGHT		6
+#define RSC_SP_TBPG_INNERBORDER_BOTTOM		6
 
 // FixedLine group inner border
-#define RSC_SP_FLGR_INNERBORDER_LEFT        6       // for FixedLine groupings
-#define RSC_SP_FLGR_INNERBORDER_TOP         3
-#define RSC_SP_FLGR_INNERBORDER_RIGHT       0
-#define RSC_SP_FLGR_INNERBORDER_BOTTOM      0
+#define RSC_SP_FLGR_INNERBORDER_LEFT		6		// for FixedLine groupings
+#define RSC_SP_FLGR_INNERBORDER_TOP			3
+#define RSC_SP_FLGR_INNERBORDER_RIGHT		0
+#define RSC_SP_FLGR_INNERBORDER_BOTTOM		0
 
 // GroupBox inner border
-#define RSC_SP_GRP_INNERBORDER_LEFT         6       // for GroupBox groupings
-#define RSC_SP_GRP_INNERBORDER_TOP          6
-#define RSC_SP_GRP_INNERBORDER_RIGHT        6
-#define RSC_SP_GRP_INNERBORDER_BOTTOM       6
+#define RSC_SP_GRP_INNERBORDER_LEFT			6		// for GroupBox groupings
+#define RSC_SP_GRP_INNERBORDER_TOP			6
+#define RSC_SP_GRP_INNERBORDER_RIGHT		6
+#define RSC_SP_GRP_INNERBORDER_BOTTOM		6
 
 #endif // _SVT_CONTROLDIMS_HRC_
diff --git a/svtools/inc/ctrlbox.hxx b/svtools/inc/ctrlbox.hxx
index 9e6e942daf1e..c53e36a20ca9 100644
--- a/svtools/inc/ctrlbox.hxx
+++ b/svtools/inc/ctrlbox.hxx
@@ -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
@@ -164,56 +164,56 @@ FontList; FontNameBox; FontStyleBox; FontSizeMenu
 
 class SVT_DLLPUBLIC ColorListBox : public ListBox
 {
-    ImpColorList*   pColorList; // Separate Liste, falls UserDaten von aussen verwendet werden.
-    Size            aImageSize;
+    ImpColorList*	pColorList; // Separate Liste, falls UserDaten von aussen verwendet werden.
+    Size			aImageSize;
 
 #ifdef _CTRLBOX_CXX
     using Window::ImplInit;
-    SVT_DLLPRIVATE void         ImplInit();
-    SVT_DLLPRIVATE void         ImplDestroyColorEntries();
+    SVT_DLLPRIVATE void			ImplInit();
+    SVT_DLLPRIVATE void			ImplDestroyColorEntries();
 #endif
 public:
                     ColorListBox( Window* pParent,
                                   WinBits nWinStyle = WB_BORDER );
                     ColorListBox( Window* pParent, const ResId& rResId );
-    virtual         ~ColorListBox();
+    virtual 		~ColorListBox();
 
-    virtual void    UserDraw( const UserDrawEvent& rUDEvt );
+    virtual void	UserDraw( const UserDrawEvent& rUDEvt );
 
     using ListBox::InsertEntry;
-    virtual USHORT  InsertEntry( const XubString& rStr,
+    virtual USHORT	InsertEntry( const XubString& rStr,
                                  USHORT nPos = LISTBOX_APPEND );
-    virtual USHORT  InsertEntry( const Color& rColor, const XubString& rStr,
+    virtual USHORT	InsertEntry( const Color& rColor, const XubString& rStr,
                                  USHORT nPos = LISTBOX_APPEND );
-    void            InsertAutomaticEntry();
+    void			InsertAutomaticEntry();
     using ListBox::RemoveEntry;
-    virtual void    RemoveEntry( USHORT nPos );
-    virtual void    Clear();
-    void            CopyEntries( const ColorListBox& rBox );
+    virtual void	RemoveEntry( USHORT nPos );
+    virtual void	Clear();
+    void			CopyEntries( const ColorListBox& rBox );
 
     using ListBox::GetEntryPos;
-    virtual USHORT  GetEntryPos( const Color& rColor ) const;
-    virtual Color   GetEntryColor( USHORT nPos ) const;
-    Size            GetImageSize() const { return aImageSize; }
+    virtual USHORT	GetEntryPos( const Color& rColor ) const;
+    virtual Color	GetEntryColor( USHORT nPos ) const;
+    Size			GetImageSize() const { return aImageSize; }
 
-    void            SelectEntry( const XubString& rStr, BOOL bSelect = TRUE )
+    void			SelectEntry( const XubString& rStr, BOOL bSelect = TRUE )
                         { ListBox::SelectEntry( rStr, bSelect ); }
-    void            SelectEntry( const Color& rColor, BOOL bSelect = TRUE );
-    XubString       GetSelectEntry( USHORT nSelIndex = 0 ) const
+    void			SelectEntry( const Color& rColor, BOOL bSelect = TRUE );
+    XubString		GetSelectEntry( USHORT nSelIndex = 0 ) const
                         { return ListBox::GetSelectEntry( nSelIndex ); }
-    Color           GetSelectEntryColor( USHORT nSelIndex = 0 ) const;
-    BOOL            IsEntrySelected( const XubString& rStr ) const
+    Color			GetSelectEntryColor( USHORT nSelIndex = 0 ) const;
+    BOOL			IsEntrySelected( const XubString& rStr ) const
                         { return ListBox::IsEntrySelected( rStr ); }
 
-    BOOL            IsEntrySelected( const Color& rColor ) const;
+    BOOL			IsEntrySelected( const Color& rColor ) const;
 
 private:
     // declared as private because some compilers would generate the default functions
                     ColorListBox( const ColorListBox& );
-    ColorListBox&   operator =( const ColorListBox& );
+    ColorListBox&	operator =( const ColorListBox& );
 
-    void            SetEntryData( USHORT nPos, void* pNewData );
-    void*           GetEntryData( USHORT nPos ) const;
+    void			SetEntryData( USHORT nPos, void* pNewData );
+    void*			GetEntryData( USHORT nPos ) const;
 };
 
 inline void ColorListBox::SelectEntry( const Color& rColor, BOOL bSelect )
@@ -247,62 +247,62 @@ inline Color ColorListBox::GetSelectEntryColor( USHORT nSelIndex ) const
 
 class SVT_DLLPUBLIC LineListBox : public ListBox
 {
-    ImpLineList*    pLineList;
-    VirtualDevice   aVirDev;
-    Size            aTxtSize;
-    Color           aColor;
-    Color           maPaintCol;
-    FieldUnit       eUnit;
-    FieldUnit       eSourceUnit;
-
-    SVT_DLLPRIVATE void         ImpGetLine( long nLine1, long nLine2, long nDistance, Bitmap& rBmp, XubString& rStr );
+    ImpLineList*	pLineList;
+    VirtualDevice	aVirDev;
+    Size			aTxtSize;
+    Color			aColor;
+    Color			maPaintCol;
+    FieldUnit		eUnit;
+    FieldUnit		eSourceUnit;
+
+    SVT_DLLPRIVATE void			ImpGetLine( long nLine1, long nLine2, long nDistance, Bitmap& rBmp, XubString& rStr );
     using Window::ImplInit;
-    SVT_DLLPRIVATE void         ImplInit();
-    void            UpdateLineColors( void );
-    BOOL            UpdatePaintLineColor( void );       // returns TRUE if maPaintCol has changed
-    inline const Color& GetPaintColor( void ) const;
-    virtual void    DataChanged( const DataChangedEvent& rDCEvt );
+    SVT_DLLPRIVATE void			ImplInit();
+    void			UpdateLineColors( void );
+    BOOL			UpdatePaintLineColor( void );		// returns TRUE if maPaintCol has changed
+    inline const Color&	GetPaintColor( void ) const;
+    virtual void	DataChanged( const DataChangedEvent& rDCEvt );
 
 public:
                     LineListBox( Window* pParent, WinBits nWinStyle = WB_BORDER );
                     LineListBox( Window* pParent, const ResId& rResId );
-    virtual         ~LineListBox();
+    virtual 		~LineListBox();
 
     using ListBox::InsertEntry;
-    virtual USHORT  InsertEntry( const XubString& rStr, USHORT nPos = LISTBOX_APPEND );
-    virtual USHORT  InsertEntry( long nLine1, long nLine2 = 0, long nDistance = 0, USHORT nPos = LISTBOX_APPEND );
+    virtual USHORT	InsertEntry( const XubString& rStr, USHORT nPos = LISTBOX_APPEND );
+    virtual USHORT	InsertEntry( long nLine1, long nLine2 = 0, long nDistance = 0, USHORT nPos = LISTBOX_APPEND );
     using ListBox::RemoveEntry;
-    virtual void    RemoveEntry( USHORT nPos );
-    virtual void    Clear();
+    virtual void	RemoveEntry( USHORT nPos );
+    virtual void	Clear();
 
     using ListBox::GetEntryPos;
-    USHORT          GetEntryPos( long nLine1, long nLine2 = 0, long nDistance = 0 ) const;
-    long            GetEntryLine1( USHORT nPos ) const;
-    long            GetEntryLine2( USHORT nPos ) const;
-    long            GetEntryDistance( USHORT nPos ) const;
-
-    inline void     SelectEntry( const XubString& rStr, BOOL bSelect = TRUE ) { ListBox::SelectEntry( rStr, bSelect ); }
-    void            SelectEntry( long nLine1, long nLine2 = 0, long nDistance = 0, BOOL bSelect = TRUE );
-    long            GetSelectEntryLine1( USHORT nSelIndex = 0 ) const;
-    long            GetSelectEntryLine2( USHORT nSelIndex = 0 ) const;
-    long            GetSelectEntryDistance( USHORT nSelIndex = 0 ) const;
-    inline BOOL     IsEntrySelected( const XubString& rStr ) const { return ListBox::IsEntrySelected( rStr ); }
-    BOOL            IsEntrySelected( long nLine1, long nLine2 = 0, long nDistance = 0 ) const;
-
-    inline void     SetUnit( FieldUnit eNewUnit ) { eUnit = eNewUnit; }
-    inline FieldUnit    GetUnit() const { return eUnit; }
-    inline void     SetSourceUnit( FieldUnit eNewUnit ) { eSourceUnit = eNewUnit; }
-    inline FieldUnit    GetSourceUnit() const { return eSourceUnit; }
-
-    void            SetColor( const Color& rColor );
-    inline Color    GetColor( void ) const;
+    USHORT			GetEntryPos( long nLine1, long nLine2 = 0, long nDistance = 0 ) const;
+    long			GetEntryLine1( USHORT nPos ) const;
+    long			GetEntryLine2( USHORT nPos ) const;
+    long			GetEntryDistance( USHORT nPos ) const;
+
+    inline void		SelectEntry( const XubString& rStr, BOOL bSelect = TRUE ) { ListBox::SelectEntry( rStr, bSelect ); }
+    void			SelectEntry( long nLine1, long nLine2 = 0, long nDistance = 0, BOOL bSelect = TRUE );
+    long			GetSelectEntryLine1( USHORT nSelIndex = 0 ) const;
+    long			GetSelectEntryLine2( USHORT nSelIndex = 0 ) const;
+    long			GetSelectEntryDistance( USHORT nSelIndex = 0 ) const;
+    inline BOOL		IsEntrySelected( const XubString& rStr ) const { return ListBox::IsEntrySelected( rStr ); }
+    BOOL			IsEntrySelected( long nLine1, long nLine2 = 0, long nDistance = 0 ) const;
+
+    inline void		SetUnit( FieldUnit eNewUnit ) { eUnit = eNewUnit; }
+    inline FieldUnit	GetUnit() const { return eUnit; }
+    inline void		SetSourceUnit( FieldUnit eNewUnit ) { eSourceUnit = eNewUnit; }
+    inline FieldUnit	GetSourceUnit() const { return eSourceUnit; }
+
+    void			SetColor( const Color& rColor );
+    inline Color	GetColor( void ) const;
 
 private:
     // declared as private because some compilers would generate the default methods
                     LineListBox( const LineListBox& );
-    LineListBox&    operator =( const LineListBox& );
-    void            SetEntryData( USHORT nPos, void* pNewData );
-    void*           GetEntryData( USHORT nPos ) const;
+    LineListBox&	operator =( const LineListBox& );
+    void			SetEntryData( USHORT nPos, void* pNewData );
+    void*			GetEntryData( USHORT nPos ) const;
 };
 
 inline void LineListBox::SelectEntry( long nLine1, long nLine2, long nDistance, BOOL bSelect )
@@ -368,41 +368,41 @@ inline Color LineListBox::GetColor( void ) const
 class SVT_DLLPUBLIC FontNameBox : public ComboBox
 {
 private:
-    ImplFontList*   mpFontList;
-    Image           maImagePrinterFont;
-    Image           maImageBitmapFont;
-    Image           maImageScalableFont;
-    BOOL            mbWYSIWYG;
-    BOOL            mbSymbols;
+    ImplFontList*	mpFontList;
+    Image			maImagePrinterFont;
+    Image			maImageBitmapFont;
+    Image			maImageScalableFont;
+    BOOL			mbWYSIWYG;
+    BOOL			mbSymbols;
 
 #ifdef _CTRLBOX_CXX
-    SVT_DLLPRIVATE void         ImplCalcUserItemSize();
-    SVT_DLLPRIVATE void         ImplDestroyFontList();
+    SVT_DLLPRIVATE void			ImplCalcUserItemSize();
+    SVT_DLLPRIVATE void			ImplDestroyFontList();
 #endif
 
-    void            InitBitmaps( void );
+    void			InitBitmaps( void );
 protected:
-    virtual void    DataChanged( const DataChangedEvent& rDCEvt );
+    virtual void	DataChanged( const DataChangedEvent& rDCEvt );
 public:
                     FontNameBox( Window* pParent,
                                  WinBits nWinStyle = WB_SORT );
                     FontNameBox( Window* pParent, const ResId& rResId );
-    virtual         ~FontNameBox();
+    virtual 		~FontNameBox();
 
-    virtual void    UserDraw( const UserDrawEvent& rUDEvt );
+    virtual void	UserDraw( const UserDrawEvent& rUDEvt );
 
-    void            Fill( const FontList* pList );
+    void			Fill( const FontList* pList );
 
-    void            EnableWYSIWYG( BOOL bEnable = TRUE );
-    BOOL            IsWYSIWYGEnabled() const { return mbWYSIWYG; }
+    void			EnableWYSIWYG( BOOL bEnable = TRUE );
+    BOOL			IsWYSIWYGEnabled() const { return mbWYSIWYG; }
 
-    void            EnableSymbols( BOOL bEnable = TRUE );
-    BOOL            IsSymbolsEnabled() const { return mbSymbols; }
+    void			EnableSymbols( BOOL bEnable = TRUE );
+    BOOL			IsSymbolsEnabled() const { return mbSymbols; }
 
 private:
     // declared as private because some compilers would generate the default functions
                     FontNameBox( const FontNameBox& );
-    FontNameBox&    operator =( const FontNameBox& );
+    FontNameBox&	operator =( const FontNameBox& );
 };
 
 // ----------------
@@ -411,26 +411,26 @@ private:
 
 class SVT_DLLPUBLIC FontStyleBox : public ComboBox
 {
-    XubString       aLastStyle;
+    XubString		aLastStyle;
 
 private:
     using ComboBox::SetText;
 public:
                     FontStyleBox( Window* pParent, WinBits nWinStyle = 0 );
                     FontStyleBox( Window* pParent, const ResId& rResId );
-    virtual         ~FontStyleBox();
+    virtual 		~FontStyleBox();
 
-    virtual void    Select();
-    virtual void    LoseFocus();
-    virtual void    Modify();
+    virtual void	Select();
+    virtual void	LoseFocus();
+    virtual void	Modify();
 
-    void            SetText( const XubString& rText );
-    void            Fill( const XubString& rName, const FontList* pList );
+    void			SetText( const XubString& rText );
+    void			Fill( const XubString& rName, const FontList* pList );
 
 private:
     // declared as private because some compilers would generate the default functions
                     FontStyleBox( const FontStyleBox& );
-    FontStyleBox&   operator =( const FontStyleBox& );
+    FontStyleBox&	operator =( const FontStyleBox& );
 };
 
 inline void FontStyleBox::SetText( const XubString& rText )
@@ -445,22 +445,22 @@ inline void FontStyleBox::SetText( const XubString& rText )
 
 class SVT_DLLPUBLIC FontSizeBox : public MetricBox
 {
-    FontInfo        aFontInfo;
+    FontInfo		aFontInfo;
     const FontList* pFontList;
-    USHORT          nRelMin;
-    USHORT          nRelMax;
-    USHORT          nRelStep;
-    short           nPtRelMin;
-    short           nPtRelMax;
-    short           nPtRelStep;
-    BOOL            bRelativeMode:1,
+    USHORT			nRelMin;
+    USHORT			nRelMax;
+    USHORT			nRelStep;
+    short			nPtRelMin;
+    short			nPtRelMax;
+    short			nPtRelStep;
+    BOOL			bRelativeMode:1,
                     bRelative:1,
                     bPtRelative:1,
                     bStdSize:1;
 
 #ifdef _CTRLBOX_CXX
     using Window::ImplInit;
-    SVT_DLLPRIVATE void         ImplInit();
+    SVT_DLLPRIVATE void			ImplInit();
 #endif
 
 protected:
@@ -469,36 +469,36 @@ protected:
 public:
                     FontSizeBox( Window* pParent, WinBits nWinStyle = 0 );
                     FontSizeBox( Window* pParent, const ResId& rResId );
-    virtual         ~FontSizeBox();
+    virtual 		~FontSizeBox();
 
-    void            Reformat();
-    void            Modify();
+    void			Reformat();
+    void			Modify();
 
-    void            Fill( const FontInfo* pInfo, const FontList* pList );
+    void			Fill( const FontInfo* pInfo, const FontList* pList );
 
-    void            EnableRelativeMode( USHORT nMin = 50, USHORT nMax = 150,
+    void			EnableRelativeMode( USHORT nMin = 50, USHORT nMax = 150,
                                         USHORT nStep = 5 );
-    void            EnablePtRelativeMode( short nMin = -200, short nMax = 200,
+    void			EnablePtRelativeMode( short nMin = -200, short nMax = 200,
                                           short nStep = 10 );
-    BOOL            IsRelativeMode() const { return bRelativeMode; }
-    void            SetRelative( BOOL bRelative = FALSE );
-    BOOL            IsRelative() const { return bRelative; }
-    void            SetPtRelative( BOOL bPtRel = TRUE )
+    BOOL			IsRelativeMode() const { return bRelativeMode; }
+    void			SetRelative( BOOL bRelative = FALSE );
+    BOOL			IsRelative() const { return bRelative; }
+    void			SetPtRelative( BOOL bPtRel = TRUE )
                         { bPtRelative = bPtRel; SetRelative( TRUE ); }
-    BOOL            IsPtRelative() const { return bPtRelative; }
+    BOOL			IsPtRelative() const { return bPtRelative; }
 
-    virtual void    SetValue( sal_Int64 nNewValue, FieldUnit eInUnit );
-    virtual void    SetValue( sal_Int64 nNewValue  );
-    virtual sal_Int64   GetValue( FieldUnit eOutUnit ) const;
-    virtual sal_Int64   GetValue() const;
-    sal_Int64           GetValue( USHORT nPos, FieldUnit eOutUnit ) const;
-    void            SetUserValue( sal_Int64 nNewValue, FieldUnit eInUnit );
-    void            SetUserValue( sal_Int64 nNewValue ) { SetUserValue( nNewValue, FUNIT_NONE ); }
+    virtual void	SetValue( sal_Int64 nNewValue, FieldUnit eInUnit );
+    virtual void	SetValue( sal_Int64 nNewValue  );
+    virtual sal_Int64	GetValue( FieldUnit eOutUnit ) const;
+    virtual sal_Int64	GetValue() const;
+    sal_Int64			GetValue( USHORT nPos, FieldUnit eOutUnit ) const;
+    void			SetUserValue( sal_Int64 nNewValue, FieldUnit eInUnit );
+    void			SetUserValue( sal_Int64 nNewValue ) { SetUserValue( nNewValue, FUNIT_NONE ); }
 
 private:
     // declared as private because some compilers would generate the default functions
                     FontSizeBox( const FontSizeBox& );
-    FontSizeBox&    operator =( const FontSizeBox& );
+    FontSizeBox&	operator =( const FontSizeBox& );
 };
 
-#endif  // _CTRLBOX_HXX
+#endif	// _CTRLBOX_HXX
diff --git a/svtools/inc/ctrltool.hxx b/svtools/inc/ctrltool.hxx
index a0eb5db2b955..64d92d74622a 100644
--- a/svtools/inc/ctrltool.hxx
+++ b/svtools/inc/ctrltool.hxx
@@ -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
@@ -147,37 +147,37 @@ von der FontList, sollte deshalb das Array nicht mehr referenziert werden.
 // - FontList -
 // ------------
 
-#define FONTLIST_FONTINFO_NOTFOUND  ((USHORT)0xFFFF)
+#define FONTLIST_FONTINFO_NOTFOUND	((USHORT)0xFFFF)
 
-#define FONTLIST_FONTNAMETYPE_PRINTER           ((USHORT)0x0001)
-#define FONTLIST_FONTNAMETYPE_SCREEN            ((USHORT)0x0002)
-#define FONTLIST_FONTNAMETYPE_SCALABLE          ((USHORT)0x0004)
+#define FONTLIST_FONTNAMETYPE_PRINTER			((USHORT)0x0001)
+#define FONTLIST_FONTNAMETYPE_SCREEN			((USHORT)0x0002)
+#define FONTLIST_FONTNAMETYPE_SCALABLE			((USHORT)0x0004)
 
 class SVT_DLLPUBLIC FontList : private List
 {
 private:
-    XubString               maMapBoth;
-    XubString               maMapPrinterOnly;
-    XubString               maMapScreenOnly;
-    XubString               maMapSizeNotAvailable;
-    XubString               maMapStyleNotAvailable;
-    XubString               maMapNotAvailable;
-    XubString               maLight;
-    XubString               maLightItalic;
-    XubString               maNormal;
-    XubString               maNormalItalic;
-    XubString               maBold;
-    XubString               maBoldItalic;
-    XubString               maBlack;
-    XubString               maBlackItalic;
-    long*                   mpSizeAry;
-    OutputDevice*           mpDev;
-    OutputDevice*           mpDev2;
+    XubString				maMapBoth;
+    XubString				maMapPrinterOnly;
+    XubString				maMapScreenOnly;
+    XubString				maMapSizeNotAvailable;
+    XubString				maMapStyleNotAvailable;
+    XubString				maMapNotAvailable;
+    XubString				maLight;
+    XubString				maLightItalic;
+    XubString				maNormal;
+    XubString				maNormalItalic;
+    XubString				maBold;
+    XubString				maBoldItalic;
+    XubString				maBlack;
+    XubString				maBlackItalic;
+    long*					mpSizeAry;
+    OutputDevice*			mpDev;
+    OutputDevice*			mpDev2;
 
 #ifdef CTRLTOOL_CXX
-    SVT_DLLPRIVATE ImplFontListNameInfo*    ImplFind( const XubString& rSearchName, ULONG* pIndex ) const;
-    SVT_DLLPRIVATE ImplFontListNameInfo*    ImplFindByName( const XubString& rStr ) const;
-    SVT_DLLPRIVATE void                 ImplInsertFonts( OutputDevice* pDev, BOOL bAll,
+    SVT_DLLPRIVATE ImplFontListNameInfo*	ImplFind( const XubString& rSearchName, ULONG* pIndex ) const;
+    SVT_DLLPRIVATE ImplFontListNameInfo*	ImplFindByName( const XubString& rStr ) const;
+    SVT_DLLPRIVATE void					ImplInsertFonts( OutputDevice* pDev, BOOL bAll,
                                              BOOL bInsertData );
 #endif
 
@@ -188,40 +188,40 @@ public:
                             ~FontList();
 
     FontList*               Clone() const;
-
+    
     OutputDevice*           GetDevice() const { return mpDev; }
-    OutputDevice*           GetDevice2() const { return mpDev2; }
-    XubString               GetFontMapText( const FontInfo& rInfo ) const;
-    USHORT                  GetFontNameType( const XubString& rFontName ) const;
-
-    const XubString&        GetNormalStr() const { return maNormal; }
-    const XubString&        GetItalicStr() const { return maNormalItalic; }
-    const XubString&        GetBoldStr() const { return maBold; }
-    const XubString&        GetBoldItalicStr() const { return maBoldItalic; }
-    const XubString&        GetStyleName( FontWeight eWeight, FontItalic eItalic ) const;
-    XubString               GetStyleName( const FontInfo& rInfo ) const;
-
-    FontInfo                Get( const XubString& rName,
+    OutputDevice*			GetDevice2() const { return mpDev2; }
+    XubString				GetFontMapText( const FontInfo& rInfo ) const;
+    USHORT					GetFontNameType( const XubString& rFontName ) const;
+
+    const XubString&		GetNormalStr() const { return maNormal; }
+    const XubString&		GetItalicStr() const { return maNormalItalic; }
+    const XubString&		GetBoldStr() const { return maBold; }
+    const XubString&		GetBoldItalicStr() const { return maBoldItalic; }
+    const XubString&		GetStyleName( FontWeight eWeight, FontItalic eItalic ) const;
+    XubString				GetStyleName( const FontInfo& rInfo ) const;
+
+    FontInfo				Get( const XubString& rName,
                                  const XubString& rStyleName ) const;
-    FontInfo                Get( const XubString& rName,
+    FontInfo				Get( const XubString& rName,
                                  FontWeight eWeight,
                                  FontItalic eItalic ) const;
 
-    BOOL                    IsAvailable( const XubString& rName ) const;
-    USHORT                  GetFontNameCount() const
+    BOOL					IsAvailable( const XubString& rName ) const;
+    USHORT					GetFontNameCount() const
                                 { return (USHORT)List::Count(); }
-    const FontInfo&         GetFontName( USHORT nFont ) const;
-    USHORT                  GetFontNameType( USHORT nFont ) const;
-    sal_Handle              GetFirstFontInfo( const XubString& rName ) const;
-    sal_Handle              GetNextFontInfo( sal_Handle hFontInfo ) const;
-    const FontInfo&         GetFontInfo( sal_Handle hFontInfo ) const;
+    const FontInfo& 		GetFontName( USHORT nFont ) const;
+    USHORT					GetFontNameType( USHORT nFont ) const;
+    sal_Handle				GetFirstFontInfo( const XubString& rName ) const;
+    sal_Handle				GetNextFontInfo( sal_Handle hFontInfo ) const;
+    const FontInfo& 		GetFontInfo( sal_Handle hFontInfo ) const;
 
-    const long*             GetSizeAry( const FontInfo& rInfo ) const;
-    static const long*      GetStdSizeAry();
+    const long* 			GetSizeAry( const FontInfo& rInfo ) const;
+    static const long*		GetStdSizeAry();
 
 private:
                             FontList( const FontList& );
-    FontList&               operator =( const FontList& );
+    FontList&				operator =( const FontList& );
 };
 
 
@@ -232,20 +232,20 @@ private:
 class SVT_DLLPUBLIC FontSizeNames
 {
 private:
-    struct ImplFSNameItem*  mpArray;
-    ULONG                   mnElem;
+    struct ImplFSNameItem*	mpArray;
+    ULONG					mnElem;
 
 public:
                             FontSizeNames( LanguageType eLanguage /* = LANGUAGE_DONTKNOW */ );
 
-    ULONG                   Count() const { return mnElem; }
-    BOOL                    IsEmpty() const { return !mnElem; }
+    ULONG					Count() const { return mnElem; }
+    BOOL					IsEmpty() const { return !mnElem; }
 
-    long                    Name2Size( const String& ) const;
-    String                  Size2Name( long ) const;
+    long					Name2Size( const String& ) const;
+    String					Size2Name( long ) const;
 
-    String                  GetIndexName( ULONG nIndex ) const;
-    long                    GetIndexSize( ULONG nIndex ) const;
+    String					GetIndexName( ULONG nIndex ) const;
+    long					GetIndexSize( ULONG nIndex ) const;
 };
 
-#endif  // _CTRLTOOL_HXX
+#endif	// _CTRLTOOL_HXX
diff --git a/svtools/inc/dialogclosedlistener.hxx b/svtools/inc/dialogclosedlistener.hxx
index 3712d408af52..9b9d690cd666 100644
--- a/svtools/inc/dialogclosedlistener.hxx
+++ b/svtools/inc/dialogclosedlistener.hxx
@@ -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
diff --git a/svtools/inc/dialogcontrolling.hxx b/svtools/inc/dialogcontrolling.hxx
index cd60736527f5..57a8e3efdd3f 100644
--- a/svtools/inc/dialogcontrolling.hxx
+++ b/svtools/inc/dialogcontrolling.hxx
@@ -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
diff --git a/svtools/inc/expander.hxx b/svtools/inc/expander.hxx
index c0f3cfc7632a..6097677731a7 100644
--- a/svtools/inc/expander.hxx
+++ b/svtools/inc/expander.hxx
@@ -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
@@ -33,60 +33,60 @@
 
 enum SvExpanderStateType
 {
-    EST_MIN=1,
-    EST_PLUS=2,
-    EST_MIN_DOWN=3,
-    EST_PLUS_DOWN=4,
-    EST_NONE=5,
-    EST_MIN_DIS=6,
-    EST_PLUS_DIS=7,
-    EST_MIN_DOWN_DIS=8,
+    EST_MIN=1,          
+    EST_PLUS=2,         
+    EST_MIN_DOWN=3,     
+    EST_PLUS_DOWN=4,    
+    EST_NONE=5,         
+    EST_MIN_DIS=6,      
+    EST_PLUS_DIS=7,     
+    EST_MIN_DOWN_DIS=8, 
     EST_PLUS_DOWN_DIS=9
 };
 
 class SvExpander: public Control
 {
 private:
-        Point                   aImagePos;
-        Point                   aTextPos;
-        Image                   aActiveImage;
-        Rectangle               maFocusRect;
-        ImageList               maExpanderImages;
-        BOOL                    mbIsExpanded;
-        BOOL                    mbHasFocusRect;
-        BOOL                    mbIsInMouseDown;
-        Link                    maToggleHdl;
-        SvExpanderStateType eType;
+        Point					aImagePos;
+        Point					aTextPos;
+        Image					aActiveImage;
+        Rectangle				maFocusRect;
+        ImageList				maExpanderImages;
+        BOOL					mbIsExpanded;
+        BOOL					mbHasFocusRect;
+        BOOL					mbIsInMouseDown;
+        Link					maToggleHdl;
+        SvExpanderStateType	eType;
 
 protected:
+        
+        virtual long	PreNotify( NotifyEvent& rNEvt );
+        virtual void	MouseButtonDown( const MouseEvent& rMEvt );
+        virtual void	MouseMove( const MouseEvent& rMEvt );
+        virtual void	MouseButtonUp( const MouseEvent& rMEvt );
+        virtual void	Paint( const Rectangle& rRect );
+        virtual void	KeyInput( const KeyEvent& rKEvt );
+        virtual void	KeyUp( const KeyEvent& rKEvt );
 
-        virtual long    PreNotify( NotifyEvent& rNEvt );
-        virtual void    MouseButtonDown( const MouseEvent& rMEvt );
-        virtual void    MouseMove( const MouseEvent& rMEvt );
-        virtual void    MouseButtonUp( const MouseEvent& rMEvt );
-        virtual void    Paint( const Rectangle& rRect );
-        virtual void    KeyInput( const KeyEvent& rKEvt );
-        virtual void    KeyUp( const KeyEvent& rKEvt );
-
-        virtual void    Click();
-        virtual void    Resize();
+        virtual void	Click();
+        virtual void	Resize();
 
 public:
-        SvExpander( Window* pParent, WinBits nStyle = 0 );
+        SvExpander( Window* pParent, WinBits nStyle = 0 ); 
         SvExpander( Window* pParent, const ResId& rResId );
 
-        BOOL            IsExpanded() {return mbIsExpanded;}
+        BOOL			IsExpanded() {return mbIsExpanded;}
 
-        void            SetToExpanded(BOOL bFlag=TRUE);
+        void			SetToExpanded(BOOL bFlag=TRUE);
 
-        void            SetExpanderImage( SvExpanderStateType eType);
-        Image           GetExpanderImage(SvExpanderStateType eType);
-        Size            GetMinSize() const;
+        void			SetExpanderImage( SvExpanderStateType eType);
+        Image			GetExpanderImage(SvExpanderStateType eType);
+        Size			GetMinSize() const;
 
-        void            SetToggleHdl( const Link& rLink ) { maToggleHdl = rLink; }
-        const Link&     GetToggleHdl() const { return maToggleHdl; }
+        void			SetToggleHdl( const Link& rLink ) { maToggleHdl = rLink; }
+        const Link& 	GetToggleHdl() const { return maToggleHdl; }
 };
 
 
 
-#endif
+#endif	
diff --git a/svtools/inc/extcolorcfg.hxx b/svtools/inc/extcolorcfg.hxx
index 44167f63287c..37aca51eabd1 100644
--- a/svtools/inc/extcolorcfg.hxx
+++ b/svtools/inc/extcolorcfg.hxx
@@ -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
@@ -44,26 +44,26 @@ class ExtendedColorConfigValue
 {
     ::rtl::OUString m_sName;
     ::rtl::OUString m_sDisplayName;
-    sal_Int32       m_nColor;
-    sal_Int32       m_nDefaultColor;
+    sal_Int32		m_nColor;
+    sal_Int32		m_nDefaultColor;
 public:
     ExtendedColorConfigValue() : m_nColor(0),m_nDefaultColor(0){}
     ExtendedColorConfigValue(const ::rtl::OUString& _sName
                             ,const ::rtl::OUString& _sDisplayName
-                            ,sal_Int32      _nColor
-                            ,sal_Int32      _nDefaultColor)
+                            ,sal_Int32		_nColor
+                            ,sal_Int32		_nDefaultColor) 
     : m_sName(_sName)
     ,m_sDisplayName(_sDisplayName)
     ,m_nColor(_nColor)
-    ,m_nDefaultColor(_nDefaultColor)
+    ,m_nDefaultColor(_nDefaultColor) 
     {}
 
     inline ::rtl::OUString getName()         const { return m_sName; }
     inline ::rtl::OUString getDisplayName()  const { return m_sDisplayName; }
-    inline sal_Int32       getColor()        const { return m_nColor; }
-    inline sal_Int32       getDefaultColor() const { return m_nDefaultColor; }
+    inline sal_Int32	   getColor()        const { return m_nColor; }
+    inline sal_Int32	   getDefaultColor() const { return m_nDefaultColor; }
 
-    inline void setColor(sal_Int32 _nColor) { m_nColor = _nColor; }
+    inline void	setColor(sal_Int32 _nColor) { m_nColor = _nColor; }
 
     sal_Bool operator !=(const ExtendedColorConfigValue& rCmp) const
         { return m_nColor != rCmp.m_nColor;}
@@ -84,11 +84,11 @@ public:
 
     // get the configured value
     ExtendedColorConfigValue        GetColorValue(const ::rtl::OUString& _sComponentName,const ::rtl::OUString& _sName)const;
-    sal_Int32                       GetComponentCount() const;
-    ::rtl::OUString                 GetComponentName(sal_uInt32 _nPos) const;
-    ::rtl::OUString                 GetComponentDisplayName(const ::rtl::OUString& _sComponentName) const;
-    sal_Int32                       GetComponentColorCount(const ::rtl::OUString& _sName) const;
-    ExtendedColorConfigValue        GetComponentColorConfigValue(const ::rtl::OUString& _sComponentName,sal_uInt32 _nPos) const;
+    sal_Int32						GetComponentCount() const;
+    ::rtl::OUString					GetComponentName(sal_uInt32 _nPos) const;
+    ::rtl::OUString					GetComponentDisplayName(const ::rtl::OUString& _sComponentName) const;
+    sal_Int32						GetComponentColorCount(const ::rtl::OUString& _sName) const;
+    ExtendedColorConfigValue		GetComponentColorConfigValue(const ::rtl::OUString& _sComponentName,sal_uInt32 _nPos) const;
 };
 /* -----------------------------22.03.2002 15:31------------------------------
 
@@ -109,19 +109,19 @@ public:
     void                        SetCurrentSchemeName(const ::rtl::OUString& rScheme);
 
     ExtendedColorConfigValue    GetColorValue(const ::rtl::OUString& _sComponentName,const ::rtl::OUString& _sName)const;
-    sal_Int32                   GetComponentCount() const;
-    ::rtl::OUString             GetComponentName(sal_uInt32 _nPos) const;
-    ::rtl::OUString             GetComponentDisplayName(const ::rtl::OUString& _sComponentName) const;
-    sal_Int32                   GetComponentColorCount(const ::rtl::OUString& _sName) const;
-    ExtendedColorConfigValue    GetComponentColorConfigValue(const ::rtl::OUString& _sName,sal_uInt32 _nPos) const;
+    sal_Int32					GetComponentCount() const;
+    ::rtl::OUString				GetComponentName(sal_uInt32 _nPos) const;
+    ::rtl::OUString				GetComponentDisplayName(const ::rtl::OUString& _sComponentName) const;
+    sal_Int32					GetComponentColorCount(const ::rtl::OUString& _sName) const;
+    ExtendedColorConfigValue	GetComponentColorConfigValue(const ::rtl::OUString& _sName,sal_uInt32 _nPos) const;
     void                        SetColorValue(const ::rtl::OUString& _sComponentName, const ExtendedColorConfigValue& rValue);
     void                        SetModified();
     void                        ClearModified(){m_bModified = sal_False;}
     sal_Bool                    IsModified()const{return m_bModified;}
     void                        Commit();
 
-    void                        DisableBroadcast();
-    void                        EnableBroadcast();
+    void						DisableBroadcast();
+    void						EnableBroadcast();
 };
 }//namespace svtools
 #endif
diff --git a/svtools/inc/filectrl.hxx b/svtools/inc/filectrl.hxx
index dd314bb23ca1..47dd23077c92 100644
--- a/svtools/inc/filectrl.hxx
+++ b/svtools/inc/filectrl.hxx
@@ -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
@@ -36,39 +36,39 @@
 #endif
 
 
-#define STR_FILECTRL_BUTTONTEXT     333     // ID-Range?!
+#define STR_FILECTRL_BUTTONTEXT		333		// ID-Range?!
 
 // Flags for FileControl
 typedef USHORT FileControlMode;
-#define FILECTRL_RESIZEBUTTONBYPATHLEN  ((USHORT)0x0001)//if this is set, the button will become small as soon as the Text in the Edit Field is to long to be shown completely
+#define FILECTRL_RESIZEBUTTONBYPATHLEN	((USHORT)0x0001)//if this is set, the button will become small as soon as the Text in the Edit Field is to long to be shown completely
 
 
 // Flags for internal use of FileControl
 typedef USHORT FileControlMode_Internal;
-#define FILECTRL_INRESIZE               ((USHORT)0x0001)
-#define FILECTRL_ORIGINALBUTTONTEXT     ((USHORT)0x0002)
+#define FILECTRL_INRESIZE				((USHORT)0x0001)
+#define FILECTRL_ORIGINALBUTTONTEXT		((USHORT)0x0002)
 
 
 class SVT_DLLPUBLIC FileControl : public Window
 {
 private:
-    Edit            maEdit;
-    PushButton      maButton;
+    Edit			maEdit;
+    PushButton		maButton;
 
-    String          maButtonText;
-    BOOL            mbOpenDlg;
+    String			maButtonText;
+    BOOL			mbOpenDlg;
 
-    Link            maDialogCreatedHdl;
+    Link			maDialogCreatedHdl;
 
-    FileControlMode             mnFlags;
-    FileControlMode_Internal    mnInternalFlags;
+    FileControlMode				mnFlags;
+    FileControlMode_Internal	mnInternalFlags;
 
 private:
-    SVT_DLLPRIVATE void     ImplBrowseFile( );
+    SVT_DLLPRIVATE void		ImplBrowseFile( );
 
 protected:
-    SVT_DLLPRIVATE void     Resize();
-    SVT_DLLPRIVATE void     GetFocus();
+    SVT_DLLPRIVATE void		Resize();
+    SVT_DLLPRIVATE void		GetFocus();
     SVT_DLLPRIVATE void     StateChanged( StateChangedType nType );
     SVT_DLLPRIVATE WinBits  ImplInitStyle( WinBits nStyle );
     DECL_DLLPRIVATE_LINK( ButtonHdl, PushButton* );
@@ -77,34 +77,34 @@ public:
                     FileControl( Window* pParent, WinBits nStyle, FileControlMode = 0 );
                     ~FileControl();
 
-    Edit&           GetEdit() { return maEdit; }
-    PushButton&     GetButton() { return maButton; }
+    Edit&			GetEdit() { return maEdit; }
+    PushButton&		GetButton() { return maButton; }
 
-    void            Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, ULONG nFlags );
+    void			Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, ULONG nFlags );
 
-    void            SetOpenDialog( BOOL bOpen )     { mbOpenDlg = bOpen; }
-    BOOL            IsOpenDialog() const            { return mbOpenDlg; }
+    void			SetOpenDialog( BOOL bOpen )		{ mbOpenDlg = bOpen; }
+    BOOL			IsOpenDialog() const			{ return mbOpenDlg; }
 
-    void            SetText( const XubString& rStr );
-    XubString       GetText() const;
-    UniString           GetSelectedText() const         { return maEdit.GetSelected(); }
+    void			SetText( const XubString& rStr );
+    XubString		GetText() const;
+    UniString			GetSelectedText() const			{ return maEdit.GetSelected(); }
 
-    void            SetSelection( const Selection& rSelection ) { maEdit.SetSelection( rSelection ); }
-    Selection       GetSelection() const                        { return maEdit.GetSelection(); }
+    void 			SetSelection( const Selection& rSelection ) { maEdit.SetSelection( rSelection ); }
+    Selection 		GetSelection() const 						{ return maEdit.GetSelection(); }
 
-    void            SetReadOnly( BOOL bReadOnly = TRUE )    { maEdit.SetReadOnly( bReadOnly ); }
-    BOOL            IsReadOnly() const                      { return maEdit.IsReadOnly(); }
+    void			SetReadOnly( BOOL bReadOnly = TRUE ) 	{ maEdit.SetReadOnly( bReadOnly ); }
+    BOOL			IsReadOnly() const 						{ return maEdit.IsReadOnly(); }
 
     //------
     //manipulate the Button-Text:
-    XubString       GetButtonText() const { return maButtonText; }
-    void            SetButtonText( const XubString& rStr );
-    void            ResetButtonText();
-
+    XubString		GetButtonText() const { return maButtonText; }
+    void			SetButtonText( const XubString& rStr );
+    void			ResetButtonText();
+                          
     //------
     //use this to manipulate the dialog bevore executing it:
-    void            SetDialogCreatedHdl( const Link& rLink ) { maDialogCreatedHdl = rLink; }
-    const Link&     GetDialogCreatedHdl() const { return maDialogCreatedHdl; }
+    void			SetDialogCreatedHdl( const Link& rLink ) { maDialogCreatedHdl = rLink; }
+    const Link& 	GetDialogCreatedHdl() const { return maDialogCreatedHdl; }
 };
 
 #endif
diff --git a/svtools/inc/filedlg.hxx b/svtools/inc/filedlg.hxx
index c04e48fc7658..f4840063d3c5 100644
--- a/svtools/inc/filedlg.hxx
+++ b/svtools/inc/filedlg.hxx
@@ -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
@@ -44,28 +44,28 @@ class ImpSvFileDlg;
 class SVT_DLLPUBLIC PathDialog : public ModalDialog
 {
 private:
-    friend class FileDialog;    // Imp...
+    friend class FileDialog;	// Imp...
 
-    ImpSvFileDlg*       pImpFileDlg;    // Implementation
-    Link                aOKHdlLink;     // Link zum OK-Handler
+    ImpSvFileDlg*		pImpFileDlg;	// Implementation
+    Link				aOKHdlLink; 	// Link zum OK-Handler
 
 protected:
-    UniString           aDfltExt;       // Default - Extension
+    UniString			aDfltExt;		// Default - Extension
 
 public:
                         PathDialog( Window* pParent, WinBits nWinStyle = 0, BOOL bCreateDir = TRUE );
                         ~PathDialog();
 
-    virtual long        OK();
+    virtual long		OK();
 
-    void                SetPath( const UniString& rNewPath );
-    void                SetPath( const Edit& rEdit );
-    UniString               GetPath() const;
+    void				SetPath( const UniString& rNewPath );
+    void				SetPath( const Edit& rEdit );
+    UniString				GetPath() const;
 
-    void                SetOKHdl( const Link& rLink ) { aOKHdlLink = rLink; }
-    const Link&         GetOKHdl() const { return aOKHdlLink; }
+    void				SetOKHdl( const Link& rLink ) { aOKHdlLink = rLink; }
+    const Link& 		GetOKHdl() const { return aOKHdlLink; }
 
-    virtual short       Execute();
+    virtual short		Execute();
 };
 
 // --------------
@@ -75,34 +75,34 @@ public:
 class SVT_DLLPUBLIC FileDialog : public PathDialog
 {
 private:
-    Link                aFileHdlLink;   // Link zum FileSelect-Handler
-    Link                aFilterHdlLink; // Link zum FilterSelect-Handler
+    Link				aFileHdlLink;	// Link zum FileSelect-Handler
+    Link				aFilterHdlLink; // Link zum FilterSelect-Handler
 
 public:
                         FileDialog( Window* pParent, WinBits nWinStyle );
                         ~FileDialog();
 
-    virtual void        FileSelect();
-    virtual void        FilterSelect();
-
-    void                SetDefaultExt( const UniString& rExt ) { aDfltExt = rExt; }
-    const UniString&        GetDefaultExt() const { return aDfltExt; }
-    void                AddFilter( const UniString& rFilter, const UniString& rType );
-    void                RemoveFilter( const UniString& rFilter );
-    void                RemoveAllFilter();
-    void                SetCurFilter( const UniString& rFilter );
-    UniString               GetCurFilter() const;
-    USHORT              GetFilterCount() const;
-    UniString               GetFilterName( USHORT nPos ) const;
-    UniString               GetFilterType( USHORT nPos ) const;
-
-    void                SetFileSelectHdl( const Link& rLink ) { aFileHdlLink = rLink; }
-    const Link&         GetFileSelectHdl() const { return aFileHdlLink; }
-    void                SetFilterSelectHdl( const Link& rLink ) { aFilterHdlLink = rLink; }
-    const Link&         GetFilterSelectHdl() const { return aFilterHdlLink; }
-
-    void                SetOkButtonText( const UniString& rText );
-    void                SetCancelButtonText( const UniString& rText );
+    virtual void		FileSelect();
+    virtual void		FilterSelect();
+
+    void				SetDefaultExt( const UniString& rExt ) { aDfltExt = rExt; }
+    const UniString&		GetDefaultExt() const { return aDfltExt; }
+    void				AddFilter( const UniString& rFilter, const UniString& rType );
+    void				RemoveFilter( const UniString& rFilter );
+    void				RemoveAllFilter();
+    void				SetCurFilter( const UniString& rFilter );
+    UniString				GetCurFilter() const;
+    USHORT				GetFilterCount() const;
+    UniString				GetFilterName( USHORT nPos ) const;
+    UniString				GetFilterType( USHORT nPos ) const;
+
+    void				SetFileSelectHdl( const Link& rLink ) { aFileHdlLink = rLink; }
+    const Link& 		GetFileSelectHdl() const { return aFileHdlLink; }
+    void				SetFilterSelectHdl( const Link& rLink ) { aFilterHdlLink = rLink; }
+    const Link& 		GetFilterSelectHdl() const { return aFilterHdlLink; }
+
+    void				SetOkButtonText( const UniString& rText );
+    void				SetCancelButtonText( const UniString& rText );
 };
 
-#endif  // _FILEDLG_HXX
+#endif	// _FILEDLG_HXX
diff --git a/svtools/inc/filedlg2.hrc b/svtools/inc/filedlg2.hrc
index a87bd6ebcad0..dff3413c5d2b 100644
--- a/svtools/inc/filedlg2.hrc
+++ b/svtools/inc/filedlg2.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
@@ -24,18 +24,18 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#define STR_FILEDLG_SELECT          1000
-#define STR_FILEDLG_CANTCHDIR       1001
-#define STR_FILEDLG_OPEN            1002
-#define STR_FILEDLG_FILE            1003
-#define STR_FILEDLG_DIR             1004
-#define STR_FILEDLG_TYPE            1005
-#define STR_FILEDLG_CANTOPENFILE    1006
-#define STR_FILEDLG_CANTOPENDIR     1007
-#define STR_FILEDLG_OVERWRITE       1008
-#define STR_FILEDLG_GOUP            1009
-#define STR_FILEDLG_SAVE            1010
-#define STR_FILEDLG_DRIVES          1011
-#define STR_FILEDLG_HOME            1012
-#define STR_FILEDLG_NEWDIR          1013
-#define STR_FILEDLG_ASKNEWDIR       1014
+#define	STR_FILEDLG_SELECT			1000
+#define STR_FILEDLG_CANTCHDIR		1001
+#define STR_FILEDLG_OPEN			1002
+#define STR_FILEDLG_FILE			1003
+#define STR_FILEDLG_DIR				1004
+#define STR_FILEDLG_TYPE			1005
+#define STR_FILEDLG_CANTOPENFILE	1006
+#define STR_FILEDLG_CANTOPENDIR		1007
+#define STR_FILEDLG_OVERWRITE		1008
+#define STR_FILEDLG_GOUP			1009
+#define STR_FILEDLG_SAVE			1010
+#define STR_FILEDLG_DRIVES  		1011
+#define STR_FILEDLG_HOME	  		1012
+#define STR_FILEDLG_NEWDIR	  		1013
+#define STR_FILEDLG_ASKNEWDIR		1014
diff --git a/svtools/inc/fileview.hxx b/svtools/inc/fileview.hxx
index 74476541dcd8..94276c7a9f6a 100644
--- a/svtools/inc/fileview.hxx
+++ b/svtools/inc/fileview.hxx
@@ -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
@@ -25,7 +25,7 @@
  *
  ************************************************************************/
 #ifndef _SVT_FILEVIEW_HXX
-#define _SVT_FILEVIEW_HXX
+#define	_SVT_FILEVIEW_HXX
 
 #include "svtools/svtdllapi.h"
 #include <com/sun/star/uno/Sequence.h>
@@ -41,13 +41,13 @@
 
 // class SvtFileView -----------------------------------------------------
 
-#define FILEVIEW_ONLYFOLDER         0x0001
-#define FILEVIEW_MULTISELECTION     0x0002
+#define FILEVIEW_ONLYFOLDER			0x0001
+#define FILEVIEW_MULTISELECTION		0x0002
 
-#define FILEVIEW_SHOW_TITLE         0x0010
-#define FILEVIEW_SHOW_SIZE          0x0020
-#define FILEVIEW_SHOW_DATE          0x0040
-#define FILEVIEW_SHOW_ALL           0x0070
+#define FILEVIEW_SHOW_TITLE			0x0010
+#define FILEVIEW_SHOW_SIZE			0x0020
+#define FILEVIEW_SHOW_DATE			0x0040
+#define FILEVIEW_SHOW_ALL			0x0070
 
 class ViewTabListBox_Impl;
 class SvtFileView_Impl;
@@ -81,13 +81,13 @@ class SVT_DLLPUBLIC SvtFileView : public Control
 {
 private:
     SvtFileView_Impl*       mpImp;
-
+    
     ::com::sun::star::uno::Sequence< ::rtl::OUString > mpBlackList;
 
-    SVT_DLLPRIVATE void                 OpenFolder( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aContents );
+    SVT_DLLPRIVATE void					OpenFolder( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aContents );
 
-    DECL_DLLPRIVATE_LINK(               HeaderSelect_Impl, HeaderBar * );
-    DECL_DLLPRIVATE_LINK(               HeaderEndDrag_Impl, HeaderBar * );
+    DECL_DLLPRIVATE_LINK( 				HeaderSelect_Impl, HeaderBar * );
+    DECL_DLLPRIVATE_LINK( 				HeaderEndDrag_Impl, HeaderBar * );
 
 protected:
     virtual void GetFocus();
@@ -98,17 +98,17 @@ public:
     ~SvtFileView();
 
     const String&           GetViewURL() const;
-    String                  GetURL( SvLBoxEntry* pEntry ) const;
-    String                  GetCurrentURL() const;
+    String					GetURL( SvLBoxEntry* pEntry ) const;
+    String					GetCurrentURL() const;
 
-    sal_Bool                GetParentURL( String& _rParentURL ) const;
-    sal_Bool                CreateNewFolder( const String& rNewFolder );
+    sal_Bool				GetParentURL( String& _rParentURL ) const;
+    sal_Bool				CreateNewFolder( const String& rNewFolder );
 
-    void                    SetHelpId( sal_uInt32 nHelpId );
-    sal_uInt32              GetHelpId( ) const;
-    void                    SetSizePixel( const Size& rNewSize );
+    void					SetHelpId( sal_uInt32 nHelpId );
+    sal_uInt32				GetHelpId( ) const;
+    void					SetSizePixel( const Size& rNewSize );
     using Window::SetPosSizePixel;
-    virtual void            SetPosSizePixel( const Point& rNewPos, const Size& rNewSize );
+    virtual void			SetPosSizePixel( const Point& rNewPos, const Size& rNewSize );
 
     /** initialize the view with the content of a folder given by URL, and aply an immediate filter
 
@@ -140,7 +140,7 @@ public:
 
     /** initializes the view with the content of a folder given by an UCB content
     */
-    sal_Bool                Initialize( const ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XContent>& _xContent,
+    sal_Bool				Initialize( const ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XContent>& _xContent, 
                                         const String& rFilter );
 
     /** reads the current content of the current folder again, and applies the given filter to it
@@ -182,28 +182,28 @@ public:
                                 const FileViewAsyncAction* pAsyncDescriptor
                             );
 
-    void                    SetNoSelection();
-    void                    ResetCursor();
+    void					SetNoSelection();
+    void					ResetCursor();
 
-    void                    SetSelectHdl( const Link& rHdl );
-    void                    SetDoubleClickHdl( const Link& rHdl );
+    void					SetSelectHdl( const Link& rHdl );
+    void					SetDoubleClickHdl( const Link& rHdl );
     void                    SetOpenDoneHdl( const Link& rHdl );
 
-    ULONG                   GetSelectionCount() const;
-    SvLBoxEntry*            FirstSelected() const;
-    SvLBoxEntry*            NextSelected( SvLBoxEntry* pEntry ) const;
-    void                    EnableAutoResize();
-    void                    SetFocus();
+    ULONG           		GetSelectionCount() const;
+    SvLBoxEntry*			FirstSelected() const;
+    SvLBoxEntry*			NextSelected( SvLBoxEntry* pEntry ) const;
+    void					EnableAutoResize();
+    void					SetFocus();
 
     void                    EnableContextMenu( sal_Bool bEnable );
     void                    EnableDelete( sal_Bool bEnable );
-    void                    EnableNameReplacing( sal_Bool bEnable = sal_True );
+    void					EnableNameReplacing( sal_Bool bEnable = sal_True );
                                 // translate folder names or display doc-title instead of file name
                                 // EnableContextMenu( TRUE )/EnableDelete(TRUE) disable name replacing!
 
                             // save and load column size and sort order
     String                  GetConfigString() const;
-    void                    SetConfigString( const String& rCfgStr );
+    void					SetConfigString( const String& rCfgStr );
 
     void                    SetUrlFilter( const IUrlFilter* _pFilter );
     const IUrlFilter*       GetUrlFilter( ) const;
@@ -218,8 +218,8 @@ protected:
 
 struct SvtContentEntry
 {
-    sal_Bool    mbIsFolder;
-    UniString   maURL;
+    sal_Bool	mbIsFolder;
+    UniString	maURL;
 
     SvtContentEntry( const UniString& rURL, sal_Bool bIsFolder ) :
         mbIsFolder( bIsFolder ), maURL( rURL ) {}
diff --git a/svtools/inc/fltdefs.hxx b/svtools/inc/fltdefs.hxx
index 8ef3f2ab3740..f752397b04c8 100644
--- a/svtools/inc/fltdefs.hxx
+++ b/svtools/inc/fltdefs.hxx
@@ -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
@@ -36,20 +36,20 @@
 
 #if defined ( WIN ) || defined ( WNT )
 
-#define RGBQUAD RGBQUADWIN
+#define RGBQUAD	RGBQUADWIN
 
 typedef struct RGBQUAD
 {
-    BYTE    rgbBlue;
-    BYTE    rgbGreen;
-    BYTE    rgbRed;
-    BYTE    rgbReserved;
+    BYTE	rgbBlue;
+    BYTE	rgbGreen;
+    BYTE	rgbRed;
+    BYTE	rgbReserved;
 
             RGBQUAD( const BYTE cRed = 0, const BYTE cGreen = 0, const BYTE cBlue = 0 ) :
-                rgbBlue     ( cBlue ),
-                rgbGreen    ( cGreen ),
-                rgbRed      ( cRed ),
-                rgbReserved ( 0 ) {};
+                rgbBlue		( cBlue ),
+                rgbGreen	( cGreen ),
+                rgbRed		( cRed ),
+                rgbReserved	( 0 ) {};
 } RGBQUAD;
 
 
@@ -59,11 +59,11 @@ typedef BYTE huge* PDIBBYTE;
 #define GLOBALALLOC(nSize) ((PDIBBYTE)GlobalLock(GlobalAlloc(GHND,(nSize))))
 #define GLOBALHANDLE(pPointer) ((HGLOBAL)GlobalHandle((*((size_t*)&(pPointer)+1))))
 #define GLOBALFREE(pPointer) (GlobalUnlock(GLOBALHANDLE((pPointer))))
-#define MEMSET( pDst, cByte, nCount )   \
-{                                       \
-    PDIBBYTE pTmp = (PDIBBYTE) pDst;    \
+#define MEMSET( pDst, cByte, nCount )	\
+{										\
+    PDIBBYTE pTmp = (PDIBBYTE) pDst;	\
     for ( ULONG i = 0; i < nCount; i++ )\
-        *pTmp++ = cByte;                \
+        *pTmp++ = cByte;				\
 }
 
 #else
@@ -92,59 +92,59 @@ void ReadBitmap( SvStream& rIStream, Bitmap& rBmp, USHORT nDefaultHeight = 0, UL
 void ReplaceInfoHeader( SvStream& rStm, BYTE* pBuffer );
 
 #ifdef OS2
-#define RGBQUAD             RGBQUADOS2
-#define BITMAPFILEHEADER    BITMAPFILEHEADEROS2
-#define PBITMAPFILEHEADER   PBITMAPFILEHEADEROS2
-#define BITMAPINFOHEADER    BITMAPINFOHEADEROS2
-#define PBITMAPINFOHEADER   PBITMAPINFOHEADEROS2
-#define BITMAPINFO          BITMAPINFOOS2
-#define PBITMAPINFO         PBITMAPINFOOS2
+#define RGBQUAD				RGBQUADOS2
+#define BITMAPFILEHEADER	BITMAPFILEHEADEROS2
+#define PBITMAPFILEHEADER	PBITMAPFILEHEADEROS2
+#define BITMAPINFOHEADER	BITMAPINFOHEADEROS2
+#define PBITMAPINFOHEADER	PBITMAPINFOHEADEROS2
+#define BITMAPINFO			BITMAPINFOOS2
+#define PBITMAPINFO			PBITMAPINFOOS2
 #endif
 
 typedef struct RGBQUAD
 {
-    BYTE    rgbBlue;
-    BYTE    rgbGreen;
-    BYTE    rgbRed;
-    BYTE    rgbReserved;
+    BYTE	rgbBlue;
+    BYTE	rgbGreen;
+    BYTE	rgbRed;
+    BYTE	rgbReserved;
 
             RGBQUAD( const BYTE cRed = 0, const BYTE cGreen = 0, const BYTE cBlue = 0 ) :
-                rgbBlue     ( cBlue ),
-                rgbGreen    ( cGreen ),
-                rgbRed      ( cRed ),
-                rgbReserved ( 0 ) {};
+                rgbBlue		( cBlue ),
+                rgbGreen	( cGreen ),
+                rgbRed		( cRed ),
+                rgbReserved	( 0 ) {};
 } RGBQUAD;
 
 typedef struct BITMAPFILEHEADER
 {
-    UINT16  bfType;
-    UINT32  bfSize;
-    UINT16  bfReserved1;
-    UINT16  bfReserved2;
-    UINT32  bfOffBits;
+    UINT16	bfType;
+    UINT32	bfSize;
+    UINT16	bfReserved1;
+    UINT16	bfReserved2;
+    UINT32	bfOffBits;
 } BITMAPFILEHEADER;
 typedef BITMAPFILEHEADER* PBITMAPFILEHEADER;
 
 typedef struct BITMAPINFOHEADER
 {
-    UINT32  biSize;
-    UINT32  biWidth;
-    UINT32  biHeight;
-    UINT16  biPlanes;
-    UINT16  biBitCount;
-    UINT32  biCompression;
-    UINT32  biSizeImage;
-    UINT32  biXPelsPerMeter;
-    UINT32  biYPelsPerMeter;
-    UINT32  biClrUsed;
-    UINT32  biClrImportant;
+    UINT32	biSize;
+    UINT32	biWidth;
+    UINT32	biHeight;
+    UINT16	biPlanes;
+    UINT16	biBitCount;
+    UINT32	biCompression;
+    UINT32	biSizeImage;
+    UINT32	biXPelsPerMeter;
+    UINT32	biYPelsPerMeter;
+    UINT32	biClrUsed;
+    UINT32	biClrImportant;
 } BITMAPINFOHEADER;
 typedef BITMAPINFOHEADER* PBITMAPINFOHEADER;
 
 typedef struct BITMAPINFO
 {
-    BITMAPINFOHEADER    bmiHeader;
-    RGBQUAD             bmiColors[1];
+    BITMAPINFOHEADER	bmiHeader;
+    RGBQUAD				bmiColors[1];
 } BITMAPINFO;
 typedef BITMAPINFO* PBITMAPINFO;
 
diff --git a/svtools/inc/fontsubstconfig.hxx b/svtools/inc/fontsubstconfig.hxx
index 7bdb0dc412c3..d2047e7a9cd1 100644
--- a/svtools/inc/fontsubstconfig.hxx
+++ b/svtools/inc/fontsubstconfig.hxx
@@ -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
@@ -35,31 +35,31 @@ struct SvtFontSubstConfig_Impl;
 //-----------------------------------------------------------------------------
 struct SubstitutionStruct
 {
-    rtl::OUString   sFont;
-    rtl::OUString   sReplaceBy;
-    sal_Bool        bReplaceAlways;
-    sal_Bool        bReplaceOnScreenOnly;
+    rtl::OUString 	sFont;
+    rtl::OUString 	sReplaceBy;
+    sal_Bool		bReplaceAlways;
+    sal_Bool		bReplaceOnScreenOnly;
 };
 //-----------------------------------------------------------------------------
 class SVT_DLLPUBLIC SvtFontSubstConfig : public utl::ConfigItem
 {
-    sal_Bool                    bIsEnabled;
-    SvtFontSubstConfig_Impl*    pImpl;
+    sal_Bool					bIsEnabled;
+    SvtFontSubstConfig_Impl*	pImpl;
 public:
     SvtFontSubstConfig();
     virtual ~SvtFontSubstConfig();
 
-    virtual void            Commit();
+    virtual void			Commit();
     virtual void Notify( const com::sun::star::uno::Sequence< rtl::OUString >& _rPropertyNames);
 
-    sal_Bool                IsEnabled() const {return bIsEnabled;}
-    void                    Enable(sal_Bool bSet)  {bIsEnabled = bSet; SetModified();}
+    sal_Bool 				IsEnabled() const {return bIsEnabled;}
+    void	 				Enable(sal_Bool bSet)  {bIsEnabled = bSet; SetModified();}
 
-    sal_Int32                   SubstitutionCount() const;
-    void                        ClearSubstitutions();
-    const SubstitutionStruct*   GetSubstitution(sal_Int32 nPos);
-    void                        AddSubstitution(const SubstitutionStruct&   rToAdd);
-    void                        Apply();
+    sal_Int32					SubstitutionCount() const;
+    void						ClearSubstitutions();
+    const SubstitutionStruct*	GetSubstitution(sal_Int32 nPos);
+    void						AddSubstitution(const SubstitutionStruct&	rToAdd);
+    void						Apply();
 };
 
 #endif
diff --git a/svtools/inc/framestatuslistener.hxx b/svtools/inc/framestatuslistener.hxx
index fd068ac5f86b..9faec7852bb2 100644
--- a/svtools/inc/framestatuslistener.hxx
+++ b/svtools/inc/framestatuslistener.hxx
@@ -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
@@ -57,12 +57,12 @@ class SVT_DLLPUBLIC FrameStatusListener : public ::com::sun::star::frame::XStatu
         FrameStatusListener( const com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory >& rServiceManager,
                              const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& xFrame );
         virtual ~FrameStatusListener();
-
+        
         ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > getFrameInterface() const;
         ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > getServiceManager() const;
-
+        
         void updateStatus( const rtl::OUString aCommandURL );
-
+        
         // methods to support status forwarder, known by the old sfx2 toolbox controller implementation
         void addStatusListener( const rtl::OUString& aCommandURL );
         void removeStatusListener( const rtl::OUString& aCommandURL );
@@ -79,22 +79,22 @@ class SVT_DLLPUBLIC FrameStatusListener : public ::com::sun::star::frame::XStatu
         virtual void SAL_CALL dispose() throw (::com::sun::star::uno::RuntimeException);
         virtual void SAL_CALL addEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& xListener ) throw (::com::sun::star::uno::RuntimeException);
         virtual void SAL_CALL removeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& aListener ) throw (::com::sun::star::uno::RuntimeException);
-
+        
         // XEventListener
         virtual void SAL_CALL disposing( const com::sun::star::lang::EventObject& Source ) throw ( ::com::sun::star::uno::RuntimeException );
-
+        
         // XStatusListener
         virtual void SAL_CALL statusChanged( const ::com::sun::star::frame::FeatureStateEvent& Event ) throw ( ::com::sun::star::uno::RuntimeException ) = 0;
 
         // XFrameActionListener
         virtual void SAL_CALL frameAction( const com::sun::star::frame::FrameActionEvent& Action ) throw ( ::com::sun::star::uno::RuntimeException );
-
+    
     protected:
         struct Listener
         {
             Listener( const ::com::sun::star::util::URL& rURL, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch >& rDispatch ) :
                 aURL( rURL ), xDispatch( rDispatch ) {}
-
+            
             ::com::sun::star::util::URL aURL;
             ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch > xDispatch;
         };
@@ -103,7 +103,7 @@ class SVT_DLLPUBLIC FrameStatusListener : public ::com::sun::star::frame::XStatu
                                  com::sun::star::uno::Reference< com::sun::star::frame::XDispatch >,
                                  ::rtl::OUStringHash,
                                  ::std::equal_to< ::rtl::OUString > > URLToDispatchMap;
-
+        
         sal_Bool                                                                            m_bInitialized : 1,
                                                                                             m_bDisposed : 1;
         ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >                 m_xFrame;
diff --git a/svtools/inc/helpagentwindow.hxx b/svtools/inc/helpagentwindow.hxx
index 45b2917c500a..06328eaa7fbd 100644
--- a/svtools/inc/helpagentwindow.hxx
+++ b/svtools/inc/helpagentwindow.hxx
@@ -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
@@ -53,10 +53,10 @@ namespace svt
     class SVT_DLLPUBLIC HelpAgentWindow : public FloatingWindow
     {
     protected:
-        Window*                 m_pCloser;
-        IHelpAgentCallback*     m_pCallback;
-        Size                    m_aPreferredSize;
-        Image                   m_aPicture;
+        Window*					m_pCloser;
+        IHelpAgentCallback*		m_pCallback;
+        Size					m_aPreferredSize;
+        Image					m_aPicture;
 
     public:
         HelpAgentWindow( Window* _pParent );
@@ -66,8 +66,8 @@ namespace svt
         const Size& getPreferredSizePixel() const { return m_aPreferredSize; }
 
         // callback handler maintainance
-        void                setCallback(IHelpAgentCallback* _pCB) { m_pCallback = _pCB; }
-        IHelpAgentCallback* getCallback() const { return m_pCallback; }
+        void				setCallback(IHelpAgentCallback* _pCB) { m_pCallback = _pCB; }
+        IHelpAgentCallback*	getCallback() const { return m_pCallback; }
 
     protected:
         virtual void Resize();
@@ -77,12 +77,12 @@ namespace svt
         DECL_LINK( OnButtonClicked, Window* );
 
     private:
-        SVT_DLLPRIVATE Size implOptimalButtonSize( const Image& _rButtonImage );
+        SVT_DLLPRIVATE Size	implOptimalButtonSize( const Image& _rButtonImage );
     };
 
 //........................................................................
-}   // namespace svt
+}	// namespace svt
 //........................................................................
 
-#endif  // _SVTOOLS_HELPAGENTWIDNOW_HXX_
+#endif	// _SVTOOLS_HELPAGENTWIDNOW_HXX_
 
diff --git a/svtools/inc/htmlkywd.hxx b/svtools/inc/htmlkywd.hxx
index 13928eaeaa39..6737274662d2 100644
--- a/svtools/inc/htmlkywd.hxx
+++ b/svtools/inc/htmlkywd.hxx
@@ -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
diff --git a/svtools/inc/htmltokn.h b/svtools/inc/htmltokn.h
index 7c43c1463e25..074dbeeae238 100644
--- a/svtools/inc/htmltokn.h
+++ b/svtools/inc/htmltokn.h
@@ -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
@@ -49,13 +49,13 @@ int GetHTMLOption( const String& rName );
 SVT_DLLPUBLIC ULONG GetHTMLColor( const String& rName );
 
 // beginnen immer ab 256, groesser als ein char
-const int HTML_TOKEN_START      = 0x100;
-const int HTML_TOKEN_ONOFF      = 0x200;
-const int HTML_TOKEN_MICROSOFT  = 0x1000;
+const int HTML_TOKEN_START		= 0x100;
+const int HTML_TOKEN_ONOFF		= 0x200;
+const int HTML_TOKEN_MICROSOFT	= 0x1000;
 
 enum HTML_TOKEN_IDS
 {
-    HTML_TEXTTOKEN                      = HTML_TOKEN_START,
+    HTML_TEXTTOKEN						= HTML_TOKEN_START,
     HTML_SINGLECHAR,
     HTML_NEWPARA,
     HTML_TABCHAR,
@@ -67,22 +67,22 @@ enum HTML_TOKEN_IDS
     HTML_BASE, // HTML 3.0
     HTML_COMMENT,
     HTML_DOCTYPE,
-    HTML_EMBED, // Netscape 2.0            </EMBED> ignorieren
+    HTML_EMBED, // Netscape 2.0			   </EMBED> ignorieren
     HTML_FIGUREOVERLAY, // HTML 3.0
-    HTML_HORZRULE,                      // </HR> ignorieren
+    HTML_HORZRULE,						// </HR> ignorieren
     HTML_HORZTAB, // HTML 3.0
-    HTML_IMAGE,                         // </IMG> ignorieren
-    HTML_INPUT,                         // </INPUT> ignorieren
+    HTML_IMAGE,							// </IMG> ignorieren
+    HTML_INPUT,							// </INPUT> ignorieren
     HTML_ISINDEX, // HTML 3.0
-    HTML_LINEBREAK,                     // </BR> -> <BR>
+    HTML_LINEBREAK,						// </BR> -> <BR>
     HTML_LINK, // HTML 3.0
-    HTML_META, // HTML 3.0                 </META> ignorieren
+    HTML_META, // HTML 3.0				   </META> ignorieren
     HTML_NEXTID, // HTML 3.0
     HTML_OF, // HTML 3.0
-    HTML_OPTION,                        // </OPTION> ignorieren
+    HTML_OPTION,						// </OPTION> ignorieren
     HTML_PARAM, // HotJava
     HTML_RANGE, // HTML 3.0
-    HTML_SPACER, // Netscape 3.0b5      // </SPACER> ignorieren
+    HTML_SPACER, // Netscape 3.0b5		// </SPACER> ignorieren
     HTML_WBR, // Netscape
 
     // Tokens, die ueber HTML-Charakter erkannt werden
@@ -90,7 +90,7 @@ enum HTML_TOKEN_IDS
     HTML_SOFTHYPH,
 
     // diese werden wieder abgeschaltet,
-    //  der off-Wert liegt immer dahinter (+1) !!
+    //	der off-Wert liegt immer dahinter (+1) !!
     HTML_ABBREVIATION_ON = HTML_TOKEN_ONOFF, // HTML 3.0
     HTML_ABBREVIATION_OFF, // HTML 3.0
     HTML_ABOVE_ON, // HTML 3.0
@@ -249,8 +249,8 @@ enum HTML_TOKEN_IDS
     HTML_ROW_OFF, // HTML 3.0
     HTML_SAMPLE_ON,
     HTML_SAMPLE_OFF,
-    HTML_SCRIPT_ON, // HTML 3.2
-    HTML_SCRIPT_OFF,    // HTML 3.2
+    HTML_SCRIPT_ON,	// HTML 3.2
+    HTML_SCRIPT_OFF,	// HTML 3.2
     HTML_SELECT_ON,
     HTML_SELECT_OFF,
     HTML_SHORTQUOTE_ON, // HTML 3.0
@@ -337,14 +337,14 @@ enum HTML_TOKEN_IDS
 // HTML Attribut-Token (=Optionen)
 
 // beginnen immer ab 256, groesser als ein char
-const int HTML_OPTION_START = 0x100;
+const int HTML_OPTION_START	= 0x100;
 
 enum HTML_OPTION_IDS
 {
-HTML_OPTION_BOOL_START          = HTML_OPTION_START,
+HTML_OPTION_BOOL_START			= HTML_OPTION_START,
 
 // Attribute ohne Wert
-    HTML_O_BOX                  = HTML_OPTION_BOOL_START,
+    HTML_O_BOX					= HTML_OPTION_BOOL_START,
     HTML_O_CHECKED,
     HTML_O_COMPACT,
     HTML_O_CONTINUE,
@@ -367,8 +367,8 @@ HTML_OPTION_BOOL_START          = HTML_OPTION_START,
 HTML_OPTION_BOOL_END,
 
 // Attribute mit einem String als Wert
-HTML_OPTION_STRING_START        = HTML_OPTION_BOOL_END,
-    HTML_O_ABOVE                = HTML_OPTION_STRING_START,
+HTML_OPTION_STRING_START		= HTML_OPTION_BOOL_END,
+    HTML_O_ABOVE				= HTML_OPTION_STRING_START,
     HTML_O_ACCEPT,
     HTML_O_ACCESSKEY,
     HTML_O_ADD_DATE, // Netscape internal
@@ -410,8 +410,8 @@ HTML_OPTION_STRING_START        = HTML_OPTION_BOOL_END,
 HTML_OPTION_STRING_END,
 
 // Attribute mit einem SGML-Identifier als Wert
-HTML_OPTION_SGMLID_START        = HTML_OPTION_STRING_END,
-    HTML_O_FROM                 = HTML_OPTION_SGMLID_START,
+HTML_OPTION_SGMLID_START		= HTML_OPTION_STRING_END,
+    HTML_O_FROM					= HTML_OPTION_SGMLID_START,
     HTML_O_ID,
     HTML_O_TARGET, // Netscape 2.0
     HTML_O_TO,
@@ -419,8 +419,8 @@ HTML_OPTION_SGMLID_START        = HTML_OPTION_STRING_END,
 HTML_OPTION_SGMLID_END,
 
 // Attribute mit einem URI als Wert
-HTML_OPTION_URI_START           = HTML_OPTION_SGMLID_END,
-    HTML_O_ACTION               = HTML_OPTION_URI_START,
+HTML_OPTION_URI_START			= HTML_OPTION_SGMLID_END,
+    HTML_O_ACTION				= HTML_OPTION_URI_START,
     HTML_O_ARCHIVE,
     HTML_O_BACKGROUND,
     HTML_O_CLASSID,
@@ -437,14 +437,14 @@ HTML_OPTION_URI_START           = HTML_OPTION_SGMLID_END,
 HTML_OPTION_URI_END,
 
 // Attribute mit Entity-Namen als Wert
-HTML_OPTION_ENTITY_START        = HTML_OPTION_URI_END,
-    HTML_O_DINGBAT              = HTML_OPTION_ENTITY_START,
+HTML_OPTION_ENTITY_START		= HTML_OPTION_URI_END,
+    HTML_O_DINGBAT				= HTML_OPTION_ENTITY_START,
     HTML_O_SYM,
 HTML_OPTION_ENTITY_END,
 
 // Attribute mit einer Farbe als Wert (alle Netscape)
-HTML_OPTION_COLOR_START         = HTML_OPTION_ENTITY_END,
-    HTML_O_ALINK                = HTML_OPTION_COLOR_START,
+HTML_OPTION_COLOR_START			= HTML_OPTION_ENTITY_END,
+    HTML_O_ALINK				= HTML_OPTION_COLOR_START,
     HTML_O_BGCOLOR,
     HTML_O_BORDERCOLOR, // IExplorer 2.0
     HTML_O_BORDERCOLORLIGHT, // IExplorer 2.0
@@ -456,8 +456,8 @@ HTML_OPTION_COLOR_START         = HTML_OPTION_ENTITY_END,
 HTML_OPTION_COLOR_END,
 
 // Attribute mit einem numerischen Wert
-HTML_OPTION_NUMBER_START        = HTML_OPTION_COLOR_END,
-    HTML_O_BORDER               = HTML_OPTION_NUMBER_START,
+HTML_OPTION_NUMBER_START		= HTML_OPTION_COLOR_END,
+    HTML_O_BORDER				= HTML_OPTION_NUMBER_START,
     HTML_O_CELLSPACING, // HTML3 Table Model Draft
     HTML_O_CELLPADDING, // HTML3 Table Model Draft
     HTML_O_CHAROFF, // HTML3 Table Model Draft
@@ -466,7 +466,7 @@ HTML_OPTION_NUMBER_START        = HTML_OPTION_COLOR_END,
     HTML_O_GUTTER, // Netscape 3.0b5
     HTML_O_INDENT,
     HTML_O_HEIGHT,
-    HTML_O_HSPACE,          // Netscape
+    HTML_O_HSPACE,			// Netscape
     HTML_O_LEFT,
     HTML_O_LEFTMARGIN, // IExplorer 2.0
     HTML_O_LOOP, // IExplorer 2.0
@@ -487,7 +487,7 @@ HTML_OPTION_NUMBER_START        = HTML_OPTION_COLOR_END,
     HTML_O_TABINDEX,
     HTML_O_TOP,
     HTML_O_TOPMARGIN, // IExplorer 2.0
-    HTML_O_VSPACE,          // Netscape
+    HTML_O_VSPACE,			// Netscape
     HTML_O_WEIGHT,
     HTML_O_WIDTH,
     HTML_O_X,
@@ -496,8 +496,8 @@ HTML_OPTION_NUMBER_START        = HTML_OPTION_COLOR_END,
 HTML_OPTION_NUMBER_END,
 
 // Attribute mit Enum-Werten
-HTML_OPTION_ENUM_START          = HTML_OPTION_NUMBER_END,
-    HTML_O_BEHAVIOR             = HTML_OPTION_ENUM_START, // IExplorer 2.0
+HTML_OPTION_ENUM_START			= HTML_OPTION_NUMBER_END,
+    HTML_O_BEHAVIOR				= HTML_OPTION_ENUM_START, // IExplorer 2.0
     HTML_O_BGPROPERTIES, // IExplorer 2.0
     HTML_O_CLEAR,
     HTML_O_DIR,
@@ -521,39 +521,39 @@ HTML_OPTION_ENUM_START          = HTML_OPTION_NUMBER_END,
 HTML_OPTION_ENUM_END,
 
 // Attribute mit Script-Code als Wert
-HTML_OPTION_SCRIPT_START        = HTML_OPTION_ENUM_END,
-    HTML_O_ONABORT              = HTML_OPTION_SCRIPT_START, // JavaScaript
-    HTML_O_ONBLUR,      // JavaScript
-    HTML_O_ONCHANGE,    // JavaScript
-    HTML_O_ONCLICK,     // JavaScript
-    HTML_O_ONERROR,     // JavaScript
-    HTML_O_ONFOCUS,     // JavaScript
-    HTML_O_ONLOAD,      // JavaScript
-    HTML_O_ONMOUSEOUT,  // JavaScript
-    HTML_O_ONMOUSEOVER, // JavaScript
-    HTML_O_ONRESET,     // JavaScript
-    HTML_O_ONSELECT,    // JavaScript
-    HTML_O_ONSUBMIT,    // JavaScript
-    HTML_O_ONUNLOAD,    // JavaScript
-
-    HTML_O_SDONABORT,       // StarBasic
-    HTML_O_SDONBLUR,        // StarBasic
-    HTML_O_SDONCHANGE,      // StarBasic
-    HTML_O_SDONCLICK,       // StarBasic
-    HTML_O_SDONERROR,       // StarBasic
-    HTML_O_SDONFOCUS,       // StarBasic
-    HTML_O_SDONLOAD,        // StarBasic
-    HTML_O_SDONMOUSEOUT,    // StarBasic
-    HTML_O_SDONMOUSEOVER,   // StarBasic
-    HTML_O_SDONRESET,       // StarBasic
-    HTML_O_SDONSELECT,      // StarBasic
-    HTML_O_SDONSUBMIT,      // StarBasic
-    HTML_O_SDONUNLOAD,      // StarBasic
+HTML_OPTION_SCRIPT_START		= HTML_OPTION_ENUM_END,
+    HTML_O_ONABORT				= HTML_OPTION_SCRIPT_START, // JavaScaript
+    HTML_O_ONBLUR,		// JavaScript
+    HTML_O_ONCHANGE,	// JavaScript
+    HTML_O_ONCLICK,		// JavaScript
+    HTML_O_ONERROR,		// JavaScript
+    HTML_O_ONFOCUS,		// JavaScript
+    HTML_O_ONLOAD,		// JavaScript
+    HTML_O_ONMOUSEOUT,	// JavaScript
+    HTML_O_ONMOUSEOVER,	// JavaScript
+    HTML_O_ONRESET,		// JavaScript
+    HTML_O_ONSELECT,	// JavaScript
+    HTML_O_ONSUBMIT,	// JavaScript
+    HTML_O_ONUNLOAD,	// JavaScript
+
+    HTML_O_SDONABORT, 		// StarBasic
+    HTML_O_SDONBLUR,		// StarBasic
+    HTML_O_SDONCHANGE, 		// StarBasic
+    HTML_O_SDONCLICK, 		// StarBasic
+    HTML_O_SDONERROR, 		// StarBasic
+    HTML_O_SDONFOCUS, 		// StarBasic
+    HTML_O_SDONLOAD, 		// StarBasic
+    HTML_O_SDONMOUSEOUT,	// StarBasic
+    HTML_O_SDONMOUSEOVER, 	// StarBasic
+    HTML_O_SDONRESET,		// StarBasic
+    HTML_O_SDONSELECT, 		// StarBasic
+    HTML_O_SDONSUBMIT, 		// StarBasic
+    HTML_O_SDONUNLOAD, 		// StarBasic
 HTML_OPTION_SCRIPT_END,
 
 // Attribute mit Kontext-abhaengigen Werten
-HTML_OPTION_CONTEXT_START       = HTML_OPTION_SCRIPT_END,
-    HTML_O_ALIGN                = HTML_OPTION_CONTEXT_START,
+HTML_OPTION_CONTEXT_START		= HTML_OPTION_SCRIPT_END,
+    HTML_O_ALIGN				= HTML_OPTION_CONTEXT_START,
     HTML_O_COLS, // Netscape 2.0 vs HTML 2.0
     HTML_O_ROWS, // Netscape 2.0 vs HTML 2.0
     HTML_O_SIZE,
@@ -562,8 +562,8 @@ HTML_OPTION_CONTEXT_START       = HTML_OPTION_SCRIPT_END,
 HTML_OPTION_CONTEXT_END,
 
 // eine unbekannte Option
-HTML_O_UNKNOWN                  = HTML_OPTION_CONTEXT_END,
+HTML_O_UNKNOWN 					= HTML_OPTION_CONTEXT_END,
 HTML_OPTION_END
 };
 
-#endif  // _HTMLTOKN_H
+#endif	// _HTMLTOKN_H
diff --git a/svtools/inc/imagemgr.hrc b/svtools/inc/imagemgr.hrc
index 19cc2942d6f4..0354d8d3fc9e 100644
--- a/svtools/inc/imagemgr.hrc
+++ b/svtools/inc/imagemgr.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
@@ -100,8 +100,8 @@
 #define IMG_RELATION                    (IMAGELIST_START + 163)
 #define IMG_IMPRESSPACKED               (IMAGELIST_START + 165)
 #define IMG_NEWFROMTEMPLATE             (IMAGELIST_START + 166)
-#define IMG_POWERPOINT                  (IMAGELIST_START + 167)
-#define IMG_POWERPOINTTEMPLATE          (IMAGELIST_START + 168)
+#define IMG_POWERPOINT					(IMAGELIST_START + 167)
+#define IMG_POWERPOINTTEMPLATE			(IMAGELIST_START + 168)
 #define IMG_OO_DATABASE_DOC             (IMAGELIST_START + 169)
 #define IMG_OO_DRAW_DOC                 (IMAGELIST_START + 170)
 #define IMG_OO_MATH_DOC                 (IMAGELIST_START + 171)
@@ -156,13 +156,13 @@
 #define STR_DESCRIPTION_DRAW_TEMPLATE               (RID_DESCRIPTION_START + 36)
 #define STR_DESCRIPTION_IMPRESS_TEMPLATE            (RID_DESCRIPTION_START + 37)
 #define STR_DESCRIPTION_WRITER_TEMPLATE             (RID_DESCRIPTION_START + 38)
-#define STR_DESCRIPTION_LOCALE_VOLUME               (RID_DESCRIPTION_START + 39)
-#define STR_DESCRIPTION_FLOPPY_VOLUME               (RID_DESCRIPTION_START + 40)
+#define STR_DESCRIPTION_LOCALE_VOLUME              	(RID_DESCRIPTION_START + 39)
+#define STR_DESCRIPTION_FLOPPY_VOLUME          		(RID_DESCRIPTION_START + 40)
 #define STR_DESCRIPTION_CDROM_VOLUME                (RID_DESCRIPTION_START + 41)
 #define STR_DESCRIPTION_REMOTE_VOLUME               (RID_DESCRIPTION_START + 42)
-#define STR_DESCRIPTION_POWERPOINT                  (RID_DESCRIPTION_START + 43)
-#define STR_DESCRIPTION_POWERPOINT_TEMPLATE         (RID_DESCRIPTION_START + 44)
-#define STR_DESCRIPTION_POWERPOINT_SHOW             (RID_DESCRIPTION_START + 45)
+#define STR_DESCRIPTION_POWERPOINT					(RID_DESCRIPTION_START + 43)
+#define STR_DESCRIPTION_POWERPOINT_TEMPLATE			(RID_DESCRIPTION_START + 44)
+#define STR_DESCRIPTION_POWERPOINT_SHOW				(RID_DESCRIPTION_START + 45)
 #define STR_DESCRIPTION_SXMATH_DOC                  (RID_DESCRIPTION_START + 46)
 #define STR_DESCRIPTION_SXCHART_DOC                 (RID_DESCRIPTION_START + 47)
 #define STR_DESCRIPTION_SXDRAW_DOC                  (RID_DESCRIPTION_START + 48)
diff --git a/svtools/inc/imagemgr.hxx b/svtools/inc/imagemgr.hxx
index efd15c5f4cde..2bd1bd5318d1 100644
--- a/svtools/inc/imagemgr.hxx
+++ b/svtools/inc/imagemgr.hxx
@@ -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
@@ -41,17 +41,17 @@ namespace svtools {
 
 struct VolumeInfo
 {
-    sal_Bool    m_bIsVolume;
-    sal_Bool    m_bIsRemote;
-    sal_Bool    m_bIsRemoveable;
-    sal_Bool    m_bIsFloppy;
-    sal_Bool    m_bIsCompactDisc;
+    sal_Bool	m_bIsVolume;
+    sal_Bool	m_bIsRemote;
+    sal_Bool	m_bIsRemoveable;
+    sal_Bool	m_bIsFloppy;
+    sal_Bool	m_bIsCompactDisc;
 
     VolumeInfo() :
-        m_bIsVolume     ( sal_False ),
-        m_bIsRemote     ( sal_False ),
-        m_bIsRemoveable ( sal_False ),
-        m_bIsFloppy     ( sal_False ),
+        m_bIsVolume		( sal_False ),
+        m_bIsRemote		( sal_False ),
+        m_bIsRemoveable	( sal_False ),
+        m_bIsFloppy		( sal_False ),
         m_bIsCompactDisc( sal_False ) {}
 
     VolumeInfo( sal_Bool _bIsVolume,
@@ -59,10 +59,10 @@ struct VolumeInfo
                 sal_Bool _bIsRemoveable,
                 sal_Bool _bIsFloppy,
                 sal_Bool _bIsCompactDisc ) :
-        m_bIsVolume     ( _bIsVolume ),
-        m_bIsRemote     ( _bIsRemote ),
-        m_bIsRemoveable ( _bIsRemoveable ),
-        m_bIsFloppy     ( _bIsFloppy ),
+        m_bIsVolume		( _bIsVolume ),
+        m_bIsRemote		( _bIsRemote ),
+        m_bIsRemoveable	( _bIsRemoveable ),
+        m_bIsFloppy		( _bIsFloppy ),
         m_bIsCompactDisc( _bIsCompactDisc ) {}
 };
 
@@ -71,24 +71,24 @@ struct VolumeInfo
 class SvFileInformationManager
 {
 private:
-    SVT_DLLPRIVATE static String    GetDescription_Impl( const INetURLObject& rObject, sal_Bool bDetectFolder );
+    SVT_DLLPRIVATE static String	GetDescription_Impl( const INetURLObject& rObject, sal_Bool bDetectFolder );
 
 public:
     // depricated, because no high contrast mode
-    SVT_DLLPUBLIC static Image  GetImage( const INetURLObject& rURL, sal_Bool bBig = sal_False );
-    static Image    GetFileImage( const INetURLObject& rURL, sal_Bool bBig = sal_False );
-    static Image    GetImageNoDefault( const INetURLObject& rURL, sal_Bool bBig = sal_False );
-    SVT_DLLPUBLIC static Image  GetFolderImage( const svtools::VolumeInfo& rInfo, sal_Bool bBig = sal_False );
+    SVT_DLLPUBLIC static Image	GetImage( const INetURLObject& rURL, sal_Bool bBig = sal_False );
+    static Image	GetFileImage( const INetURLObject& rURL, sal_Bool bBig = sal_False );
+    static Image	GetImageNoDefault( const INetURLObject& rURL, sal_Bool bBig = sal_False );
+    SVT_DLLPUBLIC static Image	GetFolderImage( const svtools::VolumeInfo& rInfo, sal_Bool bBig = sal_False );
 
     // now with high contrast mode
-    SVT_DLLPUBLIC static Image  GetImage( const INetURLObject& rURL, sal_Bool bBig, sal_Bool bHighContrast );
-    SVT_DLLPUBLIC static Image  GetFileImage( const INetURLObject& rURL, sal_Bool bBig, sal_Bool bHighContrast );
-    SVT_DLLPUBLIC static Image  GetImageNoDefault( const INetURLObject& rURL, sal_Bool bBig, sal_Bool bHighContrast );
-    SVT_DLLPUBLIC static Image  GetFolderImage( const svtools::VolumeInfo& rInfo, sal_Bool bBig, sal_Bool bHighContrast );
+    SVT_DLLPUBLIC static Image	GetImage( const INetURLObject& rURL, sal_Bool bBig, sal_Bool bHighContrast );
+    SVT_DLLPUBLIC static Image	GetFileImage( const INetURLObject& rURL, sal_Bool bBig, sal_Bool bHighContrast );
+    SVT_DLLPUBLIC static Image	GetImageNoDefault( const INetURLObject& rURL, sal_Bool bBig, sal_Bool bHighContrast );
+    SVT_DLLPUBLIC static Image	GetFolderImage( const svtools::VolumeInfo& rInfo, sal_Bool bBig, sal_Bool bHighContrast );
 
-    SVT_DLLPUBLIC static String GetDescription( const INetURLObject& rObject );
-    SVT_DLLPUBLIC static String GetFileDescription( const INetURLObject& rObject );
-    SVT_DLLPUBLIC static String GetFolderDescription( const svtools::VolumeInfo& rInfo );
+    SVT_DLLPUBLIC static String	GetDescription( const INetURLObject& rObject );
+    SVT_DLLPUBLIC static String	GetFileDescription( const INetURLObject& rObject );
+    SVT_DLLPUBLIC static String	GetFolderDescription( const svtools::VolumeInfo& rInfo );
 };
 
 #endif
diff --git a/svtools/inc/imageresourceaccess.hxx b/svtools/inc/imageresourceaccess.hxx
index d77b1c97a512..8d3d385f82cb 100644
--- a/svtools/inc/imageresourceaccess.hxx
+++ b/svtools/inc/imageresourceaccess.hxx
@@ -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
diff --git a/svtools/inc/imgdef.hxx b/svtools/inc/imgdef.hxx
index 7cdcec0fd642..4b137ef50bae 100644
--- a/svtools/inc/imgdef.hxx
+++ b/svtools/inc/imgdef.hxx
@@ -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
@@ -35,9 +35,9 @@ enum SfxSymbolsSize
     SFX_SYMBOLS_SIZE_AUTO
 };
 
-#define SFX_TOOLBOX_CHANGESYMBOLSET     0x0001
-#define SFX_TOOLBOX_CHANGEOUTSTYLE      0x0002
-#define SFX_TOOLBOX_CHANGEBUTTONTYPE    0x0004
+#define SFX_TOOLBOX_CHANGESYMBOLSET		0x0001
+#define SFX_TOOLBOX_CHANGEOUTSTYLE  	0x0002
+#define SFX_TOOLBOX_CHANGEBUTTONTYPE	0x0004
 
 #endif // _SVTOOLS_IMGDEF_HXX
 
diff --git a/svtools/inc/indexentryres.hxx b/svtools/inc/indexentryres.hxx
index f2c73000ed67..961ec04776ef 100644
--- a/svtools/inc/indexentryres.hxx
+++ b/svtools/inc/indexentryres.hxx
@@ -7,7 +7,7 @@
 
 class IndexEntryRessourceData;
 
-class SVT_DLLPUBLIC IndexEntryRessource
+class SVT_DLLPUBLIC IndexEntryRessource 
 {
     private:
         IndexEntryRessourceData  *mp_Data;
diff --git a/svtools/inc/inetimg.hxx b/svtools/inc/inetimg.hxx
index 924bbad831d6..1ddc851d9d71 100644
--- a/svtools/inc/inetimg.hxx
+++ b/svtools/inc/inetimg.hxx
@@ -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
@@ -38,21 +38,21 @@ class SotDataMemberObject;
 
 class INetImage
 {
-    String          aImageURL;
-    String          aTargetURL;
-    String          aTargetFrame;
-    String          aAlternateText;
-    Size            aSizePixel;
+    String			aImageURL;
+    String			aTargetURL;
+    String			aTargetFrame;
+    String			aAlternateText;
+    Size			aSizePixel;
 
 protected:
-    String          CopyExchange() const;
-    void            PasteExchange( const String& rString );
+    String			CopyExchange() const;
+    void			PasteExchange( const String& rString );
 
-    void            SetImageURL( const String& rS )     { aImageURL = rS; }
-    void            SetTargetURL( const String& rS )    { aTargetURL = rS; }
-    void            SetTargetFrame( const String& rS )  { aTargetFrame = rS; }
-    void            SetAlternateText( const String& rS ){ aAlternateText = rS; }
-    void            SetSizePixel( const Size& rSize )   { aSizePixel = rSize; }
+    void 			SetImageURL( const String& rS )		{ aImageURL = rS; }
+    void 			SetTargetURL( const String& rS )	{ aTargetURL = rS; }
+    void 			SetTargetFrame( const String& rS )	{ aTargetFrame = rS; }
+    void 			SetAlternateText( const String& rS ){ aAlternateText = rS; }
+    void			SetSizePixel( const Size& rSize ) 	{ aSizePixel = rSize; }
 
 public:
                     INetImage(
@@ -61,7 +61,7 @@ public:
                         const String& rTargetFrame,
                         const String& rAlternateText,
                         const Size& rSizePixel )
-                    :   aImageURL( rImageURL ),
+                    :	aImageURL( rImageURL ),
                         aTargetURL( rTargetURL ),
                         aTargetFrame( rTargetFrame ),
                         aAlternateText( rAlternateText ),
@@ -70,11 +70,11 @@ public:
                     INetImage()
                     {}
 
-    const String&   GetImageURL() const { return aImageURL; }
-    const String&   GetTargetURL() const { return aTargetURL; }
-    const String&   GetTargetFrame() const { return aTargetFrame; }
-    const String&   GetAlternateText() const { return aAlternateText; }
-    const Size&     GetSizePixel() const { return aSizePixel; }
+    const String&	GetImageURL() const { return aImageURL; }
+    const String&	GetTargetURL() const { return aTargetURL; }
+    const String&	GetTargetFrame() const { return aTargetFrame; }
+    const String&	GetAlternateText() const { return aAlternateText; }
+    const Size&		GetSizePixel() const { return aSizePixel; }
 
     // Im-/Export
     sal_Bool Write( SvStream& rOStm, ULONG nFormat ) const;
diff --git a/svtools/inc/itemdel.hxx b/svtools/inc/itemdel.hxx
index 51af97730079..fa1df062e1d9 100644
--- a/svtools/inc/itemdel.hxx
+++ b/svtools/inc/itemdel.hxx
@@ -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
diff --git a/svtools/inc/ivctrl.hxx b/svtools/inc/ivctrl.hxx
index 5bea4675b62e..b57bdf032c1a 100644
--- a/svtools/inc/ivctrl.hxx
+++ b/svtools/inc/ivctrl.hxx
@@ -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
@@ -41,31 +41,31 @@ class Point;
 class SvxIconChoiceCtrl_Impl;
 class Image;
 
-#define ICNVIEW_FLAG_POS_LOCKED     0x0001
-#define ICNVIEW_FLAG_SELECTED       0x0002
-#define ICNVIEW_FLAG_FOCUSED        0x0004
-#define ICNVIEW_FLAG_IN_USE         0x0008
-#define ICNVIEW_FLAG_CURSORED       0x0010 // Rahmen um Image
-#define ICNVIEW_FLAG_POS_MOVED      0x0020 // per D&D verschoben aber nicht gelockt
-#define ICNVIEW_FLAG_DROP_TARGET    0x0040 // im QueryDrop gesetzt
-#define ICNVIEW_FLAG_BLOCK_EMPHASIS 0x0080 // Emphasis nicht painten
-#define ICNVIEW_FLAG_USER1          0x0100
-#define ICNVIEW_FLAG_USER2          0x0200
-#define ICNVIEW_FLAG_PRED_SET       0x0400 // Predecessor wurde umgesetzt
+#define ICNVIEW_FLAG_POS_LOCKED		0x0001
+#define ICNVIEW_FLAG_SELECTED		0x0002
+#define ICNVIEW_FLAG_FOCUSED		0x0004
+#define ICNVIEW_FLAG_IN_USE			0x0008
+#define ICNVIEW_FLAG_CURSORED	   	0x0010 // Rahmen um Image
+#define ICNVIEW_FLAG_POS_MOVED   	0x0020 // per D&D verschoben aber nicht gelockt
+#define ICNVIEW_FLAG_DROP_TARGET	0x0040 // im QueryDrop gesetzt
+#define ICNVIEW_FLAG_BLOCK_EMPHASIS	0x0080 // Emphasis nicht painten
+#define ICNVIEW_FLAG_USER1			0x0100
+#define ICNVIEW_FLAG_USER2			0x0200
+#define ICNVIEW_FLAG_PRED_SET		0x0400 // Predecessor wurde umgesetzt
 
 enum SvxIconChoiceCtrlTextMode
 {
-    IcnShowTextFull = 1,        // BoundRect nach unten aufplustern
-    IcnShowTextShort,           // Abkuerzung mit "..."
-    IcnShowTextSmart,           // Text komplett anzeigen, wenn moeglich (n.i.)
-    IcnShowTextDontKnow         // Einstellung der View
+    IcnShowTextFull = 1,		// BoundRect nach unten aufplustern
+    IcnShowTextShort,      		// Abkuerzung mit "..."
+    IcnShowTextSmart,			// Text komplett anzeigen, wenn moeglich (n.i.)
+    IcnShowTextDontKnow			// Einstellung der View
 };
 
 enum SvxIconChoiceCtrlPositionMode
 {
-    IcnViewPositionModeFree = 0,                // freies pixelgenaues Positionieren
+    IcnViewPositionModeFree = 0,			    // freies pixelgenaues Positionieren
     IcnViewPositionModeAutoArrange = 1,         // automatisches Ausrichten
-    IcnViewPositionModeAutoAdjust = 2,          // automatisches Anordnen
+    IcnViewPositionModeAutoAdjust = 2,   		// automatisches Anordnen
     IcnViewPositionModeLast = IcnViewPositionModeAutoAdjust
 };
 
@@ -83,35 +83,35 @@ class SvxIconChoiceCtrlEntry
     friend class EntryList_Impl;
     friend class IcnGridMap_Impl;
 
-    Rectangle               aRect;              // Bounding-Rect des Entries
-    Rectangle               aGridRect;          // nur gesetzt im Grid-Modus
-    ULONG                   nPos;
+    Rectangle 				aRect;				// Bounding-Rect des Entries
+    Rectangle 				aGridRect;			// nur gesetzt im Grid-Modus
+    ULONG					nPos;
 
     // die Eintragsposition in der Eintragsliste entspricht der beim Insert vorgegebenen
     // [Sortier-]Reihenfolge (->Reihenfolge der Anker in der Ankerliste!). Im AutoArrange-Modus
     // kann die sichtbare Reihenfolge aber anders sein. Die Eintraege werden deshalb dann
     // verkettet
-    SvxIconChoiceCtrlEntry*         pblink;     // backward (linker Nachbar)
-    SvxIconChoiceCtrlEntry*         pflink;     // forward  (rechter Nachbar)
+    SvxIconChoiceCtrlEntry*			pblink;		// backward (linker Nachbar)
+    SvxIconChoiceCtrlEntry*			pflink;     // forward  (rechter Nachbar)
 
-    SvxIconChoiceCtrlTextMode       eTextMode;
-    USHORT                  nX,nY;      // fuer Tastatursteuerung
-    USHORT                  nFlags;
+    SvxIconChoiceCtrlTextMode 		eTextMode;
+    USHORT 					nX,nY;		// fuer Tastatursteuerung
+    USHORT					nFlags;
 
-    void                    ClearFlags( USHORT nMask ) { nFlags &= (~nMask); }
-    void                    SetFlags( USHORT nMask ) { nFlags |= nMask; }
-    void                    AssignFlags( USHORT _nFlags ) { nFlags = _nFlags; }
+    void					ClearFlags( USHORT nMask ) { nFlags &= (~nMask); }
+    void					SetFlags( USHORT nMask ) { nFlags |= nMask; }
+    void					AssignFlags( USHORT _nFlags ) { nFlags = _nFlags; }
 
     // setzt den linken Nachbarn (A <-> B  ==>  A <-> this <-> B)
-    void                    SetBacklink( SvxIconChoiceCtrlEntry* pA )
+    void					SetBacklink( SvxIconChoiceCtrlEntry* pA )
                             {
-                                pA->pflink->pblink = this;      // X <- B
-                                this->pflink = pA->pflink;      // X -> B
-                                this->pblink = pA;              // A <- X
-                                pA->pflink = this;              // A -> X
+                                pA->pflink->pblink = this;  	// X <- B
+                                this->pflink = pA->pflink; 		// X -> B
+                                this->pblink = pA;  			// A <- X
+                                pA->pflink = this;  			// A -> X
                             }
     // loest eine Verbindung (A <-> this <-> B  ==>  A <-> B)
-    void                    Unlink()
+    void					Unlink()
                             {
                                 this->pblink->pflink = this->pflink;
                                 this->pflink->pblink = this->pblink;
@@ -125,40 +125,40 @@ public:
                             SvxIconChoiceCtrlEntry( const String& rText, const Image& rImage, const Image& rImageHC, USHORT nFlags = 0 );
                             ~SvxIconChoiceCtrlEntry () {}
 
-    void                    SetImage ( const Image& rImage ) { aImage = rImage; }
-    void                    SetImageHC ( const Image& rImage ) { aImageHC = rImage; }
-    Image                   GetImage () const { return aImage; }
-    Image                   GetImageHC () const { return aImageHC; }
-    void                    SetText ( const String& rText ) { aText = rText; }
-    String                  GetText () const { return aText; }
+    void					SetImage ( const Image& rImage ) { aImage = rImage; }
+    void					SetImageHC ( const Image& rImage ) { aImageHC = rImage; }
+    Image					GetImage () const { return aImage; }
+    Image					GetImageHC () const { return aImageHC; }
+    void					SetText ( const String& rText ) { aText = rText; }
+    String					GetText () const { return aText; }
     String SVT_DLLPUBLIC                    GetDisplayText() const;
-    void                    SetQuickHelpText( const String& rText ) { aQuickHelpText = rText; }
-    String                  GetQuickHelpText() const { return aQuickHelpText; }
-    void                    SetUserData ( void* _pUserData ) { pUserData = _pUserData; }
-    void*                   GetUserData () { return pUserData; }
+    void					SetQuickHelpText( const String& rText ) { aQuickHelpText = rText; }
+    String					GetQuickHelpText() const { return aQuickHelpText; }
+    void					SetUserData ( void* _pUserData ) { pUserData = _pUserData; }
+    void*					GetUserData () { return pUserData; }
 
     const Rectangle &       GetBoundRect() const { return aRect; }
 
-    void                    SetFocus ( BOOL bSet )
+    void					SetFocus ( BOOL bSet )
                                      { nFlags = ( bSet ? nFlags | ICNVIEW_FLAG_FOCUSED : nFlags & ~ICNVIEW_FLAG_FOCUSED ); }
 
-    SvxIconChoiceCtrlTextMode       GetTextMode() const { return eTextMode; }
-    USHORT                  GetFlags() const { return nFlags; }
-    BOOL                    IsSelected() const { return (BOOL)((nFlags & ICNVIEW_FLAG_SELECTED) !=0); }
-    BOOL                    IsFocused() const { return (BOOL)((nFlags & ICNVIEW_FLAG_FOCUSED) !=0); }
-    BOOL                    IsInUse() const { return (BOOL)((nFlags & ICNVIEW_FLAG_IN_USE) !=0); }
-    BOOL                    IsCursored() const { return (BOOL)((nFlags & ICNVIEW_FLAG_CURSORED) !=0); }
-    BOOL                    IsDropTarget() const { return (BOOL)((nFlags & ICNVIEW_FLAG_DROP_TARGET) !=0); }
-    BOOL                    IsBlockingEmphasis() const { return (BOOL)((nFlags & ICNVIEW_FLAG_BLOCK_EMPHASIS) !=0); }
-    BOOL                    WasMoved() const { return (BOOL)((nFlags & ICNVIEW_FLAG_POS_MOVED) !=0); }
-    void                    SetMoved( BOOL bMoved );
-    BOOL                    IsPosLocked() const { return (BOOL)((nFlags & ICNVIEW_FLAG_POS_LOCKED) !=0); }
-    void                    LockPos( BOOL bLock );
+    SvxIconChoiceCtrlTextMode 		GetTextMode() const { return eTextMode; }
+    USHORT					GetFlags() const { return nFlags; }
+    BOOL					IsSelected() const { return (BOOL)((nFlags & ICNVIEW_FLAG_SELECTED) !=0); }
+    BOOL					IsFocused() const { return (BOOL)((nFlags & ICNVIEW_FLAG_FOCUSED) !=0); }
+    BOOL					IsInUse() const { return (BOOL)((nFlags & ICNVIEW_FLAG_IN_USE) !=0); }
+    BOOL					IsCursored() const { return (BOOL)((nFlags & ICNVIEW_FLAG_CURSORED) !=0); }
+    BOOL					IsDropTarget() const { return (BOOL)((nFlags & ICNVIEW_FLAG_DROP_TARGET) !=0); }
+    BOOL					IsBlockingEmphasis() const { return (BOOL)((nFlags & ICNVIEW_FLAG_BLOCK_EMPHASIS) !=0); }
+    BOOL					WasMoved() const { return (BOOL)((nFlags & ICNVIEW_FLAG_POS_MOVED) !=0); }
+    void					SetMoved( BOOL bMoved );
+    BOOL					IsPosLocked() const { return (BOOL)((nFlags & ICNVIEW_FLAG_POS_LOCKED) !=0); }
+    void					LockPos( BOOL bLock );
     // Nur bei AutoArrange gesetzt. Den Kopf der Liste gibts per SvxIconChoiceCtrl::GetPredecessorHead
-    SvxIconChoiceCtrlEntry*         GetSuccessor() const { return pflink; }
-    SvxIconChoiceCtrlEntry*         GetPredecessor() const { return pblink; }
+    SvxIconChoiceCtrlEntry*			GetSuccessor() const { return pflink; }
+    SvxIconChoiceCtrlEntry*			GetPredecessor() const { return pblink; }
 
-//  sal_Unicode             GetMnemonicChar() const;
+//	sal_Unicode				GetMnemonicChar() const;
 };
 
 enum SvxIconChoiceCtrlColumnAlign
@@ -170,11 +170,11 @@ enum SvxIconChoiceCtrlColumnAlign
 
 class SvxIconChoiceCtrlColumnInfo
 {
-    String                  aColText;
-    Image                   aColImage;
-    long                    nWidth;
-    SvxIconChoiceCtrlColumnAlign    eAlignment;
-    USHORT                  nSubItem;
+    String					aColText;
+    Image					aColImage;
+    long					nWidth;
+    SvxIconChoiceCtrlColumnAlign	eAlignment;
+    USHORT 					nSubItem;
 
 public:
                             SvxIconChoiceCtrlColumnInfo( USHORT nSub, long nWd,
@@ -182,53 +182,53 @@ public:
                                 nWidth( nWd ), eAlignment( eAlign ), nSubItem( nSub ) {}
                             SvxIconChoiceCtrlColumnInfo( const SvxIconChoiceCtrlColumnInfo& );
 
-    void                    SetText( const String& rText ) { aColText = rText; }
-    void                    SetImage( const Image& rImg ) { aColImage = rImg; }
-    void                    SetWidth( long nWd ) { nWidth = nWd; }
-    void                    SetAlignment( SvxIconChoiceCtrlColumnAlign eAlign ) { eAlignment = eAlign; }
-    void                    SetSubItem( USHORT nSub) { nSubItem = nSub; }
-
-    const String&           GetText() const { return aColText; }
-    const Image&            GetImage() const { return aColImage; }
-    long                    GetWidth() const { return nWidth; }
-    SvxIconChoiceCtrlColumnAlign    GetAlignment() const { return eAlignment; }
-    USHORT                  GetSubItem() const { return nSubItem; }
+    void					SetText( const String& rText ) { aColText = rText; }
+    void					SetImage( const Image& rImg ) { aColImage = rImg; }
+    void					SetWidth( long nWd ) { nWidth = nWd; }
+    void					SetAlignment( SvxIconChoiceCtrlColumnAlign eAlign ) { eAlignment = eAlign; }
+    void					SetSubItem( USHORT nSub) { nSubItem = nSub; }
+
+    const String& 			GetText() const { return aColText; }
+    const Image&			GetImage() const { return aColImage; }
+    long					GetWidth() const { return nWidth; }
+    SvxIconChoiceCtrlColumnAlign	GetAlignment() const { return eAlignment; }
+    USHORT					GetSubItem() const { return nSubItem; }
 };
 
 //###################################################################################################################################
 /*
     Window-Bits:
-        WB_ICON             // Text unter dem Icon
-        WB_SMALL_ICON       // Text rechts neben Icon, beliebige Positionierung
-        WB_DETAILS          // Text rechts neben Icon, eingeschraenkte Posit.
+        WB_ICON				// Text unter dem Icon
+        WB_SMALL_ICON		// Text rechts neben Icon, beliebige Positionierung
+        WB_DETAILS			// Text rechts neben Icon, eingeschraenkte Posit.
         WB_BORDER
-        WB_NOHIDESELECTION  // Selektion inaktiv zeichnen, wenn kein Fokus
+        WB_NOHIDESELECTION	// Selektion inaktiv zeichnen, wenn kein Fokus
         WB_NOHSCROLL
         WB_NOVSCROLL
         WB_NOSELECTION
-        WB_SMART_ARRANGE    // im Arrange die Vis-Area beibehalten
-        WB_ALIGN_TOP        // Anordnung zeilenweise von links nach rechts
-        WB_ALIGN_LEFT       // Anordnung spaltenweise von oben nach unten
-        WB_NODRAGSELECTION  // Keine Selektion per Tracking-Rect
-        WB_NOCOLUMNHEADER   // keine Headerbar in Detailsview (Headerbar not implemented)
-        WB_NOPOINTERFOCUS   // Kein GrabFocus im MouseButtonDown
-        WB_HIGHLIGHTFRAME   // der unter der Maus befindliche Eintrag wird hervorgehoben
-        WB_NOASYNCSELECTHDL // Selektionshandler synchron aufrufen, d.h. Events nicht sammeln
+        WB_SMART_ARRANGE 	// im Arrange die Vis-Area beibehalten
+        WB_ALIGN_TOP		// Anordnung zeilenweise von links nach rechts
+        WB_ALIGN_LEFT 		// Anordnung spaltenweise von oben nach unten
+        WB_NODRAGSELECTION	// Keine Selektion per Tracking-Rect
+        WB_NOCOLUMNHEADER	// keine Headerbar in Detailsview (Headerbar not implemented)
+        WB_NOPOINTERFOCUS	// Kein GrabFocus im MouseButtonDown
+        WB_HIGHLIGHTFRAME	// der unter der Maus befindliche Eintrag wird hervorgehoben
+        WB_NOASYNCSELECTHDL	// Selektionshandler synchron aufrufen, d.h. Events nicht sammeln
 */
 
-#define WB_ICON                 WB_RECTSTYLE
-#define WB_SMALLICON            WB_SMALLSTYLE
-#define WB_DETAILS              WB_VCENTER
-#define WB_NOHSCROLL            WB_SPIN
-#define WB_NOVSCROLL            WB_DRAG
-#define WB_NOSELECTION          WB_REPEAT
-#define WB_NODRAGSELECTION      WB_PATHELLIPSIS
-#define WB_SMART_ARRANGE        WB_PASSWORD
-#define WB_ALIGN_TOP            WB_TOP
-#define WB_ALIGN_LEFT           WB_LEFT
-#define WB_NOCOLUMNHEADER       WB_CENTER
-#define WB_HIGHLIGHTFRAME       WB_INFO
-#define WB_NOASYNCSELECTHDL     WB_NOLABEL
+#define WB_ICON					WB_RECTSTYLE
+#define WB_SMALLICON       		WB_SMALLSTYLE
+#define WB_DETAILS				WB_VCENTER
+#define WB_NOHSCROLL			WB_SPIN
+#define WB_NOVSCROLL			WB_DRAG
+#define WB_NOSELECTION			WB_REPEAT
+#define WB_NODRAGSELECTION		WB_PATHELLIPSIS
+#define WB_SMART_ARRANGE		WB_PASSWORD
+#define WB_ALIGN_TOP			WB_TOP
+#define WB_ALIGN_LEFT			WB_LEFT
+#define WB_NOCOLUMNHEADER		WB_CENTER
+#define WB_HIGHLIGHTFRAME		WB_INFO
+#define WB_NOASYNCSELECTHDL		WB_NOLABEL
 
 class MnemonicGenerator;
 
@@ -236,84 +236,84 @@ class SVT_DLLPUBLIC SvtIconChoiceCtrl : public Control
 {
     friend class SvxIconChoiceCtrl_Impl;
 
-    Link                    _aClickIconHdl;
-    Link                    _aDocRectChangedHdl;
-    Link                    _aVisRectChangedHdl;
-    KeyEvent*               _pCurKeyEvent;
-    SvxIconChoiceCtrl_Impl* _pImp;
-    BOOL                    _bAutoFontColor;
+    Link					_aClickIconHdl;
+    Link					_aDocRectChangedHdl;
+    Link					_aVisRectChangedHdl;
+    KeyEvent*				_pCurKeyEvent;
+    SvxIconChoiceCtrl_Impl*	_pImp;
+    BOOL					_bAutoFontColor;
 
 protected:
 
-    virtual void        KeyInput( const KeyEvent& rKEvt );
-    virtual BOOL        EditedEntry( SvxIconChoiceCtrlEntry*, const XubString& rNewText, BOOL bCancelled );
-    virtual void        DocumentRectChanged();
-    virtual void        VisibleRectChanged();
-    virtual BOOL        EditingEntry( SvxIconChoiceCtrlEntry* pEntry );
-    virtual void        Command( const CommandEvent& rCEvt );
-    virtual void        Paint( const Rectangle& rRect );
-    virtual void        MouseButtonDown( const MouseEvent& rMEvt );
-    virtual void        MouseButtonUp( const MouseEvent& rMEvt );
-    virtual void        MouseMove( const MouseEvent& rMEvt );
-    virtual void        Resize();
-    virtual void        GetFocus();
-    virtual void        LoseFocus();
-    virtual void        ClickIcon();
-    virtual void        StateChanged( StateChangedType nType );
-    virtual void        DataChanged( const DataChangedEvent& rDCEvt );
-    virtual void        RequestHelp( const HelpEvent& rHEvt );
-    virtual void        DrawEntryImage(
+    virtual void    	KeyInput( const KeyEvent& rKEvt );
+    virtual BOOL		EditedEntry( SvxIconChoiceCtrlEntry*, const XubString& rNewText, BOOL bCancelled );
+    virtual void		DocumentRectChanged();
+    virtual void		VisibleRectChanged();
+    virtual BOOL		EditingEntry( SvxIconChoiceCtrlEntry* pEntry );
+    virtual void    	Command( const CommandEvent& rCEvt );
+    virtual void    	Paint( const Rectangle& rRect );
+    virtual void    	MouseButtonDown( const MouseEvent& rMEvt );
+    virtual void    	MouseButtonUp( const MouseEvent& rMEvt );
+    virtual void    	MouseMove( const MouseEvent& rMEvt );
+    virtual void    	Resize();
+    virtual void    	GetFocus();
+    virtual void    	LoseFocus();
+    virtual void		ClickIcon();
+    virtual void 		StateChanged( StateChangedType nType );
+    virtual void 		DataChanged( const DataChangedEvent& rDCEvt );
+    virtual void		RequestHelp( const HelpEvent& rHEvt );
+    virtual void		DrawEntryImage(
                             SvxIconChoiceCtrlEntry* pEntry,
                             const Point& rPos,
                             OutputDevice& rDev );
 
-    virtual String      GetEntryText(
+    virtual String		GetEntryText(
                             SvxIconChoiceCtrlEntry* pEntry,
                             BOOL bInplaceEdit );
 
-    virtual void        FillLayoutData() const;
+    virtual void		FillLayoutData() const;
 
-    void                CallImplEventListeners(ULONG nEvent, void* pData);
+    void				CallImplEventListeners(ULONG nEvent, void* pData);
 
 public:
 
                         SvtIconChoiceCtrl( Window* pParent, WinBits nWinStyle = WB_ICON | WB_BORDER );
                         SvtIconChoiceCtrl( Window* pParent, const ResId& rResId );
-    virtual             ~SvtIconChoiceCtrl();
+    virtual 			~SvtIconChoiceCtrl();
 
-    void                SetStyle( WinBits nWinStyle );
-    WinBits             GetStyle() const;
+    void				SetStyle( WinBits nWinStyle );
+    WinBits				GetStyle() const;
 
-    BOOL                SetChoiceWithCursor ( BOOL bDo = TRUE );
+    BOOL				SetChoiceWithCursor ( BOOL bDo = TRUE );
 
-    void                SetUpdateMode( BOOL bUpdateMode );
-    void                SetFont( const Font& rFont );
-    void                SetPointFont( const Font& rFont );
+    void 				SetUpdateMode( BOOL bUpdateMode );
+    void				SetFont( const Font& rFont );
+    void				SetPointFont( const Font& rFont );
 
-    void                SetClickHdl( const Link& rLink ) { _aClickIconHdl = rLink; }
-    const Link&         GetClickHdl() const { return _aClickIconHdl; }
+    void            	SetClickHdl( const Link& rLink ) { _aClickIconHdl = rLink; }
+    const Link&     	GetClickHdl() const { return _aClickIconHdl; }
 
     using OutputDevice::SetBackground;
-    void                SetBackground( const Wallpaper& rWallpaper );
+    void				SetBackground( const Wallpaper& rWallpaper );
 
-    void                ArrangeIcons();
+    void				ArrangeIcons();
 
 
-    SvxIconChoiceCtrlEntry* InsertEntry( ULONG nPos = LIST_APPEND,
+    SvxIconChoiceCtrlEntry*	InsertEntry( ULONG nPos = LIST_APPEND,
                                      const Point* pPos = 0,
                                      USHORT nFlags = 0 );
-    SvxIconChoiceCtrlEntry* InsertEntry( const String& rText, const Image& rImage,
+    SvxIconChoiceCtrlEntry*	InsertEntry( const String& rText, const Image& rImage,
                                      ULONG nPos = LIST_APPEND,
                                      const Point* pPos = 0,
                                      USHORT nFlags = 0 );
-    SvxIconChoiceCtrlEntry* InsertEntry( const String& rText, const Image& rImage, const Image& rImageHC,
+    SvxIconChoiceCtrlEntry*	InsertEntry( const String& rText, const Image& rImage, const Image& rImageHC,
                                      ULONG nPos = LIST_APPEND,
                                      const Point* pPos = 0,
                                      USHORT nFlags = 0 );
 
     /** creates automatic mnemonics for all icon texts in the control
     */
-    void                CreateAutoMnemonics( void );
+    void				CreateAutoMnemonics( void );
 
     /** creates automatic mnemonics for all icon texts in the control
 
@@ -322,62 +322,62 @@ public:
         This can be used if the control needs to share the "mnemonic space" with other elements,
         such as a menu bar.
     */
-    void                CreateAutoMnemonics( MnemonicGenerator& _rUsedMnemonics );
+    void				CreateAutoMnemonics( MnemonicGenerator& _rUsedMnemonics );
 
-    void                RemoveEntry( SvxIconChoiceCtrlEntry* pEntry );
+    void				RemoveEntry( SvxIconChoiceCtrlEntry* pEntry );
 
-    BOOL                DoKeyInput( const KeyEvent& rKEvt );
+    BOOL				DoKeyInput( const KeyEvent& rKEvt );
 
-    BOOL                IsEntryEditing() const;
-    void                Clear();
+    BOOL				IsEntryEditing() const;
+    void				Clear();
 
-    ULONG                   GetEntryCount() const;
-    SvxIconChoiceCtrlEntry* GetEntry( ULONG nPos ) const;
-    ULONG                   GetEntryListPos( SvxIconChoiceCtrlEntry* pEntry ) const;
+    ULONG					GetEntryCount() const;
+    SvxIconChoiceCtrlEntry*	GetEntry( ULONG nPos ) const;
+    ULONG					GetEntryListPos( SvxIconChoiceCtrlEntry* pEntry ) const;
     using Window::SetCursor;
-    void                    SetCursor( SvxIconChoiceCtrlEntry* pEntry );
-    SvxIconChoiceCtrlEntry* GetCursor() const;
+    void					SetCursor( SvxIconChoiceCtrlEntry* pEntry );
+    SvxIconChoiceCtrlEntry*	GetCursor() const;
 
     // Neu-Berechnung gecachter View-Daten und Invalidierung im Fenster
-    void                    InvalidateEntry( SvxIconChoiceCtrlEntry* pEntry );
+    void					InvalidateEntry( SvxIconChoiceCtrlEntry* pEntry );
 
     // bHit==FALSE: Eintrag gilt als getroffen, wenn Position im BoundRect liegt
     //     ==TRUE : Bitmap oder Text muss getroffen sein
-    SvxIconChoiceCtrlEntry* GetEntry( const Point& rPosPixel, BOOL bHit = FALSE ) const;
+    SvxIconChoiceCtrlEntry*	GetEntry( const Point& rPosPixel, BOOL bHit = FALSE ) const;
     // Gibt den naechsten ueber pCurEntry liegenden Eintrag (ZOrder)
-    SvxIconChoiceCtrlEntry* GetNextEntry( const Point& rPosPixel, SvxIconChoiceCtrlEntry* pCurEntry, BOOL  ) const;
+    SvxIconChoiceCtrlEntry*	GetNextEntry( const Point& rPosPixel, SvxIconChoiceCtrlEntry* pCurEntry, BOOL  ) const;
     // Gibt den naechsten unter pCurEntry liegenden Eintrag (ZOrder)
-    SvxIconChoiceCtrlEntry* GetPrevEntry( const Point& rPosPixel, SvxIconChoiceCtrlEntry* pCurEntry, BOOL  ) const;
+    SvxIconChoiceCtrlEntry*	GetPrevEntry( const Point& rPosPixel, SvxIconChoiceCtrlEntry* pCurEntry, BOOL  ) const;
 
     // in dem ULONG wird die Position in der Liste des gefunden Eintrags zurueckgegeben
-    SvxIconChoiceCtrlEntry* GetSelectedEntry( ULONG& rPos ) const;
+    SvxIconChoiceCtrlEntry*	GetSelectedEntry( ULONG& rPos ) const;
 
-    void                        SetEntryTextMode( SvxIconChoiceCtrlTextMode eMode, SvxIconChoiceCtrlEntry* pEntry = 0 );
-    SvxIconChoiceCtrlTextMode   GetEntryTextMode( const SvxIconChoiceCtrlEntry* pEntry = 0 ) const;
+    void						SetEntryTextMode( SvxIconChoiceCtrlTextMode eMode, SvxIconChoiceCtrlEntry* pEntry = 0 );
+    SvxIconChoiceCtrlTextMode	GetEntryTextMode( const SvxIconChoiceCtrlEntry* pEntry = 0 ) const;
 
     // offene asynchron abzuarbeitende Aktionen ausfuehren. Muss vor dem Speichern von
     // Eintragspositionen etc. gerufen werden
-    void                Flush();
+    void				Flush();
 
 
-    virtual BOOL        HasBackground() const;
-    virtual BOOL        HasFont() const;
-    virtual BOOL        HasFontTextColor() const;
-    virtual BOOL        HasFontFillColor() const;
+    virtual BOOL		HasBackground() const;
+    virtual BOOL		HasFont() const;
+    virtual BOOL		HasFontTextColor() const;
+    virtual BOOL		HasFontFillColor() const;
 
-    void                SetFontColorToBackground ( BOOL bDo = TRUE ) { _bAutoFontColor = bDo; }
-    BOOL                AutoFontColor () { return _bAutoFontColor; }
+    void				SetFontColorToBackground ( BOOL bDo = TRUE ) { _bAutoFontColor = bDo; }
+    BOOL				AutoFontColor () { return _bAutoFontColor; }
 
-    Point               GetLogicPos( const Point& rPosPixel ) const;
-    Point               GetPixelPos( const Point& rPosLogic ) const;
-    void                SetSelectionMode( SelectionMode eMode );
+    Point				GetLogicPos( const Point& rPosPixel ) const;
+    Point		   		GetPixelPos( const Point& rPosLogic ) const;
+    void				SetSelectionMode( SelectionMode eMode );
 
-    BOOL                HandleShortCutKey( const KeyEvent& rKeyEvent );
+    BOOL				HandleShortCutKey( const KeyEvent& rKeyEvent );
 
-    Rectangle           GetBoundingBox( SvxIconChoiceCtrlEntry* pEntry ) const;
-    Rectangle           GetEntryCharacterBounds( const sal_Int32 _nEntryPos, const sal_Int32 _nCharacterIndex ) const;
+    Rectangle			GetBoundingBox( SvxIconChoiceCtrlEntry* pEntry ) const;
+    Rectangle			GetEntryCharacterBounds( const sal_Int32 _nEntryPos, const sal_Int32 _nCharacterIndex ) const;
 
-    void                SetNoSelection();
+    void				SetNoSelection();
 
     // ACCESSIBILITY ==========================================================
 
diff --git a/svtools/inc/localresaccess.hxx b/svtools/inc/localresaccess.hxx
index c72f68f64f03..604f02efeb3c 100644
--- a/svtools/inc/localresaccess.hxx
+++ b/svtools/inc/localresaccess.hxx
@@ -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
@@ -45,7 +45,7 @@ namespace svt
     class OLocalResourceAccess : public Resource
     {
     protected:
-        ResMgr*     m_pManager;
+        ResMgr*		m_pManager;
 
     public:
         OLocalResourceAccess( const ResId& _rId )
@@ -75,7 +75,7 @@ namespace svt
     };
 
 //.........................................................................
-}   // namespace svt
+}	// namespace svt
 //.........................................................................
 
 #endif // _SVTOOLS_LOCALRESACCESS_HXX_
diff --git a/svtools/inc/pch/precompiled_svtools.cxx b/svtools/inc/pch/precompiled_svtools.cxx
index 03fc0b4bb41d..d14bfb700fd5 100644
--- a/svtools/inc/pch/precompiled_svtools.cxx
+++ b/svtools/inc/pch/precompiled_svtools.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
diff --git a/svtools/inc/pch/precompiled_svtools.hxx b/svtools/inc/pch/precompiled_svtools.hxx
index ddedfc5a0369..75023cc7f94a 100644
--- a/svtools/inc/pch/precompiled_svtools.hxx
+++ b/svtools/inc/pch/precompiled_svtools.hxx
@@ -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
@@ -352,7 +352,7 @@
 #include <cppuhelper/weakref.hxx>
 
 #include <osl/conditn.hxx>
-#include <osl/conditn.hxx>
+#include <osl/conditn.hxx> 
 #include <osl/diagnose.h>
 #include <osl/endian.h>
 #include <osl/file.h>
diff --git a/svtools/inc/prgsbar.hxx b/svtools/inc/prgsbar.hxx
index c02d400c6931..33b2c6938791 100644
--- a/svtools/inc/prgsbar.hxx
+++ b/svtools/inc/prgsbar.hxx
@@ -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
@@ -44,8 +44,8 @@ Diese Klasse dient zur Anzeige einer Progress-Anzeige.
 
 WinBits
 
-WB_BORDER           Border um das Fenster
-WB_3DLOOK           3D-Darstellung
+WB_BORDER			Border um das Fenster
+WB_3DLOOK			3D-Darstellung
 
 --------------------------------------------------------------------------
 
@@ -60,7 +60,7 @@ groesser 100 gesetzt werden, faengt das letzte Rechteck an zu blinken.
 // - WinBits -
 // -----------
 
-#define WB_STDPROGRESSBAR       WB_BORDER
+#define WB_STDPROGRESSBAR		WB_BORDER
 
 // ---------------
 // - ProgressBar -
@@ -69,18 +69,18 @@ groesser 100 gesetzt werden, faengt das letzte Rechteck an zu blinken.
 class SVT_DLLPUBLIC ProgressBar : public Window
 {
 private:
-    Point               maPos;
-    long                mnPrgsWidth;
-    long                mnPrgsHeight;
-    USHORT              mnPercent;
-    USHORT              mnPercentCount;
-    BOOL                mbCalcNew;
+    Point				maPos;
+    long				mnPrgsWidth;
+    long				mnPrgsHeight;
+    USHORT				mnPercent;
+    USHORT				mnPercentCount;
+    BOOL				mbCalcNew;
 
 #ifdef _SV_PRGSBAR_CXX
     using Window::ImplInit;
-    SVT_DLLPRIVATE void             ImplInit();
-    SVT_DLLPRIVATE void             ImplInitSettings( BOOL bFont, BOOL bForeground, BOOL bBackground );
-    SVT_DLLPRIVATE void             ImplDrawProgress( USHORT nOldPerc, USHORT nNewPerc );
+    SVT_DLLPRIVATE void				ImplInit();
+    SVT_DLLPRIVATE void				ImplInitSettings( BOOL bFont, BOOL bForeground, BOOL bBackground );
+    SVT_DLLPRIVATE void				ImplDrawProgress( USHORT nOldPerc, USHORT nNewPerc );
 #endif
 
 public:
@@ -88,13 +88,13 @@ public:
                         ProgressBar( Window* pParent, const ResId& rResId );
                         ~ProgressBar();
 
-    virtual void        Paint( const Rectangle& rRect );
-    virtual void        Resize();
-    virtual void        StateChanged( StateChangedType nStateChange );
-    virtual void        DataChanged( const DataChangedEvent& rDCEvt );
+    virtual void		Paint( const Rectangle& rRect );
+    virtual void		Resize();
+    virtual void		StateChanged( StateChangedType nStateChange );
+    virtual void		DataChanged( const DataChangedEvent& rDCEvt );
 
-    void                SetValue( USHORT nNewPercent );
-    USHORT              GetValue() const { return mnPercent; }
+    void				SetValue( USHORT nNewPercent );
+    USHORT				GetValue() const { return mnPercent; }
 };
 
-#endif  // _PRGSBAR_HXX
+#endif	// _PRGSBAR_HXX
diff --git a/svtools/inc/roadmap.hxx b/svtools/inc/roadmap.hxx
index ff94cc966f4d..a9a81d2a4971 100644
--- a/svtools/inc/roadmap.hxx
+++ b/svtools/inc/roadmap.hxx
@@ -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
@@ -60,9 +60,9 @@ namespace svt
     class SVT_DLLPUBLIC ORoadmap : public Control, public RoadmapTypes
     {
     protected:
-        RoadmapImpl*    m_pImpl;
+        RoadmapImpl*	m_pImpl;
         // Window overridables
-        void            Paint( const Rectangle& _rRect );
+        void			Paint( const Rectangle& _rRect );
         void            implInit();
 
     public:
@@ -70,8 +70,8 @@ namespace svt
         ORoadmap( Window* _pParent, WinBits _nWinStyle = 0 );
         ~ORoadmap( );
 
-        void            SetRoadmapBitmap( const BitmapEx& maBitmap, sal_Bool _bInvalidate = sal_True );
-        const BitmapEx& GetRoadmapBitmap( ) const;
+        void			SetRoadmapBitmap( const BitmapEx& maBitmap, sal_Bool _bInvalidate = sal_True );
+        const BitmapEx&	GetRoadmapBitmap( ) const;
 
         void            EnableRoadmapItem( ItemId _nItemId, sal_Bool _bEnable, ItemIndex _nStartIndex = 0  );
         sal_Bool        IsRoadmapItemEnabled( ItemId _nItemId, ItemIndex _nStartIndex = 0 ) const;
@@ -99,12 +99,12 @@ namespace svt
 
         void            SetItemSelectHdl( const Link& _rHdl );
         Link            GetItemSelectHdl( ) const;
-        virtual void    DataChanged( const DataChangedEvent& rDCEvt );
+        virtual void	DataChanged( const DataChangedEvent& rDCEvt );
         virtual void    GetFocus();
 
 
     protected:
-        long            PreNotify( NotifyEvent& rNEvt );
+        long       		PreNotify( NotifyEvent& rNEvt );
 
     protected:
         /// called when an item has been selected by any means
@@ -118,19 +118,19 @@ namespace svt
 
         RoadmapItem*         GetByID( ItemId _nID, ItemIndex _nStartIndex = 0  );
         const RoadmapItem*   GetByID( ItemId _nID, ItemIndex _nStartIndex = 0  ) const;
-        RoadmapItem*            GetPreviousHyperLabel( ItemIndex _Index);
+        RoadmapItem*			GetPreviousHyperLabel( ItemIndex _Index);
 
-        void                        DrawHeadline();
-        void                        DeselectOldRoadmapItems();
-        ItemId                      GetNextAvailableItemId( ItemIndex _NewIndex );
-        ItemId                      GetPreviousAvailableItemId( ItemIndex _NewIndex );
+        void						DrawHeadline();
+        void						DeselectOldRoadmapItems();
+        ItemId						GetNextAvailableItemId( ItemIndex _NewIndex );
+        ItemId						GetPreviousAvailableItemId( ItemIndex _NewIndex );
         RoadmapItem*                GetByPointer(Window* pWindow);
         RoadmapItem*                InsertHyperLabel( ItemIndex _Index, const ::rtl::OUString& _aStr, ItemId _RMID, sal_Bool _bEnabled = sal_True  );
-        void                        UpdatefollowingHyperLabels( ItemIndex _Index );
+        void						UpdatefollowingHyperLabels( ItemIndex _Index );
     };
 
 //.........................................................................
-}   // namespace svt
+}	// namespace svt
 //.........................................................................
 
 #endif
diff --git a/svtools/inc/rtfkeywd.hxx b/svtools/inc/rtfkeywd.hxx
index 5ccd9149bd68..766f41b0c688 100644
--- a/svtools/inc/rtfkeywd.hxx
+++ b/svtools/inc/rtfkeywd.hxx
@@ -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
diff --git a/svtools/inc/rtfout.hxx b/svtools/inc/rtfout.hxx
index 12a125635132..4dc9a951f656 100644
--- a/svtools/inc/rtfout.hxx
+++ b/svtools/inc/rtfout.hxx
@@ -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
@@ -42,9 +42,9 @@ class SVT_DLLPUBLIC RTFOutFuncs
 {
 public:
 #if defined(MAC) || defined(UNX)
-    static const sal_Char sNewLine;     // nur \012 oder \015
+    static const sal_Char sNewLine;		// nur \012 oder \015
 #else
-    static const sal_Char __FAR_DATA sNewLine[];    // \015\012
+    static const sal_Char __FAR_DATA sNewLine[];	// \015\012
 #endif
 
     static SvStream& Out_Char( SvStream&, sal_Unicode cChar,
diff --git a/svtools/inc/rtftoken.h b/svtools/inc/rtftoken.h
index e75254487312..c60d4d5e6df3 100644
--- a/svtools/inc/rtftoken.h
+++ b/svtools/inc/rtftoken.h
@@ -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
@@ -36,31 +36,31 @@ class String;
 int GetRTFToken( const String& rSearch );
 
 enum RTF_TOKEN_RANGES {
-    RTF_NOGROUP                     = 0x0100,
-    RTF_DOCFMT                      = 0x0200,
-    RTF_SECTFMT                     = 0x0300,
-    RTF_PARFMT                      = 0x0400,
-    RTF_TABSTOPDEF                  = 0x0500,
-    RTF_BRDRDEF                     = 0x0600,
-    RTF_CHRFMT                      = 0x0700,
-    RTF_SPECCHAR                    = 0x0800,
-    RTF_APOCTL                      = 0x0900,
-    RTF_SHADINGDEF                  = 0x0A00,
-    // free                         = 0x0B00,
-    RTF_DRAWOBJECTS                 = 0x0C00,
-    RTF_OBJECTS                     = 0x0D00,
-    RTF_NUMBULLETS                  = 0x0E00,
+    RTF_NOGROUP						= 0x0100,
+    RTF_DOCFMT						= 0x0200,
+    RTF_SECTFMT						= 0x0300,
+    RTF_PARFMT						= 0x0400,
+    RTF_TABSTOPDEF					= 0x0500,
+    RTF_BRDRDEF						= 0x0600,
+    RTF_CHRFMT						= 0x0700,
+    RTF_SPECCHAR					= 0x0800,
+    RTF_APOCTL						= 0x0900,
+    RTF_SHADINGDEF					= 0x0A00,
+    // free 						= 0x0B00,
+    RTF_DRAWOBJECTS 				= 0x0C00,
+    RTF_OBJECTS						= 0x0D00,
+    RTF_NUMBULLETS					= 0x0E00,
 
     // !!! kann hinein verodert werden (Border/Background) !!!!
-    RTF_TABLEDEF                    = 0x1000,
+    RTF_TABLEDEF					= 0x1000,
 
     // !!! kann hinein verodert werden (Border/Tab) !!!!
-    RTF_SWGDEFS                     = 0x4000
+    RTF_SWGDEFS						= 0x4000
 };
 
 enum RTF_TOKEN_IDS {
 
-    RTF_TEXTTOKEN                       = RTF_NOGROUP,
+    RTF_TEXTTOKEN						= RTF_NOGROUP,
     RTF_SINGLECHAR,
     RTF_UNKNOWNCONTROL,
     RTF_UNKNOWNDATA,
@@ -153,7 +153,7 @@ enum RTF_TOKEN_IDS {
     RTF_BKMKSTART,
     RTF_BKMKEND,
 
-    RTF_PICT,                           // Bitmaps
+    RTF_PICT,							// Bitmaps
     RTF_PICW,
     RTF_PICH,
     RTF_WBMBITSPIXEL,
@@ -187,7 +187,7 @@ enum RTF_TOKEN_IDS {
     RTF_BLIPUID,
     RTF_BLIPUPI,
 
-    RTF_FIELD,                      // Felder
+    RTF_FIELD,						// Felder
     RTF_FLDDIRTY,
     RTF_FLDEDIT,
     RTF_FLDLOCK,
@@ -243,13 +243,13 @@ enum RTF_TOKEN_IDS {
     RTF_TCN,
     RTF_XEF,
 
-    RTF_UD,                 // Unicode
+    RTF_UD,		 			// Unicode
     RTF_UPR,
     RTF_U,
     RTF_UC,
     RTF_ANSICPG,
 
-    RTF_FFEXITMCR,          // Form Fields
+    RTF_FFEXITMCR,		 	// Form Fields
     RTF_FFENTRYMCR,
     RTF_FFDEFTEXT,
     RTF_FFFORMAT,
@@ -275,7 +275,7 @@ enum RTF_TOKEN_IDS {
 
 /*  */
 
-    RTF_DEFTAB          = RTF_DOCFMT,
+    RTF_DEFTAB			= RTF_DOCFMT,
     RTF_HYPHHOTZ,
     RTF_LINESTART,
     RTF_FRACWIDTH,
@@ -443,7 +443,7 @@ enum RTF_TOKEN_IDS {
 
 /*  */
 
-    RTF_SECTD               = RTF_SECTFMT,
+    RTF_SECTD				= RTF_SECTFMT,
     RTF_ENDNHERE,
     RTF_BINFSXN,
     RTF_BINSXN,
@@ -529,7 +529,7 @@ enum RTF_TOKEN_IDS {
     RTF_SECTSPECIFYL,
 
     // Swg-Header/Footer-Tokens
-    RTF_HEADER_YB   = (RTF_SECTFMT|RTF_SWGDEFS),
+    RTF_HEADER_YB	= (RTF_SECTFMT|RTF_SWGDEFS),
     RTF_HEADER_XL,
     RTF_HEADER_XR,
     RTF_FOOTER_YT,
@@ -542,7 +542,7 @@ enum RTF_TOKEN_IDS {
 
 /*  */
 
-    RTF_PARD                = RTF_PARFMT,
+    RTF_PARD 				= RTF_PARFMT,
     RTF_S,
     RTF_INTBL,
     RTF_KEEP,
@@ -625,7 +625,7 @@ enum RTF_TOKEN_IDS {
 
 /*  */
 
-    RTF_TX                  = RTF_TABSTOPDEF,
+    RTF_TX					= RTF_TABSTOPDEF,
     RTF_TB,
     RTF_TQL,
     RTF_TQR,
@@ -642,7 +642,7 @@ enum RTF_TOKEN_IDS {
 
 /*  */
 
-    RTF_BRDRT       = RTF_BRDRDEF,
+    RTF_BRDRT		= RTF_BRDRDEF,
     RTF_BRDRB,
     RTF_BRDRL,
     RTF_BRDRR,
@@ -662,7 +662,7 @@ enum RTF_TOKEN_IDS {
     RTF_BRDRFRAME,
 
     // Swg-Border-Tokens
-    RTF_BRDBOX          = (RTF_BRDRDEF|RTF_SWGDEFS),
+    RTF_BRDBOX			= (RTF_BRDRDEF|RTF_SWGDEFS),
     RTF_BRDLINE_COL,
     RTF_BRDLINE_IN,
     RTF_BRDLINE_OUT,
@@ -670,7 +670,7 @@ enum RTF_TOKEN_IDS {
 
 /*  */
 
-    RTF_PLAIN       = RTF_CHRFMT,
+    RTF_PLAIN		= RTF_CHRFMT,
     RTF_B,
     RTF_CAPS,
     RTF_DN,
@@ -800,7 +800,7 @@ enum RTF_TOKEN_IDS {
     RTF_HORZVERT,
 
     // Swg-Border-Tokens
-    RTF_SWG_ESCPROP     = (RTF_CHRFMT|RTF_SWGDEFS),
+    RTF_SWG_ESCPROP 	= (RTF_CHRFMT|RTF_SWGDEFS),
     RTF_HYPHEN,
     RTF_HYPHLEAD,
     RTF_HYPHTRAIL,
@@ -809,7 +809,7 @@ enum RTF_TOKEN_IDS {
 
 /*  */
 
-    RTF_CHDATE              = RTF_SPECCHAR,
+    RTF_CHDATE				= RTF_SPECCHAR,
     RTF_CHDATEL,
     RTF_CHDATEA,
     RTF_CHTIME,
@@ -908,7 +908,7 @@ enum RTF_TOKEN_IDS {
 
 /*  */
 
-    RTF_SHADING     = RTF_SHADINGDEF,
+    RTF_SHADING 	= RTF_SHADINGDEF,
     RTF_CFPAT,
     RTF_CBPAT,
     RTF_BGHORIZ,
@@ -926,7 +926,7 @@ enum RTF_TOKEN_IDS {
 
 /*  */
 
-    RTF_TROWD           = RTF_TABLEDEF,
+    RTF_TROWD			= RTF_TABLEDEF,
     RTF_TRGAPH,
     RTF_TRLEFT,
     RTF_TRRH,
@@ -1260,9 +1260,9 @@ enum RTF_TOKEN_IDS {
 // shapes
     RTF_SHP, RTF_SN, RTF_SV
 /*
-    RTF_SHPLEFT,
-    RTF_SHPTOP,
-    RTF_SHPBOTTOM,
+    RTF_SHPLEFT, 
+    RTF_SHPTOP, 
+    RTF_SHPBOTTOM, 
     RTF_SHPRIGHT
 */
 
diff --git a/svtools/inc/ruler.hxx b/svtools/inc/ruler.hxx
index c2649b298ba6..22eec9f88c1a 100644
--- a/svtools/inc/ruler.hxx
+++ b/svtools/inc/ruler.hxx
@@ -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
@@ -593,7 +593,7 @@ struct RulerBorder
     long    nWidth;
     USHORT  nStyle;
     //minimum/maximum position, supported for table borders/rows
-    long    nMinPos;
+    long    nMinPos; 
     long    nMaxPos;
 };
 
@@ -690,6 +690,10 @@ private:
     USHORT              mnExtraStyle;
     USHORT              mnExtraClicks;
     USHORT              mnExtraModifier;
+// Amelia
+    long                mnCharWidth;
+    long                mnLineHeight;
+
     RulerExtra          meExtraType;
     RulerType           meDragType;
     MapUnit             meSourceUnit;
@@ -733,9 +737,9 @@ private:
     SVT_DLLPRIVATE void                ImplDrawExtra( BOOL bPaint = FALSE );
     SVT_DLLPRIVATE void                ImplUpdate( BOOL bMustCalc = FALSE );
     using Window::ImplHitTest;
-    SVT_DLLPRIVATE BOOL                ImplHitTest( const Point& rPos,
-                                     ImplRulerHitTest* pHitTest,
-                                     BOOL bRequiredStyle = FALSE,
+    SVT_DLLPRIVATE BOOL                ImplHitTest( const Point& rPos, 
+                                     ImplRulerHitTest* pHitTest, 
+                                     BOOL bRequiredStyle = FALSE, 
                                      USHORT nRequiredStyle = 0 ) const;
     SVT_DLLPRIVATE BOOL                ImplDocHitTest( const Point& rPos, RulerType eDragType, ImplRulerHitTest* pHitTest ) const;
     SVT_DLLPRIVATE BOOL                ImplStartDrag( ImplRulerHitTest* pHitTest, USHORT nModifier );
@@ -869,6 +873,11 @@ public:
 
     //set text direction right-to-left
     void                SetTextRTL(BOOL bRTL);
+
+    void                SetCharWidth( long nWidth ) { mnCharWidth = nWidth ; }
+    void                SetLineHeight( long nHeight ) { mnLineHeight = nHeight ; }
+
+    void                DrawTicks();
 };
 
 #endif  // _RULER_HXX
diff --git a/svtools/inc/scriptedtext.hxx b/svtools/inc/scriptedtext.hxx
index 5bb89969785b..e150e25dde3d 100644
--- a/svtools/inc/scriptedtext.hxx
+++ b/svtools/inc/scriptedtext.hxx
@@ -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
diff --git a/svtools/inc/scrwin.hxx b/svtools/inc/scrwin.hxx
index 1542ed667133..2283d7fd3eea 100644
--- a/svtools/inc/scrwin.hxx
+++ b/svtools/inc/scrwin.hxx
@@ -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
@@ -43,9 +43,9 @@ class DataChangedEvent;
 typedef USHORT ScrollableWindowFlags;
 
 #define SCRWIN_THUMBDRAGGING 1
-#define SCRWIN_VCENTER       2
-#define SCRWIN_HCENTER       4
-#define SCRWIN_DEFAULT       (SCRWIN_THUMBDRAGGING | SCRWIN_VCENTER | SCRWIN_HCENTER)
+#define SCRWIN_VCENTER		 2
+#define SCRWIN_HCENTER		 4
+#define SCRWIN_DEFAULT		 (SCRWIN_THUMBDRAGGING | SCRWIN_VCENTER | SCRWIN_HCENTER)
 
 // --------------------
 // - ScrollableWindow -
@@ -54,21 +54,21 @@ typedef USHORT ScrollableWindowFlags;
 class SVT_DLLPUBLIC ScrollableWindow: public Window
 {
 private:
-    Point           aPixOffset;         // offset to virtual window (pixel)
-    Size            aTotPixSz;          // total size of virtual window (pixel)
-    long            nLinePixH;          // size of a line/column (pixel)
-    long            nColumnPixW;
-
-    ScrollBar       aVScroll;           // the scrollbars
-    ScrollBar       aHScroll;
-    ScrollBarBox    aCornerWin;         // window in the bottom right corner
-    BOOL            bScrolling:1,       // user controlled scrolling
-                    bHandleDragging:1,  // scroll window while dragging
+    Point			aPixOffset; 		// offset to virtual window (pixel)
+    Size			aTotPixSz;			// total size of virtual window (pixel)
+    long			nLinePixH;			// size of a line/column (pixel)
+    long			nColumnPixW;
+
+    ScrollBar		aVScroll;			// the scrollbars
+    ScrollBar		aHScroll;
+    ScrollBarBox	aCornerWin; 		// window in the bottom right corner
+    BOOL			bScrolling:1,		// user controlled scrolling
+                    bHandleDragging:1,	// scroll window while dragging
                     bHCenter:1,
                     bVCenter:1;
 
 #ifdef _SVT_SCRWIN_CXX
-    SVT_DLLPRIVATE void         ImpInitialize( ScrollableWindowFlags nFlags );
+    SVT_DLLPRIVATE void			ImpInitialize( ScrollableWindowFlags nFlags );
     DECL_DLLPRIVATE_LINK( ScrollHdl, ScrollBar * );
     DECL_DLLPRIVATE_LINK( EndScrollHdl, ScrollBar * );
 #endif
@@ -79,34 +79,34 @@ public:
                     ScrollableWindow( Window* pParent, const ResId& rId,
                                       ScrollableWindowFlags = SCRWIN_DEFAULT );
 
-    virtual void    Resize();
-    virtual void    Command( const CommandEvent& rCEvt );
-    virtual void    DataChanged( const DataChangedEvent& rDEvt );
+    virtual void	Resize();
+    virtual void	Command( const CommandEvent& rCEvt );
+    virtual void	DataChanged( const DataChangedEvent& rDEvt );
 
-    virtual void    StartScroll();
-    virtual void    EndScroll( long nDeltaX, long nDeltaY );
+    virtual void	StartScroll();
+    virtual void	EndScroll( long nDeltaX, long nDeltaY );
 
     using OutputDevice::SetMapMode;
-    virtual void    SetMapMode( const MapMode& rNewMapMode );
-    virtual MapMode GetMapMode() const;
+    virtual void	SetMapMode( const MapMode& rNewMapMode );
+    virtual MapMode	GetMapMode() const;
 
-    void            SetTotalSize( const Size& rNewSize );
-    Size            GetTotalSize() { return PixelToLogic( aTotPixSz ); }
+    void			SetTotalSize( const Size& rNewSize );
+    Size			GetTotalSize() { return PixelToLogic( aTotPixSz ); }
 
-    void            SetVisibleSize( const Size& rNewSize );
-    BOOL            MakeVisible( const Rectangle& rTarget, BOOL bSloppy = FALSE );
-    Rectangle       GetVisibleArea() const;
+    void			SetVisibleSize( const Size& rNewSize );
+    BOOL			MakeVisible( const Rectangle& rTarget, BOOL bSloppy = FALSE );
+    Rectangle		GetVisibleArea() const;
 
-    void            SetLineSize( ULONG nHorz, ULONG nVert );
+    void			SetLineSize( ULONG nHorz, ULONG nVert );
     using Window::Scroll;
-    virtual void    Scroll( long nDeltaX, long nDeltaY, USHORT nFlags = 0 );
-    void            ScrollLines( long nLinesX, long nLinesY );
-    void            ScrollPages( long nPagesX, ULONG nOverlapX,
+    virtual void	Scroll( long nDeltaX, long nDeltaY, USHORT nFlags = 0 );
+    void			ScrollLines( long nLinesX, long nLinesY );
+    void			ScrollPages( long nPagesX, ULONG nOverlapX,
                                  long nPagesY, ULONG nOverlapY );
 
 private:
-    SVT_DLLPRIVATE Size         GetOutputSizePixel() const;
-    SVT_DLLPRIVATE Size         GetOutputSize() const;
+    SVT_DLLPRIVATE Size			GetOutputSizePixel() const;
+    SVT_DLLPRIVATE Size			GetOutputSize() const;
 };
 
 #endif
diff --git a/svtools/inc/sfxecode.hxx b/svtools/inc/sfxecode.hxx
index 59611eb35844..2163f0daad68 100644
--- a/svtools/inc/sfxecode.hxx
+++ b/svtools/inc/sfxecode.hxx
@@ -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
@@ -29,54 +29,54 @@
 
 #include <tools/errcode.hxx>
 
-#define ERRCODE_SFX_NOSTDTEMPLATE           (ERRCODE_AREA_SFX|ERRCODE_CLASS_PATH|1)
-#define ERRCODE_SFX_NOTATEMPLATE            (ERRCODE_AREA_SFX|ERRCODE_CLASS_FORMAT|2)
-#define ERRCODE_SFX_GENERAL                 (ERRCODE_AREA_SFX|ERRCODE_CLASS_GENERAL|3)
-#define ERRCODE_SFX_DOLOADFAILED            (ERRCODE_AREA_SFX|ERRCODE_CLASS_READ|4)
-#define ERRCODE_SFX_DOSAVECOMPLETEDFAILED   (ERRCODE_AREA_SFX|ERRCODE_CLASS_WRITE|5)
-#define ERRCODE_SFX_COMMITFAILED            (ERRCODE_AREA_SFX|ERRCODE_CLASS_WRITE|6)
-#define ERRCODE_SFX_HANDSOFFFAILED          (ERRCODE_AREA_SFX|ERRCODE_CLASS_GENERAL|7)
-#define ERRCODE_SFX_DOINITNEWFAILED         (ERRCODE_AREA_SFX|ERRCODE_CLASS_CREATE|8)
-#define ERRCODE_SFX_CANTREADDOCINFO         (ERRCODE_AREA_SFX|ERRCODE_CLASS_FORMAT|9)
-#define ERRCODE_SFX_ALREADYOPEN             (ERRCODE_AREA_SFX|ERRCODE_CLASS_ALREADYEXISTS|10)
-#define ERRCODE_SFX_WRONGPASSWORD           (ERRCODE_AREA_SFX|ERRCODE_CLASS_READ|11)
-#define ERRCODE_SFX_DOCUMENTREADONLY        (ERRCODE_AREA_SFX|ERRCODE_CLASS_WRITE|12)
-#define ERRCODE_SFX_OLEGENERAL              (ERRCODE_AREA_SFX|ERRCODE_CLASS_NONE|14)
-#define ERRCODE_SFXMSG_STYLEREPLACE         (ERRCODE_WARNING_MASK|ERRCODE_AREA_SFX|ERRCODE_CLASS_NONE|13)
-#define ERRCODE_SFX_TEMPLATENOTFOUND        (ERRCODE_AREA_SFX|ERRCODE_CLASS_NOTEXISTS|15)
-#define ERRCODE_SFX_ISRELATIVE              (ERRCODE_WARNING_MASK|ERRCODE_AREA_SFX|ERRCODE_CLASS_NOTEXISTS|16)
-#define ERRCODE_SFX_FORCEDOCLOAD            (ERRCODE_WARNING_MASK|ERRCODE_AREA_SFX|ERRCODE_CLASS_NONE|17)
+#define ERRCODE_SFX_NOSTDTEMPLATE			(ERRCODE_AREA_SFX|ERRCODE_CLASS_PATH|1)
+#define ERRCODE_SFX_NOTATEMPLATE			(ERRCODE_AREA_SFX|ERRCODE_CLASS_FORMAT|2)
+#define ERRCODE_SFX_GENERAL					(ERRCODE_AREA_SFX|ERRCODE_CLASS_GENERAL|3)
+#define ERRCODE_SFX_DOLOADFAILED			(ERRCODE_AREA_SFX|ERRCODE_CLASS_READ|4)
+#define ERRCODE_SFX_DOSAVECOMPLETEDFAILED	(ERRCODE_AREA_SFX|ERRCODE_CLASS_WRITE|5)
+#define ERRCODE_SFX_COMMITFAILED			(ERRCODE_AREA_SFX|ERRCODE_CLASS_WRITE|6)
+#define ERRCODE_SFX_HANDSOFFFAILED			(ERRCODE_AREA_SFX|ERRCODE_CLASS_GENERAL|7)
+#define ERRCODE_SFX_DOINITNEWFAILED			(ERRCODE_AREA_SFX|ERRCODE_CLASS_CREATE|8)
+#define ERRCODE_SFX_CANTREADDOCINFO			(ERRCODE_AREA_SFX|ERRCODE_CLASS_FORMAT|9)
+#define ERRCODE_SFX_ALREADYOPEN				(ERRCODE_AREA_SFX|ERRCODE_CLASS_ALREADYEXISTS|10)
+#define ERRCODE_SFX_WRONGPASSWORD			(ERRCODE_AREA_SFX|ERRCODE_CLASS_READ|11)
+#define ERRCODE_SFX_DOCUMENTREADONLY		(ERRCODE_AREA_SFX|ERRCODE_CLASS_WRITE|12)
+#define ERRCODE_SFX_OLEGENERAL				(ERRCODE_AREA_SFX|ERRCODE_CLASS_NONE|14)
+#define ERRCODE_SFXMSG_STYLEREPLACE			(ERRCODE_WARNING_MASK|ERRCODE_AREA_SFX|ERRCODE_CLASS_NONE|13)
+#define ERRCODE_SFX_TEMPLATENOTFOUND		(ERRCODE_AREA_SFX|ERRCODE_CLASS_NOTEXISTS|15)
+#define ERRCODE_SFX_ISRELATIVE				(ERRCODE_WARNING_MASK|ERRCODE_AREA_SFX|ERRCODE_CLASS_NOTEXISTS|16)
+#define ERRCODE_SFX_FORCEDOCLOAD			(ERRCODE_WARNING_MASK|ERRCODE_AREA_SFX|ERRCODE_CLASS_NONE|17)
 
-#define ERRCODE_SFX_CANTFINDORIGINAL        (ERRCODE_AREA_SFX|ERRCODE_CLASS_GENERAL|19)
-#define ERRCODE_SFX_RESTART                 (ERRCODE_AREA_SFX|ERRCODE_CLASS_GENERAL|20)
-#define ERRCODE_SFX_CANTCREATECONTENT       (ERRCODE_AREA_SFX|ERRCODE_CLASS_CREATE|21)
-#define ERRCODE_SFX_CANTCREATELINK          (ERRCODE_AREA_SFX|ERRCODE_CLASS_CREATE|22)
-#define ERRCODE_SFX_WRONGBMKFORMAT          (ERRCODE_AREA_SFX|ERRCODE_CLASS_FORMAT|23)
-#define ERRCODE_SFX_WRONGICONFILE           (ERRCODE_AREA_SFX|ERRCODE_CLASS_FORMAT|24)
-#define ERRCODE_SFX_CANTDELICONFILE         (ERRCODE_AREA_SFX|ERRCODE_CLASS_ACCESS|25)
-#define ERRCODE_SFX_CANTWRITEICONFILE       (ERRCODE_AREA_SFX|ERRCODE_CLASS_ACCESS|26)
-#define ERRCODE_SFX_CANTRENAMECONTENT       (ERRCODE_AREA_SFX|ERRCODE_CLASS_ACCESS|27)
-#define ERRCODE_SFX_INVALIDBMKPATH          (ERRCODE_AREA_SFX|ERRCODE_CLASS_PATH|28)
-#define ERRCODE_SFX_CANTWRITEURLCFGFILE     (ERRCODE_AREA_SFX|ERRCODE_CLASS_ACCESS|29)
-#define ERRCODE_SFX_WRONGURLCFGFORMAT       (ERRCODE_AREA_SFX|ERRCODE_CLASS_FORMAT|30)
-#define ERRCODE_SFX_NODOCUMENT              (ERRCODE_AREA_SFX|ERRCODE_CLASS_NOTEXISTS|31)
-#define ERRCODE_SFX_INVALIDLINK             (ERRCODE_AREA_SFX|ERRCODE_CLASS_NOTEXISTS|32)
-#define ERRCODE_SFX_INVALIDTRASHPATH        (ERRCODE_AREA_SFX|ERRCODE_CLASS_PATH|33)
-#define ERRCODE_SFX_NOTRESTORABLE           (ERRCODE_AREA_SFX|ERRCODE_CLASS_CREATE|34)
-#define ERRCODE_SFX_NOTRASH                 (ERRCODE_AREA_SFX|ERRCODE_CLASS_NOTEXISTS|35)
-#define ERRCODE_SFX_INVALIDSYNTAX           (ERRCODE_AREA_SFX|ERRCODE_CLASS_PATH|36)
-#define ERRCODE_SFX_CANTCREATEFOLDER        (ERRCODE_AREA_SFX|ERRCODE_CLASS_CREATE|37)
-#define ERRCODE_SFX_CANTRENAMEFOLDER        (ERRCODE_AREA_SFX|ERRCODE_CLASS_PATH|38)
-#define ERRCODE_SFX_WRONG_CDF_FORMAT        (ERRCODE_AREA_SFX| ERRCODE_CLASS_READ | 39)
-#define ERRCODE_SFX_EMPTY_SERVER            (ERRCODE_AREA_SFX|ERRCODE_CLASS_NONE|40)
-#define ERRCODE_SFX_NO_ABOBOX               (ERRCODE_AREA_SFX| ERRCODE_CLASS_READ | 41)
-#define ERRCODE_SFX_CANTGETPASSWD           (ERRCODE_AREA_SFX| ERRCODE_CLASS_READ | 42)
-#define ERRCODE_SFX_TARGETFILECORRUPTED     (ERRCODE_AREA_SFX| ERRCODE_CLASS_READ | 43)
+#define ERRCODE_SFX_CANTFINDORIGINAL		(ERRCODE_AREA_SFX|ERRCODE_CLASS_GENERAL|19)
+#define ERRCODE_SFX_RESTART					(ERRCODE_AREA_SFX|ERRCODE_CLASS_GENERAL|20)
+#define ERRCODE_SFX_CANTCREATECONTENT		(ERRCODE_AREA_SFX|ERRCODE_CLASS_CREATE|21)
+#define ERRCODE_SFX_CANTCREATELINK			(ERRCODE_AREA_SFX|ERRCODE_CLASS_CREATE|22)
+#define ERRCODE_SFX_WRONGBMKFORMAT			(ERRCODE_AREA_SFX|ERRCODE_CLASS_FORMAT|23)
+#define ERRCODE_SFX_WRONGICONFILE			(ERRCODE_AREA_SFX|ERRCODE_CLASS_FORMAT|24)
+#define ERRCODE_SFX_CANTDELICONFILE			(ERRCODE_AREA_SFX|ERRCODE_CLASS_ACCESS|25)
+#define ERRCODE_SFX_CANTWRITEICONFILE		(ERRCODE_AREA_SFX|ERRCODE_CLASS_ACCESS|26)
+#define ERRCODE_SFX_CANTRENAMECONTENT		(ERRCODE_AREA_SFX|ERRCODE_CLASS_ACCESS|27)
+#define ERRCODE_SFX_INVALIDBMKPATH			(ERRCODE_AREA_SFX|ERRCODE_CLASS_PATH|28)
+#define ERRCODE_SFX_CANTWRITEURLCFGFILE		(ERRCODE_AREA_SFX|ERRCODE_CLASS_ACCESS|29)
+#define ERRCODE_SFX_WRONGURLCFGFORMAT		(ERRCODE_AREA_SFX|ERRCODE_CLASS_FORMAT|30)
+#define ERRCODE_SFX_NODOCUMENT				(ERRCODE_AREA_SFX|ERRCODE_CLASS_NOTEXISTS|31)
+#define ERRCODE_SFX_INVALIDLINK				(ERRCODE_AREA_SFX|ERRCODE_CLASS_NOTEXISTS|32)
+#define ERRCODE_SFX_INVALIDTRASHPATH		(ERRCODE_AREA_SFX|ERRCODE_CLASS_PATH|33)
+#define ERRCODE_SFX_NOTRESTORABLE			(ERRCODE_AREA_SFX|ERRCODE_CLASS_CREATE|34)
+#define ERRCODE_SFX_NOTRASH					(ERRCODE_AREA_SFX|ERRCODE_CLASS_NOTEXISTS|35)
+#define ERRCODE_SFX_INVALIDSYNTAX			(ERRCODE_AREA_SFX|ERRCODE_CLASS_PATH|36)
+#define ERRCODE_SFX_CANTCREATEFOLDER		(ERRCODE_AREA_SFX|ERRCODE_CLASS_CREATE|37)
+#define ERRCODE_SFX_CANTRENAMEFOLDER		(ERRCODE_AREA_SFX|ERRCODE_CLASS_PATH|38)
+#define ERRCODE_SFX_WRONG_CDF_FORMAT		(ERRCODE_AREA_SFX| ERRCODE_CLASS_READ | 39)
+#define ERRCODE_SFX_EMPTY_SERVER			(ERRCODE_AREA_SFX|ERRCODE_CLASS_NONE|40)
+#define ERRCODE_SFX_NO_ABOBOX				(ERRCODE_AREA_SFX| ERRCODE_CLASS_READ | 41)
+#define ERRCODE_SFX_CANTGETPASSWD			(ERRCODE_AREA_SFX| ERRCODE_CLASS_READ | 42)
+#define ERRCODE_SFX_TARGETFILECORRUPTED		(ERRCODE_AREA_SFX| ERRCODE_CLASS_READ | 43)
 #define ERRCODE_SFX_NOMOREDOCUMENTSALLOWED  (ERRCODE_WARNING_MASK | ERRCODE_AREA_SFX | ERRCODE_CLASS_NONE | 44)
-#define ERRCODE_SFX_NOFILTER                (ERRCODE_AREA_SFX|ERRCODE_CLASS_NOTEXISTS|45)
-#define ERRCODE_SFX_FORCEQUIET              (ERRCODE_WARNING_MASK|ERRCODE_AREA_SFX|ERRCODE_CLASS_NONE|47)
-#define ERRCODE_SFX_CONSULTUSER             (ERRCODE_WARNING_MASK|ERRCODE_AREA_SFX|ERRCODE_CLASS_NONE|48)
-#define ERRCODE_SFX_NEVERCHECKCONTENT       (ERRCODE_AREA_SFX|ERRCODE_CLASS_NONE|49)
+#define ERRCODE_SFX_NOFILTER				(ERRCODE_AREA_SFX|ERRCODE_CLASS_NOTEXISTS|45)
+#define ERRCODE_SFX_FORCEQUIET				(ERRCODE_WARNING_MASK|ERRCODE_AREA_SFX|ERRCODE_CLASS_NONE|47)
+#define ERRCODE_SFX_CONSULTUSER				(ERRCODE_WARNING_MASK|ERRCODE_AREA_SFX|ERRCODE_CLASS_NONE|48)
+#define ERRCODE_SFX_NEVERCHECKCONTENT		(ERRCODE_AREA_SFX|ERRCODE_CLASS_NONE|49)
 #define ERRCODE_SFX_CANTCREATEBACKUP        (ERRCODE_AREA_SFX | ERRCODE_CLASS_CREATE | 50)
 #define ERRCODE_SFX_MACROS_SUPPORT_DISABLED (ERRCODE_WARNING_MASK | ERRCODE_AREA_SFX | ERRCODE_CLASS_NONE | 51)
 #define ERRCODE_SFX_DOCUMENT_MACRO_DISABLED (ERRCODE_WARNING_MASK | ERRCODE_AREA_SFX | ERRCODE_CLASS_NONE | 52)
@@ -87,31 +87,31 @@
 
 
 //Dies und das
-#define ERRCTX_ERROR                    21
-#define ERRCTX_WARNING                  22
+#define ERRCTX_ERROR					21
+#define ERRCTX_WARNING					22
 
 //Documentkontexte
-#define ERRCTX_SFX_LOADTEMPLATE         1
-#define ERRCTX_SFX_SAVEDOC              2
-#define ERRCTX_SFX_SAVEASDOC            3
-#define ERRCTX_SFX_DOCINFO              4
-#define ERRCTX_SFX_DOCTEMPLATE          5
-#define ERRCTX_SFX_MOVEORCOPYCONTENTS   6
+#define ERRCTX_SFX_LOADTEMPLATE			1
+#define ERRCTX_SFX_SAVEDOC				2
+#define ERRCTX_SFX_SAVEASDOC			3
+#define ERRCTX_SFX_DOCINFO				4
+#define ERRCTX_SFX_DOCTEMPLATE			5
+#define ERRCTX_SFX_MOVEORCOPYCONTENTS	6
 
 //Appkontexte
-#define ERRCTX_SFX_DOCMANAGER           50
-#define ERRCTX_SFX_OPENDOC              51
-#define ERRCTX_SFX_NEWDOCDIRECT         52
-#define ERRCTX_SFX_NEWDOC               53
+#define ERRCTX_SFX_DOCMANAGER			50
+#define ERRCTX_SFX_OPENDOC				51
+#define ERRCTX_SFX_NEWDOCDIRECT			52
+#define ERRCTX_SFX_NEWDOC				53
 
 //Organizerkontexte
-#define ERRCTX_SFX_CREATEOBJSH          70
+#define ERRCTX_SFX_CREATEOBJSH			70
 
 //BASIC-Kontexte
-#define ERRCTX_SFX_LOADBASIC            80
+#define ERRCTX_SFX_LOADBASIC			80
 
 //Addressbook contexts
-#define ERRCTX_SFX_SEARCHADDRESS        90
+#define ERRCTX_SFX_SEARCHADDRESS		90
 
 #endif // #ifndef _SFXECODE_HXX
 
diff --git a/svtools/inc/soerr.hxx b/svtools/inc/soerr.hxx
index 41e488480039..86f27fdfadbb 100644
--- a/svtools/inc/soerr.hxx
+++ b/svtools/inc/soerr.hxx
@@ -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
@@ -30,50 +30,50 @@
 #include <tools/errcode.hxx>
 
 // Fehler Codes
-#define RID_SO_ERROR_HANDLER    32000
+#define RID_SO_ERROR_HANDLER	32000
 
 #define SO_ERR() (ERRCODE_AREA_SO | ERRCODE_CLASS_SO)
 #define SO_WRN() (ERRCODE_AREA_SO | ERRCODE_CLASS_SO | ERRCODE_WARNING_MASK)
 
-#define ERRCODE_SO_GENERALERROR             (SO_ERR() | 1)
-#define ERRCODE_SO_CANT_BINDTOSOURCE        (SO_ERR() | 2)
-#define ERRCODE_SO_NOCACHE_UPDATED          (SO_ERR() | 3)
-#define ERRCODE_SO_SOMECACHES_NOTUPDATED    (SO_WRN() | 4)
-#define ERRCODE_SO_MK_UNAVAILABLE           (SO_ERR() | 5)
-#define ERRCODE_SO_E_CLASSDIFF              (SO_ERR() | 6)
-#define ERRCODE_SO_MK_NO_OBJECT             (SO_ERR() | 7)
-#define ERRCODE_SO_MK_EXCEEDED_DEADLINE     (SO_ERR() | 8)
-#define ERRCODE_SO_MK_CONNECT_MANUALLY      (SO_ERR() | 9)
-#define ERRCODE_SO_MK_INTERMEDIATE_INTERFACE_NOT_SUPPORTED  (SO_ERR() | 10)
-#define ERRCODE_SO_NO_INTERFACE             (SO_ERR() | 11)
-#define ERRCODE_SO_OUT_OF_MEMORY            (SO_ERR() | 12)
-#define ERRCODE_SO_MK_SYNTAX                (SO_ERR() | 13)
-#define ERRCODE_SO_MK_REDUCED_TO_SELF       (SO_WRN() | 14)
+#define ERRCODE_SO_GENERALERROR 			(SO_ERR() | 1)
+#define ERRCODE_SO_CANT_BINDTOSOURCE    	(SO_ERR() | 2)
+#define ERRCODE_SO_NOCACHE_UPDATED			(SO_ERR() | 3)
+#define ERRCODE_SO_SOMECACHES_NOTUPDATED	(SO_WRN() | 4)
+#define ERRCODE_SO_MK_UNAVAILABLE			(SO_ERR() | 5)
+#define ERRCODE_SO_E_CLASSDIFF				(SO_ERR() | 6)
+#define ERRCODE_SO_MK_NO_OBJECT				(SO_ERR() | 7)
+#define ERRCODE_SO_MK_EXCEEDED_DEADLINE		(SO_ERR() | 8)
+#define ERRCODE_SO_MK_CONNECT_MANUALLY   	(SO_ERR() | 9)
+#define ERRCODE_SO_MK_INTERMEDIATE_INTERFACE_NOT_SUPPORTED	(SO_ERR() | 10)
+#define ERRCODE_SO_NO_INTERFACE				(SO_ERR() | 11)
+#define ERRCODE_SO_OUT_OF_MEMORY			(SO_ERR() | 12)
+#define ERRCODE_SO_MK_SYNTAX				(SO_ERR() | 13)
+#define ERRCODE_SO_MK_REDUCED_TO_SELF		(SO_WRN() | 14)
 #define ERRCODE_SO_MK_NO_INVERSE            (SO_ERR() | 15)
-#define ERRCODE_SO_MK_NO_PREFIX             (SO_ERR() | 16)
-#define ERRCODE_SO_MK_HIM                   (SO_WRN() | 17)
-#define ERRCODE_SO_MK_US                    (SO_WRN() | 18)
-#define ERRCODE_SO_MK_ME                    (SO_WRN() | 19)
-#define ERRCODE_SO_MK_NOT_BINDABLE          (SO_ERR() | 20)
-#define ERRCODE_SO_NOT_IMPLEMENTED          (SO_ERR() | 21)
-#define ERRCODE_SO_MK_NO_STORAGE            (SO_ERR() | 22)
-#define ERRCODE_SO_FALSE                    (SO_WRN() | 23)
-#define ERRCODE_SO_MK_NEED_GENERIC          (SO_ERR() | 24)
-#define ERRCODE_SO_PENDING                  (SO_ERR() | 25)
-#define ERRCODE_SO_NOT_INPLACEACTIVE        (SO_ERR() | 26)
-#define ERRCODE_SO_LINDEX                   (SO_ERR() | 27)
-#define ERRCODE_SO_CANNOT_DOVERB_NOW        (SO_WRN() | 28)
-#define ERRCODE_SO_OLEOBJ_INVALIDHWND       (SO_WRN() | 29)
-#define ERRCODE_SO_NOVERBS                  (SO_ERR() | 30)
-#define ERRCODE_SO_INVALIDVERB              (SO_WRN() | 31)
-#define ERRCODE_SO_MK_CONNECT               (SO_ERR() | 32)
-#define ERRCODE_SO_NOTIMPL                  (SO_ERR() | 33)
+#define ERRCODE_SO_MK_NO_PREFIX				(SO_ERR() | 16)
+#define ERRCODE_SO_MK_HIM					(SO_WRN() | 17)
+#define ERRCODE_SO_MK_US					(SO_WRN() | 18)
+#define ERRCODE_SO_MK_ME					(SO_WRN() | 19)
+#define ERRCODE_SO_MK_NOT_BINDABLE			(SO_ERR() | 20)
+#define ERRCODE_SO_NOT_IMPLEMENTED			(SO_ERR() | 21)
+#define ERRCODE_SO_MK_NO_STORAGE			(SO_ERR() | 22)
+#define ERRCODE_SO_FALSE					(SO_WRN() | 23)
+#define ERRCODE_SO_MK_NEED_GENERIC  		(SO_ERR() | 24)
+#define ERRCODE_SO_PENDING			 		(SO_ERR() | 25)
+#define ERRCODE_SO_NOT_INPLACEACTIVE		(SO_ERR() | 26)
+#define ERRCODE_SO_LINDEX					(SO_ERR() | 27)
+#define ERRCODE_SO_CANNOT_DOVERB_NOW		(SO_WRN() | 28)
+#define ERRCODE_SO_OLEOBJ_INVALIDHWND		(SO_WRN() | 29)
+#define ERRCODE_SO_NOVERBS					(SO_ERR() | 30)
+#define ERRCODE_SO_INVALIDVERB				(SO_WRN() | 31)
+#define ERRCODE_SO_MK_CONNECT				(SO_ERR() | 32)
+#define ERRCODE_SO_NOTIMPL					(SO_ERR() | 33)
 #define ERRCODE_SO_MK_CANTOPENFILE          (SO_ERR() | 34)
 
 // Fehler Contexte
-#define RID_SO_ERRCTX           32001
+#define RID_SO_ERRCTX			32001
 
-#define ERRCTX_SO_DOVERB        1
+#define ERRCTX_SO_DOVERB		1
 
 
 
diff --git a/svtools/inc/sores.hxx b/svtools/inc/sores.hxx
index e5a7e51b54cf..6a1e225f0eff 100644
--- a/svtools/inc/sores.hxx
+++ b/svtools/inc/sores.hxx
@@ -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
@@ -26,154 +26,154 @@
  ************************************************************************/
 
 //  Strings
-#define STR_INS_OBJECT                          32000
-#define STR_INS_OBJECT_ICON                     32001
-#define STR_INS_FILE                            32002
-#define STR_INS_FILE_ICON                       32003
-#define STR_INS_FILE_LINK                       32004
-#define STR_INS_FILE_ICON_LINK                  32005
-#define STR_PASTE                               32012
-#define STR_ERROR_DDE                           32013
-#define STR_ERROR_OBJNOCREATE                   32014
-#define STR_ERROR_OBJNOCREATE_FROM_FILE         32015
-#define STR_VERB_OPEN                           32016
-#define STR_PLUGIN_CANT_SHOW                    32017
-#define STR_ERROR_OBJNOCREATE_PLUGIN            32018
-#define STR_INS_PLUGIN                          32019
-#define STR_CONVERT_TO                          32010
-#define STR_ACTIVATE_AS                         32021
-#define STR_QUERYUPDATELINKS                    32022
-#define STR_INS_APPLET                          32023
-#define STR_VERB_PROPS                          32025
-#define STR_FURTHER_OBJECT                      32026
-#define STR_EDIT_APPLET                         32029
-#define STR_UNKNOWN_SOURCE                      32027
+#define STR_INS_OBJECT							32000
+#define STR_INS_OBJECT_ICON 					32001
+#define STR_INS_FILE							32002
+#define STR_INS_FILE_ICON						32003
+#define STR_INS_FILE_LINK						32004
+#define STR_INS_FILE_ICON_LINK					32005
+#define STR_PASTE								32012
+#define STR_ERROR_DDE							32013
+#define STR_ERROR_OBJNOCREATE					32014
+#define STR_ERROR_OBJNOCREATE_FROM_FILE			32015
+#define STR_VERB_OPEN							32016
+#define STR_PLUGIN_CANT_SHOW					32017
+#define STR_ERROR_OBJNOCREATE_PLUGIN			32018
+#define STR_INS_PLUGIN							32019
+#define STR_CONVERT_TO							32010
+#define STR_ACTIVATE_AS 						32021
+#define STR_QUERYUPDATELINKS					32022
+#define STR_INS_APPLET							32023
+#define STR_VERB_PROPS  						32025
+#define STR_FURTHER_OBJECT 						32026
+#define STR_EDIT_APPLET							32029
+#define STR_UNKNOWN_SOURCE						32027
 
-#define BMP_PLUGIN                      32000
-#define BMP_OLEOBJ                      32001
-#define MB_PLUGIN                       32000
-#define MI_PLUGIN                       32000
-#define MI_PLUGIN_DEACTIVATE            1
+#define BMP_PLUGIN						32000
+#define BMP_OLEOBJ						32001
+#define MB_PLUGIN						32000
+#define MI_PLUGIN						32000
+#define MI_PLUGIN_DEACTIVATE			1
 
 // Sot Format Strings
-#define STR_FORMAT_START                        32100
-#define STR_FORMAT_STRING                       (STR_FORMAT_START + 1)
-#define STR_FORMAT_BITMAP                       (STR_FORMAT_START + 2)
-#define STR_FORMAT_GDIMETAFILE                  (STR_FORMAT_START + 3)
-    //  #define STR_FORMAT_PRIVATE                      (STR_FORMAT_START + 4)
-    //  #define STR_FORMAT_FILE                         (STR_FORMAT_START + 5)
-    //  #define STR_FORMAT_FILE_LIST                    (STR_FORMAT_START + 6)
-#define STR_FORMAT_RTF                          (STR_FORMAT_START + 7)
-#define STR_FORMAT_ID_DRAWING                   (STR_FORMAT_START + 8)
-#define STR_FORMAT_ID_SVXB                      (STR_FORMAT_START + 9)
-    //  #define STR_FORMAT_ID_SVIM                  (STR_FORMAT_START + 10)
-    //  #define STR_FORMAT_ID_XFA                   (STR_FORMAT_START + 11)
-    //  #define STR_FORMAT_ID_EDITENGINE                (STR_FORMAT_START + 12)
-#define STR_FORMAT_ID_INTERNALLINK_STATE        (STR_FORMAT_START + 13)
-#define STR_FORMAT_ID_SOLK                      (STR_FORMAT_START + 14)
-#define STR_FORMAT_ID_NETSCAPE_BOOKMARK         (STR_FORMAT_START + 15)
-    //  #define STR_FORMAT_ID_TREELISTBOX           (STR_FORMAT_START + 16)
-    //  #define STR_FORMAT_ID_NATIVE                    (STR_FORMAT_START + 17)
-    //  #define STR_FORMAT_ID_OWNERLINK             (STR_FORMAT_START + 18)
-#define STR_FORMAT_ID_STARSERVER                (STR_FORMAT_START + 19)
-#define STR_FORMAT_ID_STAROBJECT                (STR_FORMAT_START + 20)
-#define STR_FORMAT_ID_APPLETOBJECT              (STR_FORMAT_START + 21)
-#define STR_FORMAT_ID_PLUGIN_OBJECT             (STR_FORMAT_START + 22)
-#define STR_FORMAT_ID_STARWRITER_30             (STR_FORMAT_START + 23)
-#define STR_FORMAT_ID_STARWRITER_40             (STR_FORMAT_START + 24)
-#define STR_FORMAT_ID_STARWRITER_50             (STR_FORMAT_START + 25)
-#define STR_FORMAT_ID_STARWRITERWEB_40          (STR_FORMAT_START + 26)
-#define STR_FORMAT_ID_STARWRITERWEB_50          (STR_FORMAT_START + 27)
-#define STR_FORMAT_ID_STARWRITERGLOB_40         (STR_FORMAT_START + 28)
-#define STR_FORMAT_ID_STARWRITERGLOB_50         (STR_FORMAT_START + 29)
-#define STR_FORMAT_ID_STARDRAW                  (STR_FORMAT_START + 30)
-#define STR_FORMAT_ID_STARDRAW_40               (STR_FORMAT_START + 31)
-#define STR_FORMAT_ID_STARIMPRESS_50            (STR_FORMAT_START + 32)
-#define STR_FORMAT_ID_STARDRAW_50               (STR_FORMAT_START + 33)
-#define STR_FORMAT_ID_STARCALC                  (STR_FORMAT_START + 34)
-#define STR_FORMAT_ID_STARCALC_40               (STR_FORMAT_START + 35)
-#define STR_FORMAT_ID_STARCALC_50               (STR_FORMAT_START + 36)
-#define STR_FORMAT_ID_STARCHART                 (STR_FORMAT_START + 37)
-#define STR_FORMAT_ID_STARCHART_40              (STR_FORMAT_START + 38)
-#define STR_FORMAT_ID_STARCHART_50              (STR_FORMAT_START + 39)
-#define STR_FORMAT_ID_STARIMAGE                 (STR_FORMAT_START + 40)
-#define STR_FORMAT_ID_STARIMAGE_40              (STR_FORMAT_START + 41)
-#define STR_FORMAT_ID_STARIMAGE_50              (STR_FORMAT_START + 42)
-#define STR_FORMAT_ID_STARMATH                  (STR_FORMAT_START + 43)
-#define STR_FORMAT_ID_STARMATH_40               (STR_FORMAT_START + 44)
-#define STR_FORMAT_ID_STARMATH_50               (STR_FORMAT_START + 45)
-#define STR_FORMAT_ID_STAROBJECT_PAINTDOC       (STR_FORMAT_START + 46)
-    //  #define STR_FORMAT_ID_FILLED_AREA           (STR_FORMAT_START + 47)
-#define STR_FORMAT_ID_HTML                      (STR_FORMAT_START + 48)
-#define STR_FORMAT_ID_HTML_SIMPLE               (STR_FORMAT_START + 49)
-    //  #define STR_FORMAT_ID_CHAOS                 (STR_FORMAT_START + 50)
-    //  #define STR_FORMAT_ID_CNT_MSGATTACHFILE     (STR_FORMAT_START + 51)
-#define STR_FORMAT_ID_BIFF_5                    (STR_FORMAT_START + 52)
+#define STR_FORMAT_START						32100
+#define STR_FORMAT_STRING           			(STR_FORMAT_START + 1)
+#define STR_FORMAT_BITMAP           			(STR_FORMAT_START + 2)
+#define STR_FORMAT_GDIMETAFILE          		(STR_FORMAT_START + 3)
+    //	#define STR_FORMAT_PRIVATE              		(STR_FORMAT_START + 4)
+    //	#define STR_FORMAT_FILE                 		(STR_FORMAT_START + 5)
+    //	#define STR_FORMAT_FILE_LIST            		(STR_FORMAT_START + 6)
+#define STR_FORMAT_RTF                  		(STR_FORMAT_START + 7)
+#define STR_FORMAT_ID_DRAWING					(STR_FORMAT_START + 8)
+#define STR_FORMAT_ID_SVXB						(STR_FORMAT_START + 9)
+    //	#define STR_FORMAT_ID_SVIM					(STR_FORMAT_START + 10)
+    //	#define STR_FORMAT_ID_XFA					(STR_FORMAT_START + 11)
+    //	#define STR_FORMAT_ID_EDITENGINE				(STR_FORMAT_START + 12)
+#define STR_FORMAT_ID_INTERNALLINK_STATE   		(STR_FORMAT_START + 13)
+#define STR_FORMAT_ID_SOLK 						(STR_FORMAT_START + 14)
+#define STR_FORMAT_ID_NETSCAPE_BOOKMARK			(STR_FORMAT_START + 15)
+    //	#define STR_FORMAT_ID_TREELISTBOX			(STR_FORMAT_START + 16)
+    //	#define STR_FORMAT_ID_NATIVE					(STR_FORMAT_START + 17)
+    //	#define STR_FORMAT_ID_OWNERLINK				(STR_FORMAT_START + 18)
+#define STR_FORMAT_ID_STARSERVER				(STR_FORMAT_START + 19)
+#define STR_FORMAT_ID_STAROBJECT				(STR_FORMAT_START + 20)
+#define STR_FORMAT_ID_APPLETOBJECT				(STR_FORMAT_START + 21)
+#define STR_FORMAT_ID_PLUGIN_OBJECT				(STR_FORMAT_START + 22)
+#define STR_FORMAT_ID_STARWRITER_30				(STR_FORMAT_START + 23)
+#define STR_FORMAT_ID_STARWRITER_40				(STR_FORMAT_START + 24)
+#define STR_FORMAT_ID_STARWRITER_50				(STR_FORMAT_START + 25)
+#define STR_FORMAT_ID_STARWRITERWEB_40			(STR_FORMAT_START + 26)
+#define STR_FORMAT_ID_STARWRITERWEB_50			(STR_FORMAT_START + 27)
+#define STR_FORMAT_ID_STARWRITERGLOB_40			(STR_FORMAT_START + 28)
+#define STR_FORMAT_ID_STARWRITERGLOB_50			(STR_FORMAT_START + 29)
+#define STR_FORMAT_ID_STARDRAW					(STR_FORMAT_START + 30)
+#define STR_FORMAT_ID_STARDRAW_40				(STR_FORMAT_START + 31)
+#define STR_FORMAT_ID_STARIMPRESS_50			(STR_FORMAT_START + 32)
+#define STR_FORMAT_ID_STARDRAW_50				(STR_FORMAT_START + 33)
+#define STR_FORMAT_ID_STARCALC					(STR_FORMAT_START + 34)
+#define STR_FORMAT_ID_STARCALC_40				(STR_FORMAT_START + 35)
+#define STR_FORMAT_ID_STARCALC_50				(STR_FORMAT_START + 36)
+#define STR_FORMAT_ID_STARCHART					(STR_FORMAT_START + 37)
+#define STR_FORMAT_ID_STARCHART_40				(STR_FORMAT_START + 38)
+#define STR_FORMAT_ID_STARCHART_50				(STR_FORMAT_START + 39)
+#define STR_FORMAT_ID_STARIMAGE					(STR_FORMAT_START + 40)
+#define STR_FORMAT_ID_STARIMAGE_40				(STR_FORMAT_START + 41)
+#define STR_FORMAT_ID_STARIMAGE_50				(STR_FORMAT_START + 42)
+#define STR_FORMAT_ID_STARMATH					(STR_FORMAT_START + 43)
+#define STR_FORMAT_ID_STARMATH_40				(STR_FORMAT_START + 44)
+#define STR_FORMAT_ID_STARMATH_50				(STR_FORMAT_START + 45)
+#define STR_FORMAT_ID_STAROBJECT_PAINTDOC		(STR_FORMAT_START + 46)
+    //	#define STR_FORMAT_ID_FILLED_AREA			(STR_FORMAT_START + 47)
+#define STR_FORMAT_ID_HTML						(STR_FORMAT_START + 48)
+#define STR_FORMAT_ID_HTML_SIMPLE				(STR_FORMAT_START + 49)
+    //	#define STR_FORMAT_ID_CHAOS					(STR_FORMAT_START + 50)
+    //	#define STR_FORMAT_ID_CNT_MSGATTACHFILE 	(STR_FORMAT_START + 51)
+#define STR_FORMAT_ID_BIFF_5					(STR_FORMAT_START + 52)
 #define STR_FORMAT_ID_BIFF_8                    (STR_FORMAT_START + 53)
-#define STR_FORMAT_ID_SYLK                      (STR_FORMAT_START + 54)
-    //  #define STR_FORMAT_ID_SYLK_BIGCAPS          (STR_FORMAT_START + 55)
-#define STR_FORMAT_ID_LINK                      (STR_FORMAT_START + 56)
-#define STR_FORMAT_ID_DIF                       (STR_FORMAT_START + 57)
-    //  #define STR_FORMAT_ID_STARDRAW_TABBAR       (STR_FORMAT_START + 58)
-    //  #define STR_FORMAT_ID_SONLK                 (STR_FORMAT_START + 59)
-#define STR_FORMAT_ID_MSWORD_DOC                (STR_FORMAT_START + 60)
-#define STR_FORMAT_ID_STAR_FRAMESET_DOC         (STR_FORMAT_START + 61)
-#define STR_FORMAT_ID_OFFICE_DOC                (STR_FORMAT_START + 62)
-#define STR_FORMAT_ID_NOTES_DOCINFO             (STR_FORMAT_START + 63)
-    //  #define STR_FORMAT_ID_NOTES_HNOTE           (STR_FORMAT_START + 64)
-    //  #define STR_FORMAT_ID_NOTES_NATIVE          (STR_FORMAT_START + 65)
-#define STR_FORMAT_ID_SFX_DOC                   (STR_FORMAT_START + 66)
-    //  #define STR_FORMAT_ID_EVDF                  (STR_FORMAT_START + 67)
-    //  #define STR_FORMAT_ID_ESDF                  (STR_FORMAT_START + 68)
-    //  #define STR_FORMAT_ID_IDF                   (STR_FORMAT_START + 69)
-    //  #define STR_FORMAT_ID_EFTP                  (STR_FORMAT_START + 70)
-    //  #define STR_FORMAT_ID_EFD                   (STR_FORMAT_START + 71)
-    //  #define STR_FORMAT_ID_SVX_FORMFIELDEXCH     (STR_FORMAT_START + 72)
-    //  #define STR_FORMAT_ID_EXTENDED_TABBAR       (STR_FORMAT_START + 73)
-    //  #define STR_FORMAT_ID_SBA_DATAEXCHANGE      (STR_FORMAT_START + 74)
-    //  #define STR_FORMAT_ID_SBA_FIELDDATAEXCHANGE (STR_FORMAT_START + 75)
-    //  #define STR_FORMAT_ID_SBA_PRIVATE_URL       (STR_FORMAT_START + 76)
-    //  #define STR_FORMAT_ID_SBA_TABED             (STR_FORMAT_START + 77)
-    //  #define STR_FORMAT_ID_SBA_TABID             (STR_FORMAT_START + 78)
-    //  #define STR_FORMAT_ID_SBA_JOIN              (STR_FORMAT_START + 79)
-    //  #define STR_FORMAT_ID_OBJECTDESCRIPTOR      (STR_FORMAT_START + 80)
-    //  #define STR_FORMAT_ID_LINKSRCDESCRIPTOR     (STR_FORMAT_START + 81)
-    //  #define STR_FORMAT_ID_EMBED_SOURCE          (STR_FORMAT_START + 82)
-    //  #define STR_FORMAT_ID_LINK_SOURCE           (STR_FORMAT_START + 83)
-    //  #define STR_FORMAT_ID_EMBEDDED_OBJ          (STR_FORMAT_START + 84)
-    //  #define STR_FORMAT_ID_FILECONTENT           (STR_FORMAT_START + 85)
-#define STR_FORMAT_ID_FILEGRPDESCRIPTOR     (STR_FORMAT_START + 86)
-    //  #define STR_FORMAT_ID_FILENAME              (STR_FORMAT_START + 87)
-    //  #define STR_FORMAT_ID_SD_OLE                (STR_FORMAT_START + 88)
-    //  #define STR_FORMAT_ID_EMBEDDED_OBJ_OLE      (STR_FORMAT_START + 89)
-    //  #define STR_FORMAT_ID_EMBED_SOURCE_OLE      (STR_FORMAT_START + 90)
-    //  #define STR_FORMAT_ID_OBJECTDESCRIPTOR_OLE  (STR_FORMAT_START + 91)
-    //  #define STR_FORMAT_ID_LINKSRCDESCRIPTOR_OLE (STR_FORMAT_START + 92)
-    //  #define STR_FORMAT_ID_LINK_SOURCE_OLE       (STR_FORMAT_START + 93)
-    //  #define STR_FORMAT_ID_SBA_CTRLDATAEXCHANGE  (STR_FORMAT_START + 94)
-    //  #define STR_FORMAT_ID_OUTPLACE_OBJ          (STR_FORMAT_START + 95)
-    //  #define STR_FORMAT_ID_CNT_OWN_CLIP          (STR_FORMAT_START + 96)
-    //  #define STR_FORMAT_ID_INET_IMAGE            (STR_FORMAT_START + 97)
-    //  #define STR_FORMAT_ID_NETSCAPE_IMAGE        (STR_FORMAT_START + 98)
-    //  #define STR_FORMAT_ID_SBA_FORMEXCHANGE      (STR_FORMAT_START + 99)
-    //  #define STR_FORMAT_ID_SBA_REPORTEXCHANGE    (STR_FORMAT_START + 100)
-    //  #define STR_FORMAT_ID_UNIFORMRESOURCELOCATOR (STR_FORMAT_START + 101)
-#define STR_FORMAT_ID_STARCHARTDOCUMENT_50      (STR_FORMAT_START + 102)
-#define STR_FORMAT_ID_GRAPHOBJ                  (STR_FORMAT_START + 103)
-#define STR_FORMAT_ID_STARWRITER_60             (STR_FORMAT_START + 104)
-#define STR_FORMAT_ID_STARWRITERWEB_60          (STR_FORMAT_START + 105)
-#define STR_FORMAT_ID_STARWRITERGLOB_60         (STR_FORMAT_START + 106)
-#define STR_FORMAT_ID_STARDRAW_60               (STR_FORMAT_START + 107)
-#define STR_FORMAT_ID_STARIMPRESS_60            (STR_FORMAT_START + 108)
-#define STR_FORMAT_ID_STARCALC_60               (STR_FORMAT_START + 109)
-#define STR_FORMAT_ID_STARCHART_60              (STR_FORMAT_START + 110)
-#define STR_FORMAT_ID_STARMATH_60               (STR_FORMAT_START + 111)
-#define STR_FORMAT_ID_WMF                       (STR_FORMAT_START + 112)
-#define STR_FORMAT_ID_DBACCESS_QUERY            (STR_FORMAT_START + 113)
-#define STR_FORMAT_ID_DBACCESS_TABLE            (STR_FORMAT_START + 114)
-#define STR_FORMAT_ID_DBACCESS_COMMAND          (STR_FORMAT_START + 115)
-#define STR_FORMAT_ID_DIALOG_60                 (STR_FORMAT_START + 116)
+#define STR_FORMAT_ID_SYLK						(STR_FORMAT_START + 54)
+    //	#define STR_FORMAT_ID_SYLK_BIGCAPS			(STR_FORMAT_START + 55)
+#define STR_FORMAT_ID_LINK						(STR_FORMAT_START + 56)
+#define STR_FORMAT_ID_DIF						(STR_FORMAT_START + 57)
+    //	#define STR_FORMAT_ID_STARDRAW_TABBAR		(STR_FORMAT_START + 58)
+    //	#define STR_FORMAT_ID_SONLK					(STR_FORMAT_START + 59)
+#define STR_FORMAT_ID_MSWORD_DOC 				(STR_FORMAT_START + 60)
+#define STR_FORMAT_ID_STAR_FRAMESET_DOC 		(STR_FORMAT_START + 61)
+#define STR_FORMAT_ID_OFFICE_DOC 				(STR_FORMAT_START + 62)
+#define STR_FORMAT_ID_NOTES_DOCINFO				(STR_FORMAT_START + 63)
+    //	#define STR_FORMAT_ID_NOTES_HNOTE			(STR_FORMAT_START + 64)
+    //	#define STR_FORMAT_ID_NOTES_NATIVE			(STR_FORMAT_START + 65)
+#define STR_FORMAT_ID_SFX_DOC					(STR_FORMAT_START + 66)
+    //	#define STR_FORMAT_ID_EVDF					(STR_FORMAT_START + 67)
+    //	#define STR_FORMAT_ID_ESDF					(STR_FORMAT_START + 68)
+    //	#define STR_FORMAT_ID_IDF					(STR_FORMAT_START + 69)
+    //	#define STR_FORMAT_ID_EFTP					(STR_FORMAT_START + 70)
+    //	#define STR_FORMAT_ID_EFD					(STR_FORMAT_START + 71)
+    //	#define STR_FORMAT_ID_SVX_FORMFIELDEXCH		(STR_FORMAT_START + 72)
+    //	#define STR_FORMAT_ID_EXTENDED_TABBAR		(STR_FORMAT_START + 73)
+    //	#define STR_FORMAT_ID_SBA_DATAEXCHANGE		(STR_FORMAT_START + 74)
+    //	#define STR_FORMAT_ID_SBA_FIELDDATAEXCHANGE (STR_FORMAT_START + 75)
+    //	#define STR_FORMAT_ID_SBA_PRIVATE_URL		(STR_FORMAT_START + 76)
+    //	#define STR_FORMAT_ID_SBA_TABED				(STR_FORMAT_START + 77)
+    //	#define STR_FORMAT_ID_SBA_TABID				(STR_FORMAT_START + 78)
+    //	#define STR_FORMAT_ID_SBA_JOIN				(STR_FORMAT_START + 79)
+    //	#define STR_FORMAT_ID_OBJECTDESCRIPTOR		(STR_FORMAT_START + 80)
+    //	#define STR_FORMAT_ID_LINKSRCDESCRIPTOR		(STR_FORMAT_START + 81)
+    //	#define STR_FORMAT_ID_EMBED_SOURCE			(STR_FORMAT_START + 82)
+    //	#define STR_FORMAT_ID_LINK_SOURCE			(STR_FORMAT_START + 83)
+    //	#define STR_FORMAT_ID_EMBEDDED_OBJ			(STR_FORMAT_START + 84)
+    //	#define STR_FORMAT_ID_FILECONTENT			(STR_FORMAT_START + 85)
+#define STR_FORMAT_ID_FILEGRPDESCRIPTOR	   	(STR_FORMAT_START + 86)
+    //	#define STR_FORMAT_ID_FILENAME				(STR_FORMAT_START + 87)
+    //	#define STR_FORMAT_ID_SD_OLE				(STR_FORMAT_START + 88)
+    //	#define STR_FORMAT_ID_EMBEDDED_OBJ_OLE		(STR_FORMAT_START + 89)
+    //	#define STR_FORMAT_ID_EMBED_SOURCE_OLE		(STR_FORMAT_START + 90)
+    //	#define STR_FORMAT_ID_OBJECTDESCRIPTOR_OLE	(STR_FORMAT_START + 91)
+    //	#define STR_FORMAT_ID_LINKSRCDESCRIPTOR_OLE	(STR_FORMAT_START + 92)
+    //	#define STR_FORMAT_ID_LINK_SOURCE_OLE		(STR_FORMAT_START + 93)
+    //	#define STR_FORMAT_ID_SBA_CTRLDATAEXCHANGE	(STR_FORMAT_START + 94)
+    //	#define STR_FORMAT_ID_OUTPLACE_OBJ			(STR_FORMAT_START + 95)
+    //	#define STR_FORMAT_ID_CNT_OWN_CLIP			(STR_FORMAT_START + 96)
+    //	#define STR_FORMAT_ID_INET_IMAGE			(STR_FORMAT_START + 97)
+    //	#define STR_FORMAT_ID_NETSCAPE_IMAGE		(STR_FORMAT_START + 98)
+    //	#define STR_FORMAT_ID_SBA_FORMEXCHANGE		(STR_FORMAT_START + 99)
+    //	#define STR_FORMAT_ID_SBA_REPORTEXCHANGE	(STR_FORMAT_START + 100)
+    //	#define STR_FORMAT_ID_UNIFORMRESOURCELOCATOR (STR_FORMAT_START + 101)
+#define STR_FORMAT_ID_STARCHARTDOCUMENT_50		(STR_FORMAT_START + 102)
+#define STR_FORMAT_ID_GRAPHOBJ					(STR_FORMAT_START + 103)
+#define STR_FORMAT_ID_STARWRITER_60				(STR_FORMAT_START + 104)
+#define STR_FORMAT_ID_STARWRITERWEB_60			(STR_FORMAT_START + 105)
+#define STR_FORMAT_ID_STARWRITERGLOB_60			(STR_FORMAT_START + 106)
+#define STR_FORMAT_ID_STARDRAW_60				(STR_FORMAT_START + 107)
+#define STR_FORMAT_ID_STARIMPRESS_60			(STR_FORMAT_START + 108)
+#define STR_FORMAT_ID_STARCALC_60				(STR_FORMAT_START + 109)
+#define STR_FORMAT_ID_STARCHART_60				(STR_FORMAT_START + 110)
+#define STR_FORMAT_ID_STARMATH_60				(STR_FORMAT_START + 111)
+#define STR_FORMAT_ID_WMF						(STR_FORMAT_START + 112)
+#define STR_FORMAT_ID_DBACCESS_QUERY			(STR_FORMAT_START + 113)
+#define STR_FORMAT_ID_DBACCESS_TABLE			(STR_FORMAT_START + 114)
+#define STR_FORMAT_ID_DBACCESS_COMMAND			(STR_FORMAT_START + 115)
+#define STR_FORMAT_ID_DIALOG_60					(STR_FORMAT_START + 116)
     // #define STR_FORMAT_ID_EMF                    (STR_FORMAT_START + 117)
     // #define STR_FORMAT_ID_BIFF_8                 (STR_FORMAT_START + 118)
 #define STR_FORMAT_ID_HTML_NO_COMMENT           (STR_FORMAT_START + 119)
-#define STR_FORMAT_END                          (STR_FORMAT_ID_HTML_NO_COMMENT)
+#define STR_FORMAT_END							(STR_FORMAT_ID_HTML_NO_COMMENT)
diff --git a/svtools/inc/statusbarcontroller.hxx b/svtools/inc/statusbarcontroller.hxx
index 7856d96bcd77..eb285bc76146 100644
--- a/svtools/inc/statusbarcontroller.hxx
+++ b/svtools/inc/statusbarcontroller.hxx
@@ -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
@@ -66,8 +66,8 @@ class SVT_DLLPUBLIC StatusbarController : public ::com::sun::star::frame::XStatu
                              const rtl::OUString& aCommandURL,
                              unsigned short       nID );
         StatusbarController();
-        virtual ~StatusbarController();
-
+        virtual ~StatusbarController();        
+        
         ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > getFrameInterface() const;
         ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > getServiceManager() const;
         ::com::sun::star::uno::Reference< ::com::sun::star::frame::XLayoutManager > getLayoutManager() const;
@@ -77,7 +77,7 @@ class SVT_DLLPUBLIC StatusbarController : public ::com::sun::star::frame::XStatu
         void updateStatus();
 
         ::Rectangle getControlRect() const;
-
+        
         // XInterface
         virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& aType ) throw (::com::sun::star::uno::RuntimeException);
         virtual void SAL_CALL acquire() throw ();
@@ -85,18 +85,18 @@ class SVT_DLLPUBLIC StatusbarController : public ::com::sun::star::frame::XStatu
 
         // XInitialization
         virtual void SAL_CALL initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments ) throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException);
-
+            
         // XUpdatable
         virtual void SAL_CALL update() throw (::com::sun::star::uno::RuntimeException);
-
+        
         // XComponent
         virtual void SAL_CALL dispose() throw (::com::sun::star::uno::RuntimeException);
         virtual void SAL_CALL addEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& xListener ) throw (::com::sun::star::uno::RuntimeException);
         virtual void SAL_CALL removeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& aListener ) throw (::com::sun::star::uno::RuntimeException);
-
+        
         // XEventListener
         virtual void SAL_CALL disposing( const com::sun::star::lang::EventObject& Source ) throw ( ::com::sun::star::uno::RuntimeException );
-
+        
         // XStatusListener
         virtual void SAL_CALL statusChanged( const ::com::sun::star::frame::FeatureStateEvent& Event ) throw ( ::com::sun::star::uno::RuntimeException );
 
@@ -104,22 +104,22 @@ class SVT_DLLPUBLIC StatusbarController : public ::com::sun::star::frame::XStatu
         virtual ::sal_Bool SAL_CALL mouseButtonDown( const ::com::sun::star::awt::MouseEvent& aMouseEvent ) throw (::com::sun::star::uno::RuntimeException);
         virtual ::sal_Bool SAL_CALL mouseMove( const ::com::sun::star::awt::MouseEvent& aMouseEvent ) throw (::com::sun::star::uno::RuntimeException);
         virtual ::sal_Bool SAL_CALL mouseButtonUp( const ::com::sun::star::awt::MouseEvent& aMouseEvent ) throw (::com::sun::star::uno::RuntimeException);
-        virtual void SAL_CALL command( const ::com::sun::star::awt::Point& aPos,
-                                       ::sal_Int32 nCommand,
-                                       ::sal_Bool bMouseEvent,
+        virtual void SAL_CALL command( const ::com::sun::star::awt::Point& aPos, 
+                                       ::sal_Int32 nCommand, 
+                                       ::sal_Bool bMouseEvent, 
                                        const ::com::sun::star::uno::Any& aData ) throw (::com::sun::star::uno::RuntimeException);
-        virtual void SAL_CALL paint( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XGraphics >& xGraphics,
-                                     const ::com::sun::star::awt::Rectangle& rOutputRectangle,
+        virtual void SAL_CALL paint( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XGraphics >& xGraphics, 
+                                     const ::com::sun::star::awt::Rectangle& rOutputRectangle, 
                                      ::sal_Int32 nItemId, ::sal_Int32 nStyle ) throw (::com::sun::star::uno::RuntimeException);
         virtual void SAL_CALL click() throw (::com::sun::star::uno::RuntimeException);
         virtual void SAL_CALL doubleClick() throw (::com::sun::star::uno::RuntimeException);
-
+ 
     protected:
         struct Listener
         {
             Listener( const ::com::sun::star::util::URL& rURL, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch >& rDispatch ) :
                 aURL( rURL ), xDispatch( rDispatch ) {}
-
+            
             ::com::sun::star::util::URL aURL;
             ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch > xDispatch;
         };
@@ -128,19 +128,19 @@ class SVT_DLLPUBLIC StatusbarController : public ::com::sun::star::frame::XStatu
                                  com::sun::star::uno::Reference< com::sun::star::frame::XDispatch >,
                                  ::rtl::OUStringHash,
                                  ::std::equal_to< ::rtl::OUString > > URLToDispatchMap;
-
+        
         // methods to support status forwarder, known by the old sfx2 toolbox controller implementation
         void addStatusListener( const rtl::OUString& aCommandURL );
         void removeStatusListener( const rtl::OUString& aCommandURL );
         void bindListener();
         void unbindListener();
         sal_Bool isBound() const;
-
+        
         // execute methods
         // execute bound status bar controller command/execute various commands
         void execute( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aArgs );
         void execute( const rtl::OUString& aCommand, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aArgs );
-
+        
         sal_Bool                                                                            m_bInitialized : 1,
                                                                                             m_bDisposed : 1;
         unsigned short                                                                      m_nID;
diff --git a/svtools/inc/stdmenu.hxx b/svtools/inc/stdmenu.hxx
index 1b7e9816a103..73c79eeb37e9 100644
--- a/svtools/inc/stdmenu.hxx
+++ b/svtools/inc/stdmenu.hxx
@@ -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
@@ -153,59 +153,59 @@ FontList; FontNameMenu; FontStyleMenu; FontSizeBox
 class SVT_DLLPUBLIC FontNameMenu : public PopupMenu
 {
 private:
-    XubString       maCurName;
-    Link            maSelectHdl;
-    Link            maHighlightHdl;
+    XubString		maCurName;
+    Link			maSelectHdl;
+    Link			maHighlightHdl;
 
 public:
                     FontNameMenu();
-    virtual         ~FontNameMenu();
+    virtual 		~FontNameMenu();
 
-    virtual void    Select();
-    virtual void    Highlight();
+    virtual void	Select();
+    virtual void	Highlight();
 
-    void            Fill( const FontList* pList );
+    void			Fill( const FontList* pList );
 
-    void            SetCurName( const XubString& rName );
+    void			SetCurName( const XubString& rName );
     const XubString& GetCurName() const { return maCurName; }
 
-    void            SetSelectHdl( const Link& rLink ) { maSelectHdl = rLink; }
-    const Link&     GetSelectHdl() const { return maSelectHdl; }
-    void            SetHighlightHdl( const Link& rLink ) { maHighlightHdl = rLink; }
-    const Link&     GetHighlightHdl() const { return maHighlightHdl; }
+    void			SetSelectHdl( const Link& rLink ) { maSelectHdl = rLink; }
+    const Link& 	GetSelectHdl() const { return maSelectHdl; }
+    void			SetHighlightHdl( const Link& rLink ) { maHighlightHdl = rLink; }
+    const Link& 	GetHighlightHdl() const { return maHighlightHdl; }
 };
 
 // -----------------
 // - FontStyleMenu -
 // -----------------
 
-#define FONTSTYLEMENU_FIRSTID       62000
-#define FONTSTYLEMENU_LASTID        62999
+#define FONTSTYLEMENU_FIRSTID		62000
+#define FONTSTYLEMENU_LASTID		62999
 
 class SVT_DLLPUBLIC FontStyleMenu : public PopupMenu
 {
 private:
-    XubString       maCurStyle;
-    Link            maSelectHdl;
-    Link            maHighlightHdl;
+    XubString		maCurStyle;
+    Link			maSelectHdl;
+    Link			maHighlightHdl;
 
-    SVT_DLLPRIVATE BOOL         ImplIsAlreadyInserted( const XubString& rStyleName, USHORT nCount );
+    SVT_DLLPRIVATE BOOL			ImplIsAlreadyInserted( const XubString& rStyleName, USHORT nCount );
 
 public:
                     FontStyleMenu();
-    virtual         ~FontStyleMenu();
+    virtual 		~FontStyleMenu();
 
-    virtual void    Select();
-    virtual void    Highlight();
+    virtual void	Select();
+    virtual void	Highlight();
 
-    void            Fill( const XubString& rName, const FontList* pList );
-    void            SetCurStyle( const XubString& rStyle );
+    void			Fill( const XubString& rName, const FontList* pList );
+    void			SetCurStyle( const XubString& rStyle );
     const XubString& GetCurStyle() const { return maCurStyle; }
 
-    void            SetSelectHdl( const Link& rLink ) { maSelectHdl = rLink; }
-    const Link&     GetSelectHdl() const { return maSelectHdl; }
-    void            SetHighlightHdl( const Link& rLink ) { maHighlightHdl = rLink; }
-    const Link&     GetHighlightHdl() const { return maHighlightHdl; }
+    void			SetSelectHdl( const Link& rLink ) { maSelectHdl = rLink; }
+    const Link& 	GetSelectHdl() const { return maSelectHdl; }
+    void			SetHighlightHdl( const Link& rLink ) { maHighlightHdl = rLink; }
+    const Link& 	GetHighlightHdl() const { return maHighlightHdl; }
 };
 
 // ----------------
@@ -215,27 +215,27 @@ public:
 class SVT_DLLPUBLIC FontSizeMenu : public PopupMenu
 {
 private:
-    long*           mpHeightAry;
-    long            mnCurHeight;
-    Link            maSelectHdl;
-    Link            maHighlightHdl;
+    long*			mpHeightAry;
+    long			mnCurHeight;
+    Link			maSelectHdl;
+    Link			maHighlightHdl;
 
 public:
                     FontSizeMenu();
                     ~FontSizeMenu();
 
-    virtual void    Select();
-    virtual void    Highlight();
+    virtual void	Select();
+    virtual void	Highlight();
 
-    void            Fill( const FontInfo& rInfo, const FontList* pList );
+    void			Fill( const FontInfo& rInfo, const FontList* pList );
 
-    void            SetCurHeight( long nHeight );
-    long            GetCurHeight() const { return mnCurHeight; }
+    void			SetCurHeight( long nHeight );
+    long			GetCurHeight() const { return mnCurHeight; }
 
-    void            SetSelectHdl( const Link& rLink ) { maSelectHdl = rLink; }
-    const Link&     GetSelectHdl() const { return maSelectHdl; }
-    void            SetHighlightHdl( const Link& rLink ) { maHighlightHdl = rLink; }
-    const Link&     GetHighlightHdl() const { return maHighlightHdl; }
+    void			SetSelectHdl( const Link& rLink ) { maSelectHdl = rLink; }
+    const Link& 	GetSelectHdl() const { return maSelectHdl; }
+    void			SetHighlightHdl( const Link& rLink ) { maHighlightHdl = rLink; }
+    const Link& 	GetHighlightHdl() const { return maHighlightHdl; }
 };
 
-#endif  // _STDMENU_HXX
+#endif	// _STDMENU_HXX
diff --git a/svtools/inc/svtools/AccessibleBrowseBoxObjType.hxx b/svtools/inc/svtools/AccessibleBrowseBoxObjType.hxx
index fdca9a80af13..e2f429309675 100644
--- a/svtools/inc/svtools/AccessibleBrowseBoxObjType.hxx
+++ b/svtools/inc/svtools/AccessibleBrowseBoxObjType.hxx
@@ -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
diff --git a/svtools/inc/svtools/FilterConfigItem.hxx b/svtools/inc/svtools/FilterConfigItem.hxx
index bdae8dabb1c3..76099172dd19 100644
--- a/svtools/inc/svtools/FilterConfigItem.hxx
+++ b/svtools/inc/svtools/FilterConfigItem.hxx
@@ -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
@@ -41,18 +41,18 @@
 
 class SVT_DLLPUBLIC FilterConfigItem
 {
-        ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > xUpdatableView;
+        ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface	> xUpdatableView;
         ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > xPropSet;
         ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > aFilterData;
 
-        sal_Bool    bModified;
+        sal_Bool	bModified;
 
-        SVT_DLLPRIVATE sal_Bool ImplGetPropertyValue( ::com::sun::star::uno::Any& rAny,
+        SVT_DLLPRIVATE sal_Bool	ImplGetPropertyValue( ::com::sun::star::uno::Any& rAny,
                         const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& rXPropSet,
                             const ::rtl::OUString& rPropName,
                                 sal_Bool bTestPropertyAvailability );
 
-        SVT_DLLPRIVATE void     ImpInitTree( const String& rTree );
+        SVT_DLLPRIVATE void		ImpInitTree( const String& rTree );
 
 
         SVT_DLLPRIVATE static ::com::sun::star::beans::PropertyValue* GetPropertyValue(
@@ -73,9 +73,9 @@ class SVT_DLLPUBLIC FilterConfigItem
         // 1. FilterData PropertySequence
         // 2. configuration
         // 3. given default
-        sal_Bool    ReadBool( const ::rtl::OUString& rKey, sal_Bool bDefault );
-        sal_Int32   ReadInt32( const ::rtl::OUString& rKey, sal_Int32 nDefault );
-        ::com::sun::star::awt::Size
+        sal_Bool	ReadBool( const ::rtl::OUString& rKey, sal_Bool bDefault );
+        sal_Int32	ReadInt32( const ::rtl::OUString& rKey, sal_Int32 nDefault );
+        ::com::sun::star::awt::Size	
                     ReadSize( const ::rtl::OUString& rKey, const ::com::sun::star::awt::Size& rDefault );
         ::rtl::OUString
                     ReadString( const ::rtl::OUString& rKey, const ::rtl::OUString& rDefault );
@@ -84,11 +84,11 @@ class SVT_DLLPUBLIC FilterConfigItem
 
         // try to store to configuration
         // and always stores into the FilterData sequence
-        void        WriteBool( const ::rtl::OUString& rKey, sal_Bool bValue );
-        void        WriteInt32( const ::rtl::OUString& rKey, sal_Int32 nValue );
-        void        WriteSize( const ::rtl::OUString& rKey, const ::com::sun::star::awt::Size& rSize );
-        void        WriteString( const ::rtl::OUString& rKey, const ::rtl::OUString& rString );
-        void        WriteAny( const rtl::OUString& rKey, const ::com::sun::star::uno::Any& rAny );
+        void		WriteBool( const ::rtl::OUString& rKey, sal_Bool bValue );
+        void		WriteInt32( const ::rtl::OUString& rKey, sal_Int32 nValue );
+        void		WriteSize( const ::rtl::OUString& rKey, const ::com::sun::star::awt::Size& rSize );
+        void		WriteString( const ::rtl::OUString& rKey, const ::rtl::OUString& rString );
+        void		WriteAny( const rtl::OUString& rKey, const ::com::sun::star::uno::Any& rAny );
 
         ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > GetFilterData() const;
 
@@ -96,5 +96,5 @@ class SVT_DLLPUBLIC FilterConfigItem
         ::com::sun::star::uno::Reference< ::com::sun::star::task::XStatusIndicator > GetStatusIndicator() const;
 };
 
-#endif  // _FILTER_CONFIG_ITEM_HXX_
+#endif	// _FILTER_CONFIG_ITEM_HXX_
 
diff --git a/svtools/inc/svtools/accessibilityoptions.hxx b/svtools/inc/svtools/accessibilityoptions.hxx
index 784f570825fb..d0f7cad0288f 100644
--- a/svtools/inc/svtools/accessibilityoptions.hxx
+++ b/svtools/inc/svtools/accessibilityoptions.hxx
@@ -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
@@ -41,41 +41,41 @@ class SVT_DLLPUBLIC SvtAccessibilityOptions:
 {
 private:
     static SvtAccessibilityOptions_Impl* volatile sm_pSingleImplConfig;
-    static sal_Int32                     volatile sm_nAccessibilityRefCount;
+    static sal_Int32					 volatile sm_nAccessibilityRefCount;
 
 public:
     SvtAccessibilityOptions();
     virtual ~SvtAccessibilityOptions();
 
     // get & set config entries
-    sal_Bool    GetIsForDrawings() const;       // obsolete!
-    sal_Bool    GetIsForBorders() const;        // obsolete!
+    sal_Bool 	GetIsForDrawings() const;		// obsolete!
+    sal_Bool    GetIsForBorders() const;		// obsolete!
     sal_Bool    GetIsForPagePreviews() const;
-    sal_Bool    GetIsHelpTipsDisappear() const;
-    sal_Bool    GetIsAllowAnimatedGraphics() const;
-    sal_Bool    GetIsAllowAnimatedText() const;
-    sal_Bool    GetIsAutomaticFontColor() const;
-    sal_Bool    GetIsSystemFont() const;
-    sal_Int16   GetHelpTipSeconds() const;
+    sal_Bool 	GetIsHelpTipsDisappear() const;
+    sal_Bool 	GetIsAllowAnimatedGraphics() const;
+    sal_Bool 	GetIsAllowAnimatedText() const;
+    sal_Bool 	GetIsAutomaticFontColor() const;
+    sal_Bool 	GetIsSystemFont() const;
+    sal_Int16	GetHelpTipSeconds() const;
     sal_Bool    IsSelectionInReadonly() const;
-    sal_Bool    GetAutoDetectSystemHC() const;
+    sal_Bool	GetAutoDetectSystemHC() const;
 
     void        SetIsForPagePreviews(sal_Bool bSet);
-    void        SetIsHelpTipsDisappear(sal_Bool bSet);
-    void        SetIsAllowAnimatedGraphics(sal_Bool bSet);
-    void        SetIsAllowAnimatedText(sal_Bool bSet);
-    void        SetIsAutomaticFontColor(sal_Bool bSet);
-    void        SetIsSystemFont(sal_Bool bSet);
-    void        SetHelpTipSeconds(sal_Int16 nSet);
+    void 		SetIsHelpTipsDisappear(sal_Bool bSet);
+    void 		SetIsAllowAnimatedGraphics(sal_Bool bSet);
+    void 		SetIsAllowAnimatedText(sal_Bool bSet);
+    void 		SetIsAutomaticFontColor(sal_Bool bSet);
+    void 		SetIsSystemFont(sal_Bool bSet);
+    void		SetHelpTipSeconds(sal_Int16 nSet);
     void        SetSelectionInReadonly(sal_Bool bSet);
     void        SetAutoDetectSystemHC(sal_Bool bSet);
 
     sal_Bool                IsModified() const;
-    void                    Commit();
+    void		            Commit();
 
     //SfxListener:
-    virtual void        Notify( SfxBroadcaster& rBC, const SfxHint& rHint );
-    void        SetVCLSettings();
+    virtual void		Notify( SfxBroadcaster& rBC, const SfxHint& rHint );
+    void 		SetVCLSettings();
 };
 
 #endif // #ifndef INCLUDED_SVTOOLS_ACCESSIBILITYOPTIONS_HXX
diff --git a/svtools/inc/svtools/accessiblefactory.hxx b/svtools/inc/svtools/accessiblefactory.hxx
index 9606e93a2fa0..d653c6c040bc 100755
--- a/svtools/inc/svtools/accessiblefactory.hxx
+++ b/svtools/inc/svtools/accessiblefactory.hxx
@@ -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
diff --git a/svtools/inc/svtools/accessibletable.hxx b/svtools/inc/svtools/accessibletable.hxx
index 8ff17a2b71c7..3381d342cf14 100755
--- a/svtools/inc/svtools/accessibletable.hxx
+++ b/svtools/inc/svtools/accessibletable.hxx
@@ -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
@@ -64,7 +64,7 @@ enum AccessibleTableControlObjType
 
 // ============================================================================
 
-#define XACC ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >
+#define	XACC ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >
 
 /** This abstract class provides methods to implement an accessible table object.
 */
@@ -72,21 +72,21 @@ class IAccessibleTable
 {
 public:
     /** @return  The position of the current row. */
-    virtual sal_Int32               GetCurrentRow() const = 0;
+    virtual sal_Int32				GetCurrentRow() const = 0;
     /** @return  The position of the current column. */
-    virtual sal_Int32               GetCurrentColumn() const = 0;
+    virtual sal_Int32				GetCurrentColumn() const = 0;
     /** Creates and returns the accessible object of the whole GridControl. */
     virtual XACC CreateAccessible()= 0;
     virtual XACC CreateAccessibleControl( sal_Int32 _nIndex )= 0;
     virtual ::rtl::OUString GetAccessibleObjectName(AccessibleTableControlObjType eObjType, sal_Int32 _nRow, sal_Int32 _nCol) const= 0;
-    virtual sal_Bool    GoToCell( sal_Int32 _nColumnPos, sal_Int32 _nRow )= 0;
-    virtual sal_Bool    HasColHeader() = 0;
-    virtual sal_Bool    HasRowHeader() = 0;
+    virtual sal_Bool	GoToCell( sal_Int32 _nColumnPos, sal_Int32 _nRow )= 0;
+    virtual sal_Bool	HasColHeader() = 0;
+    virtual sal_Bool	HasRowHeader() = 0;
 
     /** return the description of the specified object.
-        @param  eObjType
+        @param	eObjType
             The type to ask for
-        @param  _nPosition
+        @param	_nPosition
             The position of a tablecell (index position), header bar  colum/row cell
         @return
             The description of the specified object.
@@ -102,12 +102,12 @@ public:
     virtual Rectangle GetWindowExtentsRelative( Window *pRelativeWindow ) const = 0;
     virtual void GrabFocus()= 0;
     virtual XACC GetAccessible( BOOL bCreate = TRUE )= 0;
-    virtual Window* GetAccessibleParentWindow() const= 0;
-    virtual Window* GetWindowInstance()= 0;
+    virtual Window*	GetAccessibleParentWindow() const= 0;
+    virtual Window*	GetWindowInstance()= 0;
     virtual sal_Int32 GetAccessibleControlCount() const = 0;
     virtual sal_Bool ConvertPointToControlIndex( sal_Int32& _rnIndex, const Point& _rPoint )= 0;
-    virtual long GetRowCount() const= 0;
-    virtual long GetColumnCount() const= 0;
+    virtual	long GetRowCount() const= 0;
+    virtual	long GetColumnCount() const= 0;
     virtual sal_Bool HasRowHeader() const= 0;
     virtual sal_Int32 GetSelectedRowCount() const= 0;
     virtual bool IsRowSelected( long _nRow ) const= 0;
@@ -117,10 +117,10 @@ public:
     virtual Rectangle GetFieldCharacterBounds(sal_Int32 _nRow,sal_Int32 _nColumnPos,sal_Int32 nIndex)= 0;
     virtual sal_Int32 GetFieldIndexAtPoint(sal_Int32 _nRow,sal_Int32 _nColumnPos,const Point& _rPoint)= 0;
     virtual void FillAccessibleStateSetForCell( ::utl::AccessibleStateSetHelper& _rStateSet, sal_Int32 _nRow, sal_uInt16 _nColumnPos ) const= 0;
-    virtual ::rtl::OUString GetRowDescription( sal_Int32 _nRow ) const = 0;
+    virtual ::rtl::OUString	GetRowDescription( sal_Int32 _nRow ) const = 0;
     virtual ::rtl::OUString GetRowName(sal_Int32 _nIndex) const = 0;
-    virtual ::rtl::OUString GetColumnDescription( sal_uInt16 _nColumnPos ) const = 0;
-    virtual ::rtl::OUString GetColumnName( sal_Int32 _nIndex ) const = 0;
+    virtual ::rtl::OUString	GetColumnDescription( sal_uInt16 _nColumnPos ) const = 0;
+    virtual ::rtl::OUString	GetColumnName( sal_Int32 _nIndex ) const = 0;
     virtual ::com::sun::star::uno::Any GetCellContent( sal_Int32 _nRowPos, sal_Int32 _nColPos) const = 0;
     virtual std::vector<sal_Int32>& GetSelectedRows() = 0;
     virtual void RemoveSelectedRow(sal_Int32 _nRowPos) = 0;
diff --git a/svtools/inc/svtools/accessibletableprovider.hxx b/svtools/inc/svtools/accessibletableprovider.hxx
index d14aecce9f58..17ab339951a8 100644
--- a/svtools/inc/svtools/accessibletableprovider.hxx
+++ b/svtools/inc/svtools/accessibletableprovider.hxx
@@ -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
@@ -59,7 +59,7 @@ enum AccessibleTableChildIndex
 
 // ============================================================================
 
-#define XACC ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >
+#define	XACC ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >
 
 /** This abstract class provides methods to implement an accessible table object.
 */
@@ -67,79 +67,79 @@ class IAccessibleTableProvider
 {
 public:
     /** @return  The count of the rows. */
-    virtual long                    GetRowCount() const = 0;
+    virtual	long					GetRowCount() const = 0;
     /** @return  The count of the columns. */
-    virtual sal_uInt16              GetColumnCount() const = 0;
+    virtual sal_uInt16				GetColumnCount() const = 0;
 
     /** @return  The position of the current row. */
-    virtual sal_Int32               GetCurrRow() const = 0;
+    virtual sal_Int32				GetCurrRow() const = 0;
     /** @return  The position of the current column. */
-    virtual sal_uInt16              GetCurrColumn() const = 0;
+    virtual sal_uInt16				GetCurrColumn() const = 0;
 
     /** @return  The description of a row.
         @param _nRow The row which description is in demand. */
-    virtual ::rtl::OUString         GetRowDescription( sal_Int32 _nRow ) const = 0;
+    virtual ::rtl::OUString			GetRowDescription( sal_Int32 _nRow ) const = 0;
     /** @return  The description of a column.
         @param _nColumn The column which description is in demand. */
-    virtual ::rtl::OUString         GetColumnDescription( sal_uInt16 _nColumnPos ) const = 0;
+    virtual ::rtl::OUString			GetColumnDescription( sal_uInt16 _nColumnPos ) const = 0;
 
     /** @return  <TRUE/>, if the object has a row header. */
-    virtual sal_Bool                HasRowHeader() const = 0; //GetColumnId
+    virtual sal_Bool				HasRowHeader() const = 0; //GetColumnId
     /** @return  <TRUE/>, if the object can focus a cell. */
-    virtual sal_Bool                IsCellFocusable() const = 0;
-    virtual sal_Bool                GoToCell( sal_Int32 _nRow, sal_uInt16 _nColumnPos ) = 0;
-
-    virtual void                    SetNoSelection() = 0;
-    virtual void                    SelectAll() = 0;
-    virtual void                    SelectRow( long _nRow, BOOL _bSelect = TRUE, BOOL bExpand = TRUE ) = 0;
-    virtual void                    SelectColumn( sal_uInt16 _nColumnPos, sal_Bool _bSelect = sal_True ) = 0;
-    virtual sal_Int32               GetSelectedRowCount() const = 0;
-    virtual sal_Int32               GetSelectedColumnCount() const = 0;
+    virtual sal_Bool				IsCellFocusable() const = 0;
+    virtual sal_Bool				GoToCell( sal_Int32 _nRow, sal_uInt16 _nColumnPos ) = 0;
+
+    virtual void					SetNoSelection() = 0;
+    virtual void					SelectAll() = 0;
+    virtual void					SelectRow( long _nRow, BOOL _bSelect = TRUE, BOOL bExpand = TRUE ) = 0;
+    virtual void					SelectColumn( sal_uInt16 _nColumnPos, sal_Bool _bSelect = sal_True ) = 0;
+    virtual sal_Int32				GetSelectedRowCount() const = 0;
+    virtual sal_Int32				GetSelectedColumnCount() const = 0;
     /** @return  <TRUE/>, if the row is selected. */
-    virtual bool                    IsRowSelected( long _nRow ) const = 0;
-    virtual sal_Bool                IsColumnSelected( long _nColumnPos ) const = 0;
-    virtual void                    GetAllSelectedRows( ::com::sun::star::uno::Sequence< sal_Int32 >& _rRows ) const = 0;
-    virtual void                    GetAllSelectedColumns( ::com::sun::star::uno::Sequence< sal_Int32 >& _rColumns ) const = 0;
+    virtual bool					IsRowSelected( long _nRow ) const = 0;
+    virtual sal_Bool				IsColumnSelected( long _nColumnPos ) const = 0;
+    virtual void					GetAllSelectedRows( ::com::sun::star::uno::Sequence< sal_Int32 >& _rRows ) const = 0;
+    virtual void					GetAllSelectedColumns( ::com::sun::star::uno::Sequence< sal_Int32 >& _rColumns ) const = 0;
 
     /** @return  <TRUE/>, if the cell is visible. */
-    virtual sal_Bool                IsCellVisible( sal_Int32 _nRow, sal_uInt16 _nColumnPos ) const = 0;
-    virtual String                  GetAccessibleCellText( long _nRow, USHORT _nColumnPos ) const = 0;
+    virtual sal_Bool				IsCellVisible( sal_Int32 _nRow, sal_uInt16 _nColumnPos ) const = 0;
+    virtual String					GetAccessibleCellText( long _nRow, USHORT _nColumnPos ) const = 0;
 
-    virtual Rectangle               calcHeaderRect( sal_Bool _bIsColumnBar, BOOL _bOnScreen = TRUE ) = 0;
-    virtual Rectangle               calcTableRect( BOOL _bOnScreen = TRUE ) = 0;
-    virtual Rectangle               GetFieldRectPixelAbs( sal_Int32 _nRow, sal_uInt16 _nColumnPos, BOOL _bIsHeader, BOOL _bOnScreen = TRUE ) = 0;
+    virtual Rectangle				calcHeaderRect( sal_Bool _bIsColumnBar, BOOL _bOnScreen = TRUE ) = 0;
+    virtual Rectangle				calcTableRect( BOOL _bOnScreen = TRUE ) = 0;
+    virtual Rectangle				GetFieldRectPixelAbs( sal_Int32 _nRow, sal_uInt16 _nColumnPos, BOOL _bIsHeader, BOOL _bOnScreen = TRUE ) = 0;
 
-    virtual XACC                    CreateAccessibleCell( sal_Int32 _nRow, sal_uInt16 _nColumnPos ) = 0;
-    virtual XACC                    CreateAccessibleRowHeader( sal_Int32 _nRow ) = 0;
-    virtual XACC                    CreateAccessibleColumnHeader( sal_uInt16 _nColumnPos ) = 0;
+    virtual XACC					CreateAccessibleCell( sal_Int32 _nRow, sal_uInt16 _nColumnPos ) = 0;
+    virtual XACC					CreateAccessibleRowHeader( sal_Int32 _nRow ) = 0;
+    virtual XACC					CreateAccessibleColumnHeader( sal_uInt16 _nColumnPos ) = 0;
 
-    virtual sal_Int32               GetAccessibleControlCount() const = 0;
-    virtual XACC                    CreateAccessibleControl( sal_Int32 _nIndex ) = 0;
-    virtual sal_Bool                ConvertPointToControlIndex( sal_Int32& _rnIndex, const Point& _rPoint ) = 0;
+    virtual sal_Int32				GetAccessibleControlCount() const = 0;
+    virtual XACC					CreateAccessibleControl( sal_Int32 _nIndex ) = 0;
+    virtual sal_Bool				ConvertPointToControlIndex( sal_Int32& _rnIndex, const Point& _rPoint ) = 0;
 
-    virtual sal_Bool                ConvertPointToCellAddress( sal_Int32& _rnRow, sal_uInt16& _rnColPos, const Point& _rPoint ) = 0;
-    virtual sal_Bool                ConvertPointToRowHeader( sal_Int32& _rnRow, const Point& _rPoint ) = 0;
-    virtual sal_Bool                ConvertPointToColumnHeader( sal_uInt16& _rnColPos, const Point& _rPoint ) = 0;
+    virtual sal_Bool				ConvertPointToCellAddress( sal_Int32& _rnRow, sal_uInt16& _rnColPos, const Point& _rPoint ) = 0;
+    virtual sal_Bool				ConvertPointToRowHeader( sal_Int32& _rnRow, const Point& _rPoint ) = 0;
+    virtual sal_Bool				ConvertPointToColumnHeader( sal_uInt16& _rnColPos, const Point& _rPoint ) = 0;
 
-    virtual ::rtl::OUString         GetAccessibleObjectName( ::svt::AccessibleBrowseBoxObjType _eType, sal_Int32 _nPos = -1 ) const = 0;
-    virtual ::rtl::OUString         GetAccessibleObjectDescription( ::svt::AccessibleBrowseBoxObjType _eType, sal_Int32 _nPos = -1 ) const = 0;
+    virtual ::rtl::OUString			GetAccessibleObjectName( ::svt::AccessibleBrowseBoxObjType _eType, sal_Int32 _nPos = -1 ) const = 0;
+    virtual ::rtl::OUString			GetAccessibleObjectDescription( ::svt::AccessibleBrowseBoxObjType _eType, sal_Int32 _nPos = -1 ) const = 0;
 
-    virtual void                    FillAccessibleStateSet( ::utl::AccessibleStateSetHelper& _rStateSet, ::svt::AccessibleBrowseBoxObjType _eType ) const = 0;
-    virtual void                    FillAccessibleStateSetForCell( ::utl::AccessibleStateSetHelper& _rStateSet, sal_Int32 _nRow, sal_uInt16 _nColumnPos ) const = 0;
-    virtual void                    GrabTableFocus() = 0;
+    virtual void					FillAccessibleStateSet( ::utl::AccessibleStateSetHelper& _rStateSet, ::svt::AccessibleBrowseBoxObjType _eType ) const = 0;
+    virtual void					FillAccessibleStateSetForCell( ::utl::AccessibleStateSetHelper& _rStateSet, sal_Int32 _nRow, sal_uInt16 _nColumnPos ) const = 0;
+    virtual void					GrabTableFocus() = 0;
 
     // OutputDevice
-    virtual BOOL                    GetGlyphBoundRects( const Point& rOrigin, const String& rStr, int nIndex, int nLen, int nBase, MetricVector& rVector ) = 0;
+    virtual BOOL					GetGlyphBoundRects( const Point& rOrigin, const String& rStr, int nIndex, int nLen, int nBase, MetricVector& rVector ) = 0;
 
     // Window
-    virtual Rectangle               GetWindowExtentsRelative( Window *pRelativeWindow ) const = 0;
-    virtual void                    GrabFocus() = 0;
-    virtual XACC                    GetAccessible( BOOL bCreate = TRUE ) = 0;
-    virtual Window*                 GetAccessibleParentWindow() const = 0;
-    virtual Window*                 GetWindowInstance() = 0;
-
-    virtual Rectangle               GetFieldCharacterBounds(sal_Int32 _nRow,sal_Int32 _nColumnPos,sal_Int32 nIndex) = 0;
-    virtual sal_Int32               GetFieldIndexAtPoint(sal_Int32 _nRow,sal_Int32 _nColumnPos,const Point& _rPoint) = 0;
+    virtual Rectangle				GetWindowExtentsRelative( Window *pRelativeWindow ) const = 0;
+    virtual void					GrabFocus() = 0;
+    virtual XACC					GetAccessible( BOOL bCreate = TRUE ) = 0;
+    virtual Window*					GetAccessibleParentWindow() const = 0;
+    virtual Window*					GetWindowInstance() = 0;
+
+    virtual Rectangle				GetFieldCharacterBounds(sal_Int32 _nRow,sal_Int32 _nColumnPos,sal_Int32 nIndex) = 0;
+    virtual sal_Int32				GetFieldIndexAtPoint(sal_Int32 _nRow,sal_Int32 _nColumnPos,const Point& _rPoint) = 0;
 };
 
 // ----------------------------------------------------------------------------
diff --git a/svtools/inc/svtools/brwbox.hxx b/svtools/inc/svtools/brwbox.hxx
index 42fb4b4d36ac..f8ff1108d6c4 100644
--- a/svtools/inc/svtools/brwbox.hxx
+++ b/svtools/inc/svtools/brwbox.hxx
@@ -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
@@ -73,7 +73,7 @@ typedef ULONG BrowserMode;
 #define BROWSER_MULTISELECTION       0x0002
 #define BROWSER_THUMBDRAGGING        0x0004
 #define BROWSER_KEEPHIGHLIGHT        0x0008
-#define BROWSER_KEEPSELECTION        BROWSER_KEEPHIGHLIGHT  // old, dont use!
+#define BROWSER_KEEPSELECTION        BROWSER_KEEPHIGHLIGHT	// old, dont use!
 #define BROWSER_HLINES               0x0010
 #define BROWSER_VLINES               0x0020
 #define BROWSER_HLINESFULL           BROWSER_HLINES // old, dont use!
@@ -81,25 +81,25 @@ typedef ULONG BrowserMode;
 #define BROWSER_HLINESDOTS           0x0000 // old => dont use!
 #define BROWSER_VLINESDOTS           0x0000 // old => dont use!
 
-#define BROWSER_HIDESELECT           0x0100 // old => dont use!
+#define BROWSER_HIDESELECT           0x0100	// old => dont use!
 #define BROWSER_HIDECURSOR           0x0200
 
 #define BROWSER_NO_HSCROLL           0x0400
 #define BROWSER_NO_SCROLLBACK        0x0800
 
-#define BROWSER_AUTO_VSCROLL         0x1000
-#define BROWSER_AUTO_HSCROLL         0x2000
+#define BROWSER_AUTO_VSCROLL	   	 0x1000
+#define BROWSER_AUTO_HSCROLL	   	 0x2000
 
-#define BROWSER_TRACKING_TIPS        0x4000
+#define BROWSER_TRACKING_TIPS 	  	 0x4000
 
 #define BROWSER_NO_VSCROLL           0x8000
 
 #define BROWSER_HIGHLIGHT_NONE       0x0100 // == BROWSER_HIDESELECT
 #define BROWSER_HIGHLIGHT_TOGGLE 0x00000000 // old default => NULL, dont use!
 
-#define BROWSER_HEADERBAR_NEW    0x00040000
+#define BROWSER_HEADERBAR_NEW	 0x00040000
 #define BROWSER_AUTOSIZE_LASTCOL 0x00080000
-#define BROWSER_OWN_DATACHANGED  0x00100000
+#define BROWSER_OWN_DATACHANGED	 0x00100000
 
 #define BROWSER_CURSOR_WO_FOCUS  0x00200000
     // Allows a cursor which is shown even if the control does not have the focus. This does not affect other
@@ -113,7 +113,7 @@ typedef ULONG BrowserMode;
 
 typedef int BrowserColumnMode;
 #define BROWSER_COLUMN_TITLEABBREVATION   1
-#define BROWSER_COLUMN_STANDARD             BROWSER_COLUMN_TITLEABBREVATION
+#define BROWSER_COLUMN_STANDARD         	BROWSER_COLUMN_TITLEABBREVATION
 
 #define BROWSER_NONE                      0
 #define BROWSER_SELECT                  720
@@ -138,11 +138,11 @@ typedef int BrowserColumnMode;
 #define BROWSER_CURSOREND               746
 #define BROWSER_SCROLLDOWN              751
 #define BROWSER_SCROLLUP                752
-#define BROWSER_SELECTHOME              753
-#define BROWSER_SELECTEND               754
-#define BROWSER_SELECTCOLUMN            755
-#define BROWSER_MOVECOLUMNLEFT          756
-#define BROWSER_MOVECOLUMNRIGHT         757
+#define BROWSER_SELECTHOME				753
+#define BROWSER_SELECTEND				754
+#define BROWSER_SELECTCOLUMN			755
+#define BROWSER_MOVECOLUMNLEFT			756
+#define BROWSER_MOVECOLUMNRIGHT			757
 
 // ---------------
 // - BrowseEvent -
@@ -233,9 +233,9 @@ class SVT_DLLPUBLIC BrowseBox
         ,public DropTargetHelper
         ,public svt::IAccessibleTableProvider
 {
-    #define NO_CURSOR_HIDE      0
-    #define HARD_CURSOR_HIDE    1
-    #define SMART_CURSOR_HIDE   2
+    #define NO_CURSOR_HIDE		0
+    #define HARD_CURSOR_HIDE	1
+    #define SMART_CURSOR_HIDE	2
 
     friend class BrowserDataWin;
     friend class ::svt::BrowseBoxImpl;
@@ -264,7 +264,7 @@ class SVT_DLLPUBLIC BrowseBox
     BOOL            bVLines;        // draw lines between columns
     BOOL            bHDots;         // draw lines between rows dotted
     BOOL            bVDots;         // draw lines between columns dotted
-    Color           aGridLineColor;     // color for lines, default dark grey
+    Color			aGridLineColor;		// color for lines, default dark grey
     BOOL            bBootstrapped;  // child windows resized etc.
     long            nTopRow;        // no. of first visible row (0...)
     long            nCurRow;        // no. of row with cursor
@@ -272,7 +272,7 @@ class SVT_DLLPUBLIC BrowseBox
     USHORT          nFirstCol;      // no. of first visible scrollable column
     USHORT          nCurColId;      // column id of cursor
 
-    BOOL            bSelecting;
+    BOOL			bSelecting;
     BOOL            bRowDividerDrag;
     BOOL            bHit;
     BOOL            mbInteractiveRowHeight;
@@ -292,7 +292,7 @@ class SVT_DLLPUBLIC BrowseBox
     BOOL            bHasFocus;      // set/unset in Get/LoseFocus
     BOOL            bHideSelect;    // hide selection (highlight)
     BOOL            bHideCursor;    // hide cursor (frame)
-    Range           aSelRange;      // for selection expansion
+    Range			aSelRange;		// for selection expansion
 
     BrowserColumns* pCols;          // array of column-descriptions
     union
@@ -302,11 +302,11 @@ class SVT_DLLPUBLIC BrowseBox
     }               uRow;
     MultiSelection* pColSel;        // selected column-ids
 
-    ::std::auto_ptr< ::svt::BrowseBoxImpl >  m_pImpl;       // impl structure of the BrowseBox object
+    ::std::auto_ptr< ::svt::BrowseBoxImpl >  m_pImpl;		// impl structure of the BrowseBox object
 
-    BOOL            m_bFocusOnlyCursor; // hide cursor if we don't have the focus
-    Color           m_aCursorColor;     // special color for cursor, COL_TRANSPARENT for usual (VCL-painted) "inverted" cursor
-    BrowserMode     m_nCurrentMode;     // last argument of SetMode (redundant, as our other members represent the current settings, too)
+    BOOL			m_bFocusOnlyCursor;	// hide cursor if we don't have the focus
+    Color			m_aCursorColor;		// special color for cursor, COL_TRANSPARENT for usual (VCL-painted) "inverted" cursor
+    BrowserMode		m_nCurrentMode;		// last argument of SetMode (redundant, as our other members represent the current settings, too)
 
 private:
 //#if 0 // _SOLAR__PRIVATE
@@ -323,9 +323,9 @@ private:
 
     SVT_DLLPRIVATE void            ColumnInserted( USHORT nPos );
 
-    DECL_DLLPRIVATE_LINK(       ScrollHdl, ScrollBar * );
-    DECL_DLLPRIVATE_LINK(       EndScrollHdl, ScrollBar * );
-    DECL_DLLPRIVATE_LINK(       StartDragHdl, HeaderBar * );
+    DECL_DLLPRIVATE_LINK( 		ScrollHdl, ScrollBar * );
+    DECL_DLLPRIVATE_LINK( 		EndScrollHdl, ScrollBar * );
+    DECL_DLLPRIVATE_LINK( 		StartDragHdl, HeaderBar * );
 
     SVT_DLLPRIVATE long            GetFrozenWidth() const;
 //#endif
@@ -337,12 +337,12 @@ private:
     void            SelectColumnId( USHORT nColId, BOOL _bSelect, BOOL bMakeVisible)
                         { SelectColumnPos( GetColumnPos(nColId), _bSelect, bMakeVisible); }
 
-    void            ImplPaintData(OutputDevice& _rOut, const Rectangle& _rRect, BOOL _bForeignDevice, BOOL _bDrawSelections);
+    void			ImplPaintData(OutputDevice& _rOut, const Rectangle& _rRect, BOOL _bForeignDevice, BOOL _bDrawSelections);
 
-    BOOL            PaintCursorIfHiddenOnce() const { return !m_bFocusOnlyCursor && !HasFocus(); }
+    BOOL			PaintCursorIfHiddenOnce() const { return !m_bFocusOnlyCursor && !HasFocus(); }
 
-    USHORT          ToggleSelectedColumn();
-    void            SetToggledSelectedColumn(USHORT _nSelectedColumnId);
+    USHORT			ToggleSelectedColumn();
+    void			SetToggledSelectedColumn(USHORT _nSelectedColumnId);
 
 protected:
     /// retrieves the XAccessible implementation associated with the BrowseBox instance
@@ -360,7 +360,7 @@ public:
 
 protected:
     // fuer Anzeige im VScrollBar z.B. auf "?" oder setzen
-    void            SetRealRowCount( const String &rRealRowCount );
+    void 			SetRealRowCount( const String &rRealRowCount );
 
     // Return Value muss immer TRUE sein - SeekRow *muss* klappen!
     // (sonst ASSERT) MI: wer hat das eingebaut? Das darf nicht so sein!
@@ -371,7 +371,7 @@ protected:
     */
     virtual BOOL    SeekRow( long nRow ) = 0;
     virtual void    DrawCursor();
-    virtual void    PaintRow( OutputDevice &rDev, const Rectangle &rRect );
+    virtual void	PaintRow( OutputDevice &rDev, const Rectangle &rRect );
     virtual void    PaintData( Window& rWin, const Rectangle& rRect );
     virtual void    PaintField( OutputDevice& rDev, const Rectangle& rRect,
                                 USHORT nColumnId ) const = 0;
@@ -398,34 +398,34 @@ protected:
     USHORT          GetVisibleRows()
                         { return (USHORT)((pDataWin->GetOutputSizePixel().Height() - 1 )/ GetDataRowHeight() + 1); }
     long            GetTopRow() { return nTopRow; }
-    USHORT          GetFirstVisibleColNumber() const { return nFirstCol; }
+    USHORT			GetFirstVisibleColNumber() const { return nFirstCol; }
 
     // Focus-Rect ein-/ausschalten
-    void            DoShowCursor( const char *pWhoLog );
-    void            DoHideCursor( const char *pWhoLog );
-    short           GetCursorHideCount() const;
+    void			DoShowCursor( const char *pWhoLog );
+    void			DoHideCursor( const char *pWhoLog );
+    short			GetCursorHideCount() const;
 
-    virtual BrowserHeader*  CreateHeaderBar( BrowseBox* pParent );
+    virtual BrowserHeader*	CreateHeaderBar( BrowseBox* pParent );
 
     // HACK(virtuelles Create wird im Ctor nicht gerufen)
-    void            SetHeaderBar( BrowserHeader* );
+    void			SetHeaderBar( BrowserHeader* );
 
-    long            CalcReverseZoom(long nVal);
+    long			CalcReverseZoom(long nVal);
 
-    HeaderBar*      GetHeaderBar() const;
+    HeaderBar*		GetHeaderBar() const;
         // header bar access for derived classes
 
     inline const DataFlavorExVector&
                     GetDataFlavors() const;
 
-    sal_Bool        IsDropFormatSupported( SotFormatStringId nFormat );     // need this because the base class' IsDropFormatSupported is not const ...
-    sal_Bool        IsDropFormatSupported( SotFormatStringId nFormat ) const;
+    sal_Bool		IsDropFormatSupported( SotFormatStringId nFormat );		// need this because the base class' IsDropFormatSupported is not const ...
+    sal_Bool		IsDropFormatSupported( SotFormatStringId nFormat ) const;
 
-    sal_Bool        IsDropFormatSupported( const ::com::sun::star::datatransfer::DataFlavor& _rFlavor );        // need this because the base class' IsDropFormatSupported is not const ...
-    sal_Bool        IsDropFormatSupported( const ::com::sun::star::datatransfer::DataFlavor& _rFlavor ) const;
+    sal_Bool		IsDropFormatSupported( const ::com::sun::star::datatransfer::DataFlavor& _rFlavor );		// need this because the base class' IsDropFormatSupported is not const ...
+    sal_Bool		IsDropFormatSupported( const ::com::sun::star::datatransfer::DataFlavor& _rFlavor ) const;
 
 private:
-    void*           implGetDataFlavors() const;
+    void*			implGetDataFlavors() const;
         // with this we can make GetDataFlavors() inline, which is strongly needed as SVTOOLS does not export
         // any sysbols containing an "_STL", so a non-inlined method would not be exported ....
 
@@ -443,7 +443,7 @@ public:
                     ~BrowseBox();
 
     // ererbte ueberladene Handler
-    virtual void    StateChanged( StateChangedType nStateChange );
+    virtual void	StateChanged( StateChangedType nStateChange );
     virtual void    MouseButtonDown( const MouseEvent& rEvt );
     virtual void    MouseMove( const MouseEvent& rEvt );
     virtual void    MouseButtonUp( const MouseEvent& rEvt );
@@ -452,12 +452,12 @@ public:
     virtual void    GetFocus();
     virtual void    Resize();
     virtual void    Paint( const Rectangle& rRect );
-    virtual void    Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, ULONG nFlags );
+    virtual void	Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, ULONG nFlags );
     virtual void    Command( const CommandEvent& rEvt );
-    virtual void    StartDrag( sal_Int8 _nAction, const Point& _rPosPixel );
+    virtual void	StartDrag( sal_Int8 _nAction, const Point& _rPosPixel );
 
-    virtual sal_Int8 AcceptDrop( const AcceptDropEvent& rEvt );     // will forward everything got to the second AcceptDrop method
-    virtual sal_Int8 ExecuteDrop( const ExecuteDropEvent& rEvt );   // will forward everything got to the second ExecuteDrop method
+    virtual sal_Int8 AcceptDrop( const AcceptDropEvent& rEvt );		// will forward everything got to the second AcceptDrop method
+    virtual sal_Int8 ExecuteDrop( const ExecuteDropEvent& rEvt );	// will forward everything got to the second ExecuteDrop method
 
     virtual sal_Int8 AcceptDrop( const BrowserAcceptDropEvent& rEvt );
     virtual sal_Int8 ExecuteDrop( const BrowserExecuteDropEvent& rEvt );
@@ -470,7 +470,7 @@ public:
     virtual void    EndScroll();
     virtual void    Select();
     virtual void    DoubleClick( const BrowserMouseEvent& rEvt );
-    virtual BOOL    IsCursorMoveAllowed( long nNewRow, USHORT nNewColId ) const;
+    virtual BOOL	IsCursorMoveAllowed( long nNewRow, USHORT nNewColId ) const;
     virtual void    CursorMoved();
     virtual void    ColumnMoved( USHORT nColId );
     virtual void    ColumnResized( USHORT nColId );
@@ -491,18 +491,18 @@ public:
     const Font&     GetTitleFont() const { return Control::GetFont(); }
 
     // color for line painting
-    void            SetGridLineColor(const Color& rColor) {aGridLineColor = rColor;}
-    const Color&    GetGridLineColor() const {return aGridLineColor;}
+    void			SetGridLineColor(const Color& rColor) {aGridLineColor = rColor;}
+    const Color&	GetGridLineColor() const {return aGridLineColor;}
 
     // inserting, changing, removing and freezing of columns
     void            InsertHandleColumn( ULONG nWidth );
-    void            InsertDataColumn( USHORT nItemId, const Image& rImage,
+    void			InsertDataColumn( USHORT nItemId, const Image& rImage,
                                     long nSize, HeaderBarItemBits nBits = HIB_STDSTYLE,
                                     USHORT nPos = HEADERBAR_APPEND );
-    void            InsertDataColumn( USHORT nItemId, const XubString& rText,
+    void			InsertDataColumn( USHORT nItemId, const XubString& rText,
                                     long nSize, HeaderBarItemBits nBits = HIB_STDSTYLE,
                                     USHORT nPos = HEADERBAR_APPEND );
-    void            InsertDataColumn( USHORT nItemId,
+    void			InsertDataColumn( USHORT nItemId,
                                     const Image& rImage, const XubString& rText,
                                     long nSize, HeaderBarItemBits nBits = HIB_STDSTYLE,
                                     USHORT nPos = HEADERBAR_APPEND,
@@ -522,7 +522,7 @@ public:
     long            GetDataRowHeight() const;
     void            SetTitleLines( USHORT nLines );
     USHORT          GetTitleLines() const { return nTitleLines; }
-    virtual long    GetTitleHeight() const;
+    virtual long	GetTitleHeight() const;
 
     // access to dynamic values of cursor row
     String          GetColumnTitle( USHORT nColumnId ) const;
@@ -538,13 +538,13 @@ public:
     long            ScrollColumns( long nColumns );
     long            ScrollRows( long nRows );
     long            ScrollPages( long nPagesY );
-    BOOL            MakeFieldVisible( long nRow, USHORT nColId, BOOL bComplete = FALSE );
+    BOOL			MakeFieldVisible( long nRow, USHORT nColId, BOOL bComplete = FALSE );
 
     // access and movement of cursor
     long            GetCurRow() const { return nCurRow; }
     USHORT          GetCurColumnId() const { return nCurColId; }
     BOOL            GoToRow( long nRow );
-    BOOL            GoToRowAndDoNotModifySelection( long nRow );
+    BOOL			GoToRowAndDoNotModifySelection( long nRow );
     BOOL            GoToColumnId( USHORT nColId );
     BOOL            GoToRowColumnId( long nRow, USHORT nColId );
 
@@ -568,12 +568,12 @@ public:
     const MultiSelection* GetColumnSelection() const { return pColSel; }
     const MultiSelection* GetSelection() const
                     { return bMultiSelection ? uRow.pSel : 0; }
-    void            SetSelection( const MultiSelection &rSelection );
+    void			SetSelection( const MultiSelection &rSelection );
 
-    long            FirstSelectedColumn( ) const;
-    long            NextSelectedColumn( ) const;
+    long			FirstSelectedColumn( ) const;
+    long			NextSelectedColumn( ) const;
 
-    BOOL            IsResizing() const { return bResizing; }
+    BOOL			IsResizing() const { return bResizing; }
 
     // access to positions of fields, column and rows
     Window&         GetEventWindow() const;
@@ -598,15 +598,15 @@ public:
     // miscellanous
     void            ReserveControlArea( USHORT nWidth = USHRT_MAX );
     Rectangle       GetControlArea() const;
-    BOOL            ProcessKey( const KeyEvent& rEvt );
+    BOOL 			ProcessKey( const KeyEvent& rEvt );
     void            Dispatch( USHORT nId );
     void            SetMode( BrowserMode nMode = 0 );
-    BrowserMode     GetMode( ) const { return m_nCurrentMode; }
-    bool            IsInCommandEvent() const;
+    BrowserMode		GetMode( ) const { return m_nCurrentMode; }
+    bool			IsInCommandEvent() const;
 
-    void            SetCursorColor(const Color& _rCol);
-    Color           GetCursorColor() const { return m_aCursorColor; }
-    void            ResetSelecting() { bSelecting = FALSE; }
+    void			SetCursorColor(const Color& _rCol);
+    Color			GetCursorColor() const { return m_aCursorColor; }
+    void			ResetSelecting() { bSelecting = FALSE; }
 
     /** specifies that the user is allowed to interactively change the height of a row,
         by simply dragging an arbitrary row separator.
@@ -631,14 +631,14 @@ public:
     ULONG           GetDefaultColumnWidth( const String& _rText ) const;
 
     /** GetCellText returns the text at the given position
-        @param  _nRow
+        @param	_nRow
             the number of the row
-        @param  _nColId
+        @param	_nColId
             the ID of the column
         @return
             the text out of the cell
     */
-    virtual String  GetCellText(long _nRow, USHORT _nColId) const;
+    virtual String	GetCellText(long _nRow, USHORT _nColId) const;
 
     /** @return
             the current column count
@@ -685,9 +685,9 @@ public:
          );
 
     /** returns the Rectangle for either the column header bar ot the row header bar
-        @param  _bIsColumnBar
+        @param	_bIsColumnBar
             <TRUE/> when column header bar is used
-        @param  _bOnScreen
+        @param	_bOnScreen
             <TRUE/> when the rectangle should be calculated OnScreen
         @return
             the Rectangle
@@ -695,7 +695,7 @@ public:
     virtual Rectangle calcHeaderRect(sal_Bool _bIsColumnBar,BOOL _bOnScreen = TRUE);
 
     /** calculates the Rectangle of the table
-        @param  _bOnScreen
+        @param	_bOnScreen
             <TRUE/> when the rectangle should be calculated OnScreen
         @return
             the Rectangle
@@ -703,11 +703,11 @@ public:
     virtual Rectangle calcTableRect(BOOL _bOnScreen = TRUE);
 
     /**
-        @param  _nRowId
+        @param	_nRowId
             the current row
-        @param  _nColId
+        @param	_nColId
             teh column id
-        @param  _bOnScreen
+        @param	_bOnScreen
             <TRUE/> when the rectangle should be calculated OnScreen
         @return
             the Rectangle
@@ -791,9 +791,9 @@ public:
     // Object data and state --------------------------------------------------
 
     /** return the name of the specified object.
-        @param  eObjType
+        @param	eObjType
             The type to ask for
-        @param  _nPosition
+        @param	_nPosition
             The position of a tablecell (index position), header bar  colum/row cell
         @return
             The name of the specified object.
@@ -801,9 +801,9 @@ public:
     virtual ::rtl::OUString GetAccessibleObjectName( ::svt::AccessibleBrowseBoxObjType eObjType,sal_Int32 _nPosition = -1) const;
 
     /** return the description of the specified object.
-        @param  eObjType
+        @param	eObjType
             The type to ask for
-        @param  _nPosition
+        @param	_nPosition
             The position of a tablecell (index position), header bar  colum/row cell
         @return
             The description of the specified object.
@@ -814,7 +814,7 @@ public:
     virtual ::rtl::OUString GetRowDescription( sal_Int32 nRow ) const;
 
     /** @return  The header text of the specified column. */
-    virtual ::rtl::OUString GetColumnDescription( sal_uInt16 _nColumn ) const;
+    virtual ::rtl::OUString	GetColumnDescription( sal_uInt16 _nColumn ) const;
 
     /** Fills the StateSet with all states (except DEFUNC and SHOWING, done by
         the accessible object), depending on the specified object type. */
@@ -832,25 +832,25 @@ public:
     virtual void GrabTableFocus();
 
     // IAccessibleTableProvider
-    virtual sal_Int32               GetCurrRow() const;
-    virtual sal_uInt16              GetCurrColumn() const;
-    virtual sal_Bool                HasRowHeader() const;
-    virtual sal_Bool                IsCellFocusable() const;
-    virtual BOOL                    GoToCell( sal_Int32 _nRow, sal_uInt16 _nColumn );
-    virtual void                    SelectColumn( sal_uInt16 _nColumn, sal_Bool _bSelect = sal_True );
-    virtual sal_Bool                IsColumnSelected( long _nColumn ) const;
-    virtual sal_Int32               GetSelectedRowCount() const;
-    virtual sal_Int32               GetSelectedColumnCount() const;
-    virtual void                    GetAllSelectedRows( ::com::sun::star::uno::Sequence< sal_Int32 >& _rRows ) const;
-    virtual void                    GetAllSelectedColumns( ::com::sun::star::uno::Sequence< sal_Int32 >& _rColumns ) const;
-    virtual sal_Bool                IsCellVisible( sal_Int32 _nRow, sal_uInt16 _nColumn ) const;
-    virtual String                  GetAccessibleCellText(long _nRow, USHORT _nColPos) const;
-    virtual BOOL                    GetGlyphBoundRects( const Point& rOrigin, const String& rStr, int nIndex, int nLen, int nBase, MetricVector& rVector );
-    virtual Rectangle               GetWindowExtentsRelative( Window *pRelativeWindow ) const;
-    virtual void                    GrabFocus();
-    virtual XACC                    GetAccessible( BOOL bCreate = TRUE );
-    virtual Window*                 GetAccessibleParentWindow() const;
-    virtual Window*                 GetWindowInstance();
+    virtual sal_Int32				GetCurrRow() const;
+    virtual sal_uInt16				GetCurrColumn() const;
+    virtual sal_Bool				HasRowHeader() const;
+    virtual sal_Bool				IsCellFocusable() const;
+    virtual BOOL					GoToCell( sal_Int32 _nRow, sal_uInt16 _nColumn );
+    virtual void					SelectColumn( sal_uInt16 _nColumn, sal_Bool _bSelect = sal_True );
+    virtual sal_Bool				IsColumnSelected( long _nColumn ) const;
+    virtual sal_Int32				GetSelectedRowCount() const;
+    virtual sal_Int32				GetSelectedColumnCount() const;
+    virtual void					GetAllSelectedRows( ::com::sun::star::uno::Sequence< sal_Int32 >& _rRows ) const;
+    virtual void					GetAllSelectedColumns( ::com::sun::star::uno::Sequence< sal_Int32 >& _rColumns ) const;
+    virtual sal_Bool				IsCellVisible( sal_Int32 _nRow, sal_uInt16 _nColumn ) const;
+    virtual String	                GetAccessibleCellText(long _nRow, USHORT _nColPos) const;
+    virtual BOOL					GetGlyphBoundRects( const Point& rOrigin, const String& rStr, int nIndex, int nLen, int nBase, MetricVector& rVector );
+    virtual Rectangle				GetWindowExtentsRelative( Window *pRelativeWindow ) const;
+    virtual void					GrabFocus();
+    virtual XACC					GetAccessible( BOOL bCreate = TRUE );
+    virtual Window*					GetAccessibleParentWindow() const;
+    virtual Window*					GetWindowInstance();
 
 private:
     // the following declares some Window/OutputDevice methods private. This happened in the course
diff --git a/svtools/inc/svtools/brwhead.hxx b/svtools/inc/svtools/brwhead.hxx
index 3ed431a09efe..0a198246c273 100644
--- a/svtools/inc/svtools/brwhead.hxx
+++ b/svtools/inc/svtools/brwhead.hxx
@@ -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
@@ -37,10 +37,10 @@ class BrowseBox;
 
 class SVT_DLLPUBLIC BrowserHeader: public HeaderBar
 {
-    BrowseBox*          _pBrowseBox;
+    BrowseBox*			_pBrowseBox;
 
 protected:
-    virtual void        Command( const CommandEvent& rCEvt );
+    virtual void		Command( const CommandEvent& rCEvt );
     virtual void        Select();
     virtual void        EndDrag();
 
diff --git a/svtools/inc/svtools/chartprettypainter.hxx b/svtools/inc/svtools/chartprettypainter.hxx
index 200951d5c5e8..22ea16f61ede 100644
--- a/svtools/inc/svtools/chartprettypainter.hxx
+++ b/svtools/inc/svtools/chartprettypainter.hxx
@@ -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
@@ -41,7 +41,7 @@
 namespace svt { class EmbeddedObjectRef; }
 
 /** use this class for a correct view representation of charts
-see issues #i82893#, #i75867#: charts must be painted resolution dependent!!
+see issues #i82893#, #i75867#: charts must be painted resolution dependent!! 
 
 example usage when painting ole objects:
 if( ChartPrettyPainter::IsChart(xObjRef) && ChartPrettyPainter::ShouldPrettyPaintChartOnThisDevice( pOutDev )
diff --git a/svtools/inc/svtools/colctrl.hxx b/svtools/inc/svtools/colctrl.hxx
index d76f8e881269..31e56ce32dc7 100644
--- a/svtools/inc/svtools/colctrl.hxx
+++ b/svtools/inc/svtools/colctrl.hxx
@@ -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
@@ -43,16 +43,16 @@ class ColorHSB;
 class SvColorControl : public Control
 {
 private:
-    Bitmap*         mpBitmap;
+    Bitmap*			mpBitmap;
     BitmapReadAccess* mpReadAccess;
-    Color           maColor;
-    short           mnLuminance;
-    Point           maPosition;
-    Link            maModifyHdl;
+    Color			maColor;
+    short			mnLuminance;
+    Point			maPosition;
+    Link			maModifyHdl;
 
-    void            Initialize();
-    void            CreateBitmap();
-    void            ShowPosition( const Point& aPos );
+    void			Initialize();
+    void			CreateBitmap();
+    void			ShowPosition( const Point& aPos );
 
 public:
                     SvColorControl( Window* pParent, WinBits nStyle = 0 );
@@ -70,12 +70,12 @@ public:
 
     virtual void    Modify();
 
-    Color           GetColor() const { return maColor; };
-    void            SetColor( const Color& rCol );
-    void            SetColor( const ColorHSB& rCol, BOOL bSetColor = TRUE );
+    Color			GetColor() const { return maColor; };
+    void 			SetColor( const Color& rCol );
+    void 			SetColor( const ColorHSB& rCol, BOOL bSetColor = TRUE );
 
-    short           GetLuminance() const { return mnLuminance; };
-    void            SetLuminance( short nLum );
+    short			GetLuminance() const { return mnLuminance; };
+    void 			SetLuminance( short nLum );
 
     void            SetModifyHdl( const Link& rLink ) { maModifyHdl = rLink; }
     const Link&     GetModifyHdl() const { return maModifyHdl; }
@@ -89,7 +89,7 @@ public:
 class ColorPreviewControl : public Control
 {
 private:
-    Color           maColor;
+    Color			maColor;
 
 public:
                     ColorPreviewControl( Window* pParent, WinBits nStyle = 0 );
@@ -98,8 +98,8 @@ public:
 
     virtual void    Paint( const Rectangle& rRect );
 
-    Color           GetColor() const { return maColor; };
-    void            SetColor( const Color& rCol );
+    Color			GetColor() const { return maColor; };
+    void 			SetColor( const Color& rCol );
 };
 
 // -----------------------
@@ -111,15 +111,15 @@ enum CMCPosition { CMC_TOPLEFT, CMC_TOPRIGHT, CMC_BOTTOMLEFT, CMC_BOTTOMRIGHT, C
 class ColorMixingControl : public ValueSet
 {
 private:
-    USHORT          mnRows;
-    USHORT          mnColumns;
-    Color           maColor[4];
+    USHORT			mnRows;
+    USHORT			mnColumns;
+    Color			maColor[4];
 
-    void            Initialize();
+    void			Initialize();
 
-    Color           CalcDifferenceColor( USHORT nCol1, USHORT nCol2, USHORT nSteps );
-    void            FillRow( USHORT nRow );
-    void            FillColumn( USHORT nColumn );
+    Color			CalcDifferenceColor( USHORT nCol1, USHORT nCol2, USHORT nSteps );
+    void			FillRow( USHORT nRow );
+    void			FillColumn( USHORT nColumn );
 
 public:
                     ColorMixingControl( Window* pParent, WinBits nStyle = 0,
@@ -128,18 +128,18 @@ public:
                                         USHORT nRows = 4, USHORT nColumns = 4 );
                     ~ColorMixingControl();
 
-    USHORT          GetRows() const { return mnRows; };
-    void            SetRows( USHORT nRows );
-    USHORT          GetColumns() const { return mnColumns; };
-    void            SetColumns( USHORT nColumns );
+    USHORT			GetRows() const { return mnRows; };
+    void  			SetRows( USHORT nRows );
+    USHORT			GetColumns() const { return mnColumns; };
+    void  			SetColumns( USHORT nColumns );
 
     using ValueSet::GetColor;
-    Color           GetColor( CMCPosition ePos ) const { return maColor[ ePos ]; };
+    Color			GetColor( CMCPosition ePos ) const { return maColor[ ePos ]; };
     using ValueSet::SetColor;
-    void            SetColor( CMCPosition ePos, const Color& rCol );
+    void 			SetColor( CMCPosition ePos, const Color& rCol );
 
-    String          GetRGBString( const Color& rColor );
-    CMCPosition     GetCMCPosition() const;
+    String			GetRGBString( const Color& rColor );
+    CMCPosition		GetCMCPosition() const;
 };
 
 // ------------
@@ -176,10 +176,10 @@ public:
 class ColorCMYK
 {
 private:
-    USHORT      mnCyan;
-    USHORT      mnMagenta;
-    USHORT      mnYellow;
-    USHORT      mnKey;
+    USHORT		mnCyan;
+    USHORT		mnMagenta;
+    USHORT		mnYellow;
+    USHORT		mnKey;
 
 public:
                 ColorCMYK()
diff --git a/svtools/inc/svtools/colorcfg.hxx b/svtools/inc/svtools/colorcfg.hxx
index ac78afe59034..8e5a5cfdfe19 100644
--- a/svtools/inc/svtools/colorcfg.hxx
+++ b/svtools/inc/svtools/colorcfg.hxx
@@ -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
@@ -44,7 +44,7 @@ enum ColorConfigEntry
     APPBACKGROUND       ,
     OBJECTBOUNDARIES    ,
     TABLEBOUNDARIES     ,
-    FONTCOLOR           ,
+    FONTCOLOR			,
     LINKS               ,
     LINKSVISITED        ,
     ANCHOR              ,
@@ -144,8 +144,8 @@ public:
     sal_Bool                    IsModified()const{return m_bModified;}
     void                        Commit();
 
-    void                        DisableBroadcast();
-    void                        EnableBroadcast();
+    void						DisableBroadcast();
+    void						EnableBroadcast();
 };
 }//namespace svtools
 #endif
diff --git a/svtools/inc/svtools/colrdlg.hxx b/svtools/inc/svtools/colrdlg.hxx
index 00ec9647aa7a..8f1093e03130 100644
--- a/svtools/inc/svtools/colrdlg.hxx
+++ b/svtools/inc/svtools/colrdlg.hxx
@@ -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
@@ -44,50 +44,50 @@
 class SVT_DLLPUBLIC SvColorDialog : public ModalDialog
 {
 private:
-    ColorMixingControl  maColMixCtrl;
-    PushButton      maBtn1;
-    PushButton      maBtn2;
-    //PushButton        maBtn3;
-    //PushButton        maBtn4;
-    //FixedText     maFtRGB;
-    SvColorControl  maCtlColor;
+    ColorMixingControl	maColMixCtrl;
+    PushButton		maBtn1;
+    PushButton		maBtn2;
+    //PushButton		maBtn3;
+    //PushButton		maBtn4;
+    //FixedText		maFtRGB;
+    SvColorControl	maCtlColor;
 
     // CMYK controls.
-    FixedText       maFtCyan;
-    MetricField     maNumCyan;
-    FixedText       maFtMagenta;
-    MetricField     maNumMagenta;
-    FixedText       maFtYellow;
-    MetricField     maNumYellow;
-    FixedText       maFtKey;
-    MetricField     maNumKey;
+    FixedText		maFtCyan;
+    MetricField		maNumCyan;
+    FixedText		maFtMagenta;
+    MetricField		maNumMagenta;
+    FixedText		maFtYellow;
+    MetricField		maNumYellow;
+    FixedText		maFtKey;
+    MetricField		maNumKey;
 
     // RGB controls.
-    FixedText       maFtRed;
-    NumericField    maNumRed;
-    FixedText       maFtGreen;
-    NumericField    maNumGreen;
-    FixedText       maFtBlue;
-    NumericField    maNumBlue;
+    FixedText		maFtRed;
+    NumericField	maNumRed;
+    FixedText		maFtGreen;
+    NumericField	maNumGreen;
+    FixedText		maFtBlue;
+    NumericField	maNumBlue;
 
     // HSL controls.
-    FixedText       maFtHue;
-    NumericField    maNumHue;
-    FixedText       maFtSaturation;
-    NumericField    maNumSaturation;
-    FixedText       maFtLuminance;
-    NumericField    maNumLuminance;
+    FixedText		maFtHue;
+    NumericField	maNumHue;
+    FixedText		maFtSaturation;
+    NumericField	maNumSaturation;
+    FixedText		maFtLuminance;
+    NumericField	maNumLuminance;
 
-    ColorPreviewControl maCtlPreview;
-    ColorPreviewControl maCtlPreviewOld;
+    ColorPreviewControl	maCtlPreview;
+    ColorPreviewControl	maCtlPreviewOld;
 
-    OKButton        maBtnOK;
-    CancelButton    maBtnCancel;
-    HelpButton      maBtnHelp;
+    OKButton		maBtnOK;
+    CancelButton	maBtnCancel;
+    HelpButton		maBtnHelp;
 
-    Color           maColor;
+    Color			maColor;
 
-    SVT_DLLPRIVATE void         Initialize();
+    SVT_DLLPRIVATE void			Initialize();
 
     DECL_DLLPRIVATE_LINK( ColorModifyHdl, void * );
     DECL_DLLPRIVATE_LINK( ClickBtnHdl, void * );
@@ -98,10 +98,10 @@ public:
                     SvColorDialog( Window* pParent );
                     ~SvColorDialog();
 
-    void            SetColor( const Color& rColor );
-    const Color&    GetColor() const;
+    void			SetColor( const Color& rColor );
+    const Color&	GetColor() const;
 
-    virtual short   Execute();
+    virtual short	Execute();
 };
 
 #endif  // _SV_COLRDLG_HXX
diff --git a/svtools/inc/svtools/editbrowsebox.hxx b/svtools/inc/svtools/editbrowsebox.hxx
index f97449e1880c..09ceeac9161f 100644
--- a/svtools/inc/svtools/editbrowsebox.hxx
+++ b/svtools/inc/svtools/editbrowsebox.hxx
@@ -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
@@ -48,20 +48,20 @@
 //==================================================================
 // EditBrowseBoxFlags (EBBF)
 
-#define EBBF_NONE                       ((sal_Int32)0x0000)
+#define EBBF_NONE						((sal_Int32)0x0000)
 /** if this bit is _not_ set, the handle column will be invalidated upon
     changing the row in the browse box.  This is for forcing the row picture to
     be repainted. If you do not have row pictures or text, you don't need this
     invalidation, then you would specify this bit to prevent flicker
 */
-#define EBBF_NO_HANDLE_COLUMN_CONTENT   ((sal_Int32)0x0001)
+#define EBBF_NO_HANDLE_COLUMN_CONTENT	((sal_Int32)0x0001)
 /** set this bit to activate the cell on a MouseButtonDown, not a MouseButtonUp event
  */
-#define EBBF_ACTIVATE_ON_BUTTONDOWN     ((sal_Int32)0x0002)
+#define EBBF_ACTIVATE_ON_BUTTONDOWN		((sal_Int32)0x0002)
 /** if this bit is set and EBBF_NO_HANDLE_COLUMN_CONTENT is _not_ set, the handle
     column is drawn with the text contained in column 0 instead of an image
 */
-#define EBBF_HANDLE_COLUMN_TEXT         ((sal_Int32)0x0004)
+#define EBBF_HANDLE_COLUMN_TEXT			((sal_Int32)0x0004)
 
 /** If this bit is set, tab traveling is somewhat modified<br/>
     If the control gets the focus because the user pressed the TAB key, then the
@@ -70,10 +70,10 @@
     @see Window::GetGetFocusFlags
     @see GETFOCUS_*
 */
-#define EBBF_SMART_TAB_TRAVEL           ((sal_Int32)0x0008)
+#define EBBF_SMART_TAB_TRAVEL			((sal_Int32)0x0008)
 
 /// @deprecated
-#define EBBF_NOROWPICTURE               EBBF_NO_HANDLE_COLUMN_CONTENT
+#define EBBF_NOROWPICTURE				EBBF_NO_HANDLE_COLUMN_CONTENT
 
 //==================================================================
 
@@ -98,8 +98,8 @@ namespace svt
         friend class EditBrowseBox;
 
     protected:
-        Control*    pWindow;
-        sal_Bool    bSuspended;     // <TRUE> if the window is hidden and disabled
+        Control*	pWindow;
+        sal_Bool	bSuspended;		// <TRUE> if the window is hidden and disabled
 
     public:
         TYPEINFO();
@@ -119,9 +119,9 @@ namespace svt
         virtual void CommitModifications();
 
         // suspending the controller is not culmulative!
-                void        suspend( );
-                void        resume( );
-        inline  sal_Bool    isSuspended( ) const { return bSuspended; }
+                void		suspend( );
+                void		resume( );
+        inline	sal_Bool	isSuspended( ) const { return bSuspended; }
 
     protected:
         virtual sal_Bool MoveAllowed(const KeyEvent& rEvt) const;
@@ -291,9 +291,9 @@ namespace svt
     //==================================================================
     class SVT_DLLPUBLIC CheckBoxControl : public Control
     {
-        CheckBox*   pBox;
-        Rectangle   aFocusRect;
-        Link        m_aClickLink,m_aModifyLink;
+        CheckBox*	pBox;
+        Rectangle	aFocusRect;
+        Link		m_aClickLink,m_aModifyLink;
 
     public:
         CheckBoxControl(Window* pParent, WinBits nWinStyle = 0);
@@ -313,7 +313,7 @@ namespace svt
         void SetModifyHdl(const Link& rHdl) {m_aModifyLink = rHdl;}
         const Link& GetModifyHdl() const {return m_aModifyLink;}
 
-        CheckBox&   GetBox() {return *pBox;};
+        CheckBox&	GetBox() {return *pBox;};
 
     private:
         DECL_LINK( OnClick, void* );
@@ -439,25 +439,25 @@ namespace svt
 
         enum BrowseInfo
         {
-            COLSELECT   =   1,
-            ROWSELECT   =   2,
-            ROWCHANGE   =   4,
-            COLCHANGE   =   8
+            COLSELECT	=	1,
+            ROWSELECT	=	2,
+            ROWCHANGE	=	4,
+            COLCHANGE	=	8
         };
 
     public:
         enum RowStatus
         {
-            CLEAN               =   0,
-            CURRENT             =   1,
-            CURRENTNEW          =   2,
-            MODIFIED            =   3,
-            NEW                 =   4,
-            DELETED             =   5,
-            PRIMARYKEY          =   6,
-            CURRENT_PRIMARYKEY  =   7,
-            FILTER              =   8,
-            HEADERFOOTER        =   9
+            CLEAN				=	0,
+            CURRENT				=	1,
+            CURRENTNEW			=	2,
+            MODIFIED			=	3,
+            NEW					=	4,
+            DELETED				=	5,
+            PRIMARYKEY			=	6,
+            CURRENT_PRIMARYKEY	=	7,
+            FILTER				=	8,
+            HEADERFOOTER		=	9
         };
 
     private:
@@ -483,27 +483,27 @@ namespace svt
             void Set(const BrowserMouseEvent* pEvt, sal_Bool bIsDown);
         } aMouseEvent;
 
-        const BrowserMouseEvent* pMouseEvent;   // is set during a mouse event
-        CellControllerRef        aController,
+        const BrowserMouseEvent* pMouseEvent;	// is set during a mouse event
+        CellControllerRef		 aController,
                                  aOldController;
 
-        ULONG   nStartEvent, nEndEvent, nCellModifiedEvent;     // event ids
-        Window* m_pFocusWhileRequest;
+        ULONG	nStartEvent, nEndEvent, nCellModifiedEvent;		// event ids
+        Window*	m_pFocusWhileRequest;
             // In ActivateCell, we grab the focus asynchronously, but if between requesting activation
             // and the asynchornous event the focus has changed, we won't grab it for ourself.
 
-        long    nPaintRow;  // row beeing painted
-        long    nEditRow, nOldEditRow;
-        sal_uInt16  nEditCol, nOldEditCol;
+        long	nPaintRow;	// row beeing painted
+        long	nEditRow, nOldEditRow;
+        sal_uInt16	nEditCol, nOldEditCol;
 
         sal_Bool            bHasFocus : 1;
-        mutable sal_Bool    bPaintStatus : 1;   // paint a status (image) in the handle column
+        mutable sal_Bool    bPaintStatus : 1;	// paint a status (image) in the handle column
         sal_Bool            bActiveBeforeTracking;
 
         CheckBoxControl* pCheckBoxPaint;
 
-        sal_Int32   m_nBrowserFlags;
-        ImageList   m_aStatusImages;
+        sal_Int32	m_nBrowserFlags;
+        ImageList	m_aStatusImages;
         ::std::auto_ptr< EditBrowseBoxImpl> m_aImpl;
 
     protected:
@@ -516,7 +516,7 @@ namespace svt
         BrowserMouseEventPtr& getMouseEvent() { return aMouseEvent; }
 
     protected:
-        BrowserHeader*  GetHeaderBar() const {return pHeader;}
+        BrowserHeader*	GetHeaderBar() const {return pHeader;}
 
         virtual BrowserHeader* CreateHeaderBar(BrowseBox* pParent);
 
@@ -563,16 +563,16 @@ namespace svt
         virtual void    ImplEndTracking();
 
         // when changing a row:
-        // CursorMoving:    cursor is beeing moved, but GetCurRow() still provides the old row
+        // CursorMoving:	cursor is beeing moved, but GetCurRow() still provides the old row
         virtual sal_Bool CursorMoving(long nNewRow, sal_uInt16 nNewCol);
 
         // cursor has been moved
         virtual void CursorMoved();
 
-        virtual void CellModified();        // called whenever a cell has been modified
-        virtual sal_Bool SaveModified();    // called whenever a cell should be left, and it's content should be saved
+        virtual void CellModified();		// called whenever a cell has been modified
+        virtual sal_Bool SaveModified();	// called whenever a cell should be left, and it's content should be saved
                                             // return sal_False prevents leaving the cell
-        virtual sal_Bool SaveRow();         // commit the current row
+        virtual sal_Bool SaveRow();			// commit the current row
 
         virtual sal_Bool IsModified() const {return aController.Is() && aController->IsModified();}
 
@@ -598,7 +598,7 @@ namespace svt
 
         virtual sal_Bool IsCursorMoveAllowed(long nNewRow, sal_uInt16 nNewColId) const;
 
-        void    PaintTristate(OutputDevice& rDev, const Rectangle& rRect,const TriState& eState,sal_Bool _bEnabled=sal_True) const;
+        void	PaintTristate(OutputDevice& rDev, const Rectangle& rRect,const TriState& eState,sal_Bool _bEnabled=sal_True) const;
 
         void AsynchGetFocus();
             // secure starting of StartEditHdl
@@ -618,19 +618,19 @@ namespace svt
         virtual void Dispatch(sal_uInt16 nId);
 
         CellControllerRef Controller() const { return aController; }
-        sal_Int32   GetBrowserFlags() const { return m_nBrowserFlags; }
-        void    SetBrowserFlags(sal_Int32 nFlags);
+        sal_Int32	GetBrowserFlags() const { return m_nBrowserFlags; }
+        void	SetBrowserFlags(sal_Int32 nFlags);
 
-        virtual void ActivateCell(long nRow, sal_uInt16 nCol, sal_Bool bSetCellFocus = sal_True);
+        virtual void ActivateCell(long nRow, sal_uInt16	nCol, sal_Bool bSetCellFocus = sal_True);
         virtual void DeactivateCell(sal_Bool bUpdate = sal_True);
         // Children ---------------------------------------------------------------
 
         /** Creates the accessible object of a data table cell.
-        @param nRow
+        @param nRow  
             The row index of the cell.
-        @param nColumnId
+        @param nColumnId  
             The column ID of the cell.
-        @return
+        @return  
             The XAccessible interface of the specified cell. */
         virtual ::com::sun::star::uno::Reference<
             ::com::sun::star::accessibility::XAccessible >
@@ -640,18 +640,18 @@ namespace svt
         virtual sal_Int32 GetAccessibleControlCount() const;
 
         /** Creates the accessible object of an additional control.
-            @param nIndex
+            @param nIndex  
                 The 0-based index of the control.
-            @return
+            @return  
                 The XAccessible interface of the specified control. */
         virtual ::com::sun::star::uno::Reference<
             ::com::sun::star::accessibility::XAccessible >
         CreateAccessibleControl( sal_Int32 nIndex );
 
         /** Creates the accessible object of a column header.
-            @param nColumnId
+            @param nColumnId  
                 The column ID of the header.
-            @return
+            @return  
                 The XAccessible interface of the specified column header. */
         virtual ::com::sun::star::uno::Reference<
             ::com::sun::star::accessibility::XAccessible >
@@ -667,7 +667,7 @@ namespace svt
             ::com::sun::star::accessibility::XAccessible > CreateAccessibleCheckBoxCell(long _nRow, USHORT _nColumnPos,const TriState& eState,sal_Bool _bEnabled=sal_True);
     protected:
         // creates the accessible which wraps the active cell
-        void    implCreateActiveAccessible( );
+        void	implCreateActiveAccessible( );
 
     private:
         virtual void PaintField(OutputDevice& rDev, const Rectangle& rRect,
@@ -688,7 +688,7 @@ namespace svt
     };
 
 // .......................................................................
-}   // namespace svt
+}	// namespace svt
 // .......................................................................
 
 #undef SVTOOLS_IN_EDITBROWSEBOX_HXX
diff --git a/svtools/inc/svtools/editimplementation.hxx b/svtools/inc/svtools/editimplementation.hxx
index 987d94c7bcee..bcd4c2e1fa8e 100644
--- a/svtools/inc/svtools/editimplementation.hxx
+++ b/svtools/inc/svtools/editimplementation.hxx
@@ -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
diff --git a/svtools/inc/svtools/editsyntaxhighlighter.hxx b/svtools/inc/svtools/editsyntaxhighlighter.hxx
index 01add0c4ce1d..d603469c6725 100644
--- a/svtools/inc/svtools/editsyntaxhighlighter.hxx
+++ b/svtools/inc/svtools/editsyntaxhighlighter.hxx
@@ -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
@@ -36,16 +36,16 @@
 class SVT_DLLPUBLIC MultiLineEditSyntaxHighlight : public MultiLineEdit
 {
     private:
-        bool                mbDoBracketHilight;
-        SyntaxHighlighter   aHighlighter;
+        bool				mbDoBracketHilight;
+        SyntaxHighlighter	aHighlighter;
         svtools::ColorConfig m_aColorConfig;
-
+        
     private:
         virtual void DoBracketHilight(USHORT aKey);
 
     protected:
         virtual long PreNotify( NotifyEvent& rNEvt );
-
+    
     public:
         MultiLineEditSyntaxHighlight( Window* pParent, WinBits nWinStyle = WB_LEFT | WB_BORDER , HighlighterLanguage aLanguage = HIGHLIGHT_SQL);
         MultiLineEditSyntaxHighlight( Window* pParent, const ResId& rResId , HighlighterLanguage aLanguage = HIGHLIGHT_SQL);
@@ -57,7 +57,7 @@ class SVT_DLLPUBLIC MultiLineEditSyntaxHighlight : public MultiLineEdit
         virtual void SetText(const String& rNewText);
         virtual void SetText( const XubString& rStr, const Selection& rNewSelection )
                     { SetText( rStr ); SetSelection( rNewSelection ); }
-
+        
         Color GetColorValue(TokenTypes aToken);
 };
 
diff --git a/svtools/inc/svtools/ehdl.hxx b/svtools/inc/svtools/ehdl.hxx
index 967c41636ea3..33866666eaa9 100644
--- a/svtools/inc/svtools/ehdl.hxx
+++ b/svtools/inc/svtools/ehdl.hxx
@@ -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
diff --git a/svtools/inc/svtools/embedhlp.hxx b/svtools/inc/svtools/embedhlp.hxx
index 098b565385ec..bc3511b8dffd 100644
--- a/svtools/inc/svtools/embedhlp.hxx
+++ b/svtools/inc/svtools/embedhlp.hxx
@@ -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
@@ -104,18 +104,18 @@ namespace svt
 
         ::rtl::OUString GetPersistName() const;
         sal_Int64       GetViewAspect() const;
-        void            SetViewAspect( sal_Int64 nAspect );
+        void			SetViewAspect( sal_Int64 nAspect );
         Graphic*        GetGraphic( ::rtl::OUString* pMediaType=0 ) const;
 
         // the original size of the object ( size of the icon for iconified object )
         // no conversion is done if no target mode is provided
-        Size            GetSize( MapMode* pTargetMapMode = NULL ) const;
+        Size			GetSize( MapMode* pTargetMapMode = NULL ) const;
 
         // the following method tries to get the HC graphic if it is possible, otherwise returns NULL
         Graphic*        GetHCGraphic() const;
 
         void            SetGraphic( const Graphic& rGraphic, const ::rtl::OUString& rMediaType );
-        void            SetGraphicStream(
+        void			SetGraphicStream(
                             const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& xInGrStream,
                             const ::rtl::OUString& rMediaType );
 
@@ -131,8 +131,8 @@ namespace svt
 
         // #i104867#
         // Provides a graphic version number for the fetchable Graphic during this object's lifetime. Internally,
-        // that number is incremented at each change of the Graphic. This mechanism is needed to identify if a
-        // remembered Graphic (e.g. primitives) has changed compared to the current one, but without actively
+        // that number is incremented at each change of the Graphic. This mechanism is needed to identify if a 
+        // remembered Graphic (e.g. primitives) has changed compared to the current one, but without actively 
         // fetching the Graphic what would be too expensive e.g. for charts
         sal_uInt32 getGraphicVersion() const;
         void            SetDefaultSizeForChart( const Size& rSizeIn_100TH_MM );//#i103460# charts do not necessaryly have an own size within ODF files, in this case they need to use the size settings from the surrounding frame, which is made available with this method
diff --git a/svtools/inc/svtools/embedtransfer.hxx b/svtools/inc/svtools/embedtransfer.hxx
index 6b3896ceb1aa..5e0f9ce4ab1b 100644
--- a/svtools/inc/svtools/embedtransfer.hxx
+++ b/svtools/inc/svtools/embedtransfer.hxx
@@ -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
@@ -43,9 +43,9 @@ private:
 
 protected:
 
-    virtual void        AddSupportedFormats();
-    virtual sal_Bool    GetData( const ::com::sun::star::datatransfer::DataFlavor& rFlavor );
-    virtual void        ObjectReleased();
+    virtual void		AddSupportedFormats();
+    virtual sal_Bool	GetData( const ::com::sun::star::datatransfer::DataFlavor& rFlavor );
+    virtual void		ObjectReleased();
 
 public:
     // object, replacement image, and the aspect
diff --git a/svtools/inc/svtools/extensionlistbox.hxx b/svtools/inc/svtools/extensionlistbox.hxx
index 532d3822c555..8ed084331db2 100644
--- a/svtools/inc/svtools/extensionlistbox.hxx
+++ b/svtools/inc/svtools/extensionlistbox.hxx
@@ -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
diff --git a/svtools/inc/svtools/fileurlbox.hxx b/svtools/inc/svtools/fileurlbox.hxx
index 6d2f6e2b9041..1d86cec65b10 100644
--- a/svtools/inc/svtools/fileurlbox.hxx
+++ b/svtools/inc/svtools/fileurlbox.hxx
@@ -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
@@ -42,7 +42,7 @@ namespace svt
     class SVT_DLLPUBLIC FileURLBox : public SvtURLBox
     {
     protected:
-        String      m_sPreservedText;
+        String		m_sPreservedText;
 
     public:
         FileURLBox( Window* _pParent );
@@ -50,8 +50,8 @@ namespace svt
         FileURLBox( Window* _pParent, const ResId& _rId );
 
     protected:
-        virtual long        PreNotify( NotifyEvent& rNEvt );
-        virtual long        Notify( NotifyEvent& rNEvt );
+        virtual long		PreNotify( NotifyEvent& rNEvt );
+        virtual long		Notify( NotifyEvent& rNEvt );
 
     public:
         /** transforms the given URL content into a system-dependent notation, if possible, and
@@ -70,7 +70,7 @@ namespace svt
     };
 
 //.........................................................................
-}   // namespace svt
+}	// namespace svt
 //.........................................................................
 
 #endif // SVTOOLS_FILEURLBOX_HXX
diff --git a/svtools/inc/svtools/filter.hxx b/svtools/inc/svtools/filter.hxx
index 49ec77adfea5..43bd2801e91d 100644
--- a/svtools/inc/svtools/filter.hxx
+++ b/svtools/inc/svtools/filter.hxx
@@ -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
@@ -51,88 +51,88 @@ struct ImplDirEntryHelper
 class Window;
 class Graphic;
 
-#define OPT_FILTERSECTION           "Graphic"
+#define OPT_FILTERSECTION			"Graphic"
 
-#define GRFILTER_OK                 0
-#define GRFILTER_OPENERROR          1
-#define GRFILTER_IOERROR            2
-#define GRFILTER_FORMATERROR        3
-#define GRFILTER_VERSIONERROR       4
-#define GRFILTER_FILTERERROR        5
-#define GRFILTER_ABORT              6
-#define GRFILTER_TOOBIG             7
+#define GRFILTER_OK					0
+#define GRFILTER_OPENERROR			1
+#define GRFILTER_IOERROR			2
+#define GRFILTER_FORMATERROR		3
+#define GRFILTER_VERSIONERROR		4
+#define GRFILTER_FILTERERROR		5
+#define GRFILTER_ABORT				6
+#define GRFILTER_TOOBIG				7
 
 #define GRFILTER_OUTHINT_GREY       1
 
-#define GRFILTER_FORMAT_NOTFOUND    ((USHORT)0xFFFF)
-#define GRFILTER_FORMAT_DONTKNOW    ((USHORT)0xFFFF)
+#define GRFILTER_FORMAT_NOTFOUND	((USHORT)0xFFFF)
+#define GRFILTER_FORMAT_DONTKNOW	((USHORT)0xFFFF)
 
 #define GRFILTER_I_FLAGS_SET_LOGSIZE_FOR_JPEG       00000001
 #define GRFILTER_I_FLAGS_DONT_SET_LOGSIZE_FOR_JPEG  00000002
 #define GRFILTER_I_FLAGS_FOR_PREVIEW                00000004
 #define GRFILTER_I_FLAGS_ALLOW_PARTIAL_STREAMREAD   00000010
 
-#define IMP_BMP                 "SVBMP"
-#define IMP_SVMETAFILE          "SVMETAFILE"
-#define IMP_WMF                 "SVWMF"
-#define IMP_EMF                 "SVEMF"
-#define IMP_SVSGF               "SVSGF"
-#define IMP_SVSGV               "SVSGV"
-#define IMP_GIF                 "SVIGIF"
-#define IMP_PNG                 "SVIPNG"
-#define IMP_JPEG                "SVIJPEG"
-#define IMP_XBM                 "SVIXBM"
-#define IMP_XPM                 "SVIXPM"
-#define EXP_BMP                 "SVBMP"
-#define EXP_SVMETAFILE          "SVMETAFILE"
-#define EXP_WMF                 "SVWMF"
-#define EXP_EMF                 "SVEMF"
-#define EXP_JPEG                "SVEJPEG"
-#define EXP_SVG                 "SVESVG"
-#define EXP_PNG                 "SVEPNG"
-
-#define BMP_SHORTNAME           "BMP"
-#define GIF_SHORTNAME           "GIF"
-#define JPG_SHORTNAME           "JPG"
-#define MET_SHORTNAME           "MET"
-#define PCT_SHORTNAME           "PCT"
-#define PNG_SHORTNAME           "PNG"
-#define SVM_SHORTNAME           "SVM"
-#define TIF_SHORTNAME           "TIF"
-#define WMF_SHORTNAME           "WMF"
-#define EMF_SHORTNAME           "EMF"
+#define IMP_BMP					"SVBMP"
+#define IMP_SVMETAFILE			"SVMETAFILE"
+#define IMP_WMF					"SVWMF"
+#define IMP_EMF					"SVEMF"
+#define IMP_SVSGF				"SVSGF"
+#define IMP_SVSGV				"SVSGV"
+#define IMP_GIF					"SVIGIF"
+#define IMP_PNG					"SVIPNG"
+#define IMP_JPEG				"SVIJPEG"
+#define IMP_XBM					"SVIXBM"
+#define IMP_XPM					"SVIXPM"
+#define EXP_BMP					"SVBMP"
+#define EXP_SVMETAFILE			"SVMETAFILE"
+#define EXP_WMF					"SVWMF"
+#define EXP_EMF					"SVEMF"
+#define EXP_JPEG				"SVEJPEG"
+#define EXP_SVG					"SVESVG"
+#define EXP_PNG					"SVEPNG"
+
+#define BMP_SHORTNAME			"BMP"
+#define GIF_SHORTNAME			"GIF"
+#define JPG_SHORTNAME			"JPG"
+#define MET_SHORTNAME			"MET"
+#define PCT_SHORTNAME			"PCT"
+#define PNG_SHORTNAME			"PNG"
+#define SVM_SHORTNAME			"SVM"
+#define TIF_SHORTNAME			"TIF"
+#define WMF_SHORTNAME			"WMF"
+#define EMF_SHORTNAME			"EMF"
 
 // ------------------------------------
 // - Info-Klasse fuer alle von uns
-//  unterstuetzten Grafik-Fileformate
+//	unterstuetzten Grafik-Fileformate
 // ------------------------------------
 
-#define GFF_NOT ( (USHORT)0x0000 )
-#define GFF_BMP ( (USHORT)0x0001 )
-#define GFF_GIF ( (USHORT)0x0002 )
-#define GFF_JPG ( (USHORT)0x0003 )
-#define GFF_PCD ( (USHORT)0x0004 )
-#define GFF_PCX ( (USHORT)0x0005 )
-#define GFF_PNG ( (USHORT)0x0006 )
-#define GFF_TIF ( (USHORT)0x0007 )
-#define GFF_XBM ( (USHORT)0x0008 )
-#define GFF_XPM ( (USHORT)0x0009 )
-#define GFF_PBM ( (USHORT)0x000a )
-#define GFF_PGM ( (USHORT)0x000b )
-#define GFF_PPM ( (USHORT)0x000c )
-#define GFF_RAS ( (USHORT)0x000d )
-#define GFF_TGA ( (USHORT)0x000e )
-#define GFF_PSD ( (USHORT)0x000f )
-#define GFF_EPS ( (USHORT)0x0010 )
-#define GFF_DXF ( (USHORT)0x00f1 )
-#define GFF_MET ( (USHORT)0x00f2 )
-#define GFF_PCT ( (USHORT)0x00f3 )
-#define GFF_SGF ( (USHORT)0x00f4 )
-#define GFF_SVM ( (USHORT)0x00f5 )
-#define GFF_WMF ( (USHORT)0x00f6 )
-#define GFF_SGV ( (USHORT)0x00f7 )
-#define GFF_EMF ( (USHORT)0x00f8 )
-#define GFF_XXX ( (USHORT)0xffff )
+#define	GFF_NOT	( (USHORT)0x0000 )
+#define	GFF_BMP	( (USHORT)0x0001 )
+#define	GFF_GIF	( (USHORT)0x0002 )
+#define	GFF_JPG	( (USHORT)0x0003 )
+#define	GFF_PCD	( (USHORT)0x0004 )
+#define	GFF_PCX	( (USHORT)0x0005 )
+#define	GFF_PNG	( (USHORT)0x0006 )
+#define	GFF_TIF	( (USHORT)0x0007 )
+#define	GFF_XBM	( (USHORT)0x0008 )
+#define	GFF_XPM	( (USHORT)0x0009 )
+#define	GFF_PBM	( (USHORT)0x000a )
+#define	GFF_PGM	( (USHORT)0x000b )
+#define	GFF_PPM	( (USHORT)0x000c )
+#define	GFF_RAS	( (USHORT)0x000d )
+#define	GFF_TGA	( (USHORT)0x000e )
+#define	GFF_PSD	( (USHORT)0x000f )
+#define	GFF_EPS	( (USHORT)0x0010 )
+#define	GFF_DXF	( (USHORT)0x00f1 )
+#define	GFF_MET	( (USHORT)0x00f2 )
+#define	GFF_PCT	( (USHORT)0x00f3 )
+#define	GFF_SGF	( (USHORT)0x00f4 )
+#define	GFF_SVM	( (USHORT)0x00f5 )
+#define	GFF_WMF	( (USHORT)0x00f6 )
+#define GFF_SGV	( (USHORT)0x00f7 )
+#define	GFF_EMF	( (USHORT)0x00f8 )
+#define	GFF_XXX	( (USHORT)0xffff )
 
 // ---------------
 // - RequestInfo -
@@ -140,8 +140,8 @@ class Graphic;
 
 struct RequestInfo
 {
-    BYTE*   pBuffer;
-    ULONG   nRealBufferSize;
+    BYTE*	pBuffer;
+    ULONG	nRealBufferSize;
 };
 
 // ---------------------
@@ -150,54 +150,54 @@ struct RequestInfo
 
 class SVT_DLLPUBLIC GraphicDescriptor
 {
-    SvStream*           pFileStm;
-    Link                aReqLink;
-    String              aPathExt;
-    Size                aPixSize;
-    Size                aLogSize;
-    SvStream*           pMemStm;
-    SvStream*           pBaseStm;
-    ULONG               nStmPos;
-    USHORT              nBitsPerPixel;
-    USHORT              nPlanes;
-    USHORT              nFormat;
-    BOOL                bCompressed;
-    BOOL                bDataReady;
-    BOOL                bLinked;
-    BOOL                bLinkChanged;
-    BOOL                bWideSearch;
-    BOOL                bBaseStm;
-    long                nExtra1;
-    long                nExtra2;
-
-    void                ImpConstruct();
+    SvStream*			pFileStm;
+    Link				aReqLink;
+    String				aPathExt;
+    Size				aPixSize;
+    Size				aLogSize;
+    SvStream*			pMemStm;
+    SvStream*			pBaseStm;
+    ULONG				nStmPos;
+    USHORT				nBitsPerPixel;
+    USHORT				nPlanes;
+    USHORT				nFormat;
+    BOOL				bCompressed;
+    BOOL				bDataReady;
+    BOOL				bLinked;
+    BOOL				bLinkChanged;
+    BOOL				bWideSearch;
+    BOOL				bBaseStm;
+    long				nExtra1;
+    long				nExtra2;
+
+    void				ImpConstruct();
 
 //#if 0 // _SOLAR__PRIVATE
 
-    BOOL                ImpDetectBMP( SvStream& rStm, BOOL bExtendedInfo );
-    BOOL                ImpDetectGIF( SvStream& rStm, BOOL bExtendedInfo );
-    BOOL                ImpDetectJPG( SvStream& rStm, BOOL bExtendedInfo );
-    BOOL                ImpDetectPCD( SvStream& rStm, BOOL bExtendedInfo );
-    BOOL                ImpDetectPCX( SvStream& rStm, BOOL bExtendedInfo );
-    BOOL                ImpDetectPNG( SvStream& rStm, BOOL bExtendedInfo );
-    BOOL                ImpDetectTIF( SvStream& rStm, BOOL bExtendedInfo );
-    BOOL                ImpDetectXBM( SvStream& rStm, BOOL bExtendedInfo );
-    BOOL                ImpDetectXPM( SvStream& rStm, BOOL bExtendedInfo );
-    BOOL                ImpDetectPBM( SvStream& rStm, BOOL bExtendedInfo );
-    BOOL                ImpDetectPGM( SvStream& rStm, BOOL bExtendedInfo );
-    BOOL                ImpDetectPPM( SvStream& rStm, BOOL bExtendedInfo );
-    BOOL                ImpDetectRAS( SvStream& rStm, BOOL bExtendedInfo );
-    BOOL                ImpDetectTGA( SvStream& rStm, BOOL bExtendedInfo );
-    BOOL                ImpDetectPSD( SvStream& rStm, BOOL bExtendedInfo );
-    BOOL                ImpDetectEPS( SvStream& rStm, BOOL bExtendedInfo );
-    BOOL                ImpDetectDXF( SvStream& rStm, BOOL bExtendedInfo );
-    BOOL                ImpDetectMET( SvStream& rStm, BOOL bExtendedInfo );
-    BOOL                ImpDetectPCT( SvStream& rStm, BOOL bExtendedInfo );
-    BOOL                ImpDetectSGF( SvStream& rStm, BOOL bExtendedInfo );
-    BOOL                ImpDetectSVM( SvStream& rStm, BOOL bExtendedInfo );
-    BOOL                ImpDetectWMF( SvStream& rStm, BOOL bExtendedInfo );
-    BOOL                ImpDetectSGV( SvStream& rStm, BOOL bExtendedInfo );
-    BOOL                ImpDetectEMF( SvStream& rStm, BOOL bExtendedInfo );
+    BOOL				ImpDetectBMP( SvStream& rStm, BOOL bExtendedInfo );
+    BOOL				ImpDetectGIF( SvStream& rStm, BOOL bExtendedInfo );
+    BOOL				ImpDetectJPG( SvStream& rStm, BOOL bExtendedInfo );
+    BOOL				ImpDetectPCD( SvStream& rStm, BOOL bExtendedInfo );
+    BOOL				ImpDetectPCX( SvStream& rStm, BOOL bExtendedInfo );
+    BOOL				ImpDetectPNG( SvStream& rStm, BOOL bExtendedInfo );
+    BOOL				ImpDetectTIF( SvStream& rStm, BOOL bExtendedInfo );
+    BOOL				ImpDetectXBM( SvStream& rStm, BOOL bExtendedInfo );
+    BOOL				ImpDetectXPM( SvStream& rStm, BOOL bExtendedInfo );
+    BOOL				ImpDetectPBM( SvStream& rStm, BOOL bExtendedInfo );
+    BOOL				ImpDetectPGM( SvStream& rStm, BOOL bExtendedInfo );
+    BOOL				ImpDetectPPM( SvStream& rStm, BOOL bExtendedInfo );
+    BOOL				ImpDetectRAS( SvStream& rStm, BOOL bExtendedInfo );
+    BOOL				ImpDetectTGA( SvStream& rStm, BOOL bExtendedInfo );
+    BOOL				ImpDetectPSD( SvStream& rStm, BOOL bExtendedInfo );
+    BOOL				ImpDetectEPS( SvStream& rStm, BOOL bExtendedInfo );
+    BOOL				ImpDetectDXF( SvStream& rStm, BOOL bExtendedInfo );
+    BOOL				ImpDetectMET( SvStream& rStm, BOOL bExtendedInfo );
+    BOOL				ImpDetectPCT( SvStream& rStm, BOOL bExtendedInfo );
+    BOOL				ImpDetectSGF( SvStream& rStm, BOOL bExtendedInfo );
+    BOOL				ImpDetectSVM( SvStream& rStm, BOOL bExtendedInfo );
+    BOOL				ImpDetectWMF( SvStream& rStm, BOOL bExtendedInfo );
+    BOOL				ImpDetectSGV( SvStream& rStm, BOOL bExtendedInfo );
+    BOOL				ImpDetectEMF( SvStream& rStm, BOOL bExtendedInfo );
 
 //#endif
 
@@ -206,10 +206,10 @@ class SVT_DLLPUBLIC GraphicDescriptor
 
 protected:
 
-    BOOL                IsDataReady() const;
-    BOOL                IsWideSearch() const;
-    SvStream&           GetSearchStream() const;
-    const String&       GetPathExtension() const;
+    BOOL				IsDataReady() const;
+    BOOL				IsWideSearch() const;
+    SvStream&			GetSearchStream() const;
+    const String&		GetPathExtension() const;
 
 public:
 
@@ -240,26 +240,26 @@ public:
     // bei bExtendedInfo == TRUE werden soweit wie moeglich
     // Daten aus dem jeweiligen FileHeader ermittelt
     // ( Groesse, Farbtiefe usw. )
-    virtual BOOL    Detect( BOOL bExtendedInfo = FALSE );
+    virtual BOOL	Detect( BOOL bExtendedInfo = FALSE );
 
     // liefert das Fileformat nach erfolgreicher  Detektion zurueck;
     // wenn kein Format erkannt wurde, ist das Formart GFF_NOT
-    USHORT          GetFileFormat() const { return nFormat; }
+    USHORT			GetFileFormat() const { return nFormat; }
 
     // liefert die Pixel-Bildgroesse oder 0-Size zurueck
-    const Size&     GetSizePixel() const { return (Size&) aPixSize; }
+    const Size&		GetSizePixel() const { return (Size&) aPixSize; }
 
     // liefert die logische Bildgroesse in 1/100mm oder 0-Size zurueck
-    const Size&     GetSize_100TH_MM() const { return (Size&) aLogSize; }
+    const Size&		GetSize_100TH_MM() const { return (Size&) aLogSize; }
 
     // liefert die Bits/Pixel oder 0 zurueck
-    USHORT          GetBitsPerPixel() const { return nBitsPerPixel; }
+    USHORT			GetBitsPerPixel() const { return nBitsPerPixel; }
 
     // liefert die Anzahl der Planes oder 0 zurueck
-    USHORT          GetPlanes() const { return nPlanes; }
+    USHORT			GetPlanes() const { return nPlanes; }
 
     // zeigt an, ob das Bild evtl. komprimiert (wie auch immer) ist
-    BOOL            IsCompressed() const { return bCompressed; }
+    BOOL			IsCompressed() const { return bCompressed; }
 
     // setzt den LinkHdl zum Setzen der Bytes;
     // der Handler muss einen Pointer auf die RequestInfo-Struktur
@@ -267,14 +267,14 @@ public:
     // Daten muss im Handler ueber ::GetRequestedByteCount() erfragt werden;
     // die tatsaechlich zur Verfuegung gestellte BYTE-Anzahl
     // wird in der RequestInfo-Struktur gesetzt
-    void            SetRequestHdl( const Link& rRequestHdl );
+    void			SetRequestHdl( const Link& rRequestHdl );
 
     // gibt den LinkHdl zum Setzen der Bytes zurueck
-    const Link&     GetRequestHdl() const { return aReqLink; }
+    const Link&		GetRequestHdl() const { return aReqLink; }
 
     // muss im ReqHdl gerufen werden, um zu erfahren, wieviele
     // Bytes _mindestens_ bereitgestellt werden muessen
-    ULONG           GetRequestedByteCount() const;
+    ULONG			GetRequestedByteCount() const;
 
     // gibt die Filternummer des Filters zurueck,
     // der im GraphicFilter zum Lesen dieses Formats
@@ -288,12 +288,12 @@ public:
 
 struct FilterErrorEx
 {
-    ULONG   nFilterError;
-    ULONG   nStreamError;
-    long    nDummy1;
-    long    nDummy2;
-    long    nDummy3;
-    long    nDummy4;
+    ULONG	nFilterError;
+    ULONG	nStreamError;
+    long	nDummy1;
+    long	nDummy2;
+    long	nDummy3;
+    long	nDummy4;
 
             FilterErrorEx() : nFilterError( 0UL ), nStreamError( 0UL ) {}
 };
@@ -308,72 +308,72 @@ class SVT_DLLPUBLIC GraphicFilter
 
 private:
 
-    void            ImplInit();
-    ULONG           ImplSetError( ULONG nError, const SvStream* pStm = NULL );
-    sal_uInt16      ImpTestOrFindFormat( const String& rPath, SvStream& rStream, sal_uInt16& rFormat );
+    void			ImplInit();
+    ULONG			ImplSetError( ULONG nError, const SvStream* pStm = NULL );
+    sal_uInt16		ImpTestOrFindFormat( const String& rPath, SvStream& rStream, sal_uInt16& rFormat );
 
                     DECL_LINK( FilterCallback, ConvertData* pData );
 
 protected:
 
-    String              aFilterPath;
-    FilterConfigCache*  pConfig;
-    FilterErrorEx*      pErrorEx;
-    sal_Bool            bAbort;
-    sal_Bool            bUseConfig;
-    sal_Bool            bDummy1;
-    sal_Bool            bDummy2;
-    sal_Bool            bDummy3;
-    sal_Bool            bDummy4;
-    long                nExpGraphHint;
-    long                nDummy2;
-    void*               pDummy1;
-    void*               pDummy2;
+    String				aFilterPath;
+    FilterConfigCache*	pConfig;
+    FilterErrorEx*		pErrorEx;
+    sal_Bool			bAbort;
+    sal_Bool			bUseConfig;
+    sal_Bool			bDummy1;
+    sal_Bool			bDummy2;
+    sal_Bool			bDummy3;
+    sal_Bool			bDummy4;
+    long				nExpGraphHint;
+    long				nDummy2;
+    void*				pDummy1;
+    void*				pDummy2;
 
 public:
 
                     GraphicFilter( sal_Bool bUseConfig = sal_True );
                     ~GraphicFilter();
 
-    void            SetFilterPath( const String& rFilterPath ) { aFilterPath = rFilterPath; };
+    void			SetFilterPath( const String& rFilterPath ) { aFilterPath = rFilterPath; };
 
     USHORT          GetImportFormatCount();
     USHORT          GetImportFormatNumber( const String& rFormatName );
-    USHORT          GetImportFormatNumberForMediaType( const String& rMediaType );
+    USHORT			GetImportFormatNumberForMediaType( const String& rMediaType );
     USHORT          GetImportFormatNumberForShortName( const String& rShortName );
-    sal_uInt16      GetImportFormatNumberForTypeName( const String& rType );
+    sal_uInt16		GetImportFormatNumberForTypeName( const String& rType );
     String          GetImportFormatName( USHORT nFormat );
     String          GetImportFormatTypeName( USHORT nFormat );
     String          GetImportFormatMediaType( USHORT nFormat );
     String          GetImportFormatShortName( USHORT nFormat );
-    String          GetImportOSFileType( USHORT nFormat );
-    String          GetImportWildcard( USHORT nFormat, sal_Int32 nEntry = 0 );
-    BOOL            IsImportPixelFormat( USHORT nFormat );
+    String			GetImportOSFileType( USHORT nFormat );
+    String			GetImportWildcard( USHORT nFormat, sal_Int32 nEntry = 0 );
+    BOOL			IsImportPixelFormat( USHORT nFormat );
 
     USHORT          GetExportFormatCount();
     USHORT          GetExportFormatNumber( const String& rFormatName );
     USHORT          GetExportFormatNumberForMediaType( const String& rShortName );
     USHORT          GetExportFormatNumberForShortName( const String& rShortName );
-    sal_uInt16      GetExportFormatNumberForTypeName( const String& rType );
+    sal_uInt16		GetExportFormatNumberForTypeName( const String& rType );
     String          GetExportFormatName( USHORT nFormat );
     String          GetExportFormatTypeName( USHORT nFormat );
     String          GetExportFormatMediaType( USHORT nFormat );
     String          GetExportFormatShortName( USHORT nFormat );
-    String          GetExportOSFileType( USHORT nFormat );
-    String          GetExportWildcard( USHORT nFormat, sal_Int32 nEntry = 0 );
-    BOOL            IsExportPixelFormat( USHORT nFormat );
+    String			GetExportOSFileType( USHORT nFormat );
+    String			GetExportWildcard( USHORT nFormat, sal_Int32 nEntry = 0 );
+    BOOL			IsExportPixelFormat( USHORT nFormat );
 
-    BOOL            HasImportDialog( USHORT nFormat );
-    BOOL            DoImportDialog( Window* pWindow, USHORT nFormat );
+    BOOL			HasImportDialog( USHORT nFormat );
+    BOOL			DoImportDialog( Window* pWindow, USHORT nFormat );
 
-    BOOL            HasExportDialog( USHORT nFormat );
-    BOOL            DoExportDialog( Window* pWindow, USHORT nFormat );
-    BOOL            DoExportDialog( Window* pWindow, USHORT nFormat, FieldUnit eFieldUnit );
+    BOOL			HasExportDialog( USHORT nFormat );
+    BOOL			DoExportDialog( Window* pWindow, USHORT nFormat );
+    BOOL			DoExportDialog( Window* pWindow, USHORT nFormat, FieldUnit eFieldUnit );
 
-    USHORT          ExportGraphic( const Graphic& rGraphic, const INetURLObject& rPath,
+    USHORT			ExportGraphic( const Graphic& rGraphic, const INetURLObject& rPath,
                                     USHORT nFormat = GRFILTER_FORMAT_DONTKNOW,
                                         const com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue >* pFilterData = NULL );
-    USHORT          ExportGraphic( const Graphic& rGraphic, const String& rPath,
+    USHORT			ExportGraphic( const Graphic& rGraphic, const String& rPath,
                                     SvStream& rOStm, USHORT nFormat = GRFILTER_FORMAT_DONTKNOW,
                                         const com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue >* pFilterData = NULL );
     long            GetExportGraphicHint() const { return nExpGraphHint; }
@@ -405,12 +405,12 @@ public:
 
     void            Abort() { bAbort = TRUE; }
 
-    const FilterErrorEx&    GetLastError() const;
-    void                    ResetLastError();
+    const FilterErrorEx&	GetLastError() const;
+    void					ResetLastError();
 
     const Link      GetFilterCallback() const;
-    static          GraphicFilter* GetGraphicFilter();
-    static int      LoadGraphic( const String& rPath, const String& rFilter,
+    static 			GraphicFilter* GetGraphicFilter();
+    static int 		LoadGraphic( const String& rPath, const String& rFilter,
                      Graphic& rGraphic,
                      GraphicFilter* pFilter = NULL,
                      USHORT* pDeterminedFormat = NULL );
diff --git a/svtools/inc/svtools/fixedhyper.hxx b/svtools/inc/svtools/fixedhyper.hxx
index 290b53c7d841..dda559c4d9fd 100644
--- a/svtools/inc/svtools/fixedhyper.hxx
+++ b/svtools/inc/svtools/fixedhyper.hxx
@@ -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
diff --git a/svtools/inc/svtools/fltcall.hxx b/svtools/inc/svtools/fltcall.hxx
index d0bf054d724e..14b330835581 100644
--- a/svtools/inc/svtools/fltcall.hxx
+++ b/svtools/inc/svtools/fltcall.hxx
@@ -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
@@ -41,18 +41,18 @@ class Window;
 struct FltCallDialogParameter
 {
 
-    Window*     pWindow;
-    ResMgr*     pResMgr;
-    FieldUnit   eFieldUnit;
-    String      aFilterExt;
+    Window*		pWindow;
+    ResMgr*		pResMgr;
+    FieldUnit	eFieldUnit;
+    String		aFilterExt;
 
     // In and Out PropertySequence for all filter dialogs
     ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > aFilterData;
 
     FltCallDialogParameter( Window* pW, ResMgr* pRsMgr, FieldUnit eFiUni ) :
-        pWindow         ( pW ),
-        pResMgr         ( pRsMgr ),
-        eFieldUnit      ( eFiUni ) {};
+        pWindow			( pW ),
+        pResMgr			( pRsMgr ),
+        eFieldUnit		( eFiUni ) {};
 };
 
 typedef BOOL (*PFilterCall)(SvStream & rStream, Graphic & rGraphic,
diff --git a/svtools/inc/svtools/fmtfield.hxx b/svtools/inc/svtools/fmtfield.hxx
index 9226f78b77fc..ccb1cea5f17e 100644
--- a/svtools/inc/svtools/fmtfield.hxx
+++ b/svtools/inc/svtools/fmtfield.hxx
@@ -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
@@ -45,10 +45,10 @@
 #endif
 
 typedef USHORT FORMAT_CHANGE_TYPE;
-#define FCT_KEYONLY         0x00        // only a new key was set
-#define FCT_FORMATTER       0x01        // a new formatter weas set, usually implies a change of the key, too
-#define FCT_PRECISION       0x02        // a new precision was set
-#define FCT_THOUSANDSSEP    0x03        // the thousands separator setting changed
+#define FCT_KEYONLY			0x00		// only a new key was set
+#define FCT_FORMATTER		0x01		// a new formatter weas set, usually implies a change of the key, too
+#define FCT_PRECISION		0x02		// a new precision was set
+#define FCT_THOUSANDSSEP	0x03		// the thousands separator setting changed
 
 //------------------------------------------------------------------------------
 class SVT_DLLPUBLIC FormattedField : public SpinField
@@ -59,8 +59,8 @@ private:
     // einzige statische.
     class StaticFormatter
     {
-        static SvNumberFormatter*   s_cFormatter;
-        static ULONG                s_nReferences;
+        static SvNumberFormatter*	s_cFormatter;
+        static ULONG				s_nReferences;
     public:
         StaticFormatter();
         ~StaticFormatter();
@@ -70,44 +70,44 @@ private:
     };
 
 protected:
-    String      m_sLastValidText;
+    String		m_sLastValidText;
         // hat nichts mit dem current value zu tun, ist der letzte Text, der waehrend einer Eingabe als gueltig erkannt
         // wurde (also durch CheckText geprueft, nicht durch den Formatter gejagt)
-    Selection   m_aLastSelection;
+    Selection	m_aLastSelection;
 
-    double              m_dMinValue;
-    double              m_dMaxValue;
-    BOOL                m_bHasMin : 1;
-    BOOL                m_bHasMax : 1;
+    double				m_dMinValue;
+    double				m_dMaxValue;
+    BOOL				m_bHasMin : 1;
+    BOOL				m_bHasMax : 1;
 
-    BOOL                m_bStrictFormat : 1;
+    BOOL				m_bStrictFormat : 1;
 
-    BOOL                m_bValueDirty : 1;
-    BOOL                m_bEnableEmptyField : 1;
-    BOOL                m_bAutoColor : 1;
-    BOOL                m_bEnableNaN : 1;
-    double              m_dCurrentValue;
-    double              m_dDefaultValue;
+    BOOL				m_bValueDirty : 1;
+    BOOL				m_bEnableEmptyField : 1;
+    BOOL				m_bAutoColor : 1;
+    BOOL				m_bEnableNaN : 1;
+    double				m_dCurrentValue;
+    double				m_dDefaultValue;
 
-    ULONG               m_nFormatKey;
-    SvNumberFormatter*  m_pFormatter;
-    StaticFormatter     m_aStaticFormatter;
+    ULONG				m_nFormatKey;
+    SvNumberFormatter*	m_pFormatter;
+    StaticFormatter		m_aStaticFormatter;
 
-    double              m_dSpinSize;
-    double              m_dSpinFirst;
-    double              m_dSpinLast;
+    double				m_dSpinSize;
+    double				m_dSpinFirst;
+    double				m_dSpinLast;
 
     // es macht einen Unterschied, ob man bei eingestellter Textformatierung beim LostFocus den aktuellen String durch
     // den Formatter jagt und das Ergebnis anzeigt oder erst aus dem String ein double macht, das formatiert und dann
     // ausgibt
-    BOOL                m_bTreatAsNumber;
+    BOOL				m_bTreatAsNumber;
     // und mit den folgenden Members koennen wir das Ganze hier auch zur formatierten Text-Ausgabe benutzen ...
-    String              m_sCurrentTextValue;
-    String              m_sDefaultText;
+    String				m_sCurrentTextValue;
+    String				m_sDefaultText;
 
     // die bei der letzten Ausgabe-Operation vom Formatter gelieferte Farbe (nicht dass wir sie beachten wuerden, aber
     // man kann sie von aussen abfragen)
-    Color*              m_pLastOutputColor;
+    Color*				m_pLastOutputColor;
 
     bool                m_bUseInputStringForFormatting;
 
@@ -117,63 +117,63 @@ public:
     virtual ~FormattedField();
 
     // Min-/Max-Verwaltung
-    BOOL    HasMinValue() const         { return m_bHasMin; }
-    void    ClearMinValue()             { m_bHasMin = FALSE; }
-    void    SetMinValue(double dMin);
-    double  GetMinValue() const         { return m_dMinValue; }
+    BOOL	HasMinValue() const			{ return m_bHasMin; }
+    void	ClearMinValue()				{ m_bHasMin = FALSE; }
+    void	SetMinValue(double dMin);
+    double	GetMinValue() const			{ return m_dMinValue; }
 
-    BOOL    HasMaxValue() const         { return m_bHasMax; }
-    void    ClearMaxValue()             { m_bHasMax = FALSE; }
-    void    SetMaxValue(double dMax);
-    double  GetMaxValue() const         { return m_dMaxValue; }
+    BOOL	HasMaxValue() const			{ return m_bHasMax; }
+    void	ClearMaxValue()				{ m_bHasMax = FALSE; }
+    void	SetMaxValue(double dMax);
+    double	GetMaxValue() const			{ return m_dMaxValue; }
 
     // aktueller Wert
-    virtual void    SetValue(double dVal);
-    virtual double  GetValue();
+    virtual void	SetValue(double dVal);
+    virtual double	GetValue();
         // die Standard-Implementierung jagt die Eingabe jeweils durch den Formatter, so einer vorhanden ist
 
-    void    GetColor() const;
+    void	GetColor() const;
 
-    void    SetTextValue(const XubString& rText);
+    void	SetTextValue(const XubString& rText);
         // der String wird in ein double umgewandelt (durch den Formatter) und anschliessen in SetValue gesteckt
 
-    BOOL    IsEmptyFieldEnabled() const         { return m_bEnableEmptyField; }
-    void    EnableEmptyField(BOOL bEnable);
+    BOOL	IsEmptyFieldEnabled() const			{ return m_bEnableEmptyField; }
+    void	EnableEmptyField(BOOL bEnable);
         // wenn nicht enabled, wird beim Verlassen des Feldes der Text auf den letzten gueltigen zurueckgesetzt
 
-    void    SetDefaultValue(double dDefault)    { m_dDefaultValue = dDefault; m_bValueDirty = TRUE; }
+    void	SetDefaultValue(double dDefault)	{ m_dDefaultValue = dDefault; m_bValueDirty = TRUE; }
         // wenn der aktuelle String ungueltig ist, liefert GetValue() diesen Default-Wert
-    double  GetDefaultValue() const             { return m_dDefaultValue; }
+    double	GetDefaultValue() const				{ return m_dDefaultValue; }
 
     // Einstellungen fuer das Format
-    ULONG   GetFormatKey() const                { return m_nFormatKey; }
-    void    SetFormatKey(ULONG nFormatKey);
+    ULONG	GetFormatKey() const				{ return m_nFormatKey; }
+    void	SetFormatKey(ULONG nFormatKey);
 
-    SvNumberFormatter*  GetFormatter() const    { return m_pFormatter; }
-    void    SetFormatter(SvNumberFormatter* pFormatter, BOOL bResetFormat = TRUE);
+    SvNumberFormatter*	GetFormatter() const	{ return m_pFormatter; }
+    void	SetFormatter(SvNumberFormatter* pFormatter, BOOL bResetFormat = TRUE);
         // wenn bResetFormat FALSE ist, wird versucht, das alte eingestellte Format mit 'hinueberzuretten' (teuer, wenn es sich nicht
         // um eines der Standard-Formate handelt, die in allen Formattern gleich sind)
         // wenn TRUE, wird als neuer FormatKey 0 gesetzt
 
-    BOOL    GetThousandsSep() const;
-    void    SetThousandsSep(BOOL _bUseSeparator);
+    BOOL	GetThousandsSep() const;
+    void	SetThousandsSep(BOOL _bUseSeparator);
         // the is no check if the current format is numeric, so be cautious when calling these functions
 
-    USHORT  GetDecimalDigits() const;
-    void    SetDecimalDigits(USHORT _nPrecision);
+    USHORT	GetDecimalDigits() const;
+    void	SetDecimalDigits(USHORT _nPrecision);
         // the is no check if the current format is numeric, so be cautious when calling these functions
 
-    SvNumberFormatter*  StandardFormatter() { return m_aStaticFormatter; }
+    SvNumberFormatter*	StandardFormatter() { return m_aStaticFormatter; }
         // Wenn man keinen eigenen Formatter explizit anlegen will, kann man diesen hier in SetFormatter stecken ...
         // Das hier gelieferte Objekt wird allerdings zwischen allen Instanzen der Klasse geteilt (aus Zeit- und Platzgruenden),
         // also ist etwas Vorsicht angebracht ...
 
-    void        GetFormat(XubString& rFormatString, LanguageType& eLang) const;
-    BOOL        SetFormat(const XubString& rFormatString, LanguageType eLang);
+    void		GetFormat(XubString& rFormatString, LanguageType& eLang) const;
+    BOOL		SetFormat(const XubString& rFormatString, LanguageType eLang);
         // FALSE, wenn der FormatString nicht gesetzt werden konnte (also wahrscheinlich ungueltig ist)
 
-    BOOL    IsStrictFormat() const              { return m_bStrictFormat; }
-    void    SetStrictFormat(BOOL bEnable)       { m_bStrictFormat = bEnable; }
+    BOOL	IsStrictFormat() const				{ return m_bStrictFormat; }
+    void	SetStrictFormat(BOOL bEnable)		{ m_bStrictFormat = bEnable; }
         // Formatueberpruefung waehrend der Eingabe ?
 
     // Spin-Handling
@@ -184,50 +184,50 @@ public:
     virtual void Last();
         // Standard-Implementierung : aktuelles double setzen auf eingestellten first respektive last value
 
-    void    SetSpinSize(double dStep)   { m_dSpinSize = dStep; }
-    double  GetSpinSize() const         { return m_dSpinSize; }
+    void	SetSpinSize(double dStep)	{ m_dSpinSize = dStep; }
+    double	GetSpinSize() const			{ return m_dSpinSize; }
 
-    void    SetSpinFirst(double dFirst) { m_dSpinFirst = dFirst; }
-    double  GetSpinFirst() const        { return m_dSpinFirst; }
+    void	SetSpinFirst(double dFirst)	{ m_dSpinFirst = dFirst; }
+    double	GetSpinFirst() const		{ return m_dSpinFirst; }
 
-    void    SetSpinLast(double dLast)   { m_dSpinLast = dLast; }
-    double  GetSpinLast() const         { return m_dSpinLast; }
+    void	SetSpinLast(double dLast)	{ m_dSpinLast = dLast; }
+    double	GetSpinLast() const			{ return m_dSpinLast; }
 
-    BOOL    TreatingAsNumber() const    { return m_bTreatAsNumber; }
-    void    TreatAsNumber(BOOL bDoSo) { m_bTreatAsNumber = bDoSo; }
+    BOOL	TreatingAsNumber() const	{ return m_bTreatAsNumber; }
+    void	TreatAsNumber(BOOL bDoSo) { m_bTreatAsNumber = bDoSo; }
 
 public:
     virtual void SetText( const XubString& rStr );
     virtual void SetText( const XubString& rStr, const Selection& rNewSelection );
-    void    SetValidateText(const XubString& rText, const String* pErrorText = NULL);
+    void	SetValidateText(const XubString& rText, const String* pErrorText = NULL);
 
     // die folgenden Methoden sind interesant, wenn m_bTreatAsNumber auf FALSE sitzt
-    /** nehmen wir mal an, irgendjemand will das ganze schoene double-Handling gar nicht haben, sondern
+    /**	nehmen wir mal an, irgendjemand will das ganze schoene double-Handling gar nicht haben, sondern
         einfach den Text formatiert ausgeben ...
         (der Text wird einfach nur durch den Formatter gejagt und dann gesetzt)
     */
     void SetTextFormatted(const XubString& rText);
-    String  GetTextValue() const;
+    String	GetTextValue() const;
 
-    void    SetDefaultText(const XubString& rDefault) { m_sDefaultText = rDefault; }
-    String  GetDefaultText() const { return m_sDefaultText; }
+    void	SetDefaultText(const XubString& rDefault) { m_sDefaultText = rDefault; }
+    String	GetDefaultText() const { return m_sDefaultText; }
 
     // die bei der letzten Ausgabe-Operation vom Formatter gelieferte Farbe (Ausgabe-Operationen werden getriggert durch
     // SetValue, SetTextValue, SetTextFormatted, also indirekt eventuell auch durch SetMin-/-MaxValue)
-    Color*  GetLastOutputColor() const { return m_pLastOutputColor; }
+    Color*	GetLastOutputColor() const { return m_pLastOutputColor; }
 
     /** reformats the current text. Interesting if the user entered some text in an "input format", and
         this should be formatted in the "output format" (which may differ, e.g. by additional numeric
         digits or such).
     */
-    void    Commit();
+    void	Commit();
 
     // enable automatic coloring. if set to TRUE, and the format the field is working with for any current value
     // says that it has to be painted in a special color (e.g. a format where negative numbers should be printed
     // red), the text is painted with that color automatically.
     // The color used is the same as returned by GetLastOutputColor()
-    void    SetAutoColor(BOOL _bAutomatic);
-    BOOL    GetAutoColor() const { return m_bAutoColor; }
+    void	SetAutoColor(BOOL _bAutomatic);
+    BOOL	GetAutoColor() const { return m_bAutoColor; }
 
     /** enables handling of not-a-number value.
 
@@ -270,8 +270,8 @@ protected:
     void ImplSetFormatKey(ULONG nFormatKey);
         // SetFormatKey without FormatChanged notification
 
-    virtual SvNumberFormatter*  CreateFormatter() { SetFormatter(StandardFormatter()); return m_pFormatter; }
-    SvNumberFormatter*  ImplGetFormatter() const { return m_pFormatter ? m_pFormatter : ((FormattedField*)this)->CreateFormatter(); }
+    virtual SvNumberFormatter*	CreateFormatter() { SetFormatter(StandardFormatter()); return m_pFormatter; }
+    SvNumberFormatter*	ImplGetFormatter() const { return m_pFormatter ? m_pFormatter : ((FormattedField*)this)->CreateFormatter(); }
 
     long PreNotify(NotifyEvent& rNEvt);
 
@@ -283,9 +283,9 @@ class SVT_DLLPUBLIC DoubleNumericField : public FormattedField
 {
 protected:
 #ifdef REGEXP_SUPPORT
-    ::utl::TextSearch*              m_pConformanceTester;
+    ::utl::TextSearch*				m_pConformanceTester;
 #else
-    validation::NumberValidator*    m_pNumberValidator;
+    validation::NumberValidator*	m_pNumberValidator;
 #endif
 
 public:
@@ -320,25 +320,25 @@ protected:
 };
 
 //==============================================================================
-#define FCT_CURRENCY_SYMBOL     0x10
-#define FCT_CURRSYM_POSITION    0x20
+#define FCT_CURRENCY_SYMBOL		0x10
+#define FCT_CURRSYM_POSITION	0x20
 
 //------------------------------------------------------------------------------
 class DoubleCurrencyField : public FormattedField
 {
-    XubString   m_sCurrencySymbol;
-    BOOL        m_bPrependCurrSym;
-    BOOL        m_bChangingFormat;
+    XubString	m_sCurrencySymbol;
+    BOOL		m_bPrependCurrSym;
+    BOOL		m_bChangingFormat;
 
 public:
     DoubleCurrencyField(Window* pParent, WinBits nStyle = 0);
     DoubleCurrencyField(Window* pParent, const ResId& rResId);
 
-    XubString   getCurrencySymbol() const { return m_sCurrencySymbol; }
-    void        setCurrencySymbol(const XubString& _sSymbol);
+    XubString	getCurrencySymbol() const { return m_sCurrencySymbol; }
+    void		setCurrencySymbol(const XubString& _sSymbol);
 
-    BOOL        getPrependCurrSym() const { return m_bPrependCurrSym; }
-    void        setPrependCurrSym(BOOL _bPrepend);
+    BOOL		getPrependCurrSym() const { return m_bPrependCurrSym; }
+    void		setPrependCurrSym(BOOL _bPrepend);
 
 protected:
     virtual void FormatChanged(FORMAT_CHANGE_TYPE nWhat);
diff --git a/svtools/inc/svtools/generictoolboxcontroller.hxx b/svtools/inc/svtools/generictoolboxcontroller.hxx
index 0e9dc73a6882..75643cc9f264 100644
--- a/svtools/inc/svtools/generictoolboxcontroller.hxx
+++ b/svtools/inc/svtools/generictoolboxcontroller.hxx
@@ -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
@@ -29,7 +29,7 @@
 #define __SVTOOLS_GENERICTOOLBOXCONTROLLER_HXX_
 
 //_________________________________________________________________________________________________________________
-//  includes of other projects
+//	includes of other projects
 //_________________________________________________________________________________________________________________
 
 #include "svtools/svtdllapi.h"
@@ -43,7 +43,7 @@ struct ExecuteInfo;
 class SVT_DLLPUBLIC GenericToolboxController : public svt::ToolboxController
 {
     public:
-        GenericToolboxController( const com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory >& rServiceManager,
+        GenericToolboxController( const com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory >& rServiceManager, 
                                   const com::sun::star::uno::Reference< com::sun::star::frame::XFrame >& rFrame,
                                   ToolBox* pToolBox,
                                   USHORT   nID,
@@ -54,12 +54,12 @@ class SVT_DLLPUBLIC GenericToolboxController : public svt::ToolboxController
         virtual void SAL_CALL dispose() throw ( ::com::sun::star::uno::RuntimeException );
 
         // XToolbarController
-        virtual void SAL_CALL execute( sal_Int16 KeyModifier ) throw (::com::sun::star::uno::RuntimeException);
+        virtual void SAL_CALL execute( sal_Int16 KeyModifier ) throw (::com::sun::star::uno::RuntimeException); 
 
         // XStatusListener
         virtual void SAL_CALL statusChanged( const ::com::sun::star::frame::FeatureStateEvent& Event ) throw ( ::com::sun::star::uno::RuntimeException );
 
-         DECL_STATIC_LINK( GenericToolboxController, ExecuteHdl_Impl, ExecuteInfo* );
+         DECL_STATIC_LINK( GenericToolboxController, ExecuteHdl_Impl, ExecuteInfo* ); 
 
     private:
         ToolBox*    m_pToolbox;
diff --git a/svtools/inc/svtools/genericunodialog.hxx b/svtools/inc/svtools/genericunodialog.hxx
index c5fbe5b840e4..62f1b4696b72 100644
--- a/svtools/inc/svtools/genericunodialog.hxx
+++ b/svtools/inc/svtools/genericunodialog.hxx
@@ -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
@@ -58,20 +58,20 @@ namespace svt
 //.........................................................................
 
     //=========================================================================
-#define     UNODIALOG_PROPERTY_ID_TITLE     1
-#define     UNODIALOG_PROPERTY_ID_PARENT    2
+#define		UNODIALOG_PROPERTY_ID_TITLE		1
+#define		UNODIALOG_PROPERTY_ID_PARENT	2
 
-#define     UNODIALOG_PROPERTY_TITLE        "Title"
-#define     UNODIALOG_PROPERTY_PARENT       "ParentWindow"
+#define		UNODIALOG_PROPERTY_TITLE		"Title"
+#define		UNODIALOG_PROPERTY_PARENT		"ParentWindow"
 
 
     //=========================================================================
-    typedef ::cppu::WeakImplHelper3 <   com::sun::star::ui::dialogs::XExecutableDialog
-                                    ,   com::sun::star::lang::XServiceInfo
-                                    ,   com::sun::star::lang::XInitialization
-                                    >   OGenericUnoDialogBase;
+    typedef	::cppu::WeakImplHelper3	<	com::sun::star::ui::dialogs::XExecutableDialog
+                                    ,	com::sun::star::lang::XServiceInfo
+                                    ,	com::sun::star::lang::XInitialization
+                                    >	OGenericUnoDialogBase;
 
-    /** abstract base class for implementing UNO objects representing dialogs (<type scope="com.sun.star.awt">XDialog</type>)
+    /**	abstract base class for implementing UNO objects representing dialogs (<type scope="com.sun.star.awt">XDialog</type>)
     */
     class SVT_DLLPUBLIC OGenericUnoDialog
             :public OGenericUnoDialogBase
@@ -79,19 +79,19 @@ namespace svt
             ,public ::comphelper::OPropertyContainer
     {
     private:
-        ::osl::Mutex                    m_aExecutionMutex;  /// acess safety for execute/cancel
+        ::osl::Mutex					m_aExecutionMutex;	/// acess safety for execute/cancel
 
     protected:
-        Dialog*                     m_pDialog;                  /// the dialog to execute
-        sal_Bool                    m_bExecuting : 1;           /// we're currently executing the dialog
-        sal_Bool                    m_bCanceled : 1;            /// endDialog was called while we were executing
-        sal_Bool                    m_bTitleAmbiguous : 1;      /// m_sTitle has not been set yet
+        Dialog*						m_pDialog;			        /// the dialog to execute
+        sal_Bool					m_bExecuting : 1;	        /// we're currently executing the dialog
+        sal_Bool					m_bCanceled : 1;	        /// endDialog was called while we were executing
+        sal_Bool					m_bTitleAmbiguous : 1;	    /// m_sTitle has not been set yet
         bool                        m_bInitialized : 1;         /// has "initialize" been called?
         bool                        m_bNeedInitialization : 1;  /// do we need to be initialized before any other API call is allowed?
 
         // <properties>
-        ::rtl::OUString                                                 m_sTitle;   /// title of the dialog
-        com::sun::star::uno::Reference<com::sun::star::awt::XWindow>    m_xParent;  /// parent window
+        ::rtl::OUString							                        m_sTitle;	/// title of the dialog
+        com::sun::star::uno::Reference<com::sun::star::awt::XWindow>	m_xParent;	/// parent window
         // </properties>
 
         ::comphelper::ComponentContext m_aContext;
@@ -132,15 +132,15 @@ namespace svt
     protected:
         /** create the concret dialog instance. note that m_aMutex is not locked when this method get's called,
             but the application-wide solar mutex is (to guard the not thread-safe ctor of the dialog).
-            @param      pParent     the parent window for the new dialog
+            @param		pParent		the parent window for the new dialog
         */
-        virtual Dialog* createDialog(Window* _pParent) = 0;
+        virtual Dialog*	createDialog(Window* _pParent) = 0;
 
         /// called to destroy the dialog used. the default implementation just deletes m_pDialog and resets it to NULL
         virtual void destroyDialog();
 
-        /** called after the dialog has been executed
-            @param      _nExecutionResult       the execution result as returned by Dialog::Execute
+        /**	called after the dialog has been executed
+            @param		_nExecutionResult		the execution result as returned by Dialog::Execute
         */
         virtual void executedDialog(sal_Int16 /*_nExecutionResult*/) { }
 
@@ -187,7 +187,7 @@ namespace svt
     };
 
 //.........................................................................
-}   // namespace svt
+}	// namespace svt
 //.........................................................................
 
 #endif // _SVT_GENERICUNODIALOG_HXX_
diff --git a/svtools/inc/svtools/grfmgr.hxx b/svtools/inc/svtools/grfmgr.hxx
index 3ed608c1525d..af3fbab41841 100644
--- a/svtools/inc/svtools/grfmgr.hxx
+++ b/svtools/inc/svtools/grfmgr.hxx
@@ -35,34 +35,34 @@
 // - Defines -
 // -----------
 
-#define GRFMGR_DRAW_NOTCACHED               0x00000000UL
-#define GRFMGR_DRAW_CACHED                  0x00000001UL
-#define GRFMGR_DRAW_BILINEAR                0x00000002UL
-#define GRFMGR_DRAW_USE_DRAWMODE_SETTINGS   0x00000004UL
-#define GRFMGR_DRAW_SUBSTITUTE              0x00000008UL
-#define GRFMGR_DRAW_NO_SUBSTITUTE           0x00000010UL
-#define GRFMGR_DRAW_STANDARD                (GRFMGR_DRAW_CACHED|GRFMGR_DRAW_BILINEAR)
+#define GRFMGR_DRAW_NOTCACHED			    0x00000000UL
+#define GRFMGR_DRAW_CACHED				    0x00000001UL
+#define GRFMGR_DRAW_BILINEAR			    0x00000002UL
+#define GRFMGR_DRAW_USE_DRAWMODE_SETTINGS	0x00000004UL
+#define GRFMGR_DRAW_SUBSTITUTE	            0x00000008UL
+#define GRFMGR_DRAW_NO_SUBSTITUTE	        0x00000010UL
+#define GRFMGR_DRAW_STANDARD			    (GRFMGR_DRAW_CACHED|GRFMGR_DRAW_BILINEAR)
 
 // --------------------
 // - AutoSwap Defines -
 // --------------------
 
-#define GRFMGR_AUTOSWAPSTREAM_LINK      ((SvStream*)0x00000000UL)
-#define GRFMGR_AUTOSWAPSTREAM_LOADED    ((SvStream*)0xfffffffdUL)
-#define GRFMGR_AUTOSWAPSTREAM_TEMP      ((SvStream*)0xfffffffeUL)
-#define GRFMGR_AUTOSWAPSTREAM_NONE      ((SvStream*)0xffffffffUL)
+#define GRFMGR_AUTOSWAPSTREAM_LINK		((SvStream*)0x00000000UL)
+#define GRFMGR_AUTOSWAPSTREAM_LOADED	((SvStream*)0xfffffffdUL)
+#define GRFMGR_AUTOSWAPSTREAM_TEMP		((SvStream*)0xfffffffeUL)
+#define GRFMGR_AUTOSWAPSTREAM_NONE		((SvStream*)0xffffffffUL)
 
 // ----------------------
 // - Adjustment Defines -
 // ----------------------
 
-#define ADJUSTMENT_NONE                 0x00000000UL
-#define ADJUSTMENT_DRAWMODE             0x00000001UL
-#define ADJUSTMENT_COLORS               0x00000002UL
-#define ADJUSTMENT_MIRROR               0x00000004UL
-#define ADJUSTMENT_ROTATE               0x00000008UL
-#define ADJUSTMENT_TRANSPARENCY         0x00000010UL
-#define ADJUSTMENT_ALL                  0xFFFFFFFFUL
+#define ADJUSTMENT_NONE					0x00000000UL
+#define ADJUSTMENT_DRAWMODE				0x00000001UL
+#define ADJUSTMENT_COLORS				0x00000002UL
+#define ADJUSTMENT_MIRROR				0x00000004UL
+#define ADJUSTMENT_ROTATE				0x00000008UL
+#define ADJUSTMENT_TRANSPARENCY			0x00000010UL
+#define ADJUSTMENT_ALL					0xFFFFFFFFUL
 
 // ---------
 // - Enums -
@@ -96,87 +96,87 @@ class SVT_DLLPUBLIC GraphicAttr
 {
 private:
 
-    long            mnDummy1;
-    long            mnDummy2;
-    double          mfGamma;
-    sal_uInt32      mnMirrFlags;
-    long            mnLeftCrop;
-    long            mnTopCrop;
-    long            mnRightCrop;
-    long            mnBottomCrop;
-    USHORT          mnRotate10;
-    short           mnContPercent;
-    short           mnLumPercent;
-    short           mnRPercent;
-    short           mnGPercent;
-    short           mnBPercent;
-    BOOL            mbInvert;
-    BYTE            mcTransparency;
-    GraphicDrawMode meDrawMode;
-
-    void*           mpDummy;
+    long			mnDummy1;
+    long			mnDummy2;
+    double			mfGamma;
+    sal_uInt32		mnMirrFlags;
+    long			mnLeftCrop;
+    long			mnTopCrop;
+    long			mnRightCrop;
+    long			mnBottomCrop;
+    USHORT			mnRotate10;
+    short			mnContPercent;
+    short			mnLumPercent;
+    short			mnRPercent;
+    short			mnGPercent;
+    short			mnBPercent;
+    BOOL			mbInvert;
+    BYTE			mcTransparency;
+    GraphicDrawMode	meDrawMode;
+
+    void*			mpDummy;
 
 public:
 
                     GraphicAttr();
                     ~GraphicAttr();
 
-    BOOL            operator==( const GraphicAttr& rAttr ) const;
-    BOOL            operator!=( const GraphicAttr& rAttr ) const { return !( *this == rAttr ); }
+    BOOL			operator==( const GraphicAttr& rAttr ) const;
+    BOOL			operator!=( const GraphicAttr& rAttr ) const { return !( *this == rAttr ); }
 
-    void            SetDrawMode( GraphicDrawMode eDrawMode ) { meDrawMode = eDrawMode; }
-    GraphicDrawMode GetDrawMode() const { return meDrawMode; }
+    void			SetDrawMode( GraphicDrawMode eDrawMode ) { meDrawMode = eDrawMode; }
+    GraphicDrawMode	GetDrawMode() const { return meDrawMode; }
 
-    void            SetMirrorFlags( ULONG nMirrFlags ) { mnMirrFlags = nMirrFlags; }
-    ULONG           GetMirrorFlags() const { return mnMirrFlags; }
+    void			SetMirrorFlags( ULONG nMirrFlags ) { mnMirrFlags = nMirrFlags; }
+    ULONG			GetMirrorFlags() const { return mnMirrFlags; }
 
-    void            SetCrop( long nLeft_100TH_MM, long nTop_100TH_MM, long nRight_100TH_MM, long nBottom_100TH_MM )
+    void			SetCrop( long nLeft_100TH_MM, long nTop_100TH_MM, long nRight_100TH_MM, long nBottom_100TH_MM )
                     {
                         mnLeftCrop = nLeft_100TH_MM; mnTopCrop = nTop_100TH_MM;
                         mnRightCrop = nRight_100TH_MM; mnBottomCrop = nBottom_100TH_MM;
                     }
-    long            GetLeftCrop() const { return mnLeftCrop; }
-    long            GetTopCrop() const { return mnTopCrop; }
-    long            GetRightCrop() const { return mnRightCrop; }
-    long            GetBottomCrop() const { return mnBottomCrop; }
+    long			GetLeftCrop() const { return mnLeftCrop; }
+    long			GetTopCrop() const { return mnTopCrop; }
+    long			GetRightCrop() const { return mnRightCrop; }
+    long			GetBottomCrop() const { return mnBottomCrop; }
 
-    void            SetRotation( USHORT nRotate10 ) { mnRotate10 = nRotate10; }
-    USHORT          GetRotation() const { return mnRotate10; }
+    void			SetRotation( USHORT nRotate10 ) { mnRotate10 = nRotate10; }
+    USHORT			GetRotation() const { return mnRotate10; }
 
-    void            SetLuminance( short nLuminancePercent ) { mnLumPercent = nLuminancePercent; }
-    short           GetLuminance() const { return mnLumPercent; }
+    void			SetLuminance( short nLuminancePercent ) { mnLumPercent = nLuminancePercent; }
+    short			GetLuminance() const { return mnLumPercent; }
 
-    void            SetContrast( short nContrastPercent ) { mnContPercent = nContrastPercent; }
-    short           GetContrast() const { return mnContPercent; }
+    void			SetContrast( short nContrastPercent ) { mnContPercent = nContrastPercent; }
+    short			GetContrast() const { return mnContPercent; }
 
-    void            SetChannelR( short nChannelRPercent ) { mnRPercent = nChannelRPercent; }
-    short           GetChannelR() const { return mnRPercent; }
+    void			SetChannelR( short nChannelRPercent ) { mnRPercent = nChannelRPercent; }
+    short			GetChannelR() const { return mnRPercent; }
 
-    void            SetChannelG( short nChannelGPercent ) { mnGPercent = nChannelGPercent; }
-    short           GetChannelG() const { return mnGPercent; }
+    void			SetChannelG( short nChannelGPercent ) { mnGPercent = nChannelGPercent; }
+    short			GetChannelG() const { return mnGPercent; }
 
-    void            SetChannelB( short nChannelBPercent ) { mnBPercent = nChannelBPercent; }
-    short           GetChannelB() const { return mnBPercent; }
+    void			SetChannelB( short nChannelBPercent ) { mnBPercent = nChannelBPercent; }
+    short			GetChannelB() const { return mnBPercent; }
 
-    void            SetGamma( double fGamma ) { mfGamma = fGamma; }
-    double          GetGamma() const { return mfGamma; }
+    void			SetGamma( double fGamma ) { mfGamma = fGamma; }
+    double			GetGamma() const { return mfGamma; }
 
-    void            SetInvert( BOOL bInvert ) { mbInvert = bInvert; }
-    BOOL            IsInvert() const { return mbInvert; }
+    void			SetInvert( BOOL bInvert ) { mbInvert = bInvert; }
+    BOOL			IsInvert() const { return mbInvert; }
 
-    void            SetTransparency( BYTE cTransparency ) { mcTransparency = cTransparency; }
-    BYTE            GetTransparency() const { return mcTransparency; }
+    void			SetTransparency( BYTE cTransparency ) { mcTransparency = cTransparency; }
+    BYTE			GetTransparency() const { return mcTransparency; }
 
-    BOOL            IsSpecialDrawMode() const { return( meDrawMode != GRAPHICDRAWMODE_STANDARD ); }
-    BOOL            IsMirrored() const { return( mnMirrFlags != 0UL ); }
-    BOOL            IsCropped() const
+    BOOL			IsSpecialDrawMode() const { return( meDrawMode != GRAPHICDRAWMODE_STANDARD ); }
+    BOOL			IsMirrored() const { return( mnMirrFlags != 0UL ); }
+    BOOL			IsCropped() const
                     {
                         return( mnLeftCrop != 0 || mnTopCrop != 0 ||
                                 mnRightCrop != 0 || mnBottomCrop != 0 );
                     }
-    BOOL            IsRotated() const { return( ( mnRotate10 % 3600 ) != 0 ); }
-    BOOL            IsTransparent() const { return( mcTransparency > 0 ); }
-    BOOL            IsAdjusted() const
+    BOOL			IsRotated() const { return( ( mnRotate10 % 3600 ) != 0 ); }
+    BOOL			IsTransparent() const { return( mcTransparency > 0 ); }
+    BOOL			IsAdjusted() const
                     {
                         return( mnLumPercent != 0 || mnContPercent != 0 || mnRPercent != 0 ||
                                 mnGPercent != 0 || mnBPercent != 0 || mfGamma != 1.0 || mbInvert );
@@ -196,40 +196,40 @@ class SVT_DLLPUBLIC GraphicObject : public SvDataCopyStream
 
 private:
 
-    static GraphicManager*  mpGlobalMgr;
-
-    Graphic                 maGraphic;
-    GraphicAttr             maAttr;
-    Size                    maPrefSize;
-    MapMode                 maPrefMapMode;
-    ULONG                   mnSizeBytes;
-    GraphicType             meType;
-    GraphicManager*         mpMgr;
-    String*                 mpLink;
-    Link*                   mpSwapStreamHdl;
-    String*                 mpUserData;
-    Timer*                  mpSwapOutTimer;
-    GrfSimpleCacheObj*      mpSimpleCache;
+    static GraphicManager*	mpGlobalMgr;
+
+    Graphic					maGraphic;
+    GraphicAttr				maAttr;
+    Size					maPrefSize;
+    MapMode					maPrefMapMode;
+    ULONG					mnSizeBytes;
+    GraphicType				meType;
+    GraphicManager*			mpMgr;
+    String*					mpLink;
+    Link*					mpSwapStreamHdl;
+    String*					mpUserData;
+    Timer*					mpSwapOutTimer;
+    GrfSimpleCacheObj*		mpSimpleCache;
     ULONG                   mnAnimationLoopCount;
     void*                   mpDummy1;
     void*                   mpDummy2;
-    BOOL                    mbAutoSwapped   : 1;
-    BOOL                    mbTransparent   : 1;
-    BOOL                    mbAnimated      : 1;
-    BOOL                    mbEPS           : 1;
-    BOOL                    mbIsInSwapIn    : 1;
-    BOOL                    mbIsInSwapOut   : 1;
-    BOOL                    mbAlpha         : 1;
-    BOOL                    mbDummyFlag8    : 1;
-
-    void                    SVT_DLLPRIVATE ImplConstruct();
-    void                    SVT_DLLPRIVATE ImplAssignGraphicData();
-    void                    SVT_DLLPRIVATE ImplSetGraphicManager( const GraphicManager* pMgr,
+    BOOL					mbAutoSwapped	: 1;
+    BOOL					mbTransparent	: 1;
+    BOOL					mbAnimated		: 1;
+    BOOL					mbEPS			: 1;
+    BOOL					mbIsInSwapIn	: 1;
+    BOOL					mbIsInSwapOut	: 1;
+    BOOL					mbAlpha			: 1;
+    BOOL					mbDummyFlag8	: 1;
+
+    void					SVT_DLLPRIVATE ImplConstruct();
+    void					SVT_DLLPRIVATE ImplAssignGraphicData();
+    void					SVT_DLLPRIVATE ImplSetGraphicManager( const GraphicManager* pMgr,
                                                    const ByteString* pID = NULL,
                                                    const GraphicObject* pCopyObj = NULL );
-    void                    SVT_DLLPRIVATE ImplAutoSwapIn();
-    BOOL                    SVT_DLLPRIVATE ImplIsAutoSwapped() const { return mbAutoSwapped; }
-    BOOL                    SVT_DLLPRIVATE ImplGetCropParams( OutputDevice* pOut, Point& rPt, Size& rSz, const GraphicAttr* pAttr,
+    void					SVT_DLLPRIVATE ImplAutoSwapIn();
+    BOOL					SVT_DLLPRIVATE ImplIsAutoSwapped() const { return mbAutoSwapped; }
+    BOOL					SVT_DLLPRIVATE ImplGetCropParams( OutputDevice* pOut, Point& rPt, Size& rSz, const GraphicAttr* pAttr,
                                                PolyPolygon& rClipPolyPoly, BOOL& bRectClipRegion ) const;
 
     /** Render a given number of tiles in an optimized way
@@ -273,47 +273,47 @@ private:
 
         @return true, if everything was successfully rendered.
     */
-    bool                    SVT_DLLPRIVATE ImplRenderTempTile( VirtualDevice& rVDev, int nExponent,
+    bool 					SVT_DLLPRIVATE ImplRenderTempTile( VirtualDevice& rVDev, int nExponent,
                                                 int nNumTilesX, int nNumTilesY,
                                                 const Size& rTileSizePixel,
                                                 const GraphicAttr* pAttr, ULONG nFlags );
 
     /// internally called by ImplRenderTempTile()
-    bool                    SVT_DLLPRIVATE ImplRenderTileRecursive( VirtualDevice& rVDev, int nExponent, int nMSBFactor,
+    bool 					SVT_DLLPRIVATE ImplRenderTileRecursive( VirtualDevice& rVDev, int nExponent, int nMSBFactor,
                                                      int nNumOrigTilesX, int nNumOrigTilesY,
                                                      int nRemainderTilesX, int nRemainderTilesY,
                                                      const Size& rTileSizePixel, const GraphicAttr* pAttr,
                                                      ULONG nFlags, ImplTileInfo& rTileInfo );
 
-    bool                    SVT_DLLPRIVATE ImplDrawTiled( OutputDevice* pOut, const Rectangle& rArea, const Size& rSizePixel,
+    bool 					SVT_DLLPRIVATE ImplDrawTiled( OutputDevice* pOut, const Rectangle& rArea, const Size& rSizePixel,
                                            const Size& rOffset, const GraphicAttr* pAttr, ULONG nFlags, int nTileCacheSize1D );
 
-    bool                    SVT_DLLPRIVATE ImplDrawTiled( OutputDevice& rOut, const Point& rPos,
+    bool 					SVT_DLLPRIVATE ImplDrawTiled( OutputDevice& rOut, const Point& rPos,
                                            int nNumTilesX, int nNumTilesY,
                                            const Size& rTileSize,
                                            const GraphicAttr* pAttr, ULONG nFlags );
 
-    void                    SVT_DLLPRIVATE ImplTransformBitmap( BitmapEx&           rBmpEx,
+    void 					SVT_DLLPRIVATE ImplTransformBitmap( BitmapEx& 			rBmpEx,
                                                  const GraphicAttr& rAttr,
-                                                 const Size&        rCropLeftTop,
-                                                 const Size&        rCropRightBottom,
-                                                 const Rectangle&   rCropRect,
-                                                 const Size&        rDstSize,
-                                                 BOOL               bEnlarge ) const;
+                                                 const Size&		rCropLeftTop,
+                                                 const Size&		rCropRightBottom,
+                                                 const Rectangle&	rCropRect,
+                                                 const Size& 		rDstSize,
+                                                 BOOL				bEnlarge ) const;
 
                             DECL_LINK( ImplAutoSwapOutHdl, void* );
 
 protected:
 
-    virtual void            GraphicManagerDestroyed();
-    virtual SvStream*       GetSwapStream() const;
+    virtual void			GraphicManagerDestroyed();
+    virtual SvStream*		GetSwapStream() const;
 
     // !!! to be removed
-    virtual ULONG           GetReleaseFromCache() const;
+    virtual	ULONG			GetReleaseFromCache() const;
 
-    virtual void            Load( SvStream& );
-    virtual void            Save( SvStream& );
-    virtual void            Assign( const SvDataCopyStream& );
+    virtual void			Load( SvStream& );
+    virtual void			Save( SvStream& );
+    virtual void			Assign( const SvDataCopyStream& );
 
 public:
 
@@ -326,29 +326,29 @@ public:
                             GraphicObject( const ByteString& rUniqueID, const GraphicManager* pMgr = NULL );
                             ~GraphicObject();
 
-    GraphicObject&          operator=( const GraphicObject& rCacheObj );
-    BOOL                    operator==( const GraphicObject& rCacheObj ) const;
-    BOOL                    operator!=( const GraphicObject& rCacheObj ) const { return !( *this == rCacheObj ); }
+    GraphicObject&			operator=( const GraphicObject& rCacheObj );
+    BOOL					operator==( const GraphicObject& rCacheObj ) const;
+    BOOL					operator!=( const GraphicObject& rCacheObj ) const { return !( *this == rCacheObj ); }
 
-    BOOL                    HasSwapStreamHdl() const { return( mpSwapStreamHdl != NULL && mpSwapStreamHdl->IsSet() ); }
-    void                    SetSwapStreamHdl();
-    void                    SetSwapStreamHdl( const Link& rHdl, const ULONG nSwapOutTimeout = 0UL );
-    Link                    GetSwapStreamHdl() const;
-    ULONG                   GetSwapOutTimeout() const { return( mpSwapOutTimer ? mpSwapOutTimer->GetTimeout() : 0 ); }
+    BOOL					HasSwapStreamHdl() const { return( mpSwapStreamHdl != NULL && mpSwapStreamHdl->IsSet() ); }
+    void					SetSwapStreamHdl();
+    void					SetSwapStreamHdl( const Link& rHdl, const ULONG nSwapOutTimeout = 0UL );
+    Link					GetSwapStreamHdl() const;
+    ULONG					GetSwapOutTimeout() const { return( mpSwapOutTimer ? mpSwapOutTimer->GetTimeout() : 0 ); }
 
-    void                    FireSwapInRequest();
-    void                    FireSwapOutRequest();
+    void					FireSwapInRequest();
+    void					FireSwapOutRequest();
 
-    void                    SetGraphicManager( const GraphicManager& rMgr );
-    GraphicManager&         GetGraphicManager() const { return *mpMgr; }
+    void					SetGraphicManager( const GraphicManager& rMgr );
+    GraphicManager&			GetGraphicManager() const { return *mpMgr; }
 
-    BOOL                    IsCached( OutputDevice* pOut, const Point& rPt, const Size& rSz,
+    BOOL					IsCached( OutputDevice* pOut, const Point& rPt, const Size& rSz,
                                       const GraphicAttr* pAttr = NULL, ULONG nFlags = GRFMGR_DRAW_STANDARD) const;
-    void                    ReleaseFromCache();
+    void					ReleaseFromCache();
 
-    const Graphic&          GetGraphic() const;
-    void                    SetGraphic( const Graphic& rGraphic, const GraphicObject* pCopyObj = 0);
-    void                    SetGraphic( const Graphic& rGraphic, const String& rLink );
+    const Graphic&			GetGraphic() const;
+    void					SetGraphic( const Graphic& rGraphic, const GraphicObject* pCopyObj = 0);
+    void					SetGraphic( const Graphic& rGraphic, const String& rLink );
 
     /** Get graphic transformed according to given attributes
 
@@ -375,51 +375,51 @@ public:
 
         @return the readily transformed Graphic
      */
-    Graphic                 GetTransformedGraphic( const Size& rDestSize, const MapMode& rDestMap, const GraphicAttr& rAttr ) const;
-    Graphic                 GetTransformedGraphic( const GraphicAttr* pAttr = NULL ) const; // TODO: Change to Impl
-
-    void                    SetAttr( const GraphicAttr& rAttr );
-    const GraphicAttr&      GetAttr() const { return maAttr; }
-
-    BOOL                    HasLink() const { return( mpLink != NULL && mpLink->Len() > 0 ); }
-    void                    SetLink();
-    void                    SetLink( const String& rLink );
-    String                  GetLink() const;
-
-    BOOL                    HasUserData() const { return( mpUserData != NULL && mpUserData->Len() > 0 ); }
-    void                    SetUserData();
-    void                    SetUserData( const String& rUserData );
-    String                  GetUserData() const;
-
-    ByteString              GetUniqueID() const;
-
-    GraphicType             GetType() const { return meType; }
-    const Size&             GetPrefSize() const { return maPrefSize; }
-    const MapMode&          GetPrefMapMode() const { return maPrefMapMode; }
-    ULONG                   GetSizeBytes() const { return mnSizeBytes; }
-    ULONG                   GetChecksum() const;
-    BOOL                    IsTransparent() const { return mbTransparent; }
-    BOOL                    IsAlpha() const { return mbAlpha; }
-    BOOL                    IsAnimated() const { return mbAnimated; }
-    BOOL                    IsEPS() const { return mbEPS; }
-
-    void                    ResetAnimationLoopCount();
-    List*                   GetAnimationInfoList() const;
-    Link                    GetAnimationNotifyHdl() const { return maGraphic.GetAnimationNotifyHdl(); }
-    void                    SetAnimationNotifyHdl( const Link& rLink );
-
-    BOOL                    SwapOut();
-    BOOL                    SwapOut( SvStream* pOStm );
-    BOOL                    SwapIn();
-    BOOL                    SwapIn( SvStream* pIStm );
-
-    BOOL                    IsInSwapIn() const { return mbIsInSwapIn; }
-    BOOL                    IsInSwapOut() const { return mbIsInSwapOut; }
-    BOOL                    IsInSwap() const { return( mbIsInSwapOut || mbIsInSwapOut ); }
-    BOOL                    IsSwappedOut() const { return( mbAutoSwapped || maGraphic.IsSwapOut() ); }
-    void                    SetSwapState();
-
-    BOOL                    Draw( OutputDevice* pOut, const Point& rPt, const Size& rSz,
+    Graphic 				GetTransformedGraphic( const Size& rDestSize, const MapMode& rDestMap, const GraphicAttr& rAttr ) const;
+    Graphic					GetTransformedGraphic( const GraphicAttr* pAttr = NULL ) const; // TODO: Change to Impl
+
+    void					SetAttr( const GraphicAttr& rAttr );
+    const GraphicAttr&		GetAttr() const { return maAttr; }
+
+    BOOL					HasLink() const { return( mpLink != NULL && mpLink->Len() > 0 ); }
+    void					SetLink();
+    void					SetLink( const String& rLink );
+    String					GetLink() const;
+
+    BOOL					HasUserData() const { return( mpUserData != NULL && mpUserData->Len() > 0 ); }
+    void					SetUserData();
+    void					SetUserData( const String& rUserData );
+    String					GetUserData() const;
+
+    ByteString				GetUniqueID() const;
+
+    GraphicType				GetType() const { return meType; }
+    const Size&				GetPrefSize() const { return maPrefSize; }
+    const MapMode&			GetPrefMapMode() const { return maPrefMapMode; }
+    ULONG					GetSizeBytes() const { return mnSizeBytes; }
+    ULONG					GetChecksum() const;
+    BOOL					IsTransparent() const { return mbTransparent; }
+    BOOL					IsAlpha() const { return mbAlpha; }
+    BOOL					IsAnimated() const { return mbAnimated; }
+    BOOL					IsEPS() const { return mbEPS; }
+
+    void					ResetAnimationLoopCount();
+    List*					GetAnimationInfoList() const;
+    Link					GetAnimationNotifyHdl() const { return maGraphic.GetAnimationNotifyHdl(); }
+    void					SetAnimationNotifyHdl( const Link& rLink );
+
+    BOOL					SwapOut();
+    BOOL					SwapOut( SvStream* pOStm );
+    BOOL					SwapIn();
+    BOOL					SwapIn( SvStream* pIStm );
+
+    BOOL					IsInSwapIn() const { return mbIsInSwapIn; }
+    BOOL					IsInSwapOut() const { return mbIsInSwapOut; }
+    BOOL					IsInSwap() const { return( mbIsInSwapOut || mbIsInSwapOut ); }
+    BOOL					IsSwappedOut() const { return( mbAutoSwapped || maGraphic.IsSwapOut() ); }
+    void					SetSwapState();
+
+    BOOL					Draw( OutputDevice* pOut, const Point& rPt, const Size& rSz,
                                   const GraphicAttr* pAttr = NULL, ULONG nFlags = GRFMGR_DRAW_STANDARD );
 
     BOOL DrawWithPDFHandling( OutputDevice& rOutDev,
@@ -460,18 +460,18 @@ public:
 
         @return TRUE, if drawing completed successfully
      */
-    BOOL                    DrawTiled( OutputDevice* pOut, const Rectangle& rArea, const Size& rSize,
+    BOOL					DrawTiled( OutputDevice* pOut, const Rectangle& rArea, const Size& rSize,
                                        const Size& rOffset, const GraphicAttr* pAttr = NULL,
                                        ULONG nFlags = GRFMGR_DRAW_STANDARD, int nTileCacheSize1D=128 );
 
-    BOOL                    StartAnimation( OutputDevice* pOut, const Point& rPt, const Size& rSz, long nExtraData = 0L,
+    BOOL					StartAnimation( OutputDevice* pOut, const Point& rPt, const Size& rSz, long nExtraData = 0L,
                                             const GraphicAttr* pAttr = NULL, ULONG nFlags = GRFMGR_DRAW_STANDARD,
                                             OutputDevice* pFirstFrameOutDev = NULL );
 
-    void                    StopAnimation( OutputDevice* pOut = NULL, long nExtraData = 0L );
+    void					StopAnimation( OutputDevice* pOut = NULL, long nExtraData = 0L );
 
-    friend SvStream&        operator<<( SvStream& rOStm, const GraphicObject& rGraphicObj );
-    friend SvStream&        operator>>( SvStream& rIStm, GraphicObject& rGraphicObj );
+    friend SvStream&		operator<<( SvStream& rOStm, const GraphicObject& rGraphicObj );
+    friend SvStream&		operator>>( SvStream& rIStm, GraphicObject& rGraphicObj );
 
     static GraphicObject CreateGraphicObjectFromURL( const ::rtl::OUString &rURL );
 };
@@ -487,18 +487,18 @@ class SVT_DLLPUBLIC GraphicManager
 
 private:
 
-    List            maObjList;
-    GraphicCache*   mpCache;
+    List			maObjList;
+    GraphicCache*	mpCache;
 
                     GraphicManager( const GraphicManager& ) {}
-    GraphicManager& operator=( const GraphicManager& ) { return *this; }
+    GraphicManager&	operator=( const GraphicManager& ) { return *this; }
 
-    BOOL            SVT_DLLPRIVATE ImplDraw( OutputDevice* pOut, const Point& rPt,
+    BOOL			SVT_DLLPRIVATE ImplDraw( OutputDevice* pOut, const Point& rPt,
                               const Size& rSz, GraphicObject& rObj,
                               const GraphicAttr& rAttr,
                               const ULONG nFlags, BOOL& rCached );
 
-    BOOL            SVT_DLLPRIVATE ImplCreateOutput( OutputDevice* pOut, const Point& rPt, const Size& rSz,
+    BOOL			SVT_DLLPRIVATE ImplCreateOutput( OutputDevice* pOut, const Point& rPt, const Size& rSz,
                                       const BitmapEx& rBmpEx, const GraphicAttr& rAttr,
                                       const ULONG nFlags, BitmapEx* pBmpEx = NULL );
     BOOL            SVT_DLLPRIVATE ImplCreateOutput( OutputDevice* pOut,
@@ -506,63 +506,63 @@ private:
                                       const GDIMetaFile& rMtf, const GraphicAttr& rAttr,
                                       const ULONG nFlags, GDIMetaFile& rOutMtf, BitmapEx& rOutBmpEx );
 
-    BOOL            SVT_DLLPRIVATE ImplCreateScaled( const BitmapEx& rBmpEx,
+    BOOL			SVT_DLLPRIVATE ImplCreateScaled( const BitmapEx& rBmpEx,
                                       long* pMapIX, long* pMapFX, long* pMapIY, long* pMapFY,
                                       long nStartX, long nEndX, long nStartY, long nEndY,
                                       BitmapEx& rOutBmpEx );
 
-    BOOL            SVT_DLLPRIVATE ImplCreateRotatedScaled( const BitmapEx& rBmpEx,
+    BOOL			SVT_DLLPRIVATE ImplCreateRotatedScaled( const BitmapEx& rBmpEx,
                                              USHORT nRot10, const Size& rOutSzPix, const Size& rUntSzPix,
                                              long* pMapIX, long* pMapFX, long* pMapIY, long* pMapFY,
                                              long nStartX, long nEndX, long nStartY, long nEndY,
                                              BitmapEx& rOutBmpEx );
 
-    static void     SVT_DLLPRIVATE ImplAdjust( BitmapEx& rBmpEx, const GraphicAttr& rAttr, ULONG nAdjustmentFlags );
-    static void     SVT_DLLPRIVATE ImplAdjust( GDIMetaFile& rMtf, const GraphicAttr& rAttr, ULONG nAdjustmentFlags );
-    static void     SVT_DLLPRIVATE ImplAdjust( Animation& rAnimation, const GraphicAttr& rAttr, ULONG nAdjustmentFlags );
+    static void		SVT_DLLPRIVATE ImplAdjust( BitmapEx& rBmpEx, const GraphicAttr& rAttr, ULONG nAdjustmentFlags );
+    static void		SVT_DLLPRIVATE ImplAdjust( GDIMetaFile& rMtf, const GraphicAttr& rAttr, ULONG nAdjustmentFlags );
+    static void		SVT_DLLPRIVATE ImplAdjust( Animation& rAnimation, const GraphicAttr& rAttr, ULONG nAdjustmentFlags );
 
-    static void     SVT_DLLPRIVATE ImplDraw( OutputDevice* pOut, const Point& rPt, const Size& rSz,
+    static void		SVT_DLLPRIVATE ImplDraw( OutputDevice* pOut, const Point& rPt, const Size& rSz,
                               const GDIMetaFile& rMtf, const GraphicAttr& rAttr );
 
                     // Only used by GraphicObject's Ctor's and Dtor's
-    void            SVT_DLLPRIVATE ImplRegisterObj( const GraphicObject& rObj, Graphic& rSubstitute,
+    void			SVT_DLLPRIVATE ImplRegisterObj( const GraphicObject& rObj, Graphic& rSubstitute,
                                      const ByteString* pID = NULL,
                                      const GraphicObject* pCopyObj = NULL );
-    void            SVT_DLLPRIVATE ImplUnregisterObj( const GraphicObject& rObj );
-    inline BOOL     SVT_DLLPRIVATE ImplHasObjects() const { return( maObjList.Count() > 0UL ); }
+    void			SVT_DLLPRIVATE ImplUnregisterObj( const GraphicObject& rObj );
+    inline BOOL		SVT_DLLPRIVATE ImplHasObjects() const { return( maObjList.Count() > 0UL ); }
 
                     // Only used in swap case by GraphicObject
-    void            SVT_DLLPRIVATE ImplGraphicObjectWasSwappedOut( const GraphicObject& rObj );
-    BOOL            SVT_DLLPRIVATE ImplFillSwappedGraphicObject( const GraphicObject& rObj, Graphic& rSubstitute );
-    void            SVT_DLLPRIVATE ImplGraphicObjectWasSwappedIn( const GraphicObject& rObj );
+    void			SVT_DLLPRIVATE ImplGraphicObjectWasSwappedOut( const GraphicObject& rObj );
+    BOOL			SVT_DLLPRIVATE ImplFillSwappedGraphicObject( const GraphicObject& rObj, Graphic& rSubstitute );
+    void			SVT_DLLPRIVATE ImplGraphicObjectWasSwappedIn( const GraphicObject& rObj );
 
-    ByteString      SVT_DLLPRIVATE ImplGetUniqueID( const GraphicObject& rObj ) const;
+    ByteString		SVT_DLLPRIVATE ImplGetUniqueID( const GraphicObject& rObj ) const;
 
 public:
 
                     GraphicManager( ULONG nCacheSize = 10000000UL, ULONG nMaxObjCacheSize = 2400000UL );
                     ~GraphicManager();
 
-    void            SetMaxCacheSize( ULONG nNewCacheSize );
-    ULONG           GetMaxCacheSize() const;
+    void			SetMaxCacheSize( ULONG nNewCacheSize );
+    ULONG			GetMaxCacheSize() const;
 
-    void            SetMaxObjCacheSize( ULONG nNewMaxObjSize, BOOL bDestroyGreaterCached = FALSE );
-    ULONG           GetMaxObjCacheSize() const;
+    void			SetMaxObjCacheSize( ULONG nNewMaxObjSize, BOOL bDestroyGreaterCached = FALSE );
+    ULONG			GetMaxObjCacheSize() const;
 
-    ULONG           GetUsedCacheSize() const;
-    ULONG           GetFreeCacheSize() const;
+    ULONG			GetUsedCacheSize() const;
+    ULONG			GetFreeCacheSize() const;
 
     void            SetCacheTimeout( ULONG nTimeoutSeconds );
     ULONG           GetCacheTimeout() const;
 
-    void            ClearCache();
+    void			ClearCache();
 
-    void            ReleaseFromCache( const GraphicObject& rObj );
+    void			ReleaseFromCache( const GraphicObject& rObj );
 
-    BOOL            IsInCache( OutputDevice* pOut, const Point& rPt, const Size& rSz,
+    BOOL			IsInCache( OutputDevice* pOut, const Point& rPt, const Size& rSz,
                                const GraphicObject& rObj, const GraphicAttr& rAttr ) const;
 
-    BOOL            DrawObj( OutputDevice* pOut, const Point& rPt, const Size& rSz,
+    BOOL			DrawObj( OutputDevice* pOut, const Point& rPt, const Size& rSz,
                              GraphicObject& rObj, const GraphicAttr& rAttr,
                              const ULONG nFlags, BOOL& rCached );
 };
diff --git a/svtools/inc/svtools/headbar.hxx b/svtools/inc/svtools/headbar.hxx
index 1ef7687cfb1d..91443d924a2b 100644
--- a/svtools/inc/svtools/headbar.hxx
+++ b/svtools/inc/svtools/headbar.hxx
@@ -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
@@ -48,72 +48,72 @@ dieses Control mit einer SvTabListBox zu verbinden.
 
 WinBits
 
-WB_BORDER           Oben und unten wird ein Border gezeichnet
-WB_BOTTOMBORDER     Unten wird ein Border gezeichnet
-WB_BUTTONSTYLE      Die Items sehen aus wie Buttons, ansonsten sind sie flach
-WB_3DLOOK           3D-Darstellung
-WB_DRAG             Items koennen verschoben werden
-WB_STDHEADERBAR     WB_BUTTONSTYLE | WB_BOTTOMBORDER
+WB_BORDER			Oben und unten wird ein Border gezeichnet
+WB_BOTTOMBORDER 	Unten wird ein Border gezeichnet
+WB_BUTTONSTYLE		Die Items sehen aus wie Buttons, ansonsten sind sie flach
+WB_3DLOOK			3D-Darstellung
+WB_DRAG 			Items koennen verschoben werden
+WB_STDHEADERBAR 	WB_BUTTONSTYLE | WB_BOTTOMBORDER
 
 --------------------------------------------------------------------------
 
 ItemBits
 
-HIB_LEFT            Inhalt wird im Item linksbuendig ausgegeben
-HIB_CENTER          Inhalt wird im Item zentriert ausgegeben
-HIB_RIGHT           Inhalt wird im Item rechtsbuendig ausgegeben
-HIB_TOP             Inhalt wird im Item an der oberen Kante ausgegeben
-HIB_VCENTER         Inhalt wird im Item vertikal zentiert ausgegeben
-HIB_BOTTOM          Inhalt wird im Item an der unteren Kante ausgegeben
-HIB_LEFTIMAGE       Bei Text und Image, wird Image links vom Text ausgegeben
-HIB_RIGHTIMAGE      Bei Text und Image, wird Image rechts vom Text ausgegeben
-HIB_FIXED           Item laesst sich nicht in der Groesse aendern
-HIB_FIXEDPOS        Item laesst sich nicht verschieben
-HIB_CLICKABLE       Item laesst sich anklicken
+HIB_LEFT			Inhalt wird im Item linksbuendig ausgegeben
+HIB_CENTER			Inhalt wird im Item zentriert ausgegeben
+HIB_RIGHT			Inhalt wird im Item rechtsbuendig ausgegeben
+HIB_TOP 			Inhalt wird im Item an der oberen Kante ausgegeben
+HIB_VCENTER 		Inhalt wird im Item vertikal zentiert ausgegeben
+HIB_BOTTOM			Inhalt wird im Item an der unteren Kante ausgegeben
+HIB_LEFTIMAGE		Bei Text und Image, wird Image links vom Text ausgegeben
+HIB_RIGHTIMAGE		Bei Text und Image, wird Image rechts vom Text ausgegeben
+HIB_FIXED			Item laesst sich nicht in der Groesse aendern
+HIB_FIXEDPOS		Item laesst sich nicht verschieben
+HIB_CLICKABLE		Item laesst sich anklicken
                     (Select-Handler wird erst bei MouseButtonUp gerufen)
-HIB_FLAT            Item wird flach dargestellt, auch wenn WB_BUTTONSTYLE gesetzt ist
-HIB_DOWNARROW       Es wird ein Pfeil nach unter hinter dem Text ausgegeben,
+HIB_FLAT			Item wird flach dargestellt, auch wenn WB_BUTTONSTYLE gesetzt ist
+HIB_DOWNARROW		Es wird ein Pfeil nach unter hinter dem Text ausgegeben,
                     welcher zum Beispiel angezeigt werden sollte, wenn nach
                     diesem Item eine dazugehoerende Liste absteigend sortiert
                     ist. Der Status des Pfeils kann mit SetItemBits()
                     gesetzt/zurueckgesetzt werden.
-HIB_UPARROW         Es wird ein Pfeil nach oben hinter dem Text ausgegeben,
+HIB_UPARROW 		Es wird ein Pfeil nach oben hinter dem Text ausgegeben,
                     welcher zum Beispiel angezeigt werden sollte, wenn nach
                     diesem Item eine dazugehoerende Liste aufsteigend sortiert
                     ist.Der Status des Pfeils kann mit SetItemBits()
                     gesetzt/zurueckgesetzt werden.
-HIB_USERDRAW        Zu diesem Item wird auch der UserDraw-Handler gerufen.
-HIB_STDSTYLE        (HIB_LEFT | HIB_LEFTIMAGE | HIB_VCENTER | HIB_CLICKABLE)
+HIB_USERDRAW		Zu diesem Item wird auch der UserDraw-Handler gerufen.
+HIB_STDSTYLE		(HIB_LEFT | HIB_LEFTIMAGE | HIB_VCENTER | HIB_CLICKABLE)
 
 --------------------------------------------------------------------------
 
 Handler
 
-Select()            Wird gerufen, wenn Item angeklickt wird. Wenn
+Select()			Wird gerufen, wenn Item angeklickt wird. Wenn
                     HIB_CLICKABLE beim Item gesetzt ist und nicht HIB_FLAT,
                     wird der Handler erst im MouseButtonUp-Handler gerufen,
                     wenn die Maus ueber dem Item losgelassen wurde. Dann
                     verhaellt sich der Select-Handler wie bei einem
                     ToolBox-Button.
-DoubleClick()       Dieser Handler wird gerufen, wenn ein Item
+DoubleClick()		Dieser Handler wird gerufen, wenn ein Item
                     doppelt geklickt wird. Ob das Item oder der
                     Trenner angeklickt wurden, kann mit IsItemMode()
                     abgefragt werden. Wenn ein Trenner doppelt angeklickt
                     wird, sollte normalerweise die optimale Spaltenbreite
                     berechnet werden und diese gesetzt werden.
-StartDrag()         Dieser Handler wird gerufen, wenn Draggen gestartet
+StartDrag() 		Dieser Handler wird gerufen, wenn Draggen gestartet
                     wird, bzw. wenn ein Item angeklickt wurde.
                     In diesem Handler sollte spaetestens mit SetDragSize()
                     die Groesse der Size-Linie gesetzt werden, wenn
                     IsItemMode() FALSE zurueckliefert.
-Drag()              Dieser Handler wird gerufen, wenn gedraggt wird. Wenn
+Drag()				Dieser Handler wird gerufen, wenn gedraggt wird. Wenn
                     mit SetDragSize() keine Groesse gesetzt wird, kann
                     dieser Handler dafuer benutzt werden, um die
                     Linie im angrenzenden Fenster selber zu zeichnen. Mit
                     GetDragPos() kann die aktuelle Drag-Position abgefragt
                     werden. Mit IsItemMode() sollte in diesem Fall
                     abgefragt werden, ob auch ein Trenner gedraggt wird.
-EndDrag()           Dieser Handler wird gerufen, wenn ein Drag-Vorgang
+EndDrag()			Dieser Handler wird gerufen, wenn ein Drag-Vorgang
                     beendet wurde. Wenn im EndDrag-Handler GetCurItemId()
                     0 zurueckliefert, wurde der Drag-Vorgang abgebrochen.
                     Wenn dies nicht der Fall ist und IsItemMode() FALSE
@@ -131,25 +131,25 @@ EndDrag()           Dieser Handler wird gerufen, wenn ein Drag-Vorgang
 
 Weitere Methoden, die fuer die Handler wichtig sind.
 
-GetCurItemId()      Liefert die Id vom Item zurueck, fuer welches gerade
+GetCurItemId()		Liefert die Id vom Item zurueck, fuer welches gerade
                     der Handler gerufen wurde. Liefert nur eine gueltige
                     Id in den Handlern Select(), DoubleClick(), StartDrag(),
                     Drag() und EndDrag(). Im EndDrag-Handler leifert
                     diese Methode die Id vom gedraggten Item zurueck oder
                     0, wenn der Drag-Vorgang abgebrochen wurde.
-GetItemDragPos()    Liefert die Position zurueck, an der ein Item verschoben
+GetItemDragPos()	Liefert die Position zurueck, an der ein Item verschoben
                     wird bzw. wurde. HEADERBAR_ITEM_NOTFOUND wird
                     zurueckgeliefert, wenn der Vorgang abgebrochen wurde
                     oder wenn kein ItemDrag aktiv ist.
-IsItemMode()        Mit dieser Methode kann abgefragt werden, ob fuer ein
+IsItemMode()		Mit dieser Methode kann abgefragt werden, ob fuer ein
                     Item oder einen Trenner der Handler gerufen wurde.
-                    TRUE    - Handler wurde fuer das Item gerufen
-                    FALSE   - Handler wurde fuer den Trenner gerufen
-IsItemDrag()        Mit dieser Methode kann abgefragt werden, ob ein
+                    TRUE	- Handler wurde fuer das Item gerufen
+                    FALSE	- Handler wurde fuer den Trenner gerufen
+IsItemDrag()		Mit dieser Methode kann abgefragt werden, ob ein
                     Item gedragt oder selektiert wurde.
-                    TRUE    - Item wird verschoben
-                    FALSE   - Item wird selektiert
-SetDragSize()       Mit dieser Methode wird gesetzt, wir gross der
+                    TRUE	- Item wird verschoben
+                    FALSE	- Item wird selektiert
+SetDragSize()		Mit dieser Methode wird gesetzt, wir gross der
                     Trennstrich sein soll, der vom Control gemalt wird.
                     Dies sollte so gross sein, wie das angrenzende Fenster
                     hoch ist. Die Hoehe vom HeaderBar wird automatisch
@@ -159,10 +159,10 @@ SetDragSize()       Mit dieser Methode wird gesetzt, wir gross der
 
 Weitere Methoden
 
-SetOffset()             Mit dieser Methode wird der Offset gesetzt, ab dem
+SetOffset() 			Mit dieser Methode wird der Offset gesetzt, ab dem
                         die Items ausgegeben werden. Dies wird benoetigt,
                         wenn das dazugehoerige Fenster gescrollt wird.
-CalcWindowSizePixel()   Mit dieser Methode kann man die Hoehe des Fensters
+CalcWindowSizePixel()	Mit dieser Methode kann man die Hoehe des Fensters
                         berechnen, damit der Inhalt der Items ausgegeben
                         werden kann.
 
@@ -192,9 +192,9 @@ class ImplHeadItemList;
 // - WinBits -
 // -----------
 
-#define WB_BOTTOMBORDER         ((WinBits)0x0400)
-#define WB_BUTTONSTYLE          ((WinBits)0x0800)
-#define WB_STDHEADERBAR         (WB_BUTTONSTYLE | WB_BOTTOMBORDER)
+#define WB_BOTTOMBORDER 		((WinBits)0x0400)
+#define WB_BUTTONSTYLE			((WinBits)0x0800)
+#define WB_STDHEADERBAR 		(WB_BUTTONSTYLE | WB_BOTTOMBORDER)
 
 // ---------------------
 // - HeaderBarItemBits -
@@ -206,32 +206,32 @@ typedef USHORT HeaderBarItemBits;
 // - Bits fuer HeaderBarItems -
 // ----------------------------
 
-#define HIB_LEFT                ((HeaderBarItemBits)0x0001)
-#define HIB_CENTER              ((HeaderBarItemBits)0x0002)
-#define HIB_RIGHT               ((HeaderBarItemBits)0x0004)
-#define HIB_TOP                 ((HeaderBarItemBits)0x0008)
-#define HIB_VCENTER             ((HeaderBarItemBits)0x0010)
-#define HIB_BOTTOM              ((HeaderBarItemBits)0x0020)
-#define HIB_LEFTIMAGE           ((HeaderBarItemBits)0x0040)
-#define HIB_RIGHTIMAGE          ((HeaderBarItemBits)0x0080)
-#define HIB_FIXED               ((HeaderBarItemBits)0x0100)
-#define HIB_FIXEDPOS            ((HeaderBarItemBits)0x0200)
-#define HIB_CLICKABLE           ((HeaderBarItemBits)0x0400)
-#define HIB_FLAT                ((HeaderBarItemBits)0x0800)
-#define HIB_DOWNARROW           ((HeaderBarItemBits)0x1000)
-#define HIB_UPARROW             ((HeaderBarItemBits)0x2000)
-#define HIB_USERDRAW            ((HeaderBarItemBits)0x4000)
-#define HIB_STDSTYLE            (HIB_LEFT | HIB_LEFTIMAGE | HIB_VCENTER | HIB_CLICKABLE)
+#define HIB_LEFT				((HeaderBarItemBits)0x0001)
+#define HIB_CENTER				((HeaderBarItemBits)0x0002)
+#define HIB_RIGHT				((HeaderBarItemBits)0x0004)
+#define HIB_TOP 				((HeaderBarItemBits)0x0008)
+#define HIB_VCENTER 			((HeaderBarItemBits)0x0010)
+#define HIB_BOTTOM				((HeaderBarItemBits)0x0020)
+#define HIB_LEFTIMAGE			((HeaderBarItemBits)0x0040)
+#define HIB_RIGHTIMAGE			((HeaderBarItemBits)0x0080)
+#define HIB_FIXED				((HeaderBarItemBits)0x0100)
+#define HIB_FIXEDPOS			((HeaderBarItemBits)0x0200)
+#define HIB_CLICKABLE			((HeaderBarItemBits)0x0400)
+#define HIB_FLAT				((HeaderBarItemBits)0x0800)
+#define HIB_DOWNARROW			((HeaderBarItemBits)0x1000)
+#define HIB_UPARROW 			((HeaderBarItemBits)0x2000)
+#define HIB_USERDRAW			((HeaderBarItemBits)0x4000)
+#define HIB_STDSTYLE			(HIB_LEFT | HIB_LEFTIMAGE | HIB_VCENTER | HIB_CLICKABLE)
 
 // -------------------
 // - HeaderBar-Types -
 // -------------------
 
-#define HEADERBAR_APPEND            ((USHORT)0xFFFF)
-#define HEADERBAR_ITEM_NOTFOUND     ((USHORT)0xFFFF)
-#define HEADERBAR_FULLSIZE          ((long)1000000000)
+#define HEADERBAR_APPEND			((USHORT)0xFFFF)
+#define HEADERBAR_ITEM_NOTFOUND 	((USHORT)0xFFFF)
+#define HEADERBAR_FULLSIZE			((long)1000000000)
 
-#define HEADERBAR_TEXTOFF           2
+#define HEADERBAR_TEXTOFF			2
 
 // -------------
 // - HeaderBar -
@@ -240,30 +240,30 @@ typedef USHORT HeaderBarItemBits;
 class SVT_DLLPUBLIC HeaderBar : public Window
 {
 private:
-    ImplHeadItemList*   mpItemList;
-    long                mnBorderOff1;
-    long                mnBorderOff2;
-    long                mnOffset;
-    long                mnDX;
-    long                mnDY;
-    long                mnDragSize;
-    long                mnStartPos;
-    long                mnDragPos;
-    long                mnMouseOff;
-    USHORT              mnCurItemId;
-    USHORT              mnItemDragPos;
-    BOOL                mbDragable;
-    BOOL                mbDrag;
-    BOOL                mbItemDrag;
-    BOOL                mbOutDrag;
-    BOOL                mbButtonStyle;
-    BOOL                mbItemMode;
-    Link                maStartDragHdl;
-    Link                maDragHdl;
-    Link                maEndDragHdl;
-    Link                maSelectHdl;
-    Link                maDoubleClickHdl;
-    Link                maCreateAccessibleHdl;
+    ImplHeadItemList*	mpItemList;
+    long				mnBorderOff1;
+    long				mnBorderOff2;
+    long				mnOffset;
+    long				mnDX;
+    long				mnDY;
+    long				mnDragSize;
+    long				mnStartPos;
+    long				mnDragPos;
+    long				mnMouseOff;
+    USHORT				mnCurItemId;
+    USHORT				mnItemDragPos;
+    BOOL				mbDragable;
+    BOOL				mbDrag;
+    BOOL				mbItemDrag;
+    BOOL				mbOutDrag;
+    BOOL				mbButtonStyle;
+    BOOL				mbItemMode;
+    Link				maStartDragHdl;
+    Link				maDragHdl;
+    Link				maEndDragHdl;
+    Link				maSelectHdl;
+    Link				maDoubleClickHdl;
+    Link				maCreateAccessibleHdl;
 
     ::com::sun::star::uno::Reference<
         ::com::sun::star::accessibility::XAccessible >
@@ -271,26 +271,26 @@ private:
 
 #ifdef _SV_HEADBAR_CXX
     using Window::ImplInit;
-    SVT_DLLPRIVATE void             ImplInit( WinBits nWinStyle );
-    SVT_DLLPRIVATE void             ImplInitSettings( BOOL bFont, BOOL bForeground, BOOL bBackground );
-    SVT_DLLPRIVATE long             ImplGetItemPos( USHORT nPos ) const;
-    SVT_DLLPRIVATE Rectangle            ImplGetItemRect( USHORT nPos ) const;
+    SVT_DLLPRIVATE void				ImplInit( WinBits nWinStyle );
+    SVT_DLLPRIVATE void				ImplInitSettings( BOOL bFont, BOOL bForeground, BOOL bBackground );
+    SVT_DLLPRIVATE long				ImplGetItemPos( USHORT nPos ) const;
+    SVT_DLLPRIVATE Rectangle			ImplGetItemRect( USHORT nPos ) const;
     using Window::ImplHitTest;
-    SVT_DLLPRIVATE USHORT               ImplHitTest( const Point& rPos, long& nMouseOff, USHORT& nPos ) const;
-    SVT_DLLPRIVATE void             ImplInvertDrag( USHORT nStartPos, USHORT nEndPos );
-    SVT_DLLPRIVATE void             ImplDrawItem( OutputDevice* pDev,
+    SVT_DLLPRIVATE USHORT				ImplHitTest( const Point& rPos, long& nMouseOff, USHORT& nPos ) const;
+    SVT_DLLPRIVATE void				ImplInvertDrag( USHORT nStartPos, USHORT nEndPos );
+    SVT_DLLPRIVATE void				ImplDrawItem( OutputDevice* pDev,
                                       USHORT nPos, BOOL bHigh, BOOL bDrag,
                                       const Rectangle& rItemRect,
                                       const Rectangle* pRect,
                                       ULONG nFlags );
-    SVT_DLLPRIVATE void             ImplDrawItem( USHORT nPos, BOOL bHigh = FALSE,
+    SVT_DLLPRIVATE void				ImplDrawItem( USHORT nPos, BOOL bHigh = FALSE,
                                       BOOL bDrag = FALSE,
                                       const Rectangle* pRect = NULL );
-    SVT_DLLPRIVATE void             ImplUpdate( USHORT nPos,
+    SVT_DLLPRIVATE void				ImplUpdate( USHORT nPos,
                                     BOOL bEnd = FALSE, BOOL bDirect = FALSE );
-    SVT_DLLPRIVATE void             ImplStartDrag( const Point& rPos, BOOL bCommand );
-    SVT_DLLPRIVATE void             ImplDrag( const Point& rPos );
-    SVT_DLLPRIVATE void             ImplEndDrag( BOOL bCancel );
+    SVT_DLLPRIVATE void				ImplStartDrag( const Point& rPos, BOOL bCommand );
+    SVT_DLLPRIVATE void				ImplDrag( const Point& rPos );
+    SVT_DLLPRIVATE void				ImplEndDrag( BOOL bCancel );
 #endif
 
 public:
@@ -298,98 +298,98 @@ public:
                         HeaderBar( Window* pParent, const ResId& rResId );
                         ~HeaderBar();
 
-    virtual void        MouseButtonDown( const MouseEvent& rMEvt );
-    virtual void        MouseMove( const MouseEvent& rMEvt );
-    virtual void        Tracking( const TrackingEvent& rTEvt );
-    virtual void        Paint( const Rectangle& rRect );
-    virtual void        Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, ULONG nFlags );
-    virtual void        Resize();
-    virtual void        Command( const CommandEvent& rCEvt );
-    virtual void        RequestHelp( const HelpEvent& rHEvt );
-    virtual void        StateChanged( StateChangedType nStateChange );
-    virtual void        DataChanged( const DataChangedEvent& rDCEvt );
-
-    virtual void        UserDraw( const UserDrawEvent& rUDEvt );
-    virtual void        StartDrag();
-    virtual void        Drag();
-    virtual void        EndDrag();
-    virtual void        Select();
-    virtual void        DoubleClick();
-
-    void                InsertItem( USHORT nItemId, const Image& rImage,
+    virtual void		MouseButtonDown( const MouseEvent& rMEvt );
+    virtual void		MouseMove( const MouseEvent& rMEvt );
+    virtual void		Tracking( const TrackingEvent& rTEvt );
+    virtual void		Paint( const Rectangle& rRect );
+    virtual void		Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, ULONG nFlags );
+    virtual void		Resize();
+    virtual void		Command( const CommandEvent& rCEvt );
+    virtual void		RequestHelp( const HelpEvent& rHEvt );
+    virtual void		StateChanged( StateChangedType nStateChange );
+    virtual void		DataChanged( const DataChangedEvent& rDCEvt );
+
+    virtual void		UserDraw( const UserDrawEvent& rUDEvt );
+    virtual void		StartDrag();
+    virtual void		Drag();
+    virtual void		EndDrag();
+    virtual void		Select();
+    virtual void		DoubleClick();
+
+    void				InsertItem( USHORT nItemId, const Image& rImage,
                                     long nSize, HeaderBarItemBits nBits = HIB_STDSTYLE,
                                     USHORT nPos = HEADERBAR_APPEND );
-    void                InsertItem( USHORT nItemId, const XubString& rText,
+    void				InsertItem( USHORT nItemId, const XubString& rText,
                                     long nSize, HeaderBarItemBits nBits = HIB_STDSTYLE,
                                     USHORT nPos = HEADERBAR_APPEND );
-    void                InsertItem( USHORT nItemId,
+    void				InsertItem( USHORT nItemId,
                                     const Image& rImage, const XubString& rText,
                                     long nSize, HeaderBarItemBits nBits = HIB_STDSTYLE,
                                     USHORT nPos = HEADERBAR_APPEND );
-    void                RemoveItem( USHORT nItemId );
-    void                MoveItem( USHORT nItemId, USHORT nNewPos );
-    void                Clear();
-
-    void                SetOffset( long nNewOffset = 0 );
-    long                GetOffset() const { return mnOffset; }
-    inline void         SetDragSize( long nNewSize = 0 ) { mnDragSize = nNewSize; }
-    long                GetDragSize() const { return mnDragSize; }
-
-    USHORT              GetItemCount() const;
-    USHORT              GetItemPos( USHORT nItemId ) const;
-    USHORT              GetItemId( USHORT nPos ) const;
-    USHORT              GetItemId( const Point& rPos ) const;
-    Rectangle           GetItemRect( USHORT nItemId ) const;
-    USHORT              GetCurItemId() const { return mnCurItemId; }
-    long                GetDragPos() const { return mnDragPos; }
-    USHORT              GetItemDragPos() const { return mnItemDragPos; }
-    BOOL                IsItemMode() const { return mbItemMode; }
-    BOOL                IsItemDrag() const { return mbItemDrag; }
-
-    void                SetItemSize( USHORT nItemId, long nNewSize );
-    long                GetItemSize( USHORT nItemId ) const;
-    void                SetItemBits( USHORT nItemId, HeaderBarItemBits nNewBits );
-    HeaderBarItemBits   GetItemBits( USHORT nItemId ) const;
-    void                SetItemData( USHORT nItemId, void* pNewData );
-    void*               GetItemData( USHORT nItemId ) const;
-
-    void                SetItemImage( USHORT nItemId, const Image& rImage );
-    Image               GetItemImage( USHORT nItemId ) const;
-    void                SetItemText( USHORT nItemId, const XubString& rText );
-    XubString           GetItemText( USHORT nItemId ) const;
-
-    void                SetHelpText( USHORT nItemId, const XubString& rText );
-    XubString           GetHelpText( USHORT nItemId ) const;
-    void                SetHelpId( USHORT nItemId, ULONG nHelpId );
-    ULONG               GetHelpId( USHORT nItemId ) const;
-
-    Size                CalcWindowSizePixel() const;
-
-    inline void             SetHelpText( const String& rText )      { Window::SetHelpText( rText ); }
-    inline const String&    GetHelpText() const                     { return Window::GetHelpText(); }
-    inline void             SetHelpId( ULONG nId )                  { Window::SetHelpId( nId ); }
-    inline ULONG            GetHelpId() const                       { return Window::GetHelpId(); }
-
-    inline void         SetStartDragHdl( const Link& rLink )        { maStartDragHdl = rLink; }
-    inline const Link&  GetStartDragHdl() const                     { return maStartDragHdl; }
-    inline void         SetDragHdl( const Link& rLink )             { maDragHdl = rLink; }
-    inline const Link&  GetDragHdl() const                          { return maDragHdl; }
-    inline void         SetEndDragHdl( const Link& rLink )          { maEndDragHdl = rLink; }
-    inline const Link&  GetEndDragHdl() const                       { return maEndDragHdl; }
-    inline void         SetSelectHdl( const Link& rLink )           { maSelectHdl = rLink; }
-    inline const Link&  GetSelectHdl() const                        { return maSelectHdl; }
-    inline void         SetDoubleClickHdl( const Link& rLink )      { maDoubleClickHdl = rLink; }
-    inline const Link&  GetDoubleClickHdl() const                   { return maDoubleClickHdl; }
-    inline void         SetCreateAccessibleHdl( const Link& rLink ) { maCreateAccessibleHdl = rLink; }
-    inline const Link&  GetCreateAccessibleHdl() const              { return maCreateAccessibleHdl; }
-
-    inline BOOL         IsDragable() const                          { return mbDragable; }
+    void				RemoveItem( USHORT nItemId );
+    void				MoveItem( USHORT nItemId, USHORT nNewPos );
+    void				Clear();
+
+    void				SetOffset( long nNewOffset = 0 );
+    long				GetOffset() const { return mnOffset; }
+    inline void			SetDragSize( long nNewSize = 0 ) { mnDragSize = nNewSize; }
+    long				GetDragSize() const { return mnDragSize; }
+
+    USHORT				GetItemCount() const;
+    USHORT				GetItemPos( USHORT nItemId ) const;
+    USHORT				GetItemId( USHORT nPos ) const;
+    USHORT				GetItemId( const Point& rPos ) const;
+    Rectangle			GetItemRect( USHORT nItemId ) const;
+    USHORT				GetCurItemId() const { return mnCurItemId; }
+    long				GetDragPos() const { return mnDragPos; }
+    USHORT				GetItemDragPos() const { return mnItemDragPos; }
+    BOOL				IsItemMode() const { return mbItemMode; }
+    BOOL				IsItemDrag() const { return mbItemDrag; }
+
+    void				SetItemSize( USHORT nItemId, long nNewSize );
+    long				GetItemSize( USHORT nItemId ) const;
+    void				SetItemBits( USHORT nItemId, HeaderBarItemBits nNewBits );
+    HeaderBarItemBits	GetItemBits( USHORT nItemId ) const;
+    void				SetItemData( USHORT nItemId, void* pNewData );
+    void*				GetItemData( USHORT nItemId ) const;
+
+    void				SetItemImage( USHORT nItemId, const Image& rImage );
+    Image				GetItemImage( USHORT nItemId ) const;
+    void				SetItemText( USHORT nItemId, const XubString& rText );
+    XubString			GetItemText( USHORT nItemId ) const;
+
+    void				SetHelpText( USHORT nItemId, const XubString& rText );
+    XubString			GetHelpText( USHORT nItemId ) const;
+    void				SetHelpId( USHORT nItemId, ULONG nHelpId );
+    ULONG				GetHelpId( USHORT nItemId ) const;
+
+    Size				CalcWindowSizePixel() const;
+
+    inline void				SetHelpText( const String& rText )		{ Window::SetHelpText( rText ); }
+    inline const String&	GetHelpText() const						{ return Window::GetHelpText(); }
+    inline void				SetHelpId( ULONG nId )					{ Window::SetHelpId( nId ); }
+    inline ULONG			GetHelpId() const 						{ return Window::GetHelpId(); }
+
+    inline void		  	SetStartDragHdl( const Link& rLink )		{ maStartDragHdl = rLink; }
+    inline const Link&	GetStartDragHdl() const						{ return maStartDragHdl; }
+    inline void		  	SetDragHdl( const Link& rLink )				{ maDragHdl = rLink; }
+    inline const Link&	GetDragHdl() const							{ return maDragHdl; }
+    inline void		  	SetEndDragHdl( const Link& rLink )			{ maEndDragHdl = rLink; }
+    inline const Link&	GetEndDragHdl() const						{ return maEndDragHdl; }
+    inline void		  	SetSelectHdl( const Link& rLink )			{ maSelectHdl = rLink; }
+    inline const Link&	GetSelectHdl() const						{ return maSelectHdl; }
+    inline void		  	SetDoubleClickHdl( const Link& rLink )		{ maDoubleClickHdl = rLink; }
+    inline const Link&	GetDoubleClickHdl() const					{ return maDoubleClickHdl; }
+    inline void		  	SetCreateAccessibleHdl( const Link& rLink )	{ maCreateAccessibleHdl = rLink; }
+    inline const Link&	GetCreateAccessibleHdl() const				{ return maCreateAccessibleHdl; }
+
+    inline BOOL			IsDragable() const							{ return mbDragable; }
 
     /** Creates and returns the accessible object of the header bar. */
     virtual ::com::sun::star::uno::Reference<
-        ::com::sun::star::accessibility::XAccessible >  CreateAccessible();
+        ::com::sun::star::accessibility::XAccessible >	CreateAccessible();
     void SetAccessible( ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > );
 };
 
-#endif  // _HEADBAR_HXX
+#endif	// _HEADBAR_HXX
 
diff --git a/svtools/inc/svtools/helpid.hrc b/svtools/inc/svtools/helpid.hrc
index 1ffb7a99fb32..8f4c7329df9b 100644
--- a/svtools/inc/svtools/helpid.hrc
+++ b/svtools/inc/svtools/helpid.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
@@ -34,42 +34,42 @@
 
 // Help-Ids --------------------------------------------------------------
 
-#define HID_FILEDLG_OPENDLG         (HID_SVTOOLS_START +   0)
-#define HID_FILEDLG_PATHDLG         (HID_SVTOOLS_START +   1)
-#define HID_FILEDLG_DIR             (HID_SVTOOLS_START +   2)
-#define HID_FILEDLG_EDIT            (HID_SVTOOLS_START +   3)
-#define HID_FILEDLG_DIRS            (HID_SVTOOLS_START +   4)
-#define HID_FILEDLG_DRIVE           (HID_SVTOOLS_START +   5)
-#define HID_FILEDLG_DRIVES          (HID_SVTOOLS_START +   6)
-#define HID_FILEDLG_NEWDIR          (HID_SVTOOLS_START +   7)
-#define HID_FILEDLG_HOME            (HID_SVTOOLS_START +   8)
-#define HID_FILEDLG_FILE            (HID_SVTOOLS_START +   9)
-#define HID_FILEDLG_FILES           (HID_SVTOOLS_START +  10)
-#define HID_FILEDLG_PATH            (HID_SVTOOLS_START +  11)
-#define HID_FILEDLG_TYPE            (HID_SVTOOLS_START +  12)
-#define HID_FILEDLG_TYPES           (HID_SVTOOLS_START +  13)
+#define HID_FILEDLG_OPENDLG			(HID_SVTOOLS_START +   0)
+#define HID_FILEDLG_PATHDLG			(HID_SVTOOLS_START +   1)
+#define HID_FILEDLG_DIR	 			(HID_SVTOOLS_START +   2)
+#define HID_FILEDLG_EDIT 			(HID_SVTOOLS_START +   3)
+#define HID_FILEDLG_DIRS 			(HID_SVTOOLS_START +   4)
+#define HID_FILEDLG_DRIVE 			(HID_SVTOOLS_START +   5)
+#define HID_FILEDLG_DRIVES 			(HID_SVTOOLS_START +   6)
+#define HID_FILEDLG_NEWDIR 			(HID_SVTOOLS_START +   7)
+#define HID_FILEDLG_HOME 			(HID_SVTOOLS_START +   8)
+#define HID_FILEDLG_FILE 			(HID_SVTOOLS_START +   9)
+#define HID_FILEDLG_FILES 			(HID_SVTOOLS_START +  10)
+#define HID_FILEDLG_PATH			(HID_SVTOOLS_START +  11)
+#define HID_FILEDLG_TYPE 			(HID_SVTOOLS_START +  12)
+#define HID_FILEDLG_TYPES 			(HID_SVTOOLS_START +  13)
 
 // HelpID's fuer die Textkomponente
-#define HID_TEXTCPNT_OPEN_LINK          (HID_SVTOOLS_START +  14)
-#define HID_TEXTCPNT_OPEN_LINK_NEW      (HID_SVTOOLS_START +  15)
-#define HID_TEXTCPNT_DOWNLOAD           (HID_SVTOOLS_START +  16)
-#define HID_TEXTCPNT_ADD_BOOKMARK       (HID_SVTOOLS_START +  17)
-#define HID_TEXTCPNT_COPY_LINK          (HID_SVTOOLS_START +  18)
+#define HID_TEXTCPNT_OPEN_LINK 			(HID_SVTOOLS_START +  14)
+#define HID_TEXTCPNT_OPEN_LINK_NEW	 	(HID_SVTOOLS_START +  15)
+#define HID_TEXTCPNT_DOWNLOAD 			(HID_SVTOOLS_START +  16)
+#define HID_TEXTCPNT_ADD_BOOKMARK		(HID_SVTOOLS_START +  17)
+#define HID_TEXTCPNT_COPY_LINK			(HID_SVTOOLS_START +  18)
 
 // HelpID's fuer RegisterDialog
-#define HID_LIMITED_DIALOG              (HID_SVTOOLS_START +  20)
+#define HID_LIMITED_DIALOG				(HID_SVTOOLS_START +  20)
 
 // Help ids of template dialog
-#define HID_TEMPLATEDLG_DIALOG          (HID_SVTOOLS_START +  21)
-#define HID_TEMPLATEDLG_ICONCTRL        (HID_SVTOOLS_START +  22)
-#define HID_TEMPLATEDLG_FILEVIEW        (HID_SVTOOLS_START +  23)
-#define HID_TEMPLATEDLG_TB_BACK         (HID_SVTOOLS_START +  24)
-#define HID_TEMPLATEDLG_TB_PREV         (HID_SVTOOLS_START +  25)
-#define HID_TEMPLATEDLG_TB_PRINT        (HID_SVTOOLS_START +  26)
-#define HID_TEMPLATEDLG_TB_DOCINFO      (HID_SVTOOLS_START +  27)
-#define HID_TEMPLATEDLG_TB_PREVIEW      (HID_SVTOOLS_START +  28)
+#define HID_TEMPLATEDLG_DIALOG			(HID_SVTOOLS_START +  21)
+#define HID_TEMPLATEDLG_ICONCTRL		(HID_SVTOOLS_START +  22)
+#define HID_TEMPLATEDLG_FILEVIEW		(HID_SVTOOLS_START +  23)
+#define HID_TEMPLATEDLG_TB_BACK			(HID_SVTOOLS_START +  24)
+#define HID_TEMPLATEDLG_TB_PREV			(HID_SVTOOLS_START +  25)
+#define HID_TEMPLATEDLG_TB_PRINT		(HID_SVTOOLS_START +  26)
+#define HID_TEMPLATEDLG_TB_DOCINFO		(HID_SVTOOLS_START +  27)
+#define HID_TEMPLATEDLG_TB_PREVIEW		(HID_SVTOOLS_START +  28)
 
-#define HID_ADDRTEMPL_FIELD_ASSIGNMENT  (HID_SVTOOLS_START +  29)
+#define HID_ADDRTEMPL_FIELD_ASSIGNMENT	(HID_SVTOOLS_START +  29)
 
 // Help ids for the filepicker dialogs
 #define HID_EXPLORERDLG_FILE            (HID_SVTOOLS_START +  30)
@@ -80,38 +80,38 @@
 
 // help ids for the different modi of the file picker dialog
     // FREE
-#define HID_FILESAVE_LEVELUP            (HID_SVTOOLS_START +  34)
-#define HID_FILESAVE_CREATEDIRECTORY    (HID_SVTOOLS_START +  35)
-#define HID_FILESAVE_DEFAULTDIRECTORY   (HID_SVTOOLS_START +  36)
-#define HID_FILESAVE_FILEVIEW           (HID_SVTOOLS_START +  37)
-#define HID_FILESAVE_TEMPLATE           (HID_SVTOOLS_START +  38)
-#define HID_FILESAVE_FILEURL            (HID_SVTOOLS_START +  39)
-#define HID_FILESAVE_FILETYPE           (HID_SVTOOLS_START +  40)
-#define HID_FILESAVE_DOSAVE             (HID_SVTOOLS_START +  41)
-#define HID_FILESAVE_AUTOEXTENSION      (HID_SVTOOLS_START +  42)
-#define HID_FILESAVE_SAVEWITHPASSWORD   (HID_SVTOOLS_START +  43)
-#define HID_FILESAVE_CUSTOMIZEFILTER    (HID_SVTOOLS_START +  44)
-#define HID_FILESAVE_SELECTION          (HID_SVTOOLS_START +  45)
-#define HID_FILESAVE_DIALOG             (HID_SVTOOLS_START +  46)
-#define HID_FILESAVE_DOPLAY             (HID_SVTOOLS_START +  47)
-
-#define HID_FILEOPEN_READONLY           (HID_SVTOOLS_START +  48)
-#define HID_FILEOPEN_VERSION            (HID_SVTOOLS_START +  49)
-#define HID_FILEOPEN_IMAGE_TEMPLATE     (HID_SVTOOLS_START +  50)
-
-#define HID_FILEDLG_LINK_CB             (HID_SFX_START     + 276)
-#define HID_FILEDLG_PREVIEW_CB          (HID_SFX_START     + 277)
+#define HID_FILESAVE_LEVELUP			(HID_SVTOOLS_START +  34)
+#define HID_FILESAVE_CREATEDIRECTORY	(HID_SVTOOLS_START +  35)
+#define HID_FILESAVE_DEFAULTDIRECTORY	(HID_SVTOOLS_START +  36)
+#define HID_FILESAVE_FILEVIEW			(HID_SVTOOLS_START +  37)
+#define HID_FILESAVE_TEMPLATE			(HID_SVTOOLS_START +  38)
+#define HID_FILESAVE_FILEURL			(HID_SVTOOLS_START +  39)
+#define HID_FILESAVE_FILETYPE			(HID_SVTOOLS_START +  40)
+#define HID_FILESAVE_DOSAVE				(HID_SVTOOLS_START +  41)
+#define HID_FILESAVE_AUTOEXTENSION		(HID_SVTOOLS_START +  42)
+#define HID_FILESAVE_SAVEWITHPASSWORD	(HID_SVTOOLS_START +  43)
+#define HID_FILESAVE_CUSTOMIZEFILTER	(HID_SVTOOLS_START +  44)
+#define HID_FILESAVE_SELECTION			(HID_SVTOOLS_START +  45)
+#define HID_FILESAVE_DIALOG				(HID_SVTOOLS_START +  46)
+#define HID_FILESAVE_DOPLAY				(HID_SVTOOLS_START +  47)
+
+#define HID_FILEOPEN_READONLY			(HID_SVTOOLS_START +  48)
+#define HID_FILEOPEN_VERSION			(HID_SVTOOLS_START +  49)
+#define HID_FILEOPEN_IMAGE_TEMPLATE		(HID_SVTOOLS_START +  50)
+
+#define HID_FILEDLG_LINK_CB     		(HID_SFX_START 	   + 276)
+#define HID_FILEDLG_PREVIEW_CB  		(HID_SFX_START     + 277)
 
 // uniqueid for the helpagent window (testtool)
-#define HID_HELPAGENT_WINDOW            (HID_SVTOOLS_START +  51)
+#define HID_HELPAGENT_WINDOW			(HID_SVTOOLS_START +  51)
 
 // registration dialog
-#define HID_REGISTRATION_DIALOG         (HID_SVTOOLS_START +  52)
+#define HID_REGISTRATION_DIALOG			(HID_SVTOOLS_START +  52)
 
-#define HID_PRINTDIALOG_TOFILE          (HID_SVTOOLS_START +  53)
+#define HID_PRINTDIALOG_TOFILE			(HID_SVTOOLS_START +  53)
 
-#define HID_WIZARD_NEXT                 (HID_SVTOOLS_START +  54)
-#define HID_WIZARD_PREVIOUS             (HID_SVTOOLS_START +  55)
+#define HID_WIZARD_NEXT			        (HID_SVTOOLS_START +  54)
+#define HID_WIZARD_PREVIOUS		        (HID_SVTOOLS_START +  55)
 
 #endif
 
diff --git a/svtools/inc/svtools/helpopt.hxx b/svtools/inc/svtools/helpopt.hxx
index 974c6c85fa38..9a7b8f15cb6a 100644
--- a/svtools/inc/svtools/helpopt.hxx
+++ b/svtools/inc/svtools/helpopt.hxx
@@ -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
@@ -55,31 +55,31 @@ public:
 
     void            SetHelpAgentAutoStartMode( sal_Bool b );
     sal_Bool        IsHelpAgentAutoStartMode() const;
-    void            SetHelpAgentTimeoutPeriod( sal_Int32 _nSeconds );
-    sal_Int32       GetHelpAgentTimeoutPeriod( ) const;
-    void            SetHelpAgentRetryLimit( sal_Int32 _nTrials );
-    sal_Int32       GetHelpAgentRetryLimit( ) const;
+    void			SetHelpAgentTimeoutPeriod( sal_Int32 _nSeconds );
+    sal_Int32		GetHelpAgentTimeoutPeriod( ) const;
+    void			SetHelpAgentRetryLimit( sal_Int32 _nTrials );
+    sal_Int32		GetHelpAgentRetryLimit( ) const;
 
     const String&   GetHelpStyleSheet()const;
     void            SetHelpStyleSheet(const String& rStyleSheet);
 
     /** retrieves the help agent's ignore counter for the given URL.
-        <p> If the counter returned 0, the agent should silently drop any requests for this URL.<br/>
+        <p>	If the counter returned 0, the agent should silently drop any requests for this URL.<br/>
             If the counter is greater 0, the agent should display the URL and, if the user ignores it,
             decrement the counter by 1.
         </p>
     */
-    sal_Int32       getAgentIgnoreURLCounter( const ::rtl::OUString& _rURL );
+    sal_Int32		getAgentIgnoreURLCounter( const ::rtl::OUString& _rURL );
     /** decrements the help agent's ignore counter for the given URL
         @see getAgentIgnoreURLCounter
     */
-    void            decAgentIgnoreURLCounter( const ::rtl::OUString& _rURL );
+    void			decAgentIgnoreURLCounter( const ::rtl::OUString& _rURL );
     /** resets the help agent's ignore counter for the given URL
     */
-    void            resetAgentIgnoreURLCounter( const ::rtl::OUString& _rURL );
+    void			resetAgentIgnoreURLCounter( const ::rtl::OUString& _rURL );
     /** resets the help agent's ignore counter for all URL's
     */
-    void            resetAgentIgnoreURLCounter();
+    void			resetAgentIgnoreURLCounter();
 
     void            SetWelcomeScreen( sal_Bool b );
     sal_Bool        IsWelcomeScreen() const;
@@ -88,8 +88,8 @@ public:
     void            AddToPIStarterList( sal_Int32 nId );
     void            RemoveFromPIStarterList( sal_Int32 nId );
 
-    String          GetLocale() const;
-    String          GetSystem() const;
+    String			GetLocale() const;
+    String			GetSystem() const;
 };
 
 #endif
diff --git a/svtools/inc/svtools/htmlcfg.hxx b/svtools/inc/svtools/htmlcfg.hxx
index c27df0a9a67f..e10cefc8e3c8 100644
--- a/svtools/inc/svtools/htmlcfg.hxx
+++ b/svtools/inc/svtools/htmlcfg.hxx
@@ -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
@@ -36,8 +36,8 @@
 #define HTML_FONT_COUNT 7
 
 // !!!be aware!!!: the following defines are _not_ used as values in the configuration file
-//                  this is because of compatibility reasons
-#define HTML_CFG_HTML32     0   // Html 3.2
+//					this is because of compatibility reasons
+#define HTML_CFG_HTML32		0	// Html 3.2
 #define HTML_CFG_MSIE_40    1   // Internet Explorer 4.0
 #define HTML_CFG_MSIE       HTML_CFG_MSIE_40
 #define HTML_CFG_WRITER     2   // Writer
@@ -64,38 +64,38 @@ public:
     virtual void    Commit();
     virtual void Notify( const com::sun::star::uno::Sequence< rtl::OUString >& _rPropertyNames);
 
-    USHORT      GetFontSize(USHORT nPos) const;
-    void        SetFontSize(USHORT nPos, USHORT nSize);
+    USHORT 		GetFontSize(USHORT nPos) const;
+    void 		SetFontSize(USHORT nPos, USHORT nSize);
 
-    BOOL        IsImportUnknown() const;
-    void        SetImportUnknown(BOOL bSet);
+    BOOL		IsImportUnknown() const;
+    void 		SetImportUnknown(BOOL bSet);
 
-    USHORT      GetExportMode() const;
-    void        SetExportMode(USHORT nSet);
+    USHORT 		GetExportMode() const;
+    void		SetExportMode(USHORT nSet);
 
-    BOOL        IsStarBasic() const;
-    void        SetStarBasic(BOOL bSet);
+    BOOL 		IsStarBasic() const;
+    void		SetStarBasic(BOOL bSet);
 
-    BOOL        IsStarBasicWarning() const;
-    void        SetStarBasicWarning(BOOL bSet);
+    BOOL 		IsStarBasicWarning() const;
+    void		SetStarBasicWarning(BOOL bSet);
 
-    BOOL        IsSaveGraphicsLocal() const;
-    void        SetSaveGraphicsLocal(BOOL bSet);
+    BOOL 		IsSaveGraphicsLocal() const;
+    void		SetSaveGraphicsLocal(BOOL bSet);
 
-    BOOL        IsPrintLayoutExtension() const;
-    void        SetPrintLayoutExtension(BOOL bSet);
+    BOOL 		IsPrintLayoutExtension() const;
+    void		SetPrintLayoutExtension(BOOL bSet);
 
-    BOOL        IsIgnoreFontFamily() const;
-    void        SetIgnoreFontFamily(BOOL bSet);
+    BOOL		IsIgnoreFontFamily() const;
+    void		SetIgnoreFontFamily(BOOL bSet);
 
     sal_Bool    IsDefaultTextEncoding() const;
     rtl_TextEncoding GetTextEncoding() const;
-    void        SetTextEncoding( rtl_TextEncoding );
+    void 		SetTextEncoding( rtl_TextEncoding );
     static SvxHtmlOptions* Get();
 
-    BOOL        IsNumbersEnglishUS() const;
-    void        SetNumbersEnglishUS(BOOL bSet);
-
+    BOOL		IsNumbersEnglishUS() const;
+    void		SetNumbersEnglishUS(BOOL bSet);
+    
     void AddListenerLink( const Link& rLink );
     void RemoveListenerLink( const Link& rLink );
 };
diff --git a/svtools/inc/svtools/htmlout.hxx b/svtools/inc/svtools/htmlout.hxx
index 888286b231ee..39bd5faec4de 100644
--- a/svtools/inc/svtools/htmlout.hxx
+++ b/svtools/inc/svtools/htmlout.hxx
@@ -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
@@ -61,9 +61,9 @@ struct SVT_DLLPUBLIC HTMLOutContext
 struct HTMLOutFuncs
 {
 #if defined(MAC) || defined(UNX)
-    static const sal_Char sNewLine;     // nur \012 oder \015
+    static const sal_Char sNewLine;		// nur \012 oder \015
 #else
-    static const sal_Char __FAR_DATA sNewLine[];    // \015\012
+    static const sal_Char __FAR_DATA sNewLine[];	// \015\012
 #endif
 
     SVT_DLLPUBLIC static void ConvertStringToHTML( const String& sSrc, ByteString& rDest,
@@ -74,7 +74,7 @@ struct HTMLOutFuncs
                                    BOOL bOn = TRUE,
                         rtl_TextEncoding eDestEnc = RTL_TEXTENCODING_MS_1252);
     SVT_DLLPUBLIC static SvStream& Out_Char( SvStream&, sal_Unicode cChar,
-                        HTMLOutContext& rContext,
+                        HTMLOutContext& rContext, 
                         String *pNonConvertableChars = 0 );
     SVT_DLLPUBLIC static SvStream& Out_String( SvStream&, const String&,
                         rtl_TextEncoding eDestEnc = RTL_TEXTENCODING_MS_1252,
@@ -112,7 +112,7 @@ struct HTMLOutFuncs
                         String *pNonConvertableChars = 0 );
 
     // <TD SDVAL="..." SDNUM="...">
-    SVT_DLLPUBLIC static ByteString&    CreateTableDataOptionsValNum( ByteString& aStrTD,
+    SVT_DLLPUBLIC static ByteString&	CreateTableDataOptionsValNum( ByteString& aStrTD,
                 BOOL bValue, double fVal, ULONG nFormat,
                 SvNumberFormatter& rFormatter,
                 rtl_TextEncoding eDestEnc = RTL_TEXTENCODING_MS_1252,
diff --git a/svtools/inc/svtools/hyperlabel.hxx b/svtools/inc/svtools/hyperlabel.hxx
index 926b11c5537c..41fd8302023f 100644
--- a/svtools/inc/svtools/hyperlabel.hxx
+++ b/svtools/inc/svtools/hyperlabel.hxx
@@ -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
@@ -41,11 +41,11 @@ namespace svt
 //.........................................................................
 
        class HyperLabelImpl;
-
+    
     class HyperLabel : public FixedText
     {
     protected:
-        HyperLabelImpl*     m_pImpl;
+        HyperLabelImpl*		m_pImpl;
         Link                maClickHdl;
 
         virtual void        MouseMove( const MouseEvent& rMEvt );
@@ -63,8 +63,8 @@ namespace svt
         HyperLabel( Window* _pParent, const ResId& _rId );
         HyperLabel( Window* _pParent, WinBits _nWinStyle = 0 );
         ~HyperLabel( );
-
-        virtual void    DataChanged( const DataChangedEvent& rDCEvt );
+        
+        virtual void	DataChanged( const DataChangedEvent& rDCEvt );
 
         void                SetID( sal_Int16 _ID );
         sal_Int16           GetID() const;
@@ -73,11 +73,11 @@ namespace svt
         sal_Int32           GetIndex() const;
 
         void                SetLabel( const ::rtl::OUString& _rText );
-        sal_Int32           GetLogicWidth();
+        sal_Int32			GetLogicWidth();
 
         ::rtl::OUString     GetLabel( );
-
-        void                ToggleBackgroundColor( const Color& _rGBColor );
+        
+        void				ToggleBackgroundColor( const Color& _rGBColor );
         void                SetInteractive( sal_Bool _bInteractive );
 
         void                SetClickHdl( const Link& rLink ) { maClickHdl = rLink; }
@@ -86,7 +86,7 @@ namespace svt
         Size                CalcMinimumSize( long nMaxWidth = 0 ) const;
 
     private:
-
+        
         DECL_LINK(ImplClickHdl, HyperLabel*);
 
     private:
diff --git a/svtools/inc/svtools/imap.hxx b/svtools/inc/svtools/imap.hxx
index 52212e365c87..11f3f5443f25 100644
--- a/svtools/inc/svtools/imap.hxx
+++ b/svtools/inc/svtools/imap.hxx
@@ -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
@@ -46,8 +46,8 @@ class IMapObject;
 
 class SVT_DLLPUBLIC ImageMap
 {
-    List                maList;
-    String              aName;
+    List				maList;
+    String				aName;
 
 protected:
 
@@ -62,15 +62,15 @@ protected:
     ULONG               ImpReadNCSA( SvStream& rOStm, const String& rBaseURL );
 
     void                ImpReadCERNLine( const ByteString& rLine, const String& rBaseURL );
-    Point               ImpReadCERNCoords( const char** ppStr );
-    long                ImpReadCERNRadius( const char** ppStr );
+    Point				ImpReadCERNCoords( const char** ppStr );
+    long				ImpReadCERNRadius( const char** ppStr );
     String              ImpReadCERNURL( const char** ppStr, const String& rBaseURL );
 
     void                ImpReadNCSALine( const ByteString& rLine, const String& rBaseURL );
     String              ImpReadNCSAURL( const char** ppStr, const String& rBaseURL );
-    Point               ImpReadNCSACoords( const char** ppStr );
+    Point				ImpReadNCSACoords( const char** ppStr );
 
-    ULONG               ImpDetectFormat( SvStream& rIStm );
+    ULONG				ImpDetectFormat( SvStream& rIStm );
 
 public:
 
@@ -83,25 +83,25 @@ public:
                         // Der Dtor gibt den intern belegten
                         // Speicher wieder frei;
                         //  alle IMapObjekte werden im Dtor zerstoert;
-    virtual             ~ImageMap();
+    virtual				~ImageMap();
 
     // Zuweisungsoperator
-    ImageMap&           operator=( const ImageMap& rImageMap );
+    ImageMap&			operator=( const ImageMap& rImageMap );
 
     // Vergleichsoperator (es wird alles auf Gleichheit geprueft)
-    BOOL                operator==( const ImageMap& rImageMap );
-    BOOL                operator!=( const ImageMap& rImageMap );
+    BOOL				operator==( const ImageMap& rImageMap );
+    BOOL				operator!=( const ImageMap& rImageMap );
 
     // In die Map wird ein neues IMap-Obkekt ans Ende eingefuegt
-    void                InsertIMapObject( const IMapObject& rIMapObject );
+    void				InsertIMapObject( const IMapObject& rIMapObject );
 
     // Zugriff auf einzelne IMapObjekte; die Objekte
     // duerfen von aussen _nicht_ zerstoert werden
-    IMapObject*         GetFirstIMapObject() { return (IMapObject*) maList.First(); }
-    IMapObject*         GetNextIMapObject() { return (IMapObject*) maList.Next(); }
-    IMapObject*         GetLastIMapObject() { return (IMapObject*) maList.Last(); }
-    IMapObject*         GetPrevIMapObject() { return (IMapObject*) maList.Prev(); }
-    IMapObject*         GetIMapObject( USHORT nPos ) const { return (IMapObject*) maList.GetObject( nPos ); }
+    IMapObject*			GetFirstIMapObject() { return (IMapObject*) maList.First(); }
+    IMapObject*			GetNextIMapObject() { return (IMapObject*) maList.Next(); }
+    IMapObject*			GetLastIMapObject() { return (IMapObject*) maList.Last(); }
+    IMapObject*			GetPrevIMapObject() { return (IMapObject*) maList.Prev(); }
+    IMapObject*			GetIMapObject( USHORT nPos ) const { return (IMapObject*) maList.GetObject( nPos ); }
 
     // Gibt das Objekt zurueck, das zuerst getroffen wurde oder NULL;
     // Groessen- und Positionsangaben sind in 1/100mm;
@@ -109,29 +109,29 @@ public:
     // rDisplaySize die aktuelle Darstellungsgroesse;
     // rRelPoint bezieht sich auf die Darstellungsgroesse
     // und die linke oebere Ecke des Bildes
-    IMapObject*         GetHitIMapObject( const Size& rOriginalSize,
+    IMapObject*			GetHitIMapObject( const Size& rOriginalSize,
                                           const Size& rDisplaySize,
                                           const Point& rRelHitPoint,
                                           ULONG nFlags = 0 );
 
     // Gibt die Gesamtanzahl der IMap-Objekte zurueck
-    UINT16              GetIMapObjectCount() const { return (UINT16) maList.Count(); }
+    UINT16				GetIMapObjectCount() const { return (UINT16) maList.Count(); }
 
     // Loescht alle internen Objekte
-    void                ClearImageMap();
+    void				ClearImageMap();
 
     // liefert die aktuelle Versionsnummer
-    UINT16              GetVersion() const;
+    UINT16				GetVersion() const;
 
     // liefert / setzt den Namen der ImageMap
-    const String&       GetName() const { return aName; }
-    void                SetName( const String& rName ) { aName = rName; }
+    const String&		GetName() const { return aName; }
+    void				SetName( const String& rName ) { aName = rName; }
 
     // gibt das BoundRect aller IMap-Objekte in 1/100mm zurueck
-    Rectangle           GetBoundRect() const;
+    Rectangle			GetBoundRect() const;
 
     // skaliert alle Objekte der ImageMap entpr. dem uebergebenen Faktor
-    void                Scale( const Fraction& rFractX, const Fraction& rFracY );
+    void				Scale( const Fraction& rFractX, const Fraction& rFracY );
 
     // Im-/Export
     void                Write ( SvStream& rOStm, const String& rBaseURL ) const;
@@ -151,15 +151,15 @@ public:
 
 class IMapCompat
 {
-    SvStream*       pRWStm;
-    ULONG           nCompatPos;
-    ULONG           nTotalSize;
-    USHORT          nStmMode;
+    SvStream*		pRWStm;
+    ULONG			nCompatPos;
+    ULONG			nTotalSize;
+    USHORT			nStmMode;
 
                     IMapCompat() {}
                     IMapCompat( const IMapCompat& ) {}
-    IMapCompat&     operator=( const IMapCompat& ) { return *this; }
-    BOOL            operator==( const IMapCompat& ) { return FALSE; }
+    IMapCompat&		operator=( const IMapCompat& ) { return *this; }
+    BOOL			operator==( const IMapCompat& ) { return FALSE; }
 
 public:
 
diff --git a/svtools/inc/svtools/imapcirc.hxx b/svtools/inc/svtools/imapcirc.hxx
index e3ea5349d376..f039175d581c 100644
--- a/svtools/inc/svtools/imapcirc.hxx
+++ b/svtools/inc/svtools/imapcirc.hxx
@@ -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
@@ -41,16 +41,16 @@ class Fraction;
 
 class SVT_DLLPUBLIC IMapCircleObject : public IMapObject
 {
-    Point               aCenter;
-    ULONG               nRadius;
+    Point				aCenter;
+    ULONG				nRadius;
 
-    void                ImpConstruct( const Point& rCenter, ULONG nRad, BOOL bPixel );
+    void				ImpConstruct( const Point& rCenter, ULONG nRad, BOOL bPixel );
 
 protected:
 
     // Binaer-Im-/Export
-    virtual void        WriteIMapObject( SvStream& rOStm ) const;
-    virtual void        ReadIMapObject(  SvStream& rIStm );
+    virtual void		WriteIMapObject( SvStream& rOStm ) const;
+    virtual void		ReadIMapObject(  SvStream& rIStm );
 
 public:
 
@@ -63,21 +63,21 @@ public:
                                           const String& rName,
                                           BOOL bActive = TRUE,
                                           BOOL bPixelCoords = TRUE );
-    virtual             ~IMapCircleObject() {};
+    virtual				~IMapCircleObject() {};
 
-    virtual UINT16      GetType() const;
-    virtual BOOL        IsHit( const Point& rPoint ) const;
+    virtual UINT16		GetType() const;
+    virtual BOOL		IsHit( const Point& rPoint ) const;
 
-    Point               GetCenter( BOOL bPixelCoords = TRUE ) const;
-    ULONG               GetRadius( BOOL bPixelCoords = TRUE ) const;
+    Point				GetCenter( BOOL bPixelCoords = TRUE ) const;
+    ULONG				GetRadius( BOOL bPixelCoords = TRUE ) const;
 
     // liefert das BoundRect des Kreis-Objektes in 1/100mm
-    virtual Rectangle   GetBoundRect() const;
+    virtual Rectangle	GetBoundRect() const;
 
-    void                Scale( const Fraction& rFractX, const Fraction& rFracY );
+    void				Scale( const Fraction& rFractX, const Fraction& rFracY );
 
     using IMapObject::IsEqual;
-    BOOL                IsEqual( const IMapCircleObject& rEqObj );
+    BOOL				IsEqual( const IMapCircleObject& rEqObj );
 
     // Im-/Export
     void                WriteCERN( SvStream& rOStm, const String& rBaseURL  ) const;
diff --git a/svtools/inc/svtools/imapobj.hxx b/svtools/inc/svtools/imapobj.hxx
index c557727124cc..d6a167cdd402 100644
--- a/svtools/inc/svtools/imapobj.hxx
+++ b/svtools/inc/svtools/imapobj.hxx
@@ -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
@@ -36,26 +36,26 @@ class Point;
 class Rectangle;
 class SvStream;
 
-#define IMAP_OBJ_NONE       ((UINT16)0x0000)
-#define IMAP_OBJ_RECTANGLE  ((UINT16)0x0001)
-#define IMAP_OBJ_CIRCLE     ((UINT16)0x0002)
-#define IMAP_OBJ_POLYGON    ((UINT16)0x0003)
-#define IMAP_OBJ_VERSION    ((UINT16)0x0005)
+#define IMAP_OBJ_NONE		((UINT16)0x0000)
+#define IMAP_OBJ_RECTANGLE	((UINT16)0x0001)
+#define IMAP_OBJ_CIRCLE		((UINT16)0x0002)
+#define IMAP_OBJ_POLYGON	((UINT16)0x0003)
+#define IMAP_OBJ_VERSION	((UINT16)0x0005)
 
-#define IMAGE_MAP_VERSION   ((UINT16)0x0001)
+#define IMAGE_MAP_VERSION	((UINT16)0x0001)
 
-#define IMAPMAGIC           "SDIMAP"
+#define	IMAPMAGIC			"SDIMAP"
 
-#define IMAP_MIRROR_HORZ    0x00000001L
-#define IMAP_MIRROR_VERT    0x00000002L
+#define IMAP_MIRROR_HORZ	0x00000001L
+#define IMAP_MIRROR_VERT	0x00000002L
 
-#define IMAP_FORMAT_BIN     0x00000001L
-#define IMAP_FORMAT_CERN    0x00000002L
-#define IMAP_FORMAT_NCSA    0x00000004L
-#define IMAP_FORMAT_DETECT  0xffffffffL
+#define IMAP_FORMAT_BIN		0x00000001L
+#define IMAP_FORMAT_CERN	0x00000002L
+#define IMAP_FORMAT_NCSA	0x00000004L
+#define IMAP_FORMAT_DETECT	0xffffffffL
 
-#define IMAP_ERR_OK         0x00000000L
-#define IMAP_ERR_FORMAT     0x00000001L
+#define IMAP_ERR_OK			0x00000000L
+#define IMAP_ERR_FORMAT		0x00000001L
 
 /******************************************************************************
 |*
@@ -65,33 +65,33 @@ class SvStream;
 
 class SVT_DLLPUBLIC IMapObject
 {
-    friend class        ImageMap;
+    friend class		ImageMap;
 
-    String              aURL;
-    String              aAltText;
-    String              aDesc;
-    String              aTarget;
-    String              aName;
-    SvxMacroTableDtor   aEventList;
-    BOOL                bActive;
+    String				aURL;
+    String				aAltText;
+    String				aDesc;
+    String				aTarget;
+    String				aName;
+    SvxMacroTableDtor	aEventList;
+    BOOL				bActive;
 
 protected:
 
-    UINT16              nReadVersion;
+    UINT16				nReadVersion;
 
     // Binaer-Im-/Export
-    virtual void        WriteIMapObject( SvStream& rOStm ) const = 0;
-    virtual void        ReadIMapObject(  SvStream& rIStm ) = 0;
+    virtual void		WriteIMapObject( SvStream& rOStm ) const = 0;
+    virtual void		ReadIMapObject(  SvStream& rIStm ) = 0;
 
     // Hilfsmethoden
-    void                AppendCERNCoords( const Point& rPoint100, ByteString& rStr ) const;
+    void				AppendCERNCoords( const Point& rPoint100, ByteString& rStr ) const;
     void                AppendCERNURL( ByteString& rStr, const String& rBaseURL ) const;
-    void                AppendNCSACoords( const Point& rPoint100, ByteString& rStr ) const;
+    void				AppendNCSACoords( const Point& rPoint100, ByteString& rStr ) const;
     void                AppendNCSAURL( ByteString& rStr, const String& rBaseURL ) const;
 
 public:
 
-    static rtl_TextEncoding nActualTextEncoding;
+    static rtl_TextEncoding	nActualTextEncoding;
 
                         IMapObject();
                         IMapObject( const String& rURL,
@@ -100,48 +100,48 @@ public:
                                     const String& rTarget,
                                     const String& rName,
                                     BOOL bActive );
-    virtual             ~IMapObject() {};
+    virtual				~IMapObject() {};
 
-    virtual UINT16      GetVersion() const;
-    virtual UINT16      GetType() const = 0;
-    virtual BOOL        IsHit( const Point& rPoint ) const = 0;
+    virtual UINT16		GetVersion() const;
+    virtual UINT16		GetType() const = 0;
+    virtual BOOL		IsHit( const Point& rPoint ) const = 0;
 
     void                Write ( SvStream& rOStm, const String& rBaseURL ) const;
     void                Read( SvStream& rIStm, const String& rBaseURL );
 
-    virtual Rectangle   GetBoundRect() const = 0;
+    virtual Rectangle	GetBoundRect() const = 0;
 
-    const String&       GetURL() const { return aURL; }
-    void                SetURL( const String& rURL ) { aURL = rURL; }
+    const String&		GetURL() const { return aURL; }
+    void				SetURL( const String& rURL ) { aURL = rURL; }
 
-    const String&       GetAltText() const { return aAltText; }
-    void                SetAltText( const String& rAltText) { aAltText = rAltText; }
+    const String&		GetAltText() const { return aAltText; }
+    void				SetAltText( const String& rAltText) { aAltText = rAltText; }
 
-    const String&       GetDesc() const { return aDesc; }
-    void                SetDesc( const String& rDesc ) { aDesc = rDesc; }
+    const String&		GetDesc() const { return aDesc; }
+    void				SetDesc( const String& rDesc ) { aDesc = rDesc; }
 
-    const String&       GetTarget() const { return aTarget; }
-    void                SetTarget( const String& rTarget ) { aTarget = rTarget; }
+    const String&		GetTarget() const { return aTarget; }
+    void				SetTarget( const String& rTarget ) { aTarget = rTarget; }
 
-    const String&       GetName() const { return aName; }
-    void                SetName( const String& rName ) { aName = rName; }
+    const String&		GetName() const { return aName; }
+    void				SetName( const String& rName ) { aName = rName; }
 
-    BOOL                IsActive() const { return bActive; }
-    void                SetActive( BOOL bSetActive = TRUE ) { bActive = bSetActive; }
+    BOOL				IsActive() const { return bActive; }
+    void				SetActive( BOOL bSetActive = TRUE ) { bActive = bSetActive; }
 
-    static Point        GetPixelPoint( const Point& rLogPoint );
-    static Point        GetLogPoint( const Point& rPixelPoint );
+    static Point		GetPixelPoint( const Point& rLogPoint );
+    static Point		GetLogPoint( const Point& rPixelPoint );
 
-    BOOL                IsEqual( const IMapObject& rEqObj );
+    BOOL				IsEqual( const IMapObject& rEqObj );
 
     // IMap-Events
     inline const SvxMacroTableDtor& GetMacroTable() const { return aEventList;}
     inline void SetMacroTable( const SvxMacroTableDtor& rTbl ) { aEventList = rTbl; }
 
-    inline const SvxMacro&  GetEvent( USHORT nEvent ) const;
-    inline BOOL             HasEvent( USHORT nEvent ) const;
-           void             SetEvent( USHORT nEvent, const SvxMacro& );
-    inline BOOL             DelEvent( USHORT nEvent );
+    inline const SvxMacro&	GetEvent( USHORT nEvent ) const;
+    inline BOOL 			HasEvent( USHORT nEvent ) const;
+           void 			SetEvent( USHORT nEvent, const SvxMacro& );
+    inline BOOL 			DelEvent( USHORT nEvent );
 };
 
 inline BOOL IMapObject::HasEvent( USHORT nEvent ) const
diff --git a/svtools/inc/svtools/imappoly.hxx b/svtools/inc/svtools/imappoly.hxx
index 00d22cbe2de0..60222e0a82cc 100644
--- a/svtools/inc/svtools/imappoly.hxx
+++ b/svtools/inc/svtools/imappoly.hxx
@@ -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
@@ -42,19 +42,19 @@ class Fraction;
 
 class SVT_DLLPUBLIC IMapPolygonObject : public IMapObject
 {
-    Polygon             aPoly;
-    Rectangle           aEllipse;
-    BOOL                bEllipse;
+    Polygon				aPoly;
+    Rectangle			aEllipse;
+    BOOL				bEllipse;
 
-    SVT_DLLPRIVATE void             ImpConstruct( const Polygon& rPoly, BOOL bPixel );
+    SVT_DLLPRIVATE void				ImpConstruct( const Polygon& rPoly, BOOL bPixel );
 
 protected:
 
     // Binaer-Im-/Export
-    virtual void        WriteIMapObject( SvStream& rOStm ) const;
-    virtual void        ReadIMapObject(  SvStream& rIStm );
+    virtual void		WriteIMapObject( SvStream& rOStm ) const;
+    virtual void		ReadIMapObject(  SvStream& rIStm );
 
-    BOOL                ReadPreProLine( SvStream& rIStm, String& rStr );
+    BOOL				ReadPreProLine( SvStream& rIStm, String& rStr );
 
 public:
                         IMapPolygonObject() {};
@@ -66,24 +66,24 @@ public:
                                            const String& rName,
                                            BOOL bActive = TRUE,
                                            BOOL bPixelCoords = TRUE );
-    virtual             ~IMapPolygonObject() {};
+    virtual				~IMapPolygonObject() {};
 
-    virtual UINT16      GetType() const;
-    virtual BOOL        IsHit( const Point& rPoint ) const;
+    virtual UINT16		GetType() const;
+    virtual BOOL		IsHit( const Point& rPoint ) const;
 
-    Polygon             GetPolygon( BOOL bPixelCoords = TRUE ) const;
+    Polygon				GetPolygon( BOOL bPixelCoords = TRUE ) const;
 
     // liefert das BoundRect des Polygon-Objektes in 1/100mm
-    virtual Rectangle   GetBoundRect() const {  return aPoly.GetBoundRect(); }
+    virtual Rectangle	GetBoundRect() const { 	return aPoly.GetBoundRect(); }
 
-    BOOL                HasExtraEllipse() const { return bEllipse; }
-    const Rectangle&    GetExtraEllipse() const { return aEllipse; }
-    void                SetExtraEllipse( const Rectangle& rEllipse );
+    BOOL				HasExtraEllipse() const { return bEllipse; }
+    const Rectangle&	GetExtraEllipse() const { return aEllipse; }
+    void				SetExtraEllipse( const Rectangle& rEllipse );
 
-    void                Scale( const Fraction& rFractX, const Fraction& rFracY );
+    void				Scale( const Fraction& rFractX, const Fraction& rFracY );
 
     using IMapObject::IsEqual;
-    BOOL                IsEqual( const IMapPolygonObject& rEqObj );
+    BOOL				IsEqual( const IMapPolygonObject& rEqObj );
 
     // Im-/Export
     void                WriteCERN( SvStream& rOStm, const String& rBaseURL  ) const;
diff --git a/svtools/inc/svtools/imaprect.hxx b/svtools/inc/svtools/imaprect.hxx
index 8eacaaaf3531..70d70ba2ceb5 100644
--- a/svtools/inc/svtools/imaprect.hxx
+++ b/svtools/inc/svtools/imaprect.hxx
@@ -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
@@ -41,15 +41,15 @@ class Fraction;
 
 class SVT_DLLPUBLIC IMapRectangleObject : public IMapObject
 {
-    Rectangle           aRect;
+    Rectangle			aRect;
 
-    SVT_DLLPRIVATE void             ImpConstruct( const Rectangle& rRect, BOOL bPixel );
+    SVT_DLLPRIVATE void				ImpConstruct( const Rectangle& rRect, BOOL bPixel );
 
 protected:
 
     // Binaer-Im-/Export
-    virtual void        WriteIMapObject( SvStream& rOStm ) const;
-    virtual void        ReadIMapObject(  SvStream& rIStm );
+    virtual void		WriteIMapObject( SvStream& rOStm ) const;
+    virtual void		ReadIMapObject(  SvStream& rIStm );
 
 public:
 
@@ -62,20 +62,20 @@ public:
                                              const String& rName,
                                              BOOL bActive = TRUE,
                                              BOOL bPixelCoords = TRUE );
-    virtual             ~IMapRectangleObject() {};
+    virtual				~IMapRectangleObject() {};
 
-    virtual UINT16      GetType() const;
-    virtual BOOL        IsHit( const Point& rPoint ) const;
+    virtual UINT16		GetType() const;
+    virtual BOOL		IsHit( const Point& rPoint ) const;
 
-    Rectangle           GetRectangle( BOOL bPixelCoords = TRUE ) const;
+    Rectangle			GetRectangle( BOOL bPixelCoords = TRUE ) const;
 
     // liefert das BoundRect des Rechteck-Objektes in 1/100mm
-    virtual Rectangle   GetBoundRect() const { return aRect; }
+    virtual Rectangle	GetBoundRect() const { return aRect; }
 
-    void                Scale( const Fraction& rFractX, const Fraction& rFracY );
+    void				Scale( const Fraction& rFractX, const Fraction& rFracY );
 
     using IMapObject::IsEqual;
-    BOOL                IsEqual( const IMapRectangleObject& rEqObj );
+    BOOL				IsEqual( const IMapRectangleObject& rEqObj );
 
     // Im-/Export
     void                WriteCERN( SvStream& rOStm, const String& rBaseURL  ) const;
diff --git a/svtools/inc/svtools/inettbc.hxx b/svtools/inc/svtools/inettbc.hxx
index 9394f1ba5ccd..1e0467d53e36 100644
--- a/svtools/inc/svtools/inettbc.hxx
+++ b/svtools/inc/svtools/inettbc.hxx
@@ -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
@@ -45,33 +45,33 @@ class SVT_DLLPUBLIC SvtURLBox : public ComboBox
 {
 friend class SvtMatchContext_Impl;
 friend class SvtURLBox_Impl;
-    Link                            aOpenHdl;
-    String                          aBaseURL;
-    String                          aPlaceHolder;
-    SvtMatchContext_Impl*           pCtx;
-    SvtURLBox_Impl*                 pImp;
-    INetProtocol                    eSmartProtocol;
-    BOOL                            bAutoCompleteMode   : 1;
-    BOOL                            bOnlyDirectories    : 1;
-    BOOL                            bModified           : 1;
+    Link							aOpenHdl;
+    String							aBaseURL;
+    String							aPlaceHolder;
+    SvtMatchContext_Impl*			pCtx;
+    SvtURLBox_Impl*					pImp;
+    INetProtocol					eSmartProtocol;
+    BOOL            				bAutoCompleteMode   : 1;
+    BOOL							bOnlyDirectories    : 1;
+    BOOL							bModified           : 1;
     BOOL                            bTryAutoComplete    : 1;
-    BOOL                            bCtrlClick          : 1;
-    BOOL                            bHistoryDisabled    : 1;
-    BOOL                            bNoSelection        : 1;
+    BOOL							bCtrlClick          : 1;
+    BOOL							bHistoryDisabled    : 1;
+    BOOL							bNoSelection        : 1;
     BOOL                            bIsAutoCompleteEnabled : 1;
 
-    SVT_DLLPRIVATE BOOL                         ProcessKey( const KeyCode& rCode );
-    SVT_DLLPRIVATE void                         TryAutoComplete( BOOL bForce );
+    SVT_DLLPRIVATE BOOL            				ProcessKey( const KeyCode& rCode );
+    SVT_DLLPRIVATE void            				TryAutoComplete( BOOL bForce );
     SVT_DLLPRIVATE void                            UpdatePicklistForSmartProtocol_Impl();
     DECL_DLLPRIVATE_LINK(                      AutoCompleteHdl_Impl, void* );
     using Window::ImplInit;
     SVT_DLLPRIVATE void                            ImplInit();
 
 protected:
-    virtual long                    Notify( NotifyEvent& rNEvt );
-    virtual void                    Select();
-    virtual void                    Modify();
-    virtual long                    PreNotify( NotifyEvent& rNEvt );
+    virtual long					Notify( NotifyEvent& rNEvt );
+    virtual void					Select();
+    virtual void					Modify();
+    virtual long					PreNotify( NotifyEvent& rNEvt );
 
 public:
                                     SvtURLBox( Window* pParent, INetProtocol eSmart = INET_PROT_NOT_VALID );
@@ -79,24 +79,24 @@ public:
                                     SvtURLBox( Window* pParent, const ResId& _rResId, INetProtocol eSmart = INET_PROT_NOT_VALID );
                                     ~SvtURLBox();
 
-    void                            SetBaseURL( const String& rURL );
-    const String&                   GetBaseURL() const { return aBaseURL; }
-    void                            SetOpenHdl( const Link& rLink ) { aOpenHdl = rLink; }
-    const Link&                     GetOpenHdl() const { return aOpenHdl; }
-    void                            SetOnlyDirectories( BOOL bDir = TRUE );
-    void                            SetNoURLSelection( BOOL bSet = TRUE );
-    INetProtocol                    GetSmartProtocol() const { return eSmartProtocol; }
+    void							SetBaseURL( const String& rURL );
+    const String&					GetBaseURL() const { return aBaseURL; }
+    void							SetOpenHdl( const Link& rLink ) { aOpenHdl = rLink; }
+    const Link& 					GetOpenHdl() const { return aOpenHdl; }
+    void							SetOnlyDirectories( BOOL bDir = TRUE );
+    void							SetNoURLSelection( BOOL bSet = TRUE );
+    INetProtocol					GetSmartProtocol() const { return eSmartProtocol; }
     void                            SetSmartProtocol( INetProtocol eProt );
     BOOL                            IsCtrlOpen()
                                         { return bCtrlClick; }
     String                          GetURL();
-    void                            DisableHistory();
+    void							DisableHistory();
 
-    void                            UpdatePickList( );
+    void							UpdatePickList( );
 
     static String                   ParseSmart( String aText, String aBaseURL, String aWorkDir );
 
-    void                            SetFilter(const String& _sFilter);
+    void							SetFilter(const String& _sFilter);
     void                            SetUrlFilter( const IUrlFilter* _pFilter );
     const IUrlFilter*               GetUrlFilter( ) const;
 
diff --git a/svtools/inc/svtools/insdlg.hxx b/svtools/inc/svtools/insdlg.hxx
index afbbc2509011..c2dbd1a110b2 100644
--- a/svtools/inc/svtools/insdlg.hxx
+++ b/svtools/inc/svtools/insdlg.hxx
@@ -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
@@ -60,7 +60,7 @@ class SVT_DLLPUBLIC SvObjectServerList
     const SvObjectServer *  Get( const String & rHumanName ) const;
     const SvObjectServer *  Get( const SvGlobalName & ) const;
     void                    Remove( const SvGlobalName & );
-    void                    FillInsertObjects();
+    void					FillInsertObjects();
 };
 
 class SVT_DLLPUBLIC SvPasteObjectHelper
diff --git a/svtools/inc/svtools/javacontext.hxx b/svtools/inc/svtools/javacontext.hxx
index 54ef70975ae0..5d4e64f634d2 100644
--- a/svtools/inc/svtools/javacontext.hxx
+++ b/svtools/inc/svtools/javacontext.hxx
@@ -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
@@ -41,10 +41,10 @@ namespace svt
 // We cannot derive from  cppu::WeakImplHelper because we would export the inline
 //generated class. This conflicts with other libraries if they use the same inline
 //class.
-    class SVT_DLLPUBLIC JavaContext :
+    class SVT_DLLPUBLIC JavaContext :        
         public com::sun::star::uno::XCurrentContext
     {
-
+        
     public:
         JavaContext( const com::sun::star::uno::Reference<
                      com::sun::star::uno::XCurrentContext> & ctx);
@@ -77,8 +77,8 @@ namespace svt
         SVT_DLLPRIVATE JavaContext(); //not implemented
         SVT_DLLPRIVATE JavaContext(JavaContext&); //not implemented
         SVT_DLLPRIVATE JavaContext& operator = (JavaContext&); //not implemented
-
-        oslInterlockedCount m_aRefCount;
+        
+        oslInterlockedCount	m_aRefCount;
 
         com::sun::star::uno::Reference<
             com::sun::star::uno::XCurrentContext > m_xNextContext;
diff --git a/svtools/inc/svtools/javainteractionhandler.hxx b/svtools/inc/svtools/javainteractionhandler.hxx
index 87ed9da0fc3d..621e0965608e 100644
--- a/svtools/inc/svtools/javainteractionhandler.hxx
+++ b/svtools/inc/svtools/javainteractionhandler.hxx
@@ -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
@@ -44,7 +44,7 @@ namespace svt
 //class.
 
 class SVT_DLLPUBLIC JavaInteractionHandler:
-        public com::sun::star::task::XInteractionHandler
+        public com::sun::star::task::XInteractionHandler 
 {
 public:
     JavaInteractionHandler();
@@ -65,7 +65,7 @@ public:
         throw (com::sun::star::uno::RuntimeException);
 
 private:
-    oslInterlockedCount m_aRefCount;
+    oslInterlockedCount	m_aRefCount;
     SVT_DLLPRIVATE JavaInteractionHandler(JavaInteractionHandler const&); //not implemented
     SVT_DLLPRIVATE JavaInteractionHandler& operator = (JavaInteractionHandler const &); //not implemented
     SVT_DLLPRIVATE virtual ~JavaInteractionHandler();
diff --git a/svtools/inc/svtools/langtab.hxx b/svtools/inc/svtools/langtab.hxx
index e5600413091b..650617342be9 100644
--- a/svtools/inc/svtools/langtab.hxx
+++ b/svtools/inc/svtools/langtab.hxx
@@ -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
@@ -42,12 +42,12 @@ public:
     SvtLanguageTable();
     ~SvtLanguageTable();
 
-    const String&   GetString( const LanguageType eType ) const;
-    LanguageType    GetType( const String& rStr ) const;
+    const String&	GetString( const LanguageType eType ) const;
+    LanguageType	GetType( const String& rStr ) const;
 
-    sal_uInt32      GetEntryCount() const;
-    LanguageType    GetTypeAtIndex( sal_uInt32 nIndex ) const;
-    static String   GetLanguageString( const LanguageType eType );
+    sal_uInt32		GetEntryCount() const;
+    LanguageType	GetTypeAtIndex( sal_uInt32 nIndex ) const;
+    static String	GetLanguageString( const LanguageType eType );
 };
 
 // Add LRE or RLE embedding characters to the string based on the
diff --git a/svtools/inc/svtools/menuoptions.hxx b/svtools/inc/svtools/menuoptions.hxx
index 6de173f40c3a..810a0d00eb45 100644
--- a/svtools/inc/svtools/menuoptions.hxx
+++ b/svtools/inc/svtools/menuoptions.hxx
@@ -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
@@ -28,7 +28,7 @@
 #define INCLUDED_SVTOOLS_MENUOPTIONS_HXX
 
 //_________________________________________________________________________________________________________________
-//  includes
+//	includes
 //_________________________________________________________________________________________________________________
 
 #include "svtools/svtdllapi.h"
@@ -37,12 +37,12 @@
 #include <unotools/options.hxx>
 
 //_________________________________________________________________________________________________________________
-//  forward declarations
+//	forward declarations
 //_________________________________________________________________________________________________________________
 
 /*-************************************************************************************************************//**
-    @short          forward declaration to our private date container implementation
-    @descr          We use these class as internal member to support small memory requirements.
+    @short			forward declaration to our private date container implementation
+    @descr			We use these class as internal member to support small memory requirements.
                     You can create the container if it is neccessary. The class which use these mechanism
                     is faster and smaller then a complete implementation!
 *//*-*************************************************************************************************************/
@@ -51,45 +51,45 @@ class Link;
 class SvtMenuOptions_Impl;
 
 //_________________________________________________________________________________________________________________
-//  declarations
+//	declarations
 //_________________________________________________________________________________________________________________
 
 /*-************************************************************************************************************//**
-    @short          collect informations about menu features
+    @short			collect informations about menu features
     @descr          -
 
-    @implements     -
-    @base           -
+    @implements		-
+    @base			-
 
-    @devstatus      ready to use
+    @devstatus		ready to use
 *//*-*************************************************************************************************************/
 
 class SVT_DLLPUBLIC SvtMenuOptions: public utl::detail::Options
 {
     //-------------------------------------------------------------------------------------------------------------
-    //  public methods
+    //	public methods
     //-------------------------------------------------------------------------------------------------------------
 
     public:
 
         //---------------------------------------------------------------------------------------------------------
-        //  constructor / destructor
+        //	constructor / destructor
         //---------------------------------------------------------------------------------------------------------
 
         /*-****************************************************************************************************//**
-            @short      standard constructor and destructor
-            @descr      This will initialize an instance with default values.
+            @short		standard constructor and destructor
+            @descr		This will initialize an instance with default values.
                         We implement these class with a refcount mechanism! Every instance of this class increase it
                         at create and decrease it at delete time - but all instances use the same data container!
                         He is implemented as a static member ...
 
-            @seealso    member m_nRefCount
-            @seealso    member m_pDataContainer
+            @seealso	member m_nRefCount
+            @seealso	member m_pDataContainer
 
-            @param      -
-            @return     -
+            @param		-
+            @return		-
 
-            @onerror    -
+            @onerror	-
         *//*-*****************************************************************************************************/
 
          SvtMenuOptions();
@@ -98,23 +98,23 @@ class SVT_DLLPUBLIC SvtMenuOptions: public utl::detail::Options
         void AddListenerLink( const Link& rLink );
         void RemoveListenerLink( const Link& rLink );
         //---------------------------------------------------------------------------------------------------------
-        //  interface
+        //	interface
         //---------------------------------------------------------------------------------------------------------
 
         /*-****************************************************************************************************//**
-            @short      interface methods to get and set value of config key "org.openoffice.Office.Common/View/Menu/..."
+            @short		interface methods to get and set value of config key "org.openoffice.Office.Common/View/Menu/..."
             @descr      These options describe internal states to enable/disable features of installed office.
 
                         IsEntryHidingEnabled()
-                        SetEntryHidingState()   =>  Activate this field for viewing all deactivated menu entries.
+                        SetEntryHidingState()	=>	Activate this field for viewing all deactivated menu entries.
                                                     Menu commands that are normally not necessary are hidden by default.
                                                     Default=false
 
                         IsFollowMouseEnabled()
-                        SetFollowMouseState()   =>  Automatic selection while moving the mouse on a menu.
+                        SetFollowMouseState() 	=>  Automatic selection while moving the mouse on a menu.
                                                     Default=true
 
-            @seealso    configuration package "org.openoffice.Office.Common/View/Menu"
+            @seealso	configuration package "org.openoffice.Office.Common/View/Menu"
         *//*-*****************************************************************************************************/
 
         sal_Bool IsEntryHidingEnabled() const;
@@ -126,29 +126,29 @@ class SVT_DLLPUBLIC SvtMenuOptions: public utl::detail::Options
         void SetMenuIconsState( sal_Int16 bState );
 
     //-------------------------------------------------------------------------------------------------------------
-    //  private methods
+    //	private methods
     //-------------------------------------------------------------------------------------------------------------
 
     private:
 
         /*-****************************************************************************************************//**
-            @short      return a reference to a static mutex
-            @descr      These class is partially threadsafe (for de-/initialization only).
+            @short		return a reference to a static mutex
+            @descr		These class is partially threadsafe (for de-/initialization only).
                         All access methods are'nt safe!
                         We create a static mutex only for one ime and use at different times.
 
-            @seealso    -
+            @seealso	-
 
-            @param      -
-            @return     A reference to a static mutex member.
+            @param		-
+            @return		A reference to a static mutex member.
 
-            @onerror    -
+            @onerror	-
         *//*-*****************************************************************************************************/
 
         SVT_DLLPRIVATE static ::osl::Mutex& GetOwnStaticMutex();
 
     //-------------------------------------------------------------------------------------------------------------
-    //  private member
+    //	private member
     //-------------------------------------------------------------------------------------------------------------
 
     private:
@@ -161,9 +161,9 @@ class SVT_DLLPUBLIC SvtMenuOptions: public utl::detail::Options
             Do it in your source only.
          */
 
-        static SvtMenuOptions_Impl* m_pDataContainer    ;   /// impl. data container as dynamic pointer for smaller memory requirements!
-        static sal_Int32            m_nRefCount         ;   /// internal ref count mechanism
+        static SvtMenuOptions_Impl*	m_pDataContainer	;	/// impl. data container as dynamic pointer for smaller memory requirements!
+        static sal_Int32			m_nRefCount			;	/// internal ref count mechanism
 
-};      // class SvtMenuOptions
+};		// class SvtMenuOptions
 
-#endif  // #ifndef INCLUDED_SVTOOLS_MENUOPTIONS_HXX
+#endif	// #ifndef INCLUDED_SVTOOLS_MENUOPTIONS_HXX
diff --git a/svtools/inc/svtools/miscopt.hxx b/svtools/inc/svtools/miscopt.hxx
index ecee18fbe6b4..9a299c41dc18 100644
--- a/svtools/inc/svtools/miscopt.hxx
+++ b/svtools/inc/svtools/miscopt.hxx
@@ -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
@@ -28,7 +28,7 @@
 #define INCLUDED_SVTOOLS_MISCOPT_HXX
 
 //_________________________________________________________________________________________________________________
-//  includes
+//	includes
 //_________________________________________________________________________________________________________________
 
 #include "svtools/svtdllapi.h"
@@ -39,12 +39,12 @@
 #include <unotools/options.hxx>
 
 //_________________________________________________________________________________________________________________
-//  forward declarations
+//	forward declarations
 //_________________________________________________________________________________________________________________
 
 /*-************************************************************************************************************//**
-    @short          forward declaration to our private date container implementation
-    @descr          We use these class as internal member to support small memory requirements.
+    @short			forward declaration to our private date container implementation
+    @descr			We use these class as internal member to support small memory requirements.
                     You can create the container if it is neccessary. The class which use these mechanism
                     is faster and smaller then a complete implementation!
 *//*-*************************************************************************************************************/
@@ -53,47 +53,47 @@ class SvtMiscOptions_Impl;
 class Link;
 
 //_________________________________________________________________________________________________________________
-//  declarations
+//	declarations
 //_________________________________________________________________________________________________________________
 
 /*-************************************************************************************************************//**
-    @short          collect informations about misc group
+    @short			collect informations about misc group
     @descr          -
 
-    @implements     -
-    @base           -
+    @implements		-
+    @base			-
 
-    @ATTENTION      This class is partially threadsafe.
+    @ATTENTION		This class is partially threadsafe.
 
-    @devstatus      ready to use
+    @devstatus		ready to use
 *//*-*************************************************************************************************************/
 
 class SVT_DLLPUBLIC SvtMiscOptions: public utl::detail::Options
 {
     //-------------------------------------------------------------------------------------------------------------
-    //  public methods
+    //	public methods
     //-------------------------------------------------------------------------------------------------------------
 
     public:
 
         //---------------------------------------------------------------------------------------------------------
-        //  constructor / destructor
+        //	constructor / destructor
         //---------------------------------------------------------------------------------------------------------
 
         /*-****************************************************************************************************//**
-            @short      standard constructor and destructor
-            @descr      This will initialize an instance with default values.
+            @short		standard constructor and destructor
+            @descr		This will initialize an instance with default values.
                         We implement these class with a refcount mechanism! Every instance of this class increase it
                         at create and decrease it at delete time - but all instances use the same data container!
                         He is implemented as a static member ...
 
-            @seealso    member m_nRefCount
-            @seealso    member m_pDataContainer
+            @seealso	member m_nRefCount
+            @seealso	member m_pDataContainer
 
-            @param      -
-            @return     -
+            @param		-
+            @return		-
 
-            @onerror    -
+            @onerror	-
         *//*-*****************************************************************************************************/
 
          SvtMiscOptions();
@@ -103,7 +103,7 @@ class SVT_DLLPUBLIC SvtMiscOptions: public utl::detail::Options
         void RemoveListenerLink( const Link& rLink );
 
         //---------------------------------------------------------------------------------------------------------
-        //  interface
+        //	interface
         //---------------------------------------------------------------------------------------------------------
 
         sal_Bool    UseSystemFileDialog() const;
@@ -147,29 +147,29 @@ class SVT_DLLPUBLIC SvtMiscOptions: public utl::detail::Options
         sal_Bool    IsShowLinkWarningDialogReadOnly() const;
 
     //-------------------------------------------------------------------------------------------------------------
-    //  private methods
+    //	private methods
     //-------------------------------------------------------------------------------------------------------------
 
     private:
 
         /*-****************************************************************************************************//**
-            @short      return a reference to a static mutex
-            @descr      These class is partially threadsafe (for de-/initialization only).
+            @short		return a reference to a static mutex
+            @descr		These class is partially threadsafe (for de-/initialization only).
                         All access methods are'nt safe!
                         We create a static mutex only for one ime and use at different times.
 
-            @seealso    -
+            @seealso	-
 
-            @param      -
-            @return     A reference to a static mutex member.
+            @param		-
+            @return		A reference to a static mutex member.
 
-            @onerror    -
+            @onerror	-
         *//*-*****************************************************************************************************/
 
         SVT_DLLPRIVATE static ::osl::Mutex& GetInitMutex();
 
     //-------------------------------------------------------------------------------------------------------------
-    //  private member
+    //	private member
     //-------------------------------------------------------------------------------------------------------------
 
     private:
@@ -182,9 +182,9 @@ class SVT_DLLPUBLIC SvtMiscOptions: public utl::detail::Options
             Do it in your source only.
          */
 
-        static SvtMiscOptions_Impl* m_pDataContainer    ;   /// impl. data container as dynamic pointer for smaller memory requirements!
-        static sal_Int32                m_nRefCount         ;   /// internal ref count mechanism
+        static SvtMiscOptions_Impl*	m_pDataContainer	;	/// impl. data container as dynamic pointer for smaller memory requirements!
+        static sal_Int32				m_nRefCount			;	/// internal ref count mechanism
 
-};      // class SvtMiscOptions
+};		// class SvtMiscOptions
 
-#endif  // #ifndef INCLUDED_SVTOOLS_MISCOPT_HXX
+#endif	// #ifndef INCLUDED_SVTOOLS_MISCOPT_HXX
diff --git a/svtools/inc/svtools/optionsdrawinglayer.hxx b/svtools/inc/svtools/optionsdrawinglayer.hxx
index bd3114b4e871..34d7779204c0 100644
--- a/svtools/inc/svtools/optionsdrawinglayer.hxx
+++ b/svtools/inc/svtools/optionsdrawinglayer.hxx
@@ -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
@@ -29,7 +29,7 @@
 #define INCLUDED_SVTOOLS_OPTIONSDRAWINGLAYER_HXX
 
 //_________________________________________________________________________________________________________________
-//  includes
+//	includes
 //_________________________________________________________________________________________________________________
 
 #include "svtools/svtdllapi.h"
@@ -39,12 +39,12 @@
 #include <tools/color.hxx>
 
 //_________________________________________________________________________________________________________________
-//  forward declarations
+//	forward declarations
 //_________________________________________________________________________________________________________________
 
 /*-************************************************************************************************************//**
-    @short          forward declaration to our private date container implementation
-    @descr          We use these class as internal member to support small memory requirements.
+    @short			forward declaration to our private date container implementation
+    @descr			We use these class as internal member to support small memory requirements.
                     You can create the container if it is neccessary. The class which use these mechanism
                     is faster and smaller then a complete implementation!
 *//*-*************************************************************************************************************/
@@ -52,103 +52,103 @@
 class SvtOptionsDrawinglayer_Impl;
 
 //_________________________________________________________________________________________________________________
-//  declarations
+//	declarations
 //_________________________________________________________________________________________________________________
 
 /*-************************************************************************************************************//**
-    @short          collect informations about startup features
+    @short			collect informations about startup features
     @descr          -
 
-    @implements     -
-    @base           -
+    @implements		-
+    @base			-
 
-    @devstatus      ready to use
+    @devstatus		ready to use
 *//*-*************************************************************************************************************/
 
 class SVT_DLLPUBLIC SvtOptionsDrawinglayer
 {
     //-------------------------------------------------------------------------------------------------------------
-    //  public methods
+    //	public methods
     //-------------------------------------------------------------------------------------------------------------
 
     public:
 
         //---------------------------------------------------------------------------------------------------------
-        //  constructor / destructor
+        //	constructor / destructor
         //---------------------------------------------------------------------------------------------------------
 
         /*-****************************************************************************************************//**
-            @short      standard constructor and destructor
-            @descr      This will initialize an instance with default values.
+            @short		standard constructor and destructor
+            @descr		This will initialize an instance with default values.
                         We implement these class with a refcount mechanism! Every instance of this class increase it
                         at create and decrease it at delete time - but all instances use the same data container!
                         He is implemented as a static member ...
 
-            @seealso    member m_nRefCount
-            @seealso    member m_pDataContainer
+            @seealso	member m_nRefCount
+            @seealso	member m_pDataContainer
 
-            @param      -
-            @return     -
+            @param		-
+            @return		-
 
-            @onerror    -
+            @onerror	-
         *//*-*****************************************************************************************************/
 
          SvtOptionsDrawinglayer();
         ~SvtOptionsDrawinglayer();
 
         //---------------------------------------------------------------------------------------------------------
-        //  interface
+        //	interface
         //---------------------------------------------------------------------------------------------------------
 
         /*-****************************************************************************************************//**
-            @short      interface methods to get and set value of config key "org.openoffice.Office.Common/Drawinglayer/..."
+            @short		interface methods to get and set value of config key "org.openoffice.Office.Common/Drawinglayer/..."
             @descr      These options describe internal states to enable/disable features of installed office.
 
                         IsOverlayBuffer()
-                        SetOverlayBuffer()      =>  Activate this field for letting Overlay use a buffer
+                        SetOverlayBuffer()		=>	Activate this field for letting Overlay use a buffer
 
                         IsPaintBuffer()
-                        SetPaintBuffer()        =>  Activate this field for letting Paint use a prerender buffer
+                        SetPaintBuffer()		=>	Activate this field for letting Paint use a prerender buffer
 
                         GetStripeColorA()
-                        SetStripeColorA()       =>  Set first of two colors which overlay uses to draw stripes
+                        SetStripeColorA()		=>	Set first of two colors which overlay uses to draw stripes
 
                         GetStripeColorB()
-                        SetStripeColorB()       =>  Set second of two colors which overlay uses to draw stripes
+                        SetStripeColorB()		=>	Set second of two colors which overlay uses to draw stripes
 
                         GetStripeLength()
-                        SetStripeLength()       =>  Set length of a single stripe in pixels
+                        SetStripeLength()		=>	Set length of a single stripe in pixels
 
-            @seealso    configuration package "org.openoffice.Office.Common/Drawinglayer"
+            @seealso	configuration package "org.openoffice.Office.Common/Drawinglayer"
         *//*-*****************************************************************************************************/
 
-        sal_Bool    IsOverlayBuffer() const;
-        sal_Bool    IsPaintBuffer() const;
-        Color       GetStripeColorA() const;
-        Color       GetStripeColorB() const;
-        sal_uInt16  GetStripeLength() const;
+        sal_Bool	IsOverlayBuffer() const;
+        sal_Bool	IsPaintBuffer() const;
+        Color		GetStripeColorA() const;
+        Color		GetStripeColorB() const;
+        sal_uInt16	GetStripeLength() const;
 
-        void        SetOverlayBuffer( sal_Bool bState );
-        void        SetPaintBuffer( sal_Bool bState );
-        void        SetStripeColorA( Color aColor );
-        void        SetStripeColorB( Color aColor );
-        void        SetStripeLength( sal_uInt16 nLength );
+        void		SetOverlayBuffer( sal_Bool bState );
+        void		SetPaintBuffer( sal_Bool bState );
+        void		SetStripeColorA( Color aColor );
+        void		SetStripeColorB( Color aColor );
+        void		SetStripeLength( sal_uInt16 nLength );
 
         // #i73602#
-        sal_Bool    IsOverlayBuffer_Calc() const;
-        sal_Bool    IsOverlayBuffer_Writer() const;
-        sal_Bool    IsOverlayBuffer_DrawImpress() const;
-        void        SetOverlayBuffer_Calc( sal_Bool bState );
-        void        SetOverlayBuffer_Writer( sal_Bool bState );
-        void        SetOverlayBuffer_DrawImpress( sal_Bool bState );
+        sal_Bool	IsOverlayBuffer_Calc() const;
+        sal_Bool	IsOverlayBuffer_Writer() const;
+        sal_Bool	IsOverlayBuffer_DrawImpress() const;
+        void		SetOverlayBuffer_Calc( sal_Bool bState );
+        void		SetOverlayBuffer_Writer( sal_Bool bState );
+        void		SetOverlayBuffer_DrawImpress( sal_Bool bState );
 
         // #i74769#, #i75172#
-        sal_Bool    IsPaintBuffer_Calc() const;
-        sal_Bool    IsPaintBuffer_Writer() const;
-        sal_Bool    IsPaintBuffer_DrawImpress() const;
-        void        SetPaintBuffer_Calc( sal_Bool bState );
-        void        SetPaintBuffer_Writer( sal_Bool bState );
-        void        SetPaintBuffer_DrawImpress( sal_Bool bState );
+        sal_Bool	IsPaintBuffer_Calc() const;
+        sal_Bool	IsPaintBuffer_Writer() const;
+        sal_Bool	IsPaintBuffer_DrawImpress() const;
+        void		SetPaintBuffer_Calc( sal_Bool bState );
+        void		SetPaintBuffer_Writer( sal_Bool bState );
+        void		SetPaintBuffer_DrawImpress( sal_Bool bState );
 
         // #i4219#
         sal_uInt32 GetMaximumPaperWidth() const;
@@ -157,7 +157,7 @@ class SVT_DLLPUBLIC SvtOptionsDrawinglayer
         sal_uInt32 GetMaximumPaperRightMargin() const;
         sal_uInt32 GetMaximumPaperTopMargin() const;
         sal_uInt32 GetMaximumPaperBottomMargin() const;
-
+        
         void SetMaximumPaperWidth(sal_uInt32 nNew);
         void SetMaximumPaperHeight(sal_uInt32 nNew);
         void SetMaximumPaperLeftMargin(sal_uInt32 nNew);
@@ -165,59 +165,59 @@ class SVT_DLLPUBLIC SvtOptionsDrawinglayer
         void SetMaximumPaperTopMargin(sal_uInt32 nNew);
         void SetMaximumPaperBottomMargin(sal_uInt32 nNew);
 
-        // #i95644# helper to check if AA is allowed on this system. Currently, for WIN its disabled
-        // and OutDevSupport_TransparentRect is checked (this  hits XRenderExtension, e.g.
+        // #i95644# helper to check if AA is allowed on this system. Currently, for WIN its disabled 
+        // and OutDevSupport_TransparentRect is checked (this  hits XRenderExtension, e.g. 
         // currently for SunRay as long as not supported there)
         sal_Bool IsAAPossibleOnThisSystem() const;
 
         // primitives
-        sal_Bool    IsAntiAliasing() const;
-        sal_Bool    IsSnapHorVerLinesToDiscrete() const;
-        sal_Bool    IsSolidDragCreate() const;
-        sal_Bool    IsRenderDecoratedTextDirect() const;
-        sal_Bool    IsRenderSimpleTextDirect() const;
+        sal_Bool	IsAntiAliasing() const;
+        sal_Bool	IsSnapHorVerLinesToDiscrete() const;
+        sal_Bool	IsSolidDragCreate() const;
+        sal_Bool	IsRenderDecoratedTextDirect() const;
+        sal_Bool	IsRenderSimpleTextDirect() const;
         sal_uInt32  GetQuadratic3DRenderLimit() const;
         sal_uInt32  GetQuadraticFormControlRenderLimit() const;
 
-        void        SetAntiAliasing( sal_Bool bState );
-        void        SetSnapHorVerLinesToDiscrete( sal_Bool bState );
-        void        SetSolidDragCreate( sal_Bool bState );
-        void        SetRenderDecoratedTextDirect( sal_Bool bState );
-        void        SetRenderSimpleTextDirect( sal_Bool bState );
+        void		SetAntiAliasing( sal_Bool bState );
+        void		SetSnapHorVerLinesToDiscrete( sal_Bool bState );
+        void		SetSolidDragCreate( sal_Bool bState );
+        void		SetRenderDecoratedTextDirect( sal_Bool bState );
+        void		SetRenderSimpleTextDirect( sal_Bool bState );
            void        SetQuadratic3DRenderLimit(sal_uInt32 nNew);
            void        SetQuadraticFormControlRenderLimit(sal_uInt32 nNew);
 
         // #i97672# selection settings
-        sal_Bool    IsTransparentSelection() const;
-        sal_uInt16  GetTransparentSelectionPercent() const;
-        sal_uInt16  GetSelectionMaximumLuminancePercent() const;
+        sal_Bool	IsTransparentSelection() const;
+        sal_uInt16	GetTransparentSelectionPercent() const;
+        sal_uInt16	GetSelectionMaximumLuminancePercent() const;
 
-        void        SetTransparentSelection( sal_Bool bState );
-        void        SetTransparentSelectionPercent( sal_uInt16 nPercent );
-        void        SetSelectionMaximumLuminancePercent( sal_uInt16 nPercent );
+        void		SetTransparentSelection( sal_Bool bState );
+        void		SetTransparentSelectionPercent( sal_uInt16 nPercent );
+        void		SetSelectionMaximumLuminancePercent( sal_uInt16 nPercent );
 
     //-------------------------------------------------------------------------------------------------------------
-    //  private methods
+    //	private methods
     //-------------------------------------------------------------------------------------------------------------
 
     private:
 
         /*-****************************************************************************************************//**
-            @short      return a reference to a static mutex
-            @descr      These class use his own static mutex to be threadsafe.
+            @short		return a reference to a static mutex
+            @descr		These class use his own static mutex to be threadsafe.
                         We create a static mutex only for one ime and use at different times.
 
-            @seealso    -
+            @seealso	-
 
-            @param      -
-            @return     A reference to a static mutex member.
+            @param		-
+            @return		A reference to a static mutex member.
 
-            @onerror    -
+            @onerror	-
         *//*-*****************************************************************************************************/
         SVT_DLLPRIVATE static ::osl::Mutex& GetOwnStaticMutex();
 
     //-------------------------------------------------------------------------------------------------------------
-    //  private member
+    //	private member
     //-------------------------------------------------------------------------------------------------------------
 
     private:
@@ -230,9 +230,9 @@ class SVT_DLLPUBLIC SvtOptionsDrawinglayer
             Do it in your source only.
          */
 
-        static SvtOptionsDrawinglayer_Impl*     m_pDataContainer    ;   /// impl. data container as dynamic pointer for smaller memory requirements!
-        static sal_Int32                        m_nRefCount         ;   /// internal ref count mechanism
+        static SvtOptionsDrawinglayer_Impl*		m_pDataContainer	;	/// impl. data container as dynamic pointer for smaller memory requirements!
+        static sal_Int32						m_nRefCount			;	/// internal ref count mechanism
 
-};      // class SvtOptionsDrawinglayer
+};		// class SvtOptionsDrawinglayer
 
-#endif  // #ifndef INCLUDED_SVTOOLS_OPTIONSDRAWINGLAYER_HXX
+#endif	// #ifndef INCLUDED_SVTOOLS_OPTIONSDRAWINGLAYER_HXX
diff --git a/svtools/inc/svtools/parhtml.hxx b/svtools/inc/svtools/parhtml.hxx
index a302b40d9d4b..28e4dd95e16e 100644
--- a/svtools/inc/svtools/parhtml.hxx
+++ b/svtools/inc/svtools/parhtml.hxx
@@ -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
@@ -62,18 +62,18 @@ enum HTMLTableRules { HTML_TR_NONE, HTML_TR_GROUPS, HTML_TR_ROWS,
 
 enum HTMLInputType
 {
-    HTML_IT_TEXT =      0x01,
-    HTML_IT_PASSWORD =  0x02,
-    HTML_IT_CHECKBOX =  0x03,
-    HTML_IT_RADIO =     0x04,
-    HTML_IT_RANGE =     0x05,
-    HTML_IT_SCRIBBLE =  0x06,
-    HTML_IT_FILE =      0x07,
-    HTML_IT_HIDDEN =    0x08,
-    HTML_IT_SUBMIT =    0x09,
-    HTML_IT_IMAGE =     0x0a,
-    HTML_IT_RESET =     0x0b,
-    HTML_IT_BUTTON =    0x0c
+    HTML_IT_TEXT =		0x01,
+    HTML_IT_PASSWORD =	0x02,
+    HTML_IT_CHECKBOX =	0x03,
+    HTML_IT_RADIO =		0x04,
+    HTML_IT_RANGE =		0x05,
+    HTML_IT_SCRIBBLE =	0x06,
+    HTML_IT_FILE =		0x07,
+    HTML_IT_HIDDEN =	0x08,
+    HTML_IT_SUBMIT =	0x09,
+    HTML_IT_IMAGE =		0x0a,
+    HTML_IT_RESET =		0x0b,
+    HTML_IT_BUTTON = 	0x0c
 };
 
 enum HTMLScriptLanguage
@@ -85,8 +85,8 @@ enum HTMLScriptLanguage
 
 struct HTMLOptionEnum
 {
-    const sal_Char *pName;  // Wert einer HTML-Option
-    sal_uInt16 nValue;      // und der dazugehoerige Wert eines Enums
+    const sal_Char *pName;	// Wert einer HTML-Option
+    sal_uInt16 nValue;		// und der dazugehoerige Wert eines Enums
 };
 
 // Repraesentation einer HTML-Option (=Atrribut in einem Start-Tag)
@@ -96,26 +96,26 @@ struct HTMLOptionEnum
 
 class SVT_DLLPUBLIC HTMLOption
 {
-    String aValue;          // der Wert der Option (immer als String)
-    String aToken;          // der Name der Option als String
-    sal_uInt16 nToken;          // und das entsprechende Token
+    String aValue;			// der Wert der Option (immer als String)
+    String aToken;			// der Name der Option als String
+    sal_uInt16 nToken;			// und das entsprechende Token
 
 public:
 
     HTMLOption( sal_uInt16 nTyp, const String& rToken, const String& rValue );
 
     // der Name der Option ...
-    sal_uInt16 GetToken() const { return nToken; }  // ... als Enum
+    sal_uInt16 GetToken() const { return nToken; }	// ... als Enum
     const String& GetTokenString() const { return aToken; } // ... als String
 
     // der Wert der Option ...
-    const String& GetString() const { return aValue; }  // ... als String
+    const String& GetString() const { return aValue; }	// ... als String
 
-    sal_uInt32 GetNumber() const;                           // ... als Zahl
-    sal_Int32 GetSNumber() const;                           // ... als Zahl
-    void GetNumbers( SvULongs &rLongs,                  // ... als Zahlen
+    sal_uInt32 GetNumber() const;                          	// ... als Zahl
+    sal_Int32 GetSNumber() const;                          	// ... als Zahl
+    void GetNumbers( SvULongs &rLongs, 					// ... als Zahlen
                      sal_Bool bSpaceDelim=sal_False ) const;
-    void GetColor( Color& ) const;                      // ... als Farbe
+    void GetColor( Color& ) const;						// ... als Farbe
 
     // ... als Enum pOptEnums ist ein HTMLOptionEnum-Array
     sal_uInt16 GetEnum( const HTMLOptionEnum *pOptEnums,
@@ -123,10 +123,10 @@ public:
     BOOL GetEnum( sal_uInt16 &rEnum, const HTMLOptionEnum *pOptEnums ) const;
 
     // ... und als ein par spezielle Enums
-    HTMLInputType GetInputType() const;                 // <INPUT TYPE=...>
-    HTMLTableFrame GetTableFrame() const;               // <TABLE FRAME=...>
-    HTMLTableRules GetTableRules() const;               // <TABLE RULES=...>
-    //SvxAdjust GetAdjust() const;                      // <P,TH,TD ALIGN=>
+    HTMLInputType GetInputType() const;				   	// <INPUT TYPE=...>
+    HTMLTableFrame GetTableFrame() const;				// <TABLE FRAME=...>
+    HTMLTableRules GetTableRules() const;				// <TABLE RULES=...>
+    //SvxAdjust GetAdjust() const;						// <P,TH,TD ALIGN=>
 };
 
 typedef HTMLOption* HTMLOptionPtr;
@@ -134,28 +134,28 @@ SV_DECL_PTRARR(HTMLOptions,HTMLOptionPtr,16,16)
 
 class SVT_DLLPUBLIC HTMLParser : public SvParser
 {
-    BOOL bNewDoc        : 1;        // neues Doc lesen ?
-    BOOL bIsInHeader    : 1;        // scanne Header-Bereich
-    BOOL bIsInBody      : 1;        // scanne Body-Bereich
-    BOOL bReadListing   : 1;        // Lese Listings
-    BOOL bReadXMP       : 1;        // Lese XMP
-    BOOL bReadPRE       : 1;        // Lese preformatted Text
-    BOOL bReadTextArea  : 1;        // Lese TEXTAREA
-    BOOL bReadScript    : 1;        // Lesen von <SCRIPT>
-    BOOL bReadStyle     : 1;        // Lesen von <STYLE>
-    BOOL bEndTokenFound : 1;        // </SCRIPT> oder </STYLE> gefunden
-
-    BOOL bPre_IgnoreNewPara : 1;    // Flags fuers lesen von PRE-Absaetzen
-    BOOL bReadNextChar : 1;         // TRUE: NextChar nochmals lesen (JavaScript!)
-    BOOL bReadComment : 1;          // TRUE: NextChar nochmals lesen (JavaScript!)
-
-    sal_uInt32 nPre_LinePos;            // Pos in der Line im PRE-Tag
-
-    HTMLOptions *pOptions;          // die Optionen des Start-Tags
+    BOOL bNewDoc 		: 1;		// neues Doc lesen ?
+    BOOL bIsInHeader 	: 1;		// scanne Header-Bereich
+    BOOL bIsInBody 		: 1;		// scanne Body-Bereich
+    BOOL bReadListing	: 1;		// Lese Listings
+    BOOL bReadXMP		: 1;		// Lese XMP
+    BOOL bReadPRE		: 1;		// Lese preformatted Text
+    BOOL bReadTextArea	: 1;		// Lese TEXTAREA
+    BOOL bReadScript	: 1;		// Lesen von <SCRIPT>
+    BOOL bReadStyle		: 1;		// Lesen von <STYLE>
+    BOOL bEndTokenFound : 1;		// </SCRIPT> oder </STYLE> gefunden
+
+    BOOL bPre_IgnoreNewPara : 1;	// Flags fuers lesen von PRE-Absaetzen
+    BOOL bReadNextChar : 1;			// TRUE: NextChar nochmals lesen (JavaScript!)
+    BOOL bReadComment : 1;			// TRUE: NextChar nochmals lesen (JavaScript!)
+
+    sal_uInt32 nPre_LinePos;			// Pos in der Line im PRE-Tag
+
+    HTMLOptions *pOptions;			// die Optionen des Start-Tags
     String aEndToken;
 
 protected:
-    String sSaveToken;              // das gelesene Tag als String
+    String sSaveToken;				// das gelesene Tag als String
 
     int ScanText( const sal_Unicode cBreak = 0U );
 
@@ -173,17 +173,17 @@ public:
 
     virtual SvParserState CallParser();   // Aufruf des Parsers
 
-    BOOL IsNewDoc() const       { return bNewDoc; }
-    BOOL IsInHeader() const     { return bIsInHeader; }
-    BOOL IsInBody() const       { return bIsInBody; }
-    BOOL IsValidSyntax() const  { return TRUE; }
-    BOOL IsReadListing() const  { return bReadListing; }
-    BOOL IsReadXMP() const      { return bReadXMP; }
-    BOOL IsReadPRE() const      { return bReadPRE; }
-    BOOL IsReadScript() const   { return bReadScript; }
-    BOOL IsReadStyle() const    { return bReadStyle; }
+    BOOL IsNewDoc() const 		{ return bNewDoc; }
+    BOOL IsInHeader() const 	{ return bIsInHeader; }
+    BOOL IsInBody() const 		{ return bIsInBody; }
+    BOOL IsValidSyntax() const 	{ return TRUE; }
+    BOOL IsReadListing() const 	{ return bReadListing; }
+    BOOL IsReadXMP() const 		{ return bReadXMP; }
+    BOOL IsReadPRE() const 		{ return bReadPRE; }
+    BOOL IsReadScript() const 	{ return bReadScript; }
+    BOOL IsReadStyle() const 	{ return bReadStyle; }
 
-    void SetReadNextChar()      { bReadNextChar = TRUE; }
+    void SetReadNextChar() 		{ bReadNextChar = TRUE; }
 
     // PRE-/LISTING oder XMP-Modus starten/beenden oder Tags entsprechend
     // filtern
@@ -225,8 +225,8 @@ public:
     const HTMLOptions *GetOptions( sal_uInt16 *pNoConvertToken=0 ) const;
 
     // fuers asynchrone lesen aus dem SvStream
-//  virtual void SaveState( int nToken );
-//  virtual void RestoreState();
+//	virtual void SaveState( int nToken );
+//	virtual void RestoreState();
     virtual void Continue( int nToken );
 
 
diff --git a/svtools/inc/svtools/parrtf.hxx b/svtools/inc/svtools/parrtf.hxx
index 179f5a28259a..a7b4b2e3f973 100644
--- a/svtools/inc/svtools/parrtf.hxx
+++ b/svtools/inc/svtools/parrtf.hxx
@@ -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
@@ -69,11 +69,11 @@ protected:
 
     virtual ~SvRTFParser();
 
-    rtl_TextEncoding GetCodeSet() const             { return eCodeSet; }
+    rtl_TextEncoding GetCodeSet() const 			{ return eCodeSet; }
     void SetEncoding( rtl_TextEncoding eEnc );
 
-    rtl_TextEncoding GetUNICodeSet() const          { return eUNICodeSet; }
-    void SetUNICodeSet( rtl_TextEncoding eSet )     { eUNICodeSet = eSet; }
+    rtl_TextEncoding GetUNICodeSet() const 			{ return eUNICodeSet; }
+    void SetUNICodeSet( rtl_TextEncoding eSet )		{ eUNICodeSet = eSet; }
 
 public:
     SvRTFParser( SvStream& rIn, BYTE nStackSize = 3 );
@@ -83,8 +83,8 @@ public:
     int GetOpenBrakets() const { return nOpenBrakets; }
 
     // fuers asynchrone lesen aus dem SvStream
-//  virtual void SaveState( int nToken );
-//  virtual void RestoreState();
+//	virtual void SaveState( int nToken );
+//	virtual void RestoreState();
     virtual void Continue( int nToken );
 };
 
diff --git a/svtools/inc/svtools/popupmenucontrollerbase.hxx b/svtools/inc/svtools/popupmenucontrollerbase.hxx
index b062234a512e..f13272c407e3 100644
--- a/svtools/inc/svtools/popupmenucontrollerbase.hxx
+++ b/svtools/inc/svtools/popupmenucontrollerbase.hxx
@@ -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
@@ -31,7 +31,7 @@
 #include "svtools/svtdllapi.h"
 
 //_________________________________________________________________________________________________________________
-//  interface includes
+//	interface includes
 //_________________________________________________________________________________________________________________
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <com/sun/star/lang/XTypeProvider.hpp>
@@ -46,7 +46,7 @@
 #include <com/sun/star/uri/XUriReference.hpp>
 #include <com/sun/star/util/XURLTransformer.hpp>
 //_________________________________________________________________________________________________________________
-//  includes of other projects
+//	includes of other projects
 //_________________________________________________________________________________________________________________
 #include <toolkit/awt/vclxmenu.hxx>
 #include <cppuhelper/compbase7.hxx>
@@ -58,8 +58,8 @@ namespace svt
 {
     struct PopupMenuControllerBaseDispatchInfo;
 
-    typedef ::cppu::WeakComponentImplHelper7<
-                        com::sun::star::lang::XServiceInfo            ,
+    typedef ::cppu::WeakComponentImplHelper7< 
+                        com::sun::star::lang::XServiceInfo		      ,
                         com::sun::star::frame::XPopupMenuController ,
                         com::sun::star::lang::XInitialization         ,
                         com::sun::star::frame::XStatusListener        ,
@@ -67,7 +67,7 @@ namespace svt
                         com::sun::star::frame::XDispatchProvider      ,
                         com::sun::star::frame::XDispatch > PopupMenuControllerBaseType;
 
-    class SVT_DLLPUBLIC PopupMenuControllerBase : protected ::comphelper::OBaseMutex,   // Struct for right initalization of mutex member! Must be first of baseclasses.
+    class SVT_DLLPUBLIC PopupMenuControllerBase : protected ::comphelper::OBaseMutex,	// Struct for right initalization of mutex member! Must be first of baseclasses.
                                                   public PopupMenuControllerBaseType
     {
         public:
@@ -78,14 +78,14 @@ namespace svt
             virtual ::rtl::OUString SAL_CALL getImplementationName(  ) throw (::com::sun::star::uno::RuntimeException) = 0;
             virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException);
             virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames(  ) throw (::com::sun::star::uno::RuntimeException) = 0;
-
+            
             // XPopupMenuController
             virtual void SAL_CALL setPopupMenu( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XPopupMenu >& PopupMenu ) throw (::com::sun::star::uno::RuntimeException);
             virtual void SAL_CALL updatePopupMenu() throw (::com::sun::star::uno::RuntimeException);
 
             // XInitialization
             virtual void SAL_CALL initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments ) throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException);
-
+            
             // XStatusListener
             virtual void SAL_CALL statusChanged( const ::com::sun::star::frame::FeatureStateEvent& Event ) throw ( ::com::sun::star::uno::RuntimeException ) = 0;
 
@@ -100,13 +100,13 @@ namespace svt
             virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch > > SAL_CALL queryDispatches( const ::com::sun::star::uno::Sequence< ::com::sun::star::frame::DispatchDescriptor >& lDescriptor ) throw( ::com::sun::star::uno::RuntimeException );
 
             // XDispatch
-            virtual void SAL_CALL dispatch( const ::com::sun::star::util::URL& aURL, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& seqProperties ) throw( ::com::sun::star::uno::RuntimeException );
+            virtual void SAL_CALL dispatch(	const ::com::sun::star::util::URL& aURL, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& seqProperties ) throw( ::com::sun::star::uno::RuntimeException );
             virtual void SAL_CALL addStatusListener( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XStatusListener >& xControl, const ::com::sun::star::util::URL& aURL ) throw( ::com::sun::star::uno::RuntimeException );
-            virtual void SAL_CALL removeStatusListener( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XStatusListener >& xControl, const ::com::sun::star::util::URL& aURL ) throw( ::com::sun::star::uno::RuntimeException );
-
+            virtual void SAL_CALL removeStatusListener(	const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XStatusListener >& xControl, const ::com::sun::star::util::URL& aURL ) throw( ::com::sun::star::uno::RuntimeException );
+            
             // XEventListener
             virtual void SAL_CALL disposing( const com::sun::star::lang::EventObject& Source ) throw ( ::com::sun::star::uno::RuntimeException );
-
+        
             void dispatchCommand( const ::rtl::OUString& sCommandURL, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& rArgs );
 
     protected:
diff --git a/svtools/inc/svtools/popupwindowcontroller.hxx b/svtools/inc/svtools/popupwindowcontroller.hxx
index 4877d0184318..6270356392cc 100644
--- a/svtools/inc/svtools/popupwindowcontroller.hxx
+++ b/svtools/inc/svtools/popupwindowcontroller.hxx
@@ -60,7 +60,7 @@ public:
     virtual ::rtl::OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException ) = 0;
     virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw( ::com::sun::star::uno::RuntimeException );
     virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException ) = 0;
-
+   
     // XInitialization
     virtual void SAL_CALL initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments ) throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException);
 
@@ -77,7 +77,7 @@ public:
     virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow > SAL_CALL createPopupWindow() throw (::com::sun::star::uno::RuntimeException);
     virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow > SAL_CALL createItemWindow( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow >& Parent ) throw (::com::sun::star::uno::RuntimeException);
 private:
-    boost::scoped_ptr< PopupWindowControllerImpl >  mpImpl;
+    boost::scoped_ptr< PopupWindowControllerImpl >	mpImpl;
 };
 
 } // namespace svt
diff --git a/svtools/inc/svtools/printdlg.hxx b/svtools/inc/svtools/printdlg.hxx
index 8c455b910b41..b4ac79a7fe49 100644
--- a/svtools/inc/svtools/printdlg.hxx
+++ b/svtools/inc/svtools/printdlg.hxx
@@ -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,24 +79,24 @@ enum PrintSheetRange
 class SVT_DLLPUBLIC PrintDialog : public ModalDialog
 {
 private:
-    FixedLine           maFlPrinter;
-    FixedText           maFtName;
-    ListBox             maLbName;
-    PushButton          maBtnProperties;
-    FixedText           maFtStatus;
-    FixedInfo           maFiStatus;
-    FixedText           maFtType;
-    FixedInfo           maFiType;
-    FixedText           maFtLocation;
-    FixedInfo           maFiLocation;
-    FixedText           maFtComment;
-    FixedInfo           maFiComment;
+    FixedLine			maFlPrinter;
+    FixedText			maFtName;
+    ListBox 			maLbName;
+    PushButton			maBtnProperties;
+    FixedText			maFtStatus;
+    FixedInfo			maFiStatus;
+    FixedText			maFtType;
+    FixedInfo			maFiType;
+    FixedText			maFtLocation;
+    FixedInfo			maFiLocation;
+    FixedText			maFtComment;
+    FixedInfo			maFiComment;
 
     // "Print to file" or "Fax number"
     CheckBox            maCbxFilePrint;
-    FixedInfo           maFiPrintFile;
-    FixedText           maFiFaxNo;
-    Edit                maEdtFaxNo;
+    FixedInfo			maFiPrintFile;
+    FixedText			maFiFaxNo;
+    Edit				maEdtFaxNo;
     //PushButton         maBtnBrowse_nomore;
 
     // "Print"
@@ -107,8 +107,8 @@ private:
 
     // "Print range"
     FixedLine           maFlPrintRange;
-    RadioButton         maRbtAll;
-    RadioButton         maRbtPages;
+    RadioButton 		maRbtAll;
+    RadioButton 		maRbtPages;
     RadioButton         maRbtSelection;
     Edit                maEdtPages;
 
@@ -116,41 +116,41 @@ private:
 
     // "Copies"
     FixedLine           maFlCopies;
-    FixedText           maFtCopies;
-    NumericField        maNumCopies;
-    FixedImage          maImgCollate;
-    FixedImage          maImgNotCollate;
-    CheckBox            maCbxCollate;
+    FixedText			maFtCopies;
+    NumericField		maNumCopies;
+    FixedImage			maImgCollate;
+    FixedImage			maImgNotCollate;
+    CheckBox			maCbxCollate;
 
     FixedLine           maFlSepButtonLine;
     PushButton          maBtnOptions;
-    OKButton            maBtnOK;
-    CancelButton        maBtnCancel;
-    HelpButton          maBtnHelp;
+    OKButton			maBtnOK;
+    CancelButton		maBtnCancel;
+    HelpButton			maBtnHelp;
 
     AutoTimer           maStatusTimer;
-    Printer*            mpPrinter;
+    Printer*			mpPrinter;
     SvtPrinterImpl*     mpPrinterImpl;
 
-    XubString           maRangeText;
-    USHORT              mnCopyCount;
-    USHORT              mnFirstPage;
-    USHORT              mnLastPage;
-    USHORT              mnMinPage;
-    USHORT              mnMaxPage;
-    PrintDialogRange    meCheckRange;
-    BOOL                mbAll;
-    BOOL                mbSelection;
-    BOOL                mbFromTo;
-    BOOL                mbRange;
-    BOOL                mbCollate;
-    BOOL                mbCollateCheck;
-    BOOL                mbOptions;
+    XubString			maRangeText;
+    USHORT				mnCopyCount;
+    USHORT				mnFirstPage;
+    USHORT				mnLastPage;
+    USHORT				mnMinPage;
+    USHORT				mnMaxPage;
+    PrintDialogRange	meCheckRange;
+    BOOL				mbAll;
+    BOOL				mbSelection;
+    BOOL				mbFromTo;
+    BOOL				mbRange;
+    BOOL				mbCollate;
+    BOOL				mbCollateCheck;
+    BOOL				mbOptions;
     bool                mbWithSheetsAndCells;
-    Link                maOptionsHdlLink; // Link zum Options-Handler
-    Link                maOKHdlLink;      // Link zum OK-Handler
+    Link				maOptionsHdlLink; // Link zum Options-Handler
+    Link				maOKHdlLink;	  // Link zum OK-Handler
 
-    String              maAllFilterStr;
+    String				maAllFilterStr;
 
     SVT_DLLPRIVATE void     ImplCheckOK();
     SVT_DLLPRIVATE void     ImplInitControls();
@@ -168,11 +168,11 @@ public:
     PrintDialog( Window* pWindow, bool bWithSheetsAndCells );
     ~PrintDialog();
 
-    virtual long        OK();
-    virtual long        ClickOptionsHdl();
+    virtual long		OK();
+    virtual long		ClickOptionsHdl();
 
-    void                SetPrinter( Printer* pNewPrinter ) { mpPrinter = pNewPrinter; }
-    Printer*            GetPrinter() const { return mpPrinter; }
+    void				SetPrinter( Printer* pNewPrinter ) { mpPrinter = pNewPrinter; }
+    Printer*			GetPrinter() const { return mpPrinter; }
 
     inline bool         IsSheetRangeAvailable() const { return mbWithSheetsAndCells; }
     void                EnableSheetRange( bool bEnable, PrintSheetRange eRange );
@@ -182,53 +182,53 @@ public:
     bool                IsSheetRangeChecked( PrintSheetRange eRange ) const;
 
     void                EnableRange( PrintDialogRange eRange );
-    void                DisableRange( PrintDialogRange eRange );
-    BOOL                IsRangeEnabled( PrintDialogRange eRange ) const;
+    void				DisableRange( PrintDialogRange eRange );
+    BOOL				IsRangeEnabled( PrintDialogRange eRange ) const;
 
-    void                CheckRange( PrintDialogRange eRange = PRINTDIALOG_ALL )
+    void				CheckRange( PrintDialogRange eRange = PRINTDIALOG_ALL )
                             { meCheckRange = eRange; }
-    PrintDialogRange    GetCheckedRange() const { return meCheckRange; }
-    BOOL                IsRangeChecked( PrintDialogRange eRange ) const;
+    PrintDialogRange	GetCheckedRange() const { return meCheckRange; }
+    BOOL				IsRangeChecked( PrintDialogRange eRange ) const;
 
-    void                SetRangeText( const XubString& rRange ) { maRangeText = rRange; }
-    const XubString&    GetRangeText() const { return maRangeText; }
+    void				SetRangeText( const XubString& rRange ) { maRangeText = rRange; }
+    const XubString& 	GetRangeText() const { return maRangeText; }
 
-    void                SetFirstPage( USHORT nPage = 0 );
-    USHORT              GetFirstPage() const { return mnFirstPage; }
-    void                SetLastPage( USHORT nPage = 0 );
-    USHORT              GetLastPage() const { return mnLastPage; }
+    void				SetFirstPage( USHORT nPage = 0 );
+    USHORT				GetFirstPage() const { return mnFirstPage; }
+    void				SetLastPage( USHORT nPage = 0 );
+    USHORT				GetLastPage() const { return mnLastPage; }
 
-    void                SetMinPage( USHORT nPage = 1 ) { mnMinPage = nPage; }
-    USHORT              GetMinPage() const { return mnMinPage; }
-    void                SetMaxPage( USHORT nPage = 65535 ) { mnMaxPage = nPage; }
-    USHORT              GetMaxPage() const { return mnMaxPage; }
+    void				SetMinPage( USHORT nPage = 1 ) { mnMinPage = nPage; }
+    USHORT				GetMinPage() const { return mnMinPage; }
+    void				SetMaxPage( USHORT nPage = 65535 ) { mnMaxPage = nPage; }
+    USHORT				GetMaxPage() const { return mnMaxPage; }
 
-    void                SetCopyCount( USHORT nCopies = 1 ) { mnCopyCount = nCopies; }
-    USHORT              GetCopyCount() const { return mnCopyCount; }
+    void				SetCopyCount( USHORT nCopies = 1 ) { mnCopyCount = nCopies; }
+    USHORT				GetCopyCount() const { return mnCopyCount; }
 
-    void                EnableCollate( BOOL bEnable = TRUE )
+    void				EnableCollate( BOOL bEnable = TRUE )
                             { mbCollate = bEnable; }
-    BOOL                IsCollateEnabled() const { return mbCollate; }
-    void                CheckCollate( BOOL bCheck = TRUE )
+    BOOL				IsCollateEnabled() const { return mbCollate; }
+    void				CheckCollate( BOOL bCheck = TRUE )
                             { mbCollateCheck = bCheck; }
-    BOOL                IsCollateChecked() const { return mbCollateCheck; }
+    BOOL				IsCollateChecked() const { return mbCollateCheck; }
 
-    void                ShowOptionsButton( BOOL bShow = TRUE )
+    void				ShowOptionsButton( BOOL bShow = TRUE )
                             { mbOptions = bShow; }
-    BOOL                IsOptionsButtonVisible() const { return mbOptions; }
+    BOOL				IsOptionsButtonVisible() const { return mbOptions; }
 
-    void                SetOptionsHdl( const Link& rLink ) { maOptionsHdlLink = rLink; }
-    const Link&         GetOptionsHdl() const { return maOptionsHdlLink; }
+    void				SetOptionsHdl( const Link& rLink ) { maOptionsHdlLink = rLink; }
+    const Link& 		GetOptionsHdl() const { return maOptionsHdlLink; }
 
-    void                SetOKHdl( const Link& rLink ) { maOKHdlLink = rLink; }
-    const Link&         GetOKHdl() const { return maOKHdlLink; }
+    void				SetOKHdl( const Link& rLink ) { maOKHdlLink = rLink; }
+    const Link& 		GetOKHdl() const { return maOKHdlLink; }
 
-    virtual void        DataChanged( const DataChangedEvent& rDCEvt );
-    virtual long        Notify( NotifyEvent& rNEvt );
+    virtual void		DataChanged( const DataChangedEvent& rDCEvt );
+    virtual long		Notify( NotifyEvent& rNEvt );
 
-    virtual short       Execute();
+    virtual short		Execute();
 
-    void                DisableHelp();
+    void				DisableHelp();
 };
 
 inline void PrintDialog::EnableRange( PrintDialogRange eRange )
diff --git a/svtools/inc/svtools/printoptions.hxx b/svtools/inc/svtools/printoptions.hxx
index 5d95eb27949f..c217585162bd 100644
--- a/svtools/inc/svtools/printoptions.hxx
+++ b/svtools/inc/svtools/printoptions.hxx
@@ -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
@@ -59,18 +59,18 @@ public:
                 SvtBasePrintOptions();
                 virtual ~SvtBasePrintOptions();
 
-    sal_Bool    IsReduceTransparency() const;
+    sal_Bool	IsReduceTransparency() const;
     sal_Int16   GetReducedTransparencyMode() const;
-    sal_Bool    IsReduceGradients() const;
+    sal_Bool	IsReduceGradients() const;
     sal_Int16   GetReducedGradientMode() const;
     sal_Int16   GetReducedGradientStepCount() const;
-    sal_Bool    IsReduceBitmaps() const;
+    sal_Bool	IsReduceBitmaps() const;
     sal_Int16   GetReducedBitmapMode() const;
     sal_Int16   GetReducedBitmapResolution() const;
-    sal_Bool    IsReducedBitmapIncludesTransparency() const;
-       sal_Bool IsConvertToGreyscales() const;
+    sal_Bool	IsReducedBitmapIncludesTransparency() const;
+       sal_Bool	IsConvertToGreyscales() const;
 
-    void        SetReduceTransparency( sal_Bool bState );
+    void        SetReduceTransparency( sal_Bool	bState );
     void        SetReducedTransparencyMode( sal_Int16 nMode );
     void        SetReduceGradients( sal_Bool bState );
     void        SetReducedGradientMode( sal_Int16 nMode );
@@ -95,8 +95,8 @@ class SVT_DLLPUBLIC SvtPrinterOptions : public SvtBasePrintOptions
 {
 private:
 
-    static SvtPrintOptions_Impl*    m_pStaticDataContainer; /// impl. data container as dynamic pointer for smaller memory requirements!
-    static sal_Int32                m_nRefCount;            /// internal ref count mechanism
+    static SvtPrintOptions_Impl*    m_pStaticDataContainer;	/// impl. data container as dynamic pointer for smaller memory requirements!
+    static sal_Int32			    m_nRefCount;	        /// internal ref count mechanism
 
 public:
 
@@ -112,8 +112,8 @@ class SVT_DLLPUBLIC SvtPrintFileOptions : public SvtBasePrintOptions
 {
 private:
 
-    static SvtPrintOptions_Impl*    m_pStaticDataContainer; /// impl. data container as dynamic pointer for smaller memory requirements!
-    static sal_Int32                m_nRefCount;            /// internal ref count mechanism
+    static SvtPrintOptions_Impl*    m_pStaticDataContainer;	/// impl. data container as dynamic pointer for smaller memory requirements!
+    static sal_Int32			    m_nRefCount;	        /// internal ref count mechanism
 
 public:
 
diff --git a/svtools/inc/svtools/prnsetup.hxx b/svtools/inc/svtools/prnsetup.hxx
index 8e1ced9ed1a0..87bdf30c01c0 100644
--- a/svtools/inc/svtools/prnsetup.hxx
+++ b/svtools/inc/svtools/prnsetup.hxx
@@ -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
@@ -60,28 +60,28 @@ class QueueInfo;
 class SVT_DLLPUBLIC PrinterSetupDialog : public ModalDialog
 {
 private:
-    FixedLine       maFlPrinter;
-    FixedText       maFtName;
-    ListBox         maLbName;
-    PushButton      maBtnProperties;
+    FixedLine		maFlPrinter;
+    FixedText		maFtName;
+    ListBox 		maLbName;
+    PushButton		maBtnProperties;
     PushButton      maBtnOptions;
-    FixedText       maFtStatus;
-    FixedInfo       maFiStatus;
-    FixedText       maFtType;
-    FixedInfo       maFiType;
-    FixedText       maFtLocation;
-    FixedInfo       maFiLocation;
-    FixedText       maFtComment;
-    FixedInfo       maFiComment;
-    FixedLine       maFlSepButton;
-    OKButton        maBtnOK;
-    CancelButton    maBtnCancel;
-    HelpButton      maBtnHelp;
-    AutoTimer       maStatusTimer;
-    Printer*        mpPrinter;
-    Printer*        mpTempPrinter;
-
-    SVT_DLLPRIVATE void         ImplSetInfo();
+    FixedText		maFtStatus;
+    FixedInfo		maFiStatus;
+    FixedText		maFtType;
+    FixedInfo		maFiType;
+    FixedText		maFtLocation;
+    FixedInfo		maFiLocation;
+    FixedText		maFtComment;
+    FixedInfo		maFiComment;
+    FixedLine		maFlSepButton;
+    OKButton		maBtnOK;
+    CancelButton	maBtnCancel;
+    HelpButton		maBtnHelp;
+    AutoTimer		maStatusTimer;
+    Printer*		mpPrinter;
+    Printer*		mpTempPrinter;
+
+    SVT_DLLPRIVATE void			ImplSetInfo();
 
                     DECL_DLLPRIVATE_LINK( ImplPropertiesHdl, void* );
                     DECL_DLLPRIVATE_LINK( ImplOptionsHdl, void* );
@@ -92,23 +92,23 @@ public:
                     PrinterSetupDialog( Window* pWindow );
                     ~PrinterSetupDialog();
 
-    void            SetPrinter( Printer* pNewPrinter ) { mpPrinter = pNewPrinter; }
-    Printer*        GetPrinter() const { return mpPrinter; }
+    void			SetPrinter( Printer* pNewPrinter ) { mpPrinter = pNewPrinter; }
+    Printer*		GetPrinter() const { return mpPrinter; }
 
-    virtual void    DataChanged( const DataChangedEvent& rDCEvt );
-    virtual long    Notify( NotifyEvent& rNEvt );
+    virtual void	DataChanged( const DataChangedEvent& rDCEvt );
+    virtual long	Notify( NotifyEvent& rNEvt );
 
-    virtual short   Execute();
+    virtual short	Execute();
 
-    void                SetOptionsHdl( const Link& rLink );
-    const Link&         GetOptionsHdl() const;
+    void				SetOptionsHdl( const Link& rLink );
+    const Link& 		GetOptionsHdl() const;
 };
 
 // --------------------------------------
 // - Hilfsfunktionen fuer Print-Dialoge -
 // --------------------------------------
 
-#define IMPL_PRINTDLG_STATUS_UPDATE     15000
+#define IMPL_PRINTDLG_STATUS_UPDATE 	15000
 
 void ImplFillPrnDlgListBox( const Printer* pPrinter,
                             ListBox* pBox, PushButton* pPropBtn );
diff --git a/svtools/inc/svtools/roadmapwizard.hxx b/svtools/inc/svtools/roadmapwizard.hxx
index 5d8e0d9b01bb..41c39a95a6d2 100644
--- a/svtools/inc/svtools/roadmapwizard.hxx
+++ b/svtools/inc/svtools/roadmapwizard.hxx
@@ -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
@@ -87,8 +87,8 @@ namespace svt
         );
         ~RoadmapWizard( );
 
-        void            SetRoadmapBitmap( const BitmapEx& _rBitmap );
-        const BitmapEx& GetRoadmapBitmap( ) const;
+        void			SetRoadmapBitmap( const BitmapEx& _rBitmap );
+        const BitmapEx&	GetRoadmapBitmap( ) const;
 
         void            SetRoadmapSmartHelpId( const SmartId& _rId, SmartIdUpdateMode _aMode = SMART_SET_SMART );
         SmartId         GetRoadmapSmartHelpId() const;
@@ -96,7 +96,7 @@ namespace svt
         void            SetRoadmapInteractive( sal_Bool _bInteractive );
         sal_Bool        IsRoadmapInteractive();
         virtual void    Resize();
-        virtual void    StateChanged( StateChangedType nStateChange );
+        virtual void	StateChanged( StateChangedType nStateChange );
 
         // returns whether a given state is enabled
         bool            isStateEnabled( WizardState _nState ) const;
@@ -223,7 +223,7 @@ protected:
             This member is inherited from OWizardMachine, and default-implemented in this class
             for all states which have been described using describeState.
         */
-        virtual TabPage*    createPage( WizardState _nState );
+        virtual TabPage*	createPage( WizardState _nState );
 
         /** asks for a new label of the wizard page
 
diff --git a/svtools/inc/svtools/stdctrl.hxx b/svtools/inc/svtools/stdctrl.hxx
index 4c0b794f78e3..e3210ac671d5 100644
--- a/svtools/inc/svtools/stdctrl.hxx
+++ b/svtools/inc/svtools/stdctrl.hxx
@@ -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
diff --git a/svtools/inc/svtools/stringtransfer.hxx b/svtools/inc/svtools/stringtransfer.hxx
index 9cfe75418a12..d7773e86bcb0 100644
--- a/svtools/inc/svtools/stringtransfer.hxx
+++ b/svtools/inc/svtools/stringtransfer.hxx
@@ -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
@@ -42,15 +42,15 @@ namespace svt
     class SVT_DLLPUBLIC OStringTransferable : public TransferableHelper
     {
     protected:
-        ::rtl::OUString     m_sContent;
+        ::rtl::OUString		m_sContent;
 
     public:
         OStringTransferable(const ::rtl::OUString& _rContent);
 
     protected:
         // TransferableHelper overridables
-        virtual void                AddSupportedFormats();
-        virtual sal_Bool            GetData( const ::com::sun::star::datatransfer::DataFlavor& _rFlavor );
+        virtual void				AddSupportedFormats();
+        virtual sal_Bool			GetData( const ::com::sun::star::datatransfer::DataFlavor& _rFlavor );
     };
 
     //====================================================================
@@ -63,20 +63,20 @@ namespace svt
             <p>Beware: In opposite to the old DragServer::CopyString, this method does not <em>add</em> the string
             to the clipboard, instead the old clipboard content is <em>replaced</em>!</p>
         */
-        SVT_DLLPUBLIC static void           CopyString( const ::rtl::OUString& _rContent, Window* _pWindow = NULL );
+        SVT_DLLPUBLIC static void			CopyString( const ::rtl::OUString& _rContent, Window* _pWindow = NULL );
 
         /** extracts a string from the system clipboard given
             @return <TRUE/> if the extraction was successfull, i.e. if the clipboard contained a string content
         */
-        SVT_DLLPUBLIC static sal_Bool       PasteString( ::rtl::OUString& _rContent, Window* _pWindow = NULL );
+        SVT_DLLPUBLIC static sal_Bool		PasteString( ::rtl::OUString& _rContent, Window* _pWindow = NULL );
 
         /** starts dragging a simple string
         */
-        SVT_DLLPUBLIC static void           StartStringDrag( const ::rtl::OUString& _rContent, Window* _pWindow, sal_Int8 _nDragSourceActions );
+        SVT_DLLPUBLIC static void			StartStringDrag( const ::rtl::OUString& _rContent, Window* _pWindow, sal_Int8 _nDragSourceActions );
     };
 
 //........................................................................
-}   // namespace svt
+}	// namespace svt
 //........................................................................
 
 #endif // _SVTOOLS_STRINGTRANSFER_HXX_
diff --git a/svtools/inc/svtools/svicnvw.hxx b/svtools/inc/svtools/svicnvw.hxx
index ac15f0b55be6..790ecf2db53f 100644
--- a/svtools/inc/svtools/svicnvw.hxx
+++ b/svtools/inc/svtools/svicnvw.hxx
@@ -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
@@ -40,43 +40,43 @@ class SvLBoxString;
 class SvLBoxContextBmp;
 class SvPtrarr;
 
-#define WB_ICON         0x0001
-#define WB_NAME         0x0002
-#define WB_TEXT         0x0004
-#define WB_FLOW         0x0008
+#define WB_ICON			0x0001
+#define WB_NAME	        0x0002
+#define WB_TEXT			0x0004
+#define WB_FLOW			0x0008
 
-#define ICNVW_FLAG_POS_LOCKED   0x0001
-#define ICNVW_FLAG_USER1        0x1000
-#define ICNVW_FLAG_USER2        0x2000
-#define ICNVW_FLAG_USER3        0x4000
-#define ICNVW_FLAG_USER4        0x8000
+#define ICNVW_FLAG_POS_LOCKED	0x0001
+#define ICNVW_FLAG_USER1		0x1000
+#define ICNVW_FLAG_USER2		0x2000
+#define ICNVW_FLAG_USER3		0x4000
+#define ICNVW_FLAG_USER4		0x8000
 
 enum SvIconViewTextMode
 {
     ShowTextFull = 1,
     ShowTextShort,
-    ShowTextSmart,          // not implemented
-    ShowTextDontKnow        // nur fuer Eintraege (->Einstellung der View
+    ShowTextSmart,			// not implemented
+    ShowTextDontKnow		// nur fuer Eintraege (->Einstellung der View
                             // wird genommen)
 };
 
 class SvIcnVwDataEntry : public SvViewDataEntry
 {
 friend class SvImpIconView;
-    USHORT      nIcnVwFlags;
+    USHORT		nIcnVwFlags;
     SvIconViewTextMode eTextMode;
 public:
-    Rectangle   aRect;              // Bounding-Rect des Entries
-    Rectangle   aGridRect;          // gesetzt im Grid-Modus
-    Size        aTextSize;          // nur gesetzt im Grid-Modus
-    USHORT      nX,nY;              // fuer Tastatursteuerung
+    Rectangle 	aRect;				// Bounding-Rect des Entries
+    Rectangle 	aGridRect;			// gesetzt im Grid-Modus
+    Size		aTextSize;          // nur gesetzt im Grid-Modus
+    USHORT 		nX,nY;				// fuer Tastatursteuerung
                 SvIcnVwDataEntry();
-    virtual     ~SvIcnVwDataEntry();
+    virtual 	~SvIcnVwDataEntry();
 
-    BOOL        IsEntryPosLocked() const { return (BOOL)((nIcnVwFlags & ICNVW_FLAG_POS_LOCKED) !=0); }
-    void        ClearVwFlags( USHORT nMask ) { nIcnVwFlags &= (~nMask); }
-    void        SetVwFlags( USHORT nMask ) { nIcnVwFlags |= nMask; }
-    USHORT      GetVwFlags() const { return nIcnVwFlags; }
+    BOOL		IsEntryPosLocked() const { return (BOOL)((nIcnVwFlags & ICNVW_FLAG_POS_LOCKED) !=0); }
+    void		ClearVwFlags( USHORT nMask ) { nIcnVwFlags &= (~nMask); }
+    void		SetVwFlags( USHORT nMask ) { nIcnVwFlags |= nMask; }
+    USHORT		GetVwFlags() const { return nIcnVwFlags; }
     SvIconViewTextMode GetTextMode() const { return eTextMode; }
 };
 
@@ -86,31 +86,31 @@ class SvIconView : public SvLBox
 {
     friend class SvImpIconView;
 
-    SvImpIconView*  pImp;
-    Image           aCollapsedEntryBmp;
-    Image           aExpandedEntryBmp;
-    WinBits         nWinBits;
-    USHORT          nIcnVwFlags;
-    void            SetModel( SvLBoxTreeList* );
+    SvImpIconView*	pImp;
+    Image          	aCollapsedEntryBmp;
+    Image          	aExpandedEntryBmp;
+    WinBits			nWinBits;
+    USHORT			nIcnVwFlags;
+    void			SetModel( SvLBoxTreeList* );
 
 protected:
 
     using SvLBox::CreateEntry;
-    SvLBoxEntry*    CreateEntry( const XubString&, const Image&, const Image&);
-    void            ViewDataInitialized( SvLBoxEntry* );
-    virtual SvViewData* CreateViewData( SvListEntry* );
-    virtual void    InitViewData( SvViewData* pData, SvListEntry* pEntry );
-
-    void            EditingRequest(SvLBoxEntry*,SvLBoxItem*,const Point& );
-    void            EditedText( const XubString& );
-    void            EditItemText( SvLBoxEntry*,SvLBoxItem*,const Selection& );
-    SvLBoxEntry*    pCurEdEntry;
-    SvLBoxItem*     pCurEdItem;
-
-    virtual void    WriteDragServerInfo( const Point&, SvLBoxDDInfo* );
-    virtual void    ReadDragServerInfo( const Point&, SvLBoxDDInfo* );
+    SvLBoxEntry*	CreateEntry( const XubString&, const Image&, const Image&);
+    void			ViewDataInitialized( SvLBoxEntry* );
+    virtual	SvViewData* CreateViewData( SvListEntry* );
+    virtual void	InitViewData( SvViewData* pData, SvListEntry* pEntry );
+
+    void			EditingRequest(SvLBoxEntry*,SvLBoxItem*,const Point& );
+    void			EditedText( const XubString& );
+    void			EditItemText( SvLBoxEntry*,SvLBoxItem*,const Selection& );
+    SvLBoxEntry*	pCurEdEntry;
+    SvLBoxItem*		pCurEdItem;
+
+    virtual void 	WriteDragServerInfo( const Point&, SvLBoxDDInfo* );
+    virtual void 	ReadDragServerInfo( const Point&, SvLBoxDDInfo* );
     virtual void    Command( const CommandEvent& rCEvt );
-    virtual void    PreparePaint( SvLBoxEntry* );
+    virtual void	PreparePaint( SvLBoxEntry* );
 
 public:
 
@@ -120,35 +120,35 @@ public:
 
     void DisconnectFromModel();
 
-    SvLBoxEntry*    InsertEntry( const XubString& rText, SvLBoxEntry* pParent = 0,
+    SvLBoxEntry*	InsertEntry( const XubString& rText, SvLBoxEntry* pParent = 0,
                         BOOL bChildsOnDemand = FALSE,
                         ULONG nPos=LIST_APPEND );
 
-    SvLBoxEntry*    InsertEntry( const XubString& rText,
+    SvLBoxEntry*	InsertEntry( const XubString& rText,
                         const Image& rExpandedEntryBmp,
                         const Image& rCollapsedEntryBmp,
                         SvLBoxEntry* pParent = 0,
                         BOOL bChildsOnDemand = FALSE,
                         ULONG nPos = LIST_APPEND );
 
-    const Image&    GetDefaultExpandedEntryBmp() const { return aExpandedEntryBmp;}
-    const Image&    GetDefaultCollapsedEntryBmp() const { return aCollapsedEntryBmp;}
-    void            SetDefaultExpandedEntryBmp( const Image& rBmp) { aExpandedEntryBmp=rBmp;}
-    void            SetDefaultCollapsedEntryBmp( const Image& rBmp ) { aCollapsedEntryBmp=rBmp;}
+    const Image&	GetDefaultExpandedEntryBmp() const { return aExpandedEntryBmp;}
+    const Image&	GetDefaultCollapsedEntryBmp() const { return aCollapsedEntryBmp;}
+    void			SetDefaultExpandedEntryBmp( const Image& rBmp) { aExpandedEntryBmp=rBmp;}
+    void          	SetDefaultCollapsedEntryBmp( const Image& rBmp ) { aCollapsedEntryBmp=rBmp;}
 
-    void            SetEntryText(SvLBoxEntry*, const XubString& );
-    void            SetExpandedEntryBmp(SvLBoxEntry*, const Image& );
-    void            SetCollapsedEntryBmp(SvLBoxEntry*, const Image& );
+    void			SetEntryText(SvLBoxEntry*, const XubString& );
+    void			SetExpandedEntryBmp(SvLBoxEntry*, const Image& );
+    void			SetCollapsedEntryBmp(SvLBoxEntry*, const Image& );
 
-    XubString       GetEntryText(SvLBoxEntry*) const;
-    Image           GetExpandedEntryBmp(SvLBoxEntry*) const;
-    Image           GetCollapsedEntryBmp(SvLBoxEntry*) const;
+    XubString 		GetEntryText(SvLBoxEntry*) const;
+    Image			GetExpandedEntryBmp(SvLBoxEntry*) const;
+    Image			GetCollapsedEntryBmp(SvLBoxEntry*) const;
 
     virtual SvLBoxEntry* CloneEntry( SvLBoxEntry* pSource );
 
-    virtual USHORT  IsA();
+    virtual USHORT	IsA();
 
-    virtual void    RequestingChilds( SvLBoxEntry* pParent );
+    virtual void	RequestingChilds( SvLBoxEntry* pParent );
 
     virtual void    Paint( const Rectangle& rRect );
     virtual void    MouseButtonDown( const MouseEvent& rMEvt );
@@ -158,117 +158,117 @@ public:
     virtual void    Resize();
     virtual void    GetFocus();
     virtual void    LoseFocus();
-    void            SetUpdateMode( BOOL );
+    void 			SetUpdateMode( BOOL );
 
     using SvListView::SetModel;
-    virtual void    SetModel( SvLBoxTreeList*, SvLBoxEntry* pParent );
-    virtual void    ModelHasCleared();
-    virtual void    ModelHasInserted( SvListEntry* pEntry );
-    virtual void    ModelHasInsertedTree( SvListEntry* pEntry );
-    virtual void    ModelIsMoving(SvListEntry* pSource,
+    virtual void	SetModel( SvLBoxTreeList*, SvLBoxEntry* pParent );
+    virtual void 	ModelHasCleared();
+    virtual void 	ModelHasInserted( SvListEntry* pEntry );
+    virtual void 	ModelHasInsertedTree( SvListEntry* pEntry );
+    virtual void 	ModelIsMoving(SvListEntry* pSource,
                         SvListEntry* pTargetParent, ULONG nChildPos );
-    virtual void    ModelHasMoved(SvListEntry* pSource );
-    virtual void    ModelIsRemoving( SvListEntry* pEntry );
-    virtual void    ModelHasRemoved( SvListEntry* pEntry );
-    virtual void    ModelHasEntryInvalidated( SvListEntry* pEntry );
+    virtual void 	ModelHasMoved(SvListEntry* pSource );
+    virtual void 	ModelIsRemoving( SvListEntry* pEntry );
+    virtual void 	ModelHasRemoved( SvListEntry* pEntry );
+    virtual void 	ModelHasEntryInvalidated( SvListEntry* pEntry );
 
-    virtual void    ShowTargetEmphasis( SvLBoxEntry*, BOOL bShow );
+    virtual void	ShowTargetEmphasis( SvLBoxEntry*, BOOL bShow );
     using Window::GetDropTarget;
     virtual SvLBoxEntry* GetDropTarget( const Point& );
-    virtual Region  GetDragRegion() const;
+    virtual Region	GetDragRegion() const;
     // NotifyMoving/Copying ueberladen, da wir bei GetDropTarget
     // einen "magic pointer" zurueckgeben, falls in einen leeren
     // Bereich auf der IconView gedroppt wird.
-    virtual BOOL    NotifyMoving( SvLBoxEntry* pTarget, SvLBoxEntry* pEntry,
+    virtual BOOL	NotifyMoving( SvLBoxEntry* pTarget, SvLBoxEntry* pEntry,
                         SvLBoxEntry*& rpNewParent, ULONG& rNewChildPos);
-    virtual BOOL    NotifyCopying( SvLBoxEntry* pTarget, SvLBoxEntry* pEntry,
+    virtual BOOL	NotifyCopying( SvLBoxEntry* pTarget, SvLBoxEntry* pEntry,
                         SvLBoxEntry*& rpNewParent, ULONG& rNewChildPos);
 
     // gibt TopLeft des BoundingRects zurueck
     // Konvertierung in Fensterposition: MapMode.Origin addieren
-    Point           GetEntryPosition( SvLBoxEntry* ) const;
-    void            SetEntryPosition( SvLBoxEntry*, const Point& rDocPos);
-    void            SetEntryPosition( SvLBoxEntry*, const Point& rDocPos,
+    Point			GetEntryPosition( SvLBoxEntry* ) const;
+    void			SetEntryPosition( SvLBoxEntry*, const Point& rDocPos);
+    void			SetEntryPosition( SvLBoxEntry*, const Point& rDocPos,
                                       BOOL bAdjustAtGrid );
 
-    void            SetFont( const Font& rFont );
-    void            SetDefaultFont();
+    void			SetFont( const Font& rFont );
+    void			SetDefaultFont();
 
     using SvLBox::GetEntry;
-    SvLBoxEntry*    GetEntry( const Point& rPixPos, BOOL  ) const;
+    SvLBoxEntry*	GetEntry( const Point& rPixPos, BOOL  ) const;
     // Gibt den naechsten ueber pCurEntry liegenden Eintrag (ZOrder)
-    SvLBoxEntry*    GetNextEntry( const Point& rPixPos, SvLBoxEntry* pCurEntry, BOOL  ) const;
+    SvLBoxEntry*	GetNextEntry( const Point& rPixPos, SvLBoxEntry* pCurEntry, BOOL  ) const;
     // Gibt den naechsten unter pCurEntry liegenden Eintrag (ZOrder)
-    SvLBoxEntry*    GetPrevEntry( const Point& rPixPos, SvLBoxEntry* pCurEntry, BOOL  ) const;
+    SvLBoxEntry*	GetPrevEntry( const Point& rPixPos, SvLBoxEntry* pCurEntry, BOOL  ) const;
 
-    SvLBoxEntry*    GetEntryFromLogicPos( const Point& rDocPos ) const;
+    SvLBoxEntry*	GetEntryFromLogicPos( const Point& rDocPos ) const;
 
-    void            SetWindowBits( WinBits nWinStyle );
-    virtual void    PaintEntry( SvLBoxEntry* );
-    virtual void    PaintEntry( SvLBoxEntry*, const Point& rDocPos );
-    Rectangle       GetFocusRect( SvLBoxEntry* );
-    void            InvalidateEntry( SvLBoxEntry* );
-    void            MakeVisible( SvLBoxEntry* );
+    void			SetWindowBits( WinBits nWinStyle );
+    virtual void	PaintEntry( SvLBoxEntry* );
+    virtual void	PaintEntry( SvLBoxEntry*, const Point& rDocPos );
+    Rectangle		GetFocusRect( SvLBoxEntry* );
+    void			InvalidateEntry( SvLBoxEntry* );
+    void			MakeVisible( SvLBoxEntry* );
 
-    void            SetDragDropMode( DragDropMode );
-    void            SetSelectionMode( SelectionMode );
+    void			SetDragDropMode( DragDropMode );
+    void 			SetSelectionMode( SelectionMode );
 
     using SvListView::Select;
     BOOL            Select( SvLBoxEntry* pEntry, BOOL bSelect=TRUE );
-    void            SelectAll( BOOL bSelect, BOOL bPaint=TRUE );
+    void			SelectAll( BOOL bSelect, BOOL bPaint=TRUE );
     virtual void    SetCurEntry( SvLBoxEntry* _pEntry );
     virtual SvLBoxEntry*
                     GetCurEntry() const;
 
     // logische Koordinaten
-    void            SelectRect(
+    void			SelectRect(
                         const Rectangle& rRect,
                         BOOL bAdd = FALSE,
                         // die Schnittmenge mit rRect wird invertiert
                         // wird bei bAdd == FALSE ignoriert
                         SvPtrarr* pOtherRects = 0,
                         short nBorderOffs = -5 );
-    ULONG           GetSelectionCount() const;
+    ULONG			GetSelectionCount() const;
 
-    virtual void    Arrange();
-    void            SetSpaceBetweenEntries( long nHor, long Ver );
-    long            GetHorSpaceBetweenEntries();
-    long            GetVerSpaceBetweenEntries();
+    virtual void	Arrange();
+    void			SetSpaceBetweenEntries( long nHor, long Ver );
+    long			GetHorSpaceBetweenEntries();
+    long			GetVerSpaceBetweenEntries();
 
-    void            EnableInplaceEditing( BOOL bEnable );
-    void            EditEntry( SvLBoxEntry* pEntry = 0 );
-    virtual BOOL    EditingEntry( SvLBoxEntry* pEntry, Selection& );
-    virtual BOOL    EditedEntry( SvLBoxEntry*, const XubString& rNewText );
+    void			EnableInplaceEditing( BOOL bEnable );
+    void			EditEntry( SvLBoxEntry* pEntry = 0 );
+    virtual BOOL	EditingEntry( SvLBoxEntry* pEntry, Selection& );
+    virtual BOOL	EditedEntry( SvLBoxEntry*, const XubString& rNewText );
 
-    void            SetCurParent( SvLBoxEntry* pNewParent );
-    SvLBoxEntry*    GetCurParent() const;
+    void			SetCurParent( SvLBoxEntry* pNewParent );
+    SvLBoxEntry*	GetCurParent() const;
 
-    virtual void    ModelNotification( USHORT nActionId, SvListEntry* pEntry1,
+    virtual void	ModelNotification( USHORT nActionId, SvListEntry* pEntry1,
                         SvListEntry* pEntry2, ULONG nPos );
 
     // 0,0: Grid-Modus ausschalten
-    void            SetGrid( long nDX, long nDY );
+    void			SetGrid( long nDX, long nDY );
 
     // nDeltaY < 0 : View bewegt sich auf dem Doc nach oben
     // nDeltaY > 0 : View bewegt sich auf dem Doc nach unten
     // nDeltaX < 0 : View bewegt sich auf dem Doc nach links
     // nDeltaX > 0 : View bewegt sich auf dem Doc nach rechts
     using Window::Scroll;
-    virtual void    Scroll( long nDeltaX, long nDeltaY, USHORT nFlags = 0 );
+    virtual void	Scroll( long nDeltaX, long nDeltaY, USHORT nFlags = 0 );
 
-    virtual void    PrepareCommandEvent( const CommandEvent& );
-    virtual void    StartDrag( sal_Int8 nAction, const Point& );
-    virtual void    DragFinished( sal_Int8 );
-    virtual sal_Int8    AcceptDrop( const AcceptDropEvent& rEvt );
+    virtual void	PrepareCommandEvent( const CommandEvent& );
+    virtual void	StartDrag( sal_Int8 nAction, const Point& );
+    virtual void	DragFinished( sal_Int8 );
+    virtual sal_Int8	AcceptDrop( const AcceptDropEvent& rEvt );
     using SvLBox::ExecuteDrop;
     virtual sal_Int8    ExecuteDrop( const ExecuteDropEvent& rEvt );
 
-    void            ShowDDIcon( SvLBoxEntry* pRefEntry, const Point& rPos );
-    void            HideDDIcon();
-    void            HideShowDDIcon( SvLBoxEntry* pRefEntry, const Point& rPos );
+    void 			ShowDDIcon( SvLBoxEntry* pRefEntry, const Point& rPos );
+    void 			HideDDIcon();
+    void			HideShowDDIcon( SvLBoxEntry* pRefEntry, const Point& rPos );
 
     // fuers Scrollen beim D&D
-    void            CalcScrollOffsets(
+    void			CalcScrollOffsets(
                         const Point& rRefPosPixel,
                         long& rScrollX,
                         long& rScrollY,
@@ -276,15 +276,15 @@ public:
                         USHORT nBorderWidth = 10 );
 
     using Window::EndTracking;
-    void            EndTracking();
-    void            AdjustAtGrid( SvLBoxEntry* pEntry = 0 );
-    void            LockEntryPos( SvLBoxEntry* pEntry, BOOL bLock = TRUE );
-    BOOL            IsEntryPosLocked( const SvLBoxEntry* pEntry ) const;
+    void			EndTracking();
+    void			AdjustAtGrid( SvLBoxEntry* pEntry = 0 );
+    void			LockEntryPos( SvLBoxEntry* pEntry, BOOL bLock = TRUE );
+    BOOL			IsEntryPosLocked( const SvLBoxEntry* pEntry ) const;
 
-    void            SetTextMode( SvIconViewTextMode, SvLBoxEntry* pEntry = 0 );
+    void			SetTextMode( SvIconViewTextMode, SvLBoxEntry* pEntry = 0 );
     SvIconViewTextMode GetTextMode( const SvLBoxEntry* pEntry = 0 ) const;
 
-    void            ShowFocusRect( const SvLBoxEntry* pEntry );
+    void			ShowFocusRect( const SvLBoxEntry* pEntry );
 };
 
 #endif
diff --git a/svtools/inc/svtools/svlbitm.hxx b/svtools/inc/svtools/svlbitm.hxx
index c28b8d5db10c..a3dc9a3c5d03 100644
--- a/svtools/inc/svtools/svlbitm.hxx
+++ b/svtools/inc/svtools/svlbitm.hxx
@@ -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
@@ -42,19 +42,19 @@
 
 class SvLBoxEntry;
 
-#define SV_ITEM_ID_LBOXSTRING       1
-#define SV_ITEM_ID_LBOXBMP          2
-#define SV_ITEM_ID_LBOXBUTTON       3
-#define SV_ITEM_ID_LBOXCONTEXTBMP   4
+#define SV_ITEM_ID_LBOXSTRING		1
+#define SV_ITEM_ID_LBOXBMP			2
+#define SV_ITEM_ID_LBOXBUTTON		3
+#define SV_ITEM_ID_LBOXCONTEXTBMP	4
 
 enum SvButtonState { SV_BUTTON_UNCHECKED, SV_BUTTON_CHECKED, SV_BUTTON_TRISTATE };
 
-#define SV_BMP_UNCHECKED        0
-#define SV_BMP_CHECKED          1
-#define SV_BMP_TRISTATE         2
-#define SV_BMP_HIUNCHECKED      3
-#define SV_BMP_HICHECKED        4
-#define SV_BMP_HITRISTATE       5
+#define SV_BMP_UNCHECKED		0
+#define SV_BMP_CHECKED   		1
+#define SV_BMP_TRISTATE  		2
+#define SV_BMP_HIUNCHECKED 		3
+#define SV_BMP_HICHECKED   		4
+#define SV_BMP_HITRISTATE  		5
 #define SV_BMP_STATICIMAGE      6
 
 struct SvLBoxButtonData_Impl;
@@ -62,15 +62,15 @@ struct SvLBoxButtonData_Impl;
 class SVT_DLLPUBLIC SvLBoxButtonData
 {
 private:
-    Link                    aLink;
-    long                    nWidth;
-    long                    nHeight;
-    SvLBoxButtonData_Impl*  pImpl;
-    BOOL                    bDataOk;
-    SvButtonState           eState;
-
-    SVT_DLLPRIVATE void                     SetWidthAndHeight();
-    SVT_DLLPRIVATE void                 InitData( BOOL bImagesFromDefault,
+    Link 					aLink;
+    long 					nWidth;
+    long					nHeight;
+    SvLBoxButtonData_Impl*	pImpl;
+    BOOL					bDataOk;
+    SvButtonState			eState;
+
+    SVT_DLLPRIVATE void 					SetWidthAndHeight();
+    SVT_DLLPRIVATE void					InitData( BOOL bImagesFromDefault,
                                       bool _bRadioBtn, const Control* pControlForSettings = NULL );
 public:
                             // include creating default images (CheckBox or RadioButton)
@@ -80,27 +80,27 @@ public:
                             SvLBoxButtonData();
                             ~SvLBoxButtonData();
 
-    USHORT                  GetIndex( USHORT nItemState );
-    inline long             Width();
-    inline long             Height();
-    void                    SetLink( const Link& rLink) { aLink=rLink; }
-    const Link&             GetLink() const { return aLink; }
-     BOOL                   IsRadio();
+    USHORT 					GetIndex( USHORT nItemState );
+    inline long				Width();
+    inline long				Height();
+    void					SetLink( const Link& rLink) { aLink=rLink; }
+    const Link&				GetLink() const { return aLink; }
+     BOOL					IsRadio();
     // weil Buttons nicht von LinkHdl abgeleitet sind
-    void                    CallLink();
+    void					CallLink();
 
-    void                    StoreButtonState( SvLBoxEntry* pEntry, USHORT nItemFlags );
-    SvButtonState           ConvertToButtonState( USHORT nItemFlags ) const;
+    void					StoreButtonState( SvLBoxEntry* pEntry, USHORT nItemFlags );
+    SvButtonState 			ConvertToButtonState( USHORT nItemFlags ) const;
 
-    inline SvButtonState    GetActButtonState() const;
-    SvLBoxEntry*            GetActEntry() const;
+    inline SvButtonState	GetActButtonState() const;
+    SvLBoxEntry*			GetActEntry() const;
 
     Image aBmps[24];  // Indizes siehe Konstanten BMP_ ....
 
-    void                    SetDefaultImages( const Control* pControlForSettings = NULL );
+    void					SetDefaultImages( const Control* pControlForSettings = NULL );
                                 // set images acording to the color scheeme of the Control
                                 // pControlForSettings == NULL: settings are taken from Application
-    BOOL                    HasDefaultImages( void ) const;
+    BOOL					HasDefaultImages( void ) const;
 };
 
 inline long SvLBoxButtonData::Width()
@@ -130,14 +130,14 @@ class SVT_DLLPUBLIC SvLBoxString : public SvLBoxItem
 public:
                     SvLBoxString( SvLBoxEntry*,USHORT nFlags,const XubString& rStr);
                     SvLBoxString();
-    virtual         ~SvLBoxString();
-    virtual USHORT  IsA();
-    void            InitViewData( SvLBox*,SvLBoxEntry*,SvViewDataItem* );
-    XubString       GetText() const { return aStr; }
-    void            SetText( SvLBoxEntry*, const XubString& rStr );
-    void            Paint( const Point&, SvLBox& rDev, USHORT nFlags,SvLBoxEntry* );
-    SvLBoxItem*     Create() const;
-    void            Clone( SvLBoxItem* pSource );
+    virtual			~SvLBoxString();
+    virtual USHORT	IsA();
+    void			InitViewData( SvLBox*,SvLBoxEntry*,SvViewDataItem* );
+    XubString		GetText() const { return aStr; }
+    void 			SetText( SvLBoxEntry*, const XubString& rStr );
+    void			Paint( const Point&, SvLBox& rDev, USHORT nFlags,SvLBoxEntry* );
+    SvLBoxItem* 	Create() const;
+    void 			Clone( SvLBoxItem* pSource );
 };
 
 class SvLBoxBmp : public SvLBoxItem
@@ -146,20 +146,20 @@ class SvLBoxBmp : public SvLBoxItem
 public:
                     SvLBoxBmp( SvLBoxEntry*, USHORT nFlags, Image );
                     SvLBoxBmp();
-    virtual         ~SvLBoxBmp();
-    virtual USHORT  IsA();
-    void            InitViewData( SvLBox*,SvLBoxEntry*,SvViewDataItem* );
-    void            SetBitmap( SvLBoxEntry*, Image );
-    void            Paint( const Point&, SvLBox& rView, USHORT nFlags,SvLBoxEntry* );
-    SvLBoxItem*     Create() const;
-    void            Clone( SvLBoxItem* pSource );
+    virtual			~SvLBoxBmp();
+    virtual USHORT	IsA();
+    void			InitViewData( SvLBox*,SvLBoxEntry*,SvViewDataItem* );
+    void			SetBitmap( SvLBoxEntry*, Image );
+    void			Paint( const Point&, SvLBox& rView, USHORT nFlags,SvLBoxEntry* );
+    SvLBoxItem*	 	Create() const;
+    void 			Clone( SvLBoxItem* pSource );
 };
 
 
-#define SV_ITEMSTATE_UNCHECKED          0x0001
-#define SV_ITEMSTATE_CHECKED            0x0002
-#define SV_ITEMSTATE_TRISTATE           0x0004
-#define SV_ITEMSTATE_HILIGHTED          0x0008
+#define SV_ITEMSTATE_UNCHECKED			0x0001
+#define SV_ITEMSTATE_CHECKED			0x0002
+#define SV_ITEMSTATE_TRISTATE			0x0004
+#define SV_ITEMSTATE_HILIGHTED			0x0008
 #define SV_STATE_MASK 0xFFF8  // zum Loeschen von UNCHECKED,CHECKED,TRISTATE
 
 enum SvLBoxButtonKind
@@ -171,7 +171,7 @@ enum SvLBoxButtonKind
 
 class SVT_DLLPUBLIC SvLBoxButton : public SvLBoxItem
 {
-    SvLBoxButtonData*   pData;
+    SvLBoxButtonData*	pData;
     SvLBoxButtonKind eKind;
     USHORT nItemFlags;
     USHORT nImgArrOffs;
@@ -186,45 +186,45 @@ public:
                                   SvLBoxButtonKind eTheKind, USHORT nFlags,
                                   SvLBoxButtonData* pBData );
                     SvLBoxButton();
-    virtual         ~SvLBoxButton();
-    void            InitViewData( SvLBox*,SvLBoxEntry*,SvViewDataItem* );
-    virtual USHORT  IsA();
-    void            Check( SvLBox* pView, SvLBoxEntry*, BOOL bCheck );
-    virtual BOOL    ClickHdl(SvLBox* pView, SvLBoxEntry* );
-    void            Paint( const Point&, SvLBox& rView, USHORT nFlags,SvLBoxEntry* );
-    SvLBoxItem*     Create() const;
-    void            Clone( SvLBoxItem* pSource );
-    USHORT          GetButtonFlags() const { return nItemFlags; }
-    BOOL            IsStateChecked() const { return (BOOL)(nItemFlags & SV_ITEMSTATE_CHECKED)!=0; }
-    BOOL            IsStateUnchecked() const { return (BOOL)(nItemFlags & SV_ITEMSTATE_UNCHECKED)!=0; }
-    BOOL            IsStateTristate() const { return (BOOL)(nItemFlags & SV_ITEMSTATE_TRISTATE)!=0; }
-    BOOL            IsStateHilighted() const { return (BOOL)(nItemFlags & SV_ITEMSTATE_HILIGHTED)!=0; }
-    void            SetStateChecked();
-    void            SetStateUnchecked();
-    void            SetStateTristate();
-    void            SetStateHilighted( BOOL bHilight );
+    virtual			~SvLBoxButton();
+    void			InitViewData( SvLBox*,SvLBoxEntry*,SvViewDataItem* );
+    virtual USHORT	IsA();
+    void 			Check( SvLBox* pView, SvLBoxEntry*, BOOL bCheck );
+    virtual BOOL 	ClickHdl(SvLBox* pView, SvLBoxEntry* );
+    void			Paint( const Point&, SvLBox& rView, USHORT nFlags,SvLBoxEntry* );
+    SvLBoxItem*	 	Create() const;
+    void 			Clone( SvLBoxItem* pSource );
+    USHORT			GetButtonFlags() const { return nItemFlags; }
+    BOOL			IsStateChecked() const { return (BOOL)(nItemFlags & SV_ITEMSTATE_CHECKED)!=0; }
+    BOOL			IsStateUnchecked() const { return (BOOL)(nItemFlags & SV_ITEMSTATE_UNCHECKED)!=0; }
+    BOOL			IsStateTristate() const { return (BOOL)(nItemFlags & SV_ITEMSTATE_TRISTATE)!=0; }
+    BOOL			IsStateHilighted() const { return (BOOL)(nItemFlags & SV_ITEMSTATE_HILIGHTED)!=0; }
+    void			SetStateChecked();
+    void			SetStateUnchecked();
+    void			SetStateTristate();
+    void			SetStateHilighted( BOOL bHilight );
 
     SvLBoxButtonKind GetKind() const { return eKind; }
 
-    void            SetBaseOffs( USHORT nOffs ) { nBaseOffs = nOffs; }
-    USHORT          GetBaseOffs() const { return nBaseOffs; }
+    void			SetBaseOffs( USHORT nOffs ) { nBaseOffs = nOffs; }
+    USHORT			GetBaseOffs() const { return nBaseOffs; }
 
     // Check whether this button can be modified via UI, sounding a beep if it
     // cannot be modified:
     bool            CheckModification() const;
 };
 
-inline void SvLBoxButton::SetStateChecked()
+inline void	SvLBoxButton::SetStateChecked()
 {
     nItemFlags &= SV_STATE_MASK;
     nItemFlags |= SV_ITEMSTATE_CHECKED;
 }
-inline void SvLBoxButton::SetStateUnchecked()
+inline void	SvLBoxButton::SetStateUnchecked()
 {
     nItemFlags &= SV_STATE_MASK;
     nItemFlags |= SV_ITEMSTATE_UNCHECKED;
 }
-inline void SvLBoxButton::SetStateTristate()
+inline void	SvLBoxButton::SetStateTristate()
 {
     nItemFlags &= SV_STATE_MASK;
     nItemFlags |= SV_ITEMSTATE_TRISTATE;
@@ -241,26 +241,26 @@ inline void SvLBoxButton::SetStateHilighted( BOOL bHilight )
 struct SvLBoxContextBmp_Impl;
 class SVT_DLLPUBLIC SvLBoxContextBmp : public SvLBoxItem
 {
-    SvLBoxContextBmp_Impl*  m_pImpl;
+    SvLBoxContextBmp_Impl*	m_pImpl;
 public:
                     SvLBoxContextBmp( SvLBoxEntry*,USHORT nFlags,Image,Image,
                                     USHORT nEntryFlagsBmp1);
                     SvLBoxContextBmp();
-    virtual         ~SvLBoxContextBmp();
-    virtual USHORT  IsA();
-    void            InitViewData( SvLBox*,SvLBoxEntry*,SvViewDataItem* );
-    void            Paint( const Point&, SvLBox& rView, USHORT nFlags,SvLBoxEntry* );
-    SvLBoxItem*     Create() const;
-    void            Clone( SvLBoxItem* pSource );
+    virtual			~SvLBoxContextBmp();
+    virtual USHORT	IsA();
+    void			InitViewData( SvLBox*,SvLBoxEntry*,SvViewDataItem* );
+    void			Paint( const Point&, SvLBox& rView, USHORT nFlags,SvLBoxEntry* );
+    SvLBoxItem*	 	Create() const;
+    void 			Clone( SvLBoxItem* pSource );
 
 
-    BOOL            SetModeImages( const Image& _rBitmap1, const Image& _rBitmap2, BmpColorMode _eMode = BMP_COLOR_NORMAL );
-    void            GetModeImages(       Image& _rBitmap1,       Image& _rBitmap2, BmpColorMode _eMode = BMP_COLOR_NORMAL ) const;
+    BOOL			SetModeImages( const Image& _rBitmap1, const Image& _rBitmap2, BmpColorMode _eMode = BMP_COLOR_NORMAL );
+    void			GetModeImages(		 Image& _rBitmap1,		 Image& _rBitmap2, BmpColorMode _eMode = BMP_COLOR_NORMAL ) const;
 
-    inline void         SetBitmap1( const Image& _rImage, BmpColorMode _eMode = BMP_COLOR_NORMAL );
-    inline void         SetBitmap2( const Image& _rImage, BmpColorMode _eMode = BMP_COLOR_NORMAL );
-    inline const Image& GetBitmap1( BmpColorMode _eMode = BMP_COLOR_NORMAL ) const;
-    inline const Image& GetBitmap2( BmpColorMode _eMode = BMP_COLOR_NORMAL ) const;
+    inline void			SetBitmap1( const Image& _rImage, BmpColorMode _eMode = BMP_COLOR_NORMAL );
+    inline void			SetBitmap2( const Image& _rImage, BmpColorMode _eMode = BMP_COLOR_NORMAL );
+    inline const Image&	GetBitmap1( BmpColorMode _eMode = BMP_COLOR_NORMAL ) const;
+    inline const Image&	GetBitmap2( BmpColorMode _eMode = BMP_COLOR_NORMAL ) const;
 
 private:
     Image& implGetImageStore( sal_Bool _bFirst, BmpColorMode _eMode );
@@ -271,12 +271,12 @@ inline void SvLBoxContextBmp::SetBitmap1( const Image& _rImage, BmpColorMode _eM
     implGetImageStore( sal_True, _eMode ) = _rImage;
 }
 
-inline void SvLBoxContextBmp::SetBitmap2( const Image& _rImage, BmpColorMode _eMode  )
+inline void	SvLBoxContextBmp::SetBitmap2( const Image& _rImage, BmpColorMode _eMode  )
 {
     implGetImageStore( sal_False, _eMode ) = _rImage;
 }
 
-inline const Image& SvLBoxContextBmp::GetBitmap1( BmpColorMode _eMode ) const
+inline const Image&	SvLBoxContextBmp::GetBitmap1( BmpColorMode _eMode ) const
 {
     Image& rImage = const_cast< SvLBoxContextBmp* >( this )->implGetImageStore( sal_True, _eMode );
     if ( !rImage )
@@ -285,7 +285,7 @@ inline const Image& SvLBoxContextBmp::GetBitmap1( BmpColorMode _eMode ) const
     return rImage;
 }
 
-inline const Image& SvLBoxContextBmp::GetBitmap2( BmpColorMode _eMode ) const
+inline const Image&	SvLBoxContextBmp::GetBitmap2( BmpColorMode _eMode ) const
 {
     Image& rImage = const_cast< SvLBoxContextBmp* >( this )->implGetImageStore( sal_False, _eMode );
     if ( !rImage )
diff --git a/svtools/inc/svtools/svlbox.hxx b/svtools/inc/svtools/svlbox.hxx
index f33784f45397..e0c1e2ada36a 100644
--- a/svtools/inc/svtools/svlbox.hxx
+++ b/svtools/inc/svtools/svlbox.hxx
@@ -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
@@ -73,23 +73,23 @@ namespace utl {
 // *************************** Tabulatoren *****************************
 // *********************************************************************
 
-#define SV_LBOXTAB_DYNAMIC          0x0001 // Ausgabespalte des Items verschiebt
+#define SV_LBOXTAB_DYNAMIC     		0x0001 // Ausgabespalte des Items verschiebt
                                            // sich entsprechend Child-Tiefe
-#define SV_LBOXTAB_ADJUST_RIGHT     0x0002 // rechter Rand des Items am Tabulator
-#define SV_LBOXTAB_ADJUST_LEFT      0x0004 // linker Rand ...
-#define SV_LBOXTAB_ADJUST_CENTER    0x0008 // Item am Tabulator zentrieren
-#define SV_LBOXTAB_ADJUST_NUMERIC   0x0010 // Dezimalpunkt am Tabulator (Strings)
+#define SV_LBOXTAB_ADJUST_RIGHT		0x0002 // rechter Rand des Items am Tabulator
+#define SV_LBOXTAB_ADJUST_LEFT		0x0004 // linker Rand ...
+#define SV_LBOXTAB_ADJUST_CENTER	0x0008 // Item am Tabulator zentrieren
+#define SV_LBOXTAB_ADJUST_NUMERIC	0x0010 // Dezimalpunkt am Tabulator (Strings)
 
 // wird nicht mehr unterstuetzt! Fokus richtet sich jetzt nach Selektion!
-#define SV_LBOXTAB_SHOW_FOCUS       0x0020 // Fokus visualisieren
+#define SV_LBOXTAB_SHOW_FOCUS		0x0020 // Fokus visualisieren
 
-#define SV_LBOXTAB_SHOW_SELECTION   0x0040 // Selektionszustand visualisieren
+#define SV_LBOXTAB_SHOW_SELECTION	0x0040 // Selektionszustand visualisieren
                                            // Item muss umschliessendes Polygon
                                            // zurueckgeben koennen (D&D-Cursor)
-#define SV_LBOXTAB_EDITABLE         0x0100 // Item an Tabulator editierbar
-#define SV_LBOXTAB_PUSHABLE         0x0200 // Item verhaelt sich wie ein Button
-#define SV_LBOXTAB_INV_ALWAYS       0x0400 // Hintergrund immer loeschen
-#define SV_LBOXTAB_FORCE            0x0800 // Default-Berechnung des ersten Tabulators
+#define SV_LBOXTAB_EDITABLE        	0x0100 // Item an Tabulator editierbar
+#define SV_LBOXTAB_PUSHABLE			0x0200 // Item verhaelt sich wie ein Button
+#define SV_LBOXTAB_INV_ALWAYS		0x0400 // Hintergrund immer loeschen
+#define SV_LBOXTAB_FORCE			0x0800 // Default-Berechnung des ersten Tabulators
                                            // (auf die sich Abo-Tabpage, Extras/Optionen/Anpassen,
                                            // etc. verlassen) ausschalten. Die Position des ersten
                                            // Tabs entspricht jetzt exakt den eingestellten Flags &
@@ -97,25 +97,25 @@ namespace utl {
 
 class SvLBoxTab
 {
-    long    nPos;
-    void*   pUserData;
+    long	nPos;
+    void*	pUserData;
 public:
             SvLBoxTab();
             SvLBoxTab( long nPos, USHORT nFlags=SV_LBOXTAB_ADJUST_LEFT );
             SvLBoxTab( const SvLBoxTab& );
             ~SvLBoxTab();
 
-    USHORT  nFlags;
-
-    void    SetUserData( void* pPtr ) { pUserData = pPtr; }
-    void*   GetUserData() const { return pUserData; }
-    BOOL    IsDynamic() const { return (BOOL)((nFlags & SV_LBOXTAB_DYNAMIC)!=0); }
-    void    SetPos( long nNewPos) { nPos = nNewPos; }
-    long    GetPos() const { return nPos; }
-    long    CalcOffset( long nItemLength, long nTabWidth );
-    // long CalcOffset( const String&, const OutputDevice& );
-    BOOL    IsEditable() const { return (BOOL)((nFlags & SV_LBOXTAB_EDITABLE)!=0); }
-    BOOL    IsPushable() const { return (BOOL)((nFlags & SV_LBOXTAB_PUSHABLE)!=0); }
+    USHORT	nFlags;
+
+    void	SetUserData( void* pPtr ) { pUserData = pPtr; }
+    void*	GetUserData() const { return pUserData; }
+    BOOL	IsDynamic() const { return (BOOL)((nFlags & SV_LBOXTAB_DYNAMIC)!=0); }
+    void	SetPos( long nNewPos) { nPos = nNewPos; }
+    long	GetPos() const { return nPos; }
+    long	CalcOffset( long nItemLength, long nTabWidth );
+    // long	CalcOffset( const String&, const OutputDevice& );
+    BOOL	IsEditable() const { return (BOOL)((nFlags & SV_LBOXTAB_EDITABLE)!=0); }
+    BOOL	IsPushable() const { return (BOOL)((nFlags & SV_LBOXTAB_PUSHABLE)!=0); }
 };
 
 // *********************************************************************
@@ -125,7 +125,7 @@ public:
 class SvViewDataItem
 {
 public:
-    Size    aSize;
+    Size 	aSize;
             SvViewDataItem();
             ~SvViewDataItem();
 };
@@ -137,10 +137,10 @@ class SvViewDataEntry : public SvViewData
 {
 public:
     SvViewDataItem* pItemData;  // ein Array von SvViewDataItems
-    USHORT          nItmCnt;    // Anzahl Items fuer delete-operator
+    USHORT 			nItmCnt;	// Anzahl Items fuer delete-operator
 
                     SvViewDataEntry();
-    virtual         ~SvViewDataEntry();
+    virtual 		~SvViewDataEntry();
 };
 
 // *********************************************************************
@@ -152,103 +152,103 @@ class SVT_DLLPUBLIC SvLBoxItem
 public:
                         SvLBoxItem( SvLBoxEntry*, USHORT nFlags );
                         SvLBoxItem();
-    virtual             ~SvLBoxItem();
-    virtual USHORT      IsA() = 0;
-    const Size&         GetSize( SvLBox* pView, SvLBoxEntry* pEntry );
-    const Size&         GetSize( SvLBoxEntry*, SvViewDataEntry* );
-    const Size&         GetSize( SvViewDataEntry* pData, USHORT nItemPos )
+    virtual				~SvLBoxItem();
+    virtual USHORT		IsA() = 0;
+    const Size& 		GetSize( SvLBox* pView, SvLBoxEntry* pEntry );
+    const Size&			GetSize( SvLBoxEntry*, SvViewDataEntry* );
+    const Size&			GetSize( SvViewDataEntry* pData, USHORT nItemPos )
                         {
                             SvViewDataItem* pIData=pData->pItemData+nItemPos;
                             return pIData->aSize;
                         }
 
-    virtual void        Paint( const Point& rPos, SvLBox& rOutDev,
+    virtual void		Paint( const Point& rPos, SvLBox& rOutDev,
                             USHORT nViewDataEntryFlags,
                             SvLBoxEntry* pEntry ) = 0;
 
-    virtual void        InitViewData( SvLBox* pView, SvLBoxEntry* pEntry,
+    virtual void		InitViewData( SvLBox* pView, SvLBoxEntry* pEntry,
                             // wenn != 0 muss dieser Pointer benutzt werden!
                             // wenn == 0 muss er ueber die View geholt werden
                             SvViewDataItem* pViewData = 0) = 0;
     virtual SvLBoxItem* Create() const = 0;
     // view-abhaengige Daten werden nicht geklont
-    virtual void        Clone( SvLBoxItem* pSource ) = 0;
+    virtual void 		Clone( SvLBoxItem* pSource ) = 0;
 };
 
 // Flags, die am Model haengen
-#define SV_ENTRYFLAG_CHILDS_ON_DEMAND   0x0001
-#define SV_ENTRYFLAG_DISABLE_DROP       0x0002
-#define SV_ENTRYFLAG_IN_USE             0x0004
+#define SV_ENTRYFLAG_CHILDS_ON_DEMAND	0x0001
+#define SV_ENTRYFLAG_DISABLE_DROP 		0x0002
+#define SV_ENTRYFLAG_IN_USE 			0x0004
 // wird gesetzt, wenn RequestingChilds keine Childs gestzt hat
-#define SV_ENTRYFLAG_NO_NODEBMP         0x0008
+#define SV_ENTRYFLAG_NO_NODEBMP			0x0008
 // Eintrag hatte oder hat Kinder
-#define SV_ENTRYFLAG_HAD_CHILDREN       0x0010
+#define SV_ENTRYFLAG_HAD_CHILDREN		0x0010
 
-#define SV_ENTRYFLAG_USER_FLAGS         0xF000
-#define SV_ENTRYFLAG_SEMITRANSPARENT    0x8000      // draw semi-transparent entry bitmaps
+#define SV_ENTRYFLAG_USER_FLAGS			0xF000
+#define SV_ENTRYFLAG_SEMITRANSPARENT	0x8000		// draw semi-transparent entry bitmaps
 
 class SVT_DLLPUBLIC SvLBoxEntry : public SvListEntry
 {
     friend class SvLBox;
 
-    SvPtrarr    aItems;
-    void*       pUserData;
-    USHORT      nEntryFlags;
+    SvPtrarr 	aItems;
+    void*	 	pUserData;
+    USHORT	 	nEntryFlags;
 //#if 0 // _SOLAR__PRIVATE
-    SVT_DLLPRIVATE void         DeleteItems_Impl();
+    SVT_DLLPRIVATE void 		DeleteItems_Impl();
 //#endif
 public:
 
                 SvLBoxEntry();
-    virtual     ~SvLBoxEntry();
+    virtual 	~SvLBoxEntry();
 
-    USHORT      ItemCount() const { return (USHORT)aItems.Count(); }
+    USHORT		ItemCount() const { return (USHORT)aItems.Count(); }
     // DARF NUR GERUFEN WERDEN, WENN DER EINTRAG NOCH NICHT IM MODEL
     // EINGEFUEGT IST, DA SONST FUER DAS ITEM KEINE VIEW-ABHAENGIGEN
     // DATEN ALLOZIERT WERDEN!
-    void        AddItem( SvLBoxItem* pItem );
-    void        ReplaceItem( SvLBoxItem* pNewItem, USHORT nPos );
-    SvLBoxItem* GetItem( USHORT nPos ) const { return (SvLBoxItem*)aItems.GetObject(nPos ); }
+    void		AddItem( SvLBoxItem* pItem );
+    void		ReplaceItem( SvLBoxItem* pNewItem, USHORT nPos );
+    SvLBoxItem*	GetItem( USHORT nPos ) const { return (SvLBoxItem*)aItems.GetObject(nPos ); }
     SvLBoxItem* GetFirstItem( USHORT nId );
-    USHORT      GetPos( SvLBoxItem* pItem ) const { return aItems.GetPos( pItem ); }
-    void*       GetUserData() const { return pUserData; }
-    void        SetUserData( void* pPtr ) { pUserData = pPtr; }
+    USHORT		GetPos( SvLBoxItem* pItem ) const { return aItems.GetPos( pItem ); }
+    void*		GetUserData() const { return pUserData; }
+    void		SetUserData( void* pPtr ) { pUserData = pPtr; }
     virtual void Clone( SvListEntry* pSource );
-    void        EnableChildsOnDemand( BOOL bEnable=TRUE );
-    BOOL        HasChildsOnDemand() const { return (BOOL)((nEntryFlags & SV_ENTRYFLAG_CHILDS_ON_DEMAND)!=0); }
-    BOOL        HasInUseEmphasis() const    { return (BOOL)((nEntryFlags & SV_ENTRYFLAG_IN_USE)!=0); }
+    void 		EnableChildsOnDemand( BOOL bEnable=TRUE );
+    BOOL 		HasChildsOnDemand() const { return (BOOL)((nEntryFlags & SV_ENTRYFLAG_CHILDS_ON_DEMAND)!=0); }
+    BOOL		HasInUseEmphasis() const	{ return (BOOL)((nEntryFlags & SV_ENTRYFLAG_IN_USE)!=0); }
 
-    USHORT      GetFlags() const { return nEntryFlags; }
-    void        SetFlags( USHORT nFlags ) { nEntryFlags = nFlags; }
+    USHORT		GetFlags() const { return nEntryFlags; }
+    void		SetFlags( USHORT nFlags ) { nEntryFlags = nFlags; }
 };
 
 // *********************************************************************
 // ****************************** SvLBox *******************************
 // *********************************************************************
 
-#define WB_FORCE_SELECTION          ((WinBits)0x8000)
+#define WB_FORCE_SELECTION			((WinBits)0x8000)
 
 #define DragDropMode USHORT
-#define SV_DRAGDROP_NONE            (DragDropMode)0x0000
-#define SV_DRAGDROP_CTRL_MOVE       (DragDropMode)0x0001
-#define SV_DRAGDROP_CTRL_COPY       (DragDropMode)0x0002
-#define SV_DRAGDROP_APP_MOVE        (DragDropMode)0x0004
-#define SV_DRAGDROP_APP_COPY        (DragDropMode)0x0008
-#define SV_DRAGDROP_APP_DROP        (DragDropMode)0x0010
+#define SV_DRAGDROP_NONE			(DragDropMode)0x0000
+#define SV_DRAGDROP_CTRL_MOVE		(DragDropMode)0x0001
+#define SV_DRAGDROP_CTRL_COPY		(DragDropMode)0x0002
+#define SV_DRAGDROP_APP_MOVE   		(DragDropMode)0x0004
+#define SV_DRAGDROP_APP_COPY		(DragDropMode)0x0008
+#define SV_DRAGDROP_APP_DROP		(DragDropMode)0x0010
 // Entries duerfen ueber den obersten Eintrag gedroppt werden.
 // Das Drop-Target ist in diesem Fall 0
-#define SV_DRAGDROP_ENABLE_TOP      (DragDropMode)0x0020
+#define SV_DRAGDROP_ENABLE_TOP		(DragDropMode)0x0020
 
 DECLARE_SVTREELIST(SvLBoxTreeList, SvLBoxEntry*)
 
 #define SVLISTBOX_ID_LBOX 0   // fuer SvLBox::IsA()
 
-#define SVLBOX_IN_EDT           0x0001
-#define SVLBOX_EDT_ENABLED      0x0002
-#define SVLBOX_IS_EXPANDING     0x0004
-#define SVLBOX_IS_TRAVELSELECT  0x0008
-#define SVLBOX_TARGEMPH_VIS     0x0010
-#define SVLBOX_EDTEND_CALLED    0x0020
+#define SVLBOX_IN_EDT			0x0001
+#define SVLBOX_EDT_ENABLED		0x0002
+#define SVLBOX_IS_EXPANDING		0x0004
+#define SVLBOX_IS_TRAVELSELECT	0x0008
+#define SVLBOX_TARGEMPH_VIS		0x0010
+#define SVLBOX_EDTEND_CALLED	0x0020
 
 class SvLBox;
 struct SvLBox_Impl
@@ -290,29 +290,29 @@ class SVT_DLLPUBLIC SvLBox
 
 protected:
 
-    WinBits         nWindowStyle;
-    Link            aExpandedHdl;
-    Link            aExpandingHdl;
-    Link            aSelectHdl;
-    Link            aDeselectHdl;
-    Link            aDoubleClickHdl;
-    SvLBoxEntry*    pHdlEntry;
-    SvLBoxItem*     pHdlItem;
-    SvLBoxEntry*    pTargetEntry;
+    WinBits			nWindowStyle;
+    Link			aExpandedHdl;
+    Link			aExpandingHdl;
+    Link			aSelectHdl;
+    Link			aDeselectHdl;
+    Link			aDoubleClickHdl;
+    SvLBoxEntry*	pHdlEntry;
+    SvLBoxItem*		pHdlItem;
+    SvLBoxEntry*	pTargetEntry;
 
     SvLBox_Impl*    pLBoxImpl;
 
-    USHORT          nImpFlags;
+    USHORT			nImpFlags;
     // Move/CopySelection: Position des aktuellen Eintrags in Selektionsliste
-    USHORT          nCurEntrySelPos;
+    USHORT			nCurEntrySelPos;
 
-    DragDropMode    nDragDropMode;
-    SelectionMode   eSelMode;
-    sal_Int8        nDragOptions;
+    DragDropMode	nDragDropMode;
+    SelectionMode	eSelMode;
+    sal_Int8 		nDragOptions;
 
-    BOOL            CheckDragAndDropMode( SvLBox* pSource, sal_Int8 );
-    void            ImplShowTargetEmphasis( SvLBoxEntry* pEntry, BOOL bShow);
-    void            EnableSelectionAsDropTarget( BOOL bEnable = TRUE,
+    BOOL			CheckDragAndDropMode( SvLBox* pSource, sal_Int8 );
+    void			ImplShowTargetEmphasis( SvLBoxEntry* pEntry, BOOL bShow);
+    void			EnableSelectionAsDropTarget( BOOL bEnable = TRUE,
                                                  BOOL bWithChilds = TRUE );
     // standard impl gibt 0 zurueck; muss von abgeleiteten Klassen, die
     // D&D unterstuetzen, ueberladen werden
@@ -327,43 +327,43 @@ protected:
 
     // invalidate children on enable/disable
     virtual void StateChanged( StateChangedType );
-
+    
     virtual ULONG Insert( SvLBoxEntry* pEnt,SvLBoxEntry* pPar,ULONG nPos=LIST_APPEND);
     virtual ULONG Insert( SvLBoxEntry* pEntry,ULONG nRootPos = LIST_APPEND );
-    void            InsertTree( SvLBoxEntry* pTree, SvLBoxEntry* pTarget) {pModel->InsertTree( pTree, pTarget ); }
+    void			InsertTree( SvLBoxEntry* pTree, SvLBoxEntry* pTarget) {pModel->InsertTree( pTree, pTarget ); }
 
     // Inplace-Editing
     SvInplaceEdit2*  pEdCtrl;
-    void            EnableInplaceEditing( BOOL bEnable){if(bEnable)nImpFlags|=SVLBOX_EDT_ENABLED; else nImpFlags&=~SVLBOX_EDT_ENABLED;}
-    BOOL            IsInplaceEditingEnabled() const { return (BOOL)((nImpFlags&SVLBOX_EDT_ENABLED)!=0); }
-    virtual void    EditingRequest( SvLBoxEntry* pEntry, SvLBoxItem* pItem,
+    void			EnableInplaceEditing( BOOL bEnable){if(bEnable)nImpFlags|=SVLBOX_EDT_ENABLED; else nImpFlags&=~SVLBOX_EDT_ENABLED;}
+    BOOL			IsInplaceEditingEnabled() const { return (BOOL)((nImpFlags&SVLBOX_EDT_ENABLED)!=0); }
+    virtual void	EditingRequest( SvLBoxEntry* pEntry, SvLBoxItem* pItem,
                         const Point& rMousePos );
-    void            EditText( const String&, const Rectangle&,const Selection&);
-    void            EditText( const String&, const Rectangle&,const Selection&, BOOL bMulti);
-    void            EditTextMultiLine( const String&, const Rectangle&,const Selection&);
-    void            CancelTextEditing();
-    BOOL            IsEditingActive() const { return (BOOL)((nImpFlags & SVLBOX_IN_EDT)!=0); }
-    BOOL            EditingCanceled() const;
-    void            EndEditing( BOOL bCancel = FALSE );
+    void			EditText( const String&, const Rectangle&,const Selection&);
+    void			EditText( const String&, const Rectangle&,const Selection&, BOOL bMulti);
+    void			EditTextMultiLine( const String&, const Rectangle&,const Selection&);
+    void			CancelTextEditing();
+    BOOL			IsEditingActive() const	{ return (BOOL)((nImpFlags & SVLBOX_IN_EDT)!=0); }
+    BOOL			EditingCanceled() const;
+    void			EndEditing( BOOL bCancel = FALSE );
     bool            IsEmptyTextAllowed() const;
     void            ForbidEmptyText();
     // Callback EditText
-    virtual void    EditedText( const String& );
+    virtual	void	EditedText( const String& );
 
     // Rueckgabewert muss von SvViewDataEntry abgeleitet sein!
-    virtual SvViewData* CreateViewData( SvListEntry* );
+    virtual	SvViewData* CreateViewData( SvListEntry* );
     // InitViewData wird direkt nach CreateViewData aufgerufen
     // In InitViewData ist der Entry noch nicht in die View eingefuegt!
     virtual void InitViewData( SvViewData*, SvListEntry* pEntry );
     // ruft fuer Items aller Entries InitViewData auf
-    void            RecalcViewData();
+    void			RecalcViewData();
     // Callback von RecalcViewData
-    virtual void    ViewDataInitialized( SvLBoxEntry* );
+    virtual void	ViewDataInitialized( SvLBoxEntry* );
 
     virtual void    Command( const CommandEvent& rCEvt );
-    virtual void    KeyInput( const KeyEvent& rKEvt );
+    virtual void	KeyInput( const KeyEvent& rKEvt );
     virtual SvLBoxEntry* GetEntry( const Point& rPos, BOOL bHit=FALSE ) const;
-    virtual void    ModelHasEntryInvalidated( SvListEntry* pEntry );
+    virtual void 	ModelHasEntryInvalidated( SvListEntry* pEntry );
 
      // handler and methods for Drag - finished handler. This link can be set
     // to the TransferDataContainer. The AddBox/RemoveBox methods must be
@@ -374,74 +374,74 @@ protected:
     Link GetDragFinishedHdl() const;
 
     // for asynchronous D&D
-    sal_Int8        ExecuteDrop( const ExecuteDropEvent& rEvt, SvLBox* pSourceView );
+    sal_Int8    	ExecuteDrop( const ExecuteDropEvent& rEvt, SvLBox* pSourceView );
 
      // IMnemonicEntryList
      virtual const void* FirstSearchEntry( String& _rEntryText );
      virtual const void* NextSearchEntry( const void* _pCurrentSearchEntry, String& _rEntryText );
      virtual void        SelectSearchEntry( const void* _pEntry );
      virtual void        ExecuteSearchEntry( const void* _pEntry );
-
+ 
 public:
 
     SvLBox( Window* pParent, WinBits nWinStyle=0 );
     SvLBox( Window* pParent, const ResId& rResId );
     ~SvLBox();
 
-    SvLBoxTreeList* GetModel() const { return (SvLBoxTreeList*)pModel; }
+    SvLBoxTreeList*	GetModel() const { return (SvLBoxTreeList*)pModel; }
     using SvListView::SetModel;
-    void            SetModel( SvLBoxTreeList* );
-    void            DisconnectFromModel();
+    void			SetModel( SvLBoxTreeList* );
+    void			DisconnectFromModel();
 
-    virtual USHORT  IsA();
-    ULONG           GetEntryCount() const {return pModel->GetEntryCount();}
+    virtual USHORT	IsA();
+    ULONG			GetEntryCount() const {return pModel->GetEntryCount();}
     SvLBoxEntry*    First() const { return (SvLBoxEntry*)(pModel->First()); }
     SvLBoxEntry*    Next( SvLBoxEntry* pEntry, USHORT* pDepth=0 ) const { return (SvLBoxEntry*)(pModel->Next(pEntry,pDepth));}
-    SvLBoxEntry*    Prev( SvLBoxEntry* pEntry, USHORT* pDepth=0 ) const { return (SvLBoxEntry*)(pModel->Prev(pEntry,pDepth));}
-    SvLBoxEntry*    Last( USHORT* pDepth=0 ) const { return (SvLBoxEntry*)(pModel->Last(pDepth));}
+    SvLBoxEntry*	Prev( SvLBoxEntry* pEntry, USHORT* pDepth=0 ) const { return (SvLBoxEntry*)(pModel->Prev(pEntry,pDepth));}
+    SvLBoxEntry*	Last( USHORT* pDepth=0 ) const { return (SvLBoxEntry*)(pModel->Last(pDepth));}
 
-    SvLBoxEntry*    FirstChild(SvLBoxEntry* pParent ) const { return (SvLBoxEntry*)(pModel->FirstChild(pParent)); }
-    SvLBoxEntry*    NextSibling(SvLBoxEntry* pEntry ) const { return (SvLBoxEntry*)(pModel->NextSibling( pEntry )); }
-    SvLBoxEntry*    PrevSibling(SvLBoxEntry* pEntry ) const { return (SvLBoxEntry*)(pModel->PrevSibling( pEntry )); }
+    SvLBoxEntry*	FirstChild(SvLBoxEntry* pParent ) const { return (SvLBoxEntry*)(pModel->FirstChild(pParent)); }
+    SvLBoxEntry*	NextSibling(SvLBoxEntry* pEntry ) const { return (SvLBoxEntry*)(pModel->NextSibling( pEntry )); }
+    SvLBoxEntry*	PrevSibling(SvLBoxEntry* pEntry ) const { return (SvLBoxEntry*)(pModel->PrevSibling( pEntry )); }
 
-    SvLBoxEntry*    FirstSelected() const { return (SvLBoxEntry*)SvListView::FirstSelected(); }
+    SvLBoxEntry*	FirstSelected() const { return (SvLBoxEntry*)SvListView::FirstSelected(); }
     using SvListView::NextSelected;
     SvLBoxEntry*    NextSelected( SvLBoxEntry* pEntry ) const { return (SvLBoxEntry*)(SvListView::NextSelected(pEntry)); }
     using SvListView::PrevSelected;
-    SvLBoxEntry*    PrevSelected( SvLBoxEntry* pEntry ) const { return (SvLBoxEntry*)(SvListView::PrevSelected(pEntry)); }
-    SvLBoxEntry*    LastSelected() const { return (SvLBoxEntry*)(SvListView::LastSelected()); }
+    SvLBoxEntry*	PrevSelected( SvLBoxEntry* pEntry ) const { return (SvLBoxEntry*)(SvListView::PrevSelected(pEntry)); }
+    SvLBoxEntry*	LastSelected() const { return (SvLBoxEntry*)(SvListView::LastSelected()); }
 
-    BOOL            CopySelection( SvLBox* pSource, SvLBoxEntry* pTarget );
-    BOOL            MoveSelection( SvLBox* pSource, SvLBoxEntry* pTarget );
-    BOOL            MoveSelectionCopyFallbackPossible( SvLBox* pSource, SvLBoxEntry* pTarget, sal_Bool bAllowCopyFallback );
-    void            RemoveSelection();
+    BOOL 			CopySelection( SvLBox* pSource, SvLBoxEntry* pTarget );
+    BOOL 			MoveSelection( SvLBox* pSource, SvLBoxEntry* pTarget );
+    BOOL			MoveSelectionCopyFallbackPossible( SvLBox* pSource, SvLBoxEntry* pTarget, sal_Bool bAllowCopyFallback );
+    void 			RemoveSelection();
 
-    DragDropMode    GetDragDropMode() const { return nDragDropMode; }
-    virtual void    SetDragDropMode( DragDropMode );
-    SelectionMode   GetSelectionMode() const { return eSelMode; }
-    virtual void    SetSelectionMode( SelectionMode );
+    DragDropMode	GetDragDropMode() const { return nDragDropMode; }
+    virtual void	SetDragDropMode( DragDropMode );
+    SelectionMode	GetSelectionMode() const { return eSelMode; }
+    virtual void 	SetSelectionMode( SelectionMode );
 
     // pParent==0 -> Root-Ebene
-    SvLBoxEntry*    GetEntry( SvLBoxEntry* pParent, ULONG nPos ) const { return (SvLBoxEntry*)(pModel->GetEntry(pParent,nPos)); }
-    SvLBoxEntry*    GetEntry( ULONG nRootPos ) const { return (SvLBoxEntry*)(pModel->GetEntry(nRootPos)); }
+    SvLBoxEntry*	GetEntry( SvLBoxEntry* pParent, ULONG nPos ) const { return (SvLBoxEntry*)(pModel->GetEntry(pParent,nPos)); }
+    SvLBoxEntry*	GetEntry( ULONG nRootPos ) const { return (SvLBoxEntry*)(pModel->GetEntry(nRootPos)); }
 
-    SvLBoxEntry*    GetEntryFromPath( const ::std::deque< sal_Int32 >& _rPath ) const;
-    void            FillEntryPath( SvLBoxEntry* pEntry, ::std::deque< sal_Int32 >& _rPath ) const;
-    virtual String  GetEntryText( SvLBoxEntry* pEntry ) const;
+    SvLBoxEntry*	GetEntryFromPath( const ::std::deque< sal_Int32 >& _rPath ) const;
+    void			FillEntryPath( SvLBoxEntry* pEntry, ::std::deque< sal_Int32 >& _rPath ) const;
+    virtual	String	GetEntryText( SvLBoxEntry* pEntry ) const;
 
     using Window::GetParent;
-    SvLBoxEntry*    GetParent( SvLBoxEntry* pEntry ) const { return (SvLBoxEntry*)(pModel->GetParent(pEntry)); }
-    SvLBoxEntry*    GetRootLevelParent(SvLBoxEntry* pEntry ) const { return (SvLBoxEntry*)(pModel->GetRootLevelParent( pEntry ));}
+    SvLBoxEntry*	GetParent( SvLBoxEntry* pEntry ) const { return (SvLBoxEntry*)(pModel->GetParent(pEntry)); }
+    SvLBoxEntry* 	GetRootLevelParent(SvLBoxEntry* pEntry ) const { return (SvLBoxEntry*)(pModel->GetRootLevelParent( pEntry ));}
 
     using Window::GetChildCount;
-    ULONG           GetChildCount( SvLBoxEntry* pParent ) const { return pModel->GetChildCount(pParent); }
-    ULONG           GetLevelChildCount( SvLBoxEntry* pParent ) const;
+    ULONG			GetChildCount( SvLBoxEntry* pParent ) const { return pModel->GetChildCount(pParent); }
+    ULONG			GetLevelChildCount( SvLBoxEntry* pParent ) const;
 
     SvViewDataEntry* GetViewDataEntry( SvListEntry* pEntry ) const { return (SvViewDataEntry*)SvListView::GetViewData(pEntry); }
-    SvViewDataItem*  GetViewDataItem( SvListEntry*, SvLBoxItem* ) const;
+    SvViewDataItem*	 GetViewDataItem( SvListEntry*, SvLBoxItem* ) const;
 
-    virtual void    MakeVisible( SvLBoxEntry* pEntry );
-    void            Clear();
+    virtual void	MakeVisible( SvLBoxEntry* pEntry );
+    void    		Clear();
 
     /** enables or disables mnemonic characters in the entry texts.
 
@@ -481,37 +481,37 @@ public:
     virtual BOOL    Expand( SvLBoxEntry* pParent );
     virtual BOOL    Collapse( SvLBoxEntry* pParent );
     virtual BOOL    Select( SvLBoxEntry* pEntry, BOOL bSelect=TRUE );
-    virtual ULONG   SelectChilds( SvLBoxEntry* pParent, BOOL bSelect );
-    virtual void    SelectAll( BOOL bSelect, BOOL bPaint=TRUE );
+    virtual ULONG	SelectChilds( SvLBoxEntry* pParent, BOOL bSelect );
+    virtual void	SelectAll( BOOL bSelect, BOOL bPaint=TRUE );
 
     virtual void    SetCurEntry( SvLBoxEntry* _pEntry ) = 0;
     virtual SvLBoxEntry*
                     GetCurEntry() const = 0;
 
     // Model
-    void            SetInUseEmphasis( SvLBoxEntry* pEntry, BOOL bInUse=TRUE);
+    void			SetInUseEmphasis( SvLBoxEntry* pEntry, BOOL bInUse=TRUE);
     // View
-    void            SetCursorEmphasis( SvLBoxEntry* pEntry, BOOL bCursored=TRUE);
-    BOOL            HasCursorEmphasis( SvLBoxEntry* pEntry ) const;
+    void			SetCursorEmphasis( SvLBoxEntry* pEntry, BOOL bCursored=TRUE);
+    BOOL			HasCursorEmphasis( SvLBoxEntry* pEntry ) const;
 
     void            SetSelectHdl( const Link& rNewHdl ) {aSelectHdl=rNewHdl; }
     void            SetDeselectHdl( const Link& rNewHdl ) {aDeselectHdl=rNewHdl; }
-    void            SetDoubleClickHdl(const Link& rNewHdl) {aDoubleClickHdl=rNewHdl;}
+    void			SetDoubleClickHdl(const Link& rNewHdl) {aDoubleClickHdl=rNewHdl;}
     const Link&     GetSelectHdl() const { return aSelectHdl; }
     const Link&     GetDeselectHdl() const { return aDeselectHdl; }
-    const Link&     GetDoubleClickHdl() const { return aDoubleClickHdl; }
+    const Link&		GetDoubleClickHdl() const { return aDoubleClickHdl; }
     void            SetExpandingHdl(const Link& rNewHdl){aExpandingHdl=rNewHdl;}
-    void            SetExpandedHdl(const Link& rNewHdl){aExpandedHdl=rNewHdl;}
+    void			SetExpandedHdl(const Link& rNewHdl){aExpandedHdl=rNewHdl;}
     const Link&     GetExpandingHdl() const { return aExpandingHdl; }
 
-    virtual void    ExpandedHdl();
-    virtual long    ExpandingHdl();
-    virtual void    SelectHdl();
-    virtual void    DeselectHdl();
-    virtual BOOL    DoubleClickHdl();
-    BOOL            IsTravelSelect() const { return (BOOL)((nImpFlags&SVLBOX_IS_TRAVELSELECT)!=0);}
-    SvLBoxEntry*    GetHdlEntry() const { return pHdlEntry; }
-    SvLBoxItem*     GetHdlItem() const;
+    virtual void 	ExpandedHdl();
+    virtual long 	ExpandingHdl();
+    virtual void 	SelectHdl();
+    virtual void 	DeselectHdl();
+    virtual BOOL 	DoubleClickHdl();
+    BOOL			IsTravelSelect() const { return (BOOL)((nImpFlags&SVLBOX_IS_TRAVELSELECT)!=0);}
+    SvLBoxEntry*	GetHdlEntry() const { return pHdlEntry; }
+    SvLBoxItem*		GetHdlItem() const;
 
     // wird aufgerufen, wenn ein Eintrag mit gesetztem
     // ENTRYFLAG_CHILDS_ON_DEMAND expandiert wird.
@@ -520,40 +520,40 @@ public:
     // Drag & Drop
 
     //JP 28.3.2001: new Drag & Drop API
-    virtual sal_Int8    AcceptDrop( const AcceptDropEvent& rEvt );
+    virtual sal_Int8	AcceptDrop( const AcceptDropEvent& rEvt );
     virtual sal_Int8    ExecuteDrop( const ExecuteDropEvent& rEvt );
-    virtual void        StartDrag( sal_Int8 nAction, const Point& rPosPixel );
-    virtual DragDropMode    NotifyStartDrag( TransferDataContainer& rData,
+    virtual void		StartDrag( sal_Int8 nAction, const Point& rPosPixel );
+    virtual DragDropMode	NotifyStartDrag( TransferDataContainer& rData,
                                          SvLBoxEntry* );
-    virtual void        DragFinished( sal_Int8 nDropAction );
-    virtual BOOL        NotifyAcceptDrop( SvLBoxEntry* );
+    virtual void		DragFinished( sal_Int8 nDropAction );
+    virtual BOOL 		NotifyAcceptDrop( SvLBoxEntry* );
 
-    void            SetDragOptions( sal_Int8 nOptions ) { nDragOptions = nOptions; }
-    sal_Int8        GetDragOptions() const { return nDragOptions; }
+    void			SetDragOptions( sal_Int8 nOptions ) { nDragOptions = nOptions; }
+    sal_Int8 		GetDragOptions() const { return nDragOptions; }
 
-    SvLBox*         GetSourceView() const;
-    SvLBox*         GetTargetView() const;
+    SvLBox*			GetSourceView() const;
+    SvLBox*			GetTargetView() const;
 
-    virtual void    NotifyRemoving( SvLBoxEntry* );
-    virtual void    ShowTargetEmphasis( SvLBoxEntry*, BOOL bShow );
+    virtual void	NotifyRemoving( SvLBoxEntry* );
+    virtual void	ShowTargetEmphasis( SvLBoxEntry*, BOOL bShow );
     virtual SvLBoxEntry* CloneEntry( SvLBoxEntry* pSource );
     virtual SvLBoxEntry* CreateEntry() const; // zum 'new'en von Entries
 
     // Rueckgabe: TRUE==Ok, FALSE==Abbrechen
-    virtual BOOL    NotifyMoving(
-        SvLBoxEntry*  pTarget,       // D&D-Drop-Position in this->GetModel()
-        SvLBoxEntry*  pEntry,        // Zu verschiebender Entry aus
+    virtual BOOL	NotifyMoving(
+        SvLBoxEntry*  pTarget,		 // D&D-Drop-Position in this->GetModel()
+        SvLBoxEntry*  pEntry,		 // Zu verschiebender Entry aus
                                      // GetSourceListBox()->GetModel()
         SvLBoxEntry*& rpNewParent,   // Neuer Target-Parent
-        ULONG&        rNewChildPos); // Position in Childlist des Target-Parents
+        ULONG&		  rNewChildPos); // Position in Childlist des Target-Parents
 
     // Rueckgabe: TRUE==Ok, FALSE==Abbrechen
-    virtual BOOL    NotifyCopying(
-        SvLBoxEntry*  pTarget,       // D&D-Drop-Position in this->GetModel()
-        SvLBoxEntry*  pEntry,        // Zu kopierender Entry aus
+    virtual BOOL	NotifyCopying(
+        SvLBoxEntry*  pTarget,		 // D&D-Drop-Position in this->GetModel()
+        SvLBoxEntry*  pEntry,		 // Zu kopierender Entry aus
                                      // GetSourceListBox()->GetModel()
         SvLBoxEntry*& rpNewParent,   // Neuer Target-Parent
-        ULONG&        rNewChildPos); // Position in Childlist des Target-Parents
+        ULONG&		  rNewChildPos); // Position in Childlist des Target-Parents
 
     // ACCESSIBILITY ==========================================================
 
@@ -568,7 +568,7 @@ public:
         @param pEntry
             The entry.
         @return  The bounding rectangle of an entry. */
-    virtual Rectangle   GetBoundingRect( SvLBoxEntry* pEntry );
+    virtual Rectangle	GetBoundingRect( SvLBoxEntry* pEntry );
 
 protected:
     using SvListView::Expand;
@@ -581,25 +581,25 @@ protected:
 #define SV_LBOX_DD_FORMAT "SV_LBOX_DD_FORMAT"
 struct SvLBoxDDInfo
 {
-    Application*    pApp;
-    SvLBox*         pSource;
-    SvLBoxEntry*    pDDStartEntry;
+    Application*	pApp;
+    SvLBox*			pSource;
+    SvLBoxEntry*	pDDStartEntry;
     // relative Position im Eintrag bei Drag-Beginn (IconView)
-    long            nMouseRelX,nMouseRelY;
-    ULONG           nRes1,nRes2,nRes3,nRes4;
+    long 			nMouseRelX,nMouseRelY;
+    ULONG			nRes1,nRes2,nRes3,nRes4;
 };
 
 class SvInplaceEdit : public Edit
 {
-    Link        aCallBackHdl;
+    Link 		aCallBackHdl;
     Accelerator aAccReturn;
     Accelerator aAccEscape;
-    Timer       aTimer;
-    BOOL        bCanceled;
-    BOOL        bAlreadyInCallBack;
+    Timer 		aTimer;
+    BOOL 		bCanceled;
+    BOOL 		bAlreadyInCallBack;
 
 //#if 0 // _SOLAR__PRIVATE
-    void        CallCallBackHdl_Impl();
+    void 		CallCallBackHdl_Impl();
     DECL_LINK( Timeout_Impl, Timer * );
     DECL_LINK( ReturnHdl_Impl, Accelerator * );
     DECL_LINK( EscapeHdl_Impl, Accelerator * );
@@ -611,26 +611,26 @@ public:
                    const Selection& );
     ~SvInplaceEdit();
 
-    virtual void    KeyInput( const KeyEvent& rKEvt );
-    virtual void    LoseFocus();
-    BOOL            EditingCanceled() const { return bCanceled; }
-    String          GetText() const { return Edit::GetText(); }
-    void            StopEditing( BOOL bCancel = FALSE );
+    virtual void	KeyInput( const KeyEvent& rKEvt );
+    virtual void	LoseFocus();
+    BOOL			EditingCanceled() const { return bCanceled; }
+    String	 		GetText() const { return Edit::GetText(); }
+    void			StopEditing( BOOL bCancel = FALSE );
 };
 
 class SvInplaceEdit2
 {
-    Link        aCallBackHdl;
+    Link 		aCallBackHdl;
     Accelerator aAccReturn;
     Accelerator aAccEscape;
-    Timer       aTimer;
-    Edit*       pEdit;
-    BOOL        bCanceled;
-    BOOL        bAlreadyInCallBack;
-    BOOL        bMultiLine;
+    Timer 		aTimer;
+    Edit*		pEdit;
+    BOOL 		bCanceled;
+    BOOL 		bAlreadyInCallBack;
+    BOOL		bMultiLine;
 
 //#if 0 // _SOLAR__PRIVATE
-    void        CallCallBackHdl_Impl();
+    void 		CallCallBackHdl_Impl();
     DECL_LINK( Timeout_Impl, Timer * );
     DECL_LINK( ReturnHdl_Impl, Accelerator * );
     DECL_LINK( EscapeHdl_Impl, Accelerator * );
@@ -641,13 +641,13 @@ public:
                    const String& rData, const Link& rNotifyEditEnd,
                    const Selection&, BOOL bMultiLine = FALSE );
                ~SvInplaceEdit2();
-    BOOL        KeyInput( const KeyEvent& rKEvt );
-    void        LoseFocus();
-    BOOL        EditingCanceled() const { return bCanceled; }
-    String      GetText() const;
-    String      GetSavedValue() const;
-    void        StopEditing( BOOL bCancel = FALSE );
-    void        Hide();
+    BOOL 		KeyInput( const KeyEvent& rKEvt );
+    void 		LoseFocus();
+    BOOL		EditingCanceled() const { return bCanceled; }
+    String		GetText() const;
+    String		GetSavedValue() const;
+    void		StopEditing( BOOL bCancel = FALSE );
+    void		Hide();
 };
 
 inline SvViewDataItem* SvLBox::GetViewDataItem( SvListEntry* pEntry,
diff --git a/svtools/inc/svtools/svmedit.hxx b/svtools/inc/svtools/svmedit.hxx
index 3bdfdc44e8e9..7922e54bbf3e 100644
--- a/svtools/inc/svtools/svmedit.hxx
+++ b/svtools/inc/svtools/svmedit.hxx
@@ -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
@@ -43,29 +43,29 @@ class ExtTextView;
 class SVT_DLLPUBLIC MultiLineEdit : public Edit
 {
 private:
-    ImpSvMEdit*     pImpSvMEdit;
+    ImpSvMEdit*		pImpSvMEdit;
 
-    XubString       aSaveValue;
-    Link            aModifyHdlLink;
+    XubString		aSaveValue;
+    Link			aModifyHdlLink;
 
-    Timer*          pUpdateDataTimer;
-    Link            aUpdateDataHdlLink;
+    Timer*			pUpdateDataTimer;
+    Link			aUpdateDataHdlLink;
 
 protected:
 
-    DECL_LINK(      ImpUpdateDataHdl, Timer* );
-    void            StateChanged( StateChangedType nType );
-    void            DataChanged( const DataChangedEvent& rDCEvt );
-    virtual long    PreNotify( NotifyEvent& rNEvt );
-    long            Notify( NotifyEvent& rNEvt );
+    DECL_LINK( 		ImpUpdateDataHdl, Timer* );
+    void 			StateChanged( StateChangedType nType );
+    void 			DataChanged( const DataChangedEvent& rDCEvt );
+    virtual long 	PreNotify( NotifyEvent& rNEvt );
+    long 			Notify( NotifyEvent& rNEvt );
     using Control::ImplInitSettings;
-    void            ImplInitSettings( BOOL bFont, BOOL bForeground, BOOL bBackground );
-    WinBits         ImplInitStyle( WinBits nStyle );
+    void 			ImplInitSettings( BOOL bFont, BOOL bForeground, BOOL bBackground );
+    WinBits 		ImplInitStyle( WinBits nStyle );
 
-    ExtTextEngine*  GetTextEngine() const;
-    ExtTextView*    GetTextView() const;
-    ScrollBar*      GetHScrollBar() const;
-    ScrollBar*      GetVScrollBar() const;
+    ExtTextEngine*	GetTextEngine() const;
+    ExtTextView*	GetTextView() const;
+    ScrollBar*		GetHScrollBar() const;
+    ScrollBar*		GetVScrollBar() const;
 
 public:
                     MultiLineEdit( Window* pParent, WinBits nWinStyle = WB_LEFT | WB_BORDER );
@@ -73,71 +73,71 @@ public:
                     ~MultiLineEdit();
 
 
-    virtual void    Modify();
-    virtual void    UpdateData();
+    virtual void	Modify();
+    virtual void	UpdateData();
 
-    virtual void    SetModifyFlag();
-    virtual void    ClearModifyFlag();
-    virtual BOOL    IsModified() const;
+    virtual void	SetModifyFlag();
+    virtual void	ClearModifyFlag();
+    virtual BOOL	IsModified() const;
 
-    virtual void    EnableUpdateData( ULONG nTimeout = EDIT_UPDATEDATA_TIMEOUT );
-    virtual void    DisableUpdateData() { delete pUpdateDataTimer; pUpdateDataTimer = NULL; }
-    virtual ULONG   IsUpdateDataEnabled() const;
+    virtual void	EnableUpdateData( ULONG nTimeout = EDIT_UPDATEDATA_TIMEOUT );
+    virtual void	DisableUpdateData() { delete pUpdateDataTimer; pUpdateDataTimer = NULL; }
+    virtual ULONG	IsUpdateDataEnabled() const;
 
-    virtual void    SetReadOnly( BOOL bReadOnly = TRUE );
-    virtual BOOL    IsReadOnly() const;
+    virtual void	SetReadOnly( BOOL bReadOnly = TRUE );
+    virtual BOOL	IsReadOnly() const;
 
-    void            EnableFocusSelectionHide( BOOL bHide );
-    BOOL            IsFocusSelectionHideEnabled() const;
+    void			EnableFocusSelectionHide( BOOL bHide );
+    BOOL			IsFocusSelectionHideEnabled() const;
 
-    virtual void    SetMaxTextLen( xub_StrLen nMaxLen = 0 );
+    virtual void	SetMaxTextLen( xub_StrLen nMaxLen = 0 );
     virtual xub_StrLen GetMaxTextLen() const;
 
-    virtual void    SetSelection( const Selection& rSelection );
+    virtual void	SetSelection( const Selection& rSelection );
     virtual const Selection& GetSelection() const;
 
-    virtual void        ReplaceSelected( const XubString& rStr );
-    virtual void        DeleteSelected();
-    virtual XubString   GetSelected() const;
-    virtual XubString   GetSelected( LineEnd aSeparator ) const;
+    virtual void	    ReplaceSelected( const XubString& rStr );
+    virtual void	    DeleteSelected();
+    virtual XubString	GetSelected() const;
+    virtual XubString	GetSelected( LineEnd aSeparator ) const;
 
-    virtual void    Cut();
-    virtual void    Copy();
-    virtual void    Paste();
+    virtual void	Cut();
+    virtual void	Copy();
+    virtual void	Paste();
 
     virtual void    SetText( const XubString& rStr );
     virtual void    SetText( const XubString& rStr, const Selection& rNewSelection )
                     { SetText( rStr ); SetSelection( rNewSelection ); }
-    String          GetText() const;
-    String          GetText( LineEnd aSeparator ) const;
-    String          GetTextLines() const;
-    String          GetTextLines( LineEnd aSeparator ) const;
+    String			GetText() const;
+    String			GetText( LineEnd aSeparator ) const;
+    String			GetTextLines() const;
+    String			GetTextLines( LineEnd aSeparator ) const;
 
     void            SetRightToLeft( BOOL bRightToLeft );
     BOOL            IsRightToLeft() const;
 
-    void            SaveValue()                         { aSaveValue = GetText(); }
-    const XubString&    GetSavedValue() const               { return aSaveValue; }
+    void			SaveValue() 						{ aSaveValue = GetText(); }
+    const XubString&	GetSavedValue() const 				{ return aSaveValue; }
 
-    void            SetModifyHdl( const Link& rLink )   { aModifyHdlLink = rLink; }
-    const Link&     GetModifyHdl() const                { return aModifyHdlLink; }
+    void			SetModifyHdl( const Link& rLink ) 	{ aModifyHdlLink = rLink; }
+    const Link&		GetModifyHdl() const 				{ return aModifyHdlLink; }
 
-    void            SetUpdateDataHdl( const Link& rLink ) { aUpdateDataHdlLink = rLink; }
-    const Link&     GetUpdateDataHdl() const { return aUpdateDataHdlLink; }
+    void			SetUpdateDataHdl( const Link& rLink ) { aUpdateDataHdlLink = rLink; }
+    const Link&		GetUpdateDataHdl() const { return aUpdateDataHdlLink; }
 
-    virtual void    Resize();
-    virtual void    GetFocus();
+    virtual void	Resize();
+    virtual void	GetFocus();
 
-    Size            CalcMinimumSize() const;
-    Size            CalcAdjustedSize( const Size& rPrefSize ) const;
+    Size			CalcMinimumSize() const;
+    Size			CalcAdjustedSize( const Size& rPrefSize ) const;
     using Edit::CalcSize;
-    Size            CalcSize( USHORT nColumns, USHORT nLines ) const;
-    void            GetMaxVisColumnsAndLines( USHORT& rnCols, USHORT& rnLines ) const;
+    Size			CalcSize( USHORT nColumns, USHORT nLines ) const;
+    void			GetMaxVisColumnsAndLines( USHORT& rnCols, USHORT& rnLines ) const;
 
-    void            Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, ULONG nFlags );
+    void 			Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, ULONG nFlags );
 
-       void         SetLeftMargin( USHORT n );
-    USHORT          GetLeftMargin() const;
+       void			SetLeftMargin( USHORT n );
+    USHORT			GetLeftMargin() const;
 
     virtual
     ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer >
diff --git a/svtools/inc/svtools/svmedit2.hxx b/svtools/inc/svtools/svmedit2.hxx
index e09592cfc172..e0a0c9dc2057 100644
--- a/svtools/inc/svtools/svmedit2.hxx
+++ b/svtools/inc/svtools/svmedit2.hxx
@@ -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
@@ -40,14 +40,14 @@ public:
                     ~ExtMultiLineEdit();
 
                     // methods of TextView
-    void            InsertText( const String& rNew, BOOL bSelect = FALSE );
-    void            SetAutoScroll( BOOL bAutoScroll );
-    void            EnableCursor( BOOL bEnable );
+    void			InsertText( const String& rNew, BOOL bSelect = FALSE );
+    void			SetAutoScroll( BOOL bAutoScroll );
+    void			EnableCursor( BOOL bEnable );
 
                     // methods of TextEngine
-    void            SetAttrib( const TextAttrib& rAttr, ULONG nPara, USHORT nStart, USHORT nEnd );
-    void            SetLeftMargin( USHORT nLeftMargin );
-    ULONG           GetParagraphCount() const;
+    void			SetAttrib( const TextAttrib& rAttr, ULONG nPara, USHORT nStart, USHORT nEnd );
+    void			SetLeftMargin( USHORT nLeftMargin );
+    ULONG			GetParagraphCount() const;
 };
 
 #endif
diff --git a/svtools/inc/svtools/svparser.hxx b/svtools/inc/svtools/svparser.hxx
index bd24298011e2..eaf00f97f2f4 100644
--- a/svtools/inc/svtools/svparser.hxx
+++ b/svtools/inc/svtools/svparser.hxx
@@ -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,55 +56,55 @@ class SVT_DLLPUBLIC SvParser : public SvRefBase
     DECL_STATIC_LINK( SvParser, NewDataRead, void* );
 
 protected:
-    SvStream&       rInput;
-    String          aToken;             // gescanntes Token
-    ULONG           nlLineNr;           // akt. Zeilen Nummer
-    ULONG           nlLinePos;          // akt. Spalten Nummer
+    SvStream&		rInput;
+    String 	  		aToken;				// gescanntes Token
+    ULONG	  		nlLineNr;			// akt. Zeilen Nummer
+    ULONG	  		nlLinePos;			// akt. Spalten Nummer
 
-    SvParser_Impl   *pImplData;         // interne Daten
-    long            nTokenValue;        // zusaetzlicher Wert (RTF)
+    SvParser_Impl	*pImplData;			// interne Daten
+    long           	nTokenValue;		// zusaetzlicher Wert (RTF)
     BOOL            bTokenHasValue;     // indicates whether nTokenValue is valid
-    SvParserState   eState;             // Status auch in abgl. Klassen
+    SvParserState	eState;				// Status auch in abgl. Klassen
 
-    rtl_TextEncoding    eSrcEnc;        // Source encoding
+    rtl_TextEncoding	eSrcEnc;		// Source encoding
 
     ULONG nNextChPos;
-    sal_Unicode nNextCh;                // Akt. Zeichen fuer die "lex"
+    sal_Unicode	nNextCh;    		    // Akt. Zeichen fuer die "lex"
 
 
-    BOOL            bDownloadingFile : 1;// TRUE: Es wird gerade ein externes
-                                        //       File geladen. d.h. alle
-                                        //       DataAvailable Links muessen
-                                        //       ignoriert werden.
+    BOOL			bDownloadingFile : 1;// TRUE: Es wird gerade ein externes
+                                        //		 File geladen. d.h. alle
+                                        // 		 DataAvailable Links muessen
+                                        //		 ignoriert werden.
                                         // Wenn keibes der folgenden
                                         // Flags gesetzt ist, wird der
                                         // Stream als ANSI gelesen,
                                         // aber als CharSet DONTKNOW
                                         // zurueckgegeben.
-    BOOL            bUCS2BSrcEnc : 1;   // oder als big-endian UCS2
-    BOOL            bSwitchToUCS2 : 1;  // Umschalten des ist erlaubt
+    BOOL			bUCS2BSrcEnc : 1;	// oder als big-endian UCS2
+    BOOL			bSwitchToUCS2 : 1;	// Umschalten des ist erlaubt
 
-    BOOL            bRTF_InTextRead : 1;  // only for RTF-Parser!!!
+    BOOL			bRTF_InTextRead : 1;  // only for RTF-Parser!!!
 
     struct TokenStackType
     {
-        String  sToken;
-        long    nTokenValue;
-        BOOL    bTokenHasValue;
-        int     nTokenId;
+        String	sToken;
+        long 	nTokenValue;
+        BOOL	bTokenHasValue;
+        int 	nTokenId;
 
         inline TokenStackType() { nTokenId = 0; }
         inline ~TokenStackType() { }
     };
 
     // Methoden fuer Token-Stack
-    int SkipToken( short nCnt = -1 );       // n Tokens zurueck "skippen"
+    int SkipToken( short nCnt = -1 );		// n Tokens zurueck "skippen"
     TokenStackType* GetStackPtr( short nCnt );
     inline BYTE GetStackPos() const;
 
     // scanne das naechste Token:
-    //  Tokenstack abarbeiten und ggfs. _GetNextToken() rufen. Diese
-    //  ist fuers erkennen von neuen Token verantwortlich
+    //	Tokenstack abarbeiten und ggfs. _GetNextToken() rufen. Diese
+    //	ist fuers erkennen von neuen Token verantwortlich
     int GetNextToken();
     virtual int _GetNextToken() = 0;
 
@@ -112,7 +112,7 @@ protected:
     virtual void NextToken( int nToken );
 
     // zu Zeiten der SvRefBase-Ableitung darf nicht jeder loeschen
-    virtual ~SvParser();
+    virtual	~SvParser();
 
     void ClearTxtConvContext();
 
@@ -125,21 +125,21 @@ public:
     // Konstruktor
     SvParser( SvStream& rIn, BYTE nStackSize = 3 );
 
-    virtual  SvParserState CallParser() = 0;    // Aufruf des Parsers
+    virtual	 SvParserState CallParser() = 0;	// Aufruf des Parsers
 
-    inline SvParserState GetStatus() const  { return eState; }  // StatusInfo
+    inline SvParserState GetStatus() const	{ return eState; }	// StatusInfo
 
-    inline ULONG    GetLineNr() const       { return nlLineNr; }
-    inline ULONG    GetLinePos() const      { return nlLinePos; }
-    inline ULONG    IncLineNr()             { return ++nlLineNr; }
-    inline ULONG    IncLinePos()            { return ++nlLinePos; }
-    inline ULONG    SetLineNr( ULONG nlNum );           // inline unten
-    inline ULONG    SetLinePos( ULONG nlPos );          // inline unten
+    inline ULONG	GetLineNr() const		{ return nlLineNr; }
+    inline ULONG	GetLinePos() const		{ return nlLinePos; }
+    inline ULONG	IncLineNr() 			{ return ++nlLineNr; }
+    inline ULONG	IncLinePos()			{ return ++nlLinePos; }
+    inline ULONG	SetLineNr( ULONG nlNum );			// inline unten
+    inline ULONG	SetLinePos( ULONG nlPos );			// inline unten
 
-    sal_Unicode GetNextChar();
+    sal_Unicode	GetNextChar();
     void RereadLookahead();
 
-    inline int  IsParserWorking() const { return SVPAR_WORKING == eState; }
+    inline int 	IsParserWorking() const	{ return SVPAR_WORKING == eState; }
 
     Link GetAsynchCallLink() const
         { return STATIC_LINK( this, SvParser, NewDataRead ); }
@@ -190,13 +190,13 @@ SV_IMPL_REF(SvParser)
 
 
 inline ULONG SvParser::SetLineNr( ULONG nlNum )
-{   ULONG nlOld = nlLineNr; nlLineNr = nlNum; return nlOld; }
+{	ULONG nlOld = nlLineNr; nlLineNr = nlNum; return nlOld; }
 
 inline ULONG SvParser::SetLinePos( ULONG nlPos )
-{   ULONG nlOld = nlLinePos; nlLinePos = nlPos; return nlOld; }
+{	ULONG nlOld = nlLinePos; nlLinePos = nlPos; return nlOld; }
 
 inline BYTE SvParser::GetStackPos() const
-{   return nTokenStackPos; }
+{	return nTokenStackPos; }
 
 inline USHORT SvParser::GetCharSize() const
 {
diff --git a/svtools/inc/svtools/svtabbx.hxx b/svtools/inc/svtools/svtabbx.hxx
index 89fd92a4fc09..34d158a09bc8 100644
--- a/svtools/inc/svtools/svtabbx.hxx
+++ b/svtools/inc/svtools/svtabbx.hxx
@@ -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
@@ -57,41 +57,41 @@ struct TabListBoxEventData
 class SVT_DLLPUBLIC SvTabListBox : public SvTreeListBox
 {
 private:
-    SvLBoxTab*                  pTabList;
-    USHORT                      nTabCount;
-    XubString                   aCurEntry;
-    ULONG                       nDummy1;
-    ULONG                       nDummy2;
+    SvLBoxTab*					pTabList;
+    USHORT						nTabCount;
+    XubString					aCurEntry;
+    ULONG						nDummy1;
+    ULONG						nDummy2;
 
 protected:
-    SvLBoxEntry*                pViewParent;
+    SvLBoxEntry*				pViewParent;
 
-    static const xub_Unicode*   GetToken( const xub_Unicode* pPtr, USHORT& rLen );
+    static const xub_Unicode*	GetToken( const xub_Unicode* pPtr, USHORT& rLen );
 
-    virtual void                SetTabs();
-    virtual void                InitEntry( SvLBoxEntry*, const XubString&, const Image&, const Image&, SvLBoxButtonKind );
+    virtual void				SetTabs();
+    virtual void				InitEntry( SvLBoxEntry*, const XubString&, const Image&, const Image&, SvLBoxButtonKind );
 
-    String                      GetTabEntryText( ULONG nPos, USHORT nCol ) const;
-    SvLBoxEntry*                GetEntryOnPos( ULONG _nEntryPos ) const;
-    SvLBoxEntry*                GetChildOnPos( SvLBoxEntry* _pParent, ULONG _nEntryPos, ULONG& _rPos ) const;
+    String						GetTabEntryText( ULONG nPos, USHORT nCol ) const;
+    SvLBoxEntry*				GetEntryOnPos( ULONG _nEntryPos ) const;
+    SvLBoxEntry*				GetChildOnPos( SvLBoxEntry* _pParent, ULONG _nEntryPos, ULONG& _rPos ) const;
 
 public:
     SvTabListBox( Window* pParent, WinBits = WB_BORDER );
     SvTabListBox( Window* pParent, const ResId& );
     ~SvTabListBox();
-    void            SetTabs( long* pTabs, MapUnit = MAP_APPFONT );
-    USHORT          TabCount() const { return (USHORT)nTabCount; }
+    void			SetTabs( long* pTabs, MapUnit = MAP_APPFONT );
+    USHORT			TabCount() const { return (USHORT)nTabCount; }
     using SvTreeListBox::GetTab;
-    long            GetTab( USHORT nTab ) const;
-    void            SetTab( USHORT nTab, long nValue, MapUnit = MAP_APPFONT );
-    long            GetLogicTab( USHORT nTab );
+    long 			GetTab( USHORT nTab ) const;
+    void			SetTab( USHORT nTab, long nValue, MapUnit = MAP_APPFONT );
+    long			GetLogicTab( USHORT nTab );
 
-    virtual SvLBoxEntry*    InsertEntry( const XubString& rText, SvLBoxEntry* pParent = 0,
+    virtual SvLBoxEntry*	InsertEntry( const XubString& rText, SvLBoxEntry* pParent = 0,
                                          BOOL bChildsOnDemand = FALSE,
                                          ULONG nPos=LIST_APPEND, void* pUserData = 0,
                                          SvLBoxButtonKind eButtonKind = SvLBoxButtonKind_enabledCheckbox );
 
-    virtual SvLBoxEntry*    InsertEntry( const XubString& rText,
+    virtual SvLBoxEntry*	InsertEntry( const XubString& rText,
                                          const Image& rExpandedEntryBmp,
                                          const Image& rCollapsedEntryBmp,
                                          SvLBoxEntry* pParent = 0,
@@ -107,19 +107,19 @@ public:
                                  const Image& rCollapsedEntryBmp, SvLBoxEntry* pParent = NULL,
                                  ULONG nPos = LIST_APPEND, USHORT nCol = 0xffff, void* pUserData = NULL );
 
-    virtual String  GetEntryText( SvLBoxEntry* pEntry ) const;
-    String          GetEntryText( SvLBoxEntry*, USHORT nCol ) const;
-    String          GetEntryText( ULONG nPos, USHORT nCol = 0xffff ) const;
+    virtual	String	GetEntryText( SvLBoxEntry* pEntry ) const;
+    String			GetEntryText( SvLBoxEntry*, USHORT nCol ) const;
+    String			GetEntryText( ULONG nPos, USHORT nCol = 0xffff ) const;
     using SvTreeListBox::SetEntryText;
-    void            SetEntryText( const XubString&, ULONG, USHORT nCol=0xffff );
-    void            SetEntryText(const XubString&,SvLBoxEntry*,USHORT nCol=0xffff);
+    void			SetEntryText( const XubString&, ULONG, USHORT nCol=0xffff );
+    void			SetEntryText(const XubString&,SvLBoxEntry*,USHORT nCol=0xffff);
     String          GetCellText( ULONG nPos, USHORT nCol ) const;
-    ULONG           GetEntryPos( const XubString&, USHORT nCol = 0xffff );
-    ULONG           GetEntryPos( const SvLBoxEntry* pEntry ) const;
+    ULONG			GetEntryPos( const XubString&, USHORT nCol = 0xffff );
+    ULONG			GetEntryPos( const SvLBoxEntry* pEntry ) const;
 
-    virtual void    Resize();
-    void            SetTabJustify( USHORT nTab, SvTabJustify );
-    SvTabJustify    GetTabJustify( USHORT nTab ) const;
+    virtual void	Resize();
+    void			SetTabJustify( USHORT nTab, SvTabJustify );
+    SvTabJustify	GetTabJustify( USHORT nTab ) const;
 };
 
 inline long SvTabListBox::GetTab( USHORT nTab ) const
@@ -140,12 +140,12 @@ namespace svt {
 class SVT_DLLPUBLIC SvHeaderTabListBox : public SvTabListBox, public svt::IAccessibleTableProvider
 {
 private:
-    typedef ::std::vector< ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > > AccessibleChildren;
+    typedef ::std::vector< ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >	> AccessibleChildren;
 
-    sal_Bool                        m_bFirstPaint;
+    sal_Bool					    m_bFirstPaint;
     ::svt::SvHeaderTabListBoxImpl*  m_pImpl;
     ::svt::IAccessibleTabListBox*   m_pAccessible;
-    AccessibleChildren              m_aAccessibleChildren;
+    AccessibleChildren			    m_aAccessibleChildren;
 
     DECL_DLLPRIVATE_LINK( ScrollHdl_Impl, SvTabListBox* );
     DECL_DLLPRIVATE_LINK( CreateAccessibleHdl_Impl, HeaderBar* );
@@ -157,9 +157,9 @@ public:
     SvHeaderTabListBox( Window* pParent, const ResId& );
     ~SvHeaderTabListBox();
 
-    virtual void    Paint( const Rectangle& );
+    virtual void	Paint( const Rectangle& );
 
-    void            InitHeaderBar( HeaderBar* pHeaderBar );
+    void			InitHeaderBar( HeaderBar* pHeaderBar );
     sal_Bool        IsItemChecked( SvLBoxEntry* pEntry, USHORT nCol ) const;
 
     virtual SvLBoxEntry* InsertEntryToColumn( const XubString&, ULONG nPos = LIST_APPEND,
@@ -182,85 +182,85 @@ public:
     sal_Bool        IsCellCheckBox( long _nRow, sal_uInt16 _nColumn, TriState& _rState );
 
     /** @return  The count of the rows. */
-    virtual long                    GetRowCount() const;
+    virtual	long					GetRowCount() const;
     /** @return  The count of the columns. */
-    virtual sal_uInt16              GetColumnCount() const;
+    virtual sal_uInt16				GetColumnCount() const;
 
     /** @return  The position of the current row. */
-    virtual sal_Int32               GetCurrRow() const;
+    virtual sal_Int32				GetCurrRow() const;
     /** @return  The position of the current column. */
-    virtual sal_uInt16              GetCurrColumn() const;
+    virtual sal_uInt16				GetCurrColumn() const;
 
     /** @return  The description of a row.
         @param _nRow The row which description is in demand. */
-    virtual ::rtl::OUString         GetRowDescription( sal_Int32 _nRow ) const;
+    virtual ::rtl::OUString			GetRowDescription( sal_Int32 _nRow ) const;
     /** @return  The description of a column.
         @param _nColumn The column which description is in demand. */
-    virtual ::rtl::OUString         GetColumnDescription( sal_uInt16 _nColumn ) const;
+    virtual ::rtl::OUString			GetColumnDescription( sal_uInt16 _nColumn ) const;
 
     /** @return  <TRUE/>, if the object has a row header. */
-    virtual sal_Bool                HasRowHeader() const; //GetColumnId
+    virtual sal_Bool				HasRowHeader() const; //GetColumnId
     /** @return  <TRUE/>, if the object can focus a cell. */
-    virtual sal_Bool                IsCellFocusable() const;
-    virtual sal_Bool                GoToCell( sal_Int32 _nRow, sal_uInt16 _nColumn );
+    virtual sal_Bool				IsCellFocusable() const;
+    virtual sal_Bool				GoToCell( sal_Int32 _nRow, sal_uInt16 _nColumn );
 
-    virtual void                    SetNoSelection();
+    virtual void					SetNoSelection();
     using SvListView::SelectAll;
-    virtual void                    SelectAll();
-    virtual void                    SelectAll( BOOL bSelect, BOOL bPaint = TRUE );
-    virtual void                    SelectRow( long _nRow, BOOL _bSelect = TRUE, BOOL bExpand = TRUE );
-    virtual void                    SelectColumn( sal_uInt16 _nColumn, sal_Bool _bSelect = sal_True );
-    virtual sal_Int32               GetSelectedRowCount() const;
-    virtual sal_Int32               GetSelectedColumnCount() const;
+    virtual void					SelectAll();
+    virtual void					SelectAll( BOOL bSelect, BOOL bPaint = TRUE );
+    virtual void					SelectRow( long _nRow, BOOL _bSelect = TRUE, BOOL bExpand = TRUE );
+    virtual void					SelectColumn( sal_uInt16 _nColumn, sal_Bool _bSelect = sal_True );
+    virtual sal_Int32				GetSelectedRowCount() const;
+    virtual sal_Int32				GetSelectedColumnCount() const;
     /** @return  <TRUE/>, if the row is selected. */
-    virtual bool                    IsRowSelected( long _nRow ) const;
-    virtual sal_Bool                IsColumnSelected( long _nColumn ) const;
-    virtual void                    GetAllSelectedRows( ::com::sun::star::uno::Sequence< sal_Int32 >& _rRows ) const;
-    virtual void                    GetAllSelectedColumns( ::com::sun::star::uno::Sequence< sal_Int32 >& _rColumns ) const;
+    virtual bool					IsRowSelected( long _nRow ) const;
+    virtual sal_Bool				IsColumnSelected( long _nColumn ) const;
+    virtual void					GetAllSelectedRows( ::com::sun::star::uno::Sequence< sal_Int32 >& _rRows ) const;
+    virtual void					GetAllSelectedColumns( ::com::sun::star::uno::Sequence< sal_Int32 >& _rColumns ) const;
 
     /** @return  <TRUE/>, if the cell is visible. */
-    virtual sal_Bool                IsCellVisible( sal_Int32 _nRow, sal_uInt16 _nColumn ) const;
-    virtual String                  GetAccessibleCellText( long _nRow, USHORT _nColumnPos ) const;
+    virtual sal_Bool				IsCellVisible( sal_Int32 _nRow, sal_uInt16 _nColumn ) const;
+    virtual String					GetAccessibleCellText( long _nRow, USHORT _nColumnPos ) const;
 
-    virtual Rectangle               calcHeaderRect( sal_Bool _bIsColumnBar, BOOL _bOnScreen = TRUE );
-    virtual Rectangle               calcTableRect( BOOL _bOnScreen = TRUE );
-    virtual Rectangle               GetFieldRectPixelAbs( sal_Int32 _nRow, sal_uInt16 _nColumn, BOOL _bIsHeader, BOOL _bOnScreen = TRUE );
+    virtual Rectangle				calcHeaderRect( sal_Bool _bIsColumnBar, BOOL _bOnScreen = TRUE );
+    virtual Rectangle				calcTableRect( BOOL _bOnScreen = TRUE );
+    virtual Rectangle				GetFieldRectPixelAbs( sal_Int32 _nRow, sal_uInt16 _nColumn, BOOL _bIsHeader, BOOL _bOnScreen = TRUE );
 
-    virtual XACC                    CreateAccessibleCell( sal_Int32 _nRow, sal_uInt16 _nColumn );
-    virtual XACC                    CreateAccessibleRowHeader( sal_Int32 _nRow );
-    virtual XACC                    CreateAccessibleColumnHeader( sal_uInt16 _nColumnPos );
+    virtual XACC					CreateAccessibleCell( sal_Int32 _nRow, sal_uInt16 _nColumn );
+    virtual XACC					CreateAccessibleRowHeader( sal_Int32 _nRow );
+    virtual XACC					CreateAccessibleColumnHeader( sal_uInt16 _nColumnPos );
 
-    virtual sal_Int32               GetAccessibleControlCount() const;
-    virtual XACC                    CreateAccessibleControl( sal_Int32 _nIndex );
-    virtual sal_Bool                ConvertPointToControlIndex( sal_Int32& _rnIndex, const Point& _rPoint );
+    virtual sal_Int32				GetAccessibleControlCount() const;
+    virtual XACC					CreateAccessibleControl( sal_Int32 _nIndex );
+    virtual sal_Bool				ConvertPointToControlIndex( sal_Int32& _rnIndex, const Point& _rPoint );
 
-    virtual sal_Bool                ConvertPointToCellAddress( sal_Int32& _rnRow, sal_uInt16& _rnColPos, const Point& _rPoint );
-    virtual sal_Bool                ConvertPointToRowHeader( sal_Int32& _rnRow, const Point& _rPoint );
-    virtual sal_Bool                ConvertPointToColumnHeader( sal_uInt16& _rnColPos, const Point& _rPoint );
+    virtual sal_Bool				ConvertPointToCellAddress( sal_Int32& _rnRow, sal_uInt16& _rnColPos, const Point& _rPoint );
+    virtual sal_Bool				ConvertPointToRowHeader( sal_Int32& _rnRow, const Point& _rPoint );
+    virtual sal_Bool				ConvertPointToColumnHeader( sal_uInt16& _rnColPos, const Point& _rPoint );
 
-    virtual ::rtl::OUString         GetAccessibleObjectName( ::svt::AccessibleBrowseBoxObjType _eType, sal_Int32 _nPos = -1 ) const;
-    virtual ::rtl::OUString         GetAccessibleObjectDescription( ::svt::AccessibleBrowseBoxObjType _eType, sal_Int32 _nPos = -1 ) const;
-    virtual Window*                 GetWindowInstance();
+    virtual ::rtl::OUString			GetAccessibleObjectName( ::svt::AccessibleBrowseBoxObjType _eType, sal_Int32 _nPos = -1 ) const;
+    virtual ::rtl::OUString			GetAccessibleObjectDescription( ::svt::AccessibleBrowseBoxObjType _eType, sal_Int32 _nPos = -1 ) const;
+    virtual Window*					GetWindowInstance();
 
     using SvTreeListBox::FillAccessibleStateSet;
-    virtual void                    FillAccessibleStateSet( ::utl::AccessibleStateSetHelper& _rStateSet, ::svt::AccessibleBrowseBoxObjType _eType ) const;
-    virtual void                    FillAccessibleStateSetForCell( ::utl::AccessibleStateSetHelper& _rStateSet, sal_Int32 _nRow, sal_uInt16 _nColumn ) const;
-    virtual void                    GrabTableFocus();
+    virtual void					FillAccessibleStateSet( ::utl::AccessibleStateSetHelper& _rStateSet, ::svt::AccessibleBrowseBoxObjType _eType ) const;
+    virtual void					FillAccessibleStateSetForCell( ::utl::AccessibleStateSetHelper& _rStateSet, sal_Int32 _nRow, sal_uInt16 _nColumn ) const;
+    virtual void					GrabTableFocus();
 
     // OutputDevice
-    virtual BOOL                    GetGlyphBoundRects( const Point& rOrigin, const String& rStr, int nIndex, int nLen, int nBase, MetricVector& rVector );
+    virtual BOOL					GetGlyphBoundRects( const Point& rOrigin, const String& rStr, int nIndex, int nLen, int nBase, MetricVector& rVector );
 
     // Window
-    virtual Rectangle               GetWindowExtentsRelative( Window *pRelativeWindow ) const;
-    virtual void                    GrabFocus();
-    virtual XACC                    GetAccessible( BOOL bCreate = TRUE );
-    virtual Window*                 GetAccessibleParentWindow() const;
+    virtual Rectangle				GetWindowExtentsRelative( Window *pRelativeWindow ) const;
+    virtual void					GrabFocus();
+    virtual XACC					GetAccessible( BOOL bCreate = TRUE );
+    virtual Window*					GetAccessibleParentWindow() const;
 
     /** Creates and returns the accessible object of the whole BrowseBox. */
-    virtual XACC                    CreateAccessible();
+    virtual XACC					CreateAccessible();
 
-    virtual Rectangle               GetFieldCharacterBounds(sal_Int32 _nRow,sal_Int32 _nColumnPos,sal_Int32 nIndex);
-    virtual sal_Int32               GetFieldIndexAtPoint(sal_Int32 _nRow,sal_Int32 _nColumnPos,const Point& _rPoint);
+    virtual Rectangle				GetFieldCharacterBounds(sal_Int32 _nRow,sal_Int32 _nColumnPos,sal_Int32 nIndex);
+    virtual sal_Int32				GetFieldIndexAtPoint(sal_Int32 _nRow,sal_Int32 _nColumnPos,const Point& _rPoint);
 };
 
 #endif // #ifndef _SVTABBX_HXX
diff --git a/svtools/inc/svtools/svtdata.hxx b/svtools/inc/svtools/svtdata.hxx
index 9faadaff7305..8f21b611cce1 100644
--- a/svtools/inc/svtools/svtdata.hxx
+++ b/svtools/inc/svtools/svtdata.hxx
@@ -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
@@ -39,8 +39,8 @@ class ImpSvtData
 {
 public:
     SfxItemDesruptorList_Impl * pItemDesruptList;
-    ResMgr *        pResMgr;
-    ResMgr *        pPatchResMgr;
+    ResMgr *		pResMgr;
+    ResMgr *		pPatchResMgr;
 
 private:
     ImpSvtData():
diff --git a/svtools/inc/svtools/svtdllapi.h b/svtools/inc/svtools/svtdllapi.h
index d230d7e76d0c..74b34778f651 100644
--- a/svtools/inc/svtools/svtdllapi.h
+++ b/svtools/inc/svtools/svtdllapi.h
@@ -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
diff --git a/svtools/inc/svtools/svtools.hrc b/svtools/inc/svtools/svtools.hrc
index a57a0f5bb0fe..f2d492a5d06f 100644
--- a/svtools/inc/svtools/svtools.hrc
+++ b/svtools/inc/svtools/svtools.hrc
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2008 by Sun Microsystems, Inc.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -32,29 +32,29 @@
 
 #include <svl/solar.hrc>
 
-#define RID_SVTOOLS_BITMAP_START        (RID_SVTOOLS_START + 0)
-#define RID_SVTOOLS_IMAGELIST_START     (RID_SVTOOLS_START + 0)
+#define RID_SVTOOLS_BITMAP_START		(RID_SVTOOLS_START + 0)
+#define RID_SVTOOLS_IMAGELIST_START		(RID_SVTOOLS_START + 0)
 
 //.............................................................................
 // various unsorted stuff
 
-#define DLG_EXPORT_PIX                  (RID_SVTOOLS_START+1)
-#define DLG_EXPORT_VEC                  (RID_SVTOOLS_START+2)
-#define DLG_TWAIN_SOURCE                (RID_SVTOOLS_START+3)
+#define DLG_EXPORT_PIX					(RID_SVTOOLS_START+1)
+#define DLG_EXPORT_VEC					(RID_SVTOOLS_START+2)
+#define DLG_TWAIN_SOURCE				(RID_SVTOOLS_START+3)
 
 #define DLG_SVT_EXPLORERFILE            (RID_SVTOOLS_START+4)
 #define DLG_SVT_QUERYFOLDERNAME         (RID_SVTOOLS_START+5)
 #define DLG_SVT_QUERYDELETE             (RID_SVTOOLS_START+6)
 
-#define EXPORT_DIALOG_TITLE             (RID_SVTOOLS_START+4)
-#define KEY_MODE                        (RID_SVTOOLS_START+5)
-#define KEY_RES                         (RID_SVTOOLS_START+6)
-#define KEY_SIZE                        (RID_SVTOOLS_START+7)
+#define EXPORT_DIALOG_TITLE 			(RID_SVTOOLS_START+4)
+#define KEY_MODE						(RID_SVTOOLS_START+5)
+#define KEY_RES 						(RID_SVTOOLS_START+6)
+#define KEY_SIZE						(RID_SVTOOLS_START+7)
 
-#define KEY_COLORS                      (RID_SVTOOLS_START+9)
-#define KEY_RLE_CODING                  (RID_SVTOOLS_START+10)
+#define KEY_COLORS						(RID_SVTOOLS_START+9)
+#define KEY_RLE_CODING					(RID_SVTOOLS_START+10)
 
-#define STR_SVT_AUTOMATIC_COLOR         (RID_SVTOOLS_START+16)
+#define STR_SVT_AUTOMATIC_COLOR			(RID_SVTOOLS_START+16)
 
 #define STR_SVT_FILEVIEW_COLUMN_TITLE   (RID_SVTOOLS_START + 20)
 #define STR_SVT_FILEVIEW_COLUMN_SIZE    (RID_SVTOOLS_START + 21)
@@ -69,218 +69,218 @@
 #define STR_SVT_NEW_FOLDER              (RID_SVTOOLS_START + 30)
 #define STR_SVT_ALREADYEXISTOVERWRITE   (RID_SVTOOLS_START + 31)
 #define STR_SVT_FILEVIEW_COLUMN_TYPE    (RID_SVTOOLS_START + 32)
-#define RID_FILEVIEW_CONTEXTMENU        (RID_SVTOOLS_START + 33)
-#define RID_FILEOPEN_INVALIDFOLDER      (RID_SVTOOLS_START + 34)
-#define RID_FILEOPEN_NOTEXISTENTFILE    (RID_SVTOOLS_START + 35)
+#define RID_FILEVIEW_CONTEXTMENU	    (RID_SVTOOLS_START + 33)
+#define RID_FILEOPEN_INVALIDFOLDER		(RID_SVTOOLS_START + 34)
+#define RID_FILEOPEN_NOTEXISTENTFILE	(RID_SVTOOLS_START + 35)
 #define STR_SVT_NOREMOVABLEDEVICE       (RID_SVTOOLS_START + 36)
 
 // doc template dialog
-#define DLG_DOCTEMPLATE                 (RID_SVTOOLS_START+50)
-#define CTRL_FILEVIEW                   (RID_SVTOOLS_START+51)
-#define STR_SVT_NEWDOC                  (RID_SVTOOLS_START+52)
-#define STR_SVT_MYDOCS                  (RID_SVTOOLS_START+53)
-#define STR_SVT_TEMPLATES               (RID_SVTOOLS_START+54)
-#define STR_SVT_SAMPLES                 (RID_SVTOOLS_START+55)
-#define TB_SVT_FILEVIEW                 (RID_SVTOOLS_START+56)
-#define TB_SVT_FRAMEWIN                 (RID_SVTOOLS_START+57)
-#define STRARY_SVT_DOCINFO              (RID_SVTOOLS_START+58)
-#define STR_SVT_NEWDOC_HELP             (RID_SVTOOLS_START+63)
-#define STR_SVT_MYDOCS_HELP             (RID_SVTOOLS_START+64)
-#define STR_SVT_TEMPLATES_HELP          (RID_SVTOOLS_START+65)
-#define STR_SVT_SAMPLES_HELP            (RID_SVTOOLS_START+66)
-
-#define STR_WARNING_ITEM                (RID_SVTOOLS_START+90)
-
-#define CONFIG_BASIC_FORMAT_START       (RID_SVTOOLS_START+102)
-#define STR_BASICKEY_FORMAT_ON          (RID_SVTOOLS_START+103)
-#define STR_BASICKEY_FORMAT_OFF         (RID_SVTOOLS_START+104)
-#define STR_BASICKEY_FORMAT_YES         (RID_SVTOOLS_START+105)
-#define STR_BASICKEY_FORMAT_NO          (RID_SVTOOLS_START+106)
-#define STR_BASICKEY_FORMAT_TRUE        (RID_SVTOOLS_START+107)
-#define STR_BASICKEY_FORMAT_FALSE       (RID_SVTOOLS_START+108)
-#define CONFIG_BASIC_FORMAT_END         (RID_SVTOOLS_START+109)
-
-#define STR_INVALIDTRYBUY               (RID_SVTOOLS_START+120)
-#define STR_OLDTRYBUY                   (RID_SVTOOLS_START+121)
-#define STR_TRYBUY                      (RID_SVTOOLS_START+122)
-#define STR_PVER_LANGUAGECODE           (RID_SVTOOLS_START+124)
-#define STR_PVER_LONG_LANGUAGECODE      (RID_SVTOOLS_START+125)
-#define STR_INVALIDPUFF                 (RID_SVTOOLS_START+126)
-#define STR_LIMITEDPUFF                 (RID_SVTOOLS_START+127)
-#define STR_OLDLIMITEDPUFF              (RID_SVTOOLS_START+128)
-#define RID_REGISTER_DIALOG             (RID_SVTOOLS_START+129)
-#define STR_BASICKEY_FORMAT_CURRENCY    (RID_SVTOOLS_START+130)
-#define STR_KEYERR_GENERAL_HELP         (RID_SVTOOLS_START+131)
-#define STR_KEYERR_INVALID_KEY          (RID_SVTOOLS_START+132)
-#define STR_KEYERR_INVALID_USERDATA     (RID_SVTOOLS_START+133)
-#define STR_KEYERR_INVALID_ADDRESSDATA  (RID_SVTOOLS_START+134)
-#define STR_KEYERR_INVALID_LICENSE      (RID_SVTOOLS_START+135)
-#define STR_KEYERR_INVALID_LANGUAGE     (RID_SVTOOLS_START+136)
-#define STR_KEYERR_INVALID_OS           (RID_SVTOOLS_START+137)
-#define STR_KEYERR_INVALID_NO_CNR       (RID_SVTOOLS_START+138)
-#define STR_KEYERR_INVALID_CNR          (RID_SVTOOLS_START+139)
-#define RID_LIMITED_DIALOG              (RID_SVTOOLS_START+140)
-
-#define STR_SVT_PRNDLG_START                (RID_SVTOOLS_START+141)
-#define DLG_SVT_PRNDLG_PRNSETUPDLG          (STR_SVT_PRNDLG_START+0)
-#define DLG_SVT_PRNDLG_PRINTDLG             (STR_SVT_PRNDLG_START+1)
-#define STR_SVT_PRNDLG_READY                (STR_SVT_PRNDLG_START+2)
-#define STR_SVT_PRNDLG_PAUSED               (STR_SVT_PRNDLG_START+3)
-#define STR_SVT_PRNDLG_PENDING              (STR_SVT_PRNDLG_START+4)
-#define STR_SVT_PRNDLG_BUSY                 (STR_SVT_PRNDLG_START+5)
-#define STR_SVT_PRNDLG_INITIALIZING         (STR_SVT_PRNDLG_START+6)
-#define STR_SVT_PRNDLG_WAITING              (STR_SVT_PRNDLG_START+7)
-#define STR_SVT_PRNDLG_WARMING_UP           (STR_SVT_PRNDLG_START+8)
-#define STR_SVT_PRNDLG_PROCESSING           (STR_SVT_PRNDLG_START+9)
-#define STR_SVT_PRNDLG_PRINTING             (STR_SVT_PRNDLG_START+10)
-#define STR_SVT_PRNDLG_OFFLINE              (STR_SVT_PRNDLG_START+11)
-#define STR_SVT_PRNDLG_ERROR                (STR_SVT_PRNDLG_START+12)
-#define STR_SVT_PRNDLG_SERVER_UNKNOWN       (STR_SVT_PRNDLG_START+13)
-#define STR_SVT_PRNDLG_PAPER_JAM            (STR_SVT_PRNDLG_START+14)
-#define STR_SVT_PRNDLG_PAPER_OUT            (STR_SVT_PRNDLG_START+15)
-#define STR_SVT_PRNDLG_MANUAL_FEED          (STR_SVT_PRNDLG_START+16)
-#define STR_SVT_PRNDLG_PAPER_PROBLEM        (STR_SVT_PRNDLG_START+17)
-#define STR_SVT_PRNDLG_IO_ACTIVE            (STR_SVT_PRNDLG_START+18)
-#define STR_SVT_PRNDLG_OUTPUT_BIN_FULL      (STR_SVT_PRNDLG_START+19)
-#define STR_SVT_PRNDLG_TONER_LOW            (STR_SVT_PRNDLG_START+20)
-#define STR_SVT_PRNDLG_NO_TONER             (STR_SVT_PRNDLG_START+21)
-#define STR_SVT_PRNDLG_PAGE_PUNT            (STR_SVT_PRNDLG_START+22)
-#define STR_SVT_PRNDLG_USER_INTERVENTION    (STR_SVT_PRNDLG_START+23)
-#define STR_SVT_PRNDLG_OUT_OF_MEMORY        (STR_SVT_PRNDLG_START+24)
-#define STR_SVT_PRNDLG_DOOR_OPEN            (STR_SVT_PRNDLG_START+25)
-#define STR_SVT_PRNDLG_POWER_SAVE           (STR_SVT_PRNDLG_START+26)
-#define STR_SVT_PRNDLG_DEFPRINTER           (STR_SVT_PRNDLG_START+27)
-#define STR_SVT_PRNDLG_JOBCOUNT             (STR_SVT_PRNDLG_START+28)
-#define STR_SVT_PRNDLG_END                  (RID_IMG_PRNDLG_NOCOLLATE_HC)
-
-#define STR_SVT_CALENDAR_START              (STR_SVT_PRNDLG_END+1)
-#define STR_SVT_CALENDAR_DAY                (STR_SVT_CALENDAR_START+0)
-#define STR_SVT_CALENDAR_WEEK               (STR_SVT_CALENDAR_START+1)
-#define STR_SVT_CALENDAR_TODAY              (STR_SVT_CALENDAR_START+2)
-#define STR_SVT_CALENDAR_NONE               (STR_SVT_CALENDAR_START+3)
-#define STR_SVT_CALENDAR_END                (STR_SVT_CALENDAR_NONE)
-
-#define STR_SVT_PVER_START                  (STR_SVT_CALENDAR_END+1)
-#define STR_SVT_PVER_INTERNAL               (STR_SVT_PVER_START+0)
-#define STR_SVT_PVER_PERSONAL_DELUXE        (STR_SVT_PVER_START+1)
-#define STR_SVT_PVER_PERSONAL               (STR_SVT_PVER_START+2)
-#define STR_SVT_PVER_PROFESSIONAL           (STR_SVT_PVER_START+3)
-#define STR_SVT_PVER_BUSINESS               (STR_SVT_PVER_START+4)
-#define STR_SVT_PVER_ENTERPRICE             (STR_SVT_PVER_START+5)
-#define STR_SVT_PVER_EDUCATION              (STR_SVT_PVER_START+6)
-#define STR_SVT_PVER_DEMO                   (STR_SVT_PVER_START+7)
-#define STR_SVT_PVER_BETA                   (STR_SVT_PVER_START+8)
-#define STR_SVT_PVER_OEM                    (STR_SVT_PVER_START+9)
-#define STR_SVT_PVER_NOT_REGISTERED         (STR_SVT_PVER_START+10)
-#define STR_SVT_PVER_PILOT                  (STR_SVT_PVER_START+11)
-#define STR_SVT_PVER_CAMPUS                 (STR_SVT_PVER_START+12)
-#define STR_SVT_PVER_EVALUATION             (STR_SVT_PVER_START+13)
-#define STR_SVT_PVER_PARTNER                (STR_SVT_PVER_START+14)
-#define STR_SVT_PVER_SMALLBUSINESS          (STR_SVT_PVER_START+15)
-#define STR_SVT_PVER_OEM_PROFESSIONAL       (STR_SVT_PVER_START+16)
-#define STR_SVT_PVER_END                    (STR_SVT_PVER_OEM_PROFESSIONAL)
-
-#define STR_SVT_STYLE_START                 (STR_SVT_PVER_END+1)
-#define STR_SVT_STYLE_LIGHT                 (STR_SVT_STYLE_START+0)
-#define STR_SVT_STYLE_LIGHT_ITALIC          (STR_SVT_STYLE_START+1)
-#define STR_SVT_STYLE_NORMAL                (STR_SVT_STYLE_START+2)
-#define STR_SVT_STYLE_NORMAL_ITALIC         (STR_SVT_STYLE_START+3)
-#define STR_SVT_STYLE_BOLD                  (STR_SVT_STYLE_START+4)
-#define STR_SVT_STYLE_BOLD_ITALIC           (STR_SVT_STYLE_START+5)
-#define STR_SVT_STYLE_BLACK                 (STR_SVT_STYLE_START+6)
-#define STR_SVT_STYLE_BLACK_ITALIC          (STR_SVT_STYLE_START+7)
-#define STR_SVT_STYLE_END                   (STR_SVT_STYLE_BLACK_ITALIC)
-
-#define STR_SVT_FONTMAP_START               (STR_SVT_STYLE_END+1)
-#define STR_SVT_FONTMAP_BOTH                (STR_SVT_FONTMAP_START+0)
-#define STR_SVT_FONTMAP_PRINTERONLY         (STR_SVT_FONTMAP_START+1)
-#define STR_SVT_FONTMAP_SCREENONLY          (STR_SVT_FONTMAP_START+2)
-#define STR_SVT_FONTMAP_SIZENOTAVAILABLE    (STR_SVT_FONTMAP_START+3)
-#define STR_SVT_FONTMAP_STYLENOTAVAILABLE   (STR_SVT_FONTMAP_START+4)
-#define STR_SVT_FONTMAP_NOTAVAILABLE        (STR_SVT_FONTMAP_START+5)
-#define STR_SVT_FONTMAP_END                 (STR_SVT_FONTMAP_NOTAVAILABLE)
-
-#define STR_SVT_ERRORCONTEXT_START          (STR_SVT_FONTMAP_END+1)
-#define STR_ERR_HDLMESS                     (STR_SVT_ERRORCONTEXT_START+0)
-#define RID_ERRHDL_CLASS                    (STR_SVT_ERRORCONTEXT_START+1)
+#define DLG_DOCTEMPLATE					(RID_SVTOOLS_START+50)
+#define CTRL_FILEVIEW					(RID_SVTOOLS_START+51)
+#define STR_SVT_NEWDOC					(RID_SVTOOLS_START+52)
+#define STR_SVT_MYDOCS					(RID_SVTOOLS_START+53)
+#define STR_SVT_TEMPLATES				(RID_SVTOOLS_START+54)
+#define STR_SVT_SAMPLES					(RID_SVTOOLS_START+55)
+#define TB_SVT_FILEVIEW					(RID_SVTOOLS_START+56)
+#define TB_SVT_FRAMEWIN					(RID_SVTOOLS_START+57)
+#define STRARY_SVT_DOCINFO				(RID_SVTOOLS_START+58)
+#define STR_SVT_NEWDOC_HELP				(RID_SVTOOLS_START+63)
+#define STR_SVT_MYDOCS_HELP				(RID_SVTOOLS_START+64)
+#define STR_SVT_TEMPLATES_HELP			(RID_SVTOOLS_START+65)
+#define STR_SVT_SAMPLES_HELP			(RID_SVTOOLS_START+66)
+
+#define STR_WARNING_ITEM				(RID_SVTOOLS_START+90)
+
+#define CONFIG_BASIC_FORMAT_START		(RID_SVTOOLS_START+102)
+#define STR_BASICKEY_FORMAT_ON			(RID_SVTOOLS_START+103)
+#define STR_BASICKEY_FORMAT_OFF 		(RID_SVTOOLS_START+104)
+#define STR_BASICKEY_FORMAT_YES 		(RID_SVTOOLS_START+105)
+#define STR_BASICKEY_FORMAT_NO			(RID_SVTOOLS_START+106)
+#define STR_BASICKEY_FORMAT_TRUE		(RID_SVTOOLS_START+107)
+#define STR_BASICKEY_FORMAT_FALSE		(RID_SVTOOLS_START+108)
+#define CONFIG_BASIC_FORMAT_END 		(RID_SVTOOLS_START+109)
+
+#define STR_INVALIDTRYBUY				(RID_SVTOOLS_START+120)
+#define STR_OLDTRYBUY					(RID_SVTOOLS_START+121)
+#define STR_TRYBUY						(RID_SVTOOLS_START+122)
+#define STR_PVER_LANGUAGECODE			(RID_SVTOOLS_START+124)
+#define STR_PVER_LONG_LANGUAGECODE		(RID_SVTOOLS_START+125)
+#define STR_INVALIDPUFF 				(RID_SVTOOLS_START+126)
+#define STR_LIMITEDPUFF 				(RID_SVTOOLS_START+127)
+#define STR_OLDLIMITEDPUFF				(RID_SVTOOLS_START+128)
+#define RID_REGISTER_DIALOG 			(RID_SVTOOLS_START+129)
+#define STR_BASICKEY_FORMAT_CURRENCY	(RID_SVTOOLS_START+130)
+#define STR_KEYERR_GENERAL_HELP 		(RID_SVTOOLS_START+131)
+#define STR_KEYERR_INVALID_KEY			(RID_SVTOOLS_START+132)
+#define STR_KEYERR_INVALID_USERDATA 	(RID_SVTOOLS_START+133)
+#define STR_KEYERR_INVALID_ADDRESSDATA	(RID_SVTOOLS_START+134)
+#define STR_KEYERR_INVALID_LICENSE		(RID_SVTOOLS_START+135)
+#define STR_KEYERR_INVALID_LANGUAGE 	(RID_SVTOOLS_START+136)
+#define STR_KEYERR_INVALID_OS			(RID_SVTOOLS_START+137)
+#define STR_KEYERR_INVALID_NO_CNR		(RID_SVTOOLS_START+138)
+#define STR_KEYERR_INVALID_CNR			(RID_SVTOOLS_START+139)
+#define RID_LIMITED_DIALOG				(RID_SVTOOLS_START+140)
+
+#define STR_SVT_PRNDLG_START				(RID_SVTOOLS_START+141)
+#define DLG_SVT_PRNDLG_PRNSETUPDLG			(STR_SVT_PRNDLG_START+0)
+#define DLG_SVT_PRNDLG_PRINTDLG 			(STR_SVT_PRNDLG_START+1)
+#define STR_SVT_PRNDLG_READY				(STR_SVT_PRNDLG_START+2)
+#define STR_SVT_PRNDLG_PAUSED				(STR_SVT_PRNDLG_START+3)
+#define STR_SVT_PRNDLG_PENDING				(STR_SVT_PRNDLG_START+4)
+#define STR_SVT_PRNDLG_BUSY 				(STR_SVT_PRNDLG_START+5)
+#define STR_SVT_PRNDLG_INITIALIZING 		(STR_SVT_PRNDLG_START+6)
+#define STR_SVT_PRNDLG_WAITING				(STR_SVT_PRNDLG_START+7)
+#define STR_SVT_PRNDLG_WARMING_UP			(STR_SVT_PRNDLG_START+8)
+#define STR_SVT_PRNDLG_PROCESSING			(STR_SVT_PRNDLG_START+9)
+#define STR_SVT_PRNDLG_PRINTING 			(STR_SVT_PRNDLG_START+10)
+#define STR_SVT_PRNDLG_OFFLINE				(STR_SVT_PRNDLG_START+11)
+#define STR_SVT_PRNDLG_ERROR				(STR_SVT_PRNDLG_START+12)
+#define STR_SVT_PRNDLG_SERVER_UNKNOWN		(STR_SVT_PRNDLG_START+13)
+#define STR_SVT_PRNDLG_PAPER_JAM			(STR_SVT_PRNDLG_START+14)
+#define STR_SVT_PRNDLG_PAPER_OUT			(STR_SVT_PRNDLG_START+15)
+#define STR_SVT_PRNDLG_MANUAL_FEED			(STR_SVT_PRNDLG_START+16)
+#define STR_SVT_PRNDLG_PAPER_PROBLEM		(STR_SVT_PRNDLG_START+17)
+#define STR_SVT_PRNDLG_IO_ACTIVE			(STR_SVT_PRNDLG_START+18)
+#define STR_SVT_PRNDLG_OUTPUT_BIN_FULL		(STR_SVT_PRNDLG_START+19)
+#define STR_SVT_PRNDLG_TONER_LOW			(STR_SVT_PRNDLG_START+20)
+#define STR_SVT_PRNDLG_NO_TONER 			(STR_SVT_PRNDLG_START+21)
+#define STR_SVT_PRNDLG_PAGE_PUNT			(STR_SVT_PRNDLG_START+22)
+#define STR_SVT_PRNDLG_USER_INTERVENTION	(STR_SVT_PRNDLG_START+23)
+#define STR_SVT_PRNDLG_OUT_OF_MEMORY		(STR_SVT_PRNDLG_START+24)
+#define STR_SVT_PRNDLG_DOOR_OPEN			(STR_SVT_PRNDLG_START+25)
+#define STR_SVT_PRNDLG_POWER_SAVE			(STR_SVT_PRNDLG_START+26)
+#define STR_SVT_PRNDLG_DEFPRINTER			(STR_SVT_PRNDLG_START+27)
+#define STR_SVT_PRNDLG_JOBCOUNT 			(STR_SVT_PRNDLG_START+28)
+#define STR_SVT_PRNDLG_END					(RID_IMG_PRNDLG_NOCOLLATE_HC)
+
+#define STR_SVT_CALENDAR_START				(STR_SVT_PRNDLG_END+1)
+#define STR_SVT_CALENDAR_DAY				(STR_SVT_CALENDAR_START+0)
+#define STR_SVT_CALENDAR_WEEK				(STR_SVT_CALENDAR_START+1)
+#define STR_SVT_CALENDAR_TODAY				(STR_SVT_CALENDAR_START+2)
+#define STR_SVT_CALENDAR_NONE				(STR_SVT_CALENDAR_START+3)
+#define STR_SVT_CALENDAR_END				(STR_SVT_CALENDAR_NONE)
+
+#define STR_SVT_PVER_START					(STR_SVT_CALENDAR_END+1)
+#define STR_SVT_PVER_INTERNAL				(STR_SVT_PVER_START+0)
+#define STR_SVT_PVER_PERSONAL_DELUXE		(STR_SVT_PVER_START+1)
+#define STR_SVT_PVER_PERSONAL				(STR_SVT_PVER_START+2)
+#define STR_SVT_PVER_PROFESSIONAL			(STR_SVT_PVER_START+3)
+#define STR_SVT_PVER_BUSINESS				(STR_SVT_PVER_START+4)
+#define STR_SVT_PVER_ENTERPRICE 			(STR_SVT_PVER_START+5)
+#define STR_SVT_PVER_EDUCATION				(STR_SVT_PVER_START+6)
+#define STR_SVT_PVER_DEMO					(STR_SVT_PVER_START+7)
+#define STR_SVT_PVER_BETA					(STR_SVT_PVER_START+8)
+#define STR_SVT_PVER_OEM					(STR_SVT_PVER_START+9)
+#define STR_SVT_PVER_NOT_REGISTERED 		(STR_SVT_PVER_START+10)
+#define STR_SVT_PVER_PILOT					(STR_SVT_PVER_START+11)
+#define STR_SVT_PVER_CAMPUS 				(STR_SVT_PVER_START+12)
+#define STR_SVT_PVER_EVALUATION 			(STR_SVT_PVER_START+13)
+#define STR_SVT_PVER_PARTNER				(STR_SVT_PVER_START+14)
+#define STR_SVT_PVER_SMALLBUSINESS			(STR_SVT_PVER_START+15)
+#define STR_SVT_PVER_OEM_PROFESSIONAL		(STR_SVT_PVER_START+16)
+#define STR_SVT_PVER_END					(STR_SVT_PVER_OEM_PROFESSIONAL)
+
+#define STR_SVT_STYLE_START 				(STR_SVT_PVER_END+1)
+#define STR_SVT_STYLE_LIGHT 				(STR_SVT_STYLE_START+0)
+#define STR_SVT_STYLE_LIGHT_ITALIC			(STR_SVT_STYLE_START+1)
+#define STR_SVT_STYLE_NORMAL				(STR_SVT_STYLE_START+2)
+#define STR_SVT_STYLE_NORMAL_ITALIC 		(STR_SVT_STYLE_START+3)
+#define STR_SVT_STYLE_BOLD					(STR_SVT_STYLE_START+4)
+#define STR_SVT_STYLE_BOLD_ITALIC			(STR_SVT_STYLE_START+5)
+#define STR_SVT_STYLE_BLACK 				(STR_SVT_STYLE_START+6)
+#define STR_SVT_STYLE_BLACK_ITALIC			(STR_SVT_STYLE_START+7)
+#define STR_SVT_STYLE_END					(STR_SVT_STYLE_BLACK_ITALIC)
+
+#define STR_SVT_FONTMAP_START				(STR_SVT_STYLE_END+1)
+#define STR_SVT_FONTMAP_BOTH				(STR_SVT_FONTMAP_START+0)
+#define STR_SVT_FONTMAP_PRINTERONLY 		(STR_SVT_FONTMAP_START+1)
+#define STR_SVT_FONTMAP_SCREENONLY			(STR_SVT_FONTMAP_START+2)
+#define STR_SVT_FONTMAP_SIZENOTAVAILABLE	(STR_SVT_FONTMAP_START+3)
+#define STR_SVT_FONTMAP_STYLENOTAVAILABLE	(STR_SVT_FONTMAP_START+4)
+#define STR_SVT_FONTMAP_NOTAVAILABLE		(STR_SVT_FONTMAP_START+5)
+#define STR_SVT_FONTMAP_END 				(STR_SVT_FONTMAP_NOTAVAILABLE)
+
+#define STR_SVT_ERRORCONTEXT_START			(STR_SVT_FONTMAP_END+1)
+#define STR_ERR_HDLMESS					    (STR_SVT_ERRORCONTEXT_START+0)
+#define RID_ERRHDL_CLASS        			(STR_SVT_ERRORCONTEXT_START+1)
 #define RID_ERRCTX                          (STR_SVT_ERRORCONTEXT_START+2)
 #define RID_ERRHDL                          (STR_SVT_ERRORCONTEXT_START+3)
-#define STR_SVT_ERRORCONTEXT_END            (RID_ERRHDL)
+#define STR_SVT_ERRORCONTEXT_END			(RID_ERRHDL)
 
-#define STR_WIZARDDIALOG_START              (STR_SVT_ERRORCONTEXT_END + 1)
-#define STR_WIZDLG_FINISH                   (STR_WIZARDDIALOG_START + 0)
-#define STR_WIZDLG_NEXT                     (STR_WIZARDDIALOG_START + 1)
-#define STR_WIZDLG_PREVIOUS                 (STR_WIZARDDIALOG_START + 2)
+#define STR_WIZARDDIALOG_START				(STR_SVT_ERRORCONTEXT_END + 1)
+#define STR_WIZDLG_FINISH					(STR_WIZARDDIALOG_START + 0)
+#define STR_WIZDLG_NEXT						(STR_WIZARDDIALOG_START + 1)
+#define STR_WIZDLG_PREVIOUS					(STR_WIZARDDIALOG_START + 2)
 #define STR_WIZDLG_ROADMAP_TITLE            (STR_WIZARDDIALOG_START + 3)
-#define STR_WIZARDDIALOG_END                (STR_WIZDLG_ROADMAP_TITLE)
-
-#define STR_SVT_COLLATE_START               (STR_WIZARDDIALOG_END+1)
-#define STR_SVT_COLLATE_NORMAL              (STR_SVT_COLLATE_START+0)
-#define STR_SVT_COLLATE_DICTIONARY          (STR_SVT_COLLATE_START+1)
-#define STR_SVT_COLLATE_PINYIN              (STR_SVT_COLLATE_START+2)
-#define STR_SVT_COLLATE_STROKE              (STR_SVT_COLLATE_START+3)
-#define STR_SVT_COLLATE_RADICAL             (STR_SVT_COLLATE_START+4)
-#define STR_SVT_COLLATE_CHARSET             (STR_SVT_COLLATE_START+5)
-#define STR_SVT_COLLATE_ZHUYIN              (STR_SVT_COLLATE_START+6)
-#define STR_SVT_COLLATE_ALPHANUMERIC        (STR_SVT_COLLATE_START+7)
-#define STR_SVT_COLLATE_UNICODE             (STR_SVT_COLLATE_START+8)
-#define STR_SVT_COLLATE_PHONEBOOK           (STR_SVT_COLLATE_START+9)
-#define STR_SVT_COLLATE_PHONETIC_F          (STR_SVT_COLLATE_START+10)
-#define STR_SVT_COLLATE_PHONETIC_L          (STR_SVT_COLLATE_START+11)
-#define STR_SVT_COLLATE_END                 (STR_SVT_COLLATE_PHONETIC_L)
-
-#define STR_SVT_FILEPICKER_START                    (STR_SVT_COLLATE_END+1)
-#define STR_SVT_FILEPICKER_AUTO_EXTENSION           (STR_SVT_FILEPICKER_START+ 0)
-#define STR_SVT_FILEPICKER_PASSWORD                 (STR_SVT_FILEPICKER_START+ 1)
-#define STR_SVT_FILEPICKER_FILTER_OPTIONS           (STR_SVT_FILEPICKER_START+ 2)
-#define STR_SVT_FILEPICKER_READONLY                 (STR_SVT_FILEPICKER_START+ 3)
-#define STR_SVT_FILEPICKER_INSERT_AS_LINK           (STR_SVT_FILEPICKER_START+ 4)
-#define STR_SVT_FILEPICKER_SHOW_PREVIEW             (STR_SVT_FILEPICKER_START+ 5)
-#define STR_SVT_FILEPICKER_PLAY                     (STR_SVT_FILEPICKER_START+ 6)
-#define STR_SVT_FILEPICKER_VERSION                  (STR_SVT_FILEPICKER_START+ 7)
-#define STR_SVT_FILEPICKER_TEMPLATES                (STR_SVT_FILEPICKER_START+ 8)
-#define STR_SVT_FILEPICKER_IMAGE_TEMPLATE           (STR_SVT_FILEPICKER_START+ 9)
-#define STR_SVT_FILEPICKER_SELECTION                (STR_SVT_FILEPICKER_START+10)
-#define STR_SVT_FILEPICKER_FILTER_TITLE             (STR_SVT_FILEPICKER_START+11)
-#define STR_SVT_FOLDERPICKER_DEFAULT_TITLE          (STR_SVT_FILEPICKER_START+12)
-#define STR_SVT_FOLDERPICKER_DEFAULT_DESCRIPTION    (STR_SVT_FILEPICKER_START+13)
-#define STR_SVT_FILEPICKER_END                      (STR_SVT_FOLDERPICKER_DEFAULT_DESCRIPTION)
+#define STR_WIZARDDIALOG_END				(STR_WIZDLG_ROADMAP_TITLE)
+
+#define STR_SVT_COLLATE_START 				(STR_WIZARDDIALOG_END+1)
+#define STR_SVT_COLLATE_NORMAL				(STR_SVT_COLLATE_START+0)
+#define STR_SVT_COLLATE_DICTIONARY			(STR_SVT_COLLATE_START+1)
+#define STR_SVT_COLLATE_PINYIN				(STR_SVT_COLLATE_START+2)
+#define STR_SVT_COLLATE_STROKE				(STR_SVT_COLLATE_START+3)
+#define STR_SVT_COLLATE_RADICAL				(STR_SVT_COLLATE_START+4)
+#define STR_SVT_COLLATE_CHARSET				(STR_SVT_COLLATE_START+5)
+#define STR_SVT_COLLATE_ZHUYIN				(STR_SVT_COLLATE_START+6)
+#define STR_SVT_COLLATE_ALPHANUMERIC 		(STR_SVT_COLLATE_START+7)
+#define STR_SVT_COLLATE_UNICODE				(STR_SVT_COLLATE_START+8)
+#define STR_SVT_COLLATE_PHONEBOOK			(STR_SVT_COLLATE_START+9)
+#define STR_SVT_COLLATE_PHONETIC_F			(STR_SVT_COLLATE_START+10)
+#define STR_SVT_COLLATE_PHONETIC_L			(STR_SVT_COLLATE_START+11)
+#define STR_SVT_COLLATE_END 				(STR_SVT_COLLATE_PHONETIC_L)
+
+#define STR_SVT_FILEPICKER_START 					(STR_SVT_COLLATE_END+1)
+#define STR_SVT_FILEPICKER_AUTO_EXTENSION			(STR_SVT_FILEPICKER_START+ 0)
+#define STR_SVT_FILEPICKER_PASSWORD					(STR_SVT_FILEPICKER_START+ 1)
+#define STR_SVT_FILEPICKER_FILTER_OPTIONS			(STR_SVT_FILEPICKER_START+ 2)
+#define STR_SVT_FILEPICKER_READONLY					(STR_SVT_FILEPICKER_START+ 3)
+#define STR_SVT_FILEPICKER_INSERT_AS_LINK			(STR_SVT_FILEPICKER_START+ 4)
+#define STR_SVT_FILEPICKER_SHOW_PREVIEW				(STR_SVT_FILEPICKER_START+ 5)
+#define STR_SVT_FILEPICKER_PLAY						(STR_SVT_FILEPICKER_START+ 6)
+#define STR_SVT_FILEPICKER_VERSION					(STR_SVT_FILEPICKER_START+ 7)
+#define STR_SVT_FILEPICKER_TEMPLATES				(STR_SVT_FILEPICKER_START+ 8)
+#define STR_SVT_FILEPICKER_IMAGE_TEMPLATE			(STR_SVT_FILEPICKER_START+ 9)
+#define STR_SVT_FILEPICKER_SELECTION				(STR_SVT_FILEPICKER_START+10)
+#define STR_SVT_FILEPICKER_FILTER_TITLE				(STR_SVT_FILEPICKER_START+11)
+#define STR_SVT_FOLDERPICKER_DEFAULT_TITLE			(STR_SVT_FILEPICKER_START+12)
+#define STR_SVT_FOLDERPICKER_DEFAULT_DESCRIPTION	(STR_SVT_FILEPICKER_START+13)
+#define STR_SVT_FILEPICKER_END 						(STR_SVT_FOLDERPICKER_DEFAULT_DESCRIPTION)
 
 // String-Ids for accessibility
-#define STR_SVT_ACC_BEGIN                   (STR_SVT_FILEPICKER_END+1)
+#define STR_SVT_ACC_BEGIN					(STR_SVT_FILEPICKER_END+1)
 #define STR_SVT_TOOL_PANEL_BUTTON_FWD       (STR_SVT_ACC_BEGIN+0)
 #define STR_SVT_TOOL_PANEL_BUTTON_BACK      (STR_SVT_ACC_BEGIN+1)
-#define STR_SVT_ACC_DESC_TABLISTBOX         (STR_SVT_ACC_BEGIN+2)
-#define STR_SVT_ACC_DESC_FILEVIEW           (STR_SVT_ACC_BEGIN+3)
-#define STR_SVT_ACC_DESC_FOLDER             (STR_SVT_ACC_BEGIN+4)
-#define STR_SVT_ACC_DESC_FILE               (STR_SVT_ACC_BEGIN+5)
-#define STR_SVT_ACC_EMPTY_FIELD             (STR_SVT_ACC_BEGIN+6)
-#define STR_SVT_ACC_END                     (STR_SVT_ACC_EMPTY_FIELD)
-
-#define STR_SVT_INDEXENTRY_START            (STR_SVT_ACC_END + 1)
-#define STR_SVT_INDEXENTRY_ALPHANUMERIC     (STR_SVT_INDEXENTRY_START+0)
-#define STR_SVT_INDEXENTRY_DICTIONARY       (STR_SVT_INDEXENTRY_START+1)
-#define STR_SVT_INDEXENTRY_PINYIN           (STR_SVT_INDEXENTRY_START+2)
-#define STR_SVT_INDEXENTRY_RADICAL          (STR_SVT_INDEXENTRY_START+3)
-#define STR_SVT_INDEXENTRY_STROKE           (STR_SVT_INDEXENTRY_START+4)
-#define STR_SVT_INDEXENTRY_ZHUYIN           (STR_SVT_INDEXENTRY_START+5)
-#define STR_SVT_INDEXENTRY_PHONETIC_FS      (STR_SVT_INDEXENTRY_START+6)
-#define STR_SVT_INDEXENTRY_PHONETIC_FC      (STR_SVT_INDEXENTRY_START+7)
-#define STR_SVT_INDEXENTRY_PHONETIC_LS      (STR_SVT_INDEXENTRY_START+8)
-#define STR_SVT_INDEXENTRY_PHONETIC_LC      (STR_SVT_INDEXENTRY_START+9)
-#define STR_SVT_INDEXENTRY_END              (STR_SVT_INDEXENTRY_PHONETIC_LC)
+#define STR_SVT_ACC_DESC_TABLISTBOX			(STR_SVT_ACC_BEGIN+2)
+#define STR_SVT_ACC_DESC_FILEVIEW			(STR_SVT_ACC_BEGIN+3)
+#define STR_SVT_ACC_DESC_FOLDER				(STR_SVT_ACC_BEGIN+4)
+#define STR_SVT_ACC_DESC_FILE				(STR_SVT_ACC_BEGIN+5)
+#define STR_SVT_ACC_EMPTY_FIELD				(STR_SVT_ACC_BEGIN+6)
+#define STR_SVT_ACC_END						(STR_SVT_ACC_EMPTY_FIELD)
+
+#define STR_SVT_INDEXENTRY_START			(STR_SVT_ACC_END + 1)
+#define STR_SVT_INDEXENTRY_ALPHANUMERIC		(STR_SVT_INDEXENTRY_START+0)
+#define STR_SVT_INDEXENTRY_DICTIONARY		(STR_SVT_INDEXENTRY_START+1)
+#define STR_SVT_INDEXENTRY_PINYIN			(STR_SVT_INDEXENTRY_START+2)
+#define STR_SVT_INDEXENTRY_RADICAL			(STR_SVT_INDEXENTRY_START+3)
+#define STR_SVT_INDEXENTRY_STROKE			(STR_SVT_INDEXENTRY_START+4)
+#define STR_SVT_INDEXENTRY_ZHUYIN			(STR_SVT_INDEXENTRY_START+5)
+#define STR_SVT_INDEXENTRY_PHONETIC_FS		(STR_SVT_INDEXENTRY_START+6)
+#define STR_SVT_INDEXENTRY_PHONETIC_FC		(STR_SVT_INDEXENTRY_START+7)
+#define STR_SVT_INDEXENTRY_PHONETIC_LS		(STR_SVT_INDEXENTRY_START+8)
+#define STR_SVT_INDEXENTRY_PHONETIC_LC		(STR_SVT_INDEXENTRY_START+9)
+#define STR_SVT_INDEXENTRY_END				(STR_SVT_INDEXENTRY_PHONETIC_LC)
 
 //String - Ids for Java errors, messages
 //These strings come from project desktop
 //There was no time for translation, therefore the defines needed to
 //remain the same.
 #define STR_SVT_JAVAERROR_START             (STR_SVT_INDEXENTRY_END + 1)
-#define STR_QUESTION_JAVADISABLED           (STR_SVT_JAVAERROR_START+0)
-#define STR_ERROR_JVMCREATIONFAILED         (STR_SVT_JAVAERROR_START+1)
+#define STR_QUESTION_JAVADISABLED			(STR_SVT_JAVAERROR_START+0)
+#define STR_ERROR_JVMCREATIONFAILED		    (STR_SVT_JAVAERROR_START+1)
 #define STR_WARNING_JAVANOTFOUND            (STR_SVT_JAVAERROR_START+2)
 #define STR_WARNING_INVALIDJAVASETTINGS     (STR_SVT_JAVAERROR_START+3)
 #define STR_ERROR_RESTARTREQUIRED           (STR_SVT_JAVAERROR_START+4)
-#define STR_SVT_JAVAERROR_END               (STR_ERROR_RESTARTREQUIRED)
+#define STR_SVT_JAVAERROR_END               (STR_ERROR_RESTARTREQUIRED)  
 
 // String array to match UI language names to LanguageType values and vice versa
 #define STR_ARR_SVT_LANGUAGE_TABLE_START    (STR_SVT_JAVAERROR_END + 1)
@@ -290,111 +290,111 @@
 //.............................................................................
 // dialogs
 
-#define DLG_EXPORT_JPG_START            (RID_SVTOOLS_START+110)
-#define DLG_EXPORT_JPG                  (RID_SVTOOLS_START+111)
-#define DLG_EXPORT_JPG_END              (RID_SVTOOLS_START+112)
+#define DLG_EXPORT_JPG_START			(RID_SVTOOLS_START+110)
+#define DLG_EXPORT_JPG					(RID_SVTOOLS_START+111)
+#define DLG_EXPORT_JPG_END				(RID_SVTOOLS_START+112)
 
-#define DLG_LOGIN                       (RID_SVTOOLS_START+113)
-#define DLG_ADDRESSBOOKSOURCE           (RID_SVTOOLS_START+114)
+#define DLG_LOGIN						(RID_SVTOOLS_START+113)
+#define DLG_ADDRESSBOOKSOURCE			(RID_SVTOOLS_START+114)
 
-#define DLG_REGISTRATION_REQUEST        (RID_SVTOOLS_START+115)
+#define DLG_REGISTRATION_REQUEST		(RID_SVTOOLS_START+115)
 
-#define DLG_EXPORT_EPNG                 (RID_SVTOOLS_START+116)
+#define DLG_EXPORT_EPNG					(RID_SVTOOLS_START+116)
 //.............................................................................
 // bitmaps
 
-#define BMP_DEMO_FINGER                 (RID_SVTOOLS_BITMAP_START +   0)
-#define BMP_HELP_AGENT_IMAGE            (RID_SVTOOLS_BITMAP_START +   1)
-#define BMP_HELP_AGENT_CLOSER           (RID_SVTOOLS_BITMAP_START +   2)
+#define BMP_DEMO_FINGER 				(RID_SVTOOLS_BITMAP_START +   0)
+#define BMP_HELP_AGENT_IMAGE			(RID_SVTOOLS_BITMAP_START +   1)
+#define BMP_HELP_AGENT_CLOSER			(RID_SVTOOLS_BITMAP_START +   2)
 #define BMP_PLUGIN                      (RID_SVTOOLS_BITMAP_START +   3)
 
 //.............................................................................
 // image lists
 
-#define RID_IMG_EXPANDER                            (RID_SVTOOLS_IMAGELIST_START +  0)
-#define RID_SVTOOLS_IMAGELIST_BIG                   (RID_SVTOOLS_IMAGELIST_START +  1)
-#define RID_SVTOOLS_IMAGELIST_SMALL                 (RID_SVTOOLS_IMAGELIST_START +  2)
-#define RID_SVTOOLS_IMAGELIST_EDITBROWSEBOX         (RID_SVTOOLS_IMAGELIST_START +  3)
-#define RID_SVTOOLS_IMAGELIST_BIG_HIGHCONTRAST      (RID_SVTOOLS_IMAGELIST_START +  4)
-#define RID_SVTOOLS_IMAGELIST_SMALL_HIGHCONTRAST    (RID_SVTOOLS_IMAGELIST_START +  5)
-#define RID_SVTOOLS_IMAGELIST_EDITBWSEBOX_H         (RID_SVTOOLS_IMAGELIST_START +  6)
-#define RID_FILEPICKER_IMAGES                       (RID_SVTOOLS_IMAGELIST_START +  7)
-#define RID_FILEPICKER_IMAGES_HC                    (RID_SVTOOLS_IMAGELIST_START +  8)
+#define RID_IMG_EXPANDER							(RID_SVTOOLS_IMAGELIST_START +  0)
+#define RID_SVTOOLS_IMAGELIST_BIG           		(RID_SVTOOLS_IMAGELIST_START +  1)
+#define RID_SVTOOLS_IMAGELIST_SMALL         		(RID_SVTOOLS_IMAGELIST_START +  2)
+#define RID_SVTOOLS_IMAGELIST_EDITBROWSEBOX			(RID_SVTOOLS_IMAGELIST_START +  3)
+#define RID_SVTOOLS_IMAGELIST_BIG_HIGHCONTRAST		(RID_SVTOOLS_IMAGELIST_START +  4)
+#define RID_SVTOOLS_IMAGELIST_SMALL_HIGHCONTRAST	(RID_SVTOOLS_IMAGELIST_START +  5)
+#define RID_SVTOOLS_IMAGELIST_EDITBWSEBOX_H			(RID_SVTOOLS_IMAGELIST_START +  6)
+#define RID_FILEPICKER_IMAGES						(RID_SVTOOLS_IMAGELIST_START +  7)
+#define RID_FILEPICKER_IMAGES_HC					(RID_SVTOOLS_IMAGELIST_START +  8)
 
 //.............................................................................
 // error boxes
-#define ERRBOX_REG_NOSYSBROWSER             ( RID_SVTOOLS_START +  0 )
-#define ERRBOX_CHECK_PLZ                    ( RID_SVTOOLS_START + 11 )
+#define ERRBOX_REG_NOSYSBROWSER				( RID_SVTOOLS_START +  0 )
+#define ERRBOX_CHECK_PLZ					( RID_SVTOOLS_START + 11 )
 
 // Java message boxes
 //These strings come from project desktop
 //There was no time for translation, therefore the defines needed to
 //remain the same.
-#define QBX_JAVADISABLED                    (RID_SVTOOLS_START+20)
-#define ERRORBOX_JVMCREATIONFAILED          (RID_SVTOOLS_START+21)
+#define QBX_JAVADISABLED	         		(RID_SVTOOLS_START+20)
+#define ERRORBOX_JVMCREATIONFAILED  		(RID_SVTOOLS_START+21)
 #define WARNINGBOX_JAVANOTFOUND             (RID_SVTOOLS_START+22)
 #define WARNINGBOX_INVALIDJAVASETTINGS      (RID_SVTOOLS_START+23)
 #define ERRORBOX_RESTARTREQUIRED            (RID_SVTOOLS_START+24)
 
 //.............................................................................
 // images
-#define RID_IMG_TREENODE_COLLAPSED      (RID_SVTOOLS_START +  0)
-#define RID_IMG_TREENODE_EXPANDED       (RID_SVTOOLS_START +  1)
-#define RID_IMG_TREENODE_COLLAPSED_HC   (RID_SVTOOLS_START +  2)
-#define RID_IMG_TREENODE_EXPANDED_HC    (RID_SVTOOLS_START +  3)
-
-#define RID_IMG_PRINTERFONT             (RID_SVTOOLS_START + 12)
-#define RID_IMG_BITMAPFONT              (RID_SVTOOLS_START + 13)
-#define RID_IMG_SCALABLEFONT            (RID_SVTOOLS_START + 14)
-#define RID_IMG_PRINTERFONT_HC          (RID_SVTOOLS_START + 15)
-#define RID_IMG_BITMAPFONT_HC           (RID_SVTOOLS_START + 16)
-#define RID_IMG_SCALABLEFONT_HC         (RID_SVTOOLS_START + 17)
+#define RID_IMG_TREENODE_COLLAPSED		(RID_SVTOOLS_START +  0)
+#define RID_IMG_TREENODE_EXPANDED		(RID_SVTOOLS_START +  1)
+#define RID_IMG_TREENODE_COLLAPSED_HC	(RID_SVTOOLS_START +  2)
+#define RID_IMG_TREENODE_EXPANDED_HC	(RID_SVTOOLS_START +  3)
+
+#define RID_IMG_PRINTERFONT 			(RID_SVTOOLS_START + 12)
+#define RID_IMG_BITMAPFONT				(RID_SVTOOLS_START + 13)
+#define RID_IMG_SCALABLEFONT			(RID_SVTOOLS_START + 14)
+#define RID_IMG_PRINTERFONT_HC 			(RID_SVTOOLS_START + 15)
+#define RID_IMG_BITMAPFONT_HC			(RID_SVTOOLS_START + 16)
+#define RID_IMG_SCALABLEFONT_HC			(RID_SVTOOLS_START + 17)
 
 #define IMG_TRIANGLE_RIGHT              (RID_SVTOOLS_START + 18)
 #define IMG_TRIANGLE_RIGHT_HC           (RID_SVTOOLS_START + 19)
 #define IMG_TRIANGLE_DOWN               (RID_SVTOOLS_START + 20)
 #define IMG_TRIANGLE_DOWN_HC            (RID_SVTOOLS_START + 21)
 
-#define IMG_SVT_FOLDER                  (RID_SVTOOLS_START + 40)
-
-#define IMG_SVT_NEWDOC                  (RID_SVTOOLS_START + 52)
-#define IMG_SVT_MYDOCS                  (RID_SVTOOLS_START + 53)
-#define IMG_SVT_TEMPLATES               (RID_SVTOOLS_START + 54)
-#define IMG_SVT_SAMPLES                 (RID_SVTOOLS_START + 55)
-
-#define IMG_SVT_NEWDOC_HC               (RID_SVTOOLS_START + 59)
-#define IMG_SVT_MYDOCS_HC               (RID_SVTOOLS_START + 60)
-#define IMG_SVT_TEMPLATES_HC            (RID_SVTOOLS_START + 61)
-#define IMG_SVT_SAMPLES_HC              (RID_SVTOOLS_START + 62)
-
-#define IMG_SVT_DOCTEMPLATE_BACK_SMALL      (RID_SVTOOLS_START + 70)
-#define IMG_SVT_DOCTEMPLATE_BACK_LARGE      (RID_SVTOOLS_START + 71)
-#define IMG_SVT_DOCTEMPLATE_PREV_SMALL      (RID_SVTOOLS_START + 72)
-#define IMG_SVT_DOCTEMPLATE_PREV_LARGE      (RID_SVTOOLS_START + 73)
-#define IMG_SVT_DOCTEMPLATE_PRINT_SMALL     (RID_SVTOOLS_START + 74)
-#define IMG_SVT_DOCTEMPLATE_PRINT_LARGE     (RID_SVTOOLS_START + 75)
-#define IMG_SVT_DOCTEMPLATE_DOCINFO_SMALL   (RID_SVTOOLS_START + 76)
-#define IMG_SVT_DOCTEMPLATE_DOCINFO_LARGE   (RID_SVTOOLS_START + 77)
-#define IMG_SVT_DOCTEMPLATE_PREVIEW_SMALL   (RID_SVTOOLS_START + 78)
-#define IMG_SVT_DOCTEMPLATE_PREVIEW_LARGE   (RID_SVTOOLS_START + 79)
-
-#define IMG_SVT_DOCTEMPL_HC_BACK_SMALL      (RID_SVTOOLS_START + 80)
-#define IMG_SVT_DOCTEMPL_HC_BACK_LARGE      (RID_SVTOOLS_START + 81)
-#define IMG_SVT_DOCTEMPL_HC_PREV_SMALL      (RID_SVTOOLS_START + 82)
-#define IMG_SVT_DOCTEMPL_HC_PREV_LARGE      (RID_SVTOOLS_START + 83)
-#define IMG_SVT_DOCTEMPL_HC_PRINT_SMALL     (RID_SVTOOLS_START + 84)
-#define IMG_SVT_DOCTEMPL_HC_PRINT_LARGE     (RID_SVTOOLS_START + 85)
-#define IMG_SVT_DOCTEMPL_HC_DOCINFO_SMALL   (RID_SVTOOLS_START + 86)
-#define IMG_SVT_DOCTEMPL_HC_DOCINFO_LARGE   (RID_SVTOOLS_START + 87)
-#define IMG_SVT_DOCTEMPL_HC_PREVIEW_SMALL   (RID_SVTOOLS_START + 88)
-#define IMG_SVT_DOCTEMPL_HC_PREVIEW_LARGE   (RID_SVTOOLS_START + 89)
+#define IMG_SVT_FOLDER					(RID_SVTOOLS_START + 40)
+
+#define IMG_SVT_NEWDOC					(RID_SVTOOLS_START + 52)
+#define IMG_SVT_MYDOCS					(RID_SVTOOLS_START + 53)
+#define IMG_SVT_TEMPLATES				(RID_SVTOOLS_START + 54)
+#define IMG_SVT_SAMPLES					(RID_SVTOOLS_START + 55)
+
+#define IMG_SVT_NEWDOC_HC				(RID_SVTOOLS_START + 59)
+#define IMG_SVT_MYDOCS_HC				(RID_SVTOOLS_START + 60)
+#define IMG_SVT_TEMPLATES_HC			(RID_SVTOOLS_START + 61)
+#define IMG_SVT_SAMPLES_HC				(RID_SVTOOLS_START + 62)
+
+#define	IMG_SVT_DOCTEMPLATE_BACK_SMALL		(RID_SVTOOLS_START + 70)
+#define	IMG_SVT_DOCTEMPLATE_BACK_LARGE		(RID_SVTOOLS_START + 71)
+#define	IMG_SVT_DOCTEMPLATE_PREV_SMALL		(RID_SVTOOLS_START + 72)
+#define	IMG_SVT_DOCTEMPLATE_PREV_LARGE		(RID_SVTOOLS_START + 73)
+#define	IMG_SVT_DOCTEMPLATE_PRINT_SMALL		(RID_SVTOOLS_START + 74)
+#define	IMG_SVT_DOCTEMPLATE_PRINT_LARGE		(RID_SVTOOLS_START + 75)
+#define	IMG_SVT_DOCTEMPLATE_DOCINFO_SMALL	(RID_SVTOOLS_START + 76)
+#define	IMG_SVT_DOCTEMPLATE_DOCINFO_LARGE	(RID_SVTOOLS_START + 77)
+#define	IMG_SVT_DOCTEMPLATE_PREVIEW_SMALL	(RID_SVTOOLS_START + 78)
+#define	IMG_SVT_DOCTEMPLATE_PREVIEW_LARGE	(RID_SVTOOLS_START + 79)
+
+#define	IMG_SVT_DOCTEMPL_HC_BACK_SMALL		(RID_SVTOOLS_START + 80)
+#define	IMG_SVT_DOCTEMPL_HC_BACK_LARGE		(RID_SVTOOLS_START + 81)
+#define	IMG_SVT_DOCTEMPL_HC_PREV_SMALL		(RID_SVTOOLS_START + 82)
+#define	IMG_SVT_DOCTEMPL_HC_PREV_LARGE		(RID_SVTOOLS_START + 83)
+#define	IMG_SVT_DOCTEMPL_HC_PRINT_SMALL		(RID_SVTOOLS_START + 84)
+#define	IMG_SVT_DOCTEMPL_HC_PRINT_LARGE		(RID_SVTOOLS_START + 85)
+#define	IMG_SVT_DOCTEMPL_HC_DOCINFO_SMALL	(RID_SVTOOLS_START + 86)
+#define	IMG_SVT_DOCTEMPL_HC_DOCINFO_LARGE	(RID_SVTOOLS_START + 87)
+#define	IMG_SVT_DOCTEMPL_HC_PREVIEW_SMALL	(RID_SVTOOLS_START + 88)
+#define	IMG_SVT_DOCTEMPL_HC_PREVIEW_LARGE	(RID_SVTOOLS_START + 89)
 
 #define RID_IMG_PRNDLG_COLLATE              (STR_SVT_PRNDLG_START + 29)
 #define RID_IMG_PRNDLG_NOCOLLATE            (STR_SVT_PRNDLG_START + 30)
 #define RID_IMG_PRNDLG_COLLATE_HC           (STR_SVT_PRNDLG_START + 31)
 #define RID_IMG_PRNDLG_NOCOLLATE_HC         (STR_SVT_PRNDLG_START + 32)
 
-#endif  // #ifndef _SVTOOLS_HRC
+#endif	// #ifndef _SVTOOLS_HRC
 
 // ******************************************************************* EOF
 
diff --git a/svtools/inc/svtools/svtreebx.hxx b/svtools/inc/svtools/svtreebx.hxx
index a600b91db1c4..28bf652a74fc 100644
--- a/svtools/inc/svtools/svtreebx.hxx
+++ b/svtools/inc/svtools/svtreebx.hxx
@@ -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
@@ -40,17 +40,17 @@ class TabBar;
 #define SV_TAB_BORDER 8
 
 #define WB_HASBUTTONSATROOT       ((WinBits)0x0800)
-#define WB_NOINITIALSELECTION       WB_DROPDOWN
-#define WB_HIDESELECTION            WB_NOHIDESELECTION
-#define WB_FORCE_MAKEVISIBLE        WB_SPIN
+#define WB_NOINITIALSELECTION		WB_DROPDOWN
+#define WB_HIDESELECTION			WB_NOHIDESELECTION
+#define WB_FORCE_MAKEVISIBLE		WB_SPIN
 
 #define SV_LISTBOX_ID_TREEBOX 1   // fuer SvLBox::IsA()
 #define SV_ENTRYHEIGHTOFFS_PIXEL 2
 
-#define TREEFLAG_CHKBTN         0x0001
-#define TREEFLAG_USESEL         0x0002
-#define TREEFLAG_MANINS         0x0004
-#define TREEFLAG_RECALCTABS     0x0008
+#define TREEFLAG_CHKBTN			0x0001
+#define TREEFLAG_USESEL			0x0002
+#define TREEFLAG_MANINS			0x0004
+#define TREEFLAG_RECALCTABS		0x0008
 
 typedef sal_Int64   ExtendedWinBits;
 
@@ -65,105 +65,106 @@ class SVT_DLLPUBLIC SvTreeListBox : public SvLBox
     friend class ImpLBSelEng;
     friend class TreeControlPeer;
 
-    SvImpLBox*      pImp;
-    Link            aCheckButtonHdl;
-    Link            aScrolledHdl;
-    Accelerator     aInpEditAcc;
-    Image           aPrevInsertedExpBmp;
-    Image           aPrevInsertedColBmp;
-    Image           aCurInsertedExpBmp;
-    Image           aCurInsertedColBmp;
-
-    short           nContextBmpWidthMax;
-    USHORT          nFirstSelTab, nLastSelTab;
-    short           nEntryHeight;
-    short           nEntryHeightOffs;
-    short           nIndent;
-    short           nFocusWidth;
-    USHORT          aContextBmpMode;
+    SvImpLBox*		pImp;
+    Link			aCheckButtonHdl;
+    Link			aScrolledHdl;
+    Accelerator		aInpEditAcc;
+    Image			aPrevInsertedExpBmp;
+    Image			aPrevInsertedColBmp;
+    Image			aCurInsertedExpBmp;
+    Image			aCurInsertedColBmp;
+
+    short			nContextBmpWidthMax;
+    USHORT			nFirstSelTab, nLastSelTab;
+    short			nEntryHeight;
+    short			nEntryHeightOffs;
+    short  			nIndent;
+    short			nFocusWidth;
+    USHORT			aContextBmpMode;
 
 #ifdef _SVTREEBX_CXX
     DECL_DLLPRIVATE_LINK( CheckButtonClick, SvLBoxButtonData * );
 
-    SVT_DLLPRIVATE short            GetHeightOffset( const Image& rBmp, Size& rLogicSize);
-    SVT_DLLPRIVATE short            GetHeightOffset( const Font& rFont, Size& rLogicSize);
+    SVT_DLLPRIVATE short 			GetHeightOffset( const Image& rBmp, Size& rLogicSize);
+    SVT_DLLPRIVATE short 			GetHeightOffset( const Font& rFont, Size& rLogicSize);
 
-    SVT_DLLPRIVATE void         SetEntryHeight( SvLBoxEntry* pEntry );
-    SVT_DLLPRIVATE void         AdjustEntryHeight( const Image& rBmp );
-    SVT_DLLPRIVATE void             AdjustEntryHeight( const Font& rFont );
+    SVT_DLLPRIVATE void			SetEntryHeight( SvLBoxEntry* pEntry );
+    SVT_DLLPRIVATE void			AdjustEntryHeight( const Image& rBmp );
+    SVT_DLLPRIVATE void 			AdjustEntryHeight( const Font& rFont );
 
-    SVT_DLLPRIVATE void         ImpEntryInserted( SvLBoxEntry* pEntry );
-    SVT_DLLPRIVATE long         PaintEntry1( SvLBoxEntry*, long nLine,
+    SVT_DLLPRIVATE void			ImpEntryInserted( SvLBoxEntry* pEntry );
+    SVT_DLLPRIVATE long			PaintEntry1( SvLBoxEntry*, long nLine,
                                 USHORT nTabFlagMask=0xffff,
                                 BOOL bHasClipRegion=FALSE );
 
-    SVT_DLLPRIVATE void         InitTreeView( WinBits nWinStyle );
-    SVT_DLLPRIVATE SvLBoxItem*      GetItem_Impl( SvLBoxEntry*, long nX, SvLBoxTab** ppTab,
+    SVT_DLLPRIVATE void			InitTreeView( WinBits nWinStyle );
+    SVT_DLLPRIVATE SvLBoxItem*		GetItem_Impl( SvLBoxEntry*, long nX, SvLBoxTab** ppTab,
                         USHORT nEmptyWidth );
 #endif
 
 protected:
-    SvLBoxButtonData*   pCheckButtonData;
-    USHORT              nTreeFlags;
+    SvLBoxButtonData*	pCheckButtonData;
+    USHORT				nTreeFlags;
 
-    SvLBoxEntry*        pEdEntry;
-    SvLBoxItem*         pEdItem;
+    SvLBoxEntry*		pEdEntry;
+    SvLBoxItem*			pEdItem;
 
-    void            EditItemText( SvLBoxEntry* pEntry, SvLBoxString* pItem,
+    void			EditItemText( SvLBoxEntry* pEntry, SvLBoxString* pItem,
                         const Selection& );
-    void            EditedText( const XubString& );
-    void            EditingRequest( SvLBoxEntry* pEntry, SvLBoxItem* pItem,
+    void			EditedText( const XubString& );
+    void			EditingRequest( SvLBoxEntry* pEntry, SvLBoxItem* pItem,
                         const Point& rMousePos );
 
-    SvPtrarr            aTabs;
+    SvPtrarr 			aTabs;
 
     // berechnet abhaengig von TreeList-Style & Bitmap-Groessen
     // alle Tabulatoren neu; wird beim Einfuegen/Austauschen von
     // Bitmaps, beim Wechsel des Models usw. automatisch gerufen
-    virtual void    SetTabs();
-    void            SetTabs_Impl();
-    void            AddTab( long nPos,USHORT nFlags=SV_LBOXTAB_ADJUST_LEFT,
+    virtual void	SetTabs();
+    void			SetTabs_Impl();
+    void 			AddTab( long nPos,USHORT nFlags=SV_LBOXTAB_ADJUST_LEFT,
                         void* pUserData = 0 );
-    USHORT          TabCount() const { return aTabs.Count(); }
-    SvLBoxTab*      GetFirstDynamicTab() const;
-    SvLBoxTab*      GetFirstDynamicTab( USHORT& rTabPos ) const;
-    SvLBoxTab*      GetFirstTab( USHORT nFlagMask, USHORT& rTabPos );
-    SvLBoxTab*      GetLastTab( USHORT nFlagMask, USHORT& rTabPos );
-    SvLBoxTab*      GetTab( SvLBoxEntry*, SvLBoxItem* ) const;
-    void            ClearTabList();
+    USHORT			TabCount() const { return aTabs.Count(); }
+    SvLBoxTab*		GetFirstDynamicTab() const;
+    SvLBoxTab*		GetFirstDynamicTab( USHORT& rTabPos ) const;
+    SvLBoxTab*		GetFirstTab( USHORT nFlagMask, USHORT& rTabPos );
+    SvLBoxTab*		GetLastTab( USHORT nFlagMask, USHORT& rTabPos );
+    SvLBoxTab*		GetTab( SvLBoxEntry*, SvLBoxItem* ) const;
+    void			ClearTabList();
 
     virtual void InitEntry(SvLBoxEntry*,const XubString&,const Image&,const Image&,SvLBoxButtonKind);
 
-    virtual void    NotifyBeginScroll();
-    virtual void    NotifyEndScroll();
+    virtual void	NotifyBeginScroll();
+    virtual void	NotifyEndScroll();
     // nLines == 0 => horizontales Scrolling
-    virtual void    NotifyScrolling( long nLines );
-    virtual void    NotifyScrolled();
-    void            SetScrolledHdl( const Link& rLink ) { aScrolledHdl = rLink; }
-    const Link&     GetScrolledHdl() const { return aScrolledHdl; }
-    long            GetXOffset() const { return GetMapMode().GetOrigin().X(); }
+    virtual void	NotifyScrolling( long nLines );
+    virtual	void	NotifyScrolled();
+    void			SetScrolledHdl( const Link& rLink ) { aScrolledHdl = rLink; }
+    const Link&		GetScrolledHdl() const { return aScrolledHdl; }
+    long			GetXOffset() const { return GetMapMode().GetOrigin().X(); }
 
     // wird aufgerufen, _bevor_ Bereiche im Control invalidiert werden,
     // kann zum Hiden von Elementen benutzt werden, die von aussen
     // in das Control hineingezeichnet werden
-    virtual void    NotifyInvalidating();
+    virtual void	NotifyInvalidating();
 
-    virtual ULONG   GetAscInsertionPos( SvLBoxEntry*, SvLBoxEntry* pParent );
-    virtual ULONG   GetDescInsertionPos( SvLBoxEntry*, SvLBoxEntry* pParent );
+    virtual ULONG	GetAscInsertionPos( SvLBoxEntry*, SvLBoxEntry* pParent );
+    virtual ULONG	GetDescInsertionPos( SvLBoxEntry*, SvLBoxEntry* pParent );
     virtual void    Command( const CommandEvent& rCEvt );
 
     virtual void    RequestHelp( const HelpEvent& rHEvt );
-    virtual void    CursorMoved( SvLBoxEntry* pNewCursor );
-    virtual void    PreparePaint( SvLBoxEntry* );
-    virtual void    DataChanged( const DataChangedEvent& rDCEvt );
+    virtual void	CursorMoved( SvLBoxEntry* pNewCursor );
+    virtual void	PreparePaint( SvLBoxEntry* );
+    virtual void	DataChanged( const DataChangedEvent& rDCEvt );
+    virtual void    StateChanged( StateChangedType nStateChange );
 
-    void            InitSettings(BOOL bFont,BOOL bForeground,BOOL bBackground);
-    BOOL            IsCellFocusEnabled() const;
-    bool            SetCurrentTabPos( USHORT _nNewPos );
-    USHORT          GetCurrentTabPos() const;
-    void            CallImplEventListeners(ULONG nEvent, void* pData);
+    void 			InitSettings(BOOL bFont,BOOL bForeground,BOOL bBackground);
+    BOOL			IsCellFocusEnabled() const;
+    bool			SetCurrentTabPos( USHORT _nNewPos );
+    USHORT			GetCurrentTabPos() const;
+    void			CallImplEventListeners(ULONG nEvent, void* pData);
 
-    void            ImplEditEntry( SvLBoxEntry* pEntry );
+    void			ImplEditEntry( SvLBoxEntry* pEntry );
 
     sal_Bool        AreChildrenTransient() const;
     void            SetChildrenNotTransient();
@@ -176,37 +177,37 @@ public:
     void                SetExtendedWinBits( ExtendedWinBits _nBits );
     ExtendedWinBits     GetExtendedWinBits() const;
 
-    void            DisconnectFromModel();
+    void			DisconnectFromModel();
 
-    void            EnableCheckButton( SvLBoxButtonData* );
-    void            SetCheckButtonData( SvLBoxButtonData* );
-    void            SetNodeBitmaps( const Image& rCollapsedNodeBmp, const Image& rExpandedNodeBmp, BmpColorMode _eMode = BMP_COLOR_NORMAL );
-    void            SetDontKnowNodeBitmap( const Image& rDontKnowBmp, BmpColorMode _eMode = BMP_COLOR_NORMAL );
+    void 			EnableCheckButton( SvLBoxButtonData* );
+    void 			SetCheckButtonData( SvLBoxButtonData* );
+    void 			SetNodeBitmaps( const Image& rCollapsedNodeBmp, const Image& rExpandedNodeBmp, BmpColorMode _eMode = BMP_COLOR_NORMAL );
+    void			SetDontKnowNodeBitmap( const Image& rDontKnowBmp, BmpColorMode _eMode = BMP_COLOR_NORMAL );
 
     /** returns the default image which clients should use for expanded nodes, to have a consistent user
         interface experience in the whole product.
     */
-    static const Image& GetDefaultExpandedNodeImage( BmpColorMode _eMode = BMP_COLOR_NORMAL );
+    static const Image&	GetDefaultExpandedNodeImage( BmpColorMode _eMode = BMP_COLOR_NORMAL );
 
     /** returns the default image which clients should use for expanded nodes, to have a consistent user
         interface experience in the whole product.
     */
-    static const Image& GetDefaultCollapsedNodeImage( BmpColorMode _eMode = BMP_COLOR_NORMAL );
+    static const Image&	GetDefaultCollapsedNodeImage( BmpColorMode _eMode = BMP_COLOR_NORMAL );
 
     /** sets default bitmaps for collapsed and expanded nodes.
     */
-    inline  void    SetNodeDefaultImages( )
+    inline	void	SetNodeDefaultImages( )
     {
         SetNodeBitmaps( GetDefaultCollapsedNodeImage( BMP_COLOR_NORMAL ), GetDefaultExpandedNodeImage( BMP_COLOR_NORMAL ), BMP_COLOR_NORMAL );
         SetNodeBitmaps( GetDefaultCollapsedNodeImage( BMP_COLOR_HIGHCONTRAST ), GetDefaultExpandedNodeImage( BMP_COLOR_HIGHCONTRAST ), BMP_COLOR_HIGHCONTRAST );
     }
 
-    virtual SvLBoxEntry*    InsertEntry( const XubString& rText, SvLBoxEntry* pParent = 0,
+    virtual SvLBoxEntry*	InsertEntry( const XubString& rText, SvLBoxEntry* pParent = 0,
                                          BOOL bChildsOnDemand = FALSE,
                                          ULONG nPos=LIST_APPEND, void* pUserData = 0,
                                          SvLBoxButtonKind eButtonKind = SvLBoxButtonKind_enabledCheckbox );
 
-    virtual SvLBoxEntry*    InsertEntry( const XubString& rText,
+    virtual SvLBoxEntry*	InsertEntry( const XubString& rText,
                                          const Image& rExpandedEntryBmp,
                                          const Image& rCollapsedEntryBmp,
                                          SvLBoxEntry* pParent = 0,
@@ -215,52 +216,52 @@ public:
                                          SvLBoxButtonKind eButtonKind = SvLBoxButtonKind_enabledCheckbox );
 
     const Image&    GetDefaultExpandedEntryBmp( BmpColorMode _eMode = BMP_COLOR_NORMAL ) const;
-    const Image&    GetDefaultCollapsedEntryBmp( BmpColorMode _eMode = BMP_COLOR_NORMAL ) const;
+    const Image&	GetDefaultCollapsedEntryBmp( BmpColorMode _eMode = BMP_COLOR_NORMAL ) const;
 
-    void            SetDefaultExpandedEntryBmp( const Image& rBmp, BmpColorMode _eMode = BMP_COLOR_NORMAL );
-    void            SetDefaultCollapsedEntryBmp( const Image& rBmp, BmpColorMode _eMode = BMP_COLOR_NORMAL );
+    void			SetDefaultExpandedEntryBmp( const Image& rBmp, BmpColorMode _eMode = BMP_COLOR_NORMAL );
+    void          	SetDefaultCollapsedEntryBmp( const Image& rBmp, BmpColorMode _eMode = BMP_COLOR_NORMAL );
 
-    void            SetCheckButtonState( SvLBoxEntry*, SvButtonState );
-    SvButtonState   GetCheckButtonState( SvLBoxEntry* ) const;
+    void			SetCheckButtonState( SvLBoxEntry*, SvButtonState );
+    SvButtonState 	GetCheckButtonState( SvLBoxEntry* ) const;
 
     void            ShowExpandBitmapOnCursor( BOOL );
-    BOOL            IsExpandBitmapOnCursor() const  { return (BOOL)(aContextBmpMode & SVLISTENTRYFLAG_FOCUSED)!=0; }
+    BOOL            IsExpandBitmapOnCursor() const 	{ return (BOOL)(aContextBmpMode & SVLISTENTRYFLAG_FOCUSED)!=0; }
 
-    void            SetEntryText(SvLBoxEntry*, const XubString& );
-    void            SetExpandedEntryBmp( SvLBoxEntry* _pEntry, const Image& _rImage, BmpColorMode _eMode = BMP_COLOR_NORMAL );
-    void            SetCollapsedEntryBmp( SvLBoxEntry* _pEntry, const Image& _rImage, BmpColorMode _eMode = BMP_COLOR_NORMAL );
+    void			SetEntryText(SvLBoxEntry*, const XubString& );
+    void			SetExpandedEntryBmp( SvLBoxEntry* _pEntry, const Image& _rImage, BmpColorMode _eMode = BMP_COLOR_NORMAL );
+    void			SetCollapsedEntryBmp( SvLBoxEntry* _pEntry, const Image& _rImage, BmpColorMode _eMode = BMP_COLOR_NORMAL );
 
-    virtual String  GetEntryText( SvLBoxEntry* pEntry ) const;
-    String          SearchEntryText( SvLBoxEntry* pEntry ) const;
-    const Image&    GetExpandedEntryBmp(SvLBoxEntry* _pEntry, BmpColorMode _eMode = BMP_COLOR_NORMAL ) const;
-    const Image&    GetCollapsedEntryBmp(SvLBoxEntry* _pEntry, BmpColorMode _eMode = BMP_COLOR_NORMAL ) const;
+    virtual	String	GetEntryText( SvLBoxEntry* pEntry ) const;
+    String			SearchEntryText( SvLBoxEntry* pEntry ) const;
+    const Image&	GetExpandedEntryBmp(SvLBoxEntry* _pEntry, BmpColorMode _eMode = BMP_COLOR_NORMAL ) const;
+    const Image&	GetCollapsedEntryBmp(SvLBoxEntry* _pEntry, BmpColorMode _eMode = BMP_COLOR_NORMAL ) const;
 
-    void            SetCheckButtonHdl( const Link& rLink )  { aCheckButtonHdl=rLink; }
-    Link            GetCheckButtonHdl() const { return aCheckButtonHdl; }
-    virtual void    CheckButtonHdl();
+    void			SetCheckButtonHdl( const Link& rLink )	{ aCheckButtonHdl=rLink; }
+    Link			GetCheckButtonHdl() const { return aCheckButtonHdl; }
+    virtual void	CheckButtonHdl();
 
-    virtual SvLBoxEntry*    CloneEntry( SvLBoxEntry* pSource );
+    virtual SvLBoxEntry*	CloneEntry( SvLBoxEntry* pSource );
 
-    virtual USHORT  IsA();
+    virtual USHORT	IsA();
 
-    void            SetSublistOpenWithReturn( BOOL bMode = TRUE );      // open/close sublist with return/enter
-    BOOL            IsSublistOpenWithReturn() const;
-    void            SetSublistOpenWithLeftRight( BOOL bMode = TRUE );   // open/close sublist with cursor left/right
-    BOOL            IsSublistOpenWithLeftRight() const;
+    void			SetSublistOpenWithReturn( BOOL bMode = TRUE );		// open/close sublist with return/enter
+    BOOL			IsSublistOpenWithReturn() const;
+    void			SetSublistOpenWithLeftRight( BOOL bMode = TRUE );	// open/close sublist with cursor left/right
+    BOOL			IsSublistOpenWithLeftRight() const;
 
-    void            EnableInplaceEditing( BOOL bEnable );
-    BOOL            IsInplaceEditingEnabled() const { return SvLBox::IsInplaceEditingEnabled(); }
+    void			EnableInplaceEditing( BOOL bEnable );
+    BOOL			IsInplaceEditingEnabled() const { return SvLBox::IsInplaceEditingEnabled(); }
     inline void     ForbidEmptyText() { SvLBox::ForbidEmptyText(); }
     // Editiert das erste StringItem des Entries, 0==Cursor
-    void            EditEntry( SvLBoxEntry* pEntry = NULL );
-    void            CancelEditing();
-    virtual BOOL    EditingEntry( SvLBoxEntry* pEntry, Selection& );
-    virtual BOOL    EditedEntry( SvLBoxEntry* pEntry, const XubString& rNewText );
-    BOOL            IsEditingActive() const { return SvLBox::IsEditingActive(); }
-    void            EndEditing( BOOL bCancel = FALSE ) { SvLBox::EndEditing( bCancel ); }
-    BOOL            EditingCanceled() const { return SvLBox::EditingCanceled(); }
+    void			EditEntry( SvLBoxEntry* pEntry = NULL );
+    void			CancelEditing();
+    virtual BOOL	EditingEntry( SvLBoxEntry* pEntry, Selection& );
+    virtual BOOL	EditedEntry( SvLBoxEntry* pEntry, const XubString& rNewText );
+    BOOL			IsEditingActive() const { return SvLBox::IsEditingActive(); }
+    void			EndEditing( BOOL bCancel = FALSE ) { SvLBox::EndEditing( bCancel ); }
+    BOOL			EditingCanceled() const { return SvLBox::EditingCanceled(); }
 
-    virtual void    RequestingChilds( SvLBoxEntry* pParent );
+    virtual void	RequestingChilds( SvLBoxEntry* pParent );
 
     virtual void    Paint( const Rectangle& rRect );
     virtual void    MouseButtonDown( const MouseEvent& rMEvt );
@@ -270,121 +271,121 @@ public:
     virtual void    Resize();
     virtual void    GetFocus();
     virtual void    LoseFocus();
-    void            SetUpdateMode( BOOL );
+    void 			SetUpdateMode( BOOL );
     // aktualisiert nicht die vertikale ScrollBar
-    void            SetUpdateModeFast( BOOL );
+    void 			SetUpdateModeFast( BOOL );
 
     using SvListView::SetModel;
-    void            SetModel( SvLBoxTreeList* );
-    virtual void    ModelHasCleared();
-    virtual void    ModelHasInserted( SvListEntry* pEntry );
-    virtual void    ModelHasInsertedTree( SvListEntry* pEntry );
-    virtual void    ModelIsMoving(SvListEntry* pSource,
+    void			SetModel( SvLBoxTreeList* );
+    virtual void 	ModelHasCleared();
+    virtual void 	ModelHasInserted( SvListEntry* pEntry );
+    virtual void 	ModelHasInsertedTree( SvListEntry* pEntry );
+    virtual void 	ModelIsMoving(SvListEntry* pSource,
                         SvListEntry* pTargetParent, ULONG nChildPos );
-    virtual void    ModelHasMoved(SvListEntry* pSource );
-    virtual void    ModelIsRemoving( SvListEntry* pEntry );
-    virtual void    ModelHasRemoved( SvListEntry* pEntry );
-    virtual void    ModelHasEntryInvalidated( SvListEntry* pEntry );
+    virtual void 	ModelHasMoved(SvListEntry* pSource );
+    virtual void 	ModelIsRemoving( SvListEntry* pEntry );
+    virtual void 	ModelHasRemoved( SvListEntry* pEntry );
+    virtual void 	ModelHasEntryInvalidated( SvListEntry* pEntry );
 
-    void            ShowTargetEmphasis( SvLBoxEntry*, BOOL bShow );
+    void			ShowTargetEmphasis( SvLBoxEntry*, BOOL bShow );
     using Window::GetDropTarget;
-    SvLBoxEntry*    GetDropTarget( const Point& );
-    void            ScrollOutputArea( short nDeltaEntries );
-
-    short           GetEntryHeight() const  { return nEntryHeight; }
-    void            SetEntryHeight( short nHeight, BOOL bAlways = FALSE );
-    Size            GetOutputSizePixel() const;
-    short           GetIndent() const { return nIndent; }
-    void            SetIndent( short nIndent );
-    void            SetSpaceBetweenEntries( short nSpace );
-    short           GetSpaceBetweenEntries() const {return nEntryHeightOffs;}
-    Point           GetEntryPosition( SvLBoxEntry* ) const;
-    void            ShowEntry( SvLBoxEntry* );  // !!!OBSOLETE, use MakeVisible
-    virtual void    MakeVisible( SvLBoxEntry* );
-    void            MakeVisible( SvLBoxEntry*, BOOL bMoveToTop );
-
-    void            SetCollapsedNodeBmp( const Image&, BmpColorMode _eMode = BMP_COLOR_NORMAL );
-    void            SetExpandedNodeBmp( const Image&, BmpColorMode _eMode = BMP_COLOR_NORMAL  );
-    Image           GetCollapsedNodeBmp( BmpColorMode _eMode = BMP_COLOR_NORMAL ) const;
-    Image           GetExpandedNodeBmp( BmpColorMode _eMode = BMP_COLOR_NORMAL ) const;
-
-    void            SetFont( const Font& rFont );
+    SvLBoxEntry*	GetDropTarget( const Point& );
+    void			ScrollOutputArea( short nDeltaEntries );
+
+    short			GetEntryHeight() const 	{ return nEntryHeight; }
+    void			SetEntryHeight( short nHeight, BOOL bAlways = FALSE );
+    Size			GetOutputSizePixel() const;
+    short			GetIndent() const { return nIndent; }
+    void			SetIndent( short nIndent );
+    void			SetSpaceBetweenEntries( short nSpace );
+    short			GetSpaceBetweenEntries() const {return nEntryHeightOffs;}
+    Point			GetEntryPosition( SvLBoxEntry* ) const;
+    void			ShowEntry( SvLBoxEntry* );  // !!!OBSOLETE, use MakeVisible
+    virtual void	MakeVisible( SvLBoxEntry* );
+    void			MakeVisible( SvLBoxEntry*, BOOL bMoveToTop );
+
+    void          	SetCollapsedNodeBmp( const Image&, BmpColorMode _eMode = BMP_COLOR_NORMAL );
+    void          	SetExpandedNodeBmp( const Image&, BmpColorMode _eMode = BMP_COLOR_NORMAL  );
+    Image          	GetCollapsedNodeBmp( BmpColorMode _eMode = BMP_COLOR_NORMAL ) const;
+    Image          	GetExpandedNodeBmp( BmpColorMode _eMode = BMP_COLOR_NORMAL ) const;
+
+    void			SetFont( const Font& rFont );
 
     using Window::SetCursor;
-    void            SetCursor( SvLBoxEntry* pEntry, BOOL bForceNoSelect = FALSE );
+    void			SetCursor( SvLBoxEntry* pEntry, BOOL bForceNoSelect = FALSE );
 
-    SvLBoxEntry*    GetEntry( const Point& rPos, BOOL bHit = FALSE ) const;
-    SvLBoxEntry*    GetEntry( SvLBoxEntry* pParent, ULONG nPos ) const { return SvLBox::GetEntry(pParent,nPos); }
-    SvLBoxEntry*    GetEntry( ULONG nRootPos ) const { return SvLBox::GetEntry(nRootPos);}
+    SvLBoxEntry*	GetEntry( const Point& rPos, BOOL bHit = FALSE ) const;
+    SvLBoxEntry*	GetEntry( SvLBoxEntry* pParent, ULONG nPos ) const { return SvLBox::GetEntry(pParent,nPos); }
+    SvLBoxEntry*	GetEntry( ULONG nRootPos ) const { return SvLBox::GetEntry(nRootPos);}
 
-    void            SetWindowBits( WinBits nWinStyle );
-    WinBits         GetWindowBits() const { return nWindowStyle; }
+    void			SetWindowBits( WinBits nWinStyle );
+    WinBits			GetWindowBits() const { return nWindowStyle; }
 
-    void            PaintEntry( SvLBoxEntry* );
-    long            PaintEntry( SvLBoxEntry*, long nLine,
+    void			PaintEntry( SvLBoxEntry* );
+    long			PaintEntry( SvLBoxEntry*, long nLine,
                                 USHORT nTabFlagMask=0xffff );
     virtual Rectangle GetFocusRect( SvLBoxEntry*, long nLine );
     // Beruecksichtigt Einrueckung
-    virtual long    GetTabPos( SvLBoxEntry*, SvLBoxTab* );
-    void            InvalidateEntry( SvLBoxEntry* );
-    SvLBoxItem*     GetItem( SvLBoxEntry*, long nX, SvLBoxTab** ppTab);
-    SvLBoxItem*     GetItem( SvLBoxEntry*, long nX );
-    SvLBoxItem*     GetFirstDynamicItem( SvLBoxEntry* pEntry );
+    virtual long	GetTabPos( SvLBoxEntry*, SvLBoxTab* );
+    void			InvalidateEntry( SvLBoxEntry* );
+    SvLBoxItem*		GetItem( SvLBoxEntry*, long nX, SvLBoxTab** ppTab);
+    SvLBoxItem*		GetItem( SvLBoxEntry*, long nX );
+    SvLBoxItem*		GetFirstDynamicItem( SvLBoxEntry* pEntry );
 
-    void            SetDragDropMode( DragDropMode );
-    void            SetSelectionMode( SelectionMode );
-    void            SetAddMode( BOOL bAdd );
-    BOOL            IsAddMode() const;
+    void			SetDragDropMode( DragDropMode );
+    void 			SetSelectionMode( SelectionMode );
+    void			SetAddMode( BOOL bAdd );
+    BOOL			IsAddMode() const;
 
     virtual BOOL    Expand( SvLBoxEntry* pParent );
     virtual BOOL    Collapse( SvLBoxEntry* pParent );
     virtual BOOL    Select( SvLBoxEntry* pEntry, BOOL bSelect=TRUE );
-    virtual ULONG   SelectChilds( SvLBoxEntry* pParent, BOOL bSelect );
-    virtual void    SelectAll( BOOL bSelect, BOOL bPaint = TRUE );
+    virtual ULONG	SelectChilds( SvLBoxEntry* pParent, BOOL bSelect );
+    virtual void	SelectAll( BOOL bSelect, BOOL bPaint = TRUE );
     virtual void    SetCurEntry( SvLBoxEntry* _pEntry );
     virtual SvLBoxEntry*
                     GetCurEntry() const;
 
     using Window::Invalidate;
-    virtual void    Invalidate( USHORT nFlags = 0);
-    virtual void    Invalidate( const Rectangle&, USHORT nFlags = 0 );
+    virtual void	Invalidate( USHORT nFlags = 0);
+    virtual void	Invalidate( const Rectangle&, USHORT nFlags = 0 );
 
-    void            SetHighlightRange(USHORT nFirstTab=0,USHORT nLastTab=0xffff);
-    void            RemoveHighlightRange();
+    void			SetHighlightRange(USHORT nFirstTab=0,USHORT nLastTab=0xffff);
+    void			RemoveHighlightRange();
 
-    virtual Region  GetDragRegion() const;
+    virtual Region	GetDragRegion() const;
 
     // Childs des Parents werden Childs des naechstoberen Parents
-    void            RemoveParentKeepChilds( SvLBoxEntry* pParent );
+    void			RemoveParentKeepChilds( SvLBoxEntry* pParent );
 
     DECL_LINK( DefaultCompare, SvSortData* );
-    virtual void    ModelNotification( USHORT nActionId, SvListEntry* pEntry1,
+    virtual void	ModelNotification( USHORT nActionId, SvListEntry* pEntry1,
                         SvListEntry* pEntry2, ULONG nPos );
 
-    long            GetTextOffset() const;
-    void            EndSelection();
-    BOOL            IsNodeButton( const Point& rPos ) const;
-    void            RepaintScrollBars() const;
-    ScrollBar*      GetVScroll();
-    ScrollBar*      GetHScroll();
-    void            EnableAsyncDrag( BOOL b );
+    long			GetTextOffset() const;
+    void			EndSelection();
+    BOOL			IsNodeButton( const Point& rPos ) const;
+    void			RepaintScrollBars() const;
+    ScrollBar*		GetVScroll();
+    ScrollBar*		GetHScroll();
+    void			EnableAsyncDrag( BOOL b );
 
-    SvLBoxEntry*    GetFirstEntryInView() const;
-    SvLBoxEntry*    GetNextEntryInView(SvLBoxEntry*) const;
+    SvLBoxEntry*	GetFirstEntryInView() const;
+    SvLBoxEntry*	GetNextEntryInView(SvLBoxEntry*) const;
 
-    void            ShowFocusRect( const SvLBoxEntry* pEntry );
-    void            SetTabBar( TabBar* pTabBar );
-    void            InitStartEntry();
+    void			ShowFocusRect( const SvLBoxEntry* pEntry );
+    void			SetTabBar( TabBar* pTabBar );
+    void			InitStartEntry();
 
     // reset all what could lead to editingText in e.g. a contextmenu call
-    void            CancelPendingEdit();
+    void			CancelPendingEdit();
 
     virtual PopupMenu* CreateContextMenu( void );
-    virtual void    ExcecuteContextMenuAction( USHORT nSelectedPopupEntry );
+    virtual void	ExcecuteContextMenuAction( USHORT nSelectedPopupEntry );
 
-    void            EnableContextMenuHandling( void );
-    void            EnableContextMenuHandling( BOOL bEnable );
-    BOOL            IsContextMenuHandlingEnabled( void ) const;
+    void			EnableContextMenuHandling( void );
+    void			EnableContextMenuHandling( BOOL bEnable );
+    BOOL			IsContextMenuHandlingEnabled( void ) const;
 
     void            EnableList( bool _bEnable );
 
@@ -404,10 +405,10 @@ public:
         @param pEntry
             The entry.
         @return  The bounding rectangle of an entry. */
-    virtual Rectangle   GetBoundingRect( SvLBoxEntry* pEntry );
+    virtual Rectangle	GetBoundingRect( SvLBoxEntry* pEntry );
 
     /** Enables, that one cell of a tablistbox entry can be focused */
-    void                EnableCellFocus();
+    void				EnableCellFocus();
 
 protected:
     using SvListView::Expand;
diff --git a/svtools/inc/svtools/svxbox.hxx b/svtools/inc/svtools/svxbox.hxx
index 25deba4d091c..e4292dd7f86d 100644
--- a/svtools/inc/svtools/svxbox.hxx
+++ b/svtools/inc/svtools/svxbox.hxx
@@ -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
@@ -54,12 +54,12 @@ public:
     SvxBoxEntry( const SvxBoxEntry& rOrg );
     SvxBoxEntry();
 
-    String              aName;
-    USHORT              nId;
+    String 				aName;
+    USHORT 				nId;
 
 private:
-    BOOL                bModified;
-    BOOL                bNew;
+    BOOL   				bModified;
+    BOOL   				bNew;
 };
 
 // class SvxListBox ------------------------------------------------------
@@ -77,45 +77,45 @@ public:
     SvxListBox( Window* pParent, const ResId& rId );
     ~SvxListBox();
 
-    void                InsertNewEntry( const SvxBoxEntry& rEntry );
-    void                InsertEntry( const SvxBoxEntry& rEntry,
+    void				InsertNewEntry( const SvxBoxEntry& rEntry );
+    void				InsertEntry( const SvxBoxEntry& rEntry,
                                      USHORT nId = LISTBOX_ENTRY_NOTFOUND );
 
-    void                RemoveEntry( USHORT nPos );
-    void                RemoveEntry( const SvxBoxEntry& rEntry );
+    void				RemoveEntry( USHORT nPos );
+    void				RemoveEntry( const SvxBoxEntry& rEntry );
 
-    void                Clear();
+    void				Clear();
 
-    USHORT              GetEntryPos( const SvxBoxEntry& rEntry ) const;
+    USHORT 				GetEntryPos( const SvxBoxEntry& rEntry ) const;
     const SvxBoxEntry&  GetSvxBoxEntry( USHORT nIdx ) const;
 
-    inline BOOL         IsEntrySelected( const SvxBoxEntry& rEntry ) const;
+    inline BOOL			IsEntrySelected( const SvxBoxEntry& rEntry ) const;
     const SvxBoxEntry&  GetSelectSvxBoxEntry( USHORT nIdx = 0 ) const;
-    inline void         SelectEntry( const SvxBoxEntry& rEntry,
+    inline void			SelectEntry( const SvxBoxEntry& rEntry,
                                      BOOL bSelect = TRUE );
 
-    void                ModifyEntry( USHORT nPos, const String& aName );
-    USHORT              GetModifiedCount() const;
-    const SvxBoxEntry&  GetModifiedEntry( USHORT nPos ) const;
+    void				ModifyEntry( USHORT nPos, const String& aName );
+    USHORT				GetModifiedCount() const;
+    const SvxBoxEntry&	GetModifiedEntry( USHORT nPos ) const;
 
-    USHORT              GetRemovedCount() const;
-    const SvxBoxEntry&  GetRemovedEntry( USHORT nPos ) const;
+    USHORT				GetRemovedCount() const;
+    const SvxBoxEntry&	GetRemovedEntry( USHORT nPos ) const;
 
-    USHORT              GetNewCount() const;
-    const SvxBoxEntry&  GetNewEntry( USHORT nPos ) const;
+    USHORT				GetNewCount() const;
+    const SvxBoxEntry&	GetNewEntry( USHORT nPos ) const;
 
 private:
-    SvxEntryLst         aEntryLst;
-    SvxEntryLst         aDelEntryLst;
-    SvxBoxEntry         aDefault;
+    SvxEntryLst			aEntryLst;
+    SvxEntryLst			aDelEntryLst;
+    SvxBoxEntry 		aDefault;
 
-    void                InitListBox();
-    void                InsertSorted( SvxBoxEntry* pEntry );
+    void				InitListBox();
+    void				InsertSorted( SvxBoxEntry* pEntry );
 };
 
 // inlines ---------------------------------------------------------------
 
-inline BOOL SvxListBox::IsEntrySelected( const SvxBoxEntry& aEntry ) const
+inline BOOL	SvxListBox::IsEntrySelected( const SvxBoxEntry& aEntry ) const
     { return ListBox::IsEntrySelected( aEntry.aName ); }
 
 inline void SvxListBox::SelectEntry( const SvxBoxEntry& aEntry, BOOL bSelect )
@@ -125,10 +125,10 @@ inline void SvxListBox::SelectEntry( const SvxBoxEntry& aEntry, BOOL bSelect )
 
 enum SvxComboBoxStyle
 {
-    SVX_CBS_UPPER       = 0x01,
-    SVX_CBS_LOWER       = 0x02,
-    SVX_CBS_ALL         = 0x04,
-    SVX_CBS_FILENAME    = 0x08,
+    SVX_CBS_UPPER 	 	= 0x01,
+    SVX_CBS_LOWER	 	= 0x02,
+    SVX_CBS_ALL	  	 	= 0x04,
+    SVX_CBS_FILENAME 	= 0x08,
 #ifdef WIN
     SVX_CBS_SW_FILENAME = SVX_CBS_FILENAME | SVX_CBS_LOWER
 #else
@@ -151,42 +151,42 @@ public:
     SvxComboBox( Window* pParent, const ResId& rId, USHORT nStyleBits = SVX_CBS_ALL );
     ~SvxComboBox();
 
-    void                InsertNewEntry( const SvxBoxEntry& );
-    void                InsertEntry( const SvxBoxEntry& );
+    void				InsertNewEntry( const SvxBoxEntry& );
+    void				InsertEntry( const SvxBoxEntry& );
 
-    void                RemoveEntry( USHORT nPos );
-    void                RemoveEntry( const SvxBoxEntry& rEntry );
+    void				RemoveEntry( USHORT nPos );
+    void				RemoveEntry( const SvxBoxEntry& rEntry );
 
-    void                Clear();
+    void				Clear();
 
-    USHORT              GetEntryPos( const SvxBoxEntry& rEntry ) const;
+    USHORT 				GetEntryPos( const SvxBoxEntry& rEntry ) const;
     const SvxBoxEntry&  GetEntry( USHORT nIdx ) const;
 
-    void                ModifyEntry( USHORT nPos, const String& aName );
-    USHORT              GetModifiedCount() const;
-    const SvxBoxEntry&  GetModifiedEntry( USHORT nPos ) const;
+    void				ModifyEntry( USHORT nPos, const String& aName );
+    USHORT				GetModifiedCount() const;
+    const SvxBoxEntry&	GetModifiedEntry( USHORT nPos ) const;
 
-    USHORT              GetRemovedCount() const;
-    const SvxBoxEntry&  GetRemovedEntry( USHORT nPos ) const;
+    USHORT				GetRemovedCount() const;
+    const SvxBoxEntry&	GetRemovedEntry( USHORT nPos ) const;
 
-    USHORT              GetNewCount() const;
-    const SvxBoxEntry&  GetNewEntry( USHORT nPos ) const;
+    USHORT				GetNewCount() const;
+    const SvxBoxEntry&	GetNewEntry( USHORT nPos ) const;
 
-    USHORT              GetStyle() const             { return nStyle; }
-    void                SetStyle( const USHORT nSt ) { nStyle = nSt; }
+    USHORT 				GetStyle() const 			 { return nStyle; }
+    void				SetStyle( const USHORT nSt ) { nStyle = nSt; }
 
-    String              GetText() const;
+    String				GetText() const;
 
 private:
-    SvxEntryLst         aEntryLst;
-    SvxEntryLst         aDelEntryLst;
-    SvxBoxEntry         aDefault;
-    USHORT              nStyle;
+    SvxEntryLst			aEntryLst;
+    SvxEntryLst			aDelEntryLst;
+    SvxBoxEntry 		aDefault;
+    USHORT 				nStyle;
 
-    virtual void        KeyInput( const KeyEvent& rKEvt );
+    virtual void 		KeyInput( const KeyEvent& rKEvt );
 
-    void                InitComboBox();
-    void                InsertSorted( SvxBoxEntry* pEntry );
+    void				InitComboBox();
+    void				InsertSorted( SvxBoxEntry* pEntry );
 };
 
 #endif
diff --git a/svtools/inc/svtools/syntaxhighlight.hxx b/svtools/inc/svtools/syntaxhighlight.hxx
index 8cf7126fa24c..a450f46cccf5 100644
--- a/svtools/inc/svtools/syntaxhighlight.hxx
+++ b/svtools/inc/svtools/syntaxhighlight.hxx
@@ -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
@@ -86,19 +86,19 @@ SV_DECL_VARARR(HighlightPortions, HighlightPortion, 0, 16)
 // Hilfsklasse zur Untersuchung von JavaScript-Modulen, zunaechst zum
 // Heraussuchen der Funktionen, spaeter auch zum Syntax-Highlighting verwenden
 
-//  Flags fuer Zeichen-Eigenschaften
-#define CHAR_START_IDENTIFIER   0x0001
-#define CHAR_IN_IDENTIFIER      0x0002
-#define CHAR_START_NUMBER       0x0004
-#define CHAR_IN_NUMBER          0x0008
-#define CHAR_IN_HEX_NUMBER      0x0010
-#define CHAR_IN_OCT_NUMBER      0x0020
-#define CHAR_START_STRING       0x0040
-#define CHAR_OPERATOR           0x0080
-#define CHAR_SPACE              0x0100
-#define CHAR_EOL                0x0200
+//	Flags fuer Zeichen-Eigenschaften
+#define CHAR_START_IDENTIFIER	0x0001
+#define CHAR_IN_IDENTIFIER		0x0002
+#define CHAR_START_NUMBER		0x0004
+#define CHAR_IN_NUMBER			0x0008
+#define CHAR_IN_HEX_NUMBER		0x0010
+#define CHAR_IN_OCT_NUMBER		0x0020
+#define CHAR_START_STRING		0x0040
+#define CHAR_OPERATOR			0x0080
+#define CHAR_SPACE				0x0100
+#define CHAR_EOL				0x0200
 
-#define CHAR_EOF                0x00
+#define CHAR_EOF				0x00
 
 
 // Sprachmodus des HighLighters (spaeter eventuell feiner
@@ -122,8 +122,8 @@ class SimpleTokenizer_Impl
     UINT32 nLine;
     UINT32 nCol;
 
-    sal_Unicode peekChar( void )    { return *mpActualPos; }
-    sal_Unicode getChar( void )     { nCol++; return *mpActualPos++; }
+    sal_Unicode peekChar( void )	{ return *mpActualPos; }
+    sal_Unicode getChar( void )		{ nCol++; return *mpActualPos++; }
 
     // Hilfsfunktion: Zeichen-Flag Testen
     BOOL testCharFlags( sal_Unicode c, USHORT nTestFlags );
@@ -168,7 +168,7 @@ class SVT_DLLPUBLIC SyntaxHighlighter
     char* m_pKeyWords;
     UINT16 m_nKeyWordCount;
 
-//  void initializeKeyWords( HighlighterLanguage eLanguage );
+//	void initializeKeyWords( HighlighterLanguage eLanguage );
 
 public:
     SyntaxHighlighter( void );
diff --git a/svtools/inc/svtools/table/abstracttablecontrol.hxx b/svtools/inc/svtools/table/abstracttablecontrol.hxx
index 9206f20ecbcb..d5e310fb6ee0 100644
--- a/svtools/inc/svtools/table/abstracttablecontrol.hxx
+++ b/svtools/inc/svtools/table/abstracttablecontrol.hxx
@@ -1,6 +1,6 @@
 /*************************************************************************
  * 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
@@ -97,7 +97,7 @@ namespace svt { namespace table
         virtual void    hideCursor() = 0;
 
         /** shows the cell cursor
-
+        
             @see hideCursor
         */
         virtual void    showCursor() = 0;
diff --git a/svtools/inc/svtools/table/defaultinputhandler.hxx b/svtools/inc/svtools/table/defaultinputhandler.hxx
index ca760896d539..e129c5240508 100644
--- a/svtools/inc/svtools/table/defaultinputhandler.hxx
+++ b/svtools/inc/svtools/table/defaultinputhandler.hxx
@@ -1,6 +1,6 @@
 /*************************************************************************
  * 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
@@ -44,7 +44,7 @@ namespace svt { namespace table
             friend class TableDataWindow;
     private:
         DefaultInputHandler_Impl*   m_pImpl;
-        bool                        m_bResize;
+        bool						m_bResize;
 
     public:
         DefaultInputHandler();
diff --git a/svtools/inc/svtools/table/gridtablerenderer.hxx b/svtools/inc/svtools/table/gridtablerenderer.hxx
index e474306c0423..47cf86188fa2 100644
--- a/svtools/inc/svtools/table/gridtablerenderer.hxx
+++ b/svtools/inc/svtools/table/gridtablerenderer.hxx
@@ -1,6 +1,6 @@
 /*************************************************************************
  * 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
@@ -54,7 +54,7 @@ namespace svt { namespace table
 
     public:
         /** creates a table renderer associated with the given model
-
+            
             @param _rModel
                 the model which should be rendered. The caller is responsible
                 for lifetime control, that is, the model instance must live
diff --git a/svtools/inc/svtools/table/tablecontrol.hxx b/svtools/inc/svtools/table/tablecontrol.hxx
index f3b7ed88b565..7e2df362e019 100644
--- a/svtools/inc/svtools/table/tablecontrol.hxx
+++ b/svtools/inc/svtools/table/tablecontrol.hxx
@@ -1,6 +1,6 @@
 /*************************************************************************
  * 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
@@ -109,7 +109,7 @@ namespace svt { namespace table
 
         /** returns the row, which contains the input point*/
 
-        ColPos  GetCurrentRow (const Point& rPoint);
+        ColPos	GetCurrentRow (const Point& rPoint);
 
         /** retrieves the current column
 
@@ -157,11 +157,11 @@ namespace svt { namespace table
         {
             return GoTo( GetCurrentColumn(), _nRow );
         }
-    SVT_DLLPRIVATE virtual void Resize();
+    SVT_DLLPRIVATE virtual void	Resize();
     virtual void    Select();
-    SVT_DLLPRIVATE void     SetSelectHdl( const Link& rLink )   { m_aSelectHdl = rLink; }
-    const Link&     GetSelectHdl() const            { return m_aSelectHdl; }
-
+    SVT_DLLPRIVATE void		SetSelectHdl( const Link& rLink )	{ m_aSelectHdl = rLink; }
+    const Link& 	GetSelectHdl() const			{ return m_aSelectHdl; }
+        
     /**invalidates the table if table has been changed e.g. new row added
     */
     void InvalidateDataWindow(RowPos _nRowStart, RowPos _nRowEnd, bool _bRemoved);
@@ -177,9 +177,9 @@ namespace svt { namespace table
         // Window overridables
         virtual void        GetFocus();
         virtual void        LoseFocus();
-        virtual void        KeyInput( const KeyEvent& rKEvt );
+        virtual void        KeyInput( const KeyEvent& rKEvt );  
         virtual void        StateChanged( StateChangedType i_nStateChange );
-
+    
     /** Creates and returns the accessible object of the whole GridControl. */
     SVT_DLLPRIVATE virtual XACC CreateAccessible();
     SVT_DLLPRIVATE virtual XACC CreateAccessibleControl( sal_Int32 _nIndex );
@@ -193,12 +193,12 @@ namespace svt { namespace table
     virtual Rectangle GetWindowExtentsRelative( Window *pRelativeWindow ) const;
     virtual void GrabFocus();
     virtual XACC GetAccessible( BOOL bCreate = TRUE );
-    virtual Window* GetAccessibleParentWindow() const;
-    virtual Window* GetWindowInstance();
+    virtual Window*	GetAccessibleParentWindow() const;
+    virtual Window*	GetWindowInstance();
     virtual sal_Int32 GetAccessibleControlCount() const;
     virtual sal_Bool ConvertPointToControlIndex( sal_Int32& _rnIndex, const Point& _rPoint );
-    virtual long GetRowCount() const;
-    virtual long GetColumnCount() const;
+    virtual	long GetRowCount() const;
+    virtual	long GetColumnCount() const;
     virtual sal_Bool HasRowHeader() const;
     virtual sal_Int32 GetSelectedRowCount() const;
     virtual bool IsRowSelected( long _nRow ) const;
@@ -208,10 +208,10 @@ namespace svt { namespace table
     virtual Rectangle GetFieldCharacterBounds(sal_Int32 _nRow,sal_Int32 _nColumnPos,sal_Int32 nIndex);
     virtual sal_Int32 GetFieldIndexAtPoint(sal_Int32 _nRow,sal_Int32 _nColumnPos,const Point& _rPoint);
     virtual void FillAccessibleStateSetForCell( ::utl::AccessibleStateSetHelper& _rStateSet, sal_Int32 _nRow, sal_uInt16 _nColumnPos ) const;
-    virtual ::rtl::OUString GetRowDescription( sal_Int32 _nRow ) const;
+    virtual ::rtl::OUString	GetRowDescription( sal_Int32 _nRow ) const;
     virtual ::rtl::OUString GetRowName(sal_Int32 _nIndex) const;
-    virtual ::rtl::OUString GetColumnDescription( sal_uInt16 _nColumnPos ) const;
-    virtual ::rtl::OUString GetColumnName( sal_Int32 _nIndex ) const;
+    virtual ::rtl::OUString	GetColumnDescription( sal_uInt16 _nColumnPos ) const;
+    virtual ::rtl::OUString	GetColumnName( sal_Int32 _nIndex ) const;
     virtual ::com::sun::star::uno::Any GetCellContent( sal_Int32 _nRowPos, sal_Int32 _nColPos) const;
     virtual sal_Bool HasRowHeader();
     virtual sal_Bool HasColHeader();
diff --git a/svtools/inc/svtools/table/tabledatawindow.hxx b/svtools/inc/svtools/table/tabledatawindow.hxx
index 9a6ece489119..8594652415aa 100644
--- a/svtools/inc/svtools/table/tabledatawindow.hxx
+++ b/svtools/inc/svtools/table/tabledatawindow.hxx
@@ -1,6 +1,6 @@
 /*************************************************************************
  * 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
@@ -52,33 +52,33 @@ namespace svt { namespace table
         friend class TableFunctionSet;
     private:
         TableControl_Impl&  m_rTableControl;
-        Link                m_aMouseButtonDownHdl;
-         Link               m_aMouseButtonUpHdl;
-        Link                m_aSelectHdl;
-        RowPos              m_nRowAlreadySelected;
+        Link				m_aMouseButtonDownHdl;
+         Link				m_aMouseButtonUpHdl;
+        Link				m_aSelectHdl;
+        RowPos				m_nRowAlreadySelected;
     public:
         TableDataWindow( TableControl_Impl& _rTableControl );
-        inline void         SetMouseButtonDownHdl( const Link& rLink )  { m_aMouseButtonDownHdl = rLink; }
-        inline const Link&  GetMouseButtonDownHdl() const               { return m_aMouseButtonDownHdl; }
-        inline void         SetMouseButtonUpHdl( const Link& rLink )    { m_aMouseButtonUpHdl = rLink; }
-        inline const Link&  GetMouseButtonUpHdl() const             { return m_aMouseButtonUpHdl; }
-        inline void         SetSelectHdl( const Link& rLink )   { m_aSelectHdl = rLink; }
-        inline const Link&  GetSelectHdl() const                { return m_aSelectHdl; }
+        inline void			SetMouseButtonDownHdl( const Link& rLink )	{ m_aMouseButtonDownHdl = rLink; }
+        inline const Link& 	GetMouseButtonDownHdl() const				{ return m_aMouseButtonDownHdl; }
+        inline void			SetMouseButtonUpHdl( const Link& rLink )	{ m_aMouseButtonUpHdl = rLink; }
+        inline const Link& 	GetMouseButtonUpHdl() const				{ return m_aMouseButtonUpHdl; }
+        inline void			SetSelectHdl( const Link& rLink )	{ m_aSelectHdl = rLink; }
+        inline const Link& 	GetSelectHdl() const				{ return m_aSelectHdl; }
 
         // Window overridables
         virtual void        Paint( const Rectangle& rRect );
-        virtual void        MouseMove( const MouseEvent& rMEvt);
-        virtual void        MouseButtonDown( const MouseEvent& rMEvt);
-        virtual void        MouseButtonUp( const MouseEvent& rMEvt);
-        virtual void        SetPointer( const Pointer& rPointer );
-        virtual void        CaptureMouse();
-        virtual void        ReleaseMouse();
-        virtual long        Notify(NotifyEvent& rNEvt);
-        virtual void        SetControlBackground(const Color& rColor);
-        virtual void        SetControlBackground();
+        virtual void		MouseMove( const MouseEvent& rMEvt);
+        virtual void		MouseButtonDown( const MouseEvent& rMEvt);
+        virtual void		MouseButtonUp( const MouseEvent& rMEvt);
+        virtual	void		SetPointer( const Pointer& rPointer );
+        virtual	void		CaptureMouse();
+        virtual	void		ReleaseMouse();
+        virtual long		Notify(NotifyEvent& rNEvt);
+        virtual void		SetControlBackground(const Color& rColor);
+        virtual void		SetControlBackground();
 
-        void                SetBackground(const Wallpaper& rColor);
-        void                SetBackground();
+        void				SetBackground(const Wallpaper& rColor);
+        void				SetBackground();
     };
 //........................................................................
 } } // namespace svt::table
diff --git a/svtools/inc/svtools/table/tableinputhandler.hxx b/svtools/inc/svtools/table/tableinputhandler.hxx
index 6d6af9f641bb..09fdef1b3d53 100644
--- a/svtools/inc/svtools/table/tableinputhandler.hxx
+++ b/svtools/inc/svtools/table/tableinputhandler.hxx
@@ -1,6 +1,6 @@
 /*************************************************************************
  * 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
diff --git a/svtools/inc/svtools/table/tablemodel.hxx b/svtools/inc/svtools/table/tablemodel.hxx
index 3da396d9d86c..43578df16f01 100644
--- a/svtools/inc/svtools/table/tablemodel.hxx
+++ b/svtools/inc/svtools/table/tablemodel.hxx
@@ -1,6 +1,6 @@
 /*************************************************************************
  * 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
@@ -43,14 +43,14 @@ namespace svt { namespace table
 {
 //........................................................................
 
-
+    
     //====================================================================
-    //= cell data
+    //= cell data 
     //====================================================================
     struct TableContentType
     {
-        ::rtl::OUString sContent;
-        Image*  pImage;
+        ::rtl::OUString	sContent; 
+        Image*	pImage;
         TableContentType() :
             sContent(),
             pImage(  )
@@ -84,7 +84,7 @@ namespace svt { namespace table
     class SAL_NO_VTABLE ITableModelListener
     {
     public:
-        //virtual void  onTableModelChanged(PTableModel pTableModel) = 0;
+        //virtual void	onTableModelChanged(PTableModel pTableModel) = 0;
         /** notifies the listener that one or more rows have been inserted into
             the table
 
@@ -219,7 +219,7 @@ namespace svt { namespace table
         /** returns the width of the column, in 1/100 millimeters
 
             The returned value must be a positive ->TableMetrics value.
-
+            
             It can also be COLWIDTH_FIT_TO_VIEW, to indicate that the width of the column
             should automatically be adjusted to completely fit the view. For instance, a
             model's last column could return this value, to indicate that it is to occupy
@@ -284,7 +284,7 @@ namespace svt { namespace table
         virtual void            setMaxWidth( TableMetrics _nMaxWidth ) = 0;
 
         /** returns the preferred width of the column,  or 0 if the column
-            does not have a preferred width.
+            does not have a preferred width. 
 
             @see setMaxWidth
             @see getMinWidth
@@ -322,8 +322,8 @@ namespace svt { namespace table
         */
         virtual TableSize   getRowCount() const = 0;
 
-        SVT_DLLPRIVATE virtual void     setColumnCount(TableSize _nColCount) = 0;
-        SVT_DLLPRIVATE virtual void     setRowCount(TableSize _nRowCount) = 0;
+        SVT_DLLPRIVATE virtual void	    setColumnCount(TableSize _nColCount) = 0;
+        SVT_DLLPRIVATE virtual void	    setRowCount(TableSize _nRowCount) = 0;
 
         /** determines whether the table has column headers
 
@@ -336,12 +336,12 @@ namespace svt { namespace table
         /** sets whether the table should have row headers
             @see IColumnRenderer
         */
-        SVT_DLLPRIVATE virtual void     setRowHeaders( bool rowHeaders) = 0;
-
+        SVT_DLLPRIVATE virtual void		setRowHeaders( bool rowHeaders) = 0;
+        
         /** sets whether the table should have column headers
             @see IColumnRenderer
         */
-        SVT_DLLPRIVATE virtual void     setColumnHeaders( bool columnHeaders) = 0;
+        SVT_DLLPRIVATE virtual void		setColumnHeaders( bool columnHeaders) = 0;
 
         /** determines whether the table has row headers
 
@@ -353,7 +353,7 @@ namespace svt { namespace table
         virtual bool        hasRowHeaders() const = 0;
 
         /** determines whether the given cell is editable
-
+        
             @see ICellEditor
             @todo
         */
@@ -409,7 +409,7 @@ namespace svt { namespace table
         */
         SVT_DLLPRIVATE virtual TableMetrics    getRowHeight() const = 0;
 
-        SVT_DLLPRIVATE virtual void         setRowHeight(TableMetrics _nRowHeight) = 0;
+        SVT_DLLPRIVATE virtual void			setRowHeight(TableMetrics _nRowHeight) = 0;
 
         /** determines the height of the column header row
 
@@ -451,7 +451,7 @@ namespace svt { namespace table
     virtual void setCellContent(const std::vector< std::vector< ::com::sun::star::uno::Any > >& cellContent)=0;
     /** gets the content of the cells
     */
-    virtual std::vector< std::vector< ::com::sun::star::uno::Any > >&   getCellContent() = 0;
+    virtual std::vector< std::vector< ::com::sun::star::uno::Any > >&	getCellContent() = 0;
     /**sets title of header rows
     */
     SVT_DLLPRIVATE virtual void setRowHeaderName(const std::vector<rtl::OUString>& cellColumnContent)=0;
@@ -474,7 +474,7 @@ namespace svt { namespace table
         /// destroys the table model instance
         virtual ~ITableModel() { }
     };
-    typedef ::boost::shared_ptr< ITableModel > PTableModel;
+    typedef ::boost::shared_ptr< ITableModel > PTableModel;    
 
 //........................................................................
 } } // namespace svt::table
diff --git a/svtools/inc/svtools/table/tablerenderer.hxx b/svtools/inc/svtools/table/tablerenderer.hxx
index f81771dd22e6..7f6d03c799bb 100644
--- a/svtools/inc/svtools/table/tablerenderer.hxx
+++ b/svtools/inc/svtools/table/tablerenderer.hxx
@@ -1,6 +1,6 @@
 /*************************************************************************
  * 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
@@ -214,7 +214,7 @@ namespace svt { namespace table
                             bool _bActive, bool _bSelected,
                             OutputDevice& _rDevice, const Rectangle& _rArea,
                 const StyleSettings& _rStyle, Image* _pCellData ) = 0;
-
+        
     /** paints a certain cell
 
             The row to be painted is denoted by the most recent call to
diff --git a/svtools/inc/svtools/table/tabletypes.hxx b/svtools/inc/svtools/table/tabletypes.hxx
index 645120e30d4b..bcba3ffe537c 100644
--- a/svtools/inc/svtools/table/tabletypes.hxx
+++ b/svtools/inc/svtools/table/tabletypes.hxx
@@ -1,6 +1,6 @@
 /*************************************************************************
  * 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
diff --git a/svtools/inc/svtools/textdata.hxx b/svtools/inc/svtools/textdata.hxx
index 809d64248eb6..88c7e3600f35 100644
--- a/svtools/inc/svtools/textdata.hxx
+++ b/svtools/inc/svtools/textdata.hxx
@@ -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
@@ -33,49 +33,49 @@
 #include <svl/smplhint.hxx>
 #include <tools/string.hxx>
 
-#define TEXTUNDO_START              100
-#define TEXTUNDO_REMOVECHARS        100
-#define TEXTUNDO_CONNECTPARAS       101
-#define TEXTUNDO_SPLITPARA          102
-#define TEXTUNDO_INSERTCHARS        103
-#define TEXTUNDO_DELCONTENT         104
-#define TEXTUNDO_DELETE             105
-#define TEXTUNDO_CUT                106
-#define TEXTUNDO_PASTE              107
-#define TEXTUNDO_INSERT             108
-#define TEXTUNDO_ATTRIBS            109
-#define TEXTUNDO_DRAGANDDROP        110
-#define TEXTUNDO_READ               111
-#define TEXTUNDO_END                149
-
-#define XTEXTUNDO_START             150
-#define XTEXTUNDO_END               199
-
-#define TEXTUNDO_USER               200
+#define TEXTUNDO_START				100
+#define TEXTUNDO_REMOVECHARS		100
+#define TEXTUNDO_CONNECTPARAS		101
+#define TEXTUNDO_SPLITPARA			102
+#define TEXTUNDO_INSERTCHARS		103
+#define TEXTUNDO_DELCONTENT			104
+#define TEXTUNDO_DELETE				105
+#define TEXTUNDO_CUT				106
+#define TEXTUNDO_PASTE				107
+#define TEXTUNDO_INSERT				108
+#define TEXTUNDO_ATTRIBS			109
+#define TEXTUNDO_DRAGANDDROP		110
+#define TEXTUNDO_READ				111
+#define TEXTUNDO_END				149
+
+#define XTEXTUNDO_START				150
+#define XTEXTUNDO_END				199
+
+#define TEXTUNDO_USER				200
 
 // Fuer Notify, wenn alle Absaetze geloescht wurden...
-#define TEXT_PARA_ALL               0xFFFFFFFF
+#define TEXT_PARA_ALL				0xFFFFFFFF
 
 class TextPaM
 {
 private:
-    ULONG           mnPara;
-    USHORT          mnIndex;
+    ULONG			mnPara;
+    USHORT			mnIndex;
 
 public:
-                    TextPaM()                               { mnPara = 0, mnIndex = 0; }
-                    TextPaM( ULONG nPara, USHORT nIndex )   { mnPara = nPara, mnIndex = nIndex; }
+                    TextPaM() 								{ mnPara = 0, mnIndex = 0; }
+                    TextPaM( ULONG nPara, USHORT nIndex ) 	{ mnPara = nPara, mnIndex = nIndex; }
 
-    ULONG           GetPara() const     { return mnPara; }
-    ULONG&          GetPara()           { return mnPara; }
+    ULONG			GetPara() const 	{ return mnPara; }
+    ULONG&			GetPara() 			{ return mnPara; }
 
-    USHORT          GetIndex() const    { return mnIndex; }
-    USHORT&         GetIndex()          { return mnIndex; }
+    USHORT			GetIndex() const 	{ return mnIndex; }
+    USHORT&			GetIndex() 			{ return mnIndex; }
 
-    inline BOOL     operator == ( const TextPaM& rPaM ) const;
-    inline BOOL     operator != ( const TextPaM& rPaM ) const;
-    inline BOOL     operator < ( const TextPaM& rPaM ) const;
-    inline BOOL     operator > ( const TextPaM& rPaM ) const;
+    inline BOOL 	operator == ( const TextPaM& rPaM ) const;
+    inline BOOL 	operator != ( const TextPaM& rPaM ) const;
+    inline BOOL 	operator < ( const TextPaM& rPaM ) const;
+    inline BOOL 	operator > ( const TextPaM& rPaM ) const;
 };
 
 inline BOOL TextPaM::operator == ( const TextPaM& rPaM ) const
@@ -103,26 +103,26 @@ inline BOOL TextPaM::operator > ( const TextPaM& rPaM ) const
 class SVT_DLLPUBLIC TextSelection
 {
 private:
-    TextPaM         maStartPaM;
-    TextPaM         maEndPaM;
+    TextPaM			maStartPaM;
+    TextPaM			maEndPaM;
 
 public:
                     TextSelection();
                     TextSelection( const TextPaM& rPaM );
                     TextSelection( const TextPaM& rStart, const TextPaM& rEnd );
 
-    const TextPaM&  GetStart() const    { return maStartPaM; }
-    TextPaM&        GetStart()          { return maStartPaM; }
+    const TextPaM&	GetStart() const	{ return maStartPaM; }
+    TextPaM&		GetStart() 			{ return maStartPaM; }
 
-    const TextPaM&  GetEnd() const      { return maEndPaM; }
-    TextPaM&        GetEnd()            { return maEndPaM; }
+    const TextPaM&	GetEnd() const		{ return maEndPaM; }
+    TextPaM&		GetEnd() 			{ return maEndPaM; }
 
-    void            Justify();
+    void			Justify();
 
-    BOOL            HasRange() const    { return maStartPaM != maEndPaM; }
+    BOOL			HasRange() const 	{ return maStartPaM != maEndPaM; }
 
-    inline BOOL     operator == ( const TextSelection& rSel ) const;
-    inline BOOL     operator != ( const TextSelection& rSel ) const;
+    inline BOOL 	operator == ( const TextSelection& rSel ) const;
+    inline BOOL 	operator != ( const TextSelection& rSel ) const;
 };
 
 inline BOOL TextSelection::operator == ( const TextSelection& rSel ) const
@@ -135,49 +135,49 @@ inline BOOL TextSelection::operator != ( const TextSelection& rSel ) const
     return !( *this == rSel );
 }
 
-#define TEXT_HINT_PARAINSERTED              1
-#define TEXT_HINT_PARAREMOVED               2
-#define TEXT_HINT_PARACONTENTCHANGED        3
-#define TEXT_HINT_TEXTHEIGHTCHANGED         4
-#define TEXT_HINT_FORMATPARA                5
-#define TEXT_HINT_TEXTFORMATTED             6
-#define TEXT_HINT_MODIFIED                  7
-#define TEXT_HINT_BLOCKNOTIFICATION_START   8
-#define TEXT_HINT_BLOCKNOTIFICATION_END     9
-#define TEXT_HINT_INPUT_START               10
-#define TEXT_HINT_INPUT_END                 11
-
-#define TEXT_HINT_VIEWSCROLLED          100
+#define TEXT_HINT_PARAINSERTED		    	1
+#define TEXT_HINT_PARAREMOVED		    	2
+#define TEXT_HINT_PARACONTENTCHANGED    	3
+#define TEXT_HINT_TEXTHEIGHTCHANGED	    	4
+#define TEXT_HINT_FORMATPARA		    	5
+#define TEXT_HINT_TEXTFORMATTED		    	6
+#define TEXT_HINT_MODIFIED			    	7
+#define TEXT_HINT_BLOCKNOTIFICATION_START	8
+#define TEXT_HINT_BLOCKNOTIFICATION_END		9
+#define TEXT_HINT_INPUT_START				10
+#define TEXT_HINT_INPUT_END					11
+
+#define TEXT_HINT_VIEWSCROLLED		    100
 #define TEXT_HINT_VIEWSELECTIONCHANGED  101
 
 class SVT_DLLPUBLIC TextHint : public SfxSimpleHint
 {
 private:
-    ULONG   mnValue;
+    ULONG 	mnValue;
 
 public:
             TYPEINFO();
             TextHint( ULONG nId );
             TextHint( ULONG nId, ULONG nValue );
 
-    ULONG   GetValue() const        { return mnValue; }
-    void    SetValue( ULONG n )     { mnValue = n; }
+    ULONG 	GetValue() const 		{ return mnValue; }
+    void	SetValue( ULONG n ) 	{ mnValue = n; }
 };
 
 struct TEIMEInfos
 {
     String  aOldTextAfterStartPos;
-    USHORT* pAttribs;
-    TextPaM aPos;
-    USHORT  nLen;
-    BOOL    bCursor;
-    BOOL    bWasCursorOverwrite;
+    USHORT*	pAttribs;
+    TextPaM	aPos;
+    USHORT	nLen;
+    BOOL	bCursor;
+    BOOL	bWasCursorOverwrite;
 
             TEIMEInfos( const TextPaM& rPos, const String& rOldTextAfterStartPos );
             ~TEIMEInfos();
 
-    void    CopyAttribs( const USHORT* pA, USHORT nL );
-    void    DestroyAttribs();
+    void	CopyAttribs( const USHORT* pA, USHORT nL );
+    void	DestroyAttribs();
 };
 
 // -----------------  Wrapper for old Tools List -------------------
@@ -195,11 +195,11 @@ struct TEIMEInfos
 template <class T> class ToolsList : public ::std::vector< T >
 {
 public:
-    ULONG           Count() const { return static_cast<ULONG>(::std::vector< T >::size()); }
-    ULONG           GetPos( T pObject ) const { return ( ::std::find( this->begin(), this->end(), pObject ) ) - this->begin(); }
-    T               GetObject( ULONG nIndex ) const { return (*this)[nIndex]; }
-    void            Insert( T pObject, ULONG nPos ) { ::std::vector< T >::insert( this->begin()+nPos, pObject ); }
-    void            Remove( ULONG nPos ) { ::std::vector< T >::erase( this->begin()+nPos ); }
+    ULONG			Count() const { return static_cast<ULONG>(::std::vector< T >::size()); }
+    ULONG			GetPos( T pObject ) const { return ( ::std::find( this->begin(), this->end(), pObject ) ) - this->begin(); }
+    T				GetObject( ULONG nIndex ) const { return (*this)[nIndex]; }
+    void			Insert( T pObject, ULONG nPos ) { ::std::vector< T >::insert( this->begin()+nPos, pObject ); }
+    void			Remove( ULONG nPos ) { ::std::vector< T >::erase( this->begin()+nPos ); }
 };
 
 #endif // _TEXTDATA_HXX
diff --git a/svtools/inc/svtools/texteng.hxx b/svtools/inc/svtools/texteng.hxx
index ef27edee2efe..610bcaace276 100644
--- a/svtools/inc/svtools/texteng.hxx
+++ b/svtools/inc/svtools/texteng.hxx
@@ -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,83 +79,83 @@ enum TxtAlign { TXTALIGN_LEFT, TXTALIGN_CENTER, TXTALIGN_RIGHT };
 
 class SVT_DLLPUBLIC TextEngine : public SfxBroadcaster
 {
-    friend class        TextView;
-    friend class        TextSelFunctionSet;
-    friend class        ExtTextEngine;
-    friend class        ExtTextView;
-
-    friend class        TextUndo;
-    friend class        TextUndoManager;
-    friend class        TextUndoDelPara;
-    friend class        TextUndoConnectParas;
-    friend class        TextUndoSplitPara;
-    friend class        TextUndoInsertChars;
-    friend class        TextUndoRemoveChars;
-    friend class        TextUndoSetAttribs;
+    friend class 		TextView;
+    friend class 		TextSelFunctionSet;
+    friend class		ExtTextEngine;
+    friend class		ExtTextView;
+
+    friend class 		TextUndo;
+    friend class 		TextUndoManager;
+    friend class		TextUndoDelPara;
+    friend class		TextUndoConnectParas;
+    friend class		TextUndoSplitPara;
+    friend class		TextUndoInsertChars;
+    friend class		TextUndoRemoveChars;
+    friend class		TextUndoSetAttribs;
 
 private:
-    TextDoc*            mpDoc;
-    TEParaPortions*     mpTEParaPortions;
-    OutputDevice*       mpRefDev;
+    TextDoc* 			mpDoc;
+    TEParaPortions*		mpTEParaPortions;
+    OutputDevice*		mpRefDev;
 
-    TextViews*          mpViews;
-    TextView*           mpActiveView;
+    TextViews*			mpViews;
+    TextView*			mpActiveView;
 
-    TextUndoManager*    mpUndoManager;
+    TextUndoManager*	mpUndoManager;
 
-    IdleFormatter*      mpIdleFormatter;
+    IdleFormatter*		mpIdleFormatter;
 
-    TEIMEInfos*         mpIMEInfos;
+    TEIMEInfos*			mpIMEInfos;
 
     ::com::sun::star::lang::Locale maLocale;
     ::com::sun::star::uno::Reference< ::com::sun::star::i18n::XBreakIterator > mxBreakIterator;
 
-    Rectangle           maInvalidRec;
-    Range               maInvalidRange;
+    Rectangle			maInvalidRec;
+    Range				maInvalidRange;
 
     LocaleDataWrapper*  mpLocaleDataWrapper;
 
-    Font                maFont;
+    Font				maFont;
     Color               maTextColor;
-    USHORT              mnCharHeight;
-    USHORT              mnFixCharWidth100;
-
-    ULONG               mnMaxTextLen;
-    ULONG               mnMaxTextWidth;
-    ULONG               mnCurTextWidth;
-    ULONG               mnCurTextHeight;
-    ULONG               mnDefTab;
-
-    TxtAlign            meAlign;
-
-    BOOL                mbIsFormatting      : 1;    // Semaphore wegen der Hook's
-    BOOL                mbFormatted         : 1;
-    BOOL                mbUpdate            : 1;
-    BOOL                mbModified          : 1;
-    BOOL                mbUndoEnabled       : 1;
-    BOOL                mbIsInUndo          : 1;
-    BOOL                mbDowning           : 1;
-    BOOL                mbRightToLeft       : 1;
-    BOOL                mbHasMultiLineParas : 1;
-
-                        TextEngine( const TextEngine& ) : SfxBroadcaster()  {}
-    TextEngine&         operator=( const TextEngine& )      { return *this; }
+    USHORT				mnCharHeight;
+    USHORT				mnFixCharWidth100;
+
+    ULONG				mnMaxTextLen;
+    ULONG				mnMaxTextWidth;
+    ULONG 				mnCurTextWidth;
+    ULONG 				mnCurTextHeight;
+    ULONG				mnDefTab;
+
+    TxtAlign			meAlign;
+
+    BOOL				mbIsFormatting 		: 1;	// Semaphore wegen der Hook's
+    BOOL				mbFormatted			: 1;
+    BOOL				mbUpdate 			: 1;
+    BOOL				mbModified			: 1;
+    BOOL				mbUndoEnabled 		: 1;
+    BOOL				mbIsInUndo			: 1;
+    BOOL				mbDowning 			: 1;
+    BOOL				mbRightToLeft		: 1;
+    BOOL				mbHasMultiLineParas	: 1;
+
+                        TextEngine( const TextEngine& ) : SfxBroadcaster() 	{}
+    TextEngine&			operator=( const TextEngine& ) 		{ return *this; }
 
 protected:
 
-    void                CursorMoved( ULONG nNode );
-    void                TextModified();
-
-    void                ImpInitDoc();
-    void                ImpRemoveText();
-    TextPaM             ImpDeleteText( const TextSelection& rSel );
-    TextPaM             ImpInsertText( const TextSelection& rSel, sal_Unicode c, BOOL bOverwrite = FALSE );
-    TextPaM             ImpInsertText( const TextSelection& rSel, const String& rText );
-    TextPaM             ImpInsertParaBreak( const TextSelection& rTextSelection, BOOL bKeepEndingAttribs = TRUE );
-    TextPaM             ImpInsertParaBreak( const TextPaM& rPaM, BOOL bKeepEndingAttribs = TRUE );
-    void                ImpRemoveChars( const TextPaM& rPaM, USHORT nChars, SfxUndoAction* pCurUndo = 0 );
-    TextPaM             ImpConnectParagraphs( ULONG nLeft, ULONG nRight );
-    void                ImpRemoveParagraph( ULONG nPara );
+    void				CursorMoved( ULONG nNode );
+    void				TextModified();
+
+    void				ImpInitDoc();
+    void				ImpRemoveText();
+    TextPaM				ImpDeleteText( const TextSelection& rSel );
+    TextPaM				ImpInsertText( const TextSelection& rSel, sal_Unicode c, BOOL bOverwrite = FALSE );
+    TextPaM				ImpInsertText( const TextSelection& rSel, const String& rText );
+    TextPaM				ImpInsertParaBreak( const TextSelection& rTextSelection, BOOL bKeepEndingAttribs = TRUE );
+    TextPaM				ImpInsertParaBreak( const TextPaM& rPaM, BOOL bKeepEndingAttribs = TRUE );
+    void				ImpRemoveChars( const TextPaM& rPaM, USHORT nChars, SfxUndoAction* pCurUndo = 0 );
+    TextPaM				ImpConnectParagraphs( ULONG nLeft, ULONG nRight );
+    void				ImpRemoveParagraph( ULONG nPara );
     void                ImpInitWritingDirections( ULONG nPara );
     LocaleDataWrapper*  ImpGetLocaleDataWrapper();
 
@@ -168,161 +168,161 @@ protected:
     SAL_DLLPRIVATE BOOL IsInputSequenceCheckingRequired( sal_Unicode c, const TextSelection& rCurSel ) const;
 
     // Broadcasten bzw. Selektionen anpassen:
-    void                ImpParagraphInserted( ULONG nPara );
-    void                ImpParagraphRemoved( ULONG nPara );
-    void                ImpCharsRemoved( ULONG nPara, USHORT nPos, USHORT nChars );
-    void                ImpCharsInserted( ULONG nPara, USHORT nPos, USHORT nChars );
-    void                ImpFormattingParagraph( ULONG nPara );
-    void                ImpTextHeightChanged();
-    void                ImpTextFormatted();
-
-    DECL_LINK(          IdleFormatHdl, Timer * );
-    void                CheckIdleFormatter();
-    void                IdleFormatAndUpdate( TextView* pCurView = 0, USHORT nMaxTimerRestarts = 5 );
-
-    BOOL                CreateLines( ULONG nPara );
-    void                CreateAndInsertEmptyLine( ULONG nPara );
-    void                ImpBreakLine( ULONG nPara, TextLine* pLine, TETextPortion* pPortion, USHORT nPortionStart, long nRemainingWidth );
-    USHORT              SplitTextPortion( ULONG nPara, USHORT nPos );
-    void                CreateTextPortions( ULONG nPara, USHORT nStartPos );
-    void                RecalcTextPortion( ULONG nPara, USHORT nStartPos, short nNewChars );
-    void                SeekCursor( ULONG nNode, USHORT nPos, Font& rFont, OutputDevice* pOutDev );
-
-    void                FormatDoc();
-    void                FormatFullDoc();
-    void                FormatAndUpdate( TextView* pCurView = 0 );
-    BOOL                IsFormatting() const { return mbIsFormatting; }
-    void                UpdateViews( TextView* pCurView = 0 );
-    void                SetUpdateMode( BOOL bUp, TextView* pCurView, BOOL bForceUpdate );
-
-    void                ImpPaint( OutputDevice* pOut, const Point& rStartPos, Rectangle const* pPaintArea, TextSelection const* pPaintRange = 0, TextSelection const* pSelection = 0 );
-
-    void                UpdateSelections();
-
-    BOOL                IsFormatted() const { return mbFormatted; }
-
-    USHORT              GetCharPos( ULONG nPara, USHORT nLine, long nDocPosX, BOOL bSmart = FALSE );
-    Rectangle           GetEditCursor( const TextPaM& rPaM, BOOL bSpecial, BOOL bPreferPortionStart = FALSE );
-    USHORT              ImpFindIndex( ULONG nPortion, const Point& rPosInPara, BOOL bSmart );
+    void				ImpParagraphInserted( ULONG nPara );
+    void				ImpParagraphRemoved( ULONG nPara );
+    void 				ImpCharsRemoved( ULONG nPara, USHORT nPos, USHORT nChars );
+    void 				ImpCharsInserted( ULONG nPara, USHORT nPos, USHORT nChars );
+    void				ImpFormattingParagraph( ULONG nPara );
+    void				ImpTextHeightChanged();
+    void				ImpTextFormatted();
+
+    DECL_LINK( 			IdleFormatHdl, Timer * );
+    void				CheckIdleFormatter();
+    void				IdleFormatAndUpdate( TextView* pCurView = 0, USHORT nMaxTimerRestarts = 5 );
+
+    BOOL 				CreateLines( ULONG nPara );
+    void 				CreateAndInsertEmptyLine( ULONG nPara );
+    void 				ImpBreakLine( ULONG nPara, TextLine* pLine, TETextPortion* pPortion, USHORT nPortionStart, long nRemainingWidth );
+    USHORT 				SplitTextPortion( ULONG nPara, USHORT nPos );
+    void 				CreateTextPortions( ULONG nPara, USHORT nStartPos );
+    void 				RecalcTextPortion( ULONG nPara, USHORT nStartPos, short nNewChars );
+    void				SeekCursor( ULONG nNode, USHORT nPos, Font& rFont, OutputDevice* pOutDev );
+
+    void				FormatDoc();
+    void				FormatFullDoc();
+    void				FormatAndUpdate( TextView* pCurView = 0 );
+    BOOL				IsFormatting() const { return mbIsFormatting; }
+    void 				UpdateViews( TextView* pCurView = 0 );
+    void 				SetUpdateMode( BOOL bUp, TextView* pCurView, BOOL bForceUpdate );
+
+    void				ImpPaint( OutputDevice* pOut, const Point& rStartPos, Rectangle const* pPaintArea, TextSelection const* pPaintRange = 0, TextSelection const* pSelection = 0 );
+
+    void				UpdateSelections();
+
+    BOOL				IsFormatted() const { return mbFormatted; }
+
+    USHORT				GetCharPos( ULONG nPara, USHORT nLine, long nDocPosX, BOOL bSmart = FALSE );
+    Rectangle			GetEditCursor( const TextPaM& rPaM, BOOL bSpecial, BOOL bPreferPortionStart = FALSE );
+    USHORT 				ImpFindIndex( ULONG nPortion, const Point& rPosInPara, BOOL bSmart );
     long                ImpGetPortionXOffset( ULONG nPara, TextLine* pLine, USHORT nTextPortion );
     long                ImpGetXPos( ULONG nPara, TextLine* pLine, USHORT nIndex, BOOL bPreferPortionStart = FALSE );
     long                ImpGetOutputOffset( ULONG nPara, TextLine* pLine, USHORT nIndex, USHORT nIndex2 );
     BYTE                ImpGetRightToLeft( ULONG nPara, USHORT nPos, USHORT* pStart = NULL, USHORT* pEnd = NULL );
     void                ImpInitLayoutMode( OutputDevice* pOutDev, BOOL bDrawingR2LPortion = FALSE );
-    TxtAlign            ImpGetAlign() const;
+    TxtAlign			ImpGetAlign() const;
 
-    ULONG               CalcTextHeight();
-    ULONG               CalcParaHeight( ULONG nParagraph ) const;
-    ULONG               CalcTextWidth( ULONG nPara );
-    ULONG               CalcTextWidth( ULONG nPara, USHORT nPortionStart, USHORT nPortionLen, const Font* pFont = 0 );
-    Range               GetInvalidYOffsets( ULONG nPortion );
+    ULONG				CalcTextHeight();
+    ULONG 				CalcParaHeight( ULONG nParagraph ) const;
+    ULONG				CalcTextWidth( ULONG nPara );
+    ULONG				CalcTextWidth( ULONG nPara, USHORT nPortionStart, USHORT nPortionLen, const Font* pFont = 0 );
+    Range 				GetInvalidYOffsets( ULONG nPortion );
 
     // Fuer Undo/Redo
-    void                InsertContent( TextNode* pNode, ULONG nPara );
-    TextPaM             SplitContent( ULONG nNode, USHORT nSepPos );
-    TextPaM             ConnectContents( ULONG nLeftNode );
+    void 				InsertContent( TextNode* pNode, ULONG nPara );
+    TextPaM 			SplitContent( ULONG nNode, USHORT nSepPos );
+    TextPaM 			ConnectContents( ULONG nLeftNode );
 
     // Ans API uebergebene PaM's und Selektionen auf einen gueltigen Bereich einstellen
-    void                ValidateSelection( TextSelection& rSel ) const;
-    void                ValidatePaM( TextPaM& rPaM ) const;
+    void				ValidateSelection( TextSelection& rSel ) const;
+    void				ValidatePaM( TextPaM& rPaM ) const;
 
 public:
                         TextEngine();
                         ~TextEngine();
 
-    void                SetText( const String& rStr );
-    String              GetText( LineEnd aSeparator = LINEEND_LF ) const;
-    String              GetText( const TextSelection& rSel, LineEnd aSeparator = LINEEND_LF ) const;
-    String              GetTextLines( LineEnd aSeparator = LINEEND_LF ) const;
+    void				SetText( const String& rStr );
+    String				GetText( LineEnd aSeparator = LINEEND_LF ) const;
+    String				GetText( const TextSelection& rSel, LineEnd aSeparator = LINEEND_LF ) const;
+    String				GetTextLines( LineEnd aSeparator = LINEEND_LF ) const;
     void                ReplaceText(const TextSelection& rSel, const String& rText);
 
-    ULONG               GetTextLen( LineEnd aSeparator = LINEEND_LF ) const;
-    ULONG               GetTextLen( const TextSelection& rSel, LineEnd aSeparator = LINEEND_LF ) const;
+    ULONG				GetTextLen( LineEnd aSeparator = LINEEND_LF ) const;
+    ULONG				GetTextLen( const TextSelection& rSel, LineEnd aSeparator = LINEEND_LF ) const;
 
-    void                SetFont( const Font& rFont );
-    const Font&         GetFont() const { return maFont; }
+    void				SetFont( const Font& rFont );
+    const Font&			GetFont() const { return maFont; }
 
-    void                SetDefTab( USHORT nDefTab );
-    USHORT              GetDefTab() const;
+    void				SetDefTab( USHORT nDefTab );
+    USHORT				GetDefTab() const;
 
-    void                SetLeftMargin( USHORT n );
-    USHORT              GetLeftMargin() const;
+    void				SetLeftMargin( USHORT n );
+    USHORT				GetLeftMargin() const;
 
-    void                SetUpdateMode( BOOL bUpdate );
-    BOOL                GetUpdateMode() const { return mbUpdate; }
+    void				SetUpdateMode( BOOL bUpdate );
+    BOOL				GetUpdateMode() const { return mbUpdate; }
 
-    USHORT              GetViewCount() const;
-    TextView*           GetView( USHORT nView ) const;
-    void                InsertView( TextView* pTextView );
-    void                RemoveView( TextView* pTextView );
-    TextView*           GetActiveView() const;
-    void                SetActiveView( TextView* pView );
+    USHORT				GetViewCount() const;
+    TextView*			GetView( USHORT nView ) const;
+    void				InsertView( TextView* pTextView );
+    void				RemoveView( TextView* pTextView );
+    TextView*			GetActiveView() const;
+    void				SetActiveView( TextView* pView );
 
-    void                SetMaxTextLen( ULONG nLen );
-    ULONG               GetMaxTextLen() const { return mnMaxTextLen; }
+    void 				SetMaxTextLen( ULONG nLen );
+    ULONG 				GetMaxTextLen() const { return mnMaxTextLen; }
 
-    void                SetMaxTextWidth( ULONG nWidth );
-    ULONG               GetMaxTextWidth() const { return mnMaxTextWidth; }
+    void				SetMaxTextWidth( ULONG nWidth );
+    ULONG				GetMaxTextWidth() const { return mnMaxTextWidth; }
 
-    ULONG               GetTextHeight() const;
-    ULONG               CalcTextWidth();
-    USHORT              GetCharHeight() const { return mnCharHeight; }
+    ULONG				GetTextHeight() const;
+    ULONG				CalcTextWidth();
+    USHORT				GetCharHeight() const { return mnCharHeight; }
 
-    ULONG               GetParagraphCount() const;
-    String              GetText( ULONG nParagraph ) const;
-    USHORT              GetTextLen( ULONG nParagraph ) const;
-    ULONG               GetTextHeight( ULONG nParagraph ) const;
+    ULONG				GetParagraphCount() const;
+    String 				GetText( ULONG nParagraph ) const;
+    USHORT				GetTextLen( ULONG nParagraph ) const;
+    ULONG				GetTextHeight( ULONG nParagraph ) const;
 
-    USHORT              GetLineCount( ULONG nParagraph ) const;
-    USHORT              GetLineLen( ULONG nParagraph, USHORT nLine ) const;
+    USHORT				GetLineCount( ULONG nParagraph ) const;
+    USHORT				GetLineLen( ULONG nParagraph, USHORT nLine ) const;
 
     void                SetRightToLeft( BOOL bR2L );
     BOOL                IsRightToLeft() const { return mbRightToLeft; }
 
-    BOOL                HasUndoManager() const { return mpUndoManager ? TRUE : FALSE; }
-    SfxUndoManager&     GetUndoManager();
-    void                UndoActionStart( USHORT nId );
-    void                UndoActionEnd( USHORT nId );
-    void                InsertUndo( TextUndo* pUndo, BOOL bTryMerge = FALSE );
-    BOOL                IsInUndo()                  { return mbIsInUndo; }
-    void                SetIsInUndo( BOOL bInUndo ) { mbIsInUndo = bInUndo; }
-    void                ResetUndo();
+    BOOL				HasUndoManager() const { return mpUndoManager ? TRUE : FALSE; }
+    SfxUndoManager&		GetUndoManager();
+    void				UndoActionStart( USHORT nId );
+    void				UndoActionEnd( USHORT nId );
+    void				InsertUndo( TextUndo* pUndo, BOOL bTryMerge = FALSE );
+    BOOL				IsInUndo() 					{ return mbIsInUndo; }
+    void				SetIsInUndo( BOOL bInUndo )	{ mbIsInUndo = bInUndo; }
+    void				ResetUndo();
 
-    void                EnableUndo( BOOL bEnable );
-    BOOL                IsUndoEnabled()             { return mbUndoEnabled; }
+    void				EnableUndo( BOOL bEnable );
+    BOOL				IsUndoEnabled() 			{ return mbUndoEnabled; }
 
-    void                SetModified( BOOL bModified )   { mbModified = bModified; }
-    BOOL                IsModified() const              { return mbModified; }
+    void				SetModified( BOOL bModified ) 	{ mbModified = bModified; }
+    BOOL				IsModified() const 				{ return mbModified; }
 
-    BOOL                Read( SvStream& rInput, const TextSelection* pSel = NULL );
+    BOOL				Read( SvStream& rInput, const TextSelection* pSel = NULL );
 
-    BOOL                Write( SvStream& rOutput, const TextSelection* pSel = NULL, BOOL bHTML = FALSE );
+    BOOL				Write( SvStream& rOutput, const TextSelection* pSel = NULL, BOOL bHTML = FALSE );
 
-    TextPaM             GetPaM( const Point& rDocPos, BOOL bSmart = TRUE );
-    Rectangle           PaMtoEditCursor( const TextPaM& rPaM, BOOL bSpecial = FALSE );
-    String              GetWord( const TextPaM& rCursorPos, TextPaM* pStartOfWord = 0 );
+    TextPaM				GetPaM( const Point& rDocPos, BOOL bSmart = TRUE );
+    Rectangle			PaMtoEditCursor( const TextPaM& rPaM, BOOL bSpecial = FALSE );
+    String				GetWord( const TextPaM& rCursorPos, TextPaM* pStartOfWord = 0 );
 
-    BOOL                    HasAttrib( USHORT nWhich ) const;
-    const TextAttrib*       FindAttrib( const TextPaM& rPaM, USHORT nWhich ) const;
-    const TextCharAttrib*   FindCharAttrib( const TextPaM& rPaM, USHORT nWhich ) const;
+    BOOL					HasAttrib( USHORT nWhich ) const;
+    const TextAttrib*		FindAttrib( const TextPaM& rPaM, USHORT nWhich ) const;
+    const TextCharAttrib*	FindCharAttrib( const TextPaM& rPaM, USHORT nWhich ) const;
 
     void                RemoveAttribs( ULONG nPara, USHORT nWhich, BOOL bIdleFormatAndUpdate );
     void                RemoveAttrib( ULONG nPara, const TextCharAttrib& rAttrib );
-    void                RemoveAttribs( ULONG nPara, BOOL bIdleFormatAndUpdate = TRUE );
-    void                SetAttrib( const TextAttrib& rAttr, ULONG nPara, USHORT nStart, USHORT nEnd, BOOL bIdleFormatAndUpdate = TRUE );
+    void				RemoveAttribs( ULONG nPara, BOOL bIdleFormatAndUpdate = TRUE );
+    void				SetAttrib( const TextAttrib& rAttr, ULONG nPara, USHORT nStart, USHORT nEnd, BOOL bIdleFormatAndUpdate = TRUE );
 
-    TxtAlign            GetTextAlign() const { return meAlign; }
-    void                SetTextAlign( TxtAlign eAlign );
+    TxtAlign			GetTextAlign() const { return meAlign; }
+    void				SetTextAlign( TxtAlign eAlign );
 
-    void                Draw( OutputDevice* pDev, const Point& rPos );
+    void				Draw( OutputDevice* pDev, const Point& rPos );
 
     void                            SetLocale( const ::com::sun::star::lang::Locale& rLocale );
     ::com::sun::star::lang::Locale  GetLocale();
     ::com::sun::star::uno::Reference< ::com::sun::star::i18n::XBreakIterator > GetBreakIterator();
 
-    static BOOL         DoesKeyChangeText( const KeyEvent& rKeyEvent );
-    static BOOL         DoesKeyMoveCursor( const KeyEvent& rKeyEvent );
-    static BOOL         IsSimpleCharInput( const KeyEvent& rKeyEvent );
+    static BOOL			DoesKeyChangeText( const KeyEvent& rKeyEvent );
+    static BOOL			DoesKeyMoveCursor( const KeyEvent& rKeyEvent );
+    static BOOL			IsSimpleCharInput( const KeyEvent& rKeyEvent );
 };
 
 #endif // _TEXTENG_HXX
diff --git a/svtools/inc/svtools/textview.hxx b/svtools/inc/svtools/textview.hxx
index c17084a1d693..a14970259325 100644
--- a/svtools/inc/svtools/textview.hxx
+++ b/svtools/inc/svtools/textview.hxx
@@ -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
@@ -57,43 +57,43 @@ struct ImpTextView;
 
 class SVT_DLLPUBLIC TextView : public vcl::unohelper::DragAndDropClient
 {
-    friend class        TextEngine;
-    friend class        TextUndo;
-    friend class        TextUndoManager;
-    friend class        TextSelFunctionSet;
-    friend class        ExtTextView;
+    friend class 		TextEngine;
+    friend class 		TextUndo;
+    friend class 		TextUndoManager;
+    friend class		TextSelFunctionSet;
+    friend class		ExtTextView;
 
 private:
     ImpTextView*        mpImpl;
 
-                        TextView( const TextView& ) : vcl::unohelper::DragAndDropClient()       {}
-    TextView&           operator=( const TextView& )        { return *this; }
+                        TextView( const TextView& ) : vcl::unohelper::DragAndDropClient() 		{}
+    TextView&			operator=( const TextView& ) 		{ return *this; }
 
 protected:
-    void                ShowSelection();
-    void                HideSelection();
-    void                ShowSelection( const TextSelection& rSel );
+    void				ShowSelection();
+    void				HideSelection();
+    void				ShowSelection( const TextSelection& rSel );
     void                ImpShowHideSelection( BOOL bShow, const TextSelection* pRange = NULL );
 
-    TextSelection       ImpMoveCursor( const KeyEvent& rKeyEvent );
-    TextPaM             ImpDelete( BOOL bForward, BYTE nMode );
-    void                ImpSetSelection( const TextSelection& rNewSel, BOOL bUI );
-    BOOL                IsInSelection( const TextPaM& rPaM );
+    TextSelection		ImpMoveCursor( const KeyEvent& rKeyEvent );
+    TextPaM				ImpDelete( BOOL bForward, BYTE nMode );
+    void				ImpSetSelection( const TextSelection& rNewSel, BOOL bUI );
+    BOOL 				IsInSelection( const TextPaM& rPaM );
 
-    void                ImpPaint( OutputDevice* pOut, const Point& rStartPos, Rectangle const* pPaintArea, TextSelection const* pPaintRange = 0, TextSelection const* pSelection = 0 );
-    void                ImpPaint( const Rectangle& rRect, BOOL bUseVirtDev );
-    void                ImpShowCursor( BOOL bGotoCursor, BOOL bForceVisCursor, BOOL bEndKey );
-    void                ImpHighlight( const TextSelection& rSel );
+    void				ImpPaint( OutputDevice* pOut, const Point& rStartPos, Rectangle const* pPaintArea, TextSelection const* pPaintRange = 0, TextSelection const* pSelection = 0 );
+    void				ImpPaint( const Rectangle& rRect, BOOL bUseVirtDev );
+    void				ImpShowCursor( BOOL bGotoCursor, BOOL bForceVisCursor, BOOL bEndKey );
+    void				ImpHighlight( const TextSelection& rSel );
     void                ImpSetSelection( const TextSelection& rSelection );
     Point               ImpGetOutputStartPos( const Point& rStartDocPos ) const;
 
-    void                ImpHideDDCursor();
-    void                ImpShowDDCursor();
+    void				ImpHideDDCursor();
+    void				ImpShowDDCursor();
 
     bool                ImplTruncateNewText( rtl::OUString& rNewText ) const;
-    BOOL                ImplCheckTextLen( const String& rNewText );
+    BOOL				ImplCheckTextLen( const String& rNewText );
 
-    VirtualDevice*      GetVirtualDevice();
+    VirtualDevice* 		GetVirtualDevice();
 
     // DragAndDropClient
     virtual void        dragGestureRecognized( const ::com::sun::star::datatransfer::dnd::DragGestureEvent& dge ) throw (::com::sun::star::uno::RuntimeException);
@@ -109,107 +109,107 @@ protected:
 
 public:
                         TextView( TextEngine* pEng, Window* pWindow );
-    virtual            ~TextView();
+    virtual			   ~TextView();
 
     TextEngine*         GetTextEngine() const;
     Window*             GetWindow() const;
 
-    void                Invalidate();
-    void                Scroll( long nHorzScroll, long nVertScroll );
+    void				Invalidate();
+    void				Scroll( long nHorzScroll, long nVertScroll );
 
-    void                ShowCursor( BOOL bGotoCursor = TRUE, BOOL bForceVisCursor = TRUE );
-    void                HideCursor();
+    void				ShowCursor( BOOL bGotoCursor = TRUE, BOOL bForceVisCursor = TRUE );
+    void				HideCursor();
 
     void                EnableCursor( BOOL bEnable );
-    BOOL                IsCursorEnabled() const;
+    BOOL                IsCursorEnabled() const;  
 
-    const TextSelection&    GetSelection() const;
+    const TextSelection&	GetSelection() const;
     TextSelection&      GetSelection();
     void                SetSelection( const TextSelection& rNewSel );
-    void                SetSelection( const TextSelection& rNewSel, BOOL bGotoCursor );
+    void				SetSelection( const TextSelection& rNewSel, BOOL bGotoCursor );
     BOOL                HasSelection() const;
 
-    String              GetSelected();
-    String              GetSelected( LineEnd aSeparator );
-    void                DeleteSelected();
+    String				GetSelected();
+    String				GetSelected( LineEnd aSeparator );
+    void				DeleteSelected();
 
-    void                InsertNewText( const rtl::OUString& rNew, BOOL bSelect = FALSE );
+    void				InsertNewText( const rtl::OUString& rNew, BOOL bSelect = FALSE );
     // deprecated: use InsertNewText instead
-    void                InsertText( const String& rNew, BOOL bSelect = FALSE );
+    void				InsertText( const String& rNew, BOOL bSelect = FALSE );
 
-    BOOL                KeyInput( const KeyEvent& rKeyEvent );
-    void                Paint( const Rectangle& rRect );
-    void                MouseButtonUp( const MouseEvent& rMouseEvent );
-    void                MouseButtonDown( const MouseEvent& rMouseEvent );
-    void                MouseMove( const MouseEvent& rMouseEvent );
-    void                Command( const CommandEvent& rCEvt );
+    BOOL				KeyInput( const KeyEvent& rKeyEvent );
+    void				Paint( const Rectangle& rRect );
+    void				MouseButtonUp( const MouseEvent& rMouseEvent );
+    void				MouseButtonDown( const MouseEvent& rMouseEvent );
+    void				MouseMove( const MouseEvent& rMouseEvent );
+    void				Command( const CommandEvent& rCEvt );
 
-    void                Cut();
-    void                Copy();
-    void                Paste();
+    void				Cut();
+    void				Copy();
+    void				Paste();
 
     void                Copy( ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::clipboard::XClipboard >& rxClipboard );
     void                Paste( ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::clipboard::XClipboard >& rxClipboard );
 
-    void                Undo();
-    void                Redo();
+    void				Undo();
+    void				Redo();
 
-    BOOL                Read( SvStream& rInput );
-    BOOL                Write( SvStream& rOutput );
+    BOOL				Read( SvStream& rInput );
+    BOOL				Write( SvStream& rOutput );
 
     void                SetStartDocPos( const Point& rPos );
     const Point&        GetStartDocPos() const;
 
-    Point               GetDocPos( const Point& rWindowPos ) const;
-    Point               GetWindowPos( const Point& rDocPos ) const;
+    Point		        GetDocPos( const Point& rWindowPos ) const;
+    Point		        GetWindowPos( const Point& rDocPos ) const;
 
-    void                SetInsertMode( BOOL bInsert );
+    void				SetInsertMode( BOOL bInsert );
     BOOL                IsInsertMode() const;
 
     void                SetAutoIndentMode( BOOL bAutoIndent );
     BOOL                IsAutoIndentMode() const;
 
-    void                SetReadOnly( BOOL bReadOnly );
+    void				SetReadOnly( BOOL bReadOnly );
     BOOL                IsReadOnly() const;
 
     void                SetAutoScroll( BOOL bAutoScroll );
     BOOL                IsAutoScroll() const;
 
-    BOOL                SetCursorAtPoint( const Point& rPointPixel );
-    BOOL                IsSelectionAtPoint( const Point& rPointPixel );
+    BOOL 				SetCursorAtPoint( const Point& rPointPixel );
+    BOOL 				IsSelectionAtPoint( const Point& rPointPixel );
 
-    void                SetPaintSelection( BOOL bPaint);
+    void				SetPaintSelection( BOOL bPaint);
     BOOL                IsPaintSelection() const;
 
-    void                SetHighlightSelection( BOOL bSelectByHighlight );
+    void				SetHighlightSelection( BOOL bSelectByHighlight );
     BOOL                IsHighlightSelection() const;
 
-    void                EraseVirtualDevice();
+    void 				EraseVirtualDevice();
 
     // aus dem protected Teil hierher verschoben
     // F�r 'SvtXECTextCursor' (TL). Mu� ggf nochmal anders gel�st werden.
-    TextPaM             PageUp( const TextPaM& rPaM );
-    TextPaM             PageDown( const TextPaM& rPaM );
-    TextPaM             CursorUp( const TextPaM& rPaM );
-    TextPaM             CursorDown( const TextPaM& rPaM );
-    TextPaM             CursorLeft( const TextPaM& rPaM, USHORT nCharacterIteratorMode );
-    TextPaM             CursorRight( const TextPaM& rPaM, USHORT nCharacterIteratorMode );
-    TextPaM             CursorWordLeft( const TextPaM& rPaM );
-    TextPaM             CursorWordRight( const TextPaM& rPaM );
-    TextPaM             CursorStartOfLine( const TextPaM& rPaM );
-    TextPaM             CursorEndOfLine( const TextPaM& rPaM );
-    TextPaM             CursorStartOfParagraph( const TextPaM& rPaM );
-    TextPaM             CursorEndOfParagraph( const TextPaM& rPaM );
-    TextPaM             CursorStartOfDoc();
-    TextPaM             CursorEndOfDoc();
+    TextPaM				PageUp( const TextPaM& rPaM );
+    TextPaM				PageDown( const TextPaM& rPaM );
+    TextPaM				CursorUp( const TextPaM& rPaM );
+    TextPaM				CursorDown( const TextPaM& rPaM );
+    TextPaM				CursorLeft( const TextPaM& rPaM, USHORT nCharacterIteratorMode );
+    TextPaM				CursorRight( const TextPaM& rPaM, USHORT nCharacterIteratorMode );
+    TextPaM				CursorWordLeft( const TextPaM& rPaM );
+    TextPaM				CursorWordRight( const TextPaM& rPaM );
+    TextPaM				CursorStartOfLine( const TextPaM& rPaM );
+    TextPaM				CursorEndOfLine( const TextPaM& rPaM );
+    TextPaM				CursorStartOfParagraph( const TextPaM& rPaM );
+    TextPaM				CursorEndOfParagraph( const TextPaM& rPaM );
+    TextPaM				CursorStartOfDoc();
+    TextPaM				CursorEndOfDoc();
 
     // Old, remove!
-    TextPaM             CursorLeft( const TextPaM& rPaM, BOOL bWordMode = FALSE );
-    TextPaM             CursorRight( const TextPaM& rPaM, BOOL bWordMode = FALSE );
+    TextPaM				CursorLeft( const TextPaM& rPaM, BOOL bWordMode = FALSE );
+    TextPaM				CursorRight( const TextPaM& rPaM, BOOL bWordMode = FALSE );
 
     /**
-        Drag and Drop, deleting and selection regards all text that has an attribute
-        TEXTATTR_PROTECTED set as one entitity. Drag and dropped text is automatically
+        Drag and Drop, deleting and selection regards all text that has an attribute 
+        TEXTATTR_PROTECTED set as one entitity. Drag and dropped text is automatically 
         attibuted as protected.
      */
     void                SupportProtectAttribute(sal_Bool bSupport);
diff --git a/svtools/inc/svtools/textwindowpeer.hxx b/svtools/inc/svtools/textwindowpeer.hxx
index b80eb7ea89f0..f2a1e4bb9b51 100644
--- a/svtools/inc/svtools/textwindowpeer.hxx
+++ b/svtools/inc/svtools/textwindowpeer.hxx
@@ -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
diff --git a/svtools/inc/svtools/toolbarmenu.hxx b/svtools/inc/svtools/toolbarmenu.hxx
index 92b873158a98..c370098996d4 100644
--- a/svtools/inc/svtools/toolbarmenu.hxx
+++ b/svtools/inc/svtools/toolbarmenu.hxx
@@ -57,11 +57,11 @@ public:
                     ToolbarMenu( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame,
                                  Window* pParentWindow,
                                  WinBits nBits );
-
+                    
                     ToolbarMenu( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame,
                                  Window* pParentWindow,
                                  const ResId& rResId );
-
+                    
                     ~ToolbarMenu();
 
     virtual void    MouseMove( const MouseEvent& rMEvt );
@@ -71,39 +71,39 @@ public:
     virtual void    Command( const CommandEvent& rCEvt );
     virtual void    Paint( const Rectangle& rRect );
     virtual void    RequestHelp( const HelpEvent& rHEvt );
-    virtual void    GetFocus();
-    virtual void    LoseFocus();
+    virtual void	GetFocus();
+    virtual void	LoseFocus();
 
-    void            appendEntry( int nEntryId, const String& rStr, MenuItemBits nItemBits = 0 );
-    void            appendEntry( int nEntryId, const Image& rImage, MenuItemBits nItemBits = 0 );
-    void            appendEntry( int nEntryId, const String& rStr, const Image& rImage, MenuItemBits nItemBits = 0 );
-    void            appendEntry( int nEntryId, Control* pControl, MenuItemBits nItemBits = 0 );
-    void            appendSeparator();
+    void			appendEntry( int nEntryId, const String& rStr, MenuItemBits nItemBits = 0 );
+    void			appendEntry( int nEntryId, const Image& rImage, MenuItemBits nItemBits = 0 );
+    void			appendEntry( int nEntryId, const String& rStr, const Image& rImage, MenuItemBits nItemBits = 0 );
+    void			appendEntry( int nEntryId, Control* pControl, MenuItemBits nItemBits = 0 );
+    void			appendSeparator();
 
     /** creates an empty ValueSet that is initialized and can be inserted with appendEntry. */
-    ValueSet*       createEmptyValueSetControl();
+    ValueSet*		createEmptyValueSetControl();
 
-    void            checkEntry( int nEntryId, bool bCheck = true );
-    bool            isEntryChecked( int nEntryId ) const;
+    void			checkEntry( int nEntryId, bool bCheck = true );
+    bool			isEntryChecked( int nEntryId ) const;
 
-    void            enableEntry( int nEntryId, bool bEnable = true );
-    bool            isEntryEnabled( int nEntryId ) const;
+    void			enableEntry( int nEntryId, bool bEnable = true );
+    bool			isEntryEnabled( int nEntryId ) const;
 
-    void            setEntryText( int nEntryId, const String& rStr );
-    const String&   getEntryText( int nEntryId ) const;
+    void			setEntryText( int nEntryId, const String& rStr );
+    const String&	getEntryText( int nEntryId ) const;
 
-    void            setEntryImage( int nEntryId, const Image& rImage );
-    const Image&    getEntryImage( int nEntryId ) const;
+    void			setEntryImage( int nEntryId, const Image& rImage );
+    const Image&	getEntryImage( int nEntryId ) const;
 
-    const Size&     getMenuSize() const;
+    const Size&		getMenuSize() const;
 
-    void            SetSelectHdl( const Link& rLink );
-    const Link&     GetSelectHdl() const;
+    void			SetSelectHdl( const Link& rLink );
+    const Link& 	GetSelectHdl() const;
 
-    int             getSelectedEntryId() const;
-    int             getHighlightedEntryId() const;
+    int				getSelectedEntryId() const;
+    int				getHighlightedEntryId() const;
 
-    void            highlightFirstEntry();
+    void			highlightFirstEntry();
 
 protected:
     virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > CreateAccessible();
@@ -121,33 +121,33 @@ protected:
 
     void            StateChanged( StateChangedType nType );
     void            DataChanged( const DataChangedEvent& rDCEvt );
-
-    ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > GetFrame() const;
+    
+    ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >	GetFrame() const;
 private:
     DECL_LINK( HighlightHdl, Control * );
 
     void initStatusListener();
 
-    void            implInit( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame );
-    void            initWindow();
-
-    Size            implCalcSize();
+    void			implInit( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame );
+    void			initWindow();
 
-    void            appendEntry( ToolbarMenuEntry* pEntry );
+    Size			implCalcSize();
 
-    void            implPaint( ToolbarMenuEntry* pThisOnly = NULL, bool bHighlight = false );
+    void			appendEntry( ToolbarMenuEntry* pEntry );
 
-    void            implHighlightEntry( int nHighlightEntry, bool bHighlight );
-    void            implHighlightEntry( const MouseEvent& rMEvt, bool bMBDown );
+    void			implPaint( ToolbarMenuEntry* pThisOnly = NULL, bool bHighlight = false );
+    
+    void			implHighlightEntry( int nHighlightEntry, bool bHighlight );
+    void			implHighlightEntry( const MouseEvent& rMEvt, bool bMBDown );
 
-    void            implChangeHighlightEntry( int nEntry );
-    void            implSelectEntry( int nSelectedEntry );
+    void			implChangeHighlightEntry( int nEntry );
+    void			implSelectEntry( int nSelectedEntry );
 
-    ToolbarMenuEntry*   implCursorUpDown( bool bUp, bool bHomeEnd );
-    ToolbarMenuEntry*   implGetEntry( int nEntry ) const;
-    ToolbarMenuEntry*   implSearchEntry( int nEntryId ) const;
+    ToolbarMenuEntry*	implCursorUpDown( bool bUp, bool bHomeEnd );
+    ToolbarMenuEntry*	implGetEntry( int nEntry ) const;
+    ToolbarMenuEntry*	implSearchEntry( int nEntryId ) const;
 
-    ToolbarMenu_Impl*   mpImpl;
+    ToolbarMenu_Impl*	mpImpl;
 };
 
 } // namespace svtools
diff --git a/svtools/inc/svtools/toolboxcontroller.hxx b/svtools/inc/svtools/toolboxcontroller.hxx
index 7a49b294759c..dfa669ea390c 100644
--- a/svtools/inc/svtools/toolboxcontroller.hxx
+++ b/svtools/inc/svtools/toolboxcontroller.hxx
@@ -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
@@ -77,15 +77,15 @@ class SVT_DLLPUBLIC ToolboxController : public ::com::sun::star::frame::XStatusL
                            const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& xFrame,
                            const rtl::OUString& aCommandURL );
         ToolboxController();
-        virtual ~ToolboxController();
-
+        virtual ~ToolboxController();        
+        
         ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > getFrameInterface() const;
         ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > getServiceManager() const;
         ::com::sun::star::uno::Reference< ::com::sun::star::frame::XLayoutManager > getLayoutManager() const;
 
         void updateStatus( const rtl::OUString aCommandURL );
         void updateStatus();
-
+        
         // XInterface
         virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& aType ) throw (::com::sun::star::uno::RuntimeException);
         virtual void SAL_CALL acquire() throw ();
@@ -93,19 +93,19 @@ class SVT_DLLPUBLIC ToolboxController : public ::com::sun::star::frame::XStatusL
 
         // XInitialization
         virtual void SAL_CALL initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments ) throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException);
-
+            
         // XUpdatable
         virtual void SAL_CALL update() throw (::com::sun::star::uno::RuntimeException);
-
+        
         // XComponent
         virtual void SAL_CALL dispose() throw (::com::sun::star::uno::RuntimeException);
         virtual void SAL_CALL addEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& xListener ) throw (::com::sun::star::uno::RuntimeException);
         virtual void SAL_CALL removeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& aListener ) throw (::com::sun::star::uno::RuntimeException);
-
+        
         // XEventListener
         using cppu::OPropertySetHelper::disposing;
         virtual void SAL_CALL disposing( const com::sun::star::lang::EventObject& Source ) throw ( ::com::sun::star::uno::RuntimeException );
-
+        
         // XStatusListener
         virtual void SAL_CALL statusChanged( const ::com::sun::star::frame::FeatureStateEvent& Event ) throw ( ::com::sun::star::uno::RuntimeException ) = 0;
 
@@ -123,7 +123,7 @@ class SVT_DLLPUBLIC ToolboxController : public ::com::sun::star::frame::XStatusL
         virtual ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper();
         // OPropertyArrayUsageHelper //shizhoubo
         virtual ::cppu::IPropertyArrayHelper* createArrayHelper( ) const;
-
+ 
 
         const rtl::OUString& getCommandURL() const { return  m_aCommandURL; }
         const rtl::OUString& getModuleName() const;
@@ -139,7 +139,7 @@ class SVT_DLLPUBLIC ToolboxController : public ::com::sun::star::frame::XStatusL
         {
             Listener( const ::com::sun::star::util::URL& rURL, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch >& rDispatch ) :
                 aURL( rURL ), xDispatch( rDispatch ) {}
-
+            
             ::com::sun::star::util::URL aURL;
             ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch > xDispatch;
         };
@@ -148,7 +148,7 @@ class SVT_DLLPUBLIC ToolboxController : public ::com::sun::star::frame::XStatusL
                                  com::sun::star::uno::Reference< com::sun::star::frame::XDispatch >,
                                  ::rtl::OUStringHash,
                                  ::std::equal_to< ::rtl::OUString > > URLToDispatchMap;
-
+        
         // methods to support status forwarder, known by the old sfx2 toolbox controller implementation
         void addStatusListener( const rtl::OUString& aCommandURL );
         void removeStatusListener( const rtl::OUString& aCommandURL );
@@ -162,8 +162,8 @@ class SVT_DLLPUBLIC ToolboxController : public ::com::sun::star::frame::XStatusL
 
         sal_Bool                                                                            m_bInitialized : 1,
                                                                                             m_bDisposed : 1;
-        ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >                 m_xFrame;
-        ToolboxController_Impl*                                                             m_pImpl;
+        ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >					m_xFrame;
+        ToolboxController_Impl*																m_pImpl;
         ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >    m_xServiceManager;
         rtl::OUString                                                                       m_aCommandURL;
         URLToDispatchMap                                                                    m_aListenerMap;
diff --git a/svtools/inc/svtools/toolpanel/decklayouter.hxx b/svtools/inc/svtools/toolpanel/decklayouter.hxx
index da03d7c6c3aa..af65bd464a7b 100755
--- a/svtools/inc/svtools/toolpanel/decklayouter.hxx
+++ b/svtools/inc/svtools/toolpanel/decklayouter.hxx
@@ -1,6 +1,6 @@
 /*************************************************************************
  * 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
diff --git a/svtools/inc/svtools/toolpanel/drawerlayouter.hxx b/svtools/inc/svtools/toolpanel/drawerlayouter.hxx
index 0ecf493d0e98..129f5cb01120 100644
--- a/svtools/inc/svtools/toolpanel/drawerlayouter.hxx
+++ b/svtools/inc/svtools/toolpanel/drawerlayouter.hxx
@@ -1,6 +1,6 @@
 /*************************************************************************
  * 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
diff --git a/svtools/inc/svtools/toolpanel/paneltabbar.hxx b/svtools/inc/svtools/toolpanel/paneltabbar.hxx
index 668935d8a739..34fc15d6e69f 100644
--- a/svtools/inc/svtools/toolpanel/paneltabbar.hxx
+++ b/svtools/inc/svtools/toolpanel/paneltabbar.hxx
@@ -1,6 +1,6 @@
 /*************************************************************************
  * 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
diff --git a/svtools/inc/svtools/toolpanel/refbase.hxx b/svtools/inc/svtools/toolpanel/refbase.hxx
index 991d6e619090..497be1388cc2 100644
--- a/svtools/inc/svtools/toolpanel/refbase.hxx
+++ b/svtools/inc/svtools/toolpanel/refbase.hxx
@@ -1,6 +1,6 @@
 /*************************************************************************
  * 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
diff --git a/svtools/inc/svtools/toolpanel/tabalignment.hxx b/svtools/inc/svtools/toolpanel/tabalignment.hxx
index cc3f17469ffe..0bfb9845bc6c 100644
--- a/svtools/inc/svtools/toolpanel/tabalignment.hxx
+++ b/svtools/inc/svtools/toolpanel/tabalignment.hxx
@@ -1,6 +1,6 @@
 /*************************************************************************
  * 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
diff --git a/svtools/inc/svtools/toolpanel/tabitemcontent.hxx b/svtools/inc/svtools/toolpanel/tabitemcontent.hxx
index a1cf9deae9f4..3d99e1388076 100644
--- a/svtools/inc/svtools/toolpanel/tabitemcontent.hxx
+++ b/svtools/inc/svtools/toolpanel/tabitemcontent.hxx
@@ -1,6 +1,6 @@
 /*************************************************************************
  * 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
diff --git a/svtools/inc/svtools/toolpanel/tablayouter.hxx b/svtools/inc/svtools/toolpanel/tablayouter.hxx
index 92b36acf9114..1484397507e1 100755
--- a/svtools/inc/svtools/toolpanel/tablayouter.hxx
+++ b/svtools/inc/svtools/toolpanel/tablayouter.hxx
@@ -1,6 +1,6 @@
 /*************************************************************************
  * 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
diff --git a/svtools/inc/svtools/toolpanel/toolpanel.hxx b/svtools/inc/svtools/toolpanel/toolpanel.hxx
index 432dea64e8b5..0f27031de0b3 100644
--- a/svtools/inc/svtools/toolpanel/toolpanel.hxx
+++ b/svtools/inc/svtools/toolpanel/toolpanel.hxx
@@ -1,6 +1,6 @@
 /*************************************************************************
  * 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
diff --git a/svtools/inc/svtools/toolpanel/toolpaneldeck.hxx b/svtools/inc/svtools/toolpanel/toolpaneldeck.hxx
index a1009591ffba..50f355078c14 100755
--- a/svtools/inc/svtools/toolpanel/toolpaneldeck.hxx
+++ b/svtools/inc/svtools/toolpanel/toolpaneldeck.hxx
@@ -1,6 +1,6 @@
 /*************************************************************************
  * 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
diff --git a/svtools/inc/svtools/transfer.hxx b/svtools/inc/svtools/transfer.hxx
index 5eac1484fff9..305019ee75b5 100644
--- a/svtools/inc/svtools/transfer.hxx
+++ b/svtools/inc/svtools/transfer.hxx
@@ -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
@@ -68,14 +68,14 @@ class Link;
 // - Drag&Drop defines -
 // ---------------------
 
-#define DND_ACTION_NONE     ::com::sun::star::datatransfer::dnd::DNDConstants::ACTION_NONE
-#define DND_ACTION_COPY     ::com::sun::star::datatransfer::dnd::DNDConstants::ACTION_COPY
-#define DND_ACTION_MOVE     ::com::sun::star::datatransfer::dnd::DNDConstants::ACTION_MOVE
+#define DND_ACTION_NONE		::com::sun::star::datatransfer::dnd::DNDConstants::ACTION_NONE
+#define DND_ACTION_COPY		::com::sun::star::datatransfer::dnd::DNDConstants::ACTION_COPY
+#define DND_ACTION_MOVE		::com::sun::star::datatransfer::dnd::DNDConstants::ACTION_MOVE
 #define DND_ACTION_COPYMOVE ::com::sun::star::datatransfer::dnd::DNDConstants::ACTION_COPY_OR_MOVE
-#define DND_ACTION_LINK     ::com::sun::star::datatransfer::dnd::DNDConstants::ACTION_LINK
+#define DND_ACTION_LINK		::com::sun::star::datatransfer::dnd::DNDConstants::ACTION_LINK
 
-#define DND_POINTER_NONE    0
-#define DND_IMAGE_NONE      0
+#define DND_POINTER_NONE	0
+#define DND_IMAGE_NONE		0
 
 // --------------------------------
 // - TransferableObjectDescriptor -
@@ -83,20 +83,20 @@ class Link;
 
 struct TransferableObjectDescriptor
 {
-    SvGlobalName        maClassName;
-    sal_uInt16          mnViewAspect;
-    Point               maDragStartPos;
-    Size                maSize;
-    sal_uInt32          mnOle2Misc;
-    String              maTypeName;
-    String              maDisplayName;
-    sal_Bool            mbCanLink;
-    void*               mpDummy1;
-    void*               mpDummy2;
-    sal_Bool            mbDummy1;
-
-    SVT_DLLPUBLIC friend SvStream&  operator>>( SvStream& rIStm, TransferableObjectDescriptor& rObjDesc );
-    SVT_DLLPUBLIC friend SvStream&  operator<<( SvStream& rOStm, const TransferableObjectDescriptor& rObjDesc );
+    SvGlobalName		maClassName;
+    sal_uInt16			mnViewAspect;
+    Point				maDragStartPos;
+    Size				maSize;
+    sal_uInt32			mnOle2Misc;
+    String				maTypeName;
+    String				maDisplayName;
+    sal_Bool			mbCanLink;
+    void*				mpDummy1;
+    void*				mpDummy2;
+    sal_Bool			mbDummy1;
+
+    SVT_DLLPUBLIC friend SvStream&	operator>>( SvStream& rIStm, TransferableObjectDescriptor& rObjDesc );
+    SVT_DLLPUBLIC friend SvStream&	operator<<( SvStream& rOStm, const TransferableObjectDescriptor& rObjDesc );
 };
 
 // -------------------
@@ -105,10 +105,10 @@ struct TransferableObjectDescriptor
 
 struct AcceptDropEvent
 {
-    sal_Int8                                                        mnAction;
-    Point                                                           maPosPixel;
-    const ::com::sun::star::datatransfer::dnd::DropTargetDragEvent  maDragEvent;
-    sal_Bool                                                        mbLeaving;
+    sal_Int8														mnAction;
+    Point															maPosPixel;
+    const ::com::sun::star::datatransfer::dnd::DropTargetDragEvent	maDragEvent;
+    sal_Bool														mbLeaving;
     sal_Bool                                                        mbDefault;
     sal_Bool                                                        mbDummy1;
     sal_Bool                                                        mbDummy2;
@@ -136,9 +136,9 @@ struct AcceptDropEvent
 
 struct ExecuteDropEvent
 {
-    sal_Int8                                                        mnAction;
-    Point                                                           maPosPixel;
-    const ::com::sun::star::datatransfer::dnd::DropTargetDropEvent  maDropEvent;
+    sal_Int8														mnAction;
+    Point															maPosPixel;
+    const ::com::sun::star::datatransfer::dnd::DropTargetDropEvent	maDropEvent;
     sal_Bool                                                        mbDefault;
     sal_Bool                                                        mbDummy1;
     sal_Bool                                                        mbDummy2;
@@ -173,8 +173,8 @@ private:
     {
     private:
 
-        TransferableHelper& mrParent;
-        void*               mpDummy;
+        TransferableHelper&	mrParent;
+        void*				mpDummy;
 
     private:
 
@@ -188,21 +188,21 @@ private:
     public:
 
                               TerminateListener( TransferableHelper& rDropTargetHelper );
-        virtual               ~TerminateListener();
+        virtual	              ~TerminateListener();
     };
 
     friend class TransferableHelper::TerminateListener;
 
 private:
 
-    DataFlavorExList                                                                                    maDummy;
-    ::com::sun::star::uno::Any                                                                          maAny;
-    ::rtl::OUString                                                                                     maLastFormat;
-    mutable ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::clipboard::XClipboard >   mxClipboard;
-    ::com::sun::star::uno::Reference< ::com::sun::star::frame::XTerminateListener >                     mxTerminateListener;
-    DataFlavorExVector*                                                                                 mpFormats;
+    DataFlavorExList																			        maDummy;
+    ::com::sun::star::uno::Any																	        maAny;
+    ::rtl::OUString  																			        maLastFormat;
+    mutable ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::clipboard::XClipboard >	mxClipboard;
+    ::com::sun::star::uno::Reference< ::com::sun::star::frame::XTerminateListener >				        mxTerminateListener;
+    DataFlavorExVector*																			        mpFormats;
     TransferableObjectDescriptor*                                                                       mpObjDesc;
-    void*                                                                                               mpDummy1;
+    void*																						        mpDummy1;
 
 protected:
     inline const ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::clipboard::XClipboard >&
@@ -211,7 +211,7 @@ protected:
 private:
 
     // XTransferable
-    virtual ::com::sun::star::uno::Any SAL_CALL getTransferData( const ::com::sun::star::datatransfer::DataFlavor& rFlavor ) throw(::com::sun::star::datatransfer::UnsupportedFlavorException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException);
+    virtual ::com::sun::star::uno::Any SAL_CALL	getTransferData( const ::com::sun::star::datatransfer::DataFlavor& rFlavor ) throw(::com::sun::star::datatransfer::UnsupportedFlavorException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException);
     virtual ::com::sun::star::uno::Sequence< ::com::sun::star::datatransfer::DataFlavor > SAL_CALL getTransferDataFlavors() throw(::com::sun::star::uno::RuntimeException);
     virtual sal_Bool SAL_CALL isDataFlavorSupported( const ::com::sun::star::datatransfer::DataFlavor& rFlavor ) throw(::com::sun::star::uno::RuntimeException);
 
@@ -234,7 +234,7 @@ protected:
     // derivees need to access lostOwnership in case hey override it
     // on windows, changing the access rights to a method gives unresolved externals, so we introduce
     // this impl-method here 'til the next incompatible update
-    inline  void    implCallOwnLostOwnership(
+    inline	void	implCallOwnLostOwnership(
                         const ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::clipboard::XClipboard >& _rxClipboard,
                         const ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::XTransferable >& _rxTrans
                     )
@@ -245,41 +245,41 @@ protected:
 
 private:
 
-    SVT_DLLPRIVATE void             ImplFlush();
+    SVT_DLLPRIVATE void			    ImplFlush();
 
 protected:
 
-    virtual             ~TransferableHelper();
-
-    void                AddFormat( SotFormatStringId nFormat );
-    void                AddFormat( const ::com::sun::star::datatransfer::DataFlavor& rFlavor );
-    void                RemoveFormat( SotFormatStringId nFormat );
-    void                RemoveFormat( const ::com::sun::star::datatransfer::DataFlavor& rFlavor );
-    sal_Bool            HasFormat( SotFormatStringId nFormat );
-    inline sal_Bool     HasFormat( const ::com::sun::star::datatransfer::DataFlavor& rFlavor ) { return isDataFlavorSupported( rFlavor ); }
-    void                ClearFormats();
-
-    sal_Bool            SetAny( const ::com::sun::star::uno::Any& rAny, const ::com::sun::star::datatransfer::DataFlavor& rFlavor );
-    sal_Bool            SetString( const ::rtl::OUString& rString, const ::com::sun::star::datatransfer::DataFlavor& rFlavor );
-    sal_Bool            SetBitmap( const Bitmap& rBitmap, const ::com::sun::star::datatransfer::DataFlavor& rFlavor );
-    sal_Bool            SetGDIMetaFile( const GDIMetaFile& rMtf, const ::com::sun::star::datatransfer::DataFlavor& rFlavor );
-    sal_Bool            SetGraphic( const Graphic& rGraphic, const ::com::sun::star::datatransfer::DataFlavor& rFlavor );
+    virtual			    ~TransferableHelper();
+
+    void			    AddFormat( SotFormatStringId nFormat );
+    void			    AddFormat( const ::com::sun::star::datatransfer::DataFlavor& rFlavor );
+    void			    RemoveFormat( SotFormatStringId nFormat );
+    void			    RemoveFormat( const ::com::sun::star::datatransfer::DataFlavor& rFlavor );
+    sal_Bool		    HasFormat( SotFormatStringId nFormat );
+    inline sal_Bool	    HasFormat( const ::com::sun::star::datatransfer::DataFlavor& rFlavor ) { return isDataFlavorSupported( rFlavor ); }
+    void			    ClearFormats();
+
+    sal_Bool		    SetAny( const ::com::sun::star::uno::Any& rAny, const ::com::sun::star::datatransfer::DataFlavor& rFlavor );
+    sal_Bool		    SetString( const ::rtl::OUString& rString, const ::com::sun::star::datatransfer::DataFlavor& rFlavor );
+    sal_Bool		    SetBitmap( const Bitmap& rBitmap, const ::com::sun::star::datatransfer::DataFlavor& rFlavor );
+    sal_Bool		    SetGDIMetaFile( const GDIMetaFile& rMtf, const ::com::sun::star::datatransfer::DataFlavor& rFlavor );
+    sal_Bool		    SetGraphic( const Graphic& rGraphic, const ::com::sun::star::datatransfer::DataFlavor& rFlavor );
     sal_Bool            SetImageMap( const ImageMap& rIMap, const ::com::sun::star::datatransfer::DataFlavor& rFlavor );
-    sal_Bool            SetTransferableObjectDescriptor( const TransferableObjectDescriptor& rDesc, const ::com::sun::star::datatransfer::DataFlavor& rFlavor );
-    sal_Bool            SetINetBookmark( const INetBookmark& rBmk, const ::com::sun::star::datatransfer::DataFlavor& rFlavor );
-    sal_Bool            SetINetImage( const INetImage& rINtImg, const ::com::sun::star::datatransfer::DataFlavor& rFlavor );
-    sal_Bool            SetFileList( const FileList& rFileList, const ::com::sun::star::datatransfer::DataFlavor& rFlavor );
-    sal_Bool            SetObject( void* pUserObject, sal_uInt32 nUserObjectId, const ::com::sun::star::datatransfer::DataFlavor& rFlavor );
-    sal_Bool            SetInterface( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& rIf,
+    sal_Bool		    SetTransferableObjectDescriptor( const TransferableObjectDescriptor& rDesc, const ::com::sun::star::datatransfer::DataFlavor& rFlavor );
+    sal_Bool		    SetINetBookmark( const INetBookmark& rBmk, const ::com::sun::star::datatransfer::DataFlavor& rFlavor );
+    sal_Bool		    SetINetImage( const INetImage& rINtImg, const ::com::sun::star::datatransfer::DataFlavor& rFlavor );
+    sal_Bool		    SetFileList( const FileList& rFileList, const ::com::sun::star::datatransfer::DataFlavor& rFlavor );
+    sal_Bool		    SetObject( void* pUserObject, sal_uInt32 nUserObjectId, const ::com::sun::star::datatransfer::DataFlavor& rFlavor );
+    sal_Bool		    SetInterface( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& rIf,
                                       const ::com::sun::star::datatransfer::DataFlavor& rFlavor );
 
 protected:
 
-    virtual void        AddSupportedFormats() = 0;
+    virtual void	    AddSupportedFormats() = 0;
     virtual sal_Bool    GetData( const ::com::sun::star::datatransfer::DataFlavor& rFlavor ) = 0;
     virtual sal_Bool    WriteObject( SotStorageStreamRef& rxOStm, void* pUserObject, sal_uInt32 nUserObjectId, const ::com::sun::star::datatransfer::DataFlavor& rFlavor );
-    virtual void        DragFinished( sal_Int8 nDropAction );
-    virtual void        ObjectReleased();
+    virtual void	    DragFinished( sal_Int8 nDropAction );
+    virtual void	    ObjectReleased();
 
 public:
 
@@ -287,13 +287,13 @@ public:
 
     void                PrepareOLE( const TransferableObjectDescriptor& rObjDesc );
 
-    void                CopyToClipboard( Window *pWindow ) const;
-    void                CopyToSelection( Window *pWindow ) const;
-    void                StartDrag( Window* pWindow, sal_Int8 nDragSourceActions,
+    void			    CopyToClipboard( Window *pWindow ) const;
+    void			    CopyToSelection( Window *pWindow ) const;
+    void			    StartDrag( Window* pWindow, sal_Int8 nDragSourceActions,
                                    sal_Int32 nDragPointer = DND_POINTER_NONE,
                                    sal_Int32 nDragImage = DND_IMAGE_NONE );
 
-    static void         ClearSelection( Window *pWindow );
+    static void			ClearSelection( Window *pWindow );
 
     static ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::clipboard::XClipboard > GetSystemClipboard();
     static const ::com::sun::star::uno::Sequence< sal_Int8 >& getUnoTunnelId();
@@ -315,15 +315,15 @@ class SVT_DLLPUBLIC TransferableDataHelper
 
 private:
 
-    ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::XTransferable >           mxTransfer;
-    ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::clipboard::XClipboard >   mxClipboard;
-    DataFlavorExVector*                                                                         mpFormats;
+    ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::XTransferable >			mxTransfer;
+    ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::clipboard::XClipboard >	mxClipboard;
+    DataFlavorExVector*																			mpFormats;
     TransferableObjectDescriptor*                                                               mpObjDesc;
     TransferableDataHelper_Impl*                                                                mpImpl;
-    void*                                                                                       mpDummy4;
+    void*																						mpDummy4;
 
 protected:
-    void                        InitFormats();
+    void						InitFormats();
 
 public:
 
@@ -335,78 +335,78 @@ public:
                                 TransferableDataHelper( const ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::XTransferable >& rxTransferable );
                                 ~TransferableDataHelper();
 
-    TransferableDataHelper&     operator=( const TransferableDataHelper& rDataHelper );
+    TransferableDataHelper&		operator=( const TransferableDataHelper& rDataHelper );
 
-    const ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::XTransferable >&    GetTransferable() const { return mxTransfer; }
-    ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::XTransferable >           GetXTransferable() const;
+    const ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::XTransferable >&	GetTransferable() const { return mxTransfer; }
+    ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::XTransferable >			GetXTransferable() const;
 
-    sal_Bool                    HasFormat( SotFormatStringId nFormat ) const;
-    sal_Bool                    HasFormat( const ::com::sun::star::datatransfer::DataFlavor& rFlavor ) const;
+    sal_Bool					HasFormat( SotFormatStringId nFormat ) const;
+    sal_Bool					HasFormat( const ::com::sun::star::datatransfer::DataFlavor& rFlavor ) const;
 
-    sal_uInt32                  GetFormatCount() const;
+    sal_uInt32					GetFormatCount() const;
 
-    SotFormatStringId                           GetFormat( sal_uInt32 nFormat ) const;
-    ::com::sun::star::datatransfer::DataFlavor  GetFormatDataFlavor( sal_uInt32 nFormat ) const;
+    SotFormatStringId			                GetFormat( sal_uInt32 nFormat ) const;
+    ::com::sun::star::datatransfer::DataFlavor	GetFormatDataFlavor( sal_uInt32 nFormat ) const;
 
-    DataFlavorExVector&         GetDataFlavorExVector() const {return *mpFormats; }
+    DataFlavorExVector&			GetDataFlavorExVector() const {return *mpFormats; }
 
-    sal_Bool                    StartClipboardListening( );
-    void                        StopClipboardListening( );
+    sal_Bool					StartClipboardListening( );
+    void						StopClipboardListening( );
 
-    void                        Rebind( const ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::XTransferable >& _rxNewData );
+    void						Rebind( const ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::XTransferable >& _rxNewData );
 
 public:
 
-    ::com::sun::star::uno::Any  GetAny( SotFormatStringId nFormat ) const;
-    ::com::sun::star::uno::Any  GetAny( const ::com::sun::star::datatransfer::DataFlavor& rFlavor ) const;
+    ::com::sun::star::uno::Any	GetAny( SotFormatStringId nFormat ) const;
+    ::com::sun::star::uno::Any	GetAny( const ::com::sun::star::datatransfer::DataFlavor& rFlavor ) const;
 
-    sal_Bool                    GetString( SotFormatStringId nFormat, String& rStr );
-    sal_Bool                    GetString( const ::com::sun::star::datatransfer::DataFlavor& rFlavor, String& rStr );
+    sal_Bool					GetString( SotFormatStringId nFormat, String& rStr );
+    sal_Bool					GetString( const ::com::sun::star::datatransfer::DataFlavor& rFlavor, String& rStr );
 
-    sal_Bool                    GetString( SotFormatStringId nFormat, ::rtl::OUString& rStr );
-    sal_Bool                    GetString( const ::com::sun::star::datatransfer::DataFlavor& rFlavor, ::rtl::OUString& rStr );
+    sal_Bool					GetString( SotFormatStringId nFormat, ::rtl::OUString& rStr );
+    sal_Bool					GetString( const ::com::sun::star::datatransfer::DataFlavor& rFlavor, ::rtl::OUString& rStr );
 
-    sal_Bool                    GetBitmap( SotFormatStringId nFormat, Bitmap& rBmp );
-    sal_Bool                    GetBitmap( const ::com::sun::star::datatransfer::DataFlavor& rFlavor, Bitmap& rBmp );
+    sal_Bool					GetBitmap( SotFormatStringId nFormat, Bitmap& rBmp );
+    sal_Bool					GetBitmap( const ::com::sun::star::datatransfer::DataFlavor& rFlavor, Bitmap& rBmp );
 
-    sal_Bool                    GetGDIMetaFile( SotFormatStringId nFormat, GDIMetaFile& rMtf );
-    sal_Bool                    GetGDIMetaFile( const ::com::sun::star::datatransfer::DataFlavor& rFlavor, GDIMetaFile& rMtf );
+    sal_Bool					GetGDIMetaFile( SotFormatStringId nFormat, GDIMetaFile& rMtf );
+    sal_Bool					GetGDIMetaFile( const ::com::sun::star::datatransfer::DataFlavor& rFlavor, GDIMetaFile& rMtf );
 
-    sal_Bool                    GetGraphic( SotFormatStringId nFormat, Graphic& rGraphic );
-    sal_Bool                    GetGraphic( const ::com::sun::star::datatransfer::DataFlavor& rFlavor, Graphic& rGraphic );
+    sal_Bool					GetGraphic( SotFormatStringId nFormat, Graphic& rGraphic );
+    sal_Bool					GetGraphic( const ::com::sun::star::datatransfer::DataFlavor& rFlavor, Graphic& rGraphic );
 
     sal_Bool                    GetImageMap( SotFormatStringId nFormat, ImageMap& rIMap );
     sal_Bool                    GetImageMap( const ::com::sun::star::datatransfer::DataFlavor& rFlavor, ImageMap& rImap );
 
-    sal_Bool                    GetTransferableObjectDescriptor( SotFormatStringId nFormat, TransferableObjectDescriptor& rDesc );
-    sal_Bool                    GetTransferableObjectDescriptor( const ::com::sun::star::datatransfer::DataFlavor& rFlavor, TransferableObjectDescriptor& rDesc );
+    sal_Bool					GetTransferableObjectDescriptor( SotFormatStringId nFormat, TransferableObjectDescriptor& rDesc );
+    sal_Bool					GetTransferableObjectDescriptor( const ::com::sun::star::datatransfer::DataFlavor& rFlavor, TransferableObjectDescriptor& rDesc );
 
-    sal_Bool                    GetINetBookmark( SotFormatStringId nFormat, INetBookmark& rBmk );
-    sal_Bool                    GetINetBookmark( const ::com::sun::star::datatransfer::DataFlavor& rFlavor, INetBookmark& rBmk );
+    sal_Bool					GetINetBookmark( SotFormatStringId nFormat, INetBookmark& rBmk );
+    sal_Bool					GetINetBookmark( const ::com::sun::star::datatransfer::DataFlavor& rFlavor, INetBookmark& rBmk );
 
-    sal_Bool                    GetINetImage( SotFormatStringId nFormat, INetImage& rINtImg );
-    sal_Bool                    GetINetImage( const ::com::sun::star::datatransfer::DataFlavor& rFlavor, INetImage& rINtImg );
+    sal_Bool					GetINetImage( SotFormatStringId nFormat, INetImage& rINtImg );
+    sal_Bool					GetINetImage( const ::com::sun::star::datatransfer::DataFlavor& rFlavor, INetImage& rINtImg );
 
-    sal_Bool                    GetFileList( SotFormatStringId nFormat, FileList& rFileList );
-    sal_Bool                    GetFileList( const ::com::sun::star::datatransfer::DataFlavor& rFlavor, FileList& rFileList );
+    sal_Bool					GetFileList( SotFormatStringId nFormat, FileList& rFileList );
+    sal_Bool					GetFileList( const ::com::sun::star::datatransfer::DataFlavor& rFlavor, FileList& rFileList );
 
-    sal_Bool                    GetSequence( SotFormatStringId nFormat, ::com::sun::star::uno::Sequence< sal_Int8 >& rSeq );
-    sal_Bool                    GetSequence( const ::com::sun::star::datatransfer::DataFlavor& rFlavor, ::com::sun::star::uno::Sequence< sal_Int8 >& rSeq );
+    sal_Bool					GetSequence( SotFormatStringId nFormat, ::com::sun::star::uno::Sequence< sal_Int8 >& rSeq );
+    sal_Bool					GetSequence( const ::com::sun::star::datatransfer::DataFlavor& rFlavor, ::com::sun::star::uno::Sequence< sal_Int8 >& rSeq );
 
-    sal_Bool                    GetSotStorageStream( SotFormatStringId nFormat, SotStorageStreamRef& rStreamRef );
-    sal_Bool                    GetSotStorageStream( const ::com::sun::star::datatransfer::DataFlavor& rFlavor, SotStorageStreamRef& rStreamRef );
+    sal_Bool					GetSotStorageStream( SotFormatStringId nFormat, SotStorageStreamRef& rStreamRef );
+    sal_Bool					GetSotStorageStream( const ::com::sun::star::datatransfer::DataFlavor& rFlavor, SotStorageStreamRef& rStreamRef );
 
     sal_Bool                    GetInputStream( SotFormatStringId nFormat, ::com::sun::star::uno::Reference < com::sun::star::io::XInputStream >& xStream );
     sal_Bool                    GetInputStream( const ::com::sun::star::datatransfer::DataFlavor& rFlavor, ::com::sun::star::uno::Reference < com::sun::star::io::XInputStream >& xStream );
 
-    sal_Bool                    GetInterface( SotFormatStringId nFormat, ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& rIf );
-    sal_Bool                    GetInterface( const ::com::sun::star::datatransfer::DataFlavor& rFlavor, ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& rIf );
+    sal_Bool					GetInterface( SotFormatStringId nFormat, ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& rIf );
+    sal_Bool					GetInterface( const ::com::sun::star::datatransfer::DataFlavor& rFlavor, ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& rIf );
 
 public:
 
-    static TransferableDataHelper   CreateFromSystemClipboard( Window * pWindow );
-    static TransferableDataHelper   CreateFromSelection( Window * pWindow );
-    static sal_Bool                 IsEqual( const ::com::sun::star::datatransfer::DataFlavor& rInternalFlavor,
+    static TransferableDataHelper	CreateFromSystemClipboard( Window * pWindow );
+    static TransferableDataHelper	CreateFromSelection( Window * pWindow );
+    static sal_Bool					IsEqual( const ::com::sun::star::datatransfer::DataFlavor& rInternalFlavor,
                                              const ::com::sun::star::datatransfer::DataFlavor& rRequestFlavor,
                                              sal_Bool bCompareParameters = sal_False );
 };
@@ -424,9 +424,9 @@ private:
     {
     private:
 
-        DragSourceHelper&   mrParent;
-        void*               mpDummy1;
-        void*               mpDummy2;
+        DragSourceHelper&	mrParent;
+        void*				mpDummy1;
+        void*				mpDummy2;
 
     private:
 
@@ -446,23 +446,23 @@ private:
 
 private:
 
-    ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::dnd::XDragGestureRecognizer > mxDragGestureRecognizer;
-    ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::dnd::XDragGestureListener >   mxDragGestureListener;
-    void*                                                                                           mpDummy1;
-    void*                                                                                           mpDummy2;
+    ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::dnd::XDragGestureRecognizer >	mxDragGestureRecognizer;
+    ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::dnd::XDragGestureListener >	mxDragGestureListener;
+    void*																							mpDummy1;
+    void*																							mpDummy2;
 
                         // not available
                         DragSourceHelper();
-    DragSourceHelper&   operator=( const DragSourceHelper& rDragSourceHelper );
-    sal_Bool            operator==( const DragSourceHelper& rDragSourceHelper ) const;
+    DragSourceHelper&	operator=( const DragSourceHelper& rDragSourceHelper );
+    sal_Bool			operator==( const DragSourceHelper& rDragSourceHelper ) const;
 
 public:
 
                         // to be overridden by the application
-    virtual void        StartDrag( sal_Int8 nAction, const Point& rPosPixel );
+    virtual void		StartDrag( sal_Int8 nAction, const Point& rPosPixel );
 
                         DragSourceHelper( Window* pWindow );
-    virtual             ~DragSourceHelper();
+    virtual 			~DragSourceHelper();
 };
 
 // --------------------
@@ -478,11 +478,11 @@ private:
     {
     private:
 
-        DropTargetHelper&   mrParent;
+        DropTargetHelper&	mrParent;
         AcceptDropEvent*    mpLastDragOverEvent;
-        void*               mpDummy2;
-        void*               mpDummy3;
-        void*               mpDummy4;
+        void*				mpDummy2;
+        void*				mpDummy3;
+        void*				mpDummy4;
 
     private:
 
@@ -506,41 +506,41 @@ private:
 
 private:
 
-    DataFlavorExList                                                                                maDummy;
-    ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::dnd::XDropTarget >            mxDropTarget;
-    ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::dnd::XDropTargetListener >    mxDropTargetListener;
-    DataFlavorExVector*                                                                             mpFormats;
-    void*                                                                                           mpDummy1;
-    void*                                                                                           mpDummy2;
-    void*                                                                                           mpDummy3;
+    DataFlavorExList																				maDummy;
+    ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::dnd::XDropTarget >			mxDropTarget;
+    ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::dnd::XDropTargetListener >	mxDropTargetListener;
+    DataFlavorExVector*																				mpFormats;
+    void*																							mpDummy1;
+    void*																							mpDummy2;
+    void*																							mpDummy3;
 
                         // not available
                         DropTargetHelper();
-    DropTargetHelper&   operator=( const DropTargetHelper& rDropTargetHelper );
-    sal_Bool            operator==( const DropTargetHelper& rDropTargetHelper ) const;
+    DropTargetHelper&	operator=( const DropTargetHelper& rDropTargetHelper );
+    sal_Bool			operator==( const DropTargetHelper& rDropTargetHelper ) const;
 
-    void                ImplConstruct();
+    void				ImplConstruct();
 
                         // called by our own implementation of XDropTargetListener (DropTargetListener instance)
-    void                ImplBeginDrag( const ::com::sun::star::uno::Sequence< ::com::sun::star::datatransfer::DataFlavor >& rSupportedDataFlavors );
-    void                ImplEndDrag();
+    void				ImplBeginDrag( const ::com::sun::star::uno::Sequence< ::com::sun::star::datatransfer::DataFlavor >& rSupportedDataFlavors );
+    void				ImplEndDrag();
 
 public:
 
                         // to be overridden by the application
-    virtual sal_Int8    AcceptDrop( const AcceptDropEvent& rEvt );
-    virtual sal_Int8    ExecuteDrop( const ExecuteDropEvent& rEvt );
+    virtual sal_Int8	AcceptDrop( const AcceptDropEvent& rEvt );
+    virtual sal_Int8	ExecuteDrop( const ExecuteDropEvent& rEvt );
 
                         DropTargetHelper( Window* pWindow );
                         DropTargetHelper( const ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::dnd::XDropTarget >& rxDropTarget );
 
-    virtual             ~DropTargetHelper();
+    virtual 			~DropTargetHelper();
 
                         // typically called by the application in ::AcceptDrop and ::ExecuteDrop and (see above)
-    sal_Bool            IsDropFormatSupported( SotFormatStringId nFormat );
-    sal_Bool            IsDropFormatSupported( const ::com::sun::star::datatransfer::DataFlavor& rFlavor );
+    sal_Bool			IsDropFormatSupported( SotFormatStringId nFormat );
+    sal_Bool			IsDropFormatSupported( const ::com::sun::star::datatransfer::DataFlavor& rFlavor );
 
-    DataFlavorExVector& GetDataFlavorExVector() const {return *mpFormats; }
+    DataFlavorExVector&	GetDataFlavorExVector() const {return *mpFormats; }
 
 };
 
@@ -557,9 +557,9 @@ class SVT_DLLPUBLIC TransferDataContainer : public TransferableHelper
 
 protected:
 
-    virtual void        AddSupportedFormats();
-    virtual sal_Bool    GetData( const ::com::sun::star::datatransfer::DataFlavor& rFlavor );
-    virtual void        DragFinished( sal_Int8 nDropAction );
+    virtual void		AddSupportedFormats();
+    virtual sal_Bool	GetData( const ::com::sun::star::datatransfer::DataFlavor& rFlavor );
+    virtual void		DragFinished( sal_Int8 nDropAction );
 
 public:
 
diff --git a/svtools/inc/svtools/treelist.hxx b/svtools/inc/svtools/treelist.hxx
index 3ba013d90830..23fc3e1141bc 100644
--- a/svtools/inc/svtools/treelist.hxx
+++ b/svtools/inc/svtools/treelist.hxx
@@ -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
@@ -39,27 +39,27 @@
 #include <tools/string.hxx>
 #include <tools/debug.hxx>
 
-#define LISTACTION_INSERTED         1
+#define LISTACTION_INSERTED			1
 #define LISTACTION_REMOVING         2
 #define LISTACTION_REMOVED          3
-#define LISTACTION_MOVING           4
-#define LISTACTION_MOVED            5
-#define LISTACTION_CLEARING         6
-#define LISTACTION_INSERTED_TREE    7
-#define LISTACTION_INVALIDATE_ENTRY 8
-#define LISTACTION_RESORTING        9
-#define LISTACTION_RESORTED         10
-#define LISTACTION_CLEARED          11
+#define LISTACTION_MOVING			4
+#define LISTACTION_MOVED			5
+#define LISTACTION_CLEARING 		6
+#define LISTACTION_INSERTED_TREE	7
+#define LISTACTION_INVALIDATE_ENTRY	8
+#define LISTACTION_RESORTING		9
+#define LISTACTION_RESORTED			10
+#define LISTACTION_CLEARED			11
 
 #define SV_TREELIST_ROOT_ENTRY  (SvListEntry*)0
-#define SV_TREELIST_ERROR        0xFFFFFFFF
+#define SV_TREELIST_ERROR		 0xFFFFFFFF
 
 // Entryflags, die an der View haengen
-#define SVLISTENTRYFLAG_SELECTED        0x0001
-#define SVLISTENTRYFLAG_EXPANDED        0x0002
-#define SVLISTENTRYFLAG_FOCUSED         0x0004
-#define SVLISTENTRYFLAG_CURSORED        0x0008
-#define SVLISTENTRYFLAG_NOT_SELECTABLE  0x0010
+#define SVLISTENTRYFLAG_SELECTED		0x0001
+#define SVLISTENTRYFLAG_EXPANDED		0x0002
+#define SVLISTENTRYFLAG_FOCUSED			0x0004
+#define SVLISTENTRYFLAG_CURSORED		0x0008
+#define SVLISTENTRYFLAG_NOT_SELECTABLE	0x0010
 
 class SvListEntry;
 
@@ -82,34 +82,34 @@ friend class SvTreeList;
 friend class SvListView;
 
 private:
-    SvListEntry*        pParent;
-    SvTreeEntryList*    pChilds;
-    ULONG               nAbsPos;
-    ULONG               nListPos;
+    SvListEntry*		pParent;
+    SvTreeEntryList*	pChilds;
+    ULONG				nAbsPos;
+    ULONG				nListPos;
 
-    void                SetListPositions();
-    void                InvalidateChildrensListPositions()
+    void				SetListPositions();
+    void				InvalidateChildrensListPositions()
                         {
                             nListPos |= 0x80000000;
                         }
 public:
                         SvListEntry();
                         SvListEntry( const SvListEntry& );
-    virtual             ~SvListEntry();
-    BOOL                HasChilds() { return (BOOL)(pChilds!=0); }
-    BOOL                HasChildListPos() const
+    virtual				~SvListEntry();
+    BOOL				HasChilds() { return (BOOL)(pChilds!=0); }
+    BOOL				HasChildListPos() const
     {
         if( pParent && !(pParent->nListPos & 0x80000000) )
             return TRUE;
         else return FALSE;
     }
-    ULONG               GetChildListPos() const
+    ULONG				GetChildListPos() const
     {
         if( pParent && (pParent->nListPos & 0x80000000) )
             pParent->SetListPositions();
         return ( nListPos & 0x7fffffff );
     }
-    virtual void        Clone( SvListEntry* pSource );
+    virtual void 		Clone( SvListEntry* pSource );
 };
 
 class SvListView;
@@ -119,9 +119,9 @@ class SvViewData
 friend class SvTreeList;
 friend class SvListView;
 
-    ULONG       nVisPos;
+    ULONG		nVisPos;
 protected:
-    USHORT      nFlags;
+    USHORT 		nFlags;
 public:
     SvViewData();
     SvViewData( const SvViewData& );
@@ -173,54 +173,54 @@ class SVT_DLLPUBLIC SvTreeList
 {
     friend class SvListView;
 
-    List            aViewList;
+    List			aViewList;
     ULONG           nEntryCount;
 
-    Link            aCloneLink;
-    Link            aCompareLink;
-    SvSortMode      eSortMode;
+    Link			aCloneLink;
+    Link			aCompareLink;
+    SvSortMode		eSortMode;
 
-    USHORT          nRefCount;
+    USHORT			nRefCount;
 
-    BOOL            bAbsPositionsValid;
+    BOOL			bAbsPositionsValid;
 
     SvListEntry*    FirstVisible() const { return First(); }
     SvListEntry*    NextVisible( const SvListView*,SvListEntry* pEntry, USHORT* pDepth=0 ) const;
-    SvListEntry*    PrevVisible( const SvListView*,SvListEntry* pEntry, USHORT* pDepth=0 ) const;
-    SvListEntry*    LastVisible( const SvListView*,USHORT* pDepth=0 ) const;
-    SvListEntry*    NextVisible( const SvListView*,SvListEntry* pEntry, USHORT& rDelta ) const;
-    SvListEntry*    PrevVisible( const SvListView*,SvListEntry* pEntry, USHORT& rDelta ) const;
+    SvListEntry*	PrevVisible( const SvListView*,SvListEntry* pEntry, USHORT* pDepth=0 ) const;
+    SvListEntry*	LastVisible( const SvListView*,USHORT* pDepth=0 ) const;
+    SvListEntry*	NextVisible( const SvListView*,SvListEntry* pEntry, USHORT& rDelta ) const;
+    SvListEntry*	PrevVisible( const SvListView*,SvListEntry* pEntry, USHORT& rDelta ) const;
 
-    BOOL            IsEntryVisible( const SvListView*,SvListEntry* pEntry ) const;
-    SvListEntry*    GetEntryAtVisPos( const SvListView*,ULONG nVisPos ) const;
-    ULONG           GetVisiblePos( const SvListView*,SvListEntry* pEntry ) const;
-    ULONG           GetVisibleCount( const SvListView* ) const;
-    ULONG           GetVisibleChildCount( const SvListView*,SvListEntry* pParent ) const;
+    BOOL			IsEntryVisible( const SvListView*,SvListEntry* pEntry ) const;
+    SvListEntry*	GetEntryAtVisPos( const SvListView*,ULONG nVisPos ) const;
+    ULONG			GetVisiblePos( const SvListView*,SvListEntry* pEntry ) const;
+    ULONG			GetVisibleCount( const SvListView* ) const;
+    ULONG			GetVisibleChildCount( const SvListView*,SvListEntry* pParent ) const;
 
     SvListEntry*    FirstSelected( const SvListView*) const;
     SvListEntry*    NextSelected( const SvListView*,SvListEntry* pEntry ) const;
-    SvListEntry*    PrevSelected( const SvListView*,SvListEntry* pEntry ) const;
-    SvListEntry*    LastSelected( const SvListView*) const;
+    SvListEntry*	PrevSelected( const SvListView*,SvListEntry* pEntry ) const;
+    SvListEntry*	LastSelected( const SvListView*) const;
 
     BOOL            Select( SvListView*,SvListEntry* pEntry, BOOL bSelect=TRUE );
-    ULONG           SelectChilds( SvListView*,SvListEntry* pParent, BOOL bSelect );
-    void            SelectAll( SvListView*,BOOL bSelect ); // ruft nicht Select-Hdl
-    ULONG           GetChildSelectionCount( const SvListView*,SvListEntry* pParent ) const;
+    ULONG			SelectChilds( SvListView*,SvListEntry* pParent, BOOL bSelect );
+    void			SelectAll( SvListView*,BOOL bSelect ); // ruft nicht Select-Hdl
+    ULONG			GetChildSelectionCount( const SvListView*,SvListEntry* pParent ) const;
 
     void            Expand( SvListView*,SvListEntry* pParent );
     void            Collapse( SvListView*,SvListEntry* pParent );
 
 //#if 0 // _SOLAR__PRIVATE
-    SVT_DLLPRIVATE void             SetAbsolutePositions();
+    SVT_DLLPRIVATE void 			SetAbsolutePositions();
     SVT_DLLPRIVATE SvTreeEntryList*CloneChilds( SvTreeEntryList* pChilds,
                                  SvListEntry* pNewParent,
                                  ULONG& nCloneCount ) const;
-    SVT_DLLPRIVATE void         SetListPositions( SvTreeEntryList* );
+    SVT_DLLPRIVATE void			SetListPositions( SvTreeEntryList* );
 
     // rPos wird bei SortModeNone nicht geaendert
-    SVT_DLLPRIVATE void         GetInsertionPos( SvListEntry* pEntry, SvListEntry* pParent,
+    SVT_DLLPRIVATE void			GetInsertionPos( SvListEntry* pEntry, SvListEntry* pParent,
                         ULONG& rPos );
-    SVT_DLLPRIVATE void         ResortChilds( SvListEntry* pParent );
+    SVT_DLLPRIVATE void			ResortChilds( SvListEntry* pParent );
 //#endif /* _SOLAR__PRIVATE */
 
 protected:
@@ -232,59 +232,59 @@ public:
     SvTreeList();
     virtual ~SvTreeList();
 
-    void            InsertView( SvListView* );
-    void            RemoveView( SvListView* );
-    ULONG           GetViewCount() const { return aViewList.Count(); }
-    SvListView*     GetView(ULONG nPos) const {return (SvListView*)aViewList.GetObject(nPos);}
-    void            Broadcast( USHORT nActionId, SvListEntry* pEntry1=0,
+    void			InsertView( SvListView* );
+    void			RemoveView( SvListView* );
+    ULONG			GetViewCount() const { return aViewList.Count(); }
+    SvListView*		GetView(ULONG nPos) const {return (SvListView*)aViewList.GetObject(nPos);}
+    void			Broadcast( USHORT nActionId, SvListEntry* pEntry1=0,
                         SvListEntry* pEntry2=0, ULONG nPos=0 );
     // informiert alle Listener
-    void            InvalidateEntry( SvListEntry* );
+    void			InvalidateEntry( SvListEntry* );
 
-    ULONG           GetEntryCount() const { return nEntryCount; }
+    ULONG			GetEntryCount() const { return nEntryCount; }
     SvListEntry*    First() const;
     SvListEntry*    Next( SvListEntry* pEntry, USHORT* pDepth=0 ) const;
-    SvListEntry*    Prev( SvListEntry* pEntry, USHORT* pDepth=0 ) const;
-    SvListEntry*    Last( USHORT* pDepth=0 ) const;
-
-    SvListEntry*    FirstChild( SvListEntry* pParent ) const;
-    SvListEntry*    NextSibling( SvListEntry* pEntry ) const;
-    SvListEntry*    PrevSibling( SvListEntry* pEntry ) const;
-    SvListEntry*    LastSibling( SvListEntry* pEntry ) const;
-
-    ULONG           Insert( SvListEntry* pEntry,SvListEntry* pPar,ULONG nPos=LIST_APPEND);
-    ULONG           Insert( SvListEntry* pEntry,ULONG nRootPos = LIST_APPEND ) { return Insert(pEntry, pRootItem, nRootPos ); }
-    void            InsertTree( SvListEntry* pTree, SvListEntry* pTarget );
-    void            InsertTree( SvListEntry* pTree, SvListEntry* pTargetParent,
+    SvListEntry*	Prev( SvListEntry* pEntry, USHORT* pDepth=0 ) const;
+    SvListEntry*	Last( USHORT* pDepth=0 ) const;
+
+    SvListEntry*	FirstChild( SvListEntry* pParent ) const;
+    SvListEntry*	NextSibling( SvListEntry* pEntry ) const;
+    SvListEntry*	PrevSibling( SvListEntry* pEntry ) const;
+    SvListEntry*	LastSibling( SvListEntry* pEntry ) const;
+
+    ULONG			Insert( SvListEntry* pEntry,SvListEntry* pPar,ULONG nPos=LIST_APPEND);
+    ULONG			Insert( SvListEntry* pEntry,ULONG nRootPos = LIST_APPEND ) { return Insert(pEntry, pRootItem, nRootPos ); }
+    void			InsertTree( SvListEntry* pTree, SvListEntry* pTarget );
+    void			InsertTree( SvListEntry* pTree, SvListEntry* pTargetParent,
                                 ULONG nListPos );
     // Entries muessen im gleichen Model stehen!
     void            Move( SvListEntry* pSource, SvListEntry* pTarget );
     // erzeugt ggf. Child-List
-    ULONG           Move( SvListEntry* pSource, SvListEntry* pTargetParent,
+    ULONG   		Move( SvListEntry* pSource, SvListEntry* pTargetParent,
                           ULONG nListPos);
-    void            Copy( SvListEntry* pSource, SvListEntry* pTarget );
-    ULONG           Copy( SvListEntry* pSource, SvListEntry* pTargetParent,
+    void			Copy( SvListEntry* pSource, SvListEntry* pTarget );
+    ULONG   		Copy( SvListEntry* pSource, SvListEntry* pTargetParent,
                           ULONG nListPos);
 
     BOOL            Remove( SvListEntry* pEntry );
     void            Clear();
 
-    BOOL            HasChilds( SvListEntry* pEntry ) const;
-    BOOL            HasParent( SvListEntry* pEntry ) const  { return (BOOL)(pEntry->pParent!=pRootItem); }
-    BOOL            IsChild( SvListEntry* pParent, SvListEntry* pChild ) const;
-    BOOL            IsInChildList( SvListEntry* pParent, SvListEntry* pChild) const;
-    SvListEntry*    GetEntry( SvListEntry* pParent, ULONG nPos ) const;
-    SvListEntry*    GetEntry( ULONG nRootPos ) const;
-    SvListEntry*    GetEntryAtAbsPos( ULONG nAbsPos ) const;
-    SvListEntry*    GetParent( SvListEntry* pEntry ) const;
-    SvListEntry*    GetRootLevelParent( SvListEntry* pEntry ) const;
+    BOOL			HasChilds( SvListEntry* pEntry ) const;
+    BOOL			HasParent( SvListEntry* pEntry ) const 	{ return (BOOL)(pEntry->pParent!=pRootItem); }
+    BOOL			IsChild( SvListEntry* pParent, SvListEntry* pChild ) const;
+    BOOL			IsInChildList( SvListEntry* pParent, SvListEntry* pChild) const;
+    SvListEntry*	GetEntry( SvListEntry* pParent, ULONG nPos ) const;
+    SvListEntry*	GetEntry( ULONG nRootPos ) const;
+    SvListEntry*	GetEntryAtAbsPos( ULONG nAbsPos ) const;
+    SvListEntry*	GetParent( SvListEntry* pEntry ) const;
+    SvListEntry*	GetRootLevelParent( SvListEntry* pEntry ) const;
     SvTreeEntryList* GetChildList( SvListEntry* pParent ) const;
 
-    ULONG           GetAbsPos( SvListEntry* pEntry ) const;
-    ULONG           GetRelPos( SvListEntry* pChild ) const { return pChild->GetChildListPos(); }
-    ULONG           GetChildCount( SvListEntry* pParent ) const;
+    ULONG			GetAbsPos( SvListEntry* pEntry ) const;
+    ULONG			GetRelPos( SvListEntry* pChild ) const { return pChild->GetChildListPos(); }
+    ULONG			GetChildCount( SvListEntry* pParent ) const;
     USHORT          GetDepth( SvListEntry* pEntry ) const;
-    BOOL            IsAtRootDepth( SvListEntry* pEntry ) const { return (BOOL)(pEntry->pParent==pRootItem); }
+    BOOL			IsAtRootDepth( SvListEntry* pEntry ) const { return (BOOL)(pEntry->pParent==pRootItem); }
 
     // das Model ruft zum Clonen von Entries den Clone-Link auf,
     // damit man sich nicht vom Model ableiten muss, wenn man
@@ -292,23 +292,23 @@ public:
     // Deklaration des Clone-Handlers:
     // DECL_LINK(CloneHdl,SvListEntry*);
     // der Handler muss einen SvListEntry* zurueckgeben
-    SvListEntry*    Clone( SvListEntry* pEntry, ULONG& nCloneCount ) const;
-    void            SetCloneLink( const Link& rLink ) { aCloneLink=rLink; }
-    const Link&     GetCloneLink() const { return aCloneLink; }
+    SvListEntry*	Clone( SvListEntry* pEntry, ULONG& nCloneCount ) const;
+    void			SetCloneLink( const Link& rLink ) { aCloneLink=rLink; }
+    const Link&		GetCloneLink() const { return aCloneLink; }
     virtual SvListEntry* CloneEntry( SvListEntry* ) const; // ruft den Clone-Link
     virtual SvListEntry* CreateEntry() const; // zum 'new'en von Entries
 
-    USHORT          GetRefCount() const { return nRefCount; }
-    void            SetRefCount( USHORT nRef ) { nRefCount = nRef; }
+    USHORT			GetRefCount() const { return nRefCount; }
+    void			SetRefCount( USHORT nRef ) { nRefCount = nRef; }
 
-    void            SetSortMode( SvSortMode eMode ) { eSortMode = eMode; }
-    SvSortMode      GetSortMode() const { return eSortMode; }
+    void			SetSortMode( SvSortMode eMode ) { eSortMode = eMode; }
+    SvSortMode		GetSortMode() const { return eSortMode; }
     virtual StringCompare Compare( SvListEntry*, SvListEntry* ) const;
-    void            SetCompareHdl( const Link& rLink ) { aCompareLink = rLink; }
-    const Link&     GetCompareHdl() const { return aCompareLink; }
-    void            Resort();
+    void			SetCompareHdl( const Link& rLink ) { aCompareLink = rLink; }
+    const Link& 	GetCompareHdl() const { return aCompareLink; }
+    void			Resort();
 
-    void            CheckIntegrity() const;
+    void			CheckIntegrity() const;
 };
 
 class SVT_DLLPUBLIC SvListView
@@ -316,18 +316,18 @@ class SVT_DLLPUBLIC SvListView
     friend class SvTreeList;
 
     ULONG           nVisibleCount;
-    ULONG           nSelectionCount;
+    ULONG			nSelectionCount;
     BOOL            bVisPositionsValid;
 
 //#if 0 // _SOLAR__PRIVATE
-    SVT_DLLPRIVATE void         InitTable();
-    SVT_DLLPRIVATE void         ClearTable();
-    SVT_DLLPRIVATE void         RemoveViewData( SvListEntry* pParent );
+    SVT_DLLPRIVATE void			InitTable();
+    SVT_DLLPRIVATE void			ClearTable();
+    SVT_DLLPRIVATE void			RemoveViewData( SvListEntry* pParent );
 //#endif
 
 protected:
-    Table           aDataTable;  // Mapping SvListEntry -> ViewData
-    SvTreeList*     pModel;
+    Table			aDataTable;  // Mapping SvListEntry -> ViewData
+    SvTreeList*		pModel;
 
     void ActionMoving( SvListEntry* pEntry,SvListEntry* pTargetPrnt,ULONG nChildPos);
     void ActionMoved( SvListEntry* pEntry,SvListEntry* pTargetPrnt,ULONG nChildPos);
@@ -343,54 +343,54 @@ public:
     SvListView( SvTreeList* pModel );
     virtual ~SvListView();
     void            Clear();
-    SvTreeList*     GetModel() const { return pModel; }
-    virtual void    SetModel( SvTreeList* );
-    virtual void    ModelNotification( USHORT nActionId, SvListEntry* pEntry1,
+    SvTreeList*		GetModel() const { return pModel; }
+    virtual void	SetModel( SvTreeList* );
+    virtual void	ModelNotification( USHORT nActionId, SvListEntry* pEntry1,
                         SvListEntry* pEntry2, ULONG nPos );
 
-    ULONG           GetVisibleCount() const { return pModel->GetVisibleCount( (SvListView*)this );}
+    ULONG			GetVisibleCount() const { return pModel->GetVisibleCount( (SvListView*)this );}
     SvListEntry*    FirstVisible() const { return pModel->FirstVisible(); }
     SvListEntry*    NextVisible( SvListEntry* pEntry, USHORT* pDepth=0 ) const {return pModel->NextVisible(this,pEntry,pDepth); }
-    SvListEntry*    PrevVisible( SvListEntry* pEntry, USHORT* pDepth=0 ) const {return pModel->PrevVisible(this,pEntry,pDepth); }
-    SvListEntry*    LastVisible( USHORT* pDepth=0 ) const { return pModel->LastVisible(this,pDepth);}
-    SvListEntry*    NextVisible( SvListEntry* pEntry, USHORT& rDelta ) const { return pModel->NextVisible(this,pEntry,rDelta); }
-    SvListEntry*    PrevVisible( SvListEntry* pEntry, USHORT& rDelta ) const { return pModel->PrevVisible(this,pEntry,rDelta); }
+    SvListEntry*	PrevVisible( SvListEntry* pEntry, USHORT* pDepth=0 ) const {return pModel->PrevVisible(this,pEntry,pDepth); }
+    SvListEntry*	LastVisible( USHORT* pDepth=0 ) const { return pModel->LastVisible(this,pDepth);}
+    SvListEntry*	NextVisible( SvListEntry* pEntry, USHORT& rDelta ) const { return pModel->NextVisible(this,pEntry,rDelta); }
+    SvListEntry*	PrevVisible( SvListEntry* pEntry, USHORT& rDelta ) const { return pModel->PrevVisible(this,pEntry,rDelta); }
 
     ULONG           GetSelectionCount() const { return nSelectionCount; }
-    SvListEntry*    FirstSelected() const { return pModel->FirstSelected(this);}
+    SvListEntry*	FirstSelected() const { return pModel->FirstSelected(this);}
     SvListEntry*    NextSelected( SvListEntry* pEntry ) const { return pModel->NextSelected(this,pEntry); }
-    SvListEntry*    PrevSelected( SvListEntry* pEntry ) const { return pModel->PrevSelected(this,pEntry); }
-    SvListEntry*    LastSelected() const { return pModel->LastSelected(this); }
-    SvListEntry*    GetEntryAtVisPos( ULONG nVisPos ) const { return pModel->GetEntryAtVisPos((SvListView*)this,nVisPos); }
-    ULONG           GetVisiblePos( SvListEntry* pEntry ) const { return pModel->GetVisiblePos((SvListView*)this,pEntry); }
+    SvListEntry*	PrevSelected( SvListEntry* pEntry ) const { return pModel->PrevSelected(this,pEntry); }
+    SvListEntry*	LastSelected() const { return pModel->LastSelected(this); }
+    SvListEntry*	GetEntryAtVisPos( ULONG nVisPos ) const { return pModel->GetEntryAtVisPos((SvListView*)this,nVisPos); }
+    ULONG			GetVisiblePos( SvListEntry* pEntry ) const { return pModel->GetVisiblePos((SvListView*)this,pEntry); }
 
-    ULONG           GetVisibleChildCount(SvListEntry* pParent ) const { return pModel->GetVisibleChildCount((SvListView*)this,pParent); }
-    ULONG           GetChildSelectionCount( SvListEntry* pParent ) const { return pModel->GetChildSelectionCount((SvListView*)this,pParent); }
+    ULONG			GetVisibleChildCount(SvListEntry* pParent ) const { return pModel->GetVisibleChildCount((SvListView*)this,pParent); }
+    ULONG			GetChildSelectionCount( SvListEntry* pParent ) const { return pModel->GetChildSelectionCount((SvListView*)this,pParent); }
     void            Expand( SvListEntry* pParent ) { pModel->Expand((SvListView*)this,pParent); }
     void            Collapse( SvListEntry* pParent ) { pModel->Collapse((SvListView*)this,pParent); }
     BOOL            Select( SvListEntry* pEntry, BOOL bSelect=TRUE ) { return pModel->Select((SvListView*)this,pEntry,bSelect); }
-    ULONG           SelectChilds( SvListEntry* pParent, BOOL bSelect ) { return pModel->SelectChilds((SvListView*)this,pParent, bSelect); }
+    ULONG			SelectChilds( SvListEntry* pParent, BOOL bSelect ) { return pModel->SelectChilds((SvListView*)this,pParent, bSelect); }
     // ruft nicht Select-Hdl
-    virtual void    SelectAll( BOOL bSelect, BOOL ) { pModel->SelectAll((SvListView*)this, bSelect); }
-    BOOL            IsEntryVisible( SvListEntry* pEntry ) const { return pModel->IsEntryVisible((SvListView*)this,pEntry); }
-    BOOL            IsExpanded( SvListEntry* pEntry ) const;
-    BOOL            IsSelected( SvListEntry* pEntry ) const;
-    BOOL            HasEntryFocus( SvListEntry* pEntry ) const;
-    void            SetEntryFocus( SvListEntry* pEntry, BOOL bFocus ) const;
-    SvViewData*     GetViewData( SvListEntry* pEntry ) const;
-    BOOL            HasViewData() const { return aDataTable.Count() > 1;}   // eine ROOT gibts immer
-    virtual SvViewData* CreateViewData( SvListEntry* pEntry );
-    virtual void InitViewData( SvViewData*, SvListEntry* pEntry );
-
-    virtual void    ModelHasCleared();
-    virtual void    ModelHasInserted( SvListEntry* pEntry );
-    virtual void    ModelHasInsertedTree( SvListEntry* pEntry );
-    virtual void    ModelIsMoving( SvListEntry* pSource, SvListEntry* pTargetParent,
-                                ULONG nPos  );
-    virtual void    ModelHasMoved( SvListEntry* pSource );
-    virtual void    ModelIsRemoving( SvListEntry* pEntry );
-    virtual void    ModelHasRemoved( SvListEntry* pEntry );
-    virtual void    ModelHasEntryInvalidated( SvListEntry* pEntry );
+    virtual void	SelectAll( BOOL bSelect, BOOL ) { pModel->SelectAll((SvListView*)this, bSelect); }
+    BOOL			IsEntryVisible( SvListEntry* pEntry ) const	{ return pModel->IsEntryVisible((SvListView*)this,pEntry); }
+    BOOL			IsExpanded( SvListEntry* pEntry ) const;
+    BOOL			IsSelected( SvListEntry* pEntry ) const;
+    BOOL			HasEntryFocus( SvListEntry* pEntry ) const;
+    void			SetEntryFocus( SvListEntry* pEntry, BOOL bFocus ) const;
+    SvViewData*		GetViewData( SvListEntry* pEntry ) const;
+    BOOL			HasViewData() const { return aDataTable.Count() > 1;}	// eine ROOT gibts immer
+    virtual	SvViewData* CreateViewData( SvListEntry* pEntry );
+    virtual	void InitViewData( SvViewData*, SvListEntry* pEntry );
+
+    virtual void 	ModelHasCleared();
+    virtual void 	ModelHasInserted( SvListEntry* pEntry );
+    virtual void 	ModelHasInsertedTree( SvListEntry* pEntry );
+    virtual void 	ModelIsMoving( SvListEntry* pSource, SvListEntry* pTargetParent,
+                                ULONG nPos	);
+    virtual void 	ModelHasMoved( SvListEntry* pSource );
+    virtual void 	ModelIsRemoving( SvListEntry* pEntry );
+    virtual void 	ModelHasRemoved( SvListEntry* pEntry );
+    virtual void 	ModelHasEntryInvalidated( SvListEntry* pEntry );
 };
 
 inline BOOL SvListView::IsExpanded( SvListEntry* pEntry ) const
@@ -474,41 +474,41 @@ inline SvListEntry* SvTreeList::GetParent( SvListEntry* pEntry ) const
     return pParent;
 }
 
-#define DECLARE_SVTREELIST( ClassName, Type )                                   \
-class ClassName : public SvTreeList                                         \
+#define DECLARE_SVTREELIST( ClassName, Type )									\
+class ClassName : public SvTreeList                                       	\
 {                                                                           \
 public:                                                                     \
-    Type        First() const                                               \
+    Type		First() const                                               \
                     { return (Type)SvTreeList::First(); }                     \
-    Type        Next( SvListEntry* pEntry, USHORT* pDepth=0 ) const           \
+    Type    	Next( SvListEntry* pEntry, USHORT* pDepth=0 ) const           \
                     { return (Type)SvTreeList::Next(pEntry,pDepth); }         \
-    Type        Prev( SvListEntry* pEntry, USHORT* pDepth=0 ) const           \
+    Type		Prev( SvListEntry* pEntry, USHORT* pDepth=0 ) const           \
                     { return (Type)SvTreeList::Prev(pEntry,pDepth); }         \
-    Type        Last( USHORT* pDepth=0 ) const                              \
-                    { return (Type)SvTreeList::Last(pDepth); }              \
+    Type		Last( USHORT* pDepth=0 ) const           					\
+                    { return (Type)SvTreeList::Last(pDepth); }         		\
                                                                             \
-    Type        Clone( SvListEntry* pEntry, ULONG& nCloneCount ) const        \
+    Type 		Clone( SvListEntry* pEntry, ULONG& nCloneCount ) const        \
                     { return (Type)SvTreeList::Clone(pEntry,nCloneCount); }   \
-    Type        GetEntry( SvListEntry* pParent, ULONG nPos ) const            \
+    Type		GetEntry( SvListEntry* pParent, ULONG nPos ) const            \
                     { return (Type)SvTreeList::GetEntry(pParent,nPos); }      \
-    Type        GetEntry( ULONG nRootPos ) const                            \
+    Type		GetEntry( ULONG nRootPos ) const                            \
                     { return (Type)SvTreeList::GetEntry(nRootPos); }          \
-    Type        GetParent( SvListEntry* pEntry ) const                        \
+    Type		GetParent( SvListEntry* pEntry ) const                        \
                     { return (Type)SvTreeList::GetParent(pEntry); }           \
     using SvTreeList::FirstChild;                                             \
-    Type        FirstChild( Type pParent ) const                            \
-                    { return (Type)SvTreeList::FirstChild(pParent); }           \
+    Type		FirstChild( Type pParent ) const							\
+                    { return (Type)SvTreeList::FirstChild(pParent); }			\
     using SvTreeList::NextSibling;                                             \
-    Type        NextSibling( Type pEntry ) const                            \
-                    { return (Type)SvTreeList::NextSibling(pEntry); }           \
+    Type		NextSibling( Type pEntry ) const							\
+                    { return (Type)SvTreeList::NextSibling(pEntry); }			\
     using SvTreeList::PrevSibling;                                             \
-    Type        PrevSibling( Type pEntry ) const                            \
-                    { return (Type)SvTreeList::PrevSibling(pEntry); }           \
+    Type		PrevSibling( Type pEntry ) const							\
+                    { return (Type)SvTreeList::PrevSibling(pEntry); }			\
     using SvTreeList::LastSibling;                                             \
-    Type        LastSibling( Type pEntry ) const                            \
-                    { return (Type)SvTreeList::LastSibling(pEntry); }           \
-    Type        GetEntryAtAbsPos( ULONG nAbsPos ) const                     \
-                    { return (Type)SvTreeList::GetEntryAtAbsPos( nAbsPos); }    \
+    Type		LastSibling( Type pEntry ) const							\
+                    { return (Type)SvTreeList::LastSibling(pEntry); }			\
+    Type		GetEntryAtAbsPos( ULONG nAbsPos ) const						\
+                    { return (Type)SvTreeList::GetEntryAtAbsPos( nAbsPos); }	\
 };
 
 #endif
diff --git a/svtools/inc/svtools/ttprops.hxx b/svtools/inc/svtools/ttprops.hxx
index 15f080b9aa3d..e7b2eac64f7a 100644
--- a/svtools/inc/svtools/ttprops.hxx
+++ b/svtools/inc/svtools/ttprops.hxx
@@ -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
@@ -37,30 +37,30 @@ class SfxPoolItem;
 class Bitmap;
 
 // Defines zur Steuerung der Ausf�hrung von Slots
-#define EXECUTE_NO                  0
-#define EXECUTE_POSSIBLE            1
-#define EXECUTE_YES                 2
-#define EXECUTEMODE_ASYNCHRON       1
-#define EXECUTEMODE_DIALOGASYNCHRON 2
+#define EXECUTE_NO					0
+#define EXECUTE_POSSIBLE			1
+#define EXECUTE_YES					2
+#define EXECUTEMODE_ASYNCHRON		1
+#define EXECUTEMODE_DIALOGASYNCHRON	2
 
-#define SFX_USE_BINDINGS        0x8000
+#define SFX_USE_BINDINGS		0x8000
 
 // Property Requests(PR)
-#define TT_PR_ONCE      0x100
+#define TT_PR_ONCE		0x100
 
-#define TT_PR_SLOTS     ( 0x001 | TT_PR_ONCE )
+#define TT_PR_SLOTS		( 0x001 | TT_PR_ONCE )
 #define TT_PR_DISPATCHER (0x002 )
-#define TT_PR_IMG       ( 0x004 )
+#define TT_PR_IMG		( 0x004 )
 
-#define TT_PR_ERR_NODISPATCHER  01
-#define TT_PR_ERR_NOEXECUTE     02
+#define TT_PR_ERR_NODISPATCHER	01
+#define TT_PR_ERR_NOEXECUTE		02
 
-/// To detect inconsistencies
-#define TT_PROPERTIES_VERSION   1
+///	To detect inconsistencies
+#define TT_PROPERTIES_VERSION	1
 
 class SVT_DLLPUBLIC TTProperties : public ApplicationProperty
 {
-    USHORT nDonePRs;                    // Verwaltung f�r die Properties, die nur einmal gerufen werden mussen.
+    USHORT nDonePRs;					// Verwaltung f�r die Properties, die nur einmal gerufen werden mussen.
     SVT_DLLPRIVATE BOOL RequestProperty( USHORT nRequest );
 
     BOOL HasSlots(){ return nPropertyVersion == TT_PROPERTIES_VERSION; }
@@ -99,7 +99,7 @@ public:
     ULONG nSidReferer;
 
     USHORT nActualPR;
-    USHORT nPropertyVersion;        // Wird bei jedem call gesetzt.
+    USHORT nPropertyVersion;		// Wird bei jedem call gesetzt.
 };
 
 #endif // _SVTOOLS_TTPROPS_HXX
diff --git a/svtools/inc/svtools/unitconv.hxx b/svtools/inc/svtools/unitconv.hxx
index becc41543396..ddbe8dba8460 100644
--- a/svtools/inc/svtools/unitconv.hxx
+++ b/svtools/inc/svtools/unitconv.hxx
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2008 by Sun Microsystems, Inc.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -43,71 +43,71 @@ typedef long (*FUNC_CONVERT)(long);
 
 // Functions -------------------------------------------------------------
 
-SVT_DLLPUBLIC void      SetFieldUnit( MetricField& rCtrl, FieldUnit eUnit, BOOL bAll = FALSE );
-SVT_DLLPUBLIC void      SetFieldUnit( MetricBox& rCtrl, FieldUnit eUnit, BOOL bAll = FALSE );
+SVT_DLLPUBLIC void 		SetFieldUnit( MetricField& rCtrl, FieldUnit eUnit, BOOL bAll = FALSE );
+SVT_DLLPUBLIC void 		SetFieldUnit( MetricBox& rCtrl, FieldUnit eUnit, BOOL bAll = FALSE );
 
-SVT_DLLPUBLIC long      CalcToUnit( float nIn, SfxMapUnit eUnit );
-SVT_DLLPUBLIC long      CalcToPoint( long nIn, SfxMapUnit eUnit, USHORT nFaktor );
+SVT_DLLPUBLIC long 		CalcToUnit( float nIn, SfxMapUnit eUnit );
+SVT_DLLPUBLIC long 		CalcToPoint( long nIn, SfxMapUnit eUnit, USHORT nFaktor );
 
-SVT_DLLPUBLIC long      ItemToControl( long nIn, SfxMapUnit eItem, SfxFieldUnit eCtrl );
-SVT_DLLPUBLIC long      ControlToItem( long nIn, SfxFieldUnit eCtrl, SfxMapUnit eItem );
+SVT_DLLPUBLIC long		ItemToControl( long nIn, SfxMapUnit eItem, SfxFieldUnit eCtrl );
+SVT_DLLPUBLIC long		ControlToItem( long nIn, SfxFieldUnit eCtrl, SfxMapUnit eItem );
 
-SVT_DLLPUBLIC FieldUnit MapToFieldUnit( const SfxMapUnit eUnit );
-SVT_DLLPUBLIC MapUnit   FieldToMapUnit( const SfxFieldUnit eUnit );
+SVT_DLLPUBLIC FieldUnit	MapToFieldUnit( const SfxMapUnit eUnit );
+SVT_DLLPUBLIC MapUnit	FieldToMapUnit( const SfxFieldUnit eUnit );
 
-SVT_DLLPUBLIC long      ConvertValueToMap( long nVal, SfxMapUnit eUnit );
-SVT_DLLPUBLIC long      ConvertValueToUnit( long nVal, SfxMapUnit eUnit );
+SVT_DLLPUBLIC long		ConvertValueToMap( long nVal, SfxMapUnit eUnit );
+SVT_DLLPUBLIC long		ConvertValueToUnit( long nVal, SfxMapUnit eUnit );
 
-SVT_DLLPUBLIC void      SetMetricValue( MetricField& rField, long lCoreValue, SfxMapUnit eUnit );
-SVT_DLLPUBLIC long      GetCoreValue( const MetricField& rField, SfxMapUnit eUnit );
+SVT_DLLPUBLIC void 		SetMetricValue( MetricField& rField, long lCoreValue, SfxMapUnit eUnit );
+SVT_DLLPUBLIC long 		GetCoreValue( const MetricField& rField, SfxMapUnit eUnit );
 
-SVT_DLLPUBLIC long  PointToTwips( long nIn );
+SVT_DLLPUBLIC long 	PointToTwips( long nIn );
 
 #if 0
 // to Twips
-SVT_DLLPUBLIC long  CMToTwips( long nIn );
-SVT_DLLPUBLIC long  MMToTwips( long nIn );
-SVT_DLLPUBLIC long  InchToTwips( long nIn );
-SVT_DLLPUBLIC long  PicaToTwips( long nIn );
+SVT_DLLPUBLIC long 	CMToTwips( long nIn );
+SVT_DLLPUBLIC long 	MMToTwips( long nIn );
+SVT_DLLPUBLIC long 	InchToTwips( long nIn );
+SVT_DLLPUBLIC long 	PicaToTwips( long nIn );
 
 // to CM
-SVT_DLLPUBLIC long  TwipsToCM( long nIn );
-SVT_DLLPUBLIC long  InchToCM( long nIn );
-SVT_DLLPUBLIC long  MMToCM( long nIn );
-SVT_DLLPUBLIC long  PointToCM( long nIn );
-SVT_DLLPUBLIC long  PicaToCM( long nIn );
+SVT_DLLPUBLIC long 	TwipsToCM( long nIn );
+SVT_DLLPUBLIC long 	InchToCM( long nIn );
+SVT_DLLPUBLIC long 	MMToCM( long nIn );
+SVT_DLLPUBLIC long 	PointToCM( long nIn );
+SVT_DLLPUBLIC long	PicaToCM( long nIn );
 
 // to MM
-SVT_DLLPUBLIC long  TwipsToMM( long nIn );
-SVT_DLLPUBLIC long  CMToMM( long nIn );
-SVT_DLLPUBLIC long  InchToMM( long nIn );
-SVT_DLLPUBLIC long  PointToMM( long nIn );
-SVT_DLLPUBLIC long  PicaToMM( long nIn );
+SVT_DLLPUBLIC long 	TwipsToMM( long nIn );
+SVT_DLLPUBLIC long 	CMToMM( long nIn );
+SVT_DLLPUBLIC long 	InchToMM( long nIn );
+SVT_DLLPUBLIC long 	PointToMM( long nIn );
+SVT_DLLPUBLIC long 	PicaToMM( long nIn );
 
 // to Inch
-SVT_DLLPUBLIC long  TwipsToInch(long nIn );
-SVT_DLLPUBLIC long  CMToInch(long nIn );
-SVT_DLLPUBLIC long  MMToInch(long nIn );
-SVT_DLLPUBLIC long  PointToInch(long nIn );
-SVT_DLLPUBLIC long  PicaToInch(long nIn );
+SVT_DLLPUBLIC long 	TwipsToInch(long nIn );
+SVT_DLLPUBLIC long 	CMToInch(long nIn );
+SVT_DLLPUBLIC long 	MMToInch(long nIn );
+SVT_DLLPUBLIC long 	PointToInch(long nIn );
+SVT_DLLPUBLIC long	PicaToInch(long nIn );
 
 // to Point
-SVT_DLLPUBLIC long  TwipsToPoint(long nIn );
-SVT_DLLPUBLIC long  InchToPoint(long nIn );
-SVT_DLLPUBLIC long  CMToPoint(long nIn );
-SVT_DLLPUBLIC long  MMToPoint(long nIn );
-SVT_DLLPUBLIC long  PicaToPoint(long nIn );
+SVT_DLLPUBLIC long 	TwipsToPoint(long nIn );
+SVT_DLLPUBLIC long 	InchToPoint(long nIn );
+SVT_DLLPUBLIC long 	CMToPoint(long nIn );
+SVT_DLLPUBLIC long 	MMToPoint(long nIn );
+SVT_DLLPUBLIC long 	PicaToPoint(long nIn );
 
 // To Pica
-long    TwipsToPica(long nIn );
-long    InchToPica(long nIn );
-long    PointToPica(long nIn );
-long    CMToPica(long nIn );
-long    MMToPica(long nIn );
+long 	TwipsToPica(long nIn );
+long 	InchToPica(long nIn );
+long 	PointToPica(long nIn );
+long 	CMToPica(long nIn );
+long	MMToPica(long nIn );
 
 #endif
 
-SVT_DLLPUBLIC long  TransformMetric( long nVal, FieldUnit aOld, FieldUnit aNew );
+SVT_DLLPUBLIC long 	TransformMetric( long nVal, FieldUnit aOld, FieldUnit aNew );
 
 #endif
 
diff --git a/svtools/inc/svtools/urlcontrol.hxx b/svtools/inc/svtools/urlcontrol.hxx
index ce73573d5e71..19df8f5e60d5 100644
--- a/svtools/inc/svtools/urlcontrol.hxx
+++ b/svtools/inc/svtools/urlcontrol.hxx
@@ -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
@@ -42,19 +42,19 @@ namespace svt
     class SVT_DLLPUBLIC OFileURLControl : public SvtURLBox
     {
     protected:
-        String      m_sPreservedText;
+        String		m_sPreservedText;
 
     public:
         OFileURLControl(Window* _pParent);
         OFileURLControl(Window* _pParent, const ResId& _rId);
 
     protected:
-        virtual long        PreNotify( NotifyEvent& rNEvt );
-        virtual long        Notify( NotifyEvent& rNEvt );
+        virtual long		PreNotify( NotifyEvent& rNEvt );
+        virtual long		Notify( NotifyEvent& rNEvt );
     };
 
 //.........................................................................
-}   // namespace svt
+}	// namespace svt
 //.........................................................................
 
 #endif // SVTOOLS_URLCONTROL_HXX
diff --git a/svtools/inc/svtools/valueset.hxx b/svtools/inc/svtools/valueset.hxx
index 0937d824daf0..57f71339bbbd 100644
--- a/svtools/inc/svtools/valueset.hxx
+++ b/svtools/inc/svtools/valueset.hxx
@@ -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,24 +79,24 @@ class ListBox
 
 WinBits
 
-WB_RADIOSEL         Wenn dieses Flag gesetzt wird, wird im ValueSet die
+WB_RADIOSEL 		Wenn dieses Flag gesetzt wird, wird im ValueSet die
                     Selektion so gezeichnet, wie bei einem ImageRadioButton.
                     Dies ist jedoch nur sinnvoll, wenn die Images min. 8 Pixel
                     in horizontaler und vertikaler Richtung kleiner sind
                     als der Item-Bereich, WB_DOUBLEBORDER gesetzt ist und
                     als Color COL_WINDOWWORKSPACE gesetzt ist.
-WB_FLATVALUESET     Flat Look (if you set WB_ITEMBORDER or WB_DOUBLEBORDER,
+WB_FLATVALUESET 	Flat Look (if you set WB_ITEMBORDER or WB_DOUBLEBORDER,
                     then you get extra border space, but the Borders
                     aren't painted),
-WB_ITEMBORDER       Die Items werden umrandet
-WB_DOUBLEBORDER     Die Items werden doppelt umrandet. Zusaetzlich muss
+WB_ITEMBORDER		Die Items werden umrandet
+WB_DOUBLEBORDER 	Die Items werden doppelt umrandet. Zusaetzlich muss
                     WB_ITEMBORDER gesetzt werden, ansonsten hat dieses
                     WinBit keine Auswirkung. Gebraucht wird dies, wenn man
                     Items mit weissem Hintergrund hat, da sonst der 3D Effekt
                     nicht mehr sichtbar ist.
-WB_NAMEFIELD        Es gibt ein Namensfeld, wo der Name eines Items
+WB_NAMEFIELD		Es gibt ein Namensfeld, wo der Name eines Items
                     mit angezeigt wird
-WB_NONEFIELD        Es gibt ein NoSelection-Feld. Dieses kann selektiert
+WB_NONEFIELD		Es gibt ein NoSelection-Feld. Dieses kann selektiert
                     werden, wenn bei SelectItem 0 uebergeben wird. Bei
                     GetSelectItemId() wird entsprechend 0 zurueckgegeben
                     wenn dieses Feld selektiert ist, bzw. keines selektiert
@@ -104,14 +104,14 @@ WB_NONEFIELD        Es gibt ein NoSelection-Feld. Dieses kann selektiert
                     gesetzt wurde, bzw. keinen, wenn kein Text gesetzt
                     wurde. Mit SetNoSelection() kann die Selektion ganz
                     ausgeschaltet werden.
-WB_VSCROLL          Es wird immer ein ScrollBar angezeigt. Wenn dieses Flag
+WB_VSCROLL			Es wird immer ein ScrollBar angezeigt. Wenn dieses Flag
                     gesetzt wird, muss auch immer mit SetLineCount() die
                     sichtbare Anzahl der Zeilen eingestellt werden.
-WB_BORDER           Um das Fenster wird ein Border gezeichnet.
-WB_NOPOINTERFOCUS   Der Focus wird sich nicht geholt, wenn mit der Maus in
+WB_BORDER			Um das Fenster wird ein Border gezeichnet.
+WB_NOPOINTERFOCUS	Der Focus wird sich nicht geholt, wenn mit der Maus in
                     das Control geklickt wird.
-WB_TABSTOP          Mit der TabTaste kann in das ValueSet gesprungen werden.
-WB_NOTABSTOP        Mit der TabTaste kann nicht in das ValueSet gesprungen
+WB_TABSTOP			Mit der TabTaste kann in das ValueSet gesprungen werden.
+WB_NOTABSTOP		Mit der TabTaste kann nicht in das ValueSet gesprungen
                     werden.
 WB_NO_DIRECTSELECT  Cursor travelling doesn't call select immediately. To
                     execute the selection <RETURN> has to be pressed.
@@ -202,7 +202,7 @@ wird, sollte in jedem Fall HideDropPos() gerufen werden.
 Mit SetItemBits() koennen Flags an einem Item gesetzt werden. Folgende
 Flags sind zur Zeit vorgesehen:
 
-VIB_NODOUBLECLICK   Jeder Klick fuehrt zu einer Select-Aktion. Der
+VIB_NODOUBLECLICK	Jeder Klick fuehrt zu einer Select-Aktion. Der
                     Doppelklick-Handler wird in diesem Fall nie
                     gerufen.
 
@@ -218,94 +218,94 @@ gewuenschten WinBits (vor Show) mit SetStyle() gesetzt werden.
 // - ValueSet-Item-Typen -
 // -----------------------
 
-#define VIB_NODOUBLECLICK       ((USHORT)0x0080)
+#define VIB_NODOUBLECLICK		((USHORT)0x0080)
 
 // ------------------
 // - ValueSet-Typen -
 // ------------------
 
-#define WB_RADIOSEL             ((WinBits)0x00008000)
-#define WB_ITEMBORDER           ((WinBits)0x00010000)
-#define WB_DOUBLEBORDER         ((WinBits)0x00020000)
-#define WB_NAMEFIELD            ((WinBits)0x00040000)
-#define WB_NONEFIELD            ((WinBits)0x00080000)
-#define WB_FLATVALUESET         ((WinBits)0x02000000)
+#define WB_RADIOSEL 			((WinBits)0x00008000)
+#define WB_ITEMBORDER			((WinBits)0x00010000)
+#define WB_DOUBLEBORDER 		((WinBits)0x00020000)
+#define WB_NAMEFIELD			((WinBits)0x00040000)
+#define WB_NONEFIELD			((WinBits)0x00080000)
+#define WB_FLATVALUESET 		((WinBits)0x02000000)
 #define WB_NO_DIRECTSELECT      ((WinBits)0x04000000)
-#define WB_MENUSTYLEVALUESET    ((WinBits)0x08000000)
+#define WB_MENUSTYLEVALUESET	((WinBits)0x08000000)
 
 // ------------
 // - ValueSet -
 // ------------
 
-#define VALUESET_APPEND         ((USHORT)0xFFFF)
-#define VALUESET_ITEM_NOTFOUND  ((USHORT)0xFFFF)
+#define VALUESET_APPEND 		((USHORT)0xFFFF)
+#define VALUESET_ITEM_NOTFOUND	((USHORT)0xFFFF)
 
 class SVT_DLLPUBLIC ValueSet : public Control
 {
 private:
 
-    VirtualDevice   maVirDev;
-    Timer           maTimer;
+    VirtualDevice	maVirDev;
+    Timer			maTimer;
     ValueSet_Impl*  mpImpl;
-    ValueSetItem*   mpNoneItem;
-    ScrollBar*      mpScrBar;
-    long            mnTextOffset;
-    long            mnVisLines;
-    long            mnLines;
-    long            mnUserItemWidth;
-    long            mnUserItemHeight;
-    USHORT          mnOldItemId;
-    USHORT          mnSelItemId;
-    USHORT          mnHighItemId;
-    USHORT          mnDropPos;
-    USHORT          mnCols;
-    USHORT          mnCurCol;
-    USHORT          mnUserCols;
-    USHORT          mnUserVisLines;
-    USHORT          mnFirstLine;
-    USHORT          mnSpacing;
-    USHORT          mnFrameStyle;
-    BOOL            mbFormat;
-    BOOL            mbHighlight;
-    BOOL            mbSelection;
-    BOOL            mbNoSelection;
-    BOOL            mbDrawSelection;
-    BOOL            mbBlackSel;
-    BOOL            mbDoubleSel;
-    BOOL            mbScroll;
-    BOOL            mbDropPos;
-    BOOL            mbFullMode;
-    Color           maColor;
-    Link            maDoubleClickHdl;
-    Link            maSelectHdl;
+    ValueSetItem*	mpNoneItem;
+    ScrollBar*		mpScrBar;
+    long			mnTextOffset;
+    long			mnVisLines;
+    long			mnLines;
+    long			mnUserItemWidth;
+    long			mnUserItemHeight;
+    USHORT			mnOldItemId;
+    USHORT			mnSelItemId;
+    USHORT			mnHighItemId;
+    USHORT			mnDropPos;
+    USHORT			mnCols;
+    USHORT			mnCurCol;
+    USHORT			mnUserCols;
+    USHORT			mnUserVisLines;
+    USHORT			mnFirstLine;
+    USHORT			mnSpacing;
+    USHORT			mnFrameStyle;
+    BOOL			mbFormat;
+    BOOL			mbHighlight;
+    BOOL			mbSelection;
+    BOOL			mbNoSelection;
+    BOOL			mbDrawSelection;
+    BOOL			mbBlackSel;
+    BOOL			mbDoubleSel;
+    BOOL			mbScroll;
+    BOOL			mbDropPos;
+    BOOL			mbFullMode;
+    Color			maColor;
+    Link			maDoubleClickHdl;
+    Link			maSelectHdl;
 
 #ifdef _SV_VALUESET_CXX
     friend class ValueSetAcc;
     friend class ValueItemAcc;
     using Control::ImplInitSettings;
     using Window::ImplInit;
-    SVT_DLLPRIVATE void         ImplInit();
-    SVT_DLLPRIVATE void         ImplInitSettings( BOOL bFont, BOOL bForeground, BOOL bBackground );
-    SVT_DLLPRIVATE void         ImplInitScrollBar();
+    SVT_DLLPRIVATE void			ImplInit();
+    SVT_DLLPRIVATE void			ImplInitSettings( BOOL bFont, BOOL bForeground, BOOL bBackground );
+    SVT_DLLPRIVATE void			ImplInitScrollBar();
     SVT_DLLPRIVATE void            ImplDeleteItems();
-    SVT_DLLPRIVATE void         ImplFormatItem( ValueSetItem* pItem );
-    SVT_DLLPRIVATE void         ImplDrawItemText( const XubString& rStr );
-    SVT_DLLPRIVATE void         ImplDrawSelect();
-    SVT_DLLPRIVATE void         ImplHideSelect( USHORT nItemId );
-    SVT_DLLPRIVATE void         ImplHighlightItem( USHORT nItemId, BOOL bIsSelection = TRUE );
-    SVT_DLLPRIVATE void         ImplDrawDropPos( BOOL bShow );
-    SVT_DLLPRIVATE void         ImplDraw();
+    SVT_DLLPRIVATE void			ImplFormatItem( ValueSetItem* pItem );
+    SVT_DLLPRIVATE void			ImplDrawItemText( const XubString& rStr );
+    SVT_DLLPRIVATE void			ImplDrawSelect();
+    SVT_DLLPRIVATE void			ImplHideSelect( USHORT nItemId );
+    SVT_DLLPRIVATE void			ImplHighlightItem( USHORT nItemId, BOOL bIsSelection = TRUE );
+    SVT_DLLPRIVATE void			ImplDrawDropPos( BOOL bShow );
+    SVT_DLLPRIVATE void			ImplDraw();
     using Window::ImplScroll;
-    SVT_DLLPRIVATE BOOL         ImplScroll( const Point& rPos );
-    SVT_DLLPRIVATE USHORT           ImplGetItem( const Point& rPoint, BOOL bMove = FALSE ) const;
-    SVT_DLLPRIVATE ValueSetItem*    ImplGetItem( USHORT nPos );
-    SVT_DLLPRIVATE ValueSetItem*    ImplGetFirstItem();
+    SVT_DLLPRIVATE BOOL			ImplScroll( const Point& rPos );
+    SVT_DLLPRIVATE USHORT			ImplGetItem( const Point& rPoint, BOOL bMove = FALSE ) const;
+    SVT_DLLPRIVATE ValueSetItem*	ImplGetItem( USHORT nPos );
+    SVT_DLLPRIVATE ValueSetItem*	ImplGetFirstItem();
     SVT_DLLPRIVATE USHORT          ImplGetVisibleItemCount() const;
-    SVT_DLLPRIVATE ValueSetItem*    ImplGetVisibleItem( USHORT nVisiblePos );
+    SVT_DLLPRIVATE ValueSetItem*	ImplGetVisibleItem( USHORT nVisiblePos );
     SVT_DLLPRIVATE void            ImplFireAccessibleEvent( short nEventId, const ::com::sun::star::uno::Any& rOldValue, const ::com::sun::star::uno::Any& rNewValue );
     SVT_DLLPRIVATE BOOL            ImplHasAccessibleListeners();
-    SVT_DLLPRIVATE void         ImplTracking( const Point& rPos, BOOL bRepeat );
-    SVT_DLLPRIVATE void         ImplEndTracking( const Point& rPos, BOOL bCancel );
+    SVT_DLLPRIVATE void			ImplTracking( const Point& rPos, BOOL bRepeat );
+    SVT_DLLPRIVATE void			ImplEndTracking( const Point& rPos, BOOL bCancel );
                     DECL_DLLPRIVATE_LINK( ImplScrollHdl, ScrollBar* );
                     DECL_DLLPRIVATE_LINK( ImplTimerHdl, Timer* );
 #endif
@@ -316,9 +316,9 @@ private:
 
 protected:
 
-    BOOL            StartDrag( const CommandEvent& rCEvt, Region& rRegion );
-    USHORT          ShowDropPos( const Point& rPos );
-    void            HideDropPos();
+    BOOL			StartDrag( const CommandEvent& rCEvt, Region& rRegion );
+    USHORT			ShowDropPos( const Point& rPos );
+    void			HideDropPos();
 
 protected:
 
@@ -329,105 +329,105 @@ public:
                     ValueSet( Window* pParent, const ResId& rResId, bool bDisableTransientChildren = false );
                     ~ValueSet();
 
-    virtual void    MouseButtonDown( const MouseEvent& rMEvt );
-    virtual void    MouseButtonUp( const MouseEvent& rMEvt );
-    virtual void    MouseMove( const MouseEvent& rMEvt );
-    virtual void    Tracking( const TrackingEvent& rMEvt );
-    virtual void    KeyInput( const KeyEvent& rKEvt );
-    virtual void    Command( const CommandEvent& rCEvt );
-    virtual void    Paint( const Rectangle& rRect );
-    virtual void    GetFocus();
-    virtual void    LoseFocus();
-    virtual void    Resize();
-    virtual void    RequestHelp( const HelpEvent& rHEvt );
-    virtual void    StateChanged( StateChangedType nStateChange );
-    virtual void    DataChanged( const DataChangedEvent& rDCEvt );
-
-    virtual void    Select();
-    virtual void    DoubleClick();
-    virtual void    UserDraw( const UserDrawEvent& rUDEvt );
-
-    void            InsertItem( USHORT nItemId, const Image& rImage,
+    virtual void	MouseButtonDown( const MouseEvent& rMEvt );
+    virtual void	MouseButtonUp( const MouseEvent& rMEvt );
+    virtual void	MouseMove( const MouseEvent& rMEvt );
+    virtual void	Tracking( const TrackingEvent& rMEvt );
+    virtual void	KeyInput( const KeyEvent& rKEvt );
+    virtual void	Command( const CommandEvent& rCEvt );
+    virtual void	Paint( const Rectangle& rRect );
+    virtual void	GetFocus();
+    virtual void	LoseFocus();
+    virtual void	Resize();
+    virtual void	RequestHelp( const HelpEvent& rHEvt );
+    virtual void	StateChanged( StateChangedType nStateChange );
+    virtual void	DataChanged( const DataChangedEvent& rDCEvt );
+
+    virtual void	Select();
+    virtual void	DoubleClick();
+    virtual void	UserDraw( const UserDrawEvent& rUDEvt );
+
+    void			InsertItem( USHORT nItemId, const Image& rImage,
                                 USHORT nPos = VALUESET_APPEND );
-    void            InsertItem( USHORT nItemId, const Color& rColor,
+    void			InsertItem( USHORT nItemId, const Color& rColor,
                                 USHORT nPos = VALUESET_APPEND );
-    void            InsertItem( USHORT nItemId,
+    void			InsertItem( USHORT nItemId,
                                 const Image& rImage, const XubString& rStr,
                                 USHORT nPos = VALUESET_APPEND );
-    void            InsertItem( USHORT nItemId,
+    void			InsertItem( USHORT nItemId,
                                 const Color& rColor, const XubString& rStr,
                                 USHORT nPos = VALUESET_APPEND );
-    void            InsertItem( USHORT nItemId,
+    void			InsertItem( USHORT nItemId,
                                 USHORT nPos = VALUESET_APPEND );
-    void            InsertSpace( USHORT nItemId,
+    void			InsertSpace( USHORT nItemId,
                                  USHORT nPos = VALUESET_APPEND );
-    void            RemoveItem( USHORT nItemId );
-
-    void            CopyItems( const ValueSet& rValueSet );
-    void            Clear();
-
-    USHORT          GetItemCount() const;
-    USHORT          GetItemPos( USHORT nItemId ) const;
-    USHORT          GetItemId( USHORT nPos ) const;
-    USHORT          GetItemId( const Point& rPos ) const;
-    Rectangle       GetItemRect( USHORT nItemId ) const;
-
-    void            EnableFullItemMode( BOOL bFullMode = TRUE );
-    BOOL            IsFullItemModeEnabled() const { return mbFullMode; }
-    void            SetColCount( USHORT nNewCols = 1 );
-    USHORT          GetColCount() const { return mnUserCols; }
-    void            SetLineCount( USHORT nNewLines = 0 );
-    USHORT          GetLineCount() const { return mnUserVisLines; }
-    void            SetItemWidth( long nItemWidth = 0 );
-    long            GetItemWidth() const { return mnUserItemWidth; }
-    void            SetItemHeight( long nLineHeight = 0 );
-    long            GetItemHeight() const { return mnUserItemHeight; }
-    void            SetFirstLine( USHORT nNewLine = 0 );
-    USHORT          GetFirstLine() const { return mnFirstLine; }
-
-    void            SelectItem( USHORT nItemId );
-    USHORT          GetSelectItemId() const { return mnSelItemId; }
-    BOOL            IsItemSelected( USHORT nItemId ) const
+    void			RemoveItem( USHORT nItemId );
+
+    void			CopyItems( const ValueSet& rValueSet );
+    void			Clear();
+
+    USHORT			GetItemCount() const;
+    USHORT			GetItemPos( USHORT nItemId ) const;
+    USHORT			GetItemId( USHORT nPos ) const;
+    USHORT			GetItemId( const Point& rPos ) const;
+    Rectangle		GetItemRect( USHORT nItemId ) const;
+
+    void			EnableFullItemMode( BOOL bFullMode = TRUE );
+    BOOL			IsFullItemModeEnabled() const { return mbFullMode; }
+    void			SetColCount( USHORT nNewCols = 1 );
+    USHORT			GetColCount() const { return mnUserCols; }
+    void			SetLineCount( USHORT nNewLines = 0 );
+    USHORT			GetLineCount() const { return mnUserVisLines; }
+    void			SetItemWidth( long nItemWidth = 0 );
+    long			GetItemWidth() const { return mnUserItemWidth; }
+    void			SetItemHeight( long nLineHeight = 0 );
+    long			GetItemHeight() const { return mnUserItemHeight; }
+    void			SetFirstLine( USHORT nNewLine = 0 );
+    USHORT			GetFirstLine() const { return mnFirstLine; }
+
+    void			SelectItem( USHORT nItemId );
+    USHORT			GetSelectItemId() const { return mnSelItemId; }
+    BOOL			IsItemSelected( USHORT nItemId ) const
                         { return ((!mbNoSelection && (nItemId == mnSelItemId)) ? TRUE : FALSE); }
-    void            SetNoSelection();
-    BOOL            IsNoSelection() const { return mbNoSelection; }
-
-    void            SetItemBits( USHORT nItemId, USHORT nBits );
-    USHORT          GetItemBits( USHORT nItemId ) const;
-    void            SetItemImage( USHORT nItemId, const Image& rImage );
-    Image           GetItemImage( USHORT nItemId ) const;
-    void            SetItemColor( USHORT nItemId, const Color& rColor );
-    Color           GetItemColor( USHORT nItemId ) const;
-    void            SetItemData( USHORT nItemId, void* pData );
-    void*           GetItemData( USHORT nItemId ) const;
-    void            SetItemText( USHORT nItemId, const XubString& rStr );
-    XubString       GetItemText( USHORT nItemId ) const;
-    void            SetColor( const Color& rColor );
-    void            SetColor() { SetColor( Color( COL_TRANSPARENT ) ); }
-    Color           GetColor() const { return maColor; }
-    BOOL            IsColor() const { return maColor.GetTransparency() == 0; }
-
-    void            SetExtraSpacing( USHORT nNewSpacing );
-    USHORT          GetExtraSpacing() { return mnSpacing; }
-
-    void            Format();
-
-    void            StartSelection();
-    void            EndSelection();
-
-    Size            CalcWindowSizePixel( const Size& rItemSize,
+    void			SetNoSelection();
+    BOOL			IsNoSelection() const { return mbNoSelection; }
+
+    void			SetItemBits( USHORT nItemId, USHORT nBits );
+    USHORT			GetItemBits( USHORT nItemId ) const;
+    void			SetItemImage( USHORT nItemId, const Image& rImage );
+    Image			GetItemImage( USHORT nItemId ) const;
+    void			SetItemColor( USHORT nItemId, const Color& rColor );
+    Color			GetItemColor( USHORT nItemId ) const;
+    void			SetItemData( USHORT nItemId, void* pData );
+    void*			GetItemData( USHORT nItemId ) const;
+    void			SetItemText( USHORT nItemId, const XubString& rStr );
+    XubString		GetItemText( USHORT nItemId ) const;
+    void			SetColor( const Color& rColor );
+    void			SetColor() { SetColor( Color( COL_TRANSPARENT ) ); }
+    Color			GetColor() const { return maColor; }
+    BOOL			IsColor() const { return maColor.GetTransparency() == 0; }
+
+    void			SetExtraSpacing( USHORT nNewSpacing );
+    USHORT			GetExtraSpacing() { return mnSpacing; }
+
+    void			Format();
+
+    void			StartSelection();
+    void			EndSelection();
+
+    Size			CalcWindowSizePixel( const Size& rItemSize,
                                          USHORT nCalcCols = 0,
                                          USHORT nCalcLines = 0 );
-    Size            CalcItemSizePixel( const Size& rSize, BOOL bOut = TRUE ) const;
-    long            GetScrollWidth() const;
+    Size			CalcItemSizePixel( const Size& rSize, BOOL bOut = TRUE ) const;
+    long			GetScrollWidth() const;
 
-    void            SetSelectHdl( const Link& rLink ) { maSelectHdl = rLink; }
-    const Link&     GetSelectHdl() const { return maSelectHdl; }
-    void            SetDoubleClickHdl( const Link& rLink ) { maDoubleClickHdl = rLink; }
-    const Link&     GetDoubleClickHdl() const { return maDoubleClickHdl; }
+    void			SetSelectHdl( const Link& rLink ) { maSelectHdl = rLink; }
+    const Link& 	GetSelectHdl() const { return maSelectHdl; }
+    void			SetDoubleClickHdl( const Link& rLink ) { maDoubleClickHdl = rLink; }
+    const Link& 	GetDoubleClickHdl() const { return maDoubleClickHdl; }
 
-    void            SetHighlightHdl( const Link& rLink );
-    const Link&     GetHighlightHdl() const;
+    void			SetHighlightHdl( const Link& rLink );
+    const Link& 	GetHighlightHdl() const;
 
 private:
     /** Determine whether RTL (right to left writing) is active.  For this
@@ -442,4 +442,4 @@ private:
     SVT_DLLPRIVATE bool IsRTLActive (void);
 };
 
-#endif  // _VALUESET_HXX
+#endif	// _VALUESET_HXX
diff --git a/svtools/inc/svtools/wizardmachine.hxx b/svtools/inc/svtools/wizardmachine.hxx
index 02562ac4bb63..eb2e981a26a4 100644
--- a/svtools/inc/svtools/wizardmachine.hxx
+++ b/svtools/inc/svtools/wizardmachine.hxx
@@ -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
@@ -43,14 +43,14 @@ namespace svt
 
 // wizard buttons
 #define WZB_NONE                0x0000
-#define WZB_NEXT                0x0001
-#define WZB_PREVIOUS            0x0002
-#define WZB_FINISH              0x0004
-#define WZB_CANCEL              0x0008
-#define WZB_HELP                0x0010
+#define WZB_NEXT				0x0001
+#define WZB_PREVIOUS			0x0002
+#define WZB_FINISH				0x0004
+#define WZB_CANCEL				0x0008
+#define WZB_HELP				0x0010
 
 // wizard states
-#define WZS_INVALID_STATE       ((WizardState)-1)
+#define WZS_INVALID_STATE		((WizardState)-1)
 
     //=====================================================================
     //= WizardTypes
@@ -77,12 +77,12 @@ namespace svt
         // We may have situations where the next page depends on the state of the current, which needs
         // to be committed for this.
         // So initializePage and commitPage are designated to initialitzing/committing data on the page.
-        virtual void        initializePage() = 0;
-        virtual sal_Bool    commitPage( WizardTypes::CommitPageReason _eReason ) = 0;
+        virtual void		initializePage() = 0;
+        virtual sal_Bool	commitPage( WizardTypes::CommitPageReason _eReason ) = 0;
 
         /** determines whether or not it is allowed to advance to a next page
 
-            You should make this dependent on the current state of the page only, not on
+            You should make this dependent on the current state of the page only, not on 
             states on other pages of the whole dialog.
 
             The default implementation always returns <TRUE/>.
@@ -99,7 +99,7 @@ namespace svt
     class SVT_DLLPUBLIC OWizardPage : public TabPage, public IWizardPageController
     {
     private:
-        WizardPageImplData*     m_pImpl;
+        WizardPageImplData*		m_pImpl;
 
     public:
         /** @param _pParent
@@ -111,13 +111,13 @@ namespace svt
         ~OWizardPage();
 
         // IWizardPageController overridables
-        virtual void        initializePage();
-        virtual sal_Bool    commitPage( WizardTypes::CommitPageReason _eReason );
+        virtual void		initializePage();
+        virtual sal_Bool	commitPage( WizardTypes::CommitPageReason _eReason );
         virtual bool        canAdvance() const;
 
     protected:
         // TabPage overridables
-        virtual void    ActivatePage();
+        virtual void	ActivatePage();
 
         /** updates the travel-related UI elements of the OWizardMachine we live in (if any)
 
@@ -151,10 +151,10 @@ namespace svt
     {
     private:
         // restrict access to some aspects of our base class
-        SVT_DLLPRIVATE void             AddPage( TabPage* pPage ) { WizardDialog::AddPage(pPage); }
-        SVT_DLLPRIVATE void             RemovePage( TabPage* pPage ) { WizardDialog::RemovePage(pPage); }
-        SVT_DLLPRIVATE void             SetPage( USHORT nLevel, TabPage* pPage ) { WizardDialog::SetPage(nLevel, pPage); }
-        //  TabPage*            GetPage( USHORT nLevel ) const { return WizardDialog::GetPage(nLevel); }
+        SVT_DLLPRIVATE void				AddPage( TabPage* pPage ) { WizardDialog::AddPage(pPage); }
+        SVT_DLLPRIVATE void				RemovePage( TabPage* pPage ) { WizardDialog::RemovePage(pPage); }
+        SVT_DLLPRIVATE void				SetPage( USHORT nLevel, TabPage* pPage ) { WizardDialog::SetPage(nLevel, pPage); }
+        //	TabPage*			GetPage( USHORT nLevel ) const { return WizardDialog::GetPage(nLevel); }
         // TODO: probably the complete page handling (next, previous etc.) should be prohibited ...
 
         // IMPORTANT:
@@ -163,11 +163,11 @@ namespace svt
         // So use the travelXXX methods if you need to travel
 
     protected:
-        OKButton*       m_pFinish;
-        CancelButton*   m_pCancel;
-        PushButton*     m_pNextPage;
-        PushButton*     m_pPrevPage;
-        HelpButton*     m_pHelp;
+        OKButton*		m_pFinish;
+        CancelButton*	m_pCancel;
+        PushButton*		m_pNextPage;
+        PushButton*		m_pPrevPage;
+        HelpButton*		m_pHelp;
 
     private:
         WizardMachineImplData*
@@ -189,15 +189,15 @@ namespace svt
         ~OWizardMachine();
 
         /// enable (or disable) buttons
-        void    enableButtons(sal_uInt32 _nWizardButtonFlags, sal_Bool _bEnable);
+        void	enableButtons(sal_uInt32 _nWizardButtonFlags, sal_Bool _bEnable);
         /// set the default style for a button
-        void    defaultButton(sal_uInt32 _nWizardButtonFlags);
+        void	defaultButton(sal_uInt32 _nWizardButtonFlags);
         /// set the default style for a button
-        void    defaultButton(PushButton* _pNewDefButton);
+        void	defaultButton(PushButton* _pNewDefButton);
 
         /// set the base of the title to use - the title of the current page is appended
-        void            setTitleBase(const String& _rTitleBase);
-        const String&   getTitleBase() const;
+        void			setTitleBase(const String& _rTitleBase);
+        const String&	getTitleBase() const;
 
         /// determines whether there is a next state to which we can advance
         virtual bool    canAdvance() const;
@@ -212,16 +212,16 @@ namespace svt
 
     protected:
         // WizardDialog overridables
-        virtual void        ActivatePage();
-        virtual long        DeactivatePage();
+        virtual void		ActivatePage();
+        virtual long		DeactivatePage();
 
         // our own overridables
 
         /// to override to create new pages
-        virtual TabPage*    createPage(WizardState _nState) = 0;
+        virtual TabPage*	createPage(WizardState _nState) = 0;
 
         /// will be called when a new page is about to be displayed
-        virtual void        enterState(WizardState _nState);
+        virtual	void		enterState(WizardState _nState);
 
         /** will be called when the current state is about to be left for the given reason
 
@@ -247,7 +247,7 @@ namespace svt
             @return
                 <TRUE/> if and only if the page is allowed to be left
         */
-        virtual sal_Bool    leaveState( WizardState _nState );
+        virtual	sal_Bool	leaveState( WizardState _nState );
 
         /** determine the next state to travel from the given one
 
@@ -263,10 +263,10 @@ namespace svt
         virtual sal_Bool    onFinish();
 
         /// travel to the next state
-        sal_Bool            travelNext();
+        sal_Bool	        travelNext();
 
         /// travel to the previous state
-        sal_Bool            travelPrevious();
+        sal_Bool	        travelPrevious();
 
         /** enables the automatic enabled/disabled state of the "Next" button
 
@@ -297,7 +297,7 @@ namespace svt
             @see skipUntil
             @see skipBackwardUntil
         */
-        sal_Bool                skip( sal_Int32 _nSteps = 1 );
+        sal_Bool	            skip( sal_Int32 _nSteps = 1 );
 
         /** skips one or more states, until a given state is reached
 
@@ -313,7 +313,7 @@ namespace svt
             @see skip
             @see skipBackwardUntil
         */
-        sal_Bool                skipUntil( WizardState _nTargetState );
+        sal_Bool	            skipUntil( WizardState _nTargetState );
 
         /** moves back one or more states, until a given state is reached
 
@@ -337,7 +337,7 @@ namespace svt
 
             Vulgo, this is the identifier of the current tab page :)
         */
-        WizardState             getCurrentState() const { return WizardDialog::GetCurLevel(); }
+        WizardState		        getCurrentState() const { return WizardDialog::GetCurLevel(); }
 
         virtual IWizardPageController*
                                 getPageController( TabPage* _pCurrentPage ) const;
@@ -362,8 +362,8 @@ namespace svt
         DECL_DLLPRIVATE_LINK(OnPrevPage, PushButton*);
         DECL_DLLPRIVATE_LINK(OnFinish, PushButton*);
 
-        SVT_DLLPRIVATE void     implResetDefault(Window* _pWindow);
-        SVT_DLLPRIVATE void     implUpdateTitle();
+        SVT_DLLPRIVATE void		implResetDefault(Window* _pWindow);
+        SVT_DLLPRIVATE void		implUpdateTitle();
         SVT_DLLPRIVATE void     implConstruct( const sal_uInt32 _nButtonFlags );
     };
 
@@ -387,7 +387,7 @@ namespace svt
     };
 
 //.........................................................................
-}   // namespace svt
+}	// namespace svt
 //.........................................................................
 
 #endif // _SVTOOLS_WIZARDMACHINE_HXX_
diff --git a/svtools/inc/svtools/wizdlg.hxx b/svtools/inc/svtools/wizdlg.hxx
index 5bd2db5672ed..c61054060414 100644
--- a/svtools/inc/svtools/wizdlg.hxx
+++ b/svtools/inc/svtools/wizdlg.hxx
@@ -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
@@ -210,9 +210,9 @@ IMPL_LINK( MyWizardDlg, ImplNextHdl, PushButton*, pBtn )
 // - WizardDialog-Types -
 // ----------------------
 
-#define WIZARDDIALOG_BUTTON_STDOFFSET_X         6
+#define WIZARDDIALOG_BUTTON_STDOFFSET_X 	    6
 #define WIZARDDIALOG_BUTTON_SMALLSTDOFFSET_X    3
-#define WIZARDDIALOG_BUTTON_STDOFFSETLEFT_X     -10
+#define WIZARDDIALOG_BUTTON_STDOFFSETLEFT_X 	-10
 
 // ----------------
 // - WizardDialog -
@@ -221,18 +221,18 @@ IMPL_LINK( MyWizardDlg, ImplNextHdl, PushButton*, pBtn )
 class SVT_DLLPUBLIC WizardDialog : public ModalDialog
 {
 private:
-    Size                maPageSize;
-    ImplWizPageData*    mpFirstPage;
-    ImplWizButtonData*  mpFirstBtn;
-    FixedLine*          mpFixedLine;
-    TabPage*            mpCurTabPage;
-    PushButton*         mpPrevBtn;
-    PushButton*         mpNextBtn;
-    Window*             mpViewWindow;
-    USHORT              mnCurLevel;
-    WindowAlign         meViewAlign;
-    Link                maActivateHdl;
-    Link                maDeactivateHdl;
+    Size				maPageSize;
+    ImplWizPageData*	mpFirstPage;
+    ImplWizButtonData*	mpFirstBtn;
+    FixedLine*			mpFixedLine;
+    TabPage*			mpCurTabPage;
+    PushButton* 		mpPrevBtn;
+    PushButton* 		mpNextBtn;
+    Window* 			mpViewWindow;
+    USHORT				mnCurLevel;
+    WindowAlign 		meViewAlign;
+    Link				maActivateHdl;
+    Link				maDeactivateHdl;
     sal_Int16           mnLeftAlignCount;
     bool                mbEmptyViewMargin;
 
@@ -252,12 +252,12 @@ protected:
 
 #ifdef _SVT_WIZDLG_CXX
 private:
-    SVT_DLLPRIVATE void             ImplInitData();
-    SVT_DLLPRIVATE void             ImplCalcSize( Size& rSize );
-    SVT_DLLPRIVATE void             ImplPosCtrls();
-    SVT_DLLPRIVATE void             ImplPosTabPage();
-    SVT_DLLPRIVATE void             ImplShowTabPage( TabPage* pPage );
-    SVT_DLLPRIVATE TabPage*         ImplGetPage( USHORT nLevel ) const;
+    SVT_DLLPRIVATE void				ImplInitData();
+    SVT_DLLPRIVATE void				ImplCalcSize( Size& rSize );
+    SVT_DLLPRIVATE void				ImplPosCtrls();
+    SVT_DLLPRIVATE void				ImplPosTabPage();
+    SVT_DLLPRIVATE void				ImplShowTabPage( TabPage* pPage );
+    SVT_DLLPRIVATE TabPage*			ImplGetPage( USHORT nLevel ) const;
 #endif
 
 public:
@@ -265,47 +265,47 @@ public:
                         WizardDialog( Window* pParent, const ResId& rResId );
                         ~WizardDialog();
 
-    virtual void        Resize();
-    virtual void        StateChanged( StateChangedType nStateChange );
-    virtual long        Notify( NotifyEvent& rNEvt );
+    virtual void		Resize();
+    virtual void		StateChanged( StateChangedType nStateChange );
+    virtual long		Notify( NotifyEvent& rNEvt );
 
-    virtual void        ActivatePage();
-    virtual long        DeactivatePage();
+    virtual void		ActivatePage();
+    virtual long		DeactivatePage();
 
-    BOOL                ShowPrevPage();
-    BOOL                ShowNextPage();
-    BOOL                ShowPage( USHORT nLevel );
-    BOOL                Finnish( long nResult = 0 );
-    USHORT              GetCurLevel() const { return mnCurLevel; }
+    BOOL				ShowPrevPage();
+    BOOL				ShowNextPage();
+    BOOL				ShowPage( USHORT nLevel );
+    BOOL				Finnish( long nResult = 0 );
+    USHORT				GetCurLevel() const { return mnCurLevel; }
 
-    void                AddPage( TabPage* pPage );
-    void                RemovePage( TabPage* pPage );
-    void                SetPage( USHORT nLevel, TabPage* pPage );
-    TabPage*            GetPage( USHORT nLevel ) const;
+    void				AddPage( TabPage* pPage );
+    void				RemovePage( TabPage* pPage );
+    void				SetPage( USHORT nLevel, TabPage* pPage );
+    TabPage*			GetPage( USHORT nLevel ) const;
 
-    void                AddButton( Button* pButton, long nOffset = 0 );
-    void                RemoveButton( Button* pButton );
+    void				AddButton( Button* pButton, long nOffset = 0 );
+    void				RemoveButton( Button* pButton );
 
-    void                SetPrevButton( PushButton* pButton ) { mpPrevBtn = pButton; }
-    PushButton*         GetPrevButton() const { return mpPrevBtn; }
-    void                SetNextButton( PushButton* pButton ) { mpNextBtn = pButton; }
-    PushButton*         GetNextButton() const { return mpNextBtn; }
+    void				SetPrevButton( PushButton* pButton ) { mpPrevBtn = pButton; }
+    PushButton* 		GetPrevButton() const { return mpPrevBtn; }
+    void				SetNextButton( PushButton* pButton ) { mpNextBtn = pButton; }
+    PushButton* 		GetNextButton() const { return mpNextBtn; }
 
-    void                ShowButtonFixedLine( BOOL bVisible );
-    BOOL                IsButtonFixedLineVisible();
+    void				ShowButtonFixedLine( BOOL bVisible );
+    BOOL				IsButtonFixedLineVisible();
 
-    void                SetViewWindow( Window* pWindow ) { mpViewWindow = pWindow; }
-    Window*             GetViewWindow() const { return mpViewWindow; }
-    void                SetViewAlign( WindowAlign eAlign ) { meViewAlign = eAlign; }
-    WindowAlign         GetViewAlign() const { return meViewAlign; }
+    void				SetViewWindow( Window* pWindow ) { mpViewWindow = pWindow; }
+    Window* 			GetViewWindow() const { return mpViewWindow; }
+    void				SetViewAlign( WindowAlign eAlign ) { meViewAlign = eAlign; }
+    WindowAlign 		GetViewAlign() const { return meViewAlign; }
 
-    void                SetPageSizePixel( const Size& rSize ) { maPageSize = rSize; }
-    const Size&         GetPageSizePixel() const { return maPageSize; }
+    void				SetPageSizePixel( const Size& rSize ) { maPageSize = rSize; }
+    const Size& 		GetPageSizePixel() const { return maPageSize; }
 
-    void                SetActivatePageHdl( const Link& rLink ) { maActivateHdl = rLink; }
-    const Link&         GetActivatePageHdl() const { return maActivateHdl; }
-    void                SetDeactivatePageHdl( const Link& rLink ) { maDeactivateHdl = rLink; }
-    const Link&         GetDeactivatePageHdl() const { return maDeactivateHdl; }
+    void				SetActivatePageHdl( const Link& rLink ) { maActivateHdl = rLink; }
+    const Link& 		GetActivatePageHdl() const { return maActivateHdl; }
+    void				SetDeactivatePageHdl( const Link& rLink ) { maDeactivateHdl = rLink; }
+    const Link& 		GetDeactivatePageHdl() const { return maDeactivateHdl; }
 };
 
-#endif  // _SVT_WIZDLG_HXX
+#endif	// _SVT_WIZDLG_HXX
diff --git a/svtools/inc/svtools/wmf.hxx b/svtools/inc/svtools/wmf.hxx
index a41b6180747b..9d536d5180dc 100644
--- a/svtools/inc/svtools/wmf.hxx
+++ b/svtools/inc/svtools/wmf.hxx
@@ -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
diff --git a/svtools/inc/svtools/xtextedt.hxx b/svtools/inc/svtools/xtextedt.hxx
index 46c6441e005e..f2a237c37171 100644
--- a/svtools/inc/svtools/xtextedt.hxx
+++ b/svtools/inc/svtools/xtextedt.hxx
@@ -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
@@ -31,9 +31,9 @@
 #include <svtools/texteng.hxx>
 #include <svtools/textview.hxx>
 
-#define XTEXTUNDO_REPLACEALL    (XTEXTUNDO_START+1)
-#define XTEXTUNDO_INDENTBLOCK       122
-#define XTEXTUNDO_UNINDENTBLOCK     123
+#define XTEXTUNDO_REPLACEALL	(XTEXTUNDO_START+1)
+#define XTEXTUNDO_INDENTBLOCK		122
+#define XTEXTUNDO_UNINDENTBLOCK		123
 
 namespace com {
 namespace sun {
@@ -45,35 +45,35 @@ namespace util {
 class SVT_DLLPUBLIC ExtTextEngine : public TextEngine
 {
 private:
-    String              maGroupChars;
+    String				maGroupChars;
 
 public:
                         ExtTextEngine();
                         ~ExtTextEngine();
 
-    const String&       GetGroupChars() const { return maGroupChars; }
-    void                SetGroupChars( const String& r ) { maGroupChars = r; }
-    TextSelection       MatchGroup( const TextPaM& rCursor ) const;
+    const String&		GetGroupChars() const { return maGroupChars; }
+    void				SetGroupChars( const String& r ) { maGroupChars = r; }
+    TextSelection		MatchGroup( const TextPaM& rCursor ) const;
 
-    BOOL                Search( TextSelection& rSel, const ::com::sun::star::util::SearchOptions& rSearchOptions, BOOL bForward = TRUE );
+    BOOL				Search( TextSelection& rSel, const ::com::sun::star::util::SearchOptions& rSearchOptions, BOOL bForward = TRUE );
 };
 
 class SVT_DLLPUBLIC ExtTextView : public TextView
 {
 protected:
-    BOOL                ImpIndentBlock( BOOL bRight );
+    BOOL				ImpIndentBlock( BOOL bRight );
 
 public:
                         ExtTextView( ExtTextEngine* pEng, Window* pWindow );
                         ~ExtTextView();
 
-    BOOL                MatchGroup();
+    BOOL				MatchGroup();
 
-    BOOL                Search( const ::com::sun::star::util::SearchOptions& rSearchOptions, BOOL bForward );
-    USHORT              Replace( const ::com::sun::star::util::SearchOptions& rSearchOptions, BOOL bAll, BOOL bForward );
+    BOOL				Search( const ::com::sun::star::util::SearchOptions& rSearchOptions, BOOL bForward );
+    USHORT				Replace( const ::com::sun::star::util::SearchOptions& rSearchOptions, BOOL bAll, BOOL bForward );
 
-    BOOL                IndentBlock();
-    BOOL                UnindentBlock();
+    BOOL				IndentBlock();
+    BOOL				UnindentBlock();
 };
 
 #endif // _XTEXTEDT_HXX
diff --git a/svtools/inc/svtools/xwindowitem.hxx b/svtools/inc/svtools/xwindowitem.hxx
index eca425cf1369..2e3997103ad2 100755
--- a/svtools/inc/svtools/xwindowitem.hxx
+++ b/svtools/inc/svtools/xwindowitem.hxx
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2008 by Sun Microsystems, Inc.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/svtools/inc/sychconv.hxx b/svtools/inc/sychconv.hxx
index 4056556a2100..565cb7e4bf99 100644
--- a/svtools/inc/sychconv.hxx
+++ b/svtools/inc/sychconv.hxx
@@ -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
@@ -41,7 +41,7 @@ class SymCharConverter
 {
 public:
 
-    static BOOL Convert( Font& rFont, UniString& rString, OutputDevice* pDev = NULL );
+    static BOOL	Convert( Font& rFont, UniString& rString, OutputDevice* pDev = NULL );
 };
 
 #endif // _CHARCONV_HXX
diff --git a/svtools/inc/tabbar.hxx b/svtools/inc/tabbar.hxx
index e036f4c2f045..ee19bfc045d5 100644
--- a/svtools/inc/tabbar.hxx
+++ b/svtools/inc/tabbar.hxx
@@ -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
@@ -391,9 +391,9 @@ private:
     SVT_DLLPRIVATE USHORT          ImplGetLastFirstPos();
     SVT_DLLPRIVATE void            ImplInitControls();
     SVT_DLLPRIVATE void            ImplEnableControls();
-    SVT_DLLPRIVATE void         ImplSelect();
-    SVT_DLLPRIVATE void         ImplActivatePage();
-    SVT_DLLPRIVATE long         ImplDeactivatePage();
+    SVT_DLLPRIVATE void			ImplSelect();
+    SVT_DLLPRIVATE void			ImplActivatePage();
+    SVT_DLLPRIVATE long			ImplDeactivatePage();
                     DECL_DLLPRIVATE_LINK( ImplClickHdl, ImplTabButton* );
 
 public:
@@ -446,7 +446,7 @@ public:
     USHORT          GetPageId( const Point& rPos ) const;
     Rectangle       GetPageRect( USHORT nPageId ) const;
     // returns the rectangle in which page tabs are drawn
-    Rectangle       GetPageArea() const;
+    Rectangle		GetPageArea() const;
 
     void            SetCurPageId( USHORT nPageId );
     USHORT          GetCurPageId() const { return mnCurPageId; }
diff --git a/svtools/inc/taskbar.hxx b/svtools/inc/taskbar.hxx
index 46853fa07c03..65ed156a5bfb 100644
--- a/svtools/inc/taskbar.hxx
+++ b/svtools/inc/taskbar.hxx
@@ -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
diff --git a/svtools/inc/templatefoldercache.hxx b/svtools/inc/templatefoldercache.hxx
index 25d5080bd748..ab5bb02056fd 100644
--- a/svtools/inc/templatefoldercache.hxx
+++ b/svtools/inc/templatefoldercache.hxx
@@ -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
@@ -68,7 +68,7 @@ namespace svt
     class SVT_DLLPUBLIC TemplateFolderCache
     {
     private:
-        TemplateFolderCacheImpl*        m_pImpl;
+        TemplateFolderCacheImpl*		m_pImpl;
 
     public:
         /** ctor.
@@ -90,7 +90,7 @@ namespace svt
         @return
             <TRUE/> if the template configuration needs to be updated
         */
-        sal_Bool    needsUpdate( sal_Bool _bForceCheck = sal_False );
+        sal_Bool	needsUpdate( sal_Bool _bForceCheck = sal_False );
 
         /** stores the current state of the template folders in the cache
         @param _bForceRetrieval
@@ -98,11 +98,11 @@ namespace svt
             Usually, you set this to <FALSE/>: After calling <method>needsUpdate</method>, the state is know and does not
             need to be read again.
         */
-        void        storeState( sal_Bool _bForceRetrieval = sal_False );
+        void		storeState( sal_Bool _bForceRetrieval = sal_False );
     };
 
 //.........................................................................
-}   // namespace svt
+}	// namespace svt
 //.........................................................................
 
 #endif // SFX2_TEMPLATEFOLDERCACHE_HXX
diff --git a/svtools/inc/templdlg.hxx b/svtools/inc/templdlg.hxx
index f08f7cc8770d..913c9bc1b4ba 100644
--- a/svtools/inc/templdlg.hxx
+++ b/svtools/inc/templdlg.hxx
@@ -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
@@ -44,22 +44,22 @@ class SVT_DLLPUBLIC SvtDocumentTemplateDialog : public ModalDialog
 {
 private:
     svt::FixedHyperlink aMoreTemplatesLink;
-    FixedLine           aLine;
-    PushButton          aManageBtn;
-    PushButton          aEditBtn;
-    OKButton            aOKBtn;
-    CancelButton        aCancelBtn;
-    HelpButton          aHelpBtn;
-
-    SvtTmplDlg_Impl*    pImpl;
-
-    DECL_DLLPRIVATE_LINK(           SelectHdl_Impl, SvtTemplateWindow* );
-    DECL_DLLPRIVATE_LINK(           DoubleClickHdl_Impl, SvtTemplateWindow* );
-    DECL_DLLPRIVATE_LINK(           NewFolderHdl_Impl, SvtTemplateWindow* );
-    DECL_DLLPRIVATE_LINK(           SendFocusHdl_Impl, SvtTemplateWindow* );
-    DECL_DLLPRIVATE_LINK(           OKHdl_Impl, PushButton* );
-    DECL_DLLPRIVATE_LINK(           OrganizerHdl_Impl, PushButton* );
-    DECL_DLLPRIVATE_LINK(           UpdateHdl_Impl, Timer* );
+    FixedLine			aLine;
+    PushButton			aManageBtn;
+    PushButton			aEditBtn;
+    OKButton			aOKBtn;
+    CancelButton		aCancelBtn;
+    HelpButton			aHelpBtn;
+
+    SvtTmplDlg_Impl*	pImpl;
+
+    DECL_DLLPRIVATE_LINK(			SelectHdl_Impl, SvtTemplateWindow* );
+    DECL_DLLPRIVATE_LINK(			DoubleClickHdl_Impl, SvtTemplateWindow* );
+    DECL_DLLPRIVATE_LINK(			NewFolderHdl_Impl, SvtTemplateWindow* );
+    DECL_DLLPRIVATE_LINK(			SendFocusHdl_Impl, SvtTemplateWindow* );
+    DECL_DLLPRIVATE_LINK(			OKHdl_Impl, PushButton* );
+    DECL_DLLPRIVATE_LINK(			OrganizerHdl_Impl, PushButton* );
+    DECL_DLLPRIVATE_LINK(			UpdateHdl_Impl, Timer* );
     DECL_DLLPRIVATE_LINK(           OpenLinkHdl_Impl, svt::FixedHyperlink* );
 
 public:
@@ -78,8 +78,8 @@ public:
 
     ~SvtDocumentTemplateDialog();
 
-    sal_Bool    IsFileSelected( ) const;
-    String      GetSelectedFileURL( ) const;
+    sal_Bool	IsFileSelected( ) const;
+    String		GetSelectedFileURL( ) const;
 
     void        SelectTemplateFolder();
 
diff --git a/svtools/inc/testtool.hxx b/svtools/inc/testtool.hxx
index ea00fe33cdbf..c5be9037a271 100644
--- a/svtools/inc/testtool.hxx
+++ b/svtools/inc/testtool.hxx
@@ -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
diff --git a/svtools/inc/tooltiplbox.hxx b/svtools/inc/tooltiplbox.hxx
index e50d516f5aa1..1a82ff6485f1 100644
--- a/svtools/inc/tooltiplbox.hxx
+++ b/svtools/inc/tooltiplbox.hxx
@@ -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
diff --git a/svtools/inc/txtattr.hxx b/svtools/inc/txtattr.hxx
index 29723a38129b..3510e59030ce 100644
--- a/svtools/inc/txtattr.hxx
+++ b/svtools/inc/txtattr.hxx
@@ -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
@@ -36,10 +36,10 @@
 
 class Font;
 
-#define TEXTATTR_INVALID    0
-#define TEXTATTR_FONTCOLOR  1
-#define TEXTATTR_HYPERLINK  2
-#define TEXTATTR_FONTWEIGHT 3
+#define TEXTATTR_INVALID	0
+#define TEXTATTR_FONTCOLOR	1
+#define TEXTATTR_HYPERLINK	2
+#define TEXTATTR_FONTWEIGHT	3
 
 #define TEXTATTR_USER_START 1000 //start id for user defined text attributes
 #define TEXTATTR_PROTECTED  4
@@ -48,7 +48,7 @@ class Font;
 class SVT_DLLPUBLIC TextAttrib
 {
 private:
-    USHORT                  mnWhich;
+    USHORT					mnWhich;
 
 protected:
                             TextAttrib( USHORT nWhich ) { mnWhich = nWhich; }
@@ -56,14 +56,14 @@ protected:
 
 public:
 
-    virtual                 ~TextAttrib();
+    virtual					~TextAttrib();
 
-    USHORT                  Which() const   { return mnWhich; }
+    USHORT					Which() const 	{ return mnWhich; }
 
-    virtual void            SetFont( Font& rFont ) const = 0;
-    virtual TextAttrib*     Clone() const = 0;
-    virtual int             operator==( const TextAttrib& rAttr ) const = 0;
-    int                     operator!=( const TextAttrib& rAttr ) const
+    virtual void 			SetFont( Font& rFont ) const = 0;
+    virtual TextAttrib*		Clone() const = 0;
+    virtual int				operator==( const TextAttrib& rAttr ) const = 0;
+    int						operator!=( const TextAttrib& rAttr ) const
                                 { return !(*this == rAttr ); }
 };
 
@@ -72,34 +72,34 @@ public:
 class SVT_DLLPUBLIC TextAttribFontColor : public TextAttrib
 {
 private:
-    Color   maColor;
+    Color	maColor;
 
 public:
                             TextAttribFontColor( const Color& rColor );
                             TextAttribFontColor( const TextAttribFontColor& rAttr );
                             ~TextAttribFontColor();
-
+                            
     const Color&            GetColor() const { return maColor; }
-
-    virtual void            SetFont( Font& rFont ) const;
-    virtual TextAttrib*     Clone() const;
-    virtual int             operator==( const TextAttrib& rAttr ) const;
+                            
+    virtual void 			SetFont( Font& rFont ) const;
+    virtual TextAttrib*		Clone() const;
+    virtual int				operator==( const TextAttrib& rAttr ) const;
 
 };
 
 class SVT_DLLPUBLIC TextAttribFontWeight : public TextAttrib
 {
 private:
-    FontWeight  meWeight;
+    FontWeight	meWeight;
 
 public:
                             TextAttribFontWeight( FontWeight eWeight );
                             TextAttribFontWeight( const TextAttribFontWeight& rAttr );
                             ~TextAttribFontWeight();
 
-    virtual void            SetFont( Font& rFont ) const;
-    virtual TextAttrib*     Clone() const;
-    virtual int             operator==( const TextAttrib& rAttr ) const;
+    virtual void 			SetFont( Font& rFont ) const;
+    virtual TextAttrib*		Clone() const;
+    virtual int				operator==( const TextAttrib& rAttr ) const;
 
     inline FontWeight getFontWeight() const { return meWeight; }
 };
@@ -108,9 +108,9 @@ public:
 class TextAttribHyperLink : public TextAttrib
 {
 private:
-    XubString   maURL;
-    XubString   maDescription;
-    Color       maColor;
+    XubString	maURL;
+    XubString	maDescription;
+    Color		maColor;
 
 public:
                             TextAttribHyperLink( const XubString& rURL );
@@ -118,18 +118,18 @@ public:
                             TextAttribHyperLink( const TextAttribHyperLink& rAttr );
                             ~TextAttribHyperLink();
 
-    void                    SetURL( const XubString& rURL )             { maURL = rURL; }
-    const XubString&            GetURL() const                              { return maURL; }
+    void					SetURL( const XubString& rURL )				{ maURL = rURL; }
+    const XubString&			GetURL() const 								{ return maURL; }
 
-    void                    SetDescription( const XubString& rDescr )   { maDescription = rDescr; }
-    const XubString&            GetDescription() const                      { return maDescription; }
+    void					SetDescription( const XubString& rDescr )	{ maDescription = rDescr; }
+    const XubString&			GetDescription() const						{ return maDescription; }
 
-    void                    SetColor( const Color& rColor )             { maColor = rColor; }
-    const Color&            GetColor() const                            { return maColor; }
+    void					SetColor( const Color& rColor ) 			{ maColor = rColor; }
+    const Color&			GetColor() const 							{ return maColor; }
 
-    virtual void            SetFont( Font& rFont ) const;
-    virtual TextAttrib*     Clone() const;
-    virtual int             operator==( const TextAttrib& rAttr ) const;
+    virtual void 			SetFont( Font& rFont ) const;
+    virtual TextAttrib*		Clone() const;
+    virtual int				operator==( const TextAttrib& rAttr ) const;
 };
 
 class SVT_DLLPUBLIC TextAttribProtect : public TextAttrib
@@ -138,7 +138,7 @@ public:
                             TextAttribProtect();
                             TextAttribProtect( const TextAttribProtect& rAttr );
                             ~TextAttribProtect();
-
+                            
     virtual void            SetFont( Font& rFont ) const;
     virtual TextAttrib*     Clone() const;
     virtual int             operator==( const TextAttrib& rAttr ) const;
@@ -149,9 +149,9 @@ public:
 class TextCharAttrib
 {
 private:
-    TextAttrib*     mpAttr;
-    USHORT          mnStart;
-    USHORT          mnEnd;
+    TextAttrib*		mpAttr;
+    USHORT 			mnStart;
+    USHORT 			mnEnd;
 
 protected:
 
@@ -161,27 +161,27 @@ public:
                     TextCharAttrib( const TextCharAttrib& rTextCharAttrib );
                     ~TextCharAttrib();
 
-    const TextAttrib&   GetAttr() const         { return *mpAttr; }
+    const TextAttrib&	GetAttr() const 		{ return *mpAttr; }
 
-    USHORT          Which() const               { return mpAttr->Which(); }
+    USHORT			Which() const 				{ return mpAttr->Which(); }
 
-    USHORT          GetStart() const            { return mnStart; }
-    USHORT&         GetStart()                  { return mnStart; }
+    USHORT			GetStart() const			{ return mnStart; }
+    USHORT&			GetStart()					{ return mnStart; }
 
-    USHORT          GetEnd() const              { return mnEnd; }
-    USHORT&         GetEnd()                    { return mnEnd; }
+    USHORT			GetEnd() const				{ return mnEnd; }
+    USHORT&			GetEnd()					{ return mnEnd; }
 
-    inline USHORT   GetLen() const;
+    inline USHORT	GetLen() const;
 
-    inline void     MoveForward( USHORT nDiff );
-    inline void     MoveBackward( USHORT nDiff );
+    inline void		MoveForward( USHORT nDiff );
+    inline void		MoveBackward( USHORT nDiff );
 
-    inline void     Expand( USHORT nDiff );
-    inline void     Collaps( USHORT nDiff );
+    inline void		Expand( USHORT nDiff );
+    inline void		Collaps( USHORT nDiff );
 
-    inline BOOL     IsIn( USHORT nIndex );
-    inline BOOL     IsInside( USHORT nIndex );
-    inline BOOL     IsEmpty();
+    inline BOOL		IsIn( USHORT nIndex );
+    inline BOOL		IsInside( USHORT nIndex );
+    inline BOOL		IsEmpty();
 
 };
 
@@ -205,13 +205,13 @@ inline void TextCharAttrib::MoveBackward( USHORT nDiff )
     mnEnd = mnEnd - nDiff;
 }
 
-inline void TextCharAttrib::Expand( USHORT nDiff )
+inline void	TextCharAttrib::Expand( USHORT nDiff )
 {
     DBG_ASSERT( ( ((long)mnEnd + nDiff) <= (long)0xFFFF ), "TextCharAttrib: Expand?!" );
     mnEnd = mnEnd + nDiff;
 }
 
-inline void TextCharAttrib::Collaps( USHORT nDiff )
+inline void	TextCharAttrib::Collaps( USHORT nDiff )
 {
     DBG_ASSERT( (long)mnEnd - nDiff >= (long)mnStart, "TextCharAttrib: Collaps?!" );
     mnEnd = mnEnd - nDiff;
diff --git a/svtools/inc/txtcmp.hxx b/svtools/inc/txtcmp.hxx
index 7b30b76e69a7..f759f2084290 100644
--- a/svtools/inc/txtcmp.hxx
+++ b/svtools/inc/txtcmp.hxx
@@ -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
diff --git a/svtools/inc/unoevent.hxx b/svtools/inc/unoevent.hxx
index 5d5378bf909b..b33e46824565 100644
--- a/svtools/inc/unoevent.hxx
+++ b/svtools/inc/unoevent.hxx
@@ -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
@@ -37,10 +37,10 @@ class SvxMacroTableDtor;
 class SvxMacroItem;
 class SvxMacro;
 
-/** SvEventDescription: Description of a single event.
+/**	SvEventDescription: Description of a single event.
     mnEvent is the id used by SvxMacroItem
     mpEventName is the api name for this event
-
+    
     the last event in an array is indicated by mnEvent && mpEventName == 0
 */
 struct SvEventDescription
@@ -49,12 +49,12 @@ struct SvEventDescription
     const sal_Char* mpEventName;
 };
 
-/**
+/** 
  * SvBaseEventDescriptor: Abstract class that implements the basics
  * of an XNameReplace that is delivered by the
- * XEventsSupplier::getEvents() method.
+ * XEventsSupplier::getEvents() method. 
  *
- * The functionality this class provides is:
+ * The functionality this class provides is: 
  * 1) Which elements are in the XNameReplace?
  * 2) Mapping from Api names to item IDs.
  * 3) conversion from SvxMacroItem to Any and vice versa.
@@ -96,45 +96,45 @@ public:
 
     // XNameReplace
     /// calls replaceByName(const sal_uInt16, const SvxMacro&)
-    virtual void SAL_CALL replaceByName(
-        const ::rtl::OUString& rName,                /// API name of event
+    virtual void SAL_CALL replaceByName( 
+        const ::rtl::OUString& rName,				 /// API name of event
         const ::com::sun::star::uno::Any& rElement ) /// event (PropertyValues)
             throw(
-                ::com::sun::star::lang::IllegalArgumentException,
-                ::com::sun::star::container::NoSuchElementException,
-                ::com::sun::star::lang::WrappedTargetException,
+                ::com::sun::star::lang::IllegalArgumentException, 
+                ::com::sun::star::container::NoSuchElementException, 
+                ::com::sun::star::lang::WrappedTargetException, 
                 ::com::sun::star::uno::RuntimeException);
 
     // XNameAccess (via XNameReplace)
     /// calls getByName(sal_uInt16)
-    virtual ::com::sun::star::uno::Any SAL_CALL getByName(
-        const ::rtl::OUString& rName )  /// API name of event
+    virtual ::com::sun::star::uno::Any SAL_CALL getByName( 
+        const ::rtl::OUString& rName ) 	/// API name of event
             throw(
-                ::com::sun::star::container::NoSuchElementException,
-                ::com::sun::star::lang::WrappedTargetException,
+                ::com::sun::star::container::NoSuchElementException, 
+                ::com::sun::star::lang::WrappedTargetException, 
                 ::com::sun::star::uno::RuntimeException);
 
     // XNameAxcess (via XNameReplace)
-    virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL
-                                                        getElementNames()
+    virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL 
+                                                        getElementNames() 
         throw(::com::sun::star::uno::RuntimeException);
 
     // XNameAccess (via XNameReplace)
-    virtual sal_Bool SAL_CALL hasByName(
-        const ::rtl::OUString& rName )
+    virtual sal_Bool SAL_CALL hasByName( 
+        const ::rtl::OUString& rName ) 
             throw(::com::sun::star::uno::RuntimeException);
 
     // XElementAccess (via XNameReplace)
-    virtual ::com::sun::star::uno::Type SAL_CALL getElementType()
+    virtual ::com::sun::star::uno::Type SAL_CALL getElementType() 
         throw(::com::sun::star::uno::RuntimeException);
 
     // XElementAccess (via XNameReplace)
-    virtual sal_Bool SAL_CALL hasElements()
+    virtual sal_Bool SAL_CALL hasElements() 
         throw(::com::sun::star::uno::RuntimeException);
 
     // XServiceInfo
     /// must be implemented in subclass
-    virtual rtl::OUString SAL_CALL getImplementationName(void)
+    virtual rtl::OUString SAL_CALL getImplementationName(void) 
         throw( ::com::sun::star::uno::RuntimeException ) = 0;
 
     // XServiceInfo
@@ -142,29 +142,29 @@ public:
         throw( ::com::sun::star::uno::RuntimeException );
 
     // XServiceInfo
-    virtual ::com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL
-        getSupportedServiceNames(void)
+    virtual ::com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL 
+        getSupportedServiceNames(void) 
             throw( ::com::sun::star::uno::RuntimeException );
 
 protected:
 
     /// Must be implemented in subclass.
-    virtual void replaceByName(
-        const sal_uInt16 nEvent,        /// item ID of event
-        const SvxMacro& rMacro)     /// event (will be copied)
+    virtual void replaceByName( 
+        const sal_uInt16 nEvent,		/// item ID of event
+        const SvxMacro& rMacro)		/// event (will be copied)
             throw(
-                ::com::sun::star::lang::IllegalArgumentException,
-                ::com::sun::star::container::NoSuchElementException,
-                ::com::sun::star::lang::WrappedTargetException,
+                ::com::sun::star::lang::IllegalArgumentException, 
+                ::com::sun::star::container::NoSuchElementException, 
+                ::com::sun::star::lang::WrappedTargetException, 
                 ::com::sun::star::uno::RuntimeException) = 0;
 
     /// Must be implemented in subclass.
-    virtual void getByName(
+    virtual void getByName( 
         SvxMacro& rMacro,
-        const sal_uInt16 nEvent )
+        const sal_uInt16 nEvent ) 
             throw(
-                ::com::sun::star::container::NoSuchElementException,
-                ::com::sun::star::lang::WrappedTargetException,
+                ::com::sun::star::container::NoSuchElementException, 
+                ::com::sun::star::lang::WrappedTargetException, 
                 ::com::sun::star::uno::RuntimeException) = 0;
 
     /// convert an API event name to the event ID as used by SvxMacroItem
@@ -178,12 +178,12 @@ protected:
 
     /// create PropertyValues and Any from macro
     void getAnyFromMacro(
-        ::com::sun::star::uno::Any& aAny,   // Any to be filled by Macro values
+        ::com::sun::star::uno::Any& aAny,	// Any to be filled by Macro values
         const SvxMacro& rMacro);
 
     /// create macro from PropertyValues (in an Any)
     void getMacroFromAny(
-        SvxMacro& aMacro,       // reference to be filled by Any
+        SvxMacro& aMacro,		// reference to be filled by Any
         const ::com::sun::star::uno::Any& rAny)
             throw (
                 ::com::sun::star::lang::IllegalArgumentException);
@@ -193,11 +193,11 @@ protected:
 
 
 
-/**
+/** 
  * SvEventDescriptor: Implement the XNameReplace that is delivered by
  * the XEventsSupplier::getEvents() method. The SvEventDescriptor has
  * to be subclassed to implement the events for a specific
- * objects. The subclass has to
+ * objects. The subclass has to 
  * 1) supply the super class constructor with a list of known events (item IDs)
  * 2) supply the super class constructor with a reference of it's parent object
  *    (to prevent destruction)
@@ -209,7 +209,7 @@ protected:
 class SVT_DLLPUBLIC SvEventDescriptor : public SvBaseEventDescriptor
 {
     /// keep reference to parent to prevent it from being destroyed
-    ::com::sun::star::uno::Reference<
+    ::com::sun::star::uno::Reference< 
         ::com::sun::star::uno::XInterface > xParentRef;
 
 public:
@@ -224,22 +224,22 @@ protected:
 
 
     using SvBaseEventDescriptor::replaceByName;
-    virtual void replaceByName(
-        const sal_uInt16 nEvent,        /// item ID of event
-        const SvxMacro& rMacro)     /// event (will be copied)
+    virtual void replaceByName( 
+        const sal_uInt16 nEvent,		/// item ID of event
+        const SvxMacro& rMacro)		/// event (will be copied)
             throw(
-                ::com::sun::star::lang::IllegalArgumentException,
-                ::com::sun::star::container::NoSuchElementException,
-                ::com::sun::star::lang::WrappedTargetException,
+                ::com::sun::star::lang::IllegalArgumentException, 
+                ::com::sun::star::container::NoSuchElementException, 
+                ::com::sun::star::lang::WrappedTargetException, 
                 ::com::sun::star::uno::RuntimeException);
 
     using SvBaseEventDescriptor::getByName;
-    virtual void getByName(
-        SvxMacro& rMacros,          /// macro to be filled with values
-        const sal_uInt16 nEvent )       /// item ID of event
+    virtual void getByName( 
+        SvxMacro& rMacros,			/// macro to be filled with values
+        const sal_uInt16 nEvent ) 		/// item ID of event
             throw(
-                ::com::sun::star::container::NoSuchElementException,
-                ::com::sun::star::lang::WrappedTargetException,
+                ::com::sun::star::container::NoSuchElementException, 
+                ::com::sun::star::lang::WrappedTargetException, 
                 ::com::sun::star::uno::RuntimeException);
 
 
@@ -274,7 +274,7 @@ public:
     virtual ~SvDetachedEventDescriptor();
 
     //XServiceInfo
-    virtual rtl::OUString SAL_CALL getImplementationName(void)
+    virtual rtl::OUString SAL_CALL getImplementationName(void) 
         throw( ::com::sun::star::uno::RuntimeException );
 
 protected:
@@ -282,22 +282,22 @@ protected:
     sal_Int16 getIndex(const sal_uInt16 nID) const;
 
     using SvBaseEventDescriptor::replaceByName;
-    virtual void replaceByName(
-        const sal_uInt16 nEvent,        /// item ID of event
-        const SvxMacro& rMacro)     /// event (will be copied)
+    virtual void replaceByName( 
+        const sal_uInt16 nEvent,		/// item ID of event
+        const SvxMacro& rMacro)		/// event (will be copied)
             throw(
-                ::com::sun::star::lang::IllegalArgumentException,
-                ::com::sun::star::container::NoSuchElementException,
-                ::com::sun::star::lang::WrappedTargetException,
+                ::com::sun::star::lang::IllegalArgumentException, 
+                ::com::sun::star::container::NoSuchElementException, 
+                ::com::sun::star::lang::WrappedTargetException, 
                 ::com::sun::star::uno::RuntimeException);
 
     using SvBaseEventDescriptor::getByName;
-    virtual void getByName(
-        SvxMacro& rMacro,           /// macro to be filled
-        const sal_uInt16 nEvent )       /// item ID of event
+    virtual void getByName( 
+        SvxMacro& rMacro,			/// macro to be filled
+        const sal_uInt16 nEvent ) 		/// item ID of event
             throw(
-                ::com::sun::star::container::NoSuchElementException,
-                ::com::sun::star::lang::WrappedTargetException,
+                ::com::sun::star::container::NoSuchElementException, 
+                ::com::sun::star::lang::WrappedTargetException, 
                 ::com::sun::star::uno::RuntimeException);
 
     /// do we have an event?
@@ -305,8 +305,8 @@ protected:
     /// return sal_False: no macro; getByName() will return an empty macro
     /// IllegalArgumentException: the event is not supported
     using SvBaseEventDescriptor::hasByName;
-    virtual sal_Bool hasByName(
-        const sal_uInt16 nEvent ) const     /// item ID of event
+    virtual sal_Bool hasByName( 
+        const sal_uInt16 nEvent ) const		/// item ID of event
              throw(
                 ::com::sun::star::lang::IllegalArgumentException);
 
diff --git a/svtools/inc/unoimap.hxx b/svtools/inc/unoimap.hxx
index 9ed2afe8dc6c..380347e17e1d 100644
--- a/svtools/inc/unoimap.hxx
+++ b/svtools/inc/unoimap.hxx
@@ -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
diff --git a/svtools/inc/wallitem.hxx b/svtools/inc/wallitem.hxx
index 533d5ae3f6d3..27f137bff224 100644
--- a/svtools/inc/wallitem.hxx
+++ b/svtools/inc/wallitem.hxx
@@ -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
@@ -46,7 +46,7 @@ class Window;
 class SfxItemSet;
 
 typedef void* (*CreateSvxBrushTabPage)(Window *pParent, const SfxItemSet &rAttrSet);
-typedef USHORT* (*GetSvxBrushTabPageRanges)();
+typedef USHORT*	(*GetSvxBrushTabPageRanges)();
 
 class Graphic;
 class String;
@@ -56,10 +56,10 @@ public:
     virtual Graphic GetGraphic( const String& rLink, const String& rFilter) = 0;
     virtual CreateSvxBrushTabPage GetBackgroundTabpageCreateFunc() = 0;
     virtual GetSvxBrushTabPageRanges GetBackgroundTabpageRanges() = 0;
-    static SfxBrushItemLink* Get() { return *(SfxBrushItemLink**)GetAppData(SHL_BRUSHITEM); }
+    static SfxBrushItemLink* Get() { return *(SfxBrushItemLink**)GetAppData(SHL_BRUSHITEM);	}
     static void Set( SfxBrushItemLink* pLink );
 };
-#endif  // _SFX_BRUSHITEMLINK_DECLARED
+#endif	// _SFX_BRUSHITEMLINK_DECLARED
 
 #endif // _WALLITEM_HXX
 
diff --git a/svtools/source/brwbox/brwbox1.cxx b/svtools/source/brwbox/brwbox1.cxx
index 3a29c4ae63fa..26d25c6790f0 100644
--- a/svtools/source/brwbox/brwbox1.cxx
+++ b/svtools/source/brwbox/brwbox1.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
@@ -654,7 +654,7 @@ void BrowseBox::SetColumnTitle( USHORT nItemId, const String& rTitle )
 
         if ( isAccessibleAlive() )
         {
-            commitTableEvent(   TABLE_COLUMN_DESCRIPTION_CHANGED,
+            commitTableEvent(	TABLE_COLUMN_DESCRIPTION_CHANGED,
                 makeAny( sNew ),
                 makeAny( sOld )
             );
@@ -856,7 +856,7 @@ void BrowseBox::RemoveColumn( USHORT nItemId )
     {
         commitTableEvent(
             TABLE_MODEL_CHANGED,
-            makeAny( AccessibleTableModelChange(    DELETE,
+            makeAny( AccessibleTableModelChange(	DELETE,
                                                     0,
                                                     GetRowCount(),
                                                     nPos,
@@ -1456,7 +1456,7 @@ void BrowseBox::RowRemoved( long nRow, long nNumRows, BOOL bDoPaint )
         uRow.nSel = BROWSER_ENDOFSELECTION;
 
     // adjust the cursor
-    if ( nRowCount == 0 )   // don't compare nRowCount with nNumRows as nNumRows already was subtracted from nRowCount
+    if ( nRowCount == 0 )	// don't compare nRowCount with nNumRows as nNumRows already was subtracted from nRowCount
         nCurRow = BROWSER_ENDOFSELECTION;
     else if ( nRow < nCurRow )
     {
@@ -1947,13 +1947,13 @@ void BrowseBox::SelectRow( long nRow, BOOL _bSelect, BOOL bExpand )
     }
 
     // set new selection
-    if  (   !bHideSelect
-        &&  (   (   bMultiSelection
-                &&  uRow.pSel->GetTotalRange().Max() >= nRow
-                &&  uRow.pSel->Select( nRow, _bSelect )
+    if	(	!bHideSelect
+        &&	(	(	bMultiSelection
+                &&	uRow.pSel->GetTotalRange().Max() >= nRow
+                &&	uRow.pSel->Select( nRow, _bSelect )
                 )
-            ||  (   !bMultiSelection
-                &&  ( uRow.nSel = nRow ) != BROWSER_ENDOFSELECTION )
+            ||	(	!bMultiSelection
+                &&	( uRow.nSel = nRow ) != BROWSER_ENDOFSELECTION )
                 )
             )
     {
@@ -2159,12 +2159,12 @@ sal_Bool BrowseBox::IsAllSelected() const
 
 BOOL BrowseBox::MakeFieldVisible
 (
-    long    nRow,       // Zeilen-Nr des Feldes (beginnend mit 0)
-    USHORT  nColId,     // Spalten-Id des Feldes
-    BOOL    bComplete   // (== FALSE), TRUE => vollst"andig sichtbar machen
+    long	nRow,		// Zeilen-Nr des Feldes (beginnend mit 0)
+    USHORT	nColId, 	// Spalten-Id des Feldes
+    BOOL	bComplete	// (== FALSE), TRUE => vollst"andig sichtbar machen
 )
 
-/*  [Beschreibung]
+/*	[Beschreibung]
 
     Macht das durch 'nRow' und 'nColId' beschriebene Feld durch
     entsprechendes scrollen sichtbar. Ist 'bComplete' gesetzt, dann wird
@@ -2172,7 +2172,7 @@ BOOL BrowseBox::MakeFieldVisible
 
     [R"uckgabewert]
 
-    BOOL            TRUE
+    BOOL			TRUE
                     Das angegebene Feld wurde sichtbar gemacht, bzw. war
                     bereits sichtbar.
 
@@ -2433,21 +2433,21 @@ void BrowseBox::SetMode( BrowserMode nMode )
 #ifdef DBG_MIx
     Sound::Beep();
     nMode =
-//          BROWSER_COLUMNSELECTION |
-//          BROWSER_MULTISELECTION |
+//  		BROWSER_COLUMNSELECTION |
+//  		BROWSER_MULTISELECTION |
             BROWSER_THUMBDRAGGING |
             BROWSER_KEEPHIGHLIGHT |
             BROWSER_HLINES |
             BROWSER_VLINES |
-//          BROWSER_HIDECURSOR |
-//          BROWSER_NO_HSCROLL |
-//          BROWSER_NO_SCROLLBACK |
+// 			BROWSER_HIDECURSOR |
+//  		BROWSER_NO_HSCROLL |
+//  		BROWSER_NO_SCROLLBACK |
             BROWSER_AUTO_VSCROLL |
             BROWSER_AUTO_HSCROLL |
             BROWSER_TRACKING_TIPS |
-//          BROWSER_HIGHLIGHT_NONE |
+//  		BROWSER_HIGHLIGHT_NONE |
             BROWSER_HEADERBAR_NEW |
-//          BROWSER_AUTOSIZE_LASTCOL |
+//			BROWSER_AUTOSIZE_LASTCOL |
             0;
 #endif
 
@@ -2489,7 +2489,7 @@ void BrowseBox::SetMode( BrowserMode nMode )
     bHideCursor = NO_CURSOR_HIDE;
 
     if ( BROWSER_SMART_HIDECURSOR == ( nMode & BROWSER_SMART_HIDECURSOR ) )
-    {   // smart cursor hide overrules hard cursor hide
+    {	// smart cursor hide overrules hard cursor hide
         bHideCursor = SMART_CURSOR_HIDE;
     }
     else if ( BROWSER_HIDECURSOR == ( nMode & BROWSER_HIDECURSOR ) )
@@ -2596,7 +2596,7 @@ void BrowseBox::VisibleRowsChanged( long, USHORT )
 
 BOOL BrowseBox::IsCursorMoveAllowed( long, USHORT ) const
 
-/*  [Beschreibung]
+/*	[Beschreibung]
 
     Diese virtuelle Methode wird immer gerufen bevor der Cursor direkt
     bewegt werden soll. Durch 'return FALSE' kann verhindert werden, da\s
diff --git a/svtools/source/brwbox/brwbox2.cxx b/svtools/source/brwbox/brwbox2.cxx
index 68cf316e813b..5f81ebe364a4 100644
--- a/svtools/source/brwbox/brwbox2.cxx
+++ b/svtools/source/brwbox/brwbox2.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
@@ -218,13 +218,13 @@ void BrowseBox::StateChanged( StateChangedType nStateChange )
     else if (STATE_CHANGE_ENABLE == nStateChange)
     {
         // do we have a handle column?
-        sal_Bool bHandleCol = pCols->Count() && (0 == pCols->GetObject(0)->GetId());
+        sal_Bool bHandleCol	= pCols->Count() && (0 == pCols->GetObject(0)->GetId());
         // do we have a header bar
         sal_Bool bHeaderBar = (NULL != static_cast<BrowserDataWin&>(GetDataWindow()).pHeaderBar);
 
-        if  (   nTitleLines
-            &&  (   !bHeaderBar
-                ||  bHandleCol
+        if	(	nTitleLines
+            &&	(	!bHeaderBar
+                ||	bHandleCol
                 )
             )
             // we draw the text in our header bar in a color dependent on the enabled state. So if this state changed
@@ -688,7 +688,7 @@ void BrowseBox::Paint( const Rectangle& rRect )
         return;
 
     BrowserColumn *pFirstCol = pCols->GetObject(0);
-    BOOL bHandleCol = pFirstCol && pFirstCol->GetId() == 0;
+    BOOL bHandleCol	= pFirstCol && pFirstCol->GetId() == 0;
     BOOL bHeaderBar = getDataWindow()->pHeaderBar != NULL;
 
     // draw delimitational lines
@@ -1008,7 +1008,7 @@ void BrowseBox::ImplPaintData(OutputDevice& _rOut, const Rectangle& _rRect, BOOL
                 nCol = nFirstCol;
                 pCol = pCols->GetObject(nCol);
                 if (!pCol)
-                {   // FS - 21.05.99 - 66325
+                {	// FS - 21.05.99 - 66325
                     // ist zwar eigentlich woanders (an der richtigen Stelle) gefixt, aber sicher ist sicher ...
                     DBG_ERROR("BrowseBox::PaintData : nFirstCol is probably invalid !");
                     break;
@@ -1016,9 +1016,9 @@ void BrowseBox::ImplPaintData(OutputDevice& _rOut, const Rectangle& _rRect, BOOL
             }
 
             // prepare Column-AutoHighlight
-            BOOL bColAutoHighlight  =   _bDrawSelections
-                                    &&  bColumnCursor
-                                    &&  IsColumnSelected( pCol->GetId() );
+            BOOL bColAutoHighlight	=	_bDrawSelections
+                                    &&	bColumnCursor
+                                    &&	IsColumnSelected( pCol->GetId() );
             if ( bColAutoHighlight )
             {
                 _rOut.SetClipRegion();
@@ -1039,7 +1039,7 @@ void BrowseBox::ImplPaintData(OutputDevice& _rOut, const Rectangle& _rRect, BOOL
             {
                 // clip the column's output to the field area
                 if (_bForeignDevice)
-                {   // (not neccessary if painting onto the data window)
+                {	// (not neccessary if painting onto the data window)
                     Size aFieldSize(pCol->Width(), nDataRowHeigt);
 
                     if (aPos.X() + aFieldSize.Width() > aOverallAreaBRPos.X())
@@ -1092,7 +1092,7 @@ void BrowseBox::ImplPaintData(OutputDevice& _rOut, const Rectangle& _rRect, BOOL
             _rOut.SetLineColor( aDelimiterLineColor );
             long nY = aPos.Y() + nDataRowHeigt - 1;
             if (nY <= aOverallAreaBRPos.Y())
-                _rOut.DrawLine( Point( nHLineX, nY ),
+                _rOut.DrawLine(	Point( nHLineX, nY ),
                                 Point( bVLines
                                         ? std::min(long(long(aPos.X()) - 1), aOverallAreaBRPos.X())
                                         : aOverallAreaBRPos.X(),
@@ -2024,7 +2024,7 @@ void BrowseBox::Dispatch( USHORT nId )
             {
                 USHORT nNewPos = GetColumnPos( GetCurColumnId() ) + 1;
                 USHORT nNewId = GetColumnId( nNewPos );
-                if (nNewId != 0)    // Am Zeilenende ?
+                if (nNewId != 0)	// Am Zeilenende ?
                     bDone = GoToColumnId( nNewId );
                 else
                 {
diff --git a/svtools/source/brwbox/brwbox3.cxx b/svtools/source/brwbox/brwbox3.cxx
index 102af1b6e1a1..631a55525e04 100644
--- a/svtools/source/brwbox/brwbox3.cxx
+++ b/svtools/source/brwbox/brwbox3.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
@@ -50,7 +50,7 @@ namespace svt
     using namespace ::com::sun::star::lang;
     using namespace utl;
 
-    Reference< XAccessible > getHeaderCell( BrowseBoxImpl::THeaderCellMap& _raHeaderCells,
+    Reference< XAccessible > getHeaderCell(	BrowseBoxImpl::THeaderCellMap& _raHeaderCells,
                                             sal_Int32 _nPos,
                                             AccessibleBrowseBoxObjType _eType,
                                             const Reference< XAccessible >& _rParent,
@@ -106,7 +106,7 @@ Reference< XAccessible > BrowseBox::CreateAccessible()
         Reference< XAccessible > xAccParent = pParent->GetAccessible();
         if( xAccParent.is() )
         {
-            m_pImpl->m_pAccessible = getAccessibleFactory().createAccessibleBrowseBox(
+            m_pImpl->m_pAccessible = getAccessibleFactory().createAccessibleBrowseBox( 
                 xAccParent, *this
             );
         }
@@ -192,7 +192,7 @@ sal_Bool BrowseBox::ConvertPointToCellAddress(
 sal_Bool BrowseBox::ConvertPointToRowHeader( sal_Int32& rnRow, const Point& rPoint )
 {
     rnRow = GetRowAtYPosPixel(rPoint.Y());
-    //  USHORT nColumnId = GetColumnAtXPosPixel(rPoint.X());
+    //	USHORT nColumnId = GetColumnAtXPosPixel(rPoint.X());
     return rnRow != BROWSER_INVALIDID;// && nColumnId == 0;
 }
 // -----------------------------------------------------------------------------
@@ -244,7 +244,7 @@ OUString BrowseBox::GetAccessibleObjectName( ::svt::AccessibleBrowseBoxObjType e
             aRetText += OUString( RTL_CONSTASCII_USTRINGPARAM( "," ) );
             aRetText += OUString::valueOf(sal_Int32(GetCurColumnId()));
             aRetText += OUString( RTL_CONSTASCII_USTRINGPARAM( "]" ) );
-#endif
+#endif			
             break;
         case ::svt::BBTYPE_ROWHEADERCELL:
             aRetText = OUString( RTL_CONSTASCII_USTRINGPARAM( "RowHeaderCell" ) );
@@ -282,22 +282,22 @@ OUString BrowseBox::GetAccessibleObjectDescription( ::svt::AccessibleBrowseBoxOb
             aRetText = OUString( RTL_CONSTASCII_USTRINGPARAM( "BrowseBox description" ) );
             break;
         case ::svt::BBTYPE_TABLE:
-            //  aRetText = OUString( RTL_CONSTASCII_USTRINGPARAM( "TABLE description" ) );
+            //	aRetText = OUString( RTL_CONSTASCII_USTRINGPARAM( "TABLE description" ) );
             break;
         case ::svt::BBTYPE_ROWHEADERBAR:
-            //  aRetText = OUString( RTL_CONSTASCII_USTRINGPARAM( "ROWHEADERBAR description" ) );
+            //	aRetText = OUString( RTL_CONSTASCII_USTRINGPARAM( "ROWHEADERBAR description" ) );
             break;
         case ::svt::BBTYPE_COLUMNHEADERBAR:
-            //  aRetText = OUString( RTL_CONSTASCII_USTRINGPARAM( "COLUMNHEADERBAR description" ) );
+            //	aRetText = OUString( RTL_CONSTASCII_USTRINGPARAM( "COLUMNHEADERBAR description" ) );
             break;
         case ::svt::BBTYPE_TABLECELL:
-            //  aRetText = OUString( RTL_CONSTASCII_USTRINGPARAM( "TABLECELL description" ) );
+            //	aRetText = OUString( RTL_CONSTASCII_USTRINGPARAM( "TABLECELL description" ) );
             break;
         case ::svt::BBTYPE_ROWHEADERCELL:
-            //  aRetText = OUString( RTL_CONSTASCII_USTRINGPARAM( "ROWHEADERCELL description" ) );
+            //	aRetText = OUString( RTL_CONSTASCII_USTRINGPARAM( "ROWHEADERCELL description" ) );
             break;
         case ::svt::BBTYPE_COLUMNHEADERCELL:
-            //  aRetText = OUString( RTL_CONSTASCII_USTRINGPARAM( "COLUMNHEADERCELL description" ) );
+            //	aRetText = OUString( RTL_CONSTASCII_USTRINGPARAM( "COLUMNHEADERCELL description" ) );
             break;
         case ::svt::BBTYPE_CHECKBOXCELL:
             break;
diff --git a/svtools/source/brwbox/brwhead.cxx b/svtools/source/brwbox/brwhead.cxx
index 39845b84f7e0..3e85664c2fbd 100644
--- a/svtools/source/brwbox/brwhead.cxx
+++ b/svtools/source/brwbox/brwhead.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
@@ -101,7 +101,7 @@ void BrowserHeader::EndDrag()
             USHORT nOldPos = _pBrowseBox->GetColumnPos(nId),
                 nNewPos = GetItemPos( nId );
 
-            if (!_pBrowseBox->GetColumnId(0))   // Handle
+            if (!_pBrowseBox->GetColumnId(0))	// Handle
                 nNewPos++;
 
             if (nOldPos != nNewPos)
diff --git a/svtools/source/brwbox/brwimpl.hxx b/svtools/source/brwbox/brwimpl.hxx
index 3c9ddb2876f7..78173a4a6ce1 100644
--- a/svtools/source/brwbox/brwimpl.hxx
+++ b/svtools/source/brwbox/brwimpl.hxx
@@ -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
@@ -42,7 +42,7 @@ namespace svt
         typedef ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >    AccessibleRef;
         typedef ::std::map< sal_Int32, AccessibleRef >                                              THeaderCellMap;
 
-        struct  THeaderCellMapFunctorDispose : ::std::unary_function<THeaderCellMap::value_type,void>
+        struct  THeaderCellMapFunctorDispose : ::std::unary_function<THeaderCellMap::value_type,void> 
         {
             inline void operator()(const THeaderCellMap::value_type& _aType)
             {
@@ -71,7 +71,7 @@ namespace svt
         BrowseBoxImpl() : m_pAccessible(NULL)
         {
         }
-
+        
 
         /// @see AccessibleBrowseBox::getHeaderBar
         ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >
diff --git a/svtools/source/brwbox/datwin.cxx b/svtools/source/brwbox/datwin.cxx
index cb43e4989355..a53008ec2e19 100644
--- a/svtools/source/brwbox/datwin.cxx
+++ b/svtools/source/brwbox/datwin.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
@@ -126,7 +126,7 @@ void ButtonFrame::Draw( OutputDevice& rDev )
 BrowserColumn::BrowserColumn( USHORT nItemId, const class Image &rImage,
                               const String& rTitle, ULONG nWidthPixel, const Fraction& rCurrentZoom,
                               HeaderBarItemBits nFlags )
-:   _nId( nItemId ),
+:	_nId( nItemId ),
     _nWidth( nWidthPixel ),
     _aImage( rImage ),
     _aTitle( rTitle ),
diff --git a/svtools/source/brwbox/datwin.hxx b/svtools/source/brwbox/datwin.hxx
index 1deb8aeb5b56..cad4115cf859 100644
--- a/svtools/source/brwbox/datwin.hxx
+++ b/svtools/source/brwbox/datwin.hxx
@@ -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
@@ -50,13 +50,13 @@ DECLARE_LIST( RectangleList, Rectangle* )
 
 class ButtonFrame
 {
-    Rectangle   aRect;
-    Rectangle   aInnerRect;
-    String      aText;
-    BOOL        bPressed;
-    BOOL        bCurs;
-    BOOL        bAbbr;
-    BOOL        m_bDrawDisabled;
+    Rectangle	aRect;
+    Rectangle	aInnerRect;
+    String		aText;
+    BOOL		bPressed;
+    BOOL		bCurs;
+    BOOL		bAbbr;
+    BOOL		m_bDrawDisabled;
 
 public:
                ButtonFrame( const Point& rPt, const Size& rSz,
@@ -83,13 +83,13 @@ public:
 
 class BrowserColumn
 {
-    USHORT              _nId;
-    ULONG               _nOriginalWidth;
-    ULONG               _nWidth;
-    Image               _aImage;
-    String              _aTitle;
-    BOOL                _bFrozen;
-    HeaderBarItemBits   _nFlags;
+    USHORT      		_nId;
+    ULONG				_nOriginalWidth;
+    ULONG       		_nWidth;
+    Image       		_aImage;
+    String      		_aTitle;
+    BOOL        		_bFrozen;
+    HeaderBarItemBits	_nFlags;
 
 public:
                         BrowserColumn( USHORT nItemId, const Image &rImage,
@@ -97,21 +97,21 @@ public:
                                         HeaderBarItemBits nFlags );
     virtual            ~BrowserColumn();
 
-    USHORT              GetId() const { return _nId; }
+    USHORT				GetId() const { return _nId; }
 
-    ULONG               Width() { return _nWidth; }
-    Image&              GetImage() { return _aImage; }
-    String&             Title() { return _aTitle; }
-    HeaderBarItemBits&  Flags() { return _nFlags; }
+    ULONG				Width() { return _nWidth; }
+    Image&  			GetImage() { return _aImage; }
+    String& 			Title() { return _aTitle; }
+    HeaderBarItemBits&	Flags() { return _nFlags; }
 
-    BOOL                IsFrozen() const { return _bFrozen; }
-    void                Freeze( BOOL bFreeze = TRUE ) { _bFrozen = bFreeze; }
+    BOOL				IsFrozen() const { return _bFrozen; }
+    void				Freeze( BOOL bFreeze = TRUE ) { _bFrozen = bFreeze; }
 
-    virtual void        Draw( BrowseBox& rBox, OutputDevice& rDev,
+    virtual void		Draw( BrowseBox& rBox, OutputDevice& rDev,
                               const Point& rPos, BOOL bCurs  );
 
-    void                SetWidth(ULONG nNewWidthPixel, const Fraction& rCurrentZoom);
-    void                ZoomChanged(const Fraction& rNewZoom);
+    void				SetWidth(ULONG nNewWidthPixel, const Fraction& rCurrentZoom);
+    void				ZoomChanged(const Fraction& rNewZoom);
 };
 
 //===================================================================
@@ -122,34 +122,34 @@ class BrowserDataWin
             ,public DropTargetHelper
 {
 public:
-    BrowserHeader*  pHeaderBar;     // only for BROWSER_HEADERBAR_NEW
-    Window*         pEventWin;      // Window of forwarded events
-    ScrollBarBox*   pCornerWin;     // Window in the corner btw the ScrollBars
-    BOOL*           pDtorNotify;
+    BrowserHeader*	pHeaderBar;		// only for BROWSER_HEADERBAR_NEW
+    Window*			pEventWin;		// Window of forwarded events
+    ScrollBarBox*	pCornerWin;		// Window in the corner btw the ScrollBars
+    BOOL*			pDtorNotify;
     AutoTimer       aMouseTimer;    // recalls MouseMove on dragging out
     MouseEvent      aRepeatEvt;     // a MouseEvent to repeat
-    Point           aLastMousePos;  // verhindert pseudo-MouseMoves
+    Point			aLastMousePos;	// verhindert pseudo-MouseMoves
 
-    String          aRealRowCount;  // zur Anzeige im VScrollBar
+    String			aRealRowCount;	// zur Anzeige im VScrollBar
 
     RectangleList   aInvalidRegion; // invalidated Rectangles during !UpdateMode
-    FASTBOOL        bInPaint;       // TRUE while in Paint
-    FASTBOOL        bInCommand;     // TRUE while in Command
+    FASTBOOL		bInPaint;		// TRUE while in Paint
+    FASTBOOL		bInCommand;		// TRUE while in Command
     FASTBOOL        bNoScrollBack;  // nur vorwaerts scrollen
     FASTBOOL        bNoHScroll;     // kein horizontaler Scrollbar
     FASTBOOL        bNoVScroll;     // no vertical scrollbar
-    FASTBOOL        bAutoHScroll;   // autohide horizontaler Scrollbar
-    FASTBOOL        bAutoVScroll;   // autohide horizontaler Scrollbar
-    FASTBOOL        bUpdateMode;    // nicht SV-UpdateMode wegen Invalidate()
-    FASTBOOL        bAutoSizeLastCol;// last column always fills up window
-    FASTBOOL        bResizeOnPaint; // outstanding resize-event
-    FASTBOOL        bUpdateOnUnlock;    // Update() while locked
-    FASTBOOL        bInUpdateScrollbars;    // Rekursionsschutz
-    FASTBOOL        bHadRecursion;          // Rekursion war aufgetreten
-    FASTBOOL        bOwnDataChangedHdl;     // dont change colors in DataChanged
-    FASTBOOL        bCallingDropCallback;   // we're in a callback to AcceptDrop or ExecuteDrop curently
-    USHORT          nUpdateLock;    // lock count, dont call Control::Update()!
-    short           nCursorHidden;  // new conuter for DoHide/ShowCursor
+    FASTBOOL		bAutoHScroll;	// autohide horizontaler Scrollbar
+    FASTBOOL		bAutoVScroll;	// autohide horizontaler Scrollbar
+    FASTBOOL		bUpdateMode;	// nicht SV-UpdateMode wegen Invalidate()
+    FASTBOOL		bAutoSizeLastCol;// last column always fills up window
+    FASTBOOL		bResizeOnPaint; // outstanding resize-event
+    FASTBOOL		bUpdateOnUnlock;	// Update() while locked
+    FASTBOOL		bInUpdateScrollbars;	// Rekursionsschutz
+    FASTBOOL		bHadRecursion;			// Rekursion war aufgetreten
+    FASTBOOL		bOwnDataChangedHdl;		// dont change colors in DataChanged
+    FASTBOOL		bCallingDropCallback;	// we're in a callback to AcceptDrop or ExecuteDrop curently
+    USHORT			nUpdateLock;	// lock count, dont call Control::Update()!
+    short			nCursorHidden;	// new conuter for DoHide/ShowCursor
 
     long            m_nDragRowDividerLimit;
     long            m_nDragRowDividerOffset;
@@ -158,9 +158,9 @@ public:
                     BrowserDataWin( BrowseBox* pParent );
                     ~BrowserDataWin();
 
-    virtual void    DataChanged( const DataChangedEvent& rDCEvt );
+    virtual void	DataChanged( const DataChangedEvent& rDCEvt );
     virtual void    Paint( const Rectangle& rRect );
-    virtual void    RequestHelp( const HelpEvent& rHEvt );
+    virtual void	RequestHelp( const HelpEvent& rHEvt );
     virtual void    Command( const CommandEvent& rEvt );
     virtual void    MouseButtonDown( const MouseEvent& rEvt );
     virtual void    MouseMove( const MouseEvent& rEvt );
@@ -175,19 +175,19 @@ public:
     virtual sal_Int8 ExecuteDrop( const ExecuteDropEvent& rEvt );
 
     // DragSourceHelper overridables
-    virtual void    StartDrag( sal_Int8 _nAction, const Point& _rPosPixel );
+    virtual void	StartDrag( sal_Int8 _nAction, const Point& _rPosPixel );
 
 
-    BrowseEvent     CreateBrowseEvent( const Point& rPosPixel );
+    BrowseEvent 	CreateBrowseEvent( const Point& rPosPixel );
     void            Repaint();
     BrowseBox*      GetParent() const
                          { return (BrowseBox*) Window::GetParent(); }
-    const String&   GetRealRowCount() const { return aRealRowCount; }
+    const String&	GetRealRowCount() const { return aRealRowCount; }
 
     void            SetUpdateMode( BOOL bMode );
     FASTBOOL        GetUpdateMode() const { return bUpdateMode; }
-    void            EnterUpdateLock() { ++nUpdateLock; }
-    void            LeaveUpdateLock();
+    void			EnterUpdateLock() { ++nUpdateLock; }
+    void			LeaveUpdateLock();
     void            Update();
     void            DoOutstandingInvalidations();
     void            Invalidate( USHORT nFlags = 0 );
@@ -213,14 +213,14 @@ inline void BrowserDataWin::Repaint()
 
 class BrowserScrollBar: public ScrollBar
 {
-    ULONG           _nTip;
-    ULONG           _nLastPos;
-    BrowserDataWin* _pDataWin;
+    ULONG			_nTip;
+    ULONG			_nLastPos;
+    BrowserDataWin*	_pDataWin;
 
 public:
                     BrowserScrollBar( Window* pParent, WinBits nStyle,
                                       BrowserDataWin *pDataWin )
-                    :   ScrollBar( pParent, nStyle ),
+                    :	ScrollBar( pParent, nStyle ),
                         _nTip( 0 ),
                         _nLastPos( ULONG_MAX ),
                         _pDataWin( pDataWin )
@@ -228,7 +228,7 @@ public:
                     //ScrollBar( Window* pParent, const ResId& rResId );
 
     virtual void    Tracking( const TrackingEvent& rTEvt );
-    virtual void    EndScroll();
+    virtual void	EndScroll();
 };
 
 //===================================================================
diff --git a/svtools/source/brwbox/ebbcontrols.cxx b/svtools/source/brwbox/ebbcontrols.cxx
index edf56f0b9b34..3fdd3f41960e 100644
--- a/svtools/source/brwbox/ebbcontrols.cxx
+++ b/svtools/source/brwbox/ebbcontrols.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
@@ -188,7 +188,7 @@ namespace svt
                         if (nPos >= GetEntryCount())
                             nPos = GetEntryCount() - 1;
                         SelectEntryPos(sal::static_int_cast< USHORT >(nPos));
-                        Select();   // for calling Modify
+                        Select();	// for calling Modify
                         return 1;
                     }
                     else if (GetParent()->PreNotify(rNEvt))
@@ -449,13 +449,13 @@ namespace svt
             {
                 Selection aSel = m_pEditImplementation->GetSelection();
                 bResult = !aSel && aSel.Max() == m_pEditImplementation->GetText( LINEEND_LF ).Len();
-            }   break;
+            }	break;
             case KEY_HOME:
             case KEY_LEFT:
             {
                 Selection aSel = m_pEditImplementation->GetSelection();
                 bResult = !aSel && aSel.Min() == 0;
-            }   break;
+            }	break;
             default:
                 bResult = sal_True;
         }
@@ -506,13 +506,13 @@ namespace svt
             {
                 Selection aSel = GetSpinWindow().GetSelection();
                 bResult = !aSel && aSel.Max() == GetSpinWindow().GetText().Len();
-            }   break;
+            }	break;
             case KEY_HOME:
             case KEY_LEFT:
             {
                 Selection aSel = GetSpinWindow().GetSelection();
                 bResult = !aSel && aSel.Min() == 0;
-            }   break;
+            }	break;
             default:
                 bResult = sal_True;
         }
@@ -622,7 +622,7 @@ namespace svt
     }
 
 // .......................................................................
-}   // namespace svt
+}	// namespace svt
 // .......................................................................
 
 
diff --git a/svtools/source/brwbox/editbrowsebox.cxx b/svtools/source/brwbox/editbrowsebox.cxx
index 4f0afbaf5d2d..3901de17be75 100644
--- a/svtools/source/brwbox/editbrowsebox.cxx
+++ b/svtools/source/brwbox/editbrowsebox.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
@@ -67,7 +67,7 @@ namespace svt
         sal_Bool isHiContrast(Window* _pWindow)
         {
             OSL_ENSURE(_pWindow,"Window must be not null!");
-            return _pWindow && _pWindow->GetSettings().GetStyleSettings().GetHighContrastMode();
+            return _pWindow && _pWindow->GetSettings().GetStyleSettings().GetHighContrastMode(); 
         }
 
         //..............................................................
@@ -88,7 +88,7 @@ namespace svt
     using  com::sun::star::accessibility::XAccessible;
     //==================================================================
 
-    #define HANDLE_ID   0
+    #define HANDLE_ID	0
 
     //==================================================================
     //= EditBrowserHeader
@@ -174,7 +174,7 @@ namespace svt
     {
         DBG_CTOR(EditBrowseBox,NULL);
 
-        impl_construct();
+        impl_construct();		
     }
 
     //==================================================================
@@ -269,7 +269,7 @@ namespace svt
         nPaintRow = nRow;
         return sal_True;
     }
-
+    
     //------------------------------------------------------------------------------
     IMPL_LINK(EditBrowseBox, StartEditHdl, void*, EMPTYARG)
     {
@@ -503,7 +503,7 @@ namespace svt
     void EditBrowseBox::MouseButtonDown(const BrowserMouseEvent& rEvt)
     {
         sal_uInt16  nColPos = GetColumnPos( rEvt.GetColumnId() );
-        long    nRow    = rEvt.GetRow();
+        long	nRow	= rEvt.GetRow();
 
         // absorb double clicks
         if (rEvt.GetClicks() > 1 && rEvt.GetRow() >= 0)
@@ -527,7 +527,7 @@ namespace svt
         }
 
         if (0 == rEvt.GetColumnId())
-        {   // it was the handle column. save the current cell content if necessary
+        {	// it was the handle column. save the current cell content if necessary
             // (clicking on the handle column results in selecting the current row)
             // 23.01.2001 - 82797 - FS
             if (IsEditing() && aController->IsModified())
@@ -574,7 +574,7 @@ namespace svt
             AsynchGetFocus();
 
         if (IsEditing() && aController->GetWindow().IsEnabled() && aController->WantMouseEvent())
-        {   // forwards the event to the control
+        {	// forwards the event to the control
 
             // If the field has been moved previously, we have to adjust the position
 
@@ -617,7 +617,7 @@ namespace svt
     void EditBrowseBox::Dispatch( sal_uInt16 _nId )
     {
         if ( _nId == BROWSER_ENHANCESELECTION )
-        {   // this is a workaround for the bug in the base class:
+        {	// this is a workaround for the bug in the base class:
             // if the row selection is to be extended (which is what BROWSER_ENHANCESELECTION tells us)
             // then the base class does not revert any column selections, while, for doing a "simple"
             // selection (BROWSER_SELECT), it does. In fact, it does not only revert the col selection then,
@@ -643,18 +643,18 @@ namespace svt
         switch (rEvt.GetType())
         {
             case EVENT_KEYINPUT:
-                if  (   (IsEditing() && Controller()->GetWindow().HasChildPathFocus())
-                    ||  rEvt.GetWindow() == &GetDataWindow()
-                    ||  (!IsEditing() && HasChildPathFocus())
+                if	(	(IsEditing() && Controller()->GetWindow().HasChildPathFocus())
+                    ||	rEvt.GetWindow() == &GetDataWindow()
+                    ||	(!IsEditing() && HasChildPathFocus())
                     )
                 {
-                    const KeyEvent* pKeyEvent = rEvt.GetKeyEvent();
+                    const KeyEvent* pKeyEvent =	rEvt.GetKeyEvent();
                     sal_uInt16 nCode  = pKeyEvent->GetKeyCode().GetCode();
                     sal_Bool   bShift = pKeyEvent->GetKeyCode().IsShift();
                     sal_Bool   bCtrl  = pKeyEvent->GetKeyCode().IsMod1();
-                    sal_Bool   bAlt =   pKeyEvent->GetKeyCode().IsMod2();
-                    sal_Bool   bLocalSelect=    sal_False;
-                    sal_Bool   bNonEditOnly =   sal_False;
+                    sal_Bool   bAlt =	pKeyEvent->GetKeyCode().IsMod2();
+                    sal_Bool   bLocalSelect=	sal_False;
+                    sal_Bool   bNonEditOnly =	sal_False;
                     sal_uInt16 nId = BROWSER_NONE;
 
                     if (!bAlt && !bCtrl && !bShift )
@@ -708,7 +708,7 @@ namespace svt
                     if ( !bAlt && bCtrl && bShift )
                         switch ( nCode )
                         {
-                            case KEY_SPACE:         nId = BROWSER_SELECTCOLUMN; bLocalSelect = sal_True; break;
+                            case KEY_SPACE:			nId = BROWSER_SELECTCOLUMN; bLocalSelect = sal_True; break;
                         }
 
 
@@ -725,10 +725,10 @@ namespace svt
                         }
 
 
-                    if  (   ( nId != BROWSER_NONE )
-                        &&  (   !IsEditing()
-                            ||  (   !bNonEditOnly
-                                &&  aController->MoveAllowed( *pKeyEvent )
+                    if	(	( nId != BROWSER_NONE )
+                        &&	(	!IsEditing()
+                            ||	(	!bNonEditOnly
+                                &&	aController->MoveAllowed( *pKeyEvent )
                                 )
                             )
                         )
@@ -831,13 +831,13 @@ namespace svt
     {
         BrowseBox::DataChanged( rDCEvt );
 
-        if ((( rDCEvt.GetType() == DATACHANGED_SETTINGS )   ||
-            ( rDCEvt.GetType() == DATACHANGED_DISPLAY   ))  &&
-            ( rDCEvt.GetFlags() & SETTINGS_STYLE        ))
+        if ((( rDCEvt.GetType() == DATACHANGED_SETTINGS	)	||
+            ( rDCEvt.GetType() == DATACHANGED_DISPLAY	))	&&
+            ( rDCEvt.GetFlags() & SETTINGS_STYLE		))
         {
             ImplInitSettings( sal_True, sal_True, sal_True );
             Invalidate();
-        }
+        }		
     }
 
     //------------------------------------------------------------------------------
@@ -905,7 +905,7 @@ namespace svt
         if (!nInfo && nNewColId != nEditCol)
             nInfo |= COLCHANGE;
 
-        if (nInfo == 0)   // nothing happened
+        if (nInfo == 0)	  // nothing happened
             return sal_True;
 
         // save the cell content
@@ -947,9 +947,9 @@ namespace svt
         {
             Window& rWindow = GetDataWindow();
             // don't paint too much
-            // update the status immediatly if possible
+            // update the status immediatly if possible				
             if ((nEditRow >= 0) && (GetBrowserFlags() & EBBF_NO_HANDLE_COLUMN_CONTENT) == 0)
-            {
+            {				
                 Rectangle aRect = GetFieldRectPixel(nEditRow, 0, sal_False );
                 // status cell should be painted if and only if text is displayed
                 // note: bPaintStatus is mutable, but Solaris has problems with assigning
@@ -957,16 +957,16 @@ namespace svt
                 pTHIS->bPaintStatus = static_cast< sal_Bool >
                     (( GetBrowserFlags() & EBBF_HANDLE_COLUMN_TEXT ) == EBBF_HANDLE_COLUMN_TEXT );
                 rWindow.Paint(aRect);
-                pTHIS->bPaintStatus = sal_True;
-            }
-
+                pTHIS->bPaintStatus = sal_True;			
+            }		
+            
             // don't paint during row change
-            rWindow.EnablePaint(sal_False);
+            rWindow.EnablePaint(sal_False);		
 
             // the last veto chance for derived classes
             if (!pTHIS->CursorMoving(nNewRow, nNewColId))
             {
-                pTHIS->InvalidateStatusCell(nEditRow);
+                pTHIS->InvalidateStatusCell(nEditRow);									
                 rWindow.EnablePaint(sal_True);
                 return sal_False;
             }
@@ -975,7 +975,7 @@ namespace svt
                 rWindow.EnablePaint(sal_True);
                 return sal_True;
             }
-        }
+        }			
         else
             return pTHIS->CursorMoving(nNewRow, nNewColId);
     }
@@ -1013,7 +1013,7 @@ namespace svt
         if (nEditRow != nNewRow)
         {
             if ((GetBrowserFlags() & EBBF_NO_HANDLE_COLUMN_CONTENT) == 0)
-                InvalidateStatusCell(nNewRow);
+                InvalidateStatusCell(nNewRow);		
             nEditRow = nNewRow;
         }
         ActivateCell();
@@ -1139,8 +1139,8 @@ namespace svt
         ReleaseController(aOldController, nOldEditRow, nOldEditCol);
 
         aOldController  = CellControllerRef();
-        nOldEditRow     = -1;
-        nOldEditCol     =  0;
+        nOldEditRow		= -1;
+        nOldEditCol		=  0;
 
         return 0;
     }
@@ -1276,17 +1276,17 @@ namespace svt
     sal_uInt32 EditBrowseBox::GetAutoColumnWidth(sal_uInt16 nColId)
     {
         sal_uInt32 nCurColWidth  = GetColumnWidth(nColId);
-        sal_uInt32 nMinColWidth = CalcZoom(20); // minimum
+        sal_uInt32 nMinColWidth = CalcZoom(20);	// minimum
         sal_uInt32 nNewColWidth = nMinColWidth;
-        long nMaxRows      = Min(long(GetVisibleRows()), GetRowCount());
+        long nMaxRows	   = Min(long(GetVisibleRows()), GetRowCount());
         long nLastVisRow   = GetTopRow() + nMaxRows - 1;
 
-        if (GetTopRow() <= nLastVisRow) // calc the column with using the cell contents
+        if (GetTopRow() <= nLastVisRow)	// calc the column with using the cell contents
         {
             for (long i = GetTopRow(); i <= nLastVisRow; ++i)
                 nNewColWidth = std::max(nNewColWidth,GetTotalCellWidth(i,nColId) + 12);
 
-            if (nNewColWidth == nCurColWidth)   // size has not changed
+            if (nNewColWidth == nCurColWidth)	// size has not changed
                 nNewColWidth = GetDefaultColumnWidth(GetColumnTitle(nColId));
         }
         else
@@ -1319,7 +1319,7 @@ namespace svt
         // an update for the parent is done (because it's in the queue already)
         // which may lead to hiding this window immediately
 // #95598# comment out OJ
-/*      if (pCheckBoxPaint->GetParent())
+/*		if (pCheckBoxPaint->GetParent())
             pCheckBoxPaint->GetParent()->Update();
 */
         pCheckBoxPaint->GetBox().Enable(_bEnabled);
@@ -1432,6 +1432,6 @@ namespace svt
         return sal_True;
     }
 // .......................................................................
-}   // namespace svt
+}	// namespace svt
 // .......................................................................
 
diff --git a/svtools/source/brwbox/editbrowsebox.hrc b/svtools/source/brwbox/editbrowsebox.hrc
index 5902365b1b05..f16e32a7b8a5 100644
--- a/svtools/source/brwbox/editbrowsebox.hrc
+++ b/svtools/source/brwbox/editbrowsebox.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
@@ -28,15 +28,15 @@
 #ifndef _SVTOOLS_EDITBROWSEBOX_HRC_
 #define _SVTOOLS_EDITBROWSEBOX_HRC_
 
-#define IMG_EBB_CURRENT             1
-#define IMG_EBB_MODIFIED            2
-#define IMG_EBB_NEW                 3
-#define IMG_EBB_DELETED             4
-#define IMG_EBB_CURRENTNEW          5
-#define IMG_EBB_PRIMARYKEY          6
-#define IMG_EBB_CURRENT_PRIMARYKEY  7
-#define IMG_EBB_FILTER              8
-#define IMG_EBB_HEADERFOOTER        9
+#define IMG_EBB_CURRENT				1
+#define IMG_EBB_MODIFIED			2
+#define IMG_EBB_NEW					3
+#define IMG_EBB_DELETED				4
+#define IMG_EBB_CURRENTNEW			5
+#define IMG_EBB_PRIMARYKEY			6
+#define IMG_EBB_CURRENT_PRIMARYKEY	7
+#define IMG_EBB_FILTER				8
+#define IMG_EBB_HEADERFOOTER		9
 
 #endif // _SVTOOLS_EDITBROWSEBOX_HRC_
 
diff --git a/svtools/source/brwbox/editbrowsebox.src b/svtools/source/brwbox/editbrowsebox.src
index 6511d97ea86a..c189f7033dde 100644
--- a/svtools/source/brwbox/editbrowsebox.src
+++ b/svtools/source/brwbox/editbrowsebox.src
@@ -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
diff --git a/svtools/source/brwbox/editbrowsebox2.cxx b/svtools/source/brwbox/editbrowsebox2.cxx
index ed62b2cb1520..24337ae3785b 100644
--- a/svtools/source/brwbox/editbrowsebox2.cxx
+++ b/svtools/source/brwbox/editbrowsebox2.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
@@ -40,7 +40,7 @@ namespace svt
     using namespace com::sun::star::accessibility;
     using namespace com::sun::star::uno;
     using namespace ::com::sun::star::accessibility::AccessibleEventId;
-
+    
 // -----------------------------------------------------------------------------
 Reference< XAccessible > EditBrowseBox::CreateAccessibleCheckBoxCell(long _nRow, USHORT _nColumnPos,const TriState& eState,sal_Bool _bEnabled)
 {
@@ -88,10 +88,10 @@ void EditBrowseBox::implCreateActiveAccessible( )
          if ( xMy.is() && xCont.is() )
           {
              m_aImpl->m_xActiveCell = getAccessibleFactory().createEditBrowseBoxTableCellAccess(
-                 xMy,                                                       // parent accessible
-                 xCont,                                                     // control accessible
-                 VCLUnoHelper::GetInterface( &aController->GetWindow() ),   // focus window (for notifications)
-                 *this,                                                     // the browse box
+                 xMy,														// parent accessible
+                 xCont,														// control accessible
+                 VCLUnoHelper::GetInterface( &aController->GetWindow() ),	// focus window (for notifications)
+                 *this,														// the browse box
                  GetCurRow(),
                  GetColumnPos( GetCurColumnId() )
              );
@@ -158,8 +158,8 @@ void EditBrowseBox::DetermineFocus( const sal_uInt16 _nGetFocusFlags )
 
         if ( GetBrowserFlags( ) & EBBF_SMART_TAB_TRAVEL )
         {
-            if  (   bHasFocus                           // we got the focus
-                &&  ( _nGetFocusFlags & GETFOCUS_TAB )  // using the TAB key
+            if	(	bHasFocus							// we got the focus
+                &&	( _nGetFocusFlags & GETFOCUS_TAB )	// using the TAB key
                 )
             {
                 long nRows = GetRowCount();
@@ -174,7 +174,7 @@ void EditBrowseBox::DetermineFocus( const sal_uInt16 _nGetFocusFlags )
                             GoToRowColumnId( 0, GetColumnId( 0 ) );
                         }
                         else
-                        {   // the first column is the handle column -> not focussable
+                        {	// the first column is the handle column -> not focussable
                             if ( nCols > 1 )
                                 GoToRowColumnId( 0, GetColumnId( 1 ) );
                         }
diff --git a/svtools/source/brwbox/editbrowseboximpl.hxx b/svtools/source/brwbox/editbrowseboximpl.hxx
index 724da694b9c1..5aa19756b104 100644
--- a/svtools/source/brwbox/editbrowseboximpl.hxx
+++ b/svtools/source/brwbox/editbrowseboximpl.hxx
@@ -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
@@ -25,7 +25,7 @@
  *
  ************************************************************************/
 #ifndef SVTOOLS_EDITBROWSEBOX_IMPL_HXX
-#define SVTOOLS_EDITBROWSEBOX_IMPL_HXX
+#define	SVTOOLS_EDITBROWSEBOX_IMPL_HXX
 
 #include <com/sun/star/accessibility/XAccessible.hpp>
 
diff --git a/svtools/source/config/accessibilityoptions.cxx b/svtools/source/config/accessibilityoptions.cxx
index b2d2c54232b0..6d3b4d7a9d7d 100644
--- a/svtools/source/config/accessibilityoptions.cxx
+++ b/svtools/source/config/accessibilityoptions.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
@@ -74,40 +74,40 @@ class SvtAccessibilityOptions_Impl
 {
 private:
     css::uno::Reference< css::container::XNameAccess > m_xCfg;
-    sal_Bool                                           bIsModified;
+    sal_Bool										   bIsModified;
 
 public:
     SvtAccessibilityOptions_Impl();
     ~SvtAccessibilityOptions_Impl();
 
-    void        SetVCLSettings();
-    sal_Bool    GetAutoDetectSystemHC();
-    sal_Bool    GetIsForPagePreviews() const;
-    sal_Bool    GetIsHelpTipsDisappear() const;
-    sal_Bool    GetIsAllowAnimatedGraphics() const;
-    sal_Bool    GetIsAllowAnimatedText() const;
-    sal_Bool    GetIsAutomaticFontColor() const;
-    sal_Bool    GetIsSystemFont() const;
-    sal_Int16   GetHelpTipSeconds() const;
-    sal_Bool    IsSelectionInReadonly() const;
-
-    void        SetAutoDetectSystemHC(sal_Bool bSet);
-    void        SetIsForPagePreviews(sal_Bool bSet);
-    void        SetIsHelpTipsDisappear(sal_Bool bSet);
-    void        SetIsAllowAnimatedGraphics(sal_Bool bSet);
-    void        SetIsAllowAnimatedText(sal_Bool bSet);
-    void        SetIsAutomaticFontColor(sal_Bool bSet);
-    void        SetIsSystemFont(sal_Bool bSet);
-    void        SetHelpTipSeconds(sal_Int16 nSet);
-    void        SetSelectionInReadonly(sal_Bool bSet);
-
-    sal_Bool    IsModified() const { return bIsModified; };
+    void		SetVCLSettings();
+    sal_Bool	GetAutoDetectSystemHC();
+    sal_Bool	GetIsForPagePreviews() const;
+    sal_Bool	GetIsHelpTipsDisappear() const;
+    sal_Bool	GetIsAllowAnimatedGraphics() const;
+    sal_Bool	GetIsAllowAnimatedText() const;
+    sal_Bool	GetIsAutomaticFontColor() const;
+    sal_Bool	GetIsSystemFont() const;
+    sal_Int16	GetHelpTipSeconds() const;
+    sal_Bool	IsSelectionInReadonly() const;
+
+    void		SetAutoDetectSystemHC(sal_Bool bSet);
+    void		SetIsForPagePreviews(sal_Bool bSet);
+    void		SetIsHelpTipsDisappear(sal_Bool bSet);
+    void		SetIsAllowAnimatedGraphics(sal_Bool bSet);
+    void		SetIsAllowAnimatedText(sal_Bool bSet);
+    void		SetIsAutomaticFontColor(sal_Bool bSet);
+    void		SetIsSystemFont(sal_Bool bSet);
+    void		SetHelpTipSeconds(sal_Int16 nSet);
+    void		SetSelectionInReadonly(sal_Bool bSet);
+
+    sal_Bool	IsModified() const { return bIsModified; };
 };
 
 // initialization of static members --------------------------------------
 
-SvtAccessibilityOptions_Impl* volatile  SvtAccessibilityOptions::sm_pSingleImplConfig =NULL;
-sal_Int32                     volatile  SvtAccessibilityOptions::sm_nAccessibilityRefCount(0);
+SvtAccessibilityOptions_Impl* volatile 	SvtAccessibilityOptions::sm_pSingleImplConfig =NULL;
+sal_Int32					  volatile 	SvtAccessibilityOptions::sm_nAccessibilityRefCount(0);
 
 namespace
 {
@@ -146,7 +146,7 @@ SvtAccessibilityOptions_Impl::~SvtAccessibilityOptions_Impl()
 sal_Bool SvtAccessibilityOptions_Impl::GetAutoDetectSystemHC()
 {
     css::uno::Reference< css::beans::XPropertySet > xNode(m_xCfg, css::uno::UNO_QUERY);
-    sal_Bool                                        bRet = sal_True;
+    sal_Bool										bRet = sal_True;
 
     try
     {
@@ -164,7 +164,7 @@ sal_Bool SvtAccessibilityOptions_Impl::GetAutoDetectSystemHC()
 sal_Bool SvtAccessibilityOptions_Impl::GetIsForPagePreviews() const
 {
     css::uno::Reference< css::beans::XPropertySet > xNode(m_xCfg, css::uno::UNO_QUERY);
-    sal_Bool                                        bRet = sal_True;
+    sal_Bool										bRet = sal_True;
 
     try
     {
@@ -181,7 +181,7 @@ sal_Bool SvtAccessibilityOptions_Impl::GetIsForPagePreviews() const
 sal_Bool SvtAccessibilityOptions_Impl::GetIsHelpTipsDisappear() const
 {
     css::uno::Reference< css::beans::XPropertySet > xNode(m_xCfg, css::uno::UNO_QUERY);
-    sal_Bool                                        bRet = sal_True;
+    sal_Bool										bRet = sal_True;
 
     try
     {
@@ -199,7 +199,7 @@ sal_Bool SvtAccessibilityOptions_Impl::GetIsHelpTipsDisappear() const
 sal_Bool SvtAccessibilityOptions_Impl::GetIsAllowAnimatedGraphics() const
 {
     css::uno::Reference< css::beans::XPropertySet > xNode(m_xCfg, css::uno::UNO_QUERY);
-    sal_Bool                                        bRet = sal_True;
+    sal_Bool										bRet = sal_True;
 
     try
     {
@@ -217,7 +217,7 @@ sal_Bool SvtAccessibilityOptions_Impl::GetIsAllowAnimatedGraphics() const
 sal_Bool SvtAccessibilityOptions_Impl::GetIsAllowAnimatedText() const
 {
     css::uno::Reference< css::beans::XPropertySet > xNode(m_xCfg, css::uno::UNO_QUERY);
-    sal_Bool                                        bRet = sal_True;
+    sal_Bool										bRet = sal_True;
 
     try
     {
@@ -235,7 +235,7 @@ sal_Bool SvtAccessibilityOptions_Impl::GetIsAllowAnimatedText() const
 sal_Bool SvtAccessibilityOptions_Impl::GetIsAutomaticFontColor() const
 {
     css::uno::Reference< css::beans::XPropertySet > xNode(m_xCfg, css::uno::UNO_QUERY);
-    sal_Bool                                        bRet = sal_False;
+    sal_Bool										bRet = sal_False;
 
     try
     {
@@ -253,7 +253,7 @@ sal_Bool SvtAccessibilityOptions_Impl::GetIsAutomaticFontColor() const
 sal_Bool SvtAccessibilityOptions_Impl::GetIsSystemFont() const
 {
     css::uno::Reference< css::beans::XPropertySet > xNode(m_xCfg, css::uno::UNO_QUERY);
-    sal_Bool                                        bRet = sal_True;
+    sal_Bool										bRet = sal_True;
 
     try
     {
@@ -271,7 +271,7 @@ sal_Bool SvtAccessibilityOptions_Impl::GetIsSystemFont() const
 sal_Int16 SvtAccessibilityOptions_Impl::GetHelpTipSeconds() const
 {
     css::uno::Reference< css::beans::XPropertySet > xNode(m_xCfg, css::uno::UNO_QUERY);
-    sal_Int16                                       nRet = 4;
+    sal_Int16										nRet = 4;
 
     try
     {
@@ -289,7 +289,7 @@ sal_Int16 SvtAccessibilityOptions_Impl::GetHelpTipSeconds() const
 sal_Bool SvtAccessibilityOptions_Impl::IsSelectionInReadonly() const
 {
     css::uno::Reference< css::beans::XPropertySet > xNode(m_xCfg, css::uno::UNO_QUERY);
-    sal_Bool                                        bRet = sal_False;
+    sal_Bool										bRet = sal_False;
 
     try
     {
@@ -527,7 +527,7 @@ SvtAccessibilityOptions::~SvtAccessibilityOptions()
     if( !--sm_nAccessibilityRefCount )
     {
         //if( sm_pSingleImplConfig->IsModified() )
-        //  sm_pSingleImplConfig->Commit();
+        //	sm_pSingleImplConfig->Commit();
         DELETEZ( sm_pSingleImplConfig );
     }
 }
diff --git a/svtools/source/config/apearcfg.cxx b/svtools/source/config/apearcfg.cxx
index 316e6ab34656..ad7cff780ddb 100644
--- a/svtools/source/config/apearcfg.cxx
+++ b/svtools/source/config/apearcfg.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
@@ -40,7 +40,7 @@
 #define DEFAULT_DRAGMODE    2
 #define DEFAULT_SNAPMODE    0
 #define DEFAULT_SCALEFACTOR 100
-#define DEFAULT_AAMINHEIGHT 8
+#define DEFAULT_AAMINHEIGHT	8
 
 using namespace ::rtl;
 using namespace ::com::sun::star::uno;
@@ -52,23 +52,23 @@ sal_Bool SvtTabAppearanceCfg::bInitialized = sal_False;
  --------------------------------------------------------------------*/
 SvtTabAppearanceCfg::SvtTabAppearanceCfg()
     :ConfigItem(OUString::createFromAscii("Office.Common/View"))
-    ,nLookNFeel         ( DEFAULT_LOOKNFEEL )
-    ,nDragMode          ( DEFAULT_DRAGMODE )
+    ,nLookNFeel			( DEFAULT_LOOKNFEEL )
+    ,nDragMode			( DEFAULT_DRAGMODE )
     ,nScaleFactor       ( DEFAULT_SCALEFACTOR )
-    ,nSnapMode          ( DEFAULT_SNAPMODE )
+    ,nSnapMode			( DEFAULT_SNAPMODE )
     ,nMiddleMouse       ( MOUSE_MIDDLE_AUTOSCROLL )
 #if defined( UNX ) || defined ( FS_PRIV_DEBUG )
-    ,nAAMinPixelHeight  ( DEFAULT_AAMINHEIGHT )
+    ,nAAMinPixelHeight	( DEFAULT_AAMINHEIGHT )
 #endif
     ,bMenuMouseFollow(FALSE)
     ,bSingleLineTabCtrl(FALSE)
     ,bColoredTabCtrl(FALSE)
 #if defined( UNX ) || defined ( FS_PRIV_DEBUG )
-    ,bFontAntialiasing  ( TRUE )
+    ,bFontAntialiasing	( TRUE )
 #endif
 {
     RTL_LOGFILE_CONTEXT(aLog, "svtools SvtTabAppearanceCfg::SvtTabAppearanceCfg()");
-
+    
     const Sequence<OUString>& rNames = GetPropertyNames();
     Sequence<Any> aValues = GetProperties(rNames);
     const Any* pValues = aValues.getConstArray();
@@ -238,20 +238,20 @@ void SvtTabAppearanceCfg::SetApplicationDefaults ( Application* pApp )
     switch ( nLookNFeel )
     {
         case LookMotif:
-            hAppStyle.SetStandardUnixStyles();  break;
+            hAppStyle.SetStandardUnixStyles();	break;
 
         case LookOSTwo:
-            hAppStyle.SetStandardOS2Styles();   break;
+            hAppStyle.SetStandardOS2Styles();	break;
 
         case LookMacintosh:
-            hAppStyle.SetStandardMacStyles();   break;
+            hAppStyle.SetStandardMacStyles();	break;
 
         case LookWindows:
-            hAppStyle.SetStandardWinStyles();   break;
+            hAppStyle.SetStandardWinStyles();	break;
 
         case LookStardivision:
         default:
-            hAppStyle.SetStandardStyles();      break;
+            hAppStyle.SetStandardStyles();		break;
     }
 
     // and set it here
diff --git a/svtools/source/config/colorcfg.cxx b/svtools/source/config/colorcfg.cxx
index 7a151d609e6e..5050e6c988ec 100644
--- a/svtools/source/config/colorcfg.cxx
+++ b/svtools/source/config/colorcfg.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
@@ -63,10 +63,10 @@ namespace svtools
 static const sal_Char cColor[] = "/Color";
 static const sal_Char cColorSchemes[] = "ColorSchemes/";
 sal_Int32            nColorRefCount_Impl = 0;
-namespace
+namespace 
 {
-    struct ColorMutex_Impl
-        : public rtl::Static< ::osl::Mutex, ColorMutex_Impl > {};
+    struct ColorMutex_Impl 
+        : public rtl::Static< ::osl::Mutex, ColorMutex_Impl > {}; 
 }
 
 ColorConfig_Impl*    ColorConfig::m_pImpl = NULL;
@@ -134,7 +134,7 @@ uno::Sequence< OUString> ColorConfig_Impl::GetPropertyNames(const rtl::OUString&
         { RTL_CONSTASCII_USTRINGPARAM("/AppBackground")   ,sal_False },
         { RTL_CONSTASCII_USTRINGPARAM("/ObjectBoundaries"),sal_True },
         { RTL_CONSTASCII_USTRINGPARAM("/TableBoundaries") ,sal_True },
-        { RTL_CONSTASCII_USTRINGPARAM("/FontColor")     ,sal_False },
+        { RTL_CONSTASCII_USTRINGPARAM("/FontColor")		,sal_False },
         { RTL_CONSTASCII_USTRINGPARAM("/Links")           ,sal_True },
         { RTL_CONSTASCII_USTRINGPARAM("/LinksVisited")    ,sal_True },
         { RTL_CONSTASCII_USTRINGPARAM("/Anchor")          ,sal_False },
@@ -494,7 +494,7 @@ Color ColorConfig::GetDefaultColor(ColorConfigEntry eEntry)
         0x000000, // SQLOPERATOR
         0x0000E6, // SQLKEYWORD
         0x259D9D, // SQLPARAMTER
-        0x969696,// SQLCOMMENT
+        0x969696,// SQLCOMMENT 
     };
     Color aRet;
     switch(eEntry)
@@ -509,7 +509,7 @@ Color ColorConfig::GetDefaultColor(ColorConfigEntry eEntry)
 
         case SPELL :
         case DRAWDRAWING :
-        case SMARTTAGS :
+        case SMARTTAGS :            
         {
             const StyleSettings& rStyleSettings = Application::GetSettings().GetStyleSettings();
                 aRet = rStyleSettings.GetHighContrastMode() ?
@@ -519,7 +519,7 @@ Color ColorConfig::GetDefaultColor(ColorConfigEntry eEntry)
 
         case DRAWFILL            :
                 aRet = /*rStyleSettings.GetHighContrastMode() ?
-                    rStyleSettings.OutlineMode??? : */  aAutoColors[eEntry];
+                    rStyleSettings.OutlineMode??? : */	aAutoColors[eEntry];
         break;
 
         case FONTCOLOR :
diff --git a/svtools/source/config/extcolorcfg.cxx b/svtools/source/config/extcolorcfg.cxx
index 993025b22884..6b4799af883b 100644
--- a/svtools/source/config/extcolorcfg.cxx
+++ b/svtools/source/config/extcolorcfg.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
@@ -61,10 +61,10 @@ namespace svtools
 
 #define C2U(cChar) OUString::createFromAscii(cChar)
 sal_Int32            nExtendedColorRefCount_Impl = 0;
-namespace
+namespace 
 {
-    struct ColorMutex_Impl
-        : public rtl::Static< ::osl::Mutex, ColorMutex_Impl > {};
+    struct ColorMutex_Impl 
+        : public rtl::Static< ::osl::Mutex, ColorMutex_Impl > {}; 
 }
 
 ExtendedColorConfig_Impl*    ExtendedColorConfig::m_pImpl = NULL;
@@ -78,13 +78,13 @@ class ExtendedColorConfig_Impl : public utl::ConfigItem, public SfxBroadcaster
     typedef ::std::vector<TConfigValues::iterator> TMapPos;
     typedef ::std::pair< TConfigValues, TMapPos > TComponentMapping;
     DECLARE_STL_USTRINGACCESS_MAP(TComponentMapping,TComponents);
-    TComponents         m_aConfigValues;
-    TDisplayNames       m_aComponentDisplayNames;
-    ::std::vector<TComponents::iterator> m_aConfigValuesPos;
+    TComponents			m_aConfigValues;
+    TDisplayNames		m_aComponentDisplayNames;
+    ::std::vector<TComponents::iterator> m_aConfigValuesPos;	
 
     sal_Bool            m_bEditMode;
     rtl::OUString       m_sLoadedScheme;
-    sal_Bool            m_bIsBroadcastEnabled;
+    sal_Bool			m_bIsBroadcastEnabled;
     static sal_Bool     m_bLockBroadcast;
     static sal_Bool     m_bBroadcastWhenUnlocked;
 
@@ -98,15 +98,15 @@ public:
     void                            CommitCurrentSchemeName();
     //changes the name of the current scheme but doesn't load it!
     void                            SetCurrentSchemeName(const rtl::OUString& rSchemeName) {m_sLoadedScheme = rSchemeName;}
-    sal_Bool                        ExistsScheme(const ::rtl::OUString& _sSchemeName);
+    sal_Bool						ExistsScheme(const ::rtl::OUString& _sSchemeName);
     virtual void                    Commit();
     virtual void                    Notify( const uno::Sequence<rtl::OUString>& aPropertyNames);
 
-    sal_Int32                       GetComponentCount() const;
-    ::rtl::OUString                 GetComponentName(sal_uInt32 _nPos) const;
-    ::rtl::OUString                 GetComponentDisplayName(const ::rtl::OUString& _sComponentName) const;
-    sal_Int32                       GetComponentColorCount(const ::rtl::OUString& _sName) const;
-    ExtendedColorConfigValue        GetComponentColorConfigValue(const ::rtl::OUString& _sName,sal_uInt32 _nPos) const;
+    sal_Int32						GetComponentCount() const;
+    ::rtl::OUString					GetComponentName(sal_uInt32 _nPos) const;
+    ::rtl::OUString					GetComponentDisplayName(const ::rtl::OUString& _sComponentName) const;
+    sal_Int32						GetComponentColorCount(const ::rtl::OUString& _sName) const;
+    ExtendedColorConfigValue		GetComponentColorConfigValue(const ::rtl::OUString& _sName,sal_uInt32 _nPos) const;
 
     ExtendedColorConfigValue GetColorConfigValue(const ::rtl::OUString& _sComponentName,const ::rtl::OUString& _sName)
     {
@@ -140,9 +140,9 @@ public:
     void                            ClearModified(){ConfigItem::ClearModified();}
     void                            SettingsChanged();
 
-    static void                     DisableBroadcast();
-    static void                     EnableBroadcast();
-    static sal_Bool                 IsEnableBroadcast();
+    static void						DisableBroadcast();
+    static void						EnableBroadcast();
+    static sal_Bool					IsEnableBroadcast();
 
     static void                     LockBroadcast();
     static void                     UnlockBroadcast();
@@ -158,7 +158,7 @@ uno::Sequence< OUString> ExtendedColorConfig_Impl::GetPropertyNames(const rtl::O
 {
     uno::Sequence< OUString> aNames(GetNodeNames(rScheme));
     ::rtl::OUString* pIter = aNames.getArray();
-    ::rtl::OUString* pEnd    = pIter + aNames.getLength();
+    ::rtl::OUString* pEnd	 = pIter + aNames.getLength();
     ::rtl::OUString sSep(RTL_CONSTASCII_USTRINGPARAM("/"));
     for(;pIter != pEnd;++pIter)
     {
@@ -196,7 +196,7 @@ ExtendedColorConfigValue ExtendedColorConfig_Impl::GetComponentColorConfigValue(
     return ExtendedColorConfigValue();
 }
 // -----------------------------------------------------------------------------
-::rtl::OUString ExtendedColorConfig_Impl::GetComponentDisplayName(const ::rtl::OUString& _sComponentName) const
+::rtl::OUString	ExtendedColorConfig_Impl::GetComponentDisplayName(const ::rtl::OUString& _sComponentName) const
 {
     ::rtl::OUString sRet;
     TDisplayNames::const_iterator aFind = m_aComponentDisplayNames.find(_sComponentName);
@@ -256,8 +256,8 @@ void ExtendedColorConfig_Impl::EnableBroadcast()
         ExtendedColorConfig::m_pImpl->m_bIsBroadcastEnabled = sal_True;
 }
 // -----------------------------------------------------------------------------
-sal_Bool ExtendedColorConfig_Impl::IsEnableBroadcast()
-{
+sal_Bool ExtendedColorConfig_Impl::IsEnableBroadcast() 
+{ 
     return ExtendedColorConfig::m_pImpl ? ExtendedColorConfig::m_pImpl->m_bIsBroadcastEnabled : sal_False;
 }
 /* -----------------------------22.03.2002 14:38------------------------------
@@ -302,7 +302,7 @@ void ExtendedColorConfig_Impl::Load(const rtl::OUString& rScheme)
         lcl_addString(aDisplayNames,sDisplayName);
 
         uno::Sequence< uno::Any > aDisplayNamesValue = GetProperties( aDisplayNames );
-
+        
         const ::rtl::OUString* pDispIter = aDisplayNames.getConstArray();
         const ::rtl::OUString* pDispEnd  = pDispIter + aDisplayNames.getLength();
         for(sal_Int32 j = 0;pDispIter != pDispEnd;++pDispIter,++j)
@@ -314,12 +314,12 @@ void ExtendedColorConfig_Impl::Load(const rtl::OUString& rScheme)
             ::rtl::OUString sCurrentDisplayName;
             aDisplayNamesValue[j] >>= sCurrentDisplayName;
             aDisplayNameMap.insert(TDisplayNames::value_type(sName,sCurrentDisplayName));
-        }
+        } 
     }
 
     // load color settings
     rtl::OUString sScheme(rScheme);
-
+    
     if(!sScheme.getLength())
     {
         //detect current scheme name
@@ -328,7 +328,7 @@ void ExtendedColorConfig_Impl::Load(const rtl::OUString& rScheme)
         uno::Sequence< uno::Any > aCurrentVal = GetProperties( aCurrent );
         aCurrentVal.getConstArray()[0] >>= sScheme;
     } // if(!sScheme.getLength())
-
+    
     m_sLoadedScheme = sScheme;
     ::rtl::OUString sBase(RTL_CONSTASCII_USTRINGPARAM("ExtendedColorScheme/ColorSchemes/"));
     sBase += sScheme;
@@ -342,7 +342,7 @@ void ExtendedColorConfig_Impl::Load(const rtl::OUString& rScheme)
 
     if ( !m_sLoadedScheme.getLength() )
         m_sLoadedScheme = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("default"));
-
+    
     if ( !sScheme.equalsAscii("default") )
     {
         ::rtl::OUString sDefault(RTL_CONSTASCII_USTRINGPARAM("default"));
@@ -389,7 +389,7 @@ void ExtendedColorConfig_Impl::FillComponentColors(uno::Sequence < ::rtl::OUStri
 
             ::rtl::OUString* pColorIter = aColorNames.getArray();
             ::rtl::OUString* pColorEnd  = pColorIter + aColorNames.getLength();
-
+            
             m_aConfigValuesPos.push_back(m_aConfigValues.insert(TComponents::value_type(sComponentName,TComponentMapping(TConfigValues(),TMapPos()))).first);
             TConfigValues& aConfigValues = (*m_aConfigValuesPos.rbegin())->second.first;
             TMapPos& aConfigValuesPos = (*m_aConfigValuesPos.rbegin())->second.second;
@@ -401,14 +401,14 @@ void ExtendedColorConfig_Impl::FillComponentColors(uno::Sequence < ::rtl::OUStri
                     pColorIter->getToken(2,'/',nIndex);
                     ::rtl::OUString sName(pColorIter->copy(nIndex)),sDisplayName;
                     ::rtl::OUString sTemp = sName.copy(0,sName.lastIndexOf(sColor));
-
+                    
                     TDisplayNames::const_iterator aFind = _rDisplayNames.find(sTemp);
                     nIndex = 0;
                     sName = sName.getToken(2,'/',nIndex);
                     OSL_ENSURE(aFind != _rDisplayNames.end(),"DisplayName is not in EntryNames config list!");
                     if ( aFind != _rDisplayNames.end() )
                         sDisplayName = aFind->second;
-
+                    
                     OSL_ENSURE(pColors[i].hasValue(),"Color config entry has NIL as color value set!");
                     OSL_ENSURE(pDefaultColors[i].hasValue(),"Color config entry has NIL as color value set!");
                     sal_Int32 nColor = 0,nDefaultColor = 0;
@@ -486,7 +486,7 @@ void ExtendedColorConfig_Impl::Commit()
             ::rtl::OUString s(RTL_CONSTASCII_USTRINGPARAM("ExtendedColorScheme/ColorSchemes"));
             SetSetProperties(s, aPropValues);
         }
-    }
+    }    
 
     CommitCurrentSchemeName();
 }
@@ -506,11 +506,11 @@ void ExtendedColorConfig_Impl::CommitCurrentSchemeName()
 sal_Bool ExtendedColorConfig_Impl::ExistsScheme(const ::rtl::OUString& _sSchemeName)
 {
     ::rtl::OUString sBase(RTL_CONSTASCII_USTRINGPARAM("ExtendedColorScheme/ColorSchemes"));
-
+    
     uno::Sequence < ::rtl::OUString > aComponentNames = GetPropertyNames(sBase);
     sBase += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/")) + _sSchemeName;
     const ::rtl::OUString* pCompIter = aComponentNames.getConstArray();
-    const ::rtl::OUString* pCompEnd  = pCompIter + aComponentNames.getLength();
+    const ::rtl::OUString* pCompEnd	 = pCompIter + aComponentNames.getLength();
     for(;pCompIter != pCompEnd && *pCompIter != sBase;++pCompIter)
         ;
     return pCompIter != pCompEnd;
diff --git a/svtools/source/config/fontsubstconfig.cxx b/svtools/source/config/fontsubstconfig.cxx
index 7bcbc1e4be82..c57337f89b4e 100644
--- a/svtools/source/config/fontsubstconfig.cxx
+++ b/svtools/source/config/fontsubstconfig.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
@@ -49,10 +49,10 @@ using namespace com::sun::star::beans;
 const sal_Char cReplacement[] = "Replacement";
 const sal_Char cFontPairs[] = "FontPairs";
 
-const sal_Char cReplaceFont[]   = "ReplaceFont";
+const sal_Char cReplaceFont[] 	= "ReplaceFont";
 const sal_Char cSubstituteFont[]= "SubstituteFont";
-const sal_Char cOnScreenOnly[]  = "OnScreenOnly";
-const sal_Char cAlways[]        = "Always";
+const sal_Char cOnScreenOnly[] 	= "OnScreenOnly";
+const sal_Char cAlways[] 		= "Always";
 
 //-----------------------------------------------------------------------------
 typedef SubstitutionStruct* SubstitutionStructPtr;
@@ -61,7 +61,7 @@ SV_IMPL_PTRARR(SubstitutionStructArr, SubstitutionStructPtr);
 //-----------------------------------------------------------------------------
 struct SvtFontSubstConfig_Impl
 {
-    SubstitutionStructArr   aSubstArr;
+    SubstitutionStructArr	aSubstArr;
 };
 /* -----------------------------18.01.01 12:04--------------------------------
 
@@ -72,7 +72,7 @@ SvtFontSubstConfig::SvtFontSubstConfig() :
     pImpl(new SvtFontSubstConfig_Impl)
 {
     RTL_LOGFILE_CONTEXT(aLog, "svtools SvtFontSubstConfig::SvtFontSubstConfig()");
-
+    
     Sequence<OUString> aNames(1);
     aNames.getArray()[0] = C2U(cReplacement);
     Sequence<Any> aValues = GetProperties(aNames);
@@ -93,10 +93,10 @@ SvtFontSubstConfig::SvtFontSubstConfig() :
         OUString sStart(sPropPrefix);
         sStart += pNodeNames[nNode];
         sStart += C2U("/");
-        pNames[nName] = sStart;     pNames[nName++] += C2U(cReplaceFont);
-        pNames[nName] = sStart;     pNames[nName++] += C2U(cSubstituteFont);
-        pNames[nName] = sStart;     pNames[nName++] += C2U(cAlways);
-        pNames[nName] = sStart;     pNames[nName++] += C2U(cOnScreenOnly);
+        pNames[nName] = sStart; 	pNames[nName++] += C2U(cReplaceFont);
+        pNames[nName] = sStart; 	pNames[nName++] += C2U(cSubstituteFont);
+        pNames[nName] = sStart; 	pNames[nName++] += C2U(cAlways);
+        pNames[nName] = sStart; 	pNames[nName++] += C2U(cOnScreenOnly);
     }
     Sequence<Any> aNodeValues = GetProperties(aPropNames);
     const Any* pNodeValues = aNodeValues.getConstArray();
diff --git a/svtools/source/config/helpopt.cxx b/svtools/source/config/helpopt.cxx
index 091bf50c4787..54e2b5fd2d32 100644
--- a/svtools/source/config/helpopt.cxx
+++ b/svtools/source/config/helpopt.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
@@ -49,31 +49,31 @@ using namespace com::sun::star;
 static SvtHelpOptions_Impl* pOptions = NULL;
 static sal_Int32           nRefCount = 0;
 
-#define EXTENDEDHELP        0
-#define HELPTIPS            1
-#define AGENT_ENABLED       2
-#define AGENT_TIMEOUT       3
-#define AGENT_RETRYLIMIT    4
-#define LOCALE              5
-#define SYSTEM              6
+#define EXTENDEDHELP		0
+#define HELPTIPS			1
+#define AGENT_ENABLED		2
+#define AGENT_TIMEOUT		3
+#define AGENT_RETRYLIMIT	4
+#define LOCALE				5
+#define SYSTEM				6
 #define STYLESHEET          7
 
 class SvtHelpOptions_Impl : public utl::ConfigItem
 {
     IdList*         pList;
-    sal_Int32       nHelpAgentTimeoutPeriod;
-    sal_Int32       nHelpAgentRetryLimit;
+    sal_Int32		nHelpAgentTimeoutPeriod;
+    sal_Int32		nHelpAgentRetryLimit;
     sal_Bool        bExtendedHelp;
     sal_Bool        bHelpTips;
     sal_Bool        bHelpAgentEnabled;
     sal_Bool        bWelcomeScreen;
-    String          aLocale;
-    String          aSystem;
+    String			aLocale;
+    String			aSystem;
     String          sHelpStyleSheet;
 
     DECLARE_STL_USTRINGACCESS_MAP( sal_Int32, MapString2Int );
-    MapString2Int   aURLIgnoreCounters;
-    ::osl::Mutex    aIgnoreCounterSafety;
+    MapString2Int	aURLIgnoreCounters;
+    ::osl::Mutex	aIgnoreCounterSafety;
 
     Sequence< OUString > GetPropertyNames();
 
@@ -89,25 +89,25 @@ public:
     void            SetHelpTips( sal_Bool b )               { bHelpTips = b; SetModified(); }
     sal_Bool        IsHelpTips() const                      { return bHelpTips; }
 
-    void            SetHelpAgentEnabled( sal_Bool b )       { bHelpAgentEnabled = b; SetModified(); }
-    sal_Bool        IsHelpAgentEnabled() const              { return bHelpAgentEnabled; }
-    void            SetHelpAgentTimeoutPeriod( sal_Int32 _nSeconds )    { nHelpAgentTimeoutPeriod = _nSeconds; SetModified(); }
-    sal_Int32       GetHelpAgentTimeoutPeriod( ) const      { return nHelpAgentTimeoutPeriod; }
-    void            SetHelpAgentRetryLimit( sal_Int32 _nTrials )        { nHelpAgentRetryLimit = _nTrials; SetModified(); }
-    sal_Int32       GetHelpAgentRetryLimit( ) const         { return nHelpAgentRetryLimit; }
+    void            SetHelpAgentEnabled( sal_Bool b	)		{ bHelpAgentEnabled = b; SetModified(); }
+    sal_Bool        IsHelpAgentEnabled() const				{ return bHelpAgentEnabled; }
+    void			SetHelpAgentTimeoutPeriod( sal_Int32 _nSeconds )	{ nHelpAgentTimeoutPeriod = _nSeconds; SetModified(); }
+    sal_Int32		GetHelpAgentTimeoutPeriod( ) const		{ return nHelpAgentTimeoutPeriod; }
+    void			SetHelpAgentRetryLimit( sal_Int32 _nTrials )		{ nHelpAgentRetryLimit = _nTrials; SetModified(); }
+    sal_Int32		GetHelpAgentRetryLimit( ) const			{ return nHelpAgentRetryLimit; }
 
-    sal_Int32       getAgentIgnoreURLCounter( const ::rtl::OUString& _rURL );
-    void            decAgentIgnoreURLCounter( const ::rtl::OUString& _rURL );
-    void            resetAgentIgnoreURLCounter( const ::rtl::OUString& _rURL );
-    void            resetAgentIgnoreURLCounter();
+    sal_Int32		getAgentIgnoreURLCounter( const ::rtl::OUString& _rURL );
+    void			decAgentIgnoreURLCounter( const ::rtl::OUString& _rURL );
+    void			resetAgentIgnoreURLCounter( const ::rtl::OUString& _rURL );
+    void			resetAgentIgnoreURLCounter();
 
     void            SetWelcomeScreen( sal_Bool b )          { bWelcomeScreen = b; SetModified(); }
     sal_Bool        IsWelcomeScreen() const                 { return bWelcomeScreen; }
     IdList*         GetPIStarterList()                      { return pList; }
     void            AddToPIStarterList( sal_Int32 nId );
     void            RemoveFromPIStarterList( sal_Int32 nId );
-    String          GetLocale() const                       { return aLocale; }
-    String          GetSystem() const                       { return aSystem; }
+    String			GetLocale() const						{ return aLocale; }
+    String			GetSystem() const						{ return aSystem; }
 
     const String&   GetHelpStyleSheet()const{return sHelpStyleSheet;}
     void            SetHelpStyleSheet(const String& rStyleSheet){sHelpStyleSheet = rStyleSheet; SetModified();}
@@ -115,10 +115,10 @@ public:
     static ::osl::Mutex & getInitMutex();
 
 protected:
-    void    implLoadURLCounters();
-    void    implSaveURLCounters();
+    void	implLoadURLCounters();
+    void	implSaveURLCounters();
     // to be called with aIgnoreCounterSafety locked
-    void    implGetURLCounters( Sequence< ::rtl::OUString >& _rNodeNames, Sequence< Any >& _rURLs, Sequence< Any >& _rCounter );
+    void	implGetURLCounters( Sequence< ::rtl::OUString >& _rNodeNames, Sequence< Any >& _rURLs, Sequence< Any >& _rCounter );
 };
 
 Sequence< OUString > SvtHelpOptions_Impl::GetPropertyNames()
@@ -133,7 +133,7 @@ Sequence< OUString > SvtHelpOptions_Impl::GetPropertyNames()
         "Locale",
         "System",
         "HelpStyleSheet",
-//      "HowTo/Show"
+//		"HowTo/Show"
     };
 
     const int nCount = sizeof( aPropNames ) / sizeof( const char* );
@@ -183,11 +183,11 @@ static int lcl_MapPropertyName( const ::rtl::OUString rCompare,
                 const uno::Sequence< ::rtl::OUString>& aInternalPropertyNames)
 {
     for(int nProp = 0; nProp < aInternalPropertyNames.getLength(); ++nProp)
-    {
+    {        
         if( aInternalPropertyNames[nProp] == rCompare )
             return nProp;
     }
-    return -1;
+    return -1;    
 }
 
 void  SvtHelpOptions_Impl::Load(const uno::Sequence< ::rtl::OUString>& rPropertyNames)
@@ -344,27 +344,27 @@ void SvtHelpOptions_Impl::implSaveURLCounters()
     const ::rtl::OUString sCounterLocalPath = ::rtl::OUString::createFromAscii("/Counter");
 
     // get the current URL/counter pairs (as they're persistent at the moment)
-    Sequence< ::rtl::OUString > aNodeNames;
-    Sequence< Any >             aURLs;
-    Sequence< Any >             aCounters;
+    Sequence< ::rtl::OUString >	aNodeNames;
+    Sequence< Any >				aURLs;
+    Sequence< Any >				aCounters;
 
     implGetURLCounters(aNodeNames, aURLs, aCounters);
     sal_Int32 nKnownURLs = aURLs.getLength();
 
-    const ::rtl::OUString* pNodeNames   = aNodeNames.getConstArray();
-    const Any* pURLs                    = aURLs.getConstArray();
-    const Any* pCounters                = aCounters.getConstArray();
+    const ::rtl::OUString* pNodeNames	= aNodeNames.getConstArray();
+    const Any* pURLs					= aURLs.getConstArray();
+    const Any* pCounters				= aCounters.getConstArray();
 
     // check which of them must be deleted/modified
-    Sequence< ::rtl::OUString >     aDeleteFromConfig(nKnownURLs);  // names of nodes to be deleted
-    ::rtl::OUString*                pDeleteFromConfig = aDeleteFromConfig.getArray();
-    ::std::set< ::rtl::OUString >   aAlreadyPresent;    // URLs currently persistent
+    Sequence< ::rtl::OUString >		aDeleteFromConfig(nKnownURLs);	// names of nodes to be deleted
+    ::rtl::OUString*				pDeleteFromConfig = aDeleteFromConfig.getArray();
+    ::std::set< ::rtl::OUString >	aAlreadyPresent;	// URLs currently persistent
 
     // for modifying already existent nodes
-    Sequence< ::rtl::OUString > aNewCounterNodePaths(nKnownURLs);
-    Sequence< Any >             aNewCounterValues(nKnownURLs);
-    ::rtl::OUString*            pNewCounterNodePaths = aNewCounterNodePaths.getArray();
-    Any*                        pNewCounterValues = aNewCounterValues.getArray();
+    Sequence< ::rtl::OUString >	aNewCounterNodePaths(nKnownURLs);
+    Sequence< Any >				aNewCounterValues(nKnownURLs);
+    ::rtl::OUString*			pNewCounterNodePaths = aNewCounterNodePaths.getArray();
+    Any*						pNewCounterValues = aNewCounterValues.getArray();
 
     // temporaries needed inside the loop
     ::rtl::OUString sCurrentURL, sCurrentURLNodeName;
@@ -376,13 +376,13 @@ void SvtHelpOptions_Impl::implSaveURLCounters()
 
         ConstMapString2IntIterator aThisURLNewCounter = aURLIgnoreCounters.find(sCurrentURL);
         if (aURLIgnoreCounters.end() == aThisURLNewCounter)
-        {   // we do not know anything about this URL anymore.
+        {	// we do not know anything about this URL anymore.
             // -> have to removed it from the configuration later on
             *pDeleteFromConfig = *pNodeNames;
             ++pDeleteFromConfig;
         }
         else
-        {   // we know this URL
+        {	// we know this URL
             sCurrentURLNodeName = sIgnoreListNodePath;
             sCurrentURLNodeName += sPathSeparator;
             sCurrentURLNodeName += *pNodeNames;
@@ -394,7 +394,7 @@ void SvtHelpOptions_Impl::implSaveURLCounters()
             (*pCounters) >>= nThisURLPersistentCounter;
 
             if (aThisURLNewCounter->second != nThisURLPersistentCounter)
-            {   // the counter changed
+            {	// the counter changed
                 // -> remember the path and the new counter for the adjustment below
                 *pNewCounterNodePaths = sCurrentURLNodeName;
                 *pNewCounterNodePaths += sCounterLocalPath;
@@ -424,15 +424,15 @@ void SvtHelpOptions_Impl::implSaveURLCounters()
     // and for the new ones ...
     ::rtl::OUString sNewNodeName;
     Sequence< ::rtl::OUString > aNewCounterDataNodeNames(2);
-    Sequence< Any >             aNewCounterDataValues(2);
+    Sequence< Any >				aNewCounterDataValues(2);
     const ::rtl::OUString sNodeNameBase = ::rtl::OUString::createFromAscii("URL");
-    for (   ConstMapString2IntIterator aCollectNew = aURLIgnoreCounters.begin();
+    for (	ConstMapString2IntIterator aCollectNew = aURLIgnoreCounters.begin();
             aCollectNew != aURLIgnoreCounters.end();
             ++aCollectNew
         )
     {
         if (aAlreadyPresent.end() == aAlreadyPresent.find(aCollectNew->first))
-        {   // this URL is not persistent, yet
+        {	// this URL is not persistent, yet
             // -> add a new node
             sNewNodeName = sNodeNameBase;
             if (!getUniqueSetElementName(sIgnoreListNodePath, sNewNodeName))
@@ -447,13 +447,13 @@ void SvtHelpOptions_Impl::implSaveURLCounters()
             aNewCounterDataNodeNames[0] += sPathSeparator;
             aNewCounterDataNodeNames[0] += sNewNodeName;
             aNewCounterDataNodeNames[0] += sURLLocalPath;
-            aNewCounterDataValues[0]    <<= aCollectNew->first;
+            aNewCounterDataValues[0]	<<= aCollectNew->first;
 
             aNewCounterDataNodeNames[1] = sIgnoreListNodePath;
             aNewCounterDataNodeNames[1] += sPathSeparator;
             aNewCounterDataNodeNames[1] += sNewNodeName;
             aNewCounterDataNodeNames[1] += sCounterLocalPath;
-            aNewCounterDataValues[1]    <<= aCollectNew->second;
+            aNewCounterDataValues[1]	<<= aCollectNew->second;
 
             PutProperties(aNewCounterDataNodeNames, aNewCounterDataValues);
         }
@@ -466,9 +466,9 @@ void SvtHelpOptions_Impl::implLoadURLCounters()
 {
     ::osl::MutexGuard aGuard(aIgnoreCounterSafety);
 
-    Sequence< ::rtl::OUString > aNodeNames;
-    Sequence< Any >             aURLs;
-    Sequence< Any >             aCounters;
+    Sequence< ::rtl::OUString >	aNodeNames;
+    Sequence< Any >				aURLs;
+    Sequence< Any >				aCounters;
 
     implGetURLCounters(aNodeNames, aURLs, aCounters);
     sal_Int32 nKnownURLs = aURLs.getLength();
@@ -553,7 +553,7 @@ SvtHelpOptions::SvtHelpOptions()
     {
         RTL_LOGFILE_CONTEXT(aLog, "svtools ( ??? ) ::SvtHelpOptions_Impl::ctor()");
         pOptions = new SvtHelpOptions_Impl;
-
+        
         ItemHolder2::holdConfigItem(E_HELPOPTIONS);
     }
     pImp = pOptions;
@@ -577,7 +577,7 @@ void SvtHelpOptions_Impl::decAgentIgnoreURLCounter( const ::rtl::OUString& _rURL
     ::osl::MutexGuard aGuard(aIgnoreCounterSafety);
     MapString2IntIterator aMapPos = aURLIgnoreCounters.find(_rURL);
     if (aURLIgnoreCounters.end() == aMapPos)
-    {   // nothing known about this URL 'til now
+    {	// nothing known about this URL 'til now
         sal_Int32 nLimit = GetHelpAgentRetryLimit();
         sal_Int32 nIgnoreAgain = nLimit > 0 ? nLimit - 1 : 0;
         aURLIgnoreCounters[_rURL] = nIgnoreAgain;
diff --git a/svtools/source/config/htmlcfg.cxx b/svtools/source/config/htmlcfg.cxx
index b8a9660ee8dc..3a1650296ae4 100644
--- a/svtools/source/config/htmlcfg.cxx
+++ b/svtools/source/config/htmlcfg.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
@@ -36,14 +36,14 @@
 #include <tools/link.hxx>
 
 // -----------------------------------------------------------------------
-#define HTMLCFG_UNKNOWN_TAGS            0x01
-//#define HTMLCFG_STYLE_SHEETS          0x02
-//#define HTMLCFG_NETSCAPE3             0x04
-#define HTMLCFG_STAR_BASIC              0x08
-#define HTMLCFG_LOCAL_GRF               0x10
-#define HTMLCFG_PRINT_LAYOUT_EXTENSION  0x20
-#define HTMLCFG_IGNORE_FONT_FAMILY      0x40
-#define HTMLCFG_IS_BASIC_WARNING        0x80
+#define HTMLCFG_UNKNOWN_TAGS 			0x01
+//#define HTMLCFG_STYLE_SHEETS 			0x02
+//#define HTMLCFG_NETSCAPE3    			0x04
+#define HTMLCFG_STAR_BASIC   			0x08
+#define HTMLCFG_LOCAL_GRF   			0x10
+#define HTMLCFG_PRINT_LAYOUT_EXTENSION 	0x20
+#define HTMLCFG_IGNORE_FONT_FAMILY	 	0x40
+#define HTMLCFG_IS_BASIC_WARNING		0x80
 #define HTMLCFG_NUMBERS_ENGLISH_US      0x100
 
 using namespace utl;
@@ -61,10 +61,10 @@ DECLARE_LIST( LinkList, Link * )
 struct HtmlOptions_Impl
 {
     LinkList    aList;
-    sal_Int32   nFlags;
-    sal_Int32   nExportMode;
-    sal_Int32   aFontSizeArr[HTML_FONT_COUNT];
-    sal_Int32   eEncoding;
+    sal_Int32 	nFlags;
+    sal_Int32 	nExportMode;
+    sal_Int32 	aFontSizeArr[HTML_FONT_COUNT];
+    sal_Int32 	eEncoding;
     sal_Bool    bIsEncodingDefault;
 
     HtmlOptions_Impl() :
@@ -93,21 +93,21 @@ const Sequence<OUString>& SvxHtmlOptions::GetPropertyNames()
     {
         static const char* aPropNames[] =
         {
-            "Import/UnknownTag",                    //  0
-            "Import/FontSetting",                   //  1
-            "Import/FontSize/Size_1",               //  2
-            "Import/FontSize/Size_2",               //  3
-            "Import/FontSize/Size_3",               //  4
-            "Import/FontSize/Size_4",               //  5
-            "Import/FontSize/Size_5",               //  6
-            "Import/FontSize/Size_6",               //  7
-            "Import/FontSize/Size_7",               //  8
-            "Export/Browser",                       //  9
-            "Export/Basic",                         //  0
-            "Export/PrintLayout",                   // 11
-            "Export/LocalGraphic",                  // 12
-            "Export/Warning",                       // 13
-            "Export/Encoding",                      // 14
+            "Import/UnknownTag",					//  0
+            "Import/FontSetting",					//  1
+            "Import/FontSize/Size_1",				//  2
+            "Import/FontSize/Size_2",				//  3
+            "Import/FontSize/Size_3",				//  4
+            "Import/FontSize/Size_4",				//  5
+            "Import/FontSize/Size_5",				//  6
+            "Import/FontSize/Size_6",				//  7
+            "Import/FontSize/Size_7",				//  8
+            "Export/Browser",						//  9
+            "Export/Basic",							//  0
+            "Export/PrintLayout",					// 11
+            "Export/LocalGraphic",					// 12
+            "Export/Warning",    					// 13
+            "Export/Encoding",  					// 14
             "Import/NumbersEnglishUS"               // 15
         };
         const int nCount = sizeof(aPropNames) / sizeof(aPropNames[0]);
@@ -164,17 +164,17 @@ void SvxHtmlOptions::Load( const Sequence< OUString >& aNames )
                     case  9://"Export/Browser",
                         {
                             sal_Int32 nExpMode = 0;
-//                          pValues[nProp] >>= pImp->nExportMode;
+//							pValues[nProp] >>= pImp->nExportMode;
                             pValues[nProp] >>= nExpMode;
                             switch( nExpMode )
                             {
-                                case 0:     nExpMode = HTML_CFG_HTML32;     break;
-                                case 1:     nExpMode = HTML_CFG_MSIE_40;    break;
-//                              case 2:     nExpMode = HTML_CFG_NS30;       break;  depricated
-                                case 3:     nExpMode = HTML_CFG_WRITER;     break;
-                                case 4:     nExpMode = HTML_CFG_NS40;       break;
-                                case 5:     nExpMode = HTML_CFG_MSIE_40_OLD;break;
-                                default:    nExpMode = HTML_CFG_NS40;       break;
+                                case 0:		nExpMode = HTML_CFG_HTML32;		break;
+                                case 1:		nExpMode = HTML_CFG_MSIE_40;	break;
+//								case 2:		nExpMode = HTML_CFG_NS30;		break;	depricated
+                                case 3:		nExpMode = HTML_CFG_WRITER;		break;
+                                case 4:		nExpMode = HTML_CFG_NS40;		break;
+                                case 5:		nExpMode = HTML_CFG_MSIE_40_OLD;break;
+                                default:	nExpMode = HTML_CFG_NS40;		break;
                             }
 
                             pImp->nExportMode = nExpMode;
@@ -212,15 +212,15 @@ void SvxHtmlOptions::Load( const Sequence< OUString >& aNames )
 }
 
 // -----------------------------------------------------------------------
-void    SvxHtmlOptions::Commit()
+void	SvxHtmlOptions::Commit()
 {
     const Sequence<OUString>& aNames = GetPropertyNames();
 
-//  const OUString* pNames = aNames.getConstArray();
+//	const OUString* pNames = aNames.getConstArray();
     Sequence<Any> aValues(aNames.getLength());
     Any* pValues = aValues.getArray();
 
-//  const Type& rType = ::getBooleanCppuType();
+//	const Type& rType = ::getBooleanCppuType();
     for(int nProp = 0; nProp < aNames.getLength(); nProp++)
     {
         sal_Bool bSet = sal_False;
@@ -235,19 +235,19 @@ void    SvxHtmlOptions::Commit()
             case  6: pValues[nProp] <<= pImp->aFontSizeArr[4];break;//"Import/FontSize/Size_5",
             case  7: pValues[nProp] <<= pImp->aFontSizeArr[5];break;//"Import/FontSize/Size_6",
             case  8: pValues[nProp] <<= pImp->aFontSizeArr[6];break;//"Import/FontSize/Size_7",
-            case  9:                //"Export/Browser",
+            case  9:				//"Export/Browser",
                 {
                     sal_Int32 nExpMode = pImp->nExportMode;
 
                     switch( nExpMode )
                     {
-                        case HTML_CFG_HTML32:       nExpMode = 0;   break;
-                        case HTML_CFG_MSIE_40:      nExpMode = 1;   break;
-//                      case HTML_CFG_NS30:         nExpMode = 2;   break;  depricated
-                        case HTML_CFG_WRITER:       nExpMode = 3;   break;
-                        case HTML_CFG_NS40:         nExpMode = 4;   break;
-                        case HTML_CFG_MSIE_40_OLD:  nExpMode = 5;   break;
-                        default:                    nExpMode = 4;   break;  // NS40
+                        case HTML_CFG_HTML32:		nExpMode = 0;	break;
+                        case HTML_CFG_MSIE_40:		nExpMode = 1;	break;
+//						case HTML_CFG_NS30:			nExpMode = 2;	break;	depricated
+                        case HTML_CFG_WRITER:		nExpMode = 3;	break;
+                        case HTML_CFG_NS40:			nExpMode = 4;	break;
+                        case HTML_CFG_MSIE_40_OLD:	nExpMode = 5;	break;
+                        default:					nExpMode = 4;	break;	// NS40
                     }
 
                     pValues[nProp] <<= nExpMode;
@@ -300,7 +300,7 @@ void SvxHtmlOptions::Notify( const com::sun::star::uno::Sequence< rtl::OUString
 }
 
 // -----------------------------------------------------------------------
-USHORT  SvxHtmlOptions::GetFontSize(USHORT nPos) const
+USHORT 	SvxHtmlOptions::GetFontSize(USHORT nPos) const
 {
     if(nPos < HTML_FONT_COUNT)
         return (USHORT)pImp->aFontSizeArr[nPos];
@@ -341,7 +341,7 @@ void SvxHtmlOptions::SetImportUnknown(BOOL bSet)
 // -----------------------------------------------------------------------
 
 
-USHORT  SvxHtmlOptions::GetExportMode() const
+USHORT 	SvxHtmlOptions::GetExportMode() const
 {
     return (USHORT)pImp->nExportMode;
 }
@@ -403,7 +403,7 @@ void SvxHtmlOptions::SetSaveGraphicsLocal(BOOL bSet)
 
 --------------------------------------------------*/
 
-BOOL    SvxHtmlOptions::IsPrintLayoutExtension() const
+BOOL 	SvxHtmlOptions::IsPrintLayoutExtension() const
 {
     BOOL bRet = 0 != (pImp->nFlags & HTMLCFG_PRINT_LAYOUT_EXTENSION);
     switch( pImp->nExportMode )
@@ -420,7 +420,7 @@ BOOL    SvxHtmlOptions::IsPrintLayoutExtension() const
 /*-----------------10/21/97 08:34am-----------------
 
 --------------------------------------------------*/
-void    SvxHtmlOptions::SetPrintLayoutExtension(BOOL bSet)
+void	SvxHtmlOptions::SetPrintLayoutExtension(BOOL bSet)
 {
     if(bSet)
         pImp->nFlags |=  HTMLCFG_PRINT_LAYOUT_EXTENSION;
diff --git a/svtools/source/config/itemholder2.cxx b/svtools/source/config/itemholder2.cxx
index 8e971a1629bf..82f28edd1665 100644
--- a/svtools/source/config/itemholder2.cxx
+++ b/svtools/source/config/itemholder2.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
diff --git a/svtools/source/config/itemholder2.hxx b/svtools/source/config/itemholder2.hxx
index 9314021b5750..3008cc78b9cd 100644
--- a/svtools/source/config/itemholder2.hxx
+++ b/svtools/source/config/itemholder2.hxx
@@ -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
diff --git a/svtools/source/config/menuoptions.cxx b/svtools/source/config/menuoptions.cxx
index 1551361f252f..23f83414a980 100644
--- a/svtools/source/config/menuoptions.cxx
+++ b/svtools/source/config/menuoptions.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
@@ -31,7 +31,7 @@
 #endif
 
 //_________________________________________________________________________________________________________________
-//  includes
+//	includes
 //_________________________________________________________________________________________________________________
 
 #include <svtools/menuoptions.hxx>
@@ -46,30 +46,30 @@
 #include "itemholder2.hxx"
 
 //_________________________________________________________________________________________________________________
-//  namespaces
+//	namespaces
 //_________________________________________________________________________________________________________________
 
-using namespace ::utl                   ;
-using namespace ::rtl                   ;
-using namespace ::osl                   ;
-using namespace ::com::sun::star::uno   ;
+using namespace ::utl					;
+using namespace ::rtl					;
+using namespace ::osl					;
+using namespace ::com::sun::star::uno	;
 
 //_________________________________________________________________________________________________________________
-//  const
+//	const
 //_________________________________________________________________________________________________________________
 
-#define ROOTNODE_MENU                           OUString(RTL_CONSTASCII_USTRINGPARAM("Office.Common/View/Menu"  ))
-#define DEFAULT_DONTHIDEDISABLEDENTRIES         sal_False
-#define DEFAULT_FOLLOWMOUSE                     sal_True
-#define DEFAULT_MENUICONS                       2
+#define	ROOTNODE_MENU							OUString(RTL_CONSTASCII_USTRINGPARAM("Office.Common/View/Menu"	))
+#define	DEFAULT_DONTHIDEDISABLEDENTRIES			sal_False
+#define	DEFAULT_FOLLOWMOUSE						sal_True
+#define	DEFAULT_MENUICONS						2
 
-#define PROPERTYNAME_DONTHIDEDISABLEDENTRIES    OUString(RTL_CONSTASCII_USTRINGPARAM("DontHideDisabledEntry"    ))
-#define PROPERTYNAME_FOLLOWMOUSE                OUString(RTL_CONSTASCII_USTRINGPARAM("FollowMouse"              ))
+#define	PROPERTYNAME_DONTHIDEDISABLEDENTRIES	OUString(RTL_CONSTASCII_USTRINGPARAM("DontHideDisabledEntry"	))
+#define	PROPERTYNAME_FOLLOWMOUSE				OUString(RTL_CONSTASCII_USTRINGPARAM("FollowMouse"				))
 #define PROPERTYNAME_SHOWICONSINMENUES          OUString(RTL_CONSTASCII_USTRINGPARAM("ShowIconsInMenues"        ))
 #define PROPERTYNAME_SYSTEMICONSINMENUES        OUString(RTL_CONSTASCII_USTRINGPARAM("IsSystemIconsInMenus"     ))
 
-#define PROPERTYHANDLE_DONTHIDEDISABLEDENTRIES  0
-#define PROPERTYHANDLE_FOLLOWMOUSE              1
+#define	PROPERTYHANDLE_DONTHIDEDISABLEDENTRIES	0
+#define	PROPERTYHANDLE_FOLLOWMOUSE				1
 #define PROPERTYHANDLE_SHOWICONSINMENUES        2
 #define PROPERTYHANDLE_SYSTEMICONSINMENUES      3
 
@@ -80,29 +80,29 @@ using namespace ::com::sun::star::uno   ;
 DECLARE_LIST( LinkList, Link * )
 
 //_________________________________________________________________________________________________________________
-//  private declarations!
+//	private declarations!
 //_________________________________________________________________________________________________________________
 
 class SvtMenuOptions_Impl : public ConfigItem
 {
     //-------------------------------------------------------------------------------------------------------------
-    //  private member
+    //	private member
     //-------------------------------------------------------------------------------------------------------------
 
     private:
         LinkList    aList;
-        sal_Bool    m_bDontHideDisabledEntries          ;   /// cache "DontHideDisabledEntries" of Menu section
-        sal_Bool    m_bFollowMouse                      ;   /// cache "FollowMouse" of Menu section
-        sal_Int16   m_nMenuIcons                        ;   /// cache "MenuIcons" of Menu section
+        sal_Bool	m_bDontHideDisabledEntries			;	/// cache "DontHideDisabledEntries" of Menu section
+        sal_Bool	m_bFollowMouse						;	/// cache "FollowMouse" of Menu section
+        sal_Int16	m_nMenuIcons						;	/// cache "MenuIcons" of Menu section
 
     //-------------------------------------------------------------------------------------------------------------
-    //  public methods
+    //	public methods
     //-------------------------------------------------------------------------------------------------------------
 
     public:
 
         //---------------------------------------------------------------------------------------------------------
-        //  constructor / destructor
+        //	constructor / destructor
         //---------------------------------------------------------------------------------------------------------
 
          SvtMenuOptions_Impl();
@@ -112,67 +112,67 @@ class SvtMenuOptions_Impl : public ConfigItem
         void RemoveListenerLink( const Link& rLink );
 
         //---------------------------------------------------------------------------------------------------------
-        //  overloaded methods of baseclass
+        //	overloaded methods of baseclass
         //---------------------------------------------------------------------------------------------------------
 
         /*-****************************************************************************************************//**
-            @short      called for notify of configmanager
-            @descr      These method is called from the ConfigManager before application ends or from the
+            @short		called for notify of configmanager
+            @descr		These method is called from the ConfigManager before application ends or from the
                          PropertyChangeListener if the sub tree broadcasts changes. You must update your
                         internal values.
 
-            @seealso    baseclass ConfigItem
+            @seealso	baseclass ConfigItem
 
-            @param      "seqPropertyNames" is the list of properties which should be updated.
-            @return     -
+            @param		"seqPropertyNames" is the list of properties which should be updated.
+            @return		-
 
-            @onerror    -
+            @onerror	-
         *//*-*****************************************************************************************************/
 
         virtual void Notify( const Sequence< OUString >& seqPropertyNames );
 
         /*-****************************************************************************************************//**
-            @short      write changes to configuration
-            @descr      These method writes the changed values into the sub tree
+            @short		write changes to configuration
+            @descr		These method writes the changed values into the sub tree
                         and should always called in our destructor to guarantee consistency of config data.
 
-            @seealso    baseclass ConfigItem
+            @seealso	baseclass ConfigItem
 
-            @param      -
-            @return     -
+            @param		-
+            @return		-
 
-            @onerror    -
+            @onerror	-
         *//*-*****************************************************************************************************/
 
         virtual void Commit();
 
         //---------------------------------------------------------------------------------------------------------
-        //  public interface
+        //	public interface
         //---------------------------------------------------------------------------------------------------------
 
         /*-****************************************************************************************************//**
-            @short      access method to get internal values
-            @descr      These method give us a chance to regulate acces to ouer internal values.
+            @short		access method to get internal values
+            @descr		These method give us a chance to regulate acces to ouer internal values.
                         It's not used in the moment - but it's possible for the feature!
 
-            @seealso    -
+            @seealso	-
 
-            @param      -
-            @return     -
+            @param		-
+            @return		-
 
-            @onerror    -
+            @onerror	-
         *//*-*****************************************************************************************************/
 
-        sal_Bool    IsEntryHidingEnabled() const
+        sal_Bool	IsEntryHidingEnabled() const
                     { return m_bDontHideDisabledEntries; }
 
-        sal_Bool    IsFollowMouseEnabled() const
+        sal_Bool	IsFollowMouseEnabled() const
                     { return m_bFollowMouse; }
 
-        sal_Int16   GetMenuIconsState() const
+        sal_Int16	GetMenuIconsState() const
                     { return m_nMenuIcons; }
 
-        void        SetEntryHidingState ( sal_Bool bState )
+        void		SetEntryHidingState	( sal_Bool bState )
                     {
                         m_bDontHideDisabledEntries = bState;
                         SetModified();
@@ -181,7 +181,7 @@ class SvtMenuOptions_Impl : public ConfigItem
                         Commit();
                     }
 
-        void        SetFollowMouseState ( sal_Bool bState )
+        void		SetFollowMouseState	( sal_Bool bState )
                     {
                         m_bFollowMouse = bState;
                         SetModified();
@@ -190,7 +190,7 @@ class SvtMenuOptions_Impl : public ConfigItem
                         Commit();
                     }
 
-        void        SetMenuIconsState ( sal_Int16 bState    )
+        void		SetMenuIconsState ( sal_Int16 bState	)
                     {
                         m_nMenuIcons = bState;
                         SetModified();
@@ -200,45 +200,45 @@ class SvtMenuOptions_Impl : public ConfigItem
                     }
 
     //-------------------------------------------------------------------------------------------------------------
-    //  private methods
+    //	private methods
     //-------------------------------------------------------------------------------------------------------------
 
     private:
 
         /*-****************************************************************************************************//**
-            @short      return list of fix key names of ouer configuration management which represent oue module tree
-            @descr      These methods return a static const list of key names. We need it to get needed values from our
+            @short		return list of fix key names of ouer configuration management which represent oue module tree
+            @descr		These methods return a static const list of key names. We need it to get needed values from our
                         configuration management.
 
-            @seealso    -
+            @seealso	-
 
-            @param      -
-            @return     A list of needed configuration keys is returned.
+            @param		-
+            @return		A list of needed configuration keys is returned.
 
-            @onerror    -
+            @onerror	-
         *//*-*****************************************************************************************************/
 
         static Sequence< OUString > impl_GetPropertyNames();
 };
 
 //_________________________________________________________________________________________________________________
-//  definitions
+//	definitions
 //_________________________________________________________________________________________________________________
 
 //*****************************************************************************************************************
-//  constructor
+//	constructor
 //*****************************************************************************************************************
 SvtMenuOptions_Impl::SvtMenuOptions_Impl()
     // Init baseclasses first
-    :   ConfigItem                  ( ROOTNODE_MENU                     )
+    :	ConfigItem					( ROOTNODE_MENU						)
     // Init member then.
-    ,   m_bDontHideDisabledEntries  ( DEFAULT_DONTHIDEDISABLEDENTRIES   )
-    ,   m_bFollowMouse              ( DEFAULT_FOLLOWMOUSE               )
-    ,   m_nMenuIcons                ( DEFAULT_MENUICONS                 )
+    ,	m_bDontHideDisabledEntries	( DEFAULT_DONTHIDEDISABLEDENTRIES	)
+    ,	m_bFollowMouse				( DEFAULT_FOLLOWMOUSE				)
+    ,   m_nMenuIcons				( DEFAULT_MENUICONS 				)
 {
     // Use our static list of configuration keys to get his values.
-    Sequence< OUString >    seqNames    = impl_GetPropertyNames();
-    Sequence< Any >         seqValues   = GetProperties( seqNames ) ;
+    Sequence< OUString >	seqNames	= impl_GetPropertyNames();
+    Sequence< Any >			seqValues	= GetProperties( seqNames )	;
 
     // Safe impossible cases.
     // We need values from ALL configuration keys.
@@ -249,8 +249,8 @@ SvtMenuOptions_Impl::SvtMenuOptions_Impl()
     sal_Bool bSystemMenuIcons = true;
 
     // Copy values from list in right order to ouer internal member.
-    sal_Int32 nPropertyCount    =   seqValues.getLength()   ;
-    sal_Int32 nProperty         =   0                       ;
+    sal_Int32 nPropertyCount	=	seqValues.getLength()	;
+    sal_Int32 nProperty			=	0						;
     for( nProperty=0; nProperty<nPropertyCount; ++nProperty )
     {
         // Safe impossible cases.
@@ -258,13 +258,13 @@ SvtMenuOptions_Impl::SvtMenuOptions_Impl()
         DBG_ASSERT( !(seqValues[nProperty].hasValue()==sal_False), "SvtMenuOptions_Impl::SvtMenuOptions_Impl()\nInvalid property value for property detected!\n" );
         switch( nProperty )
         {
-            case PROPERTYHANDLE_DONTHIDEDISABLEDENTRIES :   {
+            case PROPERTYHANDLE_DONTHIDEDISABLEDENTRIES	:	{
                                                                 DBG_ASSERT(!(seqValues[nProperty].getValueTypeClass()!=TypeClass_BOOLEAN), "SvtMenuOptions_Impl::SvtMenuOptions_Impl()\nWho has changed the value type of \"Office.Common\\View\\Menu\\DontHideDisabledEntry\"?" );
                                                                 seqValues[nProperty] >>= m_bDontHideDisabledEntries;
                                                             }
                                                             break;
 
-            case PROPERTYHANDLE_FOLLOWMOUSE             :   {
+            case PROPERTYHANDLE_FOLLOWMOUSE				:	{
                                                                 DBG_ASSERT(!(seqValues[nProperty].getValueTypeClass()!=TypeClass_BOOLEAN), "SvtMenuOptions_Impl::SvtMenuOptions_Impl()\nWho has changed the value type of \"Office.Common\\View\\Menu\\FollowMouse\"?" );
                                                                 seqValues[nProperty] >>= m_bFollowMouse;
                                                             }
@@ -274,7 +274,7 @@ SvtMenuOptions_Impl::SvtMenuOptions_Impl()
                                                                 seqValues[nProperty] >>= bMenuIcons;
                                                             }
                                                             break;
-            case PROPERTYHANDLE_SYSTEMICONSINMENUES     :   {
+            case PROPERTYHANDLE_SYSTEMICONSINMENUES		:   {
                                                                 DBG_ASSERT(!(seqValues[nProperty].getValueTypeClass()!=TypeClass_BOOLEAN), "SvtMenuOptions_Impl::SvtMenuOptions_Impl()\nWho has changed the value type of \"Office.Common\\View\\Menu\\IsSystemIconsInMenus\"?" );
                                                                 seqValues[nProperty] >>= bSystemMenuIcons;
                                                             }
@@ -288,7 +288,7 @@ SvtMenuOptions_Impl::SvtMenuOptions_Impl()
 }
 
 //*****************************************************************************************************************
-//  destructor
+//	destructor
 //*****************************************************************************************************************
 SvtMenuOptions_Impl::~SvtMenuOptions_Impl()
 {
@@ -304,7 +304,7 @@ SvtMenuOptions_Impl::~SvtMenuOptions_Impl()
 }
 
 //*****************************************************************************************************************
-//  public method
+//	public method
 //*****************************************************************************************************************
 void SvtMenuOptions_Impl::Notify( const Sequence< OUString >& seqPropertyNames )
 {
@@ -356,24 +356,24 @@ void SvtMenuOptions_Impl::Notify( const Sequence< OUString >& seqPropertyNames )
 }
 
 //*****************************************************************************************************************
-//  public method
+//	public method
 //*****************************************************************************************************************
 void SvtMenuOptions_Impl::Commit()
 {
     // Get names of supported properties, create a list for values and copy current values to it.
-    Sequence< OUString >    seqNames    = impl_GetPropertyNames();
-    sal_Int32               nCount      = seqNames.getLength();
-    Sequence< Any >         seqValues   ( nCount );
+    Sequence< OUString >	seqNames	= impl_GetPropertyNames();
+    sal_Int32				nCount		= seqNames.getLength();
+    Sequence< Any >			seqValues	( nCount );
     for( sal_Int32 nProperty=0; nProperty<nCount; ++nProperty )
     {
         switch( nProperty )
         {
-            case PROPERTYHANDLE_DONTHIDEDISABLEDENTRIES :   {
+            case PROPERTYHANDLE_DONTHIDEDISABLEDENTRIES	:	{
                                                                 seqValues[nProperty] <<= m_bDontHideDisabledEntries;
                                                             }
                                                             break;
 
-            case PROPERTYHANDLE_FOLLOWMOUSE             :   {
+            case PROPERTYHANDLE_FOLLOWMOUSE				:	{
                                                                 seqValues[nProperty] <<= m_bFollowMouse;
                                                             }
                                                             break;
@@ -383,7 +383,7 @@ void SvtMenuOptions_Impl::Commit()
                                                                 seqValues[nProperty] <<= bValue;
                                                             }
                                                             break;
-            case PROPERTYHANDLE_SYSTEMICONSINMENUES     :   {
+            case PROPERTYHANDLE_SYSTEMICONSINMENUES		:   {
                                                                 sal_Bool bValue = (m_nMenuIcons == 2 ? sal_True : sal_False) ;
                                                                 seqValues[nProperty] <<= bValue;
                                                             }
@@ -395,16 +395,16 @@ void SvtMenuOptions_Impl::Commit()
 }
 
 //*****************************************************************************************************************
-//  private method
+//	private method
 //*****************************************************************************************************************
 Sequence< OUString > SvtMenuOptions_Impl::impl_GetPropertyNames()
 {
     // Build static list of configuration key names.
     static const OUString pProperties[] =
     {
-        PROPERTYNAME_DONTHIDEDISABLEDENTRIES    ,
-        PROPERTYNAME_FOLLOWMOUSE                ,
-        PROPERTYNAME_SHOWICONSINMENUES          ,
+        PROPERTYNAME_DONTHIDEDISABLEDENTRIES	,
+        PROPERTYNAME_FOLLOWMOUSE				,
+        PROPERTYNAME_SHOWICONSINMENUES			,
         PROPERTYNAME_SYSTEMICONSINMENUES
     };
     // Initialize return sequence with these list ...
@@ -431,15 +431,15 @@ void SvtMenuOptions_Impl::RemoveListenerLink( const Link& rLink )
 }
 
 //*****************************************************************************************************************
-//  initialize static member
-//  DON'T DO IT IN YOUR HEADER!
-//  see definition for further informations
+//	initialize static member
+//	DON'T DO IT IN YOUR HEADER!
+//	see definition for further informations
 //*****************************************************************************************************************
-SvtMenuOptions_Impl*    SvtMenuOptions::m_pDataContainer    = NULL  ;
-sal_Int32               SvtMenuOptions::m_nRefCount         = 0     ;
+SvtMenuOptions_Impl*	SvtMenuOptions::m_pDataContainer	= NULL	;
+sal_Int32				SvtMenuOptions::m_nRefCount			= 0		;
 
 //*****************************************************************************************************************
-//  constructor
+//	constructor
 //*****************************************************************************************************************
 SvtMenuOptions::SvtMenuOptions()
 {
@@ -458,7 +458,7 @@ SvtMenuOptions::SvtMenuOptions()
 }
 
 //*****************************************************************************************************************
-//  destructor
+//	destructor
 //*****************************************************************************************************************
 SvtMenuOptions::~SvtMenuOptions()
 {
@@ -476,7 +476,7 @@ SvtMenuOptions::~SvtMenuOptions()
 }
 
 //*****************************************************************************************************************
-//  public method
+//	public method
 //*****************************************************************************************************************
 sal_Bool SvtMenuOptions::IsEntryHidingEnabled() const
 {
@@ -485,7 +485,7 @@ sal_Bool SvtMenuOptions::IsEntryHidingEnabled() const
 }
 
 //*****************************************************************************************************************
-//  public method
+//	public method
 //*****************************************************************************************************************
 sal_Bool SvtMenuOptions::IsFollowMouseEnabled() const
 {
@@ -494,7 +494,7 @@ sal_Bool SvtMenuOptions::IsFollowMouseEnabled() const
 }
 
 //*****************************************************************************************************************
-//  public method
+//	public method
 //*****************************************************************************************************************
 void SvtMenuOptions::SetEntryHidingState( sal_Bool bState )
 {
@@ -503,7 +503,7 @@ void SvtMenuOptions::SetEntryHidingState( sal_Bool bState )
 }
 
 //*****************************************************************************************************************
-//  public method
+//	public method
 //*****************************************************************************************************************
 void SvtMenuOptions::SetFollowMouseState( sal_Bool bState )
 {
@@ -512,7 +512,7 @@ void SvtMenuOptions::SetFollowMouseState( sal_Bool bState )
 }
 
 //*****************************************************************************************************************
-//  public method
+//	public method
 //*****************************************************************************************************************
 sal_Int16 SvtMenuOptions::GetMenuIconsState() const
 {
@@ -521,7 +521,7 @@ sal_Int16 SvtMenuOptions::GetMenuIconsState() const
 }
 
 //*****************************************************************************************************************
-//  public method
+//	public method
 //*****************************************************************************************************************
 void SvtMenuOptions::SetMenuIconsState( sal_Int16 bState )
 {
@@ -530,7 +530,7 @@ void SvtMenuOptions::SetMenuIconsState( sal_Int16 bState )
 }
 
 //*****************************************************************************************************************
-//  private method
+//	private method
 //*****************************************************************************************************************
 Mutex& SvtMenuOptions::GetOwnStaticMutex()
 {
diff --git a/svtools/source/config/miscopt.cxx b/svtools/source/config/miscopt.cxx
index e036225cb5f4..b8a358f4297b 100644
--- a/svtools/source/config/miscopt.cxx
+++ b/svtools/source/config/miscopt.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
@@ -28,7 +28,7 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_svtools.hxx"
 //_________________________________________________________________________________________________________________
-//  includes
+//	includes
 //_________________________________________________________________________________________________________________
 
 #include <svtools/miscopt.hxx>
@@ -49,56 +49,56 @@
 #include <vcl/svapp.hxx>
 
 //_________________________________________________________________________________________________________________
-//  namespaces
+//	namespaces
 //_________________________________________________________________________________________________________________
 
-using namespace ::utl                   ;
-using namespace ::rtl                   ;
-using namespace ::osl                   ;
-using namespace ::com::sun::star::uno   ;
+using namespace ::utl					;
+using namespace ::rtl					;
+using namespace ::osl					;
+using namespace ::com::sun::star::uno	;
 using namespace ::com::sun::star;
 
 //_________________________________________________________________________________________________________________
-//  const
+//	const
 //_________________________________________________________________________________________________________________
 
-#define ASCII_STR(s)                        OUString( RTL_CONSTASCII_USTRINGPARAM(s) )
-#define ROOTNODE_MISC                       ASCII_STR("Office.Common/Misc")
-#define DEFAULT_PLUGINSENABLED              sal_True;
-
-#define PROPERTYNAME_PLUGINSENABLED         ASCII_STR("PluginsEnabled")
-#define PROPERTYHANDLE_PLUGINSENABLED       0
-#define PROPERTYNAME_SYMBOLSET              ASCII_STR("SymbolSet")
-#define PROPERTYHANDLE_SYMBOLSET            1
-#define PROPERTYNAME_TOOLBOXSTYLE           ASCII_STR("ToolboxStyle")
-#define PROPERTYHANDLE_TOOLBOXSTYLE         2
-#define PROPERTYNAME_USESYSTEMFILEDIALOG    ASCII_STR("UseSystemFileDialog")
-#define PROPERTYHANDLE_USESYSTEMFILEDIALOG  3
-#define PROPERTYNAME_SYMBOLSTYLE            ASCII_STR("SymbolStyle")
-#define PROPERTYHANDLE_SYMBOLSTYLE          4
-#define PROPERTYNAME_USESYSTEMPRINTDIALOG   ASCII_STR("UseSystemPrintDialog")
-#define PROPERTYHANDLE_USESYSTEMPRINTDIALOG 5
-#define PROPERTYNAME_TRYODMADIALOG  ASCII_STR("TryODMADialog")
-#define PROPERTYHANDLE_TRYODMADIALOG    6
-#define PROPERTYNAME_SHOWLINKWARNINGDIALOG  ASCII_STR("ShowLinkWarningDialog")
+#define ASCII_STR(s)						OUString( RTL_CONSTASCII_USTRINGPARAM(s) )
+#define	ROOTNODE_MISC						ASCII_STR("Office.Common/Misc")
+#define	DEFAULT_PLUGINSENABLED				sal_True;
+
+#define	PROPERTYNAME_PLUGINSENABLED			ASCII_STR("PluginsEnabled")
+#define	PROPERTYHANDLE_PLUGINSENABLED		0
+#define PROPERTYNAME_SYMBOLSET				ASCII_STR("SymbolSet")
+#define PROPERTYHANDLE_SYMBOLSET			1
+#define PROPERTYNAME_TOOLBOXSTYLE			ASCII_STR("ToolboxStyle")
+#define PROPERTYHANDLE_TOOLBOXSTYLE			2
+#define PROPERTYNAME_USESYSTEMFILEDIALOG	ASCII_STR("UseSystemFileDialog")
+#define PROPERTYHANDLE_USESYSTEMFILEDIALOG	3
+#define PROPERTYNAME_SYMBOLSTYLE			ASCII_STR("SymbolStyle")
+#define PROPERTYHANDLE_SYMBOLSTYLE			4
+#define PROPERTYNAME_USESYSTEMPRINTDIALOG	ASCII_STR("UseSystemPrintDialog")
+#define PROPERTYHANDLE_USESYSTEMPRINTDIALOG	5
+#define PROPERTYNAME_TRYODMADIALOG	ASCII_STR("TryODMADialog")
+#define PROPERTYHANDLE_TRYODMADIALOG	6
+#define PROPERTYNAME_SHOWLINKWARNINGDIALOG	ASCII_STR("ShowLinkWarningDialog")
 #define PROPERTYHANDLE_SHOWLINKWARNINGDIALOG 7
-#define PROPERTYNAME_DISABLEUICUSTOMIZATION ASCII_STR("DisableUICustomization")
-#define PROPERTYHANDLE_DISABLEUICUSTOMIZATION           8
+#define PROPERTYNAME_DISABLEUICUSTOMIZATION	ASCII_STR("DisableUICustomization")
+#define PROPERTYHANDLE_DISABLEUICUSTOMIZATION			8
 
-#define PROPERTYCOUNT                       9
+#define PROPERTYCOUNT						9
 
-#define VCL_TOOLBOX_STYLE_FLAT              ((USHORT)0x0004) // from <vcl/toolbox.hxx>
+#define VCL_TOOLBOX_STYLE_FLAT				((USHORT)0x0004) // from <vcl/toolbox.hxx>
 
 DECLARE_LIST( LinkList, Link * )
 
 //_________________________________________________________________________________________________________________
-//  private declarations!
+//	private declarations!
 //_________________________________________________________________________________________________________________
 
 class SvtMiscOptions_Impl : public ConfigItem
 {
     //-------------------------------------------------------------------------------------------------------------
-    //  private member
+    //	private member
     //-------------------------------------------------------------------------------------------------------------
 
     private:
@@ -121,34 +121,34 @@ class SvtMiscOptions_Impl : public ConfigItem
     sal_Bool    m_bDisableUICustomization;
 
     //-------------------------------------------------------------------------------------------------------------
-    //  public methods
+    //	public methods
     //-------------------------------------------------------------------------------------------------------------
 
     public:
 
         //---------------------------------------------------------------------------------------------------------
-        //  constructor / destructor
+        //	constructor / destructor
         //---------------------------------------------------------------------------------------------------------
 
          SvtMiscOptions_Impl();
         ~SvtMiscOptions_Impl();
 
         //---------------------------------------------------------------------------------------------------------
-        //  overloaded methods of baseclass
+        //	overloaded methods of baseclass
         //---------------------------------------------------------------------------------------------------------
 
         /*-****************************************************************************************************//**
-            @short      called for notify of configmanager
-            @descr      These method is called from the ConfigManager before application ends or from the
+            @short		called for notify of configmanager
+            @descr		These method is called from the ConfigManager before application ends or from the
                          PropertyChangeListener if the sub tree broadcasts changes. You must update your
                         internal values.
 
-            @seealso    baseclass ConfigItem
+            @seealso	baseclass ConfigItem
 
-            @param      "seqPropertyNames" is the list of properties which should be updated.
-            @return     -
+            @param		"seqPropertyNames" is the list of properties which should be updated.
+            @return		-
 
-            @onerror    -
+            @onerror	-
         *//*-*****************************************************************************************************/
 
         virtual void Notify( const Sequence< OUString >& seqPropertyNames );
@@ -160,22 +160,22 @@ class SvtMiscOptions_Impl : public ConfigItem
         void Load( const Sequence< OUString >& rPropertyNames );
 
         /*-****************************************************************************************************//**
-            @short      write changes to configuration
-            @descr      These method writes the changed values into the sub tree
+            @short		write changes to configuration
+            @descr		These method writes the changed values into the sub tree
                         and should always called in our destructor to guarantee consistency of config data.
 
-            @seealso    baseclass ConfigItem
+            @seealso	baseclass ConfigItem
 
-            @param      -
-            @return     -
+            @param		-
+            @return		-
 
-            @onerror    -
+            @onerror	-
         *//*-*****************************************************************************************************/
 
         virtual void Commit();
 
         //---------------------------------------------------------------------------------------------------------
-        //  public interface
+        //	public interface
         //---------------------------------------------------------------------------------------------------------
 
         inline sal_Bool UseSystemFileDialog() const
@@ -261,22 +261,22 @@ class SvtMiscOptions_Impl : public ConfigItem
         void CallListeners();
 
     //-------------------------------------------------------------------------------------------------------------
-    //  private methods
+    //	private methods
     //-------------------------------------------------------------------------------------------------------------
 
     private:
 
         /*-****************************************************************************************************//**
-            @short      return list of key names of ouer configuration management which represent oue module tree
-            @descr      These methods return a static const list of key names. We need it to get needed values from our
+            @short		return list of key names of ouer configuration management which represent oue module tree
+            @descr		These methods return a static const list of key names. We need it to get needed values from our
                         configuration management.
 
-            @seealso    -
+            @seealso	-
 
-            @param      -
-            @return     A list of needed configuration keys is returned.
+            @param		-
+            @return		A list of needed configuration keys is returned.
 
-            @onerror    -
+            @onerror	-
         *//*-*****************************************************************************************************/
 
         static Sequence< OUString > GetPropertyNames();
@@ -286,7 +286,7 @@ class SvtMiscOptions_Impl : public ConfigItem
 };
 
 //*****************************************************************************************************************
-//  constructor
+//	constructor
 //*****************************************************************************************************************
 SvtMiscOptions_Impl::SvtMiscOptions_Impl()
     // Init baseclasses first
@@ -310,7 +310,7 @@ SvtMiscOptions_Impl::SvtMiscOptions_Impl()
 
 {
     // Use our static list of configuration keys to get his values.
-    Sequence< OUString >    seqNames    = GetPropertyNames  (           );
+    Sequence< OUString >	seqNames	= GetPropertyNames	(			);
     Load( seqNames );
     Sequence< Any >         seqValues   = GetProperties     ( seqNames  );
     Sequence< sal_Bool >    seqRO       = GetReadOnlyStates ( seqNames  );
@@ -427,7 +427,7 @@ SvtMiscOptions_Impl::SvtMiscOptions_Impl()
 }
 
 //*****************************************************************************************************************
-//  destructor
+//	destructor
 //*****************************************************************************************************************
 SvtMiscOptions_Impl::~SvtMiscOptions_Impl()
 {
@@ -625,7 +625,7 @@ void SvtMiscOptions_Impl::SetPluginsEnabled( sal_Bool bEnable )
 }
 
 //*****************************************************************************************************************
-//  public method
+//	public method
 //*****************************************************************************************************************
 void SvtMiscOptions_Impl::Notify( const Sequence< OUString >& rPropertyNames )
 {
@@ -634,14 +634,14 @@ void SvtMiscOptions_Impl::Notify( const Sequence< OUString >& rPropertyNames )
 }
 
 //*****************************************************************************************************************
-//  public method
+//	public method
 //*****************************************************************************************************************
 void SvtMiscOptions_Impl::Commit()
 {
     // Get names of supported properties, create a list for values and copy current values to it.
-    Sequence< OUString >    seqNames    = GetPropertyNames  ();
-    sal_Int32               nCount      = seqNames.getLength();
-    Sequence< Any >         seqValues   ( nCount );
+    Sequence< OUString >	seqNames	= GetPropertyNames	();
+    sal_Int32				nCount		= seqNames.getLength();
+    Sequence< Any >			seqValues	( nCount );
     for( sal_Int32 nProperty=0; nProperty<nCount; ++nProperty )
     {
         switch( nProperty )
@@ -714,7 +714,7 @@ void SvtMiscOptions_Impl::Commit()
 }
 
 //*****************************************************************************************************************
-//  private method
+//	private method
 //*****************************************************************************************************************
 Sequence< OUString > SvtMiscOptions_Impl::GetPropertyNames()
 {
@@ -739,15 +739,15 @@ Sequence< OUString > SvtMiscOptions_Impl::GetPropertyNames()
 }
 
 //*****************************************************************************************************************
-//  initialize static member
-//  DON'T DO IT IN YOUR HEADER!
-//  see definition for further informations
+//	initialize static member
+//	DON'T DO IT IN YOUR HEADER!
+//	see definition for further informations
 //*****************************************************************************************************************
-SvtMiscOptions_Impl*    SvtMiscOptions::m_pDataContainer    = NULL  ;
-sal_Int32               SvtMiscOptions::m_nRefCount = 0     ;
+SvtMiscOptions_Impl*	SvtMiscOptions::m_pDataContainer	= NULL	;
+sal_Int32				SvtMiscOptions::m_nRefCount	= 0		;
 
 //*****************************************************************************************************************
-//  constructor
+//	constructor
 //*****************************************************************************************************************
 SvtMiscOptions::SvtMiscOptions()
 {
@@ -765,7 +765,7 @@ SvtMiscOptions::SvtMiscOptions()
 }
 
 //*****************************************************************************************************************
-//  destructor
+//	destructor
 //*****************************************************************************************************************
 SvtMiscOptions::~SvtMiscOptions()
 {
@@ -936,7 +936,7 @@ sal_Bool SvtMiscOptions::IsShowLinkWarningDialogReadOnly() const
 }
 
 //*****************************************************************************************************************
-//  private method
+//	private method
 //*****************************************************************************************************************
 Mutex & SvtMiscOptions::GetInitMutex()
 {
diff --git a/svtools/source/config/optionsdrawinglayer.cxx b/svtools/source/config/optionsdrawinglayer.cxx
index 57cf1cd8ad5b..b66fad63136d 100644
--- a/svtools/source/config/optionsdrawinglayer.cxx
+++ b/svtools/source/config/optionsdrawinglayer.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
@@ -32,7 +32,7 @@
 #endif
 
 //_________________________________________________________________________________________________________________
-//  includes
+//	includes
 //_________________________________________________________________________________________________________________
 
 #include <svtools/optionsdrawinglayer.hxx>
@@ -45,189 +45,189 @@
 #include <vcl/outdev.hxx>
 
 //_________________________________________________________________________________________________________________
-//  namespaces
+//	namespaces
 //_________________________________________________________________________________________________________________
 
-using namespace ::utl                   ;
-using namespace ::rtl                   ;
-using namespace ::osl                   ;
-using namespace ::com::sun::star::uno   ;
+using namespace ::utl					;
+using namespace ::rtl					;
+using namespace ::osl					;
+using namespace ::com::sun::star::uno	;
 
 //_________________________________________________________________________________________________________________
-//  const
+//	const
 //_________________________________________________________________________________________________________________
 
-#define ROOTNODE_START                  OUString(RTL_CONSTASCII_USTRINGPARAM("Office.Common/Drawinglayer"   ))
-#define DEFAULT_OVERLAYBUFFER           sal_True
-#define DEFAULT_PAINTBUFFER             sal_True
-#define DEFAULT_STRIPE_COLOR_A          0
-#define DEFAULT_STRIPE_COLOR_B          16581375
-#define DEFAULT_STRIPE_LENGTH           4
+#define	ROOTNODE_START			   		OUString(RTL_CONSTASCII_USTRINGPARAM("Office.Common/Drawinglayer"	))
+#define	DEFAULT_OVERLAYBUFFER			sal_True
+#define	DEFAULT_PAINTBUFFER				sal_True
+#define	DEFAULT_STRIPE_COLOR_A			0
+#define	DEFAULT_STRIPE_COLOR_B			16581375
+#define	DEFAULT_STRIPE_LENGTH			4
 
 // #i73602#
 // #i74769#, #i75172# : Change default for Calc and Writer to True
-#define DEFAULT_OVERLAYBUFFER_CALC          sal_True
-#define DEFAULT_OVERLAYBUFFER_WRITER        sal_True
-#define DEFAULT_OVERLAYBUFFER_DRAWIMPRESS   sal_True
+#define	DEFAULT_OVERLAYBUFFER_CALC			sal_True
+#define	DEFAULT_OVERLAYBUFFER_WRITER		sal_True
+#define	DEFAULT_OVERLAYBUFFER_DRAWIMPRESS	sal_True
 
 // #i74769#, #i75172#
-#define DEFAULT_PAINTBUFFER_CALC            sal_True
-#define DEFAULT_PAINTBUFFER_WRITER          sal_True
-#define DEFAULT_PAINTBUFFER_DRAWIMPRESS     sal_True
+#define	DEFAULT_PAINTBUFFER_CALC			sal_True
+#define	DEFAULT_PAINTBUFFER_WRITER			sal_True
+#define	DEFAULT_PAINTBUFFER_DRAWIMPRESS		sal_True
 
 // #i4219#
-#define DEFAULT_MAXIMUMPAPERWIDTH           300
-#define DEFAULT_MAXIMUMPAPERHEIGHT          300
-#define DEFAULT_MAXIMUMPAPERLEFTMARGIN      9999
-#define DEFAULT_MAXIMUMPAPERRIGHTMARGIN     9999
-#define DEFAULT_MAXIMUMPAPERTOPMARGIN       9999
-#define DEFAULT_MAXIMUMPAPERBOTTOMMARGIN    9999
+#define	DEFAULT_MAXIMUMPAPERWIDTH			300
+#define	DEFAULT_MAXIMUMPAPERHEIGHT			300
+#define	DEFAULT_MAXIMUMPAPERLEFTMARGIN		9999
+#define	DEFAULT_MAXIMUMPAPERRIGHTMARGIN		9999
+#define	DEFAULT_MAXIMUMPAPERTOPMARGIN		9999
+#define	DEFAULT_MAXIMUMPAPERBOTTOMMARGIN	9999
 
 // primitives
-#define DEFAULT_ANTIALIASING                        sal_True
-#define DEFAULT_SNAPHORVERLINESTODISCRETE           sal_True
-#define DEFAULT_SOLIDDRAGCREATE                     sal_True
-#define DEFAULT_RENDERDECORATEDTEXTDIRECT           sal_True
-#define DEFAULT_RENDERSIMPLETEXTDIRECT              sal_True
-#define DEFAULT_QUADRATIC3DRENDERLIMIT              1000000
-#define DEFAULT_QUADRATICFORMCONTROLRENDERLIMIT     45000
+#define	DEFAULT_ANTIALIASING                        sal_True
+#define	DEFAULT_SNAPHORVERLINESTODISCRETE			sal_True
+#define	DEFAULT_SOLIDDRAGCREATE                     sal_True
+#define	DEFAULT_RENDERDECORATEDTEXTDIRECT           sal_True
+#define	DEFAULT_RENDERSIMPLETEXTDIRECT              sal_True
+#define	DEFAULT_QUADRATIC3DRENDERLIMIT              1000000
+#define	DEFAULT_QUADRATICFORMCONTROLRENDERLIMIT     45000
 
 // #i97672# selection settings
-#define DEFAULT_TRANSPARENTSELECTION                sal_True
-#define DEFAULT_TRANSPARENTSELECTIONPERCENT         75
+#define	DEFAULT_TRANSPARENTSELECTION                sal_True
+#define DEFAULT_TRANSPARENTSELECTIONPERCENT			75
 #define DEFAULT_SELECTIONMAXIMUMLUMINANCEPERCENT    70
 
-#define PROPERTYNAME_OVERLAYBUFFER      OUString(RTL_CONSTASCII_USTRINGPARAM("OverlayBuffer"    ))
-#define PROPERTYNAME_PAINTBUFFER        OUString(RTL_CONSTASCII_USTRINGPARAM("PaintBuffer"      ))
-#define PROPERTYNAME_STRIPE_COLOR_A     OUString(RTL_CONSTASCII_USTRINGPARAM("StripeColorA"     ))
-#define PROPERTYNAME_STRIPE_COLOR_B     OUString(RTL_CONSTASCII_USTRINGPARAM("StripeColorB"     ))
-#define PROPERTYNAME_STRIPE_LENGTH      OUString(RTL_CONSTASCII_USTRINGPARAM("StripeLength"     ))
+#define	PROPERTYNAME_OVERLAYBUFFER		OUString(RTL_CONSTASCII_USTRINGPARAM("OverlayBuffer"	))
+#define	PROPERTYNAME_PAINTBUFFER		OUString(RTL_CONSTASCII_USTRINGPARAM("PaintBuffer"		))
+#define	PROPERTYNAME_STRIPE_COLOR_A		OUString(RTL_CONSTASCII_USTRINGPARAM("StripeColorA"		))
+#define	PROPERTYNAME_STRIPE_COLOR_B		OUString(RTL_CONSTASCII_USTRINGPARAM("StripeColorB"		))
+#define	PROPERTYNAME_STRIPE_LENGTH		OUString(RTL_CONSTASCII_USTRINGPARAM("StripeLength"		))
 
 // #i73602#
-#define PROPERTYNAME_OVERLAYBUFFER_CALC         OUString(RTL_CONSTASCII_USTRINGPARAM("OverlayBuffer_Calc"))
-#define PROPERTYNAME_OVERLAYBUFFER_WRITER       OUString(RTL_CONSTASCII_USTRINGPARAM("OverlayBuffer_Writer"))
-#define PROPERTYNAME_OVERLAYBUFFER_DRAWIMPRESS  OUString(RTL_CONSTASCII_USTRINGPARAM("OverlayBuffer_DrawImpress"))
+#define	PROPERTYNAME_OVERLAYBUFFER_CALC			OUString(RTL_CONSTASCII_USTRINGPARAM("OverlayBuffer_Calc"))
+#define	PROPERTYNAME_OVERLAYBUFFER_WRITER		OUString(RTL_CONSTASCII_USTRINGPARAM("OverlayBuffer_Writer"))
+#define	PROPERTYNAME_OVERLAYBUFFER_DRAWIMPRESS	OUString(RTL_CONSTASCII_USTRINGPARAM("OverlayBuffer_DrawImpress"))
 
 // #i74769#, #i75172#
-#define PROPERTYNAME_PAINTBUFFER_CALC           OUString(RTL_CONSTASCII_USTRINGPARAM("PaintBuffer_Calc"))
-#define PROPERTYNAME_PAINTBUFFER_WRITER         OUString(RTL_CONSTASCII_USTRINGPARAM("PaintBuffer_Writer"))
-#define PROPERTYNAME_PAINTBUFFER_DRAWIMPRESS    OUString(RTL_CONSTASCII_USTRINGPARAM("PaintBuffer_DrawImpress"))
+#define	PROPERTYNAME_PAINTBUFFER_CALC			OUString(RTL_CONSTASCII_USTRINGPARAM("PaintBuffer_Calc"))
+#define	PROPERTYNAME_PAINTBUFFER_WRITER			OUString(RTL_CONSTASCII_USTRINGPARAM("PaintBuffer_Writer"))
+#define	PROPERTYNAME_PAINTBUFFER_DRAWIMPRESS	OUString(RTL_CONSTASCII_USTRINGPARAM("PaintBuffer_DrawImpress"))
 
 // #i4219#
-#define PROPERTYNAME_MAXIMUMPAPERWIDTH OUString(RTL_CONSTASCII_USTRINGPARAM("MaximumPaperWidth"))
-#define PROPERTYNAME_MAXIMUMPAPERHEIGHT OUString(RTL_CONSTASCII_USTRINGPARAM("MaximumPaperHeight"))
-#define PROPERTYNAME_MAXIMUMPAPERLEFTMARGIN OUString(RTL_CONSTASCII_USTRINGPARAM("MaximumPaperLeftMargin"))
-#define PROPERTYNAME_MAXIMUMPAPERRIGHTMARGIN OUString(RTL_CONSTASCII_USTRINGPARAM("MaximumPaperRightMargin"))
-#define PROPERTYNAME_MAXIMUMPAPERTOPMARGIN OUString(RTL_CONSTASCII_USTRINGPARAM("MaximumPaperTopMargin"))
-#define PROPERTYNAME_MAXIMUMPAPERBOTTOMMARGIN OUString(RTL_CONSTASCII_USTRINGPARAM("MaximumPaperBottomMargin"))
+#define	PROPERTYNAME_MAXIMUMPAPERWIDTH OUString(RTL_CONSTASCII_USTRINGPARAM("MaximumPaperWidth"))
+#define	PROPERTYNAME_MAXIMUMPAPERHEIGHT OUString(RTL_CONSTASCII_USTRINGPARAM("MaximumPaperHeight"))
+#define	PROPERTYNAME_MAXIMUMPAPERLEFTMARGIN OUString(RTL_CONSTASCII_USTRINGPARAM("MaximumPaperLeftMargin"))
+#define	PROPERTYNAME_MAXIMUMPAPERRIGHTMARGIN OUString(RTL_CONSTASCII_USTRINGPARAM("MaximumPaperRightMargin"))
+#define	PROPERTYNAME_MAXIMUMPAPERTOPMARGIN OUString(RTL_CONSTASCII_USTRINGPARAM("MaximumPaperTopMargin"))
+#define	PROPERTYNAME_MAXIMUMPAPERBOTTOMMARGIN OUString(RTL_CONSTASCII_USTRINGPARAM("MaximumPaperBottomMargin"))
 
 // primitives
-#define PROPERTYNAME_ANTIALIASING OUString(RTL_CONSTASCII_USTRINGPARAM("AntiAliasing"))
-#define PROPERTYNAME_SNAPHORVERLINESTODISCRETE OUString(RTL_CONSTASCII_USTRINGPARAM("SnapHorVerLinesToDiscrete"))
-#define PROPERTYNAME_SOLIDDRAGCREATE OUString(RTL_CONSTASCII_USTRINGPARAM("SolidDragCreate"))
-#define PROPERTYNAME_RENDERDECORATEDTEXTDIRECT OUString(RTL_CONSTASCII_USTRINGPARAM("RenderDecoratedTextDirect"))
-#define PROPERTYNAME_RENDERSIMPLETEXTDIRECT OUString(RTL_CONSTASCII_USTRINGPARAM("RenderSimpleTextDirect"))
-#define PROPERTYNAME_QUADRATIC3DRENDERLIMIT OUString(RTL_CONSTASCII_USTRINGPARAM("Quadratic3DRenderLimit"))
-#define PROPERTYNAME_QUADRATICFORMCONTROLRENDERLIMIT OUString(RTL_CONSTASCII_USTRINGPARAM("QuadraticFormControlRenderLimit"))
+#define	PROPERTYNAME_ANTIALIASING OUString(RTL_CONSTASCII_USTRINGPARAM("AntiAliasing"))
+#define	PROPERTYNAME_SNAPHORVERLINESTODISCRETE OUString(RTL_CONSTASCII_USTRINGPARAM("SnapHorVerLinesToDiscrete"))
+#define	PROPERTYNAME_SOLIDDRAGCREATE OUString(RTL_CONSTASCII_USTRINGPARAM("SolidDragCreate"))
+#define	PROPERTYNAME_RENDERDECORATEDTEXTDIRECT OUString(RTL_CONSTASCII_USTRINGPARAM("RenderDecoratedTextDirect"))
+#define	PROPERTYNAME_RENDERSIMPLETEXTDIRECT OUString(RTL_CONSTASCII_USTRINGPARAM("RenderSimpleTextDirect"))
+#define	PROPERTYNAME_QUADRATIC3DRENDERLIMIT OUString(RTL_CONSTASCII_USTRINGPARAM("Quadratic3DRenderLimit"))
+#define	PROPERTYNAME_QUADRATICFORMCONTROLRENDERLIMIT OUString(RTL_CONSTASCII_USTRINGPARAM("QuadraticFormControlRenderLimit"))
 
 // #i97672# selection settings
-#define PROPERTYNAME_TRANSPARENTSELECTION OUString(RTL_CONSTASCII_USTRINGPARAM("TransparentSelection"))
-#define PROPERTYNAME_TRANSPARENTSELECTIONPERCENT OUString(RTL_CONSTASCII_USTRINGPARAM("TransparentSelectionPercent"))
-#define PROPERTYNAME_SELECTIONMAXIMUMLUMINANCEPERCENT OUString(RTL_CONSTASCII_USTRINGPARAM("SelectionMaximumLuminancePercent"))
+#define	PROPERTYNAME_TRANSPARENTSELECTION OUString(RTL_CONSTASCII_USTRINGPARAM("TransparentSelection"))
+#define	PROPERTYNAME_TRANSPARENTSELECTIONPERCENT OUString(RTL_CONSTASCII_USTRINGPARAM("TransparentSelectionPercent"))
+#define	PROPERTYNAME_SELECTIONMAXIMUMLUMINANCEPERCENT OUString(RTL_CONSTASCII_USTRINGPARAM("SelectionMaximumLuminancePercent"))
 
-#define PROPERTYHANDLE_OVERLAYBUFFER                0
-#define PROPERTYHANDLE_PAINTBUFFER                  1
-#define PROPERTYHANDLE_STRIPE_COLOR_A               2
-#define PROPERTYHANDLE_STRIPE_COLOR_B               3
-#define PROPERTYHANDLE_STRIPE_LENGTH                4
+#define	PROPERTYHANDLE_OVERLAYBUFFER				0
+#define	PROPERTYHANDLE_PAINTBUFFER					1
+#define	PROPERTYHANDLE_STRIPE_COLOR_A				2
+#define	PROPERTYHANDLE_STRIPE_COLOR_B				3
+#define	PROPERTYHANDLE_STRIPE_LENGTH				4
 
 // #i73602#
-#define PROPERTYHANDLE_OVERLAYBUFFER_CALC           5
-#define PROPERTYHANDLE_OVERLAYBUFFER_WRITER         6
-#define PROPERTYHANDLE_OVERLAYBUFFER_DRAWIMPRESS    7
+#define	PROPERTYHANDLE_OVERLAYBUFFER_CALC			5
+#define	PROPERTYHANDLE_OVERLAYBUFFER_WRITER			6
+#define	PROPERTYHANDLE_OVERLAYBUFFER_DRAWIMPRESS	7
 
 // #i74769#, #i75172#
-#define PROPERTYHANDLE_PAINTBUFFER_CALC             8
-#define PROPERTYHANDLE_PAINTBUFFER_WRITER           9
-#define PROPERTYHANDLE_PAINTBUFFER_DRAWIMPRESS      10
+#define	PROPERTYHANDLE_PAINTBUFFER_CALC				8
+#define	PROPERTYHANDLE_PAINTBUFFER_WRITER			9
+#define	PROPERTYHANDLE_PAINTBUFFER_DRAWIMPRESS		10
 
 // #i4219#
-#define PROPERTYHANDLE_MAXIMUMPAPERWIDTH            11
-#define PROPERTYHANDLE_MAXIMUMPAPERHEIGHT           12
-#define PROPERTYHANDLE_MAXIMUMPAPERLEFTMARGIN       13
-#define PROPERTYHANDLE_MAXIMUMPAPERRIGHTMARGIN      14
-#define PROPERTYHANDLE_MAXIMUMPAPERTOPMARGIN        15
-#define PROPERTYHANDLE_MAXIMUMPAPERBOTTOMMARGIN     16
+#define	PROPERTYHANDLE_MAXIMUMPAPERWIDTH			11
+#define	PROPERTYHANDLE_MAXIMUMPAPERHEIGHT			12
+#define	PROPERTYHANDLE_MAXIMUMPAPERLEFTMARGIN		13
+#define	PROPERTYHANDLE_MAXIMUMPAPERRIGHTMARGIN		14
+#define	PROPERTYHANDLE_MAXIMUMPAPERTOPMARGIN		15
+#define	PROPERTYHANDLE_MAXIMUMPAPERBOTTOMMARGIN		16
 
 // primitives
-#define PROPERTYHANDLE_ANTIALIASING                     17
-#define PROPERTYHANDLE_SNAPHORVERLINESTODISCRETE        18
-#define PROPERTYHANDLE_SOLIDDRAGCREATE                  19
-#define PROPERTYHANDLE_RENDERDECORATEDTEXTDIRECT        20
-#define PROPERTYHANDLE_RENDERSIMPLETEXTDIRECT           21
-#define PROPERTYHANDLE_QUADRATIC3DRENDERLIMIT           22
-#define PROPERTYHANDLE_QUADRATICFORMCONTROLRENDERLIMIT  23
+#define	PROPERTYHANDLE_ANTIALIASING                     17
+#define	PROPERTYHANDLE_SNAPHORVERLINESTODISCRETE        18
+#define	PROPERTYHANDLE_SOLIDDRAGCREATE					19
+#define	PROPERTYHANDLE_RENDERDECORATEDTEXTDIRECT        20
+#define	PROPERTYHANDLE_RENDERSIMPLETEXTDIRECT           21
+#define	PROPERTYHANDLE_QUADRATIC3DRENDERLIMIT           22
+#define	PROPERTYHANDLE_QUADRATICFORMCONTROLRENDERLIMIT  23
 
 // #i97672# selection settings
-#define PROPERTYHANDLE_TRANSPARENTSELECTION             24
-#define PROPERTYHANDLE_TRANSPARENTSELECTIONPERCENT      25
-#define PROPERTYHANDLE_SELECTIONMAXIMUMLUMINANCEPERCENT 26
+#define	PROPERTYHANDLE_TRANSPARENTSELECTION             24
+#define	PROPERTYHANDLE_TRANSPARENTSELECTIONPERCENT      25
+#define	PROPERTYHANDLE_SELECTIONMAXIMUMLUMINANCEPERCENT 26
 
-#define PROPERTYCOUNT                               27
+#define	PROPERTYCOUNT								27
 
 class SvtOptionsDrawinglayer_Impl : public ConfigItem
 {
 public:
 
 //---------------------------------------------------------------------------------------------------------
-//  constructor / destructor
+//	constructor / destructor
 //---------------------------------------------------------------------------------------------------------
 
      SvtOptionsDrawinglayer_Impl();
     ~SvtOptionsDrawinglayer_Impl();
 
 //---------------------------------------------------------------------------------------------------------
-//  overloaded methods of baseclass
+//	overloaded methods of baseclass
 //---------------------------------------------------------------------------------------------------------
 
     virtual void Commit();
     virtual void Notify( const com::sun::star::uno::Sequence<rtl::OUString>& aPropertyNames);
 
 //---------------------------------------------------------------------------------------------------------
-//  public interface
+//	public interface
 //---------------------------------------------------------------------------------------------------------
 
-    sal_Bool    IsOverlayBuffer() const;
-    sal_Bool    IsPaintBuffer() const;
-    Color       GetStripeColorA() const;
-    Color       GetStripeColorB() const;
-    sal_uInt16  GetStripeLength() const;
+    sal_Bool	IsOverlayBuffer() const;
+    sal_Bool	IsPaintBuffer() const;
+    Color		GetStripeColorA() const;
+    Color		GetStripeColorB() const;
+    sal_uInt16	GetStripeLength() const;
 
     // #i73602#
-    sal_Bool    IsOverlayBuffer_Calc() const;
-    sal_Bool    IsOverlayBuffer_Writer() const;
-    sal_Bool    IsOverlayBuffer_DrawImpress() const;
+    sal_Bool	IsOverlayBuffer_Calc() const;
+    sal_Bool	IsOverlayBuffer_Writer() const;
+    sal_Bool	IsOverlayBuffer_DrawImpress() const;
 
     // #i74769#, #i75172#
-    sal_Bool    IsPaintBuffer_Calc() const;
-    sal_Bool    IsPaintBuffer_Writer() const;
-    sal_Bool    IsPaintBuffer_DrawImpress() const;
+    sal_Bool	IsPaintBuffer_Calc() const;
+    sal_Bool	IsPaintBuffer_Writer() const;
+    sal_Bool	IsPaintBuffer_DrawImpress() const;
 
-    void        SetOverlayBuffer( sal_Bool bState );
-    void        SetPaintBuffer( sal_Bool bState );
-    void        SetStripeColorA( Color aColor );
-    void        SetStripeColorB( Color aColor );
-    void        SetStripeLength( sal_uInt16 nLength );
+    void		SetOverlayBuffer( sal_Bool bState );
+    void		SetPaintBuffer( sal_Bool bState );
+    void		SetStripeColorA( Color aColor );
+    void		SetStripeColorB( Color aColor );
+    void		SetStripeLength( sal_uInt16 nLength );
 
     // #i73602#
-    void        SetOverlayBuffer_Calc( sal_Bool bState );
-    void        SetOverlayBuffer_Writer( sal_Bool bState );
-    void        SetOverlayBuffer_DrawImpress( sal_Bool bState );
+    void		SetOverlayBuffer_Calc( sal_Bool bState );
+    void		SetOverlayBuffer_Writer( sal_Bool bState );
+    void		SetOverlayBuffer_DrawImpress( sal_Bool bState );
 
     // #i74769#, #i75172#
-    void        SetPaintBuffer_Calc( sal_Bool bState );
-    void        SetPaintBuffer_Writer( sal_Bool bState );
-    void        SetPaintBuffer_DrawImpress( sal_Bool bState );
+    void		SetPaintBuffer_Calc( sal_Bool bState );
+    void		SetPaintBuffer_Writer( sal_Bool bState );
+    void		SetPaintBuffer_DrawImpress( sal_Bool bState );
 
     // #i4219#
     sal_uInt32 GetMaximumPaperWidth() const;
@@ -248,33 +248,33 @@ public:
     sal_Bool IsAAPossibleOnThisSystem() const;
 
     // primitives
-    sal_Bool    IsAntiAliasing() const;
-    sal_Bool    IsSnapHorVerLinesToDiscrete() const;
-    sal_Bool    IsSolidDragCreate() const;
-    sal_Bool    IsRenderDecoratedTextDirect() const;
-    sal_Bool    IsRenderSimpleTextDirect() const;
+    sal_Bool	IsAntiAliasing() const;
+    sal_Bool	IsSnapHorVerLinesToDiscrete() const;
+    sal_Bool	IsSolidDragCreate() const;
+    sal_Bool	IsRenderDecoratedTextDirect() const;
+    sal_Bool	IsRenderSimpleTextDirect() const;
     sal_uInt32  GetQuadratic3DRenderLimit() const;
     sal_uInt32  GetQuadraticFormControlRenderLimit() const;
 
-    void        SetAntiAliasing( sal_Bool bState );
-    void        SetSnapHorVerLinesToDiscrete( sal_Bool bState );
-    void        SetSolidDragCreate( sal_Bool bState );
-    void        SetRenderDecoratedTextDirect( sal_Bool bState );
-    void        SetRenderSimpleTextDirect( sal_Bool bState );
+    void		SetAntiAliasing( sal_Bool bState );
+    void		SetSnapHorVerLinesToDiscrete( sal_Bool bState );
+    void		SetSolidDragCreate( sal_Bool bState );
+    void		SetRenderDecoratedTextDirect( sal_Bool bState );
+    void		SetRenderSimpleTextDirect( sal_Bool bState );
     void        SetQuadratic3DRenderLimit(sal_uInt32 nNew);
     void        SetQuadraticFormControlRenderLimit(sal_uInt32 nNew);
 
     // #i97672# selection settings
-    sal_Bool    IsTransparentSelection() const;
-    sal_uInt16  GetTransparentSelectionPercent() const;
-    sal_uInt16  GetSelectionMaximumLuminancePercent() const;
+    sal_Bool	IsTransparentSelection() const;
+    sal_uInt16	GetTransparentSelectionPercent() const;
+    sal_uInt16	GetSelectionMaximumLuminancePercent() const;
 
-    void        SetTransparentSelection( sal_Bool bState );
-    void        SetTransparentSelectionPercent( sal_uInt16 nPercent );
-    void        SetSelectionMaximumLuminancePercent( sal_uInt16 nPercent );
+    void		SetTransparentSelection( sal_Bool bState );
+    void		SetTransparentSelectionPercent( sal_uInt16 nPercent );
+    void		SetSelectionMaximumLuminancePercent( sal_uInt16 nPercent );
 
 //-------------------------------------------------------------------------------------------------------------
-//  private methods
+//	private methods
 //-------------------------------------------------------------------------------------------------------------
 
 private:
@@ -282,48 +282,48 @@ private:
     static Sequence< OUString > impl_GetPropertyNames();
 
 //-------------------------------------------------------------------------------------------------------------
-//  private member
+//	private member
 //-------------------------------------------------------------------------------------------------------------
 
 private:
 
-        sal_Bool    m_bOverlayBuffer;
-        sal_Bool    m_bPaintBuffer;
-        Color       m_bStripeColorA;
-        Color       m_bStripeColorB;
-        sal_uInt16  m_nStripeLength;
+        sal_Bool	m_bOverlayBuffer;
+        sal_Bool	m_bPaintBuffer;
+        Color		m_bStripeColorA;
+        Color		m_bStripeColorB;
+        sal_uInt16	m_nStripeLength;
 
         // #i73602#
-        sal_Bool    m_bOverlayBuffer_Calc;
-        sal_Bool    m_bOverlayBuffer_Writer;
-        sal_Bool    m_bOverlayBuffer_DrawImpress;
+        sal_Bool	m_bOverlayBuffer_Calc;
+        sal_Bool	m_bOverlayBuffer_Writer;
+        sal_Bool	m_bOverlayBuffer_DrawImpress;
 
         // #i74769#, #i75172#
-        sal_Bool    m_bPaintBuffer_Calc;
-        sal_Bool    m_bPaintBuffer_Writer;
-        sal_Bool    m_bPaintBuffer_DrawImpress;
+        sal_Bool	m_bPaintBuffer_Calc;
+        sal_Bool	m_bPaintBuffer_Writer;
+        sal_Bool	m_bPaintBuffer_DrawImpress;
 
         // #i4219#
-        sal_uInt32  m_nMaximumPaperWidth;
-        sal_uInt32  m_nMaximumPaperHeight;
-        sal_uInt32  m_nMaximumPaperLeftMargin;
-        sal_uInt32  m_nMaximumPaperRightMargin;
-        sal_uInt32  m_nMaximumPaperTopMargin;
-        sal_uInt32  m_nMaximumPaperBottomMargin;
+        sal_uInt32	m_nMaximumPaperWidth;
+        sal_uInt32	m_nMaximumPaperHeight;
+        sal_uInt32	m_nMaximumPaperLeftMargin;
+        sal_uInt32	m_nMaximumPaperRightMargin;
+        sal_uInt32	m_nMaximumPaperTopMargin;
+        sal_uInt32	m_nMaximumPaperBottomMargin;
 
         // primitives
-        sal_Bool    m_bAntiAliasing;
-        sal_Bool    m_bSnapHorVerLinesToDiscrete;
-        sal_Bool    m_bSolidDragCreate;
-        sal_Bool    m_bRenderDecoratedTextDirect;
-        sal_Bool    m_bRenderSimpleTextDirect;
-        sal_uInt32  m_nQuadratic3DRenderLimit;
-        sal_uInt32  m_nQuadraticFormControlRenderLimit;
+        sal_Bool	m_bAntiAliasing;
+        sal_Bool	m_bSnapHorVerLinesToDiscrete;
+        sal_Bool	m_bSolidDragCreate;
+        sal_Bool	m_bRenderDecoratedTextDirect;
+        sal_Bool	m_bRenderSimpleTextDirect;
+        sal_uInt32	m_nQuadratic3DRenderLimit;
+        sal_uInt32	m_nQuadraticFormControlRenderLimit;
 
         // #i97672# selection settings
-        sal_uInt16  m_nTransparentSelectionPercent;
-        sal_uInt16  m_nSelectionMaximumLuminancePercent;
-        sal_Bool    m_bTransparentSelection;
+        sal_uInt16	m_nTransparentSelectionPercent;
+        sal_uInt16	m_nSelectionMaximumLuminancePercent;
+        sal_Bool	m_bTransparentSelection;
 
         // local values
         bool        m_bAllowAA : 1;
@@ -331,14 +331,14 @@ private:
 };
 
 //_________________________________________________________________________________________________________________
-//  definitions
+//	definitions
 //_________________________________________________________________________________________________________________
 
 //*****************************************************************************************************************
-//  constructor
+//	constructor
 //*****************************************************************************************************************
 SvtOptionsDrawinglayer_Impl::SvtOptionsDrawinglayer_Impl() :
-    ConfigItem( ROOTNODE_START  ),
+    ConfigItem( ROOTNODE_START	),
     m_bOverlayBuffer( DEFAULT_OVERLAYBUFFER ),
     m_bPaintBuffer( DEFAULT_PAINTBUFFER ),
     m_bStripeColorA(Color(DEFAULT_STRIPE_COLOR_A)),
@@ -381,14 +381,14 @@ SvtOptionsDrawinglayer_Impl::SvtOptionsDrawinglayer_Impl() :
     m_bAllowAA(true),
     m_bAllowAAChecked(false)
 {
-    Sequence< OUString >    seqNames( impl_GetPropertyNames() );
-    Sequence< Any >         seqValues   = GetProperties( seqNames ) ;
+    Sequence< OUString >	seqNames( impl_GetPropertyNames() );
+    Sequence< Any >			seqValues	= GetProperties( seqNames )	;
 
     DBG_ASSERT( !(seqNames.getLength()!=seqValues.getLength()), "SvtOptionsDrawinglayer_Impl::SvtOptionsDrawinglayer_Impl()\nI miss some values of configuration keys!\n" );
 
     // Copy values from list in right order to ouer internal member.
     sal_Int32 nPropertyCount = seqValues.getLength();
-    sal_Int32 nProperty = 0;
+    sal_Int32 nProperty	= 0;
 
     for( nProperty=0; nProperty<nPropertyCount; ++nProperty )
     {
@@ -580,13 +580,13 @@ SvtOptionsDrawinglayer_Impl::SvtOptionsDrawinglayer_Impl() :
                 seqValues[nProperty] >>= m_bTransparentSelection;
             }
             break;
-
+            
             case PROPERTYHANDLE_TRANSPARENTSELECTIONPERCENT:
             {
                 DBG_ASSERT(!(seqValues[nProperty].getValueTypeClass()!=TypeClass_SHORT), "SvtOptionsDrawinglayer_Impl::SvtOptionsDrawinglayer_Impl()\nWho has changed the value type of \"Office.Common\\Drawinglayer\\TransparentSelectionPercent\"?" );
                 seqValues[nProperty] >>= m_nTransparentSelectionPercent;
             }
-
+            
             case PROPERTYHANDLE_SELECTIONMAXIMUMLUMINANCEPERCENT:
             {
                 DBG_ASSERT(!(seqValues[nProperty].getValueTypeClass()!=TypeClass_SHORT), "SvtOptionsDrawinglayer_Impl::SvtOptionsDrawinglayer_Impl()\nWho has changed the value type of \"Office.Common\\Drawinglayer\\SelectionMaximumLuminancePercent\"?" );
@@ -598,7 +598,7 @@ SvtOptionsDrawinglayer_Impl::SvtOptionsDrawinglayer_Impl() :
 }
 
 //*****************************************************************************************************************
-//  destructor
+//	destructor
 //*****************************************************************************************************************
 SvtOptionsDrawinglayer_Impl::~SvtOptionsDrawinglayer_Impl()
 {
@@ -607,12 +607,12 @@ SvtOptionsDrawinglayer_Impl::~SvtOptionsDrawinglayer_Impl()
 }
 
 //*****************************************************************************************************************
-//  Commit
+//	Commit
 //*****************************************************************************************************************
 void SvtOptionsDrawinglayer_Impl::Commit()
 {
-    Sequence< OUString >    aSeqNames( impl_GetPropertyNames() );
-    Sequence< Any >         aSeqValues( aSeqNames.getLength() );
+    Sequence< OUString >	aSeqNames( impl_GetPropertyNames() );
+    Sequence< Any >			aSeqValues( aSeqNames.getLength() );
 
     for( sal_Int32 nProperty = 0, nCount = aSeqNames.getLength(); nProperty < nCount; ++nProperty )
     {
@@ -741,7 +741,7 @@ void SvtOptionsDrawinglayer_Impl::Notify( const com::sun::star::uno::Sequence<rt
 }
 
 //*****************************************************************************************************************
-//  public method
+//	public method
 //*****************************************************************************************************************
 sal_Bool SvtOptionsDrawinglayer_Impl::IsOverlayBuffer() const
 {
@@ -749,7 +749,7 @@ sal_Bool SvtOptionsDrawinglayer_Impl::IsOverlayBuffer() const
 }
 
 //*****************************************************************************************************************
-//  public method
+//	public method
 //*****************************************************************************************************************
 sal_Bool SvtOptionsDrawinglayer_Impl::IsPaintBuffer() const
 {
@@ -757,7 +757,7 @@ sal_Bool SvtOptionsDrawinglayer_Impl::IsPaintBuffer() const
 }
 
 //*****************************************************************************************************************
-//  public method
+//	public method
 //*****************************************************************************************************************
 Color SvtOptionsDrawinglayer_Impl::GetStripeColorA() const
 {
@@ -765,7 +765,7 @@ Color SvtOptionsDrawinglayer_Impl::GetStripeColorA() const
 }
 
 //*****************************************************************************************************************
-//  public method
+//	public method
 //*****************************************************************************************************************
 Color SvtOptionsDrawinglayer_Impl::GetStripeColorB() const
 {
@@ -773,7 +773,7 @@ Color SvtOptionsDrawinglayer_Impl::GetStripeColorB() const
 }
 
 //*****************************************************************************************************************
-//  public method
+//	public method
 //*****************************************************************************************************************
 sal_uInt16 SvtOptionsDrawinglayer_Impl::GetStripeLength() const
 {
@@ -844,7 +844,7 @@ sal_uInt32 SvtOptionsDrawinglayer_Impl::GetMaximumPaperBottomMargin() const
 }
 
 //*****************************************************************************************************************
-//  public method
+//	public method
 //*****************************************************************************************************************
 void SvtOptionsDrawinglayer_Impl::SetOverlayBuffer( sal_Bool bState )
 {
@@ -856,7 +856,7 @@ void SvtOptionsDrawinglayer_Impl::SetOverlayBuffer( sal_Bool bState )
 }
 
 //*****************************************************************************************************************
-//  public method
+//	public method
 //*****************************************************************************************************************
 void SvtOptionsDrawinglayer_Impl::SetPaintBuffer( sal_Bool bState )
 {
@@ -868,7 +868,7 @@ void SvtOptionsDrawinglayer_Impl::SetPaintBuffer( sal_Bool bState )
 }
 
 //*****************************************************************************************************************
-//  public method
+//	public method
 //*****************************************************************************************************************
 void SvtOptionsDrawinglayer_Impl::SetStripeColorA( Color aColor )
 {
@@ -880,7 +880,7 @@ void SvtOptionsDrawinglayer_Impl::SetStripeColorA( Color aColor )
 }
 
 //*****************************************************************************************************************
-//  public method
+//	public method
 //*****************************************************************************************************************
 void SvtOptionsDrawinglayer_Impl::SetStripeColorB( Color aColor )
 {
@@ -892,7 +892,7 @@ void SvtOptionsDrawinglayer_Impl::SetStripeColorB( Color aColor )
 }
 
 //*****************************************************************************************************************
-//  public method
+//	public method
 //*****************************************************************************************************************
 void SvtOptionsDrawinglayer_Impl::SetStripeLength( sal_uInt16 nLength )
 {
@@ -1182,18 +1182,18 @@ sal_uInt16 SvtOptionsDrawinglayer_Impl::GetSelectionMaximumLuminancePercent() co
 }
 
 //*****************************************************************************************************************
-//  private method
+//	private method
 //*****************************************************************************************************************
 Sequence< OUString > SvtOptionsDrawinglayer_Impl::impl_GetPropertyNames()
 {
     // Build static list of configuration key names.
     static const OUString pProperties[] =
     {
-        PROPERTYNAME_OVERLAYBUFFER      ,
-        PROPERTYNAME_PAINTBUFFER        ,
-        PROPERTYNAME_STRIPE_COLOR_A     ,
-        PROPERTYNAME_STRIPE_COLOR_B     ,
-        PROPERTYNAME_STRIPE_LENGTH      ,
+        PROPERTYNAME_OVERLAYBUFFER		,
+        PROPERTYNAME_PAINTBUFFER		,
+        PROPERTYNAME_STRIPE_COLOR_A		,
+        PROPERTYNAME_STRIPE_COLOR_B		,
+        PROPERTYNAME_STRIPE_LENGTH		,
 
         // #i73602#
         PROPERTYNAME_OVERLAYBUFFER_CALC,
@@ -1221,7 +1221,7 @@ Sequence< OUString > SvtOptionsDrawinglayer_Impl::impl_GetPropertyNames()
         PROPERTYNAME_RENDERSIMPLETEXTDIRECT,
         PROPERTYNAME_QUADRATIC3DRENDERLIMIT,
         PROPERTYNAME_QUADRATICFORMCONTROLRENDERLIMIT,
-
+        
         // #i97672# selection settings
         PROPERTYNAME_TRANSPARENTSELECTION,
         PROPERTYNAME_TRANSPARENTSELECTIONPERCENT,
@@ -1235,15 +1235,15 @@ Sequence< OUString > SvtOptionsDrawinglayer_Impl::impl_GetPropertyNames()
 }
 
 //*****************************************************************************************************************
-//  initialize static member
-//  DON'T DO IT IN YOUR HEADER!
-//  see definition for further informations
+//	initialize static member
+//	DON'T DO IT IN YOUR HEADER!
+//	see definition for further informations
 //*****************************************************************************************************************
 SvtOptionsDrawinglayer_Impl* SvtOptionsDrawinglayer::m_pDataContainer = NULL;
 sal_Int32 SvtOptionsDrawinglayer::m_nRefCount = 0;
 
 //*****************************************************************************************************************
-//  constructor
+//	constructor
 //*****************************************************************************************************************
 SvtOptionsDrawinglayer::SvtOptionsDrawinglayer()
 {
@@ -1259,7 +1259,7 @@ SvtOptionsDrawinglayer::SvtOptionsDrawinglayer()
 }
 
 //*****************************************************************************************************************
-//  destructor
+//	destructor
 //*****************************************************************************************************************
 SvtOptionsDrawinglayer::~SvtOptionsDrawinglayer()
 {
@@ -1277,7 +1277,7 @@ SvtOptionsDrawinglayer::~SvtOptionsDrawinglayer()
 }
 
 //*****************************************************************************************************************
-//  public method
+//	public method
 //*****************************************************************************************************************
 sal_Bool SvtOptionsDrawinglayer::IsOverlayBuffer() const
 {
@@ -1286,7 +1286,7 @@ sal_Bool SvtOptionsDrawinglayer::IsOverlayBuffer() const
 }
 
 //*****************************************************************************************************************
-//  public method
+//	public method
 //*****************************************************************************************************************
 sal_Bool SvtOptionsDrawinglayer::IsPaintBuffer() const
 {
@@ -1295,7 +1295,7 @@ sal_Bool SvtOptionsDrawinglayer::IsPaintBuffer() const
 }
 
 //*****************************************************************************************************************
-//  public method
+//	public method
 //*****************************************************************************************************************
 Color SvtOptionsDrawinglayer::GetStripeColorA() const
 {
@@ -1304,7 +1304,7 @@ Color SvtOptionsDrawinglayer::GetStripeColorA() const
 }
 
 //*****************************************************************************************************************
-//  public method
+//	public method
 //*****************************************************************************************************************
 Color SvtOptionsDrawinglayer::GetStripeColorB() const
 {
@@ -1313,7 +1313,7 @@ Color SvtOptionsDrawinglayer::GetStripeColorB() const
 }
 
 //*****************************************************************************************************************
-//  public method
+//	public method
 //*****************************************************************************************************************
 sal_uInt16 SvtOptionsDrawinglayer::GetStripeLength() const
 {
@@ -1397,7 +1397,7 @@ sal_uInt32 SvtOptionsDrawinglayer::GetMaximumPaperBottomMargin() const
 }
 
 //*****************************************************************************************************************
-//  public method
+//	public method
 //*****************************************************************************************************************
 void SvtOptionsDrawinglayer::SetOverlayBuffer( sal_Bool bState )
 {
@@ -1406,7 +1406,7 @@ void SvtOptionsDrawinglayer::SetOverlayBuffer( sal_Bool bState )
 }
 
 //*****************************************************************************************************************
-//  public method
+//	public method
 //*****************************************************************************************************************
 void SvtOptionsDrawinglayer::SetPaintBuffer( sal_Bool bState )
 {
@@ -1415,7 +1415,7 @@ void SvtOptionsDrawinglayer::SetPaintBuffer( sal_Bool bState )
 }
 
 //*****************************************************************************************************************
-//  public method
+//	public method
 //*****************************************************************************************************************
 void SvtOptionsDrawinglayer::SetStripeColorA( Color aColor )
 {
@@ -1424,7 +1424,7 @@ void SvtOptionsDrawinglayer::SetStripeColorA( Color aColor )
 }
 
 //*****************************************************************************************************************
-//  public method
+//	public method
 //*****************************************************************************************************************
 void SvtOptionsDrawinglayer::SetStripeColorB( Color aColor )
 {
@@ -1433,7 +1433,7 @@ void SvtOptionsDrawinglayer::SetStripeColorB( Color aColor )
 }
 
 //*****************************************************************************************************************
-//  public method
+//	public method
 //*****************************************************************************************************************
 void SvtOptionsDrawinglayer::SetStripeLength( sal_uInt16 nLength )
 {
@@ -1685,7 +1685,7 @@ void SvtOptionsDrawinglayer::SetSelectionMaximumLuminancePercent( sal_uInt16 nPe
 }
 
 //*****************************************************************************************************************
-//  private method
+//	private method
 //*****************************************************************************************************************
 Mutex& SvtOptionsDrawinglayer::GetOwnStaticMutex()
 {
diff --git a/svtools/source/config/printoptions.cxx b/svtools/source/config/printoptions.cxx
index 46e1f737d347..abe9c5a7dfe3 100644
--- a/svtools/source/config/printoptions.cxx
+++ b/svtools/source/config/printoptions.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
@@ -29,7 +29,7 @@
 #include "precompiled_svtools.hxx"
 
 //_________________________________________________________________________________________________________________
-//  includes
+//	includes
 //_________________________________________________________________________________________________________________
 
 #include <svtools/printoptions.hxx>
@@ -83,13 +83,13 @@ static USHORT aDPIArray[] = { 72, 96, 150, 200, 300, 600 };
 // - Defines -
 // -----------
 
-#define ROOTNODE_START                                  OUString(RTL_CONSTASCII_USTRINGPARAM("Office.Common/Print/Option"))
+#define	ROOTNODE_START			   		                OUString(RTL_CONSTASCII_USTRINGPARAM("Office.Common/Print/Option"))
 #define ROOTNODE_PRINTOPTION                            OUString(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.Office.Common/Print/Option"))
 
-#define PROPERTYNAME_REDUCETRANSPARENCY                 OUString(RTL_CONSTASCII_USTRINGPARAM("ReduceTransparency"))
-#define PROPERTYNAME_REDUCEDTRANSPARENCYMODE            OUString(RTL_CONSTASCII_USTRINGPARAM("ReducedTransparencyMode"))
-#define PROPERTYNAME_REDUCEGRADIENTS                    OUString(RTL_CONSTASCII_USTRINGPARAM("ReduceGradients"))
-#define PROPERTYNAME_REDUCEDGRADIENTMODE                OUString(RTL_CONSTASCII_USTRINGPARAM("ReducedGradientMode"))
+#define	PROPERTYNAME_REDUCETRANSPARENCY	                OUString(RTL_CONSTASCII_USTRINGPARAM("ReduceTransparency"))
+#define	PROPERTYNAME_REDUCEDTRANSPARENCYMODE	        OUString(RTL_CONSTASCII_USTRINGPARAM("ReducedTransparencyMode"))
+#define	PROPERTYNAME_REDUCEGRADIENTS		            OUString(RTL_CONSTASCII_USTRINGPARAM("ReduceGradients"))
+#define	PROPERTYNAME_REDUCEDGRADIENTMODE		        OUString(RTL_CONSTASCII_USTRINGPARAM("ReducedGradientMode"))
 #define PROPERTYNAME_REDUCEDGRADIENTSTEPCOUNT           OUString(RTL_CONSTASCII_USTRINGPARAM("ReducedGradientStepCount"))
 #define PROPERTYNAME_REDUCEBITMAPS                      OUString(RTL_CONSTASCII_USTRINGPARAM("ReduceBitmaps"))
 #define PROPERTYNAME_REDUCEDBITMAPMODE                  OUString(RTL_CONSTASCII_USTRINGPARAM("ReducedBitmapMode"))
@@ -115,10 +115,10 @@ static SvtPrintOptions_Impl*   pPrinterOptionsDataContainer = NULL;
 static SvtPrintOptions_Impl*   pPrintFileOptionsDataContainer = NULL;
 
 SvtPrintOptions_Impl*   SvtPrinterOptions::m_pStaticDataContainer = NULL;
-sal_Int32               SvtPrinterOptions::m_nRefCount = 0;
+sal_Int32				SvtPrinterOptions::m_nRefCount = 0;
 
 SvtPrintOptions_Impl*   SvtPrintFileOptions::m_pStaticDataContainer = NULL;
-sal_Int32               SvtPrintFileOptions::m_nRefCount = 0;
+sal_Int32				SvtPrintFileOptions::m_nRefCount = 0;
 
 // ------------------------
 // - SvtPrintOptions_Impl -
@@ -129,28 +129,28 @@ class SvtPrintOptions_Impl
 public:
 
 //---------------------------------------------------------------------------------------------------------
-//  constructor / destructor
+//	constructor / destructor
 //---------------------------------------------------------------------------------------------------------
 
      SvtPrintOptions_Impl( const OUString& rConfigRoot );
     ~SvtPrintOptions_Impl();
 
 //---------------------------------------------------------------------------------------------------------
-//  public interface
+//	public interface
 //---------------------------------------------------------------------------------------------------------
 
-    sal_Bool    IsReduceTransparency() const ;
+    sal_Bool	IsReduceTransparency() const ;
     sal_Int16   GetReducedTransparencyMode() const ;
-    sal_Bool    IsReduceGradients() const ;
+    sal_Bool	IsReduceGradients() const ;
     sal_Int16   GetReducedGradientMode() const ;
     sal_Int16   GetReducedGradientStepCount() const ;
-    sal_Bool    IsReduceBitmaps() const ;
+    sal_Bool	IsReduceBitmaps() const ;
     sal_Int16   GetReducedBitmapMode() const ;
     sal_Int16   GetReducedBitmapResolution() const ;
-    sal_Bool    IsReducedBitmapIncludesTransparency() const ;
-       sal_Bool IsConvertToGreyscales() const;
+    sal_Bool	IsReducedBitmapIncludesTransparency() const ;
+       sal_Bool	IsConvertToGreyscales() const;
 
-    void        SetReduceTransparency( sal_Bool bState ) ;
+    void        SetReduceTransparency( sal_Bool	bState ) ;
     void        SetReducedTransparencyMode( sal_Int16 nMode ) ;
     void        SetReduceGradients( sal_Bool bState ) ;
     void        SetReducedGradientMode( sal_Int16 nMode ) ;
@@ -162,7 +162,7 @@ public:
        void        SetConvertToGreyscales( sal_Bool bState ) ;
 
 //-------------------------------------------------------------------------------------------------------------
-//  private API
+//	private API
 //-------------------------------------------------------------------------------------------------------------
 
 private:
@@ -172,7 +172,7 @@ private:
                               ::sal_Int16      nNew );
 
 //-------------------------------------------------------------------------------------------------------------
-//  private member
+//	private member
 //-------------------------------------------------------------------------------------------------------------
 
 private:
diff --git a/svtools/source/config/test/test.cxx b/svtools/source/config/test/test.cxx
index ea4e0c0ec942..ff50e0d89ad8 100644
--- a/svtools/source/config/test/test.cxx
+++ b/svtools/source/config/test/test.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
@@ -36,13 +36,13 @@
 #define TEST_DYNAMICMENUOPTIONS
 
 //_________________________________________________________________________________________________________________
-//  my own includes
+//	my own includes
 //_________________________________________________________________________________________________________________
 
 #include <unotools/dynamicmenuoptions.hxx>
 
 //_________________________________________________________________________________________________________________
-//  interface includes
+//	interface includes
 //_________________________________________________________________________________________________________________
 #include <cppuhelper/bootstrap.hxx>
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
@@ -50,7 +50,7 @@
 #include <com/sun/star/registry/XSimpleRegistry.hpp>
 
 //_________________________________________________________________________________________________________________
-//  other includes
+//	other includes
 //_________________________________________________________________________________________________________________
 
 #ifndef _COMPHELPER_PROCESSFACTORY_HXX_
@@ -80,23 +80,23 @@
 #include <stdio.h>
 
 //_________________________________________________________________________________________________________________
-//  const
+//	const
 //_________________________________________________________________________________________________________________
 
 //_________________________________________________________________________________________________________________
-//  namespace
+//	namespace
 //_________________________________________________________________________________________________________________
 
-using namespace ::rtl                       ;
+using namespace ::rtl						;
 using namespace ::osl                       ;
-using namespace ::comphelper                ;
-using namespace ::com::sun::star::uno       ;
+using namespace ::comphelper				;
+using namespace ::com::sun::star::uno		;
 using namespace ::com::sun::star::lang      ;
 using namespace ::com::sun::star::beans     ;
 using namespace ::com::sun::star::registry  ;
 
 //_________________________________________________________________________________________________________________
-//  defines
+//	defines
 //_________________________________________________________________________________________________________________
 
 #define ASCII( STEXT )                      OUString( RTL_CONSTASCII_USTRINGPARAM( STEXT ))
@@ -105,7 +105,7 @@ using namespace ::com::sun::star::registry  ;
 #define SERVICENAME_NESTEDREGISTRY          OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.registry.NestedRegistry" ))
 
 //_________________________________________________________________________________________________________________
-//  declarations
+//	declarations
 //_________________________________________________________________________________________________________________
 
 class TestApplication : public Application
@@ -133,16 +133,16 @@ class TestApplication : public Application
     //*************************************************************************************************************
     private:
 
-};  //  class TestApplication
+};	//	class TestApplication
 
 //_________________________________________________________________________________________________________________
-//  global variables
+//	global variables
 //_________________________________________________________________________________________________________________
 
-TestApplication aTestApplication ;
+TestApplication	aTestApplication ;
 
 //_________________________________________________________________________________________________________________
-//  main
+//	main
 //_________________________________________________________________________________________________________________
 
 void TestApplication::Main()
@@ -164,7 +164,7 @@ void TestApplication::Main()
         impl_testDynamicMenuOptions();
     #endif
 
-//  Execute();
+//	Execute();
     OSL_ENSURE( sal_False, "Test was successful!\n" );
 }
 
diff --git a/svtools/source/contnr/cont_pch.cxx b/svtools/source/contnr/cont_pch.cxx
index 4661a08162a2..53e8bf212cd3 100644
--- a/svtools/source/contnr/cont_pch.cxx
+++ b/svtools/source/contnr/cont_pch.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
diff --git a/svtools/source/contnr/contentenumeration.cxx b/svtools/source/contnr/contentenumeration.cxx
index 93f328ae2028..7daefe2a33b1 100644
--- a/svtools/source/contnr/contentenumeration.cxx
+++ b/svtools/source/contnr/contentenumeration.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
@@ -59,12 +59,12 @@ namespace svt
 #define ROW_DATE_CREATE     4
 #define ROW_IS_FOLDER       5
 #define ROW_TARGET_URL      6
-#define ROW_IS_HIDDEN       7
-#define ROW_IS_VOLUME       8
-#define ROW_IS_REMOTE       9
-#define ROW_IS_REMOVEABLE   10
-#define ROW_IS_FLOPPY       11
-#define ROW_IS_COMPACTDISC  12
+#define ROW_IS_HIDDEN		7
+#define ROW_IS_VOLUME		8
+#define ROW_IS_REMOTE		9
+#define ROW_IS_REMOVEABLE	10
+#define ROW_IS_FLOPPY		11
+#define ROW_IS_COMPACTDISC	12
 
 #define CONVERT_DATETIME( aUnoDT, aToolsDT ) \
     aToolsDT = ::DateTime( Date( aUnoDT.Day, aUnoDT.Month, aUnoDT.Year ), \
@@ -102,7 +102,7 @@ namespace svt
         ,m_pFilter               ( NULL            )
         ,m_pTranslator           ( _pTranslator    )
         ,m_bCancelled            ( false           )
-        ,m_rBlackList            ( ::com::sun::star::uno::Sequence< ::rtl::OUString >() )
+        ,m_rBlackList			 ( ::com::sun::star::uno::Sequence< ::rtl::OUString >() )
     {
     }
 
@@ -124,9 +124,9 @@ namespace svt
     }
 
     //--------------------------------------------------------------------
-    EnumerationResult FileViewContentEnumerator::enumerateFolderContentSync(
-        const FolderDescriptor& _rFolder,
-        const IUrlFilter* _pFilter,
+    EnumerationResult FileViewContentEnumerator::enumerateFolderContentSync( 
+        const FolderDescriptor& _rFolder, 
+        const IUrlFilter* _pFilter, 
         const ::com::sun::star::uno::Sequence< ::rtl::OUString >& rBlackList )
     {
         {
@@ -169,7 +169,7 @@ namespace svt
     {
         return osl_incrementInterlockedCount( &m_refCount );
     }
-
+    
     //--------------------------------------------------------------------
     oslInterlockedCount SAL_CALL FileViewContentEnumerator::release()
     {
@@ -187,7 +187,7 @@ namespace svt
         EnumerationResult eResult = ERROR;
         try
         {
-
+            
             Reference< XResultSet > xResultSet;
             Sequence< OUString > aProps(12);
 
@@ -402,7 +402,7 @@ namespace svt
             if ( entryName.equals(  m_rBlackList[i] ) )
                 return true;
         }
-
+        
         return false;
     }
 
diff --git a/svtools/source/contnr/contentenumeration.hxx b/svtools/source/contnr/contentenumeration.hxx
index 16db279ad547..188e31b3d659 100644
--- a/svtools/source/contnr/contentenumeration.hxx
+++ b/svtools/source/contnr/contentenumeration.hxx
@@ -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
@@ -54,7 +54,7 @@ namespace svt
         ::rtl::OUString maFilename;     // only filename in upper case - for compare purposes
         ::rtl::OUString maTitle;        //  -> be carefull when changing maTitle to update maFilename only when new
         ::rtl::OUString maLowerTitle;
-
+        
 
     public:
         ::rtl::OUString maType;
diff --git a/svtools/source/contnr/ctrdll.cxx b/svtools/source/contnr/ctrdll.cxx
index 463c6ccc8b35..04062561bb39 100644
--- a/svtools/source/contnr/ctrdll.cxx
+++ b/svtools/source/contnr/ctrdll.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
diff --git a/svtools/source/contnr/fileview.hrc b/svtools/source/contnr/fileview.hrc
index bbf340148fc9..23f620158401 100644
--- a/svtools/source/contnr/fileview.hrc
+++ b/svtools/source/contnr/fileview.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
@@ -25,8 +25,8 @@
  *
  ************************************************************************/
 
-#define MID_FILEVIEW_DELETE     1
-#define MID_FILEVIEW_RENAME     2
+#define MID_FILEVIEW_DELETE		1
+#define MID_FILEVIEW_RENAME		2
 
 // DLG_SFX_QUERYDELETE ********************************************************
 
diff --git a/svtools/source/contnr/fileview.src b/svtools/source/contnr/fileview.src
index f40530c10347..a1d80474afb4 100644
--- a/svtools/source/contnr/fileview.src
+++ b/svtools/source/contnr/fileview.src
@@ -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
diff --git a/svtools/source/contnr/imivctl.hxx b/svtools/source/contnr/imivctl.hxx
index cc7aa4e05ee1..39fae2e509d1 100644
--- a/svtools/source/contnr/imivctl.hxx
+++ b/svtools/source/contnr/imivctl.hxx
@@ -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
@@ -54,42 +54,42 @@ class IcnGridMap_Impl;
 //
 // some defines
 //
-#define PAINTFLAG_HOR_CENTERED  0x0001
-#define PAINTFLAG_VER_CENTERED  0x0002
-
-#define F_VER_SBARSIZE_WITH_HBAR        0x0001
-#define F_HOR_SBARSIZE_WITH_VBAR        0x0002
-#define F_PAINTED                       0x0004  // TRUE nach erstem Paint
-#define F_ADD_MODE                      0x0008
-#define F_SELECTING_RECT                0x0020
-#define F_DOWN_CTRL                     0x0080
-#define F_DOWN_DESELECT                 0x0100
-#define F_START_EDITTIMER_IN_MOUSEUP    0x0400
-#define F_MOVED_ENTRIES                 0x0800
-#define F_ENTRYLISTPOS_VALID            0x1000
-#define F_CLEARING_SELECTION            0x2000
-#define F_ARRANGING                     0x4000
+#define PAINTFLAG_HOR_CENTERED	0x0001
+#define PAINTFLAG_VER_CENTERED	0x0002
+
+#define F_VER_SBARSIZE_WITH_HBAR		0x0001
+#define F_HOR_SBARSIZE_WITH_VBAR		0x0002
+#define F_PAINTED						0x0004	// TRUE nach erstem Paint
+#define F_ADD_MODE						0x0008
+#define F_SELECTING_RECT				0x0020
+#define F_DOWN_CTRL						0x0080
+#define F_DOWN_DESELECT					0x0100
+#define F_START_EDITTIMER_IN_MOUSEUP	0x0400
+#define F_MOVED_ENTRIES					0x0800
+#define F_ENTRYLISTPOS_VALID			0x1000
+#define F_CLEARING_SELECTION			0x2000
+#define F_ARRANGING						0x4000
 
 // alle Angaben in Pixel
 // Abstaende von Fensterraendern
-#define LROFFS_WINBORDER            4
-#define TBOFFS_WINBORDER            4
+#define LROFFS_WINBORDER			4
+#define TBOFFS_WINBORDER			4
 // fuer das Bounding-Rectangle
-#define LROFFS_BOUND                2
-#define TBOFFS_BOUND                2
+#define LROFFS_BOUND				2
+#define TBOFFS_BOUND				2
 // Abstand Fokusrechteck - Icon
-#define LROFFS_ICON                 2
-#define TBOFFS_ICON                 2
+#define LROFFS_ICON					2
+#define TBOFFS_ICON					2
 // Abstaende Icon - Text
-#define HOR_DIST_BMP_STRING         3
-#define VER_DIST_BMP_STRING         3
+#define HOR_DIST_BMP_STRING			3
+#define VER_DIST_BMP_STRING			3
 // Breitenoffset Highlight-Rect bei Text
-#define LROFFS_TEXT                 2
+#define LROFFS_TEXT					2
 
-#define DEFAULT_MAX_VIRT_WIDTH  200
-#define DEFAULT_MAX_VIRT_HEIGHT 200
+#define DEFAULT_MAX_VIRT_WIDTH	200
+#define DEFAULT_MAX_VIRT_HEIGHT	200
 
-#define VIEWMODE_MASK   (WB_ICON | WB_SMALLICON | WB_DETAILS)
+#define VIEWMODE_MASK	(WB_ICON | WB_SMALLICON | WB_DETAILS)
 
 ///////////////////////////////////////////////////////////////////////////////
 //
@@ -108,9 +108,9 @@ enum IcnViewFieldType
 //
 struct LocalFocus
 {
-    BOOL        bOn;
-    Rectangle   aRect;
-    Color       aPenColor;
+    BOOL		bOn;
+    Rectangle	aRect;
+    Color		aPenColor;
 
     LocalFocus() { bOn = FALSE; }
 };
@@ -125,9 +125,9 @@ private:
 
     using List::Replace;
 
-    SvxIconChoiceCtrl_Impl*         _pOwner;
+    SvxIconChoiceCtrl_Impl*			_pOwner;
 
-    void                    Removed_Impl( SvxIconChoiceCtrlEntry* pEntry );
+    void 					Removed_Impl( SvxIconChoiceCtrlEntry* pEntry );
 
 public:
                             EntryList_Impl(
@@ -141,10 +141,10 @@ public:
                                 USHORT _nReSize );
                             ~EntryList_Impl();
 
-    void                    Clear();
-    void                    Insert( SvxIconChoiceCtrlEntry* pEntry, ULONG nPos );
-    SvxIconChoiceCtrlEntry*         Remove( ULONG nPos );
-    void                    Remove( SvxIconChoiceCtrlEntry* pEntry );
+    void 					Clear();
+    void 					Insert( SvxIconChoiceCtrlEntry* pEntry, ULONG nPos );
+    SvxIconChoiceCtrlEntry*			Remove( ULONG nPos );
+    void					Remove( SvxIconChoiceCtrlEntry* pEntry );
 };
 
 
@@ -158,72 +158,72 @@ class SvxIconChoiceCtrl_Impl
     friend class EntryList_Impl;
     friend class IcnGridMap_Impl;
 
-    BOOL            bChooseWithCursor;
-    EntryList_Impl  aEntries;
-    ScrollBar       aVerSBar;
-    ScrollBar       aHorSBar;
-    ScrollBarBox    aScrBarBox;
-    Rectangle       aCurSelectionRect;
-    SvPtrarr        aSelectedRectList;
-    Timer           aEditTimer;                 // fuer Inplace-Editieren
-    Timer           aAutoArrangeTimer;
-    Timer           aDocRectChangedTimer;
-    Timer           aVisRectChangedTimer;
-    Timer           aCallSelectHdlTimer;
-    Size            aVirtOutputSize;
-    Size            aImageSize;
-    Size            aDefaultTextSize;
-    Size            aOutputSize; // Pixel
-    Point           aDDLastEntryPos;
-    Point           aDDLastRectPos;
-    Point           aDDPaintOffs;
-    Point           aDDStartPos;
-    SvtIconChoiceCtrl*      pView;
-    IcnCursor_Impl* pImpCursor;
+    BOOL			bChooseWithCursor;
+    EntryList_Impl	aEntries;
+    ScrollBar   	aVerSBar;
+    ScrollBar   	aHorSBar;
+    ScrollBarBox	aScrBarBox;
+    Rectangle		aCurSelectionRect;
+    SvPtrarr		aSelectedRectList;
+    Timer			aEditTimer;  				// fuer Inplace-Editieren
+    Timer			aAutoArrangeTimer;
+    Timer			aDocRectChangedTimer;
+    Timer			aVisRectChangedTimer;
+    Timer			aCallSelectHdlTimer;
+    Size			aVirtOutputSize;
+    Size			aImageSize;
+    Size			aDefaultTextSize;
+    Size			aOutputSize; // Pixel
+    Point			aDDLastEntryPos;
+    Point			aDDLastRectPos;
+    Point 			aDDPaintOffs;
+    Point			aDDStartPos;
+    SvtIconChoiceCtrl*		pView;
+    IcnCursor_Impl*	pImpCursor;
     IcnGridMap_Impl* pGridMap;
-    long            nMaxVirtWidth;  // max. Breite aVirtOutputSize bei ALIGN_TOP
-    long            nMaxVirtHeight; // max. Hoehe aVirtOutputSize bei ALIGN_LEFT
-    List*           pZOrderList;
-    SvPtrarr*       pColumns;
+    long			nMaxVirtWidth;	// max. Breite aVirtOutputSize bei ALIGN_TOP
+    long			nMaxVirtHeight; // max. Hoehe aVirtOutputSize bei ALIGN_LEFT
+    List*			pZOrderList;
+    SvPtrarr*		pColumns;
     IcnViewEdit_Impl* pEdit;
-    WinBits         nWinBits;
-    long            nMaxBoundHeight;            // Hoehe des hoechsten BoundRects
-    USHORT          nFlags;
-    USHORT          nCurTextDrawFlags;
-    ULONG           nUserEventAdjustScrBars;
-    ULONG           nUserEventShowCursor;
-    SvxIconChoiceCtrlEntry* pCurHighlightFrame;
-    BOOL            bHighlightFramePressed;
-    SvxIconChoiceCtrlEntry* pHead;                      // Eintrag oben links
+    WinBits			nWinBits;
+    long			nMaxBoundHeight; 			// Hoehe des hoechsten BoundRects
+    USHORT			nFlags;
+    USHORT			nCurTextDrawFlags;
+    ULONG			nUserEventAdjustScrBars;
+    ULONG			nUserEventShowCursor;
+    SvxIconChoiceCtrlEntry*	pCurHighlightFrame;
+    BOOL			bHighlightFramePressed;
+    SvxIconChoiceCtrlEntry*	pHead;						// Eintrag oben links
     SvxIconChoiceCtrlEntry* pCursor;
-    SvxIconChoiceCtrlEntry* pPrevDropTarget;
-    SvxIconChoiceCtrlEntry* pHdlEntry;
-    SvxIconChoiceCtrlEntry* pDDRefEntry;
-    VirtualDevice*  pDDDev;
-    VirtualDevice*  pDDBufDev;
+    SvxIconChoiceCtrlEntry*	pPrevDropTarget;
+    SvxIconChoiceCtrlEntry*	pHdlEntry;
+    SvxIconChoiceCtrlEntry*	pDDRefEntry;
+    VirtualDevice*	pDDDev;
+    VirtualDevice*	pDDBufDev;
     VirtualDevice*  pDDTempDev;
-    VirtualDevice*  pEntryPaintDev;
-    SvxIconChoiceCtrlEntry* pAnchor;                    // fuer Selektion
-    LocalFocus      aFocus;                             // Data for focusrect
+    VirtualDevice*	pEntryPaintDev;
+    SvxIconChoiceCtrlEntry* pAnchor;					// fuer Selektion
+    LocalFocus		aFocus;								// Data for focusrect
     ::svt::AccessibleFactoryAccess aAccFactory;
 
-    List*           pDraggedSelection;
-    SvxIconChoiceCtrlEntry* pCurEditedEntry;
+    List*			pDraggedSelection;
+    SvxIconChoiceCtrlEntry*	pCurEditedEntry;
     SvxIconChoiceCtrlTextMode eTextMode;
-    SelectionMode   eSelectionMode;
-    ULONG           nSelectionCount;
+    SelectionMode	eSelectionMode;
+    ULONG			nSelectionCount;
     SvxIconChoiceCtrlPositionMode ePositionMode;
-    BOOL            bBoundRectsDirty;
-    BOOL            bUpdateMode;
-    BOOL            bEntryEditingEnabled;
-    BOOL            bInDragDrop;
+    BOOL			bBoundRectsDirty;
+    BOOL			bUpdateMode;
+    BOOL			bEntryEditingEnabled;
+    BOOL			bInDragDrop;
 
-    void            ShowCursor( BOOL bShow );
+    void 			ShowCursor( BOOL bShow );
 
-    void            ImpArrange( BOOL bKeepPredecessors = FALSE );
-    void            AdjustVirtSize( const Rectangle& );
-    void            ResetVirtSize();
-    void            CheckScrollBars();
+    void			ImpArrange( BOOL bKeepPredecessors = FALSE );
+    void			AdjustVirtSize( const Rectangle& );
+    void			ResetVirtSize();
+    void			CheckScrollBars();
 
                     DECL_LINK( ScrollUpDownHdl, ScrollBar * );
                     DECL_LINK( ScrollLeftRightHdl, ScrollBar * );
@@ -235,67 +235,67 @@ class SvxIconChoiceCtrl_Impl
                     DECL_LINK( VisRectChangedHdl, void* );
                     DECL_LINK( CallSelectHdlHdl, void* );
 
-    void            AdjustScrollBars( BOOL bVirtSizeGrowedOnly = FALSE);
-    void            PositionScrollBars( long nRealWidth, long nRealHeight );
-    long            GetScrollBarPageSize( long nVisibleRange ) const { return ((nVisibleRange*75)/100); }
-    long            GetScrollBarLineSize() const { return nMaxBoundHeight / 2; }
-    BOOL            HandleScrollCommand( const CommandEvent& rCmd );
-    void            ToDocPos( Point& rPosPixel ) { rPosPixel -= pView->GetMapMode().GetOrigin(); }
-    void            InitScrollBarBox();
-    SvxIconChoiceCtrlEntry* FindNewCursor();
-    void            ToggleSelection( SvxIconChoiceCtrlEntry* );
-    void            DeselectAllBut( SvxIconChoiceCtrlEntry*, BOOL bPaintSync=FALSE );
-    void            Center( SvxIconChoiceCtrlEntry* pEntry ) const;
-    void            StopEditTimer() { aEditTimer.Stop(); }
-    void            StartEditTimer() { aEditTimer.Start(); }
-    void            ImpHideDDIcon();
-    void            CallSelectHandler( SvxIconChoiceCtrlEntry* );
-    void            SelectRect(
+    void			AdjustScrollBars( BOOL bVirtSizeGrowedOnly = FALSE);
+    void			PositionScrollBars( long nRealWidth, long nRealHeight );
+    long			GetScrollBarPageSize( long nVisibleRange ) const { return ((nVisibleRange*75)/100); }
+    long			GetScrollBarLineSize() const { return nMaxBoundHeight / 2; }
+    BOOL 			HandleScrollCommand( const CommandEvent& rCmd );
+    void			ToDocPos( Point& rPosPixel ) { rPosPixel -= pView->GetMapMode().GetOrigin(); }
+    void			InitScrollBarBox();
+    SvxIconChoiceCtrlEntry*	FindNewCursor();
+    void			ToggleSelection( SvxIconChoiceCtrlEntry* );
+    void			DeselectAllBut( SvxIconChoiceCtrlEntry*, BOOL bPaintSync=FALSE );
+    void			Center( SvxIconChoiceCtrlEntry* pEntry ) const;
+    void			StopEditTimer() { aEditTimer.Stop(); }
+    void			StartEditTimer() { aEditTimer.Start(); }
+    void 			ImpHideDDIcon();
+    void			CallSelectHandler( SvxIconChoiceCtrlEntry* );
+    void			SelectRect(
                         SvxIconChoiceCtrlEntry* pEntry1,
                         SvxIconChoiceCtrlEntry* pEntry2,
                         BOOL bAdd = TRUE,
                         SvPtrarr* pOtherRects = 0 );
 
-    void            SelectRange(
+    void			SelectRange(
                         SvxIconChoiceCtrlEntry* pStart,
                         SvxIconChoiceCtrlEntry* pEnd,
                         BOOL bAdd = TRUE );
 
-    void            AddSelectedRect( const Rectangle& );
-    void            AddSelectedRect(
+    void			AddSelectedRect( const Rectangle& );
+    void			AddSelectedRect(
                         SvxIconChoiceCtrlEntry* pEntry1,
                         SvxIconChoiceCtrlEntry* pEntry2 );
 
-    void            ClearSelectedRectList();
-    void            ClearColumnList();
-    Rectangle       CalcMaxTextRect( const SvxIconChoiceCtrlEntry* pEntry ) const;
+    void			ClearSelectedRectList();
+    void			ClearColumnList();
+    Rectangle		CalcMaxTextRect( const SvxIconChoiceCtrlEntry* pEntry ) const;
 
-    void            ClipAtVirtOutRect( Rectangle& rRect ) const;
-    void            AdjustAtGrid( const SvPtrarr& rRow, SvxIconChoiceCtrlEntry* pStart=0 );
-    Point           AdjustAtGrid(
+    void			ClipAtVirtOutRect( Rectangle& rRect ) const;
+    void 			AdjustAtGrid( const SvPtrarr& rRow, SvxIconChoiceCtrlEntry* pStart=0 );
+    Point			AdjustAtGrid(
                         const Rectangle& rCenterRect, // "Schwerpunkt" des Objekts (typ. Bmp-Rect)
                         const Rectangle& rBoundRect ) const;
-    ULONG           GetPredecessorGrid( const Point& rDocPos) const;
+    ULONG			GetPredecessorGrid( const Point& rDocPos) const;
 
-    void            InitPredecessors();
-    void            ClearPredecessors();
+    void			InitPredecessors();
+    void			ClearPredecessors();
 
-    BOOL            CheckVerScrollBar();
-    BOOL            CheckHorScrollBar();
-    void            CancelUserEvents();
-    void            EntrySelected( SvxIconChoiceCtrlEntry* pEntry, BOOL bSelect,
+    BOOL			CheckVerScrollBar();
+    BOOL			CheckHorScrollBar();
+    void 			CancelUserEvents();
+    void			EntrySelected( SvxIconChoiceCtrlEntry* pEntry, BOOL bSelect,
                         BOOL bSyncPaint );
-    void            SaveSelection( List** );
-    void            RepaintEntries( USHORT nEntryFlagsMask );
-    void            SetListPositions();
-    void            SetDefaultTextSize();
-    BOOL            IsAutoArrange() const {
+    void			SaveSelection( List** );
+    void			RepaintEntries( USHORT nEntryFlagsMask );
+    void			SetListPositions();
+    void			SetDefaultTextSize();
+    BOOL			IsAutoArrange() const {
                         return (BOOL)(ePositionMode == IcnViewPositionModeAutoArrange); }
-    BOOL            IsAutoAdjust() const {
+    BOOL			IsAutoAdjust() const {
                         return (BOOL)(ePositionMode == IcnViewPositionModeAutoAdjust); }
-    void            DocRectChanged() { aDocRectChangedTimer.Start(); }
-    void            VisRectChanged() { aVisRectChangedTimer.Start(); }
-    void            SetOrigin( const Point&, BOOL bDoNotUpdateWallpaper = FALSE );
+    void			DocRectChanged() { aDocRectChangedTimer.Start(); }
+    void			VisRectChanged() { aVisRectChangedTimer.Start(); }
+    void			SetOrigin( const Point&, BOOL bDoNotUpdateWallpaper = FALSE );
 
                     DECL_LINK( TextEditEndedHdl, IcnViewEdit_Impl* );
 
@@ -303,112 +303,112 @@ class SvxIconChoiceCtrl_Impl
     void HideFocus ();
     void DrawFocusRect ( OutputDevice* pOut );
 
-    BOOL            IsMnemonicChar( sal_Unicode cChar, ULONG& rPos ) const;
+    BOOL			IsMnemonicChar( sal_Unicode cChar, ULONG& rPos ) const;
 
 public:
 
-    long            nGridDX,
+    long			nGridDX,
                     nGridDY;
-    long            nHorSBarHeight,
+    long			nHorSBarHeight,
                     nVerSBarWidth;
 
                     SvxIconChoiceCtrl_Impl( SvtIconChoiceCtrl* pView, WinBits nWinStyle );
                     ~SvxIconChoiceCtrl_Impl();
 
-    BOOL            SetChoiceWithCursor ( BOOL bDo = TRUE ) { BOOL bOld=bChooseWithCursor; bChooseWithCursor = bDo; return bOld; }
-    void            Clear( BOOL bInCtor = FALSE );
-    void            SetStyle( WinBits nWinStyle );
-    WinBits         GetStyle() const { return nWinBits; }
-    void            InsertEntry( SvxIconChoiceCtrlEntry*, ULONG nPos, const Point* pPos=0 );
-    void            CreateAutoMnemonics( MnemonicGenerator* _pGenerator = NULL );
-    void            RemoveEntry( SvxIconChoiceCtrlEntry* pEntry );
-    void            FontModified();
-    void            SelectAll( BOOL bSelect = TRUE, BOOL bPaint = TRUE );
-    void            SelectEntry(
+    BOOL			SetChoiceWithCursor ( BOOL bDo = TRUE ) { BOOL bOld=bChooseWithCursor; bChooseWithCursor = bDo; return bOld; }
+    void 			Clear( BOOL bInCtor = FALSE );
+    void 			SetStyle( WinBits nWinStyle );
+    WinBits			GetStyle() const { return nWinBits; }
+    void 			InsertEntry( SvxIconChoiceCtrlEntry*, ULONG nPos, const Point* pPos=0 );
+    void			CreateAutoMnemonics( MnemonicGenerator* _pGenerator = NULL );
+    void 			RemoveEntry( SvxIconChoiceCtrlEntry* pEntry );
+    void 			FontModified();
+    void			SelectAll( BOOL bSelect = TRUE, BOOL bPaint = TRUE );
+    void 			SelectEntry(
                         SvxIconChoiceCtrlEntry*,
                         BOOL bSelect,
                         BOOL bCallHdl = TRUE,
                         BOOL bAddToSelection = FALSE,
                         BOOL bSyncPaint = FALSE );
-    void            Paint( const Rectangle& rRect );
-    BOOL            MouseButtonDown( const MouseEvent& );
-    BOOL            MouseButtonUp( const MouseEvent& );
-    BOOL            MouseMove( const MouseEvent&);
-    BOOL            RequestHelp( const HelpEvent& rHEvt );
-    void            SetCursor_Impl(
+    void 			Paint( const Rectangle& rRect );
+    BOOL 			MouseButtonDown( const MouseEvent& );
+    BOOL 			MouseButtonUp( const MouseEvent& );
+    BOOL 			MouseMove( const MouseEvent&);
+    BOOL 			RequestHelp( const HelpEvent& rHEvt );
+    void 			SetCursor_Impl(
                         SvxIconChoiceCtrlEntry* pOldCursor,
                         SvxIconChoiceCtrlEntry* pNewCursor,
                         BOOL bMod1,
                         BOOL bShift,
                         BOOL bPaintSync = FALSE);
-    BOOL            KeyInput( const KeyEvent& );
-    void            Resize();
-    void            GetFocus();
-    void            LoseFocus();
-    void            SetUpdateMode( BOOL bUpdate );
-    BOOL            GetUpdateMode() const { return bUpdateMode; }
-    void            PaintEntry( SvxIconChoiceCtrlEntry* pEntry, BOOL bIsBackgroundPainted=FALSE );
-    void            PaintEntry(
+    BOOL 			KeyInput( const KeyEvent& );
+    void 			Resize();
+    void 			GetFocus();
+    void 			LoseFocus();
+    void 			SetUpdateMode( BOOL bUpdate );
+    BOOL			GetUpdateMode() const { return bUpdateMode; }
+    void 			PaintEntry( SvxIconChoiceCtrlEntry* pEntry, BOOL bIsBackgroundPainted=FALSE );
+    void 			PaintEntry(
                         SvxIconChoiceCtrlEntry*,
                         const Point&,
                         OutputDevice* pOut = 0,
                         BOOL bIsBackgroundPainted = FALSE);
-    void            PaintEntryVirtOutDev( SvxIconChoiceCtrlEntry* );
+    void 			PaintEntryVirtOutDev( SvxIconChoiceCtrlEntry* );
 
-    void            SetEntryPos(
+    void 			SetEntryPos(
                         SvxIconChoiceCtrlEntry* pEntry,
                         const Point& rPos,
                         BOOL bAdjustRow = FALSE,
                         BOOL bCheckScrollBars = FALSE,
                         BOOL bKeepGridMap = FALSE );
 
-    void            InvalidateEntry( SvxIconChoiceCtrlEntry* );
-    IcnViewFieldType    GetItem( SvxIconChoiceCtrlEntry*, const Point& rAbsPos );
+    void 			InvalidateEntry( SvxIconChoiceCtrlEntry* );
+    IcnViewFieldType 	GetItem( SvxIconChoiceCtrlEntry*, const Point& rAbsPos );
 
-    void            SetNoSelection();
+    void 			SetNoSelection();
 
     SvxIconChoiceCtrlEntry* GetCurEntry() const { return pCursor; }
-    void            SetCursor(
+    void 			SetCursor(
                         SvxIconChoiceCtrlEntry*,
                         // TRUE == bei Single-Selection die Sel. mitfuehren
                         BOOL bSyncSingleSelection = TRUE,
                         BOOL bShowFocusAsync = FALSE );
 
     SvxIconChoiceCtrlEntry* GetEntry( const Point& rDocPos, BOOL bHit = FALSE );
-    SvxIconChoiceCtrlEntry* GetNextEntry( const Point& rDocPos, SvxIconChoiceCtrlEntry* pCurEntry );
-    SvxIconChoiceCtrlEntry* GetPrevEntry( const Point& rDocPos, SvxIconChoiceCtrlEntry* pCurEntry  );
+    SvxIconChoiceCtrlEntry*	GetNextEntry( const Point& rDocPos, SvxIconChoiceCtrlEntry* pCurEntry );
+    SvxIconChoiceCtrlEntry*	GetPrevEntry( const Point& rDocPos, SvxIconChoiceCtrlEntry* pCurEntry  );
 
-    Point           GetEntryPos( SvxIconChoiceCtrlEntry* );
-    void            MakeEntryVisible( SvxIconChoiceCtrlEntry* pEntry, BOOL bBound = TRUE );
+    Point 			GetEntryPos( SvxIconChoiceCtrlEntry* );
+    void 			MakeEntryVisible( SvxIconChoiceCtrlEntry* pEntry, BOOL bBound = TRUE );
 
-    void            Arrange(BOOL bKeepPredecessors = FALSE, long nSetMaxVirtWidth =0, long nSetMaxVirtHeight =0 );
+    void			Arrange(BOOL bKeepPredecessors = FALSE, long nSetMaxVirtWidth =0, long nSetMaxVirtHeight =0 );
 
-    Rectangle       CalcFocusRect( SvxIconChoiceCtrlEntry* );
-    Rectangle       CalcBmpRect( SvxIconChoiceCtrlEntry*, const Point* pPos = 0 );
-    Rectangle       CalcTextRect(
+    Rectangle		CalcFocusRect( SvxIconChoiceCtrlEntry* );
+    Rectangle		CalcBmpRect( SvxIconChoiceCtrlEntry*, const Point* pPos = 0 );
+    Rectangle		CalcTextRect(
                         SvxIconChoiceCtrlEntry*,
                         const Point* pPos = 0,
                         BOOL bForInplaceEdit = FALSE,
                         const String* pStr = 0 );
 
-    long            CalcBoundingWidth( SvxIconChoiceCtrlEntry* ) const;
-    long            CalcBoundingHeight( SvxIconChoiceCtrlEntry* ) const;
-    Size            CalcBoundingSize( SvxIconChoiceCtrlEntry* ) const;
-    void            FindBoundingRect( SvxIconChoiceCtrlEntry* pEntry );
-    void            SetBoundingRect_Impl(
+    long			CalcBoundingWidth( SvxIconChoiceCtrlEntry* ) const;
+    long			CalcBoundingHeight( SvxIconChoiceCtrlEntry* ) const;
+    Size			CalcBoundingSize( SvxIconChoiceCtrlEntry* ) const;
+    void			FindBoundingRect( SvxIconChoiceCtrlEntry* pEntry );
+    void 			SetBoundingRect_Impl(
                         SvxIconChoiceCtrlEntry* pEntry,
                         const Point& rPos,
                         const Size& rBoundingSize );
     // berechnet alle BoundRects neu
-    void            RecalcAllBoundingRects();
+    void			RecalcAllBoundingRects();
     // berechnet alle ungueltigen BoundRects neu
-    void            RecalcAllBoundingRectsSmart();
+    void			RecalcAllBoundingRectsSmart();
     const Rectangle&  GetEntryBoundRect( SvxIconChoiceCtrlEntry* );
-    void            InvalidateBoundingRect( SvxIconChoiceCtrlEntry* );
-    void            InvalidateBoundingRect( Rectangle& rRect ) { rRect.Right() = LONG_MAX; bBoundRectsDirty = TRUE; }
-    BOOL            IsBoundingRectValid( const Rectangle& rRect ) const { return (BOOL)( rRect.Right() != LONG_MAX ); }
+    void			InvalidateBoundingRect( SvxIconChoiceCtrlEntry* );
+    void			InvalidateBoundingRect( Rectangle& rRect ) { rRect.Right() = LONG_MAX; bBoundRectsDirty = TRUE; }
+    BOOL			IsBoundingRectValid( const Rectangle& rRect ) const { return (BOOL)( rRect.Right() != LONG_MAX ); }
 
-    void            PaintEmphasis(
+    void 			PaintEmphasis(
                         const Rectangle& rRect1,
                         const Rectangle& rRect2,
                         BOOL bSelected,
@@ -417,7 +417,7 @@ public:
                         OutputDevice* pOut,
                         BOOL bIsBackgroundPainted = FALSE);
 
-    void            PaintItem(
+    void 			PaintItem(
                         const Rectangle& rRect,
                         IcnViewFieldType eItem,
                         SvxIconChoiceCtrlEntry* pEntry,
@@ -427,116 +427,116 @@ public:
                         ::vcl::ControlLayoutData* _pLayoutData = NULL );
 
     // berechnet alle BoundingRects neu, wenn bMustRecalcBoundingRects == TRUE
-    void            CheckBoundingRects() { if (bBoundRectsDirty) RecalcAllBoundingRectsSmart(); }
+    void			CheckBoundingRects() { if (bBoundRectsDirty) RecalcAllBoundingRectsSmart(); }
     // berechnet alle invalidierten BoundingRects neu
-    void            UpdateBoundingRects();
-    void            ShowTargetEmphasis( SvxIconChoiceCtrlEntry* pEntry, BOOL bShow );
-    void            PrepareCommandEvent( const CommandEvent& );
-    void            Command( const CommandEvent& rCEvt );
-    void            ToTop( SvxIconChoiceCtrlEntry* );
-
-    ULONG           GetSelectionCount() const;
-    void            SetGrid( const Size& );
-    Size            GetMinGrid() const;
-    ULONG           GetGridCount(
+    void			UpdateBoundingRects();
+    void			ShowTargetEmphasis( SvxIconChoiceCtrlEntry* pEntry, BOOL bShow );
+    void			PrepareCommandEvent( const CommandEvent& );
+    void			Command( const CommandEvent& rCEvt );
+    void			ToTop( SvxIconChoiceCtrlEntry* );
+
+    ULONG			GetSelectionCount() const;
+    void			SetGrid( const Size& );
+    Size 			GetMinGrid() const;
+    ULONG			GetGridCount(
                         const Size& rSize,
                         BOOL bCheckScrBars,
                         BOOL bSmartScrBar ) const;
-    void            Scroll( long nDeltaX, long nDeltaY, BOOL bScrollBar = FALSE );
-    const Size&     GetItemSize( SvxIconChoiceCtrlEntry*, IcnViewFieldType ) const;
+    void			Scroll( long nDeltaX, long nDeltaY, BOOL bScrollBar = FALSE );
+    const Size&		GetItemSize( SvxIconChoiceCtrlEntry*, IcnViewFieldType ) const;
 
-    void            HideDDIcon();
-    void            ShowDDIcon( SvxIconChoiceCtrlEntry* pRefEntry, const Point& rPos );
-    void            HideShowDDIcon(
+    void 			HideDDIcon();
+    void 			ShowDDIcon( SvxIconChoiceCtrlEntry* pRefEntry, const Point& rPos );
+    void			HideShowDDIcon(
                         SvxIconChoiceCtrlEntry* pRefEntry,
                         const Point& rPos );
 
-    BOOL            IsOver(
+    BOOL			IsOver(
                         SvPtrarr* pSelectedRectList,
                         const Rectangle& rEntryBoundRect ) const;
 
-    void            SelectRect(
+    void			SelectRect(
                         const Rectangle&,
                         BOOL bAdd = TRUE,
                         SvPtrarr* pOtherRects = 0 );
 
-    void            CalcScrollOffsets(
+    void			CalcScrollOffsets(
                         const Point& rRefPosPixel,
                         long& rX,
                         long& rY,
                         BOOL bDragDrop = FALSE,
                         USHORT nBorderWidth = 10 );
 
-    BOOL            IsTextHit( SvxIconChoiceCtrlEntry* pEntry, const Point& rDocPos );
-    void            MakeVisible(
+    BOOL			IsTextHit( SvxIconChoiceCtrlEntry* pEntry, const Point& rDocPos );
+    void			MakeVisible(
                         const Rectangle& rDocPos,
                         BOOL bInScrollBarEvent=FALSE,
                         BOOL bCallRectChangedHdl = TRUE );
 
-    void            AdjustEntryAtGrid( SvxIconChoiceCtrlEntry* pStart = 0 );
-    void            SetEntryTextMode( SvxIconChoiceCtrlTextMode, SvxIconChoiceCtrlEntry* pEntry = 0 );
+    void			AdjustEntryAtGrid( SvxIconChoiceCtrlEntry* pStart = 0 );
+    void			SetEntryTextMode( SvxIconChoiceCtrlTextMode, SvxIconChoiceCtrlEntry* pEntry = 0 );
     SvxIconChoiceCtrlTextMode GetTextMode( const SvxIconChoiceCtrlEntry* pEntry = 0 ) const;
-    void            ShowEntryFocusRect( const SvxIconChoiceCtrlEntry* pEntry );
-    void            EnableEntryEditing( BOOL bEnable ) { bEntryEditingEnabled = bEnable; }
-    BOOL            IsEntryEditingEnabled() const { return bEntryEditingEnabled; }
-    BOOL            IsEntryEditing() const { return (BOOL)(pCurEditedEntry!=0); }
-    void            EditEntry( SvxIconChoiceCtrlEntry* pEntry );
-    void            StopEntryEditing( BOOL bCancel );
-    void            LockEntryPos( SvxIconChoiceCtrlEntry* pEntry, BOOL bLock );
-    ULONG           GetEntryCount() const { return aEntries.Count(); }
-    SvxIconChoiceCtrlEntry* GetEntry( ULONG nPos ) const { return (SvxIconChoiceCtrlEntry*)aEntries.GetObject(nPos); }
-    SvxIconChoiceCtrlEntry* GetFirstSelectedEntry( ULONG& ) const;
-    SvxIconChoiceCtrlEntry* GetNextSelectedEntry( ULONG& ) const;
+    void			ShowEntryFocusRect( const SvxIconChoiceCtrlEntry* pEntry );
+    void			EnableEntryEditing( BOOL bEnable ) { bEntryEditingEnabled = bEnable; }
+    BOOL			IsEntryEditingEnabled() const { return bEntryEditingEnabled; }
+    BOOL 			IsEntryEditing() const { return (BOOL)(pCurEditedEntry!=0); }
+    void			EditEntry( SvxIconChoiceCtrlEntry* pEntry );
+    void			StopEntryEditing( BOOL bCancel );
+    void			LockEntryPos( SvxIconChoiceCtrlEntry* pEntry, BOOL bLock );
+    ULONG			GetEntryCount() const { return aEntries.Count(); }
+    SvxIconChoiceCtrlEntry*	GetEntry( ULONG nPos ) const { return (SvxIconChoiceCtrlEntry*)aEntries.GetObject(nPos); }
+    SvxIconChoiceCtrlEntry*	GetFirstSelectedEntry( ULONG& ) const;
+    SvxIconChoiceCtrlEntry*	GetNextSelectedEntry( ULONG& ) const;
     SvxIconChoiceCtrlEntry* GetHdlEntry() const { return pHdlEntry; }
-    void            SetHdlEntry( SvxIconChoiceCtrlEntry* pEntry ) { pHdlEntry = pEntry; }
+    void 			SetHdlEntry( SvxIconChoiceCtrlEntry* pEntry ) { pHdlEntry = pEntry; }
 
     SvxIconChoiceCtrlTextMode GetEntryTextModeSmart( const SvxIconChoiceCtrlEntry* pEntry ) const;
-    void            SetSelectionMode( SelectionMode eMode ) { eSelectionMode=eMode; }
-    SelectionMode   GetSelectionMode() const { return eSelectionMode; }
-    BOOL            AreEntriesMoved() const { return (BOOL)((nFlags & F_MOVED_ENTRIES)!=0); }
-    void            SetEntriesMoved( BOOL bMoved )
+    void			SetSelectionMode( SelectionMode eMode ) { eSelectionMode=eMode; }
+    SelectionMode	GetSelectionMode() const { return eSelectionMode; }
+    BOOL			AreEntriesMoved() const { return (BOOL)((nFlags & F_MOVED_ENTRIES)!=0); }
+    void			SetEntriesMoved( BOOL bMoved )
                     {
                         if( bMoved ) nFlags |= F_MOVED_ENTRIES;
                         else nFlags &= ~(F_MOVED_ENTRIES);
                     }
-    ULONG           GetEntryListPos( SvxIconChoiceCtrlEntry* ) const;
-    void            SetEntryListPos( SvxIconChoiceCtrlEntry* pEntry, ULONG nNewPos );
-    void            SetEntryImageSize( const Size& rSize ) { aImageSize = rSize; }
-    void            SetEntryFlags( SvxIconChoiceCtrlEntry* pEntry, USHORT nFlags );
+    ULONG			GetEntryListPos( SvxIconChoiceCtrlEntry* ) const;
+    void 			SetEntryListPos( SvxIconChoiceCtrlEntry* pEntry, ULONG nNewPos );
+    void			SetEntryImageSize( const Size& rSize ) { aImageSize = rSize; }
+    void			SetEntryFlags( SvxIconChoiceCtrlEntry* pEntry, USHORT nFlags );
     SvxIconChoiceCtrlEntry* GoLeftRight( SvxIconChoiceCtrlEntry*, BOOL bRight );
     SvxIconChoiceCtrlEntry* GoUpDown( SvxIconChoiceCtrlEntry*, BOOL bDown );
-    void            InitSettings();
-    Rectangle       GetOutputRect() const;
+    void 			InitSettings();
+    Rectangle		GetOutputRect() const;
 
-    BOOL            ArePredecessorsSet() const { return (BOOL)(pHead != 0); }
+    BOOL			ArePredecessorsSet() const { return (BOOL)(pHead != 0); }
     SvxIconChoiceCtrlEntry* GetPredecessorHead() const { return pHead; }
-    void            SetEntryPredecessor(SvxIconChoiceCtrlEntry* pEntry,SvxIconChoiceCtrlEntry* pPredecessor);
-    BOOL            GetEntryPredecessor(SvxIconChoiceCtrlEntry* pEntry,SvxIconChoiceCtrlEntry** ppPredecessor);
+    void			SetEntryPredecessor(SvxIconChoiceCtrlEntry* pEntry,SvxIconChoiceCtrlEntry* pPredecessor);
+    BOOL			GetEntryPredecessor(SvxIconChoiceCtrlEntry* pEntry,SvxIconChoiceCtrlEntry** ppPredecessor);
     // liefert gueltige Ergebnisse nur im AutoArrange-Modus!
-    SvxIconChoiceCtrlEntry* FindEntryPredecessor( SvxIconChoiceCtrlEntry* pEntry, const Point& );
+    SvxIconChoiceCtrlEntry*	FindEntryPredecessor( SvxIconChoiceCtrlEntry* pEntry, const Point& );
 
-    void            SetPositionMode( SvxIconChoiceCtrlPositionMode );
+    void			SetPositionMode( SvxIconChoiceCtrlPositionMode );
     SvxIconChoiceCtrlPositionMode GetPositionMode() const { return ePositionMode;}
 
-    void            Flush();
-    void            SetColumn( USHORT nIndex, const SvxIconChoiceCtrlColumnInfo& );
+    void			Flush();
+    void			SetColumn( USHORT nIndex, const SvxIconChoiceCtrlColumnInfo& );
     const SvxIconChoiceCtrlColumnInfo* GetColumn( USHORT nIndex ) const;
     const SvxIconChoiceCtrlColumnInfo* GetItemColumn( USHORT nSubItem, long& rLeft ) const;
 
-    Rectangle       GetDocumentRect() const { return Rectangle( Point(), aVirtOutputSize ); }
-    Rectangle       GetVisibleRect() const { return GetOutputRect(); }
+    Rectangle 		GetDocumentRect() const { return Rectangle( Point(), aVirtOutputSize ); }
+    Rectangle		GetVisibleRect() const { return GetOutputRect(); }
 
-    void            SetEntryHighlightFrame( SvxIconChoiceCtrlEntry* pEntry,BOOL bKeepHighlightFlags=FALSE );
-    void            HideEntryHighlightFrame();
-    void            DrawHighlightFrame( OutputDevice* pOut,
+    void			SetEntryHighlightFrame( SvxIconChoiceCtrlEntry* pEntry,BOOL bKeepHighlightFlags=FALSE );
+    void			HideEntryHighlightFrame();
+    void 			DrawHighlightFrame( OutputDevice* pOut,
                         const Rectangle& rBmpRect, BOOL bHide );
-    void            StopSelectTimer() { aCallSelectHdlTimer.Stop(); }
-    void            Tracking( const TrackingEvent& rTEvt );
-    Point           GetPopupMenuPosPixel() const;
+    void			StopSelectTimer() { aCallSelectHdlTimer.Stop(); }
+    void 			Tracking( const TrackingEvent& rTEvt );
+    Point			GetPopupMenuPosPixel() const;
 
-    BOOL            HandleShortCutKey( const KeyEvent& rKeyEvent );
+    BOOL			HandleShortCutKey( const KeyEvent& rKeyEvent );
 
-    void            CallEventListeners( ULONG nEvent, void* pData = NULL );
+    void			CallEventListeners( ULONG nEvent, void* pData = NULL );
 
     inline ::svt::IAccessibleFactory&
         GetAccessibleFactory() { return aAccFactory.getFactory(); }
@@ -546,19 +546,19 @@ public:
 
 class IcnCursor_Impl
 {
-    SvxIconChoiceCtrl_Impl* pView;
-    SvPtrarr*       pColumns;
-    SvPtrarr*       pRows;
-    long            nCols;
-    long            nRows;
-    short           nDeltaWidth;
-    short           nDeltaHeight;
+    SvxIconChoiceCtrl_Impl*	pView;
+    SvPtrarr* 		pColumns;
+    SvPtrarr* 		pRows;
+    long			nCols;
+    long			nRows;
+    short 			nDeltaWidth;
+    short 			nDeltaHeight;
     SvxIconChoiceCtrlEntry* pCurEntry;
-    void            SetDeltas();
-    void            ImplCreate();
-    void            Create() {  if( !pColumns ) ImplCreate(); }
+    void 			SetDeltas();
+    void 			ImplCreate();
+    void 			Create() {	if( !pColumns )	ImplCreate(); }
 
-    USHORT          GetSortListPos( SvPtrarr* pList, long nValue, int bVertical);
+    USHORT 			GetSortListPos( SvPtrarr* pList, long nValue, int bVertical);
     SvxIconChoiceCtrlEntry* SearchCol(USHORT nCol,USHORT nTop,USHORT nBottom,USHORT nPref,
                         BOOL bDown, BOOL bSimple );
 
@@ -568,7 +568,7 @@ class IcnCursor_Impl
 public:
                     IcnCursor_Impl( SvxIconChoiceCtrl_Impl* pOwner );
                     ~IcnCursor_Impl();
-    void            Clear();
+    void 			Clear();
 
     // fuer Cursortravelling usw.
     SvxIconChoiceCtrlEntry* GoLeftRight( SvxIconChoiceCtrlEntry*, BOOL bRight );
@@ -579,53 +579,53 @@ public:
     // sortierte Liste der Eintraege, die in ihr stehen. Eine Liste kann
     // leer sein. Die Listen gehen in das Eigentum des Rufenden ueber und
     // muessen mit DestroyGridAdjustData geloescht werden
-    void            CreateGridAjustData( SvPtrarr& pLists, SvxIconChoiceCtrlEntry* pRow=0);
-    static void     DestroyGridAdjustData( SvPtrarr& rLists );
+    void			CreateGridAjustData( SvPtrarr& pLists, SvxIconChoiceCtrlEntry* pRow=0);
+    static void 	DestroyGridAdjustData( SvPtrarr& rLists );
 };
 
 // ----------------------------------------------------------------------------------------------
 
 typedef ULONG GridId;
 
-#define GRID_NOT_FOUND  ((GridId)ULONG_MAX)
+#define GRID_NOT_FOUND	((GridId)ULONG_MAX)
 
 class IcnGridMap_Impl
 {
-    Rectangle       _aLastOccupiedGrid;
-    SvxIconChoiceCtrl_Impl* _pView;
-    BOOL*           _pGridMap;
-    USHORT          _nGridCols, _nGridRows;
+    Rectangle		_aLastOccupiedGrid;
+    SvxIconChoiceCtrl_Impl*	_pView;
+    BOOL*			_pGridMap;
+    USHORT			_nGridCols, _nGridRows;
 
-    void            Expand();
-    void            Create_Impl();
-    void            Create() { if(!_pGridMap) Create_Impl(); }
+    void			Expand();
+    void			Create_Impl();
+    void			Create() { if(!_pGridMap) Create_Impl(); }
 
-    void            GetMinMapSize( USHORT& rDX, USHORT& rDY ) const;
+    void			GetMinMapSize( USHORT& rDX, USHORT& rDY ) const;
 
 public:
-                    IcnGridMap_Impl(SvxIconChoiceCtrl_Impl* pView);
+                    IcnGridMap_Impl(SvxIconChoiceCtrl_Impl*	pView);
                     ~IcnGridMap_Impl();
 
-    void            Clear();
+    void			Clear();
 
-    GridId          GetGrid( const Point& rDocPos, BOOL* pbClipped = 0 );
-    GridId          GetGrid( USHORT nGridX, USHORT nGridY );
-    GridId          GetUnoccupiedGrid( BOOL bOccupyFound=TRUE );
+    GridId	 		GetGrid( const Point& rDocPos, BOOL* pbClipped = 0 );
+    GridId			GetGrid( USHORT nGridX, USHORT nGridY );
+    GridId			GetUnoccupiedGrid( BOOL bOccupyFound=TRUE );
 
-    void            OccupyGrids( const Rectangle&, BOOL bOccupy = TRUE );
-    void            OccupyGrids( const SvxIconChoiceCtrlEntry*, BOOL bOccupy = TRUE );
-    void            OccupyGrid( GridId nId, BOOL bOccupy = TRUE )
+    void			OccupyGrids( const Rectangle&, BOOL bOccupy = TRUE );
+    void			OccupyGrids( const SvxIconChoiceCtrlEntry*, BOOL bOccupy = TRUE );
+    void			OccupyGrid( GridId nId, BOOL bOccupy = TRUE )
                     {
                         DBG_ASSERT(!_pGridMap || nId<(ULONG)(_nGridCols*_nGridRows),"OccupyGrid: Bad GridId");
                         if(_pGridMap && nId < (ULONG)(_nGridCols *_nGridRows) )
                             _pGridMap[ nId ] = bOccupy;
                     }
 
-    Rectangle       GetGridRect( GridId );
-    void            GetGridCoord( GridId, USHORT& rGridX, USHORT& rGridY );
-    static ULONG    GetGridCount( const Size& rSizePixel, USHORT nGridWidth, USHORT nGridHeight );
+    Rectangle		GetGridRect( GridId );
+    void			GetGridCoord( GridId, USHORT& rGridX, USHORT& rGridY );
+    static ULONG 	GetGridCount( const Size& rSizePixel, USHORT nGridWidth, USHORT nGridHeight );
 
-    void            OutputSizeChanged();
+    void			OutputSizeChanged();
 };
 
 
diff --git a/svtools/source/contnr/imivctl1.cxx b/svtools/source/contnr/imivctl1.cxx
index dd2ed992536e..1cf7fe8cf5fd 100644
--- a/svtools/source/contnr/imivctl1.cxx
+++ b/svtools/source/contnr/imivctl1.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
@@ -57,13 +57,13 @@
 
 #define DRAWTEXT_FLAGS_SMALLICON (TEXT_DRAW_LEFT|TEXT_DRAW_ENDELLIPSIS|TEXT_DRAW_CLIP)
 
-#define EVENTID_SHOW_CURSOR             ((void*)1)
-#define EVENTID_ADJUST_SCROLLBARS       ((void*)2)
+#define EVENTID_SHOW_CURSOR				((void*)1)
+#define EVENTID_ADJUST_SCROLLBARS		((void*)2)
 
 struct SvxIconChoiceCtrlEntry_Impl
 {
-    SvxIconChoiceCtrlEntry* _pEntry;
-    Point           _aPos;
+    SvxIconChoiceCtrlEntry*	_pEntry;
+    Point			_aPos;
                     SvxIconChoiceCtrlEntry_Impl( SvxIconChoiceCtrlEntry* pEntry, const Rectangle& rBoundRect )
                     : _pEntry( pEntry), _aPos( rBoundRect.TopLeft()) {}
 };
@@ -74,15 +74,15 @@ static BOOL bEndScrollInvalidate = TRUE;
 
 class IcnViewEdit_Impl : public MultiLineEdit
 {
-    Link            aCallBackHdl;
-    Accelerator     aAccReturn;
-    Accelerator     aAccEscape;
-    Timer           aTimer;
-    BOOL            bCanceled;
-    BOOL            bAlreadyInCallback;
-    BOOL            bGrabFocus;
+    Link 			aCallBackHdl;
+    Accelerator 	aAccReturn;
+    Accelerator 	aAccEscape;
+    Timer 			aTimer;
+    BOOL 			bCanceled;
+    BOOL 			bAlreadyInCallback;
+    BOOL			bGrabFocus;
 
-    void            CallCallBackHdl_Impl();
+    void 			CallCallBackHdl_Impl();
                     DECL_LINK( Timeout_Impl, Timer * );
                     DECL_LINK( ReturnHdl_Impl, Accelerator * );
                     DECL_LINK( EscapeHdl_Impl, Accelerator * );
@@ -97,11 +97,11 @@ public:
                         const Link& rNotifyEditEnd );
 
                     ~IcnViewEdit_Impl();
-    virtual void    KeyInput( const KeyEvent& rKEvt );
-    virtual long    PreNotify( NotifyEvent& rNEvt );
-    BOOL            EditingCanceled() const { return bCanceled; }
-    void            StopEditing( BOOL bCancel = FALSE );
-    BOOL            IsGrabFocus() const { return bGrabFocus; }
+    virtual void 	KeyInput( const KeyEvent& rKEvt );
+    virtual long 	PreNotify( NotifyEvent& rNEvt );
+    BOOL			EditingCanceled() const { return bCanceled; }
+    void			StopEditing( BOOL bCancel = FALSE );
+    BOOL			IsGrabFocus() const { return bGrabFocus; }
 };
 
 // ----------------------------------------------------------------------------------------------
@@ -309,7 +309,7 @@ void SvxIconChoiceCtrl_Impl::InsertEntry( SvxIconChoiceCtrlEntry* pEntry, ULONG
 
     pZOrderList->Insert( (void*)pEntry, LIST_APPEND ); //pZOrderList->Count() );
     pImpCursor->Clear();
-//  pGridMap->Clear();
+//	pGridMap->Clear();
     if( pPos )
     {
         Size aSize( CalcBoundingSize( pEntry ) );
@@ -330,7 +330,7 @@ void SvxIconChoiceCtrl_Impl::InsertEntry( SvxIconChoiceCtrlEntry* pEntry, ULONG
             Rectangle aOutputArea( GetOutputRect() );
             pGridMap->OccupyGrids( pEntry );
             if( !aOutputArea.IsOver( pEntry->aRect ) )
-                return; // ist nicht sichtbar
+                return;	// ist nicht sichtbar
             pView->Invalidate( pEntry->aRect );
         }
         else
@@ -361,8 +361,8 @@ void SvxIconChoiceCtrl_Impl::CreateAutoMnemonics( MnemonicGenerator* _pGenerator
     // exchange texts with generated mnemonics
     for( i = 0; i < nEntryCount; ++i )
     {
-        SvxIconChoiceCtrlEntry* pEntry = GetEntry( i );
-        String                  aTxt = pEntry->GetText();
+        SvxIconChoiceCtrlEntry*	pEntry = GetEntry( i );
+        String					aTxt = pEntry->GetText();
 
         if( _pGenerator->CreateMnemonic( aTxt ) )
             pEntry->SetText( aTxt );
@@ -1732,8 +1732,8 @@ void SvxIconChoiceCtrl_Impl::LoseFocus()
         pCursor->ClearFlags( ICNVIEW_FLAG_FOCUSED );
     ShowCursor( FALSE );
 
-//  HideFocus ();
-//  pView->Invalidate ( aFocus.aRect );
+//	HideFocus ();
+//	pView->Invalidate ( aFocus.aRect );
 
     RepaintEntries( ICNVIEW_FLAG_SELECTED );
 }
@@ -1835,8 +1835,8 @@ void SvxIconChoiceCtrl_Impl::PaintEmphasis(
     }
 // die Emphasis des Images muss von der abgeleiteten Klasse gezeichnet werden
 // (in der virtuellen Funktion DrawEntryImage)
-//  else
-//      pOut->DrawRect( rImageRect );
+//	else
+//		pOut->DrawRect( rImageRect );
 
     pOut->SetFillColor( aOldFillColor );
 }
@@ -1972,12 +1972,12 @@ void SvxIconChoiceCtrl_Impl::PaintEntry( SvxIconChoiceCtrlEntry* pEntry, const P
     Rectangle aTextRect( CalcTextRect(pEntry,&rPos,FALSE,&aEntryText));
     Rectangle aBmpRect( CalcBmpRect(pEntry, &rPos ) );
 
-    sal_Bool    bShowSelection =
-        (   (   ( bSelected && !bCursored )
-            ||  bDropTarget
+    sal_Bool	bShowSelection =
+        (	(	( bSelected && !bCursored )
+            ||	bDropTarget
             )
-        &&  !bNoEmphasis
-        &&  ( eSelectionMode != NO_SELECTION )
+        &&	!bNoEmphasis
+        &&	( eSelectionMode != NO_SELECTION )
         );
     sal_Bool bActiveSelection = ( 0 != ( nWinBits & WB_NOHIDESELECTION ) ) || pView->HasFocus();
 
@@ -2113,7 +2113,7 @@ void SvxIconChoiceCtrl_Impl::SetEntryPos( SvxIconChoiceCtrlEntry* pEntry, const
     }
     else
     {
-        SvxIconChoiceCtrlEntry* pPrev = FindEntryPredecessor( pEntry, rPos );
+        SvxIconChoiceCtrlEntry*	pPrev = FindEntryPredecessor( pEntry, rPos );
         SetEntryPredecessor( pEntry, pPrev );
         aAutoArrangeTimer.Start();
     }
@@ -2325,7 +2325,7 @@ Rectangle SvxIconChoiceCtrl_Impl::CalcTextRect( SvxIconChoiceCtrlEntry* pEntry,
 long SvxIconChoiceCtrl_Impl::CalcBoundingWidth( SvxIconChoiceCtrlEntry* pEntry ) const
 {
     long nStringWidth = GetItemSize( pEntry, IcnViewFieldTypeText ).Width();
-//  nStringWidth += 2*LROFFS_TEXT;
+//	nStringWidth += 2*LROFFS_TEXT;
     long nWidth = 0;
 
     switch( nWinBits & (VIEWMODE_MASK) )
@@ -2379,7 +2379,7 @@ Size SvxIconChoiceCtrl_Impl::CalcBoundingSize( SvxIconChoiceCtrlEntry* pEntry )
 
 void SvxIconChoiceCtrl_Impl::RecalcAllBoundingRects()
 {
-    nMaxBoundHeight = 0;
+    nMaxBoundHeight	= 0;
     pZOrderList->Clear();
     ULONG nCount = aEntries.Count();
     ULONG nCur;
@@ -2413,7 +2413,7 @@ void SvxIconChoiceCtrl_Impl::RecalcAllBoundingRects()
 
 void SvxIconChoiceCtrl_Impl::RecalcAllBoundingRectsSmart()
 {
-    nMaxBoundHeight = 0;
+    nMaxBoundHeight	= 0;
     pZOrderList->Clear();
     ULONG nCur;
     SvxIconChoiceCtrlEntry* pEntry;
@@ -2708,7 +2708,7 @@ void SvxIconChoiceCtrl_Impl::InvalidateBoundingRect( SvxIconChoiceCtrlEntry* pEn
 
 BOOL SvxIconChoiceCtrl_Impl::HandleScrollCommand( const CommandEvent& rCmd )
 {
-    Rectangle aDocRect( GetDocumentRect() );
+    Rectangle aDocRect(	GetDocumentRect() );
     Rectangle aVisRect( GetVisibleRect() );
     if( aVisRect.IsInside( aDocRect ))
         return FALSE;
@@ -2838,7 +2838,7 @@ void SvxIconChoiceCtrl_Impl::MakeVisible( const Rectangle& rRect, BOOL bScrBar,
     aOrigin *= -1;
     Rectangle aOutputArea( GetOutputRect() );
     if( aOutputArea.IsInside( aVirtRect ) )
-        return; // ist schon sichtbar
+        return;	// ist schon sichtbar
 
     long nDy;
     if( aVirtRect.Top() < aOutputArea.Top() )
@@ -2993,7 +2993,7 @@ Size SvxIconChoiceCtrl_Impl::GetMinGrid() const
 {
     Size aMinSize( aImageSize );
     aMinSize.Width() += 2 * LROFFS_BOUND;
-    aMinSize.Height() += TBOFFS_BOUND;  // PB: einmal Offset reicht (FileDlg)
+    aMinSize.Height() += TBOFFS_BOUND;	// PB: einmal Offset reicht (FileDlg)
     String aStrDummy( RTL_CONSTASCII_USTRINGPARAM( "XXX" ) );
     Size aTextSize( pView->GetTextWidth( aStrDummy ), pView->GetTextHeight() );
     if( nWinBits & WB_ICON )
@@ -3284,9 +3284,9 @@ void SvxIconChoiceCtrl_Impl::SelectRange(
                         BOOL bAdd )
 {
     ULONG nFront = GetEntryListPos( pStart );
-    ULONG nBack  = GetEntryListPos( pEnd );
+    ULONG nBack	 = GetEntryListPos( pEnd );
     ULONG nFirst = std::min( nFront, nBack );
-    ULONG nLast  = std::max( nFront, nBack );
+    ULONG nLast	 = std::max( nFront, nBack );
     ULONG i;
     SvxIconChoiceCtrlEntry* pEntry;
 
@@ -4322,7 +4322,7 @@ BOOL SvxIconChoiceCtrl_Impl::GetEntryPredecessor( SvxIconChoiceCtrlEntry* pEntry
     return TRUE;
 }
 
-SvxIconChoiceCtrlEntry* SvxIconChoiceCtrl_Impl::FindEntryPredecessor( SvxIconChoiceCtrlEntry* pEntry,
+SvxIconChoiceCtrlEntry*	SvxIconChoiceCtrl_Impl::FindEntryPredecessor( SvxIconChoiceCtrlEntry* pEntry,
     const Point& rPosTopLeft )
 {
     Point aPos( rPosTopLeft ); //TopLeft
@@ -4641,12 +4641,12 @@ BOOL SvxIconChoiceCtrl_Impl::HandleShortCutKey( const KeyEvent& rKEvt )
 {
     StopEditTimer();
 
-    BOOL        bRet = FALSE;
+    BOOL		bRet = FALSE;
 
     DBG_ASSERT( rKEvt.GetKeyCode().IsMod2(), "*SvxIconChoiceCtrl_Impl::HandleShortCutKey(): no <ALT> pressed!?" );
 
-    sal_Unicode cChar = rKEvt.GetCharCode();
-    ULONG       nPos = (ULONG)-1;
+    sal_Unicode	cChar = rKEvt.GetCharCode();
+    ULONG		nPos = (ULONG)-1;
 
     if( cChar && IsMnemonicChar( cChar, nPos ) )
     {
diff --git a/svtools/source/contnr/imivctl2.cxx b/svtools/source/contnr/imivctl2.cxx
index 7cb92e8cef07..26a35487db2b 100644
--- a/svtools/source/contnr/imivctl2.cxx
+++ b/svtools/source/contnr/imivctl2.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
@@ -31,14 +31,14 @@
 
 IcnCursor_Impl::IcnCursor_Impl( SvxIconChoiceCtrl_Impl* pOwner )
 {
-    pView       = pOwner;
-    pColumns    = 0;
-    pRows       = 0;
-    pCurEntry   = 0;
+    pView 		= pOwner;
+    pColumns	= 0;
+    pRows 		= 0;
+    pCurEntry 	= 0;
     nDeltaWidth = 0;
     nDeltaHeight= 0;
-    nCols       = 0;
-    nRows       = 0;
+    nCols		= 0;
+    nRows		= 0;
 }
 
 IcnCursor_Impl::~IcnCursor_Impl()
@@ -346,7 +346,7 @@ SvxIconChoiceCtrlEntry* IcnCursor_Impl::GoLeftRight( SvxIconChoiceCtrlEntry* pCt
 
 SvxIconChoiceCtrlEntry* IcnCursor_Impl::GoPageUpDown( SvxIconChoiceCtrlEntry* pStart, BOOL bDown)
 {
-    if( pView->IsAutoArrange() && !(pView->nWinBits & WB_ALIGN_TOP) )
+    if(	pView->IsAutoArrange() && !(pView->nWinBits & WB_ALIGN_TOP) )
     {
         const long nPos = (long)pView->GetEntryListPos( pStart );
         long nEntriesInView = (pView->aOutputSize.Height() / pView->nGridDY);
@@ -406,7 +406,7 @@ SvxIconChoiceCtrlEntry* IcnCursor_Impl::GoPageUpDown( SvxIconChoiceCtrlEntry* pS
 
 SvxIconChoiceCtrlEntry* IcnCursor_Impl::GoUpDown( SvxIconChoiceCtrlEntry* pCtrlEntry, BOOL bDown)
 {
-    if( pView->IsAutoArrange() && !(pView->nWinBits & WB_ALIGN_TOP) )
+    if(	pView->IsAutoArrange() && !(pView->nWinBits & WB_ALIGN_TOP) )
     {
         ULONG nPos = pView->GetEntryListPos( pCtrlEntry );
         if( bDown && nPos < (pView->aEntries.Count() - 1) )
diff --git a/svtools/source/contnr/ivctrl.cxx b/svtools/source/contnr/ivctrl.cxx
index dae3abbac966..945b20a92fd8 100644
--- a/svtools/source/contnr/ivctrl.cxx
+++ b/svtools/source/contnr/ivctrl.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
@@ -131,9 +131,9 @@ SvtIconChoiceCtrl::SvtIconChoiceCtrl( Window* pParent, WinBits nWinStyle ) :
      // WB_CLIPCHILDREN an, da ScrollBars auf dem Fenster liegen!
     Control( pParent, nWinStyle | WB_CLIPCHILDREN ),
 
-    _pCurKeyEvent   ( NULL ),
-    _pImp           ( new SvxIconChoiceCtrl_Impl( this, nWinStyle ) ),
-    _bAutoFontColor ( FALSE )
+    _pCurKeyEvent	( NULL ),
+    _pImp			( new SvxIconChoiceCtrl_Impl( this, nWinStyle ) ),
+    _bAutoFontColor	( FALSE )
 
 {
     SetLineColor();
@@ -146,9 +146,9 @@ SvtIconChoiceCtrl::SvtIconChoiceCtrl( Window* pParent, const ResId& rResId ) :
 
     Control( pParent, rResId ),
 
-    _pCurKeyEvent   ( NULL ),
-    _pImp           ( new SvxIconChoiceCtrl_Impl( this, WB_BORDER ) ),
-    _bAutoFontColor ( FALSE )
+    _pCurKeyEvent	( NULL ),
+    _pImp			( new SvxIconChoiceCtrl_Impl( this, WB_BORDER ) ),
+    _bAutoFontColor	( FALSE )
 
 {
     SetLineColor();
diff --git a/svtools/source/contnr/svcontnr.src b/svtools/source/contnr/svcontnr.src
index bcd1e060664f..aaf134383562 100644
--- a/svtools/source/contnr/svcontnr.src
+++ b/svtools/source/contnr/svcontnr.src
@@ -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
diff --git a/svtools/source/contnr/svicnvw.cxx b/svtools/source/contnr/svicnvw.cxx
index 20bcfe0fe33a..f43f29d4ee5c 100644
--- a/svtools/source/contnr/svicnvw.cxx
+++ b/svtools/source/contnr/svicnvw.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
@@ -36,7 +36,7 @@
 #ifndef GCC
 #endif
 
-#define ICNVW_BLOCK_ENTRYINS    0x0001
+#define ICNVW_BLOCK_ENTRYINS	0x0001
 
 SvIcnVwDataEntry::SvIcnVwDataEntry()
     : nIcnVwFlags(0),eTextMode(ShowTextDontKnow)
diff --git a/svtools/source/contnr/svimpbox.cxx b/svtools/source/contnr/svimpbox.cxx
index 484584828b9f..faa8efc7ded5 100644
--- a/svtools/source/contnr/svimpbox.cxx
+++ b/svtools/source/contnr/svimpbox.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
@@ -55,15 +55,15 @@
 #include <comphelper/processfactory.hxx>
 #endif
 
-#define NODE_BMP_TABDIST_NOTVALID   -2000000
-#define FIRST_ENTRY_TAB             1
+#define NODE_BMP_TABDIST_NOTVALID 	-2000000
+#define FIRST_ENTRY_TAB				1
 
 // #i27063# (pl), #i32300# (pb) never access VCL after DeInitVCL - also no destructors
-Image*  SvImpLBox::s_pDefCollapsed      = NULL;
-Image*  SvImpLBox::s_pDefExpanded       = NULL;
-Image*  SvImpLBox::s_pDefCollapsedHC    = NULL;
-Image*  SvImpLBox::s_pDefExpandedHC     = NULL;
-sal_Int32 SvImpLBox::s_nImageRefCount   = 0;
+Image*	SvImpLBox::s_pDefCollapsed		= NULL;
+Image*	SvImpLBox::s_pDefExpanded		= NULL;
+Image*	SvImpLBox::s_pDefCollapsedHC	= NULL;
+Image*	SvImpLBox::s_pDefExpandedHC		= NULL;
+sal_Int32 SvImpLBox::s_nImageRefCount	= 0;
 
 SvImpLBox::SvImpLBox( SvTreeListBox* pLBView, SvLBoxTreeList* pLBTree, WinBits nWinStyle) :
 
@@ -100,15 +100,15 @@ SvImpLBox::SvImpLBox( SvTreeListBox* pLBView, SvLBoxTreeList* pLBTree, WinBits n
     nHorSBarHeight = (short)aHorSBar.GetSizePixel().Height();
     nVerSBarWidth = (short)aVerSBar.GetSizePixel().Width();
 
-    pStartEntry = 0;
-    pCursor             = 0;
-    pAnchor             = 0;
-    nVisibleCount       = 0;    // Anzahl Daten-Zeilen im Control
+    pStartEntry	= 0;
+    pCursor 			= 0;
+    pAnchor				= 0;
+    nVisibleCount  		= 0; 	// Anzahl Daten-Zeilen im Control
     nNodeBmpTabDistance = NODE_BMP_TABDIST_NOTVALID;
-    nYoffsNodeBmp       = 0;
-    nNodeBmpWidth       = 0;
+    nYoffsNodeBmp 		= 0;
+    nNodeBmpWidth		= 0;
 
-    bAsyncBeginDrag     = FALSE;
+    bAsyncBeginDrag		= FALSE;
     aAsyncBeginDragTimer.SetTimeout( 0 );
     aAsyncBeginDragTimer.SetTimeoutHdl( LINK(this,SvImpLBox,BeginDragHdl));
     // Button-Animation in Listbox
@@ -269,7 +269,7 @@ void SvImpLBox::SetExtendedWindowBits( ExtendedWinBits _nBits )
 void SvImpLBox::Clear()
 {
     StopUserEvent();
-    pStartEntry = 0;
+    pStartEntry	= 0;
     pAnchor = 0;
 
     pActiveButton = 0;
@@ -1066,10 +1066,10 @@ void SvImpLBox::DrawNet()
     //for platforms who don't have nets, DrawNativeControl does nothing and return true
     //so that SvImpLBox::DrawNet() doesn't draw anything too
      if(pView->IsNativeControlSupported( CTRL_LISTNET, PART_ENTIRE_CONTROL)) {
-        ImplControlValue    aControlValue;
+        ImplControlValue	aControlValue;
         Point  aTemp(0,0);   // temporary needed for g++ 3.3.5
         Rectangle aCtrlRegion( aTemp, Size( 0, 0 ) );
-        ControlState        nState = CTRL_STATE_ENABLED;
+        ControlState		nState = CTRL_STATE_ENABLED;
         if( pView->DrawNativeControl( CTRL_LISTNET, PART_ENTIRE_CONTROL,
                                       aCtrlRegion, nState, aControlValue, rtl::OUString() ) )
         {
@@ -1427,7 +1427,7 @@ void SvImpLBox::FillView()
             if( bFound )
             {
                 aVerSBar.SetThumbPos( nThumb );
-                ShowCursor( TRUE ); // Focusrect neu berechnen
+                ShowCursor( TRUE );	// Focusrect neu berechnen
                 pView->Invalidate();
             }
         }
@@ -1749,7 +1749,7 @@ void SvImpLBox::RemovingEntry( SvLBoxEntry* pEntry )
     {
         if( bSimpleTravel )
             pView->Select( pCursor, FALSE );
-        ShowCursor( FALSE );    // Focus-Rect weg
+        ShowCursor( FALSE );	// Focus-Rect weg
         // NextSibling, weil auch Childs des Cursors geloescht werden
         pTemp = pView->NextSibling( pCursor );
         if( !pTemp )
@@ -1911,8 +1911,8 @@ void SvImpLBox::EntryInserted( SvLBoxEntry* pEntry )
             SelAllDestrAnch( FALSE, TRUE );
         else
             DestroyAnchor();
-        //  nFlags &= (~F_DESEL_ALL);
-//      ShowCursor( FALSE ); // falls sich Cursor nach unten verschiebt
+        //	nFlags &= (~F_DESEL_ALL);
+//		ShowCursor( FALSE ); // falls sich Cursor nach unten verschiebt
         long nY = GetEntryLine( pEntry );
         BOOL bEntryVisible = IsLineVisible( nY );
         if( bEntryVisible )
@@ -1977,7 +1977,7 @@ void SvImpLBox::EntryInserted( SvLBoxEntry* pEntry )
 // ****** Steuerung der Controlanimation
 
 BOOL SvImpLBox::ButtonDownCheckCtrl(const MouseEvent& rMEvt, SvLBoxEntry* pEntry,
-                                   long nY  )
+                                   long nY	)
 {
     SvLBoxItem* pItem = pView->GetItem(pEntry,rMEvt.GetPosPixel().X(),&pActiveTab);
     if( pItem && (pItem->IsA()==SV_ITEM_ID_LBOXBUTTON))
@@ -2251,7 +2251,7 @@ void SvImpLBox::MouseMove( const MouseEvent& rMEvt)
 BOOL SvImpLBox::KeyInput( const KeyEvent& rKEvt)
 {
     aEditTimer.Stop();
-    const KeyCode&  rKeyCode = rKEvt.GetKeyCode();
+    const KeyCode&	rKeyCode = rKEvt.GetKeyCode();
 
     if( rKeyCode.IsMod2() )
         return FALSE; // Alt-Taste nicht auswerten
@@ -2298,7 +2298,7 @@ BOOL SvImpLBox::KeyInput( const KeyEvent& rKEvt)
             if( pNewCursor )
             {
                 aSelEng.CursorPosChanging( bShift, bMod1 );
-                SetCursor( pNewCursor, bMod1 );     // no selection, when Ctrl is on
+                SetCursor( pNewCursor, bMod1 );		// no selection, when Ctrl is on
                 if( !IsEntryInView( pNewCursor ) )
                     KeyUp( FALSE );
             }
@@ -2329,13 +2329,13 @@ BOOL SvImpLBox::KeyInput( const KeyEvent& rKEvt)
             {
                 aSelEng.CursorPosChanging( bShift, bMod1 );
                 if( IsEntryInView( pNewCursor ) )
-                    SetCursor( pNewCursor, bMod1 ); // no selection, when Ctrl is on
+                    SetCursor( pNewCursor, bMod1 );	// no selection, when Ctrl is on
                 else
                 {
                     if( pCursor )
                         pView->Select( pCursor, FALSE );
                     KeyDown( FALSE );
-                    SetCursor( pNewCursor, bMod1 ); // no selection, when Ctrl is on
+                    SetCursor( pNewCursor, bMod1 );	// no selection, when Ctrl is on
                 }
             }
             else
@@ -2358,9 +2358,9 @@ BOOL SvImpLBox::KeyInput( const KeyEvent& rKEvt)
             }
             else if( pView->nWindowStyle & WB_HSCROLL )
             {
-                long    nThumb = aHorSBar.GetThumbPos();
+                long	nThumb = aHorSBar.GetThumbPos();
                 nThumb += aHorSBar.GetLineSize();
-                long    nOldThumb = aHorSBar.GetThumbPos();
+                long	nOldThumb = aHorSBar.GetThumbPos();
                 aHorSBar.SetThumbPos( nThumb );
                 nThumb = nOldThumb;
                 nThumb -= aHorSBar.GetThumbPos();
@@ -2389,9 +2389,9 @@ BOOL SvImpLBox::KeyInput( const KeyEvent& rKEvt)
             }
             else if ( pView->nWindowStyle & WB_HSCROLL )
             {
-                long    nThumb = aHorSBar.GetThumbPos();
+                long	nThumb = aHorSBar.GetThumbPos();
                 nThumb -= aHorSBar.GetLineSize();
-                long    nOldThumb = aHorSBar.GetThumbPos();
+                long	nOldThumb = aHorSBar.GetThumbPos();
                 aHorSBar.SetThumbPos( nThumb );
                 nThumb = nOldThumb;
                 nThumb -= aHorSBar.GetThumbPos();
@@ -2576,8 +2576,8 @@ BOOL SvImpLBox::KeyInput( const KeyEvent& rKEvt)
         case KEY_A:
             if( bMod1 )
                 SelAllDestrAnch( TRUE );
-//          else
-//              bKeyUsed = FALSE;   #105907# assume user wants to use quicksearch with key "a", so key is handled!
+//			else
+//				bKeyUsed = FALSE;	#105907# assume user wants to use quicksearch with key "a", so key is handled!
             break;
 
         case KEY_SUBTRACT:
@@ -2648,7 +2648,7 @@ BOOL SvImpLBox::KeyInput( const KeyEvent& rKEvt)
 
             if( pNewCursor && pNewCursor != pCursor )
             {
-//              SelAllDestrAnch( FALSE );
+//				SelAllDestrAnch( FALSE );
                 aSelEng.CursorPosChanging( bShift, bMod1 );
                 SetCursor( pNewCursor );
                 if( !IsEntryInView( pNewCursor ) )
@@ -2668,7 +2668,7 @@ BOOL SvImpLBox::KeyInput( const KeyEvent& rKEvt)
 
             if( pNewCursor && pNewCursor != pCursor)
             {
-//              SelAllDestrAnch( FALSE );
+//				SelAllDestrAnch( FALSE );
                 aSelEng.CursorPosChanging( bShift, bMod1 );
                 SetCursor( pNewCursor );
                 if( !IsEntryInView( pNewCursor ) )
@@ -2703,8 +2703,8 @@ void __EXPORT SvImpLBox::GetFocus()
         pView->SetEntryFocus( pCursor, TRUE );
         ShowCursor( TRUE );
 // auskommentiert wg. deselectall
-//      if( bSimpleTravel && !pView->IsSelected(pCursor) )
-//          pView->Select( pCursor, TRUE );
+//		if( bSimpleTravel && !pView->IsSelected(pCursor) )
+//			pView->Select( pCursor, TRUE );
     }
     if( nWinBits & WB_HIDESELECTION )
     {
@@ -2814,7 +2814,7 @@ BOOL __EXPORT ImpLBSelEng::SetCursorAtPoint(const Point& rPoint, BOOL bDontSelec
         // bei SimpleTravel wird in SetCursor selektiert und
         // der Select-Handler gerufen
         //if( !bDontSelectAtCursor && !pImp->bSimpleTravel )
-        //  pImp->SelectEntry( pNewCursor, TRUE );
+        //	pImp->SelectEntry( pNewCursor, TRUE );
         pImp->SetCursor( pNewCursor, bDontSelectAtCursor );
         return TRUE;
     }
@@ -3117,7 +3117,7 @@ void lcl_DeleteSubPopups(PopupMenu* pPopup)
 
 bool SvImpLBox::Command( const CommandEvent& rCEvt )
 {
-    USHORT              nCommand = rCEvt.GetCommand();
+    USHORT				nCommand = rCEvt.GetCommand();
 
     if( nCommand == COMMAND_CONTEXTMENU )
         aEditTimer.Stop();
@@ -3142,22 +3142,22 @@ bool SvImpLBox::Command( const CommandEvent& rCEvt )
 
     if( bContextMenuHandling && nCommand == COMMAND_CONTEXTMENU )
     {
-        Point   aPopupPos;
-        BOOL    bClickedIsFreePlace = FALSE;
+        Point	aPopupPos;
+        BOOL	bClickedIsFreePlace = FALSE;
         std::stack<SvLBoxEntry*> aSelRestore;
 
         if( rCEvt.IsMouseEvent() )
-        {   // change selection, if mouse pos doesn't fit to selection
+        {	// change selection, if mouse pos doesn't fit to selection
 
             aPopupPos = rCEvt.GetMousePosPixel();
 
-            SvLBoxEntry*    pClickedEntry = GetEntry( aPopupPos );
+            SvLBoxEntry*	pClickedEntry = GetEntry( aPopupPos );
             if( pClickedEntry )
-            {   // mouse in non empty area
-                BOOL                bClickedIsSelected = FALSE;
+            {	// mouse in non empty area
+                BOOL				bClickedIsSelected = FALSE;
 
                 // collect the currently selected entries
-                SvLBoxEntry*        pSelected = pView->FirstSelected();
+                SvLBoxEntry*		pSelected = pView->FirstSelected();
                 while( pSelected )
                 {
                     bClickedIsSelected |= ( pClickedEntry == pSelected );
@@ -3166,7 +3166,7 @@ bool SvImpLBox::Command( const CommandEvent& rCEvt )
 
                 // if the entry which the user clicked at is not selected
                 if( !bClickedIsSelected )
-                {   // deselect all other and select the clicked one
+                {	// deselect all other and select the clicked one
                     pView->SelectAll( FALSE );
                     pView->SetCursor( pClickedEntry );
                 }
@@ -3174,8 +3174,8 @@ bool SvImpLBox::Command( const CommandEvent& rCEvt )
             else if( aSelEng.GetSelectionMode() == SINGLE_SELECTION )
             {//modified by BerryJia for fixing Bug102739 2002-9-9 17:00(Beijing Time)
                 bClickedIsFreePlace = TRUE;
-                INT32               nSelectedEntries = pView->GetSelectionCount();
-                SvLBoxEntry*        pSelected = pView->FirstSelected();
+                INT32				nSelectedEntries = pView->GetSelectionCount();
+                SvLBoxEntry*		pSelected = pView->FirstSelected();
                 for(USHORT nSel = 0; nSel < nSelectedEntries; nSel++ )
                 {
                     aSelRestore.push(pSelected);
@@ -3184,17 +3184,17 @@ bool SvImpLBox::Command( const CommandEvent& rCEvt )
                 pView->SelectAll( FALSE );
             }
             else
-            {   // deselect all
+            {	// deselect all
                 pView->SelectAll( FALSE );
             }
         }
         else
-        {   // key event (or at least no mouse event)
-            INT32   nSelectionCount = pView->GetSelectionCount();
+        {	// key event (or at least no mouse event)
+            INT32	nSelectionCount = pView->GetSelectionCount();
 
             if( nSelectionCount )
-            {   // now allways take first visible as base for positioning the menu
-                SvLBoxEntry*    pSelected = pView->FirstSelected();
+            {	// now allways take first visible as base for positioning the menu
+                SvLBoxEntry*	pSelected = pView->FirstSelected();
                 while( pSelected )
                 {
                     if( IsEntryInView( pSelected ) )
@@ -3216,7 +3216,7 @@ bool SvImpLBox::Command( const CommandEvent& rCEvt )
                 aPopupPos = Point( 0, 0 );
         }
 
-        PopupMenu*  pPopup = pView->CreateContextMenu();
+        PopupMenu*	pPopup = pView->CreateContextMenu();
 
         if( pPopup )
         {
@@ -3313,8 +3313,8 @@ IMPL_LINK( SvImpLBox, EditTimerCall, Timer *, EMPTYARG )
         if ( bIsMouseTriggered )
         {
             Point aCurrentMousePos = pView->GetPointerPosPixel();
-            if  (   ( abs( aCurrentMousePos.X() - aEditClickPos.X() ) > 5 )
-                ||  ( abs( aCurrentMousePos.Y() - aEditClickPos.Y() ) > 5 )
+            if	(	( abs( aCurrentMousePos.X() - aEditClickPos.X() ) > 5 )
+                ||	( abs( aCurrentMousePos.Y() - aEditClickPos.Y() ) > 5 )
                 )
             {
                 return 0L;
@@ -3368,7 +3368,7 @@ BOOL SvImpLBox::RequestHelp( const HelpEvent& rHEvt )
             {
                 // rechten Item-Rand am View-Rand clippen
                 //if( aItemRect.Right() > aViewRect.Right() )
-                //  aItemRect.Right() = aViewRect.Right();
+                //	aItemRect.Right() = aViewRect.Right();
 
                 Point aPt = pView->OutputToScreenPixel( aItemRect.TopLeft() );
                 aItemRect.Left()   = aPt.X();
diff --git a/svtools/source/contnr/svimpicn.cxx b/svtools/source/contnr/svimpicn.cxx
index 2d4c9cf2df0e..ae33b3c30ef5 100644
--- a/svtools/source/contnr/svimpicn.cxx
+++ b/svtools/source/contnr/svimpicn.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
@@ -47,32 +47,32 @@
 
 
 
-#define VIEWMODE_ICON   0x0001  // Text unter Bitmap
-#define VIEWMODE_NAME   0x0002  // Text rechts neben Bitmap
-#define VIEWMODE_TEXT   0x0004  // Text ohne Bitmap
+#define VIEWMODE_ICON 	0x0001	// Text unter Bitmap
+#define VIEWMODE_NAME 	0x0002  // Text rechts neben Bitmap
+#define VIEWMODE_TEXT 	0x0004  // Text ohne Bitmap
 
 #define DD_SCROLL_PIXEL 10
 
 // alle Angaben in Pixel
 
-#define ICONVIEW_OFFS_BMP_STRING    3
+#define ICONVIEW_OFFS_BMP_STRING	3
 
 // fuer das Bounding-Rectangle
-#define LROFFS_BOUND                2
-#define TBOFFS_BOUND                2
+#define LROFFS_BOUND				2
+#define TBOFFS_BOUND				2
 
 // fuer das Focus-Rectangle um Icons
-#define LROFFS_ICON                 2
-#define TBOFFS_ICON                 2
+#define LROFFS_ICON					2
+#define TBOFFS_ICON					2
 
-#define NAMEVIEW_OFFS_BMP_STRING    3
+#define NAMEVIEW_OFFS_BMP_STRING	3
 
 // Abstaende von Fensterraendern
-#define LROFFS_WINBORDER            4
-#define TBOFFS_WINBORDER            4
+#define LROFFS_WINBORDER			4
+#define TBOFFS_WINBORDER			4
 
 // Breitenoffset Highlight-Rect bei Text
-#define LROFFS_TEXT                 2
+#define LROFFS_TEXT					2
 
 
 #define ICNVIEWDATA(xPtr) (SvIcnVwDataEntry*)(pView->GetViewDataEntry(xPtr))
@@ -646,62 +646,62 @@ void DrawText( OutputDevice* pDev, const Rectangle& rRect,
 
 class ImpIcnCursor
 {
-    SvImpIconView*  pView;
-    SvPtrarr*       pColumns;
-    SvPtrarr*       pRows;
-    BOOL*           pGridMap;
-    long            nGridDX, nGridDY;
-    long            nGridCols, nGridRows;
-    long            nCols;
-    long            nRows;
-    short           nDeltaWidth;
-    short           nDeltaHeight;
-    SvLBoxEntry*    pCurEntry;
-    void            SetDeltas();
-    void            ImplCreate();
-    void            Create() {  if( !pColumns ) ImplCreate(); }
-
-    USHORT          GetSortListPos( SvPtrarr* pList, long nValue, int bVertical);
-    SvLBoxEntry*    SearchCol(USHORT nCol,USHORT nTop,USHORT nBottom,USHORT nPref,
+    SvImpIconView*	pView;
+    SvPtrarr* 		pColumns;
+    SvPtrarr* 		pRows;
+    BOOL*			pGridMap;
+    long			nGridDX, nGridDY;
+    long			nGridCols, nGridRows;
+    long			nCols;
+    long			nRows;
+    short 			nDeltaWidth;
+    short 			nDeltaHeight;
+    SvLBoxEntry* 	pCurEntry;
+    void 			SetDeltas();
+    void 			ImplCreate();
+    void 			Create() {	if( !pColumns )	ImplCreate(); }
+
+    USHORT 			GetSortListPos( SvPtrarr* pList, long nValue, int bVertical);
+    SvLBoxEntry* 	SearchCol(USHORT nCol,USHORT nTop,USHORT nBottom,USHORT nPref,
                         BOOL bDown, BOOL bSimple );
-    SvLBoxEntry*    SearchRow(USHORT nRow,USHORT nRight,USHORT nLeft,USHORT nPref,
+    SvLBoxEntry* 	SearchRow(USHORT nRow,USHORT nRight,USHORT nLeft,USHORT nPref,
                         BOOL bRight, BOOL bSimple );
 
-    void            ExpandGrid();
-    void            CreateGridMap();
+    void			ExpandGrid();
+    void			CreateGridMap();
     // Rueckgabe FALSE: Eintrag liegt nicht in der GridMap. rGridx,y werden
     // dann an nGridCols, nGridRows geclippt
-    BOOL            GetGrid( const Point& rDocPos, USHORT& rGridX, USHORT& rGridY ) const;
-    void            SetGridUsed( USHORT nDX, USHORT nDY, BOOL bUsed )
+    BOOL	 		GetGrid( const Point& rDocPos, USHORT& rGridX, USHORT& rGridY ) const;
+    void			SetGridUsed( USHORT nDX, USHORT nDY, BOOL bUsed )
                     {
                         pGridMap[ (nDY * nGridCols) + nDX ] = bUsed;
                     }
-    BOOL            IsGridUsed( USHORT nDX, USHORT nDY )
+    BOOL			IsGridUsed( USHORT nDX, USHORT nDY )
                     {
                         return pGridMap[ (nDY * nGridCols) + nDX ];
                     }
 public:
                     ImpIcnCursor( SvImpIconView* pOwner );
                     ~ImpIcnCursor();
-    void            Clear( BOOL bGridToo = TRUE );
+    void 			Clear( BOOL bGridToo = TRUE );
 
     // fuer Cursortravelling usw.
-    SvLBoxEntry*    GoLeftRight( SvLBoxEntry*, BOOL bRight );
-    SvLBoxEntry*    GoUpDown( SvLBoxEntry*, BOOL bDown );
+    SvLBoxEntry* 	GoLeftRight( SvLBoxEntry*, BOOL bRight );
+    SvLBoxEntry* 	GoUpDown( SvLBoxEntry*, BOOL bDown );
 
     // Rueckgaebe: FALSE == Das leere Rect steht hinter dem letzten
     // Eintrag; d.h. beim naechsten Einfuegen ergibt sich das naechste
     // leere Rechteck durch Addition. Hinweis: Das Rechteck kann dann
     // ausserhalb des View-Space liegen
-    BOOL            FindEmptyGridRect( Rectangle& rRect );
+    BOOL			FindEmptyGridRect( Rectangle& rRect );
 
     // Erzeugt fuer jede Zeile (Hoehe=nGridDY) eine nach BoundRect.Left()
     // sortierte Liste der Eintraege, die in ihr stehen. Eine Liste kann
     // leer sein. Die Listen gehen in das Eigentum des Rufenden ueber und
     // muessen mit DestroyGridAdjustData geloescht werden
-    void            CreateGridAjustData( SvPtrarr& pLists, SvLBoxEntry* pRow=0);
-    static void     DestroyGridAdjustData( SvPtrarr& rLists );
-    void            SetGridUsed( const Rectangle&, BOOL bUsed = TRUE );
+    void			CreateGridAjustData( SvPtrarr& pLists, SvLBoxEntry* pRow=0);
+    static void 	DestroyGridAdjustData( SvPtrarr& rLists );
+    void			SetGridUsed( const Rectangle&, BOOL bUsed = TRUE );
 };
 
 
@@ -879,7 +879,7 @@ void SvImpIconView::EntryInserted( SvLBoxEntry* pEntry )
         StopEditTimer();
         DBG_ASSERT(pZOrderList->GetPos(pEntry)==0xffff,"EntryInserted:ZOrder?");
         pZOrderList->Insert( pEntry, pZOrderList->Count() );
-        if( nFlags & F_GRIDMODE )
+        if( nFlags & F_GRIDMODE	)
             pImpCursor->Clear( FALSE );
         else
             pImpCursor->Clear( TRUE );
@@ -1047,7 +1047,7 @@ void SvImpIconView::EntrySelected( SvLBoxEntry* pEntry, BOOL bSelect )
 void SvImpIconView::SetNextEntryPos(const Point& rPos)
 {
     aPrevBoundRect.SetPos( rPos );
-    aPrevBoundRect.Right() = LONG_MAX;  // dont know
+    aPrevBoundRect.Right() = LONG_MAX;	// dont know
 }
 
 Point SvImpIconView::FindNextEntryPos( const Size& rBoundSize )
@@ -2095,8 +2095,8 @@ void SvImpIconView::PaintEntry( SvLBoxEntry* pEntry, const Point& rPos,
 
     SvLBoxString* pStringItem = (SvLBoxString*)(pEntry->GetFirstItem(SV_ITEM_ID_LBOXSTRING));
 
-    BOOL bSelected  = pViewData->IsSelected();
-    BOOL bCursored  = pViewData->IsCursored();
+    BOOL bSelected	= pViewData->IsSelected();
+    BOOL bCursored	= pViewData->IsCursored();
 
     Font aTempFont( pOut->GetFont() );
     // waehrend D&D nicht die Fontfarbe wechseln, da sonst auch die
@@ -2419,7 +2419,7 @@ Rectangle SvImpIconView::CalcTextRect( SvLBoxEntry* pEntry,
 
     Rectangle aRect( aPos, aTextSize );
 // KNALLT BEIM D&D, WENN GECLIPPT WIRD (In DrawText von Thomas)
-//  ClipAtVirtOutRect( aRect );
+//	ClipAtVirtOutRect( aRect );
     return aRect;
 }
 
@@ -2500,7 +2500,7 @@ Size SvImpIconView::CalcBoundingSize( SvLBoxEntry* pEntry,
 
 void SvImpIconView::RecalcAllBoundingRects()
 {
-    nMaxBoundHeight = 0;
+    nMaxBoundHeight	= 0;
     pZOrderList->Remove(0, pZOrderList->Count() );
     SvLBoxEntry* pEntry = pModel->FirstChild( pCurParent );
     while( pEntry )
@@ -2515,7 +2515,7 @@ void SvImpIconView::RecalcAllBoundingRects()
 
 void SvImpIconView::RecalcAllBoundingRectsSmart()
 {
-    nMaxBoundHeight = 0;
+    nMaxBoundHeight	= 0;
     pZOrderList->Remove(0, pZOrderList->Count() );
     SvLBoxEntry* pEntry = pModel->FirstChild( pCurParent );
     while( pEntry )
@@ -2920,7 +2920,7 @@ void SvImpIconView::MakeVisible( const Rectangle& rRect, BOOL bScrBar )
 
     Rectangle aOutputArea( aOrigin, aOutputSize );
     if( aOutputArea.IsInside( aRect ) )
-        return; // ist schon sichtbar
+        return;	// ist schon sichtbar
 
     long nDy;
     if( aRect.Top() < aOutputArea.Top() )
@@ -3042,22 +3042,22 @@ void SvImpIconView::DeselectAllBut( SvLBoxEntry* pThisEntryNot )
     }
 }
 
-#define ICN_ROWS    50
-#define ICN_COLS    30
+#define ICN_ROWS	50
+#define ICN_COLS	30
 
 ImpIcnCursor::ImpIcnCursor( SvImpIconView* pOwner )
 {
-    pView       = pOwner;
-    pColumns    = 0;
-    pRows       = 0;
-    pCurEntry   = 0;
+    pView 		= pOwner;
+    pColumns	= 0;
+    pRows 		= 0;
+    pCurEntry 	= 0;
     nDeltaWidth = 0;
     nDeltaHeight= 0;
-    nCols       = 0;
-    nRows       = 0;
-    nGridCols   = 0;
-    nGridRows   = 0;
-    pGridMap    = 0;
+    nCols		= 0;
+    nRows		= 0;
+    nGridCols	= 0;
+    nGridRows	= 0;
+    pGridMap	= 0;
 }
 
 ImpIcnCursor::~ImpIcnCursor()
@@ -3590,7 +3590,7 @@ BOOL ImpIcnCursor::FindEmptyGridRect( Rectangle& rRect )
 
             //XXX
             //if( nRow + 5 > nGridRows )
-            //  ExpandGrid();
+            //	ExpandGrid();
             DBG_ASSERT(pGridMap[nCur],"SetGridUsed failed");
             return TRUE;
         }
diff --git a/svtools/source/contnr/svlbitm.cxx b/svtools/source/contnr/svlbitm.cxx
index edb0a65cb39f..a2634c9b7048 100644
--- a/svtools/source/contnr/svlbitm.cxx
+++ b/svtools/source/contnr/svlbitm.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
@@ -43,9 +43,9 @@
 
 struct SvLBoxButtonData_Impl
 {
-    SvLBoxEntry*    pEntry;
-    BOOL            bDefaultImages;
-    BOOL            bShowRadioButton;
+    SvLBoxEntry*	pEntry;
+    BOOL			bDefaultImages;
+    BOOL			bShowRadioButton;
 
     SvLBoxButtonData_Impl() : pEntry( NULL ), bDefaultImages( FALSE ), bShowRadioButton( FALSE ) {}
 };
@@ -178,21 +178,21 @@ void SvLBoxButtonData::SetDefaultImages( const Control* pCtrl )
 
     if ( pImpl->bShowRadioButton )
     {
-        aBmps[ SV_BMP_UNCHECKED ]   = RadioButton::GetRadioImage( rSettings, BUTTON_DRAW_DEFAULT );
-        aBmps[ SV_BMP_CHECKED ]     = RadioButton::GetRadioImage( rSettings, BUTTON_DRAW_CHECKED );
-        aBmps[ SV_BMP_HICHECKED ]   = RadioButton::GetRadioImage( rSettings, BUTTON_DRAW_CHECKED | BUTTON_DRAW_PRESSED );
-        aBmps[ SV_BMP_HIUNCHECKED ] = RadioButton::GetRadioImage( rSettings, BUTTON_DRAW_DEFAULT | BUTTON_DRAW_PRESSED );
-        aBmps[ SV_BMP_TRISTATE ]    = RadioButton::GetRadioImage( rSettings, BUTTON_DRAW_DONTKNOW );
-        aBmps[ SV_BMP_HITRISTATE ]  = RadioButton::GetRadioImage( rSettings, BUTTON_DRAW_DONTKNOW | BUTTON_DRAW_PRESSED );
+        aBmps[ SV_BMP_UNCHECKED ]	= RadioButton::GetRadioImage( rSettings, BUTTON_DRAW_DEFAULT );
+        aBmps[ SV_BMP_CHECKED ]		= RadioButton::GetRadioImage( rSettings, BUTTON_DRAW_CHECKED );
+        aBmps[ SV_BMP_HICHECKED ]	= RadioButton::GetRadioImage( rSettings, BUTTON_DRAW_CHECKED | BUTTON_DRAW_PRESSED );
+        aBmps[ SV_BMP_HIUNCHECKED ]	= RadioButton::GetRadioImage( rSettings, BUTTON_DRAW_DEFAULT | BUTTON_DRAW_PRESSED );
+        aBmps[ SV_BMP_TRISTATE ]	= RadioButton::GetRadioImage( rSettings, BUTTON_DRAW_DONTKNOW );
+        aBmps[ SV_BMP_HITRISTATE ]	= RadioButton::GetRadioImage( rSettings, BUTTON_DRAW_DONTKNOW | BUTTON_DRAW_PRESSED );
     }
     else
     {
-        aBmps[ SV_BMP_UNCHECKED ]   = CheckBox::GetCheckImage( rSettings, BUTTON_DRAW_DEFAULT );
-        aBmps[ SV_BMP_CHECKED ]     = CheckBox::GetCheckImage( rSettings, BUTTON_DRAW_CHECKED );
-        aBmps[ SV_BMP_HICHECKED ]   = CheckBox::GetCheckImage( rSettings, BUTTON_DRAW_CHECKED | BUTTON_DRAW_PRESSED );
-        aBmps[ SV_BMP_HIUNCHECKED ] = CheckBox::GetCheckImage( rSettings, BUTTON_DRAW_DEFAULT | BUTTON_DRAW_PRESSED );
-        aBmps[ SV_BMP_TRISTATE ]    = CheckBox::GetCheckImage( rSettings, BUTTON_DRAW_DONTKNOW );
-        aBmps[ SV_BMP_HITRISTATE ]  = CheckBox::GetCheckImage( rSettings, BUTTON_DRAW_DONTKNOW | BUTTON_DRAW_PRESSED );
+        aBmps[ SV_BMP_UNCHECKED ]	= CheckBox::GetCheckImage( rSettings, BUTTON_DRAW_DEFAULT );
+        aBmps[ SV_BMP_CHECKED ]		= CheckBox::GetCheckImage( rSettings, BUTTON_DRAW_CHECKED );
+        aBmps[ SV_BMP_HICHECKED ]	= CheckBox::GetCheckImage( rSettings, BUTTON_DRAW_CHECKED | BUTTON_DRAW_PRESSED );
+        aBmps[ SV_BMP_HIUNCHECKED ]	= CheckBox::GetCheckImage( rSettings, BUTTON_DRAW_DEFAULT | BUTTON_DRAW_PRESSED );
+        aBmps[ SV_BMP_TRISTATE ]	= CheckBox::GetCheckImage( rSettings, BUTTON_DRAW_DONTKNOW );
+        aBmps[ SV_BMP_HITRISTATE ]	= CheckBox::GetCheckImage( rSettings, BUTTON_DRAW_DONTKNOW | BUTTON_DRAW_PRESSED );
     }
 }
 
@@ -202,7 +202,7 @@ BOOL SvLBoxButtonData::HasDefaultImages( void ) const
 }
 
 BOOL SvLBoxButtonData::IsRadio() {
-    return pImpl->bShowRadioButton;
+    return pImpl->bShowRadioButton; 
 }
 
 // ***************************************************************
@@ -247,7 +247,7 @@ void SvLBoxString::Paint( const Point& rPos, SvLBox& rDev, USHORT /* nFlags */,
     }
     else
         rDev.DrawText( rPos, aStr);
-
+    
 }
 
 SvLBoxItem* SvLBoxString::Create() const
@@ -413,7 +413,7 @@ void SvLBoxButton::Paint( const Point& rPos, SvLBox& rDev, USHORT /* nFlags */,
         ? SV_BMP_STATICIMAGE : pData->GetIndex( nItemFlags );
     USHORT nStyle = eKind != SvLBoxButtonKind_disabledCheckbox &&
         rDev.IsEnabled() ? 0 : IMAGE_DRAW_DISABLE;
-
+        
 ///
 //Native drawing
 ///
@@ -421,16 +421,16 @@ void SvLBoxButton::Paint( const Point& rPos, SvLBox& rDev, USHORT /* nFlags */,
     Window *pWin = NULL;
     if( rDev.GetOutDevType() == OUTDEV_WINDOW )
         pWin = (Window*) &rDev;
-
+        
     if ( nIndex != SV_BMP_STATICIMAGE && pWin && pWin->IsNativeControlSupported( (pData->IsRadio())? CTRL_RADIOBUTTON : CTRL_CHECKBOX, PART_ENTIRE_CONTROL) )
     {
         ImplControlValue    aControlValue;
         Rectangle           aCtrlRegion( rPos, Size(pData->Width(), pData->Height()) );
         ControlState        nState = 0;
-
+        
         //states CTRL_STATE_DEFAULT, CTRL_STATE_PRESSED and CTRL_STATE_ROLLOVER are not implemented
-        if ( IsStateHilighted() )                   nState |= CTRL_STATE_FOCUSED;
-        if ( nStyle != IMAGE_DRAW_DISABLE )         nState |= CTRL_STATE_ENABLED;
+        if ( IsStateHilighted() ) 					nState |= CTRL_STATE_FOCUSED;
+        if ( nStyle != IMAGE_DRAW_DISABLE )			nState |= CTRL_STATE_ENABLED;
 
         if ( IsStateChecked() )
             aControlValue.setTristateVal( BUTTONVALUE_ON );
@@ -443,7 +443,7 @@ void SvLBoxButton::Paint( const Point& rPos, SvLBox& rDev, USHORT /* nFlags */,
                                              aCtrlRegion, nState, aControlValue, rtl::OUString() );
     }
 
-    if( !bNativeOK)
+    if( !bNativeOK) 
         rDev.DrawImage( rPos, pData->aBmps[nIndex + nBaseOffs] ,nStyle);
 }
 
@@ -481,13 +481,13 @@ bool SvLBoxButton::CheckModification() const
 
 struct SvLBoxContextBmp_Impl
 {
-    Image       m_aImage1;
-    Image       m_aImage2;
+    Image		m_aImage1;
+    Image		m_aImage2;
 
-    Image       m_aImage1_hc;
-    Image       m_aImage2_hc;
+    Image		m_aImage1_hc;
+    Image		m_aImage2_hc;
 
-    USHORT      m_nB2IndicatorFlags;
+    USHORT		m_nB2IndicatorFlags;
 };
 
 // ***************************************************************
@@ -586,7 +586,7 @@ void SvLBoxContextBmp::Paint( const Point& _rPos, SvLBox& _rDev,
     // determine the image set
     BmpColorMode eMode( BMP_COLOR_NORMAL );
     if ( !!m_pImpl->m_aImage1_hc )
-    {   // we really have HC images
+    {	// we really have HC images
         if ( _rDev.GetSettings().GetStyleSettings().GetHighContrastMode() )
             eMode = BMP_COLOR_HIGHCONTRAST;
     }
diff --git a/svtools/source/contnr/svlbox.cxx b/svtools/source/contnr/svlbox.cxx
index a69253c69629..423d8c3cf454 100644
--- a/svtools/source/contnr/svlbox.cxx
+++ b/svtools/source/contnr/svlbox.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
@@ -66,19 +66,19 @@ DBG_NAME(SvInplaceEdit2)
 
 SvInplaceEdit::SvInplaceEdit
 (
-    Window*             pParent,
-    const Point&        rPos,
-    const Size&         rSize,
-    const String&       rData,
-    const Link&         rNotifyEditEnd,
-    const Selection&    rSelection
+    Window*				pParent,
+    const Point&		rPos,
+    const Size&			rSize,
+    const String&		rData,
+    const Link&			rNotifyEditEnd,
+    const Selection&	rSelection
 ) :
 
     Edit( pParent, WB_LEFT ),
 
-    aCallBackHdl        ( rNotifyEditEnd ),
-    bCanceled           ( FALSE ),
-    bAlreadyInCallBack  ( FALSE )
+    aCallBackHdl		( rNotifyEditEnd ),
+    bCanceled			( FALSE ),
+    bAlreadyInCallBack	( FALSE )
 
 {
     DBG_CTOR(SvInplaceEdit,0);
@@ -271,10 +271,10 @@ SvInplaceEdit2::SvInplaceEdit2
     BOOL bMulti
 ) :
 
-     aCallBackHdl       ( rNotifyEditEnd ),
-    bCanceled           ( FALSE ),
-    bAlreadyInCallBack  ( FALSE ),
-    bMultiLine          ( bMulti )
+     aCallBackHdl		( rNotifyEditEnd ),
+    bCanceled			( FALSE ),
+    bAlreadyInCallBack	( FALSE ),
+    bMultiLine			( bMulti )
 
 {
     DBG_CTOR(SvInplaceEdit2,0);
@@ -536,7 +536,7 @@ SvLBoxItem::~SvLBoxItem()
 const Size& SvLBoxItem::GetSize( SvLBox* pView,SvLBoxEntry* pEntry )
 {
     DBG_CHKTHIS(SvLBoxItem,0);
-    SvViewDataItem* pViewData = pView->GetViewDataItem( pEntry, this );
+    SvViewDataItem*	pViewData = pView->GetViewDataItem( pEntry, this );
     return pViewData->aSize;
 }
 
@@ -694,7 +694,7 @@ SvLBox_Impl::SvLBox_Impl( SvLBox& _rBox )
 
 DBG_NAME(SvLBox);
 
-SvLBox::SvLBox( Window* pParent, WinBits nWinStyle  ) :
+SvLBox::SvLBox( Window* pParent, WinBits nWinStyle	) :
     Control( pParent, nWinStyle | WB_CLIPCHILDREN ),
     DropTargetHelper( this ), DragSourceHelper( this ), eSelMode( NO_SELECTION )
 {
@@ -778,7 +778,7 @@ void SvLBox::DisconnectFromModel()
 {
     DBG_CHKTHIS(SvLBox,0);
     SvLBoxTreeList* pNewModel = new SvLBoxTreeList;
-    pNewModel->SetRefCount( 0 );    // else this will never be deleted
+    pNewModel->SetRefCount( 0 );	// else this will never be deleted
     SvListView::SetModel( pNewModel );
 }
 
@@ -921,18 +921,18 @@ void SvLBox::NotifyRemoving( SvLBoxEntry* )
 */
 #ifdef DBG_UTIL
 BOOL SvLBox::NotifyMoving(
-    SvLBoxEntry*  pTarget,       // D&D-Drop-Position in this->GetModel()
-    SvLBoxEntry*  pEntry,        // Zu verschiebender Entry aus
+    SvLBoxEntry*  pTarget,		 // D&D-Drop-Position in this->GetModel()
+    SvLBoxEntry*  pEntry,		 // Zu verschiebender Entry aus
                                  // GetSourceListBox()->GetModel()
     SvLBoxEntry*& rpNewParent,   // Neuer Target-Parent
-    ULONG&        rNewChildPos)  // Position in Childlist des Target-Parents
+    ULONG&		  rNewChildPos)  // Position in Childlist des Target-Parents
 #else
 BOOL SvLBox::NotifyMoving(
-    SvLBoxEntry*  pTarget,       // D&D-Drop-Position in this->GetModel()
-    SvLBoxEntry*,                // Zu verschiebender Entry aus
+    SvLBoxEntry*  pTarget,		 // D&D-Drop-Position in this->GetModel()
+    SvLBoxEntry*,        		 // Zu verschiebender Entry aus
                                  // GetSourceListBox()->GetModel()
     SvLBoxEntry*& rpNewParent,   // Neuer Target-Parent
-    ULONG&        rNewChildPos)  // Position in Childlist des Target-Parents
+    ULONG&		  rNewChildPos)  // Position in Childlist des Target-Parents
 #endif
 {
     DBG_CHKTHIS(SvLBox,0);
@@ -964,11 +964,11 @@ BOOL SvLBox::NotifyMoving(
 }
 
 BOOL SvLBox::NotifyCopying(
-    SvLBoxEntry*  pTarget,       // D&D-Drop-Position in this->GetModel()
-    SvLBoxEntry*  pEntry,        // Zu kopierender Entry aus
+    SvLBoxEntry*  pTarget,		 // D&D-Drop-Position in this->GetModel()
+    SvLBoxEntry*  pEntry,		 // Zu kopierender Entry aus
                                  // GetSourceListBox()->GetModel()
     SvLBoxEntry*& rpNewParent,   // Neuer Target-Parent
-    ULONG&        rNewChildPos)  // Position in Childlist des Target-Parents
+    ULONG&		  rNewChildPos)  // Position in Childlist des Target-Parents
 {
     DBG_CHKTHIS(SvLBox,0);
     return NotifyMoving(pTarget,pEntry,rpNewParent,rNewChildPos);
@@ -1605,7 +1605,7 @@ void SvLBox::ModelHasEntryInvalidated( SvListEntry* pEntry )
     USHORT nCount = ((SvLBoxEntry*)pEntry)->ItemCount();
     for( USHORT nIdx = 0; nIdx < nCount; nIdx++ )
     {
-        SvLBoxItem* pItem = ((SvLBoxEntry*)pEntry)->GetItem( nIdx );
+        SvLBoxItem*	pItem = ((SvLBoxEntry*)pEntry)->GetItem( nIdx );
         pItem->InitViewData( this, (SvLBoxEntry*)pEntry, 0 );
     }
 }
diff --git a/svtools/source/contnr/svtabbx.cxx b/svtools/source/contnr/svtabbx.cxx
index 53fbded59f11..a63d218840b2 100644
--- a/svtools/source/contnr/svtabbx.cxx
+++ b/svtools/source/contnr/svtabbx.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
@@ -117,7 +117,7 @@ SvTabListBox::SvTabListBox( Window* pParent, WinBits nBits )
     pTabList = 0;
     nTabCount = 0;
     pViewParent = 0;
-    SetHighlightRange();    // ueber volle Breite selektieren
+    SetHighlightRange();	// ueber volle Breite selektieren
 }
 
 SvTabListBox::SvTabListBox( Window* pParent, const ResId& rResId )
@@ -233,7 +233,7 @@ SvLBoxEntry* SvTabListBox::InsertEntryToColumn(const XubString& rStr,SvLBoxEntry
 }
 
 SvLBoxEntry* SvTabListBox::InsertEntryToColumn( const XubString& rStr,
-    const Image& rExpandedEntryBmp, const Image& rCollapsedEntryBmp,
+    const Image& rExpandedEntryBmp,	const Image& rCollapsedEntryBmp,
     SvLBoxEntry* pParent,ULONG nPos,USHORT nCol, void* pUser )
 {
     XubString aStr;
@@ -583,9 +583,9 @@ SvHeaderTabListBox::SvHeaderTabListBox( Window* pParent, WinBits nWinStyle ) :
 
     SvTabListBox( pParent, nWinStyle ),
 
-    m_bFirstPaint   ( TRUE ),
+    m_bFirstPaint	( TRUE ),
     m_pImpl         ( new ::svt::SvHeaderTabListBoxImpl ),
-    m_pAccessible   ( NULL )
+    m_pAccessible	( NULL )
 {
 }
 
@@ -595,9 +595,9 @@ SvHeaderTabListBox::SvHeaderTabListBox( Window* pParent, const ResId& rResId ) :
 
     SvTabListBox( pParent, rResId ),
 
-    m_bFirstPaint   ( TRUE ),
+    m_bFirstPaint	( TRUE ),
     m_pImpl         ( new ::svt::SvHeaderTabListBoxImpl ),
-    m_pAccessible   ( NULL )
+    m_pAccessible	( NULL )
 {
 }
 
@@ -1021,7 +1021,7 @@ Reference< XAccessible > SvHeaderTabListBox::CreateAccessibleColumnHeader( sal_u
     if ( m_aAccessibleChildren.empty() )
     {
         const sal_uInt16 nColumnCount = GetColumnCount();
-        sal_Int32 nCount = AreChildrenTransient() ?
+        sal_Int32 nCount = AreChildrenTransient() ? 
                 nColumnCount : ( GetRowCount() + 1 ) * nColumnCount;
         m_aAccessibleChildren.assign( nCount, Reference< XAccessible >() );
     }
diff --git a/svtools/source/contnr/svtreebx.cxx b/svtools/source/contnr/svtreebx.cxx
index b11a3f12ddf3..ff88a202d97e 100644
--- a/svtools/source/contnr/svtreebx.cxx
+++ b/svtools/source/contnr/svtreebx.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
@@ -57,7 +57,7 @@ using namespace ::com::sun::star::accessibility;
       beruecksichtigt
 */
 
-#define TREEFLAG_FIXEDHEIGHT        0x0010
+#define TREEFLAG_FIXEDHEIGHT		0x0010
 
 
 DBG_NAME(SvTreeListBox)
@@ -217,7 +217,7 @@ void SvTreeListBox::Resize()
                            SV_LBOXTAB_ADJUST_CENTER |  \
                            SV_LBOXTAB_PUSHABLE)
 
-#define TAB_STARTPOS    2
+#define TAB_STARTPOS	2
 
 // bei Aenderungen GetTextOffset beruecksichtigen
 void SvTreeListBox::SetTabs()
@@ -845,8 +845,8 @@ void SvTreeListBox::ModelHasCleared()
     AdjustEntryHeight( GetDefaultCollapsedEntryBmp() );
 
     SvLBox::ModelHasCleared();
-//  if( IsUpdateMode() )
-//      Invalidate();
+//	if( IsUpdateMode() )
+//		Invalidate();
 }
 
 void SvTreeListBox::ShowTargetEmphasis( SvLBoxEntry* pEntry, BOOL /* bShow  */ )
@@ -1034,7 +1034,7 @@ BOOL SvTreeListBox::Collapse( SvLBoxEntry* pParent )
     pHdlEntry = pParent;
     BOOL bCollapsed = FALSE;
 
-    if( ExpandingHdl() )
+    if(	ExpandingHdl() )
     {
         bCollapsed = TRUE;
         pImp->CollapsingEntry( pParent );
@@ -1097,8 +1097,8 @@ void SvTreeListBox::SelectAll( BOOL bSelect, BOOL )
     DBG_CHKTHIS(SvTreeListBox,0);
     pImp->SelAllDestrAnch(
         bSelect,
-        TRUE,       // Anker loeschen,
-        TRUE );     // auch bei SINGLE_SELECTION den Cursor deselektieren
+        TRUE,		// Anker loeschen,
+        TRUE );		// auch bei SINGLE_SELECTION den Cursor deselektieren
 }
 
 void SvTreeListBox::ModelHasInsertedTree( SvListEntry* pEntry )
@@ -1530,7 +1530,7 @@ void SvTreeListBox::InvalidateEntry( SvLBoxEntry* pEntry )
     if( pEntry )
     {
         GetModel()->InvalidateEntry( pEntry );
-    //  pImp->InvalidateEntry( pEntry );
+    //	pImp->InvalidateEntry( pEntry );
     }
 }
 
@@ -1813,11 +1813,11 @@ long SvTreeListBox::PaintEntry1(SvLBoxEntry* pEntry,long nLine,USHORT nTabFlags,
                 BOOL bNativeOK = FALSE;
                 if ( IsNativeControlSupported( CTRL_LISTNODE, PART_ENTIRE_CONTROL) )
                 {
-                    ImplControlValue    aControlValue;
+                    ImplControlValue	aControlValue;
                     Rectangle           aCtrlRegion( aPos,  pImg->GetSizePixel() );
-                    ControlState        nState = 0;
+                    ControlState		nState = 0;
 
-                    if ( IsEnabled() )  nState |= CTRL_STATE_ENABLED;
+                    if ( IsEnabled() )	nState |= CTRL_STATE_ENABLED;
 
                     if ( IsExpanded(pEntry) )
                         aControlValue.setTristateVal( BUTTONVALUE_ON );//expanded node
@@ -2507,8 +2507,8 @@ void SvTreeListBox::DataChanged( const DataChangedEvent& rDCEvt )
 {
     if( (rDCEvt.GetType()==DATACHANGED_SETTINGS) && (rDCEvt.GetFlags() & SETTINGS_STYLE) )
     {
-        nEntryHeight = 0;   // _together_ with TRUE of 1. par (bFont) of InitSettings() a zero-height
-                            //  forces complete recalc of heights!
+        nEntryHeight = 0;	// _together_ with TRUE of 1. par (bFont) of InitSettings() a zero-height
+                            //	forces complete recalc of heights!
         InitSettings( TRUE, TRUE, TRUE );
         Invalidate();
     }
@@ -2516,6 +2516,11 @@ void SvTreeListBox::DataChanged( const DataChangedEvent& rDCEvt )
         Control::DataChanged( rDCEvt );
 }
 
+void SvTreeListBox::StateChanged( StateChangedType i_nStateChange )
+{
+    SvLBox::StateChanged( i_nStateChange );
+}
+
 void SvTreeListBox::InitSettings(BOOL bFont,BOOL bForeground,BOOL bBackground)
 {
     const StyleSettings& rStyleSettings = GetSettings().GetStyleSettings();
diff --git a/svtools/source/contnr/templwin.cxx b/svtools/source/contnr/templwin.cxx
index 61112f6669ca..c4e4c3639c4b 100644
--- a/svtools/source/contnr/templwin.cxx
+++ b/svtools/source/contnr/templwin.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
@@ -107,28 +107,28 @@ using namespace svtools;
 
 extern ::rtl::OUString CreateExactSizeText_Impl( sal_Int64 nSize ); // fileview.cxx
 
-#define SPLITSET_ID         0
-#define COLSET_ID           1
-#define ICONWIN_ID          2
-#define FILEWIN_ID          3
-#define FRAMEWIN_ID         4
+#define SPLITSET_ID			0
+#define COLSET_ID			1
+#define ICONWIN_ID			2
+#define FILEWIN_ID			3
+#define FRAMEWIN_ID			4
 
-#define ICON_POS_NEWDOC     0
-#define ICON_POS_TEMPLATES  1
-#define ICON_POS_MYDOCS     2
-#define ICON_POS_SAMPLES    3
+#define ICON_POS_NEWDOC		0
+#define ICON_POS_TEMPLATES	1
+#define ICON_POS_MYDOCS		2
+#define ICON_POS_SAMPLES	3
 
-#define ASCII_STR(s)                    ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(s) )
-#define VIEWSETTING_NEWFROMTEMPLATE     ASCII_STR("NewFromTemplate")
-#define VIEWSETTING_SELECTEDGROUP       ASCII_STR("SelectedGroup")
-#define VIEWSETTING_SELECTEDVIEW        ASCII_STR("SelectedView")
-#define VIEWSETTING_SPLITRATIO          ASCII_STR("SplitRatio")
-#define VIEWSETTING_LASTFOLDER          ASCII_STR("LastFolder")
+#define ASCII_STR(s)					::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(s) )
+#define VIEWSETTING_NEWFROMTEMPLATE		ASCII_STR("NewFromTemplate")
+#define VIEWSETTING_SELECTEDGROUP		ASCII_STR("SelectedGroup")
+#define VIEWSETTING_SELECTEDVIEW		ASCII_STR("SelectedView")
+#define VIEWSETTING_SPLITRATIO			ASCII_STR("SplitRatio")
+#define VIEWSETTING_LASTFOLDER			ASCII_STR("LastFolder")
 
 struct FolderHistory
 {
-    String      m_sURL;
-    ULONG       m_nGroup;
+    String		m_sURL;
+    ULONG		m_nGroup;
 
     FolderHistory( const String& _rURL, sal_Int32 _nGroup ) :
         m_sURL( _rURL ), m_nGroup( _nGroup ) {}
@@ -311,7 +311,7 @@ void SvtDummyHeaderBar_Impl::UpdateBackgroundColor()
 
 SvtDummyHeaderBar_Impl::SvtDummyHeaderBar_Impl( Window* pPar ) : Window( pPar )
 {
-    SetSizePixel( HeaderBar( this, 0 ).CalcWindowSizePixel() ); // HeaderBar used only to calculate size
+    SetSizePixel( HeaderBar( this, 0 ).CalcWindowSizePixel() );	// HeaderBar used only to calculate size
 
     UpdateBackgroundColor();
 }
@@ -370,7 +370,7 @@ SvtIconWindow_Impl::SvtIconWindow_Impl( Window* pParent ) :
     Image aImage( SvtResId( bHiContrast ? IMG_SVT_NEWDOC_HC : IMG_SVT_NEWDOC ) );
     nMaxTextLength = aImage.GetSizePixel().Width();
     String aEntryStr = String( SvtResId( STR_SVT_NEWDOC ) );
-    SvxIconChoiceCtrlEntry* pEntry =
+    SvxIconChoiceCtrlEntry*	pEntry =
         aIconCtrl.InsertEntry( aEntryStr, aImage, ICON_POS_NEWDOC );
     pEntry->SetUserData( new String( aNewDocumentRootURL ) );
     pEntry->SetQuickHelpText( String( SvtResId( STR_SVT_NEWDOC_HELP ) ) );
@@ -427,7 +427,7 @@ SvtIconWindow_Impl::~SvtIconWindow_Impl()
     }
 }
 
-SvxIconChoiceCtrlEntry* SvtIconWindow_Impl::GetEntry( const String& rURL ) const
+SvxIconChoiceCtrlEntry*	SvtIconWindow_Impl::GetEntry( const String& rURL ) const
 {
     SvxIconChoiceCtrlEntry* pEntry = NULL;
     for ( ULONG i = 0; i < aIconCtrl.GetEntryCount(); ++i )
@@ -517,7 +517,7 @@ ULONG SvtIconWindow_Impl::GetSelectEntryPos() const
 
 void SvtIconWindow_Impl::SetCursorPos( ULONG nPos )
 {
-    SvxIconChoiceCtrlEntry* pEntry = aIconCtrl.GetEntry( nPos );
+    SvxIconChoiceCtrlEntry*	pEntry = aIconCtrl.GetEntry( nPos );
     aIconCtrl.SetCursor( pEntry );
     aIconCtrl.Invalidate();
     aIconCtrl.Update();
@@ -545,7 +545,7 @@ long SvtIconWindow_Impl::CalcHeight() const
 
 sal_Bool SvtIconWindow_Impl::IsRootURL( const String& rURL ) const
 {
-    return  rURL == aNewDocumentRootURL ||
+    return	rURL == aNewDocumentRootURL ||
             rURL == aTemplateRootURL ||
             rURL == aMyDocumentsRootURL ||
             rURL == aSamplesFolderRootURL;
@@ -603,9 +603,9 @@ SvtFileViewWindow_Impl::SvtFileViewWindow_Impl( SvtTemplateWindow* pParent ) :
 
     Window( pParent, WB_DIALOGCONTROL | WB_TABSTOP | WB_BORDER | WB_3DLOOK ),
 
-    rParent             ( *pParent ),
-    aFileView           ( this, SvtResId( CTRL_FILEVIEW ), FILEVIEW_SHOW_TITLE ),
-    bIsTemplateFolder   ( sal_False )
+    rParent				( *pParent ),
+    aFileView			( this, SvtResId( CTRL_FILEVIEW ), FILEVIEW_SHOW_TITLE ),
+    bIsTemplateFolder	( sal_False )
 
 {
     aFileView.SetStyle( aFileView.GetStyle() | WB_DIALOGCONTROL | WB_TABSTOP );
@@ -708,8 +708,8 @@ void SvtFileViewWindow_Impl::Resize()
 {
     Size aWinSize = GetOutputSizePixel();
 
-    static int  x = 0;
-    static int  y = 0;
+    static int	x = 0;
+    static int	y = 0;
 
     aWinSize.nA += x;
     aWinSize.nB += y;
@@ -978,13 +978,13 @@ void SvtFrameWindow_Impl::OpenFile( const String& rURL, sal_Bool bPreview, sal_B
                     pTextWin->EnableInput( FALSE, TRUE );
                     if ( pTextWin->IsReallyVisible() )
                     {
-                        sal_Bool    b = sal_True;
+                        sal_Bool	b = sal_True;
                         Sequence < PropertyValue > aArgs( 4 );
                         aArgs[0].Name = ASCII_STR("Preview");
                         aArgs[0].Value.setValue( &b, ::getBooleanCppuType() );
                         aArgs[1].Name = ASCII_STR("ReadOnly");
                         aArgs[1].Value.setValue( &b, ::getBooleanCppuType() );
-                        aArgs[2].Name = ASCII_STR("AsTemplate");    // prevents getting an empty URL with getURL()!
+                        aArgs[2].Name = ASCII_STR("AsTemplate");	// prevents getting an empty URL with getURL()!
 
                         uno::Reference < task::XInteractionHandler > xInteractionHandler( ::comphelper::getProcessServiceFactory()->createInstance(
                             ::rtl::OUString::createFromAscii("com.sun.star.task.InteractionHandler") ), uno::UNO_QUERY );
@@ -995,11 +995,11 @@ void SvtFrameWindow_Impl::OpenFile( const String& rURL, sal_Bool bPreview, sal_B
                         aArgs[2].Value.setValue( &b, ::getBooleanCppuType() );
                         xDisp->dispatch( aURL, aArgs );
 
-                        ::rtl::OUString                                         aDispURL;
-                        Reference< ::com::sun::star::frame::XController >       xCtrl = xFrame->getController();
+                        ::rtl::OUString											aDispURL;
+                        Reference< ::com::sun::star::frame::XController >		xCtrl = xFrame->getController();
                         if( xCtrl.is() )
                         {
-                            Reference< ::com::sun::star::frame::XModel >        xMdl = xCtrl->getModel();
+                            Reference< ::com::sun::star::frame::XModel >		xMdl = xCtrl->getModel();
                             if( xMdl.is() )
                                 aDispURL = xMdl->getURL();
                         }
@@ -1055,10 +1055,10 @@ SvtTemplateWindow::SvtTemplateWindow( Window* pParent ) :
 
     Window( pParent, WB_DIALOGCONTROL ),
 
-    aFileViewTB             ( this, SvtResId( TB_SVT_FILEVIEW ) ),
-    aFrameWinTB             ( this, SvtResId( TB_SVT_FRAMEWIN ) ),
-    aSplitWin               ( this, WB_DIALOGCONTROL | WB_NOSPLITDRAW ),
-    pHistoryList            ( NULL )
+    aFileViewTB				( this, SvtResId( TB_SVT_FILEVIEW ) ),
+    aFrameWinTB				( this, SvtResId( TB_SVT_FRAMEWIN ) ),
+    aSplitWin				( this, WB_DIALOGCONTROL | WB_NOSPLITDRAW ),
+    pHistoryList			( NULL )
 
 {
     // create windows
@@ -1076,7 +1076,7 @@ SvtTemplateWindow::SvtTemplateWindow( Window* pParent ) :
 
     // create the split items
     aSplitWin.SetAlign( WINDOWALIGN_LEFT );
-    long nWidth = pIconWin->GetMaxTextLength() * 8 / 7 + 1; // extra space for border
+    long nWidth = pIconWin->GetMaxTextLength() * 8 / 7 + 1;	// extra space for border
     aSplitWin.InsertItem( ICONWIN_ID, pIconWin, nWidth, SPLITWINDOW_APPEND, 0, SWIB_FIXED );
     aSplitWin.InsertItem( FILEWIN_ID, pFileWin, 50, SPLITWINDOW_APPEND, 0, SWIB_PERCENTSIZE );
     aSplitWin.InsertItem( FRAMEWIN_ID, pFrameWin, 50, SPLITWINDOW_APPEND, 0, SWIB_PERCENTSIZE );
@@ -1404,7 +1404,7 @@ void SvtTemplateWindow::DataChanged( const DataChangedEvent& rDCEvt )
 {
     Window::DataChanged( rDCEvt );
 
-    if ( ( ( rDCEvt.GetType() == DATACHANGED_SETTINGS ) ||
+    if ( ( ( rDCEvt.GetType() == DATACHANGED_SETTINGS )	||
            ( rDCEvt.GetType() == DATACHANGED_DISPLAY ) ) &&
          ( rDCEvt.GetFlags() & SETTINGS_STYLE ) )
     {
@@ -1551,9 +1551,9 @@ long SvtTemplateWindow::CalcHeight() const
 void SvtTemplateWindow::ReadViewSettings()
 {
     // defaults
-    sal_Int32 nSelectedGroup    =   ICON_POS_TEMPLATES;
-    sal_Int32 nSelectedView     =   TI_DOCTEMPLATE_DOCINFO;
-    double nSplitRatio          =   0.5;
+    sal_Int32 nSelectedGroup	=	ICON_POS_TEMPLATES;
+    sal_Int32 nSelectedView		=	TI_DOCTEMPLATE_DOCINFO;
+    double nSplitRatio			=	0.5;
     ::rtl::OUString sLastFolder;
 
     SvtViewOptions aViewSettings( E_DIALOG, VIEWSETTING_NEWFROMTEMPLATE );
@@ -1568,8 +1568,8 @@ void SvtTemplateWindow::ReadViewSettings()
         aViewSettings.GetUserItem( VIEWSETTING_LASTFOLDER ) >>= sLastFolder;
     }
     // normalize
-    if ( nSelectedGroup < ICON_POS_NEWDOC )     nSelectedGroup = ICON_POS_NEWDOC;
-    if ( nSelectedGroup > ICON_POS_SAMPLES )    nSelectedGroup = ICON_POS_SAMPLES;
+    if ( nSelectedGroup < ICON_POS_NEWDOC )		nSelectedGroup = ICON_POS_NEWDOC;
+    if ( nSelectedGroup > ICON_POS_SAMPLES )	nSelectedGroup = ICON_POS_SAMPLES;
 
     if ( ( TI_DOCTEMPLATE_DOCINFO != nSelectedView ) && ( TI_DOCTEMPLATE_PREVIEW != nSelectedView ) )
         nSelectedView = TI_DOCTEMPLATE_DOCINFO;
@@ -1609,23 +1609,23 @@ void SvtTemplateWindow::WriteViewSettings()
     Sequence< NamedValue > aSettings(4);
 
     // the selected group
-    aSettings[0].Name   =   VIEWSETTING_SELECTEDGROUP;
+    aSettings[0].Name	=	VIEWSETTING_SELECTEDGROUP;
     pIconWin->SetFocus();
-    aSettings[0].Value  <<= (sal_Int32)pIconWin->GetCursorPos( );
+    aSettings[0].Value	<<=	(sal_Int32)pIconWin->GetCursorPos( );
 
     // the selected view mode
-    aSettings[1].Name   =   VIEWSETTING_SELECTEDVIEW;
-    aSettings[1].Value  <<= sal_Int32( aFrameWinTB.IsItemChecked( TI_DOCTEMPLATE_DOCINFO ) ? TI_DOCTEMPLATE_DOCINFO : TI_DOCTEMPLATE_PREVIEW );
+    aSettings[1].Name	=	VIEWSETTING_SELECTEDVIEW;
+    aSettings[1].Value	<<=	sal_Int32( aFrameWinTB.IsItemChecked( TI_DOCTEMPLATE_DOCINFO ) ? TI_DOCTEMPLATE_DOCINFO : TI_DOCTEMPLATE_PREVIEW );
 
     // the split ratio
-    aSettings[2].Name   =   VIEWSETTING_SPLITRATIO;
+    aSettings[2].Name	=	VIEWSETTING_SPLITRATIO;
     sal_Int32 nSplitFileSize = aSplitWin.GetItemSize( FILEWIN_ID );
     sal_Int32 nSplitFileAndFrameSize = nSplitFileSize + aSplitWin.GetItemSize( FRAMEWIN_ID );
-    aSettings[2].Value  <<= double( 1.0 * nSplitFileSize / nSplitFileAndFrameSize );
+    aSettings[2].Value	<<=	double( 1.0 * nSplitFileSize / nSplitFileAndFrameSize );
 
     // last folder
-    aSettings[3].Name   =   VIEWSETTING_LASTFOLDER;
-    aSettings[3].Value  <<= ::rtl::OUString( pFileWin->GetFolderURL() );
+    aSettings[3].Name	=	VIEWSETTING_LASTFOLDER;
+    aSettings[3].Value	<<=	::rtl::OUString( pFileWin->GetFolderURL() );
 
     // write
     SvtViewOptions aViewSettings( E_DIALOG, VIEWSETTING_NEWFROMTEMPLATE );
@@ -1643,10 +1643,10 @@ void SvtTemplateWindow::SelectFolder(sal_Int32 nFolderPosition)
 
 struct SvtTmplDlg_Impl
 {
-    SvtTemplateWindow*  pWin;
-    String              aTitle;
-    Timer               aUpdateTimer;
-    sal_Bool            bSelectNoOpen;
+    SvtTemplateWindow*	pWin;
+    String				aTitle;
+    Timer				aUpdateTimer;
+    sal_Bool			bSelectNoOpen;
 
     uno::Reference< util::XOfficeInstallationDirectories > m_xOfficeInstDirs;
 
@@ -1958,7 +1958,7 @@ IMPL_LINK ( SvtDocumentTemplateDialog, UpdateHdl_Impl, Timer*, _pEventSource )
     if ( xTemplates.is() )
     {
         if ( _pEventSource )
-        {   // it was no direct call, which means it was triggered by the timer, which means we alread checked the necessity
+        {	// it was no direct call, which means it was triggered by the timer, which means we alread checked the necessity
             WaitObject aWaitCursor( this );
             xTemplates->update();
             if ( pImpl->pWin->IsTemplateFolderOpen() )
@@ -1972,7 +1972,7 @@ IMPL_LINK ( SvtDocumentTemplateDialog, UpdateHdl_Impl, Timer*, _pEventSource )
             // check if we really need to do the update
             ::svt::TemplateFolderCache aCache;
             if ( aCache.needsUpdate() )
-            {   // yes -> do it asynchronous (it will take a noticeable time)
+            {	// yes -> do it asynchronous (it will take a noticeable time)
 
                 // (but first store the current state)
                 aCache.storeState();
diff --git a/svtools/source/contnr/templwin.hrc b/svtools/source/contnr/templwin.hrc
index 5a0d84f1d377..80eceb20744a 100644
--- a/svtools/source/contnr/templwin.hrc
+++ b/svtools/source/contnr/templwin.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
@@ -27,33 +27,33 @@
 #ifndef _SVTOOLS_TEMPLWIN_HRC
 #define _SVTOOLS_TEMPLWIN_HRC
 
-#define FL_DOCTEMPLATE          10
-#define BTN_DOCTEMPLATE_MANAGE  11
-#define BTN_DOCTEMPLATE_EDIT    12
-#define BTN_DOCTEMPLATE_OPEN    13
-#define BTN_DOCTEMPLATE_CANCEL  14
-#define BTN_DOCTEMPLATE_HELP    15
+#define FL_DOCTEMPLATE			10
+#define BTN_DOCTEMPLATE_MANAGE	11
+#define BTN_DOCTEMPLATE_EDIT	12
+#define BTN_DOCTEMPLATE_OPEN	13
+#define BTN_DOCTEMPLATE_CANCEL	14
+#define BTN_DOCTEMPLATE_HELP	15
 #define FT_DOCTEMPLATE_LINK     16
 
-#define TI_DOCTEMPLATE_BACK     1
-#define TI_DOCTEMPLATE_PREV     2
-#define TI_DOCTEMPLATE_PRINT    3
-#define TI_DOCTEMPLATE_DOCINFO  4
-#define TI_DOCTEMPLATE_PREVIEW  5
+#define TI_DOCTEMPLATE_BACK		1
+#define TI_DOCTEMPLATE_PREV		2
+#define TI_DOCTEMPLATE_PRINT	3
+#define TI_DOCTEMPLATE_DOCINFO	4
+#define TI_DOCTEMPLATE_PREVIEW	5
 
-#define HBI_CATEGORY            1
+#define HBI_CATEGORY			1
 
-#define DI_TITLE                1
-#define DI_FROM                 2
-#define DI_DATE                 3
-#define DI_KEYWORDS             4
-#define DI_DESCRIPTION          5
-#define DI_MIMETYPE             6
-#define DI_MODIFIEDDATE         7
-#define DI_MODIFIEDBY           8
-#define DI_PRINTDATE            9
-#define DI_PRINTBY              10
-#define DI_THEME                11
-#define DI_SIZE                 12
+#define DI_TITLE				1
+#define DI_FROM					2
+#define DI_DATE					3
+#define DI_KEYWORDS				4
+#define DI_DESCRIPTION			5
+#define DI_MIMETYPE				6
+#define DI_MODIFIEDDATE			7
+#define DI_MODIFIEDBY			8
+#define DI_PRINTDATE			9
+#define DI_PRINTBY				10
+#define DI_THEME				11
+#define DI_SIZE					12
 
 #endif // _SVTOOLS_TEMPLWIN_HRC
diff --git a/svtools/source/contnr/templwin.hxx b/svtools/source/contnr/templwin.hxx
index acb7c602ad30..d1af21a2a4eb 100644
--- a/svtools/source/contnr/templwin.hxx
+++ b/svtools/source/contnr/templwin.hxx
@@ -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
@@ -54,7 +54,7 @@ namespace svtools
 class SvtDummyHeaderBar_Impl : public Window
 {
 private:
-    void                UpdateBackgroundColor();
+    void				UpdateBackgroundColor();
 
 public:
                         SvtDummyHeaderBar_Impl( Window* pParent );
@@ -68,46 +68,46 @@ public:
 class SvtIconWindow_Impl : public Window
 {
 private:
-    SvtDummyHeaderBar_Impl  aDummyHeaderBar;    // spaceholder instead of HeaderBar
-    SvtIconChoiceCtrl   aIconCtrl;
+    SvtDummyHeaderBar_Impl	aDummyHeaderBar;	// spaceholder instead of HeaderBar
+    SvtIconChoiceCtrl	aIconCtrl;
 
-    String              aNewDocumentRootURL;
-    String              aTemplateRootURL;
-    String              aMyDocumentsRootURL;
-    String              aSamplesFolderRootURL;
+    String				aNewDocumentRootURL;
+    String				aTemplateRootURL;
+    String				aMyDocumentsRootURL;
+    String				aSamplesFolderRootURL;
 
-    long                nMaxTextLength;
+    long				nMaxTextLength;
 
-    SvxIconChoiceCtrlEntry* GetEntry( const String& rURL ) const;
+    SvxIconChoiceCtrlEntry*	GetEntry( const String& rURL ) const;
 
 public:
     SvtIconWindow_Impl( Window* pParent );
     ~SvtIconWindow_Impl();
 
-    virtual void        Resize();
+    virtual void		Resize();
 
-    inline long         GetMaxTextLength() const { return nMaxTextLength; }
-    inline void         SetClickHdl( const Link& rLink ) { aIconCtrl.SetClickHdl( rLink ); }
+    inline long			GetMaxTextLength() const { return nMaxTextLength; }
+    inline void			SetClickHdl( const Link& rLink ) { aIconCtrl.SetClickHdl( rLink ); }
 
-    String              GetSelectedIconURL() const;
-    String              GetSelectedIconText() const;
-    String              GetCursorPosIconURL() const;
-    String              GetIconText( const String& rURL ) const;
-    void                InvalidateIconControl();
-    void                SetCursorPos( ULONG nPos );
-    ULONG               GetCursorPos() const;
-    ULONG               GetSelectEntryPos() const;
-    void                SetFocus();
-    long                CalcHeight() const;
-    sal_Bool            IsRootURL( const String& rURL ) const;
-    ULONG               GetRootPos( const String& rURL ) const;
-    void                UpdateIcons( sal_Bool _bHiContrast );
+    String				GetSelectedIconURL() const;
+    String				GetSelectedIconText() const;
+    String				GetCursorPosIconURL() const;
+    String				GetIconText( const String& rURL ) const;
+    void				InvalidateIconControl();
+    void				SetCursorPos( ULONG nPos );
+    ULONG				GetCursorPos() const;
+    ULONG				GetSelectEntryPos() const;
+    void				SetFocus();
+    long 				CalcHeight() const;
+    sal_Bool			IsRootURL( const String& rURL ) const;
+    ULONG				GetRootPos( const String& rURL ) const;
+    void				UpdateIcons( sal_Bool _bHiContrast );
 
-    inline sal_Bool         ProcessKeyEvent( const KeyEvent& rKEvt );
+    inline sal_Bool			ProcessKeyEvent( const KeyEvent& rKEvt );
 
-    inline const String&    GetTemplateRootURL() const      { return aTemplateRootURL; }
-    inline const String&    GetMyDocumentsRootURL() const   { return aMyDocumentsRootURL; }
-    inline const String&    GetSamplesFolderURL() const     { return aSamplesFolderRootURL; }
+    inline const String&	GetTemplateRootURL() const		{ return aTemplateRootURL; }
+    inline const String&	GetMyDocumentsRootURL() const	{ return aMyDocumentsRootURL; }
+    inline const String& 	GetSamplesFolderURL() const		{ return aSamplesFolderRootURL; }
 
     void                SelectFolder(sal_Int32 nFolderPos);
 };
@@ -124,17 +124,17 @@ class SvtTemplateWindow;
 class SvtFileViewWindow_Impl : public Window
 {
 private:
-    SvtTemplateWindow&  rParent;
-    SvtFileView         aFileView;
-    Link                aNewFolderLink;
-    String              aCurrentRootURL;
-    String              aFolderURL;
-    String              aMyDocumentsURL;
-    String              aSamplesFolderURL;
+    SvtTemplateWindow&	rParent;
+    SvtFileView	   		aFileView;
+    Link				aNewFolderLink;
+    String				aCurrentRootURL;
+    String				aFolderURL;
+    String				aMyDocumentsURL;
+    String				aSamplesFolderURL;
     ::svt::RestrictedPaths
                         aURLFilter;
 
-    sal_Bool            bIsTemplateFolder;
+    sal_Bool			bIsTemplateFolder;
 
     ::com::sun::star::uno::Sequence< ::rtl::OUString >
                         GetNewDocContents() const;
@@ -143,25 +143,25 @@ public:
     SvtFileViewWindow_Impl( SvtTemplateWindow* pParent );
     ~SvtFileViewWindow_Impl();
 
-    virtual void        Resize();
+    virtual void		Resize();
 
-    inline void         SetSelectHdl( const Link& rLink ) { aFileView.SetSelectHdl( rLink ); }
-    inline void         SetDoubleClickHdl( const Link& rLink ) { aFileView.SetDoubleClickHdl( rLink ); }
-    inline void         SetNewFolderHdl( const Link& rLink ) { aNewFolderLink = rLink; }
-    inline void         ResetCursor() { aFileView.ResetCursor(); }
-    inline sal_Bool     IsTemplateFolder() const { return bIsTemplateFolder; }
-    inline String       GetFolderURL() const { return aFolderURL; }
-    inline String       GetRootURL() const { return aCurrentRootURL; }
-    inline void         OpenRoot( const String& rRootURL )
+    inline void			SetSelectHdl( const Link& rLink ) { aFileView.SetSelectHdl( rLink ); }
+    inline void			SetDoubleClickHdl( const Link& rLink ) { aFileView.SetDoubleClickHdl( rLink ); }
+    inline void			SetNewFolderHdl( const Link& rLink ) { aNewFolderLink = rLink; }
+    inline void			ResetCursor() { aFileView.ResetCursor(); }
+    inline sal_Bool		IsTemplateFolder() const { return bIsTemplateFolder; }
+    inline String		GetFolderURL() const { return aFolderURL; }
+    inline String		GetRootURL() const { return aCurrentRootURL; }
+    inline void			OpenRoot( const String& rRootURL )
                             { aCurrentRootURL = rRootURL; OpenFolder( rRootURL ); }
-    inline void         SetMyDocumentsURL( const String& _rNewURL ) { aMyDocumentsURL = _rNewURL; }
-    inline void         SetSamplesFolderURL( const String& _rNewURL ) { aSamplesFolderURL = _rNewURL; }
-
-    String              GetSelectedFile() const;
-    void                OpenFolder( const String& rURL );
-    sal_Bool            HasPreviousLevel( String& rURL ) const;
-    String              GetFolderTitle() const;
-    void                SetFocus();
+    inline void			SetMyDocumentsURL( const String& _rNewURL ) { aMyDocumentsURL = _rNewURL; }
+    inline void			SetSamplesFolderURL( const String& _rNewURL ) { aSamplesFolderURL = _rNewURL; }
+
+    String				GetSelectedFile() const;
+    void				OpenFolder( const String& rURL );
+    sal_Bool			HasPreviousLevel( String& rURL ) const;
+    String				GetFolderTitle() const;
+    void				SetFocus();
 };
 
 // class SvtFrameWindow_Impl ---------------------------------------------
@@ -169,12 +169,12 @@ public:
 class SvtDocInfoTable_Impl : public ResStringArray
 {
 private:
-    String          aEmptyString;
+    String			aEmptyString;
 
 public:
     SvtDocInfoTable_Impl();
 
-    const String&   GetString( long nId ) const;
+    const String&	GetString( long nId ) const;
 };
 
 class SvtExtendedMultiLineEdit_Impl : public ExtMultiLineEdit
@@ -183,8 +183,8 @@ public:
     SvtExtendedMultiLineEdit_Impl( Window* pParent,WinBits _nBits );
     inline ~SvtExtendedMultiLineEdit_Impl() {}
 
-    inline void         Clear() { SetText( String() ); }
-    void                InsertEntry( const String& rTitle, const String& rValue );
+    inline void			Clear() { SetText( String() ); }
+    void				InsertEntry( const String& rTitle, const String& rValue );
 };
 
 class SvtFrameWindow_Impl : public Window
@@ -199,19 +199,19 @@ private:
 
     ::svtools::ODocumentInfoPreview*
                                     pEditWin;
-    Window*                         pTextWin;
-    Window*                         pEmptyWin;
-    ::com::sun::star::lang::Locale  aLocale;
-    SvtDocInfoTable_Impl            aInfoTable;
-    String                          aCurrentURL;
-    ::rtl::OUString                 m_aOpenURL;
-    sal_Bool                        bDocInfo;
-
-    void                    ShowDocInfo( const String& rURL );
-    void                    ViewEditWin();
-    void                    ViewTextWin();
-    void                    ViewEmptyWin();
-    void                    ViewNonEmptyWin();  // views depending on bDocInfo
+    Window*							pTextWin;
+    Window*							pEmptyWin;
+    ::com::sun::star::lang::Locale	aLocale;
+    SvtDocInfoTable_Impl			aInfoTable;
+    String							aCurrentURL;
+    ::rtl::OUString					m_aOpenURL;
+    sal_Bool						bDocInfo;
+
+    void					ShowDocInfo( const String& rURL );
+    void					ViewEditWin();
+    void					ViewTextWin();
+    void					ViewEmptyWin();
+    void					ViewNonEmptyWin();	// views depending on bDocInfo
 
     struct SvtExecuteInfo
     {
@@ -225,10 +225,10 @@ public:
     SvtFrameWindow_Impl( Window* pParent );
     ~SvtFrameWindow_Impl();
 
-    virtual void            Resize();
+    virtual void			Resize();
 
-    void                    OpenFile( const String& rURL, sal_Bool bPreview, sal_Bool bIsTemplate, sal_Bool bAsTemplate );
-    void                    ToggleView( sal_Bool bDocInfo );
+    void					OpenFile( const String& rURL, sal_Bool bPreview, sal_Bool bIsTemplate, sal_Bool bAsTemplate );
+    void					ToggleView( sal_Bool bDocInfo );
 };
 
 // class SvtTemplateWindow -----------------------------------------------
@@ -238,69 +238,69 @@ class HistoryList_Impl;
 class SvtTemplateWindow : public Window
 {
 private:
-    ToolBox                     aFileViewTB;
-    ToolBox                     aFrameWinTB;
-    SplitWindow                 aSplitWin;
-
-    SvtIconWindow_Impl*         pIconWin;
-    SvtFileViewWindow_Impl*     pFileWin;
-    SvtFrameWindow_Impl*        pFrameWin;
-    HistoryList_Impl*           pHistoryList;
-
-    Link                        aSelectHdl;
-    Link                        aDoubleClickHdl;
-    Link                        aNewFolderHdl;
-    Link                        aSendFocusHdl;
-
-    Timer                       aSelectTimer;
-
-    String                      aFolderTitle;
-
-    virtual void        Resize();
-
-    DECL_LINK(          IconClickHdl_Impl, SvtIconChoiceCtrl* );
-    DECL_LINK(          FileSelectHdl_Impl, SvtFileView* );
-    DECL_LINK(          FileDblClickHdl_Impl, SvtFileView* );
-    DECL_LINK(          NewFolderHdl_Impl, SvtFileView* );
-    DECL_LINK(          TimeoutHdl_Impl, Timer* );
-    DECL_LINK(          ClickHdl_Impl, ToolBox* );
-    DECL_LINK(          ResizeHdl_Impl, SplitWindow* );     // used for split and initial setting of toolbar pos
-
-    void                PrintFile( const String& rURL );
-    void                AppendHistoryURL( const String& rURL, ULONG nGroup );
-    void                OpenHistory();
-    void                DoAction( USHORT nAction );
-    void                InitToolBoxes();
-    void                InitToolBoxImages();
-    void                UpdateIcons();
+    ToolBox						aFileViewTB;
+    ToolBox						aFrameWinTB;
+    SplitWindow					aSplitWin;
+
+    SvtIconWindow_Impl*			pIconWin;
+    SvtFileViewWindow_Impl*		pFileWin;
+    SvtFrameWindow_Impl*		pFrameWin;
+    HistoryList_Impl*			pHistoryList;
+
+    Link						aSelectHdl;
+    Link						aDoubleClickHdl;
+    Link						aNewFolderHdl;
+    Link						aSendFocusHdl;
+
+    Timer						aSelectTimer;
+
+    String						aFolderTitle;
+
+    virtual void		Resize();
+
+    DECL_LINK(			IconClickHdl_Impl, SvtIconChoiceCtrl* );
+    DECL_LINK(			FileSelectHdl_Impl, SvtFileView* );
+    DECL_LINK(			FileDblClickHdl_Impl, SvtFileView* );
+    DECL_LINK(			NewFolderHdl_Impl, SvtFileView* );
+    DECL_LINK(			TimeoutHdl_Impl, Timer* );
+    DECL_LINK(			ClickHdl_Impl, ToolBox* );
+    DECL_LINK(			ResizeHdl_Impl, SplitWindow* );		// used for split and initial setting of toolbar pos
+
+    void				PrintFile( const String& rURL );
+    void				AppendHistoryURL( const String& rURL, ULONG nGroup );
+    void				OpenHistory();
+    void				DoAction( USHORT nAction );
+    void				InitToolBoxes();
+    void				InitToolBoxImages();
+    void				UpdateIcons();
 
 protected:
     virtual long        PreNotify( NotifyEvent& rNEvt );
-    virtual void        DataChanged( const DataChangedEvent& rDCEvt );
+    virtual void 		DataChanged( const DataChangedEvent& rDCEvt );
 
 public:
     SvtTemplateWindow( Window* pParent );
     ~SvtTemplateWindow();
 
-    inline void         SetSelectHdl( const Link& rLink ) { aSelectHdl = rLink; }
-    inline void         SetDoubleClickHdl( const Link& rLink ) { aDoubleClickHdl = rLink; }
-    inline void         SetNewFolderHdl( const Link& rLink ) { aNewFolderHdl = rLink; }
-    inline void         SetSendFocusHdl( const Link& rLink ) { aSendFocusHdl = rLink; }
-    inline sal_Bool     IsTemplateFolderOpen() const { return pFileWin->IsTemplateFolder(); }
-    inline sal_Bool     HasIconWinFocus() const { return pIconWin->HasChildPathFocus(); }
-
-    void                ReadViewSettings( );
-    void                WriteViewSettings( );
-    sal_Bool            IsFileSelected() const;
-    String              GetSelectedFile() const;
-    void                OpenFile( sal_Bool bNotAsTemplate );
-    String              GetFolderTitle() const;
-    String              GetFolderURL() const;
-    void                SetFocus( sal_Bool bIconWin );
-    void                OpenTemplateRoot();
-    void                SetPrevLevelButtonState( const String& rURL );  // sets state (enable/disable) for previous level button
-    void                ClearHistory();
-    long                CalcHeight() const;
+    inline void			SetSelectHdl( const Link& rLink ) { aSelectHdl = rLink; }
+    inline void			SetDoubleClickHdl( const Link& rLink ) { aDoubleClickHdl = rLink; }
+    inline void			SetNewFolderHdl( const Link& rLink ) { aNewFolderHdl = rLink; }
+    inline void			SetSendFocusHdl( const Link& rLink ) { aSendFocusHdl = rLink; }
+    inline sal_Bool		IsTemplateFolderOpen() const { return pFileWin->IsTemplateFolder(); }
+    inline sal_Bool		HasIconWinFocus() const { return pIconWin->HasChildPathFocus(); }
+
+    void				ReadViewSettings( );
+    void				WriteViewSettings( );
+    sal_Bool			IsFileSelected() const;
+    String				GetSelectedFile() const;
+    void				OpenFile( sal_Bool bNotAsTemplate );
+    String				GetFolderTitle() const;
+    String				GetFolderURL() const;
+    void				SetFocus( sal_Bool bIconWin );
+    void 				OpenTemplateRoot();
+    void				SetPrevLevelButtonState( const String& rURL );	// sets state (enable/disable) for previous level button
+    void				ClearHistory();
+    long				CalcHeight() const;
 
     void                SelectFolder(sal_Int32 nFolderPosition);
 };
diff --git a/svtools/source/contnr/templwin.src b/svtools/source/contnr/templwin.src
index 048d052c18d8..b0208503ccfe 100644
--- a/svtools/source/contnr/templwin.src
+++ b/svtools/source/contnr/templwin.src
@@ -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
@@ -33,7 +33,7 @@
 #include <svtools/svtools.hrc>
 
 // Magenta and Grey as mask colors
-#define MASK_COL_MAGENTA    Color { Red = 0xFFFF ; Green = 0x0000 ; Blue = 0xFFFF ; };
+#define MASK_COL_MAGENTA	Color { Red = 0xFFFF ; Green = 0x0000 ; Blue = 0xFFFF ; };
 
 Control CTRL_FILEVIEW
 {
diff --git a/svtools/source/contnr/tooltiplbox.cxx b/svtools/source/contnr/tooltiplbox.cxx
index 6aae495bd504..5a52be565f09 100644
--- a/svtools/source/contnr/tooltiplbox.cxx
+++ b/svtools/source/contnr/tooltiplbox.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
diff --git a/svtools/source/contnr/treelist.cxx b/svtools/source/contnr/treelist.cxx
index 3395dffc28f5..b246145e1323 100644
--- a/svtools/source/contnr/treelist.cxx
+++ b/svtools/source/contnr/treelist.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
@@ -81,15 +81,15 @@ void SvListEntry::Clone( SvListEntry* pSource)
     DBG_CHKTHIS(SvListEntry,0);
     nListPos &= 0x80000000;
     nListPos |= ( pSource->nListPos & 0x7fffffff);
-    nAbsPos     = pSource->nAbsPos;
+    nAbsPos		= pSource->nAbsPos;
 }
 
 void SvListEntry::SetListPositions()
 {
     if( pChilds )
     {
-        SvListEntry *pEntry = (SvListEntry*)pChilds->First();
-        ULONG       nCur = 0;
+        SvListEntry	*pEntry = (SvListEntry*)pChilds->First();
+        ULONG		nCur = 0;
         while ( pEntry )
         {
             pEntry->nListPos &= 0x80000000;
@@ -114,9 +114,9 @@ SvViewData::SvViewData()
 SvViewData::SvViewData( const SvViewData& rData )
 {
     DBG_CTOR(SvViewData,0);
-    nFlags  = rData.nFlags;
+    nFlags	= rData.nFlags;
     nFlags &= ~( SVLISTENTRYFLAG_SELECTED | SVLISTENTRYFLAG_FOCUSED );
-    nVisPos = rData.nVisPos;
+    nVisPos	= rData.nVisPos;
 }
 
 SvViewData::~SvViewData()
@@ -397,7 +397,7 @@ ULONG SvTreeList::Copy(SvListEntry* pSrcEntry,SvListEntry* pTargetParent,ULONG n
     nEntryCount += nCloneCount;
 
     SvTreeEntryList* pDstList = pTargetParent->pChilds;
-    pClonedEntry->pParent = pTargetParent;      // Parent umsetzen
+    pClonedEntry->pParent = pTargetParent;		// Parent umsetzen
     pDstList->Insert( pClonedEntry, nListPos ); // Einfuegen
     SetListPositions( pDstList ); // Listenpositionen in Zielliste korrigieren
 
@@ -670,7 +670,7 @@ ULONG SvTreeList::GetChildSelectionCount(const SvListView* pView,SvListEntry* pP
         if( pParent && pView->IsSelected( pParent ) && nRefDepth < nActDepth)
             nCount++;
     } while( pParent && nRefDepth < nActDepth );
-//  nCount--;
+//	nCount--;
     return nCount;
 }
 
@@ -822,15 +822,15 @@ SvListEntry* SvTreeList::Prev( SvListEntry* pActEntry, USHORT* pDepth ) const
 SvListEntry* SvTreeList::Last( USHORT* /* nDepth */ ) const
 {
     SvTreeEntryList* pActList = pRootItem->pChilds;
-//  if ( pActList->Count() == 0 )
-//      return 0;
+//	if ( pActList->Count() == 0 )
+//		return 0;
     SvListEntry* pEntry = 0;
     while( pActList )
     {
         pEntry = (SvListEntry*)(pActList->Last());
         pActList = pEntry->pChilds;
-//      if ( pActList->Count() == 0 )
-//          pActList = 0;
+//		if ( pActList->Count() == 0 )
+//			pActList = 0;
     }
     return pEntry;
 }
@@ -1148,7 +1148,7 @@ SvListEntry* SvTreeList::NextSibling( SvListEntry* pEntry ) const
     if( !pEntry )
         return 0;
     SvTreeEntryList* pList = pEntry->pParent->pChilds;
-//  ULONG nPos = pList->GetPos( pEntry );
+//	ULONG nPos = pList->GetPos( pEntry );
     ULONG nPos = pEntry->GetChildListPos();
     nPos++;
     pEntry = (SvListEntry*)(pList->GetObject( nPos ));
@@ -1481,9 +1481,9 @@ BOOL SvTreeList::Remove( SvListEntry* pEntry )
         pList->Remove( (void*) pEntry );
     }
 
-
+    
     // moved to end of method because it is used later with Broadcast
-    // delete pEntry; // loescht auch alle Childs
+    // delete pEntry; // loescht auch alle Childs 
 
     if ( pList->Count() == 0 )
     {
@@ -1501,7 +1501,7 @@ BOOL SvTreeList::Remove( SvListEntry* pEntry )
 CheckIntegrity();
 #endif
     Broadcast( LISTACTION_REMOVED, pEntry );
-
+    
     delete pEntry; // loescht auch alle Childs
     return TRUE;
 }
@@ -1817,7 +1817,7 @@ void SvListView::ModelHasInsertedTree( SvListEntry* )
 }
 
 void SvListView::ModelIsMoving( SvListEntry* /*  pSource */ ,
-    SvListEntry* /* pTargetParent */ ,  ULONG /* nPos */    )
+    SvListEntry* /* pTargetParent */ ,	ULONG /* nPos */	)
 {
     DBG_CHKTHIS(SvListView,0);
 }
diff --git a/svtools/source/control/asynclink.cxx b/svtools/source/control/asynclink.cxx
index 04b2b58367ee..58730e6f6343 100644
--- a/svtools/source/control/asynclink.cxx
+++ b/svtools/source/control/asynclink.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
diff --git a/svtools/source/control/calendar.cxx b/svtools/source/control/calendar.cxx
index f7b49ac57eeb..5cc99500361f 100755
--- a/svtools/source/control/calendar.cxx
+++ b/svtools/source/control/calendar.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
@@ -65,29 +65,29 @@
 
 // =======================================================================
 
-#define DAY_OFFX                        4
-#define DAY_OFFY                        2
-#define MONTH_BORDERX                   4
-#define MONTH_OFFY                      3
-#define WEEKNUMBER_OFFX                 4
-#define WEEKDAY_OFFY                    3
-#define TITLE_OFFY                      3
-#define TITLE_BORDERY                   2
-#define SPIN_OFFX                       4
-#define SPIN_OFFY                       TITLE_BORDERY
+#define DAY_OFFX						4
+#define DAY_OFFY						2
+#define MONTH_BORDERX					4
+#define MONTH_OFFY						3
+#define WEEKNUMBER_OFFX 				4
+#define WEEKDAY_OFFY					3
+#define TITLE_OFFY						3
+#define TITLE_BORDERY					2
+#define SPIN_OFFX						4
+#define SPIN_OFFY						TITLE_BORDERY
 
-#define WEEKNUMBER_HEIGHT               85
+#define WEEKNUMBER_HEIGHT				85
 
-#define CALENDAR_HITTEST_DAY            ((USHORT)0x0001)
-#define CALENDAR_HITTEST_WEEK           ((USHORT)0x0002)
-#define CALENDAR_HITTEST_MONTHTITLE     ((USHORT)0x0004)
-#define CALENDAR_HITTEST_PREV           ((USHORT)0x0008)
-#define CALENDAR_HITTEST_NEXT           ((USHORT)0x0010)
-#define CALENDAR_HITTEST_OUTSIDE        ((USHORT)0x1000)
+#define CALENDAR_HITTEST_DAY			((USHORT)0x0001)
+#define CALENDAR_HITTEST_WEEK			((USHORT)0x0002)
+#define CALENDAR_HITTEST_MONTHTITLE 	((USHORT)0x0004)
+#define CALENDAR_HITTEST_PREV			((USHORT)0x0008)
+#define CALENDAR_HITTEST_NEXT			((USHORT)0x0010)
+#define CALENDAR_HITTEST_OUTSIDE		((USHORT)0x1000)
 
-#define MENU_YEAR_COUNT                 3
+#define MENU_YEAR_COUNT 				3
 
-#define TABLE_DATE_SELECTED             ((void*)0x00000001)
+#define TABLE_DATE_SELECTED 			((void*)0x00000001)
 
 using namespace ::com::sun::star;
 
@@ -95,10 +95,10 @@ using namespace ::com::sun::star;
 
 struct ImplDateInfo
 {
-    XubString   maText;
-    Color*      mpTextColor;
-    Color*      mpFrameColor;
-    USHORT      mnFlags;
+    XubString	maText;
+    Color*		mpTextColor;
+    Color*		mpFrameColor;
+    USHORT		mnFlags;
 
                 ImplDateInfo( const XubString& rText ) :
                     maText( rText )
@@ -212,36 +212,36 @@ inline void ImplCalendarClearSelectDate( Table* pTable )
 
 void Calendar::ImplInit( WinBits nWinStyle )
 {
-    mpDateTable             = NULL;
-    mpSelectTable           = new Table;
-    mpOldSelectTable        = NULL;
-    mpRestoreSelectTable    = NULL;
-    mpStandardColor         = NULL;
-    mpSaturdayColor         = NULL;
-    mpSundayColor           = NULL;
-    mnDayCount              = 0;
-    mnWinStyle              = nWinStyle;
-    mnFirstYear             = 0;
-    mnLastYear              = 0;
-    mnRequestYear           = 0;
-    mbCalc                  = TRUE;
-    mbFormat                = TRUE;
-    mbDrag                  = FALSE;
-    mbSelection             = FALSE;
-    mbMultiSelection        = FALSE;
-    mbWeekSel               = FALSE;
-    mbUnSel                 = FALSE;
-    mbMenuDown              = FALSE;
-    mbSpinDown              = FALSE;
-    mbPrevIn                = FALSE;
-    mbNextIn                = FALSE;
-    mbDirect                = FALSE;
-    mbInSelChange           = FALSE;
-    mbTravelSelect          = FALSE;
-    mbScrollDateRange       = FALSE;
-    mbSelLeft               = FALSE;
-    mbAllSel                = FALSE;
-    mbDropPos               = FALSE;
+    mpDateTable 			= NULL;
+    mpSelectTable			= new Table;
+    mpOldSelectTable		= NULL;
+    mpRestoreSelectTable	= NULL;
+    mpStandardColor 		= NULL;
+    mpSaturdayColor 		= NULL;
+    mpSundayColor			= NULL;
+    mnDayCount				= 0;
+    mnWinStyle				= nWinStyle;
+    mnFirstYear 			= 0;
+    mnLastYear				= 0;
+    mnRequestYear			= 0;
+    mbCalc					= TRUE;
+    mbFormat				= TRUE;
+    mbDrag					= FALSE;
+    mbSelection 			= FALSE;
+    mbMultiSelection		= FALSE;
+    mbWeekSel				= FALSE;
+    mbUnSel 				= FALSE;
+    mbMenuDown				= FALSE;
+    mbSpinDown				= FALSE;
+    mbPrevIn				= FALSE;
+    mbNextIn				= FALSE;
+    mbDirect				= FALSE;
+    mbInSelChange			= FALSE;
+    mbTravelSelect			= FALSE;
+    mbScrollDateRange		= FALSE;
+    mbSelLeft				= FALSE;
+    mbAllSel				= FALSE;
+    mbDropPos				= FALSE;
 
     ::rtl::OUString aGregorian( RTL_CONSTASCII_USTRINGPARAM( "gregorian"));
     maCalendarWrapper.loadCalendar( aGregorian,
@@ -481,39 +481,39 @@ void Calendar::ImplFormat()
         long nTextHeight = GetTextHeight();
 
         // Breiten und X-Positionen berechnen
-        mnDayWidth      = n99TextWidth+DAY_OFFX;
-        mnMonthWidth    = mnDayWidth*7;
+        mnDayWidth		= n99TextWidth+DAY_OFFX;
+        mnMonthWidth	= mnDayWidth*7;
         mnMonthWidth   += mnWeekWidth;
         mnMonthWidth   += MONTH_BORDERX*2;
-        mnMonthPerLine  = aOutSize.Width() / mnMonthWidth;
+        mnMonthPerLine	= aOutSize.Width() / mnMonthWidth;
         if ( !mnMonthPerLine )
             mnMonthPerLine = 1;
-        long nOver      = ((aOutSize.Width()-(mnMonthPerLine*mnMonthWidth)) / mnMonthPerLine);
+        long nOver		= ((aOutSize.Width()-(mnMonthPerLine*mnMonthWidth)) / mnMonthPerLine);
         mnMonthWidth   += nOver;
-        mnDaysOffX      = MONTH_BORDERX;
-        mnDaysOffX     += nOver/2;
-        mnDaysOffX     += mnWeekWidth;
+        mnDaysOffX		= MONTH_BORDERX;
+        mnDaysOffX	   += nOver/2;
+        mnDaysOffX	   += mnWeekWidth;
 
         // Hoehen und Y-Positionen berechnen
-        mnDayHeight     = nTextHeight + DAY_OFFY;
-        mnWeekDayOffY   = nTextHeight + TITLE_OFFY + (TITLE_BORDERY*2);
-        mnDaysOffY      = mnWeekDayOffY + nTextHeight + WEEKDAY_OFFY;
-        mnMonthHeight   = (mnDayHeight*6) + mnDaysOffY;
+        mnDayHeight 	= nTextHeight + DAY_OFFY;
+        mnWeekDayOffY	= nTextHeight + TITLE_OFFY + (TITLE_BORDERY*2);
+        mnDaysOffY		= mnWeekDayOffY + nTextHeight + WEEKDAY_OFFY;
+        mnMonthHeight	= (mnDayHeight*6) + mnDaysOffY;
         mnMonthHeight  += MONTH_OFFY;
-        mnLines         = aOutSize.Height() / mnMonthHeight;
+        mnLines 		= aOutSize.Height() / mnMonthHeight;
         if ( !mnLines )
             mnLines = 1;
         mnMonthHeight  += (aOutSize.Height()-(mnLines*mnMonthHeight)) / mnLines;
 
         // Spinfelder berechnen
-        long nSpinSize      = nTextHeight+TITLE_BORDERY-SPIN_OFFY;
-        maPrevRect.Left()   = SPIN_OFFX;
-        maPrevRect.Top()    = SPIN_OFFY;
-        maPrevRect.Right()  = maPrevRect.Left()+nSpinSize;
+        long nSpinSize		= nTextHeight+TITLE_BORDERY-SPIN_OFFY;
+        maPrevRect.Left()	= SPIN_OFFX;
+        maPrevRect.Top()	= SPIN_OFFY;
+        maPrevRect.Right()	= maPrevRect.Left()+nSpinSize;
         maPrevRect.Bottom() = maPrevRect.Top()+nSpinSize;
-        maNextRect.Left()   = aOutSize.Width()-SPIN_OFFX-nSpinSize-1;
-        maNextRect.Top()    = SPIN_OFFY;
-        maNextRect.Right()  = maNextRect.Left()+nSpinSize;
+        maNextRect.Left()	= aOutSize.Width()-SPIN_OFFX-nSpinSize-1;
+        maNextRect.Top()	= SPIN_OFFY;
+        maNextRect.Right()	= maNextRect.Left()+nSpinSize;
         maNextRect.Bottom() = maNextRect.Top()+nSpinSize;
 
         if ( mnWinStyle & WB_BOLDTEXT )
@@ -631,12 +631,12 @@ USHORT Calendar::ImplHitTest( const Point& rPos, Date& rDate ) const
     else if ( maNextRect.IsInside( rPos ) )
         return CALENDAR_HITTEST_NEXT;
 
-    long        nX;
-    long        nY;
-    long        nOffX;
-    long        nYMonth;
-    USHORT      nDay;
-    DayOfWeek   eStartDay = ImplGetWeekStart();
+    long		nX;
+    long		nY;
+    long		nOffX;
+    long		nYMonth;
+    USHORT		nDay;
+    DayOfWeek	eStartDay = ImplGetWeekStart();
 
     rDate = GetFirstMonth();
     nY = 0;
@@ -755,11 +755,11 @@ USHORT Calendar::ImplHitTest( const Point& rPos, Date& rDate ) const
 static void ImplDrawSpinArrow( OutputDevice* pDev, const Rectangle& rRect,
                                BOOL bPrev )
 {
-    long    i;
-    long    n;
-    long    nLines;
-    long    nHeight = rRect.GetHeight();
-    long    nWidth = rRect.GetWidth();
+    long	i;
+    long	n;
+    long	nLines;
+    long	nHeight = rRect.GetHeight();
+    long	nWidth = rRect.GetWidth();
     if ( nWidth < nHeight )
         n = nWidth;
     else
@@ -809,7 +809,7 @@ void Calendar::ImplDrawSpin( BOOL bDrawPrev, BOOL bDrawNext )
     {
         Rectangle aOutRect = maPrevRect;
         aOutRect.Left()   += 3;
-        aOutRect.Top()    += 3;
+        aOutRect.Top()	  += 3;
         aOutRect.Right()  -= 3;
         aOutRect.Bottom() -= 3;
         ImplDrawSpinArrow( this, aOutRect, TRUE );
@@ -818,7 +818,7 @@ void Calendar::ImplDrawSpin( BOOL bDrawPrev, BOOL bDrawNext )
     {
         Rectangle aOutRect = maNextRect;
         aOutRect.Left()   += 3;
-        aOutRect.Top()    += 3;
+        aOutRect.Top()	  += 3;
         aOutRect.Right()  -= 3;
         aOutRect.Bottom() -= 3;
         ImplDrawSpinArrow( this, aOutRect, FALSE );
@@ -832,15 +832,15 @@ void Calendar::ImplDrawDate( long nX, long nY,
                              DayOfWeek eDayOfWeek,
                              BOOL bBack, BOOL bOther, ULONG nToday )
 {
-    ImplDateInfo*   pDateInfo;
-    Color*          pTextColor = NULL;
-    const String&   rDay = *(mpDayText[nDay-1]);
-    Rectangle       aDateRect( nX, nY, nX+mnDayWidth-1, nY+mnDayHeight-1 );
+    ImplDateInfo*	pDateInfo;
+    Color*			pTextColor = NULL;
+    const String&	rDay = *(mpDayText[nDay-1]);
+    Rectangle		aDateRect( nX, nY, nX+mnDayWidth-1, nY+mnDayHeight-1 );
 
     BOOL bSel = FALSE;
     BOOL bFocus = FALSE;
     // Aktueller Tag
-    if ( (nDay   == maCurDate.GetDay()) &&
+    if ( (nDay	 == maCurDate.GetDay()) &&
          (nMonth == maCurDate.GetMonth()) &&
          (nYear  == maCurDate.GetYear()) )
         bFocus = TRUE;
@@ -931,7 +931,7 @@ void Calendar::ImplDrawDate( long nX, long nY,
         aTodayDate.SetDate( nToday );
     else
         aTodayDate = Date();
-    if ( (nDay   == aTodayDate.GetDay()) &&
+    if ( (nDay	 == aTodayDate.GetDay()) &&
          (nMonth == aTodayDate.GetMonth()) &&
          (nYear  == aTodayDate.GetYear()) )
     {
@@ -986,21 +986,21 @@ void Calendar::ImplDraw( BOOL bPaint )
     ImplFormat();
 
     const StyleSettings& rStyleSettings = GetSettings().GetStyleSettings();
-    Size        aOutSize = GetOutputSizePixel();
-    long        i;
-    long        j;
-    long        nX;
-    long        nY;
-    long        nDeltaX;
-    long        nDeltaY;
-    long        nDayX;
-    long        nDayY;
-    ULONG       nToday = Date().GetDate();
-    USHORT      nDay;
-    USHORT      nMonth;
-    USHORT      nYear;
-    Date        aDate = GetFirstMonth();
-    DayOfWeek   eStartDay = ImplGetWeekStart();
+    Size		aOutSize = GetOutputSizePixel();
+    long		i;
+    long		j;
+    long		nX;
+    long		nY;
+    long		nDeltaX;
+    long		nDeltaY;
+    long		nDayX;
+    long		nDayY;
+    ULONG		nToday = Date().GetDate();
+    USHORT		nDay;
+    USHORT		nMonth;
+    USHORT		nYear;
+    Date		aDate = GetFirstMonth();
+    DayOfWeek	eStartDay = ImplGetWeekStart();
 
     HideFocus();
 
@@ -1058,8 +1058,8 @@ void Calendar::ImplDraw( BOOL bPaint )
         nX = 0;
         for ( j = 0; j < mnMonthPerLine; j++ )
         {
-            nMonth  = aDate.GetMonth();
-            nYear   = aDate.GetYear();
+            nMonth	= aDate.GetMonth();
+            nYear	= aDate.GetYear();
 
             // Monat in der Titleleiste ausgeben
             nDeltaX = nX;
@@ -1138,9 +1138,9 @@ void Calendar::ImplDraw( BOOL bPaint )
                 for ( USHORT nWeekCount = 0; nWeekCount < 6; nWeekCount++ )
                 {
                     sal_Int16 nWeek = maCalendarWrapper.getValue( i18n::CalendarFieldIndex::WEEK_OF_YEAR);
-                    String  aWeekText( String::CreateFromInt32( nWeek));
-                    long    nOffX = (mnWeekWidth-WEEKNUMBER_OFFX)-GetTextWidth( aWeekText );
-                    long    nOffY = (mnDayHeight-GetTextHeight())/2;
+                    String	aWeekText( String::CreateFromInt32( nWeek));
+                    long	nOffX = (mnWeekWidth-WEEKNUMBER_OFFX)-GetTextWidth( aWeekText );
+                    long	nOffY = (mnDayHeight-GetTextHeight())/2;
                     DrawText( Point( nDayX+nOffX, nDayY+nOffY ), aWeekText );
                     nDayY += mnDayHeight;
                     maCalendarWrapper.addValue( i18n::CalendarFieldIndex::DAY_OF_MONTH, 7);
@@ -1243,9 +1243,9 @@ void Calendar::ImplUpdateDate( const Date& rDate )
 
 void Calendar::ImplUpdateSelection( Table* pOld )
 {
-    Table*  pNew = mpSelectTable;
-    void*   p;
-    ULONG   nKey;
+    Table*	pNew = mpSelectTable;
+    void*	p;
+    ULONG	nKey;
 
     p = pOld->First();
     while ( p )
@@ -1279,9 +1279,9 @@ void Calendar::ImplUpdateSelection( Table* pOld )
 void Calendar::ImplMouseSelect( const Date& rDate, USHORT nHitTest,
                                 BOOL bMove, BOOL bExpand, BOOL bExtended )
 {
-    Table*  pOldSel = new Table( *mpSelectTable );
-    Date    aOldDate = maCurDate;
-    Date    aTempDate = rDate;
+    Table*	pOldSel = new Table( *mpSelectTable );
+    Date	aOldDate = maCurDate;
+    Date	aTempDate = rDate;
 
     if ( !(nHitTest & CALENDAR_HITTEST_DAY) )
         aTempDate--;
@@ -1445,15 +1445,15 @@ void Calendar::ImplShowMenu( const Point& rPos, const Date& rDate )
 {
     EndSelection();
 
-    Date        aOldFirstDate = GetFirstMonth();
-    PopupMenu   aPopupMenu;
-    PopupMenu*  pYearPopupMenus[MENU_YEAR_COUNT];
-    USHORT      nMonthOff;
-    USHORT      nCurItemId;
-    USHORT      nYear = rDate.GetYear()-1;
-    USHORT      i;
-    USHORT      j;
-    USHORT      nYearIdCount = 1000;
+    Date		aOldFirstDate = GetFirstMonth();
+    PopupMenu	aPopupMenu;
+    PopupMenu*	pYearPopupMenus[MENU_YEAR_COUNT];
+    USHORT		nMonthOff;
+    USHORT		nCurItemId;
+    USHORT		nYear = rDate.GetYear()-1;
+    USHORT		i;
+    USHORT		j;
+    USHORT		nYearIdCount = 1000;
 
     nMonthOff = (rDate.GetYear()-aOldFirstDate.GetYear())*12;
     if ( aOldFirstDate.GetMonth() < rDate.GetMonth() )
@@ -1508,8 +1508,8 @@ void Calendar::ImplShowMenu( const Point& rPos, const Date& rDate )
 
 void Calendar::ImplTracking( const Point& rPos, BOOL bRepeat )
 {
-    Date    aTempDate = maCurDate;
-    USHORT  nHitTest = ImplHitTest( rPos, aTempDate );
+    Date	aTempDate = maCurDate;
+    USHORT	nHitTest = ImplHitTest( rPos, aTempDate );
 
     if ( mbSpinDown )
     {
@@ -1534,13 +1534,13 @@ void Calendar::ImplEndTracking( BOOL bCancel )
     BOOL bSelection = mbSelection;
     BOOL bSpinDown = mbSpinDown;
 
-    mbDrag              = FALSE;
-    mbSelection         = FALSE;
-    mbMultiSelection    = FALSE;
-    mbUnSel             = FALSE;
-    mbSpinDown          = FALSE;
-    mbPrevIn            = FALSE;
-    mbNextIn            = FALSE;
+    mbDrag				= FALSE;
+    mbSelection 		= FALSE;
+    mbMultiSelection	= FALSE;
+    mbUnSel 			= FALSE;
+    mbSpinDown			= FALSE;
+    mbPrevIn			= FALSE;
+    mbNextIn			= FALSE;
 
     if ( bCancel )
     {
@@ -1549,10 +1549,10 @@ void Calendar::ImplEndTracking( BOOL bCancel )
 
         if ( !bSpinDown )
         {
-            Table*  pOldSel = new Table( *mpSelectTable );
-            Date    aOldDate = maCurDate;
-            maCurDate       = maOldCurDate;
-            *mpSelectTable  = *mpOldSelectTable;
+            Table*	pOldSel = new Table( *mpSelectTable );
+            Date	aOldDate = maCurDate;
+            maCurDate		= maOldCurDate;
+            *mpSelectTable	= *mpOldSelectTable;
             HideFocus();
             ImplUpdateSelection( pOldSel );
             if ( !pOldSel->Get( aOldDate.GetDate() ) )
@@ -1616,8 +1616,8 @@ void Calendar::MouseButtonDown( const MouseEvent& rMEvt )
 {
     if ( rMEvt.IsLeft() && !mbMenuDown )
     {
-        Date    aTempDate = maCurDate;
-        USHORT  nHitTest = ImplHitTest( rMEvt.GetPosPixel(), aTempDate );
+        Date	aTempDate = maCurDate;
+        USHORT	nHitTest = ImplHitTest( rMEvt.GetPosPixel(), aTempDate );
         if ( nHitTest )
         {
             if ( nHitTest & CALENDAR_HITTEST_MONTHTITLE )
@@ -1709,10 +1709,10 @@ void Calendar::Tracking( const TrackingEvent& rTEvt )
 
 void Calendar::KeyInput( const KeyEvent& rKEvt )
 {
-    Date    aNewDate = maCurDate;
-    BOOL    bMultiSel = (mnWinStyle & (WB_RANGESELECT | WB_MULTISELECT)) != 0;
-    BOOL    bExpand = rKEvt.GetKeyCode().IsShift();
-    BOOL    bExtended = rKEvt.GetKeyCode().IsMod1();
+    Date	aNewDate = maCurDate;
+    BOOL	bMultiSel = (mnWinStyle & (WB_RANGESELECT | WB_MULTISELECT)) != 0;
+    BOOL	bExpand = rKEvt.GetKeyCode().IsShift();
+    BOOL	bExtended = rKEvt.GetKeyCode().IsMod1();
 
     switch ( rKEvt.GetKeyCode().GetCode() )
     {
@@ -1897,8 +1897,8 @@ void Calendar::RequestHelp( const HelpEvent& rHEvt )
             {
                 maCalendarWrapper.setGregorianDateTime( aDate);
                 USHORT      nWeek = (USHORT) maCalendarWrapper.getValue( i18n::CalendarFieldIndex::WEEK_OF_YEAR);
-                USHORT      nMonth = aDate.GetMonth();
-                XubString   aStr( maDayText );
+                USHORT		nMonth = aDate.GetMonth();
+                XubString	aStr( maDayText );
                 aStr.AppendAscii( ": " );
                 aStr.Append( XubString::CreateFromInt32( aDate.GetDayOfYear() ) );
                 aStr.AppendAscii( " / " );
@@ -1933,8 +1933,8 @@ void Calendar::Command( const CommandEvent& rCEvt )
     {
         if ( !mbSelection && rCEvt.IsMouseEvent() )
         {
-            Date    aTempDate = maCurDate;
-            USHORT  nHitTest = ImplHitTest( rCEvt.GetMousePosPixel(), aTempDate );
+            Date	aTempDate = maCurDate;
+            USHORT	nHitTest = ImplHitTest( rCEvt.GetMousePosPixel(), aTempDate );
             if ( nHitTest & CALENDAR_HITTEST_MONTHTITLE )
             {
                 ImplShowMenu( rCEvt.GetMousePosPixel(), aTempDate );
@@ -2136,10 +2136,10 @@ void Calendar::SetCurDate( const Date& rNewDate )
 
     if ( maCurDate != rNewDate )
     {
-        BOOL bUpdate    = IsVisible() && IsUpdateMode();
-        Date aOldDate   = maCurDate;
-        maCurDate       = rNewDate;
-        maAnchorDate    = maCurDate;
+        BOOL bUpdate	= IsVisible() && IsUpdateMode();
+        Date aOldDate	= maCurDate;
+        maCurDate		= rNewDate;
+        maAnchorDate	= maCurDate;
 
         if ( !(mnWinStyle & (WB_RANGESELECT | WB_MULTISELECT)) )
         {
@@ -2250,8 +2250,8 @@ BOOL Calendar::GetDropDate( Date& rDate ) const
 
 BOOL Calendar::GetDate( const Point& rPos, Date& rDate ) const
 {
-    Date    aDate = maCurDate;
-    USHORT  nHitTest = ImplHitTest( rPos, aDate );
+    Date	aDate = maCurDate;
+    USHORT	nHitTest = ImplHitTest( rPos, aDate );
     if ( nHitTest & CALENDAR_HITTEST_DAY )
     {
         rDate = aDate;
@@ -2270,11 +2270,11 @@ Rectangle Calendar::GetDateRect( const Date& rDate ) const
     if ( mbFormat || (rDate < maFirstDate) || (rDate > (maFirstDate+mnDayCount)) )
         return aRect;
 
-    long    nX;
-    long    nY;
-    ULONG   nDaysOff;
-    USHORT  nDayIndex;
-    Date    aDate = GetFirstMonth();
+    long	nX;
+    long	nY;
+    ULONG	nDaysOff;
+    USHORT	nDayIndex;
+    Date	aDate = GetFirstMonth();
 
     if ( rDate < aDate )
     {
@@ -2337,10 +2337,10 @@ Rectangle Calendar::GetDateRect( const Date& rDate ) const
                 {
                     if ( nDay == rDate.GetDay() )
                     {
-                        aRect.Left()    = nDayX + (nDayIndex*mnDayWidth);
-                        aRect.Top()     = nDayY;
-                        aRect.Right()   = aRect.Left()+mnDayWidth;
-                        aRect.Bottom()  = aRect.Top()+mnDayHeight;
+                        aRect.Left()	= nDayX + (nDayIndex*mnDayWidth);
+                        aRect.Top() 	= nDayY;
+                        aRect.Right()	= aRect.Left()+mnDayWidth;
+                        aRect.Bottom()	= aRect.Top()+mnDayHeight;
                         break;
                     }
                     if ( nDayIndex == 6 )
@@ -2405,9 +2405,9 @@ void Calendar::AddDateInfo( const Date& rDate, const String& rText,
     if ( !mpDateTable )
         mpDateTable = new ImplDateTable( 256, 256 );
 
-    BOOL            bChanged = FALSE;
-    ULONG           nKey = rDate.GetDate();
-    ImplDateInfo*   pDateInfo = mpDateTable->Get( nKey );
+    BOOL			bChanged = FALSE;
+    ULONG			nKey = rDate.GetDate();
+    ImplDateInfo*	pDateInfo = mpDateTable->Get( nKey );
     if ( pDateInfo )
         pDateInfo->maText = rText;
     else
@@ -2518,8 +2518,8 @@ XubString Calendar::GetDateInfoText( const Date& rDate )
     XubString aRet;
     if ( mpDateTable )
     {
-        ULONG           nKey = rDate.GetDate();
-        ImplDateInfo*   pDateInfo = mpDateTable->Get( nKey );
+        ULONG			nKey = rDate.GetDate();
+        ImplDateInfo*	pDateInfo = mpDateTable->Get( nKey );
         if ( pDateInfo )
             aRet = pDateInfo->maText;
     }
@@ -2530,7 +2530,7 @@ XubString Calendar::GetDateInfoText( const Date& rDate )
 
 BOOL Calendar::ShowDropPos( const Point& rPos, Date& rDate )
 {
-    Date    aTempDate = maCurDate;
+    Date	aTempDate = maCurDate;
     mnDragScrollHitTest = ImplHitTest( rPos, aTempDate );
 
     if ( mnDragScrollHitTest )
@@ -2598,12 +2598,12 @@ void Calendar::EndSelection()
         if ( !mbSelection )
             ReleaseMouse();
 
-        mbDrag              = FALSE;
-        mbSelection         = FALSE;
-        mbMultiSelection    = FALSE;
-        mbSpinDown          = FALSE;
-        mbPrevIn            = FALSE;
-        mbNextIn            = FALSE;
+        mbDrag				= FALSE;
+        mbSelection 		= FALSE;
+        mbMultiSelection	= FALSE;
+        mbSpinDown			= FALSE;
+        mbPrevIn			= FALSE;
+        mbNextIn			= FALSE;
     }
 }
 
@@ -2612,8 +2612,8 @@ void Calendar::EndSelection()
 Size Calendar::CalcWindowSizePixel( long nCalcMonthPerLine,
                                     long nCalcLines ) const
 {
-    XubString   a99Text( XubString( RTL_CONSTASCII_USTRINGPARAM( "99" ) ) );
-    Font        aOldFont = GetFont();
+    XubString	a99Text( XubString( RTL_CONSTASCII_USTRINGPARAM( "99" ) ) );
+    Font		aOldFont = GetFont();
 
     // Wochenanzeige beruecksichtigen
     long nWeekWidth;
@@ -2638,9 +2638,9 @@ Size Calendar::CalcWindowSizePixel( long nCalcMonthPerLine,
         ((Calendar*)this)->SetFont( aFont );
     }
 
-    Size    aSize;
-    long    n99TextWidth = GetTextWidth( a99Text );
-    long    nTextHeight = GetTextHeight();
+    Size	aSize;
+    long	n99TextWidth = GetTextWidth( a99Text );
+    long	nTextHeight = GetTextHeight();
 
     if ( mnWinStyle & WB_BOLDTEXT )
         ((Calendar*)this)->SetFont( aOldFont );
@@ -2649,7 +2649,7 @@ Size Calendar::CalcWindowSizePixel( long nCalcMonthPerLine,
     aSize.Width()  += MONTH_BORDERX*2;
     aSize.Width()  *= nCalcMonthPerLine;
 
-    aSize.Height()  = nTextHeight + TITLE_OFFY + (TITLE_BORDERY*2);
+    aSize.Height()	= nTextHeight + TITLE_OFFY + (TITLE_BORDERY*2);
     aSize.Height() += nTextHeight + WEEKDAY_OFFY;
     aSize.Height() += ((nTextHeight+DAY_OFFY)*6);
     aSize.Height() += MONTH_OFFY;
@@ -2660,35 +2660,35 @@ Size Calendar::CalcWindowSizePixel( long nCalcMonthPerLine,
 
 // =======================================================================
 
-#define CALFIELD_EXTRA_BUTTON_WIDTH         14
-#define CALFIELD_EXTRA_BUTTON_HEIGHT        8
-#define CALFIELD_SEP_X                      6
-#define CALFIELD_BORDERLINE_X               5
-#define CALFIELD_BORDER_YTOP                4
-#define CALFIELD_BORDER_Y                   5
+#define CALFIELD_EXTRA_BUTTON_WIDTH 		14
+#define CALFIELD_EXTRA_BUTTON_HEIGHT		8
+#define CALFIELD_SEP_X						6
+#define CALFIELD_BORDERLINE_X				5
+#define CALFIELD_BORDER_YTOP				4
+#define CALFIELD_BORDER_Y					5
 
 // =======================================================================
 
 class ImplCFieldFloatWin : public FloatingWindow
 {
 private:
-    Calendar*       mpCalendar;
-    PushButton*     mpTodayBtn;
-    PushButton*     mpNoneBtn;
-    FixedLine*      mpFixedLine;
+    Calendar*		mpCalendar;
+    PushButton* 	mpTodayBtn;
+    PushButton* 	mpNoneBtn;
+    FixedLine*		mpFixedLine;
 
 public:
                     ImplCFieldFloatWin( Window* pParent );
                     ~ImplCFieldFloatWin();
 
-    void            SetCalendar( Calendar* pCalendar )
+    void			SetCalendar( Calendar* pCalendar )
                         { mpCalendar = pCalendar; }
 
-    PushButton*     EnableTodayBtn( BOOL bEnable );
-    PushButton*     EnableNoneBtn( BOOL bEnable );
-    void            ArrangeButtons();
+    PushButton* 	EnableTodayBtn( BOOL bEnable );
+    PushButton* 	EnableNoneBtn( BOOL bEnable );
+    void			ArrangeButtons();
 
-    long            Notify( NotifyEvent& rNEvt );
+    long			Notify( NotifyEvent& rNEvt );
 };
 
 // -----------------------------------------------------------------------
@@ -2696,9 +2696,9 @@ public:
 ImplCFieldFloatWin::ImplCFieldFloatWin( Window* pParent ) :
     FloatingWindow( pParent, WB_BORDER | WB_SYSTEMWINDOW | WB_NOSHADOW  )
 {
-    mpCalendar  = NULL;
-    mpTodayBtn  = NULL;
-    mpNoneBtn   = NULL;
+    mpCalendar	= NULL;
+    mpTodayBtn	= NULL;
+    mpNoneBtn	= NULL;
     mpFixedLine = NULL;
 }
 
@@ -2723,8 +2723,8 @@ PushButton* ImplCFieldFloatWin::EnableTodayBtn( BOOL bEnable )
             XubString aTodayText( SvtResId( STR_SVT_CALENDAR_TODAY ) );
             mpTodayBtn->SetText( aTodayText );
             Size aSize;
-            aSize.Width()   = mpTodayBtn->GetCtrlTextWidth( mpTodayBtn->GetText() );
-            aSize.Height()  = mpTodayBtn->GetTextHeight();
+            aSize.Width()	= mpTodayBtn->GetCtrlTextWidth( mpTodayBtn->GetText() );
+            aSize.Height()	= mpTodayBtn->GetTextHeight();
             aSize.Width()  += CALFIELD_EXTRA_BUTTON_WIDTH;
             aSize.Height() += CALFIELD_EXTRA_BUTTON_HEIGHT;
             mpTodayBtn->SetSizePixel( aSize );
@@ -2755,8 +2755,8 @@ PushButton* ImplCFieldFloatWin::EnableNoneBtn( BOOL bEnable )
             XubString aNoneText( SvtResId( STR_SVT_CALENDAR_NONE ) );
             mpNoneBtn->SetText( aNoneText );
             Size aSize;
-            aSize.Width()   = mpNoneBtn->GetCtrlTextWidth( mpNoneBtn->GetText() );
-            aSize.Height()  = mpNoneBtn->GetTextHeight();
+            aSize.Width()	= mpNoneBtn->GetCtrlTextWidth( mpNoneBtn->GetText() );
+            aSize.Height()	= mpNoneBtn->GetTextHeight();
             aSize.Width()  += CALFIELD_EXTRA_BUTTON_WIDTH;
             aSize.Height() += CALFIELD_EXTRA_BUTTON_HEIGHT;
             mpNoneBtn->SetSizePixel( aSize );
@@ -2780,8 +2780,8 @@ PushButton* ImplCFieldFloatWin::EnableNoneBtn( BOOL bEnable )
 void ImplCFieldFloatWin::ArrangeButtons()
 {
     long nBtnHeight = 0;
-    long nBtnWidth  = 0;
-    Size aOutSize   = GetOutputSizePixel();
+    long nBtnWidth	= 0;
+    Size aOutSize	= GetOutputSizePixel();
     if ( mpTodayBtn && mpNoneBtn )
     {
         Size aTodayBtnSize = mpTodayBtn->GetSizePixel();
@@ -2861,11 +2861,11 @@ CalendarField::CalendarField( Window* pParent, WinBits nWinStyle ) :
     DateField( pParent, nWinStyle ),
     maDefaultDate( 0, 0, 0 )
 {
-    mpFloatWin      = NULL;
-    mpCalendar      = NULL;
+    mpFloatWin		= NULL;
+    mpCalendar		= NULL;
     mnCalendarStyle = 0;
-    mbToday         = FALSE;
-    mbNone          = FALSE;
+    mbToday 		= FALSE;
+    mbNone			= FALSE;
 }
 
 // -----------------------------------------------------------------------
@@ -2874,11 +2874,11 @@ CalendarField::CalendarField( Window* pParent, const ResId& rResId ) :
     DateField( pParent, rResId ),
     maDefaultDate( 0, 0, 0 )
 {
-    mpFloatWin      = NULL;
-    mpCalendar      = NULL;
+    mpFloatWin		= NULL;
+    mpCalendar		= NULL;
     mnCalendarStyle = 0;
-    mbToday         = FALSE;
-    mbNone          = FALSE;
+    mbToday 		= FALSE;
+    mbNone			= FALSE;
 }
 
 // -----------------------------------------------------------------------
@@ -2984,8 +2984,8 @@ BOOL CalendarField::ShowDropDown( BOOL bShow )
             pCalendar->SelectDate( aDate );
         }
         pCalendar->SetCurDate( aDate );
-        Point       aPos( GetParent()->OutputToScreenPixel( GetPosPixel() ) );
-        Rectangle   aRect( aPos, GetSizePixel() );
+        Point		aPos( GetParent()->OutputToScreenPixel( GetPosPixel() ) );
+        Rectangle	aRect( aPos, GetSizePixel() );
         aRect.Bottom() -= 1;
         mpCalendar->SetOutputSizePixel( mpCalendar->CalcWindowSizePixel() );
         mpFloatWin->SetOutputSizePixel( mpCalendar->GetSizePixel() );
diff --git a/svtools/source/control/calendar.src b/svtools/source/control/calendar.src
index 4dd31765a5c1..82f8bb0f4ef4 100755
--- a/svtools/source/control/calendar.src
+++ b/svtools/source/control/calendar.src
@@ -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
diff --git a/svtools/source/control/collatorres.cxx b/svtools/source/control/collatorres.cxx
index 9988bfdadbb9..4a4126a55350 100755
--- a/svtools/source/control/collatorres.cxx
+++ b/svtools/source/control/collatorres.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
@@ -44,31 +44,31 @@ class CollatorRessourceData
 {
     friend class CollatorRessource;
     private: /* data */
-        String          ma_Name;
-        String          ma_Translation;
+        String 			ma_Name;
+        String 			ma_Translation;
     private: /* member functions */
         CollatorRessourceData () {}
     public:
         CollatorRessourceData ( const String &r_Algorithm, const String &r_Translation)
                     : ma_Name (r_Algorithm), ma_Translation (r_Translation) {}
 
-        const String&   GetAlgorithm () const { return ma_Name; }
+        const String&	GetAlgorithm () const { return ma_Name; }
 
-        const String&   GetTranslation () const { return ma_Translation; }
+        const String&	GetTranslation () const { return ma_Translation; }
 
         ~CollatorRessourceData () {}
 
         CollatorRessourceData& operator= (const CollatorRessourceData& r_From)
-        {
-            ma_Name         = r_From.GetAlgorithm();
-            ma_Translation  = r_From.GetTranslation();
+        { 
+            ma_Name 		= r_From.GetAlgorithm(); 
+            ma_Translation 	= r_From.GetTranslation(); 
             return *this;
         }
 };
 
 // -------------------------------------------------------------------------
 //
-//  implementation of the collator-algorithm-name translation
+//  implementation of the collator-algorithm-name translation 
 //
 // -------------------------------------------------------------------------
 
@@ -116,12 +116,12 @@ CollatorRessource::GetTranslation (const String &r_Algorithm)
         nIndex += 1;
         aLocaleFreeAlgorithm = String(r_Algorithm, nIndex, r_Algorithm.Len() - nIndex);
     }
-
+    
     for (sal_uInt32 i = 0; i < COLLATOR_RESSOURCE_COUNT; i++)
     {
         if (aLocaleFreeAlgorithm == mp_Data[i].GetAlgorithm())
             return mp_Data[i].GetTranslation();
-    }
+    } 
 
     return r_Algorithm;
 }
diff --git a/svtools/source/control/ctrlbox.cxx b/svtools/source/control/ctrlbox.cxx
index d44b18a29ae1..d66ee9b9680c 100755
--- a/svtools/source/control/ctrlbox.cxx
+++ b/svtools/source/control/ctrlbox.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
@@ -523,20 +523,20 @@ void LineListBox::UpdateLineColors( void )
 {
     if( UpdatePaintLineColor() )
     {
-        ULONG       nCount = pLineList->Count();
+        ULONG		nCount = pLineList->Count();
         if( !nCount )
             return;
 
-        XubString   aStr;
-        Bitmap      aBmp;
+        XubString	aStr;
+        Bitmap		aBmp;
 
         // exchange entries which containing lines
         SetUpdateMode( FALSE );
 
-        USHORT      nSelEntry = GetSelectEntryPos();
+        USHORT		nSelEntry = GetSelectEntryPos();
         for( ULONG n = 0 ; n < nCount ; ++n )
         {
-            ImpLineListData*    pData = pLineList->GetObject( n );
+            ImpLineListData*	pData = pLineList->GetObject( n );
             if( pData )
             {
                 // exchange listbox data
@@ -558,9 +558,9 @@ void LineListBox::UpdateLineColors( void )
 
 BOOL LineListBox::UpdatePaintLineColor( void )
 {
-    BOOL                    bRet = TRUE;
-    const StyleSettings&    rSettings = GetSettings().GetStyleSettings();
-    Color                   aNewCol( rSettings.GetWindowColor().IsDark()? rSettings.GetLabelTextColor() : aColor );
+    BOOL					bRet = TRUE;
+    const StyleSettings&	rSettings = GetSettings().GetStyleSettings();
+    Color					aNewCol( rSettings.GetWindowColor().IsDark()? rSettings.GetLabelTextColor() : aColor );
 
     bRet = aNewCol != maPaintCol;
 
diff --git a/svtools/source/control/ctrlbox.src b/svtools/source/control/ctrlbox.src
index 95440c905d89..5ddedbe4098f 100755
--- a/svtools/source/control/ctrlbox.src
+++ b/svtools/source/control/ctrlbox.src
@@ -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
diff --git a/svtools/source/control/ctrldll.cxx b/svtools/source/control/ctrldll.cxx
index 2f3ff037be31..d36547f11578 100644
--- a/svtools/source/control/ctrldll.cxx
+++ b/svtools/source/control/ctrldll.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
diff --git a/svtools/source/control/ctrltool.cxx b/svtools/source/control/ctrltool.cxx
index bd965aca66a6..31c55725de92 100755
--- a/svtools/source/control/ctrltool.cxx
+++ b/svtools/source/control/ctrltool.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
@@ -95,8 +95,8 @@ class ImplFontListFontInfo : public FontInfo
     friend class FontList;
 
 private:
-    OutputDevice*           mpDevice;
-    ImplFontListFontInfo*   mpNext;
+    OutputDevice*			mpDevice;
+    ImplFontListFontInfo*	mpNext;
 
 public:
                             ImplFontListFontInfo( const FontInfo& rInfo,
@@ -106,7 +106,7 @@ public:
                                 mpDevice = pDev;
                             }
 
-    OutputDevice*           GetDevice() const { return mpDevice; }
+    OutputDevice*			GetDevice() const { return mpDevice; }
 };
 
 // ------------------------------
@@ -118,15 +118,15 @@ class ImplFontListNameInfo
     friend class FontList;
 
 private:
-    XubString               maSearchName;
-    ImplFontListFontInfo*   mpFirst;
-    USHORT                  mnType;
+    XubString				maSearchName;
+    ImplFontListFontInfo*	mpFirst;
+    USHORT					mnType;
 
                             ImplFontListNameInfo( const XubString& rSearchName ) :
                                 maSearchName( rSearchName )
                             {}
 
-    const XubString&        GetSearchName() const { return maSearchName; }
+    const XubString&		GetSearchName() const { return maSearchName; }
 };
 
 // =======================================================================
@@ -198,11 +198,11 @@ ImplFontListNameInfo* FontList::ImplFind( const XubString& rSearchName, ULONG* p
     }
 
     // Fonts in der Liste suchen
-    ImplFontListNameInfo*   pCompareData;
-    ImplFontListNameInfo*   pFoundData = NULL;
-    ULONG                   nLow = 0;
-    ULONG                   nHigh = nCnt-1;
-    ULONG                   nMid;
+    ImplFontListNameInfo*	pCompareData;
+    ImplFontListNameInfo*	pFoundData = NULL;
+    ULONG					nLow = 0;
+    ULONG					nHigh = nCnt-1;
+    ULONG					nMid;
 
     do
     {
@@ -264,7 +264,7 @@ void FontList::ImplInsertFonts( OutputDevice* pDevice, BOOL bAll,
 
     // Alle Fonts vom Device abfragen
     int n = pDevice->GetDevFontCount();
-    USHORT  i;
+    USHORT	i;
     for( i = 0; i < n; i++ )
     {
         FontInfo aFontInfo = pDevice->GetDevFont( i );
@@ -274,9 +274,9 @@ void FontList::ImplInsertFonts( OutputDevice* pDevice, BOOL bAll,
         if ( !bAll && (aFontInfo.GetType() == TYPE_RASTER) )
             continue;
 
-        XubString               aSearchName = aFontInfo.GetName();
-        ImplFontListNameInfo*   pData;
-        ULONG                   nIndex;
+        XubString				aSearchName = aFontInfo.GetName();
+        ImplFontListNameInfo*	pData;
+        ULONG					nIndex;
         ImplMakeSearchString( aSearchName );
         pData = ImplFind( aSearchName, &nIndex );
 
@@ -286,9 +286,9 @@ void FontList::ImplInsertFonts( OutputDevice* pDevice, BOOL bAll,
             {
                 ImplFontListFontInfo* pNewInfo = new ImplFontListFontInfo( aFontInfo, pDevice );
                 pData = new ImplFontListNameInfo( aSearchName );
-                pData->mpFirst      = pNewInfo;
-                pNewInfo->mpNext    = NULL;
-                pData->mnType       = 0;
+                pData->mpFirst		= pNewInfo;
+                pNewInfo->mpNext	= NULL;
+                pData->mnType		= 0;
                 Insert( (void*)pData, nIndex );
             }
         }
@@ -296,10 +296,10 @@ void FontList::ImplInsertFonts( OutputDevice* pDevice, BOOL bAll,
         {
             if ( bInsertData )
             {
-                BOOL                    bInsert = TRUE;
-                ImplFontListFontInfo*   pPrev = NULL;
-                ImplFontListFontInfo*   pTemp = pData->mpFirst;
-                ImplFontListFontInfo*   pNewInfo = new ImplFontListFontInfo( aFontInfo, pDevice );
+                BOOL					bInsert = TRUE;
+                ImplFontListFontInfo*	pPrev = NULL;
+                ImplFontListFontInfo*	pTemp = pData->mpFirst;
+                ImplFontListFontInfo*	pNewInfo = new ImplFontListFontInfo( aFontInfo, pDevice );
                 while ( pTemp )
                 {
                     StringCompare eComp = ImplCompareFontInfo( pNewInfo, pTemp );
@@ -358,14 +358,14 @@ FontList::FontList( OutputDevice* pDevice, OutputDevice* pDevice2, BOOL bAll ) :
     mpSizeAry = NULL;
 
     // Stylenamen festlegen
-    maLight         = XubString( SvtResId( STR_SVT_STYLE_LIGHT ) );
-    maLightItalic   = XubString( SvtResId( STR_SVT_STYLE_LIGHT_ITALIC ) );
-    maNormal        = XubString( SvtResId( STR_SVT_STYLE_NORMAL ) );
-    maNormalItalic  = XubString( SvtResId( STR_SVT_STYLE_NORMAL_ITALIC ) );
-    maBold          = XubString( SvtResId( STR_SVT_STYLE_BOLD ) );
-    maBoldItalic    = XubString( SvtResId( STR_SVT_STYLE_BOLD_ITALIC ) );
-    maBlack         = XubString( SvtResId( STR_SVT_STYLE_BLACK ) );
-    maBlackItalic   = XubString( SvtResId( STR_SVT_STYLE_BLACK_ITALIC ) );
+    maLight 		= XubString( SvtResId( STR_SVT_STYLE_LIGHT ) );
+    maLightItalic	= XubString( SvtResId( STR_SVT_STYLE_LIGHT_ITALIC ) );
+    maNormal		= XubString( SvtResId( STR_SVT_STYLE_NORMAL ) );
+    maNormalItalic	= XubString( SvtResId( STR_SVT_STYLE_NORMAL_ITALIC ) );
+    maBold			= XubString( SvtResId( STR_SVT_STYLE_BOLD ) );
+    maBoldItalic	= XubString( SvtResId( STR_SVT_STYLE_BOLD_ITALIC ) );
+    maBlack 		= XubString( SvtResId( STR_SVT_STYLE_BLACK ) );
+    maBlackItalic	= XubString( SvtResId( STR_SVT_STYLE_BLACK_ITALIC ) );
 
     ImplInsertFonts( pDevice, bAll, TRUE );
 
@@ -414,7 +414,7 @@ FontList* FontList::Clone() const
     FontList* pReturn = new FontList(
             mpDev, mpDev2, GetFontNameCount() == mpDev->GetDevFontCount());
     return pReturn;
-}
+}            
 
 // -----------------------------------------------------------------------
 
@@ -461,9 +461,9 @@ const XubString& FontList::GetStyleName( FontWeight eWeight, FontItalic eItalic
 
 XubString FontList::GetStyleName( const FontInfo& rInfo ) const
 {
-    XubString   aStyleName = rInfo.GetStyleName();
-    FontWeight  eWeight = rInfo.GetWeight();
-    FontItalic  eItalic = rInfo.GetItalic();
+    XubString	aStyleName = rInfo.GetStyleName();
+    FontWeight	eWeight = rInfo.GetWeight();
+    FontItalic	eItalic = rInfo.GetItalic();
 
     // Nur wenn kein StyleName gesetzt ist, geben wir einen syntetischen
     // Namen zurueck
@@ -532,15 +532,15 @@ XubString FontList::GetFontMapText( const FontInfo& rInfo ) const
     }
 
     // search for synthetic style
-    USHORT              nType       = pData->mnType;
-    const XubString&    rStyleName  = rInfo.GetStyleName();
+    USHORT				nType		= pData->mnType;
+    const XubString&	rStyleName	= rInfo.GetStyleName();
     if ( rStyleName.Len() )
     {
-        BOOL                    bNotSynthetic = FALSE;
-        BOOL                    bNoneAvailable = FALSE;
-        FontWeight              eWeight = rInfo.GetWeight();
-        FontItalic              eItalic = rInfo.GetItalic();
-        ImplFontListFontInfo*   pFontInfo = pData->mpFirst;
+        BOOL					bNotSynthetic = FALSE;
+        BOOL					bNoneAvailable = FALSE;
+        FontWeight				eWeight = rInfo.GetWeight();
+        FontItalic				eItalic = rInfo.GetItalic();
+        ImplFontListFontInfo*	pFontInfo = pData->mpFirst;
         while ( pFontInfo )
         {
             if ( (eWeight == pFontInfo->GetWeight()) &&
@@ -586,7 +586,7 @@ XubString FontList::GetFontMapText( const FontInfo& rInfo ) const
         return maMapPrinterOnly;
     }
     // Only Screen-Font?
-    else if ( (nType & (FONTLIST_FONTNAMETYPE_PRINTER | FONTLIST_FONTNAMETYPE_SCREEN)) == FONTLIST_FONTNAMETYPE_SCREEN
+    else if ( (nType & (FONTLIST_FONTNAMETYPE_PRINTER | FONTLIST_FONTNAMETYPE_SCREEN)) == FONTLIST_FONTNAMETYPE_SCREEN 
             && rInfo.GetType() == TYPE_RASTER )
     {
         if ( !maMapScreenOnly.Len() )
@@ -820,8 +820,8 @@ const long* FontList::GetSizeAry( const FontInfo& rInfo ) const
 
     // Zuerst nach dem Fontnamen suchen um das Device dann von dem
     // entsprechenden Font zu nehmen
-    OutputDevice*           pDevice = mpDev;
-    ImplFontListNameInfo*   pData = ImplFindByName( rInfo.GetName() );
+    OutputDevice*			pDevice = mpDev;
+    ImplFontListNameInfo*	pData = ImplFindByName( rInfo.GetName() );
     if ( pData )
         pDevice = pData->mpFirst->GetDevice();
 
@@ -834,9 +834,9 @@ const long* FontList::GetSizeAry( const FontInfo& rInfo ) const
     MapMode aMap( MAP_10TH_INCH, Point(), Fraction( 1, 72 ), Fraction( 1, 72 ) );
     pDevice->SetMapMode( aMap );
 
-    USHORT  i;
-    USHORT  nRealCount = 0;
-    long    nOldHeight = 0;
+    USHORT	i;
+    USHORT	nRealCount = 0;
+    long	nOldHeight = 0;
     ((FontList*)this)->mpSizeAry = new long[nDevSizeCount+1];
     for ( i = 0; i < nDevSizeCount; i++ )
     {
@@ -869,7 +869,7 @@ const long* FontList::GetStdSizeAry()
 
 struct ImplFSNameItem
 {
-    long        mnSize;
+    long		mnSize;
     const char* mszUtf8Name;
 };
 
@@ -945,7 +945,7 @@ FontSizeNames::FontSizeNames( LanguageType eLanguage )
             mnElem = sizeof(aImplTraditionalChinese) / sizeof(aImplTraditionalChinese[0]);
             break;
 #endif
-
+            
         default:
             mpArray = NULL;
             mnElem = 0;
diff --git a/svtools/source/control/ctrltool.src b/svtools/source/control/ctrltool.src
index 72420af4908e..75e039708e75 100755
--- a/svtools/source/control/ctrltool.src
+++ b/svtools/source/control/ctrltool.src
@@ -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
diff --git a/svtools/source/control/filectrl.cxx b/svtools/source/control/filectrl.cxx
index 14c0478f5327..af715de0504d 100644
--- a/svtools/source/control/filectrl.cxx
+++ b/svtools/source/control/filectrl.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
diff --git a/svtools/source/control/filectrl.src b/svtools/source/control/filectrl.src
index dc8bbb5905d6..3ac29f94da89 100644
--- a/svtools/source/control/filectrl.src
+++ b/svtools/source/control/filectrl.src
@@ -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
diff --git a/svtools/source/control/filectrl2.cxx b/svtools/source/control/filectrl2.cxx
index 2a75c5d3d7e8..912388dab0b4 100644
--- a/svtools/source/control/filectrl2.cxx
+++ b/svtools/source/control/filectrl2.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
diff --git a/svtools/source/control/fileurlbox.cxx b/svtools/source/control/fileurlbox.cxx
index 476b2864a117..75bad406fb0d 100644
--- a/svtools/source/control/fileurlbox.cxx
+++ b/svtools/source/control/fileurlbox.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
@@ -119,6 +119,6 @@ namespace svt
     }
 
 //.........................................................................
-}   // namespace svt
+}	// namespace svt
 //.........................................................................
 
diff --git a/svtools/source/control/fixedhyper.cxx b/svtools/source/control/fixedhyper.cxx
index a8877d240d4e..e1f6403dc849 100644
--- a/svtools/source/control/fixedhyper.cxx
+++ b/svtools/source/control/fixedhyper.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
diff --git a/svtools/source/control/fmtfield.cxx b/svtools/source/control/fmtfield.cxx
index 5b986dc10f9d..2efa16bcf65f 100644
--- a/svtools/source/control/fmtfield.cxx
+++ b/svtools/source/control/fmtfield.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
@@ -75,35 +75,35 @@ namespace validation
     // the states of our automat.
     enum State
     {
-        START,              // at the very start of the string
-        NUM_START,          // the very start of the number
+        START,				// at the very start of the string
+        NUM_START,			// the very start of the number
 
-        DIGIT_PRE_COMMA,    // some pre-comma digits are read, perhaps including some thousand separators
+        DIGIT_PRE_COMMA,	// some pre-comma digits are read, perhaps including some thousand separators
 
-        DIGIT_POST_COMMA,   // reading digits after the comma
-        EXPONENT_START,     // at the very start of the exponent value
+        DIGIT_POST_COMMA,	// reading digits after the comma
+        EXPONENT_START,		// at the very start of the exponent value
                             //    (means: not including the "e" which denotes the exponent)
-        EXPONENT_DIGIT,     // currently reading the digits of the exponent
+        EXPONENT_DIGIT,		// currently reading the digits of the exponent
 
-        END                 // reached the end of the string
+        END					// reached the end of the string
     };
 
     // a row in the transition table (means the set of states to be reached from a given state)
-    typedef ::std::map< sal_Unicode, State >        StateTransitions;
+    typedef ::std::map< sal_Unicode, State >		StateTransitions;
 
     // a single transition
-    typedef StateTransitions::value_type            Transition;
+    typedef StateTransitions::value_type			Transition;
 
     // the complete transition table
-    typedef ::std::map< State, StateTransitions >   TransitionTable;
+    typedef	::std::map< State, StateTransitions >	TransitionTable;
 
     // the validator class
     class NumberValidator
     {
     private:
-        TransitionTable     m_aTransitions;
-        const sal_Unicode   m_cThSep;
-        const sal_Unicode   m_cDecSep;
+        TransitionTable		m_aTransitions;
+        const sal_Unicode	m_cThSep;
+        const sal_Unicode	m_cDecSep;
 
     public:
         NumberValidator( const sal_Unicode _cThSep, const sal_Unicode _cDecSep );
@@ -341,25 +341,25 @@ FormattedField::StaticFormatter::~StaticFormatter()
 //==============================================================================
 DBG_NAME(FormattedField);
 
-#define INIT_MEMBERS()              \
-     m_aLastSelection(0,0)          \
-    ,m_dMinValue(0)                 \
-    ,m_dMaxValue(0)                 \
-    ,m_bHasMin(FALSE)               \
-    ,m_bHasMax(FALSE)               \
-    ,m_bStrictFormat(TRUE)          \
-    ,m_bValueDirty(TRUE)            \
-    ,m_bEnableEmptyField(TRUE)      \
-    ,m_bAutoColor(FALSE)            \
+#define INIT_MEMBERS()				\
+     m_aLastSelection(0,0)			\
+    ,m_dMinValue(0)					\
+    ,m_dMaxValue(0)					\
+    ,m_bHasMin(FALSE)				\
+    ,m_bHasMax(FALSE)				\
+    ,m_bStrictFormat(TRUE)			\
+    ,m_bValueDirty(TRUE)			\
+    ,m_bEnableEmptyField(TRUE)		\
+    ,m_bAutoColor(FALSE)			\
     ,m_bEnableNaN(FALSE)            \
-    ,m_dCurrentValue(0)             \
-    ,m_dDefaultValue(0)             \
-    ,m_nFormatKey(0)                \
-    ,m_pFormatter(NULL)             \
-    ,m_dSpinSize(1)                 \
-    ,m_dSpinFirst(-1000000)         \
-    ,m_dSpinLast(1000000)           \
-    ,m_bTreatAsNumber(TRUE)         \
+    ,m_dCurrentValue(0)				\
+    ,m_dDefaultValue(0)				\
+    ,m_nFormatKey(0)				\
+    ,m_pFormatter(NULL)				\
+    ,m_dSpinSize(1)					\
+    ,m_dSpinFirst(-1000000)			\
+    ,m_dSpinLast(1000000)			\
+    ,m_bTreatAsNumber(TRUE)			\
     ,m_pLastOutputColor(NULL)       \
     ,m_bUseInputStringForFormatting(false)
 
@@ -458,22 +458,22 @@ void FormattedField::SetTextFormatted(const XubString& rStr)
     USHORT nNewLen = sFormatted.Len();
     USHORT nCurrentLen = GetText().Len();
     if ((nNewLen > nCurrentLen) && (aNewSel.Max() == nCurrentLen))
-    {   // the new text is longer and the cursor was behind the last char (of the old text)
+    {	// the new text is longer and the cursor was behind the last char (of the old text)
         if (aNewSel.Min() == 0)
-        {   // the whole text was selected -> select the new text on the whole, too
+        {	// the whole text was selected -> select the new text on the whole, too
             aNewSel.Max() = nNewLen;
             if (!nCurrentLen)
-            {   // there wasn't really a previous selection (as there was no previous text), we're setting a new one -> check the selection options
+            {	// there wasn't really a previous selection (as there was no previous text), we're setting a new one -> check the selection options
                 ULONG nSelOptions = GetSettings().GetStyleSettings().GetSelectionOptions();
                 if (nSelOptions & SELECTION_OPTION_SHOWFIRST)
-                {   // selection should be from right to left -> swap min and max
+                {	// selection should be from right to left -> swap min and max
                     aNewSel.Min() = aNewSel.Max();
                     aNewSel.Max() = 0;
                 }
             }
         }
         else if (aNewSel.Max() == aNewSel.Min())
-        {   // there was no selection -> set the cursor behind the new last char
+        {	// there was no selection -> set the cursor behind the new last char
             aNewSel.Max() = nNewLen;
             aNewSel.Min() = nNewLen;
         }
@@ -481,7 +481,7 @@ void FormattedField::SetTextFormatted(const XubString& rStr)
     else if (aNewSel.Max() > nNewLen)
         aNewSel.Max() = nNewLen;
     else
-        aNewSel = aSel; // don't use the justified version
+        aNewSel = aSel;	// don't use the justified version
     SpinField::SetText(sFormatted, aNewSel);
     m_bValueDirty = FALSE;
 }
@@ -514,7 +514,7 @@ void FormattedField::SetAutoColor(BOOL _bAutomatic)
 
     m_bAutoColor = _bAutomatic;
     if (m_bAutoColor)
-    {   // if auto color is switched on, adjust the current text color, too
+    {	// if auto color is switched on, adjust the current text color, too
         if (m_pLastOutputColor)
             SetControlForeground(*m_pLastOutputColor);
         else
@@ -573,22 +573,22 @@ void FormattedField::ImplSetTextImpl(const XubString& rNew, Selection* pNewSel)
         USHORT nCurrentLen = GetText().Len();
 
         if ((nNewLen > nCurrentLen) && (aSel.Max() == nCurrentLen))
-        {   // new new text is longer and the cursor is behind the last char
+        {	// new new text is longer and the cursor is behind the last char
             if (aSel.Min() == 0)
-            {   // the whole text was selected -> select the new text on the whole, too
+            {	// the whole text was selected -> select the new text on the whole, too
                 aSel.Max() = nNewLen;
                 if (!nCurrentLen)
-                {   // there wasn't really a previous selection (as there was no previous text), we're setting a new one -> check the selection options
+                {	// there wasn't really a previous selection (as there was no previous text), we're setting a new one -> check the selection options
                     ULONG nSelOptions = GetSettings().GetStyleSettings().GetSelectionOptions();
                     if (nSelOptions & SELECTION_OPTION_SHOWFIRST)
-                    {   // selection should be from right to left -> swap min and max
+                    {	// selection should be from right to left -> swap min and max
                         aSel.Min() = aSel.Max();
                         aSel.Max() = 0;
                     }
                 }
             }
             else if (aSel.Max() == aSel.Min())
-            {   // there was no selection -> set the cursor behind the new last char
+            {	// there was no selection -> set the cursor behind the new last char
                 aSel.Max() = nNewLen;
                 aSel.Min() = nNewLen;
             }
@@ -620,7 +620,7 @@ void FormattedField::ImplSetFormatKey(ULONG nFormatKey)
     BOOL bNeedFormatter = (m_pFormatter == NULL) && (nFormatKey != 0);
     if (bNeedFormatter)
     {
-        ImplGetFormatter();     // damit wird ein Standard-Formatter angelegt
+        ImplGetFormatter();		// damit wird ein Standard-Formatter angelegt
 
         m_nFormatKey = nFormatKey;
             // kann sein, dass das in dem Standard-Formatter keinen Sinn macht, aber der nimmt dann ein Default-Format an.
@@ -825,10 +825,10 @@ void FormattedField::Commit()
 
     // do the reformat
     ReFormat();
-
+    
     // did the text change?
     if ( GetText() != sOld )
-    {   // consider the field as modified
+    {	// consider the field as modified
         Modify();
         // but we have the most recent value now
         m_bValueDirty = FALSE;
@@ -1023,7 +1023,7 @@ BOOL FormattedField::ImplGetValue(double& dNewVal)
 
     DBG_ASSERT(ImplGetFormatter() != NULL, "FormattedField::ImplGetValue : can't give you a current value without a formatter !");
 
-    sal_uInt32 nFormatKey = m_nFormatKey;   // IsNumberFormat veraendert den FormatKey ...
+    sal_uInt32 nFormatKey = m_nFormatKey;	// IsNumberFormat veraendert den FormatKey ...
 
     if (ImplGetFormatter()->IsTextFormat(nFormatKey) && m_bTreatAsNumber)
         // damit wir in einem als Text formatierten Feld trotzdem eine Eingabe wie '1,1' erkennen ...
diff --git a/svtools/source/control/headbar.cxx b/svtools/source/control/headbar.cxx
index 1ae223bebf06..096b0335bb1f 100644
--- a/svtools/source/control/headbar.cxx
+++ b/svtools/source/control/headbar.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
@@ -50,54 +50,54 @@
 
 struct ImplHeadItem
 {
-    USHORT              mnId;
-    HeaderBarItemBits   mnBits;
-    long                mnSize;
-    ULONG               mnHelpId;
-    Image               maImage;
-    XubString           maOutText;
-    XubString           maText;
-    XubString           maHelpText;
-    void*               mpUserData;
+    USHORT				mnId;
+    HeaderBarItemBits	mnBits;
+    long				mnSize;
+    ULONG				mnHelpId;
+    Image				maImage;
+    XubString			maOutText;
+    XubString			maText;
+    XubString			maHelpText;
+    void*				mpUserData;
 };
 
 DECLARE_LIST( ImplHeadItemList, ImplHeadItem* )
 
 // =======================================================================
 
-#define HEAD_ARROWSIZE1             4
-#define HEAD_ARROWSIZE2             7
+#define HEAD_ARROWSIZE1 			4
+#define HEAD_ARROWSIZE2 			7
 
-#define HEADERBAR_TEXTOFF           2
-#define HEADERBAR_ARROWOFF          5
-#define HEADERBAR_SPLITOFF          3
+#define HEADERBAR_TEXTOFF			2
+#define HEADERBAR_ARROWOFF			5
+#define HEADERBAR_SPLITOFF			3
 
-#define HEADERBAR_DRAGOFF           4
-#define HEADERBAR_DRAGOUTOFF        15
+#define HEADERBAR_DRAGOFF			4
+#define HEADERBAR_DRAGOUTOFF		15
 
-#define HEAD_HITTEST_ITEM           ((USHORT)0x0001)
-#define HEAD_HITTEST_DIVIDER        ((USHORT)0x0002)
+#define HEAD_HITTEST_ITEM			((USHORT)0x0001)
+#define HEAD_HITTEST_DIVIDER		((USHORT)0x0002)
 
 // =======================================================================
 
 void HeaderBar::ImplInit( WinBits nWinStyle )
 {
-    mpItemList      = new ImplHeadItemList;
-    mnBorderOff1    = 0;
-    mnBorderOff2    = 0;
-    mnOffset        = 0;
-    mnDX            = 0;
-    mnDY            = 0;
-    mnDragSize      = 0;
-    mnStartPos      = 0;
-    mnDragPos       = 0;
-    mnMouseOff      = 0;
-    mnCurItemId     = 0;
-    mnItemDragPos   = HEADERBAR_ITEM_NOTFOUND;
-    mbDrag          = FALSE;
-    mbItemDrag      = FALSE;
-    mbOutDrag       = FALSE;
-    mbItemMode      = FALSE;
+    mpItemList		= new ImplHeadItemList;
+    mnBorderOff1	= 0;
+    mnBorderOff2	= 0;
+    mnOffset		= 0;
+    mnDX			= 0;
+    mnDY			= 0;
+    mnDragSize		= 0;
+    mnStartPos		= 0;
+    mnDragPos		= 0;
+    mnMouseOff		= 0;
+    mnCurItemId 	= 0;
+    mnItemDragPos	= HEADERBAR_ITEM_NOTFOUND;
+    mbDrag			= FALSE;
+    mbItemDrag		= FALSE;
+    mbOutDrag		= FALSE;
+    mbItemMode		= FALSE;
 
     // StyleBits auswerten
     if ( nWinStyle & WB_DRAG )
@@ -219,10 +219,10 @@ Rectangle HeaderBar::ImplGetItemRect( USHORT nPos ) const
 USHORT HeaderBar::ImplHitTest( const Point& rPos,
                                long& nMouseOff, USHORT& nPos ) const
 {
-    ImplHeadItem*   pItem;
-    USHORT          nCount = (USHORT)mpItemList->Count();
-    BOOL            bLastFixed = TRUE;
-    long            nX = -mnOffset;
+    ImplHeadItem*	pItem;
+    USHORT			nCount = (USHORT)mpItemList->Count();
+    BOOL			bLastFixed = TRUE;
+    long			nX = -mnOffset;
 
     for ( USHORT i = 0; i < nCount; i++ )
     {
@@ -285,8 +285,8 @@ void HeaderBar::ImplInvertDrag( USHORT nStartPos, USHORT nEndPos )
 {
     Rectangle aRect1 = ImplGetItemRect( nStartPos );
     Rectangle aRect2 = ImplGetItemRect( nEndPos );
-    Point     aStartPos = aRect1.Center();
-    Point     aEndPos = aStartPos;
+    Point	  aStartPos = aRect1.Center();
+    Point	  aEndPos = aStartPos;
     Rectangle aStartRect( aStartPos.X()-2, aStartPos.Y()-2,
                           aStartPos.X()+2, aStartPos.Y()+2 );
 
@@ -357,13 +357,13 @@ void HeaderBar::ImplDrawItem( OutputDevice* pDev,
             return;
     }
 
-    ImplHeadItem*           pItem  = mpItemList->GetObject( nPos );
-    HeaderBarItemBits       nBits = pItem->mnBits;
-    const StyleSettings&    rStyleSettings = GetSettings().GetStyleSettings();
+    ImplHeadItem*			pItem  = mpItemList->GetObject( nPos );
+    HeaderBarItemBits		nBits = pItem->mnBits;
+    const StyleSettings&	rStyleSettings = GetSettings().GetStyleSettings();
 
     // Border muss nicht gemalt werden
-    aRect.Top()     += mnBorderOff1;
-    aRect.Bottom()  -= mnBorderOff2;
+    aRect.Top() 	+= mnBorderOff1;
+    aRect.Bottom()	-= mnBorderOff2;
 
     // Hintergrund loeschen
     if ( !pRect || bDrag )
@@ -658,8 +658,8 @@ void HeaderBar::ImplUpdate( USHORT nPos, BOOL bEnd, BOOL bDirect )
     {
         if ( !bDirect )
         {
-            Rectangle   aRect;
-            USHORT      nItemCount = (USHORT)(mpItemList->Count());
+            Rectangle	aRect;
+            USHORT		nItemCount = (USHORT)(mpItemList->Count());
             if ( nPos < nItemCount )
                 aRect = ImplGetItemRect( nPos );
             else
@@ -670,8 +670,8 @@ void HeaderBar::ImplUpdate( USHORT nPos, BOOL bEnd, BOOL bDirect )
             }
             if ( bEnd )
                 aRect.Right() = mnDX-1;
-            aRect.Top()     += mnBorderOff1;
-            aRect.Bottom()  -= mnBorderOff2;
+            aRect.Top() 	+= mnBorderOff1;
+            aRect.Bottom()	-= mnBorderOff2;
             Invalidate( aRect );
         }
         else
@@ -685,8 +685,8 @@ void HeaderBar::ImplUpdate( USHORT nPos, BOOL bEnd, BOOL bDirect )
                 aRect.Right() = mnDX-1;
                 if ( aRect.Left() < aRect.Right() )
                 {
-                    aRect.Top()     += mnBorderOff1;
-                    aRect.Bottom()  -= mnBorderOff2;
+                    aRect.Top() 	+= mnBorderOff1;
+                    aRect.Bottom()	-= mnBorderOff2;
                     Erase( aRect );
                 }
             }
@@ -698,8 +698,8 @@ void HeaderBar::ImplUpdate( USHORT nPos, BOOL bEnd, BOOL bDirect )
 
 void HeaderBar::ImplStartDrag( const Point& rMousePos, BOOL bCommand )
 {
-    USHORT  nPos;
-    USHORT  nHitTest = ImplHitTest( rMousePos, mnMouseOff, nPos );
+    USHORT	nPos;
+    USHORT	nHitTest = ImplHitTest( rMousePos, mnMouseOff, nPos );
     if ( nHitTest )
     {
         mbDrag = FALSE;
@@ -761,8 +761,8 @@ void HeaderBar::ImplStartDrag( const Point& rMousePos, BOOL bCommand )
 
 void HeaderBar::ImplDrag( const Point& rMousePos )
 {
-    BOOL    bNewOutDrag;
-    USHORT  nPos = GetItemPos( mnCurItemId );
+    BOOL	bNewOutDrag;
+    USHORT	nPos = GetItemPos( mnCurItemId );
 
     mnDragPos = rMousePos.X()-mnMouseOff;
     if ( mbItemMode )
@@ -916,13 +916,13 @@ void HeaderBar::ImplEndDrag( BOOL bCancel )
         }
     }
 
-    mbDrag          = FALSE;
+    mbDrag			= FALSE;
     EndDrag();
-    mnCurItemId     = 0;
-    mnItemDragPos   = HEADERBAR_ITEM_NOTFOUND;
-    mbOutDrag       = FALSE;
-    mbItemMode      = FALSE;
-    mbItemDrag      = FALSE;
+    mnCurItemId 	= 0;
+    mnItemDragPos	= HEADERBAR_ITEM_NOTFOUND;
+    mbOutDrag		= FALSE;
+    mbItemMode		= FALSE;
+    mbItemDrag		= FALSE;
 }
 
 // -----------------------------------------------------------------------
@@ -933,9 +933,9 @@ void HeaderBar::MouseButtonDown( const MouseEvent& rMEvt )
     {
         if ( rMEvt.GetClicks() == 2 )
         {
-            long    nTemp;
-            USHORT  nPos;
-            USHORT  nHitTest = ImplHitTest( rMEvt.GetPosPixel(), nTemp, nPos );
+            long	nTemp;
+            USHORT	nPos;
+            USHORT	nHitTest = ImplHitTest( rMEvt.GetPosPixel(), nTemp, nPos );
             if ( nHitTest )
             {
                 ImplHeadItem* pItem = mpItemList->GetObject( nPos );
@@ -958,10 +958,10 @@ void HeaderBar::MouseButtonDown( const MouseEvent& rMEvt )
 
 void HeaderBar::MouseMove( const MouseEvent& rMEvt )
 {
-    long            nTemp1;
-    USHORT          nTemp2;
-    PointerStyle    eStyle = POINTER_ARROW;
-    USHORT          nHitTest = ImplHitTest( rMEvt.GetPosPixel(), nTemp1, nTemp2 );
+    long			nTemp1;
+    USHORT			nTemp2;
+    PointerStyle	eStyle = POINTER_ARROW;
+    USHORT			nHitTest = ImplHitTest( rMEvt.GetPosPixel(), nTemp1, nTemp2 );
 
     if ( nHitTest & HEAD_HITTEST_DIVIDER )
         eStyle = POINTER_HSIZEBAR;
@@ -1015,10 +1015,10 @@ void HeaderBar::Paint( const Rectangle& rRect )
 void HeaderBar::Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize,
                       ULONG nFlags )
 {
-    Point       aPos  = pDev->LogicToPixel( rPos );
-    Size        aSize = pDev->LogicToPixel( rSize );
-    Rectangle   aRect( aPos, aSize );
-    Font        aFont = GetDrawPixelFont( pDev );
+    Point		aPos  = pDev->LogicToPixel( rPos );
+    Size		aSize = pDev->LogicToPixel( rSize );
+    Rectangle	aRect( aPos, aSize );
+    Font		aFont = GetDrawPixelFont( pDev );
 
     pDev->Push();
     pDev->SetMapMode();
@@ -1043,13 +1043,13 @@ void HeaderBar::Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize,
             if ( mnBorderOff1 && mnBorderOff2 )
             {
                 pDev->DrawLine( aRect.TopLeft(), Point( aRect.Left(), aRect.Bottom() ) );
-                pDev->DrawLine( Point( aRect.Right(), aRect.Top() ), Point( aRect.Right(), aRect.Bottom() ) );
+                pDev->DrawLine( Point( aRect.Right(), aRect.Top() ), Point( aRect.Right(), aRect.Bottom() ) );                
             }
         }
     }
 
     Rectangle aItemRect( aRect );
-//    aItemRect.Bottom()--;
+//	  aItemRect.Bottom()--;
     USHORT nItemCount = (USHORT)mpItemList->Count();
     for ( USHORT i = 0; i < nItemCount; i++ )
     {
@@ -1241,11 +1241,11 @@ void HeaderBar::InsertItem( USHORT nItemId, const Image& rImage,
 
     // Item anlegen und in die Liste einfuegen
     ImplHeadItem* pItem = new ImplHeadItem;
-    pItem->mnId         = nItemId;
-    pItem->mnBits       = nBits;
-    pItem->mnSize       = nSize;
-    pItem->maImage      = rImage;
-    pItem->mpUserData   = 0;
+    pItem->mnId 		= nItemId;
+    pItem->mnBits		= nBits;
+    pItem->mnSize		= nSize;
+    pItem->maImage		= rImage;
+    pItem->mpUserData	= 0;
     mpItemList->Insert( pItem, nPos );
 
     // Ausgabe updaten
@@ -1263,12 +1263,12 @@ void HeaderBar::InsertItem( USHORT nItemId, const XubString& rText,
 
     // Item anlegen und in die Liste einfuegen
     ImplHeadItem* pItem = new ImplHeadItem;
-    pItem->mnId         = nItemId;
-    pItem->mnBits       = nBits;
-    pItem->mnSize       = nSize;
-    pItem->mnHelpId     = 0;
-    pItem->maText       = rText;
-    pItem->mpUserData   = 0;
+    pItem->mnId 		= nItemId;
+    pItem->mnBits		= nBits;
+    pItem->mnSize		= nSize;
+    pItem->mnHelpId 	= 0;
+    pItem->maText		= rText;
+    pItem->mpUserData	= 0;
     mpItemList->Insert( pItem, nPos );
 
     // Ausgabe updaten
@@ -1288,13 +1288,13 @@ void HeaderBar::InsertItem( USHORT nItemId,
 
     // Item anlegen und in die Liste einfuegen
     ImplHeadItem* pItem = new ImplHeadItem;
-    pItem->mnId         = nItemId;
-    pItem->mnBits       = nBits;
-    pItem->mnSize       = nSize;
-    pItem->mnHelpId     = 0;
-    pItem->maImage      = rImage;
-    pItem->maText       = rText;
-    pItem->mpUserData   = 0;
+    pItem->mnId 		= nItemId;
+    pItem->mnBits		= nBits;
+    pItem->mnSize		= nSize;
+    pItem->mnHelpId 	= 0;
+    pItem->maImage		= rImage;
+    pItem->maText		= rText;
+    pItem->mpUserData	= 0;
     mpItemList->Insert( pItem, nPos );
 
     // Ausgabe updaten
diff --git a/svtools/source/control/hyperlabel.cxx b/svtools/source/control/hyperlabel.cxx
index 10ef8cdcfadf..b3b861de68a2 100644
--- a/svtools/source/control/hyperlabel.cxx
+++ b/svtools/source/control/hyperlabel.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
@@ -49,7 +49,7 @@ namespace svt
     class FontChanger
     {
     protected:
-        OutputDevice*   m_pDev;
+        OutputDevice*	m_pDev;
 
     public:
         FontChanger( OutputDevice* _pDev, const Font& _rNewFont )
@@ -73,7 +73,7 @@ namespace svt
         sal_Bool            bInteractive;
         Size                m_aMinSize;
         sal_Bool            m_bHyperMode;
-
+        
         HyperLabelImpl();
     };
 
@@ -88,7 +88,7 @@ namespace svt
     {
         implInit();
     }
-
+    
     HyperLabel::HyperLabel( Window* _pParent, WinBits _nWinStyle )
         :FixedText( _pParent, _nWinStyle )
         ,m_pImpl( new HyperLabelImpl )
@@ -100,7 +100,7 @@ namespace svt
     sal_Int32 HyperLabel::GetLogicWidth()
     {
         Size rLogicLocSize = PixelToLogic( m_pImpl->m_aMinSize, MAP_APPFONT );
-        return rLogicLocSize.Width();
+        return rLogicLocSize.Width();	
     }
 
 
@@ -109,7 +109,7 @@ namespace svt
         m_pImpl->m_aMinSize = FixedText::CalcMinimumSize( nMaxWidth );
         // the MinimumSize is used to size the FocusRectangle
         // and for the MouseMove method
-        m_pImpl->m_aMinSize.Height() += 2;
+        m_pImpl->m_aMinSize.Height() += 2; 
         m_pImpl->m_aMinSize.Width() += 1;
         return m_pImpl->m_aMinSize;
     }
@@ -125,14 +125,14 @@ namespace svt
         Show();
     }
 
-    void HyperLabel::ToggleBackgroundColor( const Color& _rGBColor )
-    {
+    void HyperLabel::ToggleBackgroundColor( const Color& _rGBColor ) 
+    { 
         const StyleSettings& rStyleSettings = GetSettings().GetStyleSettings();
-        SetControlBackground( _rGBColor );
+        SetControlBackground( _rGBColor ); 
         if (_rGBColor == COL_TRANSPARENT)
-            SetTextColor( rStyleSettings.GetFieldTextColor( ) );
+            SetTextColor( rStyleSettings.GetFieldTextColor( ) );			
         else
-            SetTextColor( rStyleSettings.GetHighlightTextColor( ) );
+            SetTextColor( rStyleSettings.GetHighlightTextColor( ) );			
     }
 
 
@@ -140,7 +140,7 @@ namespace svt
     {
            Font aFont = GetControlFont( );
         const Color aColor = GetTextColor();
-
+        
         if (rMEvt.IsLeaveWindow())
         {
             DeactivateHyperMode(aFont, aColor);
@@ -158,7 +158,7 @@ namespace svt
             }
             DeactivateHyperMode(aFont, aColor);
         }
-    }
+    } 
 
     void HyperLabel::ActivateHyperMode(Font aFont, const Color aColor)
     {
@@ -166,7 +166,7 @@ namespace svt
         m_pImpl->m_bHyperMode = sal_True;
         SetPointer( POINTER_REFHAND );
         SetControlFont( aFont);
-        SetTextColor( aColor);
+        SetTextColor( aColor); 
 
     }
 
@@ -176,7 +176,7 @@ namespace svt
         aFont.SetUnderline(UNDERLINE_NONE);
         SetPointer( POINTER_ARROW );
         SetControlFont( aFont);
-        SetTextColor( aColor);
+        SetTextColor( aColor); 
     }
 
     void HyperLabel::MouseButtonDown( const MouseEvent& )
@@ -185,7 +185,7 @@ namespace svt
         {
             maClickHdl.Call( this );
         }
-    }
+    } 
 
     void HyperLabel::GetFocus()
     {
@@ -248,23 +248,23 @@ namespace svt
     {
         const StyleSettings& rStyleSettings = GetSettings().GetStyleSettings();
         FixedText::DataChanged( rDCEvt );
-        if ((( rDCEvt.GetType() == DATACHANGED_SETTINGS )   ||
-            ( rDCEvt.GetType() == DATACHANGED_DISPLAY   ))  &&
-            ( rDCEvt.GetFlags() & SETTINGS_STYLE        ))
+        if ((( rDCEvt.GetType() == DATACHANGED_SETTINGS	)	||
+            ( rDCEvt.GetType() == DATACHANGED_DISPLAY	))	&&
+            ( rDCEvt.GetFlags() & SETTINGS_STYLE		))
         {
             const Color& rGBColor = GetControlBackground();
             if (rGBColor == COL_TRANSPARENT)
-                SetTextColor( rStyleSettings.GetFieldTextColor( ) );
+                SetTextColor( rStyleSettings.GetFieldTextColor( ) );			
             else
             {
                 SetControlBackground(rStyleSettings.GetHighlightColor());
-                SetTextColor( rStyleSettings.GetHighlightTextColor( ) );
+                SetTextColor( rStyleSettings.GetHighlightTextColor( ) );			
             }
             Invalidate();
         }
     }
 
 //.........................................................................
-}   // namespace svt
+}	// namespace svt
 //.........................................................................
 
diff --git a/svtools/source/control/indexentryres.cxx b/svtools/source/control/indexentryres.cxx
index 5a79edab5b77..b50004fc36d5 100755
--- a/svtools/source/control/indexentryres.cxx
+++ b/svtools/source/control/indexentryres.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
@@ -44,24 +44,24 @@ class IndexEntryRessourceData
 {
     friend class IndexEntryRessource;
     private: /* data */
-        String  ma_Name;
-        String  ma_Translation;
+        String 	ma_Name;
+        String 	ma_Translation;
     private: /* member functions */
         IndexEntryRessourceData () {}
     public:
         IndexEntryRessourceData ( const String &r_Algorithm, const String &r_Translation)
                 : ma_Name (r_Algorithm), ma_Translation (r_Translation) {}
 
-        const String&   GetAlgorithm () const { return ma_Name; }
+        const String&	GetAlgorithm () const { return ma_Name; }
 
-        const String&   GetTranslation () const { return ma_Translation; }
+        const String&	GetTranslation () const { return ma_Translation; }
 
         ~IndexEntryRessourceData () {}
 
         IndexEntryRessourceData& operator= (const IndexEntryRessourceData& r_From)
         {
-            ma_Name         = r_From.GetAlgorithm();
-            ma_Translation  = r_From.GetTranslation();
+            ma_Name 		= r_From.GetAlgorithm();
+            ma_Translation 	= r_From.GetTranslation();
             return *this;
         }
 };
diff --git a/svtools/source/control/inettbc.cxx b/svtools/source/control/inettbc.cxx
index 02a578629039..6b527a913680 100644
--- a/svtools/source/control/inettbc.cxx
+++ b/svtools/source/control/inettbc.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
@@ -104,7 +104,7 @@ public:
     SvStringsDtor*                  pURLs;
     SvStringsDtor*                  pCompletions;
     const IUrlFilter*               pUrlFilter;
-    ::std::vector< WildCard >       m_aFilters;
+    ::std::vector< WildCard >		m_aFilters;
 
     static sal_Bool TildeParsing( String& aText, String& aBaseUrl );
 
@@ -122,18 +122,18 @@ class SvtMatchContext_Impl : public ::vos::OThread
 {
     static ::vos::OMutex*           pDirMutex;
 
-    SvStringsDtor                   aPickList;
+    SvStringsDtor 					aPickList;
     SvStringsDtor*                  pCompletions;
     SvStringsDtor*                  pURLs;
-    svtools::AsynchronLink          aLink;
-    String                          aBaseURL;
+    svtools::AsynchronLink 			aLink;
+    String							aBaseURL;
     String                          aText;
-    SvtURLBox*                      pBox;
+    SvtURLBox* 						pBox;
     BOOL                            bStop;
-    BOOL                            bOnlyDirectories;
-    BOOL                            bNoSelection;
+    BOOL							bOnlyDirectories;
+    BOOL							bNoSelection;
 
-    DECL_STATIC_LINK(               SvtMatchContext_Impl, Select_Impl, void* );
+    DECL_STATIC_LINK( 				SvtMatchContext_Impl, Select_Impl, void* );
 
     virtual void SAL_CALL           onTerminated( );
     virtual void SAL_CALL           run();
@@ -147,7 +147,7 @@ public:
 
                                     SvtMatchContext_Impl( SvtURLBox* pBoxP, const String& rText );
                                     ~SvtMatchContext_Impl();
-    void                            Stop();
+    void          					Stop();
 };
 
 ::vos::OMutex* SvtMatchContext_Impl::pDirMutex = 0;
@@ -424,9 +424,9 @@ void SvtMatchContext_Impl::ReadFolder( const String& rURL,
         try
         {
             uno::Reference< XDynamicResultSet > xDynResultSet;
-            ResultSetInclude eInclude = INCLUDE_FOLDERS_AND_DOCUMENTS;
+            ResultSetInclude eInclude =	INCLUDE_FOLDERS_AND_DOCUMENTS;
             if ( bOnlyDirectories )
-                eInclude =  INCLUDE_FOLDERS_ONLY;
+                eInclude =	INCLUDE_FOLDERS_ONLY;
 
             xDynResultSet = aCnt.createDynamicCursor( aProps, eInclude );
 
@@ -560,7 +560,7 @@ String SvtURLBox::ParseSmart( String aText, String aBaseURL, String aWorkDir )
             // HRO: I suppose this hack should only be done for Windows !!!???
 #ifdef WNT
             // HRO: INetURLObject::smatRel2Abs does not recognize '\\' as a relative path
-            //      but in case of "\\\\" INetURLObject is right - this is an absolute path !
+            //		but in case of "\\\\" INetURLObject is right - this is an absolute path !
 
             if( aText.Search( '\\' ) == 0 && (aText.Len() < 2 || aText.GetChar( 1 ) != '\\') )
             {
diff --git a/svtools/source/control/prgsbar.cxx b/svtools/source/control/prgsbar.cxx
index b67202e9c1fc..fa1a799e0e61 100644
--- a/svtools/source/control/prgsbar.cxx
+++ b/svtools/source/control/prgsbar.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
@@ -40,15 +40,15 @@
 
 // =======================================================================
 
-#define PROGRESSBAR_OFFSET          3
-#define PROGRESSBAR_WIN_OFFSET      2
+#define PROGRESSBAR_OFFSET			3
+#define PROGRESSBAR_WIN_OFFSET		2
 
 // =======================================================================
 
 void ProgressBar::ImplInit()
 {
-    mnPercent   = 0;
-    mbCalcNew   = TRUE;
+    mnPercent	= 0;
+    mbCalcNew	= TRUE;
 
     ImplInitSettings( TRUE, TRUE, TRUE );
 }
diff --git a/svtools/source/control/roadmap.cxx b/svtools/source/control/roadmap.cxx
index 7cf88816199f..fdc098ea96e8 100644
--- a/svtools/source/control/roadmap.cxx
+++ b/svtools/source/control/roadmap.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
@@ -69,7 +69,7 @@ namespace svt
     public:
         IDLabel( Window* _pParent, WinBits _nWinStyle = 0 );
         ~IDLabel( );
-        virtual void    DataChanged( const DataChangedEvent& rDCEvt );
+        virtual void	DataChanged( const DataChangedEvent& rDCEvt );
     };
 
     //=====================================================================
@@ -78,7 +78,7 @@ namespace svt
     class ColorChanger
     {
     protected:
-        OutputDevice*   m_pDev;
+        OutputDevice*	m_pDev;
 
     public:
         ColorChanger( OutputDevice* _pDev, const Color& _rNewLineColor, const Color& _rNewFillColor )
@@ -108,33 +108,33 @@ namespace svt
     public:
         RoadmapItem( ORoadmap& _rParent, const Size& _rItemPlayground );
         ~RoadmapItem( );
+        
+        void					SetID( sal_Int16 _ID );
+        sal_Int16				GetID() const;
 
-        void                    SetID( sal_Int16 _ID );
-        sal_Int16               GetID() const;
-
-        void                    SetIndex( ItemIndex _Index );
+        void					SetIndex( ItemIndex _Index );
         ItemIndex               GetIndex() const;
 
-        void                    SetLabel( const ::rtl::OUString& _rText );
-        ::rtl::OUString         GetLabel( );
+        void					SetLabel( const ::rtl::OUString& _rText );
+        ::rtl::OUString			GetLabel( );
 
-        void                    Update( ItemIndex _RMIndex, const ::rtl::OUString& _rText );
+        void					Update( ItemIndex _RMIndex, const ::rtl::OUString& _rText );
+        
+        void					SetPosition( RoadmapItem* OldHyperLabel );
 
-        void                    SetPosition( RoadmapItem* OldHyperLabel );
+        void					ToggleBackgroundColor( const Color& _rGBColor );
+        void					SetInteractive( sal_Bool _bInteractive );
 
-        void                    ToggleBackgroundColor( const Color& _rGBColor );
-        void                    SetInteractive( sal_Bool _bInteractive );
-
-        void                    SetClickHdl( const Link& rLink );
-        const Link&             GetClickHdl() const;
-        void                    SetZOrder( RoadmapItem* pRefRoadmapHyperLabel, USHORT nFlags );
-        void                    Enable( BOOL bEnable = TRUE);
-        BOOL                    IsEnabled() const;
-        void                    GrabFocus();
+        void					SetClickHdl( const Link& rLink );
+        const Link&				GetClickHdl() const;
+        void					SetZOrder( RoadmapItem* pRefRoadmapHyperLabel, USHORT nFlags );
+        void					Enable( BOOL bEnable = TRUE);
+        BOOL					IsEnabled() const;
+        void					GrabFocus();
 
         bool                    Contains( const Window* _pWindow ) const;
-
-        HyperLabel*             GetDescriptionHyperLabel() const { return mpDescription; }
+        
+        HyperLabel*				GetDescriptionHyperLabel() const { return mpDescription; }
 
     private:
         void                    ImplUpdateIndex( const ItemIndex _nIndex );
@@ -149,7 +149,7 @@ namespace svt
     protected:
         const ORoadmap&     m_rAntiImpl;
         Link                m_aSelectHdl;
-        BitmapEx            m_aPicture;
+        BitmapEx	        m_aPicture;
         HL_Vector           m_aRoadmapSteps;
         ItemId              m_iCurItemID;
         sal_Bool            m_bInteractive;
@@ -167,10 +167,10 @@ namespace svt
 
         RoadmapItem* InCompleteHyperLabel;
 
-        void                addHyperLabel( RoadmapItem*  _rRoadmapStep ) { m_aRoadmapSteps.push_back(_rRoadmapStep); }
+        void			    addHyperLabel( RoadmapItem*  _rRoadmapStep ) { m_aRoadmapSteps.push_back(_rRoadmapStep); }
 
-        HL_Vector&          getHyperLabels() { return m_aRoadmapSteps; }
-        const HL_Vector&    getHyperLabels() const { return m_aRoadmapSteps; }
+        HL_Vector&	        getHyperLabels() { return m_aRoadmapSteps; }
+        const HL_Vector&	getHyperLabels() const { return m_aRoadmapSteps; }
 
         void                insertHyperLabel( ItemIndex _Index, RoadmapItem* _rRoadmapStep ) { m_aRoadmapSteps.insert( m_aRoadmapSteps.begin() + _Index, _rRoadmapStep ); }
 
@@ -185,11 +185,11 @@ namespace svt
         void                setComplete(const sal_Bool _bComplete) {m_bComplete = _bComplete; }
         sal_Bool            isComplete() const { return m_bComplete; };
 
-        void                setPicture( const BitmapEx& _rPic ) { m_aPicture = _rPic; }
-        const BitmapEx&     getPicture( ) const { return m_aPicture; }
+        void			    setPicture( const BitmapEx& _rPic ) { m_aPicture = _rPic; }
+        const BitmapEx&	    getPicture( ) const { return m_aPicture; }
 
-        void                setSelectHdl( const Link& _rHdl ) { m_aSelectHdl = _rHdl; }
-        const Link&         getSelectHdl( ) const { return m_aSelectHdl; }
+        void			    setSelectHdl( const Link& _rHdl ) { m_aSelectHdl = _rHdl; }
+        const Link&	        getSelectHdl( ) const { return m_aSelectHdl; }
 
         void                initItemSize();
         const Size&         getItemSize() const { return m_aItemSizePixel; }
@@ -765,9 +765,9 @@ namespace svt
     //---------------------------------------------------------------------
     void ORoadmap::DataChanged( const DataChangedEvent& rDCEvt )
     {
-        if ((( rDCEvt.GetType() == DATACHANGED_SETTINGS )   ||
-            ( rDCEvt.GetType() == DATACHANGED_DISPLAY   ))  &&
-            ( rDCEvt.GetFlags() & SETTINGS_STYLE        ))
+        if ((( rDCEvt.GetType() == DATACHANGED_SETTINGS	)	||
+            ( rDCEvt.GetType() == DATACHANGED_DISPLAY	))	&&
+            ( rDCEvt.GetFlags() & SETTINGS_STYLE		))
         {
             const StyleSettings& rStyleSettings = GetSettings().GetStyleSettings();
             SetBackground( Wallpaper( rStyleSettings.GetFieldColor() ) );
@@ -1001,9 +1001,9 @@ namespace svt
     {
         const StyleSettings& rStyleSettings = GetSettings().GetStyleSettings();
         FixedText::DataChanged( rDCEvt );
-        if ((( rDCEvt.GetType() == DATACHANGED_SETTINGS )   ||
-            ( rDCEvt.GetType() == DATACHANGED_DISPLAY   ))  &&
-            ( rDCEvt.GetFlags() & SETTINGS_STYLE        ))
+        if ((( rDCEvt.GetType() == DATACHANGED_SETTINGS	)	||
+            ( rDCEvt.GetType() == DATACHANGED_DISPLAY	))	&&
+            ( rDCEvt.GetFlags() & SETTINGS_STYLE		))
         {
             const Color& rGBColor = GetControlBackground();
             if (rGBColor == COL_TRANSPARENT)
@@ -1021,5 +1021,5 @@ namespace svt
 
 
 //.........................................................................
-}   // namespace svt
+}	// namespace svt
 //.........................................................................
diff --git a/svtools/source/control/ruler.cxx b/svtools/source/control/ruler.cxx
index 6fcbd92597ba..ba56da2744d1 100644
--- a/svtools/source/control/ruler.cxx
+++ b/svtools/source/control/ruler.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
@@ -81,7 +81,9 @@
 #define RULER_UNIT_MILE     6
 #define RULER_UNIT_POINT    7
 #define RULER_UNIT_PICA     8
-#define RULER_UNIT_COUNT    9
+#define RULER_UNIT_CHAR	    9
+#define RULER_UNIT_LINE    10
+#define RULER_UNIT_COUNT    11
 
 // -----------------
 // - ImplRulerData -
@@ -145,7 +147,9 @@ static ImplRulerUnitData aImplRulerUnitTab[RULER_UNIT_COUNT] =
 { MAP_100TH_INCH,     1200,   120,    600,   1200,   30480, 3, "'"      }, // FOOT
 { MAP_10TH_INCH,    633600, 63360, 316800, 633600, 1609344, 4, " miles" }, // MILE
 { MAP_POINT,             1,    12,     12,     36,     353, 2, " pt"    }, // POINT
-{ MAP_100TH_MM,        423,   423,    423,    846,     423, 3, " pi"    }  // PICA
+{ MAP_100TH_MM,        423,   423,    423,    846,     423, 3, " pi"    }, // PICA
+{ MAP_100TH_MM,	       371,   371,    371,    743,     371, 3, " ch"    }, // CHAR
+{ MAP_100TH_MM,        551,   551,    551,   1102,     551, 3, " li"    }  // LINE
 };
 
 // =======================================================================
@@ -264,6 +268,8 @@ void Ruler::ImplInit( WinBits nWinBits )
     mnExtraStyle    = 0;                    // Style des Extra-Feldes
     mnExtraClicks   = 0;                    // Click-Anzahl fuer Extra-Feld
     mnExtraModifier = 0;                    // Modifier-Tasten beim Click im Extrafeld
+    mnCharWidth     = 371;
+    mnLineHeight    = 551;
     mbCalc          = TRUE;                 // Muessen Pagebreiten neu berechnet werden
     mbFormat        = TRUE;                 // Muss neu ausgegeben werden
     mbDrag          = FALSE;                // Sind wir im Drag-Modus
@@ -467,6 +473,29 @@ void Ruler::ImplDrawTicks( long nMin, long nMax, long nStart, long nCenter )
     long    nY;
     BOOL    bNoTicks = FALSE;
 
+    //Amelia
+    long    nTickUnit ;
+    long    nTick2 ;
+    if ( mnUnitIndex == RULER_UNIT_CHAR )
+    {
+        if ( mnCharWidth == 0 )
+            mnCharWidth = 371;
+        nTick3 = mnCharWidth*2;
+        nTickCount = mnCharWidth;
+        nTickUnit = mnCharWidth;
+        nTick2 = mnCharWidth;
+    }
+    else if ( mnUnitIndex == RULER_UNIT_LINE )
+    {
+        if ( mnLineHeight == 0 )
+            mnLineHeight = 551;
+        nTick3 = mnLineHeight*2;
+        nTickCount = mnLineHeight;
+        nTickUnit = mnLineHeight;
+        nTick2 = mnLineHeight;
+    }
+    aPixSize = maVirDev.LogicToPixel( Size( nTick3, nTick3 ), maMapMode );
+
     // Groessenvorberechnung
     BOOL bVertRight = FALSE;
     if ( mnWinStyle & WB_HORZ )
@@ -487,7 +516,11 @@ void Ruler::ImplDrawTicks( long nMin, long nMax, long nStart, long nCenter )
     long nMaxWidth = maVirDev.PixelToLogic( Size( mpData->nPageWidth, 0 ), maMapMode ).Width();
     if ( nMaxWidth < 0 )
         nMaxWidth *= -1;
-    nMaxWidth /= aImplRulerUnitTab[mnUnitIndex].nTickUnit;
+// Amelia
+    if (( mnUnitIndex == RULER_UNIT_CHAR ) || ( mnUnitIndex == RULER_UNIT_LINE ))
+        nMaxWidth /= nTickUnit;
+    else
+        nMaxWidth /= aImplRulerUnitTab[mnUnitIndex].nTickUnit;
     UniString aNumStr( UniString::CreateFromInt32( nMaxWidth ) );
     long nTxtWidth = GetTextWidth( aNumStr );
     if ( (nTxtWidth*2) > nTickWidth )
@@ -567,7 +600,11 @@ void Ruler::ImplDrawTicks( long nMin, long nMax, long nStart, long nCenter )
                 // Tick3 - Ausgabe (Text)
                 if ( !(nTick % nTick3) )
                 {
-                    aNumStr = UniString::CreateFromInt32( nTick / aImplRulerUnitTab[mnUnitIndex].nTickUnit );
+                    //aNumStr = UniString::CreateFromInt32( nTick / aImplRulerUnitTab[mnUnitIndex].nTickUnit );
+                    if ( ( mnUnitIndex == RULER_UNIT_CHAR ) || ( mnUnitIndex == RULER_UNIT_LINE ) )
+                        aNumStr = UniString::CreateFromInt32( nTick / nTickUnit );
+                    else
+                        aNumStr = UniString::CreateFromInt32( nTick / aImplRulerUnitTab[mnUnitIndex].nTickUnit );
                     nTxtWidth2 = GetTextWidth( aNumStr )/2;
 
                     nX = nStart+n;
@@ -594,7 +631,10 @@ void Ruler::ImplDrawTicks( long nMin, long nMax, long nStart, long nCenter )
                 // Tick/Tick2 - Ausgabe (Striche)
                 else
                 {
-                    if ( !(nTick % aImplRulerUnitTab[mnUnitIndex].nTick2) )
+        /// Amelia
+                    if ( ( mnUnitIndex != RULER_UNIT_CHAR ) && ( mnUnitIndex != RULER_UNIT_LINE ) )
+                        nTick2 = aImplRulerUnitTab[mnUnitIndex].nTick2;
+                    if ( !(nTick % nTick2 ) )
                         nTickWidth = RULER_TICK2_WIDTH;
                     else
                         nTickWidth = RULER_TICK1_WIDTH;
@@ -1470,16 +1510,16 @@ void Ruler::ImplDraw()
             if(mpData->bTextRTL)
                 aVirDevSize.Width() -= maExtraRect.GetWidth();
 
-//  else
-//      aVirDevSize.Width() -= mnVirOff;
+//	else
+//		aVirDevSize.Width() -= mnVirOff;
             aOffPos.Y() = RULER_OFF;
         }
         else
         {
             aOffPos.X() = RULER_OFF;
             aOffPos.Y() = mnVirOff;
-//  else
-//      aVirDevSize.Height() -= mnVirOff;
+//	else
+//		aVirDevSize.Height() -= mnVirOff;
         }
         DrawOutDev( aOffPos, aVirDevSize, Point(), aVirDevSize, maVirDev );
 
@@ -2804,6 +2844,12 @@ void Ruler::SetUnit( FieldUnit eNewUnit )
             case FUNIT_PICA:
                 mnUnitIndex = RULER_UNIT_PICA;
                 break;
+            case FUNIT_CHAR:
+                mnUnitIndex = RULER_UNIT_CHAR;
+                break;
+            case FUNIT_LINE:
+                mnUnitIndex = RULER_UNIT_LINE;
+                break;
             default:
 #ifdef DBG_UTIL
                 DBG_ERRORFILE( "Ruler::SetUnit() - Wrong Unit" );
@@ -3179,3 +3225,11 @@ const RulerBorder*  Ruler::GetBorders() const { return mpData->pBorders; }
 USHORT              Ruler::GetIndentCount() const { return mpData->nIndents; }
 const RulerIndent*  Ruler::GetIndents() const { return mpData->pIndents; }
 
+/* ---------------------------------------------------
+ *
+ * ---------------------------------------------------*/
+void Ruler::DrawTicks()
+{
+    mbFormat = TRUE;
+    ImplDraw();
+}
diff --git a/svtools/source/control/scriptedtext.cxx b/svtools/source/control/scriptedtext.cxx
index 2067e6d245f0..26dad570acda 100644
--- a/svtools/source/control/scriptedtext.cxx
+++ b/svtools/source/control/scriptedtext.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
diff --git a/svtools/source/control/scrwin.cxx b/svtools/source/control/scrwin.cxx
index eb47d2c780ad..53c9f1450077 100644
--- a/svtools/source/control/scrwin.cxx
+++ b/svtools/source/control/scrwin.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
@@ -191,21 +191,21 @@ void __EXPORT ScrollableWindow::Resize()
     const long nScrSize = GetSettings().GetStyleSettings().GetScrollBarSize();
     BOOL bVVisible = FALSE; // by default no vertical-ScrollBar
     BOOL bHVisible = FALSE; // by default no horizontal-ScrollBar
-    BOOL bChanged;          // determines if a visiblility was changed
+    BOOL bChanged;			// determines if a visiblility was changed
     do
     {
         bChanged = FALSE;
 
         // does we need a vertical ScrollBar
         if ( aOutPixSz.Width() < aTotPixSz.Width() && !bHVisible )
-        {   bHVisible = TRUE;
+        {	bHVisible = TRUE;
             aOutPixSz.Height() -= nScrSize;
             bChanged = TRUE;
         }
 
         // does we need a horizontal ScrollBar
         if ( aOutPixSz.Height() < aTotPixSz.Height() && !bVVisible )
-        {   bVVisible = TRUE;
+        {	bVVisible = TRUE;
             aOutPixSz.Width() -= nScrSize;
             bChanged = TRUE;
         }
@@ -349,7 +349,7 @@ void ScrollableWindow::SetVisibleSize( const Size& rNewSize )
 
     // get maximum rectangle for us from our parent-window (subst our border!)
     Rectangle aMax( Point(0, 0), GetParent()->GetOutputSizePixel() );
-    aMax.Left() -=  ( Window::GetSizePixel().Width() -
+    aMax.Left() -=	( Window::GetSizePixel().Width() -
                     Window::GetOutputSizePixel().Width() );
     aMax.Bottom() -= (Window::GetSizePixel().Height() -
                      Window::GetOutputSizePixel().Height());
@@ -358,7 +358,7 @@ void ScrollableWindow::SetVisibleSize( const Size& rNewSize )
     BOOL bHScroll = FALSE;
     const long nScrSize = GetSettings().GetStyleSettings().GetScrollBarSize();
     if ( aWill.Width() < aWish.GetSize().Width() )
-    {   bHScroll = TRUE;
+    {	bHScroll = TRUE;
         aWill.Height() =
             Min( aWill.Height()+nScrSize, aMax.GetSize().Height() );
     }
diff --git a/svtools/source/control/stdctrl.cxx b/svtools/source/control/stdctrl.cxx
index 14c8cade3092..07cfe0786764 100644
--- a/svtools/source/control/stdctrl.cxx
+++ b/svtools/source/control/stdctrl.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
diff --git a/svtools/source/control/stdmenu.cxx b/svtools/source/control/stdmenu.cxx
index 95b6d3fbd5c6..eecc0f6d23c8 100644
--- a/svtools/source/control/stdmenu.cxx
+++ b/svtools/source/control/stdmenu.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
@@ -203,25 +203,25 @@ void FontStyleMenu::Fill( const XubString& rName, const FontList* pList )
     sal_Handle hFontInfo = pList->GetFirstFontInfo( rName );
     if ( hFontInfo )
     {
-        XubString   aStyleText;
-        USHORT      nPos = 0;
-        USHORT      nId = FONTSTYLEMENU_FIRSTID;
-        FontWeight  eLastWeight = WEIGHT_DONTKNOW;
-        FontItalic  eLastItalic = ITALIC_NONE;
-        FontWidth   eLastWidth = WIDTH_DONTKNOW;
-        BOOL        bNormal = FALSE;
-        BOOL        bItalic = FALSE;
-        BOOL        bBold = FALSE;
-        BOOL        bBoldItalic = FALSE;
-        BOOL        bInsert = FALSE;
-        FontInfo    aInfo;
+        XubString	aStyleText;
+        USHORT		nPos = 0;
+        USHORT		nId = FONTSTYLEMENU_FIRSTID;
+        FontWeight	eLastWeight = WEIGHT_DONTKNOW;
+        FontItalic	eLastItalic = ITALIC_NONE;
+        FontWidth	eLastWidth = WIDTH_DONTKNOW;
+        BOOL		bNormal = FALSE;
+        BOOL		bItalic = FALSE;
+        BOOL		bBold = FALSE;
+        BOOL		bBoldItalic = FALSE;
+        BOOL		bInsert = FALSE;
+        FontInfo	aInfo;
         while ( hFontInfo )
         {
             aInfo = pList->GetFontInfo( hFontInfo );
 
-            FontWeight  eWeight = aInfo.GetWeight();
-            FontItalic  eItalic = aInfo.GetItalic();
-            FontWidth   eWidth = aInfo.GetWidthType();
+            FontWeight	eWeight = aInfo.GetWeight();
+            FontItalic	eItalic = aInfo.GetItalic();
+            FontWidth	eWidth = aInfo.GetWidthType();
             // Only if the attributes are different, we insert the
             // Font to avoid double Entries in different languages
             if ( (eWeight != eLastWeight) || (eItalic != eLastItalic) ||
@@ -330,7 +330,7 @@ void FontStyleMenu::Fill( const XubString& rName, const FontList* pList )
     else
     {
         // Wenn Font nicht, dann Standard-Styles einfuegen
-        InsertItem( FONTSTYLEMENU_FIRSTID,   pList->GetNormalStr(),
+        InsertItem( FONTSTYLEMENU_FIRSTID,	 pList->GetNormalStr(),
                     MIB_RADIOCHECK | MIB_AUTOCHECK, 0 );
         InsertItem( FONTSTYLEMENU_FIRSTID+1, pList->GetItalicStr(),
                     MIB_RADIOCHECK | MIB_AUTOCHECK, 0 );
@@ -447,8 +447,8 @@ void FontSizeMenu::Fill( const FontInfo& rInfo, const FontList* pList )
             ULONG nCount = aFontSizeNames.Count();
             for( ULONG i = 0; i < nCount; i++ )
             {
-                String  aSizeName = aFontSizeNames.GetIndexName( i );
-                long    nSize = aFontSizeNames.GetIndexSize( i );
+                String	aSizeName = aFontSizeNames.GetIndexName( i );
+                long	nSize = aFontSizeNames.GetIndexSize( i );
                 mpHeightAry[nPos] = nSize;
                 nPos++; // Id is nPos+1
                 InsertItem( nPos, aSizeName, MIB_RADIOCHECK | MIB_AUTOCHECK );
@@ -493,9 +493,9 @@ void FontSizeMenu::SetCurHeight( long nHeight )
     mnCurHeight = nHeight;
 
     // check menue item
-    XubString   aHeight = Application::GetSettings().GetUILocaleI18nHelper().GetNum( nHeight, 1, TRUE, FALSE  );
-    USHORT      nChecked = 0;
-    USHORT      nItemCount = GetItemCount();
+    XubString	aHeight = Application::GetSettings().GetUILocaleI18nHelper().GetNum( nHeight, 1, TRUE, FALSE  );
+    USHORT		nChecked = 0;
+    USHORT		nItemCount = GetItemCount();
     for( USHORT i = 0; i < nItemCount; i++ )
     {
         USHORT nItemId = GetItemId( i );
diff --git a/svtools/source/control/svxbox.cxx b/svtools/source/control/svxbox.cxx
index d1ea47d110cd..68b575d8704b 100644
--- a/svtools/source/control/svxbox.cxx
+++ b/svtools/source/control/svxbox.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
@@ -88,7 +88,7 @@ SvxListBox::SvxListBox(Window* pParent, const ResId& rId):
 
 __EXPORT SvxListBox::~SvxListBox()
 {
-    aEntryLst.DeleteAndDestroy(0,   aEntryLst.Count());
+    aEntryLst.DeleteAndDestroy(0,	aEntryLst.Count());
     aDelEntryLst.DeleteAndDestroy(0, aDelEntryLst.Count());
 }
 
@@ -101,7 +101,7 @@ void SvxListBox::InitListBox()
     // Verwaltung fuer die Stringlist aus der Resource aufbauen
     USHORT nSize = GetEntryCount();
     for(USHORT i=0; i < nSize; ++i)
-    {   const SvxBoxEntry* pTmp = new SvxBoxEntry(ListBox::GetEntry(i), i);
+    {	const SvxBoxEntry* pTmp = new SvxBoxEntry(ListBox::GetEntry(i), i);
         const SvxBoxEntry* &rpTmp = pTmp;
         aEntryLst.Insert(rpTmp, aEntryLst.Count());
     }
@@ -227,7 +227,7 @@ USHORT SvxListBox::GetModifiedCount() const
     USHORT nMod  = 0;
     USHORT nSize = aEntryLst.Count();
     for(USHORT i=0; i < nSize; ++i)
-    {   if(aEntryLst[i]->bModified)
+    {	if(aEntryLst[i]->bModified)
             nMod++;
     }
     return nMod;
@@ -244,8 +244,8 @@ void SvxListBox::ModifyEntry(USHORT nPos, const String& rName)
 
     SvxBoxEntry* pEntry = aEntryLst[nPos];
     aEntryLst.Remove(nPos, 1);
-    aEntryLst[nPos]->aName      = rName;
-    aEntryLst[nPos]->bModified  = TRUE;
+    aEntryLst[nPos]->aName 		= rName;
+    aEntryLst[nPos]->bModified 	= TRUE;
     ListBox::RemoveEntry(nPos);
 
     InsertSorted(pEntry);
@@ -260,8 +260,8 @@ const SvxBoxEntry& SvxListBox::GetModifiedEntry(USHORT nPos) const
     USHORT nSize = aEntryLst.Count();
     USHORT nMod  = 0;
     for(USHORT i=0; i < nSize; ++i)
-    {   if(aEntryLst[i]->bModified)
-        {   if(nMod == nPos)
+    {	if(aEntryLst[i]->bModified)
+        {	if(nMod == nPos)
                 return *aEntryLst[i];
             nMod++;
         }
@@ -296,14 +296,14 @@ USHORT SvxListBox::GetNewCount() const
     USHORT nNew = 0;
     USHORT nSize = aEntryLst.Count();
     for(USHORT i=0; i < nSize; ++i)
-    {   if(aEntryLst[i]->bNew)
+    {	if(aEntryLst[i]->bNew)
             nNew++;
     }
     return nNew;
 }
 
 /*--------------------------------------------------------------------
-     Beschreibung:  Alle neuen Eintraege ueberpruefen
+     Beschreibung:	Alle neuen Eintraege ueberpruefen
  --------------------------------------------------------------------*/
 
 const SvxBoxEntry& SvxListBox::GetNewEntry(USHORT nPos) const
@@ -311,8 +311,8 @@ const SvxBoxEntry& SvxListBox::GetNewEntry(USHORT nPos) const
     USHORT nSize = aEntryLst.Count();
     USHORT nNew  = 0;
     for(USHORT i=0; i < nSize; ++i)
-    {   if(aEntryLst[i]->bNew)
-        {   if(nNew == nPos)
+    {	if(aEntryLst[i]->bNew)
+        {	if(nNew == nPos)
                 return *aEntryLst[i];
             nNew++;
         }
@@ -356,7 +356,7 @@ SvxComboBox::SvxComboBox(Window* pParent, const ResId& rId, USHORT nStyleBits ):
 
 __EXPORT SvxComboBox::~SvxComboBox()
 {
-    aEntryLst.DeleteAndDestroy(0,   aEntryLst.Count());
+    aEntryLst.DeleteAndDestroy(0,	aEntryLst.Count());
     aDelEntryLst.DeleteAndDestroy(0, aDelEntryLst.Count());
 }
 
@@ -369,7 +369,7 @@ void SvxComboBox::InitComboBox()
     // Verwaltung fuer die Stringlist aus der Resource aufbauen
     USHORT nSize = GetEntryCount();
     for(USHORT i=0; i < nSize; ++i)
-    {   const SvxBoxEntry* pTmp = new SvxBoxEntry(ComboBox::GetEntry(i), i);
+    {	const SvxBoxEntry* pTmp = new SvxBoxEntry(ComboBox::GetEntry(i), i);
         const SvxBoxEntry* &rpTmp = pTmp;
         aEntryLst.Insert(rpTmp, aEntryLst.Count());
     }
@@ -469,7 +469,7 @@ USHORT SvxComboBox::GetModifiedCount() const
     USHORT nMod  = 0;
     USHORT nSize = aEntryLst.Count();
     for(USHORT i=0; i < nSize; ++i)
-    {   if(aEntryLst[i]->bModified)
+    {	if(aEntryLst[i]->bModified)
             nMod++;
     }
     return nMod;
@@ -486,8 +486,8 @@ void SvxComboBox::ModifyEntry(USHORT nPos, const String& rName)
 
     SvxBoxEntry* pEntry = aEntryLst[nPos];
     aEntryLst.Remove(nPos, 1);
-    aEntryLst[nPos]->aName      = rName;
-    aEntryLst[nPos]->bModified  = TRUE;
+    aEntryLst[nPos]->aName 		= rName;
+    aEntryLst[nPos]->bModified 	= TRUE;
     ComboBox::RemoveEntry(nPos);
 
     InsertSorted(pEntry);
@@ -502,8 +502,8 @@ const SvxBoxEntry& SvxComboBox::GetModifiedEntry(USHORT nPos) const
     USHORT nSize = aEntryLst.Count();
     USHORT nMod  = 0;
     for(USHORT i=0; i < nSize; ++i)
-    {   if(aEntryLst[i]->bModified)
-        {   if(nMod == nPos)
+    {	if(aEntryLst[i]->bModified)
+        {	if(nMod == nPos)
                 return *aEntryLst[i];
             nMod++;
         }
@@ -538,14 +538,14 @@ USHORT SvxComboBox::GetNewCount() const
     USHORT nNew = 0;
     USHORT nSize = aEntryLst.Count();
     for(USHORT i=0; i < nSize; ++i)
-    {   if(aEntryLst[i]->bNew)
+    {	if(aEntryLst[i]->bNew)
             nNew++;
     }
     return nNew;
 }
 
 /*--------------------------------------------------------------------
-     Beschreibung:  Alle neuen Eintraege ueberpruefen
+     Beschreibung:	Alle neuen Eintraege ueberpruefen
  --------------------------------------------------------------------*/
 
 const SvxBoxEntry& SvxComboBox::GetNewEntry(USHORT nPos) const
@@ -553,8 +553,8 @@ const SvxBoxEntry& SvxComboBox::GetNewEntry(USHORT nPos) const
     USHORT nSize = aEntryLst.Count();
     USHORT nNew  = 0;
     for(USHORT i=0; i < nSize; ++i)
-    {   if(aEntryLst[i]->bNew)
-        {   if(nNew == nPos)
+    {	if(aEntryLst[i]->bNew)
+        {	if(nNew == nPos)
                 return *aEntryLst[i];
             nNew++;
         }
@@ -588,7 +588,7 @@ void __EXPORT SvxComboBox::KeyInput( const KeyEvent& rKEvt )
         if( cChar == sal_Unicode( '/' ) || cChar == sal_Unicode( ' ' ) )
             return;
 #else
-        if( cChar == sal_Unicode( ':' ) || cChar == sal_Unicode( '\\' ) ||
+        if( cChar == sal_Unicode( ':' ) || cChar == sal_Unicode( '\\' ) || 
             cChar == sal_Unicode( '.' ) || cChar == sal_Unicode( ' ' ) )
             return;
 #endif
diff --git a/svtools/source/control/tabbar.cxx b/svtools/source/control/tabbar.cxx
index 2ad81da40716..20b601e06f21 100755
--- a/svtools/source/control/tabbar.cxx
+++ b/svtools/source/control/tabbar.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
@@ -1193,7 +1193,7 @@ void TabBar::Paint( const Rectangle& )
                 aPos2.X()--;
                 aPos3.X()--;
 
-                // If this is the current tab, draw the left inner shadow the default color,
+                // If this is the current tab, draw the left inner shadow the default color, 
                 // otherwise make it the same as the custom background color
                 if ( pItem->mbSelect || (pItem->mnId == mnCurPageId) ) {
                     SetLineColor( rStyleSettings.GetLightColor() );
@@ -1229,7 +1229,7 @@ void TabBar::Paint( const Rectangle& )
                 DrawLine( aPos1, aPos2 );
 
                 // draw a small 2px sliver of the original background color at the bottom of the selected tab
-
+                     
                 if ( !pItem->IsDefaultTabBgColor() )
                 {
                     if ( pItem->mbSelect || (pItem->mnId == mnCurPageId) || rStyleSettings.GetHighContrastMode() ) {
diff --git a/svtools/source/control/taskbar.cxx b/svtools/source/control/taskbar.cxx
index e84c934ef0d8..9eabde31d2aa 100644
--- a/svtools/source/control/taskbar.cxx
+++ b/svtools/source/control/taskbar.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
@@ -46,7 +46,7 @@
 class ImplTaskBarFloat : public FloatingWindow
 {
 public:
-    TaskBar*            mpTaskBar;
+    TaskBar*			mpTaskBar;
 
 public:
                         ImplTaskBarFloat( TaskBar* pTaskBar );
@@ -57,33 +57,33 @@ public:
 ImplTaskBarFloat::ImplTaskBarFloat( TaskBar* pTaskBar ) :
     FloatingWindow( pTaskBar, 0 )
 {
-    mpTaskBar   = pTaskBar;
+    mpTaskBar	= pTaskBar;
 }
 
 // =======================================================================
 
-#define TASKBAR_BORDER              2
-#define TASKBAR_OFFSIZE             3
-#define TASKBAR_OFFX                2
-#define TASKBAR_OFFY                1
-#define TASKBAR_BUTTONOFF           5
-#define TASKBAR_AUTOHIDE_HEIGHT     2
+#define TASKBAR_BORDER				2
+#define TASKBAR_OFFSIZE 			3
+#define TASKBAR_OFFX				2
+#define TASKBAR_OFFY				1
+#define TASKBAR_BUTTONOFF			5
+#define TASKBAR_AUTOHIDE_HEIGHT 	2
 
 // =======================================================================
 
 TaskBar::TaskBar( Window* pParent, WinBits nWinStyle ) :
     Window( pParent, WB_3DLOOK )
 {
-    mpButtonBar         = NULL;
-    mpTaskToolBox       = NULL;
-    mpStatusBar         = NULL;
-    mnStatusWidth       = 0;
-    mnOldStatusWidth    = 0;
-    mnLines             = 1;
-    mnWinBits           = nWinStyle;
-    mbStatusText        = FALSE;
-    mbShowItems         = FALSE;
-    mbAutoHide          = FALSE;
+    mpButtonBar 		= NULL;
+    mpTaskToolBox		= NULL;
+    mpStatusBar 		= NULL;
+    mnStatusWidth		= 0;
+    mnOldStatusWidth	= 0;
+    mnLines 			= 1;
+    mnWinBits			= nWinStyle;
+    mbStatusText		= FALSE;
+    mbShowItems 		= FALSE;
+    mbAutoHide			= FALSE;
 
     ImplInitSettings();
 }
@@ -164,14 +164,14 @@ void TaskBar::MouseMove( const MouseEvent& rMEvt )
 {
     if ( mnWinBits & WB_SIZEABLE )
     {
-        TaskToolBox*    pTempTaskToolBox = GetTaskToolBox();
-        TaskStatusBar*  pTempStatusBar = GetStatusBar();
+        TaskToolBox*	pTempTaskToolBox = GetTaskToolBox();
+        TaskStatusBar*	pTempStatusBar = GetStatusBar();
 
         if ( pTempTaskToolBox && pTempStatusBar )
         {
-            long            nStatusX = pTempStatusBar->GetPosPixel().X()-TASKBAR_OFFSIZE-2;
-            long            nMouseX = rMEvt.GetPosPixel().X();
-            PointerStyle    ePtrStyle;
+            long			nStatusX = pTempStatusBar->GetPosPixel().X()-TASKBAR_OFFSIZE-2;
+            long			nMouseX = rMEvt.GetPosPixel().X();
+            PointerStyle	ePtrStyle;
             if ( (nMouseX >= nStatusX-1) && (nMouseX <= nStatusX+3) )
                 ePtrStyle = POINTER_HSIZEBAR;
             else
@@ -188,13 +188,13 @@ void TaskBar::MouseButtonDown( const MouseEvent& rMEvt )
 {
     if ( rMEvt.IsLeft() && (mnWinBits & WB_SIZEABLE) )
     {
-        TaskToolBox*    pTempTaskToolBox = GetTaskToolBox();
-        TaskStatusBar*  pTempStatusBar = GetStatusBar();
+        TaskToolBox*	pTempTaskToolBox = GetTaskToolBox();
+        TaskStatusBar*	pTempStatusBar = GetStatusBar();
 
         if ( pTempTaskToolBox && pTempStatusBar )
         {
-            long    nStatusX = pTempStatusBar->GetPosPixel().X()-TASKBAR_OFFSIZE-2;
-            long    nMouseX = rMEvt.GetPosPixel().X();
+            long	nStatusX = pTempStatusBar->GetPosPixel().X()-TASKBAR_OFFSIZE-2;
+            long	nMouseX = rMEvt.GetPosPixel().X();
             if ( (nMouseX >= nStatusX-1) && (nMouseX <= nStatusX+3) )
             {
                 if ( rMEvt.GetClicks() == 2 )
@@ -251,9 +251,9 @@ void TaskBar::Paint( const Rectangle& rRect )
 {
     if ( mnWinBits & (WB_BORDER | WB_SIZEABLE) )
     {
-        const StyleSettings&    rStyleSettings = GetSettings().GetStyleSettings();
-        Size                    aSize = GetOutputSizePixel();
-        long    nY = 0;
+        const StyleSettings&	rStyleSettings = GetSettings().GetStyleSettings();
+        Size					aSize = GetOutputSizePixel();
+        long	nY = 0;
 
         if ( mnWinBits & WB_BORDER )
         {
@@ -266,9 +266,9 @@ void TaskBar::Paint( const Rectangle& rRect )
 
         if ( (mnWinBits & WB_SIZEABLE) )
         {
-            //TaskButtonBar*    pTempButtonBar = GetButtonBar();
-            TaskToolBox*    pTempTaskToolBox = GetTaskToolBox();
-            TaskStatusBar*  pTempStatusBar = GetStatusBar();
+            //TaskButtonBar*	pTempButtonBar = GetButtonBar();
+            TaskToolBox*	pTempTaskToolBox = GetTaskToolBox();
+            TaskStatusBar*	pTempStatusBar = GetStatusBar();
 
             if ( pTempTaskToolBox && pTempStatusBar )
             {
@@ -295,16 +295,16 @@ void TaskBar::Resize()
     if ( !IsReallyShown() )
         return;
 
-    TaskButtonBar*  pTempButtonBar = GetButtonBar();
-    TaskToolBox*    pTempTaskToolBox = GetTaskToolBox();
-    TaskStatusBar*  pTempStatusBar = GetStatusBar();
-    Point           aToolPos( TASKBAR_OFFX, 0 );
-    Size            aSize = GetOutputSizePixel();
-    Size            aStatusSize;
-    Size            aToolSize( aSize.Width()-(TASKBAR_OFFX*2), 0 );
-    long            nOldStatusX = -1;
-    long            nNewStatusX = -1;
-    long            nTaskHeight = aSize.Height() - (TASKBAR_OFFY*2);
+    TaskButtonBar*	pTempButtonBar = GetButtonBar();
+    TaskToolBox*	pTempTaskToolBox = GetTaskToolBox();
+    TaskStatusBar*	pTempStatusBar = GetStatusBar();
+    Point			aToolPos( TASKBAR_OFFX, 0 );
+    Size			aSize = GetOutputSizePixel();
+    Size			aStatusSize;
+    Size			aToolSize( aSize.Width()-(TASKBAR_OFFX*2), 0 );
+    long			nOldStatusX = -1;
+    long			nNewStatusX = -1;
+    long			nTaskHeight = aSize.Height() - (TASKBAR_OFFY*2);
 
     if ( mnWinBits & WB_BORDER )
     {
@@ -314,8 +314,8 @@ void TaskBar::Resize()
 
     if ( pTempButtonBar )
     {
-        USHORT  i = 0;
-        BOOL    bVisibleItems = FALSE;
+        USHORT	i = 0;
+        BOOL	bVisibleItems = FALSE;
         while ( i < pTempButtonBar->GetItemCount() )
         {
             if ( pTempButtonBar->IsItemVisible( pTempButtonBar->GetItemId( i ) ) )
@@ -535,11 +535,11 @@ void TaskBar::HideStatusText()
 
 Size TaskBar::CalcWindowSizePixel() const
 {
-    TaskButtonBar*  pTempButtonBar = GetButtonBar();
-    TaskToolBox*    pTempTaskToolBox = GetTaskToolBox();
-    TaskStatusBar*  pTempStatusBar = GetStatusBar();
-    Size            aSize;
-    long            nTempHeight;
+    TaskButtonBar*	pTempButtonBar = GetButtonBar();
+    TaskToolBox*	pTempTaskToolBox = GetTaskToolBox();
+    TaskStatusBar*	pTempStatusBar = GetStatusBar();
+    Size			aSize;
+    long			nTempHeight;
 
     if ( pTempButtonBar && pTempButtonBar->GetItemCount() )
         aSize.Height() = pTempButtonBar->CalcWindowSizePixel().Height()+(TASKBAR_OFFY*2);
diff --git a/svtools/source/control/taskbox.cxx b/svtools/source/control/taskbox.cxx
index 8e5ff6de8def..966bffa721ce 100644
--- a/svtools/source/control/taskbox.cxx
+++ b/svtools/source/control/taskbox.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
diff --git a/svtools/source/control/taskmisc.cxx b/svtools/source/control/taskmisc.cxx
index 4c9fda217258..79c9e3072796 100644
--- a/svtools/source/control/taskmisc.cxx
+++ b/svtools/source/control/taskmisc.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
@@ -113,30 +113,30 @@ void WindowArrange::ImplTile( const Rectangle& rRect )
         return;
     }
 
-    USHORT      i;
-    USHORT      j;
-    USHORT      nCols;
-    USHORT      nRows;
-    USHORT      nActRows;
-    USHORT      nOffset;
-    long        nOverWidth;
-    long        nOverHeight;
-    Window*     pWindow;
-    long        nX = rRect.Left();
-    long        nY = rRect.Top();
-    long        nWidth = rRect.GetWidth();
-    long        nHeight = rRect.GetHeight();
-    long        nRectY = nY;
-    long        nRectWidth = nWidth;
-    long        nRectHeight = nHeight;
-    long        nTempWidth;
-    long        nTempHeight;
-
-    nCols   = ImplCeilSqareRoot( nCount );
+    USHORT		i;
+    USHORT		j;
+    USHORT		nCols;
+    USHORT		nRows;
+    USHORT		nActRows;
+    USHORT		nOffset;
+    long		nOverWidth;
+    long		nOverHeight;
+    Window* 	pWindow;
+    long		nX = rRect.Left();
+    long		nY = rRect.Top();
+    long		nWidth = rRect.GetWidth();
+    long		nHeight = rRect.GetHeight();
+    long		nRectY = nY;
+    long		nRectWidth = nWidth;
+    long		nRectHeight = nHeight;
+    long		nTempWidth;
+    long		nTempHeight;
+
+    nCols	= ImplCeilSqareRoot( nCount );
     nOffset = (nCols*nCols) - nCount;
     if ( nOffset >= nCols )
     {
-        nRows    = nCols -1;
+        nRows	 = nCols -1;
         nOffset = nOffset - nCols;
     }
     else
@@ -195,15 +195,15 @@ void WindowArrange::ImplTile( const Rectangle& rRect )
 
 void WindowArrange::ImplHorz( const Rectangle& rRect )
 {
-    long        nCount = (long)mpWinList->Count();
-    long        nX = rRect.Left();
-    long        nY = rRect.Top();
-    long        nWidth = rRect.GetWidth();
-    long        nHeight = rRect.GetHeight();
-    long        nRectHeight = nHeight;
-    long        nOver;
-    long        nTempHeight;
-    Window*     pWindow;
+    long		nCount = (long)mpWinList->Count();
+    long		nX = rRect.Left();
+    long		nY = rRect.Top();
+    long		nWidth = rRect.GetWidth();
+    long		nHeight = rRect.GetHeight();
+    long		nRectHeight = nHeight;
+    long		nOver;
+    long		nTempHeight;
+    Window* 	pWindow;
 
     nHeight /= nCount;
     if ( nHeight < 1 )
@@ -229,15 +229,15 @@ void WindowArrange::ImplHorz( const Rectangle& rRect )
 
 void WindowArrange::ImplVert( const Rectangle& rRect )
 {
-    long        nCount = (long)mpWinList->Count();
-    long        nX = rRect.Left();
-    long        nY = rRect.Top();
-    long        nWidth = rRect.GetWidth();
-    long        nHeight = rRect.GetHeight();
-    long        nRectWidth = nWidth;
-    long        nOver;
-    long        nTempWidth;
-    Window*     pWindow;
+    long		nCount = (long)mpWinList->Count();
+    long		nX = rRect.Left();
+    long		nY = rRect.Top();
+    long		nWidth = rRect.GetWidth();
+    long		nHeight = rRect.GetHeight();
+    long		nRectWidth = nWidth;
+    long		nOver;
+    long		nTempWidth;
+    Window* 	pWindow;
 
     nWidth /= nCount;
     if ( nWidth < 1 )
@@ -263,29 +263,29 @@ void WindowArrange::ImplVert( const Rectangle& rRect )
 
 void WindowArrange::ImplCascade( const Rectangle& rRect )
 {
-    long        nX = rRect.Left();
-    long        nY = rRect.Top();
-    long        nWidth = rRect.GetWidth();
-    long        nHeight = rRect.GetHeight();
-    long        nRectWidth = nWidth;
-    long        nRectHeight = nHeight;
-    long        nOff;
-    long        nCascadeWins;
-    sal_Int32   nLeftBorder;
-    sal_Int32   nTopBorder;
-    sal_Int32   nRightBorder;
-    sal_Int32   nBottomBorder;
-    long        nStartOverWidth;
-    long        nStartOverHeight;
-    long        nOverWidth = 0;
-    long        nOverHeight = 0;
-    long        nTempX;
-    long        nTempY;
-    long        nTempWidth;
-    long        nTempHeight;
-    long        i;
-    Window*     pWindow;
-    Window*     pTempWindow;
+    long		nX = rRect.Left();
+    long		nY = rRect.Top();
+    long		nWidth = rRect.GetWidth();
+    long		nHeight = rRect.GetHeight();
+    long		nRectWidth = nWidth;
+    long		nRectHeight = nHeight;
+    long		nOff;
+    long		nCascadeWins;
+    sal_Int32	nLeftBorder;
+    sal_Int32	nTopBorder;
+    sal_Int32	nRightBorder;
+    sal_Int32	nBottomBorder;
+    long		nStartOverWidth;
+    long		nStartOverHeight;
+    long		nOverWidth = 0;
+    long		nOverHeight = 0;
+    long		nTempX;
+    long		nTempY;
+    long		nTempWidth;
+    long		nTempHeight;
+    long		i;
+    Window* 	pWindow;
+    Window* 	pTempWindow;
 
     // Border-Fenster suchen um den Versatz zu ermitteln
     pTempWindow = (Window*)mpWinList->First();
@@ -305,7 +305,7 @@ void WindowArrange::ImplCascade( const Rectangle& rRect )
     nCascadeWins = nRectHeight / 3 / nOff;
     if ( !nCascadeWins )
         nCascadeWins = 1;
-    nWidth   -= nCascadeWins*nOff;
+    nWidth	 -= nCascadeWins*nOff;
     nHeight  -= nCascadeWins*nOff;
     if ( nWidth < 1 )
         nWidth = 1;
diff --git a/svtools/source/control/taskstat.cxx b/svtools/source/control/taskstat.cxx
index 2fdab63be37f..de3a8eafa1ad 100644
--- a/svtools/source/control/taskstat.cxx
+++ b/svtools/source/control/taskstat.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
diff --git a/svtools/source/control/toolbarmenu.cxx b/svtools/source/control/toolbarmenu.cxx
index f0bd192fc02c..373e443aed33 100644
--- a/svtools/source/control/toolbarmenu.cxx
+++ b/svtools/source/control/toolbarmenu.cxx
@@ -97,7 +97,7 @@ ToolbarMenuEntry::ToolbarMenuEntry( ToolbarMenu& rMenu, int nEntryId, const Stri
 : mrMenu( rMenu )
 {
     init( nEntryId, nBits );
-
+    
     maText = rText;
     mbHasText = true;
 }
@@ -287,7 +287,7 @@ sal_Int32 ToolbarMenu_Impl::getAccessibleChildCount() throw (RuntimeException)
 }
 
 // --------------------------------------------------------------------
-
+    
 Reference< XAccessible > ToolbarMenu_Impl::getAccessibleChild( sal_Int32 index ) throw (IndexOutOfBoundsException, RuntimeException)
 {
     const int nEntryCount = maEntryVector.size();
@@ -309,7 +309,7 @@ Reference< XAccessible > ToolbarMenu_Impl::getAccessibleChild( sal_Int32 index )
 }
 
 // --------------------------------------------------------------------
-
+    
 Reference< XAccessible > ToolbarMenu_Impl::getAccessibleChild( Control* pControl, sal_Int32 childIndex ) throw (IndexOutOfBoundsException, RuntimeException)
 {
     const int nEntryCount = maEntryVector.size();
@@ -690,7 +690,7 @@ Size ToolbarMenu::implCalcSize()
 
     if ( aMaxImgSz.Width() )
         mpImpl->mnTextPos += std::max( nExtra, 7L );
-    if ( bCheckable )
+    if ( bCheckable	)
         mpImpl->mnTextPos += 16;
 
     // set heights, calc maximum width
@@ -725,7 +725,7 @@ Size ToolbarMenu::implCalcSize()
 
         }
     }
-
+    
     aSz.Width() = nMaxTextWidth + (BORDER_X<<1);
 
     // positionate controls
@@ -880,7 +880,7 @@ void ToolbarMenu::implHighlightEntry( int nHighlightEntry, bool bHighlight )
 {
     Size    aSz( GetOutputSizePixel() );
     long    nX = 0, nY = 0;
-
+    
     const int nEntryCount = mpImpl->maEntryVector.size();
     int nEntry;
     for( nEntry = 0; nEntry < nEntryCount; nEntry++ )
@@ -912,7 +912,7 @@ void ToolbarMenu::implHighlightEntry( int nHighlightEntry, bool bHighlight )
                 long nFontHeight = GetTextHeight();
                 aItemRect.Right() -= nFontHeight + nFontHeight/4;
             }
-
+            
             if( IsNativeControlSupported( CTRL_MENU_POPUP, PART_ENTIRE_CONTROL ) )
             {
                 Size aPxSize( GetOutputSizePixel() );
@@ -1018,7 +1018,7 @@ void ToolbarMenu::implHighlightEntry( const MouseEvent& rMEvt, bool bMBDown )
     if ( ( nMouseY >= 0 ) && ( nMouseY < aOutSz.Height() ) )
     {
         bool bHighlighted = FALSE;
-
+        
         const int nEntryCount = mpImpl->maEntryVector.size();
         int nEntry;
         for( nEntry = 0; nEntry < nEntryCount; nEntry++ )
@@ -1099,7 +1099,7 @@ static bool implCheckSubControlCursorMove( Control* pControl, bool bUp, int& nLa
             const USHORT nLine = nItemPos / nColCount;
 
             nLastColumn = nItemPos - (nLine * nColCount);
-
+    
             if( bUp )
             {
                 return nLine > 0;
@@ -1130,7 +1130,7 @@ ToolbarMenuEntry* ToolbarMenu::implCursorUpDown( bool bUp, bool bHomeEnd )
             else
                 n = mpImpl->maEntryVector.size()-1;
         }
-        else
+        else 
         {
             // if we have a currently selected entry and
             // cursor keys are used than check if this entry
@@ -1313,10 +1313,10 @@ static void ImplPaintCheckBackground( Window* i_pWindow, const Rectangle& i_rRec
     {
         ImplControlValue    aControlValue;
         ControlState        nState = CTRL_STATE_PRESSED | CTRL_STATE_ENABLED;
-
+        
         aControlValue.setTristateVal( BUTTONVALUE_ON );
-
-        bNativeOk = i_pWindow->DrawNativeControl( CTRL_TOOLBAR, PART_BUTTON,
+        
+        bNativeOk = i_pWindow->DrawNativeControl( CTRL_TOOLBAR, PART_BUTTON, 
                                                   i_rRect, nState, aControlValue,
                                                   rtl::OUString() );
     }
@@ -1332,7 +1332,7 @@ static void ImplPaintCheckBackground( Window* i_pWindow, const Rectangle& i_rRec
 static long ImplGetNativeCheckAndRadioSize( Window* pWin, long& rCheckHeight, long& rRadioHeight, long &rMaxWidth )
 {
     rMaxWidth = rCheckHeight = rRadioHeight = 0;
-
+    
     ImplControlValue aVal;
     Rectangle aNativeBounds;
     Rectangle aNativeContent;
@@ -1452,7 +1452,7 @@ void ToolbarMenu::implPaint( ToolbarMenuEntry* pThisOnly, bool bHighlighted )
                     SetLineColor( rSettings.GetLightColor() );
                     DrawLine( aRect.TopLeft(), aRect.TopRight() );
                     SetLineColor( rSettings.GetShadowColor() );
-                    DrawLine( aRect.BottomLeft(), aRect.BottomRight() );
+                    DrawLine( aRect.BottomLeft(), aRect.BottomRight() );					
                 }
 
                 // CheckMark
@@ -1474,29 +1474,29 @@ void ToolbarMenu::implPaint( ToolbarMenuEntry* pThisOnly, bool bHighlighted )
                             ControlPart nPart = ((pEntry->mnBits & MIB_RADIOCHECK)
                                                  ? PART_MENU_ITEM_RADIO_MARK
                                                  : PART_MENU_ITEM_CHECK_MARK);
-
+    
                             ControlState nState = 0;
-
+    
                             if ( pEntry->mbChecked )
                                 nState |= CTRL_STATE_PRESSED;
-
+    
                             if ( pEntry->mbEnabled )
                                 nState |= CTRL_STATE_ENABLED;
-
+    
                             if ( bHighlighted )
                                 nState |= CTRL_STATE_SELECTED;
-
+    
                             long nCtrlHeight = (pEntry->mnBits & MIB_RADIOCHECK) ? nCheckHeight : nRadioHeight;
                             aTmpPos.X() = aOuterCheckRect.Left() + (aOuterCheckRect.GetWidth() - nCtrlHeight)/2;
                             aTmpPos.Y() = aOuterCheckRect.Top() + (aOuterCheckRect.GetHeight() - nCtrlHeight)/2;
-
-                            Rectangle aCheckRect( aTmpPos, Size( nCtrlHeight, nCtrlHeight ) );
+                            
+                            Rectangle aCheckRect( aTmpPos, Size( nCtrlHeight, nCtrlHeight ) );                            
                             DrawNativeControl( CTRL_MENU_POPUP, nPart, aCheckRect, nState, ImplControlValue(), OUString() );
                         }
                         else if ( pEntry->mbChecked ) // by default do nothing for unchecked items
                         {
                             ImplPaintCheckBackground( this, aOuterCheckRect, pThisOnly && bHighlighted );
-
+                            
                             SymbolType eSymbol;
                             Size aSymbolSize;
                             if ( pEntry->mnBits & MIB_RADIOCHECK )
@@ -1707,7 +1707,7 @@ void SAL_CALL ToolbarMenu::statusChanged( const ::com::sun::star::frame::Feature
 
 class ToolbarMenuStatusListener : public svt::FrameStatusListener
 {
-public:
+public: 
     ToolbarMenuStatusListener( const com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory >& xServiceManager,
                                const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& xFrame,
                                ToolbarMenu& rToolbarMenu );
@@ -1720,7 +1720,7 @@ public:
 
 // --------------------------------------------------------------------
 
-ToolbarMenuStatusListener::ToolbarMenuStatusListener(
+ToolbarMenuStatusListener::ToolbarMenuStatusListener( 
     const com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory >& xServiceManager,
     const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& xFrame,
     ToolbarMenu& rToolbarMenu )
@@ -1790,7 +1790,7 @@ const Link& ToolbarMenu::GetSelectHdl() const
 
 // --------------------------------------------------------------------
 
-Reference< XFrame > ToolbarMenu::GetFrame() const
+Reference< XFrame >	ToolbarMenu::GetFrame() const
 {
     return mpImpl->mxFrame;
 }
diff --git a/svtools/source/control/toolbarmenuacc.cxx b/svtools/source/control/toolbarmenuacc.cxx
index 020467084748..d439881ecd34 100644
--- a/svtools/source/control/toolbarmenuacc.cxx
+++ b/svtools/source/control/toolbarmenuacc.cxx
@@ -209,7 +209,7 @@ sal_Int32 SAL_CALL ToolbarMenuAcc::getAccessibleIndexInParent() throw (RuntimeEx
 {
     const vos::OGuard aSolarGuard( Application::GetSolarMutex() );
     ThrowIfDisposed();
-
+    
     Window* pParent = mpParent->mrMenu.GetParent();
     if( pParent )
     {
@@ -381,7 +381,7 @@ Reference< XAccessible > SAL_CALL ToolbarMenuAcc::getAccessibleAtPoint( const aw
     Reference< XAccessible > xRet;
 
     const Point aVclPoint( aPoint.X, aPoint.Y );
-
+    
     const int nEntryCount = mpParent->maEntryVector.size();
     for( int nEntry = 0; (nEntry < nEntryCount) && !xRet.is(); nEntry++ )
     {
diff --git a/svtools/source/control/toolbarmenuimp.hxx b/svtools/source/control/toolbarmenuimp.hxx
index d1de4f704b76..58087c9c6a84 100644
--- a/svtools/source/control/toolbarmenuimp.hxx
+++ b/svtools/source/control/toolbarmenuimp.hxx
@@ -73,7 +73,7 @@ class ToolbarMenuEntry
 public:
     ToolbarMenu& mrMenu;
 
-    int mnEntryId;
+    int	mnEntryId;
     MenuItemBits mnBits;
     Size maSize;
 
@@ -253,8 +253,8 @@ public:
     virtual sal_Int32 SAL_CALL getBackground(  ) throw (::com::sun::star::uno::RuntimeException);
 
 private:
-    EventListenerVector    mxEventListeners;
-    ::vos::OMutex          maMutex;
+    EventListenerVector	   mxEventListeners;
+    ::vos::OMutex		   maMutex;
     ToolbarMenuEntry*      mpParent;
 
     /** Tell all listeners that the object is dying.  This callback is
@@ -270,12 +270,12 @@ struct ToolbarMenu_Impl
     ToolbarMenu& mrMenu;
 
     ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >              mxFrame;
-    rtl::Reference< svt::FrameStatusListener >                                       mxStatusListener;
+    rtl::Reference< svt::FrameStatusListener >										 mxStatusListener;
     ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > mxServiceManager;
-    rtl::Reference< ToolbarMenuAcc >                                                 mxAccessible;
+    rtl::Reference< ToolbarMenuAcc >												 mxAccessible;
     ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > mxOldSelection;
 
-    ToolbarMenuEntryVector  maEntryVector;
+    ToolbarMenuEntryVector	maEntryVector;
 
     int mnCheckPos;
     int mnImagePos;
@@ -287,7 +287,7 @@ struct ToolbarMenu_Impl
 
     Size maSize;
 
-    Link            maSelectHdl;
+    Link			maSelectHdl;
 
     ToolbarMenu_Impl( ToolbarMenu& rMenu, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& xFrame );
     ~ToolbarMenu_Impl();
diff --git a/svtools/source/control/urlcontrol.cxx b/svtools/source/control/urlcontrol.cxx
index 788948355965..12f5ceb2ef6b 100644
--- a/svtools/source/control/urlcontrol.cxx
+++ b/svtools/source/control/urlcontrol.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
@@ -90,6 +90,6 @@ namespace svt
     }
 
 //.........................................................................
-}   // namespace svt
+}	// namespace svt
 //.........................................................................
 
diff --git a/svtools/source/control/valueacc.cxx b/svtools/source/control/valueacc.cxx
index 66da5636d89c..d9a619e25a63 100644
--- a/svtools/source/control/valueacc.cxx
+++ b/svtools/source/control/valueacc.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
@@ -1028,13 +1028,13 @@ uno::Reference< accessibility::XAccessibleStateSet > SAL_CALL ValueItemAcc::getA
 
         // SELECTABLE
         pStateSet->AddState( accessibility::AccessibleStateType::SELECTABLE );
-        //      pStateSet->AddState( accessibility::AccessibleStateType::FOCUSABLE );
+        //	    pStateSet->AddState( accessibility::AccessibleStateType::FOCUSABLE );
 
         // SELECTED
         if( mpParent->mrParent.GetSelectItemId() == mpParent->mnId )
         {
             pStateSet->AddState( accessibility::AccessibleStateType::SELECTED );
-            //              pStateSet->AddState( accessibility::AccessibleStateType::FOCUSED );
+            //       	    pStateSet->AddState( accessibility::AccessibleStateType::FOCUSED );
         }
     }
 
@@ -1232,7 +1232,7 @@ sal_Int32 SAL_CALL ValueItemAcc::getForeground(  )
 
 // -----------------------------------------------------------------------------
 
-sal_Int32 SAL_CALL ValueItemAcc::getBackground(  )
+sal_Int32 SAL_CALL ValueItemAcc::getBackground(  ) 
     throw (uno::RuntimeException)
 {
     UINT32 nColor;
diff --git a/svtools/source/control/valueimp.hxx b/svtools/source/control/valueimp.hxx
index abde4a015ab8..a2e3826ce460 100755
--- a/svtools/source/control/valueimp.hxx
+++ b/svtools/source/control/valueimp.hxx
@@ -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
@@ -51,15 +51,15 @@
 // - Defines -
 // -----------
 
-#define ITEM_OFFSET                 4
-#define ITEM_OFFSET_DOUBLE          6
-#define NAME_LINE_OFF_X             2
-#define NAME_LINE_OFF_Y             2
-#define NAME_LINE_HEIGHT            2
-#define NAME_OFFSET                 2
-#define SCRBAR_OFFSET               1
-#define VALUESET_ITEM_NONEITEM      0xFFFE
-#define VALUESET_SCROLL_OFFSET      4
+#define ITEM_OFFSET 				4
+#define ITEM_OFFSET_DOUBLE			6
+#define NAME_LINE_OFF_X 			2
+#define NAME_LINE_OFF_Y 			2
+#define NAME_LINE_HEIGHT			2
+#define NAME_OFFSET 				2
+#define SCRBAR_OFFSET				1
+#define VALUESET_ITEM_NONEITEM		0xFFFE
+#define VALUESET_SCROLL_OFFSET		4
 
 // --------------------
 // - ValueSetItemType -
@@ -83,14 +83,14 @@ class ValueSet;
 struct ValueSetItem
 {
     ValueSet&           mrParent;
-    USHORT              mnId;
-    USHORT              mnBits;
-    ValueSetItemType    meType;
-    Image               maImage;
-    Color               maColor;
-    XubString           maText;
-    void*               mpData;
-    Rectangle           maRect;
+    USHORT				mnId;
+    USHORT				mnBits;
+    ValueSetItemType	meType;
+    Image				maImage;
+    Color				maColor;
+    XubString			maText;
+    void*				mpData;
+    Rectangle			maRect;
     ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >* mpxAcc;
 
     ValueSetItem( ValueSet& rParent );
@@ -111,7 +111,7 @@ struct ValueSet_Impl
 {
     ::std::auto_ptr< ValueItemList >    mpItemList;
     bool                                mbIsTransientChildrenDisabled;
-    Link                                maHighlightHdl;
+    Link								maHighlightHdl;
 
     ValueSet_Impl() :   mpItemList( ::std::auto_ptr< ValueItemList >( new ValueItemList() ) ),
                         mbIsTransientChildrenDisabled( false )
diff --git a/svtools/source/control/valueset.cxx b/svtools/source/control/valueset.cxx
index 62193eadf735..71a62289ef90 100644
--- a/svtools/source/control/valueset.cxx
+++ b/svtools/source/control/valueset.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
@@ -54,36 +54,36 @@
 
 void ValueSet::ImplInit()
 {
-    // Size aWinSize        = GetSizePixel();
+    // Size aWinSize		= GetSizePixel();
     mpImpl              = new ValueSet_Impl;
-    mpNoneItem          = NULL;
-    mpScrBar            = NULL;
-    mnTextOffset        = 0;
-    mnVisLines          = 0;
-    mnLines             = 0;
-    mnUserItemWidth     = 0;
-    mnUserItemHeight    = 0;
-    mnFirstLine         = 0;
-    mnOldItemId         = 0;
-    mnSelItemId         = 0;
-    mnHighItemId        = 0;
-    mnDropPos           = VALUESET_ITEM_NOTFOUND;
-    mnCols              = 0;
-    mnCurCol            = 0;
-    mnUserCols          = 0;
-    mnUserVisLines      = 0;
-    mnSpacing           = 0;
-    mnFrameStyle        = 0;
-    mbFormat            = TRUE;
-    mbHighlight         = FALSE ;
-    mbSelection         = FALSE;
-    mbNoSelection       = TRUE;
-    mbDrawSelection     = TRUE;
-    mbBlackSel          = FALSE;
-    mbDoubleSel         = FALSE;
-    mbScroll            = FALSE;
-    mbDropPos           = FALSE;
-    mbFullMode          = TRUE;
+    mpNoneItem			= NULL;
+    mpScrBar			= NULL;
+    mnTextOffset		= 0;
+    mnVisLines			= 0;
+    mnLines 			= 0;
+    mnUserItemWidth 	= 0;
+    mnUserItemHeight	= 0;
+    mnFirstLine 		= 0;
+    mnOldItemId 		= 0;
+    mnSelItemId 		= 0;
+    mnHighItemId		= 0;
+    mnDropPos			= VALUESET_ITEM_NOTFOUND;
+    mnCols				= 0;
+    mnCurCol			= 0;
+    mnUserCols			= 0;
+    mnUserVisLines		= 0;
+    mnSpacing			= 0;
+    mnFrameStyle		= 0;
+    mbFormat			= TRUE;
+    mbHighlight 		= FALSE ;
+    mbSelection 		= FALSE;
+    mbNoSelection		= TRUE;
+    mbDrawSelection 	= TRUE;
+    mbBlackSel			= FALSE;
+    mbDoubleSel 		= FALSE;
+    mbScroll			= FALSE;
+    mbDropPos			= FALSE;
+    mbFullMode			= TRUE;
 
     // #106446#, #106601# force mirroring of virtual device
     maVirDev.EnableRTL( GetParent()->IsRTLEnabled() );
@@ -235,10 +235,10 @@ void ValueSet::ImplFormatItem( ValueSetItem* pItem )
         {
             if ( nStyle  & WB_DOUBLEBORDER )
             {
-                aRect.Left()    += 2;
-                aRect.Top()     += 2;
-                aRect.Right()   -= 2;
-                aRect.Bottom()  -= 2;
+                aRect.Left()	+= 2;
+                aRect.Top() 	+= 2;
+                aRect.Right()	-= 2;
+                aRect.Bottom()	-= 2;
             }
             else
             {
@@ -268,8 +268,8 @@ void ValueSet::ImplFormatItem( ValueSetItem* pItem )
             maVirDev.SetTextFillColor();
             maVirDev.SetFillColor( ( nStyle & WB_MENUSTYLEVALUESET ) ? rStyleSettings.GetMenuColor() : rStyleSettings.GetWindowColor() );
             maVirDev.DrawRect( aRect );
-            Point   aTxtPos( aRect.Left()+2, aRect.Top() );
-            long    nTxtWidth = GetTextWidth( pItem->maText );
+            Point	aTxtPos( aRect.Left()+2, aRect.Top() );
+            long	nTxtWidth = GetTextWidth( pItem->maText );
             if ( nStyle & WB_RADIOSEL )
             {
                 aTxtPos.X() += 4;
@@ -309,9 +309,9 @@ void ValueSet::ImplFormatItem( ValueSetItem* pItem )
             }
             else
             {
-                Size    aImageSize = pItem->maImage.GetSizePixel();
-                Size    aRectSize = aRect.GetSize();
-                Point   aPos( aRect.Left(), aRect.Top() );
+                Size	aImageSize = pItem->maImage.GetSizePixel();
+                Size	aRectSize = aRect.GetSize();
+                Point	aPos( aRect.Left(), aRect.Top() );
                 aPos.X() += (aRectSize.Width()-aImageSize.Width())/2;
                 aPos.Y() += (aRectSize.Height()-aImageSize.Height())/2;
 
@@ -344,15 +344,15 @@ void ValueSet::ImplFormatItem( ValueSetItem* pItem )
 
 void ValueSet::Format()
 {
-    Size        aWinSize = GetOutputSizePixel();
+    Size		aWinSize = GetOutputSizePixel();
     ULONG       nItemCount = mpImpl->mpItemList->Count();
-    WinBits     nStyle = GetStyle();
-    long        nTxtHeight = GetTextHeight();
-    long        nOff;
-    long        nSpace;
-    long        nNoneHeight;
-    long        nNoneSpace;
-    ScrollBar*  pDelScrBar = NULL;
+    WinBits 	nStyle = GetStyle();
+    long		nTxtHeight = GetTextHeight();
+    long		nOff;
+    long		nSpace;
+    long		nNoneHeight;
+    long		nNoneSpace;
+    ScrollBar*	pDelScrBar = NULL;
 
     // Scrolling beruecksichtigen
     if ( nStyle & WB_VSCROLL )
@@ -465,7 +465,7 @@ void ValueSet::Format()
     }
 
     // Itemgroessen berechnen
-    long nColSpace  = (mnCols-1)*nSpace;
+    long nColSpace	= (mnCols-1)*nSpace;
     long nLineSpace = ((mnVisLines-1)*nSpace)+nNoneSpace;
     long nItemWidth;
     long nItemHeight;
@@ -574,11 +574,11 @@ void ValueSet::Format()
             if ( !mpNoneItem )
                 mpNoneItem = new ValueSetItem( *this );
 
-            mpNoneItem->mnId            = 0;
-            mpNoneItem->meType          = VALUESETITEM_NONE;
-            mpNoneItem->maRect.Left()   = x;
-            mpNoneItem->maRect.Top()    = y;
-            mpNoneItem->maRect.Right()  = mpNoneItem->maRect.Left()+aWinSize.Width()-x-1;
+            mpNoneItem->mnId			= 0;
+            mpNoneItem->meType			= VALUESETITEM_NONE;
+            mpNoneItem->maRect.Left()	= x;
+            mpNoneItem->maRect.Top()	= y;
+            mpNoneItem->maRect.Right()	= mpNoneItem->maRect.Left()+aWinSize.Width()-x-1;
             mpNoneItem->maRect.Bottom() = y+nNoneHeight-1;
 
             ImplFormatItem( mpNoneItem );
@@ -606,10 +606,10 @@ void ValueSet::Format()
             {
                 const BOOL bWasEmpty = pItem->maRect.IsEmpty();
 
-                pItem->maRect.Left()    = x;
-                pItem->maRect.Top()     = y;
-                pItem->maRect.Right()   = pItem->maRect.Left()+nItemWidth-1;
-                pItem->maRect.Bottom()  = pItem->maRect.Top()+nItemHeight-1;
+                pItem->maRect.Left()	= x;
+                pItem->maRect.Top() 	= y;
+                pItem->maRect.Right()	= pItem->maRect.Left()+nItemWidth-1;
+                pItem->maRect.Bottom()	= pItem->maRect.Top()+nItemHeight-1;
 
                 if( bWasEmpty && ImplHasAccessibleListeners() )
                 {
@@ -646,8 +646,8 @@ void ValueSet::Format()
         // ScrollBar anordnen, Werte setzen und anzeigen
         if ( mpScrBar )
         {
-            Point   aPos( aWinSize.Width()-nScrBarWidth+SCRBAR_OFFSET, 0 );
-            Size    aSize( nScrBarWidth-SCRBAR_OFFSET, aWinSize.Height() );
+            Point	aPos( aWinSize.Width()-nScrBarWidth+SCRBAR_OFFSET, 0 );
+            Size	aSize( nScrBarWidth-SCRBAR_OFFSET, aWinSize.Height() );
             // If a none field is visible, then we center the scrollbar
             if ( nStyle & WB_NONEFIELD )
             {
@@ -681,9 +681,9 @@ void ValueSet::ImplDrawItemText( const XubString& rText )
     if ( !(GetStyle() & WB_NAMEFIELD) )
         return;
 
-    Size    aWinSize = GetOutputSizePixel();
-    long    nTxtWidth = GetTextWidth( rText );
-    long    nTxtOffset = mnTextOffset;
+    Size	aWinSize = GetOutputSizePixel();
+    long	nTxtWidth = GetTextWidth( rText );
+    long	nTxtOffset = mnTextOffset;
 
     // Rechteck loeschen und Text ausgeben
     if ( GetStyle() & WB_FLATVALUESET )
@@ -756,8 +756,8 @@ void ValueSet::ImplDrawSelect()
             continue;
 
         // Selection malen
-        const StyleSettings&    rStyleSettings = GetSettings().GetStyleSettings();
-        Rectangle               aRect = pItem->maRect;
+        const StyleSettings&	rStyleSettings = GetSettings().GetStyleSettings();
+        Rectangle				aRect = pItem->maRect;
         Control::SetFillColor();
 
         Color aDoubleColor( rStyleSettings.GetHighlightColor() );
@@ -802,10 +802,10 @@ void ValueSet::ImplDrawSelect()
         }
         else if ( nStyle & WB_RADIOSEL )
         {
-            aRect.Left()    += 3;
-            aRect.Top()     += 3;
-            aRect.Right()   -= 3;
-            aRect.Bottom()  -= 3;
+            aRect.Left()	+= 3;
+            aRect.Top() 	+= 3;
+            aRect.Right()	-= 3;
+            aRect.Bottom()	-= 3;
             if ( nStyle & WB_DOUBLEBORDER )
             {
                 aRect.Left()++;
@@ -914,7 +914,7 @@ void ValueSet::ImplHideSelect( USHORT nItemId )
     if ( !aRect.IsEmpty() )
     {
         HideFocus();
-        Point aPos  = aRect.TopLeft();
+        Point aPos	= aRect.TopLeft();
         Size  aSize = aRect.GetSize();
         DrawOutDev( aPos, aSize, aPos, aSize, maVirDev );
     }
@@ -947,10 +947,10 @@ void ValueSet::ImplDrawDropPos( BOOL bShow )
 {
     if ( (mnDropPos != VALUESET_ITEM_NOTFOUND) && mpImpl->mpItemList->Count() )
     {
-        USHORT  nItemPos = mnDropPos;
-        USHORT  nItemId1;
-        USHORT  nItemId2 = 0;
-        BOOL    bRight;
+        USHORT	nItemPos = mnDropPos;
+        USHORT	nItemId1;
+        USHORT	nItemId2 = 0;
+        BOOL	bRight;
         if ( nItemPos >= mpImpl->mpItemList->Count() )
         {
             nItemPos = (USHORT)(mpImpl->mpItemList->Count()-1);
@@ -988,8 +988,8 @@ void ValueSet::ImplDrawDropPos( BOOL bShow )
             if ( bShow )
             {
                 const StyleSettings& rStyleSettings = GetSettings().GetStyleSettings();
-                long    nX;
-                long    nY;
+                long	nX;
+                long	nY;
                 SetLineColor( rStyleSettings.GetButtonTextColor() );
                 if ( !aRect1.IsEmpty() )
                 {
@@ -1012,13 +1012,13 @@ void ValueSet::ImplDrawDropPos( BOOL bShow )
             {
                 if ( !aRect1.IsEmpty() )
                 {
-                    Point aPos  = aRect1.TopLeft();
+                    Point aPos	= aRect1.TopLeft();
                     Size  aSize = aRect1.GetSize();
                     DrawOutDev( aPos, aSize, aPos, aSize, maVirDev );
                 }
                 if ( !aRect2.IsEmpty() )
                 {
-                    Point aPos  = aRect2.TopLeft();
+                    Point aPos	= aRect2.TopLeft();
                     Size  aSize = aRect2.GetSize();
                     DrawOutDev( aPos, aSize, aPos, aSize, maVirDev );
                 }
@@ -1039,23 +1039,23 @@ void ValueSet::ImplDraw()
 
     HideFocus();
 
-    Point   aDefPos;
-    Size    aSize = maVirDev.GetOutputSizePixel();
+    Point	aDefPos;
+    Size	aSize = maVirDev.GetOutputSizePixel();
 
     if ( mpScrBar && mpScrBar->IsVisible() )
     {
-        Point   aScrPos = mpScrBar->GetPosPixel();
-        Size    aScrSize = mpScrBar->GetSizePixel();
-        Point   aTempPos( 0, aScrPos.Y() );
-        Size    aTempSize( aSize.Width(), aScrPos.Y() );
+        Point	aScrPos = mpScrBar->GetPosPixel();
+        Size	aScrSize = mpScrBar->GetSizePixel();
+        Point	aTempPos( 0, aScrPos.Y() );
+        Size	aTempSize( aSize.Width(), aScrPos.Y() );
 
         DrawOutDev( aDefPos, aTempSize, aDefPos, aTempSize, maVirDev );
-        aTempSize.Width()   = aScrPos.X()-1;
-        aTempSize.Height()  = aScrSize.Height();
+        aTempSize.Width()	= aScrPos.X()-1;
+        aTempSize.Height()	= aScrSize.Height();
         DrawOutDev( aTempPos, aTempSize, aTempPos, aTempSize, maVirDev );
-        aTempPos.Y()        = aScrPos.Y()+aScrSize.Height();
-        aTempSize.Width()   = aSize.Width();
-        aTempSize.Height()  = aSize.Height()-aTempPos.Y();
+        aTempPos.Y()		= aScrPos.Y()+aScrSize.Height();
+        aTempSize.Width()	= aSize.Width();
+        aTempSize.Height()	= aSize.Height()-aTempPos.Y();
         DrawOutDev( aTempPos, aTempSize, aTempPos, aTempSize, maVirDev );
     }
     else
@@ -1102,8 +1102,8 @@ BOOL ValueSet::ImplScroll( const Point& rPos )
     if ( !mbScroll || (rPos.X() < 0) || (rPos.X() > aOutSize.Width()-nScrBarWidth) )
         return FALSE;
 
-    long             nScrollOffset;
-    USHORT           nOldLine = mnFirstLine;
+    long			 nScrollOffset;
+    USHORT			 nOldLine = mnFirstLine;
     const Rectangle& rTopRect = mpImpl->mpItemList->GetObject( mnFirstLine*mnCols )->maRect;
     if ( rTopRect.GetHeight() <= 16 )
         nScrollOffset = VALUESET_SCROLL_OFFSET/2;
@@ -1143,7 +1143,7 @@ USHORT ValueSet::ImplGetItem( const Point& rPos, BOOL bMove ) const
             return VALUESET_ITEM_NONEITEM;
     }
 
-    Point     aDefPos;
+    Point	  aDefPos;
     Rectangle aWinRect( aDefPos, maVirDev.GetOutputSizePixel() );
 
     ULONG nItemCount = mpImpl->mpItemList->Count();
@@ -1824,9 +1824,9 @@ void ValueSet::InsertItem( USHORT nItemId, const Image& rImage, USHORT nPos )
                 "ValueSet::InsertItem(): ItemId already exists" );
 
     ValueSetItem* pItem = new ValueSetItem( *this );
-    pItem->mnId     = nItemId;
-    pItem->meType   = VALUESETITEM_IMAGE;
-    pItem->maImage  = rImage;
+    pItem->mnId 	= nItemId;
+    pItem->meType	= VALUESETITEM_IMAGE;
+    pItem->maImage	= rImage;
     mpImpl->mpItemList->Insert( pItem, (ULONG)nPos );
 
     mbFormat = TRUE;
@@ -1843,9 +1843,9 @@ void ValueSet::InsertItem( USHORT nItemId, const Color& rColor, USHORT nPos )
                 "ValueSet::InsertItem(): ItemId already exists" );
 
     ValueSetItem* pItem = new ValueSetItem( *this );
-    pItem->mnId     = nItemId;
-    pItem->meType   = VALUESETITEM_COLOR;
-    pItem->maColor  = rColor;
+    pItem->mnId 	= nItemId;
+    pItem->meType	= VALUESETITEM_COLOR;
+    pItem->maColor	= rColor;
     mpImpl->mpItemList->Insert( pItem, (ULONG)nPos );
 
     mbFormat = TRUE;
@@ -1863,10 +1863,10 @@ void ValueSet::InsertItem( USHORT nItemId, const Image& rImage,
                 "ValueSet::InsertItem(): ItemId already exists" );
 
     ValueSetItem* pItem = new ValueSetItem( *this );
-    pItem->mnId     = nItemId;
-    pItem->meType   = VALUESETITEM_IMAGE;
-    pItem->maImage  = rImage;
-    pItem->maText   = rText;
+    pItem->mnId 	= nItemId;
+    pItem->meType	= VALUESETITEM_IMAGE;
+    pItem->maImage	= rImage;
+    pItem->maText	= rText;
     mpImpl->mpItemList->Insert( pItem, (ULONG)nPos );
 
     mbFormat = TRUE;
@@ -1884,10 +1884,10 @@ void ValueSet::InsertItem( USHORT nItemId, const Color& rColor,
                 "ValueSet::InsertItem(): ItemId already exists" );
 
     ValueSetItem* pItem = new ValueSetItem( *this );
-    pItem->mnId     = nItemId;
-    pItem->meType   = VALUESETITEM_COLOR;
-    pItem->maColor  = rColor;
-    pItem->maText   = rText;
+    pItem->mnId 	= nItemId;
+    pItem->meType	= VALUESETITEM_COLOR;
+    pItem->maColor	= rColor;
+    pItem->maText	= rText;
     mpImpl->mpItemList->Insert( pItem, (ULONG)nPos );
 
     mbFormat = TRUE;
@@ -1904,8 +1904,8 @@ void ValueSet::InsertItem( USHORT nItemId, USHORT nPos )
                 "ValueSet::InsertItem(): ItemId already exists" );
 
     ValueSetItem* pItem = new ValueSetItem( *this );
-    pItem->mnId     = nItemId;
-    pItem->meType   = VALUESETITEM_USERDRAW;
+    pItem->mnId 	= nItemId;
+    pItem->meType	= VALUESETITEM_USERDRAW;
     mpImpl->mpItemList->Insert( pItem, (ULONG)nPos );
 
     mbFormat = TRUE;
@@ -1922,8 +1922,8 @@ void ValueSet::InsertSpace( USHORT nItemId, USHORT nPos )
                 "ValueSet::InsertSpace(): ItemId already exists" );
 
     ValueSetItem* pItem = new ValueSetItem( *this );
-    pItem->mnId     = nItemId;
-    pItem->meType   = VALUESETITEM_SPACE;
+    pItem->mnId 	= nItemId;
+    pItem->meType	= VALUESETITEM_SPACE;
     mpImpl->mpItemList->Insert( pItem, (ULONG)nPos );
 
     mbFormat = TRUE;
@@ -1945,11 +1945,11 @@ void ValueSet::RemoveItem( USHORT nItemId )
     // Variablen zuruecksetzen
     if ( (mnHighItemId == nItemId) || (mnSelItemId == nItemId) )
     {
-        mnCurCol        = 0;
-        mnOldItemId     = 0;
-        mnHighItemId    = 0;
-        mnSelItemId     = 0;
-        mbNoSelection   = TRUE;
+        mnCurCol		= 0;
+        mnOldItemId 	= 0;
+        mnHighItemId	= 0;
+        mnSelItemId 	= 0;
+        mbNoSelection	= TRUE;
     }
 
     mbFormat = TRUE;
@@ -1983,12 +1983,12 @@ void ValueSet::CopyItems( const ValueSet& rValueSet )
     }
 
     // Variablen zuruecksetzen
-    mnFirstLine     = 0;
-    mnCurCol        = 0;
-    mnOldItemId     = 0;
-    mnHighItemId    = 0;
-    mnSelItemId     = 0;
-    mbNoSelection   = TRUE;
+    mnFirstLine 	= 0;
+    mnCurCol		= 0;
+    mnOldItemId 	= 0;
+    mnHighItemId	= 0;
+    mnSelItemId 	= 0;
+    mbNoSelection	= TRUE;
 
     mbFormat = TRUE;
     if ( IsReallyVisible() && IsUpdateMode() )
@@ -2002,12 +2002,12 @@ void ValueSet::Clear()
     ImplDeleteItems();
 
     // Variablen zuruecksetzen
-    mnFirstLine     = 0;
-    mnCurCol        = 0;
-    mnOldItemId     = 0;
-    mnHighItemId    = 0;
-    mnSelItemId     = 0;
-    mbNoSelection   = TRUE;
+    mnFirstLine 	= 0;
+    mnCurCol		= 0;
+    mnOldItemId 	= 0;
+    mnHighItemId	= 0;
+    mnSelItemId 	= 0;
+    mbNoSelection	= TRUE;
 
     mbFormat = TRUE;
     if ( IsReallyVisible() && IsUpdateMode() )
@@ -2276,9 +2276,9 @@ void ValueSet::SelectItem( USHORT nItemId )
 
 void ValueSet::SetNoSelection()
 {
-    mbNoSelection   = TRUE;
-    mbHighlight     = FALSE;
-    mbSelection     = FALSE;
+    mbNoSelection	= TRUE;
+    mbHighlight 	= FALSE;
+    mbSelection 	= FALSE;
 
     if ( IsReallyVisible() && IsUpdateMode() )
         ImplDraw();
@@ -2469,8 +2469,8 @@ XubString ValueSet::GetItemText( USHORT nItemId ) const
 
 void ValueSet::SetColor( const Color& rColor )
 {
-    maColor     = rColor;
-    mbFormat    = TRUE;
+    maColor 	= rColor;
+    mbFormat	= TRUE;
     if ( IsReallyVisible() && IsUpdateMode() )
         ImplDraw();
 }
@@ -2493,10 +2493,10 @@ void ValueSet::SetExtraSpacing( USHORT nNewSpacing )
 
 void ValueSet::StartSelection()
 {
-    mnOldItemId     = mnSelItemId;
-    mbHighlight     = TRUE;
-    mbSelection     = TRUE;
-    mnHighItemId    = mnSelItemId;
+    mnOldItemId 	= mnSelItemId;
+    mbHighlight 	= TRUE;
+    mbSelection 	= TRUE;
+    mnHighItemId	= mnSelItemId;
 }
 
 // -----------------------------------------------------------------------
@@ -2590,11 +2590,11 @@ Size ValueSet::CalcWindowSizePixel( const Size& rItemSize, USHORT nDesireCols,
         }
     }
 
-    Size        aSize( rItemSize.Width()*nCalcCols, rItemSize.Height()*nCalcLines );
-    WinBits     nStyle = GetStyle();
-    long        nTxtHeight = GetTextHeight();
-    long        nSpace;
-    long        n;
+    Size		aSize( rItemSize.Width()*nCalcCols, rItemSize.Height()*nCalcLines );
+    WinBits 	nStyle = GetStyle();
+    long		nTxtHeight = GetTextHeight();
+    long		nSpace;
+    long		n;
 
     if ( nStyle & WB_ITEMBORDER )
     {
diff --git a/svtools/source/dialogs/addresstemplate.cxx b/svtools/source/dialogs/addresstemplate.cxx
index 9a66230f012c..aac6a47e3c1c 100644
--- a/svtools/source/dialogs/addresstemplate.cxx
+++ b/svtools/source/dialogs/addresstemplate.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
@@ -128,20 +128,20 @@ namespace svt
             @return
                 a <type scope="com.sun.star.sdb">CommandType</type> value
         */
-        virtual sal_Int32       getCommandType() const = 0;
+        virtual sal_Int32		getCommandType() const = 0;
 
         /// checks whether or not there is an assignment for a given logical field
-        virtual sal_Bool        hasFieldAssignment(const ::rtl::OUString& _rLogicalName) = 0;
+        virtual sal_Bool		hasFieldAssignment(const ::rtl::OUString& _rLogicalName) = 0;
         /// retrieves the assignment for a given logical field
         virtual ::rtl::OUString getFieldAssignment(const ::rtl::OUString& _rLogicalName) = 0;
 
         /// set the assignment for a given logical field
-        virtual void            setFieldAssignment(const ::rtl::OUString& _rLogicalName, const ::rtl::OUString& _rAssignment) = 0;
+        virtual void			setFieldAssignment(const ::rtl::OUString& _rLogicalName, const ::rtl::OUString& _rAssignment) = 0;
         /// clear the assignment for a given logical field
-        virtual void            clearFieldAssignment(const ::rtl::OUString& _rLogicalName) = 0;
+        virtual void			clearFieldAssignment(const ::rtl::OUString& _rLogicalName) = 0;
 
-        virtual void    setDatasourceName(const ::rtl::OUString& _rName) = 0;
-        virtual void    setCommand(const ::rtl::OUString& _rCommand) = 0;
+        virtual void	setDatasourceName(const ::rtl::OUString& _rName) = 0;
+        virtual void	setCommand(const ::rtl::OUString& _rCommand) = 0;
     };
 
     // -------------------------------------------------------------------
@@ -156,9 +156,9 @@ namespace svt
     {
     protected:
         Reference< XDataSource >    m_xDataSource;
-        ::rtl::OUString             m_sDSName;
-        ::rtl::OUString             m_sTableName;
-        MapString2String            m_aAliases;
+        ::rtl::OUString			    m_sDSName;
+        ::rtl::OUString			    m_sTableName;
+        MapString2String		    m_aAliases;
 
 public:
         AssigmentTransientData(
@@ -171,15 +171,15 @@ public:
         // IAssigmentData overridables
         virtual ::rtl::OUString getDatasourceName() const;
         virtual ::rtl::OUString getCommand() const;
-        virtual sal_Int32       getCommandType() const;
+        virtual sal_Int32		getCommandType() const;
 
-        virtual sal_Bool        hasFieldAssignment(const ::rtl::OUString& _rLogicalName);
+        virtual sal_Bool		hasFieldAssignment(const ::rtl::OUString& _rLogicalName);
         virtual ::rtl::OUString getFieldAssignment(const ::rtl::OUString& _rLogicalName);
-        virtual void            setFieldAssignment(const ::rtl::OUString& _rLogicalName, const ::rtl::OUString& _rAssignment);
-        virtual void            clearFieldAssignment(const ::rtl::OUString& _rLogicalName);
+        virtual void			setFieldAssignment(const ::rtl::OUString& _rLogicalName, const ::rtl::OUString& _rAssignment);
+        virtual void			clearFieldAssignment(const ::rtl::OUString& _rLogicalName);
 
-        virtual void    setDatasourceName(const ::rtl::OUString& _rName);
-        virtual void    setCommand(const ::rtl::OUString& _rCommand);
+        virtual void	setDatasourceName(const ::rtl::OUString& _rName);
+        virtual void	setCommand(const ::rtl::OUString& _rCommand);
     };
 
     // -------------------------------------------------------------------
@@ -210,9 +210,9 @@ public:
             }
             else
             {
-                DBG_ERROR   (   (   ::rtl::OString("AssigmentTransientData::AssigmentTransientData: unknown programmatic name (")
-                                +=  ::rtl::OString(pFields->ProgrammaticName.getStr(), pFields->ProgrammaticName.getLength(), RTL_TEXTENCODING_ASCII_US)
-                                +=  ::rtl::OString(")!")
+                DBG_ERROR	(	(	::rtl::OString("AssigmentTransientData::AssigmentTransientData: unknown programmatic name (")
+                                +=	::rtl::OString(pFields->ProgrammaticName.getStr(), pFields->ProgrammaticName.getLength(), RTL_TEXTENCODING_ASCII_US)
+                                +=	::rtl::OString(")!")
                                 ).getStr()
                             );
             }
@@ -241,8 +241,8 @@ public:
     sal_Bool AssigmentTransientData::hasFieldAssignment(const ::rtl::OUString& _rLogicalName)
     {
         ConstMapString2StringIterator aPos = m_aAliases.find( _rLogicalName );
-        return  ( m_aAliases.end() != aPos )
-            &&  ( aPos->second.getLength() );
+        return	( m_aAliases.end() != aPos )
+            &&	( aPos->second.getLength() );
     }
 
     // -------------------------------------------------------------------
@@ -290,7 +290,7 @@ public:
             ,public IAssigmentData
     {
     protected:
-        StringBag       m_aStoredFields;
+        StringBag		m_aStoredFields;
 
     protected:
         ::com::sun::star::uno::Any
@@ -298,12 +298,12 @@ public:
         ::com::sun::star::uno::Any
                         getProperty(const sal_Char* _pLocalName) const;
 
-        ::rtl::OUString getStringProperty(const sal_Char* _pLocalName) const;
-        sal_Int32       getInt32Property(const sal_Char* _pLocalName) const;
+        ::rtl::OUString	getStringProperty(const sal_Char* _pLocalName) const;
+        sal_Int32		getInt32Property(const sal_Char* _pLocalName) const;
 
-        ::rtl::OUString getStringProperty(const ::rtl::OUString& _rLocalName) const;
+        ::rtl::OUString	getStringProperty(const ::rtl::OUString& _rLocalName) const;
 
-        void            setStringProperty(const sal_Char* _pLocalName, const ::rtl::OUString& _rValue);
+        void			setStringProperty(const sal_Char* _pLocalName, const ::rtl::OUString& _rValue);
 
     public:
         AssignmentPersistentData();
@@ -312,18 +312,18 @@ public:
         // IAssigmentData overridables
         virtual ::rtl::OUString getDatasourceName() const;
         virtual ::rtl::OUString getCommand() const;
-        virtual sal_Int32       getCommandType() const;
+        virtual sal_Int32		getCommandType() const;
 
-        virtual sal_Bool        hasFieldAssignment(const ::rtl::OUString& _rLogicalName);
+        virtual sal_Bool		hasFieldAssignment(const ::rtl::OUString& _rLogicalName);
         virtual ::rtl::OUString getFieldAssignment(const ::rtl::OUString& _rLogicalName);
-        virtual void            setFieldAssignment(const ::rtl::OUString& _rLogicalName, const ::rtl::OUString& _rAssignment);
-        virtual void            clearFieldAssignment(const ::rtl::OUString& _rLogicalName);
+        virtual void			setFieldAssignment(const ::rtl::OUString& _rLogicalName, const ::rtl::OUString& _rAssignment);
+        virtual void			clearFieldAssignment(const ::rtl::OUString& _rLogicalName);
 
-        virtual void    setDatasourceName(const ::rtl::OUString& _rName);
-        virtual void    setCommand(const ::rtl::OUString& _rCommand);
+        virtual void	setDatasourceName(const ::rtl::OUString& _rName);
+        virtual void	setCommand(const ::rtl::OUString& _rCommand);
 
         virtual void    Notify( const com::sun::star::uno::Sequence<rtl::OUString>& aPropertyNames);
-        virtual void    Commit();
+        virtual void	Commit();
     };
 
 
@@ -386,7 +386,7 @@ void AssignmentPersistentData::Commit()
     }
 
     // -------------------------------------------------------------------
-    ::rtl::OUString AssignmentPersistentData::getStringProperty(const ::rtl::OUString& _rLocalName) const
+    ::rtl::OUString	AssignmentPersistentData::getStringProperty(const ::rtl::OUString& _rLocalName) const
     {
         ::rtl::OUString sReturn;
         getProperty( _rLocalName ) >>= sReturn;
@@ -394,7 +394,7 @@ void AssignmentPersistentData::Commit()
     }
 
     // -------------------------------------------------------------------
-    ::rtl::OUString AssignmentPersistentData::getStringProperty(const sal_Char* _pLocalName) const
+    ::rtl::OUString	AssignmentPersistentData::getStringProperty(const sal_Char* _pLocalName) const
     {
         ::rtl::OUString sReturn;
         getProperty( _pLocalName ) >>= sReturn;
@@ -503,29 +503,29 @@ void AssignmentPersistentData::Commit()
     // ===================================================================
     struct AddressBookSourceDialogData
     {
-        FixedText*      pFieldLabels[FIELD_PAIRS_VISIBLE * 2];
-        ListBox*        pFields[FIELD_PAIRS_VISIBLE * 2];
+        FixedText*		pFieldLabels[FIELD_PAIRS_VISIBLE * 2];
+        ListBox*		pFields[FIELD_PAIRS_VISIBLE * 2];
 
         /// when working transient, we need the data source
         Reference< XDataSource >
                         m_xTransientDataSource;
         /// current scroll pos in the field list
-        sal_Int32       nFieldScrollPos;
+        sal_Int32		nFieldScrollPos;
         /// the index within m_pFields of the last visible list box. This is redundant, it could be extracted from other members
-        sal_Int32       nLastVisibleListIndex;
+        sal_Int32		nLastVisibleListIndex;
         /// indicates that we've an odd field number. This member is for efficiency only, it's redundant.
-        sal_Bool        bOddFieldNumber : 1;
+        sal_Bool		bOddFieldNumber : 1;
         /// indicates that we're working with the real persistent configuration
-        sal_Bool        bWorkingPersistent : 1;
+        sal_Bool		bWorkingPersistent : 1;
 
         /// the strings to use as labels for the field selection listboxes
-        StringArray     aFieldLabels;
+        StringArray		aFieldLabels;
         // the current field assignment
-        StringArray     aFieldAssignments;
+        StringArray		aFieldAssignments;
         /// the logical field names
-        StringArray     aLogicalFieldNames;
+        StringArray		aLogicalFieldNames;
 
-        IAssigmentData* pConfigData;
+        IAssigmentData*	pConfigData;
 
         // ................................................................
         AddressBookSourceDialogData( )
@@ -559,20 +559,20 @@ void AssignmentPersistentData::Commit()
     // ===================================================================
     // = AddressBookSourceDialog
     // ===================================================================
-#define INIT_FIELDS()   \
+#define INIT_FIELDS()	\
          ModalDialog(_pParent, SvtResId( DLG_ADDRESSBOOKSOURCE ))\
-        ,m_aDatasourceFrame         (this, SvtResId(FL_DATASOURCEFRAME))\
-        ,m_aDatasourceLabel         (this, SvtResId(FT_DATASOURCE))\
-        ,m_aDatasource              (this, SvtResId(CB_DATASOURCE))\
-        ,m_aAdministrateDatasources (this, SvtResId(PB_ADMINISTATE_DATASOURCES))\
-        ,m_aTableLabel              (this, SvtResId(FT_TABLE))\
-        ,m_aTable                   (this, SvtResId(CB_TABLE))\
-        ,m_aFieldsTitle             (this, SvtResId(FT_FIELDS))\
-        ,m_aFieldsFrame             (this, SvtResId(CT_BORDER))\
-        ,m_aFieldScroller           (&m_aFieldsFrame, SvtResId(SB_FIELDSCROLLER))\
-        ,m_aOK                      (this, SvtResId(PB_OK))\
-        ,m_aCancel                  (this, SvtResId(PB_CANCEL))\
-        ,m_aHelp                    (this, SvtResId(PB_HELP))\
+        ,m_aDatasourceFrame			(this, SvtResId(FL_DATASOURCEFRAME))\
+        ,m_aDatasourceLabel			(this, SvtResId(FT_DATASOURCE))\
+        ,m_aDatasource				(this, SvtResId(CB_DATASOURCE))\
+        ,m_aAdministrateDatasources	(this, SvtResId(PB_ADMINISTATE_DATASOURCES))\
+        ,m_aTableLabel				(this, SvtResId(FT_TABLE))\
+        ,m_aTable					(this, SvtResId(CB_TABLE))\
+        ,m_aFieldsTitle				(this, SvtResId(FT_FIELDS))\
+        ,m_aFieldsFrame				(this, SvtResId(CT_BORDER))\
+        ,m_aFieldScroller			(&m_aFieldsFrame, SvtResId(SB_FIELDSCROLLER))\
+        ,m_aOK						(this, SvtResId(PB_OK))\
+        ,m_aCancel					(this, SvtResId(PB_CANCEL))\
+        ,m_aHelp					(this, SvtResId(PB_HELP))\
         ,m_sNoFieldSelection(SvtResId(STR_NO_FIELD_SELECTION))\
         ,m_xORB(_rxORB)
 
@@ -737,7 +737,7 @@ void AssignmentPersistentData::Commit()
         AliasProgrammaticPair* pPair = _rMapping.getArray();
 
         ::rtl::OUString sCurrent;
-        for (   ConstStringArrayIterator aProgrammatic = m_pImpl->aLogicalFieldNames.begin();
+        for	(	ConstStringArrayIterator aProgrammatic = m_pImpl->aLogicalFieldNames.begin();
                 aProgrammatic != m_pImpl->aLogicalFieldNames.end();
                 ++aProgrammatic
             )
@@ -765,7 +765,7 @@ void AssignmentPersistentData::Commit()
             OFileNotation aFileNotation( aURL.GetMainURL( INetURLObject::NO_DECODE ) );
             sName = aFileNotation.get(OFileNotation::N_SYSTEM);
         }
-
+        
         m_aDatasource.SetText(sName);
         m_aTable.SetText(m_pImpl->pConfigData->getCommand());
         // we ignore the CommandType: only tables are supported
@@ -776,7 +776,7 @@ void AssignmentPersistentData::Commit()
 
         ConstStringArrayIterator aLogical = m_pImpl->aLogicalFieldNames.begin();
         StringArrayIterator aAssignment = m_pImpl->aFieldAssignments.begin();
-        for (   ;
+        for	(	;
                 aLogical < m_pImpl->aLogicalFieldNames.end();
                 ++aLogical, ++aAssignment
             )
@@ -883,7 +883,7 @@ void AssignmentPersistentData::Commit()
             if ( m_pImpl->bWorkingPersistent )
             {
                 String sSelectedDS = lcl_getSelectedDataSource(  m_aDatasource );
-
+                
                 // get the data source the user has chosen and let it build a connection
                 INetURLObject aURL( sSelectedDS );
                 if ( aURL.GetProtocol() != INET_PROT_NOT_VALID || m_xDatabaseContext->hasByName(sSelectedDS) )
@@ -975,7 +975,7 @@ void AssignmentPersistentData::Commit()
         {
             DBG_ERROR("AddressBookSourceDialog::resetFields: could not retrieve the table columns!");
         }
-
+        
 
         const ::rtl::OUString* pColumnNames = aColumnNames.getConstArray();
         const ::rtl::OUString* pEnd = pColumnNames + aColumnNames.getLength();
@@ -1018,7 +1018,7 @@ void AssignmentPersistentData::Commit()
         }
 
         // adjust m_pImpl->aFieldAssignments
-        for (   StringArrayIterator aAdjust = m_pImpl->aFieldAssignments.begin();
+        for (	StringArrayIterator aAdjust = m_pImpl->aFieldAssignments.begin();
                 aAdjust != m_pImpl->aFieldAssignments.end();
                 ++aAdjust
             )
@@ -1105,7 +1105,7 @@ void AssignmentPersistentData::Commit()
             implSelectField(*pRightListControl, *pRightAssignment);
 
             // the index of the last visible list box
-            ++m_pImpl->nLastVisibleListIndex;   // the left hand side box is always visible
+            ++m_pImpl->nLastVisibleListIndex;	// the left hand side box is always visible
             if (!bHideRightColumn)
                 ++m_pImpl->nLastVisibleListIndex;
 
@@ -1126,7 +1126,7 @@ void AssignmentPersistentData::Commit()
         }
 
         if (_bAdjustFocus && (nOldFocusRow >= 0))
-        {   // we have to adjust the focus and one of the list boxes has the focus
+        {	// we have to adjust the focus and one of the list boxes has the focus
             sal_Int32 nDelta = m_pImpl->nFieldScrollPos - _nPos;
             // the new row for the focus
             sal_Int32 nNewFocusRow = nOldFocusRow + nDelta;
@@ -1212,12 +1212,12 @@ void AssignmentPersistentData::Commit()
         // set the field assignments
         ConstStringArrayIterator aLogical = m_pImpl->aLogicalFieldNames.begin();
         ConstStringArrayIterator aAssignment = m_pImpl->aFieldAssignments.begin();
-        for (   ;
+        for	(	;
                 aLogical < m_pImpl->aLogicalFieldNames.end();
                 ++aLogical, ++aAssignment
             )
             m_pImpl->pConfigData->setFieldAssignment(*aLogical, *aAssignment);
-
+        
 
         EndDialog(RET_OK);
         return 0L;
@@ -1254,7 +1254,7 @@ void AssignmentPersistentData::Commit()
                 {
                     ::rtl::OUString sName;
                     xProp->getPropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DataSourceName"))) >>= sName;
-
+                    
                     INetURLObject aURL( sName );
                     if( aURL.GetProtocol() != INET_PROT_NOT_VALID )
                     {
@@ -1277,8 +1277,8 @@ void AssignmentPersistentData::Commit()
 
         // re-fill the data source list
         // try to preserve the current selection
-
-//      initializeDatasources();
+        
+//		initializeDatasources();
 
         return 0L;
     }
@@ -1290,20 +1290,20 @@ void AssignmentPersistentData::Commit()
         {
             case EVENT_KEYINPUT:
             {
-                const KeyEvent* pKeyEvent = _rNEvt.GetKeyEvent();
+                const KeyEvent* pKeyEvent =	_rNEvt.GetKeyEvent();
                 sal_uInt16 nCode  = pKeyEvent->GetKeyCode().GetCode();
                 sal_Bool   bShift = pKeyEvent->GetKeyCode().IsShift();
                 sal_Bool   bCtrl  = pKeyEvent->GetKeyCode().IsMod1();
-                sal_Bool   bAlt =   pKeyEvent->GetKeyCode().IsMod2();
+                sal_Bool   bAlt =	pKeyEvent->GetKeyCode().IsMod2();
 
                 if (KEY_TAB == nCode)
-                {   // somebody pressed the tab key
+                {	// somebody pressed the tab key
                     if (!bAlt && !bCtrl && !bShift)
-                    {   // it's really the only the key (no modifiers)
+                    {	// it's really the only the key (no modifiers)
                         if (m_pImpl->pFields[m_pImpl->nLastVisibleListIndex]->HasChildPathFocus())
                             // the last of our visible list boxes has the focus
                             if (m_pImpl->nFieldScrollPos < m_aFieldScroller.GetRangeMax())
-                            {   // we can still scroll down
+                            {	// we can still scroll down
                                 sal_Int32 nNextFocusList = m_pImpl->nLastVisibleListIndex + 1 - 2;
                                 // -> scroll down
                                 implScrollFields(m_pImpl->nFieldScrollPos + 1, sal_False, sal_True);
@@ -1314,11 +1314,11 @@ void AssignmentPersistentData::Commit()
                             }
                     }
                     else if (!bAlt && !bCtrl && bShift)
-                    {   // it's shift-tab
+                    {	// it's shift-tab
                         if (m_pImpl->pFields[0]->HasChildPathFocus())
                             // our first list box has the focus
                             if (m_pImpl->nFieldScrollPos > 0)
-                            {   // we can still scroll up
+                            {	// we can still scroll up
                                 // -> scroll up
                                 implScrollFields(m_pImpl->nFieldScrollPos - 1, sal_False, sal_True);
                                 // give the right control in the "prebious" line the focus
@@ -1335,6 +1335,6 @@ void AssignmentPersistentData::Commit()
     }
 
 // .......................................................................
-}   // namespace svt
+}	// namespace svt
 // .......................................................................
 
diff --git a/svtools/source/dialogs/addresstemplate.hrc b/svtools/source/dialogs/addresstemplate.hrc
index 5fb89cd567fc..45e3f1b06a18 100644
--- a/svtools/source/dialogs/addresstemplate.hrc
+++ b/svtools/source/dialogs/addresstemplate.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
@@ -29,59 +29,59 @@
 #define _SVT_ADDRESSTEMPLATE_HRC_
 
 
-#define FIELD_PAIRS_VISIBLE         5
-#define FIELD_CONTROLS_VISIBLE      2 * FIELD_PAIRS_VISIBLE
+#define	FIELD_PAIRS_VISIBLE			5
+#define FIELD_CONTROLS_VISIBLE		2 * FIELD_PAIRS_VISIBLE
 
-#define FL_DATASOURCEFRAME          1
-#define FT_DATASOURCE               2
-#define CB_DATASOURCE               3
-#define CT_BORDER                   1
-#define PB_ADMINISTATE_DATASOURCES  4
-#define FT_TABLE                    5
-#define CB_TABLE                    6
-#define FT_FIELDS                   7
-#define SB_FIELDSCROLLER            8
-#define PB_OK                       9
-#define PB_CANCEL                   10
-#define PB_HELP                     11
+#define	FL_DATASOURCEFRAME			1
+#define FT_DATASOURCE				2
+#define	CB_DATASOURCE				3
+#define CT_BORDER					1
+#define PB_ADMINISTATE_DATASOURCES	4
+#define FT_TABLE					5
+#define CB_TABLE					6
+#define FT_FIELDS					7
+#define SB_FIELDSCROLLER			8
+#define PB_OK						9
+#define PB_CANCEL					10
+#define PB_HELP						11
 
-#define FT_FIELD_BASE               50
-#define LB_FIELD_BASE               50
+#define FT_FIELD_BASE				50
+#define LB_FIELD_BASE				50
 
-#define STR_NO_FIELD_SELECTION      1
-#define STR_FIELD_COMPANY           2
-#define STR_FIELD_DEPARTMENT        3
-#define STR_FIELD_FIRSTNAME         4
-#define STR_FIELD_LASTNAME          5
-#define STR_FIELD_STREET            6
-#define STR_FIELD_COUNTRY           7
-#define STR_FIELD_ZIPCODE           8
-#define STR_FIELD_CITY              9
-#define STR_FIELD_TITLE             10
-#define STR_FIELD_POSITION          11
-#define STR_FIELD_ADDRFORM          12
-#define STR_FIELD_INITIALS          13
-#define STR_FIELD_SALUTATION        14
-#define STR_FIELD_HOMETEL           15
-#define STR_FIELD_WORKTEL           16
-#define STR_FIELD_FAX               17
-#define STR_FIELD_EMAIL             18
-#define STR_FIELD_URL               19
-#define STR_FIELD_NOTE              20
-#define STR_FIELD_USER1             21
-#define STR_FIELD_USER2             22
-#define STR_FIELD_USER3             23
-#define STR_FIELD_USER4             24
-#define STR_FIELD_ID                25
-#define STR_FIELD_STATE             26
-#define STR_FIELD_OFFICETEL         27
-#define STR_FIELD_PAGER             28
-#define STR_FIELD_MOBILE            29
-#define STR_FIELD_TELOTHER          30
-#define STR_FIELD_CALENDAR          31
-#define STR_FIELD_INVITE            32
+#define STR_NO_FIELD_SELECTION		1
+#define STR_FIELD_COMPANY			2
+#define STR_FIELD_DEPARTMENT		3
+#define STR_FIELD_FIRSTNAME			4
+#define STR_FIELD_LASTNAME			5
+#define STR_FIELD_STREET			6
+#define STR_FIELD_COUNTRY			7
+#define STR_FIELD_ZIPCODE			8
+#define STR_FIELD_CITY				9
+#define STR_FIELD_TITLE				10
+#define STR_FIELD_POSITION			11
+#define STR_FIELD_ADDRFORM			12
+#define STR_FIELD_INITIALS			13
+#define STR_FIELD_SALUTATION		14
+#define STR_FIELD_HOMETEL			15
+#define STR_FIELD_WORKTEL			16
+#define STR_FIELD_FAX				17
+#define STR_FIELD_EMAIL				18
+#define STR_FIELD_URL				19
+#define STR_FIELD_NOTE				20
+#define STR_FIELD_USER1				21
+#define STR_FIELD_USER2				22
+#define STR_FIELD_USER3				23
+#define STR_FIELD_USER4				24
+#define STR_FIELD_ID				25
+#define STR_FIELD_STATE				26
+#define STR_FIELD_OFFICETEL			27
+#define STR_FIELD_PAGER				28
+#define STR_FIELD_MOBILE			29
+#define STR_FIELD_TELOTHER			30
+#define STR_FIELD_CALENDAR			31
+#define STR_FIELD_INVITE			32
 
-#define STR_LOCAGICAL_FIELD_NAMES   33
+#define STR_LOCAGICAL_FIELD_NAMES	33
 
 
 #endif // _SVT_ADDRESSTEMPLATE_HRC_
diff --git a/svtools/source/dialogs/addresstemplate.src b/svtools/source/dialogs/addresstemplate.src
index 0652dfb9d0f5..d038e83a773f 100644
--- a/svtools/source/dialogs/addresstemplate.src
+++ b/svtools/source/dialogs/addresstemplate.src
@@ -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
@@ -35,7 +35,7 @@
 #include "controldims.hrc"
 #endif
 
-#define FIELD_ROW_HEIGHT    17
+#define FIELD_ROW_HEIGHT	17
 
 ModalDialog DLG_ADDRESSBOOKSOURCE
 {
@@ -111,22 +111,22 @@ ModalDialog DLG_ADDRESSBOOKSOURCE
         Size = MAP_APPFONT ( 288 , 5 + FIELD_ROW_HEIGHT * FIELD_PAIRS_VISIBLE ) ;
     };
 
-#define DECLARE_FIELD( row, column )    \
-        FixedText FT_FIELD_BASE + row * 2 + column  \
-        {   \
-            SVLook = TRUE ; \
+#define DECLARE_FIELD( row, column )	\
+        FixedText FT_FIELD_BASE + row * 2 + column	\
+        {	\
+            SVLook = TRUE ;	\
             Pos = MAP_APPFONT ( 3 + column * 134, RSC_SP_CTRL_GROUP_Y + 2 + row * FIELD_ROW_HEIGHT ) ;   \
             Size = MAP_APPFONT ( 79 , 10 ) ; \
-            Group = TRUE;   \
-        };  \
-        ListBox LB_FIELD_BASE + row * 2 + column    \
-        {   \
-            SVLook = TRUE;  \
+            Group = TRUE;	\
+        };	\
+        ListBox LB_FIELD_BASE + row * 2 + column	\
+        {	\
+            SVLook = TRUE;	\
             Pos = MAP_APPFONT ( 89 + column * 134, RSC_SP_CTRL_GROUP_Y + row * FIELD_ROW_HEIGHT ) ;  \
-            Size = MAP_APPFONT ( 42 , 14 ) ;    \
-            Border = TRUE;  \
-            DropDown = TRUE;    \
-            TabStop = TRUE;  \
+            Size = MAP_APPFONT ( 42 , 14 ) ;	\
+            Border = TRUE;	\
+            DropDown = TRUE;	\
+            TabStop = TRUE;	 \
         }
 
 #if FIELD_PAIRS_VISIBLE > 0
diff --git a/svtools/source/dialogs/colctrl.cxx b/svtools/source/dialogs/colctrl.cxx
index 4456fe2f1268..ec2b65a69b63 100644
--- a/svtools/source/dialogs/colctrl.cxx
+++ b/svtools/source/dialogs/colctrl.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
@@ -39,20 +39,20 @@
 // ----------------
 
 SvColorControl::SvColorControl( Window* pParent, WinBits nStyle ) :
-    Control         ( pParent, nStyle ),
-    mpBitmap        ( NULL ),
-    mpReadAccess    ( NULL ),
-    mnLuminance     ( 50 )
+    Control			( pParent, nStyle ),
+    mpBitmap		( NULL ),
+    mpReadAccess	( NULL ),
+    mnLuminance		( 50 )
 {
     Initialize();
 }
 
 // -----------------------------------------------------------------------
 SvColorControl::SvColorControl( Window* pParent, const ResId& rResId ) :
-    Control         ( pParent, rResId ),
-    mpBitmap        ( NULL ),
-    mpReadAccess    ( NULL ),
-    mnLuminance     ( 50 )
+    Control			( pParent, rResId ),
+    mpBitmap		( NULL ),
+    mpReadAccess	( NULL ),
+    mnLuminance		( 50 )
 {
     Initialize();
 }
@@ -74,7 +74,7 @@ void SvColorControl::Initialize()
 void SvColorControl::CreateBitmap()
 {
     const Size aSize( GetOutputSizePixel() );
-
+    
     if( mpBitmap && mpBitmap->GetSizePixel() != aSize )
         delete mpBitmap, mpBitmap = NULL;
 
@@ -101,7 +101,7 @@ void SvColorControl::CreateBitmap()
 
                 aColHSB.SetHue( nHue );
                 aColHSB.SetSat( nSat );
-
+         
                 // mpBitmap always has a bit count of 24 => use of SetPixel(...) is safe
                 pWriteAccess->SetPixel( i, j, BitmapColor( aColHSB.GetRGB() ) );
             }
@@ -229,7 +229,7 @@ void SvColorControl::SetColor( const ColorHSB& rCol, BOOL bSetColor )
         USHORT  nX = (USHORT) mpBitmap->GetSizePixel().Width();
         USHORT  nY = (USHORT) mpBitmap->GetSizePixel().Height();
         INT16   nZ = rCol.GetBri();
-
+        
         SetLuminance( nZ );
         nX = rCol.GetHue() * nX / 360; // Farbe
         nY = nY - rCol.GetSat() * nY / 100; // Saettigung
@@ -286,7 +286,7 @@ void SvColorControl::SetLuminance( short nLum )
 
 // -----------------------------------------------------------------------
 ColorPreviewControl::ColorPreviewControl( Window* pParent, WinBits nStyle ) :
-    Control     ( pParent, nStyle )
+    Control		( pParent, nStyle )
 {
     SetFillColor( maColor );
     SetLineColor( maColor );
@@ -294,7 +294,7 @@ ColorPreviewControl::ColorPreviewControl( Window* pParent, WinBits nStyle ) :
 
 // -----------------------------------------------------------------------
 ColorPreviewControl::ColorPreviewControl( Window* pParent, const ResId& rResId ) :
-    Control     ( pParent, rResId )
+    Control		( pParent, rResId )
 {
     SetFillColor( maColor );
     SetLineColor( maColor );
@@ -333,9 +333,9 @@ void ColorPreviewControl::SetColor( const Color& rCol )
 // -----------------------------------------------------------------------
 ColorMixingControl::ColorMixingControl( Window* pParent, WinBits nStyle,
                                         USHORT nRows, USHORT nColumns ) :
-    ValueSet    ( pParent, nStyle ),
-    mnRows      ( nRows ),
-    mnColumns   ( nColumns )
+    ValueSet	( pParent, nStyle ),
+    mnRows		( nRows ),
+    mnColumns	( nColumns )
 {
     Initialize();
 }
@@ -343,9 +343,9 @@ ColorMixingControl::ColorMixingControl( Window* pParent, WinBits nStyle,
 // -----------------------------------------------------------------------
 ColorMixingControl::ColorMixingControl( Window* pParent, const ResId& rResId,
                                         USHORT nRows, USHORT nColumns ) :
-    ValueSet    ( pParent, rResId ),
-    mnRows      ( nRows ),
-    mnColumns   ( nColumns )
+    ValueSet	( pParent, rResId ),
+    mnRows		( nRows ),
+    mnColumns	( nColumns )
 {
     Initialize();
 }
@@ -497,7 +497,7 @@ void ColorMixingControl::SetColor( CMCPosition ePos, const Color& rCol )
 // -----------------------------------------------------------------------
 String ColorMixingControl::GetRGBString( const Color& rColor )
 {
-    String  aStr( String::CreateFromInt32(rColor.GetRed()) );
+    String 	aStr( String::CreateFromInt32(rColor.GetRed()) );
             aStr += ' ';
             aStr += String::CreateFromInt32(rColor.GetGreen());
             aStr += ' ';
@@ -506,7 +506,7 @@ String ColorMixingControl::GetRGBString( const Color& rColor )
     return aStr;
 }
 // -----------------------------------------------------------------------
-CMCPosition ColorMixingControl::GetCMCPosition() const
+CMCPosition	ColorMixingControl::GetCMCPosition() const
 {
     CMCPosition ePos = CMC_OTHER;
     USHORT nPos = GetSelectItemId();
@@ -642,13 +642,13 @@ Color ColorHSB::GetRGB() const
 
         switch( n )
         {
-            case 0: cR = nB;    cG = c;     cB = a;     break;
-            case 1: cR = b;     cG = nB;    cB = a;     break;
-            case 2: cR = a;     cG = nB;    cB = c;     break;
-            case 3: cR = a;     cG = b;     cB = nB;    break;
-            case 4: cR = c;     cG = a;     cB = nB;    break;
-            case 5: cR = nB;    cG = a;     cB = b;     break;
-            default: cR = 0;    cG = 0;     cB = 0;     break;  // -Wall ????
+            case 0: cR = nB;	cG = c;		cB = a; 	break;
+            case 1: cR = b;		cG = nB;	cB = a; 	break;
+            case 2: cR = a;		cG = nB;	cB = c;		break;
+            case 3: cR = a;		cG = b; 	cB = nB;	break;
+            case 4: cR = c;		cG = a; 	cB = nB;	break;
+            case 5: cR = nB; 	cG = a;		cB = b;		break;
+            default: cR = 0; 	cG = 0;		cB = 0;		break;  // -Wall ????
         }
     }
 
diff --git a/svtools/source/dialogs/colrdlg.cxx b/svtools/source/dialogs/colrdlg.cxx
index a52cc4b0834c..75034363ae33 100644
--- a/svtools/source/dialogs/colrdlg.cxx
+++ b/svtools/source/dialogs/colrdlg.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
@@ -39,16 +39,16 @@
 // ---------------
 
 SvColorDialog::SvColorDialog( Window* pWindow ) :
-        ModalDialog     ( pWindow, SvtResId( DLG_COLOR ) ),
-        maColMixCtrl    ( this, SvtResId( VAL_SET_COLOR ), 8, 8 ),
-        maBtn1          ( this, SvtResId( BTN_1 ) ),
-        maBtn2          ( this, SvtResId( BTN_2 ) ),
-        //maBtn3            ( this, SvtResId( BTN_3 ) ),
-        //maBtn4            ( this, SvtResId( BTN_4 ) ),
-        //maFtRGB           ( this, SvtResId( FT_RGB ) ),
-        maCtlColor      ( this, SvtResId( CTL_COLOR ) ),
-
-        maFtCyan        ( this, SvtResId( FT_CYAN ) ),
+        ModalDialog		( pWindow, SvtResId( DLG_COLOR ) ),
+        maColMixCtrl	( this, SvtResId( VAL_SET_COLOR ), 8, 8 ),
+        maBtn1			( this, SvtResId( BTN_1 ) ),
+        maBtn2			( this, SvtResId( BTN_2 ) ),
+        //maBtn3			( this, SvtResId( BTN_3 ) ),
+        //maBtn4			( this, SvtResId( BTN_4 ) ),
+        //maFtRGB			( this, SvtResId( FT_RGB ) ),
+        maCtlColor		( this, SvtResId( CTL_COLOR ) ),
+
+        maFtCyan		( this, SvtResId( FT_CYAN ) ),
         maNumCyan       ( this, SvtResId( NUM_CYAN ) ),
         maFtMagenta     ( this, SvtResId( FT_MAGENTA ) ),
         maNumMagenta    ( this, SvtResId( NUM_MAGENTA ) ),
@@ -57,26 +57,26 @@ SvColorDialog::SvColorDialog( Window* pWindow ) :
         maFtKey         ( this, SvtResId( FT_KEY ) ),
         maNumKey        ( this, SvtResId( NUM_KEY ) ),
 
-        maFtRed         ( this, SvtResId( FT_RED ) ),
-        maNumRed        ( this, SvtResId( NUM_RED ) ),
-        maFtGreen       ( this, SvtResId( FT_GREEN ) ),
-        maNumGreen      ( this, SvtResId( NUM_GREEN ) ),
-        maFtBlue        ( this, SvtResId( FT_BLUE ) ),
-        maNumBlue       ( this, SvtResId( NUM_BLUE ) ),
-
-        maFtHue         ( this, SvtResId( FT_HUE ) ),
-        maNumHue        ( this, SvtResId( NUM_HUE ) ),
-        maFtSaturation  ( this, SvtResId( FT_SATURATION ) ),
-        maNumSaturation ( this, SvtResId( NUM_SATURATION ) ),
-        maFtLuminance   ( this, SvtResId( FT_LUMINANCE ) ),
-        maNumLuminance  ( this, SvtResId( NUM_LUMINANCE ) ),
-
-        maCtlPreview    ( this, SvtResId( CTL_PREVIEW ) ),
+        maFtRed	 		( this, SvtResId( FT_RED ) ),
+        maNumRed		( this, SvtResId( NUM_RED ) ),
+        maFtGreen		( this, SvtResId( FT_GREEN ) ),
+        maNumGreen   	( this, SvtResId( NUM_GREEN ) ),
+        maFtBlue		( this, SvtResId( FT_BLUE ) ),
+        maNumBlue		( this, SvtResId( NUM_BLUE ) ),
+
+        maFtHue			( this, SvtResId( FT_HUE ) ),
+        maNumHue	   	( this, SvtResId( NUM_HUE ) ),
+        maFtSaturation	( this, SvtResId( FT_SATURATION ) ),
+        maNumSaturation	( this, SvtResId( NUM_SATURATION ) ),
+        maFtLuminance	( this, SvtResId( FT_LUMINANCE ) ),
+        maNumLuminance	( this, SvtResId( NUM_LUMINANCE ) ),
+
+        maCtlPreview	( this, SvtResId( CTL_PREVIEW ) ),
         maCtlPreviewOld ( this, SvtResId( CTL_PREVIEW_OLD ) ),
 
-        maBtnOK         ( this, SvtResId( BTN_OK ) ),
-        maBtnCancel     ( this, SvtResId( BTN_CANCEL ) ),
-        maBtnHelp       ( this, SvtResId( BTN_HELP ) )
+        maBtnOK			( this, SvtResId( BTN_OK ) ),
+        maBtnCancel		( this, SvtResId( BTN_CANCEL ) ),
+        maBtnHelp		( this, SvtResId( BTN_HELP ) )
 {
     FreeResource();
 
diff --git a/svtools/source/dialogs/colrdlg.hrc b/svtools/source/dialogs/colrdlg.hrc
index 41329df6e366..7734866da2ca 100644
--- a/svtools/source/dialogs/colrdlg.hrc
+++ b/svtools/source/dialogs/colrdlg.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
diff --git a/svtools/source/dialogs/colrdlg.src b/svtools/source/dialogs/colrdlg.src
index ad9a5c1aa015..801ab830ee2b 100644
--- a/svtools/source/dialogs/colrdlg.src
+++ b/svtools/source/dialogs/colrdlg.src
@@ -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
diff --git a/svtools/source/dialogs/filedlg.cxx b/svtools/source/dialogs/filedlg.cxx
index 5567651c0480..18633a65c2f0 100644
--- a/svtools/source/dialogs/filedlg.cxx
+++ b/svtools/source/dialogs/filedlg.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
diff --git a/svtools/source/dialogs/filedlg2.cxx b/svtools/source/dialogs/filedlg2.cxx
index b0e77d658931..6c4e330b549a 100644
--- a/svtools/source/dialogs/filedlg2.cxx
+++ b/svtools/source/dialogs/filedlg2.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
@@ -57,16 +57,16 @@ using namespace com::sun::star::uno;
 
 DECLARE_LIST( UniStringList, UniString* )
 
-#define STD_BTN_WIDTH   80
-#define STD_BTN_HEIGHT  26
+#define STD_BTN_WIDTH	80
+#define STD_BTN_HEIGHT	26
 
 #ifndef UNX
-    #define ALLFILES                "*.*"
+    #define ALLFILES				"*.*"
 #else
-    #define ALLFILES                "*"
+    #define ALLFILES				"*"
 #endif
-//      #define STD_BTN_WIDTH   90
-//      #define STD_BTN_HEIGHT  35
+//		#define STD_BTN_WIDTH	90
+//		#define STD_BTN_HEIGHT	35
 
 #define INITCONTROL( p, ControlClass, nBits, aPos, aSize, aTitel, nHelpId ) \
     p = new ControlClass( GetPathDialog(), WinBits( nBits ) ); \
@@ -86,8 +86,8 @@ KbdListBox::PreNotify( NotifyEvent& rNEvt )
 {
     if ( rNEvt.GetType() == EVENT_KEYINPUT )
     {
-        KeyEvent aKeyEvt    = *rNEvt.GetKeyEvent();
-        sal_Unicode  cCharCode  = aKeyEvt.GetCharCode();
+        KeyEvent aKeyEvt	= *rNEvt.GetKeyEvent();
+        sal_Unicode  cCharCode	= aKeyEvt.GetCharCode();
 
         if ( IsPrintable ( cCharCode ) )
         {
@@ -134,7 +134,7 @@ ImpPathDialog::ImpPathDialog( PathDialog* pDlg, RESOURCE_TYPE nType, BOOL bCreat
 
     pDlg->SetHelpId( HID_FILEDLG_PATHDLG );
 
-    lang::Locale aLocale = Application::GetSettings().GetLocale();
+    lang::Locale aLocale = Application::GetSettings().GetLocale(); 
     xCollator = ::vcl::unohelper::CreateCollator();
     if( xCollator.is() )
         xCollator->loadDefaultCollator( aLocale, 1 );
@@ -153,9 +153,9 @@ ImpPathDialog::~ImpPathDialog()
     delete pOkBtn;
     delete pCancelBtn;
     delete pNewDirBtn;
-#   if defined(UNX) || defined(OS2)
+#	if defined(UNX) || defined(OS2)
     delete pHomeBtn;
-#   endif
+#	endif
 }
 
 void ImpPathDialog::InitControls()
@@ -518,7 +518,7 @@ BOOL ImpPathDialog::IsFileOk( const DirEntry& rDirEntry )
             aQueryTxt.SearchAndReplaceAscii( "%s", rDirEntry.GetFull() );
             QueryBox aQuery( GetPathDialog(),
                              WB_YES_NO | WB_DEF_YES,
-                             aQueryTxt  );
+                             aQueryTxt	);
             if( aQuery.Execute() == RET_YES )
                 rDirEntry.MakeDir();
             else
@@ -546,9 +546,9 @@ void ImpPathDialog::PreExecute()
     UpdateEntries( TRUE );
 
     // Zusaetzliche Buttons anordnen
-    Point   aPos;
-    Size    aSize;
-    long    nDY;
+    Point	aPos;
+    Size	aSize;
+    long	nDY;
     if( pLoadBtn )
     {
         aPos  = pLoadBtn->GetPosPixel();
@@ -631,7 +631,7 @@ void ImpPathDialog::PreExecute()
         for( i = 0; i < nCount; ++i )
         {
             DirEntry& rEntry = aDir[i];
-            UniString aStr    = rEntry.GetFull( FSYS_STYLE_HOST, FALSE );
+            UniString aStr	  = rEntry.GetFull( FSYS_STYLE_HOST, FALSE );
 
             UniString aVolume = rEntry.GetVolume() ;
             aStr.ToUpperAscii();
@@ -914,9 +914,9 @@ IMPL_LINK( ImpFileDialog, DblClickHdl, ListBox *, pBox )
         else
         {
             UniString aFilterListMask = aFilterList.GetObject( nCurPos )->aMask;
-//                      if( aFilterListMask.Search( ';' ) == STRING_NOTFOUND ) // kein ; in der Maske
-//                              aMask = WildCard( aFilterListMask, '\0' );
-//                      else // ; muss beruecksichtigt werden
+//						if( aFilterListMask.Search( ';' ) == STRING_NOTFOUND ) // kein ; in der Maske
+//								aMask = WildCard( aFilterListMask, '\0' );
+//						else // ; muss beruecksichtigt werden
                 aMask = WildCard( aFilterListMask, ';' );
         }
 
@@ -1018,7 +1018,7 @@ void ImpFileDialog::UpdateEntries( const BOOL bWithDirs )
     WildCard aTmpMask( aWildCard, ';' );
     if ( nEntries )
     {
-        UniStringList   aSortDirList;
+        UniStringList	aSortDirList;
         for ( USHORT n = 0; n < nEntries; n++ )
         {
             DirEntry& rEntry = aDir[n];
@@ -1149,7 +1149,7 @@ void ImpFileDialog::SetPath( UniString const & rPath )
 
     // Falls der Pfad eine Wildcard oder einen Filenamen enthaelt
     // -> abschneiden und merken
-    if( FileStat( aFile ).GetKind() & (FSYS_KIND_FILE | FSYS_KIND_WILD)     || !aFile.Exists() )
+    if( FileStat( aFile ).GetKind() & (FSYS_KIND_FILE | FSYS_KIND_WILD) 	|| !aFile.Exists() )
     {
         aMask = aFile.CutName();
 
@@ -1243,7 +1243,7 @@ void ImpFileDialog::PreExecute()
 {
     // ListBoxen erst unmittelbar vor Execute fuellen
     // (damit vor Execute der Pfad umgesetzt werden kann, ohne das immer die
-    //  Listboxen sofort upgedatet werden)
+    //	Listboxen sofort upgedatet werden)
 
     GetFileDialog()->EnterWait();
 
diff --git a/svtools/source/dialogs/filedlg2.hxx b/svtools/source/dialogs/filedlg2.hxx
index 4d32565a2775..c39f90478ea0 100644
--- a/svtools/source/dialogs/filedlg2.hxx
+++ b/svtools/source/dialogs/filedlg2.hxx
@@ -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
@@ -78,20 +78,20 @@ class ImpPathDialog
     friend class ImpFileDialog;
 
 private:
-    PathDialog*         pSvPathDialog;
-    Edit*               pEdit;
+    PathDialog*			pSvPathDialog;
+    Edit*			    pEdit;
     FixedText*          pDirTitel;
     KbdListBox*         pDirList;
     FixedText*          pDirPath;
-    ListBox*            pDriveList;
-    FixedText*          pDriveTitle;
+    ListBox*			pDriveList;
+    FixedText*			pDriveTitle;
     PushButton*         pLoadBtn;
     PushButton*         pOkBtn;
     PushButton*         pCancelBtn;
     PushButton*         pHomeBtn;
     PushButton*         pNewDirBtn;
 
-    USHORT              nOwnChilds;
+    USHORT 				nOwnChilds;
 
     DirEntry            aPath;          // aktuell angewaehlter Pfad
     USHORT              nDirCount;      // Anzahl der Verzeichnis-
@@ -102,31 +102,31 @@ private:
 
 protected:
 
-    virtual void        UpdateEntries( const BOOL bWithDirs );
-    void                UpdateDirs( const DirEntry& rTmpPath );
+    virtual	void		UpdateEntries( const BOOL bWithDirs );
+    void				UpdateDirs( const DirEntry& rTmpPath );
 
-    BOOL                IsFileOk( const DirEntry& rDirEntry );
-    void                InitControls();
+    BOOL            	IsFileOk( const DirEntry& rDirEntry );
+    void				InitControls();
 
-    DECL_LINK(          SelectHdl, ListBox * );
-    DECL_LINK(          DblClickHdl, ListBox * );
-    DECL_LINK(          ClickHdl, Button * );
+    DECL_LINK( 			SelectHdl, ListBox * );
+    DECL_LINK( 			DblClickHdl, ListBox * );
+    DECL_LINK( 			ClickHdl, Button * );
 
 public:
                         ImpPathDialog( PathDialog* pDlg, RESOURCE_TYPE nType, BOOL bCreateDir );
-    virtual             ~ImpPathDialog();
+    virtual 			~ImpPathDialog();
 
-    virtual void        SetPath( const String& rPath );
-    virtual void        SetPath( const Edit& rEdit );
-    virtual String      GetPath() const;
+    virtual	void		SetPath( const String& rPath );
+    virtual void    	SetPath( const Edit& rEdit );
+    virtual	String		GetPath() const;
 
-    virtual void        PreExecute();
-    virtual void        PostExecute();
+    virtual	void		PreExecute();
+    virtual void 		PostExecute();
 
-    PathDialog*     GetPathDialog() const   { return pSvPathDialog; }
+    PathDialog*		GetPathDialog() const	{ return pSvPathDialog; }
 
-    void            SetOkButtonText( const String& rText ) { pOkBtn->SetText( rText ); }
-    void            SetCancelButtonText( const String& rText ) { pCancelBtn->SetText( rText ); }
+    void			SetOkButtonText( const String& rText ) { pOkBtn->SetText( rText ); }
+    void			SetCancelButtonText( const String& rText ) { pCancelBtn->SetText( rText ); }
 
 };
 
@@ -137,48 +137,48 @@ private:
     FixedText*          pFileTitel;
     ListBox*            pFileList;
     FixedText*          pTypeTitel;
-    ListBox*            pTypeList;
+    ListBox*		    pTypeList;
 
     WildCard            aMask;          // aktuelle Maske
 
-    ImpFilterList       aFilterList;    // Filterliste
+    ImpFilterList		aFilterList;    // Filterliste
     USHORT              nCurFilter;     // aktueller Filter
 
     BOOL                bOpen;          // TRUE = Open; FALSE = SAVEAS
 
 protected:
-    void                InitControls();
+    void				InitControls();
 
-    String              ExtendFileName( DirEntry aEntry ) const;
+    String 				ExtendFileName( DirEntry aEntry ) const;
 
-    DECL_LINK(          SelectHdl, ListBox * );
-    DECL_LINK(          DblClickHdl, ListBox * );
-    DECL_LINK(          ClickHdl, Button * );
+    DECL_LINK( 			SelectHdl, ListBox * );
+    DECL_LINK( 			DblClickHdl, ListBox * );
+    DECL_LINK( 			ClickHdl, Button * );
 
-    virtual void        UpdateEntries( const BOOL bWithDirs );
-    BOOL                IsFileOk( const DirEntry& rDirEntry );
+    virtual	void		UpdateEntries( const BOOL bWithDirs );
+    BOOL            	IsFileOk( const DirEntry& rDirEntry );
 
 public:
                         ImpFileDialog( PathDialog* pDlg, WinBits nStyle, RESOURCE_TYPE nType );
-    virtual             ~ImpFileDialog();
+    virtual 			~ImpFileDialog();
 
-    void                AddFilter( const String& rFilter, const String& rMask );
-    void                RemoveFilter( const String& rFilter );
-    void                RemoveAllFilter();
-    void                SetCurFilter( const String& rFilter );
-    String              GetCurFilter() const;
+    void				AddFilter( const String& rFilter, const String& rMask );
+    void				RemoveFilter( const String& rFilter );
+    void				RemoveAllFilter();
+    void				SetCurFilter( const String& rFilter );
+    String				GetCurFilter() const;
 
-    USHORT              GetFilterCount() const  { return (USHORT)aFilterList.Count(); }
-    inline String       GetFilterName( USHORT nPos ) const;
-    inline String       GetFilterType( USHORT nPos ) const;
+    USHORT				GetFilterCount() const	{ return (USHORT)aFilterList.Count(); }
+    inline String		GetFilterName( USHORT nPos ) const;
+    inline String		GetFilterType( USHORT nPos ) const;
 
-    virtual void        SetPath( const String& rPath );
-    virtual void        SetPath( const Edit& rEdit );
-    virtual String      GetPath() const;
+    virtual	void		SetPath( const String& rPath );
+    virtual void 		SetPath( const Edit& rEdit );
+    virtual	String		GetPath() const;
 
-    virtual void        PreExecute();
+    virtual	void		PreExecute();
 
-    FileDialog*     GetFileDialog() const { return (FileDialog*)GetPathDialog(); }
+    FileDialog*		GetFileDialog() const { return (FileDialog*)GetPathDialog(); }
 };
 
 inline String ImpFileDialog::GetFilterName( USHORT nPos ) const
@@ -202,17 +202,17 @@ inline String ImpFileDialog::GetFilterType( USHORT nPos ) const
 class ImpSvFileDlg
 {
 private:
-    ImpPathDialog*  pDlg;
+    ImpPathDialog* 	pDlg;
 
 public:
-                    ImpSvFileDlg()      { pDlg = 0; }
-                    ~ImpSvFileDlg()     { delete pDlg; }
+                    ImpSvFileDlg() 		{ pDlg = 0; }
+                    ~ImpSvFileDlg() 	{ delete pDlg; }
 
-    ImpPathDialog*  GetDialog() const   { return pDlg; }
-    void            CreateDialog( PathDialog* pCreateFrom, WinBits nStyle, RESOURCE_TYPE nType, BOOL bCreate );
+    ImpPathDialog* 	GetDialog() const 	{ return pDlg; }
+    void			CreateDialog( PathDialog* pCreateFrom, WinBits nStyle, RESOURCE_TYPE nType, BOOL bCreate );
 
-    void            SetOkButtonText( const String& rText ) { pDlg->SetOkButtonText( rText ); }  // ihr habts ja nicht anders gewollt
-    void            SetCancelButtonText( const String& rText ) { pDlg->SetCancelButtonText( rText ); }
+    void			SetOkButtonText( const String& rText ) { pDlg->SetOkButtonText( rText ); }	// ihr habts ja nicht anders gewollt
+    void			SetCancelButtonText( const String& rText ) { pDlg->SetCancelButtonText( rText ); }
 
 };
 
diff --git a/svtools/source/dialogs/filedlg2.src b/svtools/source/dialogs/filedlg2.src
index 977a0d6f430b..6a707a9ad4a4 100644
--- a/svtools/source/dialogs/filedlg2.src
+++ b/svtools/source/dialogs/filedlg2.src
@@ -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
diff --git a/svtools/source/dialogs/formats.src b/svtools/source/dialogs/formats.src
index f8ce80f62f2f..ccd806a275b4 100644
--- a/svtools/source/dialogs/formats.src
+++ b/svtools/source/dialogs/formats.src
@@ -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
diff --git a/svtools/source/dialogs/insdlg.cxx b/svtools/source/dialogs/insdlg.cxx
index 3f7700805995..fd5e000629a9 100644
--- a/svtools/source/dialogs/insdlg.cxx
+++ b/svtools/source/dialogs/insdlg.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
@@ -56,14 +56,14 @@ using namespace ::com::sun::star;
 
 struct OleObjectDescriptor
 {
-    sal_uInt32  cbSize;
-    ClsId       clsid;
-    sal_uInt32  dwDrawAspect;
-    Size        sizel;
-    Point       pointl;
-    sal_uInt32  dwStatus;
-    sal_uInt32  dwFullUserTypeName;
-    sal_uInt32  dwSrcOfCopy;
+    sal_uInt32	cbSize;
+    ClsId		clsid;
+    sal_uInt32	dwDrawAspect;
+    Size		sizel;
+    Point		pointl;
+    sal_uInt32	dwStatus;
+    sal_uInt32	dwFullUserTypeName;
+    sal_uInt32	dwSrcOfCopy;
 };
 
 /********************** SvObjectServerList ********************************
diff --git a/svtools/source/dialogs/mcvmath.cxx b/svtools/source/dialogs/mcvmath.cxx
index d07c41acba04..e8746e1a9228 100644
--- a/svtools/source/dialogs/mcvmath.cxx
+++ b/svtools/source/dialogs/mcvmath.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
diff --git a/svtools/source/dialogs/mcvmath.hxx b/svtools/source/dialogs/mcvmath.hxx
index 67d54fd80cf0..b91d02a13c11 100644
--- a/svtools/source/dialogs/mcvmath.hxx
+++ b/svtools/source/dialogs/mcvmath.hxx
@@ -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
@@ -71,10 +71,10 @@ class ColWheel;
 class Fix
 {
 private:
-    friend  class FixCpx;
-    friend  class ColWheel;
+    friend	class FixCpx;
+    friend	class ColWheel;
 
-//  friend  Fix ImpMultBig2( const Fix& a, const Fix& b );
+//	friend	Fix ImpMultBig2( const Fix& a, const Fix& b );
 
 public:
     long            x;
@@ -121,7 +121,7 @@ public:
 
 class FixCpx
 {
-//  friend  FixCpx ImpMultBig2( const FixCpx& ra, const FixCpx& rb );
+//	friend	FixCpx ImpMultBig2( const FixCpx& ra, const FixCpx& rb );
 
 public:
     Fix             r;
diff --git a/svtools/source/dialogs/printdlg.cxx b/svtools/source/dialogs/printdlg.cxx
index 532fd3f61bb2..73829a38c339 100644
--- a/svtools/source/dialogs/printdlg.cxx
+++ b/svtools/source/dialogs/printdlg.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
@@ -69,28 +69,28 @@ struct SvtPrinterImpl
     ~SvtPrinterImpl() { delete m_pTempPrinter; }
 };
 
-#define TEMPPRINTER()   mpPrinterImpl->m_pTempPrinter
+#define TEMPPRINTER()	mpPrinterImpl->m_pTempPrinter
 
 // =======================================================================
 
 PrintDialog::PrintDialog( Window* pWindow, bool bWithSheetsAndCells ) :
-    ModalDialog     ( pWindow, SvtResId( DLG_SVT_PRNDLG_PRINTDLG ) ),
-    maFlPrinter     ( this, SvtResId( FL_PRINTER ) ),
-    maFtName        ( this, SvtResId( FT_NAME ) ),
-    maLbName        ( this, SvtResId( LB_NAMES ) ),
+    ModalDialog 	( pWindow, SvtResId( DLG_SVT_PRNDLG_PRINTDLG ) ),
+    maFlPrinter		( this, SvtResId( FL_PRINTER ) ),
+    maFtName		( this, SvtResId( FT_NAME ) ),
+    maLbName		( this, SvtResId( LB_NAMES ) ),
     maBtnProperties ( this, SvtResId( BTN_PROPERTIES ) ),
-    maFtStatus      ( this, SvtResId( FT_STATUS ) ),
-    maFiStatus      ( this, SvtResId( FI_STATUS ) ),
-    maFtType        ( this, SvtResId( FT_TYPE ) ),
-    maFiType        ( this, SvtResId( FI_TYPE ) ),
-    maFtLocation    ( this, SvtResId( FT_LOCATION ) ),
-    maFiLocation    ( this, SvtResId( FI_LOCATION ) ),
-    maFtComment     ( this, SvtResId( FT_COMMENT ) ),
-    maFiComment     ( this, SvtResId( FI_COMMENT ) ),
-    maCbxFilePrint  ( this, SvtResId( CBX_FILEPRINT ) ),
-    maFiPrintFile   ( this, SvtResId( FI_PRINTFILE ) ),
-    maFiFaxNo       ( this, SvtResId( FI_FAXNO ) ),
-    maEdtFaxNo      ( this, SvtResId( EDT_FAXNO ) ),
+    maFtStatus		( this, SvtResId( FT_STATUS ) ),
+    maFiStatus		( this, SvtResId( FI_STATUS ) ),
+    maFtType		( this, SvtResId( FT_TYPE ) ),
+    maFiType		( this, SvtResId( FI_TYPE ) ),
+    maFtLocation	( this, SvtResId( FT_LOCATION ) ),
+    maFiLocation	( this, SvtResId( FI_LOCATION ) ),
+    maFtComment 	( this, SvtResId( FT_COMMENT ) ),
+    maFiComment 	( this, SvtResId( FI_COMMENT ) ),
+    maCbxFilePrint	( this, SvtResId( CBX_FILEPRINT ) ),
+    maFiPrintFile	( this, SvtResId( FI_PRINTFILE ) ),
+    maFiFaxNo		( this, SvtResId( FI_FAXNO ) ),
+    maEdtFaxNo		( this, SvtResId( EDT_FAXNO ) ),
     maFlPrint       ( this, SvtResId( FL_PRINT ) ),
     maRbtAllSheets  ( this, SvtResId( RBT_ALL_SHEETS ) ),
     maRbtSelectedSheets ( this, SvtResId( RBT_SELECTED_SHEETS ) ),
@@ -118,21 +118,21 @@ PrintDialog::PrintDialog( Window* pWindow, bool bWithSheetsAndCells ) :
 {
     FreeResource();
 
-    mpPrinter       = NULL;
-    mpPrinterImpl   = new SvtPrinterImpl;
-    mnCopyCount     = 1;
-    mnFirstPage     = 0;
-    mnLastPage      = 0;
-    mnMinPage       = 1;
-    mnMaxPage       = 65535;
-    meCheckRange    = PRINTDIALOG_ALL;
-    mbAll           = TRUE;
-    mbSelection     = FALSE;
-    mbFromTo        = FALSE;
-    mbRange         = FALSE;
+    mpPrinter		= NULL;
+    mpPrinterImpl	= new SvtPrinterImpl;
+    mnCopyCount 	= 1;
+    mnFirstPage 	= 0;
+    mnLastPage		= 0;
+    mnMinPage		= 1;
+    mnMaxPage		= 65535;
+    meCheckRange	= PRINTDIALOG_ALL;
+    mbAll			= TRUE;
+    mbSelection 	= FALSE;
+    mbFromTo		= FALSE;
+    mbRange 		= FALSE;
     mbCollate       = TRUE;
     mbCollateCheck  = TRUE;
-    mbOptions       = FALSE;
+    mbOptions		= FALSE;
 
     maStatusTimer.SetTimeout( IMPL_PRINTDLG_STATUS_UPDATE );
     maStatusTimer.SetTimeoutHdl( LINK( this, PrintDialog, ImplStatusHdl ) );
@@ -755,7 +755,7 @@ short PrintDialog::Execute()
         DBG_ERRORFILE( "PrinterSetupDialog::Execute() - No Printer or printer is printing" );
         return FALSE;
     }
-
+    
     // check if the printer brings up its own dialog
     // in that case leave the work to that dialog
     if( mpPrinter->GetCapabilities( PRINTER_CAPABILITIES_EXTERNALDIALOG ) )
diff --git a/svtools/source/dialogs/printdlg.hrc b/svtools/source/dialogs/printdlg.hrc
index 83b7b0b28c82..7c7c283887e0 100644
--- a/svtools/source/dialogs/printdlg.hrc
+++ b/svtools/source/dialogs/printdlg.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
@@ -28,19 +28,19 @@
 #include <svtools/svtools.hrc>
 
 #define FL_PRINTER              1
-#define LB_NAMES                2
-#define BTN_PROPERTIES          3
-#define FT_NAME                 4
-#define FT_STATUS               5
-#define FI_STATUS               6
-#define FT_TYPE                 7
-#define FI_TYPE                 8
-#define FT_LOCATION             9
-#define FI_LOCATION             10
-#define FT_COMMENT              11
-#define FI_COMMENT              12
-#define CBX_FILEPRINT           13
-#define FI_PRINTFILE            14
+#define LB_NAMES				2
+#define BTN_PROPERTIES			3
+#define FT_NAME 				4
+#define FT_STATUS				5
+#define FI_STATUS				6
+#define FT_TYPE 				7
+#define FI_TYPE 				8
+#define FT_LOCATION 			9
+#define FI_LOCATION 			10
+#define FT_COMMENT				11
+#define FI_COMMENT				12
+#define CBX_FILEPRINT			13
+#define FI_PRINTFILE			14
 #define FI_FAXNO                15
 #define EDT_FAXNO               16
 
diff --git a/svtools/source/dialogs/printdlg.src b/svtools/source/dialogs/printdlg.src
index 405accc63344..d110c102ebd1 100644
--- a/svtools/source/dialogs/printdlg.src
+++ b/svtools/source/dialogs/printdlg.src
@@ -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
diff --git a/svtools/source/dialogs/prnsetup.cxx b/svtools/source/dialogs/prnsetup.cxx
index ceef2a88642b..68f4e9305be0 100644
--- a/svtools/source/dialogs/prnsetup.cxx
+++ b/svtools/source/dialogs/prnsetup.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
@@ -94,7 +94,7 @@ Printer* ImplPrnDlgListBoxSelect( ListBox* pBox, PushButton* pPropBtn,
                     pTempPrinter = new Printer( *pInfo );
                 }
             }
-
+    
             pPropBtn->Enable( pTempPrinter->HasSupport( SUPPORT_SETUPDIALOG ) );
         }
         else
@@ -160,8 +160,8 @@ static void ImplPrnDlgAddResString( XubString& rStr, USHORT nResId )
 
 XubString ImplPrnDlgGetStatusText( const QueueInfo& rInfo )
 {
-    XubString   aStr;
-    ULONG       nStatus = rInfo.GetStatus();
+    XubString	aStr;
+    ULONG		nStatus = rInfo.GetStatus();
 
     // Default-Printer
     if ( rInfo.GetPrinterName().Len() &&
@@ -236,32 +236,32 @@ XubString ImplPrnDlgGetStatusText( const QueueInfo& rInfo )
 // =======================================================================
 
 PrinterSetupDialog::PrinterSetupDialog( Window* pWindow ) :
-    ModalDialog     ( pWindow, SvtResId( DLG_SVT_PRNDLG_PRNSETUPDLG ) ),
-    maFlPrinter     ( this, SvtResId( FL_PRINTER ) ),
-    maFtName        ( this, SvtResId( FT_NAME ) ),
-    maLbName        ( this, SvtResId( LB_NAMES ) ),
+    ModalDialog 	( pWindow, SvtResId( DLG_SVT_PRNDLG_PRNSETUPDLG ) ),
+    maFlPrinter		( this, SvtResId( FL_PRINTER ) ),
+    maFtName		( this, SvtResId( FT_NAME ) ),
+    maLbName		( this, SvtResId( LB_NAMES ) ),
     maBtnProperties ( this, SvtResId( BTN_PROPERTIES ) ),
     maBtnOptions    ( this, SvtResId( BTN_OPTIONS ) ),
-    maFtStatus      ( this, SvtResId( FT_STATUS ) ),
-    maFiStatus      ( this, SvtResId( FI_STATUS ) ),
-    maFtType        ( this, SvtResId( FT_TYPE ) ),
-    maFiType        ( this, SvtResId( FI_TYPE ) ),
-    maFtLocation    ( this, SvtResId( FT_LOCATION ) ),
-    maFiLocation    ( this, SvtResId( FI_LOCATION ) ),
-    maFtComment     ( this, SvtResId( FT_COMMENT ) ),
-    maFiComment     ( this, SvtResId( FI_COMMENT ) ),
-    maFlSepButton   ( this, SvtResId( FL_SEPBUTTON ) ),
-    maBtnOK         ( this, SvtResId( BTN_OK ) ),
-    maBtnCancel     ( this, SvtResId( BTN_CANCEL ) ),
-    maBtnHelp       ( this, SvtResId( BTN_HELP ) )
+    maFtStatus		( this, SvtResId( FT_STATUS ) ),
+    maFiStatus		( this, SvtResId( FI_STATUS ) ),
+    maFtType		( this, SvtResId( FT_TYPE ) ),
+    maFiType		( this, SvtResId( FI_TYPE ) ),
+    maFtLocation	( this, SvtResId( FT_LOCATION ) ),
+    maFiLocation	( this, SvtResId( FI_LOCATION ) ),
+    maFtComment 	( this, SvtResId( FT_COMMENT ) ),
+    maFiComment 	( this, SvtResId( FI_COMMENT ) ),
+    maFlSepButton	( this, SvtResId( FL_SEPBUTTON ) ),
+    maBtnOK 		( this, SvtResId( BTN_OK ) ),
+    maBtnCancel 	( this, SvtResId( BTN_CANCEL ) ),
+    maBtnHelp		( this, SvtResId( BTN_HELP ) )
 {
     FreeResource();
-
+    
     // show options button only if link is set
     maBtnOptions.Hide();
 
-    mpPrinter       = NULL;
-    mpTempPrinter   = NULL;
+    mpPrinter		= NULL;
+    mpTempPrinter	= NULL;
 
     maStatusTimer.SetTimeout( IMPL_PRINTDLG_STATUS_UPDATE );
     maStatusTimer.SetTimeoutHdl( LINK( this, PrinterSetupDialog, ImplStatusHdl ) );
diff --git a/svtools/source/dialogs/prnsetup.hrc b/svtools/source/dialogs/prnsetup.hrc
index 4a06c3cf0e63..164844d8dd15 100644
--- a/svtools/source/dialogs/prnsetup.hrc
+++ b/svtools/source/dialogs/prnsetup.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
@@ -26,23 +26,23 @@
  ************************************************************************/
 #include <svtools/svtools.hrc>
 
-#define FL_PRINTER          1
-#define LB_NAMES                2
-#define BTN_PROPERTIES          3
-#define FT_NAME                 4
-#define FT_STATUS               5
-#define FI_STATUS               6
-#define FT_TYPE                 7
-#define FI_TYPE                 8
-#define FT_LOCATION             9
-#define FI_LOCATION             10
-#define FT_COMMENT              11
-#define FI_COMMENT              12
+#define FL_PRINTER 			1
+#define LB_NAMES				2
+#define BTN_PROPERTIES			3
+#define FT_NAME 				4
+#define FT_STATUS				5
+#define FI_STATUS				6
+#define FT_TYPE 				7
+#define FI_TYPE 				8
+#define FT_LOCATION 			9
+#define FI_LOCATION 			10
+#define FT_COMMENT				11
+#define FI_COMMENT				12
 
-#define BTN_OK                  13
-#define BTN_CANCEL              14
-#define BTN_HELP                15
+#define BTN_OK					13
+#define BTN_CANCEL				14
+#define BTN_HELP				15
 
-#define FL_SEPBUTTON            16
+#define FL_SEPBUTTON			16
 
 #define BTN_OPTIONS             17
diff --git a/svtools/source/dialogs/prnsetup.src b/svtools/source/dialogs/prnsetup.src
index 1443a35e0f39..11b6d853c7fe 100644
--- a/svtools/source/dialogs/prnsetup.src
+++ b/svtools/source/dialogs/prnsetup.src
@@ -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
diff --git a/svtools/source/dialogs/propctrl.cxx b/svtools/source/dialogs/propctrl.cxx
index 675a93ca728b..efeb032d7a27 100644
--- a/svtools/source/dialogs/propctrl.cxx
+++ b/svtools/source/dialogs/propctrl.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
@@ -66,32 +66,32 @@ public:
     SMART_UNO_DECLARATION(ImplIntrospection,UsrObject);
 
     // Methoden von XInterface
-    XInterface *    queryInterface( Uik aUik );
-    XIdlClassRef    getIdlClass();
+    XInterface *	queryInterface( Uik aUik );
+    XIdlClassRef	getIdlClass();
     */
 
     // Methoden von SvPropertyDataControl
-    virtual void                    Modified(   const String& aName,
+    virtual void					Modified(	const String& aName,
                                                 const String& aVal,
                                                 void* pData);
 
-    virtual void                    Clicked(    const String& aName,
+    virtual void					Clicked(	const String& aName,
                                                 const String& aVal,
                                                 void* pData);
 
-    virtual void                    Commit(     const String& aName,
+    virtual void					Commit(		const String& aName,
                                                 const String& aVal,
                                                 void* pData);
 
-    virtual void                    Select(     const String& aName,
+    virtual void					Select(		const String& aName,
                                                 void* pData);
 
-    virtual void                    LinkClicked(const String& aName,
+    virtual void					LinkClicked(const String& aName,
                                                 void* pData);
 
     // TODO: Das muss raus, sehr unglueckliche Schnittstelle
     // PropertyBox erzwingt Zustand des Controllers
-    virtual String                  GetTheCorrectProperty() const;
+    virtual String					GetTheCorrectProperty() const;
 };
 
 // Methoden von XPropertyEditor
diff --git a/svtools/source/dialogs/propctrl.hxx b/svtools/source/dialogs/propctrl.hxx
index 949873ceb1b7..41d4147c6960 100644
--- a/svtools/source/dialogs/propctrl.hxx
+++ b/svtools/source/dialogs/propctrl.hxx
@@ -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
@@ -98,8 +98,8 @@ public:
     SMART_UNO_DECLARATION(ImplIntrospection,UsrObject);
 
     // Methoden von XInterface
-    XInterface *    queryInterface( Uik aUik );
-    XIdlClassRef    getIdlClass();
+    XInterface *	queryInterface( Uik aUik );
+    XIdlClassRef	getIdlClass();
 
     // Methoden von XPropertyEditor
     virtual void setObject(const UsrAny& aToInspectObj, const XubString& aObjName);
diff --git a/svtools/source/dialogs/property.cxx b/svtools/source/dialogs/property.cxx
index 3b081ce2f520..8e631e497af4 100644
--- a/svtools/source/dialogs/property.cxx
+++ b/svtools/source/dialogs/property.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
@@ -45,19 +45,19 @@
 
 
 SvXPropertyControl::SvXPropertyControl( Window* pParent, WinBits nWinStyle)
-            :   Control(pParent,nWinStyle)
+            :	Control(pParent,nWinStyle)
 {
 }
 
 SvXPropertyControl::SvXPropertyControl( Window* pParent, const ResId& rResId )
-            :   Control(pParent,rResId )
+            :	Control(pParent,rResId )
 {
 }
 
 //------------------------------------------------------------------
 
 SvXPropertyEdit::SvXPropertyEdit( Window* pParent, WinBits nWinStyle)
-        :       SvXPropertyControl(pParent,nWinStyle),
+        :		SvXPropertyControl(pParent,nWinStyle),
                 aEdit(this,WB_BORDER | WB_TABSTOP)
 {
     pListener=NULL;
@@ -72,7 +72,7 @@ SvXPropertyEdit::SvXPropertyEdit( Window* pParent, WinBits nWinStyle)
 }
 
 SvXPropertyEdit::SvXPropertyEdit( Window* pParent, const ResId& rResId)
-        :       SvXPropertyControl(pParent,rResId),
+        :		SvXPropertyControl(pParent,rResId),
                 aEdit(this,WB_BORDER | WB_TABSTOP)
 {
     pListener=NULL;
@@ -186,7 +186,7 @@ IMPL_LINK( SvXPropertyEdit, LoseFocusHdl, Edit*, EMPTYARG )
 //------------------------------------------------------------------
 
 SvXPropertyListBox::SvXPropertyListBox( Window* pParent, WinBits nWinStyle)
-        :       SvXPropertyControl(pParent,nWinStyle),
+        :		SvXPropertyControl(pParent,nWinStyle),
                 aListBox(this,WB_BORDER | WB_DROPDOWN | WB_TABSTOP)
 {
     pListener=NULL;
@@ -200,7 +200,7 @@ SvXPropertyListBox::SvXPropertyListBox( Window* pParent, WinBits nWinStyle)
 }
 
 SvXPropertyListBox::SvXPropertyListBox( Window* pParent, const ResId& rResId)
-        :       SvXPropertyControl(pParent,rResId),
+        :		SvXPropertyControl(pParent,rResId),
                 aListBox(this,WB_BORDER | WB_DROPDOWN | WB_TABSTOP)
 {
     pListener=NULL;
@@ -315,7 +315,7 @@ IMPL_LINK( SvXPropertyListBox, LoseFocusHdl, ListBox*, EMPTYARG )
 
 
 SvXPropertyComboBox::SvXPropertyComboBox( Window* pParent, WinBits nWinStyle)
-        :       SvXPropertyControl(pParent,nWinStyle),
+        :		SvXPropertyControl(pParent,nWinStyle),
                 aComboBox(this,WB_BORDER | WB_DROPDOWN | WB_TABSTOP)
 {
     pListener=NULL;
@@ -329,7 +329,7 @@ SvXPropertyComboBox::SvXPropertyComboBox( Window* pParent, WinBits nWinStyle)
 }
 
 SvXPropertyComboBox::SvXPropertyComboBox( Window* pParent, const ResId& rResId)
-        :       SvXPropertyControl(pParent,rResId),
+        :		SvXPropertyControl(pParent,rResId),
                 aComboBox(this,WB_BORDER | WB_DROPDOWN | WB_TABSTOP)
 {
     pListener=NULL;
@@ -379,7 +379,7 @@ void SvXPropertyComboBox::SetProperty(const String &rString)
     aComboBox.SetText(rString);
 }
 
-String SvXPropertyComboBox::GetProperty()   const
+String SvXPropertyComboBox::GetProperty()	const
 {
     return aComboBox.GetText();
 }
@@ -442,7 +442,7 @@ IMPL_LINK( SvXPropertyComboBox, LoseFocusHdl, ComboBox*, EMPTYARG )
 //------------------------------------------------------------------
 
 SvPropertyLine::SvPropertyLine( Window* pParent,WinBits nWinStyle)
-        :   Control(pParent,nWinStyle),
+        :	Control(pParent,nWinStyle),
             aName(this,WB_BORDER),
             pSvXPropertyControl(NULL),
             aXButton(this,WB_BORDER),
@@ -461,10 +461,10 @@ SvPropertyLine::SvPropertyLine( Window* pParent,WinBits nWinStyle)
 }
 
 SvPropertyLine::SvPropertyLine( Window* pParent,const ResId& rResId )
-        :   Control(pParent,rResId),
-            aName       (this,WB_BORDER),
+        :	Control(pParent,rResId),
+            aName		(this,WB_BORDER),
             pSvXPropertyControl(NULL),
-            aXButton    (this,WB_BORDER),
+            aXButton	(this,WB_BORDER),
             bIsLocked(FALSE),
             bIsHyperlink(FALSE)
 {
@@ -525,8 +525,8 @@ void SvPropertyLine::Resize()
         aPos.X()=GetOutputSizePixel().Width()
                     -nXButtonWidth;
         aSize.Width()=nXButtonWidth;
-        aXButton    .SetSizePixel(aSize);
-        aXButton    .SetPosPixel(aPos);
+        aXButton	.SetSizePixel(aSize);
+        aXButton	.SetPosPixel(aPos);
     }
 }
 
@@ -659,7 +659,7 @@ void SvXPropEvListener::KeyInput (SvXPropertyControl *pSvXPCtr,const KeyCode& th
     aKeyInputLink.Call(this);
 }
 
-SvXPropertyControl *    SvXPropEvListener::GetPropertyControl()
+SvXPropertyControl *	SvXPropEvListener::GetPropertyControl()
 {
     return pTheActiveControl;
 }
@@ -672,13 +672,13 @@ KeyCode SvXPropEvListener::GetKeyCode() const
 //------------------------------------------------------------------
 
 SvListBoxForProperties::SvListBoxForProperties( Window* pParent, WinBits nWinStyle)
-        :   Control(pParent,nWinStyle),
+        :	Control(pParent,nWinStyle),
             aPlayGround(this,WB_DIALOGCONTROL),
             aVScroll(this,WB_VSCROLL|WB_REPEAT|WB_DRAG),
             pPropDataControl(NULL)
 {
 
-    aListener.SetModifyHdl   (LINK( this, SvListBoxForProperties,   ModifyHdl));
+    aListener.SetModifyHdl	 (LINK( this, SvListBoxForProperties,	ModifyHdl));
     aListener.SetGetFocusHdl (LINK( this, SvListBoxForProperties, GetFocusHdl));
     aListener.SetLoseFocusHdl(LINK( this, SvListBoxForProperties,LoseFocusHdl));
     aListener.SetKeyInputHdl (LINK( this, SvListBoxForProperties, KeyInputHdl));
@@ -700,7 +700,7 @@ SvListBoxForProperties::SvListBoxForProperties( Window* pParent, WinBits nWinSty
 
 
 SvListBoxForProperties::SvListBoxForProperties( Window* pParent, const ResId& rResId )
-            :       Control(pParent,rResId),
+            :		Control(pParent,rResId),
                     aPlayGround(this,0),
                     aVScroll(this,WB_VSCROLL|WB_REPEAT|WB_DRAG),
                     pPropDataControl(NULL)
@@ -733,9 +733,9 @@ void SvListBoxForProperties::Clear()
 
         switch(pPropLine->GetKindOfControl())
         {
-            case    KOC_LISTBOX:
-            case    KOC_COMBOBOX:
-            case    KOC_EDIT:       delete pPropLine->GetSvXPropertyControl();
+            case	KOC_LISTBOX:
+            case	KOC_COMBOBOX:
+            case	KOC_EDIT:		delete pPropLine->GetSvXPropertyControl();
                                     break;
             default:
                                     break;
@@ -946,9 +946,9 @@ void SvListBoxForProperties::ChangeEntry( const SvPropertyData& aPropData, USHOR
 
         switch(pPropLine->GetKindOfControl())
         {
-            case    KOC_LISTBOX:
-            case    KOC_COMBOBOX:
-            case    KOC_EDIT:       delete pPropLine->GetSvXPropertyControl();
+            case	KOC_LISTBOX:
+            case	KOC_COMBOBOX:
+            case	KOC_EDIT:		delete pPropLine->GetSvXPropertyControl();
                                     break;
             default:
                                     break;
@@ -956,22 +956,22 @@ void SvListBoxForProperties::ChangeEntry( const SvPropertyData& aPropData, USHOR
 
         switch(aPropData.eKind)
         {
-            case    KOC_LISTBOX:
+            case	KOC_LISTBOX:
                                     pPropLine->SetSvXPropertyControl(
                                             new SvXPropertyComboBox(pPropLine,WB_TABSTOP));
                                     pPropLine->SetKindOfControl(aPropData.eKind);
                                     break;
-            case    KOC_COMBOBOX:
+            case	KOC_COMBOBOX:
                                     pPropLine->SetSvXPropertyControl(
                                             new SvXPropertyComboBox(pPropLine,WB_TABSTOP));
                                     pPropLine->SetKindOfControl(aPropData.eKind);
                                     break;
-            case    KOC_EDIT:
+            case	KOC_EDIT:
                                     pPropLine->SetSvXPropertyControl(
                                             new SvXPropertyEdit(pPropLine,WB_TABSTOP));
                                     pPropLine->SetKindOfControl(aPropData.eKind);
                                     break;
-            case    KOC_USERDEFINED:
+            case	KOC_USERDEFINED:
                                     pPropLine->SetSvXPropertyControl(aPropData.pControl);
                                     aPropData.pControl->SetParent(pPropLine);
                                     pPropLine->SetKindOfControl(aPropData.eKind);
@@ -1141,7 +1141,7 @@ IMPL_LINK( SvListBoxForProperties, KeyInputHdl,SvXPropEvListener*, pSvXPEvL)
 
 
 SvTabPageForProperties::SvTabPageForProperties(Window* pParent,WinBits nWinStyle)
-            :   TabPage(pParent,nWinStyle),
+            :	TabPage(pParent,nWinStyle),
                 aLbProp(this)
 {
     aLbProp.Show();
@@ -1351,9 +1351,9 @@ void SvBasicPropertyDataControl::Modified(const String& aName,
     aModifyLink.Call(this);
 }
 
-void SvBasicPropertyDataControl::Clicked(   const String& aName,
+void SvBasicPropertyDataControl::Clicked(	const String& aName,
                                     const String& aVal,
-                                    void* pData)        //Xtension-Button pressed
+                                    void* pData)		//Xtension-Button pressed
 {
     aEntryName=aName;
     aEntryProperty=aVal;
@@ -1361,9 +1361,9 @@ void SvBasicPropertyDataControl::Clicked(   const String& aName,
     aClickedLink.Call(this);
 }
 
-void SvBasicPropertyDataControl::Commit(        const String& aName,
+void SvBasicPropertyDataControl::Commit(		const String& aName,
                                     const String& aVal,
-                                    void* pData)        //User accept changes
+                                    void* pData)		//User accept changes
 {
     aEntryName=aName;
     aEntryProperty=aVal;
@@ -1371,8 +1371,8 @@ void SvBasicPropertyDataControl::Commit(        const String& aName,
     aCommitLink.Call(this);
 }
 
-void SvBasicPropertyDataControl::Select(        const String& aName,
-                                    void* pData)        //User select new Row
+void SvBasicPropertyDataControl::Select(		const String& aName,
+                                    void* pData)		//User select new Row
 {
     aEntryName=aName;
     pTheData=pData;
@@ -1384,17 +1384,17 @@ void SvBasicPropertyDataControl::LinkClicked(const String&, void*)
 }
 
 
-String  SvBasicPropertyDataControl::GetName() const //Tell's the name of the Property
+String	SvBasicPropertyDataControl::GetName() const //Tell's the name of the Property
 {
     return aEntryName;
 }
 
-String  SvBasicPropertyDataControl::GetProperty() const //Tell's the content of the Property
+String	SvBasicPropertyDataControl::GetProperty() const //Tell's the content of the Property
 {
     return aEntryProperty;
 }
 
-void*   SvBasicPropertyDataControl::GetData() //Tell's the storage
+void*	SvBasicPropertyDataControl::GetData() //Tell's the storage
 {
     return pTheData;
 }
@@ -1424,13 +1424,13 @@ void SvBasicPropertyDataControl::SetIsCorrect(BOOL nFlag)
 //========================================================================
 /*
 ScPropertyDlg::ScPropertyDlg( Window* pParent) :
-    ModalDialog     ( pParent, ScResId( RID_SCDLG_PROPERTIES) ),
-    aPropListBox    ( this, ResId( CTR_PROPLINE) ),
-    aKindOfListBox  (this,ResId( LB_KIND_OF_PROP)),
-    aModAnswer      (this,ResId(FT_ANSMOD   )),
-    aClickAnswer    (this,ResId(FT_ANSCLICK )),
-    aCommitAnswer   (this,ResId(FT_ANSCOMMIT)),
-    aSelectAnswer   (this,ResId(FT_ANSSELECT)),
+    ModalDialog 	( pParent, ScResId( RID_SCDLG_PROPERTIES) ),
+    aPropListBox	( this, ResId( CTR_PROPLINE) ),
+    aKindOfListBox	(this,ResId( LB_KIND_OF_PROP)),
+    aModAnswer		(this,ResId(FT_ANSMOD	)),
+    aClickAnswer	(this,ResId(FT_ANSCLICK )),
+    aCommitAnswer	(this,ResId(FT_ANSCOMMIT)),
+    aSelectAnswer	(this,ResId(FT_ANSSELECT)),
     anOk(this,ResId( BTN_OK)),
     aCancel(this,ResId( BTN_CANCEL))
 {
@@ -1445,9 +1445,9 @@ ScPropertyDlg::ScPropertyDlg( Window* pParent) :
     String aString("Don't know ");
 
     aBaProDatCtr.SetModifyHdl (LINK( this, ScPropertyDlg, RowModifiedHdl ));
-    aBaProDatCtr.SetClickedHdl(LINK( this, ScPropertyDlg, ClickHdl       ));
-    aBaProDatCtr.SetCommitHdl (LINK( this, ScPropertyDlg, SelectHdl      ));
-    aBaProDatCtr.SetSelectHdl (LINK( this, ScPropertyDlg, CommitHdl      ));
+    aBaProDatCtr.SetClickedHdl(LINK( this, ScPropertyDlg, ClickHdl		 ));
+    aBaProDatCtr.SetCommitHdl (LINK( this, ScPropertyDlg, SelectHdl 	 ));
+    aBaProDatCtr.SetSelectHdl (LINK( this, ScPropertyDlg, CommitHdl 	 ));
 
     aPropListBox.SetController(&aBaProDatCtr);
 
diff --git a/svtools/source/dialogs/roadmapwizard.cxx b/svtools/source/dialogs/roadmapwizard.cxx
index c28cfe1d4b18..69d6a86cd2c5 100644
--- a/svtools/source/dialogs/roadmapwizard.cxx
+++ b/svtools/source/dialogs/roadmapwizard.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
@@ -71,7 +71,7 @@ namespace svt
         StateDescriptions   aStateDescriptors;
         StateSet            aDisabledStates;
         bool                bActivePathIsDefinite;
-           FixedLine*           pFixedLine;
+           FixedLine*	        pFixedLine;
 
         RoadmapWizardImpl()
             :pRoadmap( NULL )
@@ -233,7 +233,7 @@ namespace svt
     }
 
     //--------------------------------------------------------------------
-    const BitmapEx& RoadmapWizard::GetRoadmapBitmap( ) const
+    const BitmapEx&	RoadmapWizard::GetRoadmapBitmap( ) const
     {
         return m_pImpl->pRoadmap->GetRoadmapBitmap();
     }
diff --git a/svtools/source/dialogs/so3res.src b/svtools/source/dialogs/so3res.src
index 524b58e0a5df..7373f6278ebf 100644
--- a/svtools/source/dialogs/so3res.src
+++ b/svtools/source/dialogs/so3res.src
@@ -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
@@ -28,7 +28,7 @@
 #include "sores.hxx"
 #define __RSC
 #include "soerr.hxx"
-#define S_MAX   0x7fff
+#define S_MAX	0x7fff
 Resource RID_SO_ERROR_HANDLER
 {
     String ERRCODE_SO_GENERALERROR&S_MAX
@@ -178,9 +178,9 @@ Resource RID_SO_ERROR_HANDLER
         Text [ en-US ] = "The specified file could not be opened." ;
     };
     /*
-    String  & S_MAX
+    String	& S_MAX
     {
-        Text          = "";
+        Text		  = "";
     };
 */
 };
diff --git a/svtools/source/dialogs/wizardmachine.cxx b/svtools/source/dialogs/wizardmachine.cxx
index 2053da80019d..0d9cc897c1cc 100644
--- a/svtools/source/dialogs/wizardmachine.cxx
+++ b/svtools/source/dialogs/wizardmachine.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
@@ -119,7 +119,7 @@ namespace svt
             // the WizardDialog does not allow non-linear transitions (e.g. it's
             // not possible to add pages in a non-linear order), so we need some own maintainance data
 
-        sal_Bool                        m_bAutoNextButtonState;
+        sal_Bool						m_bAutoNextButtonState;
 
         bool                            m_bTravelingSuspended;
 
@@ -203,7 +203,7 @@ namespace svt
             m_pPrevPage->Show();
 
             if (_nButtonFlags & WZB_NEXT)
-                AddButton( m_pPrevPage, ( WIZARDDIALOG_BUTTON_SMALLSTDOFFSET_X) );      // half x-offset to the next button
+                AddButton( m_pPrevPage, ( WIZARDDIALOG_BUTTON_SMALLSTDOFFSET_X) );		// half x-offset to the next button
             else
                 AddButton( m_pPrevPage, WIZARDDIALOG_BUTTON_STDOFFSET_X );
             SetPrevButton( m_pPrevPage );
@@ -373,14 +373,14 @@ namespace svt
 
             // is it a button?
             WindowType eType = pChildLoop->GetType();
-            if  (   (WINDOW_BUTTON == eType)
-                ||  (WINDOW_PUSHBUTTON == eType)
-                ||  (WINDOW_OKBUTTON == eType)
-                ||  (WINDOW_CANCELBUTTON == eType)
-                ||  (WINDOW_HELPBUTTON == eType)
-                ||  (WINDOW_IMAGEBUTTON == eType)
-                ||  (WINDOW_MENUBUTTON == eType)
-                ||  (WINDOW_MOREBUTTON == eType)
+            if	(	(WINDOW_BUTTON == eType)
+                ||	(WINDOW_PUSHBUTTON == eType)
+                ||	(WINDOW_OKBUTTON == eType)
+                ||	(WINDOW_CANCELBUTTON == eType)
+                ||	(WINDOW_HELPBUTTON == eType)
+                ||	(WINDOW_IMAGEBUTTON == eType)
+                ||	(WINDOW_MENUBUTTON == eType)
+                ||	(WINDOW_MOREBUTTON == eType)
                 )
             {
                 pChildLoop->SetStyle(pChildLoop->GetStyle() & ~WB_DEFBUTTON);
@@ -746,5 +746,5 @@ namespace svt
     }
 
 //.........................................................................
-}   // namespace svt
+}	// namespace svt
 //.........................................................................
diff --git a/svtools/source/dialogs/wizardmachine.src b/svtools/source/dialogs/wizardmachine.src
index 9c82ea30071f..b3c7e5e1a515 100644
--- a/svtools/source/dialogs/wizardmachine.src
+++ b/svtools/source/dialogs/wizardmachine.src
@@ -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
diff --git a/svtools/source/dialogs/wizdlg.cxx b/svtools/source/dialogs/wizdlg.cxx
index f06b4f53ce7c..69567fcb60e1 100644
--- a/svtools/source/dialogs/wizdlg.cxx
+++ b/svtools/source/dialogs/wizdlg.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
@@ -249,7 +249,7 @@ void WizardDialog::ImplPosCtrls()
 
 
 long WizardDialog::LogicalCoordinateToPixel(int iCoordinate){
-    Size aLocSize = LogicToPixel(Size( iCoordinate, 0 ), MAP_APPFONT );
+    Size aLocSize = LogicToPixel(Size( iCoordinate, 0 ), MAP_APPFONT ); 
     int iPixelCoordinate =  aLocSize.Width();
     return iPixelCoordinate;
 }
diff --git a/svtools/source/edit/editsyntaxhighlighter.cxx b/svtools/source/edit/editsyntaxhighlighter.cxx
index 01bb7ad41682..e6e5528f1980 100644
--- a/svtools/source/edit/editsyntaxhighlighter.cxx
+++ b/svtools/source/edit/editsyntaxhighlighter.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
@@ -34,14 +34,14 @@
 #include "../../inc/txtattr.hxx"
 
 
-MultiLineEditSyntaxHighlight::MultiLineEditSyntaxHighlight( Window* pParent, WinBits nWinStyle,
+MultiLineEditSyntaxHighlight::MultiLineEditSyntaxHighlight( Window* pParent, WinBits nWinStyle, 
     HighlighterLanguage aLanguage): MultiLineEdit(pParent,nWinStyle), mbDoBracketHilight(true)
 {
     EnableUpdateData(300);
     aHighlighter.initialize( aLanguage );
 }
 
-MultiLineEditSyntaxHighlight::MultiLineEditSyntaxHighlight( Window* pParent, const ResId& rResId ,
+MultiLineEditSyntaxHighlight::MultiLineEditSyntaxHighlight( Window* pParent, const ResId& rResId , 
     HighlighterLanguage aLanguage): MultiLineEdit(pParent,rResId), mbDoBracketHilight(true)
 {
     EnableUpdateData(300);
@@ -61,7 +61,7 @@ bool MultiLineEditSyntaxHighlight::IsBracketHilight()
 {
     return mbDoBracketHilight;
 }
-
+        
 void MultiLineEditSyntaxHighlight::SetText(const String& rNewText)
 {
     MultiLineEdit::SetText(rNewText);
@@ -78,8 +78,8 @@ void MultiLineEditSyntaxHighlight::DoBracketHilight(USHORT aKey)
 
     switch (aKey)
     {
-        case '\'':  // no break
-        case '"':
+        case '\'':	// no break
+        case '"': 
         {
             aChar = aKey;
             break;
@@ -110,7 +110,7 @@ void MultiLineEditSyntaxHighlight::DoBracketHilight(USHORT aKey)
 
             String aLine( GetTextEngine()->GetText( aPara ) );
             for (USHORT i = ((unsigned long)aPara==nStartPara) ? aStartPos-1 : (USHORT)(aLine.Len()-1); i>0; --i)
-            {
+            {	
                 if (aLine.GetChar(i)==aChar)
                 {
                     if (!aCount)
@@ -148,14 +148,14 @@ Color MultiLineEditSyntaxHighlight::GetColorValue(TokenTypes aToken)
         {
             switch (aToken)
             {
-                case TT_IDENTIFIER: aColor = (ColorData)m_aColorConfig.GetColorValue(svtools::SQLIDENTIFIER).nColor; break;
-                case TT_NUMBER:     aColor = (ColorData)m_aColorConfig.GetColorValue(svtools::SQLNUMBER).nColor; break;
-                case TT_STRING:     aColor = (ColorData)m_aColorConfig.GetColorValue(svtools::SQLSTRING).nColor; break;
-                case TT_OPERATOR:   aColor = (ColorData)m_aColorConfig.GetColorValue(svtools::SQLOPERATOR).nColor; break;
-                case TT_KEYWORDS:   aColor = (ColorData)m_aColorConfig.GetColorValue(svtools::SQLKEYWORD).nColor; break;
+                case TT_IDENTIFIER:	aColor = (ColorData)m_aColorConfig.GetColorValue(svtools::SQLIDENTIFIER).nColor; break;
+                case TT_NUMBER:		aColor = (ColorData)m_aColorConfig.GetColorValue(svtools::SQLNUMBER).nColor; break;
+                case TT_STRING:		aColor = (ColorData)m_aColorConfig.GetColorValue(svtools::SQLSTRING).nColor; break;
+                case TT_OPERATOR:	aColor = (ColorData)m_aColorConfig.GetColorValue(svtools::SQLOPERATOR).nColor; break;
+                case TT_KEYWORDS:	aColor = (ColorData)m_aColorConfig.GetColorValue(svtools::SQLKEYWORD).nColor; break;
                 case TT_PARAMETER:  aColor = (ColorData)m_aColorConfig.GetColorValue(svtools::SQLPARAMETER).nColor; break;
-                case TT_COMMENT:    aColor = (ColorData)m_aColorConfig.GetColorValue(svtools::SQLCOMMENT).nColor; break;
-                default:            aColor = Color(0,0,0);
+                case TT_COMMENT:	aColor = (ColorData)m_aColorConfig.GetColorValue(svtools::SQLCOMMENT).nColor; break;
+                default:			aColor = Color(0,0,0);
             }
             break;
         }
@@ -163,14 +163,14 @@ Color MultiLineEditSyntaxHighlight::GetColorValue(TokenTypes aToken)
         {
             switch (aToken)
             {
-                case TT_IDENTIFIER: aColor = Color(255,0,0); break;
-                case TT_COMMENT:    aColor = Color(0,0,45); break;
-                case TT_NUMBER:     aColor = Color(204,102,204); break;
-                case TT_STRING:     aColor = Color(0,255,45); break;
-                case TT_OPERATOR:   aColor = Color(0,0,100); break;
-                case TT_KEYWORDS:   aColor = Color(0,0,255); break;
-                case TT_ERROR :     aColor = Color(0,255,255); break;
-                default:            aColor = Color(0,0,0);
+                case TT_IDENTIFIER:	aColor = Color(255,0,0); break;
+                case TT_COMMENT:	aColor = Color(0,0,45); break;
+                case TT_NUMBER:		aColor = Color(204,102,204); break;
+                case TT_STRING:		aColor = Color(0,255,45); break;
+                case TT_OPERATOR:	aColor = Color(0,0,100); break;
+                case TT_KEYWORDS:	aColor = Color(0,0,255); break;
+                case TT_ERROR :		aColor = Color(0,255,255); break;
+                default:			aColor = Color(0,0,0);
             }
             break;
         }
@@ -189,7 +189,7 @@ void MultiLineEditSyntaxHighlight::UpdateData()
     {
         String aLine( GetTextEngine()->GetText( nLine ) );
         Range aChanges = aHighlighter.notifyChange( nLine, 0, &aLine, 1 );
-
+            
         GetTextEngine()->RemoveAttribs( nLine, TRUE );
         HighlightPortions aPortions;
         aHighlighter.getHighlightPortions( nLine, aLine, aPortions );
diff --git a/svtools/source/edit/svmedit.cxx b/svtools/source/edit/svmedit.cxx
index daaff472d1cc..c207472d8617 100644
--- a/svtools/source/edit/svmedit.cxx
+++ b/svtools/source/edit/svmedit.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
@@ -48,13 +48,13 @@
 
 
 // IDs erstmal aus VCL geklaut, muss mal richtig delivert werden...
-#define SV_MENU_EDIT_UNDO           1
-#define SV_MENU_EDIT_CUT            2
-#define SV_MENU_EDIT_COPY           3
-#define SV_MENU_EDIT_PASTE          4
-#define SV_MENU_EDIT_DELETE         5
-#define SV_MENU_EDIT_SELECTALL      6
-#define SV_MENU_EDIT_INSERTSYMBOL   7
+#define SV_MENU_EDIT_UNDO			1
+#define SV_MENU_EDIT_CUT			2
+#define SV_MENU_EDIT_COPY			3
+#define SV_MENU_EDIT_PASTE			4
+#define SV_MENU_EDIT_DELETE 		5
+#define SV_MENU_EDIT_SELECTALL		6
+#define SV_MENU_EDIT_INSERTSYMBOL	7
 #include <vcl/scrbar.hxx>
 
 namespace css = ::com::sun::star;
@@ -62,40 +62,40 @@ namespace css = ::com::sun::star;
 class TextWindow : public Window
 {
 private:
-    ExtTextEngine*  mpExtTextEngine;
-    ExtTextView*    mpExtTextView;
+    ExtTextEngine*	mpExtTextEngine;
+    ExtTextView*	mpExtTextView;
 
-    BOOL            mbInMBDown;
-    BOOL            mbFocusSelectionHide;
-    BOOL            mbIgnoreTab;
-    BOOL            mbActivePopup;
+    BOOL			mbInMBDown;
+    BOOL			mbFocusSelectionHide;
+    BOOL			mbIgnoreTab;
+    BOOL			mbActivePopup;
     BOOL            mbSelectOnTab;
 
 public:
                     TextWindow( Window* pParent );
                     ~TextWindow();
 
-    ExtTextEngine*  GetTextEngine() const { return mpExtTextEngine; }
-    ExtTextView*    GetTextView() const { return mpExtTextView; }
+    ExtTextEngine* 	GetTextEngine() const { return mpExtTextEngine; }
+    ExtTextView*	GetTextView() const { return mpExtTextView; }
 
-    virtual void    MouseMove( const MouseEvent& rMEvt );
-    virtual void    MouseButtonDown( const MouseEvent& rMEvt );
-    virtual void    MouseButtonUp( const MouseEvent& rMEvt );
-    virtual void    KeyInput( const KeyEvent& rKEvent );
+    virtual void	MouseMove( const MouseEvent& rMEvt );
+    virtual void	MouseButtonDown( const MouseEvent& rMEvt );
+    virtual void	MouseButtonUp( const MouseEvent& rMEvt );
+    virtual void	KeyInput( const KeyEvent& rKEvent );
 
-    virtual void    Command( const CommandEvent& rCEvt );
+    virtual void	Command( const CommandEvent& rCEvt );
 
-    virtual void    Paint( const Rectangle& rRect );
-    virtual void    Resize();
+    virtual void	Paint( const Rectangle& rRect );
+    virtual void	Resize();
 
-    virtual void    GetFocus();
-    virtual void    LoseFocus();
+    virtual void	GetFocus();
+    virtual void	LoseFocus();
 
-    BOOL            IsAutoFocusHide() const { return mbFocusSelectionHide; }
-    void            SetAutoFocusHide( BOOL bAutoHide ) { mbFocusSelectionHide = bAutoHide; }
+    BOOL			IsAutoFocusHide() const { return mbFocusSelectionHide; }
+    void			SetAutoFocusHide( BOOL bAutoHide ) { mbFocusSelectionHide = bAutoHide; }
 
-    BOOL            IsIgnoreTab() const { return mbIgnoreTab; }
-    void            SetIgnoreTab( BOOL bIgnore ) { mbIgnoreTab = bIgnore; }
+    BOOL			IsIgnoreTab() const { return mbIgnoreTab; }
+    void			SetIgnoreTab( BOOL bIgnore ) { mbIgnoreTab = bIgnore; }
 
     void            DisableSelectionOnFocus() {mbSelectOnTab = sal_False;}
 
@@ -108,78 +108,78 @@ public:
 class ImpSvMEdit : public SfxListener
 {
 private:
-    MultiLineEdit*      pSvMultiLineEdit;
+    MultiLineEdit*		pSvMultiLineEdit;
 
-    TextWindow*         mpTextWindow;
-    ScrollBar*          mpHScrollBar;
-    ScrollBar*          mpVScrollBar;
-    ScrollBarBox*       mpScrollBox;
+    TextWindow* 		mpTextWindow;
+    ScrollBar*			mpHScrollBar;
+    ScrollBar*			mpVScrollBar;
+    ScrollBarBox*		mpScrollBox;
 
-    Point               maTextWindowOffset;
-    xub_StrLen          mnTextWidth;
+    Point				maTextWindowOffset;
+    xub_StrLen			mnTextWidth;
     mutable Selection   maSelection;
 
 protected:
-    virtual void        Notify( SfxBroadcaster& rBC, const SfxHint& rHint );
-    void                ImpUpdateSrollBarVis( WinBits nWinStyle );
-    void                ImpInitScrollBars();
-    void                ImpSetScrollBarRanges();
+    virtual void		Notify( SfxBroadcaster& rBC, const SfxHint& rHint );
+    void				ImpUpdateSrollBarVis( WinBits nWinStyle );
+    void				ImpInitScrollBars();
+    void				ImpSetScrollBarRanges();
     void                ImpSetHScrollBarThumbPos();
-    DECL_LINK(          ScrollHdl, ScrollBar* );
+    DECL_LINK(			ScrollHdl, ScrollBar* );
 
 public:
                 ImpSvMEdit( MultiLineEdit* pSvMultiLineEdit, WinBits nWinStyle );
                 ~ImpSvMEdit();
 
-    void        SetModified( BOOL bMod );
-    BOOL        IsModified() const;
+    void		SetModified( BOOL bMod );
+    BOOL		IsModified() const;
 
-    void        SetReadOnly( BOOL bRdOnly );
-    BOOL        IsReadOnly() const;
+    void		SetReadOnly( BOOL bRdOnly );
+    BOOL		IsReadOnly() const;
 
-    void        SetMaxTextLen( xub_StrLen nLen );
-    xub_StrLen  GetMaxTextLen() const;
+    void		SetMaxTextLen( xub_StrLen nLen );
+    xub_StrLen	GetMaxTextLen() const;
 
-    void        SetInsertMode( BOOL bInsert );
-    BOOL        IsInsertMode() const;
+    void		SetInsertMode( BOOL bInsert );
+    BOOL		IsInsertMode() const;
 
-    void        InsertText( const String& rStr );
-    String      GetSelected() const;
-    String      GetSelected( LineEnd aSeparator ) const;
+    void		InsertText( const String& rStr );
+    String		GetSelected() const;
+    String		GetSelected( LineEnd aSeparator ) const;
 
-    void        SetSelection( const Selection& rSelection );
+    void		SetSelection( const Selection& rSelection );
     const Selection& GetSelection() const;
 
-    void        Cut();
-    void        Copy();
-    void        Paste();
+    void		Cut();
+    void		Copy();
+    void		Paste();
 
-    void        SetText( const String& rStr );
-    String      GetText() const;
-    String      GetText( LineEnd aSeparator ) const;
-    String      GetTextLines() const;
-    String      GetTextLines( LineEnd aSeparator ) const;
+    void		SetText( const String& rStr );
+    String		GetText() const;
+    String		GetText( LineEnd aSeparator ) const;
+    String		GetTextLines() const;
+    String		GetTextLines( LineEnd aSeparator ) const;
 
-    void        Resize();
-    void        GetFocus();
+    void		Resize();
+    void		GetFocus();
 
-    BOOL        HandleCommand( const CommandEvent& rCEvt );
+    BOOL		HandleCommand( const CommandEvent& rCEvt );
 
-    void        Enable( BOOL bEnable );
+    void		Enable( BOOL bEnable );
 
-    Size        CalcMinimumSize() const;
-    Size        CalcSize( USHORT nColumns, USHORT nLines ) const;
-    void        GetMaxVisColumnsAndLines( USHORT& rnCols, USHORT& rnLines ) const;
+    Size		CalcMinimumSize() const;
+    Size		CalcSize( USHORT nColumns, USHORT nLines ) const;
+    void		GetMaxVisColumnsAndLines( USHORT& rnCols, USHORT& rnLines ) const;
 
-    void        SetAlign( WinBits nWinStyle );
+    void		SetAlign( WinBits nWinStyle );
 
-    void        InitFromStyle( WinBits nWinStyle );
+    void		InitFromStyle( WinBits nWinStyle );
 
     TextWindow* GetTextWindow() { return mpTextWindow; }
     ScrollBar*  GetHScrollBar() { return mpHScrollBar; }
     ScrollBar*  GetVScrollBar() { return mpVScrollBar; }
 
-    void        SetTextWindowOffset( const Point& rOffset );
+    void 		SetTextWindowOffset( const Point& rOffset );
 };
 
 ImpSvMEdit::ImpSvMEdit( MultiLineEdit* pEdt, WinBits nWinStyle )
@@ -309,10 +309,10 @@ void ImpSvMEdit::ImpSetScrollBarRanges()
     }
     if ( mpHScrollBar )
     {
-//      ULONG nTextWidth = mpTextWindow->GetTextEngine()->CalcTextWidth();
+//		ULONG nTextWidth = mpTextWindow->GetTextEngine()->CalcTextWidth();
         // Es gibt kein Notify bei Breiten-Aenderung...
-//      ULONG nW = Max( (ULONG)mpTextWindow->GetOutputSizePixel().Width()*5, (ULONG)nTextWidth );
-//      mpHScrollBar->SetRange( Range( 0, (long)nW ) );
+//		ULONG nW = Max( (ULONG)mpTextWindow->GetOutputSizePixel().Width()*5, (ULONG)nTextWidth );
+//		mpHScrollBar->SetRange( Range( 0, (long)nW ) );
         mpHScrollBar->SetRange( Range( 0, (long)mnTextWidth-1 ) );
     }
 }
@@ -372,8 +372,8 @@ IMPL_LINK( ImpSvMEdit, ScrollHdl, ScrollBar*, pCurScrollBar )
 
 // void ImpSvMEdit::ImpModified()
 // {
-//  // Wann wird das gerufen ?????????????????????
-//  pSvMultiLineEdit->Modify();
+//	// Wann wird das gerufen ?????????????????????
+//	pSvMultiLineEdit->Modify();
 // }
 
 void ImpSvMEdit::SetAlign( WinBits nWinStyle )
@@ -680,7 +680,7 @@ const Selection& ImpSvMEdit::GetSelection() const
 
 Size ImpSvMEdit::CalcMinimumSize() const
 {
-    Size aSz(   mpTextWindow->GetTextEngine()->CalcTextWidth(),
+    Size aSz(	mpTextWindow->GetTextEngine()->CalcTextWidth(),
                 mpTextWindow->GetTextEngine()->GetTextHeight() );
 
     if ( mpHScrollBar )
@@ -790,7 +790,7 @@ void TextWindow::MouseMove( const MouseEvent& rMEvt )
 
 void TextWindow::MouseButtonDown( const MouseEvent& rMEvt )
 {
-    mbInMBDown = TRUE;  // Dann im GetFocus nicht alles selektieren wird
+    mbInMBDown = TRUE;	// Dann im GetFocus nicht alles selektieren wird
     mpExtTextView->MouseButtonDown( rMEvt );
     Window::MouseButtonDown( rMEvt );
     GrabFocus();
@@ -807,7 +807,7 @@ void TextWindow::KeyInput( const KeyEvent& rKEvent )
 {
     BOOL bDone = FALSE;
     USHORT nCode = rKEvent.GetKeyCode().GetCode();
-    if ( nCode == com::sun::star::awt::Key::SELECT_ALL ||
+    if ( nCode == com::sun::star::awt::Key::SELECT_ALL || 
          ( (nCode == KEY_A) && rKEvent.GetKeyCode().IsMod1() && !rKEvent.GetKeyCode().IsMod2() )
        )
     {
@@ -878,10 +878,10 @@ void TextWindow::Command( const CommandEvent& rCEvt )
         {
             pPopup->EnableItem( SV_MENU_EDIT_UNDO, FALSE );
         }
-//      if ( ( maSelection.Min() == 0 ) && ( maSelection.Max() == maText.Len() ) )
-//      {
-//          pPopup->EnableItem( SV_MENU_EDIT_SELECTALL, FALSE );
-//      }
+//		if ( ( maSelection.Min() == 0 ) && ( maSelection.Max() == maText.Len() ) )
+//		{
+//			pPopup->EnableItem( SV_MENU_EDIT_SELECTALL, FALSE );
+//		}
         if ( !Edit::GetGetSpecialCharsFunction() )
         {
             USHORT nPos = pPopup->GetItemPos( SV_MENU_EDIT_INSERTSYMBOL );
@@ -897,30 +897,30 @@ void TextWindow::Command( const CommandEvent& rCEvt )
             Size aSize = GetOutputSizePixel();
             aPos = Point( aSize.Width()/2, aSize.Height()/2 );
         }
-//      pPopup->RemoveDisabledEntries();
+//		pPopup->RemoveDisabledEntries();
         USHORT n = pPopup->Execute( this, aPos );
         Edit::DeletePopupMenu( pPopup );
         switch ( n )
         {
-            case SV_MENU_EDIT_UNDO:     mpExtTextView->Undo();
+            case SV_MENU_EDIT_UNDO: 	mpExtTextView->Undo();
                                         mpExtTextEngine->SetModified( TRUE );
                                         mpExtTextEngine->Broadcast( TextHint( TEXT_HINT_MODIFIED ) );
                                         break;
-            case SV_MENU_EDIT_CUT:      mpExtTextView->Cut();
+            case SV_MENU_EDIT_CUT:		mpExtTextView->Cut();
                                         mpExtTextEngine->SetModified( TRUE );
                                         mpExtTextEngine->Broadcast( TextHint( TEXT_HINT_MODIFIED ) );
                                         break;
-            case SV_MENU_EDIT_COPY:     mpExtTextView->Copy();
+            case SV_MENU_EDIT_COPY: 	mpExtTextView->Copy();
                                         break;
-            case SV_MENU_EDIT_PASTE:    mpExtTextView->Paste();
+            case SV_MENU_EDIT_PASTE:	mpExtTextView->Paste();
                                         mpExtTextEngine->SetModified( TRUE );
                                         mpExtTextEngine->Broadcast( TextHint( TEXT_HINT_MODIFIED ) );
                                         break;
-            case SV_MENU_EDIT_DELETE:   mpExtTextView->DeleteSelected();
+            case SV_MENU_EDIT_DELETE:	mpExtTextView->DeleteSelected();
                                         mpExtTextEngine->SetModified( TRUE );
                                         mpExtTextEngine->Broadcast( TextHint( TEXT_HINT_MODIFIED ) );
                                         break;
-            case SV_MENU_EDIT_SELECTALL:    mpExtTextView->SetSelection( TextSelection( TextPaM( 0, 0 ), TextPaM( 0xFFFFFFFF, 0xFFFF ) ) );
+            case SV_MENU_EDIT_SELECTALL:	mpExtTextView->SetSelection( TextSelection( TextPaM( 0, 0 ), TextPaM( 0xFFFFFFFF, 0xFFFF ) ) );
                                             break;
             case SV_MENU_EDIT_INSERTSYMBOL:
                 {
@@ -1514,7 +1514,7 @@ long MultiLineEdit::PreNotify( NotifyEvent& rNEvt )
                             pImpSvMEdit->GetVScrollBar()->DoScrollAction( SCROLL_LINEDOWN );
                     }
                     break;
-                    case KEY_PAGEUP :
+                    case KEY_PAGEUP	:
                     {
                         if ( pImpSvMEdit->GetVScrollBar() )
                             pImpSvMEdit->GetVScrollBar()->DoScrollAction( SCROLL_PAGEUP );
diff --git a/svtools/source/edit/svmedit2.cxx b/svtools/source/edit/svmedit2.cxx
index 19eba618a828..5d0bc953a619 100644
--- a/svtools/source/edit/svmedit2.cxx
+++ b/svtools/source/edit/svmedit2.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
diff --git a/svtools/source/edit/sychconv.cxx b/svtools/source/edit/sychconv.cxx
index 3efa510bfc5a..1173aeb7c448 100644
--- a/svtools/source/edit/sychconv.cxx
+++ b/svtools/source/edit/sychconv.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
@@ -33,44 +33,44 @@
 BOOL SymCharConverter::Convert( Font& rFont, UniString& rString, OutputDevice* pDev )
 {
     // hibyte 0 = exact matching
-    //        1 = little differences,
-    //        2 = the converted character does not look like the original but got the same meaning
-    //        3 = the destination does not match looking and meaning of the original
+    //		  1 = little differences, 
+    //		  2 = the converted character does not look like the original but got the same meaning
+    //		  3 = the destination does not match looking and meaning of the original
 
     static USHORT __READONLY_DATA aWingdingsToStarBatsTable[ 256 - 32 ] =
     {
-        0x0020, 0x0238, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0174, 0x02BA, 0x017B, 0x017C, 0x037C, 0x037C, 0x037C, 0x037C,
-        0x0000, 0x0000, 0x0372, 0x0272, 0x0372, 0x0000, 0x0000, 0x0374, 0x0279, 0x0000, 0x027A, 0x0000, 0x0178, 0x0278, 0x0000, 0x0137,
-        0x027E, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x017D, 0x0000, 0x0000, 0x0000, 0x0021, 0x03AC, 0x00AD, 0x0000, 0x0000, 0x0000,
-        0x0000, 0x0000, 0x01C0, 0x0000, 0x0000, 0x0286, 0x0286, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
-        0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0022, 0x0023, 0x0024, 0x0025,
-        0x0026, 0x0027, 0x0028, 0x0029, 0x002A, 0x002B, 0x002C, 0x002D, 0x0133, 0x0000, 0x0000, 0x0000, 0x0000, 0x0193, 0x0194, 0x0000,
-        0x0067, 0x0068, 0x0069, 0x006A, 0x006B, 0x006C, 0x006D, 0x006E, 0x006F, 0x0070, 0x0071, 0x005C, 0x005D, 0x005E, 0x005F, 0x0060,
-        0x0061, 0x0062, 0x0063, 0x0064, 0x0065, 0x0066, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x01A5, 0x0095,
-        0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x002E, 0x0024, 0x0125, 0x0000, 0x0000, 0x0000, 0x014B, 0x024D, 0x014E, 0x014A,
-        0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
-        0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
-        0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x002F, 0x0000, 0x0000, 0x0000, 0x0035, 0x0000, 0x0000, 0x0000,
-        0x0030, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0031, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x01B1,
-        0x01AF, 0x01B2, 0x01B0, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0150, 0x0032, 0x0033, 0x0034, 0x01C8
+        0x0020, 0x0238, 0x0000,	0x0000,	0x0000,	0x0000,	0x0000,	0x0000,	0x0174,	0x02BA,	0x017B,	0x017C,	0x037C,	0x037C,	0x037C,	0x037C,
+        0x0000, 0x0000, 0x0372,	0x0272,	0x0372,	0x0000,	0x0000,	0x0374,	0x0279,	0x0000,	0x027A,	0x0000,	0x0178,	0x0278,	0x0000,	0x0137,
+        0x027E, 0x0000, 0x0000,	0x0000,	0x0000,	0x0000,	0x017D,	0x0000,	0x0000,	0x0000,	0x0021,	0x03AC,	0x00AD,	0x0000,	0x0000,	0x0000,
+        0x0000, 0x0000, 0x01C0,	0x0000,	0x0000,	0x0286,	0x0286,	0x0000,	0x0000,	0x0000,	0x0000,	0x0000,	0x0000,	0x0000,	0x0000,	0x0000,
+        0x0000, 0x0000, 0x0000,	0x0000,	0x0000,	0x0000,	0x0000,	0x0000,	0x0000,	0x0000,	0x0000,	0x0000,	0x0022,	0x0023,	0x0024,	0x0025,
+        0x0026, 0x0027, 0x0028,	0x0029,	0x002A,	0x002B,	0x002C,	0x002D,	0x0133,	0x0000,	0x0000,	0x0000,	0x0000,	0x0193,	0x0194,	0x0000,
+        0x0067, 0x0068, 0x0069,	0x006A,	0x006B,	0x006C,	0x006D,	0x006E,	0x006F,	0x0070,	0x0071,	0x005C,	0x005D,	0x005E,	0x005F,	0x0060,
+        0x0061, 0x0062, 0x0063,	0x0064,	0x0065,	0x0066,	0x0000,	0x0000,	0x0000,	0x0000,	0x0000,	0x0000,	0x0000,	0x0000,	0x01A5,	0x0095,
+        0x0000, 0x0000, 0x0000,	0x0000,	0x0000,	0x0000,	0x002E,	0x0024,	0x0125,	0x0000,	0x0000,	0x0000,	0x014B,	0x024D,	0x014E,	0x014A,
+        0x0000, 0x0000, 0x0000,	0x0000,	0x0000,	0x0000,	0x0000,	0x0000,	0x0000,	0x0000,	0x0000,	0x0000,	0x0000,	0x0000,	0x0000,	0x0000,
+        0x0000, 0x0000, 0x0000,	0x0000,	0x0000,	0x0000,	0x0000,	0x0000,	0x0000,	0x0000,	0x0000,	0x0000,	0x0000,	0x0000,	0x0000,	0x0000,
+        0x0000, 0x0000, 0x0000,	0x0000,	0x0000,	0x0000,	0x0000,	0x0000,	0x002F,	0x0000,	0x0000,	0x0000,	0x0035,	0x0000,	0x0000,	0x0000,
+        0x0030, 0x0000, 0x0000,	0x0000,	0x0000,	0x0000,	0x0000,	0x0000,	0x0031,	0x0000,	0x0000,	0x0000,	0x0000,	0x0000,	0x0000,	0x01B1,
+        0x01AF, 0x01B2, 0x01B0,	0x0000,	0x0000,	0x0000,	0x0000,	0x0000,	0x0000,	0x0000,	0x0000,	0x0150,	0x0032,	0x0033,	0x0034,	0x01C8
     };
 
     static USHORT __READONLY_DATA aMonotypeSortsToStarBatsTable[ 256 - 32 ]=
     {
-        0x0020, 0x00cb, 0x00cb, 0x00cb, 0x00cb, 0x0074, 0x00ba, 0x0021, 0x00cc, 0x007b, 0x0036, 0x007d, 0x007e, 0x0037, 0x0038, 0x0038,
-        0x0039, 0x0038, 0x0038, 0x0039, 0x003a, 0x004f, 0x0050, 0x004f, 0x0050, 0x0051, 0x0052, 0x0053, 0x0054, 0x0086, 0x0086, 0x0086,
-        0x0052, 0x00cd, 0x0044, 0x0045, 0x0046, 0x0047, 0x0041, 0x0041, 0x0058, 0x0057, 0x0075, 0x0055, 0x0056, 0x0057, 0x0058, 0x0059,
-        0x005a, 0x004b, 0x004b, 0x0048, 0x0049, 0x004a, 0x004b, 0x004c, 0x004d, 0x004e, 0x004e, 0x004b, 0x004b, 0x00ce, 0x00ce, 0x00ce,
-        0x00ce, 0x00ce, 0x00ce, 0x00ce, 0x00cf, 0x00cf, 0x00cf, 0x00cf, 0x00cf, 0x00cf, 0x00b9, 0x00b9, 0x003b, 0x003c, 0x003d, 0x003e,
-        0x003f, 0x003e, 0x0040, 0x00c5, 0x00c4, 0x002b, 0x002c, 0x00d0, 0x00d1, 0x00d1, 0x00d1, 0x0091, 0x0092, 0x0093, 0x0094, 0x0000,
-        0x00d2, 0x00d3, 0x00d2, 0x00d3, 0x00d2, 0x00d3, 0x00d2, 0x00d3, 0x00d2, 0x00d3, 0x00d2, 0x00d3, 0x00d2, 0x00d3, 0x0000, 0x0000,
-        0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
-        0x0000, 0x00d4, 0x00d4, 0x00d4, 0x00d6, 0x00d6, 0x00d4, 0x00d4, 0x00d5, 0x002a, 0x00d6, 0x00d7, 0x0068, 0x0069, 0x006a, 0x006b,
-        0x006c, 0x006d, 0x006e, 0x006f, 0x0070, 0x0071, 0x005d, 0x005e, 0x005f, 0x0060, 0x0061, 0x0062, 0x0063, 0x0064, 0x0065, 0x0066,
-        0x0068, 0x0069, 0x006a, 0x006b, 0x006c, 0x006d, 0x006e, 0x006f, 0x0070, 0x0071, 0x005d, 0x005e, 0x005f, 0x0060, 0x0061, 0x0062,
-        0x0063, 0x0064, 0x0065, 0x0066, 0x0030, 0x0031, 0x00d8, 0x00d9, 0x00da, 0x00bc, 0x00db, 0x00bc, 0x00bc, 0x00bc, 0x00bc, 0x0031,
-        0x0031, 0x0031, 0x002f, 0x002f, 0x002f, 0x00be, 0x00be, 0x0031, 0x0031, 0x00af, 0x00af, 0x00af, 0x00af, 0x00af, 0x00af, 0x00af,
-        0x0000, 0x00af, 0x0035, 0x00dc, 0x00da, 0x00dc, 0x00db, 0x00da, 0x00dc, 0x00db, 0x00dc, 0x00dc, 0x00dc, 0x00dc, 0x00af, 0x0000
+        0x0020,	0x00cb,	0x00cb,	0x00cb,	0x00cb,	0x0074,	0x00ba,	0x0021,	0x00cc,	0x007b,	0x0036,	0x007d,	0x007e,	0x0037,	0x0038,	0x0038,
+        0x0039,	0x0038,	0x0038,	0x0039,	0x003a,	0x004f,	0x0050,	0x004f,	0x0050,	0x0051,	0x0052,	0x0053,	0x0054,	0x0086,	0x0086,	0x0086,
+        0x0052,	0x00cd,	0x0044,	0x0045,	0x0046,	0x0047,	0x0041,	0x0041,	0x0058,	0x0057,	0x0075,	0x0055,	0x0056,	0x0057,	0x0058,	0x0059,
+        0x005a,	0x004b,	0x004b,	0x0048,	0x0049,	0x004a,	0x004b,	0x004c,	0x004d,	0x004e,	0x004e,	0x004b,	0x004b,	0x00ce,	0x00ce,	0x00ce,
+        0x00ce,	0x00ce,	0x00ce,	0x00ce,	0x00cf,	0x00cf,	0x00cf,	0x00cf,	0x00cf,	0x00cf,	0x00b9,	0x00b9,	0x003b,	0x003c,	0x003d,	0x003e,
+        0x003f,	0x003e,	0x0040,	0x00c5,	0x00c4,	0x002b,	0x002c,	0x00d0,	0x00d1,	0x00d1,	0x00d1,	0x0091,	0x0092,	0x0093,	0x0094,	0x0000,
+        0x00d2,	0x00d3,	0x00d2,	0x00d3,	0x00d2,	0x00d3,	0x00d2,	0x00d3,	0x00d2,	0x00d3,	0x00d2,	0x00d3,	0x00d2,	0x00d3,	0x0000,	0x0000,
+        0x0000,	0x0000,	0x0000,	0x0000,	0x0000,	0x0000,	0x0000,	0x0000,	0x0000,	0x0000,	0x0000,	0x0000,	0x0000,	0x0000,	0x0000,	0x0000,
+        0x0000,	0x00d4,	0x00d4,	0x00d4,	0x00d6,	0x00d6,	0x00d4,	0x00d4,	0x00d5,	0x002a,	0x00d6,	0x00d7,	0x0068,	0x0069,	0x006a,	0x006b,
+        0x006c,	0x006d,	0x006e,	0x006f,	0x0070,	0x0071,	0x005d,	0x005e,	0x005f,	0x0060,	0x0061,	0x0062,	0x0063,	0x0064,	0x0065,	0x0066,
+        0x0068,	0x0069,	0x006a,	0x006b,	0x006c,	0x006d,	0x006e,	0x006f,	0x0070,	0x0071,	0x005d,	0x005e,	0x005f,	0x0060,	0x0061,	0x0062,
+        0x0063,	0x0064,	0x0065,	0x0066,	0x0030,	0x0031,	0x00d8,	0x00d9,	0x00da,	0x00bc,	0x00db,	0x00bc,	0x00bc,	0x00bc,	0x00bc,	0x0031,
+        0x0031,	0x0031,	0x002f,	0x002f,	0x002f,	0x00be,	0x00be,	0x0031,	0x0031,	0x00af,	0x00af,	0x00af,	0x00af,	0x00af,	0x00af,	0x00af,
+        0x0000,	0x00af,	0x0035,	0x00dc,	0x00da,	0x00dc,	0x00db,	0x00da,	0x00dc,	0x00db,	0x00dc,	0x00dc,	0x00dc,	0x00dc,	0x00af,	0x0000
     };
 
     const USHORT* pTransTable = NULL;
@@ -91,8 +91,8 @@ BOOL SymCharConverter::Convert( Font& rFont, UniString& rString, OutputDevice* p
             c = rString.GetChar( i );
             c -= 32;
             c = ( ((UINT16)c) >= 224 ) ? 0 : (sal_Unicode) pTransTable[ c ];
-            if ( !c )               // if character is out of range or not matching
-                c = 0xA5;           // we will default a StarBats-Bullet
+            if ( !c )				// if character is out of range or not matching
+                c = 0xA5;			// we will default a StarBats-Bullet
             rString.SetChar( i, c );
         }
         rFont.SetCharSet( RTL_TEXTENCODING_SYMBOL );
diff --git a/svtools/source/edit/syntaxhighlight.cxx b/svtools/source/edit/syntaxhighlight.cxx
index 5729eb712bfe..6788e85c0394 100644
--- a/svtools/source/edit/syntaxhighlight.cxx
+++ b/svtools/source/edit/syntaxhighlight.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
@@ -188,9 +188,9 @@ static const char* strListSqlKeyWords[] = {
     "drop",
     "escape",
     "except",
-    "exists",
+    "exists",	
     "false",
-    "from",
+    "from",	
     "full",
     "global",
     "group",
@@ -241,7 +241,7 @@ extern "C" int CDECL compare_strings( const void *arg1, const void *arg2 )
 
 class LetterTable
 {
-    bool        IsLetterTab[256];
+    bool		IsLetterTab[256];
 
 public:
     LetterTable( void );
@@ -261,7 +261,7 @@ class BasicSimpleCharClass
 public:
     static BOOL isAlpha( sal_Unicode c, bool bCompatible )
     {
-        BOOL bRet = (c >= 'a' && c <= 'z') || (c >= 'A' && c <= 'Z')
+        BOOL bRet = (c >= 'a' && c <= 'z') || (c >= 'A' && c <= 'Z') 
                     || (bCompatible && aLetterTable.isLetter( c ));
         return bRet;
     }
@@ -286,68 +286,68 @@ LetterTable::LetterTable( void )
     for( int i = 0 ; i < 256 ; ++i )
         IsLetterTab[i] = false;
 
-    IsLetterTab[0xC0] = true;   // � , CAPITAL LETTER A WITH GRAVE ACCENT
-    IsLetterTab[0xC1] = true;   // � , CAPITAL LETTER A WITH ACUTE ACCENT
-    IsLetterTab[0xC2] = true;   // � , CAPITAL LETTER A WITH CIRCUMFLEX ACCENT
-    IsLetterTab[0xC3] = true;   // � , CAPITAL LETTER A WITH TILDE
-    IsLetterTab[0xC4] = true;   // � , CAPITAL LETTER A WITH DIAERESIS
-    IsLetterTab[0xC5] = true;   // � , CAPITAL LETTER A WITH RING ABOVE
-    IsLetterTab[0xC6] = true;   // � , CAPITAL LIGATURE AE
-    IsLetterTab[0xC7] = true;   // � , CAPITAL LETTER C WITH CEDILLA
-    IsLetterTab[0xC8] = true;   // � , CAPITAL LETTER E WITH GRAVE ACCENT
-    IsLetterTab[0xC9] = true;   // � , CAPITAL LETTER E WITH ACUTE ACCENT
-    IsLetterTab[0xCA] = true;   // � , CAPITAL LETTER E WITH CIRCUMFLEX ACCENT
-    IsLetterTab[0xCB] = true;   // � , CAPITAL LETTER E WITH DIAERESIS
-    IsLetterTab[0xCC] = true;   // � , CAPITAL LETTER I WITH GRAVE ACCENT
-    IsLetterTab[0xCD] = true;   // � , CAPITAL LETTER I WITH ACUTE ACCENT
-    IsLetterTab[0xCE] = true;   // � , CAPITAL LETTER I WITH CIRCUMFLEX ACCENT
-    IsLetterTab[0xCF] = true;   // � , CAPITAL LETTER I WITH DIAERESIS
-    IsLetterTab[0xD0] = true;   // � , CAPITAL LETTER ETH
-    IsLetterTab[0xD1] = true;   // � , CAPITAL LETTER N WITH TILDE
-    IsLetterTab[0xD2] = true;   // � , CAPITAL LETTER O WITH GRAVE ACCENT
-    IsLetterTab[0xD3] = true;   // � , CAPITAL LETTER O WITH ACUTE ACCENT
-    IsLetterTab[0xD4] = true;   // � , CAPITAL LETTER O WITH CIRCUMFLEX ACCENT
-    IsLetterTab[0xD5] = true;   // � , CAPITAL LETTER O WITH TILDE
-    IsLetterTab[0xD6] = true;   // � , CAPITAL LETTER O WITH DIAERESIS
-    IsLetterTab[0xD8] = true;   // � , CAPITAL LETTER O WITH STROKE
-    IsLetterTab[0xD9] = true;   // � , CAPITAL LETTER U WITH GRAVE ACCENT
-    IsLetterTab[0xDA] = true;   // � , CAPITAL LETTER U WITH ACUTE ACCENT
-    IsLetterTab[0xDB] = true;   // � , CAPITAL LETTER U WITH CIRCUMFLEX ACCENT
-    IsLetterTab[0xDC] = true;   // � , CAPITAL LETTER U WITH DIAERESIS
-    IsLetterTab[0xDD] = true;   // � , CAPITAL LETTER Y WITH ACUTE ACCENT
-    IsLetterTab[0xDE] = true;   // � , CAPITAL LETTER THORN
-    IsLetterTab[0xDF] = true;   // � , SMALL LETTER SHARP S
-    IsLetterTab[0xE0] = true;   // � , SMALL LETTER A WITH GRAVE ACCENT
-    IsLetterTab[0xE1] = true;   // � , SMALL LETTER A WITH ACUTE ACCENT
-    IsLetterTab[0xE2] = true;   // � , SMALL LETTER A WITH CIRCUMFLEX ACCENT
-    IsLetterTab[0xE3] = true;   // � , SMALL LETTER A WITH TILDE
-    IsLetterTab[0xE4] = true;   // � , SMALL LETTER A WITH DIAERESIS
-    IsLetterTab[0xE5] = true;   // � , SMALL LETTER A WITH RING ABOVE
-    IsLetterTab[0xE6] = true;   // � , SMALL LIGATURE AE
-    IsLetterTab[0xE7] = true;   // � , SMALL LETTER C WITH CEDILLA
-    IsLetterTab[0xE8] = true;   // � , SMALL LETTER E WITH GRAVE ACCENT
-    IsLetterTab[0xE9] = true;   // � , SMALL LETTER E WITH ACUTE ACCENT
-    IsLetterTab[0xEA] = true;   // � , SMALL LETTER E WITH CIRCUMFLEX ACCENT
-    IsLetterTab[0xEB] = true;   // � , SMALL LETTER E WITH DIAERESIS
-    IsLetterTab[0xEC] = true;   // � , SMALL LETTER I WITH GRAVE ACCENT
-    IsLetterTab[0xED] = true;   // � , SMALL LETTER I WITH ACUTE ACCENT
-    IsLetterTab[0xEE] = true;   // � , SMALL LETTER I WITH CIRCUMFLEX ACCENT
-    IsLetterTab[0xEF] = true;   // � , SMALL LETTER I WITH DIAERESIS
-    IsLetterTab[0xF0] = true;   // � , SMALL LETTER ETH
-    IsLetterTab[0xF1] = true;   // � , SMALL LETTER N WITH TILDE
-    IsLetterTab[0xF2] = true;   // � , SMALL LETTER O WITH GRAVE ACCENT
-    IsLetterTab[0xF3] = true;   // � , SMALL LETTER O WITH ACUTE ACCENT
-    IsLetterTab[0xF4] = true;   // � , SMALL LETTER O WITH CIRCUMFLEX ACCENT
-    IsLetterTab[0xF5] = true;   // � , SMALL LETTER O WITH TILDE
-    IsLetterTab[0xF6] = true;   // � , SMALL LETTER O WITH DIAERESIS
-    IsLetterTab[0xF8] = true;   // � , SMALL LETTER O WITH OBLIQUE BAR
-    IsLetterTab[0xF9] = true;   // � , SMALL LETTER U WITH GRAVE ACCENT
-    IsLetterTab[0xFA] = true;   // � , SMALL LETTER U WITH ACUTE ACCENT
-    IsLetterTab[0xFB] = true;   // � , SMALL LETTER U WITH CIRCUMFLEX ACCENT
-    IsLetterTab[0xFC] = true;   // � , SMALL LETTER U WITH DIAERESIS
-    IsLetterTab[0xFD] = true;   // � , SMALL LETTER Y WITH ACUTE ACCENT
-    IsLetterTab[0xFE] = true;   // � , SMALL LETTER THORN
-    IsLetterTab[0xFF] = true;   // � , SMALL LETTER Y WITH DIAERESIS
+    IsLetterTab[0xC0] = true;	// � , CAPITAL LETTER A WITH GRAVE ACCENT
+    IsLetterTab[0xC1] = true;	// � , CAPITAL LETTER A WITH ACUTE ACCENT
+    IsLetterTab[0xC2] = true;	// � , CAPITAL LETTER A WITH CIRCUMFLEX ACCENT
+    IsLetterTab[0xC3] = true;	// � , CAPITAL LETTER A WITH TILDE
+    IsLetterTab[0xC4] = true;	// � , CAPITAL LETTER A WITH DIAERESIS
+    IsLetterTab[0xC5] = true;	// � , CAPITAL LETTER A WITH RING ABOVE
+    IsLetterTab[0xC6] = true;	// � , CAPITAL LIGATURE AE
+    IsLetterTab[0xC7] = true;	// � , CAPITAL LETTER C WITH CEDILLA
+    IsLetterTab[0xC8] = true;	// � , CAPITAL LETTER E WITH GRAVE ACCENT
+    IsLetterTab[0xC9] = true;	// � , CAPITAL LETTER E WITH ACUTE ACCENT
+    IsLetterTab[0xCA] = true;	// � , CAPITAL LETTER E WITH CIRCUMFLEX ACCENT
+    IsLetterTab[0xCB] = true;	// � , CAPITAL LETTER E WITH DIAERESIS
+    IsLetterTab[0xCC] = true;	// � , CAPITAL LETTER I WITH GRAVE ACCENT
+    IsLetterTab[0xCD] = true;	// � , CAPITAL LETTER I WITH ACUTE ACCENT
+    IsLetterTab[0xCE] = true;	// � , CAPITAL LETTER I WITH CIRCUMFLEX ACCENT
+    IsLetterTab[0xCF] = true;	// � , CAPITAL LETTER I WITH DIAERESIS
+    IsLetterTab[0xD0] = true;	// � , CAPITAL LETTER ETH
+    IsLetterTab[0xD1] = true;	// � , CAPITAL LETTER N WITH TILDE
+    IsLetterTab[0xD2] = true;	// � , CAPITAL LETTER O WITH GRAVE ACCENT
+    IsLetterTab[0xD3] = true;	// � , CAPITAL LETTER O WITH ACUTE ACCENT
+    IsLetterTab[0xD4] = true;	// � , CAPITAL LETTER O WITH CIRCUMFLEX ACCENT
+    IsLetterTab[0xD5] = true;	// � , CAPITAL LETTER O WITH TILDE
+    IsLetterTab[0xD6] = true;	// � , CAPITAL LETTER O WITH DIAERESIS
+    IsLetterTab[0xD8] = true;	// � , CAPITAL LETTER O WITH STROKE
+    IsLetterTab[0xD9] = true;	// � , CAPITAL LETTER U WITH GRAVE ACCENT
+    IsLetterTab[0xDA] = true;	// � , CAPITAL LETTER U WITH ACUTE ACCENT
+    IsLetterTab[0xDB] = true;	// � , CAPITAL LETTER U WITH CIRCUMFLEX ACCENT
+    IsLetterTab[0xDC] = true;	// � , CAPITAL LETTER U WITH DIAERESIS
+    IsLetterTab[0xDD] = true;	// � , CAPITAL LETTER Y WITH ACUTE ACCENT
+    IsLetterTab[0xDE] = true;	// � , CAPITAL LETTER THORN
+    IsLetterTab[0xDF] = true;	// � , SMALL LETTER SHARP S
+    IsLetterTab[0xE0] = true;	// � , SMALL LETTER A WITH GRAVE ACCENT
+    IsLetterTab[0xE1] = true;	// � , SMALL LETTER A WITH ACUTE ACCENT
+    IsLetterTab[0xE2] = true;	// � , SMALL LETTER A WITH CIRCUMFLEX ACCENT
+    IsLetterTab[0xE3] = true;	// � , SMALL LETTER A WITH TILDE
+    IsLetterTab[0xE4] = true;	// � , SMALL LETTER A WITH DIAERESIS
+    IsLetterTab[0xE5] = true;	// � , SMALL LETTER A WITH RING ABOVE
+    IsLetterTab[0xE6] = true;	// � , SMALL LIGATURE AE
+    IsLetterTab[0xE7] = true;	// � , SMALL LETTER C WITH CEDILLA
+    IsLetterTab[0xE8] = true;	// � , SMALL LETTER E WITH GRAVE ACCENT
+    IsLetterTab[0xE9] = true;	// � , SMALL LETTER E WITH ACUTE ACCENT
+    IsLetterTab[0xEA] = true;	// � , SMALL LETTER E WITH CIRCUMFLEX ACCENT
+    IsLetterTab[0xEB] = true;	// � , SMALL LETTER E WITH DIAERESIS
+    IsLetterTab[0xEC] = true;	// � , SMALL LETTER I WITH GRAVE ACCENT
+    IsLetterTab[0xED] = true;	// � , SMALL LETTER I WITH ACUTE ACCENT
+    IsLetterTab[0xEE] = true;	// � , SMALL LETTER I WITH CIRCUMFLEX ACCENT
+    IsLetterTab[0xEF] = true;	// � , SMALL LETTER I WITH DIAERESIS
+    IsLetterTab[0xF0] = true;	// � , SMALL LETTER ETH
+    IsLetterTab[0xF1] = true;	// � , SMALL LETTER N WITH TILDE
+    IsLetterTab[0xF2] = true;	// � , SMALL LETTER O WITH GRAVE ACCENT
+    IsLetterTab[0xF3] = true;	// � , SMALL LETTER O WITH ACUTE ACCENT
+    IsLetterTab[0xF4] = true;	// � , SMALL LETTER O WITH CIRCUMFLEX ACCENT
+    IsLetterTab[0xF5] = true;	// � , SMALL LETTER O WITH TILDE
+    IsLetterTab[0xF6] = true;	// � , SMALL LETTER O WITH DIAERESIS
+    IsLetterTab[0xF8] = true;	// � , SMALL LETTER O WITH OBLIQUE BAR
+    IsLetterTab[0xF9] = true;	// � , SMALL LETTER U WITH GRAVE ACCENT
+    IsLetterTab[0xFA] = true;	// � , SMALL LETTER U WITH ACUTE ACCENT
+    IsLetterTab[0xFB] = true;	// � , SMALL LETTER U WITH CIRCUMFLEX ACCENT
+    IsLetterTab[0xFC] = true;	// � , SMALL LETTER U WITH DIAERESIS
+    IsLetterTab[0xFD] = true;	// � , SMALL LETTER Y WITH ACUTE ACCENT
+    IsLetterTab[0xFE] = true;	// � , SMALL LETTER THORN
+    IsLetterTab[0xFF] = true;	// � , SMALL LETTER Y WITH DIAERESIS
 }
 
 bool LetterTable::isLetterUnicode( sal_Unicode c )
@@ -468,7 +468,7 @@ BOOL SimpleTokenizer_Impl::getNextToken( /*out*/TokenTypes& reType,
         }
     }
 
-    // Operator?
+    // Operator?								
     // only for BASIC '\'' should be a comment, otherwise it is a normal string and handled there
     else if ( ( testCharFlags( c, CHAR_OPERATOR ) == TRUE ) || ( (c == '\'') && (aLanguage==HIGHLIGHT_BASIC)) )
     {
@@ -523,7 +523,7 @@ BOOL SimpleTokenizer_Impl::getNextToken( /*out*/TokenTypes& reType,
             // Kommentar ?
             if ( c == '\'' )
             {
-                c = getChar();  // '/' entfernen
+                c = getChar();	// '/' entfernen
 
                 // Alle Zeichen bis Zeilen-Ende oder EOF entfernen
                 sal_Unicode cPeek = peekChar();
@@ -569,7 +569,7 @@ BOOL SimpleTokenizer_Impl::getNextToken( /*out*/TokenTypes& reType,
             {
                 // o entfernen
                 getChar();
-                nRadix = 8;     // Octal-Basis
+                nRadix = 8; 	// Octal-Basis
 
                 // Alle Ziffern einlesen
                 while( testCharFlags( peekChar(), CHAR_IN_OCT_NUMBER ) )
@@ -580,7 +580,7 @@ BOOL SimpleTokenizer_Impl::getNextToken( /*out*/TokenTypes& reType,
             {
                 // x entfernen
                 getChar();
-                nRadix = 16;     // Hex-Basis
+                nRadix = 16;	 // Hex-Basis
 
                 // Alle Ziffern einlesen und puffern
                 while( testCharFlags( peekChar(), CHAR_IN_HEX_NUMBER ) )
@@ -604,7 +604,7 @@ BOOL SimpleTokenizer_Impl::getNextToken( /*out*/TokenTypes& reType,
                     (bAfterExpChar && peekChar() == '-' ) )
                     // Nach Exponent auch +/- OK
             {
-                c = getChar();                  // Zeichen lesen
+                c = getChar();					// Zeichen lesen
                 bAfterExpChar = ( c == 'e' || c == 'E' );
             }
         }
@@ -639,7 +639,7 @@ BOOL SimpleTokenizer_Impl::getNextToken( /*out*/TokenTypes& reType,
             }
         }
 
-        //  Zeichen lesen
+        //	Zeichen lesen
         if( reType != TT_ERROR )
         {
             getChar();
@@ -687,17 +687,17 @@ String SimpleTokenizer_Impl::getFullTokenStr( /*out*/TokenTypes eType,
     String aOut;
     switch( eType )
     {
-        case TT_UNKNOWN:    aOut = String( RTL_CONSTASCII_USTRINGPARAM("TT_UNKNOWN:") ); break;
-        case TT_IDENTIFIER: aOut = String( RTL_CONSTASCII_USTRINGPARAM("TT_IDENTIFIER:") ); break;
-        case TT_WHITESPACE: aOut = String( RTL_CONSTASCII_USTRINGPARAM("TT_WHITESPACE:") ); break;
-        case TT_NUMBER:     aOut = String( RTL_CONSTASCII_USTRINGPARAM("TT_NUMBER:") ); break;
-        case TT_STRING:     aOut = String( RTL_CONSTASCII_USTRINGPARAM("TT_STRING:") ); break;
-        case TT_EOL:        aOut = String( RTL_CONSTASCII_USTRINGPARAM("TT_EOL:") ); break;
-        case TT_COMMENT:    aOut = String( RTL_CONSTASCII_USTRINGPARAM("TT_COMMENT:") ); break;
-        case TT_ERROR:      aOut = String( RTL_CONSTASCII_USTRINGPARAM("TT_ERROR:") ); break;
-        case TT_OPERATOR:   aOut = String( RTL_CONSTASCII_USTRINGPARAM("TT_OPERATOR:") ); break;
-        case TT_KEYWORDS:   aOut = String( RTL_CONSTASCII_USTRINGPARAM("TT_KEYWORD:") ); break;
-        case TT_PARAMETER:  aOut = String( RTL_CONSTASCII_USTRINGPARAM("TT_PARAMETER:") ); break;
+        case TT_UNKNOWN:	aOut = String( RTL_CONSTASCII_USTRINGPARAM("TT_UNKNOWN:") ); break;
+        case TT_IDENTIFIER:	aOut = String( RTL_CONSTASCII_USTRINGPARAM("TT_IDENTIFIER:") ); break;
+        case TT_WHITESPACE:	aOut = String( RTL_CONSTASCII_USTRINGPARAM("TT_WHITESPACE:") ); break;
+        case TT_NUMBER:		aOut = String( RTL_CONSTASCII_USTRINGPARAM("TT_NUMBER:") ); break;
+        case TT_STRING:		aOut = String( RTL_CONSTASCII_USTRINGPARAM("TT_STRING:") ); break;
+        case TT_EOL:		aOut = String( RTL_CONSTASCII_USTRINGPARAM("TT_EOL:") ); break;
+        case TT_COMMENT:	aOut = String( RTL_CONSTASCII_USTRINGPARAM("TT_COMMENT:") ); break;
+        case TT_ERROR:		aOut = String( RTL_CONSTASCII_USTRINGPARAM("TT_ERROR:") ); break;
+        case TT_OPERATOR:	aOut = String( RTL_CONSTASCII_USTRINGPARAM("TT_OPERATOR:") ); break;
+        case TT_KEYWORDS:	aOut = String( RTL_CONSTASCII_USTRINGPARAM("TT_KEYWORD:") ); break;
+        case TT_PARAMETER:	aOut = String( RTL_CONSTASCII_USTRINGPARAM("TT_PARAMETER:") ); break;
     }
     if( eType != TT_EOL )
     {
@@ -757,7 +757,7 @@ SimpleTokenizer_Impl::SimpleTokenizer_Impl( HighlighterLanguage aLang ): aLangua
     // Operator-Zeichen
     aCharTypeTab[(int)'!'] |= CHAR_OPERATOR;
     aCharTypeTab[(int)'%'] |= CHAR_OPERATOR;
-    // aCharTypeTab[(int)'&'] |= CHAR_OPERATOR;     Removed because of #i14140
+    // aCharTypeTab[(int)'&'] |= CHAR_OPERATOR;		Removed because of #i14140
     aCharTypeTab[(int)'('] |= CHAR_OPERATOR;
     aCharTypeTab[(int)')'] |= CHAR_OPERATOR;
     aCharTypeTab[(int)'*'] |= CHAR_OPERATOR;
@@ -775,7 +775,7 @@ SimpleTokenizer_Impl::SimpleTokenizer_Impl( HighlighterLanguage aLang ): aLangua
     aCharTypeTab[(int)'~'] |= CHAR_OPERATOR;
     aCharTypeTab[(int)'{'] |= CHAR_OPERATOR;
     aCharTypeTab[(int)'}'] |= CHAR_OPERATOR;
-    // aCharTypeTab[(int)'['] |= CHAR_OPERATOR;     Removed because of #i17826
+    // aCharTypeTab[(int)'['] |= CHAR_OPERATOR;		Removed because of #i17826
     aCharTypeTab[(int)']'] |= CHAR_OPERATOR;
     aCharTypeTab[(int)';'] |= CHAR_OPERATOR;
 
@@ -895,7 +895,7 @@ const Range SyntaxHighlighter::notifyChange( UINT32 nLine, INT32 nLineCountDiffe
                                 const String* pChangedLines, UINT32 nArrayLength)
 {
     (void)nLineCountDifference;
-
+    
     for( UINT32 i=0 ; i < nArrayLength ; i++ )
         m_pSimpleTokenizer->parseLine(nLine+i, &pChangedLines[i]);
 
diff --git a/svtools/source/edit/textdat2.hxx b/svtools/source/edit/textdat2.hxx
index 222e8abee5a4..f11b39bba116 100644
--- a/svtools/source/edit/textdat2.hxx
+++ b/svtools/source/edit/textdat2.hxx
@@ -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
@@ -38,53 +38,53 @@
 class TextNode;
 class TextView;
 
-#define PORTIONKIND_TEXT        0
+#define PORTIONKIND_TEXT		0
 #define PORTIONKIND_TAB         1
 
-#define DELMODE_SIMPLE          0
-#define DELMODE_RESTOFWORD      1
-#define DELMODE_RESTOFCONTENT   2
+#define DELMODE_SIMPLE			0
+#define DELMODE_RESTOFWORD		1
+#define DELMODE_RESTOFCONTENT	2
 
-#define DEL_LEFT    1
-#define DEL_RIGHT   2
-#define TRAVEL_X_DONTKNOW   0xFFFF
-#define MAXCHARSINPARA      0x3FFF-CHARPOSGROW
+#define DEL_LEFT	1
+#define DEL_RIGHT	2
+#define TRAVEL_X_DONTKNOW	0xFFFF
+#define MAXCHARSINPARA		0x3FFF-CHARPOSGROW
 
-#define LINE_SEP    0x0A
+#define LINE_SEP	0x0A
 
 
 class TETextPortion
 {
 private:
-    USHORT      nLen;
-    long        nWidth;
-    BYTE        nKind;
+    USHORT		nLen;
+    long 		nWidth;
+    BYTE		nKind;
     BYTE        nRightToLeft;
 
-                TETextPortion()             { nLen = 0; nKind = PORTIONKIND_TEXT; nWidth = -1; nRightToLeft = 0;}
+                TETextPortion()				{ nLen = 0; nKind = PORTIONKIND_TEXT; nWidth = -1; nRightToLeft = 0;}
 
 public:
-                TETextPortion( USHORT nL )  {
+                TETextPortion( USHORT nL )	{
                                                 nLen = nL;
                                                 nKind = PORTIONKIND_TEXT;
                                                 nWidth= -1;
                                                 nRightToLeft = 0;
                                             }
 
-    USHORT      GetLen() const              { return nLen; }
-    USHORT&     GetLen()                    { return nLen; }
+    USHORT		GetLen() const				{ return nLen; }
+    USHORT&		GetLen() 					{ return nLen; }
 
-    long        GetWidth()const             { return nWidth; }
-    long&       GetWidth()                  { return nWidth; }
+    long		GetWidth()const				{ return nWidth; }
+    long&		GetWidth()					{ return nWidth; }
 
-    BYTE        GetKind() const             { return nKind; }
-    BYTE&       GetKind()                   { return nKind; }
+    BYTE		GetKind() const				{ return nKind; }
+    BYTE&		GetKind()					{ return nKind; }
 
-    BYTE        GetRightToLeft() const      { return nRightToLeft; }
-    BYTE&       GetRightToLeft()            { return nRightToLeft; }
+    BYTE		GetRightToLeft() const		{ return nRightToLeft; }
+    BYTE&		GetRightToLeft()			{ return nRightToLeft; }
     BOOL        IsRightToLeft() const       { return (nRightToLeft&1); }
 
-    BOOL        HasValidSize() const        { return nWidth != (-1); }
+    BOOL		HasValidSize() const		{ return nWidth != (-1); }
 };
 
 
@@ -98,10 +98,10 @@ public:
             TETextPortionList();
             ~TETextPortionList();
 
-    void    Reset();
-    USHORT  FindPortion( USHORT nCharPos, USHORT& rPortionStart, BOOL bPreferStartingPortion = FALSE );
+    void	Reset();
+    USHORT	FindPortion( USHORT nCharPos, USHORT& rPortionStart, BOOL bPreferStartingPortion = FALSE );
     USHORT  GetPortionStartIndex( USHORT nPortion );
-    void    DeleteFromPortion( USHORT nDelFrom );
+    void	DeleteFromPortion( USHORT nDelFrom );
 };
 
 struct TEWritingDirectionInfo
@@ -122,56 +122,56 @@ SV_DECL_VARARR( TEWritingDirectionInfos, TEWritingDirectionInfo, 0, 4 )
 class TextLine
 {
 private:
-    USHORT          mnStart;
-    USHORT          mnEnd;
-    USHORT          mnStartPortion;
-    USHORT          mnEndPortion;
+    USHORT			mnStart;
+    USHORT			mnEnd;
+    USHORT			mnStartPortion;
+    USHORT 			mnEndPortion;
 
-    short           mnStartX;
+    short			mnStartX;
 
-    BOOL            mbInvalid;  // fuer geschickte Formatierung/Ausgabe
+    BOOL			mbInvalid;	// fuer geschickte Formatierung/Ausgabe
 
 public:
-                    TextLine()  {
+                    TextLine() 	{
                                     mnStart = mnEnd = 0;
                                     mnStartPortion = mnEndPortion = 0;
                                     mnStartX = 0;
                                     mbInvalid = TRUE;
                                 }
 
-    BOOL            IsIn( USHORT nIndex ) const
+    BOOL			IsIn( USHORT nIndex ) const
                         { return ( (nIndex >= mnStart ) && ( nIndex < mnEnd ) ); }
 
-    BOOL            IsIn( USHORT nIndex, BOOL bInclEnd ) const
+    BOOL			IsIn( USHORT nIndex, BOOL bInclEnd ) const
                         { return ( ( nIndex >= mnStart ) && ( bInclEnd ? ( nIndex <= mnEnd ) : ( nIndex < mnEnd ) ) ); }
 
-    void            SetStart( USHORT n )            { mnStart = n; }
-    USHORT          GetStart() const                { return mnStart; }
-    USHORT&         GetStart()                      { return mnStart; }
+    void			SetStart( USHORT n )			{ mnStart = n; }
+    USHORT			GetStart() const				{ return mnStart; }
+    USHORT&			GetStart() 						{ return mnStart; }
 
-    void            SetEnd( USHORT n )              { mnEnd = n; }
-    USHORT          GetEnd() const                  { return mnEnd; }
-    USHORT&         GetEnd()                        { return mnEnd; }
+    void			SetEnd( USHORT n )				{ mnEnd = n; }
+    USHORT			GetEnd() const					{ return mnEnd; }
+    USHORT&			GetEnd() 						{ return mnEnd; }
 
-    void            SetStartPortion( USHORT n )     { mnStartPortion = n; }
-    USHORT          GetStartPortion() const         { return mnStartPortion; }
-    USHORT&         GetStartPortion()               { return mnStartPortion; }
+    void			SetStartPortion( USHORT n )		{ mnStartPortion = n; }
+    USHORT			GetStartPortion() const			{ return mnStartPortion; }
+    USHORT&			GetStartPortion() 				{ return mnStartPortion; }
 
-    void            SetEndPortion( USHORT n )       { mnEndPortion = n; }
-    USHORT          GetEndPortion() const           { return mnEndPortion; }
-    USHORT&         GetEndPortion()                 { return mnEndPortion; }
+    void			SetEndPortion( USHORT n )		{ mnEndPortion = n; }
+    USHORT			GetEndPortion() const			{ return mnEndPortion; }
+    USHORT&			GetEndPortion() 				{ return mnEndPortion; }
 
-    USHORT          GetLen() const                  { return mnEnd - mnStart; }
+    USHORT			GetLen() const					{ return mnEnd - mnStart; }
 
-    BOOL            IsInvalid() const               { return mbInvalid; }
-    BOOL            IsValid() const                 { return !mbInvalid; }
-    void            SetInvalid()                    { mbInvalid = TRUE; }
-    void            SetValid()                      { mbInvalid = FALSE; }
+    BOOL			IsInvalid()	const				{ return mbInvalid; }
+    BOOL			IsValid() const					{ return !mbInvalid; }
+    void			SetInvalid()					{ mbInvalid = TRUE; }
+    void			SetValid()						{ mbInvalid = FALSE; }
 
-    BOOL            IsEmpty() const                 { return (mnEnd > mnStart) ? FALSE : TRUE; }
+    BOOL			IsEmpty() const					{ return (mnEnd > mnStart) ? FALSE : TRUE; }
 
-    short           GetStartX() const               { return mnStartX; }
-    void            SetStartX( short n )            { mnStartX = n; }
+    short			GetStartX() const				{ return mnStartX; }
+    void			SetStartX( short n )			{ mnStartX = n; }
 
     inline BOOL operator == ( const TextLine& rLine ) const;
     inline BOOL operator != ( const TextLine& rLine ) const;
@@ -182,7 +182,7 @@ typedef TextLine* TextLinePtr;
 
 inline BOOL TextLine::operator == ( const TextLine& rLine ) const
 {
-    return (    ( mnStart == rLine.mnStart ) &&
+    return ( 	( mnStart == rLine.mnStart ) &&
                 ( mnEnd == rLine.mnEnd ) &&
                 ( mnStartPortion == rLine.mnStartPortion ) &&
                 ( mnEndPortion == rLine.mnEndPortion ) );
@@ -198,18 +198,18 @@ inline BOOL TextLine::operator != ( const TextLine& rLine ) const
 class TEParaPortion
 {
 private:
-    TextNode*               mpNode;
+    TextNode*			    mpNode;
 
-    TextLines               maLines;
+    TextLines			    maLines;
     TETextPortionList       maTextPortions;
     TEWritingDirectionInfos maWritingDirectionInfos;
 
 
-    USHORT              mnInvalidPosStart;
-    short               mnInvalidDiff;
+    USHORT				mnInvalidPosStart;
+    short				mnInvalidDiff;
 
-    BOOL                mbInvalid;
-    BOOL                mbSimple;   // nur lineares Tippen
+    BOOL				mbInvalid;
+    BOOL				mbSimple;	// nur lineares Tippen
 
 
                         TEParaPortion( const TEParaPortion& ) {;}
@@ -219,25 +219,25 @@ public:
                         ~TEParaPortion();
 
 
-    BOOL                IsInvalid() const           { return mbInvalid; }
-    BOOL                IsSimpleInvalid() const     { return mbSimple; }
-    void                SetNotSimpleInvalid()       { mbSimple = FALSE; }
-    void                SetValid()                  { mbInvalid = FALSE; mbSimple = TRUE;}
+    BOOL				IsInvalid()	const			{ return mbInvalid; }
+    BOOL				IsSimpleInvalid() const		{ return mbSimple; }
+    void				SetNotSimpleInvalid() 		{ mbSimple = FALSE; }
+    void				SetValid()					{ mbInvalid = FALSE; mbSimple = TRUE;}
 
-    void                MarkInvalid( USHORT nStart, short nDiff);
-    void                MarkSelectionInvalid( USHORT nStart, USHORT nEnd );
+    void				MarkInvalid( USHORT nStart, short nDiff);
+    void				MarkSelectionInvalid( USHORT nStart, USHORT nEnd );
 
-    USHORT              GetInvalidPosStart() const  { return mnInvalidPosStart; }
-    short               GetInvalidDiff() const      { return mnInvalidDiff; }
+    USHORT				GetInvalidPosStart() const	{ return mnInvalidPosStart; }
+    short				GetInvalidDiff() const 		{ return mnInvalidDiff; }
 
-    TextNode*           GetNode() const             { return mpNode; }
-    TextLines&          GetLines()                  { return maLines; }
-    TETextPortionList&  GetTextPortions()           { return maTextPortions; }
+    TextNode*			GetNode() const				{ return mpNode; }
+    TextLines&			GetLines()					{ return maLines; }
+    TETextPortionList&	GetTextPortions() 			{ return maTextPortions; }
     TEWritingDirectionInfos& GetWritingDirectionInfos() { return maWritingDirectionInfos; }
 
 
-    USHORT              GetLineNumber( USHORT nIndex, BOOL bInclEnd );
-    void                CorrectValuesBehindLastFormattedLine( USHORT nLastFormattedLine );
+    USHORT				GetLineNumber( USHORT nIndex, BOOL bInclEnd );
+    void				CorrectValuesBehindLastFormattedLine( USHORT nLastFormattedLine );
 };
 
 
@@ -246,54 +246,54 @@ class TEParaPortions : public ToolsList<TEParaPortion*>
 public:
                     TEParaPortions();
                     ~TEParaPortions();
-    void            Reset();
+    void			Reset();
 };
 
 
 class TextSelFunctionSet: public FunctionSet
 {
 private:
-    TextView*       mpView;
+    TextView* 		mpView;
 
 public:
                     TextSelFunctionSet( TextView* pView );
 
-    virtual void    BeginDrag();
+    virtual void	BeginDrag();
 
-    virtual void    CreateAnchor();
+    virtual void 	CreateAnchor();
 
-    virtual BOOL    SetCursorAtPoint( const Point& rPointPixel, BOOL bDontSelectAtCursor = FALSE );
+    virtual BOOL 	SetCursorAtPoint( const Point& rPointPixel, BOOL bDontSelectAtCursor = FALSE );
 
-    virtual BOOL    IsSelectionAtPoint( const Point& rPointPixel );
-    virtual void    DeselectAll();
+    virtual BOOL 	IsSelectionAtPoint( const Point& rPointPixel );
+    virtual void 	DeselectAll();
 
-    virtual void    DeselectAtPoint( const Point& );
-    virtual void    DestroyAnchor();
+    virtual void 	DeselectAtPoint( const Point& );
+    virtual void 	DestroyAnchor();
 };
 
 
 class IdleFormatter : public Timer
 {
 private:
-    TextView*   mpView;
-    USHORT      mnRestarts;
+    TextView* 	mpView;
+    USHORT		mnRestarts;
 
 public:
                 IdleFormatter();
                 ~IdleFormatter();
 
-    void        DoIdleFormat( TextView* pV, USHORT nMaxRestarts );
-    void        ForceTimeout();
-    TextView*   GetView()       { return mpView; }
+    void		DoIdleFormat( TextView* pV, USHORT nMaxRestarts );
+    void		ForceTimeout();
+    TextView*	GetView()		{ return mpView; }
 };
 
 struct TextDDInfo
 {
-    Cursor          maCursor;
-    TextPaM         maDropPos;
+    Cursor			maCursor;
+    TextPaM			maDropPos;
 
-    BOOL            mbStarterOfDD;
-    BOOL            mbVisCursor;
+    BOOL 			mbStarterOfDD;
+    BOOL 			mbVisCursor;
 
     TextDDInfo()
     {
diff --git a/svtools/source/edit/textdata.cxx b/svtools/source/edit/textdata.cxx
index 32bdfe40a3fb..5e586f474440 100644
--- a/svtools/source/edit/textdata.cxx
+++ b/svtools/source/edit/textdata.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
@@ -184,12 +184,12 @@ void TEParaPortion::MarkSelectionInvalid( USHORT nStart, USHORT /*nEnd*/ )
     if ( mbInvalid == FALSE )
     {
         mnInvalidPosStart = nStart;
-//      nInvalidPosEnd = nEnd;
+//		nInvalidPosEnd = nEnd;
     }
     else
     {
         mnInvalidPosStart = Min( mnInvalidPosStart, nStart );
-//      nInvalidPosEnd = pNode->Len();
+//		nInvalidPosEnd = pNode->Len();
     }
 
     maWritingDirectionInfos.Remove( 0, maWritingDirectionInfos.Count() );
@@ -228,7 +228,7 @@ void TEParaPortion::CorrectValuesBehindLastFormattedLine( USHORT nLastFormattedL
         const TextLine* pUnformatted = maLines[ nLastFormattedLine+1 ];
         short nPortionDiff = pUnformatted->GetStartPortion() - pLastFormatted->GetEndPortion();
         short nTextDiff = pUnformatted->GetStart() - pLastFormatted->GetEnd();
-        nTextDiff++;    // LastFormatted->GetEnd() war incl. => 1 zuviel abgezogen!
+        nTextDiff++;	// LastFormatted->GetEnd() war incl. => 1 zuviel abgezogen!
 
         // Die erste unformatierte muss genau eine Portion hinter der letzten der
         // formatierten beginnen:
diff --git a/svtools/source/edit/textdoc.cxx b/svtools/source/edit/textdoc.cxx
index d4470904077e..4892902edbe8 100644
--- a/svtools/source/edit/textdoc.cxx
+++ b/svtools/source/edit/textdoc.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
@@ -161,8 +161,8 @@ TextCharAttrib* TextCharAttribList::FindNextAttrib( USHORT nWhich, USHORT nFromP
     for ( USHORT nAttr = 0; nAttr < nAttribs; nAttr++ )
     {
         TextCharAttrib* pAttr = GetObject( nAttr );
-        if ( ( pAttr->GetStart() >= nFromPos ) &&
-             ( pAttr->GetEnd() <= nMaxPos ) &&
+        if ( ( pAttr->GetStart() >= nFromPos ) && 
+             ( pAttr->GetEnd() <= nMaxPos ) && 
              ( pAttr->Which() == nWhich ) )
             return pAttr;
     }
@@ -280,7 +280,7 @@ void TextNode::ExpandAttribs( USHORT nIndex, USHORT nNew )
                 // Wenn spaeter doch Ueberpruefung:
                 //   Spezialfall: Start == 0; AbsLen == 1, nNew = 1 => Expand, weil durch Absatzumbruch!
                 // Start <= nIndex, End >= nIndex => Start=End=nIndex!
-//              if ( pAttrib->GetStart() == nIndex )
+//				if ( pAttrib->GetStart() == nIndex )
                     pAttrib->Expand( nNew );
             }
             // 1: Attribut startet davor, geht bis Index...
@@ -307,7 +307,7 @@ void TextNode::ExpandAttribs( USHORT nIndex, USHORT nNew )
                 if ( nIndex == 0 )
                 {
                     pAttrib->Expand( nNew );
-//                  bResort = TRUE;     // es gibt ja keine Features mehr...
+//					bResort = TRUE;		// es gibt ja keine Features mehr...
                 }
                 else
                     pAttrib->MoveForward( nNew );
@@ -352,17 +352,17 @@ void TextNode::CollapsAttribs( USHORT nIndex, USHORT nDeleted )
                 // Spezialfall: Attrubt deckt genau den Bereich ab
                 // => als leeres Attribut behalten.
                 if ( ( pAttrib->GetStart() == nIndex ) && ( pAttrib->GetEnd() == nEndChanges ) )
-                    pAttrib->GetEnd() = nIndex; // leer
+                    pAttrib->GetEnd() = nIndex;	// leer
                 else
                     bDelAttr = TRUE;
             }
             // 2. Attribut beginnt davor, endet drinnen oder dahinter...
             else if ( ( pAttrib->GetStart() <= nIndex ) && ( pAttrib->GetEnd() > nIndex ) )
             {
-                if ( pAttrib->GetEnd() <= nEndChanges ) // endet drinnen
+                if ( pAttrib->GetEnd() <= nEndChanges )	// endet drinnen
                     pAttrib->GetEnd() = nIndex;
                 else
-                    pAttrib->Collaps( nDeleted );       // endet dahinter
+                    pAttrib->Collaps( nDeleted );		// endet dahinter
             }
             // 3. Attribut beginnt drinnen, endet dahinter...
             else if ( ( pAttrib->GetStart() >= nIndex ) && ( pAttrib->GetEnd() > nEndChanges ) )
@@ -499,7 +499,7 @@ void TextNode::Append( const TextNode& rNode )
                         pTmpAttrib->GetEnd() =
                             pTmpAttrib->GetEnd() + pAttrib->GetLen();
                         bMelted = TRUE;
-                        break;  // es kann nur eins von der Sorte an der Stelle geben
+                        break;	// es kann nur eins von der Sorte an der Stelle geben
                     }
                 }
             }
@@ -763,9 +763,9 @@ BOOL TextDoc::RemoveAttribs( TextNode* pNode, USHORT nStart, USHORT nEnd, TextCh
                 bChanged = TRUE;
                 if ( pAttr->GetEnd() > nEnd )
                 {
-                    pAttr->GetStart() = nEnd;   // dann faengt es dahinter an
+                    pAttr->GetStart() = nEnd;	// dann faengt es dahinter an
                     rpStarting = pAttr;
-                    break;  // es kann kein weiteres Attrib hier liegen
+                    break;	// es kann kein weiteres Attrib hier liegen
                 }
                 else if ( !pAttr->IsFeature() || ( pAttr->GetStart() == nStart ) )
                 {
@@ -780,7 +780,7 @@ BOOL TextDoc::RemoveAttribs( TextNode* pNode, USHORT nStart, USHORT nEnd, TextCh
                 bChanged = TRUE;
                 if ( ( pAttr->GetStart() < nStart ) && !pAttr->IsFeature() )
                 {
-                    pAttr->GetEnd() = nStart;   // dann hoert es hier auf
+                    pAttr->GetEnd() = nStart;	// dann hoert es hier auf
                     rpEnding = pAttr;
                 }
                 else if ( !pAttr->IsFeature() || ( pAttr->GetStart() == nStart ) )
@@ -797,23 +797,23 @@ BOOL TextDoc::RemoveAttribs( TextNode* pNode, USHORT nStart, USHORT nEnd, TextCh
                 {
                     pAttr->GetStart() = nEnd;
                     rpStarting = pAttr;
-                    break;  // es kann weitere Attribute geben!
+                    break;	// es kann weitere Attribute geben!
                 }
                 else if ( pAttr->GetEnd() == nEnd )
                 {
                     pAttr->GetEnd() = nStart;
                     rpEnding = pAttr;
-                    break;  // es kann weitere Attribute geben!
+                    break;	// es kann weitere Attribute geben!
                 }
                 else // Attribut muss gesplittet werden...
                 {
                     USHORT nOldEnd = pAttr->GetEnd();
                     pAttr->GetEnd() = nStart;
                     rpEnding = pAttr;
-//                  ULONG nSavePos = pNode->GetCharAttribs().GetStartList().GetCurPos();
+//					ULONG nSavePos = pNode->GetCharAttribs().GetStartList().GetCurPos();
                     InsertAttrib( *pAttr->GetItem(), pNode, nEnd, nOldEnd );
-//                  pNode->GetCharAttribs().GetStartList().Seek( nSavePos );
-                    break;  // es kann weitere Attribute geben!
+//					pNode->GetCharAttribs().GetStartList().Seek( nSavePos );
+                    break;	// es kann weitere Attribute geben!
                 }
             }
         }
@@ -839,17 +839,17 @@ void TextDoc::InsertAttrib( const SfxPoolItem& rPoolItem, TextNode* pNode, USHOR
     // schon an der Stelle existiert!
 
     // pruefen, ob neues Attrib oder einfach nur Ende eines Attribs...
-//  const SfxPoolItem& rDefItem = pNode->GetContentAttribs().GetItem( rPoolItem.Which() );
-//  BOOL bCreateAttrib = ( rDefItem != rPoolItem );
+//	const SfxPoolItem& rDefItem = pNode->GetContentAttribs().GetItem( rPoolItem.Which() );
+//	BOOL bCreateAttrib = ( rDefItem != rPoolItem );
 
     // Durch den Verlust der Exclude-Liste geht es nicht mehr, dass ich
     // kein neues Attribut benoetige und nur das alte nicht expandiere...
-//  if ( !bCreateAttrib )
+//	if ( !bCreateAttrib )
     {
         // => Wenn schon Default-Item, dann wenigstens nur dann einstellen,
         // wenn davor wirklich ein entsprechendes Attribut.
-//      if ( pNode->GetCharAttribs().FindAttrib( rPoolItem.Which(), nStart ) )
-//          bCreateAttrib = TRUE;
+//		if ( pNode->GetCharAttribs().FindAttrib( rPoolItem.Which(), nStart ) )
+//			bCreateAttrib = TRUE;
         // Aber kleiner Trost:
         // Die wenigsten schreiben, aendern das Attr, schreiben, und
         // stellen dann wieder das Default-Attr ein.
@@ -859,21 +859,21 @@ void TextDoc::InsertAttrib( const SfxPoolItem& rPoolItem, TextNode* pNode, USHOR
     // Die Uberlegung, einfach das andere Attribut nicht zu expandieren, war
     // sowieso falsch, da das DefAttr aus einer Vorlage kommen kann,
     // die irgendwann verschwindet!
-//  if ( bCreateAttrib )
-//  {
+//	if ( bCreateAttrib )
+//	{
         TextCharAttrib* pAttrib = MakeCharAttrib( *pCurPool, rPoolItem, nStart, nEnd );
         DBG_ASSERT( pAttrib, "MakeCharAttrib fehlgeschlagen!" );
         pNode->GetCharAttribs().InsertAttrib( pAttrib );
-//  }
-//  else
-//  {
-//      TextCharAttrib* pTmpAttrib =
-//          pNode->GetCharAttribs().FindAnyAttrib( rPoolItem.Which() );
-//      if ( pTmpAttrib )   // sonst benoetige ich es sowieso nicht....
-//      {
-//          aExcludeList.Insert( pTmpAttrib->GetItem() );
-//      }
-//  }
+//	}
+//	else
+//	{
+//		TextCharAttrib* pTmpAttrib =
+//			pNode->GetCharAttribs().FindAnyAttrib( rPoolItem.Which() );
+//		if ( pTmpAttrib ) 	// sonst benoetige ich es sowieso nicht....
+//		{
+//			aExcludeList.Insert( pTmpAttrib->GetItem() );
+//		}
+//	}
 }
 
 #pragma SEG_FUNCDEF(editdoc_40)
@@ -899,7 +899,7 @@ void TextDoc::InsertAttrib( TextNode* pNode, USHORT nStart, USHORT nEnd, const S
         pAttr = pNode->GetCharAttribs().FindAttrib( rPoolItem.Which(), nStart );
         if ( pAttr )
         {
-            if ( pAttr->IsInside( nStart ) )    // splitten
+            if ( pAttr->IsInside( nStart ) )	// splitten
             {
                 // ???????????????????????????????
                 // eigentlich noch pruefen, ob wirklich splittet, oder return !
@@ -948,15 +948,15 @@ void TextDoc::FindAttribs( TextNode* pNode, USHORT nStartPos, USHORT nEndPos, Sf
             // Attribut endet hier, ist leer
             else if ( ( pAttr->GetStart() == nStartPos ) && ( pAttr->GetEnd() == nStartPos ) )
             {
-//              if ( aExcludeList.FindAttrib( pAttr->GetItem()->Which() ) )
+//				if ( aExcludeList.FindAttrib( pAttr->GetItem()->Which() ) )
                     pItem = pAttr->GetItem();
-//              else if ( pNode->Len() == 0 )   // Sonderfall
-//                  pItem = pAttr->GetItem();
+//				else if ( pNode->Len() == 0 )	// Sonderfall
+//					pItem = pAttr->GetItem();
             }
             // Attribut beginnt hier
             else if ( ( pAttr->GetStart() == nStartPos ) && ( pAttr->GetEnd() > nStartPos ) )
             {
-                if ( nStartPos == 0 )   // Sonderfall
+                if ( nStartPos == 0 ) 	// Sonderfall
                     pItem = pAttr->GetItem();
             }
 
@@ -980,7 +980,7 @@ void TextDoc::FindAttribs( TextNode* pNode, USHORT nStartPos, USHORT nEndPos, Sf
             pAttr = GetAttrib( pNode->GetCharAttribs().GetAttribs(), nAttr );
         }
     }
-    else    // Selektion
+    else	// Selektion
     {
         while ( pAttr && ( pAttr->GetStart() < nEndPos) )
         {
@@ -1014,7 +1014,7 @@ void TextDoc::FindAttribs( TextNode* pNode, USHORT nStartPos, USHORT nEndPos, Sf
                 //  Ist falsch, wenn das gleiche Attribut sofort wieder
                 //  eingestellt wird!
                 //  => Sollte am besten nicht vorkommen, also gleich beim
-                //      Setzen von Attributen richtig machen!
+                //  	Setzen von Attributen richtig machen!
                 // --------------------------------------------------
                 rCurSet.InvalidateItem( pAttr->GetItem()->Which() );
             }
diff --git a/svtools/source/edit/textdoc.hxx b/svtools/source/edit/textdoc.hxx
index 0c875b4fe07f..33564e81746f 100644
--- a/svtools/source/edit/textdoc.hxx
+++ b/svtools/source/edit/textdoc.hxx
@@ -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
@@ -42,7 +42,7 @@ SV_DECL_PTRARR_DEL( TextCharAttribs, TextCharAttribPtr, 0, 4 )
 class TextCharAttribList : private TextCharAttribs
 {
 private:
-    BOOL            mbHasEmptyAttribs;
+    BOOL			mbHasEmptyAttribs;
 
                     TextCharAttribList( const TextCharAttribList& ) : TextCharAttribs() {}
 
@@ -50,28 +50,28 @@ public:
                     TextCharAttribList();
                     ~TextCharAttribList();
 
-    void            Clear( BOOL bDestroyAttribs );
-    USHORT          Count() const               { return TextCharAttribs::Count(); }
+    void			Clear( BOOL bDestroyAttribs );
+    USHORT			Count()	const				{ return TextCharAttribs::Count(); }
 
-    TextCharAttrib* GetAttrib( USHORT n ) const { return TextCharAttribs::GetObject( n ); }
-    void            RemoveAttrib( USHORT n )    { TextCharAttribs::Remove( n, 1 ); }
+    TextCharAttrib*	GetAttrib( USHORT n ) const	{ return TextCharAttribs::GetObject( n ); }
+    void			RemoveAttrib( USHORT n )	{ TextCharAttribs::Remove( n, 1 ); }
 
-    void            InsertAttrib( TextCharAttrib* pAttrib );
+    void			InsertAttrib( TextCharAttrib* pAttrib );
 
-    void            DeleteEmptyAttribs();
-    void            ResortAttribs();
+    void			DeleteEmptyAttribs();
+    void			ResortAttribs();
 
-    BOOL            HasEmptyAttribs() const { return mbHasEmptyAttribs; }
-    BOOL&           HasEmptyAttribs()       { return mbHasEmptyAttribs; }
+    BOOL			HasEmptyAttribs() const	{ return mbHasEmptyAttribs; }
+    BOOL&			HasEmptyAttribs() 		{ return mbHasEmptyAttribs; }
 
-    TextCharAttrib* FindAttrib( USHORT nWhich, USHORT nPos );
-    TextCharAttrib* FindNextAttrib( USHORT nWhich, USHORT nFromPos, USHORT nMaxPos = 0xFFFF ) const;
-    TextCharAttrib* FindEmptyAttrib( USHORT nWhich, USHORT nPos );
-    BOOL            HasAttrib( USHORT nWhich ) const;
-    BOOL            HasBoundingAttrib( USHORT nBound );
+    TextCharAttrib*	FindAttrib( USHORT nWhich, USHORT nPos );
+    TextCharAttrib*	FindNextAttrib( USHORT nWhich, USHORT nFromPos, USHORT nMaxPos = 0xFFFF ) const;
+    TextCharAttrib*	FindEmptyAttrib( USHORT nWhich, USHORT nPos );
+    BOOL 			HasAttrib( USHORT nWhich ) const;
+    BOOL			HasBoundingAttrib( USHORT nBound );
 
 #ifdef  DBG_UTIL
-    BOOL            DbgCheckAttribs();
+    BOOL 			DbgCheckAttribs();
 #endif
 };
 
@@ -79,70 +79,70 @@ public:
 class TextNode
 {
 private:
-    String              maText;
-    TextCharAttribList  maCharAttribs;
+    String				maText;
+    TextCharAttribList	maCharAttribs;
 
                         TextNode( const TextNode& ) {;}
 protected:
-    void                ExpandAttribs( USHORT nIndex, USHORT nNewChars );
-    void                CollapsAttribs( USHORT nIndex, USHORT nDelChars );
+    void				ExpandAttribs( USHORT nIndex, USHORT nNewChars );
+    void				CollapsAttribs( USHORT nIndex, USHORT nDelChars );
 
 public:
                         TextNode( const String& rText );
 
 
-    const String&               GetText() const         { return maText; }
+    const String&				GetText() const 		{ return maText; }
 
-    const TextCharAttribList&   GetCharAttribs() const  { return maCharAttribs; }
-    TextCharAttribList&         GetCharAttribs()        { return maCharAttribs; }
+    const TextCharAttribList&	GetCharAttribs() const	{ return maCharAttribs; }
+    TextCharAttribList&			GetCharAttribs() 		{ return maCharAttribs; }
 
-    void                InsertText( USHORT nPos, const String& rText );
-    void                InsertText( USHORT nPos, sal_Unicode c );
-    void                RemoveText( USHORT nPos, USHORT nChars );
+    void				InsertText( USHORT nPos, const String& rText );
+    void				InsertText( USHORT nPos, sal_Unicode c );
+    void 				RemoveText( USHORT nPos, USHORT nChars );
 
-    TextNode*           Split( USHORT nPos, BOOL bKeepEndigAttribs );
-    void                Append( const TextNode& rNode );
+    TextNode*			Split( USHORT nPos, BOOL bKeepEndigAttribs );
+    void				Append( const TextNode& rNode );
 };
 
 class TextDoc
 {
 private:
     ToolsList<TextNode*> maTextNodes;
-    USHORT              mnLeftMargin;
+    USHORT				mnLeftMargin;
 
 protected:
-    void                DestroyTextNodes();
+    void				DestroyTextNodes();
 
 public:
                         TextDoc();
                         ~TextDoc();
 
-    void                Clear();
+    void				Clear();
 
-    ToolsList<TextNode*>&       GetNodes()              { return maTextNodes; }
-    const ToolsList<TextNode*>& GetNodes() const        { return maTextNodes; }
+    ToolsList<TextNode*>&		GetNodes() 				{ return maTextNodes; }
+    const ToolsList<TextNode*>&	GetNodes() const 		{ return maTextNodes; }
 
-    TextPaM             RemoveChars( const TextPaM& rPaM, USHORT nChars );
-    TextPaM             InsertText( const TextPaM& rPaM, sal_Unicode c );
-    TextPaM             InsertText( const TextPaM& rPaM, const String& rStr );
+    TextPaM				RemoveChars( const TextPaM& rPaM, USHORT nChars );
+    TextPaM				InsertText( const TextPaM& rPaM, sal_Unicode c );
+    TextPaM				InsertText( const TextPaM& rPaM, const String& rStr );
 
-    TextPaM             InsertParaBreak( const TextPaM& rPaM, BOOL bKeepEndingAttribs );
-    TextPaM             ConnectParagraphs( TextNode* pLeft, TextNode* pRight );
+    TextPaM				InsertParaBreak( const TextPaM& rPaM, BOOL bKeepEndingAttribs );
+    TextPaM				ConnectParagraphs( TextNode* pLeft, TextNode* pRight );
 
-    ULONG               GetTextLen( const sal_Unicode* pSep, const TextSelection* pSel = NULL ) const;
-    String              GetText( const sal_Unicode* pSep ) const;
-    String              GetText( ULONG nPara ) const;
+    ULONG				GetTextLen( const sal_Unicode* pSep, const TextSelection* pSel = NULL ) const;
+    String				GetText( const sal_Unicode* pSep ) const;
+    String				GetText( ULONG nPara ) const;
 
-    void                SetLeftMargin( USHORT n )   { mnLeftMargin = n; }
-    USHORT              GetLeftMargin() const       { return mnLeftMargin; }
+    void				SetLeftMargin( USHORT n )	{ mnLeftMargin = n; }
+    USHORT				GetLeftMargin() const		{ return mnLeftMargin; }
 
-//  BOOL                RemoveAttribs( TextNode* pNode, USHORT nStart, USHORT nEnd ), USHORT nWhich = 0 );
-//  BOOL                RemoveAttribs( TextNode* pNode, USHORT nStart, USHORT nEnd, TextCharAttrib*& rpStarting, TextCharAttrib*& rpEnding, USHORT nWhich = 0 );
-//  void                InsertAttrib( const EditCharAttrib* pAttr );
-//  void                InsertAttribInSelection( const EditCharAttrib* pAttr );
-//  void                FindAttribs( TextNode* pNode, USHORT nStartPos, USHORT nEndPos, SfxItemSet& rCurSet );
+//	BOOL				RemoveAttribs( TextNode* pNode, USHORT nStart, USHORT nEnd ), USHORT nWhich = 0 );
+//	BOOL				RemoveAttribs( TextNode* pNode, USHORT nStart, USHORT nEnd, TextCharAttrib*& rpStarting, TextCharAttrib*& rpEnding, USHORT nWhich = 0 );
+//	void				InsertAttrib( const EditCharAttrib* pAttr );
+//	void				InsertAttribInSelection( const EditCharAttrib* pAttr );
+//	void				FindAttribs( TextNode* pNode, USHORT nStartPos, USHORT nEndPos, SfxItemSet& rCurSet );
 
-    BOOL                IsValidPaM( const TextPaM& rPaM );
+    BOOL				IsValidPaM( const TextPaM& rPaM );
 };
 
 #endif // _TEXTDOC_HXX
diff --git a/svtools/source/edit/texteng.cxx b/svtools/source/edit/texteng.cxx
index e0e136089d78..ef865a77ae2f 100644
--- a/svtools/source/edit/texteng.cxx
+++ b/svtools/source/edit/texteng.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
@@ -84,8 +84,8 @@ SV_DECL_PTRARR( TextViews, TextViewPtr, 0, 1 )
 SV_DECL_VARARR_SORT( TESortedPositions, ULONG, 16, 8 )
 SV_IMPL_VARARR_SORT( TESortedPositions, ULONG )
 
-#define RESDIFF     10
-#define SCRLRANGE   20      // 1/20 der Breite/Hoehe scrollen, wenn im QueryDrop
+#define RESDIFF		10
+#define SCRLRANGE	20		// 1/20 der Breite/Hoehe scrollen, wenn im QueryDrop
 
 
 // -------------------------------------------------------------------------
@@ -99,25 +99,25 @@ TextEngine::TextEngine()
     mpViews = new TextViews;
     mpActiveView = NULL;
 
-    mbIsFormatting      = FALSE;
-    mbFormatted         = FALSE;
-    mbUpdate            = TRUE;
-    mbModified          = FALSE;
-    mbUndoEnabled       = FALSE;
-    mbIsInUndo          = FALSE;
-    mbDowning           = FALSE;
-    mbRightToLeft       = FALSE;
+    mbIsFormatting		= FALSE;
+    mbFormatted			= FALSE;
+    mbUpdate 			= TRUE;
+    mbModified			= FALSE;
+    mbUndoEnabled 		= FALSE;
+    mbIsInUndo			= FALSE;
+    mbDowning			= FALSE;
+    mbRightToLeft		= FALSE;
     mbHasMultiLineParas = FALSE;
 
-    meAlign         = TXTALIGN_LEFT;
+    meAlign			= TXTALIGN_LEFT;
 
-    mnMaxTextWidth  = 0;
-    mnMaxTextLen    = 0;
-    mnCurTextWidth  = 0xFFFFFFFF;
-    mnCurTextHeight = 0;
+    mnMaxTextWidth	= 0;
+    mnMaxTextLen 	= 0;
+    mnCurTextWidth	= 0xFFFFFFFF;
+    mnCurTextHeight	= 0;
 
-    mpUndoManager   = NULL;
-       mpIMEInfos       = NULL;
+    mpUndoManager 	= NULL;
+       mpIMEInfos		= NULL;
     mpLocaleDataWrapper = NULL;
 
     mpIdleFormatter = new IdleFormatter;
@@ -145,7 +145,7 @@ TextEngine::~TextEngine()
     delete mpIdleFormatter;
     delete mpDoc;
     delete mpTEParaPortions;
-    delete mpViews; // nur die Liste, nicht die Vies
+    delete mpViews;	// nur die Liste, nicht die Vies
     delete mpRefDev;
     delete mpUndoManager;
     delete mpIMEInfos;
@@ -299,7 +299,7 @@ static inline const sal_Unicode* static_getLineEndText( LineEnd aLineEnd )
 }
 
 void  TextEngine::ReplaceText(const TextSelection& rSel, const String& rText)
-{
+{        
     ImpInsertText( rSel, rText );
 }
 
@@ -401,9 +401,9 @@ BOOL TextEngine::DoesKeyChangeText( const KeyEvent& rKeyEvent )
             case KEYFUNC_UNDO:
             case KEYFUNC_REDO:
             case KEYFUNC_CUT:
-            case KEYFUNC_PASTE: bDoesChange = TRUE;
+            case KEYFUNC_PASTE:	bDoesChange = TRUE;
             break;
-            default:    // wird dann evtl. unten bearbeitet.
+            default:	// wird dann evtl. unten bearbeitet.
                         eFunc = KEYFUNC_DONTKNOW;
         }
     }
@@ -538,7 +538,7 @@ void TextEngine::SetText( const XubString& rText )
             pView->Invalidate();
     }
 
-    if( !rText.Len() )  // sonst muss spaeter noch invalidiert werden, !bFormatted reicht.
+    if( !rText.Len() )	// sonst muss spaeter noch invalidiert werden, !bFormatted reicht.
         mnCurTextHeight = 0;
 
     FormatAndUpdate();
@@ -573,16 +573,16 @@ void TextEngine::ImpRemoveChars( const TextPaM& rPaM, USHORT nChars, SfxUndoActi
             TextCharAttrib* pAttr = pNode->GetCharAttribs().GetAttrib( --nAttr );
             if ( ( pAttr->GetEnd() >= nStart ) && ( pAttr->GetStart() < nEnd ) )
             {
-//              TextSelection aSel( rPaM );
-//              aSel.GetEnd().GetIndex() += nChars;
-//              TextUndoSetAttribs* pAttrUndo = CreateAttribUndo( aSel );
-//              InsertUndo( pAttrUndo );
-                break;  // for
+//				TextSelection aSel( rPaM );
+//				aSel.GetEnd().GetIndex() += nChars;
+//				TextUndoSetAttribs* pAttrUndo = CreateAttribUndo( aSel );
+//				InsertUndo( pAttrUndo );
+                break;	// for
             }
         }
-//      if ( pCurUndo && ( CreateTextPaM( pCurUndo->GetEPaM() ) == rPaM ) )
-//          pCurUndo->GetStr() += aStr;
-//      else
+//		if ( pCurUndo && ( CreateTextPaM( pCurUndo->GetEPaM() ) == rPaM ) )
+//			pCurUndo->GetStr() += aStr;
+//		else
             InsertUndo( new TextUndoRemoveChars( this, rPaM, aStr ) );
     }
 
@@ -629,7 +629,7 @@ TextPaM TextEngine::ImpDeleteText( const TextSelection& rSel )
     TextPaM aEndPaM( aSel.GetEnd() );
 
     CursorMoved( aStartPaM.GetPara() ); // nur damit neu eingestellte Attribute verschwinden...
-    CursorMoved( aEndPaM.GetPara() );   // nur damit neu eingestellte Attribute verschwinden...
+    CursorMoved( aEndPaM.GetPara() );	// nur damit neu eingestellte Attribute verschwinden...
 
     DBG_ASSERT( mpDoc->IsValidPaM( aStartPaM ), "Index im Wald in ImpDeleteText" );
     DBG_ASSERT( mpDoc->IsValidPaM( aEndPaM ), "Index im Wald in ImpDeleteText" );
@@ -658,7 +658,7 @@ TextPaM TextEngine::ImpDeleteText( const TextSelection& rSel )
         }
 
         // Den Anfang des EndNodes....
-        nEndNode = nStartNode+1;    // Die anderen Absaetze wurden geloescht
+        nEndNode = nStartNode+1;	// Die anderen Absaetze wurden geloescht
         nChars = aEndPaM.GetIndex();
         if ( nChars )
         {
@@ -683,7 +683,7 @@ TextPaM TextEngine::ImpDeleteText( const TextSelection& rSel )
         pPortion->MarkInvalid( aEndPaM.GetIndex(), aStartPaM.GetIndex() - aEndPaM.GetIndex() );
     }
 
-//  UpdateSelections();
+//	UpdateSelections();
     TextModified();
     return aStartPaM;
 }
@@ -732,13 +732,13 @@ BOOL TextEngine::IsInputSequenceCheckingRequired( sal_Unicode c, const TextSelec
     USHORT nMaxPos   = rCurSel.GetEnd().GetIndex();
     if (nMaxPos < nFirstPos)
         nFirstPos = nMaxPos;
-
-    sal_Bool bIsSequenceChecking =
+    
+    sal_Bool bIsSequenceChecking =  
         aCTLOptions.IsCTLFontEnabled() &&
-        aCTLOptions.IsCTLSequenceChecking() &&
+        aCTLOptions.IsCTLSequenceChecking() && 
         nFirstPos != 0 && /* first char needs not to be checked */
         xBI.is() && i18n::ScriptType::COMPLEX == xBI->getScriptType( rtl::OUString( c ), 0 );
-
+    
     return bIsSequenceChecking;
 }
 
@@ -785,10 +785,10 @@ TextPaM TextEngine::ImpInsertText( sal_Unicode c, const TextSelection& rCurSel,
             if (xISC.is())
             {
                 xub_StrLen nTmpPos = aPaM.GetIndex();
-                sal_Int16 nCheckMode = aCTLOptions.IsCTLSequenceCheckingRestricted() ?
+                sal_Int16 nCheckMode = aCTLOptions.IsCTLSequenceCheckingRestricted() ? 
                         i18n::InputSequenceCheckMode::STRICT : i18n::InputSequenceCheckMode::BASIC;
 
-                // the text that needs to be checked is only the one
+                // the text that needs to be checked is only the one 
                 // before the current cursor position
                 rtl::OUString aOldText( mpDoc->GetText( aPaM.GetPara() ).Copy(0, nTmpPos) );
                 rtl::OUString aNewText( aOldText );
@@ -873,7 +873,7 @@ TextPaM TextEngine::ImpInsertText( const TextSelection& rCurSel, const XubString
     {
         USHORT nEnd = aText.Search( LINE_SEP, nStart );
         if ( nEnd == STRING_NOTFOUND )
-            nEnd = aText.Len(); // nicht dereferenzieren!
+            nEnd = aText.Len();	// nicht dereferenzieren!
 
         // Start == End => Leerzeile
         if ( nEnd > nStart )
@@ -903,8 +903,8 @@ TextPaM TextEngine::ImpInsertText( const TextSelection& rCurSel, const XubString
             aPaM = ImpInsertParaBreak( aPaM );
 
         nStart = nEnd+1;
-
-        if ( nStart < nEnd )    // #108611# overflow
+        
+        if ( nStart < nEnd )    // #108611# overflow 
             break;
     }
 
@@ -944,7 +944,7 @@ TextPaM TextEngine::ImpInsertParaBreak( const TextPaM& rPaM, BOOL bKeepEndingAtt
     mpTEParaPortions->Insert( pNewPortion, aPaM.GetPara() );
     ImpParagraphInserted( aPaM.GetPara() );
 
-    CursorMoved( rPaM.GetPara() );  // falls leeres Attribut entstanden.
+    CursorMoved( rPaM.GetPara() );	// falls leeres Attribut entstanden.
     TextModified();
 
     if ( bFirstParaContentChanged )
@@ -988,9 +988,9 @@ Rectangle TextEngine::GetEditCursor( const TextPaM& rPaM, BOOL bSpecial, BOOL bP
     //TextNode* pNode = mpDoc->GetNodes().GetObject( rPaM.GetPara() );
 
     /*
-     bSpecial:  Wenn hinter dem letzten Zeichen einer umgebrochenen Zeile,
+     bSpecial:	Wenn hinter dem letzten Zeichen einer umgebrochenen Zeile,
      am Ende der Zeile bleiben, nicht am Anfang der naechsten.
-     Zweck:     - END => wirklich hinter das letzte Zeichen
+     Zweck: 	- END => wirklich hinter das letzte Zeichen
                 - Selektion....
       bSpecial: If behind the last character of a made up line, stay at the
                   end of the line, not at the start of the next line.
@@ -1066,7 +1066,7 @@ long TextEngine::ImpGetXPos( ULONG nPara, TextLine* pLine, USHORT nIndex, BOOL b
         if ( nIndex == ( nTextPortionStart + pPortion->GetLen() ) )
         {
             // End of Portion
-            if ( ( pPortion->GetKind() == PORTIONKIND_TAB ) ||
+            if ( ( pPortion->GetKind() == PORTIONKIND_TAB ) || 
                  ( !IsRightToLeft() && !pPortion->IsRightToLeft() ) ||
                  ( IsRightToLeft() && pPortion->IsRightToLeft() ) )
             {
@@ -1074,7 +1074,7 @@ long TextEngine::ImpGetXPos( ULONG nPara, TextLine* pLine, USHORT nIndex, BOOL b
                 if ( ( pPortion->GetKind() == PORTIONKIND_TAB ) && ( (nTextPortion+1) < pParaPortion->GetTextPortions().Count() ) )
                 {
                     TETextPortion* pNextPortion = pParaPortion->GetTextPortions().GetObject( nTextPortion+1 );
-                    if ( ( pNextPortion->GetKind() != PORTIONKIND_TAB ) && (
+                    if ( ( pNextPortion->GetKind() != PORTIONKIND_TAB ) && ( 
                               ( !IsRightToLeft() && pNextPortion->IsRightToLeft() ) ||
                               ( IsRightToLeft() && !pNextPortion->IsRightToLeft() ) ) )
                     {
@@ -1188,10 +1188,10 @@ USHORT TextEngine::ImpFindIndex( ULONG nPortion, const Point& rPosInPara, BOOL b
     {
         TextLine* pTmpLine = pPortion->GetLines().GetObject( nLine );
         nY += mnCharHeight;
-        if ( nY > rPosInPara.Y() )  // das war 'se
+        if ( nY > rPosInPara.Y() ) 	// das war 'se
         {
             pLine = pTmpLine;
-            break;                  // richtige Y-Position intressiert nicht
+            break;					// richtige Y-Position intressiert nicht
         }
     }
     DBG_ASSERT( pLine, "ImpFindIndex: pLine ?" );
@@ -1229,7 +1229,7 @@ USHORT TextEngine::GetCharPos( ULONG nPortion, USHORT nLine, long nXPos, BOOL )
         {
             if( pTextPortion->GetLen() > 1 )
             {
-                nTmpX -= pTextPortion->GetWidth();  // vor die Portion stellen
+                nTmpX -= pTextPortion->GetWidth();	// vor die Portion stellen
                 // Optimieren: Kein GetTextBreak, wenn feste Fontbreite...
                 Font aFont;
                 SeekCursor( nPortion, nCurIndex+1, aFont, NULL );
@@ -1299,7 +1299,7 @@ ULONG TextEngine::CalcTextWidth()
         {
             ULONG nParaWidth = CalcTextWidth( --nPara );
             if ( nParaWidth > mnCurTextWidth )
-                mnCurTextWidth = nParaWidth;
+                mnCurTextWidth = nParaWidth; 
         }
     }
     return mnCurTextWidth+1;// Ein breiter, da in CreateLines bei >= umgebrochen wird.
@@ -1554,8 +1554,8 @@ void TextEngine::SeekCursor( ULONG nPara, USHORT nPos, Font& rFont, OutputDevice
         else if ( nAttr & EXTTEXTINPUT_ATTR_GRAYWAVELINE )
         {
             rFont.SetUnderline( UNDERLINE_WAVE );
-//          if( pOut )
-//              pOut->SetTextLineColor( Color( COL_LIGHTGRAY ) );
+//			if( pOut )
+//				pOut->SetTextLineColor( Color( COL_LIGHTGRAY ) );
         }
     }
 }
@@ -1649,7 +1649,7 @@ void TextEngine::FormatFullDoc()
 {
     for ( ULONG nPortion = 0; nPortion < mpTEParaPortions->Count(); nPortion++ )
     {
-        TEParaPortion* pTEParaPortion = mpTEParaPortions->GetObject( nPortion );        USHORT nLen = pTEParaPortion->GetNode()->GetText().Len();
+        TEParaPortion* pTEParaPortion = mpTEParaPortions->GetObject( nPortion );		USHORT nLen = pTEParaPortion->GetNode()->GetText().Len();
         pTEParaPortion->MarkSelectionInvalid( 0, nLen );
     }
     mbFormatted = FALSE;
@@ -1667,7 +1667,7 @@ void TextEngine::FormatDoc()
     long nY = 0;
     BOOL bGrow = FALSE;
 
-    maInvalidRec = Rectangle(); // leermachen
+    maInvalidRec = Rectangle();	// leermachen
     for ( ULONG nPara = 0; nPara < mpTEParaPortions->Count(); nPara++ )
     {
         TEParaPortion* pTEParaPortion = mpTEParaPortions->GetObject( nPara );
@@ -1702,7 +1702,7 @@ void TextEngine::FormatDoc()
             {
                 ULONG nNewParaWidth = CalcTextWidth( nPara );
                 if ( nNewParaWidth >= mnCurTextWidth )
-                    mnCurTextWidth = nNewParaWidth;
+                    mnCurTextWidth = nNewParaWidth; 
                 else if ( ( nOldParaWidth != 0xFFFFFFFF ) && ( nOldParaWidth >= mnCurTextWidth ) )
                     mnCurTextWidth = 0xFFFFFFFF;
             }
@@ -1791,7 +1791,7 @@ void TextEngine::ImpBreakLine( ULONG nPara, TextLine* pLine, TETextPortion*, USH
 
     DBG_ASSERT( nMaxBreakPos < pNode->GetText().Len(), "Break?!" );
 
-    if ( nMaxBreakPos == STRING_LEN )   // GetTextBreak() ist anderer Auffassung als GetTextSize()
+    if ( nMaxBreakPos == STRING_LEN )	// GetTextBreak() ist anderer Auffassung als GetTextSize()
         nMaxBreakPos = pNode->GetText().Len() - 1;
 
     uno::Reference < i18n::XBreakIterator > xBI = GetBreakIterator();
@@ -1811,7 +1811,7 @@ void TextEngine::ImpBreakLine( ULONG nPara, TextLine* pLine, TETextPortion*, USH
     {
         nBreakPos = nMaxBreakPos;
         if ( nBreakPos <= pLine->GetStart() )
-            nBreakPos = pLine->GetStart() + 1;  // Sonst Endlosschleife!
+            nBreakPos = pLine->GetStart() + 1; 	// Sonst Endlosschleife!
     }
 
 
@@ -1851,7 +1851,7 @@ USHORT TextEngine::SplitTextPortion( ULONG nPara, USHORT nPos )
         nTmpPos = nTmpPos + pTP->GetLen();
         if ( nTmpPos >= nPos )
         {
-            if ( nTmpPos == nPos )  // dann braucht nichts geteilt werden
+            if ( nTmpPos == nPos )	// dann braucht nichts geteilt werden
                 return nSplitPortion;
             pTextPortion = pTP;
             break;
@@ -1949,7 +1949,7 @@ void TextEngine::CreateTextPortions( ULONG nPara, USHORT nStartPos )
 
     USHORT nInvPos;
     #ifdef DBG_UTIL
-    BOOL bFound =
+    BOOL bFound = 
     #endif
         aPositions.Seek_Entry( nPortionStart, &nInvPos );
     DBG_ASSERT( bFound && ( nInvPos < (aPositions.Count()-1) ), "InvPos ?!" );
@@ -1986,9 +1986,9 @@ void TextEngine::RecalcTextPortion( ULONG nPara, USHORT nStartPos, short nNewCha
             USHORT nNewPortionPos = 0;
             if ( nStartPos )
                 nNewPortionPos = SplitTextPortion( nPara, nStartPos ) + 1;
-//          else if ( ( pTEParaPortion->GetTextPortions().Count() == 1 ) &&
-//                      !pTEParaPortion->GetTextPortions()[0]->GetLen() )
-//              pTEParaPortion->GetTextPortions().Reset();  // DummyPortion
+//			else if ( ( pTEParaPortion->GetTextPortions().Count() == 1 ) &&
+//						!pTEParaPortion->GetTextPortions()[0]->GetLen() )
+//				pTEParaPortion->GetTextPortions().Reset();	// DummyPortion
 
             // Eine leere Portion kann hier stehen, wenn der Absatz leer war,
             // oder eine Zeile durch einen harten Zeilenumbruch entstanden ist.
@@ -2068,7 +2068,7 @@ void TextEngine::ImpPaint( OutputDevice* pOutDev, const Point& rStartPos, Rectan
 
     if ( !IsFormatted() )
         FormatDoc();
-
+    
     bool bTransparent = false;
     Window* pOutWin = dynamic_cast<Window*>(pOutDev);
     bTransparent = (pOutWin && pOutWin->IsPaintTransparent());
@@ -2258,7 +2258,7 @@ void TextEngine::ImpPaint( OutputDevice* pOutDev, const Point& rStartPos, Rectan
 #endif
                                 }
                                 break;
-                                default:    DBG_ERROR( "ImpPaint: Unknown Portion-Type !" );
+                                default:	DBG_ERROR( "ImpPaint: Unknown Portion-Type !" );
                             }
                         }
 
@@ -2269,7 +2269,7 @@ void TextEngine::ImpPaint( OutputDevice* pOutDev, const Point& rStartPos, Rectan
                 nY += mnCharHeight;
 
                 if ( pPaintArea && ( nY >= pPaintArea->Bottom() ) )
-                    break;  // keine sichtbaren Aktionen mehr...
+                    break;	// keine sichtbaren Aktionen mehr...
             }
         }
         else
@@ -2278,7 +2278,7 @@ void TextEngine::ImpPaint( OutputDevice* pOutDev, const Point& rStartPos, Rectan
         }
 
         if ( pPaintArea && ( nY > pPaintArea->Bottom() ) )
-            break;  // keine sichtbaren Aktionen mehr...
+            break;	// keine sichtbaren Aktionen mehr...
     }
 }
 
@@ -2334,7 +2334,7 @@ BOOL TextEngine::CreateLines( ULONG nPara )
         else if ( ( pTEParaPortion->IsSimpleInvalid() ) && ( nInvalidDiff < 0 ) )
         {
             // pruefen, ob loeschen ueber Portiongrenzen erfolgte...
-            USHORT nStart = nInvalidStart;  // DOPPELT !!!!!!!!!!!!!!!
+            USHORT nStart = nInvalidStart;	// DOPPELT !!!!!!!!!!!!!!!
             USHORT nEnd = nStart - nInvalidDiff;  // neg.
             bQuickFormat = TRUE;
             USHORT nPos = 0;
@@ -2404,7 +2404,7 @@ BOOL TextEngine::CreateLines( ULONG nPara )
         USHORT nTmpPos = nIndex;
         USHORT nTmpPortion = pLine->GetStartPortion();
         long nTmpWidth = mpDoc->GetLeftMargin();
-//      long nXWidth = mnMaxTextWidth ? ( mnMaxTextWidth - mpDoc->GetLeftMargin() ) : 0x7FFFFFFF;
+//		long nXWidth = mnMaxTextWidth ? ( mnMaxTextWidth - mpDoc->GetLeftMargin() ) : 0x7FFFFFFF;
         // Margin nicht abziehen, ist schon in TmpWidth enthalten.
         long nXWidth = mnMaxTextWidth ? mnMaxTextWidth : 0x7FFFFFFF;
         if ( nXWidth < nTmpWidth )
@@ -2512,7 +2512,7 @@ BOOL TextEngine::CreateLines( ULONG nPara )
             {
                 if ( ImpGetAlign() == TXTALIGN_CENTER )
                     pLine->SetStartX( (USHORT)(nSpace / 2) );
-                else    // TXTALIGN_RIGHT
+                else	// TXTALIGN_RIGHT
                     pLine->SetStartX( (USHORT)nSpace );
             }
         }
@@ -2575,7 +2575,7 @@ BOOL TextEngine::CreateLines( ULONG nPara )
             }
         }
 
-        nIndex = pLine->GetEnd();   // naechste Zeile Start = letzte Zeile Ende
+        nIndex = pLine->GetEnd();	// naechste Zeile Start = letzte Zeile Ende
                                     // weil nEnd hinter das letzte Zeichen zeigt!
 
         USHORT nEndPortion = pLine->GetEndPortion();
@@ -2602,7 +2602,7 @@ BOOL TextEngine::CreateLines( ULONG nPara )
             pLine->SetStartPortion( nEndPortion+1 );
             pLine->SetEndPortion( nEndPortion+1 );
         }
-    }   // while ( Index < Len )
+    }	// while ( Index < Len )
 
     if ( nDelFromLine != 0xFFFF )
         pTEParaPortion->GetLines().DeleteAndDestroy( nDelFromLine, pTEParaPortion->GetLines().Count() - nDelFromLine );
@@ -2811,7 +2811,7 @@ void TextEngine::RemoveAttribs( ULONG nPara, USHORT nWhich, BOOL bIdleFormatAndU
                 FormatAndUpdate( NULL );
         }
     }
-}
+}        
 void TextEngine::RemoveAttrib( ULONG nPara, const TextCharAttrib& rAttrib )
 {
     if ( nPara < mpDoc->GetNodes().Count() )
@@ -2824,7 +2824,7 @@ void TextEngine::RemoveAttrib( ULONG nPara, const TextCharAttrib& rAttrib )
             for(USHORT nAttr = nAttrCount; nAttr; --nAttr)
             {
                 if(rAttribs.GetAttrib( nAttr - 1 ) == &rAttrib)
-                {
+                {        
                     rAttribs.RemoveAttrib( nAttr -1 );
                     break;
                 }
@@ -2835,7 +2835,7 @@ void TextEngine::RemoveAttrib( ULONG nPara, const TextCharAttrib& rAttrib )
             FormatAndUpdate( NULL );
         }
     }
-}
+}        
 
 void TextEngine::SetAttrib( const TextAttrib& rAttr, ULONG nPara, USHORT nStart, USHORT nEnd, BOOL bIdleFormatAndUpdate )
 {
@@ -2913,14 +2913,14 @@ void TextEngine::ImpParagraphInserted( ULONG nPara )
             TextView* pView = mpViews->GetObject( --nView );
             if ( pView != GetActiveView() )
             {
-//              BOOL bInvers = pView->maSelection.GetEnd() < pView->maSelection.GetStart();
-//              TextPaM& rMin = !bInvers ? pView->maSelection.GetStart(): pView->maSelection.GetEnd();
-//              TextPaM& rMax = bInvers ? pView->maSelection.GetStart() : pView->maSelection.GetEnd();
+//				BOOL bInvers = pView->maSelection.GetEnd() < pView->maSelection.GetStart();
+//				TextPaM& rMin = !bInvers ? pView->maSelection.GetStart(): pView->maSelection.GetEnd();
+//				TextPaM& rMax = bInvers ? pView->maSelection.GetStart() : pView->maSelection.GetEnd();
 //
-//              if ( rMin.GetPara() >= nPara )
-//                  rMin.GetPara()++;
-//              if ( rMax.GetPara() >= nPara )
-//                  rMax.GetPara()++;
+//				if ( rMin.GetPara() >= nPara )
+//					rMin.GetPara()++;
+//				if ( rMax.GetPara() >= nPara )
+//					rMax.GetPara()++;
                 for ( int n = 0; n <= 1; n++ )
                 {
                     TextPaM& rPaM = n ? pView->GetSelection().GetStart(): pView->GetSelection().GetEnd();
@@ -3074,11 +3074,11 @@ LocaleDataWrapper* TextEngine::ImpGetLocaleDataWrapper()
     return mpLocaleDataWrapper;
 }
 
-void TextEngine::SetRightToLeft( BOOL bR2L )
-{
+void TextEngine::SetRightToLeft( BOOL bR2L ) 
+{ 
     if ( mbRightToLeft != bR2L )
     {
-        mbRightToLeft = bR2L;
+        mbRightToLeft = bR2L; 
         meAlign = bR2L ? TXTALIGN_RIGHT : TXTALIGN_LEFT;
         FormatFullDoc();
         UpdateViews();
@@ -3103,7 +3103,7 @@ void TextEngine::ImpInitWritingDirections( ULONG nPara )
         UBiDi* pBidi = ubidi_openSized( aText.Len(), 0, &nError );
         nError = U_ZERO_ERROR;
 
-        ubidi_setPara( pBidi, reinterpret_cast<const UChar *>(aText.GetBuffer()), aText.Len(), nBidiLevel, NULL, &nError ); // UChar != sal_Unicode in MinGW
+        ubidi_setPara( pBidi, reinterpret_cast<const UChar *>(aText.GetBuffer()), aText.Len(), nBidiLevel, NULL, &nError );	// UChar != sal_Unicode in MinGW
         nError = U_ZERO_ERROR;
 
         long nCount = ubidi_countRuns( pBidi, &nError );
@@ -3140,7 +3140,7 @@ BYTE TextEngine::ImpGetRightToLeft( ULONG nPara, USHORT nPos, USHORT* pStart, US
             ImpInitWritingDirections( nPara );
 
         TEWritingDirectionInfos& rDirInfos = pParaPortion->GetWritingDirectionInfos();
-        for ( USHORT n = 0; n < rDirInfos.Count(); n++ )
+        for ( USHORT n = 0; n < rDirInfos.Count(); n++ ) 
         {
             if ( ( rDirInfos[n].nStartPos <= nPos ) && ( rDirInfos[n].nEndPos >= nPos ) )
                {
@@ -3239,11 +3239,11 @@ long TextEngine::ImpGetPortionXOffset( ULONG nPara, TextLine* pLine, USHORT nTex
 void TextEngine::ImpInitLayoutMode( OutputDevice* pOutDev, BOOL bDrawingR2LPortion )
 {
     ULONG nLayoutMode = pOutDev->GetLayoutMode();
-
+    
     nLayoutMode &= ~(TEXT_LAYOUT_BIDI_RTL | TEXT_LAYOUT_COMPLEX_DISABLED | TEXT_LAYOUT_BIDI_STRONG );
     if ( bDrawingR2LPortion )
         nLayoutMode |= TEXT_LAYOUT_BIDI_RTL;
-
+    
     pOutDev->SetLayoutMode( nLayoutMode );
 }
 
diff --git a/svtools/source/edit/textund2.hxx b/svtools/source/edit/textund2.hxx
index 18cf9331328e..47e92ad2a5e7 100644
--- a/svtools/source/edit/textund2.hxx
+++ b/svtools/source/edit/textund2.hxx
@@ -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
@@ -33,101 +33,101 @@
 class TextUndoDelPara : public TextUndo
 {
 private:
-    BOOL            mbDelObject;
-    ULONG           mnPara;
-    TextNode*       mpNode; // Zeigt auf das gueltige, nicht zerstoerte Objekt!
+    BOOL 			mbDelObject;
+    ULONG 			mnPara;
+    TextNode* 		mpNode;	// Zeigt auf das gueltige, nicht zerstoerte Objekt!
 
 public:
                     TYPEINFO();
                     TextUndoDelPara( TextEngine* pTextEngine, TextNode* pNode, ULONG nPara );
                     ~TextUndoDelPara();
 
-    virtual void    Undo();
-    virtual void    Redo();
+    virtual void 	Undo();
+    virtual void 	Redo();
 };
 
 
 class TextUndoConnectParas : public TextUndo
 {
 private:
-    ULONG           mnPara;
-    USHORT          mnSepPos;
+    ULONG 			mnPara;
+    USHORT			mnSepPos;
 
 public:
                     TYPEINFO();
                     TextUndoConnectParas( TextEngine* pTextEngine, ULONG nPara, USHORT nSepPos );
                     ~TextUndoConnectParas();
 
-    virtual void    Undo();
-    virtual void    Redo();
+    virtual void 	Undo();
+    virtual void 	Redo();
 };
 
 
 class TextUndoSplitPara : public TextUndo
 {
 private:
-    ULONG           mnPara;
-    USHORT          mnSepPos;
+    ULONG 			mnPara;
+    USHORT			mnSepPos;
 
 public:
                     TYPEINFO();
                     TextUndoSplitPara( TextEngine* pTextEngine, ULONG nPara, USHORT nSepPos );
                     ~TextUndoSplitPara();
 
-    virtual void    Undo();
-    virtual void    Redo();
+    virtual void 	Undo();
+    virtual void 	Redo();
 };
 
 
 class TextUndoInsertChars : public TextUndo
 {
 private:
-    TextPaM         maTextPaM;
-    String          maText;
+    TextPaM			maTextPaM;
+    String			maText;
 
 public:
                     TYPEINFO();
                     TextUndoInsertChars( TextEngine* pTextEngine, const TextPaM& rTextPaM, const String& rStr );
 
-//  const TextPaM&  GetTextPaM() { return aTextPaM; }
-//  String&         GetStr() { return aText; }
+//	const TextPaM&	GetTextPaM() { return aTextPaM; }
+//	String&			GetStr() { return aText; }
 
-    virtual void    Undo();
-    virtual void    Redo();
+    virtual void 	Undo();
+    virtual void 	Redo();
 
-    virtual BOOL    Merge( SfxUndoAction *pNextAction );
+    virtual BOOL	Merge( SfxUndoAction *pNextAction );
 };
 
 
 class TextUndoRemoveChars : public TextUndo
 {
 private:
-    TextPaM         maTextPaM;
-    String          maText;
+    TextPaM			maTextPaM;
+    String			maText;
 
 public:
                     TYPEINFO();
                     TextUndoRemoveChars( TextEngine* pTextEngine, const TextPaM& rTextPaM, const String& rStr );
 
-//  const TextPaM&      GetTextPaM() { return aTextPaM; }
-//  String&         GetStr() { return aText; }
+//	const TextPaM&		GetTextPaM() { return aTextPaM; }
+//	String&			GetStr() { return aText; }
 
-    virtual void    Undo();
-    virtual void    Redo();
+    virtual void 	Undo();
+    virtual void 	Redo();
 };
 
 
 class TextUndoSetAttribs: public TextUndo
 {
 private:
-    TextSelection       maSelection;
-//  SfxItemSet          aNewAttribs;
-//  TextInfoArray       aPrevAttribs;
-//  BYTE                nSpecial;
-//  BOOL                bSetIsRemove;
-//  USHORT              nRemoveWhich;
+    TextSelection		maSelection;
+//	SfxItemSet			aNewAttribs;
+//	TextInfoArray		aPrevAttribs;
+//	BYTE				nSpecial;
+//	BOOL				bSetIsRemove;
+//	USHORT				nRemoveWhich;
 //
-//  void                ImpSetSelection( TextView* pView );
+//	void				ImpSetSelection( TextView* pView );
 
 
 public:
@@ -135,14 +135,14 @@ public:
                         TextUndoSetAttribs( TextEngine* pTextEngine, const TextSelection& rESel );
                         ~TextUndoSetAttribs();
 
-//  TextInfoArray&      GetTextInfos()  { return aPrevAttribs; }
-//  SfxItemSet&         GetNewAttribs()     { return aNewAttribs; }
-//  void                SetSpecial( BYTE n )            { nSpecial = n; }
-//  void                SetRemoveAttribs( BOOL b )      { bSetIsRemove = b; }
-//  void                SetRemoveWhich( USHORT n )      { nRemoveWhich = n; }
+//	TextInfoArray&		GetTextInfos()	{ return aPrevAttribs; }
+//	SfxItemSet&			GetNewAttribs()		{ return aNewAttribs; }
+//	void				SetSpecial( BYTE n ) 			{ nSpecial = n; }
+//	void				SetRemoveAttribs( BOOL b ) 		{ bSetIsRemove = b; }
+//	void				SetRemoveWhich( USHORT n )		{ nRemoveWhich = n; }
 
-    virtual void        Undo();
-    virtual void        Redo();
+    virtual void		Undo();
+    virtual void		Redo();
 };
 
 #endif // _TEXTUND2_HXX
diff --git a/svtools/source/edit/textundo.cxx b/svtools/source/edit/textundo.cxx
index 4c243de16c31..a5664ffc7f9f 100644
--- a/svtools/source/edit/textundo.cxx
+++ b/svtools/source/edit/textundo.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
@@ -91,8 +91,8 @@ void TextUndoManager::UndoRedoStart()
 {
     DBG_ASSERT( GetView(), "Undo/Redo: Active View?" );
 
-//  if ( GetView() )
-//      GetView()->HideSelection();
+//	if ( GetView() )
+//		GetView()->HideSelection();
 }
 
 void TextUndoManager::UndoRedoEnd()
@@ -128,7 +128,7 @@ USHORT __EXPORT TextUndo::GetId() const
 
 XubString __EXPORT TextUndo::GetComment() const
 {
-//  return mpTextEngine->GetUndoComment( this );
+//	return mpTextEngine->GetUndoComment( this );
     return String();
 }
 
@@ -156,7 +156,7 @@ TextUndoDelPara::~TextUndoDelPara()
 void __EXPORT TextUndoDelPara::Undo()
 {
     GetTextEngine()->InsertContent( mpNode, mnPara );
-    mbDelObject = FALSE;    // gehoert wieder der Engine
+    mbDelObject = FALSE;	// gehoert wieder der Engine
 
     if ( GetView() )
     {
@@ -178,7 +178,7 @@ void __EXPORT TextUndoDelPara::Redo()
     GetDoc()->GetNodes().Remove( mnPara );
     GetTextEngine()->ImpParagraphRemoved( mnPara );
 
-    mbDelObject = TRUE; // gehoert wieder dem Undo
+    mbDelObject = TRUE;	// gehoert wieder dem Undo
 
     ULONG nParas = GetDoc()->GetNodes().Count();
     ULONG n = mnPara < nParas ? mnPara : (nParas-1);
@@ -191,7 +191,7 @@ void __EXPORT TextUndoDelPara::Redo()
 // TextUndoConnectParas
 // ------------------------------------------------------------------------
 TextUndoConnectParas::TextUndoConnectParas( TextEngine* pTextEngine, ULONG nPara, USHORT nPos )
-                    :   TextUndo( TEXTUNDO_CONNECTPARAS, pTextEngine )
+                    : 	TextUndo( TEXTUNDO_CONNECTPARAS, pTextEngine )
 {
     mnPara = nPara;
     mnSepPos = nPos;
@@ -307,10 +307,10 @@ TextUndoSetAttribs::TextUndoSetAttribs( TextEngine* pTextEngine, const TextSelec
     : TextUndo( TEXTUNDO_ATTRIBS, pTextEngine ), maSelection( rSel )
 {
     maSelection.Justify();
-//  aNewAttribs.Set( rNewItems );
-//  mbSetIsRemove = FALSE;
-//  mnRemoveWhich = 0;
-//  mnSpecial = 0;
+// 	aNewAttribs.Set( rNewItems );
+//	mbSetIsRemove = FALSE;
+//	mnRemoveWhich = 0;
+//	mnSpecial = 0;
 }
 
 TextUndoSetAttribs::~TextUndoSetAttribs()
@@ -322,22 +322,22 @@ void __EXPORT TextUndoSetAttribs::Undo()
 {
     for ( ULONG nPara = maSelection.GetStart().GetPara(); nPara <= maSelection.GetEnd().GetPara(); nPara++ )
     {
-//      ContentAttribsInfo* pInf = aPrevAttribs[ (USHORT)(nPara-aESel.nStartPara) ];
-//      GetTextEngine()->RemoveCharAttribs( nPara );
-//      TextNode* pNode = GetTextEngine()->GetTextDoc().GetObject( nPara );
-//      for ( USHORT nAttr = 0; nAttr < pInf->GetPrevCharAttribs().Count(); nAttr++ )
-//      {
-//          GetTextEngine()->GetTextDoc().InsertAttrib( pNode, pX->GetStart(), pX->GetEnd(), *pX->GetItem() );
-//      }
+//		ContentAttribsInfo* pInf = aPrevAttribs[ (USHORT)(nPara-aESel.nStartPara) ];
+//		GetTextEngine()->RemoveCharAttribs( nPara );
+//		TextNode* pNode = GetTextEngine()->GetTextDoc().GetObject( nPara );
+//		for ( USHORT nAttr = 0; nAttr < pInf->GetPrevCharAttribs().Count(); nAttr++ )
+//		{
+//			GetTextEngine()->GetTextDoc().InsertAttrib( pNode, pX->GetStart(), pX->GetEnd(), *pX->GetItem() );
+//		}
     }
     SetSelection( maSelection );
 }
 
 void __EXPORT TextUndoSetAttribs::Redo()
 {
-//  if ( !bSetIsRemove )
-//      GetTextEngine()->SetAttribs( aSel, aNewAttribs, nSpecial );
-//  else
-//      GetTextEngine()->RemoveCharAttribs( aSel, bRemoveParaAttribs, nRemoveWhich );
+//	if ( !bSetIsRemove )
+//		GetTextEngine()->SetAttribs( aSel, aNewAttribs, nSpecial );
+//	else
+//		GetTextEngine()->RemoveCharAttribs( aSel, bRemoveParaAttribs, nRemoveWhich );
     SetSelection( maSelection );
 }
diff --git a/svtools/source/edit/textundo.hxx b/svtools/source/edit/textundo.hxx
index cc26c0b51ef6..b1fabaccbc02 100644
--- a/svtools/source/edit/textundo.hxx
+++ b/svtools/source/edit/textundo.hxx
@@ -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
@@ -33,52 +33,52 @@ class TextEngine;
 
 class TextUndoManager : public SfxUndoManager
 {
-    TextEngine*     mpTextEngine;
+    TextEngine*		mpTextEngine;
 
 protected:
 
-    void            UndoRedoStart();
-    void            UndoRedoEnd();
+    void			UndoRedoStart();
+    void			UndoRedoEnd();
 
-    TextView*       GetView() const { return mpTextEngine->GetActiveView(); }
+    TextView*		GetView() const { return mpTextEngine->GetActiveView(); }
 
 public:
                     TextUndoManager( TextEngine* pTextEngine );
                     ~TextUndoManager();
 
     using SfxUndoManager::Undo;
-    virtual BOOL    Undo( USHORT nCount=1 );
+    virtual BOOL	Undo( USHORT nCount=1 );
     using SfxUndoManager::Redo;
-    virtual BOOL    Redo( USHORT nCount=1 );
+    virtual BOOL	Redo( USHORT nCount=1 );
 
 };
 
 class TextUndo : public SfxUndoAction
 {
 private:
-    USHORT              mnId;
-    TextEngine*         mpTextEngine;
+    USHORT 				mnId;
+    TextEngine*			mpTextEngine;
 
 protected:
 
-    TextView*           GetView() const { return mpTextEngine->GetActiveView(); }
-    void                SetSelection( const TextSelection& rSel );
+    TextView*			GetView() const { return mpTextEngine->GetActiveView(); }
+    void				SetSelection( const TextSelection& rSel );
 
-    TextDoc*            GetDoc() const { return mpTextEngine->mpDoc; }
-    TEParaPortions*     GetTEParaPortions() const { return mpTextEngine->mpTEParaPortions; }
+    TextDoc*			GetDoc() const { return mpTextEngine->mpDoc; }
+    TEParaPortions*		GetTEParaPortions() const { return mpTextEngine->mpTEParaPortions; }
 
 public:
                         TYPEINFO();
                         TextUndo( USHORT nId, TextEngine* pTextEngine );
-    virtual             ~TextUndo();
+    virtual 			~TextUndo();
 
-    TextEngine*         GetTextEngine() const   { return mpTextEngine; }
+    TextEngine*			GetTextEngine() const	{ return mpTextEngine; }
 
-    virtual void        Undo()      = 0;
-    virtual void        Redo()      = 0;
+    virtual void		Undo() 		= 0;
+    virtual void		Redo()		= 0;
 
-    virtual XubString   GetComment() const;
-    virtual USHORT      GetId() const;
+    virtual XubString	GetComment() const;
+    virtual USHORT		GetId() const;
 };
 
 #endif // _TEXTUNDO_HXX
diff --git a/svtools/source/edit/textview.cxx b/svtools/source/edit/textview.cxx
index 48cd23bdcc6f..6c456eae02b8 100644
--- a/svtools/source/edit/textview.cxx
+++ b/svtools/source/edit/textview.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
@@ -78,25 +78,25 @@
 
 using namespace ::com::sun::star;
 
-class TETextDataObject :    public ::com::sun::star::datatransfer::XTransferable,
+class TETextDataObject :	public ::com::sun::star::datatransfer::XTransferable,
                         public ::cppu::OWeakObject
 
 {
 private:
-    String          maText;
-    SvMemoryStream  maHTMLStream;
+    String			maText;
+    SvMemoryStream	maHTMLStream;
 
-public:
+public:	
                     TETextDataObject( const String& rText );
                     ~TETextDataObject();
 
-    String&         GetText() { return maText; }
-    SvMemoryStream& GetHTMLStream() { return maHTMLStream; }
-
+    String&			GetText() { return maText; }
+    SvMemoryStream&	GetHTMLStream() { return maHTMLStream; }
+        
     // ::com::sun::star::uno::XInterface
-    ::com::sun::star::uno::Any                  SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException);
-    void                                        SAL_CALL acquire() throw()  { OWeakObject::acquire(); }
-    void                                        SAL_CALL release() throw()  { OWeakObject::release(); }
+    ::com::sun::star::uno::Any					SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException);
+    void										SAL_CALL acquire() throw()	{ OWeakObject::acquire(); }
+    void										SAL_CALL release() throw()	{ OWeakObject::release(); }
 
     // ::com::sun::star::datatransfer::XTransferable
     ::com::sun::star::uno::Any SAL_CALL getTransferData( const ::com::sun::star::datatransfer::DataFlavor& aFlavor ) throw(::com::sun::star::datatransfer::UnsupportedFlavorException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException);
@@ -111,7 +111,7 @@ TETextDataObject::TETextDataObject( const String& rText ) : maText( rText )
 TETextDataObject::~TETextDataObject()
 {
 }
-
+        
 // uno::XInterface
 uno::Any TETextDataObject::queryInterface( const uno::Type & rType ) throw(uno::RuntimeException)
 {
@@ -203,7 +203,7 @@ struct ImpTextView
 // -------------------------------------------------------------------------
 // (+) class TextView
 // -------------------------------------------------------------------------
-TextView::TextView( TextEngine* pEng, Window* pWindow ) :
+TextView::TextView( TextEngine* pEng, Window* pWindow ) : 
     mpImpl(new ImpTextView)
 {
     pWindow->EnableRTL( FALSE );
@@ -222,7 +222,7 @@ TextView::TextView( TextEngine* pEng, Window* pWindow ) :
     mpImpl->mbClickedInSelection = FALSE;
     mpImpl->mbSupportProtectAttribute = FALSE;
     mpImpl->mbCursorAtEndOfLine = false;
-//  mbInSelection = FALSE;
+//	mbInSelection = FALSE;
 
     mpImpl->mnTravelXPos = TRAVEL_X_DONTKNOW;
 
@@ -309,7 +309,7 @@ TextSelection&      TextView::GetSelection()
 
 void TextView::DeleteSelected()
 {
-//  HideSelection();
+//	HideSelection();
 
     mpImpl->mpTextEngine->UndoActionStart( TEXTUNDO_DELETE );
     TextPaM aPaM = mpImpl->mpTextEngine->ImpDeleteText( mpImpl->maSelection );
@@ -369,8 +369,8 @@ void TextView::ImpPaint( const Rectangle& rRect, BOOL bUseVirtDev )
 
         BOOL bVDevValid = TRUE;
         Size aOutSz( pVDev->GetOutputSizePixel() );
-        if ( (  aOutSz.Width() < rRect.GetWidth() ) ||
-             (  aOutSz.Height() < rRect.GetHeight() ) )
+        if ( (	aOutSz.Width() < rRect.GetWidth() ) ||
+             (	aOutSz.Height() < rRect.GetHeight() ) )
         {
             bVDevValid = pVDev->SetOutputSizePixel( rRect.GetSize() );
         }
@@ -401,7 +401,7 @@ void TextView::ImpPaint( const Rectangle& rRect, BOOL bUseVirtDev )
         ImpPaint( pVDev, aStartPos, &aTmpRec, NULL, pDrawSelection );
         mpImpl->mpWindow->DrawOutDev( rRect.TopLeft(), rRect.GetSize(),
                                 Point(0,0), rRect.GetSize(), *pVDev );
-//      ShowSelection();
+//		ShowSelection();
         if ( mpImpl->mbHighlightSelection )
             ImpHighlight( mpImpl->maSelection );
     }
@@ -410,7 +410,7 @@ void TextView::ImpPaint( const Rectangle& rRect, BOOL bUseVirtDev )
         Point aStartPos = ImpGetOutputStartPos( mpImpl->maStartDocPos );
         ImpPaint( mpImpl->mpWindow, aStartPos, &rRect, NULL, pDrawSelection );
 
-//      ShowSelection();
+//		ShowSelection();
         if ( mpImpl->mbHighlightSelection )
             ImpHighlight( mpImpl->maSelection );
     }
@@ -560,10 +560,10 @@ void TextView::EraseVirtualDevice()
 
 BOOL TextView::KeyInput( const KeyEvent& rKeyEvent )
 {
-    BOOL bDone      = TRUE;
-    BOOL bModified  = FALSE;
-    BOOL bMoved     = FALSE;
-    BOOL bEndKey    = FALSE;    // spezielle CursorPosition
+    BOOL bDone 		= TRUE;
+    BOOL bModified	= FALSE;
+    BOOL bMoved		= FALSE;
+    BOOL bEndKey	= FALSE;	// spezielle CursorPosition
     BOOL bAllowIdle = TRUE;
 
     // Um zu pruefen ob durch irgendeine Aktion mModified, das lokale
@@ -611,7 +611,7 @@ BOOL TextView::KeyInput( const KeyEvent& rKeyEvent )
             }
             break;
 
-            default:    // wird dann evtl. unten bearbeitet.
+            default:	// wird dann evtl. unten bearbeitet.
                         eFunc = KEYFUNC_DONTKNOW;
         }
     }
@@ -649,7 +649,7 @@ BOOL TextView::KeyInput( const KeyEvent& rKeyEvent )
                 {
                     aCurSel = ImpMoveCursor( rKeyEvent );
                     if ( aCurSel.HasRange() ) {
-                        uno::Reference<datatransfer::clipboard::XClipboard> aSelection(GetWindow()->GetPrimarySelection());
+                        uno::Reference<datatransfer::clipboard::XClipboard> aSelection(GetWindow()->GetPrimarySelection()); 
                         Copy( aSelection );
                     }
                     bMoved = TRUE;
@@ -699,13 +699,13 @@ BOOL TextView::KeyInput( const KeyEvent& rKeyEvent )
                     if(mpImpl->mbSupportProtectAttribute)
                     {
                         //expand selection to include all protected content - if there is any
-                        const TextCharAttrib* pStartAttr = mpImpl->mpTextEngine->FindCharAttrib(
-                                    TextPaM(mpImpl->maSelection.GetStart().GetPara(),
-                                    mpImpl->maSelection.GetStart().GetIndex()),
+                        const TextCharAttrib* pStartAttr = mpImpl->mpTextEngine->FindCharAttrib( 
+                                    TextPaM(mpImpl->maSelection.GetStart().GetPara(), 
+                                    mpImpl->maSelection.GetStart().GetIndex()), 
                                     TEXTATTR_PROTECTED );
-                        const TextCharAttrib* pEndAttr = mpImpl->mpTextEngine->FindCharAttrib(
-                                    TextPaM(mpImpl->maSelection.GetEnd().GetPara(),
-                                    mpImpl->maSelection.GetEnd().GetIndex()),
+                        const TextCharAttrib* pEndAttr = mpImpl->mpTextEngine->FindCharAttrib( 
+                                    TextPaM(mpImpl->maSelection.GetEnd().GetPara(), 
+                                    mpImpl->maSelection.GetEnd().GetIndex()), 
                                     TEXTATTR_PROTECTED );
                         if(pStartAttr && pStartAttr->GetStart() < mpImpl->maSelection.GetStart().GetIndex())
                         {
@@ -715,7 +715,7 @@ BOOL TextView::KeyInput( const KeyEvent& rKeyEvent )
                         {
                             mpImpl->maSelection.GetEnd().GetIndex() = pEndAttr->GetEnd();
                         }
-                    }
+                    }            
                     aCurSel = ImpDelete( nDel, nMode );
                     mpImpl->mpTextEngine->UndoActionEnd( TEXTUNDO_DELETE );
                     bModified = TRUE;
@@ -825,17 +825,17 @@ void TextView::MouseButtonUp( const MouseEvent& rMouseEvent )
     mpImpl->mbClickedInSelection = FALSE;
     mpImpl->mnTravelXPos = TRAVEL_X_DONTKNOW;
     mpImpl->mpSelEngine->SelMouseButtonUp( rMouseEvent );
-    if ( rMouseEvent.IsMiddle() && !IsReadOnly() &&
+    if ( rMouseEvent.IsMiddle() && !IsReadOnly() && 
          ( GetWindow()->GetSettings().GetMouseSettings().GetMiddleButtonAction() == MOUSE_MIDDLE_PASTESELECTION ) )
     {
-        uno::Reference<datatransfer::clipboard::XClipboard> aSelection(GetWindow()->GetPrimarySelection());
+        uno::Reference<datatransfer::clipboard::XClipboard> aSelection(GetWindow()->GetPrimarySelection()); 
         Paste( aSelection );
         if ( mpImpl->mpTextEngine->IsModified() )
             mpImpl->mpTextEngine->Broadcast( TextHint( TEXT_HINT_MODIFIED ) );
     }
     else if ( rMouseEvent.IsLeft() && GetSelection().HasRange() )
     {
-        uno::Reference<datatransfer::clipboard::XClipboard> aSelection(GetWindow()->GetPrimarySelection());
+        uno::Reference<datatransfer::clipboard::XClipboard> aSelection(GetWindow()->GetPrimarySelection()); 
         Copy( aSelection );
     }
 }
@@ -863,7 +863,7 @@ void TextView::MouseButtonDown( const MouseEvent& rMouseEvent )
         {
             HideSelection();
             ImpSetSelection( mpImpl->maSelection.GetEnd() );
-            SetCursorAtPoint( rMouseEvent.GetPosPixel() );  // Wird von SelectionEngine bei MOD2 nicht gesetzt
+            SetCursorAtPoint( rMouseEvent.GetPosPixel() );	// Wird von SelectionEngine bei MOD2 nicht gesetzt
         }
 
         if ( rMouseEvent.GetClicks() == 2 )
@@ -881,13 +881,13 @@ void TextView::MouseButtonDown( const MouseEvent& rMouseEvent )
                 if(mpImpl->mbSupportProtectAttribute)
                 {
                     //expand selection to include all protected content - if there is any
-                    const TextCharAttrib* pStartAttr = mpImpl->mpTextEngine->FindCharAttrib(
-                                TextPaM(aNewSel.GetStart().GetPara(),
-                                (USHORT)aBoundary.startPos),
+                    const TextCharAttrib* pStartAttr = mpImpl->mpTextEngine->FindCharAttrib( 
+                                TextPaM(aNewSel.GetStart().GetPara(), 
+                                (USHORT)aBoundary.startPos), 
                                 TEXTATTR_PROTECTED );
-                    const TextCharAttrib* pEndAttr = mpImpl->mpTextEngine->FindCharAttrib(
-                                TextPaM(aNewSel.GetEnd().GetPara(),
-                                (USHORT)aBoundary.endPos),
+                    const TextCharAttrib* pEndAttr = mpImpl->mpTextEngine->FindCharAttrib( 
+                                TextPaM(aNewSel.GetEnd().GetPara(), 
+                                (USHORT)aBoundary.endPos), 
                                 TEXTATTR_PROTECTED );
                     if(pStartAttr && pStartAttr->GetStart() < aNewSel.GetStart().GetIndex())
                     {
@@ -896,8 +896,8 @@ void TextView::MouseButtonDown( const MouseEvent& rMouseEvent )
                     if(pEndAttr && pEndAttr->GetEnd() > aNewSel.GetEnd().GetIndex())
                     {
                         aNewSel.GetEnd().GetIndex() = pEndAttr->GetEnd();
-                    }
-                }
+                    }            
+                }            
                 ImpSetSelection( aNewSel );
                 ShowSelection();
                 ShowCursor( TRUE, TRUE );
@@ -948,13 +948,13 @@ void TextView::Command( const CommandEvent& rCEvt )
             TEParaPortion* pPortion = mpImpl->mpTextEngine->mpTEParaPortions->GetObject( mpImpl->mpTextEngine->mpIMEInfos->aPos.GetPara() );
             pPortion->MarkSelectionInvalid( mpImpl->mpTextEngine->mpIMEInfos->aPos.GetIndex(), 0 );
 
-            BOOL bInsertMode = !mpImpl->mpTextEngine->mpIMEInfos->bWasCursorOverwrite;
+            BOOL bInsertMode = !mpImpl->mpTextEngine->mpIMEInfos->bWasCursorOverwrite; 
 
             delete mpImpl->mpTextEngine->mpIMEInfos;
             mpImpl->mpTextEngine->mpIMEInfos = NULL;
 
             mpImpl->mpTextEngine->FormatAndUpdate( this );
-
+            
             SetInsertMode( bInsertMode );
 
             if ( mpImpl->mpTextEngine->IsModified() )
@@ -1024,7 +1024,7 @@ void TextView::Command( const CommandEvent& rCEvt )
             TextSelection aNewSel = TextPaM( mpImpl->mpTextEngine->mpIMEInfos->aPos.GetPara(), mpImpl->mpTextEngine->mpIMEInfos->aPos.GetIndex()+pData->GetCursorPos() );
             SetSelection( aNewSel );
             SetInsertMode( !pData->IsCursorOverwrite() );
-
+            
             if ( pData->IsCursorVisible() )
                 ShowCursor();
             else
@@ -1037,19 +1037,19 @@ void TextView::Command( const CommandEvent& rCEvt )
         {
             TextPaM aPaM( GetSelection().GetEnd() );
             Rectangle aR1 = mpImpl->mpTextEngine->PaMtoEditCursor( aPaM );
-
+            
             USHORT nInputEnd = mpImpl->mpTextEngine->mpIMEInfos->aPos.GetIndex() + mpImpl->mpTextEngine->mpIMEInfos->nLen;
-
+            
             if ( !mpImpl->mpTextEngine->IsFormatted() )
                 mpImpl->mpTextEngine->FormatDoc();
-
+            
             TEParaPortion* pParaPortion = mpImpl->mpTextEngine->mpTEParaPortions->GetObject( aPaM.GetPara() );
             USHORT nLine = pParaPortion->GetLineNumber( aPaM.GetIndex(), sal_True );
             TextLine* pLine = pParaPortion->GetLines().GetObject( nLine );
             if ( pLine && ( nInputEnd > pLine->GetEnd() ) )
                 nInputEnd = pLine->GetEnd();
             Rectangle aR2 = mpImpl->mpTextEngine->PaMtoEditCursor( TextPaM( aPaM.GetPara(), nInputEnd ) );
-
+            
             long nWidth = aR2.Left()-aR1.Right();
             aR1.Move( -GetStartDocPos().X(), -GetStartDocPos().Y() );
             GetWindow()->SetCursorRect( &aR1, nWidth );
@@ -1168,7 +1168,7 @@ void TextView::Copy( uno::Reference< datatransfer::clipboard::XClipboard >& rxCl
 
 void TextView::Copy()
 {
-    uno::Reference<datatransfer::clipboard::XClipboard> aClipboard(GetWindow()->GetClipboard());
+    uno::Reference<datatransfer::clipboard::XClipboard> aClipboard(GetWindow()->GetClipboard()); 
     Copy( aClipboard );
 }
 
@@ -1206,7 +1206,7 @@ void TextView::Paste( uno::Reference< datatransfer::clipboard::XClipboard >& rxC
                         bWasTruncated = ImplTruncateNewText( aText );
                     InsertNewText( aText, FALSE );
                     mpImpl->mpTextEngine->Broadcast( TextHint( TEXT_HINT_MODIFIED ) );
-
+                    
                     if( bWasTruncated )
                         Edit::ShowTruncationWarning( mpImpl->mpWindow );
                 }
@@ -1220,7 +1220,7 @@ void TextView::Paste( uno::Reference< datatransfer::clipboard::XClipboard >& rxC
 
 void TextView::Paste()
 {
-    uno::Reference<datatransfer::clipboard::XClipboard> aClipboard(GetWindow()->GetClipboard());
+    uno::Reference<datatransfer::clipboard::XClipboard> aClipboard(GetWindow()->GetClipboard()); 
     Paste( aClipboard );
 }
 
@@ -1277,21 +1277,21 @@ TextSelection TextView::ImpMoveCursor( const KeyEvent& rKeyEvent )
     bool bSelect = aTranslatedKeyEvent.GetKeyCode().IsShift();
     switch ( nCode )
     {
-        case KEY_UP:        aPaM = CursorUp( aPaM );
+        case KEY_UP:		aPaM = CursorUp( aPaM );
                             break;
-        case KEY_DOWN:      aPaM = CursorDown( aPaM );
+        case KEY_DOWN:		aPaM = CursorDown( aPaM );
                             break;
-        case KEY_HOME:      aPaM = bCtrl ? CursorStartOfDoc() : CursorStartOfLine( aPaM );
+        case KEY_HOME:		aPaM = bCtrl ? CursorStartOfDoc() : CursorStartOfLine( aPaM );
                             break;
-        case KEY_END:       aPaM = bCtrl ? CursorEndOfDoc() : CursorEndOfLine( aPaM );
+        case KEY_END:		aPaM = bCtrl ? CursorEndOfDoc() : CursorEndOfLine( aPaM );
                             break;
-        case KEY_PAGEUP:    aPaM = bCtrl ? CursorStartOfDoc() : PageUp( aPaM );
+        case KEY_PAGEUP:	aPaM = bCtrl ? CursorStartOfDoc() : PageUp( aPaM );
                             break;
-        case KEY_PAGEDOWN:  aPaM = bCtrl ? CursorEndOfDoc() : PageDown( aPaM );
+        case KEY_PAGEDOWN:	aPaM = bCtrl ? CursorEndOfDoc() : PageDown( aPaM );
                             break;
-        case KEY_LEFT:      aPaM = bCtrl ? CursorWordLeft( aPaM ) : CursorLeft( aPaM, aTranslatedKeyEvent.GetKeyCode().IsMod2() ? (USHORT)i18n::CharacterIteratorMode::SKIPCHARACTER : (USHORT)i18n::CharacterIteratorMode::SKIPCELL );
+        case KEY_LEFT:		aPaM = bCtrl ? CursorWordLeft( aPaM ) : CursorLeft( aPaM, aTranslatedKeyEvent.GetKeyCode().IsMod2() ? (USHORT)i18n::CharacterIteratorMode::SKIPCHARACTER : (USHORT)i18n::CharacterIteratorMode::SKIPCELL );
                             break;
-        case KEY_RIGHT:     aPaM = bCtrl ? CursorWordRight( aPaM ) : CursorRight( aPaM, aTranslatedKeyEvent.GetKeyCode().IsMod2() ? (USHORT)i18n::CharacterIteratorMode::SKIPCHARACTER : (USHORT)i18n::CharacterIteratorMode::SKIPCELL );
+        case KEY_RIGHT: 	aPaM = bCtrl ? CursorWordRight( aPaM ) : CursorRight( aPaM, aTranslatedKeyEvent.GetKeyCode().IsMod2() ? (USHORT)i18n::CharacterIteratorMode::SKIPCHARACTER : (USHORT)i18n::CharacterIteratorMode::SKIPCELL );
                             break;
         case com::sun::star::awt::Key::SELECT_WORD_FORWARD:
                             bSelect = true; // fallthrough intentional
@@ -1369,13 +1369,13 @@ void TextView::InsertText( const XubString& rStr, BOOL bSelect )
 
 void TextView::InsertNewText( const rtl::OUString& rStr, BOOL bSelect )
 {
-//  HideSelection();
+//	HideSelection();
     mpImpl->mpTextEngine->UndoActionStart( TEXTUNDO_INSERT );
 
     /* #i87633#
     break inserted text into chunks that fit into the underlying String
     based API (which has a maximum length of 65534 elements
-
+    
     note: this will of course still cause problems for lines longer than those
     65534 elements, but those cases will hopefully be few.
     In the long run someone should switch the TextEngine to OUString instead of String
@@ -1386,11 +1386,11 @@ void TextView::InsertNewText( const rtl::OUString& rStr, BOOL bSelect )
     {
         sal_Int32 nChunkLen = nLen > 65534 ? 65534 : nLen;
         String aChunk( rStr.copy( nPos, nChunkLen ) );
-
+        
         TextSelection aNewSel( mpImpl->maSelection );
-
+    
         TextPaM aPaM = mpImpl->mpTextEngine->ImpInsertText( mpImpl->maSelection, aChunk );
-
+    
         if ( bSelect )
         {
             aNewSel.Justify();
@@ -1400,7 +1400,7 @@ void TextView::InsertNewText( const rtl::OUString& rStr, BOOL bSelect )
         {
             aNewSel = aPaM;
         }
-
+        
         ImpSetSelection( aNewSel );
         nLen -= nChunkLen;
         nPos += nChunkLen;
@@ -1413,7 +1413,7 @@ void TextView::InsertNewText( const rtl::OUString& rStr, BOOL bSelect )
 /*
 void TextView::InsertText( const XubString& rStr, BOOL bSelect )
 {
-//  HideSelection();
+//	HideSelection();
 
     TextSelection aNewSel( mpImpl->maSelection );
 
@@ -1430,7 +1430,7 @@ void TextView::InsertText( const XubString& rStr, BOOL bSelect )
     {
         aNewSel = aPaM;
     }
-
+    
     ImpSetSelection( aNewSel );
 
     mpImpl->mpTextEngine->FormatAndUpdate( this );
@@ -1560,7 +1560,7 @@ TextPaM TextView::ImpDelete( BYTE nMode, BYTE nDelMode )
             // #i63506# startPos is -1 when the paragraph starts with a tab
             aEndPaM.GetIndex() = (aBoundary.startPos >= 0) ? (USHORT)aBoundary.startPos : 0;
         }
-        else    // DELMODE_RESTOFCONTENT
+        else	// DELMODE_RESTOFCONTENT
         {
             if ( aEndPaM.GetIndex() != 0 )
                 aEndPaM.GetIndex() = 0;
@@ -1585,7 +1585,7 @@ TextPaM TextView::ImpDelete( BYTE nMode, BYTE nDelMode )
             i18n::Boundary aBoundary = xBI->nextWord( pNode->GetText(), mpImpl->maSelection.GetEnd().GetIndex(), mpImpl->mpTextEngine->GetLocale(), i18n::WordType::ANYWORD_IGNOREWHITESPACES );
             aEndPaM.GetIndex() = (USHORT)aBoundary.startPos;
         }
-        else    // DELMODE_RESTOFCONTENT
+        else	// DELMODE_RESTOFCONTENT
         {
             TextNode* pNode = mpImpl->mpTextEngine->mpDoc->GetNodes().GetObject( aEndPaM.GetPara() );
             if ( aEndPaM.GetIndex() < pNode->GetText().Len() )
@@ -1620,7 +1620,7 @@ TextPaM TextView::CursorUp( const TextPaM& rPaM )
 
     TEParaPortion* pPPortion = mpImpl->mpTextEngine->mpTEParaPortions->GetObject( rPaM.GetPara() );
     USHORT nLine = pPPortion->GetLineNumber( rPaM.GetIndex(), FALSE );
-    if ( nLine )    // gleicher Absatz
+    if ( nLine )	// gleicher Absatz
     {
         USHORT nCharPos = mpImpl->mpTextEngine->GetCharPos( rPaM.GetPara(), nLine-1, nX );
         aPaM.GetIndex() = nCharPos;
@@ -1631,7 +1631,7 @@ TextPaM TextView::CursorUp( const TextPaM& rPaM )
         if ( aPaM.GetIndex() && ( aPaM.GetIndex() == pLine->GetEnd() ) )
             aPaM.GetIndex()--;
     }
-    else if ( rPaM.GetPara() )  // vorheriger Absatz
+    else if ( rPaM.GetPara() )	// vorheriger Absatz
     {
         aPaM.GetPara()--;
         pPPortion = mpImpl->mpTextEngine->mpTEParaPortions->GetObject( aPaM.GetPara() );
@@ -1703,7 +1703,7 @@ TextPaM TextView::CursorEndOfLine( const TextPaM& rPaM )
     TextLine* pLine = pPPortion->GetLines().GetObject( nLine );
     aPaM.GetIndex() = pLine->GetEnd();
 
-    if ( pLine->GetEnd() > pLine->GetStart() )  // Leerzeile
+    if ( pLine->GetEnd() > pLine->GetStart() )	// Leerzeile
     {
         xub_Unicode cLastChar = pPPortion->GetNode()->GetText().GetChar((USHORT)(aPaM.GetIndex()-1) );
         if ( ( cLastChar == ' ' ) && ( aPaM.GetIndex() != pPPortion->GetNode()->GetText().Len() ) )
@@ -1789,16 +1789,16 @@ void TextView::ImpShowCursor( BOOL bGotoCursor, BOOL bForceVisCursor, BOOL bSpec
 
     TextPaM aPaM( mpImpl->maSelection.GetEnd() );
     Rectangle aEditCursor = mpImpl->mpTextEngine->PaMtoEditCursor( aPaM, bSpecial );
-
+    
     // Remember that we placed the cursor behind the last character of a line
     mpImpl->mbCursorAtEndOfLine = false;
     if( bSpecial )
     {
         TEParaPortion* pParaPortion = mpImpl->mpTextEngine->mpTEParaPortions->GetObject( aPaM.GetPara() );
-        mpImpl->mbCursorAtEndOfLine =
+        mpImpl->mbCursorAtEndOfLine = 
             pParaPortion->GetLineNumber( aPaM.GetIndex(), TRUE ) != pParaPortion->GetLineNumber( aPaM.GetIndex(), FALSE );
     }
-
+    
     if ( !IsInsertMode() && !mpImpl->maSelection.HasRange() )
     {
         TextNode* pNode = mpImpl->mpTextEngine->mpDoc->GetNodes().GetObject( aPaM.GetPara() );
@@ -1816,7 +1816,7 @@ void TextView::ImpShowCursor( BOOL bGotoCursor, BOOL bForceVisCursor, BOOL bSpec
             {
                 if ( mpImpl->mpTextEngine->IsRightToLeft() )
                 {
-
+                    
                 }
                 aEditCursor.Right() += pTextPortion->GetWidth();
             }
@@ -1873,9 +1873,9 @@ void TextView::ImpShowCursor( BOOL bGotoCursor, BOOL bForceVisCursor, BOOL bSpec
 
         // X kann durch das 'bischen mehr' falsch sein:
 //      ULONG nMaxTextWidth = mpImpl->mpTextEngine->GetMaxTextWidth();
-//      if ( !nMaxTextWidth || ( nMaxTextWidth > 0x7FFFFFFF ) )
-//          nMaxTextWidth = 0x7FFFFFFF;
-//      long nMaxX = (long)nMaxTextWidth - aOutSz.Width();
+//		if ( !nMaxTextWidth || ( nMaxTextWidth > 0x7FFFFFFF ) )
+//			nMaxTextWidth = 0x7FFFFFFF;
+//		long nMaxX = (long)nMaxTextWidth - aOutSz.Width();
         long nMaxX = mpImpl->mpTextEngine->CalcTextWidth() - aOutSz.Width();
         if ( nMaxX < 0 )
             nMaxX = 0;
@@ -1944,7 +1944,7 @@ BOOL TextView::SetCursorAtPoint( const Point& rPosPixel )
 BOOL TextView::IsSelectionAtPoint( const Point& rPosPixel )
 {
 //  if ( !Rectangle( Point(), mpImpl->mpWindow->GetOutputSizePixel() ).IsInside( rPosPixel ) && !mbInSelection )
-//      return FALSE;
+//		return FALSE;
 
     Point aDocPos = GetDocPos( rPosPixel );
     TextPaM aPaM = mpImpl->mpTextEngine->GetPaM( aDocPos, FALSE );
@@ -2040,19 +2040,19 @@ BOOL TextView::Write( SvStream& rOutput )
 bool TextView::ImplTruncateNewText( rtl::OUString& rNewText ) const
 {
     bool bTruncated = false;
-
+    
     if( rNewText.getLength() > 65534 ) // limit to String API
     {
         rNewText = rNewText.copy( 0, 65534 );
         bTruncated = true;
     }
-
+    
     ULONG nMaxLen = mpImpl->mpTextEngine->GetMaxTextLen();
     // 0 means unlimited, there is just the String API limit handled above
     if( nMaxLen != 0 )
     {
         ULONG nCurLen = mpImpl->mpTextEngine->GetTextLen();
-
+    
         sal_uInt32 nNewLen = rNewText.getLength();
         if ( nCurLen + nNewLen > nMaxLen )
         {
@@ -2194,14 +2194,14 @@ void TextView::drop( const ::com::sun::star::datatransfer::dnd::DropTargetDropEv
         if ( ImplCheckTextLen( aText ) )
             ImpSetSelection( mpImpl->mpTextEngine->ImpInsertText( mpImpl->mpDDInfo->maDropPos, aText ) );
         if(mpImpl->mbSupportProtectAttribute)
-        {
-            mpImpl->mpTextEngine->SetAttrib( TextAttribProtect(),
-                aTempStart.GetPara(),
-                aTempStart.GetIndex(),
+        {        
+            mpImpl->mpTextEngine->SetAttrib( TextAttribProtect(), 
+                aTempStart.GetPara(), 
+                aTempStart.GetIndex(), 
                 mpImpl->maSelection.GetEnd().GetIndex(), FALSE );
         }
 
-        if ( aPrevSel.HasRange() &&
+        if ( aPrevSel.HasRange() && 
                 !mpImpl->mbSupportProtectAttribute && // don't remove currently selected element
                 (( rDTDE.DropAction & datatransfer::dnd::DNDConstants::ACTION_MOVE ) || !bStarterOfDD) )
         {
@@ -2289,16 +2289,16 @@ void TextView::dragOver( const ::com::sun::star::datatransfer::dnd::DropTargetDr
         // Scroll?
         // No, I will not receive events for this...
     }
-*/
+*/	
 
     sal_Bool bProtected = sal_False;
     if(mpImpl->mbSupportProtectAttribute)
     {
-        const TextCharAttrib* pStartAttr = mpImpl->mpTextEngine->FindCharAttrib(
-                    mpImpl->mpDDInfo->maDropPos,
+        const TextCharAttrib* pStartAttr = mpImpl->mpTextEngine->FindCharAttrib( 
+                    mpImpl->mpDDInfo->maDropPos, 
                     TEXTATTR_PROTECTED );
-        bProtected = pStartAttr != 0 &&
-                pStartAttr->GetStart() != mpImpl->mpDDInfo->maDropPos.GetIndex() &&
+        bProtected = pStartAttr != 0 &&  
+                pStartAttr->GetStart() != mpImpl->mpDDInfo->maDropPos.GetIndex() && 
                 pStartAttr->GetEnd() != mpImpl->mpDDInfo->maDropPos.GetIndex();
     }
     // Don't drop in selection or in read only engine
@@ -2402,9 +2402,9 @@ void __EXPORT TextSelFunctionSet::BeginDrag()
 
 void __EXPORT TextSelFunctionSet::CreateAnchor()
 {
-//  TextSelection aSel( mpView->GetSelection() );
-//  aSel.GetStart() = aSel.GetEnd();
-//  mpView->SetSelection( aSel );
+//	TextSelection aSel( mpView->GetSelection() );
+//	aSel.GetStart() = aSel.GetEnd();
+//	mpView->SetSelection( aSel );
 
     // Es darf kein ShowCursor folgen:
     mpView->HideSelection();
@@ -2435,36 +2435,36 @@ void __EXPORT TextSelFunctionSet::DestroyAnchor()
 {
     // Nur bei Mehrfachselektion
 }
-TextEngine*         TextView::GetTextEngine() const
+TextEngine*         TextView::GetTextEngine() const 
 { return mpImpl->mpTextEngine; }
-Window*             TextView::GetWindow() const
+Window*             TextView::GetWindow() const 
 { return mpImpl->mpWindow; }
-void                TextView::EnableCursor( BOOL bEnable )
+void                TextView::EnableCursor( BOOL bEnable )    
 { mpImpl->mbCursorEnabled = bEnable; }
-BOOL                TextView::IsCursorEnabled() const
+BOOL                TextView::IsCursorEnabled() const         
 { return mpImpl->mbCursorEnabled; }
-void                TextView::SetStartDocPos( const Point& rPos )
+void                TextView::SetStartDocPos( const Point& rPos ) 
 { mpImpl->maStartDocPos = rPos; }
-const Point&        TextView::GetStartDocPos() const
+const Point&        TextView::GetStartDocPos() const  
 { return mpImpl->maStartDocPos; }
-void                TextView::SetAutoIndentMode( BOOL bAutoIndent )
+void                TextView::SetAutoIndentMode( BOOL bAutoIndent )   
 { mpImpl->mbAutoIndent = bAutoIndent; }
-BOOL                TextView::IsAutoIndentMode() const
+BOOL                TextView::IsAutoIndentMode() const                
 { return mpImpl->mbAutoIndent; }
-BOOL                TextView::IsReadOnly() const
+BOOL                TextView::IsReadOnly() const      
 { return mpImpl->mbReadOnly; }
-void                TextView::SetAutoScroll( BOOL bAutoScroll )
+void                TextView::SetAutoScroll( BOOL bAutoScroll )   
 { mpImpl->mbAutoScroll = bAutoScroll; }
-BOOL                TextView::IsAutoScroll() const
+BOOL                TextView::IsAutoScroll() const                
 { return mpImpl->mbAutoScroll; }
-BOOL                TextView::IsPaintSelection() const
+BOOL                TextView::IsPaintSelection() const 
 { return mpImpl->mbPaintSelection; }
-BOOL                TextView::IsHighlightSelection() const
+BOOL                TextView::IsHighlightSelection() const 
 { return mpImpl->mbHighlightSelection; }
-BOOL                TextView::HasSelection() const
+BOOL                TextView::HasSelection() const 
 { return mpImpl->maSelection.HasRange(); }
-BOOL                TextView::IsInsertMode() const
+BOOL                TextView::IsInsertMode() const 
 { return mpImpl->mbInsertMode; }
-void                TextView::SupportProtectAttribute(sal_Bool bSupport)
+void                TextView::SupportProtectAttribute(sal_Bool bSupport) 
 { mpImpl->mbSupportProtectAttribute = bSupport;}
 
diff --git a/svtools/source/edit/textwindowpeer.cxx b/svtools/source/edit/textwindowpeer.cxx
index 7f31e95c75a7..1705cfbac595 100644
--- a/svtools/source/edit/textwindowpeer.cxx
+++ b/svtools/source/edit/textwindowpeer.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
diff --git a/svtools/source/edit/txtattr.cxx b/svtools/source/edit/txtattr.cxx
index e7466cbe1d85..5f521bd84253 100644
--- a/svtools/source/edit/txtattr.cxx
+++ b/svtools/source/edit/txtattr.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
diff --git a/svtools/source/edit/xtextedt.cxx b/svtools/source/edit/xtextedt.cxx
index 0a4907edcadd..2951a86ff17b 100644
--- a/svtools/source/edit/xtextedt.cxx
+++ b/svtools/source/edit/xtextedt.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,7 +79,7 @@ TextSelection ExtTextEngine::MatchGroup( const TextPaM& rCursor ) const
                         {
                             nLevel--;
                             if ( !nLevel )
-                                break;  // while nCur...
+                                break;	// while nCur...
                         }
                         nCur++;
                     }
@@ -90,7 +90,7 @@ TextSelection ExtTextEngine::MatchGroup( const TextPaM& rCursor ) const
                         nCur = 0;
                     }
                 }
-                if ( nLevel == 0 )  // gefunden
+                if ( nLevel == 0 )	// gefunden
                 {
                     aSel.GetStart() = rCursor;
                     aSel.GetEnd() = TextPaM( nPara, nCur+1 );
@@ -115,7 +115,7 @@ TextSelection ExtTextEngine::MatchGroup( const TextPaM& rCursor ) const
                             {
                                 nLevel--;
                                 if ( !nLevel )
-                                    break;  // while nCur...
+                                    break;	// while nCur...
                             }
                             else if ( aStr.GetChar( nCur ) == nEC )
                                 nLevel++;
@@ -129,17 +129,17 @@ TextSelection ExtTextEngine::MatchGroup( const TextPaM& rCursor ) const
                         if ( nPara )
                         {
                             nPara--;
-                            nCur = GetTextLen( nPara )-1;   // egal ob negativ, weil if Len()
+                            nCur = GetTextLen( nPara )-1;	// egal ob negativ, weil if Len()
                         }
                         else
                             break;
                     }
                 }
 
-                if ( nLevel == 0 )  // gefunden
+                if ( nLevel == 0 )	// gefunden
                 {
                     aSel.GetStart() = rCursor;
-                    aSel.GetStart().GetIndex()++;   // hinter das Zeichen
+                    aSel.GetStart().GetIndex()++;	// hinter das Zeichen
                     aSel.GetEnd() = TextPaM( nPara, nCur );
                 }
             }
@@ -229,7 +229,7 @@ BOOL ExtTextEngine::Search( TextSelection& rSel, const util::SearchOptions& rSea
             break;
         }
 
-        if ( !bForward && !nNode )  // Bei rueckwaertsuche, wenn nEndNode = 0:
+        if ( !bForward && !nNode )	// Bei rueckwaertsuche, wenn nEndNode = 0:
             break;
     }
 
@@ -299,7 +299,7 @@ USHORT ExtTextView::Replace( const util::SearchOptions& rSearchOptions, BOOL bAl
         {
             InsertText( rSearchOptions.replaceString );
             nFound = 1;
-            Search( rSearchOptions, bForward ); // gleich zum naechsten
+            Search( rSearchOptions, bForward );	// gleich zum naechsten
         }
         else
         {
@@ -361,7 +361,7 @@ BOOL ExtTextView::ImpIndentBlock( BOOL bRight )
     ULONG nEndPara = aSel.GetEnd().GetPara();
     if ( aSel.HasRange() && !aSel.GetEnd().GetIndex() )
     {
-        nEndPara--; // den dann nicht einruecken...
+        nEndPara--;	// den dann nicht einruecken...
     }
 
     for ( ULONG nPara = nStartPara; nPara <= nEndPara; nPara++ )
diff --git a/svtools/source/filter.vcl/filter/FilterConfigCache.cxx b/svtools/source/filter.vcl/filter/FilterConfigCache.cxx
index 4c8023bed883..881597b2a12e 100644
--- a/svtools/source/filter.vcl/filter/FilterConfigCache.cxx
+++ b/svtools/source/filter.vcl/filter/FilterConfigCache.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
@@ -42,11 +42,11 @@
 // #define TOKEN_INDEX_FOR_HASDIALOG      2
 
 using namespace ::com::sun::star::lang          ;   // XMultiServiceFactory
-using namespace ::com::sun::star::container     ;   // XNameAccess
-using namespace ::com::sun::star::uno           ;   // Reference
-using namespace ::com::sun::star::beans         ;   // PropertyValue
+using namespace ::com::sun::star::container		;	// XNameAccess
+using namespace ::com::sun::star::uno			;	// Reference
+using namespace ::com::sun::star::beans			;	// PropertyValue
 using namespace ::utl                           ;   // getProcessServiceFactory();
-using namespace ::rtl                           ;
+using namespace ::rtl							;
 
 const char* FilterConfigCache::FilterConfigCacheEntry::InternalPixelFilterNameList[] =
 {
@@ -312,9 +312,9 @@ void FilterConfigCache::ImplInitSmart()
     const char** pPtr;
     for ( pPtr = InternalFilterListForSvxLight; *pPtr; pPtr++ )
     {
-        FilterConfigCacheEntry  aEntry;
+        FilterConfigCacheEntry	aEntry;
 
-        OUString    sExtension( OUString::createFromAscii( *pPtr++ ) );
+        OUString	sExtension( OUString::createFromAscii( *pPtr++ ) );
 
         aEntry.lExtensionList.realloc( 1 );
         aEntry.lExtensionList[ 0 ] = sExtension;
@@ -325,7 +325,7 @@ void FilterConfigCache::ImplInitSmart()
         ByteString sFlags( *pPtr++ );
         aEntry.nFlags = sFlags.ToInt32();
 
-        OUString    sUserData( OUString::createFromAscii( *pPtr ) );
+        OUString	sUserData( OUString::createFromAscii( *pPtr ) );
         aEntry.CreateFilterName( sUserData );
 
         if ( aEntry.nFlags & 1 )
diff --git a/svtools/source/filter.vcl/filter/FilterConfigCache.hxx b/svtools/source/filter.vcl/filter/FilterConfigCache.hxx
index 2c6b7361e540..c1f364061afa 100644
--- a/svtools/source/filter.vcl/filter/FilterConfigCache.hxx
+++ b/svtools/source/filter.vcl/filter/FilterConfigCache.hxx
@@ -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
@@ -48,27 +48,27 @@ class SVT_DLLPUBLIC FilterConfigCache
             ::rtl::OUString sInternalFilterName;
             ::rtl::OUString sType;
             ::com::sun::star::uno::Sequence< ::rtl::OUString > lExtensionList;
-            ::rtl::OUString sUIName;
-            ::rtl::OUString sDocumentService;
+            ::rtl::OUString	sUIName;
+            ::rtl::OUString	sDocumentService;
             ::rtl::OUString sFilterService;
             ::rtl::OUString sTemplateName;
 
-            ::rtl::OUString sMediaType;
+            ::rtl::OUString	sMediaType;
             ::rtl::OUString sFilterType;
 
-            sal_Int32       nFlags;
-            sal_Int32       nFileFormatVersion;
+            sal_Int32		nFlags;
+            sal_Int32		nFileFormatVersion;
 
             // user data
-            String          sFilterName;
-            sal_Bool        bHasDialog          : 1;
-            sal_Bool        bIsInternalFilter   : 1;
-            sal_Bool        bIsPixelFormat      : 1;
+            String			sFilterName;
+            sal_Bool		bHasDialog			: 1;
+            sal_Bool		bIsInternalFilter	: 1;
+            sal_Bool		bIsPixelFormat		: 1;
 
-            sal_Bool        IsValid();
-            sal_Bool        CreateFilterName( const ::rtl::OUString& rUserDataEntry );
+            sal_Bool		IsValid();
+            sal_Bool		CreateFilterName( const ::rtl::OUString& rUserDataEntry );
             String          GetShortName( );
-
+                    
             static const char* InternalPixelFilterNameList[];
             static const char* InternalVectorFilterNameList[];
             static const char* ExternalPixelFilterNameList[];
@@ -77,9 +77,9 @@ class SVT_DLLPUBLIC FilterConfigCache
         typedef std::vector< FilterConfigCacheEntry > CacheVector;
 
 
-        CacheVector         aImport;
-        CacheVector         aExport;
-        sal_Bool            bUseConfig;
+        CacheVector			aImport;
+        CacheVector			aExport;
+        sal_Bool			bUseConfig;
 
         static sal_Bool   bInitialized;
         static sal_Int32  nIndType;
@@ -91,55 +91,55 @@ class SVT_DLLPUBLIC FilterConfigCache
         static sal_Int32  nIndFileFormatVersion;
         static sal_Int32  nIndTemplateName;
 
-        static const char*  InternalFilterListForSvxLight[];
-
-        SVT_DLLPRIVATE void             ImplInit();
-        SVT_DLLPRIVATE void             ImplInitSmart();
+        static const char*	InternalFilterListForSvxLight[];
 
+        SVT_DLLPRIVATE void				ImplInit();
+        SVT_DLLPRIVATE void				ImplInitSmart();
+        
     public :
 
-        sal_uInt16  GetImportFormatCount() const
+        sal_uInt16	GetImportFormatCount() const
         { return sal::static_int_cast< sal_uInt16 >(aImport.size()); };
-        sal_uInt16  GetImportFormatNumber( const String& rFormatName );
-        sal_uInt16  GetImportFormatNumberForMediaType( const String& rMediaType );
-        sal_uInt16  GetImportFormatNumberForShortName( const String& rShortName );
-        sal_uInt16  GetImportFormatNumberForTypeName( const String& rType );
-        String      GetImportFilterName( sal_uInt16 nFormat );
-        String      GetImportFormatName( sal_uInt16 nFormat );
-        String      GetImportFormatExtension( sal_uInt16 nFormat, sal_Int32 nEntry = 0);
-        String      GetImportFormatMediaType( sal_uInt16 nFormat );
-        String      GetImportFormatShortName( sal_uInt16 nFormat );
-        String      GetImportWildcard( sal_uInt16 nFormat, sal_Int32 nEntry );
+        sal_uInt16	GetImportFormatNumber( const String& rFormatName );
+        sal_uInt16	GetImportFormatNumberForMediaType( const String& rMediaType );
+        sal_uInt16	GetImportFormatNumberForShortName( const String& rShortName );
+        sal_uInt16	GetImportFormatNumberForTypeName( const String& rType );
+        String		GetImportFilterName( sal_uInt16 nFormat );
+        String		GetImportFormatName( sal_uInt16 nFormat );
+        String		GetImportFormatExtension( sal_uInt16 nFormat, sal_Int32 nEntry = 0);
+        String		GetImportFormatMediaType( sal_uInt16 nFormat );
+        String		GetImportFormatShortName( sal_uInt16 nFormat );
+        String		GetImportWildcard( sal_uInt16 nFormat, sal_Int32 nEntry );
         String      GetImportFilterType( sal_uInt16 nFormat );
         String      GetImportFilterTypeName( sal_uInt16 nFormat );
 
-        sal_Bool    IsImportInternalFilter( sal_uInt16 nFormat );
-        sal_Bool    IsImportPixelFormat( sal_uInt16 nFormat );
-        sal_Bool    IsImportDialog( sal_uInt16 nFormat );
+        sal_Bool	IsImportInternalFilter( sal_uInt16 nFormat );
+        sal_Bool	IsImportPixelFormat( sal_uInt16 nFormat );
+        sal_Bool	IsImportDialog( sal_uInt16 nFormat );
 
-        sal_uInt16  GetExportFormatCount() const
+        sal_uInt16	GetExportFormatCount() const
         { return sal::static_int_cast< sal_uInt16 >(aExport.size()); };
-        sal_uInt16  GetExportFormatNumber( const String& rFormatName );
-        sal_uInt16  GetExportFormatNumberForMediaType( const String& rMediaType );
-        sal_uInt16  GetExportFormatNumberForShortName( const String& rShortName );
-        sal_uInt16  GetExportFormatNumberForTypeName( const String& rType );
-        String      GetExportFilterName( sal_uInt16 nFormat );
-        String      GetExportFormatName( sal_uInt16 nFormat );
-        String      GetExportFormatExtension( sal_uInt16 nFormat, sal_Int32 nEntry = 0 );
-        String      GetExportFormatMediaType( sal_uInt16 nFormat );
-        String      GetExportFormatShortName( sal_uInt16 nFormat );
-        String      GetExportWildcard( sal_uInt16 nFormat, sal_Int32 nEntry );
+        sal_uInt16	GetExportFormatNumber( const String& rFormatName );
+        sal_uInt16	GetExportFormatNumberForMediaType( const String& rMediaType );
+        sal_uInt16	GetExportFormatNumberForShortName( const String& rShortName );
+        sal_uInt16	GetExportFormatNumberForTypeName( const String& rType );
+        String		GetExportFilterName( sal_uInt16 nFormat );
+        String		GetExportFormatName( sal_uInt16 nFormat );
+        String		GetExportFormatExtension( sal_uInt16 nFormat, sal_Int32 nEntry = 0 );
+        String		GetExportFormatMediaType( sal_uInt16 nFormat );
+        String		GetExportFormatShortName( sal_uInt16 nFormat );
+        String		GetExportWildcard( sal_uInt16 nFormat, sal_Int32 nEntry );
         String      GetExportFilterTypeName( sal_uInt16 nFormat );
         String      GetExportInternalFilterName( sal_uInt16 nFormat );
 
-        sal_Bool    IsExportInternalFilter( sal_uInt16 nFormat );
-        sal_Bool    IsExportPixelFormat( sal_uInt16 nFormat );
-        sal_Bool    IsExportDialog( sal_uInt16 nFormat );
+        sal_Bool	IsExportInternalFilter( sal_uInt16 nFormat );
+        sal_Bool	IsExportPixelFormat( sal_uInt16 nFormat );
+        sal_Bool	IsExportDialog( sal_uInt16 nFormat );
 
                     FilterConfigCache( sal_Bool bUseConfig );
                     ~FilterConfigCache();
 
 };
 
-#endif  // _FILTER_CONFIG_CACHE_HXX_
+#endif	// _FILTER_CONFIG_CACHE_HXX_
 
diff --git a/svtools/source/filter.vcl/filter/FilterConfigItem.cxx b/svtools/source/filter.vcl/filter/FilterConfigItem.cxx
index 765711ad8d4a..df6356e44720 100644
--- a/svtools/source/filter.vcl/filter/FilterConfigItem.cxx
+++ b/svtools/source/filter.vcl/filter/FilterConfigItem.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
@@ -39,22 +39,22 @@
 #include <com/sun/star/container/XHierarchicalNameAccess.hpp>
 
 using namespace ::rtl;
-using namespace ::utl                       ;   // getProcessServiceFactory
-using namespace ::com::sun::star::lang      ;   // XMultiServiceFactory
-using namespace ::com::sun::star::beans     ;   // PropertyValue
-using namespace ::com::sun::star::uno       ;   // Reference
-using namespace ::com::sun::star::util      ;   // XChangesBatch
-using namespace ::com::sun::star::awt       ;   // Size
-using namespace ::com::sun::star::container ;   //
-using namespace ::com::sun::star::task      ;   // XStatusIndicator
+using namespace ::utl						;	// getProcessServiceFactory
+using namespace ::com::sun::star::lang		;	// XMultiServiceFactory
+using namespace ::com::sun::star::beans		;	// PropertyValue
+using namespace ::com::sun::star::uno		;	// Reference
+using namespace ::com::sun::star::util		;	// XChangesBatch
+using namespace ::com::sun::star::awt		;	// Size
+using namespace ::com::sun::star::container ;	//
+using namespace ::com::sun::star::task		;	// XStatusIndicator
 
 static sal_Bool ImpIsTreeAvailable( Reference< XMultiServiceFactory >& rXCfgProv, const String& rTree )
 {
-    sal_Bool    bAvailable = rTree.Len() != 0;
+    sal_Bool	bAvailable = rTree.Len() != 0;	
     if ( bAvailable )
     {
-        xub_StrLen  nTokenCount = rTree.GetTokenCount( (sal_Unicode)'/' );
-        xub_StrLen  i = 0;
+        xub_StrLen	nTokenCount = rTree.GetTokenCount( (sal_Unicode)'/' );
+        xub_StrLen	i = 0;
 
         if ( rTree.GetChar( 0 ) == (sal_Unicode)'/' )
             i++;
@@ -64,7 +64,7 @@ static sal_Bool ImpIsTreeAvailable( Reference< XMultiServiceFactory >& rXCfgProv
         Any aAny;
         aAny <<= (OUString)rTree.GetToken( i++, (sal_Unicode)'/' );
 
-        // creation arguments: nodepath
+        // creation arguments: nodepath   
         PropertyValue aPathArgument;
         aPathArgument.Name = OUString( RTL_CONSTASCII_USTRINGPARAM( "nodepath" ) );
         aPathArgument.Value = aAny;
@@ -82,7 +82,7 @@ static sal_Bool ImpIsTreeAvailable( Reference< XMultiServiceFactory >& rXCfgProv
         catch ( ::com::sun::star::uno::Exception& )
         {
             bAvailable = sal_False;
-        }
+        }	
         if ( xReadAccess.is() )
         {
             for ( ; bAvailable && ( i < nTokenCount ); i++ )
@@ -108,7 +108,7 @@ static sal_Bool ImpIsTreeAvailable( Reference< XMultiServiceFactory >& rXCfgProv
                         {
                             bAvailable = sal_False;
                         }
-                    }
+                    }				
                 }
             }
         }
@@ -122,9 +122,9 @@ void FilterConfigItem::ImpInitTree( const String& rSubTree )
 
     OUString sTree( ConfigManager::GetConfigBaseURL() );
     sTree += rSubTree;
-    Reference< XMultiServiceFactory > xSMGR = getProcessServiceFactory();   // get global uno service manager
+    Reference< XMultiServiceFactory > xSMGR = getProcessServiceFactory();	// get global uno service manager
 
-    Reference< XMultiServiceFactory > xCfgProv(
+    Reference< XMultiServiceFactory > xCfgProv(		
         xSMGR->createInstance( OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.configuration.ConfigurationProvider" ) ) ),
             UNO_QUERY );
 
@@ -133,19 +133,19 @@ void FilterConfigItem::ImpInitTree( const String& rSubTree )
         if ( ImpIsTreeAvailable( xCfgProv, String( sTree ) ) )
         {
             Any aAny;
-            // creation arguments: nodepath
+            // creation arguments: nodepath   
             PropertyValue aPathArgument;
             aAny <<= sTree;
             aPathArgument.Name = OUString( RTL_CONSTASCII_USTRINGPARAM( "nodepath" ) );
             aPathArgument.Value = aAny;
 
-            // creation arguments: commit mode
+            // creation arguments: commit mode   
             PropertyValue aModeArgument;
             sal_Bool bAsyncron = sal_True;
             aAny <<= bAsyncron;
             aModeArgument.Name = OUString( RTL_CONSTASCII_USTRINGPARAM( "lazywrite" ) );
             aModeArgument.Value = aAny;
-
+        
             Sequence< Any > aArguments( 2 );
             aArguments[ 0 ] <<= aPathArgument;
             aArguments[ 1 ] <<= aModeArgument;
@@ -177,7 +177,7 @@ FilterConfigItem::FilterConfigItem( ::com::sun::star::uno::Sequence< ::com::sun:
         aFilterData = *pFilterData;
 }
 
-FilterConfigItem::FilterConfigItem( const OUString& rSubTree,
+FilterConfigItem::FilterConfigItem( const OUString& rSubTree, 
     ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >* pFilterData )
 {
     ImpInitTree( rSubTree );
diff --git a/svtools/source/filter.vcl/filter/SvFilterOptionsDialog.cxx b/svtools/source/filter.vcl/filter/SvFilterOptionsDialog.cxx
index 038930ef80ee..01c5ac86e6fa 100644
--- a/svtools/source/filter.vcl/filter/SvFilterOptionsDialog.cxx
+++ b/svtools/source/filter.vcl/filter/SvFilterOptionsDialog.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
@@ -50,9 +50,9 @@
 #include "vcl/svapp.hxx"
 
 #if defined WIN || (defined OS2 && !defined ICC)
-#define EXPDLG_FUNCTION_NAME    "_DoExportDialog"
+#define EXPDLG_FUNCTION_NAME	"_DoExportDialog"
 #else
-#define EXPDLG_FUNCTION_NAME    "DoExportDialog"
+#define EXPDLG_FUNCTION_NAME	"DoExportDialog"
 #endif
 
 using namespace ::rtl;
@@ -94,8 +94,8 @@ uno::Sequence< OUString > SAL_CALL SvFilterOptionsDialog_getSupportedServiceName
 // -----------------------------------------------------------------------------
 
 SvFilterOptionsDialog::SvFilterOptionsDialog( const uno::Reference< lang::XMultiServiceFactory > & xMgr ) :
-    rxMgr       ( xMgr ),
-    eFieldUnit  ( FUNIT_CM )
+    rxMgr		( xMgr ),
+    eFieldUnit	( FUNIT_CM )
 {
 }
 
@@ -150,7 +150,7 @@ uno::Sequence< beans::PropertyValue > SvFilterOptionsDialog::getPropertyValues()
     sal_Int32 i, nCount;
     for ( i = 0, nCount = aMediaDescriptor.getLength(); i < nCount; i++ )
     {
-        if ( aMediaDescriptor[ i ].Name.equalsAscii( "FilterData" ) )
+        if ( aMediaDescriptor[ i ].Name.equalsAscii( "FilterData" ) ) 
             break;
     }
     if ( i == nCount )
@@ -163,7 +163,7 @@ uno::Sequence< beans::PropertyValue > SvFilterOptionsDialog::getPropertyValues()
 }
 
 void SvFilterOptionsDialog::setPropertyValues( const uno::Sequence< beans::PropertyValue > & aProps )
-        throw ( beans::UnknownPropertyException, beans::PropertyVetoException,
+        throw ( beans::UnknownPropertyException, beans::PropertyVetoException, 
                 lang::IllegalArgumentException, lang::WrappedTargetException,
                 uno::RuntimeException )
 {
@@ -172,7 +172,7 @@ void SvFilterOptionsDialog::setPropertyValues( const uno::Sequence< beans::Prope
     sal_Int32 i, nCount;
     for ( i = 0, nCount = aMediaDescriptor.getLength(); i < nCount; i++ )
     {
-        if ( aMediaDescriptor[ i ].Name.equalsAscii( "FilterData" ) )
+        if ( aMediaDescriptor[ i ].Name.equalsAscii( "FilterData" ) ) 
         {
             aMediaDescriptor[ i ].Value >>= aFilterDataSequence;
             break;
@@ -206,14 +206,14 @@ sal_Int16 SvFilterOptionsDialog::execute()
             aInternalFilterName.SearchAndReplace( String( RTL_CONSTASCII_USTRINGPARAM( "impress_" ) ), String(), 0 );
             break;
        }
-    }
+    }   
     if ( aInternalFilterName.Len() )
     {
         GraphicFilter aGraphicFilter( sal_True );
 
         sal_uInt16 nFormat, nFilterCount = aGraphicFilter.pConfig->GetExportFormatCount();
         for ( nFormat = 0; nFormat < nFilterCount; nFormat++ )
-        {
+        {        
             if ( aGraphicFilter.pConfig->GetExportInternalFilterName( nFormat ) == aInternalFilterName )
                 break;
         }
@@ -222,7 +222,7 @@ sal_Int16 SvFilterOptionsDialog::execute()
             FltCallDialogParameter aFltCallDlgPara( Application::GetDefDialogParent(), NULL, eFieldUnit );
             aFltCallDlgPara.aFilterData = aFilterDataSequence;
 
-            String  aFilterName( aGraphicFilter.pConfig->GetExportFilterName( nFormat ) );
+            String 	aFilterName( aGraphicFilter.pConfig->GetExportFilterName( nFormat ) );
             if ( aGraphicFilter.pConfig->IsExportInternalFilter( nFormat ) )
             {
                 // Export-Dialog fuer Bitmap's, SVM's und WMF's
@@ -233,8 +233,8 @@ sal_Int16 SvFilterOptionsDialog::execute()
                     ( aFilterName.EqualsIgnoreCaseAscii( EXP_JPEG ) )||
                     ( aFilterName.EqualsIgnoreCaseAscii( EXP_PNG ) ) )
                 {
-                    ByteString  aResMgrName( "svt", 3 );
-                    ResMgr*     pResMgr;
+                    ByteString	aResMgrName( "svt", 3 );
+                    ResMgr*		pResMgr;
 
                     pResMgr = ResMgr::CreateResMgr( aResMgrName.GetBuffer(), Application::GetSettings().GetUILocale() );
                     aFltCallDlgPara.pResMgr = pResMgr;
@@ -257,15 +257,15 @@ sal_Int16 SvFilterOptionsDialog::execute()
                             nRet = ui::dialogs::ExecutableDialogResults::OK;
                     }
                     else
-                    {
+                    { 
                         aFltCallDlgPara.aFilterExt = aGraphicFilter.pConfig->GetExportFormatShortName( nFormat );
                         if ( DlgExportVec( aFltCallDlgPara ).Execute() == RET_OK )
                             nRet = ui::dialogs::ExecutableDialogResults::OK;
                     }
                     delete pResMgr;
                 }
-            }
-            else    // ladbare Filter
+            }	
+            else	// ladbare Filter
             {
                 xub_StrLen i, nTokenCount = aGraphicFilter.aFilterPath.GetTokenCount( ';' );
                 for ( i = 0; i < nTokenCount; i++ )
@@ -281,7 +281,7 @@ sal_Int16 SvFilterOptionsDialog::execute()
                     aSystemPath += OUString( aFilterName );
 
                     osl::Module aLibrary( aSystemPath );
-                    PFilterDlgCall  pFunc = (PFilterDlgCall) aLibrary.getFunctionSymbol( UniString::CreateFromAscii( EXPDLG_FUNCTION_NAME ) );
+                    PFilterDlgCall 	pFunc = (PFilterDlgCall) aLibrary.getFunctionSymbol( UniString::CreateFromAscii( EXPDLG_FUNCTION_NAME ) );
                     // Dialog in DLL ausfuehren
                     if( pFunc )
                     {
diff --git a/svtools/source/filter.vcl/filter/SvFilterOptionsDialog.hxx b/svtools/source/filter.vcl/filter/SvFilterOptionsDialog.hxx
index a55fc4c84520..82db6531e96f 100644
--- a/svtools/source/filter.vcl/filter/SvFilterOptionsDialog.hxx
+++ b/svtools/source/filter.vcl/filter/SvFilterOptionsDialog.hxx
@@ -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
@@ -53,7 +53,7 @@ class SvFilterOptionsDialog : public cppu::WeakImplHelper5
     com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >
         aFilterDataSequence;
     rtl::OUString   aDialogTitle;
-    FieldUnit       eFieldUnit;
+    FieldUnit		eFieldUnit;
 
 public:
 
@@ -69,18 +69,18 @@ public:
         throw ( com::sun::star::uno::Exception, com::sun::star::uno::RuntimeException );
 
     // XServiceInfo
-    virtual rtl::OUString SAL_CALL getImplementationName()
+    virtual rtl::OUString SAL_CALL getImplementationName() 
         throw ( com::sun::star::uno::RuntimeException );
-    virtual sal_Bool SAL_CALL supportsService( const rtl::OUString& ServiceName )
+    virtual sal_Bool SAL_CALL supportsService( const rtl::OUString& ServiceName ) 
         throw ( com::sun::star::uno::RuntimeException );
-    virtual com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL getSupportedServiceNames()
+    virtual com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL getSupportedServiceNames() 
         throw ( com::sun::star::uno::RuntimeException );
 
     // XPropertyAccess
     virtual com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > SAL_CALL getPropertyValues()
         throw ( com::sun::star::uno::RuntimeException );
     virtual void SAL_CALL setPropertyValues( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > & aProps )
-        throw ( ::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException,
+        throw ( ::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, 
                 ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException,
                 ::com::sun::star::uno::RuntimeException );
 
@@ -91,7 +91,7 @@ public:
         throw ( ::com::sun::star::uno::RuntimeException );
 
     // XExporter
-    virtual void SAL_CALL setSourceDocument( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent >& xDoc )
+    virtual void SAL_CALL setSourceDocument( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent >& xDoc ) 
         throw ( ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException );
 
 };
diff --git a/svtools/source/filter.vcl/filter/dlgejpg.cxx b/svtools/source/filter.vcl/filter/dlgejpg.cxx
index 377697023de3..71e4eb052c4d 100644
--- a/svtools/source/filter.vcl/filter/dlgejpg.cxx
+++ b/svtools/source/filter.vcl/filter/dlgejpg.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
@@ -32,8 +32,8 @@
 #include "strings.hrc"
 #include <svtools/FilterConfigItem.hxx>
 
-#define KEY_QUALITY     "Quality"
-#define KEY_GRAYSCALES  "ColorMode"
+#define KEY_QUALITY		"Quality"
+#define KEY_GRAYSCALES	"ColorMode"
 
 /*************************************************************************
 |*
@@ -43,7 +43,7 @@
 
 DlgExportEJPG::DlgExportEJPG( FltCallDialogParameter& rPara ) :
                 ModalDialog         ( rPara.pWindow, ResId( DLG_EXPORT_JPG, *rPara.pResMgr ) ),
-                rFltCallPara        ( rPara ),
+                rFltCallPara		( rPara ),
                 aFiDescr            ( this, ResId( FI_DESCR, *rPara.pResMgr ) ),
                 aNumFldQuality      ( this, ResId( NUM_FLD_QUALITY, *rPara.pResMgr ) ),
                 aGrpQuality         ( this, ResId( GRP_QUALITY, *rPara.pResMgr ) ),
@@ -55,7 +55,7 @@ DlgExportEJPG::DlgExportEJPG( FltCallDialogParameter& rPara ) :
                 aBtnHelp            ( this, ResId( BTN_HELP, *rPara.pResMgr ) )
 {
     FreeResource();
-    String  aFilterConfigPath( RTL_CONSTASCII_USTRINGPARAM( "Office.Common/Filter/Graphic/Export/JPG" ) );
+    String	aFilterConfigPath( RTL_CONSTASCII_USTRINGPARAM( "Office.Common/Filter/Graphic/Export/JPG" ) );
     pConfigItem = new FilterConfigItem( aFilterConfigPath, &rPara.aFilterData );
 
     // reading filter options
diff --git a/svtools/source/filter.vcl/filter/dlgejpg.hrc b/svtools/source/filter.vcl/filter/dlgejpg.hrc
index 90a3c1d162be..c5fc85483532 100644
--- a/svtools/source/filter.vcl/filter/dlgejpg.hrc
+++ b/svtools/source/filter.vcl/filter/dlgejpg.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
diff --git a/svtools/source/filter.vcl/filter/dlgejpg.hxx b/svtools/source/filter.vcl/filter/dlgejpg.hxx
index d80682574a54..340539ea8f7b 100644
--- a/svtools/source/filter.vcl/filter/dlgejpg.hxx
+++ b/svtools/source/filter.vcl/filter/dlgejpg.hxx
@@ -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
@@ -50,16 +50,16 @@ private:
 
     FltCallDialogParameter& rFltCallPara;
 
-    FixedInfo           aFiDescr;
-    NumericField        aNumFldQuality;
+    FixedInfo			aFiDescr;
+    NumericField		aNumFldQuality;
     FixedLine           aGrpQuality;
-    RadioButton         aRbGray;
-    RadioButton         aRbRGB;
+    RadioButton			aRbGray;
+    RadioButton			aRbRGB;
     FixedLine           aGrpColors;
-    OKButton            aBtnOK;
-    CancelButton        aBtnCancel;
-    HelpButton          aBtnHelp;
-    FilterConfigItem*   pConfigItem;
+    OKButton			aBtnOK;
+    CancelButton		aBtnCancel;
+    HelpButton			aBtnHelp;
+    FilterConfigItem*	pConfigItem;
 
     DECL_LINK( OK, void * );
 
diff --git a/svtools/source/filter.vcl/filter/dlgejpg.src b/svtools/source/filter.vcl/filter/dlgejpg.src
index fd224f22c409..c0c58d7a1b82 100644
--- a/svtools/source/filter.vcl/filter/dlgejpg.src
+++ b/svtools/source/filter.vcl/filter/dlgejpg.src
@@ -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
diff --git a/svtools/source/filter.vcl/filter/dlgepng.cxx b/svtools/source/filter.vcl/filter/dlgepng.cxx
index bd551e9a4bda..6193135ed385 100644
--- a/svtools/source/filter.vcl/filter/dlgepng.cxx
+++ b/svtools/source/filter.vcl/filter/dlgepng.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
@@ -43,8 +43,8 @@ using namespace ::com::sun::star::uno;
 
 DlgExportEPNG::DlgExportEPNG( FltCallDialogParameter& rPara ) :
                 ModalDialog         ( rPara.pWindow, ResId( DLG_EXPORT_EPNG, *rPara.pResMgr ) ),
-                FilterConfigItem    ( OUString( RTL_CONSTASCII_USTRINGPARAM( "Office.Common/Filter/Graphic/Export/PNG" ) ), &rPara.aFilterData ),
-                rFltCallPara        ( rPara ),
+                FilterConfigItem	( OUString( RTL_CONSTASCII_USTRINGPARAM( "Office.Common/Filter/Graphic/Export/PNG" ) ), &rPara.aFilterData ),
+                rFltCallPara		( rPara ),
                 aGrpCompression     ( this, ResId( GRP_COMPRESSION, *rPara.pResMgr ) ),
                 aFiCompression      ( this, ResId( FI_COMPRESSION, *rPara.pResMgr ) ),
                 aNumCompression     ( this, ResId( NUM_COMPRESSION, *rPara.pResMgr ) ),
@@ -52,18 +52,18 @@ DlgExportEPNG::DlgExportEPNG( FltCallDialogParameter& rPara ) :
                 aBtnOK              ( this, ResId( BTN_OK, *rPara.pResMgr ) ),
                 aBtnCancel          ( this, ResId( BTN_CANCEL, *rPara.pResMgr ) ),
                 aBtnHelp            ( this, ResId( BTN_HELP, *rPara.pResMgr ) ),
-                pMgr                ( rPara.pResMgr )
+                pMgr				( rPara.pResMgr )
 {
     FreeResource();
 
     // Config-Parameter lesen
-    sal_Int32   nCompression = ReadInt32( OUString( RTL_CONSTASCII_USTRINGPARAM( "Compression" ) ), 6 );
+    sal_Int32	nCompression = ReadInt32( OUString( RTL_CONSTASCII_USTRINGPARAM( "Compression" ) ), 6 );
     if ( ( nCompression < 0 ) || ( nCompression > 9 ) )
         nCompression = 6;
     aNumCompression.SetValue( nCompression );
 
-    sal_Int32   nInterlaced = ReadInt32( OUString( RTL_CONSTASCII_USTRINGPARAM( "Interlaced" ) ), 0 );
-    sal_Bool    bInterlaced = nInterlaced != 0;
+    sal_Int32	nInterlaced = ReadInt32( OUString( RTL_CONSTASCII_USTRINGPARAM( "Interlaced" ) ), 0 );
+    sal_Bool	bInterlaced = nInterlaced != 0;
     aCbxInterlaced.Check( bInterlaced );
 
     aBtnOK.SetClickHdl( LINK( this, DlgExportEPNG, OK ) );
diff --git a/svtools/source/filter.vcl/filter/dlgepng.hrc b/svtools/source/filter.vcl/filter/dlgepng.hrc
index b3ffaab3ab1e..d63234de40fb 100644
--- a/svtools/source/filter.vcl/filter/dlgepng.hrc
+++ b/svtools/source/filter.vcl/filter/dlgepng.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
diff --git a/svtools/source/filter.vcl/filter/dlgepng.hxx b/svtools/source/filter.vcl/filter/dlgepng.hxx
index 469985afee59..d72602d33c91 100644
--- a/svtools/source/filter.vcl/filter/dlgepng.hxx
+++ b/svtools/source/filter.vcl/filter/dlgepng.hxx
@@ -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
@@ -52,14 +52,14 @@ class DlgExportEPNG : public ModalDialog, FilterConfigItem
 
         FltCallDialogParameter& rFltCallPara;
 
-        FixedLine           aGrpCompression;
-        FixedInfo           aFiCompression;
-        NumericField        aNumCompression;
-        CheckBox            aCbxInterlaced;
-        OKButton            aBtnOK;
-        CancelButton        aBtnCancel;
-        HelpButton          aBtnHelp;
-        ResMgr*             pMgr;
+        FixedLine			aGrpCompression;
+        FixedInfo			aFiCompression;
+        NumericField		aNumCompression;
+        CheckBox			aCbxInterlaced;
+        OKButton			aBtnOK;
+        CancelButton		aBtnCancel;
+        HelpButton			aBtnHelp;
+        ResMgr*				pMgr;
 
         DECL_LINK( OK, void * );
 
diff --git a/svtools/source/filter.vcl/filter/dlgepng.src b/svtools/source/filter.vcl/filter/dlgepng.src
index aa778842dc48..9924441fbfc3 100644
--- a/svtools/source/filter.vcl/filter/dlgepng.src
+++ b/svtools/source/filter.vcl/filter/dlgepng.src
@@ -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
diff --git a/svtools/source/filter.vcl/filter/dlgexpor.cxx b/svtools/source/filter.vcl/filter/dlgexpor.cxx
index b4b7c0fc949d..2280edb27436 100644
--- a/svtools/source/filter.vcl/filter/dlgexpor.cxx
+++ b/svtools/source/filter.vcl/filter/dlgexpor.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
@@ -29,7 +29,7 @@
 #include "precompiled_svtools.hxx"
 
 #ifndef GCC
-#   pragma hdrstop
+#	pragma hdrstop
 #endif
 
 #include <tools/ref.hxx>
@@ -48,7 +48,7 @@
 
 DlgExportPix::DlgExportPix( FltCallDialogParameter& rPara ) :
                 ModalDialog         ( rPara.pWindow, ResId( DLG_EXPORT_PIX, *rPara.pResMgr ) ),
-                rFltCallPara        ( rPara ),
+                rFltCallPara		( rPara ),
                 aBtnOK              ( this, ResId( BTN_OK_PIX, *rPara.pResMgr ) ),
                 aBtnCancel          ( this, ResId( BTN_CANCEL_PIX, *rPara.pResMgr ) ),
                 aBtnHelp            ( this, ResId( BTN_HELP_PIX, *rPara.pResMgr ) ),
@@ -64,15 +64,15 @@ DlgExportPix::DlgExportPix( FltCallDialogParameter& rPara ) :
                 aMtfSizeY           ( this, ResId( MTF_SIZEY_PIX, *rPara.pResMgr ) ),
                 aGrpMode            ( this, ResId( GRP_MODE_PIX, *rPara.pResMgr ) ),
                 aCbbRes             ( this, ResId( CBB_RES_PIX, *rPara.pResMgr ) ),
-                pMgr                ( rPara.pResMgr ),
-                aExt                ( rPara.aFilterExt )
+                pMgr				( rPara.pResMgr ),
+                aExt				( rPara.aFilterExt )
 {
     aExt.ToUpperAscii();
-    String  aFilterConfigPath( RTL_CONSTASCII_USTRINGPARAM( "Office.Common/Filter/Graphic/Export/" ) );
+    String	aFilterConfigPath( RTL_CONSTASCII_USTRINGPARAM( "Office.Common/Filter/Graphic/Export/" ) );
     aFilterConfigPath.Append( aExt );
     pConfigItem = new FilterConfigItem( aFilterConfigPath, &rPara.aFilterData );
 
-    String  aTitle( aExt );
+    String	aTitle( aExt );
     FreeResource();
 
     aBtnOK.SetClickHdl( LINK( this, DlgExportPix, OK ) );
@@ -111,13 +111,13 @@ DlgExportPix::DlgExportPix( FltCallDialogParameter& rPara ) :
 
     switch ( rPara.eFieldUnit )
     {
-//      case FUNIT_NONE :
-//      case FUNIT_KM :
-//      case FUNIT_PERCENT :
-//      case FUNIT_CUSTOM :
-//      case FUNIT_MILE :
-//      case FUNIT_FOOT :
-//      case FUNIT_M :
+//		case FUNIT_NONE :
+//		case FUNIT_KM :
+//		case FUNIT_PERCENT :
+//		case FUNIT_CUSTOM :
+//		case FUNIT_MILE :
+//		case FUNIT_FOOT :
+//		case FUNIT_M :
         case FUNIT_MM :
         case FUNIT_CM :
         case FUNIT_TWIP :
@@ -132,7 +132,7 @@ DlgExportPix::DlgExportPix( FltCallDialogParameter& rPara ) :
         break;
 
         default:
-        break;      // -Wall  multiple values not handled.
+        break;		// -Wall  multiple values not handled.
     }
 
     switch ( nMode )
@@ -175,7 +175,7 @@ IMPL_LINK( DlgExportPix, OK, void *, EMPTYARG )
 {
     // Config-Parameter schreiben
 
-    sal_Int32   nRes = Max( Min( aCbbRes.GetText().ToInt32(), sal_Int32( 600 ) ), sal_Int32( 75 ) );
+    sal_Int32	nRes = Max( Min( aCbbRes.GetText().ToInt32(), sal_Int32( 600 ) ), sal_Int32( 75 ) );
     ::com::sun::star::awt::Size aSize(
         static_cast<long>(MetricField::ConvertDoubleValue( static_cast<double>(aMtfSizeX.GetValue()), 2, aMtfSizeX.GetUnit(), MAP_100TH_MM )),
             static_cast<long>(MetricField::ConvertDoubleValue( static_cast<double>(aMtfSizeY.GetValue()), 2, aMtfSizeY.GetUnit(), MAP_100TH_MM )) );
@@ -286,7 +286,7 @@ IMPL_LINK( DlgExportPix, SelectLbColors, void*, EMPTYARG )
 
 DlgExportVec::DlgExportVec( FltCallDialogParameter& rPara ) :
                 ModalDialog         ( rPara.pWindow, ResId( DLG_EXPORT_VEC, *rPara.pResMgr ) ),
-                rFltCallPara        ( rPara ),
+                rFltCallPara		( rPara ),
                 aBtnOK              ( this, ResId( BTN_OK_VEC, *rPara.pResMgr ) ),
                 aBtnCancel          ( this, ResId( BTN_CANCEL_VEC, *rPara.pResMgr ) ),
                 aBtnHelp            ( this, ResId( BTN_HELP_VEC, *rPara.pResMgr ) ),
@@ -298,15 +298,15 @@ DlgExportVec::DlgExportVec( FltCallDialogParameter& rPara ) :
                 aFtSizeY            ( this, ResId( FT_SIZEY_VEC, *rPara.pResMgr ) ),
                 aMtfSizeY           ( this, ResId( MTF_SIZEY_VEC, *rPara.pResMgr ) ),
                 aGrpSize            ( this, ResId( GRP_SIZE_VEC, *rPara.pResMgr ) ),
-                pMgr                ( rPara.pResMgr ),
-                aExt                ( rPara.aFilterExt )
+                pMgr				( rPara.pResMgr ),
+                aExt				( rPara.aFilterExt )
 {
     aExt.ToUpperAscii();
-    String  aFilterConfigPath( RTL_CONSTASCII_USTRINGPARAM( "Office.Common/Filter/Graphic/Export/" ) );
+    String	aFilterConfigPath( RTL_CONSTASCII_USTRINGPARAM( "Office.Common/Filter/Graphic/Export/" ) );
     aFilterConfigPath.Append( aExt );
     pConfigItem = new FilterConfigItem( aFilterConfigPath, &rPara.aFilterData );
 
-    String  aTitle( aExt );
+    String	aTitle( aExt );
     FreeResource();
 
     aBtnOK.SetClickHdl( LINK( this, DlgExportVec, OK ) );
@@ -331,12 +331,12 @@ DlgExportVec::DlgExportVec( FltCallDialogParameter& rPara ) :
 
     switch ( rPara.eFieldUnit )
     {
-//      case FUNIT_NONE :
-//      case FUNIT_KM :
-//      case FUNIT_PERCENT :
-//      case FUNIT_CUSTOM :
-//      case FUNIT_MILE :
-//      case FUNIT_FOOT :
+//		case FUNIT_NONE :
+//		case FUNIT_KM :
+//		case FUNIT_PERCENT :
+//		case FUNIT_CUSTOM :
+//		case FUNIT_MILE :
+//		case FUNIT_FOOT :
         case FUNIT_MM :
         case FUNIT_CM :
         case FUNIT_M :
@@ -351,7 +351,7 @@ DlgExportVec::DlgExportVec( FltCallDialogParameter& rPara ) :
         }
         break;
         default:
-            break;  // -Wall Multiple values not handled.
+            break;	// -Wall Multiple values not handled.
     }
 
     switch ( nMode )
diff --git a/svtools/source/filter.vcl/filter/dlgexpor.hrc b/svtools/source/filter.vcl/filter/dlgexpor.hrc
index 69870c9b00b0..d25380b6dd18 100644
--- a/svtools/source/filter.vcl/filter/dlgexpor.hrc
+++ b/svtools/source/filter.vcl/filter/dlgexpor.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
diff --git a/svtools/source/filter.vcl/filter/dlgexpor.hxx b/svtools/source/filter.vcl/filter/dlgexpor.hxx
index 8c7b2d462e70..bad2615c001b 100644
--- a/svtools/source/filter.vcl/filter/dlgexpor.hxx
+++ b/svtools/source/filter.vcl/filter/dlgexpor.hxx
@@ -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
@@ -49,28 +49,28 @@ private:
 
     FltCallDialogParameter& rFltCallPara;
 
-    OKButton            aBtnOK;
-    CancelButton        aBtnCancel;
-    HelpButton          aBtnHelp;
+    OKButton			aBtnOK;
+    CancelButton		aBtnCancel;
+    HelpButton			aBtnHelp;
 
-    ListBox             aLbColors;
-    CheckBox            aCbxRLE;
-    FixedLine           aGrpColors;
+    ListBox				aLbColors;
+    CheckBox			aCbxRLE;
+    FixedLine			aGrpColors;
 
-    RadioButton         aRbOriginal;
-    RadioButton         aRbRes;
-    RadioButton         aRbSize;
-    FixedText           aFtSizeX;
-    MetricField         aMtfSizeX;
-    FixedText           aFtSizeY;
-    MetricField         aMtfSizeY;
-    FixedLine           aGrpMode;
-    ComboBox            aCbbRes;
+    RadioButton			aRbOriginal;
+    RadioButton			aRbRes;
+    RadioButton			aRbSize;
+    FixedText			aFtSizeX;
+    MetricField			aMtfSizeX;
+    FixedText			aFtSizeY;
+    MetricField			aMtfSizeY;
+    FixedLine			aGrpMode;
+    ComboBox			aCbbRes;
 
-    FilterConfigItem*   pConfigItem;
-    ResMgr*             pMgr;
+    FilterConfigItem*	pConfigItem;
+    ResMgr*				pMgr;
 
-    String              aExt;
+    String				aExt;
 
                         DECL_LINK( OK, void* p );
                         DECL_LINK( ClickRbOriginal,void* p );
@@ -95,24 +95,24 @@ private:
 
     FltCallDialogParameter& rFltCallPara;
 
-    OKButton            aBtnOK;
-    CancelButton        aBtnCancel;
-    HelpButton          aBtnHelp;
+    OKButton			aBtnOK;
+    CancelButton		aBtnCancel;
+    HelpButton			aBtnHelp;
 
-    RadioButton         aRbOriginal;
-    RadioButton         aRbSize;
-    FixedLine           aGrpMode;
+    RadioButton			aRbOriginal;
+    RadioButton			aRbSize;
+    FixedLine			aGrpMode;
 
-    FixedText           aFtSizeX;
-    MetricField         aMtfSizeX;
-    FixedText           aFtSizeY;
-    MetricField         aMtfSizeY;
-    FixedLine           aGrpSize;
+    FixedText			aFtSizeX;
+    MetricField			aMtfSizeX;
+    FixedText			aFtSizeY;
+    MetricField			aMtfSizeY;
+    FixedLine			aGrpSize;
 
-    FilterConfigItem*   pConfigItem;
-    ResMgr*             pMgr;
+    FilterConfigItem*	pConfigItem;
+    ResMgr*				pMgr;
 
-    String              aExt;
+    String				aExt;
 
     DECL_LINK( OK, void* p );
     DECL_LINK( ClickRbOriginal,void* p );
diff --git a/svtools/source/filter.vcl/filter/dlgexpor.src b/svtools/source/filter.vcl/filter/dlgexpor.src
index 7573b394d72f..1edef36ed5f7 100644
--- a/svtools/source/filter.vcl/filter/dlgexpor.src
+++ b/svtools/source/filter.vcl/filter/dlgexpor.src
@@ -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
@@ -198,7 +198,7 @@ ModalDialog DLG_EXPORT_VEC
     RadioButton RB_SIZE_VEC
     {
         Pos = MAP_APPFONT ( 12 , 28 ) ;
-        Size = MAP_APPFONT ( 98 , 10 ) ;
+        Size = MAP_APPFONT ( 98 , 10 ) ; 
         TabStop = TRUE ;
         Text [ en-US ] = "~Size" ;
     };
diff --git a/svtools/source/filter.vcl/filter/filter.cxx b/svtools/source/filter.vcl/filter/filter.cxx
index c8a79d3a35cd..7caea58208d7 100644
--- a/svtools/source/filter.vcl/filter/filter.cxx
+++ b/svtools/source/filter.vcl/filter/filter.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
@@ -77,21 +77,21 @@
 
 #include "SvFilterOptionsDialog.hxx"
 
-#define PMGCHUNG_msOG       0x6d734f47      // Microsoft Office Animated GIF
+#define PMGCHUNG_msOG		0x6d734f47		// Microsoft Office Animated GIF
 
 #if defined WIN || (defined OS2 && !defined ICC)
 
-#define IMPORT_FUNCTION_NAME    "_GraphicImport"
-#define EXPORT_FUNCTION_NAME    "_GraphicExport"
-#define IMPDLG_FUNCTION_NAME    "_DoImportDialog"
-#define EXPDLG_FUNCTION_NAME    "_DoExportDialog"
+#define IMPORT_FUNCTION_NAME	"_GraphicImport"
+#define EXPORT_FUNCTION_NAME	"_GraphicExport"
+#define IMPDLG_FUNCTION_NAME	"_DoImportDialog"
+#define EXPDLG_FUNCTION_NAME	"_DoExportDialog"
 
 #else
 
-#define IMPORT_FUNCTION_NAME    "GraphicImport"
-#define EXPORT_FUNCTION_NAME    "GraphicExport"
-#define IMPDLG_FUNCTION_NAME    "DoImportDialog"
-#define EXPDLG_FUNCTION_NAME    "DoExportDialog"
+#define IMPORT_FUNCTION_NAME	"GraphicImport"
+#define EXPORT_FUNCTION_NAME	"GraphicExport"
+#define IMPDLG_FUNCTION_NAME	"DoImportDialog"
+#define EXPDLG_FUNCTION_NAME	"DoExportDialog"
 
 #endif
 
@@ -107,11 +107,11 @@
 using namespace ::rtl;
 using namespace ::com::sun::star;
 
-static List*        pFilterHdlList = NULL;
+static List*		pFilterHdlList = NULL;
 
 static ::osl::Mutex& getListMutex()
 {
-    static ::osl::Mutex s_aListProtection;
+    static ::osl::Mutex	s_aListProtection;
     return s_aListProtection;
 }
 
@@ -125,11 +125,11 @@ class ImpFilterOutputStream : public ::cppu::WeakImplHelper1< ::com::sun::star::
 {
 protected:
 
-    SvStream&                           mrStm;
+    SvStream& 							mrStm;
 
-    virtual void SAL_CALL               writeBytes( const ::com::sun::star::uno::Sequence< sal_Int8 >& rData ) throw (::com::sun::star::io::NotConnectedException, ::com::sun::star::io::BufferSizeExceededException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException) { mrStm.Write( rData.getConstArray(), rData.getLength() ); }
-    virtual void SAL_CALL               flush() throw (::com::sun::star::io::NotConnectedException, ::com::sun::star::io::BufferSizeExceededException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException) { mrStm.Flush(); }
-    virtual void SAL_CALL               closeOutput() throw() {}
+    virtual void SAL_CALL				writeBytes( const ::com::sun::star::uno::Sequence< sal_Int8 >& rData ) throw (::com::sun::star::io::NotConnectedException, ::com::sun::star::io::BufferSizeExceededException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException) { mrStm.Write( rData.getConstArray(), rData.getLength() ); }
+    virtual void SAL_CALL				flush() throw (::com::sun::star::io::NotConnectedException, ::com::sun::star::io::BufferSizeExceededException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException) { mrStm.Flush(); }
+    virtual void SAL_CALL				closeOutput() throw() {}
 
 public:
 
@@ -143,8 +143,8 @@ BOOL ImplDirEntryHelper::Exists( const INetURLObject& rObj )
 
     try
     {
-        ::rtl::OUString aTitle;
-        ::ucbhelper::Content    aCnt( rObj.GetMainURL( INetURLObject::NO_DECODE ),
+        ::rtl::OUString	aTitle;
+        ::ucbhelper::Content	aCnt( rObj.GetMainURL( INetURLObject::NO_DECODE ),
                               ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XCommandEnvironment >() );
 
         bExists = aCnt.isDocument();
@@ -159,7 +159,7 @@ BOOL ImplDirEntryHelper::Exists( const INetURLObject& rObj )
     }
     catch( ... )
     {
-//      DBG_ERRORFILE( "Any other exception" );
+//		DBG_ERRORFILE( "Any other exception" );
     }
     return bExists;
 }
@@ -213,8 +213,8 @@ BYTE* ImplSearchEntry( BYTE* pSource, BYTE* pDest, ULONG nComp, ULONG nSize )
 
 inline String ImpGetExtension( const String &rPath )
 {
-    String          aExt;
-    INetURLObject   aURL( rPath );
+    String			aExt;
+    INetURLObject	aURL( rPath );
     aExt = aURL.GetFileExtension().toAsciiUpperCase();
     return aExt;
 }
@@ -257,7 +257,7 @@ static BOOL ImpPeekGraphicFormat( SvStream& rStream, String& rFormatExtension, B
     USHORT  i;
     BYTE    sFirstBytes[ 256 ];
     ULONG   nFirstLong,nSecondLong;
-    ULONG   nStreamPos = rStream.Tell();
+    ULONG	nStreamPos = rStream.Tell();
 
     rStream.Seek( STREAM_SEEK_TO_END );
     ULONG nStreamLen = rStream.Tell() - nStreamPos;
@@ -553,7 +553,7 @@ static BOOL ImpPeekGraphicFormat( SvStream& rStream, String& rFormatExtension, B
     {
         bSomethingTested = TRUE;
         BYTE sBuf[4];
-        sal_uInt32 nOffset; // in ms documents the pict format is used without the first 512 bytes
+        sal_uInt32 nOffset;	// in ms documents the pict format is used without the first 512 bytes
         for ( nOffset = 10; ( nOffset <= 522 ) && ( ( nStreamPos + nOffset + 3 ) <= nStreamLen ); nOffset += 512 )
         {
             rStream.Seek( nStreamPos + nOffset );
@@ -741,9 +741,9 @@ sal_uInt16 GraphicFilter::ImpTestOrFindFormat( const String& rPath, SvStream& rS
 
 static Graphic ImpGetScaledGraphic( const Graphic& rGraphic, FilterConfigItem& rConfigItem )
 {
-    Graphic     aGraphic;
-    ByteString  aResMgrName( "svt", 3 );
-    ResMgr*     pResMgr;
+    Graphic		aGraphic;
+    ByteString	aResMgrName( "svt", 3 );
+    ResMgr*		pResMgr;
 
     pResMgr = ResMgr::CreateResMgr( aResMgrName.GetBuffer(), Application::GetSettings().GetUILocale() );
 
@@ -754,9 +754,9 @@ static Graphic ImpGetScaledGraphic( const Graphic& rGraphic, FilterConfigItem& r
     {
         sal_Int32 nMode = rConfigItem.ReadInt32( String( ResId( KEY_MODE, *pResMgr ) ), -1 );
 
-        if ( nMode == -1 )  // the property is not there, this is possible, if the graphic filter
-        {                   // is called via UnoGraphicExporter and not from a graphic export Dialog
-            nMode = 0;      // then we are defaulting this mode to 0
+        if ( nMode == -1 )	// the property is not there, this is possible, if the graphic filter
+        {					// is called via UnoGraphicExporter and not from a graphic export Dialog
+            nMode = 0;		// then we are defaulting this mode to 0
             if ( nLogicalWidth || nLogicalHeight )
                 nMode = 2;
         }
@@ -779,11 +779,11 @@ static Graphic ImpGetScaledGraphic( const Graphic& rGraphic, FilterConfigItem& r
             // Aufloesung wird eingestellt
             if( nMode == 1 )
             {
-                Bitmap      aBitmap( rGraphic.GetBitmap() );
-                MapMode     aMap( MAP_100TH_INCH );
+                Bitmap 		aBitmap( rGraphic.GetBitmap() );
+                MapMode		aMap( MAP_100TH_INCH );
 
                 sal_Int32   nDPI = rConfigItem.ReadInt32( String( ResId( KEY_RES, *pResMgr ) ), 75 );
-                Fraction    aFrac( 1, Min( Max( nDPI, sal_Int32( 75 ) ), sal_Int32( 600 ) ) );
+                Fraction	aFrac( 1, Min( Max( nDPI, sal_Int32( 75 ) ), sal_Int32( 600 ) ) );
 
                 aMap.SetScaleX( aFrac );
                 aMap.SetScaleY( aFrac );
@@ -818,7 +818,7 @@ static Graphic ImpGetScaledGraphic( const Graphic& rGraphic, FilterConfigItem& r
         {
             if( ( nMode == 1 ) || ( nMode == 2 ) )
             {
-                GDIMetaFile aMtf( rGraphic.GetGDIMetaFile() );
+                GDIMetaFile	aMtf( rGraphic.GetGDIMetaFile() );
                 ::com::sun::star::awt::Size aDefaultSize( 10000, 10000 );
                 Size aNewSize( OutputDevice::LogicToLogic( Size( nLogicalWidth, nLogicalHeight ), MAP_100TH_MM, aMtf.GetPrefMapMode() ) );
 
@@ -845,12 +845,12 @@ static Graphic ImpGetScaledGraphic( const Graphic& rGraphic, FilterConfigItem& r
 
 static String ImpCreateFullFilterPath( const String& rPath, const String& rFilterName )
 {
-    ::rtl::OUString aPathURL;
+    ::rtl::OUString	aPathURL;
 
     ::osl::FileBase::getFileURLFromSystemPath( rPath, aPathURL );
     aPathURL += String( '/' );
 
-    ::rtl::OUString aSystemPath;
+    ::rtl::OUString	aSystemPath;
     ::osl::FileBase::getSystemPathFromFileURL( aPathURL, aSystemPath );
     aSystemPath += ::rtl::OUString( rFilterName );
 
@@ -866,29 +866,29 @@ class ImpFilterLibCache;
 
 struct ImpFilterLibCacheEntry
 {
-    ImpFilterLibCacheEntry* mpNext;
-    osl::Module             maLibrary;
-    String                  maFiltername;
-    PFilterCall             mpfnImport;
-    PFilterDlgCall          mpfnImportDlg;
+    ImpFilterLibCacheEntry*	mpNext;
+    osl::Module			    maLibrary;
+    String					maFiltername;
+    PFilterCall				mpfnImport;
+    PFilterDlgCall			mpfnImportDlg;
 
                             ImpFilterLibCacheEntry( const String& rPathname, const String& rFiltername );
-    int                     operator==( const String& rFiltername ) const { return maFiltername == rFiltername; }
+    int						operator==( const String& rFiltername ) const { return maFiltername == rFiltername; }
 
-    PFilterCall             GetImportFunction();
-    PFilterDlgCall          GetImportDlgFunction();
-    PFilterCall             GetExportFunction() { return (PFilterCall) maLibrary.getFunctionSymbol( UniString::CreateFromAscii( EXPORT_FUNCTION_NAME ) ); }
-    PFilterDlgCall          GetExportDlgFunction() { return (PFilterDlgCall) maLibrary.getFunctionSymbol( UniString::CreateFromAscii( EXPDLG_FUNCTION_NAME ) ); }
+    PFilterCall				GetImportFunction();
+    PFilterDlgCall			GetImportDlgFunction();
+    PFilterCall				GetExportFunction() { return (PFilterCall) maLibrary.getFunctionSymbol( UniString::CreateFromAscii( EXPORT_FUNCTION_NAME ) ); }
+    PFilterDlgCall			GetExportDlgFunction() { return (PFilterDlgCall) maLibrary.getFunctionSymbol( UniString::CreateFromAscii( EXPDLG_FUNCTION_NAME ) ); }
 };
 
 // ------------------------------------------------------------------------
 
 ImpFilterLibCacheEntry::ImpFilterLibCacheEntry( const String& rPathname, const String& rFiltername ) :
-        mpNext          ( NULL ),
-        maLibrary       ( rPathname ),
-        maFiltername    ( rFiltername ),
-        mpfnImport      ( NULL ),
-        mpfnImportDlg   ( NULL )
+        mpNext			( NULL ),
+        maLibrary		( rPathname ),
+        maFiltername	( rFiltername ),
+        mpfnImport		( NULL ),
+        mpfnImportDlg	( NULL )
 {
 }
 
@@ -918,21 +918,21 @@ PFilterDlgCall ImpFilterLibCacheEntry::GetImportDlgFunction()
 
 class ImpFilterLibCache
 {
-    ImpFilterLibCacheEntry* mpFirst;
-    ImpFilterLibCacheEntry* mpLast;
+    ImpFilterLibCacheEntry*	mpFirst;
+    ImpFilterLibCacheEntry*	mpLast;
 
 public:
                             ImpFilterLibCache();
                             ~ImpFilterLibCache();
 
-    ImpFilterLibCacheEntry* GetFilter( const String& rFilterPath, const String& rFiltername );
+    ImpFilterLibCacheEntry*	GetFilter( const String& rFilterPath, const String& rFiltername );
 };
 
 // ------------------------------------------------------------------------
 
 ImpFilterLibCache::ImpFilterLibCache() :
-    mpFirst     ( NULL ),
-    mpLast      ( NULL )
+    mpFirst		( NULL ),
+    mpLast		( NULL )
 {
 }
 
@@ -940,7 +940,7 @@ ImpFilterLibCache::ImpFilterLibCache() :
 
 ImpFilterLibCache::~ImpFilterLibCache()
 {
-    ImpFilterLibCacheEntry* pEntry = mpFirst;
+    ImpFilterLibCacheEntry*	pEntry = mpFirst;
     while( pEntry )
     {
         ImpFilterLibCacheEntry* pNext = pEntry->mpNext;
@@ -953,7 +953,7 @@ ImpFilterLibCache::~ImpFilterLibCache()
 
 ImpFilterLibCacheEntry* ImpFilterLibCache::GetFilter( const String& rFilterPath, const String& rFilterName )
 {
-    ImpFilterLibCacheEntry* pEntry = mpFirst;
+    ImpFilterLibCacheEntry*	pEntry = mpFirst;
 
     while( pEntry )
     {
@@ -992,7 +992,7 @@ namespace { struct Cache : public rtl::Static<ImpFilterLibCache, Cache> {}; }
 // -----------------
 
 GraphicFilter::GraphicFilter( sal_Bool bConfig ) :
-    bUseConfig        ( bConfig ),
+    bUseConfig	      ( bConfig ),
     nExpGraphHint     ( 0 )
 {
     ImplInit();
@@ -1232,11 +1232,11 @@ BOOL GraphicFilter::IsExportPixelFormat( USHORT nFormat )
 USHORT GraphicFilter::CanImportGraphic( const INetURLObject& rPath,
                                         USHORT nFormat, USHORT* pDeterminedFormat )
 {
-    sal_uInt16  nRetValue = GRFILTER_FORMATERROR;
+    sal_uInt16	nRetValue = GRFILTER_FORMATERROR;
     DBG_ASSERT( rPath.GetProtocol() != INET_PROT_NOT_VALID, "GraphicFilter::CanImportGraphic() : ProtType == INET_PROT_NOT_VALID" );
 
-    String      aMainUrl( rPath.GetMainURL( INetURLObject::NO_DECODE ) );
-    SvStream*   pStream = ::utl::UcbStreamHelper::CreateStream( aMainUrl, STREAM_READ | STREAM_SHARE_DENYNONE );
+    String		aMainUrl( rPath.GetMainURL( INetURLObject::NO_DECODE ) );
+    SvStream*	pStream = ::utl::UcbStreamHelper::CreateStream( aMainUrl, STREAM_READ | STREAM_SHARE_DENYNONE );
     if ( pStream )
     {
         nRetValue = CanImportGraphic( aMainUrl, *pStream, nFormat, pDeterminedFormat );
@@ -1269,8 +1269,8 @@ USHORT GraphicFilter::ImportGraphic( Graphic& rGraphic, const INetURLObject& rPa
     sal_uInt16 nRetValue = GRFILTER_FORMATERROR;
     DBG_ASSERT( rPath.GetProtocol() != INET_PROT_NOT_VALID, "GraphicFilter::ImportGraphic() : ProtType == INET_PROT_NOT_VALID" );
 
-    String      aMainUrl( rPath.GetMainURL( INetURLObject::NO_DECODE ) );
-    SvStream*   pStream = ::utl::UcbStreamHelper::CreateStream( aMainUrl, STREAM_READ | STREAM_SHARE_DENYNONE );
+    String		aMainUrl( rPath.GetMainURL( INetURLObject::NO_DECODE ) );
+    SvStream*	pStream = ::utl::UcbStreamHelper::CreateStream( aMainUrl, STREAM_READ | STREAM_SHARE_DENYNONE );
     if ( pStream )
     {
         nRetValue = ImportGraphic( rGraphic, aMainUrl, *pStream, nFormat, pDeterminedFormat, nImportFlags );
@@ -1291,18 +1291,18 @@ USHORT GraphicFilter::ImportGraphic( Graphic& rGraphic, const String& rPath, SvS
                                      USHORT nFormat, USHORT* pDeterminedFormat, sal_uInt32 nImportFlags,
                                      com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue >* pFilterData )
 {
-    String                  aFilterName;
-    ULONG                   nStmBegin;
-    USHORT                  nStatus;
-    GraphicReader*          pContext = rGraphic.GetContext();
-    GfxLinkType             eLinkType = GFX_LINK_TYPE_NONE;
-    BOOL                    bDummyContext = ( pContext == (GraphicReader*) 1 );
-    const BOOL              bLinkSet = rGraphic.IsLink();
+    String					aFilterName;
+    ULONG					nStmBegin;
+    USHORT					nStatus;
+    GraphicReader*			pContext = rGraphic.GetContext();
+    GfxLinkType				eLinkType = GFX_LINK_TYPE_NONE;
+    BOOL					bDummyContext = ( pContext == (GraphicReader*) 1 );
+    const BOOL				bLinkSet = rGraphic.IsLink();
     FilterConfigItem*       pFilterConfigItem = NULL;
 
-    Size                    aPreviewSizeHint( 0, 0 );
-    sal_Bool                bAllowPartialStreamRead = sal_False;
-    sal_Bool                bCreateNativeLink = sal_True;
+    Size					aPreviewSizeHint( 0, 0 );
+    sal_Bool				bAllowPartialStreamRead = sal_False;
+    sal_Bool				bCreateNativeLink = sal_True;
 
     ResetLastError();
 
@@ -1497,8 +1497,8 @@ USHORT GraphicFilter::ImportGraphic( Graphic& rGraphic, const String& rPath, SvS
         else if( aFilterName.EqualsIgnoreCaseAscii( IMP_SVSGF )
                 || aFilterName.EqualsIgnoreCaseAscii( IMP_SVSGV ) )
         {
-            USHORT          nVersion;
-            unsigned char   nTyp = CheckSgfTyp( rIStream, nVersion );
+            USHORT			nVersion;
+            unsigned char	nTyp = CheckSgfTyp( rIStream, nVersion );
 
             switch( nTyp )
             {
@@ -1561,7 +1561,7 @@ USHORT GraphicFilter::ImportGraphic( Graphic& rGraphic, const String& rPath, SvS
     }
     else
     {
-        ImpFilterLibCacheEntry* pFilter = NULL;
+        ImpFilterLibCacheEntry*	pFilter = NULL;
 
         // find first filter in filter pathes
         xub_StrLen i, nTokenCount = aFilterPath.GetTokenCount( ';' );
@@ -1610,11 +1610,11 @@ USHORT GraphicFilter::ImportGraphic( Graphic& rGraphic, const String& rPath, SvS
     if( nStatus == GRFILTER_OK && bCreateNativeLink && ( eLinkType != GFX_LINK_TYPE_NONE ) && !rGraphic.GetContext() && !bLinkSet )
     {
         const ULONG nStmEnd = rIStream.Tell();
-        const ULONG nBufSize = nStmEnd - nStmBegin;
+        const ULONG	nBufSize = nStmEnd - nStmBegin;
 
         if( nBufSize )
         {
-            BYTE*   pBuf=0;
+            BYTE*	pBuf=0;
             try
             {
                 pBuf = new BYTE[ nBufSize ];
@@ -1654,12 +1654,12 @@ USHORT GraphicFilter::ImportGraphic( Graphic& rGraphic, const String& rPath, SvS
 USHORT GraphicFilter::ExportGraphic( const Graphic& rGraphic, const INetURLObject& rPath,
     sal_uInt16 nFormat, const uno::Sequence< beans::PropertyValue >* pFilterData )
 {
-    sal_uInt16  nRetValue = GRFILTER_FORMATERROR;
+    sal_uInt16	nRetValue = GRFILTER_FORMATERROR;
     DBG_ASSERT( rPath.GetProtocol() != INET_PROT_NOT_VALID, "GraphicFilter::ExportGraphic() : ProtType == INET_PROT_NOT_VALID" );
-    BOOL        bAlreadyExists = ImplDirEntryHelper::Exists( rPath );
+    BOOL		bAlreadyExists = ImplDirEntryHelper::Exists( rPath );
 
-    String      aMainUrl( rPath.GetMainURL( INetURLObject::NO_DECODE ) );
-    SvStream*   pStream = ::utl::UcbStreamHelper::CreateStream( aMainUrl, STREAM_WRITE | STREAM_TRUNC );
+    String		aMainUrl( rPath.GetMainURL( INetURLObject::NO_DECODE ) );
+    SvStream*	pStream = ::utl::UcbStreamHelper::CreateStream( aMainUrl, STREAM_WRITE | STREAM_TRUNC );
     if ( pStream )
     {
         nRetValue = ExportGraphic( rGraphic, aMainUrl, *pStream, nFormat, pFilterData );
@@ -1702,10 +1702,10 @@ USHORT GraphicFilter::ExportGraphic( const Graphic& rGraphic, const String& rPat
     FilterConfigItem aConfigItem( (uno::Sequence< beans::PropertyValue >*)pFilterData );
     String aFilterName( pConfig->GetExportFilterName( nFormat ) );
 
-    bAbort              = FALSE;
-    USHORT      nStatus = GRFILTER_OK;
-    GraphicType eType;
-    Graphic     aGraphic( rGraphic );
+    bAbort				= FALSE;
+    USHORT		nStatus = GRFILTER_OK;
+    GraphicType	eType;
+    Graphic		aGraphic( rGraphic );
 
     aGraphic = ImpGetScaledGraphic( rGraphic, aConfigItem );
     eType = aGraphic.GetType();
@@ -1719,9 +1719,9 @@ USHORT GraphicFilter::ExportGraphic( const Graphic& rGraphic, const String& rPat
             VirtualDevice aVirDev;
 
             // Maximalen Speicherbedarf fuer das Bildes holen:
-//          if( GetOptionsConfig() )
-//              nMaxMem = (UINT32)GetOptionsConfig()->ReadKey( "VEC-TO-PIX-MAX-KB", "1024" ).ToInt32();
-//          else
+//			if( GetOptionsConfig() )
+//				nMaxMem = (UINT32)GetOptionsConfig()->ReadKey( "VEC-TO-PIX-MAX-KB", "1024" ).ToInt32();
+//			else
                 nMaxMem = 1024;
 
             nMaxMem *= 1024; // In Bytes
@@ -1770,7 +1770,7 @@ USHORT GraphicFilter::ExportGraphic( const Graphic& rGraphic, const String& rPat
                     if( !aBmp.Convert( (BmpConversion) nColorRes ) )
                         aBmp = aGraphic.GetBitmap();
                 }
-                ResMgr*     pResMgr = CREATERESMGR( svt );
+                ResMgr*		pResMgr = CREATERESMGR( svt );
                 sal_Bool    bRleCoding = aConfigItem.ReadBool( String( ResId( KEY_RLE_CODING, *pResMgr ) ), sal_True );
                 // Wollen wir RLE-Kodiert speichern?
                 aBmp.Write( rOStm, bRleCoding );
@@ -1784,7 +1784,7 @@ USHORT GraphicFilter::ExportGraphic( const Graphic& rGraphic, const String& rPat
                 sal_Int32 nVersion = aConfigItem.ReadInt32( String( RTL_CONSTASCII_USTRINGPARAM( "Version" ) ), 0 ) ;
                 if ( nVersion )
                     rOStm.SetVersion( nVersion );
-                GDIMetaFile aMTF;
+                GDIMetaFile	aMTF;
 
                 if ( eType != GRAPHIC_BITMAP )
                     aMTF = aGraphic.GetGDIMetaFile();
@@ -1811,9 +1811,9 @@ USHORT GraphicFilter::ExportGraphic( const Graphic& rGraphic, const String& rPat
                 }
                 else
                 {
-                    Bitmap          aBmp( aGraphic.GetBitmap() );
-                    GDIMetaFile     aMTF;
-                    VirtualDevice   aVirDev;
+                    Bitmap			aBmp( aGraphic.GetBitmap() );
+                    GDIMetaFile		aMTF;
+                    VirtualDevice	aVirDev;
 
                     aMTF.Record( &aVirDev );
                     aVirDev.DrawBitmap( Point(), aBmp );
@@ -1835,9 +1835,9 @@ USHORT GraphicFilter::ExportGraphic( const Graphic& rGraphic, const String& rPat
                 }
                 else
                 {
-                    Bitmap          aBmp( aGraphic.GetBitmap() );
-                    GDIMetaFile     aMTF;
-                    VirtualDevice   aVirDev;
+                    Bitmap			aBmp( aGraphic.GetBitmap() );
+                    GDIMetaFile		aMTF;
+                    VirtualDevice	aVirDev;
 
                     aMTF.Record( &aVirDev );
                     aVirDev.DrawBitmap( Point(), aBmp );
@@ -1934,7 +1934,7 @@ USHORT GraphicFilter::ExportGraphic( const Graphic& rGraphic, const String& rPat
 
                             if( xActiveDataSource.is() )
                             {
-                                const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > xStmIf(
+                                const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >	xStmIf(
                                     static_cast< ::cppu::OWeakObject* >( new ImpFilterOutputStream( rOStm ) ) );
 
                                 SvMemoryStream aMemStm( 65535, 65535 );
@@ -2003,7 +2003,7 @@ BOOL GraphicFilter::Setup( USHORT )
 BOOL GraphicFilter::HasImportDialog( USHORT )
 {
     return sal_True;
-//  return pConfig->IsImportDialog( nFormat );
+//	return pConfig->IsImportDialog( nFormat );
 }
 
 // ------------------------------------------------------------------------
@@ -2085,8 +2085,8 @@ IMPL_LINK( GraphicFilter, FilterCallback, ConvertData*, pData )
 
     if( pData )
     {
-        USHORT      nFormat = GRFILTER_FORMAT_DONTKNOW;
-        ByteString  aShortName;
+        USHORT		nFormat = GRFILTER_FORMAT_DONTKNOW;
+        ByteString	aShortName;
         switch( pData->mnFormat )
         {
             case( CVT_BMP ): aShortName = BMP_SHORTNAME; break;
diff --git a/svtools/source/filter.vcl/filter/filter2.cxx b/svtools/source/filter.vcl/filter/filter2.cxx
index 6abab2626516..4a8f3ce2f3fb 100644
--- a/svtools/source/filter.vcl/filter/filter2.cxx
+++ b/svtools/source/filter.vcl/filter/filter2.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
@@ -38,7 +38,7 @@
 #include "FilterConfigCache.hxx"
 #include <unotools/ucbstreamhelper.hxx>
 
-#define DATA_SIZE           640
+#define DATA_SIZE			640
 
 BYTE* ImplSearchEntry( BYTE* , BYTE* , ULONG , ULONG  );
 
@@ -50,7 +50,7 @@ BYTE* ImplSearchEntry( BYTE* , BYTE* , ULONG , ULONG  );
 \************************************************************************/
 
 GraphicDescriptor::GraphicDescriptor( const String* pPath ) :
-    pFileStm        ( NULL )
+    pFileStm		( NULL )
 {
     ImpConstruct();
 
@@ -95,7 +95,7 @@ GraphicDescriptor::GraphicDescriptor( const INetURLObject& rPath ) :
 \************************************************************************/
 
 GraphicDescriptor::GraphicDescriptor( SvStream& rInStream, const String* pPath) :
-    pFileStm    ( NULL )
+    pFileStm	( NULL )
 {
     ImpConstruct();
 
@@ -149,32 +149,32 @@ BOOL GraphicDescriptor::Detect( BOOL bExtendedInfo )
 
     if ( bDataReady )
     {
-        SvStream&   rStm = GetSearchStream();
-        UINT16      nOldFormat = rStm.GetNumberFormatInt();
-
-        if      ( ImpDetectGIF( rStm, bExtendedInfo ) ) bRet = TRUE;
-        else if ( ImpDetectJPG( rStm, bExtendedInfo ) ) bRet = TRUE;
-        else if ( ImpDetectBMP( rStm, bExtendedInfo ) ) bRet = TRUE;
-        else if ( ImpDetectPNG( rStm, bExtendedInfo ) ) bRet = TRUE;
-        else if ( ImpDetectTIF( rStm, bExtendedInfo ) ) bRet = TRUE;
-        else if ( ImpDetectPCX( rStm, bExtendedInfo ) ) bRet = TRUE;
-        else if ( ImpDetectDXF( rStm, bExtendedInfo ) ) bRet = TRUE;
-        else if ( ImpDetectMET( rStm, bExtendedInfo ) ) bRet = TRUE;
-        else if ( ImpDetectSGF( rStm, bExtendedInfo ) ) bRet = TRUE;
-        else if ( ImpDetectSGV( rStm, bExtendedInfo ) ) bRet = TRUE;
-        else if ( ImpDetectSVM( rStm, bExtendedInfo ) ) bRet = TRUE;
-        else if ( ImpDetectWMF( rStm, bExtendedInfo ) ) bRet = TRUE;
-        else if ( ImpDetectEMF( rStm, bExtendedInfo ) ) bRet = TRUE;
-        else if ( ImpDetectPCT( rStm, bExtendedInfo ) ) bRet = TRUE;
-        else if ( ImpDetectXBM( rStm, bExtendedInfo ) ) bRet = TRUE;
-        else if ( ImpDetectXPM( rStm, bExtendedInfo ) ) bRet = TRUE;
-        else if ( ImpDetectPBM( rStm, bExtendedInfo ) ) bRet = TRUE;
-        else if ( ImpDetectPGM( rStm, bExtendedInfo ) ) bRet = TRUE;
-        else if ( ImpDetectPPM( rStm, bExtendedInfo ) ) bRet = TRUE;
-        else if ( ImpDetectRAS( rStm, bExtendedInfo ) ) bRet = TRUE;
-        else if ( ImpDetectTGA( rStm, bExtendedInfo ) ) bRet = TRUE;
-        else if ( ImpDetectPSD( rStm, bExtendedInfo ) ) bRet = TRUE;
-        else if ( ImpDetectEPS( rStm, bExtendedInfo ) ) bRet = TRUE;
+        SvStream&	rStm = GetSearchStream();
+        UINT16		nOldFormat = rStm.GetNumberFormatInt();
+
+        if		( ImpDetectGIF( rStm, bExtendedInfo ) )	bRet = TRUE;
+        else if ( ImpDetectJPG( rStm, bExtendedInfo ) )	bRet = TRUE;
+        else if	( ImpDetectBMP( rStm, bExtendedInfo ) )	bRet = TRUE;
+        else if ( ImpDetectPNG( rStm, bExtendedInfo ) )	bRet = TRUE;
+        else if ( ImpDetectTIF( rStm, bExtendedInfo ) )	bRet = TRUE;
+        else if ( ImpDetectPCX( rStm, bExtendedInfo ) )	bRet = TRUE;
+        else if ( ImpDetectDXF( rStm, bExtendedInfo ) )	bRet = TRUE;
+        else if ( ImpDetectMET( rStm, bExtendedInfo ) )	bRet = TRUE;
+        else if ( ImpDetectSGF( rStm, bExtendedInfo ) )	bRet = TRUE;
+        else if ( ImpDetectSGV( rStm, bExtendedInfo ) )	bRet = TRUE;
+        else if ( ImpDetectSVM( rStm, bExtendedInfo ) )	bRet = TRUE;
+        else if ( ImpDetectWMF( rStm, bExtendedInfo ) )	bRet = TRUE;
+        else if ( ImpDetectEMF( rStm, bExtendedInfo ) )	bRet = TRUE;
+        else if ( ImpDetectPCT( rStm, bExtendedInfo ) )	bRet = TRUE;
+        else if ( ImpDetectXBM( rStm, bExtendedInfo ) )	bRet = TRUE;
+        else if ( ImpDetectXPM( rStm, bExtendedInfo ) )	bRet = TRUE;
+        else if ( ImpDetectPBM( rStm, bExtendedInfo ) )	bRet = TRUE;
+        else if ( ImpDetectPGM( rStm, bExtendedInfo ) )	bRet = TRUE;
+        else if ( ImpDetectPPM( rStm, bExtendedInfo ) )	bRet = TRUE;
+        else if ( ImpDetectRAS( rStm, bExtendedInfo ) )	bRet = TRUE;
+        else if ( ImpDetectTGA( rStm, bExtendedInfo ) )	bRet = TRUE;
+        else if ( ImpDetectPSD( rStm, bExtendedInfo ) )	bRet = TRUE;
+        else if ( ImpDetectEPS( rStm, bExtendedInfo ) )	bRet = TRUE;
 
         // diese Formate lassen sich nur bei WideSearch im gesamten
         // Stream ermitteln
@@ -261,8 +261,8 @@ ULONG GraphicDescriptor::GetRequestedByteCount() const
 
 
 /******************************************************************************/
-/*                               IMP-Methoden                                 */
-/*                                                                            */
+/*								 IMP-Methoden								  */
+/*																			  */
 
 
 /*************************************************************************
@@ -295,8 +295,8 @@ void GraphicDescriptor::ImpConstruct()
 
 BOOL GraphicDescriptor::ImpDetectBMP( SvStream& rStm, BOOL bExtendedInfo )
 {
-    UINT16  nTemp16;
-    BOOL    bRet = FALSE;
+    UINT16	nTemp16;
+    BOOL	bRet = FALSE;
 
     rStm.SetNumberFormatInt( NUMBERFORMAT_INT_LITTLEENDIAN );
     rStm.Seek( nStmPos );
@@ -318,8 +318,8 @@ BOOL GraphicDescriptor::ImpDetectBMP( SvStream& rStm, BOOL bExtendedInfo )
 
         if ( bExtendedInfo )
         {
-            UINT32  nTemp32;
-            UINT32  nCompression;
+            UINT32	nTemp32;
+            UINT32	nCompression;
 
             // bis zur ersten Information
             rStm.SeekRel( 0x10 );
@@ -377,10 +377,10 @@ BOOL GraphicDescriptor::ImpDetectBMP( SvStream& rStm, BOOL bExtendedInfo )
 
 BOOL GraphicDescriptor::ImpDetectGIF( SvStream& rStm, BOOL bExtendedInfo )
 {
-    UINT32  n32;
-    UINT16  n16;
-    BOOL    bRet = FALSE;
-    BYTE    cByte;
+    UINT32	n32;
+    UINT16	n16;
+    BOOL	bRet = FALSE;
+    BYTE	cByte;
 
     rStm.SetNumberFormatInt( NUMBERFORMAT_INT_LITTLEENDIAN );
     rStm.Seek( nStmPos );
@@ -425,10 +425,10 @@ BOOL GraphicDescriptor::ImpDetectGIF( SvStream& rStm, BOOL bExtendedInfo )
 
 BOOL GraphicDescriptor::ImpDetectJPG( SvStream& rStm,  BOOL bExtendedInfo )
 {
-    UINT32  nTemp32;
-    BOOL    bRet = FALSE;
-    BYTE    cByte = 0;
-    BOOL    bM_COM;
+    UINT32	nTemp32;
+    BOOL	bRet = FALSE;
+    BYTE	cByte = 0;
+    BOOL	bM_COM;
 
     rStm.SetNumberFormatInt( NUMBERFORMAT_INT_BIGENDIAN );
     rStm.Seek( nStmPos );
@@ -459,12 +459,12 @@ BOOL GraphicDescriptor::ImpDetectJPG( SvStream& rStm,  BOOL bExtendedInfo )
             if( bExtendedInfo )
             {
                 MapMode aMap;
-                UINT16  nTemp16;
-                ULONG   nCount = 9;
-                ULONG   nMax;
-                ULONG   nResX;
-                ULONG   nResY;
-                BYTE    cUnit;
+                UINT16	nTemp16;
+                ULONG	nCount = 9;
+                ULONG	nMax;
+                ULONG	nResX;
+                ULONG	nResY;
+                BYTE	cUnit;
 
                 // Groesse des verbleibenden Puffers ermitteln
                 if ( bLinked )
@@ -554,16 +554,16 @@ BOOL GraphicDescriptor::ImpDetectJPG( SvStream& rStm,  BOOL bExtendedInfo )
 
 BOOL GraphicDescriptor::ImpDetectPCD( SvStream& rStm, BOOL )
 {
-    BOOL    bRet = FALSE;
+    BOOL	bRet = FALSE;
 
     rStm.SetNumberFormatInt( NUMBERFORMAT_INT_LITTLEENDIAN );
     rStm.Seek( nStmPos );
 
     if ( bWideSearch )
     {
-        UINT32  nTemp32;
-        UINT16  nTemp16;
-        BYTE    cByte;
+        UINT32	nTemp32;
+        UINT16	nTemp16;
+        BYTE	cByte;
 
         rStm.SeekRel( 2048 );
         rStm >> nTemp32;
@@ -605,8 +605,8 @@ BOOL GraphicDescriptor::ImpDetectPCX( SvStream& rStm, BOOL bExtendedInfo )
     // We must detect the whole header.
     bExtendedInfo = TRUE;
 
-    BOOL    bRet = FALSE;
-    BYTE    cByte;
+    BOOL	bRet = FALSE;
+    BYTE	cByte;
 
     rStm.SetNumberFormatInt( NUMBERFORMAT_INT_LITTLEENDIAN );
     rStm.Seek( nStmPos );
@@ -619,13 +619,13 @@ BOOL GraphicDescriptor::ImpDetectPCX( SvStream& rStm, BOOL bExtendedInfo )
 
         if ( bExtendedInfo )
         {
-            UINT16  nTemp16;
-            USHORT  nXmin;
-            USHORT  nXmax;
-            USHORT  nYmin;
-            USHORT  nYmax;
-            USHORT  nDPIx;
-            USHORT  nDPIy;
+            UINT16	nTemp16;
+            USHORT	nXmin;
+            USHORT	nXmax;
+            USHORT	nYmin;
+            USHORT	nYmax;
+            USHORT	nDPIx;
+            USHORT	nDPIy;
 
 
             rStm.SeekRel( 1 );
@@ -660,7 +660,7 @@ BOOL GraphicDescriptor::ImpDetectPCX( SvStream& rStm, BOOL bExtendedInfo )
             nDPIy = nTemp16;
 
             // logische Groesse setzen
-            MapMode aMap( MAP_INCH, Point(),
+            MapMode	aMap( MAP_INCH, Point(),
                           Fraction( 1, nDPIx ), Fraction( 1, nDPIy ) );
             aLogSize = OutputDevice::LogicToLogic( aPixSize, aMap,
                                                    MapMode( MAP_100TH_MM ) );
@@ -687,8 +687,8 @@ BOOL GraphicDescriptor::ImpDetectPCX( SvStream& rStm, BOOL bExtendedInfo )
 
 BOOL GraphicDescriptor::ImpDetectPNG( SvStream& rStm, BOOL bExtendedInfo )
 {
-    UINT32  nTemp32;
-    BOOL    bRet = FALSE;
+    UINT32	nTemp32;
+    BOOL	bRet = FALSE;
 
     rStm.SetNumberFormatInt( NUMBERFORMAT_INT_BIGENDIAN );
     rStm.Seek( nStmPos );
@@ -728,7 +728,7 @@ BOOL GraphicDescriptor::ImpDetectPNG( SvStream& rStm, BOOL bExtendedInfo )
 
                 if ( bWideSearch )
                 {
-                    UINT32  nLen32;
+                    UINT32	nLen32;
 
                     rStm.SeekRel( 8 );
 
@@ -745,8 +745,8 @@ BOOL GraphicDescriptor::ImpDetectPNG( SvStream& rStm, BOOL bExtendedInfo )
 
                     if ( nTemp32 == 0x70485973 )
                     {
-                        ULONG   nXRes;
-                        ULONG   nYRes;
+                        ULONG	nXRes;
+                        ULONG	nYRes;
 
                         // horizontale Aufloesung
                         rStm >> nTemp32;
@@ -787,10 +787,10 @@ BOOL GraphicDescriptor::ImpDetectPNG( SvStream& rStm, BOOL bExtendedInfo )
 
 BOOL GraphicDescriptor::ImpDetectTIF( SvStream& rStm, BOOL bExtendedInfo )
 {
-    BOOL    bDetectOk = FALSE;
-    BOOL    bRet = FALSE;
-    BYTE    cByte1;
-    BYTE    cByte2;
+    BOOL	bDetectOk = FALSE;
+    BOOL	bRet = FALSE;
+    BYTE	cByte1;
+    BYTE	cByte2;
 
     rStm.Seek( nStmPos );
     rStm >> cByte1;
@@ -810,7 +810,7 @@ BOOL GraphicDescriptor::ImpDetectTIF( SvStream& rStm, BOOL bExtendedInfo )
 
         if ( bDetectOk )
         {
-            UINT16  nTemp16;
+            UINT16	nTemp16;
 
             rStm >> nTemp16;
             if ( nTemp16 == 0x2a )
@@ -820,10 +820,10 @@ BOOL GraphicDescriptor::ImpDetectTIF( SvStream& rStm, BOOL bExtendedInfo )
 
                 if ( bExtendedInfo )
                 {
-                    ULONG   nCount;
-                    ULONG   nMax = DATA_SIZE - 48;
-                    UINT32  nTemp32;
-                    BOOL    bOk = FALSE;
+                    ULONG	nCount;
+                    ULONG	nMax = DATA_SIZE - 48;
+                    UINT32	nTemp32;
+                    BOOL	bOk = FALSE;
 
                     // Offset des ersten IFD einlesen
                     rStm >> nTemp32;
@@ -965,7 +965,7 @@ BOOL GraphicDescriptor::ImpDetectPBM( SvStream& rStm, BOOL )
         bRet = TRUE;
     else
     {
-        BYTE    nFirst, nSecond;
+        BYTE	nFirst, nSecond;
         rStm.Seek( nStmPos );
         rStm >> nFirst >> nSecond;
         if ( nFirst == 'P' && ( ( nSecond == '1' ) || ( nSecond == '4' ) ) )
@@ -992,7 +992,7 @@ BOOL GraphicDescriptor::ImpDetectPGM( SvStream& rStm, BOOL )
         bRet = TRUE;
     else
     {
-        BYTE    nFirst, nSecond;
+        BYTE	nFirst, nSecond;
         rStm.Seek( nStmPos );
         rStm >> nFirst >> nSecond;
         if ( nFirst == 'P' && ( ( nSecond == '2' ) || ( nSecond == '5' ) ) )
@@ -1019,7 +1019,7 @@ BOOL GraphicDescriptor::ImpDetectPPM( SvStream& rStm, BOOL )
         bRet = TRUE;
     else
     {
-        BYTE    nFirst, nSecond;
+        BYTE	nFirst, nSecond;
         rStm.Seek( nStmPos );
         rStm >> nFirst >> nSecond;
         if ( nFirst == 'P' && ( ( nSecond == '3' ) || ( nSecond == '6' ) ) )
@@ -1078,7 +1078,7 @@ BOOL GraphicDescriptor::ImpDetectPSD( SvStream& rStm, BOOL bExtendedInfo )
 {
     BOOL bRet = FALSE;
 
-    UINT32  nMagicNumber;
+    UINT32	nMagicNumber;
     rStm.Seek( nStmPos );
     rStm.SetNumberFormatInt( NUMBERFORMAT_INT_BIGENDIAN );
     rStm >> nMagicNumber;
@@ -1096,7 +1096,7 @@ BOOL GraphicDescriptor::ImpDetectPSD( SvStream& rStm, BOOL bExtendedInfo )
                 UINT32 nColumns;
                 UINT16 nDepth;
                 UINT16 nMode;
-                rStm.SeekRel( 6 );  // Pad
+                rStm.SeekRel( 6 );	// Pad
                 rStm >> nChannels >> nRows >> nColumns >> nDepth >> nMode;
                 if ( ( nDepth == 1 ) || ( nDepth == 8 ) || ( nDepth == 16 ) )
                 {
@@ -1137,8 +1137,8 @@ BOOL GraphicDescriptor::ImpDetectEPS( SvStream& rStm, BOOL )
     // es wird die EPS mit Vorschaubild Variante und die Extensionuebereinstimmung
     // geprueft
 
-    sal_uInt32  nFirstLong;
-    sal_uInt8   nFirstBytes[20];
+    sal_uInt32	nFirstLong;
+    sal_uInt8	nFirstBytes[20];
 
     rStm.Seek( nStmPos );
     rStm.SetNumberFormatInt( NUMBERFORMAT_INT_BIGENDIAN );
@@ -1275,9 +1275,9 @@ BOOL GraphicDescriptor::ImpDetectSGV( SvStream&, BOOL )
 
 BOOL GraphicDescriptor::ImpDetectSVM( SvStream& rStm, BOOL bExtendedInfo )
 {
-    UINT32  n32;
-    BOOL    bRet = FALSE;
-    BYTE    cByte;
+    UINT32	n32;
+    BOOL	bRet = FALSE;
+    BYTE	cByte;
 
     rStm.SetNumberFormatInt( NUMBERFORMAT_INT_LITTLEENDIAN );
     rStm.Seek( nStmPos );
@@ -1293,8 +1293,8 @@ BOOL GraphicDescriptor::ImpDetectSVM( SvStream& rStm, BOOL bExtendedInfo )
 
             if ( bExtendedInfo )
             {
-                UINT32  nTemp32;
-                UINT16  nTemp16;
+                UINT32	nTemp32;
+                UINT16	nTemp16;
 
                 rStm.SeekRel( 0x04 );
 
@@ -1385,34 +1385,34 @@ BOOL GraphicDescriptor::ImpDetectEMF( SvStream&, BOOL )
 
 String GraphicDescriptor::GetImportFormatShortName( sal_uInt16 nFormat )
 {
-    ByteString          aKeyName;
+    ByteString			aKeyName;
 
     switch( nFormat )
     {
-        case( GFF_BMP ) :   aKeyName = "bmp";   break;
-        case( GFF_GIF ) :   aKeyName = "gif";   break;
-        case( GFF_JPG ) :   aKeyName = "jpg";   break;
-        case( GFF_PCD ) :   aKeyName = "pcd";   break;
-        case( GFF_PCX ) :   aKeyName = "pcx";   break;
-        case( GFF_PNG ) :   aKeyName = "png";   break;
-        case( GFF_XBM ) :   aKeyName = "xbm";   break;
-        case( GFF_XPM ) :   aKeyName = "xpm";   break;
-        case( GFF_PBM ) :   aKeyName = "pbm";   break;
-        case( GFF_PGM ) :   aKeyName = "pgm";   break;
-        case( GFF_PPM ) :   aKeyName = "ppm";   break;
-        case( GFF_RAS ) :   aKeyName = "ras";   break;
-        case( GFF_TGA ) :   aKeyName = "tga";   break;
-        case( GFF_PSD ) :   aKeyName = "psd";   break;
-        case( GFF_EPS ) :   aKeyName = "eps";   break;
-        case( GFF_TIF ) :   aKeyName = "tif";   break;
-        case( GFF_DXF ) :   aKeyName = "dxf";   break;
-        case( GFF_MET ) :   aKeyName = "met";   break;
-        case( GFF_PCT ) :   aKeyName = "pct";   break;
-        case( GFF_SGF ) :   aKeyName = "sgf";   break;
-        case( GFF_SGV ) :   aKeyName = "sgv";   break;
-        case( GFF_SVM ) :   aKeyName = "svm";   break;
-        case( GFF_WMF ) :   aKeyName = "wmf";   break;
-        case( GFF_EMF ) :   aKeyName = "emf";   break;
+        case( GFF_BMP ) :	aKeyName = "bmp";	break;
+        case( GFF_GIF ) :	aKeyName = "gif";	break;
+        case( GFF_JPG ) :	aKeyName = "jpg";	break;
+        case( GFF_PCD ) :	aKeyName = "pcd";	break;
+        case( GFF_PCX ) :	aKeyName = "pcx";	break;
+        case( GFF_PNG ) :	aKeyName = "png";	break;
+        case( GFF_XBM ) :	aKeyName = "xbm";	break;
+        case( GFF_XPM ) :	aKeyName = "xpm";	break;
+        case( GFF_PBM ) :	aKeyName = "pbm";	break;
+        case( GFF_PGM ) :	aKeyName = "pgm";	break;
+        case( GFF_PPM ) :	aKeyName = "ppm";	break;
+        case( GFF_RAS ) :	aKeyName = "ras";	break;
+        case( GFF_TGA ) :	aKeyName = "tga";	break;
+        case( GFF_PSD ) :	aKeyName = "psd";	break;
+        case( GFF_EPS ) :	aKeyName = "eps";	break;
+        case( GFF_TIF ) :	aKeyName = "tif";	break;
+        case( GFF_DXF ) :	aKeyName = "dxf";	break;
+        case( GFF_MET ) :	aKeyName = "met";	break;
+        case( GFF_PCT ) :	aKeyName = "pct";	break;
+        case( GFF_SGF ) :	aKeyName = "sgf";	break;
+        case( GFF_SGV ) :	aKeyName = "sgv";	break;
+        case( GFF_SVM ) :	aKeyName = "svm";	break;
+        case( GFF_WMF ) :	aKeyName = "wmf";	break;
+        case( GFF_EMF ) :	aKeyName = "emf";	break;
     }
 
     return String( aKeyName, RTL_TEXTENCODING_ASCII_US );
diff --git a/svtools/source/filter.vcl/filter/fldll.cxx b/svtools/source/filter.vcl/filter/fldll.cxx
index b44e08835f34..74e61371984f 100644
--- a/svtools/source/filter.vcl/filter/fldll.cxx
+++ b/svtools/source/filter.vcl/filter/fldll.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
diff --git a/svtools/source/filter.vcl/filter/gradwrap.cxx b/svtools/source/filter.vcl/filter/gradwrap.cxx
index be5dade03313..4b9f1a73a865 100644
--- a/svtools/source/filter.vcl/filter/gradwrap.cxx
+++ b/svtools/source/filter.vcl/filter/gradwrap.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
@@ -40,8 +40,8 @@
 GradientWrapper::GradientWrapper(const Link& rDrawPolyRecordHdl,
                                  const Link& rDrawPolyPolyRecordHdl,
                                  const Link& rSetFillInBrushRecordHdl) :
-            aDrawPolyRecordHdl      (rDrawPolyRecordHdl),
-            aDrawPolyPolyRecordHdl  (rDrawPolyPolyRecordHdl),
+            aDrawPolyRecordHdl		(rDrawPolyRecordHdl),
+            aDrawPolyPolyRecordHdl	(rDrawPolyPolyRecordHdl),
             aSetFillInBrushRecordHdl(rSetFillInBrushRecordHdl)
 {
 }
@@ -265,7 +265,7 @@ void GradientWrapper::WriteLinearGradient(const Rectangle& rRect,
 void GradientWrapper::WriteRadialGradient(const Rectangle& rRect,
                                           const Gradient& rGradient)
 {
-    USHORT      nStepCount = 100;
+    USHORT  	nStepCount = 100;
     Rectangle   aClipRect = rRect;
     Rectangle   aRect   = rRect;
     long        nZWidth = aRect.GetWidth() * (long)rGradient.GetOfsX() / 100;
@@ -411,9 +411,9 @@ void GradientWrapper::WriteRadialGradient(const Rectangle& rRect,
 void GradientWrapper::WriteRectGradient(const Rectangle& rRect,
                                         const Gradient& rGradient)
 {
-    USHORT      nStepCount = 100;
+    USHORT  	nStepCount = 100;
     Rectangle   aClipRect = rRect;
-    Rectangle   aRect = rRect;
+    Rectangle 	aRect = rRect;
 
     aRect.Left()--;
     aRect.Top()--;
diff --git a/svtools/source/filter.vcl/filter/sgfbram.cxx b/svtools/source/filter.vcl/filter/sgfbram.cxx
index 43cf0fbbacd3..613d6a801640 100644
--- a/svtools/source/filter.vcl/filter/sgfbram.cxx
+++ b/svtools/source/filter.vcl/filter/sgfbram.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
diff --git a/svtools/source/filter.vcl/filter/sgvmain.cxx b/svtools/source/filter.vcl/filter/sgvmain.cxx
index e175380244b3..96caf66182da 100644
--- a/svtools/source/filter.vcl/filter/sgvmain.cxx
+++ b/svtools/source/filter.vcl/filter/sgvmain.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
@@ -812,12 +812,12 @@ void CircType::Draw(OutputDevice& rOut)
 void BmapType::Draw(OutputDevice& rOut)
 {
     //ifstream aInp;
-    unsigned char   nSgfTyp;
-    USHORT          nVersion;
-    String          aStr(
+    unsigned char	nSgfTyp;
+    USHORT			nVersion;
+    String			aStr(
         reinterpret_cast< char const * >(&Filename[ 1 ]),
         (xub_StrLen)Filename[ 0 ], RTL_TEXTENCODING_UTF8 );
-    INetURLObject   aFNam( aStr );
+    INetURLObject	aFNam( aStr );
 
     SvStream* pInp = ::utl::UcbStreamHelper::CreateStream( aFNam.GetMainURL( INetURLObject::NO_DECODE ), STREAM_READ );
     if ( pInp )
@@ -1068,7 +1068,7 @@ BOOL SgfSDrwFilter(SvStream& rInp, GDIMetaFile& rMtf, INetURLObject aIniPath )
     BOOL      bRet=FALSE;            // Returncode
 
     aIniPath.Append( String::CreateFromAscii( "sgf.ini", 7 ) );
-//  aIniPath.ToAbs();
+//	aIniPath.ToAbs();
 
     pSgfFonts = new SgfFontLst;
 
diff --git a/svtools/source/filter.vcl/filter/sgvspln.cxx b/svtools/source/filter.vcl/filter/sgvspln.cxx
index 7a23e85f4dbe..daf65dd8e6d6 100644
--- a/svtools/source/filter.vcl/filter/sgvspln.cxx
+++ b/svtools/source/filter.vcl/filter/sgvspln.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
diff --git a/svtools/source/filter.vcl/filter/sgvtext.cxx b/svtools/source/filter.vcl/filter/sgvtext.cxx
index 4a0be80b55be..cb86fca40198 100644
--- a/svtools/source/filter.vcl/filter/sgvtext.cxx
+++ b/svtools/source/filter.vcl/filter/sgvtext.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
diff --git a/svtools/source/filter.vcl/filter/strings.hrc b/svtools/source/filter.vcl/filter/strings.hrc
index 0eea67fb2338..b4029f513830 100644
--- a/svtools/source/filter.vcl/filter/strings.hrc
+++ b/svtools/source/filter.vcl/filter/strings.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
diff --git a/svtools/source/filter.vcl/filter/strings.src b/svtools/source/filter.vcl/filter/strings.src
index 60e628ee0b5c..060570430021 100644
--- a/svtools/source/filter.vcl/filter/strings.src
+++ b/svtools/source/filter.vcl/filter/strings.src
@@ -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
diff --git a/svtools/source/filter.vcl/igif/decode.cxx b/svtools/source/filter.vcl/igif/decode.cxx
index bfe77319b81a..99c95408d3a6 100644
--- a/svtools/source/filter.vcl/igif/decode.cxx
+++ b/svtools/source/filter.vcl/igif/decode.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
@@ -34,21 +34,21 @@
 
 struct GIFLZWTableEntry
 {
-    GIFLZWTableEntry*   pPrev;
-    GIFLZWTableEntry*   pFirst;
-    BYTE                nData;
+    GIFLZWTableEntry*	pPrev;
+    GIFLZWTableEntry*	pFirst;
+    BYTE				nData;
 };
 
 // ------------------------------------------------------------------------
 
 GIFLZWDecompressor::GIFLZWDecompressor( BYTE cDataSize ) :
-            nInputBitsBuf       ( 0 ),
-            nOutBufDataLen      ( 0 ),
-            nInputBitsBufSize   ( 0 ),
-            bEOIFound           ( FALSE ),
-            nDataSize           ( cDataSize )
+            nInputBitsBuf		( 0 ),
+            nOutBufDataLen		( 0 ),
+            nInputBitsBufSize	( 0 ),
+            bEOIFound			( FALSE ),
+            nDataSize			( cDataSize )
 {
-    pOutBuf = new BYTE[ 4096 ];
+    pOutBuf	= new BYTE[ 4096 ];
 
     nClearCode = 1 << nDataSize;
     nEOICode = nClearCode + 1;
@@ -80,10 +80,10 @@ GIFLZWDecompressor::~GIFLZWDecompressor()
 HPBYTE GIFLZWDecompressor::DecompressBlock( HPBYTE pSrc, BYTE cBufSize,
                                             ULONG& rCount, BOOL& rEOI )
 {
-    ULONG   nTargetSize = 4096;
-    ULONG   nCount = 0;
-    HPBYTE  pTarget = (HPBYTE) rtl_allocateMemory( nTargetSize );
-    HPBYTE  pTmpTarget = pTarget;
+    ULONG	nTargetSize = 4096;
+    ULONG	nCount = 0;
+    HPBYTE	pTarget = (HPBYTE) rtl_allocateMemory( nTargetSize );
+    HPBYTE	pTmpTarget = pTarget;
 
     nBlockBufSize = cBufSize;
     nBlockBufPos = 0;
@@ -95,9 +95,9 @@ HPBYTE GIFLZWDecompressor::DecompressBlock( HPBYTE pSrc, BYTE cBufSize,
 
         if( nCount > nTargetSize )
         {
-            ULONG   nNewSize = nTargetSize << 1;
-            ULONG   nOffset = pTmpTarget - pTarget;
-            HPBYTE  pTmp = (HPBYTE) rtl_allocateMemory( nNewSize );
+            ULONG	nNewSize = nTargetSize << 1;
+            ULONG	nOffset = pTmpTarget - pTarget;
+            HPBYTE	pTmp = (HPBYTE) rtl_allocateMemory( nNewSize );
 
             memcpy( pTmp, pTarget, nTargetSize );
             rtl_freeMemory( pTarget );
@@ -144,10 +144,10 @@ void GIFLZWDecompressor::AddToTable( USHORT nPrevCode, USHORT nCodeFirstData )
 
 BOOL GIFLZWDecompressor::ProcessOneCode()
 {
-    GIFLZWTableEntry*   pE;
-    USHORT              nCode;
-    BOOL                bRet = FALSE;
-    BOOL                bEndOfBlock = FALSE;
+    GIFLZWTableEntry*	pE;
+    USHORT				nCode;
+    BOOL				bRet = FALSE;
+    BOOL				bEndOfBlock = FALSE;
 
     while( nInputBitsBufSize < nCodeSize )
     {
diff --git a/svtools/source/filter.vcl/igif/decode.hxx b/svtools/source/filter.vcl/igif/decode.hxx
index 3c6a61e7508d..739e7ae64d8f 100644
--- a/svtools/source/filter.vcl/igif/decode.hxx
+++ b/svtools/source/filter.vcl/igif/decode.hxx
@@ -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
@@ -36,25 +36,25 @@ struct GIFLZWTableEntry;
 
 class GIFLZWDecompressor
 {
-    GIFLZWTableEntry*   pTable;
-    HPBYTE              pOutBuf;
-    HPBYTE              pOutBufData;
-    HPBYTE              pBlockBuf;
-    ULONG               nInputBitsBuf;
-    USHORT              nTableSize;
-    USHORT              nClearCode;
-    USHORT              nEOICode;
-    USHORT              nCodeSize;
-    USHORT              nOldCode;
-    USHORT              nOutBufDataLen;
-    USHORT              nInputBitsBufSize;
-    BOOL                bEOIFound;
-    BYTE                nDataSize;
-    BYTE                nBlockBufSize;
-    BYTE                nBlockBufPos;
+    GIFLZWTableEntry*	pTable;
+    HPBYTE				pOutBuf;
+    HPBYTE				pOutBufData;
+    HPBYTE				pBlockBuf;
+    ULONG				nInputBitsBuf;
+    USHORT				nTableSize;
+    USHORT				nClearCode;
+    USHORT				nEOICode;
+    USHORT				nCodeSize;
+    USHORT				nOldCode;
+    USHORT				nOutBufDataLen;
+    USHORT				nInputBitsBufSize;
+    BOOL				bEOIFound;
+    BYTE				nDataSize;
+    BYTE				nBlockBufSize;
+    BYTE				nBlockBufPos;
 
-    void                AddToTable(USHORT nPrevCode, USHORT nCodeFirstData);
-    BOOL                ProcessOneCode();
+    void				AddToTable(USHORT nPrevCode, USHORT nCodeFirstData);
+    BOOL				ProcessOneCode();
 
 
 public:
@@ -62,7 +62,7 @@ public:
                         GIFLZWDecompressor( BYTE cDataSize );
                         ~GIFLZWDecompressor();
 
-    HPBYTE              DecompressBlock( HPBYTE pSrc, BYTE cBufSize, ULONG& rCount, BOOL& rEOI );
+    HPBYTE				DecompressBlock( HPBYTE pSrc, BYTE cBufSize, ULONG& rCount, BOOL& rEOI );
 };
 
 #endif
diff --git a/svtools/source/filter.vcl/igif/gifread.cxx b/svtools/source/filter.vcl/igif/gifread.cxx
index e4020c727ff4..a6babd6dff25 100644
--- a/svtools/source/filter.vcl/igif/gifread.cxx
+++ b/svtools/source/filter.vcl/igif/gifread.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
@@ -44,18 +44,18 @@
 // -------------
 
 GIFReader::GIFReader( SvStream& rStm ) :
-            aGPalette       ( 256 ),
-            aLPalette       ( 256 ),
-            rIStm           ( rStm ),
-            pAcc8           ( NULL ),
-            pAcc1           ( NULL ),
-            nLastPos        ( rStm.Tell() ),
-            nLogWidth100    ( 0UL ),
-            nLogHeight100   ( 0UL ),
-            nLoops          ( 1 ),
-            eActAction      ( GLOBAL_HEADER_READING ),
-            bGCTransparent  ( FALSE ),
-            bImGraphicReady ( FALSE )
+            aGPalette		( 256 ),
+            aLPalette		( 256 ),
+            rIStm			( rStm ),
+            pAcc8			( NULL ),
+            pAcc1			( NULL ),
+            nLastPos		( rStm.Tell() ),
+            nLogWidth100	( 0UL ),
+            nLogHeight100	( 0UL ),
+            nLoops			( 1 ),
+            eActAction		( GLOBAL_HEADER_READING ),
+            bGCTransparent	( FALSE ),
+            bImGraphicReady	( FALSE )
 {
     maUpperName = UniString::CreateFromAscii( "SVIGIF", 6 );
     pSrcBuf = new BYTE[ 256 ];
@@ -133,10 +133,10 @@ BOOL GIFReader::CreateBitmaps( long nWidth, long nHeight, BitmapPalette* pPal,
 
 BOOL GIFReader::ReadGlobalHeader()
 {
-    char    pBuf[ 7 ];
-    BYTE    nRF;
-    BYTE    nAspect;
-    BOOL    bRet = FALSE;
+    char	pBuf[ 7 ];
+    BYTE	nRF;
+    BYTE	nAspect;
+    BOOL	bRet = FALSE;
 
     rIStm.Read( pBuf, 6 );
     if( NO_PENDING( rIStm ) )
@@ -178,8 +178,8 @@ BOOL GIFReader::ReadGlobalHeader()
 
 void GIFReader::ReadPaletteEntries( BitmapPalette* pPal, ULONG nCount )
 {
-    const ULONG nLen = 3UL * nCount;
-    BYTE*       pBuf = new BYTE[ nLen ];
+    const ULONG	nLen = 3UL * nCount;
+    BYTE*		pBuf = new BYTE[ nLen ];
 
     rIStm.Read( pBuf, nLen );
     if( NO_PENDING( rIStm ) )
@@ -212,11 +212,11 @@ void GIFReader::ReadPaletteEntries( BitmapPalette* pPal, ULONG nCount )
 
 BOOL GIFReader::ReadExtension()
 {
-    BYTE    cFunction;
-    BYTE    cSize;
-    BYTE    cByte;
-    BOOL    bRet = FALSE;
-    BOOL    bOverreadDataBlocks = FALSE;
+    BYTE	cFunction;
+    BYTE	cSize;
+    BYTE	cByte;
+    BOOL	bRet = FALSE;
+    BOOL	bOverreadDataBlocks = FALSE;
 
     // Extension-Label
     rIStm >> cFunction;
@@ -258,8 +258,8 @@ BOOL GIFReader::ReadExtension()
                     // Appl.-Extension hat Laenge 11
                     if ( cSize == 0x0b )
                     {
-                        ByteString  aAppId;
-                        ByteString  aAppCode;
+                        ByteString	aAppId;
+                        ByteString	aAppCode;
 
                         rIStm.Read( aAppId.AllocBuffer( 8 ), 8 );
                         rIStm.Read( aAppCode.AllocBuffer( 3 ), 3 );
@@ -327,8 +327,8 @@ BOOL GIFReader::ReadExtension()
             bRet = TRUE;
             while( cSize && bStatus && !rIStm.IsEof() )
             {
-                USHORT  nCount = (USHORT) cSize + 1;
-                char*   pBuffer = new char[ nCount ];
+                USHORT	nCount = (USHORT) cSize + 1;
+                char*	pBuffer = new char[ nCount ];
 
                 bRet = FALSE;
                 rIStm.Read( pBuffer, nCount );
@@ -352,15 +352,15 @@ BOOL GIFReader::ReadExtension()
 
 BOOL GIFReader::ReadLocalHeader()
 {
-    BYTE    pBuf[ 9 ];
-    BOOL    bRet = FALSE;
+    BYTE	pBuf[ 9 ];
+    BOOL	bRet = FALSE;
 
     rIStm.Read( pBuf, 9 );
     if( NO_PENDING( rIStm ) )
     {
-        SvMemoryStream  aMemStm;
-        BitmapPalette*  pPal;
-        BYTE            nFlags;
+        SvMemoryStream	aMemStm;
+        BitmapPalette*	pPal;
+        BYTE			nFlags;
 
         aMemStm.SetBuffer( (char*) pBuf, 9, FALSE, 9 );
         aMemStm >> nImagePosX;
@@ -401,9 +401,9 @@ BOOL GIFReader::ReadLocalHeader()
 
 ULONG GIFReader::ReadNextBlock()
 {
-    ULONG   nRet = 0UL;
-    ULONG   nRead;
-    BYTE    cBlockSize;
+    ULONG	nRet = 0UL;
+    ULONG	nRead;
+    BYTE	cBlockSize;
 
     rIStm >> cBlockSize;
 
@@ -423,8 +423,8 @@ ULONG GIFReader::ReadNextBlock()
                     nRet = 3UL;
                 else
                 {
-                    BOOL    bEOI;
-                    HPBYTE  pTarget = pDecomp->DecompressBlock( pSrcBuf, cBlockSize, nRead, bEOI );
+                    BOOL	bEOI;
+                    HPBYTE	pTarget = pDecomp->DecompressBlock( pSrcBuf, cBlockSize, nRead, bEOI );
 
                     nRet = ( bEOI ? 3 : 1 );
 
@@ -462,10 +462,10 @@ void GIFReader::FillImages( HPBYTE pBytes, ULONG nCount )
                     // nicht zusanmmenfallen ( kommt vorm wenn wir am Ende des Bildes sind )
                     if( ( nMinY > nLastImageY ) && ( nLastImageY < ( nImageHeight - 1 ) ) )
                     {
-                        HPBYTE  pScanline8 = pAcc8->GetScanline( nYAcc );
-                        ULONG   nSize8 = pAcc8->GetScanlineSize();
-                        HPBYTE  pScanline1 = 0;
-                        ULONG   nSize1 = 0;
+                        HPBYTE	pScanline8 = pAcc8->GetScanline( nYAcc );
+                        ULONG	nSize8 = pAcc8->GetScanlineSize();
+                        HPBYTE	pScanline1 = 0;
+                        ULONG	nSize1 = 0;
 
                         if( bGCTransparent )
                         {
@@ -549,7 +549,7 @@ void GIFReader::FillImages( HPBYTE pBytes, ULONG nCount )
 
 void GIFReader::CreateNewBitmaps()
 {
-    AnimationBitmap aAnimBmp;
+    AnimationBitmap	aAnimBmp;
 
     aBmp8.ReleaseAccess( pAcc8 );
     pAcc8 = NULL;
@@ -593,7 +593,7 @@ const Graphic& GIFReader::GetIntermediateGraphic()
     // vollstaendig eingelesen wurde
     if ( bImGraphicReady && !aAnimation.Count() )
     {
-        Bitmap  aBmp;
+        Bitmap	aBmp;
 
         aBmp8.ReleaseAccess( pAcc8 );
 
@@ -714,9 +714,9 @@ BOOL GIFReader::ProcessGIF()
         // naechsten Datenblock lesen
         case( NEXT_BLOCK_READING ):
         {
-            USHORT  nLastX = nImageX;
-            USHORT  nLastY = nImageY;
-            ULONG   nRet = ReadNextBlock();
+            USHORT	nLastX = nImageX;
+            USHORT	nLastY = nImageY;
+            ULONG	nRet = ReadNextBlock();
 
             // Return: 0:Pending / 1:OK; / 2:OK und letzter Block: / 3:EOI / 4:HardAbort
             if( nRet )
@@ -826,10 +826,10 @@ ReadState GIFReader::ReadGIF( Graphic& rGraphic )
 
 BOOL ImportGIF( SvStream & rStm, Graphic& rGraphic )
 {
-    GIFReader*  pGIFReader = (GIFReader*) rGraphic.GetContext();
-    USHORT      nOldFormat = rStm.GetNumberFormatInt();
-    ReadState   eReadState;
-    BOOL        bRet = TRUE;
+    GIFReader*	pGIFReader = (GIFReader*) rGraphic.GetContext();
+    USHORT		nOldFormat = rStm.GetNumberFormatInt();
+    ReadState	eReadState;
+    BOOL		bRet = TRUE;
 
     rStm.SetNumberFormatInt( NUMBERFORMAT_INT_LITTLEENDIAN );
 
diff --git a/svtools/source/filter.vcl/ixbm/xbmread.cxx b/svtools/source/filter.vcl/ixbm/xbmread.cxx
index 9c7faaafa88c..23a1d855d00c 100644
--- a/svtools/source/filter.vcl/ixbm/xbmread.cxx
+++ b/svtools/source/filter.vcl/ixbm/xbmread.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
@@ -39,12 +39,12 @@
 // -------------
 
 XBMReader::XBMReader( SvStream& rStm ) :
-            rIStm           ( rStm ),
-            pAcc1           ( NULL ),
-            nLastPos        ( rStm.Tell() ),
-            nWidth          ( 0 ),
-            nHeight         ( 0 ),
-            bStatus         ( TRUE )
+            rIStm			( rStm ),
+            pAcc1			( NULL ),
+            nLastPos		( rStm.Tell() ),
+            nWidth			( 0 ),
+            nHeight			( 0 ),
+            bStatus			( TRUE )
 {
     pHexTable = new short[ 256 ];
     maUpperName = String::CreateFromAscii( "SVIXBM", 6 );
@@ -91,7 +91,7 @@ void XBMReader::InitTable()
     pHexTable['e'] = 14;
     pHexTable['f'] = 15;
     pHexTable['x'] = 0;
-    pHexTable[' '] =     -1;
+    pHexTable[' '] =	 -1;
     pHexTable[','] = -1;
     pHexTable['}'] = -1;
     pHexTable['\n'] = -1;
@@ -104,10 +104,10 @@ void XBMReader::InitTable()
 ByteString XBMReader::FindTokenLine( SvStream* pInStm, const char* pTok1,
                                  const char* pTok2, const char* pTok3 )
 {
-    ByteString  aRet;
-    long        nPos1;
-    long        nPos2;
-    long        nPos3;
+    ByteString	aRet;
+    long		nPos1;
+    long		nPos2;
+    long		nPos3;
 
     bStatus = FALSE;
 
@@ -152,9 +152,9 @@ ByteString XBMReader::FindTokenLine( SvStream* pInStm, const char* pTok1,
 
 long XBMReader::ParseDefine( const sal_Char* pDefine )
 {
-    long    nRet = 0;
-    char*   pTmp = (char*) pDefine;
-    unsigned char   cTmp;
+    long	nRet = 0;
+    char*	pTmp = (char*) pDefine;
+    unsigned char	cTmp;
 
     // bis zum Ende gehen
     pTmp += ( strlen( pDefine ) - 1 );
@@ -201,14 +201,14 @@ long XBMReader::ParseDefine( const sal_Char* pDefine )
 
 BOOL XBMReader::ParseData( SvStream* pInStm, const ByteString& aLastLine, XBMFormat eFormat )
 {
-    ByteString      aLine;
-    long            nRow = 0;
-    long            nCol = 0;
-    long            nBits = ( eFormat == XBM10 ) ? 16 : 8;
-    long            nBit;
-    USHORT          nValue;
-    USHORT          nDigits;
-    BOOL            bFirstLine = TRUE;
+    ByteString		aLine;
+    long			nRow = 0;
+    long			nCol = 0;
+    long			nBits = ( eFormat == XBM10 ) ? 16 : 8;
+    long			nBit;
+    USHORT			nValue;
+    USHORT			nDigits;
+    BOOL			bFirstLine = TRUE;
 
     while( nRow < nHeight )
     {
@@ -231,16 +231,16 @@ BOOL XBMReader::ParseData( SvStream* pInStm, const ByteString& aLastLine, XBMFor
 
             for( USHORT i = 0; ( i < nCount ) && ( nRow < nHeight ); i++ )
             {
-                const ByteString    aToken( aLine.GetToken( i, ',' ) );
+                const ByteString	aToken( aLine.GetToken( i, ',' ) );
                 const xub_StrLen nLen = aToken.Len();
-                BOOL                bProcessed = FALSE;
+                BOOL				bProcessed = FALSE;
 
                 nBit = nDigits = nValue = 0;
 
                 for( xub_StrLen n = 0UL; n < nLen; n++ )
                 {
                     const unsigned char cChar = aToken.GetChar( n );
-                    const short         nTable = pHexTable[ cChar ];
+                    const short			nTable = pHexTable[ cChar ];
 
                     if( isxdigit( cChar ) || !nTable )
                     {
@@ -274,8 +274,8 @@ BOOL XBMReader::ParseData( SvStream* pInStm, const ByteString& aLastLine, XBMFor
 
 ReadState XBMReader::ReadXBM( Graphic& rGraphic )
 {
-    ReadState   eReadState;
-    BYTE        cDummy;
+    ReadState	eReadState;
+    BYTE		cDummy;
 
     // sehen, ob wir _alles_ lesen koennen
     rIStm.Seek( STREAM_SEEK_TO_END );
@@ -285,8 +285,8 @@ ReadState XBMReader::ReadXBM( Graphic& rGraphic )
     // kehren wir zurueck und warten auf neue Daten
     if ( rIStm.GetError() != ERRCODE_IO_PENDING )
     {
-        ByteString  aLine;
-        int         nValue;
+        ByteString	aLine;
+        int			nValue;
 
         rIStm.Seek( nLastPos );
         bStatus = FALSE;
@@ -374,9 +374,9 @@ ReadState XBMReader::ReadXBM( Graphic& rGraphic )
 
 BOOL ImportXBM( SvStream& rStm, Graphic& rGraphic )
 {
-    XBMReader*  pXBMReader = (XBMReader*) rGraphic.GetContext();
-    ReadState   eReadState;
-    BOOL        bRet = TRUE;
+    XBMReader*	pXBMReader = (XBMReader*) rGraphic.GetContext();
+    ReadState	eReadState;
+    BOOL		bRet = TRUE;
 
     if( !pXBMReader )
         pXBMReader = new XBMReader( rStm );
diff --git a/svtools/source/filter.vcl/ixpm/rgbtable.hxx b/svtools/source/filter.vcl/ixpm/rgbtable.hxx
index afdab883b369..7c0dfa82a045 100644
--- a/svtools/source/filter.vcl/ixpm/rgbtable.hxx
+++ b/svtools/source/filter.vcl/ixpm/rgbtable.hxx
@@ -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
@@ -34,662 +34,662 @@ struct XPMRGBTab
 };
 
 static XPMRGBTab pRGBTable[] = {
-{ "white",                  255, 255, 255 },
-{ "black",                  0,   0,   0 },
-{ "snow",                   255, 250, 250 },
-{ "GhostWhite",             248, 248, 255 },
-{ "WhiteSmoke",             245, 245, 245 },
-{ "gainsboro",              220, 220, 220 },
-{ "FloralWhite",                255, 250, 240 },
-{ "OldLace",                    253, 245, 230 },
-{ "linen",                  250, 240, 230 },
-{ "AntiqueWhite",               250, 235, 215 },
-{ "PapayaWhip",             255, 239, 213 },
-{ "BlanchedAlmond",         255, 235, 205 },
-{ "bisque",                 255, 228, 196 },
-{ "PeachPuff",              255, 218, 185 },
-{ "NavajoWhite",                255, 222, 173 },
-{ "moccasin",                   255, 228, 181 },
-{ "cornsilk",                   255, 248, 220 },
-{ "ivory",                  255, 255, 240 },
-{ "LemonChiffon",               255, 250, 205 },
-{ "seashell",                   255, 245, 238 },
-{ "honeydew",                   240, 255, 240 },
-{ "MintCream",              245, 255, 250 },
-{ "azure",                  240, 255, 255 },
-{ "AliceBlue",              240, 248, 255 },
-{ "lavender",                   230, 230, 250 },
-{ "LavenderBlush",          255, 240, 245 },
-{ "MistyRose",              255, 228, 225 },
-{ "DarkSlateGray",          47,  79,  79 },
-{ "DarkSlateGrey",          47,  79,  79 },
-{ "DimGray",                    105, 105, 105 },
-{ "DimGrey",                    105, 105, 105 },
-{ "SlateGray",              112, 128, 144 },
-{ "SlateGrey",              112, 128, 144 },
-{ "LightSlateGray",         119, 136, 153 },
-{ "LightSlateGrey",         119, 136, 153 },
-{ "gray",                       190, 190, 190 },
-{ "grey",                       190, 190, 190 },
-{ "LightGrey",              211, 211, 211 },
-{ "LightGray",              211, 211, 211 },
-{ "MidnightBlue",               25,  25, 112 },
-{ "navy",                       0,   0, 128 },
-{ "NavyBlue",                   0,   0, 128 },
-{ "CornflowerBlue",         100, 149, 237 },
-{ "DarkSlateBlue",          72,  61, 139 },
-{ "SlateBlue",              106,  90, 205 },
-{ "MediumSlateBlue",            123, 104, 238 },
-{ "LightSlateBlue",         132, 112, 255 },
-{ "MediumBlue",             0,   0, 205 },
-{ "RoyalBlue",              65, 105, 225 },
-{ "blue",                       0,  0,  255 },
-{ "DodgerBlue",             30, 144, 255 },
-{ "DeepSkyBlue",                0, 191, 255 },
-{ "SkyBlue",                    135, 206, 235 },
-{ "LightSkyBlue",               135, 206, 250 },
-{ "SteelBlue",              70, 130, 180 },
-{ "LightSteelBlue",         176, 196, 222 },
-{ "LightBlue",              173, 216, 230 },
-{ "PowderBlue",             176, 224, 230 },
-{ "PaleTurquoise",          175, 238, 238 },
-{ "DarkTurquoise",          0, 206, 209 },
-{ "MediumTurquoise",            72, 209, 204 },
-{ "turquoise",              64, 224, 208 },
-{ "cyan",                       0, 255, 255 },
-{ "LightCyan",              224, 255, 255 },
-{ "CadetBlue",              95, 158, 160 },
-{ "MediumAquamarine",           102, 205, 170 },
-{ "aquamarine",             127, 255, 212 },
-{ "DarkGreen",              0, 100,   0 },
-{ "DarkOliveGreen",         85, 107,  47 },
-{ "DarkSeaGreen",               143, 188, 143 },
-{ "SeaGreen",                   46, 139,  87 },
-{ "MediumSeaGreen",         60, 179, 113 },
-{ "LightSeaGreen",          32, 178, 170 },
-{ "PaleGreen",              152, 251, 152 },
-{ "SpringGreen",                0, 255, 127 },
-{ "LawnGreen",              124, 252,   0 },
-{ "green",                  0, 255,   0 },
-{ "chartreuse",             127, 255,   0 },
-{ "MediumSpringGreen",      0, 250, 154 },
-{ "GreenYellow",                173, 255 , 47 },
-{ "LimeGreen",              50, 205,  50 },
-{ "YellowGreen",                154, 205,  50 },
-{ "ForestGreen",                34, 139,  34 },
-{ "OliveDrab",              107, 142,  35 },
-{ "DarkKhaki",              189, 183, 107 },
-{ "khaki",                  240, 230, 140 },
-{ "PaleGoldenrod",          238, 232, 170 },
-{ "LightGoldenrodYellow",   250, 250, 210 },
-{ "LightYellow",                255, 255, 224 },
-{ "yellow",                 255, 255,   0 },
-{ "gold",                       255, 215,   0 },
-{ "LightGoldenrod",         238, 221, 130 },
-{ "goldenrod",              218, 165,  32 },
-{ "DarkGoldenrod",          184, 134,  11 },
-{ "RosyBrown",              188, 143, 143 },
-{ "IndianRed",              205,  92,  92 },
-{ "SaddleBrown",                139,  69,  19 },
-{ "sienna",                 160,  82,  45 },
-{ "peru",                       205, 133,  63 },
-{ "burlywood",              222, 184, 135 },
-{ "beige",                  245, 245, 220 },
-{ "wheat",                  245, 222, 179 },
-{ "SandyBrown",             244, 164,  96 },
-{ "tan",                        210, 180, 140 },
-{ "chocolate",              210, 105, 30 },
-{ "firebrick",              178,  34,  34 },
-{ "brown",                  165,  42,  42 },
-{ "DarkSalmon",             233, 150, 122 },
-{ "salmon",                 250, 128, 114 },
-{ "LightSalmon",                255, 160, 122 },
-{ "orange",                 255, 165,   0 },
-{ "DarkOrange",             255, 140,   0 },
-{ "coral",                  255, 127,  80 },
-{ "LightCoral",             240, 128, 128 },
-{ "tomato",                 255,  99,  71 },
-{ "OrangeRed",              255,  69,   0 },
-{ "red",                        255,   0,   0 },
-{ "HotPink",                    255, 105, 180 },
-{ "DeepPink",                   255,  20, 147 },
-{ "pink",                       255, 192, 203 },
-{ "LightPink",              255, 182, 193 },
-{ "PaleVioletRed",          219, 112, 147 },
-{ "maroon",                 176,  48,  96 },
-{ "MediumVioletRed",            199,  21, 133 },
-{ "VioletRed",              208,  32, 144 },
-{ "magenta",                    255,   0, 255 },
-{ "violet",                 238, 130, 238 },
-{ "plum",                       221, 160, 221 },
-{ "orchid",                 218, 112, 214 },
-{ "MediumOrchid",               186,  85, 211 },
-{ "DarkOrchid",             153,  50, 204 },
-{ "DarkViolet",             148,   0, 211 },
-{ "BlueViolet",             138,  43, 226 },
-{ "purple",                 160,  32, 240 },
-{ "MediumPurple",               147, 112, 219 },
-{ "thistle",                    216, 191, 216 },
-{ "snow1",                  255, 250, 250 },
-{ "snow2",                  238, 233, 233 },
-{ "snow3",                  205, 201, 201 },
-{ "snow4",                  139, 137, 137 },
-{ "seashell1",              255, 245, 238 },
-{ "seashell2",              238, 229, 222 },
-{ "seashell3",              205, 197, 191 },
-{ "seashell4",              139, 134, 130 },
-{ "AntiqueWhite1",          255, 239, 219 },
-{ "AntiqueWhite2",          238, 223, 204 },
-{ "AntiqueWhite3",          205, 192, 176 },
-{ "AntiqueWhite4",          139, 131, 120 },
-{ "bisque1",                    255, 228, 196 },
-{ "bisque2",                    238, 213, 183 },
-{ "bisque3",                    205, 183, 158 },
-{ "bisque4",                    139, 125, 107 },
-{ "PeachPuff1",             255, 218, 185 },
-{ "PeachPuff2",             238, 203, 173 },
-{ "PeachPuff3",             205, 175, 149 },
-{ "PeachPuff4",             139, 119, 101 },
-{ "NavajoWhite1",               255, 222, 173 },
-{ "NavajoWhite2",               238, 207, 161 },
-{ "NavajoWhite3",               205, 179, 139 },
-{ "NavajoWhite4",               139, 121,  94 },
-{ "LemonChiffon1",          255, 250, 205 },
-{ "LemonChiffon2",          238, 233, 191 },
-{ "LemonChiffon3",          205, 201, 165 },
-{ "LemonChiffon4",          139, 137, 112 },
-{ "cornsilk1",              255, 248, 220 },
-{ "cornsilk2",              238, 232, 205 },
-{ "cornsilk3",              205, 200, 177 },
-{ "cornsilk4",              139, 136, 120 },
-{ "ivory1",                 255, 255, 240 },
-{ "ivory2",                 238, 238, 224 },
-{ "ivory3",                 205, 205, 193 },
-{ "ivory4",                 139, 139, 131 },
-{ "honeydew1",              240, 255, 240 },
-{ "honeydew2",              224, 238, 224 },
-{ "honeydew3",              193, 205, 193 },
-{ "honeydew4",              131, 139, 131 },
-{ "LavenderBlush1",         255, 240, 245 },
-{ "LavenderBlush2",         238, 224, 229 },
-{ "LavenderBlush3",         205, 193, 197 },
-{ "LavenderBlush4",         139, 131, 134 },
-{ "MistyRose1",             255, 228, 225 },
-{ "MistyRose2",             238, 213, 210 },
-{ "MistyRose3",             205, 183, 181 },
-{ "MistyRose4",             139, 125, 123 },
-{ "azure1",                 240, 255, 255 },
-{ "azure2",                 224, 238, 238 },
-{ "azure3",                 193, 205, 205 },
-{ "azure4",                 131, 139, 139 },
-{ "SlateBlue1",             131, 111, 255 },
-{ "SlateBlue2",             122, 103, 238 },
-{ "SlateBlue3",             105,  89, 205 },
-{ "SlateBlue4",             71,  60, 139 },
-{ "RoyalBlue1",             72, 118, 255 },
-{ "RoyalBlue2",             67, 110, 238 },
-{ "RoyalBlue3",             58,  95, 205 },
-{ "RoyalBlue4",             39,  64, 139 },
-{ "blue1",                  0,   0, 255 },
-{ "blue2",                  0,   0, 238 },
-{ "blue3",                  0,   0, 205 },
-{ "blue4",                  0,   0, 139 },
-{ "DodgerBlue1",                30, 144, 255 },
-{ "DodgerBlue2",                28, 134, 238 },
-{ "DodgerBlue3",                24, 116, 205 },
-{ "DodgerBlue4",                16,  78, 139 },
-{ "SteelBlue1",             99, 184, 255 },
-{ "SteelBlue2",             92, 172, 238 },
-{ "SteelBlue3",             79, 148, 205 },
-{ "SteelBlue4",             54, 100, 139 },
-{ "DeepSkyBlue1",               0, 191, 255 },
-{ "DeepSkyBlue2",               0, 178, 238 },
-{ "DeepSkyBlue3",               0, 154, 205 },
-{ "DeepSkyBlue4",               0, 104, 139 },
-{ "SkyBlue1",                   135, 206, 255 },
-{ "SkyBlue2",                   126, 192, 238 },
-{ "SkyBlue3",                   108, 166, 205 },
-{ "SkyBlue4",                   74, 112, 139 },
-{ "LightSkyBlue1",          176, 226, 255 },
-{ "LightSkyBlue2",          164, 211, 238 },
-{ "LightSkyBlue3",          141, 182, 205 },
-{ "LightSkyBlue4",          96, 123, 139 },
-{ "SlateGray1",             198, 226, 255 },
-{ "SlateGray2",             185, 211, 238 },
-{ "SlateGray3",             159, 182, 205 },
-{ "SlateGray4",             108, 123, 139 },
-{ "LightSteelBlue1",            202, 225, 255 },
-{ "LightSteelBlue2",            188, 210, 238 },
-{ "LightSteelBlue3",            162, 181, 205 },
-{ "LightSteelBlue4",            110, 123, 139 },
-{ "LightBlue1",             191, 239, 255 },
-{ "LightBlue2",             178, 223, 238 },
-{ "LightBlue3",             154, 192, 205 },
-{ "LightBlue4",             104, 131, 139 },
-{ "LightCyan1",             224, 255, 255 },
-{ "LightCyan2",             209, 238, 238 },
-{ "LightCyan3",             180, 205, 205 },
-{ "LightCyan4",             122, 139, 139 },
-{ "PaleTurquoise1",         187, 255, 255 },
-{ "PaleTurquoise2",         174, 238, 238 },
-{ "PaleTurquoise3",         150, 205, 205 },
-{ "PaleTurquoise4",         102, 139, 139 },
-{ "CadetBlue1",             152, 245, 255 },
-{ "CadetBlue2",             142, 229, 238 },
-{ "CadetBlue3",             122, 197, 205 },
-{ "CadetBlue4",             83, 134, 139 },
-{ "turquoise1",             0, 245, 255 },
-{ "turquoise2",             0, 229, 238 },
-{ "turquoise3",             0, 197, 205 },
-{ "turquoise4",             0, 134, 139 },
-{ "cyan1",                  0, 255, 255 },
-{ "cyan2",                  0, 238, 238 },
-{ "cyan3",                  0, 205, 205 },
-{ "cyan4",                  0, 139, 139 },
-{ "DarkSlateGray1",         151, 255, 255 },
-{ "DarkSlateGray2",         141, 238, 238 },
-{ "DarkSlateGray3",         121, 205, 205 },
-{ "DarkSlateGray4",         82, 139, 139 },
-{ "aquamarine1",                127, 255, 212 },
-{ "aquamarine2",                118, 238, 198 },
-{ "aquamarine3",                102, 205, 170 },
-{ "aquamarine4",                69, 139, 116 },
-{ "DarkSeaGreen1",          193, 255, 193 },
-{ "DarkSeaGreen2",          180, 238, 180 },
-{ "DarkSeaGreen3",          155, 205, 155 },
-{ "DarkSeaGreen4",          105, 139, 105 },
-{ "SeaGreen1",              84, 255, 159 },
-{ "SeaGreen2",              78, 238, 148 },
-{ "SeaGreen3",              67, 205, 128 },
-{ "SeaGreen4",              46, 139,  87 },
-{ "PaleGreen1",             154, 255, 154 },
-{ "PaleGreen2",             144, 238, 144 },
-{ "PaleGreen3",             124, 205, 124 },
-{ "PaleGreen4",             84, 139,  84 },
-{ "SpringGreen1",               0, 255, 127 },
-{ "SpringGreen2",               0, 238, 118 },
-{ "SpringGreen3",               0, 205, 102 },
-{ "SpringGreen4",               0, 139,  69 },
-{ "green1",                 0, 255,   0 },
-{ "green2",                 0, 238,   0 },
-{ "green3",                 0, 205, 0 },
-{ "green4",                 0, 139,   0 },
-{ "chartreuse1",                127, 255,   0 },
-{ "chartreuse2",                118, 238,   0 },
-{ "chartreuse3",                102, 205,   0 },
-{ "chartreuse4",                69, 139,    0 },
-{ "OliveDrab1",             192, 255,  62 },
-{ "OliveDrab2",             179, 238,  58 },
-{ "OliveDrab3",             154, 205,  50 },
-{ "OliveDrab4",             105, 139,  34 },
-{ "DarkOliveGreen1",            202, 255, 112 },
-{ "DarkOliveGreen2",            188, 238, 104 },
-{ "DarkOliveGreen3",            162, 205,  90 },
-{ "DarkOliveGreen4",            110, 139,  61 },
-{ "khaki1",                 255, 246, 143 },
-{ "khaki2",                 238, 230, 133 },
-{ "khaki3",                 205, 198, 115 },
-{ "khaki4",                 139, 134,  78 },
-{ "LightGoldenrod1",            255, 236, 139 },
-{ "LightGoldenrod2",            238, 220, 130 },
-{ "LightGoldenrod3",            205, 190, 112 },
-{ "LightGoldenrod4",            139, 129,  76 },
-{ "LightYellow1",               255, 255, 224 },
-{ "LightYellow2",               238, 238, 209 },
-{ "LightYellow3",               205, 205, 180 },
-{ "LightYellow4",               139, 139, 122 },
-{ "yellow1",                    255, 255,   0 },
-{ "yellow2",                    238, 238,   0 },
-{ "yellow3",                    205, 205,   0 },
-{ "yellow4",                    139, 139,   0 },
-{ "gold1",                  255, 215,   0 },
-{ "gold2",                  238, 201,   0 },
-{ "gold3",                  205, 173,   0 },
-{ "gold4",                  139, 117,   0 },
-{ "goldenrod1",             255, 193,  37 },
-{ "goldenrod2",             238, 180,  34 },
-{ "goldenrod3",             205, 155,  29 },
-{ "goldenrod4",             139, 105,  20 },
-{ "DarkGoldenrod1",         255, 185,  15 },
-{ "DarkGoldenrod2",         238, 173,  14 },
-{ "DarkGoldenrod3",         205, 149,  12 },
-{ "DarkGoldenrod4",         139, 101,   8 },
-{ "RosyBrown1",             255, 193, 193 },
-{ "RosyBrown2",             238, 180, 180 },
-{ "RosyBrown3",             205, 155, 155 },
-{ "RosyBrown4",             139, 105, 105 },
-{ "IndianRed1",             255, 106, 106 },
-{ "IndianRed2",             238,  99,  99 },
-{ "IndianRed3",             205,  85,  85 },
-{ "IndianRed4",             139,  58,  58 },
-{ "sienna1",                    255, 130,  71 },
-{ "sienna2",                    238, 121,  66 },
-{ "sienna3",                    205, 104,  57 },
-{ "sienna4",                    139,  71,  38 },
-{ "burlywood1",             255, 211, 155 },
-{ "burlywood2",             238, 197, 145 },
-{ "burlywood3",             205, 170, 125 },
-{ "burlywood4",             139, 115,  85 },
-{ "wheat1",                 255, 231, 186 },
-{ "wheat2",                 238, 216, 174 },
-{ "wheat3",                 205, 186, 150 },
-{ "wheat4",                 139, 126, 102 },
-{ "tan1",                       255, 165,  79 },
-{ "tan2",                       238, 154,  73 },
-{ "tan3",                       205, 133,  63 },
-{ "tan4",                       139 , 90,  43 },
-{ "chocolate1",             255, 127,  36 },
-{ "chocolate2",             238, 118,  33 },
-{ "chocolate3",             205, 102,  29 },
-{ "chocolate4",             139,  69,  19 },
-{ "firebrick1",             255,  48,  48 },
-{ "firebrick2",             238,  44,  44 },
-{ "firebrick3",             205,  38,  38 },
-{ "firebrick4",             139,  26,  26 },
-{ "brown1",                 255,  64,  64 },
-{ "brown2",                 238,  59,  59 },
-{ "brown3",                 205,  51,  51 },
-{ "brown4",                 139,  35,  35 },
-{ "salmon1",                    255, 140, 105 },
-{ "salmon2",                    238, 130,  98 },
-{ "salmon3",                    205, 112,  84 },
-{ "salmon4",                    139,  76,  57 },
-{ "LightSalmon1",               255, 160, 122 },
-{ "LightSalmon2",               238, 149, 114 },
-{ "LightSalmon3",               205, 129,  98 },
-{ "LightSalmon4",               139,  87,  66 },
-{ "orange1",                    255, 165,   0 },
-{ "orange2",                    238, 154,   0 },
-{ "orange3",                    205, 133,   0 },
-{ "orange4",                    139 , 90,   0 },
-{ "DarkOrange1",                255, 127,   0 },
-{ "DarkOrange2",                238, 118,   0 },
-{ "DarkOrange3",                205, 102,   0 },
-{ "DarkOrange4",                139 , 69,   0 },
-{ "coral1",                 255, 114,  86 },
-{ "coral2",                 238, 106,  80 },
-{ "coral3",                 205,  91,  69 },
-{ "coral4",                 139,  62,  47 },
-{ "tomato1",                    255,  99,  71 },
-{ "tomato2",                    238,  92,  66 },
-{ "tomato3",                    205,  79,  57 },
-{ "tomato4",                    139,  54,  38 },
-{ "OrangeRed1",             255,  69,   0 },
-{ "OrangeRed2",             238,  64,   0 },
-{ "OrangeRed3",             205,  55,   0 },
-{ "OrangeRed4",             139,  37,   0 },
-{ "red1",                       255,   0,   0 },
-{ "red2",                       238,   0,   0 },
-{ "red3",                       205,   0,   0 },
-{ "red4",                       139,   0,   0 },
-{ "DeepPink1",              255,  20, 147 },
-{ "DeepPink2",              238,  18, 137 },
-{ "DeepPink3",              205,  16, 118 },
-{ "DeepPink4",              139,  10,  80 },
-{ "HotPink1",                   255, 110, 180 },
-{ "HotPink2",                   238, 106, 167 },
-{ "HotPink3",                   205,  96, 144 },
-{ "HotPink4",                   139,  58,  98 },
-{ "pink1",                  255, 181, 197 },
-{ "pink2",                  238, 169, 184 },
-{ "pink3",                  205, 145, 158 },
-{ "pink4",                  139,  99, 108 },
-{ "LightPink1",             255, 174, 185 },
-{ "LightPink2",             238, 162, 173 },
-{ "LightPink3",             205, 140, 149 },
-{ "LightPink4",             139,  95, 101 },
-{ "PaleVioletRed1",         255, 130, 171 },
-{ "PaleVioletRed2",         238, 121, 159 },
-{ "PaleVioletRed3",         205, 104, 137 },
-{ "PaleVioletRed4",         139,  71,  93 },
-{ "maroon1",                    255,  52, 179 },
-{ "maroon2",                    238,  48, 167 },
-{ "maroon3",                    205,  41, 144 },
-{ "maroon4",                    139,  28,  98 },
-{ "VioletRed1",             255,  62, 150 },
-{ "VioletRed2",             238,  58, 140 },
-{ "VioletRed3",             205,  50, 120 },
-{ "VioletRed4",             139,  34,  82 },
-{ "magenta1",                   255,   0, 255 },
-{ "magenta2",                   238,   0, 238 },
-{ "magenta3",                   205,   0, 205 },
-{ "magenta4",                   139,   0, 139 },
-{ "orchid1",                    255, 131, 250 },
-{ "orchid2",                    238, 122, 233 },
-{ "orchid3",                    205, 105, 201 },
-{ "orchid4",                    139,  71, 137 },
-{ "plum1",                  255, 187, 255 },
-{ "plum2",                  238, 174, 238 },
-{ "plum3",                  205, 150, 205 },
-{ "plum4",                  139, 102, 139 },
-{ "MediumOrchid1",          224, 102, 255 },
-{ "MediumOrchid2",          209,  95, 238 },
-{ "MediumOrchid3",          180,  82, 205 },
-{ "MediumOrchid4",          122,  55, 139 },
-{ "DarkOrchid1",                191,  62, 255 },
-{ "DarkOrchid2",                178,  58, 238 },
-{ "DarkOrchid3",                154,  50, 205 },
-{ "DarkOrchid4",                104,  34, 139 },
-{ "purple1",                    155,  48, 255 },
-{ "purple2",                    145,  44, 238 },
-{ "purple3",                    125,  38, 205 },
-{ "purple4",                    85,  26, 139 },
-{ "MediumPurple1",          171, 130, 255 },
-{ "MediumPurple2",          159, 121, 238 },
-{ "MediumPurple3",          137, 104, 205 },
-{ "MediumPurple4",          93,  71, 139 },
-{ "thistle1",                   255, 225, 255 },
-{ "thistle2",                   238, 210, 238 },
-{ "thistle3",                   205, 181, 205 },
-{ "thistle4",                   139, 123, 139 },
-{ "gray0",                  0,   0,   0 },
-{ "grey0",                  0,   0,   0 },
-{ "gray1",                  3,   3,   3 },
-{ "grey1",                  3,   3,   3 },
-{ "gray2",                  5,   5,   5 },
-{ "grey2",                  5,   5,   5 },
-{ "gray3",                  8,   8,   8 },
-{ "grey3",                  8,   8,   8 },
-{ "gray4",                  10,  10,  10 },
-{ "grey4",                  10,  10,  10 },
-{ "gray5",                  13,  13,  13 },
-{ "grey5",                  13,  13,  13 },
-{ "gray6",                  15,  15,  15 },
-{ "grey6",                  15,  15,  15 },
-{ "gray7",                  18,  18,  18 },
-{ "grey7",                  18,  18,  18 },
-{ "gray8",                  20,  20,  20 },
-{ "grey8",                  20,  20,  20 },
-{ "gray9",                  23,  23,  23 },
-{ "grey9",                  23,  23,  23 },
-{ "gray10",                 26,  26,  26 },
-{ "grey10",                 26,  26,  26 },
-{ "gray11",                 28,  28,  28 },
-{ "grey11",                 28,  28,  28 },
-{ "gray12",                 31,  31,  31 },
-{ "grey12",                 31,  31,  31 },
-{ "gray13",                 33,  33,  33 },
-{ "grey13",                 33,  33,  33 },
-{ "gray14",                 36,  36,  36 },
-{ "grey14",                 36,  36,  36 },
-{ "gray15",                 38,  38,  38 },
-{ "grey15",                 38,  38,  38 },
-{ "gray16",                 41,  41,  41 },
-{ "grey16",                 41,  41,  41 },
-{ "gray17",                 43,  43,  43 },
-{ "grey17",                 43,  43,  43 },
-{ "gray18",                 46,  46,  46 },
-{ "grey18",                 46,  46,  46 },
-{ "gray19",                 48,  48,  48 },
-{ "grey19",                 48,  48,  48 },
-{ "gray20",                 51,  51,  51 },
-{ "grey20",                 51,  51,  51 },
-{ "gray21",                 54,  54,  54 },
-{ "grey21",                 54,  54,  54 },
-{ "gray22",                 56,  56,  56 },
-{ "grey22",                 56,  56,  56 },
-{ "gray23",                 59,  59,  59 },
-{ "grey23",                 59,  59,  59 },
-{ "gray24",                 61,  61,  61 },
-{ "grey24",                 61,  61,  61 },
-{ "gray25",                 64,  64,  64 },
-{ "grey25",                 64,  64,  64 },
-{ "gray26",                 66,  66,  66 },
-{ "grey26",                 66,  66,  66 },
-{ "gray27",                 69,  69,  69 },
-{ "grey27",                 69,  69,  69 },
-{ "gray28",                 71,  71,  71 },
-{ "grey28",                 71,  71,  71 },
-{ "gray29",                 74,  74,  74 },
-{ "grey29",                 74,  74,  74 },
-{ "gray30",                 77,  77,  77 },
-{ "grey30",                 77,  77,  77 },
-{ "gray31",                 79,  79,  79 },
-{ "grey31",                 79,  79,  79 },
-{ "gray32",                 82,  82,  82 },
-{ "grey32",                 82,  82,  82 },
-{ "gray33",                 84,  84,  84 },
-{ "grey33",                 84,  84,  84 },
-{ "gray34",                 87,  87,  87 },
-{ "grey34",                 87,  87,  87 },
-{ "gray35",                 89,  89,  89 },
-{ "grey35",                 89,  89,  89 },
-{ "gray36",                 92,  92,  92 },
-{ "grey36",                 92,  92,  92 },
-{ "gray37",                 94,  94,  94 },
-{ "grey37",                 94,  94,  94 },
-{ "gray38",                 97,  97,  97 },
-{ "grey38",                 97,  97,  97 },
-{ "gray39",                 99,  99,  99 },
-{ "grey39",                 99,  99,  99 },
-{ "gray40",                 102, 102, 102 },
-{ "grey40",                 102, 102, 102 },
-{ "gray41",                 105, 105, 105 },
-{ "grey41",                 105, 105, 105 },
-{ "gray42",                 107, 107, 107 },
-{ "grey42",                 107, 107, 107 },
-{ "gray43",                 110, 110, 110 },
-{ "grey43",                 110, 110, 110 },
-{ "gray44",                 112, 112, 112 },
-{ "grey44",                 112, 112, 112 },
-{ "gray45",                 115, 115, 115 },
-{ "grey45",                 115, 115, 115 },
-{ "gray46",                 117, 117, 117 },
-{ "grey46",                 117, 117, 117 },
-{ "gray47",                 120, 120, 120 },
-{ "grey47",                 120, 120, 120 },
-{ "gray48",                 122, 122, 122 },
-{ "grey48",                 122, 122, 122 },
-{ "gray49",                 125, 125, 125 },
-{ "grey49",                 125, 125, 125 },
-{ "gray50",                 127, 127, 127 },
-{ "grey50",                 127, 127, 127 },
-{ "gray51",                 130, 130, 130 },
-{ "grey51",                 130, 130, 130 },
-{ "gray52",                 133, 133, 133 },
-{ "grey52",                 133, 133, 133 },
-{ "gray53",                 135, 135, 135 },
-{ "grey53",                 135, 135, 135 },
-{ "gray54",                 138, 138, 138 },
-{ "grey54",                 138, 138, 138 },
-{ "gray55",                 140, 140, 140 },
-{ "grey55",                 140, 140, 140 },
-{ "gray56",                 143, 143, 143 },
-{ "grey56",                 143, 143, 143 },
-{ "gray57",                 145, 145, 145 },
-{ "grey57",                 145, 145, 145 },
-{ "gray58",                 148, 148, 148 },
-{ "grey58",                 148, 148, 148 },
-{ "gray59",                 150, 150, 150 },
-{ "grey59",                 150, 150, 150 },
-{ "gray60",                 153, 153, 153 },
-{ "grey60",                 153, 153, 153 },
-{ "gray61",                 156, 156, 156 },
-{ "grey61",                 156, 156, 156 },
-{ "gray62",                 158, 158, 158 },
-{ "grey62",                 158, 158, 158 },
-{ "gray63",                 161, 161, 161 },
-{ "grey63",                 161, 161, 161 },
-{ "gray64",                 163, 163, 163 },
-{ "grey64",                 163, 163, 163 },
-{ "gray65",                 166, 166, 166 },
-{ "grey65",                 166, 166, 166 },
-{ "gray66",                 168, 168, 168 },
-{ "grey66",                 168, 168, 168 },
-{ "gray67",                 171, 171, 171 },
-{ "grey67",                 171, 171, 171 },
-{ "gray68",                 173, 173, 173 },
-{ "grey68",                 173, 173, 173 },
-{ "gray69",                 176, 176, 176 },
-{ "grey69",                 176, 176, 176 },
-{ "gray70",                 179, 179, 179 },
-{ "grey70",                 179, 179, 179 },
-{ "gray71",                 181, 181, 181 },
-{ "grey71",                 181, 181, 181 },
-{ "gray72",                 184, 184, 184 },
-{ "grey72",                 184, 184, 184 },
-{ "gray73",                 186, 186, 186 },
-{ "grey73",                 186, 186, 186 },
-{ "gray74",                 189, 189, 189 },
-{ "grey74",                 189, 189, 189 },
-{ "gray75",                 191, 191, 191 },
-{ "grey75",                 191, 191, 191 },
-{ "gray76",                 194, 194, 194 },
-{ "grey76",                 194, 194, 194 },
-{ "gray77",                 196, 196, 196 },
-{ "grey77",                 196, 196, 196 },
-{ "gray78",                 199, 199, 199 },
-{ "grey78",                 199, 199, 199 },
-{ "gray79",                 201, 201, 201 },
-{ "grey79",                 201, 201, 201 },
-{ "gray80",                 204, 204, 204 },
-{ "grey80",                 204, 204, 204 },
-{ "gray81",                 207, 207, 207 },
-{ "grey81",                 207, 207, 207 },
-{ "gray82",                 209, 209, 209 },
-{ "grey82",                 209, 209, 209 },
-{ "gray83",                 212, 212, 212 },
-{ "grey83",                 212, 212, 212 },
-{ "gray84",                 214, 214, 214 },
-{ "grey84",                 214, 214, 214 },
-{ "gray85",                 217, 217, 217 },
-{ "grey85",                 217, 217, 217 },
-{ "gray86",                 219, 219, 219 },
-{ "grey86",                 219, 219, 219 },
-{ "gray87",                 222, 222, 222 },
-{ "grey87",                 222, 222, 222 },
-{ "gray88",                 224, 224, 224 },
-{ "grey88",                 224, 224, 224 },
-{ "gray89",                 227, 227, 227 },
-{ "grey89",                 227, 227, 227 },
-{ "gray90",                 229, 229, 229 },
-{ "grey90",                 229, 229, 229 },
-{ "gray91",                 232, 232, 232 },
-{ "grey91",                 232, 232, 232 },
-{ "gray92",                 235, 235, 235 },
-{ "grey92",                 235, 235, 235 },
-{ "gray93",                 237, 237, 237 },
-{ "grey93",                 237, 237, 237 },
-{ "gray94",                 240, 240, 240 },
-{ "grey94",                 240, 240, 240 },
-{ "gray95",                 242, 242, 242 },
-{ "grey95",                 242, 242, 242 },
-{ "gray96",                 245, 245, 245 },
-{ "grey96",                 245, 245, 245 },
-{ "gray97",                 247, 247, 247 },
-{ "grey97",                 247, 247, 247 },
-{ "gray98",                 250, 250, 250 },
-{ "grey98",                 250, 250, 250 },
-{ "gray99",                 252, 252, 252 },
-{ "grey99",                 252, 252, 252 },
-{ "gray100",                    255, 255, 255 },
-{ "grey100",                    255, 255, 255 },
-{ "DarkGrey",                   169, 169, 169 },
-{ "DarkGray",                   169, 169, 169 },
-{ "DarkBlue",                   0,   0, 139 },
-{ "DarkCyan",                   0, 139, 139 },
-{ "DarkMagenta",                139,   0, 139 },
-{ "DarkRed",                    139,   0,   0 },
-{ "LightGreen",             144, 238, 144 },
-{ NULL,                   0 ,   0,   0}
+{ "white",					255, 255, 255 },
+{ "black",					0,   0,   0 },
+{ "snow",					255, 250, 250 },
+{ "GhostWhite",				248, 248, 255 },
+{ "WhiteSmoke",				245, 245, 245 },
+{ "gainsboro",				220, 220, 220 },
+{ "FloralWhite",				255, 250, 240 },
+{ "OldLace",					253, 245, 230 },
+{ "linen",					250, 240, 230 },
+{ "AntiqueWhite",				250, 235, 215 },
+{ "PapayaWhip",				255, 239, 213 },
+{ "BlanchedAlmond",			255, 235, 205 },
+{ "bisque",					255, 228, 196 },
+{ "PeachPuff",				255, 218, 185 },
+{ "NavajoWhite",				255, 222, 173 },
+{ "moccasin",					255, 228, 181 },
+{ "cornsilk",					255, 248, 220 },
+{ "ivory",					255, 255, 240 },
+{ "LemonChiffon",				255, 250, 205 },
+{ "seashell",					255, 245, 238 },
+{ "honeydew",					240, 255, 240 },
+{ "MintCream",				245, 255, 250 },
+{ "azure",					240, 255, 255 },
+{ "AliceBlue",				240, 248, 255 },
+{ "lavender",					230, 230, 250 },
+{ "LavenderBlush",			255, 240, 245 },
+{ "MistyRose",				255, 228, 225 },
+{ "DarkSlateGray",			47,  79,  79 },
+{ "DarkSlateGrey",			47,  79,  79 },
+{ "DimGray",					105, 105, 105 },
+{ "DimGrey",					105, 105, 105 },
+{ "SlateGray",				112, 128, 144 },
+{ "SlateGrey",				112, 128, 144 },
+{ "LightSlateGray",			119, 136, 153 },
+{ "LightSlateGrey",			119, 136, 153 },
+{ "gray",						190, 190, 190 },
+{ "grey",						190, 190, 190 },
+{ "LightGrey",				211, 211, 211 },
+{ "LightGray",				211, 211, 211 },
+{ "MidnightBlue",				25,  25, 112 },
+{ "navy",						0,   0, 128 },
+{ "NavyBlue",					0,   0, 128 },
+{ "CornflowerBlue",			100, 149, 237 },
+{ "DarkSlateBlue",			72,  61, 139 },
+{ "SlateBlue",				106,  90, 205 },
+{ "MediumSlateBlue",			123, 104, 238 },
+{ "LightSlateBlue",			132, 112, 255 },
+{ "MediumBlue",				0,   0, 205 },
+{ "RoyalBlue",				65, 105, 225 },
+{ "blue",						0,  0,  255 },
+{ "DodgerBlue",				30, 144, 255 },
+{ "DeepSkyBlue",				0, 191, 255 },
+{ "SkyBlue",					135, 206, 235 },
+{ "LightSkyBlue",				135, 206, 250 },
+{ "SteelBlue",				70, 130, 180 },
+{ "LightSteelBlue",			176, 196, 222 },
+{ "LightBlue",				173, 216, 230 },
+{ "PowderBlue",				176, 224, 230 },
+{ "PaleTurquoise",			175, 238, 238 },
+{ "DarkTurquoise",			0, 206, 209 },
+{ "MediumTurquoise",			72, 209, 204 },
+{ "turquoise",				64, 224, 208 },
+{ "cyan",						0, 255, 255 },
+{ "LightCyan",				224, 255, 255 },
+{ "CadetBlue",				95, 158, 160 },
+{ "MediumAquamarine",			102, 205, 170 },
+{ "aquamarine",				127, 255, 212 },
+{ "DarkGreen",				0, 100,   0 },
+{ "DarkOliveGreen",			85, 107,  47 },
+{ "DarkSeaGreen",				143, 188, 143 },
+{ "SeaGreen",					46, 139,  87 },
+{ "MediumSeaGreen",			60, 179, 113 },
+{ "LightSeaGreen",			32, 178, 170 },
+{ "PaleGreen",				152, 251, 152 },
+{ "SpringGreen",				0, 255, 127 },
+{ "LawnGreen",				124, 252,	0 },
+{ "green",					0, 255,   0 },
+{ "chartreuse",				127, 255,	0 },
+{ "MediumSpringGreen",		0, 250, 154 },
+{ "GreenYellow",				173, 255 , 47 },
+{ "LimeGreen",				50, 205,  50 },
+{ "YellowGreen",				154, 205,  50 },
+{ "ForestGreen",				34, 139,  34 },
+{ "OliveDrab",				107, 142,  35 },
+{ "DarkKhaki",				189, 183, 107 },
+{ "khaki",					240, 230, 140 },
+{ "PaleGoldenrod",			238, 232, 170 },
+{ "LightGoldenrodYellow",	250, 250, 210 },
+{ "LightYellow",				255, 255, 224 },
+{ "yellow",					255, 255,   0 },
+{ "gold",						255, 215,   0 },
+{ "LightGoldenrod",			238, 221, 130 },
+{ "goldenrod",				218, 165,  32 },
+{ "DarkGoldenrod",			184, 134,  11 },
+{ "RosyBrown",				188, 143, 143 },
+{ "IndianRed",				205,  92,  92 },
+{ "SaddleBrown",				139,  69,  19 },
+{ "sienna",					160,  82,  45 },
+{ "peru",						205, 133,  63 },
+{ "burlywood",				222, 184, 135 },
+{ "beige",					245, 245, 220 },
+{ "wheat",					245, 222, 179 },
+{ "SandyBrown",				244, 164,  96 },
+{ "tan",						210, 180, 140 },
+{ "chocolate",				210, 105, 30 },
+{ "firebrick",				178,  34,  34 },
+{ "brown",					165,  42,  42 },
+{ "DarkSalmon",				233, 150, 122 },
+{ "salmon",					250, 128, 114 },
+{ "LightSalmon",				255, 160, 122 },
+{ "orange",					255, 165,   0 },
+{ "DarkOrange",				255, 140,   0 },
+{ "coral",					255, 127,  80 },
+{ "LightCoral",				240, 128, 128 },
+{ "tomato",					255,  99,  71 },
+{ "OrangeRed",				255,  69,	0 },
+{ "red",						255,   0,   0 },
+{ "HotPink",					255, 105, 180 },
+{ "DeepPink",					255,  20, 147 },
+{ "pink",						255, 192, 203 },
+{ "LightPink",				255, 182, 193 },
+{ "PaleVioletRed",			219, 112, 147 },
+{ "maroon",					176,  48,  96 },
+{ "MediumVioletRed",			199,  21, 133 },
+{ "VioletRed",				208,  32, 144 },
+{ "magenta",					255,   0, 255 },
+{ "violet",					238, 130, 238 },
+{ "plum",						221, 160, 221 },
+{ "orchid",					218, 112, 214 },
+{ "MediumOrchid",				186,  85, 211 },
+{ "DarkOrchid",				153,  50, 204 },
+{ "DarkViolet",				148,   0, 211 },
+{ "BlueViolet",				138,  43, 226 },
+{ "purple",					160,  32, 240 },
+{ "MediumPurple",				147, 112, 219 },
+{ "thistle",					216, 191, 216 },
+{ "snow1",					255, 250, 250 },
+{ "snow2",					238, 233, 233 },
+{ "snow3",					205, 201, 201 },
+{ "snow4",					139, 137, 137 },
+{ "seashell1",				255, 245, 238 },
+{ "seashell2",				238, 229, 222 },
+{ "seashell3",				205, 197, 191 },
+{ "seashell4",				139, 134, 130 },
+{ "AntiqueWhite1",			255, 239, 219 },
+{ "AntiqueWhite2",			238, 223, 204 },
+{ "AntiqueWhite3",			205, 192, 176 },
+{ "AntiqueWhite4",			139, 131, 120 },
+{ "bisque1",					255, 228, 196 },
+{ "bisque2",					238, 213, 183 },
+{ "bisque3",					205, 183, 158 },
+{ "bisque4",					139, 125, 107 },
+{ "PeachPuff1",				255, 218, 185 },
+{ "PeachPuff2",				238, 203, 173 },
+{ "PeachPuff3",				205, 175, 149 },
+{ "PeachPuff4",				139, 119, 101 },
+{ "NavajoWhite1",				255, 222, 173 },
+{ "NavajoWhite2",				238, 207, 161 },
+{ "NavajoWhite3",				205, 179, 139 },
+{ "NavajoWhite4",				139, 121,  94 },
+{ "LemonChiffon1",			255, 250, 205 },
+{ "LemonChiffon2",			238, 233, 191 },
+{ "LemonChiffon3",			205, 201, 165 },
+{ "LemonChiffon4",			139, 137, 112 },
+{ "cornsilk1",				255, 248, 220 },
+{ "cornsilk2",				238, 232, 205 },
+{ "cornsilk3",				205, 200, 177 },
+{ "cornsilk4",				139, 136, 120 },
+{ "ivory1",					255, 255, 240 },
+{ "ivory2",					238, 238, 224 },
+{ "ivory3",					205, 205, 193 },
+{ "ivory4",					139, 139, 131 },
+{ "honeydew1",				240, 255, 240 },
+{ "honeydew2",				224, 238, 224 },
+{ "honeydew3",				193, 205, 193 },
+{ "honeydew4",				131, 139, 131 },
+{ "LavenderBlush1",			255, 240, 245 },
+{ "LavenderBlush2",			238, 224, 229 },
+{ "LavenderBlush3",			205, 193, 197 },
+{ "LavenderBlush4",			139, 131, 134 },
+{ "MistyRose1",				255, 228, 225 },
+{ "MistyRose2",				238, 213, 210 },
+{ "MistyRose3",				205, 183, 181 },
+{ "MistyRose4",				139, 125, 123 },
+{ "azure1",					240, 255, 255 },
+{ "azure2",					224, 238, 238 },
+{ "azure3",					193, 205, 205 },
+{ "azure4",					131, 139, 139 },
+{ "SlateBlue1",				131, 111, 255 },
+{ "SlateBlue2",				122, 103, 238 },
+{ "SlateBlue3",				105,  89, 205 },
+{ "SlateBlue4",				71,  60, 139 },
+{ "RoyalBlue1",				72, 118, 255 },
+{ "RoyalBlue2",				67, 110, 238 },
+{ "RoyalBlue3",				58,  95, 205 },
+{ "RoyalBlue4",				39,  64, 139 },
+{ "blue1",					0,   0, 255 },
+{ "blue2",					0,   0, 238 },
+{ "blue3",					0,   0, 205 },
+{ "blue4",					0,   0, 139 },
+{ "DodgerBlue1",				30, 144, 255 },
+{ "DodgerBlue2",				28, 134, 238 },
+{ "DodgerBlue3",				24, 116, 205 },
+{ "DodgerBlue4",				16,  78, 139 },
+{ "SteelBlue1",				99, 184, 255 },
+{ "SteelBlue2",				92, 172, 238 },
+{ "SteelBlue3",				79, 148, 205 },
+{ "SteelBlue4",				54, 100, 139 },
+{ "DeepSkyBlue1",				0, 191, 255 },
+{ "DeepSkyBlue2",				0, 178, 238 },
+{ "DeepSkyBlue3",				0, 154, 205 },
+{ "DeepSkyBlue4",				0, 104, 139 },
+{ "SkyBlue1",					135, 206, 255 },
+{ "SkyBlue2",					126, 192, 238 },
+{ "SkyBlue3",					108, 166, 205 },
+{ "SkyBlue4",					74, 112, 139 },
+{ "LightSkyBlue1",			176, 226, 255 },
+{ "LightSkyBlue2",			164, 211, 238 },
+{ "LightSkyBlue3",			141, 182, 205 },
+{ "LightSkyBlue4",			96, 123, 139 },
+{ "SlateGray1",				198, 226, 255 },
+{ "SlateGray2",				185, 211, 238 },
+{ "SlateGray3",				159, 182, 205 },
+{ "SlateGray4",				108, 123, 139 },
+{ "LightSteelBlue1",			202, 225, 255 },
+{ "LightSteelBlue2",			188, 210, 238 },
+{ "LightSteelBlue3",			162, 181, 205 },
+{ "LightSteelBlue4",			110, 123, 139 },
+{ "LightBlue1",				191, 239, 255 },
+{ "LightBlue2",				178, 223, 238 },
+{ "LightBlue3",				154, 192, 205 },
+{ "LightBlue4",				104, 131, 139 },
+{ "LightCyan1",				224, 255, 255 },
+{ "LightCyan2",				209, 238, 238 },
+{ "LightCyan3",				180, 205, 205 },
+{ "LightCyan4",				122, 139, 139 },
+{ "PaleTurquoise1",			187, 255, 255 },
+{ "PaleTurquoise2",			174, 238, 238 },
+{ "PaleTurquoise3",			150, 205, 205 },
+{ "PaleTurquoise4",			102, 139, 139 },
+{ "CadetBlue1",				152, 245, 255 },
+{ "CadetBlue2",				142, 229, 238 },
+{ "CadetBlue3",				122, 197, 205 },
+{ "CadetBlue4",				83, 134, 139 },
+{ "turquoise1",				0, 245, 255 },
+{ "turquoise2",				0, 229, 238 },
+{ "turquoise3",				0, 197, 205 },
+{ "turquoise4",				0, 134, 139 },
+{ "cyan1",					0, 255, 255 },
+{ "cyan2",					0, 238, 238 },
+{ "cyan3",					0, 205, 205 },
+{ "cyan4",					0, 139, 139 },
+{ "DarkSlateGray1",			151, 255, 255 },
+{ "DarkSlateGray2",			141, 238, 238 },
+{ "DarkSlateGray3",			121, 205, 205 },
+{ "DarkSlateGray4",			82, 139, 139 },
+{ "aquamarine1",				127, 255, 212 },
+{ "aquamarine2",				118, 238, 198 },
+{ "aquamarine3",				102, 205, 170 },
+{ "aquamarine4",				69, 139, 116 },
+{ "DarkSeaGreen1",			193, 255, 193 },
+{ "DarkSeaGreen2",			180, 238, 180 },
+{ "DarkSeaGreen3",			155, 205, 155 },
+{ "DarkSeaGreen4",			105, 139, 105 },
+{ "SeaGreen1",				84, 255, 159 },
+{ "SeaGreen2",				78, 238, 148 },
+{ "SeaGreen3",				67, 205, 128 },
+{ "SeaGreen4",				46, 139,  87 },
+{ "PaleGreen1",				154, 255, 154 },
+{ "PaleGreen2",				144, 238, 144 },
+{ "PaleGreen3",				124, 205, 124 },
+{ "PaleGreen4",				84, 139,  84 },
+{ "SpringGreen1",				0, 255, 127 },
+{ "SpringGreen2",				0, 238, 118 },
+{ "SpringGreen3",				0, 205, 102 },
+{ "SpringGreen4",				0, 139,  69 },
+{ "green1",					0, 255,   0 },
+{ "green2",					0, 238,   0 },
+{ "green3",					0, 205,	0 },
+{ "green4",					0, 139,   0 },
+{ "chartreuse1",				127, 255,	0 },
+{ "chartreuse2",				118, 238,	0 },
+{ "chartreuse3",				102, 205,	0 },
+{ "chartreuse4",				69, 139,	0 },
+{ "OliveDrab1",				192, 255,  62 },
+{ "OliveDrab2",				179, 238,  58 },
+{ "OliveDrab3",				154, 205,  50 },
+{ "OliveDrab4",				105, 139,  34 },
+{ "DarkOliveGreen1",			202, 255, 112 },
+{ "DarkOliveGreen2",			188, 238, 104 },
+{ "DarkOliveGreen3",			162, 205,  90 },
+{ "DarkOliveGreen4",			110, 139,  61 },
+{ "khaki1",					255, 246, 143 },
+{ "khaki2",					238, 230, 133 },
+{ "khaki3",					205, 198, 115 },
+{ "khaki4",					139, 134,  78 },
+{ "LightGoldenrod1",			255, 236, 139 },
+{ "LightGoldenrod2",			238, 220, 130 },
+{ "LightGoldenrod3",			205, 190, 112 },
+{ "LightGoldenrod4",			139, 129,  76 },
+{ "LightYellow1",				255, 255, 224 },
+{ "LightYellow2",				238, 238, 209 },
+{ "LightYellow3",				205, 205, 180 },
+{ "LightYellow4",				139, 139, 122 },
+{ "yellow1",					255, 255,	0 },
+{ "yellow2",					238, 238,	0 },
+{ "yellow3",					205, 205,	0 },
+{ "yellow4",					139, 139,	0 },
+{ "gold1",					255, 215,	0 },
+{ "gold2",					238, 201,	0 },
+{ "gold3",					205, 173,	0 },
+{ "gold4",					139, 117,	0 },
+{ "goldenrod1",				255, 193,  37 },
+{ "goldenrod2",				238, 180,  34 },
+{ "goldenrod3",				205, 155,  29 },
+{ "goldenrod4",				139, 105,  20 },
+{ "DarkGoldenrod1",			255, 185,  15 },
+{ "DarkGoldenrod2",			238, 173,  14 },
+{ "DarkGoldenrod3",			205, 149,  12 },
+{ "DarkGoldenrod4",			139, 101,   8 },
+{ "RosyBrown1",				255, 193, 193 },
+{ "RosyBrown2",				238, 180, 180 },
+{ "RosyBrown3",				205, 155, 155 },
+{ "RosyBrown4",				139, 105, 105 },
+{ "IndianRed1",				255, 106, 106 },
+{ "IndianRed2",				238,  99,  99 },
+{ "IndianRed3",				205,  85,  85 },
+{ "IndianRed4",				139,  58,  58 },
+{ "sienna1",					255, 130,  71 },
+{ "sienna2",					238, 121,  66 },
+{ "sienna3",					205, 104,  57 },
+{ "sienna4",					139,  71,  38 },
+{ "burlywood1",				255, 211, 155 },
+{ "burlywood2",				238, 197, 145 },
+{ "burlywood3",				205, 170, 125 },
+{ "burlywood4",				139, 115,  85 },
+{ "wheat1",					255, 231, 186 },
+{ "wheat2",					238, 216, 174 },
+{ "wheat3",					205, 186, 150 },
+{ "wheat4",					139, 126, 102 },
+{ "tan1",						255, 165,  79 },
+{ "tan2",						238, 154,  73 },
+{ "tan3",						205, 133,  63 },
+{ "tan4",						139 , 90,  43 },
+{ "chocolate1",				255, 127,  36 },
+{ "chocolate2",				238, 118,  33 },
+{ "chocolate3",				205, 102,  29 },
+{ "chocolate4",				139,  69,  19 },
+{ "firebrick1",				255,  48,  48 },
+{ "firebrick2",				238,  44,  44 },
+{ "firebrick3",				205,  38,  38 },
+{ "firebrick4",				139,  26,  26 },
+{ "brown1",					255,  64,  64 },
+{ "brown2",					238,  59,  59 },
+{ "brown3",					205,  51,  51 },
+{ "brown4",					139,  35,  35 },
+{ "salmon1",					255, 140, 105 },
+{ "salmon2",					238, 130,  98 },
+{ "salmon3",					205, 112,  84 },
+{ "salmon4",					139,  76,  57 },
+{ "LightSalmon1",				255, 160, 122 },
+{ "LightSalmon2",				238, 149, 114 },
+{ "LightSalmon3",				205, 129,  98 },
+{ "LightSalmon4",				139,  87,  66 },
+{ "orange1",					255, 165,   0 },
+{ "orange2",					238, 154,   0 },
+{ "orange3",					205, 133,   0 },
+{ "orange4",					139 , 90,   0 },
+{ "DarkOrange1",				255, 127,   0 },
+{ "DarkOrange2",				238, 118,   0 },
+{ "DarkOrange3",				205, 102,   0 },
+{ "DarkOrange4",				139 , 69,	0 },
+{ "coral1",					255, 114,  86 },
+{ "coral2",					238, 106,  80 },
+{ "coral3",					205,  91,  69 },
+{ "coral4",					139,  62,  47 },
+{ "tomato1",					255,  99,  71 },
+{ "tomato2",					238,  92,  66 },
+{ "tomato3",					205,  79,  57 },
+{ "tomato4",					139,  54,  38 },
+{ "OrangeRed1",				255,  69,   0 },
+{ "OrangeRed2",				238,  64,   0 },
+{ "OrangeRed3",				205,  55,   0 },
+{ "OrangeRed4",				139,  37,   0 },
+{ "red1",						255,   0,	0 },
+{ "red2",						238,   0,	0 },
+{ "red3",						205,   0,	0 },
+{ "red4",						139,   0,	0 },
+{ "DeepPink1",				255,  20, 147 },
+{ "DeepPink2",				238,  18, 137 },
+{ "DeepPink3",				205,  16, 118 },
+{ "DeepPink4",				139,  10,  80 },
+{ "HotPink1",					255, 110, 180 },
+{ "HotPink2",					238, 106, 167 },
+{ "HotPink3",					205,  96, 144 },
+{ "HotPink4",					139,  58,  98 },
+{ "pink1",					255, 181, 197 },
+{ "pink2",					238, 169, 184 },
+{ "pink3",					205, 145, 158 },
+{ "pink4",					139,  99, 108 },
+{ "LightPink1",				255, 174, 185 },
+{ "LightPink2",				238, 162, 173 },
+{ "LightPink3",				205, 140, 149 },
+{ "LightPink4",				139,  95, 101 },
+{ "PaleVioletRed1",			255, 130, 171 },
+{ "PaleVioletRed2",			238, 121, 159 },
+{ "PaleVioletRed3",			205, 104, 137 },
+{ "PaleVioletRed4",			139,  71,  93 },
+{ "maroon1",					255,  52, 179 },
+{ "maroon2",					238,  48, 167 },
+{ "maroon3",					205,  41, 144 },
+{ "maroon4",					139,  28,  98 },
+{ "VioletRed1",				255,  62, 150 },
+{ "VioletRed2",				238,  58, 140 },
+{ "VioletRed3",				205,  50, 120 },
+{ "VioletRed4",				139,  34,  82 },
+{ "magenta1",					255,   0, 255 },
+{ "magenta2",					238,   0, 238 },
+{ "magenta3",					205,   0, 205 },
+{ "magenta4",					139,   0, 139 },
+{ "orchid1",					255, 131, 250 },
+{ "orchid2",					238, 122, 233 },
+{ "orchid3",					205, 105, 201 },
+{ "orchid4",					139,  71, 137 },
+{ "plum1",					255, 187, 255 },
+{ "plum2",					238, 174, 238 },
+{ "plum3",					205, 150, 205 },
+{ "plum4",					139, 102, 139 },
+{ "MediumOrchid1",			224, 102, 255 },
+{ "MediumOrchid2",			209,  95, 238 },
+{ "MediumOrchid3",			180,  82, 205 },
+{ "MediumOrchid4",			122,  55, 139 },
+{ "DarkOrchid1",				191,  62, 255 },
+{ "DarkOrchid2",				178,  58, 238 },
+{ "DarkOrchid3",				154,  50, 205 },
+{ "DarkOrchid4",				104,  34, 139 },
+{ "purple1",					155,  48, 255 },
+{ "purple2",					145,  44, 238 },
+{ "purple3",					125,  38, 205 },
+{ "purple4",					85,  26, 139 },
+{ "MediumPurple1",			171, 130, 255 },
+{ "MediumPurple2",			159, 121, 238 },
+{ "MediumPurple3",			137, 104, 205 },
+{ "MediumPurple4",			93,  71, 139 },
+{ "thistle1",					255, 225, 255 },
+{ "thistle2",					238, 210, 238 },
+{ "thistle3",					205, 181, 205 },
+{ "thistle4",					139, 123, 139 },
+{ "gray0",					0,   0,   0 },
+{ "grey0",					0,   0,   0 },
+{ "gray1",					3,   3,   3 },
+{ "grey1",					3,   3,   3 },
+{ "gray2",					5,   5,   5 },
+{ "grey2",					5,   5,   5 },
+{ "gray3",					8,   8,   8 },
+{ "grey3",					8,   8,   8 },
+{ "gray4",					10,  10,  10 },
+{ "grey4",					10,  10,  10 },
+{ "gray5",					13,  13,  13 },
+{ "grey5",					13,  13,  13 },
+{ "gray6",					15,  15,  15 },
+{ "grey6",					15,  15,  15 },
+{ "gray7",					18,  18,  18 },
+{ "grey7",					18,  18,  18 },
+{ "gray8",					20,  20,  20 },
+{ "grey8",					20,  20,  20 },
+{ "gray9",					23,  23,  23 },
+{ "grey9",					23,  23,  23 },
+{ "gray10",					26,  26,  26 },
+{ "grey10",					26,  26,  26 },
+{ "gray11",					28,  28,  28 },
+{ "grey11",					28,  28,  28 },
+{ "gray12",					31,  31,  31 },
+{ "grey12",					31,  31,  31 },
+{ "gray13",					33,  33,  33 },
+{ "grey13",					33,  33,  33 },
+{ "gray14",					36,  36,  36 },
+{ "grey14",					36,  36,  36 },
+{ "gray15",					38,  38,  38 },
+{ "grey15",					38,  38,  38 },
+{ "gray16",					41,  41,  41 },
+{ "grey16",					41,  41,  41 },
+{ "gray17",					43,  43,  43 },
+{ "grey17",					43,  43,  43 },
+{ "gray18",					46,  46,  46 },
+{ "grey18",					46,  46,  46 },
+{ "gray19",					48,  48,  48 },
+{ "grey19",					48,  48,  48 },
+{ "gray20",					51,  51,  51 },
+{ "grey20",					51,  51,  51 },
+{ "gray21",					54,  54,  54 },
+{ "grey21",					54,  54,  54 },
+{ "gray22",					56,  56,  56 },
+{ "grey22",					56,  56,  56 },
+{ "gray23",					59,  59,  59 },
+{ "grey23",					59,  59,  59 },
+{ "gray24",					61,  61,  61 },
+{ "grey24",					61,  61,  61 },
+{ "gray25",					64,  64,  64 },
+{ "grey25",					64,  64,  64 },
+{ "gray26",					66,  66,  66 },
+{ "grey26",					66,  66,  66 },
+{ "gray27",					69,  69,  69 },
+{ "grey27",					69,  69,  69 },
+{ "gray28",					71,  71,  71 },
+{ "grey28",					71,  71,  71 },
+{ "gray29",					74,  74,  74 },
+{ "grey29",					74,  74,  74 },
+{ "gray30",					77,  77,  77 },
+{ "grey30",					77,  77,  77 },
+{ "gray31",					79,  79,  79 },
+{ "grey31",					79,  79,  79 },
+{ "gray32",					82,  82,  82 },
+{ "grey32",					82,  82,  82 },
+{ "gray33",					84,  84,  84 },
+{ "grey33",					84,  84,  84 },
+{ "gray34",					87,  87,  87 },
+{ "grey34",					87,  87,  87 },
+{ "gray35",					89,  89,  89 },
+{ "grey35",					89,  89,  89 },
+{ "gray36",					92,  92,  92 },
+{ "grey36",					92,  92,  92 },
+{ "gray37",					94,  94,  94 },
+{ "grey37",					94,  94,  94 },
+{ "gray38",					97,  97,  97 },
+{ "grey38",					97,  97,  97 },
+{ "gray39",					99,  99,  99 },
+{ "grey39",					99,  99,  99 },
+{ "gray40",					102, 102, 102 },
+{ "grey40",					102, 102, 102 },
+{ "gray41",					105, 105, 105 },
+{ "grey41",					105, 105, 105 },
+{ "gray42",					107, 107, 107 },
+{ "grey42",					107, 107, 107 },
+{ "gray43",					110, 110, 110 },
+{ "grey43",					110, 110, 110 },
+{ "gray44",					112, 112, 112 },
+{ "grey44",					112, 112, 112 },
+{ "gray45",					115, 115, 115 },
+{ "grey45",					115, 115, 115 },
+{ "gray46",					117, 117, 117 },
+{ "grey46",					117, 117, 117 },
+{ "gray47",					120, 120, 120 },
+{ "grey47",					120, 120, 120 },
+{ "gray48",					122, 122, 122 },
+{ "grey48",					122, 122, 122 },
+{ "gray49",					125, 125, 125 },
+{ "grey49",					125, 125, 125 },
+{ "gray50",					127, 127, 127 },
+{ "grey50",					127, 127, 127 },
+{ "gray51",					130, 130, 130 },
+{ "grey51",					130, 130, 130 },
+{ "gray52",					133, 133, 133 },
+{ "grey52",					133, 133, 133 },
+{ "gray53",					135, 135, 135 },
+{ "grey53",					135, 135, 135 },
+{ "gray54",					138, 138, 138 },
+{ "grey54",					138, 138, 138 },
+{ "gray55",					140, 140, 140 },
+{ "grey55",					140, 140, 140 },
+{ "gray56",					143, 143, 143 },
+{ "grey56",					143, 143, 143 },
+{ "gray57",					145, 145, 145 },
+{ "grey57",					145, 145, 145 },
+{ "gray58",					148, 148, 148 },
+{ "grey58",					148, 148, 148 },
+{ "gray59",					150, 150, 150 },
+{ "grey59",					150, 150, 150 },
+{ "gray60",					153, 153, 153 },
+{ "grey60",					153, 153, 153 },
+{ "gray61",					156, 156, 156 },
+{ "grey61",					156, 156, 156 },
+{ "gray62",					158, 158, 158 },
+{ "grey62",					158, 158, 158 },
+{ "gray63",					161, 161, 161 },
+{ "grey63",					161, 161, 161 },
+{ "gray64",					163, 163, 163 },
+{ "grey64",					163, 163, 163 },
+{ "gray65",					166, 166, 166 },
+{ "grey65",					166, 166, 166 },
+{ "gray66",					168, 168, 168 },
+{ "grey66",					168, 168, 168 },
+{ "gray67",					171, 171, 171 },
+{ "grey67",					171, 171, 171 },
+{ "gray68",					173, 173, 173 },
+{ "grey68",					173, 173, 173 },
+{ "gray69",					176, 176, 176 },
+{ "grey69",					176, 176, 176 },
+{ "gray70",					179, 179, 179 },
+{ "grey70",					179, 179, 179 },
+{ "gray71",					181, 181, 181 },
+{ "grey71",					181, 181, 181 },
+{ "gray72",					184, 184, 184 },
+{ "grey72",					184, 184, 184 },
+{ "gray73",					186, 186, 186 },
+{ "grey73",					186, 186, 186 },
+{ "gray74",					189, 189, 189 },
+{ "grey74",					189, 189, 189 },
+{ "gray75",					191, 191, 191 },
+{ "grey75",					191, 191, 191 },
+{ "gray76",					194, 194, 194 },
+{ "grey76",					194, 194, 194 },
+{ "gray77",					196, 196, 196 },
+{ "grey77",					196, 196, 196 },
+{ "gray78",					199, 199, 199 },
+{ "grey78",					199, 199, 199 },
+{ "gray79",					201, 201, 201 },
+{ "grey79",					201, 201, 201 },
+{ "gray80",					204, 204, 204 },
+{ "grey80",					204, 204, 204 },
+{ "gray81",					207, 207, 207 },
+{ "grey81",					207, 207, 207 },
+{ "gray82",					209, 209, 209 },
+{ "grey82",					209, 209, 209 },
+{ "gray83",					212, 212, 212 },
+{ "grey83",					212, 212, 212 },
+{ "gray84",					214, 214, 214 },
+{ "grey84",					214, 214, 214 },
+{ "gray85",					217, 217, 217 },
+{ "grey85",					217, 217, 217 },
+{ "gray86",					219, 219, 219 },
+{ "grey86",					219, 219, 219 },
+{ "gray87",					222, 222, 222 },
+{ "grey87",					222, 222, 222 },
+{ "gray88",					224, 224, 224 },
+{ "grey88",					224, 224, 224 },
+{ "gray89",					227, 227, 227 },
+{ "grey89",					227, 227, 227 },
+{ "gray90",					229, 229, 229 },
+{ "grey90",					229, 229, 229 },
+{ "gray91",					232, 232, 232 },
+{ "grey91",					232, 232, 232 },
+{ "gray92",					235, 235, 235 },
+{ "grey92",					235, 235, 235 },
+{ "gray93",					237, 237, 237 },
+{ "grey93",					237, 237, 237 },
+{ "gray94",					240, 240, 240 },
+{ "grey94",					240, 240, 240 },
+{ "gray95",					242, 242, 242 },
+{ "grey95",					242, 242, 242 },
+{ "gray96",					245, 245, 245 },
+{ "grey96",					245, 245, 245 },
+{ "gray97",					247, 247, 247 },
+{ "grey97",					247, 247, 247 },
+{ "gray98",					250, 250, 250 },
+{ "grey98",					250, 250, 250 },
+{ "gray99",					252, 252, 252 },
+{ "grey99",					252, 252, 252 },
+{ "gray100",					255, 255, 255 },
+{ "grey100",					255, 255, 255 },
+{ "DarkGrey",					169, 169, 169 },
+{ "DarkGray",					169, 169, 169 },
+{ "DarkBlue",					0,   0, 139 },
+{ "DarkCyan",					0, 139, 139 },
+{ "DarkMagenta",				139,   0, 139 },
+{ "DarkRed",					139,   0,   0 },
+{ "LightGreen",				144, 238, 144 },
+{ NULL,					  0	,   0,   0}
 };
diff --git a/svtools/source/filter.vcl/ixpm/xpmread.cxx b/svtools/source/filter.vcl/ixpm/xpmread.cxx
index 7575c94e3ed9..fe0bc85540e9 100644
--- a/svtools/source/filter.vcl/ixpm/xpmread.cxx
+++ b/svtools/source/filter.vcl/ixpm/xpmread.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
@@ -43,22 +43,22 @@
 // -------------
 
 XPMReader::XPMReader( SvStream& rStm ) :
-            mrIStm          ( rStm ),
-            mpAcc           ( NULL ),
-            mpMaskAcc       ( NULL ),
-            mnLastPos       ( rStm.Tell() ),
-            mnWidth         ( 0 ),
-            mnHeight        ( 0 ),
-            mnColors        ( 0 ),
-            mnCpp           ( 0 ),
-            mbTransparent   ( FALSE ),
-            mbStatus        ( TRUE ),
-            mnStatus        ( 0 ),
-            mnIdentifier    ( XPMIDENTIFIER ),
-            mcThisByte      ( 0 ),
-            mnTempAvail     ( 0 ),
+            mrIStm			( rStm ),
+            mpAcc			( NULL ),
+            mpMaskAcc		( NULL ),
+            mnLastPos		( rStm.Tell() ),
+            mnWidth			( 0 ),
+            mnHeight		( 0 ),
+            mnColors		( 0 ),
+            mnCpp			( 0 ),
+            mbTransparent	( FALSE ),
+            mbStatus		( TRUE ),
+            mnStatus		( 0 ),
+            mnIdentifier	( XPMIDENTIFIER ),
+            mcThisByte		( 0 ),
+            mnTempAvail		( 0 ),
             mpFastColorTable( NULL ),
-            mpColMap        ( NULL )
+            mpColMap		( NULL )
 {
 
 }
@@ -79,8 +79,8 @@ XPMReader::~XPMReader()
 
 ReadState XPMReader::ReadXPM( Graphic& rGraphic )
 {
-    ReadState   eReadState;
-    BYTE        cDummy;
+    ReadState	eReadState;
+    BYTE		cDummy;
 
     // sehen, ob wir _alles_ lesen koennen
     mrIStm.Seek( STREAM_SEEK_TO_END );
@@ -100,7 +100,7 @@ ReadState XPMReader::ReadXPM( Graphic& rGraphic )
 
             if ( ( mbStatus = ImplGetString() ) == TRUE )
             {
-                mnIdentifier = XPMVALUES;           // Bitmap informationen einholen
+                mnIdentifier = XPMVALUES;			// Bitmap informationen einholen
                 mnWidth = ImplGetULONG( 0 );
                 mnHeight = ImplGetULONG( 1 );
                 mnColors = ImplGetULONG( 2 );
@@ -115,9 +115,9 @@ ReadState XPMReader::ReadXPM( Graphic& rGraphic )
                 mnIdentifier = XPMCOLORS;
 
                 // mpColMap beinhaltet fuer jede vorhandene
-                // Farbe:   ( mnCpp )Byte(s)-> ASCII Eintrag der der Farbe zugeordnet ist
-                //              1    Byte   -> 0xff wenn Farbe transparent ist
-                //              3    Bytes  -> RGB Wert der Farbe
+                // Farbe:	( mnCpp )Byte(s)-> ASCII Eintrag der der Farbe zugeordnet ist
+                //			    1    Byte	-> 0xff wenn Farbe transparent ist
+                //				3    Bytes  -> RGB Wert der Farbe
                 mpColMap = new BYTE[ mnColors * ( 4 + mnCpp ) ];
                 if ( mpColMap )
                 {
@@ -154,15 +154,15 @@ ReadState XPMReader::ReadXPM( Graphic& rGraphic )
                     {
                         maMaskBmp = Bitmap( Size( mnWidth, mnHeight ), 1 );
                         if ( ( mpMaskAcc = maMaskBmp.AcquireWriteAccess() ) == NULL )
-                            mbStatus =  FALSE;
+                            mbStatus =	FALSE;
                     }
                     if( mpAcc && mbStatus )
                     {
-                        ULONG   i;
-                        if ( mnColors <=256 )   // palette is only needed by using less than 257
-                        {                       // colors
+                        ULONG	i;
+                        if ( mnColors <=256 )	// palette is only needed by using less than 257
+                        {						// colors
 
-                            BYTE*   pPtr = &mpColMap[mnCpp];
+                            BYTE*	pPtr = &mpColMap[mnCpp];
 
                             for ( i = 0; i < mnColors; i++ )
                             {
@@ -170,12 +170,12 @@ ReadState XPMReader::ReadXPM( Graphic& rGraphic )
                                 pPtr += ( mnCpp + 4 );
                             }
                             // using 2 charakters per pixel and less than 257 Colors we speed up
-                            if ( mnCpp == 2 )   // by using a 64kb indexing table
+                            if ( mnCpp == 2 )	// by using a 64kb indexing table
                             {
                                 mpFastColorTable = new BYTE[ 256 * 256 ];
                                 for ( pPtr = mpColMap, i = 0; i < mnColors; i++, pPtr += mnCpp + 4 )
                                 {
-                                    ULONG   j =  pPtr[ 0 ] << 8;
+                                    ULONG	j =  pPtr[ 0 ] << 8;
                                             j += pPtr[ 1 ];
                                     mpFastColorTable[ j ] = (BYTE)i;
                                 }
@@ -242,9 +242,9 @@ ReadState XPMReader::ReadXPM( Graphic& rGraphic )
 
 BOOL XPMReader::ImplGetColor( ULONG nNumb )
 {
-    BYTE*   pString = mpStringBuf;
-    BYTE*   pPtr =  ( mpColMap + nNumb * ( 4 + mnCpp ) );
-    BOOL    bStatus = ImplGetString();
+    BYTE*	pString = mpStringBuf;
+    BYTE*	pPtr =  ( mpColMap + nNumb * ( 4 + mnCpp ) );
+    BOOL	bStatus = ImplGetString();
 
     if ( bStatus )
     {
@@ -261,11 +261,11 @@ BOOL XPMReader::ImplGetColor( ULONG nNumb )
 
 BOOL XPMReader::ImplGetScanLine( ULONG nY )
 {
-    BOOL    bStatus = ImplGetString();
-    BYTE*   pString = mpStringBuf;
-    BYTE*   pColor;
-    BitmapColor     aWhite;
-    BitmapColor     aBlack;
+    BOOL	bStatus = ImplGetString();
+    BYTE*	pString = mpStringBuf;
+    BYTE*	pColor;
+    BitmapColor		aWhite;
+    BitmapColor		aBlack;
 
     if ( bStatus )
     {
@@ -339,9 +339,9 @@ BOOL XPMReader::ImplGetColSub( BYTE* pDest )
         {
                 *pDest++ = 0;
                 bColStatus = TRUE;
-                switch ( mnParaSize )
+                switch ( mnParaSize	)
                 {
-                    case 25 :
+                    case 25	:
                         ImplGetRGBHex ( pDest, 6 );
                         break;
                     case 13 :
@@ -363,7 +363,7 @@ BOOL XPMReader::ImplGetColSub( BYTE* pDest )
             mbTransparent = TRUE;
         }
         // last we will try to get the colorname
-        else if ( mnParaSize > 2 )  // name must enlarge the minimum size
+        else if ( mnParaSize > 2 )	// name must enlarge the minimum size
         {
             ULONG i = 0;
             while ( TRUE )
@@ -437,15 +437,15 @@ BOOL XPMReader::ImplGetColKey( BYTE nKey )
 // ImplGetRGBHex uebersetzt den ASCII-Hexadezimalwert der sich bei mpPara befindet
 // in einen RGB wert und schreibt diesen nach pDest
 // folgende Formate muessen sich bei mpPara befinden:
-// wenn nAdd = 0 : '#12ab12'                    -> RGB = 0x12, 0xab, 0x12
-//             2 : '#1234abcd1234'                  "      "     "     "
-//             6 : '#12345678abcdefab12345678'      "      "     "     "
+// wenn nAdd = 0 : '#12ab12'					-> RGB = 0x12, 0xab, 0x12
+//			   2 : '#1234abcd1234'					"	   "     "	   "
+//			   6 : '#12345678abcdefab12345678'		"	   "	 "	   "
 
 
 void XPMReader::ImplGetRGBHex( BYTE* pDest,ULONG  nAdd )
 {
-    BYTE*   pPtr = mpPara+1;
-    BYTE    nHex, nTemp;
+    BYTE*	pPtr = mpPara+1;
+    BYTE 	nHex, nTemp;
 
     for ( ULONG i = 0; i < 3; i++ )
     {
@@ -477,7 +477,7 @@ ULONG XPMReader::ImplGetULONG( ULONG nPara )
         for ( ULONG i = 0; i < mnParaSize; i++ )
         {
             BYTE j = (*pPtr++) - 48;
-            if ( j > 9 ) return 0;              // ascii is invalid
+            if ( j > 9 ) return 0;				// ascii is invalid
             nRetValue*=10;
             nRetValue+=j;
         }
@@ -525,10 +525,10 @@ BOOL XPMReader::ImplCompare( BYTE* pSource, BYTE* pDest, ULONG nSize, ULONG nMod
 
 BOOL XPMReader::ImplGetPara ( ULONG nNumb )
 {
-    BYTE    nByte;
-    ULONG   pSize = 0;
-    BYTE*   pPtr = mpStringBuf;
-    ULONG   nCount = 0;
+    BYTE 	nByte;
+    ULONG	pSize = 0;
+    BYTE*	pPtr = mpStringBuf;
+    ULONG	nCount = 0;
 
     if ( ( *pPtr != ' ' ) && ( *pPtr != 0x09 ) )
     {
@@ -580,8 +580,8 @@ BOOL XPMReader::ImplGetPara ( ULONG nNumb )
 
 BOOL XPMReader::ImplGetString( void )
 {
-    BYTE        sID[] = "/* XPM */";
-    BYTE*       pString = mpStringBuf;
+    BYTE		sID[] = "/* XPM */";
+    BYTE*		pString = mpStringBuf;
 
     mnStringSize = 0;
     mpStringBuf[0] = 0;
@@ -600,10 +600,10 @@ BOOL XPMReader::ImplGetString( void )
             {
                 if ( mnTempAvail <= 50 )
                 {
-                    mbStatus = FALSE;   // file is too short to be a correct XPM format
+                    mbStatus = FALSE;	// file is too short to be a correct XPM format
                     break;
                 }
-                for ( int i = 0; i < 9; i++ )   // searching for "/* XPM */"
+                for ( int i = 0; i < 9; i++ )	// searching for "/* XPM */"
                     if ( *mpTempPtr++ != sID[i] )
                     {
                         mbStatus = FALSE;
@@ -629,11 +629,11 @@ BOOL XPMReader::ImplGetString( void )
                 mnStatus &=~XPMREMARK;
             continue;
         }
-        if ( mnStatus & XPMSTRING )             // characters in string
+        if ( mnStatus & XPMSTRING )				// characters in string
         {
             if ( mcThisByte == '"' )
             {
-                mnStatus &=~XPMSTRING;          // end of parameter by eol
+                mnStatus &=~XPMSTRING;			// end of parameter by eol
                 break;
             }
             if ( mnStringSize >= ( XPMSTRINGBUF - 1 ) )
@@ -647,7 +647,7 @@ BOOL XPMReader::ImplGetString( void )
             continue;
         }
         else
-        {                                           // characters beside string
+        {											// characters beside string
             switch ( mcThisByte )
             {
                 case '*' :
@@ -678,9 +678,9 @@ BOOL XPMReader::ImplGetString( void )
 
 BOOL ImportXPM( SvStream& rStm, Graphic& rGraphic )
 {
-    XPMReader*  pXPMReader = (XPMReader*) rGraphic.GetContext();
-    ReadState   eReadState;
-    BOOL        bRet = TRUE;
+    XPMReader*	pXPMReader = (XPMReader*) rGraphic.GetContext();
+    ReadState	eReadState;
+    BOOL		bRet = TRUE;
 
     if( !pXPMReader )
         pXPMReader = new XPMReader( rStm );
diff --git a/svtools/source/filter.vcl/jpeg/jpeg.cxx b/svtools/source/filter.vcl/jpeg/jpeg.cxx
index a2de92171af3..95b4674d4cc7 100644
--- a/svtools/source/filter.vcl/jpeg/jpeg.cxx
+++ b/svtools/source/filter.vcl/jpeg/jpeg.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
@@ -91,7 +91,7 @@ extern "C" long JPEGCallback( void* pCallbackData, long nPercent )
 
 #define BUF_SIZE  4096
 
-typedef struct
+typedef struct 
 {
   struct jpeg_destination_mgr pub;  /* public fields */
 
@@ -307,12 +307,12 @@ extern "C" void jpeg_svstream_src (j_decompress_ptr cinfo, void * in)
 // --------------
 
 JPEGReader::JPEGReader( SvStream& rStm, void* /*pCallData*/, sal_Bool bSetLS ) :
-        rIStm           ( rStm ),
-        pAcc            ( NULL ),
-        pAcc1           ( NULL ),
-        pBuffer         ( NULL ),
-        nLastPos        ( rStm.Tell() ),
-        nLastLines      ( 0 ),
+        rIStm			( rStm ),
+        pAcc			( NULL ),
+        pAcc1			( NULL ),
+        pBuffer			( NULL ),
+        nLastPos		( rStm.Tell() ),
+        nLastLines		( 0 ),
         bSetLogSize     ( bSetLS )
 {
     maUpperName = String::CreateFromAscii( "SVIJPEG", 7 );
@@ -360,26 +360,26 @@ void* JPEGReader::CreateBitmap( void* pParam )
     }
     else
         aBmp = Bitmap( aSize, 24 );
-
+   
     if ( bSetLogSize )
     {
         unsigned long nUnit = ((JPEGCreateBitmapParam*)pParam)->density_unit;
-
-        if( ( ( 1 == nUnit ) || ( 2 == nUnit ) ) &&
-            ( (JPEGCreateBitmapParam*) pParam )->X_density &&
+        
+        if( ( ( 1 == nUnit ) || ( 2 == nUnit ) ) && 
+            ( (JPEGCreateBitmapParam*) pParam )->X_density && 
             ( (JPEGCreateBitmapParam*) pParam )->Y_density )
         {
             Point       aEmptyPoint;
-            Fraction    aFractX( 1, ((JPEGCreateBitmapParam*)pParam)->X_density );
-            Fraction    aFractY( 1, ((JPEGCreateBitmapParam*)pParam)->Y_density );
-            MapMode     aMapMode( nUnit == 1 ? MAP_INCH : MAP_CM, aEmptyPoint, aFractX, aFractY );
-            Size        aPrefSize = OutputDevice::LogicToLogic( aSize, aMapMode, MAP_100TH_MM );
+            Fraction	aFractX( 1, ((JPEGCreateBitmapParam*)pParam)->X_density );
+            Fraction	aFractY( 1, ((JPEGCreateBitmapParam*)pParam)->Y_density );
+            MapMode		aMapMode( nUnit == 1 ? MAP_INCH : MAP_CM, aEmptyPoint, aFractX, aFractY );
+            Size		aPrefSize = OutputDevice::LogicToLogic( aSize, aMapMode, MAP_100TH_MM );
 
             aBmp.SetPrefSize( aPrefSize );
             aBmp.SetPrefMapMode( MapMode( MAP_100TH_MM ) );
         }
     }
-
+    
     pAcc = aBmp.AcquireWriteAccess();
 
     if( pAcc )
@@ -415,11 +415,11 @@ void JPEGReader::FillBitmap()
 {
     if( pBuffer && pAcc )
     {
-        HPBYTE      pTmp;
-        BitmapColor aColor;
-        long        nAlignedWidth;
-        long        nWidth = pAcc->Width();
-        long        nHeight = pAcc->Height();
+        HPBYTE		pTmp;
+        BitmapColor	aColor;
+        long		nAlignedWidth;
+        long		nWidth = pAcc->Width();
+        long		nHeight = pAcc->Height();
 
         if( pAcc->GetBitCount() == 8 )
         {
@@ -467,8 +467,8 @@ void JPEGReader::FillBitmap()
 
 Graphic JPEGReader::CreateIntermediateGraphic( const Bitmap& rBitmap, long nLines )
 {
-    Graphic     aGraphic;
-    const Size  aSizePix( rBitmap.GetSizePixel() );
+    Graphic		aGraphic;
+    const Size	aSizePix( rBitmap.GetSizePixel() );
 
     if( !nLastLines )
     {
@@ -512,11 +512,11 @@ Graphic JPEGReader::CreateIntermediateGraphic( const Bitmap& rBitmap, long nLine
 
 ReadState JPEGReader::Read( Graphic& rGraphic )
 {
-    long        nEndPos;
-    long        nLines;
-    ReadState   eReadState;
-    BOOL        bRet = FALSE;
-    BYTE        cDummy;
+    long		nEndPos;
+    long		nLines;
+    ReadState	eReadState;
+    BOOL		bRet = FALSE;
+    BYTE		cDummy;
 
 #if 1 // TODO: is it possible to get rid of this seek to the end?
     // check if the stream's end is already available
@@ -591,9 +591,9 @@ ReadState JPEGReader::Read( Graphic& rGraphic )
 // --------------
 
 JPEGWriter::JPEGWriter( SvStream& rStm, const uno::Sequence< beans::PropertyValue >* pFilterData, bool* pExportWasGrey ) :
-        rOStm       ( rStm ),
-        pAcc        ( NULL ),
-        pBuffer     ( NULL ),
+        rOStm		( rStm ),
+        pAcc		( NULL ),
+        pBuffer		( NULL ),
         pExpWasGrey ( pExportWasGrey )
 {
     FilterConfigItem aConfigItem( (uno::Sequence< beans::PropertyValue >*)pFilterData );
@@ -628,8 +628,8 @@ void* JPEGWriter::GetScanline( long nY )
         else if( pBuffer )
         {
             BitmapColor aColor;
-            long        nWidth = pAcc->Width();
-            BYTE*       pTmp = pBuffer;
+            long		nWidth = pAcc->Width();
+            BYTE*		pTmp = pBuffer;
 
             if( pAcc->HasPalette() )
             {
@@ -685,8 +685,8 @@ BOOL JPEGWriter::Write( const Graphic& rGraphic )
 
     pAcc = aGraphicBmp.AcquireReadAccess();
 
-    if ( !bGreys )  // bitmap was not explicitely converted into greyscale,
-    {               // check if source is greyscale only
+    if ( !bGreys )	// bitmap was not explicitely converted into greyscale,
+    {				// check if source is greyscale only
 
         sal_Bool bIsGrey = sal_True;
 
@@ -704,7 +704,7 @@ BOOL JPEGWriter::Write( const Graphic& rGraphic )
         if ( bIsGrey )
             bGreys = sal_True;
     }
-
+    
     if( pExpWasGrey )
         *pExpWasGrey = bGreys;
 
@@ -737,9 +737,9 @@ BOOL JPEGWriter::Write( const Graphic& rGraphic )
 
 BOOL ImportJPEG( SvStream& rStm, Graphic& rGraphic, void* pCallerData, sal_Int32 nImportFlags )
 {
-    JPEGReader* pJPEGReader = (JPEGReader*) rGraphic.GetContext();
-    ReadState   eReadState;
-    BOOL        bRet = TRUE;
+    JPEGReader*	pJPEGReader = (JPEGReader*) rGraphic.GetContext();
+    ReadState	eReadState;
+    BOOL		bRet = TRUE;
 
     if( !pJPEGReader )
         pJPEGReader = new JPEGReader( rStm, pCallerData, ( nImportFlags & GRFILTER_I_FLAGS_SET_LOGSIZE_FOR_JPEG ) != 0 );
diff --git a/svtools/source/filter.vcl/jpeg/jpeg.h b/svtools/source/filter.vcl/jpeg/jpeg.h
index deb06600474c..c3cdb35f54c2 100644
--- a/svtools/source/filter.vcl/jpeg/jpeg.h
+++ b/svtools/source/filter.vcl/jpeg/jpeg.h
@@ -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
@@ -44,29 +44,29 @@ struct JPEGCreateBitmapParam
     unsigned long X_density;
     unsigned long Y_density;
     long     bGray;
-
+    
     long     nAlignedWidth;  // these members will be filled by the
     long     bTopDown;      // CreateBitmap method in svtools
 };
 
-typedef struct my_error_mgr*    my_error_ptr;
-typedef unsigned char           BYTE;
+typedef struct my_error_mgr*	my_error_ptr;
+typedef unsigned char			BYTE;
 #ifdef WIN
-typedef unsigned char _huge*    HPBYTE;
+typedef unsigned char _huge*	HPBYTE;
 #else
-typedef unsigned char*          HPBYTE;
+typedef unsigned char*			HPBYTE;
 #endif
 
-void*   JPEGMalloc( size_t size );
-void    JPEGFree( void *ptr );
-long    JPEGCallback( void* pCallbackData, long nPercent );
+void*	JPEGMalloc( size_t size );
+void	JPEGFree( void *ptr );
+long	JPEGCallback( void* pCallbackData, long nPercent );
 
-long    WriteJPEG( void* pJPEGWriter, void* pOStm, long nWidth, long nHeight, long bGreyScale,
+long	WriteJPEG( void* pJPEGWriter, void* pOStm, long nWidth, long nHeight, long bGreyScale,
                    long nQualityPercent, void* pCallbackData );
-void*   GetScanline( void* pJPEGWriter, long nY );
+void*	GetScanline( void* pJPEGWriter, long nY );
 
-void    ReadJPEG( void* pJPEGReader, void* pIStm, long* pLines );
-void*   CreateBitmap( void* pJPEGReader, void* pJPEGCreateBitmapParam );
+void	ReadJPEG( void* pJPEGReader, void* pIStm, long* pLines );
+void*	CreateBitmap( void* pJPEGReader, void* pJPEGCreateBitmapParam );
 
 /* TODO: when incompatible changes are possible again
    the preview size hint should be redone */
diff --git a/svtools/source/filter.vcl/jpeg/jpegc.c b/svtools/source/filter.vcl/jpeg/jpegc.c
index 29b4749a7b51..7bdbe66e4e0d 100644
--- a/svtools/source/filter.vcl/jpeg/jpegc.c
+++ b/svtools/source/filter.vcl/jpeg/jpegc.c
@@ -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
@@ -71,11 +71,11 @@ void SetJpegPreviewSizeHint( int nWidth, int nHeight )
 
 void ReadJPEG( void* pJPEGReader, void* pIStm, long* pLines )
 {
-    struct jpeg_decompress_struct   cinfo;
-    struct my_error_mgr             jerr;
+    struct jpeg_decompress_struct	cinfo;
+    struct my_error_mgr				jerr;
     struct JPEGCreateBitmapParam    aCreateBitmapParam;
-    HPBYTE                          pDIB;
-    HPBYTE                          pTmp;
+    HPBYTE							pDIB;
+    HPBYTE							pTmp;
     long                            nWidth;
     long                            nHeight;
     long                            nAlignedWidth;
@@ -84,7 +84,7 @@ void ReadJPEG( void* pJPEGReader, void* pIStm, long* pLines )
     long nScanLineBufferComponents = 0;
     // declare bDecompCreated volatile because of gcc
     // warning: variable 'bDecompCreated' might be clobbered by `longjmp' or `vfork'
-    volatile long                   bDecompCreated = 0;
+    volatile long					bDecompCreated = 0;
 
     /* Falls der Stream nicht ausreicht (IO_PENDING)
      wird ueber ein longjmp in der Schleife nach Exit
@@ -197,7 +197,7 @@ void ReadJPEG( void* pJPEGReader, void* pIStm, long* pLines )
             /* PENDING ??? */
             if ( cinfo.err->msg_code == 113 )
             break;
-
+            
             pTmp += nAlignedWidth;
         }
     }
@@ -218,14 +218,14 @@ long WriteJPEG( void* pJPEGWriter, void* pOStm,
                 long nWidth, long nHeight, long bGreys,
                 long nQualityPercent, void* pCallbackData )
 {
-    struct jpeg_compress_struct cinfo;
-    struct my_error_mgr         jerr;
-    void*                       pScanline;
-    long                        nY;
+    struct jpeg_compress_struct	cinfo;
+    struct my_error_mgr			jerr;
+    void*						pScanline;
+    long						nY;
     // declare bCompCreated, bRet volatile because of gcc
     // warning: variable 'bCompCreated' might be clobbered by `longjmp' or `vfork'
-    volatile long               bCompCreated = 0;
-    volatile long               bRet = 0;
+    volatile long				bCompCreated = 0;
+    volatile long				bRet = 0;
 
     if ( setjmp( jerr.setjmp_buffer ) )
         goto Exit;
diff --git a/svtools/source/filter.vcl/wmf/emfwr.cxx b/svtools/source/filter.vcl/wmf/emfwr.cxx
index f31fd4439e9f..1c457a2f456d 100644
--- a/svtools/source/filter.vcl/wmf/emfwr.cxx
+++ b/svtools/source/filter.vcl/wmf/emfwr.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
@@ -136,33 +136,33 @@
 #define WIN_EMR_POLYTEXTOUTA                96
 #define WIN_EMR_POLYTEXTOUTW                97
 
-#define WIN_SRCCOPY                         0x00CC0020L
-#define WIN_SRCPAINT                        0x00EE0086L
-#define WIN_SRCAND                          0x008800C6L
-#define WIN_SRCINVERT                       0x00660046L
+#define WIN_SRCCOPY							0x00CC0020L
+#define WIN_SRCPAINT						0x00EE0086L
+#define WIN_SRCAND							0x008800C6L
+#define WIN_SRCINVERT						0x00660046L
 
-#define HANDLE_INVALID                      0xffffffff
-#define MAXHANDLES                          65000
+#define HANDLE_INVALID						0xffffffff
+#define MAXHANDLES							65000
 
-#define LINE_SELECT                         0x00000001
-#define FILL_SELECT                         0x00000002
-#define TEXT_SELECT                         0x00000004
+#define LINE_SELECT							0x00000001
+#define FILL_SELECT							0x00000002
+#define TEXT_SELECT							0x00000004
 
 /* Text Alignment Options */
-#define TA_NOUPDATECP                       0
-#define TA_UPDATECP                         1
+#define TA_NOUPDATECP						0
+#define TA_UPDATECP							1
 
-#define TA_LEFT                             0
-#define TA_RIGHT                            2
-#define TA_CENTER                           6
+#define TA_LEFT								0
+#define TA_RIGHT							2
+#define TA_CENTER							6
 
-#define TA_TOP                              0
-#define TA_BOTTOM                           8
-#define TA_BASELINE                         24
-#define TA_RTLREADING                       256
-#define TA_MASK     (TA_BASELINE+TA_CENTER+TA_UPDATECP+TA_RTLREADING)
+#define TA_TOP								0
+#define TA_BOTTOM							8
+#define TA_BASELINE							24
+#define TA_RTLREADING						256
+#define TA_MASK		(TA_BASELINE+TA_CENTER+TA_UPDATECP+TA_RTLREADING)
 
-#define MM_ANISOTROPIC                      8
+#define MM_ANISOTROPIC						8
 
 // -------------
 // - EMFWriter -
@@ -177,21 +177,21 @@ BOOL EMFWriter::WriteEMF( const GDIMetaFile& rMtf, SvStream& rOStm, FilterConfig
     mnHorTextAlign = mnHandleCount = mnLastPercent = mnRecordPos = mnRecordCount = 0;
     mnLineHandle = mnFillHandle = mnTextHandle = HANDLE_INVALID;
     mbRecordOpen = FALSE;
-
+    
     mpStm = &rOStm;
     maVDev.EnableOutput( FALSE );
     maVDev.SetMapMode( rMtf.GetPrefMapMode() );
     mpFilterConfigItem = pFilterConfigItem;
 
     // don't work with pixel as destination map mode -> higher resolution preferrable
-    maDestMapMode.SetMapUnit( MAP_100TH_MM );
+    maDestMapMode.SetMapUnit( MAP_100TH_MM ); 
 
     const Size aMtfSizePix( maVDev.LogicToPixel( rMtf.GetPrefSize(), rMtf.GetPrefMapMode() ) );
     const Size aMtfSizeLog( maVDev.LogicToLogic( rMtf.GetPrefSize(), rMtf.GetPrefMapMode(), MAP_100TH_MM ) );
-
+    
     // seek over header
     // use [MS-EMF 2.2.11] HeaderExtension2 Object, otherwise resulting EMF cannot be converted with GetWinMetaFileBits()
-    rOStm.SeekRel( 108 );
+    rOStm.SeekRel( 108 ); 
 
     // write initial values
 
@@ -226,16 +226,16 @@ BOOL EMFWriter::WriteEMF( const GDIMetaFile& rMtf, SvStream& rOStm, FilterConfig
     ImplWrite( rMtf );
 
     ImplBeginRecord( WIN_EMR_EOF );
-    (*mpStm)<< (sal_uInt32)0        // nPalEntries
-            << (sal_uInt32)0x10     // offPalEntries
-            << (sal_uInt32)0x14;    // nSizeLast
+    (*mpStm)<< (sal_uInt32)0		// nPalEntries
+            << (sal_uInt32)0x10		// offPalEntries
+            << (sal_uInt32)0x14;	// nSizeLast
     ImplEndRecord();
 
 
     // write header
     const ULONG nEndPos = mpStm->Tell(); mpStm->Seek( nHeaderPos );
-
-    (*mpStm) << (UINT32) 0x00000001 << (UINT32) 108 //use [MS-EMF 2.2.11] HeaderExtension2 Object
+    
+    (*mpStm) << (UINT32) 0x00000001 << (UINT32) 108	//use [MS-EMF 2.2.11] HeaderExtension2 Object
              << (INT32) 0 << (INT32) 0 << (INT32) ( aMtfSizePix.Width() - 1 ) << (INT32) ( aMtfSizePix.Height() - 1 )
              << (INT32) 0 << (INT32) 0 << (INT32) ( aMtfSizeLog.Width() - 1 ) << (INT32) ( aMtfSizeLog.Height() - 1 )
              << (UINT32) 0x464d4520 << (UINT32) 0x10000 << (UINT32) ( nEndPos - nHeaderPos )
@@ -246,7 +246,7 @@ BOOL EMFWriter::WriteEMF( const GDIMetaFile& rMtf, SvStream& rOStm, FilterConfig
              << (INT32) (  aMtfSizeLog.Width() * 10 ) << (INT32) ( aMtfSizeLog.Height() * 10 ); //use [MS-EMF 2.2.11] HeaderExtension2 Object
 
     mpStm->Seek( nEndPos );
-    delete[] mpHandlesUsed;
+    delete[] mpHandlesUsed; 
 
     return( mpStm->GetError() == ERRCODE_NONE );
 }
@@ -307,7 +307,7 @@ void EMFWriter::ImplEndRecord()
         sal_Int32 nFillBytes, nActPos = mpStm->Tell();
         mpStm->Seek( mnRecordPos + 4 );
         nFillBytes = nActPos - mnRecordPos;
-        nFillBytes += 3;    // each record has to be dword aligned
+        nFillBytes += 3;	// each record has to be dword aligned
         nFillBytes ^= 3;
         nFillBytes &= 3;
         *mpStm << (sal_uInt32)( ( nActPos - mnRecordPos ) + nFillBytes );
@@ -327,7 +327,7 @@ BOOL EMFWriter::ImplPrepareHandleSelect( sal_uInt32& rHandle, ULONG nSelectType
     {
         UINT32 nStockObject = 0x80000000;
 
-        if( LINE_SELECT == nSelectType )
+        if( LINE_SELECT == nSelectType ) 
             nStockObject |= 0x00000007;
         else if( FILL_SELECT == nSelectType )
             nStockObject |= 0x00000001;
@@ -338,13 +338,13 @@ BOOL EMFWriter::ImplPrepareHandleSelect( sal_uInt32& rHandle, ULONG nSelectType
         ImplBeginRecord( WIN_EMR_SELECTOBJECT );
         ( *mpStm ) << nStockObject;
         ImplEndRecord();
-
+        
         // destroy handle of created object
         ImplBeginRecord( WIN_EMR_DELETEOBJECT );
         ( *mpStm ) << rHandle;
         ImplEndRecord();
 
-        // mark handle as free
+        // mark handle as free 
         ImplReleaseHandle( rHandle );
     }
 
@@ -400,11 +400,11 @@ void EMFWriter::ImplCheckTextAttr()
 {
     if( mbTextChanged && ImplPrepareHandleSelect( mnTextHandle, TEXT_SELECT ) )
     {
-        const Font&     rFont = maVDev.GetFont();
-        String          aFontName( rFont.GetName() );
-        sal_Int32       nWeight;
-        sal_uInt16      i;
-        sal_uInt8       nPitchAndFamily;
+        const Font&		rFont = maVDev.GetFont();
+        String			aFontName( rFont.GetName() );
+        sal_Int32		nWeight;
+        sal_uInt16		i;
+        sal_uInt8		nPitchAndFamily;
 
         ImplBeginRecord( WIN_EMR_EXTCREATEFONTINDIRECTW );
         (*mpStm) << mnTextHandle;
@@ -412,7 +412,7 @@ void EMFWriter::ImplCheckTextAttr()
         ImplWriteExtent( rFont.GetSize().Width() );
         (*mpStm) << (INT32) rFont.GetOrientation() << (INT32) rFont.GetOrientation();
 
-        switch( rFont.GetWeight() )
+        switch( rFont.GetWeight() ) 
         {
             case WEIGHT_THIN:       nWeight = 100; break;
             case WEIGHT_ULTRALIGHT: nWeight = 200; break;
@@ -424,9 +424,9 @@ void EMFWriter::ImplCheckTextAttr()
             case WEIGHT_BOLD:       nWeight = 700; break;
             case WEIGHT_ULTRABOLD:  nWeight = 800; break;
             case WEIGHT_BLACK:      nWeight = 900; break;
-            default:                nWeight = 0; break;
+            default:				nWeight = 0; break;
         }
-
+        
         (*mpStm) << nWeight;
         (*mpStm) << (BYTE) ( ( ITALIC_NONE == rFont.GetItalic() ) ? 0 : 1 );
         (*mpStm) << (BYTE) ( ( UNDERLINE_NONE == rFont.GetUnderline() ) ? 0 : 1 );
@@ -434,14 +434,14 @@ void EMFWriter::ImplCheckTextAttr()
         (*mpStm) << (BYTE) ( ( RTL_TEXTENCODING_SYMBOL == rFont.GetCharSet() ) ? 2 : 0 );
         (*mpStm) << (BYTE) 0 << (BYTE) 0 << (BYTE) 0;
 
-        switch( rFont.GetPitch() )
+        switch( rFont.GetPitch() ) 
         {
             case PITCH_FIXED:    nPitchAndFamily = 0x01; break;
             case PITCH_VARIABLE: nPitchAndFamily = 0x02; break;
             default:             nPitchAndFamily = 0x00; break;
         }
 
-        switch( rFont.GetFamily() )
+        switch( rFont.GetFamily() ) 
         {
             case FAMILY_DECORATIVE: nPitchAndFamily |= 0x50; break;
             case FAMILY_MODERN:     nPitchAndFamily |= 0x30; break;
@@ -527,8 +527,8 @@ void EMFWriter::ImplWriteRasterOp( RasterOp eRop )
 
     switch( eRop )
     {
-        case ROP_INVERT: nROP2 = 6; break;
-        case ROP_XOR:    nROP2 = 7; break;
+        case ROP_INVERT: nROP2 = 6;	break;
+        case ROP_XOR:    nROP2 = 7;	break;
         default:         nROP2 = 13;break;
     }
 
@@ -608,8 +608,8 @@ void EMFWriter::ImplWritePolyPolygonRecord( const PolyPolygon& rPolyPoly )
             ImplWritePolygonRecord( rPolyPoly[ 0 ], TRUE );
         else
         {
-            sal_Bool    bHasFlags = sal_False;
-            sal_uInt32  nTotalPoints = 0;
+            sal_Bool	bHasFlags = sal_False;
+            sal_uInt32	nTotalPoints = 0;
 
             for( i = 0; i < nPolyCount; i++ )
             {
@@ -673,12 +673,12 @@ void EMFWriter::ImplWritePath( const PolyPolygon& rPolyPoly, sal_Bool bClosed )
                 n++;
                 continue;
             }
-
+            
             sal_uInt16 nBezPoints = 0;
-
+            
             while ( ( ( nBezPoints + n + 2 ) < rPoly.GetSize() ) && ( rPoly.GetFlags( nBezPoints + n ) == POLY_CONTROL ) )
                 nBezPoints += 3;
-
+        
             if ( nBezPoints )
             {
                 ImplBeginRecord( WIN_EMR_POLYBEZIERTO );
@@ -698,12 +698,12 @@ void EMFWriter::ImplWritePath( const PolyPolygon& rPolyPoly, sal_Bool bClosed )
                 sal_uInt16 nPoints = 1;
                 while( ( nPoints + n ) < rPoly.GetSize() && ( rPoly.GetFlags( nPoints + n ) != POLY_CONTROL ) )
                     nPoints++;
-
+            
                 if ( nPoints > 1 )
                 {
                     ImplBeginRecord( WIN_EMR_POLYLINETO );
                     Polygon aNewPoly( nPoints + 1 );
-                    aNewPoly[ 0 ] = rPoly[ n - 1];
+                    aNewPoly[ 0 ] = rPoly[ n - 1];	
                     for ( o = 1; o <= nPoints; o++ )
                         aNewPoly[ o ] = rPoly[ n - 1 + o ];
                     ImplWriteRect( aNewPoly.GetBoundRect() );
@@ -736,19 +736,19 @@ void EMFWriter::ImplWritePath( const PolyPolygon& rPolyPoly, sal_Bool bClosed )
 
 // -----------------------------------------------------------------------------
 
-void EMFWriter::ImplWriteBmpRecord( const Bitmap& rBmp, const Point& rPt,
+void EMFWriter::ImplWriteBmpRecord( const Bitmap& rBmp, const Point& rPt, 
                                     const Size& rSz, UINT32 nROP )
 {
     if( !!rBmp )
     {
-        SvMemoryStream  aMemStm( 65535, 65535 );
-        const Size      aBmpSizePixel( rBmp.GetSizePixel() );
+        SvMemoryStream	aMemStm( 65535, 65535 );
+        const Size		aBmpSizePixel( rBmp.GetSizePixel() );
 
         ImplBeginRecord( WIN_EMR_STRETCHDIBITS );
         ImplWriteRect( Rectangle( rPt, rSz ) );
         ImplWritePoint( rPt );
         (*mpStm) << (INT32) 0 << (INT32) 0 << (INT32) aBmpSizePixel.Width() << (INT32) aBmpSizePixel.Height();
-
+        
         // write offset positions and sizes later
         const ULONG nOffPos = mpStm->Tell();
         mpStm->SeekRel( 16 );
@@ -758,8 +758,8 @@ void EMFWriter::ImplWriteBmpRecord( const Bitmap& rBmp, const Point& rPt,
 
         rBmp.Write( aMemStm, TRUE, FALSE );
 
-        UINT32  nDIBSize = aMemStm.Tell(), nHeaderSize, nCompression, nColsUsed, nPalCount, nImageSize;
-        UINT16  nBitCount;
+        UINT32	nDIBSize = aMemStm.Tell(), nHeaderSize, nCompression, nColsUsed, nPalCount, nImageSize;
+        UINT16	nBitCount;
 
         // get DIB parameters
         aMemStm.Seek( 0 );
@@ -769,7 +769,7 @@ void EMFWriter::ImplWriteBmpRecord( const Bitmap& rBmp, const Point& rPt,
         aMemStm.SeekRel( 8 );
         aMemStm >> nColsUsed;
 
-        nPalCount = ( nBitCount <= 8 ) ? ( nColsUsed ? nColsUsed : ( 1 << (UINT32) nBitCount ) ) :
+        nPalCount = ( nBitCount <= 8 ) ? ( nColsUsed ? nColsUsed : ( 1 << (UINT32) nBitCount ) ) : 
                                          ( ( 3 == nCompression ) ? 12 : 0 );
 
         mpStm->Write( aMemStm.GetData(), nDIBSize );
@@ -792,9 +792,9 @@ void EMFWriter::ImplWriteTextRecord( const Point& rPos, const String rText, cons
 
     if( nLen )
     {
-        sal_uInt32  nNormWidth;
-        sal_Int32*  pOwnArray;
-        sal_Int32*  pDX;
+        sal_uInt32	nNormWidth;
+        sal_Int32*	pOwnArray;
+        sal_Int32*	pDX;
 
         // get text sizes
         if( pDXArray )
@@ -804,7 +804,7 @@ void EMFWriter::ImplWriteTextRecord( const Point& rPos, const String rText, cons
             pDX = (sal_Int32*) pDXArray;
         }
         else
-        {
+        {	
             pOwnArray = new sal_Int32[ nLen ];
             nNormWidth = maVDev.GetTextArray( rText, pOwnArray );
             pDX = pOwnArray;
@@ -904,12 +904,12 @@ void EMFWriter::ImplWrite( const GDIMetaFile& rMtf )
 {
     for( ULONG j = 0, nActionCount = rMtf.GetActionCount(); j < nActionCount; j++ )
     {
-        const MetaAction*   pAction = rMtf.GetAction( j );
-        const USHORT        nType = pAction->GetType();
+        const MetaAction*	pAction = rMtf.GetAction( j );
+        const USHORT		nType = pAction->GetType();
 
         switch( nType )
         {
-            case( META_PIXEL_ACTION ):
+            case( META_PIXEL_ACTION	):
             {
                 const MetaPixelAction* pA = (const MetaPixelAction*) pAction;
 
@@ -921,7 +921,7 @@ void EMFWriter::ImplWrite( const GDIMetaFile& rMtf )
             }
             break;
 
-            case( META_POINT_ACTION ):
+            case( META_POINT_ACTION	):
             {
                 if( maVDev.IsLineColor() )
                 {
@@ -945,7 +945,7 @@ void EMFWriter::ImplWrite( const GDIMetaFile& rMtf )
                     if(pA->GetLineInfo().IsDefault())
                     {
                         ImplCheckLineAttr();
-
+                        
                         ImplBeginRecord( WIN_EMR_MOVETOEX );
                         ImplWritePoint( pA->GetStartPoint() );
                         ImplEndRecord();
@@ -987,7 +987,7 @@ void EMFWriter::ImplWrite( const GDIMetaFile& rMtf )
             }
             break;
 
-            case( META_ROUNDRECT_ACTION ):
+            case( META_ROUNDRECT_ACTION	):
             {
                 if( maVDev.IsLineColor() || maVDev.IsFillColor() )
                 {
@@ -1022,7 +1022,7 @@ void EMFWriter::ImplWrite( const GDIMetaFile& rMtf )
 
             case( META_ARC_ACTION ):
             case( META_PIE_ACTION ):
-            case( META_CHORD_ACTION ):
+            case( META_CHORD_ACTION	):
             case( META_POLYGON_ACTION ):
             {
                 if( maVDev.IsLineColor() || maVDev.IsFillColor() )
@@ -1045,13 +1045,13 @@ void EMFWriter::ImplWrite( const GDIMetaFile& rMtf )
                         }
                         break;
 
-                        case( META_CHORD_ACTION ):
+                        case( META_CHORD_ACTION	):
                         {
                             const MetaChordAction* pA = (const MetaChordAction*) pAction;
                             aPoly = Polygon( pA->GetRect(), pA->GetStartPoint(), pA->GetEndPoint(), POLY_CHORD );
                         }
                         break;
-
+                        
                         case( META_POLYGON_ACTION ):
                             aPoly = ( (const MetaPolygonAction*) pAction )->GetPolygon();
                         break;
@@ -1066,8 +1066,8 @@ void EMFWriter::ImplWrite( const GDIMetaFile& rMtf )
             {
                 if( maVDev.IsLineColor() )
                 {
-                    const MetaPolyLineAction*   pA = (const MetaPolyLineAction*) pAction;
-                    const Polygon&              rPoly = pA->GetPolygon();
+                    const MetaPolyLineAction*	pA = (const MetaPolyLineAction*) pAction;
+                    const Polygon&				rPoly = pA->GetPolygon();
 
                     if( rPoly.GetSize() )
                     {
@@ -1094,8 +1094,8 @@ void EMFWriter::ImplWrite( const GDIMetaFile& rMtf )
 
             case( META_GRADIENT_ACTION ):
             {
-                const MetaGradientAction*   pA = (const MetaGradientAction*) pAction;
-                GDIMetaFile                 aTmpMtf;
+                const MetaGradientAction*	pA = (const MetaGradientAction*) pAction;
+                GDIMetaFile					aTmpMtf;
 
                 maVDev.AddGradientActions( pA->GetRect(), pA->GetGradient(), aTmpMtf );
                 ImplWrite( aTmpMtf );
@@ -1104,8 +1104,8 @@ void EMFWriter::ImplWrite( const GDIMetaFile& rMtf )
 
             case META_HATCH_ACTION:
             {
-                const MetaHatchAction*  pA = (const MetaHatchAction*) pAction;
-                GDIMetaFile             aTmpMtf;
+                const MetaHatchAction*	pA = (const MetaHatchAction*) pAction;
+                GDIMetaFile				aTmpMtf;
 
                 maVDev.AddHatchActions( pA->GetPolyPolygon(), pA->GetHatch(), aTmpMtf );
                 ImplWrite( aTmpMtf );
@@ -1123,15 +1123,15 @@ void EMFWriter::ImplWrite( const GDIMetaFile& rMtf )
             case META_FLOATTRANSPARENT_ACTION:
             {
                 const MetaFloatTransparentAction* pA = (const MetaFloatTransparentAction*) pAction;
-
-                GDIMetaFile     aTmpMtf( pA->GetGDIMetaFile() );
-                Point           aSrcPt( aTmpMtf.GetPrefMapMode().GetOrigin() );
-                const Size      aSrcSize( aTmpMtf.GetPrefSize() );
-                const Point     aDestPt( pA->GetPoint() );
-                const Size      aDestSize( pA->GetSize() );
-                const double    fScaleX = aSrcSize.Width() ? (double) aDestSize.Width() / aSrcSize.Width() : 1.0;
-                const double    fScaleY = aSrcSize.Height() ? (double) aDestSize.Height() / aSrcSize.Height() : 1.0;
-                long            nMoveX, nMoveY;
+                
+                GDIMetaFile		aTmpMtf( pA->GetGDIMetaFile() );
+                Point			aSrcPt( aTmpMtf.GetPrefMapMode().GetOrigin() );
+                const Size		aSrcSize( aTmpMtf.GetPrefSize() );
+                const Point		aDestPt( pA->GetPoint() );
+                const Size		aDestSize( pA->GetSize() );
+                const double	fScaleX = aSrcSize.Width() ? (double) aDestSize.Width() / aSrcSize.Width() : 1.0;
+                const double	fScaleY = aSrcSize.Height() ? (double) aDestSize.Height() / aSrcSize.Height() : 1.0;
+                long			nMoveX, nMoveY;
 
                 if( fScaleX != 1.0 || fScaleY != 1.0 )
                 {
@@ -1153,8 +1153,8 @@ void EMFWriter::ImplWrite( const GDIMetaFile& rMtf )
 
             case( META_EPS_ACTION ):
             {
-                const MetaEPSAction*    pA = (const MetaEPSAction*) pAction;
-                const GDIMetaFile       aSubstitute( pA->GetSubstitute() );
+                const MetaEPSAction*	pA = (const MetaEPSAction*) pAction;
+                const GDIMetaFile		aSubstitute( pA->GetSubstitute() );
 
                 for( ULONG i = 0, nCount = aSubstitute.GetActionCount(); i < nCount; i++ )
                 {
@@ -1165,7 +1165,7 @@ void EMFWriter::ImplWrite( const GDIMetaFile& rMtf )
                         ImplBeginRecord( WIN_EMR_SAVEDC );
                         ImplEndRecord();
 
-                        MapMode aMapMode( aSubstitute.GetPrefMapMode() );
+                        MapMode	aMapMode( aSubstitute.GetPrefMapMode() );
                         Size aOutSize( maVDev.LogicToLogic( pA->GetSize(), maVDev.GetMapMode(), aMapMode ) );
                         aMapMode.SetScaleX( Fraction( aOutSize.Width(), aSubstitute.GetPrefSize().Width() ) );
                         aMapMode.SetScaleY( Fraction( aOutSize.Height(), aSubstitute.GetPrefSize().Height() ) );
@@ -1199,8 +1199,8 @@ void EMFWriter::ImplWrite( const GDIMetaFile& rMtf )
 
             case META_BMPSCALEPART_ACTION:
             {
-                const MetaBmpScalePartAction*   pA = (const MetaBmpScalePartAction*) pAction;
-                Bitmap                          aTmp( pA->GetBitmap() );
+                const MetaBmpScalePartAction*	pA = (const MetaBmpScalePartAction*) pAction;
+                Bitmap							aTmp( pA->GetBitmap() );
 
                 if( aTmp.Crop( Rectangle( pA->GetSrcPoint(), pA->GetSrcSize() ) ) )
                     ImplWriteBmpRecord( aTmp, pA->GetDestPoint(), pA->GetDestSize(), WIN_SRCCOPY );
@@ -1209,9 +1209,9 @@ void EMFWriter::ImplWrite( const GDIMetaFile& rMtf )
 
             case META_BMPEX_ACTION:
             {
-                const MetaBmpExAction*  pA = (const MetaBmpExAction *) pAction;
-                Bitmap                  aBmp( pA->GetBitmapEx().GetBitmap() );
-                Bitmap                  aMsk( pA->GetBitmapEx().GetMask() );
+                const MetaBmpExAction*	pA = (const MetaBmpExAction *) pAction;
+                Bitmap					aBmp( pA->GetBitmapEx().GetBitmap() );
+                Bitmap					aMsk( pA->GetBitmapEx().GetMask() );
 
                 if( !!aMsk )
                 {
@@ -1227,9 +1227,9 @@ void EMFWriter::ImplWrite( const GDIMetaFile& rMtf )
 
             case META_BMPEXSCALE_ACTION:
             {
-                const MetaBmpExScaleAction* pA = (const MetaBmpExScaleAction*) pAction;
-                Bitmap                      aBmp( pA->GetBitmapEx().GetBitmap() );
-                Bitmap                      aMsk( pA->GetBitmapEx().GetMask() );
+                const MetaBmpExScaleAction*	pA = (const MetaBmpExScaleAction*) pAction;
+                Bitmap						aBmp( pA->GetBitmapEx().GetBitmap() );
+                Bitmap						aMsk( pA->GetBitmapEx().GetMask() );
 
                 if( !!aMsk )
                 {
@@ -1245,11 +1245,11 @@ void EMFWriter::ImplWrite( const GDIMetaFile& rMtf )
 
             case META_BMPEXSCALEPART_ACTION:
             {
-                const MetaBmpExScalePartAction* pA = (const MetaBmpExScalePartAction*) pAction;
-                BitmapEx                        aBmpEx( pA->GetBitmapEx() );
+                const MetaBmpExScalePartAction*	pA = (const MetaBmpExScalePartAction*) pAction;
+                BitmapEx						aBmpEx( pA->GetBitmapEx() );
                 aBmpEx.Crop( Rectangle( pA->GetSrcPoint(), pA->GetSrcSize() ) );
-                Bitmap                          aBmp( aBmpEx.GetBitmap() );
-                Bitmap                          aMsk( aBmpEx.GetMask() );
+                Bitmap							aBmp( aBmpEx.GetBitmap() );
+                Bitmap							aMsk( aBmpEx.GetMask() );
 
                 if( !!aMsk )
                 {
@@ -1265,8 +1265,8 @@ void EMFWriter::ImplWrite( const GDIMetaFile& rMtf )
 
             case META_TEXT_ACTION:
             {
-                const MetaTextAction*   pA = (const MetaTextAction*) pAction;
-                const String            aText( pA->GetText(), pA->GetIndex(), pA->GetLen() );
+                const MetaTextAction*	pA = (const MetaTextAction*) pAction;
+                const String			aText( pA->GetText(), pA->GetIndex(), pA->GetLen() );
 
                 ImplCheckTextAttr();
                 ImplWriteTextRecord( pA->GetPoint(), aText, NULL, 0 );
@@ -1275,8 +1275,8 @@ void EMFWriter::ImplWrite( const GDIMetaFile& rMtf )
 
             case META_TEXTRECT_ACTION:
             {
-                const MetaTextRectAction*   pA = (const MetaTextRectAction*) pAction;
-                const String                aText( pA->GetText() );
+                const MetaTextRectAction*	pA = (const MetaTextRectAction*) pAction;
+                const String				aText( pA->GetText() );
 
                 ImplCheckTextAttr();
                 ImplWriteTextRecord( pA->GetRect().TopLeft(), aText, NULL, 0 );
@@ -1285,8 +1285,8 @@ void EMFWriter::ImplWrite( const GDIMetaFile& rMtf )
 
             case META_TEXTARRAY_ACTION:
             {
-                const MetaTextArrayAction*  pA = (const MetaTextArrayAction*) pAction;
-                const String                aText( pA->GetText(), pA->GetIndex(), pA->GetLen() );
+                const MetaTextArrayAction*	pA = (const MetaTextArrayAction*) pAction;
+                const String				aText( pA->GetText(), pA->GetIndex(), pA->GetLen() );
 
                 ImplCheckTextAttr();
                 ImplWriteTextRecord( pA->GetPoint(), aText, pA->GetDXArray(), 0 );
@@ -1295,32 +1295,32 @@ void EMFWriter::ImplWrite( const GDIMetaFile& rMtf )
 
             case META_STRETCHTEXT_ACTION:
             {
-                const MetaStretchTextAction*    pA = (const MetaStretchTextAction*) pAction;
-                const String                    aText( pA->GetText(), pA->GetIndex(), pA->GetLen() );
+                const MetaStretchTextAction*	pA = (const MetaStretchTextAction*) pAction;
+                const String					aText( pA->GetText(), pA->GetIndex(), pA->GetLen() );
 
                 ImplCheckTextAttr();
                 ImplWriteTextRecord( pA->GetPoint(), aText, NULL, pA->GetWidth() );
             }
             break;
-
-            case( META_LINECOLOR_ACTION ):
+        
+            case( META_LINECOLOR_ACTION	):
             {
                 ( (MetaAction*) pAction )->Execute( &maVDev );
                 mbLineChanged = TRUE;
             }
             break;
-
-            case( META_FILLCOLOR_ACTION ):
+            
+            case( META_FILLCOLOR_ACTION	):
             {
                 ( (MetaAction*) pAction )->Execute( &maVDev );
                 mbFillChanged = TRUE;
             }
             break;
 
-            case( META_TEXTCOLOR_ACTION ):
+            case( META_TEXTCOLOR_ACTION	):
             case( META_TEXTLINECOLOR_ACTION ):
-            case( META_TEXTFILLCOLOR_ACTION ):
-            case( META_TEXTALIGN_ACTION ):
+            case( META_TEXTFILLCOLOR_ACTION	):
+            case( META_TEXTALIGN_ACTION	):
             case( META_FONT_ACTION ):
             {
                 ( (MetaAction*) pAction )->Execute( &maVDev );
@@ -1331,7 +1331,7 @@ void EMFWriter::ImplWrite( const GDIMetaFile& rMtf )
             case( META_ISECTRECTCLIPREGION_ACTION ):
             {
                 ( (MetaAction*) pAction )->Execute( &maVDev );
-
+                
                 ImplBeginRecord( WIN_EMR_INTERSECTCLIPRECT );
                 ImplWriteRect( ( (MetaISectRectClipRegionAction*) pAction )->GetRect() );
                 ImplEndRecord();
@@ -1339,7 +1339,7 @@ void EMFWriter::ImplWrite( const GDIMetaFile& rMtf )
             break;
 
             case( META_CLIPREGION_ACTION ):
-            case( META_ISECTREGIONCLIPREGION_ACTION ):
+            case( META_ISECTREGIONCLIPREGION_ACTION	):
             case( META_MOVECLIPREGION_ACTION ):
             {
                 ( (MetaAction*) pAction )->Execute( &maVDev );
@@ -1354,7 +1354,7 @@ void EMFWriter::ImplWrite( const GDIMetaFile& rMtf )
             case( META_PUSH_ACTION ):
             {
                 ( (MetaAction*) pAction )->Execute( &maVDev );
-
+                
                 ImplBeginRecord( WIN_EMR_SAVEDC );
                 ImplEndRecord();
             }
@@ -1363,11 +1363,11 @@ void EMFWriter::ImplWrite( const GDIMetaFile& rMtf )
             case( META_POP_ACTION ):
             {
                 ( (MetaAction*) pAction )->Execute( &maVDev );
-
+                
                 ImplBeginRecord( WIN_EMR_RESTOREDC );
                 (*mpStm) << (INT32) -1;
                 ImplEndRecord();
-
+                
                 ImplWriteRasterOp( maVDev.GetRasterOp() );
                 mbLineChanged = mbFillChanged = mbTextChanged = TRUE;
             }
@@ -1396,9 +1396,9 @@ void EMFWriter::ImplWrite( const GDIMetaFile& rMtf )
             }
 
             case( META_MASK_ACTION ):
-            case( META_MASKSCALE_ACTION ):
-            case( META_MASKSCALEPART_ACTION ):
-            case( META_WALLPAPER_ACTION ):
+            case( META_MASKSCALE_ACTION	):
+            case( META_MASKSCALEPART_ACTION	):
+            case( META_WALLPAPER_ACTION	):
             case( META_TEXTLINE_ACTION ):
             case( META_COMMENT_ACTION ):
             case( META_GRADIENTEX_ACTION ):
diff --git a/svtools/source/filter.vcl/wmf/emfwr.hxx b/svtools/source/filter.vcl/wmf/emfwr.hxx
index 6334b5dfe16f..a15b69cf0f90 100644
--- a/svtools/source/filter.vcl/wmf/emfwr.hxx
+++ b/svtools/source/filter.vcl/wmf/emfwr.hxx
@@ -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
@@ -46,55 +46,55 @@ class EMFWriter
 {
 private:
 
-    VirtualDevice       maVDev;
-    MapMode             maDestMapMode;
-    FilterConfigItem*   mpFilterConfigItem;
-    SvStream*           mpStm;
-    BOOL*               mpHandlesUsed;
-    ULONG               mnHandleCount;
-    ULONG               mnLastPercent;
-    ULONG               mnRecordCount;
-    ULONG               mnRecordPos;
-    BOOL                mbRecordOpen;
-    BOOL                mbLineChanged;
-    sal_uInt32          mnLineHandle;
-    BOOL                mbFillChanged;
-    sal_uInt32          mnFillHandle;
-    BOOL                mbTextChanged;
-    sal_uInt32          mnTextHandle;
-    sal_uInt32          mnHorTextAlign;
-
-    void                ImplBeginRecord( sal_uInt32 nType );
-    void                ImplEndRecord();
+    VirtualDevice		maVDev;
+    MapMode				maDestMapMode;
+    FilterConfigItem*	mpFilterConfigItem;
+    SvStream*			mpStm;
+    BOOL*				mpHandlesUsed;
+    ULONG				mnHandleCount;
+    ULONG				mnLastPercent;
+    ULONG				mnRecordCount;
+    ULONG				mnRecordPos;
+    BOOL				mbRecordOpen;
+    BOOL				mbLineChanged;
+    sal_uInt32			mnLineHandle;
+    BOOL				mbFillChanged;
+    sal_uInt32			mnFillHandle;
+    BOOL				mbTextChanged;
+    sal_uInt32			mnTextHandle;
+    sal_uInt32			mnHorTextAlign;
 
-    ULONG               ImplAcquireHandle();
-    void                ImplReleaseHandle( ULONG nHandle );
+    void				ImplBeginRecord( sal_uInt32 nType );
+    void				ImplEndRecord();
+                        
+    ULONG				ImplAcquireHandle();
+    void				ImplReleaseHandle( ULONG nHandle );
 
-    BOOL                ImplPrepareHandleSelect( sal_uInt32& rHandle, ULONG nSelectType );
-    void                ImplCheckLineAttr();
-    void                ImplCheckFillAttr();
-    void                ImplCheckTextAttr();
+    BOOL				ImplPrepareHandleSelect( sal_uInt32& rHandle, ULONG nSelectType );
+    void				ImplCheckLineAttr();
+    void				ImplCheckFillAttr();
+    void				ImplCheckTextAttr();
 
-    void                ImplWriteColor( const Color& rColor );
-    void                ImplWriteRasterOp( RasterOp eRop );
-    void                ImplWriteExtent( long nExtent );
-    void                ImplWritePoint( const Point& rPoint );
-    void                ImplWriteSize( const Size& rSize);
-    void                ImplWriteRect( const Rectangle& rRect );
-    void                ImplWritePath( const PolyPolygon& rPolyPoly, sal_Bool bClose );
-    void                ImplWritePolygonRecord( const Polygon& rPoly, BOOL bClose );
-    void                ImplWritePolyPolygonRecord( const PolyPolygon& rPolyPoly );
-    void                ImplWriteBmpRecord( const Bitmap& rBmp, const Point& rPt, const Size& rSz, UINT32 nROP );
-    void                ImplWriteTextRecord( const Point& rPos, const String rText, const sal_Int32* pDXArray, sal_uInt32 nWidth );
+    void				ImplWriteColor( const Color& rColor );
+    void				ImplWriteRasterOp( RasterOp eRop );
+    void				ImplWriteExtent( long nExtent );
+    void				ImplWritePoint( const Point& rPoint );
+    void				ImplWriteSize( const Size& rSize);
+    void				ImplWriteRect( const Rectangle& rRect );
+    void				ImplWritePath( const PolyPolygon& rPolyPoly, sal_Bool bClose );
+    void				ImplWritePolygonRecord( const Polygon& rPoly, BOOL bClose );
+    void				ImplWritePolyPolygonRecord( const PolyPolygon& rPolyPoly );
+    void				ImplWriteBmpRecord( const Bitmap& rBmp, const Point& rPt, const Size& rSz, UINT32 nROP );
+    void				ImplWriteTextRecord( const Point& rPos, const String rText, const sal_Int32* pDXArray, sal_uInt32 nWidth );
 
     void                Impl_handleLineInfoPolyPolygons(const LineInfo& rInfo, const basegfx::B2DPolygon& rLinePolygon);
-    void                ImplWrite( const GDIMetaFile& rMtf );
+    void				ImplWrite( const GDIMetaFile& rMtf );
 
 public:
 
                         EMFWriter() {}
 
-    BOOL                WriteEMF( const GDIMetaFile& rMtf, SvStream& rOStm, FilterConfigItem* pConfigItem = NULL );
+    BOOL				WriteEMF( const GDIMetaFile& rMtf, SvStream& rOStm, FilterConfigItem* pConfigItem = NULL );
 };
 
 #endif // _EMFWR_HXX
diff --git a/svtools/source/filter.vcl/wmf/enhwmf.cxx b/svtools/source/filter.vcl/wmf/enhwmf.cxx
index 1e49e0d61446..72b7ce593cdf 100644
--- a/svtools/source/filter.vcl/wmf/enhwmf.cxx
+++ b/svtools/source/filter.vcl/wmf/enhwmf.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
@@ -137,8 +137,8 @@
 #define EMR_SETCOLORSPACE              100
 #define EMR_DELETECOLORSPACE           101
 #define EMR_GLSRECORD                  102
-#define EMR_GLSBOUNDEDRECORD           103
-#define EMR_PIXELFORMAT                104
+#define EMR_GLSBOUNDEDRECORD	       103
+#define EMR_PIXELFORMAT				   104
 
 // WINDOWS VERSION >= 0x500
 #define EMR_DRAWESCAPE                 105
@@ -165,9 +165,9 @@
 // currently unused
 static float GetSwapFloat( SvStream& rSt )
 {
-    float   fTmp;
+    float	fTmp;
     sal_Int8* pPtr = (sal_Int8*)&fTmp;
-    rSt >> pPtr[3] >> pPtr[2] >> pPtr[1] >> pPtr[0];    // Little Endian <-> Big Endian switch
+    rSt >> pPtr[3] >> pPtr[2] >> pPtr[1] >> pPtr[0];	// Little Endian <-> Big Endian switch
     return fTmp;
 }
 #endif
@@ -183,7 +183,7 @@ SvStream& operator>>( SvStream& rIn, XForm& rXForm )
     {
 #ifdef OSL_BIGENDIAN
     rXForm.eM11 = GetSwapFloat( rIn );
-    rXForm.eM12 = GetSwapFloat( rIn );
+    rXForm.eM12 = GetSwapFloat( rIn ); 
     rXForm.eM21 = GetSwapFloat( rIn );
     rXForm.eM22 = GetSwapFloat( rIn );
     rXForm.eDx = GetSwapFloat( rIn );
@@ -238,13 +238,13 @@ BOOL EnhWMFReader::ReadEnhWMF()
     sal_Int32   nX32, nY32, nx32, ny32;
     sal_Int16   nX16, nY16;
 
-    sal_Bool    bFlag, bStatus = ReadHeader();
+    sal_Bool	bFlag, bStatus = ReadHeader();
 
     while( bStatus && nRecordCount-- )
     {
         *pWMF >> nRecType >> nRecSize;
 
-        if ( ( nRecSize < 8 ) || ( nRecSize & 3 ) )     // Parameter sind immer durch 4 teilbar
+        if ( ( nRecSize < 8 ) || ( nRecSize & 3 ) )		// Parameter sind immer durch 4 teilbar
         {
             bStatus = FALSE;
             break;
@@ -325,9 +325,9 @@ BOOL EnhWMFReader::ReadEnhWMF()
 
             case EMR_POLYPOLYLINE :
             {
-                UINT16* pnPoints;
+                UINT16*	pnPoints;
 
-                INT32   i, nPoly;
+                INT32	i, nPoly;
                 pWMF->SeekRel( 0x10 );
 
                 // Anzahl der Polygone:
@@ -366,10 +366,10 @@ BOOL EnhWMFReader::ReadEnhWMF()
 
             case EMR_POLYPOLYGON :
             {
-                UINT16* pnPoints;
-                Point*  pPtAry;
+                UINT16*	pnPoints;
+                Point*	pPtAry;
 
-                UINT32  i, nPoly, nGesPoints;
+                UINT32	i, nPoly, nGesPoints;
                 pWMF->SeekRel( 0x10 );
 
                 // Anzahl der Polygone:
@@ -380,7 +380,7 @@ BOOL EnhWMFReader::ReadEnhWMF()
                     if ( ( nPoly * sizeof(UINT16) ) <= ( nEndPos - pWMF->Tell() ) )
                     {
                         pnPoints = new UINT16[ nPoly ];
-
+        
                         for ( i = 0; i < nPoly; i++ )
                         {
                             *pWMF >> nPoints;
@@ -391,7 +391,7 @@ BOOL EnhWMFReader::ReadEnhWMF()
                         {
                             // Polygonpunkte holen:
                             pPtAry  = new Point[ nGesPoints ];
-
+            
                             for ( i = 0; i < nGesPoints; i++ )
                             {
                                 *pWMF >> nX32 >> nY32;
@@ -409,7 +409,7 @@ BOOL EnhWMFReader::ReadEnhWMF()
             break;
 
             case EMR_SETWINDOWEXTEX :
-            {                                                       // #75383#
+            {														// #75383#
                 *pWMF >> nW >> nH;
                 pOut->SetWinExt( Size( nW, nH ) );
             }
@@ -451,7 +451,7 @@ BOOL EnhWMFReader::ReadEnhWMF()
             break;
 
             case EMR_EOF :
-                nRecordCount = 0;           // #76846#
+                nRecordCount = 0;			// #76846#
             break;
 
             case EMR_SETPIXELV :
@@ -554,8 +554,8 @@ BOOL EnhWMFReader::ReadEnhWMF()
 
             case EMR_MODIFYWORLDTRANSFORM :
             {
-                UINT32  nMode;
-                XForm   aTempXForm;
+                UINT32 	nMode;
+                XForm	aTempXForm;
                 *pWMF >> aTempXForm >> nMode;
                 pOut->ModifyWorldTransform( aTempXForm, nMode );
             }
@@ -574,9 +574,9 @@ BOOL EnhWMFReader::ReadEnhWMF()
                 if ( ( nIndex & ENHMETA_STOCK_OBJECT ) == 0 )
                 {
 
-                    LineInfo    aLineInfo;
-                    UINT32      nStyle;
-                    Size        aSize;
+                    LineInfo	aLineInfo;
+                    UINT32		nStyle;
+                    Size		aSize;
 
                     *pWMF >> nStyle >> aSize.Width() >> aSize.Height();
 
@@ -623,7 +623,7 @@ BOOL EnhWMFReader::ReadEnhWMF()
                 sal_Int32   elpHatch;
                 sal_uInt32  offBmi, cbBmi, offBits, cbBits, nStyle, nWidth, nBrushStyle, elpNumEntries;
                 Color       aColorRef;
-
+                            
                 *pWMF >> nIndex;
                 if ( ( nIndex & ENHMETA_STOCK_OBJECT ) == 0 )
                 {
@@ -631,7 +631,7 @@ BOOL EnhWMFReader::ReadEnhWMF()
                      aColorRef = ReadColor();
                      *pWMF >> elpHatch >> elpNumEntries;
 
-                    LineInfo    aLineInfo;
+                    LineInfo	aLineInfo;
                     if ( nWidth )
                         aLineInfo.SetWidth( nWidth );
 
@@ -674,7 +674,7 @@ BOOL EnhWMFReader::ReadEnhWMF()
 
             case EMR_CREATEBRUSHINDIRECT :
             {
-                UINT32  nStyle;
+                UINT32	nStyle;
                 *pWMF >> nIndex;
                 if ( ( nIndex & ENHMETA_STOCK_OBJECT ) == 0 )
                 {
@@ -810,14 +810,14 @@ BOOL EnhWMFReader::ReadEnhWMF()
             }
             break;
 
-            case EMR_BITBLT :   // PASSTHROUGH INTENDED
+            case EMR_BITBLT :	// PASSTHROUGH INTENDED
             case EMR_STRETCHBLT :
             {
-                INT32   xDest, yDest, cxDest, cyDest, xSrc, ySrc, cxSrc, cySrc;
-                UINT32  dwRop, iUsageSrc, offBmiSrc, cbBmiSrc, offBitsSrc, cbBitsSrc;
-                XForm   xformSrc;
+                INT32	xDest, yDest, cxDest, cyDest, xSrc, ySrc, cxSrc, cySrc;
+                UINT32	dwRop, iUsageSrc, offBmiSrc, cbBmiSrc, offBitsSrc, cbBitsSrc;
+                XForm	xformSrc;
 
-                UINT32  nStart = pWMF->Tell() - 8;
+                UINT32	nStart = pWMF->Tell() - 8;
 
                 pWMF->SeekRel( 0x10 );
                 *pWMF >> xDest >> yDest >> cxDest >> cyDest >> dwRop >> xSrc >> ySrc
@@ -829,11 +829,11 @@ BOOL EnhWMFReader::ReadEnhWMF()
                 else
                     cxSrc = cySrc = 0;
 
-                Bitmap      aBitmap;
-                Rectangle   aRect( Point( xDest, yDest ), Size( cxDest+1, cyDest+1 ) );
+                Bitmap		aBitmap;
+                Rectangle	aRect( Point( xDest, yDest ), Size( cxDest+1, cyDest+1 ) );
 
-                cxDest = abs( (int)cxDest );        // sj: i37894, size can be negative
-                cyDest = abs( (int)cyDest );        // and also 122889
+                cxDest = abs( (int)cxDest );		// sj: i37894, size can be negative
+                cyDest = abs( (int)cyDest );		// and also 122889
 
                 if ( (cbBitsSrc > (SAL_MAX_UINT32 - 14)) || ((SAL_MAX_UINT32 - 14) - cbBitsSrc < cbBmiSrc) )
                     bStatus = FALSE;
@@ -859,7 +859,7 @@ BOOL EnhWMFReader::ReadEnhWMF()
                         aBitmap.Read( aTmp, TRUE );
 
                         // test if it is sensible to crop
-                        if ( ( cxSrc > 0 ) && ( cySrc > 0 ) &&
+                        if ( ( cxSrc > 0 ) && ( cySrc > 0 ) && 
                             ( xSrc >= 0 ) && ( ySrc >= 0 ) &&
                                 ( xSrc + cxSrc <= aBitmap.GetSizePixel().Width() ) &&
                                     ( ySrc + cySrc <= aBitmap.GetSizePixel().Height() ) )
@@ -875,19 +875,19 @@ BOOL EnhWMFReader::ReadEnhWMF()
 
             case EMR_STRETCHDIBITS :
             {
-                INT32   xDest, yDest, xSrc, ySrc, cxSrc, cySrc, cxDest, cyDest;
-                UINT32  offBmiSrc, cbBmiSrc, offBitsSrc, cbBitsSrc, iUsageSrc, dwRop;
-                UINT32  nStart = pWMF->Tell() - 8;
+                INT32	xDest, yDest, xSrc, ySrc, cxSrc, cySrc, cxDest, cyDest;
+                UINT32	offBmiSrc, cbBmiSrc, offBitsSrc, cbBitsSrc, iUsageSrc, dwRop;
+                UINT32	nStart = pWMF->Tell() - 8;
 
                 pWMF->SeekRel( 0x10 );
                 *pWMF >> xDest >> yDest >> xSrc >> ySrc >> cxSrc >> cySrc >> offBmiSrc >> cbBmiSrc >> offBitsSrc
                     >> cbBitsSrc >> iUsageSrc >> dwRop >> cxDest >> cyDest;
 
-                Bitmap      aBitmap;
-                Rectangle   aRect( Point( xDest, yDest ), Size( cxDest+1, cyDest+1 ) );
+                Bitmap		aBitmap;
+                Rectangle	aRect( Point( xDest, yDest ), Size( cxDest+1, cyDest+1 ) );
 
-                cxDest = abs( (int)cxDest );        // sj: i37894, size can be negative
-                cyDest = abs( (int)cyDest );        // and also 122889
+                cxDest = abs( (int)cxDest );		// sj: i37894, size can be negative
+                cyDest = abs( (int)cyDest );		// and also 122889
 
                 if ( (cbBitsSrc > (SAL_MAX_UINT32 - 14)) || ((SAL_MAX_UINT32 - 14) - cbBitsSrc < cbBmiSrc) )
                     bStatus = FALSE;
@@ -913,7 +913,7 @@ BOOL EnhWMFReader::ReadEnhWMF()
                         aBitmap.Read( aTmp, TRUE );
 
                         // test if it is sensible to crop
-                        if ( ( cxSrc > 0 ) && ( cySrc > 0 ) &&
+                        if ( ( cxSrc > 0 ) && ( cySrc > 0 ) && 
                             ( xSrc >= 0 ) && ( ySrc >= 0 ) &&
                                 ( xSrc + cxSrc <= aBitmap.GetSizePixel().Width() ) &&
                                     ( ySrc + cySrc <= aBitmap.GetSizePixel().Height() ) )
@@ -934,7 +934,7 @@ BOOL EnhWMFReader::ReadEnhWMF()
                 {
                     LOGFONTW aLogFont;
                     *pWMF >> aLogFont.lfHeight >> aLogFont.lfWidth >> aLogFont.lfEscapement >> aLogFont.lfOrientation >> aLogFont.lfWeight >> aLogFont.lfItalic
-                                >> aLogFont.lfUnderline >> aLogFont.lfStrikeOut >> aLogFont.lfCharSet >> aLogFont.lfOutPrecision >> aLogFont.lfClipPrecision
+                                >> aLogFont.lfUnderline >> aLogFont.lfStrikeOut	>> aLogFont.lfCharSet >> aLogFont.lfOutPrecision >> aLogFont.lfClipPrecision
                                     >> aLogFont.lfQuality >> aLogFont.lfPitchAndFamily;
 
                     sal_Unicode lfFaceName[ LF_FACESIZE ];
@@ -955,9 +955,9 @@ BOOL EnhWMFReader::ReadEnhWMF()
                 bFlag = sal_True;
             case EMR_EXTTEXTOUTW :
             {
-                sal_Int32   nLeft, nTop, nRight, nBottom, ptlReferenceX, ptlReferenceY, nGfxMode, nXScale, nYScale;
-                sal_uInt32  nCurPos, nLen, nOffString, nOptions, offDx;
-                sal_Int32*  pDX = NULL;
+                sal_Int32	nLeft, nTop, nRight, nBottom, ptlReferenceX, ptlReferenceY, nGfxMode, nXScale, nYScale;
+                sal_uInt32	nCurPos, nLen, nOffString, nOptions, offDx;
+                sal_Int32*	pDX = NULL;
 
                 nCurPos = pWMF->Tell() - 8;
 
@@ -1057,7 +1057,7 @@ BOOL EnhWMFReader::ReadEnhWMF()
                     *pWMF >> nX16 >> nY16;
                     aPoly[ i ] = Point( nX16, nY16 );
                 }
-                pOut->DrawPolyBezier( aPoly, bFlag, bRecordPath );  // Line( aPoly, bFlag );
+                pOut->DrawPolyBezier( aPoly, bFlag, bRecordPath );	// Line( aPoly, bFlag );
             }
             break;
 
@@ -1100,9 +1100,9 @@ BOOL EnhWMFReader::ReadEnhWMF()
 
             case EMR_POLYPOLYLINE16 :
             {
-                UINT16* pnPoints;
+                UINT16*	pnPoints;
 
-                INT32   i, nPoly, nGesPoints;
+                INT32	i, nPoly, nGesPoints;
                 pWMF->SeekRel( 0x10 );
                 // Anzahl der Polygone:
                 *pWMF >> nPoly >> nGesPoints;
@@ -1137,10 +1137,10 @@ BOOL EnhWMFReader::ReadEnhWMF()
 
             case EMR_POLYPOLYGON16 :
             {
-                UINT16* pnPoints;
-                Point*  pPtAry;
+                UINT16*	pnPoints;
+                Point*	pPtAry;
 
-                UINT32  i, nPoly, nGesPoints;
+                UINT32	i, nPoly, nGesPoints;
                 pWMF->SeekRel( 0x10 );
                 // Anzahl der Polygone:
                 *pWMF >> nPoly >> nGesPoints;
@@ -1163,7 +1163,7 @@ BOOL EnhWMFReader::ReadEnhWMF()
                                 *pWMF >> nX16 >> nY16;
                                 pPtAry[ i ] = Point( nX16, nY16 );
                             }
-
+            
                             // PolyPolygon Actions erzeugen
                             PolyPolygon aPolyPoly( (UINT16)nPoly, pnPoints, pPtAry );
                             pOut->DrawPolyPolygon( aPolyPoly, bRecordPath );
@@ -1201,25 +1201,25 @@ BOOL EnhWMFReader::ReadEnhWMF()
             case EMR_FRAMERGN :                 WinMtfAssertHandler( "FrameRgn" );                  break;
             case EMR_INVERTRGN :                WinMtfAssertHandler( "InvertRgn" );                 break;
             case EMR_PAINTRGN :                 WinMtfAssertHandler( "PaintRgn" );                  break;
-            case EMR_FLATTENPATH :              WinMtfAssertHandler( "FlattenPath" );               break;
+            case EMR_FLATTENPATH :		        WinMtfAssertHandler( "FlattenPath" );               break;
             case EMR_WIDENPATH :                WinMtfAssertHandler( "WidenPath" );                 break;
-            case EMR_POLYDRAW :                 WinMtfAssertHandler( "Polydraw" );                  break;
-            case EMR_SETARCDIRECTION :          WinMtfAssertHandler( "SetArcDirection" );           break;
+            case EMR_POLYDRAW :			        WinMtfAssertHandler( "Polydraw" );                  break;
+            case EMR_SETARCDIRECTION :	        WinMtfAssertHandler( "SetArcDirection" );           break;
             case EMR_SETPALETTEENTRIES :        WinMtfAssertHandler( "SetPaletteEntries" );         break;
-            case EMR_RESIZEPALETTE :            WinMtfAssertHandler( "ResizePalette" );             break;
-            case EMR_EXTFLOODFILL :             WinMtfAssertHandler( "ExtFloodFill" );              break;
-            case EMR_ANGLEARC :                 WinMtfAssertHandler( "AngleArc" );                  break;
-            case EMR_SETCOLORADJUSTMENT :       WinMtfAssertHandler( "SetColorAdjustment" );        break;
-            case EMR_POLYDRAW16 :               WinMtfAssertHandler( "PolyDraw16" );                break;
+            case EMR_RESIZEPALETTE :	        WinMtfAssertHandler( "ResizePalette" );             break;
+            case EMR_EXTFLOODFILL :		        WinMtfAssertHandler( "ExtFloodFill" );              break;
+            case EMR_ANGLEARC :     	        WinMtfAssertHandler( "AngleArc" );                  break;
+            case EMR_SETCOLORADJUSTMENT :       WinMtfAssertHandler( "SetColorAdjustment" );	    break;
+            case EMR_POLYDRAW16 :		        WinMtfAssertHandler( "PolyDraw16" );                break;
             case EMR_CREATEDIBPATTERNBRUSHPT :  WinMtfAssertHandler( "CreateDibPatternBrushPt" );   break;
-            case EMR_POLYTEXTOUTA :             WinMtfAssertHandler( "PolyTextOutA" );              break;
-            case EMR_POLYTEXTOUTW :             WinMtfAssertHandler( "PolyTextOutW" );              break;
-            case EMR_CREATECOLORSPACE :         WinMtfAssertHandler( "CreateColorSpace" );          break;
-            case EMR_SETCOLORSPACE :            WinMtfAssertHandler( "SetColorSpace" );             break;
-            case EMR_DELETECOLORSPACE :         WinMtfAssertHandler( "DeleteColorSpace" );          break;
-            case EMR_GLSRECORD :                WinMtfAssertHandler( "GlsRecord" );                 break;
-            case EMR_GLSBOUNDEDRECORD :         WinMtfAssertHandler( "GlsBoundRecord" );            break;
-            case EMR_PIXELFORMAT :              WinMtfAssertHandler( "PixelFormat" );               break;
+            case EMR_POLYTEXTOUTA : 		    WinMtfAssertHandler( "PolyTextOutA" );              break;
+            case EMR_POLYTEXTOUTW :			    WinMtfAssertHandler( "PolyTextOutW" );              break;
+            case EMR_CREATECOLORSPACE :         WinMtfAssertHandler( "CreateColorSpace" );	        break;
+            case EMR_SETCOLORSPACE :		    WinMtfAssertHandler( "SetColorSpace" );             break;
+            case EMR_DELETECOLORSPACE :		    WinMtfAssertHandler( "DeleteColorSpace" );          break;
+            case EMR_GLSRECORD :    		    WinMtfAssertHandler( "GlsRecord" );                 break;
+            case EMR_GLSBOUNDEDRECORD :		    WinMtfAssertHandler( "GlsBoundRecord" );            break;
+            case EMR_PIXELFORMAT :  		    WinMtfAssertHandler( "PixelFormat" );               break;
             case EMR_DRAWESCAPE :               WinMtfAssertHandler( "DrawEscape" );                break;
             case EMR_EXTESCAPE :                WinMtfAssertHandler( "ExtEscape" );                 break;
             case EMR_STARTDOC :                 WinMtfAssertHandler( "StartDoc" );                  break;
@@ -1235,21 +1235,21 @@ BOOL EnhWMFReader::ReadEnhWMF()
             case EMR_GRADIENTFILL :             WinMtfAssertHandler( "GradientFill" );              break;
             case EMR_SETLINKEDUFIS :            WinMtfAssertHandler( "SetLinkedUFIS" );             break;
 
-            case EMR_SETMAPPERFLAGS :           WinMtfAssertHandler( "SetMapperFlags", 0 );         break;
-            case EMR_SETICMMODE :               WinMtfAssertHandler( "SetICMMode", 0 );             break;
+            case EMR_SETMAPPERFLAGS :	        WinMtfAssertHandler( "SetMapperFlags", 0 );         break;
+            case EMR_SETICMMODE :			    WinMtfAssertHandler( "SetICMMode", 0 );             break;
             case EMR_CREATEMONOBRUSH :          WinMtfAssertHandler( "CreateMonoBrush", 0 );        break;
-            case EMR_SETBRUSHORGEX :            WinMtfAssertHandler( "SetBrushOrgEx", 0 );          break;
-            case EMR_SETMETARGN :               WinMtfAssertHandler( "SetMetArgn", 0 );             break;
-            case EMR_SETMITERLIMIT :            WinMtfAssertHandler( "SetMiterLimit", 0 );          break;
+            case EMR_SETBRUSHORGEX :	        WinMtfAssertHandler( "SetBrushOrgEx", 0 );          break;
+            case EMR_SETMETARGN :		        WinMtfAssertHandler( "SetMetArgn", 0 );             break;
+            case EMR_SETMITERLIMIT :	        WinMtfAssertHandler( "SetMiterLimit", 0 );          break;
             case EMR_EXCLUDECLIPRECT :          WinMtfAssertHandler( "ExcludeClipRect", 0 );        break;
-            case EMR_REALIZEPALETTE :           WinMtfAssertHandler( "RealizePalette", 0 );         break;
-            case EMR_SELECTPALETTE :            WinMtfAssertHandler( "SelectPalette", 0 );          break;
-            case EMR_CREATEPALETTE :            WinMtfAssertHandler( "CreatePalette", 0 );          break;
+            case EMR_REALIZEPALETTE :	        WinMtfAssertHandler( "RealizePalette", 0 );         break;
+            case EMR_SELECTPALETTE :	        WinMtfAssertHandler( "SelectPalette", 0 );          break;
+            case EMR_CREATEPALETTE :	        WinMtfAssertHandler( "CreatePalette", 0 );          break;
             case EMR_ALPHADIBBLEND :            WinMtfAssertHandler( "AlphaDibBlend", 0 );          break;
             case EMR_SETTEXTJUSTIFICATION :     WinMtfAssertHandler( "SetTextJustification", 0 );   break;
 
             case EMR_GDICOMMENT :
-            case EMR_HEADER :               // has already been read at ReadHeader()
+            case EMR_HEADER :	            // has already been read at ReadHeader()
             break;
 #endif
         }
@@ -1268,17 +1268,17 @@ BOOL EnhWMFReader::ReadEnhWMF()
 
 BOOL EnhWMFReader::ReadHeader()
 {
-    UINT32      nUINT32, nHeaderSize, nPalEntries;
-    INT32       nLeft, nTop, nRight, nBottom;
+    UINT32		nUINT32, nHeaderSize, nPalEntries;
+    INT32		nLeft, nTop, nRight, nBottom;
 
     // METAFILEHEADER SPARE ICH MIR HIER
     // Einlesen des METAHEADER
     *pWMF >> nUINT32 >> nHeaderSize;
-    if ( nUINT32 != 1 )         // Typ
+    if ( nUINT32 != 1 )			// Typ
         return FALSE;
 
     // bound size
-    Rectangle rclBounds;    // rectangle in logical units 1/100th mm
+    Rectangle rclBounds;	// rectangle in logical units 1/100th mm
     *pWMF >> nLeft >> nTop >> nRight >> nBottom;
     rclBounds.Left() = nLeft;
     rclBounds.Top() = nTop;
@@ -1286,23 +1286,23 @@ BOOL EnhWMFReader::ReadHeader()
     rclBounds.Bottom() = nBottom;
 
     // picture frame size
-    Rectangle rclFrame;     // rectangle in device units
+    Rectangle rclFrame;		// rectangle in device units
     *pWMF >> nLeft >> nTop >> nRight >> nBottom;
     rclFrame.Left() = nLeft;
     rclFrame.Top() = nTop;
     rclFrame.Right() = nRight;
     rclFrame.Bottom() = nBottom;
 
-    *pWMF >> nUINT32;                                   // signature
+    *pWMF >> nUINT32;									// signature
 
     if ( nUINT32 != 0x464d4520 )
         return FALSE;
 
-    *pWMF >> nUINT32;                                   // nVersion
-    *pWMF >> nEndPos;                                   // size of metafile
+    *pWMF >> nUINT32;									// nVersion
+    *pWMF >> nEndPos;									// size of metafile
     nEndPos += nStartPos;
 
-    sal_uInt32 nStrmPos = pWMF->Tell();                 // checking if nEndPos is valid
+    sal_uInt32 nStrmPos = pWMF->Tell();					// checking if nEndPos is valid
     pWMF->Seek( STREAM_SEEK_TO_END );
     if ( pWMF->Tell() < nEndPos )
         nEndPos = pWMF->Tell();
diff --git a/svtools/source/filter.vcl/wmf/winmtf.cxx b/svtools/source/filter.vcl/wmf/winmtf.cxx
index 787e6522b890..d6cb2623022c 100644
--- a/svtools/source/filter.vcl/wmf/winmtf.cxx
+++ b/svtools/source/filter.vcl/wmf/winmtf.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
@@ -295,7 +295,7 @@ WinMtfFontStyle::WinMtfFontStyle( LOGFONTW& rFont )
     }
     else if ( aFontSize.Height() < 0 )
         aFontSize.Height() *= -1;
-
+    
     if ( !rFont.lfWidth )
     {
         VirtualDevice aVDev;
@@ -323,7 +323,7 @@ void WinMtfAssertHandler( const sal_Char* pAction, sal_uInt32 nFlags )
     if ( nFlags & WIN_MTF_ASSERT_MIFE )
     {
         if ( ( nAssertCount == 0 ) || ( bOnlyOnce == sal_False ) )
-        {
+        {   
             ByteString aText( "WMF/EMF Import: " );
             if ( pAction )
             {
@@ -341,17 +341,17 @@ void WinMtfAssertHandler( const sal_Char* pAction, sal_uInt32 nFlags )
 // ------------------------------------------------------------------------
 
 WinMtf::WinMtf( WinMtfOutput* pWinMtfOutput, SvStream& rStreamWMF, FilterConfigItem* pConfigItem ) :
-    pOut                ( pWinMtfOutput ),
-    pWMF                ( &rStreamWMF ),
-    pFilterConfigItem   ( pConfigItem )
+    pOut				( pWinMtfOutput ),
+    pWMF				( &rStreamWMF ),
+    pFilterConfigItem	( pConfigItem )
 {
 #ifdef WIN_MTF_ASSERT
-    // we want to assert not implemented features, but we do this
+    // we want to assert not implemented features, but we do this 
     // only once, so that nobody is handicaped by getting too much assertions
     // I hope this will bring more testdocuments, without support of these
     // testdocuments the implementation of missing features won't be possible. (SJ)
     WinMtfAssertHandler( NULL, WIN_MTF_ASSERT_INIT | WIN_MTF_ASSERT_ONCE );
-#endif
+#endif 
 
     SvLockBytes *pLB = pWMF->GetLockBytes();
     if ( pLB )
@@ -463,7 +463,7 @@ Point WinMtfOutput::ImplMap( const Point& rPt )
                     fX2 *= mnDevWidth;
                     fY2 *= mnDevHeight;
                     fX2 += mnDevOrgX;
-                    fY2 += mnDevOrgY;   // fX2, fY2 now in device units
+                    fY2 += mnDevOrgY;	// fX2, fY2 now in device units
                     fX2 *= (double)mnMillX * 100.0 / (double)mnPixX;
                     fY2 *= (double)mnMillY * 100.0 / (double)mnPixY;
                 }
@@ -588,7 +588,7 @@ void WinMtfOutput::SelectObject( INT32 nIndex )
         pGDIObj = new GDIObj();
     else
     {
-        nIndex &= 0xffff;       // zur Sicherheit: mehr als 65535 nicht zulassen
+        nIndex &= 0xffff;		// zur Sicherheit: mehr als 65535 nicht zulassen
 
         if ( (UINT32)nIndex < vGDIObj.size() )
             pGDIObj = vGDIObj[ nIndex ];
@@ -750,7 +750,7 @@ void WinMtfOutput::ImplDrawClippedPolyPolygon( const PolyPolygon& rPolyPoly )
                 mpGDIMetaFile->AddAction( new MetaRectAction( rPolyPoly.GetBoundRect() ) );
             else
             {
-                Polygon aPoly( rPolyPoly[ 0 ] );
+                Polygon	aPoly( rPolyPoly[ 0 ] );
                 sal_uInt16 nCount = aPoly.GetSize();
                 if ( nCount )
                 {
@@ -779,7 +779,7 @@ void WinMtfOutput::CreateObject( GDIObjectType eType, void* pStyle )
         {
             ImplMap( ((WinMtfFontStyle*)pStyle)->aFont );
             if (!((WinMtfFontStyle*)pStyle)->aFont.GetHeight() )
-                ((WinMtfFontStyle*)pStyle)->aFont.SetHeight( 423 );     // defaulting to 12pt
+                ((WinMtfFontStyle*)pStyle)->aFont.SetHeight( 423 );		// defaulting to 12pt
         }
         else if ( eType == GDI_PEN )
         {
@@ -813,7 +813,7 @@ void WinMtfOutput::CreateObject( INT32 nIndex, GDIObjectType eType, void* pStyle
 {
     if ( ( nIndex & ENHMETA_STOCK_OBJECT ) == 0 )
     {
-        nIndex &= 0xffff;       // zur Sicherheit: mehr als 65535 nicht zulassen
+        nIndex &= 0xffff;		// zur Sicherheit: mehr als 65535 nicht zulassen
         if ( pStyle )
         {
             if ( eType == GDI_FONT )
@@ -913,42 +913,42 @@ void WinMtfOutput::SetClipPath( const PolyPolygon& rPolyPolygon, sal_Int32 nClip
 
 WinMtfOutput::WinMtfOutput( GDIMetaFile& rGDIMetaFile ) :
     mnLatestTextAlign   ( 0 ),
-    mnTextAlign         ( TA_LEFT | TA_TOP | TA_NOUPDATECP ),
+    mnTextAlign		    ( TA_LEFT | TA_TOP | TA_NOUPDATECP ),
     maLatestBkColor     ( 0x12345678 ),
-    maBkColor           ( COL_WHITE ),
+    maBkColor			( COL_WHITE ),
     mnLatestTextLayoutMode( TEXT_LAYOUT_DEFAULT ),
-    mnTextLayoutMode    ( TEXT_LAYOUT_DEFAULT ),
+    mnTextLayoutMode	( TEXT_LAYOUT_DEFAULT ),
     mnLatestBkMode      ( 0 ),
-    mnBkMode            ( OPAQUE ),
+    mnBkMode			( OPAQUE ),
     meLatestRasterOp    ( ROP_INVERT ),
-    meRasterOp          ( ROP_OVERPAINT ),
-    maActPos            ( Point() ),
-    mbNopMode           ( sal_False ),
-    mbFillStyleSelected ( sal_False ),
-    mnGfxMode           ( GM_COMPATIBLE ),
+    meRasterOp			( ROP_OVERPAINT ),
+    maActPos			( Point() ),
+    mbNopMode			( sal_False ),
+    mbFillStyleSelected	( sal_False ),
+    mnGfxMode			( GM_COMPATIBLE ),
     mnMapMode           ( MM_TEXT ),
-    mnDevOrgX           ( 0 ),
-    mnDevOrgY           ( 0 ),
-    mnDevWidth          ( 1 ),
-    mnDevHeight         ( 1 ),
-    mnWinOrgX           ( 0 ),
-    mnWinOrgY           ( 0 ),
-    mnWinExtX           ( 1 ),
-    mnWinExtY           ( 1 ),
-    mnPixX              ( 100 ),
-    mnPixY              ( 100 ),
-    mnMillX             ( 1 ),
-    mnMillY             ( 1 ),
+    mnDevOrgX			( 0 ),
+    mnDevOrgY			( 0 ),
+    mnDevWidth			( 1 ),
+    mnDevHeight			( 1 ),
+    mnWinOrgX			( 0 ),
+    mnWinOrgY			( 0 ),
+    mnWinExtX			( 1 ),
+    mnWinExtY			( 1 ),
+    mnPixX				( 100 ),
+    mnPixY				( 100 ),
+    mnMillX				( 1 ),
+    mnMillY				( 1 ),
     mpGDIMetaFile       ( &rGDIMetaFile )
 {
-    mpGDIMetaFile->AddAction( new MetaPushAction( PUSH_CLIPREGION ) );      // The original clipregion has to be on top
+    mpGDIMetaFile->AddAction( new MetaPushAction( PUSH_CLIPREGION ) );		// The original clipregion has to be on top
                                                                             // of the stack so it can always be restored
                                                                             // this is necessary to be able to support
                                                                             // SetClipRgn( NULL ) and similar ClipRgn actions (SJ)
 
-    maFont.SetName( String( RTL_CONSTASCII_USTRINGPARAM( "Arial" )) );  // sj: #i57205#, we do have some scaling problems if using
-    maFont.SetCharSet( gsl_getSystemTextEncoding() );                       // the default font then most times a x11 font is used, we
-    maFont.SetHeight( 423 );                                                // will prevent this defining a font
+    maFont.SetName( String( RTL_CONSTASCII_USTRINGPARAM( "Arial" )) );	// sj: #i57205#, we do have some scaling problems if using
+    maFont.SetCharSet( gsl_getSystemTextEncoding() );						// the default font then most times a x11 font is used, we
+    maFont.SetHeight( 423 );												// will prevent this defining a font
 
     maLatestLineStyle.aLineColor = Color( 0x12, 0x34, 0x56 );
     maLatestFillStyle.aFillColor = Color( 0x12, 0x34, 0x56 );
@@ -981,19 +981,19 @@ void WinMtfOutput::UpdateClipRegion()
         aClipPath.bNeedsUpdate = sal_False;
 
         mpGDIMetaFile->AddAction( new MetaPopAction() );                    // taking the orignal clipregion
-        mpGDIMetaFile->AddAction( new MetaPushAction( PUSH_CLIPREGION ) );  //
+        mpGDIMetaFile->AddAction( new MetaPushAction( PUSH_CLIPREGION ) );  // 
 
         switch ( aClipPath.GetType() )
         {
             case RECTANGLE :
             case COMPLEX :
             {
-//              we will not generate a RegionClipRegion Action, because this action
-//              cannot be saved to the wmf format - saving to wmf always happens
-//              if the placeholder graphic for ole objects is generated. (SJ)
+//				we will not generate a RegionClipRegion Action, because this action
+//				cannot be saved to the wmf format - saving to wmf always happens
+//				if the placeholder graphic for ole objects is generated. (SJ)
 
-//              Region aClipRegion( aClipPath.GetClipPath() );
-//              mpGDIMetaFile->AddAction( new MetaISectRegionClipRegionAction( aClipRegion ) );
+//				Region aClipRegion( aClipPath.GetClipPath() );
+//				mpGDIMetaFile->AddAction( new MetaISectRegionClipRegionAction( aClipRegion ) );
 
                 Rectangle aClipRect( aClipPath.GetClipPath().GetBoundRect() );
                 mpGDIMetaFile->AddAction( new MetaISectRectClipRegionAction( aClipRect ) );
@@ -1033,7 +1033,7 @@ void WinMtfOutput::UpdateLineStyle()
 
 void WinMtfOutput::UpdateFillStyle()
 {
-    if ( !mbFillStyleSelected )     // SJ: #i57205# taking care of bkcolor if no brush is selected
+    if ( !mbFillStyleSelected )		// SJ: #i57205# taking care of bkcolor if no brush is selected
         maFillStyle = WinMtfFillStyle( maBkColor, mnBkMode == TRANSPARENT );
     if (!( maLatestFillStyle == maFillStyle ) )
     {
@@ -1054,7 +1054,7 @@ sal_uInt32 WinMtfOutput::SetRasterOp( UINT32 nRasterOp )
         static WinMtfLineStyle aNopLineStyle;
 
         if ( mbNopMode && ( nRasterOp != R2_NOP ) )
-        {   // beim uebergang von R2_NOP auf anderen Modus
+        {	// beim uebergang von R2_NOP auf anderen Modus
             // gesetzten Pen und Brush aktivieren
             maFillStyle = aNopFillStyle;
             maLineStyle = aNopLineStyle;
@@ -1253,14 +1253,14 @@ void WinMtfOutput::DrawArc( const Rectangle& rRect, const Point& rStart, const P
     UpdateLineStyle();
     UpdateFillStyle();
 
-    Rectangle   aRect( ImplMap( rRect ) );
-    Point       aStart( ImplMap( rStart ) );
-    Point       aEnd( ImplMap( rEnd ) );
+    Rectangle	aRect( ImplMap( rRect ) );
+    Point		aStart( ImplMap( rStart ) );
+    Point		aEnd( ImplMap( rEnd ) );
 
     if ( maLineStyle.aLineInfo.GetWidth() || ( maLineStyle.aLineInfo.GetStyle() == LINE_DASH ) )
     {
         if ( aStart == aEnd )
-        {   // SJ: #i53768# if start & end is identical, then we have to draw a full ellipse
+        {	// SJ: #i53768# if start & end is identical, then we have to draw a full ellipse
             Point aCenter( aRect.Center() );
             Size  aRad( aRect.GetWidth() / 2, aRect.GetHeight() / 2 );
 
@@ -1283,9 +1283,9 @@ void WinMtfOutput::DrawPie( const Rectangle& rRect, const Point& rStart, const P
     UpdateClipRegion();
     UpdateFillStyle();
 
-    Rectangle   aRect( ImplMap( rRect ) );
-    Point       aStart( ImplMap( rStart ) );
-    Point       aEnd( ImplMap( rEnd ) );
+    Rectangle	aRect( ImplMap( rRect ) );
+    Point		aStart( ImplMap( rStart ) );
+    Point		aEnd( ImplMap( rEnd ) );
 
     if ( maLineStyle.aLineInfo.GetWidth() || ( maLineStyle.aLineInfo.GetStyle() == LINE_DASH ) )
     {
@@ -1308,9 +1308,9 @@ void WinMtfOutput::DrawChord( const Rectangle& rRect, const Point& rStart, const
     UpdateClipRegion();
     UpdateFillStyle();
 
-    Rectangle   aRect( ImplMap( rRect ) );
-    Point       aStart( ImplMap( rStart ) );
-    Point       aEnd( ImplMap( rEnd ) );
+    Rectangle	aRect( ImplMap( rRect ) );
+    Point		aStart( ImplMap( rStart ) );
+    Point		aEnd( ImplMap( rEnd ) );
 
     if ( maLineStyle.aLineInfo.GetWidth() || ( maLineStyle.aLineInfo.GetStyle() == LINE_DASH ) )
     {
@@ -1389,7 +1389,7 @@ void WinMtfOutput::DrawPolyPolygon( PolyPolygon& rPolyPolygon, sal_Bool bRecordP
         if ( aClipPath.GetType() == COMPLEX )
         {
             PolyPolygon aDest;
-            aClipPath.GetClipPath().GetIntersection( rPolyPolygon, aDest );
+            aClipPath.GetClipPath().GetIntersection( rPolyPolygon, aDest );	
             ImplDrawClippedPolyPolygon( aDest );
         }
         else
@@ -1574,7 +1574,7 @@ void WinMtfOutput::DrawText( Point& rPosition, String& rText, sal_Int32* pDXArry
 
         if( mnTextAlign & TA_UPDATECP )
             rPosition = maActPos;
-
+    
         if ( mnTextAlign & TA_RIGHT_CENTER )
         {
             double fLenght = ( ( mnTextAlign & TA_RIGHT_CENTER ) == TA_RIGHT ) ? nTextWidth : nTextWidth >> 1;
@@ -1584,7 +1584,7 @@ void WinMtfOutput::DrawText( Point& rPosition, String& rText, sal_Int32* pDXArry
 
         if( mnTextAlign & TA_UPDATECP )
             maActPos.X() = rPosition.X() + nTextWidth;
-    }
+    }   
     if ( bChangeFont || ( maLatestFont != aTmp ) )
     {
         maLatestFont = aTmp;
@@ -1601,7 +1601,7 @@ void WinMtfOutput::DrawText( Point& rPosition, String& rText, sal_Int32* pDXArry
     {
         /* because text without dx array is badly scaled, we
            will create such an array if necessary */
-        sal_Int32* pDX = pDXArry;
+        sal_Int32* pDX = pDXArry;		
         if ( !pDXArry )
         {
             pDX = new sal_Int32[ rText.Len() ];
@@ -1612,8 +1612,8 @@ void WinMtfOutput::DrawText( Point& rPosition, String& rText, sal_Int32* pDXArry
             pVDev->GetTextArray( rText, pDX, 0, STRING_LEN );
         }
         mpGDIMetaFile->AddAction( new MetaTextArrayAction( rPosition, rText, pDX, 0, STRING_LEN ) );
-        if ( !pDXArry )     // this means we have created our own array
-            delete[] pDX;   // which must be deleted
+        if ( !pDXArry )		// this means we have created our own array
+            delete[] pDX;	// which must be deleted
     }
     SetGfxMode( nOldGfxMode );
     delete pVDev;
@@ -1670,16 +1670,16 @@ void WinMtfOutput::ResolveBitmapActions( List& rSaveList )
 {
     UpdateClipRegion();
 
-    sal_uInt32 nObjects     = rSaveList.Count();
-    sal_uInt32 nObjectsLeft = nObjects;
+    sal_uInt32 nObjects		= rSaveList.Count();
+    sal_uInt32 nObjectsLeft	= nObjects;
 
     while ( nObjectsLeft )
     {
-        sal_uInt32      i, nObjectsOfSameSize = 0;
-        sal_uInt32      nObjectStartIndex = nObjects - nObjectsLeft;
+        sal_uInt32		i, nObjectsOfSameSize = 0;
+        sal_uInt32		nObjectStartIndex = nObjects - nObjectsLeft;
 
-        BSaveStruct*    pSave = (BSaveStruct*)rSaveList.GetObject( nObjectStartIndex );
-        Rectangle       aRect( pSave->aOutRect );
+        BSaveStruct*	pSave = (BSaveStruct*)rSaveList.GetObject( nObjectStartIndex );
+        Rectangle		aRect( pSave->aOutRect );
 
         for ( i = nObjectStartIndex; i < nObjects; )
         {
@@ -1691,27 +1691,27 @@ void WinMtfOutput::ResolveBitmapActions( List& rSaveList )
                     break;
             }
         }
-        Point   aPos( ImplMap( aRect.TopLeft() ) );
-        Size    aSize( ImplMap( aRect.GetSize() ) );
+        Point	aPos( ImplMap( aRect.TopLeft() ) );
+        Size	aSize( ImplMap( aRect.GetSize() ) );
 
         for ( i = nObjectStartIndex; i < ( nObjectStartIndex + nObjectsOfSameSize ); i++ )
         {
             pSave = (BSaveStruct*)rSaveList.GetObject( i );
 
-            sal_uInt32  nWinRop = pSave->nWinRop;
-            sal_uInt8   nRasterOperation = (sal_uInt8)( nWinRop >> 16 );
+            sal_uInt32	nWinRop = pSave->nWinRop;
+            sal_uInt8	nRasterOperation = (sal_uInt8)( nWinRop >> 16 );
 
-            sal_uInt32  nUsed =  0;
+            sal_uInt32	nUsed =  0;
             if ( ( nRasterOperation & 0xf )  != ( nRasterOperation >> 4 ) )
-                nUsed |= 1;     // pattern is used
+                nUsed |= 1;		// pattern is used
             if ( ( nRasterOperation & 0x33 ) != ( ( nRasterOperation & 0xcc ) >> 2 ) )
-                nUsed |= 2;     // source is used
+                nUsed |= 2;		// source is used
             if ( ( nRasterOperation & 0xaa ) != ( ( nRasterOperation & 0x55 ) << 1 ) )
-                nUsed |= 4;     // destination is used
+                nUsed |= 4;		// destination is used
 
             if ( (nUsed & 1) && (( nUsed & 2 ) == 0) )
-            {   // patterns aren't well supported yet
-                sal_uInt32 nOldRop = SetRasterOp( ROP_OVERPAINT );  // in this case nRasterOperation is either 0 or 0xff
+            {	// patterns aren't well supported yet
+                sal_uInt32 nOldRop = SetRasterOp( ROP_OVERPAINT );	// in this case nRasterOperation is either 0 or 0xff
                 UpdateFillStyle();
                 DrawRect( aRect, FALSE );
                 SetRasterOp( nOldRop );
@@ -1720,11 +1720,11 @@ void WinMtfOutput::ResolveBitmapActions( List& rSaveList )
             {
                 sal_Bool bDrawn = sal_False;
 
-                if ( i == nObjectStartIndex )   // optimizing, sometimes it is possible to create just one transparent bitmap
+                if ( i == nObjectStartIndex )	// optimizing, sometimes it is possible to create just one transparent bitmap
                 {
                     if ( nObjectsOfSameSize == 2 )
                     {
-                        BSaveStruct* pSave2 = (BSaveStruct*)rSaveList.GetObject( i + 1 );
+                        BSaveStruct* pSave2 = (BSaveStruct*)rSaveList.GetObject( i + 1 ); 
                         if ( ( pSave->aBmp.GetPrefSize() == pSave2->aBmp.GetPrefSize() ) &&
                              ( pSave->aBmp.GetPrefMapMode() == pSave2->aBmp.GetPrefMapMode() ) )
                         {
@@ -1760,18 +1760,18 @@ void WinMtfOutput::ResolveBitmapActions( List& rSaveList )
                 if ( !bDrawn )
                 {
                     Push();
-                    sal_uInt32  nOldRop = SetRasterOp( R2_COPYPEN );
-                    Bitmap      aBitmap( pSave->aBmp );
-                    sal_uInt32  nOperation = ( nRasterOperation & 0xf );
+                    sal_uInt32	nOldRop = SetRasterOp( R2_COPYPEN );
+                    Bitmap		aBitmap( pSave->aBmp );
+                    sal_uInt32	nOperation = ( nRasterOperation & 0xf );
                     switch( nOperation )
                     {
                         case 0x1 :
                         case 0xe :
-                        {
+                        {						
                             SetRasterOp( R2_XORPEN );
                             ImplDrawBitmap( aPos, aSize, aBitmap );
                             SetRasterOp( R2_COPYPEN );
-                            Bitmap  aMask( aBitmap );
+                            Bitmap	aMask( aBitmap );
                             aMask.Invert();
                             BitmapEx aBmpEx( aBitmap, aMask );
                             ImplDrawBitmap( aPos, aSize, aBmpEx );
@@ -1785,8 +1785,8 @@ void WinMtfOutput::ResolveBitmapActions( List& rSaveList )
                         case 0x7 :
                         case 0x8 :
                         {
-                            Bitmap  aMask( aBitmap );
-                            if ( ( nUsed & 1 ) && ( nRasterOperation & 0xb0 ) == 0xb0 )     // pattern used
+                            Bitmap	aMask( aBitmap );
+                            if ( ( nUsed & 1 ) && ( nRasterOperation & 0xb0 ) == 0xb0 )		// pattern used
                             {
                                 aBitmap.Convert( BMP_CONVERSION_24BIT );
                                 aBitmap.Erase( maFillStyle.aFillColor );
@@ -1807,7 +1807,7 @@ void WinMtfOutput::ResolveBitmapActions( List& rSaveList )
                             SetRasterOp( R2_NOT );
                             DrawRect( aRect, FALSE );
                             SetRasterOp( R2_COPYPEN );
-                            Bitmap  aMask( aBitmap );
+                            Bitmap	aMask( aBitmap );
                             aBitmap.Invert();
                             BitmapEx aBmpEx( aBitmap, aMask );
                             ImplDrawBitmap( aPos, aSize, aBmpEx );
@@ -1824,7 +1824,7 @@ void WinMtfOutput::ResolveBitmapActions( List& rSaveList )
                         case 0x2 :
                         case 0xd :
                         {
-                            Bitmap  aMask( aBitmap );
+                            Bitmap	aMask( aBitmap );
                             aMask.Invert();
                             BitmapEx aBmpEx( aBitmap, aMask );
                             ImplDrawBitmap( aPos, aSize, aBmpEx );
@@ -1850,16 +1850,16 @@ void WinMtfOutput::ResolveBitmapActions( List& rSaveList )
                         }
                         break;
 
-                        case 0x0 :  // WHITENESS
-                        case 0xf :  // BLACKNESS
-                        {                                                   // in this case nRasterOperation is either 0 or 0xff
+                        case 0x0 :	// WHITENESS
+                        case 0xf :	// BLACKNESS
+                        {													// in this case nRasterOperation is either 0 or 0xff
                             maFillStyle = WinMtfFillStyle( Color( nRasterOperation, nRasterOperation, nRasterOperation ) );
                             UpdateFillStyle();
                             DrawRect( aRect, FALSE );
                         }
                         break;
 
-                        case 0x3 :  // only source is used
+                        case 0x3 :	// only source is used
                         case 0xc :
                         {
                             if ( nRasterOperation == 0x33 )
@@ -1868,12 +1868,12 @@ void WinMtfOutput::ResolveBitmapActions( List& rSaveList )
                         }
                         break;
 
-                        case 0x5 :  // only destination is used
+                        case 0x5 :	// only destination is used
                         {
                             SetRasterOp( R2_NOT );
                             DrawRect( aRect, FALSE );
                         }
-                        case 0xa :  // no operation
+                        case 0xa :	// no operation
                         break;
                     }
                     SetRasterOp( nOldRop );
@@ -1915,7 +1915,7 @@ void WinMtfOutput::SetDevExt( const Size& rSize )
         switch( mnMapMode )
         {
             case MM_ISOTROPIC :
-            case MM_ANISOTROPIC :
+            case MM_ANISOTROPIC	:
             {
                 mnDevWidth = rSize.Width();
                 mnDevHeight = rSize.Height();
@@ -1958,7 +1958,7 @@ void WinMtfOutput::SetWinExt( const Size& rSize )
         switch( mnMapMode )
         {
             case MM_ISOTROPIC :
-            case MM_ANISOTROPIC :
+            case MM_ANISOTROPIC	:
             {
                 mnWinExtX = rSize.Width();
                 mnWinExtY = rSize.Height();
@@ -2049,7 +2049,7 @@ void WinMtfOutput::ModifyWorldTransform( const XForm& rXForm, UINT32 nMode )
 
         case MWT_RIGHTMULTIPLY :
         case MWT_LEFTMULTIPLY :
-        {
+        {                
             const XForm* pLeft;
             const XForm* pRight;
 
@@ -2111,7 +2111,7 @@ void WinMtfOutput::ModifyWorldTransform( const XForm& rXForm, UINT32 nMode )
 
 //-----------------------------------------------------------------------------------
 
-void WinMtfOutput::Push()                       // !! to be able to access the original ClipRegion it
+void WinMtfOutput::Push()						// !! to be able to access the original ClipRegion it
 {                                               // is not allowed to use the MetaPushAction()
     UpdateClipRegion();                         // (the original clip region is on top of the stack) (SJ)
     SaveStructPtr pSave( new SaveStruct );
diff --git a/svtools/source/filter.vcl/wmf/winmtf.hxx b/svtools/source/filter.vcl/wmf/winmtf.hxx
index fb4fd2fe0c57..4ea701e8e627 100644
--- a/svtools/source/filter.vcl/wmf/winmtf.hxx
+++ b/svtools/source/filter.vcl/wmf/winmtf.hxx
@@ -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
@@ -59,140 +59,140 @@
 #define SIMPLEREGION            2
 #define COMPLEXREGION           3
 
-#define RGN_AND                 1
-#define RGN_OR                  2
-#define RGN_XOR                 3
-#define RGN_DIFF                4
-#define RGN_COPY                5
+#define RGN_AND					1
+#define RGN_OR					2
+#define RGN_XOR					3
+#define RGN_DIFF				4
+#define RGN_COPY				5
 
-#define TRANSPARENT             1
-#define OPAQUE                  2
-#define BKMODE_LAST             2
+#define TRANSPARENT				1
+#define OPAQUE					2
+#define BKMODE_LAST				2
 
 /* xform stuff */
-#define MWT_IDENTITY            1
-#define MWT_LEFTMULTIPLY        2
-#define MWT_RIGHTMULTIPLY       3
+#define MWT_IDENTITY			1
+#define MWT_LEFTMULTIPLY		2
+#define MWT_RIGHTMULTIPLY		3
 
 #define ENHMETA_STOCK_OBJECT    0x80000000
 
 /* Stock Logical Objects */
-#define WHITE_BRUSH             0
-#define LTGRAY_BRUSH            1
-#define GRAY_BRUSH              2
-#define DKGRAY_BRUSH            3
-#define BLACK_BRUSH             4
-#define NULL_BRUSH              5
-#define HOLLOW_BRUSH            NULL_BRUSH
-#define WHITE_PEN               6
-#define BLACK_PEN               7
-#define NULL_PEN                8
-#define OEM_FIXED_FONT          10
-#define ANSI_FIXED_FONT         11
-#define ANSI_VAR_FONT           12
-#define SYSTEM_FONT             13
-#define DEVICE_DEFAULT_FONT     14
-#define DEFAULT_PALETTE         15
-#define SYSTEM_FIXED_FONT       16
-
-
-#define R2_BLACK                1
-#define R2_NOTMERGEPEN          2
-#define R2_MASKNOTPEN           3
-#define R2_NOTCOPYPEN           4
-#define R2_MASKPENNOT           5
-#define R2_NOT                  6
-#define R2_XORPEN               7
-#define R2_NOTMASKPEN           8
-#define R2_MASKPEN              9
-#define R2_NOTXORPEN            10
-#define R2_NOP                  11
-#define R2_MERGENOTPEN          12
-#define R2_COPYPEN              13
-#define R2_MERGEPENNOT          14
-#define R2_MERGEPEN             15
-#define R2_WHITE                16
+#define WHITE_BRUSH				0
+#define LTGRAY_BRUSH			1
+#define GRAY_BRUSH				2
+#define DKGRAY_BRUSH			3
+#define BLACK_BRUSH				4
+#define NULL_BRUSH				5
+#define HOLLOW_BRUSH			NULL_BRUSH
+#define WHITE_PEN				6
+#define BLACK_PEN				7
+#define NULL_PEN				8
+#define OEM_FIXED_FONT			10
+#define ANSI_FIXED_FONT			11
+#define ANSI_VAR_FONT			12
+#define SYSTEM_FONT				13
+#define DEVICE_DEFAULT_FONT		14
+#define DEFAULT_PALETTE			15
+#define SYSTEM_FIXED_FONT		16
+
+
+#define R2_BLACK				1
+#define R2_NOTMERGEPEN			2
+#define R2_MASKNOTPEN			3
+#define R2_NOTCOPYPEN			4
+#define R2_MASKPENNOT			5
+#define R2_NOT					6
+#define R2_XORPEN				7
+#define R2_NOTMASKPEN			8
+#define R2_MASKPEN				9
+#define R2_NOTXORPEN			10
+#define R2_NOP					11
+#define R2_MERGENOTPEN			12
+#define R2_COPYPEN				13
+#define R2_MERGEPENNOT			14
+#define R2_MERGEPEN				15
+#define R2_WHITE				16
 
 /* Mapping Modes */
-#define MM_TEXT                 1
-#define MM_LOMETRIC             2
-#define MM_HIMETRIC             3
-#define MM_LOENGLISH            4
-#define MM_HIENGLISH            5
-#define MM_TWIPS                6
-#define MM_ISOTROPIC            7
-#define MM_ANISOTROPIC          8
+#define MM_TEXT					1
+#define MM_LOMETRIC				2
+#define MM_HIMETRIC				3
+#define MM_LOENGLISH			4
+#define MM_HIENGLISH			5
+#define MM_TWIPS				6
+#define MM_ISOTROPIC			7
+#define MM_ANISOTROPIC			8
 
 
 /* Graphics Modes */
-#define GM_COMPATIBLE           1
-#define GM_ADVANCED             2
-#define GM_LAST                 2
+#define GM_COMPATIBLE			1
+#define GM_ADVANCED				2
+#define GM_LAST					2
 
 /* StretchBlt() Modes */
-#define BLACKONWHITE            1
-#define WHITEONBLACK            2
-#define COLORONCOLOR            3
-#define HALFTONE                4
-#define MAXSTRETCHBLTMODE       4
-#define STRETCH_ANDSCANS        BLACKONWHITE
-#define STRETCH_ORSCANS         WHITEONBLACK
-#define STRETCH_DELETESCANS     COLORONCOLOR
-#define STRETCH_HALFTONE        HALFTONE
-
-#define LF_FACESIZE             32
+#define BLACKONWHITE			1
+#define WHITEONBLACK			2
+#define COLORONCOLOR			3
+#define HALFTONE				4
+#define MAXSTRETCHBLTMODE		4
+#define STRETCH_ANDSCANS		BLACKONWHITE
+#define STRETCH_ORSCANS			WHITEONBLACK
+#define STRETCH_DELETESCANS		COLORONCOLOR
+#define STRETCH_HALFTONE		HALFTONE
+
+#define LF_FACESIZE				32
 
 struct LOGFONTW
 {
-    INT32       lfHeight;
-    INT32       lfWidth;
-    INT32       lfEscapement;
-    INT32       lfOrientation;
-    INT32       lfWeight;
-    BYTE        lfItalic;
-    BYTE        lfUnderline;
-    BYTE        lfStrikeOut;
-    BYTE        lfCharSet;
-    BYTE        lfOutPrecision;
-    BYTE        lfClipPrecision;
-    BYTE        lfQuality;
-    BYTE        lfPitchAndFamily;
-    String      alfFaceName;
+    INT32		lfHeight;
+    INT32		lfWidth;
+    INT32		lfEscapement;
+    INT32		lfOrientation;
+    INT32		lfWeight;
+    BYTE		lfItalic;
+    BYTE		lfUnderline;
+    BYTE		lfStrikeOut;
+    BYTE		lfCharSet;
+    BYTE		lfOutPrecision;
+    BYTE		lfClipPrecision;
+    BYTE		lfQuality;
+    BYTE		lfPitchAndFamily;
+    String		alfFaceName;
 };
 
-#define TA_NOUPDATECP           0x0000
-#define TA_UPDATECP             0x0001
-#define TA_LEFT                 0x0000
-#define TA_RIGHT                0x0002
-#define TA_CENTER               0x0006
-#define TA_RIGHT_CENTER  (TA_RIGHT | TA_CENTER)
-#define TA_TOP                  0x0000
-#define TA_BOTTOM               0x0008
-#define TA_BASELINE             0x0018
-
-#define SRCCOPY                 0x00CC0020L
-#define SRCPAINT                0x00EE0086L
-#define SRCAND                  0x008800C6L
-#define SRCINVERT               0x00660046L
-#define SRCERASE                0x00440328L
-#define NOTSRCCOPY              0x00330008L
-#define NOTSRCERASE             0x001100A6L
-#define MERGECOPY               0x00C000CAL
-#define MERGEPAINT              0x00BB0226L
-#define PATCOPY                 0x00F00021L
-#define PATPAINT                0x00FB0A09L
-#define PATINVERT               0x005A0049L
-#define DSTINVERT               0x00550009L
-#define BLACKNESS               0x00000042L
-#define WHITENESS               0x00FF0062L
-
-#define PS_SOLID                0
-#define PS_DASH                 1
-#define PS_DOT                  2
-#define PS_DASHDOT              3
-#define PS_DASHDOTDOT           4
-#define PS_NULL                 5
-#define PS_INSIDEFRAME          6
+#define TA_NOUPDATECP			0x0000
+#define TA_UPDATECP				0x0001
+#define TA_LEFT					0x0000
+#define TA_RIGHT				0x0002
+#define TA_CENTER				0x0006
+#define TA_RIGHT_CENTER	 (TA_RIGHT | TA_CENTER)
+#define TA_TOP					0x0000
+#define TA_BOTTOM				0x0008
+#define TA_BASELINE				0x0018
+
+#define SRCCOPY					0x00CC0020L
+#define SRCPAINT				0x00EE0086L
+#define SRCAND					0x008800C6L
+#define SRCINVERT				0x00660046L
+#define SRCERASE				0x00440328L
+#define NOTSRCCOPY				0x00330008L
+#define NOTSRCERASE				0x001100A6L
+#define MERGECOPY				0x00C000CAL
+#define MERGEPAINT				0x00BB0226L
+#define PATCOPY					0x00F00021L
+#define PATPAINT				0x00FB0A09L
+#define PATINVERT				0x005A0049L
+#define DSTINVERT				0x00550009L
+#define BLACKNESS				0x00000042L
+#define WHITENESS				0x00FF0062L
+
+#define PS_SOLID				0
+#define PS_DASH					1
+#define PS_DOT					2
+#define PS_DASHDOT				3
+#define PS_DASHDOTDOT			4
+#define PS_NULL					5
+#define PS_INSIDEFRAME			6
 #define PS_USERSTYLE            7
 #define PS_ALTERNATE            8
 #define PS_STYLE_MASK           15
@@ -211,14 +211,14 @@ struct LOGFONTW
 #define PS_GEOMETRIC        0x10000
 #define PS_TYPE_MASK        0xF0000
 
-#define ANSI_CHARSET            0
-#define DEFAULT_CHARSET         1
-#define SYMBOL_CHARSET          2
-#define SHIFTJIS_CHARSET        128
-#define HANGEUL_CHARSET         129
-#define GB2312_CHARSET          134
-#define CHINESEBIG5_CHARSET     136
-#define OEM_CHARSET             255
+#define ANSI_CHARSET			0
+#define DEFAULT_CHARSET			1
+#define SYMBOL_CHARSET			2
+#define SHIFTJIS_CHARSET		128
+#define HANGEUL_CHARSET			129
+#define GB2312_CHARSET			134
+#define CHINESEBIG5_CHARSET		136
+#define OEM_CHARSET				255
 /*WINVER >= 0x0400*/
 #define JOHAB_CHARSET           130
 #define HEBREW_CHARSET          177
@@ -232,70 +232,70 @@ struct LOGFONTW
 #define MAC_CHARSET             77
 #define BALTIC_CHARSET          186
 
-#define ETO_OPAQUE              0x0002
-#define ETO_CLIPPED             0x0004
+#define ETO_OPAQUE				0x0002
+#define ETO_CLIPPED				0x0004
 /*WINVER >= 0x0400*/
-#define ETO_GLYPH_INDEX         0x0010
-#define ETO_RTLREADING          0x0080
-#define ETO_NUMERICSLOCAL       0x0400
-#define ETO_NUMERICSLATIN       0x0800
-#define ETO_IGNORELANGUAGE      0x1000
+#define ETO_GLYPH_INDEX			0x0010
+#define ETO_RTLREADING			0x0080
+#define ETO_NUMERICSLOCAL		0x0400
+#define ETO_NUMERICSLATIN		0x0800
+#define ETO_IGNORELANGUAGE		0x1000
 /*_WIN32_WINNT >= 0x0500*/
-#define ETO_PDY                 0x2000
+#define ETO_PDY					0x2000
 
 
-#define DEFAULT_PITCH           0x00
-#define FIXED_PITCH             0x01
-#define VARIABLE_PITCH          0x02
+#define DEFAULT_PITCH			0x00
+#define FIXED_PITCH				0x01
+#define VARIABLE_PITCH			0x02
 
 /* Font Families */
-#define FF_DONTCARE             0x00
-#define FF_ROMAN                0x10
-#define FF_SWISS                0x20
-#define FF_MODERN               0x30
-#define FF_SCRIPT               0x40
-#define FF_DECORATIVE           0x50
-
-#define FW_DONTCARE             0
-#define FW_THIN                 100
-#define FW_EXTRALIGHT           200
-#define FW_LIGHT                300
-#define FW_NORMAL               400
-#define FW_MEDIUM               500
-#define FW_SEMIBOLD             600
-#define FW_BOLD                 700
-#define FW_EXTRABOLD            800
-#define FW_HEAVY                900
-#define FW_ULTRALIGHT           200
-#define FW_REGULAR              400
-#define FW_DEMIBOLD             600
-#define FW_ULTRABOLD            800
-#define FW_BLACK                900
-
-#define BS_SOLID                0
-#define BS_NULL                 1
-#define BS_HOLLOW               1
-#define BS_HATCHED              2
-#define BS_PATTERN              3
-#define BS_INDEXED              4
-#define BS_DIBPATTERN           5
-#define BS_DIBPATTERNPT         6
-#define BS_PATTERN8X8           7
-#define BS_DIBPATTERN8X8        8
-#define BS_MONOPATTERN          9
-
-#define W_HS_HORIZONTAL         0
-#define W_HS_VERTICAL           1
-#define W_HS_FDIAGONAL          2
-#define W_HS_BDIAGONAL          3
-#define W_HS_CROSS              4
-#define W_HS_DIAGCROSS          5
+#define FF_DONTCARE				0x00
+#define FF_ROMAN				0x10
+#define FF_SWISS				0x20
+#define FF_MODERN				0x30
+#define FF_SCRIPT				0x40
+#define FF_DECORATIVE			0x50
+
+#define FW_DONTCARE				0
+#define FW_THIN					100
+#define FW_EXTRALIGHT			200
+#define FW_LIGHT				300
+#define FW_NORMAL				400
+#define FW_MEDIUM				500
+#define FW_SEMIBOLD				600
+#define FW_BOLD					700
+#define FW_EXTRABOLD			800
+#define FW_HEAVY				900
+#define FW_ULTRALIGHT			200
+#define FW_REGULAR				400
+#define FW_DEMIBOLD				600
+#define FW_ULTRABOLD			800
+#define FW_BLACK				900
+
+#define BS_SOLID				0
+#define BS_NULL					1
+#define BS_HOLLOW				1
+#define BS_HATCHED				2
+#define BS_PATTERN				3
+#define BS_INDEXED				4
+#define BS_DIBPATTERN			5
+#define BS_DIBPATTERNPT			6
+#define BS_PATTERN8X8			7
+#define BS_DIBPATTERN8X8		8
+#define BS_MONOPATTERN			9
+
+#define W_HS_HORIZONTAL			0
+#define W_HS_VERTICAL			1
+#define W_HS_FDIAGONAL			2
+#define W_HS_BDIAGONAL			3
+#define W_HS_CROSS				4
+#define W_HS_DIAGCROSS			5
 
 #define RDH_RECTANGLES  1
 
-#define W_MFCOMMENT             15
+#define W_MFCOMMENT				15
 
-#define PRIVATE_ESCAPE_UNICODE  2
+#define PRIVATE_ESCAPE_UNICODE	2
 
 //============================ WMFReader ==================================
 
@@ -306,28 +306,28 @@ struct LOGFONTW
 #define WIN_MTF_ASSERT_MIFE     0x20000000
 
 void WinMtfAssertHandler( const sal_Char*, sal_uInt32 nFlags = WIN_MTF_ASSERT_MIFE );
-#endif
+#endif 
 
 enum WinMtfClipPathType{ EMPTY, RECTANGLE, COMPLEX };
 
 class WinMtfClipPath
 {
-        PolyPolygon         aPolyPoly;
-        WinMtfClipPathType  eType;
-        sal_Int32           nDepth;
+        PolyPolygon			aPolyPoly;
+        WinMtfClipPathType	eType;
+        sal_Int32			nDepth;
 
-        void        ImpUpdateType();
+        void		ImpUpdateType();
 
     public :
 
-        sal_Bool    bNeedsUpdate;
+        sal_Bool	bNeedsUpdate;
 
                     WinMtfClipPath(): eType(EMPTY), nDepth( 0 ), bNeedsUpdate( sal_False ){};
 
-        void        SetClipPath( const PolyPolygon& rPolyPolygon, sal_Int32 nClippingMode );
-        void        IntersectClipRect( const Rectangle& rRect );
-        void        ExcludeClipRect( const Rectangle& rRect );
-        void        MoveClipRegion( const Size& rSize );
+        void		SetClipPath( const PolyPolygon& rPolyPolygon, sal_Int32 nClippingMode );
+        void		IntersectClipRect( const Rectangle& rRect );
+        void		ExcludeClipRect( const Rectangle& rRect );
+        void		MoveClipRegion( const Size& rSize );
 
         WinMtfClipPathType GetType() const { return eType; };
         const PolyPolygon& GetClipPath() const { return aPolyPoly; };
@@ -341,23 +341,23 @@ class WinMtfClipPath
 
 class WinMtfPathObj : public PolyPolygon
 {
-        sal_Bool    bClosed;
+        sal_Bool	bClosed;
 
     public :
 
                 WinMtfPathObj() { bClosed = sal_True; }
         void    Init() { Clear(); bClosed = sal_True; };
-        void    ClosePath();
+        void	ClosePath();
 
-        void    AddPoint( const Point& rPoint );
-        void    AddPolygon( const Polygon& rPoly );
-        void    AddPolyLine( const Polygon& rPoly );
-        void    AddPolyPolygon( const PolyPolygon& rPolyPolygon );
+        void	AddPoint( const Point& rPoint );
+        void	AddPolygon( const Polygon& rPoly );
+        void	AddPolyLine( const Polygon& rPoly );
+        void	AddPolyPolygon( const PolyPolygon& rPolyPolygon );
 };
 
 struct WinMtfFontStyle
 {
-    Font        aFont;
+    Font		aFont;
 
     WinMtfFontStyle( LOGFONTW& rLogFont );
 };
@@ -366,17 +366,17 @@ struct WinMtfFontStyle
 
 struct WinMtfFillStyle
 {
-    Color   aFillColor;
-    BOOL    bTransparent;
+    Color	aFillColor;
+    BOOL	bTransparent;
 
     WinMtfFillStyle() :
-        aFillColor  ( Color( COL_BLACK ) ),
+        aFillColor	( Color( COL_BLACK ) ),
         bTransparent( FALSE )
     {
     };
 
     WinMtfFillStyle( const Color& rColor, BOOL bTrans = FALSE ) :
-        aFillColor  ( rColor ),
+        aFillColor	( rColor ),
         bTransparent( bTrans )
     {
     };
@@ -393,21 +393,21 @@ struct WinMtfFillStyle
 
 struct WinMtfLineStyle
 {
-    Color       aLineColor;
-    LineInfo    aLineInfo;
-    BOOL        bTransparent;
+    Color		aLineColor;
+    LineInfo	aLineInfo;
+    BOOL		bTransparent;
 
     WinMtfLineStyle() :
-        aLineColor  ( COL_BLACK ),
+        aLineColor	( COL_BLACK ),
         bTransparent( FALSE ) {};
 
     WinMtfLineStyle( const Color& rColor, BOOL bTrans = FALSE ) :
-        aLineColor  ( rColor ),
+        aLineColor	( rColor ),
         bTransparent( bTrans ) {};
 
     WinMtfLineStyle( const Color& rColor, const LineInfo rStyle, BOOL bTrans = FALSE ) :
-        aLineColor  ( rColor ),
-        aLineInfo   ( rStyle ),
+        aLineColor	( rColor ),
+        aLineInfo	( rStyle ),
         bTransparent( bTrans ) {};
 
     BOOL operator==( const WinMtfLineStyle& rStyle ) { return ( ( aLineColor == rStyle.aLineColor ) && ( bTransparent == rStyle.bTransparent ) && ( aLineInfo == rStyle.aLineInfo ) ); };
@@ -431,12 +431,12 @@ struct WinMtfLineStyle
 
 struct XForm
 {
-    float   eM11;
-    float   eM12;
-    float   eM21;
-    float   eM22;
-    float   eDx;
-    float   eDy;
+    float	eM11;
+    float	eM12;
+    float	eM21;
+    float	eM22;
+    float	eDx;
+    float	eDy;
     XForm()
     {
         eM11 =  eM22 = 1.0f;
@@ -451,25 +451,25 @@ struct XForm
 struct SaveStruct
 {
     sal_uInt32          nBkMode, nMapMode, nGfxMode, nTextLayoutMode;
-    sal_Int32           nWinOrgX, nWinOrgY, nWinExtX, nWinExtY;
-    sal_Int32           nDevOrgX, nDevOrgY, nDevWidth, nDevHeight;
+    sal_Int32			nWinOrgX, nWinOrgY, nWinExtX, nWinExtY;
+    sal_Int32			nDevOrgX, nDevOrgY, nDevWidth, nDevHeight;
 
-    WinMtfLineStyle     aLineStyle;
-    WinMtfFillStyle     aFillStyle;
+    WinMtfLineStyle		aLineStyle;
+    WinMtfFillStyle		aFillStyle;
 
-    Font                aFont;
-    Color               aBkColor;
-    Color               aTextColor;
+    Font				aFont;
+    Color				aBkColor;
+    Color				aTextColor;
     sal_uInt32          nTextAlign;
     RasterOp            eRasterOp;
 
-    Point               aActPos;
-    WinMtfPathObj       aPathObj;
-    WinMtfClipPath      aClipPath;
-    XForm               aXForm;
+    Point				aActPos;
+    WinMtfPathObj		aPathObj;
+    WinMtfClipPath		aClipPath;
+    XForm				aXForm;
 
-    sal_Bool            bRecordPath;
-    sal_Bool            bFillStyleSelected;
+    sal_Bool			bRecordPath;
+    sal_Bool			bFillStyleSelected;
 };
 
 typedef ::boost::shared_ptr< SaveStruct > SaveStructPtr;
@@ -478,9 +478,9 @@ typedef ::boost::shared_ptr< SaveStruct > SaveStructPtr;
 
 struct BSaveStruct
 {
-    Bitmap      aBmp;
-    Rectangle   aOutRect;
-    UINT32      nWinRop;
+    Bitmap		aBmp;
+    Rectangle	aOutRect;
+    UINT32		nWinRop;
 
                 BSaveStruct( const Bitmap& rBmp, const Rectangle& rOutRect, UINT32 nRop ) :
                     aBmp( rBmp ), aOutRect( rOutRect ), nWinRop( nRop ){};
@@ -492,12 +492,12 @@ enum GDIObjectType { GDI_DUMMY = 0, GDI_PEN = 1, GDI_BRUSH = 2, GDI_FONT = 3, GD
 
 struct GDIObj
 {
-    void*           pStyle;
-    GDIObjectType   eType;
+    void*			pStyle;
+    GDIObjectType 	eType;
 
     GDIObj() :
-        pStyle  ( NULL ),
-        eType   ( GDI_DUMMY )
+        pStyle	( NULL ),
+        eType	( GDI_DUMMY )
     {
     };
 
@@ -538,142 +538,142 @@ struct GDIObj
 class WinMtfOutput
 {
 
-        WinMtfPathObj       aPathObj;
-        WinMtfClipPath      aClipPath;
+        WinMtfPathObj		aPathObj;
+        WinMtfClipPath		aClipPath;
 
-        WinMtfLineStyle     maLatestLineStyle;
-        WinMtfLineStyle     maLineStyle;
-        WinMtfFillStyle     maLatestFillStyle;
-        WinMtfFillStyle     maFillStyle;
+        WinMtfLineStyle		maLatestLineStyle;
+        WinMtfLineStyle		maLineStyle;
+        WinMtfFillStyle		maLatestFillStyle;
+        WinMtfFillStyle		maFillStyle;
         Font                maLatestFont;
-        Font                maFont;
+        Font				maFont;
         sal_uInt32          mnLatestTextAlign;
         sal_uInt32          mnTextAlign;
         Color               maLatestTextColor;
-        Color               maTextColor;
+        Color				maTextColor;
         Color               maLatestBkColor;
-        Color               maBkColor;
-        sal_uInt32          mnLatestTextLayoutMode;
-        sal_uInt32          mnTextLayoutMode;
+        Color				maBkColor;
+        sal_uInt32			mnLatestTextLayoutMode;
+        sal_uInt32			mnTextLayoutMode;
         sal_uInt32          mnLatestBkMode;
         sal_uInt32          mnBkMode;
         RasterOp            meLatestRasterOp;
-        RasterOp            meRasterOp;
+        RasterOp			meRasterOp;
 
         std::vector< GDIObj* > vGDIObj;
 
-        Point               maActPos;
+        Point				maActPos;
 
         sal_uInt32          mnRop;
         sal_Bool            mbNopMode;
-        sal_Bool            mbFillStyleSelected;
+        sal_Bool			mbFillStyleSelected;
 
         std::vector< SaveStructPtr > vSaveStack;
 
-        sal_uInt32          mnGfxMode;
+        sal_uInt32			mnGfxMode;
         sal_uInt32          mnMapMode;
-        XForm               maXForm;
-        sal_Int32           mnDevOrgX, mnDevOrgY;
-        sal_Int32           mnDevWidth, mnDevHeight;
-        sal_Int32           mnWinOrgX, mnWinOrgY;       // aktuelles Window-Origin
-        sal_Int32           mnWinExtX, mnWinExtY;       // aktuelles Window-Extent
-
-        sal_Int32           mnPixX, mnPixY;             // Reference Device in pixel
-        sal_Int32           mnMillX, mnMillY;           // Reference Device in Mill
-        Rectangle           mrclFrame;                  // rectangle in logical units 1/100th mm
-        Rectangle           mrclBounds;
-
-        GDIMetaFile*        mpGDIMetaFile;
-
-        void                UpdateLineStyle();
-        void                UpdateFillStyle();
-
-        Point               ImplMap( const Point& rPt );
-        Size                ImplMap( const Size& rSz );
-        Rectangle           ImplMap( const Rectangle& rRectangle );
-        void                ImplMap( Font& rFont );
-        Polygon&            ImplMap( Polygon& rPolygon );
-        PolyPolygon&        ImplMap( PolyPolygon& rPolyPolygon );
-        void                ImplResizeObjectArry( UINT32 nNewEntry );
-        void                ImplSetNonPersistentLineColorTransparenz();
-        void                ImplDrawClippedPolyPolygon( const PolyPolygon& rPolyPoly );
-        void                ImplDrawBitmap( const Point& rPos, const Size& rSize, const BitmapEx rBitmap );
+        XForm				maXForm;
+        sal_Int32			mnDevOrgX, mnDevOrgY;
+        sal_Int32			mnDevWidth, mnDevHeight;
+        sal_Int32			mnWinOrgX, mnWinOrgY;		// aktuelles Window-Origin
+        sal_Int32			mnWinExtX, mnWinExtY;		// aktuelles Window-Extent
+    
+        sal_Int32			mnPixX, mnPixY;				// Reference Device in pixel
+        sal_Int32			mnMillX, mnMillY;			// Reference Device in Mill
+        Rectangle			mrclFrame;					// rectangle in logical units 1/100th mm
+        Rectangle			mrclBounds;
+        
+        GDIMetaFile*		mpGDIMetaFile;
+
+        void				UpdateLineStyle();
+        void				UpdateFillStyle();
+
+        Point				ImplMap( const Point& rPt );
+        Size				ImplMap( const Size& rSz );
+        Rectangle			ImplMap( const Rectangle& rRectangle );
+        void				ImplMap( Font& rFont );
+        Polygon&			ImplMap( Polygon& rPolygon );
+        PolyPolygon&		ImplMap( PolyPolygon& rPolyPolygon );
+        void				ImplResizeObjectArry( UINT32 nNewEntry );
+        void				ImplSetNonPersistentLineColorTransparenz();
+        void				ImplDrawClippedPolyPolygon( const PolyPolygon& rPolyPoly );
+        void				ImplDrawBitmap( const Point& rPos, const Size& rSize, const BitmapEx rBitmap );
 
     public:
 
-        void                SetDevOrg( const Point& rPoint );
-        void                SetDevOrgOffset( INT32 nXAdd, INT32 nYAdd );
-        void                SetDevExt( const Size& rSize );
-        void                ScaleDevExt( double fX, double fY );
+        void				SetDevOrg( const Point& rPoint );
+        void				SetDevOrgOffset( INT32 nXAdd, INT32 nYAdd );
+        void				SetDevExt( const Size& rSize );
+        void				ScaleDevExt( double fX, double fY );
 
-        void                SetWinOrg( const Point& rPoint );
-        void                SetWinOrgOffset( INT32 nX, INT32 nY );
-        void                SetWinExt( const Size& rSize );
-        void                ScaleWinExt( double fX, double fY );
+        void				SetWinOrg( const Point& rPoint );
+        void				SetWinOrgOffset( INT32 nX, INT32 nY );
+        void				SetWinExt( const Size& rSize );
+        void				ScaleWinExt( double fX, double fY );
 
-        void                SetrclBounds( const Rectangle& rRect );
-        void                SetrclFrame( const Rectangle& rRect );
-        void                SetRefPix( const Size& rSize );
-        void                SetRefMill( const Size& rSize );
+        void				SetrclBounds( const Rectangle& rRect );
+        void				SetrclFrame( const Rectangle& rRect );
+        void				SetRefPix( const Size& rSize );
+        void				SetRefMill( const Size& rSize );
 
-        sal_uInt32          GetMapMode() const { return mnMapMode; };
+        sal_uInt32			GetMapMode() const { return mnMapMode; };
         void                SetMapMode( sal_uInt32 mnMapMode );
-        void                SetWorldTransform( const XForm& rXForm );
-        void                ModifyWorldTransform( const XForm& rXForm, UINT32 nMode );
-
-        void                Push();
-        void                Pop();
-
-        UINT32              SetRasterOp( UINT32 nRasterOp );
-        void                StrokeAndFillPath( sal_Bool bStroke, sal_Bool bFill );
-
-        void                SetGfxMode( sal_Int32 nGfxMode ){ mnGfxMode = nGfxMode; };
-        sal_Int32           GetGfxMode() const { return mnGfxMode; };
-        void                SetBkMode( UINT32 nMode );
-        void                SetBkColor( const Color& rColor );
-        void                SetTextColor( const Color& rColor );
-        void                SetTextAlign( UINT32 nAlign );
-        void                CreateObject( GDIObjectType, void* pStyle = NULL );
-        void                CreateObject( INT32 nIndex, GDIObjectType, void* pStyle = NULL );
-        void                DeleteObject( INT32 nIndex );
-        void                SelectObject( INT32 nIndex );
-        CharSet             GetCharSet(){ return maFont.GetCharSet(); };
-        void                SetFont( const Font& rFont );
-        const Font&         GetFont() const;
-        void                SetTextLayoutMode( const sal_uInt32 nLayoutMode );
-        sal_uInt32          GetTextLayoutMode() const;
-
-        void                ClearPath(){ aPathObj.Init(); };
-        void                ClosePath(){ aPathObj.ClosePath(); };
-        const PolyPolygon&  GetPathObj(){ return aPathObj; };
-
-        void                MoveTo( const Point& rPoint, sal_Bool bRecordPath = sal_False );
-        void                LineTo( const Point& rPoint, sal_Bool bRecordPath = sal_False );
-        void                DrawPixel( const Point& rSource, const Color& rColor );
-        void                DrawLine( const Point& rSource, const Point& rDest );
-        void                DrawRect( const Rectangle& rRect, BOOL bEdge = TRUE );
-        void                DrawRoundRect( const Rectangle& rRect, const Size& rSize );
-        void                DrawEllipse( const Rectangle& rRect );
-        void                DrawArc( const Rectangle& rRect, const Point& rStartAngle, const Point& rEndAngle, BOOL bDrawTo = FALSE );
-        void                DrawPie( const Rectangle& rRect, const Point& rStartAngle, const Point& rEndAngle );
-        void                DrawChord( const Rectangle& rRect, const Point& rStartAngle, const Point& rEndAngle );
-        void                DrawPolygon( Polygon& rPolygon, sal_Bool bRecordPath = sal_False );
-        void                DrawPolyPolygon( PolyPolygon& rPolyPolygon, sal_Bool bRecordPath = sal_False );
-        void                DrawPolyLine( Polygon& rPolygon, sal_Bool bDrawTo = sal_False, sal_Bool bRecordPath = sal_False );
-        void                DrawPolyBezier( Polygon& rPolygin, sal_Bool bDrawTo = sal_False, sal_Bool bRecordPath = sal_False );
-        void                DrawText( Point& rPosition, String& rString, sal_Int32* pDXArry = NULL, sal_Bool bRecordPath = sal_False,
+        void				SetWorldTransform( const XForm& rXForm );
+        void				ModifyWorldTransform( const XForm& rXForm, UINT32 nMode );
+
+        void				Push();
+        void				Pop();
+
+        UINT32				SetRasterOp( UINT32 nRasterOp );
+        void				StrokeAndFillPath( sal_Bool bStroke, sal_Bool bFill );
+
+        void				SetGfxMode( sal_Int32 nGfxMode ){ mnGfxMode = nGfxMode; };
+        sal_Int32			GetGfxMode() const { return mnGfxMode; };
+        void				SetBkMode( UINT32 nMode );
+        void				SetBkColor( const Color& rColor );
+        void				SetTextColor( const Color& rColor );
+        void				SetTextAlign( UINT32 nAlign );
+        void				CreateObject( GDIObjectType, void* pStyle = NULL );
+        void				CreateObject( INT32 nIndex, GDIObjectType, void* pStyle = NULL );
+        void				DeleteObject( INT32 nIndex );
+        void				SelectObject( INT32 nIndex );
+        CharSet				GetCharSet(){ return maFont.GetCharSet(); };
+        void				SetFont( const Font& rFont );
+        const Font&			GetFont() const;
+        void				SetTextLayoutMode( const sal_uInt32 nLayoutMode );
+        sal_uInt32			GetTextLayoutMode() const;
+
+        void				ClearPath(){ aPathObj.Init(); };
+        void				ClosePath(){ aPathObj.ClosePath(); };
+        const PolyPolygon&	GetPathObj(){ return aPathObj; };
+
+        void				MoveTo( const Point& rPoint, sal_Bool bRecordPath = sal_False );
+        void				LineTo( const Point& rPoint, sal_Bool bRecordPath = sal_False );
+        void				DrawPixel( const Point& rSource, const Color& rColor );
+        void				DrawLine( const Point& rSource, const Point& rDest );
+        void				DrawRect( const Rectangle& rRect, BOOL bEdge = TRUE );
+        void				DrawRoundRect( const Rectangle& rRect, const Size& rSize );
+        void				DrawEllipse( const Rectangle& rRect );
+        void				DrawArc( const Rectangle& rRect, const Point& rStartAngle, const Point& rEndAngle, BOOL bDrawTo = FALSE );
+        void				DrawPie( const Rectangle& rRect, const Point& rStartAngle, const Point& rEndAngle );
+        void				DrawChord( const Rectangle& rRect, const Point& rStartAngle, const Point& rEndAngle );
+        void				DrawPolygon( Polygon& rPolygon, sal_Bool bRecordPath = sal_False );
+        void				DrawPolyPolygon( PolyPolygon& rPolyPolygon, sal_Bool bRecordPath = sal_False );
+        void				DrawPolyLine( Polygon& rPolygon, sal_Bool bDrawTo = sal_False, sal_Bool bRecordPath = sal_False );
+        void				DrawPolyBezier( Polygon& rPolygin, sal_Bool bDrawTo = sal_False, sal_Bool bRecordPath = sal_False );
+        void				DrawText( Point& rPosition, String& rString, sal_Int32* pDXArry = NULL, sal_Bool bRecordPath = sal_False,
                                         sal_Int32 nGraphicsMode = GM_COMPATIBLE );
-        void                ResolveBitmapActions( List& rSaveList );
+        void				ResolveBitmapActions( List& rSaveList );
 
-        void                IntersectClipRect( const Rectangle& rRect );
-        void                ExcludeClipRect( const Rectangle& rRect );
-        void                MoveClipRegion( const Size& rSize );
-        void                SetClipPath( const PolyPolygon& rPolyPoly, sal_Int32 nClippingMode, sal_Bool bIsMapped );
-        void                UpdateClipRegion();
-        void                AddFromGDIMetaFile( GDIMetaFile& rGDIMetaFile );
+        void				IntersectClipRect( const Rectangle& rRect );
+        void				ExcludeClipRect( const Rectangle& rRect );
+        void				MoveClipRegion( const Size& rSize );
+        void				SetClipPath( const PolyPolygon& rPolyPoly, sal_Int32 nClippingMode, sal_Bool bIsMapped );
+        void				UpdateClipRegion();
+        void				AddFromGDIMetaFile( GDIMetaFile& rGDIMetaFile );
 
                             WinMtfOutput( GDIMetaFile& rGDIMetaFile );
-        virtual             ~WinMtfOutput();
+        virtual				~WinMtfOutput();
 };
 
 // -----------------------------------------------------------------------------
@@ -682,20 +682,20 @@ class WinMtf
 {
     protected:
 
-    WinMtfOutput*       pOut;                   //
-    SvStream*           pWMF;                   // Die einzulesende WMF/EMF-Datei
+    WinMtfOutput*		pOut;					//
+    SvStream*			pWMF;					// Die einzulesende WMF/EMF-Datei
 
-    UINT32              nStartPos, nEndPos;
-    List                aBmpSaveList;
+    UINT32				nStartPos, nEndPos;
+    List				aBmpSaveList;
 
-    FilterConfigItem*   pFilterConfigItem;
+    FilterConfigItem*	pFilterConfigItem;
 
     com::sun::star::uno::Reference< com::sun::star::task::XStatusIndicator > xStatusIndicator;
 
     // Sorgt dafuer, das aSampledBrush der aktuelle Brush des GDIMetaFiles ist.
 
-    Color               ReadColor();
-    void                Callback( USHORT nPercent );
+    Color				ReadColor();
+    void				Callback( USHORT nPercent );
 
                         WinMtf( WinMtfOutput* pOut, SvStream& rStreamWMF, FilterConfigItem* pConfigItem = NULL );
                         ~WinMtf();
@@ -708,19 +708,19 @@ class WinMtf
 
 class EnhWMFReader : public WinMtf
 {
-    sal_Bool        bRecordPath;
-    sal_Int32       nRecordCount;
+    sal_Bool		bRecordPath;
+    sal_Int32		nRecordCount;
 
-    BOOL            ReadHeader();
-    Rectangle       ReadRectangle( INT32, INT32, INT32, INT32 );            // Liesst und konvertiert ein Rechteck
-    void            ImplExtTextOut( BOOL bWideCharakter );
+    BOOL			ReadHeader();
+    Rectangle		ReadRectangle( INT32, INT32, INT32, INT32 );			// Liesst und konvertiert ein Rechteck
+    void			ImplExtTextOut( BOOL bWideCharakter );
 
 public:
                     EnhWMFReader( SvStream& rStreamWMF, GDIMetaFile& rGDIMetaFile, FilterConfigItem* pConfigItem = NULL )
                                     : WinMtf( new WinMtfOutput( rGDIMetaFile ), rStreamWMF, pConfigItem ), bRecordPath( sal_False ) {};
                     ~EnhWMFReader();
 
-    BOOL            ReadEnhWMF();
+    BOOL			ReadEnhWMF();
 };
 
 //============================ WMFReader ==================================
@@ -729,47 +729,47 @@ class WMFReader : public WinMtf
 {
 private:
 
-    VirtualDevice   aVDev;  // just for the purpose of "IsFontAvailable"
-    UINT16          nUnitsPerInch;
-    sal_uInt32      nRecSize;
+    VirtualDevice	aVDev;	// just for the purpose of "IsFontAvailable"
+    UINT16			nUnitsPerInch;
+    sal_uInt32		nRecSize;
 
     // embedded EMF data
-    SvMemoryStream* pEMFStream;
+    SvMemoryStream* pEMFStream; 
 
     // total number of comment records containing EMF data
     sal_uInt32      nEMFRecCount;
-
+    
     // number of EMF records read
     sal_uInt32      nEMFRec;
 
     // total size of embedded EMF data
     sal_uInt32      nEMFSize;
 
-    sal_uInt32      nSkipActions;
-    sal_uInt32      nCurrentAction;
-    sal_uInt32      nUnicodeEscapeAction;
+    sal_uInt32		nSkipActions;
+    sal_uInt32		nCurrentAction;
+    sal_uInt32		nUnicodeEscapeAction;
 
     // Liesst den Kopf der WMF-Datei
-    BOOL            ReadHeader();
+    BOOL			ReadHeader();
 
     // Liesst die Parameter des Rocords mit der Funktionsnummer nFunction.
-    void            ReadRecordParams( USHORT nFunction );
+    void			ReadRecordParams( USHORT nFunction );
 
-    Point           ReadPoint();                // Liesst und konvertiert einen Punkt (erst X dann Y)
-    Point           ReadYX();                   // Liesst und konvertiert einen Punkt (erst Y dann X)
-    Rectangle       ReadRectangle();            // Liesst und konvertiert ein Rechteck
-    Size            ReadYXExt();
+    Point			ReadPoint();				// Liesst und konvertiert einen Punkt (erst X dann Y)
+    Point			ReadYX();					// Liesst und konvertiert einen Punkt (erst Y dann X)
+    Rectangle		ReadRectangle();			// Liesst und konvertiert ein Rechteck
+    Size			ReadYXExt();
     sal_Bool        GetPlaceableBound( Rectangle& rSize, SvStream* pStrm );
 
 public:
 
                     WMFReader( SvStream& rStreamWMF, GDIMetaFile& rGDIMetaFile, FilterConfigItem* pConfigItem = NULL )
                         : WinMtf( new WinMtfOutput( rGDIMetaFile ), rStreamWMF, pConfigItem ) {};
-
+                    
                     ~WMFReader();
 
     // Liesst aus dem Stream eine WMF-Datei und fuellt das GDIMetaFile
-    void            ReadWMF();
+    void			ReadWMF();
 };
 
 #endif
diff --git a/svtools/source/filter.vcl/wmf/winwmf.cxx b/svtools/source/filter.vcl/wmf/winwmf.cxx
index cea1ab490b04..a549c6095e2a 100644
--- a/svtools/source/filter.vcl/wmf/winwmf.cxx
+++ b/svtools/source/filter.vcl/wmf/winwmf.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
@@ -333,9 +333,9 @@ void WMFReader::ReadRecordParams( USHORT nFunc )
 
         case W_META_POLYPOLYGON:
         {
-            USHORT  i, nPoly, nPoints;
-            USHORT* pnPoints;
-            Point*  pPtAry;
+            USHORT	i, nPoly, nPoints;
+            USHORT*	pnPoints;
+            Point*	pPtAry;
             // Anzahl der Polygone:
             *pWMF >> nPoly;
             // Anzahl der Punkte eines jeden Polygons holen, Gesammtzahl der Punkte ermitteln:
@@ -400,7 +400,7 @@ void WMFReader::ReadRecordParams( USHORT nFunc )
             *pWMF >> nLength;
             if ( nLength )
             {
-                char*   pChar = new char[ ( nLength + 1 ) &~ 1 ];
+                char*	pChar = new char[ ( nLength + 1 ) &~ 1 ];
                 pWMF->Read( pChar, ( nLength + 1 ) &~ 1 );
                 String aText( pChar, nLength, pOut->GetCharSet() );
                 delete[] pChar;
@@ -412,12 +412,12 @@ void WMFReader::ReadRecordParams( USHORT nFunc )
 
         case W_META_EXTTEXTOUT:
         {
-            sal_Int16   nDx, nDxTmp;
-            sal_uInt16  i, nLen, nOptions;
-            sal_Int32   nRecordPos, nRecordSize, nOriginalTextLen, nNewTextLen;
-            Point       aPosition;
-            Rectangle   aRect;
-            sal_Int32*  pDXAry = NULL;
+            sal_Int16	nDx, nDxTmp;
+            sal_uInt16	i, nLen, nOptions;
+            sal_Int32	nRecordPos, nRecordSize, nOriginalTextLen, nNewTextLen;
+            Point		aPosition;
+            Rectangle	aRect;
+            sal_Int32*	pDXAry = NULL;
 
             pWMF->SeekRel(-6);
             nRecordPos = pWMF->Tell();
@@ -445,15 +445,15 @@ void WMFReader::ReadRecordParams( USHORT nFunc )
                 char* pChar = new char[ ( nOriginalTextLen + 1 ) &~ 1 ];
                 pWMF->Read( pChar, ( nOriginalTextLen + 1 ) &~ 1 );
                 String aText( pChar, (sal_uInt16)nOriginalTextLen, pOut->GetCharSet() );// after this conversion the text may contain
-                nNewTextLen = aText.Len();                                              // less character (japanese version), so the
-                delete[] pChar;                                                         // dxAry will not fit
+                nNewTextLen = aText.Len();										        // less character (japanese version), so the
+                delete[] pChar;													        // dxAry will not fit
 
                 if ( nNewTextLen )
                 {
-                    sal_uInt32  nMaxStreamPos = nRecordPos + ( nRecordSize << 1 );
-                    sal_Int32   nDxArySize =  nMaxStreamPos - pWMF->Tell();
-                    sal_Int32   nDxAryEntries = nDxArySize >> 1;
-                    sal_Bool    bUseDXAry = FALSE;
+                    sal_uInt32	nMaxStreamPos = nRecordPos + ( nRecordSize << 1 );
+                    sal_Int32	nDxArySize =  nMaxStreamPos - pWMF->Tell();
+                    sal_Int32	nDxAryEntries = nDxArySize >> 1;
+                    sal_Bool	bUseDXAry = FALSE;
 
                     if ( ( ( nDxAryEntries % nOriginalTextLen ) == 0 ) && ( nNewTextLen <= nOriginalTextLen ) )
                     {
@@ -476,7 +476,7 @@ void WMFReader::ReadRecordParams( USHORT nFunc )
                                         *pWMF >> nDxTmp;
                                         nDx = nDx + nDxTmp;
                                     }
-                                }
+                                }							
                             }
                             pDXAry[ i ] = nDx;
                         }
@@ -496,7 +496,7 @@ void WMFReader::ReadRecordParams( USHORT nFunc )
 
         case W_META_SELECTOBJECT:
         {
-            INT16   nObjIndex;
+            INT16	nObjIndex;
             *pWMF >> nObjIndex;
             pOut->SelectObject( nObjIndex );
         }
@@ -504,7 +504,7 @@ void WMFReader::ReadRecordParams( USHORT nFunc )
 
         case W_META_SETTEXTALIGN:
         {
-            UINT16  nAlign;
+            UINT16	nAlign;
             *pWMF >> nAlign;
             pOut->SetTextAlign( nAlign );
         }
@@ -512,7 +512,7 @@ void WMFReader::ReadRecordParams( USHORT nFunc )
 
         case W_META_BITBLT:
         {
-            // 0-3   : nWinROP                      #93454#
+            // 0-3   : nWinROP						#93454#
             // 4-5   : y offset of source bitmap
             // 6-7   : x offset of source bitmap
             // 8-9   : used height of source bitmap
@@ -524,11 +524,11 @@ void WMFReader::ReadRecordParams( USHORT nFunc )
             // 20-21 : Height Bitmap in Pixel
             // 22-23 : bytes per scanline
             // 24    : planes
-            // 25    : bitcount
+            // 25	 : bitcount
 
-            sal_Int32   nWinROP;
-            sal_uInt16  nSx, nSy, nSxe, nSye, nDontKnow, nWidth, nHeight, nBytesPerScan;
-            sal_uInt8   nPlanes, nBitCount;
+            sal_Int32	nWinROP;
+            sal_uInt16	nSx, nSy, nSxe, nSye, nDontKnow, nWidth, nHeight, nBytesPerScan;
+            sal_uInt8	nPlanes, nBitCount;
 
             *pWMF >> nWinROP
                   >> nSy >> nSx >> nSye >> nSxe;
@@ -561,7 +561,7 @@ void WMFReader::ReadRecordParams( USHORT nFunc )
                         }
                     }
                     aBmp.ReleaseAccess( pAcc );
-                    if ( nSye && nSxe &&
+                    if ( nSye && nSxe && 
                         ( ( nSx + nSxe ) <= aBmp.GetSizePixel().Width() ) &&
                             ( ( nSy + nSye <= aBmp.GetSizePixel().Height() ) ) )
                     {
@@ -572,7 +572,7 @@ void WMFReader::ReadRecordParams( USHORT nFunc )
                     aBmpSaveList.Insert( new BSaveStruct( aBmp, aDestRect, nWinROP ), LIST_APPEND );
                 }
             }
-        }
+        }		
         break;
 
         case W_META_STRETCHBLT:
@@ -582,13 +582,13 @@ void WMFReader::ReadRecordParams( USHORT nFunc )
         {
             sal_Int32   nWinROP;
             sal_uInt16  nSx, nSy, nSxe, nSye, nUsage;
-            Bitmap      aBmp;
+            Bitmap		aBmp;
 
             *pWMF >> nWinROP;
 
             if( nFunc == W_META_STRETCHDIB )
                 *pWMF >> nUsage;
-
+            
             // nSye and nSxe is the number of pixels that has to been used
             if( nFunc == W_META_STRETCHDIB || nFunc == W_META_STRETCHBLT || nFunc == W_META_DIBSTRETCHBLT )
                 *pWMF >> nSye >> nSxe;
@@ -601,18 +601,18 @@ void WMFReader::ReadRecordParams( USHORT nFunc )
             if( nFunc == W_META_STRETCHDIB || nFunc == W_META_DIBBITBLT || nFunc == W_META_DIBSTRETCHBLT )
             {
                 if ( nWinROP == PATCOPY )
-                    *pWMF >> nUsage;    // i don't know anything of this parameter, so its called nUsage
+                    *pWMF >> nUsage;	// i don't know anything of this parameter, so its called nUsage
                                         // pOut->DrawRect( Rectangle( ReadYX(), aDestSize ), FALSE );
 
                 Size aDestSize( ReadYXExt() );
-                if ( aDestSize.Width() && aDestSize.Height() )  // #92623# do not try to read buggy bitmaps
+                if ( aDestSize.Width() && aDestSize.Height() )  // #92623# do not try to read buggy bitmaps 
                 {
                     Rectangle aDestRect( ReadYX(), aDestSize );
                     if ( nWinROP != PATCOPY )
                         aBmp.Read( *pWMF, FALSE );
 
                     // test if it is sensible to crop
-                    if ( nSye && nSxe &&
+                    if ( nSye && nSxe && 
                         ( ( nSx + nSxe ) <= aBmp.GetSizePixel().Width() ) &&
                             ( ( nSy + nSye <= aBmp.GetSizePixel().Height() ) ) )
                     {
@@ -627,10 +627,10 @@ void WMFReader::ReadRecordParams( USHORT nFunc )
 
         case W_META_DIBCREATEPATTERNBRUSH:
         {
-            Bitmap  aBmp;
+            Bitmap	aBmp;
             BitmapReadAccess* pBmp;
-            UINT32  nRed = 0, nGreen = 0, nBlue = 0, nCount = 1;
-            UINT16  nFunction;
+            UINT32	nRed = 0, nGreen = 0, nBlue = 0, nCount = 1;
+            UINT16	nFunction;
 
             *pWMF >> nFunction >> nFunction;
 
@@ -642,8 +642,8 @@ void WMFReader::ReadRecordParams( USHORT nFunc )
                 {
                     for ( INT32 x = 0; x < pBmp->Width(); x++ )
                     {
-                        const BitmapColor aColor( pBmp->GetColor( y, x ) );
-
+                        const BitmapColor aColor( pBmp->GetColor( y, x ) );						
+                        
                         nRed += aColor.GetRed();
                         nGreen += aColor.GetGreen();
                         nBlue += aColor.GetBlue();
@@ -687,8 +687,8 @@ void WMFReader::ReadRecordParams( USHORT nFunc )
 
         case W_META_CREATEPENINDIRECT:
         {
-            LineInfo    aLineInfo;
-            USHORT      nStyle, nWidth, nHeight;
+            LineInfo	aLineInfo;
+            USHORT		nStyle, nWidth, nHeight;
 
             *pWMF >> nStyle >> nWidth >> nHeight;
 
@@ -731,7 +731,7 @@ void WMFReader::ReadRecordParams( USHORT nFunc )
 
         case W_META_CREATEBRUSHINDIRECT:
         {
-            USHORT  nStyle;
+            USHORT	nStyle;
             *pWMF >> nStyle;
             pOut->CreateObject( GDI_BRUSH, new WinMtfFillStyle( ReadColor(), ( nStyle == BS_HOLLOW ) ? TRUE : FALSE ) );
         }
@@ -739,9 +739,9 @@ void WMFReader::ReadRecordParams( USHORT nFunc )
 
         case W_META_CREATEFONTINDIRECT:
         {
-            Size    aFontSize;
-            char    lfFaceName[ LF_FACESIZE ];
-            INT16   lfEscapement, lfOrientation, lfWeight;  // ( ehemals USHORT )
+            Size	aFontSize;
+            char	lfFaceName[ LF_FACESIZE ];
+            INT16	lfEscapement, lfOrientation, lfWeight;	// ( ehemals USHORT )
 
             LOGFONTW aLogFont;
             aFontSize = ReadYXExt();
@@ -829,22 +829,22 @@ void WMFReader::ReadRecordParams( USHORT nFunc )
                 pWMF->SetError( SVSTREAM_FILEFORMAT_ERROR );
                 break;
             }
-            if ( nRecSize >= 4 )    // minimal escape lenght
+            if ( nRecSize >= 4 )	// minimal escape lenght
             {
-                sal_uInt16  nMode, nLen;
+                sal_uInt16	nMode, nLen;
                 *pWMF >> nMode
                       >> nLen;
                 if ( ( nMode == W_MFCOMMENT ) && ( nLen >= 4 ) )
                 {
-                    sal_uInt32 nNewMagic; // we have to read int32 for
+                    sal_uInt32 nNewMagic; // we have to read int32 for 
                     *pWMF >> nNewMagic;   // META_ESCAPE_ENHANCED_METAFILE CommentIdentifier
-
+                    
                     if( nNewMagic == 0x2c2a4f4f &&  nLen >= 14 )
                     {
                         sal_uInt16 nMagic2;
                         *pWMF >> nMagic2;
                         if( nMagic2 == 0x0a ) // 2nd half of magic
-                        {                     // continue with private escape
+                        {                     // continue with private escape  
                             sal_uInt32 nCheck, nEsc;
                             *pWMF >> nCheck
                                   >> nEsc;
@@ -876,12 +876,12 @@ void WMFReader::ReadRecordParams( USHORT nFunc )
                                     switch( nEsc )
                                     {
                                         case PRIVATE_ESCAPE_UNICODE :
-                                        {   // we will use text instead of polygons only if we have the correct font
+                                        {	// we will use text instead of polygons only if we have the correct font
                                             if ( aVDev.IsFontAvailable( pOut->GetFont().GetName() ) )
                                             {
                                                 Point  aPt;
                                                 String aString;
-                                                sal_uInt32  i, nStringLen, nDXCount;
+                                                sal_uInt32	i, nStringLen, nDXCount;
                                                 sal_Int32* pDXAry = NULL;
                                                 SvMemoryStream aMemoryStream( nEscLen );
                                                 aMemoryStream.Write( pData, nEscLen );
@@ -917,12 +917,12 @@ void WMFReader::ReadRecordParams( USHORT nFunc )
                     }
                     else if ( (nNewMagic == static_cast< sal_uInt32 >(0x43464D57)) && (nLen >= 34) && ( (sal_Int32)(nLen + 10) <= (sal_Int32)(nRecSize * 2) ))
                     {
-                        sal_uInt32 nComType, nVersion, nFlags, nComRecCount,
+                        sal_uInt32 nComType, nVersion, nFlags, nComRecCount, 
                                    nCurRecSize, nRemainingSize, nEMFTotalSize;
                         sal_uInt16 nCheck;
-
+                        
                         *pWMF >> nComType >> nVersion >> nCheck >> nFlags
-                              >> nComRecCount >> nCurRecSize
+                              >> nComRecCount >> nCurRecSize 
                               >> nRemainingSize >> nEMFTotalSize; // the nRemainingSize is not mentioned in MSDN documentation
                                                                   // but it seems to be required to read in data produced by OLE
 
@@ -949,7 +949,7 @@ void WMFReader::ReadRecordParams( USHORT nFunc )
                                 delete pEMFStream;
                                 pEMFStream = NULL;
                             }
-
+                            
                             if( pEMFStream )
                             {
                                 sal_Int8* pBuf = new sal_Int8[ nCurRecSize ];
@@ -998,7 +998,7 @@ void WMFReader::ReadRecordParams( USHORT nFunc )
 
 BOOL WMFReader::ReadHeader()
 {
-    Rectangle   aPlaceableBound;
+    Rectangle	aPlaceableBound;
     sal_uInt32  nl, nStrmPos = pWMF->Tell();
 
     // Einlesen des METAFILEHEADER, falls vorhanden
@@ -1029,7 +1029,7 @@ BOOL WMFReader::ReadHeader()
     }
     else
     {
-        nUnitsPerInch = 96;
+        nUnitsPerInch = 96;       
         pWMF->Seek( nStrmPos + 18 );    // set the streampos to the start of the the metaactions
         GetPlaceableBound( aPlaceableBound, pWMF );
         pWMF->Seek( nStrmPos );
@@ -1042,9 +1042,9 @@ BOOL WMFReader::ReadHeader()
     Size aDevExt( 10000, 10000 );
     if( ( labs( aWMFSize.Width() ) > 1 ) && ( labs( aWMFSize.Height() ) > 1 ) )
     {
-        const Fraction  aFrac( 1, nUnitsPerInch );
-        MapMode         aWMFMap( MAP_INCH, Point(), aFrac, aFrac );
-        Size            aSize100( OutputDevice::LogicToLogic( aWMFSize, aWMFMap, MAP_100TH_MM ) );
+        const Fraction	aFrac( 1, nUnitsPerInch );
+        MapMode			aWMFMap( MAP_INCH, Point(), aFrac, aFrac );
+        Size			aSize100( OutputDevice::LogicToLogic( aWMFSize, aWMFMap, MAP_100TH_MM ) );
         aDevExt = Size( labs( aSize100.Width() ), labs( aSize100.Height() ) );
     }
     pOut->SetDevExt( aDevExt );
@@ -1069,9 +1069,9 @@ BOOL WMFReader::ReadHeader()
 
 void WMFReader::ReadWMF()
 {
-    USHORT  nFunction;
-    ULONG   nPos, nPercent, nLastPercent;
-
+    USHORT	nFunction;
+    ULONG	nPos, nPercent, nLastPercent;
+    
     nSkipActions = 0;
     nCurrentAction = 0;
     nUnicodeEscapeAction = 0;
@@ -1080,7 +1080,7 @@ void WMFReader::ReadWMF()
     nEMFRecCount    = 0;
     nEMFRec         = 0;
     nEMFSize        = 0;
-
+    
     sal_Bool bEMFAvailable = sal_False;
 
     pOut->SetMapMode( MM_ANISOTROPIC );
@@ -1132,7 +1132,7 @@ void WMFReader::ReadWMF()
                         ReadRecordParams( nFunction );
                     else
                         nSkipActions--;
-
+                    
                     if( pEMFStream && nEMFRecCount == nEMFRec )
                     {
                         GDIMetaFile aMeta;
@@ -1141,7 +1141,7 @@ void WMFReader::ReadWMF()
                         bEMFAvailable = pEMFReader->ReadEnhWMF();
                         delete pEMFReader; // destroy first!!!
 
-                        if( bEMFAvailable )
+                        if( bEMFAvailable )   
                         {
                             pOut->AddFromGDIMetaFile( aMeta );
                             pOut->SetrclFrame( Rectangle(0, 0, aMeta.GetPrefSize().Width(), aMeta.GetPrefSize().Height() ));
@@ -1209,14 +1209,14 @@ sal_Bool WMFReader::GetPlaceableBound( Rectangle& rPlaceableBound, SvStream* pSt
     rPlaceableBound.Top()    = (sal_Int32)0x7fffffff;
     rPlaceableBound.Right()  = (sal_Int32)0x80000000;
     rPlaceableBound.Bottom() = (sal_Int32)0x80000000;
-
+    
     sal_Int16 nMapMode = MM_ANISOTROPIC;
 
     sal_uInt16 nFunction;
     sal_uInt32 nRSize;
     sal_uInt32 nPos = pStm->Tell();
     sal_uInt32 nEnd = pStm->Seek( STREAM_SEEK_TO_END );
-
+    
     pStm->Seek( nPos );
 
     if( nEnd - nPos )
@@ -1251,7 +1251,7 @@ sal_Bool WMFReader::GetPlaceableBound( Rectangle& rPlaceableBound, SvStream* pSt
                     *pStm >> nHeight >> nWidth;
                     rPlaceableBound.SetSize( Size( nWidth, nHeight ) );
                 }
-                break;
+                break;				
 
                 case W_META_SETMAPMODE :
                     *pStm >> nMapMode;
@@ -1297,7 +1297,7 @@ sal_Bool WMFReader::GetPlaceableBound( Rectangle& rPlaceableBound, SvStream* pSt
 
                 case W_META_POLYPOLYGON:
                 {
-                    USHORT  i, nPoly, nPoints = 0;
+                    USHORT	i, nPoly, nPoints = 0;
                     *pStm >> nPoly;
                     for( i = 0; i < nPoly; i++ )
                     {
@@ -1341,10 +1341,10 @@ sal_Bool WMFReader::GetPlaceableBound( Rectangle& rPlaceableBound, SvStream* pSt
 
                 case W_META_EXTTEXTOUT:
                 {
-                    sal_uInt16  nLen, nOptions;
-                    sal_Int32   nRecordPos, nRecordSize;
-                    Point       aPosition;
-                    Rectangle   aRect;
+                    sal_uInt16	nLen, nOptions;
+                    sal_Int32	nRecordPos, nRecordSize;
+                    Point		aPosition;
+                    Rectangle	aRect;
 
                     pStm->SeekRel(-6);
                     nRecordPos = pStm->Tell();
@@ -1369,7 +1369,7 @@ sal_Bool WMFReader::GetPlaceableBound( Rectangle& rPlaceableBound, SvStream* pSt
 
                     if( nFunction == W_META_STRETCHDIB )
                         *pStm >> nUsage;
-
+            
                     // nSye and nSxe is the number of pixels that has to been used
                     if( nFunction == W_META_STRETCHDIB || nFunction == W_META_STRETCHBLT || nFunction == W_META_DIBSTRETCHBLT )
                         *pStm >> nSye >> nSxe;
@@ -1382,11 +1382,11 @@ sal_Bool WMFReader::GetPlaceableBound( Rectangle& rPlaceableBound, SvStream* pSt
                     if( nFunction == W_META_STRETCHDIB || nFunction == W_META_DIBBITBLT || nFunction == W_META_DIBSTRETCHBLT )
                     {
                         if ( nWinROP == PATCOPY )
-                            *pStm >> nUsage;    // i don't know anything of this parameter, so its called nUsage
+                            *pStm >> nUsage;	// i don't know anything of this parameter, so its called nUsage
                                                 // pOut->DrawRect( Rectangle( ReadYX(), aDestSize ), FALSE );
 
                         Size aDestSize( ReadYXExt() );
-                        if ( aDestSize.Width() && aDestSize.Height() )  // #92623# do not try to read buggy bitmaps
+                        if ( aDestSize.Width() && aDestSize.Height() )  // #92623# do not try to read buggy bitmaps 
                         {
                             Rectangle aDestRect( ReadYX(), aDestSize );
                             GetWinExtMax( aDestRect, rPlaceableBound, nMapMode );
diff --git a/svtools/source/filter.vcl/wmf/wmf.cxx b/svtools/source/filter.vcl/wmf/wmf.cxx
index 25ca9f721b33..ab9bee2cac71 100644
--- a/svtools/source/filter.vcl/wmf/wmf.cxx
+++ b/svtools/source/filter.vcl/wmf/wmf.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
diff --git a/svtools/source/filter.vcl/wmf/wmfwr.cxx b/svtools/source/filter.vcl/wmf/wmfwr.cxx
index 4dff9732c7d0..cb6e95e78b0f 100644
--- a/svtools/source/filter.vcl/wmf/wmfwr.cxx
+++ b/svtools/source/filter.vcl/wmf/wmfwr.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
@@ -37,7 +37,7 @@
 #include <tools/tenccvt.hxx>
 #include <osl/endian.h>
 #ifndef INCLUDED_I18NUTIL_UNICODE_HXX
-#include <i18nutil/unicode.hxx> //unicode::getUnicodeScriptType
+#include <i18nutil/unicode.hxx>	//unicode::getUnicodeScriptType
 #endif
 
 #include <vcl/metric.hxx>
@@ -190,17 +190,17 @@
 #define W_CHINESEBIG5_CHARSET 136
 #define W_OEM_CHARSET         255
 /*WINVER >= 0x0400*/
-#define W_JOHAB_CHARSET      130
-#define W_HEBREW_CHARSET     177
-#define W_ARABIC_CHARSET     178
-#define W_GREEK_CHARSET      161
-#define W_TURKISH_CHARSET    162
+#define W_JOHAB_CHARSET		 130
+#define W_HEBREW_CHARSET	 177
+#define W_ARABIC_CHARSET	 178
+#define W_GREEK_CHARSET		 161
+#define W_TURKISH_CHARSET	 162
 #define W_VIETNAMESE_CHARSET 163
-#define W_THAI_CHARSET       222
+#define W_THAI_CHARSET		 222
 #define W_EASTEUROPE_CHARSET 238
 #define W_RUSSIAN_CHARSET    204
 #define W_MAC_CHARSET        77
-#define W_BALTIC_CHARSET     186
+#define W_BALTIC_CHARSET	 186
 
 #define W_DEFAULT_PITCH       0x00
 #define W_FIXED_PITCH         0x01
@@ -243,9 +243,9 @@
 #define W_HS_CROSS          4
 #define W_HS_DIAGCROSS      5
 
-#define W_MFCOMMENT         15
+#define W_MFCOMMENT			15
 
-#define PRIVATE_ESCAPE_UNICODE          2
+#define PRIVATE_ESCAPE_UNICODE			2
 
 /// copied from writerwordglue.cxx
 
@@ -459,8 +459,8 @@ void WMFWriter::WMFRecord_CreateFontIndirect(const Font & rFont)
     if (rFont.GetUnderline()==UNDERLINE_NONE) *pWMF << (BYTE)0; else  *pWMF << (BYTE)1;
     if (rFont.GetStrikeout()==STRIKEOUT_NONE) *pWMF << (BYTE)0; else  *pWMF << (BYTE)1;
 
-    CharSet     eFontNameEncoding = rFont.GetCharSet();
-    sal_uInt8   nCharSet = rtl_getBestWindowsCharsetFromTextEncoding( eFontNameEncoding );
+    CharSet		eFontNameEncoding = rFont.GetCharSet();
+    sal_uInt8	nCharSet = rtl_getBestWindowsCharsetFromTextEncoding( eFontNameEncoding );
     if ( eFontNameEncoding == RTL_TEXTENCODING_SYMBOL )
         eFontNameEncoding = RTL_TEXTENCODING_MS_1252;
     if ( nCharSet == 1 )
@@ -561,14 +561,14 @@ void WMFWriter::WMFRecord_Escape( sal_uInt32 nEsc, sal_uInt32 nLen, const sal_In
 
     WriteRecordHeader( 3 + 9 + ( ( nLen + 1 ) >> 1 ), W_META_ESCAPE );
     *pWMF << (sal_uInt16)W_MFCOMMENT
-          << (sal_uInt16)( nLen + 14 )  // we will always have a fourteen byte escape header:
-          << (sal_uInt16)0x4f4f         // OO
-          << (sal_uInt32)0xa2c2a        // evil magic number
-          << (sal_uInt32)nCheckSum      // crc32 checksum about nEsc & pData
-          << (sal_uInt32)nEsc;          // escape number
+          << (sal_uInt16)( nLen + 14 )	// we will always have a fourteen byte escape header:
+          << (sal_uInt16)0x4f4f			// OO
+          << (sal_uInt32)0xa2c2a		// evil magic number
+          << (sal_uInt32)nCheckSum		// crc32 checksum about nEsc & pData
+          << (sal_uInt32)nEsc;			// escape number
     pWMF->Write( pData, nLen );
     if ( nLen & 1 )
-        *pWMF << (sal_uInt8)0;          // pad byte
+        *pWMF << (sal_uInt8)0;			// pad byte
 }
 
 /* if return value is true, then a complete unicode string and also a polygon replacement has been written,
@@ -582,49 +582,49 @@ sal_Bool WMFWriter::WMFRecord_Escape_Unicode( const Point& rPoint, const String&
     if ( nStringLen )
     {
         // first we will check if a comment is necessary
-        if ( aSrcFont.GetCharSet() != RTL_TEXTENCODING_SYMBOL )     // symbol is always byte character, so there is no unicode loss
+        if ( aSrcFont.GetCharSet() != RTL_TEXTENCODING_SYMBOL )		// symbol is always byte character, so there is no unicode loss
         {
             const sal_Unicode* pBuf = rUniStr.GetBuffer();
             const rtl_TextEncoding aTextEncodingOrg = aSrcFont.GetCharSet();
             ByteString aByteStr( rUniStr, aTextEncodingOrg );
-            String     aUniStr2( aByteStr, aTextEncodingOrg );
-            const sal_Unicode* pConversion = aUniStr2.GetBuffer();  // this is the unicode array after bytestring <-> unistring conversion
+            String	   aUniStr2( aByteStr, aTextEncodingOrg );
+            const sal_Unicode* pConversion = aUniStr2.GetBuffer();	// this is the unicode array after bytestring <-> unistring conversion
             for ( i = 0; i < nStringLen; i++ )
             {
                 if ( *pBuf++ != *pConversion++ )
                     break;
             }
 
-            if  ( i != nStringLen )                             // after conversion the characters are not original,
-            {                                                   // try again, with determining a better charset from unicode char
+            if  ( i != nStringLen )								// after conversion the characters are not original, 
+            {													// try again, with determining a better charset from unicode char
                 pBuf = rUniStr.GetBuffer();
                 const sal_Unicode* pCheckChar = pBuf;
-                rtl_TextEncoding aTextEncoding = getScriptClass (*pCheckChar); // try the first character
+                rtl_TextEncoding aTextEncoding = getScriptClass (*pCheckChar); // try the first character 
                 for ( i = 1; i < nStringLen; i++)
                 {
                     if (aTextEncoding != aTextEncodingOrg) // found something
                         break;
                     pCheckChar++;
-                    aTextEncoding = getScriptClass (*pCheckChar); // try the next character
+                    aTextEncoding = getScriptClass (*pCheckChar); // try the next character 
                 }
 
                 aByteStr = ByteString ( rUniStr,  aTextEncoding );
                 aUniStr2 = String ( aByteStr, aTextEncoding );
-                pConversion = aUniStr2.GetBuffer(); // this is the unicode array after bytestring <-> unistring conversion
+                pConversion = aUniStr2.GetBuffer();	// this is the unicode array after bytestring <-> unistring conversion
                 for ( i = 0; i < nStringLen; i++ )
                 {
                     if ( *pBuf++ != *pConversion++ )
                         break;
                 }
-                if (i == nStringLen)
+                if (i == nStringLen) 
                 {
                     aSrcFont.SetCharSet (aTextEncoding);
                     SetAllAttr();
                 }
             }
 
-            if ( ( i != nStringLen ) || IsStarSymbol( aSrcFont.GetName() ) )    // after conversion the characters are not original, so we
-            {                                                                   // will store the unicode string and a polypoly replacement
+            if ( ( i != nStringLen ) || IsStarSymbol( aSrcFont.GetName() ) )	// after conversion the characters are not original, so we
+            {																	// will store the unicode string and a polypoly replacement
                 Color aOldFillColor( aSrcFillColor );
                 Color aOldLineColor( aSrcLineColor );
                 aSrcLineInfo  = LineInfo();
@@ -687,7 +687,7 @@ void WMFWriter::WMFRecord_ExtTextOut( const Point & rPoint,
     TrueExtTextOut(rPoint,rString,aByteString,pDXAry);
 }
 
-void WMFWriter::TrueExtTextOut( const Point & rPoint, const String & rString,
+void WMFWriter::TrueExtTextOut( const Point & rPoint, const String & rString, 
     const ByteString & rByteString, const sal_Int32 * pDXAry )
 {
     WriteRecordHeader( 0, W_META_EXTTEXTOUT );
@@ -1180,8 +1180,8 @@ void WMFWriter::HandleLineInfoPolyPolygons(const LineInfo& rInfo, const basegfx:
 
 void WMFWriter::WriteRecords( const GDIMetaFile & rMTF )
 {
-    ULONG       nA, nACount;
-    MetaAction* pMA;
+    ULONG		nA, nACount;
+    MetaAction*	pMA;
 
     if( bStatus )
     {
@@ -1206,8 +1206,8 @@ void WMFWriter::WriteRecords( const GDIMetaFile & rMTF )
 
                 case META_POINT_ACTION:
                 {
-                    const MetaPointAction*  pA = (const MetaPointAction*) pMA;
-                    const Point&            rPt = pA->GetPoint();
+                    const MetaPointAction*	pA = (const MetaPointAction*) pMA;
+                    const Point&			rPt = pA->GetPoint();
                     aSrcLineInfo = LineInfo();
                     SetLineAndFillAttr();
                     WMFRecord_MoveTo( rPt);
@@ -1294,7 +1294,7 @@ void WMFWriter::WriteRecords( const GDIMetaFile & rMTF )
                 case META_POLYLINE_ACTION:
                 {
                     const MetaPolyLineAction* pA = (const MetaPolyLineAction*) pMA;
-                    const Polygon&              rPoly = pA->GetPolygon();
+                    const Polygon&				rPoly = pA->GetPolygon();
 
                     if( rPoly.GetSize() )
                     {
@@ -1358,7 +1358,7 @@ void WMFWriter::WriteRecords( const GDIMetaFile & rMTF )
                 case META_TEXTARRAY_ACTION:
                 {
                     const MetaTextArrayAction* pA = (const MetaTextArrayAction*) pMA;
-
+                    
                     String aTemp( pA->GetText(), pA->GetIndex(), pA->GetLen() );
                     aSrcLineInfo = LineInfo();
                     SetAllAttr();
@@ -1407,8 +1407,8 @@ void WMFWriter::WriteRecords( const GDIMetaFile & rMTF )
 
                 case META_BMPSCALEPART_ACTION:
                 {
-                    const MetaBmpScalePartAction*   pA = (const MetaBmpScalePartAction*) pMA;
-                    Bitmap                          aTmp( pA->GetBitmap() );
+                    const MetaBmpScalePartAction*	pA = (const MetaBmpScalePartAction*) pMA;
+                    Bitmap							aTmp( pA->GetBitmap() );
 
                     if( aTmp.Crop( Rectangle( pA->GetSrcPoint(), pA->GetSrcSize() ) ) )
                         WMFRecord_StretchDIB( pA->GetDestPoint(), pA->GetDestSize(), aTmp );
@@ -1417,9 +1417,9 @@ void WMFWriter::WriteRecords( const GDIMetaFile & rMTF )
 
                 case META_BMPEX_ACTION:
                 {
-                    const MetaBmpExAction*  pA = (const MetaBmpExAction *) pMA;
-                    Bitmap                  aBmp( pA->GetBitmapEx().GetBitmap() );
-                    Bitmap                  aMsk( pA->GetBitmapEx().GetMask() );
+                    const MetaBmpExAction*	pA = (const MetaBmpExAction *) pMA;
+                    Bitmap					aBmp( pA->GetBitmapEx().GetBitmap() );
+                    Bitmap					aMsk( pA->GetBitmapEx().GetMask() );
 
                     if( !!aMsk )
                     {
@@ -1435,9 +1435,9 @@ void WMFWriter::WriteRecords( const GDIMetaFile & rMTF )
 
                 case META_BMPEXSCALE_ACTION:
                 {
-                    const MetaBmpExScaleAction* pA = (const MetaBmpExScaleAction*) pMA;
-                    Bitmap                      aBmp( pA->GetBitmapEx().GetBitmap() );
-                    Bitmap                      aMsk( pA->GetBitmapEx().GetMask() );
+                    const MetaBmpExScaleAction*	pA = (const MetaBmpExScaleAction*) pMA;
+                    Bitmap						aBmp( pA->GetBitmapEx().GetBitmap() );
+                    Bitmap						aMsk( pA->GetBitmapEx().GetMask() );
 
                     if( !!aMsk )
                     {
@@ -1453,11 +1453,11 @@ void WMFWriter::WriteRecords( const GDIMetaFile & rMTF )
 
                 case META_BMPEXSCALEPART_ACTION:
                 {
-                    const MetaBmpExScalePartAction* pA = (const MetaBmpExScalePartAction*) pMA;
-                    BitmapEx                        aBmpEx( pA->GetBitmapEx() );
+                    const MetaBmpExScalePartAction*	pA = (const MetaBmpExScalePartAction*) pMA;
+                    BitmapEx						aBmpEx( pA->GetBitmapEx() );
                     aBmpEx.Crop( Rectangle( pA->GetSrcPoint(), pA->GetSrcSize() ) );
-                    Bitmap                          aBmp( aBmpEx.GetBitmap() );
-                    Bitmap                          aMsk( aBmpEx.GetMask() );
+                    Bitmap							aBmp( aBmpEx.GetBitmap() );
+                    Bitmap							aMsk( aBmpEx.GetMask() );
 
                     if( !!aMsk )
                     {
@@ -1473,8 +1473,8 @@ void WMFWriter::WriteRecords( const GDIMetaFile & rMTF )
 
                 case META_GRADIENT_ACTION:
                 {
-                    const MetaGradientAction*   pA = (const MetaGradientAction*) pMA;
-                    GDIMetaFile                 aTmpMtf;
+                    const MetaGradientAction*	pA = (const MetaGradientAction*) pMA;
+                    GDIMetaFile					aTmpMtf;
 
                     pVirDev->AddGradientActions( pA->GetRect(), pA->GetGradient(), aTmpMtf );
                     WriteRecords( aTmpMtf );
@@ -1483,8 +1483,8 @@ void WMFWriter::WriteRecords( const GDIMetaFile & rMTF )
 
                 case META_HATCH_ACTION:
                 {
-                    const MetaHatchAction*  pA = (const MetaHatchAction*) pMA;
-                    GDIMetaFile             aTmpMtf;
+                    const MetaHatchAction*	pA = (const MetaHatchAction*) pMA;
+                    GDIMetaFile				aTmpMtf;
 
                     pVirDev->AddHatchActions( pA->GetPolyPolygon(), pA->GetHatch(), aTmpMtf );
                     WriteRecords( aTmpMtf );
@@ -1493,10 +1493,10 @@ void WMFWriter::WriteRecords( const GDIMetaFile & rMTF )
 
                 case META_WALLPAPER_ACTION:
                 {
-                    const MetaWallpaperAction*  pA = (const MetaWallpaperAction*) pMA;
-                    const Color&                rColor = pA->GetWallpaper().GetColor();
-                    const Color                 aOldLineColor( aSrcLineColor );
-                    const Color                 aOldFillColor( aSrcFillColor );
+                    const MetaWallpaperAction*	pA = (const MetaWallpaperAction*) pMA;
+                    const Color&				rColor = pA->GetWallpaper().GetColor();
+                    const Color					aOldLineColor( aSrcLineColor );
+                    const Color					aOldFillColor( aSrcFillColor );
 
                     aSrcLineColor = rColor;
                     aSrcFillColor = rColor;
@@ -1730,15 +1730,15 @@ void WMFWriter::WriteRecords( const GDIMetaFile & rMTF )
                 case META_FLOATTRANSPARENT_ACTION:
                 {
                     const MetaFloatTransparentAction* pA = (const MetaFloatTransparentAction*) pMA;
-
-                    GDIMetaFile     aTmpMtf( pA->GetGDIMetaFile() );
-                    Point           aSrcPt( aTmpMtf.GetPrefMapMode().GetOrigin() );
-                    const Size      aSrcSize( aTmpMtf.GetPrefSize() );
-                    const Point     aDestPt( pA->GetPoint() );
-                    const Size      aDestSize( pA->GetSize() );
-                    const double    fScaleX = aSrcSize.Width() ? (double) aDestSize.Width() / aSrcSize.Width() : 1.0;
-                    const double    fScaleY = aSrcSize.Height() ? (double) aDestSize.Height() / aSrcSize.Height() : 1.0;
-                    long            nMoveX, nMoveY;
+                    
+                    GDIMetaFile		aTmpMtf( pA->GetGDIMetaFile() );
+                    Point			aSrcPt( aTmpMtf.GetPrefMapMode().GetOrigin() );
+                    const Size		aSrcSize( aTmpMtf.GetPrefSize() );
+                    const Point		aDestPt( pA->GetPoint() );
+                    const Size		aDestSize( pA->GetSize() );
+                    const double	fScaleX = aSrcSize.Width() ? (double) aDestSize.Width() / aSrcSize.Width() : 1.0;
+                    const double	fScaleY = aSrcSize.Height() ? (double) aDestSize.Height() / aSrcSize.Height() : 1.0;
+                    long			nMoveX, nMoveY;
 
                     aSrcLineInfo = LineInfo();
                     SetAllAttr();
@@ -1816,9 +1816,9 @@ void WMFWriter::WriteHeader( const GDIMetaFile &, BOOL bPlaceable )
 {
     if( bPlaceable )
     {
-        USHORT  nCheckSum, nValue;
-        Size    aSize( pVirDev->LogicToLogic(Size(1,1),MapMode(MAP_INCH), aTargetMapMode) );
-        USHORT  nUnitsPerInch = (USHORT) ( ( aSize.Width() + aSize.Height() ) >> 1 );
+        USHORT	nCheckSum, nValue;
+        Size	aSize( pVirDev->LogicToLogic(Size(1,1),MapMode(MAP_INCH), aTargetMapMode) );
+        USHORT	nUnitsPerInch = (USHORT) ( ( aSize.Width() + aSize.Height() ) >> 1 );
 
         nCheckSum=0;
         nValue=0xcdd7;                              nCheckSum^=nValue; *pWMF << nValue;
@@ -1826,8 +1826,8 @@ void WMFWriter::WriteHeader( const GDIMetaFile &, BOOL bPlaceable )
         nValue=0x0000;                              nCheckSum^=nValue; *pWMF << nValue;
         nValue=0x0000;                              nCheckSum^=nValue; *pWMF << nValue;
         nValue=0x0000;                              nCheckSum^=nValue; *pWMF << nValue;
-        nValue=(USHORT) aTargetSize.Width();        nCheckSum^=nValue; *pWMF << nValue;
-        nValue=(USHORT) aTargetSize.Height();       nCheckSum^=nValue; *pWMF << nValue;
+        nValue=(USHORT) aTargetSize.Width();		nCheckSum^=nValue; *pWMF << nValue;
+        nValue=(USHORT) aTargetSize.Height();		nCheckSum^=nValue; *pWMF << nValue;
         nValue=nUnitsPerInch;                       nCheckSum^=nValue; *pWMF << nValue;
         nValue=0x0000;                              nCheckSum^=nValue; *pWMF << nValue;
         nValue=0x0000;                              nCheckSum^=nValue; *pWMF << nValue;
@@ -1838,9 +1838,9 @@ void WMFWriter::WriteHeader( const GDIMetaFile &, BOOL bPlaceable )
     *pWMF << (sal_uInt16)0x0001           // Typ: Datei
           << (sal_uInt16)0x0009           // Headerlaenge in Worten
           << (sal_uInt16)0x0300           // Version als BCD-Zahl
-          << (sal_uInt32) 0x00000000      // Dateilaenge (ohne 1. Header), wird spaeter durch UpdateHeader() berichtigt
+          << (sal_uInt32) 0x00000000  	  // Dateilaenge (ohne 1. Header), wird spaeter durch UpdateHeader() berichtigt
           << (sal_uInt16)MAXOBJECTHANDLES // Maximalezahl der gleichzeitigen Objekte
-          << (sal_uInt32) 0x00000000      // Maximale Record-laenge, wird spaeter durch UpdateHeader() berichtigt
+          << (sal_uInt32) 0x00000000  	  // Maximale Record-laenge, wird spaeter durch UpdateHeader() berichtigt
           << (sal_uInt16)0x0000;          // Reserved
 }
 
@@ -1909,8 +1909,8 @@ BOOL WMFWriter::WriteWMF( const GDIMetaFile& rMTF, SvStream& rTargetStream,
     {
         aTargetMapMode = MapMode( MAP_INCH );
 
-        const long      nUnit = pVirDev->LogicToPixel( Size( 1, 1 ), aTargetMapMode ).Width();
-        const Fraction  aFrac( 1, nUnit );
+        const long		nUnit = pVirDev->LogicToPixel( Size( 1, 1 ), aTargetMapMode ).Width();
+        const Fraction	aFrac( 1, nUnit );
 
         aTargetMapMode.SetScaleX( aFrac );
         aTargetMapMode.SetScaleY( aFrac );
@@ -1988,7 +1988,7 @@ BOOL WMFWriter::WriteWMF( const GDIMetaFile& rMTF, SvStream& rTargetStream,
 
     if ( xStatusIndicator.is() )
         xStatusIndicator->end();
-
+    
     return bStatus;
 }
 
@@ -1997,8 +1997,8 @@ BOOL WMFWriter::WriteWMF( const GDIMetaFile& rMTF, SvStream& rTargetStream,
 USHORT WMFWriter::CalcSaveTargetMapMode(MapMode& rMapMode,
                                         const Size& rPrefSize)
 {
-    Fraction    aDivFrac(2, 1);
-    USHORT      nDivisor = 1;
+    Fraction	aDivFrac(2, 1);
+    USHORT		nDivisor = 1;
 
     Size aSize = pVirDev->LogicToLogic( rPrefSize, aSrcMapMode, rMapMode );
 
@@ -2024,7 +2024,7 @@ void WMFWriter::WriteEmbeddedEMF( const GDIMetaFile& rMTF )
 {
     EMFWriter aEMFWriter;
     SvMemoryStream aStream;
-
+    
     if( aEMFWriter.WriteEMF( rMTF, aStream ) )
     {
         sal_Size nTotalSize = aStream.Tell();
@@ -2060,8 +2060,8 @@ void WMFWriter::WriteEmbeddedEMF( const GDIMetaFile& rMTF )
                 nCurSize = nRemainingSize;
                 nRemainingSize = 0;
             }
-            WriteEMFRecord( aStream,
-                            nCurSize,
+            WriteEMFRecord( aStream, 
+                            nCurSize, 
                             nRemainingSize,
                             nTotalSize,
                             nRecCounts,
@@ -2070,18 +2070,18 @@ void WMFWriter::WriteEmbeddedEMF( const GDIMetaFile& rMTF )
         }
     }
 }
-
+   
 // ------------------------------------------------------------------------
 
 void WMFWriter::WriteEMFRecord( SvMemoryStream& rStream, sal_uInt32 nCurSize, sal_uInt32 nRemainingSize,
                 sal_uInt32 nTotalSize, sal_uInt32 nRecCounts, sal_uInt16 nCheckSum )
 {
    // according to http://msdn.microsoft.com/en-us/library/dd366152%28PROT.13%29.aspx
-   WriteRecordHeader( 0, W_META_ESCAPE );
-   *pWMF << (sal_uInt16)W_MFCOMMENT         // same as META_ESCAPE_ENHANCED_METAFILE
-          << (sal_uInt16)( nCurSize + 34 )  // we will always have a 34 byte escape header:
-          << (sal_uInt32) 0x43464D57        // WMFC
-          << (sal_uInt32) 0x00000001        // Comment type
+   WriteRecordHeader( 0, W_META_ESCAPE ); 
+   *pWMF << (sal_uInt16)W_MFCOMMENT			// same as META_ESCAPE_ENHANCED_METAFILE
+          << (sal_uInt16)( nCurSize + 34 )	// we will always have a 34 byte escape header:
+          << (sal_uInt32) 0x43464D57		// WMFC
+          << (sal_uInt32) 0x00000001		// Comment type
           << (sal_uInt32) 0x00010000        // version
           << nCheckSum                      // check sum
           << (sal_uInt32) 0                 // flags = 0
diff --git a/svtools/source/filter.vcl/wmf/wmfwr.hxx b/svtools/source/filter.vcl/wmf/wmfwr.hxx
index 9fe698b22c2e..6ccc580c21e5 100644
--- a/svtools/source/filter.vcl/wmf/wmfwr.hxx
+++ b/svtools/source/filter.vcl/wmf/wmfwr.hxx
@@ -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
@@ -69,27 +69,27 @@ class WMFWriter
 {
 private:
 
-    BOOL            bStatus;
+    BOOL			bStatus;
 
-    ULONG                   nLastPercent; // Mit welcher Zahl pCallback zuletzt aufgerufen wurde.
-    FilterConfigItem*       pFilterConfigItem;
+    ULONG					nLastPercent; // Mit welcher Zahl pCallback zuletzt aufgerufen wurde.
+    FilterConfigItem*		pFilterConfigItem;
 
     com::sun::star::uno::Reference< com::sun::star::task::XStatusIndicator > xStatusIndicator;
 
-    SvStream*               pWMF;
-    VirtualDevice*          pVirDev;
+    SvStream*				pWMF;
+    VirtualDevice*			pVirDev;
     StarSymbolToMSMultiFont *pConvert;
-    MapMode                 aTargetMapMode;
-    Size                    aTargetSize;
-    USHORT                  nTargetDivisor;
+    MapMode					aTargetMapMode;
+    Size					aTargetSize;
+    USHORT					nTargetDivisor;
 
     ULONG nMetafileHeaderPos;
     sal_uInt32 nMaxRecordSize; // in Worten
     ULONG nActRecordPos;
 
     // Aktuelle Attribute im Quell-Metafile:
-    Color     aSrcLineColor;
-    Color     aSrcFillColor;
+    Color	  aSrcLineColor;
+    Color	  aSrcFillColor;
     Color     aSrcTextColor;
     LineInfo  aSrcLineInfo;
     RasterOp  eSrcRasterOp;
@@ -100,18 +100,18 @@ private:
     Region    aSrcClipRegion;
     WMFWriterAttrStackMember * pAttrStack;
 
-    UINT32    eSrcHorTextAlign;
+    UINT32	  eSrcHorTextAlign;
 
     // Aktuelle Attribute im Ziel-Metafile:
-    Color     aDstLineColor;
-    Color     aDstFillColor;
+    Color	  aDstLineColor;
+    Color	  aDstFillColor;
     Color     aDstTextColor;
     LineInfo  aDstLineInfo;
     RasterOp  eDstROP2;
     FontAlign eDstTextAlign;
     Font      aDstFont;
 
-    UINT32    eDstHorTextAlign;
+    UINT32	  eDstHorTextAlign;
 
     BOOL      bDstIsClipping; // ???: derzeit unberuecksichtigt
     Region    aDstClipRegion; // ???: derzeit unberuecksichtigt
@@ -167,7 +167,7 @@ private:
     sal_Bool WMFRecord_Escape_Unicode( const Point& rPoint, const String& rStr, const sal_Int32 * pDXAry );
     void WMFRecord_ExtTextOut(const Point & rPoint, const String & rString, const sal_Int32 * pDXAry);
 
-    void TrueExtTextOut(const Point & rPoint, const String & rString,
+    void TrueExtTextOut(const Point & rPoint, const String & rString, 
         const ByteString & rByteString, const sal_Int32 * pDXAry);
     void TrueTextOut(const Point & rPoint, const ByteString& rString);
     void WMFRecord_LineTo(const Point & rPoint);
@@ -211,7 +211,7 @@ private:
     void UpdateHeader();
 
     void WriteEmbeddedEMF( const GDIMetaFile& rMTF );
-    void WriteEMFRecord( SvMemoryStream& rStream, sal_uInt32 nCurSize,
+    void WriteEMFRecord( SvMemoryStream& rStream, sal_uInt32 nCurSize, 
                             sal_uInt32 nRemainingSize,
                             sal_uInt32 nTotalSize,
                             sal_uInt32 nRecCounts,
diff --git a/svtools/source/graphic/descriptor.cxx b/svtools/source/graphic/descriptor.cxx
index 5db73e6cc2f3..3e36eb6f4ad1 100644
--- a/svtools/source/graphic/descriptor.cxx
+++ b/svtools/source/graphic/descriptor.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
@@ -44,14 +44,14 @@
 #include "vcl/graph.hxx"
 #include "vcl/svapp.hxx"
 
-#define UNOGRAPHIC_GRAPHICTYPE  1
-#define UNOGRAPHIC_MIMETYPE     2
-#define UNOGRAPHIC_SIZEPIXEL    3
-#define UNOGRAPHIC_SIZE100THMM  4
-#define UNOGRAPHIC_BITSPERPIXEL 5
-#define UNOGRAPHIC_TRANSPARENT  6
-#define UNOGRAPHIC_ALPHA        7
-#define UNOGRAPHIC_ANIMATED     8
+#define UNOGRAPHIC_GRAPHICTYPE 	1
+#define UNOGRAPHIC_MIMETYPE		2
+#define UNOGRAPHIC_SIZEPIXEL	3
+#define UNOGRAPHIC_SIZE100THMM	4
+#define UNOGRAPHIC_BITSPERPIXEL	5
+#define UNOGRAPHIC_TRANSPARENT	6
+#define UNOGRAPHIC_ALPHA		7
+#define UNOGRAPHIC_ANIMATED		8
 
 using namespace ::com::sun::star;
 
@@ -60,7 +60,7 @@ namespace unographic {
 // ---------------------
 // - GraphicDescriptor -
 // ---------------------
-
+    
 GraphicDescriptor::GraphicDescriptor() :
     ::comphelper::PropertySetHelper( createPropertySetInfo(), SAL_NO_ACQUIRE ),
     mpGraphic( NULL ),
@@ -81,7 +81,7 @@ GraphicDescriptor::~GraphicDescriptor()
 
 // ------------------------------------------------------------------------------
 
-void GraphicDescriptor::init( const ::Graphic& rGraphic )
+void GraphicDescriptor::init( const ::Graphic& rGraphic ) 
     throw()
 {
     mpGraphic = &rGraphic;
@@ -89,11 +89,11 @@ void GraphicDescriptor::init( const ::Graphic& rGraphic )
 
 // ------------------------------------------------------------------------------
 
-void GraphicDescriptor::init( const ::rtl::OUString& rURL )
+void GraphicDescriptor::init( const ::rtl::OUString& rURL ) 
     throw()
 {
     SvStream* pIStm = ::utl::UcbStreamHelper::CreateStream( rURL, STREAM_READ );
-
+    
     if( pIStm )
     {
         implCreate( *pIStm, &rURL );
@@ -103,11 +103,11 @@ void GraphicDescriptor::init( const ::rtl::OUString& rURL )
 
 // ------------------------------------------------------------------------------
 
-void GraphicDescriptor::init( const uno::Reference< io::XInputStream >& rxIStm, const ::rtl::OUString& rURL )
+void GraphicDescriptor::init( const uno::Reference< io::XInputStream >& rxIStm, const ::rtl::OUString& rURL ) 
     throw()
 {
     SvStream* pIStm = ::utl::UcbStreamHelper::CreateStream( rxIStm );
-
+    
     if( pIStm )
     {
         implCreate( *pIStm, &rURL );
@@ -136,12 +136,12 @@ void GraphicDescriptor::implCreate( SvStream& rIStm, const ::rtl::OUString* pURL
     meType = GRAPHIC_NONE;
     mnBitsPerPixel = 0;
     mbTransparent = false;
-
+        
     if( aDescriptor.Detect( true ) && aDescriptor.GetFileFormat() != GFF_NOT )
     {
-        const char*             pMimeType = NULL;
-        sal_uInt8               cType = graphic::GraphicType::EMPTY;
-
+        const char* 			pMimeType = NULL;
+        sal_uInt8 				cType = graphic::GraphicType::EMPTY;
+    
         switch( aDescriptor.GetFileFormat() )
         {
             case( GFF_BMP ): pMimeType = MIMETYPE_BMP; cType = graphic::GraphicType::PIXEL; break;
@@ -159,7 +159,7 @@ void GraphicDescriptor::implCreate( SvStream& rIStm, const ::rtl::OUString* pURL
             case( GFF_RAS ): pMimeType = MIMETYPE_RAS; cType = graphic::GraphicType::PIXEL; break;
             case( GFF_TGA ): pMimeType = MIMETYPE_TGA; cType = graphic::GraphicType::PIXEL; break;
             case( GFF_PSD ): pMimeType = MIMETYPE_PSD; cType = graphic::GraphicType::PIXEL; break;
-
+            
             case( GFF_EPS ): pMimeType = MIMETYPE_EPS; cType = graphic::GraphicType::VECTOR; break;
             case( GFF_DXF ): pMimeType = MIMETYPE_DXF; cType = graphic::GraphicType::VECTOR; break;
             case( GFF_MET ): pMimeType = MIMETYPE_MET; cType = graphic::GraphicType::VECTOR; break;
@@ -169,11 +169,11 @@ void GraphicDescriptor::implCreate( SvStream& rIStm, const ::rtl::OUString* pURL
             case( GFF_WMF ): pMimeType = MIMETYPE_WMF; cType = graphic::GraphicType::VECTOR; break;
             case( GFF_SGV ): pMimeType = MIMETYPE_SGV; cType = graphic::GraphicType::VECTOR; break;
             case( GFF_EMF ): pMimeType = MIMETYPE_EMF; cType = graphic::GraphicType::VECTOR; break;
-
+            
             default:
             break;
         }
-
+        
         if( graphic::GraphicType::EMPTY != cType )
         {
             meType = ( ( graphic::GraphicType::PIXEL == cType ) ? GRAPHIC_BITMAP : GRAPHIC_GDIMETAFILE );
@@ -189,7 +189,7 @@ void GraphicDescriptor::implCreate( SvStream& rIStm, const ::rtl::OUString* pURL
 
 // ------------------------------------------------------------------------------
 
-::rtl::OUString GraphicDescriptor::getImplementationName_Static()
+::rtl::OUString GraphicDescriptor::getImplementationName_Static() 
     throw()
 {
     return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.graphic.GraphicDescriptor" ) );
@@ -197,19 +197,19 @@ void GraphicDescriptor::implCreate( SvStream& rIStm, const ::rtl::OUString* pURL
 
 // ------------------------------------------------------------------------------
 
-uno::Sequence< ::rtl::OUString > GraphicDescriptor::getSupportedServiceNames_Static()
-    throw(  )
+uno::Sequence< ::rtl::OUString > GraphicDescriptor::getSupportedServiceNames_Static() 
+    throw(	)
 {
     uno::Sequence< ::rtl::OUString > aSeq( 1 );
-
+    
     aSeq.getArray()[ 0 ] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.graphic.GraphicDescriptor" ) );
-
+    
     return aSeq;
 }
 
 // ------------------------------------------------------------------------------
 
-uno::Any SAL_CALL GraphicDescriptor::queryAggregation( const uno::Type & rType )
+uno::Any SAL_CALL GraphicDescriptor::queryAggregation( const uno::Type & rType ) 
     throw( uno::RuntimeException )
 {
     uno::Any aAny;
@@ -232,7 +232,7 @@ uno::Any SAL_CALL GraphicDescriptor::queryAggregation( const uno::Type & rType )
 
 // ------------------------------------------------------------------------------
 
-uno::Any SAL_CALL GraphicDescriptor::queryInterface( const uno::Type & rType )
+uno::Any SAL_CALL GraphicDescriptor::queryInterface( const uno::Type & rType ) 
     throw( uno::RuntimeException )
 {
     return OWeakAggObject::queryInterface( rType );
@@ -240,7 +240,7 @@ uno::Any SAL_CALL GraphicDescriptor::queryInterface( const uno::Type & rType )
 
 // ------------------------------------------------------------------------------
 
-void SAL_CALL GraphicDescriptor::acquire()
+void SAL_CALL GraphicDescriptor::acquire() 
     throw()
 {
     OWeakAggObject::acquire();
@@ -256,7 +256,7 @@ void SAL_CALL GraphicDescriptor::release()
 
 // ------------------------------------------------------------------------------
 
-::rtl::OUString SAL_CALL GraphicDescriptor::getImplementationName()
+::rtl::OUString SAL_CALL GraphicDescriptor::getImplementationName() 
     throw( uno::RuntimeException )
 {
     return getImplementationName_Static();
@@ -267,8 +267,8 @@ void SAL_CALL GraphicDescriptor::release()
 sal_Bool SAL_CALL GraphicDescriptor::supportsService( const rtl::OUString& ServiceName )
     throw( uno::RuntimeException )
 {
-    uno::Sequence< ::rtl::OUString >    aSNL( getSupportedServiceNames() );
-    const ::rtl::OUString*              pArray = aSNL.getConstArray();
+    uno::Sequence< ::rtl::OUString >	aSNL( getSupportedServiceNames() );
+    const ::rtl::OUString*				pArray = aSNL.getConstArray();
 
     for( sal_Int32 i = 0; i < aSNL.getLength(); i++ )
         if( pArray[i] == ServiceName )
@@ -290,8 +290,8 @@ uno::Sequence< rtl::OUString > SAL_CALL GraphicDescriptor::getSupportedServiceNa
 uno::Sequence< uno::Type > SAL_CALL GraphicDescriptor::getTypes()
     throw( uno::RuntimeException )
 {
-    uno::Sequence< uno::Type >  aTypes( 6 );
-    uno::Type*                  pTypes = aTypes.getArray();
+    uno::Sequence< uno::Type >	aTypes( 6 );
+    uno::Type* 					pTypes = aTypes.getArray();
 
     *pTypes++ = ::getCppuType((const uno::Reference< uno::XAggregation>*)0);
     *pTypes++ = ::getCppuType((const uno::Reference< lang::XServiceInfo>*)0);
@@ -302,21 +302,21 @@ uno::Sequence< uno::Type > SAL_CALL GraphicDescriptor::getTypes()
 
     return aTypes;
 }
-
+   
 // ------------------------------------------------------------------------------
 
 uno::Sequence< sal_Int8 > SAL_CALL GraphicDescriptor::getImplementationId()
     throw( uno::RuntimeException )
 {
-    vos::OGuard                         aGuard( Application::GetSolarMutex() );
-    static uno::Sequence< sal_Int8 >    aId;
-
+    vos::OGuard 						aGuard( Application::GetSolarMutex() );
+    static uno::Sequence< sal_Int8 >	aId;
+    
     if( aId.getLength() == 0 )
     {
         aId.realloc( 16 );
         rtl_createUuid( reinterpret_cast< sal_uInt8* >( aId.getArray() ), 0, sal_True );
     }
-
+    
     return aId;
 }
 
@@ -324,20 +324,20 @@ uno::Sequence< sal_Int8 > SAL_CALL GraphicDescriptor::getImplementationId()
 
 ::comphelper::PropertySetInfo* GraphicDescriptor::createPropertySetInfo()
 {
-    vos::OGuard                     aGuard( Application::GetSolarMutex() );
-    ::comphelper::PropertySetInfo*  pRet = new ::comphelper::PropertySetInfo();
+    vos::OGuard 					aGuard( Application::GetSolarMutex() );
+    ::comphelper::PropertySetInfo*	pRet = new ::comphelper::PropertySetInfo();
 
     static ::comphelper::PropertyMapEntry aEntries[] =
     {
         { MAP_CHAR_LEN( "GraphicType" ), UNOGRAPHIC_GRAPHICTYPE, &::getCppuType( (const sal_Int8*)(0)), beans::PropertyAttribute::READONLY, 0 },
         { MAP_CHAR_LEN( "MimeType" ), UNOGRAPHIC_MIMETYPE, &::getCppuType( (const ::rtl::OUString*)(0)), beans::PropertyAttribute::READONLY, 0 },
         { MAP_CHAR_LEN( "SizePixel" ), UNOGRAPHIC_SIZEPIXEL, &::getCppuType( (const awt::Size*)(0)), beans::PropertyAttribute::READONLY, 0 },
-        { MAP_CHAR_LEN( "Size100thMM" ), UNOGRAPHIC_SIZE100THMM,    &::getCppuType( (const awt::Size*)(0)), beans::PropertyAttribute::READONLY, 0 },
+        { MAP_CHAR_LEN( "Size100thMM" ), UNOGRAPHIC_SIZE100THMM,	&::getCppuType( (const awt::Size*)(0)), beans::PropertyAttribute::READONLY, 0 },
         { MAP_CHAR_LEN( "BitsPerPixel" ), UNOGRAPHIC_BITSPERPIXEL, &::getCppuType( (const sal_uInt8*)(0)), beans::PropertyAttribute::READONLY, 0 },
         { MAP_CHAR_LEN( "Transparent" ), UNOGRAPHIC_TRANSPARENT, &::getCppuType( (const sal_Bool*)(0)), beans::PropertyAttribute::READONLY, 0 },
         { MAP_CHAR_LEN( "Alpha" ), UNOGRAPHIC_ALPHA, &::getCppuType( (const sal_Bool*)(0)), beans::PropertyAttribute::READONLY, 0 },
         { MAP_CHAR_LEN( "Animated" ), UNOGRAPHIC_ANIMATED, &::getCppuType( (const sal_Bool*)(0)), beans::PropertyAttribute::READONLY, 0 },
-
+        
         { 0,0,0,0,0,0 }
     };
 
@@ -350,14 +350,14 @@ uno::Sequence< sal_Int8 > SAL_CALL GraphicDescriptor::getImplementationId()
 // ------------------------------------------------------------------------------
 
 void GraphicDescriptor::_setPropertyValues( const comphelper::PropertyMapEntry** /*ppEntries*/, const uno::Any* /*pValues*/ )
-    throw( beans::UnknownPropertyException,
-           beans::PropertyVetoException,
+    throw( beans::UnknownPropertyException, 
+           beans::PropertyVetoException, 
            lang::IllegalArgumentException,
               lang::WrappedTargetException )
 {
     // we only have readonly attributes
 }
-
+    
 // ------------------------------------------------------------------------------
 
 void GraphicDescriptor::_getPropertyValues( const comphelper::PropertyMapEntry** ppEntries, uno::Any* pValues )
@@ -372,9 +372,9 @@ void GraphicDescriptor::_getPropertyValues( const comphelper::PropertyMapEntry**
             case( UNOGRAPHIC_GRAPHICTYPE ):
             {
                 const GraphicType eType( mpGraphic ? mpGraphic->GetType() : meType );
-
-                *pValues <<= ( ( eType == GRAPHIC_BITMAP ? graphic::GraphicType::PIXEL :
-                                ( eType == GRAPHIC_GDIMETAFILE ? graphic::GraphicType::VECTOR :
+            
+                *pValues <<= ( ( eType == GRAPHIC_BITMAP ? graphic::GraphicType::PIXEL : 
+                                ( eType == GRAPHIC_GDIMETAFILE ? graphic::GraphicType::VECTOR : 
                                 graphic::GraphicType::EMPTY ) ) );
             }
             break;
@@ -382,13 +382,13 @@ void GraphicDescriptor::_getPropertyValues( const comphelper::PropertyMapEntry**
             case( UNOGRAPHIC_MIMETYPE ):
             {
                 ::rtl::OUString aMimeType;
-
+                
                 if( mpGraphic )
                 {
                     if( mpGraphic->IsLink() )
                     {
                         const char* pMimeType;
-
+                    
                         switch( const_cast< Graphic* >( mpGraphic )->GetLink().GetType() )
                         {
                             case( GFX_LINK_TYPE_NATIVE_GIF ): pMimeType = MIMETYPE_GIF; break;
@@ -397,30 +397,30 @@ void GraphicDescriptor::_getPropertyValues( const comphelper::PropertyMapEntry**
                             case( GFX_LINK_TYPE_NATIVE_WMF ): pMimeType = MIMETYPE_WMF; break;
                             case( GFX_LINK_TYPE_NATIVE_MET ): pMimeType = MIMETYPE_MET; break;
                             case( GFX_LINK_TYPE_NATIVE_PCT ): pMimeType = MIMETYPE_PCT ; break;
-
+                            
                             default:
                                 pMimeType = NULL;
                             break;
                         }
-
+                        
                         if( pMimeType )
                             aMimeType = ::rtl::OUString::createFromAscii( pMimeType );
                     }
-
+                
                     if( !aMimeType.getLength() && ( mpGraphic->GetType() != GRAPHIC_NONE ) )
                         aMimeType = ::rtl::OUString::createFromAscii( MIMETYPE_VCLGRAPHIC );
                 }
                 else
                     aMimeType = maMimeType;
-
+                
                  *pValues <<= aMimeType;
             }
             break;
-
+            
             case( UNOGRAPHIC_SIZEPIXEL ):
             {
                 awt::Size aAWTSize( 0, 0 );
-
+            
                 if( mpGraphic )
                 {
                     if( mpGraphic->GetType() == GRAPHIC_BITMAP )
@@ -435,11 +435,11 @@ void GraphicDescriptor::_getPropertyValues( const comphelper::PropertyMapEntry**
                 *pValues <<= aAWTSize;
             }
             break;
-
+            
             case( UNOGRAPHIC_SIZE100THMM ):
             {
                 awt::Size aAWTSize( 0, 0 );
-
+                
                 if( mpGraphic )
                 {
                     if( mpGraphic->GetPrefMapMode().GetMapUnit() != MAP_PIXEL )
@@ -450,15 +450,15 @@ void GraphicDescriptor::_getPropertyValues( const comphelper::PropertyMapEntry**
                 }
                 else
                     aAWTSize = awt::Size( maSize100thMM.Width(), maSize100thMM.Height() );
-
+            
                 *pValues <<= aAWTSize;
             }
             break;
-
+            
             case( UNOGRAPHIC_BITSPERPIXEL ):
             {
                 USHORT nBitsPerPixel = 0;
-
+                
                 if( mpGraphic )
                 {
                     if( mpGraphic->GetType() == GRAPHIC_BITMAP )
@@ -466,11 +466,11 @@ void GraphicDescriptor::_getPropertyValues( const comphelper::PropertyMapEntry**
                 }
                 else
                     nBitsPerPixel = mnBitsPerPixel;
-
+            
                 *pValues <<= sal::static_int_cast< sal_Int8 >(nBitsPerPixel);
             }
             break;
-
+            
             case( UNOGRAPHIC_TRANSPARENT ):
             {
                 *pValues <<= static_cast< sal_Bool >( mpGraphic ? mpGraphic->IsTransparent() : mbTransparent );
@@ -482,14 +482,14 @@ void GraphicDescriptor::_getPropertyValues( const comphelper::PropertyMapEntry**
                 *pValues <<= static_cast< sal_Bool >( mpGraphic ? mpGraphic->IsAlpha() : mbAlpha );
             }
             break;
-
+                        
             case( UNOGRAPHIC_ANIMATED ):
             {
                 *pValues <<= static_cast< sal_Bool >( mpGraphic ? mpGraphic->IsAnimated() : mbAnimated );
             }
             break;
         }
-
+        
         ++ppEntries;
         ++pValues;
     }
diff --git a/svtools/source/graphic/descriptor.hxx b/svtools/source/graphic/descriptor.hxx
index bed7c64c0411..01d4d4222e18 100644
--- a/svtools/source/graphic/descriptor.hxx
+++ b/svtools/source/graphic/descriptor.hxx
@@ -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
@@ -25,8 +25,8 @@
  *
  ************************************************************************/
 
-#ifndef _GOODIES_DESCRIPTOR_HXX
-#define _GOODIES_DESCRIPTOR_HXX
+#ifndef _GOODIES_DESCRIPTOR_HXX 
+#define _GOODIES_DESCRIPTOR_HXX 
 
 #include <comphelper/propertysethelper.hxx>
 #include <com/sun/star/lang/XServiceInfo.hpp>
@@ -34,37 +34,37 @@
 #include <comphelper/propertysetinfo.hxx>
 #include <vcl/graph.hxx>
 
-#define MIMETYPE_BMP        "image/x-MS-bmp"
-#define MIMETYPE_GIF        "image/gif"
-#define MIMETYPE_JPG        "image/jpeg"
-#define MIMETYPE_PCD        "image/x-photo-cd"
-#define MIMETYPE_PCX        "image/x-pcx"
-#define MIMETYPE_PNG        "image/png"
-#define MIMETYPE_TIF        "image/tiff"
-#define MIMETYPE_XBM        "image/x-xbitmap"
-#define MIMETYPE_XPM        "image/x-xpixmap"
-#define MIMETYPE_PBM        "image/x-portable-bitmap"
-#define MIMETYPE_PGM        "image/x-portable-graymap"
-#define MIMETYPE_PPM        "image/x-portable-pixmap"
-#define MIMETYPE_RAS        "image/x-cmu-raster"
-#define MIMETYPE_TGA        "image/x-targa"
-#define MIMETYPE_PSD        "image/vnd.adobe.photoshop"
-#define MIMETYPE_EPS        "image/x-eps"
-#define MIMETYPE_DXF        "image/vnd.dxf"
-#define MIMETYPE_MET        "image/x-met"
-#define MIMETYPE_PCT        "image/x-pict"
-#define MIMETYPE_SGF        "image/x-sgf"
-#define MIMETYPE_SVM        "image/x-svm"
-#define MIMETYPE_WMF        "image/x-wmf"
-#define MIMETYPE_SGV        "image/x-sgv"
-#define MIMETYPE_EMF        "image/x-emf"
-#define MIMETYPE_SVG        "image/svg+xml"
-#define MIMETYPE_VCLGRAPHIC "image/x-vclgraphic"
+#define	MIMETYPE_BMP		"image/x-MS-bmp"
+#define	MIMETYPE_GIF		"image/gif"
+#define	MIMETYPE_JPG		"image/jpeg"
+#define	MIMETYPE_PCD		"image/x-photo-cd"
+#define	MIMETYPE_PCX		"image/x-pcx"
+#define	MIMETYPE_PNG		"image/png"
+#define	MIMETYPE_TIF		"image/tiff"
+#define	MIMETYPE_XBM		"image/x-xbitmap"
+#define	MIMETYPE_XPM		"image/x-xpixmap"
+#define	MIMETYPE_PBM		"image/x-portable-bitmap"
+#define	MIMETYPE_PGM		"image/x-portable-graymap"
+#define	MIMETYPE_PPM		"image/x-portable-pixmap"
+#define	MIMETYPE_RAS		"image/x-cmu-raster"
+#define	MIMETYPE_TGA		"image/x-targa"
+#define	MIMETYPE_PSD		"image/vnd.adobe.photoshop"
+#define	MIMETYPE_EPS		"image/x-eps"
+#define	MIMETYPE_DXF		"image/vnd.dxf"
+#define	MIMETYPE_MET		"image/x-met"
+#define	MIMETYPE_PCT		"image/x-pict"
+#define	MIMETYPE_SGF		"image/x-sgf"
+#define	MIMETYPE_SVM		"image/x-svm"
+#define	MIMETYPE_WMF		"image/x-wmf"
+#define MIMETYPE_SGV		"image/x-sgv"
+#define	MIMETYPE_EMF		"image/x-emf"
+#define	MIMETYPE_SVG		"image/svg+xml"
+#define MIMETYPE_VCLGRAPHIC	"image/x-vclgraphic"
 
 using namespace com::sun::star;
 
 namespace comphelper { class PropertySetInfo; }
-namespace com { namespace sun { namespace star { namespace io { class XInputStream; } } } }
+namespace com { namespace sun { namespace star { namespace io { class XInputStream; } } } } 
 
 class Graphic;
 
@@ -80,19 +80,19 @@ class GraphicDescriptor : public ::cppu::OWeakAggObject,
                           public ::comphelper::PropertySetHelper
 {
 public:
-
+        
     GraphicDescriptor();
     ~GraphicDescriptor() throw();
-
+    
      void init( const ::Graphic& rGraphic ) throw();
     void init( const ::rtl::OUString& rURL ) throw();
     void init( const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& rxIStm, const ::rtl::OUString& rURL ) throw();
-
+    
     bool isValid() const;
 
     static ::rtl::OUString getImplementationName_Static() throw();
     static ::com::sun::star::uno::Sequence< ::rtl::OUString >  getSupportedServiceNames_Static() throw();
-
+    
 protected:
 
     static ::comphelper::PropertySetInfo* createPropertySetInfo();
@@ -102,7 +102,7 @@ protected:
     virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException);
     virtual void SAL_CALL acquire() throw();
     virtual void SAL_CALL release() throw();
-
+    
     // XServiceInfo
     virtual rtl::OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException );
     virtual sal_Bool SAL_CALL supportsService( const rtl::OUString& ServiceName ) throw( ::com::sun::star::uno::RuntimeException );
@@ -118,23 +118,23 @@ protected:
 
 private:
 
-    const ::Graphic*        mpGraphic;
-    GraphicType             meType;
-    ::rtl::OUString         maMimeType;
-    Size                    maSizePixel;
-    Size                    maSize100thMM;
-    USHORT              mnBitsPerPixel;
-    bool                    mbTransparent;
-    bool                    mbAlpha;
-    bool                    mbAnimated;
-
+    const ::Graphic*		mpGraphic;
+    GraphicType				meType;
+    ::rtl::OUString			maMimeType;
+    Size					maSizePixel;
+    Size					maSize100thMM;
+    USHORT				mnBitsPerPixel;
+    bool					mbTransparent;
+    bool					mbAlpha;
+    bool					mbAnimated;
+        
     GraphicDescriptor( const GraphicDescriptor& rDescriptor );
-
-    GraphicDescriptor& operator=( const GraphicDescriptor& );
+    
+    GraphicDescriptor& operator=( const GraphicDescriptor& ); 
 
     void implCreate( SvStream& rIStm, const ::rtl::OUString* pPath );
 };
 
 }
 
-#endif
+#endif 
diff --git a/svtools/source/graphic/graphic.cxx b/svtools/source/graphic/graphic.cxx
index 52c03c611241..48d5995fb873 100644
--- a/svtools/source/graphic/graphic.cxx
+++ b/svtools/source/graphic/graphic.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
@@ -61,7 +61,7 @@ Graphic::~Graphic()
 
 void Graphic::init( const ::Graphic& rGraphic )
     throw()
-{
+{	
     delete mpGraphic;
     mpGraphic = new ::Graphic( rGraphic );
     ::unographic::GraphicDescriptor::init( *mpGraphic );
@@ -81,7 +81,7 @@ uno::Any SAL_CALL Graphic::queryAggregation( const uno::Type& rType )
         aAny <<= uno::Reference< lang::XUnoTunnel >(this);
     else
         aAny <<= ::unographic::GraphicDescriptor::queryAggregation( rType );
-
+        
     return aAny ;
 }
 
@@ -98,7 +98,7 @@ uno::Any SAL_CALL Graphic::queryInterface( const uno::Type & rType )
 
 // ------------------------------------------------------------------------------
 
-void SAL_CALL Graphic::acquire()
+void SAL_CALL Graphic::acquire() 
     throw()
 {
     ::unographic::GraphicDescriptor::acquire();
@@ -112,24 +112,24 @@ void SAL_CALL Graphic::release() throw()
 }
 
 // ------------------------------------------------------------------------------
-
-uno::Sequence< sal_Int8 > SAL_CALL Graphic::getImplementationId_Static()
+    
+uno::Sequence< sal_Int8 > SAL_CALL Graphic::getImplementationId_Static() 
     throw(uno::RuntimeException)
 {
-    vos::OGuard                         aGuard( Application::GetSolarMutex() );
-    static uno::Sequence< sal_Int8 >    aId;
-
+    vos::OGuard 						aGuard( Application::GetSolarMutex() );
+    static uno::Sequence< sal_Int8 >	aId;
+    
     if( aId.getLength() == 0 )
     {
         aId.realloc( 16 );
         rtl_createUuid( reinterpret_cast< sal_uInt8* >( aId.getArray() ), 0, sal_True );
     }
-
+    
     return aId;
 }
 
 // ------------------------------------------------------------------------------
-
+    
 ::rtl::OUString Graphic::getImplementationName_Static()
     throw()
 {
@@ -142,14 +142,14 @@ uno::Sequence< ::rtl::OUString > Graphic::getSupportedServiceNames_Static()
     throw()
 {
     uno::Sequence< ::rtl::OUString > aSeq( 1 );
-
+    
     aSeq.getArray()[ 0 ] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.graphic.Graphic" ) );
-
+    
     return aSeq;
 }
 
 // ------------------------------------------------------------------------------
-
+    
 ::rtl::OUString SAL_CALL Graphic::getImplementationName()
     throw( uno::RuntimeException )
 {
@@ -158,35 +158,35 @@ uno::Sequence< ::rtl::OUString > Graphic::getSupportedServiceNames_Static()
 
 // ------------------------------------------------------------------------------
 
-sal_Bool SAL_CALL Graphic::supportsService( const ::rtl::OUString& rServiceName )
+sal_Bool SAL_CALL Graphic::supportsService( const ::rtl::OUString& rServiceName ) 
     throw( uno::RuntimeException )
 {
     if( ::unographic::GraphicDescriptor::supportsService( rServiceName ) )
         return true;
     else
     {
-        uno::Sequence< ::rtl::OUString >    aSNL( getSupportedServiceNames() );
-        const ::rtl::OUString*              pArray = aSNL.getConstArray();
-
+        uno::Sequence< ::rtl::OUString >	aSNL( getSupportedServiceNames() );
+        const ::rtl::OUString*				pArray = aSNL.getConstArray();
+    
         for( int i = 0; i < aSNL.getLength(); i++ )
             if( pArray[i] == rServiceName )
                 return true;
-
+    
         return false;
     }
 }
 
 // ------------------------------------------------------------------------------
 
-uno::Sequence< ::rtl::OUString > SAL_CALL Graphic::getSupportedServiceNames()
+uno::Sequence< ::rtl::OUString > SAL_CALL Graphic::getSupportedServiceNames() 
     throw( uno::RuntimeException )
 {
-    uno::Sequence< ::rtl::OUString >    aRet( ::unographic::GraphicDescriptor::getSupportedServiceNames() );
-    uno::Sequence< ::rtl::OUString >    aNew( getSupportedServiceNames_Static() );
-    sal_Int32                           nOldCount = aRet.getLength();
-
+    uno::Sequence< ::rtl::OUString > 	aRet( ::unographic::GraphicDescriptor::getSupportedServiceNames() );
+    uno::Sequence< ::rtl::OUString > 	aNew( getSupportedServiceNames_Static() );
+    sal_Int32							nOldCount = aRet.getLength();
+    
     aRet.realloc( nOldCount + aNew.getLength() );
-
+    
     for( sal_Int32 i = 0; i < aNew.getLength(); ++i )
         aRet[ nOldCount++ ] = aNew[ i ];
 
@@ -195,22 +195,22 @@ uno::Sequence< ::rtl::OUString > SAL_CALL Graphic::getSupportedServiceNames()
 
 // ------------------------------------------------------------------------------
 
-uno::Sequence< uno::Type > SAL_CALL Graphic::getTypes()
+uno::Sequence< uno::Type > SAL_CALL Graphic::getTypes() 
     throw(uno::RuntimeException)
 {
-    uno::Sequence< uno::Type >  aRet( ::unographic::GraphicDescriptor::getTypes() );
-    sal_Int32                   nOldCount = aRet.getLength();
+    uno::Sequence< uno::Type >	aRet( ::unographic::GraphicDescriptor::getTypes() );
+    sal_Int32 					nOldCount = aRet.getLength();
 
     aRet.realloc( nOldCount + 2 );
     aRet[ nOldCount ] = ::getCppuType((const uno::Reference< graphic::XGraphic>*)0);
     aRet[ nOldCount+1 ] = ::getCppuType((const uno::Reference< awt::XBitmap>*)0);
-
+    
     return aRet;
 }
 
 // ------------------------------------------------------------------------------
 
-uno::Sequence< sal_Int8 > SAL_CALL Graphic::getImplementationId()
+uno::Sequence< sal_Int8 > SAL_CALL Graphic::getImplementationId() 
     throw(uno::RuntimeException)
 {
     return getImplementationId_Static();
@@ -225,7 +225,7 @@ uno::Sequence< sal_Int8 > SAL_CALL Graphic::getImplementationId()
 
     if( mpGraphic && ( mpGraphic->GetType() != GRAPHIC_NONE ) )
         cRet = ( ( mpGraphic->GetType() == GRAPHIC_BITMAP ) ? graphic::GraphicType::PIXEL : graphic::GraphicType::VECTOR );
-
+    
     return cRet;
 }
 
@@ -293,7 +293,7 @@ sal_Int64 SAL_CALL Graphic::getSomething( const uno::Sequence< sal_Int8 >& rId )
     throw( uno::RuntimeException )
 {
     return( ( rId.getLength() == 16 && 0 == rtl_compareMemory( getImplementationId().getConstArray(), rId.getConstArray(), 16 ) ) ?
-            reinterpret_cast< sal_Int64 >( mpGraphic ) :
+            reinterpret_cast< sal_Int64 >( mpGraphic ) : 
             0 );
 }
 
diff --git a/svtools/source/graphic/graphic.hxx b/svtools/source/graphic/graphic.hxx
index 1a6594a3e543..833a0a7f73d7 100644
--- a/svtools/source/graphic/graphic.hxx
+++ b/svtools/source/graphic/graphic.hxx
@@ -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
@@ -25,8 +25,8 @@
  *
  ************************************************************************/
 
-#ifndef _GOODIES_GRAPHIC_HXX
-#define _GOODIES_GRAPHIC_HXX
+#ifndef _GOODIES_GRAPHIC_HXX 
+#define _GOODIES_GRAPHIC_HXX 
 
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <com/sun/star/graphic/XGraphic.hpp>
@@ -48,23 +48,23 @@ namespace unographic {
 
 class Graphic : public ::com::sun::star::graphic::XGraphic,
                 public ::com::sun::star::awt::XBitmap,
-                public ::com::sun::star::lang::XUnoTunnel,
+                public ::com::sun::star::lang::XUnoTunnel, 
                 public ::unographic::GraphicDescriptor,
                 public ::unographic::GraphicTransformer
 {
 public:
-
+        
     Graphic();
     ~Graphic() throw();
 
     using unographic::GraphicDescriptor::init;
     void init( const ::Graphic& rGraphic ) throw();
-
+    
     static const ::Graphic* getImplementation( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& rxIFace ) throw();
     static ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId_Static(  ) throw(::com::sun::star::uno::RuntimeException);
     static ::rtl::OUString getImplementationName_Static() throw();
     static ::com::sun::star::uno::Sequence< ::rtl::OUString >  getSupportedServiceNames_Static() throw();
-
+    
 protected:
 
     // XInterface
@@ -72,7 +72,7 @@ protected:
     virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException);
     virtual void SAL_CALL acquire() throw();
     virtual void SAL_CALL release() throw();
-
+    
     // XServiceInfo
     virtual rtl::OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException );
     virtual sal_Bool SAL_CALL supportsService( const rtl::OUString& ServiceName ) throw( ::com::sun::star::uno::RuntimeException );
@@ -81,7 +81,7 @@ protected:
     // XTypeProvider
     virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes(  ) throw(::com::sun::star::uno::RuntimeException);
     virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId(  ) throw(::com::sun::star::uno::RuntimeException);
-
+    
     // XGraphic
     virtual ::sal_Int8 SAL_CALL getType(  ) throw (::com::sun::star::uno::RuntimeException);
 
@@ -100,4 +100,4 @@ private:
 
 }
 
-#endif
+#endif 
diff --git a/svtools/source/graphic/graphicunofactory.cxx b/svtools/source/graphic/graphicunofactory.cxx
index f29b34b66743..ce2b85dbe969 100644
--- a/svtools/source/graphic/graphicunofactory.cxx
+++ b/svtools/source/graphic/graphicunofactory.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
@@ -62,11 +62,11 @@ GObjectImpl::GObjectImpl( uno::Sequence< uno::Any > const & args, uno::Reference
         rtl::OUString sId;
         if ( !( args[ 0 ] >>= sId ) || sId.getLength() == 0 )
             throw lang::IllegalArgumentException();
-        ByteString bsId( sId.getStr(), RTL_TEXTENCODING_UTF8 );
-        mpGObject.reset( new GraphicObject( bsId ) );
+        ByteString bsId( sId.getStr(), RTL_TEXTENCODING_UTF8 ); 
+        mpGObject.reset( new GraphicObject( bsId ) ); 
     }
     else
-       mpGObject.reset( new GraphicObject() );
+       mpGObject.reset( new GraphicObject() ); 
 }
 
 uno::Reference< graphic::XGraphic > SAL_CALL GObjectImpl::getGraphic() throw (uno::RuntimeException)
diff --git a/svtools/source/graphic/grfattr.cxx b/svtools/source/graphic/grfattr.cxx
index 757be42a104c..d79686ed8e22 100644
--- a/svtools/source/graphic/grfattr.cxx
+++ b/svtools/source/graphic/grfattr.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
@@ -36,21 +36,21 @@
 // ---------------
 
 GraphicAttr::GraphicAttr() :
-    mfGamma         ( 1.0 ),
-    mnMirrFlags     ( 0 ),
-    mnLeftCrop      ( 0 ),
-    mnTopCrop       ( 0 ),
-    mnRightCrop     ( 0 ),
-    mnBottomCrop    ( 0 ),
-    mnRotate10      ( 0 ),
-    mnContPercent   ( 0 ),
-    mnLumPercent    ( 0 ),
-    mnRPercent      ( 0 ),
-    mnGPercent      ( 0 ),
-    mnBPercent      ( 0 ),
-    mbInvert        ( FALSE ),
-    mcTransparency  ( 0 ),
-    meDrawMode      ( GRAPHICDRAWMODE_STANDARD )
+    mfGamma			( 1.0 ), 
+    mnMirrFlags		( 0 ),
+    mnLeftCrop		( 0 ),
+    mnTopCrop		( 0 ),
+    mnRightCrop		( 0 ),
+    mnBottomCrop	( 0 ),
+    mnRotate10		( 0 ),
+    mnContPercent	( 0 ), 
+    mnLumPercent	( 0 ),
+    mnRPercent		( 0 ), 
+    mnGPercent		( 0 ),
+    mnBPercent		( 0 ),
+    mbInvert		( FALSE ),
+    mcTransparency	( 0 ),
+    meDrawMode		( GRAPHICDRAWMODE_STANDARD )
 {
 }
 
@@ -85,13 +85,13 @@ BOOL GraphicAttr::operator==( const GraphicAttr& rAttr ) const
 
 SvStream& operator>>( SvStream& rIStm, GraphicAttr& rAttr )
 {
-    VersionCompat   aCompat( rIStm, STREAM_READ );
-    sal_uInt32      nTmp32;
-    UINT16          nTmp16;
+    VersionCompat	aCompat( rIStm, STREAM_READ );
+    sal_uInt32		nTmp32;
+    UINT16			nTmp16;
 
     rIStm >> nTmp32 >> nTmp32 >> rAttr.mfGamma >> rAttr.mnMirrFlags >> rAttr.mnRotate10;
     rIStm >> rAttr.mnContPercent >> rAttr.mnLumPercent >> rAttr.mnRPercent >> rAttr.mnGPercent >> rAttr.mnBPercent;
-    rIStm >> rAttr.mbInvert >> rAttr.mcTransparency >> nTmp16;
+    rIStm >> rAttr.mbInvert >> rAttr.mcTransparency >> nTmp16; 
     rAttr.meDrawMode = (GraphicDrawMode) nTmp16;
 
     if( aCompat.GetVersion() >= 2 )
@@ -106,8 +106,8 @@ SvStream& operator>>( SvStream& rIStm, GraphicAttr& rAttr )
 
 SvStream& operator<<( SvStream& rOStm, const GraphicAttr& rAttr )
 {
-    VersionCompat       aCompat( rOStm, STREAM_WRITE, 2 );
-    const sal_uInt32    nTmp32 = 0;
+    VersionCompat		aCompat( rOStm, STREAM_WRITE, 2 );
+    const sal_uInt32	nTmp32 = 0;
 
     rOStm << nTmp32 << nTmp32 << rAttr.mfGamma << rAttr.mnMirrFlags << rAttr.mnRotate10;
     rOStm << rAttr.mnContPercent << rAttr.mnLumPercent << rAttr.mnRPercent << rAttr.mnGPercent << rAttr.mnBPercent;
diff --git a/svtools/source/graphic/grfcache.cxx b/svtools/source/graphic/grfcache.cxx
index 41240c95d113..5fefa50af6f1 100644
--- a/svtools/source/graphic/grfcache.cxx
+++ b/svtools/source/graphic/grfcache.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
@@ -41,7 +41,7 @@
 // -----------
 
 #define RELEASE_TIMEOUT 10000
-#define MAX_BMP_EXTENT  4096
+#define MAX_BMP_EXTENT	4096
 
 // -----------
 // - statics -
@@ -57,10 +57,10 @@ class GraphicID
 {
 private:
 
-    sal_uInt32  mnID1;
-    sal_uInt32  mnID2;
-    sal_uInt32  mnID3;
-    sal_uInt32  mnID4;
+    sal_uInt32	mnID1;
+    sal_uInt32	mnID2;
+    sal_uInt32	mnID3;
+    sal_uInt32	mnID4;
 
                 GraphicID();
 
@@ -70,13 +70,13 @@ public:
                 GraphicID( const GraphicObject& rObj );
                 ~GraphicID() {}
 
-    BOOL        operator==( const GraphicID& rID ) const
+    BOOL		operator==( const GraphicID& rID ) const
                 {
                     return( rID.mnID1 == mnID1 && rID.mnID2 == mnID2 &&
                             rID.mnID3 == mnID3 && rID.mnID4 == mnID4 );
                 }
-
-    ByteString  GetIDString() const;
+    
+    ByteString	GetIDString() const;
     BOOL        IsEmpty() const { return( 0 == mnID4 ); }
 };
 
@@ -84,7 +84,7 @@ public:
 
 GraphicID::GraphicID( const GraphicObject& rObj )
 {
-    const Graphic& rGraphic = rObj.GetGraphic();
+    const Graphic& rGraphic = rObj.GetGraphic(); 
 
     mnID1 = ( (ULONG) rGraphic.GetType() ) << 28;
 
@@ -134,9 +134,9 @@ GraphicID::GraphicID( const GraphicObject& rObj )
 
 ByteString GraphicID::GetIDString() const
 {
-    ByteString  aHexStr;
-    sal_Char*   pStr = aHexStr.AllocBuffer( 32 );
-    sal_Int32   nShift;
+    ByteString	aHexStr;
+    sal_Char*	pStr = aHexStr.AllocBuffer( 32 );
+    sal_Int32	nShift;
 
     for( nShift = 28; nShift >= 0; nShift -= 4 )
         *pStr++ = aHexData[ ( mnID1 >> (sal_uInt32) nShift ) & 0xf ];
@@ -160,44 +160,44 @@ ByteString GraphicID::GetIDString() const
 class GraphicCacheEntry
 {
 private:
-
-    List                maGraphicObjectList;
-    GraphicID           maID;
-    GfxLink             maGfxLink;
-    BitmapEx*           mpBmpEx;
-    GDIMetaFile*        mpMtf;
-    Animation*          mpAnimation;
-    BOOL                mbSwappedAll;
-
-    BOOL                ImplInit( const GraphicObject& rObj );
-    BOOL                ImplMatches( const GraphicObject& rObj ) const { return( GraphicID( rObj ) == maID ); }
-    void                ImplFillSubstitute( Graphic& rSubstitute );
-
-public:
-
+    
+    List				maGraphicObjectList;
+    GraphicID			maID;
+    GfxLink				maGfxLink;
+    BitmapEx*			mpBmpEx;
+    GDIMetaFile*		mpMtf;
+    Animation*			mpAnimation;
+    BOOL				mbSwappedAll;
+                        
+    BOOL				ImplInit( const GraphicObject& rObj );
+    BOOL				ImplMatches( const GraphicObject& rObj ) const { return( GraphicID( rObj ) == maID ); }
+    void				ImplFillSubstitute( Graphic& rSubstitute );
+                        
+public:					
+                        
                         GraphicCacheEntry( const GraphicObject& rObj );
                         ~GraphicCacheEntry();
 
-    const GraphicID&    GetID() const { return maID; }
-
-    void                AddGraphicObjectReference( const GraphicObject& rObj, Graphic& rSubstitute );
-    BOOL                ReleaseGraphicObjectReference( const GraphicObject& rObj );
-    ULONG               GetGraphicObjectReferenceCount() { return maGraphicObjectList.Count(); }
-    BOOL                HasGraphicObjectReference( const GraphicObject& rObj );
-
-    void                TryToSwapIn();
-    void                GraphicObjectWasSwappedOut( const GraphicObject& rObj );
-    BOOL                FillSwappedGraphicObject( const GraphicObject& rObj, Graphic& rSubstitute );
-    void                GraphicObjectWasSwappedIn( const GraphicObject& rObj );
+    const GraphicID&	GetID() const { return maID; }
+                        
+    void				AddGraphicObjectReference( const GraphicObject& rObj, Graphic& rSubstitute );
+    BOOL				ReleaseGraphicObjectReference( const GraphicObject& rObj );
+    ULONG				GetGraphicObjectReferenceCount() { return maGraphicObjectList.Count(); }
+    BOOL				HasGraphicObjectReference( const GraphicObject& rObj );
+                        
+    void				TryToSwapIn();
+    void				GraphicObjectWasSwappedOut( const GraphicObject& rObj );
+    BOOL				FillSwappedGraphicObject( const GraphicObject& rObj, Graphic& rSubstitute );
+    void				GraphicObjectWasSwappedIn( const GraphicObject& rObj );
 };
 
 // -----------------------------------------------------------------------------
 
 GraphicCacheEntry::GraphicCacheEntry( const GraphicObject& rObj ) :
-    maID            ( rObj ),
-    mpBmpEx         ( NULL ),
-    mpMtf           ( NULL ),
-    mpAnimation     ( NULL ),
+    maID			( rObj ),
+    mpBmpEx			( NULL ),
+    mpMtf			( NULL ),
+    mpAnimation		( NULL ),
     mbSwappedAll    ( !ImplInit( rObj ) )
 {
     maGraphicObjectList.Insert( (void*) &rObj, LIST_APPEND );
@@ -243,7 +243,7 @@ BOOL GraphicCacheEntry::ImplInit( const GraphicObject& rObj )
                     mpBmpEx = new BitmapEx( rGraphic.GetBitmapEx() );
             }
             break;
-
+                    
             case( GRAPHIC_GDIMETAFILE ):
             {
                 mpMtf = new GDIMetaFile( rGraphic.GetGDIMetaFile() );
@@ -273,13 +273,13 @@ BOOL GraphicCacheEntry::ImplInit( const GraphicObject& rObj )
 void GraphicCacheEntry::ImplFillSubstitute( Graphic& rSubstitute )
 {
     // create substitute for graphic;
-    const Size          aPrefSize( rSubstitute.GetPrefSize() );
-    const MapMode       aPrefMapMode( rSubstitute.GetPrefMapMode() );
-    const Link          aAnimationNotifyHdl( rSubstitute.GetAnimationNotifyHdl() );
-    const String        aDocFileName( rSubstitute.GetDocFileName() );
-    const ULONG         nDocFilePos = rSubstitute.GetDocFilePos();
-    const GraphicType   eOldType = rSubstitute.GetType();
-    const BOOL          bDefaultType = ( rSubstitute.GetType() == GRAPHIC_DEFAULT );
+    const Size			aPrefSize( rSubstitute.GetPrefSize() );
+    const MapMode		aPrefMapMode( rSubstitute.GetPrefMapMode() );
+    const Link			aAnimationNotifyHdl( rSubstitute.GetAnimationNotifyHdl() );
+    const String		aDocFileName( rSubstitute.GetDocFileName() );
+    const ULONG			nDocFilePos = rSubstitute.GetDocFilePos();
+    const GraphicType	eOldType = rSubstitute.GetType();
+    const BOOL			bDefaultType = ( rSubstitute.GetType() == GRAPHIC_DEFAULT );
 
     if( rSubstitute.IsLink() && ( GFX_LINK_TYPE_NONE == maGfxLink.GetType() ) )
         maGfxLink = rSubstitute.GetLink();
@@ -311,13 +311,13 @@ void GraphicCacheEntry::ImplFillSubstitute( Graphic& rSubstitute )
 // -----------------------------------------------------------------------------
 
 void GraphicCacheEntry::AddGraphicObjectReference( const GraphicObject& rObj, Graphic& rSubstitute )
-{
+{	
     if( mbSwappedAll )
         mbSwappedAll = !ImplInit( rObj );
 
     ImplFillSubstitute( rSubstitute );
     maGraphicObjectList.Insert( (void*) &rObj, LIST_APPEND );
-}
+}	
 
 // -----------------------------------------------------------------------------
 
@@ -410,24 +410,24 @@ class GraphicDisplayCacheEntry
 private:
 
     ::vos::TTimeValue           maReleaseTime;
-    const GraphicCacheEntry*    mpRefCacheEntry;
-    GDIMetaFile*                mpMtf;
-    BitmapEx*                   mpBmpEx;
-    GraphicAttr                 maAttr;
-    Size                        maOutSizePix;
-    ULONG                       mnCacheSize;
-    ULONG                       mnOutDevDrawMode;
-    USHORT                      mnOutDevBitCount;
-
-public:
-
-    static ULONG                GetNeededSize( OutputDevice* pOut, const Point& rPt, const Size& rSz,
+    const GraphicCacheEntry*	mpRefCacheEntry;
+    GDIMetaFile*				mpMtf;
+    BitmapEx*					mpBmpEx;
+    GraphicAttr					maAttr;
+    Size						maOutSizePix;
+    ULONG						mnCacheSize;
+    ULONG						mnOutDevDrawMode;
+    USHORT						mnOutDevBitCount;
+
+public:						
+                            
+    static ULONG				GetNeededSize( OutputDevice* pOut, const Point& rPt, const Size& rSz, 
                                                const GraphicObject& rObj, const GraphicAttr& rAttr );
-
-public:
-
+                            
+public:						
+                            
                                 GraphicDisplayCacheEntry( const GraphicCacheEntry* pRefCacheEntry,
-                                                          OutputDevice* pOut, const Point& rPt, const Size& rSz,
+                                                          OutputDevice* pOut, const Point& rPt, const Size& rSz, 
                                                           const GraphicObject& rObj, const GraphicAttr& rAttr,
                                                           const BitmapEx& rBmpEx ) :
                                     mpRefCacheEntry( pRefCacheEntry ),
@@ -438,9 +438,9 @@ public:
                                     mnOutDevBitCount( pOut->GetBitCount() )
                                     {
                                     }
-
+                                
                                 GraphicDisplayCacheEntry( const GraphicCacheEntry* pRefCacheEntry,
-                                                          OutputDevice* pOut, const Point& rPt, const Size& rSz,
+                                                          OutputDevice* pOut, const Point& rPt, const Size& rSz, 
                                                           const GraphicObject& rObj, const GraphicAttr& rAttr,
                                                           const GDIMetaFile& rMtf ) :
                                     mpRefCacheEntry( pRefCacheEntry ),
@@ -448,24 +448,24 @@ public:
                                     maAttr( rAttr ), maOutSizePix( pOut->LogicToPixel( rSz ) ),
                                     mnCacheSize( GetNeededSize( pOut, rPt, rSz, rObj, rAttr ) ),
                                     mnOutDevDrawMode( pOut->GetDrawMode() ),
-                                    mnOutDevBitCount( pOut->GetBitCount() )
+                                    mnOutDevBitCount( pOut->GetBitCount() ) 
                                     {
-                                    }
-
-
+                                    }	
+                                        
+                                
                                 ~GraphicDisplayCacheEntry();
 
-    const GraphicAttr&          GetAttr() const { return maAttr; }
-    const Size&                 GetOutputSizePixel() const { return maOutSizePix; }
-    ULONG                   GetCacheSize() const { return mnCacheSize; }
-    const GraphicCacheEntry*    GetReferencedCacheEntry() const { return mpRefCacheEntry; }
-    ULONG                   GetOutDevDrawMode() const { return mnOutDevDrawMode; }
-    USHORT              GetOutDevBitCount() const { return mnOutDevBitCount; }
-
+    const GraphicAttr&			GetAttr() const { return maAttr; }
+    const Size&					GetOutputSizePixel() const { return maOutSizePix; }
+    ULONG					GetCacheSize() const { return mnCacheSize; }
+    const GraphicCacheEntry*	GetReferencedCacheEntry() const { return mpRefCacheEntry; }
+    ULONG					GetOutDevDrawMode() const { return mnOutDevDrawMode; }
+    USHORT				GetOutDevBitCount()	const { return mnOutDevBitCount; }
+    
     void                        SetReleaseTime( const ::vos::TTimeValue& rReleaseTime ) { maReleaseTime = rReleaseTime; }
     const ::vos::TTimeValue&    GetReleaseTime() const { return maReleaseTime; }
-
-    BOOL                        Matches( OutputDevice* pOut, const Point& /*rPtPixel*/, const Size& rSzPixel,
+                                
+    BOOL						Matches( OutputDevice* pOut, const Point& /*rPtPixel*/, const Size& rSzPixel,
                                          const GraphicCacheEntry* pCacheEntry, const GraphicAttr& rAttr ) const
                                 {
                                     // #i46805# Additional match
@@ -480,25 +480,25 @@ public:
                                             ( pOut->GetBitCount() == mnOutDevBitCount ) &&
                                             ( pOut->GetDrawMode() == mnOutDevDrawMode ) );
                                 }
-
-    void                        Draw( OutputDevice* pOut, const Point& rPt, const Size& rSz ) const;
+                                
+    void						Draw( OutputDevice* pOut, const Point& rPt, const Size& rSz ) const;
 };
 
 // -----------------------------------------------------------------------------
 
-ULONG GraphicDisplayCacheEntry::GetNeededSize( OutputDevice* pOut, const Point& /*rPt*/, const Size& rSz,
+ULONG GraphicDisplayCacheEntry::GetNeededSize( OutputDevice* pOut, const Point& /*rPt*/, const Size& rSz, 
                                                const GraphicObject& rObj, const GraphicAttr& rAttr )
 {
     const Graphic&      rGraphic = rObj.GetGraphic();
-    const GraphicType   eType = rGraphic.GetType();
-    ULONG               nNeededSize;
+    const GraphicType	eType = rGraphic.GetType();
+    ULONG				nNeededSize;
 
     if( GRAPHIC_BITMAP == eType )
     {
         const Size aOutSizePix( pOut->LogicToPixel( rSz ) );
         const long nBitCount = pOut->GetBitCount();
 
-        if( ( aOutSizePix.Width() > MAX_BMP_EXTENT ) ||
+        if( ( aOutSizePix.Width() > MAX_BMP_EXTENT ) || 
             ( aOutSizePix.Height() > MAX_BMP_EXTENT ) )
         {
             nNeededSize = ULONG_MAX;
@@ -546,7 +546,7 @@ void GraphicDisplayCacheEntry::Draw( OutputDevice* pOut, const Point& rPt, const
         if( maAttr.IsRotated() )
         {
             Polygon aPoly( Rectangle( rPt, rSz ) );
-
+            
             aPoly.Rotate( rPt, maAttr.GetRotation() % 3600 );
             const Rectangle aRotBoundRect( aPoly.GetBoundRect() );
             pOut->DrawBitmapEx( aRotBoundRect.TopLeft(), aRotBoundRect.GetSize(), *mpBmpEx );
@@ -561,11 +561,11 @@ void GraphicDisplayCacheEntry::Draw( OutputDevice* pOut, const Point& rPt, const
 // -----------------------
 
 GraphicCache::GraphicCache( GraphicManager& rMgr, ULONG nDisplayCacheSize, ULONG nMaxObjDisplayCacheSize ) :
-    mrMgr                   ( rMgr ),
+    mrMgr				    ( rMgr ),
     mnReleaseTimeoutSeconds ( 0UL ),
-    mnMaxDisplaySize        ( nDisplayCacheSize ),
-    mnMaxObjDisplaySize     ( nMaxObjDisplayCacheSize ),
-    mnUsedDisplaySize       ( 0UL )
+    mnMaxDisplaySize	    ( nDisplayCacheSize ),
+    mnMaxObjDisplaySize	    ( nMaxObjDisplayCacheSize ),
+    mnUsedDisplaySize	    ( 0UL )
 {
     maReleaseTimer.SetTimeoutHdl( LINK( this, GraphicCache, ReleaseTimeoutHdl ) );
     maReleaseTimer.SetTimeout( RELEASE_TIMEOUT );
@@ -573,7 +573,7 @@ GraphicCache::GraphicCache( GraphicManager& rMgr, ULONG nDisplayCacheSize, ULONG
 }
 
 // -----------------------------------------------------------------------------
-
+                                           
 GraphicCache::~GraphicCache()
 {
     DBG_ASSERT( !maGraphicCache.Count(), "GraphicCache::~GraphicCache(): there are some GraphicObjects in cache" );
@@ -582,18 +582,18 @@ GraphicCache::~GraphicCache()
 
 // -----------------------------------------------------------------------------
 
-void GraphicCache::AddGraphicObject( const GraphicObject& rObj, Graphic& rSubstitute,
+void GraphicCache::AddGraphicObject( const GraphicObject& rObj, Graphic& rSubstitute, 
                                      const ByteString* pID, const GraphicObject* pCopyObj )
 {
     BOOL bInserted = FALSE;
 
-    if( !rObj.IsSwappedOut() &&
+    if( !rObj.IsSwappedOut() && 
         ( pID || ( pCopyObj && ( pCopyObj->GetType() != GRAPHIC_NONE ) ) || ( rObj.GetType() != GRAPHIC_NONE ) ) )
     {
         if( pCopyObj )
         {
             GraphicCacheEntry* pEntry = static_cast< GraphicCacheEntry* >( maGraphicCache.First() );
-
+        
             while( !bInserted && pEntry )
             {
                 if( pEntry->HasGraphicObjectReference( *pCopyObj ) )
@@ -607,43 +607,43 @@ void GraphicCache::AddGraphicObject( const GraphicObject& rObj, Graphic& rSubsti
                 }
             }
         }
-
+        
         if( !bInserted )
         {
             GraphicCacheEntry* pEntry = static_cast< GraphicCacheEntry* >( maGraphicCache.First() );
             ::std::auto_ptr< GraphicID > apID;
-
+            
             if( !pID )
             {
                 apID.reset( new GraphicID( rObj ) );
             }
-
+    
             while( !bInserted && pEntry )
             {
                 const GraphicID& rEntryID = pEntry->GetID();
-
+    
                 if( pID )
                 {
                     if( rEntryID.GetIDString() == *pID )
                     {
                         pEntry->TryToSwapIn();
-
+    
                         // since pEntry->TryToSwapIn can modify our current list, we have to
                         // iterate from beginning to add a reference to the appropriate
                         // CacheEntry object; after this, quickly jump out of the outer iteration
-                        for( pEntry = static_cast< GraphicCacheEntry* >( maGraphicCache.First() );
-                             !bInserted && pEntry;
+                        for( pEntry = static_cast< GraphicCacheEntry* >( maGraphicCache.First() ); 
+                             !bInserted && pEntry; 
                              pEntry = static_cast< GraphicCacheEntry* >( maGraphicCache.Next() ) )
                         {
                             const GraphicID& rID = pEntry->GetID();
-
+    
                             if( rID.GetIDString() == *pID )
                             {
                                 pEntry->AddGraphicObjectReference( rObj, rSubstitute );
                                 bInserted = TRUE;
                             }
                         }
-
+    
                         if( !bInserted )
                         {
                             maGraphicCache.Insert( new GraphicCacheEntry( rObj ), LIST_APPEND );
@@ -659,7 +659,7 @@ void GraphicCache::AddGraphicObject( const GraphicObject& rObj, Graphic& rSubsti
                         bInserted = TRUE;
                     }
                 }
-
+    
                 if( !bInserted )
                     pEntry = static_cast< GraphicCacheEntry* >( maGraphicCache.Next() );
             }
@@ -675,8 +675,8 @@ void GraphicCache::AddGraphicObject( const GraphicObject& rObj, Graphic& rSubsti
 void GraphicCache::ReleaseGraphicObject( const GraphicObject& rObj )
 {
     // Release cached object
-    GraphicCacheEntry*  pEntry = (GraphicCacheEntry*) maGraphicCache.First();
-    BOOL                bRemoved = FALSE;
+    GraphicCacheEntry*	pEntry = (GraphicCacheEntry*) maGraphicCache.First();
+    BOOL				bRemoved = FALSE;
 
     while( !bRemoved && pEntry )
     {
@@ -750,7 +750,7 @@ void GraphicCache::GraphicObjectWasSwappedIn( const GraphicObject& rObj )
         if( pEntry->GetID().IsEmpty() )
         {
             ReleaseGraphicObject( rObj );
-            AddGraphicObject( rObj, (Graphic&) rObj.GetGraphic(), NULL, NULL );
+            AddGraphicObject( rObj, (Graphic&) rObj.GetGraphic(), NULL, NULL ); 
         }
         else
             pEntry->GraphicObjectWasSwappedIn( rObj );
@@ -830,23 +830,23 @@ void GraphicCache::ClearDisplayCache()
 
 // -----------------------------------------------------------------------------
 
-BOOL GraphicCache::IsDisplayCacheable( OutputDevice* pOut, const Point& rPt, const Size& rSz,
+BOOL GraphicCache::IsDisplayCacheable( OutputDevice* pOut, const Point& rPt, const Size& rSz, 
                                        const GraphicObject& rObj, const GraphicAttr& rAttr ) const
 {
-    return( GraphicDisplayCacheEntry::GetNeededSize( pOut, rPt, rSz, rObj, rAttr ) <=
+    return( GraphicDisplayCacheEntry::GetNeededSize( pOut, rPt, rSz, rObj, rAttr ) <= 
             GetMaxObjDisplayCacheSize() );
 }
 
 // -----------------------------------------------------------------------------
 
-BOOL GraphicCache::IsInDisplayCache( OutputDevice* pOut, const Point& rPt, const Size& rSz,
+BOOL GraphicCache::IsInDisplayCache( OutputDevice* pOut, const Point& rPt, const Size& rSz, 
                                      const GraphicObject& rObj, const GraphicAttr& rAttr ) const
 {
-    const Point                 aPtPixel( pOut->LogicToPixel( rPt ) );
-    const Size                  aSzPixel( pOut->LogicToPixel( rSz ) );
-    const GraphicCacheEntry*    pCacheEntry = ( (GraphicCache*) this )->ImplGetCacheEntry( rObj );
-    //GraphicDisplayCacheEntry* pDisplayEntry = (GraphicDisplayCacheEntry*) ( (GraphicCache*) this )->maDisplayCache.First(); // -Wall removed ....
-    BOOL                        bFound = FALSE;
+    const Point					aPtPixel( pOut->LogicToPixel( rPt ) );
+    const Size					aSzPixel( pOut->LogicToPixel( rSz ) );
+    const GraphicCacheEntry*	pCacheEntry = ( (GraphicCache*) this )->ImplGetCacheEntry( rObj );
+    //GraphicDisplayCacheEntry*	pDisplayEntry = (GraphicDisplayCacheEntry*) ( (GraphicCache*) this )->maDisplayCache.First(); // -Wall removed ....
+    BOOL						bFound = FALSE;
 
     if( pCacheEntry )
     {
@@ -862,8 +862,8 @@ BOOL GraphicCache::IsInDisplayCache( OutputDevice* pOut, const Point& rPt, const
 
 ByteString GraphicCache::GetUniqueID( const GraphicObject& rObj ) const
 {
-    ByteString          aRet;
-    GraphicCacheEntry*  pEntry = ( (GraphicCache*) this )->ImplGetCacheEntry( rObj );
+    ByteString			aRet;
+    GraphicCacheEntry*	pEntry = ( (GraphicCache*) this )->ImplGetCacheEntry( rObj );
 
     // ensure that the entry is correctly initialized (it has to be read at least once)
     if( pEntry && pEntry->GetID().IsEmpty() )
@@ -874,25 +874,25 @@ ByteString GraphicCache::GetUniqueID( const GraphicObject& rObj ) const
 
     if( pEntry )
         aRet = pEntry->GetID().GetIDString();
-
+    
     return aRet;
 }
 
 // -----------------------------------------------------------------------------
 
-BOOL GraphicCache::CreateDisplayCacheObj( OutputDevice* pOut, const Point& rPt, const Size& rSz,
+BOOL GraphicCache::CreateDisplayCacheObj( OutputDevice* pOut, const Point& rPt, const Size& rSz, 
                                           const GraphicObject& rObj, const GraphicAttr& rAttr,
                                           const BitmapEx& rBmpEx )
 {
     const ULONG nNeededSize = GraphicDisplayCacheEntry::GetNeededSize( pOut, rPt, rSz, rObj, rAttr );
-    BOOL        bRet = FALSE;
+    BOOL		bRet = FALSE;
 
     if( nNeededSize <= GetMaxObjDisplayCacheSize() )
     {
         if( nNeededSize > GetFreeDisplayCacheSize() )
             ImplFreeDisplayCacheSpace( nNeededSize - GetFreeDisplayCacheSize() );
 
-        GraphicDisplayCacheEntry* pNewEntry = new GraphicDisplayCacheEntry( ImplGetCacheEntry( rObj ),
+        GraphicDisplayCacheEntry* pNewEntry = new GraphicDisplayCacheEntry( ImplGetCacheEntry( rObj ), 
                                                                             pOut, rPt, rSz, rObj, rAttr, rBmpEx );
 
         if( GetCacheTimeout() )
@@ -903,7 +903,7 @@ BOOL GraphicCache::CreateDisplayCacheObj( OutputDevice* pOut, const Point& rPt,
             aReleaseTime.addTime( ::vos::TTimeValue( GetCacheTimeout(), 0 ) );
             pNewEntry->SetReleaseTime( aReleaseTime );
         }
-
+                                                                            
         maDisplayCache.Insert( pNewEntry, LIST_APPEND );
         mnUsedDisplaySize += pNewEntry->GetCacheSize();
         bRet = TRUE;
@@ -914,19 +914,19 @@ BOOL GraphicCache::CreateDisplayCacheObj( OutputDevice* pOut, const Point& rPt,
 
 // -----------------------------------------------------------------------------
 
-BOOL GraphicCache::CreateDisplayCacheObj( OutputDevice* pOut, const Point& rPt, const Size& rSz,
+BOOL GraphicCache::CreateDisplayCacheObj( OutputDevice* pOut, const Point& rPt, const Size& rSz, 
                                           const GraphicObject& rObj, const GraphicAttr& rAttr,
                                           const GDIMetaFile& rMtf )
 {
     const ULONG nNeededSize = GraphicDisplayCacheEntry::GetNeededSize( pOut, rPt, rSz, rObj, rAttr );
-    BOOL        bRet = FALSE;
+    BOOL		bRet = FALSE;
 
     if( nNeededSize <= GetMaxObjDisplayCacheSize() )
     {
         if( nNeededSize > GetFreeDisplayCacheSize() )
             ImplFreeDisplayCacheSpace( nNeededSize - GetFreeDisplayCacheSize() );
 
-        GraphicDisplayCacheEntry* pNewEntry = new GraphicDisplayCacheEntry( ImplGetCacheEntry( rObj ),
+        GraphicDisplayCacheEntry* pNewEntry = new GraphicDisplayCacheEntry( ImplGetCacheEntry( rObj ), 
                                                                             pOut, rPt, rSz, rObj, rAttr, rMtf );
 
         if( GetCacheTimeout() )
@@ -937,7 +937,7 @@ BOOL GraphicCache::CreateDisplayCacheObj( OutputDevice* pOut, const Point& rPt,
             aReleaseTime.addTime( ::vos::TTimeValue( GetCacheTimeout(), 0 ) );
             pNewEntry->SetReleaseTime( aReleaseTime );
         }
-
+                                                                            
         maDisplayCache.Insert( pNewEntry, LIST_APPEND );
         mnUsedDisplaySize += pNewEntry->GetCacheSize();
         bRet = TRUE;
@@ -948,14 +948,14 @@ BOOL GraphicCache::CreateDisplayCacheObj( OutputDevice* pOut, const Point& rPt,
 
 // -----------------------------------------------------------------------------
 
-BOOL GraphicCache::DrawDisplayCacheObj( OutputDevice* pOut, const Point& rPt, const Size& rSz,
+BOOL GraphicCache::DrawDisplayCacheObj( OutputDevice* pOut, const Point& rPt, const Size& rSz, 
                                         const GraphicObject& rObj, const GraphicAttr& rAttr )
 {
-    const Point                 aPtPixel( pOut->LogicToPixel( rPt ) );
-    const Size                  aSzPixel( pOut->LogicToPixel( rSz ) );
-    const GraphicCacheEntry*    pCacheEntry = ImplGetCacheEntry( rObj );
-    GraphicDisplayCacheEntry*   pDisplayCacheEntry = (GraphicDisplayCacheEntry*) maDisplayCache.First();
-    BOOL                        bRet = FALSE;
+    const Point					aPtPixel( pOut->LogicToPixel( rPt ) );
+    const Size					aSzPixel( pOut->LogicToPixel( rSz ) );
+    const GraphicCacheEntry*	pCacheEntry = ImplGetCacheEntry( rObj );
+    GraphicDisplayCacheEntry*	pDisplayCacheEntry = (GraphicDisplayCacheEntry*) maDisplayCache.First();
+    BOOL						bRet = FALSE;
 
     while( !bRet && pDisplayCacheEntry )
     {
diff --git a/svtools/source/graphic/grfcache.hxx b/svtools/source/graphic/grfcache.hxx
index 55309a00827d..95a2841e2a1e 100644
--- a/svtools/source/graphic/grfcache.hxx
+++ b/svtools/source/graphic/grfcache.hxx
@@ -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
@@ -43,66 +43,66 @@ class GraphicCache
 {
 private:
 
-    GraphicManager&             mrMgr;
+    GraphicManager&				mrMgr;
     Timer                       maReleaseTimer;
-    List                        maGraphicCache;
-    List                        maDisplayCache;
+    List						maGraphicCache;
+    List						maDisplayCache;
     ULONG                       mnReleaseTimeoutSeconds;
-    ULONG                       mnMaxDisplaySize;
-    ULONG                       mnMaxObjDisplaySize;
-    ULONG                       mnUsedDisplaySize;
+    ULONG						mnMaxDisplaySize;
+    ULONG						mnMaxObjDisplaySize;
+    ULONG						mnUsedDisplaySize;
 
-    BOOL                        ImplFreeDisplayCacheSpace( ULONG nSizeToFree );
-    GraphicCacheEntry*          ImplGetCacheEntry( const GraphicObject& rObj );
+    BOOL						ImplFreeDisplayCacheSpace( ULONG nSizeToFree );
+    GraphicCacheEntry*			ImplGetCacheEntry( const GraphicObject& rObj );
 
 
                                 DECL_LINK( ReleaseTimeoutHdl, Timer* pTimer );
-
-public:
-
+                    
+public:				
+                    
                                 GraphicCache( GraphicManager& rMgr,
-                                              ULONG nDisplayCacheSize = 10000000UL,
+                                              ULONG nDisplayCacheSize = 10000000UL, 
                                               ULONG nMaxObjDisplayCacheSize = 2400000UL );
                                 ~GraphicCache();
-
-public:
-
-    void                        AddGraphicObject( const GraphicObject& rObj, Graphic& rSubstitute,
+                                
+public:							
+                                
+    void						AddGraphicObject( const GraphicObject& rObj, Graphic& rSubstitute, 
                                                   const ByteString* pID, const GraphicObject* pCopyObj );
-    void                        ReleaseGraphicObject( const GraphicObject& rObj );
-
-    void                        GraphicObjectWasSwappedOut( const GraphicObject& rObj );
-    BOOL                        FillSwappedGraphicObject( const GraphicObject& rObj, Graphic& rSubstitute );
-    void                        GraphicObjectWasSwappedIn( const GraphicObject& rObj );
-
-    ByteString                  GetUniqueID( const GraphicObject& rObj ) const;
-
-public:
-
-    void                        SetMaxDisplayCacheSize( ULONG nNewCacheSize );
-    ULONG                       GetMaxDisplayCacheSize() const { return mnMaxDisplaySize; };
-
-    void                        SetMaxObjDisplayCacheSize( ULONG nNewMaxObjSize, BOOL bDestroyGreaterCached = FALSE );
-    ULONG                       GetMaxObjDisplayCacheSize() const { return mnMaxObjDisplaySize; }
-
-    ULONG                       GetUsedDisplayCacheSize() const { return mnUsedDisplaySize; }
-    ULONG                       GetFreeDisplayCacheSize() const { return( mnMaxDisplaySize - mnUsedDisplaySize ); }
+    void						ReleaseGraphicObject( const GraphicObject& rObj );
+
+    void						GraphicObjectWasSwappedOut( const GraphicObject& rObj );
+    BOOL						FillSwappedGraphicObject( const GraphicObject& rObj, Graphic& rSubstitute );
+    void						GraphicObjectWasSwappedIn( const GraphicObject& rObj );
+
+    ByteString					GetUniqueID( const GraphicObject& rObj ) const;
+                                
+public:							
+                                
+    void						SetMaxDisplayCacheSize( ULONG nNewCacheSize );
+    ULONG						GetMaxDisplayCacheSize() const { return mnMaxDisplaySize; };
+                                
+    void						SetMaxObjDisplayCacheSize( ULONG nNewMaxObjSize, BOOL bDestroyGreaterCached = FALSE );
+    ULONG						GetMaxObjDisplayCacheSize() const { return mnMaxObjDisplaySize; }
+                                
+    ULONG						GetUsedDisplayCacheSize() const { return mnUsedDisplaySize; }
+    ULONG						GetFreeDisplayCacheSize() const { return( mnMaxDisplaySize - mnUsedDisplaySize ); }
 
     void                        SetCacheTimeout( ULONG nTimeoutSeconds );
     ULONG                       GetCacheTimeout() const { return mnReleaseTimeoutSeconds; }
-
-    void                        ClearDisplayCache();
-    BOOL                        IsDisplayCacheable( OutputDevice* pOut, const Point& rPt, const Size& rSz,
+                                
+    void						ClearDisplayCache();
+    BOOL						IsDisplayCacheable( OutputDevice* pOut, const Point& rPt, const Size& rSz, 
                                                     const GraphicObject& rObj, const GraphicAttr& rAttr ) const;
-    BOOL                        IsInDisplayCache( OutputDevice* pOut, const Point& rPt, const Size& rSz,
+    BOOL						IsInDisplayCache( OutputDevice* pOut, const Point& rPt, const Size& rSz, 
                                                   const GraphicObject& rObj, const GraphicAttr& rAttr ) const;
-    BOOL                        CreateDisplayCacheObj( OutputDevice* pOut, const Point& rPt, const Size& rSz,
+    BOOL						CreateDisplayCacheObj( OutputDevice* pOut, const Point& rPt, const Size& rSz, 
                                                        const GraphicObject& rObj, const GraphicAttr& rAttr,
                                                        const BitmapEx& rBmpEx );
-    BOOL                        CreateDisplayCacheObj( OutputDevice* pOut, const Point& rPt, const Size& rSz,
+    BOOL						CreateDisplayCacheObj( OutputDevice* pOut, const Point& rPt, const Size& rSz, 
                                                        const GraphicObject& rObj, const GraphicAttr& rAttr,
                                                        const GDIMetaFile& rMtf );
-    BOOL                        DrawDisplayCacheObj( OutputDevice* pOut, const Point& rPt, const Size& rSz,
+    BOOL						DrawDisplayCacheObj( OutputDevice* pOut, const Point& rPt, const Size& rSz, 
                                                      const GraphicObject& rObj, const GraphicAttr& rAttr );
 };
 
diff --git a/svtools/source/graphic/grfmgr.cxx b/svtools/source/graphic/grfmgr.cxx
index 221354cc6665..f22694c265f9 100644
--- a/svtools/source/graphic/grfmgr.cxx
+++ b/svtools/source/graphic/grfmgr.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
@@ -52,8 +52,8 @@
 // - Defines -
 // -----------
 
-#define WATERMARK_LUM_OFFSET                50
-#define WATERMARK_CON_OFFSET                -70
+#define WATERMARK_LUM_OFFSET				50
+#define WATERMARK_CON_OFFSET				-70
 
 // -----------
 // - statics -
@@ -67,8 +67,8 @@ GraphicManager* GraphicObject::mpGlobalMgr = NULL;
 
 struct GrfSimpleCacheObj
 {
-    Graphic     maGraphic;
-    GraphicAttr maAttr;
+    Graphic		maGraphic;
+    GraphicAttr	maAttr;
 
                 GrfSimpleCacheObj( const Graphic& rGraphic, const GraphicAttr& rAttr ) :
                     maGraphic( rGraphic ), maAttr( rAttr ) {}
@@ -83,8 +83,8 @@ TYPEINIT1_AUTOFACTORY( GraphicObject, SvDataCopyStream );
 // -----------------------------------------------------------------------------
 
 GraphicObject::GraphicObject( const GraphicManager* pMgr ) :
-    mpLink      ( NULL ),
-    mpUserData  ( NULL )
+    mpLink		( NULL ),
+    mpUserData	( NULL )
 {
     ImplConstruct();
     ImplAssignGraphicData();
@@ -94,9 +94,9 @@ GraphicObject::GraphicObject( const GraphicManager* pMgr ) :
 // -----------------------------------------------------------------------------
 
 GraphicObject::GraphicObject( const Graphic& rGraphic, const GraphicManager* pMgr ) :
-    maGraphic   ( rGraphic ),
-    mpLink      ( NULL ),
-    mpUserData  ( NULL )
+    maGraphic	( rGraphic ),
+    mpLink		( NULL ),
+    mpUserData	( NULL )
 {
     ImplConstruct();
     ImplAssignGraphicData();
@@ -106,9 +106,9 @@ GraphicObject::GraphicObject( const Graphic& rGraphic, const GraphicManager* pMg
 // -----------------------------------------------------------------------------
 
 GraphicObject::GraphicObject( const Graphic& rGraphic, const String& rLink, const GraphicManager* pMgr ) :
-    maGraphic   ( rGraphic ),
-    mpLink      ( rLink.Len() ? ( new String( rLink ) ) : NULL ),
-    mpUserData  ( NULL )
+    maGraphic	( rGraphic ),
+    mpLink		( rLink.Len() ? ( new String( rLink ) ) : NULL ),
+    mpUserData	( NULL )
 {
     ImplConstruct();
     ImplAssignGraphicData();
@@ -119,10 +119,10 @@ GraphicObject::GraphicObject( const Graphic& rGraphic, const String& rLink, cons
 
 GraphicObject::GraphicObject( const GraphicObject& rGraphicObj, const GraphicManager* pMgr ) :
     SvDataCopyStream(),
-    maGraphic   ( rGraphicObj.GetGraphic() ),
-    maAttr      ( rGraphicObj.maAttr ),
-    mpLink      ( rGraphicObj.mpLink ? ( new String( *rGraphicObj.mpLink ) ) : NULL ),
-    mpUserData  ( rGraphicObj.mpUserData ? ( new String( *rGraphicObj.mpUserData ) ) : NULL )
+    maGraphic	( rGraphicObj.GetGraphic() ),
+    maAttr		( rGraphicObj.maAttr ),
+    mpLink		( rGraphicObj.mpLink ? ( new String( *rGraphicObj.mpLink ) ) : NULL ),
+    mpUserData	( rGraphicObj.mpUserData ? ( new String( *rGraphicObj.mpUserData ) ) : NULL )
 {
     ImplConstruct();
     ImplAssignGraphicData();
@@ -132,8 +132,8 @@ GraphicObject::GraphicObject( const GraphicObject& rGraphicObj, const GraphicMan
 // -----------------------------------------------------------------------------
 
 GraphicObject::GraphicObject( const ByteString& rUniqueID, const GraphicManager* pMgr ) :
-    mpLink      ( NULL ),
-    mpUserData  ( NULL )
+    mpLink		( NULL ),
+    mpUserData	( NULL )
 {
     ImplConstruct();
 
@@ -312,17 +312,17 @@ BOOL GraphicObject::ImplGetCropParams( OutputDevice* pOut, Point& rPt, Size& rSz
 
     if( GetType() != GRAPHIC_NONE )
     {
-        Polygon         aClipPoly( Rectangle( rPt, rSz ) );
-        const USHORT    nRot10 = pAttr->GetRotation() % 3600;
-        const Point     aOldOrigin( rPt );
+        Polygon			aClipPoly( Rectangle( rPt, rSz ) );
+        const USHORT	nRot10 = pAttr->GetRotation() % 3600;
+        const Point		aOldOrigin( rPt );
         // --> OD 2005-09-30 #i54875# - It's not needed to get the graphic again.
 //        const Graphic&  rGraphic = GetGraphic();
         // <--
-        const MapMode   aMap100( MAP_100TH_MM );
-        Size            aSize100;
-        long            nTotalWidth, nTotalHeight;
-        long            nNewLeft, nNewTop, nNewRight, nNewBottom;
-        double          fScale;
+        const MapMode	aMap100( MAP_100TH_MM );
+        Size			aSize100;
+        long			nTotalWidth, nTotalHeight;
+        long			nNewLeft, nNewTop, nNewRight, nNewBottom;
+        double			fScale;
 
         if( nRot10 )
         {
@@ -417,7 +417,7 @@ GraphicObject& GraphicObject::operator=( const GraphicObject& rGraphicObj )
 
 BOOL GraphicObject::operator==( const GraphicObject& rGraphicObj ) const
 {
-    return( ( rGraphicObj.maGraphic == maGraphic ) &&
+    return(	( rGraphicObj.maGraphic == maGraphic ) &&
             ( rGraphicObj.maAttr == maAttr ) &&
             ( rGraphicObj.GetLink() == GetLink() ) );
 }
@@ -555,7 +555,7 @@ void GraphicObject::SetSwapStreamHdl()
 
 void GraphicObject::SetSwapStreamHdl( const Link& rHdl, const ULONG nSwapOutTimeout )
 {
-    delete mpSwapStreamHdl, mpSwapStreamHdl = new Link( rHdl );
+    delete mpSwapStreamHdl,	mpSwapStreamHdl = new Link( rHdl );
 
     if( nSwapOutTimeout )
     {
@@ -668,16 +668,16 @@ List* GraphicObject::GetAnimationInfoList() const
 BOOL GraphicObject::Draw( OutputDevice* pOut, const Point& rPt, const Size& rSz,
                           const GraphicAttr* pAttr, ULONG nFlags )
 {
-    GraphicAttr         aAttr( pAttr ? *pAttr : GetAttr() );
-    Point               aPt( rPt );
-    Size                aSz( rSz );
+    GraphicAttr	        aAttr( pAttr ? *pAttr : GetAttr() );
+    Point 		        aPt( rPt );
+    Size  	            aSz( rSz );
     const sal_uInt32    nOldDrawMode = pOut->GetDrawMode();
-    BOOL                bCropped = aAttr.IsCropped();
-    BOOL                bCached = FALSE;
-    BOOL                bRet;
+    BOOL		        bCropped = aAttr.IsCropped();
+    BOOL		        bCached = FALSE;
+    BOOL		        bRet;
 
     // #i29534# Provide output rects for PDF writer
-    Rectangle           aCropRect;
+    Rectangle			aCropRect;
 
     if( !( GRFMGR_DRAW_USE_DRAWMODE_SETTINGS & nFlags ) )
         pOut->SetDrawMode( nOldDrawMode & ( ~( DRAWMODE_SETTINGSLINE | DRAWMODE_SETTINGSFILL | DRAWMODE_SETTINGSTEXT | DRAWMODE_SETTINGSGRADIENT ) ) );
@@ -701,8 +701,8 @@ BOOL GraphicObject::Draw( OutputDevice* pOut, const Point& rPt, const Size& rSz,
     if( bCropped )
     {
         PolyPolygon aClipPolyPoly;
-        BOOL        bRectClip;
-        const BOOL  bCrop = ImplGetCropParams( pOut, aPt, aSz, &aAttr, aClipPolyPoly, bRectClip );
+        BOOL		bRectClip;
+        const BOOL	bCrop = ImplGetCropParams( pOut, aPt, aSz, &aAttr, aClipPolyPoly, bRectClip );
 
         pOut->Push( PUSH_CLIPREGION );
 
@@ -812,11 +812,11 @@ BOOL GraphicObject::DrawTiled( OutputDevice* pOut, const Rectangle& rArea, const
     if( pOut == NULL || rSize.Width() == 0 || rSize.Height() == 0 )
         return FALSE;
 
-    const MapMode   aOutMapMode( pOut->GetMapMode() );
-    const MapMode   aMapMode( aOutMapMode.GetMapUnit(), Point(), aOutMapMode.GetScaleX(), aOutMapMode.GetScaleY() );
+    const MapMode 	aOutMapMode( pOut->GetMapMode() );
+    const MapMode	aMapMode( aOutMapMode.GetMapUnit(), Point(), aOutMapMode.GetScaleX(), aOutMapMode.GetScaleY() );
     // #106258# Clamp size to 1 for zero values. This is okay, since
     // logical size of zero is handled above already
-    const Size      aOutTileSize( ::std::max( 1L, pOut->LogicToPixel( rSize, aOutMapMode ).Width() ),
+    const Size		aOutTileSize( ::std::max( 1L, pOut->LogicToPixel( rSize, aOutMapMode ).Width() ),
                                   ::std::max( 1L, pOut->LogicToPixel( rSize, aOutMapMode ).Height() ) );
 
     //#i69780 clip final tile size to a sane max size
@@ -845,14 +845,14 @@ BOOL GraphicObject::StartAnimation( OutputDevice* pOut, const Point& rPt, const
         if( mbAnimated )
         {
             Point   aPt( rPt );
-            Size    aSz( rSz );
-            BOOL    bCropped = aAttr.IsCropped();
+            Size	aSz( rSz );
+            BOOL	bCropped = aAttr.IsCropped();
 
             if( bCropped )
             {
                 PolyPolygon aClipPolyPoly;
-                BOOL        bRectClip;
-                const BOOL  bCrop = ImplGetCropParams( pOut, aPt, aSz, &aAttr, aClipPolyPoly, bRectClip );
+                BOOL		bRectClip;
+                const BOOL	bCrop = ImplGetCropParams( pOut, aPt, aSz, &aAttr, aClipPolyPoly, bRectClip );
 
                 pOut->Push( PUSH_CLIPREGION );
 
@@ -922,7 +922,7 @@ void GraphicObject::SetGraphic( const Graphic& rGraphic, const GraphicObject* pC
     delete mpSimpleCache, mpSimpleCache = NULL;
 
     mpMgr->ImplRegisterObj( *this, maGraphic, 0, pCopyObj);
-
+    
     if( mpSwapOutTimer )
         mpSwapOutTimer->Start();
 }
@@ -940,9 +940,9 @@ void GraphicObject::SetGraphic( const Graphic& rGraphic, const String& rLink )
 Graphic GraphicObject::GetTransformedGraphic( const Size& rDestSize, const MapMode& rDestMap, const GraphicAttr& rAttr ) const
 {
     // #104550# Extracted from svx/source/svdraw/svdograf.cxx
-    Graphic             aTransGraphic( maGraphic );
-    const GraphicType   eType = GetType();
-    const Size          aSrcSize( aTransGraphic.GetPrefSize() );
+    Graphic		    	aTransGraphic( maGraphic );
+    const GraphicType	eType = GetType();
+    const Size      	aSrcSize( aTransGraphic.GetPrefSize() );
 
     // #104115# Convert the crop margins to graphic object mapmode
     const MapMode aMapGraph( aTransGraphic.GetPrefMapMode() );
@@ -1316,11 +1316,11 @@ IMPL_LINK( GraphicObject, ImplAutoSwapOutHdl, void*, EMPTYARG )
 
 SvStream& operator>>( SvStream& rIStm, GraphicObject& rGraphicObj )
 {
-    VersionCompat   aCompat( rIStm, STREAM_READ );
-    Graphic         aGraphic;
-    GraphicAttr     aAttr;
-    ByteString      aLink;
-    BOOL            bLink;
+    VersionCompat	aCompat( rIStm, STREAM_READ );
+    Graphic			aGraphic;
+    GraphicAttr		aAttr;
+    ByteString		aLink;
+    BOOL			bLink;
 
     rIStm >> aGraphic >> aAttr >> bLink;
 
@@ -1344,8 +1344,8 @@ SvStream& operator>>( SvStream& rIStm, GraphicObject& rGraphicObj )
 
 SvStream& operator<<( SvStream& rOStm, const GraphicObject& rGraphicObj )
 {
-    VersionCompat   aCompat( rOStm, STREAM_WRITE, 1 );
-    const BOOL      bLink =  rGraphicObj.HasLink();
+    VersionCompat	aCompat( rOStm, STREAM_WRITE, 1 );
+    const BOOL		bLink =  rGraphicObj.HasLink();
 
     rOStm << rGraphicObj.GetGraphic() << rGraphicObj.GetAttr() << bLink;
 
@@ -1368,10 +1368,10 @@ GraphicObject GraphicObject::CreateGraphicObjectFromURL( const ::rtl::OUString &
     }
     else
     {
-        Graphic     aGraphic;
+        Graphic		aGraphic;
         if ( aURL.Len() )
         {
-            SvStream*   pStream = utl::UcbStreamHelper::CreateStream( aURL, STREAM_READ );
+            SvStream*	pStream = utl::UcbStreamHelper::CreateStream( aURL, STREAM_READ );
             if( pStream )
                 GraphicConverter::Import( *pStream, aGraphic );
         }
diff --git a/svtools/source/graphic/grfmgr2.cxx b/svtools/source/graphic/grfmgr2.cxx
index 7e1255aabc56..5284d5b7e371 100644
--- a/svtools/source/graphic/grfmgr2.cxx
+++ b/svtools/source/graphic/grfmgr2.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
@@ -46,10 +46,10 @@
 // - defines -
 // -----------
 
-#define MAX_PRINTER_EXT             1024
-#define MAP( cVal0, cVal1, nFrac )  ((BYTE)((((long)(cVal0)<<20L)+nFrac*((long)(cVal1)-(cVal0)))>>20L))
-#define WATERMARK_LUM_OFFSET        50
-#define WATERMARK_CON_OFFSET        -70
+#define MAX_PRINTER_EXT				1024
+#define MAP( cVal0, cVal1, nFrac )	((BYTE)((((long)(cVal0)<<20L)+nFrac*((long)(cVal1)-(cVal0)))>>20L))
+#define WATERMARK_LUM_OFFSET		50
+#define WATERMARK_CON_OFFSET		-70
 
 // -----------
 // - helpers -
@@ -158,9 +158,9 @@ ULONG GraphicManager::GetMaxObjCacheSize() const
 
 // -----------------------------------------------------------------------------
 
-ULONG GraphicManager::GetUsedCacheSize() const
-{
-    return mpCache->GetUsedDisplayCacheSize();
+ULONG GraphicManager::GetUsedCacheSize() const 
+{ 
+    return mpCache->GetUsedDisplayCacheSize(); 
 }
 
 // -----------------------------------------------------------------------------
@@ -201,7 +201,7 @@ void GraphicManager::ReleaseFromCache( const GraphicObject& /*rObj*/ )
 // -----------------------------------------------------------------------------
 
 BOOL GraphicManager::IsInCache( OutputDevice* pOut, const Point& rPt,
-                                    const Size& rSz, const GraphicObject& rObj,
+                                    const Size& rSz, const GraphicObject& rObj, 
                                     const GraphicAttr& rAttr ) const
 {
     return mpCache->IsInDisplayCache( pOut, rPt, rSz, rObj, rAttr );
@@ -214,8 +214,8 @@ BOOL GraphicManager::DrawObj( OutputDevice* pOut, const Point& rPt, const Size&
                               const ULONG nFlags, BOOL& rCached )
 {
     Point   aPt( rPt );
-    Size    aSz( rSz );
-    BOOL    bRet = FALSE;
+    Size	aSz( rSz );
+    BOOL	bRet = FALSE;
 
     rCached = FALSE;
 
@@ -225,9 +225,9 @@ BOOL GraphicManager::DrawObj( OutputDevice* pOut, const Point& rPt, const Size&
         const Size aOutSize( pOut->GetOutputSizePixel() );
 
         if( rObj.IsAnimated() || ( pOut->GetOutDevType() == OUTDEV_PRINTER ) ||
-            ( !( nFlags & GRFMGR_DRAW_NO_SUBSTITUTE ) &&
-              ( ( nFlags & GRFMGR_DRAW_SUBSTITUTE ) ||
-                !( nFlags & GRFMGR_DRAW_CACHED ) ||
+            ( !( nFlags & GRFMGR_DRAW_NO_SUBSTITUTE ) && 
+              ( ( nFlags & GRFMGR_DRAW_SUBSTITUTE ) || 
+                !( nFlags & GRFMGR_DRAW_CACHED ) || 
                 ( pOut->GetConnectMetaFile() && !pOut->IsOutputEnabled() ) ) ) )
         {
             // simple output of transformed graphic
@@ -236,7 +236,7 @@ BOOL GraphicManager::DrawObj( OutputDevice* pOut, const Point& rPt, const Size&
             if( aGraphic.IsSupportedGraphic() )
             {
                 const USHORT nRot10 = rAttr.GetRotation() % 3600;
-
+    
                 if( nRot10 )
                 {
                     Polygon aPoly( Rectangle( aPt, aSz ) );
@@ -268,7 +268,7 @@ BOOL GraphicManager::DrawObj( OutputDevice* pOut, const Point& rPt, const Size&
 
 // -----------------------------------------------------------------------------
 
-void GraphicManager::ImplRegisterObj( const GraphicObject& rObj, Graphic& rSubstitute,
+void GraphicManager::ImplRegisterObj( const GraphicObject& rObj, Graphic& rSubstitute, 
                                       const ByteString* pID, const GraphicObject* pCopyObj )
 {
     maObjList.Insert( (void*) &rObj, LIST_APPEND );
@@ -278,7 +278,7 @@ void GraphicManager::ImplRegisterObj( const GraphicObject& rObj, Graphic& rSubst
 // -----------------------------------------------------------------------------
 
 void GraphicManager::ImplUnregisterObj( const GraphicObject& rObj )
-{
+{	
     mpCache->ReleaseGraphicObject( rObj );
     maObjList.Remove( (void*) &rObj );
 }
@@ -315,11 +315,11 @@ void GraphicManager::ImplGraphicObjectWasSwappedIn( const GraphicObject& rObj )
 
 BOOL GraphicManager::ImplDraw( OutputDevice* pOut, const Point& rPt,
                                const Size& rSz, GraphicObject& rObj,
-                               const GraphicAttr& rAttr,
+                               const GraphicAttr& rAttr, 
                                const ULONG nFlags, BOOL& rCached )
 {
-    const Graphic&  rGraphic = rObj.GetGraphic();
-    BOOL            bRet = FALSE;
+    const Graphic&	rGraphic = rObj.GetGraphic();
+    BOOL			bRet = FALSE;
 
     if( rGraphic.IsSupportedGraphic() && !rGraphic.IsSwapOut() )
     {
@@ -333,7 +333,7 @@ BOOL GraphicManager::ImplDraw( OutputDevice* pOut, const Point& rPt,
                 mpCache->IsDisplayCacheable( pOut, rPt, rSz, rObj, rAttr ) )
             {
                 BitmapEx aDstBmpEx;
-
+                
                 if( ImplCreateOutput( pOut, rPt, rSz, aSrcBmpEx, rAttr, nFlags, &aDstBmpEx ) )
                 {
                     rCached = mpCache->CreateDisplayCacheObj( pOut, rPt, rSz, rObj, rAttr, aDstBmpEx );
@@ -361,7 +361,7 @@ BOOL GraphicManager::ImplDraw( OutputDevice* pOut, const Point& rPt,
                         // metafile basically contains only a single
                         // bitmap
                         BitmapEx aDstBmpEx;
-
+                
                         if( ImplCreateOutput( pOut, rPt, rSz, aContainedBmpEx, rAttr, nFlags, &aDstBmpEx ) )
                         {
                             rCached = mpCache->CreateDisplayCacheObj( pOut, rPt, rSz, rObj, rAttr, aDstBmpEx );
@@ -379,7 +379,7 @@ BOOL GraphicManager::ImplDraw( OutputDevice* pOut, const Point& rPt,
             if( !bRet )
             {
                 const Graphic aGraphic( rObj.GetTransformedGraphic( &rAttr ) );
-
+                
                 if( aGraphic.IsSupportedGraphic() )
                 {
                     aGraphic.Draw( pOut, rPt, rSz );
@@ -394,16 +394,16 @@ BOOL GraphicManager::ImplDraw( OutputDevice* pOut, const Point& rPt,
 
 // -----------------------------------------------------------------------------
 
-BOOL GraphicManager::ImplCreateOutput( OutputDevice* pOut,
+BOOL GraphicManager::ImplCreateOutput( OutputDevice* pOut, 
                                        const Point& rPt, const Size& rSz,
                                        const BitmapEx& rBmpEx, const GraphicAttr& rAttr,
                                        const ULONG nFlags, BitmapEx* pBmpEx )
 {
-    USHORT  nRot10 = rAttr.GetRotation() % 3600;
-    Point   aOutPtPix;
-    Size    aOutSzPix;
-    Size    aUnrotatedSzPix( pOut->LogicToPixel( rSz ) );
-    BOOL    bRet = FALSE;
+    USHORT	nRot10 = rAttr.GetRotation() % 3600;
+    Point	aOutPtPix;
+    Size	aOutSzPix;
+    Size	aUnrotatedSzPix( pOut->LogicToPixel( rSz ) );
+    BOOL	bRet = FALSE;
 
     if( nRot10 )
     {
@@ -422,29 +422,29 @@ BOOL GraphicManager::ImplCreateOutput( OutputDevice* pOut,
 
     if( aUnrotatedSzPix.Width() && aUnrotatedSzPix.Height() )
     {
-        BitmapEx        aBmpEx( rBmpEx );
-        BitmapEx        aOutBmpEx;
-        Point           aOutPt;
-        Size            aOutSz;
-        const Size&     rBmpSzPix = rBmpEx.GetSizePixel();
-        const long      nW = rBmpSzPix.Width();
-        const long      nH = rBmpSzPix.Height();
-        const long      nNewW = aUnrotatedSzPix.Width();
-        const long      nNewH = aUnrotatedSzPix.Height();
-        double          fTmp;
-        long*           pMapIX = new long[ nNewW ];
-        long*           pMapFX = new long[ nNewW ];
-        long*           pMapIY = new long[ nNewH ];
-        long*           pMapFY = new long[ nNewH ];
-        long            nStartX = -1, nStartY = -1, nEndX = -1, nEndY = -1;
-        long            nX, nY, nTmp, nTmpX, nTmpY;
-        BOOL            bHMirr = ( rAttr.GetMirrorFlags() & BMP_MIRROR_HORZ ) != 0;
-        BOOL            bVMirr = ( rAttr.GetMirrorFlags() & BMP_MIRROR_VERT ) != 0;
+        BitmapEx		aBmpEx( rBmpEx );
+        BitmapEx		aOutBmpEx;
+        Point			aOutPt;
+        Size			aOutSz;
+        const Size&		rBmpSzPix = rBmpEx.GetSizePixel();
+        const long		nW = rBmpSzPix.Width();
+        const long		nH = rBmpSzPix.Height();
+        const long		nNewW = aUnrotatedSzPix.Width();
+        const long		nNewH = aUnrotatedSzPix.Height();
+        double			fTmp;
+        long*			pMapIX = new long[ nNewW ];
+        long*			pMapFX = new long[ nNewW ];
+        long*			pMapIY = new long[ nNewH ];
+        long*			pMapFY = new long[ nNewH ];
+        long			nStartX = -1, nStartY = -1, nEndX = -1, nEndY = -1;
+        long			nX, nY, nTmp, nTmpX, nTmpY;
+        BOOL			bHMirr = ( rAttr.GetMirrorFlags() & BMP_MIRROR_HORZ ) != 0;
+        BOOL			bVMirr = ( rAttr.GetMirrorFlags() & BMP_MIRROR_VERT ) != 0;
 
         if( nFlags & GRFMGR_DRAW_BILINEAR )
         {
-            const double    fRevScaleX = ( nNewW > 1L ) ? ( (double) ( nW - 1L ) / ( nNewW - 1L ) ) : 0.0;
-            const double    fRevScaleY = ( nNewH > 1L ) ? ( (double) ( nH - 1L ) / ( nNewH - 1L ) ) : 0.0;
+            const double	fRevScaleX = ( nNewW > 1L ) ? ( (double) ( nW - 1L ) / ( nNewW - 1L ) ) : 0.0;
+            const double	fRevScaleY = ( nNewH > 1L ) ? ( (double) ( nH - 1L ) / ( nNewH - 1L ) ) : 0.0;
 
             // create horizontal mapping table
             for( nX = 0L, nTmpX = nW - 1L, nTmp = nW - 2L; nX < nNewW; nX++ )
@@ -471,8 +471,8 @@ BOOL GraphicManager::ImplCreateOutput( OutputDevice* pOut,
         else
         {
             // #98290# Use a different mapping for non-interpolating mode, to avoid missing rows/columns
-            const double    fRevScaleX = ( nNewW > 1L ) ? ( (double) nW / nNewW ) : 0.0;
-            const double    fRevScaleY = ( nNewH > 1L ) ? ( (double) nH / nNewH ) : 0.0;
+            const double	fRevScaleX = ( nNewW > 1L ) ? ( (double) nW / nNewW ) : 0.0;
+            const double	fRevScaleY = ( nNewH > 1L ) ? ( (double) nH / nNewH ) : 0.0;
 
             // create horizontal mapping table
             for( nX = 0L, nTmpX = nW - 1L, nTmp = nW - 2L; nX < nNewW; nX++ )
@@ -504,9 +504,9 @@ BOOL GraphicManager::ImplCreateOutput( OutputDevice* pOut,
         // calculate output sizes
         if( !pBmpEx )
         {
-            Point       aPt;
-            Rectangle   aOutRect( aPt, pOut->GetOutputSizePixel() );
-            Rectangle   aBmpRect( aOutPtPix, aOutSzPix );
+            Point		aPt;
+            Rectangle	aOutRect( aPt, pOut->GetOutputSizePixel() );
+            Rectangle	aBmpRect( aOutPtPix, aOutSzPix );
 
             if( pOut->GetOutDevType() == OUTDEV_WINDOW )
             {
@@ -646,7 +646,7 @@ BOOL GraphicManager::ImplCreateOutput( OutputDevice* pOut,
         const double fScaleY = 1.0;
 
         const MapMode& rPrefMapMode( rMtf.GetPrefMapMode() );
-        const Size&    rSizePix( pOut->LogicToPixel( aNewSize,
+        const Size&    rSizePix( pOut->LogicToPixel( aNewSize, 
                                                      rPrefMapMode ) );
 
         // taking care of font width default if scaling metafile.
@@ -929,17 +929,17 @@ BOOL GraphicManager::ImplCreateScaled( const BitmapEx& rBmpEx,
                                        long nStartX, long nEndX, long nStartY, long nEndY,
                                        BitmapEx& rOutBmpEx )
 {
-    Bitmap              aBmp( rBmpEx.GetBitmap() );
-    Bitmap              aOutBmp;
-    BitmapReadAccess*   pAcc = aBmp.AcquireReadAccess();
-    BitmapWriteAccess*  pWAcc;
-    BitmapColor         aCol0, aCol1, aColRes;
-    const long          nDstW = nEndX - nStartX + 1L;
-    const long          nDstH = nEndY - nStartY + 1L;
-    long                nX, nY, nTmpX, nTmpY, nTmpFX, nTmpFY;
-    long                nXDst, nYDst;
-    BYTE                cR0, cG0, cB0, cR1, cG1, cB1;
-    BOOL                bRet = FALSE;
+    Bitmap				aBmp( rBmpEx.GetBitmap() );
+    Bitmap				aOutBmp;
+    BitmapReadAccess*	pAcc = aBmp.AcquireReadAccess();
+    BitmapWriteAccess*	pWAcc;
+    BitmapColor			aCol0, aCol1, aColRes;
+    const long			nDstW = nEndX - nStartX + 1L;
+    const long			nDstH = nEndY - nStartY + 1L;
+    long				nX, nY, nTmpX, nTmpY, nTmpFX, nTmpFY;
+    long				nXDst, nYDst;
+    BYTE				cR0, cG0, cB0, cR1, cG1, cB1;
+    BOOL				bRet = FALSE;
 
     DBG_ASSERT( aBmp.GetSizePixel() == rBmpEx.GetSizePixel(),
                 "GraphicManager::ImplCreateScaled(): bmp size inconsistent" );
@@ -1021,8 +1021,8 @@ BOOL GraphicManager::ImplCreateScaled( const BitmapEx& rBmpEx,
             {
                 if( pAcc->GetScanlineFormat() == BMP_FORMAT_24BIT_TC_BGR )
                 {
-                    Scanline    pLine0, pLine1, pTmp0, pTmp1;
-                    long        nOff;
+                    Scanline	pLine0, pLine1, pTmp0, pTmp1;
+                    long		nOff;
 
                     for( nY = nStartY, nYDst = 0L; nY <= nEndY; nY++, nYDst++ )
                     {
@@ -1054,8 +1054,8 @@ BOOL GraphicManager::ImplCreateScaled( const BitmapEx& rBmpEx,
                 }
                 else if( pAcc->GetScanlineFormat() == BMP_FORMAT_24BIT_TC_RGB )
                 {
-                    Scanline    pLine0, pLine1, pTmp0, pTmp1;
-                    long        nOff;
+                    Scanline	pLine0, pLine1, pTmp0, pTmp1;
+                    long		nOff;
 
                     for( nY = nStartY, nYDst = 0L; nY <= nEndY; nY++, nYDst++ )
                     {
@@ -1132,8 +1132,8 @@ BOOL GraphicManager::ImplCreateScaled( const BitmapEx& rBmpEx,
             DBG_ASSERT( rBmpEx.GetAlpha().GetSizePixel() == rBmpEx.GetSizePixel(),
                         "GraphicManager::ImplCreateScaled(): alpha mask size inconsistent" );
 
-            AlphaMask   aAlpha( rBmpEx.GetAlpha() );
-            AlphaMask   aOutAlpha;
+            AlphaMask	aAlpha( rBmpEx.GetAlpha() );
+            AlphaMask	aOutAlpha;
 
             pAcc = aAlpha.AcquireReadAccess();
 
@@ -1160,12 +1160,12 @@ BOOL GraphicManager::ImplCreateScaled( const BitmapEx& rBmpEx,
                             {
                                 nTmpX = pMapIX[ nX ]; nTmpFX = pMapFX[ nX ];
 
-                                const long  nAlpha0 = pLine0[ nTmpX ];
-                                const long  nAlpha2 = pLine1[ nTmpX ];
-                                const long  nAlpha1 = pLine0[ ++nTmpX ];
-                                const long  nAlpha3 = pLine1[ nTmpX ];
-                                const long  n0 = MAP( nAlpha0, nAlpha1, nTmpFX );
-                                const long  n1 = MAP( nAlpha2, nAlpha3, nTmpFX );
+                                const long	nAlpha0 = pLine0[ nTmpX ];
+                                const long	nAlpha2 = pLine1[ nTmpX ];
+                                const long	nAlpha1 = pLine0[ ++nTmpX ];
+                                const long	nAlpha3 = pLine1[ nTmpX ];
+                                const long	n0 = MAP( nAlpha0, nAlpha1, nTmpFX );
+                                const long	n1 = MAP( nAlpha2, nAlpha3, nTmpFX );
 
                                 *pLineW++ = MAP( n0, n1, nTmpFY );
                             }
@@ -1183,13 +1183,13 @@ BOOL GraphicManager::ImplCreateScaled( const BitmapEx& rBmpEx,
                             {
                                 nTmpX = pMapIX[ nX ]; nTmpFX = pMapFX[ nX ];
 
-                                long        nAlpha0 = pAcc->GetPixel( nTmpY, nTmpX ).GetIndex();
-                                long        nAlpha1 = pAcc->GetPixel( nTmpY, ++nTmpX ).GetIndex();
-                                const long  n0 = MAP( nAlpha0, nAlpha1, nTmpFX );
+                                long		nAlpha0 = pAcc->GetPixel( nTmpY, nTmpX ).GetIndex();
+                                long		nAlpha1 = pAcc->GetPixel( nTmpY, ++nTmpX ).GetIndex();
+                                const long	n0 = MAP( nAlpha0, nAlpha1, nTmpFX );
 
                                 nAlpha1 = pAcc->GetPixel( ++nTmpY, nTmpX ).GetIndex();
                                 nAlpha0 = pAcc->GetPixel( nTmpY--, --nTmpX ).GetIndex();
-                                const long  n1 = MAP( nAlpha0, nAlpha1, nTmpFX );
+                                const long	n1 = MAP( nAlpha0, nAlpha1, nTmpFX );
 
                                 aAlphaValue.SetIndex( MAP( n0, n1, nTmpFY ) );
                                 pWAcc->SetPixel( nYDst, nXDst++, aAlphaValue );
@@ -1212,8 +1212,8 @@ BOOL GraphicManager::ImplCreateScaled( const BitmapEx& rBmpEx,
             DBG_ASSERT( rBmpEx.GetMask().GetSizePixel() == rBmpEx.GetSizePixel(),
                         "GraphicManager::ImplCreateScaled(): mask size inconsistent" );
 
-            Bitmap  aMsk( rBmpEx.GetMask() );
-            Bitmap  aOutMsk;
+            Bitmap	aMsk( rBmpEx.GetMask() );
+            Bitmap	aOutMsk;
 
             pAcc = aMsk.AcquireReadAccess();
 
@@ -1223,7 +1223,7 @@ BOOL GraphicManager::ImplCreateScaled( const BitmapEx& rBmpEx,
                 // bitmap. Otherwise, we'd have to color-map even the
                 // case below, when both masks are one bit deep.
                 if( pAcc->HasPalette() )
-                    aOutMsk = Bitmap( Size( nDstW, nDstH ),
+                    aOutMsk = Bitmap( Size( nDstW, nDstH ), 
                                       1,
                                       &pAcc->GetPalette() );
                 else
@@ -1329,26 +1329,26 @@ BOOL GraphicManager::ImplCreateRotatedScaled( const BitmapEx& rBmpEx,
                                               long nStartX, long nEndX, long nStartY, long nEndY,
                                               BitmapEx& rOutBmpEx )
 {
-    Point               aPt;
-    Bitmap              aBmp( rBmpEx.GetBitmap() );
-    Bitmap              aOutBmp;
-    BitmapReadAccess*   pAcc = aBmp.AcquireReadAccess();
-    BitmapWriteAccess*  pWAcc;
-    Polygon             aPoly( Rectangle( aPt, rUnrotatedSzPix ) ); aPoly.Rotate( Point(), nRot10 );
-    Rectangle           aNewBound( aPoly.GetBoundRect() );
-    const double        fCosAngle = cos( nRot10 * F_PI1800 ), fSinAngle = sin( nRot10 * F_PI1800 );
-    double              fTmp;
-    const long          nDstW = nEndX - nStartX + 1L;
-    const long          nDstH = nEndY - nStartY + 1L;
-    const long          nUnRotW = rUnrotatedSzPix.Width();
-    const long          nUnRotH = rUnrotatedSzPix.Height();
-    long*               pCosX = new long[ nDstW ];
-    long*               pSinX = new long[ nDstW ];
-    long*               pCosY = new long[ nDstH ];
-    long*               pSinY = new long[ nDstH ];
-    long                nX, nY, nTmpX, nTmpY, nTmpFX, nTmpFY, nUnRotX, nUnRotY, nSinY, nCosY;
-    BYTE                cR0, cG0, cB0, cR1, cG1, cB1;
-    BOOL                bRet = FALSE;
+    Point				aPt;
+    Bitmap				aBmp( rBmpEx.GetBitmap() );
+    Bitmap				aOutBmp;
+    BitmapReadAccess*	pAcc = aBmp.AcquireReadAccess();
+    BitmapWriteAccess*	pWAcc;
+    Polygon				aPoly( Rectangle( aPt, rUnrotatedSzPix ) ); aPoly.Rotate( Point(), nRot10 );
+    Rectangle			aNewBound( aPoly.GetBoundRect() );
+    const double		fCosAngle = cos( nRot10 * F_PI1800 ), fSinAngle = sin( nRot10 * F_PI1800 );
+    double				fTmp;
+    const long			nDstW = nEndX - nStartX + 1L;
+    const long			nDstH = nEndY - nStartY + 1L;
+    const long			nUnRotW = rUnrotatedSzPix.Width();
+    const long			nUnRotH = rUnrotatedSzPix.Height();
+    long*				pCosX = new long[ nDstW ];
+    long*				pSinX = new long[ nDstW ];
+    long*				pCosY = new long[ nDstH ];
+    long*				pSinY = new long[ nDstH ];
+    long				nX, nY, nTmpX, nTmpY, nTmpFX, nTmpFY, nUnRotX, nUnRotY, nSinY, nCosY;
+    BYTE				cR0, cG0, cB0, cR1, cG1, cB1;
+    BOOL				bRet = FALSE;
 
     // create horizontal mapping table
     for( nX = 0L, nTmpX = aNewBound.Left() + nStartX; nX < nDstW; nX++ )
@@ -1413,7 +1413,7 @@ BOOL GraphicManager::ImplCreateRotatedScaled( const BitmapEx& rBmpEx,
             }
             else
             {
-                BitmapColor aCol0, aCol1;
+                BitmapColor	aCol0, aCol1;
 
                 for( nY = 0; nY < nDstH; nY++ )
                 {
@@ -1466,8 +1466,8 @@ BOOL GraphicManager::ImplCreateRotatedScaled( const BitmapEx& rBmpEx,
 
         if( rBmpEx.IsAlpha() )
         {
-            AlphaMask   aAlpha( rBmpEx.GetAlpha() );
-            AlphaMask   aOutAlpha;
+            AlphaMask	aAlpha( rBmpEx.GetAlpha() );
+            AlphaMask	aOutAlpha;
 
             pAcc = aAlpha.AcquireReadAccess();
 
@@ -1502,12 +1502,12 @@ BOOL GraphicManager::ImplCreateRotatedScaled( const BitmapEx& rBmpEx,
                                     pLine0 = pAcc->GetScanline( nTmpY++ );
                                     pLine1 = pAcc->GetScanline( nTmpY );
 
-                                    const long  nAlpha0 = pLine0[ nTmpX ];
-                                    const long  nAlpha2 = pLine1[ nTmpX++ ];
-                                    const long  nAlpha1 = pLine0[ nTmpX ];
-                                    const long  nAlpha3 = pLine1[ nTmpX ];
-                                    const long  n0 = MAP( nAlpha0, nAlpha1, nTmpFX );
-                                    const long  n1 = MAP( nAlpha2, nAlpha3, nTmpFX );
+                                    const long	nAlpha0 = pLine0[ nTmpX ];
+                                    const long	nAlpha2 = pLine1[ nTmpX++ ];
+                                    const long	nAlpha1 = pLine0[ nTmpX ];
+                                    const long	nAlpha3 = pLine1[ nTmpX ];
+                                    const long	n0 = MAP( nAlpha0, nAlpha1, nTmpFX );
+                                    const long	n1 = MAP( nAlpha2, nAlpha3, nTmpFX );
 
                                     *pLineW++ = MAP( n0, n1, nTmpFY );
                                 }
@@ -1518,8 +1518,8 @@ BOOL GraphicManager::ImplCreateRotatedScaled( const BitmapEx& rBmpEx,
                     }
                     else
                     {
-                        const BitmapColor   aTrans( pWAcc->GetBestMatchingColor( Color( COL_WHITE ) ) );
-                        BitmapColor         aAlphaVal( 0 );
+                        const BitmapColor	aTrans( pWAcc->GetBestMatchingColor( Color( COL_WHITE ) ) );
+                        BitmapColor			aAlphaVal( 0 );
 
                         for( nY = 0; nY < nDstH; nY++ )
                         {
@@ -1536,12 +1536,12 @@ BOOL GraphicManager::ImplCreateRotatedScaled( const BitmapEx& rBmpEx,
                                     nTmpX = pMapIX[ nUnRotX ]; nTmpFX = pMapFX[ nUnRotX ];
                                     nTmpY = pMapIY[ nUnRotY ], nTmpFY = pMapFY[ nUnRotY ];
 
-                                    const long  nAlpha0 = pAcc->GetPixel( nTmpY, nTmpX ).GetIndex();
-                                    const long  nAlpha1 = pAcc->GetPixel( nTmpY, ++nTmpX ).GetIndex();
-                                    const long  nAlpha3 = pAcc->GetPixel( ++nTmpY, nTmpX ).GetIndex();
-                                    const long  nAlpha2 = pAcc->GetPixel( nTmpY, --nTmpX ).GetIndex();
-                                    const long  n0 = MAP( nAlpha0, nAlpha1, nTmpFX );
-                                    const long  n1 = MAP( nAlpha2, nAlpha3, nTmpFX );
+                                    const long	nAlpha0 = pAcc->GetPixel( nTmpY, nTmpX ).GetIndex();
+                                    const long	nAlpha1 = pAcc->GetPixel( nTmpY, ++nTmpX ).GetIndex();
+                                    const long	nAlpha3 = pAcc->GetPixel( ++nTmpY, nTmpX ).GetIndex();
+                                    const long	nAlpha2 = pAcc->GetPixel( nTmpY, --nTmpX ).GetIndex();
+                                    const long 	n0 = MAP( nAlpha0, nAlpha1, nTmpFX );
+                                    const long 	n1 = MAP( nAlpha2, nAlpha3, nTmpFX );
 
                                     aAlphaVal.SetIndex( MAP( n0, n1, nTmpFY ) );
                                     pWAcc->SetPixel( nY, nX, aAlphaVal );
@@ -1569,16 +1569,16 @@ BOOL GraphicManager::ImplCreateRotatedScaled( const BitmapEx& rBmpEx,
 
             if( pWAcc )
             {
-                Bitmap              aMsk( rBmpEx.GetMask() );
-                const BitmapColor   aB( pWAcc->GetBestMatchingColor( Color( COL_BLACK ) ) );
-                const BitmapColor   aW( pWAcc->GetBestMatchingColor( Color( COL_WHITE ) ) );
-                BitmapReadAccess*   pMAcc = NULL;
+                Bitmap				aMsk( rBmpEx.GetMask() );
+                const BitmapColor	aB( pWAcc->GetBestMatchingColor( Color( COL_BLACK ) ) );
+                const BitmapColor	aW( pWAcc->GetBestMatchingColor( Color( COL_WHITE ) ) );
+                BitmapReadAccess*	pMAcc = NULL;
 
                 if( !aMsk || ( ( pMAcc = aMsk.AcquireReadAccess() ) != NULL ) )
                 {
-                    long*       pMapLX = new long[ nUnRotW ];
-                    long*       pMapLY = new long[ nUnRotH ];
-                    BitmapColor aTestB;
+                    long*		pMapLX = new long[ nUnRotW ];
+                    long*		pMapLY = new long[ nUnRotH ];
+                    BitmapColor	aTestB;
 
                     if( pMAcc )
                         aTestB = pMAcc->GetBestMatchingColor( Color( COL_BLACK ) );
@@ -1699,8 +1699,8 @@ void GraphicManager::ImplAdjust( BitmapEx& rBmpEx, const GraphicAttr& rAttr, ULO
 
     if( ( nAdjustmentFlags & ADJUSTMENT_TRANSPARENCY ) && aAttr.IsTransparent() )
     {
-        AlphaMask   aAlpha;
-        BYTE        cTrans = aAttr.GetTransparency();
+        AlphaMask	aAlpha;
+        BYTE		cTrans = aAttr.GetTransparency();
 
         if( !rBmpEx.IsTransparent() )
             aAlpha = AlphaMask( rBmpEx.GetSizePixel(), &cTrans );
@@ -1716,8 +1716,8 @@ void GraphicManager::ImplAdjust( BitmapEx& rBmpEx, const GraphicAttr& rAttr, ULO
 
             if( pA )
             {
-                ULONG       nTrans = cTrans, nNewTrans;
-                const long  nWidth = pA->Width(), nHeight = pA->Height();
+                ULONG		nTrans = cTrans, nNewTrans;
+                const long	nWidth = pA->Width(), nHeight = pA->Height();
 
                 if( pA->GetScanlineFormat() == BMP_FORMAT_8BIT_PAL )
                 {
@@ -1866,9 +1866,9 @@ void GraphicManager::ImplAdjust( Animation& rAnimation, const GraphicAttr& rAttr
 void GraphicManager::ImplDraw( OutputDevice* pOut, const Point& rPt, const Size& rSz,
                                const GDIMetaFile& rMtf, const GraphicAttr& rAttr )
 {
-       USHORT   nRot10 = rAttr.GetRotation() % 3600;
-    Point   aOutPt( rPt );
-    Size    aOutSz( rSz );
+       USHORT	nRot10 = rAttr.GetRotation() % 3600;
+    Point	aOutPt( rPt );
+    Size	aOutSz( rSz );
 
     if( nRot10 )
     {
@@ -1896,7 +1896,7 @@ struct ImplTileInfo
 {
     ImplTileInfo() : aTileTopLeft(), aNextTileTopLeft(), aTileSizePixel(), nTilesEmptyX(0), nTilesEmptyY(0) {}
 
-    Point aTileTopLeft;     // top, left position of the rendered tile
+    Point aTileTopLeft;   	// top, left position of the rendered tile
     Point aNextTileTopLeft; // top, left position for next recursion
                             // level's tile
     Size  aTileSizePixel;   // size of the generated tile (might
@@ -1909,7 +1909,7 @@ struct ImplTileInfo
                             // required area coverage is often
                             // less. The extraneous area covered is
                             // later overwritten by the next stage)
-    int   nTilesEmptyX;     // number of original tiles empty right of
+    int	  nTilesEmptyX;     // number of original tiles empty right of
                             // this tile. This counts from
                             // aNextTileTopLeft, i.e. the additional
                             // area covered by aTileSizePixel is not
@@ -1917,13 +1917,13 @@ struct ImplTileInfo
                             // unification purposes, as the iterative
                             // calculation of the next level's empty
                             // tiles has to be based on this value.
-    int   nTilesEmptyY;     // as above, for Y
+    int	  nTilesEmptyY;     // as above, for Y
 };
 
 
-bool GraphicObject::ImplRenderTempTile( VirtualDevice& rVDev, int nExponent,
-                                        int nNumTilesX, int nNumTilesY,
-                                        const Size& rTileSizePixel,
+bool GraphicObject::ImplRenderTempTile( VirtualDevice& rVDev, int nExponent, 
+                                        int nNumTilesX, int nNumTilesY, 
+                                        const Size& rTileSizePixel, 
                                         const GraphicAttr* pAttr, ULONG nFlags )
 {
     if( nExponent <= 1 )
@@ -1932,7 +1932,7 @@ bool GraphicObject::ImplRenderTempTile( VirtualDevice& rVDev, int nExponent,
     // determine MSB factor
     int nMSBFactor( 1 );
     while( nNumTilesX / nMSBFactor != 0 ||
-           nNumTilesY / nMSBFactor != 0 )
+           nNumTilesY / nMSBFactor != 0 ) 
     {
         nMSBFactor *= nExponent;
     }
@@ -1947,7 +1947,7 @@ bool GraphicObject::ImplRenderTempTile( VirtualDevice& rVDev, int nExponent,
     BOOL bOldMap( rVDev.IsMapModeEnabled() );
     rVDev.EnableMapMode( FALSE );
 
-    bool bRet( ImplRenderTileRecursive( rVDev, nExponent, nMSBFactor, nNumTilesX, nNumTilesY,
+    bool bRet( ImplRenderTileRecursive( rVDev, nExponent, nMSBFactor, nNumTilesX, nNumTilesY, 
                                         nNumTilesX, nNumTilesY, rTileSizePixel, pAttr, nFlags, aTileInfo ) );
 
     rVDev.EnableMapMode( bOldMap );
@@ -1965,9 +1965,9 @@ bool GraphicObject::ImplRenderTempTile( VirtualDevice& rVDev, int nExponent,
 // size is given by the decimal place of the corresponding decimal
 // representation.
 bool GraphicObject::ImplRenderTileRecursive( VirtualDevice& rVDev, int nExponent, int nMSBFactor,
-                                             int nNumOrigTilesX, int nNumOrigTilesY,
-                                             int nRemainderTilesX, int nRemainderTilesY,
-                                             const Size& rTileSizePixel, const GraphicAttr* pAttr,
+                                             int nNumOrigTilesX, int nNumOrigTilesY, 
+                                             int nRemainderTilesX, int nRemainderTilesY, 
+                                             const Size& rTileSizePixel, const GraphicAttr* pAttr, 
                                              ULONG nFlags, ImplTileInfo& rTileInfo )
 {
     // gets loaded with our tile bitmap
@@ -1989,7 +1989,7 @@ bool GraphicObject::ImplRenderTileRecursive( VirtualDevice& rVDev, int nExponent
     ImplTileInfo aTileInfo;
 
     // current output position while drawing
-    Point aCurrPos;
+    Point aCurrPos;    
     int nX, nY;
 
     // check for recursion's end condition: LSB place reached?
@@ -2002,23 +2002,23 @@ bool GraphicObject::ImplRenderTileRecursive( VirtualDevice& rVDev, int nExponent
         aTileInfo.nTilesEmptyX = nNumOrigTilesX;
         aTileInfo.nTilesEmptyY = nNumOrigTilesY;
     }
-    else if( ImplRenderTileRecursive( rVDev, nExponent, nMSBFactor/nExponent,
-                                      nNumOrigTilesX, nNumOrigTilesY,
-                                      nNewRemainderX, nNewRemainderY,
+    else if( ImplRenderTileRecursive( rVDev, nExponent, nMSBFactor/nExponent, 
+                                      nNumOrigTilesX, nNumOrigTilesY, 
+                                      nNewRemainderX, nNewRemainderY, 
                                       rTileSizePixel, pAttr, nFlags, aTileInfo ) )
     {
         // extract generated tile -> see comment on the first loop below
         BitmapEx aTileBitmap( rVDev.GetBitmap( aTileInfo.aTileTopLeft, aTileInfo.aTileSizePixel ) );
-
+        
         aTmpGraphic = GraphicObject( aTileBitmap );
 
         // fill stripes left over from upstream levels:
-        //
+        //  
         //  x0000
         //  0
         //  0
         //  0
-        //  0
+        //  0        
         //
         // where x denotes the place filled by our recursive predecessors
 
@@ -2039,12 +2039,12 @@ bool GraphicObject::ImplRenderTileRecursive( VirtualDevice& rVDev, int nExponent
             {
                 if( !aTmpGraphic.Draw( &rVDev, aCurrPos, aTileInfo.aTileSizePixel, pAttr, nFlags ) )
                     return false;
-
+            
                 aCurrPos.X() += aTileInfo.aTileSizePixel.Width();
             }
 
 #ifdef DBG_TEST
-//          rVDev.SetFillColor( COL_WHITE );
+//    		rVDev.SetFillColor( COL_WHITE );
             rVDev.SetFillColor();
             rVDev.SetLineColor( Color( 255 * nExponent / nMSBFactor, 255 - 255 * nExponent / nMSBFactor, 128 - 255 * nExponent / nMSBFactor ) );
             rVDev.DrawEllipse( Rectangle(aTileInfo.aNextTileTopLeft.X(), aTileInfo.aTileTopLeft.Y(),
@@ -2094,13 +2094,13 @@ bool GraphicObject::ImplRenderTileRecursive( VirtualDevice& rVDev, int nExponent
     nRemainderTilesY -= nNewRemainderY;
 
     // fill tile info for calling method
-    rTileInfo.aTileTopLeft     = aTileInfo.aNextTileTopLeft;
+    rTileInfo.aTileTopLeft 	   = aTileInfo.aNextTileTopLeft;
     rTileInfo.aNextTileTopLeft = Point( rTileInfo.aTileTopLeft.X() + rTileSizePixel.Width()*nRemainderTilesX,
                                         rTileInfo.aTileTopLeft.Y() + rTileSizePixel.Height()*nRemainderTilesY );
     rTileInfo.aTileSizePixel   = Size( rTileSizePixel.Width()*nMSBFactor*nExponent,
                                        rTileSizePixel.Height()*nMSBFactor*nExponent );
-    rTileInfo.nTilesEmptyX     = aTileInfo.nTilesEmptyX - nRemainderTilesX;
-    rTileInfo.nTilesEmptyY     = aTileInfo.nTilesEmptyY - nRemainderTilesY;
+    rTileInfo.nTilesEmptyX	   = aTileInfo.nTilesEmptyX - nRemainderTilesX;
+    rTileInfo.nTilesEmptyY	   = aTileInfo.nTilesEmptyY - nRemainderTilesY;
 
     // init output position
     aCurrPos = aTileInfo.aNextTileTopLeft;
@@ -2131,8 +2131,8 @@ bool GraphicObject::ImplRenderTileRecursive( VirtualDevice& rVDev, int nExponent
 //  rVDev.SetFillColor( COL_WHITE );
     rVDev.SetFillColor();
     rVDev.SetLineColor( Color( 255 * nExponent / nMSBFactor, 255 - 255 * nExponent / nMSBFactor, 128 - 255 * nExponent / nMSBFactor ) );
-    rVDev.DrawRect( Rectangle((rTileInfo.aTileTopLeft.X())*rTileSizePixel.Width(),
-                              (rTileInfo.aTileTopLeft.Y())*rTileSizePixel.Height(),
+    rVDev.DrawRect( Rectangle((rTileInfo.aTileTopLeft.X())*rTileSizePixel.Width(), 
+                              (rTileInfo.aTileTopLeft.Y())*rTileSizePixel.Height(), 
                               (rTileInfo.aNextTileTopLeft.X())*rTileSizePixel.Width()-1,
                               (rTileInfo.aNextTileTopLeft.Y())*rTileSizePixel.Height()-1) );
 #endif
@@ -2148,68 +2148,68 @@ bool GraphicObject::ImplDrawTiled( OutputDevice* pOut, const Rectangle& rArea, c
     // how many tiles to generate per recursion step
     enum{ SubdivisionExponent=2 };
 
-    const MapMode   aOutMapMode( pOut->GetMapMode() );
-    const MapMode   aMapMode( aOutMapMode.GetMapUnit(), Point(), aOutMapMode.GetScaleX(), aOutMapMode.GetScaleY() );
-    bool            bRet( false );
+    const MapMode 	aOutMapMode( pOut->GetMapMode() );
+    const MapMode	aMapMode( aOutMapMode.GetMapUnit(), Point(), aOutMapMode.GetScaleX(), aOutMapMode.GetScaleY() );
+    bool 			bRet( false );
 
     // #i42643# Casting to Int64, to avoid integer overflow for
     // huge-DPI output devices
     if( GetGraphic().GetType() == GRAPHIC_BITMAP &&
-        static_cast<sal_Int64>(rSizePixel.Width()) * rSizePixel.Height() <
+        static_cast<sal_Int64>(rSizePixel.Width()) * rSizePixel.Height() < 
         static_cast<sal_Int64>(nTileCacheSize1D)*nTileCacheSize1D )
     {
         // First combine very small bitmaps into a larger tile
         // ===================================================
 
-        VirtualDevice   aVDev;
-        const int       nNumTilesInCacheX( (nTileCacheSize1D + rSizePixel.Width()-1) / rSizePixel.Width() );
-        const int       nNumTilesInCacheY( (nTileCacheSize1D + rSizePixel.Height()-1) / rSizePixel.Height() );
+        VirtualDevice	aVDev;
+        const int		nNumTilesInCacheX( (nTileCacheSize1D + rSizePixel.Width()-1) / rSizePixel.Width() );
+        const int		nNumTilesInCacheY( (nTileCacheSize1D + rSizePixel.Height()-1) / rSizePixel.Height() );
 
-        aVDev.SetOutputSizePixel( Size( nNumTilesInCacheX*rSizePixel.Width(),
+        aVDev.SetOutputSizePixel( Size( nNumTilesInCacheX*rSizePixel.Width(), 
                                         nNumTilesInCacheY*rSizePixel.Height() ) );
         aVDev.SetMapMode( aMapMode );
 
         // draw bitmap content
-        if( ImplRenderTempTile( aVDev, SubdivisionExponent, nNumTilesInCacheX,
+        if( ImplRenderTempTile( aVDev, SubdivisionExponent, nNumTilesInCacheX, 
                                 nNumTilesInCacheY, rSizePixel, pAttr, nFlags ) )
         {
             BitmapEx aTileBitmap( aVDev.GetBitmap( Point(0,0), aVDev.GetOutputSize() ) );
-
+            
             // draw alpha content, if any
             if( IsTransparent() )
             {
                 GraphicObject aAlphaGraphic;
-
+                
                 if( GetGraphic().IsAlpha() )
                     aAlphaGraphic.SetGraphic( GetGraphic().GetBitmapEx().GetAlpha().GetBitmap() );
                 else
-                    aAlphaGraphic.SetGraphic( GetGraphic().GetBitmapEx().GetMask() );
-
-                if( aAlphaGraphic.ImplRenderTempTile( aVDev, SubdivisionExponent, nNumTilesInCacheX,
+                    aAlphaGraphic.SetGraphic( GetGraphic().GetBitmapEx().GetMask() ); 
+                
+                if( aAlphaGraphic.ImplRenderTempTile( aVDev, SubdivisionExponent, nNumTilesInCacheX, 
                                                       nNumTilesInCacheY, rSizePixel, pAttr, nFlags ) )
-                {
+                {                
                     // Combine bitmap and alpha/mask
                     if( GetGraphic().IsAlpha() )
-                        aTileBitmap = BitmapEx( aTileBitmap.GetBitmap(),
+                        aTileBitmap = BitmapEx( aTileBitmap.GetBitmap(), 
                                                 AlphaMask( aVDev.GetBitmap( Point(0,0), aVDev.GetOutputSize() ) ) );
                     else
-                        aTileBitmap = BitmapEx( aTileBitmap.GetBitmap(),
+                        aTileBitmap = BitmapEx( aTileBitmap.GetBitmap(), 
                                                 aVDev.GetBitmap( Point(0,0), aVDev.GetOutputSize() ).CreateMask( Color(COL_WHITE) ) );
                 }
             }
-
+            
             // paint generated tile
             GraphicObject aTmpGraphic( aTileBitmap );
-            bRet = aTmpGraphic.ImplDrawTiled( pOut, rArea,
-                                              aTileBitmap.GetSizePixel(),
+            bRet = aTmpGraphic.ImplDrawTiled( pOut, rArea, 
+                                              aTileBitmap.GetSizePixel(), 
                                               rOffset, pAttr, nFlags, nTileCacheSize1D );
         }
     }
     else
     {
-        const Size      aOutOffset( pOut->LogicToPixel( rOffset, aOutMapMode ) );
-        const Rectangle aOutArea( pOut->LogicToPixel( rArea, aOutMapMode ) );
-
+        const Size		aOutOffset( pOut->LogicToPixel( rOffset, aOutMapMode ) );
+        const Rectangle	aOutArea( pOut->LogicToPixel( rArea, aOutMapMode ) );
+        
         // number of invisible (because out-of-area) tiles
         int nInvisibleTilesX;
         int nInvisibleTilesY;
@@ -2252,17 +2252,17 @@ bool GraphicObject::ImplDrawTiled( OutputDevice* pOut, const Rectangle& rArea, c
 
 // -----------------------------------------------------------------------------
 
-bool GraphicObject::ImplDrawTiled( OutputDevice& rOut, const Point& rPosPixel,
-                                   int nNumTilesX, int nNumTilesY,
+bool GraphicObject::ImplDrawTiled( OutputDevice& rOut, const Point& rPosPixel, 
+                                   int nNumTilesX, int nNumTilesY, 
                                    const Size& rTileSizePixel, const GraphicAttr* pAttr, ULONG nFlags )
 {
-    Point   aCurrPos( rPosPixel );
-    Size    aTileSizeLogic( rOut.PixelToLogic( rTileSizePixel ) );
-    int     nX, nY;
+    Point 	aCurrPos( rPosPixel );
+    Size	aTileSizeLogic( rOut.PixelToLogic( rTileSizePixel ) );
+    int 	nX, nY;
 
     // #107607# Use logical coordinates for metafile playing, too
-    bool    bDrawInPixel( rOut.GetConnectMetaFile() == NULL && GRAPHIC_BITMAP == GetType() );
-    BOOL    bRet( FALSE );
+    bool	bDrawInPixel( rOut.GetConnectMetaFile() == NULL && GRAPHIC_BITMAP == GetType() );
+    BOOL	bRet( FALSE );
 
     // #105229# Switch off mapping (converting to logic and back to
     // pixel might cause roundoff errors)
@@ -2283,9 +2283,9 @@ bool GraphicObject::ImplDrawTiled( OutputDevice& rOut, const Point& rPosPixel,
 
             // update return value. This method should return true, if
             // at least one of the looped Draws succeeded.
-            bRet |= Draw( &rOut,
-                          bDrawInPixel ? aCurrPos : rOut.PixelToLogic( aCurrPos ),
-                          bDrawInPixel ? rTileSizePixel : aTileSizeLogic,
+            bRet |= Draw( &rOut, 
+                          bDrawInPixel ? aCurrPos : rOut.PixelToLogic( aCurrPos ), 
+                          bDrawInPixel ? rTileSizePixel : aTileSizeLogic, 
                           pAttr, nFlags );
 
             aCurrPos.X() += rTileSizePixel.Width();
@@ -2302,13 +2302,13 @@ bool GraphicObject::ImplDrawTiled( OutputDevice& rOut, const Point& rPosPixel,
 
 // -----------------------------------------------------------------------------
 
-void GraphicObject::ImplTransformBitmap( BitmapEx&          rBmpEx,
+void GraphicObject::ImplTransformBitmap( BitmapEx& 			rBmpEx,
                                          const GraphicAttr& rAttr,
-                                         const Size&        rCropLeftTop,
-                                         const Size&        rCropRightBottom,
-                                         const Rectangle&   rCropRect,
-                                         const Size&        rDstSize,
-                                         BOOL               bEnlarge ) const
+                                         const Size&		rCropLeftTop,
+                                         const Size&		rCropRightBottom,
+                                         const Rectangle&	rCropRect,
+                                         const Size& 		rDstSize,
+                                         BOOL				bEnlarge ) const
 {
     // #107947# Extracted from svdograf.cxx
 
@@ -2331,7 +2331,7 @@ void GraphicObject::ImplTransformBitmap( BitmapEx&          rBmpEx,
             sal_Int32 nPadTotalHeight( aBmpSize.Height() + nPadTop + (rCropRightBottom.Height() < 0 ? -rCropRightBottom.Height() : 0) );
 
             BitmapEx aBmpEx2;
-
+                
             if( rBmpEx.IsTransparent() )
             {
                 if( rBmpEx.IsAlpha() )
@@ -2359,8 +2359,8 @@ void GraphicObject::ImplTransformBitmap( BitmapEx&          rBmpEx,
         }
     }
 
-    const Size  aSizePixel( rBmpEx.GetSizePixel() );
-
+    const Size 	aSizePixel( rBmpEx.GetSizePixel() );
+            
     if( rAttr.GetRotation() != 0 && !IsAnimated() )
     {
         if( aSizePixel.Width() && aSizePixel.Height() && rDstSize.Width() && rDstSize.Height() )
diff --git a/svtools/source/graphic/provider.cxx b/svtools/source/graphic/provider.cxx
index fbf95406a63a..3311ddd24dbe 100644
--- a/svtools/source/graphic/provider.cxx
+++ b/svtools/source/graphic/provider.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
@@ -77,7 +77,7 @@ GraphicProvider::~GraphicProvider()
 }
 
 // ------------------------------------------------------------------------------
-
+    
 ::rtl::OUString GraphicProvider::getImplementationName_Static()
     throw()
 {
@@ -90,15 +90,15 @@ uno::Sequence< ::rtl::OUString > GraphicProvider::getSupportedServiceNames_Stati
     throw()
 {
     uno::Sequence< ::rtl::OUString > aSeq( 1 );
-
+    
     aSeq.getArray()[ 0 ] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.graphic.GraphicProvider" ) );
-
+    
     return aSeq;
 }
 
 // ------------------------------------------------------------------------------
-
-::rtl::OUString SAL_CALL GraphicProvider::getImplementationName()
+    
+::rtl::OUString SAL_CALL GraphicProvider::getImplementationName() 
     throw( uno::RuntimeException )
 {
     return getImplementationName_Static();
@@ -106,11 +106,11 @@ uno::Sequence< ::rtl::OUString > GraphicProvider::getSupportedServiceNames_Stati
 
 // ------------------------------------------------------------------------------
 
-sal_Bool SAL_CALL GraphicProvider::supportsService( const ::rtl::OUString& ServiceName )
+sal_Bool SAL_CALL GraphicProvider::supportsService( const ::rtl::OUString& ServiceName ) 
     throw( uno::RuntimeException )
 {
-    uno::Sequence< ::rtl::OUString >    aSNL( getSupportedServiceNames() );
-    const ::rtl::OUString*              pArray = aSNL.getConstArray();
+    uno::Sequence< ::rtl::OUString >	aSNL( getSupportedServiceNames() );
+    const ::rtl::OUString*				pArray = aSNL.getConstArray();
 
     for( int i = 0; i < aSNL.getLength(); i++ )
         if( pArray[i] == ServiceName )
@@ -121,7 +121,7 @@ sal_Bool SAL_CALL GraphicProvider::supportsService( const ::rtl::OUString& Servi
 
 // ------------------------------------------------------------------------------
 
-uno::Sequence< ::rtl::OUString > SAL_CALL GraphicProvider::getSupportedServiceNames()
+uno::Sequence< ::rtl::OUString > SAL_CALL GraphicProvider::getSupportedServiceNames() 
     throw( uno::RuntimeException )
 {
     return getSupportedServiceNames_Static();
@@ -129,11 +129,11 @@ uno::Sequence< ::rtl::OUString > SAL_CALL GraphicProvider::getSupportedServiceNa
 
 // ------------------------------------------------------------------------------
 
-uno::Sequence< uno::Type > SAL_CALL GraphicProvider::getTypes()
+uno::Sequence< uno::Type > SAL_CALL GraphicProvider::getTypes() 
     throw(uno::RuntimeException)
 {
-    uno::Sequence< uno::Type >  aTypes( 3 );
-    uno::Type*                  pTypes = aTypes.getArray();
+    uno::Sequence< uno::Type >	aTypes( 3 );
+    uno::Type* 					pTypes = aTypes.getArray();
 
     *pTypes++ = ::getCppuType((const uno::Reference< lang::XServiceInfo>*)0);
     *pTypes++ = ::getCppuType((const uno::Reference< lang::XTypeProvider>*)0);
@@ -144,18 +144,18 @@ uno::Sequence< uno::Type > SAL_CALL GraphicProvider::getTypes()
 
 // ------------------------------------------------------------------------------
 
-uno::Sequence< sal_Int8 > SAL_CALL GraphicProvider::getImplementationId()
+uno::Sequence< sal_Int8 > SAL_CALL GraphicProvider::getImplementationId() 
     throw(uno::RuntimeException)
 {
-    vos::OGuard                         aGuard( Application::GetSolarMutex() );
-    static uno::Sequence< sal_Int8 >    aId;
-
+    vos::OGuard 						aGuard( Application::GetSolarMutex() );
+    static uno::Sequence< sal_Int8 >	aId;
+    
     if( aId.getLength() == 0 )
     {
         aId.realloc( 16 );
         rtl_createUuid( reinterpret_cast< sal_uInt8* >( aId.getArray() ), 0, sal_True );
     }
-
+    
     return aId;
 }
 
@@ -163,14 +163,14 @@ uno::Sequence< sal_Int8 > SAL_CALL GraphicProvider::getImplementationId()
 
 uno::Reference< ::graphic::XGraphic > GraphicProvider::implLoadGraphicObject( const ::rtl::OUString& rResourceURL ) const
 {
-    uno::Reference< ::graphic::XGraphic >   xRet;
-    if( rResourceURL.compareToAscii( UNO_NAME_GRAPHOBJ_URLPREFIX, RTL_CONSTASCII_LENGTH( UNO_NAME_GRAPHOBJ_URLPREFIX ) ) == 0 )
+    uno::Reference< ::graphic::XGraphic > 	xRet;
+    if( rResourceURL.compareToAscii( UNO_NAME_GRAPHOBJ_URLPREFIX, RTL_CONSTASCII_LENGTH( UNO_NAME_GRAPHOBJ_URLPREFIX ) ) == 0 ) 
     {
         // graphic manager url
         String aTmpStr( rResourceURL.copy( sizeof( UNO_NAME_GRAPHOBJ_URLPREFIX ) - 1 ) );
         ByteString aUniqueID( aTmpStr, RTL_TEXTENCODING_UTF8 );
-        GraphicObject aGrafObj( aUniqueID );
-        // I don't call aGrafObj.GetXGraphic because it will call us back
+        GraphicObject aGrafObj( aUniqueID );	
+        // I don't call aGrafObj.GetXGraphic because it will call us back 		
         // into implLoadMemory ( with "private:memorygraphic" test )
         ::unographic::Graphic* pUnoGraphic = new ::unographic::Graphic;
         pUnoGraphic->init( aGrafObj.GetGraphic() );
@@ -181,22 +181,22 @@ uno::Reference< ::graphic::XGraphic > GraphicProvider::implLoadGraphicObject( co
 
 uno::Reference< ::graphic::XGraphic > GraphicProvider::implLoadMemory( const ::rtl::OUString& rResourceURL ) const
 {
-    uno::Reference< ::graphic::XGraphic >   xRet;
-    sal_Int32                               nIndex = 0;
-
+    uno::Reference< ::graphic::XGraphic > 	xRet;
+    sal_Int32								nIndex = 0;
+    
     if( ( 0 == rResourceURL.getToken( 0, '/', nIndex ).compareToAscii( "private:memorygraphic" ) ) )
     {
         sal_Int64 nGraphicAddress = rResourceURL.getToken( 0, '/', nIndex ).toInt64();
-
+        
         if( nGraphicAddress )
         {
             ::unographic::Graphic* pUnoGraphic = new ::unographic::Graphic;
-
+                    
             pUnoGraphic->init( *reinterpret_cast< ::Graphic* >( nGraphicAddress ) );
             xRet = pUnoGraphic;
         }
     }
-
+    
     return xRet;
 }
 
@@ -204,8 +204,8 @@ uno::Reference< ::graphic::XGraphic > GraphicProvider::implLoadMemory( const ::r
 
 uno::Reference< ::graphic::XGraphic > GraphicProvider::implLoadRepositoryImage( const ::rtl::OUString& rResourceURL ) const
 {
-    uno::Reference< ::graphic::XGraphic >   xRet;
-    sal_Int32                               nIndex = 0;
+    uno::Reference< ::graphic::XGraphic > 	xRet;
+    sal_Int32								nIndex = 0;
 
     if( ( 0 == rResourceURL.getToken( 0, '/', nIndex ).compareToAscii( "private:graphicrepository" ) ) )
     {
@@ -225,25 +225,25 @@ uno::Reference< ::graphic::XGraphic > GraphicProvider::implLoadRepositoryImage(
 
 uno::Reference< ::graphic::XGraphic > GraphicProvider::implLoadStandardImage( const ::rtl::OUString& rResourceURL ) const
 {
-    uno::Reference< ::graphic::XGraphic >   xRet;
-    sal_Int32                               nIndex = 0;
+    uno::Reference< ::graphic::XGraphic > 	xRet;
+    sal_Int32								nIndex = 0;
 
     if( ( 0 == rResourceURL.getToken( 0, '/', nIndex ).compareToAscii( "private:standardimage" ) ) )
     {
         rtl::OUString sImageName( rResourceURL.copy( nIndex ) );
-        if ( sImageName.compareToAscii( "info" ) )
+        if ( sImageName.equalsAscii( "info" ) )
         {
             xRet = InfoBox::GetStandardImage().GetXGraphic();
         }
-        else if ( sImageName.compareToAscii( "warning" ) )
+        else if ( sImageName.equalsAscii( "warning" ) )
         {
             xRet = WarningBox::GetStandardImage().GetXGraphic();
         }
-        else if ( sImageName.compareToAscii( "error" ) )
+        else if ( sImageName.equalsAscii( "error" ) )
         {
             xRet = ErrorBox::GetStandardImage().GetXGraphic();
         }
-        else if ( sImageName.compareToAscii( "query" ) )
+        else if ( sImageName.equalsAscii( "query" ) )
         {
             xRet = QueryBox::GetStandardImage().GetXGraphic();
         }
@@ -261,9 +261,9 @@ uno::Reference< ::graphic::XGraphic > GraphicProvider::implLoadBitmap( const uno
     SvMemoryStream aBmpStream( aBmpSeq.getArray(), aBmpSeq.getLength(), STREAM_READ );
     Bitmap aBmp;
     aBmpStream >> aBmp;
-
+    
     BitmapEx aBmpEx;
-
+    
     if( aMaskSeq.getLength() )
     {
         SvMemoryStream aMaskStream( aMaskSeq.getArray(), aMaskSeq.getLength(), STREAM_READ );
@@ -277,7 +277,7 @@ uno::Reference< ::graphic::XGraphic > GraphicProvider::implLoadBitmap( const uno
     if( !aBmpEx.IsEmpty() )
     {
         ::unographic::Graphic* pUnoGraphic = new ::unographic::Graphic;
-
+        
         pUnoGraphic->init( aBmpEx );
         xRet = pUnoGraphic;
     }
@@ -288,29 +288,29 @@ uno::Reference< ::graphic::XGraphic > GraphicProvider::implLoadBitmap( const uno
 
 uno::Reference< ::graphic::XGraphic > GraphicProvider::implLoadResource( const ::rtl::OUString& rResourceURL ) const
 {
-    uno::Reference< ::graphic::XGraphic >   xRet;
-    sal_Int32                               nIndex = 0;
-
+    uno::Reference< ::graphic::XGraphic > 	xRet;
+    sal_Int32								nIndex = 0;
+    
     if( ( 0 == rResourceURL.getToken( 0, '/', nIndex ).compareToAscii( "private:resource" ) ) )
     {
         ByteString aResMgrName( String( rResourceURL.getToken( 0, '/', nIndex ) ), RTL_TEXTENCODING_ASCII_US );
-
+        
         ResMgr* pResMgr = ResMgr::CreateResMgr( aResMgrName.GetBuffer(), Application::GetSettings().GetUILocale() );
-
+        
         if( pResMgr )
         {
-            const ::rtl::OUString   aResourceType( rResourceURL.getToken( 0, '/', nIndex ) );
-            const ResId             aResId( rResourceURL.getToken( 0, '/', nIndex ).toInt32(), *pResMgr );
-
+            const ::rtl::OUString	aResourceType( rResourceURL.getToken( 0, '/', nIndex ) );
+            const ResId				aResId( rResourceURL.getToken( 0, '/', nIndex ).toInt32(), *pResMgr );
+            
             if( aResourceType.getLength() )
             {
                 BitmapEx aBmpEx;
-
+                
                 if( ( 0 == aResourceType.compareToAscii( "bitmap" ) ) ||
                     ( 0 == aResourceType.compareToAscii( "bitmapex" ) ) )
                 {
                     aResId.SetRT( RSC_BITMAP );
-
+                    
                     if( pResMgr->IsAvailable( aResId ) )
                     {
                         aBmpEx = BitmapEx( aResId );
@@ -319,7 +319,7 @@ uno::Reference< ::graphic::XGraphic > GraphicProvider::implLoadResource( const :
                 else if( 0 == aResourceType.compareToAscii( "image" ) )
                 {
                     aResId.SetRT( RSC_IMAGE );
-
+                    
                     if( pResMgr->IsAvailable( aResId ) )
                     {
                         const Image aImage( aResId );
@@ -329,12 +329,12 @@ uno::Reference< ::graphic::XGraphic > GraphicProvider::implLoadResource( const :
                 else if( 0 == aResourceType.compareToAscii( "imagelist" ) )
                 {
                     aResId.SetRT( RSC_IMAGELIST );
-
+                    
                     if( pResMgr->IsAvailable( aResId ) )
                     {
                         const ImageList aImageList( aResId );
-                        sal_Int32       nImageId = ( nIndex > -1 ) ? rResourceURL.getToken( 0, '/', nIndex ).toInt32() : 0;
-
+                        sal_Int32		nImageId = ( nIndex > -1 ) ? rResourceURL.getToken( 0, '/', nIndex ).toInt32() : 0;
+                        
                         if( 0 < nImageId )
                         {
                             const Image aImage( aImageList.GetImage( sal::static_int_cast< USHORT >(nImageId) ) );
@@ -346,20 +346,20 @@ uno::Reference< ::graphic::XGraphic > GraphicProvider::implLoadResource( const :
                         }
                     }
                 }
-
+            
                 if( !aBmpEx.IsEmpty() )
                 {
                     ::unographic::Graphic* pUnoGraphic = new ::unographic::Graphic;
-
+                    
                     pUnoGraphic->init( aBmpEx );
                     xRet = pUnoGraphic;
                 }
             }
-
+            
             delete pResMgr;
         }
     }
-
+    
     return xRet;
 }
 
@@ -376,9 +376,9 @@ uno::Reference< beans::XPropertySet > SAL_CALL GraphicProvider::queryGraphicDesc
 
     for( sal_Int32 i = 0; ( i < rMediaProperties.getLength() ) && !xRet.is(); ++i )
     {
-        const ::rtl::OUString   aName( rMediaProperties[ i ].Name );
-        const uno::Any          aValue( rMediaProperties[ i ].Value );
-
+        const ::rtl::OUString	aName( rMediaProperties[ i ].Name );
+        const uno::Any 			aValue( rMediaProperties[ i ].Value );
+    
         if( COMPARE_EQUAL == aName.compareToAscii( "URL" ) )
         {
             aValue >>= aURL;
@@ -412,7 +412,7 @@ uno::Reference< beans::XPropertySet > SAL_CALL GraphicProvider::queryGraphicDesc
 
         if ( !xGraphic.is() )
             xGraphic = implLoadStandardImage( aURL );
-
+        
         if( xGraphic.is() )
         {
             xRet = uno::Reference< beans::XPropertySet >( xGraphic, uno::UNO_QUERY );
@@ -435,24 +435,24 @@ uno::Reference< beans::XPropertySet > SAL_CALL GraphicProvider::queryGraphicDesc
 }
 
 // ------------------------------------------------------------------------------
-
+    
 uno::Reference< ::graphic::XGraphic > SAL_CALL GraphicProvider::queryGraphic( const uno::Sequence< ::beans::PropertyValue >& rMediaProperties )
     throw ( io::IOException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException)
 {
-    uno::Reference< ::graphic::XGraphic >   xRet;
-    String                                  aPath;
-    SvStream*                               pIStm = NULL;
+    uno::Reference< ::graphic::XGraphic >	xRet;
+    String									aPath;
+    SvStream* 								pIStm = NULL;
 
     uno::Reference< io::XInputStream > xIStm;
     uno::Reference< awt::XBitmap >xBtm;
 
     for( sal_Int32 i = 0; ( i < rMediaProperties.getLength() ) && !pIStm && !xRet.is(); ++i )
     {
-        const ::rtl::OUString   aName( rMediaProperties[ i ].Name );
-        const uno::Any          aValue( rMediaProperties[ i ].Value );
-
+        const ::rtl::OUString	aName( rMediaProperties[ i ].Name );
+        const uno::Any 			aValue( rMediaProperties[ i ].Value );
+    
         if( COMPARE_EQUAL == aName.compareToAscii( "URL" ) )
-        {
+        {		
             ::rtl::OUString aURL;
             aValue >>= aURL;
             aPath = aURL;
@@ -477,10 +477,10 @@ uno::Reference< ::graphic::XGraphic > SAL_CALL GraphicProvider::queryGraphic( co
 
         if( !xRet.is() )
             xRet = implLoadGraphicObject( aPath );
-
+        
         if( !xRet.is() )
             xRet = implLoadResource( aPath );
-
+    
         if ( !xRet.is() )
             xRet = implLoadRepositoryImage( aPath );
 
@@ -498,24 +498,24 @@ uno::Reference< ::graphic::XGraphic > SAL_CALL GraphicProvider::queryGraphic( co
     if( pIStm )
     {
         ::GraphicFilter* pFilter = ::GraphicFilter::GetGraphicFilter();
-
+        
         if( pFilter )
         {
             ::Graphic aVCLGraphic;
-
-            if( ( pFilter->ImportGraphic( aVCLGraphic, aPath, *pIStm ) == GRFILTER_OK ) &&
+            
+            if( ( pFilter->ImportGraphic( aVCLGraphic, aPath, *pIStm ) == GRFILTER_OK ) && 
                 ( aVCLGraphic.GetType() != GRAPHIC_NONE ) )
             {
                 ::unographic::Graphic* pUnoGraphic = new ::unographic::Graphic;
-
+                
                 pUnoGraphic->init( aVCLGraphic );
                 xRet = pUnoGraphic;
             }
         }
-
+    
         delete pIStm;
     }
-
+    
     return xRet;
 }
 
@@ -557,7 +557,7 @@ void ImplApplyBitmapScaling( ::Graphic& rGraphic, sal_Int32 nPixelWidth, sal_Int
     {
         BitmapEx aBmpEx( rGraphic.GetBitmapEx() );
         MapMode aPrefMapMode( aBmpEx.GetPrefMapMode() );
-        Size    aPrefSize( aBmpEx.GetPrefSize() );
+        Size	aPrefSize( aBmpEx.GetPrefSize() );
         aBmpEx.Scale( Size( nPixelWidth, nPixelHeight ) );
         aBmpEx.SetPrefMapMode( aPrefMapMode );
         aBmpEx.SetPrefSize( aPrefSize );
@@ -581,7 +581,7 @@ void ImplApplyBitmapResolution( ::Graphic& rGraphic, sal_Int32 nImageResolution,
         sal_Int32 nDestPixelHeight = nSourcePixelHeight;
 
         // check, if the bitmap DPI exceeds the maximum DPI
-        if( fSourceDPIX > fImageResolution )
+        if( fSourceDPIX > fImageResolution ) 
         {
             nDestPixelWidth = static_cast<sal_Int32>(( fSourcePixelWidth * fImageResolution ) / fSourceDPIX);
             if ( !nDestPixelWidth || ( nDestPixelWidth > nSourcePixelWidth ) )
@@ -614,8 +614,8 @@ void ImplApplyFilterData( ::Graphic& rGraphic, uno::Sequence< beans::PropertyVal
 
     for( sal_Int32 i = 0; i < rFilterData.getLength(); ++i )
     {
-        const ::rtl::OUString   aName(  rFilterData[ i ].Name );
-        const uno::Any          aValue( rFilterData[ i ].Value );
+        const ::rtl::OUString	aName(  rFilterData[ i ].Name );
+        const uno::Any 			aValue( rFilterData[ i ].Value );
 
         if( COMPARE_EQUAL == aName.compareToAscii( "PixelWidth" ) )
             aValue >>= nPixelWidth;
@@ -732,23 +732,23 @@ void ImplApplyFilterData( ::Graphic& rGraphic, uno::Sequence< beans::PropertyVal
 }
 
 // ------------------------------------------------------------------------------
-
-void SAL_CALL GraphicProvider::storeGraphic( const uno::Reference< ::graphic::XGraphic >& rxGraphic, const uno::Sequence< beans::PropertyValue >& rMediaProperties )
+    
+void SAL_CALL GraphicProvider::storeGraphic( const uno::Reference< ::graphic::XGraphic >& rxGraphic, const uno::Sequence< beans::PropertyValue >& rMediaProperties ) 
     throw ( io::IOException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException)
 {
-    SvStream*   pOStm = NULL;
-    String      aPath;
-    sal_Int32   i;
-
+    SvStream* 	pOStm = NULL;
+    String		aPath;
+    sal_Int32 	i;
+    
     for( i = 0; ( i < rMediaProperties.getLength() ) && !pOStm; ++i )
     {
-        const ::rtl::OUString   aName( rMediaProperties[ i ].Name );
-        const uno::Any          aValue( rMediaProperties[ i ].Value );
-
+        const ::rtl::OUString	aName( rMediaProperties[ i ].Name );
+        const uno::Any 			aValue( rMediaProperties[ i ].Value );
+    
         if( COMPARE_EQUAL == aName.compareToAscii( "URL" ) )
         {
             ::rtl::OUString aURL;
-
+            
             aValue >>= aURL;
             pOStm = ::utl::UcbStreamHelper::CreateStream( aURL, STREAM_WRITE | STREAM_TRUNC );
             aPath = aURL;
@@ -756,9 +756,9 @@ void SAL_CALL GraphicProvider::storeGraphic( const uno::Reference< ::graphic::XG
         else if( COMPARE_EQUAL == aName.compareToAscii( "OutputStream" ) )
         {
             uno::Reference< io::XStream > xOStm;
-
+            
             aValue >>= xOStm;
-
+            
             if( xOStm.is() )
                 pOStm = ::utl::UcbStreamHelper::CreateStream( xOStm );
         }
@@ -766,24 +766,24 @@ void SAL_CALL GraphicProvider::storeGraphic( const uno::Reference< ::graphic::XG
 
     if( pOStm )
     {
-        uno::Sequence< beans::PropertyValue >   aFilterDataSeq;
-        const char*                             pFilterShortName = NULL;
-
+        uno::Sequence< beans::PropertyValue >	aFilterDataSeq;
+        const char*								pFilterShortName = NULL;
+        
         for( i = 0; i < rMediaProperties.getLength(); ++i )
         {
-            const ::rtl::OUString   aName( rMediaProperties[ i ].Name );
-            const uno::Any          aValue( rMediaProperties[ i ].Value );
-
+            const ::rtl::OUString	aName( rMediaProperties[ i ].Name );
+            const uno::Any 			aValue( rMediaProperties[ i ].Value );
+            
             if( COMPARE_EQUAL == aName.compareToAscii( "FilterData" ) )
             {
                 aValue >>= aFilterDataSeq;
             }
             else if( COMPARE_EQUAL == aName.compareToAscii( "MimeType" ) )
             {
-                ::rtl::OUString aMimeType;
-
+                ::rtl::OUString aMimeType;		
+                
                 aValue >>= aMimeType;
-
+    
                 if( COMPARE_EQUAL == aMimeType.compareToAscii( MIMETYPE_BMP ) )
                     pFilterShortName = "bmp";
                 else if( COMPARE_EQUAL == aMimeType.compareToAscii( MIMETYPE_EPS ) )
@@ -822,16 +822,16 @@ void SAL_CALL GraphicProvider::storeGraphic( const uno::Reference< ::graphic::XG
                     pFilterShortName = MIMETYPE_VCLGRAPHIC;
             }
         }
-
+        
         if( pFilterShortName )
         {
             ::GraphicFilter* pFilter = ::GraphicFilter::GetGraphicFilter();
-
+            
             if( pFilter )
             {
-                const uno::Reference< XInterface >  xIFace( rxGraphic, uno::UNO_QUERY );
-                const ::Graphic*                    pGraphic = ::unographic::Graphic::getImplementation( xIFace );
-
+                const uno::Reference< XInterface > 	xIFace( rxGraphic, uno::UNO_QUERY );
+                const ::Graphic* 					pGraphic = ::unographic::Graphic::getImplementation( xIFace );
+            
                 if( pGraphic && ( pGraphic->GetType() != GRAPHIC_NONE ) )
                 {
                     ::Graphic aGraphic( *pGraphic );
@@ -845,7 +845,7 @@ void SAL_CALL GraphicProvider::storeGraphic( const uno::Reference< ::graphic::XG
                         aMemStrm << aGraphic;
                     else
                     {
-                        pFilter->ExportGraphic( aGraphic, aPath, aMemStrm,
+                        pFilter->ExportGraphic( aGraphic, aPath, aMemStrm, 
                                                 pFilter->GetExportFormatNumberForShortName( ::rtl::OUString::createFromAscii( pFilterShortName ) ),
                                                     ( aFilterDataSeq.getLength() ? &aFilterDataSeq : NULL ) );
                     }
diff --git a/svtools/source/graphic/renderer.cxx b/svtools/source/graphic/renderer.cxx
index b8a0ea73b92c..e9f4594bd8f4 100644
--- a/svtools/source/graphic/renderer.cxx
+++ b/svtools/source/graphic/renderer.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
@@ -41,9 +41,9 @@
 #include "graphic.hxx"
 #include "renderer.hxx"
 
-#define UNOGRAPHIC_DEVICE           1
-#define UNOGRAPHIC_DESTINATIONRECT  2
-#define UNOGRAPHIC_RENDERDATA       3
+#define UNOGRAPHIC_DEVICE 			1
+#define UNOGRAPHIC_DESTINATIONRECT	2
+#define UNOGRAPHIC_RENDERDATA		3
 
 using namespace ::com::sun::star;
 
@@ -58,7 +58,7 @@ uno::Reference< uno::XInterface > SAL_CALL GraphicRendererVCL_CreateInstance( co
     return SAL_STATIC_CAST( ::cppu::OWeakObject*, new GraphicRendererVCL );
 }
 
-
+    
 GraphicRendererVCL::GraphicRendererVCL() :
     ::comphelper::PropertySetHelper( createPropertySetInfo() ),
     mpOutDev( NULL )
@@ -74,7 +74,7 @@ GraphicRendererVCL::~GraphicRendererVCL()
 
 // ------------------------------------------------------------------------------
 
-::rtl::OUString GraphicRendererVCL::getImplementationName_Static()
+::rtl::OUString GraphicRendererVCL::getImplementationName_Static() 
     throw()
 {
     return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.graphic.GraphicRendererVCL" ) );
@@ -82,19 +82,19 @@ GraphicRendererVCL::~GraphicRendererVCL()
 
 // ------------------------------------------------------------------------------
 
-uno::Sequence< ::rtl::OUString > GraphicRendererVCL::getSupportedServiceNames_Static()
-    throw(  )
+uno::Sequence< ::rtl::OUString > GraphicRendererVCL::getSupportedServiceNames_Static() 
+    throw(	)
 {
     uno::Sequence< ::rtl::OUString > aSeq( 1 );
-
+    
     aSeq.getArray()[ 0 ] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.graphic.GraphicRendererVCL" ) );
-
+    
     return aSeq;
 }
 
 // ------------------------------------------------------------------------------
 
-uno::Any SAL_CALL GraphicRendererVCL::queryAggregation( const uno::Type & rType )
+uno::Any SAL_CALL GraphicRendererVCL::queryAggregation( const uno::Type & rType ) 
     throw( uno::RuntimeException )
 {
     uno::Any aAny;
@@ -119,7 +119,7 @@ uno::Any SAL_CALL GraphicRendererVCL::queryAggregation( const uno::Type & rType
 
 // ------------------------------------------------------------------------------
 
-uno::Any SAL_CALL GraphicRendererVCL::queryInterface( const uno::Type & rType )
+uno::Any SAL_CALL GraphicRendererVCL::queryInterface( const uno::Type & rType ) 
     throw( uno::RuntimeException )
 {
     return OWeakAggObject::queryInterface( rType );
@@ -127,7 +127,7 @@ uno::Any SAL_CALL GraphicRendererVCL::queryInterface( const uno::Type & rType )
 
 // ------------------------------------------------------------------------------
 
-void SAL_CALL GraphicRendererVCL::acquire()
+void SAL_CALL GraphicRendererVCL::acquire() 
     throw()
 {
     OWeakAggObject::acquire();
@@ -143,7 +143,7 @@ void SAL_CALL GraphicRendererVCL::release()
 
 // ------------------------------------------------------------------------------
 
-::rtl::OUString SAL_CALL GraphicRendererVCL::getImplementationName()
+::rtl::OUString SAL_CALL GraphicRendererVCL::getImplementationName() 
     throw( uno::RuntimeException )
 {
     return getImplementationName_Static();
@@ -154,8 +154,8 @@ void SAL_CALL GraphicRendererVCL::release()
 sal_Bool SAL_CALL GraphicRendererVCL::supportsService( const rtl::OUString& ServiceName )
     throw( uno::RuntimeException )
 {
-    uno::Sequence< ::rtl::OUString >    aSNL( getSupportedServiceNames() );
-    const ::rtl::OUString*              pArray = aSNL.getConstArray();
+    uno::Sequence< ::rtl::OUString >	aSNL( getSupportedServiceNames() );
+    const ::rtl::OUString*				pArray = aSNL.getConstArray();
 
     for( sal_Int32 i = 0; i < aSNL.getLength(); i++ )
         if( pArray[i] == ServiceName )
@@ -177,8 +177,8 @@ uno::Sequence< rtl::OUString > SAL_CALL GraphicRendererVCL::getSupportedServiceN
 uno::Sequence< uno::Type > SAL_CALL GraphicRendererVCL::getTypes()
     throw( uno::RuntimeException )
 {
-    uno::Sequence< uno::Type >  aTypes( 7 );
-    uno::Type*                  pTypes = aTypes.getArray();
+    uno::Sequence< uno::Type >	aTypes( 7 );
+    uno::Type* 					pTypes = aTypes.getArray();
 
     *pTypes++ = ::getCppuType((const uno::Reference< uno::XAggregation>*)0);
     *pTypes++ = ::getCppuType((const uno::Reference< lang::XServiceInfo>*)0);
@@ -190,21 +190,21 @@ uno::Sequence< uno::Type > SAL_CALL GraphicRendererVCL::getTypes()
 
     return aTypes;
 }
-
+   
 // ------------------------------------------------------------------------------
 
 uno::Sequence< sal_Int8 > SAL_CALL GraphicRendererVCL::getImplementationId()
     throw( uno::RuntimeException )
 {
-    vos::OGuard                         aGuard( Application::GetSolarMutex() );
-    static uno::Sequence< sal_Int8 >    aId;
-
+    vos::OGuard 						aGuard( Application::GetSolarMutex() );
+    static uno::Sequence< sal_Int8 >	aId;
+    
     if( aId.getLength() == 0 )
     {
         aId.realloc( 16 );
         rtl_createUuid( reinterpret_cast< sal_uInt8* >( aId.getArray() ), 0, sal_True );
     }
-
+    
     return aId;
 }
 
@@ -212,15 +212,15 @@ uno::Sequence< sal_Int8 > SAL_CALL GraphicRendererVCL::getImplementationId()
 
 ::comphelper::PropertySetInfo* GraphicRendererVCL::createPropertySetInfo()
 {
-    vos::OGuard                     aGuard( Application::GetSolarMutex() );
-    ::comphelper::PropertySetInfo*  pRet = new ::comphelper::PropertySetInfo();
+    vos::OGuard 					aGuard( Application::GetSolarMutex() );
+    ::comphelper::PropertySetInfo*	pRet = new ::comphelper::PropertySetInfo();
 
     static ::comphelper::PropertyMapEntry aEntries[] =
     {
         { MAP_CHAR_LEN( "Device" ), UNOGRAPHIC_DEVICE, &::getCppuType( (const uno::Any*)(0)), 0, 0 },
         { MAP_CHAR_LEN( "DestinationRect" ), UNOGRAPHIC_DESTINATIONRECT, &::getCppuType( (const awt::Rectangle*)(0)), 0, 0 },
-        { MAP_CHAR_LEN( "RenderData" ), UNOGRAPHIC_RENDERDATA,  &::getCppuType( (const uno::Any*)(0)), 0, 0 },
-
+        { MAP_CHAR_LEN( "RenderData" ), UNOGRAPHIC_RENDERDATA,	&::getCppuType( (const uno::Any*)(0)), 0, 0 },
+        
         { 0,0,0,0,0,0 }
     };
 
@@ -233,8 +233,8 @@ uno::Sequence< sal_Int8 > SAL_CALL GraphicRendererVCL::getImplementationId()
 // ------------------------------------------------------------------------------
 
 void GraphicRendererVCL::_setPropertyValues( const comphelper::PropertyMapEntry** ppEntries, const uno::Any* pValues )
-    throw( beans::UnknownPropertyException,
-           beans::PropertyVetoException,
+    throw( beans::UnknownPropertyException, 
+           beans::PropertyVetoException, 
            lang::IllegalArgumentException,
               lang::WrappedTargetException )
 {
@@ -246,8 +246,8 @@ void GraphicRendererVCL::_setPropertyValues( const comphelper::PropertyMapEntry*
         {
             case( UNOGRAPHIC_DEVICE ):
             {
-                uno::Reference< awt::XDevice > xDevice;
-
+                uno::Reference< awt::XDevice > xDevice; 
+            
                 if( ( *pValues >>= xDevice ) && xDevice.is() )
                 {
                     mxDevice = xDevice;
@@ -264,27 +264,27 @@ void GraphicRendererVCL::_setPropertyValues( const comphelper::PropertyMapEntry*
             case( UNOGRAPHIC_DESTINATIONRECT ):
             {
                 awt::Rectangle aAWTRect;
-
+            
                 if( *pValues >>= aAWTRect )
                 {
-                    maDestRect = Rectangle( Point( aAWTRect.X, aAWTRect.Y ),
+                    maDestRect = Rectangle( Point( aAWTRect.X, aAWTRect.Y ), 
                                             Size( aAWTRect.Width, aAWTRect.Height ) );
                 }
             }
             break;
-
+            
             case( UNOGRAPHIC_RENDERDATA ):
             {
                 *pValues >>= maRenderData;
             }
             break;
         }
-
+        
         ++ppEntries;
         ++pValues;
     }
 }
-
+    
 // ------------------------------------------------------------------------------
 
 void GraphicRendererVCL::_getPropertyValues( const comphelper::PropertyMapEntry** ppEntries, uno::Any* pValues )
@@ -305,35 +305,35 @@ void GraphicRendererVCL::_getPropertyValues( const comphelper::PropertyMapEntry*
 
             case( UNOGRAPHIC_DESTINATIONRECT ):
             {
-                const awt::Rectangle aAWTRect( maDestRect.Left(), maDestRect.Top(),
+                const awt::Rectangle aAWTRect( maDestRect.Left(), maDestRect.Top(), 
                                                maDestRect.GetWidth(), maDestRect.GetHeight() );
-
+                
                 *pValues <<= aAWTRect;
             }
             break;
-
+            
             case( UNOGRAPHIC_RENDERDATA ):
             {
                 *pValues <<= maRenderData;
             }
             break;
         }
-
+        
         ++ppEntries;
         ++pValues;
     }
 }
 
 // ------------------------------------------------------------------------------
-
+    
 void SAL_CALL GraphicRendererVCL::render( const uno::Reference< graphic::XGraphic >& rxGraphic )
     throw (uno::RuntimeException)
 {
     if( mpOutDev && mxDevice.is() && rxGraphic.is() )
     {
-        const uno::Reference< XInterface >  xIFace( rxGraphic, uno::UNO_QUERY );
-        const ::Graphic*                    pGraphic = ::unographic::Graphic::getImplementation( xIFace );
-
+        const uno::Reference< XInterface > 	xIFace( rxGraphic, uno::UNO_QUERY );
+        const ::Graphic* 					pGraphic = ::unographic::Graphic::getImplementation( xIFace );
+        
         if( pGraphic )
         {
             GraphicObject aGraphicObject( *pGraphic );
diff --git a/svtools/source/graphic/transformer.cxx b/svtools/source/graphic/transformer.cxx
index 5c234c8d5ecb..fe5ac04d51e3 100644
--- a/svtools/source/graphic/transformer.cxx
+++ b/svtools/source/graphic/transformer.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
@@ -90,7 +90,7 @@ void setAlpha( Bitmap& rBitmap, AlphaMask& rAlpha, sal_Int32 nColorFrom, sal_Int
 }
 
 // XGraphicTransformer
-uno::Reference< graphic::XGraphic > SAL_CALL GraphicTransformer::colorChange(
+uno::Reference< graphic::XGraphic > SAL_CALL GraphicTransformer::colorChange( 
     const uno::Reference< graphic::XGraphic >& rxGraphic, sal_Int32 nColorFrom, sal_Int8 nTolerance, sal_Int32 nColorTo, sal_Int8 nAlphaTo )
         throw ( lang::IllegalArgumentException, uno::RuntimeException)
 {
@@ -102,8 +102,8 @@ uno::Reference< graphic::XGraphic > SAL_CALL GraphicTransformer::colorChange(
 
     if ( aGraphic.GetType() == GRAPHIC_BITMAP )
     {
-        BitmapEx    aBitmapEx( aGraphic.GetBitmapEx() );
-        Bitmap      aBitmap( aBitmapEx.GetBitmap() );
+        BitmapEx	aBitmapEx( aGraphic.GetBitmapEx() );
+        Bitmap		aBitmap( aBitmapEx.GetBitmap() );
 
         if ( aBitmapEx.IsAlpha() )
         {
diff --git a/svtools/source/graphic/transformer.hxx b/svtools/source/graphic/transformer.hxx
index c4002bb4bbae..0af598a340f4 100644
--- a/svtools/source/graphic/transformer.hxx
+++ b/svtools/source/graphic/transformer.hxx
@@ -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
@@ -25,10 +25,10 @@
  *
  ************************************************************************/
 
-#ifndef _GOODIES_GRAPHICTRANSFORMER_HXX
-#define _GOODIES_GRAPHICTRANSFORMER_HXX
+#ifndef _GOODIES_GRAPHICTRANSFORMER_HXX 
+#define _GOODIES_GRAPHICTRANSFORMER_HXX 
 
-#include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/implbase1.hxx> 
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <com/sun/star/graphic/XGraphicTransformer.hpp>
 
@@ -49,15 +49,15 @@ class GraphicTransformer : public GraphicTransformer_UnoImplHelper1
 
     GraphicTransformer();
     ~GraphicTransformer();
-
+        
     // XGraphicTransformer
-    virtual ::com::sun::star::uno::Reference< ::com::sun::star::graphic::XGraphic > SAL_CALL colorChange(
+    virtual ::com::sun::star::uno::Reference< ::com::sun::star::graphic::XGraphic > SAL_CALL colorChange( 
         const ::com::sun::star::uno::Reference< ::com::sun::star::graphic::XGraphic >& rGraphic,
             sal_Int32 nColorFrom, sal_Int8 nTolerance, sal_Int32 nColorTo, sal_Int8 nAlphaTo )
                 throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException);
-
+    
 };
 
 }
 
-#endif
+#endif 
diff --git a/svtools/source/hatchwindow/documentcloser.cxx b/svtools/source/hatchwindow/documentcloser.cxx
index 09dc7018dc42..db7c1897db6d 100644
--- a/svtools/source/hatchwindow/documentcloser.cxx
+++ b/svtools/source/hatchwindow/documentcloser.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
@@ -211,7 +211,7 @@ void SAL_CALL ODocumentCloser::initialize( const uno::Sequence< uno::Any >& aArg
 
     if ( m_bDisposed )
         throw lang::DisposedException(); // TODO
-
+    
     if ( !m_refCount )
         throw uno::RuntimeException(); // the object must be refcounted already!
 
diff --git a/svtools/source/hatchwindow/documentcloser.hxx b/svtools/source/hatchwindow/documentcloser.hxx
index 98e30b4d1683..d7421650ab4b 100644
--- a/svtools/source/hatchwindow/documentcloser.hxx
+++ b/svtools/source/hatchwindow/documentcloser.hxx
@@ -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
@@ -53,7 +53,7 @@ class ODocumentCloser : public ::cppu::WeakImplHelper3< ::com::sun::star::lang::
     ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > m_xFrame;
 
     ::cppu::OInterfaceContainerHelper* m_pListenersContainer; // list of listeners
-
+    
     sal_Bool m_bDisposed;
     sal_Bool m_bInitialized;
 
@@ -67,7 +67,7 @@ public:
     static ::rtl::OUString SAL_CALL impl_staticGetImplementationName();
 
     static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL
-        impl_staticCreateSelfInstance(
+        impl_staticCreateSelfInstance( 
             const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceManager );
 
 // XComponent
diff --git a/svtools/source/hatchwindow/hatchwindow.cxx b/svtools/source/hatchwindow/hatchwindow.cxx
index 1b84206d6696..1f347b133f7d 100644
--- a/svtools/source/hatchwindow/hatchwindow.cxx
+++ b/svtools/source/hatchwindow/hatchwindow.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
@@ -117,7 +117,7 @@ uno::Any SAL_CALL VCLXHatchWindow::queryInterface( const uno::Type & rType )
     throw( uno::RuntimeException )
 {
     // Attention:
-    //  Don't use mutex or guard in this method!!! Is a method of XInterface.
+    //	Don't use mutex or guard in this method!!! Is a method of XInterface.
 
     uno::Any aReturn( ::cppu::queryInterface( rType,
                                            static_cast< embed::XHatchWindow* >( this ) ) );
diff --git a/svtools/source/hatchwindow/hatchwindow.hxx b/svtools/source/hatchwindow/hatchwindow.hxx
index fa3e70ee8901..e05c1907bb37 100644
--- a/svtools/source/hatchwindow/hatchwindow.hxx
+++ b/svtools/source/hatchwindow/hatchwindow.hxx
@@ -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
diff --git a/svtools/source/hatchwindow/hatchwindowfactory.cxx b/svtools/source/hatchwindow/hatchwindowfactory.cxx
index f8dbddff3761..8e4990ac2cd1 100644
--- a/svtools/source/hatchwindow/hatchwindowfactory.cxx
+++ b/svtools/source/hatchwindow/hatchwindowfactory.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
@@ -124,7 +124,7 @@ SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL component_writeInfo (
         // OHatchWindowFactory registration
 
         xNewKey = xRegistryKey->createKey (
-            ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("/") ) +
+            ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("/") ) + 
             OHatchWindowFactory::impl_staticGetImplementationName() +
             ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "/UNO/SERVICES") ) );
 
@@ -137,7 +137,7 @@ SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL component_writeInfo (
         // ODocumentCloser registration
 
         xNewKey = xRegistryKey->createKey (
-            ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("/") ) +
+            ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("/") ) + 
             ODocumentCloser::impl_staticGetImplementationName() +
             ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "/UNO/SERVICES") ) );
 
diff --git a/svtools/source/hatchwindow/hatchwindowfactory.hxx b/svtools/source/hatchwindow/hatchwindowfactory.hxx
index 9a59c7a95f6d..e1bdb3f1edd5 100644
--- a/svtools/source/hatchwindow/hatchwindowfactory.hxx
+++ b/svtools/source/hatchwindow/hatchwindowfactory.hxx
@@ -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,7 +56,7 @@ public:
     static ::rtl::OUString SAL_CALL impl_staticGetImplementationName();
 
     static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL
-        impl_staticCreateSelfInstance(
+        impl_staticCreateSelfInstance( 
             const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceManager );
 
 
diff --git a/svtools/source/hatchwindow/ipwin.cxx b/svtools/source/hatchwindow/ipwin.cxx
index 1beae4a54355..5817a5bea39a 100644
--- a/svtools/source/hatchwindow/ipwin.cxx
+++ b/svtools/source/hatchwindow/ipwin.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
diff --git a/svtools/source/hatchwindow/ipwin.hxx b/svtools/source/hatchwindow/ipwin.hxx
index 4c7cb6d88d36..1ece8967794e 100644
--- a/svtools/source/hatchwindow/ipwin.hxx
+++ b/svtools/source/hatchwindow/ipwin.hxx
@@ -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
@@ -40,11 +40,11 @@ class SvResizeHelper
     Rectangle   aOuter;
     short       nGrab; // -1 kein Grab,  0 - 7, 8 = Move, siehe FillHandle...
     Point       aSelPos;
-    BOOL        bResizeable;
+    BOOL		bResizeable;
 public:
                 SvResizeHelper();
 
-    void        SetResizeable( BOOL b ) { bResizeable = b; }
+    void		SetResizeable( BOOL b ) { bResizeable = b; }
     short       GetGrab() const { return nGrab; }
     void        SetBorderPixel( const Size & rBorderP )
                 { aBorder = rBorderP; }
@@ -70,7 +70,7 @@ public:
     BOOL        SelectBegin( Window *, const Point & rPos );
     short       SelectMove( Window * pWin, const Point & rPos );
     Point       GetTrackPosPixel( const Rectangle & rRect ) const;
-    Rectangle   GetTrackRectPixel( const Point & rTrackPos ) const;
+    Rectangle	GetTrackRectPixel( const Point & rTrackPos ) const;
     void        ValidateRect( Rectangle & rValidate ) const;
     BOOL        SelectRelease( Window *, const Point & rPos, Rectangle & rOutPosSize );
     void        Release( Window * pWin );
@@ -102,7 +102,7 @@ public:
     virtual long    Notify( NotifyEvent& rNEvt );
     virtual long    PreNotify( NotifyEvent& rNEvt );
 
-    void    QueryObjAreaPixel( Rectangle & );
+    void	QueryObjAreaPixel( Rectangle & );
     void    RequestObjAreaPixel( const Rectangle & );
 };
 
diff --git a/svtools/source/inc/accessibletableimp.hxx b/svtools/source/inc/accessibletableimp.hxx
index 3a01c01567d3..896e6c87ff7b 100644
--- a/svtools/source/inc/accessibletableimp.hxx
+++ b/svtools/source/inc/accessibletableimp.hxx
@@ -1,6 +1,6 @@
 /*************************************************************************
  * 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
@@ -44,7 +44,7 @@ namespace svt { namespace table
             AccessibleTableControl_Impl() : m_pAccessible(NULL)
             {
             }
-
+            
 
             /// @see AccessibleTableControl::getTableRowHeader
             ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >
diff --git a/svtools/source/inc/configitems/accessibilityoptions_const.hxx b/svtools/source/inc/configitems/accessibilityoptions_const.hxx
index 177edce8c3f0..375029827aed 100644
--- a/svtools/source/inc/configitems/accessibilityoptions_const.hxx
+++ b/svtools/source/inc/configitems/accessibilityoptions_const.hxx
@@ -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
diff --git a/svtools/source/inc/filectrl.hrc b/svtools/source/inc/filectrl.hrc
index 1707e306e1b0..acaf450a2126 100644
--- a/svtools/source/inc/filectrl.hrc
+++ b/svtools/source/inc/filectrl.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
@@ -28,7 +28,7 @@
 #ifndef _SV_FILECTRL_HRC
 #define _SV_FILECTRL_HRC
 
-#define STR_FILECTRL_BUTTONTEXT     333     // ID-Range?!
+#define STR_FILECTRL_BUTTONTEXT		333		// ID-Range?!
 
 #endif
 
diff --git a/svtools/source/inc/gifread.hxx b/svtools/source/inc/gifread.hxx
index de4c6935ef67..5e6bf2d5d3c6 100644
--- a/svtools/source/inc/gifread.hxx
+++ b/svtools/source/inc/gifread.hxx
@@ -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
@@ -72,65 +72,65 @@ class SvStream;
 
 class GIFReader : public GraphicReader
 {
-    Graphic             aImGraphic;
-    Animation           aAnimation;
-    Bitmap              aBmp8;
-    Bitmap              aBmp1;
-    BitmapPalette       aGPalette;
-    BitmapPalette       aLPalette;
-    SvStream&           rIStm;
-    void*               pCallerData;
-    HPBYTE              pSrcBuf;
-    GIFLZWDecompressor* pDecomp;
-    BitmapWriteAccess*  pAcc8;
-    BitmapWriteAccess*  pAcc1;
-    long                nYAcc;
-    long                nLastPos;
-    sal_uInt32          nLogWidth100;
-    sal_uInt32          nLogHeight100;
-    USHORT              nTimer;
-    USHORT              nGlobalWidth;           // maximale Bildbreite aus Header
-    USHORT              nGlobalHeight;          // maximale Bildhoehe aus Header
-    USHORT              nImageWidth;            // maximale Bildbreite aus Header
-    USHORT              nImageHeight;           // maximale Bildhoehe aus Header
-    USHORT              nImagePosX;
-    USHORT              nImagePosY;
-    USHORT              nImageX;                // maximale Bildbreite aus Header
-    USHORT              nImageY;                // maximale Bildhoehe aus Header
-    USHORT              nLastImageY;
-    USHORT              nLastInterCount;
-    USHORT              nLoops;
-    GIFAction           eActAction;
-    BOOL                bStatus;
-    BOOL                bGCTransparent;         // Ob das Bild Transparent ist, wenn ja:
-    BOOL                bInterlaced;
-    BOOL                bOverreadBlock;
-    BOOL                bImGraphicReady;
-    BOOL                bGlobalPalette;
-    BYTE                nBackgroundColor;       // Hintergrundfarbe
-    BYTE                nGCTransparentIndex;    // Pixel von diesem Index sind durchsichtig
-    BYTE                nGCDisposalMethod;      // 'Disposal Method' (siehe GIF-Doku)
-    BYTE                cTransIndex1;
-    BYTE                cNonTransIndex1;
-
-    void                ReadPaletteEntries( BitmapPalette* pPal, ULONG nCount );
-    void                ClearImageExtensions();
-    BOOL                CreateBitmaps( long nWidth, long nHeight, BitmapPalette* pPal, BOOL bWatchForBackgroundColor );
-    BOOL                ReadGlobalHeader();
-    BOOL                ReadExtension();
-    BOOL                ReadLocalHeader();
-    ULONG               ReadNextBlock();
-    void                FillImages( HPBYTE pBytes, ULONG nCount );
-    void                CreateNewBitmaps();
-    BOOL                ProcessGIF();
+    Graphic				aImGraphic;
+    Animation			aAnimation;
+    Bitmap				aBmp8;
+    Bitmap				aBmp1;
+    BitmapPalette		aGPalette;
+    BitmapPalette		aLPalette;
+    SvStream&			rIStm;
+    void*				pCallerData;
+    HPBYTE				pSrcBuf;
+    GIFLZWDecompressor*	pDecomp;
+    BitmapWriteAccess*	pAcc8;
+    BitmapWriteAccess*	pAcc1;
+    long				nYAcc;
+    long				nLastPos;
+    sal_uInt32			nLogWidth100;
+    sal_uInt32			nLogHeight100;
+    USHORT				nTimer;
+    USHORT				nGlobalWidth;			// maximale Bildbreite aus Header
+    USHORT				nGlobalHeight;			// maximale Bildhoehe aus Header
+    USHORT				nImageWidth;			// maximale Bildbreite aus Header
+    USHORT				nImageHeight;			// maximale Bildhoehe aus Header
+    USHORT				nImagePosX;
+    USHORT				nImagePosY;
+    USHORT				nImageX;				// maximale Bildbreite aus Header
+    USHORT				nImageY;				// maximale Bildhoehe aus Header
+    USHORT				nLastImageY;
+    USHORT				nLastInterCount;
+    USHORT				nLoops;
+    GIFAction			eActAction;
+    BOOL				bStatus;
+    BOOL				bGCTransparent;			// Ob das Bild Transparent ist, wenn ja:
+    BOOL				bInterlaced;
+    BOOL				bOverreadBlock;
+    BOOL				bImGraphicReady;
+    BOOL				bGlobalPalette;
+    BYTE				nBackgroundColor;		// Hintergrundfarbe
+    BYTE				nGCTransparentIndex;	// Pixel von diesem Index sind durchsichtig
+    BYTE				nGCDisposalMethod;		// 'Disposal Method' (siehe GIF-Doku)
+    BYTE				cTransIndex1;
+    BYTE				cNonTransIndex1;
+
+    void				ReadPaletteEntries( BitmapPalette* pPal, ULONG nCount );
+    void				ClearImageExtensions();
+    BOOL				CreateBitmaps( long nWidth, long nHeight, BitmapPalette* pPal, BOOL bWatchForBackgroundColor );
+    BOOL				ReadGlobalHeader();
+    BOOL				ReadExtension();
+    BOOL				ReadLocalHeader();
+    ULONG				ReadNextBlock();
+    void				FillImages( HPBYTE pBytes, ULONG nCount );
+    void				CreateNewBitmaps();
+    BOOL				ProcessGIF();
 
 public:
 
-    ReadState           ReadGIF( Graphic& rGraphic );
-    const Graphic&      GetIntermediateGraphic();
+    ReadState			ReadGIF( Graphic& rGraphic );
+    const Graphic&		GetIntermediateGraphic();
 
                         GIFReader( SvStream& rStm );
-    virtual             ~GIFReader();
+    virtual				~GIFReader();
 };
 
 #endif // _GIFPRIVATE
diff --git a/svtools/source/inc/gradwrap.hxx b/svtools/source/inc/gradwrap.hxx
index 41887b67822a..18383e503a6e 100644
--- a/svtools/source/inc/gradwrap.hxx
+++ b/svtools/source/inc/gradwrap.hxx
@@ -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
@@ -33,30 +33,30 @@
 
 /******************************************************************************
 |*
-|*  class GradientWrapper
+|* 	class GradientWrapper
 |*
-|*  Ersterstellung:     KA 24.11.95
-|*  letzte Aenderung:   KA 24.11.95
+|*	Ersterstellung:		KA 24.11.95
+|*	letzte Aenderung:	KA 24.11.95
 |*
-|*  Zeck:   dient beim MetaFile-Export dazu, die eigentliche Berechungs-
-|*          funktionalitaet zu kapseln. Das Schreiben der Records fuer
-|*          die unterschiedlichen File-Formate geschieht ueber LinkHandler.
+|*	Zeck:	dient beim MetaFile-Export dazu, die eigentliche Berechungs-
+|* 			funktionalitaet zu kapseln. Das Schreiben der Records fuer
+|*			die unterschiedlichen File-Formate geschieht ueber LinkHandler.
 |*
-|*          Klassen, die diesen Wrapper benutzen, muessen drei Linkhandler
-|*          zur Verfuegung stellen, die im Ctor uebergeben werden:
+|*			Klassen, die diesen Wrapper benutzen, muessen drei Linkhandler
+|* 			zur Verfuegung stellen, die im Ctor uebergeben werden:
 |*
-|*              1. Linkhandler zum Schreiben eines Records fuer Polygonausgabe
-|*              2. Linkhandler zum Schreiben eines Records fuer PolyPolygonausgabe
-|*              3. Linkhandler zum Schreiben eines Records fuer Setzen der Brush
+|*				1. Linkhandler zum Schreiben eines Records fuer Polygonausgabe
+|*				2. Linkhandler zum Schreiben eines Records fuer PolyPolygonausgabe
+|*				3. Linkhandler zum Schreiben eines Records fuer Setzen der Brush
 |*
 \******************************************************************************/
 
 
 class GradientWrapper
 {
-    Link        aDrawPolyRecordHdl;
-    Link        aDrawPolyPolyRecordHdl;
-    Link        aSetFillInBrushRecordHdl;
+    Link		aDrawPolyRecordHdl;
+    Link		aDrawPolyPolyRecordHdl;
+    Link		aSetFillInBrushRecordHdl;
 
                 GradientWrapper() {};
 
@@ -68,10 +68,10 @@ public:
                 ~GradientWrapper();
 
 
-    void        WriteLinearGradient(const Rectangle& rRect,
+    void 		WriteLinearGradient(const Rectangle& rRect,
                                     const Gradient& rGradient);
-    void        WriteRadialGradient(const Rectangle& rRect,
+    void		WriteRadialGradient(const Rectangle& rRect,
                                     const Gradient& rGradient);
-    void        WriteRectGradient(const Rectangle& rRect,
+    void		WriteRectGradient(const Rectangle& rRect,
                                   const Gradient& rGradient);
 };
diff --git a/svtools/source/inc/iodlg.hrc b/svtools/source/inc/iodlg.hrc
index e78e3fb687fe..2627a9ae1e26 100644
--- a/svtools/source/inc/iodlg.hrc
+++ b/svtools/source/inc/iodlg.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
@@ -34,43 +34,43 @@
 
 // ModalDialog DLG_SVT_EXPLORERFILE
 
-#define FT_EXPLORERFILE_CURRENTPATH         10
-#define BTN_EXPLORERFILE_NEWFOLDER          11
-#define BTN_EXPLORERFILE_LISTVIEW           12
-#define BTN_EXPLORERFILE_DETAILSVIEW        13
-#define BTN_EXPLORERFILE_UP                 14
-#define BTN_EXPLORERFILE_STANDARD           15
-#define BTN_EXPLORERFILE_OPEN               16
-#define BTN_EXPLORERFILE_CANCEL             17
-#define BTN_EXPLORERFILE_HELP               18
-
-#define IMG_FILEDLG_BTN_UP                  10
-#define IMG_FILEDLG_BTN_STD                 11
+#define FT_EXPLORERFILE_CURRENTPATH			10
+#define BTN_EXPLORERFILE_NEWFOLDER			11
+#define BTN_EXPLORERFILE_LISTVIEW			12
+#define BTN_EXPLORERFILE_DETAILSVIEW		13
+#define BTN_EXPLORERFILE_UP					14
+#define BTN_EXPLORERFILE_STANDARD			15
+#define BTN_EXPLORERFILE_OPEN				16
+#define BTN_EXPLORERFILE_CANCEL				17
+#define BTN_EXPLORERFILE_HELP				18
+
+#define IMG_FILEDLG_BTN_UP					10
+#define IMG_FILEDLG_BTN_STD					11
 #define IMG_FILEDLG_CREATEFOLDER            15
 
-#define CTL_EXPLORERFILE_FILELIST           20
+#define CTL_EXPLORERFILE_FILELIST			20
 
-#define FT_EXPLORERFILE_FILENAME            30
-#define ED_EXPLORERFILE_FILENAME            31
-#define FT_EXPLORERFILE_SHARED_LISTBOX      32
-#define LB_EXPLORERFILE_SHARED_LISTBOX      33
-#define FT_EXPLORERFILE_FILETYPE            34
-#define LB_EXPLORERFILE_FILETYPE            35
+#define FT_EXPLORERFILE_FILENAME			30
+#define ED_EXPLORERFILE_FILENAME			31
+#define FT_EXPLORERFILE_SHARED_LISTBOX		32
+#define LB_EXPLORERFILE_SHARED_LISTBOX		33
+#define FT_EXPLORERFILE_FILETYPE			34
+#define LB_EXPLORERFILE_FILETYPE			35
 
-#define CB_EXPLORERFILE_READONLY            40
-#define CB_EXPLORERFILE_PASSWORD            41
-#define CB_AUTO_EXTENSION                   42
-#define CB_OPTIONS                          43
+#define CB_EXPLORERFILE_READONLY			40
+#define CB_EXPLORERFILE_PASSWORD			41
+#define CB_AUTO_EXTENSION					42
+#define CB_OPTIONS							43
 
 // -----------------------------------------------
 
 #define STR_EXPLORERFILE_OPEN               1
 #define STR_EXPLORERFILE_SAVE               2
-#define STR_EXPLORERFILE_BUTTONSAVE         3
-#define STR_PATHNAME                        4
-#define STR_PATHSELECT                      5
-#define STR_BUTTONSELECT                    6
-#define STR_ACTUALVERSION                   7
+#define STR_EXPLORERFILE_BUTTONSAVE     	3
+#define STR_PATHNAME						4
+#define STR_PATHSELECT						5
+#define STR_BUTTONSELECT					6
+#define STR_ACTUALVERSION					7
 
 // DLG_SVT_QUERYFOLDERNAME -----------------------
 
@@ -92,16 +92,16 @@
 #define HID_FILEDLG_USE_PASSWD          (HID_SFX_START +  31)
 #define HID_FILEDLG_READ_ONLY           (HID_SFX_START +  32)
 
-#define HID_FILEDLG_AUTOCOMPLETEBOX     (HID_SFX_START + 218)
-#define HID_FILEDLG_SAVE_BTN            (HID_SFX_START + 219)
-#define HID_FILEDLG_SAVE_FILENAME       (HID_SFX_START + 220)
-#define HID_FILEDLG_SAVE_FILETYPE       (HID_SFX_START + 221)
-#define HID_FILEDLG_INSERT_BTN          (HID_SFX_START + 222)
-#define HID_FILEDLG_PATH_BTN            (HID_SFX_START + 223)
-#define HID_FILEDLG_PATH_FILENAME       (HID_SFX_START + 224)
-#define HID_FILEDLG_FOLDER_BTN          (HID_SFX_START + 225)
-#define HID_FILEDLG_FOLDER_FILENAME     (HID_SFX_START + 226)
-#define HID_FILEDLG_SRCHFOLDER_BTN      (HID_SFX_START + 227)
+#define HID_FILEDLG_AUTOCOMPLETEBOX		(HID_SFX_START + 218)
+#define HID_FILEDLG_SAVE_BTN			(HID_SFX_START + 219)
+#define HID_FILEDLG_SAVE_FILENAME		(HID_SFX_START + 220)
+#define HID_FILEDLG_SAVE_FILETYPE		(HID_SFX_START + 221)
+#define HID_FILEDLG_INSERT_BTN			(HID_SFX_START + 222)
+#define HID_FILEDLG_PATH_BTN			(HID_SFX_START + 223)
+#define HID_FILEDLG_PATH_FILENAME		(HID_SFX_START + 224)
+#define HID_FILEDLG_FOLDER_BTN			(HID_SFX_START + 225)
+#define HID_FILEDLG_FOLDER_FILENAME		(HID_SFX_START + 226)
+#define HID_FILEDLG_SRCHFOLDER_BTN		(HID_SFX_START + 227)
 
 #endif
 
diff --git a/svtools/source/inc/jpeg.hxx b/svtools/source/inc/jpeg.hxx
index 9923190c5e21..b2431ce567a3 100644
--- a/svtools/source/inc/jpeg.hxx
+++ b/svtools/source/inc/jpeg.hxx
@@ -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
@@ -50,68 +50,68 @@ enum ReadState
 };
 
 // --------------
-// - JPEGReader -
+// - JPEGReader	-
 // --------------
 
 class JPEGReader : public GraphicReader
 {
-    SvStream&           rIStm;
-    Bitmap              aBmp;
-    Bitmap              aBmp1;
-    BitmapWriteAccess*  pAcc;
-    BitmapWriteAccess*  pAcc1;
-    void*               pBuffer;
-    long                nLastPos;
-    long                nFormerPos;
-    long                nLastLines;
+    SvStream&			rIStm;
+    Bitmap				aBmp;
+    Bitmap				aBmp1;
+    BitmapWriteAccess*	pAcc;
+    BitmapWriteAccess*	pAcc1;
+    void*				pBuffer;
+    long				nLastPos;
+    long				nFormerPos;
+    long				nLastLines;
     sal_Bool            bSetLogSize;
 
-    Graphic             CreateIntermediateGraphic( const Bitmap& rBitmap, long nLines );
-    void                FillBitmap();
+    Graphic				CreateIntermediateGraphic( const Bitmap& rBitmap, long nLines );
+    void				FillBitmap();
 
 public:
 
-    void*               CreateBitmap( void* JPEGCreateBitmapParam );
+    void*				CreateBitmap( void* JPEGCreateBitmapParam );
 
 public:
 
 
 
                         JPEGReader( SvStream& rStm, void* pCallData, sal_Bool bSetLogSize );
-    virtual             ~JPEGReader();
+    virtual				~JPEGReader();
 
 
-    ReadState           Read( Graphic& rGraphic );
+    ReadState			Read( Graphic& rGraphic );
 };
 
 // --------------
-// - JPEGWriter -
+// - JPEGWriter	-
 // --------------
 
 class JPEGWriter
 {
-    SvStream&           rOStm;
-    Bitmap              aBmp;
-    BitmapReadAccess*   pAcc;
-    BYTE*               pBuffer;
-    BOOL                bNative;
-
-    sal_Bool            bGreys;
-    sal_Int32           nQuality;
-
+    SvStream&			rOStm;
+    Bitmap				aBmp;
+    BitmapReadAccess*	pAcc;
+    BYTE*				pBuffer;
+    BOOL				bNative;
+
+    sal_Bool			bGreys;
+    sal_Int32			nQuality;
+    
     bool*               pExpWasGrey;
 
     com::sun::star::uno::Reference< com::sun::star::task::XStatusIndicator > xStatusIndicator;
 
 public:
 
-    void*               GetScanline( long nY );
+    void*				GetScanline( long nY );
 
-                        JPEGWriter( SvStream& rOStm, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >* pFilterData,
+                        JPEGWriter( SvStream& rOStm, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >* pFilterData, 
                                     bool* pExportWasGrey = NULL );
                         ~JPEGWriter() {};
 
-    BOOL                Write( const Graphic& rGraphic );
+    BOOL				Write( const Graphic& rGraphic );
 };
 
 #endif // _JPEGPRIVATE
diff --git a/svtools/source/inc/msgrd.hxx b/svtools/source/inc/msgrd.hxx
index 2d3dcccb1244..0df987e89e01 100644
--- a/svtools/source/inc/msgrd.hxx
+++ b/svtools/source/inc/msgrd.hxx
@@ -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
diff --git a/svtools/source/inc/msgwr.hxx b/svtools/source/inc/msgwr.hxx
index 7e72e98c124c..7955eb1c4724 100644
--- a/svtools/source/inc/msgwr.hxx
+++ b/svtools/source/inc/msgwr.hxx
@@ -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
diff --git a/svtools/source/inc/property.hxx b/svtools/source/inc/property.hxx
index 689da1faf140..b1e4f9a53bfa 100644
--- a/svtools/source/inc/property.hxx
+++ b/svtools/source/inc/property.hxx
@@ -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
@@ -59,7 +59,7 @@
 #include <vcl/scrbar.hxx>
 #include <svl/svarray.hxx>
 
-#ifndef _SVSTDARR_STRINGS
+#ifndef	_SVSTDARR_STRINGS
 #define _SVSTDARR_STRINGS
 #include <svl/svstdarr.hxx>
 #endif
@@ -80,34 +80,34 @@ public:
                                         SvXPropertyControl( Window* pParent, WinBits nWinStyle = 0 );
                                         SvXPropertyControl( Window* pParent, const ResId& rResId );
 
-        virtual void                    SetSvXPropertyCtrListener(SvXPropertyCtrListener*)=0;
+        virtual void					SetSvXPropertyCtrListener(SvXPropertyCtrListener*)=0;
 
-        virtual SvXPropertyCtrListener* GetSvXPropertyCtrListener()=0;
-        virtual void                    SetProperty(const String &rString)=0;
-        virtual String                  GetProperty()const=0;
-        virtual BOOL                    HasList()=0;
-        virtual void                    ClearList()=0;
-        virtual void                    InsertEntry( const String& rString,
+        virtual SvXPropertyCtrListener*	GetSvXPropertyCtrListener()=0;
+        virtual void					SetProperty(const String &rString)=0;
+        virtual String					GetProperty()const=0;
+        virtual BOOL					HasList()=0;
+        virtual void					ClearList()=0;
+        virtual	void					InsertEntry( const String& rString,
                                                 USHORT nPos = LISTBOX_APPEND )=0;
 
-        virtual void                    SetCtrSize(const Size& rSize)=0;
-        virtual void                    SetLocked(BOOL bLocked=TRUE)=0;
+        virtual void					SetCtrSize(const Size& rSize)=0;
+        virtual void					SetLocked(BOOL bLocked=TRUE)=0;
 
-        virtual void                    SetMyName(const String &rString)=0;
-        virtual String                  GetMyName()const=0;
+        virtual void					SetMyName(const String &rString)=0;
+        virtual String					GetMyName()const=0;
 
-        virtual void                    SetMyData(void*)=0;
-        virtual void*                   GetMyData()=0;
+        virtual void					SetMyData(void*)=0;
+        virtual void*					GetMyData()=0;
 };
 
 class SvXPropertyCtrListener
 {
 
 public:
-        virtual void                    Modified (SvXPropertyControl *pSvXPCtr)=0;
-        virtual void                    GetFocus (SvXPropertyControl *pSvXPCtr)=0;
-        virtual void                    LoseFocus(SvXPropertyControl *pSvXPCtr)=0;
-        virtual void                    KeyInput (SvXPropertyControl *pSvXPCtr ,const KeyCode&)=0;
+        virtual void					Modified (SvXPropertyControl *pSvXPCtr)=0;
+        virtual void					GetFocus (SvXPropertyControl *pSvXPCtr)=0;
+        virtual void					LoseFocus(SvXPropertyControl *pSvXPCtr)=0;
+        virtual void					KeyInput (SvXPropertyControl *pSvXPCtr ,const KeyCode&)=0;
 };
 
 
@@ -115,10 +115,10 @@ class SvXPropertyEdit : public SvXPropertyControl
 {
 private:
 
-        String                          aName;
-        SvXPropertyCtrListener*         pListener;
-        Edit                            aEdit;
-        void*                           pData;
+        String							aName;
+        SvXPropertyCtrListener*			pListener;
+        Edit							aEdit;
+        void*							pData;
 
         DECL_LINK(ModifiedHdl,Edit*);
         DECL_LINK(GetFocusHdl,Edit*);
@@ -128,26 +128,26 @@ public:
                                         SvXPropertyEdit( Window* pParent, WinBits nWinStyle = 0 );
                                         SvXPropertyEdit( Window* pParent, const ResId& rResId );
 
-        virtual void                    SetSvXPropertyCtrListener(SvXPropertyCtrListener*);
+        virtual void					SetSvXPropertyCtrListener(SvXPropertyCtrListener*);
 
-        virtual SvXPropertyCtrListener* GetSvXPropertyCtrListener();
+        virtual SvXPropertyCtrListener*	GetSvXPropertyCtrListener();
 
-        virtual void                    SetProperty(const String &rString);
-        virtual String                  GetProperty()const;
+        virtual void					SetProperty(const String &rString);
+        virtual String					GetProperty()const;
 
-        virtual BOOL                    HasList();
-        virtual void                    ClearList();
-        virtual void                    InsertEntry( const String& rString,
+        virtual BOOL					HasList();
+        virtual void					ClearList();
+        virtual	void					InsertEntry( const String& rString,
                                                 USHORT nPos = LISTBOX_APPEND );
 
-        virtual void                    SetCtrSize(const Size& rSize);
-        virtual void                    SetLocked(BOOL bLocked=TRUE);
+        virtual void					SetCtrSize(const Size& rSize);
+        virtual void					SetLocked(BOOL bLocked=TRUE);
 
-        virtual void                    SetMyName(const String &rString);
-        virtual String                  GetMyName()const;
+        virtual void					SetMyName(const String &rString);
+        virtual String					GetMyName()const;
 
-        virtual void                    SetMyData(void*);
-        virtual void*                   GetMyData();
+        virtual void					SetMyData(void*);
+        virtual void*					GetMyData();
 };
 
 
@@ -155,10 +155,10 @@ class SvXPropertyListBox : public SvXPropertyControl
 {
 private:
 
-        String                          aName;
-        SvXPropertyCtrListener*         pListener;
-        ListBox                         aListBox;
-        void*                           pData;
+        String							aName;
+        SvXPropertyCtrListener*			pListener;
+        ListBox							aListBox;
+        void*							pData;
 
         DECL_LINK(ModifiedHdl,ListBox*);
         DECL_LINK(GetFocusHdl,ListBox*);
@@ -169,38 +169,38 @@ public:
                                         SvXPropertyListBox( Window* pParent, WinBits nWinStyle = 0 );
                                         SvXPropertyListBox( Window* pParent, const ResId& rResId );
 
-        virtual void                    SetSvXPropertyCtrListener(SvXPropertyCtrListener*);
+        virtual void					SetSvXPropertyCtrListener(SvXPropertyCtrListener*);
 
-        virtual SvXPropertyCtrListener* GetSvXPropertyCtrListener();
+        virtual SvXPropertyCtrListener*	GetSvXPropertyCtrListener();
 
-        ListBox*                        GetListBox();
+        ListBox*						GetListBox();
 
-        virtual void                    SetProperty(const String &rString);
-        virtual String                  GetProperty()const;
+        virtual void					SetProperty(const String &rString);
+        virtual String					GetProperty()const;
 
-        virtual BOOL                    HasList();
-        virtual void                    ClearList();
-        virtual void                    InsertEntry( const String& rString,
+        virtual BOOL					HasList();
+        virtual void					ClearList();
+        virtual	void					InsertEntry( const String& rString,
                                                 USHORT nPos = LISTBOX_APPEND );
 
-        virtual void                    SetCtrSize(const Size& rSize);
-        virtual void                    SetLocked(BOOL bLocked=TRUE);
+        virtual void					SetCtrSize(const Size& rSize);
+        virtual void					SetLocked(BOOL bLocked=TRUE);
 
-        virtual void                    SetMyName(const String &rString);
-        virtual String                  GetMyName()const;
+        virtual void					SetMyName(const String &rString);
+        virtual String					GetMyName()const;
 
-        virtual void                    SetMyData(void*);
-        virtual void*                   GetMyData();
+        virtual void					SetMyData(void*);
+        virtual void*					GetMyData();
 };
 
 class SvXPropertyComboBox : public SvXPropertyControl
 {
 private:
 
-        String                          aName;
-        SvXPropertyCtrListener*         pListener;
-        ComboBox                        aComboBox;
-        void*                           pData;
+        String							aName;
+        SvXPropertyCtrListener*			pListener;
+        ComboBox						aComboBox;
+        void*							pData;
 
         DECL_LINK(ModifiedHdl,ComboBox*);
         DECL_LINK(GetFocusHdl,ComboBox*);
@@ -211,28 +211,28 @@ public:
                                         SvXPropertyComboBox( Window* pParent, WinBits nWinStyle = 0 );
                                         SvXPropertyComboBox( Window* pParent, const ResId& rResId );
 
-        virtual void                    SetSvXPropertyCtrListener(SvXPropertyCtrListener*);
+        virtual void					SetSvXPropertyCtrListener(SvXPropertyCtrListener*);
 
-        virtual SvXPropertyCtrListener* GetSvXPropertyCtrListener();
+        virtual SvXPropertyCtrListener*	GetSvXPropertyCtrListener();
 
-        ComboBox*                       GetComboBox();
+        ComboBox*						GetComboBox();
 
-        virtual void                    SetProperty(const String &rString);
-        virtual String                  GetProperty()const;
+        virtual void					SetProperty(const String &rString);
+        virtual String					GetProperty()const;
 
-        virtual BOOL                    HasList();
-        virtual void                    ClearList();
-        virtual void                    InsertEntry( const String& rString,
+        virtual BOOL					HasList();
+        virtual void					ClearList();
+        virtual	void					InsertEntry( const String& rString,
                                                 USHORT nPos = LISTBOX_APPEND );
 
-        virtual void                    SetCtrSize(const Size& rSize);
-        virtual void                    SetLocked(BOOL bLocked=TRUE);
+        virtual void					SetCtrSize(const Size& rSize);
+        virtual void					SetLocked(BOOL bLocked=TRUE);
 
-        virtual void                    SetMyName(const String &rString);
-        virtual String                  GetMyName()const;
+        virtual void					SetMyName(const String &rString);
+        virtual String					GetMyName()const;
 
-        virtual void                    SetMyData(void*);
-        virtual void*                   GetMyData();
+        virtual void					SetMyData(void*);
+        virtual void*					GetMyData();
 };
 
 
@@ -240,19 +240,19 @@ public:
 class SvPropertyLine : public Control
 {
 private:
-            FixedText           aName;
-            USHORT              nNameWidth;
-            BOOL                bNeedsRepaint;
-            SvXPropertyControl* pSvXPropertyControl;
+            FixedText			aName;
+            USHORT				nNameWidth;
+            BOOL				bNeedsRepaint;
+            SvXPropertyControl*	pSvXPropertyControl;
 
-            PushButton          aXButton;
-            BOOL                bIsLocked;
-            BOOL                bHasXButton;
-            BOOL                bIsHyperlink;
-            eKindOfControl      eKindOfCtr;
+            PushButton			aXButton;
+            BOOL				bIsLocked;
+            BOOL				bHasXButton;
+            BOOL				bIsHyperlink;
+            eKindOfControl		eKindOfCtr;
 
 protected:
-            virtual void        Resize();
+            virtual void		Resize();
 
 public:
             SvPropertyLine( Window* pParent,
@@ -260,28 +260,28 @@ public:
             SvPropertyLine( Window* pParent,
                             const ResId& rResId );
 
-            BOOL                NeedsRepaint();
-            void                SetNeedsRepaint(BOOL bFlag);
-            void                SetSvXPropertyControl(SvXPropertyControl*);
-            SvXPropertyControl* GetSvXPropertyControl();
+            BOOL				NeedsRepaint();
+            void				SetNeedsRepaint(BOOL bFlag);
+            void				SetSvXPropertyControl(SvXPropertyControl*);
+            SvXPropertyControl*	GetSvXPropertyControl();
 
-            void                SetKindOfControl(eKindOfControl);
-            eKindOfControl      GetKindOfControl();
+            void				SetKindOfControl(eKindOfControl);
+            eKindOfControl		GetKindOfControl();
 
-            void                SetName(const String& rString );
-            String              GetName() const;
-            void                SetNameWidth(USHORT);
+            void				SetName(const String& rString );
+            String				GetName() const;
+            void				SetNameWidth(USHORT);
 
-            void                ShowXButton();
-            void                HideXButton();
-            BOOL                IsVisibleXButton();
-            void                ShowAsHyperLink(BOOL nFlag=TRUE);
-            BOOL                IsShownAsHyperlink();
+            void				ShowXButton();
+            void				HideXButton();
+            BOOL				IsVisibleXButton();
+            void				ShowAsHyperLink(BOOL nFlag=TRUE);
+            BOOL				IsShownAsHyperlink();
 
-            void                Locked(BOOL nFlag=TRUE);
-            BOOL                IsLineLocked();
+            void				Locked(BOOL nFlag=TRUE);
+            BOOL				IsLineLocked();
 
-            void                SetClickHdl(const Link&);
+            void				SetClickHdl(const Link&);
 
 };
 
@@ -289,16 +289,16 @@ public:
 class SvPropertyData
 {
 public:
-        eKindOfControl          eKind;
-        String                  aName;
-        String                  aValue;
-        SvStrings               theValues; // ???
-
-        BOOL                    bHasVisibleXButton;
-        BOOL                    bIsHyperLink;
-        BOOL                    bIsLocked;
-        void*                   pDataPtr;
-        SvXPropertyControl*     pControl;
+        eKindOfControl			eKind;
+        String					aName;
+        String					aValue;
+        SvStrings				theValues; // ???
+
+        BOOL					bHasVisibleXButton;
+        BOOL					bIsHyperLink;
+        BOOL					bIsLocked;
+        void*					pDataPtr;
+        SvXPropertyControl*		pControl;
 };
 
 class SvPropertyDataObjectControl
@@ -308,59 +308,59 @@ class SvPropertyDataObjectControl
 class SvPropertyDataControl
 {
 public:
-        virtual void                    Modified(   const String& aName,
+        virtual void					Modified(	const String& aName,
                                                     const String& aVal,
                                                     void* pData)=0;
 
-        virtual void                    Clicked(    const String& aName,
+        virtual void					Clicked(	const String& aName,
                                                     const String& aVal,
                                                     void* pData)=0;
 
-        virtual void                    Commit(     const String& aName,
+        virtual void					Commit(		const String& aName,
                                                     const String& aVal,
                                                     void* pData)=0;
 
-        virtual void                    Select(     const String& aName,
+        virtual void					Select(		const String& aName,
                                                     void* pData)=0;
 
-        virtual void                    LinkClicked(const String& aName,
+        virtual void					LinkClicked(const String& aName,
                                                     void* pData)=0;
 };
 
 class SvXPropEvListener: public SvXPropertyCtrListener
 {
-        Link                            aModifyLink;
-        Link                            aGetFocusLink;
-        Link                            aLoseFocusLink;
-        Link                            aKeyInputLink;
-        String                          aModifiedResult;
+        Link							aModifyLink;
+        Link							aGetFocusLink;
+        Link							aLoseFocusLink;
+        Link							aKeyInputLink;
+        String							aModifiedResult;
 
-        SvXPropertyControl *            pTheActiveControl;
-        KeyCode                         aKeyCode;
+        SvXPropertyControl *			pTheActiveControl;
+        KeyCode							aKeyCode;
 
 public:
                                         SvXPropEvListener();
         virtual                        ~SvXPropEvListener();
+        
+        virtual void					Modified (SvXPropertyControl *pSvXPCtr);
+        virtual void					GetFocus (SvXPropertyControl *pSvXPCtr);
+        virtual void					LoseFocus(SvXPropertyControl *pSvXPCtr);
+        virtual void					KeyInput(SvXPropertyControl *pSvXPCtr ,const KeyCode&);
 
-        virtual void                    Modified (SvXPropertyControl *pSvXPCtr);
-        virtual void                    GetFocus (SvXPropertyControl *pSvXPCtr);
-        virtual void                    LoseFocus(SvXPropertyControl *pSvXPCtr);
-        virtual void                    KeyInput(SvXPropertyControl *pSvXPCtr ,const KeyCode&);
-
-        SvXPropertyControl *                GetPropertyControl();
-        KeyCode                         GetKeyCode() const;
+        SvXPropertyControl *				GetPropertyControl();
+        KeyCode							GetKeyCode() const;
 
-        void                            SetModifyHdl( const Link& rLink ) { aModifyLink = rLink; }
-        const Link&                     GetModifyHdl() const { return aModifyLink; }
+        void							SetModifyHdl( const Link& rLink ) { aModifyLink = rLink; }
+        const Link&						GetModifyHdl() const { return aModifyLink; }
 
-        void                            SetGetFocusHdl( const Link& rLink ) { aGetFocusLink = rLink; }
-        const Link&                     GetGetFocusHdl() const { return aGetFocusLink; }
+        void							SetGetFocusHdl( const Link& rLink ) { aGetFocusLink = rLink; }
+        const Link&						GetGetFocusHdl() const { return aGetFocusLink; }
 
-        void                            SetLoseFocusHdl( const Link& rLink ) { aLoseFocusLink = rLink; }
-        const Link&                     GetLoseFocusHdl() const { return aLoseFocusLink; }
+        void							SetLoseFocusHdl( const Link& rLink ) { aLoseFocusLink = rLink; }
+        const Link&						GetLoseFocusHdl() const { return aLoseFocusLink; }
 
-        void                            SetKeyInputHdl( const Link& rLink ) { aKeyInputLink = rLink; }
-        const Link&                     GetKeyInputHdl() const { return aKeyInputLink; }
+        void							SetKeyInputHdl( const Link& rLink ) { aKeyInputLink = rLink; }
+        const Link&						GetKeyInputHdl() const { return aKeyInputLink; }
 
 
 };
@@ -373,18 +373,18 @@ class SvListBoxForProperties: public Control
 {
 private:
 
-            SvXPropEvListener       aListener;
-            Window                  aPlayGround;
-            ScrollBar               aVScroll;
-            SvPropLineArray         PLineArray;
-            SvPropertyDataControl*  pPropDataControl;
-            USHORT                  nRowHeight;
-            BOOL                    bUpdate;
-            USHORT                  nTheNameSize;
-            long                    nYOffset;
+            SvXPropEvListener		aListener;
+            Window					aPlayGround;
+            ScrollBar				aVScroll;
+            SvPropLineArray			PLineArray;
+            SvPropertyDataControl*	pPropDataControl;
+            USHORT					nRowHeight;
+            BOOL					bUpdate;
+            USHORT					nTheNameSize;
+            long					nYOffset;
 
             DECL_LINK(   ScrollHdl,ScrollBar*);
-            DECL_LINK(   ClickHdl ,PushButton*);
+            DECL_LINK(	 ClickHdl ,PushButton*);
 
             DECL_LINK(   ModifyHdl,SvXPropEvListener*);
             DECL_LINK( GetFocusHdl,SvXPropEvListener*);
@@ -392,12 +392,12 @@ private:
             DECL_LINK( KeyInputHdl,SvXPropEvListener*);
 
 protected:
-            void                    UpdateAll();
-            void                    UpdatePosNSize();
-            void                    UpdatePlayGround();
-            void                    UpdateVScroll();
+            void					UpdateAll();
+            void					UpdatePosNSize();
+            void					UpdatePlayGround();
+            void					UpdateVScroll();
 
-            void                    Resize();
+            void					Resize();
 
 public:
                                     SvListBoxForProperties( Window* pParent, WinBits nWinStyle = 0 );
@@ -405,27 +405,27 @@ public:
 
                                     ~SvListBoxForProperties();
 
-            virtual USHORT          CalcVisibleLines();
-            virtual void            EnableUpdate();
-            virtual void            DisableUpdate();
+            virtual USHORT			CalcVisibleLines();
+            virtual void			EnableUpdate();
+            virtual void			DisableUpdate();
 
-            virtual void            SetController(SvPropertyDataControl *);
+            virtual void			SetController(SvPropertyDataControl *);
 
-            virtual void            Clear();
+            virtual void			Clear();
 
-            virtual USHORT          InsertEntry( const SvPropertyData&, USHORT nPos = LISTBOX_APPEND );
+            virtual USHORT 			InsertEntry( const SvPropertyData&, USHORT nPos = LISTBOX_APPEND );
 
-            virtual void            ChangeEntry( const SvPropertyData&, USHORT nPos);
+            virtual void			ChangeEntry( const SvPropertyData&, USHORT nPos);
 
-            virtual USHORT          AppendEntry( const SvPropertyData&);
+            virtual USHORT 			AppendEntry( const SvPropertyData&);
 
-            virtual void            SetPropertyValue( const String & rEntryName, const String & rValue );
+            virtual void			SetPropertyValue( const String & rEntryName, const String & rValue );
 
-            virtual void            SetFirstVisibleEntry(USHORT nPos);
-            virtual USHORT          GetFirstVisibleEntry();
+            virtual void			SetFirstVisibleEntry(USHORT nPos);
+            virtual USHORT			GetFirstVisibleEntry();
 
-            virtual void            SetSelectedEntry(USHORT nPos);
-            virtual USHORT          GetSelectedEntry();
+            virtual void			SetSelectedEntry(USHORT nPos);
+            virtual USHORT			GetSelectedEntry();
 };
 
 class SvTabPageForProperties: public TabPage
@@ -433,11 +433,11 @@ class SvTabPageForProperties: public TabPage
 
 private:
 
-            SvListBoxForProperties  aLbProp;
+            SvListBoxForProperties	aLbProp;
 
 protected:
 
-            virtual void            Resize();
+            virtual void			Resize();
 
 public:
             SvTabPageForProperties(Window* pParent,WinBits nWinStyle = 0 );
@@ -450,58 +450,58 @@ class SvBasicPropertyDataControl: public SvPropertyDataControl
 {
 private:
 
-        BOOL                            bCorrectness;
-        String                          aEntryName;
-        String                          aEntryProperty;
-        String                          aCorrectProperty;
-        void*                           pTheData;
-        Link                            aModifyLink;
-        Link                            aClickedLink;
-        Link                            aCommitLink;
-        Link                            aSelectLink;
+        BOOL							bCorrectness;
+        String							aEntryName;
+        String							aEntryProperty;
+        String							aCorrectProperty;
+        void*							pTheData;
+        Link							aModifyLink;
+        Link							aClickedLink;
+        Link							aCommitLink;
+        Link							aSelectLink;
 
 public:
         virtual ~SvBasicPropertyDataControl();
 
-        virtual void                    Modified(   const String& aName,
+        virtual void					Modified(	const String& aName,
                                                     const String& aVal,
-                                                    void* pData);       //User has modified Property
+                                                    void* pData);		//User has modified Property
 
-        virtual void                    Clicked(    const String& aName,
+        virtual void					Clicked(	const String& aName,
                                                     const String& aVal,
-                                                    void* pData);       //Xtension-Button pressed
+                                                    void* pData);		//Xtension-Button pressed
 
-        virtual void                    Commit(     const String& aName,
+        virtual void					Commit(		const String& aName,
                                                     const String& aVal,
-                                                    void* pData);       //User accept changes
+                                                    void* pData);		//User accept changes
 
-        virtual void                    Select(     const String& aName,
-                                                    void* pData);       //User select new Row
+        virtual void					Select(		const String& aName,
+                                                    void* pData);		//User select new Row
 
-        virtual void                    LinkClicked(const String& aName,
+        virtual void					LinkClicked(const String& aName,
                                                     void* pData);
 
-        virtual void                    SetIsCorrect(BOOL nFlag);
+        virtual void					SetIsCorrect(BOOL nFlag);
 
-        //virtual String                    GetTheCorrectProperty()const;
-        virtual void                    SetTheCorrectProperty(const String& aName);
+        //virtual String					GetTheCorrectProperty()const;
+        virtual void					SetTheCorrectProperty(const String& aName);
 
-        String                          GetName() const; //Tell's the name of the Property
-        String                          GetProperty() const; //Tell's the content of the Property
-        void*                           GetData(); //Tell's the storage
+        String							GetName() const; //Tell's the name of the Property
+        String							GetProperty() const; //Tell's the content of the Property
+        void*							GetData(); //Tell's the storage
 
 
-        void                            SetModifyHdl( const Link& rLink ) { aModifyLink = rLink; }
-        const Link&                     GetModifyHdl() const { return aModifyLink; }
+        void							SetModifyHdl( const Link& rLink ) { aModifyLink = rLink; }
+        const Link&						GetModifyHdl() const { return aModifyLink; }
 
-        void                            SetClickedHdl( const Link& rLink ) { aClickedLink = rLink; }
-        const Link&                     GetClickedHdl() const { return aClickedLink; }
+        void							SetClickedHdl( const Link& rLink ) { aClickedLink = rLink; }
+        const Link&						GetClickedHdl() const { return aClickedLink; }
 
-        void                            SetCommitHdl( const Link& rLink ) { aCommitLink = rLink; }
-        const Link&                     GetCommitHdl() const { return aCommitLink; }
+        void							SetCommitHdl( const Link& rLink ) { aCommitLink = rLink; }
+        const Link&						GetCommitHdl() const { return aCommitLink; }
 
-        void                            SetSelectHdl( const Link& rLink ) { aSelectLink = rLink; }
-        const Link&                     GetSelectHdl() const { return aSelectLink; }
+        void							SetSelectHdl( const Link& rLink ) { aSelectLink = rLink; }
+        const Link&						GetSelectHdl() const { return aSelectLink; }
 
 };
 
@@ -509,42 +509,42 @@ public:
 class SvPropertyBox: public Control
 {
 private:
-            SvPropertyDataControl*      pThePropDataCtr;
-            TabControl                  aTabControl;
+            SvPropertyDataControl*		pThePropDataCtr;
+            TabControl					aTabControl;
 
 protected:
-            virtual void                Resize();
+            virtual void				Resize();
 
 public:
-                                        SvPropertyBox   ( Window* pParent, WinBits nWinStyle = 0 );
-                                        SvPropertyBox   ( Window* pParent, const ResId& rResId );
+                                        SvPropertyBox	( Window* pParent, WinBits nWinStyle = 0 );
+                                        SvPropertyBox	( Window* pParent, const ResId& rResId );
 
                                         ~SvPropertyBox();
 
-            virtual USHORT              CalcVisibleLines();
-            virtual void                EnableUpdate();     // auch IDL?
-            virtual void                DisableUpdate();    // auch IDL?
+            virtual USHORT				CalcVisibleLines();
+            virtual void				EnableUpdate();		// auch IDL?
+            virtual void				DisableUpdate();	// auch IDL?
 
             // AB: Hier beginnt das 'offizielle' Interface, das in IDL uebernommen werden soll
-            virtual void                SetController(SvPropertyDataControl *);
+            virtual void				SetController(SvPropertyDataControl *);
 
-            virtual USHORT              AppendPage( const String & r );
-            virtual void                SetPage( USHORT );
-            virtual USHORT              GetCurPage();
-            virtual void                ClearAll();
-            virtual void                ClearTable();
+            virtual USHORT 				AppendPage( const String & r );
+            virtual void				SetPage( USHORT );
+            virtual USHORT 				GetCurPage();
+            virtual void				ClearAll();
+            virtual void				ClearTable();
 
-            virtual void                SetPropertyValue( const String & rEntryName, const String & rValue );
+            virtual void				SetPropertyValue( const String & rEntryName, const String & rValue );
 
-            virtual USHORT              InsertEntry( const SvPropertyData&, USHORT nPos = LISTBOX_APPEND );
-            virtual void                ChangeEntry( const SvPropertyData&, USHORT nPos);
-            virtual USHORT              AppendEntry( const SvPropertyData&);
+            virtual USHORT 				InsertEntry( const SvPropertyData&, USHORT nPos = LISTBOX_APPEND );
+            virtual void				ChangeEntry( const SvPropertyData&, USHORT nPos);
+            virtual USHORT 				AppendEntry( const SvPropertyData&);
 
-            virtual void                SetFirstVisibleEntry(USHORT nPos);
-            virtual USHORT              GetFirstVisibleEntry();
+            virtual void				SetFirstVisibleEntry(USHORT nPos);
+            virtual USHORT				GetFirstVisibleEntry();
 
-            virtual void                SetSelectedEntry(USHORT nPos);
-            virtual USHORT              GetSelectedEntry();
+            virtual void				SetSelectedEntry(USHORT nPos);
+            virtual USHORT				GetSelectedEntry();
 };
 
 
@@ -553,30 +553,30 @@ public:
 class ScPropertyDlg : public ModalDialog
 {
 private:
-            SvBasicPropertyDataControl  aBaProDatCtr;
-            OKButton                    anOk;
-            CancelButton                aCancel;
-            USHORT                      nCount;
-            USHORT                      nClickCount;
+            SvBasicPropertyDataControl	aBaProDatCtr;
+            OKButton					anOk;
+            CancelButton				aCancel;
+            USHORT						nCount;
+            USHORT						nClickCount;
 
-            SvPropertyData              aProperty;
-            SvPropertyBox               aPropListBox;
+            SvPropertyData				aProperty;
+            SvPropertyBox				aPropListBox;
 
-            ListBox                     aKindOfListBox;
-            FixedText                   aModAnswer;
-            FixedText                   aClickAnswer;
-            FixedText                   aCommitAnswer;
-            FixedText                   aSelectAnswer;
+            ListBox						aKindOfListBox;
+            FixedText					aModAnswer;
+            FixedText					aClickAnswer;
+            FixedText					aCommitAnswer;
+            FixedText					aSelectAnswer;
 
             DECL_LINK( ModifiedHdl, ListBox*);
 
             DECL_LINK( RowModifiedHdl, SvBasicPropertyDataControl*);
-            DECL_LINK( ClickHdl      , SvBasicPropertyDataControl*);
-            DECL_LINK( SelectHdl     , SvBasicPropertyDataControl*);
-            DECL_LINK( CommitHdl     , SvBasicPropertyDataControl*);
+            DECL_LINK( ClickHdl		 , SvBasicPropertyDataControl*);
+            DECL_LINK( SelectHdl	 , SvBasicPropertyDataControl*);
+            DECL_LINK( CommitHdl	 , SvBasicPropertyDataControl*);
 
 public:
-            ScPropertyDlg( Window*  pParent);
+            ScPropertyDlg( Window*	pParent);
             ~ScPropertyDlg();
 };
 */
diff --git a/svtools/source/inc/provider.hxx b/svtools/source/inc/provider.hxx
index c54215482a0e..4ac43700d7f8 100644
--- a/svtools/source/inc/provider.hxx
+++ b/svtools/source/inc/provider.hxx
@@ -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
@@ -25,10 +25,10 @@
  *
  ************************************************************************/
 
-#ifndef _GOODIES_PROVIDER_HXX
-#define _GOODIES_PROVIDER_HXX
+#ifndef _GOODIES_PROVIDER_HXX 
+#define _GOODIES_PROVIDER_HXX 
 
-#include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/implbase1.hxx> 
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <com/sun/star/graphic/XGraphicProvider.hpp>
 #include <com/sun/star/awt/XBitmap.hpp>
@@ -44,13 +44,13 @@ namespace unographic {
 class GraphicProvider : public ::cppu::WeakImplHelper1< ::com::sun::star::graphic::XGraphicProvider >
 {
 public:
-
+        
     GraphicProvider();
     ~GraphicProvider();
-
+    
     static ::rtl::OUString getImplementationName_Static() throw();
     static ::com::sun::star::uno::Sequence< ::rtl::OUString >  getSupportedServiceNames_Static() throw();
-
+    
 protected:
 
     // XServiceInfo
@@ -61,12 +61,12 @@ protected:
     // XTypeProvider
     virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes(  ) throw(::com::sun::star::uno::RuntimeException);
     virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId(  ) throw(::com::sun::star::uno::RuntimeException);
-
+    
     // XGraphicProvider
     virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > SAL_CALL queryGraphicDescriptor( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& MediaProperties ) throw (::com::sun::star::io::IOException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
     virtual ::com::sun::star::uno::Reference< ::com::sun::star::graphic::XGraphic > SAL_CALL queryGraphic( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& MediaProperties ) throw (::com::sun::star::io::IOException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
     virtual void SAL_CALL storeGraphic( const ::com::sun::star::uno::Reference< ::com::sun::star::graphic::XGraphic >& Graphic, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& MediaProperties ) throw (::com::sun::star::io::IOException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
-
+    
 private:
 
     ::com::sun::star::uno::Reference< ::com::sun::star::graphic::XGraphic > implLoadMemory( const ::rtl::OUString& rResourceURL ) const;
@@ -79,4 +79,4 @@ private:
 
 }
 
-#endif
+#endif 
diff --git a/svtools/source/inc/renderer.hxx b/svtools/source/inc/renderer.hxx
index b58bd065245b..d6985deb22d6 100644
--- a/svtools/source/inc/renderer.hxx
+++ b/svtools/source/inc/renderer.hxx
@@ -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
@@ -25,8 +25,8 @@
  *
  ************************************************************************/
 
-#ifndef _GOODIES_RENDERER_HXX
-#define _GOODIES_RENDERER_HXX
+#ifndef _GOODIES_RENDERER_HXX 
+#define _GOODIES_RENDERER_HXX 
 
 #include <tools/gen.hxx>
 #include <comphelper/propertysethelper.hxx>
@@ -53,13 +53,13 @@ class GraphicRendererVCL : public ::cppu::OWeakAggObject,
                            public ::com::sun::star::graphic::XGraphicRenderer
 {
 public:
-
+        
     GraphicRendererVCL();
     ~GraphicRendererVCL() throw();
 
     static ::rtl::OUString getImplementationName_Static() throw();
     static ::com::sun::star::uno::Sequence< ::rtl::OUString >  getSupportedServiceNames_Static() throw();
-
+        
 protected:
 
     static ::comphelper::PropertySetInfo* createPropertySetInfo();
@@ -69,7 +69,7 @@ protected:
     virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException);
     virtual void SAL_CALL acquire() throw();
     virtual void SAL_CALL release() throw();
-
+    
     // XServiceInfo
     virtual rtl::OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException );
     virtual sal_Bool SAL_CALL supportsService( const rtl::OUString& ServiceName ) throw( ::com::sun::star::uno::RuntimeException );
@@ -82,19 +82,19 @@ protected:
     // PropertySetHelper
     virtual void _setPropertyValues( const comphelper::PropertyMapEntry** ppEntries, const ::com::sun::star::uno::Any* pValues ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException );
     virtual void _getPropertyValues( const comphelper::PropertyMapEntry** ppEntries, ::com::sun::star::uno::Any* pValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException );
-
+        
     // XGraphicRenderer
     virtual void SAL_CALL render( const ::com::sun::star::uno::Reference< ::com::sun::star::graphic::XGraphic >& Graphic ) throw (::com::sun::star::uno::RuntimeException);
 
 private:
 
     ::com::sun::star::uno::Reference< ::com::sun::star::awt::XDevice > mxDevice;
-
-    OutputDevice*               mpOutDev;
-    Rectangle                   maDestRect;
-    ::com::sun::star::uno::Any  maRenderData;
+    
+    OutputDevice*				mpOutDev;
+    Rectangle					maDestRect;
+    ::com::sun::star::uno::Any	maRenderData;
 };
 
 }
 
-#endif
+#endif 
diff --git a/svtools/source/inc/sgfbram.hxx b/svtools/source/inc/sgfbram.hxx
index 2acab5445a8c..05112a84debd 100644
--- a/svtools/source/inc/sgfbram.hxx
+++ b/svtools/source/inc/sgfbram.hxx
@@ -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
diff --git a/svtools/source/inc/sgffilt.hxx b/svtools/source/inc/sgffilt.hxx
index 1c75917b8f73..ad8f5b8df76c 100644
--- a/svtools/source/inc/sgffilt.hxx
+++ b/svtools/source/inc/sgffilt.hxx
@@ -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
diff --git a/svtools/source/inc/sgvmain.hxx b/svtools/source/inc/sgvmain.hxx
index 6f69908865c5..8b43423e3cec 100644
--- a/svtools/source/inc/sgvmain.hxx
+++ b/svtools/source/inc/sgvmain.hxx
@@ -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
diff --git a/svtools/source/inc/sgvspln.hxx b/svtools/source/inc/sgvspln.hxx
index 29df09247f22..094d5c7823a3 100644
--- a/svtools/source/inc/sgvspln.hxx
+++ b/svtools/source/inc/sgvspln.hxx
@@ -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
diff --git a/svtools/source/inc/svimpbox.hxx b/svtools/source/inc/svimpbox.hxx
index 92b9f960b65c..27cfd21e2a17 100644
--- a/svtools/source/inc/svimpbox.hxx
+++ b/svtools/source/inc/svimpbox.hxx
@@ -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
@@ -53,40 +53,40 @@ class TabBar;
 
 class ImpLBSelEng : public FunctionSet
 {
-    SvImpLBox*          pImp;
-    SelectionEngine*    pSelEng;
-    SvTreeListBox*      pView;
+    SvImpLBox* 			pImp;
+    SelectionEngine*	pSelEng;
+    SvTreeListBox*		pView;
 
 public:
     ImpLBSelEng( SvImpLBox* pImp, SelectionEngine* pSelEng,
                  SvTreeListBox* pView );
     virtual ~ImpLBSelEng();
-    void        BeginDrag();
-    void        CreateAnchor();
-    void        DestroyAnchor();
-    BOOL        SetCursorAtPoint( const Point& rPoint,
+    void 		BeginDrag();
+    void 		CreateAnchor();
+    void		DestroyAnchor();
+    BOOL 		SetCursorAtPoint( const Point& rPoint,
                     BOOL bDontSelectAtCursor=FALSE );
-    BOOL        IsSelectionAtPoint( const Point& rPoint );
-    void        DeselectAtPoint( const Point& rPoint );
-    void        DeselectAll();
+    BOOL 		IsSelectionAtPoint( const Point& rPoint );
+    void 		DeselectAtPoint( const Point& rPoint );
+    void 		DeselectAll();
 };
 
 // Flags fuer nFlag
-#define F_VER_SBARSIZE_WITH_HBAR        0x0001
-#define F_HOR_SBARSIZE_WITH_VBAR        0x0002
-#define F_IGNORE_NEXT_MOUSEMOVE         0x0004  // OS/2 only
-#define F_IN_SCROLLING                  0x0008
-#define F_DESEL_ALL                     0x0010
-#define F_START_EDITTIMER               0x0020  // MAC only
-#define F_IGNORE_SELECT                 0x0040
-#define F_IN_RESIZE                     0x0080
-#define F_REMOVED_ENTRY_INVISIBLE       0x0100
-#define F_REMOVED_RECALC_MOST_RIGHT     0x0200
-#define F_IGNORE_CHANGED_TABS           0x0400
-#define F_PAINTED                       0x0800
-#define F_IN_PAINT                      0x1000
-#define F_ENDSCROLL_SET_VIS_SIZE        0x2000
-#define F_FILLING                       0x4000
+#define F_VER_SBARSIZE_WITH_HBAR		0x0001
+#define F_HOR_SBARSIZE_WITH_VBAR		0x0002
+#define F_IGNORE_NEXT_MOUSEMOVE			0x0004	// OS/2 only
+#define F_IN_SCROLLING					0x0008
+#define F_DESEL_ALL						0x0010
+#define F_START_EDITTIMER				0x0020 	// MAC only
+#define F_IGNORE_SELECT					0x0040
+#define F_IN_RESIZE						0x0080
+#define F_REMOVED_ENTRY_INVISIBLE		0x0100
+#define F_REMOVED_RECALC_MOST_RIGHT		0x0200
+#define F_IGNORE_CHANGED_TABS			0x0400
+#define F_PAINTED						0x0800
+#define F_IN_PAINT						0x1000
+#define F_ENDSCROLL_SET_VIS_SIZE	   	0x2000
+#define F_FILLING 						0x4000
 
 
 class SvImpLBox
@@ -94,83 +94,83 @@ class SvImpLBox
 friend class ImpLBSelEng;
 friend class SvTreeListBox;
 private:
-    SvTreeListBox*      pView;
-    SvLBoxTreeList*     pTree;
-    SvLBoxEntry*        pCursor;
-    SvLBoxEntry*        pStartEntry;
-    SvLBoxEntry*        pAnchor;
-    SvLBoxEntry*        pMostRightEntry;
-    SvLBoxButton*       pActiveButton;
-    SvLBoxEntry*        pActiveEntry;
-    SvLBoxTab*          pActiveTab;
-    TabBar*             pTabBar;
-
-    ScrollBar           aVerSBar;
-    ScrollBar           aHorSBar;
-    ScrollBarBox        aScrBarBox;
+    SvTreeListBox* 		pView;
+    SvLBoxTreeList*		pTree;
+    SvLBoxEntry*		pCursor;
+    SvLBoxEntry*		pStartEntry;
+    SvLBoxEntry*  		pAnchor;
+    SvLBoxEntry*		pMostRightEntry;
+    SvLBoxButton* 		pActiveButton;
+    SvLBoxEntry* 		pActiveEntry;
+    SvLBoxTab* 			pActiveTab;
+    TabBar*				pTabBar;
+
+    ScrollBar   		aVerSBar;
+    ScrollBar   		aHorSBar;
+    ScrollBarBox 		aScrBarBox;
 
     ::svt::AccessibleFactoryAccess
                         m_aFactoryAccess;
 
-    static Image*       s_pDefCollapsed;
-    static Image*       s_pDefExpanded;
-    static Image*       s_pDefCollapsedHC;
-    static Image*       s_pDefExpandedHC;
-    static oslInterlockedCount  s_nImageRefCount; /// When 0 all static images will be destroyed
+    static Image*		s_pDefCollapsed;
+    static Image*		s_pDefExpanded;
+    static Image*		s_pDefCollapsedHC;
+    static Image*		s_pDefExpandedHC;
+    static oslInterlockedCount	s_nImageRefCount; /// When 0 all static images will be destroyed
 
     // Node Bitmaps
     enum ImageType
     {
-        itNodeExpanded = 0,     // node is expanded ( usually a bitmap showing a minus )
-        itNodeCollapsed,        // node is collapsed ( usually a bitmap showing a plus )
-        itNodeDontKnow,         // don't know the node state
-        itEntryDefExpanded,     // default for expanded entries
-        itEntryDefCollapsed,    // default for collapsed entries
+        itNodeExpanded = 0,		// node is expanded ( usually a bitmap showing a minus )
+        itNodeCollapsed,		// node is collapsed ( usually a bitmap showing a plus )
+        itNodeDontKnow,			// don't know the node state
+        itEntryDefExpanded,		// default for expanded entries
+        itEntryDefCollapsed,	// default for collapsed entries
 
         IT_IMAGE_COUNT
     };
 
     // all our images
-    Image               m_aNodeAndEntryImages[ IT_IMAGE_COUNT ];
+    Image				m_aNodeAndEntryImages[ IT_IMAGE_COUNT ];
     // plus the high contrast versions
-    Image               m_aNodeAndEntryImages_HC[ IT_IMAGE_COUNT ];
+    Image				m_aNodeAndEntryImages_HC[ IT_IMAGE_COUNT ];
 
     // wg. kompat. hier
-    Size                aOutputSize;
-    SelectionEngine     aSelEng;
-    ImpLBSelEng         aFctSet;
-    Timer               aAsyncBeginDragTimer;
-    Point               aAsyncBeginDragPos;
-
-    long                nYoffsNodeBmp;
-    long                nNodeBmpTabDistance; // typisch kleiner 0
-    long                nNodeBmpWidth;
-    long                nNextVerVisSize;
-    long                nMostRight;
-    ULONG               nVisibleCount;  // Anzahl Zeilen im Control
-    ULONG               nCurUserEvent; //-1 == kein Userevent amn Laufen
-    short               nHorSBarHeight, nVerSBarWidth;
-    USHORT              nFlags;
-    USHORT              nCurTabPos;
-
-    WinBits             nWinBits;
+    Size    			aOutputSize;
+    SelectionEngine 	aSelEng;
+    ImpLBSelEng			aFctSet;
+    Timer				aAsyncBeginDragTimer;
+    Point				aAsyncBeginDragPos;
+
+    long				nYoffsNodeBmp;
+    long				nNodeBmpTabDistance; // typisch kleiner 0
+    long				nNodeBmpWidth;
+    long				nNextVerVisSize;
+    long 				nMostRight;
+    ULONG     			nVisibleCount;  // Anzahl Zeilen im Control
+    ULONG				nCurUserEvent; //-1 == kein Userevent amn Laufen
+    short				nHorSBarHeight, nVerSBarWidth;
+    USHORT				nFlags;
+    USHORT				nCurTabPos;
+
+    WinBits				nWinBits;
     ExtendedWinBits     nExtendedWinBits;
-    BOOL                bSimpleTravel : 1; // ist TRUE bei SINGLE_SELECTION
-    BOOL                bUpdateMode : 1;
-    BOOL                bInVScrollHdl : 1;
-    BOOL                bAsyncBeginDrag : 1;
-    BOOL                bSubLstOpRet : 1;   // open/close sublist with return/enter, defaulted with FALSE
-    BOOL                bSubLstOpLR : 1;    // open/close sublist with cursor left/right, defaulted with FALSE
-    BOOL                bContextMenuHandling : 1;
-    BOOL                bIsCellFocusEnabled : 1;
+    BOOL				bSimpleTravel : 1; // ist TRUE bei SINGLE_SELECTION
+    BOOL				bUpdateMode : 1;
+    BOOL				bInVScrollHdl : 1;
+    BOOL				bAsyncBeginDrag : 1;
+    BOOL				bSubLstOpRet : 1;	// open/close sublist with return/enter, defaulted with FALSE
+    BOOL				bSubLstOpLR : 1;	// open/close sublist with cursor left/right, defaulted with FALSE
+    BOOL				bContextMenuHandling : 1;
+    BOOL				bIsCellFocusEnabled : 1;
 
     sal_Bool            bAreChildrenTransient;
 
-    Point               aEditClickPos;
-    Timer               aEditTimer;
+    Point				aEditClickPos;
+    Timer				aEditTimer;
 
     // #102891# -------------------
-    IntlWrapper *       pIntlWrapper;
+    IntlWrapper *		pIntlWrapper;
 
     // #97680# --------------------
     std::vector< short > aContextBmpWidthVector;
@@ -179,82 +179,82 @@ private:
 
     DECL_LINK( BeginDragHdl, void* );
     DECL_LINK( MyUserEvent,void*);
-    void                StopUserEvent();
+    void				StopUserEvent();
 
-    void                InvalidateEntriesFrom( long nY ) const;
-    void                InvalidateEntry( long nY ) const;
-    void                ShowVerSBar();
+    void 				InvalidateEntriesFrom( long nY ) const;
+    void 				InvalidateEntry( long nY ) const;
+    void 				ShowVerSBar();
     // setzt Thumb auf FirstEntryToDraw
-    void                SyncVerThumb();
-    BOOL                IsLineVisible( long nY ) const;
-    long                GetEntryLine( SvLBoxEntry* pEntry ) const;
-    void                FillView();
-    void                CursorDown();
-    void                CursorUp();
-    void                KeyLeftRight( long nDiff );
-    void                PageDown( USHORT nDelta );
-    void                PageUp( USHORT nDelta );
+    void 				SyncVerThumb();
+    BOOL 				IsLineVisible( long nY ) const;
+    long 				GetEntryLine( SvLBoxEntry* pEntry ) const;
+    void				FillView();
+    void 				CursorDown();
+    void 				CursorUp();
+    void				KeyLeftRight( long nDiff );
+    void 				PageDown( USHORT nDelta );
+    void 				PageUp( USHORT nDelta );
 
-    void                SetCursor( SvLBoxEntry* pEntry, BOOL bForceNoSelect = FALSE );
+    void				SetCursor( SvLBoxEntry* pEntry, BOOL bForceNoSelect = FALSE );
 
-    void                DrawNet();
+    void 				DrawNet();
 
     // ScrollBar-Handler
     DECL_LINK( ScrollUpDownHdl, ScrollBar * );
     DECL_LINK( ScrollLeftRightHdl, ScrollBar * );
     DECL_LINK( EndScrollHdl, ScrollBar * );
 
-    void                SetNodeBmpYOffset( const Image& );
-    void                SetNodeBmpTabDistance();
+    void				SetNodeBmpYOffset( const Image& );
+    void				SetNodeBmpTabDistance();
 
     // Selection-Engine
-    SvLBoxEntry*        MakePointVisible( const Point& rPoint,
+    SvLBoxEntry*  		MakePointVisible( const Point& rPoint,
                             BOOL bNotifyScroll=TRUE );
 
-    void                SetAnchorSelection( SvLBoxEntry* pOld,
+    void        		SetAnchorSelection( SvLBoxEntry* pOld,
                             SvLBoxEntry* pNewCursor );
-    void                BeginDrag();
-    BOOL                ButtonDownCheckCtrl( const MouseEvent& rMEvt,
-                            SvLBoxEntry* pEntry, long nY    );
-    BOOL                MouseMoveCheckCtrl( const MouseEvent& rMEvt,
+    void        		BeginDrag();
+    BOOL				ButtonDownCheckCtrl( const MouseEvent& rMEvt,
+                            SvLBoxEntry* pEntry, long nY	);
+    BOOL				MouseMoveCheckCtrl( const MouseEvent& rMEvt,
                             SvLBoxEntry* pEntry );
-    BOOL                ButtonUpCheckCtrl( const MouseEvent& rMEvt );
-    BOOL                ButtonDownCheckExpand( const MouseEvent&,
+    BOOL				ButtonUpCheckCtrl( const MouseEvent& rMEvt );
+    BOOL 				ButtonDownCheckExpand( const MouseEvent&,
                             SvLBoxEntry*,long nY );
 
-    void                PositionScrollBars( Size& rOSize, USHORT nMask );
-    USHORT              AdjustScrollBars( Size& rSize );
+    void				PositionScrollBars( Size& rOSize, USHORT nMask );
+    USHORT				AdjustScrollBars( Size& rSize );
 
-    void                BeginScroll();
-    void                EndScroll();
-    BOOL                InScroll() const { return (BOOL)(nFlags & F_IN_SCROLLING)!=0;}
-    Rectangle           GetVisibleArea() const;
-    BOOL                EntryReallyHit(SvLBoxEntry* pEntry,const Point& rPos,long nLine);
-    void                InitScrollBarBox();
-    SvLBoxTab*          NextTab( SvLBoxTab* );
+    void				BeginScroll();
+    void				EndScroll();
+    BOOL				InScroll() const { return (BOOL)(nFlags & F_IN_SCROLLING)!=0;}
+    Rectangle			GetVisibleArea() const;
+    BOOL				EntryReallyHit(SvLBoxEntry* pEntry,const Point& rPos,long nLine);
+    void				InitScrollBarBox();
+    SvLBoxTab*			NextTab( SvLBoxTab* );
 
-    BOOL                SetMostRight( SvLBoxEntry* pEntry );
-    void                FindMostRight( SvLBoxEntry* EntryToIgnore );
-    void                FindMostRight( SvLBoxEntry* pParent, SvLBoxEntry* EntryToIgnore );
-    void                FindMostRight_Impl( SvLBoxEntry* pParent,SvLBoxEntry* EntryToIgnore  );
-    void                NotifyTabsChanged();
+    BOOL				SetMostRight( SvLBoxEntry* pEntry );
+    void				FindMostRight( SvLBoxEntry* EntryToIgnore );
+    void 				FindMostRight( SvLBoxEntry* pParent, SvLBoxEntry* EntryToIgnore );
+    void 				FindMostRight_Impl( SvLBoxEntry* pParent,SvLBoxEntry* EntryToIgnore  );
+    void				NotifyTabsChanged();
 
-    inline BOOL         IsExpandable() const        // if element at cursor can be expanded in general
+    inline BOOL			IsExpandable() const		// if element at cursor can be expanded in general
                             { return pCursor->HasChilds() || pCursor->HasChildsOnDemand(); }
-    inline BOOL         IsNowExpandable() const     // if element at cursor can be expanded at this moment
+    inline BOOL			IsNowExpandable() const		// if element at cursor can be expanded at this moment
                             { return IsExpandable() && !pView->IsExpanded( pCursor ); }
 
-    static  void        implInitDefaultNodeImages();
+    static	void		implInitDefaultNodeImages();
 
     // #102891# -------------------
-    void                UpdateIntlWrapper();
+    void 				UpdateIntlWrapper();
 
     // #97680# --------------------
-    short               UpdateContextBmpWidthVector( SvLBoxEntry* pEntry, short nWidth );
-    void                UpdateContextBmpWidthMax( SvLBoxEntry* pEntry );
-    void                UpdateContextBmpWidthVectorFromMovedEntry( SvLBoxEntry* pEntry );
+    short				UpdateContextBmpWidthVector( SvLBoxEntry* pEntry, short nWidth );
+    void				UpdateContextBmpWidthMax( SvLBoxEntry* pEntry );
+    void				UpdateContextBmpWidthVectorFromMovedEntry( SvLBoxEntry* pEntry );
 
-    void                CalcCellFocusRect( SvLBoxEntry* pEntry, Rectangle& rRect );
+    void				CalcCellFocusRect( SvLBoxEntry* pEntry, Rectangle& rRect );
 
     inline sal_Bool     AreChildrenTransient() const { return bAreChildrenTransient; }
     inline void         SetChildrenNotTransient() { bAreChildrenTransient = sal_False; }
@@ -263,115 +263,115 @@ public:
     SvImpLBox( SvTreeListBox* pView, SvLBoxTreeList*, WinBits nWinStyle );
     ~SvImpLBox();
 
-    void                Clear();
-    void                SetWindowBits( WinBits nWinStyle );
-    void                SetExtendedWindowBits( ExtendedWinBits _nBits );
+    void 				Clear();
+    void 				SetWindowBits( WinBits nWinStyle );
+    void 				SetExtendedWindowBits( ExtendedWinBits _nBits );
     ExtendedWinBits     GetExtendedWindowBits() const { return nExtendedWinBits; }
-    void                SetModel( SvLBoxTreeList* pModel ) { pTree = pModel;}
-
-    void                EntryInserted( SvLBoxEntry*);
-    void                RemovingEntry( SvLBoxEntry* pEntry );
-    void                EntryRemoved();
-    void                MovingEntry( SvLBoxEntry* pEntry );
-    void                EntryMoved( SvLBoxEntry* pEntry );
-    void                TreeInserted( SvLBoxEntry* pEntry );
-
-    void                IndentChanged( short nIndentPixel );
-    void                EntryExpanded( SvLBoxEntry* pEntry );
-    void                EntryCollapsed( SvLBoxEntry* pEntry );
-    void                CollapsingEntry( SvLBoxEntry* pEntry );
-    void                EntrySelected( SvLBoxEntry*, BOOL bSelect );
-
-    void                Paint( const Rectangle& rRect );
-    void                RepaintSelectionItems();
-    void                MouseButtonDown( const MouseEvent& );
-    void                MouseButtonUp( const MouseEvent& );
-    void                MouseMove( const MouseEvent&);
-    BOOL                KeyInput( const KeyEvent& );
-    void                Resize();
-    void                GetFocus();
-    void                LoseFocus();
-    void                UpdateAll(
+    void 				SetModel( SvLBoxTreeList* pModel ) { pTree = pModel;}
+
+    void 				EntryInserted( SvLBoxEntry*);
+    void 				RemovingEntry( SvLBoxEntry* pEntry );
+    void 				EntryRemoved();
+    void 				MovingEntry( SvLBoxEntry* pEntry );
+    void 				EntryMoved( SvLBoxEntry* pEntry );
+    void 				TreeInserted( SvLBoxEntry* pEntry );
+
+    void 				IndentChanged( short nIndentPixel );
+    void 				EntryExpanded( SvLBoxEntry* pEntry );
+    void 				EntryCollapsed( SvLBoxEntry* pEntry );
+    void 				CollapsingEntry( SvLBoxEntry* pEntry );
+    void 				EntrySelected( SvLBoxEntry*, BOOL bSelect );
+
+    void	 			Paint( const Rectangle& rRect );
+    void 				RepaintSelectionItems();
+    void 				MouseButtonDown( const MouseEvent& );
+    void 				MouseButtonUp( const MouseEvent& );
+    void 				MouseMove( const MouseEvent&);
+    BOOL 				KeyInput( const KeyEvent& );
+    void 				Resize();
+    void 				GetFocus();
+    void 				LoseFocus();
+    void 				UpdateAll(
                             BOOL bInvalidateCompleteView= TRUE,
                             BOOL bUpdateVerSBar = TRUE );
-    void                SetEntryHeight( short nHeight );
-    void                PaintEntry( SvLBoxEntry* pEntry );
-    void                InvalidateEntry( SvLBoxEntry* );
-    void                RecalcFocusRect();
-
-    inline void         SelectEntry( SvLBoxEntry* pEntry, BOOL bSelect );
-    void                SetDragDropMode( DragDropMode eDDMode );
-    void                SetSelectionMode( SelectionMode eSelMode  );
-    void                SetAddMode( BOOL ) { aSelEng.AddAlways(FALSE); }
-    BOOL                IsAddMode() const { return aSelEng.IsAlwaysAdding(); }
-
-    SvLBoxEntry*        GetCurrentEntry() const { return pCursor; }
-    BOOL                IsEntryInView( SvLBoxEntry* ) const;
-    SvLBoxEntry*        GetEntry( const Point& rPos ) const;
+    void 				SetEntryHeight( short nHeight );
+    void 				PaintEntry( SvLBoxEntry* pEntry );
+    void 				InvalidateEntry( SvLBoxEntry* );
+    void 				RecalcFocusRect();
+
+    inline void 		SelectEntry( SvLBoxEntry* pEntry, BOOL bSelect );
+    void 				SetDragDropMode( DragDropMode eDDMode );
+    void 				SetSelectionMode( SelectionMode eSelMode  );
+    void				SetAddMode( BOOL ) { aSelEng.AddAlways(FALSE); }
+    BOOL				IsAddMode() const { return aSelEng.IsAlwaysAdding(); }
+
+    SvLBoxEntry* 		GetCurrentEntry() const { return pCursor; }
+    BOOL				IsEntryInView( SvLBoxEntry* ) const;
+    SvLBoxEntry* 		GetEntry( const Point& rPos ) const;
     // gibt letzten Eintrag zurueck, falls Pos unter letztem Eintrag
-    SvLBoxEntry*        GetClickedEntry( const Point& ) const;
-    SvLBoxEntry*        GetCurEntry() const { return pCursor; }
-    void                SetCurEntry( SvLBoxEntry* );
-    Point               GetEntryPosition( SvLBoxEntry* ) const;
-    void                MakeVisible( SvLBoxEntry* pEntry, BOOL bMoveToTop=FALSE );
+    SvLBoxEntry* 		GetClickedEntry( const Point& ) const;
+    SvLBoxEntry* 		GetCurEntry() const { return pCursor; }
+    void				SetCurEntry( SvLBoxEntry* );
+    Point 				GetEntryPosition( SvLBoxEntry* ) const;
+    void 				MakeVisible( SvLBoxEntry* pEntry, BOOL bMoveToTop=FALSE );
 
-    void                PaintDDCursor( SvLBoxEntry* );
+    void 				PaintDDCursor( SvLBoxEntry* );
 
     // Images
-    inline Image&       implGetImageLocation( const ImageType _eType, BmpColorMode _eMode );
-    inline Image&       implGetImageLocationWithFallback( const ImageType _eType, BmpColorMode _eMode ) const;
+    inline Image&		implGetImageLocation( const ImageType _eType, BmpColorMode _eMode );
+    inline Image&		implGetImageLocationWithFallback( const ImageType _eType, BmpColorMode _eMode ) const;
 
-    inline void         SetExpandedNodeBmp( const Image& _rImg, BmpColorMode _eMode = BMP_COLOR_NORMAL );
-    inline void         SetCollapsedNodeBmp( const Image& _rImg, BmpColorMode _eMode = BMP_COLOR_NORMAL  );
-    inline void         SetDontKnowNodeBmp( const Image& rImg, BmpColorMode _eMode = BMP_COLOR_NORMAL );
+    inline void 		SetExpandedNodeBmp( const Image& _rImg, BmpColorMode _eMode = BMP_COLOR_NORMAL );
+    inline void 		SetCollapsedNodeBmp( const Image& _rImg, BmpColorMode _eMode = BMP_COLOR_NORMAL  );
+    inline void 		SetDontKnowNodeBmp( const Image& rImg, BmpColorMode _eMode = BMP_COLOR_NORMAL );
 
     inline const Image& GetExpandedNodeBmp( BmpColorMode _eMode = BMP_COLOR_NORMAL ) const;
     inline const Image& GetCollapsedNodeBmp( BmpColorMode _eMode = BMP_COLOR_NORMAL ) const;
-    inline const Image& GetDontKnowNodeBmp( BmpColorMode _eMode = BMP_COLOR_NORMAL ) const;
+    inline const Image&	GetDontKnowNodeBmp( BmpColorMode _eMode = BMP_COLOR_NORMAL ) const;
 
-    inline void         SetDefaultEntryExpBmp( const Image& _rImg, BmpColorMode _eMode = BMP_COLOR_NORMAL );
-    inline void         SetDefaultEntryColBmp( const Image& _rImg, BmpColorMode _eMode = BMP_COLOR_NORMAL );
-    inline const Image& GetDefaultEntryExpBmp( BmpColorMode _eMode = BMP_COLOR_NORMAL );
-    inline const Image& GetDefaultEntryColBmp( BmpColorMode _eMode = BMP_COLOR_NORMAL );
+    inline void			SetDefaultEntryExpBmp( const Image& _rImg, BmpColorMode _eMode = BMP_COLOR_NORMAL );
+    inline void			SetDefaultEntryColBmp( const Image& _rImg, BmpColorMode _eMode = BMP_COLOR_NORMAL );
+    inline const Image&	GetDefaultEntryExpBmp( BmpColorMode _eMode = BMP_COLOR_NORMAL );
+    inline const Image&	GetDefaultEntryColBmp( BmpColorMode _eMode = BMP_COLOR_NORMAL );
 
-    static const Image& GetDefaultExpandedNodeImage( BmpColorMode _eMode = BMP_COLOR_NORMAL );
-    static const Image& GetDefaultCollapsedNodeImage( BmpColorMode _eMode = BMP_COLOR_NORMAL );
+    static const Image&	GetDefaultExpandedNodeImage( BmpColorMode _eMode = BMP_COLOR_NORMAL );
+    static const Image&	GetDefaultCollapsedNodeImage( BmpColorMode _eMode = BMP_COLOR_NORMAL );
 
-    const Size&         GetOutputSize() const { return aOutputSize;}
-    void                KeyUp( BOOL bPageUp, BOOL bNotifyScroll = TRUE );
-    void                KeyDown( BOOL bPageDown, BOOL bNotifyScroll = TRUE );
+    const Size& 		GetOutputSize() const { return aOutputSize;}
+    void 				KeyUp( BOOL bPageUp, BOOL bNotifyScroll = TRUE );
+    void 				KeyDown( BOOL bPageDown, BOOL bNotifyScroll = TRUE );
     bool                Command( const CommandEvent& rCEvt );
 
-    void                Invalidate();
-    void                DestroyAnchor() { pAnchor=0; aSelEng.Reset(); }
-    void                SelAllDestrAnch( BOOL bSelect,
+    void				Invalidate();
+    void				DestroyAnchor() { pAnchor=0; aSelEng.Reset(); }
+    void        		SelAllDestrAnch( BOOL bSelect,
                             BOOL bDestroyAnchor = TRUE,
                             BOOL bSingleSelToo = FALSE );
-    void                ShowCursor( BOOL bShow );
-
-    BOOL                RequestHelp( const HelpEvent& rHEvt );
-    void                EndSelection();
-    BOOL                IsNodeButton( const Point& rPosPixel, SvLBoxEntry* pEntry ) const;
-    void                RepaintScrollBars();
-    void                EnableAsyncDrag( BOOL b) { bAsyncBeginDrag = b; }
-    void                SetUpdateMode( BOOL );
-    void                SetUpdateModeFast( BOOL );
-    BOOL                GetUpdateMode() const { return bUpdateMode; }
-    Rectangle           GetClipRegionRect() const;
-    BOOL                HasHorScrollBar() const { return aHorSBar.IsVisible(); }
-    void                ShowFocusRect( const SvLBoxEntry* pEntry );
-    void                SetTabBar( TabBar* pTabBar );
-    void                CancelPendingEdit();
-
-    void                CallEventListeners( ULONG nEvent, void* pData = NULL );
+    void				ShowCursor( BOOL bShow );
+
+    BOOL    			RequestHelp( const HelpEvent& rHEvt );
+    void				EndSelection();
+    BOOL				IsNodeButton( const Point& rPosPixel, SvLBoxEntry* pEntry ) const;
+    void				RepaintScrollBars();
+    void				EnableAsyncDrag( BOOL b) { bAsyncBeginDrag = b; }
+    void				SetUpdateMode( BOOL );
+    void 				SetUpdateModeFast( BOOL );
+    BOOL				GetUpdateMode() const { return bUpdateMode; }
+    Rectangle			GetClipRegionRect() const;
+    BOOL				HasHorScrollBar() const { return aHorSBar.IsVisible(); }
+    void				ShowFocusRect( const SvLBoxEntry* pEntry );
+    void				SetTabBar( TabBar* pTabBar );
+    void				CancelPendingEdit();
+
+    void				CallEventListeners( ULONG nEvent, void* pData = NULL );
 
     /** Enables, that one cell of a tablistbox entry can be focused */
-    inline BOOL         IsCellFocusEnabled() const { return bIsCellFocusEnabled; }
-    inline void         EnableCellFocus() { bIsCellFocusEnabled = TRUE; }
-    bool                SetCurrentTabPos( USHORT _nNewPos );
-    inline USHORT       GetCurrentTabPos() const { return nCurTabPos; }
+    inline BOOL			IsCellFocusEnabled() const { return bIsCellFocusEnabled; }
+    inline void			EnableCellFocus() { bIsCellFocusEnabled = TRUE; }
+    bool				SetCurrentTabPos( USHORT _nNewPos );
+    inline USHORT		GetCurrentTabPos() const { return nCurTabPos; }
 
-    bool                IsSelectable( const SvLBoxEntry* pEntry );
+    bool				IsSelectable( const SvLBoxEntry* pEntry );
 };
 
 inline Image& SvImpLBox::implGetImageLocation( const ImageType _eType, BmpColorMode _eMode )
@@ -411,7 +411,7 @@ inline void SvImpLBox::SetCollapsedNodeBmp( const Image& rImg, BmpColorMode _eMo
     SetNodeBmpYOffset( rImg );
 }
 
-inline const Image& SvImpLBox::GetDontKnowNodeBmp( BmpColorMode _eMode ) const
+inline const Image&	SvImpLBox::GetDontKnowNodeBmp( BmpColorMode _eMode ) const
 {
     return implGetImageLocationWithFallback( itNodeDontKnow, _eMode );
 }
@@ -436,12 +436,12 @@ inline void SvImpLBox::SetDefaultEntryColBmp( const Image& _rImg, BmpColorMode _
     implGetImageLocation( itEntryDefCollapsed, _eMode ) = _rImg;
 }
 
-inline const Image& SvImpLBox::GetDefaultEntryExpBmp( BmpColorMode _eMode )
+inline const Image&	SvImpLBox::GetDefaultEntryExpBmp( BmpColorMode _eMode )
 {
     return implGetImageLocationWithFallback( itEntryDefExpanded, _eMode );
 }
 
-inline const Image& SvImpLBox::GetDefaultEntryColBmp( BmpColorMode _eMode )
+inline const Image&	SvImpLBox::GetDefaultEntryColBmp( BmpColorMode _eMode )
 {
     return implGetImageLocationWithFallback( itEntryDefCollapsed, _eMode );
 }
diff --git a/svtools/source/inc/svimpicn.hxx b/svtools/source/inc/svimpicn.hxx
index 20f98d2bcbbd..738153b63bca 100644
--- a/svtools/source/inc/svimpicn.hxx
+++ b/svtools/source/inc/svimpicn.hxx
@@ -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
@@ -42,272 +42,272 @@ class SvImpIconView;
 class ImpIcnCursor;
 class SvPtrarr;
 
-#define PAINTFLAG_HOR_CENTERED  0x0001
-#define PAINTFLAG_VER_CENTERED  0x0002
+#define PAINTFLAG_HOR_CENTERED	0x0001
+#define PAINTFLAG_VER_CENTERED	0x0002
 
-#define SELRECT_BORDER_OFFS -7
+#define SELRECT_BORDER_OFFS	-7
 // Flags
-#define F_VER_SBARSIZE_WITH_HBAR        0x00000001
-#define F_HOR_SBARSIZE_WITH_VBAR        0x00000002
-#define F_IGNORE_NEXT_MOUSEMOVE         0x00000004  // OS/2 only
-#define F_ENTRY_REMOVED                 0x00000008
+#define F_VER_SBARSIZE_WITH_HBAR		0x00000001
+#define F_HOR_SBARSIZE_WITH_VBAR		0x00000002
+#define F_IGNORE_NEXT_MOUSEMOVE			0x00000004	// OS/2 only
+#define F_ENTRY_REMOVED					0x00000008
 // ist gesetzt, wenn nach Clear oder Ctor mind. einmal gepaintet wurde
-#define F_PAINTED                       0x00000010
-#define F_ADD_MODE                      0x00000020
-#define F_MOVING_SIBLING                0x00000040
-#define F_SELRECT_VISIBLE               0x00000080
-#define F_CMD_ARRIVED                   0x00000100
-#define F_DRAG_SOURCE                   0x00000200
-#define F_GRIDMODE                      0x00000400
+#define F_PAINTED						0x00000010
+#define F_ADD_MODE						0x00000020
+#define F_MOVING_SIBLING				0x00000040
+#define F_SELRECT_VISIBLE				0x00000080
+#define F_CMD_ARRIVED					0x00000100
+#define F_DRAG_SOURCE					0x00000200
+#define F_GRIDMODE						0x00000400
 // beim Einfuegen eines Eintrags ergibt sich dessen Position
 // durch simples Addieren auf die Position des zuletzt eingefuegten Eintrags
-#define F_GRID_INSERT                   0x00000800
-#define F_DOWN_CTRL                     0x00001000
-#define F_DOWN_DESELECT                 0x00002000
+#define F_GRID_INSERT					0x00000800
+#define F_DOWN_CTRL						0x00001000
+#define F_DOWN_DESELECT					0x00002000
 // Hack fuer D&D: Hintergrund des Entries nicht painten
-#define F_NO_EMPHASIS                   0x00004000
+#define F_NO_EMPHASIS					0x00004000
 // Selektion per Gummiband
-#define F_RUBBERING                     0x00008000
-#define F_START_EDITTIMER_IN_MOUSEUP    0x00010000
+#define F_RUBBERING						0x00008000
+#define F_START_EDITTIMER_IN_MOUSEUP	0x00010000
 
 class SvImpIconView
 {
     friend class ImpIcnCursor;
-    ScrollBar       aVerSBar;
-    ScrollBar       aHorSBar;
-    Rectangle       aCurSelectionRect;
-    SvPtrarr        aSelectedRectList;
-    MouseEvent      aMouseMoveEvent;
-    Timer           aEditTimer;  // fuer Inplace-Editieren
-    Timer           aMouseMoveTimer; // generiert MouseMoves bei Gummibandselektion
+    ScrollBar   	aVerSBar;
+    ScrollBar   	aHorSBar;
+    Rectangle		aCurSelectionRect;
+    SvPtrarr		aSelectedRectList;
+    MouseEvent		aMouseMoveEvent;
+    Timer			aEditTimer;  // fuer Inplace-Editieren
+    Timer			aMouseMoveTimer; // generiert MouseMoves bei Gummibandselektion
     // Boundrect des zuletzt eingefuegten Entries
-    Rectangle       aPrevBoundRect;
-    Size            aOutputSize;        // Pixel
-    Size            aVirtOutputSize;    // expandiert automatisch
-    Point           aDDLastEntryPos;
-    Point           aDDLastRectPos;
+    Rectangle		aPrevBoundRect;
+    Size			aOutputSize;		// Pixel
+    Size			aVirtOutputSize;    // expandiert automatisch
+    Point			aDDLastEntryPos;
+    Point			aDDLastRectPos;
 
     SvLBoxTreeList* pModel;
-    SvIconView*     pView;
-    ImpIcnCursor*   pImpCursor;
-    long            nMaxVirtWidth;      // max.breite aVirtOutputSize
-    SvPtrarr*       pZOrderList;
-    long            nGridDX,
+    SvIconView*		pView;
+    ImpIcnCursor*	pImpCursor;
+    long			nMaxVirtWidth;      // max.breite aVirtOutputSize
+    SvPtrarr*		pZOrderList;
+    long			nGridDX,
                     nGridDY;
-    long            nHorSBarHeight,
+    long			nHorSBarHeight,
                     nVerSBarWidth;
-    WinBits         nWinBits;
-    int             nViewMode;
-    long            nHorDist;
-    long            nVerDist;
-    long            nMaxBmpWidth;
-    long            nMaxBmpHeight;
-    long            nMaxTextWidth;
-    long            nMaxBoundHeight; // Hoehe des hoechsten BoundRects
-    ULONG           nFlags;
-    ULONG           nCurUserEvent;
-    SvLBoxEntry*    pCurParent;
-    SvLBoxEntry*    pCursor;
-    SvLBoxEntry*    pNextCursor; // wird in MovingEntry gesetzt und ist
+    WinBits			nWinBits;
+    int				nViewMode;
+    long			nHorDist;
+    long			nVerDist;
+    long			nMaxBmpWidth;
+    long			nMaxBmpHeight;
+    long			nMaxTextWidth;
+    long			nMaxBoundHeight; // Hoehe des hoechsten BoundRects
+    ULONG			nFlags;
+    ULONG			nCurUserEvent;
+    SvLBoxEntry*	pCurParent;
+    SvLBoxEntry* 	pCursor;
+    SvLBoxEntry*	pNextCursor; // wird in MovingEntry gesetzt und ist
                                  // nur in EntryMoved gueltig!
-    SvLBoxEntry*    pDDRefEntry;
-    VirtualDevice*  pDDDev;
-    VirtualDevice*  pDDBufDev;
+    SvLBoxEntry*	pDDRefEntry;
+    VirtualDevice*	pDDDev;
+    VirtualDevice*	pDDBufDev;
     VirtualDevice*  pDDTempDev;
 
     SvIconViewTextMode eTextMode;
-    BOOL            bMustRecalcBoundingRects;
+    BOOL			bMustRecalcBoundingRects;
 
-    void            CheckAllSizes();
-    void            CheckSizes( SvLBoxEntry* pEntry,
+    void			CheckAllSizes();
+    void 			CheckSizes( SvLBoxEntry* pEntry,
                         const SvIcnVwDataEntry* pViewData = 0  );
-    void            ShowCursor( BOOL bShow );
+    void 			ShowCursor( BOOL bShow );
 
-    void            SetNextEntryPos(const Point& rPos);
-    Point           FindNextEntryPos( const Size& rBoundSize );
-    void            ImpArrange();
-    void            AdjustVirtSize( const Rectangle& );
-    void            ResetVirtSize();
-    void            CheckScrollBars();
+    void			SetNextEntryPos(const Point& rPos);
+    Point			FindNextEntryPos( const Size& rBoundSize );
+    void			ImpArrange();
+    void			AdjustVirtSize( const Rectangle& );
+    void			ResetVirtSize();
+    void			CheckScrollBars();
 
                     DECL_LINK( ScrollUpDownHdl, ScrollBar * );
                     DECL_LINK( ScrollLeftRightHdl, ScrollBar * );
                     DECL_LINK( MouseMoveTimeoutHdl, Timer* );
                     DECL_LINK( EditTimeoutHdl, Timer* );
                     DECL_LINK( UserEventHdl, void* );
-    void            AdjustScrollBars();
-    void            PositionScrollBars( long nRealWidth, long nRealHeight );
-    void            CalcDocPos( Point& aMousePos );
-    BOOL            GetResizeRect( Rectangle& );
-    void            PaintResizeRect( const Rectangle& );
-    SvLBoxEntry*    GetNewCursor();
-    void            ToggleSelection( SvLBoxEntry* );
-    void            DeselectAllBut( SvLBoxEntry* );
-    void            Center( SvLBoxEntry* pEntry, SvIcnVwDataEntry* ) const;
-    void            StopEditTimer() { aEditTimer.Stop(); }
-    void            StartEditTimer() { aEditTimer.Start(); }
-    void            ImpHideDDIcon();
-    void            ImpDrawXORRect( const Rectangle& rRect );
-    void            AddSelectedRect( const Rectangle&, short nOffset = SELRECT_BORDER_OFFS );
-    void            ClearSelectedRectList();
-    Rectangle       CalcMaxTextRect( const SvLBoxEntry* pEntry,
+    void			AdjustScrollBars();
+    void			PositionScrollBars( long nRealWidth, long nRealHeight );
+    void			CalcDocPos( Point& aMousePos );
+    BOOL			GetResizeRect( Rectangle& );
+    void			PaintResizeRect( const Rectangle& );
+    SvLBoxEntry*	GetNewCursor();
+    void			ToggleSelection( SvLBoxEntry* );
+    void			DeselectAllBut( SvLBoxEntry* );
+    void			Center( SvLBoxEntry* pEntry, SvIcnVwDataEntry* ) const;
+    void			StopEditTimer() { aEditTimer.Stop(); }
+    void			StartEditTimer() { aEditTimer.Start(); }
+    void 			ImpHideDDIcon();
+    void 			ImpDrawXORRect( const Rectangle& rRect );
+    void			AddSelectedRect( const Rectangle&, short nOffset = SELRECT_BORDER_OFFS );
+    void			ClearSelectedRectList();
+    Rectangle		CalcMaxTextRect( const SvLBoxEntry* pEntry,
                                     const SvIcnVwDataEntry* pViewData ) const;
 
-    void            ClipAtVirtOutRect( Rectangle& rRect ) const;
-    void            AdjustAtGrid( const SvPtrarr& rRow, SvLBoxEntry* pStart=0 );
-    Point           AdjustAtGrid(
+    void			ClipAtVirtOutRect( Rectangle& rRect ) const;
+    void 			AdjustAtGrid( const SvPtrarr& rRow, SvLBoxEntry* pStart=0 );
+    Point			AdjustAtGrid(
                         const Rectangle& rCenterRect, // "Schwerpunkt" des Objekts (typ. Bmp-Rect)
                         const Rectangle& rBoundRect ) const;
     SvIconViewTextMode GetEntryTextModeSmart( const SvLBoxEntry* pEntry,
                         const SvIcnVwDataEntry* pViewData ) const;
 
-    BOOL            CheckVerScrollBar();
-    BOOL            CheckHorScrollBar();
-    void            CancelUserEvent();
+    BOOL			CheckVerScrollBar();
+    BOOL			CheckHorScrollBar();
+    void 			CancelUserEvent();
 
 public:
 
                     SvImpIconView( SvIconView* pView, SvLBoxTreeList*, WinBits nWinStyle );
                     ~SvImpIconView();
 
-    void            Clear( BOOL bInCtor = FALSE );
-    void            SetWindowBits( WinBits nWinStyle );
-    void            SetModel( SvLBoxTreeList* pTree, SvLBoxEntry* pParent )
+    void 			Clear( BOOL bInCtor = FALSE );
+    void 			SetWindowBits( WinBits nWinStyle );
+    void 			SetModel( SvLBoxTreeList* pTree, SvLBoxEntry* pParent )
                         { pModel = pTree; SetCurParent(pParent); }
-    void            EntryInserted( SvLBoxEntry*);
-    void            RemovingEntry( SvLBoxEntry* pEntry );
-    void            EntryRemoved();
-    void            MovingEntry( SvLBoxEntry* pEntry );
-    void            EntryMoved( SvLBoxEntry* pEntry );
-    void            TreeInserted( SvLBoxEntry* pEntry );
-    void            ChangedFont();
-    void            ModelHasEntryInvalidated( SvListEntry* );
-    void            EntryExpanded( SvLBoxEntry* pEntry );
-    void            EntryCollapsed( SvLBoxEntry* pEntry );
-    void            CollapsingEntry( SvLBoxEntry* pEntry );
-    void            EntrySelected( SvLBoxEntry*, BOOL bSelect );
-
-    void            Paint( const Rectangle& rRect );
-    void            RepaintSelectionItems();
-    void            MouseButtonDown( const MouseEvent& );
-    void            MouseButtonUp( const MouseEvent& );
-    void            MouseMove( const MouseEvent&);
-    BOOL            KeyInput( const KeyEvent& );
-    void            Resize();
-    void            GetFocus();
-    void            LoseFocus();
-    void            UpdateAll();
-    void            PaintEntry( SvLBoxEntry* pEntry,
+    void 			EntryInserted( SvLBoxEntry*);
+    void 			RemovingEntry( SvLBoxEntry* pEntry );
+    void 			EntryRemoved();
+    void 			MovingEntry( SvLBoxEntry* pEntry );
+    void 			EntryMoved( SvLBoxEntry* pEntry );
+    void 			TreeInserted( SvLBoxEntry* pEntry );
+    void 			ChangedFont();
+    void 			ModelHasEntryInvalidated( SvListEntry* );
+    void 			EntryExpanded( SvLBoxEntry* pEntry );
+    void 			EntryCollapsed( SvLBoxEntry* pEntry );
+    void 			CollapsingEntry( SvLBoxEntry* pEntry );
+    void 			EntrySelected( SvLBoxEntry*, BOOL bSelect );
+
+    void 			Paint( const Rectangle& rRect );
+    void 			RepaintSelectionItems();
+    void 			MouseButtonDown( const MouseEvent& );
+    void 			MouseButtonUp( const MouseEvent& );
+    void 			MouseMove( const MouseEvent&);
+    BOOL 			KeyInput( const KeyEvent& );
+    void 			Resize();
+    void 			GetFocus();
+    void 			LoseFocus();
+    void 			UpdateAll();
+    void 			PaintEntry( SvLBoxEntry* pEntry,
                         SvIcnVwDataEntry* pViewData = 0 );
-    void            PaintEntry( SvLBoxEntry*, const Point&,
+    void 			PaintEntry( SvLBoxEntry*, const Point&,
                         SvIcnVwDataEntry* pViewData = 0, OutputDevice* pOut = 0);
-    void            SetEntryPosition( SvLBoxEntry* pEntry, const Point& rPos,
+    void 			SetEntryPosition( SvLBoxEntry* pEntry, const Point& rPos,
                                       BOOL bAdjustRow = FALSE,
                                       BOOL bCheckScrollBars = FALSE );
-    void            InvalidateEntry( SvLBoxEntry* );
-    void            ViewDataInitialized( SvLBoxEntry* pEntry );
-    SvLBoxItem*     GetItem( SvLBoxEntry*, const Point& rAbsPos );
+    void 			InvalidateEntry( SvLBoxEntry* );
+    void 			ViewDataInitialized( SvLBoxEntry* pEntry );
+    SvLBoxItem* 	GetItem( SvLBoxEntry*, const Point& rAbsPos );
 
-    void            SetNoSelection();
-    void            SetDragDropMode( DragDropMode eDDMode );
-    void            SetSelectionMode( SelectionMode eSelMode  );
+    void 			SetNoSelection();
+    void 			SetDragDropMode( DragDropMode eDDMode );
+    void 			SetSelectionMode( SelectionMode eSelMode  );
 
-    void            SttDrag( const Point& rPos );
-    void            EndDrag();
+    void 			SttDrag( const Point& rPos );
+    void 			EndDrag();
 
-    SvLBoxEntry*    GetCurEntry() const { return pCursor; }
-    void            SetCursor( SvLBoxEntry* );
+    SvLBoxEntry* 	GetCurEntry() const { return pCursor; }
+    void 			SetCursor( SvLBoxEntry* );
 
-    BOOL            IsEntryInView( SvLBoxEntry* );
-    SvLBoxEntry*    GetEntry( const Point& rDocPos );
-    SvLBoxEntry*    GetNextEntry( const Point& rDocPos, SvLBoxEntry* pCurEntry );
-    SvLBoxEntry*    GetPrevEntry( const Point& rDocPos, SvLBoxEntry* pCurEntry  );
+    BOOL			IsEntryInView( SvLBoxEntry* );
+    SvLBoxEntry* 	GetEntry( const Point& rDocPos );
+    SvLBoxEntry*	GetNextEntry( const Point& rDocPos, SvLBoxEntry* pCurEntry );
+    SvLBoxEntry*	GetPrevEntry( const Point& rDocPos, SvLBoxEntry* pCurEntry  );
 
-    Point           GetEntryPosition( SvLBoxEntry* );
-    void            MakeVisible( SvLBoxEntry* pEntry );
+    Point 			GetEntryPosition( SvLBoxEntry* );
+    void 			MakeVisible( SvLBoxEntry* pEntry );
 
-    void            Arrange();
+    void			Arrange();
 
-    void            SetSpaceBetweenEntries( long nHor, long Ver );
-    long            GetHorSpaceBetweenEntries() const { return nHorDist; }
-    long            GetVerSpaceBetweenEntries() const { return nVerDist; }
+    void			SetSpaceBetweenEntries( long nHor, long Ver );
+    long			GetHorSpaceBetweenEntries() const { return nHorDist; }
+    long			GetVerSpaceBetweenEntries() const { return nVerDist; }
 
-    Rectangle       CalcFocusRect( SvLBoxEntry* );
+    Rectangle		CalcFocusRect( SvLBoxEntry* );
 
-    Rectangle       CalcBmpRect( SvLBoxEntry*, const Point* pPos = 0,
+    Rectangle		CalcBmpRect( SvLBoxEntry*, const Point* pPos = 0,
                         SvIcnVwDataEntry* pViewData=0 );
-    Rectangle       CalcTextRect( SvLBoxEntry*, SvLBoxString* pItem = 0,
+    Rectangle		CalcTextRect( SvLBoxEntry*, SvLBoxString* pItem = 0,
                                   const Point* pPos = 0,
                                   BOOL bForInplaceEdit = FALSE,
                                   SvIcnVwDataEntry* pViewData = 0 );
 
-    long            CalcBoundingWidth( SvLBoxEntry*, const SvIcnVwDataEntry* pViewData = 0) const;
-    long            CalcBoundingHeight( SvLBoxEntry*, const SvIcnVwDataEntry* pViewData= 0 ) const;
-    Size            CalcBoundingSize( SvLBoxEntry*,
+    long			CalcBoundingWidth( SvLBoxEntry*, const SvIcnVwDataEntry* pViewData = 0) const;
+    long			CalcBoundingHeight( SvLBoxEntry*, const SvIcnVwDataEntry* pViewData= 0 ) const;
+    Size			CalcBoundingSize( SvLBoxEntry*,
                         SvIcnVwDataEntry* pViewData = 0 ) const;
-    void            FindBoundingRect( SvLBoxEntry* pEntry,
+    void			FindBoundingRect( SvLBoxEntry* pEntry,
                         SvIcnVwDataEntry* pViewData = 0 );
     // berechnet alle BoundRects neu
-    void            RecalcAllBoundingRects();
+    void			RecalcAllBoundingRects();
     // berechnet alle ungueltigen BoundRects neu
-    void            RecalcAllBoundingRectsSmart();
+    void			RecalcAllBoundingRectsSmart();
     const Rectangle&  GetBoundingRect( SvLBoxEntry*,
                         SvIcnVwDataEntry* pViewData=0);
-    void            InvalidateBoundingRect( SvLBoxEntry* );
-    void            InvalidateBoundingRect( Rectangle& rRect ) { rRect.Right() = LONG_MAX; }
-    BOOL            IsBoundingRectValid( const Rectangle& rRect ) const { return (BOOL)( rRect.Right() != LONG_MAX ); }
+    void			InvalidateBoundingRect( SvLBoxEntry* );
+    void			InvalidateBoundingRect( Rectangle& rRect ) { rRect.Right() = LONG_MAX; }
+    BOOL			IsBoundingRectValid( const Rectangle& rRect ) const { return (BOOL)( rRect.Right() != LONG_MAX ); }
 
-    void            PaintEmphasis( const Rectangle&, BOOL bSelected,
+    void 			PaintEmphasis( const Rectangle&, BOOL bSelected,
                                    BOOL bCursored, OutputDevice* pOut = 0 );
-    void            PaintItem( const Rectangle& rRect, SvLBoxItem* pItem,
+    void 			PaintItem( const Rectangle& rRect, SvLBoxItem* pItem,
                         SvLBoxEntry* pEntry, USHORT nPaintFlags, OutputDevice* pOut = 0 );
     // berechnet alle BoundingRects neu, wenn bMustRecalcBoundingRects == TRUE
-    void            CheckBoundingRects() { if (bMustRecalcBoundingRects) RecalcAllBoundingRects(); }
+    void			CheckBoundingRects() { if (bMustRecalcBoundingRects) RecalcAllBoundingRects(); }
     // berechnet alle invalidierten BoundingRects neu
-    void            UpdateBoundingRects();
-    void            ShowTargetEmphasis( SvLBoxEntry* pEntry, BOOL bShow );
-    SvLBoxEntry*    GetDropTarget( const Point& rPosPixel );
-    BOOL            NotifyMoving( SvLBoxEntry* pTarget, SvLBoxEntry* pEntry,
+    void			UpdateBoundingRects();
+    void			ShowTargetEmphasis( SvLBoxEntry* pEntry, BOOL bShow );
+    SvLBoxEntry* 	GetDropTarget( const Point& rPosPixel );
+    BOOL			NotifyMoving( SvLBoxEntry* pTarget, SvLBoxEntry* pEntry,
                         SvLBoxEntry*& rpNewParent, ULONG& rNewChildPos );
-    BOOL            NotifyCopying( SvLBoxEntry* pTarget, SvLBoxEntry* pEntry,
+    BOOL			NotifyCopying( SvLBoxEntry* pTarget, SvLBoxEntry* pEntry,
                         SvLBoxEntry*& rpNewParent, ULONG& rNewChildPos );
 
-    void            WriteDragServerInfo( const Point&, SvLBoxDDInfo* );
-    void            ReadDragServerInfo( const Point&, SvLBoxDDInfo* );
-    void            ToTop( SvLBoxEntry* );
+    void 			WriteDragServerInfo( const Point&, SvLBoxDDInfo* );
+    void 			ReadDragServerInfo( const Point&, SvLBoxDDInfo* );
+    void			ToTop( SvLBoxEntry* );
 
-    void            SetCurParent( SvLBoxEntry* pNewParent );
-    SvLBoxEntry*    GetCurParent() const { return pCurParent; }
-    USHORT          GetSelectionCount() const;
-    void            SetGrid( long nDX, long nDY );
-    void            Scroll( long nDeltaX, long nDeltaY, BOOL bScrollBar = FALSE );
-    const Size&     GetItemSize( SvIconView* pView, SvLBoxEntry*, SvLBoxItem*,
+    void			SetCurParent( SvLBoxEntry* pNewParent );
+    SvLBoxEntry* 	GetCurParent() const { return pCurParent; }
+    USHORT			GetSelectionCount() const;
+    void			SetGrid( long nDX, long nDY );
+    void			Scroll( long nDeltaX, long nDeltaY, BOOL bScrollBar = FALSE );
+    const Size&		GetItemSize( SvIconView* pView, SvLBoxEntry*, SvLBoxItem*,
                         const SvIcnVwDataEntry* pViewData = 0 ) const;
-    void            PrepareCommandEvent( const Point& rPt );
+    void			PrepareCommandEvent( const Point& rPt );
 
-    void            HideDDIcon();
-    void            ShowDDIcon( SvLBoxEntry* pRefEntry, const Point& rPos );
-    void            HideShowDDIcon( SvLBoxEntry* pRefEntry, const Point& rPos );
+    void 			HideDDIcon();
+    void 			ShowDDIcon( SvLBoxEntry* pRefEntry, const Point& rPos );
+    void			HideShowDDIcon( SvLBoxEntry* pRefEntry, const Point& rPos );
 
-    SvLBoxEntry*    mpViewData;
+    SvLBoxEntry* 	mpViewData;
 
-    BOOL            IsOver( SvPtrarr* pSelectedRectList, const Rectangle& rEntryBoundRect ) const;
-    void            SelectRect( const Rectangle&, BOOL bAdd = TRUE,
+    BOOL			IsOver(	SvPtrarr* pSelectedRectList, const Rectangle& rEntryBoundRect ) const;
+    void			SelectRect( const Rectangle&, BOOL bAdd = TRUE,
                         SvPtrarr* pOtherRects = 0,
                         short nOffs = SELRECT_BORDER_OFFS );
-    void            DrawSelectionRect( const Rectangle& );
-    void            HideSelectionRect();
-    void            CalcScrollOffsets( const Point& rRefPosPixel,
+    void			DrawSelectionRect( const Rectangle& );
+    void			HideSelectionRect();
+    void			CalcScrollOffsets( const Point& rRefPosPixel,
                         long& rX, long& rY, BOOL bDragDrop = FALSE,
                         USHORT nBorderWidth = 10 );
-    void            EndTracking();
-    BOOL            IsTextHit( SvLBoxEntry* pEntry, const Point& rDocPos );
-    void            MakeVisible( const Rectangle& rDocPos,BOOL bInScrollBarEvent=FALSE);
-    void            AdjustAtGrid( SvLBoxEntry* pStart = 0 );
-    void            SetTextMode( SvIconViewTextMode, SvLBoxEntry* pEntry = 0 );
+    void			EndTracking();
+    BOOL			IsTextHit( SvLBoxEntry* pEntry, const Point& rDocPos );
+    void			MakeVisible( const Rectangle& rDocPos,BOOL bInScrollBarEvent=FALSE);
+    void			AdjustAtGrid( SvLBoxEntry* pStart = 0 );
+    void			SetTextMode( SvIconViewTextMode, SvLBoxEntry* pEntry = 0 );
     SvIconViewTextMode GetTextMode( const SvLBoxEntry* pEntry = 0,
                     const SvIcnVwDataEntry* pViewData = 0 ) const;
-    void            ShowFocusRect( const SvLBoxEntry* pEntry );
+    void			ShowFocusRect( const SvLBoxEntry* pEntry );
 };
 
 inline void SvImpIconView::MakeVisible( SvLBoxEntry* pEntry )
diff --git a/svtools/source/inc/svtaccessiblefactory.hxx b/svtools/source/inc/svtaccessiblefactory.hxx
index 7760b6427da4..c543690460d8 100644
--- a/svtools/source/inc/svtaccessiblefactory.hxx
+++ b/svtools/source/inc/svtaccessiblefactory.hxx
@@ -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
diff --git a/svtools/source/inc/unoiface.hxx b/svtools/source/inc/unoiface.hxx
index f15cb7c10d4c..24854ba253a7 100644
--- a/svtools/source/inc/unoiface.hxx
+++ b/svtools/source/inc/unoiface.hxx
@@ -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
@@ -53,12 +53,12 @@ namespace com { namespace sun { namespace star { namespace util {
 
 class SvNumberFormatsSupplierObj;
 
-//  ----------------------------------------------------
-//  class VCLXMultiLineEdit
-//  ----------------------------------------------------
-class VCLXMultiLineEdit :   public ::com::sun::star::awt::XTextComponent,
-                            public ::com::sun::star::awt::XTextArea,
-                            public ::com::sun::star::awt::XTextLayoutConstrains,
+//	----------------------------------------------------
+//	class VCLXMultiLineEdit
+//	----------------------------------------------------
+class VCLXMultiLineEdit :	public ::com::sun::star::awt::XTextComponent, 
+                            public ::com::sun::star::awt::XTextArea, 
+                            public ::com::sun::star::awt::XTextLayoutConstrains, 
                             public VCLXWindow
 {
 private:
@@ -73,13 +73,13 @@ public:
                     ~VCLXMultiLineEdit();
 
     // ::com::sun::star::uno::XInterface
-    ::com::sun::star::uno::Any                  SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException);
-    void                                        SAL_CALL acquire() throw()  { VCLXWindow::acquire(); }
-    void                                        SAL_CALL release() throw()  { VCLXWindow::release(); }
+    ::com::sun::star::uno::Any					SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException);
+    void										SAL_CALL acquire() throw()	{ VCLXWindow::acquire(); }
+    void										SAL_CALL release() throw()	{ VCLXWindow::release(); }
 
     // ::com::sun::star::lang::XTypeProvider
-    ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type >  SAL_CALL getTypes() throw(::com::sun::star::uno::RuntimeException);
-    ::com::sun::star::uno::Sequence< sal_Int8 >                     SAL_CALL getImplementationId() throw(::com::sun::star::uno::RuntimeException);
+    ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type >	SAL_CALL getTypes() throw(::com::sun::star::uno::RuntimeException);
+    ::com::sun::star::uno::Sequence< sal_Int8 >						SAL_CALL getImplementationId() throw(::com::sun::star::uno::RuntimeException);
 
     // ::com::sun::star::awt::XTextComponent
     void SAL_CALL addTextListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XTextListener >& l ) throw(::com::sun::star::uno::RuntimeException);
@@ -119,29 +119,29 @@ public:
 };
 
 
-//  ----------------------------------------------------
-//  class VCLXFileControl
-//  ----------------------------------------------------
+//	----------------------------------------------------
+//	class VCLXFileControl
+//	----------------------------------------------------
 class VCLXFileControl : ::com::sun::star::awt::XTextComponent, public ::com::sun::star::awt::XTextLayoutConstrains, public VCLXWindow
 {
 protected:
-    DECL_LINK(      ModifyHdl, Edit* );
-    TextListenerMultiplexer maTextListeners;
+    DECL_LINK( 	 	ModifyHdl, Edit* );
+    TextListenerMultiplexer	maTextListeners;
 
 public:
                     VCLXFileControl();
                     ~VCLXFileControl();
 
-    void            SetWindow( Window* pWindow );
+    void 			SetWindow( Window* pWindow );
 
     // ::com::sun::star::uno::XInterface
-    ::com::sun::star::uno::Any                  SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException);
-    void                                        SAL_CALL acquire() throw()  { VCLXWindow::acquire(); }
-    void                                        SAL_CALL release() throw()  { VCLXWindow::release(); }
+    ::com::sun::star::uno::Any					SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException);
+    void										SAL_CALL acquire() throw()	{ VCLXWindow::acquire(); }
+    void										SAL_CALL release() throw()	{ VCLXWindow::release(); }
 
     // ::com::sun::star::lang::XTypeProvider
-    ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type >  SAL_CALL getTypes() throw(::com::sun::star::uno::RuntimeException);
-    ::com::sun::star::uno::Sequence< sal_Int8 >                     SAL_CALL getImplementationId() throw(::com::sun::star::uno::RuntimeException);
+    ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type >	SAL_CALL getTypes() throw(::com::sun::star::uno::RuntimeException);
+    ::com::sun::star::uno::Sequence< sal_Int8 >						SAL_CALL getImplementationId() throw(::com::sun::star::uno::RuntimeException);
 
     // ::com::sun::star::awt::XTextComponent
     void SAL_CALL addTextListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XTextListener >& l ) throw(::com::sun::star::uno::RuntimeException);
@@ -172,19 +172,19 @@ public:
     virtual void    GetPropertyIds( std::list< sal_uInt16 > &aIds ) { return ImplGetPropertyIds( aIds ); }
 };
 
-//  ----------------------------------------------------
-//  class SVTXFormattedField
-//  ----------------------------------------------------
+//	----------------------------------------------------
+//	class SVTXFormattedField
+//	----------------------------------------------------
 
 class SVTXFormattedField : public VCLXSpinField
 {
 protected:
-    SvNumberFormatsSupplierObj* m_pCurrentSupplier;
-    sal_Bool                    bIsStandardSupplier;
+    SvNumberFormatsSupplierObj*	m_pCurrentSupplier;
+    sal_Bool					bIsStandardSupplier;
 
-    sal_Int32                   nKeyToSetDelayed;
-
-    FormattedField*             GetFormattedField() const { return (FormattedField*)GetWindow(); }
+    sal_Int32					nKeyToSetDelayed;
+    
+    FormattedField*				GetFormattedField() const { return (FormattedField*)GetWindow(); }	
 
 public:
     SVTXFormattedField();
@@ -196,29 +196,29 @@ public:
 
 protected:
     ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatsSupplier >  getFormatsSupplier(void) const;
-    void    setFormatsSupplier(const ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatsSupplier > & xSupplier);
-    sal_Int32   getFormatKey(void) const;
-    void    setFormatKey(sal_Int32 nKey);
+    void	setFormatsSupplier(const ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatsSupplier > & xSupplier);
+    sal_Int32	getFormatKey(void) const;
+    void	setFormatKey(sal_Int32 nKey);
 
-    void    SetValue(const ::com::sun::star::uno::Any& rValue);
-    ::com::sun::star::uno::Any  GetValue();
+    void	SetValue(const ::com::sun::star::uno::Any& rValue);
+    ::com::sun::star::uno::Any	GetValue();
 
-    void    SetTreatAsNumber(sal_Bool bSet);
-    sal_Bool    GetTreatAsNumber();
+    void	SetTreatAsNumber(sal_Bool bSet);
+    sal_Bool	GetTreatAsNumber();
 
-    void    SetDefaultValue(const ::com::sun::star::uno::Any& rValue);
-    ::com::sun::star::uno::Any  GetDefaultValue();
+    void	SetDefaultValue(const ::com::sun::star::uno::Any& rValue);
+    ::com::sun::star::uno::Any	GetDefaultValue();
 
-    void    SetMinValue(const ::com::sun::star::uno::Any& rValue);
-    ::com::sun::star::uno::Any  GetMinValue();
+    void	SetMinValue(const ::com::sun::star::uno::Any& rValue);
+    ::com::sun::star::uno::Any	GetMinValue();
 
-    void    SetMaxValue(const ::com::sun::star::uno::Any& rValue);
-    ::com::sun::star::uno::Any  GetMaxValue();
+    void	SetMaxValue(const ::com::sun::star::uno::Any& rValue);
+    ::com::sun::star::uno::Any	GetMaxValue();
 
-    void    NotifyTextListeners();
-    ::com::sun::star::uno::Any  convertEffectiveValue(const ::com::sun::star::uno::Any& rValue);
+    void	NotifyTextListeners();
+    ::com::sun::star::uno::Any	convertEffectiveValue(const ::com::sun::star::uno::Any& rValue);
 
-    virtual void    SetWindow(Window* _pWindow);
+    virtual void	SetWindow(Window* _pWindow);
 
     static void     ImplGetPropertyIds( std::list< sal_uInt16 > &aIds );
     virtual void    GetPropertyIds( std::list< sal_uInt16 > &aIds ) { return ImplGetPropertyIds( aIds ); }
@@ -226,9 +226,9 @@ protected:
 
 
 
-//  ----------------------------------------------------
-//  class SVTXRoadmap
-//  ----------------------------------------------------
+//	----------------------------------------------------
+//	class SVTXRoadmap
+//	----------------------------------------------------
 
 namespace svt
 {
@@ -248,17 +248,17 @@ typedef ::cppu::ImplInheritanceHelper3  <   VCLXGraphicControl
                                         ,   ::com::sun::star::awt::XItemEventBroadcaster
                                         >   SVTXRoadmap_Base;
 class SVTXRoadmap : public SVTXRoadmap_Base
-
-
+                    
+                    
 {
 private:
-    ItemListenerMultiplexer     maItemListeners;
-
+    ItemListenerMultiplexer 	maItemListeners;
+    
     RMItemData CurRMItemData;
     RMItemData GetRMItemData( const ::com::sun::star::container::ContainerEvent& _rEvent );
 
-protected:
-    ::svt::ORoadmap*                GetRoadmap() const { return (::svt::ORoadmap*)GetWindow(); }
+protected:	
+    ::svt::ORoadmap*				GetRoadmap() const { return (::svt::ORoadmap*)GetWindow(); }
     void                            ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent );
 
     ~SVTXRoadmap();
@@ -275,8 +275,8 @@ public:
 
     // XContainerListener
     void SAL_CALL elementInserted( const ::com::sun::star::container::ContainerEvent& rEvent )throw(::com::sun::star::uno::RuntimeException);
-    void SAL_CALL elementRemoved( const ::com::sun::star::container::ContainerEvent& rEvent )throw(::com::sun::star::uno::RuntimeException);
-    void SAL_CALL elementReplaced( const ::com::sun::star::container::ContainerEvent& rEvent )throw(::com::sun::star::uno::RuntimeException);
+    void SAL_CALL elementRemoved( const ::com::sun::star::container::ContainerEvent& rEvent )throw(::com::sun::star::uno::RuntimeException); 
+    void SAL_CALL elementReplaced( const ::com::sun::star::container::ContainerEvent& rEvent )throw(::com::sun::star::uno::RuntimeException); 
 
     // XItemEventBroadcaster
     virtual void SAL_CALL addItemListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XItemListener >& l ) throw (::com::sun::star::uno::RuntimeException);
@@ -296,9 +296,9 @@ protected:
 
 
 
-//  ----------------------------------------------------
-//  class SVTXNumericField
-//  ----------------------------------------------------
+//	----------------------------------------------------
+//	class SVTXNumericField
+//	----------------------------------------------------
 class SVTXNumericField : public ::com::sun::star::awt::XNumericField, public SVTXFormattedField
 {
 public:
@@ -306,13 +306,13 @@ public:
                     ~SVTXNumericField();
 
     // ::com::sun::star::uno::XInterface
-    ::com::sun::star::uno::Any                  SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException);
-    void                                        SAL_CALL acquire() throw()  { SVTXFormattedField::acquire(); }
-    void                                        SAL_CALL release() throw()  { SVTXFormattedField::release(); }
+    ::com::sun::star::uno::Any					SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException);
+    void										SAL_CALL acquire() throw()	{ SVTXFormattedField::acquire(); }
+    void										SAL_CALL release() throw()	{ SVTXFormattedField::release(); }
 
     // ::com::sun::star::lang::XTypeProvider
-    ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type >  SAL_CALL getTypes() throw(::com::sun::star::uno::RuntimeException);
-    ::com::sun::star::uno::Sequence< sal_Int8 >                     SAL_CALL getImplementationId() throw(::com::sun::star::uno::RuntimeException);
+    ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type >	SAL_CALL getTypes() throw(::com::sun::star::uno::RuntimeException);
+    ::com::sun::star::uno::Sequence< sal_Int8 >						SAL_CALL getImplementationId() throw(::com::sun::star::uno::RuntimeException);
 
     // ::com::sun::star::awt::XNumericField
     void SAL_CALL setValue( double Value ) throw(::com::sun::star::uno::RuntimeException);
@@ -336,9 +336,9 @@ public:
     virtual void    GetPropertyIds( std::list< sal_uInt16 > &aIds ) { return ImplGetPropertyIds( aIds ); }
 };
 
-// ----------------------------------------------------
-//  class VCLXCurrencyField
-//  ----------------------------------------------------
+//	----------------------------------------------------
+//	class VCLXCurrencyField
+//	----------------------------------------------------
 class SVTXCurrencyField : public ::com::sun::star::awt::XCurrencyField, public SVTXFormattedField
 {
 public:
@@ -346,13 +346,13 @@ public:
                     ~SVTXCurrencyField();
 
     // ::com::sun::star::uno::XInterface
-    ::com::sun::star::uno::Any                  SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException);
-    void                                        SAL_CALL acquire() throw()  { SVTXFormattedField::acquire(); }
-    void                                        SAL_CALL release() throw()  { SVTXFormattedField::release(); }
+    ::com::sun::star::uno::Any					SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException);
+    void										SAL_CALL acquire() throw()	{ SVTXFormattedField::acquire(); }
+    void										SAL_CALL release() throw()	{ SVTXFormattedField::release(); }
 
     // ::com::sun::star::lang::XTypeProvider
-    ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type >  SAL_CALL getTypes() throw(::com::sun::star::uno::RuntimeException);
-    ::com::sun::star::uno::Sequence< sal_Int8 >                     SAL_CALL getImplementationId() throw(::com::sun::star::uno::RuntimeException);
+    ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type >	SAL_CALL getTypes() throw(::com::sun::star::uno::RuntimeException);
+    ::com::sun::star::uno::Sequence< sal_Int8 >						SAL_CALL getImplementationId() throw(::com::sun::star::uno::RuntimeException);
 
     // ::com::sun::star::awt::XVclWindowPeer
     void SAL_CALL setProperty( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Any& Value ) throw(::com::sun::star::uno::RuntimeException);
@@ -380,40 +380,40 @@ public:
     virtual void    GetPropertyIds( std::list< sal_uInt16 > &aIds ) { return ImplGetPropertyIds( aIds ); }
 };
 
-//  ----------------------------------------------------
-//  class VCLXProgressBar
-//  ----------------------------------------------------
-class VCLXProgressBar : public ::com::sun::star::awt::XProgressBar,
+//	----------------------------------------------------
+//	class VCLXProgressBar
+//	----------------------------------------------------
+class VCLXProgressBar :	public ::com::sun::star::awt::XProgressBar, 
                         public VCLXWindow
 {
 private:
-    sal_Int32   m_nValue;
-    sal_Int32   m_nValueMin;
-    sal_Int32   m_nValueMax;
+    sal_Int32	m_nValue;
+    sal_Int32	m_nValueMin;
+    sal_Int32	m_nValueMax;
 
 protected:
-    void            ImplUpdateValue();
+    void			ImplUpdateValue();
 
 public:
                     VCLXProgressBar();
                     ~VCLXProgressBar();
 
     // ::com::sun::star::uno::XInterface
-    ::com::sun::star::uno::Any                  SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException);
-    void                                        SAL_CALL acquire() throw()  { VCLXWindow::acquire(); }
-    void                                        SAL_CALL release() throw()  { VCLXWindow::release(); }
+    ::com::sun::star::uno::Any					SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException);
+    void										SAL_CALL acquire() throw()	{ VCLXWindow::acquire(); }
+    void										SAL_CALL release() throw()	{ VCLXWindow::release(); }
 
     // ::com::sun::star::lang::XTypeProvider
-    ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type >  SAL_CALL getTypes() throw(::com::sun::star::uno::RuntimeException);
-    ::com::sun::star::uno::Sequence< sal_Int8 >                     SAL_CALL getImplementationId() throw(::com::sun::star::uno::RuntimeException);
+    ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type >	SAL_CALL getTypes() throw(::com::sun::star::uno::RuntimeException);
+    ::com::sun::star::uno::Sequence< sal_Int8 >						SAL_CALL getImplementationId() throw(::com::sun::star::uno::RuntimeException);
 
-    // ::com::sun::star::awt::XProgressBar
+    // ::com::sun::star::awt::XProgressBar	
     void SAL_CALL setForegroundColor( sal_Int32 nColor ) throw(::com::sun::star::uno::RuntimeException);
     void SAL_CALL setBackgroundColor( sal_Int32 nColor ) throw(::com::sun::star::uno::RuntimeException);
     void SAL_CALL setValue( sal_Int32 nValue ) throw(::com::sun::star::uno::RuntimeException);
-    void SAL_CALL setRange( sal_Int32 nMin, sal_Int32 nMax ) throw(::com::sun::star::uno::RuntimeException );
+    void SAL_CALL setRange(	sal_Int32 nMin, sal_Int32 nMax ) throw(::com::sun::star::uno::RuntimeException );
     sal_Int32 SAL_CALL getValue() throw(::com::sun::star::uno::RuntimeException);
-
+        
     // ::com::sun::star::awt::VclWindowPeer
     void SAL_CALL setProperty( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Any& Value ) throw(::com::sun::star::uno::RuntimeException);
     ::com::sun::star::uno::Any SAL_CALL getProperty( const ::rtl::OUString& PropertyName ) throw(::com::sun::star::uno::RuntimeException);
@@ -422,9 +422,9 @@ public:
     virtual void    GetPropertyIds( std::list< sal_uInt16 > &aIds ) { return ImplGetPropertyIds( aIds ); }
 };
 
-//  ----------------------------------------------------
-//  class SVTXDateField
-//  ----------------------------------------------------
+//	----------------------------------------------------
+//	class SVTXDateField
+//	----------------------------------------------------
 class SVTXDateField : public VCLXDateField
 {
 public:
@@ -438,4 +438,4 @@ public:
     virtual void    GetPropertyIds( std::list< sal_uInt16 > &aIds ) { return ImplGetPropertyIds( aIds ); }
 };
 
-#endif  // _SVT_UNOIFACE_HXX
+#endif	// _SVT_UNOIFACE_HXX
diff --git a/svtools/source/inc/xbmread.hxx b/svtools/source/inc/xbmread.hxx
index aab52eeffa63..9456817c60aa 100644
--- a/svtools/source/inc/xbmread.hxx
+++ b/svtools/source/inc/xbmread.hxx
@@ -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
@@ -60,30 +60,30 @@ enum ReadState
 
 class XBMReader : public GraphicReader
 {
-    SvStream&           rIStm;
-    Bitmap              aBmp1;
-    BitmapWriteAccess*  pAcc1;
-    short*              pHexTable;
-    BitmapColor         aWhite;
-    BitmapColor         aBlack;
-    long                nLastPos;
-    long                nWidth;
-    long                nHeight;
-    BOOL                bStatus;
-
-    void                InitTable();
-    ByteString          FindTokenLine( SvStream* pInStm, const char* pTok1,
+    SvStream&			rIStm;
+    Bitmap				aBmp1;
+    BitmapWriteAccess*	pAcc1;
+    short*				pHexTable;
+    BitmapColor			aWhite;
+    BitmapColor			aBlack;
+    long				nLastPos;
+    long				nWidth;
+    long				nHeight;
+    BOOL				bStatus;
+
+    void				InitTable();
+    ByteString			FindTokenLine( SvStream* pInStm, const char* pTok1,
                                        const char* pTok2 = NULL, const char* pTok3 = NULL );
-    long                ParseDefine( const sal_Char* pDefine );
-    BOOL                ParseData( SvStream* pInStm, const ByteString& aLastLine, XBMFormat eFormat );
+    long				ParseDefine( const sal_Char* pDefine );
+    BOOL				ParseData( SvStream* pInStm, const ByteString& aLastLine, XBMFormat eFormat );
 
 
 public:
 
                         XBMReader( SvStream& rStm );
-    virtual             ~XBMReader();
+    virtual				~XBMReader();
 
-    ReadState           ReadXBM( Graphic& rGraphic );
+    ReadState			ReadXBM( Graphic& rGraphic );
 };
 
 #endif // _XBMPRIVATE
diff --git a/svtools/source/inc/xpmread.hxx b/svtools/source/inc/xpmread.hxx
index 29edd15a3b1c..32973f9d5ba3 100644
--- a/svtools/source/inc/xpmread.hxx
+++ b/svtools/source/inc/xpmread.hxx
@@ -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
@@ -34,24 +34,24 @@
 
 #ifdef _XPMPRIVATE
 
-#define XPMTEMPBUFSIZE      0x00008000
-#define XPMSTRINGBUF        0x00008000
+#define XPMTEMPBUFSIZE		0x00008000
+#define XPMSTRINGBUF		0x00008000
 
-#define XPMIDENTIFIER       0x00000001          // mnIdentifier includes on of the six phases
-#define XPMDEFINITION       0x00000002          // the XPM format consists of
-#define XPMVALUES           0x00000003
-#define XPMCOLORS           0x00000004
-#define XPMPIXELS           0x00000005
-#define XPMEXTENSIONS       0x00000006
-#define XPMENDEXT           0x00000007
+#define XPMIDENTIFIER		0x00000001			// mnIdentifier includes on of the six phases
+#define XPMDEFINITION		0x00000002			// the XPM format consists of
+#define XPMVALUES			0x00000003
+#define XPMCOLORS			0x00000004
+#define XPMPIXELS			0x00000005
+#define XPMEXTENSIONS		0x00000006
+#define XPMENDEXT			0x00000007
 
 
-#define XPMREMARK           0x00000001          // defines used by mnStatus
-#define XPMDOUBLE           0x00000002
-#define XPMSTRING           0x00000004
-#define XPMFINISHED         0x00000008
+#define XPMREMARK			0x00000001			// defines used by mnStatus
+#define XPMDOUBLE			0x00000002
+#define XPMSTRING			0x00000004
+#define XPMFINISHED			0x00000008
 
-#define XPMCASESENSITIVE    0x00000001
+#define XPMCASESENSITIVE	0x00000001
 #define XPMCASENONSENSITIVE 0x00000002
 
 // ---------
@@ -76,48 +76,48 @@ class XPMReader : public GraphicReader
 {
 private:
 
-    SvStream&           mrIStm;
-    Bitmap              maBmp;
-    BitmapWriteAccess*  mpAcc;
-    Bitmap              maMaskBmp;
-    BitmapWriteAccess*  mpMaskAcc;
-    long                mnLastPos;
-
-    ULONG               mnWidth;
-    ULONG               mnHeight;
-    ULONG               mnColors;
-    ULONG               mnCpp;                              // characters per pix
-    BOOL                mbTransparent;
-    BOOL                mbStatus;
-    ULONG               mnStatus;
-    ULONG               mnIdentifier;
-    BYTE                mcThisByte;
-    BYTE                mcLastByte;
-    ULONG               mnTempAvail;
-    BYTE*               mpTempBuf;
-    BYTE*               mpTempPtr;
-    BYTE*               mpFastColorTable;
-    BYTE*               mpColMap;
-    ULONG               mnStringSize;
-    BYTE*               mpStringBuf;
-    ULONG               mnParaSize;
-    BYTE*               mpPara;
-
-    BOOL                ImplGetString( void );
-    BOOL                ImplGetColor( ULONG );
-    BOOL                ImplGetScanLine( ULONG );
-    BOOL                ImplGetColSub( BYTE* );
-    BOOL                ImplGetColKey( BYTE );
-    void                ImplGetRGBHex( BYTE*, ULONG );
-    BOOL                ImplGetPara( ULONG numb );
-    BOOL                ImplCompare( BYTE*, BYTE*, ULONG, ULONG nmode = XPMCASENONSENSITIVE );
-    ULONG               ImplGetULONG( ULONG nPara );
+    SvStream&			mrIStm;
+    Bitmap				maBmp;
+    BitmapWriteAccess*	mpAcc;
+    Bitmap				maMaskBmp;
+    BitmapWriteAccess*	mpMaskAcc;
+    long				mnLastPos;
+
+    ULONG				mnWidth;
+    ULONG				mnHeight;
+    ULONG				mnColors;
+    ULONG				mnCpp;								// characters per pix
+    BOOL				mbTransparent;
+    BOOL				mbStatus;
+    ULONG				mnStatus;
+    ULONG				mnIdentifier;
+    BYTE				mcThisByte;
+    BYTE				mcLastByte;
+    ULONG				mnTempAvail;
+    BYTE*				mpTempBuf;
+    BYTE*				mpTempPtr;
+    BYTE*				mpFastColorTable;
+    BYTE*				mpColMap;
+    ULONG				mnStringSize;
+    BYTE*				mpStringBuf;
+    ULONG				mnParaSize;
+    BYTE*				mpPara;
+
+    BOOL				ImplGetString( void );
+    BOOL				ImplGetColor( ULONG );
+    BOOL				ImplGetScanLine( ULONG );
+    BOOL				ImplGetColSub( BYTE* );
+    BOOL				ImplGetColKey( BYTE );
+    void				ImplGetRGBHex( BYTE*, ULONG );
+    BOOL				ImplGetPara( ULONG numb );
+    BOOL				ImplCompare( BYTE*, BYTE*, ULONG, ULONG nmode = XPMCASENONSENSITIVE );
+    ULONG				ImplGetULONG( ULONG nPara );
 
 public:
                         XPMReader( SvStream& rStm );
-    virtual             ~XPMReader();
+    virtual				~XPMReader();
 
-    ReadState           ReadXPM( Graphic& rGraphic );
+    ReadState			ReadXPM( Graphic& rGraphic );
 };
 
 #endif // _XPMPRIVATE
diff --git a/svtools/source/java/javacontext.cxx b/svtools/source/java/javacontext.cxx
index 7ebd3ea76d1f..f3877f4e6b94 100644
--- a/svtools/source/java/javacontext.cxx
+++ b/svtools/source/java/javacontext.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
diff --git a/svtools/source/java/javaerror.src b/svtools/source/java/javaerror.src
index d5990c05a663..48dd29f25d6e 100644
--- a/svtools/source/java/javaerror.src
+++ b/svtools/source/java/javaerror.src
@@ -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
@@ -52,7 +52,7 @@ ErrorBox ERRORBOX_JVMCREATIONFAILED
 {
     Buttons = WB_OK;
     DefButton = WB_DEF_OK ;
-    Message[ en-US ] = "%PRODUCTNAME requires a Java runtime environment (JRE) to perform this task. The selected JRE is defective. Please select another version or install a new JRE and select  it under Tools - Options - %PRODUCTNAME - Java.";
+    Message[ en-US ] = "%PRODUCTNAME requires a Java runtime environment (JRE) to perform this task. The selected JRE is defective. Please select another version or install a new JRE and select  it under Tools - Options - %PRODUCTNAME - Java."; 
 };
 
 ErrorBox ERRORBOX_RESTARTREQUIRED
diff --git a/svtools/source/java/javainteractionhandler.cxx b/svtools/source/java/javainteractionhandler.cxx
index ec34ed07f25d..fbbe5aaab367 100644
--- a/svtools/source/java/javainteractionhandler.cxx
+++ b/svtools/source/java/javainteractionhandler.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
@@ -132,12 +132,12 @@ void SAL_CALL JavaInteractionHandler::handle( const Reference< XInteractionReque
 
     com::sun::star::java::JavaNotFoundException e1;
     com::sun::star::java::InvalidJavaSettingsException e2;
-     com::sun::star::java::JavaDisabledException                e3;
-    com::sun::star::java::JavaVMCreationFailureException    e4;
+     com::sun::star::java::JavaDisabledException				e3;
+    com::sun::star::java::JavaVMCreationFailureException	e4;
     com::sun::star::java::RestartRequiredException e5;
     // Try to recover the Exception type in the any and
     // react accordingly.
-    USHORT      nResult = RET_CANCEL;
+    USHORT		nResult = RET_CANCEL;
     ::rtl::OUString    aParameter;
 
     if ( anyExc >>= e1 )
diff --git a/svtools/source/java/patchjavaerror.src b/svtools/source/java/patchjavaerror.src
index d5990c05a663..48dd29f25d6e 100644
--- a/svtools/source/java/patchjavaerror.src
+++ b/svtools/source/java/patchjavaerror.src
@@ -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
@@ -52,7 +52,7 @@ ErrorBox ERRORBOX_JVMCREATIONFAILED
 {
     Buttons = WB_OK;
     DefButton = WB_DEF_OK ;
-    Message[ en-US ] = "%PRODUCTNAME requires a Java runtime environment (JRE) to perform this task. The selected JRE is defective. Please select another version or install a new JRE and select  it under Tools - Options - %PRODUCTNAME - Java.";
+    Message[ en-US ] = "%PRODUCTNAME requires a Java runtime environment (JRE) to perform this task. The selected JRE is defective. Please select another version or install a new JRE and select  it under Tools - Options - %PRODUCTNAME - Java."; 
 };
 
 ErrorBox ERRORBOX_RESTARTREQUIRED
diff --git a/svtools/source/misc/acceleratorexecute.cxx b/svtools/source/misc/acceleratorexecute.cxx
index 6458e359a49c..61503b3f1ccf 100644
--- a/svtools/source/misc/acceleratorexecute.cxx
+++ b/svtools/source/misc/acceleratorexecute.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
@@ -247,7 +247,7 @@ sal_Bool AcceleratorExecute::execute(const css::awt::KeyEvent& aAWTKey)
     css::util::URL aURL;
     aURL.Complete = sCommand;
     xParser->parseStrict(aURL);
-
+    
     // ask for dispatch object
     css::uno::Reference< css::frame::XDispatch > xDispatch = xProvider->queryDispatch(aURL, ::rtl::OUString(), 0);
     sal_Bool bRet = xDispatch.is();
@@ -267,16 +267,16 @@ css::awt::KeyEvent AcceleratorExecute::st_VCLKey2AWTKey(const KeyCode& aVCLKey)
     css::awt::KeyEvent aAWTKey;
     aAWTKey.Modifiers = 0;
     aAWTKey.KeyCode   = (sal_Int16)aVCLKey.GetCode();
-
+    
     if (aVCLKey.IsShift())
-        aAWTKey.Modifiers |= css::awt::KeyModifier::SHIFT;
+        aAWTKey.Modifiers |= css::awt::KeyModifier::SHIFT; 
     if (aVCLKey.IsMod1())
-        aAWTKey.Modifiers |= css::awt::KeyModifier::MOD1;
+        aAWTKey.Modifiers |= css::awt::KeyModifier::MOD1; 
     if (aVCLKey.IsMod2())
         aAWTKey.Modifiers |= css::awt::KeyModifier::MOD2;
         if (aVCLKey.IsMod3())
-        aAWTKey.Modifiers |= css::awt::KeyModifier::MOD3;
-    return aAWTKey;
+        aAWTKey.Modifiers |= css::awt::KeyModifier::MOD3; 
+    return aAWTKey;    
 }
 
 //-----------------------------------------------
@@ -287,7 +287,7 @@ KeyCode AcceleratorExecute::st_AWTKey2VCLKey(const css::awt::KeyEvent& aAWTKey)
     sal_Bool bMod2  = ((aAWTKey.Modifiers & css::awt::KeyModifier::MOD2 ) == css::awt::KeyModifier::MOD2  );
     sal_Bool bMod3  = ((aAWTKey.Modifiers & css::awt::KeyModifier::MOD3 ) == css::awt::KeyModifier::MOD3  );
     USHORT   nKey   = (USHORT)aAWTKey.KeyCode;
-
+    
     return KeyCode(nKey, bShift, bMod1, bMod2, bMod3);
 }
 //-----------------------------------------------
@@ -300,12 +300,12 @@ KeyCode AcceleratorExecute::st_AWTKey2VCLKey(const css::awt::KeyEvent& aAWTKey)
 {
     // SAFE -> ----------------------------------
     ::osl::ResettableMutexGuard aLock(m_aLock);
-
+    
     css::uno::Reference< css::ui::XAcceleratorConfiguration > xGlobalCfg = m_xGlobalCfg;
     css::uno::Reference< css::ui::XAcceleratorConfiguration > xModuleCfg = m_xModuleCfg;
     css::uno::Reference< css::ui::XAcceleratorConfiguration > xDocCfg    = m_xDocCfg   ;
-
-    aLock.clear();
+    
+    aLock.clear();    
     // <- SAFE ----------------------------------
 
     ::rtl::OUString sCommand;
@@ -339,7 +339,7 @@ KeyCode AcceleratorExecute::st_AWTKey2VCLKey(const css::awt::KeyEvent& aAWTKey)
     }
     catch(const css::container::NoSuchElementException&)
         {}
-
+        
     // fall back to functional key codes
     if( aKey.Modifiers == 0 )
     {
@@ -347,91 +347,91 @@ KeyCode AcceleratorExecute::st_AWTKey2VCLKey(const css::awt::KeyEvent& aAWTKey)
         {
         case com::sun::star::awt::Key::DELETE_TO_BEGIN_OF_LINE:
             return rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:DelToStartOfLine" ) );
-
+            
         case com::sun::star::awt::Key::DELETE_TO_END_OF_LINE:
             return rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:DelToEndOfLine" ) );
-
+            
         case com::sun::star::awt::Key::DELETE_TO_BEGIN_OF_PARAGRAPH:
             return rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:DelToStartOfPara" ) );
-
+            
         case com::sun::star::awt::Key::DELETE_TO_END_OF_PARAGRAPH:
             return rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:DelToEndOfPara" ) );
-
+            
         case com::sun::star::awt::Key::DELETE_WORD_BACKWARD:
             return rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:DelToStartOfWord" ) );
-
+            
         case com::sun::star::awt::Key::DELETE_WORD_FORWARD:
             return rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:DelToEndOfWord" ) );
-
+            
         case com::sun::star::awt::Key::INSERT_LINEBREAK:
             return rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:InsertLinebreak" ) );
-
+            
         case com::sun::star::awt::Key::INSERT_PARAGRAPH:
             return rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:InsertPara" ) );
-
+            
         case com::sun::star::awt::Key::MOVE_WORD_BACKWARD:
             return rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:GoToPrevWord" ) );
-
+            
         case com::sun::star::awt::Key::MOVE_WORD_FORWARD:
             return rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:GoToNextWord" ) );
-
+            
         case com::sun::star::awt::Key::MOVE_TO_BEGIN_OF_LINE:
             return rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:GoToStartOfLine" ) );
-
+            
         case com::sun::star::awt::Key::MOVE_TO_END_OF_LINE:
             return rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:GoToEndOfLine" ) );
-
+            
         case com::sun::star::awt::Key::MOVE_TO_BEGIN_OF_PARAGRAPH:
             return rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:GoToStartOfPara" ) );
-
+            
         case com::sun::star::awt::Key::MOVE_TO_END_OF_PARAGRAPH:
             return rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:GoToEndOfPara" ) );
-
+            
         case com::sun::star::awt::Key::MOVE_TO_BEGIN_OF_DOCUMENT:
             return rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:GoToStartOfDoc" ) );
-
+            
         case com::sun::star::awt::Key::MOVE_TO_END_OF_DOCUMENT:
             return rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:GoToEndOfDoc" ) );
-
+            
         case com::sun::star::awt::Key::SELECT_BACKWARD:
             return rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:CharLeftSel" ) );
-
+            
         case com::sun::star::awt::Key::SELECT_FORWARD:
             return rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:CharRightSel" ) );
-
+            
         case com::sun::star::awt::Key::SELECT_WORD_BACKWARD:
             return rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:WordLeftSel" ) );
-
+            
         case com::sun::star::awt::Key::SELECT_WORD_FORWARD:
             return rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:WordRightSel" ) );
-
+            
         case com::sun::star::awt::Key::SELECT_WORD:
             return rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:SelectWord" ) );
-
+            
         case com::sun::star::awt::Key::SELECT_LINE:
             return rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "" ) );
-
+            
         case com::sun::star::awt::Key::SELECT_PARAGRAPH:
             return rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:SelectText" ) );
-
+            
         case com::sun::star::awt::Key::SELECT_TO_BEGIN_OF_LINE:
             return rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:StartOfLineSel" ) );
-
+            
         case com::sun::star::awt::Key::SELECT_TO_END_OF_LINE:
             return rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:EndOfLineSel" ) );
 
         case com::sun::star::awt::Key::SELECT_TO_BEGIN_OF_PARAGRAPH:
             return rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:StartOfParaSel" ) );
-
+            
         case com::sun::star::awt::Key::SELECT_TO_END_OF_PARAGRAPH:
             return rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:EndOfParaSel" ) );
-
+            
         case com::sun::star::awt::Key::SELECT_TO_BEGIN_OF_DOCUMENT:
             return rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:StartOfDocumentSel" ) );
-
+            
         case com::sun::star::awt::Key::SELECT_TO_END_OF_DOCUMENT:
             return rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:EndOfDocumentSel" ) );
-
+            
         case com::sun::star::awt::Key::SELECT_ALL:
             return rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:SelectAll" ) );
         default:
diff --git a/svtools/source/misc/chartprettypainter.cxx b/svtools/source/misc/chartprettypainter.cxx
index bc2d02384816..0d951b8dbb90 100644
--- a/svtools/source/misc/chartprettypainter.cxx
+++ b/svtools/source/misc/chartprettypainter.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
@@ -135,6 +135,6 @@ bool ChartPrettyPainter::DoPrettyPaintChart( uno::Reference< frame::XModel > xCh
         (void)e;
         DBG_ERROR( "Chart cannot be painted pretty!" );
     }
-    return false;
+    return false; 
 }
 
diff --git a/svtools/source/misc/cliplistener.cxx b/svtools/source/misc/cliplistener.cxx
index 8fb61a5a1cb9..850ef85946cd 100644
--- a/svtools/source/misc/cliplistener.cxx
+++ b/svtools/source/misc/cliplistener.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
diff --git a/svtools/source/misc/dialogclosedlistener.cxx b/svtools/source/misc/dialogclosedlistener.cxx
index a08c8a3b6dd5..9f06651f9857 100644
--- a/svtools/source/misc/dialogclosedlistener.cxx
+++ b/svtools/source/misc/dialogclosedlistener.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
diff --git a/svtools/source/misc/dialogcontrolling.cxx b/svtools/source/misc/dialogcontrolling.cxx
index 7565dad731f7..429c528b5fd2 100644
--- a/svtools/source/misc/dialogcontrolling.cxx
+++ b/svtools/source/misc/dialogcontrolling.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
diff --git a/svtools/source/misc/ehdl.cxx b/svtools/source/misc/ehdl.cxx
index bf9e87d33a74..0ff2a3325254 100644
--- a/svtools/source/misc/ehdl.cxx
+++ b/svtools/source/misc/ehdl.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
@@ -50,7 +50,7 @@
 static USHORT aWndFunc(
     Window *pWin,            // Parent des Dialoges
     USHORT nFlags,
-    const String &rErr,      // Fehlertext
+    const String &rErr,	     // Fehlertext
     const String &rAction)   // Actiontext
 
 /*  [Beschreibung]
diff --git a/svtools/source/misc/ehdl.src b/svtools/source/misc/ehdl.src
index 436e06b7f3c5..ec20938a9411 100644
--- a/svtools/source/misc/ehdl.src
+++ b/svtools/source/misc/ehdl.src
@@ -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
diff --git a/svtools/source/misc/embedhlp.cxx b/svtools/source/misc/embedhlp.cxx
index 3aa0016c225e..d94c7986de21 100644
--- a/svtools/source/misc/embedhlp.cxx
+++ b/svtools/source/misc/embedhlp.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
@@ -304,7 +304,7 @@ EmbeddedObjectRef::EmbeddedObjectRef( const EmbeddedObjectRef& rObj )
 EmbeddedObjectRef::~EmbeddedObjectRef()
 {
     delete mpImp->pGraphic;
-    if ( mpImp->pHCGraphic )
+    if ( mpImp->pHCGraphic ) 
         DELETEZ( mpImp->pHCGraphic );
     Clear();
 }
@@ -456,7 +456,7 @@ void EmbeddedObjectRef::GetReplacement( BOOL bUpdate )
         DELETEZ( mpImp->pGraphic );
         mpImp->aMediaType = ::rtl::OUString();
         mpImp->pGraphic = new Graphic;
-        if ( mpImp->pHCGraphic )
+        if ( mpImp->pHCGraphic ) 
             DELETEZ( mpImp->pHCGraphic );
         mpImp->mnGraphicVersion++;
     }
@@ -602,7 +602,7 @@ Graphic* EmbeddedObjectRef::GetHCGraphic() const
                 if ( !pStream->GetError() )
                 {
                     GraphicFilter* pGF = GraphicFilter::GetGraphicFilter();
-                    Graphic* pGraphic = new Graphic();
+                    Graphic* pGraphic = new Graphic(); 
                     if ( pGF->ImportGraphic( *pGraphic, String(), *pStream, GRFILTER_FORMAT_DONTKNOW ) == 0 )
                         mpImp->pHCGraphic = pGraphic;
                     else
@@ -625,7 +625,7 @@ void EmbeddedObjectRef::SetGraphicStream( const uno::Reference< io::XInputStream
         delete mpImp->pGraphic;
     mpImp->pGraphic = new Graphic();
     mpImp->aMediaType = rMediaType;
-    if ( mpImp->pHCGraphic )
+    if ( mpImp->pHCGraphic ) 
         DELETEZ( mpImp->pHCGraphic );
     mpImp->mnGraphicVersion++;
 
@@ -636,7 +636,7 @@ void EmbeddedObjectRef::SetGraphicStream( const uno::Reference< io::XInputStream
         GraphicFilter* pGF = GraphicFilter::GetGraphicFilter();
         pGF->ImportGraphic( *mpImp->pGraphic, String(), *pGraphicStream, GRFILTER_FORMAT_DONTKNOW );
         mpImp->mnGraphicVersion++;
-
+    
         if ( mpImp->pContainer )
         {
             pGraphicStream->Seek( 0 );
@@ -658,7 +658,7 @@ void EmbeddedObjectRef::SetGraphic( const Graphic& rGraphic, const ::rtl::OUStri
         delete mpImp->pGraphic;
     mpImp->pGraphic = new Graphic( rGraphic );
     mpImp->aMediaType = rMediaType;
-    if ( mpImp->pHCGraphic )
+    if ( mpImp->pHCGraphic ) 
         DELETEZ( mpImp->pHCGraphic );
     mpImp->mnGraphicVersion++;
 
@@ -758,8 +758,8 @@ void EmbeddedObjectRef::DrawPaintReplacement( const Rectangle &rRect, const Stri
     if( nHeight > 0 )
     {
         aPt.Y() = nHeight;
-        Point   aP = rRect.TopLeft();
-        Size    aBmpSize = aBmp.GetSizePixel();
+        Point	aP = rRect.TopLeft();
+        Size	aBmpSize = aBmp.GetSizePixel();
         // Bitmap einpassen
         if( nHeight * 10 / nWidth
           > aBmpSize.Height() * 10 / aBmpSize.Width() )
@@ -895,7 +895,7 @@ void EmbeddedObjectRef::UpdateReplacementOnDemand()
 {
     DELETEZ( mpImp->pGraphic );
     mpImp->bNeedUpdate = sal_True;
-    if ( mpImp->pHCGraphic )
+    if ( mpImp->pHCGraphic ) 
         DELETEZ( mpImp->pHCGraphic );
     mpImp->mnGraphicVersion++;
 
diff --git a/svtools/source/misc/embedtransfer.cxx b/svtools/source/misc/embedtransfer.cxx
index cbf87f40b7fc..bdb54516898f 100644
--- a/svtools/source/misc/embedtransfer.cxx
+++ b/svtools/source/misc/embedtransfer.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
diff --git a/svtools/source/misc/errtxt.src b/svtools/source/misc/errtxt.src
index f33896e20003..2c1f788709e8 100644
--- a/svtools/source/misc/errtxt.src
+++ b/svtools/source/misc/errtxt.src
@@ -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
diff --git a/svtools/source/misc/helpagent.src b/svtools/source/misc/helpagent.src
index 1f2eaaa291a3..1acb5d24383a 100644
--- a/svtools/source/misc/helpagent.src
+++ b/svtools/source/misc/helpagent.src
@@ -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
diff --git a/svtools/source/misc/helpagentwindow.cxx b/svtools/source/misc/helpagentwindow.cxx
index 1d407bbdb611..99594b1e1e8a 100644
--- a/svtools/source/misc/helpagentwindow.cxx
+++ b/svtools/source/misc/helpagentwindow.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
@@ -42,7 +42,7 @@
 #include <svtools/helpid.hrc>
 #endif
 
-#define WB_AGENT_STYLE  0
+#define WB_AGENT_STYLE	0
 
 //........................................................................
 namespace svt
@@ -62,7 +62,7 @@ namespace svt
     public:
         CloserButton_Impl( Window* pParent, WinBits nBits ) : ImageButton( pParent, nBits ) {}
 
-        virtual void        MouseButtonUp( const MouseEvent& rMEvt );
+        virtual void		MouseButtonUp( const MouseEvent& rMEvt );
     };
 
     //--------------------------------------------------------------------
@@ -128,10 +128,10 @@ namespace svt
     {
         FloatingWindow::Paint(rRect);
 
-        Size        aOutputSize( GetOutputSizePixel() );
-        Point       aPoint=Point();
-        Rectangle   aOutputRect( aPoint, aOutputSize );
-        Rectangle   aInnerRect( aOutputRect );
+        Size		aOutputSize( GetOutputSizePixel() );
+        Point		aPoint=Point();
+        Rectangle	aOutputRect( aPoint, aOutputSize );
+        Rectangle	aInnerRect( aOutputRect );
 
         // paint the background
         SetLineColor( GetSettings().GetStyleSettings().GetFaceColor() );
@@ -187,6 +187,6 @@ namespace svt
     }
 
 //........................................................................
-}   // namespace svt
+}	// namespace svt
 //........................................................................
 
diff --git a/svtools/source/misc/imagemgr.cxx b/svtools/source/misc/imagemgr.cxx
index c02ebc4477c6..f168951ec08b 100644
--- a/svtools/source/misc/imagemgr.cxx
+++ b/svtools/source/misc/imagemgr.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
@@ -59,9 +59,9 @@
 
 // globals *******************************************************************
 
-#define NO_INDEX        ((USHORT)0xFFFF)
-#define CONTENT_HELPER  ::utl::UCBContentHelper
-#define ASCII_STRING(s) ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(s) )
+#define NO_INDEX    	((USHORT)0xFFFF)
+#define CONTENT_HELPER	::utl::UCBContentHelper
+#define ASCII_STRING(s)	::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(s) )
 
 struct SvtExtensionResIdMapping_Impl
 {
diff --git a/svtools/source/misc/imagemgr.src b/svtools/source/misc/imagemgr.src
index cdc9f8da1c87..b50a0501717c 100644
--- a/svtools/source/misc/imagemgr.src
+++ b/svtools/source/misc/imagemgr.src
@@ -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
diff --git a/svtools/source/misc/imageresourceaccess.cxx b/svtools/source/misc/imageresourceaccess.cxx
index 436c3f721833..54729db80678 100644
--- a/svtools/source/misc/imageresourceaccess.cxx
+++ b/svtools/source/misc/imageresourceaccess.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
@@ -99,7 +99,7 @@ namespace svt
     {
         return m_xInput;
     }
-
+    
     //--------------------------------------------------------------------
     Reference< XOutputStream > SAL_CALL StreamSupplier::getOutputStream(  ) throw (RuntimeException)
     {
@@ -114,7 +114,7 @@ namespace svt
 
         m_xSeekable->seek( location );
     }
-
+    
     //--------------------------------------------------------------------
     ::sal_Int64 SAL_CALL StreamSupplier::getPosition(  ) throw (IOException, RuntimeException)
     {
@@ -123,7 +123,7 @@ namespace svt
 
         return m_xSeekable->getPosition();
     }
-
+    
     //--------------------------------------------------------------------
     ::sal_Int64 SAL_CALL StreamSupplier::getLength(  ) throw (IOException, RuntimeException)
     {
diff --git a/svtools/source/misc/imap.cxx b/svtools/source/misc/imap.cxx
index 25f23e2ef00b..38a9c7c647fd 100644
--- a/svtools/source/misc/imap.cxx
+++ b/svtools/source/misc/imap.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
@@ -46,7 +46,7 @@
 DBG_NAME( ImageMap )
 
 
-#define SCALEPOINT(aPT,aFracX,aFracY) (aPT).X()=((aPT).X()*(aFracX).GetNumerator())/(aFracX).GetDenominator();  \
+#define SCALEPOINT(aPT,aFracX,aFracY) (aPT).X()=((aPT).X()*(aFracX).GetNumerator())/(aFracX).GetDenominator();	\
                                       (aPT).Y()=((aPT).Y()*(aFracY).GetNumerator())/(aFracY).GetDenominator();
 
 
@@ -67,7 +67,7 @@ IMapObject::IMapObject()
 {
 }
 
-IMapObject::IMapObject( const String& rURL, const String& rAltText, const String& rDesc,
+IMapObject::IMapObject( const String& rURL,	const String& rAltText, const String& rDesc,
                         const String& rTarget, const String& rName, BOOL bURLActive )
 : aURL( rURL )
 , aAltText( rAltText )
@@ -100,8 +100,8 @@ UINT16 IMapObject::GetVersion() const
 
 void IMapObject::Write( SvStream& rOStm, const String& rBaseURL ) const
 {
-    IMapCompat*             pCompat;
-    const rtl_TextEncoding  eEncoding = gsl_getSystemTextEncoding();
+    IMapCompat*				pCompat;
+    const rtl_TextEncoding	eEncoding = gsl_getSystemTextEncoding();
 
     rOStm << GetType();
     rOStm << GetVersion();
@@ -125,15 +125,15 @@ void IMapObject::Write( SvStream& rOStm, const String& rBaseURL ) const
 
 /******************************************************************************
 |*
-|*  Binaer-Import
+|* 	Binaer-Import
 |*
 \******************************************************************************/
 
 void IMapObject::Read( SvStream& rIStm, const String& rBaseURL )
 {
-    IMapCompat*         pCompat;
-    rtl_TextEncoding    nTextEncoding;
-    ByteString          aString;
+    IMapCompat*			pCompat;
+    rtl_TextEncoding	nTextEncoding;
+    ByteString			aString;
 
     // Typ und Version ueberlesen wir
     rIStm.SeekRel( 2 );
@@ -215,11 +215,11 @@ IMapRectangleObject::IMapRectangleObject( const Rectangle& rRect,
                                           const String& rURL,
                                           const String& rAltText,
                                           const String& rDesc,
-                                          const String& rTarget,
+                                          const String&	rTarget,
                                           const String& rName,
                                           BOOL bURLActive,
                                           BOOL bPixelCoords ) :
-            IMapObject  ( rURL, rAltText, rDesc, rTarget, rName, bURLActive )
+            IMapObject	( rURL, rAltText, rDesc, rTarget, rName, bURLActive )
 {
     ImpConstruct( rRect, bPixelCoords );
 }
@@ -296,7 +296,7 @@ BOOL IMapRectangleObject::IsHit( const Point& rPoint ) const
 
 Rectangle IMapRectangleObject::GetRectangle( BOOL bPixelCoords ) const
 {
-    Rectangle   aNewRect;
+    Rectangle	aNewRect;
 
     if ( bPixelCoords )
         aNewRect = Application::GetDefaultDevice()->LogicToPixel( aRect, MapMode( MAP_100TH_MM ) );
@@ -315,8 +315,8 @@ Rectangle IMapRectangleObject::GetRectangle( BOOL bPixelCoords ) const
 
 void IMapRectangleObject::Scale( const Fraction& rFracX, const Fraction& rFracY )
 {
-    Point   aTL( aRect.TopLeft() );
-    Point   aBR( aRect.BottomRight() );
+    Point	aTL( aRect.TopLeft() );
+    Point	aBR( aRect.BottomRight() );
 
     if ( rFracX.GetDenominator() && rFracY.GetDenominator() )
     {
@@ -352,7 +352,7 @@ IMapCircleObject::IMapCircleObject( const Point& rCenter, ULONG nCircleRadius,
                                     const String& rName,
                                     BOOL bURLActive,
                                     BOOL bPixelCoords ) :
-            IMapObject  ( rURL, rAltText, rDesc, rTarget, rName, bURLActive )
+            IMapObject	( rURL, rAltText, rDesc, rTarget, rName, bURLActive )
 {
     ImpConstruct( rCenter, nCircleRadius, bPixelCoords );
 }
@@ -368,7 +368,7 @@ void IMapCircleObject::ImpConstruct( const Point& rCenter, ULONG nRad, BOOL bPix
 {
     if ( bPixel )
     {
-        MapMode aMap100( MAP_100TH_MM );
+        MapMode	aMap100( MAP_100TH_MM );
 
         aCenter = Application::GetDefaultDevice()->PixelToLogic( rCenter, aMap100 );
         nRadius = Application::GetDefaultDevice()->PixelToLogic( Size( nRad, 0 ), aMap100 ).Width();
@@ -433,8 +433,8 @@ UINT16 IMapCircleObject::GetType() const
 
 BOOL IMapCircleObject::IsHit( const Point& rPoint ) const
 {
-    const Point aPoint( aCenter - rPoint );
-    BOOL        bRet = FALSE;
+    const Point	aPoint( aCenter - rPoint );
+    BOOL		bRet = FALSE;
 
     if ( (ULONG) sqrt( (double) aPoint.X() * aPoint.X() +
                        aPoint.Y() * aPoint.Y() ) <= nRadius )
@@ -546,8 +546,8 @@ IMapPolygonObject::IMapPolygonObject( const Polygon& rPoly,
                                       const String& rName,
                                       BOOL bURLActive,
                                       BOOL bPixelCoords ) :
-            IMapObject  ( rURL, rAltText, rDesc, rTarget, rName, bURLActive ),
-            bEllipse    ( FALSE )
+            IMapObject	( rURL, rAltText, rDesc, rTarget, rName, bURLActive ),
+            bEllipse	( FALSE )
 {
     ImpConstruct( rPoly, bPixelCoords );
 }
@@ -577,8 +577,8 @@ void IMapPolygonObject::ImpConstruct( const Polygon& rPoly, BOOL bPixel )
 void IMapPolygonObject::WriteIMapObject( SvStream& rOStm ) const
 {
     rOStm << aPoly;
-    rOStm << bEllipse;  // >= Version 2
-    rOStm << aEllipse;  // >= Version 2
+    rOStm << bEllipse;	// >= Version 2
+    rOStm << aEllipse;	// >= Version 2
 }
 
 
@@ -633,7 +633,7 @@ BOOL IMapPolygonObject::IsHit( const Point& rPoint ) const
 
 Polygon IMapPolygonObject::GetPolygon( BOOL bPixelCoords ) const
 {
-    Polygon aNewPoly;
+    Polygon	aNewPoly;
 
     if ( bPixelCoords )
         aNewPoly = Application::GetDefaultDevice()->LogicToPixel( aPoly, MapMode( MAP_100TH_MM ) );
@@ -684,8 +684,8 @@ void IMapPolygonObject::Scale( const Fraction& rFracX, const Fraction& rFracY )
 
     if ( bEllipse )
     {
-        Point   aTL( aEllipse.TopLeft() );
-        Point   aBR( aEllipse.BottomRight() );
+        Point	aTL( aEllipse.TopLeft() );
+        Point	aBR( aEllipse.BottomRight() );
 
         if ( rFracX.GetDenominator() && rFracY.GetDenominator() )
         {
@@ -710,10 +710,10 @@ BOOL IMapPolygonObject::IsEqual( const IMapPolygonObject& rEqObj )
 
     if ( IMapObject::IsEqual( rEqObj ) )
     {
-        const Polygon&  rEqPoly = rEqObj.aPoly;
-        const USHORT    nCount = aPoly.GetSize();
-        const USHORT    nEqCount = rEqPoly.GetSize();
-        BOOL            bDifferent = FALSE;
+        const Polygon&	rEqPoly = rEqObj.aPoly;
+        const USHORT	nCount = aPoly.GetSize();
+        const USHORT	nEqCount = rEqPoly.GetSize();
+        BOOL			bDifferent = FALSE;
 
         if ( nCount == nEqCount )
         {
@@ -747,7 +747,7 @@ BOOL IMapPolygonObject::IsEqual( const IMapPolygonObject& rEqObj )
 \******************************************************************************/
 
 ImageMap::ImageMap( const String& rName ) :
-            aName   ( rName )
+            aName	( rName )
 {
 }
 
@@ -876,9 +876,9 @@ ImageMap& ImageMap::operator=( const ImageMap& rImageMap )
 
 BOOL ImageMap::operator==( const ImageMap& rImageMap )
 {
-    const USHORT    nCount = (USHORT) maList.Count();
-    const USHORT    nEqCount = rImageMap.GetIMapObjectCount();
-    BOOL            bRet = FALSE;
+    const USHORT	nCount = (USHORT) maList.Count();
+    const USHORT	nEqCount = rImageMap.GetIMapObjectCount();
+    BOOL			bRet = FALSE;
 
     if ( nCount == nEqCount )
     {
@@ -1029,8 +1029,8 @@ IMapObject* ImageMap::GetHitIMapObject( const Size& rTotalSize,
 
 Rectangle ImageMap::GetBoundRect() const
 {
-    Rectangle   aBoundRect;
-    ULONG       nCount = maList.Count();
+    Rectangle	aBoundRect;
+    ULONG		nCount = maList.Count();
 
     for ( ULONG i = 0; i < nCount; i++ )
         aBoundRect.Union( ( (IMapObject*) maList.GetObject( i ) )->GetBoundRect() );
@@ -1083,7 +1083,7 @@ void ImageMap::Scale( const Fraction& rFracX, const Fraction& rFracY )
 void ImageMap::ImpWriteImageMap( SvStream& rOStm, const String& rBaseURL ) const
 {
     IMapObject* pObj;
-    USHORT      nCount = (USHORT) maList.Count();
+    USHORT		nCount = (USHORT) maList.Count();
 
     for ( USHORT i = 0; i < nCount; i++ )
     {
@@ -1150,12 +1150,12 @@ void ImageMap::ImpReadImageMap( SvStream& rIStm, USHORT nCount, const String& rB
 
 void ImageMap::Write( SvStream& rOStm, const String& rBaseURL ) const
 {
-    IMapCompat*             pCompat;
+    IMapCompat*				pCompat;
     String                  aImageName( GetName() );
-    String                  aDummy;
-    USHORT                  nOldFormat = rOStm.GetNumberFormatInt();
+    String					aDummy;
+    USHORT					nOldFormat = rOStm.GetNumberFormatInt();
     UINT16                  nCount = (UINT16) GetIMapObjectCount();
-    const rtl_TextEncoding  eEncoding = gsl_getSystemTextEncoding();
+    const rtl_TextEncoding	eEncoding = gsl_getSystemTextEncoding();
 
     rOStm.SetNumberFormatInt( NUMBERFORMAT_INT_LITTLEENDIAN );
 
@@ -1187,10 +1187,10 @@ void ImageMap::Write( SvStream& rOStm, const String& rBaseURL ) const
 
 void ImageMap::Read( SvStream& rIStm, const String& rBaseURL )
 {
-    ByteString  aString;
-    char        cMagic[6];
-    USHORT      nOldFormat = rIStm.GetNumberFormatInt();
-    UINT16      nCount;
+    ByteString	aString;
+    char		cMagic[6];
+    USHORT		nOldFormat = rIStm.GetNumberFormatInt();
+    UINT16		nCount;
 
     rIStm.SetNumberFormatInt( NUMBERFORMAT_INT_LITTLEENDIAN );
     rIStm.Read( cMagic, sizeof( cMagic ) );
diff --git a/svtools/source/misc/imap2.cxx b/svtools/source/misc/imap2.cxx
index 9834fe0fcb76..9c0b9ff9a553 100644
--- a/svtools/source/misc/imap2.cxx
+++ b/svtools/source/misc/imap2.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
@@ -72,7 +72,7 @@ TYPEINIT0_AUTOFACTORY( ImageMap );
 
 void IMapObject::AppendCERNCoords( const Point& rPoint100, ByteString& rStr ) const
 {
-    const Point aPixPt( Application::GetDefaultDevice()->LogicToPixel( rPoint100, MapMode( MAP_100TH_MM ) ) );
+    const Point	aPixPt( Application::GetDefaultDevice()->LogicToPixel( rPoint100, MapMode( MAP_100TH_MM ) ) );
 
     rStr += '(';
     rStr += ByteString::CreateFromInt32( aPixPt.X() );
@@ -90,7 +90,7 @@ void IMapObject::AppendCERNCoords( const Point& rPoint100, ByteString& rStr ) co
 
 void IMapObject::AppendNCSACoords( const Point& rPoint100, ByteString& rStr ) const
 {
-    const Point aPixPt( Application::GetDefaultDevice()->LogicToPixel( rPoint100, MapMode( MAP_100TH_MM ) ) );
+    const Point	aPixPt( Application::GetDefaultDevice()->LogicToPixel( rPoint100, MapMode( MAP_100TH_MM ) ) );
 
     rStr += ByteString::CreateFromInt32( aPixPt.X() );
     rStr += ',';
@@ -217,8 +217,8 @@ void IMapCircleObject::WriteNCSA( SvStream& rOStm, const String& rBaseURL ) cons
 
 void IMapPolygonObject::WriteCERN( SvStream& rOStm, const String& rBaseURL  ) const
 {
-    ByteString      aStr( "polygon " );
-    const USHORT    nCount = aPoly.GetSize();
+    ByteString		aStr( "polygon " );
+    const USHORT	nCount = aPoly.GetSize();
 
     for ( USHORT i = 0; i < nCount; i++ )
         AppendCERNCoords( aPoly[ i ], aStr );
@@ -237,8 +237,8 @@ void IMapPolygonObject::WriteCERN( SvStream& rOStm, const String& rBaseURL  ) co
 
 void IMapPolygonObject::WriteNCSA( SvStream& rOStm, const String& rBaseURL  ) const
 {
-    ByteString      aStr( "poly " );
-    const USHORT    nCount = Min( aPoly.GetSize(), (USHORT) 100 );
+    ByteString		aStr( "poly " );
+    const USHORT	nCount = Min( aPoly.GetSize(), (USHORT) 100 );
 
     AppendNCSAURL( aStr, rBaseURL );
 
@@ -282,7 +282,7 @@ void ImageMap::Write( SvStream& rOStm, ULONG nFormat, const String& rBaseURL ) c
 void ImageMap::ImpWriteCERN( SvStream& rOStm, const String& rBaseURL ) const
 {
     IMapObject* pObj;
-    USHORT      nCount = (USHORT) maList.Count();
+    USHORT		nCount = (USHORT) maList.Count();
 
     for ( USHORT i = 0; i < nCount; i++ )
     {
@@ -318,7 +318,7 @@ void ImageMap::ImpWriteCERN( SvStream& rOStm, const String& rBaseURL ) const
 void ImageMap::ImpWriteNCSA( SvStream& rOStm, const String& rBaseURL  ) const
 {
     IMapObject* pObj;
-    USHORT      nCount = (USHORT) maList.Count();
+    USHORT		nCount = (USHORT) maList.Count();
 
     for ( USHORT i = 0; i < nCount; i++ )
     {
@@ -403,16 +403,16 @@ ULONG ImageMap::ImpReadCERN( SvStream& rIStm, const String& rBaseURL )
 
 void ImageMap::ImpReadCERNLine( const ByteString& rLine, const String& rBaseURL  )
 {
-    ByteString  aStr( rLine );
-    ByteString  aToken;
+    ByteString	aStr( rLine );
+    ByteString	aToken;
 
     aStr.EraseLeadingChars( ' ' );
     aStr.EraseLeadingChars( '\t' );
     aStr.EraseAllChars( ';' );
     aStr.ToLowerAscii();
 
-    const char* pStr = aStr.GetBuffer();
-    char        cChar = *pStr++;
+    const char*	pStr = aStr.GetBuffer();
+    char		cChar = *pStr++;
 
         // Anweisung finden
     while( ( cChar >= 'a' ) && ( cChar <= 'z' ) && NOTEOL( cChar ) )
@@ -425,18 +425,18 @@ void ImageMap::ImpReadCERNLine( const ByteString& rLine, const String& rBaseURL
     {
         if ( ( aToken == "rectangle" ) || ( aToken == "rect" ) )
         {
-            const Point     aTopLeft( ImpReadCERNCoords( &pStr ) );
-            const Point     aBottomRight( ImpReadCERNCoords( &pStr ) );
+            const Point		aTopLeft( ImpReadCERNCoords( &pStr ) );
+            const Point		aBottomRight( ImpReadCERNCoords( &pStr ) );
             const String    aURL( ImpReadCERNURL( &pStr, rBaseURL ) );
-            const Rectangle aRect( aTopLeft, aBottomRight );
+            const Rectangle	aRect( aTopLeft, aBottomRight );
 
             IMapRectangleObject* pObj = new IMapRectangleObject( aRect, aURL, String(), String(), String(), String() );
             maList.Insert( pObj, LIST_APPEND );
         }
         else if ( ( aToken == "circle" ) || ( aToken == "circ" ) )
         {
-            const Point     aCenter( ImpReadCERNCoords( &pStr ) );
-            const long      nRadius = ImpReadCERNRadius( &pStr );
+            const Point		aCenter( ImpReadCERNCoords( &pStr ) );
+            const long		nRadius = ImpReadCERNRadius( &pStr );
             const String    aURL( ImpReadCERNURL( &pStr, rBaseURL ) );
 
             IMapCircleObject* pObj = new IMapCircleObject( aCenter, nRadius, aURL, String(), String(), String(), String() );
@@ -444,9 +444,9 @@ void ImageMap::ImpReadCERNLine( const ByteString& rLine, const String& rBaseURL
         }
         else if ( ( aToken == "polygon" ) || ( aToken == "poly" ) )
         {
-            const USHORT    nCount = aStr.GetTokenCount( '(' ) - 1;
-            Polygon         aPoly( nCount );
-            String          aURL;
+            const USHORT	nCount = aStr.GetTokenCount( '(' ) - 1;
+            Polygon			aPoly( nCount );
+            String			aURL;
 
             for ( USHORT i = 0; i < nCount; i++ )
                 aPoly[ i ] = ImpReadCERNCoords( &pStr );
@@ -468,10 +468,10 @@ void ImageMap::ImpReadCERNLine( const ByteString& rLine, const String& rBaseURL
 
 Point ImageMap::ImpReadCERNCoords( const char** ppStr )
 {
-    String  aStrX;
-    String  aStrY;
-    Point   aPt;
-    char    cChar = *(*ppStr)++;
+    String	aStrX;
+    String	aStrY;
+    Point	aPt;
+    char	cChar = *(*ppStr)++;
 
     while( NOTEOL( cChar ) && ( ( cChar < '0' ) || ( cChar > '9' ) ) )
         cChar = *(*ppStr)++;
@@ -515,8 +515,8 @@ Point ImageMap::ImpReadCERNCoords( const char** ppStr )
 
 long ImageMap::ImpReadCERNRadius( const char** ppStr )
 {
-    String  aStr;
-    char    cChar = *(*ppStr)++;
+    String	aStr;
+    char	cChar = *(*ppStr)++;
 
     while( NOTEOL( cChar ) && ( ( cChar < '0' ) || ( cChar > '9' ) ) )
         cChar = *(*ppStr)++;
@@ -542,7 +542,7 @@ long ImageMap::ImpReadCERNRadius( const char** ppStr )
 
 String ImageMap::ImpReadCERNURL( const char** ppStr, const String& rBaseURL )
 {
-    String  aStr( String::CreateFromAscii( *ppStr ) );
+    String	aStr( String::CreateFromAscii( *ppStr ) );
 
     aStr.EraseLeadingChars( ' ' );
     aStr.EraseLeadingChars( '\t' );
@@ -581,16 +581,16 @@ ULONG ImageMap::ImpReadNCSA( SvStream& rIStm, const String& rBaseURL )
 
 void ImageMap::ImpReadNCSALine( const ByteString& rLine, const String& rBaseURL )
 {
-    ByteString  aStr( rLine );
-    ByteString  aToken;
+    ByteString	aStr( rLine );
+    ByteString	aToken;
 
     aStr.EraseLeadingChars( ' ' );
     aStr.EraseLeadingChars( '\t' );
     aStr.EraseAllChars( ';' );
     aStr.ToLowerAscii();
 
-    const char* pStr = aStr.GetBuffer();
-    char        cChar = *pStr++;
+    const char*	pStr = aStr.GetBuffer();
+    char		cChar = *pStr++;
 
         // Anweisung finden
     while( ( cChar >= 'a' ) && ( cChar <= 'z' ) && NOTEOL( cChar ) )
@@ -604,9 +604,9 @@ void ImageMap::ImpReadNCSALine( const ByteString& rLine, const String& rBaseURL
         if ( aToken == "rect" )
         {
             const String    aURL( ImpReadNCSAURL( &pStr, rBaseURL ) );
-            const Point     aTopLeft( ImpReadNCSACoords( &pStr ) );
-            const Point     aBottomRight( ImpReadNCSACoords( &pStr ) );
-            const Rectangle aRect( aTopLeft, aBottomRight );
+            const Point		aTopLeft( ImpReadNCSACoords( &pStr ) );
+            const Point		aBottomRight( ImpReadNCSACoords( &pStr ) );
+            const Rectangle	aRect( aTopLeft, aBottomRight );
 
             IMapRectangleObject* pObj = new IMapRectangleObject( aRect, aURL, String(), String(), String(), String() );
             maList.Insert( pObj, LIST_APPEND );
@@ -614,9 +614,9 @@ void ImageMap::ImpReadNCSALine( const ByteString& rLine, const String& rBaseURL
         else if ( aToken == "circle" )
         {
             const String    aURL( ImpReadNCSAURL( &pStr, rBaseURL ) );
-            const Point     aCenter( ImpReadNCSACoords( &pStr ) );
-            const Point     aDX( aCenter - ImpReadNCSACoords( &pStr ) );
-            long            nRadius = (long) sqrt( (double) aDX.X() * aDX.X() +
+            const Point		aCenter( ImpReadNCSACoords( &pStr ) );
+            const Point		aDX( aCenter - ImpReadNCSACoords( &pStr ) );
+            long			nRadius = (long) sqrt( (double) aDX.X() * aDX.X() +
                                                    (double) aDX.Y() * aDX.Y() );
 
             IMapCircleObject* pObj = new IMapCircleObject( aCenter, nRadius, aURL, String(), String(), String(), String() );
@@ -624,9 +624,9 @@ void ImageMap::ImpReadNCSALine( const ByteString& rLine, const String& rBaseURL
         }
         else if ( aToken == "poly" )
         {
-            const USHORT    nCount = aStr.GetTokenCount( ',' ) - 1;
+            const USHORT	nCount = aStr.GetTokenCount( ',' ) - 1;
             const String    aURL( ImpReadNCSAURL( &pStr, rBaseURL ) );
-            Polygon         aPoly( nCount );
+            Polygon			aPoly( nCount );
 
             for ( USHORT i = 0; i < nCount; i++ )
                 aPoly[ i ] = ImpReadNCSACoords( &pStr );
@@ -646,8 +646,8 @@ void ImageMap::ImpReadNCSALine( const ByteString& rLine, const String& rBaseURL
 
 String ImageMap::ImpReadNCSAURL( const char** ppStr, const String& rBaseURL )
 {
-    String  aStr;
-    char    cChar = *(*ppStr)++;
+    String	aStr;
+    char	cChar = *(*ppStr)++;
 
     while( NOTEOL( cChar ) && ( ( cChar == ' ' ) || ( cChar == '\t' ) ) )
         cChar = *(*ppStr)++;
@@ -673,10 +673,10 @@ String ImageMap::ImpReadNCSAURL( const char** ppStr, const String& rBaseURL )
 
 Point ImageMap::ImpReadNCSACoords( const char** ppStr )
 {
-    String  aStrX;
-    String  aStrY;
-    Point   aPt;
-    char    cChar = *(*ppStr)++;
+    String	aStrX;
+    String	aStrY;
+    Point	aPt;
+    char	cChar = *(*ppStr)++;
 
     while( NOTEOL( cChar ) && ( ( cChar < '0' ) || ( cChar > '9' ) ) )
         cChar = *(*ppStr)++;
@@ -716,9 +716,9 @@ Point ImageMap::ImpReadNCSACoords( const char** ppStr )
 
 ULONG ImageMap::ImpDetectFormat( SvStream& rIStm )
 {
-    ULONG   nPos = rIStm.Tell();
-    ULONG   nRet = IMAP_FORMAT_BIN;
-    char    cMagic[6];
+    ULONG	nPos = rIStm.Tell();
+    ULONG	nRet = IMAP_FORMAT_BIN;
+    char	cMagic[6];
 
     rIStm.Read( cMagic, sizeof( cMagic ) );
 
@@ -726,8 +726,8 @@ ULONG ImageMap::ImpDetectFormat( SvStream& rIStm )
     // untersuchen wir das Format
     if ( memcmp( cMagic, IMAPMAGIC, sizeof( cMagic ) ) )
     {
-        ByteString  aStr;
-        long        nCount = 128;
+        ByteString	aStr;
+        long		nCount = 128;
 
         rIStm.Seek( nPos );
         while ( rIStm.ReadLine( aStr ) && nCount-- )
diff --git a/svtools/source/misc/imap3.cxx b/svtools/source/misc/imap3.cxx
index 76763ae422f2..4493185b0c44 100644
--- a/svtools/source/misc/imap3.cxx
+++ b/svtools/source/misc/imap3.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
@@ -41,8 +41,8 @@
 \******************************************************************************/
 
 IMapCompat::IMapCompat( SvStream& rStm, const USHORT nStreamMode ) :
-            pRWStm      ( &rStm ),
-            nStmMode    ( nStreamMode )
+            pRWStm		( &rStm ),
+            nStmMode	( nStreamMode )
 {
     DBG_ASSERT( nStreamMode == STREAM_READ || nStreamMode == STREAM_WRITE, "Wrong Mode!" );
 
@@ -77,7 +77,7 @@ IMapCompat::~IMapCompat()
     {
         if ( nStmMode == STREAM_WRITE )
         {
-            const ULONG nEndPos = pRWStm->Tell();
+            const ULONG	nEndPos = pRWStm->Tell();
 
             pRWStm->Seek( nCompatPos );
             *pRWStm << (UINT32) ( nEndPos - nTotalSize );
diff --git a/svtools/source/misc/itemdel.cxx b/svtools/source/misc/itemdel.cxx
index 559d31cdeb1d..e39488abbdbd 100644
--- a/svtools/source/misc/itemdel.cxx
+++ b/svtools/source/misc/itemdel.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
@@ -46,7 +46,7 @@ DBG_NAME(SfxItemDesruptor_Impl);
 class SfxItemDesruptor_Impl
 {
     SfxPoolItem *pItem;
-    Link         aLink;
+    Link		 aLink;
 
 private:
                  DECL_LINK( Delete, void * );
diff --git a/svtools/source/misc/langtab.cxx b/svtools/source/misc/langtab.cxx
index d1ff94572a99..fd89f878e97e 100644
--- a/svtools/source/misc/langtab.cxx
+++ b/svtools/source/misc/langtab.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
@@ -54,24 +54,24 @@ SVT_DLLPUBLIC const String ApplyLreOrRleEmbedding( const String &rText )
     const USHORT nLen = rText.Len();
     if (nLen == 0)
         return String();
-
+    
     const sal_Unicode cLRE_Embedding  = 0x202A;      // the start char of an LRE embedding
     const sal_Unicode cRLE_Embedding  = 0x202B;      // the start char of an RLE embedding
     const sal_Unicode cPopDirectionalFormat = 0x202C;   // the unicode PDF (POP_DIRECTIONAL_FORMAT) char that terminates an LRE/RLE embedding
-
+    
     // check if there are alreay embedding characters at the strings start
     // if so change nothing
     const sal_Unicode cChar = rText.GetBuffer()[0];
     if (cChar == cLRE_Embedding || cChar == cRLE_Embedding)
         return rText;
-
+    
     // since we only call the function getCharacterDirection
     // it does not matter which locale the CharClass is for.
     // Thus we can readily make use of SvtSysLocale::GetCharClass()
     // which should come at no cost...
     SvtSysLocale aSysLocale;
     const CharClass &rCharClass = aSysLocale.GetCharClass();
-
+    
     // we should look for the first non-neutral LTR or RTL character
     // and use that to determine the embedding of the whole text...
     // Thus we can avoid to check every character of the text.
@@ -89,27 +89,27 @@ SVT_DLLPUBLIC const String ApplyLreOrRleEmbedding( const String &rText )
             case i18n::DirectionProperty_ARABIC_NUMBER :        // yes! arabic numbers are written from left to right
             {
                 bIsRtlText  = false;
-                bFound      = true;
+                bFound      = true; 
                 break;
             }
-
+            
             case i18n::DirectionProperty_RIGHT_TO_LEFT :
             case i18n::DirectionProperty_RIGHT_TO_LEFT_ARABIC :
             case i18n::DirectionProperty_RIGHT_TO_LEFT_EMBEDDING :
             case i18n::DirectionProperty_RIGHT_TO_LEFT_OVERRIDE :
-            {
+            {    
                 bIsRtlText  = true;
-                bFound      = true;
+                bFound      = true; 
                 break;
             }
-
+    
             default:
             {
                 // nothing to be done, character is considered to be neutral we need to look further ...
-            }
-        }
+            }    
+        }    
     }
-
+    
     sal_Unicode cStart  = cLRE_Embedding;   // default is to use LRE embedding characters
     if (bIsRtlText)
         cStart = cRLE_Embedding;            // then use RLE embedding
@@ -123,7 +123,7 @@ SVT_DLLPUBLIC const String ApplyLreOrRleEmbedding( const String &rText )
     }
 
     return aRes;
-}
+}    
 
 //------------------------------------------------------------------------
 
@@ -153,7 +153,7 @@ const String& SvtLanguageTable::GetString( const LanguageType eType ) const
         // generally raise an error.
         OSL_ENSURE(
             eLang == LANGUAGE_ENGLISH, "language entry not found in resource" );
-
+        
         nPos = FindIndex( LANGUAGE_DONTKNOW );
 
         if ( RESARRAY_INDEX_NOTFOUND != nPos && nPos < Count() )
@@ -183,7 +183,7 @@ LanguageType SvtLanguageTable::GetType( const String& rStr ) const
             eType = LanguageType( GetValue( i ) );
             break;
         }
-    }
+    }    
     return eType;
 }
 
@@ -193,7 +193,7 @@ sal_uInt32 SvtLanguageTable::GetEntryCount() const
 {
     return Count();
 }
-
+    
 //------------------------------------------------------------------------
 
 LanguageType SvtLanguageTable::GetTypeAtIndex( sal_uInt32 nIndex ) const
diff --git a/svtools/source/misc/langtab.src b/svtools/source/misc/langtab.src
index 067eb601a5af..902e365d6197 100644
--- a/svtools/source/misc/langtab.src
+++ b/svtools/source/misc/langtab.src
@@ -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
@@ -186,7 +186,7 @@ StringArray STR_ARR_SVT_LANGUAGE_TABLE
         < "Swahili (Kenya)" ; LANGUAGE_SWAHILI ; > ;
         < "Swedish (Sweden)" ; LANGUAGE_SWEDISH ; > ;
         < "Swedish (Finland)" ; LANGUAGE_SWEDISH_FINLAND ; > ;
-        < "Tajik" ; LANGUAGE_TAJIK ; > ;
+        < "Tajik" ; LANGUAGE_TAJIK ; > ; 
         < "Tamil" ; LANGUAGE_TAMIL ; > ;
         < "Tatar" ; LANGUAGE_TATAR ; > ;
         < "Telugu" ; LANGUAGE_TELUGU ; > ;
diff --git a/svtools/source/misc/stringtransfer.cxx b/svtools/source/misc/stringtransfer.cxx
index fa216b27f99c..5f3cbc58fe28 100644
--- a/svtools/source/misc/stringtransfer.cxx
+++ b/svtools/source/misc/stringtransfer.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
@@ -81,7 +81,7 @@ namespace svt
 
         // check for a string format
         const DataFlavorExVector& rFormats = aClipboardData.GetDataFlavorExVector();
-        for (   DataFlavorExVector::const_iterator aSearch = rFormats.begin();
+        for	(	DataFlavorExVector::const_iterator aSearch = rFormats.begin();
                 aSearch != rFormats.end();
                 ++aSearch
             )
@@ -107,6 +107,6 @@ namespace svt
     }
 
 //........................................................................
-}   // namespace svt
+}	// namespace svt
 //........................................................................
 
diff --git a/svtools/source/misc/svtaccessiblefactory.cxx b/svtools/source/misc/svtaccessiblefactory.cxx
index b20863db3208..ba8a4bc8bd94 100755
--- a/svtools/source/misc/svtaccessiblefactory.cxx
+++ b/svtools/source/misc/svtaccessiblefactory.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
diff --git a/svtools/source/misc/svtdata.cxx b/svtools/source/misc/svtdata.cxx
index 65715f635883..7c6145f165a0 100644
--- a/svtools/source/misc/svtdata.cxx
+++ b/svtools/source/misc/svtdata.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
diff --git a/svtools/source/misc/templatefoldercache.cxx b/svtools/source/misc/templatefoldercache.cxx
index 62f3ec39eb6f..207d643ec6dc 100644
--- a/svtools/source/misc/templatefoldercache.cxx
+++ b/svtools/source/misc/templatefoldercache.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
@@ -96,13 +96,13 @@ namespace svt
     //---------------------------------------------------------------------
     sal_Bool operator == ( const util::DateTime& _rLHS, const util::DateTime& _rRHS )
     {
-        return  _rLHS.HundredthSeconds == _rRHS.HundredthSeconds
-            &&  _rLHS.Seconds   == _rRHS.Seconds
-            &&  _rLHS.Minutes   == _rRHS.Minutes
-            &&  _rLHS.Hours     == _rRHS.Hours
-            &&  _rLHS.Day       == _rRHS.Day
-            &&  _rLHS.Month     == _rRHS.Month
-            &&  _rLHS.Year      == _rRHS.Year;
+        return	_rLHS.HundredthSeconds == _rRHS.HundredthSeconds
+            &&	_rLHS.Seconds	== _rRHS.Seconds
+            &&	_rLHS.Minutes	== _rRHS.Minutes
+            &&	_rLHS.Hours		== _rRHS.Hours
+            &&	_rLHS.Day		== _rRHS.Day
+            &&	_rLHS.Month		== _rRHS.Month
+            &&	_rLHS.Year		== _rRHS.Year;
     }
 
     //---------------------------------------------------------------------
@@ -115,7 +115,7 @@ namespace svt
     //= TemplateContent
     //=====================================================================
     struct TemplateContent;
-    typedef ::std::vector< ::vos::ORef< TemplateContent > > TemplateFolderContent;
+    typedef	::std::vector< ::vos::ORef< TemplateContent > >	TemplateFolderContent;
         typedef TemplateFolderContent::const_iterator           ConstFolderIterator;
         typedef TemplateFolderContent::iterator                 FolderIterator;
 
@@ -126,13 +126,13 @@ namespace svt
     public:
 
     private:
-        INetURLObject           m_aURL;
-        String                  m_sLocalName;       // redundant - last segment of m_aURL
-        util::DateTime          m_aLastModified;    // date of last modification as reported by UCP
-        TemplateFolderContent   m_aSubContents;     // sorted (by name) list of the children
+        INetURLObject			m_aURL;
+        String					m_sLocalName;		// redundant - last segment of m_aURL
+        util::DateTime			m_aLastModified;	// date of last modification as reported by UCP
+        TemplateFolderContent	m_aSubContents;		// sorted (by name) list of the children
 
     private:
-        inline  void    implResetDate( )
+        inline	void	implResetDate( )
         {
             m_aLastModified.HundredthSeconds = m_aLastModified.Seconds = m_aLastModified.Minutes = m_aLastModified.Hours = 0;
             m_aLastModified.Day = m_aLastModified.Month = m_aLastModified.Year = 0;
@@ -147,20 +147,20 @@ namespace svt
         TemplateContent( const INetURLObject& _rURL, const util::DateTime& _rLastModified );
 
         // attribute access
-        inline String                   getName( ) const                            { return m_sLocalName; }
-        inline String                   getURL( ) const                             { return m_aURL.GetMainURL( INetURLObject::DECODE_TO_IURI ); }
-        inline void                     setModDate( const util::DateTime& _rDate )  { m_aLastModified = _rDate; }
-        inline const util::DateTime&    getModDate( ) const                         { return m_aLastModified; }
+        inline String					getName( ) const							{ return m_sLocalName; }
+        inline String					getURL( ) const								{ return m_aURL.GetMainURL( INetURLObject::DECODE_TO_IURI ); }
+        inline void						setModDate( const util::DateTime& _rDate )	{ m_aLastModified = _rDate; }
+        inline const util::DateTime&	getModDate( ) const							{ return m_aLastModified; }
 
-        inline TemplateFolderContent&   getSubContents()            { return m_aSubContents; }
-        inline const TemplateFolderContent& getSubContents() const  { return m_aSubContents; }
+        inline TemplateFolderContent&	getSubContents()			{ return m_aSubContents; }
+        inline const TemplateFolderContent&	getSubContents() const	{ return m_aSubContents; }
 
                 inline ConstFolderIterator              begin() const   { return m_aSubContents.begin(); }
                 inline ConstFolderIterator              end() const             { return m_aSubContents.end(); }
         inline TemplateFolderContent::size_type
-                                        size() const    { return m_aSubContents.size(); }
+                                        size() const	{ return m_aSubContents.size(); }
 
-        inline void                     push_back( const ::vos::ORef< TemplateContent >& _rxNewElement )
+        inline void						push_back( const ::vos::ORef< TemplateContent >& _rxNewElement )
                                                         { m_aSubContents.push_back( _rxNewElement ); }
     };
 
@@ -206,16 +206,16 @@ namespace svt
     //---------------------------------------------------------------------
     /// compares two TemplateContent by URL
     struct TemplateContentURLLess
-        :public ::std::binary_function  <   ::vos::ORef< TemplateContent >
-                                        ,   ::vos::ORef< TemplateContent >
-                                        ,   bool
+        :public ::std::binary_function	<	::vos::ORef< TemplateContent >
+                                        ,	::vos::ORef< TemplateContent >
+                                        ,	bool
                                         >
     {
         bool operator() ( const ::vos::ORef< TemplateContent >& _rxLHS, const ::vos::ORef< TemplateContent >& _rxRHS ) const
         {
-            return  _rxLHS->getURL() < _rxRHS->getURL()
-                ?   true
-                :   false;
+            return	_rxLHS->getURL() < _rxRHS->getURL()
+                ?	true
+                :	false;
         }
     };
 
@@ -252,9 +252,9 @@ namespace svt
     /** does a deep compare of two template contents
     */
     struct TemplateContentEqual
-        :public ::std::binary_function  <   ::vos::ORef< TemplateContent >
-                                        ,   ::vos::ORef< TemplateContent >
-                                        ,   bool
+        :public ::std::binary_function	<	::vos::ORef< TemplateContent >
+                                        ,	::vos::ORef< TemplateContent >
+                                        ,	bool
                                         >
     {
         //.................................................................
@@ -277,7 +277,7 @@ namespace svt
                 return false;
 
             if ( _rLHS->getSubContents().size() )
-            {   // there are children
+            {	// there are children
                 // -> compare them
                 ::std::pair< FolderIterator, FolderIterator > aFirstDifferent = ::std::mismatch(
                     _rLHS->getSubContents().begin(),
@@ -298,7 +298,7 @@ namespace svt
     struct StorageHelper
     {
     protected:
-        SvStream&   m_rStorage;
+        SvStream&	m_rStorage;
         StorageHelper( SvStream& _rStorage ) : m_rStorage( _rStorage ) { }
     };
 
@@ -468,46 +468,46 @@ namespace svt
     class TemplateFolderCacheImpl
     {
     private:
-        TemplateFolderContent           m_aPreviousState;   // the current state of the template dirs (as found on the HD)
-        TemplateFolderContent           m_aCurrentState;    // the previous state of the template dirs (as found in the cache file)
+        TemplateFolderContent			m_aPreviousState;	// the current state of the template dirs (as found on the HD)
+        TemplateFolderContent			m_aCurrentState;	// the previous state of the template dirs (as found in the cache file)
 
         osl::Mutex                      m_aMutex;
         // will be lazy inited; never access directly; use getOfficeInstDirs().
         uno::Reference< util::XOfficeInstallationDirectories > m_xOfficeInstDirs;
 
-        SvStream*                       m_pCacheStream;
-        sal_Bool                        m_bNeedsUpdate : 1;
-        sal_Bool                        m_bKnowState : 1;
-        sal_Bool                        m_bValidCurrentState : 1;
-        sal_Bool                        m_bAutoStoreState : 1;
+        SvStream*						m_pCacheStream;
+        sal_Bool						m_bNeedsUpdate : 1;
+        sal_Bool						m_bKnowState : 1;
+        sal_Bool						m_bValidCurrentState : 1;
+        sal_Bool						m_bAutoStoreState : 1;
 
     public:
         TemplateFolderCacheImpl( sal_Bool _bAutoStoreState );
         ~TemplateFolderCacheImpl( );
 
-        sal_Bool    needsUpdate( sal_Bool _bForceCheck );
-        void        storeState( sal_Bool _bForceRetrieval );
+        sal_Bool	needsUpdate( sal_Bool _bForceCheck );
+        void		storeState( sal_Bool _bForceRetrieval );
 
     private:
-        void        initTemplDirs( ::std::vector< String >& _rRootDirs );
-        sal_Bool    openCacheStream( sal_Bool _bForRead );
-        void        closeCacheStream( );
+        void		initTemplDirs( ::std::vector< String >& _rRootDirs );
+        sal_Bool	openCacheStream( sal_Bool _bForRead );
+        void		closeCacheStream( );
 
         /// read the state of the dirs from the cache file
-        sal_Bool    readPreviousState();
+        sal_Bool	readPreviousState();
         /// read the current state of the dirs
-        sal_Bool    readCurrentState();
+        sal_Bool	readCurrentState();
 
-        String      implParseSmart( const String& _rPath );
+        String		implParseSmart( const String& _rPath );
 
-        sal_Bool    implReadFolder( const ::vos::ORef< TemplateContent >& _rxRoot );
+        sal_Bool	implReadFolder( const ::vos::ORef< TemplateContent >& _rxRoot );
 
-        static  String      getCacheFileName();
-        static  sal_Int32   getMagicNumber();
-        static  void        normalize( TemplateFolderContent& _rState );
+        static	String		getCacheFileName();
+        static	sal_Int32	getMagicNumber();
+        static	void		normalize( TemplateFolderContent& _rState );
 
         // @return <TRUE/> if the states equal
-        static  sal_Bool    equalStates( const TemplateFolderContent& _rLHS, const TemplateFolderContent& _rRHS );
+        static	sal_Bool	equalStates( const TemplateFolderContent& _rLHS, const TemplateFolderContent& _rRHS );
 
         // late initialize m_xOfficeInstDirs
         uno::Reference< util::XOfficeInstallationDirectories > getOfficeInstDirs();
@@ -515,11 +515,11 @@ namespace svt
 
     //---------------------------------------------------------------------
     TemplateFolderCacheImpl::TemplateFolderCacheImpl( sal_Bool _bAutoStoreState )
-        :m_pCacheStream         ( NULL )
-        ,m_bNeedsUpdate         ( sal_True )
-        ,m_bKnowState           ( sal_False )
-        ,m_bValidCurrentState   ( sal_False )
-        ,m_bAutoStoreState      ( _bAutoStoreState )
+        :m_pCacheStream			( NULL )
+        ,m_bNeedsUpdate			( sal_True )
+        ,m_bKnowState			( sal_False )
+        ,m_bValidCurrentState	( sal_False )
+        ,m_bAutoStoreState		( _bAutoStoreState )
     {
     }
 
@@ -584,7 +584,7 @@ namespace svt
 
         if ( m_bValidCurrentState && openCacheStream( sal_False ) )
         {
-            *m_pCacheStream << getMagicNumber();
+            *m_pCacheStream	<< getMagicNumber();
 
             // store the template root folders
             // the size
@@ -672,16 +672,16 @@ namespace svt
                     ::vos::ORef< TemplateContent > xChild = new TemplateContent( aSubContentURL );
 
                     // the modified date
-                    xChild->setModDate( xRow->getTimestamp( 2 ) );  // date modified
+                    xChild->setModDate( xRow->getTimestamp( 2 ) );	// date modified
                     if ( xRow->wasNull() )
-                        xChild->setModDate( xRow->getTimestamp( 3 ) );  // fallback: date created
+                        xChild->setModDate( xRow->getTimestamp( 3 ) );	// fallback: date created
 
                     // push back this content
                     _rxRoot->push_back( xChild );
 
                     // is it a folder?
                     if ( xRow->getBoolean( 4 ) && !xRow->wasNull() )
-                    {   // yes -> step down
+                    {	// yes -> step down
                                                 ConstFolderIterator aNextLevelRoot = _rxRoot->end();
                         --aNextLevelRoot;
                         implReadFolder( *aNextLevelRoot );
@@ -706,8 +706,8 @@ namespace svt
         m_aCurrentState.swap( aTemplateFolderContent );
 
         // the template directories from the config
-        String      aDirs = SvtPathOptions().GetTemplatePath();
-        sal_uInt16  nDirs = aDirs.GetTokenCount( ';' );
+        String		aDirs = SvtPathOptions().GetTemplatePath();
+        sal_uInt16	nDirs = aDirs.GetTokenCount( ';' );
 
         m_aCurrentState.reserve( nDirs );
         // loop through all the root-level template folders
@@ -797,7 +797,7 @@ namespace svt
 
         // open the stream
         m_pCacheStream = UcbStreamHelper::CreateStream( aStorageURL.GetMainURL( INetURLObject::DECODE_TO_IURI ),
-            _bForRead ? STREAM_READ | STREAM_NOCREATE : STREAM_WRITE | STREAM_TRUNC );
+            _bForRead ?	STREAM_READ | STREAM_NOCREATE : STREAM_WRITE | STREAM_TRUNC );
         DBG_ASSERT( m_pCacheStream, "TemplateFolderCacheImpl::openCacheStream: could not open/create the cache stream!" );
         if ( m_pCacheStream && m_pCacheStream->GetErrorCode() )
         {
@@ -823,7 +823,7 @@ namespace svt
         {
             // open the stream which contains the cached state of the directories
             if ( openCacheStream( sal_True ) )
-            {   // opening the stream succeeded
+            {	// opening the stream succeeded
                 if ( readPreviousState() )
                 {
                     m_bNeedsUpdate = !equalStates( m_aPreviousState, m_aCurrentState );
@@ -914,6 +914,6 @@ namespace svt
     }
 
 //.........................................................................
-}   // namespace sfx2
+}	// namespace sfx2
 //.........................................................................
 
diff --git a/svtools/source/misc/transfer.cxx b/svtools/source/misc/transfer.cxx
index 268533ebb8c8..759cc4578523 100644
--- a/svtools/source/misc/transfer.cxx
+++ b/svtools/source/misc/transfer.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
@@ -401,14 +401,14 @@ Any SAL_CALL TransferableHelper::getTransferData( const DataFlavor& rFlavor ) th
 
                     if( maAny >>= aSeq )
                     {
-                        SvMemoryStream* pSrcStm = new SvMemoryStream( (char*) aSeq.getConstArray(), aSeq.getLength(), STREAM_WRITE | STREAM_TRUNC );
-                        GDIMetaFile     aMtf;
+                        SvMemoryStream*	pSrcStm = new SvMemoryStream( (char*) aSeq.getConstArray(), aSeq.getLength(), STREAM_WRITE | STREAM_TRUNC );
+                        GDIMetaFile		aMtf;
 
                         *pSrcStm >> aMtf;
                         delete pSrcStm;
 
-                        Graphic         aGraphic( aMtf );
-                        SvMemoryStream  aDstStm( 65535, 65535 );
+                        Graphic			aGraphic( aMtf );
+                        SvMemoryStream	aDstStm( 65535, 65535 );
 
                         if( GraphicConverter::Export( aDstStm, aGraphic, CVT_EMF ) == ERRCODE_NONE )
                         {
@@ -431,14 +431,14 @@ Any SAL_CALL TransferableHelper::getTransferData( const DataFlavor& rFlavor ) th
 
                     if( maAny >>= aSeq )
                     {
-                        SvMemoryStream* pSrcStm = new SvMemoryStream( (char*) aSeq.getConstArray(), aSeq.getLength(), STREAM_WRITE | STREAM_TRUNC );
-                        GDIMetaFile     aMtf;
+                        SvMemoryStream*	pSrcStm = new SvMemoryStream( (char*) aSeq.getConstArray(), aSeq.getLength(), STREAM_WRITE | STREAM_TRUNC );
+                        GDIMetaFile		aMtf;
 
                         *pSrcStm >> aMtf;
                         delete pSrcStm;
 
-                        SvMemoryStream  aDstStm( 65535, 65535 );
-
+                        SvMemoryStream	aDstStm( 65535, 65535 );
+                        
                         // taking wmf without file header
                         if ( ConvertGDIMetaFileToWMF( aMtf, aDstStm, NULL, FALSE ) )
                         {
@@ -489,9 +489,9 @@ Sequence< DataFlavor > SAL_CALL TransferableHelper::getTransferDataFlavors() thr
     {
     }
 
-    Sequence< DataFlavor >          aRet( mpFormats->size() );
-    DataFlavorExVector::iterator    aIter( mpFormats->begin() ), aEnd( mpFormats->end() );
-    sal_uInt32                      nCurPos = 0;
+    Sequence< DataFlavor >			aRet( mpFormats->size() );
+    DataFlavorExVector::iterator	aIter( mpFormats->begin() ), aEnd( mpFormats->end() );
+    sal_uInt32						nCurPos = 0;
 
     while( aIter != aEnd )
     {
@@ -506,7 +506,7 @@ Sequence< DataFlavor > SAL_CALL TransferableHelper::getTransferDataFlavors() thr
 sal_Bool SAL_CALL TransferableHelper::isDataFlavorSupported( const DataFlavor& rFlavor ) throw( RuntimeException )
 {
     const ::vos::OGuard aGuard( Application::GetSolarMutex() );
-    sal_Bool            bRet = sal_False;
+    sal_Bool			bRet = sal_False;
 
     try
     {
@@ -632,8 +632,8 @@ void TransferableHelper::ImplFlush()
 {
     if( mxClipboard.is() )
     {
-        Reference< XFlushableClipboard >    xFlushableClipboard( mxClipboard, UNO_QUERY );
-        const sal_uInt32                    nRef = Application::ReleaseSolarMutex();
+        Reference< XFlushableClipboard >	xFlushableClipboard( mxClipboard, UNO_QUERY );
+        const sal_uInt32					nRef = Application::ReleaseSolarMutex();
 
         try
         {
@@ -751,8 +751,8 @@ void TransferableHelper::RemoveFormat( const DataFlavor& rFlavor )
 
 sal_Bool TransferableHelper::HasFormat( SotFormatStringId nFormat )
 {
-    DataFlavorExVector::iterator    aIter( mpFormats->begin() ), aEnd( mpFormats->end() );
-    sal_Bool                        bRet = sal_False;
+    DataFlavorExVector::iterator	aIter( mpFormats->begin() ), aEnd( mpFormats->end() );
+    sal_Bool						bRet = sal_False;
 
     while( aIter != aEnd )
     {
@@ -794,9 +794,9 @@ sal_Bool TransferableHelper::SetString( const ::rtl::OUString& rString, const Da
         SotExchange::GetFormatDataFlavor( FORMAT_FILE, aFileFlavor ) &&
         TransferableDataHelper::IsEqual( aFileFlavor, rFlavor ) )
     {
-        const String            aString( rString );
-        const ByteString        aByteStr( aString, gsl_getSystemTextEncoding() );
-        Sequence< sal_Int8 >    aSeq( aByteStr.Len() + 1 );
+        const String			aString( rString );
+        const ByteString		aByteStr( aString, gsl_getSystemTextEncoding() );
+        Sequence< sal_Int8 >	aSeq( aByteStr.Len() + 1 );
 
         rtl_copyMemory( aSeq.getArray(), aByteStr.GetBuffer(), aByteStr.Len() );
         aSeq[ aByteStr.Len() ] = 0;
@@ -935,9 +935,9 @@ sal_Bool TransferableHelper::SetINetBookmark( const INetBookmark& rBmk,
 #ifdef WNT
         case SOT_FORMATSTR_ID_FILEGRPDESCRIPTOR:
         {
-            Sequence< sal_Int8 >    aSeq( sizeof( FILEGROUPDESCRIPTOR ) );
-            FILEGROUPDESCRIPTOR*    pFDesc = (FILEGROUPDESCRIPTOR*) aSeq.getArray();
-            FILEDESCRIPTOR&         rFDesc1 = pFDesc->fgd[ 0 ];
+            Sequence< sal_Int8 >	aSeq( sizeof( FILEGROUPDESCRIPTOR ) );
+            FILEGROUPDESCRIPTOR*	pFDesc = (FILEGROUPDESCRIPTOR*) aSeq.getArray();
+            FILEDESCRIPTOR&			rFDesc1 = pFDesc->fgd[ 0 ];
 
             pFDesc->cItems = 1;
             memset( &rFDesc1, 0, sizeof( FILEDESCRIPTOR ) );
@@ -1012,8 +1012,8 @@ sal_Bool TransferableHelper::SetObject( void* pUserObject, sal_uInt32 nUserObjec
 
     if( pUserObject && WriteObject( xStm, pUserObject, nUserObjectId, rFlavor ) )
     {
-        const sal_uInt32        nLen = xStm->Seek( STREAM_SEEK_TO_END );
-        Sequence< sal_Int8 >    aSeq( nLen );
+        const sal_uInt32		nLen = xStm->Seek( STREAM_SEEK_TO_END );
+        Sequence< sal_Int8 >	aSeq( nLen );
 
         xStm->Seek( STREAM_SEEK_TO_BEGIN );
         xStm->Read( aSeq.getArray(),  nLen );
@@ -1021,9 +1021,9 @@ sal_Bool TransferableHelper::SetObject( void* pUserObject, sal_uInt32 nUserObjec
         if( nLen && ( SotExchange::GetFormat( rFlavor ) == SOT_FORMAT_STRING ) )
         {
             //JP 24.7.2001: as I know was this only for the writer application and this
-            //              writes now UTF16 format into the stream
+            //		        writes now UTF16 format into the stream
             //JP 6.8.2001:  and now it writes UTF8 because then exist no problem with
-            //              little / big endians! - Bug 88121
+            //		        little / big endians! - Bug 88121
             maAny <<= ::rtl::OUString( reinterpret_cast< const sal_Char* >( aSeq.getConstArray() ), nLen - 1, RTL_TEXTENCODING_UTF8 );
         }
         else
@@ -1168,19 +1168,19 @@ void TransferableHelper::StartDrag( Window* pWindow, sal_Int8 nDnDSourceActions,
         if( pWindow->IsMouseCaptured() )
             pWindow->ReleaseMouse();
 
-        const Point aPt( pWindow->GetPointerPosPixel() );
+        const Point	aPt( pWindow->GetPointerPosPixel() );
 
         // On Mac OS X we are forced to execute 'startDrag' synchronously
         // contrary to the XDragSource interface specification because
-        // we can receive drag events from the system only in the main
+        // we can receive drag events from the system only in the main 
         // thread
 #if !defined(QUARTZ)
         const sal_uInt32 nRef = Application::ReleaseSolarMutex();
-#endif
+#endif 
 
         try
         {
-            DragGestureEvent    aEvt;
+            DragGestureEvent	aEvt;
             aEvt.DragAction = DNDConstants::ACTION_COPY;
             aEvt.DragOriginX = aPt.X();
             aEvt.DragOriginY = aPt.Y();
@@ -1195,7 +1195,7 @@ void TransferableHelper::StartDrag( Window* pWindow, sal_Int8 nDnDSourceActions,
         // See above for the reason of this define
 #if !defined(QUARTZ)
         Application::AcquireSolarMutex( nRef );
-#endif
+#endif 
     }
 }
 
@@ -1219,7 +1219,7 @@ Reference< XClipboard> TransferableHelper::GetSystemClipboard()
     if( pFocusWindow )
         return pFocusWindow->GetClipboard();
 
-    return  Reference< XClipboard > ();
+    return 	Reference< XClipboard > ();
 }
 
 // -----------------------------------------------------------------------------
@@ -1250,7 +1250,7 @@ class TransferableClipboardNotifier : public ::cppu::WeakImplHelper1< XClipboard
 private:
     ::osl::Mutex&                   mrMutex;
     Reference< XClipboardNotifier > mxNotifier;
-    TransferableDataHelper*         mpListener;
+    TransferableDataHelper*		    mpListener;
 
 protected:
     // XClipboardListener
@@ -1422,7 +1422,7 @@ void TransferableDataHelper::FillDataFlavorExVector( const Sequence< DataFlavor
     {
         Reference< XMultiServiceFactory >       xFact( ::comphelper::getProcessServiceFactory() );
         Reference< XMimeContentTypeFactory >    xMimeFact;
-        DataFlavorEx                            aFlavorEx;
+        DataFlavorEx		                    aFlavorEx;
         const ::rtl::OUString                   aCharsetStr( ::rtl::OUString::createFromAscii( "charset" ) );
 
         if( xFact.is() )
@@ -1432,7 +1432,7 @@ void TransferableDataHelper::FillDataFlavorExVector( const Sequence< DataFlavor
 
         for( sal_Int32 i = 0; i < rDataFlavorSeq.getLength(); i++ )
         {
-            const DataFlavor&               rFlavor = rDataFlavorSeq[ i ];
+            const DataFlavor&	            rFlavor = rDataFlavorSeq[ i ];
             Reference< XMimeContentType >   xMimeType;
 
             try
@@ -1549,8 +1549,8 @@ sal_Bool TransferableDataHelper::HasFormat( SotFormatStringId nFormat ) const
 {
     ::osl::MutexGuard aGuard( mpImpl->maMutex );
 
-    DataFlavorExVector::iterator    aIter( mpFormats->begin() ), aEnd( mpFormats->end() );
-    sal_Bool                        bRet = sal_False;
+    DataFlavorExVector::iterator	aIter( mpFormats->begin() ), aEnd( mpFormats->end() );
+    sal_Bool						bRet = sal_False;
 
     while( aIter != aEnd )
     {
@@ -1570,8 +1570,8 @@ sal_Bool TransferableDataHelper::HasFormat( const DataFlavor& rFlavor ) const
 {
     ::osl::MutexGuard aGuard( mpImpl->maMutex );
 
-    DataFlavorExVector::iterator    aIter( mpFormats->begin() ), aEnd( mpFormats->end() );
-    sal_Bool                        bRet = sal_False;
+    DataFlavorExVector::iterator	aIter( mpFormats->begin() ), aEnd( mpFormats->end() );
+    sal_Bool						bRet = sal_False;
 
     while( aIter != aEnd )
     {
@@ -1645,7 +1645,7 @@ Reference< XTransferable > TransferableDataHelper::GetXTransferable() const
 
 // -----------------------------------------------------------------------------
 
-Any TransferableDataHelper::GetAny( SotFormatStringId nFormat ) const
+Any	TransferableDataHelper::GetAny( SotFormatStringId nFormat ) const
 {
     Any aReturn;
 
@@ -1778,8 +1778,8 @@ sal_Bool TransferableDataHelper::GetBitmap( SotFormatStringId nFormat, Bitmap& r
 sal_Bool TransferableDataHelper::GetBitmap( const DataFlavor& rFlavor, Bitmap& rBmp )
 {
     SotStorageStreamRef xStm;
-    DataFlavor          aSubstFlavor;
-    sal_Bool            bRet = GetSotStorageStream( rFlavor, xStm );
+    DataFlavor			aSubstFlavor;
+    sal_Bool			bRet = GetSotStorageStream( rFlavor, xStm );
 
     if( bRet )
     {
@@ -1833,8 +1833,8 @@ sal_Bool TransferableDataHelper::GetGDIMetaFile( SotFormatStringId nFormat, GDIM
 sal_Bool TransferableDataHelper::GetGDIMetaFile( const DataFlavor& rFlavor, GDIMetaFile& rMtf )
 {
     SotStorageStreamRef xStm;
-    DataFlavor          aSubstFlavor;
-    sal_Bool            bRet = sal_False;
+    DataFlavor			aSubstFlavor;
+    sal_Bool			bRet = sal_False;
 
     if( GetSotStorageStream( rFlavor, xStm ) )
     {
@@ -1885,10 +1885,10 @@ sal_Bool TransferableDataHelper::GetGraphic( SotFormatStringId nFormat, Graphic&
 
 sal_Bool TransferableDataHelper::GetGraphic( const ::com::sun::star::datatransfer::DataFlavor& rFlavor, Graphic& rGraphic )
 {
-    DataFlavor  aFlavor;
-    sal_Bool    bRet = sal_False;
+    DataFlavor	aFlavor;
+    sal_Bool	bRet = sal_False;
 
-    if( SotExchange::GetFormatDataFlavor( SOT_FORMAT_BITMAP, aFlavor ) &&
+    if(	SotExchange::GetFormatDataFlavor( SOT_FORMAT_BITMAP, aFlavor ) &&
         TransferableDataHelper::IsEqual( aFlavor, rFlavor ) )
     {
         Bitmap aBmp;
@@ -1931,7 +1931,7 @@ sal_Bool TransferableDataHelper::GetImageMap( SotFormatStringId nFormat, ImageMa
 sal_Bool TransferableDataHelper::GetImageMap( const ::com::sun::star::datatransfer::DataFlavor& rFlavor, ImageMap& rIMap )
 {
     SotStorageStreamRef xStm;
-    sal_Bool            bRet = GetSotStorageStream( rFlavor, xStm );
+    sal_Bool			bRet = GetSotStorageStream( rFlavor, xStm );
 
     if( bRet )
     {
@@ -1989,8 +1989,8 @@ sal_Bool TransferableDataHelper::GetINetBookmark( const ::com::sun::star::datatr
                 }
                 else
                 {
-                    String      aURL, aDesc;
-                    sal_uInt16  nStart = aString.Search( '@' ), nLen = (sal_uInt16) aString.ToInt32();
+                    String		aURL, aDesc;
+                    sal_uInt16	nStart = aString.Search( '@' ), nLen = (sal_uInt16) aString.ToInt32();
 
                     if( !nLen && aString.GetChar( 0 ) != '0' )
                     {
@@ -2047,8 +2047,8 @@ sal_Bool TransferableDataHelper::GetINetBookmark( const ::com::sun::star::datatr
 
                 if( pFDesc->cItems )
                 {
-                    ByteString          aDesc( pFDesc->fgd[ 0 ].cFileName );
-                    rtl_TextEncoding    eTextEncoding = gsl_getSystemTextEncoding();
+                    ByteString			aDesc( pFDesc->fgd[ 0 ].cFileName );
+                    rtl_TextEncoding	eTextEncoding = gsl_getSystemTextEncoding();
 
                     if( ( aDesc.Len() > 4 ) && aDesc.Copy( aDesc.Len() - 4 ).EqualsIgnoreCaseAscii( ".URL" ) )
                     {
@@ -2073,8 +2073,8 @@ sal_Bool TransferableDataHelper::GetINetBookmark( const ::com::sun::star::datatr
 
                         if( pStream )
                         {
-                            ByteString  aLine;
-                            sal_Bool    bSttFnd = sal_False;
+                            ByteString	aLine;
+                            sal_Bool	bSttFnd = sal_False;
 
                             while( pStream->ReadLine( aLine ) )
                             {
@@ -2203,8 +2203,8 @@ sal_Bool TransferableDataHelper::GetSotStorageStream( SotFormatStringId nFormat,
 
 sal_Bool TransferableDataHelper::GetSotStorageStream( const DataFlavor& rFlavor, SotStorageStreamRef& rxStream )
 {
-    Sequence< sal_Int8 >    aSeq;
-    sal_Bool                bRet = GetSequence( rFlavor, aSeq );
+    Sequence< sal_Int8 >	aSeq;
+    sal_Bool				bRet = GetSequence( rFlavor, aSeq );
 
     if( bRet )
     {
@@ -2226,8 +2226,8 @@ sal_Bool TransferableDataHelper::GetInputStream( SotFormatStringId nFormat, Refe
 
 sal_Bool TransferableDataHelper::GetInputStream( const DataFlavor& rFlavor, Reference < XInputStream >& rxStream )
 {
-    Sequence< sal_Int8 >    aSeq;
-    sal_Bool                bRet = GetSequence( rFlavor, aSeq );
+    Sequence< sal_Int8 >	aSeq;
+    sal_Bool				bRet = GetSequence( rFlavor, aSeq );
 
     if( bRet )
           rxStream = new ::comphelper::SequenceInputStream( aSeq );
@@ -2293,8 +2293,8 @@ TransferableDataHelper TransferableDataHelper::CreateFromSystemClipboard( Window
 {
     DBG_ASSERT( pWindow, "Window pointer is NULL" );
 
-    Reference< XClipboard > xClipboard;
-       TransferableDataHelper   aRet;
+    Reference< XClipboard >	xClipboard;
+       TransferableDataHelper	aRet;
 
     if( pWindow )
         xClipboard = pWindow->GetClipboard();
@@ -2328,8 +2328,8 @@ TransferableDataHelper TransferableDataHelper::CreateFromSelection( Window* pWin
 {
     DBG_ASSERT( pWindow, "Window pointer is NULL" );
 
-    Reference< XClipboard > xSelection;
-       TransferableDataHelper   aRet;
+    Reference< XClipboard >	xSelection;
+       TransferableDataHelper	aRet;
 
     if( pWindow )
         xSelection = pWindow->GetPrimarySelection();
@@ -2365,7 +2365,7 @@ sal_Bool TransferableDataHelper::IsEqual( const ::com::sun::star::datatransfer::
 {
     Reference< XMultiServiceFactory >       xFact( ::comphelper::getProcessServiceFactory() );
     Reference< XMimeContentTypeFactory >    xMimeFact;
-    sal_Bool                                bRet = sal_False;
+    sal_Bool								bRet = sal_False;
 
     try
     {
diff --git a/svtools/source/misc/transfer2.cxx b/svtools/source/misc/transfer2.cxx
index dcd0f81b2758..c0edc24e0461 100644
--- a/svtools/source/misc/transfer2.cxx
+++ b/svtools/source/misc/transfer2.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
@@ -344,8 +344,8 @@ sal_Int8 DropTargetHelper::ExecuteDrop( const ExecuteDropEvent& )
 
 sal_Bool DropTargetHelper::IsDropFormatSupported( SotFormatStringId nFormat )
 {
-    DataFlavorExVector::iterator    aIter( mpFormats->begin() ), aEnd( mpFormats->end() );
-    sal_Bool                        bRet = sal_False;
+    DataFlavorExVector::iterator	aIter( mpFormats->begin() ), aEnd( mpFormats->end() );
+    sal_Bool						bRet = sal_False;
 
     while( aIter != aEnd )
     {
@@ -363,8 +363,8 @@ sal_Bool DropTargetHelper::IsDropFormatSupported( SotFormatStringId nFormat )
 
 sal_Bool DropTargetHelper::IsDropFormatSupported( const DataFlavor& rFlavor )
 {
-    DataFlavorExVector::iterator    aIter( mpFormats->begin() ), aEnd( mpFormats->end() );
-    sal_Bool                        bRet = sal_False;
+    DataFlavorExVector::iterator	aIter( mpFormats->begin() ), aEnd( mpFormats->end() );
+    sal_Bool						bRet = sal_False;
 
     while( aIter != aEnd )
     {
@@ -438,7 +438,7 @@ void TransferDataContainer::AddSupportedFormats()
 sal_Bool TransferDataContainer::GetData( const
             ::com::sun::star::datatransfer::DataFlavor& rFlavor )
 {
-    TDataCntnrEntryList::iterator   aIter( pImpl->aFmtList.begin() ),
+    TDataCntnrEntryList::iterator	aIter( pImpl->aFmtList.begin() ),
                                     aEnd( pImpl->aFmtList.end() );
     sal_Bool bFnd = sal_False;
     ULONG nFmtId = SotExchange::GetFormat( rFlavor );
diff --git a/svtools/source/misc/unitconv.cxx b/svtools/source/misc/unitconv.cxx
index 612bcb4f0221..6f8516ab21ca 100644
--- a/svtools/source/misc/unitconv.cxx
+++ b/svtools/source/misc/unitconv.cxx
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2008 by Sun Microsystems, Inc.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -39,7 +39,7 @@
 
 void SetFieldUnit( MetricField& rField, FieldUnit eUnit, BOOL bAll )
 {
-    sal_Int64 nFirst    = rField.Denormalize( rField.GetFirst( FUNIT_TWIP ) );
+    sal_Int64 nFirst	= rField.Denormalize( rField.GetFirst( FUNIT_TWIP ) );
     sal_Int64 nLast = rField.Denormalize( rField.GetLast( FUNIT_TWIP ) );
     sal_Int64 nMin = rField.Denormalize( rField.GetMin( FUNIT_TWIP ) );
     sal_Int64 nMax = rField.Denormalize( rField.GetMax( FUNIT_TWIP ) );
@@ -63,6 +63,9 @@ void SetFieldUnit( MetricField& rField, FieldUnit eUnit, BOOL bAll )
     rField.SetUnit( eUnit );
     switch( eUnit )
     {
+        // _CHAR and _LINE sets the step of "char" and "line" unit, they are same as FUNIT_MM
+        case FUNIT_CHAR:
+        case FUNIT_LINE:
         case FUNIT_MM:
             rField.SetSpinSize( 50 );
             break;
@@ -170,10 +173,10 @@ long CalcToUnit( float nIn, SfxMapUnit eUnit )
 {
     // nIn ist in Points
 
-    DBG_ASSERT( eUnit == SFX_MAPUNIT_TWIP       ||
-                eUnit == SFX_MAPUNIT_100TH_MM   ||
-                eUnit == SFX_MAPUNIT_10TH_MM    ||
-                eUnit == SFX_MAPUNIT_MM         ||
+    DBG_ASSERT( eUnit == SFX_MAPUNIT_TWIP 		||
+                eUnit == SFX_MAPUNIT_100TH_MM 	||
+                eUnit == SFX_MAPUNIT_10TH_MM 	||
+                eUnit == SFX_MAPUNIT_MM 		||
                 eUnit == SFX_MAPUNIT_CM, "this unit is not implemented" );
 
     float nTmp = nIn;
@@ -183,17 +186,17 @@ long CalcToUnit( float nIn, SfxMapUnit eUnit )
 
     switch ( eUnit )
     {
-        case SFX_MAPUNIT_100TH_MM:  nTmp *= 100; break;
-        case SFX_MAPUNIT_10TH_MM:   nTmp *= 10;  break;
-        case SFX_MAPUNIT_MM:                     break;
-        case SFX_MAPUNIT_CM:        nTmp /= 10;  break;
+        case SFX_MAPUNIT_100TH_MM:	nTmp *= 100; break;
+        case SFX_MAPUNIT_10TH_MM:	nTmp *= 10;	 break;
+        case SFX_MAPUNIT_MM:					 break;
+        case SFX_MAPUNIT_CM:		nTmp /= 10;	 break;
         default: ;//prevent warning
     }
 
     nTmp *= 20;
     long nRet = (long)nTmp;
     return nRet;
-//! return (long)(nTmp * 20);
+//!	return (long)(nTmp * 20);
 }
 
 // -----------------------------------------------------------------------
@@ -352,10 +355,10 @@ long ConvertValueToUnit( long nVal, SfxMapUnit eUnit )
 
 long CalcToPoint( long nIn, SfxMapUnit eUnit, USHORT nFaktor )
 {
-    DBG_ASSERT( eUnit == SFX_MAPUNIT_TWIP       ||
-                eUnit == SFX_MAPUNIT_100TH_MM   ||
-                eUnit == SFX_MAPUNIT_10TH_MM    ||
-                eUnit == SFX_MAPUNIT_MM         ||
+    DBG_ASSERT( eUnit == SFX_MAPUNIT_TWIP 		||
+                eUnit == SFX_MAPUNIT_100TH_MM 	||
+                eUnit == SFX_MAPUNIT_10TH_MM 	||
+                eUnit == SFX_MAPUNIT_MM 		||
                 eUnit == SFX_MAPUNIT_CM, "this unit is not implemented" );
 
     long nRet = 0;
@@ -367,10 +370,10 @@ long CalcToPoint( long nIn, SfxMapUnit eUnit, USHORT nFaktor )
 
     switch ( eUnit )
     {
-        case SFX_MAPUNIT_100TH_MM:  nRet /= 100; break;
-        case SFX_MAPUNIT_10TH_MM:   nRet /= 10;  break;
-        case SFX_MAPUNIT_MM:                     break;
-        case SFX_MAPUNIT_CM:        nRet *= 10;  break;
+        case SFX_MAPUNIT_100TH_MM:	nRet /= 100; break;
+        case SFX_MAPUNIT_10TH_MM:	nRet /= 10;	 break;
+        case SFX_MAPUNIT_MM:					 break;
+        case SFX_MAPUNIT_CM:		nRet *= 10;	 break;
         default: ;//prevent warning
     }
 
@@ -703,20 +706,20 @@ long Nothing( long nIn )
 
 FUNC_CONVERT ConvertTable[6][6] =
 {
-//  CM,         MM          INCH         POINT        PICAS=32     TWIPS
-    { Nothing,  CMToMM,     CMToInch,    CMToPoint,   CMToPica,    CMToTwips },
-    { MMToCM,       Nothing,    MMToInch,    MMToPoint,   MMToPica,    MMToTwips },
-    { InchToCM, InchToMM,   Nothing,     InchToPoint, InchToPica,  InchToTwips },
-    { PointToCM,    PointToMM,  PointToInch, Nothing,     PointToPica, PointToTwips },
-    { PicaToCM, PicaToMM,   PicaToInch,  PicaToPoint, Nothing,     PicaToTwips },
-    { TwipsToCM,    TwipsToMM,  TwipsToInch, TwipsToPoint,TwipsToPica, Nothing }
+//  CM,			MM			INCH		 POINT		  PICAS=32	   TWIPS
+    { Nothing, 	CMToMM, 	CMToInch,    CMToPoint,   CMToPica,    CMToTwips },
+    { MMToCM,		Nothing,	MMToInch,	 MMToPoint,   MMToPica,    MMToTwips },
+    { InchToCM,	InchToMM,	Nothing,	 InchToPoint, InchToPica,  InchToTwips },
+    { PointToCM,	PointToMM,  PointToInch, Nothing,	  PointToPica, PointToTwips },
+    { PicaToCM,	PicaToMM,   PicaToInch,  PicaToPoint, Nothing,	   PicaToTwips },
+    { TwipsToCM,	TwipsToMM,  TwipsToInch, TwipsToPoint,TwipsToPica, Nothing }
 };
 
 // -----------------------------------------------------------------------
 
 long TransformMetric( long nVal, FieldUnit aOld, FieldUnit aNew )
 {
-    if ( aOld == FUNIT_NONE   || aNew == FUNIT_NONE ||
+    if ( aOld == FUNIT_NONE	  || aNew == FUNIT_NONE ||
          aOld == FUNIT_CUSTOM || aNew == FUNIT_CUSTOM )
     {
         return nVal;
diff --git a/svtools/source/misc/wallitem.cxx b/svtools/source/misc/wallitem.cxx
index 505af52c9908..07b4f3fd3fed 100644
--- a/svtools/source/misc/wallitem.cxx
+++ b/svtools/source/misc/wallitem.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
diff --git a/svtools/source/misc/xwindowitem.cxx b/svtools/source/misc/xwindowitem.cxx
index a382d8293617..8caf8330a1e6 100755
--- a/svtools/source/misc/xwindowitem.cxx
+++ b/svtools/source/misc/xwindowitem.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
@@ -39,8 +39,8 @@ using namespace ::com::sun::star;
 
 TYPEINIT1_FACTORY( XWindowItem, SfxPoolItem, new XWindowItem );
 
-
-XWindowItem::XWindowItem() :
+    
+XWindowItem::XWindowItem() : 
     SfxPoolItem()
 {
 }
@@ -57,16 +57,16 @@ XWindowItem::XWindowItem( USHORT nWhichId, Window * pWin ) :
     }
 }
 
-
+    
 XWindowItem::XWindowItem( USHORT nWhichId, uno::Reference< awt::XWindow > & rxWin ) :
-    SfxPoolItem( nWhichId ),
+    SfxPoolItem( nWhichId ), 
     m_xWin( rxWin )
 {
-}
+}    
 
 
 XWindowItem::XWindowItem( const XWindowItem &rItem ) :
-    SfxPoolItem( Which() ),
+    SfxPoolItem( Which() ), 
     m_xWin( rItem.m_xWin )
 {
 }
@@ -76,12 +76,12 @@ XWindowItem::~XWindowItem()
 {
 }
 
-
+    
 SfxPoolItem * XWindowItem::Clone( SfxItemPool* /*pPool*/ ) const
 {
     return new XWindowItem( *this );
 }
-
+    
 
 int XWindowItem::operator == ( const SfxPoolItem & rAttr ) const
 {
diff --git a/svtools/source/plugapp/commtest.cxx b/svtools/source/plugapp/commtest.cxx
index 3a235afcc61b..f5693c13b5a2 100644
--- a/svtools/source/plugapp/commtest.cxx
+++ b/svtools/source/plugapp/commtest.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
@@ -142,23 +142,23 @@ void CommunicationTester::Main()
     Execute();
 }
 
-#define SWITCH( pManager, ManagerClass )                    \
-{                                                           \
-    if ( pManager )                                         \
-    {                                                       \
-        pManager->StopCommunication();                      \
-        new DelayedDeleter( 1000, pManager );               \
-        pTB->SetItemState( pTB->GetCurItemId(), STATE_NOCHECK );    \
-        pManager = NULL;                                    \
-    }                                                       \
-    else                                                    \
-    {                                                       \
-        pManager = new ManagerClass;                        \
+#define SWITCH( pManager, ManagerClass )					\
+{															\
+    if ( pManager )											\
+    {														\
+        pManager->StopCommunication();						\
+        new DelayedDeleter( 1000, pManager );				\
+        pTB->SetItemState( pTB->GetCurItemId(), STATE_NOCHECK );	\
+        pManager = NULL;									\
+    }														\
+    else													\
+    {														\
+        pManager = new ManagerClass;						\
         pManager->SetConnectionOpenedHdl( LINK( this, CommunicationTester, ConnectionOpened ) );\
         pManager->SetConnectionClosedHdl( LINK( this, CommunicationTester, ConnectionClosed ) );\
         pManager->SetDataReceivedHdl( LINK( this, CommunicationTester, DataReceived ) );\
-        pTB->SetItemState( pTB->GetCurItemId(), STATE_CHECK );  \
-    }                                                       \
+        pTB->SetItemState( pTB->GetCurItemId(), STATE_CHECK );	\
+    }														\
 }
 
 
@@ -170,14 +170,14 @@ IMPL_LINK( CommunicationTester, TBClick, ToolBox*, pTB )
             {
                 SWITCH( pServerTcp, CommunicationManagerServerViaSocket( TCP_PORT, (USHORT) 32000 ) );
                 if ( pServerTcp )
-                    pServerTcp->StartCommunication();   // Am Port horchen
+                    pServerTcp->StartCommunication();	// Am Port horchen
             }
             break;
         case CLIENT_TCP:
             {
                 SWITCH( pClientTcp, CommunicationManagerClientViaSocket( "localhost", TCP_PORT ) );
                 if ( pClientTcp )
-                    pClientTcp->StartCommunication();   // Eine Verbindung aufbauen
+                    pClientTcp->StartCommunication();	// Eine Verbindung aufbauen
             }
             break;
         case BCST_BROOKER:
diff --git a/svtools/source/plugapp/commtest.hrc b/svtools/source/plugapp/commtest.hrc
index f0f646b49bfc..973d1ac06089 100644
--- a/svtools/source/plugapp/commtest.hrc
+++ b/svtools/source/plugapp/commtest.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
@@ -27,8 +27,8 @@
 #define TBMenu 256
 
 
-#define SERVER_TCP      1
-#define CLIENT_TCP      2
-#define BCST_BROOKER    3
-#define BCST_LISTEN     4
-#define BCST_SEND       5
+#define SERVER_TCP		1
+#define CLIENT_TCP		2
+#define BCST_BROOKER	3
+#define BCST_LISTEN		4
+#define BCST_SEND		5
diff --git a/svtools/source/plugapp/commtest.src b/svtools/source/plugapp/commtest.src
index 7073699f4956..47c1fd0acab1 100644
--- a/svtools/source/plugapp/commtest.src
+++ b/svtools/source/plugapp/commtest.src
@@ -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
@@ -33,7 +33,7 @@ ToolBox TBMenu {
     Pos = MAP_APPFONT( 0, 0 );
     Size = MAP_APPFONT( 100, 20 );
     LineCount = 2;
-//  FloatingLines = 2;
+//	FloatingLines = 2;
     ItemList = {
     ToolBoxItem  {
             Identifier = SERVER_TCP;
diff --git a/svtools/source/plugapp/testtool.hrc b/svtools/source/plugapp/testtool.hrc
index d6a234b74236..e8d1c04ac699 100644
--- a/svtools/source/plugapp/testtool.hrc
+++ b/svtools/source/plugapp/testtool.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
@@ -24,32 +24,32 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#define TTSTART             12345
+#define TTSTART				12345
 
-#define DisplayHidToolBox   ( TTSTART + 0 )
-#define TT_SHOW             1
-#define TT_SHOW2            ( TTSTART + 1 )
-#define TT_OUTPUT           3
-#define TT_SEND_DATA        4
-#define TT_ALLWIN           5
-#define TT_KURZNAME         6
-#define TT_LANGNAME         7
+#define DisplayHidToolBox	( TTSTART + 0 )
+#define TT_SHOW				1
+#define TT_SHOW2			( TTSTART + 1 )
+#define TT_OUTPUT			3
+#define TT_SEND_DATA		4
+#define TT_ALLWIN			5
+#define TT_KURZNAME			6
+#define TT_LANGNAME			7
 #define TT_ALTERNATE_CAPTION ( TTSTART + 2 )
 
 #define TT_INLINE_TRANSLATION ( TTSTART + 3)
-#define TT_GB_TRANSLATION   1
-#define TT_E_NEW            2
-#define TT_FT_OLD           3
-#define TT_GB_COMMENT       4
-#define TT_E_COMMENT        5
+#define TT_GB_TRANSLATION	1
+#define TT_E_NEW			2
+#define TT_FT_OLD			3
+#define TT_GB_COMMENT		4
+#define TT_E_COMMENT		5
 
-#define TT_PB_SELECT        6
-#define TT_PB_RESTORE       7
-#define TT_PB_ACCEPT        8
-#define TT_PB_NEXT          9
+#define TT_PB_SELECT		6
+#define TT_PB_RESTORE		7
+#define TT_PB_ACCEPT		8
+#define TT_PB_NEXT			9
 
 #define TT_DISCARD_CHANGED_DATA ( TTSTART + 4 )
-#define TT_NO_CONTROL       ( TTSTART + 5 )
+#define TT_NO_CONTROL		( TTSTART + 5 )
 
 
-#define TT_GPF              ( TTSTART + 6 )
+#define TT_GPF				( TTSTART + 6 )
diff --git a/svtools/source/plugapp/testtool.src b/svtools/source/plugapp/testtool.src
index 9cc52c58f013..f7c905202ad2 100644
--- a/svtools/source/plugapp/testtool.src
+++ b/svtools/source/plugapp/testtool.src
@@ -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
@@ -28,10 +28,10 @@
 #include <svl/solar.hrc>
 
 
-#define Control_Control 5
-#define Control_Border  7
-#define Button_Button   Control_Control
-#define ButtonWidth     40
+#define Control_Control	5
+#define Control_Border	7
+#define Button_Button	Control_Control
+#define ButtonWidth		40
 
 
 ToolBox DisplayHidToolBox {
diff --git a/svtools/source/plugapp/ttprops.cxx b/svtools/source/plugapp/ttprops.cxx
index 2ae41a4c50c1..a1fa6b70effb 100644
--- a/svtools/source/plugapp/ttprops.cxx
+++ b/svtools/source/plugapp/ttprops.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
diff --git a/svtools/source/productregistration/productregistration.cxx b/svtools/source/productregistration/productregistration.cxx
index 39629f5c3f77..a7f472b1a5d2 100644
--- a/svtools/source/productregistration/productregistration.cxx
+++ b/svtools/source/productregistration/productregistration.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
@@ -77,7 +77,7 @@ namespace svt
 
     struct EqualsOUString : public ::std::unary_function< OUString, sal_Bool >
     {
-        const OUString& m_rCompare;
+        const OUString&	m_rCompare;
         EqualsOUString( const OUString& _rCompare ) : m_rCompare( _rCompare ) { }
 
         sal_Bool operator() ( const OUString& _rCompare )
@@ -299,7 +299,7 @@ namespace svt
 
         static sal_Bool bFirstEncounter( sal_True );
         if ( bFirstEncounter )
-        {   // during this session, this event was never triggered before ....
+        {	// during this session, this event was never triggered before ....
             bFirstEncounter = sal_False;
 
             sal_Bool bDeactivateJob = sal_True;
@@ -310,7 +310,7 @@ namespace svt
             utl::RegOptions::DialogPermission ePermission( aRegOptions.getDialogPermission() );
 
             if ( utl::RegOptions::dpDisabled != ePermission )
-            {   // the dialog is _not_ disabled
+            {	// the dialog is _not_ disabled
 
                 // for this session, I'm no interested in the dialog registration anymore
                 aRegOptions.markSessionDone( );
@@ -318,7 +318,7 @@ namespace svt
                 if  (   ( utl::RegOptions::dpNotThisSession == ePermission )     // first trigger session not reached
                     ||  ( utl::RegOptions::dpRemindLater == ePermission )        // or at a later reminder date
                     )
-                {   // the dialog should be executed during one of the next sessions
+                {	// the dialog should be executed during one of the next sessions
                     bDeactivateJob = sal_False;
                 }
                 else
@@ -450,7 +450,7 @@ namespace svt
     }
 
 //........................................................................
-}   // namespace svt
+}	// namespace svt
 //........................................................................
 
 extern "C"
diff --git a/svtools/source/productregistration/productregistration.hxx b/svtools/source/productregistration/productregistration.hxx
index efaa624887b0..cef075fbbfb7 100644
--- a/svtools/source/productregistration/productregistration.hxx
+++ b/svtools/source/productregistration/productregistration.hxx
@@ -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
@@ -42,10 +42,10 @@ namespace svt
     //====================================================================
     //= OProductRegistration
     //====================================================================
-    typedef ::cppu::WeakImplHelper3 <   ::com::sun::star::lang::XServiceInfo
-                                    ,   ::com::sun::star::task::XJobExecutor
-                                    ,   ::com::sun::star::task::XJob
-                                    >   OProductRegistration_Base;
+    typedef	::cppu::WeakImplHelper3	<	::com::sun::star::lang::XServiceInfo
+                                    ,	::com::sun::star::task::XJobExecutor
+                                    ,	::com::sun::star::task::XJob
+                                    >	OProductRegistration_Base;
 
     class OProductRegistration : public OProductRegistration_Base
     {
@@ -93,7 +93,7 @@ namespace svt
     };
 
 //........................................................................
-}   // namespace svt
+}	// namespace svt
 //........................................................................
 
 #endif // SVTOOLS_PRODUCTREGISTRATION_HXX
diff --git a/svtools/source/productregistration/registrationdlg.cxx b/svtools/source/productregistration/registrationdlg.cxx
index 460cedb060d1..bb5cd333c05c 100644
--- a/svtools/source/productregistration/registrationdlg.cxx
+++ b/svtools/source/productregistration/registrationdlg.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
@@ -66,16 +66,16 @@ namespace svt
     //--------------------------------------------------------------------
     RegistrationDialog::RegistrationDialog( Window* _pWindow, const ResId& _rResId, bool _bEvalVersion )
         :ModalDialog( _pWindow, _rResId )
-        ,m_eResponse        ( urRegisterLater )
-        ,m_aLogo            ( this, ResId( FI_LOGO, *_rResId.GetResMgr() ) )
-        ,m_aIntro           ( this, ResId( FT_INTRO, *_rResId.GetResMgr() ) )
-        ,m_aNow             ( this, ResId( RB_NOW, *_rResId.GetResMgr() ) )
-        ,m_aLater           ( this, ResId( RB_LATER, *_rResId.GetResMgr() ) )
-        ,m_aNever           ( this, ResId( RB_NEVER, *_rResId.GetResMgr() ) )
-        ,m_aAlreadyDone     ( this, ResId( RB_DONE, *_rResId.GetResMgr() ) )
-        ,m_aSeparator       ( this, ResId( FL_SEPARATOR, *_rResId.GetResMgr() ) )
-        ,m_aOK              ( this, ResId( BTN_OK, *_rResId.GetResMgr() ) )
-        ,m_aHelp            ( this, ResId( BTN_HELP, *_rResId.GetResMgr() ) )
+        ,m_eResponse		( urRegisterLater )
+        ,m_aLogo 			( this, ResId( FI_LOGO, *_rResId.GetResMgr() ) )
+        ,m_aIntro			( this, ResId( FT_INTRO, *_rResId.GetResMgr() ) )
+        ,m_aNow				( this, ResId( RB_NOW, *_rResId.GetResMgr() ) )
+        ,m_aLater			( this, ResId( RB_LATER, *_rResId.GetResMgr() ) )
+        ,m_aNever			( this, ResId( RB_NEVER, *_rResId.GetResMgr() ) )
+        ,m_aAlreadyDone		( this, ResId( RB_DONE, *_rResId.GetResMgr() ) )
+        ,m_aSeparator		( this, ResId( FL_SEPARATOR, *_rResId.GetResMgr() ) )
+        ,m_aOK				( this, ResId( BTN_OK, *_rResId.GetResMgr() ) )
+        ,m_aHelp			( this, ResId( BTN_HELP, *_rResId.GetResMgr() ) )
     {
         if ( _bEvalVersion )
         {   // if we're an eval version, we need to hide two of the options
@@ -152,7 +152,7 @@ namespace svt
     {
         long nHandled;
         if( rNEvt.GetType() == EVENT_KEYINPUT &&
-            rNEvt.GetKeyEvent()->GetCharCode() &&
+            rNEvt.GetKeyEvent()->GetCharCode() && 
             rNEvt.GetKeyEvent()->GetKeyCode().GetCode() == KEY_ESCAPE)
         {
             EndDialog(RET_CANCEL);
@@ -161,11 +161,11 @@ namespace svt
         else
             nHandled = ModalDialog::PreNotify( rNEvt );
         return nHandled;
-    }
+    }            
 
 
 //........................................................................
-}   // namespace svt
+}	// namespace svt
 //........................................................................
 
 
diff --git a/svtools/source/productregistration/registrationdlg.hrc b/svtools/source/productregistration/registrationdlg.hrc
index cfcde5f8c9b3..9685e8e8e432 100644
--- a/svtools/source/productregistration/registrationdlg.hrc
+++ b/svtools/source/productregistration/registrationdlg.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
@@ -28,16 +28,16 @@
 #ifndef SVTOOLS_REGISTRATIONDLG_HRC
 #define SVTOOLS_REGISTRATIONDLG_HRC
 
-#define FI_LOGO             1
-#define FT_INTRO            2
-#define RB_NOW              3
-#define RB_LATER            4
-#define RB_NEVER            5
-#define RB_DONE             6
-#define FL_SEPARATOR        7
-#define BTN_OK              8
-#define BTN_HELP            9
-#define STR_COMPLETE_INTRO  10
+#define FI_LOGO				1
+#define FT_INTRO			2
+#define RB_NOW				3
+#define RB_LATER			4
+#define RB_NEVER			5
+#define RB_DONE				6
+#define FL_SEPARATOR		7
+#define BTN_OK				8
+#define BTN_HELP			9
+#define STR_COMPLETE_INTRO	10
 
 #endif // SVTOOLS_REGISTRATIONDLG_HRC
 
diff --git a/svtools/source/productregistration/registrationdlg.hxx b/svtools/source/productregistration/registrationdlg.hxx
index 16761aff08fc..9f83e00f6f12 100644
--- a/svtools/source/productregistration/registrationdlg.hxx
+++ b/svtools/source/productregistration/registrationdlg.hxx
@@ -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
@@ -29,7 +29,7 @@
 #define SVTOOLS_REGISTRATIONDLG_HXX
 
 #include <vcl/fixed.hxx>
-#ifndef _SV_BUTTON_HXX
+#ifndef _SV_BUTTON_HXX 
 #include <vcl/button.hxx>
 #endif
 #include <vcl/dialog.hxx>
@@ -54,28 +54,28 @@ namespace svt
         };
 
     private:
-        UserResponse    m_eResponse;
+        UserResponse	m_eResponse;
 
-        FixedImage      m_aLogo;
-        FixedText       m_aIntro;
+        FixedImage		m_aLogo;
+        FixedText		m_aIntro;
 
-        RadioButton     m_aNow;
-        RadioButton     m_aLater;
-        RadioButton     m_aNever;
-        RadioButton     m_aAlreadyDone;
+        RadioButton 	m_aNow;
+        RadioButton 	m_aLater;
+        RadioButton 	m_aNever;
+        RadioButton 	m_aAlreadyDone;
 
-        FixedLine       m_aSeparator;
+        FixedLine		m_aSeparator;
 
-        OKButton        m_aOK;
-        HelpButton      m_aHelp;
+        OKButton		m_aOK;
+        HelpButton 		m_aHelp;
 
     public:
         RegistrationDialog( Window* _pWindow, const ResId& _rResId, bool _bEvalVersion );
 
-        virtual short   Execute();
+        virtual short	Execute();
         virtual long    PreNotify( NotifyEvent& rNEvt );
 
-        inline  UserResponse    getResponse() const { return m_eResponse; }
+        inline	UserResponse	getResponse() const	{ return m_eResponse; }
     };
 
 
diff --git a/svtools/source/productregistration/registrationdlg.src b/svtools/source/productregistration/registrationdlg.src
index c4cdcbcbe3ec..ea0226ae4b22 100644
--- a/svtools/source/productregistration/registrationdlg.src
+++ b/svtools/source/productregistration/registrationdlg.src
@@ -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
diff --git a/svtools/source/svhtml/htmlkywd.cxx b/svtools/source/svhtml/htmlkywd.cxx
index 96377a1b7efb..a5574394c6ec 100644
--- a/svtools/source/svhtml/htmlkywd.cxx
+++ b/svtools/source/svhtml/htmlkywd.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
@@ -52,156 +52,156 @@ struct HTML_TokenEntry
 static int __FAR_DATA bSortKeyWords = FALSE;
 
 static HTML_TokenEntry __FAR_DATA aHTMLTokenTab[] = {
-    {{OOO_STRING_SVTOOLS_HTML_area},            HTML_AREA}, // Netscape 2.0
-    {{OOO_STRING_SVTOOLS_HTML_base},            HTML_BASE}, // HTML 3.0
-    {{OOO_STRING_SVTOOLS_HTML_comment},     HTML_COMMENT},
-    {{OOO_STRING_SVTOOLS_HTML_doctype},      HTML_DOCTYPE},
-    {{OOO_STRING_SVTOOLS_HTML_embed},       HTML_EMBED},    // Netscape 2.0
-    {{OOO_STRING_SVTOOLS_HTML_figureoverlay}, HTML_FIGUREOVERLAY},  // HTML 3.0
-    {{OOO_STRING_SVTOOLS_HTML_horzrule},        HTML_HORZRULE},
-    {{OOO_STRING_SVTOOLS_HTML_horztab},     HTML_HORZTAB},  // HTML 3.0
-    {{OOO_STRING_SVTOOLS_HTML_image},          HTML_IMAGE},
-    {{OOO_STRING_SVTOOLS_HTML_image2},         HTML_IMAGE},
-    {{OOO_STRING_SVTOOLS_HTML_input},          HTML_INPUT},
-    {{OOO_STRING_SVTOOLS_HTML_isindex},     HTML_ISINDEX},  // HTML 3.0
-    {{OOO_STRING_SVTOOLS_HTML_li},            HTML_LI_ON},
-    {{OOO_STRING_SVTOOLS_HTML_linebreak},      HTML_LINEBREAK},
-    {{OOO_STRING_SVTOOLS_HTML_link},            HTML_LINK}, // HTML 3.0
-    {{OOO_STRING_SVTOOLS_HTML_meta},            HTML_META}, // HTML 3.0
-    {{OOO_STRING_SVTOOLS_HTML_nextid},      HTML_NEXTID},   // HTML 3.0
-    {{OOO_STRING_SVTOOLS_HTML_of},          HTML_OF},   // HTML 3.0
-    {{OOO_STRING_SVTOOLS_HTML_option},        HTML_OPTION},
-    {{OOO_STRING_SVTOOLS_HTML_param},       HTML_PARAM},    // HotJava
-    {{OOO_STRING_SVTOOLS_HTML_range},       HTML_RANGE},    // HTML 3.0
-    {{OOO_STRING_SVTOOLS_HTML_spacer},      HTML_SPACER},   // Netscape 3.0b5
-    {{OOO_STRING_SVTOOLS_HTML_wbr},         HTML_WBR},  // Netscape
-
-    {{OOO_STRING_SVTOOLS_HTML_abbreviation},    HTML_ABBREVIATION_ON},  // HTML 3.0
-    {{OOO_STRING_SVTOOLS_HTML_above},       HTML_ABOVE_ON}, // HTML 3.0
-    {{OOO_STRING_SVTOOLS_HTML_acronym},     HTML_ACRONYM_ON},   // HTML 3.0
-    {{OOO_STRING_SVTOOLS_HTML_address},      HTML_ADDRESS_ON},
-    {{OOO_STRING_SVTOOLS_HTML_anchor},        HTML_ANCHOR_ON},
-    {{OOO_STRING_SVTOOLS_HTML_applet},      HTML_APPLET_ON},    // HotJava
-    {{OOO_STRING_SVTOOLS_HTML_array},       HTML_ARRAY_ON}, // HTML 3.0
-    {{OOO_STRING_SVTOOLS_HTML_author},      HTML_AUTHOR_ON},    // HTML 3.0
-    {{OOO_STRING_SVTOOLS_HTML_banner},      HTML_BANNER_ON},    // HTML 3.0
-    {{OOO_STRING_SVTOOLS_HTML_bar},         HTML_BAR_ON},   // HTML 3.0
-    {{OOO_STRING_SVTOOLS_HTML_basefont},        HTML_BASEFONT_ON},  // Netscape
-    {{OOO_STRING_SVTOOLS_HTML_below},       HTML_BELOW_ON}, // HTML 3.0
-    {{OOO_STRING_SVTOOLS_HTML_bigprint},        HTML_BIGPRINT_ON},  // HTML 3.0
-    {{OOO_STRING_SVTOOLS_HTML_blink},       HTML_BLINK_ON}, // Netscape
-    {{OOO_STRING_SVTOOLS_HTML_blockquote},    HTML_BLOCKQUOTE_ON},
-    {{OOO_STRING_SVTOOLS_HTML_blockquote30},    HTML_BLOCKQUOTE30_ON},  // HTML 3.0
-    {{OOO_STRING_SVTOOLS_HTML_body},            HTML_BODY_ON},
-    {{OOO_STRING_SVTOOLS_HTML_bold},            HTML_BOLD_ON},
-    {{OOO_STRING_SVTOOLS_HTML_boldtext},        HTML_BOLDTEXT_ON},  // HTML 3.0
-    {{OOO_STRING_SVTOOLS_HTML_box},         HTML_BOX_ON},   // HTML 3.0
-    {{OOO_STRING_SVTOOLS_HTML_caption},     HTML_CAPTION_ON},   // HTML 3.0
-    {{OOO_STRING_SVTOOLS_HTML_center},      HTML_CENTER_ON},    // Netscape
-    {{OOO_STRING_SVTOOLS_HTML_citiation},      HTML_CITIATION_ON},
-    {{OOO_STRING_SVTOOLS_HTML_col},             HTML_COL_ON}, // HTML 3 Table Model Draft
-    {{OOO_STRING_SVTOOLS_HTML_colgroup},        HTML_COLGROUP_ON}, // HTML 3 Table Model Draft
-    {{OOO_STRING_SVTOOLS_HTML_code},            HTML_CODE_ON},
-    {{OOO_STRING_SVTOOLS_HTML_credit},      HTML_CREDIT_ON},    // HTML 3.0
-    {{OOO_STRING_SVTOOLS_HTML_dd},            HTML_DD_ON},
-    {{OOO_STRING_SVTOOLS_HTML_deflist},      HTML_DEFLIST_ON},
-    {{OOO_STRING_SVTOOLS_HTML_deletedtext}, HTML_DELETEDTEXT_ON},   // HTML 3.0
-    {{OOO_STRING_SVTOOLS_HTML_dirlist},      HTML_DIRLIST_ON},
-    {{OOO_STRING_SVTOOLS_HTML_division},        HTML_DIVISION_ON},  // HTML 3.0
-    {{OOO_STRING_SVTOOLS_HTML_dot},         HTML_DOT_ON},   // HTML 3.0
-    {{OOO_STRING_SVTOOLS_HTML_doubledot},   HTML_DOUBLEDOT_ON}, // HTML 3.0
-    {{OOO_STRING_SVTOOLS_HTML_dt},            HTML_DT_ON},
-    {{OOO_STRING_SVTOOLS_HTML_emphasis},        HTML_EMPHASIS_ON},
-    {{OOO_STRING_SVTOOLS_HTML_figure},      HTML_FIGURE_ON},    // HTML 3.0
-    {{OOO_STRING_SVTOOLS_HTML_font},            HTML_FONT_ON}, // Netscpe
-    {{OOO_STRING_SVTOOLS_HTML_footnote},        HTML_FOOTNOTE_ON},  // HTML 3.0
-    {{OOO_STRING_SVTOOLS_HTML_form},            HTML_FORM_ON},
-    {{OOO_STRING_SVTOOLS_HTML_frame},       HTML_FRAME_ON}, // Netscape 2.0
-    {{OOO_STRING_SVTOOLS_HTML_frameset},        HTML_FRAMESET_ON},  // Netscape 2.0
-    {{OOO_STRING_SVTOOLS_HTML_hat},         HTML_HAT_ON},   // HTML 3.0
-    {{OOO_STRING_SVTOOLS_HTML_head},            HTML_HEAD_ON},
-    {{OOO_STRING_SVTOOLS_HTML_head1},          HTML_HEAD1_ON},
-    {{OOO_STRING_SVTOOLS_HTML_head2},          HTML_HEAD2_ON},
-    {{OOO_STRING_SVTOOLS_HTML_head3},          HTML_HEAD3_ON},
-    {{OOO_STRING_SVTOOLS_HTML_head4},          HTML_HEAD4_ON},
-    {{OOO_STRING_SVTOOLS_HTML_head5},          HTML_HEAD5_ON},
-    {{OOO_STRING_SVTOOLS_HTML_head6},          HTML_HEAD6_ON},
-    {{OOO_STRING_SVTOOLS_HTML_html},            HTML_HTML_ON},
-    {{OOO_STRING_SVTOOLS_HTML_iframe},      HTML_IFRAME_ON},    // IE 3.0b2
-    {{OOO_STRING_SVTOOLS_HTML_ilayer},      HTML_ILAYER_ON},
-    {{OOO_STRING_SVTOOLS_HTML_insertedtext},    HTML_INSERTEDTEXT_ON},  // HTML 3.0
-    {{OOO_STRING_SVTOOLS_HTML_italic},        HTML_ITALIC_ON},
-    {{OOO_STRING_SVTOOLS_HTML_item},            HTML_ITEM_ON},  // HTML 3.0
-    {{OOO_STRING_SVTOOLS_HTML_keyboard},        HTML_KEYBOARD_ON},
-    {{OOO_STRING_SVTOOLS_HTML_language},        HTML_LANGUAGE_ON},  // HTML 3.0
-    {{OOO_STRING_SVTOOLS_HTML_layer},       HTML_LAYER_ON},
-    {{OOO_STRING_SVTOOLS_HTML_listheader},  HTML_LISTHEADER_ON},    // HTML 3.0
-    {{OOO_STRING_SVTOOLS_HTML_map},         HTML_MAP_ON},   // Netscape 2.0
-    {{OOO_STRING_SVTOOLS_HTML_math},            HTML_MATH_ON},  // HTML 3.0
-    {{OOO_STRING_SVTOOLS_HTML_menulist},        HTML_MENULIST_ON},
-    {{OOO_STRING_SVTOOLS_HTML_multicol},        HTML_MULTICOL_ON},  // Netscape 3.0b5
-    {{OOO_STRING_SVTOOLS_HTML_nobr},            HTML_NOBR_ON},  // Netscape
-    {{OOO_STRING_SVTOOLS_HTML_noembed},     HTML_NOEMBED_ON},   // Netscape 2.0 ???
-    {{OOO_STRING_SVTOOLS_HTML_noframe},     HTML_NOFRAMES_ON},  // Netscape 2.0 ???
-    {{OOO_STRING_SVTOOLS_HTML_noframes},        HTML_NOFRAMES_ON},  // Netscape 2.0
-    {{OOO_STRING_SVTOOLS_HTML_noscript},        HTML_NOSCRIPT_ON},  // Netscape 3.0
-    {{OOO_STRING_SVTOOLS_HTML_note},            HTML_NOTE_ON},  // HTML 3.0
-    {{OOO_STRING_SVTOOLS_HTML_object},     HTML_OBJECT_ON},
-    {{OOO_STRING_SVTOOLS_HTML_orderlist},      HTML_ORDERLIST_ON},
-    {{OOO_STRING_SVTOOLS_HTML_parabreak},      HTML_PARABREAK_ON},
-    {{OOO_STRING_SVTOOLS_HTML_person},      HTML_PERSON_ON},    // HTML 3.0
-    {{OOO_STRING_SVTOOLS_HTML_plaintext},   HTML_PLAINTEXT_ON}, // HTML 3.0
-    {{OOO_STRING_SVTOOLS_HTML_preformtxt},    HTML_PREFORMTXT_ON},
-    {{OOO_STRING_SVTOOLS_HTML_root},            HTML_ROOT_ON},  // HTML 3.0
-    {{OOO_STRING_SVTOOLS_HTML_row},         HTML_ROW_ON},   // HTML 3.0
-    {{OOO_STRING_SVTOOLS_HTML_sample},        HTML_SAMPLE_ON},
-    {{OOO_STRING_SVTOOLS_HTML_script},        HTML_SCRIPT_ON}, // HTML 3.2
-    {{OOO_STRING_SVTOOLS_HTML_select},        HTML_SELECT_ON},
-    {{OOO_STRING_SVTOOLS_HTML_shortquote},  HTML_SHORTQUOTE_ON},    // HTML 3.0
-    {{OOO_STRING_SVTOOLS_HTML_smallprint},  HTML_SMALLPRINT_ON},    // HTML 3.0
-    {{OOO_STRING_SVTOOLS_HTML_span},            HTML_SPAN_ON},  // Style Sheets
-    {{OOO_STRING_SVTOOLS_HTML_squareroot},  HTML_SQUAREROOT_ON},    // HTML 3.0
-    {{OOO_STRING_SVTOOLS_HTML_strikethrough},HTML_STRIKETHROUGH_ON},    // HTML 3.0
-    {{OOO_STRING_SVTOOLS_HTML_strong},        HTML_STRONG_ON},
-    {{OOO_STRING_SVTOOLS_HTML_style},       HTML_STYLE_ON}, // HTML 3.0
-    {{OOO_STRING_SVTOOLS_HTML_subscript},   HTML_SUBSCRIPT_ON}, // HTML 3.0
-    {{OOO_STRING_SVTOOLS_HTML_superscript}, HTML_SUPERSCRIPT_ON},   // HTML 3.0
-    {{OOO_STRING_SVTOOLS_HTML_table},       HTML_TABLE_ON}, // HTML 3.0
-    {{OOO_STRING_SVTOOLS_HTML_tabledata},   HTML_TABLEDATA_ON}, // HTML 3.0
-    {{OOO_STRING_SVTOOLS_HTML_tableheader}, HTML_TABLEHEADER_ON},   // HTML 3.0
-    {{OOO_STRING_SVTOOLS_HTML_tablerow},        HTML_TABLEROW_ON},  // HTML 3.0
-    {{OOO_STRING_SVTOOLS_HTML_tbody},          HTML_TBODY_ON}, // HTML 3 Table Model Draft
-    {{OOO_STRING_SVTOOLS_HTML_teletype},        HTML_TELETYPE_ON},
-    {{OOO_STRING_SVTOOLS_HTML_text},            HTML_TEXT_ON},  // HTML 3.0
-    {{OOO_STRING_SVTOOLS_HTML_textarea},        HTML_TEXTAREA_ON},
-    {{OOO_STRING_SVTOOLS_HTML_textflow},        HTML_TEXTFLOW_ON},
-    {{OOO_STRING_SVTOOLS_HTML_tfoot},          HTML_TFOOT_ON}, // HTML 3 Table Model Draft
-    {{OOO_STRING_SVTOOLS_HTML_thead},          HTML_THEAD_ON}, // HTML 3 Table Model Draft
-    {{OOO_STRING_SVTOOLS_HTML_tilde},       HTML_TILDE_ON}, // HTML 3.0
-    {{OOO_STRING_SVTOOLS_HTML_title},          HTML_TITLE_ON},
-    {{OOO_STRING_SVTOOLS_HTML_underline},      HTML_UNDERLINE_ON},
-    {{OOO_STRING_SVTOOLS_HTML_unorderlist},  HTML_UNORDERLIST_ON},
-    {{OOO_STRING_SVTOOLS_HTML_variable},        HTML_VARIABLE_ON},
-    {{OOO_STRING_SVTOOLS_HTML_vector},      HTML_VECTOR_ON},    // HTML 3.0
-
-    {{OOO_STRING_SVTOOLS_HTML_xmp},         HTML_XMP_ON},
-    {{OOO_STRING_SVTOOLS_HTML_listing},     HTML_LISTING_ON},
-
-    {{OOO_STRING_SVTOOLS_HTML_definstance},  HTML_DEFINSTANCE_ON},
-    {{OOO_STRING_SVTOOLS_HTML_strike},        HTML_STRIKE_ON},
-
-    {{OOO_STRING_SVTOOLS_HTML_bgsound},     HTML_BGSOUND},
-    {{OOO_STRING_SVTOOLS_HTML_comment2},        HTML_COMMENT2_ON},
-    {{OOO_STRING_SVTOOLS_HTML_marquee},         HTML_MARQUEE_ON},
-    {{OOO_STRING_SVTOOLS_HTML_plaintext2},    HTML_PLAINTEXT2_ON},
-
-    {{OOO_STRING_SVTOOLS_HTML_sdfield},     HTML_SDFIELD_ON}
+    {{OOO_STRING_SVTOOLS_HTML_area},			HTML_AREA}, // Netscape 2.0
+    {{OOO_STRING_SVTOOLS_HTML_base},			HTML_BASE},	// HTML 3.0
+    {{OOO_STRING_SVTOOLS_HTML_comment},	  	HTML_COMMENT},
+    {{OOO_STRING_SVTOOLS_HTML_doctype},	     HTML_DOCTYPE},
+    {{OOO_STRING_SVTOOLS_HTML_embed},		HTML_EMBED},	// Netscape 2.0
+    {{OOO_STRING_SVTOOLS_HTML_figureoverlay}, HTML_FIGUREOVERLAY},	// HTML 3.0
+    {{OOO_STRING_SVTOOLS_HTML_horzrule},	    HTML_HORZRULE},
+    {{OOO_STRING_SVTOOLS_HTML_horztab},		HTML_HORZTAB},	// HTML 3.0
+    {{OOO_STRING_SVTOOLS_HTML_image},	       HTML_IMAGE},
+    {{OOO_STRING_SVTOOLS_HTML_image2},	       HTML_IMAGE},
+    {{OOO_STRING_SVTOOLS_HTML_input},	       HTML_INPUT},
+    {{OOO_STRING_SVTOOLS_HTML_isindex},		HTML_ISINDEX},	// HTML 3.0
+    {{OOO_STRING_SVTOOLS_HTML_li},	          HTML_LI_ON},
+    {{OOO_STRING_SVTOOLS_HTML_linebreak},	   HTML_LINEBREAK},
+    {{OOO_STRING_SVTOOLS_HTML_link},			HTML_LINK},	// HTML 3.0
+    {{OOO_STRING_SVTOOLS_HTML_meta},			HTML_META},	// HTML 3.0
+    {{OOO_STRING_SVTOOLS_HTML_nextid},		HTML_NEXTID},	// HTML 3.0
+    {{OOO_STRING_SVTOOLS_HTML_of},			HTML_OF},	// HTML 3.0
+    {{OOO_STRING_SVTOOLS_HTML_option},	      HTML_OPTION},
+    {{OOO_STRING_SVTOOLS_HTML_param},		HTML_PARAM},	// HotJava
+    {{OOO_STRING_SVTOOLS_HTML_range},		HTML_RANGE},	// HTML 3.0
+    {{OOO_STRING_SVTOOLS_HTML_spacer},		HTML_SPACER},	// Netscape 3.0b5
+    {{OOO_STRING_SVTOOLS_HTML_wbr},			HTML_WBR},	// Netscape
+
+    {{OOO_STRING_SVTOOLS_HTML_abbreviation},	HTML_ABBREVIATION_ON},	// HTML 3.0
+    {{OOO_STRING_SVTOOLS_HTML_above},		HTML_ABOVE_ON},	// HTML 3.0
+    {{OOO_STRING_SVTOOLS_HTML_acronym},		HTML_ACRONYM_ON},	// HTML 3.0
+    {{OOO_STRING_SVTOOLS_HTML_address},	     HTML_ADDRESS_ON},
+    {{OOO_STRING_SVTOOLS_HTML_anchor},	      HTML_ANCHOR_ON},
+    {{OOO_STRING_SVTOOLS_HTML_applet},		HTML_APPLET_ON},	// HotJava
+    {{OOO_STRING_SVTOOLS_HTML_array},		HTML_ARRAY_ON},	// HTML 3.0
+    {{OOO_STRING_SVTOOLS_HTML_author},		HTML_AUTHOR_ON},	// HTML 3.0
+    {{OOO_STRING_SVTOOLS_HTML_banner},		HTML_BANNER_ON},	// HTML 3.0
+    {{OOO_STRING_SVTOOLS_HTML_bar},			HTML_BAR_ON},	// HTML 3.0
+    {{OOO_STRING_SVTOOLS_HTML_basefont},		HTML_BASEFONT_ON},	// Netscape
+    {{OOO_STRING_SVTOOLS_HTML_below},		HTML_BELOW_ON},	// HTML 3.0
+    {{OOO_STRING_SVTOOLS_HTML_bigprint},		HTML_BIGPRINT_ON},	// HTML 3.0
+    {{OOO_STRING_SVTOOLS_HTML_blink},		HTML_BLINK_ON},	// Netscape
+    {{OOO_STRING_SVTOOLS_HTML_blockquote},	  HTML_BLOCKQUOTE_ON},
+    {{OOO_STRING_SVTOOLS_HTML_blockquote30},	HTML_BLOCKQUOTE30_ON},	// HTML 3.0
+    {{OOO_STRING_SVTOOLS_HTML_body},	        HTML_BODY_ON},
+    {{OOO_STRING_SVTOOLS_HTML_bold},	        HTML_BOLD_ON},
+    {{OOO_STRING_SVTOOLS_HTML_boldtext},		HTML_BOLDTEXT_ON},	// HTML 3.0
+    {{OOO_STRING_SVTOOLS_HTML_box},			HTML_BOX_ON},	// HTML 3.0
+    {{OOO_STRING_SVTOOLS_HTML_caption},		HTML_CAPTION_ON},	// HTML 3.0
+    {{OOO_STRING_SVTOOLS_HTML_center},		HTML_CENTER_ON},	// Netscape
+    {{OOO_STRING_SVTOOLS_HTML_citiation},	   HTML_CITIATION_ON},
+    {{OOO_STRING_SVTOOLS_HTML_col},	        	HTML_COL_ON}, // HTML 3 Table Model Draft
+    {{OOO_STRING_SVTOOLS_HTML_colgroup},	    HTML_COLGROUP_ON}, // HTML 3 Table Model Draft
+    {{OOO_STRING_SVTOOLS_HTML_code},	        HTML_CODE_ON},
+    {{OOO_STRING_SVTOOLS_HTML_credit},		HTML_CREDIT_ON},	// HTML 3.0
+    {{OOO_STRING_SVTOOLS_HTML_dd},	          HTML_DD_ON},
+    {{OOO_STRING_SVTOOLS_HTML_deflist},	     HTML_DEFLIST_ON},
+    {{OOO_STRING_SVTOOLS_HTML_deletedtext},	HTML_DELETEDTEXT_ON},	// HTML 3.0
+    {{OOO_STRING_SVTOOLS_HTML_dirlist},	     HTML_DIRLIST_ON},
+    {{OOO_STRING_SVTOOLS_HTML_division},		HTML_DIVISION_ON},	// HTML 3.0
+    {{OOO_STRING_SVTOOLS_HTML_dot},			HTML_DOT_ON},	// HTML 3.0
+    {{OOO_STRING_SVTOOLS_HTML_doubledot},	HTML_DOUBLEDOT_ON},	// HTML 3.0
+    {{OOO_STRING_SVTOOLS_HTML_dt},	          HTML_DT_ON},
+    {{OOO_STRING_SVTOOLS_HTML_emphasis},	    HTML_EMPHASIS_ON},
+    {{OOO_STRING_SVTOOLS_HTML_figure},		HTML_FIGURE_ON},	// HTML 3.0
+    {{OOO_STRING_SVTOOLS_HTML_font},	        HTML_FONT_ON}, // Netscpe
+    {{OOO_STRING_SVTOOLS_HTML_footnote},		HTML_FOOTNOTE_ON},	// HTML 3.0
+    {{OOO_STRING_SVTOOLS_HTML_form},	        HTML_FORM_ON},
+    {{OOO_STRING_SVTOOLS_HTML_frame},		HTML_FRAME_ON},	// Netscape 2.0
+    {{OOO_STRING_SVTOOLS_HTML_frameset},		HTML_FRAMESET_ON},	// Netscape 2.0
+    {{OOO_STRING_SVTOOLS_HTML_hat},			HTML_HAT_ON},	// HTML 3.0
+    {{OOO_STRING_SVTOOLS_HTML_head},	        HTML_HEAD_ON},
+    {{OOO_STRING_SVTOOLS_HTML_head1},	       HTML_HEAD1_ON},
+    {{OOO_STRING_SVTOOLS_HTML_head2},	       HTML_HEAD2_ON},
+    {{OOO_STRING_SVTOOLS_HTML_head3},	       HTML_HEAD3_ON},
+    {{OOO_STRING_SVTOOLS_HTML_head4},	       HTML_HEAD4_ON},
+    {{OOO_STRING_SVTOOLS_HTML_head5},	       HTML_HEAD5_ON},
+    {{OOO_STRING_SVTOOLS_HTML_head6},	       HTML_HEAD6_ON},
+    {{OOO_STRING_SVTOOLS_HTML_html},	        HTML_HTML_ON},
+    {{OOO_STRING_SVTOOLS_HTML_iframe},		HTML_IFRAME_ON},	// IE 3.0b2
+    {{OOO_STRING_SVTOOLS_HTML_ilayer},		HTML_ILAYER_ON},
+    {{OOO_STRING_SVTOOLS_HTML_insertedtext},	HTML_INSERTEDTEXT_ON},	// HTML 3.0
+    {{OOO_STRING_SVTOOLS_HTML_italic},	      HTML_ITALIC_ON},
+    {{OOO_STRING_SVTOOLS_HTML_item},			HTML_ITEM_ON},	// HTML 3.0
+    {{OOO_STRING_SVTOOLS_HTML_keyboard},	    HTML_KEYBOARD_ON},
+    {{OOO_STRING_SVTOOLS_HTML_language},		HTML_LANGUAGE_ON},	// HTML 3.0
+    {{OOO_STRING_SVTOOLS_HTML_layer},		HTML_LAYER_ON},
+    {{OOO_STRING_SVTOOLS_HTML_listheader},	HTML_LISTHEADER_ON},	// HTML 3.0
+    {{OOO_STRING_SVTOOLS_HTML_map},			HTML_MAP_ON},	// Netscape 2.0
+    {{OOO_STRING_SVTOOLS_HTML_math},			HTML_MATH_ON},	// HTML 3.0
+    {{OOO_STRING_SVTOOLS_HTML_menulist},	    HTML_MENULIST_ON},
+    {{OOO_STRING_SVTOOLS_HTML_multicol},		HTML_MULTICOL_ON},	// Netscape 3.0b5
+    {{OOO_STRING_SVTOOLS_HTML_nobr},			HTML_NOBR_ON},	// Netscape
+    {{OOO_STRING_SVTOOLS_HTML_noembed},		HTML_NOEMBED_ON},	// Netscape 2.0 ???
+    {{OOO_STRING_SVTOOLS_HTML_noframe},		HTML_NOFRAMES_ON},	// Netscape 2.0 ???
+    {{OOO_STRING_SVTOOLS_HTML_noframes},		HTML_NOFRAMES_ON},	// Netscape 2.0
+    {{OOO_STRING_SVTOOLS_HTML_noscript},		HTML_NOSCRIPT_ON},	// Netscape 3.0
+    {{OOO_STRING_SVTOOLS_HTML_note},			HTML_NOTE_ON},	// HTML 3.0
+    {{OOO_STRING_SVTOOLS_HTML_object},	   HTML_OBJECT_ON},
+    {{OOO_STRING_SVTOOLS_HTML_orderlist},	   HTML_ORDERLIST_ON},
+    {{OOO_STRING_SVTOOLS_HTML_parabreak},	   HTML_PARABREAK_ON},
+    {{OOO_STRING_SVTOOLS_HTML_person},		HTML_PERSON_ON},	// HTML 3.0
+    {{OOO_STRING_SVTOOLS_HTML_plaintext},	HTML_PLAINTEXT_ON},	// HTML 3.0
+    {{OOO_STRING_SVTOOLS_HTML_preformtxt},	  HTML_PREFORMTXT_ON},
+    {{OOO_STRING_SVTOOLS_HTML_root},			HTML_ROOT_ON},	// HTML 3.0
+    {{OOO_STRING_SVTOOLS_HTML_row},			HTML_ROW_ON},	// HTML 3.0
+    {{OOO_STRING_SVTOOLS_HTML_sample},	      HTML_SAMPLE_ON},
+    {{OOO_STRING_SVTOOLS_HTML_script},	      HTML_SCRIPT_ON}, // HTML 3.2
+    {{OOO_STRING_SVTOOLS_HTML_select},	      HTML_SELECT_ON},
+    {{OOO_STRING_SVTOOLS_HTML_shortquote},	HTML_SHORTQUOTE_ON},	// HTML 3.0
+    {{OOO_STRING_SVTOOLS_HTML_smallprint},	HTML_SMALLPRINT_ON},	// HTML 3.0
+    {{OOO_STRING_SVTOOLS_HTML_span},			HTML_SPAN_ON},	// Style Sheets
+    {{OOO_STRING_SVTOOLS_HTML_squareroot},	HTML_SQUAREROOT_ON},	// HTML 3.0
+    {{OOO_STRING_SVTOOLS_HTML_strikethrough},HTML_STRIKETHROUGH_ON},	// HTML 3.0
+    {{OOO_STRING_SVTOOLS_HTML_strong},	      HTML_STRONG_ON},
+    {{OOO_STRING_SVTOOLS_HTML_style},		HTML_STYLE_ON},	// HTML 3.0
+    {{OOO_STRING_SVTOOLS_HTML_subscript},	HTML_SUBSCRIPT_ON},	// HTML 3.0
+    {{OOO_STRING_SVTOOLS_HTML_superscript},	HTML_SUPERSCRIPT_ON},	// HTML 3.0
+    {{OOO_STRING_SVTOOLS_HTML_table},		HTML_TABLE_ON},	// HTML 3.0
+    {{OOO_STRING_SVTOOLS_HTML_tabledata},	HTML_TABLEDATA_ON},	// HTML 3.0
+    {{OOO_STRING_SVTOOLS_HTML_tableheader},	HTML_TABLEHEADER_ON},	// HTML 3.0
+    {{OOO_STRING_SVTOOLS_HTML_tablerow},		HTML_TABLEROW_ON},	// HTML 3.0
+    {{OOO_STRING_SVTOOLS_HTML_tbody},	       HTML_TBODY_ON}, // HTML 3 Table Model Draft
+    {{OOO_STRING_SVTOOLS_HTML_teletype},	    HTML_TELETYPE_ON},
+    {{OOO_STRING_SVTOOLS_HTML_text},			HTML_TEXT_ON},	// HTML 3.0
+    {{OOO_STRING_SVTOOLS_HTML_textarea},	    HTML_TEXTAREA_ON},
+    {{OOO_STRING_SVTOOLS_HTML_textflow},	    HTML_TEXTFLOW_ON},
+    {{OOO_STRING_SVTOOLS_HTML_tfoot},	       HTML_TFOOT_ON}, // HTML 3 Table Model Draft
+    {{OOO_STRING_SVTOOLS_HTML_thead},	       HTML_THEAD_ON}, // HTML 3 Table Model Draft
+    {{OOO_STRING_SVTOOLS_HTML_tilde},		HTML_TILDE_ON},	// HTML 3.0
+    {{OOO_STRING_SVTOOLS_HTML_title},	       HTML_TITLE_ON},
+    {{OOO_STRING_SVTOOLS_HTML_underline},	   HTML_UNDERLINE_ON},
+    {{OOO_STRING_SVTOOLS_HTML_unorderlist},	 HTML_UNORDERLIST_ON},
+    {{OOO_STRING_SVTOOLS_HTML_variable},	    HTML_VARIABLE_ON},
+    {{OOO_STRING_SVTOOLS_HTML_vector},		HTML_VECTOR_ON},	// HTML 3.0
+
+    {{OOO_STRING_SVTOOLS_HTML_xmp},	   		HTML_XMP_ON},
+    {{OOO_STRING_SVTOOLS_HTML_listing},		HTML_LISTING_ON},
+
+    {{OOO_STRING_SVTOOLS_HTML_definstance},	 HTML_DEFINSTANCE_ON},
+    {{OOO_STRING_SVTOOLS_HTML_strike},	      HTML_STRIKE_ON},
+
+    {{OOO_STRING_SVTOOLS_HTML_bgsound},		HTML_BGSOUND},
+    {{OOO_STRING_SVTOOLS_HTML_comment2},	    HTML_COMMENT2_ON},
+    {{OOO_STRING_SVTOOLS_HTML_marquee},	    	HTML_MARQUEE_ON},
+    {{OOO_STRING_SVTOOLS_HTML_plaintext2},	  HTML_PLAINTEXT2_ON},
+
+    {{OOO_STRING_SVTOOLS_HTML_sdfield},	  	HTML_SDFIELD_ON}
 };
 
 
 extern "C"
 {
-
+    
 static int
 #if defined( WNT )
  __cdecl
@@ -230,7 +230,7 @@ static int
             nRet = strcmp( ((HTML_TokenEntry*)pFirst)->sToken,
                             ((HTML_TokenEntry*)pSecond)->sToken );
     }
-
+    
     return nRet;
 }
 
@@ -282,82 +282,82 @@ struct HTML_CharEntry
 static int __FAR_DATA bSortCharKeyWords = FALSE;
 
 static HTML_CharEntry __FAR_DATA aHTMLCharNameTab[] = {
-    {{OOO_STRING_SVTOOLS_HTML_C_lt},             60},
-    {{OOO_STRING_SVTOOLS_HTML_C_gt},             62},
-    {{OOO_STRING_SVTOOLS_HTML_C_amp},        38},
-    {{OOO_STRING_SVTOOLS_HTML_C_quot},       34},
-
-    {{OOO_STRING_SVTOOLS_HTML_C_Agrave},        192},
-    {{OOO_STRING_SVTOOLS_HTML_C_Aacute},        193},
-    {{OOO_STRING_SVTOOLS_HTML_C_Acirc},     194},
-    {{OOO_STRING_SVTOOLS_HTML_C_Atilde},        195},
-    {{OOO_STRING_SVTOOLS_HTML_C_Auml},      196},
-    {{OOO_STRING_SVTOOLS_HTML_C_Aring},     197},
-    {{OOO_STRING_SVTOOLS_HTML_C_AElig},     198},
-    {{OOO_STRING_SVTOOLS_HTML_C_Ccedil},        199},
-    {{OOO_STRING_SVTOOLS_HTML_C_Egrave},        200},
-    {{OOO_STRING_SVTOOLS_HTML_C_Eacute},        201},
-    {{OOO_STRING_SVTOOLS_HTML_C_Ecirc},     202},
-    {{OOO_STRING_SVTOOLS_HTML_C_Euml},      203},
-    {{OOO_STRING_SVTOOLS_HTML_C_Igrave},        204},
-    {{OOO_STRING_SVTOOLS_HTML_C_Iacute},        205},
-    {{OOO_STRING_SVTOOLS_HTML_C_Icirc},     206},
-    {{OOO_STRING_SVTOOLS_HTML_C_Iuml},      207},
-    {{OOO_STRING_SVTOOLS_HTML_C_ETH},       208},
-    {{OOO_STRING_SVTOOLS_HTML_C_Ntilde},        209},
-    {{OOO_STRING_SVTOOLS_HTML_C_Ograve},        210},
-    {{OOO_STRING_SVTOOLS_HTML_C_Oacute},        211},
-    {{OOO_STRING_SVTOOLS_HTML_C_Ocirc},     212},
-    {{OOO_STRING_SVTOOLS_HTML_C_Otilde},        213},
-    {{OOO_STRING_SVTOOLS_HTML_C_Ouml},      214},
-    {{OOO_STRING_SVTOOLS_HTML_C_Oslash},        216},
-    {{OOO_STRING_SVTOOLS_HTML_C_Ugrave},        217},
-    {{OOO_STRING_SVTOOLS_HTML_C_Uacute},        218},
-    {{OOO_STRING_SVTOOLS_HTML_C_Ucirc},     219},
-    {{OOO_STRING_SVTOOLS_HTML_C_Uuml},      220},
-    {{OOO_STRING_SVTOOLS_HTML_C_Yacute},        221},
-
-    {{OOO_STRING_SVTOOLS_HTML_C_THORN},     222},
-    {{OOO_STRING_SVTOOLS_HTML_C_szlig},     223},
-
-    {{OOO_STRING_SVTOOLS_HTML_S_agrave},        224},
-    {{OOO_STRING_SVTOOLS_HTML_S_aacute},        225},
-    {{OOO_STRING_SVTOOLS_HTML_S_acirc},     226},
-    {{OOO_STRING_SVTOOLS_HTML_S_atilde},        227},
-    {{OOO_STRING_SVTOOLS_HTML_S_auml},      228},
-    {{OOO_STRING_SVTOOLS_HTML_S_aring},     229},
-    {{OOO_STRING_SVTOOLS_HTML_S_aelig},     230},
-    {{OOO_STRING_SVTOOLS_HTML_S_ccedil},        231},
-    {{OOO_STRING_SVTOOLS_HTML_S_egrave},        232},
-    {{OOO_STRING_SVTOOLS_HTML_S_eacute},        233},
-    {{OOO_STRING_SVTOOLS_HTML_S_ecirc},     234},
-    {{OOO_STRING_SVTOOLS_HTML_S_euml},      235},
-    {{OOO_STRING_SVTOOLS_HTML_S_igrave},        236},
-    {{OOO_STRING_SVTOOLS_HTML_S_iacute},        237},
-    {{OOO_STRING_SVTOOLS_HTML_S_icirc},     238},
-    {{OOO_STRING_SVTOOLS_HTML_S_iuml},      239},
-    {{OOO_STRING_SVTOOLS_HTML_S_eth},       240},
-    {{OOO_STRING_SVTOOLS_HTML_S_ntilde},        241},
-    {{OOO_STRING_SVTOOLS_HTML_S_ograve},        242},
-    {{OOO_STRING_SVTOOLS_HTML_S_oacute},        243},
-    {{OOO_STRING_SVTOOLS_HTML_S_ocirc},     244},
-    {{OOO_STRING_SVTOOLS_HTML_S_otilde},        245},
-    {{OOO_STRING_SVTOOLS_HTML_S_ouml},      246},
-    {{OOO_STRING_SVTOOLS_HTML_S_oslash},        248},
-    {{OOO_STRING_SVTOOLS_HTML_S_ugrave},        249},
-    {{OOO_STRING_SVTOOLS_HTML_S_uacute},        250},
-    {{OOO_STRING_SVTOOLS_HTML_S_ucirc},     251},
-    {{OOO_STRING_SVTOOLS_HTML_S_uuml},      252},
-    {{OOO_STRING_SVTOOLS_HTML_S_yacute},        253},
-    {{OOO_STRING_SVTOOLS_HTML_S_thorn},     254},
-    {{OOO_STRING_SVTOOLS_HTML_S_yuml},      255},
+    {{OOO_STRING_SVTOOLS_HTML_C_lt},			 60},
+    {{OOO_STRING_SVTOOLS_HTML_C_gt},			 62},
+    {{OOO_STRING_SVTOOLS_HTML_C_amp},		 38},
+    {{OOO_STRING_SVTOOLS_HTML_C_quot},		 34},
+
+    {{OOO_STRING_SVTOOLS_HTML_C_Agrave},		192},
+    {{OOO_STRING_SVTOOLS_HTML_C_Aacute},		193},
+    {{OOO_STRING_SVTOOLS_HTML_C_Acirc},		194},
+    {{OOO_STRING_SVTOOLS_HTML_C_Atilde},		195},
+    {{OOO_STRING_SVTOOLS_HTML_C_Auml},		196},
+    {{OOO_STRING_SVTOOLS_HTML_C_Aring},		197},
+    {{OOO_STRING_SVTOOLS_HTML_C_AElig},		198},
+    {{OOO_STRING_SVTOOLS_HTML_C_Ccedil},		199},
+    {{OOO_STRING_SVTOOLS_HTML_C_Egrave},		200},
+    {{OOO_STRING_SVTOOLS_HTML_C_Eacute},		201},
+    {{OOO_STRING_SVTOOLS_HTML_C_Ecirc},		202},
+    {{OOO_STRING_SVTOOLS_HTML_C_Euml},		203},
+    {{OOO_STRING_SVTOOLS_HTML_C_Igrave},		204},
+    {{OOO_STRING_SVTOOLS_HTML_C_Iacute},		205},
+    {{OOO_STRING_SVTOOLS_HTML_C_Icirc},		206},
+    {{OOO_STRING_SVTOOLS_HTML_C_Iuml},		207},
+    {{OOO_STRING_SVTOOLS_HTML_C_ETH},		208},
+    {{OOO_STRING_SVTOOLS_HTML_C_Ntilde},		209},
+    {{OOO_STRING_SVTOOLS_HTML_C_Ograve},		210},
+    {{OOO_STRING_SVTOOLS_HTML_C_Oacute},		211},
+    {{OOO_STRING_SVTOOLS_HTML_C_Ocirc},		212},
+    {{OOO_STRING_SVTOOLS_HTML_C_Otilde},		213},
+    {{OOO_STRING_SVTOOLS_HTML_C_Ouml},		214},
+    {{OOO_STRING_SVTOOLS_HTML_C_Oslash},		216},
+    {{OOO_STRING_SVTOOLS_HTML_C_Ugrave},		217},
+    {{OOO_STRING_SVTOOLS_HTML_C_Uacute},		218},
+    {{OOO_STRING_SVTOOLS_HTML_C_Ucirc},		219},
+    {{OOO_STRING_SVTOOLS_HTML_C_Uuml},		220},
+    {{OOO_STRING_SVTOOLS_HTML_C_Yacute},		221},
+
+    {{OOO_STRING_SVTOOLS_HTML_C_THORN},		222},
+    {{OOO_STRING_SVTOOLS_HTML_C_szlig},		223},
+
+    {{OOO_STRING_SVTOOLS_HTML_S_agrave},		224},
+    {{OOO_STRING_SVTOOLS_HTML_S_aacute},		225},
+    {{OOO_STRING_SVTOOLS_HTML_S_acirc},		226},
+    {{OOO_STRING_SVTOOLS_HTML_S_atilde},		227},
+    {{OOO_STRING_SVTOOLS_HTML_S_auml},		228},
+    {{OOO_STRING_SVTOOLS_HTML_S_aring},		229},
+    {{OOO_STRING_SVTOOLS_HTML_S_aelig},		230},
+    {{OOO_STRING_SVTOOLS_HTML_S_ccedil},		231},
+    {{OOO_STRING_SVTOOLS_HTML_S_egrave},		232},
+    {{OOO_STRING_SVTOOLS_HTML_S_eacute},		233},
+    {{OOO_STRING_SVTOOLS_HTML_S_ecirc},		234},
+    {{OOO_STRING_SVTOOLS_HTML_S_euml},		235},
+    {{OOO_STRING_SVTOOLS_HTML_S_igrave},		236},
+    {{OOO_STRING_SVTOOLS_HTML_S_iacute},		237},
+    {{OOO_STRING_SVTOOLS_HTML_S_icirc},		238},
+    {{OOO_STRING_SVTOOLS_HTML_S_iuml},		239},
+    {{OOO_STRING_SVTOOLS_HTML_S_eth},		240},
+    {{OOO_STRING_SVTOOLS_HTML_S_ntilde},		241},
+    {{OOO_STRING_SVTOOLS_HTML_S_ograve},		242},
+    {{OOO_STRING_SVTOOLS_HTML_S_oacute},		243},
+    {{OOO_STRING_SVTOOLS_HTML_S_ocirc},		244},
+    {{OOO_STRING_SVTOOLS_HTML_S_otilde},		245},
+    {{OOO_STRING_SVTOOLS_HTML_S_ouml},		246},
+    {{OOO_STRING_SVTOOLS_HTML_S_oslash},		248},
+    {{OOO_STRING_SVTOOLS_HTML_S_ugrave},		249},
+    {{OOO_STRING_SVTOOLS_HTML_S_uacute},		250},
+    {{OOO_STRING_SVTOOLS_HTML_S_ucirc},		251},
+    {{OOO_STRING_SVTOOLS_HTML_S_uuml},		252},
+    {{OOO_STRING_SVTOOLS_HTML_S_yacute},		253},
+    {{OOO_STRING_SVTOOLS_HTML_S_thorn},		254},
+    {{OOO_STRING_SVTOOLS_HTML_S_yuml},		255},
 
 // Sonderzeichen
-    {{OOO_STRING_SVTOOLS_HTML_S_acute},     180},
-    {{OOO_STRING_SVTOOLS_HTML_S_brvbar},    166},
+    {{OOO_STRING_SVTOOLS_HTML_S_acute},		180},
+    {{OOO_STRING_SVTOOLS_HTML_S_brvbar}, 	166},
     {{OOO_STRING_SVTOOLS_HTML_S_cedil},      184},
     {{OOO_STRING_SVTOOLS_HTML_S_cent},       162},
-    {{OOO_STRING_SVTOOLS_HTML_S_copy},      169},
+    {{OOO_STRING_SVTOOLS_HTML_S_copy},		169},
     {{OOO_STRING_SVTOOLS_HTML_S_curren},     164},
     {{OOO_STRING_SVTOOLS_HTML_S_deg},        176},
     {{OOO_STRING_SVTOOLS_HTML_S_divide},     247},
@@ -377,7 +377,7 @@ static HTML_CharEntry __FAR_DATA aHTMLCharNameTab[] = {
     {{OOO_STRING_SVTOOLS_HTML_S_plusmn},     177},
     {{OOO_STRING_SVTOOLS_HTML_S_pound},      163},
     {{OOO_STRING_SVTOOLS_HTML_S_raquo},      187},
-    {{OOO_STRING_SVTOOLS_HTML_S_reg},       174},
+    {{OOO_STRING_SVTOOLS_HTML_S_reg},		174},
     {{OOO_STRING_SVTOOLS_HTML_S_sect},       167},
     {{OOO_STRING_SVTOOLS_HTML_S_sup1},       185},
     {{OOO_STRING_SVTOOLS_HTML_S_sup2},       178},
@@ -387,171 +387,171 @@ static HTML_CharEntry __FAR_DATA aHTMLCharNameTab[] = {
     {{OOO_STRING_SVTOOLS_HTML_S_yen},        165},
 
 // Netscape kennt noch ein paar in Grossbuchstaben ...
-    {{OOO_STRING_SVTOOLS_HTML_C_LT},             60},
-    {{OOO_STRING_SVTOOLS_HTML_C_GT},             62},
-    {{OOO_STRING_SVTOOLS_HTML_C_AMP},        38},
-    {{OOO_STRING_SVTOOLS_HTML_C_QUOT},       34},
-    {{OOO_STRING_SVTOOLS_HTML_S_COPY},      169},
-    {{OOO_STRING_SVTOOLS_HTML_S_REG},       174},
+    {{OOO_STRING_SVTOOLS_HTML_C_LT},			 60},
+    {{OOO_STRING_SVTOOLS_HTML_C_GT},			 62},
+    {{OOO_STRING_SVTOOLS_HTML_C_AMP},		 38},
+    {{OOO_STRING_SVTOOLS_HTML_C_QUOT},		 34},
+    {{OOO_STRING_SVTOOLS_HTML_S_COPY},		169},
+    {{OOO_STRING_SVTOOLS_HTML_S_REG},		174},
 
 // Sonderzeichen, die zu Tokens konvertiert werden !!!
-    {{OOO_STRING_SVTOOLS_HTML_S_nbsp},      1},
-    {{OOO_STRING_SVTOOLS_HTML_S_shy},       2},
+    {{OOO_STRING_SVTOOLS_HTML_S_nbsp},		1},
+    {{OOO_STRING_SVTOOLS_HTML_S_shy},		2},
 
 
 // HTML4
-    {{OOO_STRING_SVTOOLS_HTML_S_OElig},     338},
-    {{OOO_STRING_SVTOOLS_HTML_S_oelig},     339},
-    {{OOO_STRING_SVTOOLS_HTML_S_Scaron},        352},
-    {{OOO_STRING_SVTOOLS_HTML_S_scaron},        353},
-    {{OOO_STRING_SVTOOLS_HTML_S_Yuml},      376},
-    {{OOO_STRING_SVTOOLS_HTML_S_fnof},      402},
-    {{OOO_STRING_SVTOOLS_HTML_S_circ},      710},
-    {{OOO_STRING_SVTOOLS_HTML_S_tilde},     732},
-    {{OOO_STRING_SVTOOLS_HTML_S_Alpha},     913},
-    {{OOO_STRING_SVTOOLS_HTML_S_Beta},      914},
-    {{OOO_STRING_SVTOOLS_HTML_S_Gamma},     915},
-    {{OOO_STRING_SVTOOLS_HTML_S_Delta},     916},
-    {{OOO_STRING_SVTOOLS_HTML_S_Epsilon},   917},
-    {{OOO_STRING_SVTOOLS_HTML_S_Zeta},      918},
-    {{OOO_STRING_SVTOOLS_HTML_S_Eta},       919},
-    {{OOO_STRING_SVTOOLS_HTML_S_Theta},     920},
-    {{OOO_STRING_SVTOOLS_HTML_S_Iota},      921},
-    {{OOO_STRING_SVTOOLS_HTML_S_Kappa},     922},
-    {{OOO_STRING_SVTOOLS_HTML_S_Lambda},        923},
-    {{OOO_STRING_SVTOOLS_HTML_S_Mu},            924},
-    {{OOO_STRING_SVTOOLS_HTML_S_Nu},            925},
-    {{OOO_STRING_SVTOOLS_HTML_S_Xi},            926},
-    {{OOO_STRING_SVTOOLS_HTML_S_Omicron},   927},
-    {{OOO_STRING_SVTOOLS_HTML_S_Pi},            928},
-    {{OOO_STRING_SVTOOLS_HTML_S_Rho},       929},
-    {{OOO_STRING_SVTOOLS_HTML_S_Sigma},     931},
-    {{OOO_STRING_SVTOOLS_HTML_S_Tau},       932},
-    {{OOO_STRING_SVTOOLS_HTML_S_Upsilon},   933},
-    {{OOO_STRING_SVTOOLS_HTML_S_Phi},       934},
-    {{OOO_STRING_SVTOOLS_HTML_S_Chi},       935},
-    {{OOO_STRING_SVTOOLS_HTML_S_Psi},       936},
-    {{OOO_STRING_SVTOOLS_HTML_S_Omega},     937},
-    {{OOO_STRING_SVTOOLS_HTML_S_alpha},     945},
-    {{OOO_STRING_SVTOOLS_HTML_S_beta},      946},
-    {{OOO_STRING_SVTOOLS_HTML_S_gamma},     947},
-    {{OOO_STRING_SVTOOLS_HTML_S_delta},     948},
-    {{OOO_STRING_SVTOOLS_HTML_S_epsilon},   949},
-    {{OOO_STRING_SVTOOLS_HTML_S_zeta},      950},
-    {{OOO_STRING_SVTOOLS_HTML_S_eta},       951},
-    {{OOO_STRING_SVTOOLS_HTML_S_theta},     952},
-    {{OOO_STRING_SVTOOLS_HTML_S_iota},      953},
-    {{OOO_STRING_SVTOOLS_HTML_S_kappa},     954},
-    {{OOO_STRING_SVTOOLS_HTML_S_lambda},        955},
-    {{OOO_STRING_SVTOOLS_HTML_S_mu},            956},
-    {{OOO_STRING_SVTOOLS_HTML_S_nu},            957},
-    {{OOO_STRING_SVTOOLS_HTML_S_xi},            958},
-    {{OOO_STRING_SVTOOLS_HTML_S_omicron},   959},
-    {{OOO_STRING_SVTOOLS_HTML_S_pi},            960},
-    {{OOO_STRING_SVTOOLS_HTML_S_rho},       961},
-    {{OOO_STRING_SVTOOLS_HTML_S_sigmaf},        962},
-    {{OOO_STRING_SVTOOLS_HTML_S_sigma},     963},
-    {{OOO_STRING_SVTOOLS_HTML_S_tau},       964},
-    {{OOO_STRING_SVTOOLS_HTML_S_upsilon},   965},
-    {{OOO_STRING_SVTOOLS_HTML_S_phi},       966},
-    {{OOO_STRING_SVTOOLS_HTML_S_chi},       967},
-    {{OOO_STRING_SVTOOLS_HTML_S_psi},       968},
-    {{OOO_STRING_SVTOOLS_HTML_S_omega},     969},
-    {{OOO_STRING_SVTOOLS_HTML_S_thetasym},  977},
-    {{OOO_STRING_SVTOOLS_HTML_S_upsih},     978},
-    {{OOO_STRING_SVTOOLS_HTML_S_piv},       982},
-    {{OOO_STRING_SVTOOLS_HTML_S_ensp},      8194},
-    {{OOO_STRING_SVTOOLS_HTML_S_emsp},      8195},
-    {{OOO_STRING_SVTOOLS_HTML_S_thinsp},        8201},
-    {{OOO_STRING_SVTOOLS_HTML_S_zwnj},      8204},
-    {{OOO_STRING_SVTOOLS_HTML_S_zwj},       8205},
-    {{OOO_STRING_SVTOOLS_HTML_S_lrm},       8206},
-    {{OOO_STRING_SVTOOLS_HTML_S_rlm},       8207},
-    {{OOO_STRING_SVTOOLS_HTML_S_ndash},     8211},
-    {{OOO_STRING_SVTOOLS_HTML_S_mdash},     8212},
-    {{OOO_STRING_SVTOOLS_HTML_S_lsquo},     8216},
-    {{OOO_STRING_SVTOOLS_HTML_S_rsquo},     8217},
-    {{OOO_STRING_SVTOOLS_HTML_S_sbquo},     8218},
-    {{OOO_STRING_SVTOOLS_HTML_S_ldquo},     8220},
-    {{OOO_STRING_SVTOOLS_HTML_S_rdquo},     8221},
-    {{OOO_STRING_SVTOOLS_HTML_S_bdquo},     8222},
-    {{OOO_STRING_SVTOOLS_HTML_S_dagger},        8224},
-    {{OOO_STRING_SVTOOLS_HTML_S_Dagger},        8225},
-    {{OOO_STRING_SVTOOLS_HTML_S_bull},      8226},
-    {{OOO_STRING_SVTOOLS_HTML_S_hellip},        8230},
-    {{OOO_STRING_SVTOOLS_HTML_S_permil},        8240},
-    {{OOO_STRING_SVTOOLS_HTML_S_prime},     8242},
-    {{OOO_STRING_SVTOOLS_HTML_S_Prime},     8243},
-    {{OOO_STRING_SVTOOLS_HTML_S_lsaquo},        8249},
-    {{OOO_STRING_SVTOOLS_HTML_S_rsaquo},        8250},
-    {{OOO_STRING_SVTOOLS_HTML_S_oline},     8254},
-    {{OOO_STRING_SVTOOLS_HTML_S_frasl},     8260},
-    {{OOO_STRING_SVTOOLS_HTML_S_euro},      8364},
-    {{OOO_STRING_SVTOOLS_HTML_S_image},     8465},
-    {{OOO_STRING_SVTOOLS_HTML_S_weierp},        8472},
-    {{OOO_STRING_SVTOOLS_HTML_S_real},      8476},
-    {{OOO_STRING_SVTOOLS_HTML_S_trade},     8482},
-    {{OOO_STRING_SVTOOLS_HTML_S_alefsym},   8501},
-    {{OOO_STRING_SVTOOLS_HTML_S_larr},      8592},
-    {{OOO_STRING_SVTOOLS_HTML_S_uarr},      8593},
-    {{OOO_STRING_SVTOOLS_HTML_S_rarr},      8594},
-    {{OOO_STRING_SVTOOLS_HTML_S_darr},      8595},
-    {{OOO_STRING_SVTOOLS_HTML_S_harr},      8596},
-    {{OOO_STRING_SVTOOLS_HTML_S_crarr},     8629},
-    {{OOO_STRING_SVTOOLS_HTML_S_lArr},      8656},
-    {{OOO_STRING_SVTOOLS_HTML_S_uArr},      8657},
-    {{OOO_STRING_SVTOOLS_HTML_S_rArr},      8658},
-    {{OOO_STRING_SVTOOLS_HTML_S_dArr},      8659},
-    {{OOO_STRING_SVTOOLS_HTML_S_hArr},      8660},
-    {{OOO_STRING_SVTOOLS_HTML_S_forall},        8704},
-    {{OOO_STRING_SVTOOLS_HTML_S_part},      8706},
-    {{OOO_STRING_SVTOOLS_HTML_S_exist},     8707},
-    {{OOO_STRING_SVTOOLS_HTML_S_empty},     8709},
-    {{OOO_STRING_SVTOOLS_HTML_S_nabla},     8711},
-    {{OOO_STRING_SVTOOLS_HTML_S_isin},      8712},
-    {{OOO_STRING_SVTOOLS_HTML_S_notin},     8713},
-    {{OOO_STRING_SVTOOLS_HTML_S_ni},            8715},
-    {{OOO_STRING_SVTOOLS_HTML_S_prod},      8719},
-    {{OOO_STRING_SVTOOLS_HTML_S_sum},       8721},
-    {{OOO_STRING_SVTOOLS_HTML_S_minus},     8722},
-    {{OOO_STRING_SVTOOLS_HTML_S_lowast},        8727},
-    {{OOO_STRING_SVTOOLS_HTML_S_radic},     8730},
-    {{OOO_STRING_SVTOOLS_HTML_S_prop},      8733},
-    {{OOO_STRING_SVTOOLS_HTML_S_infin},     8734},
-    {{OOO_STRING_SVTOOLS_HTML_S_ang},       8736},
-    {{OOO_STRING_SVTOOLS_HTML_S_and},       8743},
-    {{OOO_STRING_SVTOOLS_HTML_S_or},            8744},
-    {{OOO_STRING_SVTOOLS_HTML_S_cap},       8745},
-    {{OOO_STRING_SVTOOLS_HTML_S_cup},       8746},
-    {{OOO_STRING_SVTOOLS_HTML_S_int},       8747},
-    {{OOO_STRING_SVTOOLS_HTML_S_there4},        8756},
-    {{OOO_STRING_SVTOOLS_HTML_S_sim},       8764},
-    {{OOO_STRING_SVTOOLS_HTML_S_cong},      8773},
-    {{OOO_STRING_SVTOOLS_HTML_S_asymp},     8776},
-    {{OOO_STRING_SVTOOLS_HTML_S_ne},            8800},
-    {{OOO_STRING_SVTOOLS_HTML_S_equiv},     8801},
-    {{OOO_STRING_SVTOOLS_HTML_S_le},            8804},
-    {{OOO_STRING_SVTOOLS_HTML_S_ge},            8805},
-    {{OOO_STRING_SVTOOLS_HTML_S_sub},       8834},
-    {{OOO_STRING_SVTOOLS_HTML_S_sup},       8835},
-    {{OOO_STRING_SVTOOLS_HTML_S_nsub},      8836},
-    {{OOO_STRING_SVTOOLS_HTML_S_sube},      8838},
-    {{OOO_STRING_SVTOOLS_HTML_S_supe},      8839},
-    {{OOO_STRING_SVTOOLS_HTML_S_oplus},     8853},
-    {{OOO_STRING_SVTOOLS_HTML_S_otimes},        8855},
-    {{OOO_STRING_SVTOOLS_HTML_S_perp},      8869},
-    {{OOO_STRING_SVTOOLS_HTML_S_sdot},      8901},
-    {{OOO_STRING_SVTOOLS_HTML_S_lceil},     8968},
-    {{OOO_STRING_SVTOOLS_HTML_S_rceil},     8969},
-    {{OOO_STRING_SVTOOLS_HTML_S_lfloor},        8970},
-    {{OOO_STRING_SVTOOLS_HTML_S_rfloor},        8971},
-    {{OOO_STRING_SVTOOLS_HTML_S_lang},      9001},
-    {{OOO_STRING_SVTOOLS_HTML_S_rang},      9002},
-    {{OOO_STRING_SVTOOLS_HTML_S_loz},       9674},
-    {{OOO_STRING_SVTOOLS_HTML_S_spades},        9824},
-    {{OOO_STRING_SVTOOLS_HTML_S_clubs},     9827},
-    {{OOO_STRING_SVTOOLS_HTML_S_hearts},        9829},
-    {{OOO_STRING_SVTOOLS_HTML_S_diams},     9830}
+    {{OOO_STRING_SVTOOLS_HTML_S_OElig},		338},
+    {{OOO_STRING_SVTOOLS_HTML_S_oelig},		339},
+    {{OOO_STRING_SVTOOLS_HTML_S_Scaron},		352},
+    {{OOO_STRING_SVTOOLS_HTML_S_scaron},		353},
+    {{OOO_STRING_SVTOOLS_HTML_S_Yuml},		376},
+    {{OOO_STRING_SVTOOLS_HTML_S_fnof},		402},
+    {{OOO_STRING_SVTOOLS_HTML_S_circ},		710},
+    {{OOO_STRING_SVTOOLS_HTML_S_tilde},		732},
+    {{OOO_STRING_SVTOOLS_HTML_S_Alpha},		913},
+    {{OOO_STRING_SVTOOLS_HTML_S_Beta},		914},
+    {{OOO_STRING_SVTOOLS_HTML_S_Gamma},		915},
+    {{OOO_STRING_SVTOOLS_HTML_S_Delta},		916},
+    {{OOO_STRING_SVTOOLS_HTML_S_Epsilon},	917},
+    {{OOO_STRING_SVTOOLS_HTML_S_Zeta},		918},
+    {{OOO_STRING_SVTOOLS_HTML_S_Eta},		919},
+    {{OOO_STRING_SVTOOLS_HTML_S_Theta},		920},
+    {{OOO_STRING_SVTOOLS_HTML_S_Iota},		921},
+    {{OOO_STRING_SVTOOLS_HTML_S_Kappa},		922},
+    {{OOO_STRING_SVTOOLS_HTML_S_Lambda},		923},
+    {{OOO_STRING_SVTOOLS_HTML_S_Mu},			924},
+    {{OOO_STRING_SVTOOLS_HTML_S_Nu},			925},
+    {{OOO_STRING_SVTOOLS_HTML_S_Xi},			926},
+    {{OOO_STRING_SVTOOLS_HTML_S_Omicron},	927},
+    {{OOO_STRING_SVTOOLS_HTML_S_Pi},			928},
+    {{OOO_STRING_SVTOOLS_HTML_S_Rho},		929},
+    {{OOO_STRING_SVTOOLS_HTML_S_Sigma},		931},
+    {{OOO_STRING_SVTOOLS_HTML_S_Tau},		932},
+    {{OOO_STRING_SVTOOLS_HTML_S_Upsilon},	933},
+    {{OOO_STRING_SVTOOLS_HTML_S_Phi},		934},
+    {{OOO_STRING_SVTOOLS_HTML_S_Chi},		935},
+    {{OOO_STRING_SVTOOLS_HTML_S_Psi},		936},
+    {{OOO_STRING_SVTOOLS_HTML_S_Omega},		937},
+    {{OOO_STRING_SVTOOLS_HTML_S_alpha},		945},
+    {{OOO_STRING_SVTOOLS_HTML_S_beta},		946},
+    {{OOO_STRING_SVTOOLS_HTML_S_gamma},		947},
+    {{OOO_STRING_SVTOOLS_HTML_S_delta},		948},
+    {{OOO_STRING_SVTOOLS_HTML_S_epsilon},	949},
+    {{OOO_STRING_SVTOOLS_HTML_S_zeta},		950},
+    {{OOO_STRING_SVTOOLS_HTML_S_eta},		951},
+    {{OOO_STRING_SVTOOLS_HTML_S_theta},		952},
+    {{OOO_STRING_SVTOOLS_HTML_S_iota},		953},
+    {{OOO_STRING_SVTOOLS_HTML_S_kappa},		954},
+    {{OOO_STRING_SVTOOLS_HTML_S_lambda},		955},
+    {{OOO_STRING_SVTOOLS_HTML_S_mu},			956},
+    {{OOO_STRING_SVTOOLS_HTML_S_nu},			957},
+    {{OOO_STRING_SVTOOLS_HTML_S_xi},			958},
+    {{OOO_STRING_SVTOOLS_HTML_S_omicron},	959},
+    {{OOO_STRING_SVTOOLS_HTML_S_pi},			960},
+    {{OOO_STRING_SVTOOLS_HTML_S_rho},		961},
+    {{OOO_STRING_SVTOOLS_HTML_S_sigmaf},		962},
+    {{OOO_STRING_SVTOOLS_HTML_S_sigma},		963},
+    {{OOO_STRING_SVTOOLS_HTML_S_tau},		964},
+    {{OOO_STRING_SVTOOLS_HTML_S_upsilon},	965},
+    {{OOO_STRING_SVTOOLS_HTML_S_phi},		966},
+    {{OOO_STRING_SVTOOLS_HTML_S_chi},		967},
+    {{OOO_STRING_SVTOOLS_HTML_S_psi},		968},
+    {{OOO_STRING_SVTOOLS_HTML_S_omega},		969},
+    {{OOO_STRING_SVTOOLS_HTML_S_thetasym},	977},
+    {{OOO_STRING_SVTOOLS_HTML_S_upsih},		978},
+    {{OOO_STRING_SVTOOLS_HTML_S_piv},		982},
+    {{OOO_STRING_SVTOOLS_HTML_S_ensp},		8194},
+    {{OOO_STRING_SVTOOLS_HTML_S_emsp},		8195},
+    {{OOO_STRING_SVTOOLS_HTML_S_thinsp},		8201},
+    {{OOO_STRING_SVTOOLS_HTML_S_zwnj},		8204},
+    {{OOO_STRING_SVTOOLS_HTML_S_zwj},		8205},
+    {{OOO_STRING_SVTOOLS_HTML_S_lrm},		8206},
+    {{OOO_STRING_SVTOOLS_HTML_S_rlm},		8207},
+    {{OOO_STRING_SVTOOLS_HTML_S_ndash},		8211},
+    {{OOO_STRING_SVTOOLS_HTML_S_mdash},		8212},
+    {{OOO_STRING_SVTOOLS_HTML_S_lsquo},		8216},
+    {{OOO_STRING_SVTOOLS_HTML_S_rsquo},		8217},
+    {{OOO_STRING_SVTOOLS_HTML_S_sbquo},		8218},
+    {{OOO_STRING_SVTOOLS_HTML_S_ldquo},		8220},
+    {{OOO_STRING_SVTOOLS_HTML_S_rdquo},		8221},
+    {{OOO_STRING_SVTOOLS_HTML_S_bdquo},		8222},
+    {{OOO_STRING_SVTOOLS_HTML_S_dagger},		8224},
+    {{OOO_STRING_SVTOOLS_HTML_S_Dagger},		8225},
+    {{OOO_STRING_SVTOOLS_HTML_S_bull},		8226},
+    {{OOO_STRING_SVTOOLS_HTML_S_hellip},		8230},
+    {{OOO_STRING_SVTOOLS_HTML_S_permil},		8240},
+    {{OOO_STRING_SVTOOLS_HTML_S_prime},		8242},
+    {{OOO_STRING_SVTOOLS_HTML_S_Prime},		8243},
+    {{OOO_STRING_SVTOOLS_HTML_S_lsaquo},		8249},
+    {{OOO_STRING_SVTOOLS_HTML_S_rsaquo},		8250},
+    {{OOO_STRING_SVTOOLS_HTML_S_oline},		8254},
+    {{OOO_STRING_SVTOOLS_HTML_S_frasl},		8260},
+    {{OOO_STRING_SVTOOLS_HTML_S_euro},		8364},
+    {{OOO_STRING_SVTOOLS_HTML_S_image},		8465},
+    {{OOO_STRING_SVTOOLS_HTML_S_weierp},		8472},
+    {{OOO_STRING_SVTOOLS_HTML_S_real},		8476},
+    {{OOO_STRING_SVTOOLS_HTML_S_trade},		8482},
+    {{OOO_STRING_SVTOOLS_HTML_S_alefsym},	8501},
+    {{OOO_STRING_SVTOOLS_HTML_S_larr},		8592},
+    {{OOO_STRING_SVTOOLS_HTML_S_uarr},		8593},
+    {{OOO_STRING_SVTOOLS_HTML_S_rarr},		8594},
+    {{OOO_STRING_SVTOOLS_HTML_S_darr},		8595},
+    {{OOO_STRING_SVTOOLS_HTML_S_harr},		8596},
+    {{OOO_STRING_SVTOOLS_HTML_S_crarr},		8629},
+    {{OOO_STRING_SVTOOLS_HTML_S_lArr},		8656},
+    {{OOO_STRING_SVTOOLS_HTML_S_uArr},		8657},
+    {{OOO_STRING_SVTOOLS_HTML_S_rArr},		8658},
+    {{OOO_STRING_SVTOOLS_HTML_S_dArr},		8659},
+    {{OOO_STRING_SVTOOLS_HTML_S_hArr},		8660},
+    {{OOO_STRING_SVTOOLS_HTML_S_forall},		8704},
+    {{OOO_STRING_SVTOOLS_HTML_S_part},		8706},
+    {{OOO_STRING_SVTOOLS_HTML_S_exist},		8707},
+    {{OOO_STRING_SVTOOLS_HTML_S_empty},		8709},
+    {{OOO_STRING_SVTOOLS_HTML_S_nabla},		8711},
+    {{OOO_STRING_SVTOOLS_HTML_S_isin},		8712},
+    {{OOO_STRING_SVTOOLS_HTML_S_notin},		8713},
+    {{OOO_STRING_SVTOOLS_HTML_S_ni},			8715},
+    {{OOO_STRING_SVTOOLS_HTML_S_prod},		8719},
+    {{OOO_STRING_SVTOOLS_HTML_S_sum},		8721},
+    {{OOO_STRING_SVTOOLS_HTML_S_minus},		8722},
+    {{OOO_STRING_SVTOOLS_HTML_S_lowast},		8727},
+    {{OOO_STRING_SVTOOLS_HTML_S_radic},		8730},
+    {{OOO_STRING_SVTOOLS_HTML_S_prop},		8733},
+    {{OOO_STRING_SVTOOLS_HTML_S_infin},		8734},
+    {{OOO_STRING_SVTOOLS_HTML_S_ang},		8736},
+    {{OOO_STRING_SVTOOLS_HTML_S_and},		8743},
+    {{OOO_STRING_SVTOOLS_HTML_S_or},			8744},
+    {{OOO_STRING_SVTOOLS_HTML_S_cap},		8745},
+    {{OOO_STRING_SVTOOLS_HTML_S_cup},		8746},
+    {{OOO_STRING_SVTOOLS_HTML_S_int},		8747},
+    {{OOO_STRING_SVTOOLS_HTML_S_there4},		8756},
+    {{OOO_STRING_SVTOOLS_HTML_S_sim},		8764},
+    {{OOO_STRING_SVTOOLS_HTML_S_cong},		8773},
+    {{OOO_STRING_SVTOOLS_HTML_S_asymp},		8776},
+    {{OOO_STRING_SVTOOLS_HTML_S_ne},			8800},
+    {{OOO_STRING_SVTOOLS_HTML_S_equiv},		8801},
+    {{OOO_STRING_SVTOOLS_HTML_S_le},			8804},
+    {{OOO_STRING_SVTOOLS_HTML_S_ge},			8805},
+    {{OOO_STRING_SVTOOLS_HTML_S_sub},		8834},
+    {{OOO_STRING_SVTOOLS_HTML_S_sup},		8835},
+    {{OOO_STRING_SVTOOLS_HTML_S_nsub},		8836},
+    {{OOO_STRING_SVTOOLS_HTML_S_sube},		8838},
+    {{OOO_STRING_SVTOOLS_HTML_S_supe},		8839},
+    {{OOO_STRING_SVTOOLS_HTML_S_oplus},		8853},
+    {{OOO_STRING_SVTOOLS_HTML_S_otimes},		8855},
+    {{OOO_STRING_SVTOOLS_HTML_S_perp},		8869},
+    {{OOO_STRING_SVTOOLS_HTML_S_sdot},		8901},
+    {{OOO_STRING_SVTOOLS_HTML_S_lceil},		8968},
+    {{OOO_STRING_SVTOOLS_HTML_S_rceil},		8969},
+    {{OOO_STRING_SVTOOLS_HTML_S_lfloor},		8970},
+    {{OOO_STRING_SVTOOLS_HTML_S_rfloor},		8971},
+    {{OOO_STRING_SVTOOLS_HTML_S_lang},		9001},
+    {{OOO_STRING_SVTOOLS_HTML_S_rang},		9002},
+    {{OOO_STRING_SVTOOLS_HTML_S_loz},		9674},
+    {{OOO_STRING_SVTOOLS_HTML_S_spades},		9824},
+    {{OOO_STRING_SVTOOLS_HTML_S_clubs},		9827},
+    {{OOO_STRING_SVTOOLS_HTML_S_hearts},		9829},
+    {{OOO_STRING_SVTOOLS_HTML_S_diams},		9830}
 };
 
 extern "C"
@@ -585,7 +585,7 @@ static int
             nRet = strcmp( ((HTML_CharEntry*)pFirst)->sName,
                             ((HTML_CharEntry*)pSecond)->sName );
     }
-
+    
     return nRet;
 }
 
@@ -625,203 +625,203 @@ static int __FAR_DATA bSortOptionKeyWords = FALSE;
 static HTML_TokenEntry __FAR_DATA aHTMLOptionTab[] = {
 
 // Attribute ohne Wert
-    {{OOO_STRING_SVTOOLS_HTML_O_box},       HTML_O_BOX},
-    {{OOO_STRING_SVTOOLS_HTML_O_checked},   HTML_O_CHECKED},
-    {{OOO_STRING_SVTOOLS_HTML_O_compact},   HTML_O_COMPACT},
-    {{OOO_STRING_SVTOOLS_HTML_O_continue},  HTML_O_CONTINUE},
-    {{OOO_STRING_SVTOOLS_HTML_O_controls},  HTML_O_CONTROLS}, // IExplorer 2.0
-    {{OOO_STRING_SVTOOLS_HTML_O_declare},   HTML_O_DECLARE},
-    {{OOO_STRING_SVTOOLS_HTML_O_disabled},  HTML_O_DISABLED},
-    {{OOO_STRING_SVTOOLS_HTML_O_folded},        HTML_O_FOLDED}, // Netscape internal
-    {{OOO_STRING_SVTOOLS_HTML_O_ismap},     HTML_O_ISMAP},
-    {{OOO_STRING_SVTOOLS_HTML_O_mayscript}, HTML_O_MAYSCRIPT},
-    {{OOO_STRING_SVTOOLS_HTML_O_multiple},  HTML_O_MULTIPLE},
-    {{OOO_STRING_SVTOOLS_HTML_O_noflow},        HTML_O_NOFLOW},
-    {{OOO_STRING_SVTOOLS_HTML_O_nohref},        HTML_O_NOHREF}, // Netscape 2.0
-    {{OOO_STRING_SVTOOLS_HTML_O_noresize},  HTML_O_NORESIZE}, // Netscape 2.0
-    {{OOO_STRING_SVTOOLS_HTML_O_noshade},   HTML_O_NOSHADE}, // Netscape 2.0
-    {{OOO_STRING_SVTOOLS_HTML_O_nowrap},        HTML_O_NOWRAP},
-    {{OOO_STRING_SVTOOLS_HTML_O_plain},     HTML_O_PLAIN},
-    {{OOO_STRING_SVTOOLS_HTML_O_sdfixed},   HTML_O_SDFIXED},
-    {{OOO_STRING_SVTOOLS_HTML_O_selected},      HTML_O_SELECTED},
-    {{OOO_STRING_SVTOOLS_HTML_O_shapes},    HTML_O_SHAPES},
+    {{OOO_STRING_SVTOOLS_HTML_O_box},		HTML_O_BOX},
+    {{OOO_STRING_SVTOOLS_HTML_O_checked},	HTML_O_CHECKED},
+    {{OOO_STRING_SVTOOLS_HTML_O_compact},	HTML_O_COMPACT},
+    {{OOO_STRING_SVTOOLS_HTML_O_continue},	HTML_O_CONTINUE},
+    {{OOO_STRING_SVTOOLS_HTML_O_controls},	HTML_O_CONTROLS}, // IExplorer 2.0
+    {{OOO_STRING_SVTOOLS_HTML_O_declare},	HTML_O_DECLARE},
+    {{OOO_STRING_SVTOOLS_HTML_O_disabled},	HTML_O_DISABLED},
+    {{OOO_STRING_SVTOOLS_HTML_O_folded},		HTML_O_FOLDED}, // Netscape internal
+    {{OOO_STRING_SVTOOLS_HTML_O_ismap},		HTML_O_ISMAP},
+    {{OOO_STRING_SVTOOLS_HTML_O_mayscript},	HTML_O_MAYSCRIPT},
+    {{OOO_STRING_SVTOOLS_HTML_O_multiple},	HTML_O_MULTIPLE},
+    {{OOO_STRING_SVTOOLS_HTML_O_noflow},		HTML_O_NOFLOW},
+    {{OOO_STRING_SVTOOLS_HTML_O_nohref},		HTML_O_NOHREF}, // Netscape 2.0
+    {{OOO_STRING_SVTOOLS_HTML_O_noresize},	HTML_O_NORESIZE}, // Netscape 2.0
+    {{OOO_STRING_SVTOOLS_HTML_O_noshade},	HTML_O_NOSHADE}, // Netscape 2.0
+    {{OOO_STRING_SVTOOLS_HTML_O_nowrap},		HTML_O_NOWRAP},
+    {{OOO_STRING_SVTOOLS_HTML_O_plain},		HTML_O_PLAIN},
+    {{OOO_STRING_SVTOOLS_HTML_O_sdfixed},	HTML_O_SDFIXED},
+    {{OOO_STRING_SVTOOLS_HTML_O_selected},  	HTML_O_SELECTED},
+    {{OOO_STRING_SVTOOLS_HTML_O_shapes},  	HTML_O_SHAPES},
 
 // Attribute mit einem String als Wert
-    {{OOO_STRING_SVTOOLS_HTML_O_above},     HTML_O_ABOVE},
-    {{OOO_STRING_SVTOOLS_HTML_O_accept},        HTML_O_ACCEPT},
-    {{OOO_STRING_SVTOOLS_HTML_O_accesskey}, HTML_O_ACCESSKEY},
-    {{OOO_STRING_SVTOOLS_HTML_O_add_date},  HTML_O_ADD_DATE}, // Netscape internal
-    {{OOO_STRING_SVTOOLS_HTML_O_alt},       HTML_O_ALT},
-    {{OOO_STRING_SVTOOLS_HTML_O_axes},      HTML_O_AXES},
-    {{OOO_STRING_SVTOOLS_HTML_O_axis},      HTML_O_AXIS},
-    {{OOO_STRING_SVTOOLS_HTML_O_below},     HTML_O_BELOW},
-    {{OOO_STRING_SVTOOLS_HTML_O_char},      HTML_O_CHAR}, // HTML 3 Table Model Draft
-    {{OOO_STRING_SVTOOLS_HTML_O_class},     HTML_O_CLASS},
-    {{OOO_STRING_SVTOOLS_HTML_O_clip},      HTML_O_CLIP},
-    {{OOO_STRING_SVTOOLS_HTML_O_code},      HTML_O_CODE}, // HotJava
-    {{OOO_STRING_SVTOOLS_HTML_O_codetype},  HTML_O_CODETYPE},
-    {{OOO_STRING_SVTOOLS_HTML_O_colspec},   HTML_O_COLSPEC},
-    {{OOO_STRING_SVTOOLS_HTML_O_content},   HTML_O_CONTENT},
-    {{OOO_STRING_SVTOOLS_HTML_O_coords},        HTML_O_COORDS}, // Netscape 2.0
-    {{OOO_STRING_SVTOOLS_HTML_O_dp},            HTML_O_DP},
-    {{OOO_STRING_SVTOOLS_HTML_O_enctype},   HTML_O_ENCTYPE},
-    {{OOO_STRING_SVTOOLS_HTML_O_error},     HTML_O_ERROR},
-    {{OOO_STRING_SVTOOLS_HTML_O_face},      HTML_O_FACE}, // IExplorer 2.0
+    {{OOO_STRING_SVTOOLS_HTML_O_above},		HTML_O_ABOVE},
+    {{OOO_STRING_SVTOOLS_HTML_O_accept},		HTML_O_ACCEPT},
+    {{OOO_STRING_SVTOOLS_HTML_O_accesskey},	HTML_O_ACCESSKEY},
+    {{OOO_STRING_SVTOOLS_HTML_O_add_date},	HTML_O_ADD_DATE}, // Netscape internal
+    {{OOO_STRING_SVTOOLS_HTML_O_alt},		HTML_O_ALT},
+    {{OOO_STRING_SVTOOLS_HTML_O_axes},		HTML_O_AXES},
+    {{OOO_STRING_SVTOOLS_HTML_O_axis},		HTML_O_AXIS},
+    {{OOO_STRING_SVTOOLS_HTML_O_below},		HTML_O_BELOW},
+    {{OOO_STRING_SVTOOLS_HTML_O_char},		HTML_O_CHAR}, // HTML 3 Table Model Draft
+    {{OOO_STRING_SVTOOLS_HTML_O_class},		HTML_O_CLASS},
+    {{OOO_STRING_SVTOOLS_HTML_O_clip},		HTML_O_CLIP},
+    {{OOO_STRING_SVTOOLS_HTML_O_code},		HTML_O_CODE}, // HotJava
+    {{OOO_STRING_SVTOOLS_HTML_O_codetype},	HTML_O_CODETYPE},
+    {{OOO_STRING_SVTOOLS_HTML_O_colspec},	HTML_O_COLSPEC},
+    {{OOO_STRING_SVTOOLS_HTML_O_content},	HTML_O_CONTENT},
+    {{OOO_STRING_SVTOOLS_HTML_O_coords},		HTML_O_COORDS}, // Netscape 2.0
+    {{OOO_STRING_SVTOOLS_HTML_O_dp},			HTML_O_DP},
+    {{OOO_STRING_SVTOOLS_HTML_O_enctype},	HTML_O_ENCTYPE},
+    {{OOO_STRING_SVTOOLS_HTML_O_error},		HTML_O_ERROR},
+    {{OOO_STRING_SVTOOLS_HTML_O_face},		HTML_O_FACE}, // IExplorer 2.0
     {{OOO_STRING_SVTOOLS_HTML_O_frameborder}, HTML_O_FRAMEBORDER}, // IExplorer 3.0
-    {{OOO_STRING_SVTOOLS_HTML_O_httpequiv}, HTML_O_HTTPEQUIV},
-    {{OOO_STRING_SVTOOLS_HTML_O_language},  HTML_O_LANGUAGE}, // JavaScript
-    {{OOO_STRING_SVTOOLS_HTML_O_last_modified}, HTML_O_LAST_MODIFIED}, // Netscape internal
-    {{OOO_STRING_SVTOOLS_HTML_O_last_visit},    HTML_O_LAST_VISIT}, // Netscape internal
-    {{OOO_STRING_SVTOOLS_HTML_O_md},            HTML_O_MD},
-    {{OOO_STRING_SVTOOLS_HTML_O_n},         HTML_O_N},
-    {{OOO_STRING_SVTOOLS_HTML_O_name},      HTML_O_NAME},
-    {{OOO_STRING_SVTOOLS_HTML_O_notation},  HTML_O_NOTATION},
-    {{OOO_STRING_SVTOOLS_HTML_O_prompt},        HTML_O_PROMPT},
-    {{OOO_STRING_SVTOOLS_HTML_O_shape},     HTML_O_SHAPE},
-    {{OOO_STRING_SVTOOLS_HTML_O_standby},   HTML_O_STANDBY},
-    {{OOO_STRING_SVTOOLS_HTML_O_style},     HTML_O_STYLE},
-    {{OOO_STRING_SVTOOLS_HTML_O_title},     HTML_O_TITLE},
-    {{OOO_STRING_SVTOOLS_HTML_O_value},     HTML_O_VALUE},
-    {{OOO_STRING_SVTOOLS_HTML_O_SDval},     HTML_O_SDVAL}, // StarDiv NumberValue
-    {{OOO_STRING_SVTOOLS_HTML_O_SDnum},     HTML_O_SDNUM}, // StarDiv NumberFormat
-    {{OOO_STRING_SVTOOLS_HTML_O_sdlibrary}, HTML_O_SDLIBRARY},
-    {{OOO_STRING_SVTOOLS_HTML_O_sdmodule},  HTML_O_SDMODULE},
+    {{OOO_STRING_SVTOOLS_HTML_O_httpequiv},	HTML_O_HTTPEQUIV},
+    {{OOO_STRING_SVTOOLS_HTML_O_language},	HTML_O_LANGUAGE}, // JavaScript
+    {{OOO_STRING_SVTOOLS_HTML_O_last_modified},	HTML_O_LAST_MODIFIED}, // Netscape internal
+    {{OOO_STRING_SVTOOLS_HTML_O_last_visit},	HTML_O_LAST_VISIT}, // Netscape internal
+    {{OOO_STRING_SVTOOLS_HTML_O_md},			HTML_O_MD},
+    {{OOO_STRING_SVTOOLS_HTML_O_n},			HTML_O_N},
+    {{OOO_STRING_SVTOOLS_HTML_O_name},		HTML_O_NAME},
+    {{OOO_STRING_SVTOOLS_HTML_O_notation},	HTML_O_NOTATION},
+    {{OOO_STRING_SVTOOLS_HTML_O_prompt},		HTML_O_PROMPT},
+    {{OOO_STRING_SVTOOLS_HTML_O_shape},		HTML_O_SHAPE},
+    {{OOO_STRING_SVTOOLS_HTML_O_standby},	HTML_O_STANDBY},
+    {{OOO_STRING_SVTOOLS_HTML_O_style},		HTML_O_STYLE},
+    {{OOO_STRING_SVTOOLS_HTML_O_title},		HTML_O_TITLE},
+    {{OOO_STRING_SVTOOLS_HTML_O_value},		HTML_O_VALUE},
+    {{OOO_STRING_SVTOOLS_HTML_O_SDval},		HTML_O_SDVAL}, // StarDiv NumberValue
+    {{OOO_STRING_SVTOOLS_HTML_O_SDnum},		HTML_O_SDNUM}, // StarDiv NumberFormat
+    {{OOO_STRING_SVTOOLS_HTML_O_sdlibrary},	HTML_O_SDLIBRARY},
+    {{OOO_STRING_SVTOOLS_HTML_O_sdmodule},	HTML_O_SDMODULE},
 
 // Attribute mit einem SGML-Identifier als Wert
-    {{OOO_STRING_SVTOOLS_HTML_O_from},      HTML_O_FROM},
-    {{OOO_STRING_SVTOOLS_HTML_O_id},            HTML_O_ID},
-    {{OOO_STRING_SVTOOLS_HTML_O_target},        HTML_O_TARGET}, // Netscape 2.0
-    {{OOO_STRING_SVTOOLS_HTML_O_to},            HTML_O_TO},
-    {{OOO_STRING_SVTOOLS_HTML_O_until},     HTML_O_UNTIL},
+    {{OOO_STRING_SVTOOLS_HTML_O_from},		HTML_O_FROM},
+    {{OOO_STRING_SVTOOLS_HTML_O_id},			HTML_O_ID},
+    {{OOO_STRING_SVTOOLS_HTML_O_target},		HTML_O_TARGET}, // Netscape 2.0
+    {{OOO_STRING_SVTOOLS_HTML_O_to},			HTML_O_TO},
+    {{OOO_STRING_SVTOOLS_HTML_O_until},		HTML_O_UNTIL},
 
 // Attribute mit einem URI als Wert
-    {{OOO_STRING_SVTOOLS_HTML_O_action},        HTML_O_ACTION},
-    {{OOO_STRING_SVTOOLS_HTML_O_archive},       HTML_O_ARCHIVE},
-    {{OOO_STRING_SVTOOLS_HTML_O_background},    HTML_O_BACKGROUND},
-    {{OOO_STRING_SVTOOLS_HTML_O_classid},   HTML_O_CLASSID},
-    {{OOO_STRING_SVTOOLS_HTML_O_codebase},  HTML_O_CODEBASE}, // HotJava
-    {{OOO_STRING_SVTOOLS_HTML_O_data},      HTML_O_DATA},
-    {{OOO_STRING_SVTOOLS_HTML_O_dynsrc},        HTML_O_DYNSRC}, // IExplorer 3.0b1
-    {{OOO_STRING_SVTOOLS_HTML_O_dynsync},   HTML_O_DYNSYNC}, // IExplorer 2.0
-    {{OOO_STRING_SVTOOLS_HTML_O_imagemap},  HTML_O_IMAGEMAP},
-    {{OOO_STRING_SVTOOLS_HTML_O_href},      HTML_O_HREF},
-    {{OOO_STRING_SVTOOLS_HTML_O_lowsrc},        HTML_O_LOWSRC}, // Netscape 3.0
-    {{OOO_STRING_SVTOOLS_HTML_O_script},        HTML_O_SCRIPT},
-    {{OOO_STRING_SVTOOLS_HTML_O_src},       HTML_O_SRC},
-    {{OOO_STRING_SVTOOLS_HTML_O_usemap},        HTML_O_USEMAP}, // Netscape 2.0
+    {{OOO_STRING_SVTOOLS_HTML_O_action},		HTML_O_ACTION},
+    {{OOO_STRING_SVTOOLS_HTML_O_archive},		HTML_O_ARCHIVE},
+    {{OOO_STRING_SVTOOLS_HTML_O_background},	HTML_O_BACKGROUND},
+    {{OOO_STRING_SVTOOLS_HTML_O_classid},	HTML_O_CLASSID},
+    {{OOO_STRING_SVTOOLS_HTML_O_codebase},	HTML_O_CODEBASE}, // HotJava
+    {{OOO_STRING_SVTOOLS_HTML_O_data},		HTML_O_DATA},
+    {{OOO_STRING_SVTOOLS_HTML_O_dynsrc},		HTML_O_DYNSRC}, // IExplorer 3.0b1
+    {{OOO_STRING_SVTOOLS_HTML_O_dynsync},	HTML_O_DYNSYNC}, // IExplorer 2.0
+    {{OOO_STRING_SVTOOLS_HTML_O_imagemap},	HTML_O_IMAGEMAP},
+    {{OOO_STRING_SVTOOLS_HTML_O_href},		HTML_O_HREF},
+    {{OOO_STRING_SVTOOLS_HTML_O_lowsrc},		HTML_O_LOWSRC}, // Netscape 3.0
+    {{OOO_STRING_SVTOOLS_HTML_O_script},		HTML_O_SCRIPT},
+    {{OOO_STRING_SVTOOLS_HTML_O_src},		HTML_O_SRC},
+    {{OOO_STRING_SVTOOLS_HTML_O_usemap},		HTML_O_USEMAP}, // Netscape 2.0
 
 // Attribute mit Entity-Namen als Wert
-    {{OOO_STRING_SVTOOLS_HTML_O_dingbat},   HTML_O_DINGBAT},
-    {{OOO_STRING_SVTOOLS_HTML_O_sym},       HTML_O_SYM},
+    {{OOO_STRING_SVTOOLS_HTML_O_dingbat},	HTML_O_DINGBAT},
+    {{OOO_STRING_SVTOOLS_HTML_O_sym},		HTML_O_SYM},
 
 // Attribute mit einer Farbe als Wert (alle Netscape)
-    {{OOO_STRING_SVTOOLS_HTML_O_alink},     HTML_O_ALINK},
-    {{OOO_STRING_SVTOOLS_HTML_O_bgcolor},   HTML_O_BGCOLOR},
+    {{OOO_STRING_SVTOOLS_HTML_O_alink},		HTML_O_ALINK},
+    {{OOO_STRING_SVTOOLS_HTML_O_bgcolor},	HTML_O_BGCOLOR},
     {{OOO_STRING_SVTOOLS_HTML_O_bordercolor}, HTML_O_BORDERCOLOR}, // IExplorer 2.0
     {{OOO_STRING_SVTOOLS_HTML_O_bordercolorlight}, HTML_O_BORDERCOLORLIGHT}, // IExplorer 2.0
     {{OOO_STRING_SVTOOLS_HTML_O_bordercolordark}, HTML_O_BORDERCOLORDARK}, // IExplorer 2.0
-    {{OOO_STRING_SVTOOLS_HTML_O_color},     HTML_O_COLOR},
-    {{OOO_STRING_SVTOOLS_HTML_O_link},      HTML_O_LINK},
-    {{OOO_STRING_SVTOOLS_HTML_O_text},      HTML_O_TEXT},
-    {{OOO_STRING_SVTOOLS_HTML_O_vlink},     HTML_O_VLINK},
+    {{OOO_STRING_SVTOOLS_HTML_O_color},		HTML_O_COLOR},
+    {{OOO_STRING_SVTOOLS_HTML_O_link},		HTML_O_LINK},
+    {{OOO_STRING_SVTOOLS_HTML_O_text},		HTML_O_TEXT},
+    {{OOO_STRING_SVTOOLS_HTML_O_vlink},		HTML_O_VLINK},
 
 // Attribute mit einem numerischen Wert
-    {{OOO_STRING_SVTOOLS_HTML_O_border},        HTML_O_BORDER},
+    {{OOO_STRING_SVTOOLS_HTML_O_border},		HTML_O_BORDER},
     {{OOO_STRING_SVTOOLS_HTML_O_cellspacing},HTML_O_CELLSPACING}, // HTML 3 Table Model Draft
     {{OOO_STRING_SVTOOLS_HTML_O_cellpadding},HTML_O_CELLPADDING}, // HTML 3 Table Model Draft
-    {{OOO_STRING_SVTOOLS_HTML_O_charoff},   HTML_O_CHAROFF}, // HTML 3 Table Model Draft
-    {{OOO_STRING_SVTOOLS_HTML_O_colspan},   HTML_O_COLSPAN},
+    {{OOO_STRING_SVTOOLS_HTML_O_charoff},	HTML_O_CHAROFF}, // HTML 3 Table Model Draft
+    {{OOO_STRING_SVTOOLS_HTML_O_colspan},	HTML_O_COLSPAN},
     {{OOO_STRING_SVTOOLS_HTML_O_framespacing}, HTML_O_FRAMESPACING}, // IExplorer 3.0
-    {{OOO_STRING_SVTOOLS_HTML_O_gutter},        HTML_O_GUTTER}, // Netscape 3.0b5
-    {{OOO_STRING_SVTOOLS_HTML_O_indent},        HTML_O_INDENT},
-    {{OOO_STRING_SVTOOLS_HTML_O_height},        HTML_O_HEIGHT},
-    {{OOO_STRING_SVTOOLS_HTML_O_hspace},        HTML_O_HSPACE}, // Netscape
-    {{OOO_STRING_SVTOOLS_HTML_O_left},      HTML_O_LEFT},
-    {{OOO_STRING_SVTOOLS_HTML_O_leftmargin},    HTML_O_LEFTMARGIN}, // IExplorer 2.0
-    {{OOO_STRING_SVTOOLS_HTML_O_loop},      HTML_O_LOOP}, // IExplorer 2.0
+    {{OOO_STRING_SVTOOLS_HTML_O_gutter},		HTML_O_GUTTER}, // Netscape 3.0b5
+    {{OOO_STRING_SVTOOLS_HTML_O_indent},		HTML_O_INDENT},
+    {{OOO_STRING_SVTOOLS_HTML_O_height},		HTML_O_HEIGHT},
+    {{OOO_STRING_SVTOOLS_HTML_O_hspace},		HTML_O_HSPACE}, // Netscape
+    {{OOO_STRING_SVTOOLS_HTML_O_left},		HTML_O_LEFT},
+    {{OOO_STRING_SVTOOLS_HTML_O_leftmargin},	HTML_O_LEFTMARGIN}, // IExplorer 2.0
+    {{OOO_STRING_SVTOOLS_HTML_O_loop}, 		HTML_O_LOOP}, // IExplorer 2.0
     {{OOO_STRING_SVTOOLS_HTML_O_marginheight},HTML_O_MARGINHEIGHT}, // Netscape 2.0
     {{OOO_STRING_SVTOOLS_HTML_O_marginwidth},HTML_O_MARGINWIDTH}, // Netscape 2.0
-    {{OOO_STRING_SVTOOLS_HTML_O_max},       HTML_O_MAX},
-    {{OOO_STRING_SVTOOLS_HTML_O_maxlength}, HTML_O_MAXLENGTH},
-    {{OOO_STRING_SVTOOLS_HTML_O_min},       HTML_O_MIN},
-    {{OOO_STRING_SVTOOLS_HTML_O_pagex},     HTML_O_PAGEX},
-    {{OOO_STRING_SVTOOLS_HTML_O_pagey},     HTML_O_PAGEY},
-    {{OOO_STRING_SVTOOLS_HTML_O_pointsize}, HTML_O_POINTSIZE},
-    {{OOO_STRING_SVTOOLS_HTML_O_rowspan},   HTML_O_ROWSPAN},
+    {{OOO_STRING_SVTOOLS_HTML_O_max},		HTML_O_MAX},
+    {{OOO_STRING_SVTOOLS_HTML_O_maxlength},	HTML_O_MAXLENGTH},
+    {{OOO_STRING_SVTOOLS_HTML_O_min},		HTML_O_MIN},
+    {{OOO_STRING_SVTOOLS_HTML_O_pagex},		HTML_O_PAGEX},
+    {{OOO_STRING_SVTOOLS_HTML_O_pagey},		HTML_O_PAGEY},
+    {{OOO_STRING_SVTOOLS_HTML_O_pointsize},	HTML_O_POINTSIZE},
+    {{OOO_STRING_SVTOOLS_HTML_O_rowspan},	HTML_O_ROWSPAN},
     {{OOO_STRING_SVTOOLS_HTML_O_scrollamount}, HTML_O_SCROLLAMOUNT}, // IExplorer 2.0
     {{OOO_STRING_SVTOOLS_HTML_O_scrolldelay}, HTML_O_SCROLLDELAY}, // IExplorer 2.0
-    {{OOO_STRING_SVTOOLS_HTML_O_seqnum},        HTML_O_SEQNUM},
-    {{OOO_STRING_SVTOOLS_HTML_O_skip},      HTML_O_SKIP},
-    {{OOO_STRING_SVTOOLS_HTML_O_span},      HTML_O_SPAN}, // HTML 3 Table Model Draft
-    {{OOO_STRING_SVTOOLS_HTML_O_tabindex},  HTML_O_TABINDEX},
-    {{OOO_STRING_SVTOOLS_HTML_O_top},       HTML_O_TOP},
-    {{OOO_STRING_SVTOOLS_HTML_O_topmargin}, HTML_O_TOPMARGIN}, // IExplorer 2.0
-    {{OOO_STRING_SVTOOLS_HTML_O_vspace},        HTML_O_VSPACE}, // Netscape
-    {{OOO_STRING_SVTOOLS_HTML_O_weight},        HTML_O_WEIGHT},
-    {{OOO_STRING_SVTOOLS_HTML_O_width},     HTML_O_WIDTH},
-    {{OOO_STRING_SVTOOLS_HTML_O_x},         HTML_O_X},
-    {{OOO_STRING_SVTOOLS_HTML_O_y},         HTML_O_Y},
-    {{OOO_STRING_SVTOOLS_HTML_O_zindex},        HTML_O_ZINDEX},
+    {{OOO_STRING_SVTOOLS_HTML_O_seqnum},		HTML_O_SEQNUM},
+    {{OOO_STRING_SVTOOLS_HTML_O_skip},		HTML_O_SKIP},
+    {{OOO_STRING_SVTOOLS_HTML_O_span},		HTML_O_SPAN}, // HTML 3 Table Model Draft
+    {{OOO_STRING_SVTOOLS_HTML_O_tabindex},	HTML_O_TABINDEX},
+    {{OOO_STRING_SVTOOLS_HTML_O_top},		HTML_O_TOP},
+    {{OOO_STRING_SVTOOLS_HTML_O_topmargin},	HTML_O_TOPMARGIN}, // IExplorer 2.0
+    {{OOO_STRING_SVTOOLS_HTML_O_vspace},		HTML_O_VSPACE}, // Netscape
+    {{OOO_STRING_SVTOOLS_HTML_O_weight},		HTML_O_WEIGHT},
+    {{OOO_STRING_SVTOOLS_HTML_O_width},		HTML_O_WIDTH},
+    {{OOO_STRING_SVTOOLS_HTML_O_x},			HTML_O_X},
+    {{OOO_STRING_SVTOOLS_HTML_O_y},			HTML_O_Y},
+    {{OOO_STRING_SVTOOLS_HTML_O_zindex},		HTML_O_ZINDEX},
 
 // Attribute mit Enum-Werten
     {{OOO_STRING_SVTOOLS_HTML_O_bgproperties}, HTML_O_BGPROPERTIES}, // IExplorer 2.0
-    {{OOO_STRING_SVTOOLS_HTML_O_behavior},  HTML_O_BEHAVIOR}, // IExplorer 2.0
-    {{OOO_STRING_SVTOOLS_HTML_O_clear},     HTML_O_CLEAR},
-    {{OOO_STRING_SVTOOLS_HTML_O_dir},       HTML_O_DIR}, // HTML 3 Table Model Draft
-    {{OOO_STRING_SVTOOLS_HTML_O_direction},     HTML_O_DIRECTION}, // IExplorer 2.0
-    {{OOO_STRING_SVTOOLS_HTML_O_format},        HTML_O_FORMAT},
-    {{OOO_STRING_SVTOOLS_HTML_O_frame},     HTML_O_FRAME}, // HTML 3 Table Model Draft
-    {{OOO_STRING_SVTOOLS_HTML_O_lang},      HTML_O_LANG},
-    {{OOO_STRING_SVTOOLS_HTML_O_method},        HTML_O_METHOD},
-    {{OOO_STRING_SVTOOLS_HTML_O_palette},   HTML_O_PALETTE},
-    {{OOO_STRING_SVTOOLS_HTML_O_rel},       HTML_O_REL},
-    {{OOO_STRING_SVTOOLS_HTML_O_rev},       HTML_O_REV},
-    {{OOO_STRING_SVTOOLS_HTML_O_rules},     HTML_O_RULES}, // HTML 3 Table Model Draft
-    {{OOO_STRING_SVTOOLS_HTML_O_scrolling}, HTML_O_SCROLLING}, // Netscape 2.0
-    {{OOO_STRING_SVTOOLS_HTML_O_sdreadonly},    HTML_O_SDREADONLY},
-    {{OOO_STRING_SVTOOLS_HTML_O_subtype},   HTML_O_SUBTYPE},
-    {{OOO_STRING_SVTOOLS_HTML_O_type},      HTML_O_TYPE},
-    {{OOO_STRING_SVTOOLS_HTML_O_valign},        HTML_O_VALIGN},
-    {{OOO_STRING_SVTOOLS_HTML_O_valuetype}, HTML_O_VALUETYPE},
-    {{OOO_STRING_SVTOOLS_HTML_O_wrap},      HTML_O_WRAP},
-    {{OOO_STRING_SVTOOLS_HTML_O_visibility},    HTML_O_VISIBILITY},
+    {{OOO_STRING_SVTOOLS_HTML_O_behavior}, 	HTML_O_BEHAVIOR}, // IExplorer 2.0
+    {{OOO_STRING_SVTOOLS_HTML_O_clear},		HTML_O_CLEAR},
+    {{OOO_STRING_SVTOOLS_HTML_O_dir},		HTML_O_DIR}, // HTML 3 Table Model Draft
+    {{OOO_STRING_SVTOOLS_HTML_O_direction}, 	HTML_O_DIRECTION}, // IExplorer 2.0
+    {{OOO_STRING_SVTOOLS_HTML_O_format},		HTML_O_FORMAT},
+    {{OOO_STRING_SVTOOLS_HTML_O_frame},		HTML_O_FRAME}, // HTML 3 Table Model Draft
+    {{OOO_STRING_SVTOOLS_HTML_O_lang},		HTML_O_LANG},
+    {{OOO_STRING_SVTOOLS_HTML_O_method},		HTML_O_METHOD},
+    {{OOO_STRING_SVTOOLS_HTML_O_palette},	HTML_O_PALETTE},
+    {{OOO_STRING_SVTOOLS_HTML_O_rel},		HTML_O_REL},
+    {{OOO_STRING_SVTOOLS_HTML_O_rev},		HTML_O_REV},
+    {{OOO_STRING_SVTOOLS_HTML_O_rules},		HTML_O_RULES}, // HTML 3 Table Model Draft
+    {{OOO_STRING_SVTOOLS_HTML_O_scrolling},	HTML_O_SCROLLING}, // Netscape 2.0
+    {{OOO_STRING_SVTOOLS_HTML_O_sdreadonly},	HTML_O_SDREADONLY},
+    {{OOO_STRING_SVTOOLS_HTML_O_subtype},	HTML_O_SUBTYPE},
+    {{OOO_STRING_SVTOOLS_HTML_O_type},		HTML_O_TYPE},
+    {{OOO_STRING_SVTOOLS_HTML_O_valign},		HTML_O_VALIGN},
+    {{OOO_STRING_SVTOOLS_HTML_O_valuetype},	HTML_O_VALUETYPE},
+    {{OOO_STRING_SVTOOLS_HTML_O_wrap},		HTML_O_WRAP},
+    {{OOO_STRING_SVTOOLS_HTML_O_visibility},	HTML_O_VISIBILITY},
 
 // Attribute mit Script-Code als Wert
-    {{OOO_STRING_SVTOOLS_HTML_O_onblur},        HTML_O_ONBLUR}, // JavaScript
-    {{OOO_STRING_SVTOOLS_HTML_O_onchange},  HTML_O_ONCHANGE}, // JavaScript
-    {{OOO_STRING_SVTOOLS_HTML_O_onclick},   HTML_O_ONCLICK}, // JavaScript
-    {{OOO_STRING_SVTOOLS_HTML_O_onfocus},   HTML_O_ONFOCUS}, // JavaScript
-    {{OOO_STRING_SVTOOLS_HTML_O_onload},    HTML_O_ONLOAD}, // JavaScript
+    {{OOO_STRING_SVTOOLS_HTML_O_onblur},		HTML_O_ONBLUR}, // JavaScript
+    {{OOO_STRING_SVTOOLS_HTML_O_onchange}, 	HTML_O_ONCHANGE}, // JavaScript
+    {{OOO_STRING_SVTOOLS_HTML_O_onclick}, 	HTML_O_ONCLICK}, // JavaScript
+    {{OOO_STRING_SVTOOLS_HTML_O_onfocus}, 	HTML_O_ONFOCUS}, // JavaScript
+    {{OOO_STRING_SVTOOLS_HTML_O_onload}, 	HTML_O_ONLOAD}, // JavaScript
     {{OOO_STRING_SVTOOLS_HTML_O_onmouseover}, HTML_O_ONMOUSEOVER}, // JavaScript
-    {{OOO_STRING_SVTOOLS_HTML_O_onreset},   HTML_O_ONRESET}, // JavaScript
-    {{OOO_STRING_SVTOOLS_HTML_O_onselect},  HTML_O_ONSELECT}, // JavaScript
-    {{OOO_STRING_SVTOOLS_HTML_O_onsubmit},  HTML_O_ONSUBMIT}, // JavaScript
-    {{OOO_STRING_SVTOOLS_HTML_O_onunload},  HTML_O_ONUNLOAD}, // JavaScript
-    {{OOO_STRING_SVTOOLS_HTML_O_onabort},   HTML_O_ONABORT}, // JavaScript
-    {{OOO_STRING_SVTOOLS_HTML_O_onerror},   HTML_O_ONERROR}, // JavaScript
-    {{OOO_STRING_SVTOOLS_HTML_O_onmouseout},    HTML_O_ONMOUSEOUT}, // JavaScript
-
-    {{OOO_STRING_SVTOOLS_HTML_O_SDonblur},      HTML_O_SDONBLUR}, // StarBasic
-    {{OOO_STRING_SVTOOLS_HTML_O_SDonchange},    HTML_O_SDONCHANGE}, // StarBasic
-    {{OOO_STRING_SVTOOLS_HTML_O_SDonclick},         HTML_O_SDONCLICK}, // StarBasic
-    {{OOO_STRING_SVTOOLS_HTML_O_SDonfocus},         HTML_O_SDONFOCUS}, // StarBasic
-    {{OOO_STRING_SVTOOLS_HTML_O_SDonload},      HTML_O_SDONLOAD}, // StarBasic
-    {{OOO_STRING_SVTOOLS_HTML_O_SDonmouseover},     HTML_O_SDONMOUSEOVER}, // StarBasic
-    {{OOO_STRING_SVTOOLS_HTML_O_SDonreset},     HTML_O_SDONRESET}, // StarBasic
-    {{OOO_STRING_SVTOOLS_HTML_O_SDonselect},        HTML_O_SDONSELECT}, // StarBasic
-    {{OOO_STRING_SVTOOLS_HTML_O_SDonsubmit},        HTML_O_SDONSUBMIT}, // StarBasic
-    {{OOO_STRING_SVTOOLS_HTML_O_SDonunload},        HTML_O_SDONUNLOAD}, // StarBasic
-    {{OOO_STRING_SVTOOLS_HTML_O_SDonabort},     HTML_O_SDONABORT}, // StarBasic
-    {{OOO_STRING_SVTOOLS_HTML_O_SDonerror},         HTML_O_SDONERROR}, // StarBasic
-    {{OOO_STRING_SVTOOLS_HTML_O_SDonmouseout},  HTML_O_SDONMOUSEOUT}, // StarBasic
+    {{OOO_STRING_SVTOOLS_HTML_O_onreset},	HTML_O_ONRESET}, // JavaScript
+    {{OOO_STRING_SVTOOLS_HTML_O_onselect},	HTML_O_ONSELECT}, // JavaScript
+    {{OOO_STRING_SVTOOLS_HTML_O_onsubmit},	HTML_O_ONSUBMIT}, // JavaScript
+    {{OOO_STRING_SVTOOLS_HTML_O_onunload},	HTML_O_ONUNLOAD}, // JavaScript
+    {{OOO_STRING_SVTOOLS_HTML_O_onabort},	HTML_O_ONABORT}, // JavaScript
+    {{OOO_STRING_SVTOOLS_HTML_O_onerror}, 	HTML_O_ONERROR}, // JavaScript
+    {{OOO_STRING_SVTOOLS_HTML_O_onmouseout},	HTML_O_ONMOUSEOUT}, // JavaScript
+
+    {{OOO_STRING_SVTOOLS_HTML_O_SDonblur},		HTML_O_SDONBLUR}, // StarBasic
+    {{OOO_STRING_SVTOOLS_HTML_O_SDonchange}, 	HTML_O_SDONCHANGE}, // StarBasic
+    {{OOO_STRING_SVTOOLS_HTML_O_SDonclick}, 		HTML_O_SDONCLICK}, // StarBasic
+    {{OOO_STRING_SVTOOLS_HTML_O_SDonfocus}, 		HTML_O_SDONFOCUS}, // StarBasic
+    {{OOO_STRING_SVTOOLS_HTML_O_SDonload}, 		HTML_O_SDONLOAD}, // StarBasic
+    {{OOO_STRING_SVTOOLS_HTML_O_SDonmouseover}, 	HTML_O_SDONMOUSEOVER}, // StarBasic
+    {{OOO_STRING_SVTOOLS_HTML_O_SDonreset},		HTML_O_SDONRESET}, // StarBasic
+    {{OOO_STRING_SVTOOLS_HTML_O_SDonselect},		HTML_O_SDONSELECT}, // StarBasic
+    {{OOO_STRING_SVTOOLS_HTML_O_SDonsubmit},		HTML_O_SDONSUBMIT}, // StarBasic
+    {{OOO_STRING_SVTOOLS_HTML_O_SDonunload},		HTML_O_SDONUNLOAD}, // StarBasic
+    {{OOO_STRING_SVTOOLS_HTML_O_SDonabort},		HTML_O_SDONABORT}, // StarBasic
+    {{OOO_STRING_SVTOOLS_HTML_O_SDonerror}, 		HTML_O_SDONERROR}, // StarBasic
+    {{OOO_STRING_SVTOOLS_HTML_O_SDonmouseout},	HTML_O_SDONMOUSEOUT}, // StarBasic
 
 // Attribute mit Kontext-abhaengigen Werten
-    {{OOO_STRING_SVTOOLS_HTML_O_align},     HTML_O_ALIGN},
-    {{OOO_STRING_SVTOOLS_HTML_O_cols},      HTML_O_COLS}, // Netscape 2.0 vs HTML 2.0
-    {{OOO_STRING_SVTOOLS_HTML_O_rows},      HTML_O_ROWS}, // Netscape 2.0 vs HTML 2.0
-    {{OOO_STRING_SVTOOLS_HTML_O_size},      HTML_O_SIZE},
-    {{OOO_STRING_SVTOOLS_HTML_O_start},     HTML_O_START}, // Netscape 2.0 vs IExplorer 2.0
-    {{OOO_STRING_SVTOOLS_HTML_O_units},     HTML_O_UNITS}
+    {{OOO_STRING_SVTOOLS_HTML_O_align},		HTML_O_ALIGN},
+    {{OOO_STRING_SVTOOLS_HTML_O_cols},		HTML_O_COLS}, // Netscape 2.0 vs HTML 2.0
+    {{OOO_STRING_SVTOOLS_HTML_O_rows},		HTML_O_ROWS}, // Netscape 2.0 vs HTML 2.0
+    {{OOO_STRING_SVTOOLS_HTML_O_size},		HTML_O_SIZE},
+    {{OOO_STRING_SVTOOLS_HTML_O_start},		HTML_O_START}, // Netscape 2.0 vs IExplorer 2.0
+    {{OOO_STRING_SVTOOLS_HTML_O_units},		HTML_O_UNITS}
 };
 
 int GetHTMLOption( const String& rName )
@@ -855,7 +855,7 @@ int GetHTMLOption( const String& rName )
 // Flag: Farb-Tabelle wurde schon sortiert
 struct HTML_ColorEntry
 {
-    union
+    union 
     {
         const sal_Char* sName;
         const String *pUName;
@@ -1046,7 +1046,7 @@ static int
             nRet = strcmp( ((HTML_ColorEntry*)pFirst)->sName,
                             ((HTML_ColorEntry*)pSecond)->sName );
     }
-
+    
     return nRet;
 }
 
diff --git a/svtools/source/svhtml/htmlout.cxx b/svtools/source/svhtml/htmlout.cxx
index af0d0dff9667..28d19243bb0b 100644
--- a/svtools/source/svhtml/htmlout.cxx
+++ b/svtools/source/svhtml/htmlout.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
@@ -57,14 +57,14 @@ const sal_Char __FAR_DATA HTMLOutFuncs::sNewLine[] = "\015\012";
 
 HTMLOutContext::HTMLOutContext( rtl_TextEncoding eDestEnc )
 {
-    m_eDestEnc = RTL_TEXTENCODING_DONTKNOW == eDestEnc
+    m_eDestEnc = RTL_TEXTENCODING_DONTKNOW == eDestEnc 
                     ? gsl_getSystemTextEncoding()
                     : eDestEnc;
 
     m_hConv = rtl_createUnicodeToTextConverter( eDestEnc );
-    DBG_ASSERT( m_hConv,
+    DBG_ASSERT( m_hConv, 
         "HTMLOutContext::HTMLOutContext: no converter for source encoding" );
-    m_hContext = m_hConv ? rtl_createUnicodeToTextContext( m_hConv )
+    m_hContext = m_hConv ? rtl_createUnicodeToTextContext( m_hConv ) 
                      : (rtl_TextToUnicodeContext)1;
 }
 
@@ -74,7 +74,7 @@ HTMLOutContext::~HTMLOutContext()
     rtl_destroyUnicodeToTextConverter( m_hConv );
 }
 
-const sal_Char *lcl_svhtml_GetEntityForChar( sal_Unicode c,
+const sal_Char *lcl_svhtml_GetEntityForChar( sal_Unicode c, 
                                              rtl_TextEncoding eDestEnc )
 {
     const sal_Char* pStr = 0;
@@ -92,29 +92,29 @@ const sal_Char *lcl_svhtml_GetEntityForChar( sal_Unicode c,
         case 184: // ccedil
         case 193: // Aacute
         case 194: // Acirc
-        case 196: // Auml
+        case 196: // Auml 
         case 199: // Ccedil
         case 201: // Eacute
-        case 203: // Euml
+        case 203: // Euml 
         case 205: // Iacute
         case 206: // Icirc
         case 211: // Oacute
         case 212: // Ocirc
-        case 214: // Ouml
+        case 214: // Ouml 
         case 215: // times
         case 218: // Uacute
-        case 220: // Uuml
+        case 220: // Uuml 
         case 221: // Yacute
         case 225: // aacute
         case 226: // acirc
-        case 228: // auml
+        case 228: // auml 
         case 233: // eacute
-        case 235: // euml
+        case 235: // euml 
         case 237: // iacute
         case 238: // icirc
         case 243: // oacute
         case 244: // ocirc
-        case 246: // ouml
+        case 246: // ouml 
         case 247: // divide
         case 250: // uacute
         case 252: // uuml
@@ -129,216 +129,216 @@ const sal_Char *lcl_svhtml_GetEntityForChar( sal_Unicode c,
 
     switch( c )
     {
-//      case '\x0a':   return HTMLOutFuncs::Out_Tag( rStream, OOO_STRING_SVTOOLS_HTML_linebreak );
-
-    case '<':       pStr = OOO_STRING_SVTOOLS_HTML_C_lt;        break;
-    case '>':       pStr = OOO_STRING_SVTOOLS_HTML_C_gt;        break;
-    case '&':       pStr = OOO_STRING_SVTOOLS_HTML_C_amp;       break;
-    case '"':       pStr = OOO_STRING_SVTOOLS_HTML_C_quot;  break;
-
-    case 161:       pStr = OOO_STRING_SVTOOLS_HTML_S_iexcl; break;
-    case 162:       pStr = OOO_STRING_SVTOOLS_HTML_S_cent;  break;
-    case 163:       pStr = OOO_STRING_SVTOOLS_HTML_S_pound; break;
-    case 164:       pStr = OOO_STRING_SVTOOLS_HTML_S_curren;    break;
-    case 165:       pStr = OOO_STRING_SVTOOLS_HTML_S_yen;       break;
-    case 166:       pStr = OOO_STRING_SVTOOLS_HTML_S_brvbar;    break;
-    case 167:       pStr = OOO_STRING_SVTOOLS_HTML_S_sect;  break;
-    case 168:       pStr = OOO_STRING_SVTOOLS_HTML_S_uml;       break;
-    case 169:       pStr = OOO_STRING_SVTOOLS_HTML_S_copy;  break;
-    case 170:       pStr = OOO_STRING_SVTOOLS_HTML_S_ordf;  break;
-    case 171:       pStr = OOO_STRING_SVTOOLS_HTML_S_laquo; break;
-    case 172:       pStr = OOO_STRING_SVTOOLS_HTML_S_not;       break;
-    case 174:       pStr = OOO_STRING_SVTOOLS_HTML_S_reg;       break;
-    case 175:       pStr = OOO_STRING_SVTOOLS_HTML_S_macr;  break;
-    case 176:       pStr = OOO_STRING_SVTOOLS_HTML_S_deg;       break;
-    case 177:       pStr = OOO_STRING_SVTOOLS_HTML_S_plusmn;    break;
-    case 178:       pStr = OOO_STRING_SVTOOLS_HTML_S_sup2;  break;
-    case 179:       pStr = OOO_STRING_SVTOOLS_HTML_S_sup3;  break;
-    case 180:       pStr = OOO_STRING_SVTOOLS_HTML_S_acute; break;
-    case 181:       pStr = OOO_STRING_SVTOOLS_HTML_S_micro; break;
-    case 182:       pStr = OOO_STRING_SVTOOLS_HTML_S_para;  break;
-    case 183:       pStr = OOO_STRING_SVTOOLS_HTML_S_middot;    break;
-    case 184:       pStr = OOO_STRING_SVTOOLS_HTML_S_cedil; break;
-    case 185:       pStr = OOO_STRING_SVTOOLS_HTML_S_sup1;  break;
-    case 186:       pStr = OOO_STRING_SVTOOLS_HTML_S_ordm;  break;
-    case 187:       pStr = OOO_STRING_SVTOOLS_HTML_S_raquo; break;
-    case 188:       pStr = OOO_STRING_SVTOOLS_HTML_S_frac14;    break;
-    case 189:       pStr = OOO_STRING_SVTOOLS_HTML_S_frac12;    break;
-    case 190:       pStr = OOO_STRING_SVTOOLS_HTML_S_frac34;    break;
-    case 191:       pStr = OOO_STRING_SVTOOLS_HTML_S_iquest;    break;
-
-    case 192:       pStr = OOO_STRING_SVTOOLS_HTML_C_Agrave;    break;
-    case 193:       pStr = OOO_STRING_SVTOOLS_HTML_C_Aacute;    break;
-    case 194:       pStr = OOO_STRING_SVTOOLS_HTML_C_Acirc; break;
-    case 195:       pStr = OOO_STRING_SVTOOLS_HTML_C_Atilde;    break;
-    case 196:       pStr = OOO_STRING_SVTOOLS_HTML_C_Auml;  break;
-    case 197:       pStr = OOO_STRING_SVTOOLS_HTML_C_Aring; break;
-    case 198:       pStr = OOO_STRING_SVTOOLS_HTML_C_AElig; break;
-    case 199:       pStr = OOO_STRING_SVTOOLS_HTML_C_Ccedil;    break;
-    case 200:       pStr = OOO_STRING_SVTOOLS_HTML_C_Egrave;    break;
-    case 201:       pStr = OOO_STRING_SVTOOLS_HTML_C_Eacute;    break;
-    case 202:       pStr = OOO_STRING_SVTOOLS_HTML_C_Ecirc; break;
-    case 203:       pStr = OOO_STRING_SVTOOLS_HTML_C_Euml;  break;
-    case 204:       pStr = OOO_STRING_SVTOOLS_HTML_C_Igrave;    break;
-    case 205:       pStr = OOO_STRING_SVTOOLS_HTML_C_Iacute;    break;
-    case 206:       pStr = OOO_STRING_SVTOOLS_HTML_C_Icirc; break;
-    case 207:       pStr = OOO_STRING_SVTOOLS_HTML_C_Iuml;  break;
-    case 208:       pStr = OOO_STRING_SVTOOLS_HTML_C_ETH;       break;
-    case 209:       pStr = OOO_STRING_SVTOOLS_HTML_C_Ntilde;    break;
-    case 210:       pStr = OOO_STRING_SVTOOLS_HTML_C_Ograve;    break;
-    case 211:       pStr = OOO_STRING_SVTOOLS_HTML_C_Oacute;    break;
-    case 212:       pStr = OOO_STRING_SVTOOLS_HTML_C_Ocirc; break;
-    case 213:       pStr = OOO_STRING_SVTOOLS_HTML_C_Otilde;    break;
-    case 214:       pStr = OOO_STRING_SVTOOLS_HTML_C_Ouml;  break;
-    case 215:       pStr = OOO_STRING_SVTOOLS_HTML_S_times; break;
-    case 216:       pStr = OOO_STRING_SVTOOLS_HTML_C_Oslash;    break;
-    case 217:       pStr = OOO_STRING_SVTOOLS_HTML_C_Ugrave;    break;
-    case 218:       pStr = OOO_STRING_SVTOOLS_HTML_C_Uacute;    break;
-    case 219:       pStr = OOO_STRING_SVTOOLS_HTML_C_Ucirc; break;
-    case 220:       pStr = OOO_STRING_SVTOOLS_HTML_C_Uuml;  break;
-    case 221:       pStr = OOO_STRING_SVTOOLS_HTML_C_Yacute;    break;
-
-    case 222:       pStr = OOO_STRING_SVTOOLS_HTML_C_THORN; break;
-    case 223:       pStr = OOO_STRING_SVTOOLS_HTML_C_szlig; break;
-
-    case 224:       pStr = OOO_STRING_SVTOOLS_HTML_S_agrave;    break;
-    case 225:       pStr = OOO_STRING_SVTOOLS_HTML_S_aacute;    break;
-    case 226:       pStr = OOO_STRING_SVTOOLS_HTML_S_acirc; break;
-    case 227:       pStr = OOO_STRING_SVTOOLS_HTML_S_atilde;    break;
-    case 228:       pStr = OOO_STRING_SVTOOLS_HTML_S_auml;  break;
-    case 229:       pStr = OOO_STRING_SVTOOLS_HTML_S_aring; break;
-    case 230:       pStr = OOO_STRING_SVTOOLS_HTML_S_aelig; break;
-    case 231:       pStr = OOO_STRING_SVTOOLS_HTML_S_ccedil;    break;
-    case 232:       pStr = OOO_STRING_SVTOOLS_HTML_S_egrave;    break;
-    case 233:       pStr = OOO_STRING_SVTOOLS_HTML_S_eacute;    break;
-    case 234:       pStr = OOO_STRING_SVTOOLS_HTML_S_ecirc; break;
-    case 235:       pStr = OOO_STRING_SVTOOLS_HTML_S_euml;  break;
-    case 236:       pStr = OOO_STRING_SVTOOLS_HTML_S_igrave;    break;
-    case 237:       pStr = OOO_STRING_SVTOOLS_HTML_S_iacute;    break;
-    case 238:       pStr = OOO_STRING_SVTOOLS_HTML_S_icirc; break;
-    case 239:       pStr = OOO_STRING_SVTOOLS_HTML_S_iuml;  break;
-    case 240:       pStr = OOO_STRING_SVTOOLS_HTML_S_eth;       break;
-    case 241:       pStr = OOO_STRING_SVTOOLS_HTML_S_ntilde;    break;
-    case 242:       pStr = OOO_STRING_SVTOOLS_HTML_S_ograve;    break;
-    case 243:       pStr = OOO_STRING_SVTOOLS_HTML_S_oacute;    break;
-    case 244:       pStr = OOO_STRING_SVTOOLS_HTML_S_ocirc; break;
-    case 245:       pStr = OOO_STRING_SVTOOLS_HTML_S_otilde;    break;
-    case 246:       pStr = OOO_STRING_SVTOOLS_HTML_S_ouml;  break;
-    case 247:       pStr = OOO_STRING_SVTOOLS_HTML_S_divide;    break;
-    case 248:       pStr = OOO_STRING_SVTOOLS_HTML_S_oslash;    break;
-    case 249:       pStr = OOO_STRING_SVTOOLS_HTML_S_ugrave;    break;
-    case 250:       pStr = OOO_STRING_SVTOOLS_HTML_S_uacute;    break;
-    case 251:       pStr = OOO_STRING_SVTOOLS_HTML_S_ucirc; break;
-    case 252:       pStr = OOO_STRING_SVTOOLS_HTML_S_uuml;  break;
-    case 253:       pStr = OOO_STRING_SVTOOLS_HTML_S_yacute;    break;
-    case 254:       pStr = OOO_STRING_SVTOOLS_HTML_S_thorn; break;
-    case 255:       pStr = OOO_STRING_SVTOOLS_HTML_S_yuml;  break;
-
-    case 338:       pStr = OOO_STRING_SVTOOLS_HTML_S_OElig; break;
-    case 339:       pStr = OOO_STRING_SVTOOLS_HTML_S_oelig; break;
-    case 352:       pStr = OOO_STRING_SVTOOLS_HTML_S_Scaron;    break;
-    case 353:       pStr = OOO_STRING_SVTOOLS_HTML_S_scaron;    break;
-    case 376:       pStr = OOO_STRING_SVTOOLS_HTML_S_Yuml;  break;
-    case 402:       pStr = OOO_STRING_SVTOOLS_HTML_S_fnof;  break;
-    case 710:       pStr = OOO_STRING_SVTOOLS_HTML_S_circ;  break;
-    case 732:       pStr = OOO_STRING_SVTOOLS_HTML_S_tilde; break;
+//	    case '\x0a':   return HTMLOutFuncs::Out_Tag( rStream, OOO_STRING_SVTOOLS_HTML_linebreak );
+
+    case '<':		pStr = OOO_STRING_SVTOOLS_HTML_C_lt;		break;
+    case '>':		pStr = OOO_STRING_SVTOOLS_HTML_C_gt;		break;
+    case '&':		pStr = OOO_STRING_SVTOOLS_HTML_C_amp;		break;
+    case '"':		pStr = OOO_STRING_SVTOOLS_HTML_C_quot;	break;
+
+    case 161:		pStr = OOO_STRING_SVTOOLS_HTML_S_iexcl;	break;
+    case 162:		pStr = OOO_STRING_SVTOOLS_HTML_S_cent;	break;
+    case 163:		pStr = OOO_STRING_SVTOOLS_HTML_S_pound;	break;
+    case 164:		pStr = OOO_STRING_SVTOOLS_HTML_S_curren;	break;
+    case 165:		pStr = OOO_STRING_SVTOOLS_HTML_S_yen;		break;
+    case 166:		pStr = OOO_STRING_SVTOOLS_HTML_S_brvbar;	break;
+    case 167:		pStr = OOO_STRING_SVTOOLS_HTML_S_sect;	break;
+    case 168:		pStr = OOO_STRING_SVTOOLS_HTML_S_uml;		break;
+    case 169:		pStr = OOO_STRING_SVTOOLS_HTML_S_copy;	break;
+    case 170:		pStr = OOO_STRING_SVTOOLS_HTML_S_ordf;	break;
+    case 171:		pStr = OOO_STRING_SVTOOLS_HTML_S_laquo;	break;
+    case 172:		pStr = OOO_STRING_SVTOOLS_HTML_S_not;		break;
+    case 174:		pStr = OOO_STRING_SVTOOLS_HTML_S_reg;		break;
+    case 175:		pStr = OOO_STRING_SVTOOLS_HTML_S_macr;	break;
+    case 176:		pStr = OOO_STRING_SVTOOLS_HTML_S_deg;		break;
+    case 177:		pStr = OOO_STRING_SVTOOLS_HTML_S_plusmn;	break;
+    case 178:		pStr = OOO_STRING_SVTOOLS_HTML_S_sup2;	break;
+    case 179:		pStr = OOO_STRING_SVTOOLS_HTML_S_sup3;	break;
+    case 180:		pStr = OOO_STRING_SVTOOLS_HTML_S_acute;	break;
+    case 181:		pStr = OOO_STRING_SVTOOLS_HTML_S_micro;	break;
+    case 182:		pStr = OOO_STRING_SVTOOLS_HTML_S_para;	break;
+    case 183:		pStr = OOO_STRING_SVTOOLS_HTML_S_middot;	break;
+    case 184:		pStr = OOO_STRING_SVTOOLS_HTML_S_cedil;	break;
+    case 185:		pStr = OOO_STRING_SVTOOLS_HTML_S_sup1;	break;
+    case 186:		pStr = OOO_STRING_SVTOOLS_HTML_S_ordm;	break;
+    case 187:		pStr = OOO_STRING_SVTOOLS_HTML_S_raquo;	break;
+    case 188:		pStr = OOO_STRING_SVTOOLS_HTML_S_frac14;	break;
+    case 189:		pStr = OOO_STRING_SVTOOLS_HTML_S_frac12;	break;
+    case 190:		pStr = OOO_STRING_SVTOOLS_HTML_S_frac34;	break;
+    case 191:		pStr = OOO_STRING_SVTOOLS_HTML_S_iquest;	break;
+
+    case 192:		pStr = OOO_STRING_SVTOOLS_HTML_C_Agrave;	break;
+    case 193:		pStr = OOO_STRING_SVTOOLS_HTML_C_Aacute;	break;
+    case 194:		pStr = OOO_STRING_SVTOOLS_HTML_C_Acirc;	break;
+    case 195:		pStr = OOO_STRING_SVTOOLS_HTML_C_Atilde;	break;
+    case 196:		pStr = OOO_STRING_SVTOOLS_HTML_C_Auml;	break;
+    case 197:		pStr = OOO_STRING_SVTOOLS_HTML_C_Aring;	break;
+    case 198:		pStr = OOO_STRING_SVTOOLS_HTML_C_AElig;	break;
+    case 199:		pStr = OOO_STRING_SVTOOLS_HTML_C_Ccedil;	break;
+    case 200:		pStr = OOO_STRING_SVTOOLS_HTML_C_Egrave;	break;
+    case 201:		pStr = OOO_STRING_SVTOOLS_HTML_C_Eacute;	break;
+    case 202:		pStr = OOO_STRING_SVTOOLS_HTML_C_Ecirc;	break;
+    case 203:		pStr = OOO_STRING_SVTOOLS_HTML_C_Euml;	break;
+    case 204:		pStr = OOO_STRING_SVTOOLS_HTML_C_Igrave;	break;
+    case 205:		pStr = OOO_STRING_SVTOOLS_HTML_C_Iacute;	break;
+    case 206:		pStr = OOO_STRING_SVTOOLS_HTML_C_Icirc;	break;
+    case 207:		pStr = OOO_STRING_SVTOOLS_HTML_C_Iuml;	break;
+    case 208:		pStr = OOO_STRING_SVTOOLS_HTML_C_ETH;		break;
+    case 209:		pStr = OOO_STRING_SVTOOLS_HTML_C_Ntilde;	break;
+    case 210:		pStr = OOO_STRING_SVTOOLS_HTML_C_Ograve;	break;
+    case 211:		pStr = OOO_STRING_SVTOOLS_HTML_C_Oacute;	break;
+    case 212:		pStr = OOO_STRING_SVTOOLS_HTML_C_Ocirc;	break;
+    case 213:		pStr = OOO_STRING_SVTOOLS_HTML_C_Otilde;	break;
+    case 214:		pStr = OOO_STRING_SVTOOLS_HTML_C_Ouml;	break;
+    case 215:		pStr = OOO_STRING_SVTOOLS_HTML_S_times;	break;
+    case 216:		pStr = OOO_STRING_SVTOOLS_HTML_C_Oslash;	break;
+    case 217:		pStr = OOO_STRING_SVTOOLS_HTML_C_Ugrave;	break;
+    case 218:		pStr = OOO_STRING_SVTOOLS_HTML_C_Uacute;	break;
+    case 219:		pStr = OOO_STRING_SVTOOLS_HTML_C_Ucirc;	break;
+    case 220:		pStr = OOO_STRING_SVTOOLS_HTML_C_Uuml;	break;
+    case 221:		pStr = OOO_STRING_SVTOOLS_HTML_C_Yacute;	break;
+
+    case 222:		pStr = OOO_STRING_SVTOOLS_HTML_C_THORN;	break;
+    case 223:		pStr = OOO_STRING_SVTOOLS_HTML_C_szlig;	break;
+
+    case 224:		pStr = OOO_STRING_SVTOOLS_HTML_S_agrave;	break;
+    case 225:		pStr = OOO_STRING_SVTOOLS_HTML_S_aacute;	break;
+    case 226:		pStr = OOO_STRING_SVTOOLS_HTML_S_acirc;	break;
+    case 227:		pStr = OOO_STRING_SVTOOLS_HTML_S_atilde;	break;
+    case 228:		pStr = OOO_STRING_SVTOOLS_HTML_S_auml;	break;
+    case 229:		pStr = OOO_STRING_SVTOOLS_HTML_S_aring;	break;
+    case 230:		pStr = OOO_STRING_SVTOOLS_HTML_S_aelig;	break;
+    case 231:		pStr = OOO_STRING_SVTOOLS_HTML_S_ccedil;	break;
+    case 232:		pStr = OOO_STRING_SVTOOLS_HTML_S_egrave;	break;
+    case 233:		pStr = OOO_STRING_SVTOOLS_HTML_S_eacute;	break;
+    case 234:		pStr = OOO_STRING_SVTOOLS_HTML_S_ecirc;	break;
+    case 235:		pStr = OOO_STRING_SVTOOLS_HTML_S_euml;	break;
+    case 236:		pStr = OOO_STRING_SVTOOLS_HTML_S_igrave;	break;
+    case 237:		pStr = OOO_STRING_SVTOOLS_HTML_S_iacute;	break;
+    case 238:		pStr = OOO_STRING_SVTOOLS_HTML_S_icirc;	break;
+    case 239:		pStr = OOO_STRING_SVTOOLS_HTML_S_iuml;	break;
+    case 240:		pStr = OOO_STRING_SVTOOLS_HTML_S_eth;		break;
+    case 241:		pStr = OOO_STRING_SVTOOLS_HTML_S_ntilde;	break;
+    case 242:		pStr = OOO_STRING_SVTOOLS_HTML_S_ograve;	break;
+    case 243:		pStr = OOO_STRING_SVTOOLS_HTML_S_oacute;	break;
+    case 244:		pStr = OOO_STRING_SVTOOLS_HTML_S_ocirc;	break;
+    case 245:		pStr = OOO_STRING_SVTOOLS_HTML_S_otilde;	break;
+    case 246:		pStr = OOO_STRING_SVTOOLS_HTML_S_ouml;	break;
+    case 247:		pStr = OOO_STRING_SVTOOLS_HTML_S_divide;	break;
+    case 248:		pStr = OOO_STRING_SVTOOLS_HTML_S_oslash;	break;
+    case 249:		pStr = OOO_STRING_SVTOOLS_HTML_S_ugrave;	break;
+    case 250:		pStr = OOO_STRING_SVTOOLS_HTML_S_uacute;	break;
+    case 251:		pStr = OOO_STRING_SVTOOLS_HTML_S_ucirc;	break;
+    case 252:		pStr = OOO_STRING_SVTOOLS_HTML_S_uuml;	break;
+    case 253:		pStr = OOO_STRING_SVTOOLS_HTML_S_yacute;	break;
+    case 254:		pStr = OOO_STRING_SVTOOLS_HTML_S_thorn;	break;
+    case 255:     	pStr = OOO_STRING_SVTOOLS_HTML_S_yuml;	break;
+
+    case 338:		pStr = OOO_STRING_SVTOOLS_HTML_S_OElig;	break;
+    case 339:		pStr = OOO_STRING_SVTOOLS_HTML_S_oelig;	break;
+    case 352:		pStr = OOO_STRING_SVTOOLS_HTML_S_Scaron;	break;
+    case 353:		pStr = OOO_STRING_SVTOOLS_HTML_S_scaron;	break;
+    case 376:		pStr = OOO_STRING_SVTOOLS_HTML_S_Yuml;	break;
+    case 402:		pStr = OOO_STRING_SVTOOLS_HTML_S_fnof;	break;
+    case 710:		pStr = OOO_STRING_SVTOOLS_HTML_S_circ;	break;
+    case 732:		pStr = OOO_STRING_SVTOOLS_HTML_S_tilde;	break;
 
     // Greek chars are handled later,
     // since they should *not* be transformed to entities
     // when generating Greek text (== using Greek encoding)
 
-    case 8194:      pStr = OOO_STRING_SVTOOLS_HTML_S_ensp;  break;
-    case 8195:      pStr = OOO_STRING_SVTOOLS_HTML_S_emsp;  break;
-    case 8201:      pStr = OOO_STRING_SVTOOLS_HTML_S_thinsp;    break;
-    case 8204:      pStr = OOO_STRING_SVTOOLS_HTML_S_zwnj;  break;
-    case 8205:      pStr = OOO_STRING_SVTOOLS_HTML_S_zwj;       break;
-    case 8206:      pStr = OOO_STRING_SVTOOLS_HTML_S_lrm;       break;
-    case 8207:      pStr = OOO_STRING_SVTOOLS_HTML_S_rlm;       break;
-    case 8211:      pStr = OOO_STRING_SVTOOLS_HTML_S_ndash; break;
-    case 8212:      pStr = OOO_STRING_SVTOOLS_HTML_S_mdash; break;
-    case 8216:      pStr = OOO_STRING_SVTOOLS_HTML_S_lsquo; break;
-    case 8217:      pStr = OOO_STRING_SVTOOLS_HTML_S_rsquo; break;
-    case 8218:      pStr = OOO_STRING_SVTOOLS_HTML_S_sbquo; break;
-    case 8220:      pStr = OOO_STRING_SVTOOLS_HTML_S_ldquo; break;
-    case 8221:      pStr = OOO_STRING_SVTOOLS_HTML_S_rdquo; break;
-    case 8222:      pStr = OOO_STRING_SVTOOLS_HTML_S_bdquo; break;
-    case 8224:      pStr = OOO_STRING_SVTOOLS_HTML_S_dagger;    break;
-    case 8225:      pStr = OOO_STRING_SVTOOLS_HTML_S_Dagger;    break;
-    case 8226:      pStr = OOO_STRING_SVTOOLS_HTML_S_bull;  break;
-    case 8230:      pStr = OOO_STRING_SVTOOLS_HTML_S_hellip;    break;
-    case 8240:      pStr = OOO_STRING_SVTOOLS_HTML_S_permil;    break;
-    case 8242:      pStr = OOO_STRING_SVTOOLS_HTML_S_prime; break;
-    case 8243:      pStr = OOO_STRING_SVTOOLS_HTML_S_Prime; break;
-    case 8249:      pStr = OOO_STRING_SVTOOLS_HTML_S_lsaquo;    break;
-    case 8250:      pStr = OOO_STRING_SVTOOLS_HTML_S_rsaquo;    break;
-    case 8254:      pStr = OOO_STRING_SVTOOLS_HTML_S_oline; break;
-    case 8260:      pStr = OOO_STRING_SVTOOLS_HTML_S_frasl; break;
-    case 8364:      pStr = OOO_STRING_SVTOOLS_HTML_S_euro;  break;
-    case 8465:      pStr = OOO_STRING_SVTOOLS_HTML_S_image; break;
-    case 8472:      pStr = OOO_STRING_SVTOOLS_HTML_S_weierp;    break;
-    case 8476:      pStr = OOO_STRING_SVTOOLS_HTML_S_real;  break;
-    case 8482:      pStr = OOO_STRING_SVTOOLS_HTML_S_trade; break;
-    case 8501:      pStr = OOO_STRING_SVTOOLS_HTML_S_alefsym;   break;
-    case 8592:      pStr = OOO_STRING_SVTOOLS_HTML_S_larr;  break;
-    case 8593:      pStr = OOO_STRING_SVTOOLS_HTML_S_uarr;  break;
-    case 8594:      pStr = OOO_STRING_SVTOOLS_HTML_S_rarr;  break;
-    case 8595:      pStr = OOO_STRING_SVTOOLS_HTML_S_darr;  break;
-    case 8596:      pStr = OOO_STRING_SVTOOLS_HTML_S_harr;  break;
-    case 8629:      pStr = OOO_STRING_SVTOOLS_HTML_S_crarr; break;
-    case 8656:      pStr = OOO_STRING_SVTOOLS_HTML_S_lArr;  break;
-    case 8657:      pStr = OOO_STRING_SVTOOLS_HTML_S_uArr;  break;
-    case 8658:      pStr = OOO_STRING_SVTOOLS_HTML_S_rArr;  break;
-    case 8659:      pStr = OOO_STRING_SVTOOLS_HTML_S_dArr;  break;
-    case 8660:      pStr = OOO_STRING_SVTOOLS_HTML_S_hArr;  break;
-    case 8704:      pStr = OOO_STRING_SVTOOLS_HTML_S_forall;    break;
-    case 8706:      pStr = OOO_STRING_SVTOOLS_HTML_S_part;  break;
-    case 8707:      pStr = OOO_STRING_SVTOOLS_HTML_S_exist; break;
-    case 8709:      pStr = OOO_STRING_SVTOOLS_HTML_S_empty; break;
-    case 8711:      pStr = OOO_STRING_SVTOOLS_HTML_S_nabla; break;
-    case 8712:      pStr = OOO_STRING_SVTOOLS_HTML_S_isin;  break;
-    case 8713:      pStr = OOO_STRING_SVTOOLS_HTML_S_notin; break;
-    case 8715:      pStr = OOO_STRING_SVTOOLS_HTML_S_ni;        break;
-    case 8719:      pStr = OOO_STRING_SVTOOLS_HTML_S_prod;  break;
-    case 8721:      pStr = OOO_STRING_SVTOOLS_HTML_S_sum;       break;
-    case 8722:      pStr = OOO_STRING_SVTOOLS_HTML_S_minus; break;
-    case 8727:      pStr = OOO_STRING_SVTOOLS_HTML_S_lowast;    break;
-    case 8730:      pStr = OOO_STRING_SVTOOLS_HTML_S_radic; break;
-    case 8733:      pStr = OOO_STRING_SVTOOLS_HTML_S_prop;  break;
-    case 8734:      pStr = OOO_STRING_SVTOOLS_HTML_S_infin; break;
-    case 8736:      pStr = OOO_STRING_SVTOOLS_HTML_S_ang;       break;
-    case 8743:      pStr = OOO_STRING_SVTOOLS_HTML_S_and;       break;
-    case 8744:      pStr = OOO_STRING_SVTOOLS_HTML_S_or;        break;
-    case 8745:      pStr = OOO_STRING_SVTOOLS_HTML_S_cap;       break;
-    case 8746:      pStr = OOO_STRING_SVTOOLS_HTML_S_cup;       break;
-    case 8747:      pStr = OOO_STRING_SVTOOLS_HTML_S_int;       break;
-    case 8756:      pStr = OOO_STRING_SVTOOLS_HTML_S_there4;    break;
-    case 8764:      pStr = OOO_STRING_SVTOOLS_HTML_S_sim;       break;
-    case 8773:      pStr = OOO_STRING_SVTOOLS_HTML_S_cong;  break;
-    case 8776:      pStr = OOO_STRING_SVTOOLS_HTML_S_asymp; break;
-    case 8800:      pStr = OOO_STRING_SVTOOLS_HTML_S_ne;        break;
-    case 8801:      pStr = OOO_STRING_SVTOOLS_HTML_S_equiv; break;
-    case 8804:      pStr = OOO_STRING_SVTOOLS_HTML_S_le;        break;
-    case 8805:      pStr = OOO_STRING_SVTOOLS_HTML_S_ge;        break;
-    case 8834:      pStr = OOO_STRING_SVTOOLS_HTML_S_sub;       break;
-    case 8835:      pStr = OOO_STRING_SVTOOLS_HTML_S_sup;       break;
-    case 8836:      pStr = OOO_STRING_SVTOOLS_HTML_S_nsub;  break;
-    case 8838:      pStr = OOO_STRING_SVTOOLS_HTML_S_sube;  break;
-    case 8839:      pStr = OOO_STRING_SVTOOLS_HTML_S_supe;  break;
-    case 8853:      pStr = OOO_STRING_SVTOOLS_HTML_S_oplus; break;
-    case 8855:      pStr = OOO_STRING_SVTOOLS_HTML_S_otimes;    break;
-    case 8869:      pStr = OOO_STRING_SVTOOLS_HTML_S_perp;  break;
-    case 8901:      pStr = OOO_STRING_SVTOOLS_HTML_S_sdot;  break;
-    case 8968:      pStr = OOO_STRING_SVTOOLS_HTML_S_lceil; break;
-    case 8969:      pStr = OOO_STRING_SVTOOLS_HTML_S_rceil; break;
-    case 8970:      pStr = OOO_STRING_SVTOOLS_HTML_S_lfloor;    break;
-    case 8971:      pStr = OOO_STRING_SVTOOLS_HTML_S_rfloor;    break;
-    case 9001:      pStr = OOO_STRING_SVTOOLS_HTML_S_lang;  break;
-    case 9002:      pStr = OOO_STRING_SVTOOLS_HTML_S_rang;  break;
-    case 9674:      pStr = OOO_STRING_SVTOOLS_HTML_S_loz;       break;
-    case 9824:      pStr = OOO_STRING_SVTOOLS_HTML_S_spades;    break;
-    case 9827:      pStr = OOO_STRING_SVTOOLS_HTML_S_clubs; break;
-    case 9829:      pStr = OOO_STRING_SVTOOLS_HTML_S_hearts;    break;
-    case 9830:      pStr = OOO_STRING_SVTOOLS_HTML_S_diams; break;
+    case 8194:		pStr = OOO_STRING_SVTOOLS_HTML_S_ensp;	break;
+    case 8195:		pStr = OOO_STRING_SVTOOLS_HTML_S_emsp;	break;
+    case 8201:		pStr = OOO_STRING_SVTOOLS_HTML_S_thinsp;	break;
+    case 8204:		pStr = OOO_STRING_SVTOOLS_HTML_S_zwnj;	break;
+    case 8205:		pStr = OOO_STRING_SVTOOLS_HTML_S_zwj;		break;
+    case 8206:		pStr = OOO_STRING_SVTOOLS_HTML_S_lrm;		break;
+    case 8207:		pStr = OOO_STRING_SVTOOLS_HTML_S_rlm;		break;
+    case 8211:		pStr = OOO_STRING_SVTOOLS_HTML_S_ndash;	break;
+    case 8212:		pStr = OOO_STRING_SVTOOLS_HTML_S_mdash;	break;
+    case 8216:		pStr = OOO_STRING_SVTOOLS_HTML_S_lsquo;	break;
+    case 8217:		pStr = OOO_STRING_SVTOOLS_HTML_S_rsquo;	break;
+    case 8218:		pStr = OOO_STRING_SVTOOLS_HTML_S_sbquo;	break;
+    case 8220:		pStr = OOO_STRING_SVTOOLS_HTML_S_ldquo;	break;
+    case 8221:		pStr = OOO_STRING_SVTOOLS_HTML_S_rdquo;	break;
+    case 8222:		pStr = OOO_STRING_SVTOOLS_HTML_S_bdquo;	break;
+    case 8224:		pStr = OOO_STRING_SVTOOLS_HTML_S_dagger;	break;
+    case 8225:		pStr = OOO_STRING_SVTOOLS_HTML_S_Dagger;	break;
+    case 8226:		pStr = OOO_STRING_SVTOOLS_HTML_S_bull;	break;
+    case 8230:		pStr = OOO_STRING_SVTOOLS_HTML_S_hellip;	break;
+    case 8240:		pStr = OOO_STRING_SVTOOLS_HTML_S_permil;	break;
+    case 8242:		pStr = OOO_STRING_SVTOOLS_HTML_S_prime;	break;
+    case 8243:		pStr = OOO_STRING_SVTOOLS_HTML_S_Prime;	break;
+    case 8249:		pStr = OOO_STRING_SVTOOLS_HTML_S_lsaquo;	break;
+    case 8250:		pStr = OOO_STRING_SVTOOLS_HTML_S_rsaquo;	break;
+    case 8254:		pStr = OOO_STRING_SVTOOLS_HTML_S_oline;	break;
+    case 8260:		pStr = OOO_STRING_SVTOOLS_HTML_S_frasl;	break;
+    case 8364:		pStr = OOO_STRING_SVTOOLS_HTML_S_euro;	break;
+    case 8465:		pStr = OOO_STRING_SVTOOLS_HTML_S_image;	break;
+    case 8472:		pStr = OOO_STRING_SVTOOLS_HTML_S_weierp;	break;
+    case 8476:		pStr = OOO_STRING_SVTOOLS_HTML_S_real;	break;
+    case 8482:		pStr = OOO_STRING_SVTOOLS_HTML_S_trade;	break;
+    case 8501:		pStr = OOO_STRING_SVTOOLS_HTML_S_alefsym;	break;
+    case 8592:		pStr = OOO_STRING_SVTOOLS_HTML_S_larr;	break;
+    case 8593:		pStr = OOO_STRING_SVTOOLS_HTML_S_uarr;	break;
+    case 8594:		pStr = OOO_STRING_SVTOOLS_HTML_S_rarr;	break;
+    case 8595:		pStr = OOO_STRING_SVTOOLS_HTML_S_darr;	break;
+    case 8596:		pStr = OOO_STRING_SVTOOLS_HTML_S_harr;	break;
+    case 8629:		pStr = OOO_STRING_SVTOOLS_HTML_S_crarr;	break;
+    case 8656:		pStr = OOO_STRING_SVTOOLS_HTML_S_lArr;	break;
+    case 8657:		pStr = OOO_STRING_SVTOOLS_HTML_S_uArr;	break;
+    case 8658:		pStr = OOO_STRING_SVTOOLS_HTML_S_rArr;	break;
+    case 8659:		pStr = OOO_STRING_SVTOOLS_HTML_S_dArr;	break;
+    case 8660:		pStr = OOO_STRING_SVTOOLS_HTML_S_hArr;	break;
+    case 8704:		pStr = OOO_STRING_SVTOOLS_HTML_S_forall;	break;
+    case 8706:		pStr = OOO_STRING_SVTOOLS_HTML_S_part;	break;
+    case 8707:		pStr = OOO_STRING_SVTOOLS_HTML_S_exist;	break;
+    case 8709:		pStr = OOO_STRING_SVTOOLS_HTML_S_empty;	break;
+    case 8711:		pStr = OOO_STRING_SVTOOLS_HTML_S_nabla;	break;
+    case 8712:		pStr = OOO_STRING_SVTOOLS_HTML_S_isin;	break;
+    case 8713:		pStr = OOO_STRING_SVTOOLS_HTML_S_notin;	break;
+    case 8715:		pStr = OOO_STRING_SVTOOLS_HTML_S_ni;		break;
+    case 8719:		pStr = OOO_STRING_SVTOOLS_HTML_S_prod;	break;
+    case 8721:		pStr = OOO_STRING_SVTOOLS_HTML_S_sum;		break;
+    case 8722:		pStr = OOO_STRING_SVTOOLS_HTML_S_minus;	break;
+    case 8727:		pStr = OOO_STRING_SVTOOLS_HTML_S_lowast;	break;
+    case 8730:		pStr = OOO_STRING_SVTOOLS_HTML_S_radic;	break;
+    case 8733:		pStr = OOO_STRING_SVTOOLS_HTML_S_prop;	break;
+    case 8734:		pStr = OOO_STRING_SVTOOLS_HTML_S_infin;	break;
+    case 8736:		pStr = OOO_STRING_SVTOOLS_HTML_S_ang;		break;
+    case 8743:		pStr = OOO_STRING_SVTOOLS_HTML_S_and;		break;
+    case 8744:		pStr = OOO_STRING_SVTOOLS_HTML_S_or;		break;
+    case 8745:		pStr = OOO_STRING_SVTOOLS_HTML_S_cap;		break;
+    case 8746:		pStr = OOO_STRING_SVTOOLS_HTML_S_cup;		break;
+    case 8747:		pStr = OOO_STRING_SVTOOLS_HTML_S_int;		break;
+    case 8756:		pStr = OOO_STRING_SVTOOLS_HTML_S_there4;	break;
+    case 8764:		pStr = OOO_STRING_SVTOOLS_HTML_S_sim;		break;
+    case 8773:		pStr = OOO_STRING_SVTOOLS_HTML_S_cong;	break;
+    case 8776:		pStr = OOO_STRING_SVTOOLS_HTML_S_asymp;	break;
+    case 8800:		pStr = OOO_STRING_SVTOOLS_HTML_S_ne;		break;
+    case 8801:		pStr = OOO_STRING_SVTOOLS_HTML_S_equiv;	break;
+    case 8804:		pStr = OOO_STRING_SVTOOLS_HTML_S_le;		break;
+    case 8805:		pStr = OOO_STRING_SVTOOLS_HTML_S_ge;		break;
+    case 8834:		pStr = OOO_STRING_SVTOOLS_HTML_S_sub;		break;
+    case 8835:		pStr = OOO_STRING_SVTOOLS_HTML_S_sup;		break;
+    case 8836:		pStr = OOO_STRING_SVTOOLS_HTML_S_nsub;	break;
+    case 8838:		pStr = OOO_STRING_SVTOOLS_HTML_S_sube;	break;
+    case 8839:		pStr = OOO_STRING_SVTOOLS_HTML_S_supe;	break;
+    case 8853:		pStr = OOO_STRING_SVTOOLS_HTML_S_oplus;	break;
+    case 8855:		pStr = OOO_STRING_SVTOOLS_HTML_S_otimes;	break;
+    case 8869:		pStr = OOO_STRING_SVTOOLS_HTML_S_perp;	break;
+    case 8901:		pStr = OOO_STRING_SVTOOLS_HTML_S_sdot;	break;
+    case 8968:		pStr = OOO_STRING_SVTOOLS_HTML_S_lceil;	break;
+    case 8969:		pStr = OOO_STRING_SVTOOLS_HTML_S_rceil;	break;
+    case 8970:		pStr = OOO_STRING_SVTOOLS_HTML_S_lfloor;	break;
+    case 8971:		pStr = OOO_STRING_SVTOOLS_HTML_S_rfloor;	break;
+    case 9001:		pStr = OOO_STRING_SVTOOLS_HTML_S_lang;	break;
+    case 9002:		pStr = OOO_STRING_SVTOOLS_HTML_S_rang;	break;
+    case 9674:		pStr = OOO_STRING_SVTOOLS_HTML_S_loz;		break;
+    case 9824:		pStr = OOO_STRING_SVTOOLS_HTML_S_spades;	break;
+    case 9827:		pStr = OOO_STRING_SVTOOLS_HTML_S_clubs;	break;
+    case 9829:		pStr = OOO_STRING_SVTOOLS_HTML_S_hearts;	break;
+    case 9830:		pStr = OOO_STRING_SVTOOLS_HTML_S_diams;	break;
     }
 
     // Greek chars: if we do not produce a Greek encoding,
@@ -349,58 +349,58 @@ const sal_Char *lcl_svhtml_GetEntityForChar( sal_Unicode c,
     {
         switch( c )
         {
-        case 913:       pStr = OOO_STRING_SVTOOLS_HTML_S_Alpha; break;
-        case 914:       pStr = OOO_STRING_SVTOOLS_HTML_S_Beta;  break;
-        case 915:       pStr = OOO_STRING_SVTOOLS_HTML_S_Gamma; break;
-        case 916:       pStr = OOO_STRING_SVTOOLS_HTML_S_Delta; break;
-        case 917:       pStr = OOO_STRING_SVTOOLS_HTML_S_Epsilon;   break;
-        case 918:       pStr = OOO_STRING_SVTOOLS_HTML_S_Zeta;  break;
-        case 919:       pStr = OOO_STRING_SVTOOLS_HTML_S_Eta;       break;
-        case 920:       pStr = OOO_STRING_SVTOOLS_HTML_S_Theta; break;
-        case 921:       pStr = OOO_STRING_SVTOOLS_HTML_S_Iota;  break;
-        case 922:       pStr = OOO_STRING_SVTOOLS_HTML_S_Kappa; break;
-        case 923:       pStr = OOO_STRING_SVTOOLS_HTML_S_Lambda;    break;
-        case 924:       pStr = OOO_STRING_SVTOOLS_HTML_S_Mu;        break;
-        case 925:       pStr = OOO_STRING_SVTOOLS_HTML_S_Nu;        break;
-        case 926:       pStr = OOO_STRING_SVTOOLS_HTML_S_Xi;        break;
-        case 927:       pStr = OOO_STRING_SVTOOLS_HTML_S_Omicron;   break;
-        case 928:       pStr = OOO_STRING_SVTOOLS_HTML_S_Pi;        break;
-        case 929:       pStr = OOO_STRING_SVTOOLS_HTML_S_Rho;       break;
-        case 931:       pStr = OOO_STRING_SVTOOLS_HTML_S_Sigma; break;
-        case 932:       pStr = OOO_STRING_SVTOOLS_HTML_S_Tau;       break;
-        case 933:       pStr = OOO_STRING_SVTOOLS_HTML_S_Upsilon;   break;
-        case 934:       pStr = OOO_STRING_SVTOOLS_HTML_S_Phi;       break;
-        case 935:       pStr = OOO_STRING_SVTOOLS_HTML_S_Chi;       break;
-        case 936:       pStr = OOO_STRING_SVTOOLS_HTML_S_Psi;       break;
-        case 937:       pStr = OOO_STRING_SVTOOLS_HTML_S_Omega; break;
-        case 945:       pStr = OOO_STRING_SVTOOLS_HTML_S_alpha; break;
-        case 946:       pStr = OOO_STRING_SVTOOLS_HTML_S_beta;  break;
-        case 947:       pStr = OOO_STRING_SVTOOLS_HTML_S_gamma; break;
-        case 948:       pStr = OOO_STRING_SVTOOLS_HTML_S_delta; break;
-        case 949:       pStr = OOO_STRING_SVTOOLS_HTML_S_epsilon;   break;
-        case 950:       pStr = OOO_STRING_SVTOOLS_HTML_S_zeta;  break;
-        case 951:       pStr = OOO_STRING_SVTOOLS_HTML_S_eta;       break;
-        case 952:       pStr = OOO_STRING_SVTOOLS_HTML_S_theta; break;
-        case 953:       pStr = OOO_STRING_SVTOOLS_HTML_S_iota;  break;
-        case 954:       pStr = OOO_STRING_SVTOOLS_HTML_S_kappa; break;
-        case 955:       pStr = OOO_STRING_SVTOOLS_HTML_S_lambda;    break;
-        case 956:       pStr = OOO_STRING_SVTOOLS_HTML_S_mu;        break;
-        case 957:       pStr = OOO_STRING_SVTOOLS_HTML_S_nu;        break;
-        case 958:       pStr = OOO_STRING_SVTOOLS_HTML_S_xi;        break;
-        case 959:       pStr = OOO_STRING_SVTOOLS_HTML_S_omicron;   break;
-        case 960:       pStr = OOO_STRING_SVTOOLS_HTML_S_pi;        break;
-        case 961:       pStr = OOO_STRING_SVTOOLS_HTML_S_rho;       break;
-        case 962:       pStr = OOO_STRING_SVTOOLS_HTML_S_sigmaf;    break;
-        case 963:       pStr = OOO_STRING_SVTOOLS_HTML_S_sigma; break;
-        case 964:       pStr = OOO_STRING_SVTOOLS_HTML_S_tau;       break;
-        case 965:       pStr = OOO_STRING_SVTOOLS_HTML_S_upsilon;   break;
-        case 966:       pStr = OOO_STRING_SVTOOLS_HTML_S_phi;       break;
-        case 967:       pStr = OOO_STRING_SVTOOLS_HTML_S_chi;       break;
-        case 968:       pStr = OOO_STRING_SVTOOLS_HTML_S_psi;       break;
-        case 969:       pStr = OOO_STRING_SVTOOLS_HTML_S_omega; break;
-        case 977:       pStr = OOO_STRING_SVTOOLS_HTML_S_thetasym;break;
-        case 978:       pStr = OOO_STRING_SVTOOLS_HTML_S_upsih; break;
-        case 982:       pStr = OOO_STRING_SVTOOLS_HTML_S_piv;       break;
+        case 913:		pStr = OOO_STRING_SVTOOLS_HTML_S_Alpha;	break;
+        case 914:		pStr = OOO_STRING_SVTOOLS_HTML_S_Beta;	break;
+        case 915:		pStr = OOO_STRING_SVTOOLS_HTML_S_Gamma;	break;
+        case 916:		pStr = OOO_STRING_SVTOOLS_HTML_S_Delta;	break;
+        case 917:		pStr = OOO_STRING_SVTOOLS_HTML_S_Epsilon;	break;
+        case 918:		pStr = OOO_STRING_SVTOOLS_HTML_S_Zeta;	break;
+        case 919:		pStr = OOO_STRING_SVTOOLS_HTML_S_Eta;		break;
+        case 920:		pStr = OOO_STRING_SVTOOLS_HTML_S_Theta;	break;
+        case 921:		pStr = OOO_STRING_SVTOOLS_HTML_S_Iota;	break;
+        case 922:		pStr = OOO_STRING_SVTOOLS_HTML_S_Kappa;	break;
+        case 923:		pStr = OOO_STRING_SVTOOLS_HTML_S_Lambda;	break;
+        case 924:		pStr = OOO_STRING_SVTOOLS_HTML_S_Mu;		break;
+        case 925:		pStr = OOO_STRING_SVTOOLS_HTML_S_Nu;		break;
+        case 926:		pStr = OOO_STRING_SVTOOLS_HTML_S_Xi;		break;
+        case 927:		pStr = OOO_STRING_SVTOOLS_HTML_S_Omicron;	break;
+        case 928:		pStr = OOO_STRING_SVTOOLS_HTML_S_Pi;		break;
+        case 929:		pStr = OOO_STRING_SVTOOLS_HTML_S_Rho;		break;
+        case 931:		pStr = OOO_STRING_SVTOOLS_HTML_S_Sigma;	break;
+        case 932:		pStr = OOO_STRING_SVTOOLS_HTML_S_Tau;		break;
+        case 933:		pStr = OOO_STRING_SVTOOLS_HTML_S_Upsilon;	break;
+        case 934:		pStr = OOO_STRING_SVTOOLS_HTML_S_Phi;		break;
+        case 935:		pStr = OOO_STRING_SVTOOLS_HTML_S_Chi;		break;
+        case 936:		pStr = OOO_STRING_SVTOOLS_HTML_S_Psi;		break;
+        case 937:		pStr = OOO_STRING_SVTOOLS_HTML_S_Omega;	break;
+        case 945:		pStr = OOO_STRING_SVTOOLS_HTML_S_alpha;	break;
+        case 946:		pStr = OOO_STRING_SVTOOLS_HTML_S_beta;	break;
+        case 947:		pStr = OOO_STRING_SVTOOLS_HTML_S_gamma;	break;
+        case 948:		pStr = OOO_STRING_SVTOOLS_HTML_S_delta;	break;
+        case 949:		pStr = OOO_STRING_SVTOOLS_HTML_S_epsilon;	break;
+        case 950:		pStr = OOO_STRING_SVTOOLS_HTML_S_zeta;	break;
+        case 951:		pStr = OOO_STRING_SVTOOLS_HTML_S_eta;		break;
+        case 952:		pStr = OOO_STRING_SVTOOLS_HTML_S_theta;	break;
+        case 953:		pStr = OOO_STRING_SVTOOLS_HTML_S_iota;	break;
+        case 954:		pStr = OOO_STRING_SVTOOLS_HTML_S_kappa;	break;
+        case 955:		pStr = OOO_STRING_SVTOOLS_HTML_S_lambda;	break;
+        case 956:		pStr = OOO_STRING_SVTOOLS_HTML_S_mu;		break;
+        case 957:		pStr = OOO_STRING_SVTOOLS_HTML_S_nu;		break;
+        case 958:		pStr = OOO_STRING_SVTOOLS_HTML_S_xi;		break;
+        case 959:		pStr = OOO_STRING_SVTOOLS_HTML_S_omicron;	break;
+        case 960:		pStr = OOO_STRING_SVTOOLS_HTML_S_pi;		break;
+        case 961:		pStr = OOO_STRING_SVTOOLS_HTML_S_rho;		break;
+        case 962:		pStr = OOO_STRING_SVTOOLS_HTML_S_sigmaf;	break;
+        case 963:		pStr = OOO_STRING_SVTOOLS_HTML_S_sigma;	break;
+        case 964:		pStr = OOO_STRING_SVTOOLS_HTML_S_tau;		break;
+        case 965:		pStr = OOO_STRING_SVTOOLS_HTML_S_upsilon;	break;
+        case 966:		pStr = OOO_STRING_SVTOOLS_HTML_S_phi;		break;
+        case 967:		pStr = OOO_STRING_SVTOOLS_HTML_S_chi;		break;
+        case 968:		pStr = OOO_STRING_SVTOOLS_HTML_S_psi;		break;
+        case 969:		pStr = OOO_STRING_SVTOOLS_HTML_S_omega;	break;
+        case 977:		pStr = OOO_STRING_SVTOOLS_HTML_S_thetasym;break;
+        case 978:		pStr = OOO_STRING_SVTOOLS_HTML_S_upsih;	break;
+        case 982:		pStr = OOO_STRING_SVTOOLS_HTML_S_piv;		break;
         }
     }
 
@@ -416,13 +416,13 @@ void lcl_ConvertCharToHTML( sal_Unicode c, ByteString& rDest,
     const sal_Char *pStr = 0;
     switch( c )
     {
-    case 0xA0:      // is a hard blank
+    case 0xA0:		// is a hard blank
 //!! the TextConverter has a problem with this character - so change it to
 // a hard space - that's the same as our 5.2
-    case 0x2011:    // is a hard hyphen
+    case 0x2011:	// is a hard hyphen
         pStr = OOO_STRING_SVTOOLS_HTML_S_nbsp;
         break;
-    case 0xAD:      // is a soft hyphen
+    case 0xAD:		// is a soft hyphen
         pStr = OOO_STRING_SVTOOLS_HTML_S_shy;
         break;
     default:
@@ -444,9 +444,9 @@ void lcl_ConvertCharToHTML( sal_Unicode c, ByteString& rDest,
                         RTL_UNICODETOTEXT_FLAGS_INVALID_ERROR;
     if( pStr )
     {
-        sal_Size nLen = rtl_convertUnicodeToText(
+        sal_Size nLen = rtl_convertUnicodeToText( 
                             rContext.m_hConv, rContext.m_hContext, &c, 0,
-                            cBuffer, TXTCONV_BUFFER_SIZE,
+                            cBuffer, TXTCONV_BUFFER_SIZE, 
                             nFlags|RTL_UNICODETOTEXT_FLAGS_FLUSH,
                             &nInfo, &nSrcChars );
         DBG_ASSERT( (nInfo & (RTL_UNICODETOTEXT_INFO_ERROR|RTL_UNICODETOTEXT_INFO_DESTBUFFERTOSMALL)) == 0, "HTMLOut: error while flushing" );
@@ -457,7 +457,7 @@ void lcl_ConvertCharToHTML( sal_Unicode c, ByteString& rDest,
     }
     else
     {
-        sal_Size nLen = rtl_convertUnicodeToText( rContext.m_hConv,
+        sal_Size nLen = rtl_convertUnicodeToText( rContext.m_hConv, 
                                                   rContext.m_hContext, &c, 1,
                                                      cBuffer, TXTCONV_BUFFER_SIZE,
                                                   nFlags,
@@ -473,9 +473,9 @@ void lcl_ConvertCharToHTML( sal_Unicode c, ByteString& rDest,
             // If the character could not be converted to the destination
             // character set, the UNICODE character is exported as character
             // entity.
-            nLen = rtl_convertUnicodeToText(
+            nLen = rtl_convertUnicodeToText( 
                                 rContext.m_hConv, rContext.m_hContext, &c, 0,
-                                cBuffer, TXTCONV_BUFFER_SIZE,
+                                cBuffer, TXTCONV_BUFFER_SIZE, 
                                 nFlags|RTL_UNICODETOTEXT_FLAGS_FLUSH,
                                 &nInfo, &nSrcChars );
             DBG_ASSERT( (nInfo & (RTL_UNICODETOTEXT_INFO_ERROR|RTL_UNICODETOTEXT_INFO_DESTBUFFERTOSMALL)) == 0, "HTMLOut: error while flushing" );
@@ -503,7 +503,7 @@ sal_Bool lcl_FlushToAscii( ByteString& rDest, HTMLOutContext& rContext )
                         RTL_UNICODETOTEXT_FLAGS_UNDEFINED_ERROR|
                         RTL_UNICODETOTEXT_FLAGS_FLUSH|
                         RTL_UNICODETOTEXT_FLAGS_INVALID_ERROR;
-    sal_Size nLen = rtl_convertUnicodeToText(
+    sal_Size nLen = rtl_convertUnicodeToText( 
                         rContext.m_hConv, rContext.m_hContext, &c, 0,
                         cBuffer, TXTCONV_BUFFER_SIZE, nFlags,
                         &nInfo, &nSrcChars );
@@ -537,7 +537,7 @@ SvStream& HTMLOutFuncs::Out_AsciiTag( SvStream& rStream, const sal_Char *pStr,
 }
 
 SvStream& HTMLOutFuncs::Out_Char( SvStream& rStream, sal_Unicode c,
-                                  HTMLOutContext& rContext,
+                                  HTMLOutContext& rContext, 
                                   String *pNonConvertableChars )
 {
     ByteString sOut;
@@ -571,7 +571,7 @@ SvStream& HTMLOutFuncs::FlushToAscii( SvStream& rStream,
 
 SvStream& HTMLOutFuncs::Out_Hex( SvStream& rStream, ULONG nHex, BYTE nLen,
                                    rtl_TextEncoding )
-{                                                  // in einen Stream aus
+{												   // in einen Stream aus
     sal_Char aNToABuf[] = "0000000000000000";
 
     DBG_ASSERT( nLen < sizeof(aNToABuf), "zu viele Stellen" );
@@ -620,7 +620,7 @@ SvStream& HTMLOutFuncs::Out_ImageMap( SvStream& rStream,
                                       const sal_Char *pIndentArea,
                                       const sal_Char *pIndentMap,
                                       rtl_TextEncoding eDestEnc,
-                                        String *pNonConvertableChars    )
+                                        String *pNonConvertableChars	)
 {
     if( RTL_TEXTENCODING_DONTKNOW == eDestEnc )
         eDestEnc = gsl_getSystemTextEncoding();
@@ -776,7 +776,7 @@ SvStream& HTMLOutFuncs::Out_ImageMap( SvStream& rStream,
     return rStream;
 }
 
-SvStream& HTMLOutFuncs::OutScript( SvStream& rStrm,
+SvStream& HTMLOutFuncs::OutScript( SvStream& rStrm, 
                                    const String& rBaseURL,
                                    const String& rSource,
                                    const String& rLanguage,
@@ -944,7 +944,7 @@ ByteString& HTMLOutFuncs::CreateTableDataOptionsValNum( ByteString& aStrTD,
         ((aStrTD += ' ') += OOO_STRING_SVTOOLS_HTML_O_SDnum) += "=\"";
         (aStrTD += ByteString::CreateFromInt32(
                                 Application::GetSettings().GetLanguage() ))
-            += ';'; // Language fuer Format 0
+            += ';';	// Language fuer Format 0
         if ( nFormat )
         {
             ByteString aNumStr;
diff --git a/svtools/source/svhtml/htmlsupp.cxx b/svtools/source/svhtml/htmlsupp.cxx
index 4c08d9c41ec9..bd996ea865c6 100644
--- a/svtools/source/svhtml/htmlsupp.cxx
+++ b/svtools/source/svhtml/htmlsupp.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
@@ -46,14 +46,14 @@
 
 static HTMLOptionEnum __READONLY_DATA aScriptLangOptEnums[] =
 {
-    { OOO_STRING_SVTOOLS_HTML_LG_starbasic, HTML_SL_STARBASIC   },
-    { OOO_STRING_SVTOOLS_HTML_LG_javascript,    HTML_SL_JAVASCRIPT  },
-    { OOO_STRING_SVTOOLS_HTML_LG_javascript11,HTML_SL_JAVASCRIPT    },
-    { OOO_STRING_SVTOOLS_HTML_LG_livescript,    HTML_SL_JAVASCRIPT  },
-//  { OOO_STRING_SVTOOLS_HTML_LG_unused_javascript, HTML_SL_UNUSEDJS },
-//  { OOO_STRING_SVTOOLS_HTML_LG_vbscript,  HTML_SL_VBSCRIPT    },
-//  { OOO_STRING_SVTOOLS_HTML_LG_starone,       HTML_SL_STARONE     },
-    { 0,                    0                   }
+    { OOO_STRING_SVTOOLS_HTML_LG_starbasic,	HTML_SL_STARBASIC	},
+    { OOO_STRING_SVTOOLS_HTML_LG_javascript,	HTML_SL_JAVASCRIPT	},
+    { OOO_STRING_SVTOOLS_HTML_LG_javascript11,HTML_SL_JAVASCRIPT	},
+    { OOO_STRING_SVTOOLS_HTML_LG_livescript,	HTML_SL_JAVASCRIPT	},
+//	{ OOO_STRING_SVTOOLS_HTML_LG_unused_javascript, HTML_SL_UNUSEDJS },
+//	{ OOO_STRING_SVTOOLS_HTML_LG_vbscript,	HTML_SL_VBSCRIPT	},
+//	{ OOO_STRING_SVTOOLS_HTML_LG_starone,		HTML_SL_STARONE		},
+    { 0,					0					}
 };
 
 BOOL HTMLParser::ParseScriptOptions( String& rLangString, const String& rBaseURL,
diff --git a/svtools/source/svhtml/parhtml.cxx b/svtools/source/svhtml/parhtml.cxx
index ade58688dc55..34bccdc98b27 100644
--- a/svtools/source/svhtml/parhtml.cxx
+++ b/svtools/source/svhtml/parhtml.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
@@ -68,45 +68,45 @@ const sal_Int32 MAX_ENTITY_LEN( 8L );
 // <INPUT TYPE=xxx>
 static HTMLOptionEnum __READONLY_DATA aInputTypeOptEnums[] =
 {
-    { OOO_STRING_SVTOOLS_HTML_IT_text,      HTML_IT_TEXT        },
-    { OOO_STRING_SVTOOLS_HTML_IT_password,  HTML_IT_PASSWORD    },
-    { OOO_STRING_SVTOOLS_HTML_IT_checkbox,  HTML_IT_CHECKBOX    },
-    { OOO_STRING_SVTOOLS_HTML_IT_radio,     HTML_IT_RADIO       },
-    { OOO_STRING_SVTOOLS_HTML_IT_range,     HTML_IT_RANGE       },
-    { OOO_STRING_SVTOOLS_HTML_IT_scribble,  HTML_IT_SCRIBBLE    },
-    { OOO_STRING_SVTOOLS_HTML_IT_file,      HTML_IT_FILE        },
-    { OOO_STRING_SVTOOLS_HTML_IT_hidden,    HTML_IT_HIDDEN      },
-    { OOO_STRING_SVTOOLS_HTML_IT_submit,    HTML_IT_SUBMIT      },
-    { OOO_STRING_SVTOOLS_HTML_IT_image,     HTML_IT_IMAGE       },
-    { OOO_STRING_SVTOOLS_HTML_IT_reset,     HTML_IT_RESET       },
-    { OOO_STRING_SVTOOLS_HTML_IT_button,    HTML_IT_BUTTON      },
-    { 0,                    0                   }
+    { OOO_STRING_SVTOOLS_HTML_IT_text,		HTML_IT_TEXT		},
+    { OOO_STRING_SVTOOLS_HTML_IT_password,	HTML_IT_PASSWORD	},
+    { OOO_STRING_SVTOOLS_HTML_IT_checkbox,	HTML_IT_CHECKBOX	},
+    { OOO_STRING_SVTOOLS_HTML_IT_radio,   	HTML_IT_RADIO		},
+    { OOO_STRING_SVTOOLS_HTML_IT_range,   	HTML_IT_RANGE		},
+    { OOO_STRING_SVTOOLS_HTML_IT_scribble,	HTML_IT_SCRIBBLE	},
+    { OOO_STRING_SVTOOLS_HTML_IT_file,    	HTML_IT_FILE		},
+    { OOO_STRING_SVTOOLS_HTML_IT_hidden,  	HTML_IT_HIDDEN		},
+    { OOO_STRING_SVTOOLS_HTML_IT_submit,  	HTML_IT_SUBMIT		},
+    { OOO_STRING_SVTOOLS_HTML_IT_image,   	HTML_IT_IMAGE		},
+    { OOO_STRING_SVTOOLS_HTML_IT_reset,   	HTML_IT_RESET		},
+    { OOO_STRING_SVTOOLS_HTML_IT_button,   	HTML_IT_BUTTON		},
+    { 0,					0					}
 };
 
 // <TABLE FRAME=xxx>
 static HTMLOptionEnum __READONLY_DATA aTableFrameOptEnums[] =
 {
-    { OOO_STRING_SVTOOLS_HTML_TF_void,  HTML_TF_VOID    },
-    { OOO_STRING_SVTOOLS_HTML_TF_above, HTML_TF_ABOVE   },
-    { OOO_STRING_SVTOOLS_HTML_TF_below, HTML_TF_BELOW   },
-    { OOO_STRING_SVTOOLS_HTML_TF_hsides,    HTML_TF_HSIDES  },
-    { OOO_STRING_SVTOOLS_HTML_TF_lhs,       HTML_TF_LHS     },
-    { OOO_STRING_SVTOOLS_HTML_TF_rhs,       HTML_TF_RHS     },
-    { OOO_STRING_SVTOOLS_HTML_TF_vsides,    HTML_TF_VSIDES  },
-    { OOO_STRING_SVTOOLS_HTML_TF_box,       HTML_TF_BOX     },
-    { OOO_STRING_SVTOOLS_HTML_TF_border,    HTML_TF_BOX     },
-    { 0,                0               }
+    { OOO_STRING_SVTOOLS_HTML_TF_void,	HTML_TF_VOID	},
+    { OOO_STRING_SVTOOLS_HTML_TF_above,	HTML_TF_ABOVE	},
+    { OOO_STRING_SVTOOLS_HTML_TF_below,	HTML_TF_BELOW	},
+    { OOO_STRING_SVTOOLS_HTML_TF_hsides,	HTML_TF_HSIDES	},
+    { OOO_STRING_SVTOOLS_HTML_TF_lhs,		HTML_TF_LHS		},
+    { OOO_STRING_SVTOOLS_HTML_TF_rhs,		HTML_TF_RHS		},
+    { OOO_STRING_SVTOOLS_HTML_TF_vsides,	HTML_TF_VSIDES	},
+    { OOO_STRING_SVTOOLS_HTML_TF_box,		HTML_TF_BOX		},
+    { OOO_STRING_SVTOOLS_HTML_TF_border,	HTML_TF_BOX		},
+    { 0,				0				}
 };
 
 // <TABLE RULES=xxx>
 static HTMLOptionEnum __READONLY_DATA aTableRulesOptEnums[] =
 {
-    { OOO_STRING_SVTOOLS_HTML_TR_none,  HTML_TR_NONE    },
-    { OOO_STRING_SVTOOLS_HTML_TR_groups,    HTML_TR_GROUPS  },
-    { OOO_STRING_SVTOOLS_HTML_TR_rows,  HTML_TR_ROWS    },
-    { OOO_STRING_SVTOOLS_HTML_TR_cols,  HTML_TR_COLS    },
-    { OOO_STRING_SVTOOLS_HTML_TR_all,       HTML_TR_ALL     },
-    { 0,                0               }
+    { OOO_STRING_SVTOOLS_HTML_TR_none,	HTML_TR_NONE	},
+    { OOO_STRING_SVTOOLS_HTML_TR_groups,	HTML_TR_GROUPS	},
+    { OOO_STRING_SVTOOLS_HTML_TR_rows,	HTML_TR_ROWS	},
+    { OOO_STRING_SVTOOLS_HTML_TR_cols,	HTML_TR_COLS	},
+    { OOO_STRING_SVTOOLS_HTML_TR_all,		HTML_TR_ALL		},
+    { 0,				0				}
 };
 
 
@@ -344,7 +344,7 @@ SvParserState __EXPORT HTMLParser::CallParser()
     AddRef();
     Continue( 0 );
     if( SVPAR_PENDING != eState )
-        ReleaseRef();       // dann brauchen wir den Parser nicht mehr!
+        ReleaseRef();		// dann brauchen wir den Parser nicht mehr!
 
     return eState;
 }
@@ -363,7 +363,7 @@ void HTMLParser::Continue( int nToken )
             NextToken( nToken );
 
         if( IsParserWorking() )
-            SaveState( 0 );         // bis hierhin abgearbeitet,
+            SaveState( 0 );			// bis hierhin abgearbeitet,
                                     // weiter mit neuem Token!
         nToken = GetNextToken();
     }
@@ -375,7 +375,7 @@ int HTMLParser::FilterToken( int nToken )
     {
     case sal_Unicode(EOF):
         nToken = 0;
-        break;          // nicht verschicken
+        break;			// nicht verschicken
 
     case HTML_HEAD_OFF:
         bIsInBody = TRUE;
@@ -396,7 +396,7 @@ int HTMLParser::FilterToken( int nToken )
     case HTML_HTML_OFF:
         nToken = 0;
         bReadPRE = bReadListing = bReadXMP = FALSE;
-        break;      // HTML_ON wurde auch nicht verschickt !
+        break;		// HTML_ON wurde auch nicht verschickt !
 
     case HTML_PREFORMTXT_ON:
         StartPRE();
@@ -565,15 +565,15 @@ int HTMLParser::ScanText( const sal_Unicode cBreak )
                             }
                         }
 
-                        if( !cChar )        // unbekanntes Zeichen?
+                        if( !cChar )		// unbekanntes Zeichen?
                         {
                             // dann im Stream zurueck, das '&' als Zeichen
                             // einfuegen und mit dem nachfolgenden Zeichen
                             // wieder aufsetzen
                             sTmpBuffer.append( (sal_Unicode)'&' );
 
-//                          rInput.SeekRel( -(long)(++nPos*GetCharSize()) );
-//                          nlLinePos -= nPos;
+//							rInput.SeekRel( -(long)(++nPos*GetCharSize()) );
+//							nlLinePos -= nPos;
                             DBG_ASSERT( rInput.Tell()-nStreamPos ==
                                         (ULONG)(nPos+1)*GetCharSize(),
                                         "Falsche Stream-Position" );
@@ -617,8 +617,8 @@ int HTMLParser::ScanText( const sal_Unicode cBreak )
                                     {
                                         // mit dem Zeichen wieder aufsetzen
                                         nNextCh = '&';
-//                                      rInput.SeekRel( -(long)(++nPos*GetCharSize()) );
-//                                      nlLinePos -= nPos;
+//										rInput.SeekRel( -(long)(++nPos*GetCharSize()) );
+//										nlLinePos -= nPos;
                                         DBG_ASSERT( rInput.Tell()-nStreamPos ==
                                                     (ULONG)(nPos+1)*GetCharSize(),
                                                     "Falsche Stream-Position" );
@@ -733,8 +733,8 @@ int HTMLParser::ScanText( const sal_Unicode cBreak )
             {
 // MIB 20.11.98: Das macht hier keinen Sinn, oder doch: Zumindest wird
 // abc&auml;<EOF> nicht angezeigt, also lassen wir das in Zukunft.
-//              if( '>' != cBreak )
-//                  eState = SVPAR_ACCEPTED;
+//				if( '>' != cBreak )
+//					eState = SVPAR_ACCEPTED;
                 bWeiter = FALSE;
             }
             else
@@ -748,7 +748,7 @@ int HTMLParser::ScanText( const sal_Unicode cBreak )
             if( '>'==cBreak )
                 sTmpBuffer.append( nNextCh );
             else
-                bWeiter = FALSE;        // Abbrechen, String zusammen
+                bWeiter = FALSE;		// Abbrechen, String zusammen
             break;
 
         case '\f':
@@ -778,7 +778,7 @@ int HTMLParser::ScanText( const sal_Unicode cBreak )
                 break;
             }
             // Bug 18984: CR-LF -> Blank
-            //      Folge von CR/LF/BLANK/TAB nur in ein Blank wandeln
+            // 		Folge von CR/LF/BLANK/TAB nur in ein Blank wandeln
             // kein break!!
         case '\t':
             if( '\t'==nNextCh && bReadPRE && '>'!=cBreak )
@@ -1109,7 +1109,7 @@ int __EXPORT HTMLParser::_GetNextToken()
     if( pOptions->Count() )
         pOptions->DeleteAndDestroy( 0, pOptions->Count() );
 
-    if( !IsParserWorking() )        // wenn schon Fehler, dann nicht weiter!
+    if( !IsParserWorking() )		// wenn schon Fehler, dann nicht weiter!
         return 0;
 
     BOOL bReadNextCharSave = bReadNextChar;
@@ -1118,7 +1118,7 @@ int __EXPORT HTMLParser::_GetNextToken()
         DBG_ASSERT( !bEndTokenFound,
                     "</SCRIPT> gelesen und trotzdem noch ein Zeichen lesen?" );
         nNextCh = GetNextChar();
-        if( !IsParserWorking() )        // wenn schon Fehler, dann nicht weiter!
+        if( !IsParserWorking() )		// wenn schon Fehler, dann nicht weiter!
             return 0;
         bReadNextChar = FALSE;
     }
@@ -1453,7 +1453,7 @@ scan_text:
     } while( !nRet && SVPAR_WORKING == eState );
 
     if( SVPAR_PENDING == eState )
-        nRet = -1;      // irgendwas ungueltiges
+        nRet = -1;		// irgendwas ungueltiges
 
     return nRet;
 }
@@ -1502,8 +1502,8 @@ const HTMLOptions *HTMLParser::GetOptions( USHORT *pNoConvertToken ) const
             // Netscape achtet aber nur auf "=" und Leerzeichen (siehe
             // Mozilla: PA_FetchRequestedNameValues in
             // lipparse/pa_mdl.c
-//          while( nPos < aToken.Len() &&
-//                  ( '-'==(c=aToken[nPos]) || isalnum(c) || '.'==c || '_'==c) )
+//			while( nPos < aToken.Len() &&
+//					( '-'==(c=aToken[nPos]) || isalnum(c) || '.'==c || '_'==c) )
             while( nPos < aToken.Len() && '=' != (cChar=aToken.GetChar(nPos)) &&
                    HTML_ISPRINTABLE(cChar) && !HTML_ISSPACE(cChar) )
                 nPos++;
@@ -1511,7 +1511,7 @@ const HTMLOptions *HTMLParser::GetOptions( USHORT *pNoConvertToken ) const
             String sName( aToken.Copy( nStt, nPos-nStt ) );
 
 //JP 23.03.97: die PlugIns wollen die TokenName im "Original" haben
-//              also nur fuers Suchen in UpperCase wandeln
+//				also nur fuers Suchen in UpperCase wandeln
             String sNameUpperCase( sName );
             sNameUpperCase.ToUpperAscii();
 
@@ -1847,7 +1847,7 @@ int HTMLParser::FilterXMP( int nToken )
     case HTML_TEXTTOKEN:
     case HTML_NONBREAKSPACE:
     case HTML_SOFTHYPH:
-        break;              // bleiben erhalten
+        break;				// bleiben erhalten
 
     default:
         if( nToken )
@@ -1888,7 +1888,7 @@ int HTMLParser::FilterListing( int nToken )
     case HTML_TEXTTOKEN:
     case HTML_NONBREAKSPACE:
     case HTML_SOFTHYPH:
-        break;      // bleiben erhalten
+        break;		// bleiben erhalten
 
     default:
         if( nToken )
diff --git a/svtools/source/svrtf/parrtf.cxx b/svtools/source/svrtf/parrtf.cxx
index 1c578d160307..78f067af2bcd 100644
--- a/svtools/source/svrtf/parrtf.cxx
+++ b/svtools/source/svrtf/parrtf.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
@@ -29,8 +29,8 @@
 #include "precompiled_svtools.hxx"
 
 /* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil -*- */
-
-#include <stdio.h>                      // for EOF
+ 
+#include <stdio.h>		                // for EOF
 #include <rtl/tencinfo.h>
 #include <tools/stream.hxx>
 #include <tools/debug.hxx>
@@ -48,7 +48,7 @@ SV_IMPL_VARARR( RtfParserStates_Impl, RtfParserState_Impl )
 
 SvRTFParser::SvRTFParser( SvStream& rIn, BYTE nStackSize )
     : SvParser( rIn, nStackSize ),
-    eUNICodeSet( RTL_TEXTENCODING_MS_1252 ),    // default ist ANSI-CodeSet
+    eUNICodeSet( RTL_TEXTENCODING_MS_1252 ), 	// default ist ANSI-CodeSet
     nUCharOverread( 1 )
 {
     // default ist ANSI-CodeSet
@@ -78,11 +78,11 @@ int SvRTFParser::_GetNextToken()
                 case '{':
                 case '}':
                 case '\\':
-                case '+':       // habe ich in einem RTF-File gefunden
-                case '~':       // nonbreaking space
-                case '-':       // optional hyphen
-                case '_':       // nonbreaking hyphen
-                case '\'':      // HexValue
+                case '+':		// habe ich in einem RTF-File gefunden
+                case '~':		// nonbreaking space
+                case '-':		// optional hyphen
+                case '_':		// nonbreaking hyphen
+                case '\'':		// HexValue
                     nNextCh = '\\';
                     rInput.SeekRel( -1 );
                     ScanText();
@@ -90,13 +90,13 @@ int SvRTFParser::_GetNextToken()
                     bNextCh = 0 == nNextCh;
                     break;
 
-                case '*':       // ignoreflag
+                case '*':		// ignoreflag
                     nRet = RTF_IGNOREFLAG;
                     break;
-                case ':':       // subentry in an index entry
+                case ':':	 	// subentry in an index entry
                     nRet = RTF_SUBENTRYINDEX;
                     break;
-                case '|':       // formula-charakter
+                case '|':		// formula-charakter
                     nRet = RTF_FORMULA;
                     break;
 
@@ -152,12 +152,12 @@ int SvRTFParser::_GetNextToken()
                                 nTokenValue = -nTokenValue;
                             bTokenHasValue=true;
                         }
-                        else if( bNegValue )        // das Minus wieder zurueck
+                        else if( bNegValue )		// das Minus wieder zurueck
                         {
                             nNextCh = '-';
                             rInput.SeekRel( -1 );
                         }
-                        if( ' ' == nNextCh )        // Blank gehoert zum Token!
+                        if( ' ' == nNextCh )		// Blank gehoert zum Token!
                             nNextCh = GetNextChar();
 
                         // suche das Token in der Tabelle:
@@ -174,7 +174,7 @@ int SvRTFParser::_GetNextToken()
                             {
                                 nUCharOverread = (BYTE)nTokenValue;
 #if 1
-                                //cmc: other ifdef breaks #i3584
+                                //cmc: other ifdef breaks #i3584 
                                 aParserStates[ aParserStates.Count()-1].
                                     nUCharOverread = nUCharOverread;
 #else
@@ -404,16 +404,16 @@ void SvRTFParser::ScanText( const sal_Unicode cBreak )
                 case '\\':
                 case '}':
                 case '{':
-                case '+':       // habe ich in einem RTF-File gefunden
+                case '+':		// habe ich in einem RTF-File gefunden
                     aStrBuffer.Append(nNextCh);
                     break;
-                case '~':       // nonbreaking space
+                case '~':		// nonbreaking space
                     aStrBuffer.Append(static_cast< sal_Unicode >(0xA0));
                     break;
-                case '-':       // optional hyphen
+                case '-':		// optional hyphen
                     aStrBuffer.Append(static_cast< sal_Unicode >(0xAD));
                     break;
-                case '_':       // nonbreaking hyphen
+                case '_':		// nonbreaking hyphen
                     aStrBuffer.Append(static_cast< sal_Unicode >(0x2011));
                     break;
 
@@ -461,7 +461,7 @@ void SvRTFParser::ScanText( const sal_Unicode cBreak )
                         else
                         {
                             nNextCh = '\\';
-                            bWeiter = false;        // Abbrechen, String zusammen
+                            bWeiter = false;		// Abbrechen, String zusammen
                         }
                     }
                     break;
@@ -469,7 +469,7 @@ void SvRTFParser::ScanText( const sal_Unicode cBreak )
                 default:
                     rInput.SeekRel( -1 );
                     nNextCh = '\\';
-                    bWeiter = false;        // Abbrechen, String zusammen
+                    bWeiter = false;		// Abbrechen, String zusammen
                     break;
                 }
             }
@@ -525,10 +525,10 @@ short SvRTFParser::_inSkipGroup=0;
 void SvRTFParser::SkipGroup()
 {
 short nBrackets=1;
-if (_inSkipGroup>0)
+if (_inSkipGroup>0) 
     return;
 _inSkipGroup++;
-#if 1   //#i16185# fecking \bin keyword
+#if 1	//#i16185# fecking \bin keyword
     do
     {
         switch (nNextCh)
@@ -585,9 +585,9 @@ _inSkipGroup++;
     _inSkipGroup--;
 }
 
-void SvRTFParser::ReadUnknownData() { SkipGroup(); }
-void SvRTFParser::ReadBitmapData()  { SkipGroup(); }
-void SvRTFParser::ReadOLEData()     { SkipGroup(); }
+void SvRTFParser::ReadUnknownData()	{ SkipGroup(); }
+void SvRTFParser::ReadBitmapData()	{ SkipGroup(); }
+void SvRTFParser::ReadOLEData()		{ SkipGroup(); }
 
 
 SvParserState SvRTFParser::CallParser()
@@ -598,7 +598,7 @@ SvParserState SvRTFParser::CallParser()
     eState = SVPAR_WORKING;
     nOpenBrakets = 0;
     SetSrcEncoding( eCodeSet = RTL_TEXTENCODING_MS_1252 );
-    eUNICodeSet = RTL_TEXTENCODING_MS_1252;     // default ist ANSI-CodeSet
+    eUNICodeSet = RTL_TEXTENCODING_MS_1252; 	// default ist ANSI-CodeSet
 
     // die 1. beiden Token muessen '{' und \\rtf sein !!
     if( '{' == GetNextToken() && RTF_RTF == GetNextToken() )
@@ -606,7 +606,7 @@ SvParserState SvRTFParser::CallParser()
         AddRef();
         Continue( 0 );
         if( SVPAR_PENDING != eState )
-            ReleaseRef();       // dann brauchen wir den Parser nicht mehr!
+            ReleaseRef();		// dann brauchen wir den Parser nicht mehr!
     }
     else
         eState = SVPAR_ERROR;
@@ -616,8 +616,8 @@ SvParserState SvRTFParser::CallParser()
 
 void SvRTFParser::Continue( int nToken )
 {
-//  DBG_ASSERT( SVPAR_CS_DONTKNOW == GetCharSet(),
-//              "Zeichensatz wurde geaendert." );
+//	DBG_ASSERT( SVPAR_CS_DONTKNOW == GetCharSet(),
+//				"Zeichensatz wurde geaendert." );
 
     if( !nToken )
         nToken = GetNextToken();
@@ -647,25 +647,25 @@ void SvRTFParser::Continue( int nToken )
                     nToken = GetNextToken();
                     if( '}' != nToken )
                         eState = SVPAR_ERROR;
-                    break;      // auf zum naechsten Token!!
+                    break;		// auf zum naechsten Token!!
                 }
             }
             goto NEXTTOKEN;
 
         case RTF_UNKNOWNCONTROL:
-            break;      // unbekannte Token ueberspringen
+            break;		// unbekannte Token ueberspringen
         case RTF_NEXTTYPE:
-        case RTF_ANSITYPE:
-            SetSrcEncoding( eCodeSet = RTL_TEXTENCODING_MS_1252 );
+        case RTF_ANSITYPE:		
+            SetSrcEncoding( eCodeSet = RTL_TEXTENCODING_MS_1252 );		
             break;
-        case RTF_MACTYPE:
-            SetSrcEncoding( eCodeSet = RTL_TEXTENCODING_APPLE_ROMAN );
+        case RTF_MACTYPE:		
+            SetSrcEncoding( eCodeSet = RTL_TEXTENCODING_APPLE_ROMAN );		
             break;
-        case RTF_PCTYPE:
-            SetSrcEncoding( eCodeSet = RTL_TEXTENCODING_IBM_437 );
+        case RTF_PCTYPE:		
+            SetSrcEncoding( eCodeSet = RTL_TEXTENCODING_IBM_437 );	
             break;
-        case RTF_PCATYPE:
-            SetSrcEncoding( eCodeSet = RTL_TEXTENCODING_IBM_850 );
+        case RTF_PCATYPE:		
+            SetSrcEncoding( eCodeSet = RTL_TEXTENCODING_IBM_850 );	
             break;
         case RTF_ANSICPG:
             eCodeSet = rtl_getTextEncodingFromWindowsCodePage(nTokenValue);
@@ -677,7 +677,7 @@ NEXTTOKEN:
             break;
         }
         if( IsParserWorking() )
-            SaveState( 0 );         // bis hierhin abgearbeitet,
+            SaveState( 0 );			// bis hierhin abgearbeitet,
                                     // weiter mit neuem Token!
         nToken = GetNextToken();
     }
diff --git a/svtools/source/svrtf/rtfkey2.cxx b/svtools/source/svrtf/rtfkey2.cxx
index 03a7667f48e2..bd0bc82f4a39 100644
--- a/svtools/source/svrtf/rtfkey2.cxx
+++ b/svtools/source/svrtf/rtfkey2.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
@@ -1043,25 +1043,25 @@ sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_ULTHDASHDD, "\\ulthdashdd" );
 sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_ULHWAVE, "\\ulhwave" );
 sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_ULULDBWAVE, "\\ululdbwave" );
 
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_LOCH,       "\\loch" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_HICH,       "\\hich" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_DBCH,       "\\dbch" );
+sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_LOCH,    	"\\loch" );
+sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_HICH,    	"\\hich" );
+sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_DBCH,    	"\\dbch" );
 sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_LANGFE,    "\\langfe" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_ADEFLANG,   "\\adeflang" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_ADEFF,      "\\adeff" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_ACCNONE,    "\\accnone" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_ACCDOT, "\\accdot" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_ACCCOMMA,   "\\acccomma" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_TWOINONE,   "\\twoinone" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_HORZVERT,   "\\horzvert" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_FAHANG,     "\\fahang" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_FAVAR,  "\\favar" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_FACENTER,   "\\facenter" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_FAROMAN,    "\\faroman" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_FAFIXED,    "\\fafixed" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_NOCWRAP,    "\\nocwrap" );
+sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_ADEFLANG,	"\\adeflang" );
+sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_ADEFF,		"\\adeff" );
+sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_ACCNONE,	"\\accnone" );
+sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_ACCDOT,	"\\accdot" );
+sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_ACCCOMMA,	"\\acccomma" );
+sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_TWOINONE,	"\\twoinone" );
+sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_HORZVERT,	"\\horzvert" );
+sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_FAHANG, 	"\\fahang" );
+sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_FAVAR, 	"\\favar" );
+sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_FACENTER, 	"\\facenter" );
+sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_FAROMAN, 	"\\faroman" );
+sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_FAFIXED, 	"\\fafixed" );
+sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_NOCWRAP, 	"\\nocwrap" );
 sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_NOOVERFLOW,"\\nooverflow" );
-sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_ASPALPHA,   "\\aspalpha" );
+sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_ASPALPHA, 	"\\aspalpha" );
 
 // SWG spezifische Attribute
 sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_GRFALIGNV, "\\grfalignv" );
diff --git a/svtools/source/svrtf/rtfkeywd.cxx b/svtools/source/svrtf/rtfkeywd.cxx
index 27ce3643f8cf..1c6f93cb1163 100644
--- a/svtools/source/svrtf/rtfkeywd.cxx
+++ b/svtools/source/svrtf/rtfkeywd.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
@@ -71,9 +71,9 @@ static RTF_TokenEntry __FAR_DATA aRTFTokenTab[] = {
 {{OOO_STRING_SVTOOLS_RTF_FSCRIPT},       RTF_FSCRIPT},
 {{OOO_STRING_SVTOOLS_RTF_FDECOR},        RTF_FDECOR},
 {{OOO_STRING_SVTOOLS_RTF_FTECH},         RTF_FTECH},
-{{OOO_STRING_SVTOOLS_RTF_FCHARSET},     RTF_FCHARSET},
-{{OOO_STRING_SVTOOLS_RTF_FALT},         RTF_FALT},
-{{OOO_STRING_SVTOOLS_RTF_FPRQ},         RTF_FPRQ},
+{{OOO_STRING_SVTOOLS_RTF_FCHARSET},		RTF_FCHARSET},
+{{OOO_STRING_SVTOOLS_RTF_FALT},			RTF_FALT},
+{{OOO_STRING_SVTOOLS_RTF_FPRQ},			RTF_FPRQ},
 {{OOO_STRING_SVTOOLS_RTF_COLORTBL},      RTF_COLORTBL},
 {{OOO_STRING_SVTOOLS_RTF_RED},           RTF_RED},
 {{OOO_STRING_SVTOOLS_RTF_GREEN},         RTF_GREEN},
@@ -213,9 +213,9 @@ static RTF_TokenEntry __FAR_DATA aRTFTokenTab[] = {
 {{OOO_STRING_SVTOOLS_RTF_VERTALJ},       RTF_VERTALJ},
 {{OOO_STRING_SVTOOLS_RTF_COLS},          RTF_COLS},
 {{OOO_STRING_SVTOOLS_RTF_COLSX},         RTF_COLSX},
-{{OOO_STRING_SVTOOLS_RTF_COLNO},            RTF_COLNO},
-{{OOO_STRING_SVTOOLS_RTF_COLSR},            RTF_COLSR},
-{{OOO_STRING_SVTOOLS_RTF_COLW},         RTF_COLW},
+{{OOO_STRING_SVTOOLS_RTF_COLNO},			RTF_COLNO},
+{{OOO_STRING_SVTOOLS_RTF_COLSR},			RTF_COLSR},
+{{OOO_STRING_SVTOOLS_RTF_COLW},			RTF_COLW},
 {{OOO_STRING_SVTOOLS_RTF_LINEBETCOL},    RTF_LINEBETCOL},
 {{OOO_STRING_SVTOOLS_RTF_ENDNHERE},      RTF_ENDNHERE},
 {{OOO_STRING_SVTOOLS_RTF_TITLEPG},       RTF_TITLEPG},
@@ -236,7 +236,7 @@ static RTF_TokenEntry __FAR_DATA aRTFTokenTab[] = {
 {{OOO_STRING_SVTOOLS_RTF_INTBL},         RTF_INTBL},
 {{OOO_STRING_SVTOOLS_RTF_KEEP},          RTF_KEEP},
 {{OOO_STRING_SVTOOLS_RTF_KEEPN},         RTF_KEEPN},
-{{OOO_STRING_SVTOOLS_RTF_LEVEL},            RTF_LEVEL},
+{{OOO_STRING_SVTOOLS_RTF_LEVEL},			RTF_LEVEL},
 {{OOO_STRING_SVTOOLS_RTF_SBYS},          RTF_SBYS},
 {{OOO_STRING_SVTOOLS_RTF_PAGEBB},        RTF_PAGEBB},
 {{OOO_STRING_SVTOOLS_RTF_NOLINE},        RTF_NOLINE},
@@ -324,9 +324,9 @@ static RTF_TokenEntry __FAR_DATA aRTFTokenTab[] = {
 {{OOO_STRING_SVTOOLS_RTF_UP},            RTF_UP},
 {{OOO_STRING_SVTOOLS_RTF_DN},            RTF_DN},
 {{OOO_STRING_SVTOOLS_RTF_REVISED},       RTF_REVISED},
-{{OOO_STRING_SVTOOLS_RTF_SUB},          RTF_SUB},
-{{OOO_STRING_SVTOOLS_RTF_NOSUPERSUB},   RTF_NOSUPERSUB},
-{{OOO_STRING_SVTOOLS_RTF_SUPER},            RTF_SUPER},
+{{OOO_STRING_SVTOOLS_RTF_SUB},			RTF_SUB},
+{{OOO_STRING_SVTOOLS_RTF_NOSUPERSUB},	RTF_NOSUPERSUB},
+{{OOO_STRING_SVTOOLS_RTF_SUPER},			RTF_SUPER},
 {{OOO_STRING_SVTOOLS_RTF_CHDATE},        RTF_CHDATE},
 {{OOO_STRING_SVTOOLS_RTF_CHTIME},        RTF_CHTIME},
 {{OOO_STRING_SVTOOLS_RTF_CHPGN},         RTF_CHPGN},
@@ -423,7 +423,7 @@ static RTF_TokenEntry __FAR_DATA aRTFTokenTab[] = {
 {{OOO_STRING_SVTOOLS_RTF_CLBGBDIAG},     RTF_CLBGBDIAG},
 {{OOO_STRING_SVTOOLS_RTF_CLBGCROSS},     RTF_CLBGCROSS},
 {{OOO_STRING_SVTOOLS_RTF_CLBGDCROSS},    RTF_CLBGDCROSS},
-{{OOO_STRING_SVTOOLS_RTF_CLBGDKHOR},    RTF_CLBGDKHOR},
+{{OOO_STRING_SVTOOLS_RTF_CLBGDKHOR},   	RTF_CLBGDKHOR},
 {{OOO_STRING_SVTOOLS_RTF_CLBGDKVERT},    RTF_CLBGDKVERT},
 {{OOO_STRING_SVTOOLS_RTF_CLBGDKFDIAG},   RTF_CLBGDKFDIAG},
 {{OOO_STRING_SVTOOLS_RTF_CLBGDKBDIAG},   RTF_CLBGDKBDIAG},
@@ -432,307 +432,307 @@ static RTF_TokenEntry __FAR_DATA aRTFTokenTab[] = {
 {{OOO_STRING_SVTOOLS_RTF_CLCFPAT},       RTF_CLCFPAT},
 {{OOO_STRING_SVTOOLS_RTF_CLCBPAT},       RTF_CLCBPAT},
 
-{{OOO_STRING_SVTOOLS_RTF_AB},           RTF_AB},
-{{OOO_STRING_SVTOOLS_RTF_ACAPS},            RTF_ACAPS},
-{{OOO_STRING_SVTOOLS_RTF_ACF},          RTF_ACF},
-{{OOO_STRING_SVTOOLS_RTF_ADDITIVE},     RTF_ADDITIVE},
-{{OOO_STRING_SVTOOLS_RTF_ADN},          RTF_ADN},
-{{OOO_STRING_SVTOOLS_RTF_AENDDOC},      RTF_AENDDOC},
-{{OOO_STRING_SVTOOLS_RTF_AENDNOTES},        RTF_AENDNOTES},
-{{OOO_STRING_SVTOOLS_RTF_AEXPND},       RTF_AEXPND},
-{{OOO_STRING_SVTOOLS_RTF_AF},           RTF_AF},
-{{OOO_STRING_SVTOOLS_RTF_AFS},          RTF_AFS},
-{{OOO_STRING_SVTOOLS_RTF_AFTNBJ},       RTF_AFTNBJ},
-{{OOO_STRING_SVTOOLS_RTF_AFTNCN},       RTF_AFTNCN},
-{{OOO_STRING_SVTOOLS_RTF_AFTNNALC},     RTF_AFTNNALC},
-{{OOO_STRING_SVTOOLS_RTF_AFTNNAR},      RTF_AFTNNAR},
-{{OOO_STRING_SVTOOLS_RTF_AFTNNAUC},     RTF_AFTNNAUC},
-{{OOO_STRING_SVTOOLS_RTF_AFTNNCHI},     RTF_AFTNNCHI},
-{{OOO_STRING_SVTOOLS_RTF_AFTNNRLC},     RTF_AFTNNRLC},
-{{OOO_STRING_SVTOOLS_RTF_AFTNNRUC},     RTF_AFTNNRUC},
-{{OOO_STRING_SVTOOLS_RTF_AFTNRESTART},  RTF_AFTNRESTART},
-{{OOO_STRING_SVTOOLS_RTF_AFTNRSTCONT},  RTF_AFTNRSTCONT},
-{{OOO_STRING_SVTOOLS_RTF_AFTNSEP},      RTF_AFTNSEP},
-{{OOO_STRING_SVTOOLS_RTF_AFTNSEPC},     RTF_AFTNSEPC},
-{{OOO_STRING_SVTOOLS_RTF_AFTNSTART},        RTF_AFTNSTART},
-{{OOO_STRING_SVTOOLS_RTF_AFTNTJ},       RTF_AFTNTJ},
-{{OOO_STRING_SVTOOLS_RTF_AI},           RTF_AI},
-{{OOO_STRING_SVTOOLS_RTF_ALANG},            RTF_ALANG},
-{{OOO_STRING_SVTOOLS_RTF_ALLPROT},      RTF_ALLPROT},
-{{OOO_STRING_SVTOOLS_RTF_ANNOTPROT},        RTF_ANNOTPROT},
-{{OOO_STRING_SVTOOLS_RTF_AOUTL},            RTF_AOUTL},
-{{OOO_STRING_SVTOOLS_RTF_ASCAPS},       RTF_ASCAPS},
-{{OOO_STRING_SVTOOLS_RTF_ASHAD},            RTF_ASHAD},
-{{OOO_STRING_SVTOOLS_RTF_ASTRIKE},      RTF_ASTRIKE},
-{{OOO_STRING_SVTOOLS_RTF_ATNAUTHOR},        RTF_ATNAUTHOR},
-{{OOO_STRING_SVTOOLS_RTF_ATNICN},       RTF_ATNICN},
-{{OOO_STRING_SVTOOLS_RTF_ATNREF},       RTF_ATNREF},
-{{OOO_STRING_SVTOOLS_RTF_ATNTIME},      RTF_ATNTIME},
-{{OOO_STRING_SVTOOLS_RTF_ATRFEND},      RTF_ATRFEND},
-{{OOO_STRING_SVTOOLS_RTF_ATRFSTART},        RTF_ATRFSTART},
-{{OOO_STRING_SVTOOLS_RTF_AUL},          RTF_AUL},
-{{OOO_STRING_SVTOOLS_RTF_AULD},         RTF_AULD},
-{{OOO_STRING_SVTOOLS_RTF_AULDB},            RTF_AULDB},
-{{OOO_STRING_SVTOOLS_RTF_AULNONE},      RTF_AULNONE},
-{{OOO_STRING_SVTOOLS_RTF_AULW},         RTF_AULW},
-{{OOO_STRING_SVTOOLS_RTF_AUP},          RTF_AUP},
-{{OOO_STRING_SVTOOLS_RTF_BKMKPUB},      RTF_BKMKPUB},
-{{OOO_STRING_SVTOOLS_RTF_BRDRDASH},     RTF_BRDRDASH},
-{{OOO_STRING_SVTOOLS_RTF_BRKFRM},       RTF_BRKFRM},
-{{OOO_STRING_SVTOOLS_RTF_CCHS},         RTF_CCHS},
-{{OOO_STRING_SVTOOLS_RTF_CPG},          RTF_CPG},
-{{OOO_STRING_SVTOOLS_RTF_CS},           RTF_CS},
-{{OOO_STRING_SVTOOLS_RTF_CVMME},            RTF_CVMME},
-{{OOO_STRING_SVTOOLS_RTF_DATAFIELD},        RTF_DATAFIELD},
-{{OOO_STRING_SVTOOLS_RTF_DO},           RTF_DO},
-{{OOO_STRING_SVTOOLS_RTF_DOBXCOLUMN},   RTF_DOBXCOLUMN},
-{{OOO_STRING_SVTOOLS_RTF_DOBXMARGIN},   RTF_DOBXMARGIN},
-{{OOO_STRING_SVTOOLS_RTF_DOBXPAGE},     RTF_DOBXPAGE},
-{{OOO_STRING_SVTOOLS_RTF_DOBYMARGIN},   RTF_DOBYMARGIN},
-{{OOO_STRING_SVTOOLS_RTF_DOBYPAGE},     RTF_DOBYPAGE},
-{{OOO_STRING_SVTOOLS_RTF_DOBYPARA},     RTF_DOBYPARA},
-{{OOO_STRING_SVTOOLS_RTF_DODHGT},       RTF_DODHGT},
-{{OOO_STRING_SVTOOLS_RTF_DOLOCK},       RTF_DOLOCK},
-{{OOO_STRING_SVTOOLS_RTF_DPAENDHOL},        RTF_DPAENDHOL},
-{{OOO_STRING_SVTOOLS_RTF_DPAENDL},      RTF_DPAENDL},
-{{OOO_STRING_SVTOOLS_RTF_DPAENDSOL},        RTF_DPAENDSOL},
-{{OOO_STRING_SVTOOLS_RTF_DPAENDW},      RTF_DPAENDW},
-{{OOO_STRING_SVTOOLS_RTF_DPARC},            RTF_DPARC},
-{{OOO_STRING_SVTOOLS_RTF_DPARCFLIPX},   RTF_DPARCFLIPX},
-{{OOO_STRING_SVTOOLS_RTF_DPARCFLIPY},   RTF_DPARCFLIPY},
-{{OOO_STRING_SVTOOLS_RTF_DPASTARTHOL},  RTF_DPASTARTHOL},
-{{OOO_STRING_SVTOOLS_RTF_DPASTARTL},        RTF_DPASTARTL},
-{{OOO_STRING_SVTOOLS_RTF_DPASTARTSOL},  RTF_DPASTARTSOL},
-{{OOO_STRING_SVTOOLS_RTF_DPASTARTW},        RTF_DPASTARTW},
-{{OOO_STRING_SVTOOLS_RTF_DPCALLOUT},        RTF_DPCALLOUT},
-{{OOO_STRING_SVTOOLS_RTF_DPCOA},            RTF_DPCOA},
-{{OOO_STRING_SVTOOLS_RTF_DPCOACCENT},   RTF_DPCOACCENT},
-{{OOO_STRING_SVTOOLS_RTF_DPCOBESTFIT},  RTF_DPCOBESTFIT},
-{{OOO_STRING_SVTOOLS_RTF_DPCOBORDER},   RTF_DPCOBORDER},
-{{OOO_STRING_SVTOOLS_RTF_DPCODABS},     RTF_DPCODABS},
-{{OOO_STRING_SVTOOLS_RTF_DPCODBOTTOM},  RTF_DPCODBOTTOM},
-{{OOO_STRING_SVTOOLS_RTF_DPCODCENTER},  RTF_DPCODCENTER},
-{{OOO_STRING_SVTOOLS_RTF_DPCODTOP},     RTF_DPCODTOP},
-{{OOO_STRING_SVTOOLS_RTF_DPCOLENGTH},   RTF_DPCOLENGTH},
-{{OOO_STRING_SVTOOLS_RTF_DPCOMINUSX},   RTF_DPCOMINUSX},
-{{OOO_STRING_SVTOOLS_RTF_DPCOMINUSY},   RTF_DPCOMINUSY},
-{{OOO_STRING_SVTOOLS_RTF_DPCOOFFSET},   RTF_DPCOOFFSET},
-{{OOO_STRING_SVTOOLS_RTF_DPCOSMARTA},   RTF_DPCOSMARTA},
-{{OOO_STRING_SVTOOLS_RTF_DPCOTDOUBLE},  RTF_DPCOTDOUBLE},
-{{OOO_STRING_SVTOOLS_RTF_DPCOTRIGHT},   RTF_DPCOTRIGHT},
-{{OOO_STRING_SVTOOLS_RTF_DPCOTSINGLE},  RTF_DPCOTSINGLE},
-{{OOO_STRING_SVTOOLS_RTF_DPCOTTRIPLE},  RTF_DPCOTTRIPLE},
-{{OOO_STRING_SVTOOLS_RTF_DPCOUNT},      RTF_DPCOUNT},
-{{OOO_STRING_SVTOOLS_RTF_DPELLIPSE},        RTF_DPELLIPSE},
-{{OOO_STRING_SVTOOLS_RTF_DPENDGROUP},   RTF_DPENDGROUP},
-{{OOO_STRING_SVTOOLS_RTF_DPFILLBGCB},   RTF_DPFILLBGCB},
-{{OOO_STRING_SVTOOLS_RTF_DPFILLBGCG},   RTF_DPFILLBGCG},
-{{OOO_STRING_SVTOOLS_RTF_DPFILLBGCR},   RTF_DPFILLBGCR},
-{{OOO_STRING_SVTOOLS_RTF_DPFILLBGGRAY}, RTF_DPFILLBGGRAY},
-{{OOO_STRING_SVTOOLS_RTF_DPFILLBGPAL},  RTF_DPFILLBGPAL},
-{{OOO_STRING_SVTOOLS_RTF_DPFILLFGCB},   RTF_DPFILLFGCB},
-{{OOO_STRING_SVTOOLS_RTF_DPFILLFGCG},   RTF_DPFILLFGCG},
-{{OOO_STRING_SVTOOLS_RTF_DPFILLFGCR},   RTF_DPFILLFGCR},
-{{OOO_STRING_SVTOOLS_RTF_DPFILLFGGRAY}, RTF_DPFILLFGGRAY},
-{{OOO_STRING_SVTOOLS_RTF_DPFILLFGPAL},  RTF_DPFILLFGPAL},
-{{OOO_STRING_SVTOOLS_RTF_DPFILLPAT},        RTF_DPFILLPAT},
-{{OOO_STRING_SVTOOLS_RTF_DPGROUP},      RTF_DPGROUP},
-{{OOO_STRING_SVTOOLS_RTF_DPLINE},       RTF_DPLINE},
-{{OOO_STRING_SVTOOLS_RTF_DPLINECOB},        RTF_DPLINECOB},
-{{OOO_STRING_SVTOOLS_RTF_DPLINECOG},        RTF_DPLINECOG},
-{{OOO_STRING_SVTOOLS_RTF_DPLINECOR},        RTF_DPLINECOR},
-{{OOO_STRING_SVTOOLS_RTF_DPLINEDADO},   RTF_DPLINEDADO},
-{{OOO_STRING_SVTOOLS_RTF_DPLINEDADODO}, RTF_DPLINEDADODO},
-{{OOO_STRING_SVTOOLS_RTF_DPLINEDASH},   RTF_DPLINEDASH},
-{{OOO_STRING_SVTOOLS_RTF_DPLINEDOT},        RTF_DPLINEDOT},
-{{OOO_STRING_SVTOOLS_RTF_DPLINEGRAY},   RTF_DPLINEGRAY},
-{{OOO_STRING_SVTOOLS_RTF_DPLINEHOLLOW}, RTF_DPLINEHOLLOW},
-{{OOO_STRING_SVTOOLS_RTF_DPLINEPAL},        RTF_DPLINEPAL},
-{{OOO_STRING_SVTOOLS_RTF_DPLINESOLID},  RTF_DPLINESOLID},
-{{OOO_STRING_SVTOOLS_RTF_DPLINEW},      RTF_DPLINEW},
-{{OOO_STRING_SVTOOLS_RTF_DPPOLYCOUNT},  RTF_DPPOLYCOUNT},
-{{OOO_STRING_SVTOOLS_RTF_DPPOLYGON},        RTF_DPPOLYGON},
-{{OOO_STRING_SVTOOLS_RTF_DPPOLYLINE},   RTF_DPPOLYLINE},
-{{OOO_STRING_SVTOOLS_RTF_DPPTX},            RTF_DPPTX},
-{{OOO_STRING_SVTOOLS_RTF_DPPTY},            RTF_DPPTY},
-{{OOO_STRING_SVTOOLS_RTF_DPRECT},       RTF_DPRECT},
-{{OOO_STRING_SVTOOLS_RTF_DPROUNDR},     RTF_DPROUNDR},
-{{OOO_STRING_SVTOOLS_RTF_DPSHADOW},     RTF_DPSHADOW},
-{{OOO_STRING_SVTOOLS_RTF_DPSHADX},      RTF_DPSHADX},
-{{OOO_STRING_SVTOOLS_RTF_DPSHADY},      RTF_DPSHADY},
-{{OOO_STRING_SVTOOLS_RTF_DPTXBX},       RTF_DPTXBX},
-{{OOO_STRING_SVTOOLS_RTF_DPTXBXMAR},        RTF_DPTXBXMAR},
-{{OOO_STRING_SVTOOLS_RTF_DPTXBXTEXT},   RTF_DPTXBXTEXT},
-{{OOO_STRING_SVTOOLS_RTF_DPX},          RTF_DPX},
-{{OOO_STRING_SVTOOLS_RTF_DPXSIZE},      RTF_DPXSIZE},
-{{OOO_STRING_SVTOOLS_RTF_DPY},          RTF_DPY},
-{{OOO_STRING_SVTOOLS_RTF_DPYSIZE},      RTF_DPYSIZE},
-{{OOO_STRING_SVTOOLS_RTF_DS},           RTF_DS},
-{{OOO_STRING_SVTOOLS_RTF_EMSPACE},      RTF_EMSPACE},
-{{OOO_STRING_SVTOOLS_RTF_ENSPACE},      RTF_ENSPACE},
-{{OOO_STRING_SVTOOLS_RTF_FBIDI},            RTF_FBIDI},
-{{OOO_STRING_SVTOOLS_RTF_FET},          RTF_FET},
-{{OOO_STRING_SVTOOLS_RTF_FID},          RTF_FID},
-{{OOO_STRING_SVTOOLS_RTF_FILE},         RTF_FILE},
-{{OOO_STRING_SVTOOLS_RTF_FILETBL},      RTF_FILETBL},
-{{OOO_STRING_SVTOOLS_RTF_FLDALT},       RTF_FLDALT},
-{{OOO_STRING_SVTOOLS_RTF_FNETWORK},     RTF_FNETWORK},
-{{OOO_STRING_SVTOOLS_RTF_FONTEMB},      RTF_FONTEMB},
-{{OOO_STRING_SVTOOLS_RTF_FONTFILE},     RTF_FONTFILE},
-{{OOO_STRING_SVTOOLS_RTF_FORMDISP},     RTF_FORMDISP},
-{{OOO_STRING_SVTOOLS_RTF_FORMPROT},     RTF_FORMPROT},
-{{OOO_STRING_SVTOOLS_RTF_FORMSHADE},        RTF_FORMSHADE},
-{{OOO_STRING_SVTOOLS_RTF_FOSNUM},       RTF_FOSNUM},
-{{OOO_STRING_SVTOOLS_RTF_FRELATIVE},        RTF_FRELATIVE},
-{{OOO_STRING_SVTOOLS_RTF_FTNALT},       RTF_FTNALT},
-{{OOO_STRING_SVTOOLS_RTF_FTNIL},            RTF_FTNIL},
-{{OOO_STRING_SVTOOLS_RTF_FTNNALC},      RTF_FTNNALC},
-{{OOO_STRING_SVTOOLS_RTF_FTNNAR},       RTF_FTNNAR},
-{{OOO_STRING_SVTOOLS_RTF_FTNNAUC},      RTF_FTNNAUC},
-{{OOO_STRING_SVTOOLS_RTF_FTNNCHI},      RTF_FTNNCHI},
-{{OOO_STRING_SVTOOLS_RTF_FTNNRLC},      RTF_FTNNRLC},
-{{OOO_STRING_SVTOOLS_RTF_FTNNRUC},      RTF_FTNNRUC},
-{{OOO_STRING_SVTOOLS_RTF_FTNRSTCONT},   RTF_FTNRSTCONT},
-{{OOO_STRING_SVTOOLS_RTF_FTNRSTPG},     RTF_FTNRSTPG},
-{{OOO_STRING_SVTOOLS_RTF_FTTRUETYPE},   RTF_FTTRUETYPE},
-{{OOO_STRING_SVTOOLS_RTF_FVALIDDOS},        RTF_FVALIDDOS},
-{{OOO_STRING_SVTOOLS_RTF_FVALIDHPFS},   RTF_FVALIDHPFS},
-{{OOO_STRING_SVTOOLS_RTF_FVALIDMAC},        RTF_FVALIDMAC},
-{{OOO_STRING_SVTOOLS_RTF_FVALIDNTFS},   RTF_FVALIDNTFS},
-{{OOO_STRING_SVTOOLS_RTF_HYPHAUTO},     RTF_HYPHAUTO},
-{{OOO_STRING_SVTOOLS_RTF_HYPHCAPS},     RTF_HYPHCAPS},
-{{OOO_STRING_SVTOOLS_RTF_HYPHCONSEC},   RTF_HYPHCONSEC},
-{{OOO_STRING_SVTOOLS_RTF_HYPHPAR},      RTF_HYPHPAR},
-{{OOO_STRING_SVTOOLS_RTF_LINKSELF},     RTF_LINKSELF},
-{{OOO_STRING_SVTOOLS_RTF_LINKSTYLES},   RTF_LINKSTYLES},
-{{OOO_STRING_SVTOOLS_RTF_LTRCH},            RTF_LTRCH},
-{{OOO_STRING_SVTOOLS_RTF_LTRDOC},       RTF_LTRDOC},
-{{OOO_STRING_SVTOOLS_RTF_LTRMARK},      RTF_LTRMARK},
-{{OOO_STRING_SVTOOLS_RTF_LTRPAR},       RTF_LTRPAR},
-{{OOO_STRING_SVTOOLS_RTF_LTRROW},       RTF_LTRROW},
-{{OOO_STRING_SVTOOLS_RTF_LTRSECT},      RTF_LTRSECT},
-{{OOO_STRING_SVTOOLS_RTF_NOCOLBAL},     RTF_NOCOLBAL},
-{{OOO_STRING_SVTOOLS_RTF_NOEXTRASPRL},  RTF_NOEXTRASPRL},
-{{OOO_STRING_SVTOOLS_RTF_NOTABIND},     RTF_NOTABIND},
-{{OOO_STRING_SVTOOLS_RTF_NOWIDCTLPAR},  RTF_NOWIDCTLPAR},
-{{OOO_STRING_SVTOOLS_RTF_OBJALIAS},     RTF_OBJALIAS},
-{{OOO_STRING_SVTOOLS_RTF_OBJALIGN},     RTF_OBJALIGN},
-{{OOO_STRING_SVTOOLS_RTF_OBJAUTLINK},   RTF_OBJAUTLINK},
-{{OOO_STRING_SVTOOLS_RTF_OBJCLASS},     RTF_OBJCLASS},
-{{OOO_STRING_SVTOOLS_RTF_OBJCROPB},     RTF_OBJCROPB},
-{{OOO_STRING_SVTOOLS_RTF_OBJCROPL},     RTF_OBJCROPL},
-{{OOO_STRING_SVTOOLS_RTF_OBJCROPR},     RTF_OBJCROPR},
-{{OOO_STRING_SVTOOLS_RTF_OBJCROPT},     RTF_OBJCROPT},
-{{OOO_STRING_SVTOOLS_RTF_OBJDATA},      RTF_OBJDATA},
-{{OOO_STRING_SVTOOLS_RTF_OBJECT},       RTF_OBJECT},
-{{OOO_STRING_SVTOOLS_RTF_OBJEMB},       RTF_OBJEMB},
-{{OOO_STRING_SVTOOLS_RTF_OBJH},         RTF_OBJH},
-{{OOO_STRING_SVTOOLS_RTF_OBJICEMB},     RTF_OBJICEMB},
-{{OOO_STRING_SVTOOLS_RTF_OBJLINK},      RTF_OBJLINK},
-{{OOO_STRING_SVTOOLS_RTF_OBJLOCK},      RTF_OBJLOCK},
-{{OOO_STRING_SVTOOLS_RTF_OBJNAME},      RTF_OBJNAME},
-{{OOO_STRING_SVTOOLS_RTF_OBJPUB},       RTF_OBJPUB},
-{{OOO_STRING_SVTOOLS_RTF_OBJSCALEX},        RTF_OBJSCALEX},
-{{OOO_STRING_SVTOOLS_RTF_OBJSCALEY},        RTF_OBJSCALEY},
-{{OOO_STRING_SVTOOLS_RTF_OBJSECT},      RTF_OBJSECT},
-{{OOO_STRING_SVTOOLS_RTF_OBJSETSIZE},   RTF_OBJSETSIZE},
-{{OOO_STRING_SVTOOLS_RTF_OBJSUB},       RTF_OBJSUB},
-{{OOO_STRING_SVTOOLS_RTF_OBJTIME},      RTF_OBJTIME},
-{{OOO_STRING_SVTOOLS_RTF_OBJTRANSY},        RTF_OBJTRANSY},
-{{OOO_STRING_SVTOOLS_RTF_OBJUPDATE},        RTF_OBJUPDATE},
-{{OOO_STRING_SVTOOLS_RTF_OBJW},         RTF_OBJW},
-{{OOO_STRING_SVTOOLS_RTF_OTBLRUL},      RTF_OTBLRUL},
-{{OOO_STRING_SVTOOLS_RTF_PGNHN},            RTF_PGNHN},
-{{OOO_STRING_SVTOOLS_RTF_PGNHNSC},      RTF_PGNHNSC},
-{{OOO_STRING_SVTOOLS_RTF_PGNHNSH},      RTF_PGNHNSH},
-{{OOO_STRING_SVTOOLS_RTF_PGNHNSM},      RTF_PGNHNSM},
-{{OOO_STRING_SVTOOLS_RTF_PGNHNSN},      RTF_PGNHNSN},
-{{OOO_STRING_SVTOOLS_RTF_PGNHNSP},      RTF_PGNHNSP},
-{{OOO_STRING_SVTOOLS_RTF_PICBMP},       RTF_PICBMP},
-{{OOO_STRING_SVTOOLS_RTF_PICBPP},       RTF_PICBPP},
-{{OOO_STRING_SVTOOLS_RTF_PN},           RTF_PN},
-{{OOO_STRING_SVTOOLS_RTF_PNACROSS},     RTF_PNACROSS},
-{{OOO_STRING_SVTOOLS_RTF_PNB},          RTF_PNB},
-{{OOO_STRING_SVTOOLS_RTF_PNCAPS},       RTF_PNCAPS},
-{{OOO_STRING_SVTOOLS_RTF_PNCARD},       RTF_PNCARD},
-{{OOO_STRING_SVTOOLS_RTF_PNCF},         RTF_PNCF},
-{{OOO_STRING_SVTOOLS_RTF_PNDEC},            RTF_PNDEC},
-{{OOO_STRING_SVTOOLS_RTF_PNF},          RTF_PNF},
-{{OOO_STRING_SVTOOLS_RTF_PNFS},         RTF_PNFS},
-{{OOO_STRING_SVTOOLS_RTF_PNHANG},       RTF_PNHANG},
-{{OOO_STRING_SVTOOLS_RTF_PNI},          RTF_PNI},
-{{OOO_STRING_SVTOOLS_RTF_PNINDENT},     RTF_PNINDENT},
-{{OOO_STRING_SVTOOLS_RTF_PNLCLTR},      RTF_PNLCLTR},
-{{OOO_STRING_SVTOOLS_RTF_PNLCRM},       RTF_PNLCRM},
-{{OOO_STRING_SVTOOLS_RTF_PNLVL},            RTF_PNLVL},
-{{OOO_STRING_SVTOOLS_RTF_PNLVLBLT},     RTF_PNLVLBLT},
-{{OOO_STRING_SVTOOLS_RTF_PNLVLBODY},        RTF_PNLVLBODY},
-{{OOO_STRING_SVTOOLS_RTF_PNLVLCONT},        RTF_PNLVLCONT},
-{{OOO_STRING_SVTOOLS_RTF_PNNUMONCE},        RTF_PNNUMONCE},
-{{OOO_STRING_SVTOOLS_RTF_PNORD},            RTF_PNORD},
-{{OOO_STRING_SVTOOLS_RTF_PNORDT},       RTF_PNORDT},
-{{OOO_STRING_SVTOOLS_RTF_PNPREV},       RTF_PNPREV},
-{{OOO_STRING_SVTOOLS_RTF_PNQC},         RTF_PNQC},
-{{OOO_STRING_SVTOOLS_RTF_PNQL},         RTF_PNQL},
-{{OOO_STRING_SVTOOLS_RTF_PNQR},         RTF_PNQR},
-{{OOO_STRING_SVTOOLS_RTF_PNRESTART},        RTF_PNRESTART},
-{{OOO_STRING_SVTOOLS_RTF_PNSCAPS},      RTF_PNSCAPS},
-{{OOO_STRING_SVTOOLS_RTF_PNSECLVL},     RTF_PNSECLVL},
-{{OOO_STRING_SVTOOLS_RTF_PNSP},         RTF_PNSP},
-{{OOO_STRING_SVTOOLS_RTF_PNSTART},      RTF_PNSTART},
-{{OOO_STRING_SVTOOLS_RTF_PNSTRIKE},     RTF_PNSTRIKE},
-{{OOO_STRING_SVTOOLS_RTF_PNTEXT},       RTF_PNTEXT},
-{{OOO_STRING_SVTOOLS_RTF_PNTXTA},       RTF_PNTXTA},
-{{OOO_STRING_SVTOOLS_RTF_PNTXTB},       RTF_PNTXTB},
-{{OOO_STRING_SVTOOLS_RTF_PNUCLTR},      RTF_PNUCLTR},
-{{OOO_STRING_SVTOOLS_RTF_PNUCRM},       RTF_PNUCRM},
-{{OOO_STRING_SVTOOLS_RTF_PNUL},         RTF_PNUL},
-{{OOO_STRING_SVTOOLS_RTF_PNULD},            RTF_PNULD},
-{{OOO_STRING_SVTOOLS_RTF_PNULDB},       RTF_PNULDB},
-{{OOO_STRING_SVTOOLS_RTF_PNULNONE},     RTF_PNULNONE},
-{{OOO_STRING_SVTOOLS_RTF_PNULW},            RTF_PNULW},
-{{OOO_STRING_SVTOOLS_RTF_PRCOLBL},      RTF_PRCOLBL},
-{{OOO_STRING_SVTOOLS_RTF_PRINTDATA},        RTF_PRINTDATA},
-{{OOO_STRING_SVTOOLS_RTF_PSZ},          RTF_PSZ},
-{{OOO_STRING_SVTOOLS_RTF_PUBAUTO},      RTF_PUBAUTO},
-{{OOO_STRING_SVTOOLS_RTF_RESULT},       RTF_RESULT},
-{{OOO_STRING_SVTOOLS_RTF_REVAUTH},      RTF_REVAUTH},
-{{OOO_STRING_SVTOOLS_RTF_REVDTTM},      RTF_REVDTTM},
-{{OOO_STRING_SVTOOLS_RTF_REVPROT},      RTF_REVPROT},
-{{OOO_STRING_SVTOOLS_RTF_REVTBL},       RTF_REVTBL},
-{{OOO_STRING_SVTOOLS_RTF_RSLTBMP},      RTF_RSLTBMP},
-{{OOO_STRING_SVTOOLS_RTF_RSLTMERGE},        RTF_RSLTMERGE},
-{{OOO_STRING_SVTOOLS_RTF_RSLTPICT},     RTF_RSLTPICT},
-{{OOO_STRING_SVTOOLS_RTF_RSLTRTF},      RTF_RSLTRTF},
-{{OOO_STRING_SVTOOLS_RTF_RSLTTXT},      RTF_RSLTTXT},
-{{OOO_STRING_SVTOOLS_RTF_RTLCH},            RTF_RTLCH},
-{{OOO_STRING_SVTOOLS_RTF_RTLDOC},       RTF_RTLDOC},
-{{OOO_STRING_SVTOOLS_RTF_RTLMARK},      RTF_RTLMARK},
-{{OOO_STRING_SVTOOLS_RTF_RTLPAR},       RTF_RTLPAR},
-{{OOO_STRING_SVTOOLS_RTF_RTLROW},       RTF_RTLROW},
-{{OOO_STRING_SVTOOLS_RTF_RTLSECT},      RTF_RTLSECT},
-{{OOO_STRING_SVTOOLS_RTF_SEC},          RTF_SEC},
-{{OOO_STRING_SVTOOLS_RTF_SECTNUM},      RTF_SECTNUM},
-{{OOO_STRING_SVTOOLS_RTF_SECTUNLOCKED}, RTF_SECTUNLOCKED},
-{{OOO_STRING_SVTOOLS_RTF_SLMULT},       RTF_SLMULT},
-{{OOO_STRING_SVTOOLS_RTF_SOFTCOL},      RTF_SOFTCOL},
-{{OOO_STRING_SVTOOLS_RTF_SOFTLHEIGHT},  RTF_SOFTLHEIGHT},
-{{OOO_STRING_SVTOOLS_RTF_SOFTLINE},     RTF_SOFTLINE},
-{{OOO_STRING_SVTOOLS_RTF_SOFTPAGE},     RTF_SOFTPAGE},
-{{OOO_STRING_SVTOOLS_RTF_SPRSSPBF},     RTF_SPRSSPBF},
-{{OOO_STRING_SVTOOLS_RTF_SPRSTSP},      RTF_SPRSTSP},
-{{OOO_STRING_SVTOOLS_RTF_SUBDOCUMENT},  RTF_SUBDOCUMENT},
-{{OOO_STRING_SVTOOLS_RTF_SWPBDR},       RTF_SWPBDR},
-{{OOO_STRING_SVTOOLS_RTF_TCN},          RTF_TCN},
-{{OOO_STRING_SVTOOLS_RTF_TRANSMF},      RTF_TRANSMF},
-{{OOO_STRING_SVTOOLS_RTF_TRBRDRB},      RTF_TRBRDRB},
-{{OOO_STRING_SVTOOLS_RTF_TRBRDRH},      RTF_TRBRDRH},
-{{OOO_STRING_SVTOOLS_RTF_TRBRDRL},      RTF_TRBRDRL},
-{{OOO_STRING_SVTOOLS_RTF_TRBRDRR},      RTF_TRBRDRR},
-{{OOO_STRING_SVTOOLS_RTF_TRBRDRT},      RTF_TRBRDRT},
-{{OOO_STRING_SVTOOLS_RTF_TRBRDRV},      RTF_TRBRDRV},
-{{OOO_STRING_SVTOOLS_RTF_TRHDR},            RTF_TRHDR},
-{{OOO_STRING_SVTOOLS_RTF_TRKEEP},       RTF_TRKEEP},
+{{OOO_STRING_SVTOOLS_RTF_AB},			RTF_AB},
+{{OOO_STRING_SVTOOLS_RTF_ACAPS},			RTF_ACAPS},
+{{OOO_STRING_SVTOOLS_RTF_ACF},			RTF_ACF},
+{{OOO_STRING_SVTOOLS_RTF_ADDITIVE},		RTF_ADDITIVE},
+{{OOO_STRING_SVTOOLS_RTF_ADN},			RTF_ADN},
+{{OOO_STRING_SVTOOLS_RTF_AENDDOC},		RTF_AENDDOC},
+{{OOO_STRING_SVTOOLS_RTF_AENDNOTES},		RTF_AENDNOTES},
+{{OOO_STRING_SVTOOLS_RTF_AEXPND},		RTF_AEXPND},
+{{OOO_STRING_SVTOOLS_RTF_AF},			RTF_AF},
+{{OOO_STRING_SVTOOLS_RTF_AFS},			RTF_AFS},
+{{OOO_STRING_SVTOOLS_RTF_AFTNBJ},		RTF_AFTNBJ},
+{{OOO_STRING_SVTOOLS_RTF_AFTNCN},		RTF_AFTNCN},
+{{OOO_STRING_SVTOOLS_RTF_AFTNNALC},		RTF_AFTNNALC},
+{{OOO_STRING_SVTOOLS_RTF_AFTNNAR},		RTF_AFTNNAR},
+{{OOO_STRING_SVTOOLS_RTF_AFTNNAUC},		RTF_AFTNNAUC},
+{{OOO_STRING_SVTOOLS_RTF_AFTNNCHI},		RTF_AFTNNCHI},
+{{OOO_STRING_SVTOOLS_RTF_AFTNNRLC},		RTF_AFTNNRLC},
+{{OOO_STRING_SVTOOLS_RTF_AFTNNRUC},		RTF_AFTNNRUC},
+{{OOO_STRING_SVTOOLS_RTF_AFTNRESTART},	RTF_AFTNRESTART},
+{{OOO_STRING_SVTOOLS_RTF_AFTNRSTCONT},	RTF_AFTNRSTCONT},
+{{OOO_STRING_SVTOOLS_RTF_AFTNSEP},		RTF_AFTNSEP},
+{{OOO_STRING_SVTOOLS_RTF_AFTNSEPC},		RTF_AFTNSEPC},
+{{OOO_STRING_SVTOOLS_RTF_AFTNSTART},		RTF_AFTNSTART},
+{{OOO_STRING_SVTOOLS_RTF_AFTNTJ},		RTF_AFTNTJ},
+{{OOO_STRING_SVTOOLS_RTF_AI},			RTF_AI},
+{{OOO_STRING_SVTOOLS_RTF_ALANG},			RTF_ALANG},
+{{OOO_STRING_SVTOOLS_RTF_ALLPROT},		RTF_ALLPROT},
+{{OOO_STRING_SVTOOLS_RTF_ANNOTPROT},		RTF_ANNOTPROT},
+{{OOO_STRING_SVTOOLS_RTF_AOUTL},			RTF_AOUTL},
+{{OOO_STRING_SVTOOLS_RTF_ASCAPS},		RTF_ASCAPS},
+{{OOO_STRING_SVTOOLS_RTF_ASHAD},			RTF_ASHAD},
+{{OOO_STRING_SVTOOLS_RTF_ASTRIKE},		RTF_ASTRIKE},
+{{OOO_STRING_SVTOOLS_RTF_ATNAUTHOR},		RTF_ATNAUTHOR},
+{{OOO_STRING_SVTOOLS_RTF_ATNICN},		RTF_ATNICN},
+{{OOO_STRING_SVTOOLS_RTF_ATNREF},		RTF_ATNREF},
+{{OOO_STRING_SVTOOLS_RTF_ATNTIME},		RTF_ATNTIME},
+{{OOO_STRING_SVTOOLS_RTF_ATRFEND},		RTF_ATRFEND},
+{{OOO_STRING_SVTOOLS_RTF_ATRFSTART},		RTF_ATRFSTART},
+{{OOO_STRING_SVTOOLS_RTF_AUL},			RTF_AUL},
+{{OOO_STRING_SVTOOLS_RTF_AULD},			RTF_AULD},
+{{OOO_STRING_SVTOOLS_RTF_AULDB},			RTF_AULDB},
+{{OOO_STRING_SVTOOLS_RTF_AULNONE},		RTF_AULNONE},
+{{OOO_STRING_SVTOOLS_RTF_AULW},			RTF_AULW},
+{{OOO_STRING_SVTOOLS_RTF_AUP},			RTF_AUP},
+{{OOO_STRING_SVTOOLS_RTF_BKMKPUB},		RTF_BKMKPUB},
+{{OOO_STRING_SVTOOLS_RTF_BRDRDASH},		RTF_BRDRDASH},
+{{OOO_STRING_SVTOOLS_RTF_BRKFRM},		RTF_BRKFRM},
+{{OOO_STRING_SVTOOLS_RTF_CCHS},			RTF_CCHS},
+{{OOO_STRING_SVTOOLS_RTF_CPG},			RTF_CPG},
+{{OOO_STRING_SVTOOLS_RTF_CS},			RTF_CS},
+{{OOO_STRING_SVTOOLS_RTF_CVMME},			RTF_CVMME},
+{{OOO_STRING_SVTOOLS_RTF_DATAFIELD},		RTF_DATAFIELD},
+{{OOO_STRING_SVTOOLS_RTF_DO},			RTF_DO},
+{{OOO_STRING_SVTOOLS_RTF_DOBXCOLUMN},	RTF_DOBXCOLUMN},
+{{OOO_STRING_SVTOOLS_RTF_DOBXMARGIN},	RTF_DOBXMARGIN},
+{{OOO_STRING_SVTOOLS_RTF_DOBXPAGE},		RTF_DOBXPAGE},
+{{OOO_STRING_SVTOOLS_RTF_DOBYMARGIN},	RTF_DOBYMARGIN},
+{{OOO_STRING_SVTOOLS_RTF_DOBYPAGE},		RTF_DOBYPAGE},
+{{OOO_STRING_SVTOOLS_RTF_DOBYPARA},		RTF_DOBYPARA},
+{{OOO_STRING_SVTOOLS_RTF_DODHGT},		RTF_DODHGT},
+{{OOO_STRING_SVTOOLS_RTF_DOLOCK},		RTF_DOLOCK},
+{{OOO_STRING_SVTOOLS_RTF_DPAENDHOL},		RTF_DPAENDHOL},
+{{OOO_STRING_SVTOOLS_RTF_DPAENDL},		RTF_DPAENDL},
+{{OOO_STRING_SVTOOLS_RTF_DPAENDSOL},		RTF_DPAENDSOL},
+{{OOO_STRING_SVTOOLS_RTF_DPAENDW},		RTF_DPAENDW},
+{{OOO_STRING_SVTOOLS_RTF_DPARC},			RTF_DPARC},
+{{OOO_STRING_SVTOOLS_RTF_DPARCFLIPX},	RTF_DPARCFLIPX},
+{{OOO_STRING_SVTOOLS_RTF_DPARCFLIPY},	RTF_DPARCFLIPY},
+{{OOO_STRING_SVTOOLS_RTF_DPASTARTHOL},	RTF_DPASTARTHOL},
+{{OOO_STRING_SVTOOLS_RTF_DPASTARTL},		RTF_DPASTARTL},
+{{OOO_STRING_SVTOOLS_RTF_DPASTARTSOL},	RTF_DPASTARTSOL},
+{{OOO_STRING_SVTOOLS_RTF_DPASTARTW},		RTF_DPASTARTW},
+{{OOO_STRING_SVTOOLS_RTF_DPCALLOUT},		RTF_DPCALLOUT},
+{{OOO_STRING_SVTOOLS_RTF_DPCOA},			RTF_DPCOA},
+{{OOO_STRING_SVTOOLS_RTF_DPCOACCENT},	RTF_DPCOACCENT},
+{{OOO_STRING_SVTOOLS_RTF_DPCOBESTFIT},	RTF_DPCOBESTFIT},
+{{OOO_STRING_SVTOOLS_RTF_DPCOBORDER},	RTF_DPCOBORDER},
+{{OOO_STRING_SVTOOLS_RTF_DPCODABS},		RTF_DPCODABS},
+{{OOO_STRING_SVTOOLS_RTF_DPCODBOTTOM},	RTF_DPCODBOTTOM},
+{{OOO_STRING_SVTOOLS_RTF_DPCODCENTER},	RTF_DPCODCENTER},
+{{OOO_STRING_SVTOOLS_RTF_DPCODTOP},		RTF_DPCODTOP},
+{{OOO_STRING_SVTOOLS_RTF_DPCOLENGTH},	RTF_DPCOLENGTH},
+{{OOO_STRING_SVTOOLS_RTF_DPCOMINUSX},	RTF_DPCOMINUSX},
+{{OOO_STRING_SVTOOLS_RTF_DPCOMINUSY},	RTF_DPCOMINUSY},
+{{OOO_STRING_SVTOOLS_RTF_DPCOOFFSET},	RTF_DPCOOFFSET},
+{{OOO_STRING_SVTOOLS_RTF_DPCOSMARTA},	RTF_DPCOSMARTA},
+{{OOO_STRING_SVTOOLS_RTF_DPCOTDOUBLE},	RTF_DPCOTDOUBLE},
+{{OOO_STRING_SVTOOLS_RTF_DPCOTRIGHT},	RTF_DPCOTRIGHT},
+{{OOO_STRING_SVTOOLS_RTF_DPCOTSINGLE},	RTF_DPCOTSINGLE},
+{{OOO_STRING_SVTOOLS_RTF_DPCOTTRIPLE},	RTF_DPCOTTRIPLE},
+{{OOO_STRING_SVTOOLS_RTF_DPCOUNT},		RTF_DPCOUNT},
+{{OOO_STRING_SVTOOLS_RTF_DPELLIPSE},		RTF_DPELLIPSE},
+{{OOO_STRING_SVTOOLS_RTF_DPENDGROUP},	RTF_DPENDGROUP},
+{{OOO_STRING_SVTOOLS_RTF_DPFILLBGCB},	RTF_DPFILLBGCB},
+{{OOO_STRING_SVTOOLS_RTF_DPFILLBGCG},	RTF_DPFILLBGCG},
+{{OOO_STRING_SVTOOLS_RTF_DPFILLBGCR},	RTF_DPFILLBGCR},
+{{OOO_STRING_SVTOOLS_RTF_DPFILLBGGRAY},	RTF_DPFILLBGGRAY},
+{{OOO_STRING_SVTOOLS_RTF_DPFILLBGPAL},	RTF_DPFILLBGPAL},
+{{OOO_STRING_SVTOOLS_RTF_DPFILLFGCB},	RTF_DPFILLFGCB},
+{{OOO_STRING_SVTOOLS_RTF_DPFILLFGCG},	RTF_DPFILLFGCG},
+{{OOO_STRING_SVTOOLS_RTF_DPFILLFGCR},	RTF_DPFILLFGCR},
+{{OOO_STRING_SVTOOLS_RTF_DPFILLFGGRAY},	RTF_DPFILLFGGRAY},
+{{OOO_STRING_SVTOOLS_RTF_DPFILLFGPAL},	RTF_DPFILLFGPAL},
+{{OOO_STRING_SVTOOLS_RTF_DPFILLPAT},		RTF_DPFILLPAT},
+{{OOO_STRING_SVTOOLS_RTF_DPGROUP},		RTF_DPGROUP},
+{{OOO_STRING_SVTOOLS_RTF_DPLINE},		RTF_DPLINE},
+{{OOO_STRING_SVTOOLS_RTF_DPLINECOB},		RTF_DPLINECOB},
+{{OOO_STRING_SVTOOLS_RTF_DPLINECOG},		RTF_DPLINECOG},
+{{OOO_STRING_SVTOOLS_RTF_DPLINECOR},		RTF_DPLINECOR},
+{{OOO_STRING_SVTOOLS_RTF_DPLINEDADO},	RTF_DPLINEDADO},
+{{OOO_STRING_SVTOOLS_RTF_DPLINEDADODO},	RTF_DPLINEDADODO},
+{{OOO_STRING_SVTOOLS_RTF_DPLINEDASH},	RTF_DPLINEDASH},
+{{OOO_STRING_SVTOOLS_RTF_DPLINEDOT},		RTF_DPLINEDOT},
+{{OOO_STRING_SVTOOLS_RTF_DPLINEGRAY},	RTF_DPLINEGRAY},
+{{OOO_STRING_SVTOOLS_RTF_DPLINEHOLLOW},	RTF_DPLINEHOLLOW},
+{{OOO_STRING_SVTOOLS_RTF_DPLINEPAL},		RTF_DPLINEPAL},
+{{OOO_STRING_SVTOOLS_RTF_DPLINESOLID},	RTF_DPLINESOLID},
+{{OOO_STRING_SVTOOLS_RTF_DPLINEW},		RTF_DPLINEW},
+{{OOO_STRING_SVTOOLS_RTF_DPPOLYCOUNT},	RTF_DPPOLYCOUNT},
+{{OOO_STRING_SVTOOLS_RTF_DPPOLYGON},		RTF_DPPOLYGON},
+{{OOO_STRING_SVTOOLS_RTF_DPPOLYLINE},	RTF_DPPOLYLINE},
+{{OOO_STRING_SVTOOLS_RTF_DPPTX},			RTF_DPPTX},
+{{OOO_STRING_SVTOOLS_RTF_DPPTY},			RTF_DPPTY},
+{{OOO_STRING_SVTOOLS_RTF_DPRECT},		RTF_DPRECT},
+{{OOO_STRING_SVTOOLS_RTF_DPROUNDR},		RTF_DPROUNDR},
+{{OOO_STRING_SVTOOLS_RTF_DPSHADOW},		RTF_DPSHADOW},
+{{OOO_STRING_SVTOOLS_RTF_DPSHADX},		RTF_DPSHADX},
+{{OOO_STRING_SVTOOLS_RTF_DPSHADY},		RTF_DPSHADY},
+{{OOO_STRING_SVTOOLS_RTF_DPTXBX},		RTF_DPTXBX},
+{{OOO_STRING_SVTOOLS_RTF_DPTXBXMAR},		RTF_DPTXBXMAR},
+{{OOO_STRING_SVTOOLS_RTF_DPTXBXTEXT},	RTF_DPTXBXTEXT},
+{{OOO_STRING_SVTOOLS_RTF_DPX},			RTF_DPX},
+{{OOO_STRING_SVTOOLS_RTF_DPXSIZE},		RTF_DPXSIZE},
+{{OOO_STRING_SVTOOLS_RTF_DPY},			RTF_DPY},
+{{OOO_STRING_SVTOOLS_RTF_DPYSIZE},		RTF_DPYSIZE},
+{{OOO_STRING_SVTOOLS_RTF_DS},			RTF_DS},
+{{OOO_STRING_SVTOOLS_RTF_EMSPACE},		RTF_EMSPACE},
+{{OOO_STRING_SVTOOLS_RTF_ENSPACE},		RTF_ENSPACE},
+{{OOO_STRING_SVTOOLS_RTF_FBIDI},			RTF_FBIDI},
+{{OOO_STRING_SVTOOLS_RTF_FET},			RTF_FET},
+{{OOO_STRING_SVTOOLS_RTF_FID},			RTF_FID},
+{{OOO_STRING_SVTOOLS_RTF_FILE},			RTF_FILE},
+{{OOO_STRING_SVTOOLS_RTF_FILETBL},		RTF_FILETBL},
+{{OOO_STRING_SVTOOLS_RTF_FLDALT},		RTF_FLDALT},
+{{OOO_STRING_SVTOOLS_RTF_FNETWORK},		RTF_FNETWORK},
+{{OOO_STRING_SVTOOLS_RTF_FONTEMB},		RTF_FONTEMB},
+{{OOO_STRING_SVTOOLS_RTF_FONTFILE},		RTF_FONTFILE},
+{{OOO_STRING_SVTOOLS_RTF_FORMDISP},		RTF_FORMDISP},
+{{OOO_STRING_SVTOOLS_RTF_FORMPROT},		RTF_FORMPROT},
+{{OOO_STRING_SVTOOLS_RTF_FORMSHADE},		RTF_FORMSHADE},
+{{OOO_STRING_SVTOOLS_RTF_FOSNUM},		RTF_FOSNUM},
+{{OOO_STRING_SVTOOLS_RTF_FRELATIVE},		RTF_FRELATIVE},
+{{OOO_STRING_SVTOOLS_RTF_FTNALT},		RTF_FTNALT},
+{{OOO_STRING_SVTOOLS_RTF_FTNIL},			RTF_FTNIL},
+{{OOO_STRING_SVTOOLS_RTF_FTNNALC},		RTF_FTNNALC},
+{{OOO_STRING_SVTOOLS_RTF_FTNNAR},		RTF_FTNNAR},
+{{OOO_STRING_SVTOOLS_RTF_FTNNAUC},		RTF_FTNNAUC},
+{{OOO_STRING_SVTOOLS_RTF_FTNNCHI},		RTF_FTNNCHI},
+{{OOO_STRING_SVTOOLS_RTF_FTNNRLC},		RTF_FTNNRLC},
+{{OOO_STRING_SVTOOLS_RTF_FTNNRUC},		RTF_FTNNRUC},
+{{OOO_STRING_SVTOOLS_RTF_FTNRSTCONT},	RTF_FTNRSTCONT},
+{{OOO_STRING_SVTOOLS_RTF_FTNRSTPG},		RTF_FTNRSTPG},
+{{OOO_STRING_SVTOOLS_RTF_FTTRUETYPE},	RTF_FTTRUETYPE},
+{{OOO_STRING_SVTOOLS_RTF_FVALIDDOS},		RTF_FVALIDDOS},
+{{OOO_STRING_SVTOOLS_RTF_FVALIDHPFS},	RTF_FVALIDHPFS},
+{{OOO_STRING_SVTOOLS_RTF_FVALIDMAC},		RTF_FVALIDMAC},
+{{OOO_STRING_SVTOOLS_RTF_FVALIDNTFS},	RTF_FVALIDNTFS},
+{{OOO_STRING_SVTOOLS_RTF_HYPHAUTO},		RTF_HYPHAUTO},
+{{OOO_STRING_SVTOOLS_RTF_HYPHCAPS},		RTF_HYPHCAPS},
+{{OOO_STRING_SVTOOLS_RTF_HYPHCONSEC},	RTF_HYPHCONSEC},
+{{OOO_STRING_SVTOOLS_RTF_HYPHPAR},		RTF_HYPHPAR},
+{{OOO_STRING_SVTOOLS_RTF_LINKSELF},		RTF_LINKSELF},
+{{OOO_STRING_SVTOOLS_RTF_LINKSTYLES},	RTF_LINKSTYLES},
+{{OOO_STRING_SVTOOLS_RTF_LTRCH},			RTF_LTRCH},
+{{OOO_STRING_SVTOOLS_RTF_LTRDOC},		RTF_LTRDOC},
+{{OOO_STRING_SVTOOLS_RTF_LTRMARK},		RTF_LTRMARK},
+{{OOO_STRING_SVTOOLS_RTF_LTRPAR},		RTF_LTRPAR},
+{{OOO_STRING_SVTOOLS_RTF_LTRROW},		RTF_LTRROW},
+{{OOO_STRING_SVTOOLS_RTF_LTRSECT},		RTF_LTRSECT},
+{{OOO_STRING_SVTOOLS_RTF_NOCOLBAL},		RTF_NOCOLBAL},
+{{OOO_STRING_SVTOOLS_RTF_NOEXTRASPRL},	RTF_NOEXTRASPRL},
+{{OOO_STRING_SVTOOLS_RTF_NOTABIND},		RTF_NOTABIND},
+{{OOO_STRING_SVTOOLS_RTF_NOWIDCTLPAR},	RTF_NOWIDCTLPAR},
+{{OOO_STRING_SVTOOLS_RTF_OBJALIAS},		RTF_OBJALIAS},
+{{OOO_STRING_SVTOOLS_RTF_OBJALIGN},		RTF_OBJALIGN},
+{{OOO_STRING_SVTOOLS_RTF_OBJAUTLINK},	RTF_OBJAUTLINK},
+{{OOO_STRING_SVTOOLS_RTF_OBJCLASS},		RTF_OBJCLASS},
+{{OOO_STRING_SVTOOLS_RTF_OBJCROPB},		RTF_OBJCROPB},
+{{OOO_STRING_SVTOOLS_RTF_OBJCROPL},		RTF_OBJCROPL},
+{{OOO_STRING_SVTOOLS_RTF_OBJCROPR},		RTF_OBJCROPR},
+{{OOO_STRING_SVTOOLS_RTF_OBJCROPT},		RTF_OBJCROPT},
+{{OOO_STRING_SVTOOLS_RTF_OBJDATA},		RTF_OBJDATA},
+{{OOO_STRING_SVTOOLS_RTF_OBJECT},		RTF_OBJECT},
+{{OOO_STRING_SVTOOLS_RTF_OBJEMB},		RTF_OBJEMB},
+{{OOO_STRING_SVTOOLS_RTF_OBJH},			RTF_OBJH},
+{{OOO_STRING_SVTOOLS_RTF_OBJICEMB},		RTF_OBJICEMB},
+{{OOO_STRING_SVTOOLS_RTF_OBJLINK},		RTF_OBJLINK},
+{{OOO_STRING_SVTOOLS_RTF_OBJLOCK},		RTF_OBJLOCK},
+{{OOO_STRING_SVTOOLS_RTF_OBJNAME},		RTF_OBJNAME},
+{{OOO_STRING_SVTOOLS_RTF_OBJPUB},		RTF_OBJPUB},
+{{OOO_STRING_SVTOOLS_RTF_OBJSCALEX},		RTF_OBJSCALEX},
+{{OOO_STRING_SVTOOLS_RTF_OBJSCALEY},		RTF_OBJSCALEY},
+{{OOO_STRING_SVTOOLS_RTF_OBJSECT},		RTF_OBJSECT},
+{{OOO_STRING_SVTOOLS_RTF_OBJSETSIZE},	RTF_OBJSETSIZE},
+{{OOO_STRING_SVTOOLS_RTF_OBJSUB},		RTF_OBJSUB},
+{{OOO_STRING_SVTOOLS_RTF_OBJTIME},		RTF_OBJTIME},
+{{OOO_STRING_SVTOOLS_RTF_OBJTRANSY},		RTF_OBJTRANSY},
+{{OOO_STRING_SVTOOLS_RTF_OBJUPDATE},		RTF_OBJUPDATE},
+{{OOO_STRING_SVTOOLS_RTF_OBJW},			RTF_OBJW},
+{{OOO_STRING_SVTOOLS_RTF_OTBLRUL},		RTF_OTBLRUL},
+{{OOO_STRING_SVTOOLS_RTF_PGNHN},			RTF_PGNHN},
+{{OOO_STRING_SVTOOLS_RTF_PGNHNSC},		RTF_PGNHNSC},
+{{OOO_STRING_SVTOOLS_RTF_PGNHNSH},		RTF_PGNHNSH},
+{{OOO_STRING_SVTOOLS_RTF_PGNHNSM},		RTF_PGNHNSM},
+{{OOO_STRING_SVTOOLS_RTF_PGNHNSN},		RTF_PGNHNSN},
+{{OOO_STRING_SVTOOLS_RTF_PGNHNSP},		RTF_PGNHNSP},
+{{OOO_STRING_SVTOOLS_RTF_PICBMP},		RTF_PICBMP},
+{{OOO_STRING_SVTOOLS_RTF_PICBPP},		RTF_PICBPP},
+{{OOO_STRING_SVTOOLS_RTF_PN},			RTF_PN},
+{{OOO_STRING_SVTOOLS_RTF_PNACROSS},		RTF_PNACROSS},
+{{OOO_STRING_SVTOOLS_RTF_PNB},			RTF_PNB},
+{{OOO_STRING_SVTOOLS_RTF_PNCAPS},		RTF_PNCAPS},
+{{OOO_STRING_SVTOOLS_RTF_PNCARD},		RTF_PNCARD},
+{{OOO_STRING_SVTOOLS_RTF_PNCF},			RTF_PNCF},
+{{OOO_STRING_SVTOOLS_RTF_PNDEC},			RTF_PNDEC},
+{{OOO_STRING_SVTOOLS_RTF_PNF},			RTF_PNF},
+{{OOO_STRING_SVTOOLS_RTF_PNFS},			RTF_PNFS},
+{{OOO_STRING_SVTOOLS_RTF_PNHANG},		RTF_PNHANG},
+{{OOO_STRING_SVTOOLS_RTF_PNI},			RTF_PNI},
+{{OOO_STRING_SVTOOLS_RTF_PNINDENT},		RTF_PNINDENT},
+{{OOO_STRING_SVTOOLS_RTF_PNLCLTR},		RTF_PNLCLTR},
+{{OOO_STRING_SVTOOLS_RTF_PNLCRM},		RTF_PNLCRM},
+{{OOO_STRING_SVTOOLS_RTF_PNLVL},			RTF_PNLVL},
+{{OOO_STRING_SVTOOLS_RTF_PNLVLBLT},		RTF_PNLVLBLT},
+{{OOO_STRING_SVTOOLS_RTF_PNLVLBODY},		RTF_PNLVLBODY},
+{{OOO_STRING_SVTOOLS_RTF_PNLVLCONT},		RTF_PNLVLCONT},
+{{OOO_STRING_SVTOOLS_RTF_PNNUMONCE},		RTF_PNNUMONCE},
+{{OOO_STRING_SVTOOLS_RTF_PNORD},			RTF_PNORD},
+{{OOO_STRING_SVTOOLS_RTF_PNORDT},		RTF_PNORDT},
+{{OOO_STRING_SVTOOLS_RTF_PNPREV},		RTF_PNPREV},
+{{OOO_STRING_SVTOOLS_RTF_PNQC},			RTF_PNQC},
+{{OOO_STRING_SVTOOLS_RTF_PNQL},			RTF_PNQL},
+{{OOO_STRING_SVTOOLS_RTF_PNQR},			RTF_PNQR},
+{{OOO_STRING_SVTOOLS_RTF_PNRESTART},		RTF_PNRESTART},
+{{OOO_STRING_SVTOOLS_RTF_PNSCAPS},		RTF_PNSCAPS},
+{{OOO_STRING_SVTOOLS_RTF_PNSECLVL},		RTF_PNSECLVL},
+{{OOO_STRING_SVTOOLS_RTF_PNSP},			RTF_PNSP},
+{{OOO_STRING_SVTOOLS_RTF_PNSTART},		RTF_PNSTART},
+{{OOO_STRING_SVTOOLS_RTF_PNSTRIKE},		RTF_PNSTRIKE},
+{{OOO_STRING_SVTOOLS_RTF_PNTEXT},		RTF_PNTEXT},
+{{OOO_STRING_SVTOOLS_RTF_PNTXTA},		RTF_PNTXTA},
+{{OOO_STRING_SVTOOLS_RTF_PNTXTB},		RTF_PNTXTB},
+{{OOO_STRING_SVTOOLS_RTF_PNUCLTR},		RTF_PNUCLTR},
+{{OOO_STRING_SVTOOLS_RTF_PNUCRM},		RTF_PNUCRM},
+{{OOO_STRING_SVTOOLS_RTF_PNUL},			RTF_PNUL},
+{{OOO_STRING_SVTOOLS_RTF_PNULD},			RTF_PNULD},
+{{OOO_STRING_SVTOOLS_RTF_PNULDB},		RTF_PNULDB},
+{{OOO_STRING_SVTOOLS_RTF_PNULNONE},		RTF_PNULNONE},
+{{OOO_STRING_SVTOOLS_RTF_PNULW},			RTF_PNULW},
+{{OOO_STRING_SVTOOLS_RTF_PRCOLBL},		RTF_PRCOLBL},
+{{OOO_STRING_SVTOOLS_RTF_PRINTDATA},		RTF_PRINTDATA},
+{{OOO_STRING_SVTOOLS_RTF_PSZ},			RTF_PSZ},
+{{OOO_STRING_SVTOOLS_RTF_PUBAUTO},		RTF_PUBAUTO},
+{{OOO_STRING_SVTOOLS_RTF_RESULT},		RTF_RESULT},
+{{OOO_STRING_SVTOOLS_RTF_REVAUTH},		RTF_REVAUTH},
+{{OOO_STRING_SVTOOLS_RTF_REVDTTM},		RTF_REVDTTM},
+{{OOO_STRING_SVTOOLS_RTF_REVPROT},		RTF_REVPROT},
+{{OOO_STRING_SVTOOLS_RTF_REVTBL},		RTF_REVTBL},
+{{OOO_STRING_SVTOOLS_RTF_RSLTBMP},		RTF_RSLTBMP},
+{{OOO_STRING_SVTOOLS_RTF_RSLTMERGE},		RTF_RSLTMERGE},
+{{OOO_STRING_SVTOOLS_RTF_RSLTPICT},		RTF_RSLTPICT},
+{{OOO_STRING_SVTOOLS_RTF_RSLTRTF},		RTF_RSLTRTF},
+{{OOO_STRING_SVTOOLS_RTF_RSLTTXT},		RTF_RSLTTXT},
+{{OOO_STRING_SVTOOLS_RTF_RTLCH},			RTF_RTLCH},
+{{OOO_STRING_SVTOOLS_RTF_RTLDOC},		RTF_RTLDOC},
+{{OOO_STRING_SVTOOLS_RTF_RTLMARK},		RTF_RTLMARK},
+{{OOO_STRING_SVTOOLS_RTF_RTLPAR},		RTF_RTLPAR},
+{{OOO_STRING_SVTOOLS_RTF_RTLROW},		RTF_RTLROW},
+{{OOO_STRING_SVTOOLS_RTF_RTLSECT},		RTF_RTLSECT},
+{{OOO_STRING_SVTOOLS_RTF_SEC},			RTF_SEC},
+{{OOO_STRING_SVTOOLS_RTF_SECTNUM},		RTF_SECTNUM},
+{{OOO_STRING_SVTOOLS_RTF_SECTUNLOCKED},	RTF_SECTUNLOCKED},
+{{OOO_STRING_SVTOOLS_RTF_SLMULT},		RTF_SLMULT},
+{{OOO_STRING_SVTOOLS_RTF_SOFTCOL},		RTF_SOFTCOL},
+{{OOO_STRING_SVTOOLS_RTF_SOFTLHEIGHT},	RTF_SOFTLHEIGHT},
+{{OOO_STRING_SVTOOLS_RTF_SOFTLINE},		RTF_SOFTLINE},
+{{OOO_STRING_SVTOOLS_RTF_SOFTPAGE},		RTF_SOFTPAGE},
+{{OOO_STRING_SVTOOLS_RTF_SPRSSPBF},		RTF_SPRSSPBF},
+{{OOO_STRING_SVTOOLS_RTF_SPRSTSP},		RTF_SPRSTSP},
+{{OOO_STRING_SVTOOLS_RTF_SUBDOCUMENT},	RTF_SUBDOCUMENT},
+{{OOO_STRING_SVTOOLS_RTF_SWPBDR},		RTF_SWPBDR},
+{{OOO_STRING_SVTOOLS_RTF_TCN},			RTF_TCN},
+{{OOO_STRING_SVTOOLS_RTF_TRANSMF},		RTF_TRANSMF},
+{{OOO_STRING_SVTOOLS_RTF_TRBRDRB},		RTF_TRBRDRB},
+{{OOO_STRING_SVTOOLS_RTF_TRBRDRH},		RTF_TRBRDRH},
+{{OOO_STRING_SVTOOLS_RTF_TRBRDRL},		RTF_TRBRDRL},
+{{OOO_STRING_SVTOOLS_RTF_TRBRDRR},		RTF_TRBRDRR},
+{{OOO_STRING_SVTOOLS_RTF_TRBRDRT},		RTF_TRBRDRT},
+{{OOO_STRING_SVTOOLS_RTF_TRBRDRV},		RTF_TRBRDRV},
+{{OOO_STRING_SVTOOLS_RTF_TRHDR},			RTF_TRHDR},
+{{OOO_STRING_SVTOOLS_RTF_TRKEEP},		RTF_TRKEEP},
 {{OOO_STRING_SVTOOLS_RTF_TRPADDB},      RTF_TRPADDB},
 {{OOO_STRING_SVTOOLS_RTF_TRPADDL},      RTF_TRPADDL},
 {{OOO_STRING_SVTOOLS_RTF_TRPADDR},      RTF_TRPADDR},
@@ -743,315 +743,315 @@ static RTF_TokenEntry __FAR_DATA aRTFTokenTab[] = {
 {{OOO_STRING_SVTOOLS_RTF_TRPADDFT},      RTF_TRPADDFT},
 
 
-{{OOO_STRING_SVTOOLS_RTF_WRAPTRSP},     RTF_WRAPTRSP},
-{{OOO_STRING_SVTOOLS_RTF_XEF},          RTF_XEF},
-{{OOO_STRING_SVTOOLS_RTF_ZWJ},          RTF_ZWJ},
-{{OOO_STRING_SVTOOLS_RTF_ZWNJ},         RTF_ZWNJ},
+{{OOO_STRING_SVTOOLS_RTF_WRAPTRSP},		RTF_WRAPTRSP},
+{{OOO_STRING_SVTOOLS_RTF_XEF},			RTF_XEF},
+{{OOO_STRING_SVTOOLS_RTF_ZWJ},			RTF_ZWJ},
+{{OOO_STRING_SVTOOLS_RTF_ZWNJ},			RTF_ZWNJ},
 
 
-{{OOO_STRING_SVTOOLS_RTF_ABSLOCK},      RTF_ABSLOCK},
-{{OOO_STRING_SVTOOLS_RTF_ADJUSTRIGHT},  RTF_ADJUSTRIGHT},
-{{OOO_STRING_SVTOOLS_RTF_AFTNNCHOSUNG}, RTF_AFTNNCHOSUNG},
-{{OOO_STRING_SVTOOLS_RTF_AFTNNCNUM},        RTF_AFTNNCNUM},
-{{OOO_STRING_SVTOOLS_RTF_AFTNNDBAR},        RTF_AFTNNDBAR},
-{{OOO_STRING_SVTOOLS_RTF_AFTNNDBNUM},   RTF_AFTNNDBNUM},
-{{OOO_STRING_SVTOOLS_RTF_AFTNNDBNUMD},  RTF_AFTNNDBNUMD},
-{{OOO_STRING_SVTOOLS_RTF_AFTNNDBNUMK},  RTF_AFTNNDBNUMK},
-{{OOO_STRING_SVTOOLS_RTF_AFTNNDBNUMT},  RTF_AFTNNDBNUMT},
-{{OOO_STRING_SVTOOLS_RTF_AFTNNGANADA},  RTF_AFTNNGANADA},
-{{OOO_STRING_SVTOOLS_RTF_AFTNNGBNUM},   RTF_AFTNNGBNUM},
-{{OOO_STRING_SVTOOLS_RTF_AFTNNGBNUMD},  RTF_AFTNNGBNUMD},
-{{OOO_STRING_SVTOOLS_RTF_AFTNNGBNUMK},  RTF_AFTNNGBNUMK},
-{{OOO_STRING_SVTOOLS_RTF_AFTNNGBNUML},  RTF_AFTNNGBNUML},
-{{OOO_STRING_SVTOOLS_RTF_AFTNNZODIAC},  RTF_AFTNNZODIAC},
-{{OOO_STRING_SVTOOLS_RTF_AFTNNZODIACD}, RTF_AFTNNZODIACD},
-{{OOO_STRING_SVTOOLS_RTF_AFTNNZODIACL}, RTF_AFTNNZODIACL},
-{{OOO_STRING_SVTOOLS_RTF_ANIMTEXT},     RTF_ANIMTEXT},
-{{OOO_STRING_SVTOOLS_RTF_ANSICPG},      RTF_ANSICPG},
-{{OOO_STRING_SVTOOLS_RTF_BACKGROUND},   RTF_BACKGROUND},
-{{OOO_STRING_SVTOOLS_RTF_BDBFHDR},      RTF_BDBFHDR},
-{{OOO_STRING_SVTOOLS_RTF_BLIPTAG},      RTF_BLIPTAG},
-{{OOO_STRING_SVTOOLS_RTF_BLIPUID},      RTF_BLIPUID},
-{{OOO_STRING_SVTOOLS_RTF_BLIPUPI},      RTF_BLIPUPI},
-{{OOO_STRING_SVTOOLS_RTF_BRDRART},      RTF_BRDRART},
-{{OOO_STRING_SVTOOLS_RTF_BRDRDASHD},        RTF_BRDRDASHD},
-{{OOO_STRING_SVTOOLS_RTF_BRDRDASHDD},   RTF_BRDRDASHDD},
+{{OOO_STRING_SVTOOLS_RTF_ABSLOCK},		RTF_ABSLOCK},
+{{OOO_STRING_SVTOOLS_RTF_ADJUSTRIGHT},	RTF_ADJUSTRIGHT},
+{{OOO_STRING_SVTOOLS_RTF_AFTNNCHOSUNG},	RTF_AFTNNCHOSUNG},
+{{OOO_STRING_SVTOOLS_RTF_AFTNNCNUM},		RTF_AFTNNCNUM},
+{{OOO_STRING_SVTOOLS_RTF_AFTNNDBAR},		RTF_AFTNNDBAR},
+{{OOO_STRING_SVTOOLS_RTF_AFTNNDBNUM},	RTF_AFTNNDBNUM},
+{{OOO_STRING_SVTOOLS_RTF_AFTNNDBNUMD},	RTF_AFTNNDBNUMD},
+{{OOO_STRING_SVTOOLS_RTF_AFTNNDBNUMK},	RTF_AFTNNDBNUMK},
+{{OOO_STRING_SVTOOLS_RTF_AFTNNDBNUMT},	RTF_AFTNNDBNUMT},
+{{OOO_STRING_SVTOOLS_RTF_AFTNNGANADA},	RTF_AFTNNGANADA},
+{{OOO_STRING_SVTOOLS_RTF_AFTNNGBNUM},	RTF_AFTNNGBNUM},
+{{OOO_STRING_SVTOOLS_RTF_AFTNNGBNUMD},	RTF_AFTNNGBNUMD},
+{{OOO_STRING_SVTOOLS_RTF_AFTNNGBNUMK},	RTF_AFTNNGBNUMK},
+{{OOO_STRING_SVTOOLS_RTF_AFTNNGBNUML},	RTF_AFTNNGBNUML},
+{{OOO_STRING_SVTOOLS_RTF_AFTNNZODIAC},	RTF_AFTNNZODIAC},
+{{OOO_STRING_SVTOOLS_RTF_AFTNNZODIACD},	RTF_AFTNNZODIACD},
+{{OOO_STRING_SVTOOLS_RTF_AFTNNZODIACL},	RTF_AFTNNZODIACL},
+{{OOO_STRING_SVTOOLS_RTF_ANIMTEXT},		RTF_ANIMTEXT},
+{{OOO_STRING_SVTOOLS_RTF_ANSICPG},		RTF_ANSICPG},
+{{OOO_STRING_SVTOOLS_RTF_BACKGROUND},	RTF_BACKGROUND},
+{{OOO_STRING_SVTOOLS_RTF_BDBFHDR},		RTF_BDBFHDR},
+{{OOO_STRING_SVTOOLS_RTF_BLIPTAG},		RTF_BLIPTAG},
+{{OOO_STRING_SVTOOLS_RTF_BLIPUID},		RTF_BLIPUID},
+{{OOO_STRING_SVTOOLS_RTF_BLIPUPI},		RTF_BLIPUPI},
+{{OOO_STRING_SVTOOLS_RTF_BRDRART},		RTF_BRDRART},
+{{OOO_STRING_SVTOOLS_RTF_BRDRDASHD},		RTF_BRDRDASHD},
+{{OOO_STRING_SVTOOLS_RTF_BRDRDASHDD},	RTF_BRDRDASHDD},
 {{OOO_STRING_SVTOOLS_RTF_BRDRDASHDOTSTR},RTF_BRDRDASHDOTSTR},
-{{OOO_STRING_SVTOOLS_RTF_BRDRDASHSM},   RTF_BRDRDASHSM},
-{{OOO_STRING_SVTOOLS_RTF_BRDREMBOSS},   RTF_BRDREMBOSS},
-{{OOO_STRING_SVTOOLS_RTF_BRDRENGRAVE},  RTF_BRDRENGRAVE},
-{{OOO_STRING_SVTOOLS_RTF_BRDRFRAME},        RTF_BRDRFRAME},
-{{OOO_STRING_SVTOOLS_RTF_BRDRTHTNLG},   RTF_BRDRTHTNLG},
-{{OOO_STRING_SVTOOLS_RTF_BRDRTHTNMG},   RTF_BRDRTHTNMG},
-{{OOO_STRING_SVTOOLS_RTF_BRDRTHTNSG},   RTF_BRDRTHTNSG},
-{{OOO_STRING_SVTOOLS_RTF_BRDRTNTHLG},   RTF_BRDRTNTHLG},
-{{OOO_STRING_SVTOOLS_RTF_BRDRTNTHMG},   RTF_BRDRTNTHMG},
-{{OOO_STRING_SVTOOLS_RTF_BRDRTNTHSG},   RTF_BRDRTNTHSG},
-{{OOO_STRING_SVTOOLS_RTF_BRDRTNTHTNLG}, RTF_BRDRTNTHTNLG},
-{{OOO_STRING_SVTOOLS_RTF_BRDRTNTHTNMG}, RTF_BRDRTNTHTNMG},
-{{OOO_STRING_SVTOOLS_RTF_BRDRTNTHTNSG}, RTF_BRDRTNTHTNSG},
-{{OOO_STRING_SVTOOLS_RTF_BRDRTRIPLE},   RTF_BRDRTRIPLE},
-{{OOO_STRING_SVTOOLS_RTF_BRDRWAVY},     RTF_BRDRWAVY},
-{{OOO_STRING_SVTOOLS_RTF_BRDRWAVYDB},   RTF_BRDRWAVYDB},
-{{OOO_STRING_SVTOOLS_RTF_CATEGORY},     RTF_CATEGORY},
-{{OOO_STRING_SVTOOLS_RTF_CGRID},            RTF_CGRID},
-{{OOO_STRING_SVTOOLS_RTF_CHARSCALEX},   RTF_CHARSCALEX},
-{{OOO_STRING_SVTOOLS_RTF_CHBGBDIAG},        RTF_CHBGBDIAG},
-{{OOO_STRING_SVTOOLS_RTF_CHBGCROSS},        RTF_CHBGCROSS},
-{{OOO_STRING_SVTOOLS_RTF_CHBGDCROSS},   RTF_CHBGDCROSS},
-{{OOO_STRING_SVTOOLS_RTF_CHBGDKBDIAG},  RTF_CHBGDKBDIAG},
-{{OOO_STRING_SVTOOLS_RTF_CHBGDKCROSS},  RTF_CHBGDKCROSS},
-{{OOO_STRING_SVTOOLS_RTF_CHBGDKDCROSS}, RTF_CHBGDKDCROSS},
-{{OOO_STRING_SVTOOLS_RTF_CHBGDKFDIAG},  RTF_CHBGDKFDIAG},
-{{OOO_STRING_SVTOOLS_RTF_CHBGDKHORIZ},  RTF_CHBGDKHORIZ},
-{{OOO_STRING_SVTOOLS_RTF_CHBGDKVERT},   RTF_CHBGDKVERT},
-{{OOO_STRING_SVTOOLS_RTF_CHBGFDIAG},        RTF_CHBGFDIAG},
-{{OOO_STRING_SVTOOLS_RTF_CHBGHORIZ},        RTF_CHBGHORIZ},
-{{OOO_STRING_SVTOOLS_RTF_CHBGVERT},     RTF_CHBGVERT},
-{{OOO_STRING_SVTOOLS_RTF_CHBRDR},       RTF_CHBRDR},
-{{OOO_STRING_SVTOOLS_RTF_CHCBPAT},      RTF_CHCBPAT},
-{{OOO_STRING_SVTOOLS_RTF_CHCFPAT},      RTF_CHCFPAT},
-{{OOO_STRING_SVTOOLS_RTF_CHSHDNG},      RTF_CHSHDNG},
-{{OOO_STRING_SVTOOLS_RTF_CLTXLRTB},     RTF_CLTXLRTB},
-{{OOO_STRING_SVTOOLS_RTF_CLTXTBRL},     RTF_CLTXTBRL},
-{{OOO_STRING_SVTOOLS_RTF_CLVERTALB},        RTF_CLVERTALB},
-{{OOO_STRING_SVTOOLS_RTF_CLVERTALC},        RTF_CLVERTALC},
-{{OOO_STRING_SVTOOLS_RTF_CLVERTALT},        RTF_CLVERTALT},
-{{OOO_STRING_SVTOOLS_RTF_CLVMGF},       RTF_CLVMGF},
-{{OOO_STRING_SVTOOLS_RTF_CLVMRG},       RTF_CLVMRG},
-{{OOO_STRING_SVTOOLS_RTF_CLTXTBRLV},    RTF_CLTXTBRLV},
-{{OOO_STRING_SVTOOLS_RTF_CLTXBTLR},         RTF_CLTXBTLR},
-{{OOO_STRING_SVTOOLS_RTF_CLTXLRTBV},        RTF_CLTXLRTBV},
-{{OOO_STRING_SVTOOLS_RTF_COMPANY},      RTF_COMPANY},
-{{OOO_STRING_SVTOOLS_RTF_CRAUTH},       RTF_CRAUTH},
-{{OOO_STRING_SVTOOLS_RTF_CRDATE},       RTF_CRDATE},
-{{OOO_STRING_SVTOOLS_RTF_DATE},         RTF_DATE},
-{{OOO_STRING_SVTOOLS_RTF_DEFLANGFE},        RTF_DEFLANGFE},
-{{OOO_STRING_SVTOOLS_RTF_DFRAUTH},      RTF_DFRAUTH},
-{{OOO_STRING_SVTOOLS_RTF_DFRDATE},      RTF_DFRDATE},
-{{OOO_STRING_SVTOOLS_RTF_DFRSTART},     RTF_DFRSTART},
-{{OOO_STRING_SVTOOLS_RTF_DFRSTOP},      RTF_DFRSTOP},
-{{OOO_STRING_SVTOOLS_RTF_DFRXST},       RTF_DFRXST},
-{{OOO_STRING_SVTOOLS_RTF_DGMARGIN},     RTF_DGMARGIN},
-{{OOO_STRING_SVTOOLS_RTF_DNTBLNSBDB},   RTF_DNTBLNSBDB},
-{{OOO_STRING_SVTOOLS_RTF_DOCTYPE},      RTF_DOCTYPE},
-{{OOO_STRING_SVTOOLS_RTF_DOCVAR},       RTF_DOCVAR},
-{{OOO_STRING_SVTOOLS_RTF_DPCODESCENT},  RTF_DPCODESCENT},
-{{OOO_STRING_SVTOOLS_RTF_EMBO},         RTF_EMBO},
-{{OOO_STRING_SVTOOLS_RTF_EMFBLIP},      RTF_EMFBLIP},
-{{OOO_STRING_SVTOOLS_RTF_EXPSHRTN},     RTF_EXPSHRTN},
-{{OOO_STRING_SVTOOLS_RTF_FAAUTO},       RTF_FAAUTO},
-{{OOO_STRING_SVTOOLS_RTF_FBIAS},            RTF_FBIAS},
-{{OOO_STRING_SVTOOLS_RTF_FFDEFRES},     RTF_FFDEFRES},
-{{OOO_STRING_SVTOOLS_RTF_FFDEFTEXT},        RTF_FFDEFTEXT},
-{{OOO_STRING_SVTOOLS_RTF_FFENTRYMCR},   RTF_FFENTRYMCR},
-{{OOO_STRING_SVTOOLS_RTF_FFEXITMCR},        RTF_FFEXITMCR},
-{{OOO_STRING_SVTOOLS_RTF_FFFORMAT},     RTF_FFFORMAT},
-{{OOO_STRING_SVTOOLS_RTF_FFHASLISTBOX}, RTF_FFHASLISTBOX},
-{{OOO_STRING_SVTOOLS_RTF_FFHELPTEXT},   RTF_FFHELPTEXT},
-{{OOO_STRING_SVTOOLS_RTF_FFHPS},            RTF_FFHPS},
-{{OOO_STRING_SVTOOLS_RTF_FFL},          RTF_FFL},
-{{OOO_STRING_SVTOOLS_RTF_FFMAXLEN},     RTF_FFMAXLEN},
-{{OOO_STRING_SVTOOLS_RTF_FFNAME},       RTF_FFNAME},
-{{OOO_STRING_SVTOOLS_RTF_FFOWNHELP},        RTF_FFOWNHELP},
-{{OOO_STRING_SVTOOLS_RTF_FFOWNSTAT},        RTF_FFOWNSTAT},
-{{OOO_STRING_SVTOOLS_RTF_FFPROT},       RTF_FFPROT},
-{{OOO_STRING_SVTOOLS_RTF_FFRECALC},     RTF_FFRECALC},
-{{OOO_STRING_SVTOOLS_RTF_FFRES},            RTF_FFRES},
-{{OOO_STRING_SVTOOLS_RTF_FFSIZE},       RTF_FFSIZE},
-{{OOO_STRING_SVTOOLS_RTF_FFSTATTEXT},   RTF_FFSTATTEXT},
-{{OOO_STRING_SVTOOLS_RTF_FFTYPE},       RTF_FFTYPE},
-{{OOO_STRING_SVTOOLS_RTF_FFTYPETXT},        RTF_FFTYPETXT},
-{{OOO_STRING_SVTOOLS_RTF_FLDTYPE},      RTF_FLDTYPE},
-{{OOO_STRING_SVTOOLS_RTF_FNAME},            RTF_FNAME},
-{{OOO_STRING_SVTOOLS_RTF_FORMFIELD},        RTF_FORMFIELD},
-{{OOO_STRING_SVTOOLS_RTF_FROMTEXT},     RTF_FROMTEXT},
-{{OOO_STRING_SVTOOLS_RTF_FTNNCHOSUNG},  RTF_FTNNCHOSUNG},
-{{OOO_STRING_SVTOOLS_RTF_FTNNCNUM},     RTF_FTNNCNUM},
-{{OOO_STRING_SVTOOLS_RTF_FTNNDBAR},     RTF_FTNNDBAR},
-{{OOO_STRING_SVTOOLS_RTF_FTNNDBNUM},        RTF_FTNNDBNUM},
-{{OOO_STRING_SVTOOLS_RTF_FTNNDBNUMD},   RTF_FTNNDBNUMD},
-{{OOO_STRING_SVTOOLS_RTF_FTNNDBNUMK},   RTF_FTNNDBNUMK},
-{{OOO_STRING_SVTOOLS_RTF_FTNNDBNUMT},   RTF_FTNNDBNUMT},
-{{OOO_STRING_SVTOOLS_RTF_FTNNGANADA},   RTF_FTNNGANADA},
-{{OOO_STRING_SVTOOLS_RTF_FTNNGBNUM},        RTF_FTNNGBNUM},
-{{OOO_STRING_SVTOOLS_RTF_FTNNGBNUMD},   RTF_FTNNGBNUMD},
-{{OOO_STRING_SVTOOLS_RTF_FTNNGBNUMK},   RTF_FTNNGBNUMK},
-{{OOO_STRING_SVTOOLS_RTF_FTNNGBNUML},   RTF_FTNNGBNUML},
-{{OOO_STRING_SVTOOLS_RTF_FTNNZODIAC},   RTF_FTNNZODIAC},
-{{OOO_STRING_SVTOOLS_RTF_FTNNZODIACD},  RTF_FTNNZODIACD},
-{{OOO_STRING_SVTOOLS_RTF_FTNNZODIACL},  RTF_FTNNZODIACL},
-{{OOO_STRING_SVTOOLS_RTF_G},                RTF_G},
-{{OOO_STRING_SVTOOLS_RTF_GCW},          RTF_GCW},
-{{OOO_STRING_SVTOOLS_RTF_GRIDTBL},      RTF_GRIDTBL},
-{{OOO_STRING_SVTOOLS_RTF_HIGHLIGHT},        RTF_HIGHLIGHT},
-{{OOO_STRING_SVTOOLS_RTF_HLFR},         RTF_HLFR},
-{{OOO_STRING_SVTOOLS_RTF_HLINKBASE},        RTF_HLINKBASE},
-{{OOO_STRING_SVTOOLS_RTF_HLLOC},            RTF_HLLOC},
-{{OOO_STRING_SVTOOLS_RTF_HLSRC},            RTF_HLSRC},
-{{OOO_STRING_SVTOOLS_RTF_ILVL},         RTF_ILVL},
-{{OOO_STRING_SVTOOLS_RTF_IMPR},         RTF_IMPR},
-{{OOO_STRING_SVTOOLS_RTF_JPEGBLIP},     RTF_JPEGBLIP},
-{{OOO_STRING_SVTOOLS_RTF_LEVELFOLLOW},  RTF_LEVELFOLLOW},
-{{OOO_STRING_SVTOOLS_RTF_LEVELINDENT},  RTF_LEVELINDENT},
-{{OOO_STRING_SVTOOLS_RTF_LEVELJC},      RTF_LEVELJC},
-{{OOO_STRING_SVTOOLS_RTF_LEVELLEGAL},   RTF_LEVELLEGAL},
-{{OOO_STRING_SVTOOLS_RTF_LEVELNFC},     RTF_LEVELNFC},
+{{OOO_STRING_SVTOOLS_RTF_BRDRDASHSM},	RTF_BRDRDASHSM},
+{{OOO_STRING_SVTOOLS_RTF_BRDREMBOSS},	RTF_BRDREMBOSS},
+{{OOO_STRING_SVTOOLS_RTF_BRDRENGRAVE},	RTF_BRDRENGRAVE},
+{{OOO_STRING_SVTOOLS_RTF_BRDRFRAME},		RTF_BRDRFRAME},
+{{OOO_STRING_SVTOOLS_RTF_BRDRTHTNLG},	RTF_BRDRTHTNLG},
+{{OOO_STRING_SVTOOLS_RTF_BRDRTHTNMG},	RTF_BRDRTHTNMG},
+{{OOO_STRING_SVTOOLS_RTF_BRDRTHTNSG},	RTF_BRDRTHTNSG},
+{{OOO_STRING_SVTOOLS_RTF_BRDRTNTHLG},	RTF_BRDRTNTHLG},
+{{OOO_STRING_SVTOOLS_RTF_BRDRTNTHMG},	RTF_BRDRTNTHMG},
+{{OOO_STRING_SVTOOLS_RTF_BRDRTNTHSG},	RTF_BRDRTNTHSG},
+{{OOO_STRING_SVTOOLS_RTF_BRDRTNTHTNLG},	RTF_BRDRTNTHTNLG},
+{{OOO_STRING_SVTOOLS_RTF_BRDRTNTHTNMG},	RTF_BRDRTNTHTNMG},
+{{OOO_STRING_SVTOOLS_RTF_BRDRTNTHTNSG},	RTF_BRDRTNTHTNSG},
+{{OOO_STRING_SVTOOLS_RTF_BRDRTRIPLE},	RTF_BRDRTRIPLE},
+{{OOO_STRING_SVTOOLS_RTF_BRDRWAVY},		RTF_BRDRWAVY},
+{{OOO_STRING_SVTOOLS_RTF_BRDRWAVYDB},	RTF_BRDRWAVYDB},
+{{OOO_STRING_SVTOOLS_RTF_CATEGORY},		RTF_CATEGORY},
+{{OOO_STRING_SVTOOLS_RTF_CGRID},			RTF_CGRID},
+{{OOO_STRING_SVTOOLS_RTF_CHARSCALEX},	RTF_CHARSCALEX},
+{{OOO_STRING_SVTOOLS_RTF_CHBGBDIAG},		RTF_CHBGBDIAG},
+{{OOO_STRING_SVTOOLS_RTF_CHBGCROSS},		RTF_CHBGCROSS},
+{{OOO_STRING_SVTOOLS_RTF_CHBGDCROSS},	RTF_CHBGDCROSS},
+{{OOO_STRING_SVTOOLS_RTF_CHBGDKBDIAG},	RTF_CHBGDKBDIAG},
+{{OOO_STRING_SVTOOLS_RTF_CHBGDKCROSS},	RTF_CHBGDKCROSS},
+{{OOO_STRING_SVTOOLS_RTF_CHBGDKDCROSS},	RTF_CHBGDKDCROSS},
+{{OOO_STRING_SVTOOLS_RTF_CHBGDKFDIAG},	RTF_CHBGDKFDIAG},
+{{OOO_STRING_SVTOOLS_RTF_CHBGDKHORIZ},	RTF_CHBGDKHORIZ},
+{{OOO_STRING_SVTOOLS_RTF_CHBGDKVERT},	RTF_CHBGDKVERT},
+{{OOO_STRING_SVTOOLS_RTF_CHBGFDIAG},		RTF_CHBGFDIAG},
+{{OOO_STRING_SVTOOLS_RTF_CHBGHORIZ},		RTF_CHBGHORIZ},
+{{OOO_STRING_SVTOOLS_RTF_CHBGVERT},		RTF_CHBGVERT},
+{{OOO_STRING_SVTOOLS_RTF_CHBRDR},		RTF_CHBRDR},
+{{OOO_STRING_SVTOOLS_RTF_CHCBPAT},		RTF_CHCBPAT},
+{{OOO_STRING_SVTOOLS_RTF_CHCFPAT},		RTF_CHCFPAT},
+{{OOO_STRING_SVTOOLS_RTF_CHSHDNG},		RTF_CHSHDNG},
+{{OOO_STRING_SVTOOLS_RTF_CLTXLRTB},		RTF_CLTXLRTB},
+{{OOO_STRING_SVTOOLS_RTF_CLTXTBRL},		RTF_CLTXTBRL},
+{{OOO_STRING_SVTOOLS_RTF_CLVERTALB},		RTF_CLVERTALB},
+{{OOO_STRING_SVTOOLS_RTF_CLVERTALC},		RTF_CLVERTALC},
+{{OOO_STRING_SVTOOLS_RTF_CLVERTALT},		RTF_CLVERTALT},
+{{OOO_STRING_SVTOOLS_RTF_CLVMGF},		RTF_CLVMGF},
+{{OOO_STRING_SVTOOLS_RTF_CLVMRG},		RTF_CLVMRG},
+{{OOO_STRING_SVTOOLS_RTF_CLTXTBRLV}, 	RTF_CLTXTBRLV},
+{{OOO_STRING_SVTOOLS_RTF_CLTXBTLR}, 		RTF_CLTXBTLR},
+{{OOO_STRING_SVTOOLS_RTF_CLTXLRTBV},		RTF_CLTXLRTBV},
+{{OOO_STRING_SVTOOLS_RTF_COMPANY},		RTF_COMPANY},
+{{OOO_STRING_SVTOOLS_RTF_CRAUTH},		RTF_CRAUTH},
+{{OOO_STRING_SVTOOLS_RTF_CRDATE},		RTF_CRDATE},
+{{OOO_STRING_SVTOOLS_RTF_DATE},			RTF_DATE},
+{{OOO_STRING_SVTOOLS_RTF_DEFLANGFE},		RTF_DEFLANGFE},
+{{OOO_STRING_SVTOOLS_RTF_DFRAUTH},		RTF_DFRAUTH},
+{{OOO_STRING_SVTOOLS_RTF_DFRDATE},		RTF_DFRDATE},
+{{OOO_STRING_SVTOOLS_RTF_DFRSTART},		RTF_DFRSTART},
+{{OOO_STRING_SVTOOLS_RTF_DFRSTOP},		RTF_DFRSTOP},
+{{OOO_STRING_SVTOOLS_RTF_DFRXST},		RTF_DFRXST},
+{{OOO_STRING_SVTOOLS_RTF_DGMARGIN},		RTF_DGMARGIN},
+{{OOO_STRING_SVTOOLS_RTF_DNTBLNSBDB},	RTF_DNTBLNSBDB},
+{{OOO_STRING_SVTOOLS_RTF_DOCTYPE},		RTF_DOCTYPE},
+{{OOO_STRING_SVTOOLS_RTF_DOCVAR},		RTF_DOCVAR},
+{{OOO_STRING_SVTOOLS_RTF_DPCODESCENT},	RTF_DPCODESCENT},
+{{OOO_STRING_SVTOOLS_RTF_EMBO},			RTF_EMBO},
+{{OOO_STRING_SVTOOLS_RTF_EMFBLIP},		RTF_EMFBLIP},
+{{OOO_STRING_SVTOOLS_RTF_EXPSHRTN},		RTF_EXPSHRTN},
+{{OOO_STRING_SVTOOLS_RTF_FAAUTO},		RTF_FAAUTO},
+{{OOO_STRING_SVTOOLS_RTF_FBIAS},			RTF_FBIAS},
+{{OOO_STRING_SVTOOLS_RTF_FFDEFRES},		RTF_FFDEFRES},
+{{OOO_STRING_SVTOOLS_RTF_FFDEFTEXT},		RTF_FFDEFTEXT},
+{{OOO_STRING_SVTOOLS_RTF_FFENTRYMCR},	RTF_FFENTRYMCR},
+{{OOO_STRING_SVTOOLS_RTF_FFEXITMCR},		RTF_FFEXITMCR},
+{{OOO_STRING_SVTOOLS_RTF_FFFORMAT},		RTF_FFFORMAT},
+{{OOO_STRING_SVTOOLS_RTF_FFHASLISTBOX},	RTF_FFHASLISTBOX},
+{{OOO_STRING_SVTOOLS_RTF_FFHELPTEXT},	RTF_FFHELPTEXT},
+{{OOO_STRING_SVTOOLS_RTF_FFHPS},			RTF_FFHPS},
+{{OOO_STRING_SVTOOLS_RTF_FFL},			RTF_FFL},
+{{OOO_STRING_SVTOOLS_RTF_FFMAXLEN},		RTF_FFMAXLEN},
+{{OOO_STRING_SVTOOLS_RTF_FFNAME},		RTF_FFNAME},
+{{OOO_STRING_SVTOOLS_RTF_FFOWNHELP},		RTF_FFOWNHELP},
+{{OOO_STRING_SVTOOLS_RTF_FFOWNSTAT},		RTF_FFOWNSTAT},
+{{OOO_STRING_SVTOOLS_RTF_FFPROT},		RTF_FFPROT},
+{{OOO_STRING_SVTOOLS_RTF_FFRECALC},		RTF_FFRECALC},
+{{OOO_STRING_SVTOOLS_RTF_FFRES},			RTF_FFRES},
+{{OOO_STRING_SVTOOLS_RTF_FFSIZE},		RTF_FFSIZE},
+{{OOO_STRING_SVTOOLS_RTF_FFSTATTEXT},	RTF_FFSTATTEXT},
+{{OOO_STRING_SVTOOLS_RTF_FFTYPE},		RTF_FFTYPE},
+{{OOO_STRING_SVTOOLS_RTF_FFTYPETXT},		RTF_FFTYPETXT},
+{{OOO_STRING_SVTOOLS_RTF_FLDTYPE},		RTF_FLDTYPE},
+{{OOO_STRING_SVTOOLS_RTF_FNAME},			RTF_FNAME},
+{{OOO_STRING_SVTOOLS_RTF_FORMFIELD},		RTF_FORMFIELD},
+{{OOO_STRING_SVTOOLS_RTF_FROMTEXT},		RTF_FROMTEXT},
+{{OOO_STRING_SVTOOLS_RTF_FTNNCHOSUNG},	RTF_FTNNCHOSUNG},
+{{OOO_STRING_SVTOOLS_RTF_FTNNCNUM},		RTF_FTNNCNUM},
+{{OOO_STRING_SVTOOLS_RTF_FTNNDBAR},		RTF_FTNNDBAR},
+{{OOO_STRING_SVTOOLS_RTF_FTNNDBNUM},		RTF_FTNNDBNUM},
+{{OOO_STRING_SVTOOLS_RTF_FTNNDBNUMD},	RTF_FTNNDBNUMD},
+{{OOO_STRING_SVTOOLS_RTF_FTNNDBNUMK},	RTF_FTNNDBNUMK},
+{{OOO_STRING_SVTOOLS_RTF_FTNNDBNUMT},	RTF_FTNNDBNUMT},
+{{OOO_STRING_SVTOOLS_RTF_FTNNGANADA},	RTF_FTNNGANADA},
+{{OOO_STRING_SVTOOLS_RTF_FTNNGBNUM},		RTF_FTNNGBNUM},
+{{OOO_STRING_SVTOOLS_RTF_FTNNGBNUMD},	RTF_FTNNGBNUMD},
+{{OOO_STRING_SVTOOLS_RTF_FTNNGBNUMK},	RTF_FTNNGBNUMK},
+{{OOO_STRING_SVTOOLS_RTF_FTNNGBNUML},	RTF_FTNNGBNUML},
+{{OOO_STRING_SVTOOLS_RTF_FTNNZODIAC},	RTF_FTNNZODIAC},
+{{OOO_STRING_SVTOOLS_RTF_FTNNZODIACD},	RTF_FTNNZODIACD},
+{{OOO_STRING_SVTOOLS_RTF_FTNNZODIACL},	RTF_FTNNZODIACL},
+{{OOO_STRING_SVTOOLS_RTF_G},				RTF_G},
+{{OOO_STRING_SVTOOLS_RTF_GCW},			RTF_GCW},
+{{OOO_STRING_SVTOOLS_RTF_GRIDTBL},		RTF_GRIDTBL},
+{{OOO_STRING_SVTOOLS_RTF_HIGHLIGHT},		RTF_HIGHLIGHT},
+{{OOO_STRING_SVTOOLS_RTF_HLFR},			RTF_HLFR},
+{{OOO_STRING_SVTOOLS_RTF_HLINKBASE},		RTF_HLINKBASE},
+{{OOO_STRING_SVTOOLS_RTF_HLLOC},			RTF_HLLOC},
+{{OOO_STRING_SVTOOLS_RTF_HLSRC},			RTF_HLSRC},
+{{OOO_STRING_SVTOOLS_RTF_ILVL},			RTF_ILVL},
+{{OOO_STRING_SVTOOLS_RTF_IMPR},			RTF_IMPR},
+{{OOO_STRING_SVTOOLS_RTF_JPEGBLIP},		RTF_JPEGBLIP},
+{{OOO_STRING_SVTOOLS_RTF_LEVELFOLLOW},	RTF_LEVELFOLLOW},
+{{OOO_STRING_SVTOOLS_RTF_LEVELINDENT},	RTF_LEVELINDENT},
+{{OOO_STRING_SVTOOLS_RTF_LEVELJC},		RTF_LEVELJC},
+{{OOO_STRING_SVTOOLS_RTF_LEVELLEGAL},	RTF_LEVELLEGAL},
+{{OOO_STRING_SVTOOLS_RTF_LEVELNFC},		RTF_LEVELNFC},
 {{OOO_STRING_SVTOOLS_RTF_LEVELNORESTART},RTF_LEVELNORESTART},
-{{OOO_STRING_SVTOOLS_RTF_LEVELNUMBERS}, RTF_LEVELNUMBERS},
-{{OOO_STRING_SVTOOLS_RTF_LEVELOLD},     RTF_LEVELOLD},
-{{OOO_STRING_SVTOOLS_RTF_LEVELPREV},        RTF_LEVELPREV},
+{{OOO_STRING_SVTOOLS_RTF_LEVELNUMBERS},	RTF_LEVELNUMBERS},
+{{OOO_STRING_SVTOOLS_RTF_LEVELOLD},		RTF_LEVELOLD},
+{{OOO_STRING_SVTOOLS_RTF_LEVELPREV},		RTF_LEVELPREV},
 {{OOO_STRING_SVTOOLS_RTF_LEVELPREVSPACE},RTF_LEVELPREVSPACE},
-{{OOO_STRING_SVTOOLS_RTF_LEVELSPACE},   RTF_LEVELSPACE},
-{{OOO_STRING_SVTOOLS_RTF_LEVELSTARTAT}, RTF_LEVELSTARTAT},
-{{OOO_STRING_SVTOOLS_RTF_LEVELTEXT},        RTF_LEVELTEXT},
-{{OOO_STRING_SVTOOLS_RTF_LINKVAL},      RTF_LINKVAL},
-{{OOO_STRING_SVTOOLS_RTF_LIST},         RTF_LIST},
-{{OOO_STRING_SVTOOLS_RTF_LISTID},       RTF_LISTID},
+{{OOO_STRING_SVTOOLS_RTF_LEVELSPACE},	RTF_LEVELSPACE},
+{{OOO_STRING_SVTOOLS_RTF_LEVELSTARTAT},	RTF_LEVELSTARTAT},
+{{OOO_STRING_SVTOOLS_RTF_LEVELTEXT},		RTF_LEVELTEXT},
+{{OOO_STRING_SVTOOLS_RTF_LINKVAL},		RTF_LINKVAL},
+{{OOO_STRING_SVTOOLS_RTF_LIST},			RTF_LIST},
+{{OOO_STRING_SVTOOLS_RTF_LISTID},		RTF_LISTID},
 {{OOO_STRING_SVTOOLS_RTF_LISTLEVEL},     RTF_LISTLEVEL},
-{{OOO_STRING_SVTOOLS_RTF_LISTNAME},     RTF_LISTNAME},
-{{OOO_STRING_SVTOOLS_RTF_LISTOVERRIDE}, RTF_LISTOVERRIDE},
-{{OOO_STRING_SVTOOLS_RTF_LISTOVERRIDECOUNT},        RTF_LISTOVERRIDECOUNT},
-{{OOO_STRING_SVTOOLS_RTF_LISTOVERRIDEFORMAT},   RTF_LISTOVERRIDEFORMAT},
-{{OOO_STRING_SVTOOLS_RTF_LISTOVERRIDESTART},        RTF_LISTOVERRIDESTART},
-{{OOO_STRING_SVTOOLS_RTF_LISTOVERRIDETABLE},        RTF_LISTOVERRIDETABLE},
+{{OOO_STRING_SVTOOLS_RTF_LISTNAME},		RTF_LISTNAME},
+{{OOO_STRING_SVTOOLS_RTF_LISTOVERRIDE},	RTF_LISTOVERRIDE},
+{{OOO_STRING_SVTOOLS_RTF_LISTOVERRIDECOUNT},		RTF_LISTOVERRIDECOUNT},
+{{OOO_STRING_SVTOOLS_RTF_LISTOVERRIDEFORMAT},	RTF_LISTOVERRIDEFORMAT},
+{{OOO_STRING_SVTOOLS_RTF_LISTOVERRIDESTART},		RTF_LISTOVERRIDESTART},
+{{OOO_STRING_SVTOOLS_RTF_LISTOVERRIDETABLE},		RTF_LISTOVERRIDETABLE},
 {{OOO_STRING_SVTOOLS_RTF_LISTRESTARTHDN},RTF_LISTRESTARTHDN},
-{{OOO_STRING_SVTOOLS_RTF_LISTSIMPLE},   RTF_LISTSIMPLE},
-{{OOO_STRING_SVTOOLS_RTF_LISTTABLE},        RTF_LISTTABLE},
+{{OOO_STRING_SVTOOLS_RTF_LISTSIMPLE},	RTF_LISTSIMPLE},
+{{OOO_STRING_SVTOOLS_RTF_LISTTABLE},		RTF_LISTTABLE},
 {{OOO_STRING_SVTOOLS_RTF_LISTTEMPLATEID},RTF_LISTTEMPLATEID},
-{{OOO_STRING_SVTOOLS_RTF_LISTTEXT},     RTF_LISTTEXT},
-{{OOO_STRING_SVTOOLS_RTF_LS},           RTF_LS},
-{{OOO_STRING_SVTOOLS_RTF_LYTEXCTTP},        RTF_LYTEXCTTP},
-{{OOO_STRING_SVTOOLS_RTF_LYTPRTMET},        RTF_LYTPRTMET},
-{{OOO_STRING_SVTOOLS_RTF_MANAGER},      RTF_MANAGER},
-{{OOO_STRING_SVTOOLS_RTF_MSMCAP},       RTF_MSMCAP},
-{{OOO_STRING_SVTOOLS_RTF_NOFCHARSWS},   RTF_NOFCHARSWS},
-{{OOO_STRING_SVTOOLS_RTF_NOLEAD},       RTF_NOLEAD},
-{{OOO_STRING_SVTOOLS_RTF_NONSHPPICT},   RTF_NONSHPPICT},
-{{OOO_STRING_SVTOOLS_RTF_NOSECTEXPAND}, RTF_NOSECTEXPAND},
+{{OOO_STRING_SVTOOLS_RTF_LISTTEXT},		RTF_LISTTEXT},
+{{OOO_STRING_SVTOOLS_RTF_LS},			RTF_LS},
+{{OOO_STRING_SVTOOLS_RTF_LYTEXCTTP},		RTF_LYTEXCTTP},
+{{OOO_STRING_SVTOOLS_RTF_LYTPRTMET},		RTF_LYTPRTMET},
+{{OOO_STRING_SVTOOLS_RTF_MANAGER},		RTF_MANAGER},
+{{OOO_STRING_SVTOOLS_RTF_MSMCAP},		RTF_MSMCAP},
+{{OOO_STRING_SVTOOLS_RTF_NOFCHARSWS},	RTF_NOFCHARSWS},
+{{OOO_STRING_SVTOOLS_RTF_NOLEAD},		RTF_NOLEAD},
+{{OOO_STRING_SVTOOLS_RTF_NONSHPPICT},	RTF_NONSHPPICT},
+{{OOO_STRING_SVTOOLS_RTF_NOSECTEXPAND},	RTF_NOSECTEXPAND},
 {{OOO_STRING_SVTOOLS_RTF_NOSNAPLINEGRID},RTF_NOSNAPLINEGRID},
-{{OOO_STRING_SVTOOLS_RTF_NOSPACEFORUL}, RTF_NOSPACEFORUL},
-{{OOO_STRING_SVTOOLS_RTF_NOULTRLSPC},   RTF_NOULTRLSPC},
-{{OOO_STRING_SVTOOLS_RTF_NOXLATTOYEN},  RTF_NOXLATTOYEN},
-{{OOO_STRING_SVTOOLS_RTF_OBJATTPH},     RTF_OBJATTPH},
-{{OOO_STRING_SVTOOLS_RTF_OBJHTML},      RTF_OBJHTML},
-{{OOO_STRING_SVTOOLS_RTF_OBJOCX},       RTF_OBJOCX},
-{{OOO_STRING_SVTOOLS_RTF_OLDLINEWRAP},  RTF_OLDLINEWRAP},
-{{OOO_STRING_SVTOOLS_RTF_OUTLINELEVEL}, RTF_OUTLINELEVEL},
-{{OOO_STRING_SVTOOLS_RTF_OVERLAY},      RTF_OVERLAY},
-{{OOO_STRING_SVTOOLS_RTF_PANOSE},       RTF_PANOSE},
-{{OOO_STRING_SVTOOLS_RTF_PGBRDRB},      RTF_PGBRDRB},
-{{OOO_STRING_SVTOOLS_RTF_PGBRDRFOOT},   RTF_PGBRDRFOOT},
-{{OOO_STRING_SVTOOLS_RTF_PGBRDRHEAD},   RTF_PGBRDRHEAD},
-{{OOO_STRING_SVTOOLS_RTF_PGBRDRL},      RTF_PGBRDRL},
-{{OOO_STRING_SVTOOLS_RTF_PGBRDROPT},        RTF_PGBRDROPT},
-{{OOO_STRING_SVTOOLS_RTF_PGBRDRR},      RTF_PGBRDRR},
-{{OOO_STRING_SVTOOLS_RTF_PGBRDRSNAP},   RTF_PGBRDRSNAP},
-{{OOO_STRING_SVTOOLS_RTF_PGBRDRT},      RTF_PGBRDRT},
-{{OOO_STRING_SVTOOLS_RTF_PGNCHOSUNG},   RTF_PGNCHOSUNG},
-{{OOO_STRING_SVTOOLS_RTF_PGNCNUM},      RTF_PGNCNUM},
-{{OOO_STRING_SVTOOLS_RTF_PGNDBNUMK},        RTF_PGNDBNUMK},
-{{OOO_STRING_SVTOOLS_RTF_PGNDBNUMT},        RTF_PGNDBNUMT},
-{{OOO_STRING_SVTOOLS_RTF_PGNGANADA},        RTF_PGNGANADA},
-{{OOO_STRING_SVTOOLS_RTF_PGNGBNUM},     RTF_PGNGBNUM},
-{{OOO_STRING_SVTOOLS_RTF_PGNGBNUMD},        RTF_PGNGBNUMD},
-{{OOO_STRING_SVTOOLS_RTF_PGNGBNUMK},        RTF_PGNGBNUMK},
-{{OOO_STRING_SVTOOLS_RTF_PGNGBNUML},        RTF_PGNGBNUML},
-{{OOO_STRING_SVTOOLS_RTF_PGNZODIAC},        RTF_PGNZODIAC},
-{{OOO_STRING_SVTOOLS_RTF_PGNZODIACD},   RTF_PGNZODIACD},
-{{OOO_STRING_SVTOOLS_RTF_PGNZODIACL},   RTF_PGNZODIACL},
-{{OOO_STRING_SVTOOLS_RTF_PICPROP},      RTF_PICPROP},
-{{OOO_STRING_SVTOOLS_RTF_PNAIUEO},      RTF_PNAIUEO},
-{{OOO_STRING_SVTOOLS_RTF_PNAIUEOD},     RTF_PNAIUEOD},
-{{OOO_STRING_SVTOOLS_RTF_PNCHOSUNG},        RTF_PNCHOSUNG},
-{{OOO_STRING_SVTOOLS_RTF_PNDBNUMD},     RTF_PNDBNUMD},
-{{OOO_STRING_SVTOOLS_RTF_PNDBNUMK},     RTF_PNDBNUMK},
-{{OOO_STRING_SVTOOLS_RTF_PNDBNUML},     RTF_PNDBNUML},
-{{OOO_STRING_SVTOOLS_RTF_PNDBNUMT},     RTF_PNDBNUMT},
-{{OOO_STRING_SVTOOLS_RTF_PNGANADA},     RTF_PNGANADA},
-{{OOO_STRING_SVTOOLS_RTF_PNGBLIP},      RTF_PNGBLIP},
-{{OOO_STRING_SVTOOLS_RTF_PNGBNUM},      RTF_PNGBNUM},
-{{OOO_STRING_SVTOOLS_RTF_PNGBNUMD},     RTF_PNGBNUMD},
-{{OOO_STRING_SVTOOLS_RTF_PNGBNUMK},     RTF_PNGBNUMK},
-{{OOO_STRING_SVTOOLS_RTF_PNGBNUML},     RTF_PNGBNUML},
-{{OOO_STRING_SVTOOLS_RTF_PNRAUTH},      RTF_PNRAUTH},
-{{OOO_STRING_SVTOOLS_RTF_PNRDATE},      RTF_PNRDATE},
-{{OOO_STRING_SVTOOLS_RTF_PNRNFC},       RTF_PNRNFC},
-{{OOO_STRING_SVTOOLS_RTF_PNRNOT},       RTF_PNRNOT},
-{{OOO_STRING_SVTOOLS_RTF_PNRPNBR},      RTF_PNRPNBR},
-{{OOO_STRING_SVTOOLS_RTF_PNRRGB},       RTF_PNRRGB},
-{{OOO_STRING_SVTOOLS_RTF_PNRSTART},     RTF_PNRSTART},
-{{OOO_STRING_SVTOOLS_RTF_PNRSTOP},      RTF_PNRSTOP},
-{{OOO_STRING_SVTOOLS_RTF_PNRXST},       RTF_PNRXST},
-{{OOO_STRING_SVTOOLS_RTF_PNZODIAC},     RTF_PNZODIAC},
-{{OOO_STRING_SVTOOLS_RTF_PNZODIACD},        RTF_PNZODIACD},
-{{OOO_STRING_SVTOOLS_RTF_PNZODIACL},        RTF_PNZODIACL},
-{{OOO_STRING_SVTOOLS_RTF_LFOLEVEL},     RTF_LFOLEVEL},
-{{OOO_STRING_SVTOOLS_RTF_POSYIN},       RTF_POSYIN},
-{{OOO_STRING_SVTOOLS_RTF_POSYOUT},      RTF_POSYOUT},
-{{OOO_STRING_SVTOOLS_RTF_PRIVATE},      RTF_PRIVATE},
-{{OOO_STRING_SVTOOLS_RTF_PROPNAME},     RTF_PROPNAME},
-{{OOO_STRING_SVTOOLS_RTF_PROPTYPE},     RTF_PROPTYPE},
-{{OOO_STRING_SVTOOLS_RTF_REVAUTHDEL},   RTF_REVAUTHDEL},
-{{OOO_STRING_SVTOOLS_RTF_REVDTTMDEL},   RTF_REVDTTMDEL},
-{{OOO_STRING_SVTOOLS_RTF_SAUTOUPD},     RTF_SAUTOUPD},
-{{OOO_STRING_SVTOOLS_RTF_SECTDEFAULTCL},    RTF_SECTDEFAULTCL},
-{{OOO_STRING_SVTOOLS_RTF_SECTEXPAND},   RTF_SECTEXPAND},
-{{OOO_STRING_SVTOOLS_RTF_SECTLINEGRID}, RTF_SECTLINEGRID},
-{{OOO_STRING_SVTOOLS_RTF_SECTSPECIFYCL},    RTF_SECTSPECIFYCL},
-{{OOO_STRING_SVTOOLS_RTF_SECTSPECIFYL}, RTF_SECTSPECIFYL},
-{{OOO_STRING_SVTOOLS_RTF_SHIDDEN},      RTF_SHIDDEN},
-{{OOO_STRING_SVTOOLS_RTF_SHPBOTTOM},        RTF_SHPBOTTOM},
-{{OOO_STRING_SVTOOLS_RTF_SHPBXCOLUMN},  RTF_SHPBXCOLUMN},
-{{OOO_STRING_SVTOOLS_RTF_SHPBXMARGIN},  RTF_SHPBXMARGIN},
-{{OOO_STRING_SVTOOLS_RTF_SHPBXPAGE},        RTF_SHPBXPAGE},
-{{OOO_STRING_SVTOOLS_RTF_SHPBYMARGIN},  RTF_SHPBYMARGIN},
-{{OOO_STRING_SVTOOLS_RTF_SHPBYPAGE},        RTF_SHPBYPAGE},
-{{OOO_STRING_SVTOOLS_RTF_SHPBYPARA},        RTF_SHPBYPARA},
-{{OOO_STRING_SVTOOLS_RTF_SHPFBLWTXT},   RTF_SHPFBLWTXT},
-{{OOO_STRING_SVTOOLS_RTF_SHPFHDR},      RTF_SHPFHDR},
-{{OOO_STRING_SVTOOLS_RTF_SHPGRP},       RTF_SHPGRP},
-{{OOO_STRING_SVTOOLS_RTF_SHPLEFT},      RTF_SHPLEFT},
-{{OOO_STRING_SVTOOLS_RTF_SHPLID},       RTF_SHPLID},
-{{OOO_STRING_SVTOOLS_RTF_SHPLOCKANCHOR},    RTF_SHPLOCKANCHOR},
-{{OOO_STRING_SVTOOLS_RTF_SHPPICT},      RTF_SHPPICT},
-{{OOO_STRING_SVTOOLS_RTF_SHPRIGHT},     RTF_SHPRIGHT},
-{{OOO_STRING_SVTOOLS_RTF_SHPRSLT},      RTF_SHPRSLT},
-{{OOO_STRING_SVTOOLS_RTF_SHPTOP},       RTF_SHPTOP},
-{{OOO_STRING_SVTOOLS_RTF_SHPTXT},       RTF_SHPTXT},
-{{OOO_STRING_SVTOOLS_RTF_SHPWRK},       RTF_SHPWRK},
-{{OOO_STRING_SVTOOLS_RTF_SHPWR},            RTF_SHPWR},
-{{OOO_STRING_SVTOOLS_RTF_SHPZ},         RTF_SHPZ},
-{{OOO_STRING_SVTOOLS_RTF_SPRSBSP},      RTF_SPRSBSP},
-{{OOO_STRING_SVTOOLS_RTF_SPRSLNSP},     RTF_SPRSLNSP},
-{{OOO_STRING_SVTOOLS_RTF_SPRSTSM},      RTF_SPRSTSM},
-{{OOO_STRING_SVTOOLS_RTF_STATICVAL},        RTF_STATICVAL},
-{{OOO_STRING_SVTOOLS_RTF_STEXTFLOW},        RTF_STEXTFLOW},
-{{OOO_STRING_SVTOOLS_RTF_STRIKED},      RTF_STRIKED},
-{{OOO_STRING_SVTOOLS_RTF_SUBFONTBYSIZE},    RTF_SUBFONTBYSIZE},
-{{OOO_STRING_SVTOOLS_RTF_TCELLD},       RTF_TCELLD},
-{{OOO_STRING_SVTOOLS_RTF_TIME},         RTF_TIME},
-{{OOO_STRING_SVTOOLS_RTF_TRUNCATEFONTHEIGHT},   RTF_TRUNCATEFONTHEIGHT},
-{{OOO_STRING_SVTOOLS_RTF_UC},           RTF_UC},
-{{OOO_STRING_SVTOOLS_RTF_UD},           RTF_UD},
-{{OOO_STRING_SVTOOLS_RTF_ULDASH},       RTF_ULDASH},
-{{OOO_STRING_SVTOOLS_RTF_ULDASHD},      RTF_ULDASHD},
-{{OOO_STRING_SVTOOLS_RTF_ULDASHDD},     RTF_ULDASHDD},
-{{OOO_STRING_SVTOOLS_RTF_ULTH},         RTF_ULTH},
-{{OOO_STRING_SVTOOLS_RTF_ULWAVE},       RTF_ULWAVE},
-{{OOO_STRING_SVTOOLS_RTF_ULC},          RTF_ULC},
-{{OOO_STRING_SVTOOLS_RTF_U},                RTF_U},
-{{OOO_STRING_SVTOOLS_RTF_UPR},          RTF_UPR},
-{{OOO_STRING_SVTOOLS_RTF_USERPROPS},        RTF_USERPROPS},
-{{OOO_STRING_SVTOOLS_RTF_VIEWKIND},     RTF_VIEWKIND},
-{{OOO_STRING_SVTOOLS_RTF_VIEWSCALE},        RTF_VIEWSCALE},
-{{OOO_STRING_SVTOOLS_RTF_VIEWZK},       RTF_VIEWZK},
-{{OOO_STRING_SVTOOLS_RTF_WIDCTLPAR},        RTF_WIDCTLPAR},
-{{OOO_STRING_SVTOOLS_RTF_WINDOWCAPTION},    RTF_WINDOWCAPTION},
-{{OOO_STRING_SVTOOLS_RTF_WPEQN},            RTF_WPEQN},
-{{OOO_STRING_SVTOOLS_RTF_WPJST},            RTF_WPJST},
-{{OOO_STRING_SVTOOLS_RTF_WPSP},         RTF_WPSP},
-{{OOO_STRING_SVTOOLS_RTF_YXE},          RTF_YXE},
+{{OOO_STRING_SVTOOLS_RTF_NOSPACEFORUL},	RTF_NOSPACEFORUL},
+{{OOO_STRING_SVTOOLS_RTF_NOULTRLSPC},	RTF_NOULTRLSPC},
+{{OOO_STRING_SVTOOLS_RTF_NOXLATTOYEN},	RTF_NOXLATTOYEN},
+{{OOO_STRING_SVTOOLS_RTF_OBJATTPH},		RTF_OBJATTPH},
+{{OOO_STRING_SVTOOLS_RTF_OBJHTML},		RTF_OBJHTML},
+{{OOO_STRING_SVTOOLS_RTF_OBJOCX},		RTF_OBJOCX},
+{{OOO_STRING_SVTOOLS_RTF_OLDLINEWRAP},	RTF_OLDLINEWRAP},
+{{OOO_STRING_SVTOOLS_RTF_OUTLINELEVEL},	RTF_OUTLINELEVEL},
+{{OOO_STRING_SVTOOLS_RTF_OVERLAY},		RTF_OVERLAY},
+{{OOO_STRING_SVTOOLS_RTF_PANOSE},		RTF_PANOSE},
+{{OOO_STRING_SVTOOLS_RTF_PGBRDRB},		RTF_PGBRDRB},
+{{OOO_STRING_SVTOOLS_RTF_PGBRDRFOOT},	RTF_PGBRDRFOOT},
+{{OOO_STRING_SVTOOLS_RTF_PGBRDRHEAD},	RTF_PGBRDRHEAD},
+{{OOO_STRING_SVTOOLS_RTF_PGBRDRL},		RTF_PGBRDRL},
+{{OOO_STRING_SVTOOLS_RTF_PGBRDROPT},		RTF_PGBRDROPT},
+{{OOO_STRING_SVTOOLS_RTF_PGBRDRR},		RTF_PGBRDRR},
+{{OOO_STRING_SVTOOLS_RTF_PGBRDRSNAP},	RTF_PGBRDRSNAP},
+{{OOO_STRING_SVTOOLS_RTF_PGBRDRT},		RTF_PGBRDRT},
+{{OOO_STRING_SVTOOLS_RTF_PGNCHOSUNG},	RTF_PGNCHOSUNG},
+{{OOO_STRING_SVTOOLS_RTF_PGNCNUM},		RTF_PGNCNUM},
+{{OOO_STRING_SVTOOLS_RTF_PGNDBNUMK},		RTF_PGNDBNUMK},
+{{OOO_STRING_SVTOOLS_RTF_PGNDBNUMT},		RTF_PGNDBNUMT},
+{{OOO_STRING_SVTOOLS_RTF_PGNGANADA},		RTF_PGNGANADA},
+{{OOO_STRING_SVTOOLS_RTF_PGNGBNUM},		RTF_PGNGBNUM},
+{{OOO_STRING_SVTOOLS_RTF_PGNGBNUMD},		RTF_PGNGBNUMD},
+{{OOO_STRING_SVTOOLS_RTF_PGNGBNUMK},		RTF_PGNGBNUMK},
+{{OOO_STRING_SVTOOLS_RTF_PGNGBNUML},		RTF_PGNGBNUML},
+{{OOO_STRING_SVTOOLS_RTF_PGNZODIAC},		RTF_PGNZODIAC},
+{{OOO_STRING_SVTOOLS_RTF_PGNZODIACD},	RTF_PGNZODIACD},
+{{OOO_STRING_SVTOOLS_RTF_PGNZODIACL},	RTF_PGNZODIACL},
+{{OOO_STRING_SVTOOLS_RTF_PICPROP},		RTF_PICPROP},
+{{OOO_STRING_SVTOOLS_RTF_PNAIUEO},		RTF_PNAIUEO},
+{{OOO_STRING_SVTOOLS_RTF_PNAIUEOD},		RTF_PNAIUEOD},
+{{OOO_STRING_SVTOOLS_RTF_PNCHOSUNG},		RTF_PNCHOSUNG},
+{{OOO_STRING_SVTOOLS_RTF_PNDBNUMD},		RTF_PNDBNUMD},
+{{OOO_STRING_SVTOOLS_RTF_PNDBNUMK},		RTF_PNDBNUMK},
+{{OOO_STRING_SVTOOLS_RTF_PNDBNUML},		RTF_PNDBNUML},
+{{OOO_STRING_SVTOOLS_RTF_PNDBNUMT},		RTF_PNDBNUMT},
+{{OOO_STRING_SVTOOLS_RTF_PNGANADA},		RTF_PNGANADA},
+{{OOO_STRING_SVTOOLS_RTF_PNGBLIP},		RTF_PNGBLIP},
+{{OOO_STRING_SVTOOLS_RTF_PNGBNUM},		RTF_PNGBNUM},
+{{OOO_STRING_SVTOOLS_RTF_PNGBNUMD},		RTF_PNGBNUMD},
+{{OOO_STRING_SVTOOLS_RTF_PNGBNUMK},		RTF_PNGBNUMK},
+{{OOO_STRING_SVTOOLS_RTF_PNGBNUML},		RTF_PNGBNUML},
+{{OOO_STRING_SVTOOLS_RTF_PNRAUTH},		RTF_PNRAUTH},
+{{OOO_STRING_SVTOOLS_RTF_PNRDATE},		RTF_PNRDATE},
+{{OOO_STRING_SVTOOLS_RTF_PNRNFC},		RTF_PNRNFC},
+{{OOO_STRING_SVTOOLS_RTF_PNRNOT},		RTF_PNRNOT},
+{{OOO_STRING_SVTOOLS_RTF_PNRPNBR},		RTF_PNRPNBR},
+{{OOO_STRING_SVTOOLS_RTF_PNRRGB},		RTF_PNRRGB},
+{{OOO_STRING_SVTOOLS_RTF_PNRSTART},		RTF_PNRSTART},
+{{OOO_STRING_SVTOOLS_RTF_PNRSTOP},		RTF_PNRSTOP},
+{{OOO_STRING_SVTOOLS_RTF_PNRXST},		RTF_PNRXST},
+{{OOO_STRING_SVTOOLS_RTF_PNZODIAC},		RTF_PNZODIAC},
+{{OOO_STRING_SVTOOLS_RTF_PNZODIACD},		RTF_PNZODIACD},
+{{OOO_STRING_SVTOOLS_RTF_PNZODIACL},		RTF_PNZODIACL},
+{{OOO_STRING_SVTOOLS_RTF_LFOLEVEL},		RTF_LFOLEVEL},
+{{OOO_STRING_SVTOOLS_RTF_POSYIN},		RTF_POSYIN},
+{{OOO_STRING_SVTOOLS_RTF_POSYOUT},		RTF_POSYOUT},
+{{OOO_STRING_SVTOOLS_RTF_PRIVATE},		RTF_PRIVATE},
+{{OOO_STRING_SVTOOLS_RTF_PROPNAME},		RTF_PROPNAME},
+{{OOO_STRING_SVTOOLS_RTF_PROPTYPE},		RTF_PROPTYPE},
+{{OOO_STRING_SVTOOLS_RTF_REVAUTHDEL},	RTF_REVAUTHDEL},
+{{OOO_STRING_SVTOOLS_RTF_REVDTTMDEL},	RTF_REVDTTMDEL},
+{{OOO_STRING_SVTOOLS_RTF_SAUTOUPD},		RTF_SAUTOUPD},
+{{OOO_STRING_SVTOOLS_RTF_SECTDEFAULTCL},	RTF_SECTDEFAULTCL},
+{{OOO_STRING_SVTOOLS_RTF_SECTEXPAND},	RTF_SECTEXPAND},
+{{OOO_STRING_SVTOOLS_RTF_SECTLINEGRID},	RTF_SECTLINEGRID},
+{{OOO_STRING_SVTOOLS_RTF_SECTSPECIFYCL},	RTF_SECTSPECIFYCL},
+{{OOO_STRING_SVTOOLS_RTF_SECTSPECIFYL},	RTF_SECTSPECIFYL},
+{{OOO_STRING_SVTOOLS_RTF_SHIDDEN},		RTF_SHIDDEN},
+{{OOO_STRING_SVTOOLS_RTF_SHPBOTTOM},		RTF_SHPBOTTOM},
+{{OOO_STRING_SVTOOLS_RTF_SHPBXCOLUMN},	RTF_SHPBXCOLUMN},
+{{OOO_STRING_SVTOOLS_RTF_SHPBXMARGIN},	RTF_SHPBXMARGIN},
+{{OOO_STRING_SVTOOLS_RTF_SHPBXPAGE},		RTF_SHPBXPAGE},
+{{OOO_STRING_SVTOOLS_RTF_SHPBYMARGIN},	RTF_SHPBYMARGIN},
+{{OOO_STRING_SVTOOLS_RTF_SHPBYPAGE},		RTF_SHPBYPAGE},
+{{OOO_STRING_SVTOOLS_RTF_SHPBYPARA},		RTF_SHPBYPARA},
+{{OOO_STRING_SVTOOLS_RTF_SHPFBLWTXT},	RTF_SHPFBLWTXT},
+{{OOO_STRING_SVTOOLS_RTF_SHPFHDR},		RTF_SHPFHDR},
+{{OOO_STRING_SVTOOLS_RTF_SHPGRP},		RTF_SHPGRP},
+{{OOO_STRING_SVTOOLS_RTF_SHPLEFT},		RTF_SHPLEFT},
+{{OOO_STRING_SVTOOLS_RTF_SHPLID},		RTF_SHPLID},
+{{OOO_STRING_SVTOOLS_RTF_SHPLOCKANCHOR},	RTF_SHPLOCKANCHOR},
+{{OOO_STRING_SVTOOLS_RTF_SHPPICT},		RTF_SHPPICT},
+{{OOO_STRING_SVTOOLS_RTF_SHPRIGHT},		RTF_SHPRIGHT},
+{{OOO_STRING_SVTOOLS_RTF_SHPRSLT},		RTF_SHPRSLT},
+{{OOO_STRING_SVTOOLS_RTF_SHPTOP},		RTF_SHPTOP},
+{{OOO_STRING_SVTOOLS_RTF_SHPTXT},		RTF_SHPTXT},
+{{OOO_STRING_SVTOOLS_RTF_SHPWRK},		RTF_SHPWRK},
+{{OOO_STRING_SVTOOLS_RTF_SHPWR},			RTF_SHPWR},
+{{OOO_STRING_SVTOOLS_RTF_SHPZ},			RTF_SHPZ},
+{{OOO_STRING_SVTOOLS_RTF_SPRSBSP},		RTF_SPRSBSP},
+{{OOO_STRING_SVTOOLS_RTF_SPRSLNSP},		RTF_SPRSLNSP},
+{{OOO_STRING_SVTOOLS_RTF_SPRSTSM},		RTF_SPRSTSM},
+{{OOO_STRING_SVTOOLS_RTF_STATICVAL},		RTF_STATICVAL},
+{{OOO_STRING_SVTOOLS_RTF_STEXTFLOW},		RTF_STEXTFLOW},
+{{OOO_STRING_SVTOOLS_RTF_STRIKED},		RTF_STRIKED},
+{{OOO_STRING_SVTOOLS_RTF_SUBFONTBYSIZE},	RTF_SUBFONTBYSIZE},
+{{OOO_STRING_SVTOOLS_RTF_TCELLD},		RTF_TCELLD},
+{{OOO_STRING_SVTOOLS_RTF_TIME},			RTF_TIME},
+{{OOO_STRING_SVTOOLS_RTF_TRUNCATEFONTHEIGHT},	RTF_TRUNCATEFONTHEIGHT},
+{{OOO_STRING_SVTOOLS_RTF_UC},			RTF_UC},
+{{OOO_STRING_SVTOOLS_RTF_UD},			RTF_UD},
+{{OOO_STRING_SVTOOLS_RTF_ULDASH},		RTF_ULDASH},
+{{OOO_STRING_SVTOOLS_RTF_ULDASHD},		RTF_ULDASHD},
+{{OOO_STRING_SVTOOLS_RTF_ULDASHDD},		RTF_ULDASHDD},
+{{OOO_STRING_SVTOOLS_RTF_ULTH},			RTF_ULTH},
+{{OOO_STRING_SVTOOLS_RTF_ULWAVE},		RTF_ULWAVE},
+{{OOO_STRING_SVTOOLS_RTF_ULC},			RTF_ULC},
+{{OOO_STRING_SVTOOLS_RTF_U},				RTF_U},
+{{OOO_STRING_SVTOOLS_RTF_UPR},			RTF_UPR},
+{{OOO_STRING_SVTOOLS_RTF_USERPROPS},		RTF_USERPROPS},
+{{OOO_STRING_SVTOOLS_RTF_VIEWKIND},		RTF_VIEWKIND},
+{{OOO_STRING_SVTOOLS_RTF_VIEWSCALE},		RTF_VIEWSCALE},
+{{OOO_STRING_SVTOOLS_RTF_VIEWZK},		RTF_VIEWZK},
+{{OOO_STRING_SVTOOLS_RTF_WIDCTLPAR},		RTF_WIDCTLPAR},
+{{OOO_STRING_SVTOOLS_RTF_WINDOWCAPTION},	RTF_WINDOWCAPTION},
+{{OOO_STRING_SVTOOLS_RTF_WPEQN},			RTF_WPEQN},
+{{OOO_STRING_SVTOOLS_RTF_WPJST},			RTF_WPJST},
+{{OOO_STRING_SVTOOLS_RTF_WPSP},			RTF_WPSP},
+{{OOO_STRING_SVTOOLS_RTF_YXE},			RTF_YXE},
 {{OOO_STRING_SVTOOLS_RTF_FRMTXLRTB},    RTF_FRMTXLRTB},
 {{OOO_STRING_SVTOOLS_RTF_FRMTXTBRL},    RTF_FRMTXTBRL},
 {{OOO_STRING_SVTOOLS_RTF_FRMTXBTLR},    RTF_FRMTXBTLR},
@@ -1068,22 +1068,22 @@ static RTF_TokenEntry __FAR_DATA aRTFTokenTab[] = {
         {{OOO_STRING_SVTOOLS_RTF_ULHWAVE},       RTF_ULHWAVE},
         {{OOO_STRING_SVTOOLS_RTF_ULULDBWAVE},    RTF_ULULDBWAVE},
 
-        {{OOO_STRING_SVTOOLS_RTF_LOCH},         RTF_LOCH},
-        {{OOO_STRING_SVTOOLS_RTF_HICH},         RTF_HICH},
-        {{OOO_STRING_SVTOOLS_RTF_DBCH},         RTF_DBCH},
-        {{OOO_STRING_SVTOOLS_RTF_LANGFE},       RTF_LANGFE},
-        {{OOO_STRING_SVTOOLS_RTF_ADEFLANG},     RTF_ADEFLANG},
-        {{OOO_STRING_SVTOOLS_RTF_ADEFF},            RTF_ADEFF},
-        {{OOO_STRING_SVTOOLS_RTF_ACCNONE},      RTF_ACCNONE},
-        {{OOO_STRING_SVTOOLS_RTF_ACCDOT},       RTF_ACCDOT},
-        {{OOO_STRING_SVTOOLS_RTF_ACCCOMMA},     RTF_ACCCOMMA},
-        {{OOO_STRING_SVTOOLS_RTF_TWOINONE},     RTF_TWOINONE},
-        {{OOO_STRING_SVTOOLS_RTF_HORZVERT},     RTF_HORZVERT},
-        {{OOO_STRING_SVTOOLS_RTF_FAHANG},       RTF_FAHANG},
-        {{OOO_STRING_SVTOOLS_RTF_FAVAR},            RTF_FAVAR},
-        {{OOO_STRING_SVTOOLS_RTF_FACENTER},     RTF_FACENTER},
-        {{OOO_STRING_SVTOOLS_RTF_FAROMAN},      RTF_FAROMAN},
-        {{OOO_STRING_SVTOOLS_RTF_FAFIXED},      RTF_FAFIXED},
+        {{OOO_STRING_SVTOOLS_RTF_LOCH},    		RTF_LOCH},
+        {{OOO_STRING_SVTOOLS_RTF_HICH},    		RTF_HICH},
+        {{OOO_STRING_SVTOOLS_RTF_DBCH},    		RTF_DBCH},
+        {{OOO_STRING_SVTOOLS_RTF_LANGFE},    	RTF_LANGFE},
+        {{OOO_STRING_SVTOOLS_RTF_ADEFLANG},		RTF_ADEFLANG},
+        {{OOO_STRING_SVTOOLS_RTF_ADEFF},			RTF_ADEFF},
+        {{OOO_STRING_SVTOOLS_RTF_ACCNONE},		RTF_ACCNONE},
+        {{OOO_STRING_SVTOOLS_RTF_ACCDOT},		RTF_ACCDOT},
+        {{OOO_STRING_SVTOOLS_RTF_ACCCOMMA},		RTF_ACCCOMMA},
+        {{OOO_STRING_SVTOOLS_RTF_TWOINONE},		RTF_TWOINONE},
+        {{OOO_STRING_SVTOOLS_RTF_HORZVERT},		RTF_HORZVERT},
+        {{OOO_STRING_SVTOOLS_RTF_FAHANG},		RTF_FAHANG},
+        {{OOO_STRING_SVTOOLS_RTF_FAVAR},			RTF_FAVAR},
+        {{OOO_STRING_SVTOOLS_RTF_FACENTER},		RTF_FACENTER},
+        {{OOO_STRING_SVTOOLS_RTF_FAROMAN},		RTF_FAROMAN},
+        {{OOO_STRING_SVTOOLS_RTF_FAFIXED},		RTF_FAFIXED},
         {{OOO_STRING_SVTOOLS_RTF_NOCWRAP},       RTF_NOCWRAP},
         {{OOO_STRING_SVTOOLS_RTF_NOOVERFLOW},    RTF_NOOVERFLOW},
         {{OOO_STRING_SVTOOLS_RTF_ASPALPHA},      RTF_ASPALPHA},
@@ -1162,25 +1162,25 @@ static RTF_TokenEntry __FAR_DATA aRTFTokenTab[] = {
         {{OOO_STRING_SVTOOLS_RTF_SV},       RTF_SV},
 
 // Support for overline attributes
-        {{OOO_STRING_SVTOOLS_RTF_OL},           RTF_OL},
-        {{OOO_STRING_SVTOOLS_RTF_OLW},          RTF_OLW},
-        {{OOO_STRING_SVTOOLS_RTF_OLD},          RTF_OLD},
-        {{OOO_STRING_SVTOOLS_RTF_OLDB},         RTF_OLDB},
-        {{OOO_STRING_SVTOOLS_RTF_OLNONE},       RTF_OLNONE},
-        {{OOO_STRING_SVTOOLS_RTF_OLDASH},       RTF_OLDASH},
-        {{OOO_STRING_SVTOOLS_RTF_OLDASHD},      RTF_OLDASHD},
-        {{OOO_STRING_SVTOOLS_RTF_OLDASHDD},     RTF_OLDASHDD},
-        {{OOO_STRING_SVTOOLS_RTF_OLTH},         RTF_OLTH},
-        {{OOO_STRING_SVTOOLS_RTF_OLWAVE},       RTF_OLWAVE},
-        {{OOO_STRING_SVTOOLS_RTF_OLC},          RTF_OLC},
-        {{OOO_STRING_SVTOOLS_RTF_OLTHD},            RTF_OLTHD},
-        {{OOO_STRING_SVTOOLS_RTF_OLTHDASH},     RTF_OLTHDASH},
-        {{OOO_STRING_SVTOOLS_RTF_OLLDASH},      RTF_OLLDASH},
-        {{OOO_STRING_SVTOOLS_RTF_OLTHLDASH},        RTF_OLTHLDASH},
-        {{OOO_STRING_SVTOOLS_RTF_OLTHDASHD},        RTF_OLTHDASHD},
-        {{OOO_STRING_SVTOOLS_RTF_OLTHDASHDD},   RTF_OLTHDASHDD},
-        {{OOO_STRING_SVTOOLS_RTF_OLHWAVE},      RTF_OLHWAVE},
-        {{OOO_STRING_SVTOOLS_RTF_OLOLDBWAVE},   RTF_OLOLDBWAVE}
+        {{OOO_STRING_SVTOOLS_RTF_OL}, 			RTF_OL},
+        {{OOO_STRING_SVTOOLS_RTF_OLW},			RTF_OLW},
+        {{OOO_STRING_SVTOOLS_RTF_OLD},			RTF_OLD},
+        {{OOO_STRING_SVTOOLS_RTF_OLDB},			RTF_OLDB},
+        {{OOO_STRING_SVTOOLS_RTF_OLNONE}, 		RTF_OLNONE},
+        {{OOO_STRING_SVTOOLS_RTF_OLDASH}, 		RTF_OLDASH},
+        {{OOO_STRING_SVTOOLS_RTF_OLDASHD},		RTF_OLDASHD},
+        {{OOO_STRING_SVTOOLS_RTF_OLDASHDD},		RTF_OLDASHDD},
+        {{OOO_STRING_SVTOOLS_RTF_OLTH},			RTF_OLTH},
+        {{OOO_STRING_SVTOOLS_RTF_OLWAVE}, 		RTF_OLWAVE},
+        {{OOO_STRING_SVTOOLS_RTF_OLC},			RTF_OLC},
+        {{OOO_STRING_SVTOOLS_RTF_OLTHD},			RTF_OLTHD},
+        {{OOO_STRING_SVTOOLS_RTF_OLTHDASH},		RTF_OLTHDASH},
+        {{OOO_STRING_SVTOOLS_RTF_OLLDASH},		RTF_OLLDASH},
+        {{OOO_STRING_SVTOOLS_RTF_OLTHLDASH},		RTF_OLTHLDASH},
+        {{OOO_STRING_SVTOOLS_RTF_OLTHDASHD},		RTF_OLTHDASHD},
+        {{OOO_STRING_SVTOOLS_RTF_OLTHDASHDD}, 	RTF_OLTHDASHDD},
+        {{OOO_STRING_SVTOOLS_RTF_OLHWAVE},		RTF_OLHWAVE},
+        {{OOO_STRING_SVTOOLS_RTF_OLOLDBWAVE}, 	RTF_OLOLDBWAVE}
 };
 
 
@@ -1201,13 +1201,13 @@ _Optlink
             nRet = ((RTF_TokenEntry*)pFirst)->pUToken->CompareTo(
                             *((RTF_TokenEntry*)pSecond)->pUToken );
         else
-            nRet = ((RTF_TokenEntry*)pFirst)->pUToken->CompareToAscii(
+            nRet = ((RTF_TokenEntry*)pFirst)->pUToken->CompareIgnoreCaseToAscii(
                             ((RTF_TokenEntry*)pSecond)->sToken );
     }
     else
     {
         if( -1 == ((RTF_TokenEntry*)pSecond)->nToken )
-            nRet = -1 * ((RTF_TokenEntry*)pSecond)->pUToken->CompareToAscii(
+            nRet = -1 * ((RTF_TokenEntry*)pSecond)->pUToken->CompareIgnoreCaseToAscii(
                             ((RTF_TokenEntry*)pFirst)->sToken );
         else
             nRet = strcmp( ((RTF_TokenEntry*)pFirst)->sToken,
diff --git a/svtools/source/svrtf/rtfout.cxx b/svtools/source/svrtf/rtfout.cxx
index d97e838d2450..f1af03bcc5e7 100644
--- a/svtools/source/svrtf/rtfout.cxx
+++ b/svtools/source/svrtf/rtfout.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
@@ -50,8 +50,8 @@ SvStream& RTFOutFuncs::Out_Char(SvStream& rStream, sal_Unicode c,
     const sal_Char* pStr = 0;
     switch (c)
     {
-    case 0x1:
-    case 0x2:
+    case 0x1:	
+    case 0x2:	
         // this are control character of our textattributes and will never be
         // written
         break;
@@ -125,7 +125,7 @@ SvStream& RTFOutFuncs::Out_Char(SvStream& rStream, sal_Unicode c,
                         RTL_UNICODETOTEXT_FLAGS_UNDEFINED_ERROR |
                         RTL_UNICODETOTEXT_FLAGS_INVALID_ERROR;
                     bool bWriteAsUnicode = !(sBuf.convertToString(&sConverted,
-                                         eDestEnc, nFlags))
+                                         eDestEnc, nFlags)) 
                                             || (RTL_TEXTENCODING_UTF8==eDestEnc); // #i43933# do not export UTF-8 chars in RTF;
                     if (bWriteAsUnicode)
                     {
@@ -133,7 +133,7 @@ SvStream& RTFOutFuncs::Out_Char(SvStream& rStream, sal_Unicode c,
                             eDestEnc, OUSTRING_TO_OSTRING_CVTFLAGS);
                     }
                     const sal_Int32 nLen = sConverted.getLength();
-
+                    
                     if (bWriteAsUnicode && pUCMode)
                     {
                         // then write as unicode - character
diff --git a/svtools/source/svrtf/svparser.cxx b/svtools/source/svrtf/svparser.cxx
index 53b7ee497754..8c04ad6ba47d 100644
--- a/svtools/source/svrtf/svparser.cxx
+++ b/svtools/source/svrtf/svparser.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
@@ -40,25 +40,25 @@
 
 #define SVPAR_CSM_
 
-#define SVPAR_CSM_ANSI      0x0001U
-#define SVPAR_CSM_UTF8      0x0002U
-#define SVPAR_CSM_UCS2B     0x0004U
-#define SVPAR_CSM_UCS2L     0x0008U
-#define SVPAR_CSM_SWITCH    0x8000U
+#define SVPAR_CSM_ANSI		0x0001U
+#define SVPAR_CSM_UTF8		0x0002U
+#define SVPAR_CSM_UCS2B		0x0004U
+#define SVPAR_CSM_UCS2L		0x0008U
+#define SVPAR_CSM_SWITCH	0x8000U
 
 // Struktur, um sich die akt. Daten zumerken
 struct SvParser_Impl
 {
-    String          aToken;             // gescanntes Token
-    ULONG           nFilePos;           // akt. Position im Stream
-    ULONG           nlLineNr;           // akt. Zeilen Nummer
-    ULONG           nlLinePos;          // akt. Spalten Nummer
-    long            nTokenValue;        // zusaetzlicher Wert (RTF)
-    BOOL            bTokenHasValue;     // indicates whether nTokenValue is valid
-    int             nToken;             // akt. Token
-    sal_Unicode     nNextCh;            // akt. Zeichen
+    String 	  		aToken;				// gescanntes Token
+    ULONG 			nFilePos;			// akt. Position im Stream
+    ULONG	  		nlLineNr;			// akt. Zeilen Nummer
+    ULONG	  		nlLinePos;			// akt. Spalten Nummer
+    long            nTokenValue;		// zusaetzlicher Wert (RTF)
+    BOOL			bTokenHasValue;		// indicates whether nTokenValue is valid
+    int 			nToken;				// akt. Token
+    sal_Unicode		nNextCh;    		// akt. Zeichen
 
-    int             nSaveToken;         // das Token vom Continue
+    int 			nSaveToken;			// das Token vom Continue
 
     rtl_TextToUnicodeConverter hConv;
     rtl_TextToUnicodeContext   hContext;
@@ -261,13 +261,13 @@ sal_Unicode SvParser::GetNextChar()
         sal_Size nChars = 0;
         do
         {
-            sal_Char c1;    // signed, that's the text converter expects
+            sal_Char c1;	// signed, that's the text converter expects
             rInput >> c1;
             bErr = rInput.IsEof() || rInput.GetError();
             if( !bErr )
             {
                 if (
-                     RTL_TEXTENCODING_DONTKNOW == eSrcEnc ||
+                     RTL_TEXTENCODING_DONTKNOW == eSrcEnc || 
                      RTL_TEXTENCODING_SYMBOL == eSrcEnc
                    )
                 {
@@ -319,11 +319,11 @@ sal_Unicode SvParser::GetNextChar()
                                 }
                                 else if( 0 != nChars || 0 != nInfo )
                                 {
-                                    DBG_ASSERT( (nInfo&RTL_TEXTTOUNICODE_INFO_SRCBUFFERTOSMALL) == 0,
+                                    DBG_ASSERT( (nInfo&RTL_TEXTTOUNICODE_INFO_SRCBUFFERTOSMALL) == 0, 
                                         "source buffer is to small" );
                                     DBG_ASSERT( (nInfo&~(RTL_TEXTTOUNICODE_INFO_SRCBUFFERTOSMALL)) == 0,
                                          "there is a conversion error" );
-                                    DBG_ASSERT( 0 == nChars,
+                                    DBG_ASSERT( 0 == nChars, 
                                        "there is a converted character, but an error" );
                                     // There are still errors, but nothing we can
                                     // do
@@ -363,13 +363,13 @@ sal_Unicode SvParser::GetNextChar()
                                 }
                                 else
                                 {
-                                    DBG_ASSERT( (nInfo&RTL_TEXTTOUNICODE_INFO_SRCBUFFERTOSMALL) == 0,
+                                    DBG_ASSERT( (nInfo&RTL_TEXTTOUNICODE_INFO_SRCBUFFERTOSMALL) == 0, 
                                         "source buffer is to small" );
                                     DBG_ASSERT( (nInfo&~(RTL_TEXTTOUNICODE_INFO_SRCBUFFERTOSMALL)) == 0,
                                          "there is a conversion error" );
-                                    DBG_ASSERT( 0 == nChars,
+                                    DBG_ASSERT( 0 == nChars, 
                                        "there is a converted character, but an error" );
-
+                                    
                                     // There are still errors, so we use the first
                                     // character and restart after that.
                                     c = (sal_Unicode)sBuffer[0];
@@ -388,9 +388,9 @@ sal_Unicode SvParser::GetNextChar()
                     }
                     else if( 0 != nChars || 0 != nInfo )
                     {
-                        DBG_ASSERT( 0 == nChars,
+                        DBG_ASSERT( 0 == nChars, 
                                 "there is a converted character, but an error" );
-                        DBG_ASSERT( 0 != nInfo,
+                        DBG_ASSERT( 0 != nInfo, 
                                 "there is no converted character and no error" );
                         // #73398#: If the character could not be converted,
                         // because a conversion is not available, do no conversion at all.
@@ -436,8 +436,8 @@ int SvParser::GetNextToken()
 
     if( !nTokenStackPos )
     {
-        aToken.Erase();     // Token-Buffer loeschen
-        nTokenValue = -1;   // Kennzeichen fuer kein Value gelesen
+        aToken.Erase();		// Token-Buffer loeschen
+        nTokenValue = -1;	// Kennzeichen fuer kein Value gelesen
         bTokenHasValue = false;
 
         nRet = _GetNextToken();
@@ -467,12 +467,12 @@ int SvParser::GetNextToken()
         pTokenStackPos->nTokenId = nRet;
     }
     else if( SVPAR_ACCEPTED != eState && SVPAR_PENDING != eState )
-        eState = SVPAR_ERROR;       // irgend ein Fehler
+        eState = SVPAR_ERROR;		// irgend ein Fehler
 
     return nRet;
 }
 
-int SvParser::SkipToken( short nCnt )       // n Tokens zurueck "skippen"
+int SvParser::SkipToken( short nCnt )		// n Tokens zurueck "skippen"
 {
     pTokenStackPos = GetStackPtr( nCnt );
     short nTmp = nTokenStackPos - nCnt;
@@ -644,7 +644,7 @@ IMPL_STATIC_LINK( SvParser, NewDataRead, void*, EMPTYARG )
             pThis->rInput.ResetError();
 
         if( SVPAR_PENDING != pThis->eState )
-            pThis->ReleaseRef();                    // ansonsten sind wir fertig!
+            pThis->ReleaseRef();					// ansonsten sind wir fertig!
         break;
 
     case SVPAR_WAITFORDATA:
@@ -656,7 +656,7 @@ IMPL_STATIC_LINK( SvParser, NewDataRead, void*, EMPTYARG )
         break;
 
     default:
-        pThis->ReleaseRef();                    // ansonsten sind wir fertig!
+        pThis->ReleaseRef();					// ansonsten sind wir fertig!
         break;
     }
 
diff --git a/svtools/source/table/defaultinputhandler.cxx b/svtools/source/table/defaultinputhandler.cxx
index ad8f7a7562d3..67a3bdd23ade 100644
--- a/svtools/source/table/defaultinputhandler.cxx
+++ b/svtools/source/table/defaultinputhandler.cxx
@@ -1,6 +1,6 @@
 /*************************************************************************
  * 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
@@ -106,7 +106,7 @@ namespace svt { namespace table
         bool bHandled = false;
         Point aPoint = _rMEvt.GetPosPixel();
         if(_rControl.getCurrentRow(aPoint) >= 0)
-        {
+        {			
             if(m_bResize)
             {
                 m_bResize = _rControl.endResizeColumn(aPoint);
diff --git a/svtools/source/table/gridtablerenderer.cxx b/svtools/source/table/gridtablerenderer.cxx
index 8e5bd181a583..da8ea1c8905c 100644
--- a/svtools/source/table/gridtablerenderer.cxx
+++ b/svtools/source/table/gridtablerenderer.cxx
@@ -1,6 +1,6 @@
 /*************************************************************************
  * 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
@@ -118,13 +118,13 @@ namespace svt { namespace table
         if(m_pImpl->rModel.getVerticalAlign() == 1)
             nVerFlag = TEXT_DRAW_VCENTER;
         else if(m_pImpl->rModel.getVerticalAlign() == 2)
-            nVerFlag = TEXT_DRAW_BOTTOM;
+            nVerFlag = TEXT_DRAW_BOTTOM;		
         if(m_pImpl->rModel.getColumnModel(_nCol)->getHorizontalAlign() == 1)
             nHorFlag = TEXT_DRAW_CENTER;
         else if(m_pImpl->rModel.getColumnModel(_nCol)->getHorizontalAlign() == 2)
             nHorFlag = TEXT_DRAW_RIGHT;
         Rectangle aRect(_rArea);
-        aRect.Left()+=4; aRect.Right()-=4;
+        aRect.Left()+=4; aRect.Right()-=4; 
         aRect.Bottom()-=2;
             _rDevice.DrawText( aRect, sHeaderText, nHorFlag | nVerFlag | TEXT_DRAW_CLIP);
         _rDevice.DrawLine( _rArea.BottomLeft(), _rArea.BottomRight() );
@@ -154,10 +154,10 @@ namespace svt { namespace table
             aRowBackground = fieldColor;
         if(aRowBackground2 == 0xFFFFFF)
             aRowBackground2 = fieldColor;
-        //if row is selected background color becomes blue, and lines should be also blue
+        //if row is selected background color becomes blue, and lines should be also blue 
         //if they aren't user defined
         if(_bSelected)
-        {
+        {	
             Color aSelected(_rStyle.GetHighlightColor());
             aRowBackground = aSelected;
             if(line == 0xFFFFFF)
@@ -174,9 +174,9 @@ namespace svt { namespace table
                 aRowBackground = aRowBackground2;
                 if(line == 0xFFFFFF)
                     _rDevice.SetLineColor(aRowBackground);
-                else
+                else	
                     _rDevice.SetLineColor(line);
-            }
+            }	
             //fill the rows with alternating background colors if second background color is specified
             else if(aRowBackground != fieldColor && line == 0xFFFFFF)
                 _rDevice.SetLineColor(aRowBackground);
@@ -190,7 +190,7 @@ namespace svt { namespace table
         _rDevice.SetFillColor( aRowBackground );
         _rDevice.DrawRect( _rRowArea );
 
-        // TODO: active?
+        // TODO: active? 
 
         _rDevice.Pop();
         (void)_bActive;
@@ -212,13 +212,13 @@ namespace svt { namespace table
         if(m_pImpl->rModel.getVerticalAlign() == 1)
             nVerFlag = TEXT_DRAW_VCENTER;
         else if(m_pImpl->rModel.getVerticalAlign() == 2)
-            nVerFlag = TEXT_DRAW_BOTTOM;
+            nVerFlag = TEXT_DRAW_BOTTOM;		
         if(m_pImpl->rModel.getColumnModel(0)->getHorizontalAlign() == 1)
             nHorFlag = TEXT_DRAW_CENTER;
         else if(m_pImpl->rModel.getColumnModel(0)->getHorizontalAlign() == 2)
             nHorFlag = TEXT_DRAW_RIGHT;
         Rectangle aRect(_rArea);
-        aRect.Left()+=4; aRect.Right()-=4;
+        aRect.Left()+=4; aRect.Right()-=4; 
         aRect.Bottom()-=2;
         _rDevice.DrawText( aRect, _rText, nHorFlag | nVerFlag | TEXT_DRAW_CLIP);
         // TODO: active? selected?
@@ -248,7 +248,7 @@ namespace svt { namespace table
         else
         {
             if(background2 != 0xFFFFFF && m_pImpl->nCurrentRow%2)
-            {
+            {	
                 if(line == 0xFFFFFF)
                     _rDevice.SetLineColor(background2);
                 else
@@ -277,14 +277,14 @@ namespace svt { namespace table
             else if(m_pImpl->rModel.getColumnModel(_nColumn)->getHorizontalAlign() == 2)
                 imagePos.X() = aRect.Right() - imageSize.Width();
         }
-        else
+        else 
             imageSize.Width() = aRect.GetWidth();
         if(aRect.GetHeight() > imageSize.Height())
         {
             if(m_pImpl->rModel.getVerticalAlign() == 1)
                 imagePos.Y() = aRect.Top()+((double)(aRect.GetHeight() - imageSize.Height()))/2;
             else if(m_pImpl->rModel.getVerticalAlign() == 2)
-                imagePos.Y() = aRect.Bottom() - imageSize.Height();
+                imagePos.Y() = aRect.Bottom() - imageSize.Height();		
         }
         else
             imageSize.Height() = aRect.GetHeight()-1;
@@ -337,23 +337,23 @@ namespace svt { namespace table
         ++aRect.Left(); --aRect.Right();
         aRect.Top(); aRect.Bottom();
         if(_bSelected)
-            _rDevice.SetTextColor(_rStyle.GetHighlightTextColor());
+            _rDevice.SetTextColor(_rStyle.GetHighlightTextColor());			
         else if(m_pImpl->rModel.getTextColor() != 0x000000)
             _rDevice.SetTextColor(m_pImpl->rModel.getTextColor());
         else
-            _rDevice.SetTextColor(_rStyle.GetFieldTextColor());
+            _rDevice.SetTextColor(_rStyle.GetFieldTextColor());		
         ULONG nHorFlag = TEXT_DRAW_LEFT;
         ULONG nVerFlag = TEXT_DRAW_TOP;
         if(m_pImpl->rModel.getVerticalAlign() == 1)
             nVerFlag = TEXT_DRAW_VCENTER;
         else if(m_pImpl->rModel.getVerticalAlign() == 2)
-            nVerFlag = TEXT_DRAW_BOTTOM;
+            nVerFlag = TEXT_DRAW_BOTTOM;		
         if(m_pImpl->rModel.getColumnModel(_nColumn)->getHorizontalAlign() == 1)
             nHorFlag = TEXT_DRAW_CENTER;
         else if(m_pImpl->rModel.getColumnModel(_nColumn)->getHorizontalAlign() == 2)
             nHorFlag = TEXT_DRAW_RIGHT;
         Rectangle textRect(_rArea);
-        textRect.Left()+=4; textRect.Right()-=4;
+        textRect.Left()+=4; textRect.Right()-=4; 
         textRect.Bottom()-=2;
         _rDevice.DrawText( textRect, _rText, nHorFlag | nVerFlag | TEXT_DRAW_CLIP);
 
@@ -373,7 +373,7 @@ namespace svt { namespace table
     {
     (void)_rCursorRect;
         _rView.HideFocus();
-
+        
     }
 
 //........................................................................
diff --git a/svtools/source/table/tablecontrol.cxx b/svtools/source/table/tablecontrol.cxx
index 33c80e642118..4d188c3373c1 100644
--- a/svtools/source/table/tablecontrol.cxx
+++ b/svtools/source/table/tablecontrol.cxx
@@ -1,6 +1,6 @@
 /*************************************************************************
  * 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
@@ -272,7 +272,7 @@ namespace svt { namespace table
             Reference< XAccessible > xAccParent = pParent->GetAccessible();
             if( xAccParent.is() )
             {
-                m_pAccessTable->m_pAccessible = getAccessibleFactory().createAccessibleTableControl(
+                m_pAccessTable->m_pAccessible = getAccessibleFactory().createAccessibleTableControl( 
                     xAccParent, *this
                 );
             }
@@ -612,7 +612,7 @@ IMPL_LINK( TableControl, ImplMouseButtonDownHdl, MouseEvent*, pData )
 {
     CallEventListeners( VCLEVENT_WINDOW_MOUSEBUTTONDOWN, pData );
      return 1;
-}
+} 
 IMPL_LINK( TableControl, ImplMouseButtonUpHdl, MouseEvent*, pData )
 {
      CallEventListeners( VCLEVENT_WINDOW_MOUSEBUTTONUP, pData );
diff --git a/svtools/source/table/tablecontrol_impl.cxx b/svtools/source/table/tablecontrol_impl.cxx
index 90bc4899209b..e9816ee1d700 100644
--- a/svtools/source/table/tablecontrol_impl.cxx
+++ b/svtools/source/table/tablecontrol_impl.cxx
@@ -1,6 +1,6 @@
 /*************************************************************************
  * 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
@@ -158,7 +158,7 @@ namespace svt { namespace table
         {
             return 5 * 100;
         }
-        virtual void setRowHeight(TableMetrics _nRowHeight)
+        virtual void setRowHeight(TableMetrics _nRowHeight) 
         {
             (void)_nRowHeight;
         }
@@ -207,7 +207,7 @@ namespace svt { namespace table
     {
         return 0;
     }
-    virtual void setTextColor(::com::sun::star::util::Color )
+    virtual void setTextColor(::com::sun::star::util::Color ) 
     {
     }
     virtual ::com::sun::star::util::Color getOddRowBackgroundColor()
@@ -231,14 +231,14 @@ namespace svt { namespace table
     virtual void setEvenRowBackgroundColor(::com::sun::star::util::Color )
     {
     }
-    virtual std::vector<std::vector< ::com::sun::star::uno::Any > >& getCellContent()
+    virtual std::vector<std::vector< ::com::sun::star::uno::Any > >& getCellContent() 
     {
         return m_aCellContent;
     }
     virtual void setRowHeaderName(const std::vector<rtl::OUString>& )
     {
     }
-    virtual std::vector<rtl::OUString>& getRowHeaderName()
+    virtual std::vector<rtl::OUString>& getRowHeaderName() 
     {
         aRowHeaderNames.clear();
         aRowHeaderNames.push_back(rtl::OUString::createFromAscii(""));
@@ -429,13 +429,13 @@ namespace svt { namespace table
     ,m_pVScroll             ( NULL                          )
         ,m_pHScroll             ( NULL                          )
         ,m_pScrollCorner        ( NULL                          )
-    ,m_pSelEngine       (               )
-    ,m_nRowSelected     (               )
-    ,m_pTableFunctionSet    ( new TableFunctionSet(this )   )
-    ,m_nAnchor      (-1             )
-    ,m_bResizing        ( false             )
-    ,m_nResizingColumn  ( 0             )
-    ,m_bResizingGrid    ( false             )
+    ,m_pSelEngine		(				)
+    ,m_nRowSelected		(				)
+    ,m_pTableFunctionSet	( new TableFunctionSet(this )   )
+    ,m_nAnchor		(-1				)
+    ,m_bResizing		( false				)
+    ,m_nResizingColumn	( 0				)
+    ,m_bResizingGrid	( false				)
 #if DBG_UTIL
         ,m_nRequiredInvariants ( INV_SCROLL_POSITION )
 #endif
@@ -525,7 +525,7 @@ namespace svt { namespace table
         --_rCellArea.Right();
 
         // determine the last row which is at least partially visible
-        _rCellArea.Bottom() =
+        _rCellArea.Bottom() = 
                 m_nColHeaderHeightPixel
             +   impl_getVisibleRows( true ) * m_nRowHeightPixel
             -   1;
@@ -550,7 +550,7 @@ namespace svt { namespace table
         m_pInputHandler.reset();
         m_nColumnCount = m_nRowCount = 0;
 
-    m_nRowHeightPixel = m_rAntiImpl.LogicToPixel( Size( 0, m_pModel->getRowHeight() ), MAP_APPFONT ).Height();
+    m_nRowHeightPixel = m_rAntiImpl.LogicToPixel( Size( 0, m_pModel->getRowHeight() ), MAP_APPFONT ).Height();       
     if ( m_pModel->hasColumnHeaders() )
            m_nColHeaderHeightPixel = m_rAntiImpl.LogicToPixel( Size( 0, m_pModel->getColumnHeaderHeight() ), MAP_APPFONT ).Height();
         if ( m_pModel->hasRowHeaders() )
@@ -575,7 +575,7 @@ namespace svt { namespace table
             return;
 
         TableSize colCount = m_pModel->getColumnCount();
-
+        
         m_aColumnWidthsPixel.reserve( colCount );
         m_aAccColumnWidthsPixel.reserve( colCount );
         if(colCount>0)
@@ -651,13 +651,13 @@ namespace svt { namespace table
                     if(colWithoutFixedWidthsSum>0)
                         scalingFactor = gridWidthWithoutFixed/colWithoutFixedWidthsSum;
                 }
-            }
+            } 
             for ( ColPos i = 0; i < colCount; ++i )
             {
                 PColumnModel pColumn = m_pModel->getColumnModel( i );
                 DBG_ASSERT( !!pColumn, "TableControl_Impl::impl_ni_updateColumnWidths: invalid column returned by the model!" );
                 if ( !pColumn )
-                    continue;
+                    continue;	
                 if(pColumn->isResizable() && pColumn->getPreferredWidth() == 0)
                 {
                     aPrePixelWidths[i]*=scalingFactor;
@@ -872,7 +872,7 @@ namespace svt { namespace table
         lcl_updateScrollbar(
             m_rAntiImpl,
             m_pHScroll,
-            m_pModel->getHorizontalScrollbarVisibility(aDataCellPlayground.GetWidth(), m_aAccColumnWidthsPixel[m_nColumnCount-1]),
+            m_pModel->getHorizontalScrollbarVisibility(aDataCellPlayground.GetWidth(), m_aAccColumnWidthsPixel[m_nColumnCount-1]),             
             lcl_getColumnsVisibleWithin( aDataCellPlayground, m_nLeftColumn, *this, false ),
                                                                     // visible units
             m_nLeftColumn,                                          // current position
@@ -889,8 +889,8 @@ namespace svt { namespace table
             if( m_nLeftColumn + nVisibleUnits == nRange-1)
             {
                 if(m_aAccColumnWidthsPixel[nRange-2] - m_aAccColumnWidthsPixel[m_nLeftColumn] + m_aColumnWidthsPixel[nRange-1]>aDataCellPlayground.GetWidth())
-                {
-                    m_pHScroll->SetVisibleSize( nVisibleUnits -1 );
+                {				
+                    m_pHScroll->SetVisibleSize( nVisibleUnits -1 ); 
                     m_pHScroll->SetPageSize(nVisibleUnits -1);
                 }
             }
@@ -1077,7 +1077,7 @@ namespace svt { namespace table
             //to avoid double lines
             if( aRowIterator.getRow() != 0 )
                 --aRect.Top();
-            if(m_nLeftColumn != 0)
+            if(m_nLeftColumn !=	0)
                 --aRect.Left();
             else
             {
@@ -1111,15 +1111,15 @@ namespace svt { namespace table
                 {
                     Image* pImage = new Image(xGraphic);
                     if(pImage!=NULL)
-                        pRenderer->PaintCellImage( aCell.getColumn(), isSelectedRow || isSelectedColumn, isActiveRow,
+                        pRenderer->PaintCellImage( aCell.getColumn(), isSelectedRow || isSelectedColumn, isActiveRow, 
                                 *m_pDataWindow, aCell.getRect(), rStyle, pImage );
                 }
                 else
                 {
                     ::rtl::OUString sContent = convertToString(rCellData);
-                    pRenderer->PaintCellString( aCell.getColumn(), isSelectedRow || isSelectedColumn, isActiveRow,
+                    pRenderer->PaintCellString( aCell.getColumn(), isSelectedRow || isSelectedColumn, isActiveRow, 
                         *m_pDataWindow, aCell.getRect(), rStyle, sContent );
-                }
+                }	
             }
         }
     }
@@ -1291,7 +1291,7 @@ namespace svt { namespace table
     }
         break;
     case cursorSelectRowUp:
-    {
+    {	
         if(m_pSelEngine->GetSelectionMode() == NO_SELECTION)
             return bSuccess = false;
         else if(m_pSelEngine->GetSelectionMode() == SINGLE_SELECTION)
@@ -1370,7 +1370,7 @@ namespace svt { namespace table
                     m_nRowSelected.push_back(m_nCurRow);
                     invalidateSelectedRegion(m_nCurRow, m_nCurRow, rCells);
                 }
-            }
+            }			
             m_pSelEngine->SetAnchor(TRUE);
             m_nAnchor = m_nCurRow;
             ensureVisible(m_nCurColumn, m_nCurRow, false);
@@ -1497,12 +1497,12 @@ namespace svt { namespace table
             return bSuccess = false;
         else if(m_pSelEngine->GetSelectionMode() == SINGLE_SELECTION)
             return bSuccess = false;
-        //select the region between the current and the last row
+        //select the region between the current and the last row 
         RowPos iter = m_nCurRow;
         invalidateSelectedRegion(m_nCurRow, m_nRowCount-1, rCells);
         //put the rows in the vector
         while(iter<=m_nRowCount)
-        {
+        { 
             if(!isRowSelected(m_nRowSelected, iter))
                 m_nRowSelected.push_back(iter);
             ++iter;
@@ -1534,7 +1534,7 @@ namespace svt { namespace table
             if ( _bShow )
                 pRenderer->ShowCellCursor( *m_pDataWindow, aCellRect);
             else
-                pRenderer->HideCellCursor( *m_pDataWindow, aCellRect);
+                pRenderer->HideCellCursor( *m_pDataWindow, aCellRect);		
         }
     }
 
@@ -2029,7 +2029,7 @@ namespace svt { namespace table
             int gridHeight = m_pDataWindow->GetOutputSizePixel().Height();
             if(lineHeight >= gridHeight)
                 lineHeight = gridHeight;
-            m_pDataWindow->ShowTracking(Rectangle(Point(rPoint.X(),0), Size(1, lineHeight )),
+            m_pDataWindow->ShowTracking(Rectangle(Point(rPoint.X(),0), Size(1, lineHeight )), 
                 SHOWTRACK_SPLIT | SHOWTRACK_WINDOW);
         }
         m_pDataWindow->SetPointer(aNewPointer);
@@ -2057,7 +2057,7 @@ namespace svt { namespace table
             int maxWidth = m_rAntiImpl.LogicToPixel( Size( pColumn->getMaxWidth(), 0 ), MAP_APPFONT ).Width();
             int minWidth = m_rAntiImpl.LogicToPixel( Size( pColumn->getMinWidth(), 0 ), MAP_APPFONT ).Width();
             int resizeCol = m_nResizingColumn-m_nLeftColumn;
-            //new position of mouse
+            //new position of mouse 
             int actX = rPoint.X();
             //old position of right border
             int oldX = m_aVisibleColumnWidthsPixel[resizeCol];
@@ -2101,7 +2101,7 @@ namespace svt { namespace table
         m_bResizingGrid = true;
     }
     m_pDataWindow->ReleaseMouse();
-    return m_bResizing;
+    return m_bResizing;	
     }
     //-------------------------------------------------------------------------------
     void TableControl_Impl::impl_ni_getAccVisibleColWidths()
@@ -2138,7 +2138,7 @@ namespace svt { namespace table
             widthsPixel+=headerRowWidth;
         }
         int col = m_nLeftColumn;
-        //add column width of the neighbour of the left column
+        //add column width of the neighbour of the left column 
         widthsPixel+=m_aColumnWidthsPixel[col-1];
         //compute the sum of the new column widths
         while(nVisCols)
@@ -2152,7 +2152,7 @@ namespace svt { namespace table
             col++;
             nVisCols--;
         }
-        //when the sum of all visible columns and the next to the left column is smaller than
+        //when the sum of all visible columns and the next to the left column is smaller than 
         //window width, then update m_nLeftColumn
         if(widthsPixel<m_pDataWindow->GetOutputSizePixel().Width())
             m_nLeftColumn--;
@@ -2167,7 +2167,7 @@ namespace svt { namespace table
         ::rtl::OUString sConvertString;
         if(value >>= sConvertString)
             sNewString = sConvertString;
-        else if(value >>= nInt)
+        else if(value >>= nInt)							
             sNewString = sConvertString.valueOf(nInt);
         else if(value >>= bBool)
             sNewString = sConvertString.valueOf(bBool);
@@ -2219,7 +2219,7 @@ namespace svt { namespace table
     }
     //-------------------------------------------------------------------------------
     void TableFunctionSet::BeginDrag()
-    {
+    {		
     }
     //-------------------------------------------------------------------------------
     void TableFunctionSet::CreateAnchor()
@@ -2229,7 +2229,7 @@ namespace svt { namespace table
     //-------------------------------------------------------------------------------
     void TableFunctionSet::DestroyAnchor()
     {
-        m_pTableControl->m_nAnchor = -1;
+        m_pTableControl->m_nAnchor = -1;	
     }
     //-------------------------------------------------------------------------------
     BOOL TableFunctionSet::SetCursorAtPoint(const Point& rPoint, BOOL bDontSelectAtCursor)
@@ -2248,8 +2248,8 @@ namespace svt { namespace table
         }
         else if(m_pTableControl->m_nAnchor == m_pTableControl->m_nCurRow)
         {
-            //selecting region,
-            int diff = m_pTableControl->m_nCurRow - curRow;
+            //selecting region, 
+            int diff = m_pTableControl->m_nCurRow - curRow;	
             //selected region lies above the last selection
             if( diff >= 0)
             {
@@ -2267,7 +2267,7 @@ namespace svt { namespace table
             }
             //selected region lies beneath the last selected row
             else
-            {
+            { 
                 while(m_pTableControl->m_nAnchor<=curRow)
                 {
                     bool isAlreadySelected = m_pTableControl->isRowSelected(m_pTableControl->m_nRowSelected, m_pTableControl->m_nAnchor);
@@ -2357,7 +2357,7 @@ namespace svt { namespace table
             m_pTableControl->m_nRowSelected.clear();
         }
     }
-
+    
 //........................................................................
 } } // namespace svt::table
 //........................................................................
diff --git a/svtools/source/table/tablecontrol_impl.hxx b/svtools/source/table/tablecontrol_impl.hxx
index 053766d92841..89965aa6cba4 100644
--- a/svtools/source/table/tablecontrol_impl.hxx
+++ b/svtools/source/table/tablecontrol_impl.hxx
@@ -1,6 +1,6 @@
 /*************************************************************************
  * 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
@@ -66,66 +66,66 @@ namespace svt { namespace table
     friend class TableFunctionSet;
     private:
         /// the control whose impl-instance we implemnt
-        TableControl&           m_rAntiImpl;
+        TableControl&       	m_rAntiImpl;
         /// the model of the table control
-        PTableModel             m_pModel;
+        PTableModel         	m_pModel;
         /// the input handler to use, usually the input handler as provided by ->m_pModel
-        PTableInputHandler      m_pInputHandler;
+        PTableInputHandler  	m_pInputHandler;
         /// the widths of the single columns, measured in pixel
-        ArrayOfLong             m_aColumnWidthsPixel;
+        ArrayOfLong         	m_aColumnWidthsPixel;
         /** the accumulated widths of the single columns, i.e. their exclusive right borders,
             <strong<not</strong> counting the space for a possible row header column
         */
-        ArrayOfLong             m_aAccColumnWidthsPixel;
+        ArrayOfLong         	m_aAccColumnWidthsPixel;
 
-    ArrayOfLong     m_aVisibleColumnWidthsPixel;
+    ArrayOfLong		m_aVisibleColumnWidthsPixel;
         /// the height of a single row in the table, measured in pixels
-        long                    m_nRowHeightPixel;
+        long                	m_nRowHeightPixel;
         /// the height of the column header row in the table, measured in pixels
-        long                    m_nColHeaderHeightPixel;
+        long                	m_nColHeaderHeightPixel;
         /// the width of the row header column in the table, measured in pixels
-        long                    m_nRowHeaderWidthPixel;
+        long                	m_nRowHeaderWidthPixel;
 
         /// the number of columns in the table control. Cached model value.
-        TableSize               m_nColumnCount;
+        TableSize           	m_nColumnCount;
         /// the number of rows in the table control. Cached model value.
-        TableSize               m_nRowCount;
+        TableSize           	m_nRowCount;
 
-        ColPos                  m_nCurColumn;
-        RowPos                  m_nCurRow;
-        ColPos                  m_nLeftColumn;
-        RowPos                  m_nTopRow;
+        ColPos              	m_nCurColumn;
+        RowPos              	m_nCurRow;
+        ColPos              	m_nLeftColumn;
+        RowPos              	m_nTopRow;
 
-        sal_Int32               m_nCursorHidden;
+        sal_Int32           	m_nCursorHidden;
 
         /** the window to contain all data content, including header bars
 
             The window's upper left corner is at position (0,0), relative to the
             table control, which is the direct parent of the data window.
         */
-        TableDataWindow*        m_pDataWindow;
+        TableDataWindow*    	m_pDataWindow;
         /// the vertical scrollbar, if any
-        ScrollBar*              m_pVScroll;
+        ScrollBar*          	m_pVScroll;
         /// the horizontal scrollbar, if any
-        ScrollBar*          m_pHScroll;
-        ScrollBarBox*           m_pScrollCorner;
+        ScrollBar*	    	m_pHScroll;
+        ScrollBarBox*       	m_pScrollCorner;
     //selection engine - for determining selection range, e.g. single, multiple
-    SelectionEngine*        m_pSelEngine;
+    SelectionEngine*    	m_pSelEngine;
     //vector which contains the selected rows
-    std::vector<RowPos>     m_nRowSelected;
+    std::vector<RowPos> 	m_nRowSelected;
     //part of selection engine
-    TableFunctionSet*       m_pTableFunctionSet;
+    TableFunctionSet*   	m_pTableFunctionSet;
     //part of selection engine
-    RowPos              m_nAnchor;
-    bool            m_bResizing;
-    ColPos          m_nResizingColumn;
-    bool            m_bResizingGrid;
-    rtl::OUString   m_aTooltipText;
+    RowPos		    	m_nAnchor;
+    bool			m_bResizing;
+    ColPos			m_nResizingColumn;
+    bool			m_bResizingGrid;
+    rtl::OUString	m_aTooltipText;
 
 #if DBG_UTIL
     #define INV_SCROLL_POSITION     1
         /** represents a bitmask of invariants to check
-
+            
             Actually, impl_checkInvariants checks more invariants than denoted in this
             bit mask, but only those present here can be disabled temporarily.
         */
@@ -142,10 +142,10 @@ namespace svt { namespace table
 
         inline  ColPos  getCurColumn() const    { return m_nCurColumn; }
         inline  RowPos  getCurRow() const       { return m_nCurRow; }
-        inline  void    setCurRow(RowPos curRow){ m_nCurRow = curRow; }
+        inline	void	setCurRow(RowPos curRow){ m_nCurRow = curRow; }
         inline  RowPos  getTopRow() const       { return m_nTopRow; }
-        inline  long    getRowCount() const     { return m_nRowCount; }
-        inline  long    getColumnCount() const  { return m_nColumnCount; }
+        inline  long	getRowCount() const		{ return m_nRowCount; }
+        inline  long	getColumnCount() const	{ return m_nColumnCount; }
 
         inline  long    getColHeaderHightPixel() const  { return m_nColHeaderHeightPixel; }
 
@@ -186,7 +186,7 @@ namespace svt { namespace table
         */
         void    ensureVisible( ColPos _nColumn, RowPos _nRow, bool _bAcceptPartialVisibility );
     /** returns the row, which contains the input point*/
-    virtual RowPos  getCurrentRow (const Point& rPoint);
+    virtual RowPos	getCurrentRow (const Point& rPoint);
 
     void setCursorAtCurrentCell(const Point& rPoint);
     /** checks whether the vector with the selected rows contains the current row*/
@@ -194,7 +194,7 @@ namespace svt { namespace table
 
     bool    isRowSelected(RowPos current);
     /** returns the position of the current row in the selection vector */
-    int getRowSelectedNumber(const ::std::vector<RowPos>& selectedRows, RowPos current);
+    int	getRowSelectedNumber(const ::std::vector<RowPos>& selectedRows, RowPos current);
     /** _rCellRect contains the region, which should be invalidate after some action e.g. selecting row*/
     void    invalidateSelectedRegion(RowPos _nPrevRow, RowPos _nCurRow, Rectangle& _rCellRect );
     /** to be called when a new row is added to the control*/
@@ -202,7 +202,7 @@ namespace svt { namespace table
     /** returns the vector, which contains the selected rows*/
     std::vector<RowPos>& getSelectedRows();
     /** updates the vector, which contains the selected rows after removing the row nRowPos*/
-    void    removeSelectedRow(RowPos _nRowPos);
+    void	removeSelectedRow(RowPos _nRowPos);
     void    invalidateRows();
     void    clearSelection();
         // IAbstractTableControl
@@ -328,7 +328,7 @@ namespace svt { namespace table
         void impl_ni_getAccVisibleColWidths();
         void impl_updateLeftColumn();
 
-        DECL_LINK( OnScroll, ScrollBar* );
+        DECL_LINK( OnScroll, ScrollBar* );		
     };
     //see seleng.hxx, seleng.cxx, FunctionSet overridables, part of selection engine
     class TableFunctionSet : public FunctionSet
@@ -342,7 +342,7 @@ namespace svt { namespace table
         virtual ~TableFunctionSet();
 
        virtual void BeginDrag();
-       virtual void CreateAnchor();
+       virtual void CreateAnchor(); 
        virtual void DestroyAnchor();
        virtual BOOL SetCursorAtPoint(const Point& rPoint, BOOL bDontSelectAtCursor);
        virtual BOOL IsSelectionAtPoint( const Point& rPoint );
diff --git a/svtools/source/table/tabledatawindow.cxx b/svtools/source/table/tabledatawindow.cxx
index e2e1ce5353fe..c34ed77a83ba 100644
--- a/svtools/source/table/tabledatawindow.cxx
+++ b/svtools/source/table/tabledatawindow.cxx
@@ -1,6 +1,6 @@
 /*************************************************************************
  * 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
@@ -44,7 +44,7 @@ namespace svt { namespace table
     //--------------------------------------------------------------------
     TableDataWindow::TableDataWindow( TableControl_Impl& _rTableControl )
         :Window( &_rTableControl.getAntiImpl() )
-        ,m_rTableControl        ( _rTableControl )
+        ,m_rTableControl		( _rTableControl )
         ,m_nRowAlreadySelected( -1 )
     {
         // by default, use the background as determined by the style settings
@@ -85,14 +85,14 @@ namespace svt { namespace table
         if ( !m_rTableControl.getInputHandler()->MouseMove( m_rTableControl, rMEvt ) )
         {
             if(m_rTableControl.getCurrentRow(aPoint)>=0 && m_rTableControl.isTooltipActive() )
-            {
+            {	
                 SetPointer(POINTER_ARROW);
                 rtl::OUString& rHelpText = m_rTableControl.setTooltip(aPoint);
                 Help::EnableBalloonHelp();
                 Window::SetHelpText( rHelpText.getStr());
             }
             else if(m_rTableControl.getCurrentRow(aPoint) == -1)
-            {
+            {	
                 if(Help::IsBalloonHelpEnabled())
                     Help::DisableBalloonHelp();
                 m_rTableControl.resizeColumn(aPoint);
@@ -112,7 +112,7 @@ namespace svt { namespace table
         RowPos nCurRow = m_rTableControl.getCurrentRow(aPoint);
         if ( !m_rTableControl.getInputHandler()->MouseButtonDown( m_rTableControl, rMEvt ) )
             Window::MouseButtonDown( rMEvt );
-        else
+        else			
         {
             if(nCurRow >= 0 && m_rTableControl.getSelEngine()->GetSelectionMode() != NO_SELECTION)
             {
@@ -132,7 +132,7 @@ namespace svt { namespace table
         if ( !m_rTableControl.getInputHandler()->MouseButtonUp( m_rTableControl, rMEvt ) )
             Window::MouseButtonUp( rMEvt );
         m_aMouseButtonUpHdl.Call((MouseEvent*) &rMEvt);
-        m_rTableControl.getAntiImpl().GetFocus();
+        m_rTableControl.getAntiImpl().GetFocus();	
     }
     //--------------------------------------------------------------------
     void TableDataWindow::SetPointer( const Pointer& rPointer )
diff --git a/svtools/source/table/tablegeometry.cxx b/svtools/source/table/tablegeometry.cxx
index d60de9e6438f..f5debfc244be 100644
--- a/svtools/source/table/tablegeometry.cxx
+++ b/svtools/source/table/tablegeometry.cxx
@@ -1,6 +1,6 @@
 /*************************************************************************
  * 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
diff --git a/svtools/source/table/tablegeometry.hxx b/svtools/source/table/tablegeometry.hxx
index 3ddde0c98c64..32f2c0801d7d 100644
--- a/svtools/source/table/tablegeometry.hxx
+++ b/svtools/source/table/tablegeometry.hxx
@@ -1,6 +1,6 @@
 /*************************************************************************
  * 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
diff --git a/svtools/source/toolpanel/drawerlayouter.cxx b/svtools/source/toolpanel/drawerlayouter.cxx
index 040f33045fff..d698f3667bc6 100644
--- a/svtools/source/toolpanel/drawerlayouter.cxx
+++ b/svtools/source/toolpanel/drawerlayouter.cxx
@@ -1,6 +1,6 @@
 /*************************************************************************
  * 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
diff --git a/svtools/source/toolpanel/dummypanel.cxx b/svtools/source/toolpanel/dummypanel.cxx
index 20f140a6e610..d2540d04433d 100644
--- a/svtools/source/toolpanel/dummypanel.cxx
+++ b/svtools/source/toolpanel/dummypanel.cxx
@@ -1,6 +1,6 @@
 /*************************************************************************
  * 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
diff --git a/svtools/source/toolpanel/dummypanel.hxx b/svtools/source/toolpanel/dummypanel.hxx
index adb98e52077e..2a17cd38ad0c 100644
--- a/svtools/source/toolpanel/dummypanel.hxx
+++ b/svtools/source/toolpanel/dummypanel.hxx
@@ -1,6 +1,6 @@
 /*************************************************************************
  * 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
diff --git a/svtools/source/toolpanel/paneldecklisteners.cxx b/svtools/source/toolpanel/paneldecklisteners.cxx
index 32ba9b5c6a24..46723039ee1a 100755
--- a/svtools/source/toolpanel/paneldecklisteners.cxx
+++ b/svtools/source/toolpanel/paneldecklisteners.cxx
@@ -1,6 +1,6 @@
 /*************************************************************************
  * 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
diff --git a/svtools/source/toolpanel/paneldecklisteners.hxx b/svtools/source/toolpanel/paneldecklisteners.hxx
index bc7e2ae7db88..c0d9acd9e056 100755
--- a/svtools/source/toolpanel/paneldecklisteners.hxx
+++ b/svtools/source/toolpanel/paneldecklisteners.hxx
@@ -1,6 +1,6 @@
 /*************************************************************************
  * 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
diff --git a/svtools/source/toolpanel/paneltabbar.cxx b/svtools/source/toolpanel/paneltabbar.cxx
index 23067d3ee5d0..79cb0560b7cf 100755
--- a/svtools/source/toolpanel/paneltabbar.cxx
+++ b/svtools/source/toolpanel/paneltabbar.cxx
@@ -1,6 +1,6 @@
 /*************************************************************************
  * 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
diff --git a/svtools/source/toolpanel/paneltabbarpeer.cxx b/svtools/source/toolpanel/paneltabbarpeer.cxx
index d8329109ffb4..ee24ceec3364 100644
--- a/svtools/source/toolpanel/paneltabbarpeer.cxx
+++ b/svtools/source/toolpanel/paneltabbarpeer.cxx
@@ -1,6 +1,6 @@
 /*************************************************************************
  * 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
diff --git a/svtools/source/toolpanel/paneltabbarpeer.hxx b/svtools/source/toolpanel/paneltabbarpeer.hxx
index 7c2e5188d994..e5fde030e41b 100644
--- a/svtools/source/toolpanel/paneltabbarpeer.hxx
+++ b/svtools/source/toolpanel/paneltabbarpeer.hxx
@@ -1,6 +1,6 @@
 /*************************************************************************
  * 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
diff --git a/svtools/source/toolpanel/refbase.cxx b/svtools/source/toolpanel/refbase.cxx
index f41aa2d9bb9c..51aba9719cd6 100644
--- a/svtools/source/toolpanel/refbase.cxx
+++ b/svtools/source/toolpanel/refbase.cxx
@@ -1,6 +1,6 @@
 /*************************************************************************
  * 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
diff --git a/svtools/source/toolpanel/tabbargeometry.cxx b/svtools/source/toolpanel/tabbargeometry.cxx
index 45c40cee6ef2..c58666b47505 100644
--- a/svtools/source/toolpanel/tabbargeometry.cxx
+++ b/svtools/source/toolpanel/tabbargeometry.cxx
@@ -1,6 +1,6 @@
 /*************************************************************************
  * 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
@@ -75,7 +75,7 @@ namespace svt
         }
 
         //--------------------------------------------------------------------------------------------------------------
-        /** transforms the given, possible rotated playground,
+        /** transforms the given, possible rotated playground, 
         */
         void lcl_rotate( const Rectangle& i_rReference, Rectangle& io_rArea, const bool i_bRight )
         {
diff --git a/svtools/source/toolpanel/tabbargeometry.hxx b/svtools/source/toolpanel/tabbargeometry.hxx
index 059d69a3e233..86cb701024c8 100644
--- a/svtools/source/toolpanel/tabbargeometry.hxx
+++ b/svtools/source/toolpanel/tabbargeometry.hxx
@@ -1,6 +1,6 @@
 /*************************************************************************
  * 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
diff --git a/svtools/source/toolpanel/tabitemdescriptor.hxx b/svtools/source/toolpanel/tabitemdescriptor.hxx
index 8005816b0fe2..7732692771f2 100644
--- a/svtools/source/toolpanel/tabitemdescriptor.hxx
+++ b/svtools/source/toolpanel/tabitemdescriptor.hxx
@@ -1,6 +1,6 @@
 /*************************************************************************
  * 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
diff --git a/svtools/source/toolpanel/tablayouter.cxx b/svtools/source/toolpanel/tablayouter.cxx
index f68bbc1bbd0f..e4fb7e031cd1 100755
--- a/svtools/source/toolpanel/tablayouter.cxx
+++ b/svtools/source/toolpanel/tablayouter.cxx
@@ -1,6 +1,6 @@
 /*************************************************************************
  * 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
diff --git a/svtools/source/toolpanel/toolpanel.cxx b/svtools/source/toolpanel/toolpanel.cxx
index f7b999494563..23f7c7cb0325 100644
--- a/svtools/source/toolpanel/toolpanel.cxx
+++ b/svtools/source/toolpanel/toolpanel.cxx
@@ -1,6 +1,6 @@
 /*************************************************************************
  * 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
diff --git a/svtools/source/toolpanel/toolpanel.src b/svtools/source/toolpanel/toolpanel.src
index 5908a8fbcf98..32594b8c8efe 100644
--- a/svtools/source/toolpanel/toolpanel.src
+++ b/svtools/source/toolpanel/toolpanel.src
@@ -1,6 +1,6 @@
 /*************************************************************************
  * 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
diff --git a/svtools/source/toolpanel/toolpanelcollection.cxx b/svtools/source/toolpanel/toolpanelcollection.cxx
index baefbd92400f..4289c6c222bb 100644
--- a/svtools/source/toolpanel/toolpanelcollection.cxx
+++ b/svtools/source/toolpanel/toolpanelcollection.cxx
@@ -1,6 +1,6 @@
 /*************************************************************************
  * 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
@@ -139,7 +139,7 @@ namespace svt
         if ( m_pData->aActivePanel == i_nPosition )
         {
             const ::boost::optional< size_t > aOldActive( m_pData->aActivePanel );
-
+            
             if ( i_nPosition + 1 < GetPanelCount() )
             {
                 ++*m_pData->aActivePanel;
diff --git a/svtools/source/toolpanel/toolpanelcollection.hxx b/svtools/source/toolpanel/toolpanelcollection.hxx
index 2bdba38546c9..0ef97eacf486 100644
--- a/svtools/source/toolpanel/toolpanelcollection.hxx
+++ b/svtools/source/toolpanel/toolpanelcollection.hxx
@@ -1,6 +1,6 @@
 /*************************************************************************
  * 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
diff --git a/svtools/source/toolpanel/toolpaneldeck.cxx b/svtools/source/toolpanel/toolpaneldeck.cxx
index e157090bbf0e..534decb21e2b 100755
--- a/svtools/source/toolpanel/toolpaneldeck.cxx
+++ b/svtools/source/toolpanel/toolpaneldeck.cxx
@@ -1,6 +1,6 @@
 /*************************************************************************
  * 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
diff --git a/svtools/source/toolpanel/toolpaneldeckpeer.cxx b/svtools/source/toolpanel/toolpaneldeckpeer.cxx
index 0a84a90b4fb3..5c11897bb2b5 100755
--- a/svtools/source/toolpanel/toolpaneldeckpeer.cxx
+++ b/svtools/source/toolpanel/toolpaneldeckpeer.cxx
@@ -1,6 +1,6 @@
 /*************************************************************************
  * 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
diff --git a/svtools/source/toolpanel/toolpaneldeckpeer.hxx b/svtools/source/toolpanel/toolpaneldeckpeer.hxx
index 4b6607ecbd05..a07f698976af 100755
--- a/svtools/source/toolpanel/toolpaneldeckpeer.hxx
+++ b/svtools/source/toolpanel/toolpaneldeckpeer.hxx
@@ -1,6 +1,6 @@
 /*************************************************************************
  * 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
diff --git a/svtools/source/toolpanel/toolpaneldrawer.cxx b/svtools/source/toolpanel/toolpaneldrawer.cxx
index 851556bc7874..618de42d4e01 100644
--- a/svtools/source/toolpanel/toolpaneldrawer.cxx
+++ b/svtools/source/toolpanel/toolpaneldrawer.cxx
@@ -1,6 +1,6 @@
 /*************************************************************************
  * 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
@@ -151,7 +151,7 @@ namespace svt
                 i_rTextBox.Top() + ( GetTextHeight() - nHeight ) / 2
             );
             m_pPaintDevice->DrawImage( aPosition, aImage );
-
+            
             aExpansionIndicatorArea = Rectangle( aPosition, aImage.GetSizePixel() );
         }
 
@@ -278,7 +278,7 @@ namespace svt
                 m_pPaintDevice.reset( new VirtualDevice( *this ) );
 
                 // fall through.
-
+                
             case DATACHANGED_FONTS:
             case DATACHANGED_FONTSUBSTITUTION:
             {
@@ -289,7 +289,7 @@ namespace svt
                 if ( IsControlFont() )
                     aFont.Merge( GetControlFont() );
                 SetZoomedPointFont( aFont );
-
+                
                 // Color.
                 Color aColor;
                 if ( IsControlForeground() )
@@ -330,7 +330,7 @@ namespace svt
         Rectangle aTextBox(
             Point(),
             Size(
-                nAvailableWidth,
+                nAvailableWidth, 
                 GetSettings().GetStyleSettings().GetTitleHeight()
             )
         );
diff --git a/svtools/source/toolpanel/toolpaneldrawer.hxx b/svtools/source/toolpanel/toolpaneldrawer.hxx
index a465a0a6c9e1..5acb074d9e71 100644
--- a/svtools/source/toolpanel/toolpaneldrawer.hxx
+++ b/svtools/source/toolpanel/toolpaneldrawer.hxx
@@ -1,6 +1,6 @@
 /*************************************************************************
  * 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
@@ -41,7 +41,7 @@ namespace svt
     /** serves a single purpose - let ZoomText read the drawers ...
 
         Strange enough, ZoomText does not read the drawers when they get the focus (in none of the combinations
-        of AccessibleRoles I tried), except when it does have an AccessibleChild with the role LABEL. To "inject"
+        of AccessibleRoles I tried), except when it does have an AccessibleChild with the role LABEL. To "inject"       
         such a child into the A11Y hierarchy, we use this window here.
 
         (We could also inject the A11Y component on the A11Y level only, but this would mean additional code. With
diff --git a/svtools/source/toolpanel/toolpaneldrawerpeer.cxx b/svtools/source/toolpanel/toolpaneldrawerpeer.cxx
index 959527330897..384d000facf0 100644
--- a/svtools/source/toolpanel/toolpaneldrawerpeer.cxx
+++ b/svtools/source/toolpanel/toolpaneldrawerpeer.cxx
@@ -1,6 +1,6 @@
 /*************************************************************************
  * 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
@@ -72,8 +72,8 @@ namespace svt
         {
         }
 
-        virtual void    ProcessWindowEvent( const VclWindowEvent& i_rVclWindowEvent );
-        virtual void    FillAccessibleStateSet( ::utl::AccessibleStateSetHelper& i_rStateSet );
+        virtual void	ProcessWindowEvent( const VclWindowEvent& i_rVclWindowEvent );
+        virtual void	FillAccessibleStateSet( ::utl::AccessibleStateSetHelper& i_rStateSet );
 
     protected:
         ~ToolPanelDrawerContext()
diff --git a/svtools/source/toolpanel/toolpaneldrawerpeer.hxx b/svtools/source/toolpanel/toolpaneldrawerpeer.hxx
index 5fcf0ac0ae7c..e56f9de7149e 100644
--- a/svtools/source/toolpanel/toolpaneldrawerpeer.hxx
+++ b/svtools/source/toolpanel/toolpaneldrawerpeer.hxx
@@ -1,6 +1,6 @@
 /*************************************************************************
  * 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
diff --git a/svtools/source/uno/addrtempuno.cxx b/svtools/source/uno/addrtempuno.cxx
index 2f25a8f2f9b2..ff7c3180c769 100644
--- a/svtools/source/uno/addrtempuno.cxx
+++ b/svtools/source/uno/addrtempuno.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
@@ -47,8 +47,8 @@ namespace svt
 {
 // .......................................................................
 
-#define UNODIALOG_PROPERTY_ID_ALIASES       100
-#define UNODIALOG_PROPERTY_ALIASES          "FieldMapping"
+#define UNODIALOG_PROPERTY_ID_ALIASES		100
+#define UNODIALOG_PROPERTY_ALIASES			"FieldMapping"
 
     using namespace com::sun::star::uno;
     using namespace com::sun::star::lang;
@@ -65,10 +65,10 @@ namespace svt
             ,public ::comphelper::OPropertyArrayUsageHelper< OAddressBookSourceDialogUno >
     {
     protected:
-        Sequence< AliasProgrammaticPair >   m_aAliases;
+        Sequence< AliasProgrammaticPair >	m_aAliases;
         Reference< XDataSource >            m_xDataSource;
         ::rtl::OUString                     m_sDataSourceName;
-        ::rtl::OUString                     m_sTable;
+        ::rtl::OUString						m_sTable;
 
     protected:
         OAddressBookSourceDialogUno(const Reference< XMultiServiceFactory >& _rxORB);
@@ -96,7 +96,7 @@ namespace svt
 
     protected:
     // OGenericUnoDialog overridables
-        virtual Dialog* createDialog(Window* _pParent);
+        virtual Dialog*	createDialog(Window* _pParent);
 
         virtual void implInitialize(const com::sun::star::uno::Any& _rValue);
 
@@ -231,7 +231,7 @@ namespace svt
     }
 
     //------------------------------------------------------------------------------
-    Dialog* OAddressBookSourceDialogUno::createDialog(Window* _pParent)
+    Dialog*	OAddressBookSourceDialogUno::createDialog(Window* _pParent)
     {
         if ( m_xDataSource.is() && m_sTable.getLength() )
             return new AddressBookSourceDialog(_pParent, m_aContext.getLegacyServiceFactory(), m_xDataSource, m_sDataSourceName, m_sTable, m_aAliases );
@@ -240,6 +240,6 @@ namespace svt
     }
 
 // .......................................................................
-}   // namespace svt
+}	// namespace svt
 // .......................................................................
 
diff --git a/svtools/source/uno/contextmenuhelper.cxx b/svtools/source/uno/contextmenuhelper.cxx
index 9eb36cf18a45..c3ffb1973039 100644
--- a/svtools/source/uno/contextmenuhelper.cxx
+++ b/svtools/source/uno/contextmenuhelper.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
@@ -43,7 +43,7 @@
 #include <com/sun/star/ui/ImageType.hpp>
 #include <com/sun/star/beans/PropertyValue.hpp>
 
-#include <osl/conditn.hxx>
+#include <osl/conditn.hxx> 
 #include <cppuhelper/weak.hxx>
 #include <comphelper/processfactory.hxx>
 #include <vos/mutex.hxx>
@@ -52,7 +52,7 @@
 #include <toolkit/unohlp.hxx>
 #include <toolkit/awt/vclxwindow.hxx>
 #include <toolkit/awt/vclxmenu.hxx>
-
+ 
 using namespace ::com::sun::star;
 
 namespace svt
@@ -74,13 +74,13 @@ class StateEventHelper : public ::com::sun::star::frame::XStatusListener,
         virtual uno::Any SAL_CALL queryInterface( const uno::Type& aType ) throw ( uno::RuntimeException);
         virtual void SAL_CALL acquire() throw ();
         virtual void SAL_CALL release() throw ();
-
+ 
         // XEventListener
         virtual void SAL_CALL disposing(const lang::EventObject& Source) throw( uno::RuntimeException );
-
+        
         // XStatusListener
         virtual void SAL_CALL statusChanged(const frame::FeatureStateEvent& Event) throw( uno::RuntimeException );
-
+     
     private:
         StateEventHelper();
         StateEventHelper( const StateEventHelper& );
@@ -90,7 +90,7 @@ class StateEventHelper : public ::com::sun::star::frame::XStatusListener,
         ::rtl::OUString                            m_aCommandURL;
         uno::Reference< frame::XDispatchProvider > m_xDispatchProvider;
         uno::Reference< util::XURLTransformer >    m_xURLTransformer;
-        osl::Condition                             m_aCondition;
+        osl::Condition                             m_aCondition;         
 };
 
 StateEventHelper::StateEventHelper(
@@ -112,13 +112,13 @@ uno::Any SAL_CALL StateEventHelper::queryInterface(
     const uno::Type& aType )
 throw ( uno::RuntimeException )
 {
-    uno::Any a = ::cppu::queryInterface(
+    uno::Any a = ::cppu::queryInterface( 
                 aType,
                 SAL_STATIC_CAST( XStatusListener*, this ));
-
+    
     if( a.hasValue() )
         return a;
-
+        
     return ::cppu::OWeakObject::queryInterface( aType );
 }
 
@@ -134,21 +134,21 @@ throw ()
     ::cppu::OWeakObject::release();
 }
 
-void SAL_CALL StateEventHelper::disposing(
+void SAL_CALL StateEventHelper::disposing( 
     const lang::EventObject& )
 throw ( uno::RuntimeException )
 {
-    vos::OGuard aSolarGuard( Application::GetSolarMutex() );
+    vos::OGuard	aSolarGuard( Application::GetSolarMutex() );
     m_xDispatchProvider.clear();
     m_xURLTransformer.clear();
     m_aCondition.set();
 }
 
-void SAL_CALL StateEventHelper::statusChanged(
+void SAL_CALL StateEventHelper::statusChanged( 
     const frame::FeatureStateEvent& Event )
 throw ( uno::RuntimeException )
 {
-    vos::OGuard aSolarGuard( Application::GetSolarMutex() );
+    vos::OGuard	aSolarGuard( Application::GetSolarMutex() );
     m_bCurrentCommandEnabled = Event.IsEnabled;
     m_aCondition.set();
 }
@@ -156,17 +156,17 @@ throw ( uno::RuntimeException )
 bool StateEventHelper::isCommandEnabled()
 {
     // Be sure that we cannot die during condition wait
-    uno::Reference< frame::XStatusListener > xSelf(
+    uno::Reference< frame::XStatusListener > xSelf( 
         SAL_STATIC_CAST( frame::XStatusListener*, this ));
-
+   
     uno::Reference< frame::XDispatch > xDispatch;
     util::URL                          aTargetURL;
     {
-        vos::OGuard aSolarGuard( Application::GetSolarMutex() );
+        vos::OGuard	aSolarGuard( Application::GetSolarMutex() );
         if ( m_xDispatchProvider.is() && m_xURLTransformer.is() )
         {
             ::rtl::OUString aSelf( RTL_CONSTASCII_USTRINGPARAM( "_self" ));
-
+            
             aTargetURL.Complete = m_aCommandURL;
             m_xURLTransformer->parseStrict( aTargetURL );
 
@@ -192,7 +192,7 @@ bool StateEventHelper::isCommandEnabled()
             // add/remove ourself to retrieve status by callback
             xDispatch->addStatusListener( xSelf, aTargetURL );
             xDispatch->removeStatusListener( xSelf, aTargetURL );
-
+            
             // wait for anwser
             m_aCondition.wait();
         }
@@ -204,22 +204,22 @@ bool StateEventHelper::isCommandEnabled()
         {
         }
 
-        vos::OGuard aSolarGuard( Application::GetSolarMutex() );
+        vos::OGuard	aSolarGuard( Application::GetSolarMutex() );
         bResult = m_bCurrentCommandEnabled;
     }
-
+    
     return bResult;
 }
 
 /*************************************************************************/
-
+    
 struct ExecuteInfo
 {
     uno::Reference< frame::XDispatch >    xDispatch;
     util::URL                             aTargetURL;
     uno::Sequence< beans::PropertyValue > aArgs;
 };
-
+    
 static const PopupMenu* lcl_FindPopupFromItemId( const PopupMenu* pPopupMenu, sal_uInt16 nItemId )
 {
     if ( pPopupMenu )
@@ -233,7 +233,7 @@ static const PopupMenu* lcl_FindPopupFromItemId( const PopupMenu* pPopupMenu, sa
             else
             {
                 const PopupMenu* pResult( 0 );
-
+                
                 const PopupMenu* pSubPopup = pPopupMenu->GetPopupMenu( i );
                 if ( pPopupMenu )
                     pResult = lcl_FindPopupFromItemId( pSubPopup, nItemId );
@@ -258,7 +258,7 @@ static ::rtl::OUString lcl_GetItemCommandRecursive( const PopupMenu* pPopupMenu,
 /*************************************************************************/
 
 ContextMenuHelper::ContextMenuHelper(
-    const uno::Reference< frame::XFrame >& xFrame,
+    const uno::Reference< frame::XFrame >& xFrame, 
     bool bAutoRefresh ) :
     m_xWeakFrame( xFrame ),
     m_aSelf( RTL_CONSTASCII_USTRINGPARAM( "_self" )),
@@ -271,25 +271,25 @@ ContextMenuHelper::~ContextMenuHelper()
 {
 }
 
-void
-ContextMenuHelper::completeAndExecute(
-    const Point& aPos,
+void 
+ContextMenuHelper::completeAndExecute( 
+    const Point& aPos, 
     PopupMenu& rPopupMenu )
 {
-    vos::OGuard aSolarGuard( Application::GetSolarMutex() );
-
+    vos::OGuard	aSolarGuard( Application::GetSolarMutex() );
+    
     associateUIConfigurationManagers();
     completeMenuProperties( &rPopupMenu );
     executePopupMenu( aPos, &rPopupMenu );
     resetAssociations();
 }
 
-void
-ContextMenuHelper::completeAndExecute(
-    const Point& aPos,
+void 
+ContextMenuHelper::completeAndExecute( 
+    const Point& aPos, 
     const uno::Reference< awt::XPopupMenu >& xPopupMenu )
 {
-    vos::OGuard aSolarGuard( Application::GetSolarMutex() );
+    vos::OGuard	aSolarGuard( Application::GetSolarMutex() );
 
     VCLXMenu* pXMenu = VCLXMenu::GetImplementation( xPopupMenu );
     if ( pXMenu )
@@ -306,17 +306,17 @@ ContextMenuHelper::completeAndExecute(
     }
 }
 
-uno::Reference< awt::XPopupMenu >
-ContextMenuHelper::create(
+uno::Reference< awt::XPopupMenu > 
+ContextMenuHelper::create( 
     const ::rtl::OUString& /*aPopupMenuResourceId*/ )
 {
     // NOT IMPLEMENTED YET!
     return uno::Reference< awt::XPopupMenu >();
 }
 
-bool
-ContextMenuHelper::createAndExecute(
-    const Point& /*aPos*/,
+bool 
+ContextMenuHelper::createAndExecute( 
+    const Point& /*aPos*/, 
     const ::rtl::OUString& /*aPopupMenuResourceId*/ )
 {
     // NOT IMPLEMENTED YET!
@@ -325,8 +325,8 @@ ContextMenuHelper::createAndExecute(
 
 // private member
 
-void
-ContextMenuHelper::executePopupMenu(
+void 
+ContextMenuHelper::executePopupMenu( 
     const Point& rPos,
     PopupMenu* pMenu )
 {
@@ -353,19 +353,19 @@ ContextMenuHelper::executePopupMenu(
 }
 
 bool
-ContextMenuHelper::dispatchCommand(
+ContextMenuHelper::dispatchCommand( 
     const uno::Reference< ::frame::XFrame >& rFrame,
     const ::rtl::OUString& aCommandURL )
 {
     if ( !m_xURLTransformer.is() )
     {
-        m_xURLTransformer = uno::Reference< util::XURLTransformer >(
+        m_xURLTransformer = uno::Reference< util::XURLTransformer >( 
             ::comphelper::getProcessServiceFactory()->createInstance(
                 rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(
                     "com.sun.star.util.URLTransformer" ))),
             uno::UNO_QUERY );
     }
-
+    
     util::URL aTargetURL;
     uno::Reference< frame::XDispatch > xDispatch;
     if ( m_xURLTransformer.is() )
@@ -373,7 +373,7 @@ ContextMenuHelper::dispatchCommand(
         aTargetURL.Complete = aCommandURL;
         m_xURLTransformer->parseStrict( aTargetURL );
 
-        uno::Reference< frame::XDispatchProvider > xDispatchProvider(
+        uno::Reference< frame::XDispatchProvider > xDispatchProvider( 
             rFrame, uno::UNO_QUERY );
         if ( xDispatchProvider.is() )
         {
@@ -433,9 +433,9 @@ ContextMenuHelper::associateUIConfigurationManagers()
                 uno::Reference< ui::XUIConfigurationManagerSupplier > xSupplier( xModel, uno::UNO_QUERY );
                 if ( xSupplier.is() )
                 {
-                    uno::Reference< ui::XUIConfigurationManager > xDocUICfgMgr(
+                    uno::Reference< ui::XUIConfigurationManager > xDocUICfgMgr( 
                         xSupplier->getUIConfigurationManager(), uno::UNO_QUERY );
-                    m_xDocImageMgr = uno::Reference< ui::XImageManager >(
+                    m_xDocImageMgr = uno::Reference< ui::XImageManager >( 
                         xDocUICfgMgr->getImageManager(), uno::UNO_QUERY );
                 }
             }
@@ -445,7 +445,7 @@ ContextMenuHelper::associateUIConfigurationManagers()
                     rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(
                         "com.sun.star.frame.ModuleManager" ))),
                 uno::UNO_QUERY );
-
+            
             uno::Reference< ui::XImageManager > xModuleImageManager;
             rtl::OUString                       aModuleId;
             if ( xModuleManager.is() )
@@ -460,11 +460,11 @@ ContextMenuHelper::associateUIConfigurationManagers()
                         uno::UNO_QUERY );
                 if ( xModuleCfgMgrSupplier.is() )
                 {
-                    uno::Reference< ui::XUIConfigurationManager > xUICfgMgr(
+                    uno::Reference< ui::XUIConfigurationManager > xUICfgMgr( 
                         xModuleCfgMgrSupplier->getUIConfigurationManager( aModuleId ));
                     if ( xUICfgMgr.is() )
                     {
-                        m_xModuleImageMgr = uno::Reference< ui::XImageManager >(
+                        m_xModuleImageMgr = uno::Reference< ui::XImageManager >( 
                             xUICfgMgr->getImageManager(), uno::UNO_QUERY );
                     }
                 }
@@ -502,8 +502,8 @@ ContextMenuHelper::associateUIConfigurationManagers()
     return true;
 }
 
-Image
-ContextMenuHelper::getImageFromCommandURL(
+Image 
+ContextMenuHelper::getImageFromCommandURL( 
     const ::rtl::OUString& aCmdURL,
     bool                   bHiContrast ) const
 {
@@ -512,11 +512,11 @@ ContextMenuHelper::getImageFromCommandURL(
                           ui::ImageType::SIZE_DEFAULT );
     if ( bHiContrast )
         nImageType |= ui::ImageType::COLOR_HIGHCONTRAST;
-
+    
     uno::Sequence< uno::Reference< graphic::XGraphic > > aGraphicSeq;
     uno::Sequence< ::rtl::OUString > aImageCmdSeq( 1 );
     aImageCmdSeq[0] = aCmdURL;
-
+    
     if ( m_xDocImageMgr.is() )
     {
         try
@@ -536,7 +536,7 @@ ContextMenuHelper::getImageFromCommandURL(
         {
         }
     }
-
+    
     if ( m_xModuleImageMgr.is() )
     {
         try
@@ -561,11 +561,11 @@ ContextMenuHelper::getImageFromCommandURL(
 }
 
 rtl::OUString
-ContextMenuHelper::getLabelFromCommandURL(
+ContextMenuHelper::getLabelFromCommandURL( 
     const ::rtl::OUString& aCmdURL ) const
 {
     ::rtl::OUString aLabel;
-
+    
     if ( m_xUICommandLabels.is() )
     {
         try
@@ -600,8 +600,8 @@ ContextMenuHelper::getLabelFromCommandURL(
     return aLabel;
 }
 
-void
-ContextMenuHelper::completeMenuProperties(
+void 
+ContextMenuHelper::completeMenuProperties( 
     Menu* pMenu )
 {
     // Retrieve some settings necessary to display complete context
@@ -609,21 +609,21 @@ ContextMenuHelper::completeMenuProperties(
     const StyleSettings& rSettings = Application::GetSettings().GetStyleSettings();
     bool  bShowMenuImages( rSettings.GetUseImagesInMenus() );
     bool  bIsHiContrast( rSettings.GetHighContrastMode() );
-
+    
     if ( pMenu )
     {
         uno::Reference< frame::XFrame > xFrame( m_xWeakFrame );
         uno::Reference< frame::XDispatchProvider > xDispatchProvider( xFrame, uno::UNO_QUERY );
-
+        
         if ( !m_xURLTransformer.is() )
         {
-            m_xURLTransformer = uno::Reference< util::XURLTransformer >(
+            m_xURLTransformer = uno::Reference< util::XURLTransformer >( 
                 ::comphelper::getProcessServiceFactory()->createInstance(
                     rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(
                         "com.sun.star.util.URLTransformer" ))),
                 uno::UNO_QUERY );
         }
-
+        
         for ( sal_uInt16 nPos = 0; nPos < pMenu->GetItemCount(); nPos++ )
         {
             sal_uInt16 nId        = pMenu->GetItemId( nPos );
@@ -633,7 +633,7 @@ ContextMenuHelper::completeMenuProperties(
             if ( pMenu->GetItemType( nPos ) != MENUITEM_SEPARATOR )
             {
                 ::rtl::OUString aCmdURL( pMenu->GetItemCommand( nId ));
-
+                
                 if ( bShowMenuImages )
                 {
                     Image aImage;
@@ -651,8 +651,8 @@ ContextMenuHelper::completeMenuProperties(
                 }
 
                 // Use helper to retrieve state of the command URL
-                StateEventHelper* pHelper = new StateEventHelper(
-                                                    xDispatchProvider,
+                StateEventHelper* pHelper = new StateEventHelper( 
+                                                    xDispatchProvider, 
                                                     m_xURLTransformer,
                                                     aCmdURL );
 
@@ -666,7 +666,7 @@ ContextMenuHelper::completeMenuProperties(
 
 IMPL_STATIC_LINK_NOINSTANCE( ContextMenuHelper, ExecuteHdl_Impl, ExecuteInfo*, pExecuteInfo )
 {
-    // Release solar mutex to prevent deadlocks with clipboard thread
+    // Release solar mutex to prevent deadlocks with clipboard thread    
     const sal_uInt32 nRef = Application::ReleaseSolarMutex();
     try
     {
diff --git a/svtools/source/uno/framestatuslistener.cxx b/svtools/source/uno/framestatuslistener.cxx
index 20176160b396..6b3fc2772efb 100644
--- a/svtools/source/uno/framestatuslistener.cxx
+++ b/svtools/source/uno/framestatuslistener.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
@@ -194,7 +194,7 @@ void FrameStatusListener::addStatusListener( const rtl::OUString& aCommandURL )
     {
         vos::OGuard aSolarMutexGuard( Application::GetSolarMutex() );
         URLToDispatchMap::iterator pIter = m_aListenerMap.find( aCommandURL );
-
+        
         // Already in the list of status listener. Do nothing.
         if ( pIter != m_aListenerMap.end() )
             return;
@@ -213,13 +213,13 @@ void FrameStatusListener::addStatusListener( const rtl::OUString& aCommandURL )
             Reference< XDispatchProvider > xDispatchProvider( m_xFrame, UNO_QUERY );
             if ( m_xServiceManager.is() && xDispatchProvider.is() )
             {
-                Reference< XURLTransformer > xURLTransformer( m_xServiceManager->createInstance(
-                                                                rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.util.URLTransformer" ))),
+                Reference< XURLTransformer > xURLTransformer( m_xServiceManager->createInstance( 
+                                                                rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.util.URLTransformer" ))), 
                                                             UNO_QUERY );
                 aTargetURL.Complete = aCommandURL;
                 xURLTransformer->parseStrict( aTargetURL );
                 xDispatch = xDispatchProvider->queryDispatch( aTargetURL, ::rtl::OUString(), 0 );
-
+            
                 xStatusListener = Reference< XStatusListener >( static_cast< OWeakObject* >( this ), UNO_QUERY );
                 URLToDispatchMap::iterator aIter = m_aListenerMap.find( aCommandURL );
                 if ( aIter != m_aListenerMap.end() )
@@ -234,14 +234,14 @@ void FrameStatusListener::addStatusListener( const rtl::OUString& aCommandURL )
                     }
                     catch ( Exception& )
                     {
-                    }
+                    }    
                 }
                 else
                     m_aListenerMap.insert( URLToDispatchMap::value_type( aCommandURL, xDispatch ));
             }
         }
     }
-
+    
     // Call without locked mutex as we are called back from dispatch implementation
     try
     {
@@ -256,7 +256,7 @@ void FrameStatusListener::addStatusListener( const rtl::OUString& aCommandURL )
 void FrameStatusListener::removeStatusListener( const rtl::OUString& aCommandURL )
 {
     vos::OGuard aSolarMutexGuard( Application::GetSolarMutex() );
-
+    
     URLToDispatchMap::iterator pIter = m_aListenerMap.find( aCommandURL );
     if ( pIter != m_aListenerMap.end() )
     {
@@ -266,13 +266,13 @@ void FrameStatusListener::removeStatusListener( const rtl::OUString& aCommandURL
 
         try
         {
-            Reference< XURLTransformer > xURLTransformer( m_xServiceManager->createInstance(
-                                                            rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.util.URLTransformer" ))),
+            Reference< XURLTransformer > xURLTransformer( m_xServiceManager->createInstance( 
+                                                            rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.util.URLTransformer" ))), 
                                                         UNO_QUERY );
             com::sun::star::util::URL aTargetURL;
             aTargetURL.Complete = aCommandURL;
             xURLTransformer->parseStrict( aTargetURL );
-
+            
             if ( xDispatch.is() && xStatusListener.is() )
                 xDispatch->removeStatusListener( xStatusListener, aTargetURL );
         }
@@ -289,10 +289,10 @@ void FrameStatusListener::bindListener()
 
     {
         vos::OGuard aSolarMutexGuard( Application::GetSolarMutex() );
-
+        
         if ( !m_bInitialized )
             return;
-
+        
         // Collect all registered command URL's and store them temporary
         Reference< XDispatchProvider > xDispatchProvider( m_xFrame, UNO_QUERY );
         if ( m_xServiceManager.is() && xDispatchProvider.is() )
@@ -301,13 +301,13 @@ void FrameStatusListener::bindListener()
             URLToDispatchMap::iterator pIter = m_aListenerMap.begin();
             while ( pIter != m_aListenerMap.end() )
             {
-                Reference< XURLTransformer > xURLTransformer( m_xServiceManager->createInstance(
-                                                                rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.util.URLTransformer" ))),
+                Reference< XURLTransformer > xURLTransformer( m_xServiceManager->createInstance( 
+                                                                rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.util.URLTransformer" ))), 
                                                             UNO_QUERY );
                 com::sun::star::util::URL aTargetURL;
                 aTargetURL.Complete = pIter->first;
                 xURLTransformer->parseStrict( aTargetURL );
-
+                
                 Reference< XDispatch > xDispatch( pIter->second );
                 if ( xDispatch.is() )
                 {
@@ -321,7 +321,7 @@ void FrameStatusListener::bindListener()
                     {
                     }
                 }
-
+                
                 // Query for dispatch object. Old dispatch will be released with this, too.
                 try
                 {
@@ -331,14 +331,14 @@ void FrameStatusListener::bindListener()
                 {
                 }
                 pIter->second = xDispatch;
-
+                
                 Listener aListener( aTargetURL, xDispatch );
                 aDispatchVector.push_back( aListener );
                 ++pIter;
             }
         }
     }
-
+    
     // Call without locked mutex as we are called back from dispatch implementation
     if ( xStatusListener.is() )
     {
@@ -360,10 +360,10 @@ void FrameStatusListener::bindListener()
 void FrameStatusListener::unbindListener()
 {
     vos::OGuard aSolarMutexGuard( Application::GetSolarMutex() );
-
+    
     if ( !m_bInitialized )
         return;
-
+    
     // Collect all registered command URL's and store them temporary
     Reference< XDispatchProvider > xDispatchProvider( m_xFrame, UNO_QUERY );
     if ( m_xServiceManager.is() && xDispatchProvider.is() )
@@ -372,13 +372,13 @@ void FrameStatusListener::unbindListener()
         URLToDispatchMap::iterator pIter = m_aListenerMap.begin();
         while ( pIter != m_aListenerMap.end() )
         {
-            Reference< XURLTransformer > xURLTransformer( m_xServiceManager->createInstance(
-                                                            rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.util.URLTransformer" ))),
+            Reference< XURLTransformer > xURLTransformer( m_xServiceManager->createInstance( 
+                                                            rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.util.URLTransformer" ))), 
                                                         UNO_QUERY );
             com::sun::star::util::URL aTargetURL;
             aTargetURL.Complete = pIter->first;
             xURLTransformer->parseStrict( aTargetURL );
-
+            
             Reference< XDispatch > xDispatch( pIter->second );
             if ( xDispatch.is() )
             {
@@ -403,20 +403,20 @@ void FrameStatusListener::updateStatus( const rtl::OUString aCommandURL )
     Reference< XDispatch > xDispatch;
     Reference< XStatusListener > xStatusListener;
     com::sun::star::util::URL aTargetURL;
-
+    
     {
         vos::OGuard aSolarMutexGuard( Application::GetSolarMutex() );
-
+        
         if ( !m_bInitialized )
             return;
-
+        
         // Try to find a dispatch object for the requested command URL
         Reference< XDispatchProvider > xDispatchProvider( m_xFrame, UNO_QUERY );
         xStatusListener = Reference< XStatusListener >( static_cast< OWeakObject* >( this ), UNO_QUERY );
         if ( m_xServiceManager.is() && xDispatchProvider.is() )
         {
-            Reference< XURLTransformer > xURLTransformer( m_xServiceManager->createInstance(
-                                                            rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.util.URLTransformer" ))),
+            Reference< XURLTransformer > xURLTransformer( m_xServiceManager->createInstance( 
+                                                            rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.util.URLTransformer" ))), 
                                                         UNO_QUERY );
             aTargetURL.Complete = aCommandURL;
             xURLTransformer->parseStrict( aTargetURL );
@@ -426,9 +426,9 @@ void FrameStatusListener::updateStatus( const rtl::OUString aCommandURL )
 
     if ( xDispatch.is() && xStatusListener.is() )
     {
-        // Catch exception as we release our mutex, it is possible that someone else
+        // Catch exception as we release our mutex, it is possible that someone else 
         // has already disposed this instance!
-        // Add/remove status listener to get a update status information from the
+        // Add/remove status listener to get a update status information from the 
         // requested command.
         try
         {
diff --git a/svtools/source/uno/generictoolboxcontroller.cxx b/svtools/source/uno/generictoolboxcontroller.cxx
index a58d9b784cca..bfec100cdb55 100644
--- a/svtools/source/uno/generictoolboxcontroller.cxx
+++ b/svtools/source/uno/generictoolboxcontroller.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
@@ -30,11 +30,11 @@
 #include <svtools/generictoolboxcontroller.hxx>
 
 //_________________________________________________________________________________________________________________
-//  my own includes
+//	my own includes
 //_________________________________________________________________________________________________________________
 
 //_________________________________________________________________________________________________________________
-//  interface includes
+//	interface includes
 //_________________________________________________________________________________________________________________
 #include <com/sun/star/util/XURLTransformer.hpp>
 #include <com/sun/star/frame/XDispatchProvider.hpp>
@@ -44,7 +44,7 @@
 #include <com/sun/star/frame/status/ItemState.hpp>
 
 //_________________________________________________________________________________________________________________
-//  other includes
+//	other includes
 //_________________________________________________________________________________________________________________
 #include <vos/mutex.hxx>
 #include <vcl/svapp.hxx>
diff --git a/svtools/source/uno/genericunodialog.cxx b/svtools/source/uno/genericunodialog.cxx
index a7ece1acc369..d878e2d5486e 100644
--- a/svtools/source/uno/genericunodialog.cxx
+++ b/svtools/source/uno/genericunodialog.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
@@ -368,6 +368,6 @@ IMPL_LINK( OGenericUnoDialog, OnDialogDying, VclWindowEvent*, _pEvent )
 }
 
 //.........................................................................
-}   // namespace svt
+}	// namespace svt
 //.........................................................................
 
diff --git a/svtools/source/uno/miscservices.cxx b/svtools/source/uno/miscservices.cxx
index e16a1ecb56dc..6666dd9b584e 100644
--- a/svtools/source/uno/miscservices.cxx
+++ b/svtools/source/uno/miscservices.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
@@ -66,8 +66,8 @@ extern sdecl::ServiceDecl const serviceDecl;
 
 // for CreateInstance functions implemented elsewhere, while the function is within a namespace
 #define DECLARE_CREATEINSTANCE_NAMESPACE( nmspe, ImplName ) \
-    namespace nmspe {   \
-        Reference< XInterface > SAL_CALL ImplName##_CreateInstance( const Reference< XMultiServiceFactory >& ); \
+    namespace nmspe {	\
+        Reference< XInterface > SAL_CALL ImplName##_CreateInstance( const Reference< XMultiServiceFactory >& );	\
     }
 
 namespace
@@ -78,7 +78,7 @@ namespace
             ::svt::uno::Wizard::Create,
             ::svt::uno::Wizard::getImplementationName_static,
             ::svt::uno::Wizard::getSupportedServiceNames_static,
-            ::cppu::createSingleComponentFactory, NULL, 0
+            ::cppu::createSingleComponentFactory, NULL, 0 
         },
         { 0, 0, 0, 0, 0, 0 }
     };
@@ -109,7 +109,7 @@ SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL component_writeInfo (
         Reference< XRegistryKey > xRegistryKey (
             reinterpret_cast< XRegistryKey* >( _pRegistryKey ));
         Reference< XRegistryKey > xNewKey;
-        uno::Sequence< ::rtl::OUString >            aServices;
+        uno::Sequence< ::rtl::OUString > 			aServices;
 
         xNewKey = xRegistryKey->createKey (
             OUString::createFromAscii( "/com.sun.star.comp.svtools.OAddressBookSourceDialogUno/UNO/SERVICES" ) );
@@ -122,23 +122,23 @@ SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL component_writeInfo (
             OUString::createFromAscii( "com.sun.star.ui.dialogs.FilterOptionsDialog" ) );
 
         // GraphicProvider
-        xNewKey = reinterpret_cast< registry::XRegistryKey * >( _pRegistryKey )->createKey(
-                    ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("/") ) +
-                    GraphicProvider::getImplementationName_Static() +
+        xNewKey = reinterpret_cast< registry::XRegistryKey * >( _pRegistryKey )->createKey( 
+                    ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("/") ) + 
+                    GraphicProvider::getImplementationName_Static() + 
                     ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "/UNO/SERVICES") ) );
 
-        aServices = GraphicProvider::getSupportedServiceNames_Static();
+        aServices = GraphicProvider::getSupportedServiceNames_Static();    
         int i;
         for( i = 0; i < aServices.getLength(); i++ )
             xNewKey->createKey( aServices.getConstArray()[ i ] );
-
+    
         // GraphicRendererVCL
-        xNewKey = reinterpret_cast< registry::XRegistryKey * >( _pRegistryKey )->createKey(
-                    ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("/") ) +
-                    GraphicRendererVCL::getImplementationName_Static() +
+        xNewKey = reinterpret_cast< registry::XRegistryKey * >( _pRegistryKey )->createKey( 
+                    ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("/") ) + 
+                    GraphicRendererVCL::getImplementationName_Static() + 
                     ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "/UNO/SERVICES") ) );
-
-        aServices = ( GraphicRendererVCL::getSupportedServiceNames_Static() );
+        
+        aServices = ( GraphicRendererVCL::getSupportedServiceNames_Static() );	    
         for( i = 0; i < aServices.getLength(); i++ )
             xNewKey->createKey( aServices.getConstArray()[ i ] );
 
@@ -185,7 +185,7 @@ SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory (
         }
         else if( 0 == GraphicProvider::getImplementationName_Static().compareToAscii( pImplementationName ) )
         {
-            xFactory =  ::cppu::createOneInstanceFactory(
+            xFactory =  ::cppu::createOneInstanceFactory( 
                 reinterpret_cast< lang::XMultiServiceFactory * >( _pServiceManager ),
                 GraphicProvider::getImplementationName_Static(),
                 GraphicProvider_CreateInstance,
@@ -193,13 +193,13 @@ SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory (
         }
         else if( 0 == GraphicRendererVCL::getImplementationName_Static().compareToAscii( pImplementationName ) )
         {
-            xFactory = ::cppu::createOneInstanceFactory(
+            xFactory = ::cppu::createOneInstanceFactory( 
                 reinterpret_cast< lang::XMultiServiceFactory * >( _pServiceManager ),
                 GraphicRendererVCL::getImplementationName_Static(),
                 GraphicRendererVCL_CreateInstance,
                 GraphicRendererVCL::getSupportedServiceNames_Static() );
         }
-        else
+        else 
         {
             pResult =  component_getFactoryHelper( pImplementationName, reinterpret_cast< lang::XMultiServiceFactory * >( _pServiceManager ),reinterpret_cast< registry::XRegistryKey* >( pRegistryKey ), serviceDecl );
             if ( !pResult )
@@ -215,5 +215,5 @@ SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory (
     return pResult;
 }
 
-}   // "C"
+}	// "C"
 
diff --git a/svtools/source/uno/popupmenucontrollerbase.cxx b/svtools/source/uno/popupmenucontrollerbase.cxx
index ac75a1b9a24b..d6f63e5dc810 100644
--- a/svtools/source/uno/popupmenucontrollerbase.cxx
+++ b/svtools/source/uno/popupmenucontrollerbase.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
@@ -29,13 +29,13 @@
 #include "precompiled_svtools.hxx"
 
 //_________________________________________________________________________________________________________________
-//  my own includes
+//	my own includes
 //_________________________________________________________________________________________________________________
 #include "svtools/popupmenucontrollerbase.hxx"
 
 
 //_________________________________________________________________________________________________________________
-//  interface includes
+//	interface includes
 //_________________________________________________________________________________________________________________
 #include <com/sun/star/awt/XDevice.hpp>
 #include <com/sun/star/beans/PropertyValue.hpp>
@@ -45,7 +45,7 @@
 #include <com/sun/star/awt/XMenuExtended.hpp>
 
 //_________________________________________________________________________________________________________________
-//  includes of other projects
+//	includes of other projects
 //_________________________________________________________________________________________________________________
 
 #ifndef _VCL_MENU_HXX_
@@ -57,9 +57,9 @@
 #include <vos/mutex.hxx>
 
 //_________________________________________________________________________________________________________________
-//  Defines
+//	Defines
 //_________________________________________________________________________________________________________________
-//
+// 
 
 using ::rtl::OUString;
 
@@ -114,14 +114,14 @@ void PopupMenuControllerBase::resetPopupMenu( com::sun::star::uno::Reference< co
          if ( pPopupMenu )
          {
             vos::OGuard aSolarMutexGuard( Application::GetSolarMutex() );
-
+    
             PopupMenu* pVCLPopupMenu = (PopupMenu *)pPopupMenu->GetMenu();
             pVCLPopupMenu->Clear();
          }
     }
 }
 
-void SAL_CALL PopupMenuControllerBase::disposing()
+void SAL_CALL PopupMenuControllerBase::disposing() 
 {
     // Reset our members and set disposed flag
     osl::MutexGuard aLock( m_aMutex );
@@ -161,7 +161,7 @@ void SAL_CALL PopupMenuControllerBase::highlight( const awt::MenuEvent& ) throw
 
 void PopupMenuControllerBase::impl_select(const Reference< XDispatch >& _xDispatch,const URL& aURL)
 {
-    Sequence<PropertyValue>      aArgs;
+    Sequence<PropertyValue>	     aArgs;
     OSL_ENSURE(_xDispatch.is(),"PopupMenuControllerBase::impl_select: No dispatch");
     if ( _xDispatch.is() )
         _xDispatch->dispatch( aURL, aArgs );
@@ -190,7 +190,7 @@ void PopupMenuControllerBase::dispatchCommand( const ::rtl::OUString& sCommandUR
     try
     {
         Reference< XDispatchProvider > xDispatchProvider( m_xFrame, UNO_QUERY_THROW );
-        URL aURL;
+        URL aURL;       
         aURL.Complete = sCommandURL;
         m_xURLTransformer->parseStrict( aURL );
 
@@ -221,8 +221,8 @@ void SAL_CALL PopupMenuControllerBase::deactivate( const awt::MenuEvent& ) throw
 }
 
 void SAL_CALL PopupMenuControllerBase::updatePopupMenu() throw ( ::com::sun::star::uno::RuntimeException )
-{
-    osl::ClearableMutexGuard aLock( m_aMutex );
+{   
+    osl::ClearableMutexGuard aLock( m_aMutex );   
     throwIfDisposed();
     aLock.clear();
 
@@ -231,7 +231,7 @@ void SAL_CALL PopupMenuControllerBase::updatePopupMenu() throw ( ::com::sun::sta
 
 void SAL_CALL PopupMenuControllerBase::updateCommand( const rtl::OUString& rCommandURL )
 {
-    osl::ClearableMutexGuard aLock( m_aMutex );
+    osl::ClearableMutexGuard aLock( m_aMutex );   
     Reference< XStatusListener > xStatusListener( static_cast< OWeakObject* >( this ), UNO_QUERY );
     Reference< XDispatch > xDispatch( m_xDispatch );
     URL aTargetURL;
@@ -249,17 +249,17 @@ void SAL_CALL PopupMenuControllerBase::updateCommand( const rtl::OUString& rComm
 
 
 // XDispatchProvider
-Reference< XDispatch > SAL_CALL
-PopupMenuControllerBase::queryDispatch(
-    const URL& /*aURL*/,
-    const rtl::OUString& /*sTarget*/,
-    sal_Int32 /*nFlags*/ )
+Reference< XDispatch > SAL_CALL 
+PopupMenuControllerBase::queryDispatch( 
+    const URL& /*aURL*/, 
+    const rtl::OUString& /*sTarget*/, 
+    sal_Int32 /*nFlags*/ ) 
 throw( RuntimeException )
 {
     // must be implemented by subclass
     osl::MutexGuard aLock( m_aMutex );
     throwIfDisposed();
-
+    
     return Reference< XDispatch >();
 }
 
@@ -270,7 +270,7 @@ Sequence< Reference< XDispatch > > SAL_CALL PopupMenuControllerBase::queryDispat
     osl::ClearableMutexGuard aLock( m_aMutex );
     throwIfDisposed();
     aLock.clear();
-
+    
     sal_Int32                                                          nCount = lDescriptor.getLength();
     uno::Sequence< uno::Reference< frame::XDispatch > > lDispatcher( nCount );
 
@@ -286,10 +286,10 @@ Sequence< Reference< XDispatch > > SAL_CALL PopupMenuControllerBase::queryDispat
 }
 
 // XDispatch
-void SAL_CALL
+void SAL_CALL 
 PopupMenuControllerBase::dispatch(
-    const URL& /*aURL*/,
-    const Sequence< PropertyValue >& /*seqProperties*/ )
+    const URL& /*aURL*/, 
+    const Sequence< PropertyValue >& /*seqProperties*/ ) 
 throw( ::com::sun::star::uno::RuntimeException )
 {
     // must be implemented by subclass
@@ -297,16 +297,16 @@ throw( ::com::sun::star::uno::RuntimeException )
     throwIfDisposed();
 }
 
-void SAL_CALL
-PopupMenuControllerBase::addStatusListener(
+void SAL_CALL 
+PopupMenuControllerBase::addStatusListener( 
     const Reference< XStatusListener >& xControl,
-    const URL& aURL )
+    const URL& aURL ) 
 throw( ::com::sun::star::uno::RuntimeException )
 {
     osl::ResettableMutexGuard aLock( m_aMutex );
     throwIfDisposed();
     aLock.clear();
-
+    
     bool bStatusUpdate( false );
     rBHelper.addListener( ::getCppuType( &xControl ), xControl );
 
@@ -314,7 +314,7 @@ throw( ::com::sun::star::uno::RuntimeException )
     if ( aURL.Complete.indexOf( m_aBaseURL ) == 0 )
         bStatusUpdate = true;
     aLock.clear();
-
+    
     if ( bStatusUpdate )
     {
         // Dummy update for popup menu controllers
@@ -327,9 +327,9 @@ throw( ::com::sun::star::uno::RuntimeException )
     }
 }
 
-void SAL_CALL PopupMenuControllerBase::removeStatusListener(
-    const Reference< XStatusListener >& xControl,
-    const URL& /*aURL*/ )
+void SAL_CALL PopupMenuControllerBase::removeStatusListener( 
+    const Reference< XStatusListener >& xControl, 
+    const URL& /*aURL*/ ) 
 throw( ::com::sun::star::uno::RuntimeException )
 {
     rBHelper.removeListener( ::getCppuType( &xControl ), xControl );
@@ -341,18 +341,18 @@ throw( ::com::sun::star::uno::RuntimeException )
     sal_Int32     nQueryPart( 0 );
     sal_Int32     nSchemePart( 0 );
     rtl::OUString aMainURL( RTL_CONSTASCII_USTRINGPARAM( "vnd.sun.star.popup:" ));
-
+    
     nSchemePart = aURL.indexOf( ':' );
-    if (( nSchemePart > 0 ) &&
+    if (( nSchemePart > 0 ) && 
         ( aURL.getLength() > ( nSchemePart+1 )))
     {
         nQueryPart  = aURL.indexOf( '?', nSchemePart );
         if ( nQueryPart > 0 )
             aMainURL += aURL.copy( nSchemePart, nQueryPart-nSchemePart );
         else if ( nQueryPart == -1 )
-            aMainURL += aURL.copy( nSchemePart+1 );
+            aMainURL += aURL.copy( nSchemePart+1 );        
     }
-
+    
     return aMainURL;
 }
 
@@ -360,14 +360,14 @@ throw( ::com::sun::star::uno::RuntimeException )
 void SAL_CALL PopupMenuControllerBase::initialize( const Sequence< Any >& aArguments ) throw ( Exception, RuntimeException )
 {
     osl::MutexGuard aLock( m_aMutex );
-
+    
     sal_Bool bInitalized( m_bInitialized );
     if ( !bInitalized )
     {
         PropertyValue       aPropValue;
         rtl::OUString       aCommandURL;
         Reference< XFrame > xFrame;
-
+        
         for ( int i = 0; i < aArguments.getLength(); i++ )
         {
             if ( aArguments[i] >>= aPropValue )
@@ -393,17 +393,17 @@ void SAL_CALL PopupMenuControllerBase::setPopupMenu( const Reference< awt::XPopu
 {
     osl::MutexGuard aLock( m_aMutex );
     throwIfDisposed();
-
+    
     if ( m_xFrame.is() && !m_xPopupMenu.is() )
     {
         // Create popup menu on demand
         vos::OGuard aSolarMutexGuard( Application::GetSolarMutex() );
-
+        
         m_xPopupMenu = xPopupMenu;
         m_xPopupMenu->addMenuListener( Reference< awt::XMenuListener >( (OWeakObject*)this, UNO_QUERY ));
-
+            
         Reference< XDispatchProvider > xDispatchProvider( m_xFrame, UNO_QUERY );
-
+        
         URL aTargetURL;
         aTargetURL.Complete = m_aCommandURL;
         m_xURLTransformer->parseStrict( aTargetURL );
@@ -412,7 +412,7 @@ void SAL_CALL PopupMenuControllerBase::setPopupMenu( const Reference< awt::XPopu
         impl_setPopupMenu();
 
         updatePopupMenu();
-    }
+    }    
 }
 void PopupMenuControllerBase::impl_setPopupMenu()
 {
diff --git a/svtools/source/uno/popupwindowcontroller.cxx b/svtools/source/uno/popupwindowcontroller.cxx
index 4fbaff23714d..de256d50b6ba 100644
--- a/svtools/source/uno/popupwindowcontroller.cxx
+++ b/svtools/source/uno/popupwindowcontroller.cxx
@@ -157,13 +157,13 @@ PopupWindowController::~PopupWindowController()
 }
 
 // XInterface
-Any SAL_CALL PopupWindowController::queryInterface( const Type& aType )
+Any SAL_CALL PopupWindowController::queryInterface( const Type& aType ) 
 throw (RuntimeException)
 {
     Any a( ToolboxController::queryInterface( aType ) );
     if ( a.hasValue() )
         return a;
-
+    
     return ::cppu::queryInterface( aType, static_cast< lang::XServiceInfo* >( this ));
 }
 
@@ -242,13 +242,13 @@ Reference< awt::XWindow > SAL_CALL PopupWindowController::createPopupWindow() th
         {
                pWin->EnableDocking(true);
             mpImpl->SetPopupWindow(pWin,pToolBox);
-            ::Window::GetDockingManager()->StartPopupMode( pToolBox, pWin, FLOATWIN_POPUPMODE_NOFOCUSCLOSE|FLOATWIN_POPUPMODE_ALLMOUSEBUTTONCLOSE |FLOATWIN_POPUPMODE_NOMOUSEUPCLOSE );
+            ::Window::GetDockingManager()->StartPopupMode( pToolBox, pWin, FLOATWIN_POPUPMODE_NOFOCUSCLOSE|FLOATWIN_POPUPMODE_ALLMOUSEBUTTONCLOSE |FLOATWIN_POPUPMODE_NOMOUSEUPCLOSE );	        
         }
     }
     return Reference< awt::XWindow >();
 }
 
-Reference< awt::XWindow > SAL_CALL PopupWindowController::createItemWindow( const Reference< awt::XWindow >& /*Parent*/ )
+Reference< awt::XWindow > SAL_CALL PopupWindowController::createItemWindow( const Reference< awt::XWindow >& /*Parent*/ ) 
     throw (RuntimeException)
 {
     return Reference< awt::XWindow >();
diff --git a/svtools/source/uno/statusbarcontroller.cxx b/svtools/source/uno/statusbarcontroller.cxx
index 14b802a1bf90..5dfcf91577ea 100644
--- a/svtools/source/uno/statusbarcontroller.cxx
+++ b/svtools/source/uno/statusbarcontroller.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
@@ -675,10 +675,10 @@ void StatusbarController::updateStatus( const rtl::OUString aCommandURL )
 ::Rectangle StatusbarController::getControlRect() const
 {
     ::Rectangle aRect;
-
+    
     {
         vos::OGuard aSolarMutexGuard( Application::GetSolarMutex() );
-
+        
         if ( m_bDisposed )
             throw DisposedException();
 
diff --git a/svtools/source/uno/svtxgridcontrol.cxx b/svtools/source/uno/svtxgridcontrol.cxx
index f5bc837f60b0..eebe14651437 100755
--- a/svtools/source/uno/svtxgridcontrol.cxx
+++ b/svtools/source/uno/svtxgridcontrol.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
@@ -67,7 +67,7 @@ SVTXGridControl::SVTXGridControl()
     m_xDataModel(0),
     m_xColumnModel(0),
     m_bHasColumnHeaders(false),
-    m_bHasRowHeaders(false),
+    m_bHasRowHeaders(false), 
     m_bVScroll(false),
     m_bHScroll(false),
     m_bUpdate(false),
@@ -148,11 +148,11 @@ void SVTXGridControl::setProperty( const ::rtl::OUString& PropertyName, const An
                 SelectionMode eSelMode;
                 switch( eSelectionType )
                 {
-                case SelectionType_SINGLE:  eSelMode = SINGLE_SELECTION; break;
-                case SelectionType_RANGE:   eSelMode = RANGE_SELECTION; break;
-                case SelectionType_MULTI:   eSelMode = MULTIPLE_SELECTION; break;
-    //          case SelectionType_NONE:
-                default:                    eSelMode = NO_SELECTION; break;
+                case SelectionType_SINGLE:	eSelMode = SINGLE_SELECTION; break;
+                case SelectionType_RANGE:	eSelMode = RANGE_SELECTION; break;
+                case SelectionType_MULTI:	eSelMode = MULTIPLE_SELECTION; break;
+    //			case SelectionType_NONE:		
+                default:					eSelMode = NO_SELECTION; break;
                 }
                 if( pTable->getSelEngine()->GetSelectionMode() != eSelMode )
                     pTable->getSelEngine()->SetSelectionMode( eSelMode );
@@ -241,16 +241,16 @@ void SVTXGridControl::setProperty( const ::rtl::OUString& PropertyName, const An
             {
                 switch( vAlign )
                 {
-                case com::sun::star::style::VerticalAlignment_TOP:  m_pTableModel->setVerticalAlign(com::sun::star::style::VerticalAlignment(0)); break;
-                case com::sun::star::style::VerticalAlignment_MIDDLE:   m_pTableModel->setVerticalAlign(com::sun::star::style::VerticalAlignment(1)); break;
-                case com::sun::star::style::VerticalAlignment_BOTTOM: m_pTableModel->setVerticalAlign(com::sun::star::style::VerticalAlignment(2)); break;
+                case com::sun::star::style::VerticalAlignment_TOP:	m_pTableModel->setVerticalAlign(com::sun::star::style::VerticalAlignment(0)); break;
+                case com::sun::star::style::VerticalAlignment_MIDDLE:	m_pTableModel->setVerticalAlign(com::sun::star::style::VerticalAlignment(1)); break;
+                case com::sun::star::style::VerticalAlignment_BOTTOM: m_pTableModel->setVerticalAlign(com::sun::star::style::VerticalAlignment(2)); break;		
                 default: m_pTableModel->setVerticalAlign(com::sun::star::style::VerticalAlignment(0)); break;
                 }
             }
             break;
         }
 
-        case BASEPROPERTY_GRID_SHOWCOLUMNHEADER:
+        case BASEPROPERTY_GRID_SHOWCOLUMNHEADER:	
         {
             sal_Bool colHeader = true;
             if( aValue >>= colHeader )
@@ -292,12 +292,12 @@ void SVTXGridControl::setProperty( const ::rtl::OUString& PropertyName, const An
                             }
                             m_pTableModel->getCellContent().push_back(newRow);
                         }
-
+                        
                         Sequence< ::rtl::OUString > rowHeaders = m_xDataModel->getRowHeaders();
                         std::vector< rtl::OUString > newRow(
                             comphelper::sequenceToContainer< std::vector<rtl::OUString > >(rowHeaders));
                         m_pTableModel->setRowCount(m_xDataModel->getRowCount());
-                        m_pTableModel->setRowHeaderName(newRow);
+                        m_pTableModel->setRowHeaderName(newRow);			
                     }
                 }
                 else
@@ -311,7 +311,7 @@ void SVTXGridControl::setProperty( const ::rtl::OUString& PropertyName, const An
                 else
                     m_pTableModel->setRowHeight(m_xDataModel->getRowHeight());
                 m_pTableModel->setRowHeaderWidth(m_xDataModel->getRowHeaderWidth());
-            }
+            }		
             break;
         }
         case BASEPROPERTY_GRID_COLUMNMODEL:
@@ -377,11 +377,11 @@ Any SVTXGridControl::getProperty( const ::rtl::OUString& PropertyName ) throw(Ru
             SelectionMode eSelMode = pTable->getSelEngine()->GetSelectionMode();
             switch( eSelMode )
             {
-                case SINGLE_SELECTION:  eSelectionType = SelectionType_SINGLE; break;
-                case RANGE_SELECTION:   eSelectionType = SelectionType_RANGE; break;
+                case SINGLE_SELECTION:	eSelectionType = SelectionType_SINGLE; break;
+                case RANGE_SELECTION:	eSelectionType = SelectionType_RANGE; break;
                 case MULTIPLE_SELECTION:eSelectionType = SelectionType_MULTI; break;
-//              case NO_SELECTION:
-                default:                eSelectionType = SelectionType_NONE; break;
+//				case NO_SELECTION:		
+                default:				eSelectionType = SelectionType_NONE; break;
             }
             return Any( eSelectionType );
         }
@@ -398,7 +398,7 @@ Any SVTXGridControl::getProperty( const ::rtl::OUString& PropertyName ) throw(Ru
             case BASEPROPERTY_HSCROLL:
                 return Any ( m_bHScroll);
             case BASEPROPERTY_VSCROLL:
-                return Any ( m_bVScroll);
+                return Any ( m_bVScroll);		
         }
     }
     return VCLXWindow::getProperty( PropertyName );
@@ -450,15 +450,15 @@ void SAL_CALL SVTXGridControl::rowAdded(const ::com::sun::star::awt::grid::GridD
         {
             UnoControlTableColumn* tableColumn = new UnoControlTableColumn();
             m_pTableModel->getColumnModel().push_back((PColumnModel)tableColumn);
-            m_xColumnModel->getColumn(col)->addColumnListener(listener);
+            m_xColumnModel->getColumn(col)->addColumnListener(listener);	
         }
-
+        
     }
     else if((unsigned int)rawRowData.getLength()!=(unsigned)colCount)
         throw GridInvalidDataException(rtl::OUString::createFromAscii("The column count doesn't match with the length of row data"), m_xDataModel);
 
-    for ( int k = 0; k < rawRowData.getLength(); k++)
-        newRow.push_back(rawRowData[k]);
+    for ( int k = 0; k < rawRowData.getLength(); k++)	
+        newRow.push_back(rawRowData[k]);	
     m_pTableModel->getCellContent().push_back(newRow);
     if(m_pTableModel->hasRowHeaders())
         m_pTableModel->getRowHeaderName().push_back(Event.headerName);
@@ -662,7 +662,7 @@ void SAL_CALL SVTXGridControl::disposing( const ::com::sun::star::lang::EventObj
 }
 
 void SAL_CALL SVTXGridControl::selectRows(const ::com::sun::star::uno::Sequence< ::sal_Int32 >& rangeOfRows) throw (::com::sun::star::uno::RuntimeException)
-{
+{	
     TableControl* pTable = (TableControl*)GetWindow();
     SelectionMode eSelMode = pTable->getSelEngine()->GetSelectionMode();
     if(eSelMode != NO_SELECTION)
@@ -679,7 +679,7 @@ void SAL_CALL SVTXGridControl::selectRows(const ::com::sun::star::uno::Sequence<
                     selectedRows.clear();
                 if(rangeOfRows.getLength() == 1)
                     selectedRows.push_back(start);
-                else
+                else 
                     return;
             }
             else
@@ -718,7 +718,7 @@ void SAL_CALL SVTXGridControl::selectAllRows() throw (::com::sun::star::uno::Run
 }
 
 void SAL_CALL SVTXGridControl::deselectRows(const ::com::sun::star::uno::Sequence< ::sal_Int32 >& rangeOfRows) throw (::com::sun::star::uno::RuntimeException)
-{
+{	
     TableControl* pTable = (TableControl*)GetWindow();
     std::vector<RowPos>& selectedRows = pTable->GetSelectedRows();
     std::vector<RowPos>::iterator itStart = selectedRows.begin();
@@ -794,7 +794,7 @@ void SAL_CALL SVTXGridControl::selectRow(::sal_Int32 index) throw (::com::sun::s
                 return;
         }
         else if(eSelMode == SINGLE_SELECTION)
-        {
+        {	
             if(!selectedRows.empty())
             {
                 if(!isSelectedIndex(index))
diff --git a/svtools/source/uno/svtxgridcontrol.hxx b/svtools/source/uno/svtxgridcontrol.hxx
index b15507e4614f..cdd5557dfab8 100755
--- a/svtools/source/uno/svtxgridcontrol.hxx
+++ b/svtools/source/uno/svtxgridcontrol.hxx
@@ -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
@@ -47,7 +47,7 @@
 
 using namespace ::svt::table;
 
-class SVTXGridControl : public ::cppu::ImplInheritanceHelper3< VCLXWindow, ::com::sun::star::awt::grid::XGridControl,
+class SVTXGridControl : public ::cppu::ImplInheritanceHelper3< VCLXWindow, ::com::sun::star::awt::grid::XGridControl, 
                                  ::com::sun::star::awt::grid::XGridDataListener, ::com::sun::star::awt::grid::XGridColumnListener>
 {
 private:
@@ -63,9 +63,9 @@ private:
     SelectionListenerMultiplexer m_aSelectionListeners;
 
 protected:
-    virtual void    ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent );
+    virtual void	ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent );
     void            ImplCallItemListeners();
-
+            
 public:
         SVTXGridControl();
     ~SVTXGridControl();
@@ -76,16 +76,16 @@ public:
 
     //XGridColumnListener overridables
     virtual void SAL_CALL columnChanged(const ::com::sun::star::awt::grid::GridColumnEvent & Event) throw (::com::sun::star::uno::RuntimeException);
-
+    
     virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw(::com::sun::star::uno::RuntimeException);
 
-    ::com::sun::star::uno::Any      SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException);
-    void                    SAL_CALL acquire() throw()  { VCLXWindow::acquire(); }
-    void                    SAL_CALL release() throw()  { VCLXWindow::release(); }
+    ::com::sun::star::uno::Any		SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException);
+    void					SAL_CALL acquire() throw()	{ VCLXWindow::acquire(); }
+    void					SAL_CALL release() throw()	{ VCLXWindow::release(); }
 
     // ::com::sun::star::lang::XTypeProvider
-    ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type >  SAL_CALL getTypes() throw(::com::sun::star::uno::RuntimeException);
-    ::com::sun::star::uno::Sequence< sal_Int8 >                     SAL_CALL getImplementationId() throw(::com::sun::star::uno::RuntimeException);
+    ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type >	SAL_CALL getTypes() throw(::com::sun::star::uno::RuntimeException);
+    ::com::sun::star::uno::Sequence< sal_Int8 >						SAL_CALL getImplementationId() throw(::com::sun::star::uno::RuntimeException);
 
     //::com::sun::star::awt::grid::XGridControl
     virtual ::sal_Int32 SAL_CALL getMinSelectionIndex() throw (::com::sun::star::uno::RuntimeException);
@@ -102,8 +102,8 @@ public:
     virtual void SAL_CALL selectColumn(::sal_Int32 x) throw (::com::sun::star::uno::RuntimeException);
     virtual void SAL_CALL addSelectionListener(const ::com::sun::star::uno::Reference< ::com::sun::star::awt::grid::XGridSelectionListener > & listener) throw (::com::sun::star::uno::RuntimeException);
     virtual void SAL_CALL removeSelectionListener(const ::com::sun::star::uno::Reference< ::com::sun::star::awt::grid::XGridSelectionListener > & listener) throw (::com::sun::star::uno::RuntimeException);
-    virtual ::sal_Int32 SAL_CALL getItemIndexAtPoint(::sal_Int32 x, ::sal_Int32 y) throw (::com::sun::star::uno::RuntimeException);
-    virtual void SAL_CALL setToolTip(const ::com::sun::star::uno::Sequence< ::rtl::OUString >& text, const ::com::sun::star::uno::Sequence< sal_Int32 >& columns) throw (::com::sun::star::uno::RuntimeException);
+    virtual ::sal_Int32 SAL_CALL getItemIndexAtPoint(::sal_Int32 x, ::sal_Int32 y) throw (::com::sun::star::uno::RuntimeException);	
+    virtual void SAL_CALL setToolTip(const ::com::sun::star::uno::Sequence< ::rtl::OUString >& text, const ::com::sun::star::uno::Sequence< sal_Int32 >& columns) throw (::com::sun::star::uno::RuntimeException);	
 
     void SAL_CALL setProperty( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Any& Value ) throw(::com::sun::star::uno::RuntimeException);
     ::com::sun::star::uno::Any SAL_CALL getProperty( const ::rtl::OUString& PropertyName ) throw(::com::sun::star::uno::RuntimeException);
diff --git a/svtools/source/uno/toolboxcontroller.cxx b/svtools/source/uno/toolboxcontroller.cxx
index 92ae93f5080d..67f3028ae6aa 100644
--- a/svtools/source/uno/toolboxcontroller.cxx
+++ b/svtools/source/uno/toolboxcontroller.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
@@ -42,7 +42,7 @@
 #include <toolkit/unohlp.hxx>
 #endif
 #include <vcl/toolbox.hxx>
-//shizhobo
+//shizhobo 
 #include <com/sun/star/beans/PropertyAttribute.hpp>
 const int TOOLBARCONTROLLER_PROPHANDLE_SUPPORTSVISIABLE  = 1;
 const int TOOLBARCONTROLLER_PROPCOUNT               = 1;
@@ -88,15 +88,15 @@ struct ToolboxController_Impl
 };
 
 ToolboxController::ToolboxController(
-
+    
     const Reference< XMultiServiceFactory >& rServiceManager,
     const Reference< XFrame >& xFrame,
     const ::rtl::OUString& aCommandURL ) :
     OPropertyContainer(GetBroadcastHelper())
-    ,   OWeakObject()
+    ,	OWeakObject()
     ,   m_bInitialized( sal_False )
     ,   m_bDisposed( sal_False )
-    ,   m_xFrame(xFrame)
+    ,	m_xFrame(xFrame)
     ,   m_xServiceManager( rServiceManager )
     ,   m_aCommandURL( aCommandURL )
     ,   m_aListenerContainer( m_aMutex )
@@ -120,7 +120,7 @@ ToolboxController::ToolboxController(
 
 ToolboxController::ToolboxController() :
     OPropertyContainer(GetBroadcastHelper())
-    ,   OWeakObject()
+    ,	OWeakObject()
     ,   m_bInitialized( sal_False )
     ,   m_bDisposed( sal_False )
     ,   m_aListenerContainer( m_aMutex )
@@ -191,7 +191,7 @@ throw ( RuntimeException )
             ,static_cast<XMultiPropertySet*>(this)
             ,static_cast<XFastPropertySet*>(this));
         if (!a.hasValue())
-            return OWeakObject::queryInterface( rType );
+            return OWeakObject::queryInterface( rType );	
     }
     return a;
 }
@@ -210,7 +210,7 @@ void SAL_CALL ToolboxController::initialize( const Sequence< Any >& aArguments )
 throw ( Exception, RuntimeException )
 {
     bool bInitialized( true );
-
+    
     {
         vos::OGuard aSolarMutexGuard( Application::GetSolarMutex() );
 
@@ -224,7 +224,7 @@ throw ( Exception, RuntimeException )
     {
         vos::OGuard aSolarMutexGuard( Application::GetSolarMutex() );
         m_bInitialized = sal_True;
-        //shizhoubo add
+        //shizhoubo add 
         m_bSupportVisiable = sal_False;
         PropertyValue aPropValue;
         for ( int i = 0; i < aArguments.getLength(); i++ )
@@ -262,13 +262,13 @@ throw ( Exception, RuntimeException )
 
 void SAL_CALL ToolboxController::update()
 throw ( RuntimeException )
-{
+{ 
     {
         vos::OGuard aSolarMutexGuard( Application::GetSolarMutex() );
         if ( m_bDisposed )
             throw DisposedException();
     }
-
+   
     // Bind all registered listeners to their dispatch objects
     bindListener();
 }
@@ -756,7 +756,7 @@ void ToolboxController::dispatchCommand( const OUString& sCommandURL, const Sequ
     try
     {
         Reference< XDispatchProvider > xDispatchProvider( m_xFrame, UNO_QUERY_THROW );
-        URL aURL;
+        URL aURL;       
         aURL.Complete = sCommandURL;
         getURLTransformer()->parseStrict( aURL );
 
@@ -827,7 +827,7 @@ throw( com::sun::star::uno::Exception)
 {
     OPropertyContainer::setFastPropertyValue_NoBroadcast(nHandle, aValue);
     if (TOOLBARCONTROLLER_PROPHANDLE_SUPPORTSVISIABLE == nHandle)
-    {
+    {   
         sal_Bool rValue(sal_False);
         if (( aValue >>= rValue ) && m_bInitialized)
             this->setSupportVisiableProperty( rValue );
diff --git a/svtools/source/uno/treecontrolpeer.cxx b/svtools/source/uno/treecontrolpeer.cxx
index 7fb1a007960f..efe581ed6db0 100644
--- a/svtools/source/uno/treecontrolpeer.cxx
+++ b/svtools/source/uno/treecontrolpeer.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
@@ -108,10 +108,10 @@ public:
 
     sal_uInt32 insert( SvLBoxEntry* pEntry,SvLBoxEntry* pParent,ULONG nPos=LIST_APPEND );
 
-    virtual void    RequestingChilds( SvLBoxEntry* pParent );
+    virtual void	RequestingChilds( SvLBoxEntry* pParent );
 
-    virtual BOOL    EditingEntry( SvLBoxEntry* pEntry, Selection& );
-    virtual BOOL    EditedEntry( SvLBoxEntry* pEntry, const XubString& rNewText );
+    virtual BOOL	EditingEntry( SvLBoxEntry* pEntry, Selection& );
+    virtual BOOL	EditedEntry( SvLBoxEntry* pEntry, const XubString& rNewText );
 
     DECL_LINK( OnSelectionChangeHdl, UnoTreeListBoxImpl* );
     DECL_LINK( OnExpandingHdl, UnoTreeListBoxImpl* );
@@ -128,23 +128,23 @@ class SVT_DLLPUBLIC UnoTreeListItem : public SvLBoxItem
 public:
                     UnoTreeListItem( SvLBoxEntry* );
                     UnoTreeListItem();
-    virtual         ~UnoTreeListItem();
-    virtual USHORT  IsA();
-    void            InitViewData( SvLBox*,SvLBoxEntry*,SvViewDataItem* );
-    OUString        GetText() const;
-    void            SetText( const OUString& rText );
-    Image           GetImage() const;
-    void            SetImage( const Image& rImage );
-    OUString        GetGraphicURL() const;
-    void            SetGraphicURL( const OUString& rGraphicURL );
-    void            Paint( const Point&, SvLBox& rDev, USHORT nFlags,SvLBoxEntry* );
-    SvLBoxItem*     Create() const;
-    void            Clone( SvLBoxItem* pSource );
+    virtual			~UnoTreeListItem();
+    virtual USHORT	IsA();
+    void			InitViewData( SvLBox*,SvLBoxEntry*,SvViewDataItem* );
+    OUString		GetText() const;
+    void 			SetText( const OUString& rText );
+    Image			GetImage() const;
+    void			SetImage( const Image& rImage );
+    OUString		GetGraphicURL() const;
+    void			SetGraphicURL( const OUString& rGraphicURL );
+    void			Paint( const Point&, SvLBox& rDev, USHORT nFlags,SvLBoxEntry* );
+    SvLBoxItem* 	Create() const;
+    void 			Clone( SvLBoxItem* pSource );
 
 private:
-    OUString        maText;
-    OUString        maGraphicURL;
-    Image           maImage;
+    OUString		maText;
+    OUString		maGraphicURL;
+    Image			maImage;
 };
 
 // --------------------------------------------------------------------
@@ -338,7 +338,7 @@ bool TreeControlPeer::updateEntry( UnoTreeListEntry* pEntry )
             if( pContextGraphicItem->msExpandedGraphicURL != pEntry->mxNode->getExpandedGraphicURL() )
             {
                 Image aImage;
-                if( loadImage( pEntry->mxNode->getExpandedGraphicURL(), aImage ) )
+                if(	loadImage( pEntry->mxNode->getExpandedGraphicURL(), aImage ) )
                 {
                     pContextGraphicItem->msExpandedGraphicURL = pEntry->mxNode->getExpandedGraphicURL();
                     mpTreeImpl->SetExpandedEntryBmp( pEntry, aImage );
@@ -348,7 +348,7 @@ bool TreeControlPeer::updateEntry( UnoTreeListEntry* pEntry )
             if( pContextGraphicItem->msCollapsedGraphicURL != pEntry->mxNode->getCollapsedGraphicURL() )
             {
                 Image aImage;
-                if( loadImage( pEntry->mxNode->getCollapsedGraphicURL(), aImage ) )
+                if(	loadImage( pEntry->mxNode->getCollapsedGraphicURL(), aImage ) )
                 {
                     pContextGraphicItem->msCollapsedGraphicURL = pEntry->mxNode->getCollapsedGraphicURL();
                     mpTreeImpl->SetCollapsedEntryBmp( pEntry, aImage );
@@ -681,7 +681,7 @@ Reference< XEnumeration > SAL_CALL TreeControlPeer::createSelectionEnumeration()
     ::vos::OGuard aGuard( GetMutex() );
 
     UnoTreeListBoxImpl& rTree = getTreeListBoxOrThrow();
-
+    
     sal_uInt32 nSelectionCount = rTree.GetSelectionCount();
     std::list< Any > aSelection( nSelectionCount );
 
@@ -705,7 +705,7 @@ Reference< XEnumeration > SAL_CALL TreeControlPeer::createReverseSelectionEnumer
     ::vos::OGuard aGuard( GetMutex() );
 
     UnoTreeListBoxImpl& rTree = getTreeListBoxOrThrow();
-
+    
     sal_uInt32 nSelectionCount = rTree.GetSelectionCount();
     std::list< Any > aSelection;
 
@@ -1105,7 +1105,7 @@ void TreeControlPeer::updateNode( UnoTreeListBoxImpl& rTree, const Reference< XT
             Reference< XTreeNode > xParentNode( xNode->getParent() );
             UnoTreeListEntry* pParentEntry = 0;
             ULONG nChild = LIST_APPEND;
-
+            
             if( xParentNode.is() )
             {
                 pParentEntry = getEntry( xParentNode  );
@@ -1322,6 +1322,21 @@ void TreeControlPeer::setProperty( const ::rtl::OUString& PropertyName, const An
 
     switch( GetPropertyId( PropertyName ) )
     {
+        case BASEPROPERTY_HIDEINACTIVESELECTION:
+        {
+            sal_Bool bEnabled = sal_False;
+            if ( aValue >>= bEnabled )
+            {
+                WinBits nStyle = rTree.GetWindowBits();
+                if ( bEnabled )
+                    nStyle |= WB_HIDESELECTION;
+                else
+                    nStyle &= ~WB_HIDESELECTION;
+                rTree.SetWindowBits( nStyle );
+            }
+        }
+        break;
+
         case BASEPROPERTY_TREE_SELECTIONTYPE:
         {
             SelectionType eSelectionType;
@@ -1330,11 +1345,11 @@ void TreeControlPeer::setProperty( const ::rtl::OUString& PropertyName, const An
                 SelectionMode eSelMode;
                 switch( eSelectionType )
                 {
-                case SelectionType_SINGLE:  eSelMode = SINGLE_SELECTION; break;
-                case SelectionType_RANGE:   eSelMode = RANGE_SELECTION; break;
-                case SelectionType_MULTI:   eSelMode = MULTIPLE_SELECTION; break;
-    //          case SelectionType_NONE:
-                default:                    eSelMode = NO_SELECTION; break;
+                case SelectionType_SINGLE:	eSelMode = SINGLE_SELECTION; break;
+                case SelectionType_RANGE:	eSelMode = RANGE_SELECTION; break;
+                case SelectionType_MULTI:	eSelMode = MULTIPLE_SELECTION; break;
+    //			case SelectionType_NONE:		
+                default:					eSelMode = NO_SELECTION; break;
                 }
                 if( rTree.GetSelectionMode() != eSelMode )
                     rTree.SetSelectionMode( eSelMode );
@@ -1342,7 +1357,7 @@ void TreeControlPeer::setProperty( const ::rtl::OUString& PropertyName, const An
             break;
         }
 
-        case BASEPROPERTY_TREE_DATAMODEL:
+        case BASEPROPERTY_TREE_DATAMODEL:			
             onChangeDataModel( rTree, Reference< XTreeDataModel >( aValue, UNO_QUERY ) );
             break;
         case BASEPROPERTY_TREE_ROWHEIGHT:
@@ -1412,6 +1427,9 @@ Any TreeControlPeer::getProperty( const ::rtl::OUString& PropertyName ) throw(Ru
         UnoTreeListBoxImpl& rTree = getTreeListBoxOrThrow();
         switch(nPropId)
         {
+        case BASEPROPERTY_HIDEINACTIVESELECTION:
+            return Any( ( rTree.GetWindowBits() & WB_HIDESELECTION ) != 0 ? sal_True : sal_False );
+
         case BASEPROPERTY_TREE_SELECTIONTYPE:
         {
             SelectionType eSelectionType;
@@ -1419,11 +1437,11 @@ Any TreeControlPeer::getProperty( const ::rtl::OUString& PropertyName ) throw(Ru
             SelectionMode eSelMode = rTree.GetSelectionMode();
             switch( eSelMode )
             {
-            case SINGLE_SELECTION:  eSelectionType = SelectionType_SINGLE; break;
-            case RANGE_SELECTION:   eSelectionType = SelectionType_RANGE; break;
+            case SINGLE_SELECTION:	eSelectionType = SelectionType_SINGLE; break;
+            case RANGE_SELECTION:	eSelectionType = SelectionType_RANGE; break;
             case MULTIPLE_SELECTION:eSelectionType = SelectionType_MULTI; break;
-//          case NO_SELECTION:
-            default:                eSelectionType = SelectionType_NONE; break;
+//			case NO_SELECTION:		
+            default:				eSelectionType = SelectionType_NONE; break;
             }
             return Any( eSelectionType );
         }
diff --git a/svtools/source/uno/treecontrolpeer.hxx b/svtools/source/uno/treecontrolpeer.hxx
index 336830804a6f..1b325d402f21 100644
--- a/svtools/source/uno/treecontrolpeer.hxx
+++ b/svtools/source/uno/treecontrolpeer.hxx
@@ -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
@@ -46,10 +46,10 @@ class TreeControlPeer;
 class UnoTreeListBoxImpl;
 class TreeNodeMap;
 
-//  ----------------------------------------------------
-//  class TreeControlPeer
-//  ----------------------------------------------------
-class TreeControlPeer : public ::cppu::ImplInheritanceHelper2< VCLXWindow, ::com::sun::star::awt::tree::XTreeControl, ::com::sun::star::awt::tree::XTreeDataModelListener >
+//	----------------------------------------------------
+//	class TreeControlPeer
+//	----------------------------------------------------
+class TreeControlPeer :	public ::cppu::ImplInheritanceHelper2< VCLXWindow, ::com::sun::star::awt::tree::XTreeControl, ::com::sun::star::awt::tree::XTreeDataModelListener >
 {
     friend class UnoTreeListBoxImpl;
     friend class UnoTreeListEntry;
diff --git a/svtools/source/uno/unocontroltablemodel.cxx b/svtools/source/uno/unocontroltablemodel.cxx
index d239ee3c740d..7ba74644be6a 100644
--- a/svtools/source/uno/unocontroltablemodel.cxx
+++ b/svtools/source/uno/unocontroltablemodel.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
@@ -49,8 +49,8 @@ using namespace ::com::sun::star::uno;
         :m_nID( 0 )
         ,m_sName()
         ,m_bIsResizable( true )
-        ,m_nWidth( 4  )
-        ,m_nMinWidth( 0 )
+        ,m_nWidth( 4  )    
+        ,m_nMinWidth( 0 ) 
         ,m_nMaxWidth( 0 )
     ,m_nPrefWidth ( 0 )
     ,m_xHorizontalAlign(com::sun::star::style::HorizontalAlignment(0))
@@ -62,9 +62,9 @@ using namespace ::com::sun::star::uno;
         :m_nID( 0 )
         ,m_sName()
         ,m_bIsResizable( true )
-        ,m_nWidth( 4  )
+        ,m_nWidth( 4  )    
         ,m_nMinWidth( 0 )
-        ,m_nMaxWidth( 0 )
+        ,m_nMaxWidth( 0 )  
     ,m_nPrefWidth ( 0 )
     ,m_xHorizontalAlign(com::sun::star::style::HorizontalAlignment(0))
     {
@@ -75,67 +75,67 @@ using namespace ::com::sun::star::uno;
     {
         return m_nID;
     }
-
+    
     //--------------------------------------------------------------------
     bool UnoControlTableColumn::setID( const ColumnID _nID )
     {
         m_nID = _nID;
         return true;
     }
-
+    
     //--------------------------------------------------------------------
     String UnoControlTableColumn::getName() const
     {
         return m_sName;
     }
-
+    
     //--------------------------------------------------------------------
     void UnoControlTableColumn::setName( const String& _rName )
     {
         m_sName = _rName;
-    }
+    }    
     //--------------------------------------------------------------------
     bool UnoControlTableColumn::isResizable() const
     {
         return m_bIsResizable;
     }
-
+    
     //--------------------------------------------------------------------
     void UnoControlTableColumn::setResizable( bool _bResizable )
     {
         m_bIsResizable = _bResizable;
     }
-
+    
     //--------------------------------------------------------------------
     TableMetrics UnoControlTableColumn::getWidth() const
     {
         return m_nWidth;
     }
-
+    
     //--------------------------------------------------------------------
     void UnoControlTableColumn::setWidth( TableMetrics _nWidth )
     {
         m_nWidth = _nWidth;
     }
-
+    
     //--------------------------------------------------------------------
     TableMetrics UnoControlTableColumn::getMinWidth() const
     {
         return m_nMinWidth;
     }
-
+    
     //--------------------------------------------------------------------
     void UnoControlTableColumn::setMinWidth( TableMetrics _nMinWidth )
     {
         m_nMinWidth = _nMinWidth;
     }
-
+    
     //--------------------------------------------------------------------
     TableMetrics UnoControlTableColumn::getMaxWidth() const
     {
         return m_nMaxWidth;
     }
-
+    
     //--------------------------------------------------------------------
     void UnoControlTableColumn::setMaxWidth( TableMetrics _nMaxWidth )
     {
@@ -146,7 +146,7 @@ using namespace ::com::sun::star::uno;
     {
         return m_nPrefWidth;
     }
-
+    
     //--------------------------------------------------------------------
     void UnoControlTableColumn::setPreferredWidth( TableMetrics _nPrefWidth )
     {
@@ -157,7 +157,7 @@ using namespace ::com::sun::star::uno;
     {
         return m_xHorizontalAlign;
     }
-
+    
     //--------------------------------------------------------------------
     void UnoControlTableColumn::setHorizontalAlign( com::sun::star::style::HorizontalAlignment _align )
     {
@@ -173,15 +173,15 @@ using namespace ::com::sun::star::uno;
         TableSize                       nRowCount;
         bool                            bHasColumnHeaders;
         bool                            bHasRowHeaders;
-    bool                            bVScroll;
-    bool                            bHScroll;
+    bool							bVScroll;
+    bool							bHScroll;
         PTableRenderer                  pRenderer;
         PTableInputHandler              pInputHandler;
         TableMetrics                    nRowHeight;
         TableMetrics                    nColumnHeaderHeight;
         TableMetrics                    nRowHeaderWidth;
-    std::vector<rtl::OUString>      aRowHeadersTitle;
-    std::vector<std::vector< Any > >    aCellContent;
+    std::vector<rtl::OUString>		aRowHeadersTitle;
+    std::vector<std::vector< Any > >	aCellContent;
     ::com::sun::star::util::Color m_xLineColor;
     ::com::sun::star::util::Color m_xHeaderColor;
     ::com::sun::star::util::Color m_xTextColor;
@@ -190,25 +190,25 @@ using namespace ::com::sun::star::uno;
     ::com::sun::star::style::VerticalAlignment m_xVerticalAlign;
 
         UnoControlTableModel_Impl()
-            :aColumns       ( )
+            :aColumns		( )
         ,nRowCount          ( 0         )
             ,bHasColumnHeaders  ( false     )
             ,bHasRowHeaders     ( false     )
-        ,bVScroll       ( false     )
-            ,bHScroll       ( false     )
+        ,bVScroll		( false     )
+            ,bHScroll		( false     )
             ,pRenderer          (           )
             ,pInputHandler      (           )
-            ,nRowHeight         ( 0 )
-            ,nColumnHeaderHeight( 0 )
-            ,nRowHeaderWidth    ( 10 )
+            ,nRowHeight         ( 0 )  
+            ,nColumnHeaderHeight( 0 )  
+            ,nRowHeaderWidth    ( 10 )   
         ,aRowHeadersTitle   ( )
-        ,aCellContent   ( )
-        ,m_xLineColor   ( 0xFFFFFF )
-        ,m_xHeaderColor ( 0xFFFFFF )
-        ,m_xTextColor   ( 0 )//black as default
-        ,m_xRowColor1   ( 0xFFFFFF )
-        ,m_xRowColor2   ( 0xFFFFFF )
-        ,m_xVerticalAlign   (com::sun::star::style::VerticalAlignment(0))
+        ,aCellContent	( )
+        ,m_xLineColor	( 0xFFFFFF )	
+        ,m_xHeaderColor	( 0xFFFFFF )
+        ,m_xTextColor	( 0 )//black as default
+        ,m_xRowColor1	( 0xFFFFFF )
+        ,m_xRowColor2	( 0xFFFFFF )
+        ,m_xVerticalAlign	(com::sun::star::style::VerticalAlignment(0))
         {
         }
     };
@@ -234,7 +234,7 @@ using namespace ::com::sun::star::uno;
 
     //--------------------------------------------------------------------
     TableSize UnoControlTableModel::getColumnCount() const
-    {
+    { 
         return (TableSize)m_pImpl->aColumns.size();
     }
 
@@ -255,7 +255,7 @@ using namespace ::com::sun::star::uno;
     {
         return m_pImpl->bHasRowHeaders;
     }
-
+    
     //--------------------------------------------------------------------
     void UnoControlTableModel::setRowHeaders(bool _bRowHeaders)
     {
@@ -266,7 +266,7 @@ using namespace ::com::sun::star::uno;
     {
         m_pImpl->bHasColumnHeaders = _bColumnHeaders;
     }
-
+    
     void UnoControlTableModel::setColumnCount(TableSize _nColCount)
     {
        m_pImpl->aColumns.resize( _nColCount);
@@ -449,7 +449,7 @@ using namespace ::com::sun::star::uno;
     {
         return  m_pImpl->m_xLineColor;
     }
-
+    
     //--------------------------------------------------------------------
     void UnoControlTableModel::setLineColor( ::com::sun::star::util::Color _rColor )
     {
@@ -460,7 +460,7 @@ using namespace ::com::sun::star::uno;
     {
         return  m_pImpl->m_xHeaderColor;
     }
-
+    
     //--------------------------------------------------------------------
     void UnoControlTableModel::setHeaderBackgroundColor( ::com::sun::star::util::Color _rColor )
     {
@@ -471,7 +471,7 @@ using namespace ::com::sun::star::uno;
     {
         return  m_pImpl->m_xTextColor;
     }
-
+    
     //--------------------------------------------------------------------
     void UnoControlTableModel::setTextColor( ::com::sun::star::util::Color _rColor )
     {
@@ -482,7 +482,7 @@ using namespace ::com::sun::star::uno;
     {
         return  m_pImpl->m_xRowColor1;
     }
-
+    
     //--------------------------------------------------------------------
     void UnoControlTableModel::setOddRowBackgroundColor( ::com::sun::star::util::Color _rColor )
     {
@@ -493,7 +493,7 @@ using namespace ::com::sun::star::uno;
     {
         return  m_pImpl->m_xRowColor2;
     }
-
+    
     //--------------------------------------------------------------------
     void UnoControlTableModel::setEvenRowBackgroundColor( ::com::sun::star::util::Color _rColor )
     {
@@ -504,7 +504,7 @@ using namespace ::com::sun::star::uno;
     {
         return  m_pImpl->m_xVerticalAlign;
     }
-
+    
     //--------------------------------------------------------------------
     void UnoControlTableModel::setVerticalAlign( com::sun::star::style::VerticalAlignment _xAlign )
     {
diff --git a/svtools/source/uno/unocontroltablemodel.hxx b/svtools/source/uno/unocontroltablemodel.hxx
index c00642448f79..d22de8031f7d 100644
--- a/svtools/source/uno/unocontroltablemodel.hxx
+++ b/svtools/source/uno/unocontroltablemodel.hxx
@@ -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
@@ -124,8 +124,8 @@ class UnoControlTableModel : public ITableModel
         // ITableModel overridables
         virtual TableSize           getColumnCount() const;
         virtual TableSize           getRowCount() const;
-    virtual void                setColumnCount(TableSize _nColCount);
-        virtual void                setRowCount(TableSize _nRowCount);
+    virtual void	            setColumnCount(TableSize _nColCount);
+        virtual void	            setRowCount(TableSize _nRowCount);
         virtual bool                hasColumnHeaders() const;
         virtual bool                hasRowHeaders() const;
     virtual void                setRowHeaders(bool _bRowHeaders);
@@ -143,26 +143,26 @@ class UnoControlTableModel : public ITableModel
         virtual TableMetrics        getRowHeaderWidth() const;
         virtual ScrollbarVisibility getVerticalScrollbarVisibility(int overAllHeight, int actHeight) const;
         virtual ScrollbarVisibility getHorizontalScrollbarVisibility(int overAllWidth, int actWidth) const;
-    virtual void                setVerticalScrollbarVisibility(bool _bVScroll) const;
-        virtual void                setHorizontalScrollbarVisibility(bool _bHScroll) const;
-    virtual void                setCellContent(const std::vector<std::vector< Any > >& cellContent);
-    virtual std::vector<std::vector< Any > >&   getCellContent();
-    virtual void                setRowHeaderName(const std::vector<rtl::OUString>& cellColumnContent);
-    virtual std::vector<rtl::OUString>& getRowHeaderName();
+    virtual void				setVerticalScrollbarVisibility(bool _bVScroll) const;
+        virtual void				setHorizontalScrollbarVisibility(bool _bHScroll) const;
+    virtual void				setCellContent(const std::vector<std::vector< Any > >& cellContent);
+    virtual std::vector<std::vector< Any > >&	getCellContent();
+    virtual void				setRowHeaderName(const std::vector<rtl::OUString>& cellColumnContent);
+    virtual std::vector<rtl::OUString>&	getRowHeaderName();
     virtual ::com::sun::star::util::Color getLineColor();
-    virtual void                setLineColor(::com::sun::star::util::Color _rColor);
+    virtual void				setLineColor(::com::sun::star::util::Color _rColor);
     virtual ::com::sun::star::util::Color getHeaderBackgroundColor();
-    virtual void                setHeaderBackgroundColor(::com::sun::star::util::Color _rColor);
+    virtual void			    setHeaderBackgroundColor(::com::sun::star::util::Color _rColor);
     virtual ::com::sun::star::util::Color getTextColor();
-    virtual void                setTextColor(::com::sun::star::util::Color _rColor);
+    virtual void				setTextColor(::com::sun::star::util::Color _rColor);
     virtual ::com::sun::star::util::Color getOddRowBackgroundColor();
-    virtual void                setOddRowBackgroundColor(::com::sun::star::util::Color _rColor);
+    virtual void			    setOddRowBackgroundColor(::com::sun::star::util::Color _rColor);
     virtual ::com::sun::star::util::Color getEvenRowBackgroundColor();
-    virtual void                setEvenRowBackgroundColor(::com::sun::star::util::Color _rColor);
+    virtual void			    setEvenRowBackgroundColor(::com::sun::star::util::Color _rColor);
     virtual ::com::sun::star::style::VerticalAlignment getVerticalAlign();
-    virtual void                setVerticalAlign(::com::sun::star::style::VerticalAlignment _rAlign);
-    virtual bool                hasVerticalScrollbar();
-    virtual bool                hasHorizontalScrollbar();
+    virtual void			    setVerticalAlign(::com::sun::star::style::VerticalAlignment _rAlign);
+    virtual bool				hasVerticalScrollbar();
+    virtual bool				hasHorizontalScrollbar();
 };
 
 inline void UnoControlTableModel::SetColumnWidth( ColPos _nColumn, TableMetrics _nWidth100thMM )
diff --git a/svtools/source/uno/unoevent.cxx b/svtools/source/uno/unoevent.cxx
index 526cdbb5d03a..15b90b9dc89b 100644
--- a/svtools/source/uno/unoevent.cxx
+++ b/svtools/source/uno/unoevent.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
@@ -217,7 +217,7 @@ sal_uInt16 SvBaseEventDescriptor::getMacroID(const OUString& rName) const
 void SvBaseEventDescriptor::getAnyFromMacro(Any& rAny,
                                        const SvxMacro& rMacro)
 {
-    sal_Bool bRetValueOK = sal_False;   // do we have a ret value?
+    sal_Bool bRetValueOK = sal_False;	// do we have a ret value?
 
     if (rMacro.HasMacro())
     {
@@ -257,7 +257,7 @@ void SvBaseEventDescriptor::getAnyFromMacro(Any& rAny,
                 break;
             }
             case EXTENDED_STYPE:
-            {
+            {   
                 // create sequence
                 Sequence<PropertyValue> aSequence(2);
                 Any aTmp;
@@ -318,7 +318,7 @@ void SvBaseEventDescriptor::getMacroFromAny(
 
     // process ...
     sal_Bool bTypeOK = sal_False;
-    sal_Bool bNone = sal_False;     // true if EventType=="None"
+    sal_Bool bNone = sal_False;		// true if EventType=="None"
     enum ScriptType eType = EXTENDED_STYPE;
     OUString sScriptVal;
     OUString sMacroVal;
@@ -383,7 +383,7 @@ void SvBaseEventDescriptor::getMacroFromAny(
                 SvxMacro aMacro(sMacroVal, sLibVal, eType);
                 rMacro = aMacro;
             }
-            else if (eType == EXTENDED_STYPE)
+            else if (eType == EXTENDED_STYPE) 
             {
                 SvxMacro aMacro(sScriptVal, sScript);
                 rMacro = aMacro;
@@ -425,13 +425,13 @@ SvEventDescriptor::~SvEventDescriptor()
     // automatically release xParentRef !
 }
 
-void SvEventDescriptor::replaceByName(
+void SvEventDescriptor::replaceByName( 
     const sal_uInt16 nEvent,
     const SvxMacro& rMacro)
         throw(
-            IllegalArgumentException,
-            NoSuchElementException,
-            WrappedTargetException,
+            IllegalArgumentException, 
+            NoSuchElementException, 
+            WrappedTargetException, 
             RuntimeException)
 {
     SvxMacroItem aItem(getMacroItemWhich());
@@ -440,12 +440,12 @@ void SvEventDescriptor::replaceByName(
     setMacroItem(aItem);
 }
 
-void SvEventDescriptor::getByName(
+void SvEventDescriptor::getByName( 
     SvxMacro& rMacro,
     const sal_uInt16 nEvent )
         throw(
-            NoSuchElementException,
-            WrappedTargetException,
+            NoSuchElementException, 
+            WrappedTargetException, 
             RuntimeException)
 {
     const SvxMacroItem& rItem = getMacroItem();
@@ -466,7 +466,7 @@ void SvEventDescriptor::getByName(
 //
 
 SvDetachedEventDescriptor::SvDetachedEventDescriptor(
-    const SvEventDescription* pSupportedMacroItems) :
+    const SvEventDescription* pSupportedMacroItems) : 
     SvBaseEventDescriptor(pSupportedMacroItems),
     sImplName(RTL_CONSTASCII_USTRINGPARAM(sAPI_SvDetachedEventDescriptor))
 {
@@ -496,7 +496,7 @@ sal_Int16 SvDetachedEventDescriptor::getIndex(const sal_uInt16 nID) const
 {
     // iterate over supported events
     sal_Int16 nIndex = 0;
-    while ( (mpSupportedMacroItems[nIndex].mnEvent != nID) &&
+    while ( (mpSupportedMacroItems[nIndex].mnEvent != nID) && 
             (mpSupportedMacroItems[nIndex].mnEvent != 0)      )
     {
         nIndex++;
@@ -504,20 +504,20 @@ sal_Int16 SvDetachedEventDescriptor::getIndex(const sal_uInt16 nID) const
     return (mpSupportedMacroItems[nIndex].mnEvent == nID) ? nIndex : -1;
 }
 
-OUString SvDetachedEventDescriptor::getImplementationName()
+OUString SvDetachedEventDescriptor::getImplementationName() 
     throw( ::com::sun::star::uno::RuntimeException )
 {
     return sImplName;
 }
 
 
-void SvDetachedEventDescriptor::replaceByName(
+void SvDetachedEventDescriptor::replaceByName( 
     const sal_uInt16 nEvent,
     const SvxMacro& rMacro)
     throw(
-        IllegalArgumentException,
-        NoSuchElementException,
-        WrappedTargetException,
+        IllegalArgumentException, 
+        NoSuchElementException, 
+        WrappedTargetException, 
         RuntimeException)
 {
     sal_Int16 nIndex = getIndex(nEvent);
@@ -529,12 +529,12 @@ void SvDetachedEventDescriptor::replaceByName(
 }
 
 
-void SvDetachedEventDescriptor::getByName(
+void SvDetachedEventDescriptor::getByName( 
     SvxMacro& rMacro,
     const sal_uInt16 nEvent )
     throw(
-        NoSuchElementException,
-        WrappedTargetException,
+        NoSuchElementException, 
+        WrappedTargetException, 
         RuntimeException)
 {
     sal_Int16 nIndex = getIndex(nEvent);
@@ -545,8 +545,8 @@ void SvDetachedEventDescriptor::getByName(
         rMacro = (*aMacros[nIndex]);
 }
 
-sal_Bool SvDetachedEventDescriptor::hasByName(
-    const sal_uInt16 nEvent ) const     /// item ID of event
+sal_Bool SvDetachedEventDescriptor::hasByName( 
+    const sal_uInt16 nEvent ) const		/// item ID of event
         throw(IllegalArgumentException)
 {
     sal_Int16 nIndex = getIndex(nEvent);
diff --git a/svtools/source/uno/unoiface.cxx b/svtools/source/uno/unoiface.cxx
index 2d22d9cedb33..7af97b90c18f 100644
--- a/svtools/source/uno/unoiface.cxx
+++ b/svtools/source/uno/unoiface.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
@@ -67,9 +67,9 @@ namespace
     }
 }
 
-//  ----------------------------------------------------
-//  help function for the toolkit...
-//  ----------------------------------------------------
+//	----------------------------------------------------
+//	help function for the toolkit...
+//	----------------------------------------------------
 
 extern "C" {
 
@@ -167,7 +167,7 @@ SAL_DLLPUBLIC_EXPORT Window* CreateWindow( VCLXWindow** ppNewComp, const ::com::
     else if ( aServiceName.EqualsIgnoreCaseAscii( "Grid" ) )
     {
         if ( pParent )
-        {
+        {	
             pWindow = new ::svt::table::TableControl(pParent, nWinBits);
             *ppNewComp = new SVTXGridControl;
         }
@@ -180,11 +180,11 @@ SAL_DLLPUBLIC_EXPORT Window* CreateWindow( VCLXWindow** ppNewComp, const ::com::
     return pWindow;
 }
 
-}   // extern "C"
+}	// extern "C"
 
-//  ----------------------------------------------------
-//  class VCLXMultiLineEdit
-//  ----------------------------------------------------
+//	----------------------------------------------------
+//	class VCLXMultiLineEdit
+//	----------------------------------------------------
 VCLXMultiLineEdit::VCLXMultiLineEdit()
     :maTextListeners( *this )
     ,meLineEndType( LINEEND_LF )    // default behavior before introducing this property: LF (unix-like)
@@ -545,9 +545,9 @@ void VCLXMultiLineEdit::ImplGetPropertyIds( std::list< sal_uInt16 > &rIds )
     VCLXWindow::ImplGetPropertyIds( rIds, true );
 
 }
-//  ----------------------------------------------------
-//  class VCLXFileControl
-//  ----------------------------------------------------
+//	----------------------------------------------------
+//	class VCLXFileControl
+//	----------------------------------------------------
 VCLXFileControl::VCLXFileControl() : maTextListeners( *this )
 {
 }
@@ -814,9 +814,9 @@ void VCLXFileControl::ImplGetPropertyIds( std::list< sal_uInt16 > &rIds )
 }
 
 
-//  ----------------------------------------------------
-//  class SVTXFormattedField
-//  ----------------------------------------------------
+//	----------------------------------------------------
+//	class SVTXFormattedField
+//	----------------------------------------------------
 // --------------------------------------------------------------------------------------
 SVTXFormattedField::SVTXFormattedField()
     :m_pCurrentSupplier(NULL)
@@ -914,7 +914,7 @@ void SVTXFormattedField::setProperty( const ::rtl::OUString& PropertyName, const
                     if (rTC != ::com::sun::star::uno::TypeClass_DOUBLE)
                         // no double
                         if (Value.hasValue())
-                        {   // but a value
+                        {	// but a value
                             // try if it is something converitble
                             sal_Int32 nValue = 0;
                             if (!(Value >>= nValue))
@@ -959,7 +959,7 @@ void SVTXFormattedField::setProperty( const ::rtl::OUString& PropertyName, const
         }
 
         if (BASEPROPERTY_TEXTCOLOR == nPropType)
-        {   // after setting a new text color, think again about the AutoColor flag of the control
+        {	// after setting a new text color, think again about the AutoColor flag of the control
             // 17.05.2001 - 86859 - frank.schoenheit@germany.sun.com
             pField->SetAutoColor(!Value.hasValue());
         }
@@ -1015,7 +1015,7 @@ void SVTXFormattedField::setProperty( const ::rtl::OUString& PropertyName, const
             case BASEPROPERTY_FORMATSSUPPLIER:
             {
                 if (!bIsStandardSupplier)
-                {   // ansonsten void
+                {	// ansonsten void
                     ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatsSupplier >  xSupplier = getFormatsSupplier();
                     aReturn <<= xSupplier;
                 }
@@ -1259,7 +1259,7 @@ void SVTXFormattedField::SetTreatAsNumber(sal_Bool bSet)
     }
     else
     {
-        if (pField->GetText().Len())    // empty wird erst mal standardmaessig als void nach draussen gereicht
+        if (pField->GetText().Len())	// empty wird erst mal standardmaessig als void nach draussen gereicht
             aReturn <<= pField->GetValue();
     }
 
@@ -1298,7 +1298,7 @@ void SVTXFormattedField::SetValue(const ::com::sun::star::uno::Any& rValue)
                 pField->SetTextValue(aStr);
         }
     }
-//  NotifyTextListeners();
+//	NotifyTextListeners();
 }
 
 // --------------------------------------------------------------------------------------
@@ -1328,7 +1328,7 @@ void SVTXFormattedField::setFormatsSupplier(const ::com::sun::star::uno::Referen
     }
 
     if (!pNew)
-        return;     // TODO : wie das behandeln ?
+        return;		// TODO : wie das behandeln ?
 
     if (m_pCurrentSupplier)
         m_pCurrentSupplier->release();
@@ -1365,7 +1365,7 @@ void SVTXFormattedField::setFormatKey(sal_Int32 nKey)
         if (pField->GetFormatter())
             pField->SetFormatKey(nKey);
         else
-        {   // Wahrscheinlich bin ich gerade in einem Block, in dem erst der Key und dann der Formatter gesetzt
+        {	// Wahrscheinlich bin ich gerade in einem Block, in dem erst der Key und dann der Formatter gesetzt
             // wird, das passiert initial mit ziemlicher Sicherheit, da die Properties in alphabetischer Reihenfolge
             // gesetzt werden, und der FormatsSupplier nun mal vor dem FormatKey kommt
             nKeyToSetDelayed = nKey;
@@ -1410,9 +1410,9 @@ void SVTXFormattedField::ImplGetPropertyIds( std::list< sal_uInt16 > &rIds )
 }
 
 
-//  ----------------------------------------------------
-//  class SVTXRoadmap
-//  ----------------------------------------------------
+//	----------------------------------------------------
+//	class SVTXRoadmap
+//	----------------------------------------------------
 
 using namespace svt;
 
@@ -1667,9 +1667,9 @@ void SVTXRoadmap::ImplGetPropertyIds( std::list< sal_uInt16 > &rIds )
     VCLXGraphicControl::ImplGetPropertyIds( rIds );
 }
 
-//  ----------------------------------------------------
-//  class SVTXNumericField
-//  ----------------------------------------------------
+//	----------------------------------------------------
+//	class SVTXNumericField
+//	----------------------------------------------------
 SVTXNumericField::SVTXNumericField()
 {
 }
@@ -1834,9 +1834,9 @@ void SVTXNumericField::ImplGetPropertyIds( std::list< sal_uInt16 > &rIds )
     SVTXFormattedField::ImplGetPropertyIds( rIds );
 }
 
-//  ----------------------------------------------------
-//  class SVTXCurrencyField
-//  ----------------------------------------------------
+//	----------------------------------------------------
+//	class SVTXCurrencyField
+//	----------------------------------------------------
 SVTXCurrencyField::SVTXCurrencyField()
 {
 }
@@ -2074,9 +2074,9 @@ void SVTXCurrencyField::ImplGetPropertyIds( std::list< sal_uInt16 > &rIds )
 }
 
 
-//  ----------------------------------------------------
-//  class VCLXProgressBar
-//  ----------------------------------------------------
+//	----------------------------------------------------
+//	class VCLXProgressBar
+//	----------------------------------------------------
 
 VCLXProgressBar::VCLXProgressBar()
             :m_nValue(0)
@@ -2322,9 +2322,9 @@ void VCLXProgressBar::ImplGetPropertyIds( std::list< sal_uInt16 > &rIds )
 }
 
 
-//  ----------------------------------------------------
-//  class SVTXDateField
-//  ----------------------------------------------------
+//	----------------------------------------------------
+//	class SVTXDateField
+//	----------------------------------------------------
 SVTXDateField::SVTXDateField()
     :VCLXDateField()
 {
diff --git a/svtools/source/uno/unoimap.cxx b/svtools/source/uno/unoimap.cxx
index 88f22f0c8402..fdc34f44f21f 100644
--- a/svtools/source/uno/unoimap.cxx
+++ b/svtools/source/uno/unoimap.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
@@ -163,8 +163,8 @@ PropertySetInfo* SvUnoImageMapObject::createPropertySetInfo( UINT16 nType )
                 { MAP_LEN( "Description" ), HANDLE_DESCRIPTION, &::getCppuType((const ::rtl::OUString*)0),     0, 0 },
                 { MAP_LEN( "Target" ),      HANDLE_TARGET,      &::getCppuType((const ::rtl::OUString*)0),     0, 0 },
                 { MAP_LEN( "Name" ),        HANDLE_NAME,        &::getCppuType((const ::rtl::OUString*)0),     0, 0 },
-                { MAP_LEN( "IsActive" ),    HANDLE_ISACTIVE,    &::getBooleanCppuType(),                0, 0 },
-                { MAP_LEN( "Polygon" ),     HANDLE_POLYGON,     SEQTYPE(::getCppuType((const PointSequence*)0)),    0, 0 },
+                { MAP_LEN( "IsActive" ),	HANDLE_ISACTIVE,	&::getBooleanCppuType(),				0, 0 },
+                { MAP_LEN( "Polygon" ),		HANDLE_POLYGON,		SEQTYPE(::getCppuType((const PointSequence*)0)),	0, 0 },
                 {0,0,0,0,0,0}
             };
 
@@ -179,9 +179,9 @@ PropertySetInfo* SvUnoImageMapObject::createPropertySetInfo( UINT16 nType )
                 { MAP_LEN( "Description" ), HANDLE_DESCRIPTION, &::getCppuType((const ::rtl::OUString*)0),     0, 0 },
                 { MAP_LEN( "Target" ),      HANDLE_TARGET,      &::getCppuType((const ::rtl::OUString*)0),     0, 0 },
                 { MAP_LEN( "Name" ),            HANDLE_NAME,        &::getCppuType((const ::rtl::OUString*)0),     0, 0 },
-                { MAP_LEN( "IsActive" ),        HANDLE_ISACTIVE,    &::getBooleanCppuType(),                0, 0 },
-                { MAP_LEN( "Center" ),      HANDLE_CENTER,      &::getCppuType((const awt::Point*)0),   0, 0 },
-                { MAP_LEN( "Radius" ),      HANDLE_RADIUS,      &::getCppuType((const sal_Int32*)0),    0, 0 },
+                { MAP_LEN( "IsActive" ),		HANDLE_ISACTIVE,	&::getBooleanCppuType(),				0, 0 },
+                { MAP_LEN( "Center" ),		HANDLE_CENTER,		&::getCppuType((const awt::Point*)0),	0, 0 },
+                { MAP_LEN( "Radius" ),		HANDLE_RADIUS,		&::getCppuType((const sal_Int32*)0),	0, 0 },
                 {0,0,0,0,0,0}
             };
 
@@ -197,8 +197,8 @@ PropertySetInfo* SvUnoImageMapObject::createPropertySetInfo( UINT16 nType )
                 { MAP_LEN( "Description" ), HANDLE_DESCRIPTION, &::getCppuType((const ::rtl::OUString*)0), 0, 0 },
                 { MAP_LEN( "Target" ),      HANDLE_TARGET,      &::getCppuType((const ::rtl::OUString*)0), 0, 0 },
                 { MAP_LEN( "Name" ),        HANDLE_NAME,        &::getCppuType((const ::rtl::OUString*)0), 0, 0 },
-                { MAP_LEN( "IsActive" ),    HANDLE_ISACTIVE,    &::getBooleanCppuType(),            0, 0 },
-                { MAP_LEN( "Boundary" ),    HANDLE_BOUNDARY,    &::getCppuType((const awt::Rectangle*)0),   0, 0 },
+                { MAP_LEN( "IsActive" ),	HANDLE_ISACTIVE,	&::getBooleanCppuType(),			0, 0 },
+                { MAP_LEN( "Boundary" ),	HANDLE_BOUNDARY,	&::getCppuType((const awt::Rectangle*)0),	0, 0 },
                 {0,0,0,0,0,0}
             };
 
@@ -208,7 +208,7 @@ PropertySetInfo* SvUnoImageMapObject::createPropertySetInfo( UINT16 nType )
 }
 
 SvUnoImageMapObject::SvUnoImageMapObject( UINT16 nType, const SvEventDescription* pSupportedMacroItems )
-:   PropertySetHelper( createPropertySetInfo( nType ) ),
+:	PropertySetHelper( createPropertySetInfo( nType ) ),
     mnType( nType )
 ,   mbIsActive( true )
 ,   mnRadius( 0 )
@@ -218,7 +218,7 @@ SvUnoImageMapObject::SvUnoImageMapObject( UINT16 nType, const SvEventDescription
 }
 
 SvUnoImageMapObject::SvUnoImageMapObject( const IMapObject& rMapObject, const SvEventDescription* pSupportedMacroItems )
-:   PropertySetHelper( createPropertySetInfo( rMapObject.GetType() ) ),
+:	PropertySetHelper( createPropertySetInfo( rMapObject.GetType() ) ),
     mnType( rMapObject.GetType() )
 ,   mbIsActive( true )
 ,   mnRadius( 0 )
diff --git a/svtools/source/uno/unowizard.hxx b/svtools/source/uno/unowizard.hxx
index ceb8fac14eb6..3fd0e1d7d932 100644
--- a/svtools/source/uno/unowizard.hxx
+++ b/svtools/source/uno/unowizard.hxx
@@ -100,7 +100,7 @@ namespace svt { namespace uno
         ~Wizard();
 
     protected:
-        virtual Dialog* createDialog( Window* _pParent );
+        virtual Dialog*	createDialog( Window* _pParent );
         virtual void destroyDialog();
 
     private:
diff --git a/svtools/source/uno/wizard/unowizard.cxx b/svtools/source/uno/wizard/unowizard.cxx
index 9440c0e69f26..8b3385413102 100644
--- a/svtools/source/uno/wizard/unowizard.cxx
+++ b/svtools/source/uno/wizard/unowizard.cxx
@@ -207,7 +207,7 @@ namespace svt { namespace uno
     }
 
     //--------------------------------------------------------------------
-    Dialog* Wizard::createDialog( Window* i_pParent )
+    Dialog*	Wizard::createDialog( Window* i_pParent )
     {
         WizardShell* pDialog( new WizardShell( i_pParent, this, m_xController, m_aWizardSteps ) );
         pDialog->SetSmartHelpId( SmartId( m_sHelpURL ) );
@@ -229,7 +229,7 @@ namespace svt { namespace uno
     {
         return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.svtools.uno.Wizard" ) );
     }
-
+    
     //--------------------------------------------------------------------
     Sequence< ::rtl::OUString > SAL_CALL Wizard::getSupportedServiceNames_static() throw(RuntimeException)
     {
@@ -243,7 +243,7 @@ namespace svt { namespace uno
     {
         return getImplementationName_static();
     }
-
+    
     //--------------------------------------------------------------------
     Sequence< ::rtl::OUString > SAL_CALL Wizard::getSupportedServiceNames() throw(RuntimeException)
     {
@@ -316,7 +316,7 @@ namespace svt { namespace uno
 
         pWizardImpl->enableButtons( lcl_convertWizardButtonToWZB( i_WizardButton ), i_Enable );
     }
-
+    
     //------------------------------------------------------------------------------------------------------------------
     void SAL_CALL Wizard::setDefaultButton( ::sal_Int16 i_WizardButton ) throw (RuntimeException)
     {
@@ -328,7 +328,7 @@ namespace svt { namespace uno
 
         pWizardImpl->defaultButton( lcl_convertWizardButtonToWZB( i_WizardButton ) );
     }
-
+    
     //------------------------------------------------------------------------------------------------------------------
     sal_Bool SAL_CALL Wizard::travelNext(  ) throw (RuntimeException)
     {
@@ -340,7 +340,7 @@ namespace svt { namespace uno
 
         return pWizardImpl->travelNext();
     }
-
+    
     //------------------------------------------------------------------------------------------------------------------
     sal_Bool SAL_CALL Wizard::travelPrevious(  ) throw (RuntimeException)
     {
@@ -352,7 +352,7 @@ namespace svt { namespace uno
 
         return pWizardImpl->travelPrevious();
     }
-
+    
     //------------------------------------------------------------------------------------------------------------------
     void SAL_CALL Wizard::enablePage( ::sal_Int16 i_PageID, ::sal_Bool i_Enable ) throw (NoSuchElementException, InvalidStateException, RuntimeException)
     {
@@ -394,7 +394,7 @@ namespace svt { namespace uno
 
         return pWizardImpl->advanceTo( i_PageId );
     }
-
+    
     //------------------------------------------------------------------------------------------------------------------
     ::sal_Bool SAL_CALL Wizard::goBackTo( ::sal_Int16 i_PageId ) throw (RuntimeException)
     {
@@ -406,7 +406,7 @@ namespace svt { namespace uno
 
         return pWizardImpl->goBackTo( i_PageId );
     }
-
+    
     //------------------------------------------------------------------------------------------------------------------
     Reference< XWizardPage > SAL_CALL Wizard::getCurrentPage(  ) throw (RuntimeException)
     {
@@ -440,7 +440,7 @@ namespace svt { namespace uno
         // simply disambiguate
         Wizard_Base::OGenericUnoDialog::setTitle( i_Title );
     }
-
+    
     //------------------------------------------------------------------------------------------------------------------
     ::sal_Int16 SAL_CALL Wizard::execute(  ) throw (RuntimeException)
     {
diff --git a/svtools/source/uno/wizard/wizardpagecontroller.hxx b/svtools/source/uno/wizard/wizardpagecontroller.hxx
index 9de04d2f0dd4..4c3036c5ae7c 100644
--- a/svtools/source/uno/wizard/wizardpagecontroller.hxx
+++ b/svtools/source/uno/wizard/wizardpagecontroller.hxx
@@ -54,8 +54,8 @@ namespace svt { namespace uno
         ~WizardPageController();
 
         // IWizardPageController overridables
-        virtual void        initializePage();
-        virtual sal_Bool    commitPage( WizardTypes::CommitPageReason _eReason );
+        virtual void		initializePage();
+        virtual sal_Bool	commitPage( WizardTypes::CommitPageReason _eReason );
         virtual bool        canAdvance() const;
 
         const ::com::sun::star::uno::Reference< ::com::sun::star::ui::dialogs::XWizardPage >&
diff --git a/svtools/source/uno/wizard/wizardshell.cxx b/svtools/source/uno/wizard/wizardshell.cxx
index 7737b214ac1f..75376217e9fc 100644
--- a/svtools/source/uno/wizard/wizardshell.cxx
+++ b/svtools/source/uno/wizard/wizardshell.cxx
@@ -188,7 +188,7 @@ namespace svt { namespace uno
     Reference< XWizardPage > WizardShell::getCurrentWizardPage() const
     {
         const WizardState eState = getCurrentState();
-
+        
         PWizardPageController pController( impl_getController( GetPage( eState ) ) );
         ENSURE_OR_RETURN( pController, "WizardShell::getCurrentWizardPage: invalid page/controller!", NULL );
 
diff --git a/svtools/source/uno/wizard/wizardshell.hxx b/svtools/source/uno/wizard/wizardshell.hxx
index 338b4f38dc4a..ea1087a65db8 100644
--- a/svtools/source/uno/wizard/wizardshell.hxx
+++ b/svtools/source/uno/wizard/wizardshell.hxx
@@ -61,12 +61,12 @@ namespace svt { namespace uno
         virtual ~WizardShell();
 
         // Dialog overridables
-        virtual short   Execute();
+        virtual short	Execute();
 
         // OWizardMachine overridables
-        virtual TabPage*    createPage( WizardState i_nState );
+        virtual TabPage*	createPage( WizardState i_nState );
         virtual void        enterState( WizardState i_nState );
-        virtual sal_Bool    leaveState( WizardState i_nState );
+        virtual	sal_Bool	leaveState( WizardState i_nState );
         virtual String      getStateDisplayName( WizardState i_nState ) const;
         virtual bool        canAdvance() const;
         virtual sal_Bool    onFinish();
diff --git a/svtools/source/urlobj/inetimg.cxx b/svtools/source/urlobj/inetimg.cxx
index 7e81f17209f2..3ae55eba49cb 100644
--- a/svtools/source/urlobj/inetimg.cxx
+++ b/svtools/source/urlobj/inetimg.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
@@ -105,7 +105,7 @@ sal_Bool INetImage::Read( SvStream& rIStm, ULONG nFormat )
     int     iAltOffset;         // (alternate text?)
     int     iAnchorOffset;      // HREF in image
     int     iExtraHTML_Offset;  // Extra HTML (stored in CImageElement)
-    sal_Char pImageURL[1];      // Append all variable-length strings starting here
+    sal_Char pImageURL[1]; 		// Append all variable-length strings starting here
 */
             rtl_TextEncoding eSysCSet = gsl_getSystemTextEncoding();
             sal_Int32 nVal, nAnchorOffset, nAltOffset, nFilePos;
@@ -114,8 +114,8 @@ sal_Bool INetImage::Read( SvStream& rIStm, ULONG nFormat )
             nFilePos = rIStm.Tell();
             // skip over iSize (int), bIsMao ( BOOL ) alignment of 4 !!!!
             rIStm.SeekRel( 8 );
-            rIStm >> nVal;  aSizePixel.Width() = nVal;
-            rIStm >> nVal;  aSizePixel.Height() = nVal;
+            rIStm >> nVal;	aSizePixel.Width() = nVal;
+            rIStm >> nVal;	aSizePixel.Height() = nVal;
             // skip over iHSpace, iVSpace, iBorder, iLowResOffset
             rIStm.SeekRel( 3 * sizeof( INT32 ) + sizeof( int ) );
             rIStm >> nAltOffset;
diff --git a/svtools/util/hidother.src b/svtools/util/hidother.src
index 77dd98115221..91c889eda866 100644
--- a/svtools/util/hidother.src
+++ b/svtools/util/hidother.src
@@ -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
@@ -27,33 +27,33 @@
 
 #include "../inc/svtools/helpid.hrc"         // HID_XXX
 
-hidspecial HID_TEMPLATEDLG_ICONCTRL             { HelpID = HID_TEMPLATEDLG_ICONCTRL; }
-hidspecial HID_TEMPLATEDLG_FILEVIEW             { HelpID = HID_TEMPLATEDLG_FILEVIEW; };
+hidspecial HID_TEMPLATEDLG_ICONCTRL				{ HelpID = HID_TEMPLATEDLG_ICONCTRL; }
+hidspecial HID_TEMPLATEDLG_FILEVIEW				{ HelpID = HID_TEMPLATEDLG_FILEVIEW; };
 
-hidspecial HID_ADDRTEMPL_FIELD_ASSIGNMENT       { HelpID = HID_ADDRTEMPL_FIELD_ASSIGNMENT; };
+hidspecial HID_ADDRTEMPL_FIELD_ASSIGNMENT		{ HelpID = HID_ADDRTEMPL_FIELD_ASSIGNMENT; };
 
-hidspecial HID_FILESAVE_LEVELUP                 { HelpID = HID_FILESAVE_LEVELUP; };
-hidspecial HID_FILESAVE_CREATEDIRECTORY         { HelpID = HID_FILESAVE_CREATEDIRECTORY; };
-hidspecial HID_FILESAVE_DEFAULTDIRECTORY        { HelpID = HID_FILESAVE_DEFAULTDIRECTORY; };
-hidspecial HID_FILESAVE_FILEVIEW                { HelpID = HID_FILESAVE_FILEVIEW; };
-hidspecial HID_FILESAVE_TEMPLATE                { HelpID = HID_FILESAVE_TEMPLATE; };
-hidspecial HID_FILESAVE_FILEURL                 { HelpID = HID_FILESAVE_FILEURL; };
-hidspecial HID_FILESAVE_FILETYPE                { HelpID = HID_FILESAVE_FILETYPE; };
-hidspecial HID_FILESAVE_DOSAVE                  { HelpID = HID_FILESAVE_DOSAVE; };
-hidspecial HID_FILESAVE_AUTOEXTENSION           { HelpID = HID_FILESAVE_AUTOEXTENSION; };
-hidspecial HID_FILESAVE_SAVEWITHPASSWORD        { HelpID = HID_FILESAVE_SAVEWITHPASSWORD; };
-hidspecial HID_FILESAVE_CUSTOMIZEFILTER         { HelpID = HID_FILESAVE_CUSTOMIZEFILTER; };
-hidspecial HID_FILESAVE_SELECTION               { HelpID = HID_FILESAVE_SELECTION; };
-hidspecial HID_FILESAVE_DIALOG                  { HelpID = HID_FILESAVE_DIALOG; };
-hidspecial HID_FILESAVE_DOPLAY                  { HelpID = HID_FILESAVE_DOPLAY; };
-hidspecial HID_FILEOPEN_READONLY                { HelpID = HID_FILEOPEN_READONLY; };
-hidspecial HID_FILEOPEN_VERSION                 { HelpID = HID_FILEOPEN_VERSION; };
-hidspecial HID_FILEOPEN_IMAGE_TEMPLATE          { HelpID = HID_FILEOPEN_IMAGE_TEMPLATE; };
-hidspecial HID_HELPAGENT_WINDOW                 { HelpID = HID_HELPAGENT_WINDOW; };
+hidspecial HID_FILESAVE_LEVELUP					{ HelpID = HID_FILESAVE_LEVELUP; };
+hidspecial HID_FILESAVE_CREATEDIRECTORY			{ HelpID = HID_FILESAVE_CREATEDIRECTORY; };
+hidspecial HID_FILESAVE_DEFAULTDIRECTORY		{ HelpID = HID_FILESAVE_DEFAULTDIRECTORY; };
+hidspecial HID_FILESAVE_FILEVIEW				{ HelpID = HID_FILESAVE_FILEVIEW; };
+hidspecial HID_FILESAVE_TEMPLATE				{ HelpID = HID_FILESAVE_TEMPLATE; };
+hidspecial HID_FILESAVE_FILEURL					{ HelpID = HID_FILESAVE_FILEURL; };
+hidspecial HID_FILESAVE_FILETYPE				{ HelpID = HID_FILESAVE_FILETYPE; };
+hidspecial HID_FILESAVE_DOSAVE					{ HelpID = HID_FILESAVE_DOSAVE; };
+hidspecial HID_FILESAVE_AUTOEXTENSION			{ HelpID = HID_FILESAVE_AUTOEXTENSION; };
+hidspecial HID_FILESAVE_SAVEWITHPASSWORD		{ HelpID = HID_FILESAVE_SAVEWITHPASSWORD; };
+hidspecial HID_FILESAVE_CUSTOMIZEFILTER			{ HelpID = HID_FILESAVE_CUSTOMIZEFILTER; };
+hidspecial HID_FILESAVE_SELECTION				{ HelpID = HID_FILESAVE_SELECTION; };
+hidspecial HID_FILESAVE_DIALOG					{ HelpID = HID_FILESAVE_DIALOG; };
+hidspecial HID_FILESAVE_DOPLAY					{ HelpID = HID_FILESAVE_DOPLAY; };
+hidspecial HID_FILEOPEN_READONLY				{ HelpID = HID_FILEOPEN_READONLY; };
+hidspecial HID_FILEOPEN_VERSION					{ HelpID = HID_FILEOPEN_VERSION; };
+hidspecial HID_FILEOPEN_IMAGE_TEMPLATE			{ HelpID = HID_FILEOPEN_IMAGE_TEMPLATE; };
+hidspecial HID_HELPAGENT_WINDOW					{ HelpID = HID_HELPAGENT_WINDOW; };
 
-hidspecial HID_REGISTRATION_DIALOG              { HelpID = HID_REGISTRATION_DIALOG; };
+hidspecial HID_REGISTRATION_DIALOG				{ HelpID = HID_REGISTRATION_DIALOG; };
 
-hidspecial HID_PRINTDIALOG_TOFILE               { HelpID = HID_PRINTDIALOG_TOFILE; };
+hidspecial HID_PRINTDIALOG_TOFILE				{ HelpID = HID_PRINTDIALOG_TOFILE; };
 
-hidspecial HID_WIZARD_NEXT                  { HelpID = HID_WIZARD_NEXT; };
-hidspecial HID_WIZARD_PREVIOUS              { HelpID = HID_WIZARD_PREVIOUS; };
+hidspecial HID_WIZARD_NEXT				    { HelpID = HID_WIZARD_NEXT; };
+hidspecial HID_WIZARD_PREVIOUS				{ HelpID = HID_WIZARD_PREVIOUS; };
diff --git a/svtools/workben/browser.cxx b/svtools/workben/browser.cxx
index 2f4f120a276b..092a38184072 100644
--- a/svtools/workben/browser.cxx
+++ b/svtools/workben/browser.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
@@ -42,33 +42,33 @@
 #endif
 #include <vcl/dialog.hxx>
 
-#define MID_BROWSER             10
-#define MID_MODE                11
-#define MID_EVENTVIEW           12
-#define MID_INVALIDATE          13
-#define MID_CLEAR               14
+#define MID_BROWSER 			10
+#define MID_MODE				11
+#define MID_EVENTVIEW			12
+#define MID_INVALIDATE			13
+#define MID_CLEAR				14
 #define MID_ROW                 20
-#define MID_INSERTROW_BEFORE    21
-#define MID_INSERTROW_AT        22
-#define MID_INSERTROW_BEHIND    23
-#define MID_REMOVEROW_BEFORE    24
-#define MID_REMOVEROW_AT        25
-#define MID_REMOVEROW_BEHIND    26
-#define MID_MODIFYROW_BEFORE    27
-#define MID_MODIFYROW_AT        28
-#define MID_MODIFYROW_BEHIND    29
+#define MID_INSERTROW_BEFORE	21
+#define MID_INSERTROW_AT		22
+#define MID_INSERTROW_BEHIND	23
+#define MID_REMOVEROW_BEFORE	24
+#define MID_REMOVEROW_AT		25
+#define MID_REMOVEROW_BEHIND	26
+#define MID_MODIFYROW_BEFORE	27
+#define MID_MODIFYROW_AT		28
+#define MID_MODIFYROW_BEHIND	29
 #define MID_COL                 30
-#define MID_INSERTCOL           31
-#define MID_REMOVECOL           32
-#define MID_MOVECOLLEFT         33
-#define MID_MOVECOLRIGHT        34
-#define MID_SELECTIONS          60
-#define MID_SELECTROW           61
-#define MID_SELECTALL           62
-#define MID_SELECTNONE          63
-#define MID_INVERSE             64
-#define MID_EXTRAS              70
-#define MID_STARMONEY_1         71
+#define MID_INSERTCOL			31
+#define MID_REMOVECOL			32
+#define MID_MOVECOLLEFT 		33
+#define MID_MOVECOLRIGHT		34
+#define MID_SELECTIONS			60
+#define MID_SELECTROW			61
+#define MID_SELECTALL			62
+#define MID_SELECTNONE			63
+#define MID_INVERSE 			64
+#define MID_EXTRAS  			70
+#define MID_STARMONEY_1 		71
 
 //==================================================================
 
@@ -113,16 +113,16 @@ friend class AppWindow;
 
     DataList        aRows;
     BOOL            bInverse;
-    Edit*           pEdit;
+    Edit*			pEdit;
 
 protected:
     virtual long    GetRowCount() const;
     virtual BOOL    SeekRow( long nRow );
-    virtual void    PaintField( OutputDevice& rDev, const Rectangle& rRect,
+    virtual void	PaintField( OutputDevice& rDev, const Rectangle& rRect,
                                 USHORT nColumnId ) const;
 
     virtual void    Select();
-    virtual void    DoubleClick();
+    virtual void	DoubleClick();
     virtual void    CursorMoved();
     virtual void    StartScroll();
     virtual void    EndScroll();
@@ -131,7 +131,7 @@ protected:
     virtual BOOL    StartDragging( Pointer& rMovePtr,
                                    Pointer& rCopyPtr );
     virtual void    EndDragging( const DropAction &rAction );
-    virtual void    MouseButtonDown( const BrowserMouseEvent &rEvt );
+    virtual	void	MouseButtonDown( const BrowserMouseEvent &rEvt );
 
 public:
                     Browser( AppWindow* pParent, BrowserMode eMode );
@@ -146,8 +146,8 @@ public:
 class AppWindow: public WorkWindow
 {
     MenuBar         aMenu;
-    PopupMenu       aBrwMenu, aRowMenu, aColMenu, aSelMenu, aExtMenu;
-    Edit            aEdit;
+    PopupMenu		aBrwMenu, aRowMenu, aColMenu, aSelMenu, aExtMenu;
+    Edit			aEdit;
     Browser         aBrowser;
     BrowserMode     eCurMode;
     FloatingWindow *pEventView;
diff --git a/svtools/workben/cui/loadlib.cxx b/svtools/workben/cui/loadlib.cxx
index 85869e25cb97..f15750ed38db 100644
--- a/svtools/workben/cui/loadlib.cxx
+++ b/svtools/workben/cui/loadlib.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
@@ -83,7 +83,7 @@ int __LOADONCALLAPI main( int argc, char **argv )
 
     if ( aLibrary )
         osl_unloadModule( aLibrary );
-
+    
     return 0;
 }
 
diff --git a/svtools/workben/stest.cxx b/svtools/workben/stest.cxx
index 85b7013663da..ea8cc55f839c 100644
--- a/svtools/workben/stest.cxx
+++ b/svtools/workben/stest.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
@@ -45,11 +45,11 @@ public:
 
 class SearchWindow : public WorkWindow
 {
-    PushButton      aPB;
-    FixedText       aFT1, aFT2, aFT3;
-    MultiLineEdit   aEText, aESrch;
-    RadioButton     aModeN, aModeR, aModeL;
-    SearchParam     aParam;
+    PushButton		aPB;
+    FixedText 		aFT1, aFT2, aFT3;
+    MultiLineEdit 	aEText, aESrch;
+    RadioButton 	aModeN, aModeR, aModeL;
+    SearchParam 	aParam;
 
 public:
                     SearchWindow();
@@ -121,7 +121,7 @@ IMPL_LINK( SearchWindow, ClickHdl, Button *, pButton )
         String sText( aEText.GetText() );
         String sSrch( aESrch.GetText() );
 
-/*      InfoBox( this, String( "T: " ) + sText +
+/*		InfoBox( this, String( "T: " ) + sText +
                        String( "\nS: " ) + sSrch ).Execute();
 */
         BOOL bRet = FALSE;
@@ -132,7 +132,7 @@ IMPL_LINK( SearchWindow, ClickHdl, Button *, pButton )
             SearchText aSrchText( aParam, GetpApp()->GetAppInternational() );
             bRet = aSrchText.SearchFrwrd( sText, &nStt, &nEnd );
 
-//          BOOL SearchBkwrd( const String &rStr, USHORT* pStart, USHORT* pEnde );
+//			BOOL SearchBkwrd( const String &rStr, USHORT* pStart, USHORT* pEnde );
         }
 
         String sFound( "gefunden" );
@@ -174,7 +174,7 @@ IMPL_LINK( SearchWindow, ClickHdl, Button *, pButton )
 
 void MyApp::Main( )
 {
-    SearchWindow*   pSearchWindow = new SearchWindow;
+    SearchWindow*	pSearchWindow = new SearchWindow;
     pSearchWindow->Show();
     Execute();
     delete pSearchWindow;
diff --git a/svtools/workben/svdem.cxx b/svtools/workben/svdem.cxx
index fd40d3d645fa..5d5930b4f9ab 100644
--- a/svtools/workben/svdem.cxx
+++ b/svtools/workben/svdem.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
@@ -72,13 +72,13 @@ public:
 
 class ShowBitmap : public WorkWindow
 {
-    Bitmap          aBmp;
+    Bitmap			aBmp;
 
 public:
                     ShowBitmap( Window* pParent, const Bitmap& rBmp );
 
-    virtual void    Paint( const Rectangle& );
-    virtual BOOL    Close();
+    virtual void	Paint( const Rectangle& );
+    virtual BOOL	Close();
 };
 
 // -----------------------------------------------------------------------
@@ -88,8 +88,8 @@ class ShowFont : public Control
 public:
                     ShowFont( Window* pParent );
 
-    virtual void    Paint( const Rectangle& );
-    void            SetFont( const Font& rFont )
+    virtual void	Paint( const Rectangle& );
+    void			SetFont( const Font& rFont )
                         { Invalidate(); Control::SetFont( rFont ); }
 };
 
@@ -100,7 +100,7 @@ class OrientSlider : public Slider
 public:
                 OrientSlider( Window* pParent );
 
-    short       GetOrientation() const { return (short)GetThumbPos(); }
+    short		GetOrientation() const { return (short)GetThumbPos(); }
 };
 
 // -----------------------------------------------------------------------
@@ -119,25 +119,25 @@ OrientSlider::OrientSlider( Window* pParent ) :
 class MyFontDialog : public ModalDialog
 {
 private:
-    FontList*       pList;
-    Font            aCurFont;
-    Printer         aPrinter;
-    FontNameBox     aFontBox;
-    FontStyleBox    aStyleBox;
-    FontSizeBox     aSizeBox;
-    ListBox         aUnderlineBox;
-    ListBox         aStrikeoutBox;
-    CheckBox        aWordLineBox;
-    CheckBox        aShadowBox;
-    CheckBox        aOutlineBox;
-    ColorListBox    aColorBox;
-    GroupBox        aEffectBox;
-    OrientSlider    aLineOrientSlider;
-    ShowFont        aShowFont;
-    GroupBox        aSampleBox;
-    FixedText       aMapText;
-    OKButton        aOKBtn;
-    CancelButton    aCancelBtn;
+    FontList*		pList;
+    Font			aCurFont;
+    Printer 		aPrinter;
+    FontNameBox 	aFontBox;
+    FontStyleBox	aStyleBox;
+    FontSizeBox 	aSizeBox;
+    ListBox 		aUnderlineBox;
+    ListBox 		aStrikeoutBox;
+    CheckBox		aWordLineBox;
+    CheckBox		aShadowBox;
+    CheckBox		aOutlineBox;
+    ColorListBox	aColorBox;
+    GroupBox		aEffectBox;
+    OrientSlider	aLineOrientSlider;
+    ShowFont		aShowFont;
+    GroupBox		aSampleBox;
+    FixedText		aMapText;
+    OKButton		aOKBtn;
+    CancelButton	aCancelBtn;
 
 public:
                     MyFontDialog( Window* pParent );
@@ -145,8 +145,8 @@ public:
                     DECL_LINK( SelectFont, ComboBox* );
                     DECL_LINK( SelectStyle, ComboBox* );
                     DECL_LINK( AttrHdl, Window * );
-    void            SetAttr();
-    short           Execute();
+    void			SetAttr();
+    short			Execute();
 };
 
 // -----------------------------------------------------------------------
@@ -158,22 +158,22 @@ public:
                               WinBits nWinStyle = WB_STDTABBAR ) :
                         TabBar( pParent, nWinStyle ) {}
 
-    virtual long    DeactivatePage();
-    virtual long    AllowRenaming();
-    virtual void    Split();
+    virtual long	DeactivatePage();
+    virtual long	AllowRenaming();
+    virtual void	Split();
 };
 
 // -----------------------------------------------------------------------
 
 class MyCalendar : public WorkWindow
 {
-    MenuBar     aMenuBar;
-    PopupMenu   aWeekStartMenu;
-    PopupMenu   aWeekCountMenu;
-    Calendar    aCalendar;
-    Color       aInfoColor;
-    Color       aHolidayColor;
-    Color       aFrameColor;
+    MenuBar 	aMenuBar;
+    PopupMenu	aWeekStartMenu;
+    PopupMenu	aWeekCountMenu;
+    Calendar	aCalendar;
+    Color		aInfoColor;
+    Color		aHolidayColor;
+    Color		aFrameColor;
 
 public:
                 MyCalendar( Window* pParent );
@@ -183,7 +183,7 @@ public:
                 DECL_LINK( DoubleClickHdl, Calendar* );
                 DECL_LINK( MenuSelectHdl, Menu* );
 
-    void        Resize();
+    void		Resize();
 };
 
 // -----------------------------------------------------------------------
@@ -191,27 +191,27 @@ public:
 class MyWin : public WorkWindow
 {
 private:
-    Printer         aPrn;
-    ToolBox         aBox;
-    StatusBar       aBar;
-    HeaderBar       aHeadBar;
-    ColorListBox    aColorList;
-    LineListBox     aLineList;
-    ValueSet        aValueSet;
-    CalendarField   aCalendarField;
-    CalendarField   aCalendarField2;
-    MyTabBar        aTabBar;
-    ProgressBar     aPrgsBar;
-    PushButton      aFontBtn;
-    PushButton      aCalendarBtn;
-    PushButton      aPrnSetupBtn;
-    PushButton      aPrnDlgBtn;
-    Size            aBoxSize;
-    MyCalendar*     pCalendar;
-    PopupMenu*      pMenu;
-    FontNameMenu*   pNameMenu;
-    FontStyleMenu*  pStyleMenu;
-    FontSizeMenu*   pSizeMenu;
+    Printer 		aPrn;
+    ToolBox 		aBox;
+    StatusBar		aBar;
+    HeaderBar		aHeadBar;
+    ColorListBox	aColorList;
+    LineListBox 	aLineList;
+    ValueSet		aValueSet;
+    CalendarField	aCalendarField;
+    CalendarField	aCalendarField2;
+    MyTabBar		aTabBar;
+    ProgressBar 	aPrgsBar;
+    PushButton		aFontBtn;
+    PushButton		aCalendarBtn;
+    PushButton		aPrnSetupBtn;
+    PushButton		aPrnDlgBtn;
+    Size			aBoxSize;
+    MyCalendar* 	pCalendar;
+    PopupMenu*		pMenu;
+    FontNameMenu*	pNameMenu;
+    FontStyleMenu*	pStyleMenu;
+    FontSizeMenu*	pSizeMenu;
 
 public:
                     MyWin( Window* pParent, WinBits aWinStyle );
@@ -220,13 +220,13 @@ public:
                     DECL_LINK( Test, PushButton* );
                     DECL_LINK( SelectHdl, Window* );
                     DECL_LINK( CalSelectHdl, CalendarField* );
-    void            ContextMenu( const Point& rPos );
+    void			ContextMenu( const Point& rPos );
 
-    void            Command( const CommandEvent& rCEvt );
-    void            MouseButtonDown( const MouseEvent& rMEvt );
-    void            KeyInput( const KeyEvent& rKEvt );
-    void            Paint( const Rectangle& rRect );
-    void            Resize();
+    void			Command( const CommandEvent& rCEvt );
+    void			MouseButtonDown( const MouseEvent& rMEvt );
+    void			KeyInput( const KeyEvent& rKEvt );
+    void			Paint( const Rectangle& rRect );
+    void			Resize();
 };
 
 // -----------------------------------------------------------------------
@@ -304,9 +304,9 @@ ShowFont::ShowFont( Window* pParent ) :
 void ShowFont::Paint( const Rectangle& )
 {
     const Font& rFont = GetFont();
-    String      aText;
-    Size        aWindowSize( GetOutputSize() );
-    long        x,y;
+    String		aText;
+    Size		aWindowSize( GetOutputSize() );
+    long		x,y;
 
     if ( rFont.GetOrientation() )
     {
@@ -422,22 +422,22 @@ MyFontDialog::MyFontDialog( Window* pParent ) :
     aColorBox.SetPosSizePixel( Point( 15, 305 ), Size( 130, 100 ) );
     aColorBox.SetSelectHdl( LINK( this, MyFontDialog, AttrHdl ) );
     aColorBox.SetUpdateMode( FALSE );
-    aColorBox.InsertEntry( Color( COL_BLACK ),         XubString( RTL_CONSTASCII_USTRINGPARAM( "Black" ) ) );
-    aColorBox.InsertEntry( Color( COL_BLUE ),          XubString( RTL_CONSTASCII_USTRINGPARAM( "Blue" ) ) );
-    aColorBox.InsertEntry( Color( COL_GREEN ),         XubString( RTL_CONSTASCII_USTRINGPARAM( "Green" ) ) );
-    aColorBox.InsertEntry( Color( COL_CYAN ),          XubString( RTL_CONSTASCII_USTRINGPARAM( "Cyan" ) ) );
-    aColorBox.InsertEntry( Color( COL_RED ),           XubString( RTL_CONSTASCII_USTRINGPARAM( "Red" ) ) );
-    aColorBox.InsertEntry( Color( COL_MAGENTA ),       XubString( RTL_CONSTASCII_USTRINGPARAM( "Magenta" ) ) );
-    aColorBox.InsertEntry( Color( COL_BROWN ),         XubString( RTL_CONSTASCII_USTRINGPARAM( "Brown" ) ) );
-    aColorBox.InsertEntry( Color( COL_GRAY ),          XubString( RTL_CONSTASCII_USTRINGPARAM( "Gray" ) ) );
-    aColorBox.InsertEntry( Color( COL_LIGHTGRAY ),     XubString( RTL_CONSTASCII_USTRINGPARAM( "LightGray" ) ) );
-    aColorBox.InsertEntry( Color( COL_LIGHTBLUE ),     XubString( RTL_CONSTASCII_USTRINGPARAM( "LightBlue" ) ) );
+    aColorBox.InsertEntry( Color( COL_BLACK ),		   XubString( RTL_CONSTASCII_USTRINGPARAM( "Black" ) ) );
+    aColorBox.InsertEntry( Color( COL_BLUE ),		   XubString( RTL_CONSTASCII_USTRINGPARAM( "Blue" ) ) );
+    aColorBox.InsertEntry( Color( COL_GREEN ),		   XubString( RTL_CONSTASCII_USTRINGPARAM( "Green" ) ) );
+    aColorBox.InsertEntry( Color( COL_CYAN ),		   XubString( RTL_CONSTASCII_USTRINGPARAM( "Cyan" ) ) );
+    aColorBox.InsertEntry( Color( COL_RED ),		   XubString( RTL_CONSTASCII_USTRINGPARAM( "Red" ) ) );
+    aColorBox.InsertEntry( Color( COL_MAGENTA ),	   XubString( RTL_CONSTASCII_USTRINGPARAM( "Magenta" ) ) );
+    aColorBox.InsertEntry( Color( COL_BROWN ),		   XubString( RTL_CONSTASCII_USTRINGPARAM( "Brown" ) ) );
+    aColorBox.InsertEntry( Color( COL_GRAY ),		   XubString( RTL_CONSTASCII_USTRINGPARAM( "Gray" ) ) );
+    aColorBox.InsertEntry( Color( COL_LIGHTGRAY ),	   XubString( RTL_CONSTASCII_USTRINGPARAM( "LightGray" ) ) );
+    aColorBox.InsertEntry( Color( COL_LIGHTBLUE ),	   XubString( RTL_CONSTASCII_USTRINGPARAM( "LightBlue" ) ) );
     aColorBox.InsertEntry( Color( COL_LIGHTGREEN ),    XubString( RTL_CONSTASCII_USTRINGPARAM( "LightGreen" ) ) );
-    aColorBox.InsertEntry( Color( COL_LIGHTCYAN ),     XubString( RTL_CONSTASCII_USTRINGPARAM( "LightCyan" ) ) );
-    aColorBox.InsertEntry( Color( COL_LIGHTRED ),      XubString( RTL_CONSTASCII_USTRINGPARAM( "LightRed" ) ) );
+    aColorBox.InsertEntry( Color( COL_LIGHTCYAN ),	   XubString( RTL_CONSTASCII_USTRINGPARAM( "LightCyan" ) ) );
+    aColorBox.InsertEntry( Color( COL_LIGHTRED ),	   XubString( RTL_CONSTASCII_USTRINGPARAM( "LightRed" ) ) );
     aColorBox.InsertEntry( Color( COL_LIGHTMAGENTA ),  XubString( RTL_CONSTASCII_USTRINGPARAM( "LightMagenta" ) ) );
-    aColorBox.InsertEntry( Color( COL_YELLOW ),        XubString( RTL_CONSTASCII_USTRINGPARAM( "Yellow" ) ) );
-    aColorBox.InsertEntry( Color( COL_WHITE ),         XubString( RTL_CONSTASCII_USTRINGPARAM( "White" ) ) );
+    aColorBox.InsertEntry( Color( COL_YELLOW ), 	   XubString( RTL_CONSTASCII_USTRINGPARAM( "Yellow" ) ) );
+    aColorBox.InsertEntry( Color( COL_WHITE ),		   XubString( RTL_CONSTASCII_USTRINGPARAM( "White" ) ) );
     aColorBox.SetUpdateMode( TRUE );
     aColorBox.Show();
     }
@@ -573,9 +573,9 @@ long MyTabBar::AllowRenaming()
 
 void MyTabBar::Split()
 {
-    Size    aSize = GetSizePixel();
-    long    nWidth = GetSplitSize();
-    long    nMaxWidth = GetParent()->GetOutputSizePixel().Width()-50;
+    Size	aSize = GetSizePixel();
+    long	nWidth = GetSplitSize();
+    long	nMaxWidth = GetParent()->GetOutputSizePixel().Width()-50;
     if ( nWidth < GetMinSize() )
         nWidth = GetMinSize();
     else if ( nWidth > nMaxWidth )
@@ -669,7 +669,7 @@ IMPL_LINK( MyCalendar, DoubleClickHdl, Calendar*, EMPTYARG )
 
 IMPL_LINK( MyCalendar, MenuSelectHdl, Menu*, pMenu )
 {
-    USHORT          nItemId = pMenu->GetCurItemId();
+    USHORT			nItemId = pMenu->GetCurItemId();
 
     if ( (nItemId >= 10) && (nItemId <= 19) )
         aCalendar.SetWeekStart( nItemId-10 );
@@ -751,22 +751,22 @@ MyWin::MyWin( Window* pParent, WinBits aWinStyle ) :
     {
     aColorList.SetPosSizePixel( Point( 10, nY ), Size( 130, 180 ) );
     aColorList.SetUpdateMode( FALSE );
-    aColorList.InsertEntry( Color( COL_BLACK ),         XubString( RTL_CONSTASCII_USTRINGPARAM( "Black" ) ) );
-    aColorList.InsertEntry( Color( COL_BLUE ),          XubString( RTL_CONSTASCII_USTRINGPARAM( "Blue" ) ) );
-    aColorList.InsertEntry( Color( COL_GREEN ),         XubString( RTL_CONSTASCII_USTRINGPARAM( "Green" ) ) );
-    aColorList.InsertEntry( Color( COL_CYAN ),          XubString( RTL_CONSTASCII_USTRINGPARAM( "Cyan" ) ) );
-    aColorList.InsertEntry( Color( COL_RED ),           XubString( RTL_CONSTASCII_USTRINGPARAM( "Red" ) ) );
-    aColorList.InsertEntry( Color( COL_MAGENTA ),       XubString( RTL_CONSTASCII_USTRINGPARAM( "Magenta" ) ) );
-    aColorList.InsertEntry( Color( COL_BROWN ),         XubString( RTL_CONSTASCII_USTRINGPARAM( "Brown" ) ) );
-    aColorList.InsertEntry( Color( COL_GRAY ),          XubString( RTL_CONSTASCII_USTRINGPARAM( "Gray" ) ) );
-    aColorList.InsertEntry( Color( COL_LIGHTGRAY ),     XubString( RTL_CONSTASCII_USTRINGPARAM( "LightGray" ) ) );
-    aColorList.InsertEntry( Color( COL_LIGHTBLUE ),     XubString( RTL_CONSTASCII_USTRINGPARAM( "LightBlue" ) ) );
-    aColorList.InsertEntry( Color( COL_LIGHTGREEN ),    XubString( RTL_CONSTASCII_USTRINGPARAM( "LightGreen" ) ) );
-    aColorList.InsertEntry( Color( COL_LIGHTCYAN ),     XubString( RTL_CONSTASCII_USTRINGPARAM( "LightCyan" ) ) );
-    aColorList.InsertEntry( Color( COL_LIGHTRED ),      XubString( RTL_CONSTASCII_USTRINGPARAM( "LightRed" ) ) );
-    aColorList.InsertEntry( Color( COL_LIGHTMAGENTA ),  XubString( RTL_CONSTASCII_USTRINGPARAM( "LightMagenta" ) ) );
-    aColorList.InsertEntry( Color( COL_YELLOW ),        XubString( RTL_CONSTASCII_USTRINGPARAM( "Yellow" ) ) );
-    aColorList.InsertEntry( Color( COL_WHITE ),         XubString( RTL_CONSTASCII_USTRINGPARAM( "White" ) ) );
+    aColorList.InsertEntry( Color( COL_BLACK ), 		XubString( RTL_CONSTASCII_USTRINGPARAM( "Black" ) ) );
+    aColorList.InsertEntry( Color( COL_BLUE ),			XubString( RTL_CONSTASCII_USTRINGPARAM( "Blue" ) ) );
+    aColorList.InsertEntry( Color( COL_GREEN ), 		XubString( RTL_CONSTASCII_USTRINGPARAM( "Green" ) ) );
+    aColorList.InsertEntry( Color( COL_CYAN ),			XubString( RTL_CONSTASCII_USTRINGPARAM( "Cyan" ) ) );
+    aColorList.InsertEntry( Color( COL_RED ),			XubString( RTL_CONSTASCII_USTRINGPARAM( "Red" ) ) );
+    aColorList.InsertEntry( Color( COL_MAGENTA ),		XubString( RTL_CONSTASCII_USTRINGPARAM( "Magenta" ) ) );
+    aColorList.InsertEntry( Color( COL_BROWN ), 		XubString( RTL_CONSTASCII_USTRINGPARAM( "Brown" ) ) );
+    aColorList.InsertEntry( Color( COL_GRAY ),			XubString( RTL_CONSTASCII_USTRINGPARAM( "Gray" ) ) );
+    aColorList.InsertEntry( Color( COL_LIGHTGRAY ), 	XubString( RTL_CONSTASCII_USTRINGPARAM( "LightGray" ) ) );
+    aColorList.InsertEntry( Color( COL_LIGHTBLUE ), 	XubString( RTL_CONSTASCII_USTRINGPARAM( "LightBlue" ) ) );
+    aColorList.InsertEntry( Color( COL_LIGHTGREEN ),	XubString( RTL_CONSTASCII_USTRINGPARAM( "LightGreen" ) ) );
+    aColorList.InsertEntry( Color( COL_LIGHTCYAN ), 	XubString( RTL_CONSTASCII_USTRINGPARAM( "LightCyan" ) ) );
+    aColorList.InsertEntry( Color( COL_LIGHTRED ),		XubString( RTL_CONSTASCII_USTRINGPARAM( "LightRed" ) ) );
+    aColorList.InsertEntry( Color( COL_LIGHTMAGENTA ),	XubString( RTL_CONSTASCII_USTRINGPARAM( "LightMagenta" ) ) );
+    aColorList.InsertEntry( Color( COL_YELLOW ),		XubString( RTL_CONSTASCII_USTRINGPARAM( "Yellow" ) ) );
+    aColorList.InsertEntry( Color( COL_WHITE ), 		XubString( RTL_CONSTASCII_USTRINGPARAM( "White" ) ) );
     aColorList.SetUpdateMode( TRUE );
     aColorList.SetSelectHdl( LINK( this, MyWin, SelectHdl ) );
     aColorList.Show();
@@ -794,22 +794,22 @@ MyWin::MyWin( Window* pParent, WinBits aWinStyle ) :
 
     {
     aValueSet.SetPosSizePixel( Point( 290, nY ), Size( 130, 180 ) );
-    aValueSet.InsertItem(  9, Color( COL_BLACK ),         XubString( RTL_CONSTASCII_USTRINGPARAM( "Black" ) ) );
-    aValueSet.InsertItem( 10, Color( COL_BLUE ),          XubString( RTL_CONSTASCII_USTRINGPARAM( "Blue" ) ) );
-    aValueSet.InsertItem( 11, Color( COL_GREEN ),         XubString( RTL_CONSTASCII_USTRINGPARAM( "Green" ) ) );
-    aValueSet.InsertItem( 12, Color( COL_CYAN ),          XubString( RTL_CONSTASCII_USTRINGPARAM( "Cyan" ) ) );
-    aValueSet.InsertItem( 13, Color( COL_RED ),           XubString( RTL_CONSTASCII_USTRINGPARAM( "Red" ) ) );
-    aValueSet.InsertItem( 14, Color( COL_MAGENTA ),       XubString( RTL_CONSTASCII_USTRINGPARAM( "Magenta" ) ) );
-    aValueSet.InsertItem( 15, Color( COL_BROWN ),         XubString( RTL_CONSTASCII_USTRINGPARAM( "Brown" ) ) );
-    aValueSet.InsertItem( 16, Color( COL_GRAY ),          XubString( RTL_CONSTASCII_USTRINGPARAM( "Gray" ) ) );
-    aValueSet.InsertItem( 17, Color( COL_LIGHTGRAY ),     XubString( RTL_CONSTASCII_USTRINGPARAM( "LightGray" ) ) );
-    aValueSet.InsertItem( 18, Color( COL_LIGHTBLUE ),     XubString( RTL_CONSTASCII_USTRINGPARAM( "LightBlue" ) ) );
-    aValueSet.InsertItem( 19, Color( COL_LIGHTGREEN ),    XubString( RTL_CONSTASCII_USTRINGPARAM( "LightGreen" ) ) );
-    aValueSet.InsertItem( 20, Color( COL_LIGHTCYAN ),     XubString( RTL_CONSTASCII_USTRINGPARAM( "LightCyan" ) ) );
-    aValueSet.InsertItem( 21, Color( COL_LIGHTRED ),      XubString( RTL_CONSTASCII_USTRINGPARAM( "LightRed" ) ) );
+    aValueSet.InsertItem(  9, Color( COL_BLACK ),		  XubString( RTL_CONSTASCII_USTRINGPARAM( "Black" ) ) );
+    aValueSet.InsertItem( 10, Color( COL_BLUE ),		  XubString( RTL_CONSTASCII_USTRINGPARAM( "Blue" ) ) );
+    aValueSet.InsertItem( 11, Color( COL_GREEN ),		  XubString( RTL_CONSTASCII_USTRINGPARAM( "Green" ) ) );
+    aValueSet.InsertItem( 12, Color( COL_CYAN ),		  XubString( RTL_CONSTASCII_USTRINGPARAM( "Cyan" ) ) );
+    aValueSet.InsertItem( 13, Color( COL_RED ), 		  XubString( RTL_CONSTASCII_USTRINGPARAM( "Red" ) ) );
+    aValueSet.InsertItem( 14, Color( COL_MAGENTA ), 	  XubString( RTL_CONSTASCII_USTRINGPARAM( "Magenta" ) ) );
+    aValueSet.InsertItem( 15, Color( COL_BROWN ),		  XubString( RTL_CONSTASCII_USTRINGPARAM( "Brown" ) ) );
+    aValueSet.InsertItem( 16, Color( COL_GRAY ),		  XubString( RTL_CONSTASCII_USTRINGPARAM( "Gray" ) ) );
+    aValueSet.InsertItem( 17, Color( COL_LIGHTGRAY ),	  XubString( RTL_CONSTASCII_USTRINGPARAM( "LightGray" ) ) );
+    aValueSet.InsertItem( 18, Color( COL_LIGHTBLUE ),	  XubString( RTL_CONSTASCII_USTRINGPARAM( "LightBlue" ) ) );
+    aValueSet.InsertItem( 19, Color( COL_LIGHTGREEN ),	  XubString( RTL_CONSTASCII_USTRINGPARAM( "LightGreen" ) ) );
+    aValueSet.InsertItem( 20, Color( COL_LIGHTCYAN ),	  XubString( RTL_CONSTASCII_USTRINGPARAM( "LightCyan" ) ) );
+    aValueSet.InsertItem( 21, Color( COL_LIGHTRED ),	  XubString( RTL_CONSTASCII_USTRINGPARAM( "LightRed" ) ) );
     aValueSet.InsertItem( 22, Color( COL_LIGHTMAGENTA ),  XubString( RTL_CONSTASCII_USTRINGPARAM( "LightMagenta" ) ) );
-    aValueSet.InsertItem( 23, Color( COL_YELLOW ),        XubString( RTL_CONSTASCII_USTRINGPARAM( "Yellow" ) ) );
-    aValueSet.InsertItem( 24, Color( COL_WHITE ),         XubString( RTL_CONSTASCII_USTRINGPARAM( "White" ) ) );
+    aValueSet.InsertItem( 23, Color( COL_YELLOW ),		  XubString( RTL_CONSTASCII_USTRINGPARAM( "Yellow" ) ) );
+    aValueSet.InsertItem( 24, Color( COL_WHITE ),		  XubString( RTL_CONSTASCII_USTRINGPARAM( "White" ) ) );
     aValueSet.SetText( XubString( RTL_CONSTASCII_USTRINGPARAM( "None" ) ) );
     aValueSet.SetColCount( 4 );
     aValueSet.SetLineCount( 4 );
@@ -821,7 +821,7 @@ MyWin::MyWin( Window* pParent, WinBits aWinStyle ) :
     aCalendarField.EnableEmptyFieldValue( TRUE );
     aCalendarField.SetCalendarStyle( aCalendarField.GetCalendarStyle() | WB_RANGESELECT );
     aCalendarField.SetSelectHdl( LINK( this, MyWin, CalSelectHdl ) );
-//    aCalendarField.SetDate( Date() );
+//	  aCalendarField.SetDate( Date() );
     aCalendarField.SetEmptyDate();
     aCalendarField.EnableToday();
     aCalendarField.EnableNone();
@@ -1021,10 +1021,10 @@ void MyWin::ContextMenu( const Point& rPos )
 
     if ( !pMenu )
     {
-        pMenu       = new PopupMenu;
-        pNameMenu   = new FontNameMenu;
-        pStyleMenu  = new FontStyleMenu;
-        pSizeMenu   = new FontSizeMenu;
+        pMenu		= new PopupMenu;
+        pNameMenu	= new FontNameMenu;
+        pStyleMenu	= new FontStyleMenu;
+        pSizeMenu	= new FontSizeMenu;
 
         pMenu->InsertItem( 1, XubString( RTL_CONSTASCII_USTRINGPARAM( "Font" ) ) );
         pMenu->InsertItem( 2, XubString( RTL_CONSTASCII_USTRINGPARAM( "Attribute" ) ) );
diff --git a/svtools/workben/toolpanel/toolpaneltest.cxx b/svtools/workben/toolpanel/toolpaneltest.cxx
index 6d044cee7c93..5e8e8c64011c 100755
--- a/svtools/workben/toolpanel/toolpaneltest.cxx
+++ b/svtools/workben/toolpanel/toolpaneltest.cxx
@@ -1,6 +1,6 @@
 /*************************************************************************
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-*
+* 
 * Copyright 2009 by Sun Microsystems, Inc.
 *
 * OpenOffice.org - a multi-platform office productivity suite
@@ -341,7 +341,7 @@ public:
                     ~PanelDemoMainWindow();
 
     // window overridables
-    virtual void    Resize();
+    virtual void	Resize();
 
 public:
     // operations
@@ -385,22 +385,22 @@ OptionsWindow::OptionsWindow( PanelDemoMainWindow& i_rParent )
 {
     SetBorderStyle( WINDOW_BORDER_MONO );
 
-    m_aColors.InsertEntry( Color( COL_BLACK ),         String( RTL_CONSTASCII_USTRINGPARAM( "Black" ) ) );
-    m_aColors.InsertEntry( Color( COL_BLUE ),          String( RTL_CONSTASCII_USTRINGPARAM( "Blue" ) ) );
-    m_aColors.InsertEntry( Color( COL_GREEN ),         String( RTL_CONSTASCII_USTRINGPARAM( "Green" ) ) );
-    m_aColors.InsertEntry( Color( COL_CYAN ),          String( RTL_CONSTASCII_USTRINGPARAM( "Cyan" ) ) );
-    m_aColors.InsertEntry( Color( COL_RED ),           String( RTL_CONSTASCII_USTRINGPARAM( "Red" ) ) );
-    m_aColors.InsertEntry( Color( COL_MAGENTA ),       String( RTL_CONSTASCII_USTRINGPARAM( "Magenta" ) ) );
-    m_aColors.InsertEntry( Color( COL_BROWN ),         String( RTL_CONSTASCII_USTRINGPARAM( "Brown" ) ) );
-    m_aColors.InsertEntry( Color( COL_GRAY ),          String( RTL_CONSTASCII_USTRINGPARAM( "Gray" ) ) );
-    m_aColors.InsertEntry( Color( COL_LIGHTGRAY ),     String( RTL_CONSTASCII_USTRINGPARAM( "Light Gray" ) ) );
-    m_aColors.InsertEntry( Color( COL_LIGHTBLUE ),     String( RTL_CONSTASCII_USTRINGPARAM( "Light Blue" ) ) );
+    m_aColors.InsertEntry( Color( COL_BLACK ),		   String( RTL_CONSTASCII_USTRINGPARAM( "Black" ) ) );
+    m_aColors.InsertEntry( Color( COL_BLUE ),		   String( RTL_CONSTASCII_USTRINGPARAM( "Blue" ) ) );
+    m_aColors.InsertEntry( Color( COL_GREEN ),		   String( RTL_CONSTASCII_USTRINGPARAM( "Green" ) ) );
+    m_aColors.InsertEntry( Color( COL_CYAN ),		   String( RTL_CONSTASCII_USTRINGPARAM( "Cyan" ) ) );
+    m_aColors.InsertEntry( Color( COL_RED ),		   String( RTL_CONSTASCII_USTRINGPARAM( "Red" ) ) );
+    m_aColors.InsertEntry( Color( COL_MAGENTA ),	   String( RTL_CONSTASCII_USTRINGPARAM( "Magenta" ) ) );
+    m_aColors.InsertEntry( Color( COL_BROWN ),		   String( RTL_CONSTASCII_USTRINGPARAM( "Brown" ) ) );
+    m_aColors.InsertEntry( Color( COL_GRAY ),		   String( RTL_CONSTASCII_USTRINGPARAM( "Gray" ) ) );
+    m_aColors.InsertEntry( Color( COL_LIGHTGRAY ),	   String( RTL_CONSTASCII_USTRINGPARAM( "Light Gray" ) ) );
+    m_aColors.InsertEntry( Color( COL_LIGHTBLUE ),	   String( RTL_CONSTASCII_USTRINGPARAM( "Light Blue" ) ) );
     m_aColors.InsertEntry( Color( COL_LIGHTGREEN ),    String( RTL_CONSTASCII_USTRINGPARAM( "Light Green" ) ) );
-    m_aColors.InsertEntry( Color( COL_LIGHTCYAN ),     String( RTL_CONSTASCII_USTRINGPARAM( "Light Cyan" ) ) );
-    m_aColors.InsertEntry( Color( COL_LIGHTRED ),      String( RTL_CONSTASCII_USTRINGPARAM( "Light Red" ) ) );
+    m_aColors.InsertEntry( Color( COL_LIGHTCYAN ),	   String( RTL_CONSTASCII_USTRINGPARAM( "Light Cyan" ) ) );
+    m_aColors.InsertEntry( Color( COL_LIGHTRED ),	   String( RTL_CONSTASCII_USTRINGPARAM( "Light Red" ) ) );
     m_aColors.InsertEntry( Color( COL_LIGHTMAGENTA ),  String( RTL_CONSTASCII_USTRINGPARAM( "Light Magenta" ) ) );
-    m_aColors.InsertEntry( Color( COL_YELLOW ),        String( RTL_CONSTASCII_USTRINGPARAM( "Yellow" ) ) );
-    m_aColors.InsertEntry( Color( COL_WHITE ),         String( RTL_CONSTASCII_USTRINGPARAM( "White" ) ) );
+    m_aColors.InsertEntry( Color( COL_YELLOW ), 	   String( RTL_CONSTASCII_USTRINGPARAM( "Yellow" ) ) );
+    m_aColors.InsertEntry( Color( COL_WHITE ),		   String( RTL_CONSTASCII_USTRINGPARAM( "White" ) ) );
     m_aColors.SetDropDownLineCount( 16 );
 
     Window* pControls[] =
diff --git a/svtools/workben/treecontrol/treetest.cxx b/svtools/workben/treecontrol/treetest.cxx
index f82c4ae388f5..6beb911b92ad 100644
--- a/svtools/workben/treecontrol/treetest.cxx
+++ b/svtools/workben/treecontrol/treetest.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
@@ -128,7 +128,7 @@ void DirectoryTree::display( const OUString& rURL )
 
     // first create a data model for our tree control
     mxTreeDataModel = Reference< XMutableTreeDataModel >(
-        mxMultiComponentFactoryServer->createInstanceWithContext(
+        mxMultiComponentFactoryServer->createInstanceWithContext( 
             OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.awt.tree.MutableTreeDataModel" ) ),
             mxComponentContext ), UNO_QUERY_THROW );
 
@@ -143,39 +143,39 @@ void DirectoryTree::display( const OUString& rURL )
 
     // now create the dialog
     Reference< XControlModel > xDialogModel(
-        mxMultiComponentFactoryServer->createInstanceWithContext(
+        mxMultiComponentFactoryServer->createInstanceWithContext( 
             OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.awt.UnoControlDialogModel" ) ),
             mxComponentContext ), UNO_QUERY_THROW );
 
     Reference< XPropertySet > xDialogPropertySet( xDialogModel, UNO_QUERY_THROW );
-    xDialogPropertySet->setPropertyValue( sPositionX,   Any( sal_Int32(50) ) );
-    xDialogPropertySet->setPropertyValue( sPositionY,   Any( sal_Int32(50) ) );
-    xDialogPropertySet->setPropertyValue( sWidth,       Any( sal_Int32(256) ) );
-    xDialogPropertySet->setPropertyValue( sHeight,      Any( sal_Int32(256) ) );
-    xDialogPropertySet->setPropertyValue( sTitle,       Any( OUString( RTL_CONSTASCII_USTRINGPARAM( "Tree Control Test" ) ) ) );
+    xDialogPropertySet->setPropertyValue( sPositionX,	Any( sal_Int32(50) ) );
+    xDialogPropertySet->setPropertyValue( sPositionY,	Any( sal_Int32(50) ) );
+    xDialogPropertySet->setPropertyValue( sWidth,		Any( sal_Int32(256) ) );
+    xDialogPropertySet->setPropertyValue( sHeight,		Any( sal_Int32(256) ) );
+    xDialogPropertySet->setPropertyValue( sTitle,		Any( OUString( RTL_CONSTASCII_USTRINGPARAM( "Tree Control Test" ) ) ) );
 
     Reference< XMultiServiceFactory > xDialogMSF( xDialogModel, UNO_QUERY_THROW );
 
     // now create our tree control
     Reference< XControlModel > xTreeControlModel(
-        xDialogMSF->createInstance(
+        xDialogMSF->createInstance( 
             OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.awt.tree.TreeControlModel" ) ) ),
             UNO_QUERY_THROW );
 
     Reference< XPropertySet > XTreeControlModelSet( xTreeControlModel, UNO_QUERY_THROW );
 
-    XTreeControlModelSet->setPropertyValue( sSelectionType, Any( SelectionType_NONE ) );
-    XTreeControlModelSet->setPropertyValue( sPositionX,     Any( sal_Int32(3) ) );
-    XTreeControlModelSet->setPropertyValue( sPositionY,     Any( sal_Int32(3) ) );
-    XTreeControlModelSet->setPropertyValue( sWidth,         Any( sal_Int32(253) ) );
-    XTreeControlModelSet->setPropertyValue( sHeight,        Any( sal_Int32(253) ) );
-    XTreeControlModelSet->setPropertyValue( sDataModel,     Any( mxTreeDataModel ) );
+    XTreeControlModelSet->setPropertyValue( sSelectionType,	Any( SelectionType_NONE ) );
+    XTreeControlModelSet->setPropertyValue( sPositionX,		Any( sal_Int32(3) ) );
+    XTreeControlModelSet->setPropertyValue( sPositionY,		Any( sal_Int32(3) ) );
+    XTreeControlModelSet->setPropertyValue( sWidth,			Any( sal_Int32(253) ) );
+    XTreeControlModelSet->setPropertyValue( sHeight,		Any( sal_Int32(253) ) );
+    XTreeControlModelSet->setPropertyValue( sDataModel,		Any( mxTreeDataModel ) );
     XTreeControlModelSet->setPropertyValue( sShowsRootHandles,Any( sal_False ) );
-    XTreeControlModelSet->setPropertyValue( sShowsHandles,  Any( sal_False ) );
-    XTreeControlModelSet->setPropertyValue( sRootDisplayed, Any( sal_True ) );
-    XTreeControlModelSet->setPropertyValue( sEditable,      Any( sal_True ) );
-//  XTreeControlModelSet->setPropertyValue( sRowHeight,     Any( sal_Int32( 12 ) ) );
-
+    XTreeControlModelSet->setPropertyValue( sShowsHandles,	Any( sal_False ) );
+    XTreeControlModelSet->setPropertyValue( sRootDisplayed,	Any( sal_True ) );
+    XTreeControlModelSet->setPropertyValue( sEditable,		Any( sal_True ) );
+//	XTreeControlModelSet->setPropertyValue( sRowHeight,		Any( sal_Int32( 12 ) ) );
+  
     Reference< XNameContainer > xDialogModelContainer( xDialogModel, UNO_QUERY_THROW );
 
     const OUString sTreeControlName( RTL_CONSTASCII_USTRINGPARAM( "tree" ) );
@@ -184,18 +184,18 @@ void DirectoryTree::display( const OUString& rURL )
 
     // now create the peers
     Reference< XControl > xDialogControl(
-        mxMultiComponentFactoryServer->createInstanceWithContext(
+        mxMultiComponentFactoryServer->createInstanceWithContext( 
             OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.awt.UnoControlDialog" ) ),
             mxComponentContext ), UNO_QUERY_THROW );
 
     xDialogControl->setModel( xDialogModel );
-
+    
     Reference< XToolkit > xToolkit(
-        mxMultiComponentFactoryServer->createInstanceWithContext(
+        mxMultiComponentFactoryServer->createInstanceWithContext( 
             OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.awt.Toolkit" ) ),
             mxComponentContext ), UNO_QUERY_THROW );
     xDialogControl->createPeer( xToolkit, 0 );
-
+    
     // get the peers of the sub controls from the dialog peer container
     Reference< XControlContainer > xDialogContainer( xDialogControl, UNO_QUERY_THROW );
     mxTreeControl = Reference< XTreeControl >( xDialogContainer->getControl( sTreeControlName ), UNO_QUERY_THROW );
@@ -314,9 +314,9 @@ int SAL_CALL main( int argc, char **argv )
     }
      if (argc == 3)
     {
-        sConnectionString = OUString::createFromAscii(argv[2]);
-    }
-
+        sConnectionString = OUString::createFromAscii(argv[2]);        
+    } 
+    
     // Creates a simple registry service instance.
     Reference< XSimpleRegistry > xSimpleRegistry(::cppu::createSimpleRegistry() );
 
@@ -334,7 +334,7 @@ int SAL_CALL main( int argc, char **argv )
     */
     Reference< XComponentContext > xComponentContext(
         ::cppu::bootstrap_InitialComponentContext( xSimpleRegistry ) );
-
+    
     /* Gets the service manager instance to be used (or null). This method has
        been added for convenience, because the service manager is a often used
        object.
@@ -346,7 +346,7 @@ int SAL_CALL main( int argc, char **argv )
        by the factory.
     */
     Reference< XInterface > xInterface =
-        xMultiComponentFactoryClient->createInstanceWithContext(
+        xMultiComponentFactoryClient->createInstanceWithContext( 
             OUString::createFromAscii( "com.sun.star.bridge.UnoUrlResolver" ),
             xComponentContext );
 
@@ -355,7 +355,7 @@ int SAL_CALL main( int argc, char **argv )
     // Resolves the component context from the office, on the uno URL given by argv[1].
     try
     {
-        xInterface = Reference< XInterface >(
+        xInterface = Reference< XInterface >( 
             resolver->resolve( sConnectionString ), UNO_QUERY );
     }
     catch ( Exception& e )
@@ -363,9 +363,9 @@ int SAL_CALL main( int argc, char **argv )
         printf("Error: cannot establish a connection using '%s':\n       %s\n",
                OUStringToOString(sConnectionString, RTL_TEXTENCODING_ASCII_US).getStr(),
                OUStringToOString(e.Message, RTL_TEXTENCODING_ASCII_US).getStr());
-        exit(1);
+        exit(1);        
     }
-
+    
     // gets the server component context as property of the office component factory
     Reference< XPropertySet > xPropSet( xInterface, UNO_QUERY );
     xPropSet->getPropertyValue( OUString::createFromAscii("DefaultContext") ) >>= xComponentContext;
@@ -373,7 +373,7 @@ int SAL_CALL main( int argc, char **argv )
     // gets the service manager from the office
     Reference< XMultiComponentFactory > xMultiComponentFactoryServer(
         xComponentContext->getServiceManager() );
-
+  
     try
     {
         OUString ustrFileURL;
@@ -386,11 +386,11 @@ int SAL_CALL main( int argc, char **argv )
     {
         printf("Error: exception caught during test:\n       %s\n",
                OUStringToOString(e.Message, RTL_TEXTENCODING_ASCII_US).getStr());
-        exit(1);
+        exit(1);        
     }
 
     // dispose the local service manager
     Reference< XComponent >::query( xMultiComponentFactoryClient )->dispose();
 
     return 0;
-}
+} 
diff --git a/svtools/workben/unodialog/roadmapskeleton.cxx b/svtools/workben/unodialog/roadmapskeleton.cxx
index e3ed06707f14..ace64b740273 100644
--- a/svtools/workben/unodialog/roadmapskeleton.cxx
+++ b/svtools/workben/unodialog/roadmapskeleton.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
diff --git a/svtools/workben/unodialog/roadmapskeleton.hrc b/svtools/workben/unodialog/roadmapskeleton.hrc
index 9b704e4a8f11..02727c53243f 100644
--- a/svtools/workben/unodialog/roadmapskeleton.hrc
+++ b/svtools/workben/unodialog/roadmapskeleton.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
diff --git a/svtools/workben/unodialog/roadmapskeleton.hxx b/svtools/workben/unodialog/roadmapskeleton.hxx
index 8859390c4b58..647b8d5f7b1e 100644
--- a/svtools/workben/unodialog/roadmapskeleton.hxx
+++ b/svtools/workben/unodialog/roadmapskeleton.hxx
@@ -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
diff --git a/svtools/workben/unodialog/roadmapskeleton.src b/svtools/workben/unodialog/roadmapskeleton.src
index 797490273b5f..11d828245be7 100644
--- a/svtools/workben/unodialog/roadmapskeleton.src
+++ b/svtools/workben/unodialog/roadmapskeleton.src
@@ -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
diff --git a/svtools/workben/unodialog/roadmapskeletonpages.cxx b/svtools/workben/unodialog/roadmapskeletonpages.cxx
index 9d9291f92da5..1fc05a83fc3f 100644
--- a/svtools/workben/unodialog/roadmapskeletonpages.cxx
+++ b/svtools/workben/unodialog/roadmapskeletonpages.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
diff --git a/svtools/workben/unodialog/roadmapskeletonpages.hxx b/svtools/workben/unodialog/roadmapskeletonpages.hxx
index 6b1d9b01710d..a0d96a070226 100644
--- a/svtools/workben/unodialog/roadmapskeletonpages.hxx
+++ b/svtools/workben/unodialog/roadmapskeletonpages.hxx
@@ -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
diff --git a/svtools/workben/unodialog/udlg_global.hrc b/svtools/workben/unodialog/udlg_global.hrc
index 572de306f0df..9dc064974041 100644
--- a/svtools/workben/unodialog/udlg_global.hrc
+++ b/svtools/workben/unodialog/udlg_global.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
diff --git a/svtools/workben/unodialog/udlg_module.cxx b/svtools/workben/unodialog/udlg_module.cxx
index da16bc5657ab..be2646d5d1b6 100644
--- a/svtools/workben/unodialog/udlg_module.cxx
+++ b/svtools/workben/unodialog/udlg_module.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
diff --git a/svtools/workben/unodialog/udlg_module.hxx b/svtools/workben/unodialog/udlg_module.hxx
index 2f1b30d9afed..45d37cf51e6b 100644
--- a/svtools/workben/unodialog/udlg_module.hxx
+++ b/svtools/workben/unodialog/udlg_module.hxx
@@ -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
diff --git a/svtools/workben/unodialog/udlg_services.cxx b/svtools/workben/unodialog/udlg_services.cxx
index b71dceed5eba..c4cb6fe287f1 100644
--- a/svtools/workben/unodialog/udlg_services.cxx
+++ b/svtools/workben/unodialog/udlg_services.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
diff --git a/svtools/workben/unodialog/unodialogsample.cxx b/svtools/workben/unodialog/unodialogsample.cxx
index 4eadc646fef5..c1bee1651446 100644
--- a/svtools/workben/unodialog/unodialogsample.cxx
+++ b/svtools/workben/unodialog/unodialogsample.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
@@ -93,7 +93,7 @@ namespace udlg
         ~UnoDialogSkeleton();
 
     protected:
-        virtual Dialog* createDialog( Window* _pParent );
+        virtual Dialog*	createDialog( Window* _pParent );
         virtual void destroyDialog();
 
     private:
@@ -130,7 +130,7 @@ namespace udlg
     }
 
     //--------------------------------------------------------------------
-    Dialog* UnoDialogSkeleton::createDialog( Window* _pParent )
+    Dialog*	UnoDialogSkeleton::createDialog( Window* _pParent )
     {
         return new RoadmapSkeletonDialog( m_aContext, _pParent );
     }
@@ -156,13 +156,13 @@ namespace udlg
         }
         return pId->getImplementationId();
     }
-
+    
     //--------------------------------------------------------------------
     ::rtl::OUString SAL_CALL UnoDialogSkeleton::getImplementationName_static() throw(RuntimeException)
     {
         return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.svtools.workben.UnoDialogSkeleton" ) );
     }
-
+    
     //--------------------------------------------------------------------
     Sequence< ::rtl::OUString > SAL_CALL UnoDialogSkeleton::getSupportedServiceNames_static() throw(RuntimeException)
     {
@@ -176,7 +176,7 @@ namespace udlg
     {
         return getImplementationName_static();
     }
-
+    
     //--------------------------------------------------------------------
     Sequence< ::rtl::OUString > SAL_CALL UnoDialogSkeleton::getSupportedServiceNames() throw(RuntimeException)
     {
diff --git a/svtools/workben/urange.cxx b/svtools/workben/urange.cxx
index aa5eba3d5543..a807c6a44328 100644
--- a/svtools/workben/urange.cxx
+++ b/svtools/workben/urange.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
diff --git a/toolkit/inc/layout/layout-post.hxx b/toolkit/inc/layout/layout-post.hxx
index 8ef66bf04470..22f996ba838e 100644
--- a/toolkit/inc/layout/layout-post.hxx
+++ b/toolkit/inc/layout/layout-post.hxx
@@ -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
diff --git a/toolkit/inc/layout/layout-pre.hxx b/toolkit/inc/layout/layout-pre.hxx
index 09605ad440d5..29e7b95c5028 100644
--- a/toolkit/inc/layout/layout-pre.hxx
+++ b/toolkit/inc/layout/layout-pre.hxx
@@ -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
diff --git a/toolkit/inc/layout/layout.hxx b/toolkit/inc/layout/layout.hxx
index 78c7ea29272a..d0e0b2ef2ab4 100644
--- a/toolkit/inc/layout/layout.hxx
+++ b/toolkit/inc/layout/layout.hxx
@@ -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
diff --git a/toolkit/inc/pch/precompiled_toolkit.cxx b/toolkit/inc/pch/precompiled_toolkit.cxx
index b448e489dc90..b3a4478801b7 100644
--- a/toolkit/inc/pch/precompiled_toolkit.cxx
+++ b/toolkit/inc/pch/precompiled_toolkit.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
diff --git a/toolkit/inc/pch/precompiled_toolkit.hxx b/toolkit/inc/pch/precompiled_toolkit.hxx
index d0baff3b8343..c7430ecae772 100644
--- a/toolkit/inc/pch/precompiled_toolkit.hxx
+++ b/toolkit/inc/pch/precompiled_toolkit.hxx
@@ -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
diff --git a/toolkit/inc/toolkit/awt/vclxaccessiblecomponent.hxx b/toolkit/inc/toolkit/awt/vclxaccessiblecomponent.hxx
index 12e7b10d8330..85a9fbbaa558 100644
--- a/toolkit/inc/toolkit/awt/vclxaccessiblecomponent.hxx
+++ b/toolkit/inc/toolkit/awt/vclxaccessiblecomponent.hxx
@@ -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
@@ -40,8 +40,8 @@
 #include <comphelper/accimplaccess.hxx>
 #include <comphelper/accessiblecomponenthelper.hxx>
 
-#include <tools/gen.hxx>    // Size
-#include <tools/link.hxx>   // Size
+#include <tools/gen.hxx>	// Size
+#include <tools/link.hxx>	// Size
 
 class Window;
 class VCLXWindow;
@@ -54,13 +54,13 @@ class AccessibleStateSetHelper;
 }
 
 
-//  ----------------------------------------------------
-//  class VCLXAccessibleComponent
-//  ----------------------------------------------------
+//	----------------------------------------------------
+//	class VCLXAccessibleComponent
+//	----------------------------------------------------
 
-typedef ::comphelper::OAccessibleExtendedComponentHelper    AccessibleExtendedComponentHelper_BASE;
+typedef ::comphelper::OAccessibleExtendedComponentHelper	AccessibleExtendedComponentHelper_BASE;
 
-typedef ::cppu::ImplHelper1<
+typedef ::cppu::ImplHelper1< 
     ::com::sun::star::lang::XServiceInfo > VCLXAccessibleComponent_BASE;
 
 class VCLExternalSolarLock;
@@ -72,30 +72,30 @@ class TOOLKIT_DLLPUBLIC VCLXAccessibleComponent
 {
 private:
     ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow> mxWindow;
-    VCLXWindow*                         mpVCLXindow;
+    VCLXWindow* 						mpVCLXindow;
 
-    ULONG                           nDummy1;
-    ULONG                           nDummy2;
-    void*                           pDummy1;
-    VCLExternalSolarLock*           m_pSolarLock;
+    ULONG							nDummy1;
+    ULONG							nDummy2;
+    void*							pDummy1;
+    VCLExternalSolarLock*			m_pSolarLock;
 
 protected:
      DECL_LINK( WindowEventListener, VclSimpleEvent* );
      DECL_LINK( WindowChildEventListener, VclSimpleEvent* );
 
-    virtual void    ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent );
-    virtual void    ProcessWindowChildEvent( const VclWindowEvent& rVclWindowEvent );
-    virtual void    FillAccessibleRelationSet( utl::AccessibleRelationSetHelper& rRelationSet );
-    virtual void    FillAccessibleStateSet( utl::AccessibleStateSetHelper& rStateSet );
+    virtual void	ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent );
+    virtual void	ProcessWindowChildEvent( const VclWindowEvent& rVclWindowEvent );
+    virtual void	FillAccessibleRelationSet( utl::AccessibleRelationSetHelper& rRelationSet );
+    virtual void	FillAccessibleStateSet( utl::AccessibleStateSetHelper& rStateSet );
 
     virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > GetChildAccessible( const VclWindowEvent& rVclWindowEvent );
-
+    
 public:
     VCLXAccessibleComponent( VCLXWindow* pVCLXindow );
     ~VCLXAccessibleComponent();
 
     VCLXWindow*    GetVCLXWindow() const { return mpVCLXindow; }
-    Window*        GetWindow() const;
+    Window* 	   GetWindow() const;
 
     virtual void SAL_CALL disposing();
 
@@ -112,24 +112,24 @@ public:
     // ::com::sun::star::accessibility::XAccessibleContext
     sal_Int32 SAL_CALL getAccessibleChildCount(  ) throw (::com::sun::star::uno::RuntimeException);
     ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleChild( sal_Int32 i ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException);
-    ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleParent(  ) throw (::com::sun::star::uno::RuntimeException);
-    sal_Int32 SAL_CALL getAccessibleIndexInParent(  ) throw (::com::sun::star::uno::RuntimeException);
+    ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleParent(	) throw (::com::sun::star::uno::RuntimeException);
+    sal_Int32 SAL_CALL getAccessibleIndexInParent(	) throw (::com::sun::star::uno::RuntimeException);
     sal_Int16 SAL_CALL getAccessibleRole(  ) throw (::com::sun::star::uno::RuntimeException);
-    ::rtl::OUString SAL_CALL getAccessibleDescription(  ) throw (::com::sun::star::uno::RuntimeException);
+    ::rtl::OUString SAL_CALL getAccessibleDescription(	) throw (::com::sun::star::uno::RuntimeException);
     ::rtl::OUString SAL_CALL getAccessibleName(  ) throw (::com::sun::star::uno::RuntimeException);
-    ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleRelationSet > SAL_CALL getAccessibleRelationSet(  ) throw (::com::sun::star::uno::RuntimeException);
+    ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleRelationSet > SAL_CALL getAccessibleRelationSet(	) throw (::com::sun::star::uno::RuntimeException);
     ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleStateSet > SAL_CALL getAccessibleStateSet(  ) throw (::com::sun::star::uno::RuntimeException);
-    ::com::sun::star::lang::Locale SAL_CALL getLocale(  ) throw (::com::sun::star::accessibility::IllegalAccessibleComponentStateException, ::com::sun::star::uno::RuntimeException);
+    ::com::sun::star::lang::Locale SAL_CALL getLocale(	) throw (::com::sun::star::accessibility::IllegalAccessibleComponentStateException, ::com::sun::star::uno::RuntimeException);
 
     // ::com::sun::star::accessibility::XAccessibleComponent
     ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleAtPoint( const ::com::sun::star::awt::Point& aPoint ) throw (::com::sun::star::uno::RuntimeException);
-    ::com::sun::star::awt::Point SAL_CALL getLocationOnScreen(  ) throw (::com::sun::star::uno::RuntimeException);
+    ::com::sun::star::awt::Point SAL_CALL getLocationOnScreen(	) throw (::com::sun::star::uno::RuntimeException);
     void SAL_CALL grabFocus(  ) throw (::com::sun::star::uno::RuntimeException);
     virtual sal_Int32 SAL_CALL getForeground(  ) throw (::com::sun::star::uno::RuntimeException);
     virtual sal_Int32 SAL_CALL getBackground(  ) throw (::com::sun::star::uno::RuntimeException);
 
     // ::com::sun::star::accessibility::XAccessibleExtendedComponent
-    virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XFont > SAL_CALL getFont(  ) throw (::com::sun::star::uno::RuntimeException);
+    virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XFont > SAL_CALL getFont(	) throw (::com::sun::star::uno::RuntimeException);
     virtual ::rtl::OUString SAL_CALL getTitledBorderText(  ) throw (::com::sun::star::uno::RuntimeException);
     virtual ::rtl::OUString SAL_CALL getToolTipText(  ) throw (::com::sun::star::uno::RuntimeException);
 
@@ -138,7 +138,7 @@ protected:
     ::com::sun::star::awt::Rectangle SAL_CALL implGetBounds(  ) throw (::com::sun::star::uno::RuntimeException);
 
 private:
-    /** we may be reparented (if external components use OAccessibleImplementationAccess base class),
+    /**	we may be reparented (if external components use OAccessibleImplementationAccess base class),
         so this method here returns the parent in the VCL world, in opposite to the parent
         an external component gave us
     @precond
diff --git a/toolkit/inc/toolkit/awt/vclxbitmap.hxx b/toolkit/inc/toolkit/awt/vclxbitmap.hxx
index 7712372dfaee..832198699e50 100644
--- a/toolkit/inc/toolkit/awt/vclxbitmap.hxx
+++ b/toolkit/inc/toolkit/awt/vclxbitmap.hxx
@@ -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
@@ -37,47 +37,47 @@
 #include <vcl/bitmapex.hxx>
 
 
-//  ----------------------------------------------------
-//  class VCLXBitmap
-//  ----------------------------------------------------
+//	----------------------------------------------------
+//	class VCLXBitmap
+//	----------------------------------------------------
 
-class VCLXBitmap :  public ::com::sun::star::awt::XBitmap,
+class VCLXBitmap :	public ::com::sun::star::awt::XBitmap, 
                     public ::com::sun::star::awt::XDisplayBitmap,
                     public ::com::sun::star::lang::XTypeProvider,
                     public ::com::sun::star::lang::XUnoTunnel,
                     public ::cppu::OWeakObject
 {
 private:
-    ::osl::Mutex    maMutex;
-    BitmapEx        maBitmap;
+    ::osl::Mutex	maMutex;
+    BitmapEx		maBitmap;
 
 protected:
-    ::osl::Mutex&   GetMutex() { return maMutex; }
+    ::osl::Mutex&	GetMutex() { return maMutex; }
 
 
 public:
-    void            SetBitmap( const BitmapEx& rBmp )   { maBitmap = rBmp; }
-    const BitmapEx& GetBitmap() const                   { return maBitmap; }
-
+    void			SetBitmap( const BitmapEx& rBmp )	{ maBitmap = rBmp; }
+    const BitmapEx&	GetBitmap() const					{ return maBitmap; }
 
+    
     // ::com::sun::star::uno::XInterface
-    ::com::sun::star::uno::Any                  SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException);
-    void                                        SAL_CALL acquire() throw()  { OWeakObject::acquire(); }
-    void                                        SAL_CALL release() throw()  { OWeakObject::release(); }
+    ::com::sun::star::uno::Any					SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException);
+    void										SAL_CALL acquire() throw()	{ OWeakObject::acquire(); }
+    void										SAL_CALL release() throw()	{ OWeakObject::release(); }
 
     // ::com::sun::star::lang::XUnoTunnel
-    static const ::com::sun::star::uno::Sequence< sal_Int8 >&   GetUnoTunnelId() throw();
-    static VCLXBitmap*                                          GetImplementation( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& rxIFace ) throw();
-    sal_Int64                                                   SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& rIdentifier ) throw(::com::sun::star::uno::RuntimeException);
+    static const ::com::sun::star::uno::Sequence< sal_Int8 >&	GetUnoTunnelId() throw();
+    static VCLXBitmap*											GetImplementation( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& rxIFace ) throw();
+    sal_Int64													SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& rIdentifier ) throw(::com::sun::star::uno::RuntimeException);
 
     // ::com::sun::star::lang::XTypeProvider
-    ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type >  SAL_CALL getTypes() throw(::com::sun::star::uno::RuntimeException);
-    ::com::sun::star::uno::Sequence< sal_Int8 >                     SAL_CALL getImplementationId() throw(::com::sun::star::uno::RuntimeException);
+    ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type >	SAL_CALL getTypes() throw(::com::sun::star::uno::RuntimeException);
+    ::com::sun::star::uno::Sequence< sal_Int8 >						SAL_CALL getImplementationId() throw(::com::sun::star::uno::RuntimeException);
 
     // ::com::sun::star::awt::XBitmap
-    ::com::sun::star::awt::Size                 SAL_CALL getSize() throw(::com::sun::star::uno::RuntimeException);
-    ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getDIB() throw(::com::sun::star::uno::RuntimeException);
-    ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getMaskDIB() throw(::com::sun::star::uno::RuntimeException);
+    ::com::sun::star::awt::Size					SAL_CALL getSize() throw(::com::sun::star::uno::RuntimeException);
+    ::com::sun::star::uno::Sequence< sal_Int8 >	SAL_CALL getDIB() throw(::com::sun::star::uno::RuntimeException);
+    ::com::sun::star::uno::Sequence< sal_Int8 >	SAL_CALL getMaskDIB() throw(::com::sun::star::uno::RuntimeException);
 };
 
 
diff --git a/toolkit/inc/toolkit/awt/vclxcontainer.hxx b/toolkit/inc/toolkit/awt/vclxcontainer.hxx
index b854844ae7f1..7f3f728babe8 100644
--- a/toolkit/inc/toolkit/awt/vclxcontainer.hxx
+++ b/toolkit/inc/toolkit/awt/vclxcontainer.hxx
@@ -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
@@ -38,26 +38,26 @@
 #include <toolkit/awt/vclxwindow.hxx>
 
 
-//  ----------------------------------------------------
-//  class VCLXContainer
-//  ----------------------------------------------------
+//	----------------------------------------------------
+//	class VCLXContainer
+//	----------------------------------------------------
 
-class VCLXContainer :   public ::com::sun::star::awt::XVclContainer,
-                        public ::com::sun::star::awt::XVclContainerPeer,
+class VCLXContainer :	public ::com::sun::star::awt::XVclContainer, 
+                        public ::com::sun::star::awt::XVclContainerPeer, 
                         public VCLXWindow
 {
-public:
+public:	
                     VCLXContainer();
                     ~VCLXContainer();
-
+    
     // ::com::sun::star::uno::XInterface
-    ::com::sun::star::uno::Any  SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException);
-    void                        SAL_CALL acquire() throw()  { OWeakObject::acquire(); }
-    void                        SAL_CALL release() throw()  { OWeakObject::release(); }
+    ::com::sun::star::uno::Any	SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException);
+    void						SAL_CALL acquire() throw()	{ OWeakObject::acquire(); }
+    void						SAL_CALL release() throw()	{ OWeakObject::release(); }
 
     // ::com::sun::star::lang::XTypeProvider
-    ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type >  SAL_CALL getTypes() throw(::com::sun::star::uno::RuntimeException);
-    ::com::sun::star::uno::Sequence< sal_Int8 >                     SAL_CALL getImplementationId() throw(::com::sun::star::uno::RuntimeException);
+    ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type >	SAL_CALL getTypes() throw(::com::sun::star::uno::RuntimeException);
+    ::com::sun::star::uno::Sequence< sal_Int8 >						SAL_CALL getImplementationId() throw(::com::sun::star::uno::RuntimeException);
 
     // ::com::sun::star::awt::XVclContainer
     void SAL_CALL addVclContainerListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XVclContainerListener >& l ) throw(::com::sun::star::uno::RuntimeException);
diff --git a/toolkit/inc/toolkit/awt/vclxdevice.hxx b/toolkit/inc/toolkit/awt/vclxdevice.hxx
index 62753a36136d..a41abb260316 100644
--- a/toolkit/inc/toolkit/awt/vclxdevice.hxx
+++ b/toolkit/inc/toolkit/awt/vclxdevice.hxx
@@ -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
@@ -41,14 +41,14 @@
 class OutputDevice;
 class VirtualDevice;
 
-//  ----------------------------------------------------
-//  class VCLXDevice
-//  ----------------------------------------------------
+//	----------------------------------------------------
+//	class VCLXDevice
+//	----------------------------------------------------
 
 // For using nDummy, no incompatible update, add a BOOL bCreatedWithToolkitMember later...
 #define FLAGS_CREATEDWITHTOOLKIT    0x00000001
 
-class TOOLKIT_DLLPUBLIC VCLXDevice :    public ::com::sun::star::awt::XDevice,
+class TOOLKIT_DLLPUBLIC VCLXDevice :	public ::com::sun::star::awt::XDevice, 
                     public ::com::sun::star::lang::XTypeProvider,
                     public ::com::sun::star::lang::XUnoTunnel,
 /* public ::com::sun::star::awt::XTextConstraints,*/
@@ -58,48 +58,48 @@ class TOOLKIT_DLLPUBLIC VCLXDevice :    public ::com::sun::star::awt::XDevice,
     friend class VCLXGraphics;
 
 private:
-    NAMESPACE_VOS(IMutex)&  mrMutex;    // Reference to SolarMutex
-    OutputDevice*           mpOutputDevice;
-
+    NAMESPACE_VOS(IMutex)&	mrMutex;	// Reference to SolarMutex
+    OutputDevice*			mpOutputDevice;
+    
 public:
-    void*                   pDummy;
-    sal_uInt32              nFlags;
+    void*					pDummy;
+    sal_uInt32				nFlags;
 
 protected:
-    NAMESPACE_VOS(IMutex)&  GetMutex() { return mrMutex; }
-    void                    DestroyOutputDevice();
+    NAMESPACE_VOS(IMutex)&	GetMutex() { return mrMutex; }
+    void					DestroyOutputDevice();
 
 public:
                             VCLXDevice();
                             ~VCLXDevice();
 
-    void                    SetOutputDevice( OutputDevice* pOutDev ) { mpOutputDevice = pOutDev; }
-    OutputDevice*           GetOutputDevice() const { return mpOutputDevice; }
-
+    void					SetOutputDevice( OutputDevice* pOutDev ) { mpOutputDevice = pOutDev; }
+    OutputDevice*			GetOutputDevice() const { return mpOutputDevice; }
+    
     void                    SetCreatedWithToolkit( sal_Bool bCreatedWithToolkit );
     sal_Bool                IsCreatedWithToolkit() const;
-
+    
     // ::com::sun::star::uno::XInterface
-    ::com::sun::star::uno::Any                  SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException);
-    void                                        SAL_CALL acquire() throw()  { OWeakObject::acquire(); }
-    void                                        SAL_CALL release() throw()  { OWeakObject::release(); }
+    ::com::sun::star::uno::Any					SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException);
+    void										SAL_CALL acquire() throw()	{ OWeakObject::acquire(); }
+    void										SAL_CALL release() throw()	{ OWeakObject::release(); }
 
     // ::com::sun::star::lang::XUnoTunnel
-    static const ::com::sun::star::uno::Sequence< sal_Int8 >&   GetUnoTunnelId() throw();
-    static VCLXDevice*                                          GetImplementation( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& rxIFace ) throw();
-    sal_Int64                                                   SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& rIdentifier ) throw(::com::sun::star::uno::RuntimeException);
+    static const ::com::sun::star::uno::Sequence< sal_Int8 >&	GetUnoTunnelId() throw();
+    static VCLXDevice*											GetImplementation( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& rxIFace ) throw();
+    sal_Int64													SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& rIdentifier ) throw(::com::sun::star::uno::RuntimeException);
 
     // ::com::sun::star::lang::XTypeProvider
-    ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type >  SAL_CALL getTypes() throw(::com::sun::star::uno::RuntimeException);
-    ::com::sun::star::uno::Sequence< sal_Int8 >                     SAL_CALL getImplementationId() throw(::com::sun::star::uno::RuntimeException);
+    ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type >	SAL_CALL getTypes() throw(::com::sun::star::uno::RuntimeException);
+    ::com::sun::star::uno::Sequence< sal_Int8 >						SAL_CALL getImplementationId() throw(::com::sun::star::uno::RuntimeException);
 
-    // ::com::sun::star::awt::XDevice,
-    ::com::sun::star::uno::Reference< ::com::sun::star::awt::XGraphics >    SAL_CALL createGraphics(  ) throw(::com::sun::star::uno::RuntimeException);
-    ::com::sun::star::uno::Reference< ::com::sun::star::awt::XDevice >      SAL_CALL createDevice( sal_Int32 nWidth, sal_Int32 nHeight ) throw(::com::sun::star::uno::RuntimeException);
-    ::com::sun::star::awt::DeviceInfo                                       SAL_CALL getInfo() throw(::com::sun::star::uno::RuntimeException);
+    // ::com::sun::star::awt::XDevice, 
+    ::com::sun::star::uno::Reference< ::com::sun::star::awt::XGraphics >	SAL_CALL createGraphics(  ) throw(::com::sun::star::uno::RuntimeException);
+    ::com::sun::star::uno::Reference< ::com::sun::star::awt::XDevice >		SAL_CALL createDevice( sal_Int32 nWidth, sal_Int32 nHeight ) throw(::com::sun::star::uno::RuntimeException);
+    ::com::sun::star::awt::DeviceInfo										SAL_CALL getInfo() throw(::com::sun::star::uno::RuntimeException);
     ::com::sun::star::uno::Sequence< ::com::sun::star::awt::FontDescriptor > SAL_CALL getFontDescriptors(  ) throw(::com::sun::star::uno::RuntimeException);
-    ::com::sun::star::uno::Reference< ::com::sun::star::awt::XFont >        SAL_CALL getFont( const ::com::sun::star::awt::FontDescriptor& aDescriptor ) throw(::com::sun::star::uno::RuntimeException);
-    ::com::sun::star::uno::Reference< ::com::sun::star::awt::XBitmap >      SAL_CALL createBitmap( sal_Int32 nX, sal_Int32 nY, sal_Int32 nWidth, sal_Int32 nHeight ) throw(::com::sun::star::uno::RuntimeException);
+    ::com::sun::star::uno::Reference< ::com::sun::star::awt::XFont >		SAL_CALL getFont( const ::com::sun::star::awt::FontDescriptor& aDescriptor ) throw(::com::sun::star::uno::RuntimeException);
+    ::com::sun::star::uno::Reference< ::com::sun::star::awt::XBitmap >		SAL_CALL createBitmap( sal_Int32 nX, sal_Int32 nY, sal_Int32 nWidth, sal_Int32 nHeight ) throw(::com::sun::star::uno::RuntimeException);
     ::com::sun::star::uno::Reference< ::com::sun::star::awt::XDisplayBitmap > SAL_CALL createDisplayBitmap( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XBitmap >& Bitmap ) throw(::com::sun::star::uno::RuntimeException);
 
     // ::com::sun::star::awt::XTextConstraints
@@ -115,19 +115,19 @@ public:
 
 };
 
-//  ----------------------------------------------------
-//  class VCLXVirtualDevice
-//  ----------------------------------------------------
+//	----------------------------------------------------
+//	class VCLXVirtualDevice
+//	----------------------------------------------------
 
 class VCLXVirtualDevice : public VCLXDevice
 {
 private:
-    VirtualDevice*  mpVDev;
+    VirtualDevice*	mpVDev;	
 
 public:
                     ~VCLXVirtualDevice();
 
-    void            SetVirtualDevice( VirtualDevice* pVDev ) { SetOutputDevice( (OutputDevice*)pVDev ); }
+    void			SetVirtualDevice( VirtualDevice* pVDev ) { SetOutputDevice( (OutputDevice*)pVDev ); }
 };
 
 
diff --git a/toolkit/inc/toolkit/awt/vclxfont.hxx b/toolkit/inc/toolkit/awt/vclxfont.hxx
index e912f2d13114..c8e3ed68fe38 100644
--- a/toolkit/inc/toolkit/awt/vclxfont.hxx
+++ b/toolkit/inc/toolkit/awt/vclxfont.hxx
@@ -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
@@ -37,54 +37,54 @@
 #include <osl/mutex.hxx>
 #include <vcl/metric.hxx>
 
-//  ----------------------------------------------------
-//  class VCLXFont
-//  ----------------------------------------------------
+//	----------------------------------------------------
+//	class VCLXFont
+//	----------------------------------------------------
 
-class TOOLKIT_DLLPUBLIC VCLXFont :  public ::com::sun::star::awt::XFont2,
+class TOOLKIT_DLLPUBLIC VCLXFont :	public ::com::sun::star::awt::XFont2, 
                     public ::com::sun::star::lang::XTypeProvider,
                     public ::com::sun::star::lang::XUnoTunnel,
                     public ::cppu::OWeakObject
 {
 private:
-    ::osl::Mutex    maMutex;
+    ::osl::Mutex	maMutex;
     ::com::sun::star::uno::Reference< ::com::sun::star::awt::XDevice> mxDevice;
-    Font            maFont;
-    FontMetric*     mpFontMetric;
+    Font			maFont;
+    FontMetric*		mpFontMetric;
 
 protected:
-    BOOL            ImplAssertValidFontMetric();
-    ::osl::Mutex&   GetMutex() { return maMutex; }
+    BOOL			ImplAssertValidFontMetric();
+    ::osl::Mutex&	GetMutex() { return maMutex; }
 
 public:
                     VCLXFont();
                     ~VCLXFont();
 
-    void            Init( ::com::sun::star::awt::XDevice& rxDev, const Font& rFont );
-    const Font&     GetFont() const { return maFont; }
+    void			Init( ::com::sun::star::awt::XDevice& rxDev, const Font& rFont );
+    const Font&		GetFont() const { return maFont; }
 
     // ::com::sun::star::uno::XInterface
-    ::com::sun::star::uno::Any                  SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException);
-    void                                        SAL_CALL acquire() throw()  { OWeakObject::acquire(); }
-    void                                        SAL_CALL release() throw()  { OWeakObject::release(); }
+    ::com::sun::star::uno::Any					SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException);
+    void										SAL_CALL acquire() throw()	{ OWeakObject::acquire(); }
+    void										SAL_CALL release() throw()	{ OWeakObject::release(); }
 
     // ::com::sun::star::lang::XUnoTunnel
-    static const ::com::sun::star::uno::Sequence< sal_Int8 >&   GetUnoTunnelId() throw();
-    static VCLXFont*                                            GetImplementation( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& rxIFace ) throw();
-    sal_Int64                                                   SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& rIdentifier ) throw(::com::sun::star::uno::RuntimeException);
+    static const ::com::sun::star::uno::Sequence< sal_Int8 >&	GetUnoTunnelId() throw();
+    static VCLXFont*											GetImplementation( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& rxIFace ) throw();
+    sal_Int64													SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& rIdentifier ) throw(::com::sun::star::uno::RuntimeException);
 
     // ::com::sun::star::lang::XTypeProvider
-    ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type >  SAL_CALL getTypes() throw(::com::sun::star::uno::RuntimeException);
-    ::com::sun::star::uno::Sequence< sal_Int8 >                     SAL_CALL getImplementationId() throw(::com::sun::star::uno::RuntimeException);
+    ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type >	SAL_CALL getTypes() throw(::com::sun::star::uno::RuntimeException);
+    ::com::sun::star::uno::Sequence< sal_Int8 >						SAL_CALL getImplementationId() throw(::com::sun::star::uno::RuntimeException);
 
     // ::com::sun::star::lang::XFont
-    ::com::sun::star::awt::FontDescriptor           SAL_CALL getFontDescriptor(  ) throw(::com::sun::star::uno::RuntimeException);
-    ::com::sun::star::awt::SimpleFontMetric         SAL_CALL getFontMetric(  ) throw(::com::sun::star::uno::RuntimeException);
-    sal_Int16                                       SAL_CALL getCharWidth( sal_Unicode c ) throw(::com::sun::star::uno::RuntimeException);
-    ::com::sun::star::uno::Sequence< sal_Int16 >    SAL_CALL getCharWidths( sal_Unicode nFirst, sal_Unicode nLast ) throw(::com::sun::star::uno::RuntimeException);
-    sal_Int32                                       SAL_CALL getStringWidth( const ::rtl::OUString& str ) throw(::com::sun::star::uno::RuntimeException);
-    sal_Int32                                       SAL_CALL getStringWidthArray( const ::rtl::OUString& str, ::com::sun::star::uno::Sequence< sal_Int32 >& rDXArray ) throw(::com::sun::star::uno::RuntimeException);
-    void                                            SAL_CALL getKernPairs( ::com::sun::star::uno::Sequence< sal_Unicode >& rnChars1, ::com::sun::star::uno::Sequence< sal_Unicode >& rnChars2, ::com::sun::star::uno::Sequence< sal_Int16 >& rnKerns ) throw(::com::sun::star::uno::RuntimeException);
+    ::com::sun::star::awt::FontDescriptor			SAL_CALL getFontDescriptor(  ) throw(::com::sun::star::uno::RuntimeException);
+    ::com::sun::star::awt::SimpleFontMetric			SAL_CALL getFontMetric(  ) throw(::com::sun::star::uno::RuntimeException);
+    sal_Int16										SAL_CALL getCharWidth( sal_Unicode c ) throw(::com::sun::star::uno::RuntimeException);
+    ::com::sun::star::uno::Sequence< sal_Int16 >	SAL_CALL getCharWidths( sal_Unicode nFirst, sal_Unicode nLast ) throw(::com::sun::star::uno::RuntimeException);
+    sal_Int32										SAL_CALL getStringWidth( const ::rtl::OUString& str ) throw(::com::sun::star::uno::RuntimeException);
+    sal_Int32										SAL_CALL getStringWidthArray( const ::rtl::OUString& str, ::com::sun::star::uno::Sequence< sal_Int32 >& rDXArray ) throw(::com::sun::star::uno::RuntimeException);
+    void											SAL_CALL getKernPairs( ::com::sun::star::uno::Sequence< sal_Unicode >& rnChars1, ::com::sun::star::uno::Sequence< sal_Unicode >& rnChars2, ::com::sun::star::uno::Sequence< sal_Int16 >& rnKerns ) throw(::com::sun::star::uno::RuntimeException);
 
     // ::com::sun::star::lang::XFont2
     sal_Bool                                        SAL_CALL hasGlyphs( const ::rtl::OUString& aText ) throw(::com::sun::star::uno::RuntimeException);
diff --git a/toolkit/inc/toolkit/awt/vclxgraphics.hxx b/toolkit/inc/toolkit/awt/vclxgraphics.hxx
index 5fda9ac947ee..148b4700fc9f 100644
--- a/toolkit/inc/toolkit/awt/vclxgraphics.hxx
+++ b/toolkit/inc/toolkit/awt/vclxgraphics.hxx
@@ -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
@@ -43,94 +43,94 @@ class OutputDevice;
 class Region;
 
 
-#define INITOUTDEV_FONT         0x0001
-#define INITOUTDEV_COLORS       0x0002
-#define INITOUTDEV_RASTEROP     0x0004
-#define INITOUTDEV_CLIPREGION   0x0008
-#define INITOUTDEV_ALL          0xFFFF
+#define INITOUTDEV_FONT			0x0001
+#define INITOUTDEV_COLORS		0x0002
+#define INITOUTDEV_RASTEROP		0x0004
+#define INITOUTDEV_CLIPREGION	0x0008
+#define INITOUTDEV_ALL			0xFFFF
 
 
-//  ----------------------------------------------------
-//  class VCLXGraphics
-//  ----------------------------------------------------
+//	----------------------------------------------------
+//	class VCLXGraphics
+//	----------------------------------------------------
 
-class VCLXGraphics :    public ::com::sun::star::awt::XGraphics,
+class VCLXGraphics :	public ::com::sun::star::awt::XGraphics, 
                         public ::com::sun::star::lang::XTypeProvider,
                         public ::com::sun::star::lang::XUnoTunnel,
                         public ::cppu::OWeakObject
 {
 private:
-    NAMESPACE_VOS(IMutex)&  mrMutex;    // Reference to SolarMutex
-    ::com::sun::star::uno::Reference< ::com::sun::star::awt::XDevice> mxDevice; // nur um bei getDevice() immer das gleiche zurueckzugeben
-
-    OutputDevice*   mpOutputDevice;
-    Font            maFont;
-    Color           maTextColor;
-    Color           maTextFillColor;
-    Color           maLineColor;
-    Color           maFillColor;
-    RasterOp        meRasterOp;
-    Region*         mpClipRegion;
+    NAMESPACE_VOS(IMutex)&	mrMutex;	// Reference to SolarMutex
+    ::com::sun::star::uno::Reference< ::com::sun::star::awt::XDevice> mxDevice;	// nur um bei getDevice() immer das gleiche zurueckzugeben
+
+    OutputDevice*	mpOutputDevice;
+    Font			maFont;
+    Color			maTextColor;
+    Color			maTextFillColor;
+    Color			maLineColor;
+    Color			maFillColor;
+    RasterOp		meRasterOp;
+    Region*			mpClipRegion;
 
 protected:
-    NAMESPACE_VOS(IMutex)&  GetMutex() { return mrMutex; }
+    NAMESPACE_VOS(IMutex)&	GetMutex() { return mrMutex; }
 
-public:
+public:	
                     VCLXGraphics();
                     ~VCLXGraphics();
 
-    void            Init( OutputDevice* pOutDev );
-    void            InitOutputDevice( sal_uInt16 nFlags );
-
-    void            SetOutputDevice( OutputDevice* pOutDev );
-    OutputDevice*   GetOutputDevice() const { return mpOutputDevice; }
+    void			Init( OutputDevice* pOutDev );
+    void			InitOutputDevice( sal_uInt16 nFlags );
 
-    const Font&     GetFont() const { return maFont; }
+    void			SetOutputDevice( OutputDevice* pOutDev );
+    OutputDevice*	GetOutputDevice() const { return mpOutputDevice; }
 
+    const Font&		GetFont() const { return maFont; }
+    
     // ::com::sun::star::uno::XInterface
-    ::com::sun::star::uno::Any                  SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException);
-    void                                        SAL_CALL acquire() throw()  { OWeakObject::acquire(); }
-    void                                        SAL_CALL release() throw()  { OWeakObject::release(); }
+    ::com::sun::star::uno::Any					SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException);
+    void										SAL_CALL acquire() throw()	{ OWeakObject::acquire(); }
+    void										SAL_CALL release() throw()	{ OWeakObject::release(); }
 
     // ::com::sun::star::lang::XUnoTunnel
-    static const ::com::sun::star::uno::Sequence< sal_Int8 >&   GetUnoTunnelId() throw();
-    static VCLXGraphics*                                        GetImplementation( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& rxIFace ) throw();
-    sal_Int64                                                   SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& rIdentifier ) throw(::com::sun::star::uno::RuntimeException);
+    static const ::com::sun::star::uno::Sequence< sal_Int8 >&	GetUnoTunnelId() throw();
+    static VCLXGraphics*										GetImplementation( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& rxIFace ) throw();
+    sal_Int64													SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& rIdentifier ) throw(::com::sun::star::uno::RuntimeException);
 
     // ::com::sun::star::lang::XTypeProvider
-    ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type >  SAL_CALL getTypes() throw(::com::sun::star::uno::RuntimeException);
-    ::com::sun::star::uno::Sequence< sal_Int8 >                     SAL_CALL getImplementationId() throw(::com::sun::star::uno::RuntimeException);
+    ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type >	SAL_CALL getTypes() throw(::com::sun::star::uno::RuntimeException);
+    ::com::sun::star::uno::Sequence< sal_Int8 >						SAL_CALL getImplementationId() throw(::com::sun::star::uno::RuntimeException);
 
     // ::com::sun::star::awt::XGraphics
-    ::com::sun::star::uno::Reference< ::com::sun::star::awt::XDevice >  SAL_CALL getDevice(  ) throw(::com::sun::star::uno::RuntimeException);
-    ::com::sun::star::awt::SimpleFontMetric                             SAL_CALL getFontMetric() throw(::com::sun::star::uno::RuntimeException);
-    void        SAL_CALL setFont( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XFont >& xNewFont ) throw(::com::sun::star::uno::RuntimeException);
-    void        SAL_CALL selectFont( const ::com::sun::star::awt::FontDescriptor& aDescription ) throw(::com::sun::star::uno::RuntimeException);
-    void        SAL_CALL setTextColor( sal_Int32 nColor ) throw(::com::sun::star::uno::RuntimeException);
-    void        SAL_CALL setTextFillColor( sal_Int32 nColor ) throw(::com::sun::star::uno::RuntimeException);
-    void        SAL_CALL setLineColor( sal_Int32 nColor ) throw(::com::sun::star::uno::RuntimeException);
-    void        SAL_CALL setFillColor( sal_Int32 nColor ) throw(::com::sun::star::uno::RuntimeException);
-    void        SAL_CALL setRasterOp( ::com::sun::star::awt::RasterOperation ROP ) throw(::com::sun::star::uno::RuntimeException);
-    void        SAL_CALL setClipRegion( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XRegion >& Clipping ) throw(::com::sun::star::uno::RuntimeException);
-    void        SAL_CALL intersectClipRegion( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XRegion >& xClipping ) throw(::com::sun::star::uno::RuntimeException);
-    void        SAL_CALL push(  ) throw(::com::sun::star::uno::RuntimeException);
-    void        SAL_CALL pop(  ) throw(::com::sun::star::uno::RuntimeException);
-    void        SAL_CALL copy( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XDevice >& xSource, sal_Int32 nSourceX, sal_Int32 nSourceY, sal_Int32 nSourceWidth, sal_Int32 nSourceHeight, sal_Int32 nDestX, sal_Int32 nDestY, sal_Int32 nDestWidth, sal_Int32 nDestHeight ) throw(::com::sun::star::uno::RuntimeException);
-    void        SAL_CALL draw( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XDisplayBitmap >& xBitmapHandle, sal_Int32 SourceX, sal_Int32 SourceY, sal_Int32 SourceWidth, sal_Int32 SourceHeight, sal_Int32 DestX, sal_Int32 DestY, sal_Int32 DestWidth, sal_Int32 DestHeight ) throw(::com::sun::star::uno::RuntimeException);
-    void        SAL_CALL drawPixel( sal_Int32 X, sal_Int32 Y ) throw(::com::sun::star::uno::RuntimeException);
-    void        SAL_CALL drawLine( sal_Int32 X1, sal_Int32 Y1, sal_Int32 X2, sal_Int32 Y2 ) throw(::com::sun::star::uno::RuntimeException);
-    void        SAL_CALL drawRect( sal_Int32 X, sal_Int32 Y, sal_Int32 Width, sal_Int32 Height ) throw(::com::sun::star::uno::RuntimeException);
-    void        SAL_CALL drawRoundedRect( sal_Int32 X, sal_Int32 Y, sal_Int32 Width, sal_Int32 Height, sal_Int32 nHorzRound, sal_Int32 nVertRound ) throw(::com::sun::star::uno::RuntimeException);
-    void        SAL_CALL drawPolyLine( const ::com::sun::star::uno::Sequence< sal_Int32 >& DataX, const ::com::sun::star::uno::Sequence< sal_Int32 >& DataY ) throw(::com::sun::star::uno::RuntimeException);
-    void        SAL_CALL drawPolygon( const ::com::sun::star::uno::Sequence< sal_Int32 >& DataX, const ::com::sun::star::uno::Sequence< sal_Int32 >& DataY ) throw(::com::sun::star::uno::RuntimeException);
-    void        SAL_CALL drawPolyPolygon( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< sal_Int32 > >& DataX, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< sal_Int32 > >& DataY ) throw(::com::sun::star::uno::RuntimeException);
-    void        SAL_CALL drawEllipse( sal_Int32 X, sal_Int32 Y, sal_Int32 Width, sal_Int32 Height ) throw(::com::sun::star::uno::RuntimeException);
-    void        SAL_CALL drawArc( sal_Int32 X, sal_Int32 Y, sal_Int32 Width, sal_Int32 Height, sal_Int32 X1, sal_Int32 Y1, sal_Int32 X2, sal_Int32 Y2 ) throw(::com::sun::star::uno::RuntimeException);
-    void        SAL_CALL drawPie( sal_Int32 X, sal_Int32 Y, sal_Int32 Width, sal_Int32 Height, sal_Int32 X1, sal_Int32 Y1, sal_Int32 X2, sal_Int32 Y2 ) throw(::com::sun::star::uno::RuntimeException);
-    void        SAL_CALL drawChord( sal_Int32 nX, sal_Int32 nY, sal_Int32 nWidth, sal_Int32 nHeight, sal_Int32 nX1, sal_Int32 nY1, sal_Int32 nX2, sal_Int32 nY2 ) throw(::com::sun::star::uno::RuntimeException);
-    void        SAL_CALL drawGradient( sal_Int32 nX, sal_Int32 nY, sal_Int32 nWidth, sal_Int32 Height, const ::com::sun::star::awt::Gradient& aGradient ) throw(::com::sun::star::uno::RuntimeException);
-    void        SAL_CALL drawText( sal_Int32 X, sal_Int32 Y, const ::rtl::OUString& Text ) throw(::com::sun::star::uno::RuntimeException);
-    void        SAL_CALL drawTextArray( sal_Int32 X, sal_Int32 Y, const ::rtl::OUString& Text, const ::com::sun::star::uno::Sequence< sal_Int32 >& Longs ) throw(::com::sun::star::uno::RuntimeException);
+    ::com::sun::star::uno::Reference< ::com::sun::star::awt::XDevice >	SAL_CALL getDevice(  ) throw(::com::sun::star::uno::RuntimeException);
+    ::com::sun::star::awt::SimpleFontMetric								SAL_CALL getFontMetric() throw(::com::sun::star::uno::RuntimeException);
+    void		SAL_CALL setFont( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XFont >& xNewFont ) throw(::com::sun::star::uno::RuntimeException);
+    void		SAL_CALL selectFont( const ::com::sun::star::awt::FontDescriptor& aDescription ) throw(::com::sun::star::uno::RuntimeException);
+    void		SAL_CALL setTextColor( sal_Int32 nColor ) throw(::com::sun::star::uno::RuntimeException);
+    void		SAL_CALL setTextFillColor( sal_Int32 nColor ) throw(::com::sun::star::uno::RuntimeException);
+    void		SAL_CALL setLineColor( sal_Int32 nColor ) throw(::com::sun::star::uno::RuntimeException);
+    void		SAL_CALL setFillColor( sal_Int32 nColor ) throw(::com::sun::star::uno::RuntimeException);
+    void		SAL_CALL setRasterOp( ::com::sun::star::awt::RasterOperation ROP ) throw(::com::sun::star::uno::RuntimeException);
+    void		SAL_CALL setClipRegion( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XRegion >& Clipping ) throw(::com::sun::star::uno::RuntimeException);
+    void		SAL_CALL intersectClipRegion( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XRegion >& xClipping ) throw(::com::sun::star::uno::RuntimeException);
+    void		SAL_CALL push(  ) throw(::com::sun::star::uno::RuntimeException);
+    void		SAL_CALL pop(  ) throw(::com::sun::star::uno::RuntimeException);
+    void		SAL_CALL copy( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XDevice >& xSource, sal_Int32 nSourceX, sal_Int32 nSourceY, sal_Int32 nSourceWidth, sal_Int32 nSourceHeight, sal_Int32 nDestX, sal_Int32 nDestY, sal_Int32 nDestWidth, sal_Int32 nDestHeight ) throw(::com::sun::star::uno::RuntimeException);
+    void		SAL_CALL draw( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XDisplayBitmap >& xBitmapHandle, sal_Int32 SourceX, sal_Int32 SourceY, sal_Int32 SourceWidth, sal_Int32 SourceHeight, sal_Int32 DestX, sal_Int32 DestY, sal_Int32 DestWidth, sal_Int32 DestHeight ) throw(::com::sun::star::uno::RuntimeException);
+    void		SAL_CALL drawPixel( sal_Int32 X, sal_Int32 Y ) throw(::com::sun::star::uno::RuntimeException);
+    void		SAL_CALL drawLine( sal_Int32 X1, sal_Int32 Y1, sal_Int32 X2, sal_Int32 Y2 ) throw(::com::sun::star::uno::RuntimeException);
+    void		SAL_CALL drawRect( sal_Int32 X, sal_Int32 Y, sal_Int32 Width, sal_Int32 Height ) throw(::com::sun::star::uno::RuntimeException);
+    void		SAL_CALL drawRoundedRect( sal_Int32 X, sal_Int32 Y, sal_Int32 Width, sal_Int32 Height, sal_Int32 nHorzRound, sal_Int32 nVertRound ) throw(::com::sun::star::uno::RuntimeException);
+    void		SAL_CALL drawPolyLine( const ::com::sun::star::uno::Sequence< sal_Int32 >& DataX, const ::com::sun::star::uno::Sequence< sal_Int32 >& DataY ) throw(::com::sun::star::uno::RuntimeException);
+    void		SAL_CALL drawPolygon( const ::com::sun::star::uno::Sequence< sal_Int32 >& DataX, const ::com::sun::star::uno::Sequence< sal_Int32 >& DataY ) throw(::com::sun::star::uno::RuntimeException);
+    void		SAL_CALL drawPolyPolygon( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< sal_Int32 > >& DataX, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< sal_Int32 > >& DataY ) throw(::com::sun::star::uno::RuntimeException);
+    void		SAL_CALL drawEllipse( sal_Int32 X, sal_Int32 Y, sal_Int32 Width, sal_Int32 Height ) throw(::com::sun::star::uno::RuntimeException);
+    void		SAL_CALL drawArc( sal_Int32 X, sal_Int32 Y, sal_Int32 Width, sal_Int32 Height, sal_Int32 X1, sal_Int32 Y1, sal_Int32 X2, sal_Int32 Y2 ) throw(::com::sun::star::uno::RuntimeException);
+    void		SAL_CALL drawPie( sal_Int32 X, sal_Int32 Y, sal_Int32 Width, sal_Int32 Height, sal_Int32 X1, sal_Int32 Y1, sal_Int32 X2, sal_Int32 Y2 ) throw(::com::sun::star::uno::RuntimeException);
+    void		SAL_CALL drawChord( sal_Int32 nX, sal_Int32 nY, sal_Int32 nWidth, sal_Int32 nHeight, sal_Int32 nX1, sal_Int32 nY1, sal_Int32 nX2, sal_Int32 nY2 ) throw(::com::sun::star::uno::RuntimeException);
+    void		SAL_CALL drawGradient( sal_Int32 nX, sal_Int32 nY, sal_Int32 nWidth, sal_Int32 Height, const ::com::sun::star::awt::Gradient& aGradient ) throw(::com::sun::star::uno::RuntimeException);
+    void		SAL_CALL drawText( sal_Int32 X, sal_Int32 Y, const ::rtl::OUString& Text ) throw(::com::sun::star::uno::RuntimeException);
+    void		SAL_CALL drawTextArray( sal_Int32 X, sal_Int32 Y, const ::rtl::OUString& Text, const ::com::sun::star::uno::Sequence< sal_Int32 >& Longs ) throw(::com::sun::star::uno::RuntimeException);
 };
 
 
diff --git a/toolkit/inc/toolkit/awt/vclxmenu.hxx b/toolkit/inc/toolkit/awt/vclxmenu.hxx
index c675ad1d4bd9..9fefbe9c036d 100644
--- a/toolkit/inc/toolkit/awt/vclxmenu.hxx
+++ b/toolkit/inc/toolkit/awt/vclxmenu.hxx
@@ -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
@@ -48,9 +48,9 @@ class VclSimpleEvent;
 
 DECLARE_LIST( PopupMenuRefList, ::com::sun::star::uno::Reference< ::com::sun::star::awt::XPopupMenu >* )
 
-//  ----------------------------------------------------
-//  class VCLXMenu
-//  ----------------------------------------------------
+//	----------------------------------------------------
+//	class VCLXMenu
+//	----------------------------------------------------
 
 class TOOLKIT_DLLPUBLIC VCLXMenu :  public ::com::sun::star::awt::XMenuBarExtended,
                                     public ::com::sun::star::awt::XPopupMenuExtended,
@@ -60,17 +60,17 @@ class TOOLKIT_DLLPUBLIC VCLXMenu :  public ::com::sun::star::awt::XMenuBarExtend
                                     public ::cppu::OWeakObject
 {
 private:
-    ::osl::Mutex            maMutex;
-    Menu*                   mpMenu;
-    MenuListenerMultiplexer maMenuListeners;
-    PopupMenuRefList        maPopupMenueRefs;
+    ::osl::Mutex			maMutex;
+    Menu*					mpMenu;
+    MenuListenerMultiplexer	maMenuListeners;
+    PopupMenuRefList		maPopupMenueRefs;
 
 protected:
-    ::osl::Mutex&           GetMutex() { return maMutex; }
+    ::osl::Mutex&			GetMutex() { return maMutex; }
 
-    DECL_LINK(      MenuEventListener, VclSimpleEvent* );
+    DECL_LINK( 	 	MenuEventListener, VclSimpleEvent* );
 
-    void            ImplCreateMenu( BOOL bPopup );
+    void			ImplCreateMenu( BOOL bPopup );
 
 public:
                     VCLXMenu();
@@ -78,22 +78,22 @@ public:
                     ~VCLXMenu();
 
 
-    Menu*           GetMenu() const { return mpMenu; }
-    BOOL            IsPopupMenu() const;
+    Menu*			GetMenu() const { return mpMenu; }
+    BOOL			IsPopupMenu() const;
 
     // ::com::sun::star::uno::XInterface
-    ::com::sun::star::uno::Any  SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException);
-    void                        SAL_CALL acquire() throw()  { OWeakObject::acquire(); }
-    void                        SAL_CALL release() throw()  { OWeakObject::release(); }
+    ::com::sun::star::uno::Any	SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException);
+    void						SAL_CALL acquire() throw()	{ OWeakObject::acquire(); }
+    void						SAL_CALL release() throw()	{ OWeakObject::release(); }
 
     // ::com::sun::star::lang::XUnoTunnel
-    static const ::com::sun::star::uno::Sequence< sal_Int8 >&   GetUnoTunnelId() throw();
-    static VCLXMenu*                                            GetImplementation( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& rxIFace ) throw();
-    sal_Int64                                                   SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& rIdentifier ) throw(::com::sun::star::uno::RuntimeException);
+    static const ::com::sun::star::uno::Sequence< sal_Int8 >&	GetUnoTunnelId() throw();
+    static VCLXMenu*											GetImplementation( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& rxIFace ) throw();
+    sal_Int64													SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& rIdentifier ) throw(::com::sun::star::uno::RuntimeException);
 
     // ::com::sun::star::lang::XTypeProvider
-    ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type >  SAL_CALL getTypes() throw(::com::sun::star::uno::RuntimeException);
-    ::com::sun::star::uno::Sequence< sal_Int8 >                     SAL_CALL getImplementationId() throw(::com::sun::star::uno::RuntimeException);
+    ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type >	SAL_CALL getTypes() throw(::com::sun::star::uno::RuntimeException);
+    ::com::sun::star::uno::Sequence< sal_Int8 >						SAL_CALL getImplementationId() throw(::com::sun::star::uno::RuntimeException);
 
     // ::com::sun::star::awt::XMenu
     void SAL_CALL addMenuListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XMenuListener >& xListener ) throw(::com::sun::star::uno::RuntimeException);
@@ -164,9 +164,9 @@ public:
 
 };
 
-//  ----------------------------------------------------
-//  class VCLXMenuBar
-//  ----------------------------------------------------
+//	----------------------------------------------------
+//	class VCLXMenuBar
+//	----------------------------------------------------
 class TOOLKIT_DLLPUBLIC VCLXMenuBar : public VCLXMenu
 {
 public:
@@ -174,9 +174,9 @@ public:
         VCLXMenuBar( MenuBar* pMenuBar );
 };
 
-//  ----------------------------------------------------
-//  class VCLXPopupMenu
-//  ----------------------------------------------------
+//	----------------------------------------------------
+//	class VCLXPopupMenu
+//	----------------------------------------------------
 class TOOLKIT_DLLPUBLIC VCLXPopupMenu : public VCLXMenu
 {
 public:
diff --git a/toolkit/inc/toolkit/awt/vclxpointer.hxx b/toolkit/inc/toolkit/awt/vclxpointer.hxx
index 2dd694f6e742..c469530a1ca2 100644
--- a/toolkit/inc/toolkit/awt/vclxpointer.hxx
+++ b/toolkit/inc/toolkit/awt/vclxpointer.hxx
@@ -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
@@ -37,41 +37,41 @@
 
 #include <vcl/pointr.hxx>
 
-//  ----------------------------------------------------
-//  class VCLXPointer
-//  ----------------------------------------------------
+//	----------------------------------------------------
+//	class VCLXPointer
+//	----------------------------------------------------
 
-class VCLXPointer : public ::com::sun::star::awt::XPointer,
+class VCLXPointer :	public ::com::sun::star::awt::XPointer, 
                     public ::com::sun::star::lang::XTypeProvider,
                     public ::com::sun::star::lang::XUnoTunnel,
                     public ::cppu::OWeakObject
 {
 private:
-    ::osl::Mutex    maMutex;
-    Pointer         maPointer;
+    ::osl::Mutex	maMutex;
+    Pointer			maPointer;
 
 protected:
-    ::osl::Mutex&   GetMutex() { return maMutex; }
+    ::osl::Mutex&	GetMutex() { return maMutex; }
 
-public:
+public:	
     VCLXPointer();
     ~VCLXPointer();
 
-    const Pointer&      GetPointer() const { return maPointer; }
-
+    const Pointer&		GetPointer() const { return maPointer; }
+    
     // ::com::sun::star::uno::XInterface
-    ::com::sun::star::uno::Any  SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException);
-    void                        SAL_CALL acquire() throw()  { OWeakObject::acquire(); }
-    void                        SAL_CALL release() throw()  { OWeakObject::release(); }
+    ::com::sun::star::uno::Any	SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException);
+    void						SAL_CALL acquire() throw()	{ OWeakObject::acquire(); }
+    void						SAL_CALL release() throw()	{ OWeakObject::release(); }
 
     // ::com::sun::star::lang::XUnoTunnel
-    static const ::com::sun::star::uno::Sequence< sal_Int8 >&   GetUnoTunnelId() throw();
-    static VCLXPointer*                                         GetImplementation( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& rxIFace ) throw();
-    sal_Int64                                                   SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& rIdentifier ) throw(::com::sun::star::uno::RuntimeException);
+    static const ::com::sun::star::uno::Sequence< sal_Int8 >&	GetUnoTunnelId() throw();
+    static VCLXPointer*											GetImplementation( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& rxIFace ) throw();
+    sal_Int64													SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& rIdentifier ) throw(::com::sun::star::uno::RuntimeException);
 
     // ::com::sun::star::lang::XTypeProvider
-    ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type >  SAL_CALL getTypes() throw(::com::sun::star::uno::RuntimeException);
-    ::com::sun::star::uno::Sequence< sal_Int8 >                     SAL_CALL getImplementationId() throw(::com::sun::star::uno::RuntimeException);
+    ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type >	SAL_CALL getTypes() throw(::com::sun::star::uno::RuntimeException);
+    ::com::sun::star::uno::Sequence< sal_Int8 >						SAL_CALL getImplementationId() throw(::com::sun::star::uno::RuntimeException);
 
     // ::com::sun::star::awt::XPointer
     void SAL_CALL setType( sal_Int32 nType ) throw(::com::sun::star::uno::RuntimeException);
diff --git a/toolkit/inc/toolkit/awt/vclxprinter.hxx b/toolkit/inc/toolkit/awt/vclxprinter.hxx
index a7991d38a387..2d5128205f71 100644
--- a/toolkit/inc/toolkit/awt/vclxprinter.hxx
+++ b/toolkit/inc/toolkit/awt/vclxprinter.hxx
@@ -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
@@ -44,41 +44,41 @@
 
 // Fuer den Drucker relevante Properties:
 /*
-     sal_Bool   Horizontal
-     sal_uInt16 CopyCount;
-     sal_Bool   Collate;
-     String FormDescriptor;
-     sal_uInt16 Orientation;    // PORTRAIT, LANDSCAPE
+     sal_Bool	Horizontal
+     sal_uInt16	CopyCount;
+     sal_Bool	Collate;
+     String	FormDescriptor;
+     sal_uInt16	Orientation;	// PORTRAIT, LANDSCAPE
 */
 
-//  ----------------------------------------------------
-//  class VCLXPrinterPropertySet
-//  ----------------------------------------------------
+//	----------------------------------------------------
+//	class VCLXPrinterPropertySet
+//	----------------------------------------------------
 
-class VCLXPrinterPropertySet :  public ::com::sun::star::awt::XPrinterPropertySet,
+class VCLXPrinterPropertySet :	public ::com::sun::star::awt::XPrinterPropertySet, 
                                 public ::com::sun::star::lang::XTypeProvider,
                                 public MutexAndBroadcastHelper,
                                 public ::cppu::OPropertySetHelper
 {
 protected:
     boost::shared_ptr<Printer>                      mpPrinter;
-    ::com::sun::star::uno::Reference< ::com::sun::star::awt::XDevice >  mxPrnDevice;
+    ::com::sun::star::uno::Reference< ::com::sun::star::awt::XDevice >	mxPrnDevice;
 
-    sal_Int16                   mnOrientation;
-    sal_Bool                    mbHorizontal;
-public:
+    sal_Int16					mnOrientation;
+    sal_Bool					mbHorizontal;
+public:	
     VCLXPrinterPropertySet( const String& rPrinterName );
     virtual ~VCLXPrinterPropertySet();
 
-    Printer*                    GetPrinter() const { return mpPrinter.get(); }
-    ::com::sun::star::uno::Reference< ::com::sun::star::awt::XDevice >  GetDevice();
+    Printer*					GetPrinter() const { return mpPrinter.get(); }
+    ::com::sun::star::uno::Reference< ::com::sun::star::awt::XDevice >	GetDevice();
 
     // ::com::sun::star::uno::XInterface
-    ::com::sun::star::uno::Any                  SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException);
+    ::com::sun::star::uno::Any					SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException);
 
     // ::com::sun::star::lang::XTypeProvider
-    ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type >  SAL_CALL getTypes() throw(::com::sun::star::uno::RuntimeException);
-    ::com::sun::star::uno::Sequence< sal_Int8 >                     SAL_CALL getImplementationId() throw(::com::sun::star::uno::RuntimeException);
+    ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type >	SAL_CALL getTypes() throw(::com::sun::star::uno::RuntimeException);
+    ::com::sun::star::uno::Sequence< sal_Int8 >						SAL_CALL getImplementationId() throw(::com::sun::star::uno::RuntimeException);
 
     // ::com::sun::star::beans::XPropertySet
     ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo(  ) throw(::com::sun::star::uno::RuntimeException);
@@ -104,11 +104,11 @@ public:
     void SAL_CALL setBinarySetup( const ::com::sun::star::uno::Sequence< sal_Int8 >& data ) throw(::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException);
 };
 
-//  ----------------------------------------------------
-//  class VCLXPrinter
-//  ----------------------------------------------------
+//	----------------------------------------------------
+//	class VCLXPrinter
+//	----------------------------------------------------
 
-class VCLXPrinter:  public ::com::sun::star::awt::XPrinter,
+class VCLXPrinter:	public ::com::sun::star::awt::XPrinter, 
                     public VCLXPrinterPropertySet,
                     public ::cppu::OWeakObject
 {
@@ -119,13 +119,13 @@ public:
                     ~VCLXPrinter();
 
     // ::com::sun::star::uno::XInterface
-    ::com::sun::star::uno::Any                  SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException);
-    void                                        SAL_CALL acquire() throw()  { OWeakObject::acquire(); }
-    void                                        SAL_CALL release() throw()  { OWeakObject::release(); }
+    ::com::sun::star::uno::Any					SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException);
+    void										SAL_CALL acquire() throw()	{ OWeakObject::acquire(); }
+    void										SAL_CALL release() throw()	{ OWeakObject::release(); }
 
     // ::com::sun::star::lang::XTypeProvider
-    ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type >  SAL_CALL getTypes() throw(::com::sun::star::uno::RuntimeException);
-    ::com::sun::star::uno::Sequence< sal_Int8 >                     SAL_CALL getImplementationId() throw(::com::sun::star::uno::RuntimeException);
+    ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type >	SAL_CALL getTypes() throw(::com::sun::star::uno::RuntimeException);
+    ::com::sun::star::uno::Sequence< sal_Int8 >						SAL_CALL getImplementationId() throw(::com::sun::star::uno::RuntimeException);
 
 
     // ::com::sun::star::beans::XPropertySet
@@ -152,11 +152,11 @@ public:
     void SAL_CALL endPage(  ) throw(::com::sun::star::awt::PrinterException, ::com::sun::star::uno::RuntimeException);
 };
 
-//  ----------------------------------------------------
-//  class VCLXInfoPrinter
-//  ----------------------------------------------------
+//	----------------------------------------------------
+//	class VCLXInfoPrinter
+//	----------------------------------------------------
 
-class VCLXInfoPrinter:  public ::com::sun::star::awt::XInfoPrinter,
+class VCLXInfoPrinter:	public ::com::sun::star::awt::XInfoPrinter, 
                         public VCLXPrinterPropertySet,
                         public ::cppu::OWeakObject
 {
@@ -165,13 +165,13 @@ public:
                         ~VCLXInfoPrinter();
 
     // ::com::sun::star::uno::XInterface
-    ::com::sun::star::uno::Any                  SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException);
-    void                                        SAL_CALL acquire() throw()  { OWeakObject::acquire(); }
-    void                                        SAL_CALL release() throw()  { OWeakObject::release(); }
+    ::com::sun::star::uno::Any					SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException);
+    void										SAL_CALL acquire() throw()	{ OWeakObject::acquire(); }
+    void										SAL_CALL release() throw()	{ OWeakObject::release(); }
 
     // ::com::sun::star::lang::XTypeProvider
-    ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type >  SAL_CALL getTypes() throw(::com::sun::star::uno::RuntimeException);
-    ::com::sun::star::uno::Sequence< sal_Int8 >                     SAL_CALL getImplementationId() throw(::com::sun::star::uno::RuntimeException);
+    ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type >	SAL_CALL getTypes() throw(::com::sun::star::uno::RuntimeException);
+    ::com::sun::star::uno::Sequence< sal_Int8 >						SAL_CALL getImplementationId() throw(::com::sun::star::uno::RuntimeException);
 
 
     // ::com::sun::star::beans::XPropertySet
@@ -194,23 +194,23 @@ public:
     ::com::sun::star::uno::Reference< ::com::sun::star::awt::XDevice > SAL_CALL createDevice(  ) throw(::com::sun::star::uno::RuntimeException);
 };
 
-//  ----------------------------------------------------
-//  class VCLXPrinterServer
-//  ----------------------------------------------------
+//	----------------------------------------------------
+//	class VCLXPrinterServer
+//	----------------------------------------------------
 
-class VCLXPrinterServer :   public ::com::sun::star::awt::XPrinterServer,
-                            public  ::cppu::OWeakObject
+class VCLXPrinterServer :	public ::com::sun::star::awt::XPrinterServer,
+                            public	::cppu::OWeakObject
 {
 public:
-
+    
     // ::com::sun::star::uno::XInterface
-    ::com::sun::star::uno::Any                  SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException);
-    void                                        SAL_CALL acquire() throw()  { OWeakObject::acquire(); }
-    void                                        SAL_CALL release() throw()  { OWeakObject::release(); }
+    ::com::sun::star::uno::Any					SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException);
+    void										SAL_CALL acquire() throw()	{ OWeakObject::acquire(); }
+    void										SAL_CALL release() throw()	{ OWeakObject::release(); }
 
     // ::com::sun::star::lang::XTypeProvider
-    ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type >  SAL_CALL getTypes() throw(::com::sun::star::uno::RuntimeException);
-    ::com::sun::star::uno::Sequence< sal_Int8 >                     SAL_CALL getImplementationId() throw(::com::sun::star::uno::RuntimeException);
+    ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type >	SAL_CALL getTypes() throw(::com::sun::star::uno::RuntimeException);
+    ::com::sun::star::uno::Sequence< sal_Int8 >						SAL_CALL getImplementationId() throw(::com::sun::star::uno::RuntimeException);
 
     // ::com::sun::star::awt::XPrinterServer
     ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getPrinterNames(  ) throw(::com::sun::star::uno::RuntimeException);
diff --git a/toolkit/inc/toolkit/awt/vclxregion.hxx b/toolkit/inc/toolkit/awt/vclxregion.hxx
index 3e95c880558b..68662f00ee14 100644
--- a/toolkit/inc/toolkit/awt/vclxregion.hxx
+++ b/toolkit/inc/toolkit/awt/vclxregion.hxx
@@ -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
@@ -37,55 +37,55 @@
 
 #include <vcl/region.hxx>
 
-//  ----------------------------------------------------
-//  class VCLXRegion
-//  ----------------------------------------------------
+//	----------------------------------------------------
+//	class VCLXRegion
+//	----------------------------------------------------
 
-class VCLXRegion :  public ::com::sun::star::awt::XRegion,
+class VCLXRegion :	public ::com::sun::star::awt::XRegion, 
                     public ::com::sun::star::lang::XTypeProvider,
                     public ::com::sun::star::lang::XUnoTunnel,
                     public ::cppu::OWeakObject
 {
 private:
-    ::osl::Mutex    maMutex;
-    Region          maRegion;
+    ::osl::Mutex	maMutex;
+    Region			maRegion;
 
 protected:
-    ::osl::Mutex&   GetMutex() { return maMutex; }
+    ::osl::Mutex&	GetMutex() { return maMutex; }
 
-public:
+public:	
                     VCLXRegion();
                     ~VCLXRegion();
 
-    void            SetRegion( const Region& rRegion )  { maRegion = rRegion; }
-    const Region&   GetRegion() const                   { return maRegion; }
-
+    void			SetRegion( const Region& rRegion )	{ maRegion = rRegion; }
+    const Region& 	GetRegion() const 					{ return maRegion; }
+    
     // ::com::sun::star::uno::XInterface
-    ::com::sun::star::uno::Any                  SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException);
-    void                                        SAL_CALL acquire() throw()  { OWeakObject::acquire(); }
-    void                                        SAL_CALL release() throw()  { OWeakObject::release(); }
+    ::com::sun::star::uno::Any					SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException);
+    void										SAL_CALL acquire() throw()	{ OWeakObject::acquire(); }
+    void										SAL_CALL release() throw()	{ OWeakObject::release(); }
 
     // ::com::sun::star::lang::XUnoTunnel
-    static const ::com::sun::star::uno::Sequence< sal_Int8 >&   GetUnoTunnelId() throw();
-    static VCLXRegion*                                          GetImplementation( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& rxIFace ) throw();
-    sal_Int64                                                   SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& rIdentifier ) throw(::com::sun::star::uno::RuntimeException);
+    static const ::com::sun::star::uno::Sequence< sal_Int8 >&	GetUnoTunnelId() throw();
+    static VCLXRegion*											GetImplementation( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& rxIFace ) throw();
+    sal_Int64													SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& rIdentifier ) throw(::com::sun::star::uno::RuntimeException);
 
     // ::com::sun::star::lang::XTypeProvider
-    ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type >  SAL_CALL getTypes() throw(::com::sun::star::uno::RuntimeException);
-    ::com::sun::star::uno::Sequence< sal_Int8 >                     SAL_CALL getImplementationId() throw(::com::sun::star::uno::RuntimeException);
+    ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type >	SAL_CALL getTypes() throw(::com::sun::star::uno::RuntimeException);
+    ::com::sun::star::uno::Sequence< sal_Int8 >						SAL_CALL getImplementationId() throw(::com::sun::star::uno::RuntimeException);
 
     // ::com::sun::star::awt::XRegion
-     ::com::sun::star::awt::Rectangle       SAL_CALL getBounds() throw(::com::sun::star::uno::RuntimeException);
-     void                                   SAL_CALL clear() throw(::com::sun::star::uno::RuntimeException);
-     void                                   SAL_CALL move( sal_Int32 nHorzMove, sal_Int32 nVertMove ) throw(::com::sun::star::uno::RuntimeException);
-     void                                   SAL_CALL unionRectangle( const ::com::sun::star::awt::Rectangle& rRect ) throw(::com::sun::star::uno::RuntimeException);
-     void                                   SAL_CALL intersectRectangle( const ::com::sun::star::awt::Rectangle& rRect ) throw(::com::sun::star::uno::RuntimeException);
-     void                                   SAL_CALL excludeRectangle( const ::com::sun::star::awt::Rectangle& rRect ) throw(::com::sun::star::uno::RuntimeException);
-     void                                   SAL_CALL xOrRectangle( const ::com::sun::star::awt::Rectangle& rRect ) throw(::com::sun::star::uno::RuntimeException);
-     void                                   SAL_CALL unionRegion( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XRegion >& rxRegion ) throw(::com::sun::star::uno::RuntimeException);
-     void                                   SAL_CALL intersectRegion( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XRegion >& rxRegion ) throw(::com::sun::star::uno::RuntimeException);
-     void                                   SAL_CALL excludeRegion( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XRegion >& rxRegion ) throw(::com::sun::star::uno::RuntimeException);
-     void                                   SAL_CALL xOrRegion( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XRegion >& rxRegion ) throw(::com::sun::star::uno::RuntimeException);
+     ::com::sun::star::awt::Rectangle		SAL_CALL getBounds() throw(::com::sun::star::uno::RuntimeException);
+     void									SAL_CALL clear() throw(::com::sun::star::uno::RuntimeException);
+     void									SAL_CALL move( sal_Int32 nHorzMove, sal_Int32 nVertMove ) throw(::com::sun::star::uno::RuntimeException);
+     void									SAL_CALL unionRectangle( const ::com::sun::star::awt::Rectangle& rRect ) throw(::com::sun::star::uno::RuntimeException);
+     void									SAL_CALL intersectRectangle( const ::com::sun::star::awt::Rectangle& rRect ) throw(::com::sun::star::uno::RuntimeException);
+     void									SAL_CALL excludeRectangle( const ::com::sun::star::awt::Rectangle& rRect ) throw(::com::sun::star::uno::RuntimeException);
+     void									SAL_CALL xOrRectangle( const ::com::sun::star::awt::Rectangle& rRect ) throw(::com::sun::star::uno::RuntimeException);
+     void									SAL_CALL unionRegion( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XRegion >& rxRegion ) throw(::com::sun::star::uno::RuntimeException);
+     void									SAL_CALL intersectRegion( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XRegion >& rxRegion ) throw(::com::sun::star::uno::RuntimeException);
+     void									SAL_CALL excludeRegion( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XRegion >& rxRegion ) throw(::com::sun::star::uno::RuntimeException);
+     void									SAL_CALL xOrRegion( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XRegion >& rxRegion ) throw(::com::sun::star::uno::RuntimeException);
      ::com::sun::star::uno::Sequence< ::com::sun::star::awt::Rectangle > SAL_CALL getRectangles() throw(::com::sun::star::uno::RuntimeException);
 
 };
diff --git a/toolkit/inc/toolkit/awt/vclxspinbutton.hxx b/toolkit/inc/toolkit/awt/vclxspinbutton.hxx
index f855b6efb948..df8fb8855410 100644
--- a/toolkit/inc/toolkit/awt/vclxspinbutton.hxx
+++ b/toolkit/inc/toolkit/awt/vclxspinbutton.hxx
@@ -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
diff --git a/toolkit/inc/toolkit/awt/vclxsystemdependentwindow.hxx b/toolkit/inc/toolkit/awt/vclxsystemdependentwindow.hxx
index 73bd100c2bb7..2b7bf41e8790 100644
--- a/toolkit/inc/toolkit/awt/vclxsystemdependentwindow.hxx
+++ b/toolkit/inc/toolkit/awt/vclxsystemdependentwindow.hxx
@@ -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
@@ -36,25 +36,25 @@
 
 #include <toolkit/awt/vclxwindow.hxx>
 
-//  ----------------------------------------------------
-//  class VCLXSystemDependendtWindow
-//  ----------------------------------------------------
+//	----------------------------------------------------
+//	class VCLXSystemDependendtWindow
+//	----------------------------------------------------
 
-class TOOLKIT_DLLPUBLIC VCLXSystemDependentWindow : public ::com::sun::star::awt::XSystemDependentWindowPeer,
+class TOOLKIT_DLLPUBLIC VCLXSystemDependentWindow :	public ::com::sun::star::awt::XSystemDependentWindowPeer,
                                                     public VCLXWindow
 {
-public:
+public:	
     VCLXSystemDependentWindow();
     ~VCLXSystemDependentWindow();
-
+    
     // ::com::sun::star::uno::XInterface
-    ::com::sun::star::uno::Any  SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException);
-    void                        SAL_CALL acquire() throw()  { OWeakObject::acquire(); }
-    void                        SAL_CALL release() throw()  { OWeakObject::release(); }
+    ::com::sun::star::uno::Any	SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException);
+    void						SAL_CALL acquire() throw()	{ OWeakObject::acquire(); }
+    void						SAL_CALL release() throw()	{ OWeakObject::release(); }
 
     // ::com::sun::star::lang::XTypeProvider
-    ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type >  SAL_CALL getTypes() throw(::com::sun::star::uno::RuntimeException);
-    ::com::sun::star::uno::Sequence< sal_Int8 >                     SAL_CALL getImplementationId() throw(::com::sun::star::uno::RuntimeException);
+    ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type >	SAL_CALL getTypes() throw(::com::sun::star::uno::RuntimeException);
+    ::com::sun::star::uno::Sequence< sal_Int8 >						SAL_CALL getImplementationId() throw(::com::sun::star::uno::RuntimeException);
 
     // ::com::sun::star::awt::XSystemDependendtWindowPeer
     ::com::sun::star::uno::Any SAL_CALL getWindowHandle( const ::com::sun::star::uno::Sequence< sal_Int8 >& ProcessId, sal_Int16 SystemType ) throw(::com::sun::star::uno::RuntimeException);
diff --git a/toolkit/inc/toolkit/awt/vclxtoolkit.hxx b/toolkit/inc/toolkit/awt/vclxtoolkit.hxx
index 3f37ac58200f..453ec6179800 100644
--- a/toolkit/inc/toolkit/awt/vclxtoolkit.hxx
+++ b/toolkit/inc/toolkit/awt/vclxtoolkit.hxx
@@ -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
@@ -67,17 +67,17 @@ extern "C" {
 }
 
 
-//  ----------------------------------------------------
-//  class VCLXTOOLKIT
-//  ----------------------------------------------------
+//	----------------------------------------------------
+//	class VCLXTOOLKIT
+//	----------------------------------------------------
 
 class VCLXToolkit_Impl
 {
 protected:
-    ::osl::Mutex    maMutex;
+    ::osl::Mutex	maMutex;
 };
 
-class VCLXToolkit : public VCLXToolkit_Impl,
+class VCLXToolkit :	public VCLXToolkit_Impl, 
                     public cppu::WeakComponentImplHelper7<
                     ::com::sun::star::awt::XToolkit,
                     ::com::sun::star::lang::XServiceInfo,
@@ -90,8 +90,8 @@ class VCLXToolkit : public VCLXToolkit_Impl,
     ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::clipboard::XClipboard > mxClipboard;
     ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::clipboard::XClipboard > mxSelection;
 
-    oslModule           hSvToolsLib;
-    FN_SvtCreateWindow  fnSvtCreateWindow;
+    oslModule			hSvToolsLib;
+    FN_SvtCreateWindow	fnSvtCreateWindow;
 
     ::cppu::OInterfaceContainerHelper m_aTopWindowListeners;
     ::cppu::OInterfaceContainerHelper m_aKeyHandlers;
@@ -115,25 +115,25 @@ class VCLXToolkit : public VCLXToolkit_Impl,
     void callFocusListeners(::VclSimpleEvent const * pEvent, bool bGained);
 
 protected:
-    ::osl::Mutex&   GetMutex() { return maMutex; }
+    ::osl::Mutex&	GetMutex() { return maMutex; }
 
     virtual void SAL_CALL disposing();
 
-    Window* ImplCreateWindow( VCLXWindow** ppNewComp, const ::com::sun::star::awt::WindowDescriptor& rDescriptor, Window* pParent, WinBits nWinBits );
+    Window*	ImplCreateWindow( VCLXWindow** ppNewComp, const ::com::sun::star::awt::WindowDescriptor& rDescriptor, Window* pParent, WinBits nWinBits );
     ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer > ImplCreateWindow( const ::com::sun::star::awt::WindowDescriptor& Descriptor, WinBits nWinBits );
 
-public:
+public:	
 
     VCLXToolkit( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > & );
     ~VCLXToolkit();
-
+    
     // ::com::sun::star::awt::XToolkit
-    ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer >  SAL_CALL getDesktopWindow(  ) throw(::com::sun::star::uno::RuntimeException);
-    ::com::sun::star::awt::Rectangle                                        SAL_CALL getWorkArea(  ) throw(::com::sun::star::uno::RuntimeException);
-    ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer >  SAL_CALL createWindow( const ::com::sun::star::awt::WindowDescriptor& Descriptor ) throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException);
+    ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer >	SAL_CALL getDesktopWindow(  ) throw(::com::sun::star::uno::RuntimeException);
+    ::com::sun::star::awt::Rectangle										SAL_CALL getWorkArea(  ) throw(::com::sun::star::uno::RuntimeException);
+    ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer >	SAL_CALL createWindow( const ::com::sun::star::awt::WindowDescriptor& Descriptor ) throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException);
     ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer > > SAL_CALL createWindows( const ::com::sun::star::uno::Sequence< ::com::sun::star::awt::WindowDescriptor >& Descriptors ) throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException);
-    ::com::sun::star::uno::Reference< ::com::sun::star::awt::XDevice >      SAL_CALL createScreenCompatibleDevice( sal_Int32 Width, sal_Int32 Height ) throw(::com::sun::star::uno::RuntimeException);
-    ::com::sun::star::uno::Reference< ::com::sun::star::awt::XRegion >      SAL_CALL createRegion(  ) throw(::com::sun::star::uno::RuntimeException);
+    ::com::sun::star::uno::Reference< ::com::sun::star::awt::XDevice >		SAL_CALL createScreenCompatibleDevice( sal_Int32 Width, sal_Int32 Height ) throw(::com::sun::star::uno::RuntimeException);
+    ::com::sun::star::uno::Reference< ::com::sun::star::awt::XRegion >		SAL_CALL createRegion(  ) throw(::com::sun::star::uno::RuntimeException);
 
     // ::com::sun::star::awt::XSystemChildFactory
     ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer > SAL_CALL createSystemChild( const ::com::sun::star::uno::Any& Parent, const ::com::sun::star::uno::Sequence< sal_Int8 >& ProcessId, sal_Int16 SystemType ) throw(::com::sun::star::uno::RuntimeException);
@@ -145,7 +145,7 @@ public:
     ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::dnd::XDragGestureRecognizer > SAL_CALL getDragGestureRecognizer( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow >& window ) throw(::com::sun::star::uno::RuntimeException);
     ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::dnd::XDragSource > SAL_CALL getDragSource( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow >& window ) throw(::com::sun::star::uno::RuntimeException);
     ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::dnd::XDropTarget > SAL_CALL getDropTarget( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow >& window ) throw(::com::sun::star::uno::RuntimeException);
-    ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::clipboard::XClipboard > SAL_CALL getClipboard( const ::rtl::OUString& clipboardName ) throw(::com::sun::star::uno::RuntimeException);
+    ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::clipboard::XClipboard > SAL_CALL getClipboard( const ::rtl::OUString& clipboardName ) throw(::com::sun::star::uno::RuntimeException);  
 
     // ::com::sun::star::lang::XServiceInfo
     ::rtl::OUString SAL_CALL getImplementationName(  ) throw(::com::sun::star::uno::RuntimeException);
@@ -197,21 +197,21 @@ public:
         ::com::sun::star::awt::XFocusListener > const & rListener)
         throw (::com::sun::star::uno::RuntimeException);
 
-    virtual void SAL_CALL fireFocusGained(
-        ::com::sun::star::uno::Reference<
-        ::com::sun::star::uno::XInterface > const & source)
+    virtual void SAL_CALL fireFocusGained( 
+        ::com::sun::star::uno::Reference< 
+        ::com::sun::star::uno::XInterface > const & source) 
         throw (::com::sun::star::uno::RuntimeException);
-
-    virtual void SAL_CALL fireFocusLost(
-        ::com::sun::star::uno::Reference<
-        ::com::sun::star::uno::XInterface > const & source)
+        
+    virtual void SAL_CALL fireFocusLost( 
+        ::com::sun::star::uno::Reference< 
+        ::com::sun::star::uno::XInterface > const & source) 
         throw (::com::sun::star::uno::RuntimeException);
-
+        
     // ::com::sun::star::awt::XReschedule:
     virtual void SAL_CALL reschedule()
         throw (::com::sun::star::uno::RuntimeException);
 
-
+        
 };
 
 #endif // _TOOLKIT_AWT_VCLXTOOLKIT_HXX_
diff --git a/toolkit/inc/toolkit/awt/vclxtopwindow.hxx b/toolkit/inc/toolkit/awt/vclxtopwindow.hxx
index d8e467b01499..57dd55035868 100644
--- a/toolkit/inc/toolkit/awt/vclxtopwindow.hxx
+++ b/toolkit/inc/toolkit/awt/vclxtopwindow.hxx
@@ -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
@@ -87,9 +87,9 @@ public:
     virtual void SAL_CALL setDisplay( ::sal_Int32 _display ) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::lang::IndexOutOfBoundsException);
 };
 
-//  ----------------------------------------------------
-//  class VCLXTopWindow
-//  ----------------------------------------------------
+//	----------------------------------------------------
+//	class VCLXTopWindow
+//	----------------------------------------------------
 
 class VCLXTopWindow: public VCLXTopWindow_Base,
                      public VCLXContainer
@@ -99,18 +99,18 @@ protected:
     virtual Window* GetWindowImpl();
     virtual ::cppu::OInterfaceContainerHelper& GetTopWindowListenersImpl();
 
-public:
+public:	
     VCLXTopWindow(bool bWHWND = false);
     ~VCLXTopWindow();
-
+    
     // ::com::sun::star::uno::XInterface
-    ::com::sun::star::uno::Any  SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException);
-    void                        SAL_CALL acquire() throw()  { OWeakObject::acquire(); }
-    void                        SAL_CALL release() throw()  { OWeakObject::release(); }
+    ::com::sun::star::uno::Any	SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException);
+    void						SAL_CALL acquire() throw()	{ OWeakObject::acquire(); }
+    void						SAL_CALL release() throw()	{ OWeakObject::release(); }
 
     // ::com::sun::star::lang::XTypeProvider
-    ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type >  SAL_CALL getTypes() throw(::com::sun::star::uno::RuntimeException);
-    ::com::sun::star::uno::Sequence< sal_Int8 >                     SAL_CALL getImplementationId() throw(::com::sun::star::uno::RuntimeException);
+    ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type >	SAL_CALL getTypes() throw(::com::sun::star::uno::RuntimeException);
+    ::com::sun::star::uno::Sequence< sal_Int8 >						SAL_CALL getImplementationId() throw(::com::sun::star::uno::RuntimeException);
 
     static void     ImplGetPropertyIds( std::list< sal_uInt16 > &aIds );
     virtual void    GetPropertyIds( std::list< sal_uInt16 > &aIds ) { return ImplGetPropertyIds( aIds ); }
diff --git a/toolkit/inc/toolkit/awt/vclxwindow.hxx b/toolkit/inc/toolkit/awt/vclxwindow.hxx
index 565691b97f09..09e628ddae84 100644
--- a/toolkit/inc/toolkit/awt/vclxwindow.hxx
+++ b/toolkit/inc/toolkit/awt/vclxwindow.hxx
@@ -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
@@ -47,7 +47,7 @@
 #include <cppuhelper/implbase9.hxx>
 #include <osl/mutex.hxx>
 
-#include <tools/gen.hxx>    // Size
+#include <tools/gen.hxx>	// Size
 #include <tools/link.hxx>
 
 #include <stdarg.h>
@@ -66,9 +66,9 @@ namespace toolkit
 }
 
 
-//  ----------------------------------------------------
-//  class VCLXWINDOW
-//  ----------------------------------------------------
+//	----------------------------------------------------
+//	class VCLXWINDOW
+//	----------------------------------------------------
 
 class UnoPropertyArrayHelper;
 class VCLXWindowImpl;
@@ -90,9 +90,9 @@ private:
     VCLXWindowImpl*                 mpImpl;
 
     UnoPropertyArrayHelper *GetPropHelper();
-
+    
 protected:
-    Size            ImplCalcWindowSize( const Size& rOutSz ) const;
+    Size			ImplCalcWindowSize( const Size& rOutSz ) const;
     DECL_LINK(      WindowEventListener, VclSimpleEvent* );
 
     virtual void    ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent );
@@ -102,7 +102,7 @@ protected:
     void            SetSynthesizingVCLEvent( sal_Bool b );
     BOOL            IsSynthesizingVCLEvent() const;
 
-    void        SetSystemParent_Impl( const com::sun::star::uno::Any& rHandle );
+    void 	    SetSystemParent_Impl( const com::sun::star::uno::Any& rHandle );
 
     ::toolkit::IAccessibleFactory&  getAccessibleFactory();
 
@@ -137,8 +137,8 @@ public:
     VCLXWindow( bool bWithDefaultProps = false );
     ~VCLXWindow();
 
-    virtual void    SetWindow( Window* pWindow );
-    Window*         GetWindow() const                                   { return (Window*)GetOutputDevice(); }
+    virtual void	SetWindow( Window* pWindow );
+    Window*			GetWindow() const 									{ return (Window*)GetOutputDevice(); }
 
     void    suspendVclEventListening( );
     void    resumeVclEventListening( );
@@ -146,9 +146,9 @@ public:
     void    notifyWindowRemoved( Window& _rWindow );
 
     // ::com::sun::star::lang::XUnoTunnel
-    static const ::com::sun::star::uno::Sequence< sal_Int8 >&   GetUnoTunnelId() throw();
-    static VCLXWindow*                                          GetImplementation( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& rxIFace ) throw();
-    sal_Int64                                                   SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& rIdentifier ) throw(::com::sun::star::uno::RuntimeException);
+    static const ::com::sun::star::uno::Sequence< sal_Int8 >&	GetUnoTunnelId() throw();
+    static VCLXWindow*											GetImplementation( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& rxIFace ) throw();
+    sal_Int64													SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& rIdentifier ) throw(::com::sun::star::uno::RuntimeException);
 
     // ::com::sun::star::lang::XEventListener
     virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw (::com::sun::star::uno::RuntimeException);
diff --git a/toolkit/inc/toolkit/awt/vclxwindows.hxx b/toolkit/inc/toolkit/awt/vclxwindows.hxx
index 80e3a37279d3..bbb4100183ca 100644
--- a/toolkit/inc/toolkit/awt/vclxwindows.hxx
+++ b/toolkit/inc/toolkit/awt/vclxwindows.hxx
@@ -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
@@ -108,10 +108,10 @@ class ToolBox;
 class VclSimpleEvent;
 class VclMenuEvent;
 
-//  ----------------------------------------------------
-//  class VCLXGraphicControl
+//	----------------------------------------------------
+//	class VCLXGraphicControl
 //    deriving from VCLXWindow, drawing the graphic which exists as "Graphic" at the model
-//  ----------------------------------------------------
+//	----------------------------------------------------
 
 
 class TOOLKIT_DLLPUBLIC VCLXGraphicControl : public VCLXWindow
@@ -147,9 +147,9 @@ public:
 
 };
 
-//  ----------------------------------------------------
-//  class VCLXButton
-//  ----------------------------------------------------
+//	----------------------------------------------------
+//	class VCLXButton
+//	----------------------------------------------------
 typedef ::cppu::ImplInheritanceHelper2  <   VCLXGraphicControl
                                         ,   ::com::sun::star::awt::XButton
                                         ,   ::com::sun::star::awt::XToggleButton
@@ -157,8 +157,8 @@ typedef ::cppu::ImplInheritanceHelper2  <   VCLXGraphicControl
 class VCLXButton :public VCLXButton_Base
 {
 private:
-    ::rtl::OUString             maActionCommand;
-    ActionListenerMultiplexer   maActionListeners;
+    ::rtl::OUString				maActionCommand;
+    ActionListenerMultiplexer	maActionListeners;
     ItemListenerMultiplexer     maItemListeners;
 
 protected:
@@ -196,9 +196,9 @@ public:
     virtual void    GetPropertyIds( std::list< sal_uInt16 > &aIds ) { return ImplGetPropertyIds( aIds ); }
 };
 
-//  ----------------------------------------------------
-//  class VCLXImageControl
-//  ----------------------------------------------------
+//	----------------------------------------------------
+//	class VCLXImageControl
+//	----------------------------------------------------
 class VCLXImageControl : public VCLXGraphicControl
 {
 public:
@@ -221,16 +221,16 @@ protected:
     virtual void    ImplSetNewImage();
 };
 
-//  ----------------------------------------------------
-//  class VCLXCheckBox
-//  ----------------------------------------------------
-class VCLXCheckBox :    public ::com::sun::star::awt::XCheckBox,
+//	----------------------------------------------------
+//	class VCLXCheckBox
+//	----------------------------------------------------
+class VCLXCheckBox :	public ::com::sun::star::awt::XCheckBox,
                         public ::com::sun::star::awt::XButton,
                         public VCLXGraphicControl
 {
 private:
-    ActionListenerMultiplexer   maActionListeners;
-    ::rtl::OUString             maActionCommand;
+    ActionListenerMultiplexer	maActionListeners;
+    ::rtl::OUString				maActionCommand;
     ItemListenerMultiplexer     maItemListeners;
 
 protected:
@@ -241,13 +241,13 @@ public:
                     VCLXCheckBox();
 
     // ::com::sun::star::uno::XInterface
-    ::com::sun::star::uno::Any                  SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException);
-    void                                        SAL_CALL acquire() throw()  { OWeakObject::acquire(); }
-    void                                        SAL_CALL release() throw()  { OWeakObject::release(); }
+    ::com::sun::star::uno::Any					SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException);
+    void										SAL_CALL acquire() throw()	{ OWeakObject::acquire(); }
+    void										SAL_CALL release() throw()	{ OWeakObject::release(); }
 
     // ::com::sun::star::lang::XTypeProvider
-    ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type >  SAL_CALL getTypes() throw(::com::sun::star::uno::RuntimeException);
-    ::com::sun::star::uno::Sequence< sal_Int8 >                     SAL_CALL getImplementationId() throw(::com::sun::star::uno::RuntimeException);
+    ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type >	SAL_CALL getTypes() throw(::com::sun::star::uno::RuntimeException);
+    ::com::sun::star::uno::Sequence< sal_Int8 >						SAL_CALL getImplementationId() throw(::com::sun::star::uno::RuntimeException);
 
 
     // ::com::sun::star::lang::XComponent
@@ -279,20 +279,20 @@ public:
     virtual void    GetPropertyIds( std::list< sal_uInt16 > &aIds ) { return ImplGetPropertyIds( aIds ); }
 };
 
-//  ----------------------------------------------------
-//  class VCLXRadioButton
-//  ----------------------------------------------------
-class VCLXRadioButton : public ::com::sun::star::awt::XRadioButton,
+//	----------------------------------------------------
+//	class VCLXRadioButton
+//	----------------------------------------------------
+class VCLXRadioButton :	public ::com::sun::star::awt::XRadioButton,
                         public ::com::sun::star::awt::XButton,
                         public VCLXGraphicControl
 {
 private:
     ItemListenerMultiplexer     maItemListeners;
-    ActionListenerMultiplexer   maActionListeners;
-    ::rtl::OUString             maActionCommand;
+    ActionListenerMultiplexer	maActionListeners;
+    ::rtl::OUString				maActionCommand;
 
 protected:
-    void            ImplClickedOrToggled( BOOL bToggled );
+    void			ImplClickedOrToggled( BOOL bToggled );
     void            ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent );
     virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleContext > CreateAccessibleContext();
 
@@ -300,13 +300,13 @@ public:
                     VCLXRadioButton();
 
     // ::com::sun::star::uno::XInterface
-    ::com::sun::star::uno::Any                  SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException);
-    void                                        SAL_CALL acquire() throw()  { OWeakObject::acquire(); }
-    void                                        SAL_CALL release() throw()  { OWeakObject::release(); }
+    ::com::sun::star::uno::Any					SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException);
+    void										SAL_CALL acquire() throw()	{ OWeakObject::acquire(); }
+    void										SAL_CALL release() throw()	{ OWeakObject::release(); }
 
     // ::com::sun::star::lang::XTypeProvider
-    ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type >  SAL_CALL getTypes() throw(::com::sun::star::uno::RuntimeException);
-    ::com::sun::star::uno::Sequence< sal_Int8 >                     SAL_CALL getImplementationId() throw(::com::sun::star::uno::RuntimeException);
+    ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type >	SAL_CALL getTypes() throw(::com::sun::star::uno::RuntimeException);
+    ::com::sun::star::uno::Sequence< sal_Int8 >						SAL_CALL getImplementationId() throw(::com::sun::star::uno::RuntimeException);
 
     // ::com::sun::star::lang::XComponent
     void SAL_CALL dispose(  ) throw(::com::sun::star::uno::RuntimeException);
@@ -338,10 +338,10 @@ public:
     ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > getFirstActionListener ();
 };
 
-//  ----------------------------------------------------
-//  class VCLXMessageBox
-//  ----------------------------------------------------
-class VCLXMessageBox :  public ::com::sun::star::awt::XMessageBox,
+//	----------------------------------------------------
+//	class VCLXMessageBox
+//	----------------------------------------------------
+class VCLXMessageBox :	public ::com::sun::star::awt::XMessageBox,
                         public VCLXTopWindow
 {
 public:
@@ -349,13 +349,13 @@ public:
                         ~VCLXMessageBox();
 
     // ::com::sun::star::uno::XInterface
-    ::com::sun::star::uno::Any                  SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException);
-    void                                        SAL_CALL acquire() throw()  { OWeakObject::acquire(); }
-    void                                        SAL_CALL release() throw()  { OWeakObject::release(); }
+    ::com::sun::star::uno::Any					SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException);
+    void										SAL_CALL acquire() throw()	{ OWeakObject::acquire(); }
+    void										SAL_CALL release() throw()	{ OWeakObject::release(); }
 
     // ::com::sun::star::lang::XTypeProvider
-    ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type >  SAL_CALL getTypes() throw(::com::sun::star::uno::RuntimeException);
-    ::com::sun::star::uno::Sequence< sal_Int8 >                     SAL_CALL getImplementationId() throw(::com::sun::star::uno::RuntimeException);
+    ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type >	SAL_CALL getTypes() throw(::com::sun::star::uno::RuntimeException);
+    ::com::sun::star::uno::Sequence< sal_Int8 >						SAL_CALL getImplementationId() throw(::com::sun::star::uno::RuntimeException);
 
 
     // ::com::sun::star::awt::XMessageBox
@@ -374,10 +374,10 @@ public:
 
 
 
-//  ----------------------------------------------------
-//  class VCLXDialog
-//  ----------------------------------------------------
-class VCLXDialog :  public ::com::sun::star::awt::XDialog2,
+//	----------------------------------------------------
+//	class VCLXDialog
+//	----------------------------------------------------
+class VCLXDialog :	public ::com::sun::star::awt::XDialog2,
                     public VCLXTopWindow
 {
 public:
@@ -385,13 +385,13 @@ public:
                         ~VCLXDialog();
 
     // ::com::sun::star::uno::XInterface
-    ::com::sun::star::uno::Any                  SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException);
-    void                                        SAL_CALL acquire() throw()  { OWeakObject::acquire(); }
-    void                                        SAL_CALL release() throw()  { OWeakObject::release(); }
+    ::com::sun::star::uno::Any					SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException);
+    void										SAL_CALL acquire() throw()	{ OWeakObject::acquire(); }
+    void										SAL_CALL release() throw()	{ OWeakObject::release(); }
 
     // ::com::sun::star::lang::XTypeProvider
-    ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type >  SAL_CALL getTypes() throw(::com::sun::star::uno::RuntimeException);
-    ::com::sun::star::uno::Sequence< sal_Int8 >                     SAL_CALL getImplementationId() throw(::com::sun::star::uno::RuntimeException);
+    ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type >	SAL_CALL getTypes() throw(::com::sun::star::uno::RuntimeException);
+    ::com::sun::star::uno::Sequence< sal_Int8 >						SAL_CALL getImplementationId() throw(::com::sun::star::uno::RuntimeException);
 
     // ::com::sun::star::awt::XDialog2
     virtual void SAL_CALL endDialog( ::sal_Int32 Result ) throw (::com::sun::star::uno::RuntimeException);
@@ -417,23 +417,23 @@ public:
 
 };
 
-//  ----------------------------------------------------
-//  class VCLXTabPage
-//  ----------------------------------------------------
-class VCLXTabPage : public VCLXContainer
+//	----------------------------------------------------
+//	class VCLXTabPage
+//	----------------------------------------------------
+class VCLXTabPage :	public VCLXContainer
 {
 public:
                         VCLXTabPage();
                         ~VCLXTabPage();
 
     // ::com::sun::star::uno::XInterface
-    ::com::sun::star::uno::Any                  SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException);
-    void                                        SAL_CALL acquire() throw()  { OWeakObject::acquire(); }
-    void                                        SAL_CALL release() throw()  { OWeakObject::release(); }
+    ::com::sun::star::uno::Any					SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException);
+    void										SAL_CALL acquire() throw()	{ OWeakObject::acquire(); }
+    void										SAL_CALL release() throw()	{ OWeakObject::release(); }
 
     // ::com::sun::star::lang::XTypeProvider
-    ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type >  SAL_CALL getTypes() throw(::com::sun::star::uno::RuntimeException);
-    ::com::sun::star::uno::Sequence< sal_Int8 >                     SAL_CALL getImplementationId() throw(::com::sun::star::uno::RuntimeException);
+    ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type >	SAL_CALL getTypes() throw(::com::sun::star::uno::RuntimeException);
+    ::com::sun::star::uno::Sequence< sal_Int8 >						SAL_CALL getImplementationId() throw(::com::sun::star::uno::RuntimeException);
 
     // ::com::sun::star::awt::XView
     void SAL_CALL draw( sal_Int32 nX, sal_Int32 nY ) throw(::com::sun::star::uno::RuntimeException);
@@ -501,10 +501,10 @@ public:
     virtual void    GetPropertyIds( std::list< sal_uInt16 > &aIds ) { return ImplGetPropertyIds( aIds ); }
 };
 
-//  ----------------------------------------------------
-//  class VCLXFixedText
-//  ----------------------------------------------------
-class VCLXFixedText :   public ::com::sun::star::awt::XFixedText,
+//	----------------------------------------------------
+//	class VCLXFixedText
+//	----------------------------------------------------
+class VCLXFixedText :	public ::com::sun::star::awt::XFixedText,
                         public VCLXWindow
 {
 protected:
@@ -515,13 +515,13 @@ public:
                         ~VCLXFixedText();
 
     // ::com::sun::star::uno::XInterface
-    ::com::sun::star::uno::Any                  SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException);
-    void                                        SAL_CALL acquire() throw()  { OWeakObject::acquire(); }
-    void                                        SAL_CALL release() throw()  { OWeakObject::release(); }
+    ::com::sun::star::uno::Any					SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException);
+    void										SAL_CALL acquire() throw()	{ OWeakObject::acquire(); }
+    void										SAL_CALL release() throw()	{ OWeakObject::release(); }
 
     // ::com::sun::star::lang::XTypeProvider
-    ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type >  SAL_CALL getTypes() throw(::com::sun::star::uno::RuntimeException);
-    ::com::sun::star::uno::Sequence< sal_Int8 >                     SAL_CALL getImplementationId() throw(::com::sun::star::uno::RuntimeException);
+    ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type >	SAL_CALL getTypes() throw(::com::sun::star::uno::RuntimeException);
+    ::com::sun::star::uno::Sequence< sal_Int8 >						SAL_CALL getImplementationId() throw(::com::sun::star::uno::RuntimeException);
 
     // ::com::sun::star::awt::XFixedText
     void SAL_CALL setText( const ::rtl::OUString& Text ) throw(::com::sun::star::uno::RuntimeException);
@@ -538,10 +538,10 @@ public:
     virtual void    GetPropertyIds( std::list< sal_uInt16 > &aIds ) { return ImplGetPropertyIds( aIds ); }
 };
 
-//  ----------------------------------------------------
-//  class VCLXScrollBar
-//  ----------------------------------------------------
-class VCLXScrollBar :   public ::com::sun::star::awt::XScrollBar,
+//	----------------------------------------------------
+//	class VCLXScrollBar
+//	----------------------------------------------------
+class VCLXScrollBar :	public ::com::sun::star::awt::XScrollBar,
                         public VCLXWindow
 {
 private:
@@ -554,13 +554,13 @@ protected:
 public:
                     VCLXScrollBar();
     // ::com::sun::star::uno::XInterface
-    ::com::sun::star::uno::Any                  SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException);
-    void                                        SAL_CALL acquire() throw()  { OWeakObject::acquire(); }
-    void                                        SAL_CALL release() throw()  { OWeakObject::release(); }
+    ::com::sun::star::uno::Any					SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException);
+    void										SAL_CALL acquire() throw()	{ OWeakObject::acquire(); }
+    void										SAL_CALL release() throw()	{ OWeakObject::release(); }
 
     // ::com::sun::star::lang::XTypeProvider
-    ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type >  SAL_CALL getTypes() throw(::com::sun::star::uno::RuntimeException);
-    ::com::sun::star::uno::Sequence< sal_Int8 >                     SAL_CALL getImplementationId() throw(::com::sun::star::uno::RuntimeException);
+    ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type >	SAL_CALL getTypes() throw(::com::sun::star::uno::RuntimeException);
+    ::com::sun::star::uno::Sequence< sal_Int8 >						SAL_CALL getImplementationId() throw(::com::sun::star::uno::RuntimeException);
 
 
     // ::com::sun::star::lang::XComponent
@@ -599,10 +599,10 @@ public:
     virtual void    GetPropertyIds( std::list< sal_uInt16 > &aIds ) { return ImplGetPropertyIds( aIds ); }
 };
 
-//  ----------------------------------------------------
-//  class VCLXEdit
-//  ----------------------------------------------------
-class TOOLKIT_DLLPUBLIC VCLXEdit :  public ::com::sun::star::awt::XTextComponent,
+//	----------------------------------------------------
+//	class VCLXEdit
+//	----------------------------------------------------
+class TOOLKIT_DLLPUBLIC VCLXEdit :	public ::com::sun::star::awt::XTextComponent,
                     public ::com::sun::star::awt::XTextEditField,
                     public ::com::sun::star::awt::XTextLayoutConstrains,
                     public VCLXWindow
@@ -618,16 +618,16 @@ protected:
 public:
                     VCLXEdit();
 
-    TextListenerMultiplexer&    GetTextListeners() { return maTextListeners; }
+    TextListenerMultiplexer&	GetTextListeners() { return maTextListeners; }
 
     // ::com::sun::star::uno::XInterface
-    ::com::sun::star::uno::Any                  SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException);
-    void                                        SAL_CALL acquire() throw()  { OWeakObject::acquire(); }
-    void                                        SAL_CALL release() throw()  { OWeakObject::release(); }
+    ::com::sun::star::uno::Any					SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException);
+    void										SAL_CALL acquire() throw()	{ OWeakObject::acquire(); }
+    void										SAL_CALL release() throw()	{ OWeakObject::release(); }
 
     // ::com::sun::star::lang::XTypeProvider
-    ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type >  SAL_CALL getTypes() throw(::com::sun::star::uno::RuntimeException);
-    ::com::sun::star::uno::Sequence< sal_Int8 >                     SAL_CALL getImplementationId() throw(::com::sun::star::uno::RuntimeException);
+    ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type >	SAL_CALL getTypes() throw(::com::sun::star::uno::RuntimeException);
+    ::com::sun::star::uno::Sequence< sal_Int8 >						SAL_CALL getImplementationId() throw(::com::sun::star::uno::RuntimeException);
 
 
     // ::com::sun::star::lang::XComponent
@@ -667,9 +667,9 @@ public:
     virtual void    GetPropertyIds( std::list< sal_uInt16 > &aIds ) { return ImplGetPropertyIds( aIds ); }
 };
 
-//  ----------------------------------------------------
-//  class VCLXListBox
-//  ----------------------------------------------------
+//	----------------------------------------------------
+//	class VCLXListBox
+//	----------------------------------------------------
 typedef ::cppu::ImplInheritanceHelper3  <   VCLXWindow
                                         ,   ::com::sun::star::awt::XListBox
                                         ,   ::com::sun::star::awt::XTextLayoutConstrains
@@ -678,11 +678,11 @@ typedef ::cppu::ImplInheritanceHelper3  <   VCLXWindow
 class VCLXListBox  : public VCLXListBox_Base
 {
 private:
-    ActionListenerMultiplexer   maActionListeners;
-    ItemListenerMultiplexer     maItemListeners;
+    ActionListenerMultiplexer	maActionListeners;
+    ItemListenerMultiplexer		maItemListeners;
 
 protected:
-    virtual void    ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent );
+    virtual void	ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent );
     virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleContext >
                     CreateAccessibleContext();
     void            ImplCallItemListeners();
@@ -744,15 +744,17 @@ public:
     virtual void    GetPropertyIds( std::list< sal_uInt16 > &aIds ) { return ImplGetPropertyIds( aIds ); }
 };
 
-//  ----------------------------------------------------
-//  class VCLXComboBox
-//  ----------------------------------------------------
-class VCLXComboBox :    public ::com::sun::star::awt::XComboBox,
-                        public VCLXEdit
+//	----------------------------------------------------
+//	class VCLXComboBox
+//	----------------------------------------------------
+typedef ::cppu::ImplInheritanceHelper2  <   VCLXEdit
+                                        ,   ::com::sun::star::awt::XComboBox
+                                        ,   ::com::sun::star::awt::XItemListListener > VCLXComboBox_Base;
+class VCLXComboBox :	public VCLXComboBox_Base
 {
 private:
-    ActionListenerMultiplexer   maActionListeners;
-    ItemListenerMultiplexer     maItemListeners;
+    ActionListenerMultiplexer	maActionListeners;
+    ItemListenerMultiplexer		maItemListeners;
 
 protected:
     void            ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent );
@@ -763,15 +765,6 @@ public:
                         VCLXComboBox();
     ~VCLXComboBox();
 
-    // ::com::sun::star::uno::XInterface
-    ::com::sun::star::uno::Any                  SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException);
-    void                                        SAL_CALL acquire() throw()  { OWeakObject::acquire(); }
-    void                                        SAL_CALL release() throw()  { OWeakObject::release(); }
-
-    // ::com::sun::star::lang::XTypeProvider
-    ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type >  SAL_CALL getTypes() throw(::com::sun::star::uno::RuntimeException);
-    ::com::sun::star::uno::Sequence< sal_Int8 >                     SAL_CALL getImplementationId() throw(::com::sun::star::uno::RuntimeException);
-
      // ::com::sun::star::lang::XComponent
     void SAL_CALL dispose(  ) throw(::com::sun::star::uno::RuntimeException);
 
@@ -802,18 +795,27 @@ public:
     void SAL_CALL setProperty( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Any& Value ) throw(::com::sun::star::uno::RuntimeException);
     ::com::sun::star::uno::Any SAL_CALL getProperty( const ::rtl::OUString& PropertyName ) throw(::com::sun::star::uno::RuntimeException);
 
+    // XItemListListener
+    virtual void SAL_CALL listItemInserted( const ::com::sun::star::awt::ItemListEvent& Event ) throw (::com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL listItemRemoved( const ::com::sun::star::awt::ItemListEvent& Event ) throw (::com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL listItemModified( const ::com::sun::star::awt::ItemListEvent& Event ) throw (::com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL allItemsRemoved( const ::com::sun::star::lang::EventObject& Event ) throw (::com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL itemListChanged( const ::com::sun::star::lang::EventObject& Event ) throw (::com::sun::star::uno::RuntimeException);
+    // XEventListener
+    virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& i_rEvent ) throw (::com::sun::star::uno::RuntimeException);
+
     static void     ImplGetPropertyIds( std::list< sal_uInt16 > &aIds );
     virtual void    GetPropertyIds( std::list< sal_uInt16 > &aIds ) { return ImplGetPropertyIds( aIds ); }
 };
 
-//  ----------------------------------------------------
-//  class VCLXSpinField
-//  ----------------------------------------------------
-class TOOLKIT_DLLPUBLIC VCLXSpinField : public ::com::sun::star::awt::XSpinField,
+//	----------------------------------------------------
+//	class VCLXSpinField
+//	----------------------------------------------------
+class TOOLKIT_DLLPUBLIC VCLXSpinField :	public ::com::sun::star::awt::XSpinField,
                         public VCLXEdit
 {
 private:
-    SpinListenerMultiplexer maSpinListeners;
+    SpinListenerMultiplexer	maSpinListeners;
 
 protected:
     void            ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent );
@@ -822,13 +824,13 @@ public:
                     VCLXSpinField();
 
     // ::com::sun::star::uno::XInterface
-    ::com::sun::star::uno::Any                  SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException);
-    void                                        SAL_CALL acquire() throw()  { OWeakObject::acquire(); }
-    void                                        SAL_CALL release() throw()  { OWeakObject::release(); }
+    ::com::sun::star::uno::Any					SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException);
+    void										SAL_CALL acquire() throw()	{ OWeakObject::acquire(); }
+    void										SAL_CALL release() throw()	{ OWeakObject::release(); }
 
     // ::com::sun::star::lang::XTypeProvider
-    ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type >  SAL_CALL getTypes() throw(::com::sun::star::uno::RuntimeException);
-    ::com::sun::star::uno::Sequence< sal_Int8 >                     SAL_CALL getImplementationId() throw(::com::sun::star::uno::RuntimeException);
+    ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type >	SAL_CALL getTypes() throw(::com::sun::star::uno::RuntimeException);
+    ::com::sun::star::uno::Sequence< sal_Int8 >						SAL_CALL getImplementationId() throw(::com::sun::star::uno::RuntimeException);
 
 
     // ::com::sun::star::awt::XSpinField
@@ -844,25 +846,25 @@ public:
     virtual void    GetPropertyIds( std::list< sal_uInt16 > &aIds ) { return ImplGetPropertyIds( aIds ); }
 };
 
-//  ----------------------------------------------------
-//  class VCLXFormattedSpinField
-//  ----------------------------------------------------
+//	----------------------------------------------------
+//	class VCLXFormattedSpinField
+//	----------------------------------------------------
 class VCLXFormattedSpinField : public VCLXSpinField
 {
 private:
-    FormatterBase*  mpFormatter;
+    FormatterBase*	mpFormatter;
 
 protected:
-    FormatterBase*  GetFormatter() const { return GetWindow() ? mpFormatter : NULL; }
+    FormatterBase*	GetFormatter() const { return GetWindow() ? mpFormatter : NULL; }
 
 public:
                     VCLXFormattedSpinField();
                     ~VCLXFormattedSpinField();
 
-    void            SetFormatter( FormatterBase* pFormatter ) { mpFormatter = pFormatter; }
+    void			SetFormatter( FormatterBase* pFormatter ) { mpFormatter = pFormatter; }
 
-    void            setStrictFormat( sal_Bool bStrict );
-    sal_Bool        isStrictFormat();
+    void 			setStrictFormat( sal_Bool bStrict );
+    sal_Bool 		isStrictFormat();
 
     // ::com::sun::star::awt::VclWindowPeer
     void SAL_CALL setProperty( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Any& Value ) throw(::com::sun::star::uno::RuntimeException);
@@ -872,10 +874,10 @@ public:
     virtual void    GetPropertyIds( std::list< sal_uInt16 > &aIds ) { return ImplGetPropertyIds( aIds ); }
 };
 
-//  ----------------------------------------------------
-//  class VCLXDateField
-//  ----------------------------------------------------
-class TOOLKIT_DLLPUBLIC VCLXDateField : public ::com::sun::star::awt::XDateField,
+//	----------------------------------------------------
+//	class VCLXDateField
+//	----------------------------------------------------
+class TOOLKIT_DLLPUBLIC VCLXDateField :	public ::com::sun::star::awt::XDateField,
                         public VCLXFormattedSpinField
 {
 public:
@@ -883,13 +885,13 @@ public:
                     ~VCLXDateField();
 
     // ::com::sun::star::uno::XInterface
-    ::com::sun::star::uno::Any                  SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException);
-    void                                        SAL_CALL acquire() throw()  { OWeakObject::acquire(); }
-    void                                        SAL_CALL release() throw()  { OWeakObject::release(); }
+    ::com::sun::star::uno::Any					SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException);
+    void										SAL_CALL acquire() throw()	{ OWeakObject::acquire(); }
+    void										SAL_CALL release() throw()	{ OWeakObject::release(); }
 
     // ::com::sun::star::lang::XTypeProvider
-    ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type >  SAL_CALL getTypes() throw(::com::sun::star::uno::RuntimeException);
-    ::com::sun::star::uno::Sequence< sal_Int8 >                     SAL_CALL getImplementationId() throw(::com::sun::star::uno::RuntimeException);
+    ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type >	SAL_CALL getTypes() throw(::com::sun::star::uno::RuntimeException);
+    ::com::sun::star::uno::Sequence< sal_Int8 >						SAL_CALL getImplementationId() throw(::com::sun::star::uno::RuntimeException);
 
 
     // ::com::sun::star::awt::XDateField
@@ -918,10 +920,10 @@ public:
     virtual void    GetPropertyIds( std::list< sal_uInt16 > &aIds ) { return ImplGetPropertyIds( aIds ); }
 };
 
-//  ----------------------------------------------------
-//  class VCLXTimeField
-//  ----------------------------------------------------
-class VCLXTimeField :   public ::com::sun::star::awt::XTimeField,
+//	----------------------------------------------------
+//	class VCLXTimeField
+//	----------------------------------------------------
+class VCLXTimeField :	public ::com::sun::star::awt::XTimeField,
                         public VCLXFormattedSpinField
 {
 public:
@@ -929,13 +931,13 @@ public:
                     ~VCLXTimeField();
 
     // ::com::sun::star::uno::XInterface
-    ::com::sun::star::uno::Any                  SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException);
-    void                                        SAL_CALL acquire() throw()  { OWeakObject::acquire(); }
-    void                                        SAL_CALL release() throw()  { OWeakObject::release(); }
+    ::com::sun::star::uno::Any					SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException);
+    void										SAL_CALL acquire() throw()	{ OWeakObject::acquire(); }
+    void										SAL_CALL release() throw()	{ OWeakObject::release(); }
 
     // ::com::sun::star::lang::XTypeProvider
-    ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type >  SAL_CALL getTypes() throw(::com::sun::star::uno::RuntimeException);
-    ::com::sun::star::uno::Sequence< sal_Int8 >                     SAL_CALL getImplementationId() throw(::com::sun::star::uno::RuntimeException);
+    ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type >	SAL_CALL getTypes() throw(::com::sun::star::uno::RuntimeException);
+    ::com::sun::star::uno::Sequence< sal_Int8 >						SAL_CALL getImplementationId() throw(::com::sun::star::uno::RuntimeException);
 
     // ::com::sun::star::awt::XTimeField
     void SAL_CALL setTime( sal_Int32 Time ) throw(::com::sun::star::uno::RuntimeException);
@@ -961,10 +963,10 @@ public:
     virtual void    GetPropertyIds( std::list< sal_uInt16 > &aIds ) { return ImplGetPropertyIds( aIds ); }
 };
 
-//  ----------------------------------------------------
-//  class VCLXNumericField
-//  ----------------------------------------------------
-class VCLXNumericField :    public ::com::sun::star::awt::XNumericField,
+//	----------------------------------------------------
+//	class VCLXNumericField
+//	----------------------------------------------------
+class VCLXNumericField :	public ::com::sun::star::awt::XNumericField,
                             public VCLXFormattedSpinField
 {
 public:
@@ -972,13 +974,13 @@ public:
                     ~VCLXNumericField();
 
     // ::com::sun::star::uno::XInterface
-    ::com::sun::star::uno::Any                  SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException);
-    void                                        SAL_CALL acquire() throw()  { OWeakObject::acquire(); }
-    void                                        SAL_CALL release() throw()  { OWeakObject::release(); }
+    ::com::sun::star::uno::Any					SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException);
+    void										SAL_CALL acquire() throw()	{ OWeakObject::acquire(); }
+    void										SAL_CALL release() throw()	{ OWeakObject::release(); }
 
     // ::com::sun::star::lang::XTypeProvider
-    ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type >  SAL_CALL getTypes() throw(::com::sun::star::uno::RuntimeException);
-    ::com::sun::star::uno::Sequence< sal_Int8 >                     SAL_CALL getImplementationId() throw(::com::sun::star::uno::RuntimeException);
+    ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type >	SAL_CALL getTypes() throw(::com::sun::star::uno::RuntimeException);
+    ::com::sun::star::uno::Sequence< sal_Int8 >						SAL_CALL getImplementationId() throw(::com::sun::star::uno::RuntimeException);
 
     // ::com::sun::star::awt::XNumericField
     void SAL_CALL setValue( double Value ) throw(::com::sun::star::uno::RuntimeException);
@@ -1006,12 +1008,12 @@ public:
     virtual void    GetPropertyIds( std::list< sal_uInt16 > &aIds ) { return ImplGetPropertyIds( aIds ); }
 };
 
-//  ----------------------------------------------------
-//  class VCLXMetricField
-//  ----------------------------------------------------
+//	----------------------------------------------------
+//	class VCLXMetricField
+//	----------------------------------------------------
 class MetricFormatter;
 class MetricField;
-class VCLXMetricField : public ::com::sun::star::awt::XMetricField,
+class VCLXMetricField :	public ::com::sun::star::awt::XMetricField,
                         public VCLXFormattedSpinField
 {
     MetricFormatter *GetMetricFormatter() throw(::com::sun::star::uno::RuntimeException);
@@ -1022,13 +1024,13 @@ public:
     ~VCLXMetricField();
 
     // ::com::sun::star::uno::XInterface
-    ::com::sun::star::uno::Any                  SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException);
-    void                                        SAL_CALL acquire() throw()  { OWeakObject::acquire(); }
-    void                                        SAL_CALL release() throw()  { OWeakObject::release(); }
+    ::com::sun::star::uno::Any					SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException);
+    void										SAL_CALL acquire() throw()	{ OWeakObject::acquire(); }
+    void										SAL_CALL release() throw()	{ OWeakObject::release(); }
 
     // ::com::sun::star::lang::XTypeProvider
-    ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type >  SAL_CALL getTypes() throw(::com::sun::star::uno::RuntimeException);
-    ::com::sun::star::uno::Sequence< sal_Int8 >                     SAL_CALL getImplementationId() throw(::com::sun::star::uno::RuntimeException);
+    ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type >	SAL_CALL getTypes() throw(::com::sun::star::uno::RuntimeException);
+    ::com::sun::star::uno::Sequence< sal_Int8 >						SAL_CALL getImplementationId() throw(::com::sun::star::uno::RuntimeException);
 
     // ::com::sun::star::awt::XMetricField
     virtual void SAL_CALL setValue( ::sal_Int64 Value, ::sal_Int16 Unit ) throw (::com::sun::star::uno::RuntimeException);
@@ -1058,10 +1060,10 @@ public:
     virtual void    GetPropertyIds( std::list< sal_uInt16 > &aIds ) { return ImplGetPropertyIds( aIds ); }
 };
 
-//  ----------------------------------------------------
-//  class VCLXCurrencyField
-//  ----------------------------------------------------
-class VCLXCurrencyField :   public ::com::sun::star::awt::XCurrencyField,
+//	----------------------------------------------------
+//	class VCLXCurrencyField
+//	----------------------------------------------------
+class VCLXCurrencyField :	public ::com::sun::star::awt::XCurrencyField,
                             public VCLXFormattedSpinField
 {
 public:
@@ -1069,13 +1071,13 @@ public:
                     ~VCLXCurrencyField();
 
     // ::com::sun::star::uno::XInterface
-    ::com::sun::star::uno::Any                  SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException);
-    void                                        SAL_CALL acquire() throw()  { OWeakObject::acquire(); }
-    void                                        SAL_CALL release() throw()  { OWeakObject::release(); }
+    ::com::sun::star::uno::Any					SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException);
+    void										SAL_CALL acquire() throw()	{ OWeakObject::acquire(); }
+    void										SAL_CALL release() throw()	{ OWeakObject::release(); }
 
     // ::com::sun::star::lang::XTypeProvider
-    ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type >  SAL_CALL getTypes() throw(::com::sun::star::uno::RuntimeException);
-    ::com::sun::star::uno::Sequence< sal_Int8 >                     SAL_CALL getImplementationId() throw(::com::sun::star::uno::RuntimeException);
+    ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type >	SAL_CALL getTypes() throw(::com::sun::star::uno::RuntimeException);
+    ::com::sun::star::uno::Sequence< sal_Int8 >						SAL_CALL getImplementationId() throw(::com::sun::star::uno::RuntimeException);
 
 
     // ::com::sun::star::awt::XCurrencyField
@@ -1104,10 +1106,10 @@ public:
     virtual void    GetPropertyIds( std::list< sal_uInt16 > &aIds ) { return ImplGetPropertyIds( aIds ); }
 };
 
-//  ----------------------------------------------------
-//  class VCLXPatternField
-//  ----------------------------------------------------
-class VCLXPatternField :    public ::com::sun::star::awt::XPatternField,
+//	----------------------------------------------------
+//	class VCLXPatternField
+//	----------------------------------------------------
+class VCLXPatternField :	public ::com::sun::star::awt::XPatternField,
                             public VCLXFormattedSpinField
 {
 public:
@@ -1115,13 +1117,13 @@ public:
                     ~VCLXPatternField();
 
     // ::com::sun::star::uno::XInterface
-    ::com::sun::star::uno::Any                  SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException);
-    void                                        SAL_CALL acquire() throw()  { OWeakObject::acquire(); }
-    void                                        SAL_CALL release() throw()  { OWeakObject::release(); }
+    ::com::sun::star::uno::Any					SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException);
+    void										SAL_CALL acquire() throw()	{ OWeakObject::acquire(); }
+    void										SAL_CALL release() throw()	{ OWeakObject::release(); }
 
     // ::com::sun::star::lang::XTypeProvider
-    ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type >  SAL_CALL getTypes() throw(::com::sun::star::uno::RuntimeException);
-    ::com::sun::star::uno::Sequence< sal_Int8 >                     SAL_CALL getImplementationId() throw(::com::sun::star::uno::RuntimeException);
+    ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type >	SAL_CALL getTypes() throw(::com::sun::star::uno::RuntimeException);
+    ::com::sun::star::uno::Sequence< sal_Int8 >						SAL_CALL getImplementationId() throw(::com::sun::star::uno::RuntimeException);
 
 
     // ::com::sun::star::awt::XPatternField
@@ -1140,10 +1142,10 @@ public:
     virtual void    GetPropertyIds( std::list< sal_uInt16 > &aIds ) { return ImplGetPropertyIds( aIds ); }
 };
 
-//  ----------------------------------------------------
-//  class VCLXToolBox
-//  ----------------------------------------------------
-class VCLXToolBox : public VCLXWindow
+//	----------------------------------------------------
+//	class VCLXToolBox
+//	----------------------------------------------------
+class VCLXToolBox :	public VCLXWindow
 {
 private:
 
diff --git a/toolkit/inc/toolkit/awt/xsimpleanimation.hxx b/toolkit/inc/toolkit/awt/xsimpleanimation.hxx
index dc8fbe4506ed..bdcd5f319f39 100644
--- a/toolkit/inc/toolkit/awt/xsimpleanimation.hxx
+++ b/toolkit/inc/toolkit/awt/xsimpleanimation.hxx
@@ -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
diff --git a/toolkit/inc/toolkit/awt/xthrobber.hxx b/toolkit/inc/toolkit/awt/xthrobber.hxx
index 511f3f76ecf6..da1c6a5e5f23 100644
--- a/toolkit/inc/toolkit/awt/xthrobber.hxx
+++ b/toolkit/inc/toolkit/awt/xthrobber.hxx
@@ -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
diff --git a/toolkit/inc/toolkit/controls/accessiblecontrolcontext.hxx b/toolkit/inc/toolkit/controls/accessiblecontrolcontext.hxx
index bc5f1e1295a2..0a4903b803dc 100644
--- a/toolkit/inc/toolkit/controls/accessiblecontrolcontext.hxx
+++ b/toolkit/inc/toolkit/controls/accessiblecontrolcontext.hxx
@@ -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
@@ -45,9 +45,9 @@ namespace toolkit
     //= OAccessibleControlContext
     //====================================================================
 
-    typedef ::comphelper::OAccessibleComponentHelper    OAccessibleControlContext_Base;
-    typedef ::cppu::ImplHelper1 <   ::com::sun::star::lang::XEventListener
-                                >   OAccessibleControlContext_IBase;
+    typedef	::comphelper::OAccessibleComponentHelper	OAccessibleControlContext_Base;
+    typedef ::cppu::ImplHelper1	<	::com::sun::star::lang::XEventListener
+                                >	OAccessibleControlContext_IBase;
 
     /** class implementing the AccessibleContext for an UNO control - to be used in design mode of the control.
         <p><b>life time control<b/><br/>
@@ -62,9 +62,9 @@ namespace toolkit
     {
     private:
         ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >
-                    m_xControlModel;        // the model of the control which's context we implement
+                    m_xControlModel;		// the model of the control which's context we implement
         ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo >
-                    m_xModelPropsInfo;      // the cached property set info of the model
+                    m_xModelPropsInfo;		// the cached property set info of the model
 
     protected:
         /// ctor. @see Init
@@ -75,7 +75,7 @@ namespace toolkit
         */
         void Init(
             const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >& _rxCreator
-        )   SAL_THROW( ( ::com::sun::star::uno::Exception ) );
+        )	SAL_THROW( ( ::com::sun::star::uno::Exception ) );
 
         // OCommonAccessibleComponent overridables
         virtual ::com::sun::star::awt::Rectangle SAL_CALL implGetBounds(  ) throw (::com::sun::star::uno::RuntimeException);
@@ -118,18 +118,18 @@ namespace toolkit
 
     private:
         // retrieves the value of a string property from the model, if the property is present
-        ::rtl::OUString getModelStringProperty( const sal_Char* _pPropertyName ) SAL_THROW( ( ) );
+        ::rtl::OUString	getModelStringProperty( const sal_Char* _pPropertyName ) SAL_THROW( ( ) );
 
         // starts listening at the control model (currently for disposal only)
         void startModelListening( ) SAL_THROW( ( ::com::sun::star::uno::Exception ) );
         // stops listening at the control model
         void stopModelListening( ) SAL_THROW( ( ::com::sun::star::uno::Exception ) );
 
-        Window* implGetWindow( ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow >* _pxUNOWindow = NULL ) const;
+        Window*	implGetWindow( ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow >* _pxUNOWindow = NULL ) const;
     };
 
 //........................................................................
-}   // namespace toolkit
+}	// namespace toolkit
 //........................................................................
 
 #endif // TOOLKIT_ACCESSIBLE_CONTROL_CONTEXT_HXX
diff --git a/toolkit/inc/toolkit/controls/dialogcontrol.hxx b/toolkit/inc/toolkit/controls/dialogcontrol.hxx
index 0c5731d3f923..7b8e0256c088 100644
--- a/toolkit/inc/toolkit/controls/dialogcontrol.hxx
+++ b/toolkit/inc/toolkit/controls/dialogcontrol.hxx
@@ -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
@@ -49,20 +49,20 @@
 #include <cppuhelper/basemutex.hxx>
 #include <list>
 
-//  ----------------------------------------------------
-//  class UnoControlDialogModel
-//  ----------------------------------------------------
-typedef UnoControlModel     UnoControlDialogModel_Base;
-typedef ::cppu::ImplHelper6 <   ::com::sun::star::lang::XMultiServiceFactory
-                            ,   ::com::sun::star::container::XContainer
-                            ,   ::com::sun::star::container::XNameContainer
-                            ,   ::com::sun::star::awt::XTabControllerModel
-                            ,   ::com::sun::star::util::XChangesNotifier
-                            ,   ::com::sun::star::beans::XPropertyChangeListener
-                            >   UnoControlDialogModel_IBase;
-
-class UnoControlDialogModel :   public UnoControlDialogModel_IBase
-                            ,   public UnoControlDialogModel_Base
+//	----------------------------------------------------
+//	class UnoControlDialogModel
+//	----------------------------------------------------
+typedef UnoControlModel		UnoControlDialogModel_Base;
+typedef ::cppu::ImplHelper6	<	::com::sun::star::lang::XMultiServiceFactory
+                            ,	::com::sun::star::container::XContainer
+                            ,	::com::sun::star::container::XNameContainer
+                            ,	::com::sun::star::awt::XTabControllerModel
+                            ,	::com::sun::star::util::XChangesNotifier
+                            ,	::com::sun::star::beans::XPropertyChangeListener
+                            >	UnoControlDialogModel_IBase;
+
+class UnoControlDialogModel :	public UnoControlDialogModel_IBase
+                            ,	public UnoControlDialogModel_Base
 {
 public:
     // would like to make this typedef private, too, but the Forte 7 compiler does have
@@ -70,46 +70,46 @@ public:
     typedef ::std::pair< ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel >, ::rtl::OUString >
                                                         UnoControlModelHolder;
 private:
-    typedef ::std::list< UnoControlModelHolder >        UnoControlModelHolderList;
+    typedef ::std::list< UnoControlModelHolder >		UnoControlModelHolderList;
 
     // for grouping control models (XTabControllerModel::getGroupXXX)
-    typedef ::std::vector< ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel > >
+    typedef ::std::vector< ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel > >	
                                                         ModelGroup;
-    typedef ::std::vector< ModelGroup >                 AllGroups;
+    typedef	::std::vector< ModelGroup >					AllGroups;
 
     friend struct CloneControlModel;
     friend struct FindControlModel;
     friend struct CompareControlModel;
 
 private:
-    ContainerListenerMultiplexer        maContainerListeners;
-    ::cppu::OInterfaceContainerHelper   maChangeListeners;
-    UnoControlModelHolderList           maModels;
+    ContainerListenerMultiplexer		maContainerListeners;
+    ::cppu::OInterfaceContainerHelper	maChangeListeners;
+    UnoControlModelHolderList			maModels;
 
-    AllGroups                           maGroups;
-    sal_Bool                            mbGroupsUpToDate;
+    AllGroups							maGroups;
+    sal_Bool							mbGroupsUpToDate;
 
-protected:
-    ::com::sun::star::uno::Any          ImplGetDefaultValue( sal_uInt16 nPropId ) const;
-    ::cppu::IPropertyArrayHelper&       SAL_CALL getInfoHelper();
+protected:	
+    ::com::sun::star::uno::Any			ImplGetDefaultValue( sal_uInt16 nPropId ) const;
+    ::cppu::IPropertyArrayHelper&		SAL_CALL getInfoHelper();
 
-    UnoControlModelHolderList::iterator         ImplFindElement( const ::rtl::OUString& rName );
+    UnoControlModelHolderList::iterator			ImplFindElement( const ::rtl::OUString& rName );
 
 public:
                         UnoControlDialogModel();
                         UnoControlDialogModel( const UnoControlDialogModel& rModel );
                         ~UnoControlDialogModel();
+                        
+    UnoControlModel*	Clone() const;
 
-    UnoControlModel*    Clone() const;
-
-    ::com::sun::star::uno::Any  SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException) { return UnoControlModel::queryInterface(rType); }
-    ::com::sun::star::uno::Any  SAL_CALL queryAggregation( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException);
-    void                        SAL_CALL acquire() throw()  { OWeakAggObject::acquire(); }
-    void                        SAL_CALL release() throw()  { OWeakAggObject::release(); }
+    ::com::sun::star::uno::Any	SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException) { return UnoControlModel::queryInterface(rType); }
+    ::com::sun::star::uno::Any	SAL_CALL queryAggregation( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException);
+    void						SAL_CALL acquire() throw()	{ OWeakAggObject::acquire(); }
+    void						SAL_CALL release() throw()	{ OWeakAggObject::release(); }
 
     // ::com::sun::star::lang::XTypeProvider
-    ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type >  SAL_CALL getTypes() throw(::com::sun::star::uno::RuntimeException);
-    ::com::sun::star::uno::Sequence< sal_Int8 >                     SAL_CALL getImplementationId() throw(::com::sun::star::uno::RuntimeException);
+    ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type >	SAL_CALL getTypes() throw(::com::sun::star::uno::RuntimeException);
+    ::com::sun::star::uno::Sequence< sal_Int8 >						SAL_CALL getImplementationId() throw(::com::sun::star::uno::RuntimeException);
 
     // ::com::sun::star::container::XContainer
     void SAL_CALL addContainerListener( const ::com::sun::star::uno::Reference< ::com::sun::star::container::XContainerListener >& xListener ) throw(::com::sun::star::uno::RuntimeException);
@@ -118,14 +118,14 @@ public:
     // ::com::sun::star::container::XElementAcces
     ::com::sun::star::uno::Type SAL_CALL getElementType(  ) throw(::com::sun::star::uno::RuntimeException);
     sal_Bool SAL_CALL hasElements(  ) throw(::com::sun::star::uno::RuntimeException);
-
+    
     // ::com::sun::star::container::XIndexContainer, XIndexReplace, XIndexAcces
     // void SAL_CALL replaceByIndex( sal_Int32 Index, const ::com::sun::star::uno::Any& Element ) throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) = 0;
     // sal_Int32 SAL_CALL getCount(  ) throw(::com::sun::star::uno::RuntimeException) = 0;
     // ::com::sun::star::uno::Any SAL_CALL getByIndex( sal_Int32 Index ) throw(::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) = 0;
     // void SAL_CALL insertByIndex( sal_Int32 Index, const ::com::sun::star::uno::Any& Element ) throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) = 0;
     // void SAL_CALL removeByIndex( sal_Int32 Index ) throw(::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) = 0;
-
+    
     // ::com::sun::star::container::XNameContainer, XNameReplace, XNameAccess
     void SAL_CALL replaceByName( const ::rtl::OUString& aName, const ::com::sun::star::uno::Any& aElement ) throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
     ::com::sun::star::uno::Any SAL_CALL getByName( const ::rtl::OUString& aName ) throw(::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
@@ -136,12 +136,12 @@ public:
 
     // ::com::sun::star::beans::XMultiPropertySet
     ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo(  ) throw(::com::sun::star::uno::RuntimeException);
-
+    
     // ::com::sun::star::lang::XMultiServiceFactory
     ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL createInstance( const ::rtl::OUString& aServiceSpecifier ) throw(::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException);
     ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL createInstanceWithArguments( const ::rtl::OUString& ServiceSpecifier, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& Arguments ) throw(::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException);
     ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getAvailableServiceNames(  ) throw(::com::sun::star::uno::RuntimeException);
-
+    
     // ::com::sun::star::io::XPersistObject
     ::rtl::OUString SAL_CALL getServiceName() throw(::com::sun::star::uno::RuntimeException);
 
@@ -181,16 +181,16 @@ protected:
     void implUpdateGroupStructure();
 };
 
-//  ----------------------------------------------------
-//  class UnoDialogControl
-//  ----------------------------------------------------
-typedef ::cppu::ImplHelper6 <   ::com::sun::star::container::XContainerListener
-                            ,   ::com::sun::star::awt::XTopWindow
-                            ,   ::com::sun::star::awt::XDialog2
-                            ,   ::com::sun::star::util::XChangesListener
+//	----------------------------------------------------
+//	class UnoDialogControl
+//	----------------------------------------------------
+typedef ::cppu::ImplHelper6	<	::com::sun::star::container::XContainerListener
+                            ,	::com::sun::star::awt::XTopWindow
+                            ,	::com::sun::star::awt::XDialog2
+                            ,	::com::sun::star::util::XChangesListener
                             ,   ::com::sun::star::util::XModifyListener
                             ,   ::com::sun::star::awt::XWindowListener
-                            >   UnoDialogControl_IBase;
+                            >	UnoDialogControl_IBase;
 
 class ResourceListener  :public ::com::sun::star::util::XModifyListener,
                          public ::cppu::OWeakObject,
@@ -207,48 +207,48 @@ class ResourceListener  :public ::com::sun::star::util::XModifyListener,
         virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& aType ) throw (::com::sun::star::uno::RuntimeException);
         virtual void SAL_CALL acquire() throw ();
         virtual void SAL_CALL release() throw ();
-
+        
         // XModifyListener
         virtual void SAL_CALL modified( const ::com::sun::star::lang::EventObject& aEvent ) throw (::com::sun::star::uno::RuntimeException);
 
         // XEventListener
         virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw (::com::sun::star::uno::RuntimeException);
-
+        
     private:
         ::com::sun::star::uno::Reference< ::com::sun::star::resource::XStringResourceResolver > m_xResource;
         ::com::sun::star::uno::Reference< ::com::sun::star::util::XModifyListener >             m_xListener;
         bool                                                                                    m_bListening;
 };
 
-class UnoDialogControl  :public UnoControlContainer
+class UnoDialogControl	:public UnoControlContainer
                         ,public UnoDialogControl_IBase
 {
 private:
-    ::com::sun::star::uno::Reference< ::com::sun::star::awt::XMenuBar >         mxMenuBar;
-    ::com::sun::star::uno::Reference< ::com::sun::star::awt::XTabController >   mxTabController;
-    ::com::sun::star::uno::Reference< ::com::sun::star::util::XModifyListener > mxListener;
-    TopWindowListenerMultiplexer                                                maTopWindowListeners;
+    ::com::sun::star::uno::Reference< ::com::sun::star::awt::XMenuBar >			mxMenuBar;
+    ::com::sun::star::uno::Reference< ::com::sun::star::awt::XTabController >	mxTabController;
+    ::com::sun::star::uno::Reference< ::com::sun::star::util::XModifyListener > mxListener;                
+    TopWindowListenerMultiplexer	                                            maTopWindowListeners;
     bool                                                                        mbWindowListener;
     bool                                                                        mbSizeModified;
     bool                                                                        mbPosModified;
 
 protected:
-
-    void        ImplInsertControl( ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel >& rxModel, const ::rtl::OUString& rName );
-    void        ImplRemoveControl( ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel >& rxModel );
-    void        ImplSetPosSize( ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControl >& rxCtrl );
+    
+    void		ImplInsertControl( ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel >& rxModel, const ::rtl::OUString& rName );
+    void		ImplRemoveControl( ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel >& rxModel );
+    void		ImplSetPosSize( ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControl >& rxCtrl );
     void        ImplUpdateResourceResolver();
     void        ImplStartListingForResourceEvents();
 
 public:
 
                                 UnoDialogControl();
-    ::rtl::OUString             GetComponentServiceName();
+    ::rtl::OUString				GetComponentServiceName();
 
-    ::com::sun::star::uno::Any  SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException) { return UnoControlContainer::queryInterface(rType); }
-    ::com::sun::star::uno::Any  SAL_CALL queryAggregation( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException);
-    void                        SAL_CALL acquire() throw()  { OWeakAggObject::acquire(); }
-    void                        SAL_CALL release() throw()  { OWeakAggObject::release(); }
+    ::com::sun::star::uno::Any	SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException) { return UnoControlContainer::queryInterface(rType); }
+    ::com::sun::star::uno::Any	SAL_CALL queryAggregation( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException);
+    void						SAL_CALL acquire() throw()	{ OWeakAggObject::acquire(); }
+    void						SAL_CALL release() throw()	{ OWeakAggObject::release(); }
 
     void SAL_CALL createPeer( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XToolkit >& Toolkit, const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer >& Parent ) throw(::com::sun::star::uno::RuntimeException);
     void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw(::com::sun::star::uno::RuntimeException);
@@ -266,12 +266,12 @@ public:
     virtual void SAL_CALL windowMoved( const ::com::sun::star::awt::WindowEvent& e ) throw (::com::sun::star::uno::RuntimeException);
     virtual void SAL_CALL windowShown( const ::com::sun::star::lang::EventObject& e ) throw (::com::sun::star::uno::RuntimeException);
     virtual void SAL_CALL windowHidden( const ::com::sun::star::lang::EventObject& e ) throw (::com::sun::star::uno::RuntimeException);
-
+    
     // ::com::sun::star::container::XContainerListener
     void SAL_CALL elementInserted( const ::com::sun::star::container::ContainerEvent& Event ) throw(::com::sun::star::uno::RuntimeException);
     void SAL_CALL elementRemoved( const ::com::sun::star::container::ContainerEvent& Event ) throw(::com::sun::star::uno::RuntimeException);
     void SAL_CALL elementReplaced( const ::com::sun::star::container::ContainerEvent& Event ) throw(::com::sun::star::uno::RuntimeException);
-
+    
     // ::com::sun::star::awt::XDialog2
     virtual void SAL_CALL endDialog( ::sal_Int32 Result ) throw (::com::sun::star::uno::RuntimeException);
     virtual void SAL_CALL setHelpId( ::sal_Int32 Id ) throw (::com::sun::star::uno::RuntimeException);
@@ -283,8 +283,8 @@ public:
     void SAL_CALL endExecute() throw(::com::sun::star::uno::RuntimeException);
 
     // ::com::sun::star::lang::XTypeProvider
-    ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type >  SAL_CALL getTypes() throw(::com::sun::star::uno::RuntimeException);
-    ::com::sun::star::uno::Sequence< sal_Int8 >                     SAL_CALL getImplementationId() throw(::com::sun::star::uno::RuntimeException);
+    ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type >	SAL_CALL getTypes() throw(::com::sun::star::uno::RuntimeException);
+    ::com::sun::star::uno::Sequence< sal_Int8 >						SAL_CALL getImplementationId() throw(::com::sun::star::uno::RuntimeException);
 
     // ::com::sun::star::awt::XControl
     sal_Bool SAL_CALL setModel( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel >& Model ) throw(::com::sun::star::uno::RuntimeException);
@@ -295,7 +295,7 @@ public:
 
     // XModifyListener
     virtual void SAL_CALL modified( const ::com::sun::star::lang::EventObject& aEvent ) throw (::com::sun::star::uno::RuntimeException);
-
+    
     // ::com::sun::star::lang::XServiceInfo
     DECLIMPL_SERVICEINFO( UnoDialogControl, szServiceName2_UnoControlDialog )
 
diff --git a/toolkit/inc/toolkit/controls/eventcontainer.hxx b/toolkit/inc/toolkit/controls/eventcontainer.hxx
index d0b7adbbe497..a01fa978724e 100644
--- a/toolkit/inc/toolkit/controls/eventcontainer.hxx
+++ b/toolkit/inc/toolkit/controls/eventcontainer.hxx
@@ -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
@@ -91,43 +91,43 @@ public:
     }
 
     // Methods XElementAccess
-    virtual ::com::sun::star::uno::Type SAL_CALL getElementType(  )
+    virtual ::com::sun::star::uno::Type SAL_CALL getElementType(  ) 
         throw(::com::sun::star::uno::RuntimeException);
-    virtual sal_Bool SAL_CALL hasElements(  )
+    virtual sal_Bool SAL_CALL hasElements(  ) 
         throw(::com::sun::star::uno::RuntimeException);
 
     // Methods XNameAccess
-    virtual ::com::sun::star::uno::Any SAL_CALL getByName( const ::rtl::OUString& aName )
-        throw(::com::sun::star::container::NoSuchElementException,
-              ::com::sun::star::lang::WrappedTargetException,
+    virtual ::com::sun::star::uno::Any SAL_CALL getByName( const ::rtl::OUString& aName ) 
+        throw(::com::sun::star::container::NoSuchElementException, 
+              ::com::sun::star::lang::WrappedTargetException, 
               ::com::sun::star::uno::RuntimeException);
-    virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getElementNames(  )
+    virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getElementNames(  ) 
         throw(::com::sun::star::uno::RuntimeException);
-    virtual sal_Bool SAL_CALL hasByName( const ::rtl::OUString& aName )
+    virtual sal_Bool SAL_CALL hasByName( const ::rtl::OUString& aName ) 
         throw(::com::sun::star::uno::RuntimeException);
 
     // Methods XNameReplace
-    virtual void SAL_CALL replaceByName( const ::rtl::OUString& aName, const ::com::sun::star::uno::Any& aElement )
-        throw(::com::sun::star::lang::IllegalArgumentException,
-              ::com::sun::star::container::NoSuchElementException,
-              ::com::sun::star::lang::WrappedTargetException,
+    virtual void SAL_CALL replaceByName( const ::rtl::OUString& aName, const ::com::sun::star::uno::Any& aElement ) 
+        throw(::com::sun::star::lang::IllegalArgumentException, 
+              ::com::sun::star::container::NoSuchElementException, 
+              ::com::sun::star::lang::WrappedTargetException, 
               ::com::sun::star::uno::RuntimeException);
 
     // Methods XNameContainer
     virtual void SAL_CALL insertByName( const ::rtl::OUString& aName, const ::com::sun::star::uno::Any& aElement )
-        throw(::com::sun::star::lang::IllegalArgumentException,
-              ::com::sun::star::container::ElementExistException,
-              ::com::sun::star::lang::WrappedTargetException,
+        throw(::com::sun::star::lang::IllegalArgumentException, 
+              ::com::sun::star::container::ElementExistException, 
+              ::com::sun::star::lang::WrappedTargetException, 
               ::com::sun::star::uno::RuntimeException);
-    virtual void SAL_CALL removeByName( const ::rtl::OUString& Name )
-        throw(::com::sun::star::container::NoSuchElementException,
-              ::com::sun::star::lang::WrappedTargetException,
+    virtual void SAL_CALL removeByName( const ::rtl::OUString& Name ) 
+        throw(::com::sun::star::container::NoSuchElementException, 
+              ::com::sun::star::lang::WrappedTargetException, 
               ::com::sun::star::uno::RuntimeException);
 
     // Methods XContainer
-    void SAL_CALL addContainerListener( const ::com::sun::star::uno::Reference< ::com::sun::star::container::XContainerListener >& xListener )
+    void SAL_CALL addContainerListener( const ::com::sun::star::uno::Reference< ::com::sun::star::container::XContainerListener >& xListener ) 
         throw(::com::sun::star::uno::RuntimeException);
-    void SAL_CALL removeContainerListener( const ::com::sun::star::uno::Reference< ::com::sun::star::container::XContainerListener >& xListener )
+    void SAL_CALL removeContainerListener( const ::com::sun::star::uno::Reference< ::com::sun::star::container::XContainerListener >& xListener ) 
         throw(::com::sun::star::uno::RuntimeException);
 };
 
@@ -138,5 +138,5 @@ public:
 };
 
 
-}   // namespace toolkit_namecontainer
+}	// namespace toolkit_namecontainer
 
diff --git a/toolkit/inc/toolkit/controls/formattedcontrol.hxx b/toolkit/inc/toolkit/controls/formattedcontrol.hxx
index f589dabd47aa..a7ea264e7f4c 100644
--- a/toolkit/inc/toolkit/controls/formattedcontrol.hxx
+++ b/toolkit/inc/toolkit/controls/formattedcontrol.hxx
@@ -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
@@ -44,8 +44,8 @@ namespace toolkit
     // ===================================================================
     class UnoControlFormattedFieldModel : public UnoControlModel
     {
-    protected:
-        ::com::sun::star::uno::Any      ImplGetDefaultValue( sal_uInt16 nPropId ) const;
+    protected:	
+        ::com::sun::star::uno::Any 		ImplGetDefaultValue( sal_uInt16 nPropId ) const;
         ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper();
         ::com::sun::star::uno::Any      m_aCachedFormat;
         bool                            m_bRevokedAsClient;
@@ -69,9 +69,9 @@ namespace toolkit
     public:
                             UnoControlFormattedFieldModel();
                             UnoControlFormattedFieldModel( const UnoControlFormattedFieldModel& rModel ) : UnoControlModel( rModel ) {;}
-
-        UnoControlModel*    Clone() const { return new UnoControlFormattedFieldModel( *this ); }
-
+                            
+        UnoControlModel*	Clone() const { return new UnoControlFormattedFieldModel( *this ); }
+                            
         // ::com::sun::star::io::XPersistObject
         ::rtl::OUString SAL_CALL getServiceName() throw(::com::sun::star::uno::RuntimeException);
 
@@ -93,11 +93,11 @@ namespace toolkit
 
         // UnoControlModel
         virtual void ImplNormalizePropertySequence(
-                        const sal_Int32                 _nCount,        /// the number of entries in the arrays
-                        sal_Int32*                      _pHandles,      /// the handles of the properties to set
-                        ::com::sun::star::uno::Any*     _pValues,       /// the values of the properties to set
-                        sal_Int32*                      _pValidHandles  /// pointer to the valid handles, allowed to be adjusted
-                    )   const SAL_THROW(());
+                        const sal_Int32					_nCount,		/// the number of entries in the arrays
+                        sal_Int32*						_pHandles,		/// the handles of the properties to set
+                        ::com::sun::star::uno::Any*		_pValues,		/// the values of the properties to set
+                        sal_Int32*						_pValidHandles	/// pointer to the valid handles, allowed to be adjusted
+                    )	const SAL_THROW(());
     private:
         void    impl_updateTextFromValue_nothrow();
         void    impl_updateCachedFormatter_nothrow();
@@ -111,17 +111,17 @@ namespace toolkit
     {
     public:
                             UnoFormattedFieldControl();
-        ::rtl::OUString     GetComponentServiceName();
+        ::rtl::OUString		GetComponentServiceName();
 
         // ::com::sun::star::awt::XTextListener
         void SAL_CALL textChanged( const ::com::sun::star::awt::TextEvent& rEvent ) throw(::com::sun::star::uno::RuntimeException);
-
+        
         // ::com::sun::star::lang::XServiceInfo
         DECLIMPL_SERVICEINFO_DERIVED( UnoFormattedFieldControl, UnoEditControl, szServiceName2_UnoControlFormattedField )
     };
 
 //........................................................................
-}   // namespace toolkit
+}	// namespace toolkit
 //........................................................................
 
 #endif // TOOLKIT_FORMATTED_CONTROL_HXX
diff --git a/toolkit/inc/toolkit/controls/geometrycontrolmodel.hxx b/toolkit/inc/toolkit/controls/geometrycontrolmodel.hxx
index 05b3016e690a..8003ede71e13 100644
--- a/toolkit/inc/toolkit/controls/geometrycontrolmodel.hxx
+++ b/toolkit/inc/toolkit/controls/geometrycontrolmodel.hxx
@@ -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
@@ -53,9 +53,9 @@ FORWARD_DECLARE_INTERFACE( script, XNameContainer )
     //====================================================================
     //= OGeometryControlModel_Base
     //====================================================================
-    typedef ::cppu::WeakAggComponentImplHelper2 <   ::com::sun::star::util::XCloneable
-                                                ,   ::com::sun::star::script::XScriptEventsSupplier
-                                                >   OGCM_Base;
+    typedef ::cppu::WeakAggComponentImplHelper2	<	::com::sun::star::util::XCloneable
+                                                ,	::com::sun::star::script::XScriptEventsSupplier
+                                                >	OGCM_Base;
     class OGeometryControlModel_Base
         :public ::comphelper::OMutexAndBroadcastHelper
         ,public ::comphelper::OPropertySetAggregationHelper
@@ -65,27 +65,27 @@ FORWARD_DECLARE_INTERFACE( script, XNameContainer )
     protected:
         ::com::sun::star::uno::Reference< ::com::sun::star::uno::XAggregation >
                     m_xAggregate;
-        ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >
+        ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer > 
                     mxEventContainer;
 
         // <properties>
-        sal_Int32       m_nPosX;
-        sal_Int32       m_nPosY;
-        sal_Int32       m_nWidth;
-        sal_Int32       m_nHeight;
-        ::rtl::OUString m_aName;
-        sal_Int16       m_nTabIndex;
-        sal_Int32       m_nStep;
+        sal_Int32		m_nPosX;
+        sal_Int32		m_nPosY;
+        sal_Int32		m_nWidth;
+        sal_Int32		m_nHeight;
+        ::rtl::OUString	m_aName;
+        sal_Int16		m_nTabIndex;
+        sal_Int32		m_nStep;
         ::rtl::OUString m_aTag;
         ::com::sun::star::uno::Reference< ::com::sun::star::resource::XStringResourceResolver > m_xStrResolver;
         // </properties>
 
-        sal_Bool        m_bCloneable;
+        sal_Bool		m_bCloneable;
 
     protected:
-        virtual ::com::sun::star::uno::Any          ImplGetDefaultValueByHandle(sal_Int32 nHandle) const;
-        virtual ::com::sun::star::uno::Any          ImplGetPropertyValueByHandle(sal_Int32 nHandle) const;
-        virtual void                                ImplSetPropertyValueByHandle(sal_Int32 nHandle, const :: com::sun::star::uno::Any& aValue);
+        virtual ::com::sun::star::uno::Any 			ImplGetDefaultValueByHandle(sal_Int32 nHandle) const;
+        virtual ::com::sun::star::uno::Any 			ImplGetPropertyValueByHandle(sal_Int32 nHandle) const;
+        virtual void					 			ImplSetPropertyValueByHandle(sal_Int32 nHandle, const :: com::sun::star::uno::Any& aValue);
 
     protected:
         /**
@@ -136,9 +136,9 @@ FORWARD_DECLARE_INTERFACE( script, XNameContainer )
             ::com::sun::star::uno::Any& _rValue, sal_Int32 _nHandle) const;
 
         // OPropertyStateHelper overridables
-        virtual ::com::sun::star::beans::PropertyState  getPropertyStateByHandle(sal_Int32 nHandle);
-        virtual void                                    setPropertyToDefaultByHandle(sal_Int32 nHandle);
-        virtual ::com::sun::star::uno::Any              getPropertyDefaultByHandle(sal_Int32 nHandle) const;
+        virtual ::com::sun::star::beans::PropertyState	getPropertyStateByHandle(sal_Int32 nHandle);
+        virtual void									setPropertyToDefaultByHandle(sal_Int32 nHandle);
+        virtual ::com::sun::star::uno::Any				getPropertyDefaultByHandle(sal_Int32 nHandle) const;
 
         // XPropertySet
         virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo> SAL_CALL getPropertySetInfo() throw(::com::sun::star::uno::RuntimeException);
@@ -150,7 +150,7 @@ FORWARD_DECLARE_INTERFACE( script, XNameContainer )
         virtual ::com::sun::star::uno::Reference< ::com::sun::star::util::XCloneable > SAL_CALL createClone(  ) throw(::com::sun::star::uno::RuntimeException);
 
         //XScriptEventsSupplier
-        virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >
+        virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer > 
             SAL_CALL getEvents(  ) throw(::com::sun::star::uno::RuntimeException);
 
         // XCloneable implementation - to be overwritten
@@ -176,7 +176,7 @@ FORWARD_DECLARE_INTERFACE( script, XNameContainer )
     //====================================================================
     //= OGeometryControlModel
     //====================================================================
-    /*  example for usage:
+    /*	example for usage:
             Reference< XAggregation > xIFace = new ::toolkit::OGeometryControlModel< UnoControlButtonModel > ();
     */
     template <class CONTROLMODEL>
@@ -219,8 +219,8 @@ FORWARD_DECLARE_INTERFACE( script, XNameContainer )
         ,public ::comphelper::OIdPropertyArrayUsageHelper< OCommonGeometryControlModel >
     {
     private:
-        ::rtl::OUString m_sServiceSpecifier;        // the service specifier of our aggregate
-        sal_Int32       m_nPropertyMapId;           // our unique property info id, used to look up in s_aAggregateProperties
+        ::rtl::OUString	m_sServiceSpecifier;		// the service specifier of our aggregate
+        sal_Int32		m_nPropertyMapId;			// our unique property info id, used to look up in s_aAggregateProperties
 
     public:
         /** instantiate the model
@@ -231,7 +231,7 @@ FORWARD_DECLARE_INTERFACE( script, XNameContainer )
         */
         OCommonGeometryControlModel(
                     ::com::sun::star::uno::Reference< ::com::sun::star::util::XCloneable >& _rxAgg,
-            const   ::rtl::OUString& _rxServiceSpecifier
+            const	::rtl::OUString& _rxServiceSpecifier
         );
 
         // OIdPropertyArrayUsageHelper overridables
@@ -256,7 +256,7 @@ FORWARD_DECLARE_INTERFACE( script, XNameContainer )
 #include "toolkit/controls/geometrycontrolmodel_impl.hxx"
 
 //........................................................................
-// }    // namespace toolkit
+// }	// namespace toolkit
 //........................................................................
 
 #endif // _TOOLKIT_HELPERS_GEOMETRYCONTROLMODEL_HXX_
diff --git a/toolkit/inc/toolkit/controls/geometrycontrolmodel_impl.hxx b/toolkit/inc/toolkit/controls/geometrycontrolmodel_impl.hxx
index d6491877c7ad..fc7d3327e5aa 100644
--- a/toolkit/inc/toolkit/controls/geometrycontrolmodel_impl.hxx
+++ b/toolkit/inc/toolkit/controls/geometrycontrolmodel_impl.hxx
@@ -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
diff --git a/toolkit/inc/toolkit/controls/roadmapcontrol.hxx b/toolkit/inc/toolkit/controls/roadmapcontrol.hxx
index 1b86d277fde2..13ba90e0e1b2 100644
--- a/toolkit/inc/toolkit/controls/roadmapcontrol.hxx
+++ b/toolkit/inc/toolkit/controls/roadmapcontrol.hxx
@@ -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
@@ -48,22 +48,22 @@
 
 #include <comphelper/uno3.hxx>
 
-typedef GraphicControlModel UnoControlRoadmapModel_Base;
+typedef GraphicControlModel	UnoControlRoadmapModel_Base;
 
 
-typedef ::cppu::ImplHelper3 <   ::com::sun::star::lang::XSingleServiceFactory
-                            ,   ::com::sun::star::container::XContainer
-                            ,   ::com::sun::star::container::XIndexContainer
-                            >   UnoControlRoadmapModel_IBase;
+typedef ::cppu::ImplHelper3	<	::com::sun::star::lang::XSingleServiceFactory
+                            ,	::com::sun::star::container::XContainer
+                            ,	::com::sun::star::container::XIndexContainer
+                            >	UnoControlRoadmapModel_IBase;
 
 
 
-typedef UnoControlBase  UnoControlRoadmap_Base;
-typedef ::cppu::ImplHelper4 <   ::com::sun::star::awt::XItemEventBroadcaster
+typedef UnoControlBase	UnoControlRoadmap_Base;
+typedef ::cppu::ImplHelper4	<   ::com::sun::star::awt::XItemEventBroadcaster
                             ,   ::com::sun::star::container::XContainerListener
-                            ,   ::com::sun::star::awt::XItemListener
+                            ,	::com::sun::star::awt::XItemListener
                             ,   ::com::sun::star::beans::XPropertyChangeListener
-                            >   UnoControlRoadmap_IBase;
+                            >	UnoControlRoadmap_IBase;
 
 
 
@@ -88,15 +88,15 @@ namespace toolkit{
     // ===================================================================
     class UnoControlRoadmapModel : public UnoControlRoadmapModel_Base,
                                    public UnoControlRoadmapModel_IBase
-
+                                   
     {
     private:
-//        PropertyChangeListenerMultiplexer                 maPropertyListeners;
+//        PropertyChangeListenerMultiplexer 	            maPropertyListeners;
 
-        typedef ::std::vector< Reference< XInterface > >    RoadmapItemHolderList;
+        typedef ::std::vector< Reference< XInterface > >	RoadmapItemHolderList;
 
-        ContainerListenerMultiplexer        maContainerListeners;
-        RoadmapItemHolderList               maRoadmapItems;
+        ContainerListenerMultiplexer		maContainerListeners;
+        RoadmapItemHolderList			    maRoadmapItems;
 
         void                                MakeRMItemValidation( sal_Int32 Index, Reference< XInterface > xRoadmapItem );
         ContainerEvent                      GetContainerEvent(sal_Int32 Index, Reference< XInterface > );
@@ -106,7 +106,7 @@ namespace toolkit{
 
 
     protected:
-        ::com::sun::star::uno::Any      ImplGetDefaultValue( sal_uInt16 nPropId ) const;
+        ::com::sun::star::uno::Any 		ImplGetDefaultValue( sal_uInt16 nPropId ) const;
         ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper();
 
     public:
@@ -115,7 +115,7 @@ namespace toolkit{
             UnoControlRoadmapModel_Base( rModel ),
             UnoControlRoadmapModel_IBase( rModel ),
             maContainerListeners( *this ) {}
-        UnoControlModel*    Clone() const { return new UnoControlRoadmapModel( *this ); }
+        UnoControlModel*	Clone() const { return new UnoControlRoadmapModel( *this ); }
 
 
     // XTypeProvider
@@ -129,19 +129,19 @@ namespace toolkit{
     DECLIMPL_SERVICEINFO_DERIVED( UnoControlRoadmapModel, UnoControlRoadmapModel_Base, szServiceName2_UnoControlRoadmapModel )
 
     sal_Int32 SAL_CALL getCount() throw (RuntimeException);
-    virtual Any SAL_CALL getByIndex( sal_Int32 Index ) throw (IndexOutOfBoundsException, WrappedTargetException, RuntimeException );
+    virtual Any SAL_CALL getByIndex( sal_Int32 Index ) throw (IndexOutOfBoundsException, WrappedTargetException, RuntimeException ); 
 
-    virtual void SAL_CALL insertByIndex( sal_Int32 Index, const Any & _Element) throw    (IllegalArgumentException, IndexOutOfBoundsException, WrappedTargetException, RuntimeException );
-    virtual void SAL_CALL removeByIndex( sal_Int32 Index ) throw (IndexOutOfBoundsException, WrappedTargetException, RuntimeException );
-    virtual void SAL_CALL replaceByIndex( sal_Int32 Index, const Any & _Element) throw (IllegalArgumentException, IndexOutOfBoundsException, WrappedTargetException, RuntimeException );
+    virtual void SAL_CALL insertByIndex( sal_Int32 Index, const Any & _Element) throw	 (IllegalArgumentException, IndexOutOfBoundsException, WrappedTargetException, RuntimeException ); 	
+    virtual void SAL_CALL removeByIndex( sal_Int32 Index ) throw (IndexOutOfBoundsException, WrappedTargetException, RuntimeException ); 
+    virtual void SAL_CALL replaceByIndex( sal_Int32 Index, const Any & _Element) throw (IllegalArgumentException, IndexOutOfBoundsException, WrappedTargetException, RuntimeException ); 
 
     virtual void SAL_CALL addContainerListener( const Reference< XContainerListener >& xListener ) throw (RuntimeException);
     virtual void SAL_CALL removeContainerListener( const Reference< XContainerListener >& xListener ) throw (RuntimeException);
 
-    ::com::sun::star::uno::Any  SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException) { return UnoControlRoadmapModel_Base::queryInterface(rType); }
-    ::com::sun::star::uno::Any  SAL_CALL queryAggregation( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException);
-    void                        SAL_CALL acquire() throw()  { UnoControlRoadmapModel_Base::acquire(); }
-    void                        SAL_CALL release() throw()  { UnoControlRoadmapModel_Base::release(); }
+    ::com::sun::star::uno::Any	SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException) { return UnoControlRoadmapModel_Base::queryInterface(rType); }
+    ::com::sun::star::uno::Any	SAL_CALL queryAggregation( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException);
+    void						SAL_CALL acquire() throw()	{ UnoControlRoadmapModel_Base::acquire(); }
+    void						SAL_CALL release() throw()	{ UnoControlRoadmapModel_Base::release(); }
 
 
     // ::com::sun::star::beans::XPropertySet
@@ -153,7 +153,7 @@ namespace toolkit{
 
     virtual Type SAL_CALL getElementType() throw (RuntimeException);
 
-    virtual sal_Bool SAL_CALL hasElements() throw (RuntimeException);
+    virtual sal_Bool SAL_CALL hasElements() throw (RuntimeException); 
 
     };
 
@@ -162,31 +162,31 @@ namespace toolkit{
     // = UnoRoadmapControl
     // ===================================================================
     class UnoRoadmapControl : public UnoControlRoadmap_Base,
-                              public UnoControlRoadmap_IBase
+                              public UnoControlRoadmap_IBase    
     {
     private:
-        ItemListenerMultiplexer                 maItemListeners;
+        ItemListenerMultiplexer 	            maItemListeners;
     public:
                             UnoRoadmapControl();
-        ::rtl::OUString     GetComponentServiceName();
+        ::rtl::OUString		GetComponentServiceName();
 
     void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw(::com::sun::star::uno::RuntimeException) { UnoControlBase::disposing( Source ); }
 
-    void SAL_CALL   dispose(  ) throw(::com::sun::star::uno::RuntimeException);
+    void SAL_CALL   dispose(  ) throw(::com::sun::star::uno::RuntimeException);   
 
 
     sal_Bool SAL_CALL setModel(const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel >& Model) throw ( ::com::sun::star::uno::RuntimeException );
 
     void SAL_CALL elementInserted( const ::com::sun::star::container::ContainerEvent& rEvent )throw(::com::sun::star::uno::RuntimeException);
-    void SAL_CALL elementRemoved( const ::com::sun::star::container::ContainerEvent& rEvent )throw(::com::sun::star::uno::RuntimeException);
-    void SAL_CALL elementReplaced( const ::com::sun::star::container::ContainerEvent& rEvent )throw(::com::sun::star::uno::RuntimeException);
+    void SAL_CALL elementRemoved( const ::com::sun::star::container::ContainerEvent& rEvent )throw(::com::sun::star::uno::RuntimeException); 
+    void SAL_CALL elementReplaced( const ::com::sun::star::container::ContainerEvent& rEvent )throw(::com::sun::star::uno::RuntimeException); 
 
     virtual void SAL_CALL addItemListener( const Reference< XItemListener >& l ) throw (RuntimeException);
     virtual void SAL_CALL removeItemListener( const Reference< XItemListener >& l ) throw (RuntimeException);
 
 
     virtual void SAL_CALL itemStateChanged( const ItemEvent& rEvent ) throw (RuntimeException);
-
+    
     virtual void SAL_CALL propertyChange( const ::com::sun::star::beans::PropertyChangeEvent& evt ) throw (::com::sun::star::uno::RuntimeException);
 
     // XTypeProvider
diff --git a/toolkit/inc/toolkit/controls/roadmapentry.hxx b/toolkit/inc/toolkit/controls/roadmapentry.hxx
index 6f43f0510465..49febe115ba2 100644
--- a/toolkit/inc/toolkit/controls/roadmapentry.hxx
+++ b/toolkit/inc/toolkit/controls/roadmapentry.hxx
@@ -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
@@ -36,10 +36,10 @@
 #include <com/sun/star/lang/XServiceInfo.hpp>
 
 
-#define RM_PROPERTY_ID_LABEL        1
-#define RM_PROPERTY_ID_ID           2
-#define RM_PROPERTY_ID_ENABLED      4
-#define RM_PROPERTY_ID_INTERACTIVE  5
+#define RM_PROPERTY_ID_LABEL	    1
+#define RM_PROPERTY_ID_ID	        2
+#define RM_PROPERTY_ID_ENABLED	    4
+#define RM_PROPERTY_ID_INTERACTIVE	5
 
 typedef ::cppu::WeakImplHelper1 <   ::com::sun::star::lang::XServiceInfo
                                 >   ORoadmapEntry_Base;
@@ -80,9 +80,9 @@ protected:
 protected:
     // <properties>
     ::rtl::OUString     m_sLabel;
-    sal_Int32           m_nID;
-    sal_Bool            m_bEnabled;
-    sal_Bool            m_bInteractive;
+    sal_Int32		    m_nID;
+    sal_Bool		    m_bEnabled;
+    sal_Bool		    m_bInteractive;
 
     // </properties>
 };
diff --git a/toolkit/inc/toolkit/controls/stdtabcontroller.hxx b/toolkit/inc/toolkit/controls/stdtabcontroller.hxx
index 9dc5ae1a2d5a..3d74bde88bd1 100644
--- a/toolkit/inc/toolkit/controls/stdtabcontroller.hxx
+++ b/toolkit/inc/toolkit/controls/stdtabcontroller.hxx
@@ -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
@@ -40,38 +40,38 @@
 #include <toolkit/helper/servicenames.hxx>
 
 
-class StdTabController :    public ::com::sun::star::awt::XTabController,
+class StdTabController : 	public ::com::sun::star::awt::XTabController,
                             public ::com::sun::star::lang::XServiceInfo,
                             public ::com::sun::star::lang::XTypeProvider,
                             public ::cppu::OWeakAggObject
 {
 private:
-    ::osl::Mutex            maMutex;
-    ::com::sun::star::uno::Reference< ::com::sun::star::awt::XTabControllerModel >  mxModel;
-    ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlContainer >    mxControlContainer;
+    ::osl::Mutex			maMutex;
+    ::com::sun::star::uno::Reference< ::com::sun::star::awt::XTabControllerModel >	mxModel;
+    ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlContainer > 	mxControlContainer;
 
 protected:
-    ::osl::Mutex&               GetMutex() { return maMutex; }
-    sal_Bool                    ImplCreateComponentSequence( ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControl > >& rControls, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel > >& rModels, ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow > >& rComponents, ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any>* pTabStops, sal_Bool bPeerComponent ) const;
+    ::osl::Mutex&				GetMutex() { return maMutex; }
+    sal_Bool					ImplCreateComponentSequence( ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControl > >& rControls, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel > >& rModels, ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow > >& rComponents, ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any>* pTabStops, sal_Bool bPeerComponent ) const;
     // wenn rModels kuerzer als rControls ist, werden nur die rModels entsprechenden Elemente geliefert und die korrespondierenden Elemente aus rControls entfernt
-    void                        ImplActivateControl( sal_Bool bFirst ) const;
+    void						ImplActivateControl( sal_Bool bFirst ) const;
 
 public:
                             StdTabController();
                             ~StdTabController();
 
-    static ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControl >  FindControl( ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControl > >& rCtrls, const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel > & rxCtrlModel );
+    static ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControl >	FindControl( ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControl > >& rCtrls, const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel > & rxCtrlModel );
 
     // ::com::sun::star::uno::XInterface
-    ::com::sun::star::uno::Any  SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException) { return OWeakAggObject::queryInterface(rType); }
-    void                        SAL_CALL acquire() throw()  { OWeakAggObject::acquire(); }
-    void                        SAL_CALL release() throw()  { OWeakAggObject::release(); }
+    ::com::sun::star::uno::Any	SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException) { return OWeakAggObject::queryInterface(rType); }
+    void						SAL_CALL acquire() throw()	{ OWeakAggObject::acquire(); }
+    void						SAL_CALL release() throw()	{ OWeakAggObject::release(); }
 
-    ::com::sun::star::uno::Any  SAL_CALL queryAggregation( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException);
+    ::com::sun::star::uno::Any	SAL_CALL queryAggregation( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException);
 
     // ::com::sun::star::lang::XTypeProvider
-    ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type >  SAL_CALL getTypes() throw(::com::sun::star::uno::RuntimeException);
-    ::com::sun::star::uno::Sequence< sal_Int8 >                     SAL_CALL getImplementationId() throw(::com::sun::star::uno::RuntimeException);
+    ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type >	SAL_CALL getTypes() throw(::com::sun::star::uno::RuntimeException);
+    ::com::sun::star::uno::Sequence< sal_Int8 >						SAL_CALL getImplementationId() throw(::com::sun::star::uno::RuntimeException);
 
     // XTabController
     void SAL_CALL setModel( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XTabControllerModel >& Model ) throw(::com::sun::star::uno::RuntimeException);
diff --git a/toolkit/inc/toolkit/controls/stdtabcontrollermodel.hxx b/toolkit/inc/toolkit/controls/stdtabcontrollermodel.hxx
index d49fa720d5fd..27c2910ddd9f 100644
--- a/toolkit/inc/toolkit/controls/stdtabcontrollermodel.hxx
+++ b/toolkit/inc/toolkit/controls/stdtabcontrollermodel.hxx
@@ -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
@@ -50,72 +50,72 @@ DECLARE_LIST( UnoControlModelEntryListBase, UnoControlModelEntry* )
 class UnoControlModelEntryList : public UnoControlModelEntryListBase
 {
 private:
-    ::rtl::OUString maGroupName;
+    ::rtl::OUString	maGroupName;
 
 public:
                     UnoControlModelEntryList();
                     ~UnoControlModelEntryList();
 
-    const ::rtl::OUString&      GetName() const                         { return maGroupName; }
-    void                        SetName( const ::rtl::OUString& rName ) { maGroupName = rName; }
+    const ::rtl::OUString&		GetName() const 						{ return maGroupName; }
+    void						SetName( const ::rtl::OUString& rName )	{ maGroupName = rName; }
 
-    void    Reset();
-    void    DestroyEntry( sal_uInt32 nEntry );
+    void	Reset();
+    void	DestroyEntry( sal_uInt32 nEntry );
 };
 
 struct UnoControlModelEntry
 {
-    sal_Bool        bGroup;
+    sal_Bool 		bGroup;
     union
     {
         ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel >* pxControl;
-        UnoControlModelEntryList*   pGroup;
+        UnoControlModelEntryList*	pGroup;
     };
 };
 
 // Keine Referenz halten, nur temporaer fuer AutoTabOrder
 struct ComponentEntry
 {
-    ::com::sun::star::awt::XWindow*     pComponent;
-    Point                               aPos;
+    ::com::sun::star::awt::XWindow*		pComponent;
+    Point								aPos;
 };
 
 DECLARE_LIST( ComponentEntryList, ComponentEntry* )
 
-#define CONTROLPOS_NOTFOUND 0xFFFFFFFF
+#define CONTROLPOS_NOTFOUND	0xFFFFFFFF
 
-class StdTabControllerModel :   public ::com::sun::star::awt::XTabControllerModel,
+class StdTabControllerModel : 	public ::com::sun::star::awt::XTabControllerModel, 
                                 public ::com::sun::star::lang::XServiceInfo,
-                                public ::com::sun::star::io::XPersistObject,
+                                public ::com::sun::star::io::XPersistObject, 
                                 public ::com::sun::star::lang::XTypeProvider,
                                 public ::cppu::OWeakAggObject
 {
 private:
-    ::osl::Mutex                maMutex;
-    UnoControlModelEntryList    maControls;
-    sal_Bool                    mbGroupControl;
+    ::osl::Mutex				maMutex;
+    UnoControlModelEntryList	maControls;
+    sal_Bool					mbGroupControl;
 
 protected:
-    ::osl::Mutex&           GetMutex() { return maMutex; }
-    sal_uInt32              ImplGetControlCount( const UnoControlModelEntryList& rList ) const;
-    void                    ImplGetControlModels( ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel > ** pRefs, const UnoControlModelEntryList& rList ) const;
-    void                    ImplSetControlModels( UnoControlModelEntryList& rList, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel > >& Controls ) const;
-    sal_uInt32              ImplGetControlPos( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel >  xCtrl, const UnoControlModelEntryList& rList ) const;
+    ::osl::Mutex&			GetMutex() { return maMutex; }
+    sal_uInt32				ImplGetControlCount( const UnoControlModelEntryList& rList ) const;
+    void 					ImplGetControlModels( ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel > ** pRefs, const UnoControlModelEntryList& rList ) const;
+    void 					ImplSetControlModels( UnoControlModelEntryList& rList, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel > >& Controls ) const;
+    sal_uInt32				ImplGetControlPos( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel >  xCtrl, const UnoControlModelEntryList& rList ) const;
 
 public:
                             StdTabControllerModel();
                             ~StdTabControllerModel();
 
     // ::com::sun::star::uno::XInterface
-    ::com::sun::star::uno::Any  SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException) { return OWeakAggObject::queryInterface(rType); }
-    void                        SAL_CALL acquire() throw()  { OWeakAggObject::acquire(); }
-    void                        SAL_CALL release() throw()  { OWeakAggObject::release(); }
+    ::com::sun::star::uno::Any	SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException) { return OWeakAggObject::queryInterface(rType); }
+    void						SAL_CALL acquire() throw()	{ OWeakAggObject::acquire(); }
+    void						SAL_CALL release() throw()	{ OWeakAggObject::release(); }
 
-    ::com::sun::star::uno::Any  SAL_CALL queryAggregation( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException);
+    ::com::sun::star::uno::Any	SAL_CALL queryAggregation( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException);
 
     // ::com::sun::star::lang::XTypeProvider
-    ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type >  SAL_CALL getTypes() throw(::com::sun::star::uno::RuntimeException);
-    ::com::sun::star::uno::Sequence< sal_Int8 >                     SAL_CALL getImplementationId() throw(::com::sun::star::uno::RuntimeException);
+    ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type >	SAL_CALL getTypes() throw(::com::sun::star::uno::RuntimeException);
+    ::com::sun::star::uno::Sequence< sal_Int8 >						SAL_CALL getImplementationId() throw(::com::sun::star::uno::RuntimeException);
 
     // ::com::sun::star::awt::XTabControllerModel
     sal_Bool SAL_CALL getGroupControl(  ) throw(::com::sun::star::uno::RuntimeException);
diff --git a/toolkit/inc/toolkit/controls/tkscrollbar.hxx b/toolkit/inc/toolkit/controls/tkscrollbar.hxx
index 78795aa240c2..b2dd1c25a9f1 100644
--- a/toolkit/inc/toolkit/controls/tkscrollbar.hxx
+++ b/toolkit/inc/toolkit/controls/tkscrollbar.hxx
@@ -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
@@ -45,16 +45,16 @@ namespace toolkit
     //====================================================================
     class UnoControlScrollBarModel : public UnoControlModel
     {
-    protected:
-        ::com::sun::star::uno::Any      ImplGetDefaultValue( sal_uInt16 nPropId ) const;
-        ::cppu::IPropertyArrayHelper&   SAL_CALL getInfoHelper();
+    protected:	
+        ::com::sun::star::uno::Any		ImplGetDefaultValue( sal_uInt16 nPropId ) const;
+        ::cppu::IPropertyArrayHelper&	SAL_CALL getInfoHelper();
 
     public:
                             UnoControlScrollBarModel();
                             UnoControlScrollBarModel( const UnoControlScrollBarModel& rModel ) : UnoControlModel( rModel ) {;}
-
-        UnoControlModel*    Clone() const { return new UnoControlScrollBarModel( *this ); }
-
+                            
+        UnoControlModel*	Clone() const { return new UnoControlScrollBarModel( *this ); }
+                            
         // ::com::sun::star::beans::XMultiPropertySet
         ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo(  ) throw(::com::sun::star::uno::RuntimeException);
 
@@ -68,7 +68,7 @@ namespace toolkit
     //====================================================================
     //= UnoControlScrollBarModel
     //====================================================================
-    class UnoScrollBarControl : public UnoControlBase,
+    class UnoScrollBarControl :	public UnoControlBase,
                                 public ::com::sun::star::awt::XAdjustmentListener,
                                 public ::com::sun::star::awt::XScrollBar
     {
@@ -77,24 +77,24 @@ namespace toolkit
 
     public:
                                     UnoScrollBarControl();
-        ::rtl::OUString             GetComponentServiceName();
+        ::rtl::OUString				GetComponentServiceName();
 
-        ::com::sun::star::uno::Any  SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException) { return UnoControlBase::queryInterface(rType); }
-        ::com::sun::star::uno::Any  SAL_CALL queryAggregation( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException);
-        void                        SAL_CALL acquire() throw()  { OWeakAggObject::acquire(); }
-        void                        SAL_CALL release() throw()  { OWeakAggObject::release(); }
+        ::com::sun::star::uno::Any	SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException) { return UnoControlBase::queryInterface(rType); }
+        ::com::sun::star::uno::Any	SAL_CALL queryAggregation( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException);
+        void						SAL_CALL acquire() throw()	{ OWeakAggObject::acquire(); }
+        void						SAL_CALL release() throw()	{ OWeakAggObject::release(); }
         void SAL_CALL createPeer( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XToolkit >& Toolkit, const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer >& Parent ) throw(::com::sun::star::uno::RuntimeException);
         void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw(::com::sun::star::uno::RuntimeException) { UnoControlBase::disposing( Source ); }
         void SAL_CALL dispose(  ) throw(::com::sun::star::uno::RuntimeException);
 
         // ::com::sun::star::lang::XTypeProvider
-        ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type >  SAL_CALL getTypes() throw(::com::sun::star::uno::RuntimeException);
-        ::com::sun::star::uno::Sequence< sal_Int8 >                     SAL_CALL getImplementationId() throw(::com::sun::star::uno::RuntimeException);
+        ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type >	SAL_CALL getTypes() throw(::com::sun::star::uno::RuntimeException);
+        ::com::sun::star::uno::Sequence< sal_Int8 >						SAL_CALL getImplementationId() throw(::com::sun::star::uno::RuntimeException);
 
         // ::com::sun::star::awt::XAdjustmentListener
         void SAL_CALL adjustmentValueChanged( const ::com::sun::star::awt::AdjustmentEvent& rEvent ) throw(::com::sun::star::uno::RuntimeException);
 
-        // ::com::sun::star::awt::XScrollBar
+        // ::com::sun::star::awt::XScrollBar	
         void SAL_CALL addAdjustmentListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XAdjustmentListener >& l ) throw(::com::sun::star::uno::RuntimeException);
         void SAL_CALL removeAdjustmentListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XAdjustmentListener >& l ) throw(::com::sun::star::uno::RuntimeException);
         void SAL_CALL setValue( sal_Int32 n ) throw(::com::sun::star::uno::RuntimeException);
diff --git a/toolkit/inc/toolkit/controls/tksimpleanimation.hxx b/toolkit/inc/toolkit/controls/tksimpleanimation.hxx
index 697d1679af45..eae04dd7156f 100644
--- a/toolkit/inc/toolkit/controls/tksimpleanimation.hxx
+++ b/toolkit/inc/toolkit/controls/tksimpleanimation.hxx
@@ -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
@@ -46,16 +46,16 @@ namespace toolkit
     //====================================================================
     class UnoSimpleAnimationControlModel : public UnoControlModel
     {
-    protected:
-        ::com::sun::star::uno::Any      ImplGetDefaultValue( sal_uInt16 nPropId ) const;
-        ::cppu::IPropertyArrayHelper&   SAL_CALL getInfoHelper();
+    protected:	
+        ::com::sun::star::uno::Any		ImplGetDefaultValue( sal_uInt16 nPropId ) const;
+        ::cppu::IPropertyArrayHelper&	SAL_CALL getInfoHelper();
 
     public:
                             UnoSimpleAnimationControlModel();
                             UnoSimpleAnimationControlModel( const UnoSimpleAnimationControlModel& rModel ) : UnoControlModel( rModel ) {;}
-
-        UnoControlModel*    Clone() const { return new UnoSimpleAnimationControlModel( *this ); }
-
+                            
+        UnoControlModel*	Clone() const { return new UnoSimpleAnimationControlModel( *this ); }
+                            
         // XMultiPropertySet
         ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo(  ) throw(::com::sun::star::uno::RuntimeException);
 
@@ -81,10 +81,10 @@ namespace toolkit
 
     public:
                                     UnoSimpleAnimationControl();
-        ::rtl::OUString             GetComponentServiceName();
+        ::rtl::OUString				GetComponentServiceName();
 
         DECLARE_UNO3_AGG_DEFAULTS( UnoSimpleAnimationControl, UnoControlBase );
-        ::com::sun::star::uno::Any  SAL_CALL queryAggregation( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException);
+        ::com::sun::star::uno::Any	SAL_CALL queryAggregation( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException);
 
         void SAL_CALL createPeer( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XToolkit >& Toolkit, const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer >& Parent ) throw(::com::sun::star::uno::RuntimeException);
         void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw(::com::sun::star::uno::RuntimeException) { UnoControlBase::disposing( Source ); }
diff --git a/toolkit/inc/toolkit/controls/tkspinbutton.hxx b/toolkit/inc/toolkit/controls/tkspinbutton.hxx
index 48c602f76cfc..7abb02e48345 100644
--- a/toolkit/inc/toolkit/controls/tkspinbutton.hxx
+++ b/toolkit/inc/toolkit/controls/tkspinbutton.hxx
@@ -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
@@ -46,16 +46,16 @@ namespace toolkit
     //====================================================================
     class UnoSpinButtonModel : public UnoControlModel
     {
-    protected:
-        ::com::sun::star::uno::Any      ImplGetDefaultValue( sal_uInt16 nPropId ) const;
-        ::cppu::IPropertyArrayHelper&   SAL_CALL getInfoHelper();
+    protected:	
+        ::com::sun::star::uno::Any		ImplGetDefaultValue( sal_uInt16 nPropId ) const;
+        ::cppu::IPropertyArrayHelper&	SAL_CALL getInfoHelper();
 
     public:
                             UnoSpinButtonModel();
                             UnoSpinButtonModel( const UnoSpinButtonModel& rModel ) : UnoControlModel( rModel ) {;}
-
-        UnoControlModel*    Clone() const { return new UnoSpinButtonModel( *this ); }
-
+                            
+        UnoControlModel*	Clone() const { return new UnoSpinButtonModel( *this ); }
+                            
         // XMultiPropertySet
         ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo(  ) throw(::com::sun::star::uno::RuntimeException);
 
@@ -83,10 +83,10 @@ namespace toolkit
 
     public:
                                     UnoSpinButtonControl();
-        ::rtl::OUString             GetComponentServiceName();
+        ::rtl::OUString				GetComponentServiceName();
 
         DECLARE_UNO3_AGG_DEFAULTS( UnoSpinButtonControl, UnoControlBase );
-        ::com::sun::star::uno::Any  SAL_CALL queryAggregation( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException);
+        ::com::sun::star::uno::Any	SAL_CALL queryAggregation( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException);
 
         void SAL_CALL createPeer( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XToolkit >& Toolkit, const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer >& Parent ) throw(::com::sun::star::uno::RuntimeException);
         void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw(::com::sun::star::uno::RuntimeException) { UnoControlBase::disposing( Source ); }
diff --git a/toolkit/inc/toolkit/controls/tkthrobber.hxx b/toolkit/inc/toolkit/controls/tkthrobber.hxx
index d6c3a3d8a511..dea43df499f5 100644
--- a/toolkit/inc/toolkit/controls/tkthrobber.hxx
+++ b/toolkit/inc/toolkit/controls/tkthrobber.hxx
@@ -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
@@ -46,16 +46,16 @@ namespace toolkit
     //====================================================================
     class UnoThrobberControlModel : public UnoControlModel
     {
-    protected:
-        ::com::sun::star::uno::Any      ImplGetDefaultValue( sal_uInt16 nPropId ) const;
-        ::cppu::IPropertyArrayHelper&   SAL_CALL getInfoHelper();
+    protected:	
+        ::com::sun::star::uno::Any		ImplGetDefaultValue( sal_uInt16 nPropId ) const;
+        ::cppu::IPropertyArrayHelper&	SAL_CALL getInfoHelper();
 
     public:
                             UnoThrobberControlModel();
                             UnoThrobberControlModel( const UnoThrobberControlModel& rModel ) : UnoControlModel( rModel ) {;}
-
-        UnoControlModel*    Clone() const { return new UnoThrobberControlModel( *this ); }
-
+                            
+        UnoControlModel*	Clone() const { return new UnoThrobberControlModel( *this ); }
+                            
         // XMultiPropertySet
         ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo(  ) throw(::com::sun::star::uno::RuntimeException);
 
@@ -81,10 +81,10 @@ namespace toolkit
 
     public:
                                     UnoThrobberControl();
-        ::rtl::OUString             GetComponentServiceName();
+        ::rtl::OUString				GetComponentServiceName();
 
         DECLARE_UNO3_AGG_DEFAULTS( UnoThrobberControl, UnoControlBase );
-        ::com::sun::star::uno::Any  SAL_CALL queryAggregation( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException);
+        ::com::sun::star::uno::Any	SAL_CALL queryAggregation( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException);
 
         void SAL_CALL createPeer( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XToolkit >& Toolkit, const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer >& Parent ) throw(::com::sun::star::uno::RuntimeException);
         void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw(::com::sun::star::uno::RuntimeException) { UnoControlBase::disposing( Source ); }
diff --git a/toolkit/inc/toolkit/controls/unocontrol.hxx b/toolkit/inc/toolkit/controls/unocontrol.hxx
index 6bcfa519ed3d..679b5a3738b5 100644
--- a/toolkit/inc/toolkit/controls/unocontrol.hxx
+++ b/toolkit/inc/toolkit/controls/unocontrol.hxx
@@ -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
@@ -55,12 +55,12 @@
 
 struct UnoControlComponentInfos
 {
-    sal_Bool    bVisible;
-    sal_Bool    bEnable;
-    long        nX, nY, nWidth, nHeight;
-    sal_uInt16  nFlags;
-    float       nZoomX, nZoomY;
-
+    sal_Bool	bVisible;
+    sal_Bool	bEnable;
+    long		nX, nY, nWidth, nHeight;
+    sal_uInt16	nFlags;
+    float		nZoomX, nZoomY;
+    
     UnoControlComponentInfos()
     {
         bVisible = sal_True;
@@ -72,72 +72,72 @@ struct UnoControlComponentInfos
 };
 
 struct UnoControl_Data;
-//  ----------------------------------------------------
-//  class UnoControl
-//  ----------------------------------------------------
-typedef ::cppu::WeakAggImplHelper9  <   ::com::sun::star::awt::XControl
-                                    ,   ::com::sun::star::awt::XWindow2
-                                    ,   ::com::sun::star::awt::XView
-                                    ,   ::com::sun::star::beans::XPropertiesChangeListener
-                                    ,   ::com::sun::star::lang::XServiceInfo
-                                    ,   ::com::sun::star::accessibility::XAccessible
-                                    ,   ::com::sun::star::util::XModeChangeBroadcaster
-                                    ,   ::com::sun::star::awt::XUnitConversion
+//	----------------------------------------------------
+//	class UnoControl
+//	----------------------------------------------------
+typedef ::cppu::WeakAggImplHelper9	<	::com::sun::star::awt::XControl
+                                    ,	::com::sun::star::awt::XWindow2
+                                    ,	::com::sun::star::awt::XView
+                                    ,	::com::sun::star::beans::XPropertiesChangeListener
+                                    ,	::com::sun::star::lang::XServiceInfo
+                                    ,	::com::sun::star::accessibility::XAccessible
+                                    ,	::com::sun::star::util::XModeChangeBroadcaster
+                                    ,	::com::sun::star::awt::XUnitConversion
                                     ,   ::com::sun::star::awt::XStyleSettingsSupplier
-                                    >   UnoControl_Base;
+                                    >	UnoControl_Base;
 
-class TOOLKIT_DLLPUBLIC UnoControl :    public UnoControl_Base
+class TOOLKIT_DLLPUBLIC UnoControl : 	public UnoControl_Base
 {
 private:
-    ::osl::Mutex    maMutex;
-
-    ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer >      mxPeer;
-    ::com::sun::star::uno::Reference< ::com::sun::star::awt::XVclWindowPeer >   mxVclWindowPeer; // just to avoid the query_interface thing
+    ::osl::Mutex	maMutex;
+    
+    ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer > 		mxPeer;
+    ::com::sun::star::uno::Reference< ::com::sun::star::awt::XVclWindowPeer > 	mxVclWindowPeer; // just to avoid the query_interface thing
 
 protected:
-    EventListenerMultiplexer            maDisposeListeners;
-    WindowListenerMultiplexer           maWindowListeners;
-    FocusListenerMultiplexer            maFocusListeners;
-    KeyListenerMultiplexer              maKeyListeners;
-    MouseListenerMultiplexer            maMouseListeners;
-    MouseMotionListenerMultiplexer      maMouseMotionListeners;
-    PaintListenerMultiplexer            maPaintListeners;
-    ::cppu::OInterfaceContainerHelper   maModeChangeListeners;
-
-    ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >       mxContext;
-    ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel >    mxModel;
-    ::com::sun::star::uno::Reference< ::com::sun::star::awt::XGraphics >        mxGraphics;
+    EventListenerMultiplexer			maDisposeListeners;
+    WindowListenerMultiplexer			maWindowListeners;
+    FocusListenerMultiplexer			maFocusListeners;
+    KeyListenerMultiplexer				maKeyListeners;
+    MouseListenerMultiplexer			maMouseListeners;
+    MouseMotionListenerMultiplexer		maMouseMotionListeners;
+    PaintListenerMultiplexer			maPaintListeners;
+    ::cppu::OInterfaceContainerHelper	maModeChangeListeners;
+    
+    ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > 		mxContext;
+    ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel > 	mxModel;
+    ::com::sun::star::uno::Reference< ::com::sun::star::awt::XGraphics > 		mxGraphics;
 
     ::com::sun::star::uno::WeakReferenceHelper
-                                        maAccessibleContext;    /// our most recent XAccessibleContext instance
-
-    sal_Bool                            mbDisposePeer;
-    sal_Bool                            mbRefeshingPeer;
-    sal_Bool                            mbCreatingPeer;
-    sal_Bool                            mbCreatingCompatiblePeer;
-    sal_Bool                            mbDesignMode;
-
-    UnoControlComponentInfos            maComponentInfos;
+                                        maAccessibleContext;	/// our most recent XAccessibleContext instance
+    
+    sal_Bool							mbDisposePeer;
+    sal_Bool							mbRefeshingPeer;
+    sal_Bool							mbCreatingPeer;
+    sal_Bool							mbCreatingCompatiblePeer;
+    sal_Bool							mbDesignMode;
+
+    UnoControlComponentInfos			maComponentInfos;
     UnoControl_Data*                    mpData;
+    
+    ::osl::Mutex&																GetMutex() { return maMutex; }
 
-    ::osl::Mutex&                                                               GetMutex() { return maMutex; }
-
-    ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow >          getParentPeer() const;
+    ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow >			getParentPeer() const;
     virtual void                                                                updateFromModel();
     void                                                                        peerCreated();
     bool                                                                        ImplCheckLocalize( ::rtl::OUString& _rPossiblyLocalizable );
-    ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer >      ImplGetCompatiblePeer( sal_Bool bAcceptExistingPeer );
-    virtual void                                                                ImplSetPeerProperty( const ::rtl::OUString& rPropName, const ::com::sun::star::uno::Any& rVal );
-    virtual void                                                                PrepareWindowDescriptor( ::com::sun::star::awt::WindowDescriptor& rDesc );
+    ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer >  	ImplGetCompatiblePeer( sal_Bool bAcceptExistingPeer );
+    virtual void																ImplSetPeerProperty( const ::rtl::OUString& rPropName, const ::com::sun::star::uno::Any& rVal );
+    virtual void																PrepareWindowDescriptor( ::com::sun::star::awt::WindowDescriptor& rDesc );
     virtual void                                                                ImplModelPropertiesChanged( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyChangeEvent >& rEvents );
 
     void                                                                        ImplLockPropertyChangeNotification( const ::rtl::OUString& rPropertyName, bool bLock );
     void                                                                        ImplLockPropertyChangeNotifications( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& rPropertyNames, bool bLock );
 
-    void                                                                        disposeAccessibleContext();
+    void																		disposeAccessibleContext();
 
-    inline void setPeer( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer >& _xPeer)
-    {
+    inline void setPeer( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer >& _xPeer)	
+    { 
         mxPeer = _xPeer;
         mxVclWindowPeer = ::com::sun::star::uno::Reference< ::com::sun::star::awt::XVclWindowPeer >(mxPeer,::com::sun::star::uno::UNO_QUERY); // just to avoid the query_interface thing
     }
@@ -148,13 +148,13 @@ public:
                 UnoControl();
                 ~UnoControl();
 
-                UnoControlComponentInfos&           GetComponentInfos() { return maComponentInfos; }
+                UnoControlComponentInfos&			GetComponentInfos() { return maComponentInfos; }
 
-
-    virtual ::rtl::OUString GetComponentServiceName();
+    
+    virtual ::rtl::OUString	GetComponentServiceName();
 
     // ::com::sun::star::lang::XTypeProvider
-    ::com::sun::star::uno::Sequence< sal_Int8 >                     SAL_CALL getImplementationId() throw(::com::sun::star::uno::RuntimeException);
+    ::com::sun::star::uno::Sequence< sal_Int8 >						SAL_CALL getImplementationId() throw(::com::sun::star::uno::RuntimeException);
 
     // ::com::sun::star::lang::XComponent
     void SAL_CALL dispose(  ) throw(::com::sun::star::uno::RuntimeException);
@@ -209,7 +209,7 @@ public:
     void SAL_CALL setDesignMode( sal_Bool bOn ) throw(::com::sun::star::uno::RuntimeException);
     sal_Bool SAL_CALL isDesignMode(  ) throw(::com::sun::star::uno::RuntimeException);
     sal_Bool SAL_CALL isTransparent(  ) throw(::com::sun::star::uno::RuntimeException);
-
+    
     // ::com::sun::star::lang::XServiceInfo
     ::rtl::OUString SAL_CALL getImplementationName(  ) throw(::com::sun::star::uno::RuntimeException);
     sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException);
diff --git a/toolkit/inc/toolkit/controls/unocontrolbase.hxx b/toolkit/inc/toolkit/controls/unocontrolbase.hxx
index f12dd23a5c67..d6dde33b3e0c 100644
--- a/toolkit/inc/toolkit/controls/unocontrolbase.hxx
+++ b/toolkit/inc/toolkit/controls/unocontrolbase.hxx
@@ -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
@@ -32,35 +32,35 @@
 
 #include <toolkit/controls/unocontrol.hxx>
 
-//  ----------------------------------------------------
-//  class UnoControlBase
-//  ----------------------------------------------------
+//	----------------------------------------------------
+//	class UnoControlBase
+//	----------------------------------------------------
 
 class TOOLKIT_DLLPUBLIC UnoControlBase : public UnoControl
 {
 protected:
-    sal_Bool                    ImplHasProperty( sal_uInt16 nProp );
-    sal_Bool                    ImplHasProperty( const ::rtl::OUString& aPropertyName );
-    void                        ImplSetPropertyValue( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue, sal_Bool bUpdateThis );
-    void                        ImplSetPropertyValues( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyNames, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aValues, sal_Bool bUpdateThis );
-    ::com::sun::star::uno::Any  ImplGetPropertyValue( const ::rtl::OUString& aPropertyName );
+    sal_Bool					ImplHasProperty( sal_uInt16 nProp );
+    sal_Bool					ImplHasProperty( const ::rtl::OUString& aPropertyName );
+    void						ImplSetPropertyValue( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue, sal_Bool bUpdateThis );
+    void						ImplSetPropertyValues( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyNames, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aValues, sal_Bool bUpdateThis );
+    ::com::sun::star::uno::Any	ImplGetPropertyValue( const ::rtl::OUString& aPropertyName );
 
-    sal_Bool        ImplGetPropertyValue_BOOL( sal_uInt16 nProp );
-    sal_Int16       ImplGetPropertyValue_INT16( sal_uInt16 nProp );
-    sal_uInt16      ImplGetPropertyValue_UINT16( sal_uInt16 nProp );
-    sal_Int32       ImplGetPropertyValue_INT32( sal_uInt16 nProp );
-    sal_uInt32      ImplGetPropertyValue_UINT32( sal_uInt16 nProp );
-    double          ImplGetPropertyValue_DOUBLE( sal_uInt16 nProp );
-    ::rtl::OUString ImplGetPropertyValue_UString( sal_uInt16 nProp );
+    sal_Bool		ImplGetPropertyValue_BOOL( sal_uInt16 nProp );
+    sal_Int16 		ImplGetPropertyValue_INT16( sal_uInt16 nProp );
+    sal_uInt16 		ImplGetPropertyValue_UINT16( sal_uInt16 nProp );
+    sal_Int32 		ImplGetPropertyValue_INT32( sal_uInt16 nProp );
+    sal_uInt32 		ImplGetPropertyValue_UINT32( sal_uInt16 nProp );
+    double 			ImplGetPropertyValue_DOUBLE( sal_uInt16 nProp );
+    ::rtl::OUString	ImplGetPropertyValue_UString( sal_uInt16 nProp );
 
     // XLayoutConstrains (nur wenn das Control es unterstuetzt!)
-    ::com::sun::star::awt::Size Impl_getMinimumSize();
-    ::com::sun::star::awt::Size Impl_getPreferredSize();
-    ::com::sun::star::awt::Size Impl_calcAdjustedSize( const ::com::sun::star::awt::Size& rNewSize );
+    ::com::sun::star::awt::Size	Impl_getMinimumSize();
+    ::com::sun::star::awt::Size	Impl_getPreferredSize();
+    ::com::sun::star::awt::Size	Impl_calcAdjustedSize( const ::com::sun::star::awt::Size& rNewSize );
 
     // XTextLayoutConstrains (nur wenn das Control es unterstuetzt!)
-    ::com::sun::star::awt::Size Impl_getMinimumSize( sal_Int16 nCols, sal_Int16 nLines );
-    void                        Impl_getColumnsAndLines( sal_Int16& nCols, sal_Int16& nLines );
+    ::com::sun::star::awt::Size	Impl_getMinimumSize( sal_Int16 nCols, sal_Int16 nLines );
+    void						Impl_getColumnsAndLines( sal_Int16& nCols, sal_Int16& nLines );
 };
 
 
diff --git a/toolkit/inc/toolkit/controls/unocontrolcontainer.hxx b/toolkit/inc/toolkit/controls/unocontrolcontainer.hxx
index 1175d0e85abb..d85d3f0b5bf8 100644
--- a/toolkit/inc/toolkit/controls/unocontrolcontainer.hxx
+++ b/toolkit/inc/toolkit/controls/unocontrolcontainer.hxx
@@ -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
@@ -43,9 +43,9 @@
 
 class UnoControlHolderList;
 
-//  ----------------------------------------------------
-//  class UnoControlContainer
-//  ----------------------------------------------------
+//	----------------------------------------------------
+//	class UnoControlContainer
+//	----------------------------------------------------
 typedef ::cppu::AggImplInheritanceHelper4   <   UnoControlBase
                                             ,   ::com::sun::star::awt::XUnoControlContainer
                                             ,   ::com::sun::star::awt::XControlContainer
@@ -55,13 +55,13 @@ typedef ::cppu::AggImplInheritanceHelper4   <   UnoControlBase
 
 class UnoControlContainer : public UnoControlContainer_Base
 {
-private:
-    UnoControlHolderList*                   mpControls;
-    ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::awt::XTabController > >    maTabControllers;
-    ContainerListenerMultiplexer            maCListeners;
+private:	
+    UnoControlHolderList*					mpControls;
+    ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::awt::XTabController > >	maTabControllers;
+    ContainerListenerMultiplexer			maCListeners;
 
 protected:
-    void                                    ImplActivateTabControllers();
+    void									ImplActivateTabControllers();
 
 public:
                 UnoControlContainer();
@@ -100,16 +100,16 @@ public:
     ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControl > SAL_CALL getControl( const ::rtl::OUString& aName ) throw(::com::sun::star::uno::RuntimeException);
     void SAL_CALL addControl( const ::rtl::OUString& Name, const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControl >& Control ) throw(::com::sun::star::uno::RuntimeException);
     void SAL_CALL removeControl( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControl >& Control ) throw(::com::sun::star::uno::RuntimeException);
-
+    
     // ::com::sun::star::awt::XUnoControlContainer
     void SAL_CALL setTabControllers( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::awt::XTabController > >& TabControllers ) throw(::com::sun::star::uno::RuntimeException);
     ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::awt::XTabController > > SAL_CALL getTabControllers(  ) throw(::com::sun::star::uno::RuntimeException);
     void SAL_CALL addTabController( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XTabController >& TabController ) throw(::com::sun::star::uno::RuntimeException);
     void SAL_CALL removeTabController( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XTabController >& TabController ) throw(::com::sun::star::uno::RuntimeException);
-
+    
     // ::com::sun::star::awt::XControl
     void SAL_CALL createPeer( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XToolkit >& Toolkit, const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer >& Parent ) throw(::com::sun::star::uno::RuntimeException);
-
+    
     // ::com::sun::star::awt::XWindow
     void SAL_CALL setVisible( sal_Bool Visible ) throw(::com::sun::star::uno::RuntimeException);
 
diff --git a/toolkit/inc/toolkit/controls/unocontrolcontainermodel.hxx b/toolkit/inc/toolkit/controls/unocontrolcontainermodel.hxx
index ef0d9a4068ee..a5cfa049d86a 100644
--- a/toolkit/inc/toolkit/controls/unocontrolcontainermodel.hxx
+++ b/toolkit/inc/toolkit/controls/unocontrolcontainermodel.hxx
@@ -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
@@ -34,28 +34,28 @@
 #include <toolkit/helper/servicenames.hxx>
 
 
-//  ----------------------------------------------------
-//  class ::com::sun::star::awt::UnoControlContainerModel
-//  ----------------------------------------------------
+//	----------------------------------------------------
+//	class ::com::sun::star::awt::UnoControlContainerModel
+//	----------------------------------------------------
 class UnoControlContainerModel : public UnoControlModel
 {
-protected:
-    ::com::sun::star::uno::Any                                                      ImplGetDefaultValue( sal_uInt16 nPropId ) const;
-    ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo >   getPropertySetInfo() const;
-    ::cppu::IPropertyArrayHelper&                                                   SAL_CALL getInfoHelper();
+protected:	
+    ::com::sun::star::uno::Any														ImplGetDefaultValue( sal_uInt16 nPropId ) const;
+    ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > 	getPropertySetInfo() const;
+    ::cppu::IPropertyArrayHelper&													SAL_CALL getInfoHelper();
 
 public:
                         UnoControlContainerModel();
                         UnoControlContainerModel( const UnoControlContainerModel& rModel ) : UnoControlModel( rModel ) {;}
-
-    UnoControlModel*    Clone() const { return new UnoControlContainerModel( *this ); }
+                        
+    UnoControlModel*	Clone() const { return new UnoControlContainerModel( *this ); }
 
     // ::com::sun::star::beans::XMultiPropertySet
     ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo(  ) throw(::com::sun::star::uno::RuntimeException);
 
     // ::com::sun::star::io::XPersistObject
     ::rtl::OUString SAL_CALL getServiceName() throw(::com::sun::star::uno::RuntimeException);
-
+    
     // ::com::sun::star::lang::XServiceInfo
     DECLIMPL_SERVICEINFO_DERIVED( UnoControlContainerModel, UnoControlModel, szServiceName2_UnoControlContainerModel )
 };
diff --git a/toolkit/inc/toolkit/controls/unocontrolmodel.hxx b/toolkit/inc/toolkit/controls/unocontrolmodel.hxx
index 5ac3c33aa1c9..94971acbb211 100644
--- a/toolkit/inc/toolkit/controls/unocontrolmodel.hxx
+++ b/toolkit/inc/toolkit/controls/unocontrolmodel.hxx
@@ -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
@@ -47,15 +47,15 @@
 
 #include <list>
 
-class ImplPropertyTable;
+class ImplPropertyTable; 
 
-//  ----------------------------------------------------
-//  class UnoControlModel
-//  ----------------------------------------------------
+//	----------------------------------------------------
+//	class UnoControlModel
+//	----------------------------------------------------
 
-class TOOLKIT_DLLPUBLIC UnoControlModel :   public ::com::sun::star::awt::XControlModel,
-                        public ::com::sun::star::beans::XPropertyState,
-                        public ::com::sun::star::io::XPersistObject,
+class TOOLKIT_DLLPUBLIC UnoControlModel :	public ::com::sun::star::awt::XControlModel, 
+                        public ::com::sun::star::beans::XPropertyState, 
+                        public ::com::sun::star::io::XPersistObject, 
                         public ::com::sun::star::lang::XComponent,
                         public ::com::sun::star::lang::XServiceInfo,
                         public ::com::sun::star::lang::XTypeProvider,
@@ -66,16 +66,16 @@ class TOOLKIT_DLLPUBLIC UnoControlModel :   public ::com::sun::star::awt::XContr
                         public ::cppu::OWeakAggObject
 {
 private:
-    ImplPropertyTable*          mpData;
-    EventListenerMultiplexer    maDisposeListeners;
+    ImplPropertyTable*			mpData;
+    EventListenerMultiplexer	maDisposeListeners;
 
 protected:
-    void                                        ImplRegisterProperty( sal_uInt16 nPropType );
-    void                                        ImplRegisterProperties( const std::list< sal_uInt16 > &rIds );
-    void                                        ImplRegisterProperty( sal_uInt16 nPropId, const ::com::sun::star::uno::Any& rDefault );
-    ::com::sun::star::uno::Sequence<sal_Int32>  ImplGetPropertyIds() const;
-    virtual ::com::sun::star::uno::Any          ImplGetDefaultValue( sal_uInt16 nPropId ) const;
-    sal_Bool                                    ImplHasProperty( sal_uInt16 nPropId ) const;
+    void										ImplRegisterProperty( sal_uInt16 nPropType );
+    void										ImplRegisterProperties( const std::list< sal_uInt16 > &rIds );
+    void										ImplRegisterProperty( sal_uInt16 nPropId, const ::com::sun::star::uno::Any& rDefault );
+    ::com::sun::star::uno::Sequence<sal_Int32>	ImplGetPropertyIds() const;
+    virtual ::com::sun::star::uno::Any 			ImplGetDefaultValue( sal_uInt16 nPropId ) const;
+    sal_Bool 									ImplHasProperty( sal_uInt16 nPropId ) const;
 
     /** called before setting multiple properties, allows to care for property dependencies
 
@@ -84,11 +84,11 @@ protected:
         the properties are internally really set.</p>
     */
     virtual void ImplNormalizePropertySequence(
-                    const sal_Int32                 _nCount,        /// the number of entries in the arrays
-                    sal_Int32*                      _pHandles,      /// the handles of the properties to set
-                    ::com::sun::star::uno::Any*     _pValues,       /// the values of the properties to set
-                    sal_Int32*                      _pValidHandles  /// pointer to the valid handles, allowed to be adjusted
-                )   const SAL_THROW(());
+                    const sal_Int32					_nCount,		/// the number of entries in the arrays
+                    sal_Int32*						_pHandles,		/// the handles of the properties to set
+                    ::com::sun::star::uno::Any*		_pValues,		/// the values of the properties to set
+                    sal_Int32*						_pValidHandles	/// pointer to the valid handles, allowed to be adjusted
+                )	const SAL_THROW(());
 
     /// ensures that two property values in a sequence have a certain order
     void    ImplEnsureHandleOrder(
@@ -99,31 +99,31 @@ protected:
                 sal_Int32 _nSecondHandle                /// second handle, which should supersede _nFirstHandle in the sequence
             ) const;
 
-public:
+public:	
                 UnoControlModel();
                 UnoControlModel( const UnoControlModel& rModel );
                 ~UnoControlModel();
-
-    virtual UnoControlModel*    Clone() const = 0;
-
+                
+    virtual UnoControlModel*	Clone() const = 0;
+    
     // ::com::sun::star::uno::XAggregation
-    ::com::sun::star::uno::Any  SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException) { return OWeakAggObject::queryInterface(rType); }
-    void                        SAL_CALL acquire() throw()  { OWeakAggObject::acquire(); }
-    void                        SAL_CALL release() throw()  { OWeakAggObject::release(); }
+    ::com::sun::star::uno::Any	SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException) { return OWeakAggObject::queryInterface(rType); }
+    void						SAL_CALL acquire() throw()	{ OWeakAggObject::acquire(); }
+    void						SAL_CALL release() throw()	{ OWeakAggObject::release(); }
 
-    ::com::sun::star::uno::Any  SAL_CALL queryAggregation( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException);
+    ::com::sun::star::uno::Any	SAL_CALL queryAggregation( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException);
 
     // ::com::sun::star::lang::XUnoTunnel
-    static const ::com::sun::star::uno::Sequence< sal_Int8 >&   GetUnoTunnelId() throw();
-    static UnoControlModel*                                     GetImplementation( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& rxIFace ) throw();
-    sal_Int64                                                   SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& rIdentifier ) throw(::com::sun::star::uno::RuntimeException);
+    static const ::com::sun::star::uno::Sequence< sal_Int8 >&	GetUnoTunnelId() throw();
+    static UnoControlModel*										GetImplementation( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& rxIFace ) throw();
+    sal_Int64													SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& rIdentifier ) throw(::com::sun::star::uno::RuntimeException);
 
     // ::com::sun::star::util::XCloneable
     ::com::sun::star::uno::Reference< ::com::sun::star::util::XCloneable > SAL_CALL createClone() throw(::com::sun::star::uno::RuntimeException);
 
     // ::com::sun::star::lang::XTypeProvider
-    ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type >  SAL_CALL getTypes() throw(::com::sun::star::uno::RuntimeException);
-    ::com::sun::star::uno::Sequence< sal_Int8 >                     SAL_CALL getImplementationId() throw(::com::sun::star::uno::RuntimeException);
+    ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type >	SAL_CALL getTypes() throw(::com::sun::star::uno::RuntimeException);
+    ::com::sun::star::uno::Sequence< sal_Int8 >						SAL_CALL getImplementationId() throw(::com::sun::star::uno::RuntimeException);
 
     // ::com::sun::star::awt::XControlModel
 
diff --git a/toolkit/inc/toolkit/controls/unocontrols.hxx b/toolkit/inc/toolkit/controls/unocontrols.hxx
index 6223e47a6871..835838902308 100644
--- a/toolkit/inc/toolkit/controls/unocontrols.hxx
+++ b/toolkit/inc/toolkit/controls/unocontrols.hxx
@@ -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
@@ -70,22 +70,22 @@
 
 #define UNO_NAME_GRAPHOBJ_URLPREFIX                             "vnd.sun.star.GraphicObject:"
 #define UNO_NAME_GRAPHOBJ_URLPKGPREFIX                  "vnd.sun.star.Package:"
+ 
 
-
-//  ----------------------------------------------------
-//  class UnoControlEditModel
-//  ----------------------------------------------------
-class UnoControlEditModel : public UnoControlModel
+//	----------------------------------------------------
+//	class UnoControlEditModel
+//	----------------------------------------------------
+class UnoControlEditModel :	public UnoControlModel
 {
 protected:
-    ::com::sun::star::uno::Any      ImplGetDefaultValue( sal_uInt16 nPropId ) const;
-    ::cppu::IPropertyArrayHelper&   SAL_CALL getInfoHelper();
+    ::com::sun::star::uno::Any		ImplGetDefaultValue( sal_uInt16 nPropId ) const;
+    ::cppu::IPropertyArrayHelper&	SAL_CALL getInfoHelper();
 
 public:
                         UnoControlEditModel();
                         UnoControlEditModel( const UnoControlEditModel& rModel ) : UnoControlModel( rModel ) {;}
 
-    UnoControlModel*    Clone() const { return new UnoControlEditModel( *this ); }
+    UnoControlModel*	Clone() const { return new UnoControlEditModel( *this ); }
 
     // ::com::sun::star::io::XPersistObject
     ::rtl::OUString SAL_CALL getServiceName() throw(::com::sun::star::uno::RuntimeException);
@@ -98,9 +98,9 @@ public:
     DECLIMPL_SERVICEINFO_DERIVED( UnoControlEditModel, UnoControlModel, szServiceName2_UnoControlEditModel )
 };
 
-//  ----------------------------------------------------
-//  class UnoEditControl
-//  ----------------------------------------------------
+//	----------------------------------------------------
+//	class UnoEditControl
+//	----------------------------------------------------
 typedef ::cppu::ImplHelper4  <   ::com::sun::star::awt::XTextComponent
                              ,   ::com::sun::star::awt::XTextListener
                              ,   ::com::sun::star::awt::XLayoutConstrains
@@ -110,7 +110,7 @@ class TOOLKIT_DLLPUBLIC UnoEditControl    :public UnoControlBase
                                             ,public UnoEditControl_Base
 {
 private:
-    TextListenerMultiplexer maTextListeners;
+    TextListenerMultiplexer	maTextListeners;
 
     // Not all fields derived from UnoEditCOntrol have the property "Text"
     // They only support XTextComponent, so keep the text
@@ -125,10 +125,10 @@ private:
 public:
 
                                 UnoEditControl();
-    ::rtl::OUString             GetComponentServiceName();
-    TextListenerMultiplexer&    GetTextListeners()  { return maTextListeners; }
+    ::rtl::OUString				GetComponentServiceName();
+    TextListenerMultiplexer&	GetTextListeners()	{ return maTextListeners; }
 
-    void                        ImplSetPeerProperty( const ::rtl::OUString& rPropName, const ::com::sun::star::uno::Any& rVal );
+    void						ImplSetPeerProperty( const ::rtl::OUString& rPropName, const ::com::sun::star::uno::Any& rVal );
 
     void SAL_CALL createPeer( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XToolkit >& Toolkit, const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer >& Parent ) throw(::com::sun::star::uno::RuntimeException);
     void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw(::com::sun::star::uno::RuntimeException) { UnoControlBase::disposing( Source ); }
@@ -175,20 +175,20 @@ public:
     sal_Bool SAL_CALL setModel(const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel >& Model) throw ( ::com::sun::star::uno::RuntimeException );
 };
 
-//  ----------------------------------------------------
-//  class UnoControlFileControlModel
-//  ----------------------------------------------------
+//	----------------------------------------------------
+//	class UnoControlFileControlModel
+//	----------------------------------------------------
 class UnoControlFileControlModel : public UnoControlModel
 {
 protected:
-    ::com::sun::star::uno::Any      ImplGetDefaultValue( sal_uInt16 nPropId ) const;
+    ::com::sun::star::uno::Any 		ImplGetDefaultValue( sal_uInt16 nPropId ) const;
     ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper();
 
 public:
                         UnoControlFileControlModel();
                         UnoControlFileControlModel( const UnoControlFileControlModel& rModel ) : UnoControlModel( rModel ) {;}
 
-    UnoControlModel*    Clone() const { return new UnoControlFileControlModel( *this ); }
+    UnoControlModel*	Clone() const { return new UnoControlFileControlModel( *this ); }
 
     // ::com::sun::star::io::XPersistObject
     ::rtl::OUString SAL_CALL getServiceName() throw(::com::sun::star::uno::RuntimeException);
@@ -200,28 +200,28 @@ public:
     DECLIMPL_SERVICEINFO_DERIVED( UnoControlFileControlModel, UnoControlModel, szServiceName2_UnoControlFileControlModel )
 };
 
-//  ----------------------------------------------------
-//  class UnoFileControl
-//  ----------------------------------------------------
+//	----------------------------------------------------
+//	class UnoFileControl
+//	----------------------------------------------------
 class UnoFileControl : public UnoEditControl
 {
 public:
                         UnoFileControl();
-    ::rtl::OUString     GetComponentServiceName();
+    ::rtl::OUString		GetComponentServiceName();
 
     // ::com::sun::star::lang::XServiceInfo
     DECLIMPL_SERVICEINFO_DERIVED( UnoFileControl, UnoEditControl, szServiceName2_UnoControlFileControl )
 };
 
-//  ----------------------------------------------------
-//  class GraphicControlModel
-//  ----------------------------------------------------
+//	----------------------------------------------------
+//	class GraphicControlModel
+//	----------------------------------------------------
 class GraphicControlModel : public UnoControlModel
 {
 private:
     bool                                                                                    mbAdjustingImagePosition;
     bool                                                                                    mbAdjustingGraphic;
-
+    
     ::com::sun::star::uno::Reference< ::com::sun::star::graphic::XGraphicObject > mxGrfObj;
     ::com::sun::star::uno::Reference< ::com::sun::star::graphic::XGraphic > getGraphicFromURL_nothrow( const ::rtl::OUString& _rURL );
 
@@ -239,20 +239,20 @@ private:
         GraphicControlModel& operator=( const GraphicControlModel& );   // never implemented
 };
 
-//  ----------------------------------------------------
-//  class UnoControlButtonModel
-//  ----------------------------------------------------
-class UnoControlButtonModel :   public GraphicControlModel
+//	----------------------------------------------------
+//	class UnoControlButtonModel
+//	----------------------------------------------------
+class UnoControlButtonModel :	public GraphicControlModel
 {
 protected:
-    ::com::sun::star::uno::Any      ImplGetDefaultValue( sal_uInt16 nPropId ) const;
+    ::com::sun::star::uno::Any 		ImplGetDefaultValue( sal_uInt16 nPropId ) const;
     ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper();
 
 public:
                         UnoControlButtonModel();
                         UnoControlButtonModel( const UnoControlButtonModel& rModel ) : GraphicControlModel( rModel ) {;}
 
-    UnoControlModel*    Clone() const { return new UnoControlButtonModel( *this ); }
+    UnoControlModel*	Clone() const { return new UnoControlButtonModel( *this ); }
 
     // ::com::sun::star::beans::XMultiPropertySet
     ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo(  ) throw(::com::sun::star::uno::RuntimeException);
@@ -264,9 +264,9 @@ public:
     DECLIMPL_SERVICEINFO_DERIVED( UnoControlButtonModel, GraphicControlModel, szServiceName2_UnoControlButtonModel )
 };
 
-//  ----------------------------------------------------
-//  class UnoButtonControl
-//  ----------------------------------------------------
+//	----------------------------------------------------
+//	class UnoButtonControl
+//	----------------------------------------------------
 typedef ::cppu::AggImplInheritanceHelper4   <   UnoControlBase
                                             ,   ::com::sun::star::awt::XButton
                                             ,   ::com::sun::star::awt::XToggleButton
@@ -278,12 +278,12 @@ class UnoButtonControl :    public UnoButtonControl_Base
 private:
     ActionListenerMultiplexer   maActionListeners;
     ItemListenerMultiplexer     maItemListeners;
-    ::rtl::OUString             maActionCommand;
+    ::rtl::OUString				maActionCommand;
 
 public:
 
                         UnoButtonControl();
-    ::rtl::OUString     GetComponentServiceName();
+    ::rtl::OUString		GetComponentServiceName();
 
     void SAL_CALL createPeer( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XToolkit >& Toolkit, const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer >& Parent ) throw(::com::sun::star::uno::RuntimeException);
     void SAL_CALL dispose(  ) throw(::com::sun::star::uno::RuntimeException);
@@ -314,23 +314,23 @@ public:
     DECLIMPL_SERVICEINFO_DERIVED( UnoButtonControl, UnoControlBase, szServiceName2_UnoControlButton )
 };
 
-//  ----------------------------------------------------
-//  class UnoControlImageControlModel
-//  ----------------------------------------------------
-class UnoControlImageControlModel : public GraphicControlModel
+//	----------------------------------------------------
+//	class UnoControlImageControlModel
+//	----------------------------------------------------
+class UnoControlImageControlModel :	public GraphicControlModel
 {
 private:
     bool    mbAdjustingImageScaleMode;
 
 protected:
-    ::com::sun::star::uno::Any      ImplGetDefaultValue( sal_uInt16 nPropId ) const;
+    ::com::sun::star::uno::Any 		ImplGetDefaultValue( sal_uInt16 nPropId ) const;
     ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper();
 
 public:
                                     UnoControlImageControlModel();
                                     UnoControlImageControlModel( const UnoControlImageControlModel& rModel ) : GraphicControlModel( rModel ), mbAdjustingImageScaleMode( false ) { }
 
-    UnoControlModel*    Clone() const { return new UnoControlImageControlModel( *this ); }
+    UnoControlModel*	Clone() const { return new UnoControlImageControlModel( *this ); }
 
     // ::com::sun::star::beans::XMultiPropertySet
     ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo(  ) throw(::com::sun::star::uno::RuntimeException);
@@ -345,22 +345,22 @@ public:
     void SAL_CALL setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const ::com::sun::star::uno::Any& rValue ) throw (::com::sun::star::uno::Exception);
 };
 
-//  ----------------------------------------------------
-//  class UnoImageControlControl
-//  ----------------------------------------------------
+//	----------------------------------------------------
+//	class UnoImageControlControl
+//	----------------------------------------------------
 typedef ::cppu::AggImplInheritanceHelper1   <   UnoControlBase
                                             ,   ::com::sun::star::awt::XLayoutConstrains
                                             >   UnoImageControlControl_Base;
 class UnoImageControlControl : public UnoImageControlControl_Base
 {
 private:
-    ActionListenerMultiplexer   maActionListeners;
-    ::rtl::OUString             maActionCommand;
+    ActionListenerMultiplexer 	maActionListeners;
+    ::rtl::OUString				maActionCommand;
 
 public:
 
                             UnoImageControlControl();
-    ::rtl::OUString         GetComponentServiceName();
+    ::rtl::OUString			GetComponentServiceName();
 
     void SAL_CALL dispose(  ) throw(::com::sun::star::uno::RuntimeException);
 
@@ -376,21 +376,21 @@ public:
     DECLIMPL_SERVICEINFO_DERIVED( UnoImageControlControl, UnoControlBase, szServiceName2_UnoControlImageControl )
 };
 
-//  ----------------------------------------------------
-//  class UnoControlRadioButtonModel
-//  ----------------------------------------------------
-class UnoControlRadioButtonModel :  public GraphicControlModel
+//	----------------------------------------------------
+//	class UnoControlRadioButtonModel
+//	----------------------------------------------------
+class UnoControlRadioButtonModel :	public GraphicControlModel
 
 {
 protected:
-    ::com::sun::star::uno::Any      ImplGetDefaultValue( sal_uInt16 nPropId ) const;
-    ::cppu::IPropertyArrayHelper&   SAL_CALL getInfoHelper();
+    ::com::sun::star::uno::Any 		ImplGetDefaultValue( sal_uInt16 nPropId ) const;
+    ::cppu::IPropertyArrayHelper&	SAL_CALL getInfoHelper();
 
 public:
                         UnoControlRadioButtonModel();
                         UnoControlRadioButtonModel( const UnoControlRadioButtonModel& rModel ) : GraphicControlModel( rModel ) {;}
 
-    UnoControlModel*    Clone() const { return new UnoControlRadioButtonModel( *this ); }
+    UnoControlModel*	Clone() const { return new UnoControlRadioButtonModel( *this ); }
 
     // ::com::sun::star::io::XPersistObject
     ::rtl::OUString SAL_CALL getServiceName() throw(::com::sun::star::uno::RuntimeException);
@@ -403,9 +403,9 @@ public:
 
 };
 
-//  ----------------------------------------------------
-//  class UnoRadioButtonControl
-//  ----------------------------------------------------
+//	----------------------------------------------------
+//	class UnoRadioButtonControl
+//	----------------------------------------------------
 typedef ::cppu::AggImplInheritanceHelper4   <   UnoControlBase
                                             ,   ::com::sun::star::awt::XButton
                                             ,   ::com::sun::star::awt::XRadioButton
@@ -415,14 +415,14 @@ typedef ::cppu::AggImplInheritanceHelper4   <   UnoControlBase
 class UnoRadioButtonControl : public UnoRadioButtonControl_Base
 {
 private:
-    ItemListenerMultiplexer     maItemListeners;
-    ActionListenerMultiplexer   maActionListeners;
-    ::rtl::OUString             maActionCommand;
+    ItemListenerMultiplexer 	maItemListeners;
+    ActionListenerMultiplexer	maActionListeners;
+    ::rtl::OUString				maActionCommand;
 
 public:
 
                             UnoRadioButtonControl();
-    ::rtl::OUString         GetComponentServiceName();
+    ::rtl::OUString			GetComponentServiceName();
 
     void SAL_CALL createPeer( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XToolkit >& Toolkit, const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer >& Parent ) throw(::com::sun::star::uno::RuntimeException);
     void SAL_CALL dispose(  ) throw(::com::sun::star::uno::RuntimeException);
@@ -456,20 +456,20 @@ public:
 
 };
 
-//  ----------------------------------------------------
-//  class UnoControlCheckBoxModel
-//  ----------------------------------------------------
-class UnoControlCheckBoxModel : public GraphicControlModel
+//	----------------------------------------------------
+//	class UnoControlCheckBoxModel
+//	----------------------------------------------------
+class UnoControlCheckBoxModel :	public GraphicControlModel
 {
 protected:
-    ::com::sun::star::uno::Any      ImplGetDefaultValue( sal_uInt16 nPropId ) const;
-    ::cppu::IPropertyArrayHelper&   SAL_CALL getInfoHelper();
+    ::com::sun::star::uno::Any 		ImplGetDefaultValue( sal_uInt16 nPropId ) const;
+    ::cppu::IPropertyArrayHelper&	SAL_CALL getInfoHelper();
 
 public:
                         UnoControlCheckBoxModel();
                         UnoControlCheckBoxModel( const UnoControlCheckBoxModel& rModel ) : GraphicControlModel( rModel ) {;}
 
-    UnoControlModel*    Clone() const { return new UnoControlCheckBoxModel( *this ); }
+    UnoControlModel*	Clone() const { return new UnoControlCheckBoxModel( *this ); }
 
     // ::com::sun::star::io::XPersistObject
     ::rtl::OUString SAL_CALL getServiceName() throw(::com::sun::star::uno::RuntimeException);
@@ -481,9 +481,9 @@ public:
     DECLIMPL_SERVICEINFO_DERIVED( UnoControlCheckBoxModel, GraphicControlModel, szServiceName2_UnoControlCheckBoxModel )
 };
 
-//  ----------------------------------------------------
-//  class UnoCheckBoxControl
-//  ----------------------------------------------------
+//	----------------------------------------------------
+//	class UnoCheckBoxControl
+//	----------------------------------------------------
 typedef ::cppu::AggImplInheritanceHelper4   <   UnoControlBase
                                             ,   ::com::sun::star::awt::XButton
                                             ,   ::com::sun::star::awt::XCheckBox
@@ -494,14 +494,14 @@ class UnoCheckBoxControl : public UnoCheckBoxControl_Base
 {
 private:
     ItemListenerMultiplexer     maItemListeners;
-    ActionListenerMultiplexer   maActionListeners;
-    ::rtl::OUString             maActionCommand;
+    ActionListenerMultiplexer	maActionListeners;
+    ::rtl::OUString				maActionCommand;
 
 public:
 
                             UnoCheckBoxControl();
                             ~UnoCheckBoxControl(){;}
-    ::rtl::OUString         GetComponentServiceName();
+    ::rtl::OUString			GetComponentServiceName();
 
     void SAL_CALL createPeer( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XToolkit >& Toolkit, const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer >& Parent ) throw(::com::sun::star::uno::RuntimeException);
     void SAL_CALL dispose(  ) throw(::com::sun::star::uno::RuntimeException);
@@ -537,14 +537,14 @@ public:
 
 };
 
-//  ----------------------------------------------------
-//  class UnoControlFixedTextModel
-//  ----------------------------------------------------
+//	----------------------------------------------------
+//	class UnoControlFixedTextModel
+//	----------------------------------------------------
 class UnoControlFixedHyperlinkModel : public UnoControlModel
 {
 protected:
-    ::com::sun::star::uno::Any      ImplGetDefaultValue( sal_uInt16 nPropId ) const;
-    ::cppu::IPropertyArrayHelper&   SAL_CALL getInfoHelper();
+    ::com::sun::star::uno::Any 		ImplGetDefaultValue( sal_uInt16 nPropId ) const;
+    ::cppu::IPropertyArrayHelper&	SAL_CALL getInfoHelper();
 
 public:
     UnoControlFixedHyperlinkModel();
@@ -562,9 +562,9 @@ public:
     DECLIMPL_SERVICEINFO_DERIVED( UnoControlFixedHyperlinkModel, UnoControlModel, szServiceName_UnoControlFixedHyperlinkModel )
 };
 
-//  ----------------------------------------------------
+//	----------------------------------------------------
 //  class UnoFixedHyperlinkControl
-//  ----------------------------------------------------
+//	----------------------------------------------------
 class UnoFixedHyperlinkControl : public UnoControlBase,
                                  public ::com::sun::star::awt::XFixedHyperlink,
                                  public ::com::sun::star::awt::XLayoutConstrains
@@ -577,17 +577,17 @@ public:
 
     ::rtl::OUString     GetComponentServiceName();
 
-    ::com::sun::star::uno::Any  SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException) { return UnoControlBase::queryInterface(rType); }
-    ::com::sun::star::uno::Any  SAL_CALL queryAggregation( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException);
-    void                        SAL_CALL acquire() throw()  { OWeakAggObject::acquire(); }
-    void                        SAL_CALL release() throw()  { OWeakAggObject::release(); }
+    ::com::sun::star::uno::Any	SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException) { return UnoControlBase::queryInterface(rType); }
+    ::com::sun::star::uno::Any	SAL_CALL queryAggregation( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException);
+    void						SAL_CALL acquire() throw()	{ OWeakAggObject::acquire(); }
+    void						SAL_CALL release() throw()	{ OWeakAggObject::release(); }
 
     void SAL_CALL createPeer( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XToolkit >& Toolkit, const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer >& Parent ) throw(::com::sun::star::uno::RuntimeException);
     void SAL_CALL dispose(  ) throw(::com::sun::star::uno::RuntimeException);
 
     // ::com::sun::star::lang::XTypeProvider
-    ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type >  SAL_CALL getTypes() throw(::com::sun::star::uno::RuntimeException);
-    ::com::sun::star::uno::Sequence< sal_Int8 >                     SAL_CALL getImplementationId() throw(::com::sun::star::uno::RuntimeException);
+    ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type >	SAL_CALL getTypes() throw(::com::sun::star::uno::RuntimeException);
+    ::com::sun::star::uno::Sequence< sal_Int8 >						SAL_CALL getImplementationId() throw(::com::sun::star::uno::RuntimeException);
 
     // ::com::sun::star::awt::XControl
     sal_Bool SAL_CALL isTransparent(  ) throw(::com::sun::star::uno::RuntimeException);
@@ -676,20 +676,20 @@ public:
 
 };
 
-//  ----------------------------------------------------
-//  class UnoControlGroupBoxModel
-//  ----------------------------------------------------
+//	----------------------------------------------------
+//	class UnoControlGroupBoxModel
+//	----------------------------------------------------
 class UnoControlGroupBoxModel : public UnoControlModel
 {
 protected:
-    ::com::sun::star::uno::Any      ImplGetDefaultValue( sal_uInt16 nPropId ) const;
-    ::cppu::IPropertyArrayHelper&   SAL_CALL getInfoHelper();
+    ::com::sun::star::uno::Any 		ImplGetDefaultValue( sal_uInt16 nPropId ) const;
+    ::cppu::IPropertyArrayHelper& 	SAL_CALL getInfoHelper();
 
 public:
                         UnoControlGroupBoxModel();
                         UnoControlGroupBoxModel( const UnoControlGroupBoxModel& rModel ) : UnoControlModel( rModel ) {;}
 
-    UnoControlModel*    Clone() const { return new UnoControlGroupBoxModel( *this ); }
+    UnoControlModel*	Clone() const { return new UnoControlGroupBoxModel( *this ); }
 
     // ::com::sun::star::io::XPersistObject
     ::rtl::OUString SAL_CALL getServiceName() throw(::com::sun::star::uno::RuntimeException);
@@ -702,14 +702,14 @@ public:
 
 };
 
-//  ----------------------------------------------------
-//  class UnoGroupBoxControl
-//  ----------------------------------------------------
-class UnoGroupBoxControl :  public UnoControlBase
+//	----------------------------------------------------
+//	class UnoGroupBoxControl
+//	----------------------------------------------------
+class UnoGroupBoxControl :	public UnoControlBase
 {
 public:
                         UnoGroupBoxControl();
-    ::rtl::OUString     GetComponentServiceName();
+    ::rtl::OUString		GetComponentServiceName();
 
     sal_Bool SAL_CALL isTransparent(  ) throw(::com::sun::star::uno::RuntimeException);
 
@@ -718,28 +718,30 @@ public:
 
 };
 
-//  ----------------------------------------------------
-//  class UnoControlListBoxModel
-//  ----------------------------------------------------
+//	----------------------------------------------------
+//	class UnoControlListBoxModel
+//	----------------------------------------------------
 struct UnoControlListBoxModel_Data;
 typedef ::cppu::AggImplInheritanceHelper1   <   UnoControlModel
                                             ,   ::com::sun::star::awt::XItemList
                                             >   UnoControlListBoxModel_Base;
 class TOOLKIT_DLLPUBLIC UnoControlListBoxModel    :public UnoControlListBoxModel_Base
 {
+protected:
+    UnoControlListBoxModel(bool asComboBox);
 public:
                         UnoControlListBoxModel();
                         UnoControlListBoxModel( const UnoControlListBoxModel& i_rSource );
                         ~UnoControlListBoxModel();
 
-    UnoControlModel*    Clone() const { return new UnoControlListBoxModel( *this ); }
+    UnoControlModel*	Clone() const { return new UnoControlListBoxModel( *this ); }
 
-    virtual void        ImplNormalizePropertySequence(
-                            const sal_Int32                 _nCount,        /// the number of entries in the arrays
-                            sal_Int32*                      _pHandles,      /// the handles of the properties to set
-                            ::com::sun::star::uno::Any*     _pValues,       /// the values of the properties to set
-                            sal_Int32*                      _pValidHandles  /// pointer to the valid handles, allowed to be adjusted
-                        )   const SAL_THROW(());
+    virtual void		ImplNormalizePropertySequence(
+                            const sal_Int32					_nCount,		/// the number of entries in the arrays
+                            sal_Int32*						_pHandles,		/// the handles of the properties to set
+                            ::com::sun::star::uno::Any*		_pValues,		/// the values of the properties to set
+                            sal_Int32*						_pValidHandles	/// pointer to the valid handles, allowed to be adjusted
+                        )	const SAL_THROW(());
 
     // ::com::sun::star::beans::XMultiPropertySet
     ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo(  ) throw(::com::sun::star::uno::RuntimeException);
@@ -748,7 +750,9 @@ public:
     ::rtl::OUString SAL_CALL getServiceName() throw(::com::sun::star::uno::RuntimeException);
 
     // ::com::sun::star::lang::XServiceInfo
-    DECLIMPL_SERVICEINFO_DERIVED( UnoControlListBoxModel, UnoControlModel, szServiceName2_UnoControlListBoxModel )
+    //DECLIMPL_SERVICEINFO_DERIVED( UnoControlListBoxModel, UnoControlModel, szServiceName2_UnoControlListBoxModel )
+    ::rtl::OUString SAL_CALL getImplementationName(  ) throw(::com::sun::star::uno::RuntimeException);
+    ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException);
 
     // ::com::sun::star::awt::XItemList
     virtual ::sal_Int32 SAL_CALL getItemCount() throw (::com::sun::star::uno::RuntimeException);
@@ -773,8 +777,8 @@ public:
     void SAL_CALL setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const ::com::sun::star::uno::Any& rValue ) throw (::com::sun::star::uno::Exception);
 
 protected:
-    ::com::sun::star::uno::Any      ImplGetDefaultValue( sal_uInt16 nPropId ) const;
-    ::cppu::IPropertyArrayHelper&   SAL_CALL getInfoHelper();
+    ::com::sun::star::uno::Any 		ImplGetDefaultValue( sal_uInt16 nPropId ) const;
+    ::cppu::IPropertyArrayHelper&	SAL_CALL getInfoHelper();
 
 private:
     void    impl_notifyItemListEvent_nolck(
@@ -806,14 +810,14 @@ private:
     void    impl_getStringItemList( ::std::vector< ::rtl::OUString >& o_rStringItems ) const;
     void    impl_setStringItemList_nolck( const ::std::vector< ::rtl::OUString >& i_rStringItems );
 
-private:
+protected:
     ::boost::scoped_ptr< UnoControlListBoxModel_Data >  m_pData;
     ::cppu::OInterfaceContainerHelper                   m_aItemListListeners;
 };
 
-//  ----------------------------------------------------
-//  class UnoListBoxControl
-//  ----------------------------------------------------
+//	----------------------------------------------------
+//	class UnoListBoxControl
+//	----------------------------------------------------
 typedef ::cppu::AggImplInheritanceHelper5   <   UnoControlBase
                                             ,   ::com::sun::star::awt::XListBox
                                             ,   ::com::sun::star::awt::XItemListener
@@ -825,7 +829,7 @@ class TOOLKIT_DLLPUBLIC UnoListBoxControl : public UnoListBoxControl_Base
 {
 public:
                         UnoListBoxControl();
-    ::rtl::OUString     GetComponentServiceName();
+    ::rtl::OUString		GetComponentServiceName();
 
     void SAL_CALL createPeer( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XToolkit >& Toolkit, const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer >& Parent ) throw(::com::sun::star::uno::RuntimeException);
     void SAL_CALL dispose(  ) throw(::com::sun::star::uno::RuntimeException);
@@ -878,71 +882,82 @@ public:
     virtual void SAL_CALL itemListChanged( const ::com::sun::star::lang::EventObject& Event ) throw (::com::sun::star::uno::RuntimeException);
 
     // ::com::sun::star::lang::XServiceInfo
-    DECLIMPL_SERVICEINFO_DERIVED( UnoListBoxControl, UnoControlBase, szServiceName2_UnoControlListBox )
+    // DECLIMPL_SERVICEINFO_DERIVED( UnoListBoxControl, UnoControlBase, szServiceName2_UnoControlListBox )
+    ::rtl::OUString SAL_CALL getImplementationName(  ) throw(::com::sun::star::uno::RuntimeException);
+    ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException);
 
 protected:
     void                ImplUpdateSelectedItemsProperty();
     virtual void        ImplSetPeerProperty( const ::rtl::OUString& rPropName, const ::com::sun::star::uno::Any& rVal );
     virtual void        updateFromModel();
 
-    ActionListenerMultiplexer&  getActionListeners();
-    ItemListenerMultiplexer&    getItemListeners();
+    ActionListenerMultiplexer& 	getActionListeners();
+    ItemListenerMultiplexer& 	getItemListeners();
 private:
-    ActionListenerMultiplexer   maActionListeners;
-    ItemListenerMultiplexer     maItemListeners;
+    ActionListenerMultiplexer 	maActionListeners;
+    ItemListenerMultiplexer 	maItemListeners;
 };
 
-//  ----------------------------------------------------
-//  class UnoControlComboBoxModel
-//  ----------------------------------------------------
-class UnoControlComboBoxModel : public UnoControlModel
+//	----------------------------------------------------
+//	class UnoControlComboBoxModel
+//	----------------------------------------------------
+class UnoControlComboBoxModel :	public UnoControlListBoxModel
 {
 protected:
-    ::com::sun::star::uno::Any      ImplGetDefaultValue( sal_uInt16 nPropId ) const;
-    ::cppu::IPropertyArrayHelper&   SAL_CALL getInfoHelper();
+    ::com::sun::star::uno::Any 		ImplGetDefaultValue( sal_uInt16 nPropId ) const;
+    ::cppu::IPropertyArrayHelper&	SAL_CALL getInfoHelper();
 
 public:
                         UnoControlComboBoxModel();
-                        UnoControlComboBoxModel( const UnoControlComboBoxModel& rModel ) : UnoControlModel( rModel ) {;}
+                        UnoControlComboBoxModel( const UnoControlComboBoxModel& rModel ) : UnoControlListBoxModel( rModel ) {;}
 
-    UnoControlModel*    Clone() const { return new UnoControlComboBoxModel( *this ); }
+    UnoControlModel*	Clone() const { return new UnoControlComboBoxModel( *this ); }
 
     // ::com::sun::star::io::XPersistObject
     ::rtl::OUString SAL_CALL getServiceName() throw(::com::sun::star::uno::RuntimeException);
 
     // ::com::sun::star::beans::XMultiPropertySet
     ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo(  ) throw(::com::sun::star::uno::RuntimeException);
+    // OPropertySetHelper
+    void SAL_CALL setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const ::com::sun::star::uno::Any& rValue ) throw (::com::sun::star::uno::Exception);
 
     // ::com::sun::star::lang::XServiceInfo
-    DECLIMPL_SERVICEINFO_DERIVED( UnoControlComboBoxModel, UnoControlModel, szServiceName2_UnoControlComboBoxModel )
+    ::rtl::OUString SAL_CALL getImplementationName(  ) throw(::com::sun::star::uno::RuntimeException);
+    ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException);
+    // DECLIMPL_SERVICEINFO_DERIVED( UnoControlComboBoxModel, UnoControlModel, szServiceName2_UnoControlComboBoxModel )
 
 };
 
-//  ----------------------------------------------------
-//  class UnoComboBoxControl
-//  ----------------------------------------------------
-class UnoComboBoxControl :  public UnoEditControl,
-                            public ::com::sun::star::awt::XComboBox
+//	----------------------------------------------------
+//	class UnoComboBoxControl
+//	----------------------------------------------------
+class UnoComboBoxControl :	public UnoEditControl
+                        ,   public ::com::sun::star::awt::XComboBox
+                        ,   public ::com::sun::star::awt::XItemListener
+                        ,   public ::com::sun::star::awt::XItemListListener
 {
 private:
-    ActionListenerMultiplexer   maActionListeners;
-    ItemListenerMultiplexer     maItemListeners;
+    ActionListenerMultiplexer 	maActionListeners;
+    ItemListenerMultiplexer 	maItemListeners;
 
 public:
 
                 UnoComboBoxControl();
-    ::rtl::OUString     GetComponentServiceName();
+    ::rtl::OUString		GetComponentServiceName();
 
-    ::com::sun::star::uno::Any  SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException) { return UnoEditControl::queryInterface(rType); }
-    ::com::sun::star::uno::Any  SAL_CALL queryAggregation( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException);
-    void                        SAL_CALL acquire() throw()  { OWeakAggObject::acquire(); }
-    void                        SAL_CALL release() throw()  { OWeakAggObject::release(); }
     void SAL_CALL createPeer( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XToolkit >& Toolkit, const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer >& Parent ) throw(::com::sun::star::uno::RuntimeException);
+    void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw(::com::sun::star::uno::RuntimeException) { UnoEditControl::disposing( Source ); }
     void SAL_CALL dispose(  ) throw(::com::sun::star::uno::RuntimeException);
 
+    ::com::sun::star::uno::Any	SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException) { return UnoEditControl::queryInterface(rType); }
+    ::com::sun::star::uno::Any	SAL_CALL queryAggregation( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException);
+    void						SAL_CALL acquire() throw()	{ OWeakAggObject::acquire(); }
+    void						SAL_CALL release() throw()	{ OWeakAggObject::release(); }
+    
+
     // ::com::sun::star::lang::XTypeProvider
-    ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type >  SAL_CALL getTypes() throw(::com::sun::star::uno::RuntimeException);
-    ::com::sun::star::uno::Sequence< sal_Int8 >                     SAL_CALL getImplementationId() throw(::com::sun::star::uno::RuntimeException);
+    ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type >	SAL_CALL getTypes() throw(::com::sun::star::uno::RuntimeException);
+    ::com::sun::star::uno::Sequence< sal_Int8 >						SAL_CALL getImplementationId() throw(::com::sun::star::uno::RuntimeException);
 
     // ::com::sun::star::awt::XComboBox
     void SAL_CALL addItemListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XItemListener >& l ) throw(::com::sun::star::uno::RuntimeException);
@@ -958,32 +973,52 @@ public:
     sal_Int16 SAL_CALL getDropDownLineCount(  ) throw(::com::sun::star::uno::RuntimeException);
     void SAL_CALL setDropDownLineCount( sal_Int16 nLines ) throw(::com::sun::star::uno::RuntimeException);
 
+    // XUnoControl
+    virtual sal_Bool SAL_CALL setModel(const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel >& Model) throw ( ::com::sun::star::uno::RuntimeException );
+
+    // XItemListListener
+    virtual void SAL_CALL listItemInserted( const ::com::sun::star::awt::ItemListEvent& Event ) throw (::com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL listItemRemoved( const ::com::sun::star::awt::ItemListEvent& Event ) throw (::com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL listItemModified( const ::com::sun::star::awt::ItemListEvent& Event ) throw (::com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL allItemsRemoved( const ::com::sun::star::lang::EventObject& Event ) throw (::com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL itemListChanged( const ::com::sun::star::lang::EventObject& Event ) throw (::com::sun::star::uno::RuntimeException);
+
+    // XItemListener
+    virtual void SAL_CALL itemStateChanged( const ::com::sun::star::awt::ItemEvent& rEvent ) throw (::com::sun::star::uno::RuntimeException);
+
     // ::com::sun::star::lang::XServiceInfo
-    DECLIMPL_SERVICEINFO_DERIVED( UnoComboBoxControl, UnoEditControl, szServiceName2_UnoControlComboBox )
+    ::rtl::OUString SAL_CALL getImplementationName(  ) throw(::com::sun::star::uno::RuntimeException);
+    ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException);
+    //DECLIMPL_SERVICEINFO_DERIVED( UnoComboBoxControl, UnoEditControl, szServiceName2_UnoControlComboBox )
+protected:
+    virtual void        ImplSetPeerProperty( const ::rtl::OUString& rPropName, const ::com::sun::star::uno::Any& rVal );
+    virtual void        updateFromModel();
+    ActionListenerMultiplexer& 	getActionListeners();
+    ItemListenerMultiplexer& 	getItemListeners();
 
 };
 
-//  ----------------------------------------------------
-//  class UnoSpinFieldControl
-//  ----------------------------------------------------
+//	----------------------------------------------------
+//	class UnoSpinFieldControl
+//	----------------------------------------------------
 class UnoSpinFieldControl : public UnoEditControl,
                             public ::com::sun::star::awt::XSpinField
 {
 private:
-    SpinListenerMultiplexer     maSpinListeners;
+    SpinListenerMultiplexer	    maSpinListeners;
     BOOL                        mbRepeat;
 
 public:
                                 UnoSpinFieldControl();
 
-    ::com::sun::star::uno::Any  SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException) { return UnoEditControl::queryInterface(rType); }
-    ::com::sun::star::uno::Any  SAL_CALL queryAggregation( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException);
-    void                        SAL_CALL acquire() throw()  { OWeakAggObject::acquire(); }
-    void                        SAL_CALL release() throw()  { OWeakAggObject::release(); }
+    ::com::sun::star::uno::Any	SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException) { return UnoEditControl::queryInterface(rType); }
+    ::com::sun::star::uno::Any	SAL_CALL queryAggregation( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException);
+    void						SAL_CALL acquire() throw()	{ OWeakAggObject::acquire(); }
+    void						SAL_CALL release() throw()	{ OWeakAggObject::release(); }
 
     // ::com::sun::star::lang::XTypeProvider
-    ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type >  SAL_CALL getTypes() throw(::com::sun::star::uno::RuntimeException);
-    ::com::sun::star::uno::Sequence< sal_Int8 >                     SAL_CALL getImplementationId() throw(::com::sun::star::uno::RuntimeException);
+    ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type >	SAL_CALL getTypes() throw(::com::sun::star::uno::RuntimeException);
+    ::com::sun::star::uno::Sequence< sal_Int8 >						SAL_CALL getImplementationId() throw(::com::sun::star::uno::RuntimeException);
 
     void SAL_CALL createPeer( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XToolkit >& Toolkit, const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer >& Parent ) throw(::com::sun::star::uno::RuntimeException);
 
@@ -1002,20 +1037,20 @@ public:
 };
 
 
-//  ----------------------------------------------------
-//  class UnoControlDateFieldModel
-//  ----------------------------------------------------
+//	----------------------------------------------------
+//	class UnoControlDateFieldModel
+//	----------------------------------------------------
 class UnoControlDateFieldModel : public UnoControlModel
 {
 protected:
-    ::com::sun::star::uno::Any      ImplGetDefaultValue( sal_uInt16 nPropId ) const;
-    ::cppu::IPropertyArrayHelper&   SAL_CALL getInfoHelper();
+    ::com::sun::star::uno::Any 		ImplGetDefaultValue( sal_uInt16 nPropId ) const;
+    ::cppu::IPropertyArrayHelper&	SAL_CALL getInfoHelper();
 
 public:
                 UnoControlDateFieldModel();
                 UnoControlDateFieldModel( const UnoControlDateFieldModel& rModel ) : UnoControlModel( rModel ) {;}
 
-    UnoControlModel*    Clone() const { return new UnoControlDateFieldModel( *this ); }
+    UnoControlModel*	Clone() const { return new UnoControlDateFieldModel( *this ); }
 
     // ::com::sun::star::io::XPersistObject
     ::rtl::OUString SAL_CALL getServiceName() throw(::com::sun::star::uno::RuntimeException);
@@ -1028,9 +1063,9 @@ public:
 
 };
 
-//  ----------------------------------------------------
-//  class UnoDateFieldControl
-//  ----------------------------------------------------
+//	----------------------------------------------------
+//	class UnoDateFieldControl
+//	----------------------------------------------------
 class UnoDateFieldControl : public UnoSpinFieldControl,
                             public ::com::sun::star::awt::XDateField
 {
@@ -1040,16 +1075,16 @@ private:
     sal_Bool        mbLongFormat;
 public:
                     UnoDateFieldControl();
-    ::rtl::OUString         GetComponentServiceName();
+    ::rtl::OUString			GetComponentServiceName();
 
-    ::com::sun::star::uno::Any  SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException) { return UnoSpinFieldControl::queryInterface(rType); }
-    ::com::sun::star::uno::Any  SAL_CALL queryAggregation( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException);
-    void                        SAL_CALL acquire() throw()  { OWeakAggObject::acquire(); }
-    void                        SAL_CALL release() throw()  { OWeakAggObject::release(); }
+    ::com::sun::star::uno::Any	SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException) { return UnoSpinFieldControl::queryInterface(rType); }
+    ::com::sun::star::uno::Any	SAL_CALL queryAggregation( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException);
+    void						SAL_CALL acquire() throw()	{ OWeakAggObject::acquire(); }
+    void						SAL_CALL release() throw()	{ OWeakAggObject::release(); }
 
     // ::com::sun::star::lang::XTypeProvider
-    ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type >  SAL_CALL getTypes() throw(::com::sun::star::uno::RuntimeException);
-    ::com::sun::star::uno::Sequence< sal_Int8 >                     SAL_CALL getImplementationId() throw(::com::sun::star::uno::RuntimeException);
+    ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type >	SAL_CALL getTypes() throw(::com::sun::star::uno::RuntimeException);
+    ::com::sun::star::uno::Sequence< sal_Int8 >						SAL_CALL getImplementationId() throw(::com::sun::star::uno::RuntimeException);
 
     void SAL_CALL createPeer( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XToolkit >& Toolkit, const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer >& Parent ) throw(::com::sun::star::uno::RuntimeException);
 
@@ -1078,20 +1113,20 @@ public:
     DECLIMPL_SERVICEINFO_DERIVED( UnoDateFieldControl, UnoSpinFieldControl, szServiceName2_UnoControlDateField )
 };
 
-//  ----------------------------------------------------
-//  class UnoControlTimeFieldModel
-//  ----------------------------------------------------
+//	----------------------------------------------------
+//	class UnoControlTimeFieldModel
+//	----------------------------------------------------
 class UnoControlTimeFieldModel : public UnoControlModel
 {
 protected:
-    ::com::sun::star::uno::Any      ImplGetDefaultValue( sal_uInt16 nPropId ) const;
-    ::cppu::IPropertyArrayHelper&   SAL_CALL getInfoHelper();
+    ::com::sun::star::uno::Any 		ImplGetDefaultValue( sal_uInt16 nPropId ) const;
+    ::cppu::IPropertyArrayHelper&	SAL_CALL getInfoHelper();
 
 public:
                         UnoControlTimeFieldModel();
                         UnoControlTimeFieldModel( const UnoControlTimeFieldModel& rModel ) : UnoControlModel( rModel ) {;}
 
-    UnoControlModel*    Clone() const { return new UnoControlTimeFieldModel( *this ); }
+    UnoControlModel*	Clone() const { return new UnoControlTimeFieldModel( *this ); }
 
     // ::com::sun::star::io::XPersistObject
     ::rtl::OUString SAL_CALL getServiceName() throw(::com::sun::star::uno::RuntimeException);
@@ -1104,9 +1139,9 @@ public:
 
 };
 
-//  ----------------------------------------------------
-//  class UnoTimeFieldControl
-//  ----------------------------------------------------
+//	----------------------------------------------------
+//	class UnoTimeFieldControl
+//	----------------------------------------------------
 class UnoTimeFieldControl : public UnoSpinFieldControl,
                             public ::com::sun::star::awt::XTimeField
 {
@@ -1116,16 +1151,16 @@ private:
 
 public:
                         UnoTimeFieldControl();
-    ::rtl::OUString     GetComponentServiceName();
+    ::rtl::OUString		GetComponentServiceName();
 
-    ::com::sun::star::uno::Any  SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException) { return UnoSpinFieldControl::queryInterface(rType); }
-    ::com::sun::star::uno::Any  SAL_CALL queryAggregation( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException);
-    void                        SAL_CALL acquire() throw()  { OWeakAggObject::acquire(); }
-    void                        SAL_CALL release() throw()  { OWeakAggObject::release(); }
+    ::com::sun::star::uno::Any	SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException) { return UnoSpinFieldControl::queryInterface(rType); }
+    ::com::sun::star::uno::Any	SAL_CALL queryAggregation( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException);
+    void						SAL_CALL acquire() throw()	{ OWeakAggObject::acquire(); }
+    void						SAL_CALL release() throw()	{ OWeakAggObject::release(); }
 
     // ::com::sun::star::lang::XTypeProvider
-    ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type >  SAL_CALL getTypes() throw(::com::sun::star::uno::RuntimeException);
-    ::com::sun::star::uno::Sequence< sal_Int8 >                     SAL_CALL getImplementationId() throw(::com::sun::star::uno::RuntimeException);
+    ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type >	SAL_CALL getTypes() throw(::com::sun::star::uno::RuntimeException);
+    ::com::sun::star::uno::Sequence< sal_Int8 >						SAL_CALL getImplementationId() throw(::com::sun::star::uno::RuntimeException);
 
     void SAL_CALL createPeer( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XToolkit >& Toolkit, const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer >& Parent ) throw(::com::sun::star::uno::RuntimeException);
 
@@ -1153,20 +1188,20 @@ public:
 
 };
 
-//  ----------------------------------------------------
-//  class UnoControlNumericFieldModel
-//  ----------------------------------------------------
+//	----------------------------------------------------
+//	class UnoControlNumericFieldModel
+//	----------------------------------------------------
 class UnoControlNumericFieldModel : public UnoControlModel
 {
 protected:
-    ::com::sun::star::uno::Any      ImplGetDefaultValue( sal_uInt16 nPropId ) const;
-    ::cppu::IPropertyArrayHelper&   SAL_CALL getInfoHelper();
+    ::com::sun::star::uno::Any 		ImplGetDefaultValue( sal_uInt16 nPropId ) const;
+    ::cppu::IPropertyArrayHelper&	SAL_CALL getInfoHelper();
 
 public:
                 UnoControlNumericFieldModel();
                 UnoControlNumericFieldModel( const UnoControlNumericFieldModel& rModel ) : UnoControlModel( rModel ) {;}
 
-    UnoControlModel*    Clone() const { return new UnoControlNumericFieldModel( *this ); }
+    UnoControlModel*	Clone() const { return new UnoControlNumericFieldModel( *this ); }
 
     // ::com::sun::star::io::XPersistObject
     ::rtl::OUString SAL_CALL getServiceName() throw(::com::sun::star::uno::RuntimeException);
@@ -1179,10 +1214,10 @@ public:
 
 };
 
-//  ----------------------------------------------------
-//  class UnoNumericFieldControl
-//  ----------------------------------------------------
-class UnoNumericFieldControl :  public UnoSpinFieldControl,
+//	----------------------------------------------------
+//	class UnoNumericFieldControl
+//	----------------------------------------------------
+class UnoNumericFieldControl :	public UnoSpinFieldControl,
                                 public ::com::sun::star::awt::XNumericField
 {
 private:
@@ -1191,18 +1226,18 @@ private:
 
 public:
                         UnoNumericFieldControl();
-    ::rtl::OUString     GetComponentServiceName();
+    ::rtl::OUString		GetComponentServiceName();
 
-    ::com::sun::star::uno::Any  SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException) { return UnoSpinFieldControl::queryInterface(rType); }
-    ::com::sun::star::uno::Any  SAL_CALL queryAggregation( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException);
-    void                        SAL_CALL acquire() throw()  { OWeakAggObject::acquire(); }
-    void                        SAL_CALL release() throw()  { OWeakAggObject::release(); }
+    ::com::sun::star::uno::Any	SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException) { return UnoSpinFieldControl::queryInterface(rType); }
+    ::com::sun::star::uno::Any	SAL_CALL queryAggregation( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException);
+    void						SAL_CALL acquire() throw()	{ OWeakAggObject::acquire(); }
+    void						SAL_CALL release() throw()	{ OWeakAggObject::release(); }
 
     void SAL_CALL createPeer( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XToolkit >& Toolkit, const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer >& Parent ) throw(::com::sun::star::uno::RuntimeException);
 
     // ::com::sun::star::lang::XTypeProvider
-    ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type >  SAL_CALL getTypes() throw(::com::sun::star::uno::RuntimeException);
-    ::com::sun::star::uno::Sequence< sal_Int8 >                     SAL_CALL getImplementationId() throw(::com::sun::star::uno::RuntimeException);
+    ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type >	SAL_CALL getTypes() throw(::com::sun::star::uno::RuntimeException);
+    ::com::sun::star::uno::Sequence< sal_Int8 >						SAL_CALL getImplementationId() throw(::com::sun::star::uno::RuntimeException);
 
     // ::com::sun::star::awt::XTextListener
     void SAL_CALL textChanged( const ::com::sun::star::awt::TextEvent& rEvent ) throw(::com::sun::star::uno::RuntimeException);
@@ -1230,20 +1265,20 @@ public:
 
 };
 
-//  ----------------------------------------------------
-//  class UnoControlCurrencyFieldModel
-//  ----------------------------------------------------
+//	----------------------------------------------------
+//	class UnoControlCurrencyFieldModel
+//	----------------------------------------------------
 class UnoControlCurrencyFieldModel : public UnoControlModel
 {
 protected:
-    ::com::sun::star::uno::Any      ImplGetDefaultValue( sal_uInt16 nPropId ) const;
-    ::cppu::IPropertyArrayHelper&   SAL_CALL getInfoHelper();
+    ::com::sun::star::uno::Any 		ImplGetDefaultValue( sal_uInt16 nPropId ) const;
+    ::cppu::IPropertyArrayHelper&	SAL_CALL getInfoHelper();
 
 public:
                         UnoControlCurrencyFieldModel();
                         UnoControlCurrencyFieldModel( const UnoControlCurrencyFieldModel& rModel ) : UnoControlModel( rModel ) {;}
 
-    UnoControlModel*    Clone() const { return new UnoControlCurrencyFieldModel( *this ); }
+    UnoControlModel*	Clone() const { return new UnoControlCurrencyFieldModel( *this ); }
 
     // ::com::sun::star::io::XPersistObject
     ::rtl::OUString SAL_CALL getServiceName() throw(::com::sun::star::uno::RuntimeException);
@@ -1256,10 +1291,10 @@ public:
 
 };
 
-//  ----------------------------------------------------
-//  class UnoCurrencyFieldControl
-//  ----------------------------------------------------
-class UnoCurrencyFieldControl : public UnoSpinFieldControl,
+//	----------------------------------------------------
+//	class UnoCurrencyFieldControl
+//	----------------------------------------------------
+class UnoCurrencyFieldControl :	public UnoSpinFieldControl,
                                 public ::com::sun::star::awt::XCurrencyField
 {
 private:
@@ -1268,18 +1303,18 @@ private:
 
 public:
                         UnoCurrencyFieldControl();
-    ::rtl::OUString     GetComponentServiceName();
+    ::rtl::OUString		GetComponentServiceName();
 
-    ::com::sun::star::uno::Any  SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException) { return UnoSpinFieldControl::queryInterface(rType); }
-    ::com::sun::star::uno::Any  SAL_CALL queryAggregation( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException);
-    void                        SAL_CALL acquire() throw()  { OWeakAggObject::acquire(); }
-    void                        SAL_CALL release() throw()  { OWeakAggObject::release(); }
+    ::com::sun::star::uno::Any	SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException) { return UnoSpinFieldControl::queryInterface(rType); }
+    ::com::sun::star::uno::Any	SAL_CALL queryAggregation( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException);
+    void						SAL_CALL acquire() throw()	{ OWeakAggObject::acquire(); }
+    void						SAL_CALL release() throw()	{ OWeakAggObject::release(); }
 
     void SAL_CALL createPeer( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XToolkit >& Toolkit, const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer >& Parent ) throw(::com::sun::star::uno::RuntimeException);
 
     // ::com::sun::star::lang::XTypeProvider
-    ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type >  SAL_CALL getTypes() throw(::com::sun::star::uno::RuntimeException);
-    ::com::sun::star::uno::Sequence< sal_Int8 >                     SAL_CALL getImplementationId() throw(::com::sun::star::uno::RuntimeException);
+    ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type >	SAL_CALL getTypes() throw(::com::sun::star::uno::RuntimeException);
+    ::com::sun::star::uno::Sequence< sal_Int8 >						SAL_CALL getImplementationId() throw(::com::sun::star::uno::RuntimeException);
 
     // ::com::sun::star::awt::XTextListener
     void SAL_CALL textChanged( const ::com::sun::star::awt::TextEvent& rEvent ) throw(::com::sun::star::uno::RuntimeException);
@@ -1306,20 +1341,20 @@ public:
     DECLIMPL_SERVICEINFO_DERIVED( UnoCurrencyFieldControl, UnoSpinFieldControl, szServiceName2_UnoControlCurrencyField )
 };
 
-//  ----------------------------------------------------
-//  class UnoControlPatternFieldModel
-//  ----------------------------------------------------
+//	----------------------------------------------------
+//	class UnoControlPatternFieldModel
+//	----------------------------------------------------
 class UnoControlPatternFieldModel : public UnoControlModel
 {
 protected:
-    ::com::sun::star::uno::Any      ImplGetDefaultValue( sal_uInt16 nPropId ) const;
-    ::cppu::IPropertyArrayHelper&   SAL_CALL getInfoHelper();
+    ::com::sun::star::uno::Any 		ImplGetDefaultValue( sal_uInt16 nPropId ) const;
+    ::cppu::IPropertyArrayHelper&	SAL_CALL getInfoHelper();
 
 public:
                         UnoControlPatternFieldModel();
                         UnoControlPatternFieldModel( const UnoControlPatternFieldModel& rModel ) : UnoControlModel( rModel ) {;}
 
-    UnoControlModel*    Clone() const { return new UnoControlPatternFieldModel( *this ); }
+    UnoControlModel*	Clone() const { return new UnoControlPatternFieldModel( *this ); }
 
     // ::com::sun::star::io::XPersistObject
     ::rtl::OUString SAL_CALL getServiceName() throw(::com::sun::star::uno::RuntimeException);
@@ -1332,27 +1367,27 @@ public:
 
 };
 
-//  ----------------------------------------------------
-//  class UnoPatternFieldControl
-//  ----------------------------------------------------
-class UnoPatternFieldControl :  public UnoSpinFieldControl,
+//	----------------------------------------------------
+//	class UnoPatternFieldControl
+//	----------------------------------------------------
+class UnoPatternFieldControl :	public UnoSpinFieldControl,
                                 public ::com::sun::star::awt::XPatternField
 {
 protected:
-    void            ImplSetPeerProperty( const ::rtl::OUString& rPropName, const ::com::sun::star::uno::Any& rVal );
+    void 			ImplSetPeerProperty( const ::rtl::OUString& rPropName, const ::com::sun::star::uno::Any& rVal );
 
 public:
                         UnoPatternFieldControl();
-    ::rtl::OUString     GetComponentServiceName();
+    ::rtl::OUString		GetComponentServiceName();
 
-    ::com::sun::star::uno::Any  SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException) { return UnoSpinFieldControl::queryInterface(rType); }
-    ::com::sun::star::uno::Any  SAL_CALL queryAggregation( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException);
-    void                        SAL_CALL acquire() throw()  { OWeakAggObject::acquire(); }
-    void                        SAL_CALL release() throw()  { OWeakAggObject::release(); }
+    ::com::sun::star::uno::Any	SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException) { return UnoSpinFieldControl::queryInterface(rType); }
+    ::com::sun::star::uno::Any	SAL_CALL queryAggregation( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException);
+    void						SAL_CALL acquire() throw()	{ OWeakAggObject::acquire(); }
+    void						SAL_CALL release() throw()	{ OWeakAggObject::release(); }
 
     // ::com::sun::star::lang::XTypeProvider
-    ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type >  SAL_CALL getTypes() throw(::com::sun::star::uno::RuntimeException);
-    ::com::sun::star::uno::Sequence< sal_Int8 >                     SAL_CALL getImplementationId() throw(::com::sun::star::uno::RuntimeException);
+    ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type >	SAL_CALL getTypes() throw(::com::sun::star::uno::RuntimeException);
+    ::com::sun::star::uno::Sequence< sal_Int8 >						SAL_CALL getImplementationId() throw(::com::sun::star::uno::RuntimeException);
 
     // ::com::sun::star::awt::XPatternField
     void SAL_CALL setMasks( const ::rtl::OUString& EditMask, const ::rtl::OUString& LiteralMask ) throw(::com::sun::star::uno::RuntimeException);
@@ -1367,20 +1402,20 @@ public:
 
 };
 
-//  ----------------------------------------------------
-//  class UnoControlProgressBarModel
-//  ----------------------------------------------------
-class UnoControlProgressBarModel :  public UnoControlModel
+//	----------------------------------------------------
+//	class UnoControlProgressBarModel
+//	----------------------------------------------------
+class UnoControlProgressBarModel :	public UnoControlModel
 {
 protected:
-    ::com::sun::star::uno::Any      ImplGetDefaultValue( sal_uInt16 nPropId ) const;
-    ::cppu::IPropertyArrayHelper&   SAL_CALL getInfoHelper();
+    ::com::sun::star::uno::Any		ImplGetDefaultValue( sal_uInt16 nPropId ) const;
+    ::cppu::IPropertyArrayHelper&	SAL_CALL getInfoHelper();
 
 public:
                         UnoControlProgressBarModel();
                         UnoControlProgressBarModel( const UnoControlProgressBarModel& rModel ) : UnoControlModel( rModel ) {;}
 
-    UnoControlModel*    Clone() const { return new UnoControlProgressBarModel( *this ); }
+    UnoControlModel*	Clone() const { return new UnoControlProgressBarModel( *this ); }
 
     // ::com::sun::star::beans::XMultiPropertySet
     ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo(  ) throw(::com::sun::star::uno::RuntimeException);
@@ -1392,30 +1427,30 @@ public:
     DECLIMPL_SERVICEINFO_DERIVED( UnoControlProgressBarModel, UnoControlModel, szServiceName2_UnoControlProgressBarModel )
 };
 
-//  ----------------------------------------------------
-//  class UnoProgressBarControl
-//  ----------------------------------------------------
-class UnoProgressBarControl :   public UnoControlBase,
+//	----------------------------------------------------
+//	class UnoProgressBarControl
+//	----------------------------------------------------
+class UnoProgressBarControl :	public UnoControlBase,
                                 public ::com::sun::star::awt::XProgressBar
 {
 public:
                                 UnoProgressBarControl();
-    ::rtl::OUString             GetComponentServiceName();
+    ::rtl::OUString				GetComponentServiceName();
 
-    ::com::sun::star::uno::Any  SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException) { return UnoControlBase::queryInterface(rType); }
-    ::com::sun::star::uno::Any  SAL_CALL queryAggregation( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException);
-    void                        SAL_CALL acquire() throw()  { OWeakAggObject::acquire(); }
-    void                        SAL_CALL release() throw()  { OWeakAggObject::release(); }
+    ::com::sun::star::uno::Any	SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException) { return UnoControlBase::queryInterface(rType); }
+    ::com::sun::star::uno::Any	SAL_CALL queryAggregation( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException);
+    void						SAL_CALL acquire() throw()	{ OWeakAggObject::acquire(); }
+    void						SAL_CALL release() throw()	{ OWeakAggObject::release(); }
 
     // ::com::sun::star::lang::XTypeProvider
-    ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type >  SAL_CALL getTypes() throw(::com::sun::star::uno::RuntimeException);
-    ::com::sun::star::uno::Sequence< sal_Int8 >                     SAL_CALL getImplementationId() throw(::com::sun::star::uno::RuntimeException);
+    ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type >	SAL_CALL getTypes() throw(::com::sun::star::uno::RuntimeException);
+    ::com::sun::star::uno::Sequence< sal_Int8 >						SAL_CALL getImplementationId() throw(::com::sun::star::uno::RuntimeException);
 
     // ::com::sun::star::awt::XProgressBar
     void SAL_CALL setForegroundColor( sal_Int32 nColor ) throw(::com::sun::star::uno::RuntimeException);
     void SAL_CALL setBackgroundColor( sal_Int32 nColor ) throw(::com::sun::star::uno::RuntimeException);
     void SAL_CALL setValue( sal_Int32 nValue ) throw(::com::sun::star::uno::RuntimeException);
-    void SAL_CALL setRange( sal_Int32 nMin, sal_Int32 nMax ) throw(::com::sun::star::uno::RuntimeException );
+    void SAL_CALL setRange(	sal_Int32 nMin, sal_Int32 nMax ) throw(::com::sun::star::uno::RuntimeException );
     sal_Int32 SAL_CALL getValue() throw(::com::sun::star::uno::RuntimeException);
 
     // ::com::sun::star::lang::XServiceInfo
@@ -1423,20 +1458,20 @@ public:
 };
 
 
-//  ----------------------------------------------------
-//  class UnoControlFixedLineModel
-//  ----------------------------------------------------
+//	----------------------------------------------------
+//	class UnoControlFixedLineModel
+//	----------------------------------------------------
 class UnoControlFixedLineModel : public UnoControlModel
 {
 protected:
-    ::com::sun::star::uno::Any      ImplGetDefaultValue( sal_uInt16 nPropId ) const;
-    ::cppu::IPropertyArrayHelper&   SAL_CALL getInfoHelper();
+    ::com::sun::star::uno::Any 		ImplGetDefaultValue( sal_uInt16 nPropId ) const;
+    ::cppu::IPropertyArrayHelper& 	SAL_CALL getInfoHelper();
 
 public:
                         UnoControlFixedLineModel();
                         UnoControlFixedLineModel( const UnoControlFixedLineModel& rModel ) : UnoControlModel( rModel ) {;}
 
-    UnoControlModel*    Clone() const { return new UnoControlFixedLineModel( *this ); }
+    UnoControlModel*	Clone() const { return new UnoControlFixedLineModel( *this ); }
 
     // ::com::sun::star::beans::XMultiPropertySet
     ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo(  ) throw(::com::sun::star::uno::RuntimeException);
@@ -1449,14 +1484,14 @@ public:
 
 };
 
-//  ----------------------------------------------------
-//  class UnoFixedLineControl
-//  ----------------------------------------------------
-class UnoFixedLineControl : public UnoControlBase
+//	----------------------------------------------------
+//	class UnoFixedLineControl
+//	----------------------------------------------------
+class UnoFixedLineControl :	public UnoControlBase
 {
 public:
                         UnoFixedLineControl();
-    ::rtl::OUString     GetComponentServiceName();
+    ::rtl::OUString		GetComponentServiceName();
 
     sal_Bool SAL_CALL isTransparent(  ) throw(::com::sun::star::uno::RuntimeException);
 
diff --git a/toolkit/inc/toolkit/dllapi.h b/toolkit/inc/toolkit/dllapi.h
index 02e64153310c..f6536e8c3a98 100644
--- a/toolkit/inc/toolkit/dllapi.h
+++ b/toolkit/inc/toolkit/dllapi.h
@@ -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
diff --git a/toolkit/inc/toolkit/helper/accessibilityclient.hxx b/toolkit/inc/toolkit/helper/accessibilityclient.hxx
index 732e2d76279a..081108c6da5c 100644
--- a/toolkit/inc/toolkit/helper/accessibilityclient.hxx
+++ b/toolkit/inc/toolkit/helper/accessibilityclient.hxx
@@ -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
diff --git a/toolkit/inc/toolkit/helper/accessiblefactory.hxx b/toolkit/inc/toolkit/helper/accessiblefactory.hxx
index f3f28287d460..e39aaae7a300 100644
--- a/toolkit/inc/toolkit/helper/accessiblefactory.hxx
+++ b/toolkit/inc/toolkit/helper/accessiblefactory.hxx
@@ -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
diff --git a/toolkit/inc/toolkit/helper/convert.hxx b/toolkit/inc/toolkit/helper/convert.hxx
index 5de2b8861abf..1d63dc67281b 100644
--- a/toolkit/inc/toolkit/helper/convert.hxx
+++ b/toolkit/inc/toolkit/helper/convert.hxx
@@ -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
@@ -64,4 +64,4 @@ inline ::Rectangle VCLRectangle( const ::com::sun::star::awt::Rectangle& rAWTRec
     return ::Rectangle( ::Point( rAWTRect.X, rAWTRect.Y ), ::Size( rAWTRect.Width, rAWTRect.Height ) );
 }
 
-#endif  // _TOOLKIT_HELPER_CONVERT_HXX_
+#endif	// _TOOLKIT_HELPER_CONVERT_HXX_
diff --git a/toolkit/inc/toolkit/helper/emptyfontdescriptor.hxx b/toolkit/inc/toolkit/helper/emptyfontdescriptor.hxx
index e35b1395eb54..5f47dbd8dabf 100644
--- a/toolkit/inc/toolkit/helper/emptyfontdescriptor.hxx
+++ b/toolkit/inc/toolkit/helper/emptyfontdescriptor.hxx
@@ -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
@@ -33,15 +33,15 @@
 #include <com/sun/star/awt/FontUnderline.hpp>
 #include <com/sun/star/awt/FontStrikeout.hpp>
 
-//  ----------------------------------------------------
-//  class EmptyFontDescriptor
-//  ----------------------------------------------------
-class EmptyFontDescriptor : public ::com::sun::star::awt::FontDescriptor
+//	----------------------------------------------------
+//	class EmptyFontDescriptor
+//	----------------------------------------------------
+class EmptyFontDescriptor : public ::com::sun::star::awt::FontDescriptor 
 {
-public:
+public:	
     EmptyFontDescriptor()
     {
-        // Not all enums are initialized correctly in FontDescriptor-CTOR because
+        // Not all enums are initialized correctly in FontDescriptor-CTOR because 
         // they are set to the first enum value, this is not allways the default value.
         Slant = ::com::sun::star::awt::FontSlant_DONTKNOW;
         Underline = ::com::sun::star::awt::FontUnderline::DONTKNOW;
diff --git a/toolkit/inc/toolkit/helper/externallock.hxx b/toolkit/inc/toolkit/helper/externallock.hxx
index 75246a829790..2971167eec88 100644
--- a/toolkit/inc/toolkit/helper/externallock.hxx
+++ b/toolkit/inc/toolkit/helper/externallock.hxx
@@ -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
@@ -31,7 +31,7 @@
 #include <comphelper/accessiblecontexthelper.hxx>
 
 // -----------------------------------------------------------------------------
-//  class VCLExternalSolarLock
+//	class VCLExternalSolarLock
 // -----------------------------------------------------------------------------
 
 class TOOLKIT_DLLPUBLIC VCLExternalSolarLock : public ::comphelper::IMutex
@@ -41,5 +41,5 @@ public:
     virtual void release();
 };
 
-#endif  // _TOOLKIT_HELPER_EXTERNALLOCK_HXX_
+#endif	// _TOOLKIT_HELPER_EXTERNALLOCK_HXX_
 
diff --git a/toolkit/inc/toolkit/helper/fixedhyperbase.hxx b/toolkit/inc/toolkit/helper/fixedhyperbase.hxx
index 4688e2a3f33d..4f7c4d60969d 100644
--- a/toolkit/inc/toolkit/helper/fixedhyperbase.hxx
+++ b/toolkit/inc/toolkit/helper/fixedhyperbase.hxx
@@ -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
diff --git a/toolkit/inc/toolkit/helper/formpdfexport.hxx b/toolkit/inc/toolkit/helper/formpdfexport.hxx
index 502f25520145..18aea0f8f0bb 100644
--- a/toolkit/inc/toolkit/helper/formpdfexport.hxx
+++ b/toolkit/inc/toolkit/helper/formpdfexport.hxx
@@ -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
diff --git a/toolkit/inc/toolkit/helper/imagealign.hxx b/toolkit/inc/toolkit/helper/imagealign.hxx
index 5d725a692bc6..22d415dea48d 100644
--- a/toolkit/inc/toolkit/helper/imagealign.hxx
+++ b/toolkit/inc/toolkit/helper/imagealign.hxx
@@ -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
diff --git a/toolkit/inc/toolkit/helper/listenermultiplexer.hxx b/toolkit/inc/toolkit/helper/listenermultiplexer.hxx
index b4151fe0f35e..332875232733 100644
--- a/toolkit/inc/toolkit/helper/listenermultiplexer.hxx
+++ b/toolkit/inc/toolkit/helper/listenermultiplexer.hxx
@@ -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
@@ -55,49 +55,49 @@
 #include <toolkit/helper/mutexhelper.hxx>
 #include <toolkit/helper/macros.hxx>
 #include <com/sun/star/awt/grid/XGridSelectionListener.hpp>
-//  ----------------------------------------------------
-//  class ListenerMultiplexerBase
-//  ----------------------------------------------------
+//	----------------------------------------------------
+//	class ListenerMultiplexerBase
+//	----------------------------------------------------
 
 class TOOLKIT_DLLPUBLIC ListenerMultiplexerBase : public MutexHelper,
                                 public ::cppu::OInterfaceContainerHelper,
                                 public ::com::sun::star::uno::XInterface
 {
 private:
-    ::cppu::OWeakObject&    mrContext;
+    ::cppu::OWeakObject&	mrContext;
 
 protected:
-    ::cppu::OWeakObject&    GetContext() { return mrContext; }
+    ::cppu::OWeakObject&	GetContext() { return mrContext; }
 
 public:
     ListenerMultiplexerBase( ::cppu::OWeakObject& rSource );
     virtual ~ListenerMultiplexerBase();
 
     // ::com::sun::star::uno::XInterface
-    ::com::sun::star::uno::Any  SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException);
-    void                        SAL_CALL acquire() throw()  { mrContext.acquire(); }
-    void                        SAL_CALL release() throw()  { mrContext.release(); }
+    ::com::sun::star::uno::Any	SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException);
+    void						SAL_CALL acquire() throw()	{ mrContext.acquire(); }
+    void						SAL_CALL release() throw()	{ mrContext.release(); }
 };
 
 
-//  ----------------------------------------------------
-//  class EventListenerMultiplexer
-//  ----------------------------------------------------
+//	----------------------------------------------------
+//	class EventListenerMultiplexer
+//	----------------------------------------------------
 DECL_LISTENERMULTIPLEXER_START( EventListenerMultiplexer, ::com::sun::star::lang::XEventListener )
 DECL_LISTENERMULTIPLEXER_END
 
-//  ----------------------------------------------------
-//  class FocusListenerMultiplexer
-//  ----------------------------------------------------
+//	----------------------------------------------------
+//	class FocusListenerMultiplexer
+//	----------------------------------------------------
 DECL_LISTENERMULTIPLEXER_START( FocusListenerMultiplexer, ::com::sun::star::awt::XFocusListener )
     void SAL_CALL focusGained( const ::com::sun::star::awt::FocusEvent& e ) throw(::com::sun::star::uno::RuntimeException);
     void SAL_CALL focusLost( const ::com::sun::star::awt::FocusEvent& e ) throw(::com::sun::star::uno::RuntimeException);
 DECL_LISTENERMULTIPLEXER_END
 
 
-//  ----------------------------------------------------
-//  class WindowListenerMultiplexer
-//  ----------------------------------------------------
+//	----------------------------------------------------
+//	class WindowListenerMultiplexer
+//	----------------------------------------------------
 DECL_LISTENERMULTIPLEXER_START( WindowListenerMultiplexer, ::com::sun::star::awt::XWindowListener )
     void SAL_CALL windowResized( const ::com::sun::star::awt::WindowEvent& e ) throw(::com::sun::star::uno::RuntimeException);
     void SAL_CALL windowMoved( const ::com::sun::star::awt::WindowEvent& e ) throw(::com::sun::star::uno::RuntimeException);
@@ -107,25 +107,25 @@ DECL_LISTENERMULTIPLEXER_END
 
 
 
-//  ----------------------------------------------------
-//  class VclContainerListenerMultiplexer
-//  ----------------------------------------------------
+//	----------------------------------------------------
+//	class VclContainerListenerMultiplexer
+//	----------------------------------------------------
 DECL_LISTENERMULTIPLEXER_START( VclContainerListenerMultiplexer, ::com::sun::star::awt::XVclContainerListener )
     void SAL_CALL windowAdded( const ::com::sun::star::awt::VclContainerEvent& e ) throw(::com::sun::star::uno::RuntimeException);
     void SAL_CALL windowRemoved( const ::com::sun::star::awt::VclContainerEvent& e ) throw(::com::sun::star::uno::RuntimeException);
 DECL_LISTENERMULTIPLEXER_END
 
-//  ----------------------------------------------------
-//  class KeyListenerMultiplexer
-//  ----------------------------------------------------
+//	----------------------------------------------------
+//	class KeyListenerMultiplexer
+//	----------------------------------------------------
 DECL_LISTENERMULTIPLEXER_START( KeyListenerMultiplexer, ::com::sun::star::awt::XKeyListener )
     void SAL_CALL keyPressed( const ::com::sun::star::awt::KeyEvent& e ) throw(::com::sun::star::uno::RuntimeException);
     void SAL_CALL keyReleased( const ::com::sun::star::awt::KeyEvent& e ) throw(::com::sun::star::uno::RuntimeException);
 DECL_LISTENERMULTIPLEXER_END
 
-//  ----------------------------------------------------
-//  class MouseListenerMultiplexer
-//  ----------------------------------------------------
+//	----------------------------------------------------
+//	class MouseListenerMultiplexer
+//	----------------------------------------------------
 DECL_LISTENERMULTIPLEXER_START_DLLPUB( MouseListenerMultiplexer, ::com::sun::star::awt::XMouseListener )
     void SAL_CALL mousePressed( const ::com::sun::star::awt::MouseEvent& e ) throw(::com::sun::star::uno::RuntimeException);
     void SAL_CALL mouseReleased( const ::com::sun::star::awt::MouseEvent& e ) throw(::com::sun::star::uno::RuntimeException);
@@ -133,24 +133,24 @@ DECL_LISTENERMULTIPLEXER_START_DLLPUB( MouseListenerMultiplexer, ::com::sun::sta
     void SAL_CALL mouseExited( const ::com::sun::star::awt::MouseEvent& e ) throw(::com::sun::star::uno::RuntimeException);
 DECL_LISTENERMULTIPLEXER_END
 
-//  ----------------------------------------------------
-//  class MouseMotionListenerMultiplexer
-//  ----------------------------------------------------
+//	----------------------------------------------------
+//	class MouseMotionListenerMultiplexer
+//	----------------------------------------------------
 DECL_LISTENERMULTIPLEXER_START( MouseMotionListenerMultiplexer, ::com::sun::star::awt::XMouseMotionListener )
     void SAL_CALL mouseDragged( const ::com::sun::star::awt::MouseEvent& e ) throw(::com::sun::star::uno::RuntimeException);
     void SAL_CALL mouseMoved( const ::com::sun::star::awt::MouseEvent& e ) throw(::com::sun::star::uno::RuntimeException);
 DECL_LISTENERMULTIPLEXER_END
 
-//  ----------------------------------------------------
-//  class PaintListenerMultiplexer
-//  ----------------------------------------------------
+//	----------------------------------------------------
+//	class PaintListenerMultiplexer
+//	----------------------------------------------------
 DECL_LISTENERMULTIPLEXER_START( PaintListenerMultiplexer, ::com::sun::star::awt::XPaintListener )
     void SAL_CALL windowPaint( const ::com::sun::star::awt::PaintEvent& e ) throw(::com::sun::star::uno::RuntimeException);
 DECL_LISTENERMULTIPLEXER_END
 
-//  ----------------------------------------------------
-//  class TopWindowListenerMultiplexer
-//  ----------------------------------------------------
+//	----------------------------------------------------
+//	class TopWindowListenerMultiplexer
+//	----------------------------------------------------
 DECL_LISTENERMULTIPLEXER_START( TopWindowListenerMultiplexer, ::com::sun::star::awt::XTopWindowListener )
     void SAL_CALL windowOpened( const ::com::sun::star::lang::EventObject& e ) throw(::com::sun::star::uno::RuntimeException);
     void SAL_CALL windowClosing( const ::com::sun::star::lang::EventObject& e ) throw(::com::sun::star::uno::RuntimeException);
@@ -161,39 +161,39 @@ DECL_LISTENERMULTIPLEXER_START( TopWindowListenerMultiplexer, ::com::sun::star::
     void SAL_CALL windowDeactivated( const ::com::sun::star::lang::EventObject& e ) throw(::com::sun::star::uno::RuntimeException);
 DECL_LISTENERMULTIPLEXER_END
 
-//  ----------------------------------------------------
-//  class TextListenerMultiplexer
-//  ----------------------------------------------------
+//	----------------------------------------------------
+//	class TextListenerMultiplexer
+//	----------------------------------------------------
 DECL_LISTENERMULTIPLEXER_START_DLLPUB( TextListenerMultiplexer, ::com::sun::star::awt::XTextListener )
     void SAL_CALL textChanged( const ::com::sun::star::awt::TextEvent& rEvent ) throw(::com::sun::star::uno::RuntimeException);
 DECL_LISTENERMULTIPLEXER_END
 
-//  ----------------------------------------------------
-//  class ActionListenerMultiplexer
-//  ----------------------------------------------------
+//	----------------------------------------------------
+//	class ActionListenerMultiplexer
+//	----------------------------------------------------
 DECL_LISTENERMULTIPLEXER_START_DLLPUB( ActionListenerMultiplexer, ::com::sun::star::awt::XActionListener )
     void SAL_CALL actionPerformed( const ::com::sun::star::awt::ActionEvent& rEvent ) throw(::com::sun::star::uno::RuntimeException);
 DECL_LISTENERMULTIPLEXER_END
 
-//  ----------------------------------------------------
-//  class ItemListenerMultiplexer
-//  ----------------------------------------------------
+//	----------------------------------------------------
+//	class ItemListenerMultiplexer
+//	----------------------------------------------------
 DECL_LISTENERMULTIPLEXER_START_DLLPUB( ItemListenerMultiplexer, ::com::sun::star::awt::XItemListener )
     void SAL_CALL itemStateChanged( const ::com::sun::star::awt::ItemEvent& rEvent ) throw(::com::sun::star::uno::RuntimeException);
 DECL_LISTENERMULTIPLEXER_END
 
-//  ----------------------------------------------------
-//  class ContainerListenerMultiplexer
-//  ----------------------------------------------------
+//	----------------------------------------------------
+//	class ContainerListenerMultiplexer
+//	----------------------------------------------------
 DECL_LISTENERMULTIPLEXER_START( ContainerListenerMultiplexer, ::com::sun::star::container::XContainerListener )
     void SAL_CALL elementInserted( const ::com::sun::star::container::ContainerEvent& Event ) throw(::com::sun::star::uno::RuntimeException);
     void SAL_CALL elementRemoved( const ::com::sun::star::container::ContainerEvent& Event ) throw(::com::sun::star::uno::RuntimeException);
     void SAL_CALL elementReplaced( const ::com::sun::star::container::ContainerEvent& Event ) throw(::com::sun::star::uno::RuntimeException);
 DECL_LISTENERMULTIPLEXER_END
 
-//  ----------------------------------------------------
-//  class SpinListenerMultiplexer
-//  ----------------------------------------------------
+//	----------------------------------------------------
+//	class SpinListenerMultiplexer
+//	----------------------------------------------------
 DECL_LISTENERMULTIPLEXER_START_DLLPUB( SpinListenerMultiplexer, ::com::sun::star::awt::XSpinListener )
     void SAL_CALL up( const ::com::sun::star::awt::SpinEvent& rEvent ) throw(::com::sun::star::uno::RuntimeException);
     void SAL_CALL down( const ::com::sun::star::awt::SpinEvent& rEvent ) throw(::com::sun::star::uno::RuntimeException);
@@ -201,16 +201,16 @@ DECL_LISTENERMULTIPLEXER_START_DLLPUB( SpinListenerMultiplexer, ::com::sun::star
     void SAL_CALL last( const ::com::sun::star::awt::SpinEvent& rEvent ) throw(::com::sun::star::uno::RuntimeException);
 DECL_LISTENERMULTIPLEXER_END
 
-//  ----------------------------------------------------
-//  class AdjustmentListenerMultiplexer
-//  ----------------------------------------------------
+//	----------------------------------------------------
+//	class AdjustmentListenerMultiplexer
+//	----------------------------------------------------
 DECL_LISTENERMULTIPLEXER_START( AdjustmentListenerMultiplexer, ::com::sun::star::awt::XAdjustmentListener )
     void SAL_CALL adjustmentValueChanged( const ::com::sun::star::awt::AdjustmentEvent& rEvent ) throw(::com::sun::star::uno::RuntimeException);
 DECL_LISTENERMULTIPLEXER_END
 
-//  ----------------------------------------------------
-//  class MenuListenerMultiplexer
-//  ----------------------------------------------------
+//	----------------------------------------------------
+//	class MenuListenerMultiplexer
+//	----------------------------------------------------
 DECL_LISTENERMULTIPLEXER_START( MenuListenerMultiplexer, ::com::sun::star::awt::XMenuListener )
     void SAL_CALL highlight( const ::com::sun::star::awt::MenuEvent& rEvent ) throw(::com::sun::star::uno::RuntimeException);
     void SAL_CALL select( const ::com::sun::star::awt::MenuEvent& rEvent ) throw(::com::sun::star::uno::RuntimeException);
@@ -218,16 +218,16 @@ DECL_LISTENERMULTIPLEXER_START( MenuListenerMultiplexer, ::com::sun::star::awt::
     void SAL_CALL deactivate( const ::com::sun::star::awt::MenuEvent& rEvent ) throw(::com::sun::star::uno::RuntimeException);
 DECL_LISTENERMULTIPLEXER_END
 
-//  ----------------------------------------------------
-//  class TreeSelectionListenerMultiplexer
-//  ----------------------------------------------------
+//	----------------------------------------------------
+//	class TreeSelectionListenerMultiplexer
+//	----------------------------------------------------
 DECL_LISTENERMULTIPLEXER_START_DLLPUB( TreeSelectionListenerMultiplexer, ::com::sun::star::view::XSelectionChangeListener )
     virtual void SAL_CALL selectionChanged( const ::com::sun::star::lang::EventObject& aEvent ) throw (::com::sun::star::uno::RuntimeException);
 DECL_LISTENERMULTIPLEXER_END
 
-//  ----------------------------------------------------
-//  class TreeExpansionListenerMultiplexer
-//  ----------------------------------------------------
+//	----------------------------------------------------
+//	class TreeExpansionListenerMultiplexer
+//	----------------------------------------------------
 DECL_LISTENERMULTIPLEXER_START_DLLPUB( TreeExpansionListenerMultiplexer, ::com::sun::star::awt::tree::XTreeExpansionListener )
     virtual void SAL_CALL requestChildNodes( const ::com::sun::star::awt::tree::TreeExpansionEvent& aEvent ) throw (::com::sun::star::uno::RuntimeException);
     virtual void SAL_CALL treeExpanding( const ::com::sun::star::awt::tree::TreeExpansionEvent& aEvent ) throw (::com::sun::star::awt::tree::ExpandVetoException, ::com::sun::star::uno::RuntimeException);
@@ -236,17 +236,17 @@ DECL_LISTENERMULTIPLEXER_START_DLLPUB( TreeExpansionListenerMultiplexer, ::com::
     virtual void SAL_CALL treeCollapsed( const ::com::sun::star::awt::tree::TreeExpansionEvent& aEvent ) throw (::com::sun::star::uno::RuntimeException);
 DECL_LISTENERMULTIPLEXER_END
 
-//  ----------------------------------------------------
-//  class TreeEditListenerMultiplexer
-//  ----------------------------------------------------
+//	----------------------------------------------------
+//	class TreeEditListenerMultiplexer
+//	----------------------------------------------------
 DECL_LISTENERMULTIPLEXER_START_DLLPUB( TreeEditListenerMultiplexer, ::com::sun::star::awt::tree::XTreeEditListener )
     virtual void SAL_CALL nodeEditing( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::tree::XTreeNode >& Node ) throw (::com::sun::star::uno::RuntimeException,::com::sun::star::util::VetoException);
     virtual void SAL_CALL nodeEdited( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::tree::XTreeNode >& Node, const ::rtl::OUString& NewText ) throw (::com::sun::star::uno::RuntimeException);
 DECL_LISTENERMULTIPLEXER_END
 
-//  ----------------------------------------------------
-//  class SelectionListenerMultiplexer
-//  ----------------------------------------------------
+//	----------------------------------------------------
+//	class SelectionListenerMultiplexer
+//	----------------------------------------------------
 DECL_LISTENERMULTIPLEXER_START_DLLPUB( SelectionListenerMultiplexer, ::com::sun::star::awt::grid::XGridSelectionListener )
     void SAL_CALL selectionChanged( const ::com::sun::star::awt::grid::GridSelectionEvent& aEvent ) throw (::com::sun::star::uno::RuntimeException);
 DECL_LISTENERMULTIPLEXER_END
diff --git a/toolkit/inc/toolkit/helper/macros.hxx b/toolkit/inc/toolkit/helper/macros.hxx
index 48386d9a404c..6ad74d0357d3 100644
--- a/toolkit/inc/toolkit/helper/macros.hxx
+++ b/toolkit/inc/toolkit/helper/macros.hxx
@@ -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
@@ -92,7 +92,7 @@ ClassName* ClassName::GetImplementation( const ::com::sun::star::uno::Reference<
 
 // -------------------------------------------------------------------------------------
 
-#define IMPL_IMPLEMENTATION_ID( ClassName ) \
+#define IMPL_IMPLEMENTATION_ID( ClassName )	\
 ::com::sun::star::uno::Sequence< sal_Int8 > ClassName::getImplementationId() throw(::com::sun::star::uno::RuntimeException) \
 { \
     static ::cppu::OImplementationId* pId = NULL; \
@@ -108,7 +108,7 @@ ClassName* ClassName::GetImplementation( const ::com::sun::star::uno::Reference<
     return (*pId).getImplementationId(); \
 }
 
-#define IMPL_XTYPEPROVIDER_START( ClassName )   \
+#define IMPL_XTYPEPROVIDER_START( ClassName )	\
 IMPL_IMPLEMENTATION_ID( ClassName ) \
 ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > ClassName::getTypes() throw(::com::sun::star::uno::RuntimeException) \
 { \
@@ -138,10 +138,10 @@ class ClassName : public ListenerMultiplexerBase, public InterfaceName \
 { \
 public: \
     ClassName( ::cppu::OWeakObject& rSource ); \
-    ::com::sun::star::uno::Any  SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException); \
-    void                        SAL_CALL acquire() throw()  { ListenerMultiplexerBase::acquire(); } \
-    void                        SAL_CALL release() throw()  { ListenerMultiplexerBase::release(); } \
-    void                        SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw(::com::sun::star::uno::RuntimeException);
+    ::com::sun::star::uno::Any	SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException); \
+    void						SAL_CALL acquire() throw()	{ ListenerMultiplexerBase::acquire(); } \
+    void						SAL_CALL release() throw()	{ ListenerMultiplexerBase::release(); } \
+    void						SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw(::com::sun::star::uno::RuntimeException);
 
 // -------------------------------------------------------------------------------------
 
@@ -150,10 +150,10 @@ class TOOLKIT_DLLPUBLIC ClassName : public ListenerMultiplexerBase, public Inter
 { \
 public: \
     ClassName( ::cppu::OWeakObject& rSource ); \
-    ::com::sun::star::uno::Any  SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException); \
-    void                        SAL_CALL acquire() throw()  { ListenerMultiplexerBase::acquire(); } \
-    void                        SAL_CALL release() throw()  { ListenerMultiplexerBase::release(); } \
-    void                        SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw(::com::sun::star::uno::RuntimeException);
+    ::com::sun::star::uno::Any	SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException); \
+    void						SAL_CALL acquire() throw()	{ ListenerMultiplexerBase::acquire(); } \
+    void						SAL_CALL release() throw()	{ ListenerMultiplexerBase::release(); } \
+    void						SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw(::com::sun::star::uno::RuntimeException);
 
 // -------------------------------------------------------------------------------------
 
@@ -241,7 +241,7 @@ IMPL_LISTENERMULTIPLEXER_LISTENERMETHOD_BODY( ClassName, InterfaceName, MethodNa
 
 #define DECLIMPL_SERVICEINFO_DERIVED( ImplName, BaseClass, ServiceName ) \
     ::rtl::OUString SAL_CALL getImplementationName(  ) throw(::com::sun::star::uno::RuntimeException) { return ::rtl::OUString::createFromAscii( "stardiv.Toolkit." #ImplName ); } \
-    ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException)   \
+    ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException)	\
                             { \
                                 ::com::sun::star::uno::Sequence< ::rtl::OUString > aNames = BaseClass::getSupportedServiceNames( ); \
                                 aNames.realloc( aNames.getLength() + 1 ); \
@@ -253,7 +253,7 @@ IMPL_LISTENERMULTIPLEXER_LISTENERMETHOD_BODY( ClassName, InterfaceName, MethodNa
 
 #define DECLIMPL_SERVICEINFO( ImplName, ServiceName ) \
     ::rtl::OUString SAL_CALL getImplementationName(  ) throw(::com::sun::star::uno::RuntimeException) { return ::rtl::OUString::createFromAscii( "stardiv.Toolkit." #ImplName ); } \
-    ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException)   \
+    ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException)	\
                             { \
                                 ::com::sun::star::uno::Sequence< ::rtl::OUString > aNames( 1 ); \
                                 aNames[ 0 ] = ::rtl::OUString::createFromAscii( ServiceName ); \
diff --git a/toolkit/inc/toolkit/helper/mutexandbroadcasthelper.hxx b/toolkit/inc/toolkit/helper/mutexandbroadcasthelper.hxx
index c84a6e54d73b..585af217d5a7 100644
--- a/toolkit/inc/toolkit/helper/mutexandbroadcasthelper.hxx
+++ b/toolkit/inc/toolkit/helper/mutexandbroadcasthelper.hxx
@@ -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
@@ -34,17 +34,17 @@
 // Helper class with Mutex and BroadcastHelper, because they must be
 // initialized before calling the OPropertySetHelper-CTOR
 
-class MutexAndBroadcastHelper
+class MutexAndBroadcastHelper 
 {
 public:
     MutexAndBroadcastHelper() : BrdcstHelper( Mutex ) {}
 
-
-    ::osl::Mutex                Mutex;
-    ::cppu::OBroadcastHelper    BrdcstHelper;
-
-    ::osl::Mutex&               GetMutex() { return Mutex; }
-
+    
+    ::osl::Mutex				Mutex;
+    ::cppu::OBroadcastHelper	BrdcstHelper;
+    
+    ::osl::Mutex&				GetMutex() { return Mutex; }
+    
 };
 
 
@@ -52,6 +52,6 @@ public:
 
 
 
-#endif  // _TOOLKIT_HELPER_MUTEXANDBROADCASTHELPER_HXX
+#endif	// _TOOLKIT_HELPER_MUTEXANDBROADCASTHELPER_HXX
 
 
diff --git a/toolkit/inc/toolkit/helper/mutexhelper.hxx b/toolkit/inc/toolkit/helper/mutexhelper.hxx
index 43d5e77b353e..05e63007b0e5 100644
--- a/toolkit/inc/toolkit/helper/mutexhelper.hxx
+++ b/toolkit/inc/toolkit/helper/mutexhelper.hxx
@@ -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
@@ -30,11 +30,11 @@
 
 #include <osl/mutex.hxx>
 
-//  ----------------------------------------------------
-//  class MutexHelper
-//  ----------------------------------------------------
+//	----------------------------------------------------
+//	class MutexHelper
+//	----------------------------------------------------
 
-class MutexHelper
+class MutexHelper 
 {
 private:
     ::osl::Mutex maMutex;
diff --git a/toolkit/inc/toolkit/helper/property.hxx b/toolkit/inc/toolkit/helper/property.hxx
index 837d283f4e8c..2fb64b2751ec 100644
--- a/toolkit/inc/toolkit/helper/property.hxx
+++ b/toolkit/inc/toolkit/helper/property.hxx
@@ -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
@@ -45,102 +45,102 @@ namespace rtl {
 }
 
 
-#define BASEPROPERTY_NOTFOUND                        0
-
-#define BASEPROPERTY_TEXT                            1  // ::rtl::OUString
-#define BASEPROPERTY_BACKGROUNDCOLOR                 2  // sal_Int32
-#define BASEPROPERTY_FILLCOLOR                       3  // sal_Int32
-#define BASEPROPERTY_TEXTCOLOR                       4  // sal_Int32
-#define BASEPROPERTY_LINECOLOR                       5  // sal_Int32
-#define BASEPROPERTY_BORDER                          6  // sal_Int16
-#define BASEPROPERTY_ALIGN                           7  // sal_Int16
-#define BASEPROPERTY_FONTDESCRIPTOR                  8  // ::com::sun::star::awt::FontDescriptor, war mal Font, aber nie gespeichert...
-#define BASEPROPERTY_DROPDOWN                        9  // sal_Bool
-#define BASEPROPERTY_MULTILINE                       10 // sal_Bool
-#define BASEPROPERTY_STRINGITEMLIST                  11 // UStringSequence
-#define BASEPROPERTY_HSCROLL                         12 // sal_Bool
-#define BASEPROPERTY_VSCROLL                         13 // sal_Bool
-#define BASEPROPERTY_TABSTOP                         14 // sal_Bool
-#define BASEPROPERTY_STATE                           15 // sal_Int16
-#define BASEPROPERTY_FONT_TYPE                       16 // OLD: Font_Type
-#define BASEPROPERTY_FONT_SIZE                       17 // OLD: Font_Size
-#define BASEPROPERTY_FONT_ATTRIBS                    18 // OLD: Font_Attribs
-#define BASEPROPERTY_DEFAULTCONTROL                  19 // ::rtl::OUString (ServiceName)
-#define BASEPROPERTY_LABEL                           20 // ::rtl::OUString
-#define BASEPROPERTY_LINECOUNT                       21 // sal_Int16
-#define BASEPROPERTY_EXTDATEFORMAT                   22 // sal_Int16
-#define BASEPROPERTY_DATESHOWCENTURY                 23 // sal_Bool
-#define BASEPROPERTY_EXTTIMEFORMAT                   24 // sal_Int16
-#define BASEPROPERTY_NUMSHOWTHOUSANDSEP              25 // sal_Bool
-#define BASEPROPERTY_CURRENCYSYMBOL                  26 // ::rtl::OUString
-#define BASEPROPERTY_SPIN                            27 // sal_Bool
-#define BASEPROPERTY_STRICTFORMAT                    28 // sal_Bool
-#define BASEPROPERTY_DECIMALACCURACY                 29 // sal_Int16
-#define BASEPROPERTY_DATE                            30 // sal_Int32
-#define BASEPROPERTY_DATEMIN                         31 // sal_Int32
-#define BASEPROPERTY_DATEMAX                         32 // sal_Int32
-#define BASEPROPERTY_TIME                            33 // sal_Int32
-#define BASEPROPERTY_TIMEMIN                         34 // sal_Int32
-#define BASEPROPERTY_TIMEMAX                         35 // sal_Int32
-#define BASEPROPERTY_VALUE_INT32                     36 // sal_Int32
-#define BASEPROPERTY_VALUEMIN_INT32                  37 // sal_Int32
-#define BASEPROPERTY_VALUEMAX_INT32                  38 // sal_Int32
-#define BASEPROPERTY_VALUESTEP_INT32                 39 // sal_Int32
-#define BASEPROPERTY_EDITMASK                        40 // ::rtl::OUString
-#define BASEPROPERTY_LITERALMASK                     41 // ::rtl::OUString
-#define BASEPROPERTY_IMAGEURL                        42 // ::rtl::OUString
-#define BASEPROPERTY_READONLY                        43 // sal_Bool
-#define BASEPROPERTY_ENABLED                         44 // sal_Bool
-#define BASEPROPERTY_PRINTABLE                       45 // sal_Bool
-#define BASEPROPERTY_ECHOCHAR                        46 // sal_Int16
-#define BASEPROPERTY_MAXTEXTLEN                      47 // sal_Int16
-#define BASEPROPERTY_HARDLINEBREAKS                  48 // sal_Int16
-#define BASEPROPERTY_AUTOCOMPLETE                    49 // sal_Bool
-#define BASEPROPERTY_MULTISELECTION                  50 // sal_Bool
-#define BASEPROPERTY_SELECTEDITEMS                   51 // INT16Sequence
-#define BASEPROPERTY_VALUE_DOUBLE                    52 // DOUBLE
-#define BASEPROPERTY_VALUEMIN_DOUBLE                 53 // DOUBLE
-#define BASEPROPERTY_VALUEMAX_DOUBLE                 54 // DOUBLE
-#define BASEPROPERTY_VALUESTEP_DOUBLE                55 // DOUBLE
-#define BASEPROPERTY_TRISTATE                        56 // sal_Bool
-#define BASEPROPERTY_DEFAULTBUTTON                   57 // sal_Bool
-#define BASEPROPERTY_HELPURL                         58 // ::rtl::OUString
-#define BASEPROPERTY_AUTOTOGGLE                      59 // sal_Bool
-//#define BASEPROPERTY_FOCUSSELECTIONHIDE            60 // sal_Bool
-#define BASEPROPERTY_FORMATKEY                       61 // sal_Bool
-#define BASEPROPERTY_FORMATSSUPPLIER                 62 // ::com::sun::star::util::XNumberFormatsSupplier
-#define BASEPROPERTY_EFFECTIVE_VALUE                 63 // Any (double or string)
-#define BASEPROPERTY_TREATASNUMBER                   64 // sal_Bool
-#define BASEPROPERTY_EFFECTIVE_DEFAULT               65 // Any (double or string)
-#define BASEPROPERTY_EFFECTIVE_MIN                   66 // Double
-#define BASEPROPERTY_EFFECTIVE_MAX                   67 // Double
-#define BASEPROPERTY_CURSYM_POSITION                 68 // sal_Bool
-#define BASEPROPERTY_TITLE                           69 // ::rtl::OUString
-#define BASEPROPERTY_MOVEABLE                        70 // sal_Bool
-#define BASEPROPERTY_CLOSEABLE                       71 // sal_Bool
-#define BASEPROPERTY_SIZEABLE                        72 // sal_Bool
-#define BASEPROPERTY_HELPTEXT                        73 // ::rtl::OUString
-#define BASEPROPERTY_PROGRESSVALUE                   74 // sal_Int32
-#define BASEPROPERTY_PROGRESSVALUE_MIN               75 // sal_Int32
-#define BASEPROPERTY_PROGRESSVALUE_MAX               76 // sal_Int32
-#define BASEPROPERTY_SCROLLVALUE                     77 // sal_Int32
-#define BASEPROPERTY_SCROLLVALUE_MAX                 78 // sal_Int32
-#define BASEPROPERTY_LINEINCREMENT                   79 // sal_Int32
-#define BASEPROPERTY_BLOCKINCREMENT                  80 // sal_Int32
-#define BASEPROPERTY_VISIBLESIZE                     81 // sal_Int32
-#define BASEPROPERTY_ORIENTATION                     82 // sal_Int32
-#define BASEPROPERTY_FONTRELIEF                      83 // sal_Int16
-#define BASEPROPERTY_FONTEMPHASISMARK                84 // sal_Int16
-#define BASEPROPERTY_TEXTLINECOLOR                   85 // sal_Int32
-#define BASEPROPERTY_IMAGEALIGN                      86 // sal_Int16
-#define BASEPROPERTY_SCALEIMAGE                      87 // sal_Bool
-#define BASEPROPERTY_PUSHBUTTONTYPE                  88 // sal_Int16
-#define BASEPROPERTY_DISPLAYBACKGROUNDCOLOR          89 // sal_Int32
-#define BASEPROPERTY_AUTOMNEMONICS                   90 // sal_Bool
-#define BASEPROPERTY_MOUSETRANSPARENT                91 // sal_Bool
+#define BASEPROPERTY_NOTFOUND				         0
+
+#define BASEPROPERTY_TEXT					         1	// ::rtl::OUString
+#define BASEPROPERTY_BACKGROUNDCOLOR		         2	// sal_Int32
+#define BASEPROPERTY_FILLCOLOR				         3	// sal_Int32
+#define BASEPROPERTY_TEXTCOLOR			             4	// sal_Int32
+#define BASEPROPERTY_LINECOLOR				         5	// sal_Int32
+#define BASEPROPERTY_BORDER				 	         6	// sal_Int16
+#define BASEPROPERTY_ALIGN					         7	// sal_Int16
+#define BASEPROPERTY_FONTDESCRIPTOR			         8	// ::com::sun::star::awt::FontDescriptor, war mal Font, aber nie gespeichert...
+#define BASEPROPERTY_DROPDOWN				         9	// sal_Bool
+#define BASEPROPERTY_MULTILINE				         10	// sal_Bool
+#define BASEPROPERTY_STRINGITEMLIST			         11	// UStringSequence
+#define BASEPROPERTY_HSCROLL				         12	// sal_Bool
+#define BASEPROPERTY_VSCROLL				         13	// sal_Bool
+#define BASEPROPERTY_TABSTOP				         14	// sal_Bool
+#define BASEPROPERTY_STATE					         15	// sal_Int16
+#define BASEPROPERTY_FONT_TYPE				         16	// OLD: Font_Type
+#define BASEPROPERTY_FONT_SIZE				         17	// OLD: Font_Size
+#define BASEPROPERTY_FONT_ATTRIBS			         18	// OLD: Font_Attribs
+#define BASEPROPERTY_DEFAULTCONTROL			         19	// ::rtl::OUString (ServiceName)
+#define BASEPROPERTY_LABEL					         20	// ::rtl::OUString
+#define BASEPROPERTY_LINECOUNT				         21	// sal_Int16
+#define BASEPROPERTY_EXTDATEFORMAT			         22	// sal_Int16
+#define BASEPROPERTY_DATESHOWCENTURY                 23	// sal_Bool
+#define BASEPROPERTY_EXTTIMEFORMAT			         24	// sal_Int16
+#define BASEPROPERTY_NUMSHOWTHOUSANDSEP		         25	// sal_Bool
+#define BASEPROPERTY_CURRENCYSYMBOL			         26	// ::rtl::OUString
+#define BASEPROPERTY_SPIN					         27	// sal_Bool
+#define BASEPROPERTY_STRICTFORMAT			         28	// sal_Bool
+#define BASEPROPERTY_DECIMALACCURACY		         29	// sal_Int16
+#define BASEPROPERTY_DATE					         30	// sal_Int32
+#define BASEPROPERTY_DATEMIN                         31	// sal_Int32
+#define BASEPROPERTY_DATEMAX                         32	// sal_Int32
+#define BASEPROPERTY_TIME					         33	// sal_Int32
+#define BASEPROPERTY_TIMEMIN                         34	// sal_Int32
+#define BASEPROPERTY_TIMEMAX                         35	// sal_Int32
+#define BASEPROPERTY_VALUE_INT32			         36	// sal_Int32
+#define BASEPROPERTY_VALUEMIN_INT32			         37	// sal_Int32
+#define BASEPROPERTY_VALUEMAX_INT32			         38	// sal_Int32
+#define BASEPROPERTY_VALUESTEP_INT32		         39	// sal_Int32
+#define BASEPROPERTY_EDITMASK				         40	// ::rtl::OUString
+#define BASEPROPERTY_LITERALMASK			         41	// ::rtl::OUString
+#define BASEPROPERTY_IMAGEURL				         42	// ::rtl::OUString
+#define BASEPROPERTY_READONLY				         43	// sal_Bool
+#define BASEPROPERTY_ENABLED				         44	// sal_Bool
+#define BASEPROPERTY_PRINTABLE				         45	// sal_Bool
+#define BASEPROPERTY_ECHOCHAR				         46	// sal_Int16
+#define BASEPROPERTY_MAXTEXTLEN				         47	// sal_Int16
+#define BASEPROPERTY_HARDLINEBREAKS			         48	// sal_Int16
+#define BASEPROPERTY_AUTOCOMPLETE			         49	// sal_Bool
+#define BASEPROPERTY_MULTISELECTION			         50	// sal_Bool
+#define BASEPROPERTY_SELECTEDITEMS			         51	// INT16Sequence
+#define BASEPROPERTY_VALUE_DOUBLE			         52	// DOUBLE
+#define BASEPROPERTY_VALUEMIN_DOUBLE		         53	// DOUBLE
+#define BASEPROPERTY_VALUEMAX_DOUBLE		         54	// DOUBLE
+#define BASEPROPERTY_VALUESTEP_DOUBLE		         55	// DOUBLE
+#define BASEPROPERTY_TRISTATE				         56	// sal_Bool
+#define BASEPROPERTY_DEFAULTBUTTON			         57	// sal_Bool
+#define BASEPROPERTY_HELPURL				         58	// ::rtl::OUString
+#define BASEPROPERTY_AUTOTOGGLE				         59	// sal_Bool
+//#define BASEPROPERTY_FOCUSSELECTIONHIDE		     60	// sal_Bool
+#define BASEPROPERTY_FORMATKEY				         61	// sal_Bool
+#define BASEPROPERTY_FORMATSSUPPLIER		         62	// ::com::sun::star::util::XNumberFormatsSupplier
+#define BASEPROPERTY_EFFECTIVE_VALUE		         63	// Any (double or string)
+#define BASEPROPERTY_TREATASNUMBER			         64	// sal_Bool
+#define BASEPROPERTY_EFFECTIVE_DEFAULT		         65	// Any (double or string)
+#define BASEPROPERTY_EFFECTIVE_MIN			         66	// Double
+#define BASEPROPERTY_EFFECTIVE_MAX			         67	// Double
+#define BASEPROPERTY_CURSYM_POSITION		         68	// sal_Bool
+#define BASEPROPERTY_TITLE					         69	// ::rtl::OUString
+#define BASEPROPERTY_MOVEABLE				         70	// sal_Bool
+#define BASEPROPERTY_CLOSEABLE				         71	// sal_Bool
+#define BASEPROPERTY_SIZEABLE				         72	// sal_Bool
+#define BASEPROPERTY_HELPTEXT				         73	// ::rtl::OUString
+#define BASEPROPERTY_PROGRESSVALUE  	             74	// sal_Int32
+#define BASEPROPERTY_PROGRESSVALUE_MIN 	             75	// sal_Int32
+#define BASEPROPERTY_PROGRESSVALUE_MAX 	             76	// sal_Int32
+#define BASEPROPERTY_SCROLLVALUE	 	             77	// sal_Int32
+#define BASEPROPERTY_SCROLLVALUE_MAX 	             78	// sal_Int32
+#define BASEPROPERTY_LINEINCREMENT	 	             79	// sal_Int32
+#define BASEPROPERTY_BLOCKINCREMENT	 	             80	// sal_Int32
+#define BASEPROPERTY_VISIBLESIZE	 	             81	// sal_Int32
+#define BASEPROPERTY_ORIENTATION	 	             82	// sal_Int32
+#define BASEPROPERTY_FONTRELIEF	 	                 83	// sal_Int16
+#define BASEPROPERTY_FONTEMPHASISMARK	 	         84	// sal_Int16
+#define BASEPROPERTY_TEXTLINECOLOR			         85	// sal_Int32
+#define BASEPROPERTY_IMAGEALIGN			             86	// sal_Int16
+#define BASEPROPERTY_SCALEIMAGE                      87	// sal_Bool
+#define BASEPROPERTY_PUSHBUTTONTYPE                  88	// sal_Int16
+#define BASEPROPERTY_DISPLAYBACKGROUNDCOLOR          89	// sal_Int32
+#define BASEPROPERTY_AUTOMNEMONICS                   90	// sal_Bool
+#define BASEPROPERTY_MOUSETRANSPARENT                91	// sal_Bool
 #define BASEPROPERTY_ACCESSIBLENAME                  92  // ::rtl::OUString
-#define BASEPROPERTY_PLUGINPARENT                    93  // sal_Int64
-#define BASEPROPERTY_SCROLLVALUE_MIN                 94  // sal_Int32
+#define BASEPROPERTY_PLUGINPARENT	                 93  // sal_Int64
+#define BASEPROPERTY_SCROLLVALUE_MIN 	             94  // sal_Int32
 #define BASEPROPERTY_REPEAT_DELAY                    95  // sal_Int32
 #define BASEPROPERTY_SYMBOL_COLOR                    96  // sal_Int32
 #define BASEPROPERTY_SPINVALUE                       97  // sal_Int32
@@ -167,20 +167,20 @@ namespace rtl {
 #define BASEPROPERTY_STEP_TIME                      118  // sal_Int32
 #define BASEPROPERTY_DECORATION                     119  // sal_Bool
 #define BASEPROPERTY_PAINTTRANSPARENT               120  // sal_Bool
-#define BASEPROPERTY_AUTOHSCROLL                    121 // sal_Bool
+#define BASEPROPERTY_AUTOHSCROLL                    121	// sal_Bool
 #define BASEPROPERTY_AUTOVSCROLL                    122  // sal_Bool
 #define BASEPROPERTY_DESKTOP_AS_PARENT              123  // sal_Bool
-#define BASEPROPERTY_TREE_START                     124
-#define BASEPROPERTY_TREE_SELECTIONTYPE             124
-#define BASEPROPERTY_TREE_EDITABLE                  125
-#define BASEPROPERTY_TREE_DATAMODEL                 126
-#define BASEPROPERTY_TREE_ROOTDISPLAYED             127
-#define BASEPROPERTY_TREE_SHOWSHANDLES              128
-#define BASEPROPERTY_TREE_SHOWSROOTHANDLES          129
-#define BASEPROPERTY_TREE_ROWHEIGHT                 130
-#define BASEPROPERTY_TREE_INVOKESSTOPNODEEDITING    131
-#define BASEPROPERTY_TREE_END                       131
-#define BASEPROPERTY_DIALOGSOURCEURL                132
+#define BASEPROPERTY_TREE_START						124
+#define BASEPROPERTY_TREE_SELECTIONTYPE				124
+#define BASEPROPERTY_TREE_EDITABLE					125
+#define BASEPROPERTY_TREE_DATAMODEL					126
+#define BASEPROPERTY_TREE_ROOTDISPLAYED				127
+#define BASEPROPERTY_TREE_SHOWSHANDLES				128
+#define BASEPROPERTY_TREE_SHOWSROOTHANDLES			129
+#define BASEPROPERTY_TREE_ROWHEIGHT					130
+#define BASEPROPERTY_TREE_INVOKESSTOPNODEEDITING	131
+#define BASEPROPERTY_TREE_END						131
+#define BASEPROPERTY_DIALOGSOURCEURL				132
 #define BASEPROPERTY_NOLABEL                        133  // ::rtl::OUString  added for issue79712
 #define BASEPROPERTY_URL                            134  // ::rtl::OUString
 #define BASEPROPERTY_UNIT                           135  // ::awt::FieldUnit
@@ -198,47 +198,47 @@ namespace rtl {
 #define BASEPROPERTY_HIGHCONTRASTMODE               147
 #define BASEPROPERTY_GRID_EVEN_ROW_BACKGROUND       148
 #define BASEPROPERTY_GRID_HEADER_BACKGROUND         149
-#define BASEPROPERTY_GRID_LINE_COLOR                150
-#define BASEPROPERTY_GRID_ROW_BACKGROUND            151
+#define BASEPROPERTY_GRID_LINE_COLOR	            150
+#define BASEPROPERTY_GRID_ROW_BACKGROUND	        151
 #define BASEPROPERTY_MULTISELECTION_SIMPLEMODE      152
 #define BASEPROPERTY_ITEM_SEPARATOR_POS             153
 
 
 // Keine gebundenen Properties, werden immer aus der Property BASEPROPERTY_FONTDESCRIPTOR entnommen.
-#define BASEPROPERTY_FONTDESCRIPTORPART_START           1000
-#define BASEPROPERTY_FONTDESCRIPTORPART_NAME            1000    // ::rtl::OUString, not bound
-#define BASEPROPERTY_FONTDESCRIPTORPART_STYLENAME       1001    // ::rtl::OUString, not bound
-#define BASEPROPERTY_FONTDESCRIPTORPART_FAMILY          1002    // sal_Int16, not bound
-#define BASEPROPERTY_FONTDESCRIPTORPART_CHARSET         1003    // sal_Int16, not bound
-#define BASEPROPERTY_FONTDESCRIPTORPART_HEIGHT          1004    // sal_Int16, not bound
-#define BASEPROPERTY_FONTDESCRIPTORPART_WEIGHT          1005    // Float, not bound
-#define BASEPROPERTY_FONTDESCRIPTORPART_SLANT           1006    // sal_Int16, not bound
-#define BASEPROPERTY_FONTDESCRIPTORPART_UNDERLINE       1007    // sal_Int16, not bound
-#define BASEPROPERTY_FONTDESCRIPTORPART_STRIKEOUT       1008    // sal_Int16, not bound
-#define BASEPROPERTY_FONTDESCRIPTORPART_WIDTH           1009    // sal_Int16, not bound
-#define BASEPROPERTY_FONTDESCRIPTORPART_PITCH           1010    // sal_Int16, not bound
-#define BASEPROPERTY_FONTDESCRIPTORPART_CHARWIDTH       1011    // Float, not bound
-#define BASEPROPERTY_FONTDESCRIPTORPART_ORIENTATION     1012    // Float, not bound
-#define BASEPROPERTY_FONTDESCRIPTORPART_KERNING         1013    // sal_Bool, not bound
-#define BASEPROPERTY_FONTDESCRIPTORPART_WORDLINEMODE    1014    // sal_Bool, not bound
-#define BASEPROPERTY_FONTDESCRIPTORPART_TYPE            1015    // sal_Int16, not bound
-#define BASEPROPERTY_FONTDESCRIPTORPART_END             1015
-
-#define PROPERTY_ALIGN_LEFT                     0
-#define PROPERTY_ALIGN_CENTER                   1
-#define PROPERTY_ALIGN_RIGHT                    2
-
-#define PROPERTY_STATE_OFF                      0
-#define PROPERTY_STATE_ON                       1
-#define PROPERTY_STATE_DONTCARE                 2
-
-TOOLKIT_DLLPUBLIC sal_uInt16        GetPropertyId( const ::rtl::OUString& rPropertyName );
-const ::com::sun::star::uno::Type*  GetPropertyType( sal_uInt16 nPropertyId );
-TOOLKIT_DLLPUBLIC const ::rtl::OUString&    GetPropertyName( sal_uInt16 nPropertyId );
-sal_Int16                           GetPropertyAttribs( sal_uInt16 nPropertyId );
-sal_uInt16                          GetPropertyOrderNr( sal_uInt16 nPropertyId );
-sal_Bool                            DoesDependOnOthers( sal_uInt16 nPropertyId );
-sal_Bool                            CompareProperties( const ::com::sun::star::uno::Any& r1, const ::com::sun::star::uno::Any& r2 );
+#define BASEPROPERTY_FONTDESCRIPTORPART_START			1000
+#define BASEPROPERTY_FONTDESCRIPTORPART_NAME			1000	// ::rtl::OUString, not bound
+#define BASEPROPERTY_FONTDESCRIPTORPART_STYLENAME		1001	// ::rtl::OUString, not bound
+#define BASEPROPERTY_FONTDESCRIPTORPART_FAMILY			1002	// sal_Int16, not bound
+#define BASEPROPERTY_FONTDESCRIPTORPART_CHARSET     	1003	// sal_Int16, not bound
+#define BASEPROPERTY_FONTDESCRIPTORPART_HEIGHT      	1004	// sal_Int16, not bound
+#define BASEPROPERTY_FONTDESCRIPTORPART_WEIGHT      	1005	// Float, not bound
+#define BASEPROPERTY_FONTDESCRIPTORPART_SLANT       	1006	// sal_Int16, not bound
+#define BASEPROPERTY_FONTDESCRIPTORPART_UNDERLINE   	1007	// sal_Int16, not bound
+#define BASEPROPERTY_FONTDESCRIPTORPART_STRIKEOUT   	1008	// sal_Int16, not bound
+#define BASEPROPERTY_FONTDESCRIPTORPART_WIDTH			1009	// sal_Int16, not bound
+#define BASEPROPERTY_FONTDESCRIPTORPART_PITCH			1010	// sal_Int16, not bound
+#define BASEPROPERTY_FONTDESCRIPTORPART_CHARWIDTH		1011	// Float, not bound
+#define BASEPROPERTY_FONTDESCRIPTORPART_ORIENTATION		1012	// Float, not bound
+#define BASEPROPERTY_FONTDESCRIPTORPART_KERNING			1013	// sal_Bool, not bound
+#define BASEPROPERTY_FONTDESCRIPTORPART_WORDLINEMODE	1014	// sal_Bool, not bound
+#define BASEPROPERTY_FONTDESCRIPTORPART_TYPE			1015	// sal_Int16, not bound
+#define BASEPROPERTY_FONTDESCRIPTORPART_END         	1015
+
+#define PROPERTY_ALIGN_LEFT						0
+#define PROPERTY_ALIGN_CENTER					1
+#define PROPERTY_ALIGN_RIGHT					2
+
+#define PROPERTY_STATE_OFF						0
+#define PROPERTY_STATE_ON						1
+#define PROPERTY_STATE_DONTCARE					2
+
+TOOLKIT_DLLPUBLIC sal_uInt16		GetPropertyId( const ::rtl::OUString& rPropertyName );
+const ::com::sun::star::uno::Type*	GetPropertyType( sal_uInt16 nPropertyId );
+TOOLKIT_DLLPUBLIC const ::rtl::OUString&	GetPropertyName( sal_uInt16 nPropertyId );
+sal_Int16 							GetPropertyAttribs( sal_uInt16 nPropertyId );
+sal_uInt16							GetPropertyOrderNr( sal_uInt16 nPropertyId );
+sal_Bool							DoesDependOnOthers( sal_uInt16 nPropertyId );
+sal_Bool							CompareProperties( const ::com::sun::star::uno::Any& r1, const ::com::sun::star::uno::Any& r2 );
 
 
 
diff --git a/toolkit/inc/toolkit/helper/servicenames.hxx b/toolkit/inc/toolkit/helper/servicenames.hxx
index 2d1df79b733b..91ece3a432eb 100644
--- a/toolkit/inc/toolkit/helper/servicenames.hxx
+++ b/toolkit/inc/toolkit/helper/servicenames.hxx
@@ -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
diff --git a/toolkit/inc/toolkit/helper/solarrelease.hxx b/toolkit/inc/toolkit/helper/solarrelease.hxx
index d8938b41c220..b28d10246fe2 100644
--- a/toolkit/inc/toolkit/helper/solarrelease.hxx
+++ b/toolkit/inc/toolkit/helper/solarrelease.hxx
@@ -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
diff --git a/toolkit/inc/toolkit/helper/throbberimpl.hxx b/toolkit/inc/toolkit/helper/throbberimpl.hxx
index 5ca6ec83d330..099990a8d4d1 100644
--- a/toolkit/inc/toolkit/helper/throbberimpl.hxx
+++ b/toolkit/inc/toolkit/helper/throbberimpl.hxx
@@ -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
@@ -43,7 +43,7 @@ namespace toolkit
     class Throbber_Impl
     {
     private:
-        NAMESPACE_VOS(IMutex)&  mrMutex;    // Reference to SolarMutex
+        NAMESPACE_VOS(IMutex)&	mrMutex;	// Reference to SolarMutex
         ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::graphic::XGraphic > > maImageList;
         ::com::sun::star::uno::Reference< VCLXWindow > mxParent;
 
@@ -55,7 +55,7 @@ namespace toolkit
 
         DECL_LINK( TimeOutHdl, Throbber_Impl* );
 
-        NAMESPACE_VOS(IMutex)&  GetMutex() { return mrMutex; }
+        NAMESPACE_VOS(IMutex)&	GetMutex() { return mrMutex; }
 
     public:
              Throbber_Impl( ::com::sun::star::uno::Reference< VCLXWindow > xParent,
diff --git a/toolkit/inc/toolkit/helper/tkresmgr.hxx b/toolkit/inc/toolkit/helper/tkresmgr.hxx
index d7a1c42ea13c..829e7ee5d284 100644
--- a/toolkit/inc/toolkit/helper/tkresmgr.hxx
+++ b/toolkit/inc/toolkit/helper/tkresmgr.hxx
@@ -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
@@ -51,7 +51,7 @@ private:
     TkResMgr() { }
     ~TkResMgr() { }
 
-    // we'll instantiate one static member of the following class,
+    // we'll instantiate one static member of the following class, 
     // which in it's dtor ensures that m_pSimpleResMgr will be deleted
     class EnsureDelete
     {
diff --git a/toolkit/inc/toolkit/helper/unomemorystream.hxx b/toolkit/inc/toolkit/helper/unomemorystream.hxx
index c7d91e076f73..bd8940b88145 100644
--- a/toolkit/inc/toolkit/helper/unomemorystream.hxx
+++ b/toolkit/inc/toolkit/helper/unomemorystream.hxx
@@ -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
@@ -35,35 +35,35 @@
 
 #include <tools/stream.hxx>
 
-//  ----------------------------------------------------
-//  class UNOMEMORYSTREAM
-//  ----------------------------------------------------
+//	----------------------------------------------------
+//	class UNOMEMORYSTREAM
+//	----------------------------------------------------
 
-class UnoMemoryStream : public SvMemoryStream,
+class UnoMemoryStream :	public SvMemoryStream,
                         public ::com::sun::star::io::XInputStream,
                         public ::cppu::OWeakObject
 {
 private:
-    ::osl::Mutex    maMutex;
+    ::osl::Mutex	maMutex;
 
 protected:
-    ::osl::Mutex&   GetMutex() { return maMutex; }
+    ::osl::Mutex&	GetMutex() { return maMutex; }
 
 
-public:
+public:	
     UnoMemoryStream( sal_uInt32 nInitSize = 0x3FFF, sal_uInt32 nResize = 0x3FFFF );
-
+    
     // ::com::sun::star::uno::XInterface
-    ::com::sun::star::uno::Any  SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException);
-    void                        SAL_CALL acquire() throw()  { OWeakObject::acquire(); }
-    void                        SAL_CALL release() throw()  { OWeakObject::release(); }
+    ::com::sun::star::uno::Any	SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException);
+    void						SAL_CALL acquire() throw()	{ OWeakObject::acquire(); }
+    void						SAL_CALL release() throw()	{ OWeakObject::release(); }
 
     // ::com::sun::star::io::XInputStream
-    sal_Int32       SAL_CALL readBytes( ::com::sun::star::uno::Sequence< sal_Int8 >& aData, sal_Int32 nBytesToRead ) throw(::com::sun::star::io::NotConnectedException, ::com::sun::star::io::BufferSizeExceededException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException);
-    sal_Int32       SAL_CALL readSomeBytes( ::com::sun::star::uno::Sequence< sal_Int8 >& aData, sal_Int32 nMaxBytesToRead ) throw(::com::sun::star::io::NotConnectedException, ::com::sun::star::io::BufferSizeExceededException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException);
-    void            SAL_CALL skipBytes( sal_Int32 nBytesToSkip ) throw(::com::sun::star::io::NotConnectedException, ::com::sun::star::io::BufferSizeExceededException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException);
-    sal_Int32       SAL_CALL available(  ) throw(::com::sun::star::io::NotConnectedException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException);
-    void            SAL_CALL closeInput(  ) throw(::com::sun::star::io::NotConnectedException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException);
+    sal_Int32		SAL_CALL readBytes( ::com::sun::star::uno::Sequence< sal_Int8 >& aData, sal_Int32 nBytesToRead ) throw(::com::sun::star::io::NotConnectedException, ::com::sun::star::io::BufferSizeExceededException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException);
+    sal_Int32		SAL_CALL readSomeBytes( ::com::sun::star::uno::Sequence< sal_Int8 >& aData, sal_Int32 nMaxBytesToRead ) throw(::com::sun::star::io::NotConnectedException, ::com::sun::star::io::BufferSizeExceededException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException);
+    void			SAL_CALL skipBytes( sal_Int32 nBytesToSkip ) throw(::com::sun::star::io::NotConnectedException, ::com::sun::star::io::BufferSizeExceededException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException);
+    sal_Int32		SAL_CALL available(  ) throw(::com::sun::star::io::NotConnectedException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException);
+    void			SAL_CALL closeInput(  ) throw(::com::sun::star::io::NotConnectedException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException);
 };
 
 
diff --git a/toolkit/inc/toolkit/helper/unopropertyarrayhelper.hxx b/toolkit/inc/toolkit/helper/unopropertyarrayhelper.hxx
index 99d1763db1e6..4e8753a57472 100644
--- a/toolkit/inc/toolkit/helper/unopropertyarrayhelper.hxx
+++ b/toolkit/inc/toolkit/helper/unopropertyarrayhelper.hxx
@@ -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
@@ -36,21 +36,21 @@
 #include <list>
 #include "toolkit/dllapi.h"
 
-//  ----------------------------------------------------
-//  class UnoPropertyArrayHelper
-//  ----------------------------------------------------
+//	----------------------------------------------------
+//	class UnoPropertyArrayHelper
+//	----------------------------------------------------
 class TOOLKIT_DLLPUBLIC UnoPropertyArrayHelper : public ::cppu::IPropertyArrayHelper
 {
-private:
-    Table       maIDs;
+private:	
+    Table		maIDs;
 
 protected:
-    sal_Bool    ImplHasProperty( sal_uInt16 nPropId ) const;
+    sal_Bool 	ImplHasProperty( sal_uInt16 nPropId ) const;
 
 public:
                 UnoPropertyArrayHelper( const ::com::sun::star::uno::Sequence<sal_Int32>& rIDs );
                 UnoPropertyArrayHelper( const std::list< sal_uInt16 > &rIDs );
-
+    
     // ::cppu::IPropertyArrayHelper
     sal_Bool SAL_CALL fillPropertyMembersByHandle( ::rtl::OUString * pPropName, sal_Int16 * pAttributes, sal_Int32 nHandle );
     ::com::sun::star::uno::Sequence< ::com::sun::star::beans::Property > SAL_CALL getProperties();
diff --git a/toolkit/inc/toolkit/helper/unowrapper.hxx b/toolkit/inc/toolkit/helper/unowrapper.hxx
index 31cc259b7fd0..0f41292786a8 100644
--- a/toolkit/inc/toolkit/helper/unowrapper.hxx
+++ b/toolkit/inc/toolkit/helper/unowrapper.hxx
@@ -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
@@ -37,9 +37,9 @@
 #include <vcl/unowrap.hxx>
 #include <vcl/window.hxx>
 
-//  ----------------------------------------------------
-//  class UnoWrapper
-//  ----------------------------------------------------
+//	----------------------------------------------------
+//	class UnoWrapper
+//	----------------------------------------------------
 
 class UnoWrapper : public UnoWrapperBase
 {
@@ -47,39 +47,39 @@ private:
     ::com::sun::star::uno::Reference< ::com::sun::star::awt::XToolkit>  mxToolkit;
     ::toolkit::AccessibilityClient                                      maAccessibleFactoryAccess;
 
-public:
+public:	
     UnoWrapper( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XToolkit>& rxToolkit );
-
+    
     virtual void        Destroy();
-
+    
     // Toolkit
     virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XToolkit> GetVCLToolkit();
 
     // Graphics
-    virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XGraphics> CreateGraphics( OutputDevice* pOutDev );
-    virtual void                ReleaseAllGraphics( OutputDevice* pOutDev );
-
+    virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XGraphics>	CreateGraphics( OutputDevice* pOutDev );
+    virtual void				ReleaseAllGraphics( OutputDevice* pOutDev );
+    
     // Window
     virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer> GetWindowInterface( Window* pWindow, BOOL bCreate );
-    virtual void                SetWindowInterface( Window* pWindow, ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer> xIFace );
+    virtual void				SetWindowInterface( Window* pWindow, ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer> xIFace );
 
-    void                WindowDestroyed( Window* pWindow );
-    void                WindowEvent_Move( Window* pWindow );
-    void                WindowEvent_Resize( Window* pWindow );
-    void                WindowEvent_Show( Window* pWindow, BOOL bShow );
-    void                WindowEvent_Close( Window* pWindow );
-    void                WindowEvent_Minimize( Window* pWindow );
-    void                WindowEvent_Normalize( Window* pWindow );
-    void                WindowEvent_Activate( Window* pWindow, BOOL bActivated );
-    void                WindowEvent_MouseButtonUp( Window* pWindow, const MouseEvent& rEvt );
-    void                WindowEvent_MouseButtonDown( Window* pWindow, const MouseEvent& rEvt );
-    void                WindowEvent_MouseMove( Window* pWindow, const MouseEvent& rEvt );
-    void                WindowEvent_Command( Window* pWindow, const CommandEvent& rCEvt );
-    void                WindowEvent_KeyInput( Window* pWindow, const KeyEvent& rEvt );
-    void                WindowEvent_KeyUp( Window* pWindow, const KeyEvent& rEvt );
-    void                WindowEvent_GetFocus( Window* pWindow );
-    void                WindowEvent_LoseFocus( Window* pWindow );
-    void                WindowEvent_Paint( Window* pWindow, const Rectangle& rRect );
+    void				WindowDestroyed( Window* pWindow );
+    void 				WindowEvent_Move( Window* pWindow );
+    void 				WindowEvent_Resize( Window* pWindow );
+    void 				WindowEvent_Show( Window* pWindow, BOOL bShow );
+    void 				WindowEvent_Close( Window* pWindow );
+    void 				WindowEvent_Minimize( Window* pWindow );
+    void 				WindowEvent_Normalize( Window* pWindow );
+    void 				WindowEvent_Activate( Window* pWindow, BOOL bActivated );
+    void 				WindowEvent_MouseButtonUp( Window* pWindow, const MouseEvent& rEvt );
+    void 				WindowEvent_MouseButtonDown( Window* pWindow, const MouseEvent& rEvt );
+    void 				WindowEvent_MouseMove( Window* pWindow, const MouseEvent& rEvt );
+    void 				WindowEvent_Command( Window* pWindow, const CommandEvent& rCEvt );
+    void 				WindowEvent_KeyInput( Window* pWindow, const KeyEvent& rEvt );
+    void 				WindowEvent_KeyUp( Window* pWindow, const KeyEvent& rEvt );
+    void 				WindowEvent_GetFocus( Window* pWindow );
+    void 				WindowEvent_LoseFocus( Window* pWindow );
+    void 				WindowEvent_Paint( Window* pWindow, const Rectangle& rRect );
 
     // Accessibility
     virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >
diff --git a/toolkit/inc/toolkit/helper/vclunohelper.hxx b/toolkit/inc/toolkit/helper/vclunohelper.hxx
index cc11f3a586bb..948eb998859e 100644
--- a/toolkit/inc/toolkit/helper/vclunohelper.hxx
+++ b/toolkit/inc/toolkit/helper/vclunohelper.hxx
@@ -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
@@ -73,57 +73,57 @@ class OutputDevice;
 class MouseEvent;
 class KeyEvent;
 
-//  ----------------------------------------------------
-//  class VclUnoHelper
-//  ----------------------------------------------------
+//	----------------------------------------------------
+//	class VclUnoHelper
+//	----------------------------------------------------
 class TOOLKIT_DLLPUBLIC VCLUnoHelper
 {
 public:
     // Toolkit
-    static ::com::sun::star::uno::Reference< ::com::sun::star::awt::XToolkit>   CreateToolkit();
+    static ::com::sun::star::uno::Reference< ::com::sun::star::awt::XToolkit>	CreateToolkit();
 
     // Bitmap
-    static BitmapEx                                                         GetBitmap( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XBitmap>& rxBitmap );
-    static ::com::sun::star::uno::Reference< ::com::sun::star::awt::XBitmap>    CreateBitmap( const BitmapEx& rBitmap );
+    static BitmapEx															GetBitmap( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XBitmap>& rxBitmap );
+    static ::com::sun::star::uno::Reference< ::com::sun::star::awt::XBitmap>	CreateBitmap( const BitmapEx& rBitmap );
 
     // Window
-    static Window*                                                          GetWindow( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow>& rxWindow );
-    static Window*                                                          GetWindow( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow2>& rxWindow2 );
-    static Window*                                                          GetWindow( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer>& rxWindowPeer );
-    static ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow>    GetInterface( Window* pWindow );
+    static Window* 															GetWindow( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow>& rxWindow );
+    static Window* 															GetWindow( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow2>& rxWindow2 );
+    static Window* 															GetWindow( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer>& rxWindowPeer );
+    static ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow>	GetInterface( Window* pWindow );
 
     // OutputDevice
-    static OutputDevice*                            GetOutputDevice( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XDevice>& rxDevice );
-    static OutputDevice*                            GetOutputDevice( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XGraphics>& rxGraphics );
+    static OutputDevice* 							GetOutputDevice( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XDevice>& rxDevice );
+    static OutputDevice* 							GetOutputDevice( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XGraphics>& rxGraphics );
 
     // Region
-    static Region                                   GetRegion( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XRegion >& rxRegion );
+    static Region									GetRegion( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XRegion >& rxRegion );
 
 
     // Pointer
     static ::com::sun::star::uno::Reference< ::com::sun::star::awt::XPointer> CreatePointer();
 
     // Polygon
-    static Polygon                                  CreatePolygon( const ::com::sun::star::uno::Sequence< sal_Int32 >& DataX, const ::com::sun::star::uno::Sequence< sal_Int32 >& DataY );
+    static Polygon									CreatePolygon( const ::com::sun::star::uno::Sequence< sal_Int32 >& DataX, const ::com::sun::star::uno::Sequence< sal_Int32 >& DataY );
 
     // Font
-    static ::com::sun::star::awt::FontDescriptor    CreateFontDescriptor( const Font& rFont );
-    static Font                                     CreateFont( const ::com::sun::star::awt::FontDescriptor& rDescr, const Font& rInitFont );
-    static Font                                     CreateFont( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XFont >& rxFont );
-    static ::com::sun::star::awt::SimpleFontMetric  CreateFontMetric( const FontMetric& rFontMetric );
-    static float                                    ConvertFontWidth( FontWidth eWidth );
-    static FontWidth                                ConvertFontWidth( float f );
-    static float                                    ConvertFontWeight( FontWeight eWeight );
-    static FontWeight                               ConvertFontWeight( float f );
-
+    static ::com::sun::star::awt::FontDescriptor	CreateFontDescriptor( const Font& rFont );
+    static Font										CreateFont( const ::com::sun::star::awt::FontDescriptor& rDescr, const Font& rInitFont );
+    static Font										CreateFont( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XFont >& rxFont );
+    static ::com::sun::star::awt::SimpleFontMetric	CreateFontMetric( const FontMetric& rFontMetric );
+    static float 									ConvertFontWidth( FontWidth eWidth );
+    static FontWidth 								ConvertFontWidth( float f );
+    static float 									ConvertFontWeight( FontWeight eWeight );
+    static FontWeight 								ConvertFontWeight( float f );
+    
     // Rectangle
-    static sal_Bool                                 IsZero( ::com::sun::star::awt::Rectangle rRect );
+    static sal_Bool									IsZero( ::com::sun::star::awt::Rectangle rRect );
 
-    static ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlContainer>  CreateControlContainer( Window* pWindow );
+    static ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlContainer>	CreateControlContainer( Window* pWindow );
 
     // MapUnits
-    static MapUnit                                  UnoEmbed2VCLMapUnit( sal_Int32 nUnoEmbedMapUnit );
-    static sal_Int32                                VCL2UnoEmbedMapUnit( MapUnit nVCLMapUnit );
+    static MapUnit									UnoEmbed2VCLMapUnit( sal_Int32 nUnoEmbedMapUnit );
+    static sal_Int32								VCL2UnoEmbedMapUnit( MapUnit nVCLMapUnit );
 
     //========================================================================
     //= MeasurementUnitConversion
@@ -160,4 +160,4 @@ public:
 };
 
 
-#endif  // _TOOLKIT_HELPER_VCLUNOHELPER_HXX_
+#endif	// _TOOLKIT_HELPER_VCLUNOHELPER_HXX_
diff --git a/toolkit/qa/complex/toolkit/CallbackClass.java b/toolkit/qa/complex/toolkit/CallbackClass.java
index efc0ef91f7c0..8e1a005bc47f 100644
--- a/toolkit/qa/complex/toolkit/CallbackClass.java
+++ b/toolkit/qa/complex/toolkit/CallbackClass.java
@@ -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
@@ -50,7 +50,7 @@ public class CallbackClass implements XCallback{
 
 
     public CallbackClass(LogWriter log, XMultiServiceFactory xMSF ) {
-
+        
         this.xMSF = xMSF;
         this.log = log;
     }
@@ -58,7 +58,7 @@ public class CallbackClass implements XCallback{
 
     /**
      * Callback method which will be called by the asynchronous
-     * service where we have added our request before.
+     * service where we have added our request before.     
      */
     public void notify( Object aData ) {
 
diff --git a/toolkit/qa/complex/toolkit/CheckAccessibleStatusBar.java b/toolkit/qa/complex/toolkit/CheckAccessibleStatusBar.java
index fee95f2e6de0..6ad18a4aa04f 100755
--- a/toolkit/qa/complex/toolkit/CheckAccessibleStatusBar.java
+++ b/toolkit/qa/complex/toolkit/CheckAccessibleStatusBar.java
@@ -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
diff --git a/toolkit/qa/complex/toolkit/CheckAccessibleStatusBarItem.java b/toolkit/qa/complex/toolkit/CheckAccessibleStatusBarItem.java
index 36394732ce78..e877a9023dd8 100755
--- a/toolkit/qa/complex/toolkit/CheckAccessibleStatusBarItem.java
+++ b/toolkit/qa/complex/toolkit/CheckAccessibleStatusBarItem.java
@@ -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
diff --git a/toolkit/qa/complex/toolkit/CheckAsyncCallback.java b/toolkit/qa/complex/toolkit/CheckAsyncCallback.java
index cc184f3c1a73..ad26344630a4 100644
--- a/toolkit/qa/complex/toolkit/CheckAsyncCallback.java
+++ b/toolkit/qa/complex/toolkit/CheckAsyncCallback.java
@@ -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
@@ -88,14 +88,14 @@ public class CheckAsyncCallback extends ComplexTestCase {
         try {
             xMSF = (XMultiServiceFactory)param.getMSF();
             SOfficeFactory xSOF = SOfficeFactory.getFactory(xMSF);
-
+            
             XRequestCallback xAsyncCallback = null;
-
-            XInterface xIfc = (XInterface)xMSF.createInstance(
+        
+            XInterface xIfc = (XInterface)xMSF.createInstance( 
                                 "com.sun.star.awt.AsyncCallback" );
             xAsyncCallback = (XRequestCallback)
                 UnoRuntime.queryInterface(XRequestCallback.class,xIfc);
-
+            
             testObject=xAsyncCallback;
         }
         catch(com.sun.star.uno.Exception e) {
@@ -114,7 +114,7 @@ public class CheckAsyncCallback extends ComplexTestCase {
                                 new _XRequestCallback(testObject, log, xMSF );
         assure("failed: XRequestCallback::addCallback", _xRequestCallback._addCallback());
     }
-
+    
     public void checkCallback() {
         getTestObject();
         log.println("*** Now testing asynchronous callback service ***");
diff --git a/toolkit/qa/complex/toolkit/interface_tests/_XAccessibleComponent.java b/toolkit/qa/complex/toolkit/interface_tests/_XAccessibleComponent.java
index e3d80629be40..fc66e0b47d21 100755
--- a/toolkit/qa/complex/toolkit/interface_tests/_XAccessibleComponent.java
+++ b/toolkit/qa/complex/toolkit/interface_tests/_XAccessibleComponent.java
@@ -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
diff --git a/toolkit/qa/complex/toolkit/interface_tests/_XAccessibleContext.java b/toolkit/qa/complex/toolkit/interface_tests/_XAccessibleContext.java
index 230eb3d098d3..294812061bc5 100755
--- a/toolkit/qa/complex/toolkit/interface_tests/_XAccessibleContext.java
+++ b/toolkit/qa/complex/toolkit/interface_tests/_XAccessibleContext.java
@@ -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
diff --git a/toolkit/qa/complex/toolkit/interface_tests/_XAccessibleEventBroadcaster.java b/toolkit/qa/complex/toolkit/interface_tests/_XAccessibleEventBroadcaster.java
index 18a20d02e233..e2998772dae0 100755
--- a/toolkit/qa/complex/toolkit/interface_tests/_XAccessibleEventBroadcaster.java
+++ b/toolkit/qa/complex/toolkit/interface_tests/_XAccessibleEventBroadcaster.java
@@ -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
diff --git a/toolkit/qa/complex/toolkit/interface_tests/_XAccessibleExtendedComponent.java b/toolkit/qa/complex/toolkit/interface_tests/_XAccessibleExtendedComponent.java
index e022e60d90c0..b6766bea066d 100755
--- a/toolkit/qa/complex/toolkit/interface_tests/_XAccessibleExtendedComponent.java
+++ b/toolkit/qa/complex/toolkit/interface_tests/_XAccessibleExtendedComponent.java
@@ -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
diff --git a/toolkit/qa/complex/toolkit/interface_tests/_XAccessibleText.java b/toolkit/qa/complex/toolkit/interface_tests/_XAccessibleText.java
index d6357e8f24bc..8ae001fc35ad 100755
--- a/toolkit/qa/complex/toolkit/interface_tests/_XAccessibleText.java
+++ b/toolkit/qa/complex/toolkit/interface_tests/_XAccessibleText.java
@@ -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
diff --git a/toolkit/qa/complex/toolkit/interface_tests/_XRequestCallback.java b/toolkit/qa/complex/toolkit/interface_tests/_XRequestCallback.java
index 472412e80aa6..3d04c2030081 100644
--- a/toolkit/qa/complex/toolkit/interface_tests/_XRequestCallback.java
+++ b/toolkit/qa/complex/toolkit/interface_tests/_XRequestCallback.java
@@ -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
@@ -81,7 +81,7 @@ public class _XRequestCallback {
             res = false;
         }
         log.println("addCallback called" );
-
+        
         return res;
     }
 
diff --git a/toolkit/qa/complex/xunitconversion/XUnitConversionTest.java b/toolkit/qa/complex/xunitconversion/XUnitConversionTest.java
index 654f5ec69da5..9e1500bc3dde 100644
--- a/toolkit/qa/complex/xunitconversion/XUnitConversionTest.java
+++ b/toolkit/qa/complex/xunitconversion/XUnitConversionTest.java
@@ -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
@@ -41,10 +41,10 @@ import util.DesktopTools;
  * These are converter methods to get the size of a well known awt component
  * in a com.sun.star.util.MeasureUnit you want.
  * You don't need to know the factors to calculate by hand.
- *
+ * 
  * @author ll93751
  */
-public class XUnitConversionTest extends ComplexTestCase
+public class XUnitConversionTest extends ComplexTestCase 
 {
     public String[] getTestMethodNames()
         {
@@ -87,7 +87,7 @@ public class XUnitConversionTest extends ComplexTestCase
             log.println("Caught IllegalArgumentException in convertSizeToLogic with '" + _sEinheit + "' " + e.getMessage());
         }
     }
-
+    
 /**
  * The real test function
  * 1. try to get the XMultiServiceFactory of an already running office. Therefore make sure an (open|star)office is running with
@@ -96,10 +96,10 @@ public class XUnitConversionTest extends ComplexTestCase
  * 3. try to convert the WindowPeer to an XWindow
  * 4. try to resize and move the window to an other position, so we get a well knowing position and size.
  * 5. run some more tests
- *
+ * 
  * If no test fails, the test is well done and returns with 'PASSED, OK'
- *
- */    public void testXUnitConversion()
+ * 
+ */    public void testXUnitConversion() 
         {
             XMultiServiceFactory xMSF = (XMultiServiceFactory) param.getMSF();
             assure("failed: There is no office.", xMSF != null);
@@ -218,5 +218,5 @@ public class XUnitConversionTest extends ComplexTestCase
             // close the window.
             // IMHO a little bit stupid, but the XWindow doesn't support a XCloseable interface
             xWindow.dispose();
-    }
+    } 
 }
diff --git a/toolkit/source/awt/asynccallback.cxx b/toolkit/source/awt/asynccallback.cxx
index 593feb582274..fe5c2c59e481 100644
--- a/toolkit/source/awt/asynccallback.cxx
+++ b/toolkit/source/awt/asynccallback.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,13 +79,13 @@ private:
     {
         CallbackData( const css::uno::Reference< css::awt::XCallback >& rCallback, const css::uno::Any& rAny ) :
             xCallback( rCallback ), aData( rAny ) {}
-
+        
         css::uno::Reference< css::awt::XCallback > xCallback;
         css::uno::Any                              aData;
     };
-
+  
     DECL_STATIC_LINK( AsyncCallback, Notify_Impl, CallbackData* );
-
+    
     AsyncCallback(AsyncCallback &); // not defined
     void operator =(AsyncCallback &); // not defined
 
@@ -143,7 +143,7 @@ IMPL_STATIC_LINK_NOINSTANCE( AsyncCallback, Notify_Impl, CallbackData*, pCallbac
     catch ( css::uno::Exception& )
     {
     }
-
+    
     delete pCallbackData;
     return 0;
 }
diff --git a/toolkit/source/awt/forward.hxx b/toolkit/source/awt/forward.hxx
index 0228be562b2c..f59d1593ffb3 100644
--- a/toolkit/source/awt/forward.hxx
+++ b/toolkit/source/awt/forward.hxx
@@ -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
diff --git a/toolkit/source/awt/vclxaccessiblecomponent.cxx b/toolkit/source/awt/vclxaccessiblecomponent.cxx
index 175289d1ac84..a245ed2d7812 100644
--- a/toolkit/source/awt/vclxaccessiblecomponent.cxx
+++ b/toolkit/source/awt/vclxaccessiblecomponent.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
@@ -58,9 +58,9 @@ using namespace ::comphelper;
 DBG_NAME(VCLXAccessibleComponent)
 
 
-//  ----------------------------------------------------
-//  class VCLXAccessibleComponent
-//  ----------------------------------------------------
+//	----------------------------------------------------
+//	class VCLXAccessibleComponent
+//	----------------------------------------------------
 VCLXAccessibleComponent::VCLXAccessibleComponent( VCLXWindow* pVCLXindow )
     : AccessibleExtendedComponentHelper_BASE( new VCLExternalSolarLock() )
     , OAccessibleImplementationAccess( )
@@ -292,9 +292,9 @@ void VCLXAccessibleComponent::ProcessWindowEvent( const VclWindowEvent& rVclWind
         {
             // avoid notification if a child frame is already active
             // only one frame may be active at a given time
-            if ( !pAccWindow->HasActiveChildFrame() &&
-                 ( getAccessibleRole() == accessibility::AccessibleRole::FRAME ||
-                   getAccessibleRole() == accessibility::AccessibleRole::ALERT ||
+            if ( !pAccWindow->HasActiveChildFrame() && 
+                 ( getAccessibleRole() == accessibility::AccessibleRole::FRAME || 
+                   getAccessibleRole() == accessibility::AccessibleRole::ALERT || 
                    getAccessibleRole() == accessibility::AccessibleRole::DIALOG ) )  // #i18891#
             {
                 aNewValue <<= accessibility::AccessibleStateType::ACTIVE;
@@ -304,8 +304,8 @@ void VCLXAccessibleComponent::ProcessWindowEvent( const VclWindowEvent& rVclWind
         break;
         case VCLEVENT_WINDOW_DEACTIVATE:
         {
-            if ( getAccessibleRole() == accessibility::AccessibleRole::FRAME ||
-                 getAccessibleRole() == accessibility::AccessibleRole::ALERT ||
+            if ( getAccessibleRole() == accessibility::AccessibleRole::FRAME || 
+                 getAccessibleRole() == accessibility::AccessibleRole::ALERT || 
                  getAccessibleRole() == accessibility::AccessibleRole::DIALOG )  // #i18891#
             {
                 aOldValue <<= accessibility::AccessibleStateType::ACTIVE;
@@ -485,13 +485,13 @@ void VCLXAccessibleComponent::FillAccessibleStateSet( utl::AccessibleStateSetHel
         }
 
         if ( pWindow->HasChildPathFocus() &&
-             ( getAccessibleRole() == accessibility::AccessibleRole::FRAME ||
-               getAccessibleRole() == accessibility::AccessibleRole::ALERT ||
+             ( getAccessibleRole() == accessibility::AccessibleRole::FRAME || 
+               getAccessibleRole() == accessibility::AccessibleRole::ALERT || 
                getAccessibleRole() == accessibility::AccessibleRole::DIALOG ) )  // #i18891#
             rStateSet.AddState( accessibility::AccessibleStateType::ACTIVE );
 
         // #104290# MT: This way, a ComboBox doesn't get state FOCUSED.
-        // I also don't understand
+        // I also don't understand 
         // a) why WINDOW_FIRSTCHILD is used here (which btw is a border window in the case of a combo box)
         // b) why HasFocus() is nout "enough" for a compound control
         /*
@@ -588,7 +588,7 @@ uno::Reference< accessibility::XAccessible > VCLXAccessibleComponent::getVclPare
     return xAcc;
 }
 
-uno::Reference< accessibility::XAccessible > VCLXAccessibleComponent::getAccessibleParent(  ) throw (uno::RuntimeException)
+uno::Reference< accessibility::XAccessible > VCLXAccessibleComponent::getAccessibleParent(	) throw (uno::RuntimeException)
 {
     OExternalLockGuard aGuard( this );
 
@@ -600,7 +600,7 @@ uno::Reference< accessibility::XAccessible > VCLXAccessibleComponent::getAccessi
     return xAcc;
 }
 
-sal_Int32 VCLXAccessibleComponent::getAccessibleIndexInParent(  ) throw (uno::RuntimeException)
+sal_Int32 VCLXAccessibleComponent::getAccessibleIndexInParent(	) throw (uno::RuntimeException)
 {
     OExternalLockGuard aGuard( this );
 
@@ -608,7 +608,7 @@ sal_Int32 VCLXAccessibleComponent::getAccessibleIndexInParent(  ) throw (uno::Ru
 
     uno::Reference< accessibility::XAccessible > xAcc( implGetForeignControlledParent() );
     if ( xAcc.is() )
-    {   // we _do_ have a foreign-controlled parent -> use the base class' implementation,
+    {	// we _do_ have a foreign-controlled parent -> use the base class' implementation,
         // which goes the UNO way
         nIndex = AccessibleExtendedComponentHelper_BASE::getAccessibleIndexInParent( );
     }
@@ -630,7 +630,7 @@ sal_Int32 VCLXAccessibleComponent::getAccessibleIndexInParent(  ) throw (uno::Ru
                     }
                 }
                 */
-                //  Iterate over all the parent's children and search for this object.
+                //	Iterate over all the parent's children and search for this object.
                 // this should be compatible with the code in SVX
                 uno::Reference< accessibility::XAccessible > xParentAcc( pParent->GetAccessible() );
                 if ( xParentAcc.is() )
@@ -672,7 +672,7 @@ sal_Int16 VCLXAccessibleComponent::getAccessibleRole(  ) throw (uno::RuntimeExce
     return nRole;
 }
 
-::rtl::OUString VCLXAccessibleComponent::getAccessibleDescription(  ) throw (uno::RuntimeException)
+::rtl::OUString VCLXAccessibleComponent::getAccessibleDescription(	) throw (uno::RuntimeException)
 {
     OExternalLockGuard aGuard( this );
 
@@ -701,7 +701,7 @@ sal_Int16 VCLXAccessibleComponent::getAccessibleRole(  ) throw (uno::RuntimeExce
     return aName;
 }
 
-uno::Reference< accessibility::XAccessibleRelationSet > VCLXAccessibleComponent::getAccessibleRelationSet(  ) throw (uno::RuntimeException)
+uno::Reference< accessibility::XAccessibleRelationSet > VCLXAccessibleComponent::getAccessibleRelationSet(	) throw (uno::RuntimeException)
 {
     OExternalLockGuard aGuard( this );
 
@@ -737,8 +737,8 @@ uno::Reference< accessibility::XAccessible > VCLXAccessibleComponent::getAccessi
     {
         uno::Reference< accessibility::XAccessible > xAcc = getAccessibleChild( i );
         if ( xAcc.is() )
-        {
-            uno::Reference< accessibility::XAccessibleComponent > xComp( xAcc->getAccessibleContext(), uno::UNO_QUERY );
+        {			
+            uno::Reference< accessibility::XAccessibleComponent > xComp( xAcc->getAccessibleContext(), uno::UNO_QUERY );				
             if ( xComp.is() )
             {
                 Rectangle aRect = VCLRectangle( xComp->getBounds() );
@@ -777,7 +777,7 @@ awt::Rectangle VCLXAccessibleComponent::implGetBounds() throw (uno::RuntimeExcep
 
     uno::Reference< accessibility::XAccessible > xParent( implGetForeignControlledParent() );
     if ( xParent.is() )
-    {   // hmm, we can't rely on our VCL coordinates, as in the Accessibility Hierarchy, somebody gave
+    {	// hmm, we can't rely on our VCL coordinates, as in the Accessibility Hierarchy, somebody gave
         // us a parent which is different from our VCL parent
         // (actually, we did not check if it's really different ...)
 
@@ -832,7 +832,7 @@ void VCLXAccessibleComponent::grabFocus(  ) throw (uno::RuntimeException)
         mxWindow->setFocus();
 }
 
-sal_Int32 SAL_CALL VCLXAccessibleComponent::getForeground(  ) throw (uno::RuntimeException)
+sal_Int32 SAL_CALL VCLXAccessibleComponent::getForeground(	) throw (uno::RuntimeException)
 {
     OExternalLockGuard aGuard( this );
 
@@ -856,7 +856,7 @@ sal_Int32 SAL_CALL VCLXAccessibleComponent::getForeground(  ) throw (uno::Runtim
     return nColor;
 }
 
-sal_Int32 SAL_CALL VCLXAccessibleComponent::getBackground(  ) throw (uno::RuntimeException)
+sal_Int32 SAL_CALL VCLXAccessibleComponent::getBackground(	) throw (uno::RuntimeException)
 {
     OExternalLockGuard aGuard( this );
 
@@ -900,7 +900,7 @@ uno::Reference< awt::XFont > SAL_CALL VCLXAccessibleComponent::getFont(  ) throw
     return xFont;
 }
 
-::rtl::OUString SAL_CALL VCLXAccessibleComponent::getTitledBorderText(  ) throw (uno::RuntimeException)
+::rtl::OUString SAL_CALL VCLXAccessibleComponent::getTitledBorderText(	) throw (uno::RuntimeException)
 {
     OExternalLockGuard aGuard( this );
 
diff --git a/toolkit/source/awt/vclxbitmap.cxx b/toolkit/source/awt/vclxbitmap.cxx
index 44d909674ca4..57af245cc8e8 100644
--- a/toolkit/source/awt/vclxbitmap.cxx
+++ b/toolkit/source/awt/vclxbitmap.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
@@ -36,9 +36,9 @@
 #include <rtl/memory.h>
 #include <rtl/uuid.h>
 
-//  ----------------------------------------------------
-//  class VCLXBitmap
-//  ----------------------------------------------------
+//	----------------------------------------------------
+//	class VCLXBitmap
+//	----------------------------------------------------
 
 // ::com::sun::star::uno::XInterface
 ::com::sun::star::uno::Any VCLXBitmap::queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException)
diff --git a/toolkit/source/awt/vclxbutton.cxx b/toolkit/source/awt/vclxbutton.cxx
index 3701eee409c3..c63828d25776 100644
--- a/toolkit/source/awt/vclxbutton.cxx
+++ b/toolkit/source/awt/vclxbutton.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
diff --git a/toolkit/source/awt/vclxbutton.hxx b/toolkit/source/awt/vclxbutton.hxx
index 5ec29321cb4f..f39c9eb2d474 100644
--- a/toolkit/source/awt/vclxbutton.hxx
+++ b/toolkit/source/awt/vclxbutton.hxx
@@ -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
diff --git a/toolkit/source/awt/vclxcontainer.cxx b/toolkit/source/awt/vclxcontainer.cxx
index d86b3bbb5591..5d4d2f2ce5bc 100644
--- a/toolkit/source/awt/vclxcontainer.cxx
+++ b/toolkit/source/awt/vclxcontainer.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
@@ -39,9 +39,9 @@
 #include <vcl/window.hxx>
 #include <tools/debug.hxx>
 
-//  ----------------------------------------------------
-//  class VCLXContainer
-//  ----------------------------------------------------
+//	----------------------------------------------------
+//	class VCLXContainer
+//	----------------------------------------------------
 
 void VCLXContainer::ImplGetPropertyIds( std::list< sal_uInt16 > &rIds )
 {
@@ -198,7 +198,7 @@ void VCLXContainer::setGroup( const ::com::sun::star::uno::Sequence< ::com::sun:
             {
                 if ( pPrevRadio )
                 {
-                    bNewPrevWin = ( pPrevWin == pPrevRadio );   // Radio-Button wurde vor das PreWin sortiert....
+                    bNewPrevWin = ( pPrevWin == pPrevRadio );	// Radio-Button wurde vor das PreWin sortiert....
                     pSortBehind = pPrevRadio;
                 }
                 pPrevRadio = pWin;
diff --git a/toolkit/source/awt/vclxdevice.cxx b/toolkit/source/awt/vclxdevice.cxx
index 310f01a97679..62093dc66b84 100644
--- a/toolkit/source/awt/vclxdevice.cxx
+++ b/toolkit/source/awt/vclxdevice.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
@@ -49,9 +49,9 @@
 #include <vcl/bitmapex.hxx>
 #include <vcl/font.hxx>
 
-//  ----------------------------------------------------
-//  class VCLXDevice
-//  ----------------------------------------------------
+//	----------------------------------------------------
+//	class VCLXDevice
+//	----------------------------------------------------
 VCLXDevice::VCLXDevice() : mrMutex( Application::GetSolarMutex() )
 {
     mpOutputDevice = NULL;
@@ -108,13 +108,13 @@ IMPL_XTYPEPROVIDER_START( VCLXDevice )
 IMPL_XTYPEPROVIDER_END
 
 
-// ::com::sun::star::awt::XDevice,
+// ::com::sun::star::awt::XDevice, 
 ::com::sun::star::uno::Reference< ::com::sun::star::awt::XGraphics > VCLXDevice::createGraphics(  ) throw(::com::sun::star::uno::RuntimeException)
 {
     ::vos::OGuard aGuard( GetMutex() );
-
+    
     ::com::sun::star::uno::Reference< ::com::sun::star::awt::XGraphics > xRef;
-
+    
     if ( mpOutputDevice )
         xRef = mpOutputDevice->CreateUnoGraphics();
 
@@ -147,12 +147,12 @@ IMPL_XTYPEPROVIDER_END
     {
         Size aDevSz;
         OutDevType eDevType = mpOutputDevice->GetOutDevType();
-        if ( eDevType == OUTDEV_WINDOW )
+        if ( eDevType == OUTDEV_WINDOW ) 
         {
             aDevSz = ((Window*)mpOutputDevice)->GetSizePixel();
             ((Window*)mpOutputDevice)->GetBorder( aInfo.LeftInset, aInfo.TopInset, aInfo.RightInset, aInfo.BottomInset );
         }
-        else if ( eDevType == OUTDEV_PRINTER )
+        else if ( eDevType == OUTDEV_PRINTER ) 
         {
             aDevSz = ((Printer*)mpOutputDevice)->GetPaperSizePixel();
             Size aOutSz = mpOutputDevice->GetOutputSizePixel();
@@ -170,18 +170,18 @@ IMPL_XTYPEPROVIDER_END
             aInfo.RightInset = 0;
             aInfo.BottomInset = 0;
         }
-
+        
         aInfo.Width = aDevSz.Width();
         aInfo.Height = aDevSz.Height();
-
+        
         Size aTmpSz = mpOutputDevice->LogicToPixel( Size( 1000, 1000 ), MapMode( MAP_CM ) );
         aInfo.PixelPerMeterX = aTmpSz.Width()/10;
         aInfo.PixelPerMeterY = aTmpSz.Height()/10;
-
+        
         aInfo.BitsPerPixel = mpOutputDevice->GetBitCount();
-
+        
         aInfo.Capabilities = 0;
-        if ( mpOutputDevice->GetOutDevType() != OUTDEV_PRINTER )
+        if ( mpOutputDevice->GetOutDevType() != OUTDEV_PRINTER ) 
             aInfo.Capabilities = ::com::sun::star::awt::DeviceCapability::RASTEROPERATIONS|::com::sun::star::awt::DeviceCapability::GETBITS;
     }
 
@@ -252,8 +252,8 @@ IMPL_XTYPEPROVIDER_END
 VCLXVirtualDevice::~VCLXVirtualDevice()
 {
     ::vos::OGuard aGuard( GetMutex() );
-
-    DestroyOutputDevice();
+    
+    DestroyOutputDevice(); 
 }
 
 
@@ -262,18 +262,18 @@ VCLXVirtualDevice::~VCLXVirtualDevice()
 // -----------------------------------------------------------------------------
 // ::sal_Int32 SAL_CALL VCLXDevice::getTextWidth( const ::rtl::OUString& Text ) throw (::com::sun::star::uno::RuntimeException)
 // {
-//  ::vos::OGuard aGuard( GetMutex() );
+// 	::vos::OGuard aGuard( GetMutex() );
 //     if (Text.getLength() == 0)
 //     {
 //         return 0;
 //     }
-//
+//     
 //     return 1;
 // }
-//
+// 
 // ::sal_Int32 SAL_CALL VCLXDevice::getTextHeight(  ) throw (::com::sun::star::uno::RuntimeException)
 // {
-//  ::vos::OGuard aGuard( GetMutex() );
+// 	::vos::OGuard aGuard( GetMutex() );
 //     return 1;
 // }
 
@@ -286,15 +286,15 @@ VCLXVirtualDevice::~VCLXVirtualDevice()
 {
     (void)aPoint;
     ::vos::OGuard aGuard( GetMutex() );
-    if (TargetUnit == com::sun::star::util::MeasureUnit::PERCENT )
+    if (TargetUnit == com::sun::star::util::MeasureUnit::PERCENT ) 
     {
         // percentage not allowed here
         throw ::com::sun::star::lang::IllegalArgumentException();
     }
-
+    
     ::com::sun::star::awt::Point aAWTPoint(0,0);
     // X,Y
-
+    
     if( mpOutputDevice )
     {
         MapMode aMode(VCLUnoHelper::ConvertToMapModeUnit(TargetUnit));
@@ -302,7 +302,7 @@ VCLXVirtualDevice::~VCLXVirtualDevice()
         ::Point aDevPoint = mpOutputDevice->PixelToLogic(aVCLPoint, aMode );
         aAWTPoint = VCLUnoHelper::ConvertToAWTPoint(aDevPoint);
     }
-
+    
     return aAWTPoint;
 }
 
@@ -317,7 +317,7 @@ VCLXVirtualDevice::~VCLXVirtualDevice()
         // pixel or percentage not allowed here
         throw ::com::sun::star::lang::IllegalArgumentException();
     }
-
+    
     ::com::sun::star::awt::Point aAWTPoint(0,0);
 
     if( mpOutputDevice )
@@ -327,7 +327,7 @@ VCLXVirtualDevice::~VCLXVirtualDevice()
         ::Point aDevPoint = mpOutputDevice->LogicToPixel(aVCLPoint, aMode );
         aAWTPoint = VCLUnoHelper::ConvertToAWTPoint(aDevPoint);
     }
-
+    
     return aAWTPoint;
 }
 
@@ -340,11 +340,11 @@ VCLXVirtualDevice::~VCLXVirtualDevice()
         // percentage not allowed here
         throw ::com::sun::star::lang::IllegalArgumentException();
     }
-
+    
     ::com::sun::star::awt::Size aAWTSize(0,0);
     // Width, Height
 
-
+    
     if( mpOutputDevice )
     {
         MapMode aMode(VCLUnoHelper::ConvertToMapModeUnit(TargetUnit));
@@ -352,7 +352,7 @@ VCLXVirtualDevice::~VCLXVirtualDevice()
         ::Size aDevSz = mpOutputDevice->PixelToLogic(aVCLSize, aMode );
         aAWTSize = VCLUnoHelper::ConvertToAWTSize(aDevSz);
     }
-
+    
     return aAWTSize;
 }
 
@@ -366,7 +366,7 @@ VCLXVirtualDevice::~VCLXVirtualDevice()
         // pixel or percentage not allowed here
         throw ::com::sun::star::lang::IllegalArgumentException();
     }
-
+    
     ::com::sun::star::awt::Size aAWTSize(0,0);
     // Width, Height
     if( mpOutputDevice )
@@ -376,7 +376,7 @@ VCLXVirtualDevice::~VCLXVirtualDevice()
         ::Size aDevSz = mpOutputDevice->LogicToPixel(aVCLSize, aMode );
         aAWTSize = VCLUnoHelper::ConvertToAWTSize(aDevSz);
     }
-
+    
     return aAWTSize;
 }
 
diff --git a/toolkit/source/awt/vclxdialog.cxx b/toolkit/source/awt/vclxdialog.cxx
index 43861c3ed347..d3eb684f079b 100644
--- a/toolkit/source/awt/vclxdialog.cxx
+++ b/toolkit/source/awt/vclxdialog.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
diff --git a/toolkit/source/awt/vclxdialog.hxx b/toolkit/source/awt/vclxdialog.hxx
index 64b2c03f90d5..074cd9c28006 100644
--- a/toolkit/source/awt/vclxdialog.hxx
+++ b/toolkit/source/awt/vclxdialog.hxx
@@ -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
diff --git a/toolkit/source/awt/vclxfixedline.cxx b/toolkit/source/awt/vclxfixedline.cxx
index 8c77a4f35e19..1c15198f11e7 100644
--- a/toolkit/source/awt/vclxfixedline.cxx
+++ b/toolkit/source/awt/vclxfixedline.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
diff --git a/toolkit/source/awt/vclxfixedline.hxx b/toolkit/source/awt/vclxfixedline.hxx
index d7dfd76d961f..0513f22bc83c 100644
--- a/toolkit/source/awt/vclxfixedline.hxx
+++ b/toolkit/source/awt/vclxfixedline.hxx
@@ -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
diff --git a/toolkit/source/awt/vclxfont.cxx b/toolkit/source/awt/vclxfont.cxx
index 53175ec79d24..f09bb8532ee1 100644
--- a/toolkit/source/awt/vclxfont.cxx
+++ b/toolkit/source/awt/vclxfont.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
@@ -39,9 +39,9 @@
 
 #include <vcl/outdev.hxx>
 
-//  ----------------------------------------------------
-//  class VCLXFont
-//  ----------------------------------------------------
+//	----------------------------------------------------
+//	class VCLXFont
+//	----------------------------------------------------
 VCLXFont::VCLXFont()
 {
     mpFontMetric = NULL;
@@ -112,7 +112,7 @@ IMPL_XTYPEPROVIDER_END
     ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() );
 
     ::com::sun::star::awt::SimpleFontMetric aFM;
-    if ( ImplAssertValidFontMetric() )
+    if ( ImplAssertValidFontMetric() ) 
         aFM = VCLUnoHelper::CreateFontMetric( *mpFontMetric );
     return aFM;
 }
@@ -127,7 +127,7 @@ sal_Int16 VCLXFont::getCharWidth( sal_Unicode c ) throw(::com::sun::star::uno::R
     {
         Font aOldFont = pOutDev->GetFont();
         pOutDev->SetFont( maFont );
-
+        
         nRet = sal::static_int_cast< sal_Int16 >(
             pOutDev->GetTextWidth( String(c) ));
 
@@ -146,7 +146,7 @@ sal_Int16 VCLXFont::getCharWidth( sal_Unicode c ) throw(::com::sun::star::uno::R
     {
         Font aOldFont = pOutDev->GetFont();
         pOutDev->SetFont( maFont );
-
+        
         sal_Int16 nCount = nLast-nFirst + 1;
         aSeq = ::com::sun::star::uno::Sequence<sal_Int16>( nCount );
         for ( USHORT n = 0; n < nCount; n++ )
diff --git a/toolkit/source/awt/vclxgraphics.cxx b/toolkit/source/awt/vclxgraphics.cxx
index bfbdb531e8d2..5b6d3b549b89 100644
--- a/toolkit/source/awt/vclxgraphics.cxx
+++ b/toolkit/source/awt/vclxgraphics.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
@@ -42,9 +42,9 @@
 #include <tools/debug.hxx>
 
 
-//  ----------------------------------------------------
-//  class VCLXGraphics
-//  ----------------------------------------------------
+//	----------------------------------------------------
+//	class VCLXGraphics
+//	----------------------------------------------------
 
 // ::com::sun::star::uno::XInterface
 ::com::sun::star::uno::Any VCLXGraphics::queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException)
@@ -79,24 +79,24 @@ VCLXGraphics::~VCLXGraphics()
     delete mpClipRegion;
 }
 
-void VCLXGraphics::SetOutputDevice( OutputDevice* pOutDev )
-{
-    mpOutputDevice = pOutDev;
+void VCLXGraphics::SetOutputDevice( OutputDevice* pOutDev ) 
+{ 
+    mpOutputDevice = pOutDev; 
     mxDevice = NULL;
 }
 
 void VCLXGraphics::Init( OutputDevice* pOutDev )
 {
     DBG_ASSERT( !mpOutputDevice, "VCLXGraphics::Init allready has pOutDev !" );
-    mpOutputDevice  = pOutDev;
+    mpOutputDevice 	= pOutDev;
 
-    maFont          = mpOutputDevice->GetFont();
-    maTextColor     = COL_BLACK;
+    maFont 			= mpOutputDevice->GetFont();
+    maTextColor 	= COL_BLACK;
     maTextFillColor = COL_TRANSPARENT;
-    maLineColor     = COL_BLACK;
-    maFillColor     = COL_WHITE;
-    meRasterOp      = ROP_OVERPAINT;
-    mpClipRegion    = NULL;
+    maLineColor 	= COL_BLACK;
+    maFillColor 	= COL_WHITE;
+    meRasterOp 		= ROP_OVERPAINT;
+    mpClipRegion 	= NULL;
 
     // Register at OutputDevice
     List* pLst = mpOutputDevice->GetUnoGraphicsList();
@@ -107,7 +107,7 @@ void VCLXGraphics::Init( OutputDevice* pOutDev )
 
 void VCLXGraphics::InitOutputDevice( sal_uInt16 nFlags )
 {
-    if(mpOutputDevice)
+    if(mpOutputDevice) 
     {
         NAMESPACE_VOS(OGuard) aVclGuard( Application::GetSolarMutex()  );
 
@@ -157,7 +157,7 @@ void VCLXGraphics::InitOutputDevice( sal_uInt16 nFlags )
     ::vos::OGuard aGuard( GetMutex() );
 
     ::com::sun::star::awt::SimpleFontMetric aM;
-    if( mpOutputDevice )
+    if( mpOutputDevice ) 
     {
         mpOutputDevice->SetFont( maFont );
         aM = VCLUnoHelper::CreateFontMetric( mpOutputDevice->GetFontMetric() );
@@ -261,14 +261,14 @@ void VCLXGraphics::copy( const ::com::sun::star::uno::Reference< ::com::sun::sta
 {
     ::vos::OGuard aGuard( GetMutex() );
 
-    if ( mpOutputDevice )
+    if ( mpOutputDevice ) 
     {
         VCLXDevice* pFromDev = VCLXDevice::GetImplementation( rxSource );
         DBG_ASSERT( pFromDev, "VCLXGraphics::copy - invalid device" );
         if ( pFromDev )
         {
             InitOutputDevice( INITOUTDEV_CLIPREGION|INITOUTDEV_RASTEROP );
-            mpOutputDevice->DrawOutDev( Point( nDestX, nDestY ), Size( nDestWidth, nDestHeight ),
+            mpOutputDevice->DrawOutDev( Point( nDestX, nDestY ), Size( nDestWidth, nDestHeight ), 
                                     Point( nSourceX, nSourceY ), Size( nSourceWidth, nSourceHeight ), *pFromDev->GetOutputDevice() );
         }
     }
@@ -283,23 +283,23 @@ void VCLXGraphics::draw( const ::com::sun::star::uno::Reference< ::com::sun::sta
         InitOutputDevice( INITOUTDEV_CLIPREGION|INITOUTDEV_RASTEROP);
         ::com::sun::star::uno::Reference< ::com::sun::star::awt::XBitmap > xBitmap( rxBitmapHandle, ::com::sun::star::uno::UNO_QUERY );
         BitmapEx aBmpEx = VCLUnoHelper::GetBitmap( xBitmap );
-
+        
         Point aPos(nDestX - nSourceX, nDestY - nSourceY);
           Size aSz = aBmpEx.GetSizePixel();
 
-        if(nDestWidth != nSourceWidth)
+        if(nDestWidth != nSourceWidth) 
         {
             float zoomX = (float)nDestWidth / (float)nSourceWidth;
-            aSz.Width() = (long) ((float)aSz.Width() * zoomX);
+            aSz.Width() = (long) ((float)aSz.Width() * zoomX); 
         }
 
-        if(nDestHeight != nSourceHeight)
+        if(nDestHeight != nSourceHeight) 
         {
             float zoomY = (float)nDestHeight / (float)nSourceHeight;
             aSz.Height() = (long) ((float)aSz.Height() * zoomY);
         }
 
-        if(nSourceX || nSourceY || aSz.Width() != nSourceWidth || aSz.Height() != nSourceHeight)
+        if(nSourceX || nSourceY || aSz.Width() != nSourceWidth || aSz.Height() != nSourceHeight) 
             mpOutputDevice->IntersectClipRegion(Region(Rectangle(nDestX, nDestY, nDestX + nDestWidth - 1, nDestY + nDestHeight - 1)));
 
         mpOutputDevice->DrawBitmapEx( aPos, aSz, aBmpEx );
diff --git a/toolkit/source/awt/vclxmenu.cxx b/toolkit/source/awt/vclxmenu.cxx
index 5e44df58318e..c6294c882ab7 100644
--- a/toolkit/source/awt/vclxmenu.cxx
+++ b/toolkit/source/awt/vclxmenu.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
@@ -76,9 +76,9 @@
 #endif
 
 
-//  ----------------------------------------------------
-//  class VCLXMenu
-//  ----------------------------------------------------
+//	----------------------------------------------------
+//	class VCLXMenu
+//	----------------------------------------------------
 
 DBG_NAME(VCLXMenu)
 
@@ -1073,9 +1073,9 @@ throw ( ::com::sun::star::container::NoSuchElementException,
 }
 
 
-//  ----------------------------------------------------
-//  class VCLXMenuBar
-//  ----------------------------------------------------
+//	----------------------------------------------------
+//	class VCLXMenuBar
+//	----------------------------------------------------
 
 DBG_NAME(VCLXMenuBar);
 
@@ -1090,9 +1090,9 @@ VCLXMenuBar::VCLXMenuBar( MenuBar* pMenuBar ) : VCLXMenu( (Menu *)pMenuBar )
     DBG_CTOR( VCLXMenuBar, 0 );
 }
 
-//  ----------------------------------------------------
-//  class VCLXPopupMenu
-//  ----------------------------------------------------
+//	----------------------------------------------------
+//	class VCLXPopupMenu
+//	----------------------------------------------------
 
 DBG_NAME(VCLXPopupMenu);
 
diff --git a/toolkit/source/awt/vclxplugin.cxx b/toolkit/source/awt/vclxplugin.cxx
index 29264ef0a85d..7c6c63d832e7 100644
--- a/toolkit/source/awt/vclxplugin.cxx
+++ b/toolkit/source/awt/vclxplugin.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
@@ -55,11 +55,11 @@ void SAL_CALL VCLXPlugin::dispose() throw(uno::RuntimeException)
 {
     {
         ::vos::OGuard aGuard( GetMutex() );
-
+        
         lang::EventObject aDisposeEvent;
         aDisposeEvent.Source = W3K_EXPLICIT_CAST (*this);
     }
-
+    
     VCLXWindow::dispose();
 }
 
diff --git a/toolkit/source/awt/vclxplugin.hxx b/toolkit/source/awt/vclxplugin.hxx
index 49a2b2950854..20f07ea420a7 100644
--- a/toolkit/source/awt/vclxplugin.hxx
+++ b/toolkit/source/awt/vclxplugin.hxx
@@ -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
diff --git a/toolkit/source/awt/vclxpointer.cxx b/toolkit/source/awt/vclxpointer.cxx
index d6f2160fb694..a44db76abf21 100644
--- a/toolkit/source/awt/vclxpointer.cxx
+++ b/toolkit/source/awt/vclxpointer.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
@@ -33,9 +33,9 @@
 #include <toolkit/helper/macros.hxx>
 #include <cppuhelper/typeprovider.hxx>
 
-//  ----------------------------------------------------
-//  class VCLXPointer
-//  ----------------------------------------------------
+//	----------------------------------------------------
+//	class VCLXPointer
+//	----------------------------------------------------
 VCLXPointer::VCLXPointer()
 {
 }
diff --git a/toolkit/source/awt/vclxprinter.cxx b/toolkit/source/awt/vclxprinter.cxx
index 3c100c7c2186..0bf43ae6a217 100644
--- a/toolkit/source/awt/vclxprinter.cxx
+++ b/toolkit/source/awt/vclxprinter.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
@@ -46,10 +46,10 @@
 #include <toolkit/awt/vclxdevice.hxx>
 
 
-#define BINARYSETUPMARKER   0x23864691
+#define BINARYSETUPMARKER	0x23864691
 
-#define PROPERTY_Orientation    0
-#define PROPERTY_Horizontal     1
+#define PROPERTY_Orientation	0
+#define PROPERTY_Horizontal		1
 
 ::com::sun::star::beans::Property* ImplGetProperties( sal_uInt16& rElementCount )
 {
@@ -73,9 +73,9 @@
     return pProperties;
 }
 
-//  ----------------------------------------------------
-//  class VCLXPrinterPropertySet
-//  ----------------------------------------------------
+//	----------------------------------------------------
+//	class VCLXPrinterPropertySet
+//	----------------------------------------------------
 
 // ::com::sun::star::uno::XInterface
 ::com::sun::star::uno::Any VCLXPrinterPropertySet::queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException)
@@ -115,7 +115,7 @@ VCLXPrinterPropertySet::~VCLXPrinterPropertySet()
 
 ::com::sun::star::uno::Reference< ::com::sun::star::awt::XDevice >  VCLXPrinterPropertySet::GetDevice()
 {
-    if ( !mxPrnDevice.is() )
+    if ( !mxPrnDevice.is() ) 
     {
         VCLXDevice* pDev = new VCLXDevice;
         pDev->SetOutputDevice( GetPrinter() );
@@ -149,9 +149,9 @@ VCLXPrinterPropertySet::~VCLXPrinterPropertySet()
 sal_Bool VCLXPrinterPropertySet::convertFastPropertyValue( ::com::sun::star::uno::Any & rConvertedValue, ::com::sun::star::uno::Any & rOldValue, sal_Int32 nHandle, const ::com::sun::star::uno::Any& rValue ) throw (::com::sun::star::lang::IllegalArgumentException)
 {
     ::osl::Guard< ::osl::Mutex > aGuard( Mutex );
-
+    
     sal_Bool bDifferent = sal_False;
-    switch ( nHandle )
+    switch ( nHandle ) 
     {
         case PROPERTY_Orientation:
         {
@@ -186,7 +186,7 @@ sal_Bool VCLXPrinterPropertySet::convertFastPropertyValue( ::com::sun::star::uno
 void VCLXPrinterPropertySet::setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const ::com::sun::star::uno::Any& rValue ) throw (::com::sun::star::uno::Exception)
 {
     ::osl::Guard< ::osl::Mutex > aGuard( Mutex );
-
+    
     switch( nHandle )
     {
         case PROPERTY_Orientation:
@@ -209,7 +209,7 @@ void VCLXPrinterPropertySet::setFastPropertyValue_NoBroadcast( sal_Int32 nHandle
 void VCLXPrinterPropertySet::getFastPropertyValue( ::com::sun::star::uno::Any& rValue, sal_Int32 nHandle ) const
 {
     ::osl::Guard< ::osl::Mutex > aGuard( ((VCLXPrinterPropertySet*)this)->Mutex );
-
+    
     switch( nHandle )
     {
         case PROPERTY_Orientation:
@@ -238,10 +238,10 @@ void VCLXPrinterPropertySet::setHorizontal( sal_Bool bHorizontal ) throw(::com::
 ::com::sun::star::uno::Sequence< ::rtl::OUString > VCLXPrinterPropertySet::getFormDescriptions(  ) throw(::com::sun::star::uno::RuntimeException)
 {
     ::osl::Guard< ::osl::Mutex > aGuard( Mutex );
-
+    
     sal_uInt16 nPaperBinCount = GetPrinter()->GetPaperBinCount();
-    ::com::sun::star::uno::Sequence< ::rtl::OUString >  aDescriptions( nPaperBinCount );
-    for ( sal_uInt16 n = 0; n < nPaperBinCount; n++ )
+    ::com::sun::star::uno::Sequence< ::rtl::OUString >	aDescriptions( nPaperBinCount );
+    for ( sal_uInt16 n = 0; n < nPaperBinCount; n++ ) 
     {
         // Format: <DisplayFormName;FormNameId;DisplayPaperBinName;PaperBinNameId;DisplayPaperName;PaperNameId>
         String aDescr( RTL_CONSTASCII_USTRINGPARAM( "*;*;" ) );
@@ -258,7 +258,7 @@ void VCLXPrinterPropertySet::setHorizontal( sal_Bool bHorizontal ) throw(::com::
 void VCLXPrinterPropertySet::selectForm( const ::rtl::OUString& rFormDescription ) throw(::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException)
 {
     ::osl::Guard< ::osl::Mutex > aGuard( Mutex );
-
+    
     sal_Int32 nIndex = 0;
     sal_uInt16 nPaperBin = sal::static_int_cast< sal_uInt16 >(
         rFormDescription.getToken( 3, ';', nIndex ).toInt32());
@@ -268,7 +268,7 @@ void VCLXPrinterPropertySet::selectForm( const ::rtl::OUString& rFormDescription
 ::com::sun::star::uno::Sequence< sal_Int8 > VCLXPrinterPropertySet::getBinarySetup(  ) throw(::com::sun::star::uno::RuntimeException)
 {
     ::osl::Guard< ::osl::Mutex > aGuard( Mutex );
-
+    
     SvMemoryStream aMem;
     aMem << BINARYSETUPMARKER;
     aMem << GetPrinter()->GetJobSetup();
@@ -278,12 +278,12 @@ void VCLXPrinterPropertySet::selectForm( const ::rtl::OUString& rFormDescription
 void VCLXPrinterPropertySet::setBinarySetup( const ::com::sun::star::uno::Sequence< sal_Int8 >& data ) throw(::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException)
 {
     ::osl::Guard< ::osl::Mutex > aGuard( Mutex );
-
+    
     SvMemoryStream aMem( (char*) data.getConstArray(), data.getLength(), STREAM_READ );
     sal_uInt32 nMarker;
     aMem >> nMarker;
     DBG_ASSERT( nMarker == BINARYSETUPMARKER, "setBinarySetup - invalid!" );
-    if ( nMarker == BINARYSETUPMARKER )
+    if ( nMarker == BINARYSETUPMARKER ) 
     {
         JobSetup aSetup;
         aMem >> aSetup;
@@ -292,10 +292,10 @@ void VCLXPrinterPropertySet::setBinarySetup( const ::com::sun::star::uno::Sequen
 }
 
 
-//  ----------------------------------------------------
-//  class VCLXPrinter
-//  ----------------------------------------------------
-VCLXPrinter::VCLXPrinter( const String& rPrinterName )
+//	----------------------------------------------------
+//	class VCLXPrinter
+//	----------------------------------------------------
+VCLXPrinter::VCLXPrinter( const String& rPrinterName ) 
     : VCLXPrinterPropertySet( rPrinterName )
 {
 }
@@ -325,22 +325,22 @@ IMPL_XTYPEPROVIDER_END
 sal_Bool VCLXPrinter::start( const ::rtl::OUString& /*rJobName*/, sal_Int16 /*nCopies*/, sal_Bool /*bCollate*/ ) throw(::com::sun::star::awt::PrinterException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException)
 {
     ::osl::Guard< ::osl::Mutex > aGuard( Mutex );
-
+    
     sal_Bool bDone = sal_True;
     if ( mpListener.get() )
     {
         maInitJobSetup = mpPrinter->GetJobSetup();
         mpListener.reset( new vcl::OldStylePrintAdaptor( mpPrinter ) );
     }
-
+    
     return bDone;
 }
 
 void VCLXPrinter::end(  ) throw(::com::sun::star::awt::PrinterException, ::com::sun::star::uno::RuntimeException)
 {
     ::osl::Guard< ::osl::Mutex > aGuard( Mutex );
-
-    if ( mpListener.get() )
+    
+    if ( mpListener.get() ) 
     {
         Printer::PrintJob( mpListener, maInitJobSetup );
         mpListener.reset();
@@ -351,14 +351,14 @@ void VCLXPrinter::terminate(  ) throw(::com::sun::star::uno::RuntimeException)
 {
     ::osl::Guard< ::osl::Mutex > aGuard( Mutex );
 
-    mpListener.reset();
+    mpListener.reset();	
 }
 
 ::com::sun::star::uno::Reference< ::com::sun::star::awt::XDevice > VCLXPrinter::startPage(  ) throw(::com::sun::star::awt::PrinterException, ::com::sun::star::uno::RuntimeException)
 {
     ::osl::Guard< ::osl::Mutex > aGuard( Mutex );
-
-    if ( mpListener.get() )
+    
+    if ( mpListener.get() ) 
     {
         mpListener->StartPage();
     }
@@ -368,19 +368,19 @@ void VCLXPrinter::terminate(  ) throw(::com::sun::star::uno::RuntimeException)
 void VCLXPrinter::endPage(  ) throw(::com::sun::star::awt::PrinterException, ::com::sun::star::uno::RuntimeException)
 {
     ::osl::Guard< ::osl::Mutex > aGuard( Mutex );
-
-    if ( mpListener.get() )
+    
+    if ( mpListener.get() ) 
     {
         mpListener->EndPage();
     }
 }
 
 
-//  ----------------------------------------------------
-//  class VCLXInfoPrinter
-//  ----------------------------------------------------
+//	----------------------------------------------------
+//	class VCLXInfoPrinter
+//	----------------------------------------------------
 
-VCLXInfoPrinter::VCLXInfoPrinter( const String& rPrinterName )
+VCLXInfoPrinter::VCLXInfoPrinter( const String& rPrinterName ) 
     : VCLXPrinterPropertySet( rPrinterName )
 {
 }
@@ -411,13 +411,13 @@ IMPL_XTYPEPROVIDER_END
 ::com::sun::star::uno::Reference< ::com::sun::star::awt::XDevice > VCLXInfoPrinter::createDevice(  ) throw(::com::sun::star::uno::RuntimeException)
 {
     ::osl::Guard< ::osl::Mutex > aGuard( Mutex );
-
+    
     return GetDevice();
 }
 
-//  ----------------------------------------------------
-//  class VCLXPrinterServer
-//  ----------------------------------------------------
+//	----------------------------------------------------
+//	class VCLXPrinterServer
+//	----------------------------------------------------
 
 // ::com::sun::star::uno::XInterface
 ::com::sun::star::uno::Any VCLXPrinterServer::queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException)
@@ -438,10 +438,10 @@ IMPL_XTYPEPROVIDER_END
     const std::vector<rtl::OUString>& rQueues = Printer::GetPrinterQueues();
     sal_uInt32 nPrinters = rQueues.size();
 
-    ::com::sun::star::uno::Sequence< ::rtl::OUString >  aNames( nPrinters );
-    for ( sal_uInt32 n = 0; n < nPrinters; n++ )
+    ::com::sun::star::uno::Sequence< ::rtl::OUString >	aNames( nPrinters );
+    for ( sal_uInt32 n = 0; n < nPrinters; n++ ) 
         aNames.getArray()[n] = rQueues[n];
-
+    
     return aNames;
 }
 
diff --git a/toolkit/source/awt/vclxregion.cxx b/toolkit/source/awt/vclxregion.cxx
index 3c4bbcad2d79..1a60b88c7b19 100644
--- a/toolkit/source/awt/vclxregion.cxx
+++ b/toolkit/source/awt/vclxregion.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
@@ -38,9 +38,9 @@
 #include <rtl/uuid.h>
 #include <vcl/svapp.hxx>
 
-//  ----------------------------------------------------
-//  class VCLXRegion
-//  ----------------------------------------------------
+//	----------------------------------------------------
+//	class VCLXRegion
+//	----------------------------------------------------
 VCLXRegion::VCLXRegion()
 {
 }
diff --git a/toolkit/source/awt/vclxscroller.cxx b/toolkit/source/awt/vclxscroller.cxx
index 834632a7548b..3ebbfe0fed10 100644
--- a/toolkit/source/awt/vclxscroller.cxx
+++ b/toolkit/source/awt/vclxscroller.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
diff --git a/toolkit/source/awt/vclxscroller.hxx b/toolkit/source/awt/vclxscroller.hxx
index be2524020c72..7f9b9f0e5efa 100644
--- a/toolkit/source/awt/vclxscroller.hxx
+++ b/toolkit/source/awt/vclxscroller.hxx
@@ -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
diff --git a/toolkit/source/awt/vclxspinbutton.cxx b/toolkit/source/awt/vclxspinbutton.cxx
index e9c2b3271396..bd4b9827afff 100644
--- a/toolkit/source/awt/vclxspinbutton.cxx
+++ b/toolkit/source/awt/vclxspinbutton.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
@@ -108,14 +108,14 @@ namespace toolkit
         if ( listener.is() )
             maAdjustmentListeners.addInterface( listener );
     }
-
+    
     //--------------------------------------------------------------------
     void SAL_CALL VCLXSpinButton::removeAdjustmentListener( const Reference< XAdjustmentListener >& listener ) throw (RuntimeException)
     {
         if ( listener.is() )
             maAdjustmentListeners.removeInterface( listener );
     }
-
+    
     namespace
     {
         typedef void (SpinButton::*SetSpinButtonValue) (long);
@@ -150,7 +150,7 @@ namespace toolkit
     {
         lcl_setSpinButtonValue( GetMutex(), GetWindow(), &SpinButton::SetValue, n );
     }
-
+    
     //--------------------------------------------------------------------
     void SAL_CALL VCLXSpinButton::setValues( sal_Int32 minValue, sal_Int32 maxValue, sal_Int32 currentValue ) throw (RuntimeException)
     {
@@ -160,49 +160,49 @@ namespace toolkit
         setMaximum( maxValue );
         setValue( currentValue );
     }
-
+    
     //--------------------------------------------------------------------
     sal_Int32 SAL_CALL VCLXSpinButton::getValue(  ) throw (RuntimeException)
     {
         return lcl_getSpinButtonValue( GetMutex(), GetWindow(), &SpinButton::GetValue );
     }
-
+    
     //--------------------------------------------------------------------
     void SAL_CALL VCLXSpinButton::setMinimum( sal_Int32 minValue ) throw (RuntimeException)
     {
         lcl_setSpinButtonValue( GetMutex(), GetWindow(), &SpinButton::SetRangeMin, minValue );
     }
-
+    
     //--------------------------------------------------------------------
     void SAL_CALL VCLXSpinButton::setMaximum( sal_Int32 maxValue ) throw (RuntimeException)
     {
         lcl_setSpinButtonValue( GetMutex(), GetWindow(), &SpinButton::SetRangeMax, maxValue );
     }
-
+    
     //--------------------------------------------------------------------
     sal_Int32 SAL_CALL VCLXSpinButton::getMinimum(  ) throw (RuntimeException)
     {
         return lcl_getSpinButtonValue( GetMutex(), GetWindow(), &SpinButton::GetRangeMin );
     }
-
+    
     //--------------------------------------------------------------------
     sal_Int32 SAL_CALL VCLXSpinButton::getMaximum(  ) throw (RuntimeException)
     {
         return lcl_getSpinButtonValue( GetMutex(), GetWindow(), &SpinButton::GetRangeMax );
     }
-
+    
     //--------------------------------------------------------------------
     void SAL_CALL VCLXSpinButton::setSpinIncrement( sal_Int32 spinIncrement ) throw (RuntimeException)
     {
         lcl_setSpinButtonValue( GetMutex(), GetWindow(), &SpinButton::SetValueStep, spinIncrement );
     }
-
+    
     //--------------------------------------------------------------------
     sal_Int32 SAL_CALL VCLXSpinButton::getSpinIncrement(  ) throw (RuntimeException)
     {
         return lcl_getSpinButtonValue( GetMutex(), GetWindow(), &SpinButton::GetValueStep );
     }
-
+    
     //--------------------------------------------------------------------
     void SAL_CALL VCLXSpinButton::setOrientation( sal_Int32 orientation ) throw (NoSupportException, RuntimeException)
     {
@@ -210,7 +210,7 @@ namespace toolkit
 
         lcl_modifyStyle( GetWindow(), WB_HSCROLL, orientation == ScrollBarOrientation::HORIZONTAL );
     }
-
+    
     //--------------------------------------------------------------------
     sal_Int32 SAL_CALL VCLXSpinButton::getOrientation(  ) throw (RuntimeException)
     {
@@ -218,7 +218,7 @@ namespace toolkit
             ?   ScrollBarOrientation::HORIZONTAL
             :   ScrollBarOrientation::VERTICAL;
     }
-
+    
     //--------------------------------------------------------------------
     void VCLXSpinButton::ProcessWindowEvent( const VclWindowEvent& _rVclWindowEvent )
     {
@@ -300,7 +300,7 @@ namespace toolkit
             }
         }
     }
-
+    
     //--------------------------------------------------------------------
     Any SAL_CALL VCLXSpinButton::getProperty( const ::rtl::OUString& PropertyName ) throw(RuntimeException)
     {
diff --git a/toolkit/source/awt/vclxsplitter.cxx b/toolkit/source/awt/vclxsplitter.cxx
index 07fcf96cb813..c272f4611717 100644
--- a/toolkit/source/awt/vclxsplitter.cxx
+++ b/toolkit/source/awt/vclxsplitter.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
diff --git a/toolkit/source/awt/vclxsplitter.hxx b/toolkit/source/awt/vclxsplitter.hxx
index 69be466e6be8..90f8926a31a9 100644
--- a/toolkit/source/awt/vclxsplitter.hxx
+++ b/toolkit/source/awt/vclxsplitter.hxx
@@ -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
diff --git a/toolkit/source/awt/vclxsystemdependentwindow.cxx b/toolkit/source/awt/vclxsystemdependentwindow.cxx
index a0d8febb44f0..2540a253ed1a 100644
--- a/toolkit/source/awt/vclxsystemdependentwindow.cxx
+++ b/toolkit/source/awt/vclxsystemdependentwindow.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
@@ -52,9 +52,9 @@
 #include <vcl/syschild.hxx>
 #include <vcl/sysdata.hxx>
 
-//  ----------------------------------------------------
-//  class VCLXSystemDependentWindow
-//  ----------------------------------------------------
+//	----------------------------------------------------
+//	class VCLXSystemDependentWindow
+//	----------------------------------------------------
 VCLXSystemDependentWindow::VCLXSystemDependentWindow()
 {
 }
diff --git a/toolkit/source/awt/vclxtabcontrol.cxx b/toolkit/source/awt/vclxtabcontrol.cxx
index 1dfd52678957..1aceb600affd 100644
--- a/toolkit/source/awt/vclxtabcontrol.cxx
+++ b/toolkit/source/awt/vclxtabcontrol.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
diff --git a/toolkit/source/awt/vclxtabcontrol.hxx b/toolkit/source/awt/vclxtabcontrol.hxx
index 8f5debf2626c..36e0d9f0cd77 100644
--- a/toolkit/source/awt/vclxtabcontrol.hxx
+++ b/toolkit/source/awt/vclxtabcontrol.hxx
@@ -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
diff --git a/toolkit/source/awt/vclxtabpage.cxx b/toolkit/source/awt/vclxtabpage.cxx
index 6523f7e98c5f..fae1c35c87d8 100644
--- a/toolkit/source/awt/vclxtabpage.cxx
+++ b/toolkit/source/awt/vclxtabpage.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
@@ -66,11 +66,11 @@ void SAL_CALL VCLXTabPage::dispose() throw(uno::RuntimeException)
 {
     {
         ::vos::OGuard aGuard( GetMutex() );
-
+        
         lang::EventObject aDisposeEvent;
         aDisposeEvent.Source = W3K_EXPLICIT_CAST (*this);
     }
-
+    
     VCLXWindow::dispose();
 }
 
diff --git a/toolkit/source/awt/vclxtabpage.hxx b/toolkit/source/awt/vclxtabpage.hxx
index 215ee49c5716..ef9b78a2d06f 100644
--- a/toolkit/source/awt/vclxtabpage.hxx
+++ b/toolkit/source/awt/vclxtabpage.hxx
@@ -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
@@ -47,7 +47,7 @@ public:
 
     // XInterface
     DECLARE_XINTERFACE()
-
+    
     // XTypeProvider
     DECLARE_XTYPEPROVIDER()
 
diff --git a/toolkit/source/awt/vclxtoolkit.cxx b/toolkit/source/awt/vclxtoolkit.cxx
index f85e29c21099..c8ee01672d1a 100644
--- a/toolkit/source/awt/vclxtoolkit.cxx
+++ b/toolkit/source/awt/vclxtoolkit.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
@@ -122,8 +122,8 @@
 
 namespace css = ::com::sun::star;
 
-#define VCLWINDOW_FRAMEWINDOW               0x1000
-#define VCLWINDOW_SYSTEMCHILDWINDOW         0x1001
+#define VCLWINDOW_FRAMEWINDOW				0x1000
+#define VCLWINDOW_SYSTEMCHILDWINDOW			0x1001
 
 #if (defined WNT)
 #define SYSTEM_DEPENDENT_TYPE ::com::sun::star::lang::SystemDependent::SYSTEM_WIN32
@@ -259,77 +259,77 @@ TOOLKIT_DLLPUBLIC WinBits ImplGetWinBits( sal_uInt32 nComponentAttribs, sal_uInt
 
 struct ComponentInfo
 {
-    const char*     pName;
-    WindowType      nWinType;
+    const char*		pName;
+    WindowType		nWinType;
 };
 
 static ComponentInfo __FAR_DATA aComponentInfos [] =
 {
-    { "buttondialog",       WINDOW_BUTTONDIALOG },
-    { "cancelbutton",       WINDOW_CANCELBUTTON },
-    { "checkbox",           WINDOW_CHECKBOX },
-    { "combobox",           WINDOW_COMBOBOX },
-    { "control",            WINDOW_CONTROL },
-    { "currencybox",        WINDOW_CURRENCYBOX },
-    { "currencyfield",      WINDOW_CURRENCYFIELD },
-    { "datebox",            WINDOW_DATEBOX },
-    { "datefield",          WINDOW_DATEFIELD },
-    { "dialog",             WINDOW_DIALOG },
-    { "dockingarea",        WINDOW_DOCKINGAREA },
-    { "dockingwindow",      WINDOW_DOCKINGWINDOW },
-    { "edit",               WINDOW_EDIT },
-    { "errorbox",           WINDOW_ERRORBOX },
-    { "fixedbitmap",        WINDOW_FIXEDBITMAP },
-    { "fixedimage",         WINDOW_FIXEDIMAGE },
-    { "fixedline",          WINDOW_FIXEDLINE },
-    { "fixedtext",          WINDOW_FIXEDTEXT },
-    { "floatingwindow",     WINDOW_FLOATINGWINDOW },
-    { "framewindow",        VCLWINDOW_FRAMEWINDOW },
-    { "groupbox",           WINDOW_GROUPBOX },
-    { "helpbutton",         WINDOW_HELPBUTTON },
-    { "imagebutton",        WINDOW_IMAGEBUTTON },
-    { "imageradiobutton",   WINDOW_IMAGERADIOBUTTON },
-    { "infobox",            WINDOW_INFOBOX },
-    { "listbox",            WINDOW_LISTBOX },
-    { "longcurrencybox",    WINDOW_LONGCURRENCYBOX },
-    { "longcurrencyfield",  WINDOW_LONGCURRENCYFIELD },
-    { "menubutton",         WINDOW_MENUBUTTON },
-    { "messbox",            WINDOW_MESSBOX },
-    { "metricbox",          WINDOW_METRICBOX },
-    { "metricfield",        WINDOW_METRICFIELD },
-    { "modaldialog",        WINDOW_MODALDIALOG },
-    { "modelessdialog",     WINDOW_MODELESSDIALOG },
-    { "morebutton",         WINDOW_MOREBUTTON },
-    { "multilineedit",      WINDOW_MULTILINEEDIT },
-    { "multilistbox",       WINDOW_MULTILISTBOX },
-    { "numericbox",         WINDOW_NUMERICBOX },
-    { "numericfield",       WINDOW_NUMERICFIELD },
-    { "okbutton",           WINDOW_OKBUTTON },
-    { "patternbox",         WINDOW_PATTERNBOX },
-    { "patternfield",       WINDOW_PATTERNFIELD },
-    { "pushbutton",         WINDOW_PUSHBUTTON },
-    { "querybox",           WINDOW_QUERYBOX },
-    { "radiobutton",        WINDOW_RADIOBUTTON },
-    { "scrollbar",          WINDOW_SCROLLBAR },
-    { "scrollbarbox",       WINDOW_SCROLLBARBOX },
-    { "simpleanimation",    WINDOW_CONTROL },
-    { "spinbutton",         WINDOW_SPINBUTTON },
-    { "spinfield",          WINDOW_SPINFIELD },
-    { "throbber",           WINDOW_CONTROL },
-    { "splitter",           WINDOW_SPLITTER },
-    { "splitwindow",        WINDOW_SPLITWINDOW },
-    { "statusbar",          WINDOW_STATUSBAR },
-    { "systemchildwindow",  VCLWINDOW_SYSTEMCHILDWINDOW },
-    { "tabcontrol",         WINDOW_TABCONTROL },
-    { "tabdialog",          WINDOW_TABDIALOG },
-    { "tabpage",            WINDOW_TABPAGE },
-    { "timebox",            WINDOW_TIMEBOX },
-    { "timefield",          WINDOW_TIMEFIELD },
-    { "toolbox",            WINDOW_TOOLBOX },
-    { "tristatebox",        WINDOW_TRISTATEBOX },
-    { "warningbox",         WINDOW_WARNINGBOX },
-    { "window",             WINDOW_WINDOW },
-    { "workwindow",         WINDOW_WORKWINDOW }
+    { "buttondialog", 		WINDOW_BUTTONDIALOG },
+    { "cancelbutton",		WINDOW_CANCELBUTTON },
+    { "checkbox",			WINDOW_CHECKBOX },
+    { "combobox",			WINDOW_COMBOBOX },
+    { "control",			WINDOW_CONTROL },
+    { "currencybox",		WINDOW_CURRENCYBOX },
+    { "currencyfield",		WINDOW_CURRENCYFIELD },
+    { "datebox",			WINDOW_DATEBOX },
+    { "datefield",			WINDOW_DATEFIELD },
+    { "dialog",				WINDOW_DIALOG },
+    { "dockingarea",		WINDOW_DOCKINGAREA },
+    { "dockingwindow",		WINDOW_DOCKINGWINDOW },
+    { "edit",				WINDOW_EDIT },
+    { "errorbox",			WINDOW_ERRORBOX },
+    { "fixedbitmap",		WINDOW_FIXEDBITMAP },
+    { "fixedimage",			WINDOW_FIXEDIMAGE },
+    { "fixedline",			WINDOW_FIXEDLINE },
+    { "fixedtext",			WINDOW_FIXEDTEXT },
+    { "floatingwindow",		WINDOW_FLOATINGWINDOW },
+    { "framewindow",		VCLWINDOW_FRAMEWINDOW },
+    { "groupbox",			WINDOW_GROUPBOX },
+    { "helpbutton",			WINDOW_HELPBUTTON },
+    { "imagebutton",		WINDOW_IMAGEBUTTON },
+    { "imageradiobutton",	WINDOW_IMAGERADIOBUTTON },
+    { "infobox",			WINDOW_INFOBOX },
+    { "listbox",			WINDOW_LISTBOX },
+    { "longcurrencybox",	WINDOW_LONGCURRENCYBOX },
+    { "longcurrencyfield",	WINDOW_LONGCURRENCYFIELD },
+    { "menubutton",			WINDOW_MENUBUTTON },
+    { "messbox",			WINDOW_MESSBOX },
+    { "metricbox",			WINDOW_METRICBOX },
+    { "metricfield",		WINDOW_METRICFIELD },
+    { "modaldialog",		WINDOW_MODALDIALOG },
+    { "modelessdialog",		WINDOW_MODELESSDIALOG },
+    { "morebutton",			WINDOW_MOREBUTTON },
+    { "multilineedit",		WINDOW_MULTILINEEDIT },
+    { "multilistbox",		WINDOW_MULTILISTBOX },
+    { "numericbox",			WINDOW_NUMERICBOX },
+    { "numericfield",		WINDOW_NUMERICFIELD },
+    { "okbutton",			WINDOW_OKBUTTON },
+    { "patternbox",			WINDOW_PATTERNBOX },
+    { "patternfield",		WINDOW_PATTERNFIELD },
+    { "pushbutton",			WINDOW_PUSHBUTTON },
+    { "querybox",			WINDOW_QUERYBOX },
+    { "radiobutton",		WINDOW_RADIOBUTTON },
+    { "scrollbar",			WINDOW_SCROLLBAR },
+    { "scrollbarbox",		WINDOW_SCROLLBARBOX },
+    { "simpleanimation",	WINDOW_CONTROL },
+    { "spinbutton",			WINDOW_SPINBUTTON },
+    { "spinfield",			WINDOW_SPINFIELD },
+    { "throbber",        	WINDOW_CONTROL },
+    { "splitter",			WINDOW_SPLITTER },
+    { "splitwindow",		WINDOW_SPLITWINDOW },
+    { "statusbar",			WINDOW_STATUSBAR },
+    { "systemchildwindow",	VCLWINDOW_SYSTEMCHILDWINDOW },
+    { "tabcontrol",			WINDOW_TABCONTROL },
+    { "tabdialog",			WINDOW_TABDIALOG },
+    { "tabpage",			WINDOW_TABPAGE },
+    { "timebox",			WINDOW_TIMEBOX },
+    { "timefield",			WINDOW_TIMEFIELD },
+    { "toolbox",			WINDOW_TOOLBOX },
+    { "tristatebox",		WINDOW_TRISTATEBOX },
+    { "warningbox",			WINDOW_WARNINGBOX },
+    { "window",				WINDOW_WINDOW },
+    { "workwindow",			WINDOW_WORKWINDOW }
 };
 
 extern "C"
@@ -353,7 +353,7 @@ sal_uInt16 ImplGetComponentType( const String& rServiceName )
     static sal_Bool bSorted = sal_False;
     if( !bSorted )
     {
-        qsort(  (void*) aComponentInfos,
+        qsort( 	(void*) aComponentInfos,
                 sizeof( aComponentInfos ) / sizeof( ComponentInfo ),
                 sizeof( ComponentInfo ),
                 ComponentInfoCompare );
@@ -379,13 +379,13 @@ sal_uInt16 ImplGetComponentType( const String& rServiceName )
 }
 
 
-//  ----------------------------------------------------
-//  class VCLXToolkit
-//  ----------------------------------------------------
+//	----------------------------------------------------
+//	class VCLXToolkit
+//	----------------------------------------------------
 
-static sal_Int32                            nVCLToolkitInstanceCount = 0;
-static BOOL                                 bInitedByVCLToolkit = sal_False;
-//static cppu::OInterfaceContainerHelper *  pToolkits = 0;
+static sal_Int32							nVCLToolkitInstanceCount = 0;
+static BOOL									bInitedByVCLToolkit = sal_False;
+//static cppu::OInterfaceContainerHelper *	pToolkits = 0;
 
 static osl::Mutex & getInitMutex()
 {
@@ -458,7 +458,7 @@ static void SAL_CALL ToolkitWorkerFunction( void* pArgs )
         if( pToolkits )
         {
             cppu::OInterfaceIteratorHelper aIt( *pToolkits );
-            ::com::sun::star::uno::XInterface * pI;
+            ::com::sun::star::uno::XInterface *	pI;
             while( pI = aIt.next() )
                 ((::com::sun::star::lang::XComponent *)pI)->dispose();
 
@@ -617,7 +617,7 @@ void SAL_CALL VCLXToolkit::disposing()
     return xRef;
 }
 
-Window* VCLXToolkit::ImplCreateWindow( VCLXWindow** ppNewComp,
+Window*	VCLXToolkit::ImplCreateWindow( VCLXWindow** ppNewComp,
     const ::com::sun::star::awt::WindowDescriptor& rDescriptor,
     Window* pParent, WinBits nWinBits )
 {
@@ -944,9 +944,9 @@ Window* VCLXToolkit::ImplCreateWindow( VCLXWindow** ppNewComp,
                                 if( bUseParentData )
                                 {
                                     SystemParentData aParentData;
-                                    aParentData.nSize   = sizeof( aParentData );
+                                    aParentData.nSize	= sizeof( aParentData );
                                     #if defined QUARTZ
-                                    aParentData.pView   = reinterpret_cast<NSView*>(nWindowHandle);
+                                    aParentData.pView	= reinterpret_cast<NSView*>(nWindowHandle);
                                     #elif defined UNX
                                     aParentData.aWindow = nWindowHandle;
                                     aParentData.bXEmbedSupport = bXEmbed;
@@ -1157,9 +1157,9 @@ css::uno::Reference< css::awt::XWindowPeer > VCLXToolkit::ImplCreateWindow(
         if( bUseParentData )
         {
             SystemParentData aParentData;
-            aParentData.nSize   = sizeof( aParentData );
+            aParentData.nSize	= sizeof( aParentData );
             #if defined QUARTZ
-            aParentData.pView   = reinterpret_cast<NSView*>(nWindowHandle);
+            aParentData.pView	= reinterpret_cast<NSView*>(nWindowHandle);
             #elif defined UNX
             aParentData.aWindow = nWindowHandle;
             aParentData.bXEmbedSupport = bXEmbed;
@@ -1203,12 +1203,12 @@ css::uno::Reference< css::awt::XWindowPeer > VCLXToolkit::ImplCreateWindow(
 }
 
 // ::com::sun::star::awt::XMessageBoxFactory
-::com::sun::star::uno::Reference< ::com::sun::star::awt::XMessageBox > SAL_CALL VCLXToolkit::createMessageBox(
-    const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer >& aParent,
-    const ::com::sun::star::awt::Rectangle& aPosSize,
-    const ::rtl::OUString& aType,
-    ::sal_Int32 aButtons,
-    const ::rtl::OUString& aTitle,
+::com::sun::star::uno::Reference< ::com::sun::star::awt::XMessageBox > SAL_CALL VCLXToolkit::createMessageBox( 
+    const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer >& aParent, 
+    const ::com::sun::star::awt::Rectangle& aPosSize, 
+    const ::rtl::OUString& aType, 
+    ::sal_Int32 aButtons, 
+    const ::rtl::OUString& aTitle, 
     const ::rtl::OUString& aMessage ) throw (::com::sun::star::uno::RuntimeException)
 {
     ::com::sun::star::awt::WindowDescriptor aDescriptor;
@@ -1246,7 +1246,7 @@ css::uno::Reference< css::awt::XWindowPeer > VCLXToolkit::ImplCreateWindow(
         nAddWinBits |= WB_ABORT_RETRY_IGNORE;
     if ( sal_Int32( aButtons & 0xffff0000L ) == css::awt::MessageBoxButtons::DEFAULT_BUTTON_IGNORE )
         nAddWinBits |= WB_DEF_IGNORE;
-
+    
     aDescriptor.Type              = css::awt::WindowClass_MODALTOP;
     aDescriptor.WindowServiceName = aType;
     aDescriptor.ParentIndex       = -1;
@@ -1494,17 +1494,17 @@ void SAL_CALL VCLXToolkit::removeFocusListener(
 }
 
 // virtual
-void SAL_CALL VCLXToolkit::fireFocusGained(
-    ::com::sun::star::uno::Reference<
-    ::com::sun::star::uno::XInterface > const &)
+void SAL_CALL VCLXToolkit::fireFocusGained( 
+    ::com::sun::star::uno::Reference< 
+    ::com::sun::star::uno::XInterface > const &) 
     throw (::com::sun::star::uno::RuntimeException)
 {
 }
-
-// virtual
-void SAL_CALL VCLXToolkit::fireFocusLost(
-    ::com::sun::star::uno::Reference<
-    ::com::sun::star::uno::XInterface > const &)
+        
+// virtual 
+void SAL_CALL VCLXToolkit::fireFocusLost( 
+    ::com::sun::star::uno::Reference< 
+    ::com::sun::star::uno::XInterface > const &) 
     throw (::com::sun::star::uno::RuntimeException)
 {
 }
@@ -1604,11 +1604,11 @@ long VCLXToolkit::callKeyHandlers(::VclSimpleEvent const * pEvent,
 {
     ::css::uno::Sequence< ::css::uno::Reference< ::css::uno::XInterface > >
           aHandlers(m_aKeyHandlers.getElements());
-
+    
     if (aHandlers.hasElements())
     {
         ::Window * pWindow = static_cast< ::VclWindowEvent const * >(pEvent)->GetWindow();
-
+        
         // See implementation in vclxwindow.cxx for mapping between VCL and UNO AWT event
         ::KeyEvent * pKeyEvent = static_cast< ::KeyEvent * >(
             static_cast< ::VclWindowEvent const * >(pEvent)->GetData());
diff --git a/toolkit/source/awt/vclxtopwindow.cxx b/toolkit/source/awt/vclxtopwindow.cxx
index 10220a87de63..7c8828b3608e 100644
--- a/toolkit/source/awt/vclxtopwindow.cxx
+++ b/toolkit/source/awt/vclxtopwindow.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
@@ -171,7 +171,7 @@ void VCLXTopWindow_Base::toBack(  ) throw(::com::sun::star::uno::RuntimeExceptio
 void VCLXTopWindow_Base::setMenuBar( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XMenuBar >& rxMenu ) throw(::com::sun::star::uno::RuntimeException)
 {
     ::vos::OGuard aGuard( GetMutexImpl() );
-
+    
     SystemWindow* pWindow = (SystemWindow*) GetWindowImpl();
     if ( pWindow )
     {
@@ -190,7 +190,7 @@ void VCLXTopWindow_Base::setMenuBar( const ::com::sun::star::uno::Reference< ::c
 ::sal_Bool SAL_CALL VCLXTopWindow_Base::getIsMaximized() throw (RuntimeException)
 {
     ::vos::OGuard aGuard( GetMutexImpl() );
-
+    
     const WorkWindow* pWindow = dynamic_cast< const WorkWindow* >( GetWindowImpl() );
     if ( !pWindow )
         return sal_False;
@@ -202,7 +202,7 @@ void VCLXTopWindow_Base::setMenuBar( const ::com::sun::star::uno::Reference< ::c
 void SAL_CALL VCLXTopWindow_Base::setIsMaximized( ::sal_Bool _ismaximized ) throw (RuntimeException)
 {
     ::vos::OGuard aGuard( GetMutexImpl() );
-
+    
     WorkWindow* pWindow = dynamic_cast< WorkWindow* >( GetWindowImpl() );
     if ( !pWindow )
         return;
@@ -214,7 +214,7 @@ void SAL_CALL VCLXTopWindow_Base::setIsMaximized( ::sal_Bool _ismaximized ) thro
 ::sal_Bool SAL_CALL VCLXTopWindow_Base::getIsMinimized() throw (RuntimeException)
 {
     ::vos::OGuard aGuard( GetMutexImpl() );
-
+    
     const WorkWindow* pWindow = dynamic_cast< const WorkWindow* >( GetWindowImpl() );
     if ( !pWindow )
         return sal_False;
@@ -226,7 +226,7 @@ void SAL_CALL VCLXTopWindow_Base::setIsMaximized( ::sal_Bool _ismaximized ) thro
 void SAL_CALL VCLXTopWindow_Base::setIsMinimized( ::sal_Bool _isMinimized ) throw (RuntimeException)
 {
     ::vos::OGuard aGuard( GetMutexImpl() );
-
+    
     WorkWindow* pWindow = dynamic_cast< WorkWindow* >( GetWindowImpl() );
     if ( !pWindow )
         return;
@@ -238,7 +238,7 @@ void SAL_CALL VCLXTopWindow_Base::setIsMinimized( ::sal_Bool _isMinimized ) thro
 ::sal_Int32 SAL_CALL VCLXTopWindow_Base::getDisplay() throw (RuntimeException)
 {
     ::vos::OGuard aGuard( GetMutexImpl() );
-
+    
     const SystemWindow* pWindow = dynamic_cast< const SystemWindow* >( GetWindowImpl() );
     if ( !pWindow )
         return 0;
@@ -253,7 +253,7 @@ void SAL_CALL VCLXTopWindow_Base::setDisplay( ::sal_Int32 _display ) throw (Runt
 
     if ( ( _display < 0 ) || ( _display >= (sal_Int32)Application::GetScreenCount() ) )
         throw IndexOutOfBoundsException();
-
+    
     SystemWindow* pWindow = dynamic_cast< SystemWindow* >( GetWindowImpl() );
     if ( !pWindow )
         return;
@@ -261,9 +261,9 @@ void SAL_CALL VCLXTopWindow_Base::setDisplay( ::sal_Int32 _display ) throw (Runt
     pWindow->SetScreenNumber( _display );
 }
 
-//  ----------------------------------------------------
-//  class VCLXTopWindow
-//  ----------------------------------------------------
+//	----------------------------------------------------
+//	class VCLXTopWindow
+//	----------------------------------------------------
 
 void VCLXTopWindow::ImplGetPropertyIds( std::list< sal_uInt16 > &rIds )
 {
diff --git a/toolkit/source/awt/vclxwindow.cxx b/toolkit/source/awt/vclxwindow.cxx
index efc2c40c6baa..3fb70f580f0b 100644
--- a/toolkit/source/awt/vclxwindow.cxx
+++ b/toolkit/source/awt/vclxwindow.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
@@ -139,15 +139,15 @@ private:
     ::osl::Mutex                        maListenerContainerMutex;
     ::cppu::OInterfaceContainerHelper   maWindow2Listeners;
     ::cppu::OInterfaceContainerHelper   maDockableWindowListeners;
-    EventListenerMultiplexer            maEventListeners;
-    FocusListenerMultiplexer            maFocusListeners;
-    WindowListenerMultiplexer           maWindowListeners;
-    KeyListenerMultiplexer              maKeyListeners;
-    MouseListenerMultiplexer            maMouseListeners;
-    MouseMotionListenerMultiplexer      maMouseMotionListeners;
-    PaintListenerMultiplexer            maPaintListeners;
-    VclContainerListenerMultiplexer     maContainerListeners;
-    TopWindowListenerMultiplexer        maTopWindowListeners;
+    EventListenerMultiplexer		    maEventListeners;
+    FocusListenerMultiplexer		    maFocusListeners;
+    WindowListenerMultiplexer		    maWindowListeners;
+    KeyListenerMultiplexer			    maKeyListeners;
+    MouseListenerMultiplexer		    maMouseListeners;
+    MouseMotionListenerMultiplexer	    maMouseMotionListeners;
+    PaintListenerMultiplexer		    maPaintListeners;
+    VclContainerListenerMultiplexer	    maContainerListeners;
+    TopWindowListenerMultiplexer	    maTopWindowListeners;
 
     CallbackArray                       maCallbackEvents;
     ULONG                               mnCallbackEventId;
@@ -216,11 +216,11 @@ public:
     inline FocusListenerMultiplexer&            getFocusListeners()         { return maFocusListeners; }
     inline WindowListenerMultiplexer&           getWindowListeners()        { return maWindowListeners; }
     inline KeyListenerMultiplexer&              getKeyListeners()           { return maKeyListeners; }
-    inline MouseListenerMultiplexer&            getMouseListeners()         { return maMouseListeners; }
+    inline MouseListenerMultiplexer&            getMouseListeners() 	    { return maMouseListeners; }
     inline MouseMotionListenerMultiplexer&      getMouseMotionListeners()   { return maMouseMotionListeners; }
-    inline PaintListenerMultiplexer&            getPaintListeners()         { return maPaintListeners; }
+    inline PaintListenerMultiplexer&            getPaintListeners() 	    { return maPaintListeners; }
     inline VclContainerListenerMultiplexer&     getContainerListeners()     { return maContainerListeners; }
-    inline TopWindowListenerMultiplexer&        getTopWindowListeners()     { return maTopWindowListeners; }
+    inline TopWindowListenerMultiplexer&        getTopWindowListeners()	    { return maTopWindowListeners; }
 
     virtual ~VCLXWindowImpl();
 
@@ -394,9 +394,9 @@ void ImplInitWindowEvent( ::com::sun::star::awt::WindowEvent& rEvent, Window* pW
     pWindow->GetBorder( rEvent.LeftInset, rEvent.TopInset, rEvent.RightInset, rEvent.BottomInset );
 }
 
-//  ----------------------------------------------------
-//  class VCLXWindow
-//  ----------------------------------------------------
+//	----------------------------------------------------
+//	class VCLXWindow
+//	----------------------------------------------------
 
 DBG_NAME(VCLXWindow);
 
@@ -450,7 +450,7 @@ void VCLXWindow::SetWindow( Window* pWindow )
         sal_Bool bDirectVisible = pWindow ? pWindow->IsVisible() : false;
         mpImpl->setDirectVisible( bDirectVisible );
     }
-
+    
 }
 
 void VCLXWindow::suspendVclEventListening( )
@@ -640,11 +640,11 @@ void VCLXWindow::ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent )
         case VCLEVENT_CONTROL_GETFOCUS:
         case VCLEVENT_WINDOW_GETFOCUS:
         {
-            if  (   (   rVclWindowEvent.GetWindow()->IsCompoundControl()
-                    &&  rVclWindowEvent.GetId() == VCLEVENT_CONTROL_GETFOCUS
+            if	(	(	rVclWindowEvent.GetWindow()->IsCompoundControl()
+                    &&	rVclWindowEvent.GetId() == VCLEVENT_CONTROL_GETFOCUS
                     )
-                ||  (   !rVclWindowEvent.GetWindow()->IsCompoundControl()
-                    &&  rVclWindowEvent.GetId() == VCLEVENT_WINDOW_GETFOCUS
+                ||	(	!rVclWindowEvent.GetWindow()->IsCompoundControl()
+                    &&	rVclWindowEvent.GetId() == VCLEVENT_WINDOW_GETFOCUS
                     )
                 )
             {
@@ -662,11 +662,11 @@ void VCLXWindow::ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent )
         case VCLEVENT_CONTROL_LOSEFOCUS:
         case VCLEVENT_WINDOW_LOSEFOCUS:
         {
-            if  (   (   rVclWindowEvent.GetWindow()->IsCompoundControl()
-                    &&  rVclWindowEvent.GetId() == VCLEVENT_CONTROL_LOSEFOCUS
+            if	(	(	rVclWindowEvent.GetWindow()->IsCompoundControl()
+                    &&	rVclWindowEvent.GetId() == VCLEVENT_CONTROL_LOSEFOCUS
                     )
-                ||  (   !rVclWindowEvent.GetWindow()->IsCompoundControl()
-                    &&  rVclWindowEvent.GetId() == VCLEVENT_WINDOW_LOSEFOCUS
+                ||	(	!rVclWindowEvent.GetWindow()->IsCompoundControl()
+                    &&	rVclWindowEvent.GetId() == VCLEVENT_WINDOW_LOSEFOCUS
                     )
                 )
             {
@@ -745,7 +745,7 @@ void VCLXWindow::ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent )
                 // COMMAND_CONTEXTMENU als mousePressed mit PopupTrigger = sal_True versenden...
                 Point aWhere = static_cast< CommandEvent* >( rVclWindowEvent.GetData() )->GetMousePosPixel();
                 if ( !pCmdEvt->IsMouseEvent() )
-                {   // for keyboard events, we set the coordinates to -1,-1. This is a slight HACK, but the current API
+                {	// for keyboard events, we set the coordinates to -1,-1. This is a slight HACK, but the current API
                     // handles a context menu command as special case of a mouse event, which is simply wrong.
                     // Without extending the API, we would not have another chance to notify listeners of a
                     // keyboard-triggered context menu request
@@ -993,7 +993,7 @@ void VCLXWindow::dispose(  ) throw(::com::sun::star::uno::RuntimeException)
         if ( GetWindow() )
         {
             OutputDevice* pOutDev = GetOutputDevice();
-            SetWindow( NULL );  // Damit ggf. Handler abgemeldet werden (virtuell).
+            SetWindow( NULL );	// Damit ggf. Handler abgemeldet werden (virtuell).
             SetOutputDevice( pOutDev );
             DestroyOutputDevice();
         }
@@ -1399,7 +1399,7 @@ void VCLXWindow::ImplGetPropertyIds( std::list< sal_uInt16 > &rIds, bool bWithDe
             // some properties are not included in the FontDescriptor, but everytime
             // when we have a FontDescriptor we want to have these properties too.
             // => Easier to register the here, istead everywhere where I register the FontDescriptor...
-
+            
             rIds.push_back( BASEPROPERTY_TEXTCOLOR );
             rIds.push_back( BASEPROPERTY_TEXTLINECOLOR );
             rIds.push_back( BASEPROPERTY_FONTRELIEF );
@@ -1579,7 +1579,7 @@ void VCLXWindow::setProperty( const ::rtl::OUString& PropertyName, const ::com::
                         if (aText.getLength())
                             pWindow->SetText( aText );
                         break;
-
+                    
                     default:
                         pWindow->SetText( aText );
                         break;
@@ -1618,7 +1618,7 @@ void VCLXWindow::setProperty( const ::rtl::OUString& PropertyName, const ::com::
             ::rtl::OUString aHelpText;
             if ( Value >>= aHelpText )
             {
-                pWindow->SetQuickHelpText( aHelpText );
+                pWindow->SetQuickHelpText( aHelpText );	
             }
         }
         break;
@@ -1688,9 +1688,9 @@ void VCLXWindow::setProperty( const ::rtl::OUString& PropertyName, const ::com::
                         pWindow->SetPaintTransparent( TRUE );
                         break;
                     }
-
+                    
                     default:
-                    {
+                    {    
                         // default code which enables transparency for
                         // compound controls. It's not real transparency
                         // as most of these controls repaint their client
@@ -1721,7 +1721,7 @@ void VCLXWindow::setProperty( const ::rtl::OUString& PropertyName, const ::com::
                             pWindow->SetPaintTransparent( FALSE );
                         default: ;
                     }
-                    pWindow->Invalidate();  // Falls das Control nicht drauf reagiert
+                    pWindow->Invalidate();	// Falls das Control nicht drauf reagiert
                 }
             }
         break;
@@ -2331,7 +2331,7 @@ void VCLXWindow::draw( sal_Int32 nX, sal_Int32 nY ) throw(::com::sun::star::uno:
     Window* pWindow = GetWindow();
     if ( !pWindow )
         return;
-
+    
     if ( isDesignMode() || mpImpl->isEnableVisible() )
     {
         TabPage* pTabPage = dynamic_cast< TabPage* >( pWindow );
@@ -2445,7 +2445,7 @@ void SAL_CALL VCLXWindow::disposing( const ::com::sun::star::lang::EventObject&
     uno::Reference< uno::XInterface > xSource( _rSource.Source, uno::UNO_QUERY );
 
     if ( aAC.get() == xSource.get() )
-    {   // yep, it does
+    {	// yep, it does
         mpImpl->mxAccessibleContext = uno::Reference< accessibility::XAccessibleContext >();
     }
 }
@@ -2456,7 +2456,7 @@ void SAL_CALL VCLXWindow::disposing( const ::com::sun::star::lang::EventObject&
     using namespace ::com::sun::star;
 
     ::vos::OGuard aGuard( GetMutex() );
-
+    
     // already disposed
     if( ! mpImpl )
         return uno::Reference< accessibility::XAccessibleContext >();
diff --git a/toolkit/source/awt/vclxwindow1.cxx b/toolkit/source/awt/vclxwindow1.cxx
index daea557d241a..21e041f6b11f 100644
--- a/toolkit/source/awt/vclxwindow1.cxx
+++ b/toolkit/source/awt/vclxwindow1.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
@@ -54,7 +54,7 @@ void VCLXWindow::SetSystemParent_Impl( const com::sun::star::uno::Any& rHandle )
     Window *pWindow = GetWindow();
     if ( pWindow->GetType() != WINDOW_WORKWINDOW )
     {
-        ::com::sun::star::uno::Exception *pException =
+        ::com::sun::star::uno::Exception *pException = 
             new ::com::sun::star::uno::RuntimeException;
         pException->Message = ::rtl::OUString::createFromAscii( "not a work window" );
         throw pException;
@@ -91,7 +91,7 @@ void VCLXWindow::SetSystemParent_Impl( const com::sun::star::uno::Any& rHandle )
         throw pException;
     }
     // create system parent data
-    SystemParentData aSysParentData;
+    SystemParentData aSysParentData; 
     aSysParentData.nSize = sizeof ( SystemParentData );
 #if defined( WIN ) || defined( WNT ) || defined ( OS2 )
     aSysParentData.hWnd = (HWND) nHandle;
diff --git a/toolkit/source/awt/vclxwindows.cxx b/toolkit/source/awt/vclxwindows.cxx
index 4a68b4c80e3f..b07953604657 100644
--- a/toolkit/source/awt/vclxwindows.cxx
+++ b/toolkit/source/awt/vclxwindows.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
@@ -206,9 +206,9 @@ namespace toolkit
     }
 }
 
-//  ----------------------------------------------------
-//  class VCLXGraphicControl
-//  ----------------------------------------------------
+//	----------------------------------------------------
+//	class VCLXGraphicControl
+//	----------------------------------------------------
 
 void VCLXGraphicControl::ImplGetPropertyIds( std::list< sal_uInt16 > &rIds )
 {
@@ -336,8 +336,8 @@ void VCLXGraphicControl::setProperty( const ::rtl::OUString& PropertyName, const
 }
 
 //--------------------------------------------------------------------
-//  class VCLXButton
-//  ----------------------------------------------------
+//	class VCLXButton
+//	----------------------------------------------------
 
 void VCLXButton::ImplGetPropertyIds( std::list< sal_uInt16 > &rIds )
 {
@@ -621,9 +621,9 @@ void VCLXButton::ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent )
     }
 }
 
-//  ----------------------------------------------------
-//  class VCLXImageControl
-//  ----------------------------------------------------
+//	----------------------------------------------------
+//	class VCLXImageControl
+//	----------------------------------------------------
 
 void VCLXImageControl::ImplGetPropertyIds( std::list< sal_uInt16 > &rIds )
 {
@@ -752,9 +752,9 @@ void VCLXImageControl::setProperty( const ::rtl::OUString& PropertyName, const :
     return aProp;
 }
 
-//  ----------------------------------------------------
-//  class VCLXCheckBox
-//  ----------------------------------------------------
+//	----------------------------------------------------
+//	class VCLXCheckBox
+//	----------------------------------------------------
 
 
 void VCLXCheckBox::ImplGetPropertyIds( std::list< sal_uInt16 > &rIds )
@@ -1055,9 +1055,9 @@ void VCLXCheckBox::ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent )
     }
 }
 
-//  ----------------------------------------------------
-//  class VCLXRadioButton
-//  ----------------------------------------------------
+//	----------------------------------------------------
+//	class VCLXRadioButton
+//	----------------------------------------------------
 void VCLXRadioButton::ImplGetPropertyIds( std::list< sal_uInt16 > &rIds )
 {
     PushPropertyIds( rIds,
@@ -1345,9 +1345,9 @@ void VCLXRadioButton::ImplClickedOrToggled( BOOL bToggled )
     return maActionListeners.getElements()[0];
 }
 
-//  ----------------------------------------------------
-//  class VCLXSpinField
-//  ----------------------------------------------------
+//	----------------------------------------------------
+//	class VCLXSpinField
+//	----------------------------------------------------
 void VCLXSpinField::ImplGetPropertyIds( std::list< sal_uInt16 > &rIds )
 {
     PushPropertyIds( rIds,
@@ -1480,9 +1480,9 @@ void VCLXSpinField::ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent )
 }
 
 
-//  ----------------------------------------------------
-//  class VCLXListBox
-//  ----------------------------------------------------
+//	----------------------------------------------------
+//	class VCLXListBox
+//	----------------------------------------------------
 void VCLXListBox::ImplGetPropertyIds( std::list< sal_uInt16 > &rIds )
 {
     PushPropertyIds( rIds,
@@ -2174,7 +2174,7 @@ void SAL_CALL VCLXListBox::itemListChanged( const EventObject& i_rEvent ) throw
             uno::UNO_QUERY
         );
     }
-
+    
 
     Reference< XItemList > xItemList( i_rEvent.Source, uno::UNO_QUERY_THROW );
     uno::Sequence< beans::Pair< ::rtl::OUString, ::rtl::OUString > > aItems = xItemList->getAllItems();
@@ -2195,9 +2195,9 @@ void SAL_CALL VCLXListBox::disposing( const EventObject& i_rEvent ) throw (Runti
     VCLXWindow::disposing( i_rEvent );
 }
 
-//  ----------------------------------------------------
-//  class VCLXMessageBox
-//  ----------------------------------------------------
+//	----------------------------------------------------
+//	class VCLXMessageBox
+//	----------------------------------------------------
 
 void VCLXMessageBox::ImplGetPropertyIds( std::list< sal_uInt16 > &rIds )
 {
@@ -2280,9 +2280,9 @@ sal_Int16 VCLXMessageBox::execute() throw(::com::sun::star::uno::RuntimeExceptio
     return ::com::sun::star::awt::Size( 250, 100 );
 }
 
-//  ----------------------------------------------------
-//  class VCLXDialog
-//  ----------------------------------------------------
+//	----------------------------------------------------
+//	class VCLXDialog
+//	----------------------------------------------------
 void VCLXDialog::ImplGetPropertyIds( std::list< sal_uInt16 > &rIds )
 {
     VCLXTopWindow::ImplGetPropertyIds( rIds );
@@ -2363,15 +2363,23 @@ sal_Int16 VCLXDialog::execute() throw(::com::sun::star::uno::RuntimeException)
         Dialog* pDlg = (Dialog*) GetWindow();
         Window* pParent = pDlg->GetWindow( WINDOW_PARENTOVERLAP );
         Window* pOldParent = NULL;
+        Window* pSetParent = NULL;
         if ( pParent && !pParent->IsReallyVisible() )
         {
             pOldParent = pDlg->GetParent();
             Window* pFrame = pDlg->GetWindow( WINDOW_FRAME );
             if( pFrame != pDlg )
+            {
                 pDlg->SetParent( pFrame );
+                pSetParent = pFrame;
+            }
         }
+
         nRet = pDlg->Execute();
-        if ( pOldParent )
+
+        // set the parent back only in case no new parent was set from outside
+        // in other words, revert only own changes
+        if ( pOldParent && pDlg->GetParent() == pSetParent )
             pDlg->SetParent( pOldParent );
     }
     return nRet;
@@ -2459,9 +2467,9 @@ throw(::com::sun::star::uno::RuntimeException)
     }
 }
 
-//  ----------------------------------------------------
-//  class VCLXTabPage
-//  ----------------------------------------------------
+//	----------------------------------------------------
+//	class VCLXTabPage
+//	----------------------------------------------------
 VCLXTabPage::VCLXTabPage()
 {
 }
@@ -2555,9 +2563,9 @@ throw(::com::sun::star::uno::RuntimeException)
     }
 }
 
-//  ----------------------------------------------------
+//	----------------------------------------------------
 //  class VCLXFixedHyperlink
-//  ----------------------------------------------------
+//	----------------------------------------------------
 VCLXFixedHyperlink::VCLXFixedHyperlink() :
 
     maActionListeners( *this )
@@ -2990,9 +2998,9 @@ short VCLXFixedText::getAlignment() throw(::com::sun::star::uno::RuntimeExceptio
     return VCLUnoHelper::ConvertToAWTSize( aAdjustedSize );
 }
 
-//  ----------------------------------------------------
-//  class VCLXScrollBar
-//  ----------------------------------------------------
+//	----------------------------------------------------
+//	class VCLXScrollBar
+//	----------------------------------------------------
 void VCLXScrollBar::ImplGetPropertyIds( std::list< sal_uInt16 > &rIds )
 {
     PushPropertyIds( rIds,
@@ -3468,34 +3476,34 @@ void VCLXScrollBar::ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent )
 }
 
 
-//  ----------------------------------------------------
-//  class VCLXEdit
-//  ----------------------------------------------------
+//	----------------------------------------------------
+//	class VCLXEdit
+//	----------------------------------------------------
 
 void VCLXEdit::ImplGetPropertyIds( std::list< sal_uInt16 > &rIds )
 {
     PushPropertyIds( rIds,
-                     BASEPROPERTY_ALIGN,
-                     BASEPROPERTY_BACKGROUNDCOLOR,
-                     BASEPROPERTY_BORDER,
-                     BASEPROPERTY_BORDERCOLOR,
-                     BASEPROPERTY_DEFAULTCONTROL,
-                     BASEPROPERTY_ECHOCHAR,
-                     BASEPROPERTY_ENABLED,
+                     BASEPROPERTY_ALIGN, 
+                     BASEPROPERTY_BACKGROUNDCOLOR, 
+                     BASEPROPERTY_BORDER, 
+                     BASEPROPERTY_BORDERCOLOR, 
+                     BASEPROPERTY_DEFAULTCONTROL, 
+                     BASEPROPERTY_ECHOCHAR, 
+                     BASEPROPERTY_ENABLED, 
                      BASEPROPERTY_ENABLEVISIBLE,
-                     BASEPROPERTY_FONTDESCRIPTOR,
-                     BASEPROPERTY_HARDLINEBREAKS,
-                     BASEPROPERTY_HELPTEXT,
-                     BASEPROPERTY_HELPURL,
-                     BASEPROPERTY_HSCROLL,
-                     BASEPROPERTY_LINE_END_FORMAT,
-                     BASEPROPERTY_MAXTEXTLEN,
-                     BASEPROPERTY_MULTILINE,
-                     BASEPROPERTY_PRINTABLE,
-                     BASEPROPERTY_READONLY,
-                     BASEPROPERTY_TABSTOP,
-                     BASEPROPERTY_TEXT,
-                     BASEPROPERTY_VSCROLL,
+                     BASEPROPERTY_FONTDESCRIPTOR, 
+                     BASEPROPERTY_HARDLINEBREAKS, 
+                     BASEPROPERTY_HELPTEXT, 
+                     BASEPROPERTY_HELPURL, 
+                     BASEPROPERTY_HSCROLL, 
+                     BASEPROPERTY_LINE_END_FORMAT, 
+                     BASEPROPERTY_MAXTEXTLEN, 
+                     BASEPROPERTY_MULTILINE, 
+                     BASEPROPERTY_PRINTABLE, 
+                     BASEPROPERTY_READONLY, 
+                     BASEPROPERTY_TABSTOP, 
+                     BASEPROPERTY_TEXT, 
+                     BASEPROPERTY_VSCROLL, 
                      BASEPROPERTY_HIDEINACTIVESELECTION,
                      BASEPROPERTY_PAINTTRANSPARENT,
                      BASEPROPERTY_AUTOHSCROLL,
@@ -3846,9 +3854,9 @@ void VCLXEdit::ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent )
     }
 }
 
-//  ----------------------------------------------------
-//  class VCLXComboBox
-//  ----------------------------------------------------
+//	----------------------------------------------------
+//	class VCLXComboBox
+//	----------------------------------------------------
 
 void VCLXComboBox::ImplGetPropertyIds( std::list< sal_uInt16 > &rIds )
 {
@@ -3896,20 +3904,6 @@ VCLXComboBox::~VCLXComboBox()
 #endif
 }
 
-// ::com::sun::star::uno::XInterface
-::com::sun::star::uno::Any VCLXComboBox::queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException)
-{
-    ::com::sun::star::uno::Any aRet = ::cppu::queryInterface( rType,
-                                        SAL_STATIC_CAST( ::com::sun::star::awt::XComboBox*, this ) );
-    return (aRet.hasValue() ? aRet : VCLXEdit::queryInterface( rType ));
-}
-
-// ::com::sun::star::lang::XTypeProvider
-IMPL_XTYPEPROVIDER_START( VCLXComboBox )
-    getCppuType( ( ::com::sun::star::uno::Reference< ::com::sun::star::awt::XComboBox>* ) NULL ),
-    VCLXEdit::getTypes()
-IMPL_XTYPEPROVIDER_END
-
 ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleContext > VCLXComboBox::CreateAccessibleContext()
 {
     ::vos::OGuard aGuard( GetMutex() );
@@ -3973,8 +3967,12 @@ void VCLXComboBox::addItems( const ::com::sun::star::uno::Sequence< ::rtl::OUStr
         for ( sal_uInt16 n = 0; n < aItems.getLength(); n++ )
         {
             pBox->InsertEntry( aItems.getConstArray()[n], nP );
-            if ( (sal_uInt16)nPos < 0xFFFF )    // Nicht wenn 0xFFFF, weil LIST_APPEND
-                nP++;
+            if ( nP == 0xFFFF )
+            {
+                OSL_ENSURE( false, "VCLXComboBox::addItems: too many entries!" );
+                // skip remaining entries, list cannot hold them, anyway
+                break;
+            }
         }
     }
 }
@@ -4078,14 +4076,8 @@ void VCLXComboBox::setProperty( const ::rtl::OUString& PropertyName, const ::com
                 ::com::sun::star::uno::Sequence< ::rtl::OUString> aItems;
                 if ( Value >>= aItems )
                 {
-                    sal_Bool bUpdate = pComboBox->IsUpdateMode();
-                    pComboBox->SetUpdateMode( sal_False );
                     pComboBox->Clear();
-                    const ::rtl::OUString* pStrings = aItems.getConstArray();
-                    sal_Int32 nItems = aItems.getLength();
-                    for ( sal_Int32 n = 0; n < nItems; n++ )
-                        pComboBox->InsertEntry( pStrings[n], LISTBOX_APPEND );
-                    pComboBox->SetUpdateMode( bUpdate );
+                    addItems( aItems, 0 );
                 }
             }
             break;
@@ -4182,7 +4174,7 @@ void VCLXComboBox::ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent )
             {
                 ::com::sun::star::awt::ActionEvent aEvent;
                 aEvent.Source = (::cppu::OWeakObject*)this;
-//              aEvent.ActionCommand = ...;
+//				aEvent.ActionCommand = ...;
                 maActionListeners.actionPerformed( aEvent );
             }
             break;
@@ -4255,10 +4247,108 @@ void VCLXComboBox::getColumnsAndLines( sal_Int16& nCols, sal_Int16& nLines ) thr
         nLines = nL;
     }
 }
+void SAL_CALL VCLXComboBox::listItemInserted( const ItemListEvent& i_rEvent ) throw (RuntimeException)
+{
+    ::vos::OGuard aGuard( GetMutex() );
 
-//  ----------------------------------------------------
-//  class VCLXFormattedSpinField
-//  ----------------------------------------------------
+    ComboBox* pComboBox = dynamic_cast< ComboBox* >( GetWindow() );
+
+    ENSURE_OR_RETURN_VOID( pComboBox, "VCLXComboBox::listItemInserted: no ComboBox?!" );
+    ENSURE_OR_RETURN_VOID( ( i_rEvent.ItemPosition >= 0 ) && ( i_rEvent.ItemPosition <= sal_Int32( pComboBox->GetEntryCount() ) ),
+        "VCLXComboBox::listItemInserted: illegal (inconsistent) item position!" );
+    pComboBox->InsertEntry(
+        i_rEvent.ItemText.IsPresent ? i_rEvent.ItemText.Value : ::rtl::OUString(),
+        i_rEvent.ItemImageURL.IsPresent ? lcl_getImageFromURL( i_rEvent.ItemImageURL.Value ) : Image(),
+        i_rEvent.ItemPosition );
+}
+
+void SAL_CALL VCLXComboBox::listItemRemoved( const ItemListEvent& i_rEvent ) throw (RuntimeException)
+{
+    ::vos::OGuard aGuard( GetMutex() );
+
+    ComboBox* pComboBox = dynamic_cast< ComboBox* >( GetWindow() );
+
+    ENSURE_OR_RETURN_VOID( pComboBox, "VCLXComboBox::listItemRemoved: no ComboBox?!" );
+    ENSURE_OR_RETURN_VOID( ( i_rEvent.ItemPosition >= 0 ) && ( i_rEvent.ItemPosition < sal_Int32( pComboBox->GetEntryCount() ) ),
+        "VCLXComboBox::listItemRemoved: illegal (inconsistent) item position!" );
+
+    pComboBox->RemoveEntry( i_rEvent.ItemPosition );
+}
+
+void SAL_CALL VCLXComboBox::listItemModified( const ItemListEvent& i_rEvent ) throw (RuntimeException)
+{
+    ::vos::OGuard aGuard( GetMutex() );
+
+    ComboBox* pComboBox = dynamic_cast< ComboBox* >( GetWindow() );
+
+    ENSURE_OR_RETURN_VOID( pComboBox, "VCLXComboBox::listItemModified: no ComboBox?!" );
+    ENSURE_OR_RETURN_VOID( ( i_rEvent.ItemPosition >= 0 ) && ( i_rEvent.ItemPosition < sal_Int32( pComboBox->GetEntryCount() ) ),
+        "VCLXComboBox::listItemModified: illegal (inconsistent) item position!" );
+
+    // VCL's ComboBox does not support changing an entry's text or image, so remove and re-insert
+
+    const ::rtl::OUString sNewText = i_rEvent.ItemText.IsPresent ? i_rEvent.ItemText.Value : ::rtl::OUString( pComboBox->GetEntry( i_rEvent.ItemPosition ) );
+    const Image aNewImage( i_rEvent.ItemImageURL.IsPresent ? lcl_getImageFromURL( i_rEvent.ItemImageURL.Value ) : pComboBox->GetEntryImage( i_rEvent.ItemPosition  ) );
+
+    pComboBox->RemoveEntry( i_rEvent.ItemPosition );
+    pComboBox->InsertEntry( sNewText, aNewImage, i_rEvent.ItemPosition );
+}
+
+void SAL_CALL VCLXComboBox::allItemsRemoved( const EventObject& i_rEvent ) throw (RuntimeException)
+{
+    ::vos::OGuard aGuard( GetMutex() );
+
+    ComboBox* pComboBox = dynamic_cast< ComboBox* >( GetWindow() );
+    ENSURE_OR_RETURN_VOID( pComboBox, "VCLXComboBox::listItemModified: no ComboBox?!" );
+
+    pComboBox->Clear();
+
+    (void)i_rEvent;
+}
+
+void SAL_CALL VCLXComboBox::itemListChanged( const EventObject& i_rEvent ) throw (RuntimeException)
+{
+    ::vos::OGuard aGuard( GetMutex() );
+
+    ComboBox* pComboBox = dynamic_cast< ComboBox* >( GetWindow() );
+    ENSURE_OR_RETURN_VOID( pComboBox, "VCLXComboBox::listItemModified: no ComboBox?!" );
+
+    pComboBox->Clear();
+
+    uno::Reference< beans::XPropertySet > xPropSet( i_rEvent.Source, uno::UNO_QUERY_THROW );
+    uno::Reference< beans::XPropertySetInfo > xPSI( xPropSet->getPropertySetInfo(), uno::UNO_QUERY_THROW );
+    // bool localize = xPSI->hasPropertyByName( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ResourceResolver" ) ) );
+    uno::Reference< resource::XStringResourceResolver > xStringResourceResolver;
+    if ( xPSI->hasPropertyByName( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ResourceResolver" ) ) ) )
+    {
+        xStringResourceResolver.set(
+            xPropSet->getPropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ResourceResolver" ) ) ),
+            uno::UNO_QUERY
+        );
+    }
+    
+
+    Reference< XItemList > xItemList( i_rEvent.Source, uno::UNO_QUERY_THROW );
+    uno::Sequence< beans::Pair< ::rtl::OUString, ::rtl::OUString > > aItems = xItemList->getAllItems();
+    for ( sal_Int32 i=0; i<aItems.getLength(); ++i )
+    {
+        ::rtl::OUString aLocalizationKey( aItems[i].First );
+        if ( xStringResourceResolver.is() && aLocalizationKey.getLength() != 0 && aLocalizationKey[0] == '&' )
+        {
+            aLocalizationKey = xStringResourceResolver->resolveString(aLocalizationKey.copy( 1 ));
+        }
+        pComboBox->InsertEntry( aLocalizationKey, lcl_getImageFromURL( aItems[i].Second ) );
+    }
+}
+void SAL_CALL VCLXComboBox::disposing( const EventObject& i_rEvent ) throw (RuntimeException)
+{
+    // just disambiguate
+    VCLXEdit::disposing( i_rEvent );
+}
+
+//	----------------------------------------------------
+//	class VCLXFormattedSpinField
+//	----------------------------------------------------
 void VCLXFormattedSpinField::ImplGetPropertyIds( std::list< sal_uInt16 > &rIds )
 {
     // Interestingly in the UnoControl API this is
@@ -4361,9 +4451,9 @@ void VCLXFormattedSpinField::setProperty( const ::rtl::OUString& PropertyName, c
 }
 
 
-//  ----------------------------------------------------
-//  class VCLXDateField
-//  ----------------------------------------------------
+//	----------------------------------------------------
+//	class VCLXDateField
+//	----------------------------------------------------
 
 void VCLXDateField::ImplGetPropertyIds( std::list< sal_uInt16 > &rIds )
 {
@@ -4705,9 +4795,9 @@ sal_Bool VCLXDateField::isStrictFormat() throw(::com::sun::star::uno::RuntimeExc
 }
 
 
-//  ----------------------------------------------------
-//  class VCLXTimeField
-//  ----------------------------------------------------
+//	----------------------------------------------------
+//	class VCLXTimeField
+//	----------------------------------------------------
 
 void VCLXTimeField::ImplGetPropertyIds( std::list< sal_uInt16 > &rIds )
 {
@@ -5008,9 +5098,9 @@ void VCLXTimeField::setProperty( const ::rtl::OUString& PropertyName, const ::co
     return aProp;
 }
 
-//  ----------------------------------------------------
-//  class VCLXNumericField
-//  ----------------------------------------------------
+//	----------------------------------------------------
+//	class VCLXNumericField
+//	----------------------------------------------------
 
 void VCLXNumericField::ImplGetPropertyIds( std::list< sal_uInt16 > &rIds )
 {
@@ -5601,9 +5691,9 @@ void VCLXMetricField::setProperty( const ::rtl::OUString& PropertyName, const ::
 }
 
 
-//  ----------------------------------------------------
-//  class VCLXCurrencyField
-//  ----------------------------------------------------
+//	----------------------------------------------------
+//	class VCLXCurrencyField
+//	----------------------------------------------------
 
 void VCLXCurrencyField::ImplGetPropertyIds( std::list< sal_uInt16 > &rIds )
 {
@@ -5957,9 +6047,9 @@ void VCLXCurrencyField::setProperty( const ::rtl::OUString& PropertyName, const
     return aProp;
 }
 
-//  ----------------------------------------------------
-//  class VCLXPatternField
-//  ----------------------------------------------------
+//	----------------------------------------------------
+//	class VCLXPatternField
+//	----------------------------------------------------
 
 void VCLXPatternField::ImplGetPropertyIds( std::list< sal_uInt16 > &rIds )
 {
@@ -6020,7 +6110,7 @@ void VCLXPatternField::setMasks( const ::rtl::OUString& EditMask, const ::rtl::O
     PatternField* pPatternField = (PatternField*) GetWindow();
     if ( pPatternField )
     {
-        pPatternField->SetMask( ByteString( UniString( EditMask ), RTL_TEXTENCODING_ASCII_US ), LiteralMask );
+        pPatternField->SetMask(	ByteString( UniString( EditMask ), RTL_TEXTENCODING_ASCII_US ), LiteralMask );
     }
 }
 
@@ -6131,9 +6221,9 @@ void VCLXPatternField::setProperty( const ::rtl::OUString& PropertyName, const :
     return aProp;
 }
 
-//  ----------------------------------------------------
-//  class VCLXToolBox
-//  ----------------------------------------------------
+//	----------------------------------------------------
+//	class VCLXToolBox
+//	----------------------------------------------------
 VCLXToolBox::VCLXToolBox()
 {
 }
diff --git a/toolkit/source/awt/xsimpleanimation.cxx b/toolkit/source/awt/xsimpleanimation.cxx
index c7ccbde118f4..4913231c594e 100644
--- a/toolkit/source/awt/xsimpleanimation.cxx
+++ b/toolkit/source/awt/xsimpleanimation.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
@@ -71,7 +71,7 @@ namespace toolkit
     {
         mpThrobber->start();
     }
-
+    
     //--------------------------------------------------------------------
     void SAL_CALL XSimpleAnimation::stop() throw ( uno::RuntimeException )
     {
@@ -116,7 +116,7 @@ namespace toolkit
                         mnStepTime = nStepTime;
                         mpThrobber->setStepTime( mnStepTime );
                     }
-
+                    
                     break;
                 }
                 case BASEPROPERTY_REPEAT: {
@@ -133,7 +133,7 @@ namespace toolkit
             }
         }
     }
-
+    
     //--------------------------------------------------------------------
     uno::Any SAL_CALL XSimpleAnimation::getProperty( const ::rtl::OUString& PropertyName )
         throw( uno::RuntimeException )
diff --git a/toolkit/source/awt/xthrobber.cxx b/toolkit/source/awt/xthrobber.cxx
index 439fb49c1cbe..b0b9150acd64 100644
--- a/toolkit/source/awt/xthrobber.cxx
+++ b/toolkit/source/awt/xthrobber.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,7 +79,7 @@ namespace toolkit
     {
         mpThrobber->start();
     }
-
+    
     //--------------------------------------------------------------------
     void SAL_CALL XThrobber::stop() throw ( uno::RuntimeException )
     {
@@ -117,7 +117,7 @@ namespace toolkit
             VCLXWindow::setProperty( PropertyName, Value );
         }
     }
-
+    
     //--------------------------------------------------------------------
     uno::Any SAL_CALL XThrobber::getProperty( const ::rtl::OUString& PropertyName )
         throw( uno::RuntimeException )
@@ -152,7 +152,7 @@ namespace toolkit
 
         mpThrobber->setImageList( aImageList );
     }
-
+ 
 //........................................................................
 }   // namespace toolkit
 //........................................................................
diff --git a/toolkit/source/awt/xthrobber.hrc b/toolkit/source/awt/xthrobber.hrc
index 32c068ff8a85..5fa6bdede24b 100644
--- a/toolkit/source/awt/xthrobber.hrc
+++ b/toolkit/source/awt/xthrobber.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
diff --git a/toolkit/source/awt/xthrobber.src b/toolkit/source/awt/xthrobber.src
index 199b25015056..cf3522cfb707 100644
--- a/toolkit/source/awt/xthrobber.src
+++ b/toolkit/source/awt/xthrobber.src
@@ -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
diff --git a/toolkit/source/controls/accessiblecontrolcontext.cxx b/toolkit/source/controls/accessiblecontrolcontext.cxx
index 2611b2f37a91..f6036a7db352 100644
--- a/toolkit/source/controls/accessiblecontrolcontext.cxx
+++ b/toolkit/source/controls/accessiblecontrolcontext.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
@@ -83,7 +83,7 @@ namespace toolkit
             m_xControlModel = m_xControlModel.query( xControl->getModel() );
         OSL_ENSURE( m_xControlModel.is(), "OAccessibleControlContext::Init: invalid creator (no control, or control without model!" );
         if ( !m_xControlModel.is() )
-            throw DisposedException();  // caught by the caller (the create method)
+            throw DisposedException();	// caught by the caller (the create method)
 
         // start listening at the model
         startModelListening();
@@ -189,7 +189,7 @@ namespace toolkit
             pStateSet = new ::utl::AccessibleStateSetHelper( implGetForeignControlledStates() );
         }
         else
-        {   // only the DEFUNC state if we're already disposed
+        {	// only the DEFUNC state if we're already disposed
             pStateSet = new ::utl::AccessibleStateSetHelper;
             pStateSet->AddState( AccessibleStateType::DEFUNC );
         }
@@ -214,7 +214,7 @@ namespace toolkit
     }
 
     //--------------------------------------------------------------------
-    ::rtl::OUString OAccessibleControlContext::getModelStringProperty( const sal_Char* _pPropertyName )
+    ::rtl::OUString	OAccessibleControlContext::getModelStringProperty( const sal_Char* _pPropertyName )
     {
         ::rtl::OUString sReturn;
         try
@@ -234,7 +234,7 @@ namespace toolkit
     }
 
     //--------------------------------------------------------------------
-    Window* OAccessibleControlContext::implGetWindow( Reference< awt::XWindow >* _pxUNOWindow ) const
+    Window*	OAccessibleControlContext::implGetWindow( Reference< awt::XWindow >* _pxUNOWindow ) const
     {
         Reference< awt::XControl > xControl( getAccessibleCreator(), UNO_QUERY );
         Reference< awt::XWindow > xWindow;
@@ -375,6 +375,6 @@ namespace toolkit
     }
 
 //........................................................................
-}   //namespace toolkit
+}	//namespace toolkit
 //........................................................................
 
diff --git a/toolkit/source/controls/dialogcontrol.cxx b/toolkit/source/controls/dialogcontrol.cxx
index c54549baed5e..7f23b498fc02 100644
--- a/toolkit/source/controls/dialogcontrol.cxx
+++ b/toolkit/source/controls/dialogcontrol.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
@@ -183,7 +183,7 @@ public:
 struct CloneControlModel : public ::std::unary_function< UnoControlDialogModel::UnoControlModelHolder, void >
 {
 private:
-    UnoControlDialogModel::UnoControlModelHolderList&   m_rTargetList;
+    UnoControlDialogModel::UnoControlModelHolderList&	m_rTargetList;
 
 public:
     CloneControlModel( UnoControlDialogModel::UnoControlModelHolderList& _rTargetList )
@@ -218,19 +218,19 @@ public:
 
 // ----------------------------------------------------------------------------
 static void lcl_throwIllegalArgumentException( )
-{   // throwing is expensive (in terms of code size), thus we hope the compiler does not inline this ....
+{	// throwing is expensive (in terms of code size), thus we hope the compiler does not inline this ....
     throw IllegalArgumentException();
 }
 
 // ----------------------------------------------------------------------------
 static void lcl_throwNoSuchElementException( )
-{   // throwing is expensive (in terms of code size), thus we hope the compiler does not inline this ....
+{	// throwing is expensive (in terms of code size), thus we hope the compiler does not inline this ....
     throw NoSuchElementException();
 }
 
 // ----------------------------------------------------------------------------
 static void lcl_throwElementExistException( )
-{   // throwing is expensive (in terms of code size), thus we hope the compiler does not inline this ....
+{	// throwing is expensive (in terms of code size), thus we hope the compiler does not inline this ....
     throw ElementExistException();
 }
 
@@ -248,20 +248,20 @@ static const ::rtl::OUString& getStepPropertyName( )
     return s_sStepProperty;
 }
 
-//  ----------------------------------------------------
-//  class UnoControlDialogModel
-//  ----------------------------------------------------
+//	----------------------------------------------------
+//	class UnoControlDialogModel
+//	----------------------------------------------------
 UnoControlDialogModel::UnoControlDialogModel()
     :maContainerListeners( *this )
     ,maChangeListeners ( GetMutex() )
     ,mbGroupsUpToDate( sal_False )
 {
     ImplRegisterProperty( BASEPROPERTY_BACKGROUNDCOLOR );
-//  ImplRegisterProperty( BASEPROPERTY_BORDER );
+//	ImplRegisterProperty( BASEPROPERTY_BORDER );
     ImplRegisterProperty( BASEPROPERTY_DEFAULTCONTROL );
     ImplRegisterProperty( BASEPROPERTY_ENABLED );
     ImplRegisterProperty( BASEPROPERTY_FONTDESCRIPTOR );
-//  ImplRegisterProperty( BASEPROPERTY_PRINTABLE );
+//	ImplRegisterProperty( BASEPROPERTY_PRINTABLE );
     ImplRegisterProperty( BASEPROPERTY_HELPTEXT );
     ImplRegisterProperty( BASEPROPERTY_HELPURL );
     ImplRegisterProperty( BASEPROPERTY_TITLE );
@@ -365,9 +365,9 @@ void SAL_CALL UnoControlDialogModel::dispose(  ) throw(RuntimeException)
     ::std::vector< Reference< XControlModel > > aChildModels( maModels.size() );
 
     ::std::transform(
-        maModels.begin(), maModels.end(),               // source range
-        aChildModels.begin(),                           // target location
-        ::std::select1st< UnoControlModelHolder >( )    // operation to apply -> select the XControlModel part
+        maModels.begin(), maModels.end(),				// source range
+        aChildModels.begin(),							// target location
+        ::std::select1st< UnoControlModelHolder >( )	// operation to apply -> select the XControlModel part
     );
 
     // now dispose
@@ -600,9 +600,9 @@ Sequence< ::rtl::OUString > UnoControlDialogModel::getElementNames() throw(Runti
     Sequence< ::rtl::OUString > aNames( maModels.size() );
 
     ::std::transform(
-        maModels.begin(), maModels.end(),               // source range
-        aNames.getArray(),                              // target range
-        ::std::select2nd< UnoControlModelHolder >()     // operator to apply: select the second element (the name)
+        maModels.begin(), maModels.end(),				// source range
+        aNames.getArray(),								// target range
+        ::std::select2nd< UnoControlModelHolder >()		// operator to apply: select the second element (the name)
     );
 
     return aNames;
@@ -769,7 +769,7 @@ Sequence< Reference< XControlModel > > SAL_CALL UnoControlDialogModel::getContro
 
         // has it?
         if ( xPSI.is() && xPSI->hasPropertyByName( getTabIndexPropertyName() ) )
-        {   // yes
+        {	// yes
             sal_Int32 nTabIndex = -1;
             xControlProps->getPropertyValue( getTabIndexPropertyName() ) >>= nTabIndex;
 
@@ -891,8 +891,8 @@ void UnoControlDialogModel::implNotifyTabModelChange( const ::rtl::OUString& _rA
     // the changes event
     ChangesEvent aEvent;
     aEvent.Source = *this;
-    aEvent.Base <<= aEvent.Source;  // the "base of the changes root" is also ourself
-    aEvent.Changes.realloc( 1 );    // exactly one change
+    aEvent.Base <<= aEvent.Source;	// the "base of the changes root" is also ourself
+    aEvent.Changes.realloc( 1 );	// exactly one change
     aEvent.Changes[ 0 ].Accessor <<= _rAccessor;
 
 
@@ -928,11 +928,11 @@ void UnoControlDialogModel::implUpdateGroupStructure()
     // in extreme we have as much groups as controls
     maGroups.reserve( aControlModels.getLength() );
 
-    GroupingMachineState eState = eLookingForGroup;     // the current state of our machine
-    Reference< XServiceInfo > xModelSI;                 // for checking for a radion button
-    AllGroups::iterator aCurrentGroup = maGroups.end(); // the group which we're currently building
-    sal_Int32   nCurrentGroupStep = -1;                 // the step which all controls of the current group belong to
-    sal_Bool    bIsRadioButton;                         // is it a radio button?
+    GroupingMachineState eState = eLookingForGroup;		// the current state of our machine
+    Reference< XServiceInfo > xModelSI;					// for checking for a radion button
+    AllGroups::iterator aCurrentGroup = maGroups.end();	// the group which we're currently building
+    sal_Int32	nCurrentGroupStep = -1;					// the step which all controls of the current group belong to
+    sal_Bool	bIsRadioButton;							// is it a radio button?
 
 #if OSL_DEBUG_LEVEL > 1
     ::std::vector< ::rtl::OUString > aCurrentGroupLabels;
@@ -978,7 +978,7 @@ void UnoControlDialogModel::implUpdateGroupStructure()
             case eExpandingGroup:
             {
                 if ( !bIsRadioButton )
-                {   // no radio button -> the group is done
+                {	// no radio button -> the group is done
                     aCurrentGroup = maGroups.end();
                     eState = eLookingForGroup;
 #if OSL_DEBUG_LEVEL > 1
@@ -989,8 +989,8 @@ void UnoControlDialogModel::implUpdateGroupStructure()
 
                 // it is a radio button - is it on the proper page?
                 const sal_Int32 nThisModelStep = lcl_getDialogStep( *pControlModels );
-                if  (   ( nThisModelStep == nCurrentGroupStep ) // the current button is on the same dialog page
-                    ||  ( 0 == nThisModelStep )                 // the current button appears on all pages
+                if	(	( nThisModelStep == nCurrentGroupStep )	// the current button is on the same dialog page
+                    ||	( 0 == nThisModelStep )					// the current button appears on all pages
                     )
                 {
                     // -> it belongs to the same group
@@ -1455,7 +1455,7 @@ void UnoDialogControl::ImplSetPosSize( Reference< XControl >& rxCtrl )
         }
 
         sal_Int16 nH = aFM.Ascent + aFM.Descent;
-        sal_Int16 nW = nH/2;    // calculate avarage width?!
+        sal_Int16 nW = nH/2;	// calculate avarage width?!
 
         nX *= nW;
         nX /= 4;
@@ -1523,9 +1523,9 @@ sal_Bool UnoDialogControl::setModel( const Reference< XControlModel >& rxModel )
     // destroy the old tab controller, if existent
     if ( mxTabController.is() )
     {
-        mxTabController->setModel( NULL );                  // just to be sure, should not be necessary
+        mxTabController->setModel( NULL );					// just to be sure, should not be necessary
         removeTabController( mxTabController );
-        ::comphelper::disposeComponent( mxTabController );  // just to be sure, should not be necessary
+        ::comphelper::disposeComponent( mxTabController );	// just to be sure, should not be necessary
         mxTabController.clear();
     }
 
@@ -1960,7 +1960,7 @@ void UnoDialogControl::ImplUpdateResourceResolver()
                 &&  ( xStringResourceResolver == xCurrStringResourceResolver )
                 )
             {
-                Reference< XMultiPropertySet >  xMultiPropSet( xPropertySet, UNO_QUERY );
+                Reference< XMultiPropertySet >	xMultiPropSet( xPropertySet, UNO_QUERY );
                 Reference< XPropertiesChangeListener > xListener( xPropertySet, UNO_QUERY );
                 xMultiPropSet->firePropertiesChangeEvent( aPropNames, xListener );
             }
@@ -1977,7 +1977,7 @@ void UnoDialogControl::ImplUpdateResourceResolver()
     Reference< XPropertySet > xPropertySet( getModel(), UNO_QUERY );
     if ( xPropertySet.is() )
     {
-        Reference< XMultiPropertySet >  xMultiPropSet( xPropertySet, UNO_QUERY );
+        Reference< XMultiPropertySet >	xMultiPropSet( xPropertySet, UNO_QUERY );
         Reference< XPropertiesChangeListener > xListener( xPropertySet, UNO_QUERY );
         xMultiPropSet->firePropertiesChangeEvent( lcl_getLanguageDependentProperties(), xListener );
     }
@@ -2097,9 +2097,9 @@ throw (RuntimeException)
     ImplUpdateResourceResolver();
 }
 
-//  ----------------------------------------------------
-//  Helper Method to convert relative url to physical location
-//  ----------------------------------------------------
+//	----------------------------------------------------
+//	Helper Method to convert relative url to physical location
+//	----------------------------------------------------
 
 ::rtl::OUString getPhysicalLocation( const ::com::sun::star::uno::Any& rbase, const ::com::sun::star::uno::Any& rUrl )
 {
diff --git a/toolkit/source/controls/eventcontainer.cxx b/toolkit/source/controls/eventcontainer.cxx
index 0cbf9d4e7281..987eee9cab95 100644
--- a/toolkit/source/controls/eventcontainer.cxx
+++ b/toolkit/source/controls/eventcontainer.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
@@ -54,7 +54,7 @@ using namespace std;
 
 namespace toolkit
 {
-
+    
 // Methods XElementAccess
 Type NameContainer_Impl::getElementType()
     throw(RuntimeException)
@@ -62,7 +62,7 @@ Type NameContainer_Impl::getElementType()
     return mType;
 }
 
-sal_Bool NameContainer_Impl::hasElements()
+sal_Bool NameContainer_Impl::hasElements() 
     throw(RuntimeException)
 {
     sal_Bool bRet = (mnElementCount > 0);
@@ -70,7 +70,7 @@ sal_Bool NameContainer_Impl::hasElements()
 }
 
 // Methods XNameAccess
-Any NameContainer_Impl::getByName( const OUString& aName )
+Any NameContainer_Impl::getByName( const OUString& aName ) 
     throw(NoSuchElementException, WrappedTargetException, RuntimeException)
 {
     NameContainerNameMap::iterator aIt = mHashMap.find( aName );
@@ -89,7 +89,7 @@ Sequence< OUString > NameContainer_Impl::getElementNames()
     return mNames;
 }
 
-sal_Bool NameContainer_Impl::hasByName( const OUString& aName )
+sal_Bool NameContainer_Impl::hasByName( const OUString& aName ) 
     throw(RuntimeException)
 {
     NameContainerNameMap::iterator aIt = mHashMap.find( aName );
@@ -99,7 +99,7 @@ sal_Bool NameContainer_Impl::hasByName( const OUString& aName )
 
 
 // Methods XNameReplace
-void NameContainer_Impl::replaceByName( const OUString& aName, const Any& aElement )
+void NameContainer_Impl::replaceByName( const OUString& aName, const Any& aElement ) 
     throw(IllegalArgumentException, NoSuchElementException, WrappedTargetException, RuntimeException)
 {
     Type aAnyType = aElement.getValueType();
@@ -116,7 +116,7 @@ void NameContainer_Impl::replaceByName( const OUString& aName, const Any& aEleme
     mValues.getArray()[ iHashResult ] = aElement;
 
     // Fire event
-    ContainerEvent aEvent;
+    ContainerEvent aEvent;		
     aEvent.Source = *this;
     aEvent.Element <<= aElement;
     aEvent.ReplacedElement = aOldElement;
@@ -126,7 +126,7 @@ void NameContainer_Impl::replaceByName( const OUString& aName, const Any& aEleme
 
 
 // Methods XNameContainer
-void NameContainer_Impl::insertByName( const OUString& aName, const Any& aElement )
+void NameContainer_Impl::insertByName( const OUString& aName, const Any& aElement ) 
     throw(IllegalArgumentException, ElementExistException, WrappedTargetException, RuntimeException)
 {
     Type aAnyType = aElement.getValueType();
@@ -147,14 +147,14 @@ void NameContainer_Impl::insertByName( const OUString& aName, const Any& aElemen
     mHashMap[ aName ] = nCount;
 
     // Fire event
-    ContainerEvent aEvent;
+    ContainerEvent aEvent;		
     aEvent.Source = *this;
     aEvent.Element <<= aElement;
     aEvent.Accessor <<= aName;
     maContainerListeners.elementInserted( aEvent );
 }
 
-void NameContainer_Impl::removeByName( const OUString& Name )
+void NameContainer_Impl::removeByName( const OUString& Name ) 
     throw(NoSuchElementException, WrappedTargetException, RuntimeException)
 {
     NameContainerNameMap::iterator aIt = mHashMap.find( Name );
@@ -167,7 +167,7 @@ void NameContainer_Impl::removeByName( const OUString& Name )
     Any aOldElement = mValues.getConstArray()[ iHashResult ];
 
     // Fire event
-    ContainerEvent aEvent;
+    ContainerEvent aEvent;		
     aEvent.Source = *this;
     aEvent.Element = aOldElement;
     aEvent.Accessor <<= Name;
diff --git a/toolkit/source/controls/formattedcontrol.cxx b/toolkit/source/controls/formattedcontrol.cxx
index 67c9c40ebd38..2440ab918505 100644
--- a/toolkit/source/controls/formattedcontrol.cxx
+++ b/toolkit/source/controls/formattedcontrol.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
@@ -77,7 +77,7 @@ namespace toolkit
         const Reference< XNumberFormatsSupplier >& lcl_getDefaultFormats_throw()
         {
             ::osl::MutexGuard aGuard( getDefaultFormatsMutex() );
-
+            
             bool& rbTriedCreation = lcl_getTriedCreation();
             Reference< XNumberFormatsSupplier >& rDefaultFormats( lcl_getDefaultFormatsAccess_nothrow() );
             if ( !rDefaultFormats.is() && !rbTriedCreation )
@@ -375,7 +375,7 @@ namespace toolkit
 
             throw IllegalArgumentException(
                         ( ::rtl::OUString::createFromAscii("Unable to convert the given value for the property ")
-                    +=  GetPropertyName((sal_uInt16)nPropId) )
+                    +=	GetPropertyName((sal_uInt16)nPropId) )
                     +=  ::rtl::OUString::createFromAscii(" (double, integer, or string expected)."),
                 static_cast< XPropertySet* >(this),
                 1);
@@ -415,7 +415,7 @@ namespace toolkit
         static UnoPropertyArrayHelper* pHelper = NULL;
         if ( !pHelper )
         {
-            Sequence<sal_Int32> aIDs = ImplGetPropertyIds();
+            Sequence<sal_Int32>	aIDs = ImplGetPropertyIds();
             pHelper = new UnoPropertyArrayHelper( aIDs );
         }
         return *pHelper;
@@ -458,11 +458,11 @@ namespace toolkit
         aValues[1] = xPeer->getProperty( aNames[1] );
 
         ImplSetPropertyValues( aNames, aValues, FALSE );
-
+        
         if ( GetTextListeners().getLength() )
             GetTextListeners().textChanged( e );
     }
 
 //........................................................................
-}   // namespace toolkit
+}	// namespace toolkit
 //........................................................................
diff --git a/toolkit/source/controls/geometrycontrolmodel.cxx b/toolkit/source/controls/geometrycontrolmodel.cxx
index ac8a6e83ae28..613d8273b7ea 100644
--- a/toolkit/source/controls/geometrycontrolmodel.cxx
+++ b/toolkit/source/controls/geometrycontrolmodel.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
@@ -44,27 +44,27 @@
 #include <comphelper/sequence.hxx>
 
 
-#define GCM_PROPERTY_ID_POS_X               1
-#define GCM_PROPERTY_ID_POS_Y               2
-#define GCM_PROPERTY_ID_WIDTH               3
-#define GCM_PROPERTY_ID_HEIGHT              4
-#define GCM_PROPERTY_ID_NAME                5
-#define GCM_PROPERTY_ID_TABINDEX            6
-#define GCM_PROPERTY_ID_STEP                7
-#define GCM_PROPERTY_ID_TAG                 8
+#define GCM_PROPERTY_ID_POS_X		        1
+#define GCM_PROPERTY_ID_POS_Y		        2
+#define GCM_PROPERTY_ID_WIDTH		        3
+#define GCM_PROPERTY_ID_HEIGHT		        4
+#define GCM_PROPERTY_ID_NAME		        5
+#define GCM_PROPERTY_ID_TABINDEX	        6
+#define GCM_PROPERTY_ID_STEP		        7
+#define GCM_PROPERTY_ID_TAG			        8
 #define GCM_PROPERTY_ID_RESOURCERESOLVER    9
 
-#define GCM_PROPERTY_POS_X              ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("PositionX"))
-#define GCM_PROPERTY_POS_Y              ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("PositionY"))
-#define GCM_PROPERTY_WIDTH              ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Width"))
-#define GCM_PROPERTY_HEIGHT             ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Height"))
-#define GCM_PROPERTY_NAME               ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Name"))
-#define GCM_PROPERTY_TABINDEX           ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("TabIndex"))
-#define GCM_PROPERTY_STEP               ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Step"))
-#define GCM_PROPERTY_TAG                ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Tag"))
-#define GCM_PROPERTY_RESOURCERESOLVER   ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ResourceResolver"))
+#define GCM_PROPERTY_POS_X		        ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("PositionX"))
+#define GCM_PROPERTY_POS_Y		        ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("PositionY"))
+#define GCM_PROPERTY_WIDTH		        ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Width"))
+#define GCM_PROPERTY_HEIGHT		        ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Height"))
+#define GCM_PROPERTY_NAME		        ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Name"))
+#define GCM_PROPERTY_TABINDEX	        ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("TabIndex"))
+#define GCM_PROPERTY_STEP		        ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Step"))
+#define GCM_PROPERTY_TAG		        ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Tag"))
+#define GCM_PROPERTY_RESOURCERESOLVER	::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ResourceResolver"))
 
-#define DEFAULT_ATTRIBS()       PropertyAttribute::BOUND | PropertyAttribute::TRANSIENT
+#define DEFAULT_ATTRIBS()		PropertyAttribute::BOUND | PropertyAttribute::TRANSIENT
 
 //........................................................................
 // namespace toolkit
@@ -101,7 +101,7 @@
         {
             m_xAggregate = _pAggregateInstance;
 
-            {   // check if the aggregat is cloneable
+            {	// check if the aggregat is cloneable
                 Reference< XCloneable > xCloneAccess(m_xAggregate, UNO_QUERY);
                 m_bCloneable = xCloneAccess.is();
             }
@@ -184,14 +184,14 @@
     void OGeometryControlModel_Base::registerProperties()
     {
         // register our members for the property handling of the OPropertyContainer
-        registerProperty(GCM_PROPERTY_POS_X,    GCM_PROPERTY_ID_POS_X,      DEFAULT_ATTRIBS(), &m_nPosX, ::getCppuType(&m_nPosX));
-        registerProperty(GCM_PROPERTY_POS_Y,    GCM_PROPERTY_ID_POS_Y,      DEFAULT_ATTRIBS(), &m_nPosY, ::getCppuType(&m_nPosY));
-        registerProperty(GCM_PROPERTY_WIDTH,    GCM_PROPERTY_ID_WIDTH,      DEFAULT_ATTRIBS(), &m_nWidth, ::getCppuType(&m_nWidth));
-        registerProperty(GCM_PROPERTY_HEIGHT,   GCM_PROPERTY_ID_HEIGHT,     DEFAULT_ATTRIBS(), &m_nHeight, ::getCppuType(&m_nHeight));
-        registerProperty(GCM_PROPERTY_NAME,     GCM_PROPERTY_ID_NAME,       DEFAULT_ATTRIBS(), &m_aName, ::getCppuType(&m_aName));
-        registerProperty(GCM_PROPERTY_TABINDEX, GCM_PROPERTY_ID_TABINDEX,   DEFAULT_ATTRIBS(), &m_nTabIndex, ::getCppuType(&m_nTabIndex));
-        registerProperty(GCM_PROPERTY_STEP,     GCM_PROPERTY_ID_STEP,       DEFAULT_ATTRIBS(), &m_nStep, ::getCppuType(&m_nStep));
-        registerProperty(GCM_PROPERTY_TAG,      GCM_PROPERTY_ID_TAG,        DEFAULT_ATTRIBS(), &m_aTag, ::getCppuType(&m_aTag));
+        registerProperty(GCM_PROPERTY_POS_X,	GCM_PROPERTY_ID_POS_X,		DEFAULT_ATTRIBS(), &m_nPosX, ::getCppuType(&m_nPosX));
+        registerProperty(GCM_PROPERTY_POS_Y,	GCM_PROPERTY_ID_POS_Y,		DEFAULT_ATTRIBS(), &m_nPosY, ::getCppuType(&m_nPosY));
+        registerProperty(GCM_PROPERTY_WIDTH,	GCM_PROPERTY_ID_WIDTH,		DEFAULT_ATTRIBS(), &m_nWidth, ::getCppuType(&m_nWidth));
+        registerProperty(GCM_PROPERTY_HEIGHT,	GCM_PROPERTY_ID_HEIGHT,		DEFAULT_ATTRIBS(), &m_nHeight, ::getCppuType(&m_nHeight));
+        registerProperty(GCM_PROPERTY_NAME,		GCM_PROPERTY_ID_NAME,		DEFAULT_ATTRIBS(), &m_aName, ::getCppuType(&m_aName));
+        registerProperty(GCM_PROPERTY_TABINDEX,	GCM_PROPERTY_ID_TABINDEX,	DEFAULT_ATTRIBS(), &m_nTabIndex, ::getCppuType(&m_nTabIndex));
+        registerProperty(GCM_PROPERTY_STEP,		GCM_PROPERTY_ID_STEP,		DEFAULT_ATTRIBS(), &m_nStep, ::getCppuType(&m_nStep));
+        registerProperty(GCM_PROPERTY_TAG,		GCM_PROPERTY_ID_TAG,		DEFAULT_ATTRIBS(), &m_aTag, ::getCppuType(&m_aTag));
         registerProperty(GCM_PROPERTY_RESOURCERESOLVER, GCM_PROPERTY_ID_RESOURCERESOLVER, DEFAULT_ATTRIBS(), &m_xStrResolver, ::getCppuType(&m_xStrResolver));
     }
 
@@ -199,19 +199,19 @@
     ::com::sun::star::uno::Any OGeometryControlModel_Base::ImplGetDefaultValueByHandle(sal_Int32 nHandle) const
     {
         ::com::sun::star::uno::Any aDefault;
-
+    
         switch ( nHandle )
         {
-            case GCM_PROPERTY_ID_POS_X:             aDefault <<= (sal_Int32) 0; break;
-            case GCM_PROPERTY_ID_POS_Y:             aDefault <<= (sal_Int32) 0; break;
-            case GCM_PROPERTY_ID_WIDTH:             aDefault <<= (sal_Int32) 0; break;
-            case GCM_PROPERTY_ID_HEIGHT:            aDefault <<= (sal_Int32) 0; break;
-            case GCM_PROPERTY_ID_NAME:              aDefault <<= ::rtl::OUString(); break;
-            case GCM_PROPERTY_ID_TABINDEX:          aDefault <<= (sal_Int16) -1; break;
-            case GCM_PROPERTY_ID_STEP:              aDefault <<= (sal_Int32) 0; break;
-            case GCM_PROPERTY_ID_TAG:               aDefault <<= ::rtl::OUString(); break;
+            case GCM_PROPERTY_ID_POS_X:			    aDefault <<= (sal_Int32) 0; break;
+            case GCM_PROPERTY_ID_POS_Y:			    aDefault <<= (sal_Int32) 0; break;
+            case GCM_PROPERTY_ID_WIDTH:			    aDefault <<= (sal_Int32) 0; break;
+            case GCM_PROPERTY_ID_HEIGHT:		    aDefault <<= (sal_Int32) 0; break;
+            case GCM_PROPERTY_ID_NAME:			    aDefault <<= ::rtl::OUString(); break;
+            case GCM_PROPERTY_ID_TABINDEX:		    aDefault <<= (sal_Int16) -1; break;
+            case GCM_PROPERTY_ID_STEP:			    aDefault <<= (sal_Int32) 0; break;
+            case GCM_PROPERTY_ID_TAG:			    aDefault <<= ::rtl::OUString(); break;
             case GCM_PROPERTY_ID_RESOURCERESOLVER:  aDefault <<= Reference< resource::XStringResourceResolver >(); break;
-            default:                            DBG_ERROR( "ImplGetDefaultValueByHandle - unknown Property" );
+            default:							DBG_ERROR( "ImplGetDefaultValueByHandle - unknown Property" );
         }
 
         return aDefault;
@@ -221,19 +221,19 @@
     ::com::sun::star::uno::Any OGeometryControlModel_Base::ImplGetPropertyValueByHandle(sal_Int32 nHandle) const
     {
         ::com::sun::star::uno::Any aValue;
-
+    
         switch ( nHandle )
         {
-            case GCM_PROPERTY_ID_POS_X:         aValue <<= m_nPosX; break;
-            case GCM_PROPERTY_ID_POS_Y:         aValue <<= m_nPosY; break;
-            case GCM_PROPERTY_ID_WIDTH:         aValue <<= m_nWidth; break;
-            case GCM_PROPERTY_ID_HEIGHT:        aValue <<= m_nHeight; break;
-            case GCM_PROPERTY_ID_NAME:          aValue <<= m_aName; break;
-            case GCM_PROPERTY_ID_TABINDEX:      aValue <<= m_nTabIndex; break;
-            case GCM_PROPERTY_ID_STEP:          aValue <<= m_nStep; break;
-            case GCM_PROPERTY_ID_TAG:           aValue <<= m_aTag; break;
+            case GCM_PROPERTY_ID_POS_X:			aValue <<= m_nPosX; break;
+            case GCM_PROPERTY_ID_POS_Y:			aValue <<= m_nPosY; break;
+            case GCM_PROPERTY_ID_WIDTH:			aValue <<= m_nWidth; break;
+            case GCM_PROPERTY_ID_HEIGHT:		aValue <<= m_nHeight; break;
+            case GCM_PROPERTY_ID_NAME:			aValue <<= m_aName; break;
+            case GCM_PROPERTY_ID_TABINDEX:		aValue <<= m_nTabIndex; break;
+            case GCM_PROPERTY_ID_STEP:			aValue <<= m_nStep; break;
+            case GCM_PROPERTY_ID_TAG:			aValue <<= m_aTag; break;
             case GCM_PROPERTY_ID_RESOURCERESOLVER: aValue <<= m_xStrResolver; break;
-            default:                            DBG_ERROR( "ImplGetPropertyValueByHandle - unknown Property" );
+            default:							DBG_ERROR( "ImplGetPropertyValueByHandle - unknown Property" );
         }
 
         return aValue;
@@ -241,19 +241,19 @@
 
     //--------------------------------------------------------------------
     void OGeometryControlModel_Base::ImplSetPropertyValueByHandle(sal_Int32 nHandle, const :: com::sun::star::uno::Any& aValue)
-    {
+    {		
         switch ( nHandle )
         {
-            case GCM_PROPERTY_ID_POS_X:         aValue >>= m_nPosX; break;
-            case GCM_PROPERTY_ID_POS_Y:         aValue >>= m_nPosY; break;
-            case GCM_PROPERTY_ID_WIDTH:         aValue >>= m_nWidth; break;
-            case GCM_PROPERTY_ID_HEIGHT:        aValue >>= m_nHeight; break;
-            case GCM_PROPERTY_ID_NAME:          aValue >>= m_aName; break;
-            case GCM_PROPERTY_ID_TABINDEX:      aValue >>= m_nTabIndex; break;
-            case GCM_PROPERTY_ID_STEP:          aValue >>= m_nStep; break;
-            case GCM_PROPERTY_ID_TAG:           aValue >>= m_aTag; break;
+            case GCM_PROPERTY_ID_POS_X:			aValue >>= m_nPosX; break;
+            case GCM_PROPERTY_ID_POS_Y:			aValue >>= m_nPosY; break;
+            case GCM_PROPERTY_ID_WIDTH:			aValue >>= m_nWidth; break;
+            case GCM_PROPERTY_ID_HEIGHT:		aValue >>= m_nHeight; break;
+            case GCM_PROPERTY_ID_NAME:			aValue >>= m_aName; break;
+            case GCM_PROPERTY_ID_TABINDEX:		aValue >>= m_nTabIndex; break;
+            case GCM_PROPERTY_ID_STEP:			aValue >>= m_nStep; break;
+            case GCM_PROPERTY_ID_TAG:			aValue >>= m_aTag; break;
             case GCM_PROPERTY_ID_RESOURCERESOLVER: aValue >>= m_xStrResolver; break;
-            default:                            DBG_ERROR( "ImplSetPropertyValueByHandle - unknown Property" );
+            default:							DBG_ERROR( "ImplSetPropertyValueByHandle - unknown Property" );
         }
     }
 
@@ -333,7 +333,7 @@
     {
         OPropertyArrayAggregationHelper& rPH = static_cast<OPropertyArrayAggregationHelper&>(const_cast<OGeometryControlModel_Base*>(this)->getInfoHelper());
         ::rtl::OUString sPropName;
-        sal_Int32   nOriginalHandle = -1;
+        sal_Int32	nOriginalHandle = -1;
 
         if (rPH.fillAggregatePropertyInfoByHandle(&sPropName, &nOriginalHandle, _nHandle))
             OPropertySetAggregationHelper::getFastPropertyValue(_rValue, _nHandle);
@@ -393,14 +393,14 @@
             // should have been reset
 
         // set properties
-        pOwnClone->m_nPosX      = m_nPosX;
-        pOwnClone->m_nPosY      = m_nPosY;
-        pOwnClone->m_nWidth     = m_nWidth;
-        pOwnClone->m_nHeight    = m_nHeight;
-        pOwnClone->m_aName      = m_aName;
-        pOwnClone->m_nTabIndex  = m_nTabIndex;
-        pOwnClone->m_nStep      = m_nStep;
-        pOwnClone->m_aTag       = m_aTag;
+        pOwnClone->m_nPosX		= m_nPosX;
+        pOwnClone->m_nPosY		= m_nPosY;
+        pOwnClone->m_nWidth		= m_nWidth;
+        pOwnClone->m_nHeight	= m_nHeight;
+        pOwnClone->m_aName		= m_aName;
+        pOwnClone->m_nTabIndex	= m_nTabIndex;
+        pOwnClone->m_nStep		= m_nStep;
+        pOwnClone->m_aTag		= m_aTag;
 
 
         // Clone event container
@@ -408,13 +408,13 @@
             static_cast< ::com::sun::star::script::XScriptEventsSupplier* >( this );
         Reference< ::com::sun::star::script::XScriptEventsSupplier > xCloneEventsSupplier =
             static_cast< ::com::sun::star::script::XScriptEventsSupplier* >( pOwnClone );
-
+            
         if( xEventsSupplier.is() && xCloneEventsSupplier.is() )
         {
             Reference< XNameContainer > xEventCont = xEventsSupplier->getEvents();
             Reference< XNameContainer > xCloneEventCont = xCloneEventsSupplier->getEvents();
 
-            ::com::sun::star::uno::Sequence< ::rtl::OUString > aNames =
+            ::com::sun::star::uno::Sequence< ::rtl::OUString > aNames = 
                 xEventCont->getElementNames();
             const ::rtl::OUString* pNames = aNames.getConstArray();
             sal_Int32 i, nNameCount = aNames.getLength();
@@ -454,8 +454,8 @@
     //====================================================================
     //--------------------------------------------------------------------
 
-    typedef ::std::hash_map< ::rtl::OUString, sal_Int32, ::comphelper::UStringHash > HashMapString2Int;
-    typedef ::std::vector< ::com::sun::star::uno::Sequence< ::com::sun::star::beans::Property > >   PropSeqArray;
+    typedef	::std::hash_map< ::rtl::OUString, sal_Int32, ::comphelper::UStringHash > HashMapString2Int;
+    typedef ::std::vector< ::com::sun::star::uno::Sequence< ::com::sun::star::beans::Property > >	PropSeqArray;
     typedef ::std::vector< ::std::vector< sal_Int32 > > IntArrayArray;
 
     // for creating class-unique PropertySetInfo's, we need some info:
@@ -519,7 +519,7 @@
     //--------------------------------------------------------------------
     struct PropertyNameEqual : public ::std::unary_function< Property, bool >
     {
-        const ::rtl::OUString&  m_rCompare;
+        const ::rtl::OUString&	m_rCompare;
         PropertyNameEqual( const ::rtl::OUString& _rCompare ) : m_rCompare( _rCompare ) { }
 
         bool operator()( const Property& _rLHS )
@@ -562,7 +562,7 @@
             // look for the current property in the properties of our aggregate
             const Property* pAggPropPos = ::std::find_if( pAggProps, pAggPropsEnd, PropertyNameEqual( pProp->Name ) );
             if ( pAggPropPos != pAggPropsEnd )
-            {   // found a duplicate
+            {	// found a duplicate
                 // -> remove from the aggregate property sequence
                 ::comphelper::removeElementAt( aAggregateProps, pAggPropPos - pAggProps );
                 // which means we have to adjust the pointers
@@ -613,7 +613,7 @@
     //--------------------------------------------------------------------
     struct Int32Equal : public ::std::unary_function< sal_Int32, bool >
     {
-        sal_Int32   m_nCompare;
+        sal_Int32	m_nCompare;
         Int32Equal( sal_Int32 _nCompare ) : m_nCompare( _nCompare ) { }
 
         bool operator()( sal_Int32 _nLHS )
@@ -649,5 +649,5 @@
     }
 
 //........................................................................
-// }    // namespace toolkit
+// }	// namespace toolkit
 //........................................................................
diff --git a/toolkit/source/controls/grid/defaultgridcolumnmodel.cxx b/toolkit/source/controls/grid/defaultgridcolumnmodel.cxx
index 011f3502cdd8..fd2d3b119654 100644
--- a/toolkit/source/controls/grid/defaultgridcolumnmodel.cxx
+++ b/toolkit/source/controls/grid/defaultgridcolumnmodel.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
@@ -116,14 +116,14 @@ void SAL_CALL DefaultGridColumnModel::setDefaultColumns(sal_Int32 rowElements) t
 
     for(sal_Int32 i=0;i<rowElements;i++)
     {
-        Reference<XGridColumn> xColumn( m_xFactory->createInstance ( OUString::createFromAscii( "com.sun.star.awt.grid.GridColumn"  ) ), UNO_QUERY );
+        Reference<XGridColumn> xColumn( m_xFactory->createInstance ( OUString::createFromAscii( "com.sun.star.awt.grid.GridColumn"	) ), UNO_QUERY );
         columns.push_back(xColumn);
         xColumn->setIndex(i);
     }
 }
 ::com::sun::star::uno::Reference< ::com::sun::star::awt::grid::XGridColumn > SAL_CALL DefaultGridColumnModel::copyColumn(const ::com::sun::star::uno::Reference< ::com::sun::star::awt::grid::XGridColumn > & column)  throw (::com::sun::star::uno::RuntimeException)
 {
-    Reference<XGridColumn> xColumn( m_xFactory->createInstance ( OUString::createFromAscii( "com.sun.star.awt.grid.GridColumn"  ) ), UNO_QUERY );
+    Reference<XGridColumn> xColumn( m_xFactory->createInstance ( OUString::createFromAscii( "com.sun.star.awt.grid.GridColumn"	) ), UNO_QUERY );
     xColumn->setColumnWidth(column->getColumnWidth());
     xColumn->setPreferredWidth(column->getPreferredWidth());
     xColumn->setMaxWidth(column->getMaxWidth());
diff --git a/toolkit/source/controls/grid/defaultgridcolumnmodel.hxx b/toolkit/source/controls/grid/defaultgridcolumnmodel.hxx
index 8b8c8bfc795c..b98975efee17 100644
--- a/toolkit/source/controls/grid/defaultgridcolumnmodel.hxx
+++ b/toolkit/source/controls/grid/defaultgridcolumnmodel.hxx
@@ -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
@@ -60,7 +60,7 @@ class DefaultGridColumnModel : public ::cppu::WeakImplHelper2< XGridColumnModel,
 public:
     DefaultGridColumnModel(const Reference< XMultiServiceFactory >& xFactory);
     virtual ~DefaultGridColumnModel();
-
+    
     // XGridColumnModel
 
     //virtual ::sal_Bool SAL_CALL getColumnSelectionAllowed() throw (::com::sun::star::uno::RuntimeException);
diff --git a/toolkit/source/controls/grid/defaultgriddatamodel.cxx b/toolkit/source/controls/grid/defaultgriddatamodel.cxx
index 7ffafdf0ddb6..785dbd7d7716 100644
--- a/toolkit/source/controls/grid/defaultgriddatamodel.cxx
+++ b/toolkit/source/controls/grid/defaultgriddatamodel.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
@@ -76,9 +76,9 @@ void DefaultGridDataModel::broadcast( broadcast_type eType, const GridDataEvent&
             XGridDataListener* pListener = static_cast<XGridDataListener*>(aListIter.next());
             switch( eType )
             {
-            case row_added:     pListener->rowAdded(aEvent); break;
-            case row_removed:   pListener->rowRemoved(aEvent); break;
-            case data_changed:  pListener->dataChanged(aEvent); break;
+            case row_added:		pListener->rowAdded(aEvent); break;
+            case row_removed:	pListener->rowRemoved(aEvent); break;
+            case data_changed:	pListener->dataChanged(aEvent); break;
             }
         }
     }
@@ -95,7 +95,7 @@ void DefaultGridDataModel::broadcast_changed( ::rtl::OUString name, sal_Int32 in
 
 //---------------------------------------------------------------------
 
-void DefaultGridDataModel::broadcast_add( sal_Int32 index, const ::rtl::OUString & headerName,
+void DefaultGridDataModel::broadcast_add( sal_Int32 index, const ::rtl::OUString & headerName, 
                                          ::com::sun::star::uno::Sequence< Any > rowData ) throw (::com::sun::star::uno::RuntimeException)
 {
     Reference< XInterface > xSource( static_cast< ::cppu::OWeakObject* >( this ) );
@@ -105,7 +105,7 @@ void DefaultGridDataModel::broadcast_add( sal_Int32 index, const ::rtl::OUString
 
 //---------------------------------------------------------------------
 
-void DefaultGridDataModel::broadcast_remove( sal_Int32 index, const ::rtl::OUString & headerName,
+void DefaultGridDataModel::broadcast_remove( sal_Int32 index, const ::rtl::OUString & headerName, 
                                             ::com::sun::star::uno::Sequence< Any > rowData ) throw (::com::sun::star::uno::RuntimeException)
 {
     Reference< XInterface > xSource( static_cast< ::cppu::OWeakObject* >( this ) );
@@ -179,13 +179,13 @@ void SAL_CALL DefaultGridDataModel::addRow(const ::rtl::OUString & headername, c
     // store row data
     std::vector< Any > newRow;
     for ( int i = 0; i < rRowdata.getLength();i++)
-    {
+    {		
         newRow.push_back(rRowdata[i]);
     }
 
     data.push_back( newRow );
-
-    broadcast_add( data.size()-1, headername, comphelper::containerToSequence(newRow));
+    
+    broadcast_add( data.size()-1, headername, comphelper::containerToSequence(newRow));  
 
 }
 
@@ -198,21 +198,21 @@ void SAL_CALL DefaultGridDataModel::removeRow(::sal_Int32 index) throw (::com::s
         ::rtl::OUString headerName( (::rtl::OUString) rowHeaders[index] );
         rowHeaders.erase(rowHeaders.begin() + index);
 
-        Sequence< Any >& rowData ( (Sequence< Any >&)data[index] );
+        Sequence< Any >& rowData ( (Sequence< Any >&)data[index] ); 
         data.erase(data.begin() + index);
-        broadcast_remove( index, headerName, rowData);
+        broadcast_remove( index, headerName, rowData);  
     }
-    else
+    else 
         return;
 }
 //---------------------------------------------------------------------
 ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< Any > > SAL_CALL DefaultGridDataModel::getData() throw (::com::sun::star::uno::RuntimeException)
 {
-
+    
     std::vector< std::vector< Any > >::iterator iterator;
     std::vector< Sequence< Any  > > dummyContainer(0);
 
-
+    
     for(iterator = data.begin(); iterator != data.end(); iterator++)
     {
         Sequence< Any > cols(comphelper::containerToSequence(*iterator));
@@ -241,7 +241,7 @@ void SAL_CALL DefaultGridDataModel::removeAll() throw (RuntimeException)
 {
     rowHeaders.clear();
     data.clear();
-    broadcast_remove( -1, ::rtl::OUString(), 0);
+    broadcast_remove( -1, ::rtl::OUString(), 0); 
 }
 //---------------------------------------------------------------------
 void SAL_CALL DefaultGridDataModel::setRowHeaderWidth(sal_Int32 _value) throw (::com::sun::star::uno::RuntimeException)
diff --git a/toolkit/source/controls/grid/defaultgriddatamodel.hxx b/toolkit/source/controls/grid/defaultgriddatamodel.hxx
index ea11a8a9a00a..0680c3e60a14 100644
--- a/toolkit/source/controls/grid/defaultgriddatamodel.hxx
+++ b/toolkit/source/controls/grid/defaultgriddatamodel.hxx
@@ -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
diff --git a/toolkit/source/controls/grid/gridcolumn.cxx b/toolkit/source/controls/grid/gridcolumn.cxx
index 6720d639f5c1..63a21ad72f8b 100644
--- a/toolkit/source/controls/grid/gridcolumn.cxx
+++ b/toolkit/source/controls/grid/gridcolumn.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
@@ -87,7 +87,7 @@ void GridColumn::broadcast( broadcast_column_type eType, const GridColumnEvent&
             XGridColumnListener* pListener = static_cast<XGridColumnListener*>(aListIter.next());
             switch( eType )
             {
-                case column_attribute_changed:  pListener->columnChanged(aEvent); break;
+                case column_attribute_changed:	pListener->columnChanged(aEvent); break;
             }
         }
     }
diff --git a/toolkit/source/controls/grid/gridcolumn.hxx b/toolkit/source/controls/grid/gridcolumn.hxx
index 38d43d55a07b..727aabcda013 100644
--- a/toolkit/source/controls/grid/gridcolumn.hxx
+++ b/toolkit/source/controls/grid/gridcolumn.hxx
@@ -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
@@ -87,7 +87,7 @@ public:
     virtual ::rtl::OUString SAL_CALL getImplementationName(  ) throw (RuntimeException);
     virtual ::sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw (RuntimeException);
     virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames(  ) throw (RuntimeException);
-
+    
     virtual void SAL_CALL setIndex(sal_Int32 _nIndex)throw (::com::sun::star::uno::RuntimeException);
 private:
     void broadcast( broadcast_column_type eType, const GridColumnEvent& aEvent );
diff --git a/toolkit/source/controls/grid/gridcontrol.cxx b/toolkit/source/controls/grid/gridcontrol.cxx
index 5125c1349ade..e4e3042e32be 100644
--- a/toolkit/source/controls/grid/gridcontrol.cxx
+++ b/toolkit/source/controls/grid/gridcontrol.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
@@ -52,9 +52,9 @@ using namespace ::com::sun::star::view;
 
 namespace toolkit
 {
-//  ----------------------------------------------------
-//  class UnoGridModel
-//  ----------------------------------------------------
+//	----------------------------------------------------
+//	class UnoGridModel
+//	----------------------------------------------------
 UnoGridModel::UnoGridModel()
 {
     ImplRegisterProperty( BASEPROPERTY_BACKGROUNDCOLOR );
@@ -90,7 +90,7 @@ UnoGridModel::UnoGridModel( const UnoGridModel& rModel )
 : UnoControlModel( rModel )
 {
 }
-
+                        
 UnoControlModel* UnoGridModel::Clone() const
 {
     return new UnoGridModel( *this );
@@ -104,9 +104,9 @@ OUString UnoGridModel::getServiceName() throw(RuntimeException)
 Any UnoGridModel::ImplGetDefaultValue( sal_uInt16 nPropId ) const
 {
     switch( nPropId )
-    {
+    { 
         case BASEPROPERTY_DEFAULTCONTROL:
-            return uno::makeAny( ::rtl::OUString::createFromAscii( szServiceName_GridControl ) );
+            return uno::makeAny( ::rtl::OUString::createFromAscii( szServiceName_GridControl ) ); 
         case BASEPROPERTY_GRID_SELECTIONMODE:
             return uno::makeAny( SelectionType(1) );
         case BASEPROPERTY_GRID_SHOWROWHEADER:
@@ -126,9 +126,9 @@ Any UnoGridModel::ImplGetDefaultValue( sal_uInt16 nPropId ) const
         case BASEPROPERTY_GRID_ROW_BACKGROUND:
             return uno::makeAny(com::sun::star::util::Color(0xFFFFFF) );
         default:
-            return UnoControlModel::ImplGetDefaultValue( nPropId );
+            return UnoControlModel::ImplGetDefaultValue( nPropId ); 
     }
-
+    
 }
 
 ::cppu::IPropertyArrayHelper& UnoGridModel::getInfoHelper()
@@ -136,7 +136,7 @@ Any UnoGridModel::ImplGetDefaultValue( sal_uInt16 nPropId ) const
     static UnoPropertyArrayHelper* pHelper = NULL;
     if ( !pHelper )
     {
-        Sequence<sal_Int32> aIDs = ImplGetPropertyIds();
+        Sequence<sal_Int32>	aIDs = ImplGetPropertyIds();
         pHelper = new UnoPropertyArrayHelper( aIDs );
     }
     return *pHelper;
@@ -150,9 +150,9 @@ Reference< XPropertySetInfo > UnoGridModel::getPropertySetInfo(  ) throw(Runtime
 }
 
 
-//  ----------------------------------------------------
-//  class UnoGridControl
-//  ----------------------------------------------------
+//	----------------------------------------------------
+//	class UnoGridControl
+//	----------------------------------------------------
 UnoGridControl::UnoGridControl()
 : mSelectionMode(SelectionType(1)),
     m_aSelectionListeners( *this )
@@ -178,7 +178,7 @@ void UnoGridControl::createPeer( const uno::Reference< awt::XToolkit > & rxToolk
 
     Reference< XGridControl >  xGrid( getPeer(), UNO_QUERY_THROW );
     xGrid->addSelectionListener(&m_aSelectionListeners);
-
+ 
     Reference<XGridDataListener> xListener ( getPeer(), UNO_QUERY_THROW );
     Reference<XGridColumnListener> xColListener ( getPeer(), UNO_QUERY_THROW );
     Reference<XPropertySet> xPropSet ( getModel(), UNO_QUERY_THROW );
@@ -190,7 +190,7 @@ void UnoGridControl::createPeer( const uno::Reference< awt::XToolkit > & rxToolk
     if(xGridColumnModel != NULL)
     {
         for(int i = 0;i<xGridColumnModel->getColumnCount();i++)
-        {
+        {		
             xGridColumnModel->getColumn(i)->addColumnListener(xColListener);
         }
     }
diff --git a/toolkit/source/controls/grid/gridcontrol.hxx b/toolkit/source/controls/grid/gridcontrol.hxx
index 0c8ddb1c02b6..aa10bc972d67 100644
--- a/toolkit/source/controls/grid/gridcontrol.hxx
+++ b/toolkit/source/controls/grid/gridcontrol.hxx
@@ -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
@@ -51,16 +51,16 @@ using namespace ::com::sun::star::container;
 // ===================================================================
 class UnoGridModel : public UnoControlModel
 {
-protected:
-    Any     ImplGetDefaultValue( sal_uInt16 nPropId ) const;
-    ::cppu::IPropertyArrayHelper&   SAL_CALL getInfoHelper();
+protected:	
+    Any		ImplGetDefaultValue( sal_uInt16 nPropId ) const;
+    ::cppu::IPropertyArrayHelper&	SAL_CALL getInfoHelper();
 
 public:
     UnoGridModel();
     UnoGridModel( const UnoGridModel& rModel );
-
+                        
     UnoControlModel* Clone() const;
-
+                        
     // ::com::sun::star::beans::XMultiPropertySet
     ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo(  ) throw(::com::sun::star::uno::RuntimeException);
 
@@ -79,21 +79,21 @@ class UnoGridControl : public ::cppu::ImplInheritanceHelper1< UnoControlBase, ::
 {
 public:
     UnoGridControl();
-    ::rtl::OUString             GetComponentServiceName();
-
+    ::rtl::OUString				GetComponentServiceName();
+                                                                                                                                                
     // ::com::sun::star::lang::XComponent
     void SAL_CALL dispose(  ) throw(::com::sun::star::uno::RuntimeException);
 
     // ::com::sun::star::awt::XControl
     void SAL_CALL createPeer( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XToolkit >& Toolkit, const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer >& Parent ) throw(::com::sun::star::uno::RuntimeException);
 
-    // ::com::sun::star::awt::grid::XGridControl
+    // ::com::sun::star::awt::grid::XGridControl 
 
-    virtual ::sal_Int32 SAL_CALL getItemIndexAtPoint(::sal_Int32 x, ::sal_Int32 y) throw (::com::sun::star::uno::RuntimeException);
+    virtual ::sal_Int32 SAL_CALL getItemIndexAtPoint(::sal_Int32 x, ::sal_Int32 y) throw (::com::sun::star::uno::RuntimeException);	
     virtual void SAL_CALL setToolTip(const ::com::sun::star::uno::Sequence< ::rtl::OUString >& text, const ::com::sun::star::uno::Sequence< ::sal_Int32 >& columns) throw (::com::sun::star::uno::RuntimeException);
 
     // ::com::sun::star::awt::grid::XGridSelection
-
+    
     virtual ::sal_Int32 SAL_CALL getMinSelectionIndex() throw (::com::sun::star::uno::RuntimeException);
     virtual ::sal_Int32 SAL_CALL getMaxSelectionIndex() throw (::com::sun::star::uno::RuntimeException);
     virtual void SAL_CALL selectRows(const ::com::sun::star::uno::Sequence< ::sal_Int32 >& rangeOfRows) throw (::com::sun::star::uno::RuntimeException);
@@ -106,14 +106,14 @@ public:
     virtual void SAL_CALL selectRow(::sal_Int32 y) throw (::com::sun::star::uno::RuntimeException);
     virtual void SAL_CALL addSelectionListener(const ::com::sun::star::uno::Reference< ::com::sun::star::awt::grid::XGridSelectionListener > & listener) throw (::com::sun::star::uno::RuntimeException);
     virtual void SAL_CALL removeSelectionListener(const ::com::sun::star::uno::Reference< ::com::sun::star::awt::grid::XGridSelectionListener > & listener) throw (::com::sun::star::uno::RuntimeException);
-
+    
     // ::com::sun::star::lang::XServiceInfo
     DECLIMPL_SERVICEINFO_DERIVED( UnoGridControl, UnoControlBase, szServiceName_GridControl )
 
     using UnoControl::getPeer;
 private:
     ::com::sun::star::view::SelectionType mSelectionMode;
-    SelectionListenerMultiplexer    m_aSelectionListeners;
+    SelectionListenerMultiplexer 	m_aSelectionListeners;
 };
 
 } // toolkit
diff --git a/toolkit/source/controls/roadmapcontrol.cxx b/toolkit/source/controls/roadmapcontrol.cxx
index 96f51b39dc72..0d52b714cd40 100644
--- a/toolkit/source/controls/roadmapcontrol.cxx
+++ b/toolkit/source/controls/roadmapcontrol.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
@@ -48,17 +48,17 @@ namespace toolkit
     using namespace ::com::sun::star::beans;
     using namespace ::com::sun::star::container;
 
-//  ----------------------------------------------------
+//	----------------------------------------------------
 //  helper
-//  ----------------------------------------------------
+//	----------------------------------------------------
 
 static void lcl_throwIllegalArgumentException( )
-{   // throwing is expensive (in terms of code size), thus we hope the compiler does not inline this ....
+{	// throwing is expensive (in terms of code size), thus we hope the compiler does not inline this ....
     throw IllegalArgumentException();
 }
 
 static void lcl_throwIndexOutOfBoundsException( )
-{   // throwing is expensive (in terms of code size), thus we hope the compiler does not inline this ....
+{	// throwing is expensive (in terms of code size), thus we hope the compiler does not inline this ....
     throw IndexOutOfBoundsException();
 }
 
@@ -143,7 +143,7 @@ static void lcl_throwIndexOutOfBoundsException( )
 
 
     // -------------------------------------------------------------------
-    ::com::sun::star::uno::Any  SAL_CALL UnoControlRoadmapModel::queryAggregation( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException)
+    ::com::sun::star::uno::Any	SAL_CALL UnoControlRoadmapModel::queryAggregation( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException)
     {
         Any aRet = UnoControlRoadmapModel_Base::queryAggregation( rType );
         if ( !aRet.hasValue() )
@@ -158,7 +158,7 @@ static void lcl_throwIndexOutOfBoundsException( )
         static UnoPropertyArrayHelper* pHelper = NULL;
         if ( !pHelper )
         {
-            Sequence<sal_Int32> aIDs = ImplGetPropertyIds();
+            Sequence<sal_Int32>	aIDs = ImplGetPropertyIds();
             pHelper = new UnoPropertyArrayHelper( aIDs );
         }
         return *pHelper;
@@ -205,7 +205,7 @@ static void lcl_throwIndexOutOfBoundsException( )
 
     void UnoControlRoadmapModel::SetRMItemDefaultProperties( const sal_Int32 , Reference< XInterface > xRoadmapItem)
     {
-        Any aAny;
+        Any	aAny;
         Reference< XPropertySet > xPropertySet( xRoadmapItem, UNO_QUERY );
         Reference< XPropertySet > xProps( xRoadmapItem, UNO_QUERY );
         if ( xProps.is() )
@@ -297,7 +297,7 @@ static void lcl_throwIndexOutOfBoundsException( )
 
 
     void SAL_CALL UnoControlRoadmapModel::removeByIndex( sal_Int32 Index)
-                                                throw    (IndexOutOfBoundsException, WrappedTargetException, RuntimeException )
+                                                throw	 (IndexOutOfBoundsException, WrappedTargetException, RuntimeException )
     {
         if (( Index > (sal_Int32)maRoadmapItems.size()) || (Index < 0))
             lcl_throwIndexOutOfBoundsException( );
diff --git a/toolkit/source/controls/roadmapentry.cxx b/toolkit/source/controls/roadmapentry.cxx
index fb760e404b93..6e714ef58d27 100644
--- a/toolkit/source/controls/roadmapentry.cxx
+++ b/toolkit/source/controls/roadmapentry.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
diff --git a/toolkit/source/controls/stdtabcontroller.cxx b/toolkit/source/controls/stdtabcontroller.cxx
index 012a7bc0a084..97fdbbe1b9a1 100644
--- a/toolkit/source/controls/stdtabcontroller.cxx
+++ b/toolkit/source/controls/stdtabcontroller.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
@@ -48,9 +48,9 @@ using namespace ::com::sun::star::awt;
 using namespace ::com::sun::star::lang;
 using namespace ::com::sun::star::beans;
 
-//  ----------------------------------------------------
-//  class StdTabController
-//  ----------------------------------------------------
+//	----------------------------------------------------
+//	class StdTabController
+//	----------------------------------------------------
 StdTabController::StdTabController()
 {
 }
@@ -60,13 +60,13 @@ StdTabController::~StdTabController()
 }
 
 sal_Bool StdTabController::ImplCreateComponentSequence(
-        Sequence< Reference< XControl > >&              rControls,
-        const Sequence< Reference< XControlModel > >&   rModels,
-        Sequence< Reference< XWindow > >&               rComponents,
-        Sequence< Any>*                                 pTabStops,
+        Sequence< Reference< XControl > >&				rControls,
+        const Sequence< Reference< XControlModel > >&	rModels,
+        Sequence< Reference< XWindow > >&				rComponents,
+        Sequence< Any>*									pTabStops,
         sal_Bool bPeerComponent ) const
 {
-    sal_Bool bOK = sal_True;
+    sal_Bool bOK = sal_True;			
 
     // nur die wirklich geforderten Controls
     sal_Int32 nModels = rModels.getLength();
@@ -93,7 +93,7 @@ sal_Bool StdTabController::ImplCreateComponentSequence(
 
 
     const Reference< XControl > * pControls = rControls.getConstArray();
-    sal_uInt32 nCtrls = rControls.getLength();
+    sal_uInt32 nCtrls = rControls.getLength(); 
     rComponents.realloc( nCtrls );
     Reference< XWindow > * pComps = rComponents.getArray();
     Any* pTabs = NULL;
@@ -106,22 +106,22 @@ sal_Bool StdTabController::ImplCreateComponentSequence(
     }
 
     for ( sal_uInt32 n = 0; bOK && ( n < nCtrls ); n++ )
-    {
+    {			
         // Zum Model passendes Control suchen
         Reference< XControl >  xCtrl(pControls[n]);
         if ( xCtrl.is() )
         {
             if (bPeerComponent)
-                pComps[n] = Reference< XWindow > (xCtrl->getPeer(), UNO_QUERY);
+                pComps[n] = Reference< XWindow > (xCtrl->getPeer(), UNO_QUERY);							
             else
                 pComps[n] = Reference< XWindow > (xCtrl, UNO_QUERY);
 
             // TabStop-Property
             if ( pTabs )
-            {
+            {					
                 // opt: String fuer TabStop als Konstante
                 static const ::rtl::OUString aTabStopName( ::rtl::OUString::createFromAscii( "Tabstop" ) );
-
+                
                 Reference< XPropertySet >  xPSet( xCtrl->getModel(), UNO_QUERY );
                 Reference< XPropertySetInfo >  xInfo = xPSet->getPropertySetInfo();
                 if( xInfo->hasPropertyByName( aTabStopName ) )
@@ -146,9 +146,9 @@ void StdTabController::ImplActivateControl( sal_Bool bFirst ) const
     Sequence< Reference< XControl > > aCtrls = xTabController->getControls();
     const Reference< XControl > * pControls = aCtrls.getConstArray();
     sal_uInt32 nCount = aCtrls.getLength();
-
+    
     for ( sal_uInt32 n = bFirst ? 0 : nCount; bFirst ? ( n < nCount ) : n; )
-    {
+    {			
         sal_uInt32 nCtrl = bFirst ? n++ : --n;
         DBG_ASSERT( pControls[nCtrl].is(), "Control nicht im Container!" );
         if ( pControls[nCtrl].is() )
@@ -186,35 +186,35 @@ IMPL_XTYPEPROVIDER_END
 void StdTabController::setModel( const Reference< XTabControllerModel >& Model ) throw(RuntimeException)
 {
     ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() );
-
+    
     mxModel = Model;
 }
 
 Reference< XTabControllerModel > StdTabController::getModel(  ) throw(RuntimeException)
 {
     ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() );
-
+    
     return mxModel;
 }
 
 void StdTabController::setContainer( const Reference< XControlContainer >& Container ) throw(RuntimeException)
 {
     ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() );
-
+    
     mxControlContainer = Container;
 }
 
 Reference< XControlContainer > StdTabController::getContainer(  ) throw(RuntimeException)
 {
     ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() );
-
+    
     return mxControlContainer;
 }
 
 Sequence< Reference< XControl > > StdTabController::getControls(  ) throw(RuntimeException)
 {
     ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() );
-
+    
     Sequence< Reference< XControl > > aSeq;
 
     if ( mxControlContainer.is() )
@@ -240,7 +240,7 @@ Sequence< Reference< XControl > > StdTabController::getControls(  ) throw(Runtim
 void StdTabController::autoTabOrder(  ) throw(RuntimeException)
 {
     ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() );
-
+    
     DBG_ASSERT( mxControlContainer.is(), "autoTabOrder: No ControlContainer!" );
     if ( !mxControlContainer.is() )
         return;
@@ -250,7 +250,7 @@ void StdTabController::autoTabOrder(  ) throw(RuntimeException)
 
     // vieleicht erhalte ich hier einen TabController,
     // der schneller die Liste meiner Controls ermittelt
-    Reference< XTabController >  xTabController(static_cast< ::cppu::OWeakObject* >(this), UNO_QUERY);
+    Reference< XTabController >  xTabController(static_cast< ::cppu::OWeakObject* >(this), UNO_QUERY);	
     Sequence< Reference< XControl > > aControls = xTabController->getControls();
 
     // #58317# Es sind ggf. noch nicht alle Controls fuer die Models im Container,
@@ -305,7 +305,7 @@ void StdTabController::autoTabOrder(  ) throw(RuntimeException)
 void StdTabController::activateTabOrder(  ) throw(RuntimeException)
 {
     ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() );
-
+    
     // Am Container die Tab-Reihenfolge aktivieren...
 
     Reference< XControl >  xC( mxControlContainer, UNO_QUERY );
@@ -317,7 +317,7 @@ void StdTabController::activateTabOrder(  ) throw(RuntimeException)
 
     // vieleicht erhalte ich hier einen TabController,
     // der schneller die Liste meiner Controls ermittelt
-    Reference< XTabController >  xTabController(static_cast< ::cppu::OWeakObject* >(this), UNO_QUERY);
+    Reference< XTabController >  xTabController(static_cast< ::cppu::OWeakObject* >(this), UNO_QUERY);	
 
     // Flache Liste besorgen...
     Sequence< Reference< XControlModel > > aModels = mxModel->getControlModels();
@@ -326,7 +326,7 @@ void StdTabController::activateTabOrder(  ) throw(RuntimeException)
 
     // DG: Aus Optimierungsgruenden werden die Controls mittels getControls() geholt,
     // dieses hoert sich zwar wiedersinning an, fuehrt aber im konkreten Fall (Forms) zu sichtbaren
-    // Geschwindigkeitsvorteilen
+    // Geschwindigkeitsvorteilen	
     Sequence< Reference< XControl > > aControls = xTabController->getControls();
 
     // #58317# Es sind ggf. noch nicht alle Controls fuer die Models im Container,
@@ -337,8 +337,8 @@ void StdTabController::activateTabOrder(  ) throw(RuntimeException)
     xVclContainerPeer->setTabOrder( aCompSeq, aTabSeq, mxModel->getGroupControl() );
 
     ::rtl::OUString aName;
-    Sequence< Reference< XControlModel > >  aThisGroupModels;
-    Sequence< Reference< XWindow > >        aControlComponents;
+    Sequence< Reference< XControlModel > >	aThisGroupModels;
+    Sequence< Reference< XWindow > >		aControlComponents;
 
     sal_uInt32 nGroups = mxModel->getGroupCount();
     for ( sal_uInt32 nG = 0; nG < nGroups; nG++ )
@@ -361,14 +361,14 @@ void StdTabController::activateTabOrder(  ) throw(RuntimeException)
 void StdTabController::activateFirst(  ) throw(RuntimeException)
 {
     ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() );
-
+    
     ImplActivateControl( sal_True );
 }
 
 void StdTabController::activateLast(  ) throw(RuntimeException)
 {
     ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() );
-
+    
     ImplActivateControl( sal_False );
 }
 
@@ -411,7 +411,7 @@ Reference< XControl >  StdTabController::FindControl( Sequence< Reference< XCont
     if ( !xCtrl.is() && rxCtrlModel.is())
 */
     DBG_ASSERT( rxCtrlModel.is(), "ImplFindControl - welches ?!" );
-
+    
     const Reference< XControl > * pCtrls = rCtrls.getConstArray();
     sal_Int32 nCtrls = rCtrls.getLength();
     for ( sal_Int32 n = 0; n < nCtrls; n++ )
diff --git a/toolkit/source/controls/stdtabcontrollermodel.cxx b/toolkit/source/controls/stdtabcontrollermodel.cxx
index db0555762511..7597765696a5 100644
--- a/toolkit/source/controls/stdtabcontrollermodel.cxx
+++ b/toolkit/source/controls/stdtabcontrollermodel.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
@@ -39,11 +39,11 @@
 
 #include <tools/debug.hxx>
 
-#define UNOCONTROL_STREAMVERSION    (short)2
+#define UNOCONTROL_STREAMVERSION	(short)2
 
-//  ----------------------------------------------------
-//  class UnoControlModelEntryList
-//  ----------------------------------------------------
+//	----------------------------------------------------
+//	class UnoControlModelEntryList
+//	----------------------------------------------------
 UnoControlModelEntryList::UnoControlModelEntryList()
 {
 }
@@ -72,9 +72,9 @@ void UnoControlModelEntryList::DestroyEntry( sal_uInt32 nEntry )
     delete pEntry;
 }
 
-//  ----------------------------------------------------
-//  class StdTabControllerModel
-//  ----------------------------------------------------
+//	----------------------------------------------------
+//	class StdTabControllerModel
+//	----------------------------------------------------
 StdTabControllerModel::StdTabControllerModel()
 {
     mbGroupControl = sal_True;
@@ -148,8 +148,8 @@ void ImplWriteControls( const ::com::sun::star::uno::Reference< ::com::sun::star
     sal_uInt32 nStoredControls = 0;
     sal_Int32 nDataBeginMark = xMark->createMark();
 
-    OutStream->writeLong( 0L ); // DataLen
-    OutStream->writeLong( 0L ); // nStoredControls
+    OutStream->writeLong( 0L );	// DataLen
+    OutStream->writeLong( 0L );	// nStoredControls
 
     sal_uInt32 nCtrls = rCtrls.getLength();
     for ( sal_uInt32 n = 0; n < nCtrls; n++ )
@@ -218,21 +218,21 @@ IMPL_XTYPEPROVIDER_END
 sal_Bool StdTabControllerModel::getGroupControl(  ) throw(::com::sun::star::uno::RuntimeException)
 {
     ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() );
-
+    
     return mbGroupControl;
 }
 
 void StdTabControllerModel::setGroupControl( sal_Bool GroupControl ) throw(::com::sun::star::uno::RuntimeException)
 {
     ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() );
-
+    
     mbGroupControl = GroupControl;
 }
 
 void StdTabControllerModel::setControlModels( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel > >& Controls ) throw(::com::sun::star::uno::RuntimeException)
 {
     ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() );
-
+    
     maControls.Reset();
     ImplSetControlModels( maControls, Controls );
 }
@@ -240,7 +240,7 @@ void StdTabControllerModel::setControlModels( const ::com::sun::star::uno::Seque
 ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel > > StdTabControllerModel::getControlModels(  ) throw(::com::sun::star::uno::RuntimeException)
 {
     ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() );
-
+    
     ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel > > aSeq( ImplGetControlCount( maControls ) );
     ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel > * pRefs = aSeq.getArray();
     ImplGetControlModels( &pRefs, maControls );
@@ -250,7 +250,7 @@ void StdTabControllerModel::setControlModels( const ::com::sun::star::uno::Seque
 void StdTabControllerModel::setGroup( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel > >& Group, const ::rtl::OUString& GroupName ) throw(::com::sun::star::uno::RuntimeException)
 {
     ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() );
-
+    
     // Die Controls stehen eventuel flach in der Liste und werden jetzt gruppiert.
     // Verschachtelte Gruppen sind erstmal nicht moeglich...
     // Das erste Element der Gruppe welches auch schon in der flachen Liste
@@ -290,7 +290,7 @@ void StdTabControllerModel::setGroup( const ::com::sun::star::uno::Sequence< ::c
 sal_Int32 StdTabControllerModel::getGroupCount(  ) throw(::com::sun::star::uno::RuntimeException)
 {
     ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() );
-
+    
     // erstmal nur eine Ebene...
     // Das Model und die Impl-Methoden arbeiten zwar rekursiv, aber das wird
     // erstmal nich nach aussen gegeben.
@@ -309,7 +309,7 @@ sal_Int32 StdTabControllerModel::getGroupCount(  ) throw(::com::sun::star::uno::
 void StdTabControllerModel::getGroup( sal_Int32 nGroup, ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel > >& rGroup, ::rtl::OUString& rName ) throw(::com::sun::star::uno::RuntimeException)
 {
     ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() );
-
+    
     ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel > > aSeq;
     sal_uInt32 nG = 0;
     sal_uInt32 nEntries = maControls.Count();
@@ -336,7 +336,7 @@ void StdTabControllerModel::getGroup( sal_Int32 nGroup, ::com::sun::star::uno::S
 void StdTabControllerModel::getGroupByName( const ::rtl::OUString& rName, ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel > >& rGroup ) throw(::com::sun::star::uno::RuntimeException)
 {
     ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() );
-
+    
     sal_uInt32 nGroup = 0;
     sal_uInt32 nEntries = maControls.Count();
     for ( sal_uInt32 n = 0; n < nEntries; n++ )
@@ -365,7 +365,7 @@ void StdTabControllerModel::getGroupByName( const ::rtl::OUString& rName, ::com:
 void StdTabControllerModel::write( const ::com::sun::star::uno::Reference< ::com::sun::star::io::XObjectOutputStream >& OutStream ) throw(::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException)
 {
     ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() );
-
+    
     ::com::sun::star::uno::Reference< ::com::sun::star::io::XMarkableStream >  xMark( OutStream, ::com::sun::star::uno::UNO_QUERY );
     DBG_ASSERT( xMark.is(), "write: no XMarkableStream!" );
 
@@ -389,7 +389,7 @@ void StdTabControllerModel::write( const ::com::sun::star::uno::Reference< ::com
 void StdTabControllerModel::read( const ::com::sun::star::uno::Reference< ::com::sun::star::io::XObjectInputStream >& InStream ) throw(::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException)
 {
     ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() );
-
+    
     ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel > > aSeq = ImplReadControls( InStream );
     setControlModels( aSeq );
 
diff --git a/toolkit/source/controls/tkscrollbar.cxx b/toolkit/source/controls/tkscrollbar.cxx
index 2de8b56131c8..bfcd2704dd47 100644
--- a/toolkit/source/controls/tkscrollbar.cxx
+++ b/toolkit/source/controls/tkscrollbar.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,7 +79,7 @@ namespace toolkit
         static UnoPropertyArrayHelper* pHelper = NULL;
         if ( !pHelper )
         {
-            uno::Sequence<sal_Int32>    aIDs = ImplGetPropertyIds();
+            uno::Sequence<sal_Int32>	aIDs = ImplGetPropertyIds();
             pHelper = new UnoPropertyArrayHelper( aIDs );
         }
         return *pHelper;
diff --git a/toolkit/source/controls/tksimpleanimation.cxx b/toolkit/source/controls/tksimpleanimation.cxx
index 3d89bf59af82..a60f6d70aa16 100644
--- a/toolkit/source/controls/tksimpleanimation.cxx
+++ b/toolkit/source/controls/tksimpleanimation.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
@@ -184,7 +184,7 @@ namespace toolkit
         if ( xAnimation.is() )
             xAnimation->start();
     }
-
+    
     //--------------------------------------------------------------------
     void SAL_CALL UnoSimpleAnimationControl::stop() throw ( uno::RuntimeException )
     {
@@ -194,7 +194,7 @@ namespace toolkit
         if ( xAnimation.is() )
             xAnimation->stop();
     }
-
+    
     //--------------------------------------------------------------------
     void SAL_CALL UnoSimpleAnimationControl::setImageList( const uno::Sequence< uno::Reference< graphic::XGraphic > >& ImageList )
         throw ( uno::RuntimeException )
diff --git a/toolkit/source/controls/tkspinbutton.cxx b/toolkit/source/controls/tkspinbutton.cxx
index 5929dc7a4635..886a29a82dcd 100644
--- a/toolkit/source/controls/tkspinbutton.cxx
+++ b/toolkit/source/controls/tkspinbutton.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
@@ -105,7 +105,7 @@ namespace toolkit
         static UnoPropertyArrayHelper* pHelper = NULL;
         if ( !pHelper )
         {
-            Sequence<sal_Int32> aIDs = ImplGetPropertyIds();
+            Sequence<sal_Int32>	aIDs = ImplGetPropertyIds();
             pHelper = new UnoPropertyArrayHelper( aIDs );
         }
         return *pHelper;
@@ -246,7 +246,7 @@ namespace toolkit
     {
         ImplSetPropertyValue( GetPropertyName( BASEPROPERTY_SPINVALUE ), makeAny( value ), sal_True );
     }
-
+    
     //--------------------------------------------------------------------
     void SAL_CALL UnoSpinButtonControl::setValues( sal_Int32 minValue, sal_Int32 maxValue, sal_Int32 currentValue ) throw (RuntimeException)
     {
@@ -254,7 +254,7 @@ namespace toolkit
         ImplSetPropertyValue( GetPropertyName( BASEPROPERTY_SPINVALUE_MAX ), makeAny( maxValue ), sal_True );
         ImplSetPropertyValue( GetPropertyName( BASEPROPERTY_SPINVALUE ), makeAny( currentValue ), sal_True );
     }
-
+    
     //--------------------------------------------------------------------
     sal_Int32 SAL_CALL UnoSpinButtonControl::getValue(  ) throw (RuntimeException)
     {
@@ -267,19 +267,19 @@ namespace toolkit
 
         return nValue;
     }
-
+    
     //--------------------------------------------------------------------
     void SAL_CALL UnoSpinButtonControl::setMinimum( sal_Int32 minValue ) throw (RuntimeException)
     {
         ImplSetPropertyValue( GetPropertyName( BASEPROPERTY_SPINVALUE_MIN ), makeAny( minValue ), sal_True );
     }
-
+    
     //--------------------------------------------------------------------
     void SAL_CALL UnoSpinButtonControl::setMaximum( sal_Int32 maxValue ) throw (RuntimeException)
     {
         ImplSetPropertyValue( GetPropertyName( BASEPROPERTY_SPINVALUE_MAX ), makeAny( maxValue ), sal_True );
     }
-
+    
     //--------------------------------------------------------------------
     sal_Int32 SAL_CALL UnoSpinButtonControl::getMinimum(  ) throw (RuntimeException)
     {
@@ -292,7 +292,7 @@ namespace toolkit
 
         return nMin;
     }
-
+    
     //--------------------------------------------------------------------
     sal_Int32 SAL_CALL UnoSpinButtonControl::getMaximum(  ) throw (RuntimeException)
     {
@@ -305,13 +305,13 @@ namespace toolkit
 
         return nMax;
     }
-
+    
     //--------------------------------------------------------------------
     void SAL_CALL UnoSpinButtonControl::setSpinIncrement( sal_Int32 spinIncrement ) throw (RuntimeException)
     {
         ImplSetPropertyValue( GetPropertyName( BASEPROPERTY_SPININCREMENT ), makeAny( spinIncrement ), sal_True );
     }
-
+    
     //--------------------------------------------------------------------
     sal_Int32 SAL_CALL UnoSpinButtonControl::getSpinIncrement(  ) throw (RuntimeException)
     {
@@ -324,13 +324,13 @@ namespace toolkit
 
         return nIncrement;
     }
-
+    
     //--------------------------------------------------------------------
     void SAL_CALL UnoSpinButtonControl::setOrientation( sal_Int32 orientation ) throw (NoSupportException, RuntimeException)
     {
         ImplSetPropertyValue( GetPropertyName( BASEPROPERTY_ORIENTATION ), makeAny( orientation ), sal_True );
     }
-
+    
     //--------------------------------------------------------------------
     sal_Int32 SAL_CALL UnoSpinButtonControl::getOrientation(  ) throw (RuntimeException)
     {
@@ -343,7 +343,7 @@ namespace toolkit
 
         return nOrientation;
     }
-
+    
 //........................................................................
 }  // namespace toolkit
 //........................................................................
diff --git a/toolkit/source/controls/tkthrobber.cxx b/toolkit/source/controls/tkthrobber.cxx
index 1dc83f860e34..9549a828f742 100644
--- a/toolkit/source/controls/tkthrobber.cxx
+++ b/toolkit/source/controls/tkthrobber.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
@@ -182,7 +182,7 @@ namespace toolkit
         if ( xAnimation.is() )
             xAnimation->start();
     }
-
+    
     //--------------------------------------------------------------------
     void SAL_CALL UnoThrobberControl::stop() throw ( uno::RuntimeException )
     {
@@ -192,7 +192,7 @@ namespace toolkit
         if ( xAnimation.is() )
             xAnimation->stop();
     }
-
+    
 //........................................................................
 }  // namespace toolkit
 //........................................................................
diff --git a/toolkit/source/controls/tree/treecontrol.cxx b/toolkit/source/controls/tree/treecontrol.cxx
index 8606792fdf2f..bd495b78e734 100644
--- a/toolkit/source/controls/tree/treecontrol.cxx
+++ b/toolkit/source/controls/tree/treecontrol.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
@@ -52,9 +52,9 @@ using namespace ::com::sun::star::view;
 
 namespace toolkit
 {
-//  ----------------------------------------------------
-//  class UnoTreeModel
-//  ----------------------------------------------------
+//	----------------------------------------------------
+//	class UnoTreeModel
+//	----------------------------------------------------
 UnoTreeModel::UnoTreeModel()
 {
     ImplRegisterProperty( BASEPROPERTY_BACKGROUNDCOLOR );
@@ -76,13 +76,14 @@ UnoTreeModel::UnoTreeModel()
     ImplRegisterProperty( BASEPROPERTY_TREE_SHOWSROOTHANDLES );
     ImplRegisterProperty( BASEPROPERTY_TREE_ROWHEIGHT );
     ImplRegisterProperty( BASEPROPERTY_TREE_INVOKESSTOPNODEEDITING );
+    ImplRegisterProperty( BASEPROPERTY_HIDEINACTIVESELECTION );
 }
 
 UnoTreeModel::UnoTreeModel( const UnoTreeModel& rModel )
 : UnoControlModel( rModel )
 {
 }
-
+                        
 UnoControlModel* UnoTreeModel::Clone() const
 {
     return new UnoTreeModel( *this );
@@ -122,7 +123,7 @@ Any UnoTreeModel::ImplGetDefaultValue( sal_uInt16 nPropId ) const
     static UnoPropertyArrayHelper* pHelper = NULL;
     if ( !pHelper )
     {
-        Sequence<sal_Int32> aIDs = ImplGetPropertyIds();
+        Sequence<sal_Int32>	aIDs = ImplGetPropertyIds();
         pHelper = new UnoPropertyArrayHelper( aIDs );
     }
     return *pHelper;
@@ -136,9 +137,9 @@ Reference< XPropertySetInfo > UnoTreeModel::getPropertySetInfo(  ) throw(Runtime
 }
 
 
-//  ----------------------------------------------------
-//  class UnoTreeControl
-//  ----------------------------------------------------
+//	----------------------------------------------------
+//	class UnoTreeControl
+//	----------------------------------------------------
 UnoTreeControl::UnoTreeControl()
 : maSelectionListeners( *this )
 , maTreeExpansionListeners( *this )
diff --git a/toolkit/source/controls/tree/treecontrol.hxx b/toolkit/source/controls/tree/treecontrol.hxx
index e646664c4a64..2ba3abf21bbc 100644
--- a/toolkit/source/controls/tree/treecontrol.hxx
+++ b/toolkit/source/controls/tree/treecontrol.hxx
@@ -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
@@ -49,16 +49,16 @@ using namespace ::com::sun::star::container;
 // ===================================================================
 class UnoTreeModel : public UnoControlModel
 {
-protected:
-    Any     ImplGetDefaultValue( sal_uInt16 nPropId ) const;
-    ::cppu::IPropertyArrayHelper&   SAL_CALL getInfoHelper();
+protected:	
+    Any		ImplGetDefaultValue( sal_uInt16 nPropId ) const;
+    ::cppu::IPropertyArrayHelper&	SAL_CALL getInfoHelper();
 
 public:
     UnoTreeModel();
     UnoTreeModel( const UnoTreeModel& rModel );
-
+                        
     UnoControlModel* Clone() const;
-
+                        
     // ::com::sun::star::beans::XMultiPropertySet
     ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo(  ) throw(::com::sun::star::uno::RuntimeException);
 
@@ -77,7 +77,7 @@ class UnoTreeControl : public ::cppu::ImplInheritanceHelper1< UnoControlBase, ::
 {
 public:
     UnoTreeControl();
-    ::rtl::OUString             GetComponentServiceName();
+    ::rtl::OUString				GetComponentServiceName();
 
     // ::com::sun::star::lang::XComponent
     void SAL_CALL dispose(  ) throw(::com::sun::star::uno::RuntimeException);
diff --git a/toolkit/source/controls/tree/treedatamodel.cxx b/toolkit/source/controls/tree/treedatamodel.cxx
index 8ca76c0e57a8..2a4421348db0 100644
--- a/toolkit/source/controls/tree/treedatamodel.cxx
+++ b/toolkit/source/controls/tree/treedatamodel.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
@@ -60,7 +60,7 @@ static void implThrowIllegalArgumentException() throw( IllegalArgumentException
     throw IllegalArgumentException();
 }
 
-class MutableTreeDataModel : public ::cppu::WeakAggImplHelper2< XMutableTreeDataModel, XServiceInfo >,
+class MutableTreeDataModel : public ::cppu::WeakAggImplHelper2<	XMutableTreeDataModel, XServiceInfo >,
                              public MutexAndBroadcastHelper
 {
 public:
@@ -140,7 +140,7 @@ public:
     }
 
 private:
-    TreeNodeVector  maChilds;
+    TreeNodeVector	maChilds;
     Any maDisplayValue;
     Any maDataValue;
     sal_Bool mbHasChildsOnDemand;
@@ -185,10 +185,10 @@ void MutableTreeDataModel::broadcast( broadcast_type eType, const Reference< XTr
             XTreeDataModelListener* pListener = static_cast<XTreeDataModelListener*>(aListIter.next());
             switch( eType )
             {
-            case nodes_changed:     pListener->treeNodesChanged(aEvent); break;
-            case nodes_inserted:    pListener->treeNodesInserted(aEvent); break;
-            case nodes_removed:     pListener->treeNodesRemoved(aEvent); break;
-            case structure_changed: pListener->treeStructureChanged(aEvent); break;
+            case nodes_changed:		pListener->treeNodesChanged(aEvent); break;
+            case nodes_inserted:	pListener->treeNodesInserted(aEvent); break;
+            case nodes_removed:		pListener->treeNodesRemoved(aEvent); break;
+            case structure_changed:	pListener->treeStructureChanged(aEvent); break;
             }
         }
     }
@@ -223,7 +223,7 @@ void SAL_CALL MutableTreeDataModel::setRoot( const Reference< XMutableTreeNode >
         MutableTreeNodeRef xImpl( dynamic_cast< MutableTreeNode* >( xNode.get() ) );
         if( !xImpl.is() || xImpl->mbIsInserted )
             throw IllegalArgumentException();
-
+        
         xImpl->mbIsInserted = true;
         mxRootNode.set(xImpl.get());
 
@@ -446,7 +446,7 @@ void SAL_CALL MutableTreeNode::insertChildByIndex( sal_Int32 nChildIndex, const
 void SAL_CALL MutableTreeNode::removeChildByIndex( sal_Int32 nChildIndex ) throw (IndexOutOfBoundsException, RuntimeException)
 {
     ::osl::Guard< ::osl::Mutex > aGuard( maMutex );
-
+    
     MutableTreeNodeRef xImpl;
 
     if( (nChildIndex >= 0) && (nChildIndex < (sal_Int32)maChilds.size()) )
diff --git a/toolkit/source/controls/unocontrol.cxx b/toolkit/source/controls/unocontrol.cxx
index eb45dd521d9a..ba6181430e0a 100644
--- a/toolkit/source/controls/unocontrol.cxx
+++ b/toolkit/source/controls/unocontrol.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
@@ -107,8 +107,8 @@ static Sequence< ::rtl::OUString> lcl_ImplGetPropertyNames( const Reference< XMu
     Sequence< ::rtl::OUString> aNames;
     Reference< XPropertySetInfo >  xPSInf = rxModel->getPropertySetInfo();
     DBG_ASSERT( xPSInf.is(), "UpdateFromModel: No PropertySetInfo!" );
-    if ( xPSInf.is() )
-    {
+    if ( xPSInf.is() ) 
+    {	
         Sequence< Property> aProps = xPSInf->getProperties();
         sal_Int32 nLen = aProps.getLength();
         aNames = Sequence< ::rtl::OUString>( nLen );
@@ -120,7 +120,7 @@ static Sequence< ::rtl::OUString> lcl_ImplGetPropertyNames( const Reference< XMu
     return aNames;
 }
 
-//  ====================================================
+//	====================================================
 class VclListenerLock
 {
 private:
@@ -159,9 +159,9 @@ struct UnoControl_Data
     }
 };
 
-//  ----------------------------------------------------
-//  class UnoControl
-//  ----------------------------------------------------
+//	----------------------------------------------------
+//	class UnoControl
+//	----------------------------------------------------
 DBG_NAME( UnoControl )
 UnoControl::UnoControl()
     : maDisposeListeners( *this )
@@ -193,7 +193,7 @@ UnoControl::~UnoControl()
     return ::rtl::OUString();
 }
 
-Reference< XWindowPeer >    UnoControl::ImplGetCompatiblePeer( sal_Bool bAcceptExistingPeer )
+Reference< XWindowPeer >	UnoControl::ImplGetCompatiblePeer( sal_Bool bAcceptExistingPeer )
 {
     DBG_ASSERT( !mbCreatingCompatiblePeer, "ImplGetCompatiblePeer - rekursive?" );
 
@@ -211,7 +211,7 @@ Reference< XWindowPeer >    UnoControl::ImplGetCompatiblePeer( sal_Bool bAcceptE
         if( bVis )
             maComponentInfos.bVisible = sal_False;
 
-        Reference< XWindowPeer >    xCurrentPeer = getPeer();
+        Reference< XWindowPeer >	xCurrentPeer = getPeer();
         setPeer( NULL );
 
         // queryInterface ourself, to allow aggregation
@@ -288,7 +288,7 @@ void UnoControl::ImplSetPeerProperty( const ::rtl::OUString& rPropName, const An
     // this assumption may be false in some (seldom) multi-threading scenarios (cause propertiesChange
     // releases our mutex before calling here in)
     // That's why this additional check
-
+    
     if ( mxVclWindowPeer.is() )
     {
         Any aConvertedValue( rVal );
@@ -319,7 +319,7 @@ void UnoControl::ImplSetPeerProperty( const ::rtl::OUString& rPropName, const An
                 }
             }
         }
-
+        
         mxVclWindowPeer->setProperty( rPropName, aConvertedValue );
     }
 }
@@ -328,7 +328,7 @@ void UnoControl::PrepareWindowDescriptor( WindowDescriptor& )
 {
 }
 
-Reference< XWindow >    UnoControl::getParentPeer() const
+Reference< XWindow >	UnoControl::getParentPeer() const
 {
     Reference< XWindow > xPeer;
     if( mxContext.is() )
@@ -349,7 +349,7 @@ void UnoControl::updateFromModel()
     // Alle standard Properties werden ausgelesen und in das Peer uebertragen
     if( getPeer().is() )
     {
-        Reference< XMultiPropertySet >  xPropSet( mxModel, UNO_QUERY );
+        Reference< XMultiPropertySet >	xPropSet( mxModel, UNO_QUERY );
         if( xPropSet.is() )
         {
             Sequence< ::rtl::OUString> aNames = lcl_ImplGetPropertyNames( xPropSet );
@@ -410,7 +410,7 @@ void UnoControl::dispose(  ) throw(RuntimeException)
     maMouseMotionListeners.disposeAndClear( aDisposeEvent );
     maPaintListeners.disposeAndClear( aDisposeEvent );
     maModeChangeListeners.disposeAndClear( aDisposeEvent );
-
+    
     // Model wieder freigeben
     setModel( Reference< XControlModel > () );
     setContext( Reference< XInterface > () );
@@ -419,14 +419,14 @@ void UnoControl::dispose(  ) throw(RuntimeException)
 void UnoControl::addEventListener( const Reference< XEventListener >& rxListener ) throw(RuntimeException)
 {
     ::osl::MutexGuard aGuard( GetMutex() );
-
+    
     maDisposeListeners.addInterface( rxListener );
 }
 
 void UnoControl::removeEventListener( const Reference< XEventListener >& rxListener ) throw(RuntimeException)
 {
     ::osl::MutexGuard aGuard( GetMutex() );
-
+    
     maDisposeListeners.removeInterface( rxListener );
 }
 
@@ -465,7 +465,7 @@ void UnoControl::propertiesChange( const Sequence< PropertyChangeEvent >& rEvent
 
     ImplModelPropertiesChanged( aEvents );
 }
-
+    
 void UnoControl::ImplLockPropertyChangeNotification( const ::rtl::OUString& rPropertyName, bool bLock )
 {
     MapString2Int::iterator pos = mpData->aSuspendedPropertyNotifications.find( rPropertyName );
@@ -503,8 +503,8 @@ void UnoControl::ImplModelPropertiesChanged( const Sequence< PropertyChangeEvent
     if( getPeer().is() )
     {
         DECLARE_STL_VECTOR( PropertyValue, PropertyValueVector);
-        PropertyValueVector     aPeerPropertiesToSet;
-        sal_Int32               nIndependentPos = 0;
+        PropertyValueVector 	aPeerPropertiesToSet;
+        sal_Int32				nIndependentPos = 0;
         bool                    bResourceResolverSet( false );
             // position where to insert the independent properties into aPeerPropertiesToSet,
             // dependent ones are inserted at the end of the vector
@@ -538,9 +538,9 @@ void UnoControl::ImplModelPropertiesChanged( const Sequence< PropertyChangeEvent
                 if ( pEvents->NewValue >>= xStrResolver )
                     bResourceResolverSet = xStrResolver.is();
             }
-
+            
             sal_uInt16 nPType = GetPropertyId( pEvents->PropertyName );
-            if ( mbDesignMode && mbDisposePeer && !mbRefeshingPeer && !mbCreatingPeer )
+            if ( mbDesignMode && mbDisposePeer && !mbRefeshingPeer && !mbCreatingPeer )	 
             {
                 // if we're in design mode, then some properties can change which
                 // require creating a *new* peer (since these properties cannot
@@ -607,7 +607,7 @@ void UnoControl::ImplModelPropertiesChanged( const Sequence< PropertyChangeEvent
             }
         }
 
-        Reference< XWindow >    xParent = getParentPeer();
+        Reference< XWindow >	xParent = getParentPeer();
         Reference< XControl > xThis( (XAggregation*)(::cppu::OWeakAggObject*)this, UNO_QUERY );
         // call createPeer via a interface got from queryInterface, so the aggregating class can intercept it
 
@@ -625,14 +625,14 @@ void UnoControl::ImplModelPropertiesChanged( const Sequence< PropertyChangeEvent
                 bool bMustBeInserted( true );
                 for ( sal_uInt32 i = 0; i < aPeerPropertiesToSet.size(); i++ )
                 {
-                    if ( aPeerPropertiesToSet[i].Name.equalsAsciiL(
+                    if ( aPeerPropertiesToSet[i].Name.equalsAsciiL( 
                             pLangDepProp->pPropName, pLangDepProp->nPropNameLength ))
                     {
                         bMustBeInserted = false;
                         break;
                     }
                 }
-
+                
                 if ( bMustBeInserted )
                 {
                     // Add language dependent props at the end
@@ -643,12 +643,12 @@ void UnoControl::ImplModelPropertiesChanged( const Sequence< PropertyChangeEvent
                             PropertyValue( aPropName, 0, xPS->getPropertyValue( aPropName ), PropertyState_DIRECT_VALUE ) );
                     }
                 }
-
+                
                 ++pLangDepProp;
             }
         }
         aGuard.clear();
-
+        
         // clear the guard before creating a new peer - as usual, our peer implementations use the SolarMutex
         // #82300# - 2000-12-21 - fs@openoffice.org
         if (bNeedNewPeer && xParent.is())
@@ -664,7 +664,7 @@ void UnoControl::ImplModelPropertiesChanged( const Sequence< PropertyChangeEvent
             mxPeer.clear();
             mxVclWindowPeer = NULL;
             mbRefeshingPeer = sal_True;
-            Reference< XWindowPeer >    xP( xParent, UNO_QUERY );
+            Reference< XWindowPeer >	xP( xParent, UNO_QUERY );
             xThis->createPeer( Reference< XToolkit > (), xP );
             mbRefeshingPeer = sal_False;
             aPeerPropertiesToSet.clear();
@@ -685,7 +685,7 @@ void UnoControl::ImplModelPropertiesChanged( const Sequence< PropertyChangeEvent
         // To prevent deadlocks resulting from this, we do this without our own mutex locked
         // 2000-11-03 - fs@openoffice.org
         PropertyValueVectorIterator aEnd = aPeerPropertiesToSet.end();
-        for (   PropertyValueVectorIterator aLoop = aPeerPropertiesToSet.begin();
+        for (	PropertyValueVectorIterator aLoop = aPeerPropertiesToSet.begin();
                 aLoop != aEnd;
                 ++aLoop
             )
@@ -777,17 +777,17 @@ void UnoControl::setPosSize( sal_Int32 X, sal_Int32 Y, sal_Int32 Width, sal_Int3
     Reference< XWindow > xWindow;
     {
         ::osl::MutexGuard aGuard( GetMutex() );
-
+        
         if ( Flags & awt::PosSize::X )
-            maComponentInfos.nX = X;
+            maComponentInfos.nX = X; 
         if ( Flags & awt::PosSize::Y )
-            maComponentInfos.nY = Y;
+            maComponentInfos.nY = Y; 
         if ( Flags & awt::PosSize::WIDTH )
-            maComponentInfos.nWidth = Width;
+            maComponentInfos.nWidth = Width; 
         if ( Flags & awt::PosSize::HEIGHT )
             maComponentInfos.nHeight = Height;
         maComponentInfos.nFlags |= Flags;
-
+        
         xWindow = xWindow.query( getPeer() );
     }
 
@@ -815,7 +815,7 @@ void UnoControl::setVisible( sal_Bool bVisible ) throw(RuntimeException)
     Reference< XWindow > xWindow;
     {
         ::osl::MutexGuard aGuard( GetMutex() );
-
+    
         // Visible status ist Sache der View
         maComponentInfos.bVisible = bVisible;
         xWindow = xWindow.query( getPeer() );
@@ -829,7 +829,7 @@ void UnoControl::setEnable( sal_Bool bEnable ) throw(RuntimeException)
     Reference< XWindow > xWindow;
     {
         ::osl::MutexGuard aGuard( GetMutex() );
-
+    
         // Enable status ist Sache der View
         maComponentInfos.bEnable = bEnable;
         xWindow = xWindow.query( getPeer() );
@@ -838,7 +838,7 @@ void UnoControl::setEnable( sal_Bool bEnable ) throw(RuntimeException)
         xWindow->setEnable( bEnable );
 }
 
-void UnoControl::setFocus(  ) throw(RuntimeException)
+void UnoControl::setFocus(	) throw(RuntimeException)
 {
     Reference< XWindow > xWindow;
     {
@@ -1011,7 +1011,7 @@ sal_Bool UnoControl::setGraphics( const Reference< XGraphics >& rDevice ) throw(
     Reference< XView > xView;
     {
         ::osl::MutexGuard aGuard( GetMutex() );
-
+    
         mxGraphics = rDevice;
         xView = xView.query( getPeer() );
     }
@@ -1048,7 +1048,7 @@ void UnoControl::draw( sal_Int32 x, sal_Int32 y ) throw(RuntimeException)
     if ( xDrawPeerView.is() )
     {
         Reference< XVclWindowPeer > xWindowPeer;
-        xWindowPeer.set( xDrawPeer, UNO_QUERY );
+        xWindowPeer.set( xDrawPeer, UNO_QUERY ); 
         if ( xWindowPeer.is() )
             xWindowPeer->setDesignMode( mbDesignMode );
         xDrawPeerView->draw( x, y );
@@ -1063,7 +1063,7 @@ void UnoControl::setZoom( float fZoomX, float fZoomY ) throw(RuntimeException)
     Reference< XView > xView;
     {
         ::osl::MutexGuard aGuard( GetMutex() );
-
+        
         maComponentInfos.nZoomX = fZoomX;
         maComponentInfos.nZoomY = fZoomY;
 
@@ -1077,14 +1077,14 @@ void UnoControl::setZoom( float fZoomX, float fZoomY ) throw(RuntimeException)
 void UnoControl::setContext( const Reference< XInterface >& rxContext ) throw(RuntimeException)
 {
     ::osl::MutexGuard aGuard( GetMutex() );
-
+    
     mxContext = rxContext;
 }
 
 Reference< XInterface > UnoControl::getContext(  ) throw(RuntimeException)
 {
     ::osl::MutexGuard aGuard( GetMutex() );
-
+    
     return mxContext;
 }
 
@@ -1124,7 +1124,7 @@ void UnoControl::createPeer( const Reference< XToolkit >& rxToolkit, const Refer
         aException.Context = (XAggregation*)(::cppu::OWeakAggObject*)this;
         throw( aException );
     }
-
+    
     if( !getPeer().is() )
     {
         mbCreatingPeer = sal_True;
@@ -1134,7 +1134,7 @@ void UnoControl::createPeer( const Reference< XToolkit >& rxToolkit, const Refer
         if( rParentPeer.is() && mxContext.is() )
         {
             // kein TopWindow
-            if ( !xToolkit.is() )
+            if ( !xToolkit.is() ) 
                 xToolkit = rParentPeer->getToolkit();
             Any aAny = OWeakAggObject::queryInterface( ::getCppuType((const Reference< XControlContainer>*)0) );
             Reference< XControlContainer > xC;
@@ -1149,13 +1149,13 @@ void UnoControl::createPeer( const Reference< XToolkit >& rxToolkit, const Refer
         { // Nur richtig, wenn es sich um ein Top Window handelt
             if( rParentPeer.is() )
             {
-                if ( !xToolkit.is() )
+                if ( !xToolkit.is() ) 
                     xToolkit = rParentPeer->getToolkit();
                 eType = WindowClass_CONTAINER;
             }
             else
             {
-                if ( !xToolkit.is() )
+                if ( !xToolkit.is() ) 
                     xToolkit = VCLUnoHelper::CreateToolkit();
                 eType = WindowClass_TOP;
             }
@@ -1170,7 +1170,7 @@ void UnoControl::createPeer( const Reference< XToolkit >& rxToolkit, const Refer
         // Border
         Reference< XPropertySet > xPSet( mxModel, UNO_QUERY );
         Reference< XPropertySetInfo >  xInfo = xPSet->getPropertySetInfo();
-
+        
         Any aVal;
         ::rtl::OUString aPropName = GetPropertyName( BASEPROPERTY_BORDER );
         if ( xInfo->hasPropertyByName( aPropName ) )
@@ -1227,7 +1227,7 @@ void UnoControl::createPeer( const Reference< XToolkit >& rxToolkit, const Refer
             if ( ( aVal >>= b ) && b)
                 aDescr.WindowAttributes |= VclWindowPeerAttribute::DROPDOWN;
         }
-
+        
         // Spin
         aPropName = GetPropertyName( BASEPROPERTY_SPIN );
         if ( xInfo->hasPropertyByName( aPropName ) )
@@ -1279,7 +1279,7 @@ void UnoControl::createPeer( const Reference< XToolkit >& rxToolkit, const Refer
         }
 
         //added for issue79712
-        //NoLabel
+        //NoLabel 
         aPropName = GetPropertyName( BASEPROPERTY_NOLABEL );
         if ( xInfo->hasPropertyByName( aPropName ) )
         {
@@ -1289,7 +1289,7 @@ void UnoControl::createPeer( const Reference< XToolkit >& rxToolkit, const Refer
                 aDescr.WindowAttributes |= VclWindowPeerAttribute::NOLABEL;
         }
         //issue79712 ends
-
+        
         // Align
         aPropName = GetPropertyName( BASEPROPERTY_ALIGN );
         if ( xInfo->hasPropertyByName( aPropName ) )
@@ -1365,7 +1365,7 @@ Reference< XWindowPeer > UnoControl::getPeer() throw(RuntimeException)
 sal_Bool UnoControl::setModel( const Reference< XControlModel >& rxModel ) throw(RuntimeException)
 {
     ::osl::MutexGuard aGuard( GetMutex() );
-
+    
     Reference< XMultiPropertySet > xPropSet( mxModel, UNO_QUERY );
 
     // query for the XPropertiesChangeListener - our delegator is allowed to overwrite this interface
@@ -1400,14 +1400,14 @@ sal_Bool UnoControl::setModel( const Reference< XControlModel >& rxModel ) throw
     return mxModel.is();
 }
 
-Reference< XControlModel > UnoControl::getModel(    ) throw(RuntimeException)
+Reference< XControlModel > UnoControl::getModel(	) throw(RuntimeException)
 {
     return mxModel;
 }
 
 Reference< XView > UnoControl::getView(  ) throw(RuntimeException)
 {
-    return  static_cast< XView* >( this );
+    return	static_cast< XView* >( this );
 }
 
 void UnoControl::setDesignMode( sal_Bool bOn ) throw(RuntimeException)
@@ -1440,7 +1440,7 @@ void UnoControl::setDesignMode( sal_Bool bOn ) throw(RuntimeException)
     maModeChangeListeners.notifyEach( &XModeChangeListener::modeChanged, aModeChangeEvent );
 }
 
-sal_Bool UnoControl::isDesignMode(  ) throw(RuntimeException)
+sal_Bool UnoControl::isDesignMode(	) throw(RuntimeException)
 {
     return mbDesignMode;
 }
@@ -1451,7 +1451,7 @@ sal_Bool UnoControl::isTransparent(  ) throw(RuntimeException)
 }
 
 // XServiceInfo
-::rtl::OUString UnoControl::getImplementationName(  ) throw(RuntimeException)
+::rtl::OUString UnoControl::getImplementationName(	) throw(RuntimeException)
 {
     DBG_ERROR( "This method should be overloaded!" );
     return ::rtl::OUString();
@@ -1460,7 +1460,7 @@ sal_Bool UnoControl::isTransparent(  ) throw(RuntimeException)
 sal_Bool UnoControl::supportsService( const ::rtl::OUString& rServiceName ) throw(RuntimeException)
 {
     ::osl::MutexGuard aGuard( GetMutex() );
-
+    
     Sequence< ::rtl::OUString > aSNL = getSupportedServiceNames();
     const ::rtl::OUString* pArray = aSNL.getConstArray();
     const ::rtl::OUString* pArrayEnd = aSNL.getConstArray() + aSNL.getLength();
@@ -1488,7 +1488,7 @@ Reference< XAccessibleContext > SAL_CALL UnoControl::getAccessibleContext(  ) th
     if ( !xCurrentContext.is() )
     {
         if ( !mbDesignMode )
-        {   // in alive mode, use the AccessibleContext of the peer
+        {	// in alive mode, use the AccessibleContext of the peer
             Reference< XAccessible > xPeerAcc( getPeer(), UNO_QUERY );
             if ( xPeerAcc.is() )
                 xCurrentContext = xPeerAcc->getAccessibleContext( );
diff --git a/toolkit/source/controls/unocontrolbase.cxx b/toolkit/source/controls/unocontrolbase.cxx
index bbd0fc507e80..92b616c05043 100644
--- a/toolkit/source/controls/unocontrolbase.cxx
+++ b/toolkit/source/controls/unocontrolbase.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
@@ -35,9 +35,9 @@
 
 #include <tools/debug.hxx>
 
-//  ----------------------------------------------------
-//  class UnoControlBase
-//  ----------------------------------------------------
+//	----------------------------------------------------
+//	class UnoControlBase
+//	----------------------------------------------------
 
 sal_Bool UnoControlBase::ImplHasProperty( sal_uInt16 nPropId )
 {
@@ -91,7 +91,7 @@ void UnoControlBase::ImplSetPropertyValues( const ::com::sun::star::uno::Sequenc
 void UnoControlBase::ImplSetPropertyValue( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue, sal_Bool bUpdateThis )
 {
     // Model ggf. schon abgemeldet, aber ein Event schlaegt noch zu...
-    if ( mxModel.is() )
+    if ( mxModel.is() ) 
     {
         ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >  xPSet( mxModel, ::com::sun::star::uno::UNO_QUERY );
         if ( !bUpdateThis )
diff --git a/toolkit/source/controls/unocontrolcontainer.cxx b/toolkit/source/controls/unocontrolcontainer.cxx
index c3149a8cc869..0fa370e68d6a 100644
--- a/toolkit/source/controls/unocontrolcontainer.cxx
+++ b/toolkit/source/controls/unocontrolcontainer.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
@@ -55,9 +55,9 @@ using namespace ::com::sun::star;
 
 extern WorkWindow* lcl_GetDefaultWindow();
 
-//  ----------------------------------------------------
-//  class UnoControlHolder
-//  ----------------------------------------------------
+//	----------------------------------------------------
+//	class UnoControlHolder
+//	----------------------------------------------------
 struct UnoControlHolder
 {
     uno::Reference< awt::XControl > mxControl;
@@ -65,7 +65,7 @@ struct UnoControlHolder
 
 public:
     UnoControlHolder( const ::rtl::OUString& rName, const uno::Reference< awt::XControl > & rControl )
-    :   mxControl( rControl ),
+    :	mxControl( rControl ),
         msName( rName )
     {
     }
@@ -327,10 +327,10 @@ UnoControlHolderList::ControlIdentifier UnoControlHolderList::impl_getFreeIdenti
     }
     throw uno::RuntimeException( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "out of identifiers" ) ), NULL );
 }
-//  ----------------------------------------------------
-//  Function to set the controls' visibility according
-//  to the dialog's "Step" property
-//  ----------------------------------------------------
+//	----------------------------------------------------
+//	Function to set the controls' visibility according
+//	to the dialog's "Step" property
+//	----------------------------------------------------
 void implUpdateVisibility
 (
     sal_Int32 nDialogStep,
@@ -372,9 +372,9 @@ void implUpdateVisibility
 }
 
 
-//  ----------------------------------------------------
-//  class DialogStepChangedListener
-//  ----------------------------------------------------
+//	----------------------------------------------------
+//	class DialogStepChangedListener
+//	----------------------------------------------------
 typedef ::cppu::WeakImplHelper1< beans::XPropertyChangeListener > PropertyChangeListenerHelper;
 
 class DialogStepChangedListener: public PropertyChangeListenerHelper
@@ -387,7 +387,7 @@ public:
         : mxControlContainer( xControlContainer ) {}
 
     // XEventListener
-    virtual void SAL_CALL disposing( const  lang::EventObject& Source ) throw( uno::RuntimeException);
+    virtual void SAL_CALL disposing( const	lang::EventObject& Source ) throw( uno::RuntimeException);
 
     // XPropertyChangeListener
     virtual void SAL_CALL propertyChange( const  beans::PropertyChangeEvent& evt ) throw( uno::RuntimeException);
@@ -400,7 +400,7 @@ void SAL_CALL DialogStepChangedListener::disposing( const  lang::EventObject& /*
     mxControlContainer.clear();
 }
 
-void SAL_CALL DialogStepChangedListener::propertyChange( const  beans::PropertyChangeEvent& evt )
+void SAL_CALL DialogStepChangedListener::propertyChange( const	beans::PropertyChangeEvent& evt )
     throw( uno::RuntimeException)
 {
     // evt.PropertyName HAS to be "Step" because we only use the listener for that
@@ -409,16 +409,16 @@ void SAL_CALL DialogStepChangedListener::propertyChange( const  beans::PropertyC
     implUpdateVisibility( nDialogStep, mxControlContainer );
 }
 
-//  ----------------------------------------------------
-//  class UnoControlContainer
-//  ----------------------------------------------------
+//	----------------------------------------------------
+//	class UnoControlContainer
+//	----------------------------------------------------
 UnoControlContainer::UnoControlContainer() : maCListeners( *this )
 {
     mpControls = new UnoControlHolderList;
 }
 
 UnoControlContainer::UnoControlContainer( uno::Reference< awt::XWindowPeer >  xP )
-    :   maCListeners( *this )
+    :	maCListeners( *this )
 {
     setPeer( xP );
     mbDisposePeer = sal_False;
@@ -441,7 +441,7 @@ void UnoControlContainer::ImplActivateTabControllers()
 }
 
 // lang::XComponent
-void UnoControlContainer::dispose(  ) throw(uno::RuntimeException)
+void UnoControlContainer::dispose(	) throw(uno::RuntimeException)
 {
     ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() );
 
@@ -642,7 +642,7 @@ void UnoControlContainer::impl_createControlPeerIfNecessary( const uno::Referenc
 
     // if the container already has a peer, then also create a peer for the control
     uno::Reference< awt::XWindowPeer > xMyPeer( getPeer() );
-
+    
     if( xMyPeer.is() )
     {
         _rxControl->createPeer( NULL, xMyPeer );
diff --git a/toolkit/source/controls/unocontrolcontainermodel.cxx b/toolkit/source/controls/unocontrolcontainermodel.cxx
index 7630971d8a57..e3f7d71af1c4 100644
--- a/toolkit/source/controls/unocontrolcontainermodel.cxx
+++ b/toolkit/source/controls/unocontrolcontainermodel.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
@@ -33,9 +33,9 @@
 #include <toolkit/helper/servicenames.hxx>
 #include <toolkit/helper/unopropertyarrayhelper.hxx>
 
-//  ----------------------------------------------------
-//  class UnoControlContainerModel
-//  ----------------------------------------------------
+//	----------------------------------------------------
+//	class UnoControlContainerModel
+//	----------------------------------------------------
 UnoControlContainerModel::UnoControlContainerModel()
 {
     ImplRegisterProperty( BASEPROPERTY_BACKGROUNDCOLOR );
@@ -74,11 +74,11 @@ UnoControlContainerModel::UnoControlContainerModel()
 ::cppu::IPropertyArrayHelper& UnoControlContainerModel::getInfoHelper()
 {
     ::osl::Guard< ::osl::Mutex > aGuard( ((UnoControlContainerModel*)this)->GetMutex() );
-
+    
     static UnoPropertyArrayHelper* pHelper = NULL;
     if ( !pHelper )
     {
-        ::com::sun::star::uno::Sequence<sal_Int32>  aIDs = ImplGetPropertyIds();
+        ::com::sun::star::uno::Sequence<sal_Int32>	aIDs = ImplGetPropertyIds();
         pHelper = new UnoPropertyArrayHelper( aIDs );
     }
     return *pHelper;
diff --git a/toolkit/source/controls/unocontrolmodel.cxx b/toolkit/source/controls/unocontrolmodel.cxx
index 91d202409e86..7e6346b3576c 100644
--- a/toolkit/source/controls/unocontrolmodel.cxx
+++ b/toolkit/source/controls/unocontrolmodel.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
@@ -73,8 +73,8 @@ using ::com::sun::star::awt::FontDescriptor;
 struct ImplControlProperty
 {
 private:
-    sal_uInt16                  nId;
-    ::com::sun::star::uno::Any  aValue;
+    sal_uInt16					nId;
+    ::com::sun::star::uno::Any	aValue;
 
 public:
     ImplControlProperty( const ImplControlProperty& rProp ) : aValue( rProp.aValue )
@@ -92,67 +92,67 @@ public:
         nId = nT;
     }
 
-    sal_uInt16                          GetId() const                                           { return nId; }
-    const ::com::sun::star::uno::Any&   GetValue() const                                        { return aValue; }
-    void                                SetValue( const ::com::sun::star::uno::Any& rValue )    { aValue = rValue; }
+    sal_uInt16							GetId() const 											{ return nId; }
+    const ::com::sun::star::uno::Any&	GetValue() const 										{ return aValue; }
+    void								SetValue( const ::com::sun::star::uno::Any& rValue )	{ aValue = rValue; }
 };
 
 DECLARE_TABLE( ImplPropertyTable, ImplControlProperty* )
 
-#define UNOCONTROL_STREAMVERSION    (short)2
+#define UNOCONTROL_STREAMVERSION	(short)2
 
 static void lcl_ImplMergeFontProperty( FontDescriptor& rFD, sal_uInt16 nPropId, const Any& rValue )
 {
     // some props are defined with other types than the matching FontDescriptor members have
     // (e.g. FontWidth, FontSlant)
     // 78474 - 09/19/2000 - FS
-    float       nExtractFloat = 0;
-    sal_Int16   nExtractShort = 0;
+    float		nExtractFloat = 0;
+    sal_Int16	nExtractShort = 0;
 
     switch ( nPropId )
     {
-        case BASEPROPERTY_FONTDESCRIPTORPART_NAME:          rValue >>= rFD.Name;
+        case BASEPROPERTY_FONTDESCRIPTORPART_NAME: 			rValue >>= rFD.Name;
                                                             break;
-        case BASEPROPERTY_FONTDESCRIPTORPART_STYLENAME:     rValue >>= rFD.StyleName;
+        case BASEPROPERTY_FONTDESCRIPTORPART_STYLENAME:		rValue >>= rFD.StyleName;
                                                             break;
-        case BASEPROPERTY_FONTDESCRIPTORPART_FAMILY:        rValue >>= rFD.Family;
+        case BASEPROPERTY_FONTDESCRIPTORPART_FAMILY: 		rValue >>= rFD.Family;
                                                             break;
-        case BASEPROPERTY_FONTDESCRIPTORPART_CHARSET:       rValue >>= rFD.CharSet;
+        case BASEPROPERTY_FONTDESCRIPTORPART_CHARSET: 		rValue >>= rFD.CharSet;
                                                             break;
-        case BASEPROPERTY_FONTDESCRIPTORPART_HEIGHT:        rValue >>= nExtractFloat; rFD.Height = (sal_Int16)nExtractFloat;
+        case BASEPROPERTY_FONTDESCRIPTORPART_HEIGHT: 		rValue >>= nExtractFloat; rFD.Height = (sal_Int16)nExtractFloat;
                                                             break;
-        case BASEPROPERTY_FONTDESCRIPTORPART_WEIGHT:        rValue >>= rFD.Weight;
+        case BASEPROPERTY_FONTDESCRIPTORPART_WEIGHT: 		rValue >>= rFD.Weight;
                                                             break;
-        case BASEPROPERTY_FONTDESCRIPTORPART_SLANT:         if ( rValue >>= nExtractShort )
+        case BASEPROPERTY_FONTDESCRIPTORPART_SLANT: 		if ( rValue >>= nExtractShort )
                                                                 rFD.Slant = (::com::sun::star::awt::FontSlant)nExtractShort;
                                                             else
                                                                 rValue >>= rFD.Slant;
                                                             break;
-        case BASEPROPERTY_FONTDESCRIPTORPART_UNDERLINE:     rValue >>= rFD.Underline;
+        case BASEPROPERTY_FONTDESCRIPTORPART_UNDERLINE:		rValue >>= rFD.Underline;
                                                             break;
-        case BASEPROPERTY_FONTDESCRIPTORPART_STRIKEOUT:     rValue >>= rFD.Strikeout;
+        case BASEPROPERTY_FONTDESCRIPTORPART_STRIKEOUT:		rValue >>= rFD.Strikeout;
                                                             break;
-        case BASEPROPERTY_FONTDESCRIPTORPART_WIDTH:         rValue >>= rFD.Width;
+        case BASEPROPERTY_FONTDESCRIPTORPART_WIDTH:			rValue >>= rFD.Width;
                                                             break;
-        case BASEPROPERTY_FONTDESCRIPTORPART_PITCH:         rValue >>= rFD.Pitch;
+        case BASEPROPERTY_FONTDESCRIPTORPART_PITCH:			rValue >>= rFD.Pitch;
                                                             break;
-        case BASEPROPERTY_FONTDESCRIPTORPART_CHARWIDTH:     rValue >>= rFD.CharacterWidth;
+        case BASEPROPERTY_FONTDESCRIPTORPART_CHARWIDTH:		rValue >>= rFD.CharacterWidth;
                                                             break;
-        case BASEPROPERTY_FONTDESCRIPTORPART_ORIENTATION:   rValue >>= rFD.Orientation;
+        case BASEPROPERTY_FONTDESCRIPTORPART_ORIENTATION: 	rValue >>= rFD.Orientation;
                                                             break;
-        case BASEPROPERTY_FONTDESCRIPTORPART_KERNING:       rValue >>= rFD.Kerning;
+        case BASEPROPERTY_FONTDESCRIPTORPART_KERNING: 		rValue >>= rFD.Kerning;
                                                             break;
-        case BASEPROPERTY_FONTDESCRIPTORPART_WORDLINEMODE:  rValue >>= rFD.WordLineMode;
+        case BASEPROPERTY_FONTDESCRIPTORPART_WORDLINEMODE: 	rValue >>= rFD.WordLineMode;
                                                             break;
-        case BASEPROPERTY_FONTDESCRIPTORPART_TYPE:          rValue >>= rFD.Type;
+        case BASEPROPERTY_FONTDESCRIPTORPART_TYPE:			rValue >>= rFD.Type;
                                                             break;
-        default:                                            DBG_ERROR( "FontProperty?!" );
+        default: 											DBG_ERROR( "FontProperty?!" );
     }
 }
 
-//  ----------------------------------------------------
-//  class UnoControlModel
-//  ----------------------------------------------------
+//	----------------------------------------------------
+//	class UnoControlModel
+//	----------------------------------------------------
 UnoControlModel::UnoControlModel()
     : OPropertySetHelper( BrdcstHelper ), maDisposeListeners( *this )
 {
@@ -192,7 +192,7 @@ UnoControlModel::~UnoControlModel()
     delete mpData;
 }
 
-UnoControlModel* UnoControlModel::Clone() const
+UnoControlModel* UnoControlModel::Clone() const 
 {
     DBG_ERROR( "UnoControlModel::Clone() ?!" );
     return NULL;
@@ -201,7 +201,7 @@ UnoControlModel* UnoControlModel::Clone() const
 ::com::sun::star::uno::Sequence<sal_Int32> UnoControlModel::ImplGetPropertyIds() const
 {
     sal_uInt32 nIDs = mpData->Count();
-    ::com::sun::star::uno::Sequence<sal_Int32>  aIDs( nIDs );
+    ::com::sun::star::uno::Sequence<sal_Int32>	aIDs( nIDs );
     sal_Int32* pIDs = aIDs.getArray();
     for ( sal_uInt32 n = 0; n < nIDs; n++ )
         pIDs[n] = mpData->GetObjectKey( n );
@@ -231,23 +231,23 @@ sal_Bool UnoControlModel::ImplHasProperty( sal_uInt16 nPropId ) const
         EmptyFontDescriptor aFD;
         switch ( nPropId )
         {
-            case BASEPROPERTY_FONTDESCRIPTOR:                   aDefault <<= aFD;                   break;
-            case BASEPROPERTY_FONTDESCRIPTORPART_NAME:          aDefault <<= aFD.Name;              break;
-            case BASEPROPERTY_FONTDESCRIPTORPART_STYLENAME:     aDefault <<= aFD.StyleName;         break;
-            case BASEPROPERTY_FONTDESCRIPTORPART_FAMILY:        aDefault <<= aFD.Family;            break;
-            case BASEPROPERTY_FONTDESCRIPTORPART_CHARSET:       aDefault <<= aFD.CharSet;           break;
-            case BASEPROPERTY_FONTDESCRIPTORPART_HEIGHT:        aDefault <<= (float)aFD.Height;     break;
-            case BASEPROPERTY_FONTDESCRIPTORPART_WEIGHT:        aDefault <<= aFD.Weight;            break;
-            case BASEPROPERTY_FONTDESCRIPTORPART_SLANT:         aDefault <<= (sal_Int16)aFD.Slant;  break;
-            case BASEPROPERTY_FONTDESCRIPTORPART_UNDERLINE:     aDefault <<= aFD.Underline;         break;
-            case BASEPROPERTY_FONTDESCRIPTORPART_STRIKEOUT:     aDefault <<= aFD.Strikeout;         break;
-            case BASEPROPERTY_FONTDESCRIPTORPART_WIDTH:         aDefault <<= aFD.Width;             break;
-            case BASEPROPERTY_FONTDESCRIPTORPART_PITCH:         aDefault <<= aFD.Pitch;             break;
-            case BASEPROPERTY_FONTDESCRIPTORPART_CHARWIDTH:     aDefault <<= aFD.CharacterWidth;    break;
-            case BASEPROPERTY_FONTDESCRIPTORPART_ORIENTATION:   aDefault <<= aFD.Orientation;       break;
-            case BASEPROPERTY_FONTDESCRIPTORPART_KERNING:       aDefault <<= aFD.Kerning;           break;
-            case BASEPROPERTY_FONTDESCRIPTORPART_WORDLINEMODE:  aDefault <<= aFD.WordLineMode;      break;
-            case BASEPROPERTY_FONTDESCRIPTORPART_TYPE:          aDefault <<= aFD.Type;              break;
+            case BASEPROPERTY_FONTDESCRIPTOR: 					aDefault <<= aFD;					break;
+            case BASEPROPERTY_FONTDESCRIPTORPART_NAME: 			aDefault <<= aFD.Name;				break;
+            case BASEPROPERTY_FONTDESCRIPTORPART_STYLENAME:		aDefault <<= aFD.StyleName;			break;
+            case BASEPROPERTY_FONTDESCRIPTORPART_FAMILY: 		aDefault <<= aFD.Family;			break;
+            case BASEPROPERTY_FONTDESCRIPTORPART_CHARSET: 		aDefault <<= aFD.CharSet;			break;
+            case BASEPROPERTY_FONTDESCRIPTORPART_HEIGHT: 		aDefault <<= (float)aFD.Height;		break;
+            case BASEPROPERTY_FONTDESCRIPTORPART_WEIGHT: 		aDefault <<= aFD.Weight;			break;
+            case BASEPROPERTY_FONTDESCRIPTORPART_SLANT: 		aDefault <<= (sal_Int16)aFD.Slant;	break;
+            case BASEPROPERTY_FONTDESCRIPTORPART_UNDERLINE:		aDefault <<= aFD.Underline;			break;
+            case BASEPROPERTY_FONTDESCRIPTORPART_STRIKEOUT:		aDefault <<= aFD.Strikeout;			break;
+            case BASEPROPERTY_FONTDESCRIPTORPART_WIDTH:			aDefault <<= aFD.Width;				break;
+            case BASEPROPERTY_FONTDESCRIPTORPART_PITCH:			aDefault <<= aFD.Pitch;				break;
+            case BASEPROPERTY_FONTDESCRIPTORPART_CHARWIDTH:		aDefault <<= aFD.CharacterWidth;	break;
+            case BASEPROPERTY_FONTDESCRIPTORPART_ORIENTATION:	aDefault <<= aFD.Orientation;		break;
+            case BASEPROPERTY_FONTDESCRIPTORPART_KERNING:		aDefault <<= aFD.Kerning;			break;
+            case BASEPROPERTY_FONTDESCRIPTORPART_WORDLINEMODE:	aDefault <<= aFD.WordLineMode;		break;
+            case BASEPROPERTY_FONTDESCRIPTORPART_TYPE:			aDefault <<= aFD.Type;				break;
             default: DBG_ERROR( "FontProperty?!" );
         }
     }
@@ -274,9 +274,9 @@ sal_Bool UnoControlModel::ImplHasProperty( sal_uInt16 nPropId ) const
             case BASEPROPERTY_DATESHOWCENTURY:
             case BASEPROPERTY_TIME:
             case BASEPROPERTY_VALUE_DOUBLE:
-            case BASEPROPERTY_PROGRESSVALUE:
-            case BASEPROPERTY_SCROLLVALUE:
-            case BASEPROPERTY_VISIBLESIZE:
+            case BASEPROPERTY_PROGRESSVALUE: 
+            case BASEPROPERTY_SCROLLVALUE: 
+            case BASEPROPERTY_VISIBLESIZE: 
             case BASEPROPERTY_BACKGROUNDCOLOR:
             case BASEPROPERTY_FILLCOLOR:            break;  // Void
 
@@ -302,14 +302,14 @@ sal_Bool UnoControlModel::ImplHasProperty( sal_uInt16 nPropId ) const
             case BASEPROPERTY_TIMEMIN:              aDefault <<= (sal_Int32) 0;     break;
             case BASEPROPERTY_VALUEMAX_DOUBLE:      aDefault <<= (double) 1000000;  break;
             case BASEPROPERTY_VALUEMIN_DOUBLE:      aDefault <<= (double) -1000000; break;
-            case BASEPROPERTY_VALUESTEP_DOUBLE:     aDefault <<= (double ) 1;       break;
+            case BASEPROPERTY_VALUESTEP_DOUBLE:     aDefault <<= (double ) 1;       break; 
             case BASEPROPERTY_PROGRESSVALUE_MAX:    aDefault <<= (sal_Int32) 100;   break;
             case BASEPROPERTY_PROGRESSVALUE_MIN:    aDefault <<= (sal_Int32)   0;   break;
-            case BASEPROPERTY_SCROLLVALUE_MAX:      aDefault <<= (sal_Int32) 100;   break;
-            case BASEPROPERTY_SCROLLVALUE_MIN:      aDefault <<= (sal_Int32)   0;   break;
-            case BASEPROPERTY_LINEINCREMENT:        aDefault <<= (sal_Int32)   1;   break;
-            case BASEPROPERTY_BLOCKINCREMENT:       aDefault <<= (sal_Int32)  10;   break;
-            case BASEPROPERTY_ORIENTATION:          aDefault <<= (sal_Int32)   0;   break;
+            case BASEPROPERTY_SCROLLVALUE_MAX:		aDefault <<= (sal_Int32) 100;	break;
+            case BASEPROPERTY_SCROLLVALUE_MIN:		aDefault <<= (sal_Int32)   0;	break;
+            case BASEPROPERTY_LINEINCREMENT:		aDefault <<= (sal_Int32)   1;	break;
+            case BASEPROPERTY_BLOCKINCREMENT:		aDefault <<= (sal_Int32)  10;	break;
+            case BASEPROPERTY_ORIENTATION:			aDefault <<= (sal_Int32)   0;	break;
             case BASEPROPERTY_SPINVALUE:            aDefault <<= (sal_Int32)   0;   break;
             case BASEPROPERTY_SPININCREMENT:        aDefault <<= (sal_Int32)   1;   break;
             case BASEPROPERTY_SPINVALUE_MIN:        aDefault <<= (sal_Int32)   0;   break;
@@ -352,7 +352,7 @@ sal_Bool UnoControlModel::ImplHasProperty( sal_uInt16 nPropId ) const
             case BASEPROPERTY_HELPTEXT:
             case BASEPROPERTY_HELPURL:
             case BASEPROPERTY_IMAGEURL:
-            case BASEPROPERTY_DIALOGSOURCEURL:
+            case BASEPROPERTY_DIALOGSOURCEURL:				    
             case BASEPROPERTY_EDITMASK:
             case BASEPROPERTY_LITERALMASK:
             case BASEPROPERTY_LABEL:
@@ -409,8 +409,8 @@ sal_Bool UnoControlModel::ImplHasProperty( sal_uInt16 nPropId ) const
 
                 // look for the currency entry (for this language) which has the given bank symbol
                 Sequence< Currency2 > aAllCurrencies = aLocaleInfo.getAllCurrencies();
-                const Currency2* pAllCurrencies     =                       aAllCurrencies.getConstArray();
-                const Currency2* pAllCurrenciesEnd  =   pAllCurrencies  +   aAllCurrencies.getLength();
+                const Currency2* pAllCurrencies		=						aAllCurrencies.getConstArray();
+                const Currency2* pAllCurrenciesEnd	=	pAllCurrencies	+	aAllCurrencies.getLength();
 
                 ::rtl::OUString sCurrencySymbol = aLocaleInfo.getCurrSymbol();
                 if ( !sBankSymbol.getLength() )
@@ -636,7 +636,7 @@ void UnoControlModel::write( const ::com::sun::star::uno::Reference< ::com::sun:
     for ( i = 0; i < nProps; i++ )
     {
         sal_Int32 nPropDataBeginMark = xMark->createMark();
-        OutStream->writeLong( 0L ); // DataLen
+        OutStream->writeLong( 0L );	// DataLen
 
         ImplControlProperty* pProp = aProps.GetObject( i );
         OutStream->writeShort( pProp->GetId() );
@@ -780,9 +780,9 @@ void UnoControlModel::write( const ::com::sun::star::uno::Reference< ::com::sun:
         for ( sal_uInt16 n = BASEPROPERTY_FONT_TYPE; n <= BASEPROPERTY_FONT_ATTRIBS; n++ )
         {
             sal_Int32 nPropDataBeginMark = xMark->createMark();
-            OutStream->writeLong( 0L ); // DataLen
-            OutStream->writeShort( n ); // PropId
-            OutStream->writeBoolean( sal_False );   // Void
+            OutStream->writeLong( 0L );	// DataLen
+            OutStream->writeShort( n );	// PropId
+            OutStream->writeBoolean( sal_False );	// Void
 
             if ( n == BASEPROPERTY_FONT_TYPE )
             {
@@ -922,7 +922,7 @@ void UnoControlModel::read( const ::com::sun::star::uno::Reference< ::com::sun::
                 {
                     long nEntries = InStream->readLong();
                     ::com::sun::star::uno::Sequence< ::rtl::OUString> aSeq( nEntries );
-                    for ( long n = 0; n < nEntries; n++ )
+                    for ( long n = 0; n < nEntries; n++ ) 
                         aSeq.getArray()[n] = InStream->readUTF();
                     aValue <<= aSeq;
 
@@ -932,7 +932,7 @@ void UnoControlModel::read( const ::com::sun::star::uno::Reference< ::com::sun::
                 {
                     long nEntries = InStream->readLong();
                     ::com::sun::star::uno::Sequence<sal_uInt16> aSeq( nEntries );
-                    for ( long n = 0; n < nEntries; n++ )
+                    for ( long n = 0; n < nEntries; n++ ) 
                         aSeq.getArray()[n] = (sal_uInt16)InStream->readShort();
                     aValue <<= aSeq;
                 }
@@ -940,7 +940,7 @@ void UnoControlModel::read( const ::com::sun::star::uno::Reference< ::com::sun::
                 {
                     long nEntries = InStream->readLong();
                     ::com::sun::star::uno::Sequence<sal_Int16> aSeq( nEntries );
-                    for ( long n = 0; n < nEntries; n++ )
+                    for ( long n = 0; n < nEntries; n++ ) 
                         aSeq.getArray()[n] = (sal_Int16)InStream->readShort();
                     aValue <<= aSeq;
                 }
@@ -968,7 +968,7 @@ void UnoControlModel::read( const ::com::sun::star::uno::Reference< ::com::sun::
                 {
                     // Sonst ist es nur die redundante Info fuer alte Versionen
                     // Daten werden durch MarkableStream geskippt.
-                    if ( nVersion < 2 )
+                    if ( nVersion < 2 ) 
                     {
                         if ( !pFD )
                         {
@@ -997,7 +997,7 @@ void UnoControlModel::read( const ::com::sun::star::uno::Reference< ::com::sun::
                         }
                         pFD->Width = (sal_Int16)InStream->readLong();
                         pFD->Height = (sal_Int16)InStream->readLong();
-                        InStream->readShort();  // ::com::sun::star::awt::FontWidth ignorieren - wurde mal falsch geschrieben und wird nicht gebraucht.
+                        InStream->readShort();	// ::com::sun::star::awt::FontWidth ignorieren - wurde mal falsch geschrieben und wird nicht gebraucht.
                         pFD->CharacterWidth = ::com::sun::star::awt::FontWidth::DONTKNOW;
                     }
                 }
@@ -1005,7 +1005,7 @@ void UnoControlModel::read( const ::com::sun::star::uno::Reference< ::com::sun::
                 {
                     if ( nVersion < 2 )
                     {
-                         if ( !pFD )
+                         if ( !pFD )	
                         {
                             pFD = new ::com::sun::star::awt::FontDescriptor;
                             ImplControlProperty* pProp = mpData->Get( BASEPROPERTY_FONTDESCRIPTOR );
@@ -1036,7 +1036,7 @@ void UnoControlModel::read( const ::com::sun::star::uno::Reference< ::com::sun::
             }
         }
 
-        if ( mpData->Get( nPropId ) )
+        if ( mpData->Get( nPropId ) ) 
         {
             aProps.getArray()[i] = GetPropertyName( nPropId );
             aValues.getArray()[i] = aValue;
@@ -1049,13 +1049,13 @@ void UnoControlModel::read( const ::com::sun::star::uno::Reference< ::com::sun::
         // Falls bereits mehr drinsteht als diese Version kennt:
         xMark->jumpToMark( nPropDataBeginMark );
         InStream->skipBytes( nPropDataLen );
-        xMark->deleteMark(nPropDataBeginMark);
+        xMark->deleteMark(nPropDataBeginMark);		
     }
-    if ( bInvalidEntries )
+    if ( bInvalidEntries ) 
     {
-        for ( i = 0; i < (sal_uInt32)aProps.getLength(); i++ )
+        for ( i = 0; i < (sal_uInt32)aProps.getLength(); i++ ) 
         {
-            if ( !aProps.getConstArray()[i].getLength() )
+            if ( !aProps.getConstArray()[i].getLength() ) 
             {
                 ::comphelper::removeElementAt( aProps, i );
                 ::comphelper::removeElementAt( aValues, i );
@@ -1063,7 +1063,7 @@ void UnoControlModel::read( const ::com::sun::star::uno::Reference< ::com::sun::
             }
         }
     }
-
+    
     try
     {
         setPropertyValues( aProps, aValues );
@@ -1073,7 +1073,7 @@ void UnoControlModel::read( const ::com::sun::star::uno::Reference< ::com::sun::
         DBG_UNHANDLED_EXCEPTION();
     }
 
-    if ( pFD )
+    if ( pFD ) 
     {
         ::com::sun::star::uno::Any aValue;
         aValue <<= *pFD;
@@ -1088,13 +1088,13 @@ void UnoControlModel::read( const ::com::sun::star::uno::Reference< ::com::sun::
 {
     DBG_ERROR( "This method should be overloaded!" );
     return ::rtl::OUString();
-
+    
 }
 
 sal_Bool UnoControlModel::supportsService( const ::rtl::OUString& rServiceName ) throw(::com::sun::star::uno::RuntimeException)
 {
     ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() );
-
+    
     ::com::sun::star::uno::Sequence< ::rtl::OUString > aSNL = getSupportedServiceNames();
     const ::rtl::OUString * pArray = aSNL.getConstArray();
     for( sal_Int32 i = 0; i < aSNL.getLength(); i++ )
@@ -1166,7 +1166,7 @@ sal_Bool UnoControlModel::convertFastPropertyValue( Any & rConvertedValue, Any &
                         if ( bConverted )
                             rConvertedValue <<= nAsDouble;
                         else
-                        {   // try as integer - 96136 - 2002-10-08 - fs@openoffice.org
+                        {	// try as integer - 96136 - 2002-10-08 - fs@openoffice.org
                             sal_Int32 nAsInteger = 0;
                             bConverted = ( rValue >>= nAsInteger );
                             if ( bConverted )
@@ -1258,7 +1258,7 @@ sal_Bool UnoControlModel::convertFastPropertyValue( Any & rConvertedValue, Any &
 void UnoControlModel::setFastPropertyValue_NoBroadcast( sal_Int32 nPropId, const ::com::sun::star::uno::Any& rValue ) throw (::com::sun::star::uno::Exception)
 {
     // Fehlt: Die gefakten Einzelproperties des FontDescriptors...
-
+        
     ImplControlProperty* pProp = mpData->Get( nPropId );
     ENSURE_OR_RETURN_VOID( pProp, "UnoControlModel::setFastPropertyValue_NoBroadcast: invalid property id!" );
 
@@ -1269,9 +1269,9 @@ void UnoControlModel::setFastPropertyValue_NoBroadcast( sal_Int32 nPropId, const
 void UnoControlModel::getFastPropertyValue( ::com::sun::star::uno::Any& rValue, sal_Int32 nPropId ) const
 {
     ::osl::Guard< ::osl::Mutex > aGuard( ((UnoControlModel*)this)->GetMutex() );
-
+    
     ImplControlProperty* pProp = mpData->Get( nPropId );
-
+    
     if ( pProp )
         rValue = pProp->GetValue();
     else if ( ( nPropId >= BASEPROPERTY_FONTDESCRIPTORPART_START ) && ( nPropId <= BASEPROPERTY_FONTDESCRIPTORPART_END ) )
@@ -1279,39 +1279,39 @@ void UnoControlModel::getFastPropertyValue( ::com::sun::star::uno::Any& rValue,
         pProp = mpData->Get( BASEPROPERTY_FONTDESCRIPTOR );
         ::com::sun::star::awt::FontDescriptor aFD;
         pProp->GetValue() >>= aFD;
-        switch ( nPropId )
+        switch ( nPropId ) 
         {
-            case BASEPROPERTY_FONTDESCRIPTORPART_NAME:          rValue <<= aFD.Name;
+            case BASEPROPERTY_FONTDESCRIPTORPART_NAME: 			rValue <<= aFD.Name;
                                                                 break;
-            case BASEPROPERTY_FONTDESCRIPTORPART_STYLENAME:     rValue <<= aFD.StyleName;
+            case BASEPROPERTY_FONTDESCRIPTORPART_STYLENAME:		rValue <<= aFD.StyleName;
                                                                 break;
-            case BASEPROPERTY_FONTDESCRIPTORPART_FAMILY:        rValue <<= aFD.Family;
+            case BASEPROPERTY_FONTDESCRIPTORPART_FAMILY: 		rValue <<= aFD.Family;
                                                                 break;
-            case BASEPROPERTY_FONTDESCRIPTORPART_CHARSET:       rValue <<= aFD.CharSet;
+            case BASEPROPERTY_FONTDESCRIPTORPART_CHARSET: 		rValue <<= aFD.CharSet;
                                                                 break;
-            case BASEPROPERTY_FONTDESCRIPTORPART_HEIGHT:        rValue <<= (float)aFD.Height;
+            case BASEPROPERTY_FONTDESCRIPTORPART_HEIGHT: 		rValue <<= (float)aFD.Height;
                                                                 break;
-            case BASEPROPERTY_FONTDESCRIPTORPART_WEIGHT:        rValue <<= aFD.Weight;
+            case BASEPROPERTY_FONTDESCRIPTORPART_WEIGHT: 		rValue <<= aFD.Weight;
                                                                 break;
-            case BASEPROPERTY_FONTDESCRIPTORPART_SLANT:         rValue <<= (sal_Int16)aFD.Slant;
+            case BASEPROPERTY_FONTDESCRIPTORPART_SLANT: 		rValue <<= (sal_Int16)aFD.Slant;
                                                                 break;
-            case BASEPROPERTY_FONTDESCRIPTORPART_UNDERLINE:     rValue <<= aFD.Underline;
+            case BASEPROPERTY_FONTDESCRIPTORPART_UNDERLINE:		rValue <<= aFD.Underline;
                                                                 break;
-            case BASEPROPERTY_FONTDESCRIPTORPART_STRIKEOUT:     rValue <<= aFD.Strikeout;
+            case BASEPROPERTY_FONTDESCRIPTORPART_STRIKEOUT:		rValue <<= aFD.Strikeout;
                                                                 break;
-            case BASEPROPERTY_FONTDESCRIPTORPART_WIDTH:         rValue <<= aFD.Width;
+            case BASEPROPERTY_FONTDESCRIPTORPART_WIDTH:			rValue <<= aFD.Width;
                                                                 break;
-            case BASEPROPERTY_FONTDESCRIPTORPART_PITCH:         rValue <<= aFD.Pitch;
+            case BASEPROPERTY_FONTDESCRIPTORPART_PITCH:			rValue <<= aFD.Pitch;
                                                                 break;
-            case BASEPROPERTY_FONTDESCRIPTORPART_CHARWIDTH:     rValue <<= aFD.CharacterWidth;
+            case BASEPROPERTY_FONTDESCRIPTORPART_CHARWIDTH:		rValue <<= aFD.CharacterWidth;
                                                                 break;
-            case BASEPROPERTY_FONTDESCRIPTORPART_ORIENTATION:   rValue <<= aFD.Orientation;
+            case BASEPROPERTY_FONTDESCRIPTORPART_ORIENTATION:	rValue <<= aFD.Orientation;
                                                                 break;
-            case BASEPROPERTY_FONTDESCRIPTORPART_KERNING:       rValue <<= aFD.Kerning;
+            case BASEPROPERTY_FONTDESCRIPTORPART_KERNING:		rValue <<= aFD.Kerning;
                                                                 break;
-            case BASEPROPERTY_FONTDESCRIPTORPART_WORDLINEMODE:  rValue <<= aFD.WordLineMode;
+            case BASEPROPERTY_FONTDESCRIPTORPART_WORDLINEMODE:	rValue <<= aFD.WordLineMode;
                                                                 break;
-            case BASEPROPERTY_FONTDESCRIPTORPART_TYPE:          rValue <<= aFD.Type;
+            case BASEPROPERTY_FONTDESCRIPTORPART_TYPE:			rValue <<= aFD.Type;
                                                                 break;
             default: DBG_ERROR( "FontProperty?!" );
         }
@@ -1343,7 +1343,7 @@ void UnoControlModel::setFastPropertyValue( sal_Int32 nPropId, const ::com::sun:
     if ( ( nPropId >= BASEPROPERTY_FONTDESCRIPTORPART_START ) && ( nPropId <= BASEPROPERTY_FONTDESCRIPTORPART_END ) )
     {
         ::osl::ClearableMutexGuard aGuard( GetMutex() );
-
+        
         Any aOldSingleValue;
         getFastPropertyValue( aOldSingleValue, BASEPROPERTY_FONTDESCRIPTORPART_START );
 
@@ -1382,10 +1382,10 @@ void UnoControlModel::setFastPropertyValue( sal_Int32 nPropId, const ::com::sun:
 void UnoControlModel::setPropertyValues( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& rPropertyNames, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& Values ) throw(::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException)
 {
     ::osl::ClearableMutexGuard aGuard( GetMutex() );
-
+    
     sal_Int32 nProps = rPropertyNames.getLength();
 
-//  sal_Int32* pHandles = new sal_Int32[nProps];
+//	sal_Int32* pHandles = new sal_Int32[nProps];
         // don't do this - it leaks in case of an exception
     Sequence< sal_Int32 > aHandles( nProps );
     sal_Int32* pHandles = aHandles.getArray();
@@ -1397,16 +1397,16 @@ void UnoControlModel::setPropertyValues( const ::com::sun::star::uno::Sequence<
 
     sal_Int32 nValidHandles = getInfoHelper().fillHandles( pHandles, rPropertyNames );
 
-    if ( nValidHandles )
+    if ( nValidHandles ) 
     {
         // if somebody sets properties which are single aspects of a font descriptor,
         // remove them, and build a font descriptor instead
         ::std::auto_ptr< awt::FontDescriptor > pFD;
-        for ( sal_uInt16 n = 0; n < nProps; ++n )
+        for ( sal_uInt16 n = 0; n < nProps; ++n ) 
         {
             if ( ( pHandles[n] >= BASEPROPERTY_FONTDESCRIPTORPART_START ) && ( pHandles[n] <= BASEPROPERTY_FONTDESCRIPTORPART_END ) )
             {
-                if ( !pFD.get() )
+                if ( !pFD.get() ) 
                 {
                     ImplControlProperty* pProp = mpData->Get( BASEPROPERTY_FONTDESCRIPTOR );
                     pFD.reset( new awt::FontDescriptor );
@@ -1431,9 +1431,9 @@ void UnoControlModel::setPropertyValues( const ::com::sun::star::uno::Sequence<
         else
             aGuard.clear();
             // same as a few lines above
-
+        
         // FD-Propertie nicht in das Array mergen, weil sortiert...
-        if ( pFD.get() )
+        if ( pFD.get() ) 
         {
             ::com::sun::star::uno::Any aValue;
             aValue <<= *pFD;
diff --git a/toolkit/source/controls/unocontrols.cxx b/toolkit/source/controls/unocontrols.cxx
index 6599b039600f..5c4ded083be9 100644
--- a/toolkit/source/controls/unocontrols.cxx
+++ b/toolkit/source/controls/unocontrols.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
@@ -80,9 +80,21 @@ using ::com::sun::star::graphic::XGraphic;
 using ::com::sun::star::uno::Reference;
 using namespace ::toolkit;
 
-//  ----------------------------------------------------
-//  class UnoControlEditModel
-//  ----------------------------------------------------
+#define IMPL_SERVICEINFO_DERIVED( ImplName, BaseClass, ServiceName ) \
+    ::rtl::OUString SAL_CALL ImplName::getImplementationName(  ) throw(::com::sun::star::uno::RuntimeException) { return ::rtl::OUString::createFromAscii( "stardiv.Toolkit." #ImplName ); } \
+    ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL ImplName::getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException)	\
+                            { \
+                                ::com::sun::star::uno::Sequence< ::rtl::OUString > aNames = BaseClass::getSupportedServiceNames( ); \
+                                aNames.realloc( aNames.getLength() + 1 ); \
+                                aNames[ aNames.getLength() - 1 ] = ::rtl::OUString::createFromAscii( ServiceName ); \
+                                return aNames; \
+                            } \
+
+
+
+//	----------------------------------------------------
+//	class UnoControlEditModel
+//	----------------------------------------------------
 UnoControlEditModel::UnoControlEditModel()
 {
     UNO_CONTROL_MODEL_REGISTER_PROPERTIES( VCLXEdit );
@@ -117,7 +129,7 @@ uno::Any UnoControlEditModel::ImplGetDefaultValue( sal_uInt16 nPropId ) const
     static UnoPropertyArrayHelper* pHelper = NULL;
     if ( !pHelper )
     {
-        uno::Sequence<sal_Int32>    aIDs = ImplGetPropertyIds();
+        uno::Sequence<sal_Int32>	aIDs = ImplGetPropertyIds();
         pHelper = new UnoPropertyArrayHelper( aIDs );
     }
     return *pHelper;
@@ -131,9 +143,9 @@ uno::Reference< beans::XPropertySetInfo > UnoControlEditModel::getPropertySetInf
 }
 
 
-//  ----------------------------------------------------
-//  class UnoEditControl
-//  ----------------------------------------------------
+//	----------------------------------------------------
+//	class UnoEditControl
+//	----------------------------------------------------
 UnoEditControl::UnoEditControl()
     :maTextListeners( *this )
     ,mnMaxTextLen( 0 )
@@ -445,9 +457,9 @@ void UnoEditControl::getColumnsAndLines( sal_Int16& nCols, sal_Int16& nLines ) t
 }
 
 
-//  ----------------------------------------------------
-//  class UnoControlFileControlModel
-//  ----------------------------------------------------
+//	----------------------------------------------------
+//	class UnoControlFileControlModel
+//	----------------------------------------------------
 UnoControlFileControlModel::UnoControlFileControlModel()
 {
     ImplRegisterProperty( BASEPROPERTY_ALIGN );
@@ -491,7 +503,7 @@ uno::Any UnoControlFileControlModel::ImplGetDefaultValue( sal_uInt16 nPropId ) c
     static UnoPropertyArrayHelper* pHelper = NULL;
     if ( !pHelper )
     {
-        uno::Sequence<sal_Int32>    aIDs = ImplGetPropertyIds();
+        uno::Sequence<sal_Int32>	aIDs = ImplGetPropertyIds();
         pHelper = new UnoPropertyArrayHelper( aIDs );
     }
     return *pHelper;
@@ -504,9 +516,9 @@ uno::Reference< beans::XPropertySetInfo > UnoControlFileControlModel::getPropert
     return xInfo;
 }
 
-//  ----------------------------------------------------
-//  class UnoFileControl
-//  ----------------------------------------------------
+//	----------------------------------------------------
+//	class UnoFileControl
+//	----------------------------------------------------
 UnoFileControl::UnoFileControl()
 {
 }
@@ -516,9 +528,9 @@ UnoFileControl::UnoFileControl()
     return ::rtl::OUString::createFromAscii( "filecontrol" );
 }
 
-//  ----------------------------------------------------
-//  class GraphicControlModel
-//  ----------------------------------------------------
+//	----------------------------------------------------
+//	class GraphicControlModel
+//	----------------------------------------------------
 uno::Any GraphicControlModel::ImplGetDefaultValue( sal_uInt16 nPropId ) const
 {
     if ( nPropId == BASEPROPERTY_GRAPHIC )
@@ -623,9 +635,9 @@ void SAL_CALL GraphicControlModel::setFastPropertyValue_NoBroadcast( sal_Int32 n
     }
 }
 
-//  ----------------------------------------------------
-//  class UnoControlButtonModel
-//  ----------------------------------------------------
+//	----------------------------------------------------
+//	class UnoControlButtonModel
+//	----------------------------------------------------
 UnoControlButtonModel::UnoControlButtonModel()
 {
     UNO_CONTROL_MODEL_REGISTER_PROPERTIES( VCLXButton );
@@ -666,7 +678,7 @@ uno::Any UnoControlButtonModel::ImplGetDefaultValue( sal_uInt16 nPropId ) const
     static UnoPropertyArrayHelper* pHelper = NULL;
     if ( !pHelper )
     {
-        uno::Sequence<sal_Int32>    aIDs = ImplGetPropertyIds();
+        uno::Sequence<sal_Int32>	aIDs = ImplGetPropertyIds();
         pHelper = new UnoPropertyArrayHelper( aIDs );
     }
     return *pHelper;
@@ -679,9 +691,9 @@ uno::Reference< beans::XPropertySetInfo > UnoControlButtonModel::getPropertySetI
     return xInfo;
 }
 
-//  ----------------------------------------------------
-//  class UnoButtonControl
-//  ----------------------------------------------------
+//	----------------------------------------------------
+//	class UnoButtonControl
+//	----------------------------------------------------
 UnoButtonControl::UnoButtonControl()
     : maActionListeners( *this )
     , maItemListeners( *this )
@@ -818,9 +830,9 @@ awt::Size UnoButtonControl::calcAdjustedSize( const awt::Size& rNewSize ) throw(
     return Impl_calcAdjustedSize( rNewSize );
 }
 
-//  ----------------------------------------------------
-//  class UnoControlImageControlModel
-//  ----------------------------------------------------
+//	----------------------------------------------------
+//	class UnoControlImageControlModel
+//	----------------------------------------------------
 UnoControlImageControlModel::UnoControlImageControlModel()
     :mbAdjustingImageScaleMode( false )
 {
@@ -848,7 +860,7 @@ uno::Any UnoControlImageControlModel::ImplGetDefaultValue( sal_uInt16 nPropId )
     static UnoPropertyArrayHelper* pHelper = NULL;
     if ( !pHelper )
     {
-        uno::Sequence<sal_Int32>    aIDs = ImplGetPropertyIds();
+        uno::Sequence<sal_Int32>	aIDs = ImplGetPropertyIds();
         pHelper = new UnoPropertyArrayHelper( aIDs );
     }
     return *pHelper;
@@ -899,9 +911,9 @@ void SAL_CALL UnoControlImageControlModel::setFastPropertyValue_NoBroadcast( sal
     }
 }
 
-//  ----------------------------------------------------
-//  class UnoImageControlControl
-//  ----------------------------------------------------
+//	----------------------------------------------------
+//	class UnoImageControlControl
+//	----------------------------------------------------
 UnoImageControlControl::UnoImageControlControl()
     : maActionListeners( *this )
 {
@@ -943,9 +955,9 @@ awt::Size UnoImageControlControl::calcAdjustedSize( const awt::Size& rNewSize )
     return Impl_calcAdjustedSize( rNewSize );
 }
 
-//  ----------------------------------------------------
-//  class UnoControlRadioButtonModel
-//  ----------------------------------------------------
+//	----------------------------------------------------
+//	class UnoControlRadioButtonModel
+//	----------------------------------------------------
 UnoControlRadioButtonModel::UnoControlRadioButtonModel()
 {
     UNO_CONTROL_MODEL_REGISTER_PROPERTIES( VCLXRadioButton );
@@ -975,7 +987,7 @@ uno::Any UnoControlRadioButtonModel::ImplGetDefaultValue( sal_uInt16 nPropId ) c
     static UnoPropertyArrayHelper* pHelper = NULL;
     if ( !pHelper )
     {
-        uno::Sequence<sal_Int32>    aIDs = ImplGetPropertyIds();
+        uno::Sequence<sal_Int32>	aIDs = ImplGetPropertyIds();
         pHelper = new UnoPropertyArrayHelper( aIDs );
     }
     return *pHelper;
@@ -990,9 +1002,9 @@ uno::Reference< beans::XPropertySetInfo > UnoControlRadioButtonModel::getPropert
 
 
 
-//  ----------------------------------------------------
-//  class UnoRadioButtonControl
-//  ----------------------------------------------------
+//	----------------------------------------------------
+//	class UnoRadioButtonControl
+//	----------------------------------------------------
 UnoRadioButtonControl::UnoRadioButtonControl()
     : maItemListeners( *this ), maActionListeners( *this )
 {
@@ -1150,9 +1162,9 @@ awt::Size UnoRadioButtonControl::calcAdjustedSize( const awt::Size& rNewSize ) t
     return Impl_calcAdjustedSize( rNewSize );
 }
 
-//  ----------------------------------------------------
-//  class UnoControlCheckBoxModel
-//  ----------------------------------------------------
+//	----------------------------------------------------
+//	class UnoControlCheckBoxModel
+//	----------------------------------------------------
 UnoControlCheckBoxModel::UnoControlCheckBoxModel()
 {
     UNO_CONTROL_MODEL_REGISTER_PROPERTIES( VCLXCheckBox );
@@ -1182,7 +1194,7 @@ uno::Any UnoControlCheckBoxModel::ImplGetDefaultValue( sal_uInt16 nPropId ) cons
     static UnoPropertyArrayHelper* pHelper = NULL;
     if ( !pHelper )
     {
-        uno::Sequence<sal_Int32>    aIDs = ImplGetPropertyIds();
+        uno::Sequence<sal_Int32>	aIDs = ImplGetPropertyIds();
         pHelper = new UnoPropertyArrayHelper( aIDs );
     }
     return *pHelper;
@@ -1197,9 +1209,9 @@ uno::Reference< beans::XPropertySetInfo > UnoControlCheckBoxModel::getPropertySe
 
 
 
-//  ----------------------------------------------------
-//  class UnoCheckBoxControl
-//  ----------------------------------------------------
+//	----------------------------------------------------
+//	class UnoCheckBoxControl
+//	----------------------------------------------------
 UnoCheckBoxControl::UnoCheckBoxControl()
     : maItemListeners( *this ), maActionListeners( *this )
 {
@@ -1333,9 +1345,9 @@ awt::Size UnoCheckBoxControl::calcAdjustedSize( const awt::Size& rNewSize ) thro
     return Impl_calcAdjustedSize( rNewSize );
 }
 
-//  ----------------------------------------------------
+//	----------------------------------------------------
 //  class UnoControlFixedHyperlinkModel
-//  ----------------------------------------------------
+//	----------------------------------------------------
 UnoControlFixedHyperlinkModel::UnoControlFixedHyperlinkModel()
 {
     UNO_CONTROL_MODEL_REGISTER_PROPERTIES( VCLXFixedHyperlink );
@@ -1375,7 +1387,7 @@ uno::Any UnoControlFixedHyperlinkModel::ImplGetDefaultValue( sal_uInt16 nPropId
     static UnoPropertyArrayHelper* pHelper = NULL;
     if ( !pHelper )
     {
-        uno::Sequence<sal_Int32>    aIDs = ImplGetPropertyIds();
+        uno::Sequence<sal_Int32>	aIDs = ImplGetPropertyIds();
         pHelper = new UnoPropertyArrayHelper( aIDs );
     }
     return *pHelper;
@@ -1388,9 +1400,9 @@ uno::Reference< beans::XPropertySetInfo > UnoControlFixedHyperlinkModel::getProp
     return xInfo;
 }
 
-//  ----------------------------------------------------
+//	----------------------------------------------------
 //  class UnoFixedHyperlinkControl
-//  ----------------------------------------------------
+//	----------------------------------------------------
 UnoFixedHyperlinkControl::UnoFixedHyperlinkControl()
     : maActionListeners( *this )
 {
@@ -1648,9 +1660,9 @@ awt::Size UnoFixedTextControl::calcAdjustedSize( const awt::Size& rNewSize ) thr
     return Impl_calcAdjustedSize( rNewSize );
 }
 
-//  ----------------------------------------------------
-//  class UnoControlGroupBoxModel
-//  ----------------------------------------------------
+//	----------------------------------------------------
+//	class UnoControlGroupBoxModel
+//	----------------------------------------------------
 UnoControlGroupBoxModel::UnoControlGroupBoxModel()
 {
     ImplRegisterProperty( BASEPROPERTY_DEFAULTCONTROL );
@@ -1686,7 +1698,7 @@ uno::Any UnoControlGroupBoxModel::ImplGetDefaultValue( sal_uInt16 nPropId ) cons
     static UnoPropertyArrayHelper* pHelper = NULL;
     if ( !pHelper )
     {
-        uno::Sequence<sal_Int32>    aIDs = ImplGetPropertyIds();
+        uno::Sequence<sal_Int32>	aIDs = ImplGetPropertyIds();
         pHelper = new UnoPropertyArrayHelper( aIDs );
     }
     return *pHelper;
@@ -1699,9 +1711,9 @@ uno::Reference< beans::XPropertySetInfo > UnoControlGroupBoxModel::getPropertySe
     return xInfo;
 }
 
-//  ----------------------------------------------------
-//  class UnoGroupBoxControl
-//  ----------------------------------------------------
+//	----------------------------------------------------
+//	class UnoGroupBoxControl
+//	----------------------------------------------------
 UnoGroupBoxControl::UnoGroupBoxControl()
 {
     maComponentInfos.nWidth = 100;
@@ -1826,6 +1838,13 @@ UnoControlListBoxModel::UnoControlListBoxModel()
 {
     UNO_CONTROL_MODEL_REGISTER_PROPERTIES( VCLXListBox );
 }
+// ---------------------------------------------------------------------------------------------------------------------
+UnoControlListBoxModel::UnoControlListBoxModel(bool)
+    :UnoControlListBoxModel_Base()
+    ,m_pData( new UnoControlListBoxModel_Data( *this ) )
+    ,m_aItemListListeners( GetMutex() )
+{
+}
 
 // ---------------------------------------------------------------------------------------------------------------------
 UnoControlListBoxModel::UnoControlListBoxModel( const UnoControlListBoxModel& i_rSource )
@@ -1837,12 +1856,12 @@ UnoControlListBoxModel::UnoControlListBoxModel( const UnoControlListBoxModel& i_
 UnoControlListBoxModel::~UnoControlListBoxModel()
 {
 }
+IMPL_SERVICEINFO_DERIVED( UnoControlListBoxModel, UnoControlModel, szServiceName2_UnoControlListBoxModel )
 // ---------------------------------------------------------------------------------------------------------------------
 ::rtl::OUString UnoControlListBoxModel::getServiceName() throw(::com::sun::star::uno::RuntimeException)
 {
     return ::rtl::OUString::createFromAscii( szServiceName_UnoControlListBoxModel );
 }
-
 // ---------------------------------------------------------------------------------------------------------------------
 uno::Any UnoControlListBoxModel::ImplGetDefaultValue( sal_uInt16 nPropId ) const
 {
@@ -1861,7 +1880,7 @@ uno::Any UnoControlListBoxModel::ImplGetDefaultValue( sal_uInt16 nPropId ) const
     static UnoPropertyArrayHelper* pHelper = NULL;
     if ( !pHelper )
     {
-        uno::Sequence<sal_Int32>    aIDs = ImplGetPropertyIds();
+        uno::Sequence<sal_Int32>	aIDs = ImplGetPropertyIds();
         pHelper = new UnoPropertyArrayHelper( aIDs );
     }
     return *pHelper;
@@ -2255,9 +2274,9 @@ void UnoControlListBoxModel::impl_notifyItemListEvent_nolck( const sal_Int32 i_n
     m_aItemListListeners.notifyEach( NotificationMethod, aEvent );
 }
 
-//  ----------------------------------------------------
-//  class UnoListBoxControl
-//  ----------------------------------------------------
+//	----------------------------------------------------
+//	class UnoListBoxControl
+//	----------------------------------------------------
 UnoListBoxControl::UnoListBoxControl()
     :maActionListeners( *this )
     ,maItemListeners( *this )
@@ -2270,6 +2289,7 @@ UnoListBoxControl::UnoListBoxControl()
 {
     return ::rtl::OUString::createFromAscii( "listbox" );
 }
+IMPL_SERVICEINFO_DERIVED( UnoListBoxControl, UnoControlBase, szServiceName2_UnoControlListBox )
 
 void UnoListBoxControl::dispose() throw(uno::RuntimeException)
 {
@@ -2676,98 +2696,158 @@ void SAL_CALL UnoListBoxControl::itemListChanged( const lang::EventObject& i_rEv
     if ( xPeerListener.is() )
         xPeerListener->itemListChanged( i_rEvent );
 }
-ActionListenerMultiplexer&  UnoListBoxControl::getActionListeners()
+ActionListenerMultiplexer& 	UnoListBoxControl::getActionListeners()
 {
     return maActionListeners;
 }
-ItemListenerMultiplexer&    UnoListBoxControl::getItemListeners()
+ItemListenerMultiplexer& 	UnoListBoxControl::getItemListeners()
 {
     return maItemListeners;
 }
-//  ----------------------------------------------------
-//  class UnoControlComboBoxModel
-//  ----------------------------------------------------
-UnoControlComboBoxModel::UnoControlComboBoxModel()
+//	----------------------------------------------------
+//	class UnoControlComboBoxModel
+//	----------------------------------------------------
+UnoControlComboBoxModel::UnoControlComboBoxModel() : UnoControlListBoxModel(true)
 {
     UNO_CONTROL_MODEL_REGISTER_PROPERTIES( VCLXComboBox );
 }
 
-::rtl::OUString UnoControlComboBoxModel::getServiceName() throw(::com::sun::star::uno::RuntimeException)
-{
-    return ::rtl::OUString::createFromAscii( szServiceName_UnoControlComboBoxModel );
-}
+IMPL_SERVICEINFO_DERIVED( UnoControlComboBoxModel, UnoControlModel, szServiceName2_UnoControlComboBoxModel )
 
-uno::Any UnoControlComboBoxModel::ImplGetDefaultValue( sal_uInt16 nPropId ) const
+uno::Reference< beans::XPropertySetInfo > UnoControlComboBoxModel::getPropertySetInfo(  ) throw(uno::RuntimeException)
 {
-    if ( nPropId == BASEPROPERTY_DEFAULTCONTROL )
-    {
-        uno::Any aAny;
-        aAny <<= ::rtl::OUString::createFromAscii( szServiceName_UnoControlComboBox );
-        return aAny;
-    }
-    return UnoControlModel::ImplGetDefaultValue( nPropId );
+    static uno::Reference< beans::XPropertySetInfo > xInfo( createPropertySetInfo( getInfoHelper() ) );
+    return xInfo;
 }
-
-
+// ---------------------------------------------------------------------------------------------------------------------
 ::cppu::IPropertyArrayHelper& UnoControlComboBoxModel::getInfoHelper()
 {
     static UnoPropertyArrayHelper* pHelper = NULL;
     if ( !pHelper )
     {
-        uno::Sequence<sal_Int32>    aIDs = ImplGetPropertyIds();
+        uno::Sequence<sal_Int32>	aIDs = ImplGetPropertyIds();
         pHelper = new UnoPropertyArrayHelper( aIDs );
     }
     return *pHelper;
 }
 
-// beans::XMultiPropertySet
-uno::Reference< beans::XPropertySetInfo > UnoControlComboBoxModel::getPropertySetInfo(  ) throw(uno::RuntimeException)
+
+::rtl::OUString UnoControlComboBoxModel::getServiceName() throw(::com::sun::star::uno::RuntimeException)
 {
-    static uno::Reference< beans::XPropertySetInfo > xInfo( createPropertySetInfo( getInfoHelper() ) );
-    return xInfo;
+    return ::rtl::OUString::createFromAscii( szServiceName_UnoControlComboBoxModel );
 }
+void SAL_CALL UnoControlComboBoxModel::setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const uno::Any& rValue ) throw (uno::Exception)
+{
+    UnoControlModel::setFastPropertyValue_NoBroadcast( nHandle, rValue );
 
+    if ( nHandle == BASEPROPERTY_STRINGITEMLIST && !m_pData->m_bSettingLegacyProperty)
+    {
+        // synchronize the legacy StringItemList property with our list items
+        Sequence< ::rtl::OUString > aStringItemList;
+        Any aPropValue;
+        getFastPropertyValue( aPropValue, BASEPROPERTY_STRINGITEMLIST );
+        OSL_VERIFY( aPropValue >>= aStringItemList );
+
+        ::std::vector< ListItem > aItems( aStringItemList.getLength() );
+        ::std::transform(
+            aStringItemList.getConstArray(),
+            aStringItemList.getConstArray() + aStringItemList.getLength(),
+            aItems.begin(),
+            CreateListItem()
+        );
+        m_pData->setAllItems( aItems );
+
+        // since an XItemListListener does not have a "all items modified" or some such method,
+        // we simulate this by notifying removal of all items, followed by insertion of all new
+        // items
+        lang::EventObject aEvent;
+        aEvent.Source = *this;
+        m_aItemListListeners.notifyEach( &XItemListListener::itemListChanged, aEvent );
+        // TODO: OPropertySetHelper calls into this method with the mutex locked ...
+        // which is wrong for the above notifications ...
+    }
+}
 
+uno::Any UnoControlComboBoxModel::ImplGetDefaultValue( sal_uInt16 nPropId ) const
+{
+    if ( nPropId == BASEPROPERTY_DEFAULTCONTROL )
+    {
+        uno::Any aAny;
+        aAny <<= ::rtl::OUString::createFromAscii( szServiceName_UnoControlComboBox );
+        return aAny;
+    }
+    return UnoControlModel::ImplGetDefaultValue( nPropId );
+}
 
-//  ----------------------------------------------------
-//  class UnoComboBoxControl
-//  ----------------------------------------------------
+//	----------------------------------------------------
+//	class UnoComboBoxControl
+//	----------------------------------------------------
 UnoComboBoxControl::UnoComboBoxControl()
-    :   maActionListeners( *this ),
+    : 	maActionListeners( *this ),
         maItemListeners( *this )
 {
     maComponentInfos.nWidth = 100;
     maComponentInfos.nHeight = 12;
 }
+IMPL_SERVICEINFO_DERIVED( UnoComboBoxControl, UnoEditControl, szServiceName2_UnoControlComboBox )
 
 ::rtl::OUString UnoComboBoxControl::GetComponentServiceName()
 {
     return ::rtl::OUString::createFromAscii( "combobox" );
 }
 
-// uno::XInterface
+void UnoComboBoxControl::dispose() throw(uno::RuntimeException)
+{
+    lang::EventObject aEvt;
+    aEvt.Source = (::cppu::OWeakObject*)this;
+    maActionListeners.disposeAndClear( aEvt );
+    maItemListeners.disposeAndClear( aEvt );
+    UnoControl::dispose();
+}
 uno::Any UnoComboBoxControl::queryAggregation( const uno::Type & rType ) throw(uno::RuntimeException)
 {
     uno::Any aRet = ::cppu::queryInterface( rType,
                                         SAL_STATIC_CAST( awt::XComboBox*, this ) );
+    if ( !aRet.hasValue() )
+    {
+        aRet = ::cppu::queryInterface( rType,
+                                        SAL_STATIC_CAST( awt::XItemListener*, this ) );
+        if ( !aRet.hasValue() )
+        {
+            aRet = ::cppu::queryInterface( rType,
+                                            SAL_STATIC_CAST( awt::XItemListListener*, this ) );
+        }
+    }
     return (aRet.hasValue() ? aRet : UnoEditControl::queryAggregation( rType ));
 }
-
 // lang::XTypeProvider
 IMPL_XTYPEPROVIDER_START( UnoComboBoxControl )
     getCppuType( ( uno::Reference< awt::XComboBox>* ) NULL ),
+    getCppuType( ( uno::Reference< awt::XItemListener>* ) NULL ),
+    getCppuType( ( uno::Reference< awt::XItemListListener>* ) NULL ),
     UnoEditControl::getTypes()
 IMPL_XTYPEPROVIDER_END
 
-void UnoComboBoxControl::dispose() throw(uno::RuntimeException)
+void UnoComboBoxControl::updateFromModel()
 {
-    lang::EventObject aEvt;
-    aEvt.Source = (::cppu::OWeakObject*)this;
-    maActionListeners.disposeAndClear( aEvt );
-    maItemListeners.disposeAndClear( aEvt );
-    UnoControl::dispose();
+    UnoEditControl::updateFromModel();
+
+    Reference< XItemListListener > xItemListListener( getPeer(), UNO_QUERY );
+    ENSURE_OR_RETURN_VOID( xItemListListener.is(), "UnoComboBoxControl::updateFromModel: a peer which is no ItemListListener?!" );
+
+    EventObject aEvent( getModel() );
+    xItemListListener->itemListChanged( aEvent );
 }
+void UnoComboBoxControl::ImplSetPeerProperty( const ::rtl::OUString& rPropName, const uno::Any& rVal )
+{
+    if ( rPropName == GetPropertyName( BASEPROPERTY_STRINGITEMLIST ) )
+        // do not forward this to our peer. We are a XItemListListener at our model, and changes in the string item
+        // list (which is a legacy property) will, later, arrive as changes in the ItemList. Those latter changes
+        // will be forwarded to the peer, which will update itself accordingly.
+        return;
 
+    UnoEditControl::ImplSetPeerProperty( rPropName, rVal );
+}
 void UnoComboBoxControl::createPeer( const uno::Reference< awt::XToolkit > & rxToolkit, const uno::Reference< awt::XWindowPeer >  & rParentPeer ) throw(uno::RuntimeException)
 {
     UnoEditControl::createPeer( rxToolkit, rParentPeer );
@@ -2813,11 +2893,98 @@ void UnoComboBoxControl::removeItemListener(const uno::Reference < awt::XItemLis
 {
     if( getPeer().is() && maItemListeners.getLength() == 1 )
     {
-        uno::Reference < awt::XComboBox >  xComboBox( getPeer(), uno::UNO_QUERY );  // MT: Mal alles so umstellen, schoener als Ref anlegen und query rufen
+        uno::Reference < awt::XComboBox >  xComboBox( getPeer(), uno::UNO_QUERY );	// MT: Mal alles so umstellen, schoener als Ref anlegen und query rufen
         xComboBox->removeItemListener( &maItemListeners );
     }
     maItemListeners.removeInterface( l );
 }
+void UnoComboBoxControl::itemStateChanged( const awt::ItemEvent& rEvent ) throw(uno::RuntimeException)
+{
+    if ( maItemListeners.getLength() )
+    {
+        try
+        {
+            maItemListeners.itemStateChanged( rEvent );
+        }
+        catch( const Exception& e )
+        {
+#if OSL_DEBUG_LEVEL == 0
+            (void) e; // suppress warning
+#else
+            ::rtl::OString sMessage( "UnoComboBoxControl::itemStateChanged: caught an exception:\n" );
+            sMessage += ::rtl::OString( e.Message.getStr(), e.Message.getLength(), RTL_TEXTENCODING_ASCII_US );
+            OSL_ENSURE( sal_False, sMessage.getStr() );
+#endif
+        }
+    }
+}
+sal_Bool SAL_CALL UnoComboBoxControl::setModel( const uno::Reference< awt::XControlModel >& i_rModel ) throw ( uno::RuntimeException )
+{
+    ::osl::MutexGuard aGuard( GetMutex() );
+
+    const Reference< XItemList > xOldItems( getModel(), UNO_QUERY );
+    OSL_ENSURE( xOldItems.is() || !getModel().is(), "UnoComboBoxControl::setModel: illegal old model!" );
+    const Reference< XItemList > xNewItems( i_rModel, UNO_QUERY );
+    OSL_ENSURE( xNewItems.is() || !i_rModel.is(), "UnoComboBoxControl::setModel: illegal new model!" );
+
+    if ( !UnoEditControl::setModel( i_rModel ) )
+        return sal_False;
+
+    if ( xOldItems.is() )
+        xOldItems->removeItemListListener( this );
+    if ( xNewItems.is() )
+        xNewItems->addItemListListener( this );
+
+    return sal_True;
+}
+
+void SAL_CALL UnoComboBoxControl::listItemInserted( const awt::ItemListEvent& i_rEvent ) throw (uno::RuntimeException)
+{
+    const Reference< XItemListListener > xPeerListener( getPeer(), UNO_QUERY );
+    OSL_ENSURE( xPeerListener.is() || !getPeer().is(), "UnoComboBoxControl::listItemInserted: invalid peer!" );
+    if ( xPeerListener.is() )
+        xPeerListener->listItemInserted( i_rEvent );
+}
+
+void SAL_CALL UnoComboBoxControl::listItemRemoved( const awt::ItemListEvent& i_rEvent ) throw (uno::RuntimeException)
+{
+    const Reference< XItemListListener > xPeerListener( getPeer(), UNO_QUERY );
+    OSL_ENSURE( xPeerListener.is() || !getPeer().is(), "UnoComboBoxControl::listItemRemoved: invalid peer!" );
+    if ( xPeerListener.is() )
+        xPeerListener->listItemRemoved( i_rEvent );
+}
+
+void SAL_CALL UnoComboBoxControl::listItemModified( const awt::ItemListEvent& i_rEvent ) throw (uno::RuntimeException)
+{
+    const Reference< XItemListListener > xPeerListener( getPeer(), UNO_QUERY );
+    OSL_ENSURE( xPeerListener.is() || !getPeer().is(), "UnoComboBoxControl::listItemModified: invalid peer!" );
+    if ( xPeerListener.is() )
+        xPeerListener->listItemModified( i_rEvent );
+}
+
+void SAL_CALL UnoComboBoxControl::allItemsRemoved( const lang::EventObject& i_rEvent ) throw (uno::RuntimeException)
+{
+    const Reference< XItemListListener > xPeerListener( getPeer(), UNO_QUERY );
+    OSL_ENSURE( xPeerListener.is() || !getPeer().is(), "UnoComboBoxControl::allItemsRemoved: invalid peer!" );
+    if ( xPeerListener.is() )
+        xPeerListener->allItemsRemoved( i_rEvent );
+}
+
+void SAL_CALL UnoComboBoxControl::itemListChanged( const lang::EventObject& i_rEvent ) throw (uno::RuntimeException)
+{
+    const Reference< XItemListListener > xPeerListener( getPeer(), UNO_QUERY );
+    OSL_ENSURE( xPeerListener.is() || !getPeer().is(), "UnoComboBoxControl::itemListChanged: invalid peer!" );
+    if ( xPeerListener.is() )
+        xPeerListener->itemListChanged( i_rEvent );
+}
+ActionListenerMultiplexer& 	UnoComboBoxControl::getActionListeners()
+{
+    return maActionListeners;
+}
+ItemListenerMultiplexer& 	UnoComboBoxControl::getItemListeners()
+{
+    return maItemListeners;
+}
 
 void UnoComboBoxControl::addItem( const ::rtl::OUString& aItem, sal_Int16 nPos ) throw(uno::RuntimeException)
 {
@@ -2932,9 +3099,9 @@ sal_Int16 UnoComboBoxControl::getDropDownLineCount() throw(uno::RuntimeException
 }
 
 
-//  ----------------------------------------------------
-//  UnoSpinFieldControl
-//  ----------------------------------------------------
+//	----------------------------------------------------
+//	UnoSpinFieldControl
+//	----------------------------------------------------
 UnoSpinFieldControl::UnoSpinFieldControl() : maSpinListeners( *this )
 {
     mbRepeat = sal_False;
@@ -3022,9 +3189,9 @@ void UnoSpinFieldControl::enableRepeat( sal_Bool bRepeat ) throw(::com::sun::sta
         xField->enableRepeat( bRepeat );
 }
 
-//  ----------------------------------------------------
-//  class UnoControlDateFieldModel
-//  ----------------------------------------------------
+//	----------------------------------------------------
+//	class UnoControlDateFieldModel
+//	----------------------------------------------------
 UnoControlDateFieldModel::UnoControlDateFieldModel()
 {
     UNO_CONTROL_MODEL_REGISTER_PROPERTIES( VCLXDateField );
@@ -3052,7 +3219,7 @@ uno::Any UnoControlDateFieldModel::ImplGetDefaultValue( sal_uInt16 nPropId ) con
     static UnoPropertyArrayHelper* pHelper = NULL;
     if ( !pHelper )
     {
-        uno::Sequence<sal_Int32>    aIDs = ImplGetPropertyIds();
+        uno::Sequence<sal_Int32>	aIDs = ImplGetPropertyIds();
         pHelper = new UnoPropertyArrayHelper( aIDs );
     }
     return *pHelper;
@@ -3067,9 +3234,9 @@ uno::Reference< beans::XPropertySetInfo > UnoControlDateFieldModel::getPropertyS
 
 
 
-//  ----------------------------------------------------
-//  class UnoDateFieldControl
-//  ----------------------------------------------------
+//	----------------------------------------------------
+//	class UnoDateFieldControl
+//	----------------------------------------------------
 UnoDateFieldControl::UnoDateFieldControl()
 {
     mnFirst = Date( 1, 1, 1900 ).GetDate();
@@ -3262,9 +3429,9 @@ sal_Bool UnoDateFieldControl::isStrictFormat() throw(uno::RuntimeException)
     return ImplGetPropertyValue_BOOL( BASEPROPERTY_STRICTFORMAT );
 }
 
-//  ----------------------------------------------------
-//  class UnoControlTimeFieldModel
-//  ----------------------------------------------------
+//	----------------------------------------------------
+//	class UnoControlTimeFieldModel
+//	----------------------------------------------------
 UnoControlTimeFieldModel::UnoControlTimeFieldModel()
 {
     UNO_CONTROL_MODEL_REGISTER_PROPERTIES( VCLXTimeField );
@@ -3292,7 +3459,7 @@ uno::Any UnoControlTimeFieldModel::ImplGetDefaultValue( sal_uInt16 nPropId ) con
     static UnoPropertyArrayHelper* pHelper = NULL;
     if ( !pHelper )
     {
-        uno::Sequence<sal_Int32>    aIDs = ImplGetPropertyIds();
+        uno::Sequence<sal_Int32>	aIDs = ImplGetPropertyIds();
         pHelper = new UnoPropertyArrayHelper( aIDs );
     }
     return *pHelper;
@@ -3307,9 +3474,9 @@ uno::Reference< beans::XPropertySetInfo > UnoControlTimeFieldModel::getPropertyS
 
 
 
-//  ----------------------------------------------------
-//  class UnoTimeFieldControl
-//  ----------------------------------------------------
+//	----------------------------------------------------
+//	class UnoTimeFieldControl
+//	----------------------------------------------------
 UnoTimeFieldControl::UnoTimeFieldControl()
 {
     mnFirst = Time( 0, 0 ).GetTime();
@@ -3461,9 +3628,9 @@ sal_Bool UnoTimeFieldControl::isStrictFormat() throw(uno::RuntimeException)
     return ImplGetPropertyValue_BOOL( BASEPROPERTY_STRICTFORMAT );
 }
 
-//  ----------------------------------------------------
-//  class UnoControlNumericFieldModel
-//  ----------------------------------------------------
+//	----------------------------------------------------
+//	class UnoControlNumericFieldModel
+//	----------------------------------------------------
 UnoControlNumericFieldModel::UnoControlNumericFieldModel()
 {
     UNO_CONTROL_MODEL_REGISTER_PROPERTIES( VCLXNumericField );
@@ -3491,7 +3658,7 @@ uno::Any UnoControlNumericFieldModel::ImplGetDefaultValue( sal_uInt16 nPropId )
     static UnoPropertyArrayHelper* pHelper = NULL;
     if ( !pHelper )
     {
-        uno::Sequence<sal_Int32>    aIDs = ImplGetPropertyIds();
+        uno::Sequence<sal_Int32>	aIDs = ImplGetPropertyIds();
         pHelper = new UnoPropertyArrayHelper( aIDs );
     }
     return *pHelper;
@@ -3506,9 +3673,9 @@ uno::Reference< beans::XPropertySetInfo > UnoControlNumericFieldModel::getProper
 
 
 
-//  ----------------------------------------------------
-//  class UnoNumericFieldControl
-//  ----------------------------------------------------
+//	----------------------------------------------------
+//	class UnoNumericFieldControl
+//	----------------------------------------------------
 UnoNumericFieldControl::UnoNumericFieldControl()
 {
     mnFirst = 0;
@@ -3657,9 +3824,9 @@ sal_Int16 UnoNumericFieldControl::getDecimalDigits() throw(uno::RuntimeException
     return ImplGetPropertyValue_INT16( BASEPROPERTY_DECIMALACCURACY );
 }
 
-//  ----------------------------------------------------
-//  class UnoControlCurrencyFieldModel
-//  ----------------------------------------------------
+//	----------------------------------------------------
+//	class UnoControlCurrencyFieldModel
+//	----------------------------------------------------
 UnoControlCurrencyFieldModel::UnoControlCurrencyFieldModel()
 {
     UNO_CONTROL_MODEL_REGISTER_PROPERTIES( VCLXCurrencyField );
@@ -3693,7 +3860,7 @@ uno::Any UnoControlCurrencyFieldModel::ImplGetDefaultValue( sal_uInt16 nPropId )
     static UnoPropertyArrayHelper* pHelper = NULL;
     if ( !pHelper )
     {
-        uno::Sequence<sal_Int32>    aIDs = ImplGetPropertyIds();
+        uno::Sequence<sal_Int32>	aIDs = ImplGetPropertyIds();
         pHelper = new UnoPropertyArrayHelper( aIDs );
     }
     return *pHelper;
@@ -3706,9 +3873,9 @@ uno::Reference< beans::XPropertySetInfo > UnoControlCurrencyFieldModel::getPrope
     return xInfo;
 }
 
-//  ----------------------------------------------------
-//  class UnoCurrencyFieldControl
-//  ----------------------------------------------------
+//	----------------------------------------------------
+//	class UnoCurrencyFieldControl
+//	----------------------------------------------------
 UnoCurrencyFieldControl::UnoCurrencyFieldControl()
 {
     mnFirst = 0;
@@ -3856,9 +4023,9 @@ sal_Int16 UnoCurrencyFieldControl::getDecimalDigits() throw(uno::RuntimeExceptio
     return ImplGetPropertyValue_INT16( BASEPROPERTY_DECIMALACCURACY );
 }
 
-//  ----------------------------------------------------
-//  class UnoControlPatternFieldModel
-//  ----------------------------------------------------
+//	----------------------------------------------------
+//	class UnoControlPatternFieldModel
+//	----------------------------------------------------
 UnoControlPatternFieldModel::UnoControlPatternFieldModel()
 {
     UNO_CONTROL_MODEL_REGISTER_PROPERTIES( VCLXPatternField );
@@ -3885,7 +4052,7 @@ uno::Any UnoControlPatternFieldModel::ImplGetDefaultValue( sal_uInt16 nPropId )
     static UnoPropertyArrayHelper* pHelper = NULL;
     if ( !pHelper )
     {
-        uno::Sequence<sal_Int32>    aIDs = ImplGetPropertyIds();
+        uno::Sequence<sal_Int32>	aIDs = ImplGetPropertyIds();
         pHelper = new UnoPropertyArrayHelper( aIDs );
     }
     return *pHelper;
@@ -3899,9 +4066,9 @@ uno::Reference< beans::XPropertySetInfo > UnoControlPatternFieldModel::getProper
 }
 
 
-//  ----------------------------------------------------
-//  class UnoPatternFieldControl
-//  ----------------------------------------------------
+//	----------------------------------------------------
+//	class UnoPatternFieldControl
+//	----------------------------------------------------
 UnoPatternFieldControl::UnoPatternFieldControl()
 {
 }
@@ -3988,9 +4155,9 @@ sal_Bool UnoPatternFieldControl::isStrictFormat() throw(uno::RuntimeException)
 }
 
 
-//  ----------------------------------------------------
-//  class UnoControlProgressBarModel
-//  ----------------------------------------------------
+//	----------------------------------------------------
+//	class UnoControlProgressBarModel
+//	----------------------------------------------------
 UnoControlProgressBarModel::UnoControlProgressBarModel()
 {
     ImplRegisterProperty( BASEPROPERTY_BACKGROUNDCOLOR );
@@ -4030,7 +4197,7 @@ uno::Any UnoControlProgressBarModel::ImplGetDefaultValue( sal_uInt16 nPropId ) c
     static UnoPropertyArrayHelper* pHelper = NULL;
     if ( !pHelper )
     {
-        uno::Sequence<sal_Int32>    aIDs = ImplGetPropertyIds();
+        uno::Sequence<sal_Int32>	aIDs = ImplGetPropertyIds();
         pHelper = new UnoPropertyArrayHelper( aIDs );
     }
     return *pHelper;
@@ -4044,9 +4211,9 @@ uno::Reference< beans::XPropertySetInfo > UnoControlProgressBarModel::getPropert
 }
 
 
-//  ----------------------------------------------------
-//  class UnoProgressBarControl
-//  ----------------------------------------------------
+//	----------------------------------------------------
+//	class UnoProgressBarControl
+//	----------------------------------------------------
 UnoProgressBarControl::UnoProgressBarControl()
 {
 }
@@ -4120,9 +4287,9 @@ sal_Int32 UnoProgressBarControl::getValue() throw(::com::sun::star::uno::Runtime
 }
 
 
-//  ----------------------------------------------------
-//  class UnoControlFixedLineModel
-//  ----------------------------------------------------
+//	----------------------------------------------------
+//	class UnoControlFixedLineModel
+//	----------------------------------------------------
 UnoControlFixedLineModel::UnoControlFixedLineModel()
 {
     ImplRegisterProperty( BASEPROPERTY_BACKGROUNDCOLOR );
@@ -4158,7 +4325,7 @@ uno::Any UnoControlFixedLineModel::ImplGetDefaultValue( sal_uInt16 nPropId ) con
     static UnoPropertyArrayHelper* pHelper = NULL;
     if ( !pHelper )
     {
-        uno::Sequence<sal_Int32>    aIDs = ImplGetPropertyIds();
+        uno::Sequence<sal_Int32>	aIDs = ImplGetPropertyIds();
         pHelper = new UnoPropertyArrayHelper( aIDs );
     }
     return *pHelper;
@@ -4171,13 +4338,13 @@ uno::Reference< beans::XPropertySetInfo > UnoControlFixedLineModel::getPropertyS
     return xInfo;
 }
 
-//  ----------------------------------------------------
-//  class UnoFixedLineControl
-//  ----------------------------------------------------
+//	----------------------------------------------------
+//	class UnoFixedLineControl
+//	----------------------------------------------------
 UnoFixedLineControl::UnoFixedLineControl()
 {
-    maComponentInfos.nWidth = 100;      // ??
-    maComponentInfos.nHeight = 100;     // ??
+    maComponentInfos.nWidth = 100;		// ??
+    maComponentInfos.nHeight = 100;		// ??
 }
 
 ::rtl::OUString UnoFixedLineControl::GetComponentServiceName()
diff --git a/toolkit/source/helper/accessibilityclient.cxx b/toolkit/source/helper/accessibilityclient.cxx
index ba466ac6959d..2745b3177f5a 100644
--- a/toolkit/source/helper/accessibilityclient.cxx
+++ b/toolkit/source/helper/accessibilityclient.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
diff --git a/toolkit/source/helper/externallock.cxx b/toolkit/source/helper/externallock.cxx
index c0eb2427936f..26270f8cc2de 100644
--- a/toolkit/source/helper/externallock.cxx
+++ b/toolkit/source/helper/externallock.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
@@ -32,7 +32,7 @@
 #include <vcl/svapp.hxx>
 
 // -----------------------------------------------------------------------------
-//  class VCLExternalSolarLock
+//	class VCLExternalSolarLock
 // -----------------------------------------------------------------------------
 void VCLExternalSolarLock::acquire()
 {
diff --git a/toolkit/source/helper/fixedhyperbase.cxx b/toolkit/source/helper/fixedhyperbase.cxx
index d6c22e936116..f62cfeef2abc 100644
--- a/toolkit/source/helper/fixedhyperbase.cxx
+++ b/toolkit/source/helper/fixedhyperbase.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
@@ -37,7 +37,7 @@ namespace toolkit
 
 //  ----------------------------------------------------
 //  class FixedHyperlinkBase
-//  ----------------------------------------------------
+//	----------------------------------------------------
 
 FixedHyperlinkBase::FixedHyperlinkBase( Window* pParent, const ResId& rId ) :
     FixedText( pParent, rId )
diff --git a/toolkit/source/helper/formpdfexport.cxx b/toolkit/source/helper/formpdfexport.cxx
index bff2d6008d10..e519fb8f2bee 100644
--- a/toolkit/source/helper/formpdfexport.cxx
+++ b/toolkit/source/helper/formpdfexport.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
@@ -454,7 +454,7 @@ namespace toolkitform
                 OSL_VERIFY( xModelProps->getPropertyValue( FM_PROP_FONT ) >>= aUNOFont );
                 _rpDescriptor->TextFont = VCLUnoHelper::CreateFont( aUNOFont, Font() );
             }
-
+            
             // tab order
             rtl::OUString aTabIndexString( RTL_CONSTASCII_USTRINGPARAM( "TabIndex" ) );
             if ( xPSI->hasPropertyByName( aTabIndexString ) )
@@ -592,7 +592,7 @@ namespace toolkitform
                 // since we explicitly list the entries in the order in which they appear, they should not be
                 // resorted by the PDF viewer
                 pListWidget->Sort = false;
-
+                
                 // get selected items
                 Sequence< sal_Int16 > aSelectIndices;
                 OSL_VERIFY( xModelProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "SelectedItems" ) ) ) >>= aSelectIndices );
diff --git a/toolkit/source/helper/imagealign.cxx b/toolkit/source/helper/imagealign.cxx
index c5e8781d478b..97c3e572d948 100644
--- a/toolkit/source/helper/imagealign.cxx
+++ b/toolkit/source/helper/imagealign.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
diff --git a/toolkit/source/helper/listenermultiplexer.cxx b/toolkit/source/helper/listenermultiplexer.cxx
index 9b8df60521ae..541150e59345 100644
--- a/toolkit/source/helper/listenermultiplexer.cxx
+++ b/toolkit/source/helper/listenermultiplexer.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
@@ -31,9 +31,9 @@
 #include <toolkit/helper/listenermultiplexer.hxx>
 #include <com/sun/star/lang/DisposedException.hpp>
 
-//  ----------------------------------------------------
-//  class ListenerMultiplexerBase
-//  ----------------------------------------------------
+//	----------------------------------------------------
+//	class ListenerMultiplexerBase
+//	----------------------------------------------------
 ListenerMultiplexerBase::ListenerMultiplexerBase( ::cppu::OWeakObject& rSource )
     : ::cppu::OInterfaceContainerHelper( GetMutex() ), mrContext( rSource )
 {
@@ -50,9 +50,9 @@ ListenerMultiplexerBase::~ListenerMultiplexerBase()
 }
 
 
-//  ----------------------------------------------------
-//  class EventListenerMultiplexer
-//  ----------------------------------------------------
+//	----------------------------------------------------
+//	class EventListenerMultiplexer
+//	----------------------------------------------------
 EventListenerMultiplexer::EventListenerMultiplexer( ::cppu::OWeakObject& rSource )
     : ListenerMultiplexerBase( rSource )
 {
@@ -71,61 +71,61 @@ void EventListenerMultiplexer::disposing( const ::com::sun::star::lang::EventObj
 {
 }
 
-//  ----------------------------------------------------
-//  class FocusListenerMultiplexer
-//  ----------------------------------------------------
+//	----------------------------------------------------
+//	class FocusListenerMultiplexer
+//	----------------------------------------------------
 IMPL_LISTENERMULTIPLEXER_BASEMETHODS( FocusListenerMultiplexer, ::com::sun::star::awt::XFocusListener )
 IMPL_LISTENERMULTIPLEXER_LISTENERMETHOD( FocusListenerMultiplexer, ::com::sun::star::awt::XFocusListener, focusGained, ::com::sun::star::awt::FocusEvent )
 IMPL_LISTENERMULTIPLEXER_LISTENERMETHOD( FocusListenerMultiplexer, ::com::sun::star::awt::XFocusListener, focusLost, ::com::sun::star::awt::FocusEvent )
 
-//  ----------------------------------------------------
-//  class WindowListenerMultiplexer
-//  ----------------------------------------------------
+//	----------------------------------------------------
+//	class WindowListenerMultiplexer
+//	----------------------------------------------------
 IMPL_LISTENERMULTIPLEXER_BASEMETHODS( WindowListenerMultiplexer, ::com::sun::star::awt::XWindowListener )
 IMPL_LISTENERMULTIPLEXER_LISTENERMETHOD( WindowListenerMultiplexer, ::com::sun::star::awt::XWindowListener, windowResized, ::com::sun::star::awt::WindowEvent )
 IMPL_LISTENERMULTIPLEXER_LISTENERMETHOD( WindowListenerMultiplexer, ::com::sun::star::awt::XWindowListener, windowMoved, ::com::sun::star::awt::WindowEvent )
 IMPL_LISTENERMULTIPLEXER_LISTENERMETHOD( WindowListenerMultiplexer, ::com::sun::star::awt::XWindowListener, windowShown, ::com::sun::star::lang::EventObject )
 IMPL_LISTENERMULTIPLEXER_LISTENERMETHOD( WindowListenerMultiplexer, ::com::sun::star::awt::XWindowListener, windowHidden, ::com::sun::star::lang::EventObject )
 
-//  ----------------------------------------------------
-//  class VclContainerListenerMultiplexer
-//  ----------------------------------------------------
+//	----------------------------------------------------
+//	class VclContainerListenerMultiplexer
+//	----------------------------------------------------
 IMPL_LISTENERMULTIPLEXER_BASEMETHODS( VclContainerListenerMultiplexer, ::com::sun::star::awt::XVclContainerListener )
 IMPL_LISTENERMULTIPLEXER_LISTENERMETHOD( VclContainerListenerMultiplexer, ::com::sun::star::awt::XVclContainerListener, windowAdded, ::com::sun::star::awt::VclContainerEvent )
 IMPL_LISTENERMULTIPLEXER_LISTENERMETHOD( VclContainerListenerMultiplexer, ::com::sun::star::awt::XVclContainerListener, windowRemoved, ::com::sun::star::awt::VclContainerEvent )
 
-//  ----------------------------------------------------
-//  class KeyListenerMultiplexer
-//  ----------------------------------------------------
+//	----------------------------------------------------
+//	class KeyListenerMultiplexer
+//	----------------------------------------------------
 IMPL_LISTENERMULTIPLEXER_BASEMETHODS( KeyListenerMultiplexer, ::com::sun::star::awt::XKeyListener )
 IMPL_LISTENERMULTIPLEXER_LISTENERMETHOD( KeyListenerMultiplexer, ::com::sun::star::awt::XKeyListener, keyPressed, ::com::sun::star::awt::KeyEvent )
 IMPL_LISTENERMULTIPLEXER_LISTENERMETHOD( KeyListenerMultiplexer, ::com::sun::star::awt::XKeyListener, keyReleased, ::com::sun::star::awt::KeyEvent )
 
-//  ----------------------------------------------------
-//  class MouseListenerMultiplexer
-//  ----------------------------------------------------
+//	----------------------------------------------------
+//	class MouseListenerMultiplexer
+//	----------------------------------------------------
 IMPL_LISTENERMULTIPLEXER_BASEMETHODS( MouseListenerMultiplexer, ::com::sun::star::awt::XMouseListener )
 IMPL_LISTENERMULTIPLEXER_LISTENERMETHOD( MouseListenerMultiplexer, ::com::sun::star::awt::XMouseListener, mousePressed, ::com::sun::star::awt::MouseEvent )
 IMPL_LISTENERMULTIPLEXER_LISTENERMETHOD( MouseListenerMultiplexer, ::com::sun::star::awt::XMouseListener, mouseReleased, ::com::sun::star::awt::MouseEvent )
 IMPL_LISTENERMULTIPLEXER_LISTENERMETHOD( MouseListenerMultiplexer, ::com::sun::star::awt::XMouseListener, mouseEntered, ::com::sun::star::awt::MouseEvent )
 IMPL_LISTENERMULTIPLEXER_LISTENERMETHOD( MouseListenerMultiplexer, ::com::sun::star::awt::XMouseListener, mouseExited, ::com::sun::star::awt::MouseEvent )
 
-//  ----------------------------------------------------
-//  class MouseMotionListenerMultiplexer
-//  ----------------------------------------------------
+//	----------------------------------------------------
+//	class MouseMotionListenerMultiplexer
+//	----------------------------------------------------
 IMPL_LISTENERMULTIPLEXER_BASEMETHODS( MouseMotionListenerMultiplexer, ::com::sun::star::awt::XMouseMotionListener )
 IMPL_LISTENERMULTIPLEXER_LISTENERMETHOD( MouseMotionListenerMultiplexer, ::com::sun::star::awt::XMouseMotionListener, mouseDragged, ::com::sun::star::awt::MouseEvent )
 IMPL_LISTENERMULTIPLEXER_LISTENERMETHOD( MouseMotionListenerMultiplexer, ::com::sun::star::awt::XMouseMotionListener, mouseMoved, ::com::sun::star::awt::MouseEvent )
 
-//  ----------------------------------------------------
-//  class PaintListenerMultiplexer
-//  ----------------------------------------------------
+//	----------------------------------------------------
+//	class PaintListenerMultiplexer
+//	----------------------------------------------------
 IMPL_LISTENERMULTIPLEXER_BASEMETHODS( PaintListenerMultiplexer, ::com::sun::star::awt::XPaintListener )
 IMPL_LISTENERMULTIPLEXER_LISTENERMETHOD( PaintListenerMultiplexer, ::com::sun::star::awt::XPaintListener, windowPaint, ::com::sun::star::awt::PaintEvent )
 
-//  ----------------------------------------------------
-//  class TopWindowListenerMultiplexer
-//  ----------------------------------------------------
+//	----------------------------------------------------
+//	class TopWindowListenerMultiplexer
+//	----------------------------------------------------
 IMPL_LISTENERMULTIPLEXER_BASEMETHODS( TopWindowListenerMultiplexer, ::com::sun::star::awt::XTopWindowListener )
 IMPL_LISTENERMULTIPLEXER_LISTENERMETHOD( TopWindowListenerMultiplexer, ::com::sun::star::awt::XTopWindowListener, windowOpened, ::com::sun::star::lang::EventObject )
 IMPL_LISTENERMULTIPLEXER_LISTENERMETHOD( TopWindowListenerMultiplexer, ::com::sun::star::awt::XTopWindowListener, windowClosing, ::com::sun::star::lang::EventObject )
@@ -135,65 +135,65 @@ IMPL_LISTENERMULTIPLEXER_LISTENERMETHOD( TopWindowListenerMultiplexer, ::com::su
 IMPL_LISTENERMULTIPLEXER_LISTENERMETHOD( TopWindowListenerMultiplexer, ::com::sun::star::awt::XTopWindowListener, windowActivated, ::com::sun::star::lang::EventObject )
 IMPL_LISTENERMULTIPLEXER_LISTENERMETHOD( TopWindowListenerMultiplexer, ::com::sun::star::awt::XTopWindowListener, windowDeactivated, ::com::sun::star::lang::EventObject )
 
-//  ----------------------------------------------------
-//  class TextListenerMultiplexer
-//  ----------------------------------------------------
+//	----------------------------------------------------
+//	class TextListenerMultiplexer
+//	----------------------------------------------------
 IMPL_LISTENERMULTIPLEXER_BASEMETHODS( TextListenerMultiplexer, ::com::sun::star::awt::XTextListener )
 IMPL_LISTENERMULTIPLEXER_LISTENERMETHOD( TextListenerMultiplexer, ::com::sun::star::awt::XTextListener, textChanged, ::com::sun::star::awt::TextEvent )
 
-//  ----------------------------------------------------
-//  class ActionListenerMultiplexer
-//  ----------------------------------------------------
+//	----------------------------------------------------
+//	class ActionListenerMultiplexer
+//	----------------------------------------------------
 IMPL_LISTENERMULTIPLEXER_BASEMETHODS( ActionListenerMultiplexer, ::com::sun::star::awt::XActionListener )
 IMPL_LISTENERMULTIPLEXER_LISTENERMETHOD( ActionListenerMultiplexer, ::com::sun::star::awt::XActionListener, actionPerformed, ::com::sun::star::awt::ActionEvent )
 
-//  ----------------------------------------------------
-//  class ItemListenerMultiplexer
-//  ----------------------------------------------------
+//	----------------------------------------------------
+//	class ItemListenerMultiplexer
+//	----------------------------------------------------
 IMPL_LISTENERMULTIPLEXER_BASEMETHODS( ItemListenerMultiplexer, ::com::sun::star::awt::XItemListener )
 IMPL_LISTENERMULTIPLEXER_LISTENERMETHOD( ItemListenerMultiplexer, ::com::sun::star::awt::XItemListener, itemStateChanged, ::com::sun::star::awt::ItemEvent )
 
-//  ----------------------------------------------------
-//  class ContainerListenerMultiplexer
-//  ----------------------------------------------------
+//	----------------------------------------------------
+//	class ContainerListenerMultiplexer
+//	----------------------------------------------------
 IMPL_LISTENERMULTIPLEXER_BASEMETHODS( ContainerListenerMultiplexer, ::com::sun::star::container::XContainerListener )
 IMPL_LISTENERMULTIPLEXER_LISTENERMETHOD( ContainerListenerMultiplexer, ::com::sun::star::container::XContainerListener, elementInserted, ::com::sun::star::container::ContainerEvent )
 IMPL_LISTENERMULTIPLEXER_LISTENERMETHOD( ContainerListenerMultiplexer, ::com::sun::star::container::XContainerListener, elementRemoved, ::com::sun::star::container::ContainerEvent )
 IMPL_LISTENERMULTIPLEXER_LISTENERMETHOD( ContainerListenerMultiplexer, ::com::sun::star::container::XContainerListener, elementReplaced, ::com::sun::star::container::ContainerEvent )
-
-//  ----------------------------------------------------
-//  class SpinListenerMultiplexer
-//  ----------------------------------------------------
+    
+//	----------------------------------------------------
+//	class SpinListenerMultiplexer
+//	----------------------------------------------------
 IMPL_LISTENERMULTIPLEXER_BASEMETHODS( SpinListenerMultiplexer, ::com::sun::star::awt::XSpinListener )
 IMPL_LISTENERMULTIPLEXER_LISTENERMETHOD( SpinListenerMultiplexer, ::com::sun::star::awt::XSpinListener, up, ::com::sun::star::awt::SpinEvent )
 IMPL_LISTENERMULTIPLEXER_LISTENERMETHOD( SpinListenerMultiplexer, ::com::sun::star::awt::XSpinListener, down, ::com::sun::star::awt::SpinEvent )
 IMPL_LISTENERMULTIPLEXER_LISTENERMETHOD( SpinListenerMultiplexer, ::com::sun::star::awt::XSpinListener, first, ::com::sun::star::awt::SpinEvent )
 IMPL_LISTENERMULTIPLEXER_LISTENERMETHOD( SpinListenerMultiplexer, ::com::sun::star::awt::XSpinListener, last, ::com::sun::star::awt::SpinEvent )
 
-//  ----------------------------------------------------
-//  class AdjustmentListenerMultiplexer
-//  ----------------------------------------------------
+//	----------------------------------------------------
+//	class AdjustmentListenerMultiplexer
+//	----------------------------------------------------
 IMPL_LISTENERMULTIPLEXER_BASEMETHODS( AdjustmentListenerMultiplexer, ::com::sun::star::awt::XAdjustmentListener )
 IMPL_LISTENERMULTIPLEXER_LISTENERMETHOD( AdjustmentListenerMultiplexer, ::com::sun::star::awt::XAdjustmentListener, adjustmentValueChanged, ::com::sun::star::awt::AdjustmentEvent )
 
-//  ----------------------------------------------------
-//  class MenuListenerMultiplexer
-//  ----------------------------------------------------
+//	----------------------------------------------------
+//	class MenuListenerMultiplexer
+//	----------------------------------------------------
 IMPL_LISTENERMULTIPLEXER_BASEMETHODS( MenuListenerMultiplexer, ::com::sun::star::awt::XMenuListener )
 IMPL_LISTENERMULTIPLEXER_LISTENERMETHOD( MenuListenerMultiplexer, ::com::sun::star::awt::XMenuListener, highlight, ::com::sun::star::awt::MenuEvent )
 IMPL_LISTENERMULTIPLEXER_LISTENERMETHOD( MenuListenerMultiplexer, ::com::sun::star::awt::XMenuListener, select, ::com::sun::star::awt::MenuEvent )
 IMPL_LISTENERMULTIPLEXER_LISTENERMETHOD( MenuListenerMultiplexer, ::com::sun::star::awt::XMenuListener, activate, ::com::sun::star::awt::MenuEvent )
 IMPL_LISTENERMULTIPLEXER_LISTENERMETHOD( MenuListenerMultiplexer, ::com::sun::star::awt::XMenuListener, deactivate, ::com::sun::star::awt::MenuEvent )
 
-//  ----------------------------------------------------
-//  class TreeSelectionListenerMultiplexer
-//  ----------------------------------------------------
+//	----------------------------------------------------
+//	class TreeSelectionListenerMultiplexer
+//	----------------------------------------------------
 IMPL_LISTENERMULTIPLEXER_BASEMETHODS( TreeSelectionListenerMultiplexer, ::com::sun::star::view::XSelectionChangeListener )
 IMPL_LISTENERMULTIPLEXER_LISTENERMETHOD( TreeSelectionListenerMultiplexer, ::com::sun::star::view::XSelectionChangeListener, selectionChanged,  ::com::sun::star::lang::EventObject )
 
-//  ----------------------------------------------------
-//  class TreeSelectionListenerMultiplexer
-//  ----------------------------------------------------
+//	----------------------------------------------------
+//	class TreeSelectionListenerMultiplexer
+//	----------------------------------------------------
 IMPL_LISTENERMULTIPLEXER_BASEMETHODS( TreeExpansionListenerMultiplexer, ::com::sun::star::awt::tree::XTreeExpansionListener )
 IMPL_LISTENERMULTIPLEXER_LISTENERMETHOD( TreeExpansionListenerMultiplexer, ::com::sun::star::awt::tree::XTreeExpansionListener, requestChildNodes, ::com::sun::star::awt::tree::TreeExpansionEvent )
 IMPL_LISTENERMULTIPLEXER_LISTENERMETHOD_EXCEPTION( TreeExpansionListenerMultiplexer, ::com::sun::star::awt::tree::XTreeExpansionListener, treeExpanding, ::com::sun::star::awt::tree::TreeExpansionEvent, ::com::sun::star::awt::tree::ExpandVetoException )
@@ -201,13 +201,13 @@ IMPL_LISTENERMULTIPLEXER_LISTENERMETHOD_EXCEPTION( TreeExpansionListenerMultiple
 IMPL_LISTENERMULTIPLEXER_LISTENERMETHOD( TreeExpansionListenerMultiplexer, ::com::sun::star::awt::tree::XTreeExpansionListener, treeExpanded, ::com::sun::star::awt::tree::TreeExpansionEvent )
 IMPL_LISTENERMULTIPLEXER_LISTENERMETHOD( TreeExpansionListenerMultiplexer, ::com::sun::star::awt::tree::XTreeExpansionListener, treeCollapsed, ::com::sun::star::awt::tree::TreeExpansionEvent )
 
-//  ----------------------------------------------------
-//  class TreeEditListenerMultiplexer
-//  ----------------------------------------------------
+//	----------------------------------------------------
+//	class TreeEditListenerMultiplexer
+//	----------------------------------------------------
 IMPL_LISTENERMULTIPLEXER_BASEMETHODS( TreeEditListenerMultiplexer, ::com::sun::star::awt::tree::XTreeEditListener )
 
-//  ----------------------------------------------------
-//  class SelectionListenerMultiplexer
-//  ----------------------------------------------------
+//	----------------------------------------------------
+//	class SelectionListenerMultiplexer
+//	----------------------------------------------------
 IMPL_LISTENERMULTIPLEXER_BASEMETHODS( SelectionListenerMultiplexer, ::com::sun::star::awt::grid::XGridSelectionListener )
 IMPL_LISTENERMULTIPLEXER_LISTENERMETHOD( SelectionListenerMultiplexer, ::com::sun::star::awt::grid::XGridSelectionListener, selectionChanged, ::com::sun::star::awt::grid::GridSelectionEvent )
diff --git a/toolkit/source/helper/property.cxx b/toolkit/source/helper/property.cxx
index 3a83465a3218..b6d47ff27a47 100644
--- a/toolkit/source/helper/property.cxx
+++ b/toolkit/source/helper/property.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
@@ -33,7 +33,7 @@
 #include <toolkit/helper/macros.hxx>
 #include <osl/mutex.hxx>
 
-#include <stdlib.h> // qsort/bsearch
+#include <stdlib.h>	// qsort/bsearch
 #include <tools/debug.hxx>
 #include <com/sun/star/awt/FontWeight.hpp>
 #include <com/sun/star/awt/FontSlant.hpp>
@@ -69,11 +69,11 @@ using ::com::sun::star::style::VerticalAlignment;
 
 struct ImplPropertyInfo
 {
-    ::rtl::OUString                 aName;
-    sal_uInt16                      nPropId;
-    ::com::sun::star::uno::Type     aType;
-    sal_Int16                       nAttribs;
-    sal_Bool                        bDependsOnOthers;   // eg. VALUE depends on MIN/MAX and must be set after MIN/MAX.
+    ::rtl::OUString					aName;
+    sal_uInt16						nPropId;
+    ::com::sun::star::uno::Type		aType;
+    sal_Int16 						nAttribs;
+    sal_Bool						bDependsOnOthers;	// eg. VALUE depends on MIN/MAX and must be set after MIN/MAX.
 
     ImplPropertyInfo()
      {
@@ -206,7 +206,7 @@ ImplPropertyInfo* ImplGetPropertyInfos( sal_uInt16& rElementCount )
             DECL_PROP_2     ( "MultiSelection",         MULTISELECTION,     bool,               BOUND, MAYBEDEFAULT ),
             DECL_PROP_2     ( "MultiSelectionSimpleMode",   MULTISELECTION_SIMPLEMODE,    bool, BOUND, MAYBEDEFAULT ),
             DECL_PROP_2     ( "NativeWidgetLook",       NATIVE_WIDGET_LOOK, bool,               BOUND, MAYBEDEFAULT ),
-            DECL_PROP_2     ( "NoLabel",                NOLABEL,            bool,               BOUND, MAYBEDEFAULT ),
+            DECL_PROP_2	    ( "NoLabel",                NOLABEL,            bool,               BOUND, MAYBEDEFAULT ),
             DECL_PROP_2     ( "Orientation",            ORIENTATION,        sal_Int32,          BOUND, MAYBEDEFAULT ),
             DECL_PROP_2     ( "PaintTransparent",       PAINTTRANSPARENT,   bool,               BOUND, MAYBEDEFAULT ),
             DECL_PROP_2     ( "PluginParent",           PLUGINPARENT,       sal_Int64,          BOUND, MAYBEDEFAULT ),
@@ -265,29 +265,29 @@ ImplPropertyInfo* ImplGetPropertyInfos( sal_uInt16& rElementCount )
             DECL_PROP_2     ( "StepTime",               STEP_TIME,              sal_Int32,      BOUND, MAYBEDEFAULT ),
             DECL_PROP_2     ( "Decoration",             DECORATION,             sal_Bool,       BOUND, MAYBEDEFAULT ),
 
-            DECL_PROP_2     ( "SelectionType",          TREE_SELECTIONTYPE,     ::com::sun::star::view::SelectionType,      BOUND, MAYBEDEFAULT ),
-            DECL_PROP_2     ( "Editable",               TREE_EDITABLE,          sal_Bool,       BOUND, MAYBEDEFAULT ),
-            DECL_PROP_3     ( "DataModel",              TREE_DATAMODEL,         Reference< ::com::sun::star::awt::tree::XTreeDataModel >,       BOUND, MAYBEDEFAULT, MAYBEVOID ),
-            DECL_PROP_2     ( "RootDisplayed",          TREE_ROOTDISPLAYED,     sal_Bool,           BOUND, MAYBEDEFAULT ),
-            DECL_PROP_2     ( "ShowsHandles",           TREE_SHOWSHANDLES,      sal_Bool,           BOUND, MAYBEDEFAULT ),
-            DECL_PROP_2     ( "ShowsRootHandles",       TREE_SHOWSROOTHANDLES,  sal_Bool,           BOUND, MAYBEDEFAULT ),
-            DECL_PROP_3     ( "RowHeight",              TREE_ROWHEIGHT,         sal_Int32,          BOUND, MAYBEDEFAULT, MAYBEVOID ),
-            DECL_PROP_2     ( "InvokesStopNodeEditing", TREE_INVOKESSTOPNODEEDITING, sal_Bool,      BOUND, MAYBEDEFAULT ),
+            DECL_PROP_2		( "SelectionType",			TREE_SELECTIONTYPE,		::com::sun::star::view::SelectionType,		BOUND, MAYBEDEFAULT ),
+            DECL_PROP_2		( "Editable",				TREE_EDITABLE,			sal_Bool,		BOUND, MAYBEDEFAULT ),
+            DECL_PROP_3		( "DataModel",				TREE_DATAMODEL,			Reference< ::com::sun::star::awt::tree::XTreeDataModel >,		BOUND, MAYBEDEFAULT, MAYBEVOID ),
+            DECL_PROP_2		( "RootDisplayed",			TREE_ROOTDISPLAYED,		sal_Bool,			BOUND, MAYBEDEFAULT ),
+            DECL_PROP_2		( "ShowsHandles",			TREE_SHOWSHANDLES,		sal_Bool,			BOUND, MAYBEDEFAULT ),
+            DECL_PROP_2		( "ShowsRootHandles",		TREE_SHOWSROOTHANDLES,	sal_Bool,			BOUND, MAYBEDEFAULT ),
+            DECL_PROP_3		( "RowHeight",				TREE_ROWHEIGHT,			sal_Int32,			BOUND, MAYBEDEFAULT, MAYBEVOID ),
+            DECL_PROP_2		( "InvokesStopNodeEditing",	TREE_INVOKESSTOPNODEEDITING, sal_Bool,		BOUND, MAYBEDEFAULT ),
             DECL_PROP_2     ( "DialogSourceURL",        DIALOGSOURCEURL,        ::rtl::OUString,    BOUND, MAYBEDEFAULT ),
             DECL_PROP_2     ( "URL",                    URL,                    ::rtl::OUString,    BOUND, MAYBEDEFAULT ),
             DECL_PROP_2     ( "WritingMode",            WRITING_MODE,           sal_Int16,          BOUND, MAYBEDEFAULT ),
             DECL_PROP_3     ( "ContextWritingMode",     CONTEXT_WRITING_MODE,   sal_Int16,          BOUND, MAYBEDEFAULT, TRANSIENT ),
-            DECL_PROP_2     ( "ShowRowHeader",          GRID_SHOWROWHEADER,     sal_Bool,          BOUND, MAYBEDEFAULT ),
-            DECL_PROP_2     ( "ShowColumnHeader",       GRID_SHOWCOLUMNHEADER,  sal_Bool,          BOUND, MAYBEDEFAULT ),
-            DECL_PROP_3     ( "GridDataModel",          GRID_DATAMODEL,         Reference< ::com::sun::star::awt::grid::XGridDataModel >,          BOUND, MAYBEDEFAULT, MAYBEVOID ),
-            DECL_PROP_3     ( "ColumnModel",            GRID_COLUMNMODEL,       Reference< ::com::sun::star::awt::grid::XGridColumnModel >,          BOUND, MAYBEDEFAULT, MAYBEVOID ),
-            DECL_PROP_3     ( "SelectionModel",         GRID_SELECTIONMODE,     ::com::sun::star::view::SelectionType,          BOUND, MAYBEDEFAULT, MAYBEVOID ),
+            DECL_PROP_2     ( "ShowRowHeader",			GRID_SHOWROWHEADER,     sal_Bool,          BOUND, MAYBEDEFAULT ),
+            DECL_PROP_2     ( "ShowColumnHeader",		GRID_SHOWCOLUMNHEADER,  sal_Bool,          BOUND, MAYBEDEFAULT ),
+            DECL_PROP_3     ( "GridDataModel",		    GRID_DATAMODEL,         Reference< ::com::sun::star::awt::grid::XGridDataModel >,          BOUND, MAYBEDEFAULT, MAYBEVOID ),
+            DECL_PROP_3     ( "ColumnModel",		    GRID_COLUMNMODEL,       Reference< ::com::sun::star::awt::grid::XGridColumnModel >,          BOUND, MAYBEDEFAULT, MAYBEVOID ),
+            DECL_PROP_3     ( "SelectionModel",		    GRID_SELECTIONMODE,     ::com::sun::star::view::SelectionType,          BOUND, MAYBEDEFAULT, MAYBEVOID ),
             DECL_PROP_2     ( "EnableVisible",          ENABLEVISIBLE,          sal_Bool,           BOUND, MAYBEDEFAULT ),
             DECL_PROP_3     ( "ReferenceDevice",        REFERENCE_DEVICE,       Reference< XDevice >,BOUND, MAYBEDEFAULT, TRANSIENT ),
             DECL_PROP_3     ( "EvenRowBackgroundColor", GRID_EVEN_ROW_BACKGROUND, sal_Int32,      BOUND, MAYBEDEFAULT, MAYBEVOID ),
             DECL_PROP_3     ( "HeaderBackgroundColor",  GRID_HEADER_BACKGROUND,  sal_Int32,      BOUND, MAYBEDEFAULT, MAYBEVOID ),
             DECL_PROP_3     ( "GridLineColor",          GRID_LINE_COLOR,         sal_Int32,      BOUND, MAYBEDEFAULT, MAYBEVOID ),
-            DECL_PROP_3     ( "RowBackgroundColor",     GRID_ROW_BACKGROUND,     sal_Int32,      BOUND, MAYBEDEFAULT, MAYBEVOID )
+            DECL_PROP_3     ( "RowBackgroundColor",     GRID_ROW_BACKGROUND,     sal_Int32,      BOUND, MAYBEDEFAULT, MAYBEVOID )		
     };
             pPropertyInfos = aImplPropertyInfos;
             nElements = sizeof( aImplPropertyInfos ) / sizeof( ImplPropertyInfo );
@@ -300,15 +300,15 @@ ImplPropertyInfo* ImplGetPropertyInfos( sal_uInt16& rElementCount )
 
 struct ImplPropertyInfoCompareFunctor : ::std::binary_function<ImplPropertyInfo,::rtl::OUString,bool>
 {
-    inline bool operator()(const ImplPropertyInfo& lhs,const ImplPropertyInfo& rhs) const
+    inline bool operator()(const ImplPropertyInfo& lhs,const ImplPropertyInfo& rhs)	const
     {
         return lhs.aName.compareTo(rhs.aName) < 0;
     }
-    inline bool operator()(const ImplPropertyInfo& lhs,const ::rtl::OUString& rhs)  const
+    inline bool operator()(const ImplPropertyInfo& lhs,const ::rtl::OUString& rhs)	const
     {
         return lhs.aName.compareTo(rhs) < 0;
     }
-    inline bool operator()(const ::rtl::OUString& lhs,const ImplPropertyInfo& rhs)  const
+    inline bool operator()(const ::rtl::OUString& lhs,const ImplPropertyInfo& rhs)	const
     {
         return lhs.compareTo(rhs.aName) < 0;
     }
diff --git a/toolkit/source/helper/registerservices.cxx b/toolkit/source/helper/registerservices.cxx
index aedf4024f2b9..424f9b2a76ae 100644
--- a/toolkit/source/helper/registerservices.cxx
+++ b/toolkit/source/helper/registerservices.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
diff --git a/toolkit/source/helper/servicenames.cxx b/toolkit/source/helper/servicenames.cxx
index f57f52f13e57..184f4bed7811 100644
--- a/toolkit/source/helper/servicenames.cxx
+++ b/toolkit/source/helper/servicenames.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
diff --git a/toolkit/source/helper/throbberimpl.cxx b/toolkit/source/helper/throbberimpl.cxx
index 7a8e260ab4b8..7587c9994e7e 100644
--- a/toolkit/source/helper/throbberimpl.cxx
+++ b/toolkit/source/helper/throbberimpl.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
@@ -64,7 +64,7 @@ namespace toolkit
         mnCurStep = 0;
         maWaitTimer.Start();
     }
-
+    
     //--------------------------------------------------------------------
     void Throbber_Impl::stop() throw ( uno::RuntimeException )
     {
diff --git a/toolkit/source/helper/tkresmgr.cxx b/toolkit/source/helper/tkresmgr.cxx
index 4e1e4153daf1..9cbfd05cc891 100644
--- a/toolkit/source/helper/tkresmgr.cxx
+++ b/toolkit/source/helper/tkresmgr.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
diff --git a/toolkit/source/helper/unomemorystream.cxx b/toolkit/source/helper/unomemorystream.cxx
index b07cee100406..46df92997872 100644
--- a/toolkit/source/helper/unomemorystream.cxx
+++ b/toolkit/source/helper/unomemorystream.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
@@ -32,9 +32,9 @@
 #include <toolkit/helper/unomemorystream.hxx>
 #include <algorithm>
 
-//  ----------------------------------------------------
-//  class UnoMemoryStream
-//  ----------------------------------------------------
+//	----------------------------------------------------
+//	class UnoMemoryStream
+//	----------------------------------------------------
 UnoMemoryStream::UnoMemoryStream( sal_uInt32 nInitSize, sal_uInt32 nInitResize )
     : SvMemoryStream( nInitSize, nInitResize )
 {
@@ -48,7 +48,7 @@ UnoMemoryStream::UnoMemoryStream( sal_uInt32 nInitSize, sal_uInt32 nInitResize )
     return (aRet.hasValue() ? aRet : OWeakObject::queryInterface( rType ));
 }
 
-
+    
 // ::com::sun::star::io::XInputStream
 sal_Int32 UnoMemoryStream::readBytes( ::com::sun::star::uno::Sequence< sal_Int8 >& rData, sal_Int32 nBytesToRead ) throw(::com::sun::star::io::NotConnectedException, ::com::sun::star::io::BufferSizeExceededException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException)
 {
@@ -57,10 +57,10 @@ sal_Int32 UnoMemoryStream::readBytes( ::com::sun::star::uno::Sequence< sal_Int8
     sal_Int32 nRead = available();
     if ( nRead > nBytesToRead )
         nRead = nBytesToRead;
-
+    
     rData = ::com::sun::star::uno::Sequence< sal_Int8 >( nRead );
     Read( rData.getArray(), nRead );
-
+    
     return nRead;
 }
 
@@ -69,14 +69,14 @@ sal_Int32 UnoMemoryStream::readSomeBytes( ::com::sun::star::uno::Sequence< sal_I
     ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() );
 
     sal_Int32 nAvailable = available();
-    if( nAvailable )
+    if( nAvailable ) 
     {
         return readBytes( rData, std::min( nMaxBytesToRead , nAvailable ) );
     }
-    else
+    else 
     {
         // Not the most effective method, but it sticks to the specification
-        return readBytes( rData, 1 );
+        return readBytes( rData, 1 );	
     }
 }
 
@@ -99,7 +99,7 @@ sal_Int32 UnoMemoryStream::available() throw(::com::sun::star::io::NotConnectedE
 
 void UnoMemoryStream::closeInput() throw(::com::sun::star::io::NotConnectedException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException)
 {
-    // nothing to do
+    // nothing to do	
 }
 
 
diff --git a/toolkit/source/helper/unopropertyarrayhelper.cxx b/toolkit/source/helper/unopropertyarrayhelper.cxx
index da946ffdc08a..90689101e2fe 100644
--- a/toolkit/source/helper/unopropertyarrayhelper.cxx
+++ b/toolkit/source/helper/unopropertyarrayhelper.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
@@ -31,9 +31,9 @@
 #include <toolkit/helper/unopropertyarrayhelper.hxx>
 #include <toolkit/helper/property.hxx>
 
-//  ----------------------------------------------------
-//  class UnoPropertyArrayHelper
-//  ----------------------------------------------------
+//	----------------------------------------------------
+//	class UnoPropertyArrayHelper
+//	----------------------------------------------------
 
 UnoPropertyArrayHelper::UnoPropertyArrayHelper( const ::com::sun::star::uno::Sequence<sal_Int32>& rIDs )
 {
@@ -54,7 +54,7 @@ sal_Bool UnoPropertyArrayHelper::ImplHasProperty( sal_uInt16 nPropId ) const
 {
     if ( ( nPropId >= BASEPROPERTY_FONTDESCRIPTORPART_START ) && ( nPropId <= BASEPROPERTY_FONTDESCRIPTORPART_END ) )
         nPropId = BASEPROPERTY_FONTDESCRIPTOR;
-
+    
     return maIDs.Get( nPropId ) ? sal_True : sal_False;
 }
 
@@ -63,11 +63,11 @@ sal_Bool UnoPropertyArrayHelper::fillPropertyMembersByHandle( ::rtl::OUString *
 {
     sal_uInt16 id = sal::static_int_cast< sal_uInt16 >(nPropId);
     sal_Bool bValid = ImplHasProperty( id );
-    if ( bValid )
+    if ( bValid ) 
     {
-        if ( pPropName )
+        if ( pPropName ) 
             *pPropName = GetPropertyName( id );
-        if ( pAttributes )
+        if ( pAttributes ) 
             *pAttributes = GetPropertyAttribs( id );
     }
     return bValid;
@@ -76,7 +76,7 @@ sal_Bool UnoPropertyArrayHelper::fillPropertyMembersByHandle( ::rtl::OUString *
 ::com::sun::star::uno::Sequence< ::com::sun::star::beans::Property > UnoPropertyArrayHelper::getProperties()
 {
     // Sortiert nach Namen...
-
+    
     Table aSortedPropsIds;
     sal_uInt32 nProps = maIDs.Count();
     for ( sal_uInt32 s = 0; s < nProps; s++ )
@@ -93,11 +93,11 @@ sal_Bool UnoPropertyArrayHelper::fillPropertyMembersByHandle( ::rtl::OUString *
         }
     }
 
-    nProps = aSortedPropsIds.Count();   // koennen jetzt mehr sein
+    nProps = aSortedPropsIds.Count();	// koennen jetzt mehr sein
     ::com::sun::star::uno::Sequence< ::com::sun::star::beans::Property> aProps( nProps );
     ::com::sun::star::beans::Property* pProps = aProps.getArray();
-
-    for ( sal_uInt32 n = 0; n < nProps; n++ )
+    
+    for ( sal_uInt32 n = 0; n < nProps; n++ ) 
     {
         sal_uInt16 nId = (sal_uInt16)(sal_uIntPtr)aSortedPropsIds.GetObject( n );
         pProps[n].Name = GetPropertyName( nId );
@@ -105,7 +105,7 @@ sal_Bool UnoPropertyArrayHelper::fillPropertyMembersByHandle( ::rtl::OUString *
         pProps[n].Type = *GetPropertyType( nId );
         pProps[n].Attributes = GetPropertyAttribs( nId );
     }
-
+    
     return aProps;
 }
 
@@ -141,10 +141,10 @@ sal_Int32 UnoPropertyArrayHelper::fillHandles( sal_Int32* pHandles, const ::com:
     sal_Int32 nValues = rPropNames.getLength();
     sal_Int32 nValidHandles = 0;
 
-    for ( sal_Int32 n = 0; n < nValues; n++ )
+    for ( sal_Int32 n = 0; n < nValues; n++ ) 
     {
         sal_uInt16 nPropId = GetPropertyId( pNames[n] );
-        if ( nPropId && ImplHasProperty( nPropId ) )
+        if ( nPropId && ImplHasProperty( nPropId ) ) 
         {
             pHandles[n] = nPropId;
             nValidHandles++;
diff --git a/toolkit/source/helper/unowrapper.cxx b/toolkit/source/helper/unowrapper.cxx
index d7cec7c17354..827f4f76c612 100644
--- a/toolkit/source/helper/unowrapper.cxx
+++ b/toolkit/source/helper/unowrapper.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
@@ -101,12 +101,12 @@ using namespace ::com::sun::star;
         case WINDOW_WORKWINDOW:
         case WINDOW_DOCKINGWINDOW:
         case WINDOW_FLOATINGWINDOW:
-        case WINDOW_HELPTEXTWINDOW: return new VCLXTopWindow;
+        case WINDOW_HELPTEXTWINDOW:	return new VCLXTopWindow;
 
         case WINDOW_WINDOW:
         case WINDOW_TABPAGE:        return new VCLXContainer;
 
-        case WINDOW_TOOLBOX:        return new VCLXToolBox;
+        case WINDOW_TOOLBOX:		return new VCLXToolBox;
 
         // case WINDOW_FIXEDLINE:
         // case WINDOW_FIXEDBITMAP:
@@ -127,9 +127,9 @@ using namespace ::com::sun::star;
     }
 }
 
-//  ----------------------------------------------------
-//  class UnoWrapper
-//  ----------------------------------------------------
+//	----------------------------------------------------
+//	class UnoWrapper
+//	----------------------------------------------------
 
 extern "C" {
 
@@ -138,7 +138,7 @@ TOOLKIT_DLLPUBLIC UnoWrapperBase* CreateUnoWrapper()
     return new UnoWrapper( NULL );
 }
 
-}   // extern "C"
+}	// extern "C"
 
 
 UnoWrapper::UnoWrapper( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XToolkit>& rxToolkit )
@@ -184,7 +184,7 @@ void UnoWrapper::SetWindowInterface( Window* pWindow, ::com::sun::star::uno::Ref
         {
             int i = 0;
             i++;
-            //          DBG_ERROR( "UnoWrapper::SetWindowInterface: there already *is* a WindowInterface for this window!" );
+            //			DBG_ERROR( "UnoWrapper::SetWindowInterface: there already *is* a WindowInterface for this window!" );
         }
         pVCLXWindow->SetWindow( pWindow );
         pWindow->SetWindowPeer( xIFace, pVCLXWindow );
@@ -260,34 +260,34 @@ void UnoWrapper::WindowDestroyed( Window* pWindow )
     // ggf. existieren noch von ::com::sun::star::loader::Java erzeugte Childs, die sonst erst
     // im Garbage-Collector zerstoert werden...
     Window* pChild = pWindow->GetWindow( WINDOW_FIRSTCHILD );
-    while ( pChild )
+    while ( pChild ) 
     {
         Window* pNextChild = pChild->GetWindow( WINDOW_NEXT );
 
         Window* pClient = pChild->GetWindow( WINDOW_CLIENT );
-        if ( pClient->GetWindowPeer() )
+        if ( pClient->GetWindowPeer() ) 
         {
             ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent > xComp( pClient->GetComponentInterface( FALSE ), ::com::sun::star::uno::UNO_QUERY );
             xComp->dispose();
         }
-
+        
         pChild = pNextChild;
     }
 
     // ::com::sun::star::chaos::System-Windows suchen...
     Window* pOverlap = pWindow->GetWindow( WINDOW_OVERLAP );
     pOverlap = pOverlap->GetWindow( WINDOW_FIRSTOVERLAP );
-    while ( pOverlap )
+    while ( pOverlap ) 
     {
         Window* pNextOverlap = pOverlap->GetWindow( WINDOW_NEXT );
         Window* pClient = pOverlap->GetWindow( WINDOW_CLIENT );
-
+        
         if ( pClient->GetWindowPeer() && lcl_ImplIsParent( pWindow, pClient ) )
         {
             ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent > xComp( pClient->GetComponentInterface( FALSE ), ::com::sun::star::uno::UNO_QUERY );
             xComp->dispose();
         }
-
+        
         pOverlap = pNextOverlap;
     }
 
@@ -318,12 +318,17 @@ void UnoWrapper::WindowDestroyed( Window* pWindow )
         Window* pTopWindowChild = pWindow->GetWindow( WINDOW_FIRSTTOPWINDOWCHILD );
         while ( pTopWindowChild )
         {
-            OSL_ENSURE( pTopWindowChild->GetParent() == pWindow, "UnoWrapper::WindowDestroyed: inconsistency in the SystemWindow relationship!" );
+            OSL_ENSURE( pTopWindowChild->GetParent() == pWindow,
+                        "UnoWrapper::WindowDestroyed: inconsistency in the SystemWindow relationship!" );
+
+            Window* pNextTopChild = pTopWindowChild->GetWindow( WINDOW_NEXTTOPWINDOWSIBLING );
+
+            //the window still could be on the stack, so we have to
+            // use lazy delete ( it will automatically
+            // disconnect from the currently destroyed parent window )
+            pTopWindowChild->doLazyDelete();
 
-            uno::Reference< lang::XComponent > xComp( pTopWindowChild->GetComponentInterface( FALSE ), uno::UNO_QUERY );
-            pTopWindowChild = pTopWindowChild->GetWindow( WINDOW_NEXTTOPWINDOWSIBLING );
-            if  ( xComp.is() )
-                xComp->dispose();
+            pTopWindowChild = pNextTopChild;
         }
     }
 }
diff --git a/toolkit/source/helper/vclunohelper.cxx b/toolkit/source/helper/vclunohelper.cxx
index da91945c0b0e..fa6ba15b9215 100644
--- a/toolkit/source/helper/vclunohelper.cxx
+++ b/toolkit/source/helper/vclunohelper.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
@@ -68,9 +68,9 @@
 
 using namespace ::com::sun::star;
 
-//  ----------------------------------------------------
-//  class VCLUnoHelper
-//  ----------------------------------------------------
+//	----------------------------------------------------
+//	class VCLUnoHelper
+//	----------------------------------------------------
 
 ::com::sun::star::uno::Reference< ::com::sun::star::awt::XToolkit> VCLUnoHelper::CreateToolkit()
 {
@@ -348,7 +348,7 @@ FontWeight VCLUnoHelper::ConvertFontWeight( float f )
     aFD.Orientation = rFont.GetOrientation();
     aFD.Kerning = rFont.IsKerning();
     aFD.WordLineMode = rFont.IsWordLineMode();
-    aFD.Type = 0;   // ??? => Nur an Metric...
+    aFD.Type = 0;	// ??? => Nur an Metric...
     return aFD;
 }
 
@@ -534,7 +534,7 @@ namespace
         }
         if ( eDirection == FieldUnitToMeasurementUnit )
             return -1;
-
+        
         _rFieldToUNOValueFactor = 1;
         return (sal_Int16)FUNIT_NONE;
     }
diff --git a/toolkit/source/layout/core/bin.cxx b/toolkit/source/layout/core/bin.cxx
index 0f0719f12bbd..b5f864ec5326 100644
--- a/toolkit/source/layout/core/bin.cxx
+++ b/toolkit/source/layout/core/bin.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
diff --git a/toolkit/source/layout/core/bin.hxx b/toolkit/source/layout/core/bin.hxx
index 554f6f1bbcf9..ee6821c285cf 100644
--- a/toolkit/source/layout/core/bin.hxx
+++ b/toolkit/source/layout/core/bin.hxx
@@ -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
diff --git a/toolkit/source/layout/core/box-base.cxx b/toolkit/source/layout/core/box-base.cxx
index d203e63ce2ed..a174f549b228 100644
--- a/toolkit/source/layout/core/box-base.cxx
+++ b/toolkit/source/layout/core/box-base.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
@@ -77,7 +77,7 @@ static bool isVisible( uno::Reference< awt::XLayoutConstrains > xWidget )
 
     return true;
 }
-
+    
 bool Box_Base::ChildData::isVisible()
 {
     // FIXME: call the 'isVisible' method on it ?
@@ -152,7 +152,7 @@ uno::Reference< beans::XPropertySet > SAL_CALL
 Box_Base::getChildProperties( const uno::Reference< awt::XLayoutConstrains >& xChild )
     throw (uno::RuntimeException)
 {
-
+    
     for ( std::list< ChildData * >::iterator it = maChildren.begin();
           it != maChildren.end(); it++)
     {
diff --git a/toolkit/source/layout/core/box-base.hxx b/toolkit/source/layout/core/box-base.hxx
index 685e0e35e8b6..894a24de4b46 100644
--- a/toolkit/source/layout/core/box-base.hxx
+++ b/toolkit/source/layout/core/box-base.hxx
@@ -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
@@ -45,7 +45,7 @@ public:
         css::uno::Reference< css::beans::XPropertySet > mxProps;
         css::awt::Size maRequisition;
         virtual bool isVisible();
-
+        
         ChildData( css::uno::Reference< css::awt::XLayoutConstrains > const& xChild );
         virtual ~ChildData() { };
     };
@@ -61,9 +61,9 @@ protected:
 
     virtual ChildData *createChild( css::uno::Reference< css::awt::XLayoutConstrains > const& xChild ) = 0;
     virtual ChildProps *createChildProps( ChildData* pData ) = 0;
-
+    
     ChildData *removeChildData( std::list< ChildData *>&, css::uno::Reference< css::awt::XLayoutConstrains > const& Child );
-
+    
 public:
     void AddChild( const css::uno::Reference< css::awt::XLayoutConstrains >& Child);
 
@@ -76,7 +76,7 @@ public:
     virtual css::uno::Sequence< css::uno::Reference
                                 < css::awt::XLayoutConstrains > > SAL_CALL getChildren()
         throw (css::uno::RuntimeException);
-
+    
     virtual css::uno::Reference< css::beans::XPropertySet > SAL_CALL getChildProperties(
         const css::uno::Reference< css::awt::XLayoutConstrains >& Child )
         throw (css::uno::RuntimeException);
diff --git a/toolkit/source/layout/core/box.cxx b/toolkit/source/layout/core/box.cxx
index a173bb5b7633..dbb928de169c 100644
--- a/toolkit/source/layout/core/box.cxx
+++ b/toolkit/source/layout/core/box.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
diff --git a/toolkit/source/layout/core/box.hxx b/toolkit/source/layout/core/box.hxx
index 9e4652a37b2f..66416c23031f 100644
--- a/toolkit/source/layout/core/box.hxx
+++ b/toolkit/source/layout/core/box.hxx
@@ -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
diff --git a/toolkit/source/layout/core/byteseq.cxx b/toolkit/source/layout/core/byteseq.cxx
index b49297d8b1c9..dd689610820b 100644
--- a/toolkit/source/layout/core/byteseq.cxx
+++ b/toolkit/source/layout/core/byteseq.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
@@ -66,7 +66,7 @@ uno::Reference< io::XInputStream > getFileAsStream( const rtl::OUString &rName )
             sMsg.append(configmgr::FileHelper::createOSLErrorString(errorCode));
 
             throw io::IOException(sMsg.makeStringAndClear(),NULL);
-        }
+        }   
 */
     }
 
diff --git a/toolkit/source/layout/core/container.cxx b/toolkit/source/layout/core/container.cxx
index 43f837f32de5..d8ba694f3610 100644
--- a/toolkit/source/layout/core/container.cxx
+++ b/toolkit/source/layout/core/container.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
@@ -161,7 +161,7 @@ void Container::propertiesChanged()
 {
     // cl: why this assertion? This is also called to set properties at the top level widget which has no parent!?
     // DBG_ASSERT( mxParent.is(), "Properties listener: error container doesn't have parent" );
-
+    
     if ( mxLayoutUnit.is() && mxParent.is() )
         mxLayoutUnit->queueResize( mxParent );
 }
diff --git a/toolkit/source/layout/core/container.hxx b/toolkit/source/layout/core/container.hxx
index f236139fb1cb..1ebb37c0d056 100644
--- a/toolkit/source/layout/core/container.hxx
+++ b/toolkit/source/layout/core/container.hxx
@@ -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
diff --git a/toolkit/source/layout/core/dialogbuttonhbox.cxx b/toolkit/source/layout/core/dialogbuttonhbox.cxx
index 4a54fcecaf8c..064bf637bd69 100644
--- a/toolkit/source/layout/core/dialogbuttonhbox.cxx
+++ b/toolkit/source/layout/core/dialogbuttonhbox.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
diff --git a/toolkit/source/layout/core/dialogbuttonhbox.hxx b/toolkit/source/layout/core/dialogbuttonhbox.hxx
index b1e5ca0f6ba3..3114d5f76282 100644
--- a/toolkit/source/layout/core/dialogbuttonhbox.hxx
+++ b/toolkit/source/layout/core/dialogbuttonhbox.hxx
@@ -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
diff --git a/toolkit/source/layout/core/factory.cxx b/toolkit/source/layout/core/factory.cxx
index db9616a8cc77..30cdaeedef17 100644
--- a/toolkit/source/layout/core/factory.cxx
+++ b/toolkit/source/layout/core/factory.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
@@ -124,7 +124,7 @@ sal_Bool SAL_CALL LayoutFactory::supportsService( const ::rtl::OUString& Service
     for ( sal_Int32 i = 0; i < aSeq.getLength(); i++ )
         if ( ServiceName.compareTo( aSeq[i] ) == 0 )
             return sal_True;
-
+    
     return sal_False;
 }
 
diff --git a/toolkit/source/layout/core/factory.hxx b/toolkit/source/layout/core/factory.hxx
index 3e2af712b961..19c798bdf1ac 100644
--- a/toolkit/source/layout/core/factory.hxx
+++ b/toolkit/source/layout/core/factory.hxx
@@ -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
diff --git a/toolkit/source/layout/core/flow.cxx b/toolkit/source/layout/core/flow.cxx
index 9a573b7487f4..b5f98a49e27a 100644
--- a/toolkit/source/layout/core/flow.cxx
+++ b/toolkit/source/layout/core/flow.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
diff --git a/toolkit/source/layout/core/flow.hxx b/toolkit/source/layout/core/flow.hxx
index e2b4708cf261..c355c0b469b3 100644
--- a/toolkit/source/layout/core/flow.hxx
+++ b/toolkit/source/layout/core/flow.hxx
@@ -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
diff --git a/toolkit/source/layout/core/helper.cxx b/toolkit/source/layout/core/helper.cxx
index d18a4f615d04..cbac95efe256 100644
--- a/toolkit/source/layout/core/helper.cxx
+++ b/toolkit/source/layout/core/helper.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
@@ -439,7 +439,7 @@ Window* WidgetFactory::sfx2CreateWindow (VCLXWindow** component, Window* parent,
 Window* WidgetFactory::layoutCreateWindow (VCLXWindow** component, Window *parent, OUString const& name, long& attributes)
 {
     Window* window = 0;
-
+    
     if (0)
     {
         ;
diff --git a/toolkit/source/layout/core/helper.hxx b/toolkit/source/layout/core/helper.hxx
index 2fac41ebc493..b691694b7dfa 100644
--- a/toolkit/source/layout/core/helper.hxx
+++ b/toolkit/source/layout/core/helper.hxx
@@ -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
diff --git a/toolkit/source/layout/core/import.cxx b/toolkit/source/layout/core/import.cxx
index 6d161cf1b07e..8e7a0d1d7ccb 100644
--- a/toolkit/source/layout/core/import.cxx
+++ b/toolkit/source/layout/core/import.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
@@ -238,7 +238,7 @@ void RadioGroups::addItem( rtl::OUString id, uno::Reference< awt::XRadioButton >
 {
     if ( ! xRadio.is() )
         throw uno::RuntimeException();
-
+    
     uno::Reference< RadioGroup > group;
     RadioGroupsMap::iterator it = mxRadioGroups.find( id );
     if ( it == mxRadioGroups.end() )
diff --git a/toolkit/source/layout/core/import.hxx b/toolkit/source/layout/core/import.hxx
index 7af8f16eb5d3..d35a2bcb6641 100644
--- a/toolkit/source/layout/core/import.hxx
+++ b/toolkit/source/layout/core/import.hxx
@@ -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
diff --git a/toolkit/source/layout/core/localized-string.cxx b/toolkit/source/layout/core/localized-string.cxx
index bbf067011f6b..e8a9826e0e3f 100644
--- a/toolkit/source/layout/core/localized-string.cxx
+++ b/toolkit/source/layout/core/localized-string.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
diff --git a/toolkit/source/layout/core/localized-string.hxx b/toolkit/source/layout/core/localized-string.hxx
index a6310336ceb6..85568d5b2cb0 100644
--- a/toolkit/source/layout/core/localized-string.hxx
+++ b/toolkit/source/layout/core/localized-string.hxx
@@ -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
@@ -36,7 +36,7 @@ namespace layoutimpl
 namespace css = ::com::sun::star;
 
 // FIXME: misuse XFixedText interface for simple string
-class LocalizedString : public css::awt::XFixedText
+class LocalizedString :	public css::awt::XFixedText
                       , public VCLXWindow
 {
 public:
@@ -54,7 +54,7 @@ public:
     ::rtl::OUString SAL_CALL getText()
         throw(css::uno::RuntimeException);
     void SAL_CALL setAlignment( sal_Int16 )
-        throw(css::uno::RuntimeException) { }
+        throw(css::uno::RuntimeException) { } 
     sal_Int16 SAL_CALL getAlignment()
         throw(css::uno::RuntimeException) { return 0; }
 
diff --git a/toolkit/source/layout/core/precompiled_xmlscript.hxx b/toolkit/source/layout/core/precompiled_xmlscript.hxx
index 0fc538151348..2c36e87a345f 100644
--- a/toolkit/source/layout/core/precompiled_xmlscript.hxx
+++ b/toolkit/source/layout/core/precompiled_xmlscript.hxx
@@ -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
diff --git a/toolkit/source/layout/core/proplist.cxx b/toolkit/source/layout/core/proplist.cxx
index 7cd27473a8c7..5e955084e13b 100644
--- a/toolkit/source/layout/core/proplist.cxx
+++ b/toolkit/source/layout/core/proplist.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
diff --git a/toolkit/source/layout/core/proplist.hxx b/toolkit/source/layout/core/proplist.hxx
index 6a98cf449df3..3750c77000b0 100644
--- a/toolkit/source/layout/core/proplist.hxx
+++ b/toolkit/source/layout/core/proplist.hxx
@@ -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
diff --git a/toolkit/source/layout/core/root.cxx b/toolkit/source/layout/core/root.cxx
index af56e77f9aac..1b982caab560 100644
--- a/toolkit/source/layout/core/root.cxx
+++ b/toolkit/source/layout/core/root.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
@@ -174,7 +174,7 @@ void SAL_CALL LayoutRoot::initialize( const uno::Sequence< uno::Any >& aArgument
 
     if (! xDocHandler.is() )
         error( OUString::createFromAscii( "cannot find SAx handler for document type of:") + aXMLName );
-
+        
     xParser->setDocumentHandler( xDocHandler );
 
     xml::sax::InputSource source;
diff --git a/toolkit/source/layout/core/root.hxx b/toolkit/source/layout/core/root.hxx
index 321c891bbe50..2b9354b2881a 100644
--- a/toolkit/source/layout/core/root.hxx
+++ b/toolkit/source/layout/core/root.hxx
@@ -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
diff --git a/toolkit/source/layout/core/table.cxx b/toolkit/source/layout/core/table.cxx
index 48156b1d730e..a569be3a8a1b 100644
--- a/toolkit/source/layout/core/table.cxx
+++ b/toolkit/source/layout/core/table.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
diff --git a/toolkit/source/layout/core/table.hxx b/toolkit/source/layout/core/table.hxx
index dd05eba38c41..88257e26bd78 100644
--- a/toolkit/source/layout/core/table.hxx
+++ b/toolkit/source/layout/core/table.hxx
@@ -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
diff --git a/toolkit/source/layout/core/timer.cxx b/toolkit/source/layout/core/timer.cxx
index f0975fd3f76b..c1f3372e1763 100644
--- a/toolkit/source/layout/core/timer.cxx
+++ b/toolkit/source/layout/core/timer.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
diff --git a/toolkit/source/layout/core/timer.hxx b/toolkit/source/layout/core/timer.hxx
index f8432141c2f1..48ed418f32d3 100644
--- a/toolkit/source/layout/core/timer.hxx
+++ b/toolkit/source/layout/core/timer.hxx
@@ -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
diff --git a/toolkit/source/layout/core/translate.cxx b/toolkit/source/layout/core/translate.cxx
index fa09d02190d2..f95fb099adb7 100644
--- a/toolkit/source/layout/core/translate.cxx
+++ b/toolkit/source/layout/core/translate.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
diff --git a/toolkit/source/layout/core/translate.hxx b/toolkit/source/layout/core/translate.hxx
index 597b4a88530e..8f2a46485531 100644
--- a/toolkit/source/layout/core/translate.hxx
+++ b/toolkit/source/layout/core/translate.hxx
@@ -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
diff --git a/toolkit/source/layout/core/vcl.cxx b/toolkit/source/layout/core/vcl.cxx
index 2b8d910584e9..e2310c1c2b86 100644
--- a/toolkit/source/layout/core/vcl.cxx
+++ b/toolkit/source/layout/core/vcl.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
diff --git a/toolkit/source/layout/core/vcl.hxx b/toolkit/source/layout/core/vcl.hxx
index 20cc77dc7f82..87a33fe323c3 100644
--- a/toolkit/source/layout/core/vcl.hxx
+++ b/toolkit/source/layout/core/vcl.hxx
@@ -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
diff --git a/toolkit/source/layout/vcl/wbutton.cxx b/toolkit/source/layout/vcl/wbutton.cxx
index 26d4410ccf9a..a30298b9ee6a 100644
--- a/toolkit/source/layout/vcl/wbutton.cxx
+++ b/toolkit/source/layout/vcl/wbutton.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
diff --git a/toolkit/source/layout/vcl/wcontainer.cxx b/toolkit/source/layout/vcl/wcontainer.cxx
index 712aae19934d..cc5b3a327942 100644
--- a/toolkit/source/layout/vcl/wcontainer.cxx
+++ b/toolkit/source/layout/vcl/wcontainer.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
diff --git a/toolkit/source/layout/vcl/wfield.cxx b/toolkit/source/layout/vcl/wfield.cxx
index fb26d04a478b..ac4c3db19343 100644
--- a/toolkit/source/layout/vcl/wfield.cxx
+++ b/toolkit/source/layout/vcl/wfield.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
diff --git a/toolkit/source/layout/vcl/wrapper.cxx b/toolkit/source/layout/vcl/wrapper.cxx
index a8133250eb58..9c696627105e 100644
--- a/toolkit/source/layout/vcl/wrapper.cxx
+++ b/toolkit/source/layout/vcl/wrapper.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
diff --git a/toolkit/source/layout/vcl/wrapper.hxx b/toolkit/source/layout/vcl/wrapper.hxx
index 2f7e24211150..77afd8b0559e 100644
--- a/toolkit/source/layout/vcl/wrapper.hxx
+++ b/toolkit/source/layout/vcl/wrapper.hxx
@@ -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
@@ -141,7 +141,7 @@ inline WindowImpl &Window::getImpl() const{ return *(static_cast< WindowImpl * >
             : parent##Impl( context, peer, window ) \
         { \
         } \
-    };
+    };    
 
 
 } // namespace layout
diff --git a/toolkit/test/accessibility/AccTreeNode.java b/toolkit/test/accessibility/AccTreeNode.java
index 64a5a5a3c4f6..5a922da5045f 100644
--- a/toolkit/test/accessibility/AccTreeNode.java
+++ b/toolkit/test/accessibility/AccTreeNode.java
@@ -56,18 +56,18 @@ class AccTreeNode
             System.out.println ("replacing handler " + i);
             HandlerDescriptor aDescriptor = (HandlerDescriptor)maHandlers.get(i);
             aDescriptor.maHandler = aDescriptor.maHandler.createHandler (mxContext);
-            aDescriptor.mnChildCount =
+            aDescriptor.mnChildCount = 
                     aDescriptor.maHandler.getChildCount (this);
         }
     }
 
     public XAccessibleContext getContext ()
-    {
-        return mxContext;
+    { 
+        return mxContext; 
     }
 
     public XAccessibleComponent getComponent ()
-    {
+    { 
         if (mxComponent == null && mxContext != null)
             mxComponent = (XAccessibleComponent)UnoRuntime.queryInterface(
                 XAccessibleComponent.class, mxContext);
@@ -75,7 +75,7 @@ class AccTreeNode
     }
 
     public XAccessibleExtendedComponent getExtendedComponent ()
-    {
+    { 
         if (mxComponent == null)
             getComponent();
         if (mxComponent != null)
@@ -86,38 +86,38 @@ class AccTreeNode
     }
 
     public XAccessibleText getText ()
-    {
+    { 
         if (mxText == null && mxContext != null)
             mxText = (XAccessibleText)UnoRuntime.queryInterface(
                 XAccessibleText.class, mxContext);
-        return mxText;
+        return mxText; 
     }
 
     public XAccessibleEditableText getEditText ()
-    {
+    { 
         return (XAccessibleEditableText)UnoRuntime.queryInterface(
                 XAccessibleEditableText.class, mxContext);
     }
 
     public XAccessibleTable getTable ()
-    {
+    { 
         if (mxTable == null && mxContext != null)
             mxTable = (XAccessibleTable)UnoRuntime.queryInterface(
                 XAccessibleTable.class, mxContext);
-        return mxTable;
+        return mxTable; 
     }
 
 
-    public XAccessible getAccessible()
+    public XAccessible getAccessible() 
     {
         if ((mxAccessible == null) && (mxContext != null))
             mxAccessible = (XAccessible)UnoRuntime.queryInterface(
                 XAccessible.class, mxContext);
-        return mxAccessible;
+        return mxAccessible; 
     }
 
     public XAccessibleSelection getSelection ()
-    {
+    { 
         return (XAccessibleSelection)UnoRuntime.queryInterface(
                 XAccessibleSelection.class, mxContext);
     }
@@ -131,7 +131,7 @@ class AccTreeNode
 
     /** iterate over handlers and return child sum */
     protected HandlerDescriptor getHandlerDescriptor (int i)
-    {
+    { 
         HandlerDescriptor aDescriptor = (HandlerDescriptor)maHandlers.get(i);
         if (aDescriptor.mnChildCount < 0)
             aDescriptor.mnChildCount =
@@ -140,7 +140,7 @@ class AccTreeNode
     }
 
     public int getChildCount()
-    {
+    { 
         int nChildCount = 0;
         for (int i = 0; i < maHandlers.size(); i++)
         {
@@ -246,7 +246,7 @@ class AccTreeNode
 
     /** this node is a leaf if have no handlers, or is those
             handlers show no children */
-    public boolean isLeaf()
+    public boolean isLeaf() 
     {
         return (maHandlers.size() == 0);// || (getChildCount() == 0);
     }
@@ -295,7 +295,7 @@ class AccTreeNode
     }
 
     /** Try to add the specified accessible object as new accessible child of the
-        AccessibleTreeHandler.
+        AccessibleTreeHandler.  
         Note that child is used in another context than
         it is used in the other methods of this class.
     */
@@ -322,7 +322,7 @@ class AccTreeNode
     */
     public Vector updateChildren (java.lang.Class class1)
     {
-        return updateChildren (class1, null);
+        return updateChildren (class1, null); 
     }
 
     public Vector updateChildren (java.lang.Class class1, java.lang.Class class2)
diff --git a/toolkit/test/accessibility/AccessibilityTree.java b/toolkit/test/accessibility/AccessibilityTree.java
index 819631b41eb8..5beb8bb0565e 100755
--- a/toolkit/test/accessibility/AccessibilityTree.java
+++ b/toolkit/test/accessibility/AccessibilityTree.java
@@ -11,11 +11,11 @@ import javax.swing.tree.*;
 import javax.swing.event.*;
 
 
-
+      
 /** This is the tree component that is responsible for displaying the
     contents of the tree model on the screen.
-*/
-public class AccessibilityTree
+*/  
+public class AccessibilityTree 
     implements TreeExpansionListener, TreeWillExpandListener
 {
     /** Create a new accessibility tree.  Use the specified message display
@@ -26,16 +26,16 @@ public class AccessibilityTree
     {
         maTree = new JTree ();
 
-        AccessibilityTreeModel aModel =
+        AccessibilityTreeModel aModel = 
             new AccessibilityTreeModel (
                 new StringNode ("Please press Update button", null));
         maTree.setModel (aModel);
-
+        
         maCellRenderer = new AccessibleTreeCellRenderer();
         //        setCellRenderer (maCellRenderer);
 
         // allow editing of XAccessibleText interfaces
-        //        setEditable (true);
+        //        setEditable (true); 
         //        maTreeModel.addTreeModelListener( new TextUpdateListener() );
 
         maTree.addMouseListener (new MouseListener (this));
@@ -131,7 +131,7 @@ public class AccessibilityTree
 
         //        System.out.print ("e");
 
-        try
+        try 
         {
             // get 'our' object
             Object aObj = aPath.getLastPathComponent();
@@ -140,7 +140,7 @@ public class AccessibilityTree
             if( aExpander.expand( aObj ) )
             {
                 maTree.expandPath (aPath);
-                if( aFirst == null )
+                if( aFirst == null )  
                     aFirst = aPath;
             }
 
@@ -151,8 +151,8 @@ public class AccessibilityTree
                 int nLength = aNode.getChildCount();
                 for( int i = 0; i < nLength; i++ )
                 {
-                    TreePath aRet = expandTree(
-                        aPath.pathByAddingChild( aNode.getChild( i ) ),
+                    TreePath aRet = expandTree( 
+                        aPath.pathByAddingChild( aNode.getChild( i ) ), 
                         aExpander );
                     if( aFirst == null )
                         aFirst = aRet;
@@ -161,7 +161,7 @@ public class AccessibilityTree
         }
         catch (Exception e)
         {
-            System.out.println ("caught exception while expanding tree path "
+            System.out.println ("caught exception while expanding tree path " 
                 + aPath + ": " + e);
             e.printStackTrace ();
         }
@@ -211,7 +211,7 @@ public class AccessibilityTree
 
     class MouseListener extends MouseAdapter
     {
-        public MouseListener (AccessibilityTree aTree)
+        public MouseListener (AccessibilityTree aTree) 
         {
             maTree=aTree;
         }
@@ -237,7 +237,7 @@ public class AccessibilityTree
                     if( aObject instanceof AccTreeNode )
                     {
                         AccTreeNode aNode = (AccTreeNode)aObject;
-
+                        
                         Vector aActions = new Vector();
                         aMenu.add (new AccessibilityTree.ShapeExpandAction(maTree, aNode));
                         aMenu.add (new AccessibilityTree.SubtreeExpandAction(maTree, aNode));
@@ -245,7 +245,7 @@ public class AccessibilityTree
                         aNode.getActions(aActions);
                         for( int i = 0; i < aActions.size(); i++ )
                         {
-                            aMenu.add( new NodeAction(
+                            aMenu.add( new NodeAction( 
                                            aActions.elementAt(i).toString(),
                                            aNode, i ) );
                         }
@@ -258,16 +258,16 @@ public class AccessibilityTree
                         if (nCount > 0)
                         {
                             for (int i=0; i<nCount; i++)
-                                aMenu.add( new NodeAction(
+                                aMenu.add( new NodeAction( 
                                     aActionNames[i],
-                                    aNode,
+                                    aNode, 
                                     i));
                         }
                         else
                             aMenu = null;
                     }
                     if (aMenu != null)
-                        aMenu.show (maTree.getComponent(),
+                        aMenu.show (maTree.getComponent(), 
                             e.getX(), e.getY());
                 }
             }
@@ -301,13 +301,13 @@ public class AccessibilityTree
     {
         private AccessibilityTree maTree;
         private AccTreeNode maNode;
-        public ShapeExpandAction (AccessibilityTree aTree, AccTreeNode aNode)
+        public ShapeExpandAction (AccessibilityTree aTree, AccTreeNode aNode) 
         {
             super ("Expand Shapes");
             maTree = aTree;
             maNode = aNode;
         }
-        public void actionPerformed (ActionEvent e)
+        public void actionPerformed (ActionEvent e) 
         {
             maTree.expandShapes (maNode);
         }
@@ -318,13 +318,13 @@ public class AccessibilityTree
     {
         private AccessibilityTree maTree;
         private AccTreeNode maNode;
-        public SubtreeExpandAction (AccessibilityTree aTree, AccTreeNode aNode)
+        public SubtreeExpandAction (AccessibilityTree aTree, AccTreeNode aNode) 
         {
             super ("Expand Subtree");
             maTree = aTree;
             maNode = aNode;
         }
-        public void actionPerformed (ActionEvent e)
+        public void actionPerformed (ActionEvent e) 
         {
             maTree.expandAll (maNode);
         }
@@ -333,8 +333,8 @@ public class AccessibilityTree
     /** Predicate class to determine whether a node should be expanded
      * For use with expandTree method */
     abstract class Expander
-    {
-        abstract public boolean expand (Object aObject);
+    { 
+        abstract public boolean expand (Object aObject);  
     }
 
     /** expand all nodes */
@@ -365,13 +365,13 @@ public class AccessibilityTree
     protected AccessibleTreeCellRenderer
         maCellRenderer;
 
-
+    
     private JTree
         maTree;
     private Canvas
         maCanvas;
     private boolean
         mbFirstShapeSeen;
-    private int
+    private int 
         mnExpandLevel;
 }
diff --git a/toolkit/test/accessibility/AccessibilityTreeModel.java b/toolkit/test/accessibility/AccessibilityTreeModel.java
index d4981e86b4a0..7a226ec6c6af 100644
--- a/toolkit/test/accessibility/AccessibilityTreeModel.java
+++ b/toolkit/test/accessibility/AccessibilityTreeModel.java
@@ -164,7 +164,7 @@ public class AccessibilityTreeModel
         }
         catch (Exception e)
         {
-            System.out.println ("caught exception while removing child "
+            System.out.println ("caught exception while removing child " 
                 + aNode + " : " + e);
             e.printStackTrace ();
             return false;
@@ -174,7 +174,7 @@ public class AccessibilityTreeModel
 
     public void removeNode (XAccessibleContext xNode)
     {
-        if (xNode != null)
+        if (xNode != null) 
         {
             AccessibleTreeNode aNode = maNodeMap.GetNode (xNode);
             AccessibleTreeNode aRootNode = (AccessibleTreeNode)getRoot();
@@ -189,7 +189,7 @@ public class AccessibilityTreeModel
 
 
     /** Add add a new child to a parent.
-        @return
+        @return 
             Returns the new or existing representation of the specified
             accessible object.
     */
@@ -210,7 +210,7 @@ public class AccessibilityTreeModel
         }
         catch (Exception e)
         {
-            System.out.println ("caught exception while adding child "
+            System.out.println ("caught exception while adding child " 
                 + xNewChild + " to parent " + aParentNode + ": " + e);
             e.printStackTrace ();
         }
@@ -227,7 +227,7 @@ public class AccessibilityTreeModel
             {
                 if (maCanvas != null)
                     maCanvas.updateNode ((AccTreeNode)aParentNode);
-
+                
                 // A call to fireTreeNodesInserted for xNew
                 // should be sufficient but at least the
                 // StringNode object that contains the number of
@@ -242,7 +242,7 @@ public class AccessibilityTreeModel
         }
     }
 
-
+    
     /** Add the child node to the internal tree structure.
         @param aNode
             The node to insert into the internal tree structure.
@@ -265,11 +265,11 @@ public class AccessibilityTreeModel
                 }
                 bRet = true;
             }
-
+            
         }
         catch (Exception e)
         {
-            System.out.println ("caught exception while adding node "
+            System.out.println ("caught exception while adding node " 
                 + aNode + ": " + e);
             e.printStackTrace ();
         }
@@ -335,7 +335,7 @@ public class AccessibilityTreeModel
     }
 
     /** Create a TreeModelEvent object that informs listeners that one child
-        has been removed from or inserted into its parent.
+        has been removed from or inserted into its parent. 
     */
     public TreeModelEvent createEvent (XAccessibleContext xParent, XAccessible xChild)
     {
@@ -354,7 +354,7 @@ public class AccessibilityTreeModel
 
 
     protected TreeModelEvent createEvent (
-        AccessibleTreeNode aParentNode,
+        AccessibleTreeNode aParentNode, 
         AccessibleTreeNode aChildNode)
     {
         Object[] aPathToParent = createPath (aParentNode);
@@ -367,11 +367,11 @@ public class AccessibilityTreeModel
 
         if (nIndexInParent == -1)
             // This event may be passed only to treeStructureChanged of the listeners.
-            return new TreeModelEvent (this,
+            return new TreeModelEvent (this, 
                 aPathToParent);
         else
             // General purpose event for removing or inserting known nodes.
-            return new TreeModelEvent (this,
+            return new TreeModelEvent (this, 
                 aPathToParent,
                 new int[] {nIndexInParent},
                 new Object[] {aChildNode} );
@@ -422,7 +422,7 @@ public class AccessibilityTreeModel
     }
 
 
-
+     
     protected XAccessibleEventBroadcaster getBroadcaster (Object aObject)
     {
         if (aObject instanceof AccTreeNode)
@@ -466,15 +466,15 @@ public class AccessibilityTreeModel
 
     public void updateNode (XAccessibleContext xSource, java.lang.Class class1)
     {
-        updateNode (xSource, class1,null);
+        updateNode (xSource, class1,null); 
     }
 
-    /** Get a list of children of the node associated with xSource that are
+    /** Get a list of children of the node associated with xSource that are 
         affected by the given handlers.  Fire events that these children may
         have changed in the tree view.  Update the canvas representation of
         xSource.
     */
-    public AccTreeNode updateNode (XAccessibleContext xSource,
+    public AccTreeNode updateNode (XAccessibleContext xSource, 
         java.lang.Class class1, java.lang.Class class2)
     {
         AccessibleTreeNode aTreeNode = maNodeMap.GetNode (xSource);
diff --git a/toolkit/test/accessibility/AccessibilityTreeModelBase.java b/toolkit/test/accessibility/AccessibilityTreeModelBase.java
index e80819bef840..23e403a67c89 100644
--- a/toolkit/test/accessibility/AccessibilityTreeModelBase.java
+++ b/toolkit/test/accessibility/AccessibilityTreeModelBase.java
@@ -71,7 +71,7 @@ public class AccessibilityTreeModelBase
             {
                 AccessibleTreeNode aParentNode = (AccessibleTreeNode) aParent;
                 AccessibleTreeNode aChildNode = (AccessibleTreeNode) aChild;
-
+                
                 int nChildCount = aParentNode.getChildCount();
                 for( int i = 0; i < nChildCount; i++ )
                 {
@@ -105,7 +105,7 @@ public class AccessibilityTreeModelBase
         return maRoot;
     }
 
-    public void valueForPathChanged(TreePath path, Object newValue)
+    public void valueForPathChanged(TreePath path, Object newValue) 
     { }
 
     protected synchronized void setRoot (AccessibleTreeNode aRoot)
diff --git a/toolkit/test/accessibility/AccessibilityWorkBench.java b/toolkit/test/accessibility/AccessibilityWorkBench.java
index 58ad607fed67..77997201b377 100755
--- a/toolkit/test/accessibility/AccessibilityWorkBench.java
+++ b/toolkit/test/accessibility/AccessibilityWorkBench.java
@@ -50,7 +50,7 @@ import ov.ObjectViewContainer;
 public class AccessibilityWorkBench
     extends JFrame
     implements ActionListener, XTerminateListener, TreeSelectionListener
-
+    
 {
     public static final String msVersion = "v1.7.2";
     public String msOptionsFileName = ".AWBrc";
@@ -74,7 +74,7 @@ public class AccessibilityWorkBench
                 nPortNumber = Integer.parseInt (args[++i]);
             }
         }
-
+        
         saWorkBench = new AccessibilityWorkBench (nPortNumber);
     }
 
@@ -101,7 +101,7 @@ public class AccessibilityWorkBench
         mbInitialized = false;
 
         Layout ();
-
+        
         MessageArea.println (System.getProperty ("os.name") + " / "
             + System.getProperty ("os.arch") + " / "
             + System.getProperty ("os.version"));
@@ -123,7 +123,7 @@ public class AccessibilityWorkBench
 
 
     /** Create and arrange the widgets of the GUI.
-    */
+    */    
     public void Layout  ()
     {
         setSize (new Dimension (8000,600));
@@ -157,7 +157,7 @@ public class AccessibilityWorkBench
         // Split pane for tree view and object view.
         JSplitPane aLeftViewSplitPane = new JSplitPane (
             JSplitPane.VERTICAL_SPLIT,
-            aTreeScrollPane,
+            aTreeScrollPane, 
             aObjectViewContainerScrollPane
             );
         aLeftViewSplitPane.setDividerLocation (300);
@@ -166,7 +166,7 @@ public class AccessibilityWorkBench
         maCanvas = new Canvas ();
         maCanvas.setTree (maAccessibilityTree.getComponent());
         maAccessibilityTree.SetCanvas (maCanvas);
-        JScrollPane aScrolledCanvas = new JScrollPane(maCanvas,
+        JScrollPane aScrolledCanvas = new JScrollPane(maCanvas, 
             JScrollPane.VERTICAL_SCROLLBAR_AS_NEEDED,
             JScrollPane.HORIZONTAL_SCROLLBAR_AS_NEEDED);
         aScrolledCanvas.getViewport().setBackground (Color.RED);
@@ -175,12 +175,12 @@ public class AccessibilityWorkBench
         // Split pane for tree view and canvas.
         JSplitPane aViewSplitPane = new JSplitPane (
             JSplitPane.HORIZONTAL_SPLIT,
-            aLeftViewSplitPane,
+            aLeftViewSplitPane, 
             aScrolledCanvas
             );
         aViewSplitPane.setOneTouchExpandable(true);
         aViewSplitPane.setDividerLocation (400);
-
+            
         //  Text output area.
         maMessageArea = MessageArea.Instance ();
         //        maMessageArea.setPreferredSize (new Dimension (300,50));
@@ -204,7 +204,7 @@ public class AccessibilityWorkBench
         aUpdateButton = createButton ("Update", "update");
         aShapesButton = createButton ("Expand Shapes", "shapes");
         aExpandButton = createButton ("Expand All", "expand");
-        aQuitButton = createButton ("Quit", "quit");
+        aQuitButton = createButton ("Quit", "quit");        
         UpdateButtonStates ();
 
         Options.Instance().Load (msOptionsFileName);
@@ -224,7 +224,7 @@ public class AccessibilityWorkBench
 
     /** Shortcut method for adding an object to a GridBagLayout.
     */
-    void addGridElement (JComponent object,
+    void addGridElement (JComponent object, 
         int x, int y, int width, int height, int weightx, int weighty,
         int anchor, int fill)
     {
@@ -252,7 +252,7 @@ public class AccessibilityWorkBench
         aButton.setEnabled (false);
         aButton.setActionCommand (command);
         aButton.addActionListener (this);
-
+        
         maButtonBar.add (aButton);
         return aButton;
     }
@@ -269,7 +269,7 @@ public class AccessibilityWorkBench
     {
         // Menu bar.
         maMenuBar = new JMenuBar ();
-
+   
         // File menu.
         JMenu aFileMenu = new JMenu ("File");
         maMenuBar.add (aFileMenu);
@@ -330,7 +330,7 @@ public class AccessibilityWorkBench
         // Help menu.
         JMenu aHelpMenu = new JMenu ("Help");
         maMenuBar.add (aHelpMenu);
-
+        
         aItem = new JMenuItem ("Help");
         aHelpMenu.add (aItem);
         aItem.addActionListener (this);
@@ -413,7 +413,7 @@ public class AccessibilityWorkBench
 
     /** Callback for GUI actions from the buttons.
     */
-    public void actionPerformed (java.awt.event.ActionEvent e)
+    public void actionPerformed (java.awt.event.ActionEvent e) 
     {
         if (e.getActionCommand().equals("connect"))
         {
@@ -578,17 +578,17 @@ public class AccessibilityWorkBench
 
 
     /// The Singleton Workbench object.
-    private static AccessibilityWorkBench
+    private static AccessibilityWorkBench 
         saWorkBench = null;
-
-    protected SimpleOffice
+    
+    protected SimpleOffice 
         office;
-    protected InformationWriter
+    protected InformationWriter 
         info;
-
-    private XModel
+        
+    private XModel 
         mxModel;
-    private JPanel
+    private JPanel 
         maMainPanel,
         maButtonBar;
     private Canvas
@@ -599,9 +599,9 @@ public class AccessibilityWorkBench
         maObjectViewContainer;
     private JScrollPane
         maScrollPane;
-    private MessageArea
+    private MessageArea 
         maMessageArea;
-    private JButton
+    private JButton 
         aConnectButton,
         aQuitButton,
         aUpdateButton,
@@ -615,6 +615,6 @@ public class AccessibilityWorkBench
         mbInitialized;
     private TopWindowListener
         maTopWindowListener;
-    private QueuedTopWindowListener
+    private QueuedTopWindowListener 
         maQueuedTopWindowListener;
 }
diff --git a/toolkit/test/accessibility/AccessibleActionHandler.java b/toolkit/test/accessibility/AccessibleActionHandler.java
index 0aac7158efde..d91923b2b7a2 100644
--- a/toolkit/test/accessibility/AccessibleActionHandler.java
+++ b/toolkit/test/accessibility/AccessibleActionHandler.java
@@ -4,12 +4,12 @@ import com.sun.star.accessibility.XAccessibleContext;
 import com.sun.star.accessibility.XAccessibleAction;
 import com.sun.star.lang.IndexOutOfBoundsException;
 
-class AccessibleActionHandler
+class AccessibleActionHandler 
     extends NodeHandler
 {
     public NodeHandler createHandler (XAccessibleContext xContext)
     {
-        XAccessibleAction xEComponent =
+        XAccessibleAction xEComponent = 
             (XAccessibleAction) UnoRuntime.queryInterface (
                 XAccessibleAction.class, xContext);
         if (xEComponent != null)
@@ -35,7 +35,7 @@ class AccessibleActionHandler
     }
 
     public AccessibleTreeNode createChild (
-        AccessibleTreeNode aParent,
+        AccessibleTreeNode aParent, 
         int nIndex)
     {
         AccessibleTreeNode aChild = null;
@@ -54,7 +54,7 @@ class AccessibleActionHandler
                     try
                     {
                         aChild = new AccessibleActionNode (
-                            "Action " + nIndex + " : "
+                            "Action " + nIndex + " : " 
                             + xAction.getAccessibleActionDescription (nIndex),
                             aParent,
                             nIndex);
diff --git a/toolkit/test/accessibility/AccessibleActionNode.java b/toolkit/test/accessibility/AccessibleActionNode.java
index 7c72ac69803e..b684d4c87f3e 100644
--- a/toolkit/test/accessibility/AccessibleActionNode.java
+++ b/toolkit/test/accessibility/AccessibleActionNode.java
@@ -7,7 +7,7 @@ import com.sun.star.accessibility.XAccessibleAction;
 class AccessibleActionNode
     extends StringNode
 {
-    public AccessibleActionNode (String aDisplayObject,
+    public AccessibleActionNode (String aDisplayObject, 
         AccessibleTreeNode aParent,
         int nActionIndex)
     {
@@ -15,13 +15,13 @@ class AccessibleActionNode
         mnActionIndex = nActionIndex;
     }
 
-    public String[] getActions ()
+    public String[] getActions () 
     {
         return new String[] {"Perform Action"};
     }
 
     /** perform action */
-    public void performAction (int nIndex)
+    public void performAction (int nIndex) 
     {
         if (nIndex != 0)
             return;
@@ -37,10 +37,10 @@ class AccessibleActionNode
         {
         }
 
-        JOptionPane.showMessageDialog (null,
+        JOptionPane.showMessageDialog (null, 
             "performed action " + mnActionIndex
             + (bResult?" with":" without") + " success",
-            "Action " + mnActionIndex,
+            "Action " + mnActionIndex, 
             JOptionPane.INFORMATION_MESSAGE);
     }
 
diff --git a/toolkit/test/accessibility/AccessibleCellHandler.java b/toolkit/test/accessibility/AccessibleCellHandler.java
index 19b4a9df67ad..bef792998db6 100644
--- a/toolkit/test/accessibility/AccessibleCellHandler.java
+++ b/toolkit/test/accessibility/AccessibleCellHandler.java
@@ -15,7 +15,7 @@ class AccessibleCellHandler extends NodeHandler
             XAccessible xParent = xContext.getAccessibleParent();
             if (xParent != null)
             {
-                XAccessibleTable xTable =
+                XAccessibleTable xTable = 
                     (XAccessibleTable) UnoRuntime.queryInterface (
                         XAccessibleTable.class, xParent.getAccessibleContext());
                 if (xTable != null)
diff --git a/toolkit/test/accessibility/AccessibleComponentHandler.java b/toolkit/test/accessibility/AccessibleComponentHandler.java
index 38e5545d23aa..3c9f2b56a29d 100644
--- a/toolkit/test/accessibility/AccessibleComponentHandler.java
+++ b/toolkit/test/accessibility/AccessibleComponentHandler.java
@@ -4,20 +4,20 @@ import com.sun.star.accessibility.XAccessibleContext;
 import com.sun.star.accessibility.XAccessibleComponent;
 
 
-class AccessibleComponentHandler
+class AccessibleComponentHandler 
     extends NodeHandler
 {
 
     public NodeHandler createHandler (XAccessibleContext xContext)
     {
-        XAccessibleComponent xComponent =
+        XAccessibleComponent xComponent = 
             (XAccessibleComponent) UnoRuntime.queryInterface (
                 XAccessibleComponent.class, xContext);
         if (xComponent != null)
             return new AccessibleComponentHandler (xComponent);
         else
             return null;
-
+        
     }
 
     public AccessibleComponentHandler ()
@@ -35,9 +35,9 @@ class AccessibleComponentHandler
         AccessibleTreeNode aChild = null;
         if (aParent instanceof AccTreeNode)
         {
-            XAccessibleComponent xComponent =
+            XAccessibleComponent xComponent = 
                 ((AccTreeNode)aParent).getComponent();
-
+        
             if (xComponent != null)
             {
                 int nColor;
@@ -64,7 +64,7 @@ class AccessibleComponentHandler
                     case 3:
                         com.sun.star.awt.Rectangle aBBox = xComponent.getBounds();
                         aChild = new StringNode (
-                            "Bounding Box: "+ aBBox.X + ", " + aBBox.Y + ","
+                            "Bounding Box: "+ aBBox.X + ", " + aBBox.Y + "," 
                             + aBBox.Width + ", " + aBBox.Height,
                             aParent);
                         break;
diff --git a/toolkit/test/accessibility/AccessibleContextHandler.java b/toolkit/test/accessibility/AccessibleContextHandler.java
index fd22bcd5367f..a9267e562938 100644
--- a/toolkit/test/accessibility/AccessibleContextHandler.java
+++ b/toolkit/test/accessibility/AccessibleContextHandler.java
@@ -7,7 +7,7 @@ import java.util.HashMap;
 
 import tools.NameProvider;
 
-class AccessibleContextHandler
+class AccessibleContextHandler 
     extends NodeHandler
 {
     protected int nChildrenCount;
@@ -37,14 +37,14 @@ class AccessibleContextHandler
         XAccessibleContext xContext = null;
         if (aParent instanceof AccTreeNode)
             xContext = ((AccTreeNode)aParent).getContext();
-
+        
         String sChild = new String();
         if (xContext != null)
         {
             switch( nIndex )
             {
                 case 0:
-                    sChild = "Description: " +
+                    sChild = "Description: " + 
                         xContext.getAccessibleDescription();
                     break;
                 case 1:
@@ -56,14 +56,14 @@ class AccessibleContextHandler
                     sChild = "Has parent: " + (xParent!=null ? "yes" : "no");
                     /*                    if (xParent != ((AccTreeNode)aParent).getAccessible())
                     {
-                        sChild += " but that is inconsistent"
+                        sChild += " but that is inconsistent" 
                             + "#" + xParent + " # " + ((AccTreeNode)aParent).getAccessible();
                     }
                     */
                     break;
                 case 3:
                     sChild = "";
-                    XAccessibleStateSet xStateSet =
+                    XAccessibleStateSet xStateSet = 
                         xContext.getAccessibleStateSet();
                     if (xStateSet != null)
                     {
diff --git a/toolkit/test/accessibility/AccessibleEditableTextHandler.java b/toolkit/test/accessibility/AccessibleEditableTextHandler.java
index a79158c099ba..80081da665e9 100644
--- a/toolkit/test/accessibility/AccessibleEditableTextHandler.java
+++ b/toolkit/test/accessibility/AccessibleEditableTextHandler.java
@@ -8,7 +8,7 @@ class AccessibleEditableTextHandler extends NodeHandler
 {
     public NodeHandler createHandler (XAccessibleContext xContext)
     {
-        XAccessibleEditableText xText =
+        XAccessibleEditableText xText = 
             (XAccessibleEditableText) UnoRuntime.queryInterface (
                 XAccessibleEditableText.class, xContext);
         if (xText != null)
diff --git a/toolkit/test/accessibility/AccessibleExtendedComponentHandler.java b/toolkit/test/accessibility/AccessibleExtendedComponentHandler.java
index 7f9fc17b23a5..3336175d2d22 100644
--- a/toolkit/test/accessibility/AccessibleExtendedComponentHandler.java
+++ b/toolkit/test/accessibility/AccessibleExtendedComponentHandler.java
@@ -3,12 +3,12 @@ import com.sun.star.accessibility.XAccessibleContext;
 import com.sun.star.accessibility.XAccessibleExtendedComponent;
 
 
-class AccessibleExtendedComponentHandler
+class AccessibleExtendedComponentHandler 
     extends NodeHandler
 {
     public NodeHandler createHandler (XAccessibleContext xContext)
     {
-        XAccessibleExtendedComponent xEComponent =
+        XAccessibleExtendedComponent xEComponent = 
             (XAccessibleExtendedComponent) UnoRuntime.queryInterface (
                 XAccessibleExtendedComponent.class, xContext);
         if (xEComponent != null)
@@ -30,7 +30,7 @@ class AccessibleExtendedComponentHandler
     private static XAccessibleExtendedComponent getComponent (AccTreeNode aNode)
     {
         return (XAccessibleExtendedComponent) UnoRuntime.queryInterface (
-            XAccessibleExtendedComponent.class,
+            XAccessibleExtendedComponent.class, 
             aNode.getContext());
     }
 
@@ -41,7 +41,7 @@ class AccessibleExtendedComponentHandler
         if (aParent instanceof AccTreeNode)
         {
             XAccessibleExtendedComponent xEComponent = getComponent ((AccTreeNode)aParent);
-
+        
             if (xEComponent != null)
             {
                 int nColor;
diff --git a/toolkit/test/accessibility/AccessibleHyperlinkHandler.java b/toolkit/test/accessibility/AccessibleHyperlinkHandler.java
index 674331317f7e..34609fe9ef33 100644
--- a/toolkit/test/accessibility/AccessibleHyperlinkHandler.java
+++ b/toolkit/test/accessibility/AccessibleHyperlinkHandler.java
@@ -8,7 +8,7 @@ class AccessibleHyperlinkHandler extends AccessibleTreeHandler
 {
     public NodeHandler createHandler (XAccessibleContext xContext)
     {
-        XAccessibleHyperlink xLink =
+        XAccessibleHyperlink xLink = 
             (XAccessibleHyperlink) UnoRuntime.queryInterface (
                 XAccessibleHyperlink.class, xContext);
         if (xLink != null)
@@ -29,7 +29,7 @@ class AccessibleHyperlinkHandler extends AccessibleTreeHandler
 
     protected XAccessibleHyperlink getHyperlink(Object aObject)
     {
-        XAccessibleHyperlink xHyperlink =
+        XAccessibleHyperlink xHyperlink = 
             (XAccessibleHyperlink) UnoRuntime.queryInterface (
                  XAccessibleHyperlink.class, aObject);
         return xHyperlink;
diff --git a/toolkit/test/accessibility/AccessibleHypertextHandler.java b/toolkit/test/accessibility/AccessibleHypertextHandler.java
index aa703942bc4c..ddfd5ebef910 100644
--- a/toolkit/test/accessibility/AccessibleHypertextHandler.java
+++ b/toolkit/test/accessibility/AccessibleHypertextHandler.java
@@ -8,7 +8,7 @@ class AccessibleHypertextHandler extends AccessibleTreeHandler
 {
     public NodeHandler createHandler (XAccessibleContext xContext)
     {
-        XAccessibleHypertext xText =
+        XAccessibleHypertext xText = 
             (XAccessibleHypertext) UnoRuntime.queryInterface (
                 XAccessibleHypertext.class, xContext);
         if (xText != null)
@@ -29,7 +29,7 @@ class AccessibleHypertextHandler extends AccessibleTreeHandler
 
     protected static XAccessibleHypertext getHypertext (AccTreeNode aNode)
     {
-        XAccessibleHypertext xHypertext =
+        XAccessibleHypertext xHypertext = 
             (XAccessibleHypertext) UnoRuntime.queryInterface (
                  XAccessibleHypertext.class, aNode.getContext());
         return xHypertext;
diff --git a/toolkit/test/accessibility/AccessibleImageHandler.java b/toolkit/test/accessibility/AccessibleImageHandler.java
index 92917e1b9740..c7e28a679b3e 100644
--- a/toolkit/test/accessibility/AccessibleImageHandler.java
+++ b/toolkit/test/accessibility/AccessibleImageHandler.java
@@ -8,7 +8,7 @@ class AccessibleImageHandler extends NodeHandler
 {
     public NodeHandler createHandler (XAccessibleContext xContext)
     {
-        XAccessibleImage xImage =
+        XAccessibleImage xImage = 
             (XAccessibleImage) UnoRuntime.queryInterface (
                 XAccessibleImage.class, xContext);
         if (xImage != null)
@@ -40,7 +40,7 @@ class AccessibleImageHandler extends NodeHandler
             XAccessibleImage xImage = getImage ((AccTreeNode)aParent);
             if (xImage != null)
                 return new StringNode (
-                    "Image: " +
+                    "Image: " + 
                     xImage.getAccessibleImageDescription() + " (" +
                     xImage.getAccessibleImageWidth() + "x" +
                     xImage.getAccessibleImageHeight() + ")",
diff --git a/toolkit/test/accessibility/AccessibleRelationHandler.java b/toolkit/test/accessibility/AccessibleRelationHandler.java
index ea3be4c16264..d4cbc9a7e1c2 100644
--- a/toolkit/test/accessibility/AccessibleRelationHandler.java
+++ b/toolkit/test/accessibility/AccessibleRelationHandler.java
@@ -8,7 +8,7 @@ import com.sun.star.lang.IndexOutOfBoundsException;
 
 import tools.NameProvider;
 
-class AccessibleRelationHandler
+class AccessibleRelationHandler 
     extends NodeHandler
 {
     public NodeHandler createHandler( XAccessibleContext xContext )
@@ -34,7 +34,7 @@ class AccessibleRelationHandler
             maChildList.setSize( 1 );
     }
 
-    public AccessibleTreeNode createChild( AccessibleTreeNode aParent,
+    public AccessibleTreeNode createChild( AccessibleTreeNode aParent, 
                                            int nIndex )
     {
         XAccessibleRelationSet xRelation = null;
@@ -42,7 +42,7 @@ class AccessibleRelationHandler
 
         if( aParent instanceof AccTreeNode )
         {
-            xRelation =
+            xRelation = 
                 ((AccTreeNode)aParent).getContext().getAccessibleRelationSet();
         }
         if( xRelation == null )
@@ -64,8 +64,8 @@ class AccessibleRelationHandler
                 for( int j = 0; j < aRelation.TargetSet.length; j++ )
                 {
                     Object aTarget = aRelation.TargetSet[j];
-                    XAccessible xAccTarget =
-                        (XAccessible)UnoRuntime.queryInterface(
+                    XAccessible xAccTarget = 
+                        (XAccessible)UnoRuntime.queryInterface( 
                              XAccessible.class, aTarget );
                     if( xAccTarget == null )
                     {
@@ -80,7 +80,7 @@ class AccessibleRelationHandler
                 }
                 aBuffer.delete( aBuffer.length() - 2, aBuffer.length() );
 
-                aVNode.addChild( new StringNode( aBuffer.toString(),
+                aVNode.addChild( new StringNode( aBuffer.toString(), 
                                                  aParent ) );
             }
 
diff --git a/toolkit/test/accessibility/AccessibleSelectionHandler.java b/toolkit/test/accessibility/AccessibleSelectionHandler.java
index f7ab62807332..bf6fbade0762 100644
--- a/toolkit/test/accessibility/AccessibleSelectionHandler.java
+++ b/toolkit/test/accessibility/AccessibleSelectionHandler.java
@@ -13,15 +13,15 @@ import java.awt.event.ActionEvent;
 
 
 
-class AccessibleSelectionHandler
+class AccessibleSelectionHandler 
     extends NodeHandler
 {
     public NodeHandler createHandler( XAccessibleContext xContext )
     {
-        XAccessibleSelection xSelection =
+        XAccessibleSelection xSelection = 
             (XAccessibleSelection) UnoRuntime.queryInterface(
                 XAccessibleSelection.class, xContext);
-        return (xSelection == null) ? null :
+        return (xSelection == null) ? null : 
             new AccessibleSelectionHandler(xSelection);
     }
 
@@ -35,28 +35,28 @@ class AccessibleSelectionHandler
             maChildList.setSize( 2 );
     }
 
-    public AccessibleTreeNode createChild( AccessibleTreeNode aParent,
+    public AccessibleTreeNode createChild( AccessibleTreeNode aParent, 
                                            int nIndex )
     {
         AccessibleTreeNode aChild = null;
 
         if( aParent instanceof AccTreeNode )
         {
-            XAccessibleSelection xSelection =
+            XAccessibleSelection xSelection = 
                 ((AccTreeNode)aParent).getSelection();
             if( xSelection != null )
             {
                 switch( nIndex )
                 {
                     case 0:
-                        aChild = new StringNode(
-                            "getSelectedAccessibleChildCount: " +
+                        aChild = new StringNode( 
+                            "getSelectedAccessibleChildCount: " + 
                             xSelection.getSelectedAccessibleChildCount(),
                             aParent );
                         break;
                     case 1:
                     {
-                        VectorNode aVNode =
+                        VectorNode aVNode = 
                             new VectorNode( "Selected Children", aParent);
                         int nSelected = 0;
                         int nCount = ((AccTreeNode)aParent).getContext().
@@ -71,13 +71,13 @@ class AccessibleSelectionHandler
                                     {
                                         XAccessible xSelChild = xSelection.
                                             getSelectedAccessibleChild(nSelected);
-                                        XAccessible xNChild =
+                                        XAccessible xNChild = 
                                             ((AccTreeNode)aParent).
                                             getContext().getAccessibleChild( i );
                                         aVNode.addChild( new StringNode(
-                                            i + ": " +
+                                            i + ": " + 
                                             xNChild.getAccessibleContext().
-                                            getAccessibleDescription() + " (" +
+                                            getAccessibleDescription() + " (" +  
                                             (xSelChild.equals(xNChild) ? "OK" : "XXX") +
                                             ")", aParent ) );
                                     }
@@ -93,7 +93,7 @@ class AccessibleSelectionHandler
                         }
                         catch( IndexOutOfBoundsException e )
                         {
-                            aChild = new StringNode( "IndexOutOfBounds",
+                            aChild = new StringNode( "IndexOutOfBounds", 
                                                      aParent );
                         }
                     }
@@ -109,11 +109,11 @@ class AccessibleSelectionHandler
     }
 
 
-    public String[] getActions (AccessibleTreeNode aNode)
-    {
+    public String[] getActions (AccessibleTreeNode aNode) 
+    { 
         if( aNode instanceof AccTreeNode )
         {
-            XAccessibleSelection xSelection =
+            XAccessibleSelection xSelection = 
                 ((AccTreeNode)aNode).getSelection();
             if( xSelection != null )
             {
@@ -124,7 +124,7 @@ class AccessibleSelectionHandler
     }
 
     public void performAction (AccessibleTreeNode aNode, int nIndex)
-    {
+    { 
         new SelectionDialog( (AccTreeNode)aNode ).show();
     }
 }
diff --git a/toolkit/test/accessibility/AccessibleTableHandler.java b/toolkit/test/accessibility/AccessibleTableHandler.java
index c3883f649d5e..cc175bb4c63d 100644
--- a/toolkit/test/accessibility/AccessibleTableHandler.java
+++ b/toolkit/test/accessibility/AccessibleTableHandler.java
@@ -8,7 +8,7 @@ class AccessibleTableHandler extends NodeHandler
 {
     public NodeHandler createHandler (XAccessibleContext xContext)
     {
-        XAccessibleTable xTable =
+        XAccessibleTable xTable = 
             (XAccessibleTable) UnoRuntime.queryInterface (
                 XAccessibleTable.class, xContext);
         if (xTable != null)
diff --git a/toolkit/test/accessibility/AccessibleTextHandler.java b/toolkit/test/accessibility/AccessibleTextHandler.java
index 6fa083b22ea3..2f256a4f3573 100644
--- a/toolkit/test/accessibility/AccessibleTextHandler.java
+++ b/toolkit/test/accessibility/AccessibleTextHandler.java
@@ -78,9 +78,9 @@ class AccessibleTextHandler extends NodeHandler
                         aChild = new StringNode (characters( xText ), aParent);
                         break;
                     case 3:
-                        aChild = new StringNode ("selection: "
-                            + "[" + xText.getSelectionStart()
-                            + "," + xText.getSelectionEnd()
+                        aChild = new StringNode ("selection: " 
+                            + "[" + xText.getSelectionStart() 
+                            + "," + xText.getSelectionEnd() 
                             + "] \"" + xText.getSelectedText() + "\"",
                             aParent);
                         break;
@@ -91,32 +91,32 @@ class AccessibleTextHandler extends NodeHandler
                     {
                         VectorNode aVec = new VectorNode("portions", aParent);
                         aChild = aVec;
-                        aVec.addChild(
-                             textAtIndexNode( xText, "Character",
+                        aVec.addChild( 
+                             textAtIndexNode( xText, "Character", 
                                               AccessibleTextType.CHARACTER,
                                               aParent ) );
-                        aVec.addChild(
-                            textAtIndexNode( xText, "Word",
-                                             AccessibleTextType.WORD,
+                        aVec.addChild( 
+                            textAtIndexNode( xText, "Word", 
+                                             AccessibleTextType.WORD, 
                                              aParent ) );
-                        aVec.addChild(
-                            textAtIndexNode( xText, "Sentence",
+                        aVec.addChild( 
+                            textAtIndexNode( xText, "Sentence", 
                                              AccessibleTextType.SENTENCE,
                                              aParent ) );
-                        aVec.addChild(
-                            textAtIndexNode( xText, "Paragraph",
+                        aVec.addChild( 
+                            textAtIndexNode( xText, "Paragraph", 
                                              AccessibleTextType.PARAGRAPH,
                                              aParent ) );
-                        aVec.addChild(
-                            textAtIndexNode( xText, "Line",
+                        aVec.addChild( 
+                            textAtIndexNode( xText, "Line", 
                                              AccessibleTextType.LINE,
                                              aParent ) );
-                        aVec.addChild(
+                        aVec.addChild( 
                             textAtIndexNode( xText, "Attribute",
                                              AccessibleTextType.ATTRIBUTE_RUN,
                                              aParent ) );
-                        aVec.addChild(
-                            textAtIndexNode( xText, "Glyph",
+                        aVec.addChild( 
+                            textAtIndexNode( xText, "Glyph", 
                                              AccessibleTextType.GLYPH,
                                              aParent ) );
                     }
@@ -147,21 +147,21 @@ class AccessibleTextHandler extends NodeHandler
     {
         return "[" + nStart + "," + nEnd + "] "
             + "\"" + sWord + "\"     \t"
-            + "(" + sBefore + ","
+            + "(" + sBefore + "," 
             + "" + sBehind + ")";
     }
-
+    
     /** Create a text node that lists all strings of a particular text type
      */
     private AccessibleTreeNode textAtIndexNode(
-        XAccessibleText xText,
-        String sName,
+        XAccessibleText xText, 
+        String sName, 
         short nTextType,
         AccessibleTreeNode aParent)
     {
         VectorNode aNode = new VectorNode (sName, aParent);
 
-        // get word at all positions;
+        // get word at all positions; 
         // for nicer display, compare current word to previous one and
         // make a new node for every interval, not for every word
         int nLength = xText.getCharacterCount();
@@ -170,7 +170,7 @@ class AccessibleTextHandler extends NodeHandler
             try
             {
                 // sWord + nStart mark the current word
-                // make a node as soon as a new one is found; close the last
+                // make a node as soon as a new one is found; close the last 
                 // one at the end
                 TextSegment sWord = xText.getTextAtIndex(0, nTextType);
                 TextSegment sBefore = xText.getTextBeforeIndex(0, nTextType);
@@ -185,14 +185,14 @@ class AccessibleTextHandler extends NodeHandler
                             sTBeh.equals( sBehind ) ) )
                     {
                         aNode.addChild (new StringNode (textAtIndexNodeString(
-                            nStart, i,
+                            nStart, i, 
                             sWord.SegmentText, sBefore.SegmentText, sBehind.SegmentText), aNode));
                         sWord = sTmp;
                         sBefore = sTBef;
                         sBehind = sTBeh;
                         nStart = i;
                     }
-
+                    
                     // don't generate more than 50 children.
                     if (aNode.getChildCount() > 50)
                     {
@@ -200,8 +200,8 @@ class AccessibleTextHandler extends NodeHandler
                         break;
                     }
                 }
-                aNode.addChild (new StringNode (textAtIndexNodeString(
-                    nStart, nLength,
+                aNode.addChild (new StringNode (textAtIndexNodeString( 
+                    nStart, nLength, 
                     sWord.SegmentText, sBefore.SegmentText, sBehind.SegmentText), aNode));
             }
             catch( IndexOutOfBoundsException e )
@@ -237,7 +237,7 @@ class AccessibleTextHandler extends NodeHandler
                 aChars.append( xText.getCharacter(i) );
                 aChars.append( "," );
             }
-            if( nChars > 0)
+            if( nChars > 0) 
             {
                 if( nChars == xText.getCharacterCount() )
                     aChars.deleteCharAt( aChars.length() - 1 );
@@ -256,7 +256,7 @@ class AccessibleTextHandler extends NodeHandler
     }
 
 
-    /** iterate over characters, and translate their positions
+    /** iterate over characters, and translate their positions 
      * back and forth */
     private String bounds( XAccessibleText xText )
     {
@@ -290,7 +290,7 @@ class AccessibleTextHandler extends NodeHandler
         return aBuffer.toString();
     }
 
-
+    
     private AccessibleTreeNode getAttributes( XAccessibleText xText,
                                   AccessibleTreeNode aParent)
     {
@@ -316,7 +316,7 @@ class AccessibleTextHandler extends NodeHandler
         try
         {
             VectorNode aPortions = new VectorNode ("getAttributes", aParent);
-
+        
             int nIndex = 0;
             int nLength = xText.getCharacterCount();
             while( nIndex < nLength )
@@ -325,7 +325,7 @@ class AccessibleTextHandler extends NodeHandler
                 String aPortion = null;
                 try
                 {
-                    aPortion = xText.getTextAtIndex(
+                    aPortion = xText.getTextAtIndex( 
                         nIndex, AccessibleTextType.ATTRIBUTE_RUN).SegmentText;
                 }
                 catch(com.sun.star.lang.IllegalArgumentException e)
@@ -338,7 +338,7 @@ class AccessibleTextHandler extends NodeHandler
                 VectorNode aAttrs = new VectorNode (aPortion, aPortions);
                 for( int i = 0; i < aValues.length; i++ )
                 {
-                    new StringNode( aValues[i].Name + ": " + aValues[i].Value,
+                    new StringNode( aValues[i].Name + ": " + aValues[i].Value, 
                                     aAttrs );
                 }
 
@@ -349,31 +349,31 @@ class AccessibleTextHandler extends NodeHandler
             aRet = aPortions;
         }
         catch( IndexOutOfBoundsException e )
-        {
-            aRet = new StringNode( "Exception caught:" + e, aParent );
+        { 
+            aRet = new StringNode( "Exception caught:" + e, aParent ); 
         }
 
         return aRet;
     }
 
 
-    static String[] aTextActions =
+    static String[] aTextActions = 
         new String[] { "select...", "copy..." };
-    static String[] aEditableTextActions =
-        new String[] { "select...", "copy...",
+    static String[] aEditableTextActions = 
+        new String[] { "select...", "copy...", 
                        "cut...", "paste...", "edit...", "format..." };
 
-    public String[] getActions (AccessibleTreeNode aNode)
-    {
+    public String[] getActions (AccessibleTreeNode aNode) 
+    { 
         XAccessibleEditableText xEText = null;
         if (aNode instanceof AccTreeNode)
             xEText = ((AccTreeNode)aNode).getEditText ();
-
+        
         return (xEText == null) ? aTextActions : aEditableTextActions;
     }
 
     public void performAction (AccessibleTreeNode aNode, int nIndex)
-    {
+    { 
         if ( ! (aNode instanceof AccTreeNode))
             return;
 
@@ -384,66 +384,66 @@ class AccessibleTextHandler extends NodeHandler
         switch( nIndex )
         {
             case 0:
-                aDialog = new TextActionDialog( aATNode,
-                                                "Select range:",
+                aDialog = new TextActionDialog( aATNode, 
+                                                "Select range:", 
                                                 "select" )
                     {
-                        boolean action(
+                        boolean action( 
                             JTextComponent aText, AccTreeNode aNode )
                             throws IndexOutOfBoundsException
                         {
-                            return aNode.getText().setSelection(
-                                getSelectionStart(),
+                            return aNode.getText().setSelection( 
+                                getSelectionStart(), 
                                 getSelectionEnd() );
                         }
                     };
                 break;
             case 1:
-                aDialog = new TextActionDialog( aATNode,
-                                                "Select range and copy:",
+                aDialog = new TextActionDialog( aATNode, 
+                                                "Select range and copy:", 
                                                 "copy" )
                     {
-                        boolean action(
+                        boolean action( 
                             JTextComponent aText, AccTreeNode aNode )
                             throws IndexOutOfBoundsException
                         {
-                            return aNode.getText().copyText(
-                                getSelectionStart(),
+                            return aNode.getText().copyText( 
+                                getSelectionStart(), 
                                 getSelectionEnd() );
                         }
                     };
                 break;
             case 2:
-                aDialog = new TextActionDialog( aATNode,
-                                                "Select range and cut:",
+                aDialog = new TextActionDialog( aATNode, 
+                                                "Select range and cut:", 
                                                 "cut" )
                     {
-                        boolean action(
+                        boolean action( 
                             JTextComponent aText, AccTreeNode aNode )
                             throws IndexOutOfBoundsException
                         {
-                            return aNode.getEditText().cutText(
-                                getSelectionStart(),
+                            return aNode.getEditText().cutText( 
+                                getSelectionStart(), 
                                 getSelectionEnd() );
                         }
                     };
                 break;
             case 3:
-                aDialog = new TextActionDialog( aATNode,
-                                                "Place Caret and paste:",
+                aDialog = new TextActionDialog( aATNode, 
+                                                "Place Caret and paste:", 
                                                 "paste" )
                     {
-                        boolean action(
+                        boolean action( 
                             JTextComponent aText, AccTreeNode aNode )
                             throws IndexOutOfBoundsException
                         {
-                            return aNode.getEditText().pasteText(
+                            return aNode.getEditText().pasteText( 
                                 aText.getCaretPosition() );
                         }
                     };
                 break;
             case 4:
-                aDialog = new TextEditDialog( aATNode, "Edit text:",
+                aDialog = new TextEditDialog( aATNode, "Edit text:", 
                                               "edit" );
                 break;
             case 5:
@@ -469,7 +469,7 @@ class TextActionDialog extends JDialog
     JCheckBox aIndexToggle;
 
     public TextActionDialog( AccTreeNode aNd,
-                             String sExplanation,
+                             String sExplanation, 
                              String sButtonText )
     {
         super( AccessibilityWorkBench.Instance() );
@@ -482,8 +482,8 @@ class TextActionDialog extends JDialog
     }
 
     /** build dialog */
-    protected void init( String sExplanation,
-                         String sText,
+    protected void init( String sExplanation, 
+                         String sText, 
                          String sButtonText )
     {
         setTitle( sName );
@@ -504,7 +504,7 @@ class TextActionDialog extends JDialog
         aText.setLineWrap( true );
         aText.setEditable( false );
         aContent.add( aText, BorderLayout.CENTER );
-
+        
         JPanel aButtons = new JPanel();
         aButtons.setLayout( new FlowLayout() );
         aIndexToggle = new JCheckBox( "reverse selection" );
@@ -543,8 +543,8 @@ class TextActionDialog extends JDialog
         }
 
         if( sError != null )
-            JOptionPane.showMessageDialog( AccessibilityWorkBench.Instance(),
-                                           sError, sName,
+            JOptionPane.showMessageDialog( AccessibilityWorkBench.Instance(), 
+                                           sError, sName, 
                                            JOptionPane.ERROR_MESSAGE);
 
         cancel();
@@ -565,14 +565,14 @@ class TextActionDialog extends JDialog
     int getSelectionEnd()       { return getSelection(false); }
     int getSelection(boolean bStart)
     {
-        return ( bStart ^ aIndexToggle.isSelected() )
+        return ( bStart ^ aIndexToggle.isSelected() ) 
             ? aText.getSelectionStart() : aText.getSelectionEnd();
     }
 
 
 
     /** override this for dialog-specific action */
-    boolean action( JTextComponent aText, AccTreeNode aNode )
+    boolean action( JTextComponent aText, AccTreeNode aNode ) 
         throws IndexOutOfBoundsException
     {
         return false;
@@ -583,14 +583,14 @@ class TextActionDialog extends JDialog
 class TextEditDialog extends TextActionDialog
 {
     public TextEditDialog( AccTreeNode aNode,
-                           String sExplanation,
+                           String sExplanation, 
                            String sButtonText )
     {
         super( aNode, sExplanation, sButtonText );
     }
 
-    protected void init( String sExplanation,
-                         String sText,
+    protected void init( String sExplanation, 
+                         String sText, 
                          String sButtonText )
     {
         super.init( sExplanation, sText, sButtonText );
@@ -599,7 +599,7 @@ class TextEditDialog extends TextActionDialog
 
 
     /** edit the text */
-    boolean action( JTextComponent aText, AccTreeNode aNode )
+    boolean action( JTextComponent aText, AccTreeNode aNode ) 
     {
         // is this text editable? if not, fudge you and return
         XAccessibleEditableText xEdit = aNode.getEditText();
@@ -629,7 +629,7 @@ class TextEditDialog extends TextActionDialog
             nFront++;
         int nBack = 0;
         while( (nBack < nMinLength) &&
-               ( sNew.charAt(sNew.length()-nBack-1) ==
+               ( sNew.charAt(sNew.length()-nBack-1) == 
                  sOld.charAt(sOld.length()-nBack-1)    ) )
             nBack++;
         if( nFront + nBack > nMinLength )
@@ -640,7 +640,7 @@ class TextEditDialog extends TextActionDialog
         String sDel = sOld.substring( nFront, sOld.length() - nBack );
         String sIns = sNew.substring( nFront, sNew.length() - nBack );
 
-        System.out.println("edit text: " +
+        System.out.println("edit text: " + 
                            sOld.substring(0, nFront) +
                            " [ " + sDel + " -> " + sIns + " ] " +
                            sOld.substring(sOld.length() - nBack) );
@@ -674,19 +674,19 @@ class TextAttributeDialog extends TextActionDialog
     public TextAttributeDialog(
         AccTreeNode aNode )
     {
-        super( aNode, "Choose attributes, select text, and press 'Set':",
+        super( aNode, "Choose attributes, select text, and press 'Set':", 
                "set" );
     }
 
     private JCheckBox aBold, aUnderline, aItalics;
     private Color aForeground, aBackground;
 
-    protected void init( String sExplanation,
-                         String sText,
+    protected void init( String sExplanation, 
+                         String sText, 
                          String sButtonText )
     {
         super.init( sExplanation, sText, sButtonText );
-
+        
         aForeground = Color.black;
         aBackground = Color.white;
 
@@ -699,22 +699,22 @@ class TextAttributeDialog extends TextActionDialog
 
         JButton aForeButton = new JButton("Foreground", new ColorIcon(true));
         aForeButton.addActionListener( new ActionListener() {
-                public void actionPerformed(ActionEvent e)
-                {
+                public void actionPerformed(ActionEvent e) 
+                { 
                     aForeground = JColorChooser.showDialog(
-                        TextAttributeDialog.this,
-                        "Select Foreground Color",
+                        TextAttributeDialog.this, 
+                        "Select Foreground Color", 
                         aForeground);
                 }
             } );
-
+           
         JButton aBackButton = new JButton("Background", new ColorIcon(false));
         aBackButton.addActionListener( new ActionListener() {
-                public void actionPerformed(ActionEvent e)
-                {
+                public void actionPerformed(ActionEvent e) 
+                { 
                     aBackground = JColorChooser.showDialog(
-                        TextAttributeDialog.this,
-                        "Select Background Color",
+                        TextAttributeDialog.this, 
+                        "Select Background Color", 
                         aBackground);
                 }
             } );
@@ -751,10 +751,10 @@ class TextAttributeDialog extends TextActionDialog
         }
     }
 
-
+          
 
     /** edit the text */
-    boolean action( JTextComponent aText, AccTreeNode aNode )
+    boolean action( JTextComponent aText, AccTreeNode aNode ) 
         throws IndexOutOfBoundsException
     {
         // is this text editable? if not, fudge you and return
@@ -782,7 +782,7 @@ class TextAttributeDialog extends TextActionDialog
             aSequence[5].Name = "CharBackTransparent";
             aSequence[5].Value = new Boolean( false );
 
-            bSuccess = xEdit.setAttributes( getSelectionStart(),
+            bSuccess = xEdit.setAttributes( getSelectionStart(), 
                                             getSelectionEnd(),
                                             aSequence );
         }
diff --git a/toolkit/test/accessibility/AccessibleTreeCellRenderer.java b/toolkit/test/accessibility/AccessibleTreeCellRenderer.java
index deb3cb967133..8e8f26aa858a 100644
--- a/toolkit/test/accessibility/AccessibleTreeCellRenderer.java
+++ b/toolkit/test/accessibility/AccessibleTreeCellRenderer.java
@@ -7,7 +7,7 @@ import java.util.Vector;
 
 
 public class AccessibleTreeCellRenderer
-    extends DefaultTreeCellRenderer
+    extends DefaultTreeCellRenderer 
 {
     public Color
         maDefaultColor,
@@ -17,7 +17,7 @@ public class AccessibleTreeCellRenderer
 
 
 
-    public AccessibleTreeCellRenderer ()
+    public AccessibleTreeCellRenderer () 
     {
         maDefaultColor = Color.black;
         maChangedColor = Color.red;
@@ -31,7 +31,7 @@ public class AccessibleTreeCellRenderer
         boolean expanded,
         boolean leaf,
         int row,
-        boolean hasFocus)
+        boolean hasFocus) 
     {
         super.getTreeCellRendererComponent(
             tree, value, sel,
@@ -40,7 +40,7 @@ public class AccessibleTreeCellRenderer
 
         if (maChangedLines.size()<=row || maChangedLines.elementAt (row) == null)
             setTextNonSelectionColor (maDefaultColor);
-        else
+        else 
             setTextNonSelectionColor (maChangedColor);
 
         return this;
diff --git a/toolkit/test/accessibility/AccessibleTreeHandler.java b/toolkit/test/accessibility/AccessibleTreeHandler.java
index f45db8cb5ab9..7c05ed43008d 100644
--- a/toolkit/test/accessibility/AccessibleTreeHandler.java
+++ b/toolkit/test/accessibility/AccessibleTreeHandler.java
@@ -6,9 +6,9 @@ import com.sun.star.lang.IndexOutOfBoundsException;
 
 /**
  * Map the tree of accessibility objects into their
- * AccessibilityTreeModel counterparts.
+ * AccessibilityTreeModel counterparts. 
  */
-class AccessibleTreeHandler
+class AccessibleTreeHandler 
     extends NodeHandler
 {
     protected XAccessibleContext mxContext;
@@ -59,7 +59,7 @@ class AccessibleTreeHandler
                         xChild, aParent);
                 }
                 catch( IndexOutOfBoundsException e )
-                {
+                { 
                     aChild = new StringNode ("ERROR: no child with index " + nIndex, aParent);
                 }
             }
@@ -98,7 +98,7 @@ class AccessibleTreeHandler
 
 
     /** Update only the child count node.  Trust on other ways to update the
-        accessible children.
+        accessible children. 
     */
     public void update (AccessibleTreeNode aNode)
     {
diff --git a/toolkit/test/accessibility/AccessibleTreeNode.java b/toolkit/test/accessibility/AccessibleTreeNode.java
index f9b0799e4423..205556c061c6 100644
--- a/toolkit/test/accessibility/AccessibleTreeNode.java
+++ b/toolkit/test/accessibility/AccessibleTreeNode.java
@@ -23,14 +23,14 @@ class AccessibleTreeNode
         // Empty
     }
 
-    public AccessibleTreeNode getParent ()
+    public AccessibleTreeNode getParent () 
     {
-        return maParent;
+        return maParent; 
     }
 
-    public Object getDisplayObject ()
+    public Object getDisplayObject () 
     {
-        return maDisplayObject;
+        return maDisplayObject; 
     }
 
     public int getChildCount ()
@@ -78,7 +78,7 @@ class AccessibleTreeNode
         return aPath.toArray();
     }
 
-    public boolean isLeaf()
+    public boolean isLeaf() 
     {
         return true;
     }
@@ -89,13 +89,13 @@ class AccessibleTreeNode
     }
 
     /** get names of suported actions */
-    public String[] getActions ()
-    {
+    public String[] getActions () 
+    { 
         return new String[] {};
     }
 
     /** perform action */
-    public void performAction (int nIndex)
+    public void performAction (int nIndex) 
     {
     }
 }
diff --git a/toolkit/test/accessibility/AccessibleUNOHandler.java b/toolkit/test/accessibility/AccessibleUNOHandler.java
index d52e60cd721f..cdd0906ef614 100644
--- a/toolkit/test/accessibility/AccessibleUNOHandler.java
+++ b/toolkit/test/accessibility/AccessibleUNOHandler.java
@@ -12,14 +12,14 @@ import com.sun.star.uno.Type;
 /** This handler displays lower level UNO information.  These are the
     supported services, interfaces, and the implementation name.
 */
-class AccessibleUNOHandler
+class AccessibleUNOHandler 
     extends NodeHandler
 {
     public NodeHandler createHandler (XAccessibleContext xContext)
     {
         if (xContext == null)
             return null;
-        else
+        else 
             return new AccessibleUNOHandler (xContext);
     }
 
@@ -49,7 +49,7 @@ class AccessibleUNOHandler
         return xTypeProvider;
     }
 
-    public AccessibleTreeNode createChild (AccessibleTreeNode aParent,
+    public AccessibleTreeNode createChild (AccessibleTreeNode aParent, 
                                            int nIndex)
     {
         AccessibleTreeNode aChild = null;
diff --git a/toolkit/test/accessibility/Canvas.java b/toolkit/test/accessibility/Canvas.java
index a1d8fb0f7d08..a9614c81e4bb 100755
--- a/toolkit/test/accessibility/Canvas.java
+++ b/toolkit/test/accessibility/Canvas.java
@@ -19,7 +19,7 @@ import com.sun.star.accessibility.XAccessibleComponent;
     <p>The canvas listens to selection events of the associated JTree and
     highlights the first selected node of that tree.</p>
 */
-class Canvas
+class Canvas 
     extends JPanel
     implements MouseListener, MouseMotionListener, TreeSelectionListener//, Scrollable
 {
@@ -48,7 +48,7 @@ class Canvas
     }
 
     /** Tell the canvas which tree view to use to highlight accessible
-        objects.
+        objects. 
     */
     public void setTree (JTree aTree)
     {
@@ -67,7 +67,7 @@ class Canvas
         if (maNodes.indexOf (aNode) == -1)
         {
             maNodes.add (aNode);
-
+            
             CanvasShape aObject = (CanvasShape) maObjects.get (aNode);
             if (aObject == null)
             {
@@ -77,7 +77,7 @@ class Canvas
                     maBoundingBox = aObject.getBBox();
                 else
                     maBoundingBox = maBoundingBox.union (aObject.getBBox());
-
+                
                 maObjects.put (aNode, aObject);
                 maObjectList.add (aObject);
 
@@ -109,14 +109,14 @@ class Canvas
                 aObject.update();
         }
     }
-
+    
     public void updateNodeGeometry (AccTreeNode aNode)
     {
         CanvasShape aObject = (CanvasShape)maObjects.get(aNode);
         if (aObject != null)
             aObject.updateGeometry();
     }
-
+    
     public void clear ()
     {
         while (maNodes.size() > 0)
@@ -159,7 +159,7 @@ class Canvas
         Options.SetBoolean ("Antialiasing", bNewValue);
         repaint ();
     }
-
+    
     public boolean getShowText ()
     {
         return Options.GetBoolean ("ShowText");
@@ -191,10 +191,10 @@ class Canvas
 
             Graphics2D g2 = (Graphics2D)g;
             if (getAntialiasing())
-                g2.setRenderingHint (RenderingHints.KEY_ANTIALIASING,
+                g2.setRenderingHint (RenderingHints.KEY_ANTIALIASING, 
                     RenderingHints.VALUE_ANTIALIAS_ON);
             else
-                g2.setRenderingHint (RenderingHints.KEY_ANTIALIASING,
+                g2.setRenderingHint (RenderingHints.KEY_ANTIALIASING, 
                     RenderingHints.VALUE_ANTIALIAS_OFF);
 
             setupTransformation ();
@@ -212,7 +212,7 @@ class Canvas
             g2.fill (aScreen);
             g2.setColor (Color.BLACK);
             g2.draw (aScreen);
-
+            
             synchronized (maObjectList)
             {
                 int nCount = maObjectList.size();
@@ -228,7 +228,7 @@ class Canvas
                         bShowDescriptions, bShowNames, bShowText);
                 }
             }
-
+            
             // Paint highlighted frame around active object as the last thing.
             if (maActiveObject != null)
                 maActiveObject.paint_highlight (
@@ -278,7 +278,7 @@ class Canvas
                     // Calculate the scales that would map the screen onto the
                     // widget in both of the coordinate axes and select the
                     // smaller
-                    // of the two: it maps the screen onto the widget in both
+                    // of the two: it maps the screen onto the widget in both 
                     // axes at the same time.
                     double nHScale = (aWidgetSize.getWidth() - 10) / aScreenSize.getWidth();
                     double nVScale = (aWidgetSize.getHeight() - 10) / aScreenSize.getHeight();
@@ -299,7 +299,7 @@ class Canvas
                     mnHOffset = 0;
                 if (mnVOffset < 0)
                     mnVOffset = 0;
-
+            
                 setPreferredSize (new Dimension (
                     (int)(2*mnHOffset + mnScale * aScreenSize.getWidth()),
                     (int)(2*mnVOffset + mnScale * aScreenSize.getHeight())));
@@ -316,8 +316,8 @@ class Canvas
         }
         maLastWidgetSize = aWidgetSize;
     }
-
-
+    
+    
 
     /**  Call getAccessibleAt to determine accessible object under mouse.
     */
@@ -388,7 +388,7 @@ class Canvas
         {
             if (maActiveObject != null)
                 maActiveObject.unhighlight();
-
+            
             maActiveObject = aNewActiveObject;
             if (maActiveObject != null)
             {
@@ -406,7 +406,7 @@ class Canvas
         else
             return false;
     }
-
+    
     /** Called when the selection of the tree changes.  Highlight the
         corresponding graphical representation of the first selected object.
     */
@@ -422,7 +422,7 @@ class Canvas
         }
     }
 
-    private int
+    private int 
         mnXAnchor,
         mnYAnchor,
         maResizeFlag;
@@ -430,19 +430,19 @@ class Canvas
         mnHOffset,
         mnVOffset,
         mnScale;
-    private CanvasShape
+    private CanvasShape 
         maActiveObject;
     private java.util.HashMap
         maObjects;
-    private Vector
+    private Vector 
         maObjectList,
         maContexts,
         maNodes;
-    private Rectangle
+    private Rectangle 
         maBoundingBox;
     private JTree
         maTree;
     // The size of the widget at the last call of setupTransformation()
-    private Dimension
+    private Dimension 
         maLastWidgetSize;
 }
diff --git a/toolkit/test/accessibility/CanvasShape.java b/toolkit/test/accessibility/CanvasShape.java
index 57cedebb9e88..c71320b43e69 100644
--- a/toolkit/test/accessibility/CanvasShape.java
+++ b/toolkit/test/accessibility/CanvasShape.java
@@ -61,7 +61,7 @@ class CanvasShape
                 mbFocused = xStateSet.contains (AccessibleStateType.FOCUSED);
             }
         }
-
+         
         updateGeometry ();
         if (mxComponent != null)
         {
@@ -99,7 +99,7 @@ class CanvasShape
     /** Paint the object into the specified canvas.  It is transformed
         according to the specified offset and scale.
     */
-    public void paint (Graphics2D g,
+    public void paint (Graphics2D g, 
         double nXOffset, double nYOffset, double nScaleFactor,
         boolean bShowDescription, boolean bShowName, boolean bShowText)
     {
@@ -112,7 +112,7 @@ class CanvasShape
                 maPosition.y * nScaleFactor + nYOffset,
                 maSize.width * nScaleFactor,
                 maSize.height * nScaleFactor);
-
+            
             // Fill the object's bounding box with its background color if it
             // has no children.
             if (mxContext.getAccessibleChildCount() == 0)
@@ -127,7 +127,7 @@ class CanvasShape
                 color = new Color (maFgColor.getRed(), maFgColor.getGreen(), maFgColor.getBlue());
             g.setColor (color);
             g.draw (maShape);
-
+            
             if (mbFocused)
             {
                 g.setColor (maFocusColor);
@@ -167,7 +167,7 @@ class CanvasShape
         }
     }
 
-    public void paint_highlight (Graphics2D g,
+    public void paint_highlight (Graphics2D g, 
         double nXOffset, double nYOffset, double nScaleFactor)
     {
         if (mbHighlighted)
@@ -182,18 +182,18 @@ class CanvasShape
 
     private void paintName (Graphics2D g)
     {
-        g.drawString ("Name: " + msName,
-            (float)maShape.x+5,
-            (float)maShape.y+15);
+        g.drawString ("Name: " + msName, 
+            (float)maShape.x+5, 
+            (float)maShape.y+15); 
     }
 
 
 
     private void paintDescription (Graphics2D g)
     {
-        g.drawString ("Description: " + msDescription,
-            (float)maShape.x+5,
-            (float)maShape.y+35);
+        g.drawString ("Description: " + msDescription, 
+            (float)maShape.x+5, 
+            (float)maShape.y+35); 
     }
 
 
@@ -215,10 +215,10 @@ class CanvasShape
                 {
                     com.sun.star.awt.Rectangle aRect =
                         xText.getCharacterBounds(i);
-
+                    
                     double x = maShape.x + aRect.X;
                     double y = maShape.y + aRect.Y + aRect.Height;
-
+                    
                     g.drawString(sText.substring(i, i+1), (float)x, (float)y);
                 }
             }
@@ -267,7 +267,7 @@ class CanvasShape
     {
         return new Rectangle (maPosition, maSize);
     }
-
+    
     public Point getOrigin ()
     {
         return maPosition;
diff --git a/toolkit/test/accessibility/EventHandler.java b/toolkit/test/accessibility/EventHandler.java
index 69f7fd2144f0..616448e5d769 100644
--- a/toolkit/test/accessibility/EventHandler.java
+++ b/toolkit/test/accessibility/EventHandler.java
@@ -31,9 +31,9 @@ class EventHandler
 
     public void Print (PrintStream out)
     {
-        out.println ("Event id is " + mnEventId
+        out.println ("Event id is " + mnEventId 
             + " (" + NameProvider.getEventName(mnEventId)+")"
-            + " for " + mxEventSource.getAccessibleName() + " / "
+            + " for " + mxEventSource.getAccessibleName() + " / " 
             + NameProvider.getRoleName (mxEventSource.getAccessibleRole()));
         PrintOldAndNew (out);
     }
diff --git a/toolkit/test/accessibility/EventQueue.java b/toolkit/test/accessibility/EventQueue.java
index 9c90af9c63b7..4eb86ede50ce 100644
--- a/toolkit/test/accessibility/EventQueue.java
+++ b/toolkit/test/accessibility/EventQueue.java
@@ -93,7 +93,7 @@ class EventQueue
                     }
                     catch( Throwable e )
                     {
-                        System.out.println(
+                        System.out.println( 
                             "caught exception during event delivery: " + e );
                         e.printStackTrace();
                     }
@@ -109,7 +109,7 @@ class EventQueue
                 }
             }
             catch (Exception e)
-            {
+            { 
                 // can't wait? odd!
                 System.err.println("Can't wait!");
                 e.printStackTrace();
diff --git a/toolkit/test/accessibility/FrameActionListener.java b/toolkit/test/accessibility/FrameActionListener.java
index 30324fb9bc52..27d44455e73b 100644
--- a/toolkit/test/accessibility/FrameActionListener.java
+++ b/toolkit/test/accessibility/FrameActionListener.java
@@ -9,12 +9,12 @@ public class   FrameActionListener
     public FrameActionListener ()
     {
     }
-
+    
     public void frameAction (com.sun.star.frame.FrameActionEvent aEvent)
     {
         System.out.println ("frame action");
     }
-
+    
     public void disposing (com.sun.star.lang.EventObject aEvent)
     {
     }
diff --git a/toolkit/test/accessibility/GeometryEventHandler.java b/toolkit/test/accessibility/GeometryEventHandler.java
index 07236785e862..9402a33b91d7 100644
--- a/toolkit/test/accessibility/GeometryEventHandler.java
+++ b/toolkit/test/accessibility/GeometryEventHandler.java
@@ -48,7 +48,7 @@ class GeometryEventHandler
                         aShapeQueue.addLast (aTreeNode);
                 }
             }
-            aCanvas.repaint ();
+            aCanvas.repaint ();    
         }
     }
 }
diff --git a/toolkit/test/accessibility/HelpWindow.java b/toolkit/test/accessibility/HelpWindow.java
index 74627ad99761..80b206f24ce5 100644
--- a/toolkit/test/accessibility/HelpWindow.java
+++ b/toolkit/test/accessibility/HelpWindow.java
@@ -118,7 +118,7 @@ class HelpWindow
         {}
     }
 
-    public void actionPerformed (java.awt.event.ActionEvent e)
+    public void actionPerformed (java.awt.event.ActionEvent e) 
     {
         if (e.getActionCommand().equals("Prev"))
         {
diff --git a/toolkit/test/accessibility/InformationWriter.java b/toolkit/test/accessibility/InformationWriter.java
index e119d2037350..d2cc118a1564 100755
--- a/toolkit/test/accessibility/InformationWriter.java
+++ b/toolkit/test/accessibility/InformationWriter.java
@@ -72,7 +72,7 @@ public class InformationWriter
         {
             XPropertySet xPropertySet =  (XPropertySet) UnoRuntime.queryInterface(
                 XPropertySet.class, xObject);
-            MessageArea.println (prefix +
+            MessageArea.println (prefix + 
                 xPropertySet.getPropertyValue (name));
         }
         catch (Exception e)
@@ -82,7 +82,7 @@ public class InformationWriter
         }
     }
 
-
+    
 
     public void showShapes (XDrawPage xPage)
     {
@@ -90,24 +90,24 @@ public class InformationWriter
         {
             XIndexAccess xShapeList = (XIndexAccess) UnoRuntime.queryInterface(
                 XIndexAccess.class, xPage);
-
-            MessageArea.println ("There are " + xShapeList.getCount()
+                
+            MessageArea.println ("There are " + xShapeList.getCount() 
                 + " shapes");
             for (int i=0; i<xShapeList.getCount(); i++)
             {
                 XShape xShape = (XShape) UnoRuntime.queryInterface(
                     XShape.class, xShapeList.getByIndex (i));
-
-                XShapeDescriptor xShapeDescriptor =
+                    
+                XShapeDescriptor xShapeDescriptor = 
                     (XShapeDescriptor) UnoRuntime.queryInterface(
                         XShapeDescriptor.class, xShape);
                 String sName = xShapeDescriptor.getShapeType ();
                 MessageArea.println ("   shape " + i + " : " + sName);
-
-                XPropertySet xPropertySet =
+                
+                XPropertySet xPropertySet = 
                     (XPropertySet) UnoRuntime.queryInterface(
                         XPropertySet.class, xShape);
-                Integer nZOrder =
+                Integer nZOrder = 
                     (Integer) xPropertySet.getPropertyValue ("ZOrder");
                 MessageArea.println ("   zorder = " + nZOrder);
             }
@@ -117,11 +117,11 @@ public class InformationWriter
             MessageArea.println ("caught exception in showShapes: " + e);
         }
     }
+    
 
 
 
-
-    /** @descr Print all available services of the given object to the
+    /** @descr Print all available services of the given object to the 
                 standard output.
     */
     public void showServices (XInterface xObject)
@@ -138,7 +138,7 @@ public class InformationWriter
             else
             {
                 String[] sServiceNames = xMSF.getAvailableServiceNames ();
-                MessageArea.println ("    object can create "
+                MessageArea.println ("    object can create " 
                     + sServiceNames.length + " services");
                 for (int i=0; i<sServiceNames.length; i++)
                     MessageArea.println ("        service " + i + " : " + sServiceNames[i]);
@@ -149,7 +149,7 @@ public class InformationWriter
             MessageArea.println ("caught exception in showServices : " + e);
         }
     }
-
+    
     /** @descr Print the service and implementation name of the given
                 object.
     */
@@ -167,7 +167,7 @@ public class InformationWriter
             {
                 MessageArea.println ("    Service name        : " + xSN.getServiceName ());
             }
-
+            
             // Use interface XServiceInfo to retrieve information about
             // supported services.
             XServiceInfo xSI = (XServiceInfo) UnoRuntime.queryInterface (
@@ -176,8 +176,8 @@ public class InformationWriter
                 MessageArea.println ("    interface XServiceInfo not supported");
             else
             {
-                MessageArea.println ("    Implementation name : "
-                    + xSI.getImplementationName ());
+                MessageArea.println ("    Implementation name : " 
+                    + xSI.getImplementationName ());    
             }
         }
         catch (Exception e)
@@ -185,10 +185,10 @@ public class InformationWriter
             MessageArea.println ("caught exception in showInfo : " + e);
         }
     }
-
-
-
-
+    
+    
+    
+    
     /** @descr Print information about supported interfaces.
     */
     public void showInterfaces (XInterface xObject)
@@ -205,10 +205,10 @@ public class InformationWriter
             else
             {
                 Type[] aTypeList = xTP.getTypes ();
-                MessageArea.println ("    object supports " + aTypeList.length
+                MessageArea.println ("    object supports " + aTypeList.length 
                     + " interfaces");
                 for (int i=0; i<aTypeList.length; i++)
-                    MessageArea.println ("        " + i + " : "
+                    MessageArea.println ("        " + i + " : " 
                         + aTypeList[i].getTypeName());
             }
         }
@@ -217,8 +217,8 @@ public class InformationWriter
             MessageArea.println ("caught exception in showInterfaces : " + e);
         }
     }
-
-
+    
+    
     /** @descr Print information concerning the accessibility of the given
         object.
     */
@@ -233,46 +233,46 @@ public class InformationWriter
 
             //  Get XAccessibleContext object if given object does not
             //  already support this interface.
-            XAccessibleContext xContext
+            XAccessibleContext xContext 
                 = (XAccessibleContext) UnoRuntime.queryInterface (
                     XAccessibleContext.class, xObject);
             if (xContext == null)
             {
-                XAccessible xAccessible
+                XAccessible xAccessible 
                     = (XAccessible) UnoRuntime.queryInterface (
                         XAccessible.class, xObject);
                 if (xAccessible == null)
                 {
-                    MessageArea.println (sIndent + "given object " + xObject
+                    MessageArea.println (sIndent + "given object " + xObject 
                         + " is not accessible");
                     return false;
                 }
                 else
                     xContext = xAccessible.getAccessibleContext();
             }
-
+            
             //  Print information about the accessible context.
             if (xContext != null)
             {
-                MessageArea.println (sIndent + "Name         : "
+                MessageArea.println (sIndent + "Name         : " 
                     + xContext.getAccessibleName());
-                MessageArea.println (sIndent + "Description  : "
+                MessageArea.println (sIndent + "Description  : " 
                     + xContext.getAccessibleDescription());
-                MessageArea.println (sIndent + "Role         : "
+                MessageArea.println (sIndent + "Role         : " 
                     + xContext.getAccessibleRole());
                 String sHasParent;
                 if (xContext.getAccessibleParent() != null)
                 {
                     MessageArea.println (sIndent + "Has parent   : yes");
-                    MessageArea.println (sIndent + "Parent index : "
+                    MessageArea.println (sIndent + "Parent index : " 
                         + xContext.getAccessibleIndexInParent());
                 }
                 else
                     MessageArea.println (sIndent + "Has parent   : no");
-                MessageArea.println (sIndent + "Child count  : "
+                MessageArea.println (sIndent + "Child count  : " 
                     + xContext.getAccessibleChildCount());
                 MessageArea.print (sIndent + "Relation set : ");
-                XAccessibleRelationSet xRelationSet
+                XAccessibleRelationSet xRelationSet 
                     = xContext.getAccessibleRelationSet();
                 if (xRelationSet != null)
                 {
@@ -287,13 +287,13 @@ public class InformationWriter
                 }
                 else
                     MessageArea.println ("no relation set");
-
+                
                 MessageArea.print (sIndent + "State set    : ");
-                XAccessibleStateSet xStateSet =
+                XAccessibleStateSet xStateSet = 
                     xContext.getAccessibleStateSet();
                 if (xStateSet != null)
                 {
-                    XIndexAccess xStates =
+                    XIndexAccess xStates = 
                         (XIndexAccess) UnoRuntime.queryInterface (
                             XIndexAccess.class, xStateSet);
                     MessageArea.print (xStates.getCount() + " (");
@@ -312,7 +312,7 @@ public class InformationWriter
             }
             else
                 MessageArea.println ("object has no accessible context.");
-
+            
             //            showInfo (xContext);
             //            showServices (xContext);
             //            showInterfaces (xContext);
@@ -323,7 +323,7 @@ public class InformationWriter
         }
         return true;
     }
-
+    
 
 
 
@@ -333,20 +333,20 @@ public class InformationWriter
     {
         try
         {
-            XAccessibleComponent xComponent =
+            XAccessibleComponent xComponent = 
                 (XAccessibleComponent) UnoRuntime.queryInterface (
                     XAccessibleComponent.class, xObject);
-
+            
             //  Print information about the accessible context.
             if (xComponent != null)
             {
-                MessageArea.println (sIndent + "Position        : "
+                MessageArea.println (sIndent + "Position        : " 
                     + xComponent.getLocation().X+", "
                     + xComponent.getLocation().Y);
-                MessageArea.println (sIndent + "Screen position : "
+                MessageArea.println (sIndent + "Screen position : " 
                     + xComponent.getLocationOnScreen().X+", "
                     + xComponent.getLocationOnScreen().Y);
-                MessageArea.println (sIndent + "Size            : "
+                MessageArea.println (sIndent + "Size            : " 
                     + xComponent.getSize().Width+", "
                     + xComponent.getSize().Height);
             }
@@ -368,7 +368,7 @@ public class InformationWriter
         {
             if ( ! showAccessibility (xRoot, depth))
                 return false;
-
+            
             String sIndent = "";
             for (int i=0; i<depth; i++)
                 sIndent += "    ";
diff --git a/toolkit/test/accessibility/MessageArea.java b/toolkit/test/accessibility/MessageArea.java
index c9d95995e066..6e9aef02c514 100644
--- a/toolkit/test/accessibility/MessageArea.java
+++ b/toolkit/test/accessibility/MessageArea.java
@@ -9,7 +9,7 @@ import javax.swing.JScrollBar;
 
 
 /** A message area displays text in a scrollable text widget.  It is a
-    singleton.  Other objects can access it directly to display messages.
+    singleton.  Other objects can access it directly to display messages. 
 */
 public class MessageArea
     extends JScrollPane
diff --git a/toolkit/test/accessibility/MessageInterface.java b/toolkit/test/accessibility/MessageInterface.java
index ad189bb8214f..4fc2c4184fb3 100755
--- a/toolkit/test/accessibility/MessageInterface.java
+++ b/toolkit/test/accessibility/MessageInterface.java
@@ -1,5 +1,5 @@
 interface MessageInterface
 {
-    void    message   (String text);
+    void    message   (String text);    
 }
 
diff --git a/toolkit/test/accessibility/NodeFactory.java b/toolkit/test/accessibility/NodeFactory.java
index 403c482e5ea1..e132988a1cf9 100644
--- a/toolkit/test/accessibility/NodeFactory.java
+++ b/toolkit/test/accessibility/NodeFactory.java
@@ -37,7 +37,7 @@ class NodeFactory
         maUNOHandler = new AccessibleUNOHandler();
     }
 
-
+        
     /** add default handlers based on the supported interfaces */
     private void addDefaultHandlers (AccTreeNode aNode, XAccessibleContext xContext)
     {
@@ -106,7 +106,7 @@ class NodeFactory
             sDisplay = xContext.getAccessibleName();
             if (sDisplay.length()==0)
             {
-                sDisplay = "<no name> Role: "
+                sDisplay = "<no name> Role: " 
                     + NameProvider.getRoleName (
                         xContext.getAccessibleRole());
             }
diff --git a/toolkit/test/accessibility/NodeHandler.java b/toolkit/test/accessibility/NodeHandler.java
index b39741b1f398..c4c374e60178 100644
--- a/toolkit/test/accessibility/NodeHandler.java
+++ b/toolkit/test/accessibility/NodeHandler.java
@@ -44,8 +44,8 @@ abstract class NodeHandler
     }
 
     /**
-     * return a child object. Complex
-     * children have to be AccTreeNode instances.
+     * return a child object. Complex 
+     * children have to be AccTreeNode instances. 
      * @see AccTreeNode
      */
     public AccessibleTreeNode getChild (AccessibleTreeNode aParent, int nIndex)
@@ -110,7 +110,7 @@ abstract class NodeHandler
     // The following methods support editing of children and actions.
     // They have default implementations for no actions and read-only.
     //
-
+    
     /** May this child be changed? */
     public boolean isChildEditable (AccessibleTreeNode aNode, int nIndex)
     {
@@ -122,13 +122,13 @@ abstract class NodeHandler
 
 
     /** get names of suported actions */
-    public String[] getActions (AccessibleTreeNode aNode)
-    {
+    public String[] getActions (AccessibleTreeNode aNode) 
+    { 
         return new String[] {};
     }
 
     /** perform action */
-    public void performAction (AccessibleTreeNode aNode, int nIndex)
+    public void performAction (AccessibleTreeNode aNode, int nIndex) 
     {
     }
 
diff --git a/toolkit/test/accessibility/NodeMap.java b/toolkit/test/accessibility/NodeMap.java
index 43479278aec4..4e2f631027cb 100644
--- a/toolkit/test/accessibility/NodeMap.java
+++ b/toolkit/test/accessibility/NodeMap.java
@@ -31,7 +31,7 @@ class NodeMap
     public boolean InsertNode (XAccessibleContext xContext, AccessibleTreeNode aNode)
     {
         AccessibleTreeNode aPreviousNode = (AccessibleTreeNode)maXAccessibleToNode.put (
-            xContext,
+            xContext, 
             aNode);
         return aPreviousNode != aNode;
     }
@@ -47,7 +47,7 @@ class NodeMap
         }
         catch (Exception e)
         {
-            System.out.println ("caught exception while removing node "
+            System.out.println ("caught exception while removing node " 
                 + aNode + " : " + e);
             e.printStackTrace();
         }
@@ -67,7 +67,7 @@ class NodeMap
                 }
                 catch (Exception e)
                 {
-                    System.out.println ("caught exception applying functor to "
+                    System.out.println ("caught exception applying functor to " 
                         + i + "th node " + aNodes[i] + " : " + e);
                     e.printStackTrace();
                 }
@@ -84,7 +84,7 @@ class NodeMap
     {
         if (aObject instanceof XAccessibleContext)
             return GetNode ((XAccessibleContext)aObject);
-        else
+        else 
             return null;
     }
 
@@ -92,7 +92,7 @@ class NodeMap
     {
         if ((aNode != null) && (aNode instanceof AccTreeNode))
             return ((AccTreeNode)aNode).getContext();
-        else
+        else 
             return null;
     }
 
diff --git a/toolkit/test/accessibility/OfficeConnection.java b/toolkit/test/accessibility/OfficeConnection.java
index 4cc5bee1ed78..d98d48aabc3d 100755
--- a/toolkit/test/accessibility/OfficeConnection.java
+++ b/toolkit/test/accessibility/OfficeConnection.java
@@ -23,7 +23,7 @@ public class OfficeConnection
         mnDefaultPort = nPortNumber;
         connect ();
     }
-
+    
     /** @descr Return the service manager that represents the connected
                 StarOffice application
     */
@@ -33,7 +33,7 @@ public class OfficeConnection
             connect ();
         return maServiceManager;
     }
-
+    
     /** @descr  Return a flag that indicates if the constructor has been able to
                 establish a valid connection.
     */
@@ -48,14 +48,14 @@ public class OfficeConnection
     {
         connect (msDefaultHost, mnDefaultPort);
     }
-
+    
     private void connect (String hostname)
     {
         connect (hostname, mnDefaultPort);
     }
-
-    /** @descr  Connect to a already running StarOffice application that has
-                been started with a command line argument like
+    
+    /** @descr  Connect to a already running StarOffice application that has 
+                been started with a command line argument like 
                 "-accept=socket,host=localhost,port=5678;urp;"
     */
     private void connect (String hostname, int portnumber)
@@ -65,7 +65,7 @@ public class OfficeConnection
         String sConnectString = "uno:socket,host=" + hostname + ",port=" + portnumber
             + ";urp;StarOffice.ServiceManager";
 
-
+        
         // connect to a running office and get the ServiceManager
         try
         {
@@ -76,7 +76,7 @@ public class OfficeConnection
                 XUnoUrlResolver.class,
                 aLocalServiceManager.createInstance ("com.sun.star.bridge.UnoUrlResolver")
                 );
-
+            
             maServiceManager = (XMultiServiceFactory) UnoRuntime.queryInterface (
                     XMultiServiceFactory.class,
                     aURLResolver.resolve (sConnectString)
@@ -94,7 +94,7 @@ public class OfficeConnection
     private int mnDefaultPort = 5678;
     private final String msDefaultHost = "localhost";
     private XMultiServiceFactory  maServiceManager = null;
-
+    
     /** A value of true just indicates that it has been tried to establish a connection,
         not that that has been successfull.
     */
diff --git a/toolkit/test/accessibility/Options.java b/toolkit/test/accessibility/Options.java
index 9b0f6f01889c..76a2a3b0b55b 100644
--- a/toolkit/test/accessibility/Options.java
+++ b/toolkit/test/accessibility/Options.java
@@ -58,7 +58,7 @@ class Options
         }
         catch (java.io.IOException e)
         {
-            // Ignore a non-existing options file.
+            // Ignore a non-existing options file. 
         }
     }
 
@@ -72,7 +72,7 @@ class Options
         {
         }
     }
-
+    
     private Options ()
     {
     }
diff --git a/toolkit/test/accessibility/Print.java b/toolkit/test/accessibility/Print.java
index e4d21dc4e092..1a04934cf224 100755
--- a/toolkit/test/accessibility/Print.java
+++ b/toolkit/test/accessibility/Print.java
@@ -1,5 +1,5 @@
 interface Print
 {
-    void    print   (String text);
+    void    print   (String text);    
     void    println (String text);
 }
diff --git a/toolkit/test/accessibility/QueuedListener.java b/toolkit/test/accessibility/QueuedListener.java
index b92d7ac487e6..1523808ad79e 100644
--- a/toolkit/test/accessibility/QueuedListener.java
+++ b/toolkit/test/accessibility/QueuedListener.java
@@ -26,14 +26,14 @@ class QueuedListener
                 xContext = xAccessible.getAccessibleContext();
         }
         final XAccessibleContext xSource = xContext;
-        EventQueue.Instance().addDisposingEvent (new Runnable()
+        EventQueue.Instance().addDisposingEvent (new Runnable() 
             {
-                public void run()
+                public void run() 
                 {
                     if (QueuedListener.this.maListener != null)
                         QueuedListener.this.maListener.disposing (xSource);
                 }
-            }
+            } 
             );
     }
 
@@ -45,7 +45,7 @@ class QueuedListener
                 {
                     QueuedListener.this.maListener.notifyEvent( aEvent );
                 }
-            }
+            } 
             );
     }
 
diff --git a/toolkit/test/accessibility/QueuedTopWindowListener.java b/toolkit/test/accessibility/QueuedTopWindowListener.java
index 61b3472d2002..7eaff5b47d57 100644
--- a/toolkit/test/accessibility/QueuedTopWindowListener.java
+++ b/toolkit/test/accessibility/QueuedTopWindowListener.java
@@ -17,7 +17,7 @@ class QueuedTopWindowListener
                 {
                     QueuedTopWindowListener.this.maListener.windowOpened (aEvent);
                 }
-            }
+            } 
             );
     }
 
@@ -40,32 +40,32 @@ class QueuedTopWindowListener
                 {
                     QueuedTopWindowListener.this.maListener.windowClosed (aEvent);
                 }
-            }
+            } 
             );
     }
 
 
 
 
-    public void windowMinimized (final com.sun.star.lang.EventObject aEvent)
+    public void windowMinimized (final com.sun.star.lang.EventObject aEvent) 
         throws RuntimeException
     {
         System.out.println ("QueuedTopWindowListener: Top window minimized: " + aEvent);
     }
 
-    public void windowNormalized (final com.sun.star.lang.EventObject aEvent)
+    public void windowNormalized (final com.sun.star.lang.EventObject aEvent) 
         throws RuntimeException
     {
         System.out.println ("QueuedTopWindowListener: Top window normalized: " + aEvent);
     }
 
-    public void windowActivated (final com.sun.star.lang.EventObject aEvent)
+    public void windowActivated (final com.sun.star.lang.EventObject aEvent) 
         throws RuntimeException
     {
         System.out.println ("QueuedTopWindowListener: Top window actived: " + aEvent);
     }
 
-    public void windowDeactivated (final com.sun.star.lang.EventObject aEvent)
+    public void windowDeactivated (final com.sun.star.lang.EventObject aEvent) 
         throws RuntimeException
     {
         System.out.println ("QueuedTopWindowListener: Top window deactived: " + aEvent);
@@ -73,14 +73,14 @@ class QueuedTopWindowListener
 
     public void disposing( final EventObject aEvent)
     {
-        EventQueue.Instance().addDisposingEvent (new Runnable()
+        EventQueue.Instance().addDisposingEvent (new Runnable() 
             {
-                public void run()
+                public void run() 
                 {
                     if (QueuedTopWindowListener.this.maListener != null)
                         QueuedTopWindowListener.this.maListener.disposing (aEvent);
                 }
-            }
+            } 
             );
     }
 
diff --git a/toolkit/test/accessibility/SelectionDialog.java b/toolkit/test/accessibility/SelectionDialog.java
index a632e9f77a0c..551875c9d5f9 100644
--- a/toolkit/test/accessibility/SelectionDialog.java
+++ b/toolkit/test/accessibility/SelectionDialog.java
@@ -22,7 +22,7 @@ class SelectionDialog extends JDialog
     public SelectionDialog (AccTreeNode aNode)
     {
         super (AccessibilityWorkBench.Instance());
-
+        
         maNode = aNode;
 
         Layout();
@@ -37,7 +37,7 @@ class SelectionDialog extends JDialog
         Container aContent = getContentPane();
 
         // label with explanation
-        aContent.add( new JLabel( "Select/Deselect child elements" ),
+        aContent.add( new JLabel( "Select/Deselect child elements" ), 
                       BorderLayout.NORTH );
 
         // the JListBox
@@ -122,9 +122,9 @@ class SelectionDialog extends JDialog
         }
         catch( IndexOutOfBoundsException e )
         {
-            JOptionPane.showMessageDialog( AccessibilityWorkBench.Instance(),
+            JOptionPane.showMessageDialog( AccessibilityWorkBench.Instance(), 
                                            "Can't select: IndexOutofBounds",
-                                           "Error in selectAccessibleChild",
+                                           "Error in selectAccessibleChild", 
                                            JOptionPane.ERROR_MESSAGE);
         }
     }
@@ -133,14 +133,14 @@ class SelectionDialog extends JDialog
     {
         try
         {
-            mxSelection.deselectAccessibleChild(
+            mxSelection.deselectAccessibleChild( 
                 maChildrenSelector.getSelectedIndex());
         }
         catch( IndexOutOfBoundsException e )
         {
-            JOptionPane.showMessageDialog( AccessibilityWorkBench.Instance(),
+            JOptionPane.showMessageDialog( AccessibilityWorkBench.Instance(), 
                                            "Can't deselect: IndexOutofBounds",
-                                           "Error in deselectAccessibleChild",
+                                           "Error in deselectAccessibleChild", 
                                            JOptionPane.ERROR_MESSAGE);
         }
     }
@@ -155,7 +155,7 @@ class SelectionDialog extends JDialog
         mxSelection.clearAccessibleSelection();
     }
 
-
+        
 
     public void actionPerformed(ActionEvent e)
     {
diff --git a/toolkit/test/accessibility/SimpleOffice.java b/toolkit/test/accessibility/SimpleOffice.java
index 4417267675af..c1c2d28738ff 100755
--- a/toolkit/test/accessibility/SimpleOffice.java
+++ b/toolkit/test/accessibility/SimpleOffice.java
@@ -73,7 +73,7 @@ public class SimpleOffice
         try
         {
             //  Load the document from the specified URL.
-            XComponentLoader xLoader =
+            XComponentLoader xLoader = 
                 (XComponentLoader)UnoRuntime.queryInterface(
                     XComponentLoader.class, mxDesktop);
 
@@ -108,7 +108,7 @@ public class SimpleOffice
         XModel xModel = null;
         try
         {
-            XTasksSupplier xTasksSupplier =
+            XTasksSupplier xTasksSupplier = 
                 (XTasksSupplier) UnoRuntime.queryInterface(
                     XTasksSupplier.class, mxDesktop);
             XEnumerationAccess xEA = xTasksSupplier.getTasks();
@@ -157,7 +157,7 @@ public class SimpleOffice
             }
             else
                 MessageArea.println ("Connected successfully.");
-
+            
             //  Create a new desktop.
             mxDesktop = (XDesktop) UnoRuntime.queryInterface(
                 XDesktop.class,
@@ -248,7 +248,7 @@ public class SimpleOffice
 
 
 
-    /** @descr Return the current window associated with the given
+    /** @descr Return the current window associated with the given 
                 model.
     */
     public XWindow getCurrentWindow ()
@@ -264,8 +264,8 @@ public class SimpleOffice
     public XWindow getCurrentWindow (XModel xModel)
     {
         XWindow xWindow = null;
-        try
-        {
+        try 
+        {        
             if (xModel == null)
                 MessageArea.println ("invalid model (==null)");
             XController xController = xModel.getCurrentController();
@@ -282,7 +282,7 @@ public class SimpleOffice
         {
             MessageArea.println ("caught exception while getting current window" + e);
         }
-
+        
         return xWindow;
     }
 
@@ -301,8 +301,8 @@ public class SimpleOffice
     public XDrawPage getCurrentDrawPage (XDrawView xView)
     {
         XDrawPage xPage = null;
-        try
-        {
+        try 
+        {        
             if (xView == null)
                 MessageArea.println ("can't get current draw page from null view");
             else
@@ -312,7 +312,7 @@ public class SimpleOffice
         {
             MessageArea.println ("caught exception while getting current draw page : " + e);
         }
-
+        
         return xPage;
     }
 
@@ -332,8 +332,8 @@ public class SimpleOffice
             MessageArea.println ("can't get desktop to retrieve current view");
 
         XDrawView xView = null;
-        try
-        {
+        try 
+        {        
             XComponent xComponent = xDesktop.getCurrentComponent();
             if (xComponent == null)
                 MessageArea.println ("can't get component to retrieve current view");
@@ -345,7 +345,7 @@ public class SimpleOffice
             XController xController = xFrame.getController();
             if (xController == null)
                 MessageArea.println ("can't get controller to retrieve current view");
-
+            
             xView = (XDrawView) UnoRuntime.queryInterface(
                 XDrawView.class, xController);
             if (xView == null)
@@ -355,7 +355,7 @@ public class SimpleOffice
         {
             MessageArea.println ("caught exception while getting current view : " + e);
         }
-
+        
         return xView;
     }
 
diff --git a/toolkit/test/accessibility/TableEventHandler.java b/toolkit/test/accessibility/TableEventHandler.java
index 7655d3a13599..35bd7c64dc4e 100644
--- a/toolkit/test/accessibility/TableEventHandler.java
+++ b/toolkit/test/accessibility/TableEventHandler.java
@@ -19,7 +19,7 @@ class TableEventHandler
         switch (mnEventId)
         {
             case AccessibleEventId.TABLE_MODEL_CHANGED:
-                AccessibleTableModelChange aModelChange =
+                AccessibleTableModelChange aModelChange = 
                     (AccessibleTableModelChange)maEvent.NewValue;
                 out.println( "Range: StartRow " + aModelChange.FirstRow +
                     " StartColumn " + aModelChange.FirstColumn +
diff --git a/toolkit/test/accessibility/TextUpdateListener.java b/toolkit/test/accessibility/TextUpdateListener.java
index 0ce990144c67..eece44d5fc60 100644
--- a/toolkit/test/accessibility/TextUpdateListener.java
+++ b/toolkit/test/accessibility/TextUpdateListener.java
@@ -28,7 +28,7 @@ class TextUpdateListener implements TreeModelListener
             {
                 // aha! we have an xText. So we can now check for
                 // the various cases we support
-                XAccessibleText xText =
+                XAccessibleText xText = 
                     (XAccessibleText)aParent.getUserObject();
 
                 if( aIndices[0] == 0 )
@@ -48,8 +48,8 @@ class TextUpdateListener implements TreeModelListener
                     //                             try
                     //                             {
                     //                                 // aha! Selection:
-                    //                                 setSelection( xText,
-                    //                                               Integer.parseInt(m.group(1)),
+                    //                                 setSelection( xText, 
+                    //                                               Integer.parseInt(m.group(1)), 
                     //                                               Integer.parseInt(m.group(2)) );
                     //                             }
                     //                             catch( NumberFormatException f )
@@ -75,7 +75,7 @@ class TextUpdateListener implements TreeModelListener
         throws com.sun.star.lang.IndexOutOfBoundsException
     {
         // is this text editable? if not, fudge you and return
-        XAccessibleEditableText xEdit =
+        XAccessibleEditableText xEdit = 
             (XAccessibleEditableText) UnoRuntime.queryInterface (
                 XAccessibleEditableText.class, xText);
         if (xEdit == null)
@@ -99,7 +99,7 @@ class TextUpdateListener implements TreeModelListener
             nFront++;
         int nBack = 0;
         while( (nBack < nMinLength) &&
-            ( sNew.charAt(sNew.length()-nBack-1) ==
+            ( sNew.charAt(sNew.length()-nBack-1) == 
                 sOld.charAt(sOld.length()-nBack-1)    ) )
             nBack++;
         if( nFront + nBack > nMinLength )
@@ -110,7 +110,7 @@ class TextUpdateListener implements TreeModelListener
         String sDel = sOld.substring( nFront, sOld.length() - nBack );
         String sIns = sNew.substring( nFront, sNew.length() - nBack );
 
-        System.out.println("edit text: " +
+        System.out.println("edit text: " + 
             sOld.substring(0, nFront) +
             " [ " + sDel + " -> " + sIns + " ] " +
             sOld.substring(sOld.length() - nBack) );
@@ -150,14 +150,14 @@ class TextUpdateListener implements TreeModelListener
     }
 
     //         /** replace the given node with a new xText node */
-    //         void updateNode( XAccessibleText xText,
+    //         void updateNode( XAccessibleText xText, 
     //                          DefaultMutableTreeNode aNode )
     //         {
     //             // create a new node
     //             DefaultMutableTreeNode aNew = newTextTreeNode( xText );
-    //
+    // 
     //             // get parent (must be DefaultMutableTreeNode)
-    //             DefaultMutableTreeNode aParent =
+    //             DefaultMutableTreeNode aParent = 
     //                 (DefaultMutableTreeNode)aNode.getParent();
     //             if( aParent != null )
     //             {
diff --git a/toolkit/test/accessibility/TopWindowListener.java b/toolkit/test/accessibility/TopWindowListener.java
index c0aea933ece7..84e7a65e9781 100644
--- a/toolkit/test/accessibility/TopWindowListener.java
+++ b/toolkit/test/accessibility/TopWindowListener.java
@@ -75,7 +75,7 @@ class TopWindowListener
                     if (aRootObject instanceof VectorNode)
                     {
                         VectorNode aRoot = (VectorNode) aRootObject;
-                        AccessibleTreeNode aNode =
+                        AccessibleTreeNode aNode = 
                             NodeFactory.Instance().createDefaultNode (xNewTopLevelObject, aRoot);
                         aRoot.addChild (aNode);
                         maModel.fireTreeNodesInserted (maModel.createEvent (aRoot, aNode));
@@ -147,7 +147,7 @@ class TopWindowListener
 
 
     // XTopWindowListener
-    public void windowOpened (final com.sun.star.lang.EventObject aEvent)
+    public void windowOpened (final com.sun.star.lang.EventObject aEvent) 
         throws RuntimeException
     {
         if (maModel != null)
@@ -170,7 +170,7 @@ class TopWindowListener
 
 
 
-    public void windowClosed (final com.sun.star.lang.EventObject aEvent)
+    public void windowClosed (final com.sun.star.lang.EventObject aEvent) 
         throws RuntimeException
     {
         if (maModel != null)
diff --git a/toolkit/test/accessibility/VectorNode.java b/toolkit/test/accessibility/VectorNode.java
index 282abb595620..6277cfaefe57 100644
--- a/toolkit/test/accessibility/VectorNode.java
+++ b/toolkit/test/accessibility/VectorNode.java
@@ -16,7 +16,7 @@ class VectorNode
         maChildren = new Vector ();
     }
 
-    public void addChild (AccessibleTreeNode aChild)
+    public void addChild (AccessibleTreeNode aChild) 
     {
         maChildren.add (aChild);
     }
@@ -43,7 +43,7 @@ class VectorNode
         return maChildren.indexOf (aNode);
     }
 
-    public boolean isLeaf()
+    public boolean isLeaf() 
     {
         return maChildren.isEmpty();
     }
diff --git a/toolkit/test/accessibility/ov/ListeningObjectView.java b/toolkit/test/accessibility/ov/ListeningObjectView.java
index 574fa989b20f..109390a8eff2 100644
--- a/toolkit/test/accessibility/ov/ListeningObjectView.java
+++ b/toolkit/test/accessibility/ov/ListeningObjectView.java
@@ -25,7 +25,7 @@ abstract class ListeningObjectView
     public void SetObject (XAccessibleContext xContext)
     {
         super.SetObject (xContext);
-        XAccessibleEventBroadcaster xBroadcaster =
+        XAccessibleEventBroadcaster xBroadcaster = 
             (XAccessibleEventBroadcaster)UnoRuntime.queryInterface(
                 XAccessibleEventBroadcaster.class, xContext);
         if (xBroadcaster != null)
@@ -39,7 +39,7 @@ abstract class ListeningObjectView
     public void Destroy ()
     {
         super.Destroy ();
-        XAccessibleEventBroadcaster xBroadcaster =
+        XAccessibleEventBroadcaster xBroadcaster = 
             (XAccessibleEventBroadcaster)UnoRuntime.queryInterface(
                 XAccessibleEventBroadcaster.class, mxContext);
         if (xBroadcaster != null)
diff --git a/toolkit/test/accessibility/ov/ObjectViewContainer.java b/toolkit/test/accessibility/ov/ObjectViewContainer.java
index c0bf6a86736b..96eb1c7b5363 100644
--- a/toolkit/test/accessibility/ov/ObjectViewContainer.java
+++ b/toolkit/test/accessibility/ov/ObjectViewContainer.java
@@ -64,7 +64,7 @@ public class ObjectViewContainer
                 Class aViewClass = (Class)maViewTemplates.elementAt (i);
                 Method aCreateMethod = aViewClass.getDeclaredMethod (
                     "Create", new Class[] {
-                        ObjectViewContainer.class,
+                        ObjectViewContainer.class, 
                         XAccessibleContext.class});
                 if (aCreateMethod != null)
                 {
@@ -142,7 +142,7 @@ public class ObjectViewContainer
     /** Update the layout manager by setting the vertical weight of the
         bottom entry to 1 and so make it strech to over the available
         space.
-
+        
     */
     private void UpdateLayoutManager ()
     {
diff --git a/toolkit/test/accessibility/ov/SelectionView.java b/toolkit/test/accessibility/ov/SelectionView.java
index a71f242420ba..f3e4d5214d33 100644
--- a/toolkit/test/accessibility/ov/SelectionView.java
+++ b/toolkit/test/accessibility/ov/SelectionView.java
@@ -163,12 +163,12 @@ class SelectionView
                 }
 
                 XAccessibleStateSet aChildStateSet = mxContext.getAccessibleStateSet();
-                aChild.setSelected (aChildStateSet!=null
+                aChild.setSelected (aChildStateSet!=null 
                     && aChildStateSet.contains(AccessibleStateType.SELECTED));
 
                 aChild.addActionListener (this);
                 maChildrenSelector.add (aChild);
-
+                
             }
             catch (IndexOutOfBoundsException e)
             {
@@ -186,7 +186,7 @@ class SelectionView
     {
         mxSelection.clearAccessibleSelection();
     }
-
+        
 
     /** Call the function associated with the pressed button.
     */
diff --git a/toolkit/test/accessibility/ov/StateSetView.java b/toolkit/test/accessibility/ov/StateSetView.java
index e8997ac0c5a0..a2e4e28a49b3 100644
--- a/toolkit/test/accessibility/ov/StateSetView.java
+++ b/toolkit/test/accessibility/ov/StateSetView.java
@@ -159,7 +159,7 @@ public class StateSetAllView
         Color aTextColor = g.getColor();
 
         g.setRenderingHint (
-            RenderingHints.KEY_ANTIALIASING,
+            RenderingHints.KEY_ANTIALIASING, 
             RenderingHints.VALUE_ANTIALIAS_ON);
 
         XAccessibleStateSet xStateSet = mxContext.getAccessibleStateSet();
diff --git a/toolkit/test/accessibility/ov/TextView.java b/toolkit/test/accessibility/ov/TextView.java
index 094647986e4f..b472e030f936 100644
--- a/toolkit/test/accessibility/ov/TextView.java
+++ b/toolkit/test/accessibility/ov/TextView.java
@@ -116,7 +116,7 @@ public class TextView
         }
     }
 
-    private JLabel
+    private JLabel 
         maTextLabel,
         maCaretPositionLabel;
     private XAccessibleText mxText;
diff --git a/toolkit/test/accessibility/tools/NameProvider.java b/toolkit/test/accessibility/tools/NameProvider.java
index d9bcab802cbf..5b1d5a01b329 100644
--- a/toolkit/test/accessibility/tools/NameProvider.java
+++ b/toolkit/test/accessibility/tools/NameProvider.java
@@ -98,7 +98,7 @@ public class NameProvider
         maStateMap.put (new Integer (AccessibleStateType.OPAQUE), "OPAQUE");
         maStateMap.put (new Integer (AccessibleStateType.PRESSED), "PRESSED");
         maStateMap.put (new Integer (AccessibleStateType.RESIZABLE), "RESIZABLE");
-        maStateMap.put (new Integer (AccessibleStateType.SELECTABLE), "SELECTABLE");
+        maStateMap.put (new Integer (AccessibleStateType.SELECTABLE), "SELECTABLE");           
         maStateMap.put (new Integer (AccessibleStateType.SELECTED), "SELECTED");
         maStateMap.put (new Integer (AccessibleStateType.SENSITIVE), "SENSITIVE");
         maStateMap.put (new Integer (AccessibleStateType.SHOWING), "SHOWING");
diff --git a/toolkit/workben/controls.cxx b/toolkit/workben/controls.cxx
index 9047e914a76d..f5a5146cdac0 100644
--- a/toolkit/workben/controls.cxx
+++ b/toolkit/workben/controls.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
@@ -45,7 +45,7 @@
 #include <unoctrl.hxx>
 // #include <unoctrl2.hxx>
 
-#include <svtools/unoiface.hxx> // InitExtToolkit
+#include <svtools/unoiface.hxx>	// InitExtToolkit
 
 UsrAny UsrAny_UINT16( UINT16 n )
 {
@@ -68,13 +68,13 @@ MyApp aMyApp;
 
 class MyWin : public WorkWindow
 {
-    XControlRef             xCtrl;
-    XPropertySetRef         xCtrlModel;
-    XControlContainerRef    xCont;
-    XPropertySetRef         xContModel;
-    XControlRef             xDrawCtrl;
-    XGraphicsRef            xG;
-
+    XControlRef				xCtrl;
+    XPropertySetRef			xCtrlModel;
+    XControlContainerRef	xCont;
+    XPropertySetRef			xContModel;
+    XControlRef				xDrawCtrl;
+    XGraphicsRef			xG;
+    
 public:
                 MyWin( Window* pParent, WinBits nWinStyle );
                 ~MyWin();
@@ -116,7 +116,7 @@ MyWin::~MyWin()
 
 void MyWin::MouseButtonDown( const MouseEvent& rMEvt )
 {
-    if( rMEvt.GetClicks() == 2 )
+    if( rMEvt.GetClicks() == 2 ) 
     {
         XViewRef xV( xDrawCtrl, USR_QUERY );
         XWindowRef xC( xDrawCtrl, USR_QUERY );
@@ -128,13 +128,13 @@ void MyWin::MouseButtonDown( const MouseEvent& rMEvt )
         XServiceProviderRef xSSI = xProv->queryServiceProvider( L"stardiv.vcl.PrinterServer" );
         XPrinterServerRef xPrinterServer( xSSI->createInstance(), USR_QUERY );
 
-        Sequence< UString > aPrinterNames = xPrinterServer->getPrinterNames();
+        Sequence< UString >	aPrinterNames = xPrinterServer->getPrinterNames();
         USHORT nPrinters = aPrinterNames.getLen();
         String aInfo( "Printers: " );
-        aInfo += nPrinters;
-        if ( nPrinters )
+        aInfo += nPrinters; 
+        if ( nPrinters ) 
         {
-            for ( USHORT n = 0; n < nPrinters; n++ )
+            for ( USHORT n = 0; n < nPrinters; n++ ) 
             {
                 aInfo += '\n';
                 aInfo += OUStringToString( aPrinterNames.getConstArray()[n], CHARSET_SYSTEM );
@@ -149,9 +149,9 @@ void MyWin::MouseButtonDown( const MouseEvent& rMEvt )
             xPrinter->end();
         }
         InfoBox( this, aInfo ).Execute();
-*/
+*/	
     }
-    else if( rMEvt.GetClicks() == 1 )
+    else if( rMEvt.GetClicks() == 1 ) 
     {
         if( xContModel )
         {
@@ -165,7 +165,7 @@ void MyWin::MouseButtonDown( const MouseEvent& rMEvt )
             XServiceManagerRef xProv = getGlobalServiceManager();
 
             XMultiServiceFactoryRef xMSF = NAMESPACE_USR( getProcessServiceManager )();
-
+            
             XServiceProviderRef xSSI = xProv->queryServiceProvider( L"stardiv.vcl.VclToolkit" );
             XToolkitRef xToolkit( xMSF->createInstance( L"stardiv.vcl.VclToolkit" ), USR_QUERY );
             DBG_ASSERT( xToolkit, "No Toolkit!" );
@@ -180,7 +180,7 @@ void MyWin::MouseButtonDown( const MouseEvent& rMEvt )
             xModelProv = xProv->queryServiceProvider( L"stardiv.vcl.control.ControlContainer" );
             XInterfaceRef xCCRef( xModelProv->createInstance(), USR_QUERY );
             xCCRef->queryInterface( XControlContainer::getSmartUik(), xCont );
-
+            
             XControlModelRef xCM( xContModel, USR_QUERY );
             XControlRef xContControl( xCont, USR_QUERY );
             xContControl->setModel( xCM );
@@ -188,14 +188,14 @@ void MyWin::MouseButtonDown( const MouseEvent& rMEvt )
             xContComp->setPosSize( 0, 0, 500, 600, PosSize_POSSIZE );
 
             // Zwei EditControls auf einem Model...
-//          xModelProv = xProv->queryServiceProvider( L"stardiv.uno.awt.UnoControlEditModel" );
+//			xModelProv = xProv->queryServiceProvider( L"stardiv.uno.awt.UnoControlEditModel" );
             XInterfaceRef xModel( xMSF->createInstance(L"stardiv.uno.awt.UnoControlEditModel") );
             DBG_ASSERT( xModel, "No Model!" );
 
             XPropertySetRef xPSet( xModel, USR_QUERY );
             xPSet->setPropertyValue( L"Text", UsrAny( UString( L"Hallo!" ) ) );
             xPSet->setPropertyValue( L"FontName", UsrAny( UString( L"Times New Roman" ) ) );
-//          xPSet->setPropertyValue( L"FontWeight", UsrAny( 200 ) );
+//			xPSet->setPropertyValue( L"FontWeight", UsrAny( 200 ) );
 
             XServiceProviderRef xEditCtrlProv = xProv->queryServiceProvider( L"stardiv.uno.awt.UnoControlEdit" );
             // Edit1
@@ -211,7 +211,7 @@ void MyWin::MouseButtonDown( const MouseEvent& rMEvt )
             xEdit2->setModel( xCM );
             XWindowRef xEditCmp2( xEdit2, USR_QUERY );
             XLayoutConstrainsRef xL( xEdit2, USR_QUERY );
-            if ( xL.is() )
+            if ( xL.is() ) 
             {
                 Size aSz = xL->getPreferredSize();
                 xEditCmp2->setPosSize( 100, 180, aSz.Width(), aSz.Height(), PosSize_POSSIZE );
@@ -232,7 +232,7 @@ void MyWin::MouseButtonDown( const MouseEvent& rMEvt )
             XWindowRef xNumFieldWin( xNumField, USR_QUERY );
             xNumFieldWin->setPosSize( 50, 250, 100, 60, PosSize_POSSIZE );
             xCont->addControl( L"", xNumField );
-
+            
             XMultiPropertySetRef xPSet2( xNumModel, USR_QUERY );
             Sequence<UString> Names( 2 );
             Names.getArray()[0] = L"Value";
@@ -242,7 +242,7 @@ void MyWin::MouseButtonDown( const MouseEvent& rMEvt )
             Values.getArray()[1] = UsrAny( -2000000.0 );
             xPSet2->setPropertyValues( Names, Values );
 
-
+            
             // Button...
             xModelProv = xProv->queryServiceProvider( L"stardiv.vcl.controlmodel.Button" );
             xModelProv->createInstance()->queryInterface( XInterface::getSmartUik(), xModel );
@@ -264,11 +264,11 @@ void MyWin::MouseButtonDown( const MouseEvent& rMEvt )
             xCont->addControl( L"", xButton1 );
 
 /*
-
+            
             // ListBox...
             xModelProv = xProv->queryServiceProvider( L"stardiv.vcl.controlmodel.ListBox" );
             xModel = (XInterface*)xModelProv->createInstance()->queryInterface( XInterface::getSmartUik() );
-
+            
             xPSet = (XPropertySet*)xModel->queryInterface( XPropertySet::getSmartUik() );
             Sequence<UString> aSeq( 7 );
             aSeq.getArray()[0] = L"Item1";
@@ -325,10 +325,10 @@ void MyWin::MouseButtonDown( const MouseEvent& rMEvt )
             XWindowRef xGroupBoxCmp1 = (XWindow*)xGroupBox1->queryInterface( XWindow::getSmartUik() );
             xGroupBoxCmp1->setPosSize( 30, 410, 100, 130, PosSize_POSSIZE );
             xCont->addControl( L"", xGroupBox1 );
-
+            
             XServiceProviderRef xRadioButtonModelProv = xProv->queryServiceProvider( L"stardiv.vcl.controlmodel.RadioButton" );
             XServiceProviderRef xRadioButtonCtrlProv = xProv->queryServiceProvider( L"stardiv.vcl.control.RadioButton" );
-
+            
             xModel = (XInterface*)xRadioButtonModelProv->createInstance()->queryInterface( XInterface::getSmartUik() );
             XControlRef xT1 = (XControl*)xRadioButtonCtrlProv->createInstance()->queryInterface( XControl::getSmartUik() );
             xT1->setModel( (XControlModel*)xModel->queryInterface( XControlModel::getSmartUik() ) );
@@ -338,7 +338,7 @@ void MyWin::MouseButtonDown( const MouseEvent& rMEvt )
             xPSet = (XPropertySet*)xModel->queryInterface( XPropertySet::getSmartUik() );
             xPSet->setPropertyValue( L"Label", UsrAny( L"Radio1" ) );
             xPSet->setPropertyValue( L"State", UsrAny_UINT16( 1 ) );
-
+            
             xModel = (XInterface*)xRadioButtonModelProv->createInstance()->queryInterface( XInterface::getSmartUik() );
             XControlRef xT2 = (XControl*)xRadioButtonCtrlProv->createInstance()->queryInterface( XControl::getSmartUik() );
             xT2->setModel( (XControlModel*)xModel->queryInterface( XControlModel::getSmartUik() ) );
@@ -347,7 +347,7 @@ void MyWin::MouseButtonDown( const MouseEvent& rMEvt )
             xCont->addControl( L"", xT2 );
             xPSet = (XPropertySet*)xModel->queryInterface( XPropertySet::getSmartUik() );
             xPSet->setPropertyValue( L"Label", UsrAny( L"Radio2" ) );
-
+            
             xModel = (XInterface*)xRadioButtonModelProv->createInstance()->queryInterface( XInterface::getSmartUik() );
             XControlRef xT3 = (XControl*)xRadioButtonCtrlProv->createInstance()->queryInterface( XControl::getSmartUik() );
             xT3->setModel( (XControlModel*)xModel->queryInterface( XControlModel::getSmartUik() ) );
@@ -356,7 +356,7 @@ void MyWin::MouseButtonDown( const MouseEvent& rMEvt )
             xCont->addControl( L"", xT3 );
             xPSet = (XPropertySet*)xModel->queryInterface( XPropertySet::getSmartUik() );
             xPSet->setPropertyValue( L"Label", UsrAny( L"Radio3" ) );
-
+            
             xModel = (XInterface*)xRadioButtonModelProv->createInstance()->queryInterface( XInterface::getSmartUik() );
             XControlRef xT4 = (XControl*)xRadioButtonCtrlProv->createInstance()->queryInterface( XControl::getSmartUik() );
             xT4->setModel( (XControlModel*)xModel->queryInterface( XControlModel::getSmartUik() ) );
@@ -385,26 +385,26 @@ void MyWin::MouseButtonDown( const MouseEvent& rMEvt )
             aControls.getArray()[3] = xT2->getModel();
             aControls.getArray()[4] = xT4->getModel();
             xTCModel->setControls( aControls );
-
+            
             Sequence<XControlModelRef> aGroup( 3 );
             aGroup.getArray()[0] = xT1->getModel();
             aGroup.getArray()[1] = xT3->getModel();
             aGroup.getArray()[2] = xT2->getModel();
             xTCModel->setGroup( aGroup, L"test" );
-*/
+*/			
             // Container anzeigen...
             // Als Child zu diesem Fenster
-            xContControl->createPeer( XToolkitRef(), GetComponentInterface( TRUE ) );
+            xContControl->createPeer( XToolkitRef(), GetComponentInterface( TRUE ) ); 
 
             XDeviceRef xD( xContControl->getPeer(), USR_QUERY );
             xG = xD->createGraphics();
             XViewRef xV ( xDrawCtrl, USR_QUERY );
             xV->setGraphics( xG );
 
-//      ((UnoControl*)(XControl*)xNumField))->updateFromModel();
+//		((UnoControl*)(XControl*)xNumField))->updateFromModel();
 
 /*
-            // TEST:
+            // TEST: 
             WindowDecriptor aDescr;
             aDescr.ComponentServiceName = "window";
             aDescr.Type = VCLCOMPONENTTYPE_CONTAINER;
@@ -412,7 +412,7 @@ void MyWin::MouseButtonDown( const MouseEvent& rMEvt )
             aDescr.WindowAttributes = WA_SHOW|WA_BORDER;
             aDescr.Bounds = Rectangle( Point( 500, 50 ), Size( 300, 200 ) );
             XVclWindowPeerRef xSPWin = xToolkit->createComponent( aDescr );
-
+            
             WindowDecriptor aDescr2;
             aDescr2.ComponentServiceName = "scrollbar";
             aDescr2.Type = VCLCOMPONENTTYPE_SIMPLE;
@@ -438,12 +438,12 @@ void MyWin::Resize()
 void MyWin::Paint( const Rectangle& r )
 {
     // Muss ueber PaintListener geschehen...
-    if ( xDrawCtrl.is() )
+    if ( xDrawCtrl.is() ) 
     {
         XViewRef xV( xDrawCtrl, USR_QUERY );
         XWindowRef xC( xDrawCtrl, USR_QUERY );
         xV->draw( xC->getPosSize().Left(), xC->getPosSize().Top() );
     }
-
+   
 }
 
diff --git a/toolkit/workben/layout/editor-normal.xml b/toolkit/workben/layout/editor-normal.xml
index 7f0dc0b69e74..daefa961c9b9 100644
--- a/toolkit/workben/layout/editor-normal.xml
+++ b/toolkit/workben/layout/editor-normal.xml
@@ -46,7 +46,7 @@
         </vbox>
         <hbox cnt:expand="false">
             <vbox><fixedline /><fixedline /><fixedline /><fixedline /></vbox>
-<!--            <pushbutton id="import-button" label="Import..." cnt:expand="false"/>-->
+<!--			<pushbutton id="import-button" label="Import..." cnt:expand="false"/>-->
             <pushbutton id="export-button" label="Export (stdout)" cnt:expand="false"/>
         </hbox>
     </vbox>
diff --git a/toolkit/workben/layout/editor.cxx b/toolkit/workben/layout/editor.cxx
index 699c103d2ee8..df007d01231e 100644
--- a/toolkit/workben/layout/editor.cxx
+++ b/toolkit/workben/layout/editor.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
@@ -29,7 +29,7 @@
 
 #undef NDEBUG
 
-/*
+/* 
 #include <stdio.h>
 #include <string.h>
 */
@@ -187,11 +187,11 @@ public:
             OSL_ASSERT( xContainer.is() );
             xParent = uno::Reference< awt::XLayoutContainer >( xContainer->getParent(), uno::UNO_QUERY );
         }
-
+        
         mxWidget = WidgetFactory::createWidget( xToolkit, xParent, unoName, nAttrbs );
         OSL_ASSERT( mxWidget.is() );
         mxContainer = uno::Reference< awt::XLayoutContainer >( mxWidget, uno::UNO_QUERY );
-
+        
         mrLabel = mrUnoName = unoName;
         // try to get a nicer label for the widget
         for ( int i = 0; i < WIDGETS_SPECS_LEN; i++ )
@@ -201,21 +201,21 @@ public:
                 mrLabel = rtl::OUString( label, strlen( label ), RTL_TEXTENCODING_UTF8  );
                 break;
             }
-
+        
         // set default Text property
         // TODO: disable editing of text fields, check boxes selected, etc...
 #if 0
         uno::Reference< awt::XVclWindowPeer> xVclPeer( mxWidget, uno::UNO_QUERY )
-            if ( xVclPeer.is() ) // XVclWindowPeer ignores missing / incorrect properties
+            if ( xVclPeer.is() ) // XVclWindowPeer ignores missing / incorrect properties 
 
 //FIXME: it looks odd on widgets like NumericField seeing text which is deleted
 // when you interact with it... We can avoid it for those widgets, by doing a getProp
 // of "Text" and check if it is empty or not.
-
+            
                 xVclPeer->setProperty( rtl::OUString::createFromAscii( "Text" ),
                                        uno::makeAny( rtl::OUString::createFromAscii( "new widget" ) ) );
 #endif
-
+        
         // store original properties
         {
             PropertyIterator it( this, WINDOW_PROPERTY );
@@ -267,7 +267,7 @@ public:
 
     virtual void setChildProperties( LayoutWidget *pChild, const PropList &rProps )
     {
-        maOriChildProps = rProps;
+        maOriChildProps = rProps;        
         LayoutWidget::setChildProperties( pChild, rProps );
     }
 
@@ -515,7 +515,7 @@ public:
     }
 
     using LayoutWidget::setProperty;
-
+    
     void setProperty( rtl::OUString rPropName, PropertyKind rKind, uno::Any rValue )
     {
         switch ( rKind ) {
@@ -783,7 +783,7 @@ class PropertiesList : public layout::Table
             void checkProperty()
             {
                 bool flag = mpWidget->isPropertyTouched( maPropName, maPropKind );
-
+                
                 if ( mpFlag && mpFlag->IsChecked() != (BOOL)flag )
                 {
                     CheckFlag( flag, true );
@@ -931,7 +931,7 @@ class PropertiesList : public layout::Table
                 // replace end of lines by "\\n" strings
                 Translate trans[] = {
                     { "\\", "\\\\" }, { "\n", "\\n" }, { 0, 0 }
-                };
+                }; 
                 rtl::OUString str = anyToString( getValue() );
                 str = stringReplace( str, trans );
                 SetText( str );
@@ -947,7 +947,7 @@ class PropertiesList : public layout::Table
                 Translate trans[] = {
                     { "\\\\", "\\"  }, { "\\n", "\n" },
                     { "\\", "" }, { 0, 0 }
-                };
+                }; 
                 rtl::OUString str = GetText();
                 str = stringReplace( str, trans );
                 save( uno::makeAny( str ) );
@@ -1039,7 +1039,7 @@ class PropertiesList : public layout::Table
             void setLabel()
             {
                 SetText( String::CreateFromAscii( IsChecked() ? "true" : "false" ) );
-            }
+            }            
         };
 
         struct AnyListBox : public AnyWidget, layout::ListBox
diff --git a/toolkit/workben/layout/editor.hxx b/toolkit/workben/layout/editor.hxx
index b955732e32c9..ed7187efeca1 100644
--- a/toolkit/workben/layout/editor.hxx
+++ b/toolkit/workben/layout/editor.hxx
@@ -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
diff --git a/toolkit/workben/layout/editor.xml b/toolkit/workben/layout/editor.xml
index 4126dea8b289..03f2ad7c107a 100644
--- a/toolkit/workben/layout/editor.xml
+++ b/toolkit/workben/layout/editor.xml
@@ -45,7 +45,7 @@
         </vbox>
         <hbox cnt:expand="false">
             <vbox><fixedline /><fixedline /><fixedline /><fixedline /></vbox>
-<!--            <pushbutton id="import-button" label="Import..." cnt:expand="false"/>-->
+<!--			<pushbutton id="import-button" label="Import..." cnt:expand="false"/>-->
             <pushbutton id="export-button" label="Export (stdout)" cnt:expand="false"/>
         </hbox>
     </vbox>
diff --git a/toolkit/workben/layout/non-interactable-containers.xml b/toolkit/workben/layout/non-interactable-containers.xml
index 29b37b6a7a49..6acebb7df2d9 100644
--- a/toolkit/workben/layout/non-interactable-containers.xml
+++ b/toolkit/workben/layout/non-interactable-containers.xml
@@ -30,7 +30,7 @@
         </flow>
         <hfixedline/>
         <hbox cnt:expand="false">
-<!--            <align>
+<!--			<align>
                 <okbutton cnt:hfill="0.2" cnt:halign="0.2" />
             </align>
             <align>
diff --git a/toolkit/workben/layout/plugin.cxx b/toolkit/workben/layout/plugin.cxx
index d20fad8c71b9..596ab2ecf252 100644
--- a/toolkit/workben/layout/plugin.cxx
+++ b/toolkit/workben/layout/plugin.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
diff --git a/toolkit/workben/layout/plugin.hxx b/toolkit/workben/layout/plugin.hxx
index 6c8f238b0f57..33a863179625 100644
--- a/toolkit/workben/layout/plugin.hxx
+++ b/toolkit/workben/layout/plugin.hxx
@@ -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
diff --git a/toolkit/workben/layout/recover.cxx b/toolkit/workben/layout/recover.cxx
index fc54fc0be28d..5764154719f8 100644
--- a/toolkit/workben/layout/recover.cxx
+++ b/toolkit/workben/layout/recover.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
diff --git a/toolkit/workben/layout/recover.hxx b/toolkit/workben/layout/recover.hxx
index d01350121375..80444d4392f7 100644
--- a/toolkit/workben/layout/recover.hxx
+++ b/toolkit/workben/layout/recover.hxx
@@ -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
diff --git a/toolkit/workben/layout/recover.xml b/toolkit/workben/layout/recover.xml
index b7387b687de2..58b21173092b 100644
--- a/toolkit/workben/layout/recover.xml
+++ b/toolkit/workben/layout/recover.xml
@@ -14,7 +14,7 @@
         <fixedtext id="FT_HEADER" _label="OpenOffice.org Document Restore"/>
     </hbox>
     <fixedline id="FL_HEADER"/>
-    <!-- mockup: fixedtext multiline=true" does not work?
+    <!-- mockup: fixedtext multiline=true" does not work? 
     <multilineedit id="MLE_RECOVER" has_border="false" foobar="x" _text="At least one document was found that was not stored safely to the media.  Uncheck any documents you do not want to restore (information may be lost)."/>
     <fixedtext id="FT_RECOVER" has_border="false" multi-line="true" font-word-line-mode="true" word-break="true"  _label="At least one document was found that was not stored safely to the media.  Uncheck any documents you do not want to restore (information may be lost).
 LINE TEST"/>
@@ -28,7 +28,7 @@ LINE TEST"/>
         <fixedtext id="FT_DOC" _label="My document"/>
         </hbox>
         <hbox>
-        <checkbox id="CB_SHEET" state="1" cnt:expand="false" scale="false" />
+        <checkbox id="CB_SHEET" state="1" cnt:expand="false" scale="false" /> 
         <fixedimage id="FI_SHEET" cnt:expand="false" scale="false" graphic="res/commandimagelist/lc_inserttable.png" />
         <fixedtext id="FT_SHEET" _label="My spreadsheet"/>
         </hbox>
@@ -51,7 +51,7 @@ LINE TEST"/>
         <fixedtext id="FT_PROGRESS" _label="Restore progress (idle)"/>
         <hbox height="40" cnt:expand="true">
         <progressbar cnt:expand="true" cnt:fill="true" id="PB_RECOVER" has_border="true" border="10" fill-color="#ccccff" background-color="#ffffff" progress-value-min="0" progress-value-max="100" progress-value="50" />
-        <!-- FIXME: cannot set progress bar's height, use space as strut... !-->
+        <!-- FIXME: cannot set progress bar's height, use space as strut... !--> 
         <fixedtext label="" height="10" cnt:expand="false" cnt:fill="false"/>
         </hbox>
     </vbox>
diff --git a/toolkit/workben/layout/simple-paragraph.cxx b/toolkit/workben/layout/simple-paragraph.cxx
index 721dd9030c67..29ee0e48a3a2 100644
--- a/toolkit/workben/layout/simple-paragraph.cxx
+++ b/toolkit/workben/layout/simple-paragraph.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
diff --git a/toolkit/workben/layout/simple-paragraph.hxx b/toolkit/workben/layout/simple-paragraph.hxx
index 07d85da29723..31c4a7328ad4 100644
--- a/toolkit/workben/layout/simple-paragraph.hxx
+++ b/toolkit/workben/layout/simple-paragraph.hxx
@@ -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
diff --git a/toolkit/workben/layout/sortdlg.cxx b/toolkit/workben/layout/sortdlg.cxx
index cc3aa08c105d..7ef77e301712 100644
--- a/toolkit/workben/layout/sortdlg.cxx
+++ b/toolkit/workben/layout/sortdlg.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
@@ -43,23 +43,23 @@
 #include <layout/layout-pre.hxx>
 #endif
 
-ScSortDlg::ScSortDlg( Window*           pParent,
+ScSortDlg::ScSortDlg( Window*			pParent,
                       const SfxItemSet* pArgSet ) :
         SfxTabDialog( pParent,
                       ScResId( RID_SCDLG_SORT ),
                       pArgSet ),
-        bIsHeaders  ( FALSE ),
-        bIsByRows   ( FALSE )
+        bIsHeaders	( FALSE ),
+        bIsByRows	( FALSE )
 
 {
 #if LAYOUT_SFX_TABDIALOG_BROKEN
-    AddTabPage( TP_FIELDS,  ScTabPageSortFields::Create,  0 );
-    AddTabPage( TP_OPTIONS, ScTabPageSortOptions::Create, 0 );
+    AddTabPage( TP_FIELDS,	ScTabPageSortFields::Create,  0 );
+    AddTabPage( TP_OPTIONS,	ScTabPageSortOptions::Create, 0 );
 #else /* !LAYOUT_SFX_TABDIALOG_BROKEN */
     String fields = rtl::OUString::createFromAscii ("fields");
     AddTabPage( TP_FIELDS, fields, ScTabPageSortFields::Create, 0, FALSE, TAB_APPEND);
     String options = rtl::OUString::createFromAscii ("options");
-    AddTabPage( TP_OPTIONS, options, ScTabPageSortOptions::Create, 0, FALSE, TAB_APPEND);
+    AddTabPage( TP_OPTIONS,	options, ScTabPageSortOptions::Create, 0, FALSE, TAB_APPEND);
 #endif /* !LAYOUT_SFX_TABDIALOG_BROKEN */
     FreeResource();
 }
diff --git a/toolkit/workben/layout/sortdlg.hrc b/toolkit/workben/layout/sortdlg.hrc
index 0cecd39e8541..1bae1ef908a3 100644
--- a/toolkit/workben/layout/sortdlg.hrc
+++ b/toolkit/workben/layout/sortdlg.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
@@ -34,32 +34,32 @@
                     // -> SCSTR_FIELD
 
 /*
-#define RID_SCDLG_SORT          256
-#define RID_SCPAGE_SORT_FIELDS  257
-#define RID_SCPAGE_SORT_OPTIONS 258
+#define RID_SCDLG_SORT			256
+#define RID_SCPAGE_SORT_FIELDS	257
+#define RID_SCPAGE_SORT_OPTIONS	258
 */
 
-#define TP_FIELDS           1
-#define TP_OPTIONS          2
+#define TP_FIELDS			1
+#define TP_OPTIONS			2
 
 // TP_SORT_FIELDS:
 #define FL_SORT1            1
 #define FL_SORT2            2
 #define FL_SORT3            3
-#define LB_SORT1            4
-#define LB_SORT2            5
-#define LB_SORT3            6
-#define BTN_UP1             7
-#define BTN_UP2             8
-#define BTN_UP3             9
-#define BTN_DOWN1           10
-#define BTN_DOWN2           11
-#define BTN_DOWN3           12
+#define LB_SORT1			4
+#define LB_SORT2			5
+#define LB_SORT3			6
+#define BTN_UP1				7
+#define BTN_UP2				8
+#define BTN_UP3				9
+#define BTN_DOWN1			10
+#define BTN_DOWN2			11
+#define BTN_DOWN3			12
 
 // TP_SORT_OPTIONS:
-#define FL_DIRECTION        1
-#define LB_SORT_USER        2
-#define LB_OUTAREA          3
+#define FL_DIRECTION		1
+#define LB_SORT_USER		2
+#define LB_OUTAREA			3
 #define ED_OUTAREA          4
 //#define FT_AREA_LABEL       5
 //#define FT_AREA             6
@@ -76,7 +76,7 @@
 #define LB_LANGUAGE         17
 #define FT_ALGORITHM        18
 #define LB_ALGORITHM        19
-#define BTN_NATURALSORT     20
+#define	BTN_NATURALSORT		20
 
 
 
diff --git a/toolkit/workben/layout/sortdlg.hxx b/toolkit/workben/layout/sortdlg.hxx
index e5b3b289434d..330ddc9d6720 100644
--- a/toolkit/workben/layout/sortdlg.hxx
+++ b/toolkit/workben/layout/sortdlg.hxx
@@ -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
@@ -46,25 +46,25 @@
 class ScSortDlg : public SfxTabDialog
 {
 public:
-                ScSortDlg( Window*           pParent,
+                ScSortDlg( Window*			 pParent,
                            const SfxItemSet* pArgSet );
                 ~ScSortDlg();
 
-    void    SetHeaders( BOOL bHeaders );
-    void    SetByRows ( BOOL bByRows );
-    BOOL    GetHeaders() const;
-    BOOL    GetByRows () const;
+    void	SetHeaders( BOOL bHeaders );
+    void	SetByRows ( BOOL bByRows );
+    BOOL	GetHeaders() const;
+    BOOL	GetByRows () const;
 
 
 private:
-    BOOL    bIsHeaders;
-    BOOL    bIsByRows;
+    BOOL	bIsHeaders;
+    BOOL	bIsByRows;
 };
 
-inline void ScSortDlg::SetHeaders( BOOL bHeaders )  { bIsHeaders = bHeaders; }
-inline void ScSortDlg::SetByRows ( BOOL bByRows  )  { bIsByRows = bByRows; }
-inline BOOL ScSortDlg::GetHeaders() const           { return bIsHeaders; }
-inline BOOL ScSortDlg::GetByRows () const           { return bIsByRows; }
+inline void ScSortDlg::SetHeaders( BOOL bHeaders )	{ bIsHeaders = bHeaders; }
+inline void ScSortDlg::SetByRows ( BOOL bByRows  )	{ bIsByRows = bByRows; }
+inline BOOL ScSortDlg::GetHeaders() const 			{ return bIsHeaders; }
+inline BOOL ScSortDlg::GetByRows () const 			{ return bIsByRows; }
 
 #if !LAYOUT_SFX_TABDIALOG_BROKEN
 #include <layout/layout-post.hxx>
diff --git a/toolkit/workben/layout/sortdlg.src b/toolkit/workben/layout/sortdlg.src
index 5e855962af96..1d03abd0d19c 100644
--- a/toolkit/workben/layout/sortdlg.src
+++ b/toolkit/workben/layout/sortdlg.src
@@ -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
diff --git a/toolkit/workben/layout/test.cxx b/toolkit/workben/layout/test.cxx
index 6a09518ebc4f..36a18d6a2520 100644
--- a/toolkit/workben/layout/test.cxx
+++ b/toolkit/workben/layout/test.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
@@ -115,7 +115,7 @@ static uno::Reference< lang::XSingleServiceFactory > get_factory( char const *se
 }
 
 #define GET_FACTORY(x) get_factory( #x )
-
+    
 void LayoutTest::LoadFile( const OUString &aTestFile )
 {
     fprintf( stderr, "TEST: layout instance\n" );
@@ -220,7 +220,7 @@ void LayoutTest::ParseCommandLine()
 
     if ( mFiles.size() <= 0 )
         mFiles.push_back( OUString::createFromAscii( "layout.xml" ) );
-}
+}    
 
 void LayoutTest::RunEditor()
 {
@@ -312,7 +312,7 @@ void LayoutTest::RunFiles()
     for ( std::list< OUString >::iterator  i = mFiles.begin(); i != mFiles.end(); i++ )
         LoadFile( *i );
     fprintf( stderr, "TEST: executing\n" );
-    Execute();
+    Execute(); 
     fprintf( stderr, "TEST: done executing\n" );
 }
 
diff --git a/toolkit/workben/layout/tpsort.cxx b/toolkit/workben/layout/tpsort.cxx
index 949f3b777a71..9f0684d81a49 100644
--- a/toolkit/workben/layout/tpsort.cxx
+++ b/toolkit/workben/layout/tpsort.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
@@ -87,7 +87,7 @@ static USHORT pSortRanges[] =
  *
  * virtual BOOL HasExchangeSupport() const; -> return TRUE;
  * virtual void ActivatePage(const SfxItemSet &);
- * virtual int  DeactivatePage(SfxItemSet * = 0);
+ * virtual int	DeactivatePage(SfxItemSet * = 0);
  *
  * muss noch geaendert werden!
  */
@@ -96,49 +96,49 @@ static USHORT pSortRanges[] =
 //========================================================================
 // Sortierkriterien-Tabpage:
 
-ScTabPageSortFields::ScTabPageSortFields( Window*           pParent,
+ScTabPageSortFields::ScTabPageSortFields( Window*			pParent,
                                           const SfxItemSet& rArgSet )
 
-    :   SfxTabPage      ( pParent,
+    :	SfxTabPage		( pParent,
                           ScResId( RID_SCPAGE_SORT_FIELDS ),
                           rArgSet ),
         //
         aFlSort1        ( this, ScResId( FL_SORT1  ) ),
-        aLbSort1        ( this, ScResId( LB_SORT1  ) ),
+        aLbSort1		( this, ScResId( LB_SORT1  ) ),
         aBtnUp1         ( this, ScResId( BTN_UP1   ) ),
-        aBtnDown1       ( this, ScResId( BTN_DOWN1 ) ),
+        aBtnDown1		( this, ScResId( BTN_DOWN1 ) ),
         //
         aFlSort2        ( this, ScResId( FL_SORT2  ) ),
-        aLbSort2        ( this, ScResId( LB_SORT2  ) ),
+        aLbSort2		( this, ScResId( LB_SORT2  ) ),
         aBtnUp2         ( this, ScResId( BTN_UP2   ) ),
-        aBtnDown2       ( this, ScResId( BTN_DOWN2 ) ),
+        aBtnDown2		( this, ScResId( BTN_DOWN2 ) ),
         //
         aFlSort3        ( this, ScResId( FL_SORT3  ) ),
-        aLbSort3        ( this, ScResId( LB_SORT3  ) ),
+        aLbSort3		( this, ScResId( LB_SORT3  ) ),
         aBtnUp3         ( this, ScResId( BTN_UP3   ) ),
-        aBtnDown3       ( this, ScResId( BTN_DOWN3 ) ),
+        aBtnDown3		( this, ScResId( BTN_DOWN3 ) ),
 
-        aStrUndefined   ( ScResId( SCSTR_UNDEFINED ) ),
-        aStrColumn      ( ScResId( SCSTR_COLUMN ) ),
-        aStrRow         ( ScResId( SCSTR_ROW ) ),
+        aStrUndefined	( ScResId( SCSTR_UNDEFINED ) ),
+        aStrColumn		( ScResId( SCSTR_COLUMN ) ),
+        aStrRow 		( ScResId( SCSTR_ROW ) ),
         //
 #if !TEST_LAYOUT
-        nWhichSort      ( rArgSet.GetPool()->GetWhich( SID_SORT ) ),
+        nWhichSort		( rArgSet.GetPool()->GetWhich( SID_SORT ) ),
 #else /* TEST_LAYOUT */
-        nWhichSort      ( 0 ),
+        nWhichSort		( 0 ),
 #endif /* TEST_LAYOUT */
-        pDlg            ( (ScSortDlg*)(GetParent()->GetParent()) ),
-        pViewData       ( NULL ),
+        pDlg			( (ScSortDlg*)(GetParent()->GetParent()) ),
+        pViewData		( NULL ),
 #if !TEST_LAYOUT
-        rSortData       ( ((const ScSortItem&)
+        rSortData		( ((const ScSortItem&)
                            rArgSet.Get( nWhichSort )).
                                 GetSortData() ),
 #else /* TEST_LAYOUT */
-        rSortData       ( *new ScSortParam() ),
+        rSortData		( *new ScSortParam() ),
 #endif /* TEST_LAYOUT */
-        nFieldCount     ( 0 ),
-        bHasHeader      ( FALSE ),
-        bSortByRows     ( FALSE )
+        nFieldCount 	( 0 ),
+        bHasHeader		( FALSE ),
+        bSortByRows 	( FALSE )
 {
     Init();
     FreeResource();
@@ -175,15 +175,15 @@ void ScTabPageSortFields::Init()
     aLbSort2.Clear();
     aLbSort3.Clear();
 
-    aSortLbArr[0]       = &aLbSort1;
-    aSortLbArr[1]       = &aLbSort2;
-    aSortLbArr[2]       = &aLbSort3;
-    aDirBtnArr[0][0]    = &aBtnUp1;
-    aDirBtnArr[0][1]    = &aBtnDown1;
-    aDirBtnArr[1][0]    = &aBtnUp2;
-    aDirBtnArr[1][1]    = &aBtnDown2;
-    aDirBtnArr[2][0]    = &aBtnUp3;
-    aDirBtnArr[2][1]    = &aBtnDown3;
+    aSortLbArr[0]		= &aLbSort1;
+    aSortLbArr[1]		= &aLbSort2;
+    aSortLbArr[2]		= &aLbSort3;
+    aDirBtnArr[0][0]	= &aBtnUp1;
+    aDirBtnArr[0][1]	= &aBtnDown1;
+    aDirBtnArr[1][0]	= &aBtnUp2;
+    aDirBtnArr[1][1]	= &aBtnDown2;
+    aDirBtnArr[2][0]	= &aBtnUp3;
+    aDirBtnArr[2][1]	= &aBtnDown3;
     aFlArr[0]           = &aFlSort1;
     aFlArr[1]           = &aFlSort2;
     aFlArr[2]           = &aFlSort3;
@@ -198,8 +198,8 @@ USHORT* __EXPORT ScTabPageSortFields::GetRanges()
 
 // -----------------------------------------------------------------------
 
-SfxTabPage* __EXPORT ScTabPageSortFields::Create( Window*   pParent,
-                                         const SfxItemSet&  rArgSet )
+SfxTabPage* __EXPORT ScTabPageSortFields::Create( Window*	pParent,
+                                         const SfxItemSet&	rArgSet )
 {
     return ( new ScTabPageSortFields( pParent, rArgSet ) );
 }
@@ -209,7 +209,7 @@ SfxTabPage* __EXPORT ScTabPageSortFields::Create( Window*   pParent,
 void __EXPORT ScTabPageSortFields::Reset( const SfxItemSet& /* rArgSet */ )
 {
     bSortByRows = rSortData.bByRow;
-    bHasHeader  = rSortData.bHasHeader;
+    bHasHeader	= rSortData.bHasHeader;
 
     if ( aLbSort1.GetEntryCount() == 0 )
         FillFieldLists();
@@ -226,13 +226,13 @@ void __EXPORT ScTabPageSortFields::Reset( const SfxItemSet& /* rArgSet */ )
                      GetFieldSelPos( rSortData.nField[i] ) );
 
                 (rSortData.bAscending[i])
-                    ? aDirBtnArr[i][0]->Check()     // Up
-                    : aDirBtnArr[i][1]->Check();    // Down
+                    ? aDirBtnArr[i][0]->Check() 	// Up
+                    : aDirBtnArr[i][1]->Check();	// Down
             }
             else
             {
                 aSortLbArr[i]->SelectEntryPos( 0 ); // "keiner" selektieren
-                aDirBtnArr[i][0]->Check();          // Up
+                aDirBtnArr[i][0]->Check();			// Up
             }
         }
 
@@ -277,9 +277,9 @@ BOOL __EXPORT ScTabPageSortFields::FillItemSet( SfxItemSet& rArgSet )
             theSortData = ((const ScSortItem*)pItem)->GetSortData();
     }
 
-    USHORT  nSort1Pos = aLbSort1.GetSelectEntryPos();
-    USHORT  nSort2Pos = aLbSort2.GetSelectEntryPos();
-    USHORT  nSort3Pos = aLbSort3.GetSelectEntryPos();
+    USHORT	nSort1Pos = aLbSort1.GetSelectEntryPos();
+    USHORT	nSort2Pos = aLbSort2.GetSelectEntryPos();
+    USHORT	nSort3Pos = aLbSort3.GetSelectEntryPos();
 
     DBG_ASSERT(    (nSort1Pos <= SC_MAXFIELDS)
                 && (nSort2Pos <= SC_MAXFIELDS)
@@ -318,7 +318,7 @@ BOOL __EXPORT ScTabPageSortFields::FillItemSet( SfxItemSet& rArgSet )
         theSortData.bAscending[0] = aBtnUp1.IsChecked();
         theSortData.bAscending[1] = aBtnUp2.IsChecked();
         theSortData.bAscending[2] = aBtnUp3.IsChecked();
-        //  bHasHeader ist in ScTabPageSortOptions::FillItemSet, wo es hingehoert
+        //	bHasHeader ist in ScTabPageSortOptions::FillItemSet, wo es hingehoert
     }
     else
     {
@@ -344,11 +344,11 @@ void __EXPORT ScTabPageSortFields::ActivatePage()
         if (   bHasHeader  != pDlg->GetHeaders()
             || bSortByRows != pDlg->GetByRows()   )
         {
-            USHORT  nCurSel1 = aLbSort1.GetSelectEntryPos();
-            USHORT  nCurSel2 = aLbSort2.GetSelectEntryPos();
-            USHORT  nCurSel3 = aLbSort3.GetSelectEntryPos();
+            USHORT	nCurSel1 = aLbSort1.GetSelectEntryPos();
+            USHORT	nCurSel2 = aLbSort2.GetSelectEntryPos();
+            USHORT	nCurSel3 = aLbSort3.GetSelectEntryPos();
 
-            bHasHeader  = pDlg->GetHeaders();
+            bHasHeader	= pDlg->GetHeaders();
             bSortByRows = pDlg->GetByRows();
             FillFieldLists();
             aLbSort1.SelectEntryPos( nCurSel1 );
@@ -385,7 +385,7 @@ void ScTabPageSortFields::DisableField( USHORT nField )
 
     if ( nField<=2 )
     {
-        aSortLbArr[nField]   ->Disable();
+        aSortLbArr[nField]	 ->Disable();
         aDirBtnArr[nField][0]->Disable();
         aDirBtnArr[nField][1]->Disable();
         aFlArr[nField]       ->Disable();
@@ -400,7 +400,7 @@ void ScTabPageSortFields::EnableField( USHORT nField )
 
     if ( nField<=2 )
     {
-        aSortLbArr[nField]   ->Enable();
+        aSortLbArr[nField]	 ->Enable();
         aDirBtnArr[nField][0]->Enable();
         aDirBtnArr[nField][1]->Enable();
         aFlArr[nField]       ->Enable();
@@ -424,23 +424,23 @@ void ScTabPageSortFields::FillFieldLists()
             aLbSort2.InsertEntry( aStrUndefined, 0 );
             aLbSort3.InsertEntry( aStrUndefined, 0 );
 
-            SCCOL   nFirstSortCol   = rSortData.nCol1;
-            SCROW   nFirstSortRow   = rSortData.nRow1;
-            SCTAB   nTab        = pViewData->GetTabNo();
-            USHORT  i           = 1;
+            SCCOL	nFirstSortCol	= rSortData.nCol1;
+            SCROW	nFirstSortRow	= rSortData.nRow1;
+            SCTAB	nTab		= pViewData->GetTabNo();
+            USHORT	i			= 1;
 
             if ( bSortByRows )
             {
-                String  aFieldName;
-                SCCOL   nMaxCol = rSortData.nCol2;
-                SCCOL   col;
+                String	aFieldName;
+                SCCOL	nMaxCol = rSortData.nCol2;
+                SCCOL	col;
 
                 for ( col=nFirstSortCol; col<=nMaxCol && i<SC_MAXFIELDS; col++ )
                 {
                     pDoc->GetString( col, nFirstSortRow, nTab, aFieldName );
                     if ( !bHasHeader || (aFieldName.Len() == 0) )
                     {
-                        aFieldName  = aStrColumn;
+                        aFieldName	= aStrColumn;
                         aFieldName += ' ';
                         aFieldName += ColToAlpha( col );
                     }
@@ -453,16 +453,16 @@ void ScTabPageSortFields::FillFieldLists()
             }
             else
             {
-                String  aFieldName;
-                SCROW   nMaxRow = rSortData.nRow2;
-                SCROW   row;
+                String	aFieldName;
+                SCROW	nMaxRow = rSortData.nRow2;
+                SCROW	row;
 
                 for ( row=nFirstSortRow; row<=nMaxRow && i<SC_MAXFIELDS; row++ )
                 {
                     pDoc->GetString( nFirstSortCol, row, nTab, aFieldName );
                     if ( !bHasHeader || (aFieldName.Len() == 0) )
                     {
-                        aFieldName  = aStrRow;
+                        aFieldName	= aStrRow;
                         aFieldName += ' ';
                         aFieldName += String::CreateFromInt32( row+1 );
                     }
@@ -482,8 +482,8 @@ void ScTabPageSortFields::FillFieldLists()
 
 USHORT ScTabPageSortFields::GetFieldSelPos( SCCOLROW nField )
 {
-    USHORT  nFieldPos   = 0;
-    BOOL    bFound      = FALSE;
+    USHORT	nFieldPos	= 0;
+    BOOL	bFound		= FALSE;
 
     for ( USHORT n=1; n<nFieldCount && !bFound; n++ )
     {
@@ -554,55 +554,55 @@ IMPL_LINK( ScTabPageSortFields, SelectHdl, ListBox *, pLb )
 #define SfxTabPage( parent, id, args ) SfxTabPage( parent, "sort-options.xml", id, &args )
 #endif /* ENABLE_LAYOUT */
 
-ScTabPageSortOptions::ScTabPageSortOptions( Window*             pParent,
-                                            const SfxItemSet&   rArgSet )
+ScTabPageSortOptions::ScTabPageSortOptions( Window* 			pParent,
+                                            const SfxItemSet&	rArgSet )
 
-    :   SfxTabPage      ( pParent,
+    :	SfxTabPage		( pParent,
                           ScResId( RID_SCPAGE_SORT_OPTIONS ),
                           rArgSet ),
         //
-        aBtnCase        ( this, ScResId( BTN_CASESENSITIVE ) ),
-        aBtnHeader      ( this, ScResId( BTN_LABEL ) ),
-        aBtnFormats     ( this, ScResId( BTN_FORMATS ) ),
-        aBtnCopyResult  ( this, ScResId( BTN_COPYRESULT ) ),
-        aBtnNaturalSort ( this, ScResId( BTN_NATURALSORT ) ),
-        aLbOutPos       ( this, ScResId( LB_OUTAREA ) ),
-        aEdOutPos       ( this, ScResId( ED_OUTAREA ) ),
-        aBtnSortUser    ( this, ScResId( BTN_SORT_USER ) ),
-        aLbSortUser     ( this, ScResId( LB_SORT_USER ) ),
+        aBtnCase		( this, ScResId( BTN_CASESENSITIVE ) ),
+        aBtnHeader		( this, ScResId( BTN_LABEL ) ),
+        aBtnFormats 	( this, ScResId( BTN_FORMATS ) ),
+        aBtnCopyResult	( this, ScResId( BTN_COPYRESULT ) ),
+        aBtnNaturalSort	( this, ScResId( BTN_NATURALSORT ) ),
+        aLbOutPos		( this, ScResId( LB_OUTAREA ) ),
+        aEdOutPos		( this, ScResId( ED_OUTAREA ) ),
+        aBtnSortUser	( this, ScResId( BTN_SORT_USER ) ),
+        aLbSortUser 	( this, ScResId( LB_SORT_USER ) ),
         aFtLanguage     ( this, ScResId( FT_LANGUAGE ) ),
-        aLbLanguage     ( this, ScResId( LB_LANGUAGE ) ),
+        aLbLanguage		( this, ScResId( LB_LANGUAGE ) ),
         aFtAlgorithm    ( this, ScResId( FT_ALGORITHM ) ),
-        aLbAlgorithm    ( this, ScResId( LB_ALGORITHM ) ),
-        aLineDirection  ( this, ScResId( FL_DIRECTION ) ),
-        aBtnTopDown     ( this, ScResId( BTN_TOP_DOWN ) ),
-        aBtnLeftRight   ( this, ScResId( BTN_LEFT_RIGHT ) ),
-//      aFtAreaLabel    ( this, ScResId( FT_AREA_LABEL ) ),
-//      aFtArea         ( this, ScResId( FT_AREA ) ),
+        aLbAlgorithm	( this, ScResId( LB_ALGORITHM ) ),
+        aLineDirection	( this, ScResId( FL_DIRECTION ) ),
+        aBtnTopDown 	( this, ScResId( BTN_TOP_DOWN ) ),
+        aBtnLeftRight	( this, ScResId( BTN_LEFT_RIGHT ) ),
+// 		aFtAreaLabel	( this, ScResId( FT_AREA_LABEL ) ),
+//		aFtArea 		( this, ScResId( FT_AREA ) ),
         //
 #if ENABLE_LAYOUT
 #undef this
 #undef ScResId
 #define ScResId(x) this, #x
 #endif /* ENABLE_LAYOUT */
-        aStrRowLabel    ( ScResId( STR_ROW_LABEL ) ),
-        aStrColLabel    ( ScResId( STR_COL_LABEL ) ),
-        aStrUndefined   ( ScResId( SCSTR_UNDEFINED ) ),
-        aStrNoName      ( ScGlobal::GetRscString(STR_DB_NONAME) ),
+        aStrRowLabel	( ScResId( STR_ROW_LABEL ) ),
+        aStrColLabel	( ScResId( STR_COL_LABEL ) ),
+        aStrUndefined	( ScResId( SCSTR_UNDEFINED ) ),
+        aStrNoName		( ScGlobal::GetRscString(STR_DB_NONAME) ),
         //
 #if !TEST_LAYOUT
-        nWhichSort      ( rArgSet.GetPool()->GetWhich( SID_SORT ) ),
-        rSortData       ( ((const ScSortItem&)
+        nWhichSort		( rArgSet.GetPool()->GetWhich( SID_SORT ) ),
+        rSortData		( ((const ScSortItem&)
                           rArgSet.Get( nWhichSort )).GetSortData() ),
 #else /* TEST_LAYOUT */
-        nWhichSort      ( 0 ),
-        rSortData       ( *new ScSortParam() ),
+        nWhichSort		( 0 ),
+        rSortData		( *new ScSortParam() ),
 #endif /* TEST_LAYOUT */
-        pViewData       ( NULL ),
-        pDoc            ( NULL ),
-        pDlg            ( (ScSortDlg*)(GetParent() ? GetParent()->GetParent() : 0 ) ),
-        pColRes         ( NULL ),
-        pColWrap        ( NULL )
+        pViewData		( NULL ),
+        pDoc			( NULL ),
+        pDlg			( (ScSortDlg*)(GetParent() ? GetParent()->GetParent() : 0 ) ),
+        pColRes			( NULL ),
+        pColWrap		( NULL )
 {
 #if TEST_LAYOUT
     (void) rArgSet;
@@ -624,49 +624,49 @@ __EXPORT ScTabPageSortOptions::~ScTabPageSortOptions()
 #endif /* !TEST_LAYOUT */
 
     delete pColRes;
-    delete pColWrap;        //! not if from document
+    delete pColWrap;		//! not if from document
 }
 
 // -----------------------------------------------------------------------
 
 void ScTabPageSortOptions::Init()
 {
-//  aStrAreaLabel = aFtAreaLabel.GetText();
-//  aStrAreaLabel.Append( (sal_Unicode) ' ' );
+// 	aStrAreaLabel = aFtAreaLabel.GetText();
+// 	aStrAreaLabel.Append( (sal_Unicode) ' ' );
 
-    //  CollatorRessource has user-visible names for sort algorithms
+    //	CollatorRessource has user-visible names for sort algorithms
     pColRes = new CollatorRessource();
 
-    //! use CollatorWrapper from document?
+    //!	use CollatorWrapper from document?
     pColWrap = new CollatorWrapper( comphelper::getProcessServiceFactory() );
 
 #if !TEST_LAYOUT
-    const ScSortItem&   rSortItem = (const ScSortItem&)
+    const ScSortItem&	rSortItem = (const ScSortItem&)
                                     GetItemSet().Get( nWhichSort );
 #endif /* !TEST_LAYOUT */
 
-    aLbOutPos.SetSelectHdl    ( LINK( this, ScTabPageSortOptions, SelOutPosHdl ) );
+    aLbOutPos.SetSelectHdl	  ( LINK( this, ScTabPageSortOptions, SelOutPosHdl ) );
     aBtnCopyResult.SetClickHdl( LINK( this, ScTabPageSortOptions, EnableHdl ) );
     aBtnSortUser.SetClickHdl  ( LINK( this, ScTabPageSortOptions, EnableHdl ) );
-    aBtnTopDown.SetClickHdl   ( LINK( this, ScTabPageSortOptions, SortDirHdl ) );
+    aBtnTopDown.SetClickHdl	  ( LINK( this, ScTabPageSortOptions, SortDirHdl ) );
     aBtnLeftRight.SetClickHdl ( LINK( this, ScTabPageSortOptions, SortDirHdl ) );
     aLbLanguage.SetSelectHdl  ( LINK( this, ScTabPageSortOptions, FillAlgorHdl ) );
 
 #if !TEST_LAYOUT
     pViewData = rSortItem.GetViewData();
 #endif /* TEST_LAYOUT */
-    pDoc      = pViewData ? pViewData->GetDocument() : NULL;
+    pDoc	  = pViewData ? pViewData->GetDocument() : NULL;
 
     DBG_ASSERT( pViewData, "ViewData not found! :-/" );
 
 #if !TEST_LAYOUT
     if ( pViewData && pDoc )
     {
-        String          theArea;
-        ScDBCollection* pDBColl     = pDoc->GetDBCollection();
-        String          theDbArea;
-        String          theDbName   = aStrNoName;
-        const SCTAB nCurTab     = pViewData->GetTabNo();
+        String			theArea;
+        ScDBCollection* pDBColl 	= pDoc->GetDBCollection();
+        String			theDbArea;
+        String			theDbName	= aStrNoName;
+        const SCTAB	nCurTab		= pViewData->GetTabNo();
         const ScAddress::Convention eConv = pDoc->GetAddressConvention();
 #endif /* !TEST_LAYOUT */
 
@@ -729,7 +729,7 @@ void ScTabPageSortOptions::Init()
 
     FillUserSortListBox();
 
-    //  get available languages
+    //	get available languages
 
     aLbLanguage.SetLanguageList( LANG_LIST_ALL | LANG_LIST_ONLY_KNOWN, FALSE );
     aLbLanguage.InsertLanguage( LANGUAGE_SYSTEM );
@@ -748,8 +748,8 @@ USHORT* __EXPORT ScTabPageSortOptions::GetRanges()
 #undef SfxTabPage
 #endif /* ENABLE_LAYOUT */
 SfxTabPage* __EXPORT ScTabPageSortOptions::Create(
-                                            Window*             pParent,
-                                            const SfxItemSet&   rArgSet )
+                                            Window*				pParent,
+                                            const SfxItemSet&	rArgSet )
 {
     return ( new ScTabPageSortOptions( pParent, rArgSet ) );
 }
@@ -771,10 +771,10 @@ void __EXPORT ScTabPageSortOptions::Reset( const SfxItemSet& /* rArgSet */ )
         aLbSortUser.SelectEntryPos( 0 );
     }
 
-    aBtnCase.Check          ( rSortData.bCaseSens );
-    aBtnFormats.Check       ( rSortData.bIncludePattern );
-    aBtnHeader.Check        ( rSortData.bHasHeader );
-    aBtnNaturalSort.Check   ( rSortData.bNaturalSort );
+    aBtnCase.Check			( rSortData.bCaseSens );
+    aBtnFormats.Check		( rSortData.bIncludePattern );
+    aBtnHeader.Check		( rSortData.bHasHeader );
+    aBtnNaturalSort.Check	( rSortData.bNaturalSort );
 
     if ( rSortData.bByRow )
     {
@@ -791,7 +791,7 @@ void __EXPORT ScTabPageSortOptions::Reset( const SfxItemSet& /* rArgSet */ )
     if ( eLang == LANGUAGE_DONTKNOW )
         eLang = LANGUAGE_SYSTEM;
     aLbLanguage.SelectLanguage( eLang );
-    FillAlgorHdl( &aLbLanguage );               // get algorithms, select default
+    FillAlgorHdl( &aLbLanguage );				// get algorithms, select default
     if ( rSortData.aCollatorAlgorithm.Len() )
         aLbAlgorithm.SelectEntry( pColRes->GetTranslation( rSortData.aCollatorAlgorithm ) );
 
@@ -837,17 +837,17 @@ BOOL __EXPORT ScTabPageSortOptions::FillItemSet( SfxItemSet& rArgSet )
             theSortData = ((const ScSortItem*)pItem)->GetSortData();
     }
 
-    theSortData.bByRow          = aBtnTopDown.IsChecked();
-    theSortData.bHasHeader      = aBtnHeader.IsChecked();
-    theSortData.bCaseSens       = aBtnCase.IsChecked();
-    theSortData.bNaturalSort    = aBtnNaturalSort.IsChecked();
+    theSortData.bByRow			= aBtnTopDown.IsChecked();
+    theSortData.bHasHeader		= aBtnHeader.IsChecked();
+    theSortData.bCaseSens		= aBtnCase.IsChecked();
+    theSortData.bNaturalSort	= aBtnNaturalSort.IsChecked();
     theSortData.bIncludePattern = aBtnFormats.IsChecked();
-    theSortData.bInplace        = !aBtnCopyResult.IsChecked();
-    theSortData.nDestCol        = theOutPos.Col();
-    theSortData.nDestRow        = theOutPos.Row();
-    theSortData.nDestTab        = theOutPos.Tab();
-    theSortData.bUserDef        = aBtnSortUser.IsChecked();
-    theSortData.nUserIndex      = (aBtnSortUser.IsChecked())
+    theSortData.bInplace		= !aBtnCopyResult.IsChecked();
+    theSortData.nDestCol		= theOutPos.Col();
+    theSortData.nDestRow		= theOutPos.Row();
+    theSortData.nDestTab		= theOutPos.Tab();
+    theSortData.bUserDef		= aBtnSortUser.IsChecked();
+    theSortData.nUserIndex		= (aBtnSortUser.IsChecked())
                                     ? aLbSortUser.GetSelectEntryPos()
                                     : 0;
 
@@ -906,17 +906,17 @@ int __EXPORT ScTabPageSortOptions::DeactivatePage( SfxItemSet* pSetP )
 
     if ( aBtnCopyResult.IsChecked() )
     {
-        String      thePosStr = aEdOutPos.GetText();
-        ScAddress   thePos;
-        xub_StrLen  nColonPos = thePosStr.Search( ':' );
+        String		thePosStr = aEdOutPos.GetText();
+        ScAddress	thePos;
+        xub_StrLen	nColonPos = thePosStr.Search( ':' );
 
         if ( STRING_NOTFOUND != nColonPos )
             thePosStr.Erase( nColonPos );
 
         if ( pViewData )
         {
-            //  visible table is default for input without table
-            //  must be changed to GetRefTabNo when sorting has RefInput!
+            //	visible table is default for input without table
+            //	must be changed to GetRefTabNo when sorting has RefInput!
             thePos.SetTab( pViewData->GetTabNo() );
         }
 
@@ -1008,8 +1008,8 @@ IMPL_LINK( ScTabPageSortOptions, SelOutPosHdl, ListBox *, pLb )
 {
     if ( pLb == &aLbOutPos )
     {
-        String  aString;
-        USHORT  nSelPos = aLbOutPos.GetSelectEntryPos();
+        String	aString;
+        USHORT	nSelPos = aLbOutPos.GetSelectEntryPos();
 
         if ( nSelPos > 0 )
             aString = *(String*)aLbOutPos.GetEntryData( nSelPos );
@@ -1040,15 +1040,15 @@ void __EXPORT ScTabPageSortOptions::EdOutPosModHdl( Edit* pEd )
 {
     if ( pEd == &aEdOutPos )
     {
-        String  theCurPosStr = aEdOutPos.GetText();
-        USHORT  nResult = ScAddress().Parse( theCurPosStr, pDoc, pDoc->GetAddressConvention() );
+        String	theCurPosStr = aEdOutPos.GetText();
+        USHORT	nResult = ScAddress().Parse( theCurPosStr, pDoc, pDoc->GetAddressConvention() );
 
         if ( SCA_VALID == (nResult & SCA_VALID) )
         {
-            String* pStr    = NULL;
-            BOOL    bFound  = FALSE;
-            USHORT  i       = 0;
-            USHORT  nCount  = aLbOutPos.GetEntryCount();
+            String*	pStr	= NULL;
+            BOOL	bFound	= FALSE;
+            USHORT	i		= 0;
+            USHORT	nCount	= aLbOutPos.GetEntryCount();
 
             for ( i=2; i<nCount && !bFound; i++ )
             {
@@ -1074,11 +1074,11 @@ IMPL_LINK( ScTabPageSortOptions, FillAlgorHdl, void *, EMPTYARG )
     LanguageType eLang = aLbLanguage.GetSelectLanguage();
     if ( eLang == LANGUAGE_SYSTEM )
     {
-        //  for LANGUAGE_SYSTEM no algorithm can be selected because
-        //  it wouldn't necessarily exist for other languages
-        //  -> leave list box empty if LANGUAGE_SYSTEM is selected
+        //	for LANGUAGE_SYSTEM no algorithm can be selected because
+        //	it wouldn't necessarily exist for other languages
+        //	-> leave list box empty if LANGUAGE_SYSTEM is selected
         aFtAlgorithm.Enable( FALSE );           // nothing to select
-        aLbAlgorithm.Enable( FALSE );           // nothing to select
+        aLbAlgorithm.Enable( FALSE );			// nothing to select
     }
     else
     {
@@ -1093,9 +1093,9 @@ IMPL_LINK( ScTabPageSortOptions, FillAlgorHdl, void *, EMPTYARG )
             String sUser = pColRes->GetTranslation( sAlg );
             aLbAlgorithm.InsertEntry( sUser, LISTBOX_APPEND );
         }
-        aLbAlgorithm.SelectEntryPos( 0 );       // first entry is default
+        aLbAlgorithm.SelectEntryPos( 0 );		// first entry is default
         aFtAlgorithm.Enable( nCount > 1 );      // enable only if there is a choice
-        aLbAlgorithm.Enable( nCount > 1 );      // enable only if there is a choice
+        aLbAlgorithm.Enable( nCount > 1 );		// enable only if there is a choice
     }
 
     aLbAlgorithm.SetUpdateMode( TRUE );
diff --git a/toolkit/workben/layout/tpsort.hxx b/toolkit/workben/layout/tpsort.hxx
index 9cc851914fd5..0dcb2f2433e4 100644
--- a/toolkit/workben/layout/tpsort.hxx
+++ b/toolkit/workben/layout/tpsort.hxx
@@ -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
@@ -43,7 +43,7 @@
 //------------------------------------------------------------------------
 
 // +1 because one field is reserved for the "- undefined -" entry
-#define SC_MAXFIELDS    MAXCOLCOUNT+1
+#define SC_MAXFIELDS	MAXCOLCOUNT+1
 
 class ScViewData;
 class ScSortDlg;
@@ -55,66 +55,66 @@ struct ScSortParam;
 class ScTabPageSortFields : public SfxTabPage
 {
 public:
-                ScTabPageSortFields( Window*             pParent,
-                                     const SfxItemSet&   rArgSet );
+                ScTabPageSortFields( Window*			 pParent,
+                                     const SfxItemSet&	 rArgSet );
                 ~ScTabPageSortFields();
 
-    static  SfxTabPage* Create      ( Window*               pParent,
-                                      const SfxItemSet&     rArgSet );
-    static  USHORT*     GetRanges   ();
-    virtual BOOL        FillItemSet ( SfxItemSet& rArgSet );
-    virtual void        Reset       ( const SfxItemSet& rArgSet );
+    static	SfxTabPage*	Create		( Window*				pParent,
+                                      const SfxItemSet& 	rArgSet );
+    static	USHORT*		GetRanges	();
+    virtual	BOOL		FillItemSet	( SfxItemSet& rArgSet );
+    virtual	void		Reset		( const SfxItemSet& rArgSet );
 
 protected:
 // fuer Datenaustausch (sollte noch umgestellt werden!)
-//  virtual void        ActivatePage    ( const SfxItemSet& rSet );
+//	virtual void		ActivatePage	( const SfxItemSet& rSet );
     using SfxTabPage::ActivatePage;
     using SfxTabPage::DeactivatePage;
-    virtual void        ActivatePage    ();
-    virtual int         DeactivatePage  ( SfxItemSet* pSet = 0);
+    virtual void		ActivatePage	();
+    virtual int			DeactivatePage	( SfxItemSet* pSet = 0);
 
 private:
     FixedLine       aFlSort1;
-    ListBox         aLbSort1;
-    RadioButton     aBtnUp1;
-    RadioButton     aBtnDown1;
+    ListBox			aLbSort1;
+    RadioButton		aBtnUp1;
+    RadioButton 	aBtnDown1;
 
     FixedLine       aFlSort2;
-    ListBox         aLbSort2;
-    RadioButton     aBtnUp2;
-    RadioButton     aBtnDown2;
+    ListBox			aLbSort2;
+    RadioButton		aBtnUp2;
+    RadioButton 	aBtnDown2;
 
     FixedLine       aFlSort3;
-    ListBox         aLbSort3;
-    RadioButton     aBtnUp3;
-    RadioButton     aBtnDown3;
-
-    String          aStrUndefined;
-    String          aStrColumn;
-    String          aStrRow;
-
-    const USHORT        nWhichSort;
-    ScSortDlg*          pDlg;
-    ScViewData*         pViewData;
-    const ScSortParam&  rSortData;
-    SCCOLROW            nFieldArr[SC_MAXFIELDS];
-    USHORT              nFieldCount;
-    SCCOL               nFirstCol;
-    SCROW               nFirstRow;
-    BOOL                bHasHeader;
-    BOOL                bSortByRows;
-
-    ListBox*            aSortLbArr[3];
-    RadioButton*        aDirBtnArr[3][2];
+    ListBox			aLbSort3;
+    RadioButton		aBtnUp3;
+    RadioButton 	aBtnDown3;
+
+    String			aStrUndefined;
+    String			aStrColumn;
+    String			aStrRow;
+
+    const USHORT		nWhichSort;
+    ScSortDlg*			pDlg;
+    ScViewData*			pViewData;
+    const ScSortParam&	rSortData;
+    SCCOLROW			nFieldArr[SC_MAXFIELDS];
+    USHORT				nFieldCount;
+    SCCOL				nFirstCol;
+    SCROW				nFirstRow;
+    BOOL				bHasHeader;
+    BOOL				bSortByRows;
+
+    ListBox*			aSortLbArr[3];
+    RadioButton*		aDirBtnArr[3][2];
     FixedLine*          aFlArr[3];
 
 #ifdef _TPSORT_CXX
 private:
-    void    Init            ();
-    void    DisableField    ( USHORT nField );
-    void    EnableField     ( USHORT nField );
-    void    FillFieldLists  ();
-    USHORT  GetFieldSelPos  ( SCCOLROW nField );
+    void	Init			();
+    void	DisableField	( USHORT nField );
+    void	EnableField		( USHORT nField );
+    void	FillFieldLists	();
+    USHORT	GetFieldSelPos	( SCCOLROW nField );
 
     // Handler ------------------------
     DECL_LINK( SelectHdl, ListBox * );
@@ -135,25 +135,25 @@ class CollatorWrapper;
 class ScTabPageSortOptions : public SfxTabPage
 {
 public:
-                ScTabPageSortOptions( Window*            pParent,
-                                      const SfxItemSet&  rArgSet );
+                ScTabPageSortOptions( Window*			 pParent,
+                                      const SfxItemSet&	 rArgSet );
                 ~ScTabPageSortOptions();
 
 #undef SfxTabPage
 #define SfxTabPage ::SfxTabPage
-    static  SfxTabPage* Create      ( Window*               pParent,
-                                      const SfxItemSet&     rArgSet );
-    static  USHORT*     GetRanges   ();
-    virtual BOOL        FillItemSet ( SfxItemSet& rArgSet );
-    virtual void        Reset       ( const SfxItemSet& rArgSet );
+    static	SfxTabPage*	Create		( Window*				pParent,
+                                      const SfxItemSet& 	rArgSet );
+    static	USHORT*		GetRanges	();
+    virtual	BOOL		FillItemSet	( SfxItemSet& rArgSet );
+    virtual	void		Reset		( const SfxItemSet& rArgSet );
 
 protected:
 // fuer Datenaustausch (sollte noch umgestellt werden!)
-//  virtual void        ActivatePage    ( const SfxItemSet& rSet );
+//	virtual void		ActivatePage	( const SfxItemSet& rSet );
     using SfxTabPage::ActivatePage;
     using SfxTabPage::DeactivatePage;
-    virtual void        ActivatePage    ();
-    virtual int         DeactivatePage  ( SfxItemSet* pSet = 0);
+    virtual void		ActivatePage	();
+    virtual int			DeactivatePage	( SfxItemSet* pSet = 0);
 
 private:
 
@@ -162,7 +162,7 @@ private:
     CheckBox            aBtnFormats;
     CheckBox            aBtnCopyResult;
 
-    CheckBox            aBtnNaturalSort;
+    CheckBox			aBtnNaturalSort;
     ListBox             aLbOutPos;
     Edit                aEdOutPos;
 
@@ -186,26 +186,26 @@ private:
     String              aStrNoName;
     String              aStrAreaLabel;
 
-    const USHORT        nWhichSort;
-    const ScSortParam&  rSortData;
-    ScViewData*         pViewData;
-    ScDocument*         pDoc;
-    ScSortDlg*          pDlg;
-    ScAddress           theOutPos;
+    const USHORT		nWhichSort;
+    const ScSortParam&	rSortData;
+    ScViewData*			pViewData;
+    ScDocument*			pDoc;
+    ScSortDlg*			pDlg;
+    ScAddress			theOutPos;
 
-    CollatorRessource*  pColRes;
-    CollatorWrapper*    pColWrap;
+    CollatorRessource*	pColRes;
+    CollatorWrapper*	pColWrap;
 
 #ifdef _TPSORT_CXX
 private:
-    void Init                   ();
-    void FillUserSortListBox    ();
-    void FillOutPosList         ();
+    void Init					();
+    void FillUserSortListBox	();
+    void FillOutPosList 		();
 
     // Handler ------------------------
     DECL_LINK( EnableHdl, CheckBox * );
     DECL_LINK( SelOutPosHdl, ListBox * );
-    void EdOutPosModHdl ( Edit* pEd );
+    void EdOutPosModHdl	( Edit* pEd );
     DECL_LINK( SortDirHdl, RadioButton * );
     DECL_LINK( FillAlgorHdl, void * );
 #endif
diff --git a/toolkit/workben/layout/uno.hxx b/toolkit/workben/layout/uno.hxx
index 89b1bedd4e11..77c8f0396e6b 100644
--- a/toolkit/workben/layout/uno.hxx
+++ b/toolkit/workben/layout/uno.hxx
@@ -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
diff --git a/toolkit/workben/layout/wordcountdialog.cxx b/toolkit/workben/layout/wordcountdialog.cxx
index 0f391f7f7d5e..979be7690426 100644
--- a/toolkit/workben/layout/wordcountdialog.cxx
+++ b/toolkit/workben/layout/wordcountdialog.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
diff --git a/toolkit/workben/layout/wordcountdialog.hxx b/toolkit/workben/layout/wordcountdialog.hxx
index a228b8bdea77..d3d7a7d75691 100644
--- a/toolkit/workben/layout/wordcountdialog.hxx
+++ b/toolkit/workben/layout/wordcountdialog.hxx
@@ -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
@@ -53,7 +53,7 @@ class SwWordCountDialog : public SfxModalDialog
     OKButton        aOK;
     HelpButton      aHelp;
 
-public:
+public:    
     SwWordCountDialog(Window* pParent);
     ~SwWordCountDialog();
 
diff --git a/toolkit/workben/layout/zoom.cxx b/toolkit/workben/layout/zoom.cxx
index bf27ad3feaf6..38f99170d0b4 100644
--- a/toolkit/workben/layout/zoom.cxx
+++ b/toolkit/workben/layout/zoom.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
@@ -127,7 +127,7 @@ static USHORT pRanges[] =
     0
 };
 
-#define SPECIAL_FACTOR  ((USHORT)0xFFFF)
+#define SPECIAL_FACTOR	((USHORT)0xFFFF)
 
 // class SvxZoomDialog ---------------------------------------------------
 
@@ -279,13 +279,13 @@ SvxZoomDialog::SvxZoomDialog( Window* pParent, const SfxItemSet& rCoreSet ) :
     aBottomFl       ( this, SVX_RES( FL_BOTTOM ) ),
     aOKBtn          ( this, SVX_RES( BTN_ZOOM_OK ) ),
     aCancelBtn      ( this, SVX_RES( BTN_ZOOM_CANCEL ) ),
-    aHelpBtn        ( this, SVX_RES( BTN_ZOOM_HELP ) ),
+    aHelpBtn	    ( this, SVX_RES( BTN_ZOOM_HELP ) ),
 
 #if !TEST_LAYOUT
-    rSet        ( rCoreSet ),
+    rSet		( rCoreSet ),
 #endif /* !TEST_LAYOUT */
     pOutSet     ( NULL ),
-    bModified   ( FALSE )
+    bModified	( FALSE )
 
 {
 #if ENABLE_LAYOUT
diff --git a/toolkit/workben/layout/zoom.hrc b/toolkit/workben/layout/zoom.hrc
index 49412ad085f0..0fb3a8afc6c5 100644
--- a/toolkit/workben/layout/zoom.hrc
+++ b/toolkit/workben/layout/zoom.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
diff --git a/toolkit/workben/layout/zoom.hxx b/toolkit/workben/layout/zoom.hxx
index f0c617a4b4d6..2553fff02c64 100644
--- a/toolkit/workben/layout/zoom.hxx
+++ b/toolkit/workben/layout/zoom.hxx
@@ -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
@@ -39,9 +39,9 @@
 
 // define ----------------------------------------------------------------
 /* CHINA001
-#define ZOOMBTN_OPTIMAL     ((USHORT)0x0001)
-#define ZOOMBTN_PAGEWIDTH   ((USHORT)0x0002)
-#define ZOOMBTN_WHOLEPAGE   ((USHORT)0x0004)
+#define	ZOOMBTN_OPTIMAL		((USHORT)0x0001)
+#define ZOOMBTN_PAGEWIDTH	((USHORT)0x0002)
+#define ZOOMBTN_WHOLEPAGE	((USHORT)0x0004)
 */
 #ifndef _SVX_ZOOM_HXX
 #include "zoom_def.hxx"
@@ -54,7 +54,7 @@
     Mit diesem Dialog wird ein Zoom-Faktor eingestellt.
 
     [Items]
-    SvxZoomItem <SID_ATTR_ZOOM>
+    SvxZoomItem	<SID_ATTR_ZOOM>
 */
 
 #include <layout/layout-pre.hxx>
@@ -65,10 +65,10 @@ private:
     FixedLine           aZoomFl;
     RadioButton         aOptimalBtn;
     RadioButton         aWholePageBtn;
-    RadioButton         aPageWidthBtn;
+    RadioButton 		aPageWidthBtn;
     RadioButton         a100Btn;
     RadioButton         aUserBtn;
-    MetricField         aUserEdit;
+    MetricField 		aUserEdit;
 
     FixedLine           aViewLayoutFl;
     RadioButton         aAutomaticBtn;
@@ -79,14 +79,14 @@ private:
 
     FixedLine           aBottomFl;
     OKButton            aOKBtn;
-    CancelButton        aCancelBtn;
-    HelpButton          aHelpBtn;
+    CancelButton		aCancelBtn;
+    HelpButton			aHelpBtn;
 
 #if !TEST_LAYOUT
-    const SfxItemSet&   rSet;
+    const SfxItemSet&	rSet;
 #endif /* !TEST_LAYOUT */
-    SfxItemSet*         pOutSet;
-    BOOL                bModified;
+    SfxItemSet*			pOutSet;
+    BOOL				bModified;
 
 #ifdef _SVX_ZOOM_CXX
     DECL_LINK( UserHdl, RadioButton* );
@@ -105,16 +105,16 @@ public:
 #endif /* !TEST_LAYOUT */
     ~SvxZoomDialog();
 
-    static USHORT*      GetRanges();
-    const SfxItemSet*   GetOutputItemSet() const { return pOutSet; }
+    static USHORT*		GetRanges();
+    const SfxItemSet*	GetOutputItemSet() const { return pOutSet; }
 
-    USHORT              GetFactor() const;
-    void                SetFactor( USHORT nNewFactor, USHORT nBtnId = 0 );
+    USHORT				GetFactor() const;
+    void				SetFactor( USHORT nNewFactor, USHORT nBtnId = 0 );
 
-    void                SetButtonText( USHORT nBtnId, const String& aNewTxt );
-    void                HideButton( USHORT nBtnId );
-    void                SetLimits( USHORT nMin, USHORT nMax );
-    void                SetSpinSize( USHORT nNewSpin );
+    void				SetButtonText( USHORT nBtnId, const String& aNewTxt );
+    void				HideButton( USHORT nBtnId );
+    void				SetLimits( USHORT nMin, USHORT nMax );
+    void				SetSpinSize( USHORT nNewSpin );
 };
 
 #include <layout/layout-post.hxx>
diff --git a/toolkit/workben/layout/zoom_def.hxx b/toolkit/workben/layout/zoom_def.hxx
index 5af749f2abde..4792fc93423c 100644
--- a/toolkit/workben/layout/zoom_def.hxx
+++ b/toolkit/workben/layout/zoom_def.hxx
@@ -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
@@ -28,8 +28,8 @@
 #ifndef _SVX_ZOOM_DEF_HXX
 #define _SVX_ZOOM_DEF_HXX
 
-#define ZOOMBTN_OPTIMAL     ((USHORT)0x0001)
-#define ZOOMBTN_PAGEWIDTH   ((USHORT)0x0002)
-#define ZOOMBTN_WHOLEPAGE   ((USHORT)0x0004)
+#define	ZOOMBTN_OPTIMAL		((USHORT)0x0001)
+#define ZOOMBTN_PAGEWIDTH	((USHORT)0x0002)
+#define ZOOMBTN_WHOLEPAGE	((USHORT)0x0004)
 
 #endif
diff --git a/toolkit/workben/unodialog.cxx b/toolkit/workben/unodialog.cxx
index 052ece9ac7fd..486cc0e5c245 100644
--- a/toolkit/workben/unodialog.cxx
+++ b/toolkit/workben/unodialog.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
@@ -43,7 +43,7 @@
 #include <vcl/svapp.hxx>
 #include <vcl/wrkwin.hxx>
 
-#include <svtools/unoiface.hxx> // InitExtToolkit
+#include <svtools/unoiface.hxx>	// InitExtToolkit
 #include <comphelper/processfactory.hxx>
 
 #include <cppuhelper/servicefactory.hxx>
@@ -70,7 +70,7 @@ using namespace ::com::sun::star::lang;
     {
         ::rtl::OUString localRegistry = ::comphelper::getPathToUserRegistry();
         ::rtl::OUString systemRegistry = ::comphelper::getPathToSystemRegistry();
-
+        
         Reference< XSimpleRegistry > xLocalRegistry( ::cppu::createSimpleRegistry() );
         Reference< XSimpleRegistry > xSystemRegistry( ::cppu::createSimpleRegistry() );
         if ( xLocalRegistry.is() && (localRegistry.getLength() > 0) )
@@ -82,14 +82,14 @@ using namespace ::com::sun::star::lang;
             catch ( InvalidRegistryException& )
             {
             }
-
+            
             if ( !xLocalRegistry->isValid() )
                 xLocalRegistry->open(localRegistry, sal_True, sal_True);
         }
-
+        
         if ( xSystemRegistry.is() && (systemRegistry.getLength() > 0) )
             xSystemRegistry->open( systemRegistry, sal_True, sal_False);
-
+        
         if ( (xLocalRegistry.is() && xLocalRegistry->isValid()) &&
              (xSystemRegistry.is() && xSystemRegistry->isValid()) )
         {
@@ -99,7 +99,7 @@ using namespace ::com::sun::star::lang;
             seqAnys[1] <<= xSystemRegistry ;
             Reference< XInitialization > xInit( xReg, UNO_QUERY );
             xInit->initialize( seqAnys );
-
+            
             Reference< XComponentContext > xContext( ::cppu::bootstrap_InitialComponentContext( xReg ) );
             return Reference< XMultiServiceFactory >( xContext->getServiceManager(), UNO_QUERY );
         }
@@ -107,7 +107,7 @@ using namespace ::com::sun::star::lang;
     catch( ::com::sun::star::uno::Exception& )
     {
     }
-
+    
     return ::cppu::createServiceFactory();
 }
 
@@ -147,7 +147,7 @@ private:
 public:
     MyWin() : WorkWindow( NULL, WB_APP|WB_STDWORK ) {;}
     void        Paint( const Rectangle& r );
-    void        SetXView(  uno::Reference< awt::XView > xV  ) { mxView = xV; }
+    void		SetXView(  uno::Reference< awt::XView > xV  ) { mxView = xV; }
 };
 
 
@@ -156,7 +156,7 @@ public:
 void Main( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > & xMSF )
 {
     ::comphelper::setProcessServiceFactory( xMSF );
-
+    
     //uno::Reference< awt::XToolkit> xToolkit( xMSF->createInstance( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.awt.ExtToolkit" ) ) ), uno::UNO_QUERY );
     uno::Reference< awt::XToolkit> xToolkit( xMSF->createInstance( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.awt.Toolkit" ) ) ), uno::UNO_QUERY );
 
@@ -218,7 +218,7 @@ void Main( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMult
     MyWin * pWindow;
     ::osl::Guard< vos::IMutex > aVclGuard( Application::GetSolarMutex() );
     pWindow = new MyWin();
-    pWindow->Show();
+    pWindow->Show();	
 
     xDlg->setDesignMode( sal_True );
 
@@ -242,7 +242,7 @@ void Main( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMult
 
     Reference< XComponent > xT( xToolkit, uno::UNO_QUERY );
     xT->dispose();
-
+    
     Reference< beans::XPropertySet > xProps( ::comphelper::getProcessServiceFactory(), UNO_QUERY );
     if (xProps.is())
     {
diff --git a/tools/bootstrp/addexes/replace.cxx b/tools/bootstrp/addexes/replace.cxx
index 3c451ae54be0..3cc52bf1c825 100644
--- a/tools/bootstrp/addexes/replace.cxx
+++ b/tools/bootstrp/addexes/replace.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
@@ -58,11 +58,11 @@ int _cdecl main( int argc, char *argv[] )
 
     ByteString aUpperText( aText );
     aUpperText.ToUpperAscii();
-
+    
 
     ULONG nIndex;
     aSearch.ToUpperAscii();
-
+    
     nIndex = aUpperText.Search( aSearch.GetBuffer(), 0);
     while ( nIndex != STRING_NOTFOUND )
     {
diff --git a/tools/bootstrp/addexes2/mkfilt.cxx b/tools/bootstrp/addexes2/mkfilt.cxx
index 2d03aaa153e5..da9cd6c11352 100644
--- a/tools/bootstrp/addexes2/mkfilt.cxx
+++ b/tools/bootstrp/addexes2/mkfilt.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
@@ -36,14 +36,14 @@
 class TextFilter
 {
 protected:
-    FILE            *pIn, *pOut;
-    virtual void    Filter();
+    FILE			*pIn, *pOut;
+    virtual void	Filter();
 public:
-                    TextFilter( ByteString aInFile = "stdin",
+                    TextFilter( ByteString aInFile = "stdin", 
                         ByteString aOutFile = "stdout" );
-    virtual         ~TextFilter();
+    virtual			~TextFilter();
 
-    virtual void    Execute();
+    virtual void	Execute();
 };
 
 TextFilter::TextFilter( ByteString aInFile, ByteString aOutFile )
@@ -86,11 +86,11 @@ class ByteStringList;
 class MkLine
 {
 public:
-    ByteString          aLine;
-    ByteStringList*     pPrivateTnrLst;
-    BOOL            bOut;
-    BOOL            bHier;
-
+    ByteString			aLine;
+    ByteStringList*		pPrivateTnrLst;
+    BOOL			bOut;
+    BOOL			bHier;
+        
                     MkLine();
 };
 
@@ -105,11 +105,11 @@ DECLARE_LIST( ByteStringList, MkLine * )
 
 class MkFilter : public TextFilter
 {
-    static ByteString   aTnr;
-    ByteStringList      *pLst;
-    ByteStringList      *pTnrLst;
+    static ByteString	aTnr;
+    ByteStringList		*pLst;
+    ByteStringList		*pTnrLst;
 protected:
-    virtual void    Filter();
+    virtual void	Filter();
 public:
                     MkFilter( ByteString aInFile = "stdin", ByteString aOutFile = "stdout");
                     ~MkFilter();
@@ -141,7 +141,7 @@ void MkFilter::Filter()
         //fprintf(stderr, "aLine :%s\n", aLine.GetBuffer());
         if ( aLine.Search("mkfilter1" ) != STRING_NOTFOUND )
         {
-            // Zeilen unterdruecken
+            // Zeilen unterdruecken 
             fprintf( stderr, "mkfilter1\n" );
             nState = 0;
         }
@@ -152,7 +152,7 @@ void MkFilter::Filter()
             nState = 1;
         }
         ;
-
+        
         if ( nState == 0  )
         {
             fprintf( stderr, "." );
@@ -160,7 +160,7 @@ void MkFilter::Filter()
             ByteString *pStr = new ByteString( aLineBuf );
             pMkLine->aLine = *pStr;
             pMkLine->bOut = FALSE;
-
+        
             pLst->Insert( pMkLine, LIST_APPEND );
         }
         else if ( nState == 1 )
@@ -185,16 +185,16 @@ void MkFilter::Filter()
             ByteString *pStr = new ByteString( aLineBuf );
             pMkLine->aLine = *pStr;
             pMkLine->bOut = FALSE;
-
+        
             if ( bInTnrList )
                 pTnrLst->Insert( pMkLine, LIST_APPEND );
         }
         else {
             /* Zeilen ignorieren */;
         }
-    }   // End Of File
+    }	// End Of File
     fprintf( stderr, "\n" );
-
+    
     // das File wieder ausgegeben
     ULONG nLines = pLst->Count();
     for ( ULONG j=0; j<nLines; j++ )
@@ -220,7 +220,7 @@ void MkFilter::Filter()
             pLine->pPrivateTnrLst = NULL;
         }
         if ( pLine->bOut )
-                fputs(pLine->aLine.GetBuffer(), pOut );
+                fputs(pLine->aLine.GetBuffer(), pOut );			
     }
     fprintf( stderr, "\n" );
 }
diff --git a/tools/bootstrp/appdef.cxx b/tools/bootstrp/appdef.cxx
index ac6212724afc..938b4a526cc9 100644
--- a/tools/bootstrp/appdef.cxx
+++ b/tools/bootstrp/appdef.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
diff --git a/tools/bootstrp/command.cxx b/tools/bootstrp/command.cxx
index 2ab0cc8dc4a6..eafadc204039 100644
--- a/tools/bootstrp/command.cxx
+++ b/tools/bootstrp/command.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
@@ -57,7 +57,7 @@
 #pragma warning (pop)
 #endif
 
-//#define MH_TEST2  1           // fuers direkte Testen
+//#define MH_TEST2	1			// fuers direkte Testen
 
 #if defined(WNT) || defined(OS2)
 #ifdef _MSC_VER
@@ -77,7 +77,7 @@
 #else
 #include <wait.h>
 #endif
-#define P_WAIT 1        // erstmal einen dummz
+#define P_WAIT 1 		// erstmal einen dummz
 #endif
 
 #if defined WNT
@@ -85,10 +85,10 @@
 #endif
 
 #if defined(WNT) || defined(OS2)
-#define     cPathSeperator ';'
+#define  	cPathSeperator ';'
 #endif
 #ifdef UNX
-#define     cPathSeperator  ':'
+#define	 	cPathSeperator	':'
 #endif
 
 /*****************************************************************************/
@@ -470,19 +470,19 @@ CCommand::operator int()
 
     switch ( errno )
     {
-        case    E2BIG :
+        case	E2BIG :
                     nError = COMMAND_TOOBIG;
                     break;
-        case    EINVAL :
+        case	EINVAL :
                     nError = COMMAND_INVALID;
                     break;
-        case    ENOENT:
+        case	ENOENT:
                     nError = COMMAND_NOTFOUND;
                     break;
-        case    ENOEXEC :
+        case 	ENOEXEC :
                     nError = COMMAND_NOEXEC;
                     break;
-        case    ENOMEM :
+        case	ENOMEM :
                     nError = COMMAND_NOMEM;
                     break;
         default:
@@ -509,7 +509,7 @@ ByteString CCommand::Search(ByteString aEnv, ByteString sItem)
     }
 
     DirEntry aItem( String( sItem, RTL_TEXTENCODING_ASCII_US ));
-    if ( aItem.Exists())
+    if ( aItem.Exists()) 
         return sItem;
 
     ByteString aEntry, sReturn;
@@ -636,7 +636,7 @@ CCommandd::operator int()
     aStartupInfo.dwFillAttribute = FOREGROUND_RED | BACKGROUND_RED |
                                 BACKGROUND_BLUE | BACKGROUND_GREEN;
 
-//  aStartupInfo.dwFlags = STARTF_USESTDHANDLES;
+//	aStartupInfo.dwFlags = STARTF_USESTDHANDLES;
     //aStartupInfo.wShowWindow = SW_NORMAL; //SW_SHOWDEFAULT;
     //aStartupInfo.wShowWindow = SW_HIDE; //SW_SHOWNOACTIVATE;
     aStartupInfo.wShowWindow = SW_SHOWNOACTIVATE;
diff --git a/tools/bootstrp/cppdep.cxx b/tools/bootstrp/cppdep.cxx
index 6263c719df51..a617f0a7aad6 100644
--- a/tools/bootstrp/cppdep.cxx
+++ b/tools/bootstrp/cppdep.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
@@ -30,7 +30,7 @@
 
 #include <stdio.h>
 #include <string.h>
-
+ 
 #include <unistd.h>
 
 #include <sys/stat.h>
@@ -187,7 +187,7 @@ ByteString CppDep::IsIncludeStatement( ByteString aLine )
 #ifdef DEBUG_VERBOSE
         fprintf( stderr, "found starting C comment : %s\n", aLine.GetBuffer() );
 #endif
-        aLine.Erase(aLine.Search("/*",0), aLine.Len() - 1);
+        aLine.Erase(aLine.Search("/*",0), aLine.Len() - 1);	
 #ifdef DEBUG_VERBOSE
         fprintf( stderr, "cleaned string : %s\n", aLine.GetBuffer() );
 #endif
@@ -197,7 +197,7 @@ ByteString CppDep::IsIncludeStatement( ByteString aLine )
 #ifdef DEBUG_VERBOSE
         fprintf( stderr, "found C++ comment : %s\n", aLine.GetBuffer() );
 #endif
-        aLine.Erase(aLine.Search("//",0), aLine.Len() - 1);
+        aLine.Erase(aLine.Search("//",0), aLine.Len() - 1);	
 #ifdef DEBUG_VERBOSE
         fprintf( stderr, "cleaned string : %s\n", aLine.GetBuffer() );
 #endif
diff --git a/tools/bootstrp/cppdep.hxx b/tools/bootstrp/cppdep.hxx
index cdc3ac2e9758..987666f4bc18 100644
--- a/tools/bootstrp/cppdep.hxx
+++ b/tools/bootstrp/cppdep.hxx
@@ -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
@@ -28,31 +28,31 @@
 #include <tools/list.hxx>
 #include <tools/string.hxx>
 #define PATH_SEP ":"
-#define DIR_SEP "/"
+#define DIR_SEP	"/"
 
 DECLARE_LIST( ByteStringList, ByteString * )
 
 class CppDep
 {
-    ByteString          aSourceFile;
-    ByteStringList      *pSearchPath;
+    ByteString			aSourceFile;
+    ByteStringList		*pSearchPath;
 
 protected:
-    ByteStringList      *pFileList;
-    ByteStringList      *pSources;
+    ByteStringList		*pFileList;
+    ByteStringList		*pSources;
 
-    BOOL            Search( ByteString aFileName );
-    ByteString      Exists( ByteString aFileName );
+    BOOL			Search( ByteString aFileName );
+    ByteString		Exists( ByteString aFileName );
 
-    ByteString      IsIncludeStatement( ByteString aLine );
+    ByteString		IsIncludeStatement( ByteString aLine );
 public:
                     CppDep( ByteString aFileName );
                     CppDep();
                     virtual ~CppDep();
-    virtual void    Execute();
+    virtual void	Execute();
 
-    ByteStringList*     GetDepList(){return pFileList;}
-    BOOL            AddSearchPath( const char* aPath );
-    BOOL            AddSource( const char * aSource );
+    ByteStringList*		GetDepList(){return pFileList;}
+    BOOL			AddSearchPath( const char* aPath );
+    BOOL			AddSource( const char * aSource );
 };
 
diff --git a/tools/bootstrp/inimgr.cxx b/tools/bootstrp/inimgr.cxx
index a0a69f06f7af..8c872e1cb5c4 100644
--- a/tools/bootstrp/inimgr.cxx
+++ b/tools/bootstrp/inimgr.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
diff --git a/tools/bootstrp/iserver.cxx b/tools/bootstrp/iserver.cxx
index 0b2c1df15203..5f25f04d487b 100644
--- a/tools/bootstrp/iserver.cxx
+++ b/tools/bootstrp/iserver.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
diff --git a/tools/bootstrp/md5.cxx b/tools/bootstrp/md5.cxx
index 687441c5c511..5b65e79f7dec 100644
--- a/tools/bootstrp/md5.cxx
+++ b/tools/bootstrp/md5.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
@@ -36,16 +36,16 @@
 #include <tools/string.hxx>
 
 #ifdef WNT
-#define FILE_OPEN_READ  "rb"
+#define FILE_OPEN_READ	"rb"
 #else
-#define FILE_OPEN_READ  "r"
+#define FILE_OPEN_READ	"r"
 #endif
 
 // Extended calc_md5_checksum to recognize Windows executables and libraries. To
 // create the same md5 checksum for a (code/data) identical file it ignores a different
 // date and header checksum. Please see crashrep/source/win32/soreport.cpp
 // where the same method is also used. The crash reporter uses the MD5
-// checksums to transfer them to the crash database. You have to make sure that both
+// checksums to transfer them to the crash database. You have to make sure that both 
 // methods use the same algorithm otherwise there could be problems with stack reports.
 
 void normalize_pe_image(sal_uInt8* buffer, size_t nBufferSize)
@@ -55,7 +55,7 @@ void normalize_pe_image(sal_uInt8* buffer, size_t nBufferSize)
     const int PE_SIGNATURE_SIZE = 4;
     const int COFFHEADER_SIZE = 20;
     const int OFFSET_PE_OPTIONALHEADER_CHECKSUM = 64;
-
+    
     // Check the header part of the file buffer
     if (buffer[0] == sal_uInt8('M') && buffer[1] == sal_uInt8('Z'))
     {
@@ -72,7 +72,7 @@ void normalize_pe_image(sal_uInt8* buffer, size_t nBufferSize)
                 {
                     // Set timedatestamp and checksum fields to a normalized
                     // value to enforce the same MD5 checksum for identical
-                    // Windows  executables/libraries.
+                    // Windows	executables/libraries.
                     buffer[PEHeaderOffset+OFFSET_COFF_TIMEDATESTAMP+0] = 0;
                     buffer[PEHeaderOffset+OFFSET_COFF_TIMEDATESTAMP+1] = 0;
                     buffer[PEHeaderOffset+OFFSET_COFF_TIMEDATESTAMP+2] = 0;
@@ -98,7 +98,7 @@ rtlDigestError calc_md5_checksum( const char *filename, ByteString &aChecksum )
     const size_t MINIMAL_SIZE = 512;
 
     sal_uInt8 checksum[RTL_DIGEST_LENGTH_MD5];
-    rtlDigestError  error = rtl_Digest_E_None;
+    rtlDigestError	error = rtl_Digest_E_None;
 
     FILE *fp = fopen( filename, FILE_OPEN_READ );
 
@@ -108,9 +108,9 @@ rtlDigestError calc_md5_checksum( const char *filename, ByteString &aChecksum )
 
         if ( digest )
         {
-            size_t          nBytesRead;
-            sal_uInt8       buffer[BUFFER_SIZE];
-            bool            bHeader(true);
+            size_t			nBytesRead;
+            sal_uInt8		buffer[BUFFER_SIZE];
+            bool			bHeader(true);
 
             while ( rtl_Digest_E_None == error &&
                 0 != (nBytesRead = fread( buffer, 1, sizeof(buffer), fp )) )
@@ -121,8 +121,8 @@ rtlDigestError calc_md5_checksum( const char *filename, ByteString &aChecksum )
                     if (nBytesRead >= MINIMAL_SIZE && buffer[0] == sal_uInt8('M') && buffer[1] == sal_uInt8('Z') )
                         normalize_pe_image(buffer, nBytesRead);
                 }
-
-                error = rtl_digest_updateMD5( digest, buffer, nBytesRead );
+                
+                error = rtl_digest_updateMD5( digest, buffer, nBytesRead );	
             }
 
             if ( rtl_Digest_E_None == error )
@@ -135,7 +135,7 @@ rtlDigestError calc_md5_checksum( const char *filename, ByteString &aChecksum )
             for ( std::size_t i = 0; i < sizeof(checksum); i++ )
             {
                 if ( checksum[i] < 16 )
-                    aChecksum.Append( "0" );
+                    aChecksum.Append( "0" ); 
                 aChecksum += ByteString::CreateFromInt32( checksum[i], 16 );
             }
         }
diff --git a/tools/bootstrp/md5.hxx b/tools/bootstrp/md5.hxx
index 55aa97e941c9..a483001784b0 100644
--- a/tools/bootstrp/md5.hxx
+++ b/tools/bootstrp/md5.hxx
@@ -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
diff --git a/tools/bootstrp/mkcreate.cxx b/tools/bootstrp/mkcreate.cxx
index 398a3a4c4143..dae7581af466 100644
--- a/tools/bootstrp/mkcreate.cxx
+++ b/tools/bootstrp/mkcreate.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
@@ -87,7 +87,7 @@ SourceDirectory::~SourceDirectory()
 
 /*****************************************************************************/
 CodedDependency *SourceDirectory::AddCodedDependency(
-    const ByteString &rCodedIdentifier, USHORT nOperatingSystems )
+    const ByteString &rCodedIdentifier,	USHORT nOperatingSystems )
 /*****************************************************************************/
 {
     CodedDependency *pReturn = NULL;
@@ -116,7 +116,7 @@ CodedDependency *SourceDirectory::AddCodedDependency(
 
 /*****************************************************************************/
 CodedDependency *SourceDirectory::AddCodedIdentifier(
-    const ByteString &rCodedIdentifier, USHORT nOperatingSystems )
+    const ByteString &rCodedIdentifier,	USHORT nOperatingSystems )
 /*****************************************************************************/
 {
     CodedDependency *pReturn = NULL;
@@ -536,8 +536,8 @@ SourceDirectory *SourceDirectory::CreateRootDirectory(
     ByteString sStandLst( aIniManager.ToLocal( sDefLst ));
     String s = String( sStandLst, gsl_getSystemTextEncoding());
     InformationParser aParser;
-//  fprintf( stderr,
-//      "Reading database %s ...\n", sStandLst.GetBuffer());
+//	fprintf( stderr,
+//		"Reading database %s ...\n", sStandLst.GetBuffer());
     GenericInformationList *pVerList = aParser.Execute(
         s );
 
@@ -560,13 +560,13 @@ SourceDirectory *SourceDirectory::CreateRootDirectory(
 
     sSolarList = aIniManager.ToLocal( sSolarList );
     fprintf( stderr,
-        "Reading directory information %s ...\n", sSolarList.GetBuffer());
+        "Reading directory information %s ...\n", sSolarList.GetBuffer()); 
 */
 
     ByteString sVersion( rVersion );
     Star aStar( pVerList, sVersion, TRUE, rRoot.GetBuffer());
-//  fprintf( stderr,
-//      "Creating virtual directory tree ...\n" );
+//	fprintf( stderr,
+//		"Creating virtual directory tree ...\n" );
 
 
     SourceDirectory *pSourceRoot = new SourceDirectory( rRoot, OS_ALL );
diff --git a/tools/bootstrp/prj.cxx b/tools/bootstrp/prj.cxx
index 4f4d44a33536..39483930a83e 100644
--- a/tools/bootstrp/prj.cxx
+++ b/tools/bootstrp/prj.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
@@ -37,7 +37,7 @@
 #include "bootstrp/prj.hxx"
 #include "bootstrp/inimgr.hxx"
 
-//#define TEST  1
+//#define TEST 	1
 
 #if defined(WNT) || defined(OS2)
 #define LIST_DELIMETER ';'
@@ -50,7 +50,7 @@
 Link Star::aDBNotFoundHdl;
 
 //
-//  class SimpleConfig
+//	class SimpleConfig
 //
 
 /*****************************************************************************/
@@ -98,7 +98,7 @@ ByteString SimpleConfig::GetNext()
 }
 
 /*****************************************************************************/
-ByteString  SimpleConfig::GetNextLine()
+ByteString	SimpleConfig::GetNextLine()
 /*****************************************************************************/
 {
     ByteString aSecStr;
@@ -140,7 +140,7 @@ ByteString SimpleConfig::GetCleanedNextLine( BOOL bReadComments )
 
     aTmpStr = aTmpStr.EraseLeadingChars();
     aTmpStr = aTmpStr.EraseTrailingChars();
-//  while ( aTmpStr.SearchAndReplace(String(' '),String('\t') ) != (USHORT)-1 );
+//	while ( aTmpStr.SearchAndReplace(String(' '),String('\t') ) != (USHORT)-1 );
     int nLength = aTmpStr.Len();
     ByteString aEraseString;
     BOOL bFirstTab = TRUE;
@@ -169,7 +169,7 @@ ByteString SimpleConfig::GetCleanedNextLine( BOOL bReadComments )
 
 
 //
-//  class CommandData
+//	class CommandData
 //
 
 /*****************************************************************************/
@@ -278,7 +278,7 @@ CommandData* Prj::GetDirectoryData( ByteString aLogFileName )
 }
 
 //
-//  class Prj
+//	class Prj
 //
 
 /*****************************************************************************/
@@ -423,7 +423,7 @@ CommandData* Prj::RemoveDirectory ( ByteString aLogFileName )
 }
 
 //
-//  class Star
+//	class Star
 //
 
 /*****************************************************************************/
@@ -451,7 +451,7 @@ Star::Star( SolarFileList *pSolarFiles )
 }
 
 /*****************************************************************************/
-Star::Star( GenericInformationList *pStandLst, ByteString &rVersion,
+Star::Star( GenericInformationList *pStandLst, ByteString &rVersion, 
     BOOL bLocal, const char *pSourceRoot )
 /*****************************************************************************/
 {
@@ -545,7 +545,7 @@ Star::Star( GenericInformationList *pStandLst, ByteString &rVersion,
                                     aPrjEntry += DirEntry( sPrjDir );
                                     aPrjEntry += DirEntry( sSolarFile );
 
-                                    pFileList->Insert( new String( aPrjEntry.GetFull()), LIST_APPEND );
+                                    pFileList->Insert( new String( aPrjEntry.GetFull()), LIST_APPEND );										   
 
                                     ByteString sFile( aPrjEntry.GetFull(), RTL_TEXTENCODING_ASCII_US );
                                 }
@@ -581,7 +581,7 @@ BOOL Star::NeedsUpdate()
 }
 
 /*****************************************************************************/
-void Star::Read( String &rFileName )
+void Star::Read( String &rFileName ) 
 /*****************************************************************************/
 {
     ByteString aString;
@@ -623,7 +623,7 @@ void Star::Read( SolarFileList *pSolarFiles )
         }
 
         aMutex.acquire();
-        aLoadedFilesList.Insert( pFile, LIST_APPEND );
+        aLoadedFilesList.Insert( pFile,	LIST_APPEND );
         aMutex.release();
         delete pSolarFiles->Remove(( ULONG ) 0 );
     }
@@ -937,7 +937,7 @@ Prj* Star::GetPrj ( ByteString aProjectName )
         if ( pPrj->GetProjectName().EqualsIgnoreCaseAscii(aProjectName) )
             return pPrj;
     }
-//  return (Prj*)NULL;
+//	return (Prj*)NULL;
     return 0L ;
 }
 
@@ -964,7 +964,7 @@ ByteString Star::GetPrjName( DirEntry &aPath )
 
 
 //
-//  class StarWriter
+//	class StarWriter
 //
 
 /*****************************************************************************/
@@ -982,7 +982,7 @@ StarWriter::StarWriter( SolarFileList *pSolarFiles, BOOL bReadComments )
 }
 
 /*****************************************************************************/
-StarWriter::StarWriter( GenericInformationList *pStandLst, ByteString &rVersion,
+StarWriter::StarWriter( GenericInformationList *pStandLst, ByteString &rVersion,         
     BOOL bLocal, const char *pSourceRoot )
 /*****************************************************************************/
 {
@@ -1076,7 +1076,7 @@ StarWriter::StarWriter( GenericInformationList *pStandLst, ByteString &rVersion,
                                     aPrjEntry += DirEntry( sPrjDir );
                                     aPrjEntry += DirEntry( sSolarFile );
 
-                                    pFileList->Insert( new String( aPrjEntry.GetFull()), LIST_APPEND );
+                                    pFileList->Insert( new String( aPrjEntry.GetFull()), LIST_APPEND );										   
 
                                     ByteString sFile( aPrjEntry.GetFull(), RTL_TEXTENCODING_ASCII_US );
                                     fprintf( stdout, "%s\n", sFile.GetBuffer());
@@ -1152,7 +1152,7 @@ USHORT StarWriter::Read( SolarFileList *pSolarFiles, BOOL bReadComments )
         }
 
         aMutex.acquire();
-        aLoadedFilesList.Insert( pFile, LIST_APPEND );
+        aLoadedFilesList.Insert( pFile,	LIST_APPEND );
         aMutex.release();
         delete pSolarFiles->Remove(( ULONG ) 0 );
     }
@@ -1314,7 +1314,7 @@ void StarWriter::InsertTokenLine ( ByteString& rString )
     int i = 0;
     ByteString aWhat, aWhatOS,
         sClientRestriction, aLogFileName, aProjectName, aPrefix, aCommandPara;
-    static  ByteString aDirName;
+    static	ByteString aDirName;
     BOOL bPrjDep = FALSE;
     BOOL bHardDep = FALSE;
     USHORT nCommandType = 0;
@@ -1591,7 +1591,7 @@ BOOL StarFile::NeedsUpdate()
             return TRUE;
         }
         FileStat aStat( aEntry );
-        if (( aStat.DateModified() > aDate ) ||
+        if (( aStat.DateModified() > aDate ) || 
             (( aStat.DateModified() == aDate ) && ( aStat.TimeModified() > aTime )))
             return TRUE;
     }
diff --git a/tools/bootstrp/rscdep.cxx b/tools/bootstrp/rscdep.cxx
index 37edfc6a8c18..a35c92e17421 100644
--- a/tools/bootstrp/rscdep.cxx
+++ b/tools/bootstrp/rscdep.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
@@ -45,7 +45,7 @@
 
 #include "cppdep.hxx"
 
-#if defined WNT
+#if defined WNT 
 #if !defined HAVE_GETOPT
 #define __STDC__ 1
 #define __GNU_LIBRARY__
@@ -59,12 +59,12 @@ class RscHrcDep : public CppDep
 {
 public:
                     RscHrcDep();
-    virtual         ~RscHrcDep();
+    virtual			~RscHrcDep();
 
-    virtual void    Execute();
+    virtual void 	Execute();
 };
 
-RscHrcDep::RscHrcDep()  :
+RscHrcDep::RscHrcDep()	:
     CppDep()
 {
 }
@@ -91,11 +91,11 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS( argc, argv )
     BOOL bSource = FALSE;
     ByteString aRespArg;
 //  who needs anything but '/' ?
-//  String aDelim = String(DirEntry::GetAccessDelimiter());
+//	String aDelim = String(DirEntry::GetAccessDelimiter());
     String aDelim = '/';
 
     RscHrcDep *pDep = new RscHrcDep;
-
+    
     pOutputFileName[0] = 0;
     pSrsFileName[0] = 0;
 
@@ -219,9 +219,9 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS( argc, argv )
 
     DirEntry aEntry(".");
     aEntry.ToAbs();
-//  String aCwd = aEntry.GetName();
+//	String aCwd = aEntry.GetName();
     String aCwd(pFileNamePrefix, gsl_getSystemTextEncoding());
-/*  USHORT nPos;
+/*	USHORT nPos;
 #ifndef UNX
     while ( (nPos = aCwd.Search('\\') != STRING_NOTFOUND  ))
 #else
@@ -259,7 +259,7 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS( argc, argv )
         {
             if (!bSource )
             {
-                aString += ByteString(" " );
+                aString += ByteString("	" );
                 aString += ByteString( argv[optind]);
                 pDep->AddSource( argv[optind++]);
             }
diff --git a/tools/bootstrp/so_checksum.cxx b/tools/bootstrp/so_checksum.cxx
index 716e99eff9f1..41e45a4796c3 100644
--- a/tools/bootstrp/so_checksum.cxx
+++ b/tools/bootstrp/so_checksum.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
diff --git a/tools/bootstrp/sspretty.cxx b/tools/bootstrp/sspretty.cxx
index 143705b6a2ea..8973896dc692 100644
--- a/tools/bootstrp/sspretty.cxx
+++ b/tools/bootstrp/sspretty.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
@@ -48,7 +48,7 @@ int _cdecl main( int argc, char *argv[] )
         String aFileName( argv[ 1 ], RTL_TEXTENCODING_ASCII_US );
         InformationParser aParser;
         GenericInformationList *pList = aParser.Execute( aFileName );
-        if ( pList )
+        if ( pList ) 
             aParser.Save( aFileName, pList );
         else {
             fprintf( stderr, "Error reading input file!\n" );
diff --git a/tools/bootstrp/sstring.cxx b/tools/bootstrp/sstring.cxx
index 8c83dedf72ec..36500b6f086e 100644
--- a/tools/bootstrp/sstring.cxx
+++ b/tools/bootstrp/sstring.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
@@ -32,7 +32,7 @@
 #  define _TOOLS_STRINGLIST
 #endif
 
-#define ENABLE_BYTESTRING_STREAM_OPERATORS
+#define ENABLE_BYTESTRING_STREAM_OPERATORS 
 #include <tools/stream.hxx>
 #include "bootstrp/sstring.hxx"
 
@@ -104,8 +104,8 @@ ULONG SByteStringList::GetPrevString( ByteString* pStr )
 
 /**************************************************************************
 *
-*   Sortiert einen ByteString in die Liste ein und gibt die Position,
-*   an der einsortiert wurde, zurueck
+*	Sortiert einen ByteString in die Liste ein und gibt die Position,
+*	an der einsortiert wurde, zurueck
 *
 **************************************************************************/
 
@@ -170,7 +170,7 @@ SByteStringList& SByteStringList::operator<<  ( SvStream& rStream )
 {
     sal_uInt32 nListCount;
     rStream >> nListCount;
-    for ( USHORT i = 0; i < nListCount; i++ ) {
+    for ( USHORT i = 0; i < nListCount; i++ ) { 
         ByteString* pByteString = new ByteString();
         rStream >> *pByteString;
         Insert (pByteString, LIST_APPEND);
@@ -264,8 +264,8 @@ ULONG SUniStringList::GetPrevString( UniString* pStr )
 
 /**************************************************************************
 *
-*   Sortiert einen UniString in die Liste ein und gibt die Position,
-*   an der einsortiert wurde, zurueck
+*	Sortiert einen UniString in die Liste ein und gibt die Position,
+*	an der einsortiert wurde, zurueck
 *
 **************************************************************************/
 
diff --git a/tools/inc/bootstrp/appdef.hxx b/tools/inc/bootstrp/appdef.hxx
index bf73b215205e..44792aa3cdf2 100644
--- a/tools/inc/bootstrp/appdef.hxx
+++ b/tools/inc/bootstrp/appdef.hxx
@@ -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
@@ -30,27 +30,27 @@
 
 
 #ifdef UNX
-#define DEFAULT_INI_ROOT    "/so/env"
-#define DEFAULT_BS_ROOT     "/so/env/b_server"
-#define PATH_SEPARATOR      '/'
-#define S_PATH_SEPARATOR    "/"
+#define DEFAULT_INI_ROOT	"/so/env" 
+#define DEFAULT_BS_ROOT		"/so/env/b_server"
+#define PATH_SEPARATOR		'/'
+#define S_PATH_SEPARATOR 	"/"
 #else
-#define DEFAULT_INI_ROOT    "r:"
-#define DEFAULT_BS_ROOT     "n:"
-#define PATH_SEPARATOR      '\\'
-#define S_PATH_SEPARATOR    "\\"
+#define DEFAULT_INI_ROOT 	"r:"
+#define DEFAULT_BS_ROOT 	"n:"
+#define PATH_SEPARATOR		'\\'
+#define S_PATH_SEPARATOR	"\\"
 #endif
 
-#define _INI_DRV                DEFAULT_INI_ROOT
-#define B_SERVER_ROOT           DEFAULT_BS_ROOT
-#define _SOLARLIST              B_SERVER_ROOT S_PATH_SEPARATOR "config" S_PATH_SEPARATOR "solar.lst"
-#define _DEF_STAND_LIST         B_SERVER_ROOT S_PATH_SEPARATOR "config" S_PATH_SEPARATOR "stand.lst"
-#define _DEF_SSOLARINI          B_SERVER_ROOT S_PATH_SEPARATOR "config" S_PATH_SEPARATOR "ssolar.ini"
-#define _DEF_SSCOMMON           B_SERVER_ROOT S_PATH_SEPARATOR "config" S_PATH_SEPARATOR "ssolar.cmn"
-#define _INIROOT                B_SERVER_ROOT S_PATH_SEPARATOR "config"
-#define _INIROOT_OLD            B_SERVER_ROOT S_PATH_SEPARATOR "config"
-#define _INI_UNC                "\\\\jumbo2.germany.sun.com\\R-Laufwerk"
-#define _INI_UNC_OLD            "\\\\jumbo2.germany.sun.com\\R-Laufwerk"
+#define _INI_DRV				DEFAULT_INI_ROOT
+#define B_SERVER_ROOT			DEFAULT_BS_ROOT
+#define _SOLARLIST				B_SERVER_ROOT S_PATH_SEPARATOR "config" S_PATH_SEPARATOR "solar.lst"
+#define _DEF_STAND_LIST 		B_SERVER_ROOT S_PATH_SEPARATOR "config" S_PATH_SEPARATOR "stand.lst"
+#define _DEF_SSOLARINI	 		B_SERVER_ROOT S_PATH_SEPARATOR "config" S_PATH_SEPARATOR "ssolar.ini"
+#define _DEF_SSCOMMON			B_SERVER_ROOT S_PATH_SEPARATOR "config" S_PATH_SEPARATOR "ssolar.cmn"
+#define	_INIROOT				B_SERVER_ROOT S_PATH_SEPARATOR "config"
+#define	_INIROOT_OLD			B_SERVER_ROOT S_PATH_SEPARATOR "config"
+#define _INI_UNC				"\\\\jumbo2.germany.sun.com\\R-Laufwerk"
+#define _INI_UNC_OLD	    	"\\\\jumbo2.germany.sun.com\\R-Laufwerk"
 
 
 // path conversion
diff --git a/tools/inc/bootstrp/command.hxx b/tools/inc/bootstrp/command.hxx
index 638beb6cce1f..f8e22a25efc7 100644
--- a/tools/inc/bootstrp/command.hxx
+++ b/tools/inc/bootstrp/command.hxx
@@ -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
@@ -42,26 +42,26 @@
 */
 enum ExeType
 {
-    EXE,    /// programm is a native executable
-    BAT,    /// programm is a DOS-Batch
-    BTM     /// programm is a 4DOS-Batch
+    EXE,	/// programm is a native executable
+    BAT, 	/// programm is a DOS-Batch
+    BTM 	/// programm is a 4DOS-Batch
 };
 
-#define COMMAND_NOTFOUND    0x0001
-#define COMMAND_TOOBIG      0x0002
-#define COMMAND_INVALID     0x0004
-#define COMMAND_NOEXEC      0x0008
-#define COMMAND_NOMEM       0x0010
-#define COMMAND_UNKNOWN     0x0020
+#define COMMAND_NOTFOUND	0x0001
+#define COMMAND_TOOBIG		0x0002
+#define COMMAND_INVALID		0x0004
+#define COMMAND_NOEXEC		0x0008
+#define COMMAND_NOMEM		0x0010
+#define COMMAND_UNKNOWN		0x0020
 
 #ifdef WNT
-#define COMMAND_SHELL   "4nt.exe"
+#define COMMAND_SHELL	"4nt.exe"
 #endif
 #ifdef OS2
 #define COMMAND_SHELL  "4os2.exe"
 #endif
 #ifdef UNX
-#define COMMAND_SHELL   "csh"
+#define COMMAND_SHELL	"csh"
 #endif
 
 class CommandLine;
@@ -71,25 +71,25 @@ class CommandLine
 {
 friend class ChildProcess;
 private:
-    char            *CommandBuffer;
-    char            *ComShell;
-    char            **ppArgv;
-    BOOL            bTmpWrite;
+    char 			*CommandBuffer;
+    char 			*ComShell;
+    char 			**ppArgv;
+    BOOL			bTmpWrite;
 
 public:
                     CommandLine(BOOL bTmpWrite = FALSE);
                     CommandLine(const char *, BOOL bTmpWrite = FALSE);
                     CommandLine(const CommandLine&, BOOL bTmpWrite = FALSE);
-    virtual         ~CommandLine();
+    virtual 		~CommandLine();
 
-    int             nArgc;
+    int 			nArgc;
 
-    CommandLine&    operator=(const CommandLine&);
-    CommandLine&    operator=(const char *);
-    void            BuildCommand(const char *);
-    char**          GetCommand(void) { return ppArgv; }
-    void            Strtokens(const char *);
-    void            Print();
+    CommandLine& 	operator=(const CommandLine&);
+    CommandLine& 	operator=(const char *);
+    void 			BuildCommand(const char *);
+    char**			GetCommand(void) { return ppArgv; }
+    void 			Strtokens(const char *);
+    void 			Print();
 };
 
 /** Declares and spawns a child process.
@@ -98,16 +98,16 @@ public:
 class CCommand
 {
 private:
-    ByteString          aCommandLine;
-    ByteString          aCommand;
-    char                *pArgv;
-    char                **ppArgv;
-    ULONG               nArgc;
-    int                 nError;
+    ByteString			aCommandLine;
+    ByteString			aCommand;
+    char				*pArgv;
+    char				**ppArgv;
+    ULONG				nArgc;
+    int					nError;
 
 protected:
-    void            ImplInit();
-    void            Initpp( ULONG nCount, ByteString &rStr );
+    void			ImplInit();
+    void			Initpp( ULONG nCount, ByteString &rStr );
 
 public:
                     /** Creates the process specified without spawning it
@@ -125,7 +125,7 @@ public:
                         @param sItem specifies the system shell
                         @return the Location (when programm was found)
                     */
-    static ByteString   Search( ByteString sEnv,
+    static ByteString	Search( ByteString sEnv,
                                     ByteString sItem = COMMAND_SHELL );
 
                     /** Spawns the Process
@@ -133,14 +133,14 @@ public:
                     */
     operator int();
 
-    ByteString          GetCommandLine_() { return aCommandLine; }
-    ByteString          GetCommand() { return aCommand; }
+    ByteString			GetCommandLine_() { return aCommandLine; }
+    ByteString			GetCommand() { return aCommand; }
 
-    char**  GetCommandStr() { return ppArgv; }
+    char**	GetCommandStr() { return ppArgv; }
 };
 
-#define COMMAND_EXECUTE_WINDOW  0x0000001
-#define COMMAND_EXECUTE_CONSOLE 0x0000002
+#define COMMAND_EXECUTE_WINDOW	0x0000001
+#define COMMAND_EXECUTE_CONSOLE	0x0000002
 #define COMMAND_EXECUTE_HIDDEN  0x0000004
 #define COMMAND_EXECUTE_START   0x0000008
 #define COMMAND_EXECUTE_WAIT    0x0000010
@@ -153,7 +153,7 @@ typedef ULONG CommandBits;
 */
 class CCommandd : public CCommand
 {
-    CommandBits     nFlag;
+    CommandBits		nFlag;
 public:
                     CCommandd( ByteString &rString, CommandBits nBits );
                     CCommandd( const char *pChar, CommandBits nBits );
diff --git a/tools/inc/bootstrp/inimgr.hxx b/tools/inc/bootstrp/inimgr.hxx
index 7be00ce14d48..9abcd33ff384 100644
--- a/tools/inc/bootstrp/inimgr.hxx
+++ b/tools/inc/bootstrp/inimgr.hxx
@@ -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
@@ -41,8 +41,8 @@ class IniManager
 private:
     BOOL bUpdate;
 
-    ByteString sGlobalDir;      /// holds the org. ini dir
-    ByteString sLocalPath;      /// holds path of local ini dir
+    ByteString sGlobalDir;   	/// holds the org. ini dir
+    ByteString sLocalPath;		/// holds path of local ini dir
 
 public:
     IniManager( ByteString &rDir, ByteString &rLocalDir );
@@ -50,7 +50,7 @@ public:
     IniManager();
 
     ByteString ToLocal( ByteString &rPath );
-    void Update();          /// Call ForceUpdate the First Time called
+    void Update();			/// Call ForceUpdate the First Time called
     void ForceUpdate();
 
     static ByteString GetLocalIni();
diff --git a/tools/inc/bootstrp/listmacr.hxx b/tools/inc/bootstrp/listmacr.hxx
index 8c678ff32275..c66eb875b4d3 100644
--- a/tools/inc/bootstrp/listmacr.hxx
+++ b/tools/inc/bootstrp/listmacr.hxx
@@ -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
@@ -28,24 +28,24 @@
 #ifndef _LISTMACR_HXX
 #define _LISTMACR_HXX
 
-#define DECL_DEST_LIST( TmpListType, ListType, PointerType )    \
-DECLARE_LIST(TmpListType, PointerType)                          \
-class ListType : public TmpListType                             \
-{                                                               \
-public:                                                         \
+#define DECL_DEST_LIST( TmpListType, ListType, PointerType )	\
+DECLARE_LIST(TmpListType, PointerType)							\
+class ListType : public TmpListType								\
+{                                                           	\
+public:															\
     void ClearAndDelete()                                       \
-    {                                                           \
-        while ( Count()) {                                      \
-            PointerType pTmp = GetObject(( ULONG ) 0 );         \
-            delete pTmp;                                        \
-            Remove(( ULONG ) 0 );                               \
-        }                                                       \
-    }                                                           \
-    ~ListType()                                                 \
-    {                                                           \
-        ClearAndDelete();                                       \
-    }                                                           \
-};                                                              \
+    {                                                       	\
+        while ( Count()) {                                  	\
+            PointerType pTmp = GetObject(( ULONG ) 0 );     	\
+            delete pTmp;                                    	\
+            Remove(( ULONG ) 0 );                           	\
+        }                                                   	\
+    }                                                       	\
+    ~ListType()                                             	\
+    {                                                       	\
+        ClearAndDelete();										\
+    }                                                   		\
+};																\
 
 #endif
 
diff --git a/tools/inc/bootstrp/mkcreate.hxx b/tools/inc/bootstrp/mkcreate.hxx
index 991b5961a096..f33cb02903ea 100644
--- a/tools/inc/bootstrp/mkcreate.hxx
+++ b/tools/inc/bootstrp/mkcreate.hxx
@@ -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
@@ -44,14 +44,14 @@ class SourceDirectoryList;
 class CodedDependency : public ByteString
 {
 private:
-    USHORT nOSType;                         // operating systems where dependeny exists
+    USHORT nOSType;							// operating systems where dependeny exists
 
 public:
     /* create a dependency instance with given coded directory name
      */
     CodedDependency(
         const ByteString &rCodedIdentifier, // the coded name of the directory
-        USHORT nOperatingSystems            // the operating systems where this dependency exists
+        USHORT nOperatingSystems			// the operating systems where this dependency exists
     ) :
     ByteString( rCodedIdentifier ),
     nOSType( nOperatingSystems )
@@ -76,7 +76,7 @@ public:
      */
     BOOL TryToMerge(
         const ByteString &rCodedIdentifier, // the coded name of the directory
-        USHORT nOperatingSystems            // the operating systems where this dependency exists
+        USHORT nOperatingSystems			// the operating systems where this dependency exists
     )
     {
         if ( rCodedIdentifier != *this )
@@ -93,14 +93,14 @@ public:
 class Dependency : public ByteString
 {
 private:
-    USHORT nOSType;                         // operating systems where dependecy exists
+    USHORT nOSType;							// operating systems where dependecy exists
 
 public:
     /* create a dependency instance with given directory name
      */
     Dependency(
-        const ByteString &rDirectoryName,   // the coded name of the directory
-        USHORT nOperatingSystems            // the operating systems where this dependency exists
+        const ByteString &rDirectoryName, 	// the coded name of the directory
+        USHORT nOperatingSystems			// the operating systems where this dependency exists
     ) :
     ByteString( rDirectoryName ),
     nOSType( nOperatingSystems )
@@ -122,26 +122,26 @@ public:
 class SourceDirectory : public ByteString
 {
 private:
-    SourceDirectory *pParent;               // the parent directory
-    SourceDirectoryList *pSubDirectories;   // list of sub directories
-    USHORT nOSType;                         // operating systems where this directory is used
-    USHORT nDepth;                          // depth of directory structure (root is 0)
+    SourceDirectory *pParent;				// the parent directory
+    SourceDirectoryList *pSubDirectories;	// list of sub directories
+    USHORT nOSType;							// operating systems where this directory is used
+    USHORT nDepth;							// depth of directory structure (root is 0)
 
-    SByteStringList *pDependencies;         // dependencies on other directories in this depth
+    SByteStringList *pDependencies;			// dependencies on other directories in this depth
 
-    SByteStringList *pCodedDependencies;    // dependencies on other directories in different depth
-    SByteStringList *pCodedIdentifier;      // symbolic identifier to resolve dependencies
+    SByteStringList *pCodedDependencies;   	// dependencies on other directories in different depth
+    SByteStringList *pCodedIdentifier;     	// symbolic identifier to resolve dependencies
 
     /* try to resolve a single dependency
      */
     Dependency *ResolvesDependency(
-        CodedDependency *pCodedDependency   // the dependency
+        CodedDependency *pCodedDependency 	// the dependency
     );
 
     /* returns the operating systems of a coded dependency
      */
     static USHORT GetOSType(
-        const ByteString &sDependExt        // the corresponding dependency extension (see also prj.hxx)
+        const ByteString &sDependExt 		// the corresponding dependency extension (see also prj.hxx)
     );
 
     /* removes this and all sub directories with all dependencies
@@ -154,9 +154,9 @@ public:
      * (not the file system root but the root of the source tree, e.g. o:\569)
      */
     SourceDirectory(
-        const ByteString &rDirectoryName,           // name without parent
-        USHORT nOperatingSystem,                    // the operating systems where this directory is used
-        SourceDirectory *pParentDirectory = NULL    // parent (if not root)
+        const ByteString &rDirectoryName, 			// name without parent
+        USHORT nOperatingSystem,					// the operating systems where this directory is used
+        SourceDirectory *pParentDirectory = NULL 	// parent (if not root)
     );
     ~SourceDirectory();
 
@@ -175,15 +175,15 @@ public:
     /* returns the given directory
      */
     SourceDirectory *GetDirectory(
-        const ByteString &rDirectoryName,   // full path
-        USHORT nOperatingSystem             // the operating systems where this directory is used
+        const ByteString &rDirectoryName,	// full path
+        USHORT nOperatingSystem				// the operating systems where this directory is used
     );
 
     /* create the directory and all mandatory parents
      */
     SourceDirectory *InsertFull(
-        const ByteString &rDirectoryName,   // full path
-        USHORT nOperatingSystem             // the operating systems where this directory is used
+        const ByteString &rDirectoryName,	// full path
+        USHORT nOperatingSystem				// the operating systems where this directory is used
     )
     {
         return GetDirectory( rDirectoryName, nOperatingSystem );
@@ -192,8 +192,8 @@ public:
     /* create the directory as sub directory of this directory
      */
     SourceDirectory *Insert(
-        const ByteString &rDirectoryName,   // name without parent
-        USHORT nOperatingSystem             // the operating systems where this directory is used
+        const ByteString &rDirectoryName,	// name without parent
+        USHORT nOperatingSystem				// the operating systems where this directory is used
     );
 
     /* get the root directory
@@ -203,15 +203,15 @@ public:
     /* get sub directory if exists
      */
     SourceDirectory *GetSubDirectory(
-        const ByteString &rDirectoryPath,   // full sub path
-        USHORT nOperatingSystem             // the operating systems where this directory is used
+        const ByteString &rDirectoryPath,	// full sub path
+        USHORT nOperatingSystem				// the operating systems where this directory is used
     );
 
     /* add a dependency for several platforms
      */
     CodedDependency *AddCodedDependency(
         const ByteString &rCodedIdentifier, // the coded name of the directory
-        USHORT nOperatingSystems            // the operating systems where this dependency exists
+        USHORT nOperatingSystems			// the operating systems where this dependency exists
     );
 
     /* returns the dependency list
@@ -225,7 +225,7 @@ public:
      */
     CodedDependency *AddCodedIdentifier(
         const ByteString &rCodedIdentifier, // the coded name of the directory
-        USHORT nOperatingSystems            // the operating systems where this dependency exists
+        USHORT nOperatingSystems			// the operating systems where this dependency exists
     );
 
     /* returns the identifier list
@@ -250,15 +250,15 @@ public:
     /* create the full directory tree (only virtual, not in file system)
      */
     static SourceDirectory *CreateRootDirectory(
-        const ByteString &rRoot,    // the root directory in file system
-        const ByteString &rVersion, // the solar verion (r.g. SRC590, SRC591 etc.)
-        BOOL bAll = FALSE           // add all directories or only buildable ones
+        const ByteString &rRoot, 	// the root directory in file system
+        const ByteString &rVersion,	// the solar verion (r.g. SRC590, SRC591 etc.)
+        BOOL bAll = FALSE			// add all directories or only buildable ones
     );
 
     /* create the makefile.rc in file system
      */
     BOOL CreateRecursiveMakefile(
-        BOOL bAllChilds = FALSE     // create rcursive for all sub directories
+        BOOL bAllChilds = FALSE 	// create rcursive for all sub directories
     );
 };
 
@@ -279,13 +279,13 @@ public:
     /* search for a directory by directory name
      */
     SourceDirectory *Search(
-        const ByteString &rDirectoryName    // name without parent
+        const ByteString &rDirectoryName	// name without parent
     );
 
     /* insert a new directory
      */
     ULONG InsertSorted(
-        SourceDirectory *pDirectory     // directory
+        SourceDirectory *pDirectory 	// directory
     )
     {
         return PutString(( ByteString * ) pDirectory );
diff --git a/tools/inc/bootstrp/prj.hxx b/tools/inc/bootstrp/prj.hxx
index 2d7664b8b69f..2fb536da0d41 100644
--- a/tools/inc/bootstrp/prj.hxx
+++ b/tools/inc/bootstrp/prj.hxx
@@ -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
@@ -33,19 +33,19 @@
 #include "bootstrp/listmacr.hxx"
 #include <vos/mutex.hxx>
 
-#define OS_NONE             0x0000
-#define OS_WIN16            0x0001
-#define OS_WIN32            0x0002
-#define OS_OS2              0x0004
-#define OS_UNX              0x0008
-#define OS_ALL              ( OS_WIN16 | OS_WIN32 | OS_OS2 | OS_UNX )
+#define OS_NONE				0x0000
+#define OS_WIN16			0x0001
+#define OS_WIN32			0x0002
+#define OS_OS2				0x0004
+#define OS_UNX				0x0008
+#define OS_ALL				( OS_WIN16 | OS_WIN32 | OS_OS2 | OS_UNX )
 
-#define COMMAND_PROJECTROOT 0x0000
-#define COMMAND_NMAKE       0x0001
-#define COMMAND_GET         0x0002
-#define COMMAND_USER_START  0x0003
-#define COMMAND_USER_END    0xFFFE
-#define COMMAND_ALLDIRS     0xFFFF
+#define COMMAND_PROJECTROOT	0x0000
+#define COMMAND_NMAKE		0x0001
+#define COMMAND_GET			0x0002
+#define COMMAND_USER_START	0x0003
+#define COMMAND_USER_END	0xFFFE
+#define COMMAND_ALLDIRS		0xFFFF
 
 class SByteStringList;
 class GenericInformationList;
@@ -53,129 +53,129 @@ class GenericInformationList;
 /*
 // Pfade auf Konfigurationsdateien des Build-Servers
 
-#define REQUEST_DIR         \\src\data4\source\b_server\server\newjob
+#define REQUEST_DIR			\\src\data4\source\b_server\server\newjob
 */
 /*********************************************************************
 *
-*   Die Klasse CommandData haelte alle Informationen, die fuer die
-*   Abarbeitung eines Kommandos (nmake, get) noetig sind
+*	Die Klasse CommandData haelte alle Informationen, die fuer die
+*	Abarbeitung eines Kommandos (nmake, get) noetig sind
 *
 *********************************************************************/
 
 class CommandData
 {
-    ByteString      aPrj;
-    ByteString      aLogFileName;
-    ByteString      aInpath;
-    ByteString      aUpd;
-    ByteString      aUpdMinor;
-    ByteString      aProduct;
-    ByteString      aCommand;
-    ByteString      aPath;
-    ByteString      aPrePath;
-    ByteString      aPreFix;
-    ByteString      aCommandPara;
-    ByteString      aComment;
-    ByteString      sClientRestriction;
-    SByteStringList *pDepList;
-    USHORT      nOSType;
-    USHORT      nCommand;
-
-    ULONG       nDepth;             // Tiefe der Abhaenigkeit
+    ByteString 		aPrj;
+    ByteString		aLogFileName;
+    ByteString		aInpath;
+    ByteString		aUpd;
+    ByteString		aUpdMinor;
+    ByteString		aProduct;
+    ByteString		aCommand;
+    ByteString		aPath;
+    ByteString		aPrePath;
+    ByteString		aPreFix;
+    ByteString		aCommandPara;
+    ByteString		aComment;
+    ByteString		sClientRestriction;
+    SByteStringList	*pDepList;
+    USHORT		nOSType;
+    USHORT		nCommand;
+
+    ULONG		nDepth;				// Tiefe der Abhaenigkeit
 
 public:
                 CommandData();
                 ~CommandData();
-    ByteString      GetProjectName(){return aPrj;}
-    void        SetProjectName( ByteString aName ){aPrj = aName;}
-    ByteString      GetLogFile(){return aLogFileName;}
-    void        SetLogFile( ByteString aName ){aLogFileName = aName;}
-    ByteString      GetInpath(){return aInpath;}
-    void        SetInpath( ByteString aName ){aInpath = aName;}
-    ByteString      GetUpd(){return aUpd;}
-    void        SetUpd( ByteString aName ){aUpd = aName;}
-    ByteString      GetUpdMinor(){return aUpdMinor;}
-    void        SetUpdMinor( ByteString aName ){aUpdMinor = aName;}
-    ByteString      GetProduct(){return aProduct;}
-    void        SetProduct( ByteString aName ){aProduct = aName;}
-    ByteString      GetCommand(){return aCommand;}
-    void        SetCommand ( ByteString aName ){aCommand = aName;}
-    ByteString      GetCommandPara(){return aCommandPara;}
-    void        SetCommandPara ( ByteString aName ){aCommandPara = aName;}
-    ByteString      GetComment(){return aComment;}
-    void        SetComment ( ByteString aCommentString ){aComment = aCommentString;}
-    ByteString      GetPath(){return aPath;}
-    void        SetPath( ByteString aName ){aPath = aName;}
-    ByteString      GetPrePath(){return aPrePath;}
-    void        SetPrePath( ByteString aName ){aPrePath = aName;}
-    USHORT      GetOSType(){return nOSType;}
-    ByteString      GetOSTypeString();
-    void        SetOSType( USHORT nType ){nOSType = nType;}
-    USHORT      GetCommandType(){return nCommand;}
-    ByteString      GetCommandTypeString();
-    void        SetCommandType( USHORT nCommandType ){nCommand = nCommandType;}
+    ByteString		GetProjectName(){return aPrj;}
+    void		SetProjectName( ByteString aName ){aPrj = aName;}
+    ByteString		GetLogFile(){return aLogFileName;}
+    void		SetLogFile( ByteString aName ){aLogFileName = aName;}
+    ByteString		GetInpath(){return aInpath;}
+    void		SetInpath( ByteString aName ){aInpath = aName;}
+    ByteString		GetUpd(){return aUpd;}
+    void		SetUpd( ByteString aName ){aUpd = aName;}
+    ByteString		GetUpdMinor(){return aUpdMinor;}
+    void		SetUpdMinor( ByteString aName ){aUpdMinor = aName;}
+    ByteString		GetProduct(){return aProduct;}
+    void		SetProduct( ByteString aName ){aProduct = aName;}
+    ByteString		GetCommand(){return aCommand;}
+    void		SetCommand ( ByteString aName ){aCommand = aName;}
+    ByteString		GetCommandPara(){return aCommandPara;}
+    void		SetCommandPara ( ByteString aName ){aCommandPara = aName;}
+    ByteString		GetComment(){return aComment;}
+    void		SetComment ( ByteString aCommentString ){aComment = aCommentString;}
+    ByteString		GetPath(){return aPath;}
+    void		SetPath( ByteString aName ){aPath = aName;}
+    ByteString		GetPrePath(){return aPrePath;}
+    void		SetPrePath( ByteString aName ){aPrePath = aName;}
+    USHORT		GetOSType(){return nOSType;}
+    ByteString		GetOSTypeString();
+    void		SetOSType( USHORT nType ){nOSType = nType;}
+    USHORT		GetCommandType(){return nCommand;}
+    ByteString		GetCommandTypeString();
+    void		SetCommandType( USHORT nCommandType ){nCommand = nCommandType;}
     SByteStringList* GetDependencies(){return pDepList;}
-    void        SetDependencies( SByteStringList *pList ){pDepList = pList;}
-    ByteString      GetClientRestriction() { return sClientRestriction; }
-    void        SetClientRestriction( ByteString sRestriction ) { sClientRestriction = sRestriction; }
+    void		SetDependencies( SByteStringList *pList ){pDepList = pList;}
+    ByteString		GetClientRestriction() { return sClientRestriction; }
+    void		SetClientRestriction( ByteString sRestriction ) { sClientRestriction = sRestriction; }
 
-    void        AddDepth(){nDepth++;}
-    ULONG       GetDepth(){return nDepth;}
+    void		AddDepth(){nDepth++;}
+    ULONG		GetDepth(){return nDepth;}
 };
 
 /*********************************************************************
 *
-*   Die Klasse SimpleConfig kann benutzt werden, um aus einer Textdatei
-*   alle Tokens zu lesen
+*	Die Klasse SimpleConfig kann benutzt werden, um aus einer Textdatei
+*	alle Tokens zu lesen
 *
 *********************************************************************/
 
 class SimpleConfig
 {
-    long            nLine;
-    String          aFileName;
-    SvFileStream    aFileStream;
-    ByteString          aTmpStr;
-    ByteString          aStringBuffer;
+    long			nLine;
+    String			aFileName;
+    SvFileStream	aFileStream;
+    ByteString			aTmpStr;
+    ByteString			aStringBuffer;
 
-    ByteString          GetNextLine();
+    ByteString			GetNextLine();
 public:
                     SimpleConfig(String aSimpleConfigFileName);
                     SimpleConfig(DirEntry& rDirEntry);
                     ~SimpleConfig();
-    ByteString          GetNext();
-    ByteString          GetCleanedNextLine( BOOL bReadComments = FALSE );
+    ByteString			GetNext();
+    ByteString			GetCleanedNextLine( BOOL bReadComments = FALSE );
 };
 
-#define ENV_GUI     0x00000000
-#define ENV_OS      0x00000001
-#define ENV_UPD     0x00000002
-#define ENV_UPDMIN  0x00000004
-#define ENV_INPATH  0x00000008
+#define ENV_GUI		0x00000000
+#define ENV_OS		0x00000001
+#define ENV_UPD		0x00000002
+#define	ENV_UPDMIN	0x00000004
+#define ENV_INPATH	0x00000008
 #define ENV_OUTPATH 0x00000010
 #define ENV_GUIBASE 0x00000020
-#define ENV_CVER    0x00000040
-#define ENV_GVER    0x00000080
-#define ENV_GUIENV  0x00000100
-#define ENV_CPU     0x00000200
+#define ENV_CVER	0x00000040
+#define ENV_GVER	0x00000080
+#define ENV_GUIENV	0x00000100
+#define ENV_CPU		0x00000200
 #define ENV_CPUNAME 0x00000400
 #define ENV_DLLSUFF 0x00000800
-#define ENV_COMEX   0x00001000
+#define ENV_COMEX	0x00001000
 #define ENV_COMPATH 0x00002000
 #define ENV_INCLUDE 0x00004000
-#define ENV_LIB     0x00008000
-#define ENV_PATH    0x00010000
-#define ENV_SOLVER  0x00020000
-#define ENV_SOLENV  0x00040000
+#define ENV_LIB		0x00008000
+#define ENV_PATH	0x00010000
+#define ENV_SOLVER	0x00020000
+#define ENV_SOLENV	0x00040000
 #define ENV_SOLROOT 0x00080000
 #define ENV_DEVROOT 0x00100000
-#define ENV_EMERG   0x00200000
-#define ENV_STAND   0x00400000
+#define ENV_EMERG	0x00200000
+#define ENV_STAND	0x00400000
 
 /*********************************************************************
 *
-*   class Prj
-*   alle Daten eines Projektes werden hier gehalten
+*	class Prj
+*	alle Daten eines Projektes werden hier gehalten
 *
 *********************************************************************/
 
@@ -186,53 +186,53 @@ class Prj : public PrjList
 {
 friend class Star;
 private:
-    BOOL            bVisited;
+    BOOL			bVisited;
 
-    ByteString          aPrjPath;
-    ByteString          aProjectName;
-    ByteString          aProjectPrefix;     // max. 2-buchstabige Abk.
-    SByteStringList*    pPrjInitialDepList;
-    SByteStringList*    pPrjDepList;
-    BOOL            bHardDependencies;
-    BOOL            bSorted;
+    ByteString			aPrjPath;
+    ByteString			aProjectName;
+    ByteString			aProjectPrefix;		// max. 2-buchstabige Abk.
+    SByteStringList*	pPrjInitialDepList;
+    SByteStringList*	pPrjDepList;
+    BOOL			bHardDependencies;
+    BOOL			bSorted;
 
 public:
                     Prj();
                     Prj( ByteString aName );
                     ~Prj();
-    void            SetPreFix( ByteString aPre ){aProjectPrefix = aPre;}
-    ByteString          GetPreFix(){return aProjectPrefix;}
-    ByteString          GetProjectName()
+    void			SetPreFix( ByteString aPre ){aProjectPrefix = aPre;}
+    ByteString			GetPreFix(){return aProjectPrefix;}
+    ByteString			GetProjectName()
                             {return aProjectName;}
-    void            SetProjectName(ByteString aName)
+    void			SetProjectName(ByteString aName)
                             {aProjectName = aName;}
-    BOOL            InsertDirectory( ByteString aDirName , USHORT aWhat,
+    BOOL			InsertDirectory( ByteString aDirName , USHORT aWhat,
                                     USHORT aWhatOS, ByteString aLogFileName,
                                     const ByteString &rClientRestriction );
-    CommandData*    RemoveDirectory( ByteString aLogFileName );
-    CommandData*    GetDirectoryList ( USHORT nWhatOs, USHORT nCommand );
-    CommandData*    GetDirectoryData( ByteString aLogFileName );
-    inline CommandData* GetData( ByteString aLogFileName )
+    CommandData*	RemoveDirectory( ByteString aLogFileName );
+    CommandData*	GetDirectoryList ( USHORT nWhatOs, USHORT nCommand );
+    CommandData*	GetDirectoryData( ByteString aLogFileName );
+    inline CommandData*	GetData( ByteString aLogFileName )
                             { return GetDirectoryData( aLogFileName ); };
 
-    SByteStringList*    GetDependencies( BOOL bExpanded = TRUE );
-    void            AddDependencies( ByteString aStr );
-    void            HasHardDependencies( BOOL bHard ) { bHardDependencies = bHard; }
-    BOOL            HasHardDependencies() { return bHardDependencies; }
+    SByteStringList* 	GetDependencies( BOOL bExpanded = TRUE );
+    void			AddDependencies( ByteString aStr );
+    void			HasHardDependencies( BOOL bHard ) { bHardDependencies = bHard; }
+    BOOL			HasHardDependencies() { return bHardDependencies; }
 };
 
 /*********************************************************************
 *
-*   class Star
-*   Diese Klasse liest die Projectstruktur aller StarDivision Projekte
-*   aus \\dev\data1\upenv\data\config\solar.lst aus
+*	class Star
+*	Diese Klasse liest die Projectstruktur aller StarDivision Projekte
+*	aus \\dev\data1\upenv\data\config\solar.lst aus
 *
 *********************************************************************/
 
 DECL_DEST_LIST ( StarList_tmp, StarList, Prj* )
 DECLARE_LIST ( SolarFileList, String* )
 
-class StarFile
+class StarFile 
 {
 private:
     String aFileName;
@@ -253,33 +253,33 @@ public:
 
 DECLARE_LIST( StarFileList, StarFile * )
 
-#define STAR_MODE_SINGLE_PARSE          0x0000
-#define STAR_MODE_RECURSIVE_PARSE       0x0001
-#define STAR_MODE_MULTIPLE_PARSE        0x0002
+#define STAR_MODE_SINGLE_PARSE			0x0000
+#define STAR_MODE_RECURSIVE_PARSE		0x0001
+#define STAR_MODE_MULTIPLE_PARSE 		0x0002
 
 class Star : public StarList
 {
 private:
-    ByteString      aStarName;
+    ByteString		aStarName;
 
     static Link aDBNotFoundHdl;
 protected:
     NAMESPACE_VOS( OMutex ) aMutex;
 
-    USHORT          nStarMode;
-    SolarFileList   aFileList;
-    StarFileList    aLoadedFilesList;
-    String          sSourceRoot;
+    USHORT 			nStarMode;
+    SolarFileList 	aFileList;
+    StarFileList	aLoadedFilesList;
+    String 			sSourceRoot;
 
     void InsertSolarList( String sProject );
     String CreateFileName( String sProject );
 
-    void            Expand_Impl();
-    void            ExpandPrj_Impl( Prj *pPrj, Prj *pDepPrj );
+    void			Expand_Impl();
+    void			ExpandPrj_Impl( Prj *pPrj, Prj *pDepPrj );
 
 private:
-    void            Read( String &rFileName );
-    void            Read( SolarFileList *pSOlarFiles );
+    void			Read( String &rFileName );
+    void			Read( SolarFileList *pSOlarFiles );
 
 public:
                     Star();
@@ -290,24 +290,24 @@ public:
 
                     ~Star();
 
-    static          void SetDBNotFoundHdl( const Link &rLink ) { aDBNotFoundHdl = rLink; }
+    static 			void SetDBNotFoundHdl( const Link &rLink ) { aDBNotFoundHdl = rLink; }
 
-    ByteString      GetName(){ return aStarName; };
+    ByteString		GetName(){ return aStarName; };
 
-    BOOL            HasProject( ByteString aProjectName );
-    Prj*            GetPrj( ByteString aProjectName );
-    ByteString          GetPrjName( DirEntry &rPath );
+    BOOL			HasProject( ByteString aProjectName );
+    Prj*			GetPrj( ByteString aProjectName );
+    ByteString			GetPrjName( DirEntry &rPath );
 
-    void            InsertToken( char *pChar );
-    BOOL            NeedsUpdate();
+    void			InsertToken( char *pChar );
+    BOOL			NeedsUpdate();
 
-    USHORT          GetMode() { return nStarMode; }
+    USHORT			GetMode() { return nStarMode; }
 };
 
 class StarWriter : public Star
 {
 private:
-    USHORT          WritePrj( Prj *pPrj, SvFileStream& rStream );
+    USHORT			WritePrj( Prj *pPrj, SvFileStream& rStream );
 
 public:
                     StarWriter( String aFileName, BOOL bReadComments = FALSE, USHORT nMode = STAR_MODE_SINGLE_PARSE );
@@ -315,17 +315,17 @@ public:
                     StarWriter( GenericInformationList *pStandLst, ByteString &rVersion, BOOL bLocal = FALSE,
                         const char *pSourceRoot = NULL );
 
-    void            CleanUp();
+    void			CleanUp();
 
-    BOOL            InsertProject ( Prj* pNewPrj );
-    Prj*            RemoveProject ( ByteString aProjectName );
+    BOOL			InsertProject ( Prj* pNewPrj );
+    Prj*			RemoveProject ( ByteString aProjectName );
 
-    USHORT          Read( String aFileName, BOOL bReadComments = FALSE, USHORT nMode = STAR_MODE_SINGLE_PARSE  );
-       USHORT           Read( SolarFileList *pSolarFiles, BOOL bReadComments = FALSE );
-    USHORT          Write( String aFileName );
-    USHORT          WriteMultiple( String rSourceRoot );
+    USHORT			Read( String aFileName, BOOL bReadComments = FALSE, USHORT nMode = STAR_MODE_SINGLE_PARSE  );
+       USHORT		   	Read( SolarFileList *pSolarFiles, BOOL bReadComments = FALSE );
+    USHORT			Write( String aFileName );
+    USHORT			WriteMultiple( String rSourceRoot );
 
-    void            InsertTokenLine( ByteString& rString );
+    void			InsertTokenLine( ByteString& rString );
 };
 
 #endif
diff --git a/tools/inc/bootstrp/sstring.hxx b/tools/inc/bootstrp/sstring.hxx
index 933770887e37..6fdb52385225 100644
--- a/tools/inc/bootstrp/sstring.hxx
+++ b/tools/inc/bootstrp/sstring.hxx
@@ -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
@@ -31,10 +31,10 @@
 #include <tools/string.hxx>
 #include <tools/list.hxx>
 
-#define NOT_THERE       LIST_ENTRY_NOTFOUND
+#define NOT_THERE		LIST_ENTRY_NOTFOUND
 
-#define  SStringList SUniStringList
-#define  StringList UniStringList
+#define  SStringList SUniStringList 
+#define  StringList UniStringList 
 
 DECLARE_LIST( ByteStringList, ByteString* )
 DECLARE_LIST( UniStringList, UniString* )
@@ -52,17 +52,17 @@ public:
                 ~SByteStringList();
 
                 // neuen ByteString in Liste einfuegen
-    ULONG       PutString( ByteString* );
-    ByteString*     RemoveString( const ByteString& rName );
+    ULONG		PutString( ByteString* );
+    ByteString* 	RemoveString( const ByteString& rName );
 
                 // Position des ByteString in Liste, wenn nicht enthalten, dann
                 // return = NOT_THERE
-    ULONG       IsString( ByteString* );
+    ULONG		IsString( ByteString* );
 
                 // Vorgaenger ermitteln ( auch wenn selbst noch nicht in
                 // Liste enthalten
-    ULONG       GetPrevString( ByteString* );
-    void        CleanUp();
+    ULONG		GetPrevString( ByteString* );
+    void		CleanUp();
 
     SByteStringList& operator<<  ( SvStream& rStream );
     SByteStringList& operator>>  ( SvStream& rStream );
@@ -79,27 +79,27 @@ public:
                 ~SUniStringList();
 
                 // neuen UniString in Liste einfuegen
-    ULONG       PutString( UniString* );
-    UniString*  RemoveString( const UniString& rName );
+    ULONG		PutString( UniString* );
+    UniString* 	RemoveString( const UniString& rName );
 
                 // Position des UniString in Liste, wenn nicht enthalten, dann
                 // return = NOT_THERE
-    ULONG       IsString( UniString* );
+    ULONG		IsString( UniString* );
 
                 // Vorgaenger ermitteln ( auch wenn selbst noch nicht in
                 // Liste enthalten
-    ULONG       GetPrevString( UniString* );
+    ULONG		GetPrevString( UniString* );
 };
 
 class Text
 {
 protected:
-    String      aString;
+    String		aString;
 
 public:
                 Text( char* pChar );
                 Text( String &rStr ) { aString = rStr; }
-    void        Stderr();
+    void		Stderr();
 };
 
 #endif
diff --git a/tools/inc/impcont.hxx b/tools/inc/impcont.hxx
index 224d5a4429ef..244c255d2d98 100644
--- a/tools/inc/impcont.hxx
+++ b/tools/inc/impcont.hxx
@@ -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
diff --git a/tools/inc/impstrg.hxx b/tools/inc/impstrg.hxx
index 60b25a4c3fd6..15d914ac84e2 100644
--- a/tools/inc/impstrg.hxx
+++ b/tools/inc/impstrg.hxx
@@ -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
diff --git a/tools/inc/pch/precompiled_tools.cxx b/tools/inc/pch/precompiled_tools.cxx
index cafe6444a55d..29db7a72c0e3 100644
--- a/tools/inc/pch/precompiled_tools.cxx
+++ b/tools/inc/pch/precompiled_tools.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
diff --git a/tools/inc/pch/precompiled_tools.hxx b/tools/inc/pch/precompiled_tools.hxx
index 2bc615738a08..512634020f17 100644
--- a/tools/inc/pch/precompiled_tools.hxx
+++ b/tools/inc/pch/precompiled_tools.hxx
@@ -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
diff --git a/tools/inc/poly.h b/tools/inc/poly.h
index e6678e071f28..fbb00377529f 100644
--- a/tools/inc/poly.h
+++ b/tools/inc/poly.h
@@ -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
diff --git a/tools/inc/tools/StringListResource.hxx b/tools/inc/tools/StringListResource.hxx
index 9709435407fb..07f31defba81 100644
--- a/tools/inc/tools/StringListResource.hxx
+++ b/tools/inc/tools/StringListResource.hxx
@@ -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
diff --git a/tools/inc/tools/agapi.hxx b/tools/inc/tools/agapi.hxx
index 9c71bd35c6cc..9e86bad3acab 100644
--- a/tools/inc/tools/agapi.hxx
+++ b/tools/inc/tools/agapi.hxx
@@ -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
@@ -40,27 +40,27 @@ class AgentApi
 protected:
     friend class ChannelList;
 
-    AgentItem*          pChannelAgent;
-    virtual BOOL        StartAgent() = 0;
+    AgentItem*			pChannelAgent;
+    virtual BOOL		StartAgent() = 0;
 
     AgentApi(AgentItem* pAgent) { pChannelAgent = pAgent; }
 
 public:
     virtual ~AgentApi() {}
 
-    virtual void    InitAgent() = 0;
-    virtual void    ShutDownAgent() = 0;
+    virtual void	InitAgent() = 0;
+    virtual void	ShutDownAgent() = 0;
 
-    virtual BOOL    NewDataPermission(const String& rChannelName) = 0;
-    virtual void    NewData(const String& rChannelName,
+    virtual BOOL	NewDataPermission(const String& rChannelName) = 0;
+    virtual void 	NewData(const String& rChannelName,
                         const INetURLObject& rURL) = 0;
-    virtual void    NotifyChannelObjFile(const INetURLObject& rURL,
+    virtual void	NotifyChannelObjFile(const INetURLObject& rURL,
                         const String& rFileName) = 0;
-    virtual void    NotifyChannelObjData(const INetURLObject& rURL,
+    virtual void	NotifyChannelObjData(const INetURLObject& rURL,
                         void* pBuffer, long nOffset, long nLen, long nTotalLen) = 0;
 
-    virtual void    RegisterChannels() = 0;
-    virtual void    RegisterUpdateTransmitter() = 0;
+    virtual void	RegisterChannels() = 0;
+    virtual void 	RegisterUpdateTransmitter() = 0;
 };
 
 #endif //_AGAPI_HXX
diff --git a/tools/inc/tools/agitem.hxx b/tools/inc/tools/agitem.hxx
index 3177bdffa0a8..774f86a69ebb 100644
--- a/tools/inc/tools/agitem.hxx
+++ b/tools/inc/tools/agitem.hxx
@@ -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
@@ -38,13 +38,13 @@ class ChApi;
 class AgentItem
 {
 public:
-    virtual const String&           GetChAgentName() const = 0;
-    virtual const INetURLObject&    GetLocation() const = 0;
-    virtual AgentApi*               GetApi() const = 0;
-    virtual ChApi*                  GetChApi() const = 0;
+    virtual const String&			GetChAgentName() const = 0;
+    virtual const INetURLObject&	GetLocation() const = 0;
+    virtual AgentApi*				GetApi() const = 0;
+    virtual ChApi*					GetChApi() const = 0;
 
-    virtual void                    SetIsActive(BOOL bNew) = 0;
-    virtual BOOL                    IsActive() const = 0;
+    virtual void   					SetIsActive(BOOL bNew) = 0;
+    virtual BOOL   					IsActive() const = 0;
 };
 
 #endif //_AGITEM_HXX
diff --git a/tools/inc/tools/appendunixshellword.hxx b/tools/inc/tools/appendunixshellword.hxx
index 66b333bb62a5..31c698e6dd8e 100644
--- a/tools/inc/tools/appendunixshellword.hxx
+++ b/tools/inc/tools/appendunixshellword.hxx
@@ -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
diff --git a/tools/inc/tools/b3dtrans.hxx b/tools/inc/tools/b3dtrans.hxx
index 5b812bde15a2..4df6e7a9df85 100644
--- a/tools/inc/tools/b3dtrans.hxx
+++ b/tools/inc/tools/b3dtrans.hxx
@@ -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
@@ -29,7 +29,7 @@
 #define _B3D_B3DTRANS_HXX
 
 // Zu verwendender DephRange des Z-Buffers
-#define ZBUFFER_DEPTH_RANGE         ((double)(256L * 256L * 256L))
+#define ZBUFFER_DEPTH_RANGE			((double)(256L * 256L * 256L))
 
 #include <basegfx/matrix/b3dhommatrix.hxx>
 #include <basegfx/range/b3drange.hxx>
@@ -75,68 +75,68 @@ class TOOLS_DLLPUBLIC B3dTransformationSet
 {
 private:
     // Object Matrix Object -> World
-    basegfx::B3DHomMatrix           maObjectTrans;
-    basegfx::B3DHomMatrix           maInvObjectTrans;
+    basegfx::B3DHomMatrix			maObjectTrans;
+    basegfx::B3DHomMatrix			maInvObjectTrans;
 
     // Orientation Matrix
-    basegfx::B3DHomMatrix           maOrientation;
-    basegfx::B3DHomMatrix           maInvOrientation;
+    basegfx::B3DHomMatrix			maOrientation;
+    basegfx::B3DHomMatrix			maInvOrientation;
 
     // Projection Matrix
-    basegfx::B3DHomMatrix           maProjection;
-    basegfx::B3DHomMatrix           maInvProjection;
+    basegfx::B3DHomMatrix			maProjection;
+    basegfx::B3DHomMatrix			maInvProjection;
 
     // Texture Matrices
-    basegfx::B2DHomMatrix           maTexture;
+    basegfx::B2DHomMatrix			maTexture;
 
     // Speziell zum Umwandeln von Punkten Objekt -> Device
-    basegfx::B3DHomMatrix           maObjectToDevice;
+    basegfx::B3DHomMatrix			maObjectToDevice;
 
     // Transponierte Inverse fuer Vectortransformationen
-    basegfx::B3DHomMatrix           maInvTransObjectToEye;
+    basegfx::B3DHomMatrix			maInvTransObjectToEye;
 
     // Transformation World->View
-    basegfx::B3DHomMatrix           maMatFromWorldToView;
-    basegfx::B3DHomMatrix           maInvMatFromWorldToView;
+    basegfx::B3DHomMatrix			maMatFromWorldToView;
+    basegfx::B3DHomMatrix			maInvMatFromWorldToView;
 
     // Parameters for ViewportTransformation
-    basegfx::B3DVector          maScale;
-    basegfx::B3DVector          maTranslate;
+    basegfx::B3DVector			maScale;
+    basegfx::B3DVector			maTranslate;
 
     // ViewPlane DeviceRectangle (vom Benutzer gesetzt)
-    double                          mfLeftBound;
-    double                          mfRightBound;
-    double                          mfBottomBound;
-    double                          mfTopBound;
+    double							mfLeftBound;
+    double							mfRightBound;
+    double							mfBottomBound;
+    double							mfTopBound;
 
     // Near and far clipping planes
-    double                          mfNearBound;
-    double                          mfFarBound;
+    double							mfNearBound;
+    double							mfFarBound;
 
     // Seitenverhaeltnis der 3D Abbildung (Y / X)
     // default ist 1:1 -> 1.0
     // Deaktivieren mit 0.0 als Wert
-    double                          mfRatio;
+    double							mfRatio;
 
     // Der gesetzte Ausgabebereich (in logischen Koordinaten)
     // und der dazugehoerige sichtbare Bereich
-    Rectangle                       maViewportRectangle;
-    Rectangle                       maVisibleRectangle;
+    Rectangle						maViewportRectangle;
+    Rectangle						maVisibleRectangle;
 
     // Die tatsaechlich von CalcViewport gesetzten Abmessungen
     // des sichtbaren Bereichs (in logischen Koordinaten)
-    Rectangle                       maSetBound;
+    Rectangle						maSetBound;
 
     // Methode zur Aufrechterhaltung des Seitenverhaeltnisses
     // default ist Base3DRatioGrow
-    Base3DRatio                     meRatio;
+    Base3DRatio						meRatio;
 
     // Flags
-    unsigned                        mbPerspective               : 1;
-    unsigned                        mbWorldToViewValid          : 1;
-    unsigned                        mbInvTransObjectToEyeValid  : 1;
-    unsigned                        mbObjectToDeviceValid       : 1;
-    unsigned                        mbProjectionValid           : 1;
+    unsigned						mbPerspective				: 1;
+    unsigned						mbWorldToViewValid			: 1;
+    unsigned						mbInvTransObjectToEyeValid	: 1;
+    unsigned						mbObjectToDeviceValid		: 1;
+    unsigned						mbProjectionValid			: 1;
 
 public:
     B3dTransformationSet();
@@ -243,8 +243,8 @@ public:
         double fNear = 0.0, double fFar = 1.0);
     static void Orientation(
         basegfx::B3DHomMatrix& rTarget,
-        basegfx::B3DPoint aVRP = basegfx::B3DPoint(0.0,0.0,1.0),
-        basegfx::B3DVector aVPN = basegfx::B3DVector(0.0,0.0,1.0),
+        basegfx::B3DPoint aVRP = basegfx::B3DPoint(0.0,0.0,1.0), 
+        basegfx::B3DVector aVPN = basegfx::B3DVector(0.0,0.0,1.0), 
         basegfx::B3DVector aVUP = basegfx::B3DVector(0.0,1.0,0.0));
 
 protected:
@@ -273,9 +273,9 @@ protected:
 class TOOLS_DLLPUBLIC B3dViewport : public B3dTransformationSet
 {
 private:
-    basegfx::B3DPoint               aVRP;           // View Reference Point
-    basegfx::B3DVector          aVPN;           // View Plane Normal
-    basegfx::B3DVector          aVUV;           // View Up Vector
+    basegfx::B3DPoint				aVRP;			// View Reference Point
+    basegfx::B3DVector			aVPN;			// View Plane Normal
+    basegfx::B3DVector			aVUV;			// View Up Vector
 
 public:
     B3dViewport();
@@ -289,9 +289,9 @@ public:
         const basegfx::B3DVector& rNewVPN,
         const basegfx::B3DVector& rNewVUV);
 
-    const basegfx::B3DPoint&    GetVRP() const  { return aVRP; }
-    const basegfx::B3DVector&   GetVPN() const  { return aVPN; }
-    const basegfx::B3DVector&   GetVUV() const  { return aVUV; }
+    const basegfx::B3DPoint&	GetVRP() const	{ return aVRP; }
+    const basegfx::B3DVector&	GetVPN() const	{ return aVPN; }
+    const basegfx::B3DVector&	GetVUV() const	{ return aVUV; }
 
 protected:
     void CalcOrientation();
@@ -306,13 +306,13 @@ protected:
 class TOOLS_DLLPUBLIC B3dCamera : public B3dViewport
 {
 private:
-    basegfx::B3DPoint       aPosition;
-    basegfx::B3DPoint       aCorrectedPosition;
-    basegfx::B3DVector  aLookAt;
-    double                  fFocalLength;
-    double                  fBankAngle;
+    basegfx::B3DPoint		aPosition;
+    basegfx::B3DPoint		aCorrectedPosition;
+    basegfx::B3DVector	aLookAt;
+    double					fFocalLength;
+    double					fBankAngle;
 
-    unsigned                bUseFocalLength         : 1;
+    unsigned				bUseFocalLength			: 1;
 
 public:
     B3dCamera(
diff --git a/tools/inc/tools/bigint.hxx b/tools/inc/tools/bigint.hxx
index 353fbb063191..a3154d02f2d7 100644
--- a/tools/inc/tools/bigint.hxx
+++ b/tools/inc/tools/bigint.hxx
@@ -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
diff --git a/tools/inc/tools/cachestr.hxx b/tools/inc/tools/cachestr.hxx
index 1819792bb386..e3eaa9767913 100644
--- a/tools/inc/tools/cachestr.hxx
+++ b/tools/inc/tools/cachestr.hxx
@@ -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
@@ -49,7 +49,7 @@ private:
     SvStream*       pCurrentStream;
     TempFile*       pTempFile;
 
-    Link            aFilenameLinkHdl;
+    Link    		aFilenameLinkHdl;
 
     TOOLS_DLLPRIVATE virtual ULONG   GetData( void* pData, ULONG nSize );
     TOOLS_DLLPRIVATE virtual ULONG   PutData( const void* pData, ULONG nSize );
@@ -64,19 +64,19 @@ public:
                                    ULONG nMaxMemSize = 0 );
                     ~SvCacheStream();
 
-    void            SetFilenameHdl( const Link& rLink);
+    void			SetFilenameHdl( const Link& rLink);
     const Link&     GetFilenameHdl() const;
-    void            SetFilename( const String& rFN )
+    void			SetFilename( const String& rFN )
                  { aFileName = rFN; } // darf nur vom FilenameHdl gerufen werden!
-    const String&   GetFilename() const { return aFileName; }
+    const String&   GetFilename() const { return aFileName;	}
 
     void            SwapOut();
     const void*     GetBuffer();
     ULONG           GetSize();
 
-    BOOL            IsPersistent() { return bPersistent != 0; }
-    void            SetPersistence( BOOL b = TRUE ) { bPersistent = b; }
-    void            SetSwapStream( SvStream *p )
+    BOOL			IsPersistent() { return bPersistent != 0; }
+    void			SetPersistence( BOOL b = TRUE ) { bPersistent = b; }
+    void			SetSwapStream( SvStream *p )
                  { pSwapStream = p; } // darf nur vom FilenameHdl gerufen werden!
 };
 
diff --git a/tools/inc/tools/chapi.hxx b/tools/inc/tools/chapi.hxx
index 0acfe4cb2ca5..e4d867126a52 100644
--- a/tools/inc/tools/chapi.hxx
+++ b/tools/inc/tools/chapi.hxx
@@ -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
@@ -35,8 +35,8 @@ class INetURLObject;
 class String;
 
 enum RequestType {
-    REQTYP_LOCAL_FILE   = 1,
-    REQTYP_MEMORY       = 2
+    REQTYP_LOCAL_FILE	= 1,
+    REQTYP_MEMORY		= 2
 };
 
 class ChApi
@@ -44,22 +44,22 @@ class ChApi
 public:
     virtual ~ChApi() {}
 
-    virtual void    ShutDownAgent() = 0;
-    virtual void    SetLastSuccUpd() = 0;
+    virtual void	ShutDownAgent() = 0;
+    virtual void	SetLastSuccUpd() = 0;
 
-    virtual void    GetChannelObject( const INetURLObject& rURL, RequestType eStreamType,
+    virtual void	GetChannelObject( const INetURLObject& rURL, RequestType eStreamType,
                             const String& rFileName ) = 0;
     virtual void    AddChannelItem( const String& aChName, const INetURLObject& aTransmitter,
                             const String& aChannel, USHORT nUpdPeriode,
                             const String& rChAgentName ) = 0;
     virtual void    DelChannelItem( const String& aChName ) = 0;
-    virtual void    SetChTransmitter( const String& aChName, const String& rNewVal ) = 0;
-    virtual void    SetChannel( const String& aChName, const String& rNewVal ) = 0;
-    virtual void    SetChannelName( const String& aChName, const String& rNewVal ) = 0;
-    virtual void    SetChUpdPeriode( const String& aChName, USHORT nUpdPeriode ) = 0;
-    virtual void    SetChannelAgentName( const String& aChName, const String& rNewVal ) = 0;
+    virtual void	SetChTransmitter( const String& aChName, const String& rNewVal ) = 0;
+    virtual void	SetChannel( const String& aChName, const String& rNewVal ) = 0;
+    virtual void	SetChannelName( const String& aChName, const String& rNewVal ) = 0;
+    virtual void	SetChUpdPeriode( const String& aChName, USHORT nUpdPeriode ) = 0;
+    virtual void	SetChannelAgentName( const String& aChName, const String& rNewVal ) = 0;
 
-    virtual void    SetUpdateTransmitter(ChannelAgentItem* pAgent, const INetURLObject& rTransmitter) = 0;
+    virtual void	SetUpdateTransmitter(ChannelAgentItem* pAgent, const INetURLObject& rTransmitter) = 0;
 };
 
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/tools/inc/tools/color.hxx b/tools/inc/tools/color.hxx
index a99ad1dd11c4..aca8f95b3fc1 100644
--- a/tools/inc/tools/color.hxx
+++ b/tools/inc/tools/color.hxx
@@ -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
@@ -41,71 +41,71 @@ class ResId;
 // - ColorCount-Types -
 // --------------------
 
-#define COLCOUNT_MONOCHROM          ((ULONG)2)
-#define COLCOUNT_16                 ((ULONG)16)
-#define COLCOUNT_256                ((ULONG)256)
-#define COLCOUNT_HICOLOR1           (((ULONG)0x00007FFF)+1)
-#define COLCOUNT_HICOLOR2           (((ULONG)0x0000FFFF)+1)
-#define COLCOUNT_TRUECOLOR          (((ULONG)0x00FFFFFF)+1)
+#define COLCOUNT_MONOCHROM			((ULONG)2)
+#define COLCOUNT_16 				((ULONG)16)
+#define COLCOUNT_256				((ULONG)256)
+#define COLCOUNT_HICOLOR1			(((ULONG)0x00007FFF)+1)
+#define COLCOUNT_HICOLOR2			(((ULONG)0x0000FFFF)+1)
+#define COLCOUNT_TRUECOLOR			(((ULONG)0x00FFFFFF)+1)
 
 // ---------------
 // - Color-Types -
 // ---------------
 
 typedef UINT32 ColorData;
-#define RGB_COLORDATA( r,g,b )      ((ColorData)(((UINT32)((UINT8)(b))))|(((UINT32)((UINT8)(g)))<<8)|(((UINT32)((UINT8)(r)))<<16))
-#define TRGB_COLORDATA( t,r,g,b )   ((ColorData)(((UINT32)((UINT8)(b))))|(((UINT32)((UINT8)(g)))<<8)|(((UINT32)((UINT8)(r)))<<16)|(((UINT32)((UINT8)(t)))<<24))
-#define COLORDATA_RED( n )          ((UINT8)((n)>>16))
-#define COLORDATA_GREEN( n )        ((UINT8)(((UINT16)(n)) >> 8))
-#define COLORDATA_BLUE( n )         ((UINT8)(n))
+#define RGB_COLORDATA( r,g,b )		((ColorData)(((UINT32)((UINT8)(b))))|(((UINT32)((UINT8)(g)))<<8)|(((UINT32)((UINT8)(r)))<<16))
+#define TRGB_COLORDATA( t,r,g,b )	((ColorData)(((UINT32)((UINT8)(b))))|(((UINT32)((UINT8)(g)))<<8)|(((UINT32)((UINT8)(r)))<<16)|(((UINT32)((UINT8)(t)))<<24))
+#define COLORDATA_RED( n )			((UINT8)((n)>>16))
+#define COLORDATA_GREEN( n )		((UINT8)(((UINT16)(n)) >> 8))
+#define COLORDATA_BLUE( n ) 		((UINT8)(n))
 #define COLORDATA_TRANSPARENCY( n ) ((UINT8)((n)>>24))
-#define COLORDATA_RGB( n )          ((ColorData)((n) & 0x00FFFFFF))
-
-#define COL_BLACK                   RGB_COLORDATA( 0x00, 0x00, 0x00 )
-#define COL_BLUE                    RGB_COLORDATA( 0x00, 0x00, 0x80 )
-#define COL_GREEN                   RGB_COLORDATA( 0x00, 0x80, 0x00 )
-#define COL_CYAN                    RGB_COLORDATA( 0x00, 0x80, 0x80 )
-#define COL_RED                     RGB_COLORDATA( 0x80, 0x00, 0x00 )
-#define COL_MAGENTA                 RGB_COLORDATA( 0x80, 0x00, 0x80 )
-#define COL_BROWN                   RGB_COLORDATA( 0x80, 0x80, 0x00 )
-#define COL_GRAY                    RGB_COLORDATA( 0x80, 0x80, 0x80 )
-#define COL_LIGHTGRAY               RGB_COLORDATA( 0xC0, 0xC0, 0xC0 )
-#define COL_LIGHTBLUE               RGB_COLORDATA( 0x00, 0x00, 0xFF )
-#define COL_LIGHTGREEN              RGB_COLORDATA( 0x00, 0xFF, 0x00 )
-#define COL_LIGHTCYAN               RGB_COLORDATA( 0x00, 0xFF, 0xFF )
-#define COL_LIGHTRED                RGB_COLORDATA( 0xFF, 0x00, 0x00 )
-#define COL_LIGHTMAGENTA            RGB_COLORDATA( 0xFF, 0x00, 0xFF )
-#define COL_YELLOW                  RGB_COLORDATA( 0xFF, 0xFF, 0x00 )
-#define COL_WHITE                   RGB_COLORDATA( 0xFF, 0xFF, 0xFF )
-#define COL_TRANSPARENT             TRGB_COLORDATA( 0xFF, 0xFF, 0xFF, 0xFF )
+#define COLORDATA_RGB( n )			((ColorData)((n) & 0x00FFFFFF))
+
+#define COL_BLACK					RGB_COLORDATA( 0x00, 0x00, 0x00 )
+#define COL_BLUE					RGB_COLORDATA( 0x00, 0x00, 0x80 )
+#define COL_GREEN					RGB_COLORDATA( 0x00, 0x80, 0x00 )
+#define COL_CYAN					RGB_COLORDATA( 0x00, 0x80, 0x80 )
+#define COL_RED 					RGB_COLORDATA( 0x80, 0x00, 0x00 )
+#define COL_MAGENTA 				RGB_COLORDATA( 0x80, 0x00, 0x80 )
+#define COL_BROWN					RGB_COLORDATA( 0x80, 0x80, 0x00 )
+#define COL_GRAY					RGB_COLORDATA( 0x80, 0x80, 0x80 )
+#define COL_LIGHTGRAY				RGB_COLORDATA( 0xC0, 0xC0, 0xC0 )
+#define COL_LIGHTBLUE				RGB_COLORDATA( 0x00, 0x00, 0xFF )
+#define COL_LIGHTGREEN				RGB_COLORDATA( 0x00, 0xFF, 0x00 )
+#define COL_LIGHTCYAN				RGB_COLORDATA( 0x00, 0xFF, 0xFF )
+#define COL_LIGHTRED				RGB_COLORDATA( 0xFF, 0x00, 0x00 )
+#define COL_LIGHTMAGENTA			RGB_COLORDATA( 0xFF, 0x00, 0xFF )
+#define COL_YELLOW					RGB_COLORDATA( 0xFF, 0xFF, 0x00 )
+#define COL_WHITE					RGB_COLORDATA( 0xFF, 0xFF, 0xFF )
+#define COL_TRANSPARENT 			TRGB_COLORDATA( 0xFF, 0xFF, 0xFF, 0xFF )
 #define COL_AUTO                    (ColorData)0xFFFFFFFF
-#define COL_AUTHOR1_DARK            RGB_COLORDATA(198, 146, 0)
-#define COL_AUTHOR1_NORMAL          RGB_COLORDATA(255, 255, 158)
-#define COL_AUTHOR1_LIGHT           RGB_COLORDATA(255, 255, 195)
-#define COL_AUTHOR2_DARK            RGB_COLORDATA(6,  70, 162)
-#define COL_AUTHOR2_NORMAL          RGB_COLORDATA(216, 232, 255)
-#define COL_AUTHOR2_LIGHT           RGB_COLORDATA(233, 242, 255)
-#define COL_AUTHOR3_DARK            RGB_COLORDATA(87, 157,  28)
-#define COL_AUTHOR3_NORMAL          RGB_COLORDATA(218, 248, 193)
-#define COL_AUTHOR3_LIGHT           RGB_COLORDATA(226, 250, 207)
-#define COL_AUTHOR4_DARK            RGB_COLORDATA(105,  43, 157)
-#define COL_AUTHOR4_NORMAL          RGB_COLORDATA(228, 210, 245)
-#define COL_AUTHOR4_LIGHT           RGB_COLORDATA(239, 228, 248)
-#define COL_AUTHOR5_DARK            RGB_COLORDATA(197,   0,  11)
-#define COL_AUTHOR5_NORMAL          RGB_COLORDATA(254, 205, 208)
-#define COL_AUTHOR5_LIGHT           RGB_COLORDATA(255, 227, 229)
-#define COL_AUTHOR6_DARK            RGB_COLORDATA(0, 128, 128)
-#define COL_AUTHOR6_NORMAL          RGB_COLORDATA(210, 246, 246)
-#define COL_AUTHOR6_LIGHT           RGB_COLORDATA(230, 250, 250)
-#define COL_AUTHOR7_DARK            RGB_COLORDATA(140, 132,  0)
-#define COL_AUTHOR7_NORMAL          RGB_COLORDATA(237, 252, 163)
-#define COL_AUTHOR7_LIGHT           RGB_COLORDATA(242, 254, 181)
-#define COL_AUTHOR8_DARK            RGB_COLORDATA(53,  85, 107)
-#define COL_AUTHOR8_NORMAL          RGB_COLORDATA(211, 222, 232)
-#define COL_AUTHOR8_LIGHT           RGB_COLORDATA(226, 234, 241)
-#define COL_AUTHOR9_DARK            RGB_COLORDATA(209, 118,   0)
-#define COL_AUTHOR9_NORMAL          RGB_COLORDATA(255, 226, 185)
-#define COL_AUTHOR9_LIGHT           RGB_COLORDATA(255, 231, 199)
+#define COL_AUTHOR1_DARK			RGB_COLORDATA(198, 146, 0)
+#define COL_AUTHOR1_NORMAL			RGB_COLORDATA(255, 255, 158)
+#define COL_AUTHOR1_LIGHT			RGB_COLORDATA(255, 255, 195)
+#define COL_AUTHOR2_DARK			RGB_COLORDATA(6,  70, 162)
+#define COL_AUTHOR2_NORMAL			RGB_COLORDATA(216, 232, 255)
+#define COL_AUTHOR2_LIGHT			RGB_COLORDATA(233, 242, 255)
+#define COL_AUTHOR3_DARK			RGB_COLORDATA(87, 157,  28)
+#define COL_AUTHOR3_NORMAL			RGB_COLORDATA(218, 248, 193)
+#define COL_AUTHOR3_LIGHT			RGB_COLORDATA(226, 250, 207)
+#define COL_AUTHOR4_DARK			RGB_COLORDATA(105,  43, 157)
+#define COL_AUTHOR4_NORMAL			RGB_COLORDATA(228, 210, 245)
+#define COL_AUTHOR4_LIGHT			RGB_COLORDATA(239, 228, 248)
+#define COL_AUTHOR5_DARK			RGB_COLORDATA(197,   0,  11)
+#define COL_AUTHOR5_NORMAL			RGB_COLORDATA(254, 205, 208)
+#define COL_AUTHOR5_LIGHT			RGB_COLORDATA(255, 227, 229)
+#define COL_AUTHOR6_DARK			RGB_COLORDATA(0, 128, 128)
+#define COL_AUTHOR6_NORMAL			RGB_COLORDATA(210, 246, 246)
+#define COL_AUTHOR6_LIGHT			RGB_COLORDATA(230, 250, 250)
+#define COL_AUTHOR7_DARK			RGB_COLORDATA(140, 132,  0)
+#define COL_AUTHOR7_NORMAL			RGB_COLORDATA(237, 252, 163)
+#define COL_AUTHOR7_LIGHT			RGB_COLORDATA(242, 254, 181)
+#define COL_AUTHOR8_DARK			RGB_COLORDATA(53,  85, 107)
+#define COL_AUTHOR8_NORMAL			RGB_COLORDATA(211, 222, 232)
+#define COL_AUTHOR8_LIGHT			RGB_COLORDATA(226, 234, 241)
+#define COL_AUTHOR9_DARK			RGB_COLORDATA(209, 118,   0)
+#define COL_AUTHOR9_NORMAL			RGB_COLORDATA(255, 226, 185)
+#define COL_AUTHOR9_LIGHT			RGB_COLORDATA(255, 231, 199)
 
 #define COLOR_CHANNEL_MERGE( _def_cDst, _def_cSrc, _def_cSrcTrans ) \
     ((BYTE)((((long)(_def_cDst)-(_def_cSrc))*(_def_cSrcTrans)+(((_def_cSrc)<<8L)|(_def_cDst)))>>8L))
@@ -117,7 +117,7 @@ typedef UINT32 ColorData;
 class TOOLS_DLLPUBLIC Color
 {
 protected:
-    ColorData           mnColor;
+    ColorData			mnColor;
 
 public:
                         Color() { mnColor = COL_BLACK; }
@@ -130,41 +130,41 @@ public:
                          // This ctor is defined in svtools, not tools!
 
                         // constructor to create a tools-Color from ::basegfx::BColor
-                        explicit Color(const ::basegfx::BColor& rBColor)
-                        {
-                            mnColor = RGB_COLORDATA(
-                                UINT8((rBColor.getRed() * 255.0) + 0.5),
-                                UINT8((rBColor.getGreen() * 255.0) + 0.5),
+                        explicit Color(const ::basegfx::BColor& rBColor) 
+                        { 
+                            mnColor = RGB_COLORDATA( 
+                                UINT8((rBColor.getRed() * 255.0) + 0.5), 
+                                UINT8((rBColor.getGreen() * 255.0) + 0.5), 
                                 UINT8((rBColor.getBlue() * 255.0) + 0.5));
                         }
 
-    void                SetRed( UINT8 nRed );
-    UINT8               GetRed() const { return COLORDATA_RED( mnColor ); }
-    void                SetGreen( UINT8 nGreen );
-    UINT8               GetGreen() const { return COLORDATA_GREEN( mnColor ); }
-    void                SetBlue( UINT8 nBlue );
-    UINT8               GetBlue() const { return COLORDATA_BLUE( mnColor ); }
-    void                SetTransparency( UINT8 nTransparency );
-    UINT8               GetTransparency() const { return COLORDATA_TRANSPARENCY( mnColor ); }
+    void				SetRed( UINT8 nRed );
+    UINT8				GetRed() const { return COLORDATA_RED( mnColor ); }
+    void				SetGreen( UINT8 nGreen );
+    UINT8				GetGreen() const { return COLORDATA_GREEN( mnColor ); }
+    void				SetBlue( UINT8 nBlue );
+    UINT8				GetBlue() const { return COLORDATA_BLUE( mnColor ); }
+    void				SetTransparency( UINT8 nTransparency );
+    UINT8				GetTransparency() const { return COLORDATA_TRANSPARENCY( mnColor ); }
 
-    void                SetColor( ColorData nColor ) { mnColor = nColor; }
-    ColorData           GetColor() const { return mnColor; }
-    ColorData           GetRGBColor() const { return COLORDATA_RGB( mnColor ); }
+    void				SetColor( ColorData nColor ) { mnColor = nColor; }
+    ColorData			GetColor() const { return mnColor; }
+    ColorData			GetRGBColor() const { return COLORDATA_RGB( mnColor ); }
 
-    UINT8               GetColorError( const Color& rCompareColor ) const;
+    UINT8				GetColorError( const Color& rCompareColor ) const;
 
-    UINT8               GetLuminance() const;
-    void                IncreaseLuminance( UINT8 cLumInc );
-    void                DecreaseLuminance( UINT8 cLumDec );
+    UINT8				GetLuminance() const;
+    void				IncreaseLuminance( UINT8 cLumInc );
+    void				DecreaseLuminance( UINT8 cLumDec );
 
-    void                IncreaseContrast( UINT8 cContInc );
-    void                DecreaseContrast( UINT8 cContDec );
+    void				IncreaseContrast( UINT8 cContInc );
+    void				DecreaseContrast( UINT8 cContDec );
 
-    void                Invert();
+    void				Invert();
 
-    void                Merge( const Color& rMergeColor, BYTE cTransparency );
+    void				Merge( const Color& rMergeColor, BYTE cTransparency );
 
-    BOOL                IsRGBEqual( const Color& rColor ) const;
+    BOOL				IsRGBEqual( const Color& rColor ) const;
 
     // comparison with luminance thresholds
     BOOL                IsDark()    const;
@@ -178,16 +178,16 @@ public:
     static ColorData    HSBtoRGB( USHORT nHue, USHORT nSat, USHORT nBri );
     void                RGBtoHSB( USHORT& nHue, USHORT& nSat, USHORT& nBri ) const;
 
-    BOOL                operator==( const Color& rColor ) const
+    BOOL				operator==( const Color& rColor ) const
                             { return (mnColor == rColor.mnColor); }
-    BOOL                operator!=( const Color& rColor ) const
+    BOOL				operator!=( const Color& rColor ) const
                             { return !(Color::operator==( rColor )); }
 
-    SvStream&           Read( SvStream& rIStm, BOOL bNewFormat = TRUE );
-    SvStream&           Write( SvStream& rOStm, BOOL bNewFormat = TRUE );
+    SvStream&			Read( SvStream& rIStm, BOOL bNewFormat = TRUE );
+    SvStream&			Write( SvStream& rOStm, BOOL bNewFormat = TRUE );
 
-    TOOLS_DLLPUBLIC friend SvStream&    operator>>( SvStream& rIStream, Color& rColor );
-    TOOLS_DLLPUBLIC friend SvStream&    operator<<( SvStream& rOStream, const Color& rColor );
+    TOOLS_DLLPUBLIC friend SvStream&	operator>>( SvStream& rIStream, Color& rColor );
+    TOOLS_DLLPUBLIC friend SvStream&	operator<<( SvStream& rOStream, const Color& rColor );
 
     // get ::basegfx::BColor from this color
     ::basegfx::BColor getBColor() const { return ::basegfx::BColor(GetRed() / 255.0, GetGreen() / 255.0, GetBlue() / 255.0); }
diff --git a/tools/inc/tools/config.hxx b/tools/inc/tools/config.hxx
index cb64cc2ec5bd..95977ea456fd 100644
--- a/tools/inc/tools/config.hxx
+++ b/tools/inc/tools/config.hxx
@@ -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
@@ -40,18 +40,18 @@ struct ImplGroupData;
 class TOOLS_DLLPUBLIC Config
 {
 private:
-    XubString           maFileName;
-    ByteString          maGroupName;
-    ImplConfigData*     mpData;
-    ImplGroupData*      mpActGroup;
-    ULONG               mnDataUpdateId;
-    USHORT              mnLockCount;
-    BOOL                mbPersistence;
-    BOOL                mbDummy1;
+    XubString			maFileName;
+    ByteString			maGroupName;
+    ImplConfigData* 	mpData;
+    ImplGroupData*		mpActGroup;
+    ULONG				mnDataUpdateId;
+    USHORT				mnLockCount;
+    BOOL				mbPersistence;
+    BOOL				mbDummy1;
 
 #ifdef _CONFIG_CXX
-    TOOLS_DLLPRIVATE BOOL               ImplUpdateConfig() const;
-    TOOLS_DLLPRIVATE ImplGroupData*     ImplGetGroup() const;
+    TOOLS_DLLPRIVATE BOOL				ImplUpdateConfig() const;
+    TOOLS_DLLPRIVATE ImplGroupData*		ImplGetGroup() const;
 #endif
 
 public:
@@ -59,43 +59,43 @@ public:
                         Config( const XubString& rFileName );
                         ~Config();
 
-    const XubString&    GetPathName() const { return maFileName; }
-    static XubString    GetDefDirectory();
-    static XubString    GetConfigName( const XubString& rPath, const XubString& rBaseName );
+    const XubString&	GetPathName() const { return maFileName; }
+    static XubString	GetDefDirectory();
+    static XubString	GetConfigName( const XubString& rPath, const XubString& rBaseName );
 
-    void                SetGroup( const ByteString& rGroup );
-    const ByteString&   GetGroup() const { return maGroupName; }
-    void                DeleteGroup( const ByteString& rGroup );
-    ByteString          GetGroupName( USHORT nGroup ) const;
-    USHORT              GetGroupCount() const;
-    BOOL                HasGroup( const ByteString& rGroup ) const;
+    void				SetGroup( const ByteString& rGroup );
+    const ByteString&	GetGroup() const { return maGroupName; }
+    void				DeleteGroup( const ByteString& rGroup );
+    ByteString			GetGroupName( USHORT nGroup ) const;
+    USHORT				GetGroupCount() const;
+    BOOL				HasGroup( const ByteString& rGroup ) const;
 
-    ByteString          ReadKey( const ByteString& rKey ) const;
-    UniString           ReadKey( const ByteString& rKey, rtl_TextEncoding eEncoding ) const;
-    ByteString          ReadKey( const ByteString& rKey, const ByteString& rDefault ) const;
-    void                WriteKey( const ByteString& rKey, const ByteString& rValue );
-    void                WriteKey( const ByteString& rKey, const UniString& rValue, rtl_TextEncoding eEncoding );
-    void                DeleteKey( const ByteString& rKey );
-    ByteString          GetKeyName( USHORT nKey ) const;
-    ByteString          ReadKey( USHORT nKey ) const;
-    USHORT              GetKeyCount() const;
+    ByteString			ReadKey( const ByteString& rKey ) const;
+    UniString			ReadKey( const ByteString& rKey, rtl_TextEncoding eEncoding ) const;
+    ByteString			ReadKey( const ByteString& rKey, const ByteString& rDefault ) const;
+    void				WriteKey( const ByteString& rKey, const ByteString& rValue );
+    void				WriteKey( const ByteString& rKey, const UniString& rValue, rtl_TextEncoding eEncoding );
+    void				DeleteKey( const ByteString& rKey );
+    ByteString			GetKeyName( USHORT nKey ) const;
+    ByteString			ReadKey( USHORT nKey ) const;
+    USHORT				GetKeyCount() const;
 
-    void                EnterLock();
-    void                LeaveLock();
-    BOOL                IsLocked() const { return (mnLockCount != 0); }
-    BOOL                Update();
-    void                Flush();
+    void				EnterLock();
+    void				LeaveLock();
+    BOOL				IsLocked() const { return (mnLockCount != 0); }
+    BOOL				Update();
+    void				Flush();
 
-    void                EnablePersistence( BOOL bPersistence = TRUE )
+    void				EnablePersistence( BOOL bPersistence = TRUE )
                             { mbPersistence = bPersistence; }
-    BOOL                IsPersistenceEnabled() const { return mbPersistence; }
+    BOOL				IsPersistenceEnabled() const { return mbPersistence; }
 
-    void                SetLineEnd( LineEnd eLineEnd );
-    LineEnd             GetLineEnd() const;
+    void				SetLineEnd( LineEnd eLineEnd );
+    LineEnd 			GetLineEnd() const;
 
 private:
-    TOOLS_DLLPRIVATE                Config( const Config& rConfig );
-    TOOLS_DLLPRIVATE Config&            operator = ( const Config& rConfig );
+    TOOLS_DLLPRIVATE 				Config( const Config& rConfig );
+    TOOLS_DLLPRIVATE Config& 			operator = ( const Config& rConfig );
 };
 
 #endif // _SV_CONFIG_HXX
diff --git a/tools/inc/tools/contnr.hxx b/tools/inc/tools/contnr.hxx
index 5cf8e7b74569..c2fdc20de0e4 100644
--- a/tools/inc/tools/contnr.hxx
+++ b/tools/inc/tools/contnr.hxx
@@ -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
diff --git a/tools/inc/tools/date.hxx b/tools/inc/tools/date.hxx
index 50b31edb0f83..43bbf9472d69 100644
--- a/tools/inc/tools/date.hxx
+++ b/tools/inc/tools/date.hxx
@@ -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
@@ -46,7 +46,7 @@ enum DayOfWeek { MONDAY, TUESDAY, WEDNESDAY, THURSDAY, FRIDAY,
 class TOOLS_DLLPUBLIC Date
 {
 private:
-    sal_uInt32      nDate;
+    sal_uInt32		nDate;
 
 public:
                     Date();
@@ -59,59 +59,59 @@ public:
                                   ( ( sal_uInt32( nMonth % 100 ) ) * 100 ) +
                                   ( ( sal_uInt32( nYear  % 10000 ) ) * 10000); }
 
-    void            SetDate( sal_uInt32 nNewDate ) { nDate = nNewDate; }
-    sal_uInt32      GetDate() const { return nDate; }
+    void			SetDate( sal_uInt32 nNewDate ) { nDate = nNewDate; }
+    sal_uInt32		GetDate() const { return nDate; }
 
-    void            SetDay( USHORT nNewDay );
-    void            SetMonth( USHORT nNewMonth );
-    void            SetYear( USHORT nNewYear );
-    USHORT          GetDay() const { return (USHORT)(nDate % 100); }
-    USHORT          GetMonth() const { return (USHORT)((nDate / 100) % 100); }
-    USHORT          GetYear() const { return (USHORT)(nDate / 10000); }
+    void			SetDay( USHORT nNewDay );
+    void			SetMonth( USHORT nNewMonth );
+    void			SetYear( USHORT nNewYear );
+    USHORT			GetDay() const { return (USHORT)(nDate % 100); }
+    USHORT			GetMonth() const { return (USHORT)((nDate / 100) % 100); }
+    USHORT			GetYear() const { return (USHORT)(nDate / 10000); }
 
-    DayOfWeek       GetDayOfWeek() const;
-    USHORT          GetDayOfYear() const;
+    DayOfWeek		GetDayOfWeek() const;
+    USHORT			GetDayOfYear() const;
     /** nMinimumNumberOfDaysInWeek: how many days of a week must reside in the
         first week of a year. */
-    USHORT          GetWeekOfYear( DayOfWeek eStartDay = MONDAY,
+    USHORT			GetWeekOfYear( DayOfWeek eStartDay = MONDAY,
                                    sal_Int16 nMinimumNumberOfDaysInWeek = 4 ) const;
 
-    USHORT          GetDaysInMonth() const;
-    USHORT          GetDaysInYear() const { return (IsLeapYear()) ? 366 : 365; }
-    BOOL            IsLeapYear() const;
-    BOOL            IsValid() const;
+    USHORT			GetDaysInMonth() const;
+    USHORT			GetDaysInYear() const { return (IsLeapYear()) ? 366 : 365; }
+    BOOL			IsLeapYear() const;
+    BOOL			IsValid() const;
 
-    BOOL            IsBetween( const Date& rFrom, const Date& rTo ) const
+    BOOL			IsBetween( const Date& rFrom, const Date& rTo ) const
                         { return ((nDate >= rFrom.nDate) &&
                                  (nDate <= rTo.nDate)); }
 
-    BOOL            operator ==( const Date& rDate ) const
+    BOOL			operator ==( const Date& rDate ) const
                         { return (nDate == rDate.nDate); }
-    BOOL            operator !=( const Date& rDate ) const
+    BOOL			operator !=( const Date& rDate ) const
                         { return (nDate != rDate.nDate); }
-    BOOL            operator  >( const Date& rDate ) const
+    BOOL			operator  >( const Date& rDate ) const
                         { return (nDate > rDate.nDate); }
-    BOOL            operator  <( const Date& rDate ) const
+    BOOL			operator  <( const Date& rDate ) const
                         { return (nDate < rDate.nDate); }
-    BOOL            operator >=( const Date& rDate ) const
+    BOOL			operator >=( const Date& rDate ) const
                         { return (nDate >= rDate.nDate); }
-    BOOL            operator <=( const Date& rDate ) const
+    BOOL			operator <=( const Date& rDate ) const
                         { return (nDate <= rDate.nDate); }
 
-    Date&           operator =( const Date& rDate )
+    Date&			operator =( const Date& rDate )
                         { nDate = rDate.nDate; return *this; }
-    Date&           operator +=( long nDays );
-    Date&           operator -=( long nDays );
-    Date&           operator ++();
-    Date&           operator --();
+    Date&			operator +=( long nDays );
+    Date&			operator -=( long nDays );
+    Date&			operator ++();
+    Date&			operator --();
 #ifndef MPW33
-    Date            operator ++( int );
-    Date            operator --( int );
+    Date			operator ++( int );
+    Date			operator --( int );
 #endif
 
-    TOOLS_DLLPUBLIC friend Date     operator +( const Date& rDate, long nDays );
-    TOOLS_DLLPUBLIC friend Date     operator -( const Date& rDate, long nDays );
-    TOOLS_DLLPUBLIC friend long     operator -( const Date& rDate1, const Date& rDate2 );
+    TOOLS_DLLPUBLIC friend Date 	operator +( const Date& rDate, long nDays );
+    TOOLS_DLLPUBLIC friend Date 	operator -( const Date& rDate, long nDays );
+    TOOLS_DLLPUBLIC friend long 	operator -( const Date& rDate1, const Date& rDate2 );
 
     static long DateToDays( USHORT nDay, USHORT nMonth, USHORT nYear );
 
diff --git a/tools/inc/tools/datetime.hxx b/tools/inc/tools/datetime.hxx
index 1a782486250b..c4cf26a4b0db 100644
--- a/tools/inc/tools/datetime.hxx
+++ b/tools/inc/tools/datetime.hxx
@@ -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
@@ -78,8 +78,8 @@ public:
                         { Date::operator+=( nDays ); return *this; }
     DateTime&       operator -=( long nDays )
                         { Date::operator-=( nDays ); return *this; }
-    DateTime&       operator +=( double fTimeInDays );
-    DateTime&       operator -=( double fTimeInDays )
+    DateTime&		operator +=( double fTimeInDays );
+    DateTime&		operator -=( double fTimeInDays )
                         { return operator+=( -fTimeInDays ); }
     DateTime&       operator +=( const Time& rTime );
     DateTime&       operator -=( const Time& rTime );
@@ -91,8 +91,8 @@ public:
                         { return operator+( rDateTime, -fTimeInDays ); }
     TOOLS_DLLPUBLIC friend DateTime operator +( const DateTime& rDateTime, const Time& rTime );
     TOOLS_DLLPUBLIC friend DateTime operator -( const DateTime& rDateTime, const Time& rTime );
-    TOOLS_DLLPUBLIC friend double   operator -( const DateTime& rDateTime1, const DateTime& rDateTime2 );
-    TOOLS_DLLPUBLIC friend long     operator -( const DateTime& rDateTime, const Date& rDate )
+    TOOLS_DLLPUBLIC friend double	operator -( const DateTime& rDateTime1, const DateTime& rDateTime2 );
+    TOOLS_DLLPUBLIC friend long		operator -( const DateTime& rDateTime, const Date& rDate )
                         { return (const Date&) rDateTime - rDate; }
 
     DateTime&       operator =( const DateTime& rDateTime );
diff --git a/tools/inc/tools/debug.hxx b/tools/inc/tools/debug.hxx
index b8aa1c8b59fe..5dff4f3c2f4b 100644
--- a/tools/inc/tools/debug.hxx
+++ b/tools/inc/tools/debug.hxx
@@ -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
@@ -725,7 +725,7 @@ typedef const sal_Char* (*DbgUsr)(const void* pThis );
 #define DBG_ENDAPPEXECUTE() ((void)0)
 
 #define DBG_MEMTEST() ((void)0)
-#define DBG_MEMTEST_PTR( p ) ((void)0)
+#define DBG_MEMTEST_PTR( p ) ((void)0)             
 
 #define DBG_NAME( aName )
 #define DBG_NAMEEX( aName )
diff --git a/tools/inc/tools/diagnose_ex.h b/tools/inc/tools/diagnose_ex.h
index b244d11dc305..c0646a46ec21 100644
--- a/tools/inc/tools/diagnose_ex.h
+++ b/tools/inc/tools/diagnose_ex.h
@@ -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
diff --git a/tools/inc/tools/download.hxx b/tools/inc/tools/download.hxx
index b187433927cd..08cc71280b59 100644
--- a/tools/inc/tools/download.hxx
+++ b/tools/inc/tools/download.hxx
@@ -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
@@ -32,13 +32,13 @@
 class String;
 class Link;
 
-#define DOWNLOAD_SUCCESS    0
-#define DOWNLOAD_CONNECT    1
-#define DOWNLOAD_LOCATION   2
-#define DOWNLOAD_ABORT      3
-#define DOWNLOAD_FILEACCESS 4
-#define DOWNLOAD_INSTALL    5
-#define DOWNLOAD_ERROR      6
+#define DOWNLOAD_SUCCESS	0
+#define DOWNLOAD_CONNECT	1
+#define DOWNLOAD_LOCATION	2
+#define DOWNLOAD_ABORT		3
+#define DOWNLOAD_FILEACCESS	4
+#define DOWNLOAD_INSTALL	5
+#define DOWNLOAD_ERROR		6
 
 class Downloader
 /* ***************************************************************************
diff --git a/tools/inc/tools/dynary.hxx b/tools/inc/tools/dynary.hxx
index 1693be40e435..df3ee25f6d9c 100644
--- a/tools/inc/tools/dynary.hxx
+++ b/tools/inc/tools/dynary.hxx
@@ -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
@@ -75,9 +75,9 @@ public:
 class ClassName : private DynArray                                      \
 {                                                                       \
 public:                                                                 \
-                using DynArray::SetSize;                                \
-                using DynArray::GetSize;                                \
-                using DynArray::Clear;                                  \
+                using DynArray::SetSize;								\
+                using DynArray::GetSize;								\
+                using DynArray::Clear;									\
                                                                         \
                 ClassName( ULONG nSize = 16 ) :                         \
                     DynArray( nSize ) {}                                \
diff --git a/tools/inc/tools/eacopier.hxx b/tools/inc/tools/eacopier.hxx
index c80eeb0d35cc..000df07fc6d3 100644
--- a/tools/inc/tools/eacopier.hxx
+++ b/tools/inc/tools/eacopier.hxx
@@ -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
@@ -33,14 +33,14 @@ class SvFileStream;
 
 class EA_Copier
 {
-    static EA_Copier*   _pCopier;
+    static EA_Copier*	_pCopier;
 
 public:
-    static void         Register( EA_Copier* pCopier );
-    static EA_Copier*   Get();
+    static void 		Register( EA_Copier* pCopier );
+    static EA_Copier*	Get();
 
-    virtual             ~EA_Copier();
-    virtual BOOL        Copy( const SvFileStream& rFrom, const SvFileStream& rTo ) const = 0;
+    virtual 			~EA_Copier();
+    virtual BOOL		Copy( const SvFileStream& rFrom, const SvFileStream& rTo ) const = 0;
 };
 
 #endif
diff --git a/tools/inc/tools/errcode.hxx b/tools/inc/tools/errcode.hxx
index cf767b842b7a..ced3b3ac700a 100644
--- a/tools/inc/tools/errcode.hxx
+++ b/tools/inc/tools/errcode.hxx
@@ -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
@@ -120,10 +120,10 @@ inline ULONG ERRCODE_TOERROR( ULONG x )
 #define ERRCODE_AREA_SVX_END             (ERRCODE_AREA_SO-1)
 #define ERRCODE_AREA_SO                  (9UL   << ERRCODE_AREA_SHIFT)
 #define ERRCODE_AREA_SO_END              (ERRCODE_AREA_SBX-1)
-#define ERRCODE_AREA_SBX                 (10UL   << ERRCODE_AREA_SHIFT)
-#define ERRCODE_AREA_SBX_END             ((11UL  << ERRCODE_AREA_SHIFT) - 1)
-#define ERRCODE_AREA_DB                  (11UL   << ERRCODE_AREA_SHIFT)
-#define ERRCODE_AREA_DB_END              ((12UL  << ERRCODE_AREA_SHIFT) - 1)
+#define ERRCODE_AREA_SBX				 (10UL   << ERRCODE_AREA_SHIFT)
+#define ERRCODE_AREA_SBX_END			 ((11UL  << ERRCODE_AREA_SHIFT) - 1)
+#define ERRCODE_AREA_DB 				 (11UL   << ERRCODE_AREA_SHIFT)
+#define ERRCODE_AREA_DB_END			 	 ((12UL  << ERRCODE_AREA_SHIFT) - 1)
 #define ERRCODE_AREA_JAVA                (12UL  << ERRCODE_AREA_SHIFT)
 #define ERRCODE_AREA_JAVA_END            ((13UL  << ERRCODE_AREA_SHIFT) - 1)
 #define ERRCODE_AREA_UUI                 (13UL  << ERRCODE_AREA_SHIFT)
@@ -173,9 +173,9 @@ inline ULONG ERRCODE_TOERROR( ULONG x )
 #define ERRCODE_CLASS_EXPORT             (18UL  << ERRCODE_CLASS_SHIFT)
 #define ERRCODE_CLASS_FILTER             (19UL  << ERRCODE_CLASS_SHIFT)
 #define ERRCODE_CLASS_SO                 (20UL  << ERRCODE_CLASS_SHIFT)
-#define ERRCODE_CLASS_SBX                (21UL  << ERRCODE_CLASS_SHIFT)
-#define ERRCODE_CLASS_RUNTIME            (22UL  << ERRCODE_CLASS_SHIFT)
-#define ERRCODE_CLASS_COMPILER           (23UL  << ERRCODE_CLASS_SHIFT)
+#define ERRCODE_CLASS_SBX				 (21UL  << ERRCODE_CLASS_SHIFT)
+#define ERRCODE_CLASS_RUNTIME			 (22UL  << ERRCODE_CLASS_SHIFT)
+#define ERRCODE_CLASS_COMPILER			 (23UL  << ERRCODE_CLASS_SHIFT)
 
 #define ERRCODE_NONE                  (0UL)
 #define ERRCODE_ABORT                 ERRCODE_IO_ABORT
@@ -238,23 +238,23 @@ inline ULONG ERRCODE_TOERROR( ULONG x )
                                          ERRCODE_AREA_IO)
 #define ERRCODE_IO_RECURSIVE          (30UL |ERRCODE_CLASS_PARAMETER|\
                                          ERRCODE_AREA_IO)
-#define ERRCODE_IO_NAMETOOLONG        (31UL |ERRCODE_CLASS_PARAMETER|\
+#define ERRCODE_IO_NAMETOOLONG		  (31UL |ERRCODE_CLASS_PARAMETER|\
                                          ERRCODE_AREA_IO)
-#define ERRCODE_IO_INVALIDLENGTH      (32UL |ERRCODE_CLASS_PARAMETER|\
+#define ERRCODE_IO_INVALIDLENGTH	  (32UL |ERRCODE_CLASS_PARAMETER|\
                                          ERRCODE_AREA_IO)
-#define ERRCODE_IO_CURRENTDIR         (33UL |ERRCODE_CLASS_PARAMETER|\
+#define ERRCODE_IO_CURRENTDIR		  (33UL |ERRCODE_CLASS_PARAMETER|\
                                          ERRCODE_AREA_IO)
-#define ERRCODE_IO_NOTSAMEDEVICE      (34UL |ERRCODE_CLASS_PARAMETER|\
+#define ERRCODE_IO_NOTSAMEDEVICE	  (34UL |ERRCODE_CLASS_PARAMETER|\
                                          ERRCODE_AREA_IO)
-#define ERRCODE_IO_DEVICENOTREADY     (35UL |ERRCODE_CLASS_READ|\
+#define ERRCODE_IO_DEVICENOTREADY	  (35UL |ERRCODE_CLASS_READ|\
                                          ERRCODE_AREA_IO)
-#define ERRCODE_IO_BADCRC             (36UL |ERRCODE_CLASS_READ|\
+#define ERRCODE_IO_BADCRC			  (36UL |ERRCODE_CLASS_READ|\
                                          ERRCODE_AREA_IO)
-#define ERRCODE_IO_WRITEPROTECTED     (37UL |ERRCODE_CLASS_ACCESS|\
+#define ERRCODE_IO_WRITEPROTECTED	  (37UL |ERRCODE_CLASS_ACCESS|\
                                          ERRCODE_AREA_IO)
-#define ERRCODE_IO_BROKENPACKAGE      (38UL |ERRCODE_CLASS_FORMAT|\
+#define ERRCODE_IO_BROKENPACKAGE	  (38UL |ERRCODE_CLASS_FORMAT|\
                                          ERRCODE_AREA_IO)
-#define ERRCODE_IO_NOTSTORABLEINBINARYFORMAT      (39UL |ERRCODE_CLASS_FORMAT|\
+#define ERRCODE_IO_NOTSTORABLEINBINARYFORMAT	  (39UL |ERRCODE_CLASS_FORMAT|\
                                          ERRCODE_AREA_IO)
 
 // FsysErrorCodes
diff --git a/tools/inc/tools/errinf.hxx b/tools/inc/tools/errinf.hxx
index 45141af278b1..21867456fdd2 100644
--- a/tools/inc/tools/errinf.hxx
+++ b/tools/inc/tools/errinf.hxx
@@ -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
@@ -202,14 +202,14 @@ class TOOLS_DLLPUBLIC ErrorHandler
 private:
     ErrHdl_Impl*        pImpl;
 
-    static USHORT       HandleError_Impl( ULONG lId,
-                      USHORT nFlags,
-                      BOOL bJustCreateString,
+    static USHORT       HandleError_Impl( ULONG lId, 
+                      USHORT nFlags, 
+                      BOOL bJustCreateString, 
                       String & rError);
 protected:
-    virtual BOOL        CreateString( const ErrorInfo *,
+    virtual BOOL        CreateString( const ErrorInfo *, 
                       String &, USHORT& nMask ) const = 0;
-            BOOL        ForwCreateString( const ErrorInfo*,
+            BOOL        ForwCreateString( const ErrorInfo*, 
                       String&, USHORT& nMask ) const;
 
 public:
@@ -231,7 +231,7 @@ public:
 class TOOLS_DLLPUBLIC SimpleErrorHandler : private ErrorHandler
 {
 protected:
-    virtual BOOL        CreateString( const ErrorInfo*, String &,
+    virtual BOOL        CreateString( const ErrorInfo*, String &, 
                                       USHORT &nMask ) const;
 
 public:
diff --git a/tools/inc/tools/extendapplicationenvironment.hxx b/tools/inc/tools/extendapplicationenvironment.hxx
index 05eac33effba..6c435a0ab0bc 100644
--- a/tools/inc/tools/extendapplicationenvironment.hxx
+++ b/tools/inc/tools/extendapplicationenvironment.hxx
@@ -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
diff --git a/tools/inc/tools/fldunit.hxx b/tools/inc/tools/fldunit.hxx
index 637539f6dd6f..d3d7dcada5ca 100644
--- a/tools/inc/tools/fldunit.hxx
+++ b/tools/inc/tools/fldunit.hxx
@@ -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
@@ -35,7 +35,7 @@
 // By changes you must also change: rsc/vclrsc.hxx
 enum FieldUnit { FUNIT_NONE, FUNIT_MM, FUNIT_CM, FUNIT_M, FUNIT_KM,
                  FUNIT_TWIP, FUNIT_POINT, FUNIT_PICA,
-                 FUNIT_INCH, FUNIT_FOOT, FUNIT_MILE, FUNIT_CUSTOM,
+                 FUNIT_INCH, FUNIT_FOOT, FUNIT_MILE, FUNIT_CHAR, FUNIT_LINE, FUNIT_CUSTOM,
                  FUNIT_PERCENT, FUNIT_100TH_MM };
 
 #endif // _TOOLS_FLDUNIT_HXX
diff --git a/tools/inc/tools/fontenum.hxx b/tools/inc/tools/fontenum.hxx
index 0e0f1b2f7368..c9827ba17e1d 100644
--- a/tools/inc/tools/fontenum.hxx
+++ b/tools/inc/tools/fontenum.hxx
@@ -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
@@ -128,20 +128,20 @@ enum FontStrikeout { STRIKEOUT_NONE, STRIKEOUT_SINGLE, STRIKEOUT_DOUBLE,
 #define ENUM_FONTEMPHASISMARK_DECLARED
 
 typedef USHORT FontEmphasisMark;
-#define EMPHASISMARK_NONE           ((FontEmphasisMark)0x0000)
-#define EMPHASISMARK_DOT            ((FontEmphasisMark)0x0001)
-#define EMPHASISMARK_CIRCLE         ((FontEmphasisMark)0x0002)
-#define EMPHASISMARK_DISC           ((FontEmphasisMark)0x0003)
-#define EMPHASISMARK_ACCENT         ((FontEmphasisMark)0x0004)
-#define EMPHASISMARK_STYLE          ((FontEmphasisMark)0x00FF)
-#define EMPHASISMARK_POS_ABOVE      ((FontEmphasisMark)0x1000)
-#define EMPHASISMARK_POS_BELOW      ((FontEmphasisMark)0x2000)
+#define EMPHASISMARK_NONE			((FontEmphasisMark)0x0000)
+#define EMPHASISMARK_DOT			((FontEmphasisMark)0x0001)
+#define EMPHASISMARK_CIRCLE 		((FontEmphasisMark)0x0002)
+#define EMPHASISMARK_DISC			((FontEmphasisMark)0x0003)
+#define EMPHASISMARK_ACCENT 		((FontEmphasisMark)0x0004)
+#define EMPHASISMARK_STYLE			((FontEmphasisMark)0x00FF)
+#define EMPHASISMARK_POS_ABOVE		((FontEmphasisMark)0x1000)
+#define EMPHASISMARK_POS_BELOW		((FontEmphasisMark)0x2000)
 
 // Only for kompability
-#define EMPHASISMARK_DOTS_ABOVE     (EMPHASISMARK_DOT | EMPHASISMARK_POS_ABOVE)
-#define EMPHASISMARK_DOTS_BELOW     (EMPHASISMARK_DOT | EMPHASISMARK_POS_BELOW)
-#define EMPHASISMARK_SIDE_DOTS      (EMPHASISMARK_ACCENT | EMPHASISMARK_POS_ABOVE)
-#define EMPHASISMARK_CIRCLE_ABOVE   (EMPHASISMARK_CIRCLE | EMPHASISMARK_POS_ABOVE)
+#define EMPHASISMARK_DOTS_ABOVE 	(EMPHASISMARK_DOT | EMPHASISMARK_POS_ABOVE)
+#define EMPHASISMARK_DOTS_BELOW 	(EMPHASISMARK_DOT | EMPHASISMARK_POS_BELOW)
+#define EMPHASISMARK_SIDE_DOTS		(EMPHASISMARK_ACCENT | EMPHASISMARK_POS_ABOVE)
+#define EMPHASISMARK_CIRCLE_ABOVE	(EMPHASISMARK_CIRCLE | EMPHASISMARK_POS_ABOVE)
 
 #endif
 
@@ -169,4 +169,4 @@ enum FontAntiAlias { ANTIALIAS_DONTKNOW, ANTIALIAS_FALSE, ANTIALIAS_TRUE };
 
 #endif
 
-#endif  // _TOOLS_FONTENUM_HXX
+#endif	// _TOOLS_FONTENUM_HXX
diff --git a/tools/inc/tools/fract.hxx b/tools/inc/tools/fract.hxx
index 7769e88ab541..d4138eb12f88 100644
--- a/tools/inc/tools/fract.hxx
+++ b/tools/inc/tools/fract.hxx
@@ -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
diff --git a/tools/inc/tools/fsys.hxx b/tools/inc/tools/fsys.hxx
index 880768c89d8c..1ff0048c143a 100644
--- a/tools/inc/tools/fsys.hxx
+++ b/tools/inc/tools/fsys.hxx
@@ -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
@@ -53,58 +53,58 @@ struct FileCopier_Impl;
 class SvFileStream;
 class BigInt;
 
-#define FSYS_BUFSIZE                1024
-#define FSYS_SHORTNAME_DELIMITER    '@'
+#define FSYS_BUFSIZE				1024
+#define FSYS_SHORTNAME_DELIMITER	'@'
 
 // FSysAccess
 typedef int FSysAccess;
-#define FSYS_ACCESS_FORCED          1
-#define FSYS_ACCESS_FLOPPY          FSYS_ACCESS_FORCED
-#define FSYS_ACCESS_CACHED          2
+#define FSYS_ACCESS_FORCED			1
+#define FSYS_ACCESS_FLOPPY			FSYS_ACCESS_FORCED
+#define FSYS_ACCESS_CACHED			2
 
 // DirEntryKind
 typedef int DirEntryKind;
-#define FSYS_KIND_NONE              ((DirEntryKind)     0)
-#define FSYS_KIND_UNKNOWN           FSYS_KIND_NONE
-#define FSYS_KIND_FILE              ((DirEntryKind)     1)
-#define FSYS_KIND_DIR               ((DirEntryKind)     2)
-#define FSYS_KIND_DEV               ((DirEntryKind)     4)
-#define FSYS_KIND_BLOCK             ((DirEntryKind)     8)
-#define FSYS_KIND_CHAR              ((DirEntryKind)    16)
-#define FSYS_KIND_WILD              ((DirEntryKind)    32)
-#define FSYS_KIND_BLOCK_REMOTE      ((DirEntryKind)    64)  //TPF: fuer RFS
-#define FSYS_KIND_REMOVEABLE        ((DirEntryKind)   128)
-#define FSYS_KIND_FIXED             ((DirEntryKind)   256)
-#define FSYS_KIND_REMOTE            ((DirEntryKind)   512)
-#define FSYS_KIND_RAM               ((DirEntryKind)  1024)
-#define FSYS_KIND_CDROM             ((DirEntryKind)  2048)
-#define FSYS_KIND_ALL               ((DirEntryKind)  4095)
-#define FSYS_KIND_VISIBLE           ((DirEntryKind)  4096)
+#define FSYS_KIND_NONE				((DirEntryKind) 	0)
+#define FSYS_KIND_UNKNOWN			FSYS_KIND_NONE
+#define FSYS_KIND_FILE				((DirEntryKind) 	1)
+#define FSYS_KIND_DIR				((DirEntryKind) 	2)
+#define FSYS_KIND_DEV				((DirEntryKind) 	4)
+#define FSYS_KIND_BLOCK 			((DirEntryKind) 	8)
+#define FSYS_KIND_CHAR				((DirEntryKind)    16)
+#define FSYS_KIND_WILD				((DirEntryKind)    32)
+#define FSYS_KIND_BLOCK_REMOTE		((DirEntryKind)    64)	//TPF: fuer RFS
+#define FSYS_KIND_REMOVEABLE		((DirEntryKind)   128)
+#define FSYS_KIND_FIXED 			((DirEntryKind)   256)
+#define FSYS_KIND_REMOTE			((DirEntryKind)   512)
+#define FSYS_KIND_RAM				((DirEntryKind)  1024)
+#define FSYS_KIND_CDROM 			((DirEntryKind)  2048)
+#define FSYS_KIND_ALL				((DirEntryKind)  4095)
+#define FSYS_KIND_VISIBLE			((DirEntryKind)  4096)
 
 // FSysSort
 typedef int FSysSort;
-#define FSYS_SORT_NONE              ((FSysSort)   0)
-#define FSYS_SORT_SIZE              ((FSysSort)   1)
-#define FSYS_SORT_CREATED           ((FSysSort)   2)
-#define FSYS_SORT_MODIFYED          ((FSysSort)   4)
-#define FSYS_SORT_ACCESSED          ((FSysSort)   8)
-#define FSYS_SORT_ASCENDING         ((FSysSort)  16)
-#define FSYS_SORT_DESCENDING        ((FSysSort)  32)
-#define FSYS_SORT_EXT               ((FSysSort)  64)
-#define FSYS_SORT_NAME              ((FSysSort) 128)
-#define FSYS_SORT_KIND              ((FSysSort) 256)
-#define FSYS_SORT_CREATOR           ((FSysSort) 512)
-#define FSYS_SORT_END               ((FSysSort)1024)
+#define FSYS_SORT_NONE				((FSysSort)   0)
+#define FSYS_SORT_SIZE				((FSysSort)   1)
+#define FSYS_SORT_CREATED			((FSysSort)   2)
+#define FSYS_SORT_MODIFYED			((FSysSort)   4)
+#define FSYS_SORT_ACCESSED			((FSysSort)   8)
+#define FSYS_SORT_ASCENDING 		((FSysSort)  16)
+#define FSYS_SORT_DESCENDING		((FSysSort)  32)
+#define FSYS_SORT_EXT				((FSysSort)  64)
+#define FSYS_SORT_NAME				((FSysSort) 128)
+#define FSYS_SORT_KIND				((FSysSort) 256)
+#define FSYS_SORT_CREATOR			((FSysSort) 512)
+#define FSYS_SORT_END				((FSysSort)1024)
 
 // DirEntryFlag
 enum DirEntryFlag
 {
     FSYS_FLAG_NORMAL,
-    FSYS_FLAG_VOLUME,                      // Dir( FSYS_FLAG_VOLUME ) und GetDevice()
-    FSYS_FLAG_ABSROOT,                     // z.B. "a:\" oder "\"
-    FSYS_FLAG_RELROOT,                     // z.B. "a:", "a:." oder "."
+    FSYS_FLAG_VOLUME,					   // Dir( FSYS_FLAG_VOLUME ) und GetDevice()
+    FSYS_FLAG_ABSROOT,					   // z.B. "a:\" oder "\"
+    FSYS_FLAG_RELROOT,					   // z.B. "a:", "a:." oder "."
     FSYS_FLAG_CURRENT = FSYS_FLAG_RELROOT, // Synonym fuer FSYS_FLAG_RELROOT
-    FSYS_FLAG_PARENT,                      // z.B. ".."
+    FSYS_FLAG_PARENT,					   // z.B. ".."
     FSYS_FLAG_INVALID
 };
 
@@ -131,20 +131,20 @@ enum FSysPathStyle
 
 // FSysAction
 typedef int FSysAction;
-#define FSYS_ACTION_COPYFILE        0x01    // not only create hardlink
-#define FSYS_ACTION_RECURSIVE       0x02    // deep through dircetory structure
-#define FSYS_ACTION_USERECYCLEBIN   0x04    // move to recycle bin
-#define FSYS_ACTION_MOVE            0x08    // delete after copy (=> move)
-#define FSYS_ACTION_CONTINUE        0x10    // continue on error
-#define FSYS_ACTION_KEEP_EXISTING   0x20    // do not overwrite objects in
+#define FSYS_ACTION_COPYFILE		0x01	// not only create hardlink
+#define FSYS_ACTION_RECURSIVE		0x02	// deep through dircetory structure
+#define FSYS_ACTION_USERECYCLEBIN	0x04	// move to recycle bin
+#define FSYS_ACTION_MOVE			0x08	// delete after copy (=> move)
+#define FSYS_ACTION_CONTINUE		0x10	// continue on error
+#define FSYS_ACTION_KEEP_EXISTING	0x20	// do not overwrite objects in
                                             // target folder in case of name
                                             // clashes
-#define FSYS_ACTION_STANDARD        0
+#define FSYS_ACTION_STANDARD		0
 
 // Fuer RFS
-#define RFS_IDENTIFIER  "-rfs-"
-#define RFS_LOWER       "-rfs-"
-#define RFS_UPPER       "-RFS-"
+#define RFS_IDENTIFIER	"-rfs-"
+#define RFS_LOWER		"-rfs-"
+#define RFS_UPPER		"-RFS-"
 
 typedef ULONG FSysError;
 
@@ -182,65 +182,65 @@ String FSys2Gui( const String& rStr );
 struct dirent;
 class TOOLS_DLLPUBLIC FileStat
 {
-    friend class    CORmFSys;
-    friend class    Dir;
-    friend struct   DirReader_Impl;
-    friend void     ImpInitFileStat( FileStat&, dirent* );
-
-    ULONG           nError;
-    DirEntryKind    nKindFlags;
-    ULONG           nSize;
-    String          aCreator;
-    String          aType;
-    Date            aDateCreated;
-    Time            aTimeCreated;
-    Date            aDateModified;
-    Time            aTimeModified;
-    Date            aDateAccessed;
-    Time            aTimeAccessed;
+    friend class	CORmFSys;
+    friend class	Dir;
+    friend struct	DirReader_Impl;
+    friend void 	ImpInitFileStat( FileStat&, dirent* );
+
+    ULONG			nError;
+    DirEntryKind	nKindFlags;
+    ULONG			nSize;
+    String			aCreator;
+    String			aType;
+    Date			aDateCreated;
+    Time			aTimeCreated;
+    Date			aDateModified;
+    Time			aTimeModified;
+    Date			aDateAccessed;
+    Time			aTimeAccessed;
 private:
-    TOOLS_DLLPRIVATE void           ImpInit( void* );
+    TOOLS_DLLPRIVATE void			ImpInit( void* );
 
 protected:
                     // Implementation
-                    FileStat( const void *pInfo,      // CInfoPBRec
+                    FileStat( const void *pInfo,	  // CInfoPBRec
                               const void *pVolInfo ); // ParamBlockRec
 
 public:
                     FileStat();
                     FileStat( const DirEntry& rDirEntry,
                               FSysAccess nAccess = FSYS_ACCESS_FLOPPY );
-    BOOL            Update( const DirEntry& rDirEntry,
+    BOOL			Update( const DirEntry& rDirEntry,
                               BOOL bForceAccess = TRUE );
 
-    ULONG           GetError() const { return ERRCODE_TOERROR(nError); }
-    ULONG           GetErrorCode() const { return nError; }
+    ULONG			GetError() const { return ERRCODE_TOERROR(nError); }
+    ULONG			GetErrorCode() const { return nError; }
 
-    ULONG           GetSize() const { return nSize; }
+    ULONG			GetSize() const { return nSize; }
 
-    DirEntryKind    GetKind() const { return nKindFlags; }
-    BOOL            IsKind( DirEntryKind nKind ) const;
+    DirEntryKind	GetKind() const { return nKindFlags; }
+    BOOL			IsKind( DirEntryKind nKind ) const;
 
-    String          GetType() const { return aType; }
-    String          GetCreator() const { return aCreator; }
+    String			GetType() const { return aType; }
+    String			GetCreator() const { return aCreator; }
 
-    Date            DateCreated() const  { return aDateCreated;  }
-    Time            TimeCreated() const  { return aTimeCreated;  }
-    Date            DateModified() const { return aDateModified; }
-    Time            TimeModified() const { return aTimeModified; }
-    Date            DateAccessed() const { return aDateAccessed; }
-    Time            TimeAccessed() const { return aTimeAccessed; }
-    BOOL            IsYounger( const FileStat& rIsOlder ) const;
+    Date			DateCreated() const  { return aDateCreated;  }
+    Time			TimeCreated() const  { return aTimeCreated;  }
+    Date			DateModified() const { return aDateModified; }
+    Time			TimeModified() const { return aTimeModified; }
+    Date			DateAccessed() const { return aDateAccessed; }
+    Time			TimeAccessed() const { return aTimeAccessed; }
+    BOOL			IsYounger( const FileStat& rIsOlder ) const;
 
 #define TF_FSYS_READONLY_FLAG
-    static ULONG    SetReadOnlyFlag( const DirEntry &rEntry, BOOL bRO = TRUE );
-    static BOOL     GetReadOnlyFlag( const DirEntry &rEntry );
-    static BOOL     HasReadOnlyFlag();
+    static ULONG	SetReadOnlyFlag( const DirEntry &rEntry, BOOL bRO = TRUE );
+    static BOOL 	GetReadOnlyFlag( const DirEntry &rEntry );
+    static BOOL 	HasReadOnlyFlag();
 
-    static ErrCode  QueryDiskSpace( const String &rPath,
+    static ErrCode	QueryDiskSpace( const String &rPath,
                                     BigInt &rFreeBytes, BigInt &rTotalBytes );
 
-    static void     SetDateTime( const String& rFileName,
+    static void 	SetDateTime( const String& rFileName,
                                  const DateTime& rNewDateTime );
 };
 
@@ -258,15 +258,15 @@ friend struct DirReader_Impl;
 friend class FileCopier;
 
 #ifdef FEAT_FSYS_DOUBLESPEED
-    FileStat*           pStat;      // optional
+    FileStat*			pStat;		// optional
 #endif
-    ByteString          aName;
-    DirEntry*           pParent;
-    ULONG               nError;
-    DirEntryFlag        eFlag;
+    ByteString			aName;
+    DirEntry*			pParent;
+    ULONG				nError;
+    DirEntryFlag		eFlag;
 
 private:
-    TOOLS_DLLPRIVATE            DirEntry( const ByteString& rInitName,
+    TOOLS_DLLPRIVATE 			DirEntry( const ByteString& rInitName,
                                   DirEntryFlag aDirFlag,
                                   FSysPathStyle eStyle );
 
@@ -276,34 +276,34 @@ private:
     friend class FileStat;
     friend const char* ImpCheckDirEntry( const void* p );
 
-    TOOLS_DLLPRIVATE FSysError          ImpParseName( const ByteString& rIntiName,
+    TOOLS_DLLPRIVATE FSysError			ImpParseName( const ByteString& rIntiName,
                                       FSysPathStyle eParser );
-    TOOLS_DLLPRIVATE FSysError          ImpParseOs2Name( const ByteString& rPfad,
+    TOOLS_DLLPRIVATE FSysError			ImpParseOs2Name( const ByteString& rPfad,
                                          FSysPathStyle eStyle );
-    TOOLS_DLLPRIVATE FSysError          ImpParseUnixName( const ByteString& rPfad,
+    TOOLS_DLLPRIVATE FSysError			ImpParseUnixName( const ByteString& rPfad,
                                           FSysPathStyle eStyle );
-    TOOLS_DLLPRIVATE USHORT             ImpTryUrl( DirEntryStack& rStack, const String& rPfad, FSysPathStyle eStyle );
-    TOOLS_DLLPRIVATE const DirEntry*    ImpGetTopPtr() const;
-    TOOLS_DLLPRIVATE DirEntry*          ImpGetTopPtr();
-    TOOLS_DLLPRIVATE DirEntry*          ImpGetPreTopPtr();
-    TOOLS_DLLPRIVATE BOOL               ImpToRel( String aStart );
+    TOOLS_DLLPRIVATE USHORT				ImpTryUrl( DirEntryStack& rStack, const String& rPfad, FSysPathStyle eStyle );
+    TOOLS_DLLPRIVATE const DirEntry* 	ImpGetTopPtr() const;
+    TOOLS_DLLPRIVATE DirEntry*			ImpGetTopPtr();
+    TOOLS_DLLPRIVATE DirEntry*			ImpGetPreTopPtr();
+    TOOLS_DLLPRIVATE BOOL				ImpToRel( String aStart );
 
 protected:
-    void                ImpTrim( FSysPathStyle eStyle );
-    const ByteString&   ImpTheName() const;
-    DirEntryFlag        ImpTheFlag() const { return eFlag; };
-    DirEntry*           ImpChangeParent( DirEntry* pNewParent, BOOL bNormalize = TRUE );
-    DirEntry*           ImpGetParent() { return pParent; }
+    void				ImpTrim( FSysPathStyle eStyle );
+    const ByteString&	ImpTheName() const;
+    DirEntryFlag		ImpTheFlag() const { return eFlag; };
+    DirEntry*			ImpChangeParent( DirEntry* pNewParent, BOOL bNormalize = TRUE );
+    DirEntry*			ImpGetParent() { return pParent; }
 #ifdef FEAT_FSYS_DOUBLESPEED
-    FileStat*           ImpGetStat() const { return pStat; }
-    void                ImpSetStat( FileStat *p ) { pStat = p; }
+    FileStat*			ImpGetStat() const { return pStat; }
+    void				ImpSetStat( FileStat *p ) { pStat = p; }
 #endif
 
 //#endif
 
 protected:
-    void                SetError( ULONG nErr ) { nError = nErr; }
-    DirEntry*           GetParent() { return pParent; }
+    void				SetError( ULONG nErr ) { nError = nErr; }
+    DirEntry*			GetParent() { return pParent; }
 public:
                         DirEntry( DirEntryFlag aDirFlag = FSYS_FLAG_CURRENT );
                         DirEntry( const DirEntry& rEntry );
@@ -313,65 +313,65 @@ public:
                                    FSysPathStyle eParser = FSYS_STYLE_HOST );
                         ~DirEntry();
 
-    BOOL                IsLongNameOnFAT() const;
-    BOOL                IsCaseSensitive (FSysPathStyle eFormatter = FSYS_STYLE_HOST) const;
+    BOOL				IsLongNameOnFAT() const;
+    BOOL				IsCaseSensitive (FSysPathStyle eFormatter = FSYS_STYLE_HOST) const;
 
-    ULONG               GetError() const { return nError; }
-    BOOL                IsValid() const;
-    DirEntryFlag        GetFlag() const { return eFlag; };
+    ULONG				GetError() const { return nError; }
+    BOOL				IsValid() const;
+    DirEntryFlag		GetFlag() const { return eFlag; };
 
-    void                SetExtension( const String& rExt, char cSep = '.' );
-    String              GetExtension( char cSep = '.' ) const;
-    String              CutExtension( char cSep = '.' );
-    void                SetName( const String& rName, FSysPathStyle eFormatter = FSYS_STYLE_HOST );
+    void				SetExtension( const String& rExt, char cSep = '.' );
+    String				GetExtension( char cSep = '.' ) const;
+    String				CutExtension( char cSep = '.' );
+    void				SetName( const String& rName, FSysPathStyle eFormatter = FSYS_STYLE_HOST );
     inline const String GetNameDirect() const { return String(aName, osl_getThreadTextEncoding()); }
-    String              GetName( FSysPathStyle eFormatter = FSYS_STYLE_HOST ) const;
-    String              CutName( FSysPathStyle eFormatter = FSYS_STYLE_HOST );
-    void                SetBase( const String& rBase, char cSep = '.' );
-    String              GetBase(char cSep = '.' ) const;
-    DirEntry            GetPath() const;
-    DirEntry            GetDevice() const;
-    String              GetVolume() const;
-    String              GetFull( FSysPathStyle eFormatter = FSYS_STYLE_HOST,
+    String				GetName( FSysPathStyle eFormatter = FSYS_STYLE_HOST ) const;
+    String				CutName( FSysPathStyle eFormatter = FSYS_STYLE_HOST );
+    void				SetBase( const String& rBase, char cSep = '.' );
+    String				GetBase(char cSep = '.' ) const;
+    DirEntry			GetPath() const;
+    DirEntry			GetDevice() const;
+    String				GetVolume() const;
+    String				GetFull( FSysPathStyle eFormatter = FSYS_STYLE_HOST,
                                  BOOL bWithDelimiter = FALSE,
                                  USHORT nMaxChars = STRING_MAXLEN ) const;
 
-    DirEntry            TempName( DirEntryKind = FSYS_KIND_NONE ) const;
+    DirEntry			TempName( DirEntryKind = FSYS_KIND_NONE ) const;
     static const DirEntry& SetTempNameBase( const String &rBaseName );
-    BOOL                MakeShortName( const String& rLongName,
+    BOOL				MakeShortName( const String& rLongName,
                                        DirEntryKind eCreateKind = FSYS_KIND_NONE,
                                        BOOL bUseTilde = TRUE,
                                        FSysPathStyle eStyle = FSYS_STYLE_DETECT );
 
-    bool                IsAbs() const;
-    BOOL                ToAbs();
-    BOOL                Find( const String& rPfad, char cDelim = 0 );
-    BOOL                ToRel();
-    BOOL                ToRel( const DirEntry& rRefDir );
-    USHORT              CutRelParents();
+    bool				IsAbs() const;
+    BOOL				ToAbs();
+    BOOL				Find( const String& rPfad, char cDelim = 0 );
+    BOOL				ToRel();
+    BOOL				ToRel( const DirEntry& rRefDir );
+    USHORT				CutRelParents();
 
-    BOOL                SetCWD( BOOL bSloppy = FALSE ) const;
-    BOOL                MakeDir( BOOL bSloppy = FALSE ) const;
-    BOOL                Exists( FSysAccess nAccess = FSYS_ACCESS_FLOPPY ) const;
-    BOOL                First();
+    BOOL				SetCWD( BOOL bSloppy = FALSE ) const;
+    BOOL				MakeDir( BOOL bSloppy = FALSE ) const;
+    BOOL				Exists( FSysAccess nAccess = FSYS_ACCESS_FLOPPY ) const;
+    BOOL				First();
 
-    USHORT              Level() const;
-    const DirEntry&     operator []( USHORT nParentLevel ) const;
-    BOOL                Contains( const DirEntry &rSubEntry ) const;
+    USHORT				Level() const;
+    const DirEntry& 	operator []( USHORT nParentLevel ) const;
+    BOOL				Contains( const DirEntry &rSubEntry ) const;
 
-    FSysError           CopyTo( const DirEntry& rDestDir,
+    FSysError			CopyTo( const DirEntry& rDestDir,
                                 FSysAction nActions = FSYS_ACTION_STANDARD ) const;
-    FSysError           MoveTo( const DirEntry& rDestDir ) const;
-    FSysError           Kill( FSysAction nActions = FSYS_ACTION_STANDARD ) const;
-
-    DirEntry&           operator =( const DirEntry& rOrigDir );
-    DirEntry            operator +( const DirEntry& rSubDir ) const;
-    DirEntry&           operator +=( const DirEntry& rSubDir );
-    BOOL                operator ==( const DirEntry& rAnotherDir ) const;
-    BOOL                operator !=( const DirEntry& rAnotherDir ) const
+    FSysError			MoveTo( const DirEntry& rDestDir ) const;
+    FSysError			Kill( FSysAction nActions = FSYS_ACTION_STANDARD ) const;
+
+    DirEntry&			operator =( const DirEntry& rOrigDir );
+    DirEntry			operator +( const DirEntry& rSubDir ) const;
+    DirEntry&			operator +=( const DirEntry& rSubDir );
+    BOOL				operator ==( const DirEntry& rAnotherDir ) const;
+    BOOL				operator !=( const DirEntry& rAnotherDir ) const
                             { return !(DirEntry::operator==( rAnotherDir )); }
 
-    StringCompare       NameCompare( const DirEntry &rWith ) const;
+    StringCompare		NameCompare( const DirEntry &rWith ) const;
     inline StringCompare NameCompareDirect( const DirEntry &rWith ) const
                         {
 #ifdef UNX
@@ -381,13 +381,13 @@ public:
 #endif
                         }
 
-    static String       GetAccessDelimiter( FSysPathStyle eFormatter = FSYS_STYLE_HOST );
-    static String       GetSearchDelimiter( FSysPathStyle eFormatter = FSYS_STYLE_HOST );
-    static USHORT       GetMaxNameLen( FSysPathStyle eFormatter = FSYS_STYLE_HOST );
+    static String		GetAccessDelimiter( FSysPathStyle eFormatter = FSYS_STYLE_HOST );
+    static String		GetSearchDelimiter( FSysPathStyle eFormatter = FSYS_STYLE_HOST );
+    static USHORT		GetMaxNameLen( FSysPathStyle eFormatter = FSYS_STYLE_HOST );
     static FSysPathStyle GetPathStyle( const String &rDevice );
-    static String       ConvertNameToSystem( const String & rName );
-    static String       ConvertSystemToName( const String & rName );
-    static BOOL         IsRFSAvailable();
+    static String		ConvertNameToSystem( const String & rName );
+    static String		ConvertSystemToName( const String & rName );
+    static BOOL 		IsRFSAvailable();
 };
 
 // --------------
@@ -396,21 +396,21 @@ public:
 
 class TOOLS_DLLPUBLIC FileCopier
 {
-    DirEntry            aSource;
-    DirEntry            aTarget;
-    ULONG               nBytesTotal;
-    ULONG               nBytesCopied;
-    Link                aProgressLink;
-    USHORT              nBlockSize;
-    FileCopier_Impl*    pImp;
+    DirEntry			aSource;
+    DirEntry			aTarget;
+    ULONG				nBytesTotal;
+    ULONG				nBytesCopied;
+    Link				aProgressLink;
+    USHORT				nBlockSize;
+    FileCopier_Impl*	pImp;
 
 private:
-    TOOLS_DLLPRIVATE FSysError          DoCopy_Impl(
+    TOOLS_DLLPRIVATE FSysError			DoCopy_Impl(
         const DirEntry &rSource, const DirEntry &rTarget );
 
 protected:
-    virtual BOOL        Progress();
-    virtual ErrCode     Error( ErrCode eErr,
+    virtual BOOL		Progress();
+    virtual ErrCode 	Error( ErrCode eErr,
                                const DirEntry *pSource, const DirEntry *pTarget );
 
 public:
@@ -420,31 +420,31 @@ public:
                         FileCopier( const FileCopier &rCopier );
                         virtual ~FileCopier();
 
-    FileCopier&         operator = ( const FileCopier &rCopier );
+    FileCopier& 		operator = ( const FileCopier &rCopier );
 
-    void                SetBlockSize( USHORT nBytes ) { nBlockSize = nBytes; }
-    USHORT              GetBlockSize() const { return nBlockSize; }
+    void				SetBlockSize( USHORT nBytes ) { nBlockSize = nBytes; }
+    USHORT				GetBlockSize() const { return nBlockSize; }
 
-    ULONG               GetBytesTotal() const { return nBytesTotal; }
-    ULONG               GetBytesCopied() const { return nBytesCopied; }
+    ULONG				GetBytesTotal() const { return nBytesTotal; }
+    ULONG				GetBytesCopied() const { return nBytesCopied; }
 
-    void                SetSource( const DirEntry &rSource ) { aSource = rSource; }
-    void                SetTarget( const DirEntry &rTarget ) { aTarget = rTarget; }
-    const DirEntry&     GetSource() const { return aSource; }
-    const DirEntry&     GetTarget() const { return aTarget; }
+    void				SetSource( const DirEntry &rSource ) { aSource = rSource; }
+    void				SetTarget( const DirEntry &rTarget ) { aTarget = rTarget; }
+    const DirEntry& 	GetSource() const { return aSource; }
+    const DirEntry& 	GetTarget() const { return aTarget; }
 
-    FSysError           Execute( FSysAction nActions = FSYS_ACTION_STANDARD );
-    FSysError           ExecuteExact( FSysAction nActions = FSYS_ACTION_STANDARD,
-                                                                 FSysExact  eExact = FSYS_NOTEXACT);
+    FSysError			Execute( FSysAction nActions = FSYS_ACTION_STANDARD );
+    FSysError			ExecuteExact( FSysAction nActions = FSYS_ACTION_STANDARD,
+                                                                 FSysExact	eExact = FSYS_NOTEXACT);
 
-    const DirEntry*     GetErrorSource() const;
-    const DirEntry*     GetErrorTarget() const;
-    ErrCode             GetError() const;
+    const DirEntry* 	GetErrorSource() const;
+    const DirEntry* 	GetErrorTarget() const;
+    ErrCode 			GetError() const;
 
-    void                SetProgressHdl( const Link& rLink ) { aProgressLink = rLink; }
-    const Link&         GetProgressHdl() const { return aProgressLink; }
-    void                SetErrorHdl( const Link& rLink );
-    const Link&         GetErrorHdl() const;
+    void				SetProgressHdl( const Link& rLink ) { aProgressLink = rLink; }
+    const Link& 		GetProgressHdl() const { return aProgressLink; }
+    void				SetErrorHdl( const Link& rLink );
+    const Link& 		GetErrorHdl() const;
 };
 
 // -------
@@ -457,29 +457,29 @@ class TOOLS_DLLPUBLIC Dir : public DirEntry
 friend struct DirReader_Impl;
 friend class CORmFSys;
 
-    DirReader_Impl* pReader;        // systemabhaengig
-    DirEntryList*   pLst;
-    FSysSortList*   pSortLst;       // NULL, wenn kein Sort gefordert
-    FileStatList*   pStatLst;       // NULL, wenn keine Stat's benoetigt
-    WildCard        aNameMask;
+    DirReader_Impl* pReader;		// systemabhaengig
+    DirEntryList*	pLst;
+    FSysSortList*	pSortLst;		// NULL, wenn kein Sort gefordert
+    FileStatList*	pStatLst;		// NULL, wenn keine Stat's benoetigt
+    WildCard		aNameMask;
     DirEntryKind eAttrMask;
 
 private:
-    TOOLS_DLLPRIVATE            Dir( const Dir& );          // not allowed
-    TOOLS_DLLPRIVATE Dir&           operator=( const Dir& );    // not allowed
+    TOOLS_DLLPRIVATE			Dir( const Dir& );			// not allowed
+    TOOLS_DLLPRIVATE Dir&			operator=( const Dir& );	// not allowed
 
 #ifdef _DIR_CXX
-    TOOLS_DLLPRIVATE FSysError      ImpSetSort( std::va_list pArgs, FSysSort nSort );
-    TOOLS_DLLPRIVATE void           Construct( DirEntryKind nKind = FSYS_KIND_DIR|FSYS_KIND_FILE );
+    TOOLS_DLLPRIVATE FSysError		ImpSetSort( std::va_list pArgs, FSysSort nSort );
+    TOOLS_DLLPRIVATE void			Construct( DirEntryKind nKind = FSYS_KIND_DIR|FSYS_KIND_FILE );
 #endif
 
 #ifndef _TOOLS_HXX
 protected:
-    BOOL            ImpInsertPointReached( const DirEntry& rIsSmaller,
+    BOOL			ImpInsertPointReached( const DirEntry& rIsSmaller,
                                            const FileStat& rNewStat,
                                            ULONG nCurPos,
                                            ULONG nSortIndex ) const;
-    void            ImpSortedInsert( const DirEntry *pNewEntry,
+    void			ImpSortedInsert( const DirEntry *pNewEntry,
                                      const FileStat *pNewStat );
 #endif
 
@@ -494,15 +494,15 @@ public:
 
     const WildCard& GetNameMask() const { return aNameMask; }
 
-    FSysError       SetSort( FSysSort nSort, ... );
+    FSysError		SetSort( FSysSort nSort, ... );
 
-    void            Reset();
-    USHORT          Scan( USHORT nCount = 5 );
-    USHORT          Count( BOOL bUpdated = TRUE ) const;
-    BOOL            Update();
+    void			Reset();
+    USHORT			Scan( USHORT nCount = 5 );
+    USHORT			Count( BOOL bUpdated = TRUE ) const;
+    BOOL			Update();
 
-    Dir&            operator +=( const Dir& rDir );
-    DirEntry&       operator []( USHORT nIndex ) const;
+    Dir&			operator +=( const Dir& rDir );
+    DirEntry&		operator []( USHORT nIndex ) const;
 };
 
 // we don't need this stuff for bootstraping
@@ -519,8 +519,8 @@ public:
 
 class FSysRedirector
 {
-    static FSysRedirector*  _pRedirector;
-    static BOOL             _bEnabled;
+    static FSysRedirector*	_pRedirector;
+    static BOOL 			_bEnabled;
 
 public:
     /** This method must called with the one and only instance of the
@@ -528,7 +528,7 @@ public:
 
         <P>It must be called with 0 when the instance is destroyed.
      */
-    static void             Register( FSysRedirector *pRedirector );
+    static void 			Register( FSysRedirector *pRedirector );
 
     //-----------------------------------------------------------------------
     /** This method returns the currently registererd instance of
@@ -536,7 +536,7 @@ public:
 
         <P>If no redirector is registered, it returns 0.
      */
-    static FSysRedirector*  Redirector();
+    static FSysRedirector*	Redirector();
 
     //-----------------------------------------------------------------------
     /** This method is to be used to redirect a file system path.
@@ -556,7 +556,7 @@ public:
                 TRUE, if the path is redirected
                 FALSE, if the path is not redirected (unchanged)
      */
-    static void             DoRedirect( String &rPath );
+    static void 			DoRedirect( String &rPath );
 };
 
 #endif // BOOTSTRP
diff --git a/tools/inc/tools/gen.hxx b/tools/inc/tools/gen.hxx
index 308cc02165ce..315e829e688b 100644
--- a/tools/inc/tools/gen.hxx
+++ b/tools/inc/tools/gen.hxx
@@ -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
@@ -72,23 +72,23 @@ inline long FRound( double fVal )
 class Pair
 {
 public:
-    long                nA;
-    long                nB;
+    long				nA;
+    long				nB;
 
                         Pair();
                         Pair( long nA, long nB );
 
-    long                A() const { return nA; }
-    long                B() const { return nB; }
+    long				A() const { return nA; }
+    long				B() const { return nB; }
 
-    long&               A() { return nA; }
-    long&               B() { return nB; }
+    long&				A() { return nA; }
+    long&				B() { return nB; }
 
-    BOOL                operator == ( const Pair& rPair ) const;
-    BOOL                operator != ( const Pair& rPair ) const;
+    BOOL				operator == ( const Pair& rPair ) const;
+    BOOL				operator != ( const Pair& rPair ) const;
 
-    TOOLS_DLLPUBLIC friend SvStream&    operator>>( SvStream& rIStream, Pair& rPair );
-    TOOLS_DLLPUBLIC friend SvStream&    operator<<( SvStream& rOStream, const Pair& rPair );
+    TOOLS_DLLPUBLIC friend SvStream&	operator>>( SvStream& rIStream, Pair& rPair );
+    TOOLS_DLLPUBLIC friend SvStream&	operator<<( SvStream& rOStream, const Pair& rPair );
 };
 
 inline Pair::Pair()
@@ -122,28 +122,28 @@ public:
                         Point();
                         Point( long nX, long nY );
 
-    long                X() const { return nA; }
-    long                Y() const { return nB; }
+    long				X() const { return nA; }
+    long				Y() const { return nB; }
 
-    long&               X() { return nA; }
-    long&               Y() { return nB; }
+    long&				X() { return nA; }
+    long&				Y() { return nB; }
 
-    void                Move( long nHorzMove, long nVertMove );
-    BOOL                IsAbove( const Point& rPoint ) const;
-    BOOL                IsBelow( const Point& rPoint ) const;
-    BOOL                IsLeft( const Point& rPoint ) const;
-    BOOL                IsRight( const Point& rPoint ) const;
+    void				Move( long nHorzMove, long nVertMove );
+    BOOL				IsAbove( const Point& rPoint ) const;
+    BOOL				IsBelow( const Point& rPoint ) const;
+    BOOL				IsLeft( const Point& rPoint ) const;
+    BOOL				IsRight( const Point& rPoint ) const;
 
-    Point&              operator += ( const Point& rPoint );
-    Point&              operator -= ( const Point& rPoint );
-    Point&              operator *= ( const long nVal );
-    Point&              operator /= ( const long nVal );
+    Point&				operator += ( const Point& rPoint );
+    Point&				operator -= ( const Point& rPoint );
+    Point&				operator *= ( const long nVal );
+    Point&				operator /= ( const long nVal );
 
 #ifdef __BORLANDC__
-    friend Point        operator+( const Point &rVal1, const Point &rVal2 );
-    friend Point        operator-( const Point &rVal1, const Point &rVal2 );
-    friend Point        operator*( const Point &rVal1, const long nVal2 );
-    friend Point        operator/( const Point &rVal1, const long nVal2 );
+    friend Point		operator+( const Point &rVal1, const Point &rVal2 );
+    friend Point		operator-( const Point &rVal1, const Point &rVal2 );
+    friend Point		operator*( const Point &rVal1, const long nVal2 );
+    friend Point		operator/( const Point &rVal1, const long nVal2 );
 #else
     friend inline Point operator+( const Point &rVal1, const Point &rVal2 );
     friend inline Point operator-( const Point &rVal1, const Point &rVal2 );
@@ -151,10 +151,10 @@ public:
     friend inline Point operator/( const Point &rVal1, const long nVal2 );
 #endif
 
-    long                getX() const { return X(); }
-    long                getY() const { return Y(); }
-    void                setX(long nX)  { X() = nX; }
-    void                setY(long nY)  { Y() = nY; }
+    long				getX() const { return X(); }
+    long				getY() const { return Y(); }
+    void				setX(long nX)  { X() = nX; }
+    void				setY(long nY)  { Y() = nY; }
 };
 
 inline Point::Point()
@@ -249,16 +249,16 @@ public:
                     Size();
                     Size( long nWidth, long nHeight );
 
-    long            Width() const  { return nA; }
-    long            Height() const { return nB; }
+    long			Width() const  { return nA; }
+    long			Height() const { return nB; }
 
-    long&           Width()  { return nA; }
-    long&           Height() { return nB; }
+    long&			Width()  { return nA; }
+    long&			Height() { return nB; }
 
-    long                getWidth() const { return Width(); }
-    long                getHeight() const { return Height(); }
-    void                setWidth(long nWidth)  { Width() = nWidth; }
-    void                setHeight(long nHeight)  { Height() = nHeight; }
+    long				getWidth() const { return Width(); }
+    long				getHeight() const { return Height(); }
+    void				setWidth(long nWidth)  { Width() = nWidth; }
+    void				setHeight(long nHeight)  { Height() = nHeight; }
 };
 
 inline Size::Size()
@@ -274,8 +274,8 @@ inline Size::Size( long nWidth, long nHeight ) :
 // - Range -
 // ---------
 
-#define RANGE_MIN   LONG_MIN
-#define RANGE_MAX   LONG_MAX
+#define RANGE_MIN	LONG_MIN
+#define RANGE_MAX	LONG_MAX
 
 class Range : public Pair
 {
@@ -283,16 +283,16 @@ public:
                     Range();
                     Range( long nMin, long nMax );
 
-    long            Min() const { return nA; }
-    long            Max() const { return nB; }
-    long            Len() const { return nB - nA + 1; }
+    long			Min() const { return nA; }
+    long			Max() const { return nB; }
+    long			Len() const { return nB - nA + 1; }
 
-    long&           Min() { return nA; }
-    long&           Max() { return nB; }
+    long&			Min() { return nA; }
+    long&			Max() { return nB; }
 
-    BOOL            IsInside( long nIs ) const;
+    BOOL			IsInside( long nIs ) const;
 
-    void            Justify();
+    void			Justify();
 };
 
 inline Range::Range()
@@ -322,8 +322,8 @@ inline void Range::Justify()
 // - Selection -
 // -------------
 
-#define SELECTION_MIN   LONG_MIN
-#define SELECTION_MAX   LONG_MAX
+#define SELECTION_MIN	LONG_MIN
+#define SELECTION_MAX	LONG_MAX
 
 class Selection : public Pair
 {
@@ -332,23 +332,23 @@ public:
                     Selection( long nPos );
                     Selection( long nMin, long nMax );
 
-    long            Min() const { return nA; }
-    long            Max() const { return nB; }
-    long            Len() const { return nB - nA; }
+    long			Min() const { return nA; }
+    long			Max() const { return nB; }
+    long			Len() const { return nB - nA; }
 
-    long&           Min() { return nA; }
-    long&           Max() { return nB; }
+    long&			Min() { return nA; }
+    long&			Max() { return nB; }
 
-    BOOL            IsInside( long nIs ) const;
+    BOOL			IsInside( long nIs ) const;
 
-    void            Justify();
+    void			Justify();
 
-    BOOL            operator !() const { return !Len(); }
+    BOOL			operator !() const { return !Len(); }
 
-    long                getMin() const { return Min(); }
-    long                getMax() const { return Max(); }
-    void                setMin(long nMin)  { Min() = nMin; }
-    void                setMax(long nMax)  { Max() = nMax; }
+    long				getMin() const { return Min(); }
+    long				getMax() const { return Max(); }
+    void				setMin(long nMin)  { Min() = nMin; }
+    void				setMax(long nMax)  { Max() = nMax; }
 };
 
 inline Selection::Selection()
@@ -383,15 +383,15 @@ inline void Selection::Justify()
 // - Rectangle -
 // -------------
 
-#define RECT_EMPTY  ((short)-32767)
+#define RECT_EMPTY	((short)-32767)
 
 class TOOLS_DLLPUBLIC Rectangle
 {
 public:
-    long                nLeft;
-    long                nTop;
-    long                nRight;
-    long                nBottom;
+    long				nLeft;
+    long				nTop;
+    long				nRight;
+    long				nBottom;
 
                         Rectangle();
                         Rectangle( const Point& rLT, const Point& rRB );
@@ -399,75 +399,75 @@ public:
                                    long nRight, long nBottom );
                         Rectangle( const Point& rLT, const Size& rSize );
 
-    long                Left() const    { return nLeft;   }
-    long                Right() const   { return nRight;  }
-    long                Top() const     { return nTop;    }
-    long                Bottom() const  { return nBottom; }
-
-    long&               Left()          { return nLeft;   }
-    long&               Right()         { return nRight;  }
-    long&               Top()           { return nTop;    }
-    long&               Bottom()        { return nBottom; }
-
-    inline Point                TopLeft() const;
-    Point               TopRight() const;
-    Point               TopCenter() const;
-    Point               BottomLeft() const;
-    Point               BottomRight() const;
-    Point               BottomCenter() const;
-    Point               LeftCenter() const;
-    Point               RightCenter() const;
-    Point               Center() const;
-
-    void                Move( long nHorzMove, long nVertMove );
+    long				Left() const	{ return nLeft;   }
+    long				Right() const	{ return nRight;  }
+    long				Top() const 	{ return nTop;	  }
+    long				Bottom() const	{ return nBottom; }
+
+    long&				Left()			{ return nLeft;   }
+    long&				Right() 		{ return nRight;  }
+    long&				Top()			{ return nTop;	  }
+    long&				Bottom()		{ return nBottom; }
+
+    inline Point				TopLeft() const;
+    Point				TopRight() const;
+    Point				TopCenter() const;
+    Point				BottomLeft() const;
+    Point				BottomRight() const;
+    Point				BottomCenter() const;
+    Point				LeftCenter() const;
+    Point				RightCenter() const;
+    Point				Center() const;
+
+    void				Move( long nHorzMove, long nVertMove );
     inline void         Transpose();
-    inline void         SetPos( const Point& rPoint );
-    void                SetSize( const Size& rSize );
-    inline Size         GetSize() const;
+    inline void			SetPos( const Point& rPoint );
+    void				SetSize( const Size& rSize );
+    inline Size			GetSize() const;
 
-    long                GetWidth() const;
-    long                GetHeight() const;
+    long				GetWidth() const;
+    long				GetHeight() const;
 
-    Rectangle&          Union( const Rectangle& rRect );
-    Rectangle&          Intersection( const Rectangle& rRect );
-    Rectangle           GetUnion( const Rectangle& rRect ) const;
-    Rectangle           GetIntersection( const Rectangle& rRect ) const;
+    Rectangle&			Union( const Rectangle& rRect );
+    Rectangle&			Intersection( const Rectangle& rRect );
+    Rectangle			GetUnion( const Rectangle& rRect ) const;
+    Rectangle			GetIntersection( const Rectangle& rRect ) const;
 
-    void                Justify();
+    void				Justify();
 
-    BOOL                IsInside( const Point& rPOINT ) const;
-    BOOL                IsInside( const Rectangle& rRect ) const;
-    BOOL                IsOver( const Rectangle& rRect ) const;
+    BOOL				IsInside( const Point& rPOINT ) const;
+    BOOL				IsInside( const Rectangle& rRect ) const;
+    BOOL				IsOver( const Rectangle& rRect ) const;
 
-    void                SetEmpty() { nRight = nBottom = RECT_EMPTY; }
-    BOOL                IsEmpty() const;
+    void				SetEmpty() { nRight = nBottom = RECT_EMPTY; }
+    BOOL				IsEmpty() const;
 
-    BOOL                operator == ( const Rectangle& rRect ) const;
-    BOOL                operator != ( const Rectangle& rRect ) const;
+    BOOL				operator == ( const Rectangle& rRect ) const;
+    BOOL				operator != ( const Rectangle& rRect ) const;
 
-    Rectangle&          operator += ( const Point& rPt );
-    Rectangle&          operator -= ( const Point& rPt );
+    Rectangle&			operator += ( const Point& rPt );
+    Rectangle&			operator -= ( const Point& rPt );
 
 #ifdef __BORLANDC__
-    friend Rectangle    operator + ( const Rectangle& rRect, const Point& rPt );
-    friend Rectangle    operator - ( const Rectangle& rRect, const Point& rPt );
+    friend Rectangle	operator + ( const Rectangle& rRect, const Point& rPt );
+    friend Rectangle	operator - ( const Rectangle& rRect, const Point& rPt );
 #else
     friend inline Rectangle operator + ( const Rectangle& rRect, const Point& rPt );
     friend inline Rectangle operator - ( const Rectangle& rRect, const Point& rPt );
 #endif
 
-    TOOLS_DLLPUBLIC friend SvStream&    operator>>( SvStream& rIStream, Rectangle& rRect );
-    TOOLS_DLLPUBLIC friend SvStream&    operator<<( SvStream& rOStream, const Rectangle& rRect );
+    TOOLS_DLLPUBLIC friend SvStream&	operator>>( SvStream& rIStream, Rectangle& rRect );
+    TOOLS_DLLPUBLIC friend SvStream&	operator<<( SvStream& rOStream, const Rectangle& rRect );
 
     // ONE
-    long                getX() const { return nLeft; }
-    long                getY() const { return nTop; }
-    long                getWidth() const { return nRight - nLeft; }
-    long                getHeight() const { return nBottom - nTop; }
-    void                setX( long n ) { nRight += n-nLeft; nLeft = n; }
-    void                setY( long n ) { nBottom += n-nTop; nTop = n; }
-    void                setWidth( long n ) { nRight = nLeft + n; }
-    void                setHeight( long n ) { nBottom = nTop + n; }
+    long				getX() const { return nLeft; }
+    long				getY() const { return nTop; }
+    long				getWidth() const { return nRight - nLeft; }
+    long				getHeight() const { return nBottom - nTop; }
+    void				setX( long n ) { nRight += n-nLeft; nLeft = n; }
+    void				setY( long n ) { nBottom += n-nTop; nTop = n; }
+    void				setWidth( long n ) { nRight = nLeft + n; }
+    void				setHeight( long n ) { nBottom = nTop + n; }
 };
 
 inline Rectangle::Rectangle()
@@ -478,26 +478,26 @@ inline Rectangle::Rectangle()
 
 inline Rectangle::Rectangle( const Point& rLT, const Point& rRB )
 {
-    nLeft   = rLT.X();
-    nTop    = rLT.Y();
-    nRight  = rRB.X();
+    nLeft	= rLT.X();
+    nTop	= rLT.Y();
+    nRight	= rRB.X();
     nBottom = rRB.Y();
 }
 
 inline Rectangle::Rectangle( long _nLeft,  long _nTop,
                              long _nRight, long _nBottom )
 {
-    nLeft   = _nLeft;
-    nTop    = _nTop;
-    nRight  = _nRight;
+    nLeft	= _nLeft;
+    nTop	= _nTop;
+    nRight	= _nRight;
     nBottom = _nBottom;
 }
 
 inline Rectangle::Rectangle( const Point& rLT, const Size& rSize )
 {
-    nLeft   = rLT.X();
-    nTop    = rLT.Y();
-    nRight  = rSize.Width()  ? nLeft+rSize.Width()-1 : RECT_EMPTY;
+    nLeft	= rLT.X();
+    nTop	= rLT.Y();
+    nRight	= rSize.Width()  ? nLeft+rSize.Width()-1 : RECT_EMPTY;
     nBottom = rSize.Height() ? nTop+rSize.Height()-1 : RECT_EMPTY;
 }
 
@@ -656,16 +656,16 @@ inline Rectangle Rectangle::GetIntersection( const Rectangle& rRect ) const
 
 inline BOOL Rectangle::operator == ( const Rectangle& rRect ) const
 {
-    return ((nLeft   == rRect.nLeft   ) &&
-            (nTop    == rRect.nTop    ) &&
+    return ((nLeft	 == rRect.nLeft   ) &&
+            (nTop	 == rRect.nTop	  ) &&
             (nRight  == rRect.nRight  ) &&
             (nBottom == rRect.nBottom ));
 }
 
 inline BOOL Rectangle::operator != ( const Rectangle& rRect ) const
 {
-    return ((nLeft   != rRect.nLeft   ) ||
-            (nTop    != rRect.nTop    ) ||
+    return ((nLeft	 != rRect.nLeft   ) ||
+            (nTop	 != rRect.nTop	  ) ||
             (nRight  != rRect.nRight  ) ||
             (nBottom != rRect.nBottom ));
 }
@@ -695,7 +695,7 @@ inline Rectangle& Rectangle::operator -= ( const Point& rPt )
 inline Rectangle operator + ( const Rectangle& rRect, const Point& rPt )
 {
     Rectangle aRect( rRect.nLeft  + rPt.X(), rRect.nTop    + rPt.Y(),
-                     (rRect.nRight  == RECT_EMPTY) ? RECT_EMPTY : rRect.nRight + rPt.X(),
+                     (rRect.nRight	== RECT_EMPTY) ? RECT_EMPTY : rRect.nRight + rPt.X(),
                      (rRect.nBottom == RECT_EMPTY) ? RECT_EMPTY : rRect.nBottom + rPt.Y() );
     return aRect;
 }
@@ -704,7 +704,7 @@ inline Rectangle operator - ( const Rectangle& rRect, const Point& rPt )
 {
     Rectangle aRect( rRect.nLeft - rPt.X(),
                      rRect.nTop - rPt.Y(),
-                     (rRect.nRight  == RECT_EMPTY) ? RECT_EMPTY : rRect.nRight - rPt.X(),
+                     (rRect.nRight	== RECT_EMPTY) ? RECT_EMPTY : rRect.nRight - rPt.X(),
                      (rRect.nBottom == RECT_EMPTY) ? RECT_EMPTY : rRect.nBottom - rPt.Y() );
     return aRect;
 }
diff --git a/tools/inc/tools/geninfo.hxx b/tools/inc/tools/geninfo.hxx
index 720ccb9cd788..1867c0278ffb 100644
--- a/tools/inc/tools/geninfo.hxx
+++ b/tools/inc/tools/geninfo.hxx
@@ -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
@@ -43,18 +43,18 @@ class GenericInformationList;
 Purpose: holds generic informations and subinformations in a simple format
 ******************************************************************************/
 
-class TOOLS_DLLPUBLIC GenericInformation : public ByteString    // the key is stored in base class
+class TOOLS_DLLPUBLIC GenericInformation : public ByteString	// the key is stored in base class
 {
-friend class GenericInformationList;    // can be child or/and parent
+friend class GenericInformationList;	// can be child or/and parent
 private:
-    ByteString sValue;                  // holds value of data
+    ByteString sValue;					// holds value of data
     ByteString sComment;
 
-    GenericInformationList *pInfoList;  // holds subinformations
-    GenericInformationList *pParent;    // holds a pointer to parent list
+    GenericInformationList *pInfoList;	// holds subinformations
+    GenericInformationList *pParent;	// holds a pointer to parent list
 
     // methods
-    void ListDeleted() { pParent = NULL; }  // allowed to be accessed
+    void ListDeleted() { pParent = NULL; }	// allowed to be accessed
                                                 // from friend class
                                                 // GenericInformationList
 
@@ -193,7 +193,7 @@ DECLARE_LIST( GenericInformationList_Impl, GenericInformation * )
 class TOOLS_DLLPUBLIC GenericInformationList : public GenericInformationList_Impl
 {
 private:
-    GenericInformation *pOwner;         // holds parent of this list
+    GenericInformation *pOwner;			// holds parent of this list
 
 protected:
     // methods
diff --git a/tools/inc/tools/getprocessworkingdir.hxx b/tools/inc/tools/getprocessworkingdir.hxx
index 1b0688379590..9a780b7cc58f 100644
--- a/tools/inc/tools/getprocessworkingdir.hxx
+++ b/tools/inc/tools/getprocessworkingdir.hxx
@@ -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
diff --git a/tools/inc/tools/globname.hxx b/tools/inc/tools/globname.hxx
index 7fac64e2f74b..e12cbc41956c 100644
--- a/tools/inc/tools/globname.hxx
+++ b/tools/inc/tools/globname.hxx
@@ -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
diff --git a/tools/inc/tools/inetdef.hxx b/tools/inc/tools/inetdef.hxx
index 7341225912ab..80f57dc1cbab 100644
--- a/tools/inc/tools/inetdef.hxx
+++ b/tools/inc/tools/inetdef.hxx
@@ -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
@@ -69,14 +69,14 @@
 #define TOOLS_INETDEF_MOZILLA "Mozilla/3.0"
 
 #define INET_PRODUCTNAME TOOLS_INETDEF_PRODUCT " (" TOOLS_INETDEF_OS ")"
-#define INET_DEF_CALLERNAME TOOLS_INETDEF_MOZILLA " (compatible; "           \
+#define INET_DEF_CALLERNAME TOOLS_INETDEF_MOZILLA " (compatible; "			 \
      TOOLS_INETDEF_PRODUCT "; " TOOLS_INETDEF_OS ")"
 
 //============================================================================
 // The following definitions seem obsolete and might get removed in future.
 
 #define INET_PERS_CERT_HOMEPAGE "http://www.stardivision.de/certs.html"
-#define INET_PERS_CERT_HOMEPAGE_INT                                          \
+#define INET_PERS_CERT_HOMEPAGE_INT											 \
      "http://www.stardivision.de/certs/certs##.html"
     // the above definitions are only used in svx/source/options/optinet2.cxx
 
diff --git a/tools/inc/tools/inetmime.hxx b/tools/inc/tools/inetmime.hxx
index 4e8065f6264c..dc662138dd50 100644
--- a/tools/inc/tools/inetmime.hxx
+++ b/tools/inc/tools/inetmime.hxx
@@ -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
diff --git a/tools/inc/tools/inetmsg.hxx b/tools/inc/tools/inetmsg.hxx
index d7619fc34a4d..be58350d7005 100644
--- a/tools/inc/tools/inetmsg.hxx
+++ b/tools/inc/tools/inetmsg.hxx
@@ -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
diff --git a/tools/inc/tools/inetstrm.hxx b/tools/inc/tools/inetstrm.hxx
index 1fd9a913b382..bcf54d4323c3 100644
--- a/tools/inc/tools/inetstrm.hxx
+++ b/tools/inc/tools/inetstrm.hxx
@@ -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
diff --git a/tools/inc/tools/iparser.hxx b/tools/inc/tools/iparser.hxx
index 78eed43e8391..62c2306f9d51 100644
--- a/tools/inc/tools/iparser.hxx
+++ b/tools/inc/tools/iparser.hxx
@@ -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
@@ -69,10 +69,10 @@ key [value]
 
 // error codes:
 
-#define IP_NO_ERROR         0x0000
-#define IP_UNEXPECTED_EOF   0x0001
+#define IP_NO_ERROR			0x0000
+#define IP_UNEXPECTED_EOF	0x0001
 
-#define REPLACE_VARIABLES   TRUE
+#define REPLACE_VARIABLES	TRUE
 
 class TOOLS_DLLPUBLIC InformationParser
 {
diff --git a/tools/inc/tools/isofallback.hxx b/tools/inc/tools/isofallback.hxx
index dcf4bd938376..3fe04c808d82 100644
--- a/tools/inc/tools/isofallback.hxx
+++ b/tools/inc/tools/isofallback.hxx
@@ -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
diff --git a/tools/inc/tools/line.hxx b/tools/inc/tools/line.hxx
index c6c70df842ca..ff501ecfb2fa 100644
--- a/tools/inc/tools/line.hxx
+++ b/tools/inc/tools/line.hxx
@@ -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
@@ -53,10 +53,10 @@ public:
     void            SetEnd( const Point& rEndPt ) { maEnd = rEndPt; }
     const Point&    GetEnd() const { return maEnd; }
 
-    long            Left() const { return ( maStart.X() < maEnd.X() ) ? maStart.X() : maEnd.X(); }
-    long            Top() const { return ( maStart.Y() < maEnd.Y() ) ? maStart.Y() : maEnd.Y(); }
-    long            Right() const { return ( maStart.X() > maEnd.X() ) ? maStart.X() : maEnd.X(); }
-    long            Bottom() const { return ( maStart.Y() > maEnd.Y() ) ? maStart.Y() : maEnd.Y(); }
+    long			Left() const { return ( maStart.X() < maEnd.X() ) ? maStart.X() : maEnd.X(); }
+    long			Top() const { return ( maStart.Y() < maEnd.Y() ) ? maStart.Y() : maEnd.Y(); }
+    long			Right() const { return ( maStart.X() > maEnd.X() ) ? maStart.X() : maEnd.X(); }
+    long			Bottom() const { return ( maStart.Y() > maEnd.Y() ) ? maStart.Y() : maEnd.Y(); }
 
     double          GetLength() const;
 
@@ -64,8 +64,8 @@ public:
     BOOL            Intersection( const Line& rLine, Point& rIntersection ) const;
     BOOL            Intersection( const Rectangle& rRect, Line& rIntersection ) const;
 
-    double          GetDistance( const double& rPtX, const double& rPtY ) const;
-    double          GetDistance( const Point& rPoint ) const { return( GetDistance( rPoint.X(), rPoint.Y() ) ); }
+    double			GetDistance( const double& rPtX, const double& rPtY ) const;
+    double			GetDistance( const Point& rPoint ) const { return( GetDistance( rPoint.X(), rPoint.Y() ) ); }
 
     Point           NearestPoint( const Point& rPoint ) const;
 
diff --git a/tools/inc/tools/link.hxx b/tools/inc/tools/link.hxx
index 1742759055d6..412ca5f98b68 100644
--- a/tools/inc/tools/link.hxx
+++ b/tools/inc/tools/link.hxx
@@ -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
diff --git a/tools/inc/tools/list.hxx b/tools/inc/tools/list.hxx
index dd8fbf454f80..6f6ff673b0ea 100644
--- a/tools/inc/tools/list.hxx
+++ b/tools/inc/tools/list.hxx
@@ -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
diff --git a/tools/inc/tools/mapunit.hxx b/tools/inc/tools/mapunit.hxx
index 0b5f5d044d19..256e4037ecb6 100644
--- a/tools/inc/tools/mapunit.hxx
+++ b/tools/inc/tools/mapunit.hxx
@@ -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
@@ -38,4 +38,4 @@ enum MapUnit { MAP_100TH_MM, MAP_10TH_MM, MAP_MM, MAP_CM,
                MAP_POINT, MAP_TWIP, MAP_PIXEL, MAP_SYSFONT, MAP_APPFONT,
                MAP_RELATIVE, MAP_REALAPPFONT, MAP_LASTENUMDUMMY };
 
-#endif  // _TOOLS_MAPUNIT_HXX
+#endif	// _TOOLS_MAPUNIT_HXX
diff --git a/tools/inc/tools/mempool.hxx b/tools/inc/tools/mempool.hxx
index a96a024d4b27..af3724816724 100644
--- a/tools/inc/tools/mempool.hxx
+++ b/tools/inc/tools/mempool.hxx
@@ -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
diff --git a/tools/inc/tools/multisel.hxx b/tools/inc/tools/multisel.hxx
index f75f4c5f03af..17a5b5d36dd9 100644
--- a/tools/inc/tools/multisel.hxx
+++ b/tools/inc/tools/multisel.hxx
@@ -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
@@ -43,7 +43,7 @@ DECLARE_LIST( ImpSelList, Range* )
 #define ImpSelList List
 #endif
 
-#define SFX_ENDOFSELECTION      CONTAINER_ENTRY_NOTFOUND
+#define SFX_ENDOFSELECTION		CONTAINER_ENTRY_NOTFOUND
 
 //------------------------------------------------------------------
 
@@ -54,21 +54,21 @@ DECLARE_LIST( ImpSelList, Range* )
 class TOOLS_DLLPUBLIC MultiSelection
 {
 private:
-    ImpSelList      aSels;      // array of SV-selections
-    Range           aTotRange;  // total range of indexes
-    ULONG           nCurSubSel; // index in aSels of current selected index
-    long            nCurIndex;  // current selected entry
-    ULONG           nSelCount;  // number of selected indexes
-    BOOL            bInverseCur;// inverse cursor
-    BOOL            bCurValid;  // are nCurIndex and nCurSubSel valid
-    BOOL            bSelectNew; // auto-select newly inserted indexes
+    ImpSelList		aSels;		// array of SV-selections
+    Range			aTotRange;	// total range of indexes
+    ULONG			nCurSubSel; // index in aSels of current selected index
+    long			nCurIndex;	// current selected entry
+    ULONG			nSelCount;	// number of selected indexes
+    BOOL			bInverseCur;// inverse cursor
+    BOOL			bCurValid;	// are nCurIndex and nCurSubSel valid
+    BOOL			bSelectNew; // auto-select newly inserted indexes
 
 #ifdef _SV_MULTISEL_CXX
-    TOOLS_DLLPRIVATE void           ImplClear();
-    TOOLS_DLLPRIVATE ULONG          ImplFindSubSelection( long nIndex ) const;
-    TOOLS_DLLPRIVATE BOOL           ImplMergeSubSelections( ULONG nPos1, ULONG nPos2 );
-    TOOLS_DLLPRIVATE long           ImplFwdUnselected();
-    TOOLS_DLLPRIVATE long           ImplBwdUnselected();
+    TOOLS_DLLPRIVATE void			ImplClear();
+    TOOLS_DLLPRIVATE ULONG			ImplFindSubSelection( long nIndex ) const;
+    TOOLS_DLLPRIVATE BOOL			ImplMergeSubSelections( ULONG nPos1, ULONG nPos2 );
+    TOOLS_DLLPRIVATE long			ImplFwdUnselected();
+    TOOLS_DLLPRIVATE long			ImplBwdUnselected();
 #endif
 
 public:
@@ -81,35 +81,35 @@ public:
                     ~MultiSelection();
 
     MultiSelection& operator= ( const MultiSelection& rOrig );
-    BOOL            operator== ( MultiSelection& rOrig );
-    BOOL            operator!= ( MultiSelection& rOrig )
+    BOOL			operator== ( MultiSelection& rOrig );
+    BOOL			operator!= ( MultiSelection& rOrig )
                         { return !operator==( rOrig ); }
-    BOOL            operator !() const
+    BOOL			operator !() const
                         { return nSelCount == 0; }
 
-    void            SelectAll( BOOL bSelect = TRUE );
-    BOOL            Select( long nIndex, BOOL bSelect = TRUE );
-    void            Select( const Range& rIndexRange, BOOL bSelect = TRUE );
-    BOOL            IsSelected( long nIndex ) const;
-    BOOL            IsAllSelected() const
+    void			SelectAll( BOOL bSelect = TRUE );
+    BOOL			Select( long nIndex, BOOL bSelect = TRUE );
+    void			Select( const Range& rIndexRange, BOOL bSelect = TRUE );
+    BOOL			IsSelected( long nIndex ) const;
+    BOOL			IsAllSelected() const
                         { return nSelCount == ULONG(aTotRange.Len()); }
-    long            GetSelectCount() const { return nSelCount; }
-
-    void            SetTotalRange( const Range& rTotRange );
-    void            Insert( long nIndex, long nCount = 1 );
-    void            Remove( long nIndex );
-    void            Append( long nCount = 1 );
-
-    const Range&    GetTotalRange() const { return aTotRange; }
-    BOOL            IsCurValid() const { return bCurValid; }
-    long            GetCurSelected() const { return nCurIndex; }
-    long            FirstSelected( BOOL bInverse = FALSE );
-    long            LastSelected();
-    long            NextSelected();
-    long            PrevSelected();
-
-    ULONG           GetRangeCount() const { return aSels.Count(); }
-    const Range&    GetRange( ULONG nRange ) const { return *(const Range*)aSels.GetObject(nRange); }
+    long			GetSelectCount() const { return nSelCount; }
+
+    void			SetTotalRange( const Range& rTotRange );
+    void			Insert( long nIndex, long nCount = 1 );
+    void			Remove( long nIndex );
+    void			Append( long nCount = 1 );
+
+    const Range&	GetTotalRange() const { return aTotRange; }
+    BOOL			IsCurValid() const { return bCurValid; }
+    long			GetCurSelected() const { return nCurIndex; }
+    long			FirstSelected( BOOL bInverse = FALSE );
+    long			LastSelected();
+    long			NextSelected();
+    long			PrevSelected();
+
+    ULONG			GetRangeCount() const { return aSels.Count(); }
+    const Range&	GetRange( ULONG nRange ) const { return *(const Range*)aSels.GetObject(nRange); }
 };
 
 class TOOLS_DLLPUBLIC StringRangeEnumerator
@@ -118,7 +118,7 @@ class TOOLS_DLLPUBLIC StringRangeEnumerator
     {
         sal_Int32   nFirst;
         sal_Int32   nLast;
-
+        
         Range() : nFirst( -1 ), nLast( -1 ) {}
         Range( sal_Int32 i_nFirst, sal_Int32 i_nLast ) : nFirst( i_nFirst ), nLast( i_nLast ) {}
     };
@@ -127,7 +127,7 @@ class TOOLS_DLLPUBLIC StringRangeEnumerator
     sal_Int32                                              mnMin;
     sal_Int32                                              mnMax;
     sal_Int32                                              mnOffset;
-
+    
     bool insertRange( sal_Int32 nFirst, sal_Int32 nLast, bool bSequence, bool bMayAdjust );
     bool checkValue( sal_Int32, const std::set< sal_Int32 >* i_pPossibleValues = NULL ) const;
 public:
@@ -137,7 +137,7 @@ public:
         const std::set< sal_Int32 >*      pPossibleValues;
         sal_Int32                         nRangeIndex;
         sal_Int32                         nCurrent;
-
+        
         friend class StringRangeEnumerator;
         Iterator( const StringRangeEnumerator* i_pEnum,
                   const std::set< sal_Int32 >* i_pPossibleValues,
@@ -155,29 +155,29 @@ public:
     };
 
     friend class StringRangeEnumerator::Iterator;
-
+    
     StringRangeEnumerator() : mnCount( 0 ), mnMin( -1 ), mnMax( -1 ), mnOffset( -1 ) {}
     StringRangeEnumerator( const rtl::OUString& i_rInput,
                            sal_Int32 i_nMinNumber = -1,
                            sal_Int32 i_nMaxNumber = -1,
                            sal_Int32 i_nLogicalOffset = -1
                            );
-
+    
     size_t size() const { return size_t(mnCount); }
     Iterator begin( const std::set< sal_Int32 >* i_pPossibleValues = NULL ) const;
     Iterator end( const std::set< sal_Int32 >* i_pPossibleValues = NULL ) const;
-
+    
     sal_Int32 getMin() const { return mnMin; }
     void setMin( sal_Int32 i_nMinValue ) { mnMin = i_nMinValue; }
     sal_Int32 getMax() const { return mnMax; }
     void setMax( sal_Int32 i_nMaxValue ) { mnMax = i_nMaxValue; }
     sal_Int32 getLogicalOffset() const { return mnOffset; }
     void setLogicalOffset( sal_Int32 i_nOffset ) { mnOffset = i_nOffset; }
-
+    
     bool setRange( const rtl::OUString& i_rNewRange, bool i_bStrict = false );
     bool hasValue( sal_Int32 nValue, const std::set< sal_Int32 >* i_pPossibleValues = NULL ) const;
-
-
+    
+                          
     /**
     i_rPageRange:     the string to be changed into a sequence of numbers
                       valid format example "5-3,9,9,7-8" ; instead of ',' ';' or ' ' are allowed as well
@@ -188,10 +188,10 @@ public:
                                so the logical offset would be -1
     i_nMinNumber:     the minimum allowed number, a negative number means no minimum check
     i_nMaxNumber:     the maximum allowed number, a negative number means no maximum check
-
+    
     @returns: true if the input string was valid, o_rPageVector will contain the resulting sequence
               false if the input string was invalid, o_rPageVector will be unchanged
-
+    
     behavior:
     - only non-negative sequence numbers are allowed
     - only non-negative values in the input string are allowed
@@ -213,4 +213,4 @@ public:
                                     );
 };
 
-#endif  // _SV_MULTISEL_HXX
+#endif	// _SV_MULTISEL_HXX
diff --git a/tools/inc/tools/ownlist.hxx b/tools/inc/tools/ownlist.hxx
index ac99537a9f0d..d84ad1be9ea1 100644
--- a/tools/inc/tools/ownlist.hxx
+++ b/tools/inc/tools/ownlist.hxx
@@ -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
@@ -53,8 +53,8 @@ public:                                                                   \
     void                Remove( ULONG nPos )                              \
                         { delete (Type *)aTypes.Remove( nPos ); }         \
     Type &              Insert( const Type &, ULONG nPos );               \
-    Type &              Insert( const Type & rType )                      \
-                        { return Insert( rType, aTypes.GetCurPos() ); }   \
+    Type &              Insert( const Type & rType )           			  \
+                        { return Insert( rType, aTypes.GetCurPos() ); }	  \
     Type &              Append( const Type & rType )                      \
                         { return Insert( rType, LIST_APPEND ); }          \
     Type &              GetObject( ULONG nPos ) const                     \
diff --git a/tools/inc/tools/pathutils.hxx b/tools/inc/tools/pathutils.hxx
index e5c54b09fb4b..db75397eb69e 100644
--- a/tools/inc/tools/pathutils.hxx
+++ b/tools/inc/tools/pathutils.hxx
@@ -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
diff --git a/tools/inc/tools/poly.hxx b/tools/inc/tools/poly.hxx
index b83877b88959..fecd09da7765 100644
--- a/tools/inc/tools/poly.hxx
+++ b/tools/inc/tools/poly.hxx
@@ -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
@@ -37,17 +37,17 @@
 // - Defines -
 // -----------
 
-#define POLY_APPEND             (0xFFFF)
-#define POLYPOLY_APPEND         (0xFFFF)
+#define POLY_APPEND				(0xFFFF)
+#define POLYPOLY_APPEND			(0xFFFF)
 
 // ------------------------------------------------------------------------
 
-#define POLY_OPTIMIZE_NONE      0x00000000UL
-#define POLY_OPTIMIZE_OPEN      0x00000001UL
-#define POLY_OPTIMIZE_CLOSE     0x00000002UL
-#define POLY_OPTIMIZE_NO_SAME   0x00000004UL
-#define POLY_OPTIMIZE_REDUCE    0x00000008UL
-#define POLY_OPTIMIZE_EDGES     0x00000010UL
+#define POLY_OPTIMIZE_NONE		0x00000000UL
+#define POLY_OPTIMIZE_OPEN		0x00000001UL
+#define POLY_OPTIMIZE_CLOSE		0x00000002UL
+#define POLY_OPTIMIZE_NO_SAME	0x00000004UL
+#define POLY_OPTIMIZE_REDUCE	0x00000008UL
+#define POLY_OPTIMIZE_EDGES		0x00000010UL
 
 // -------------
 // - PolyStyle -
@@ -83,9 +83,9 @@ class PolyOptimizeData
 {
 private:
 
-    enum DataType   { DATA_NONE = 0, DATA_ABSOLUT = 1, DATA_PERCENT = 2 };
-    DataType        eType;
-    union           { ULONG mnAbsolut; USHORT mnPercent; };
+    enum DataType	{ DATA_NONE = 0, DATA_ABSOLUT = 1, DATA_PERCENT = 2 };
+    DataType		eType;
+    union			{ ULONG mnAbsolut; USHORT mnPercent; };
 
 public:
 
@@ -93,8 +93,8 @@ public:
                     PolyOptimizeData( ULONG nAbsolut ) : eType( DATA_ABSOLUT ), mnAbsolut( nAbsolut ) {}
                     PolyOptimizeData( USHORT nPercent ) : eType( DATA_PERCENT ), mnPercent( nPercent ) {}
 
-    ULONG           GetAbsValue() const { DBG_ASSERT( eType == DATA_ABSOLUT, "Wrong data type" ); return mnAbsolut; }
-    USHORT          GetPercentValue() const { DBG_ASSERT( eType == DATA_PERCENT, "Wrong data type" ); return mnPercent; }
+    ULONG			GetAbsValue() const { DBG_ASSERT( eType == DATA_ABSOLUT, "Wrong data type" ); return mnAbsolut; }
+    USHORT			GetPercentValue() const { DBG_ASSERT( eType == DATA_PERCENT, "Wrong data type" ); return mnPercent; }
 };
 
 // -----------
@@ -104,10 +104,10 @@ public:
 class SvStream;
 class ImplPolygon;
 class ImplPolyPolygon;
-class PolyPolygon;
+class PolyPolygon; 
 
-namespace basegfx
-{
+namespace basegfx 
+{ 
     class B2DPolygon;
     class B2DPolyPolygon;
 } // end of namespace basegfx
@@ -127,9 +127,9 @@ public:
     Point*              ImplGetPointAry();
     BYTE*               ImplGetFlagAry();
 
-    static void         ImplReduceEdges( Polygon& rPoly, const double& rArea, USHORT nPercent );
-    void                ImplRead( SvStream& rIStream );
-    void                ImplWrite( SvStream& rOStream ) const;
+    static void			ImplReduceEdges( Polygon& rPoly, const double& rArea, USHORT nPercent );
+    void				ImplRead( SvStream& rIStream );
+    void				ImplWrite( SvStream& rOStream ) const;
 
 //#endif // __PRIVATE
 
@@ -139,7 +139,7 @@ public:
                         Polygon( USHORT nPoints, const Point* pPtAry,
                                  const BYTE* pFlagAry = NULL );
                         Polygon( const Rectangle& rRect );
-                        Polygon( const Rectangle& rRect,
+                        Polygon( const Rectangle& rRect, 
                                  ULONG nHorzRound, ULONG nVertRound );
                         Polygon( const Point& rCenter,
                                  long nRadX, long nRadY,
@@ -147,8 +147,8 @@ public:
                         Polygon( const Rectangle& rBound,
                                  const Point& rStart, const Point& rEnd,
                                  PolyStyle ePolyStyle = POLY_ARC );
-                        Polygon( const Point& rBezPt1, const Point& rCtrlPt1,
-                                 const Point& rBezPt2, const Point& rCtrlPt2,
+                        Polygon( const Point& rBezPt1, const Point& rCtrlPt1, 
+                                 const Point& rBezPt2, const Point& rCtrlPt2,  
                                  USHORT nPoints = 0 );
 
                         Polygon( const Polygon& rPoly );
@@ -159,11 +159,11 @@ public:
 
     void                SetFlags( USHORT nPos, PolyFlags eFlags );
     PolyFlags           GetFlags( USHORT nPos ) const;
-    sal_Bool            HasFlags() const;
+    sal_Bool			HasFlags() const;
 
     BOOL                IsControl( USHORT nPos ) const;
     BOOL                IsSmooth( USHORT nPos ) const;
-    BOOL                IsRect() const;
+    BOOL				IsRect() const;
 
     void                SetSize( USHORT nNewSize );
     USHORT              GetSize() const;
@@ -177,7 +177,7 @@ public:
     BOOL                IsRightOrientated() const;
     double              CalcDistance( USHORT nPt1, USHORT nPt2 );
     void                Clip( const Rectangle& rRect, BOOL bPolygon = TRUE );
-    void                Optimize( ULONG nOptimizeFlags, const PolyOptimizeData* pData = NULL );
+    void				Optimize( ULONG nOptimizeFlags, const PolyOptimizeData* pData = NULL );
 
     /** Adaptive subdivision of polygons with curves
 
@@ -188,7 +188,7 @@ public:
         @param rResult
         The resulting subdivided polygon
 
-        @param d
+        @param d 
         This parameter controls the amount of subdivision. The
         original curve is guaranteed to not differ by more than this
         amount per bezier segment from the subdivided
@@ -197,12 +197,12 @@ public:
         the original polygon is guaranteed to be smaller than one
         pixel.
      */
-    void                AdaptiveSubdivide( Polygon& rResult, const double d = 1.0 ) const;
+    void 				AdaptiveSubdivide( Polygon& rResult, const double d = 1.0 ) const;
 
-    void                GetIntersection( const PolyPolygon& rPolyPoly, PolyPolygon& rResult ) const;
-    void                GetUnion( const PolyPolygon& rPolyPoly, PolyPolygon& rResult ) const;
-    void                GetDifference( const PolyPolygon& rPolyPoly, PolyPolygon& rResult ) const;
-    void                GetXOR( const PolyPolygon& rPolyPoly, PolyPolygon& rResult ) const;
+    void				GetIntersection( const PolyPolygon& rPolyPoly, PolyPolygon& rResult ) const;
+    void				GetUnion( const PolyPolygon& rPolyPoly, PolyPolygon& rResult ) const;
+    void				GetDifference( const PolyPolygon& rPolyPoly, PolyPolygon& rResult ) const;
+    void				GetXOR( const PolyPolygon& rPolyPoly, PolyPolygon& rResult ) const;
 
     void                Move( long nHorzMove, long nVertMove );
     void                Translate( const Point& rTrans );
@@ -224,15 +224,15 @@ public:
     BOOL                operator==( const Polygon& rPoly ) const;
     BOOL                operator!=( const Polygon& rPoly ) const
                             { return !(Polygon::operator==( rPoly )); }
-    sal_Bool            IsEqual( const Polygon& rPoly ) const;
+    sal_Bool			IsEqual( const Polygon& rPoly ) const;
 
     // streaming a Polygon does ignore PolyFlags, so use the Write Or Read
     // method to take care of PolyFlags
     TOOLS_DLLPUBLIC friend SvStream&    operator>>( SvStream& rIStream, Polygon& rPoly );
     TOOLS_DLLPUBLIC friend SvStream&    operator<<( SvStream& rOStream, const Polygon& rPoly );
 
-    void                Read( SvStream& rIStream );
-    void                Write( SvStream& rOStream ) const;
+    void				Read( SvStream& rIStream );
+    void				Write( SvStream& rOStream ) const;
 
     const Point*        GetConstPointAry() const;
     const BYTE*         GetConstFlagAry() const;
@@ -275,14 +275,14 @@ public:
     void                Replace( const Polygon& rPoly, USHORT nPos );
     const Polygon&      GetObject( USHORT nPos ) const;
 
-    BOOL                IsRect() const;
+    BOOL				IsRect() const;
 
     void                Clear();
 
     USHORT              Count() const;
     Rectangle           GetBoundRect() const;
     void                Clip( const Rectangle& rRect );
-    void                Optimize( ULONG nOptimizeFlags, const PolyOptimizeData* pData = NULL );
+    void				Optimize( ULONG nOptimizeFlags, const PolyOptimizeData* pData = NULL );
 
     /** Adaptive subdivision of polygons with curves
 
@@ -293,7 +293,7 @@ public:
         @param rResult
         The resulting subdivided polygon
 
-        @param d
+        @param d 
         This parameter controls the amount of subdivision. The
         original curve is guaranteed to not differ by more than this
         amount per bezier segment from the subdivided
@@ -302,12 +302,12 @@ public:
         the original polygon is guaranteed to be smaller than one
         pixel.
      */
-    void                AdaptiveSubdivide( PolyPolygon& rResult, const double d = 1.0 ) const;
+    void 				AdaptiveSubdivide( PolyPolygon& rResult, const double d = 1.0 ) const;
 
-    void                GetIntersection( const PolyPolygon& rPolyPoly, PolyPolygon& rResult ) const;
-    void                GetUnion( const PolyPolygon& rPolyPoly, PolyPolygon& rResult ) const;
-    void                GetDifference( const PolyPolygon& rPolyPoly, PolyPolygon& rResult ) const;
-    void                GetXOR( const PolyPolygon& rPolyPoly, PolyPolygon& rResult ) const;
+    void				GetIntersection( const PolyPolygon& rPolyPoly, PolyPolygon& rResult ) const;
+    void				GetUnion( const PolyPolygon& rPolyPoly, PolyPolygon& rResult ) const;
+    void				GetDifference( const PolyPolygon& rPolyPoly, PolyPolygon& rResult ) const;
+    void				GetXOR( const PolyPolygon& rPolyPoly, PolyPolygon& rResult ) const;
 
     void                Move( long nHorzMove, long nVertMove );
     void                Translate( const Point& rTrans );
@@ -326,13 +326,13 @@ public:
     BOOL                operator!=( const PolyPolygon& rPolyPoly ) const
                             { return !(PolyPolygon::operator==( rPolyPoly )); }
 
-    sal_Bool            IsEqual( const PolyPolygon& rPolyPoly ) const;
+    sal_Bool			IsEqual( const PolyPolygon& rPolyPoly ) const;
 
     TOOLS_DLLPUBLIC friend SvStream&    operator>>( SvStream& rIStream, PolyPolygon& rPolyPoly );
     TOOLS_DLLPUBLIC friend SvStream&    operator<<( SvStream& rOStream, const PolyPolygon& rPolyPoly );
 
-    void                Read( SvStream& rIStream );
-    void                Write( SvStream& rOStream ) const;
+    void				Read( SvStream& rIStream );
+    void				Write( SvStream& rOStream ) const;
 
     // convert to ::basegfx::B2DPolyPolygon and return
     ::basegfx::B2DPolyPolygon getB2DPolyPolygon() const;
diff --git a/tools/inc/tools/postextstl.h b/tools/inc/tools/postextstl.h
index 81a21e25c15b..efbdaddbaacc 100644
--- a/tools/inc/tools/postextstl.h
+++ b/tools/inc/tools/postextstl.h
@@ -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
diff --git a/tools/inc/tools/postsys.h b/tools/inc/tools/postsys.h
index 3b7e37a4c23b..0864d09e3f74 100644
--- a/tools/inc/tools/postsys.h
+++ b/tools/inc/tools/postsys.h
@@ -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
@@ -38,7 +38,7 @@
 #undef DELETE
 
 /* Hilfe-Ids umbenennen */
-#define WIN_HELP_INDEX       0x0003
+#define WIN_HELP_INDEX		 0x0003
 #define WIN_HELP_HELPONHELP  0x0004
 #undef HELP_INDEX
 #undef HELP_HELPONHELP
@@ -46,86 +46,86 @@
 #define WIN_MOUSE_MOVED 0x0001
 #undef MOUSE_MOVED
 
-#define WIN_WB_LEFT               0
-#define WIN_WB_RIGHT              1
+#define WIN_WB_LEFT 			  0
+#define WIN_WB_RIGHT			  1
 #undef WB_LEFT
 #undef WB_RIGHT
 
 #ifdef GetObject
 #undef GetObject
 #ifdef UNICODE
-#define WIN_GetObject   GetObjectW
+#define WIN_GetObject	GetObjectW
 #else
-#define WIN_GetObject   GetObjectA
+#define WIN_GetObject	GetObjectA
 #endif
 #else
-#define WIN_GetObject   GetObject
+#define WIN_GetObject	GetObject
 #endif
 
 #ifdef SetPrinter
 #undef SetPrinter
 #ifdef UNICODE
-#define WIN_SetPrinter  SetPrinterW
+#define WIN_SetPrinter	SetPrinterW
 #else
-#define WIN_SetPrinter  SetPrinterA
+#define WIN_SetPrinter	SetPrinterA
 #endif
 #else
-#define WIN_SetPrinter  SetPrinter
+#define WIN_SetPrinter	SetPrinter
 #endif
 
 #ifdef GetPrinter
 #undef GetPrinter
 #ifdef UNICODE
-#define WIN_GetPrinter  GetPrinterW
+#define WIN_GetPrinter	GetPrinterW
 #else
-#define WIN_GetPrinter  GetPrinterA
+#define WIN_GetPrinter	GetPrinterA
 #endif
 #else
-#define WIN_GetPrinter  GetPrinter
+#define WIN_GetPrinter	GetPrinter
 #endif
 
 #ifdef DrawText
 #undef DrawText
 #ifdef UNICODE
-#define WIN_DrawText    DrawTextW
+#define WIN_DrawText	DrawTextW
 #else
-#define WIN_DrawText    DrawTextA
+#define WIN_DrawText	DrawTextA
 #endif
 #else
-#define WIN_DrawText    DrawText
+#define WIN_DrawText	DrawText
 #endif
 
 #ifdef mciSetCommand
 #undef mciSetCommand
 #ifdef UNICODE
-#define WIN_mciSetCommand   mciSetCommandW
+#define WIN_mciSetCommand	mciSetCommandW
 #else
-#define WIN_mciSetCommand   mciSetCommandA
+#define WIN_mciSetCommand	mciSetCommandA
 #endif
 #else
-#define mciSetCommand   mciSetCommand
+#define mciSetCommand	mciSetCommand
 #endif
 
 #ifdef SetPort
 #undef SetPort
 #ifdef UNICODE
-#define WIN_SetPort     SetPortW
+#define WIN_SetPort 	SetPortW
 #else
-#define WIN_SetPort     SetPortA
+#define WIN_SetPort 	SetPortA
 #endif
 #else
-#define WIN_SetPort     SetPort
+#define WIN_SetPort 	SetPort
 #endif
 
 #ifdef CopyFile
 #undef CopyFile
 #ifdef UNICODE
-#define WIN_CopyFile    CopyFileW
+#define WIN_CopyFile	CopyFileW
 #else
-#define WIN_CopyFile    CopyFileA
+#define WIN_CopyFile	CopyFileA
 #endif
 #else
-#define WIN_CopyFile    CopyFile
+#define WIN_CopyFile	CopyFile
 #endif
 
 #ifdef GetUserName
@@ -221,13 +221,13 @@
 
 /* new StretchBlt() Modes (simpler names) */
 #ifndef STRETCH_ANDSCANS
-#define STRETCH_ANDSCANS        1
+#define STRETCH_ANDSCANS		1
 #endif
 #ifndef STRETCH_ORSCANS
-#define STRETCH_ORSCANS         2
+#define STRETCH_ORSCANS 		2
 #endif
 #ifndef STRETCH_DELETESCANS
-#define STRETCH_DELETESCANS     3
+#define STRETCH_DELETESCANS 	3
 #endif
 
 extern "C"
diff --git a/tools/inc/tools/postwin.h b/tools/inc/tools/postwin.h
index a6bd3431a9dc..4e7c334e3871 100644
--- a/tools/inc/tools/postwin.h
+++ b/tools/inc/tools/postwin.h
@@ -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
@@ -51,7 +51,7 @@
 #undef GradientStyle_RECT
 
 /* Hilfe-Ids umbenennen */
-#define WIN_HELP_INDEX       0x0003
+#define WIN_HELP_INDEX		 0x0003
 #define WIN_HELP_HELPONHELP  0x0004
 #undef HELP_INDEX
 #undef HELP_HELPONHELP
@@ -59,86 +59,86 @@
 #define WIN_MOUSE_MOVED 0x0001
 #undef MOUSE_MOVED
 
-#define WIN_WB_LEFT               0
-#define WIN_WB_RIGHT              1
+#define WIN_WB_LEFT 			  0
+#define WIN_WB_RIGHT			  1
 #undef WB_LEFT
 #undef WB_RIGHT
 
 #ifdef GetObject
 #undef GetObject
 #ifdef UNICODE
-#define WIN_GetObject   GetObjectW
+#define WIN_GetObject	GetObjectW
 #else
-#define WIN_GetObject   GetObjectA
+#define WIN_GetObject	GetObjectA
 #endif
 #else
-#define WIN_GetObject   GetObject
+#define WIN_GetObject	GetObject
 #endif
 
 #ifdef SetPrinter
 #undef SetPrinter
 #ifdef UNICODE
-#define WIN_SetPrinter  SetPrinterW
+#define WIN_SetPrinter	SetPrinterW
 #else
-#define WIN_SetPrinter  SetPrinterA
+#define WIN_SetPrinter	SetPrinterA
 #endif
 #else
-#define WIN_SetPrinter  SetPrinter
+#define WIN_SetPrinter	SetPrinter
 #endif
 
 #ifdef GetPrinter
 #undef GetPrinter
 #ifdef UNICODE
-#define WIN_GetPrinter  GetPrinterW
+#define WIN_GetPrinter	GetPrinterW
 #else
-#define WIN_GetPrinter  GetPrinterA
+#define WIN_GetPrinter	GetPrinterA
 #endif
 #else
-#define WIN_GetPrinter  GetPrinter
+#define WIN_GetPrinter	GetPrinter
 #endif
 
 #ifdef DrawText
 #undef DrawText
 #ifdef UNICODE
-#define WIN_DrawText    DrawTextW
+#define WIN_DrawText	DrawTextW
 #else
-#define WIN_DrawText    DrawTextA
+#define WIN_DrawText	DrawTextA
 #endif
 #else
-#define WIN_DrawText    DrawText
+#define WIN_DrawText	DrawText
 #endif
 
 #ifdef mciSetCommand
 #undef mciSetCommand
 #ifdef UNICODE
-#define WIN_mciSetCommand   mciSetCommandW
+#define WIN_mciSetCommand	mciSetCommandW
 #else
-#define WIN_mciSetCommand   mciSetCommandA
+#define WIN_mciSetCommand	mciSetCommandA
 #endif
 #else
-#define mciSetCommand   mciSetCommand
+#define mciSetCommand	mciSetCommand
 #endif
 
 #ifdef SetPort
 #undef SetPort
 #ifdef UNICODE
-#define WIN_SetPort     SetPortW
+#define WIN_SetPort 	SetPortW
 #else
-#define WIN_SetPort     SetPortA
+#define WIN_SetPort 	SetPortA
 #endif
 #else
-#define WIN_SetPort     SetPort
+#define WIN_SetPort 	SetPort
 #endif
 
 #ifdef CopyFile
 #undef CopyFile
 #ifdef UNICODE
-#define WIN_CopyFile    CopyFileW
+#define WIN_CopyFile	CopyFileW
 #else
-#define WIN_CopyFile    CopyFileA
+#define WIN_CopyFile	CopyFileA
 #endif
 #else
-#define WIN_CopyFile    CopyFile
+#define WIN_CopyFile	CopyFile
 #endif
 
 
@@ -235,13 +235,13 @@
 
 /* new StretchBlt() Modes (simpler names) */
 #ifndef STRETCH_ANDSCANS
-#define STRETCH_ANDSCANS        1
+#define STRETCH_ANDSCANS		1
 #endif
 #ifndef STRETCH_ORSCANS
-#define STRETCH_ORSCANS         2
+#define STRETCH_ORSCANS 		2
 #endif
 #ifndef STRETCH_DELETESCANS
-#define STRETCH_DELETESCANS     3
+#define STRETCH_DELETESCANS 	3
 #endif
 
 #ifdef WNT
diff --git a/tools/inc/tools/postx.h b/tools/inc/tools/postx.h
index 3e77fde5d14b..776b7f0858a1 100644
--- a/tools/inc/tools/postx.h
+++ b/tools/inc/tools/postx.h
@@ -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
diff --git a/tools/inc/tools/preextstl.h b/tools/inc/tools/preextstl.h
index 27aed38686f0..3f59c5613c03 100644
--- a/tools/inc/tools/preextstl.h
+++ b/tools/inc/tools/preextstl.h
@@ -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
diff --git a/tools/inc/tools/presys.h b/tools/inc/tools/presys.h
index 457b57142dcd..0fdfbe21e321 100644
--- a/tools/inc/tools/presys.h
+++ b/tools/inc/tools/presys.h
@@ -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
diff --git a/tools/inc/tools/prewin.h b/tools/inc/tools/prewin.h
index 43a4452594cc..f705261e7103 100644
--- a/tools/inc/tools/prewin.h
+++ b/tools/inc/tools/prewin.h
@@ -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
@@ -32,10 +32,10 @@
 #define BOOL         WIN_BOOL
 #define BYTE         WIN_BYTE
 #ifndef VCL_NEED_BASETSD
-#define INT64        WIN_INT64
-#define UINT64       WIN_UINT64
-#define INT32        WIN_INT32
-#define UINT32       WIN_UINT32
+#define INT64	     WIN_INT64
+#define UINT64	     WIN_UINT64
+#define INT32	     WIN_INT32
+#define UINT32	     WIN_UINT32
 #endif
 
 #define Rectangle    BLA_Rectangle
@@ -43,7 +43,7 @@
 #define PolyPolygon  BLA_PolyPolygon
 #define Region       WIN_Region
 #define Folder       WIN_Folder
-#define GradientStyle_RECT  WIN_GradientStyle_RECT
+#define GradientStyle_RECT	WIN_GradientStyle_RECT
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/tools/inc/tools/prex.h b/tools/inc/tools/prex.h
index 61088960bbfd..b9e68332ba13 100644
--- a/tools/inc/tools/prex.h
+++ b/tools/inc/tools/prex.h
@@ -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
@@ -28,20 +28,20 @@
 #ifndef _PREX_H
 #define _PREX_H
 
-#define Window      XLIB_Window
-#define BYTE        XLIB_BYTE
-#define INT8        XLIB_INT8
+#define Window		XLIB_Window
+#define BYTE		XLIB_BYTE
+#define INT8		XLIB_INT8
 #define INT64       XLIB_INT64
-#define BOOL        XLIB_BOOL
-#define Font        XLIB_Font
-#define Cursor      XLIB_Cursor
-#define String      XLIB_String
-#define KeyCode     XLIB_KeyCode
-#define Region      XLIB_Region
-#define Icon        XLIB_Icon
-#define Time        XLIB_Time
-#define Region      XLIB_Region
-#define Boolean     XLIB_Boolean
+#define BOOL		XLIB_BOOL
+#define Font		XLIB_Font
+#define Cursor		XLIB_Cursor
+#define String		XLIB_String
+#define KeyCode		XLIB_KeyCode
+#define Region		XLIB_Region
+#define Icon		XLIB_Icon
+#define Time		XLIB_Time
+#define Region		XLIB_Region
+#define Boolean		XLIB_Boolean
 
 #if defined __cplusplus
 extern "C" {
@@ -64,13 +64,13 @@ extern "C" {
 typedef unsigned long Pixel;
 
 #undef  DestroyAll
-#define DestroyAll      XLIB_DestroyAll
-#define XLIB_DestroyAll 0
+#define DestroyAll		XLIB_DestroyAll
+#define XLIB_DestroyAll	0
 #undef  String
-#define String          XLIB_String
+#define String			XLIB_String
 
 #undef  KeyCode
-#define KeyCode         XLIB_KeyCode //undef in intrinsics
+#define KeyCode			XLIB_KeyCode //undef in intrinsics
 
 #define __Ol_OlXlibExt_h__
 
diff --git a/tools/inc/tools/pstm.hxx b/tools/inc/tools/pstm.hxx
index 0d14385e5f08..4fc00cfd1ef6 100644
--- a/tools/inc/tools/pstm.hxx
+++ b/tools/inc/tools/pstm.hxx
@@ -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
@@ -170,7 +170,7 @@ DECLARE_UNIQUEINDEX( SvPersistUIdx,SvPersistBase *)
 //=========================================================================
 class SvStream;
 class TOOLS_DLLPUBLIC SvPersistStream : public SvStream
-/*  [Beschreibung]
+/*	[Beschreibung]
 
     Mit dieser Klasse k"onnen Laufzeit Objektstrukturen gespeichert
     und geladen werden. Es m"ussen immer alle beteiligten Objekte
@@ -194,11 +194,11 @@ class TOOLS_DLLPUBLIC SvPersistStream : public SvStream
 
     Die Reihenfolge beim Speichern und Laden ist egal, sie muss nur
     gleich sein:
-    Speichern:      Laden:
-    A,B,C,D         A,B,C,D     richtig
-    B,A,C,D         B,A,C,D     richtig
-    C,A,B,D         A,B,C,D     falsch
-    A,B,C,D         A,B,C       falsch
+    Speichern:		Laden:
+    A,B,C,D			A,B,C,D     richtig
+    B,A,C,D			B,A,C,D     richtig
+    C,A,B,D			A,B,C,D     falsch
+    A,B,C,D			A,B,C		falsch
 
     [Anmerkung]
 
@@ -223,8 +223,8 @@ protected:
     ULONG               GetCurMaxIndex() const
                         { return GetCurMaxIndex( aPUIdx ); }
 
-    void                WriteObj( BYTE nHdr, SvPersistBase * pObj );
-    UINT32              ReadObj( SvPersistBase * & rpObj,
+    void				WriteObj( BYTE nHdr, SvPersistBase * pObj );
+    UINT32  			ReadObj( SvPersistBase * & rpObj,
                                 BOOL bRegister );
 public:
     BOOL                IsStreamed( SvPersistBase * pObj ) const
@@ -238,8 +238,8 @@ public:
                         ~SvPersistStream();
 
     void                SetStream( SvStream * pStream );
-    SvStream *          GetStream() const { return pStm; }
-    virtual USHORT      IsA() const;
+    SvStream *			GetStream() const { return pStm; }
+    virtual USHORT		IsA() const;
 
     SvPersistBase *     GetObject( ULONG nIdx ) const;
     ULONG               GetIndex( SvPersistBase * ) const;
@@ -263,8 +263,8 @@ public:
                         // gespeichert werden.
     friend SvStream& operator >> ( SvStream &, SvPersistStream & );
     friend SvStream& operator << ( SvStream &, SvPersistStream & );
-    ULONG               InsertObj( SvPersistBase * );
-    ULONG               RemoveObj( SvPersistBase * );
+    ULONG   			InsertObj( SvPersistBase * );
+    ULONG   			RemoveObj( SvPersistBase * );
 };
 
 #endif // _PSTM_HXX
diff --git a/tools/inc/tools/queue.hxx b/tools/inc/tools/queue.hxx
index cb89bce6cdda..197bfef0f86d 100644
--- a/tools/inc/tools/queue.hxx
+++ b/tools/inc/tools/queue.hxx
@@ -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
diff --git a/tools/inc/tools/rc.h b/tools/inc/tools/rc.h
index bd499717a3a4..01926dd48cb1 100644
--- a/tools/inc/tools/rc.h
+++ b/tools/inc/tools/rc.h
@@ -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
@@ -32,189 +32,189 @@
 
 // Definition der Struktur die alle "Window"-Resourcen haben
 // Hier sind die Fensterstyles definiert die nicht in WinBits sind
-#define RSC_EXTRAMAPUNIT                0xFFFF //Wert nicht veraendern!!!
+#define RSC_EXTRAMAPUNIT				0xFFFF //Wert nicht veraendern!!!
 
 typedef short RSWND_STYLE;
-#define RSWND_DISABLED                  0x01
-#define RSWND_CLIENTSIZE                0x02
-
-#define WINDOW_XYMAPMODE                0x0001
-#define WINDOW_X                        0x0002
-#define WINDOW_Y                        0x0004
-#define WINDOW_WHMAPMODE                0x0008
-#define WINDOW_WIDTH                    0x0010
-#define WINDOW_HEIGHT                   0x0020
-#define WINDOW_TEXT                     0x0080
-#define WINDOW_HELPTEXT                 0x0100
-#define WINDOW_QUICKTEXT                0x0200
-#define WINDOW_EXTRALONG                0x0800
-#define WINDOW_UNIQUEID                 0x1000
+#define RSWND_DISABLED					0x01
+#define RSWND_CLIENTSIZE				0x02
+
+#define WINDOW_XYMAPMODE				0x0001
+#define WINDOW_X						0x0002
+#define WINDOW_Y						0x0004
+#define WINDOW_WHMAPMODE				0x0008
+#define WINDOW_WIDTH					0x0010
+#define WINDOW_HEIGHT					0x0020
+#define WINDOW_TEXT 					0x0080
+#define WINDOW_HELPTEXT 				0x0100
+#define WINDOW_QUICKTEXT				0x0200
+#define WINDOW_EXTRALONG				0x0800
+#define WINDOW_UNIQUEID 				0x1000
 #define WINDOW_BORDER_STYLE             0x2000
 
 // Definition der Struktur die alle "WorkWindow"-Resourcen haben
-#define WORKWIN_SHOWNORMAL              0
-#define WORKWIN_SHOWMINIMIZED           1
-#define WORKWIN_SHOWMAXIMIZED           2
+#define WORKWIN_SHOWNORMAL				0
+#define WORKWIN_SHOWMINIMIZED			1
+#define WORKWIN_SHOWMAXIMIZED			2
 
 // Definition der Struktur der FixedBitmap-Resource.
-#define RSC_FIXEDBITMAP_BITMAP          0x0001
+#define RSC_FIXEDBITMAP_BITMAP			0x0001
 
 // Definition der Struktur der FixedImage-Resource.
-#define RSC_FIXEDIMAGE_IMAGE            0x0001
+#define RSC_FIXEDIMAGE_IMAGE			0x0001
 
 // Definition der Struktur des MenuButtons
-#define RSCMENUBUTTON_MENU              0x01
+#define RSCMENUBUTTON_MENU				0x01
 
 // Definition der Struktur die alle Menu-Resourcen haben
-#define RSC_MENU_ITEMS                  0x01
-#define RSC_MENU_TEXT                   0x02
-#define RSC_MENU_DEFAULTITEMID          0x04
+#define RSC_MENU_ITEMS					0x01
+#define RSC_MENU_TEXT					0x02
+#define RSC_MENU_DEFAULTITEMID			0x04
 
 // Hier sind die MenuItem-Resourceoptionen definiert
-#define RSC_MENUITEM_SEPARATOR          0x001
-#define RSC_MENUITEM_ID                 0x002
-#define RSC_MENUITEM_STATUS             0x004
-#define RSC_MENUITEM_TEXT               0x008
-#define RSC_MENUITEM_BITMAP             0x010
-#define RSC_MENUITEM_HELPTEXT           0x020
-#define RSC_MENUITEM_HELPID             0x040
-#define RSC_MENUITEM_KEYCODE            0x080
-#define RSC_MENUITEM_MENU               0x100
-#define RSC_MENUITEM_CHECKED            0x200
-#define RSC_MENUITEM_DISABLE            0x400
-#define RSC_MENUITEM_COMMAND            0x800
+#define RSC_MENUITEM_SEPARATOR			0x001
+#define RSC_MENUITEM_ID 				0x002
+#define RSC_MENUITEM_STATUS 			0x004
+#define RSC_MENUITEM_TEXT				0x008
+#define RSC_MENUITEM_BITMAP 			0x010
+#define RSC_MENUITEM_HELPTEXT			0x020
+#define RSC_MENUITEM_HELPID 			0x040
+#define RSC_MENUITEM_KEYCODE			0x080
+#define RSC_MENUITEM_MENU				0x100
+#define RSC_MENUITEM_CHECKED			0x200
+#define RSC_MENUITEM_DISABLE			0x400
+#define RSC_MENUITEM_COMMAND			0x800
 
 // Hier sind die AccelKey-Resourceoptionen definiert
-#define ACCELITEM_ACCEL                 0x01
-#define ACCELITEM_KEY                   0x02
+#define ACCELITEM_ACCEL 				0x01
+#define ACCELITEM_KEY					0x02
 
 // Definition der Struktur die alle "Field"-Resourcen haben
-#define PATTERNFORMATTER_STRICTFORMAT   0x01
-#define PATTERNFORMATTER_EDITMASK       0x02
-#define PATTERNFORMATTER_LITTERALMASK   0x04
-
-#define NUMERICFORMATTER_MIN            0x01
-#define NUMERICFORMATTER_MAX            0x02
-#define NUMERICFORMATTER_STRICTFORMAT   0x04
-//#define NUMERICFORMATTER_I12          0x08    // erAck: got rid of class International (2005-06-17)
-#define NUMERICFORMATTER_DECIMALDIGITS  0x10
-#define NUMERICFORMATTER_VALUE          0x20
+#define PATTERNFORMATTER_STRICTFORMAT	0x01
+#define PATTERNFORMATTER_EDITMASK		0x02
+#define PATTERNFORMATTER_LITTERALMASK	0x04
+
+#define NUMERICFORMATTER_MIN			0x01
+#define NUMERICFORMATTER_MAX			0x02
+#define NUMERICFORMATTER_STRICTFORMAT	0x04
+//#define NUMERICFORMATTER_I12			0x08    // erAck: got rid of class International (2005-06-17)
+#define NUMERICFORMATTER_DECIMALDIGITS	0x10
+#define NUMERICFORMATTER_VALUE			0x20
 #define NUMERICFORMATTER_NOTHOUSANDSEP  0x40
 
-#define METRICFORMATTER_UNIT            0x01
-#define METRICFORMATTER_CUSTOMUNITTEXT  0x02
+#define METRICFORMATTER_UNIT			0x01
+#define METRICFORMATTER_CUSTOMUNITTEXT	0x02
 
-#define DATEFORMATTER_MIN               0x01
-#define DATEFORMATTER_MAX               0x02
-#define DATEFORMATTER_LONGFORMAT        0x04
-#define DATEFORMATTER_STRICTFORMAT      0x08
-//#define DATEFORMATTER_I12             0x10    // erAck: got rid of class International (2005-06-17)
-#define DATEFORMATTER_VALUE             0x20
+#define DATEFORMATTER_MIN				0x01
+#define DATEFORMATTER_MAX				0x02
+#define DATEFORMATTER_LONGFORMAT		0x04
+#define DATEFORMATTER_STRICTFORMAT		0x08
+//#define DATEFORMATTER_I12				0x10    // erAck: got rid of class International (2005-06-17)
+#define DATEFORMATTER_VALUE 			0x20
 
-#define TIMEFORMATTER_MIN               0x01
-#define TIMEFORMATTER_MAX               0x02
-#define TIMEFORMATTER_TIMEFIELDFORMAT   0x04
-#define TIMEFORMATTER_DURATION          0x08
-#define TIMEFORMATTER_STRICTFORMAT      0x10
-//#define TIMEFORMATTER_I12             0x20    // erAck: got rid of class International (2005-06-17)
-#define TIMEFORMATTER_VALUE             0x40
+#define TIMEFORMATTER_MIN				0x01
+#define TIMEFORMATTER_MAX				0x02
+#define TIMEFORMATTER_TIMEFIELDFORMAT	0x04
+#define TIMEFORMATTER_DURATION			0x08
+#define TIMEFORMATTER_STRICTFORMAT		0x10
+//#define TIMEFORMATTER_I12				0x20    // erAck: got rid of class International (2005-06-17)
+#define TIMEFORMATTER_VALUE 			0x40
 
-#define NUMERICFIELD_FIRST              0x01
-#define NUMERICFIELD_LAST               0x02
-#define NUMERICFIELD_SPINSIZE           0x04
+#define NUMERICFIELD_FIRST				0x01
+#define NUMERICFIELD_LAST				0x02
+#define NUMERICFIELD_SPINSIZE			0x04
 
-#define METRICFIELD_FIRST               0x01
-#define METRICFIELD_LAST                0x02
-#define METRICFIELD_SPINSIZE            0x04
+#define METRICFIELD_FIRST				0x01
+#define METRICFIELD_LAST				0x02
+#define METRICFIELD_SPINSIZE			0x04
 
-#define CURRENCYFIELD_FIRST             0x01
-#define CURRENCYFIELD_LAST              0x02
-#define CURRENCYFIELD_SPINSIZE          0x04
+#define CURRENCYFIELD_FIRST 			0x01
+#define CURRENCYFIELD_LAST				0x02
+#define CURRENCYFIELD_SPINSIZE			0x04
 
-#define DATEFIELD_FIRST                 0x01
-#define DATEFIELD_LAST                  0x02
+#define DATEFIELD_FIRST 				0x01
+#define DATEFIELD_LAST					0x02
 
-#define TIMEFIELD_FIRST                 0x01
-#define TIMEFIELD_LAST                  0x02
+#define TIMEFIELD_FIRST 				0x01
+#define TIMEFIELD_LAST					0x02
 
 // Definition der Struktur die alle "ToolBoxItem"-Resourcen haben
-#define RSC_TOOLBOXITEM_ID              0x0001
-#define RSC_TOOLBOXITEM_TYPE            0x0002
-#define RSC_TOOLBOXITEM_STATUS          0x0004
-#define RSC_TOOLBOXITEM_HELPID          0x0008
-#define RSC_TOOLBOXITEM_TEXT            0x0010
-#define RSC_TOOLBOXITEM_HELPTEXT        0x0020
-#define RSC_TOOLBOXITEM_BITMAP          0x0040
-#define RSC_TOOLBOXITEM_IMAGE           0x0080
-#define RSC_TOOLBOXITEM_DISABLE         0x0100
-#define RSC_TOOLBOXITEM_STATE           0x0200
-#define RSC_TOOLBOXITEM_HIDE            0x0400
-#define RSC_TOOLBOXITEM_COMMAND         0x0800
-#define RSC_TOOLBOXITEM_MENUSTRINGS     0x1000
+#define RSC_TOOLBOXITEM_ID				0x0001
+#define RSC_TOOLBOXITEM_TYPE			0x0002
+#define RSC_TOOLBOXITEM_STATUS			0x0004
+#define RSC_TOOLBOXITEM_HELPID			0x0008
+#define RSC_TOOLBOXITEM_TEXT			0x0010
+#define RSC_TOOLBOXITEM_HELPTEXT		0x0020
+#define RSC_TOOLBOXITEM_BITMAP			0x0040
+#define RSC_TOOLBOXITEM_IMAGE			0x0080
+#define RSC_TOOLBOXITEM_DISABLE 		0x0100
+#define RSC_TOOLBOXITEM_STATE			0x0200
+#define RSC_TOOLBOXITEM_HIDE			0x0400
+#define RSC_TOOLBOXITEM_COMMAND 		0x0800
+#define RSC_TOOLBOXITEM_MENUSTRINGS 	0x1000
 
 // Definition der Struktur die alle ToolBox-Resourcen haben
-#define RSC_TOOLBOX_BUTTONTYPE          0x01
-#define RSC_TOOLBOX_ALIGN               0x02
-#define RSC_TOOLBOX_LINECOUNT           0x04
-#define RSC_TOOLBOX_FLOATLINES          0x08
-#define RSC_TOOLBOX_CUSTOMIZE           0x10
-#define RSC_TOOLBOX_MENUSTRINGS         0x20
-#define RSC_TOOLBOX_ITEMIMAGELIST       0x40
-#define RSC_TOOLBOX_ITEMLIST            0x80
+#define RSC_TOOLBOX_BUTTONTYPE			0x01
+#define RSC_TOOLBOX_ALIGN				0x02
+#define RSC_TOOLBOX_LINECOUNT			0x04
+#define RSC_TOOLBOX_FLOATLINES			0x08
+#define RSC_TOOLBOX_CUSTOMIZE			0x10
+#define RSC_TOOLBOX_MENUSTRINGS 		0x20
+#define RSC_TOOLBOX_ITEMIMAGELIST		0x40
+#define RSC_TOOLBOX_ITEMLIST			0x80
 
 // Definition der Struktur die alle MoreButton-Resourcen haben
-#define RSC_MOREBUTTON_STATE            0x01
-#define RSC_MOREBUTTON_MAPUNIT          0x02
-#define RSC_MOREBUTTON_DELTA            0x04
+#define RSC_MOREBUTTON_STATE			0x01
+#define RSC_MOREBUTTON_MAPUNIT			0x02
+#define RSC_MOREBUTTON_DELTA			0x04
 
 // Definition der Struktur die alle FloatingWindow-Resourcen haben
-#define RSC_FLOATINGWINDOW_WHMAPMODE    0x01
-#define RSC_FLOATINGWINDOW_WIDTH        0x02
-#define RSC_FLOATINGWINDOW_HEIGHT       0x04
-#define RSC_FLOATINGWINDOW_ZOOMIN       0x08
+#define RSC_FLOATINGWINDOW_WHMAPMODE	0x01
+#define RSC_FLOATINGWINDOW_WIDTH		0x02
+#define RSC_FLOATINGWINDOW_HEIGHT		0x04
+#define RSC_FLOATINGWINDOW_ZOOMIN		0x08
 
 // Definition der Struktur die alle DockingWindow-Resourcen haben
-#define RSC_DOCKINGWINDOW_XYMAPMODE     0x01
-#define RSC_DOCKINGWINDOW_X             0x02
-#define RSC_DOCKINGWINDOW_Y             0x04
-#define RSC_DOCKINGWINDOW_FLOATING      0x08
+#define RSC_DOCKINGWINDOW_XYMAPMODE 	0x01
+#define RSC_DOCKINGWINDOW_X 			0x02
+#define RSC_DOCKINGWINDOW_Y 			0x04
+#define RSC_DOCKINGWINDOW_FLOATING		0x08
 
 // Definition der Struktur die alle "TabControlItem"-Resourcen haben
-#define RSC_TABCONTROLITEM_ID           0x0001
-#define RSC_TABCONTROLITEM_TEXT         0x0002
-#define RSC_TABCONTROLITEM_PAGERESID    0x0008
+#define RSC_TABCONTROLITEM_ID			0x0001
+#define RSC_TABCONTROLITEM_TEXT 		0x0002
+#define RSC_TABCONTROLITEM_PAGERESID	0x0008
 
 // Definition der Struktur die alle TabControl-Resourcen haben
-#define RSC_TABCONTROL_ITEMLIST         0x01
+#define RSC_TABCONTROL_ITEMLIST 		0x01
 
 // Definition der Struktur des ImageButtons
-#define RSC_IMAGEBUTTON_IMAGE           0x01
-#define RSC_IMAGEBUTTON_SYMBOL          0x02
-#define RSC_IMAGEBUTTON_STATE           0x04
+#define RSC_IMAGEBUTTON_IMAGE			0x01
+#define RSC_IMAGEBUTTON_SYMBOL			0x02
+#define RSC_IMAGEBUTTON_STATE			0x04
 
 // Definition der Struktur des ImageRadioButtons
-#define RSC_IMAGERADIOBUTTON_IMAGE      0x01
+#define RSC_IMAGERADIOBUTTON_IMAGE		0x01
 
 // Definition der Struktur des Image
-#define RSC_IMAGE_IMAGEBITMAP           0x01
-#define RSC_IMAGE_MASKBITMAP            0x02
-#define RSC_IMAGE_MASKCOLOR             0x04
+#define RSC_IMAGE_IMAGEBITMAP			0x01
+#define RSC_IMAGE_MASKBITMAP			0x02
+#define RSC_IMAGE_MASKCOLOR 			0x04
 
 // Definition der Struktur des Image
-#define RSC_IMAGELIST_IMAGEBITMAP       0x01
-#define RSC_IMAGELIST_MASKBITMAP        0x02
-#define RSC_IMAGELIST_MASKCOLOR         0x04
-#define RSC_IMAGELIST_IDLIST            0x08
-#define RSC_IMAGELIST_IDCOUNT           0x10
+#define RSC_IMAGELIST_IMAGEBITMAP		0x01
+#define RSC_IMAGELIST_MASKBITMAP		0x02
+#define RSC_IMAGELIST_MASKCOLOR 		0x04
+#define RSC_IMAGELIST_IDLIST			0x08
+#define RSC_IMAGELIST_IDCOUNT			0x10
 
 // obsolete, should be removed by MM
-#define RSC_COLOR                       (RSC_NOTYPE + 0x16)
-#define TIME_HOUR                       0x01
-#define TIME_MINUTE                     0x02
-#define TIME_SECOND                     0x04
-#define TIME_SEC100                     0x08
-#define DATE_YEAR                       0x01
-#define DATE_MONTH                      0x02
-#define DATE_DAY                        0x04
+#define RSC_COLOR						(RSC_NOTYPE + 0x16)
+#define TIME_HOUR						0x01
+#define TIME_MINUTE 					0x02
+#define TIME_SECOND 					0x04
+#define TIME_SEC100 					0x08
+#define DATE_YEAR						0x01
+#define DATE_MONTH						0x02
+#define DATE_DAY						0x04
 
 #endif // _TOOLS_RC_H
diff --git a/tools/inc/tools/rc.hxx b/tools/inc/tools/rc.hxx
index 4bf1827a1ab6..1fd6dfd6b5a2 100644
--- a/tools/inc/tools/rc.hxx
+++ b/tools/inc/tools/rc.hxx
@@ -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
@@ -40,44 +40,44 @@ class TOOLS_DLLPUBLIC Resource
 {
     protected:
     ResMgr* m_pResMgr;
-
+    
     // check availability of Resource
-    BOOL                IsAvailableRes( const ResId& rId ) const
+    BOOL				IsAvailableRes( const ResId& rId ) const
     { return m_pResMgr->IsAvailable( rId, this ); }
 
     // Load a Resource
-    void                GetRes( const ResId& rResId );
-
+    void				GetRes( const ResId& rResId );
+    
     // check Resource state
-    void                TestRes();
-
+    void				TestRes();
+    
     // Get a pointer to the Resource's data
     void* GetClassRes()
     { return m_pResMgr->GetClass(); }
-
+    
     // read a string from the resource
-    static sal_uInt32   GetStringRes( UniString& rStr, const BYTE* pStr )
+    static sal_uInt32	GetStringRes( UniString& rStr, const BYTE* pStr )
     { return ResMgr::GetString( rStr, pStr ); }
-
+    
     // increase the memory pointer gotten by GetClassRes()
     void* IncrementRes( sal_uInt32 nBytes )
     { return m_pResMgr->Increment( nBytes ); }
-
+    
     // return the memory size of a Resource data block
-    static sal_uInt32   GetObjSizeRes( RSHEADER_TYPE * pHT )
+    static sal_uInt32	GetObjSizeRes( RSHEADER_TYPE * pHT )
     { return ResMgr::GetObjSize( pHT ); }
-
+    
     // return the remaining size of this Resource's data
     sal_uInt32 GetRemainSizeRes()
     { return m_pResMgr->GetRemainSize(); }
-
+    
     // get a 32bit value from Resource data
-    static sal_Int32    GetLongRes( void * pLong )
+    static sal_Int32	GetLongRes( void * pLong )
     { return ResMgr::GetLong( pLong ); }
     // get a 16bit value from Resource data
-    static sal_Int16    GetShortRes( void * pShort )
+    static sal_Int16	GetShortRes( void * pShort )
     { return ResMgr::GetShort( pShort ); }
-
+    
     // read a 32bit value from resource data and increment pointer
     sal_Int32 ReadLongRes()
     { return m_pResMgr->ReadLong(); }
@@ -87,16 +87,16 @@ class TOOLS_DLLPUBLIC Resource
     // read a string from resource data and increment pointer
     UniString ReadStringRes()
     { return m_pResMgr->ReadString(); }
-
+    
     // Gibt die Resource frei (this-Zeiger fuer Fehlerueberpruefung)
     // free the resource from m_pResMgr's stack (pass this ptr for validation)
     void FreeResource()
     { m_pResMgr->PopContext( this ); }
-
+    
     // constructors
     Resource() : m_pResMgr( NULL ) {}
     Resource( const ResId& rResId );
-
+    
     public:
     #ifdef DBG_UTIL
     ~Resource() { TestRes(); }
diff --git a/tools/inc/tools/rcid.h b/tools/inc/tools/rcid.h
index 3daf64c547a7..e9eadfb02b58 100644
--- a/tools/inc/tools/rcid.h
+++ b/tools/inc/tools/rcid.h
@@ -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
@@ -31,103 +31,103 @@
 #include <tools/resid.hxx>
 
 // Definition der Versionsnummer
-#define RSCVERSION_ID           200U
+#define RSCVERSION_ID			200U
 // Definition eines ungueltige Identifiers.
-#define RC_NO_ID                (sal_uInt32(0xFFFFFFFF))
+#define RC_NO_ID				(sal_uInt32(0xFFFFFFFF))
 
 // Dies sind die Resourcetypen
 // Mindestens 0x100 wegen MS-Windows Resourcetypen
-//#define RSC_NOTYPE              0x100
+//#define RSC_NOTYPE			  0x100
 //RSC_NOTYPE wird in resid.hxx definiert
-#define RSC_BYNAME              (RSC_NOTYPE + 0x01)
-#define RSC_VERSIONCONTROL      (RSC_NOTYPE + 0x02) // Versionskontrolle
+#define RSC_BYNAME				(RSC_NOTYPE + 0x01)
+#define RSC_VERSIONCONTROL		(RSC_NOTYPE + 0x02) // Versionskontrolle
 
-#define RSC_RESOURCE            (RSC_NOTYPE + 0x10)
-#define RSC_STRING              (RSC_NOTYPE + 0x11)
-#define RSC_BITMAP              (RSC_NOTYPE + 0x13)
-#define RSC_ACCEL               (RSC_NOTYPE + 0x1a)
-#define RSC_ACCELITEM           (RSC_NOTYPE + 0x1b)// nur intern
-#define RSC_MENU                (RSC_NOTYPE + 0x1c)
-#define RSC_MENUITEM            (RSC_NOTYPE + 0x1d)// nur intern
-#define RSC_KEYCODE             (RSC_NOTYPE + 0x1f)
-#define RSC_TIME                (RSC_NOTYPE + 0x20)
-#define RSC_DATE                (RSC_NOTYPE + 0x21)
-//#define RSC_INTERNATIONAL     (RSC_NOTYPE + 0x22) // erAck: got rid of class International (2005-06-17)
-#define RSC_IMAGE               (RSC_NOTYPE + 0x23)
-#define RSC_IMAGELIST           (RSC_NOTYPE + 0x24)
+#define RSC_RESOURCE			(RSC_NOTYPE + 0x10)
+#define RSC_STRING				(RSC_NOTYPE + 0x11)
+#define RSC_BITMAP				(RSC_NOTYPE + 0x13)
+#define RSC_ACCEL				(RSC_NOTYPE + 0x1a)
+#define RSC_ACCELITEM			(RSC_NOTYPE + 0x1b)// nur intern
+#define RSC_MENU				(RSC_NOTYPE + 0x1c)
+#define RSC_MENUITEM			(RSC_NOTYPE + 0x1d)// nur intern
+#define RSC_KEYCODE 			(RSC_NOTYPE + 0x1f)
+#define RSC_TIME				(RSC_NOTYPE + 0x20)
+#define RSC_DATE				(RSC_NOTYPE + 0x21)
+//#define RSC_INTERNATIONAL		(RSC_NOTYPE + 0x22) // erAck: got rid of class International (2005-06-17)
+#define RSC_IMAGE				(RSC_NOTYPE + 0x23)
+#define RSC_IMAGELIST			(RSC_NOTYPE + 0x24)
 
-#define RSC_MESSBOX             (RSC_NOTYPE + 0x30)
-#define RSC_INFOBOX             (RSC_NOTYPE + 0x31)
-#define RSC_WARNINGBOX          (RSC_NOTYPE + 0x32)
-#define RSC_ERRORBOX            (RSC_NOTYPE + 0x33)
-#define RSC_QUERYBOX            (RSC_NOTYPE + 0x34)
-#define RSC_WINDOW              (RSC_NOTYPE + 0x35)
-#define RSC_SYSWINDOW           (RSC_NOTYPE + 0x36)
-#define RSC_WORKWIN             (RSC_NOTYPE + 0x37)
-#define RSC_MDIWINDOW           (RSC_NOTYPE + 0x38)
-#define RSC_FLOATINGWINDOW      (RSC_NOTYPE + 0x39)
-#define RSC_DIALOG              (RSC_NOTYPE + 0x3a)
-#define RSC_MODELESSDIALOG      (RSC_NOTYPE + 0x3b)
-#define RSC_MODALDIALOG         (RSC_NOTYPE + 0x3c)
-#define RSC_CONTROL             (RSC_NOTYPE + 0x44)
-#define RSC_BUTTON              (RSC_NOTYPE + 0x45)
-#define RSC_PUSHBUTTON          (RSC_NOTYPE + 0x46)
-#define RSC_OKBUTTON            (RSC_NOTYPE + 0x47)
-#define RSC_CANCELBUTTON        (RSC_NOTYPE + 0x48)
-#define RSC_HELPBUTTON          (RSC_NOTYPE + 0x49)
-#define RSC_IMAGEBUTTON         (RSC_NOTYPE + 0x4a)
-#define RSC_MENUBUTTON          (RSC_NOTYPE + 0x4b)
-#define RSC_MOREBUTTON          (RSC_NOTYPE + 0x4c)
-#define RSC_SPINBUTTON          (RSC_NOTYPE + 0x4d)
-#define RSC_RADIOBUTTON         (RSC_NOTYPE + 0x4e)
-#define RSC_IMAGERADIOBUTTON    (RSC_NOTYPE + 0x4f)
-#define RSC_CHECKBOX            (RSC_NOTYPE + 0x50)
-#define RSC_TRISTATEBOX         (RSC_NOTYPE + 0x51)
-#define RSC_EDIT                (RSC_NOTYPE + 0x52)
-#define RSC_MULTILINEEDIT       (RSC_NOTYPE + 0x53)
-#define RSC_COMBOBOX            (RSC_NOTYPE + 0x54)
-#define RSC_LISTBOX             (RSC_NOTYPE + 0x55)
-#define RSC_MULTILISTBOX        (RSC_NOTYPE + 0x56)
-#define RSC_TEXT                (RSC_NOTYPE + 0x57)
-#define RSC_FIXEDLINE           (RSC_NOTYPE + 0x58)
-#define RSC_FIXEDBITMAP         (RSC_NOTYPE + 0x59)
-#define RSC_FIXEDIMAGE          (RSC_NOTYPE + 0x5a)
-#define RSC_GROUPBOX            (RSC_NOTYPE + 0x5c)
-#define RSC_SCROLLBAR           (RSC_NOTYPE + 0x5d)
-#define RSC_SCROLLBARBOX        (RSC_NOTYPE + 0x5e)
-#define RSC_SPLITTER            (RSC_NOTYPE + 0x5f)
-#define RSC_SPLITWINDOW         (RSC_NOTYPE + 0x60)
-#define RSC_SPINFIELD           (RSC_NOTYPE + 0x61)
-#define RSC_PATTERNFIELD        (RSC_NOTYPE + 0x62)
-#define RSC_NUMERICFIELD        (RSC_NOTYPE + 0x63)
-#define RSC_METRICFIELD         (RSC_NOTYPE + 0x64)
-#define RSC_CURRENCYFIELD       (RSC_NOTYPE + 0x65)
-#define RSC_DATEFIELD           (RSC_NOTYPE + 0x66)
-#define RSC_TIMEFIELD           (RSC_NOTYPE + 0x67)
-#define RSC_PATTERNBOX          (RSC_NOTYPE + 0x68)
-#define RSC_NUMERICBOX          (RSC_NOTYPE + 0x69)
-#define RSC_METRICBOX           (RSC_NOTYPE + 0x6a)
-#define RSC_CURRENCYBOX         (RSC_NOTYPE + 0x6b)
-#define RSC_DATEBOX             (RSC_NOTYPE + 0x6c)
-#define RSC_TIMEBOX             (RSC_NOTYPE + 0x6d)
-#define RSC_LONGCURRENCYFIELD   (RSC_NOTYPE + 0x6e)
-#define RSC_LONGCURRENCYBOX     (RSC_NOTYPE + 0x6f)
-#define RSC_TOOLBOXITEM         (RSC_NOTYPE + 0x70)
-#define RSC_TOOLBOX             (RSC_NOTYPE + 0x71)
-#define RSC_DOCKINGWINDOW       (RSC_NOTYPE + 0x72)
-#define RSC_STATUSBAR           (RSC_NOTYPE + 0x73)
-#define RSC_TABPAGE             (RSC_NOTYPE + 0x74)
-#define RSC_TABCONTROL          (RSC_NOTYPE + 0x75)
-#define RSC_TABDIALOG           (RSC_NOTYPE + 0x76)
-#define RSC_TABCONTROLITEM      (RSC_NOTYPE + 0x77)
-#define RSC_TREELISTBOX         (RSC_NOTYPE + 0x78)
-#define RSC_STRINGARRAY         (RSC_NOTYPE + 0x79)
+#define RSC_MESSBOX 			(RSC_NOTYPE + 0x30)
+#define RSC_INFOBOX 			(RSC_NOTYPE + 0x31)
+#define RSC_WARNINGBOX			(RSC_NOTYPE + 0x32)
+#define RSC_ERRORBOX			(RSC_NOTYPE + 0x33)
+#define RSC_QUERYBOX			(RSC_NOTYPE + 0x34)
+#define RSC_WINDOW				(RSC_NOTYPE + 0x35)
+#define RSC_SYSWINDOW			(RSC_NOTYPE + 0x36)
+#define RSC_WORKWIN 			(RSC_NOTYPE + 0x37)
+#define RSC_MDIWINDOW			(RSC_NOTYPE + 0x38)
+#define RSC_FLOATINGWINDOW		(RSC_NOTYPE + 0x39)
+#define RSC_DIALOG				(RSC_NOTYPE + 0x3a)
+#define RSC_MODELESSDIALOG		(RSC_NOTYPE + 0x3b)
+#define RSC_MODALDIALOG 		(RSC_NOTYPE + 0x3c)
+#define RSC_CONTROL 			(RSC_NOTYPE + 0x44)
+#define RSC_BUTTON				(RSC_NOTYPE + 0x45)
+#define RSC_PUSHBUTTON			(RSC_NOTYPE + 0x46)
+#define RSC_OKBUTTON			(RSC_NOTYPE + 0x47)
+#define RSC_CANCELBUTTON		(RSC_NOTYPE + 0x48)
+#define RSC_HELPBUTTON			(RSC_NOTYPE + 0x49)
+#define RSC_IMAGEBUTTON 		(RSC_NOTYPE + 0x4a)
+#define RSC_MENUBUTTON			(RSC_NOTYPE + 0x4b)
+#define RSC_MOREBUTTON			(RSC_NOTYPE + 0x4c)
+#define RSC_SPINBUTTON			(RSC_NOTYPE + 0x4d)
+#define RSC_RADIOBUTTON 		(RSC_NOTYPE + 0x4e)
+#define RSC_IMAGERADIOBUTTON	(RSC_NOTYPE + 0x4f)
+#define RSC_CHECKBOX			(RSC_NOTYPE + 0x50)
+#define RSC_TRISTATEBOX 		(RSC_NOTYPE + 0x51)
+#define RSC_EDIT				(RSC_NOTYPE + 0x52)
+#define RSC_MULTILINEEDIT		(RSC_NOTYPE + 0x53)
+#define RSC_COMBOBOX			(RSC_NOTYPE + 0x54)
+#define RSC_LISTBOX 			(RSC_NOTYPE + 0x55)
+#define RSC_MULTILISTBOX		(RSC_NOTYPE + 0x56)
+#define RSC_TEXT				(RSC_NOTYPE + 0x57)
+#define RSC_FIXEDLINE			(RSC_NOTYPE + 0x58)
+#define RSC_FIXEDBITMAP 		(RSC_NOTYPE + 0x59)
+#define RSC_FIXEDIMAGE			(RSC_NOTYPE + 0x5a)
+#define RSC_GROUPBOX			(RSC_NOTYPE + 0x5c)
+#define RSC_SCROLLBAR			(RSC_NOTYPE + 0x5d)
+#define RSC_SCROLLBARBOX		(RSC_NOTYPE + 0x5e)
+#define RSC_SPLITTER			(RSC_NOTYPE + 0x5f)
+#define RSC_SPLITWINDOW 		(RSC_NOTYPE + 0x60)
+#define RSC_SPINFIELD			(RSC_NOTYPE + 0x61)
+#define RSC_PATTERNFIELD		(RSC_NOTYPE + 0x62)
+#define RSC_NUMERICFIELD		(RSC_NOTYPE + 0x63)
+#define RSC_METRICFIELD 		(RSC_NOTYPE + 0x64)
+#define RSC_CURRENCYFIELD		(RSC_NOTYPE + 0x65)
+#define RSC_DATEFIELD			(RSC_NOTYPE + 0x66)
+#define RSC_TIMEFIELD			(RSC_NOTYPE + 0x67)
+#define RSC_PATTERNBOX			(RSC_NOTYPE + 0x68)
+#define RSC_NUMERICBOX			(RSC_NOTYPE + 0x69)
+#define RSC_METRICBOX			(RSC_NOTYPE + 0x6a)
+#define RSC_CURRENCYBOX 		(RSC_NOTYPE + 0x6b)
+#define RSC_DATEBOX 			(RSC_NOTYPE + 0x6c)
+#define RSC_TIMEBOX 			(RSC_NOTYPE + 0x6d)
+#define RSC_LONGCURRENCYFIELD	(RSC_NOTYPE + 0x6e)
+#define RSC_LONGCURRENCYBOX 	(RSC_NOTYPE + 0x6f)
+#define RSC_TOOLBOXITEM 		(RSC_NOTYPE + 0x70)
+#define RSC_TOOLBOX 			(RSC_NOTYPE + 0x71)
+#define RSC_DOCKINGWINDOW		(RSC_NOTYPE + 0x72)
+#define RSC_STATUSBAR			(RSC_NOTYPE + 0x73)
+#define RSC_TABPAGE 			(RSC_NOTYPE + 0x74)
+#define RSC_TABCONTROL			(RSC_NOTYPE + 0x75)
+#define RSC_TABDIALOG			(RSC_NOTYPE + 0x76)
+#define RSC_TABCONTROLITEM		(RSC_NOTYPE + 0x77)
+#define RSC_TREELISTBOX 		(RSC_NOTYPE + 0x78)
+#define RSC_STRINGARRAY 		(RSC_NOTYPE + 0x79)
 
 // (RSC_NOTYPE + 0x200) - (RSC_NOTYPE + 0x300) fuer Sfx reserviert
 
-#define RT_SYS_BITMAP           (RSC_NOTYPE + 0xf2)
-#define RT_SYS_STRING           (RSC_NOTYPE + 0xf3)     // Sonderbehandlung
-#define RT_SYS_FILE             (RSC_NOTYPE + 0xf4)     // nicht implementiert
+#define RT_SYS_BITMAP			(RSC_NOTYPE + 0xf2)
+#define RT_SYS_STRING			(RSC_NOTYPE + 0xf3) 	// Sonderbehandlung
+#define RT_SYS_FILE 			(RSC_NOTYPE + 0xf4) 	// nicht implementiert
 
 // (RSC_NOTYPE + 0x200) - (RSC_NOTYPE + 0x300) fuer Sfx reserviert
 
diff --git a/tools/inc/tools/ref.hxx b/tools/inc/tools/ref.hxx
index ea1886b73e04..f5e4e753f02c 100644
--- a/tools/inc/tools/ref.hxx
+++ b/tools/inc/tools/ref.hxx
@@ -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
@@ -33,89 +33,89 @@
 
 //=========================================================================
 
-#define PRV_SV_DECL_REF_SIGNATURE( ClassName, Ref )                     \
-    inline               ClassName##Ref() { pObj = 0; }                 \
-    inline               ClassName##Ref( const ClassName##Ref & rObj ); \
-    inline               ClassName##Ref( ClassName * pObjP );           \
-    inline void          Clear();                                       \
-    inline               ~ClassName##Ref();                             \
-    inline ClassName##Ref & operator = ( const ClassName##Ref & rObj ); \
-    inline ClassName##Ref & operator = ( ClassName * pObj );            \
-    inline BOOL            Is() const { return pObj != NULL; }          \
-    inline ClassName *     operator &  () const { return pObj; }        \
-    inline ClassName *     operator -> () const { return pObj; }        \
-    inline ClassName &     operator *  () const { return *pObj; }       \
+#define PRV_SV_DECL_REF_SIGNATURE( ClassName, Ref )						\
+    inline               ClassName##Ref() { pObj = 0; }					\
+    inline               ClassName##Ref( const ClassName##Ref & rObj );	\
+    inline               ClassName##Ref( ClassName * pObjP );			\
+    inline void          Clear();										\
+    inline               ~ClassName##Ref();								\
+    inline ClassName##Ref & operator = ( const ClassName##Ref & rObj );	\
+    inline ClassName##Ref & operator = ( ClassName * pObj );			\
+    inline BOOL            Is() const { return pObj != NULL; }			\
+    inline ClassName *     operator &  () const { return pObj; }		\
+    inline ClassName *     operator -> () const { return pObj; }		\
+    inline ClassName &     operator *  () const { return *pObj; }		\
     inline operator ClassName * () const { return pObj; }
 
 #define PRV_SV_IMPL_REF_COUNTERS( ClassName, Ref, AddRef, AddNextRef, ReleaseRef, Init, pRefbase ) \
-inline ClassName##Ref::ClassName##Ref( const ClassName##Ref & rObj )        \
-    { pObj = rObj.pObj; if( pObj ) { Init pRefbase->AddNextRef; } }         \
-inline ClassName##Ref::ClassName##Ref( ClassName * pObjP )                  \
-{ pObj = pObjP; if( pObj ) { Init pRefbase->AddRef; } }                     \
-inline void ClassName##Ref::Clear()                                         \
-{                                                                           \
-    if( pObj )                                                              \
-    {                                                                       \
-        ClassName* const pRefObj = pRefbase;                                \
-        pObj = 0;                                                           \
-        pRefObj->ReleaseRef;                                                \
-    }                                                                       \
-}                                                                           \
-inline ClassName##Ref::~ClassName##Ref()                                    \
-{ if( pObj ) { pRefbase->ReleaseRef; } }                                    \
-inline ClassName##Ref & ClassName##Ref::                                    \
-            operator = ( const ClassName##Ref & rObj )                      \
-{                                                                           \
-    if( rObj.pObj ) rObj.pRefbase->AddNextRef;                              \
-    ClassName* const pRefObj = pRefbase;                                    \
-    pObj = rObj.pObj;                                                       \
-    Init if( pRefObj ) { pRefObj->ReleaseRef; }                             \
-    return *this;                                                           \
-}                                                                           \
-inline ClassName##Ref & ClassName##Ref::operator = ( ClassName * pObjP )    \
+inline ClassName##Ref::ClassName##Ref( const ClassName##Ref & rObj )		\
+    { pObj = rObj.pObj; if( pObj ) { Init pRefbase->AddNextRef; } }			\
+inline ClassName##Ref::ClassName##Ref( ClassName * pObjP )					\
+{ pObj = pObjP; if( pObj ) { Init pRefbase->AddRef; } }						\
+inline void ClassName##Ref::Clear()											\
+{																			\
+    if( pObj )																\
+    {																		\
+        ClassName* const pRefObj = pRefbase;								\
+        pObj = 0;															\
+        pRefObj->ReleaseRef;												\
+    }																		\
+}																			\
+inline ClassName##Ref::~ClassName##Ref()									\
+{ if( pObj ) { pRefbase->ReleaseRef; } }									\
+inline ClassName##Ref & ClassName##Ref::									\
+            operator = ( const ClassName##Ref & rObj )						\
+{																			\
+    if( rObj.pObj ) rObj.pRefbase->AddNextRef;								\
+    ClassName* const pRefObj = pRefbase;									\
+    pObj = rObj.pObj;														\
+    Init if( pRefObj ) { pRefObj->ReleaseRef; }								\
+    return *this;															\
+}																			\
+inline ClassName##Ref & ClassName##Ref::operator = ( ClassName * pObjP )	\
 { return *this = ClassName##Ref( pObjP ); }
 
-#define PRV_SV_DECL_REF_LOCK(ClassName, Ref)    \
-protected:                                      \
-    ClassName * pObj;                           \
-public:                                         \
+#define PRV_SV_DECL_REF_LOCK(ClassName, Ref)	\
+protected:										\
+    ClassName * pObj;							\
+public:											\
 PRV_SV_DECL_REF_SIGNATURE(ClassName, Ref)
 
-#define PRV_SV_DECL_REF( ClassName )            \
+#define PRV_SV_DECL_REF( ClassName )			\
 PRV_SV_DECL_REF_LOCK( ClassName, Ref )
 
-#define PRV_SV_DECL_LOCK( ClassName )           \
+#define PRV_SV_DECL_LOCK( ClassName )			\
 PRV_SV_DECL_REF_LOCK( ClassName, Lock )
 
-#define SV_DECL_REF( ClassName )                \
-class ClassName;                                \
-class ClassName##Ref                            \
-{                                               \
-    PRV_SV_DECL_REF( ClassName )                \
+#define SV_DECL_REF( ClassName )				\
+class ClassName;								\
+class ClassName##Ref							\
+{												\
+    PRV_SV_DECL_REF( ClassName )				\
 };
 
-#define SV_DECL_LOCK( ClassName )               \
-class ClassName;                                \
-class ClassName##Lock                           \
-{                                               \
-    PRV_SV_DECL_LOCK( ClassName )               \
+#define SV_DECL_LOCK( ClassName )				\
+class ClassName;								\
+class ClassName##Lock							\
+{												\
+    PRV_SV_DECL_LOCK( ClassName )				\
 };
 
-#define SV_IMPL_REF( ClassName )                                \
+#define SV_IMPL_REF( ClassName )								\
 PRV_SV_IMPL_REF_COUNTERS( ClassName, Ref, AddRef(), AddNextRef(),\
                           ReleaseReference(), EMPTYARG, pObj )
 
-#define SV_IMPL_LOCK( ClassName )                                   \
-PRV_SV_IMPL_REF_COUNTERS( ClassName, Lock, OwnerLock( TRUE ),       \
-                          OwnerLock( TRUE ), OwnerLock( FALSE ),    \
+#define SV_IMPL_LOCK( ClassName )									\
+PRV_SV_IMPL_REF_COUNTERS( ClassName, Lock, OwnerLock( TRUE ), 		\
+                          OwnerLock( TRUE ), OwnerLock( FALSE ), 	\
                           EMPTYARG, pObj )
 
-#define SV_DECL_IMPL_REF(ClassName)             \
-    SV_DECL_REF(ClassName)                      \
+#define SV_DECL_IMPL_REF(ClassName)				\
+    SV_DECL_REF(ClassName)						\
     SV_IMPL_REF(ClassName)
 
-#define SV_DECL_IMPL_LOCK( ClassName )          \
-    SV_DECL_LOCK(ClassName)                     \
+#define SV_DECL_IMPL_LOCK( ClassName )			\
+    SV_DECL_LOCK(ClassName)						\
     SV_IMPL_LOCK(ClassName)
 
 
@@ -300,9 +300,9 @@ inline EntryName ClassName##MemberList::Prev()\
             {return (EntryName)BaseList::Prev();}\
 inline void      ClassName##MemberList::Append( const ClassName##MemberList & rList )\
             {BaseList::Append(rList);}\
-inline ULONG     ClassName##MemberList::GetPos( const EntryName p) const\
+inline ULONG	 ClassName##MemberList::GetPos( const EntryName p) const\
             {return BaseList::GetPos( p );}\
-inline ULONG     ClassName##MemberList::GetPos\
+inline ULONG	 ClassName##MemberList::GetPos\
                     ( const EntryName p, ULONG nStart, BOOL bForward ) const\
             {return BaseList::GetPos( p, nStart, bForward );}
 
@@ -327,9 +327,9 @@ class TOOLS_DLLPUBLIC SvRefBase
     UINT32 nRefCount;
 #if defined (GCC) && (defined (C281) || defined (C290) || defined (C291))
 public:
-#else
+#else	
 protected:
-#endif
+#endif		
     virtual         ~SvRefBase();
     virtual void    QueryDelete();
 public:
@@ -351,7 +351,7 @@ public:
                             nRefCount -= SV_NO_DELETE_REFCOUNT;
                         return ++nRefCount;
                     }
-    void            ReleaseReference()
+    void			ReleaseReference()
                     {
                         if( !--nRefCount )
                             QueryDelete();
@@ -425,27 +425,27 @@ public:
     ~SvCompatWeakBase() { _xHdl->ResetWeakBase(); }
 };
 
-#define SV_DECL_WEAK_IMPL( ClassName, HdlName )                     \
-class ClassName##Weak                                               \
-{                                                                   \
-    HdlName _xHdl;                                                  \
-public:                                                             \
-    inline               ClassName##Weak( ) {}                      \
-    inline               ClassName##Weak( ClassName* pObj ) {       \
-        if( pObj ) _xHdl = pObj->GetHdl(); }                        \
-    inline void          Clear() { _xHdl.Clear(); }                 \
-    inline ClassName##Weak& operator = ( ClassName * pObj ) {       \
-        _xHdl = pObj ? pObj->GetHdl() : 0; return *this; }          \
-    inline BOOL            Is() const {                             \
-        return _xHdl.Is() && _xHdl->GetObj(); }                     \
-    inline ClassName *     operator &  () const {                   \
-        return (ClassName*) ( _xHdl.Is() ? _xHdl->GetObj() : 0 ); } \
-    inline ClassName *     operator -> () const {                   \
-        return (ClassName*) ( _xHdl.Is() ? _xHdl->GetObj() : 0 ); } \
-    inline ClassName &     operator *  () const {                   \
-        return *(ClassName*) _xHdl->GetObj(); }                     \
-    inline operator ClassName * () const {                          \
-        return (ClassName*) (_xHdl.Is() ? _xHdl->GetObj() : 0 ); }  \
+#define SV_DECL_WEAK_IMPL( ClassName, HdlName )						\
+class ClassName##Weak												\
+{																	\
+    HdlName _xHdl;												    \
+public:																\
+    inline               ClassName##Weak( ) {}           			\
+    inline               ClassName##Weak( ClassName* pObj ) {		\
+        if( pObj ) _xHdl = pObj->GetHdl(); }						\
+    inline void          Clear() { _xHdl.Clear(); }					\
+    inline ClassName##Weak& operator = ( ClassName * pObj ) {		\
+        _xHdl = pObj ? pObj->GetHdl() : 0; return *this; }			\
+    inline BOOL            Is() const {								\
+        return _xHdl.Is() && _xHdl->GetObj(); }						\
+    inline ClassName *     operator &  () const {					\
+        return (ClassName*) ( _xHdl.Is() ? _xHdl->GetObj() : 0 ); }	\
+    inline ClassName *     operator -> () const {					\
+        return (ClassName*) ( _xHdl.Is() ? _xHdl->GetObj() : 0 ); }	\
+    inline ClassName &     operator *  () const {					\
+        return *(ClassName*) _xHdl->GetObj(); }						\
+    inline operator ClassName * () const {							\
+        return (ClassName*) (_xHdl.Is() ? _xHdl->GetObj() : 0 ); }	\
 };
 
 #define SV_DECL_WEAK( ClassName ) SV_DECL_WEAK_IMPL( ClassName, SvWeakHdlRef )
diff --git a/tools/inc/tools/resary.hxx b/tools/inc/tools/resary.hxx
index b6cd8f8943c6..97c8606fa840 100644
--- a/tools/inc/tools/resary.hxx
+++ b/tools/inc/tools/resary.hxx
@@ -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
@@ -37,8 +37,8 @@
 
 struct ImplResStringItem
 {
-    XubString   maStr;
-    long        mnValue;
+    XubString	maStr;
+    long		mnValue;
 
 //#if 0 // _SOLAR__PRIVATE
 #ifdef _TOOLS_RESARY_CXX
@@ -62,32 +62,32 @@ class TOOLS_DLLPUBLIC ResStringArray
     // ---------------------
     struct ImplResStringItem
     {
-        XubString   m_aStr;
-        long        m_nValue;
-
+        XubString	m_aStr;
+        long		m_nValue;
+        
         ImplResStringItem( const XubString& rStr, long nValue = 0 ) :
         m_aStr( rStr ),
         m_nValue( nValue )
         {}
     };
-
+    
     std::vector< ImplResStringItem >    m_aStrings;
-
+    
     public:
     ResStringArray( const ResId& rResId );
     ~ResStringArray();
-
-    const XubString&    GetString( sal_uInt32 nIndex ) const
+    
+    const XubString&	GetString( sal_uInt32 nIndex ) const
     { return (nIndex < m_aStrings.size()) ? m_aStrings[nIndex].m_aStr : String::EmptyString(); }
-    long                GetValue( sal_uInt32 nIndex ) const
+    long				GetValue( sal_uInt32 nIndex ) const
     { return (nIndex < m_aStrings.size()) ? m_aStrings[nIndex].m_nValue : -1; }
-    sal_uInt32          Count() const { return sal_uInt32(m_aStrings.size()); }
-
-    sal_uInt32          FindIndex( long nValue ) const;
-
+    sal_uInt32			Count() const { return sal_uInt32(m_aStrings.size()); }
+    
+    sal_uInt32			FindIndex( long nValue ) const;
+    
     private:
     ResStringArray( const ResStringArray& );
-    ResStringArray&     operator=( const ResStringArray& );
+    ResStringArray& 	operator=( const ResStringArray& );
 };
 
-#endif  // _TOOLS_RESARY_HXX
+#endif	// _TOOLS_RESARY_HXX
diff --git a/tools/inc/tools/resid.hxx b/tools/inc/tools/resid.hxx
index cfefce8e6ab0..2f7552cba063 100644
--- a/tools/inc/tools/resid.hxx
+++ b/tools/inc/tools/resid.hxx
@@ -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
@@ -33,8 +33,8 @@
 
 struct RSHEADER_TYPE;
 typedef sal_uInt32 RESOURCE_TYPE;
-#define RSC_NOTYPE              0x100
-#define RSC_DONTRELEASE         (sal_uInt32(1 << 31))
+#define RSC_NOTYPE				0x100
+#define RSC_DONTRELEASE 		(sal_uInt32(1 << 31))
 
 class ResMgr;
 
@@ -52,14 +52,14 @@ class ResId
     In this case the highest bit if set decides whether to
     not to release the Resource context after loading this id
     */
-    RSHEADER_TYPE*          m_pResource;
-
-    mutable sal_uInt32      m_nResId;      // Resource Identifier
-    mutable RESOURCE_TYPE   m_nRT;         // type for loading (mutable to be set later)
-    mutable ResMgr *        m_pResMgr;     // load from this ResMgr (mutable for setting on demand)
-    mutable RESOURCE_TYPE   m_nRT2;        // type for loading (supercedes m_nRT)
+    RSHEADER_TYPE*	        m_pResource;
+    
+    mutable sal_uInt32      m_nResId; 	   // Resource Identifier
+    mutable RESOURCE_TYPE	m_nRT;		   // type for loading (mutable to be set later)
+    mutable ResMgr *		m_pResMgr;	   // load from this ResMgr (mutable for setting on demand)
+    mutable RESOURCE_TYPE	m_nRT2;		   // type for loading (supercedes m_nRT)
     mutable sal_uInt32      m_nWinBits;    // container for original style bits on a window in a resource
-
+    
     void ImplInit( sal_uInt32 nId, ResMgr& rMgr, RSHEADER_TYPE* pRes )
     {
         m_pResource = pRes; m_nResId = nId; m_nRT = RSC_NOTYPE; m_pResMgr = &rMgr; m_nRT2 = RSC_NOTYPE; m_nWinBits = 0;
@@ -87,24 +87,24 @@ class ResId
     {
         ImplInit( sal_uInt32(nId), rMgr, NULL );
     }
-
+    
     sal_uInt32 GetWinBits() const
     { return m_nWinBits; }
     void SetWinBits( sal_uInt32 nBits ) const
     { m_nWinBits = nBits; }
-
-    RESOURCE_TYPE   GetRT() const { return( m_nRT ); }
-    const ResId &   SetRT( RESOURCE_TYPE nType ) const
+    
+    RESOURCE_TYPE	GetRT() const { return( m_nRT ); }
+    const ResId &	SetRT( RESOURCE_TYPE nType ) const
     /*
     Set the type if not already set. Ask for tye with GetRT()
-
+    
     [Example]
     ResId aId( 1000 );
-    aId.SetRT( RSC_WINDOW );    // settype window Window
-    aId.SetRT( RSC_BUTTON );    // will not set type Button
+    aId.SetRT( RSC_WINDOW );	// settype window Window
+    aId.SetRT( RSC_BUTTON );	// will not set type Button
     //aId.GetRT() == RSC_WINDOW is true
-
-    @see
+    
+    @see    
     ResId::GetRT2(), ResId::GetRT()
     */
     {
@@ -112,7 +112,7 @@ class ResId
             m_nRT = nType;
         return *this;
     }
-    RESOURCE_TYPE   GetRT2() const
+    RESOURCE_TYPE	GetRT2() const
     /*
     Get the effective type (m_nRT2 or m_nRT1)
 
@@ -122,10 +122,10 @@ class ResId
     {
         return (RSC_NOTYPE == m_nRT2) ? m_nRT : m_nRT2;
     }
-    const ResId &   SetRT2( RESOURCE_TYPE nTyp ) const
+    const ResId &	SetRT2( RESOURCE_TYPE nTyp ) const
     /*
     Set the superceding type. Ask spcifically for it with GetRT2()
-
+    
     SetRT2() may only be called if no derived class calls SetRT in its
     Resource constructor.
     */
@@ -134,15 +134,15 @@ class ResId
             m_nRT2 = nTyp;
         return *this;
     }
-
-    ResMgr *        GetResMgr() const { return m_pResMgr; }
-    const ResId &   SetResMgr( ResMgr * pMgr ) const
+    
+    ResMgr *		GetResMgr() const { return m_pResMgr; }
+    const ResId &	SetResMgr( ResMgr * pMgr ) const
     {
         m_pResMgr = pMgr;
         OSL_ENSURE( m_pResMgr != NULL, "invalid ResMgr set on ResId" );
         return *this;
     }
-
+    
     const ResId &  SetAutoRelease(BOOL bRelease) const
     {
         if( bRelease )
@@ -151,12 +151,12 @@ class ResId
             m_nResId |= RSC_DONTRELEASE;
         return *this;
     }
-
-    BOOL           IsAutoRelease()  const
+    
+    BOOL		   IsAutoRelease()	const
     { return !(m_nResId & RSC_DONTRELEASE); }
-
-    sal_uInt32     GetId()          const { return m_nResId & ~RSC_DONTRELEASE; }
-    RSHEADER_TYPE* GetpResource()   const { return m_pResource; }
+    
+    sal_uInt32	   GetId()			const { return m_nResId & ~RSC_DONTRELEASE; }
+    RSHEADER_TYPE* GetpResource()	const { return m_pResource; }
 };
 
 #endif // _RESID_HXX
diff --git a/tools/inc/tools/resmgr.hxx b/tools/inc/tools/resmgr.hxx
index b19524139078..87f3fb6cbd30 100644
--- a/tools/inc/tools/resmgr.hxx
+++ b/tools/inc/tools/resmgr.hxx
@@ -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
@@ -52,14 +52,14 @@ class InternalResMgr;
 struct RSHEADER_TYPE
 {
 private:
-    sal_uInt32              nId;        // Identifier der Resource
-    RESOURCE_TYPE           nRT;        // Resource Typ
-    sal_uInt32              nGlobOff;   // Globaler Offset
-    sal_uInt32              nLocalOff;  // Lokaler Offset
+    sal_uInt32				nId;		// Identifier der Resource
+    RESOURCE_TYPE			nRT;		// Resource Typ
+    sal_uInt32				nGlobOff;	// Globaler Offset
+    sal_uInt32				nLocalOff;	// Lokaler Offset
 
 public:
-    inline sal_uInt32       GetId();       // Identifier der Resource
-    inline RESOURCE_TYPE    GetRT();       // Resource Typ
+    inline sal_uInt32       GetId(); 	   // Identifier der Resource
+    inline RESOURCE_TYPE    GetRT(); 	   // Resource Typ
     inline sal_uInt32       GetGlobOff();   // Globaler Offset
     inline sal_uInt32       GetLocalOff();  // Lokaler Offset
 };
@@ -75,10 +75,10 @@ typedef void (*ResHookProc)( UniString& rStr );
 // ----------
 
 // Initialisierung
-#define RC_NOTYPE               0x00
+#define RC_NOTYPE				0x00
 // Globale Resource
-#define RC_GLOBAL               0x01
-#define RC_AUTORELEASE          0x02
+#define RC_GLOBAL				0x01
+#define RC_AUTORELEASE			0x02
 #define RC_NOTFOUND             0x04
 #define RC_FALLBACK_DOWN        0x08
 #define RC_FALLBACK_UP          0x10
@@ -88,23 +88,23 @@ class ResMgr;
 struct ImpRCStack
 {
     // pResource and pClassRes equal NULL: resource was not loaded
-    RSHEADER_TYPE * pResource;          // pointer to resource
-    void          * pClassRes;          // pointer to class specified init data
-    short           Flags;              // resource status
-    void *          aResHandle;         // Resource-Identifier from InternalResMgr
-    const Resource* pResObj;            // pointer to Resource object
-    sal_uInt32      nId;                // ResId used for error message
-    ResMgr*         pResMgr;            // ResMgr for Resource pResObj
-
-    void            Clear();
-    void            Init( ResMgr * pMgr, const Resource * pObj, sal_uInt32 nId );
+    RSHEADER_TYPE * pResource;		    // pointer to resource
+    void		  * pClassRes;		    // pointer to class specified init data
+    short			Flags;			    // resource status
+    void *			aResHandle; 	    // Resource-Identifier from InternalResMgr
+    const Resource* pResObj;		    // pointer to Resource object
+    sal_uInt32		nId;			    // ResId used for error message
+    ResMgr*         pResMgr;		    // ResMgr for Resource pResObj
+
+    void			Clear();
+    void			Init( ResMgr * pMgr, const Resource * pObj, sal_uInt32 nId );    
 };
 
 class TOOLS_DLLPUBLIC ResMgr
 {
 private:
     InternalResMgr*            pImpRes;
-    std::vector< ImpRCStack >  aStack;  // resource context stack
+    std::vector< ImpRCStack >  aStack;	// resource context stack
     int                        nCurStack;
     ResMgr*         pFallbackResMgr;    // fallback ResMgr in case the Resource
                                         // was not contained in this ResMgr
@@ -114,11 +114,11 @@ private:
     TOOLS_DLLPRIVATE void         incStack();
     TOOLS_DLLPRIVATE void         decStack();
 
-    TOOLS_DLLPRIVATE const ImpRCStack * StackTop( sal_uInt32 nOff = 0 ) const
+    TOOLS_DLLPRIVATE const ImpRCStack *	StackTop( sal_uInt32 nOff = 0 ) const
     {
         return (((int)nOff >= nCurStack) ? NULL : &aStack[nCurStack-nOff]);
     }
-    TOOLS_DLLPRIVATE void               Init( const rtl::OUString& rFileName );
+    TOOLS_DLLPRIVATE void				Init( const rtl::OUString& rFileName );
 
     TOOLS_DLLPRIVATE ResMgr( InternalResMgr * pImp );
 
@@ -138,9 +138,9 @@ private:
     // the next two methods are needed to prevent the string hook called
     // with the res mgr mutex locked
     // like GetString, but doesn't call the string hook
-    TOOLS_DLLPRIVATE static sal_uInt32  GetStringWithoutHook( UniString& rStr, const BYTE* pStr );
+    TOOLS_DLLPRIVATE static sal_uInt32	GetStringWithoutHook( UniString& rStr, const BYTE* pStr );
     // like ReadString but doesn't call the string hook
-    TOOLS_DLLPRIVATE UniString          ReadStringWithoutHook();
+    TOOLS_DLLPRIVATE UniString			ReadStringWithoutHook();
 
     static ResMgr* ImplCreateResMgr( InternalResMgr* pImpl ) { return new ResMgr( pImpl ); }
 
@@ -148,73 +148,73 @@ private:
     ResMgr(const ResMgr&);
     ResMgr& operator=(const ResMgr&);
 public:
-    static void         DestroyAllResMgr();  // Wird gerufen, wenn App beendet wird
+    static void 		DestroyAllResMgr();  // Wird gerufen, wenn App beendet wird
 
     ~ResMgr();
 
                         // Sprachabhaengige Ressource Library
-    static const sal_Char*  GetLang( LanguageType& eLanguage, USHORT nPrio = 0 ); //depricated! see "tools/source/rc/resmgr.cxx"
+    static const sal_Char*	GetLang( LanguageType& eLanguage, USHORT nPrio = 0 ); //depricated! see "tools/source/rc/resmgr.cxx"
     static ResMgr*      SearchCreateResMgr( const sal_Char* pPrefixName,
                                             com::sun::star::lang::Locale& rLocale );
-     static ResMgr*     CreateResMgr( const sal_Char* pPrefixName,
+     static ResMgr*		CreateResMgr( const sal_Char* pPrefixName,
                                       com::sun::star::lang::Locale aLocale = com::sun::star::lang::Locale( rtl::OUString(),
                                                                                                            rtl::OUString(),
                                                                                                            rtl::OUString()));
 
     // Testet ob Resource noch da ist
-    void                TestStack( const Resource * );
+    void				TestStack( const Resource * );
 
     // ist Resource verfuegbar
-    BOOL                IsAvailable( const ResId& rId,
+    BOOL				IsAvailable( const ResId& rId,
                                      const Resource* = NULL) const;
 
     // Resource suchen und laden
-    BOOL                GetResource( const ResId& rId, const Resource * = NULL );
-    static void *       GetResourceSkipHeader( const ResId& rResId, ResMgr ** ppResMgr );
+    BOOL				GetResource( const ResId& rId, const Resource * = NULL );
+    static void *		GetResourceSkipHeader( const ResId& rResId, ResMgr ** ppResMgr );
     // Kontext freigeben
-    void                PopContext( const Resource* = NULL );
+    void				PopContext( const Resource* = NULL );
 
     // Resourcezeiger erhoehen
-    void*               Increment( sal_uInt32 nSize );
+    void*				Increment( sal_uInt32 nSize );
 
     // Groesse ein Objektes in der Resource
-    static sal_uInt32   GetObjSize( RSHEADER_TYPE* pHT )
+    static sal_uInt32	GetObjSize( RSHEADER_TYPE* pHT )
                             { return( pHT->GetGlobOff() ); }
 
     // Liefert einen String aus der Resource
-    static sal_uInt32   GetString( UniString& rStr, const BYTE* pStr );
+    static sal_uInt32	GetString( UniString& rStr, const BYTE* pStr );
 
     // Groesse eines Strings in der Resource
-    static sal_uInt32   GetStringSize( sal_uInt32 nLen )
+    static sal_uInt32	GetStringSize( sal_uInt32 nLen )
                             { nLen++; return (nLen + nLen%2); }
-    static sal_uInt32   GetStringSize( const BYTE* pStr );
+    static sal_uInt32	GetStringSize( const BYTE* pStr );
 
     // return a int64
     static sal_uInt64   GetUInt64( void* pDatum );
     // Gibt einen long zurueck
-    static INT32        GetLong( void * pLong );
+    static INT32		GetLong( void * pLong );
     // return a short
-    static INT16        GetShort( void * pShort );
+    static INT16		GetShort( void * pShort );
 
     // Gibt einen Zeiger auf die Resource zurueck
-    void *              GetClass();
+    void *				GetClass();
 
-    RSHEADER_TYPE *     CreateBlock( const ResId & rId );
+    RSHEADER_TYPE * 	CreateBlock( const ResId & rId );
 
     // Gibt die verbleibende Groesse zurueck
-    sal_uInt32          GetRemainSize();
+    sal_uInt32			GetRemainSize();
 
     const rtl::OUString&GetFileName() const;
 
-    INT16               ReadShort();
-    INT32               ReadLong();
-    UniString           ReadString();
+    INT16				ReadShort();
+    INT32				ReadLong();
+    UniString			ReadString();
 
      // generate auto help id for current resource stack
     ULONG               GetAutoHelpId();
 
-    static void         SetReadStringHook( ResHookProc pProc );
-    static ResHookProc  GetReadStringHook();
+    static void 		SetReadStringHook( ResHookProc pProc );
+    static ResHookProc	GetReadStringHook();
     static void         SetDefaultLocale( const com::sun::star::lang::Locale& rLocale );
 };
 
diff --git a/tools/inc/tools/rtti.hxx b/tools/inc/tools/rtti.hxx
index 1f8673596b48..3cedb7f8cd2a 100644
--- a/tools/inc/tools/rtti.hxx
+++ b/tools/inc/tools/rtti.hxx
@@ -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
@@ -120,7 +120,7 @@ typedef void* (*TypeId)();
 // On-Demand-faehige persistent-TypeId Version
 
 #define TYPEINFO_ID(id) \
-        static  TypeId StaticType() { return (TypeId) ( id | 0xF000000L ); } \
+        static	TypeId StaticType() { return (TypeId) ( id | 0xF000000L ); } \
         static  BOOL   IsOf( TypeId aSameOrSuperType ); \
         virtual TypeId Type() const; \
         virtual BOOL   IsA( TypeId aSameOrSuperType ) const
diff --git a/tools/inc/tools/shl.hxx b/tools/inc/tools/shl.hxx
index ab08e3cc7a58..4a176e468bb7 100644
--- a/tools/inc/tools/shl.hxx
+++ b/tools/inc/tools/shl.hxx
@@ -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
@@ -35,79 +35,79 @@
 // - GetAppData() -
 // ----------------
 
-#define SHL_SHL1        0
-#define SHL_SHL2        1
-#define SHL_SHL3        2
-#define SHL_APP1        3
-#define SHL_APP2        4
-#define SHL_APP3        5
-#define SHL_TOOLS       6
-#define SHL_SV          7
-#define SHL_SVT         8
-#define SHL_SVDDE       9
-#define SHL_ERR         10
-#define SHL_IPC         11
-#define SHL_SVX         12
-#define SHL_ITEM        13
-#define SHL_SVD         14
-#define SHL_SI          15
-#define SHL_SFC         16
-#define SHL_SFX         17
-//#define SHL_SO2       18
-#define SHL_IDL         19
-#define SHL_IDE         20
-#define SHL_EDIT        21
-#define SHL_VCED        22
-#define SHL_BASIC       23
-#define SHL_HELP        24
-#define SHL_LNKCCH      25
-#define SHL_CHANNEL     26
-#define SHL_SBX         27
-#define SHL_SBC         28
-#define SHL_SDB         29
-#define SHL_SBA         30
-#define SHL_SBA2        31
-#define SHL_SCH         32
-#define SHL_SIM         33
-#define SHL_SM          34
-#define SHL_SGA         35
-#define SHL_DOCMGR      36
+#define SHL_SHL1		0
+#define SHL_SHL2		1
+#define SHL_SHL3		2
+#define SHL_APP1		3
+#define SHL_APP2		4
+#define SHL_APP3		5
+#define SHL_TOOLS		6
+#define SHL_SV			7
+#define SHL_SVT 		8
+#define SHL_SVDDE		9
+#define SHL_ERR 		10
+#define SHL_IPC 		11
+#define SHL_SVX 		12
+#define SHL_ITEM		13
+#define SHL_SVD 		14
+#define SHL_SI			15
+#define SHL_SFC 		16
+#define SHL_SFX 		17
+//#define SHL_SO2 		18
+#define SHL_IDL 		19
+#define SHL_IDE 		20
+#define SHL_EDIT		21
+#define SHL_VCED		22
+#define SHL_BASIC		23
+#define SHL_HELP		24
+#define SHL_LNKCCH		25
+#define SHL_CHANNEL 	26
+#define SHL_SBX 		27
+#define SHL_SBC 		28
+#define SHL_SDB 		29
+#define SHL_SBA 		30
+#define SHL_SBA2		31
+#define SHL_SCH 		32
+#define SHL_SIM 		33
+#define SHL_SM			34
+#define SHL_SGA 		35
+#define SHL_DOCMGR		36
 // 37 removed
-#define SHL_MAIL        38
-#define SHL_NEWS        39
-#define SHL_OFFAPP      40
-#define SHL_INET        41
-#define SHL_CHAOS       42
-#define SHL_HISTORY     43
-#define SHL_SJ          44
-#define SHL_CALC        45
-#define SHL_DRAW        46
-#define SHL_WRITER      47
-#define SHL_MONEY       48
-#define SHL_HBCI        49
-#define SHL_BASE3D      50
-#define SHL_BRUSHITEM   51
-#define SHL_SFONTITEM   52
+#define SHL_MAIL		38
+#define SHL_NEWS		39
+#define SHL_OFFAPP		40
+#define SHL_INET		41
+#define SHL_CHAOS		42
+#define SHL_HISTORY 	43
+#define SHL_SJ			44
+#define SHL_CALC		45
+#define SHL_DRAW		46
+#define SHL_WRITER		47
+#define SHL_MONEY		48
+#define SHL_HBCI		49
+#define SHL_BASE3D		50
+#define SHL_BRUSHITEM	51
+#define SHL_SFONTITEM	52
 
 // #110743#
-// #define SHL_COUNT        53
+// #define SHL_COUNT		53
 // the following added for binary filter project
 // Sice an array is created for that values, it is necessary to
 // put them directly behind the defined ones. Else, some space is
 // wasted.
-#define BF_SHL_SVX      53
-#define BF_SHL_ITEM     54
-#define BF_SHL_SVD      55
-#define BF_SHL_EDIT     56
-#define BF_SHL_SCH      57
-#define BF_SHL_SM       58
-#define BF_SHL_CALC     59
-#define BF_SHL_DRAW     60
-#define BF_SHL_WRITER   61
-#define BF_SHL_SVT      62
-#define BF_SHL_SVDDE    63
+#define BF_SHL_SVX 		53
+#define BF_SHL_ITEM		54
+#define BF_SHL_SVD 		55
+#define BF_SHL_EDIT		56
+#define BF_SHL_SCH 		57
+#define BF_SHL_SM		58
+#define BF_SHL_CALC		59
+#define BF_SHL_DRAW		60
+#define BF_SHL_WRITER	61
+#define BF_SHL_SVT 		62
+#define BF_SHL_SVDDE	63
 
-#define SHL_COUNT       64
+#define SHL_COUNT		64
 
 TOOLS_DLLPUBLIC void** GetAppData( USHORT nSharedLib );
 
diff --git a/tools/inc/tools/simplerm.hxx b/tools/inc/tools/simplerm.hxx
index c16fe41abc0b..fe14979f1817 100644
--- a/tools/inc/tools/simplerm.hxx
+++ b/tools/inc/tools/simplerm.hxx
@@ -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
@@ -46,8 +46,8 @@ class InternalResMgr;
 class TOOLS_DLLPUBLIC SimpleResMgr
 {
 protected:
-    NAMESPACE_VOS(OMutex)   m_aAccessSafety;
-    InternalResMgr*         m_pResImpl;
+    NAMESPACE_VOS(OMutex)	m_aAccessSafety;
+    InternalResMgr* 		m_pResImpl;
 
 public:
                             /** creates a new SimpleResManager
@@ -61,7 +61,7 @@ public:
                                           const ::com::sun::star::lang::Locale& _rLocale);
 
                             /** creates a new SimpleResManager
-                                @param _rPrefixName
+                                @param _rPrefixName 
                                     denotes the prefix of the resource file name
                                 @param _inout_Locale
                                     denotes the locale of the resource file to load. If empty, no default handling
@@ -73,9 +73,9 @@ public:
                                     this one will be loaded as final fallback.
                             */
                             SimpleResMgr( const ::rtl::OUString& _rPrefixName, ::com::sun::star::lang::Locale& _inout_Locale );
-    virtual                 ~SimpleResMgr();
+    virtual 				~SimpleResMgr();
 
-    static SimpleResMgr*    Create( const sal_Char* pPrefixName,
+    static SimpleResMgr*	Create( const sal_Char* pPrefixName,
                                       ::com::sun::star::lang::Locale aLocale = ::com::sun::star::lang::Locale( rtl::OUString(),
                                                                                                                rtl::OUString(),
                                                                                                                rtl::OUString()));// nur in VCL
@@ -97,7 +97,7 @@ public:
             an existent string
         @seealso IsAvailable
     */
-    UniString               ReadString( sal_uInt32 nId );
+    UniString				ReadString( sal_uInt32 nId );
 
     /** checks whether a certain resource is availble
         @param  _resourceType
@@ -110,8 +110,8 @@ public:
     */
     bool                    IsAvailable( RESOURCE_TYPE _resourceType, sal_uInt32 _resourceId );
 
-    sal_uInt32              ReadBlob( sal_uInt32 nId, void** pBuffer );
-    void                    FreeBlob( void* pBuffer );
+    sal_uInt32				ReadBlob( sal_uInt32 nId, void** pBuffer );
+    void					FreeBlob( void* pBuffer );
 };
 
 #endif // _TOOLS_SIMPLERESMGR_HXX_
diff --git a/tools/inc/tools/solar.h b/tools/inc/tools/solar.h
index 096d34d05b9e..a6abdf03c6d2 100644
--- a/tools/inc/tools/solar.h
+++ b/tools/inc/tools/solar.h
@@ -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
@@ -35,17 +35,17 @@
 /*** common solar defines ***********************************/
 
 #ifndef TRUE
-#define TRUE        1
+#define TRUE		1
 #endif
 #ifndef FALSE
-#define FALSE       0
+#define FALSE		0
 #endif
 
 #ifdef _SOLAR__PRIVATE
 #undef _SOLAR__PRIVATE
 #endif
 #define _SOLAR__PRIVATE 1
-#define __REFERENCED    0
+#define __REFERENCED	0
 
 /*** common solar types ********************************************/
 /* NOTE: these types are deprecated, or soon will be.  They should */
@@ -54,41 +54,41 @@
 /*   Previous typedefs from before sal convergence are in comments */
 /*   to the right of the new types.                                */
 
-typedef sal_Bool        BOOL;   /* typedef unsigned char   BOOL; */
-typedef sal_uInt8       BYTE;   /* typedef unsigned char   BYTE; */
-typedef sal_uInt16      USHORT; /* typedef unsigned short  USHORT; */
-typedef sal_uIntPtr     ULONG;  /* typedef unsigned long   ULONG; */
-typedef int             FASTBOOL;
+typedef sal_Bool		BOOL;	/* typedef unsigned char   BOOL; */
+typedef sal_uInt8		BYTE;	/* typedef unsigned char   BYTE; */
+typedef sal_uInt16		USHORT;	/* typedef unsigned short  USHORT; */
+typedef sal_uIntPtr		ULONG;	/* typedef unsigned long   ULONG; */
+typedef int 			FASTBOOL;
 
 #if !defined(VCL_NEED_BASETSD) || defined(__MINGW32__)
 #ifndef _SOLAR_NOUINT
-typedef sal_Int16           INT16;  /* typedef short           INT16; */
-typedef sal_uInt16          UINT16; /* typedef unsigned short  UINT16; */
+typedef sal_Int16			INT16;	/* typedef short           INT16; */
+typedef sal_uInt16			UINT16;	/* typedef unsigned short  UINT16; */
 #if defined(SAL_W32)
-typedef sal_sChar           INT8;
+typedef sal_sChar			INT8;
 #else
-typedef sal_Char            INT8;   /* typedef char            INT8; */
+typedef sal_Char			INT8;	/* typedef char            INT8; */
 #endif
-typedef sal_uInt8           UINT8;  /* typedef unsigned char   UINT8; */
+typedef sal_uInt8			UINT8;	/* typedef unsigned char   UINT8; */
 #endif /* _SOLAR_NOUINT */
 #endif
 
 #ifndef VCL_NEED_BASETSD
 #ifndef _SOLAR_NOUINT
 /* types with exact defined size (not just the minimum size) */
-typedef sal_Int64           INT64;  /* typedef long            INT64;  previously "void" on Windows */
-typedef sal_uInt64          UINT64; /* typedef unsigned long   UINT64; previously "void" on Windows */
-typedef sal_Int32           INT32;  /* typedef int             INT32;  previously "long" on Windows */
-typedef sal_uInt32          UINT32; /* typedef unsigned int    UINT32; previously "unsigned long" on Windows */
+typedef sal_Int64			INT64;	/* typedef long            INT64;  previously "void" on Windows */
+typedef sal_uInt64			UINT64;	/* typedef unsigned long   UINT64; previously "void" on Windows */
+typedef sal_Int32			INT32;	/* typedef int             INT32;  previously "long" on Windows */
+typedef sal_uInt32			UINT32;	/* typedef unsigned int    UINT32; previously "unsigned long" on Windows */
 #endif /* _SOLAR_NOUINT */
 #endif
 
 /*** misc. macros to leverage platform and compiler differences ********/
 
-#define DELETEZ( p )    ( delete p,p = 0 )
+#define DELETEZ( p )	( delete p,p = 0 )
 
 #define __FAR_DATA
-#define __READONLY_DATA         const
+#define __READONLY_DATA 		const
 #define __EXPORT
 
 #ifdef WNT
@@ -114,22 +114,22 @@ typedef sal_uInt32          UINT32; /* typedef unsigned int    UINT32; previousl
    always little endian;
    not necessarily aligned */
 
-typedef BYTE                SVBT8[1];
-typedef BYTE                SVBT16[2];
-typedef BYTE                SVBT32[4];
-typedef BYTE                SVBT64[8];
+typedef BYTE				SVBT8[1];
+typedef BYTE				SVBT16[2];
+typedef BYTE				SVBT32[4];
+typedef BYTE				SVBT64[8];
 
 #ifdef __cplusplus
 
-inline BYTE     SVBT8ToByte  ( const SVBT8  p ) { return p[0]; }
-inline USHORT   SVBT16ToShort( const SVBT16 p ) { return (USHORT)p[0]
+inline BYTE 	SVBT8ToByte  ( const SVBT8	p ) { return p[0]; }
+inline USHORT	SVBT16ToShort( const SVBT16 p ) { return (USHORT)p[0]
                                                    + ((USHORT)p[1] <<  8); }
-inline sal_uInt32   SVBT32ToUInt32 ( const SVBT32 p ) { return (sal_uInt32)p[0]
+inline sal_uInt32	SVBT32ToUInt32 ( const SVBT32 p ) { return (sal_uInt32)p[0]
                                                    + ((sal_uInt32)p[1] <<  8)
                                                    + ((sal_uInt32)p[2] << 16)
                                                    + ((sal_uInt32)p[3] << 24); }
 #if defined OSL_LITENDIAN
-inline double   SVBT64ToDouble( const SVBT64 p ) { double n;
+inline double	SVBT64ToDouble( const SVBT64 p ) { double n;
                                                     ((BYTE*)&n)[0] = p[0];
                                                     ((BYTE*)&n)[1] = p[1];
                                                     ((BYTE*)&n)[2] = p[2];
@@ -140,7 +140,7 @@ inline double   SVBT64ToDouble( const SVBT64 p ) { double n;
                                                     ((BYTE*)&n)[7] = p[7];
                                                     return n; }
 #else
-inline double   SVBT64ToDouble( const SVBT64 p ) { double n;
+inline double	SVBT64ToDouble( const SVBT64 p ) { double n;
                                                     ((BYTE*)&n)[0] = p[7];
                                                     ((BYTE*)&n)[1] = p[6];
                                                     ((BYTE*)&n)[2] = p[5];
@@ -152,15 +152,15 @@ inline double   SVBT64ToDouble( const SVBT64 p ) { double n;
                                                     return n; }
 #endif
 
-inline void     ByteToSVBT8  ( BYTE   n, SVBT8  p ) { p[0] = n; }
-inline void     ShortToSVBT16( USHORT n, SVBT16 p ) { p[0] = (BYTE) n;
+inline void 	ByteToSVBT8  ( BYTE   n, SVBT8	p ) { p[0] = n; }
+inline void 	ShortToSVBT16( USHORT n, SVBT16 p ) { p[0] = (BYTE) n;
                                                       p[1] = (BYTE)(n >>  8); }
-inline void     UInt32ToSVBT32 ( sal_uInt32  n, SVBT32 p ) { p[0] = (BYTE) n;
+inline void 	UInt32ToSVBT32 ( sal_uInt32  n, SVBT32 p ) { p[0] = (BYTE) n;
                                                       p[1] = (BYTE)(n >>  8);
                                                       p[2] = (BYTE)(n >> 16);
                                                       p[3] = (BYTE)(n >> 24); }
 #if defined OSL_LITENDIAN
-inline void     DoubleToSVBT64( double n, SVBT64 p ) { p[0] = ((BYTE*)&n)[0];
+inline void 	DoubleToSVBT64( double n, SVBT64 p ) { p[0] = ((BYTE*)&n)[0];
                                                        p[1] = ((BYTE*)&n)[1];
                                                        p[2] = ((BYTE*)&n)[2];
                                                        p[3] = ((BYTE*)&n)[3];
@@ -169,7 +169,7 @@ inline void     DoubleToSVBT64( double n, SVBT64 p ) { p[0] = ((BYTE*)&n)[0];
                                                        p[6] = ((BYTE*)&n)[6];
                                                        p[7] = ((BYTE*)&n)[7]; }
 #else
-inline void     DoubleToSVBT64( double n, SVBT64 p ) { p[0] = ((BYTE*)&n)[7];
+inline void 	DoubleToSVBT64( double n, SVBT64 p ) { p[0] = ((BYTE*)&n)[7];
                                                        p[1] = ((BYTE*)&n)[6];
                                                        p[2] = ((BYTE*)&n)[5];
                                                        p[3] = ((BYTE*)&n)[4];
@@ -185,25 +185,25 @@ inline void     DoubleToSVBT64( double n, SVBT64 p ) { p[0] = ((BYTE*)&n)[7];
 /*** standard floating point definitions *******************************/
 
 #ifndef F_PI
-#define F_PI        3.14159265358979323846
+#define F_PI		3.14159265358979323846
 #endif
 #ifndef F_PI2
-#define F_PI2       1.57079632679489661923
+#define F_PI2		1.57079632679489661923
 #endif
 #ifndef F_PI4
-#define F_PI4       0.785398163397448309616
+#define F_PI4		0.785398163397448309616
 #endif
 #ifndef F_PI180
-#define F_PI180     0.01745329251994
+#define F_PI180 	0.01745329251994
 #endif
 #ifndef F_PI1800
-#define F_PI1800    0.001745329251994
+#define F_PI1800	0.001745329251994
 #endif
 #ifndef F_PI18000
-#define F_PI18000   0.0001745329251994
+#define F_PI18000	0.0001745329251994
 #endif
 #ifndef F_2PI
-#define F_2PI       6.28318530717958647694
+#define F_2PI		6.28318530717958647694
 #endif
 
 
@@ -215,10 +215,10 @@ inline void     DoubleToSVBT64( double n, SVBT64 p ) { p[0] = ((BYTE*)&n)[7];
 
 #ifndef __cplusplus
 #ifndef min
-#define min(a,b)    (((a) < (b)) ? (a) : (b))
+#define min(a,b)	(((a) < (b)) ? (a) : (b))
 #endif
 #ifndef max
-#define max(a,b)    (((a) > (b)) ? (a) : (b))
+#define max(a,b)	(((a) > (b)) ? (a) : (b))
 #endif
 #endif
 
@@ -236,9 +236,9 @@ template<typename T> inline T Abs(T a) { return (a>=0?a:-a); }
 /*** C / C++ - macros **************************************************/
 
 #ifdef __cplusplus
-#define BEGIN_C     extern "C" {
-#define END_C       }
-#define EXTERN_C    extern "C"
+#define BEGIN_C 	extern "C" {
+#define END_C		}
+#define EXTERN_C	extern "C"
 #else
 #define BEGIN_C
 #define END_C
@@ -254,11 +254,11 @@ template<typename T> inline T Abs(T a) { return (a>=0?a:-a); }
 #define HACK( comment )
 #endif
 
-#define _MAKE_NUMSTR( n )           # n
-#define MAKE_NUMSTR( n )            _MAKE_NUMSTR( n )
+#define _MAKE_NUMSTR( n )			# n
+#define MAKE_NUMSTR( n )			_MAKE_NUMSTR( n )
 
-#define _LF     ((char)0x0A)
-#define _CR     ((char)0x0D)
+#define _LF 	((char)0x0A)
+#define _CR 	((char)0x0D)
 
 
 /*** pragmas ************************************************************/
@@ -276,40 +276,40 @@ template<typename T> inline T Abs(T a) { return (a>=0?a:-a); }
 /* dll file extensions *******************************************************/
 
 /* many of these platforms are historic */
-#define SYSTEM_WINMSCI       1
-#define SYSTEM_WNTMSCI       2
-#define SYSTEM_WNTMSCA       3
-#define SYSTEM_WNTMSCP       4
-#define SYSTEM_WNTMSCM       5
-#define SYSTEM_OS2BLCI       6
-#define SYSTEM_OS2ICCI       7
-#define SYSTEM_OS2ICCI3      8
-#define SYSTEM_UNXLNXI       9
-#define SYSTEM_UNXSOLS      10
-#define SYSTEM_UNXBSDI      11
-#define SYSTEM_UNXBSDA      12
-#define SYSTEM_UNXSCOI      13
-#define SYSTEM_UNXAIXP      14
-#define SYSTEM_UNXHPXR      15
-#define SYSTEM_UNXSNIM      16
-#define SYSTEM_UNXMVSG      17
-#define SYSTEM_UNXIRXM      18
-// #define SYSTEM_MACOSP        19
-#define SYSTEM_UNXFBSDI     20
-#define SYSTEM_UNXSOLI      21
-#define SYSTEM_WINBLCI      22
-#define SYSTEM_UNXMACXP     23
-#define SYSTEM_UNXLNXP      24
-#define SYSTEM_UNXBSDS      25
-#define SYSTEM_UNXLNXR      26
-#define SYSTEM_UNXLNX3      28
-#define SYSTEM_UNXLNXS      29
-#define SYSTEM_UNXLNXX      30
-#define SYSTEM_UNXSOGS      31
-#define SYSTEM_UNXSOGI      32
-#define SYSTEM_UNXMACXI     33
-#define SYSTEM_OS2GCCI      34
-#define SYSTEM_WNTGCCI      99
+#define SYSTEM_WINMSCI		 1
+#define SYSTEM_WNTMSCI		 2
+#define SYSTEM_WNTMSCA		 3
+#define SYSTEM_WNTMSCP		 4
+#define SYSTEM_WNTMSCM		 5
+#define SYSTEM_OS2BLCI		 6
+#define SYSTEM_OS2ICCI		 7
+#define SYSTEM_OS2ICCI3 	 8
+#define SYSTEM_UNXLNXI		 9
+#define SYSTEM_UNXSOLS		10
+#define SYSTEM_UNXBSDI		11
+#define SYSTEM_UNXBSDA		12
+#define SYSTEM_UNXSCOI		13
+#define SYSTEM_UNXAIXP		14
+#define SYSTEM_UNXHPXR		15
+#define SYSTEM_UNXSNIM		16
+#define SYSTEM_UNXMVSG		17
+#define SYSTEM_UNXIRXM		18
+// #define SYSTEM_MACOSP		19
+#define SYSTEM_UNXFBSDI 	20
+#define SYSTEM_UNXSOLI		21
+#define SYSTEM_WINBLCI		22
+#define SYSTEM_UNXMACXP 	23
+#define SYSTEM_UNXLNXP		24
+#define SYSTEM_UNXBSDS		25
+#define SYSTEM_UNXLNXR		26
+#define SYSTEM_UNXLNX3		28
+#define SYSTEM_UNXLNXS		29
+#define SYSTEM_UNXLNXX		30
+#define SYSTEM_UNXSOGS		31
+#define SYSTEM_UNXSOGI		32
+#define SYSTEM_UNXMACXI		33
+#define SYSTEM_OS2GCCI		34
+#define SYSTEM_WNTGCCI  	99
 
 #if defined WNT
 #if defined(__MINGW32__)
@@ -385,23 +385,23 @@ template<typename T> inline T Abs(T a) { return (a>=0?a:-a); }
 
 #define NOOLDSTRING
 #ifndef NOREPLACESTRING
-#define UniString       String
-#define XubString       String
+#define UniString		String
+#define XubString		String
 #else
-#define XubString       UniString
+#define XubString		UniString
 #endif
-#define xub_Unicode     sal_Unicode
-#define xub_uUnicode    sal_Unicode
+#define xub_Unicode 	sal_Unicode
+#define xub_uUnicode	sal_Unicode
 #ifdef STRING32
-#define xub_StrLen      sal_uInt32
+#define xub_StrLen		sal_uInt32
 #else
-#define xub_StrLen      USHORT
+#define xub_StrLen		USHORT
 #endif
 
 // -- moved here from libcall.hxx ----------------------------------------
 
-#define LIBRARY_STR(s)      # s
-#define LIBRARY_STRING(s)   LIBRARY_STR(s)
+#define LIBRARY_STR(s)		# s
+#define LIBRARY_STRING(s)	LIBRARY_STR(s)
 
 #define GETFUNCTION( s ) GetFunction( s )
 #define LIBRARY_CONCAT3( s1, s2, s3 ) \
@@ -437,4 +437,4 @@ template<typename T> inline T Abs(T a) { return (a>=0?a:-a); }
     LIBRARYFILENAME_CONCAT3( str, __DLLEXTENSION, ".dll" )
 #endif
 
-#endif  /* _SOLAR_H */
+#endif	/* _SOLAR_H */
diff --git a/tools/inc/tools/solarmutex.hxx b/tools/inc/tools/solarmutex.hxx
index f8b784c9f9ae..a0e1d4ed87dd 100644
--- a/tools/inc/tools/solarmutex.hxx
+++ b/tools/inc/tools/solarmutex.hxx
@@ -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
diff --git a/tools/inc/tools/stack.hxx b/tools/inc/tools/stack.hxx
index 4f3223295114..aead3da51f20 100644
--- a/tools/inc/tools/stack.hxx
+++ b/tools/inc/tools/stack.hxx
@@ -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
@@ -69,8 +69,8 @@ public:
 class ClassName : private Stack                                     \
 {                                                                   \
 public:                                                             \
-                using Stack::Clear;                                 \
-                using Stack::Count;                                 \
+                using Stack::Clear;									\
+                using Stack::Count;									\
                                                                     \
                 ClassName( USHORT _nInitSize = 16,                  \
                        USHORT _nReSize = 16 ) :                     \
diff --git a/tools/inc/tools/stream.hxx b/tools/inc/tools/stream.hxx
index 61af361aa5b7..0ce15bc3470b 100644
--- a/tools/inc/tools/stream.hxx
+++ b/tools/inc/tools/stream.hxx
@@ -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
@@ -58,56 +58,56 @@ inline rtl_TextEncoding GetStoreCharSet( rtl_TextEncoding eEncoding )
 typedef sal_uInt16 StreamMode;
 
 // read, write, create,... options
-#define STREAM_READ                     0x0001  // allow read accesses
-#define STREAM_WRITE                    0x0002  // allow write accesses
+#define STREAM_READ 					0x0001	// allow read accesses
+#define STREAM_WRITE					0x0002	// allow write accesses
 // file i/o
-#define STREAM_NOCREATE                 0x0004  // 1 == Dont create file
-#define STREAM_TRUNC                    0x0008  // Truncate _existing_ file to zero length
-#define STREAM_COPY_ON_SYMLINK          0x0010  // copy-on-write for symlinks (UNX)
+#define STREAM_NOCREATE 				0x0004	// 1 == Dont create file
+#define STREAM_TRUNC					0x0008	// Truncate _existing_ file to zero length
+#define STREAM_COPY_ON_SYMLINK			0x0010	// copy-on-write for symlinks (UNX)
 
-#define STREAM_READWRITEBITS            (STREAM_READ | STREAM_WRITE | \
+#define STREAM_READWRITEBITS			(STREAM_READ | STREAM_WRITE | \
                                          STREAM_NOCREATE | STREAM_TRUNC)
 
 // sharing options
-#define STREAM_SHARE_DENYNONE           0x0100
-#define STREAM_SHARE_DENYREAD           0x0200  // overrides denynone
-#define STREAM_SHARE_DENYWRITE      0x0400  // overrides denynone
-#define STREAM_SHARE_DENYALL            0x0800  // overrides denyread,write,none
+#define STREAM_SHARE_DENYNONE			0x0100
+#define STREAM_SHARE_DENYREAD			0x0200	// overrides denynone
+#define STREAM_SHARE_DENYWRITE		0x0400	// overrides denynone
+#define STREAM_SHARE_DENYALL			0x0800	// overrides denyread,write,none
 
-#define STREAM_SHAREBITS                (STREAM_SHARE_DENYNONE | STREAM_SHARE_DENYREAD |\
+#define STREAM_SHAREBITS				(STREAM_SHARE_DENYNONE | STREAM_SHARE_DENYREAD |\
                                          STREAM_SHARE_DENYWRITE | STREAM_SHARE_DENYALL)
 
-#define STREAM_READWRITE                (STREAM_READ | STREAM_WRITE)
-#define STREAM_SHARE_DENYREADWRITE      (STREAM_SHARE_DENYREAD | STREAM_SHARE_DENYWRITE)
+#define STREAM_READWRITE				(STREAM_READ | STREAM_WRITE)
+#define STREAM_SHARE_DENYREADWRITE		(STREAM_SHARE_DENYREAD | STREAM_SHARE_DENYWRITE)
 
-#define STREAM_STD_READ                 (STREAM_READ | STREAM_SHARE_DENYNONE | STREAM_NOCREATE)
-#define STREAM_STD_WRITE                (STREAM_WRITE | STREAM_SHARE_DENYALL)
-#define STREAM_STD_READWRITE            (STREAM_READWRITE | STREAM_SHARE_DENYALL)
+#define STREAM_STD_READ 				(STREAM_READ | STREAM_SHARE_DENYNONE | STREAM_NOCREATE)
+#define STREAM_STD_WRITE				(STREAM_WRITE | STREAM_SHARE_DENYALL)
+#define STREAM_STD_READWRITE			(STREAM_READWRITE | STREAM_SHARE_DENYALL)
 
-#define STREAM_SEEK_TO_BEGIN            0L
-#define STREAM_SEEK_TO_END              ULONG_MAX
+#define STREAM_SEEK_TO_BEGIN			0L
+#define STREAM_SEEK_TO_END				ULONG_MAX
 
-#define NUMBERFORMAT_INT_BIGENDIAN      (sal_uInt16)0x0000
-#define NUMBERFORMAT_INT_LITTLEENDIAN   (sal_uInt16)0xFFFF
+#define NUMBERFORMAT_INT_BIGENDIAN		(sal_uInt16)0x0000
+#define NUMBERFORMAT_INT_LITTLEENDIAN	(sal_uInt16)0xFFFF
 
-#define COMPRESSMODE_FULL           (sal_uInt16)0xFFFF
-#define COMPRESSMODE_NONE           (sal_uInt16)0x0000
-#define COMPRESSMODE_ZBITMAP            (sal_uInt16)0x0001
-#define COMPRESSMODE_NATIVE             (sal_uInt16)0x0010
+#define COMPRESSMODE_FULL			(sal_uInt16)0xFFFF
+#define COMPRESSMODE_NONE			(sal_uInt16)0x0000
+#define COMPRESSMODE_ZBITMAP			(sal_uInt16)0x0001
+#define COMPRESSMODE_NATIVE 			(sal_uInt16)0x0010
 
-#define JUSTIFY_RIGHT               0x00
-#define JUSTIFY_LEFT                0x01
+#define JUSTIFY_RIGHT				0x00
+#define JUSTIFY_LEFT				0x01
 
-#define STREAM_IO_DONTKNOW          0
-#define STREAM_IO_READ              1
-#define STREAM_IO_WRITE                 2
+#define STREAM_IO_DONTKNOW			0
+#define STREAM_IO_READ				1
+#define STREAM_IO_WRITE 				2
 
-#define ID_STREAM                       1
-#define ID_FILESTREAM                   2
-#define ID_MEMORYSTREAM                 3
-#define ID_SHAREDMEMORYSTREAM           4
-#define ID_STORAGESTREAM                5
-#define ID_PERSISTSTREAM                6
+#define ID_STREAM						1
+#define ID_FILESTREAM					2
+#define ID_MEMORYSTREAM 				3
+#define ID_SHAREDMEMORYSTREAM			4
+#define ID_STORAGESTREAM				5
+#define ID_PERSISTSTREAM				6
 
 class SvStream;
 typedef SvStream& (*SvStrPtr)( SvStream& );
@@ -241,264 +241,264 @@ class TOOLS_DLLPUBLIC SvStream
 {
 private:
     // LockBytes Interface
-    void*       pImp;           // unused
-    SvLockBytesRef  xLockBytes;     // Default Implmentierung
-    sal_Size        nActPos;        //
+    void*		pImp;			// unused
+    SvLockBytesRef	xLockBytes; 	// Default Implmentierung
+    sal_Size		nActPos;		//
 
     // Puffer-Verwaltung
-    sal_uInt8*  pRWBuf;         // Zeigt auf Read/Write-Puffer
-    sal_uInt8*  pBufPos;        // pRWBuf + nBufActualPos
-    sal_uInt16  nBufSize;       // Allozierte Groesse des Puffers
-    sal_uInt16  nBufActualLen;  // Laenge des beschriebenen Teils des Puffers
+    sal_uInt8*	pRWBuf; 		// Zeigt auf Read/Write-Puffer
+    sal_uInt8*	pBufPos;		// pRWBuf + nBufActualPos
+    sal_uInt16	nBufSize;		// Allozierte Groesse des Puffers
+    sal_uInt16	nBufActualLen;	// Laenge des beschriebenen Teils des Puffers
                                     // Entspricht nBufSize, wenn EOF nicht
                                     // ueberschritten wurde
-    sal_uInt16  nBufActualPos;  // aktuelle Position im Puffer (0..nBufSize-1)
-    sal_uInt16  nBufFree;       // freier Platz im Puffer fuer IO vom Typ eIOMode
-    unsigned int    eIOMode:2;      // STREAM_IO_*
+    sal_uInt16	nBufActualPos;	// aktuelle Position im Puffer (0..nBufSize-1)
+    sal_uInt16	nBufFree;		// freier Platz im Puffer fuer IO vom Typ eIOMode
+    unsigned int	eIOMode:2;		// STREAM_IO_*
 
     // Error-Codes, Konvertierung, Komprimierung, ...
-    int             bIsDirty:1;     // TRUE: Stream != Pufferinhalt
-    int             bIsConsistent:1;// FALSE: Buffer enthaelt Daten, die NICHT
+    int 			bIsDirty:1; 	// TRUE: Stream != Pufferinhalt
+    int 			bIsConsistent:1;// FALSE: Buffer enthaelt Daten, die NICHT
                                     // per PutData in den abgeleiteten Stream
                                     // geschrieben werden duerfen (siehe PutBack)
-    int             bSwap:1;
-    int             bIsEof:1;
-    sal_uInt32  nError;
-    sal_uInt16  nNumberFormatInt;
-    sal_uInt16  nCompressMode;
-    LineEnd         eLineDelimiter;
-    CharSet         eStreamCharSet;
-//  CharSet         eTargetCharSet;
+    int 			bSwap:1;
+    int 			bIsEof:1;
+    sal_uInt32	nError;
+    sal_uInt16	nNumberFormatInt;
+    sal_uInt16	nCompressMode;
+    LineEnd 		eLineDelimiter;
+    CharSet 		eStreamCharSet;
+//	CharSet 		eTargetCharSet;
 
     // Verschluesselung
-    ByteString      aKey;           // aKey.Len != 0  -> Verschluesselung
-    unsigned char   nCryptMask;
+    ByteString		aKey;			// aKey.Len != 0  -> Verschluesselung
+    unsigned char	nCryptMask;
 
     // Formatierung von Strings
-    char            cFiller;
-    sal_uInt8           nRadix;
-    sal_uInt8           nPrecision;
-    sal_uInt8           nWidth;
-    sal_uInt8           nPrintfParams;
-    sal_uInt8           nJustification;
-    ByteString      aFormatString;
+    char			cFiller;
+    sal_uInt8			nRadix;
+    sal_uInt8			nPrecision;
+    sal_uInt8			nWidth;
+    sal_uInt8			nPrintfParams;
+    sal_uInt8			nJustification;
+    ByteString		aFormatString;
 
     // Userdata
-    long            nVersion;       // for external use
+    long			nVersion;		// for external use
 
     // Hilfsmethoden
-    void            CreateFormatString();
-    TOOLS_DLLPRIVATE void           ImpInit();
+    void			CreateFormatString();
+    TOOLS_DLLPRIVATE void			ImpInit();
 
                      SvStream ( const SvStream& rStream ); // not implemented
-    SvStream&       operator=( const SvStream& rStream ); // not implemented
+    SvStream&		operator=( const SvStream& rStream ); // not implemented
 
 protected:
-    sal_Size            nBufFilePos;    // Fileposition von pBuf[0]
-    sal_uInt16          eStreamMode;
-    sal_Bool            bIsWritable;
+    sal_Size			nBufFilePos;	// Fileposition von pBuf[0]
+    sal_uInt16			eStreamMode;
+    sal_Bool			bIsWritable;
 
-    virtual sal_Size    GetData( void* pData, sal_Size nSize );
-    virtual sal_Size    PutData( const void* pData, sal_Size nSize );
-    virtual sal_Size    SeekPos( sal_Size nPos );
-    virtual void    FlushData();
-    virtual void    SetSize( sal_Size nSize );
+    virtual sal_Size	GetData( void* pData, sal_Size nSize );
+    virtual sal_Size	PutData( const void* pData, sal_Size nSize );
+    virtual sal_Size	SeekPos( sal_Size nPos );
+    virtual void	FlushData();
+    virtual void	SetSize( sal_Size nSize );
 
-    void            ClearError();
-    void            ClearBuffer();
+    void			ClearError();
+    void			ClearBuffer();
 
     // verschluesselt & schreibt blockweise
-    sal_Size            CryptAndWriteBuffer( const void* pStart, sal_Size nLen );
-    sal_Bool            EncryptBuffer( void* pStart, sal_Size nLen );
+    sal_Size			CryptAndWriteBuffer( const void* pStart, sal_Size nLen );
+    sal_Bool			EncryptBuffer( void* pStart, sal_Size nLen );
 
-    void            SyncSvStream( sal_Size nNewStreamPos ); // SvStream <- Medium
-    void            SyncSysStream(); // SvStream -> Medium
+    void			SyncSvStream( sal_Size nNewStreamPos ); // SvStream <- Medium
+    void			SyncSysStream(); // SvStream -> Medium
 
 public:
                     SvStream();
                     SvStream( SvLockBytes *pLockBytes);
-    virtual         ~SvStream();
+    virtual 		~SvStream();
 
-    ErrCode         SetLockBytes( SvLockBytesRef& rBytes );
-    SvLockBytes*    GetLockBytes() const { return xLockBytes; }
+    ErrCode 		SetLockBytes( SvLockBytesRef& rBytes );
+    SvLockBytes*	GetLockBytes() const { return xLockBytes; }
 
-    sal_uInt32  GetError() const { return ERRCODE_TOERROR(nError); }
-    sal_uInt32  GetErrorCode() const { return nError; }
+    sal_uInt32	GetError() const { return ERRCODE_TOERROR(nError); }
+    sal_uInt32	GetErrorCode() const { return nError; }
 
-    void            SetError( sal_uInt32 nErrorCode );
-    virtual void    ResetError();
+    void			SetError( sal_uInt32 nErrorCode );
+    virtual void	ResetError();
 
-    void            SetNumberFormatInt( sal_uInt16 nNewFormat );
-    sal_uInt16          GetNumberFormatInt() const { return nNumberFormatInt; }
+    void			SetNumberFormatInt( sal_uInt16 nNewFormat );
+    sal_uInt16			GetNumberFormatInt() const { return nNumberFormatInt; }
                     /// Enable/disable swapping of endians, may be needed for Unicode import/export
-    inline void     SetEndianSwap( sal_Bool bVal );
+    inline void		SetEndianSwap( sal_Bool bVal );
                     // returns status of endian swap flag
-    sal_Bool            IsEndianSwap() const { return 0 != bSwap; }
+    sal_Bool			IsEndianSwap() const { return 0 != bSwap; }
 
-    void            SetCompressMode( sal_uInt16 nNewMode )
+    void			SetCompressMode( sal_uInt16 nNewMode )
                         { nCompressMode = nNewMode; }
-    sal_uInt16          GetCompressMode() const { return nCompressMode; }
+    sal_uInt16			GetCompressMode() const { return nCompressMode; }
 
-    void            SetKey( const ByteString& rKey );
-    const ByteString&   GetKey() const { return aKey; }
+    void			SetKey( const ByteString& rKey );
+    const ByteString&	GetKey() const { return aKey; }
 
-    void            SetStreamCharSet( CharSet eCharSet )
+    void			SetStreamCharSet( CharSet eCharSet )
                         { eStreamCharSet = eCharSet; }
-    CharSet         GetStreamCharSet() const { return eStreamCharSet; }
-//  void            SetTargetCharSet( CharSet eCharSet )
-//                      { eTargetCharSet = eCharSet; }
-//  CharSet         GetTargetCharSet() const { return eTargetCharSet; }
+    CharSet 		GetStreamCharSet() const { return eStreamCharSet; }
+//	void			SetTargetCharSet( CharSet eCharSet )
+//						{ eTargetCharSet = eCharSet; }
+//	CharSet 		GetTargetCharSet() const { return eTargetCharSet; }
 
-    void            SetLineDelimiter( LineEnd eLineEnd )
+    void			SetLineDelimiter( LineEnd eLineEnd )
                         { eLineDelimiter = eLineEnd; }
-    LineEnd         GetLineDelimiter() const { return eLineDelimiter; }
-
-    SvStream&       operator>>( sal_uInt16& rUInt16 );
-    SvStream&       operator>>( sal_uInt32& rUInt32 );
-    SvStream&       operator>>( long& rLong );
-    SvStream&       operator>>( short& rShort );
-    SvStream&       operator>>( int& rInt );
-    SvStream&       operator>>( signed char& rChar );
-    SvStream&       operator>>( char& rChar );
-    SvStream&       operator>>( unsigned char& rChar );
-    SvStream&       operator>>( float& rFloat );
-    SvStream&       operator>>( double& rDouble );
+    LineEnd 		GetLineDelimiter() const { return eLineDelimiter; }
+
+    SvStream&		operator>>( sal_uInt16& rUInt16 );
+    SvStream&		operator>>( sal_uInt32& rUInt32 );
+    SvStream&		operator>>( long& rLong );
+    SvStream&		operator>>( short& rShort );
+    SvStream&		operator>>( int& rInt );
+    SvStream&		operator>>( signed char& rChar );
+    SvStream&		operator>>( char& rChar );
+    SvStream&		operator>>( unsigned char& rChar );
+    SvStream&		operator>>( float& rFloat );
+    SvStream&		operator>>( double& rDouble );
 #ifdef ENABLE_BYTESTRING_STREAM_OPERATORS
-    SvStream&       operator>>( ByteString& rString ) { return ReadByteString(rString); }
+    SvStream&		operator>>( ByteString& rString ) { return ReadByteString(rString); }
 #endif
 #ifdef ENABLE_STRING_STREAM_OPERATORS
-    SvStream&       operator>>( UniString& rString ) { return ReadByteString(rString); }
+    SvStream&		operator>>( UniString& rString ) { return ReadByteString(rString); }
 #endif
-    SvStream&       operator>>( SvStream& rStream );
-
-    SvStream&       operator<<( sal_uInt16 nUInt16 );
-    SvStream&       operator<<( sal_uInt32 nUInt32 );
-    SvStream&       operator<<( long nLong );
-    SvStream&       operator<<( short nShort );
-    SvStream&       operator<<( int nInt );
-    SvStream&       operator<<( signed char nChar );
-    SvStream&       operator<<( char nChar );
-    SvStream&       operator<<( unsigned char nChar );
-    SvStream&       operator<<( float nFloat );
-    SvStream&       operator<<( const double& rDouble );
-    SvStream&       operator<<( const char* pBuf );
-    SvStream&       operator<<( const unsigned char* pBuf );
+    SvStream&		operator>>( SvStream& rStream );
+
+    SvStream&		operator<<( sal_uInt16 nUInt16 );
+    SvStream&		operator<<( sal_uInt32 nUInt32 );
+    SvStream&		operator<<( long nLong );
+    SvStream&		operator<<( short nShort );
+    SvStream&		operator<<( int nInt );
+    SvStream&		operator<<( signed char nChar );
+    SvStream&		operator<<( char nChar );
+    SvStream&		operator<<( unsigned char nChar );
+    SvStream&		operator<<( float nFloat );
+    SvStream&		operator<<( const double& rDouble );
+    SvStream&		operator<<( const char* pBuf );
+    SvStream&		operator<<( const unsigned char* pBuf );
 #ifdef ENABLE_BYTESTRING_STREAM_OPERATORS
-    SvStream&       operator<<( const ByteString& rString ) { return WriteByteString( rString ); }
+    SvStream&		operator<<( const ByteString& rString ) { return WriteByteString( rString ); }
 #endif
 #ifdef ENABLE_STRING_STREAM_OPERATORS
-    SvStream&       operator<<( const UniString& rString ) { return WriteByteString(rString); }
+    SvStream&		operator<<( const UniString& rString ) { return WriteByteString(rString); }
 #endif
-    SvStream&       operator<<( SvStream& rStream );
+    SvStream&		operator<<( SvStream& rStream );
 
-    SvStream&       ReadByteString( UniString& rStr, rtl_TextEncoding eSrcCharSet );
-    SvStream&       ReadByteString( UniString& rStr ) { return ReadByteString( rStr, GetStreamCharSet() ); }
+    SvStream&		ReadByteString( UniString& rStr, rtl_TextEncoding eSrcCharSet );
+    SvStream&		ReadByteString( UniString& rStr ) { return ReadByteString( rStr, GetStreamCharSet() ); }
     SvStream&       ReadByteString( ByteString& rStr );
-    SvStream&       WriteByteString( const UniString& rStr, rtl_TextEncoding eDestCharSet );
-    SvStream&       WriteByteString( const UniString& rStr ) { return WriteByteString( rStr, GetStreamCharSet() ); }
+    SvStream&		WriteByteString( const UniString& rStr, rtl_TextEncoding eDestCharSet );
+    SvStream&		WriteByteString( const UniString& rStr ) { return WriteByteString( rStr, GetStreamCharSet() ); }
     SvStream&       WriteByteString( const ByteString& rStr );
 
-    void            SetRadix( sal_uInt8 nRad )
+    void			SetRadix( sal_uInt8 nRad )
                         { nRadix = nRad; CreateFormatString(); }
-    sal_uInt8           GetRadix() const { return nRadix; }
-    void            SetPrecision( sal_uInt8 nPrec )
+    sal_uInt8			GetRadix() const { return nRadix; }
+    void			SetPrecision( sal_uInt8 nPrec )
                         { nPrecision = nPrec; CreateFormatString(); }
-    sal_uInt8           GetPrecision() const { return nPrecision; }
-    void            SetWidth( sal_uInt8 nWid)
+    sal_uInt8			GetPrecision() const { return nPrecision; }
+    void			SetWidth( sal_uInt8 nWid)
                         { nWidth = nWid; CreateFormatString(); }
-    sal_uInt8           GetWidth() const { return nWidth; }
-    void            SetFiller( char cFil )
+    sal_uInt8			GetWidth() const { return nWidth; }
+    void			SetFiller( char cFil )
                         { cFiller = cFil; CreateFormatString(); }
-    char            GetFiller() const { return cFiller; }
-    void            SetJustification( sal_uInt8 nJus )
+    char			GetFiller() const { return cFiller; }
+    void			SetJustification( sal_uInt8 nJus )
                          { nJustification = nJus; CreateFormatString(); }
-    sal_uInt8           GetJustification() const { return nJustification; }
-
-    SvStream&       ReadNumber( short& rShort );
-    SvStream&       ReadNumber( sal_uInt16& rUInt16 );
-    SvStream&       ReadNumber( long& rLong );
-    SvStream&       ReadNumber( sal_uInt32& rUInt32 );
-    SvStream&       ReadNumber( int& rInt );
-    SvStream&       ReadNumber( float& rFloat );
-    SvStream&       ReadNumber( double& rDouble );
-
-    SvStream&       WriteNumber( short nShort );
-    SvStream&       WriteNumber( sal_uInt16 nUInt16 );
-    SvStream&       WriteNumber( long nLong );
-    SvStream&       WriteNumber( sal_uInt32 nUInt32 );
-    SvStream&       WriteNumber( int nInt );
-    SvStream&       WriteNumber( float nFloat );
-    SvStream&       WriteNumber( const double& rDouble );
-
-    sal_Size        Read( void* pData, sal_Size nSize );
-    sal_Size        Write( const void* pData, sal_Size nSize );
-    sal_Size        Seek( sal_Size nPos );
-    sal_Size        SeekRel( sal_sSize nPos );
-    sal_Size        Tell() const { return nBufFilePos+nBufActualPos;  }
-    void            Flush();
-    sal_Bool        IsEof() const { return bIsEof; }
+    sal_uInt8			GetJustification() const { return nJustification; }
+
+    SvStream&		ReadNumber( short& rShort );
+    SvStream&		ReadNumber( sal_uInt16& rUInt16 );
+    SvStream&		ReadNumber( long& rLong );
+    SvStream&		ReadNumber( sal_uInt32& rUInt32 );
+    SvStream&		ReadNumber( int& rInt );
+    SvStream&		ReadNumber( float& rFloat );
+    SvStream&		ReadNumber( double& rDouble );
+
+    SvStream&		WriteNumber( short nShort );
+    SvStream&		WriteNumber( sal_uInt16 nUInt16 );
+    SvStream&		WriteNumber( long nLong );
+    SvStream&		WriteNumber( sal_uInt32 nUInt32 );
+    SvStream&		WriteNumber( int nInt );
+    SvStream&		WriteNumber( float nFloat );
+    SvStream&		WriteNumber( const double& rDouble );
+
+    sal_Size		Read( void* pData, sal_Size nSize );
+    sal_Size		Write( const void* pData, sal_Size nSize );
+    sal_Size		Seek( sal_Size nPos );
+    sal_Size		SeekRel( sal_sSize nPos );
+    sal_Size		Tell() const { return nBufFilePos+nBufActualPos;  }
+    void			Flush();
+    sal_Bool		IsEof() const { return bIsEof; }
     // next Tell() <= nSize
-    sal_Bool        SetStreamSize( sal_Size nSize );
+    sal_Bool		SetStreamSize( sal_Size nSize );
 
                 /// Read in the stream to a zero character and put all
                 /// read chracters in the Bytestring. The String interface
                 /// convert the BytString with the given encoding to a String
-    sal_Bool        ReadCString( ByteString& rStr );
-    sal_Bool        ReadCString( String& rStr, rtl_TextEncoding eToEncode );
-    sal_Bool        ReadCString( String& rStr ) { return ReadCString( rStr, GetStreamCharSet()); }
+    sal_Bool		ReadCString( ByteString& rStr );
+    sal_Bool 		ReadCString( String& rStr, rtl_TextEncoding eToEncode );
+    sal_Bool 		ReadCString( String& rStr ) { return ReadCString( rStr, GetStreamCharSet()); }
 
-    sal_Bool        ReadLine( ByteString& rStr );
-    sal_Bool        WriteLine( const ByteString& rStr );
-    sal_Bool        WriteLines( const ByteString& rStr );
+    sal_Bool		ReadLine( ByteString& rStr );
+    sal_Bool		WriteLine( const ByteString& rStr );
+    sal_Bool		WriteLines( const ByteString& rStr );
 
-    sal_Bool        ReadByteStringLine( String& rStr, rtl_TextEncoding eSrcCharSet );
-    sal_Bool        ReadByteStringLine( String& rStr ) { return ReadByteStringLine( rStr, GetStreamCharSet()); }
-    sal_Bool        WriteByteStringLine( const String& rStr, rtl_TextEncoding eDestCharSet );
-    sal_Bool        WriteByteStringLine( const String& rStr ) { return WriteByteStringLine( rStr, GetStreamCharSet()); }
-    sal_Bool        WriteByteStringLines( const String& rStr, rtl_TextEncoding eDestCharSet );
-    sal_Bool        WriteByteStringLines( const String& rStr ) { return WriteByteStringLine( rStr, GetStreamCharSet()); }
+    sal_Bool		ReadByteStringLine( String& rStr, rtl_TextEncoding eSrcCharSet );
+    sal_Bool		ReadByteStringLine( String& rStr ) { return ReadByteStringLine( rStr, GetStreamCharSet()); }
+    sal_Bool		WriteByteStringLine( const String& rStr, rtl_TextEncoding eDestCharSet );
+    sal_Bool		WriteByteStringLine( const String& rStr ) { return WriteByteStringLine( rStr, GetStreamCharSet()); }
+    sal_Bool		WriteByteStringLines( const String& rStr, rtl_TextEncoding eDestCharSet );
+    sal_Bool		WriteByteStringLines( const String& rStr ) { return WriteByteStringLine( rStr, GetStreamCharSet()); }
 
                 /// Switch to no endian swapping and write 0xfeff
-    sal_Bool        StartWritingUnicodeText();
+    sal_Bool		StartWritingUnicodeText();
                 /// Read 16bit, if 0xfeff do nothing, if 0xfffe switch
                 /// endian swapping, if none of them put back
-    sal_Bool        StartReadingUnicodeText();
+    sal_Bool		StartReadingUnicodeText();
 
                 /// Read a line of Unicode
-    sal_Bool        ReadUniStringLine( String& rStr );
+    sal_Bool		ReadUniStringLine( String& rStr );
                 /// Read a line of Unicode if eSrcCharSet==RTL_TEXTENCODING_UNICODE,
                 /// otherwise read a line of Bytecode and convert from eSrcCharSet
-    sal_Bool        ReadUniOrByteStringLine( String& rStr, rtl_TextEncoding eSrcCharSet );
-    sal_Bool        ReadUniOrByteStringLine( String& rStr )
+    sal_Bool		ReadUniOrByteStringLine( String& rStr, rtl_TextEncoding eSrcCharSet );
+    sal_Bool		ReadUniOrByteStringLine( String& rStr )
                     { return ReadUniOrByteStringLine( rStr, GetStreamCharSet() ); }
                 /// Write a sequence of Unicode characters
-    sal_Bool        WriteUnicodeText( const String& rStr );
+    sal_Bool		WriteUnicodeText( const String& rStr );
                 /// Write a sequence of Unicode characters if eDestCharSet==RTL_TEXTENCODING_UNICODE,
                 /// otherwise write a sequence of Bytecodes converted to eDestCharSet
-    sal_Bool        WriteUnicodeOrByteText( const String& rStr, rtl_TextEncoding eDestCharSet );
-    sal_Bool        WriteUnicodeOrByteText( const String& rStr )
+    sal_Bool		WriteUnicodeOrByteText( const String& rStr, rtl_TextEncoding eDestCharSet );
+    sal_Bool		WriteUnicodeOrByteText( const String& rStr )
                     { return WriteUnicodeOrByteText( rStr, GetStreamCharSet() ); }
                 /// Write a line of Unicode and append line end (endlu())
-    sal_Bool        WriteUniStringLine( const String& rStr );
+    sal_Bool		WriteUniStringLine( const String& rStr );
                 /// Write multiple lines of Unicode (with CovertLineEnd) and append line end (endlu())
-    sal_Bool        WriteUniStringLines( const String& rStr );
+    sal_Bool		WriteUniStringLines( const String& rStr );
                 /// Write a line of Unicode if eDestCharSet==RTL_TEXTENCODING_UNICODE,
                 /// otherwise write a line of Bytecode converted to eDestCharSet
-    sal_Bool        WriteUniOrByteStringLine( const String& rStr, rtl_TextEncoding eDestCharSet );
-    sal_Bool        WriteUniOrByteStringLine( const String& rStr )
+    sal_Bool		WriteUniOrByteStringLine( const String& rStr, rtl_TextEncoding eDestCharSet );
+    sal_Bool		WriteUniOrByteStringLine( const String& rStr )
                     { return WriteUniOrByteStringLine( rStr, GetStreamCharSet() ); }
                 /// Write multiple lines of Unicode if eDestCharSet==RTL_TEXTENCODING_UNICODE,
                 /// otherwise write multiple lines of Bytecode converted to eDestCharSet,
                 /// CovertLineEnd is applied.
-    sal_Bool        WriteUniOrByteStringLines( const String& rStr, rtl_TextEncoding eDestCharSet );
-    sal_Bool        WriteUniOrByteStringLines( const String& rStr )
+    sal_Bool		WriteUniOrByteStringLines( const String& rStr, rtl_TextEncoding eDestCharSet );
+    sal_Bool		WriteUniOrByteStringLines( const String& rStr )
                     { return WriteUniOrByteStringLines( rStr, GetStreamCharSet() ); }
                 /// Write a Unicode character if eDestCharSet==RTL_TEXTENCODING_UNICODE,
                 /// otherwise write as Bytecode converted to eDestCharSet.
                 /// This may result in more than one byte being written
                 /// if a multi byte encoding (e.g. UTF7, UTF8) is chosen.
-    sal_Bool        WriteUniOrByteChar( sal_Unicode ch, rtl_TextEncoding eDestCharSet );
-    sal_Bool        WriteUniOrByteChar( sal_Unicode ch )
+    sal_Bool		WriteUniOrByteChar( sal_Unicode ch, rtl_TextEncoding eDestCharSet );
+    sal_Bool		WriteUniOrByteChar( sal_Unicode ch )
                     { return WriteUniOrByteChar( ch, GetStreamCharSet() ); }
 
                 /** Read a CSV (comma separated values) data line using
@@ -556,61 +556,61 @@ public:
                         const String& rFieldSeparators, sal_Unicode cFieldQuote,
                         sal_Bool bAllowBackslashEscape = sal_False);
 
-    void            SetBufferSize( sal_uInt16 nBufSize );
-    sal_uInt16  GetBufferSize() const { return nBufSize; }
+    void			SetBufferSize( sal_uInt16 nBufSize );
+    sal_uInt16	GetBufferSize() const { return nBufSize; }
 
-    void            RefreshBuffer();
-    SvStream&       PutBack( char aCh );
-    void            EatWhite();
+    void			RefreshBuffer();
+    SvStream&		PutBack( char aCh );
+    void			EatWhite();
 
-    sal_Bool            IsWritable() const { return bIsWritable; }
-    StreamMode      GetStreamMode() const { return eStreamMode; }
-    virtual sal_uInt16  IsA() const;
+    sal_Bool			IsWritable() const { return bIsWritable; }
+    StreamMode		GetStreamMode() const { return eStreamMode; }
+    virtual sal_uInt16	IsA() const;
 
-    long            GetVersion() { return nVersion; }
-    void            SetVersion( long n ) { nVersion = n; }
+    long			GetVersion() { return nVersion; }
+    void			SetVersion( long n ) { nVersion = n; }
 
     /** Add a mark to indicate to which position in the stream you want to be
         able to seek back.
 
-        @descr  If you set a mark at nPos, you indicate to the stream that you
+        @descr	If you set a mark at nPos, you indicate to the stream that you
         won't issue seek operations to any position 'before' nPos.  This can
         be exploited by 'transient streams' that do not permanently store
         their data; they can discard any buffered data up to nPos.
 
-        @descr  However, if the stream is already positioned past nPos, this
+        @descr	However, if the stream is already positioned past nPos, this
         method is not guaranteed to have the desired effect.  A 'transient
         stream' may have already discarded the buffered data at nPos, so that
         a seek operation to nPos will fail nonetheless.
 
-        @descr  There can be more than one mark for a stream, indicating that
+        @descr	There can be more than one mark for a stream, indicating that
         you want to be able to seek back in the stream as far as the 'lowest'
-        off all the marks.  There can even be multiple marks at the same
+        off all the marks.	There can even be multiple marks at the same
         position (and they must all be individually removed with
         RemoveMark()).
 
         @param nPos  The position in the stream at which to add a mark.
      */
-    virtual void    AddMark(sal_Size nPos);
+    virtual void	AddMark(sal_Size nPos);
 
     /** Remove a mark introduced with AddMark().
 
-        @descr  If you no longer need to seek back to some position for which
-        you added a mark, you should remove that mark.  (And a 'transient
+        @descr	If you no longer need to seek back to some position for which
+        you added a mark, you should remove that mark.	(And a 'transient
         stream' that does not permanently store its data can then potentially
         discard some of its buffered data.)
 
-        @descr  Removing one mark does not have any effects on any other
-        marks.  Especially, if you have multiple marks at the same position,
+        @descr	Removing one mark does not have any effects on any other
+        marks.	Especially, if you have multiple marks at the same position,
         you must call this method multiple times to effectively 'unmark' that
         position.
 
-        @descr  If you specify a position for which there is no mark, this
+        @descr	If you specify a position for which there is no mark, this
         method simply has no effect.
 
         @param nPos  The position in the stream at which to remove the mark.
      */
-    virtual void    RemoveMark(sal_Size nPos);
+    virtual void	RemoveMark(sal_Size nPos);
 
     friend SvStream& operator<<( SvStream& rStr, SvStrPtr f ); // fuer Manips
 };
@@ -722,11 +722,11 @@ class TOOLS_DLLPUBLIC SvFileStream : public SvStream
     friend class FileCopier;
 
 private:
-    StreamData*         pInstanceData;
-    String          aFilename;
-    sal_uInt16      nLockCounter;
-    sal_Bool            bIsOpen;
-    sal_uInt32      GetFileHandle() const;
+    StreamData* 		pInstanceData;
+    String			aFilename;
+    sal_uInt16		nLockCounter;
+    sal_Bool			bIsOpen;
+    sal_uInt32		GetFileHandle() const;
 
     // Forbidden and not implemented.
     SvFileStream (const SvFileStream&);
@@ -734,11 +734,11 @@ private:
 
 protected:
 
-    virtual sal_Size    GetData( void* pData, sal_Size nSize );
-    virtual sal_Size    PutData( const void* pData, sal_Size nSize );
-    virtual sal_Size    SeekPos( sal_Size nPos );
-    virtual void    SetSize( sal_Size nSize );
-    virtual void    FlushData();
+    virtual sal_Size	GetData( void* pData, sal_Size nSize );
+    virtual sal_Size	PutData( const void* pData, sal_Size nSize );
+    virtual sal_Size	SeekPos( sal_Size nPos );
+    virtual void	SetSize( sal_Size nSize );
+    virtual void	FlushData();
 
 public:
                     // Schaltet bei fehlgeschlagenem Schreiboeffnen auf Lesen zurueck
@@ -746,21 +746,21 @@ public:
                     SvFileStream();
                     ~SvFileStream();
 
-    virtual void    ResetError();
+    virtual void	ResetError();
 
-    sal_Bool            LockRange( sal_Size nByteOffset, sal_Size nBytes );
-    sal_Bool            UnlockRange( sal_Size nByteOffset, sal_Size nBytes );
-    sal_Bool            LockFile();
-    sal_Bool            UnlockFile();
+    sal_Bool			LockRange( sal_Size nByteOffset, sal_Size nBytes );
+    sal_Bool			UnlockRange( sal_Size nByteOffset, sal_Size nBytes );
+    sal_Bool			LockFile();
+    sal_Bool			UnlockFile();
 
-    void            Open( const String& rFileName, StreamMode eOpenMode );
-    void            Close();
-    void            ReOpen(); // Aufruf nach Close, FilePointer == 0
-    sal_Bool            IsOpen() const { return bIsOpen; }
-    sal_Bool            IsLocked() const { return ( nLockCounter!=0 ); }
-    virtual sal_uInt16  IsA() const;
+    void			Open( const String& rFileName, StreamMode eOpenMode );
+    void			Close();
+    void			ReOpen(); // Aufruf nach Close, FilePointer == 0
+    sal_Bool			IsOpen() const { return bIsOpen; }
+    sal_Bool			IsLocked() const { return ( nLockCounter!=0 ); }
+    virtual sal_uInt16	IsA() const;
 
-    const String&   GetFileName() const { return aFilename; }
+    const String&	GetFileName() const { return aFilename; }
 };
 
 // ----------------
@@ -777,59 +777,59 @@ class TOOLS_DLLPUBLIC SvMemoryStream : public SvStream
     sal_Size            GetSize() const { return nSize; }
 
 protected:
-    sal_Size            nSize;
-    sal_Size            nResize;
-    sal_Size            nPos;
-    sal_Size            nEndOfData;
-    sal_uInt8*          pBuf;
-    sal_Bool            bOwnsData;
-
-    virtual sal_Size    GetData( void* pData, sal_Size nSize );
-    virtual sal_Size    PutData( const void* pData, sal_Size nSize );
-    virtual sal_Size    SeekPos( sal_Size nPos );
-    virtual void    SetSize( sal_Size nSize );
-    virtual void    FlushData();
+    sal_Size			nSize;
+    sal_Size			nResize;
+    sal_Size			nPos;
+    sal_Size			nEndOfData;
+    sal_uInt8*			pBuf;
+    sal_Bool			bOwnsData;
+
+    virtual sal_Size	GetData( void* pData, sal_Size nSize );
+    virtual sal_Size	PutData( const void* pData, sal_Size nSize );
+    virtual sal_Size	SeekPos( sal_Size nPos );
+    virtual void	SetSize( sal_Size nSize );
+    virtual void	FlushData();
 
     // AllocateMemory muss folgende Variable mitpflegen:
     // - pBuf: Adresse des neuen Blocks
-    virtual sal_Bool    AllocateMemory( sal_Size nSize );
+    virtual sal_Bool	AllocateMemory( sal_Size nSize );
 
     // ReAllocateMemory muss folgende Variablen mitpflegen:
     // - pBuf: Adresse des neuen Blocks
     // - nEndOfData: Muss auf nNewSize-1L gesetzt werden, wenn ausserhalb des Blocks
-    //               Muss auf 0 gesetzt werden, wenn neuer Block 0 Byte gross
+    //				 Muss auf 0 gesetzt werden, wenn neuer Block 0 Byte gross
     // - nSize: Neue Groesse des Blocks
     // - nPos: Muss auf 0 gesetzt werden, wenn ausserhalb des Blocks
-    virtual sal_Bool    ReAllocateMemory( long nDiff );
+    virtual sal_Bool	ReAllocateMemory( long nDiff );
 
     // wird aufgerufen, wenn dem Stream der Speicher gehoert oder wenn
     // der Speicher in der Groesse veraendert wird.
     // FreeMemory muss folgende Variablen mitpflegen:
     // - in abgeleiteten Klassen muessen ggf. Handles genullt werden
-    virtual void    FreeMemory();
+    virtual void	FreeMemory();
 
-                    SvMemoryStream(void*) { }   // Fuer unsere Subklassen
+                    SvMemoryStream(void*) { }	// Fuer unsere Subklassen
 
 public:
                     SvMemoryStream( void* pBuf, sal_Size nSize, StreamMode eMode);
                     SvMemoryStream( sal_Size nInitSize=512, sal_Size nResize=64 );
                     ~SvMemoryStream();
 
-    virtual void    ResetError();
+    virtual void	ResetError();
 
     sal_Size        GetEndOfData() const { return nEndOfData; }
-    const void*     GetData() { Flush(); return pBuf; }
-    operator const  void*() { Flush(); return pBuf; }
-    virtual sal_uInt16  IsA() const;
+    const void* 	GetData() { Flush(); return pBuf; }
+    operator const	void*() { Flush(); return pBuf; }
+    virtual sal_uInt16	IsA() const;
 
-    void*           SwitchBuffer( sal_Size nInitSize=512, sal_Size nResize=64 );
-    void*           SetBuffer( void* pBuf, sal_Size nSize,
+    void*			SwitchBuffer( sal_Size nInitSize=512, sal_Size nResize=64 );
+    void*			SetBuffer( void* pBuf, sal_Size nSize,
                                sal_Bool bOwnsData=TRUE, sal_Size nEOF=0 );
 
-    void            ObjectOwnsMemory( sal_Bool bOwn ) { bOwnsData = bOwn; }
-    sal_Bool            IsObjectMemoryOwner() { return bOwnsData; }
-    void            SetResizeOffset( sal_Size nNewResize ) { nResize = nNewResize; }
-    sal_Size            GetResizeOffset() const { return nResize; }
+    void			ObjectOwnsMemory( sal_Bool bOwn ) { bOwnsData = bOwn; }
+    sal_Bool			IsObjectMemoryOwner() { return bOwnsData; }
+    void			SetResizeOffset( sal_Size nNewResize ) { nResize = nNewResize; }
+    sal_Size			GetResizeOffset() const { return nResize; }
 };
 
 // --------------------
@@ -847,10 +847,10 @@ public:
      mehrfaches Aufrufen von Load und Assign erlaubt
     --------------------------------------------------*/
                     TYPEINFO();
-    virtual         ~SvDataCopyStream(){}
-    virtual void    Load( SvStream & ) = 0;
-    virtual void    Save( SvStream & ) = 0;
-    virtual void    Assign( const SvDataCopyStream & );
+    virtual 		~SvDataCopyStream(){}
+    virtual void	Load( SvStream & ) = 0;
+    virtual void	Save( SvStream & ) = 0;
+    virtual void	Assign( const SvDataCopyStream & );
 };
 
 #endif // _STREAM_HXX
diff --git a/tools/inc/tools/string.hxx b/tools/inc/tools/string.hxx
index 8b86a1835596..cd4b8227fc0a 100644
--- a/tools/inc/tools/string.hxx
+++ b/tools/inc/tools/string.hxx
@@ -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
@@ -61,10 +61,10 @@ class UniString;
 
 // -----------------------------------------------------------------------
 
-#define BYTESTRING_TO_UNISTRING_CVTFLAGS    (RTL_TEXTTOUNICODE_FLAGS_UNDEFINED_MAPTOPRIVATE |\
+#define BYTESTRING_TO_UNISTRING_CVTFLAGS	(RTL_TEXTTOUNICODE_FLAGS_UNDEFINED_MAPTOPRIVATE |\
                                              RTL_TEXTTOUNICODE_FLAGS_MBUNDEFINED_DEFAULT |\
                                              RTL_TEXTTOUNICODE_FLAGS_INVALID_DEFAULT)
-#define UNISTRING_TO_BYTESTRING_CVTFLAGS    (RTL_UNICODETOTEXT_FLAGS_UNDEFINED_DEFAULT |\
+#define UNISTRING_TO_BYTESTRING_CVTFLAGS	(RTL_UNICODETOTEXT_FLAGS_UNDEFINED_DEFAULT |\
                                              RTL_UNICODETOTEXT_FLAGS_INVALID_DEFAULT |\
                                              RTL_UNICODETOTEXT_FLAGS_UNDEFINED_REPLACE |\
                                              RTL_UNICODETOTEXT_FLAGS_PRIVATE_MAPTO0 |\
@@ -113,14 +113,14 @@ inline LineEnd GetSystemLineEnd()
 
 #ifdef STRING32
 #define STRING_NOTFOUND    ((xub_StrLen)0x7FFFFFFF)
-#define STRING_MATCH       ((xub_StrLen)0x7FFFFFFF)
-#define STRING_LEN         ((xub_StrLen)0x7FFFFFFF)
-#define STRING_MAXLEN      ((xub_StrLen)0x7FFFFFFF)
+#define STRING_MATCH	   ((xub_StrLen)0x7FFFFFFF)
+#define STRING_LEN		   ((xub_StrLen)0x7FFFFFFF)
+#define STRING_MAXLEN	   ((xub_StrLen)0x7FFFFFFF)
 #else
 #define STRING_NOTFOUND    ((xub_StrLen)0xFFFF)
-#define STRING_MATCH       ((xub_StrLen)0xFFFF)
-#define STRING_LEN         ((xub_StrLen)0xFFFF)
-#define STRING_MAXLEN      ((xub_StrLen)0xFFFF)
+#define STRING_MATCH	   ((xub_StrLen)0xFFFF)
+#define STRING_LEN		   ((xub_StrLen)0xFFFF)
+#define STRING_MAXLEN	   ((xub_StrLen)0xFFFF)
 #endif
 
 enum StringCompare { COMPARE_LESS = -1, COMPARE_EQUAL = 0, COMPARE_GREATER = 1 };
@@ -142,9 +142,9 @@ enum StringCompare { COMPARE_LESS = -1, COMPARE_EQUAL = 0, COMPARE_GREATER = 1 }
 
 typedef struct _ByteStringData
 {
-    sal_Int32               mnRefCount;     // Referenz counter
-    sal_Int32               mnLen;          // Length of the String
-    sal_Char                maStr[1];       // CharArray (String)
+    sal_Int32				mnRefCount; 	// Referenz counter
+    sal_Int32				mnLen;			// Length of the String
+    sal_Char				maStr[1];		// CharArray (String)
 } ByteStringData;
 
 #ifdef SAL_W32
@@ -159,12 +159,12 @@ typedef struct _ByteStringData
 
 class TOOLS_DLLPUBLIC ByteString
 {
-    friend              class UniString;
+    friend				class UniString;
 
     TOOLS_DLLPRIVATE void InitStringRes( const UniString& rStr );
 
 private:
-    ByteStringData*     mpData;
+    ByteStringData* 	mpData;
 
     TOOLS_DLLPRIVATE inline void ImplCopyData();
     TOOLS_DLLPRIVATE inline char * ImplCopyStringData(char *);
@@ -212,186 +212,186 @@ public:
         return rtl::OString (reinterpret_cast<rtl_String*>(mpData));
     }
 
-    static ByteString   CreateFromInt32( sal_Int32 n, sal_Int16 nRadix = 10 );
-    static ByteString   CreateFromInt64( sal_Int64 n, sal_Int16 nRadix = 10 );
-    static ByteString   CreateFromFloat( float f );
-    static ByteString   CreateFromDouble( double d );
+    static ByteString	CreateFromInt32( sal_Int32 n, sal_Int16 nRadix = 10 );
+    static ByteString	CreateFromInt64( sal_Int64 n, sal_Int16 nRadix = 10 );
+    static ByteString	CreateFromFloat( float f );
+    static ByteString	CreateFromDouble( double d );
     static const ByteString& EmptyString();
-    sal_Int32           ToInt32() const;
-    sal_Int64           ToInt64() const;
-    float               ToFloat() const;
-    double              ToDouble() const;
-
-    ByteString&         Assign( const ByteString& rStr );
-    ByteString&         Assign( const rtl::OString& rStr );
-    ByteString&         Assign( const sal_Char* pCharStr );
-    ByteString&         Assign( const sal_Char* pCharStr, xub_StrLen nLen );
-    ByteString&         Assign( sal_Char c );
-    ByteString&         operator =( const ByteString& rStr )
+    sal_Int32			ToInt32() const;
+    sal_Int64			ToInt64() const;
+    float				ToFloat() const;
+    double				ToDouble() const;
+
+    ByteString& 		Assign( const ByteString& rStr );
+    ByteString& 		Assign( const rtl::OString& rStr );
+    ByteString& 		Assign( const sal_Char* pCharStr );
+    ByteString& 		Assign( const sal_Char* pCharStr, xub_StrLen nLen );
+    ByteString& 		Assign( sal_Char c );
+    ByteString& 		operator =( const ByteString& rStr )
                             { return Assign( rStr ); }
-    ByteString&         operator =( const rtl::OString& rStr )
+    ByteString& 		operator =( const rtl::OString& rStr )
                             { return Assign( rStr ); }
-    ByteString&         operator =( const sal_Char* pCharStr )
+    ByteString& 		operator =( const sal_Char* pCharStr )
                             { return Assign( pCharStr ); }
-    ByteString&         operator =( const sal_Char c )
+    ByteString& 		operator =( const sal_Char c )
                             { return Assign( c ); }
 
-    ByteString&         Append( const ByteString& rStr );
-    ByteString&         Append( const sal_Char* pCharStr );
-    ByteString&         Append( const sal_Char* pCharStr, xub_StrLen nLen );
-    ByteString&         Append( char c );
-    ByteString&         operator +=( const ByteString& rStr )
+    ByteString& 		Append( const ByteString& rStr );
+    ByteString& 		Append( const sal_Char* pCharStr );
+    ByteString& 		Append( const sal_Char* pCharStr, xub_StrLen nLen );
+    ByteString& 		Append( char c );
+    ByteString& 		operator +=( const ByteString& rStr )
                             { return Append( rStr ); }
-    ByteString&         operator +=( const sal_Char* pCharStr )
+    ByteString& 		operator +=( const sal_Char* pCharStr )
                             { return Append( pCharStr ); }
-    ByteString&         operator +=( sal_Char c )
+    ByteString& 		operator +=( sal_Char c )
                             { return Append( c ); }
 
-    void                SetChar( xub_StrLen nIndex, sal_Char c );
-    sal_Char            GetChar( xub_StrLen nIndex ) const
+    void				SetChar( xub_StrLen nIndex, sal_Char c );
+    sal_Char			GetChar( xub_StrLen nIndex ) const
                             { return mpData->maStr[nIndex]; }
 
-    xub_StrLen          Len() const { return (xub_StrLen)mpData->mnLen; }
+    xub_StrLen			Len() const { return (xub_StrLen)mpData->mnLen; }
 
-    ByteString&         Insert( const ByteString& rStr, xub_StrLen nIndex = STRING_LEN );
-    ByteString&         Insert( const ByteString& rStr, xub_StrLen nPos, xub_StrLen nLen,
+    ByteString& 		Insert( const ByteString& rStr, xub_StrLen nIndex = STRING_LEN );
+    ByteString& 		Insert( const ByteString& rStr, xub_StrLen nPos, xub_StrLen nLen,
                                 xub_StrLen nIndex = STRING_LEN );
-    ByteString&         Insert( const sal_Char* pCharStr, xub_StrLen nIndex = STRING_LEN );
-    ByteString&         Insert( sal_Char c, xub_StrLen nIndex = STRING_LEN );
-    ByteString&         Replace( xub_StrLen nIndex, xub_StrLen nCount, const ByteString& rStr );
-    ByteString&         Erase( xub_StrLen nIndex = 0, xub_StrLen nCount = STRING_LEN );
+    ByteString& 		Insert( const sal_Char* pCharStr, xub_StrLen nIndex = STRING_LEN );
+    ByteString& 		Insert( sal_Char c, xub_StrLen nIndex = STRING_LEN );
+    ByteString& 		Replace( xub_StrLen nIndex, xub_StrLen nCount, const ByteString& rStr );
+    ByteString& 		Erase( xub_StrLen nIndex = 0, xub_StrLen nCount = STRING_LEN );
     ByteString          Copy( xub_StrLen nIndex = 0, xub_StrLen nCount = STRING_LEN ) const;
 
-    ByteString&         Fill( xub_StrLen nCount, sal_Char cFillChar = ' ' );
-    ByteString&         Expand( xub_StrLen nCount, sal_Char cExpandChar = ' ' );
+    ByteString& 		Fill( xub_StrLen nCount, sal_Char cFillChar = ' ' );
+    ByteString& 		Expand( xub_StrLen nCount, sal_Char cExpandChar = ' ' );
 
-    ByteString&         EraseLeadingChars( sal_Char c = ' ' );
-    ByteString&         EraseTrailingChars( sal_Char c = ' ' );
-    ByteString&         EraseLeadingAndTrailingChars( sal_Char c = ' ' );
-    ByteString&         EraseAllChars( sal_Char c = ' ' );
-    ByteString&         Reverse();
+    ByteString& 		EraseLeadingChars( sal_Char c = ' ' );
+    ByteString& 		EraseTrailingChars( sal_Char c = ' ' );
+    ByteString& 		EraseLeadingAndTrailingChars( sal_Char c = ' ' );
+    ByteString& 		EraseAllChars( sal_Char c = ' ' );
+    ByteString& 		Reverse();
 
-    ByteString&         Convert( rtl_TextEncoding eSource,
+    ByteString& 		Convert( rtl_TextEncoding eSource,
                                  rtl_TextEncoding eTarget,
                                  BOOL bReplace = TRUE );
-    static sal_Char     Convert( sal_Char c, rtl_TextEncoding eSource,
+    static sal_Char 	Convert( sal_Char c, rtl_TextEncoding eSource,
                                  rtl_TextEncoding eTarget,
                                  BOOL bReplace = TRUE );
-    static sal_Unicode  ConvertToUnicode( sal_Char c,
+    static sal_Unicode	ConvertToUnicode( sal_Char c,
                                           rtl_TextEncoding eTextEncoding );
-    static sal_Char     ConvertFromUnicode( sal_Unicode c,
+    static sal_Char 	ConvertFromUnicode( sal_Unicode c,
                                             rtl_TextEncoding eTextEncoding,
                                             BOOL bReplace = TRUE );
-    static sal_Unicode  ConvertToUnicode( const sal_Char* pChar, sal_Size* pLen,
+    static sal_Unicode	ConvertToUnicode( const sal_Char* pChar, sal_Size* pLen,
                                           rtl_TextEncoding eTextEncoding );
-    static sal_Size     ConvertFromUnicode( sal_Unicode c, sal_Char* pBuf, sal_Size nBufLen,
+    static sal_Size 	ConvertFromUnicode( sal_Unicode c, sal_Char* pBuf, sal_Size nBufLen,
                                             rtl_TextEncoding eTextEncoding,
                                             BOOL bReplace = TRUE );
-    ByteString&         ConvertLineEnd( LineEnd eLineEnd );
-    ByteString&         ConvertLineEnd()
+    ByteString& 		ConvertLineEnd( LineEnd eLineEnd );
+    ByteString& 		ConvertLineEnd()
                             { return ConvertLineEnd( GetSystemLineEnd() ); }
 
-    BOOL                IsLowerAscii() const;
-    BOOL                IsUpperAscii() const;
-    BOOL                IsAlphaAscii() const;
-    BOOL                IsNumericAscii() const;
-    BOOL                IsAlphaNumericAscii() const;
+    BOOL				IsLowerAscii() const;
+    BOOL				IsUpperAscii() const;
+    BOOL				IsAlphaAscii() const;
+    BOOL				IsNumericAscii() const;
+    BOOL				IsAlphaNumericAscii() const;
 
-    ByteString&         ToLowerAscii();
-    ByteString&         ToUpperAscii();
+    ByteString& 		ToLowerAscii();
+    ByteString& 		ToUpperAscii();
 
-    StringCompare       CompareTo( const ByteString& rStr,
+    StringCompare		CompareTo( const ByteString& rStr,
                                    xub_StrLen nLen = STRING_LEN ) const;
-    StringCompare       CompareTo( const sal_Char* pCharStr,
+    StringCompare		CompareTo( const sal_Char* pCharStr,
                                    xub_StrLen nLen = STRING_LEN ) const;
-    StringCompare       CompareIgnoreCaseToAscii( const ByteString& rStr,
+    StringCompare		CompareIgnoreCaseToAscii( const ByteString& rStr,
                                                   xub_StrLen nLen = STRING_LEN ) const;
-    StringCompare       CompareIgnoreCaseToAscii( const sal_Char* pCharStr,
+    StringCompare		CompareIgnoreCaseToAscii( const sal_Char* pCharStr,
                                                   xub_StrLen nLen = STRING_LEN ) const;
-    BOOL                Equals( const ByteString& rStr ) const;
-    BOOL                Equals( const sal_Char* pCharStr ) const;
-    BOOL                EqualsIgnoreCaseAscii( const ByteString& rStr ) const;
-    BOOL                EqualsIgnoreCaseAscii( const sal_Char* pCharStr ) const;
-    BOOL                Equals( const ByteString& rStr,
+    BOOL				Equals( const ByteString& rStr ) const;
+    BOOL				Equals( const sal_Char* pCharStr ) const;
+    BOOL				EqualsIgnoreCaseAscii( const ByteString& rStr ) const;
+    BOOL				EqualsIgnoreCaseAscii( const sal_Char* pCharStr ) const;
+    BOOL				Equals( const ByteString& rStr,
                                 xub_StrLen nIndex, xub_StrLen nLen ) const;
-    BOOL                Equals( const sal_Char* pCharStr,
+    BOOL				Equals( const sal_Char* pCharStr,
                                 xub_StrLen nIndex, xub_StrLen nLen ) const;
-    BOOL                EqualsIgnoreCaseAscii( const ByteString& rStr,
+    BOOL				EqualsIgnoreCaseAscii( const ByteString& rStr,
                                                xub_StrLen nIndex, xub_StrLen nLen ) const;
-    BOOL                EqualsIgnoreCaseAscii( const sal_Char* pCharStr,
+    BOOL				EqualsIgnoreCaseAscii( const sal_Char* pCharStr,
                                                xub_StrLen nIndex, xub_StrLen nLen ) const;
 
-    xub_StrLen          Match( const ByteString& rStr ) const;
-    xub_StrLen          Match( const sal_Char* pCharStr ) const;
+    xub_StrLen			Match( const ByteString& rStr ) const;
+    xub_StrLen			Match( const sal_Char* pCharStr ) const;
 
-    xub_StrLen          Search( sal_Char c, xub_StrLen nIndex = 0 ) const;
-    xub_StrLen          Search( const ByteString& rStr, xub_StrLen nIndex = 0 ) const;
-    xub_StrLen          Search( const sal_Char* pCharStr, xub_StrLen nIndex = 0 ) const;
-    xub_StrLen          SearchBackward( sal_Char c, xub_StrLen nIndex = STRING_LEN ) const;
-    xub_StrLen          SearchChar( const sal_Char* pChars, xub_StrLen nIndex = 0 ) const;
-    xub_StrLen          SearchCharBackward( const sal_Char* pChars, xub_StrLen nIndex = STRING_LEN ) const;
+    xub_StrLen			Search( sal_Char c, xub_StrLen nIndex = 0 ) const;
+    xub_StrLen			Search( const ByteString& rStr, xub_StrLen nIndex = 0 ) const;
+    xub_StrLen			Search( const sal_Char* pCharStr, xub_StrLen nIndex = 0 ) const;
+    xub_StrLen			SearchBackward( sal_Char c, xub_StrLen nIndex = STRING_LEN ) const;
+    xub_StrLen			SearchChar( const sal_Char* pChars, xub_StrLen nIndex = 0 ) const;
+    xub_StrLen			SearchCharBackward( const sal_Char* pChars, xub_StrLen nIndex = STRING_LEN ) const;
 
-    xub_StrLen          SearchAndReplace( sal_Char c, sal_Char cRep, xub_StrLen nIndex = 0 );
-    xub_StrLen          SearchAndReplace( const ByteString& rStr, const ByteString& rRepStr,
+    xub_StrLen			SearchAndReplace( sal_Char c, sal_Char cRep, xub_StrLen nIndex = 0 );
+    xub_StrLen			SearchAndReplace( const ByteString& rStr, const ByteString& rRepStr,
                                           xub_StrLen nIndex = 0 );
-    xub_StrLen          SearchAndReplace( const sal_Char* pCharStr, const ByteString& rRepStr,
+    xub_StrLen			SearchAndReplace( const sal_Char* pCharStr, const ByteString& rRepStr,
                                           xub_StrLen nIndex = 0 );
-    void                SearchAndReplaceAll( sal_Char c, sal_Char cRep );
-    void                SearchAndReplaceAll( const ByteString& rStr, const ByteString& rRepStr );
-    void                SearchAndReplaceAll( const sal_Char* pCharStr, const ByteString& rRepStr );
+    void				SearchAndReplaceAll( sal_Char c, sal_Char cRep );
+    void				SearchAndReplaceAll( const ByteString& rStr, const ByteString& rRepStr );
+    void				SearchAndReplaceAll( const sal_Char* pCharStr, const ByteString& rRepStr );
 
-    xub_StrLen          GetTokenCount( sal_Char cTok = ';' ) const;
-    void                SetToken( xub_StrLen nToken, sal_Char cTok, const ByteString& rStr,
+    xub_StrLen			GetTokenCount( sal_Char cTok = ';' ) const;
+    void				SetToken( xub_StrLen nToken, sal_Char cTok, const ByteString& rStr,
                                   xub_StrLen nIndex = 0 );
-    ByteString          GetToken( xub_StrLen nToken, sal_Char cTok, xub_StrLen& rIndex ) const;
-    ByteString          GetToken( xub_StrLen nToken, sal_Char cTok = ';' ) const;
+    ByteString			GetToken( xub_StrLen nToken, sal_Char cTok, xub_StrLen& rIndex ) const;
+    ByteString			GetToken( xub_StrLen nToken, sal_Char cTok = ';' ) const;
 
-    xub_StrLen          GetQuotedTokenCount( const ByteString& rQuotedPairs, sal_Char cTok = ';' ) const;
-    ByteString          GetQuotedToken( xub_StrLen nToken, const ByteString& rQuotedPairs,
-                                        sal_Char cTok,  xub_StrLen& rIndex ) const;
-    ByteString          GetQuotedToken( xub_StrLen nToken, const ByteString& rQuotedPairs,
+    xub_StrLen			GetQuotedTokenCount( const ByteString& rQuotedPairs, sal_Char cTok = ';' ) const;
+    ByteString			GetQuotedToken( xub_StrLen nToken, const ByteString& rQuotedPairs,
+                                        sal_Char cTok,	xub_StrLen& rIndex ) const;
+    ByteString			GetQuotedToken( xub_StrLen nToken, const ByteString& rQuotedPairs,
                                         sal_Char cTok = ';' ) const;
 
-    const sal_Char*     GetBuffer() const { return mpData->maStr; }
-    sal_Char*           GetBufferAccess();
-    void                ReleaseBufferAccess( xub_StrLen nLen = STRING_LEN );
-    sal_Char*           AllocBuffer( xub_StrLen nLen );
+    const sal_Char* 	GetBuffer() const { return mpData->maStr; }
+    sal_Char*			GetBufferAccess();
+    void				ReleaseBufferAccess( xub_StrLen nLen = STRING_LEN );
+    sal_Char*			AllocBuffer( xub_StrLen nLen );
 
-    friend BOOL         operator == ( const ByteString& rStr1,  const ByteString& rStr2 )
+    friend BOOL 		operator == ( const ByteString& rStr1,	const ByteString& rStr2 )
                             { return rStr1.Equals( rStr2 ); }
-    friend BOOL         operator == ( const ByteString& rStr,   const sal_Char* pCharStr )
+    friend BOOL 		operator == ( const ByteString& rStr,	const sal_Char* pCharStr )
                             { return rStr.Equals( pCharStr ); }
-    friend BOOL         operator == ( const sal_Char* pCharStr, const ByteString& rStr )
+    friend BOOL 		operator == ( const sal_Char* pCharStr, const ByteString& rStr )
                             { return rStr.Equals( pCharStr ); }
-    friend BOOL         operator != ( const ByteString& rStr1,  const ByteString& rStr2 )
+    friend BOOL 		operator != ( const ByteString& rStr1,	const ByteString& rStr2 )
                             { return !(operator == ( rStr1, rStr2 )); }
-    friend BOOL         operator != ( const ByteString& rStr,   const sal_Char* pCharStr )
+    friend BOOL 		operator != ( const ByteString& rStr,	const sal_Char* pCharStr )
                             { return !(operator == ( rStr, pCharStr )); }
-    friend BOOL         operator != ( const sal_Char* pCharStr, const ByteString& rStr )
+    friend BOOL 		operator != ( const sal_Char* pCharStr, const ByteString& rStr )
                             { return !(operator == ( pCharStr, rStr )); }
-    friend BOOL         operator <  ( const ByteString& rStr1,  const ByteString& rStr2 )
+    friend BOOL 		operator <	( const ByteString& rStr1,	const ByteString& rStr2 )
                             { return (rStr1.CompareTo( rStr2 ) == COMPARE_LESS); }
-    friend BOOL         operator <  ( const ByteString& rStr,   const sal_Char* pCharStr )
+    friend BOOL 		operator <	( const ByteString& rStr,	const sal_Char* pCharStr )
                             { return (rStr.CompareTo( pCharStr ) == COMPARE_LESS); }
-    friend BOOL         operator <  ( const sal_Char* pCharStr, const ByteString& rStr )
+    friend BOOL 		operator <	( const sal_Char* pCharStr, const ByteString& rStr )
                             { return (rStr.CompareTo( pCharStr ) >= COMPARE_EQUAL); }
-    friend BOOL         operator >  ( const ByteString& rStr1,  const ByteString& rStr2 )
+    friend BOOL 		operator >	( const ByteString& rStr1,	const ByteString& rStr2 )
                             { return (rStr1.CompareTo( rStr2 ) == COMPARE_GREATER); }
-    friend BOOL         operator >  ( const ByteString& rStr,   const sal_Char* pCharStr )
+    friend BOOL 		operator >	( const ByteString& rStr,	const sal_Char* pCharStr )
                             { return (rStr.CompareTo( pCharStr ) == COMPARE_GREATER); }
-    friend BOOL         operator >  ( const sal_Char* pCharStr, const ByteString& rStr )
+    friend BOOL 		operator >	( const sal_Char* pCharStr, const ByteString& rStr )
                             { return (rStr.CompareTo( pCharStr ) <= COMPARE_EQUAL); }
-    friend BOOL         operator <= ( const ByteString& rStr1,  const ByteString& rStr2 )
+    friend BOOL 		operator <= ( const ByteString& rStr1,	const ByteString& rStr2 )
                             { return !(operator > ( rStr1, rStr2 )); }
-    friend BOOL         operator <= ( const ByteString& rStr,   const sal_Char* pCharStr )
+    friend BOOL 		operator <= ( const ByteString& rStr,	const sal_Char* pCharStr )
                             { return !(operator > ( rStr, pCharStr )); }
-    friend BOOL         operator <= ( const sal_Char* pCharStr,     const ByteString& rStr )
+    friend BOOL 		operator <= ( const sal_Char* pCharStr, 	const ByteString& rStr )
                             { return !(operator > ( pCharStr, rStr )); }
-    friend BOOL         operator >= ( const ByteString& rStr1,  const ByteString& rStr2 )
+    friend BOOL 		operator >= ( const ByteString& rStr1,	const ByteString& rStr2 )
                             { return !(operator < ( rStr1, rStr2 )); }
-    friend BOOL         operator >= ( const ByteString& rStr,   const sal_Char* pCharStr )
+    friend BOOL 		operator >= ( const ByteString& rStr,	const sal_Char* pCharStr )
                             { return !(operator < ( rStr, pCharStr )); }
-    friend BOOL         operator >= ( const sal_Char* pCharStr,     const ByteString& rStr )
+    friend BOOL 		operator >= ( const sal_Char* pCharStr, 	const ByteString& rStr )
                             { return !(operator < ( pCharStr, rStr )); }
 };
 
@@ -430,9 +430,9 @@ inline ByteString ByteString::GetQuotedToken( xub_StrLen nToken, const ByteStrin
 
 typedef struct _UniStringData
 {
-    sal_Int32               mnRefCount;     // Referenz counter
-    sal_Int32               mnLen;          // Length of the String
-    sal_Unicode             maStr[1];       // CharArray (String)
+    sal_Int32				mnRefCount; 	// Referenz counter
+    sal_Int32				mnLen;			// Length of the String
+    sal_Unicode 			maStr[1];		// CharArray (String)
 } UniStringData;
 
 #ifdef SAL_W32
@@ -446,7 +446,7 @@ typedef struct _UniStringData
 // -------------------
 
 #ifndef NOOLDSTRING
-#define WSTRING_MAXLEN      STRING_MAXLEN
+#define WSTRING_MAXLEN		STRING_MAXLEN
 #endif
 
 // -------------
@@ -455,12 +455,12 @@ typedef struct _UniStringData
 
 class TOOLS_DLLPUBLIC UniString
 {
-    friend              class ByteString;
+    friend				class ByteString;
 
     TOOLS_DLLPRIVATE void InitStringRes( const sal_Char* pUTF8Str, sal_Int32 nLen );
 
 private:
-    UniStringData*      mpData;
+    UniStringData*		mpData;
 
     TOOLS_DLLPRIVATE inline void ImplCopyData();
     TOOLS_DLLPRIVATE inline sal_Unicode * ImplCopyStringData(sal_Unicode *);
@@ -508,173 +508,173 @@ public:
 
     UniString           intern() const;
 
-    static UniString    CreateFromAscii( const sal_Char* pAsciiStr );
-    static UniString    CreateFromAscii( const sal_Char* pAsciiStr, xub_StrLen nLen );
+    static UniString	CreateFromAscii( const sal_Char* pAsciiStr );
+    static UniString	CreateFromAscii( const sal_Char* pAsciiStr, xub_StrLen nLen );
 
-    static UniString    CreateFromInt32( sal_Int32 n, sal_Int16 nRadix = 10 );
-    static UniString    CreateFromInt64( sal_Int64 n, sal_Int16 nRadix = 10 );
-    static UniString    CreateFromFloat( float f );
-    static UniString    CreateFromDouble( double d );
+    static UniString	CreateFromInt32( sal_Int32 n, sal_Int16 nRadix = 10 );
+    static UniString	CreateFromInt64( sal_Int64 n, sal_Int16 nRadix = 10 );
+    static UniString	CreateFromFloat( float f );
+    static UniString	CreateFromDouble( double d );
     static const UniString& EmptyString();
-    sal_Int32           ToInt32() const;
-    sal_Int64           ToInt64() const;
-    float               ToFloat() const;
-    double              ToDouble() const;
-
-    UniString&          Assign( const UniString& rStr );
-    UniString&          Assign( const rtl::OUString& rStr );
-    UniString&          Assign( const sal_Unicode* pCharStr );
-    UniString&          Assign( const sal_Unicode* pCharStr, xub_StrLen nLen );
-    UniString&          Assign( sal_Unicode c );
+    sal_Int32			ToInt32() const;
+    sal_Int64			ToInt64() const;
+    float				ToFloat() const;
+    double				ToDouble() const;
+
+    UniString&			Assign( const UniString& rStr );
+    UniString&			Assign( const rtl::OUString& rStr );
+    UniString&			Assign( const sal_Unicode* pCharStr );
+    UniString&			Assign( const sal_Unicode* pCharStr, xub_StrLen nLen );
+    UniString&			Assign( sal_Unicode c );
     inline UniString & Assign(char c) // ...but allow "Assign('a')"
         { return Assign(static_cast< sal_Unicode >(c)); }
-    UniString&          AssignAscii( const sal_Char* pAsciiStr );
-    UniString&          AssignAscii( const sal_Char* pAsciiStr, xub_StrLen nLen );
-    UniString&          operator =( const UniString& rStr )
+    UniString&			AssignAscii( const sal_Char* pAsciiStr );
+    UniString&			AssignAscii( const sal_Char* pAsciiStr, xub_StrLen nLen );
+    UniString&			operator =( const UniString& rStr )
                             { return Assign( rStr ); }
-    UniString&          operator =( const rtl::OUString& rStr )
+    UniString&			operator =( const rtl::OUString& rStr )
                             { return Assign( rStr ); }
-    UniString&          operator =( const sal_Unicode* pCharStr )
+    UniString&			operator =( const sal_Unicode* pCharStr )
                             { return Assign( pCharStr ); }
-    UniString&          operator =( sal_Unicode c )
+    UniString&			operator =( sal_Unicode c )
                             { return Assign( c ); }
     inline UniString & operator =(char c) // ...but allow "= 'a'"
         { return operator =(static_cast< sal_Unicode >(c)); }
 
-    UniString&          Append( const UniString& rStr );
-    UniString&          Append( const sal_Unicode* pCharStr );
-    UniString&          Append( const sal_Unicode* pCharStr, xub_StrLen nLen );
-    UniString&          Append( sal_Unicode c );
+    UniString&			Append( const UniString& rStr );
+    UniString&			Append( const sal_Unicode* pCharStr );
+    UniString&			Append( const sal_Unicode* pCharStr, xub_StrLen nLen );
+    UniString&			Append( sal_Unicode c );
     inline UniString & Append(char c) // ...but allow "Append('a')"
         { return Append(static_cast< sal_Unicode >(c)); }
-    UniString&          AppendAscii( const sal_Char* pAsciiStr );
-    UniString&          AppendAscii( const sal_Char* pAsciiStr, xub_StrLen nLen );
-    UniString&          operator +=( const UniString& rStr )
+    UniString&			AppendAscii( const sal_Char* pAsciiStr );
+    UniString&			AppendAscii( const sal_Char* pAsciiStr, xub_StrLen nLen );
+    UniString&			operator +=( const UniString& rStr )
                             { return Append( rStr ); }
-    UniString&          operator +=( const sal_Unicode* pCharStr )
+    UniString&			operator +=( const sal_Unicode* pCharStr )
                             { return Append( pCharStr ); }
-    UniString&          operator +=( sal_Unicode c )
+    UniString&			operator +=( sal_Unicode c )
                             { return Append( c ); }
     inline UniString & operator +=(char c) // ...but allow "+= 'a'"
         { return operator +=(static_cast< sal_Unicode >(c)); }
 
-    void                SetChar( xub_StrLen nIndex, sal_Unicode c );
-    sal_Unicode         GetChar( xub_StrLen nIndex ) const
+    void				SetChar( xub_StrLen nIndex, sal_Unicode c );
+    sal_Unicode 		GetChar( xub_StrLen nIndex ) const
                             { return mpData->maStr[nIndex]; }
 
-    xub_StrLen          Len() const { return (xub_StrLen)mpData->mnLen; }
+    xub_StrLen			Len() const { return (xub_StrLen)mpData->mnLen; }
 
-    UniString&          Insert( const UniString& rStr, xub_StrLen nIndex = STRING_LEN );
-    UniString&          Insert( const UniString& rStr, xub_StrLen nPos, xub_StrLen nLen,
+    UniString&			Insert( const UniString& rStr, xub_StrLen nIndex = STRING_LEN );
+    UniString&			Insert( const UniString& rStr, xub_StrLen nPos, xub_StrLen nLen,
                                 xub_StrLen nIndex = STRING_LEN );
-    UniString&          Insert( const sal_Unicode* pCharStr, xub_StrLen nIndex = STRING_LEN );
-    UniString&          Insert( sal_Unicode c, xub_StrLen nIndex = STRING_LEN );
-    UniString&          InsertAscii( const sal_Char* pAsciiStr, xub_StrLen nIndex = STRING_LEN );
-    UniString&          Replace( xub_StrLen nIndex, xub_StrLen nLen, const UniString& rStr );
-    UniString&          ReplaceAscii( xub_StrLen nIndex, xub_StrLen nLen,
+    UniString&			Insert( const sal_Unicode* pCharStr, xub_StrLen nIndex = STRING_LEN );
+    UniString&			Insert( sal_Unicode c, xub_StrLen nIndex = STRING_LEN );
+    UniString&			InsertAscii( const sal_Char* pAsciiStr, xub_StrLen nIndex = STRING_LEN );
+    UniString&			Replace( xub_StrLen nIndex, xub_StrLen nLen, const UniString& rStr );
+    UniString&			ReplaceAscii( xub_StrLen nIndex, xub_StrLen nLen,
                                       const sal_Char* pAsciiStr, xub_StrLen nStrLen = STRING_LEN );
-    UniString&          Erase( xub_StrLen nIndex = 0, xub_StrLen nCount = STRING_LEN );
+    UniString&			Erase( xub_StrLen nIndex = 0, xub_StrLen nCount = STRING_LEN );
     UniString           Copy( xub_StrLen nIndex = 0, xub_StrLen nCount = STRING_LEN ) const;
 
-    UniString&          Fill( xub_StrLen nCount, sal_Unicode cFillChar = ' ' );
-    UniString&          Expand( xub_StrLen nCount, sal_Unicode cExpandChar = ' ' );
+    UniString&			Fill( xub_StrLen nCount, sal_Unicode cFillChar = ' ' );
+    UniString&			Expand( xub_StrLen nCount, sal_Unicode cExpandChar = ' ' );
 
-    UniString&          EraseLeadingChars( sal_Unicode c = ' ' );
-    UniString&          EraseTrailingChars( sal_Unicode c = ' ' );
-    UniString&          EraseLeadingAndTrailingChars( sal_Unicode c = ' ' );
-    UniString&          EraseAllChars( sal_Unicode c = ' ' );
-    UniString&          Reverse();
+    UniString&			EraseLeadingChars( sal_Unicode c = ' ' );
+    UniString&			EraseTrailingChars( sal_Unicode c = ' ' );
+    UniString&			EraseLeadingAndTrailingChars( sal_Unicode c = ' ' );
+    UniString&			EraseAllChars( sal_Unicode c = ' ' );
+    UniString&			Reverse();
 
-    UniString&          ConvertLineEnd( LineEnd eLineEnd );
-    UniString&          ConvertLineEnd()
+    UniString&			ConvertLineEnd( LineEnd eLineEnd );
+    UniString&			ConvertLineEnd()
                             { return ConvertLineEnd( GetSystemLineEnd() ); }
 
-    UniString&          ToLowerAscii();
-    UniString&          ToUpperAscii();
+    UniString&			ToLowerAscii();
+    UniString&			ToUpperAscii();
 
-    StringCompare       CompareTo( const UniString& rStr,
+    StringCompare		CompareTo( const UniString& rStr,
                                    xub_StrLen nLen = STRING_LEN ) const;
-    StringCompare       CompareTo( const sal_Unicode* pCharStr,
+    StringCompare		CompareTo( const sal_Unicode* pCharStr,
                                    xub_StrLen nLen = STRING_LEN ) const;
-    StringCompare       CompareToAscii( const sal_Char* pAsciiStr,
+    StringCompare		CompareToAscii( const sal_Char* pAsciiStr,
                                         xub_StrLen nLen = STRING_LEN ) const;
-    StringCompare       CompareIgnoreCaseToAscii( const UniString& rStr,
+    StringCompare		CompareIgnoreCaseToAscii( const UniString& rStr,
                                                   xub_StrLen nLen = STRING_LEN ) const;
-    StringCompare       CompareIgnoreCaseToAscii( const sal_Unicode* pCharStr,
+    StringCompare		CompareIgnoreCaseToAscii( const sal_Unicode* pCharStr,
                                                   xub_StrLen nLen = STRING_LEN ) const;
-    StringCompare       CompareIgnoreCaseToAscii( const sal_Char* pAsciiStr,
+    StringCompare		CompareIgnoreCaseToAscii( const sal_Char* pAsciiStr,
                                                   xub_StrLen nLen = STRING_LEN ) const;
-    BOOL                Equals( const UniString& rStr ) const;
-    BOOL                Equals( const sal_Unicode* pCharStr ) const;
-    BOOL                EqualsAscii( const sal_Char* pAsciiStr ) const;
-    BOOL                EqualsIgnoreCaseAscii( const UniString& rStr ) const;
-    BOOL                EqualsIgnoreCaseAscii( const sal_Unicode* pCharStr ) const;
-    BOOL                EqualsIgnoreCaseAscii( const sal_Char* pAsciiStr ) const;
-    BOOL                Equals( const UniString& rStr,
+    BOOL				Equals( const UniString& rStr ) const;
+    BOOL				Equals( const sal_Unicode* pCharStr ) const;
+    BOOL				EqualsAscii( const sal_Char* pAsciiStr ) const;
+    BOOL				EqualsIgnoreCaseAscii( const UniString& rStr ) const;
+    BOOL				EqualsIgnoreCaseAscii( const sal_Unicode* pCharStr ) const;
+    BOOL				EqualsIgnoreCaseAscii( const sal_Char* pAsciiStr ) const;
+    BOOL				Equals( const UniString& rStr,
                                 xub_StrLen nIndex, xub_StrLen nLen ) const;
-    BOOL                Equals( const sal_Unicode* pCharStr,
+    BOOL				Equals( const sal_Unicode* pCharStr,
                                 xub_StrLen nIndex, xub_StrLen nLen ) const;
-    BOOL                EqualsAscii( const sal_Char* pAsciiStr,
+    BOOL				EqualsAscii( const sal_Char* pAsciiStr,
                                      xub_StrLen nIndex, xub_StrLen nLen ) const;
-    BOOL                EqualsIgnoreCaseAscii( const UniString& rStr,
+    BOOL				EqualsIgnoreCaseAscii( const UniString& rStr,
                                                xub_StrLen nIndex, xub_StrLen nLen ) const;
-    BOOL                EqualsIgnoreCaseAscii( const sal_Unicode* pCharStr,
+    BOOL				EqualsIgnoreCaseAscii( const sal_Unicode* pCharStr,
                                                xub_StrLen nIndex, xub_StrLen nLen ) const;
-    BOOL                EqualsIgnoreCaseAscii( const sal_Char* pAsciiStr,
+    BOOL				EqualsIgnoreCaseAscii( const sal_Char* pAsciiStr,
                                                xub_StrLen nIndex, xub_StrLen nLen ) const;
 
-    xub_StrLen          Match( const UniString& rStr ) const;
-    xub_StrLen          Match( const sal_Unicode* pCharStr ) const;
+    xub_StrLen			Match( const UniString& rStr ) const;
+    xub_StrLen			Match( const sal_Unicode* pCharStr ) const;
 
-    xub_StrLen          Search( sal_Unicode c, xub_StrLen nIndex = 0 ) const;
-    xub_StrLen          Search( const UniString& rStr, xub_StrLen nIndex = 0 ) const;
-    xub_StrLen          Search( const sal_Unicode* pCharStr, xub_StrLen nIndex = 0 ) const;
-    xub_StrLen          SearchAscii( const sal_Char* pAsciiStr, xub_StrLen nIndex = 0 ) const;
-    xub_StrLen          SearchBackward( sal_Unicode c, xub_StrLen nIndex = STRING_LEN ) const;
-    xub_StrLen          SearchChar( const sal_Unicode* pChars, xub_StrLen nIndex = 0 ) const;
-    xub_StrLen          SearchCharBackward( const sal_Unicode* pChars, xub_StrLen nIndex = STRING_LEN ) const;
+    xub_StrLen			Search( sal_Unicode c, xub_StrLen nIndex = 0 ) const;
+    xub_StrLen			Search( const UniString& rStr, xub_StrLen nIndex = 0 ) const;
+    xub_StrLen			Search( const sal_Unicode* pCharStr, xub_StrLen nIndex = 0 ) const;
+    xub_StrLen			SearchAscii( const sal_Char* pAsciiStr, xub_StrLen nIndex = 0 ) const;
+    xub_StrLen			SearchBackward( sal_Unicode c, xub_StrLen nIndex = STRING_LEN ) const;
+    xub_StrLen			SearchChar( const sal_Unicode* pChars, xub_StrLen nIndex = 0 ) const;
+    xub_StrLen			SearchCharBackward( const sal_Unicode* pChars, xub_StrLen nIndex = STRING_LEN ) const;
 
-    xub_StrLen          SearchAndReplace( sal_Unicode c, sal_Unicode cRep,
+    xub_StrLen			SearchAndReplace( sal_Unicode c, sal_Unicode cRep,
                                           xub_StrLen nIndex = 0 );
-    xub_StrLen          SearchAndReplace( const UniString& rStr, const UniString& rRepStr,
+    xub_StrLen			SearchAndReplace( const UniString& rStr, const UniString& rRepStr,
                                           xub_StrLen nIndex = 0 );
-    xub_StrLen          SearchAndReplace( const sal_Unicode* pCharStr, const UniString& rRepStr,
+    xub_StrLen			SearchAndReplace( const sal_Unicode* pCharStr, const UniString& rRepStr,
                                           xub_StrLen nIndex = 0 );
-    xub_StrLen          SearchAndReplaceAscii( const sal_Char* pAsciiStr, const UniString& rRepStr,
+    xub_StrLen			SearchAndReplaceAscii( const sal_Char* pAsciiStr, const UniString& rRepStr,
                                                xub_StrLen nIndex = 0 );
-    void                SearchAndReplaceAll( sal_Unicode c, sal_Unicode cRep );
-    void                SearchAndReplaceAll( const UniString& rStr, const UniString& rRepStr );
-    void                SearchAndReplaceAll( const sal_Unicode* pCharStr, const UniString& rRepStr );
-    void                SearchAndReplaceAllAscii( const sal_Char* pAsciiStr, const UniString& rRepStr );
+    void				SearchAndReplaceAll( sal_Unicode c, sal_Unicode cRep );
+    void				SearchAndReplaceAll( const UniString& rStr, const UniString& rRepStr );
+    void				SearchAndReplaceAll( const sal_Unicode* pCharStr, const UniString& rRepStr );
+    void				SearchAndReplaceAllAscii( const sal_Char* pAsciiStr, const UniString& rRepStr );
 
-    xub_StrLen          GetTokenCount( sal_Unicode cTok = ';' ) const;
-    void                SetToken( xub_StrLen nToken, sal_Unicode cTok, const UniString& rStr,
+    xub_StrLen			GetTokenCount( sal_Unicode cTok = ';' ) const;
+    void				SetToken( xub_StrLen nToken, sal_Unicode cTok, const UniString& rStr,
                                   xub_StrLen nIndex = 0 );
-    UniString           GetToken( xub_StrLen nToken, sal_Unicode cTok, xub_StrLen& rIndex ) const;
-    UniString           GetToken( xub_StrLen nToken, sal_Unicode cTok = ';' ) const;
+    UniString			GetToken( xub_StrLen nToken, sal_Unicode cTok, xub_StrLen& rIndex ) const;
+    UniString			GetToken( xub_StrLen nToken, sal_Unicode cTok = ';' ) const;
 
-    xub_StrLen          GetQuotedTokenCount( const UniString& rQuotedPairs, sal_Unicode cTok = ';' ) const;
-    UniString           GetQuotedToken( xub_StrLen nToken, const UniString& rQuotedPairs,
+    xub_StrLen			GetQuotedTokenCount( const UniString& rQuotedPairs, sal_Unicode cTok = ';' ) const;
+    UniString			GetQuotedToken( xub_StrLen nToken, const UniString& rQuotedPairs,
                                         sal_Unicode cTok,  xub_StrLen& rIndex ) const;
-    UniString           GetQuotedToken( xub_StrLen nToken, const UniString& rQuotedPairs,
+    UniString			GetQuotedToken( xub_StrLen nToken, const UniString& rQuotedPairs,
                                         sal_Unicode cTok = ';' ) const;
 
-    const sal_Unicode*  GetBuffer() const { return mpData->maStr; }
-    sal_Unicode*        GetBufferAccess();
-    void                ReleaseBufferAccess( xub_StrLen nLen = STRING_LEN );
-    sal_Unicode*        AllocBuffer( xub_StrLen nLen );
+    const sal_Unicode*	GetBuffer() const { return mpData->maStr; }
+    sal_Unicode*		GetBufferAccess();
+    void				ReleaseBufferAccess( xub_StrLen nLen = STRING_LEN );
+    sal_Unicode*		AllocBuffer( xub_StrLen nLen );
 
-    friend BOOL         operator == ( const UniString& rStr1,   const UniString& rStr2 )
+    friend BOOL 		operator == ( const UniString& rStr1,	const UniString& rStr2 )
                             { return rStr1.Equals( rStr2 ); }
-    friend BOOL         operator != ( const UniString& rStr1,   const UniString& rStr2 )
+    friend BOOL 		operator != ( const UniString& rStr1,	const UniString& rStr2 )
                             { return !(operator == ( rStr1, rStr2 )); }
-    friend BOOL         operator <  ( const UniString& rStr1,   const UniString& rStr2 )
+    friend BOOL 		operator <	( const UniString& rStr1,	const UniString& rStr2 )
                             { return (rStr1.CompareTo( rStr2 ) == COMPARE_LESS); }
-    friend BOOL         operator >  ( const UniString& rStr1,   const UniString& rStr2 )
+    friend BOOL 		operator >	( const UniString& rStr1,	const UniString& rStr2 )
                             { return (rStr1.CompareTo( rStr2 ) == COMPARE_GREATER); }
-    friend BOOL         operator <= ( const UniString& rStr1,   const UniString& rStr2 )
+    friend BOOL 		operator <= ( const UniString& rStr1,	const UniString& rStr2 )
                             { return !(operator > ( rStr1, rStr2 )); }
-    friend BOOL         operator >= ( const UniString& rStr1,   const UniString& rStr2 )
+    friend BOOL 		operator >= ( const UniString& rStr1,	const UniString& rStr2 )
                             { return !(operator < ( rStr1, rStr2 )); }
 };
 
diff --git a/tools/inc/tools/svborder.hxx b/tools/inc/tools/svborder.hxx
index a0509bcc89be..da5e52dcffe8 100644
--- a/tools/inc/tools/svborder.hxx
+++ b/tools/inc/tools/svborder.hxx
@@ -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
@@ -93,5 +93,5 @@ TOOLS_DLLPUBLIC Rectangle & operator -= ( Rectangle & rRect, const SvBorder & rB
 
 //=========================================================================
 
-#endif
+#endif 
 
diff --git a/tools/inc/tools/svlibrary.hxx b/tools/inc/tools/svlibrary.hxx
index fa8ff7c8068b..aa0f05938464 100644
--- a/tools/inc/tools/svlibrary.hxx
+++ b/tools/inc/tools/svlibrary.hxx
@@ -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
diff --git a/tools/inc/tools/svwin.h b/tools/inc/tools/svwin.h
index b4ea6fcc3374..da1ad71601fb 100644
--- a/tools/inc/tools/svwin.h
+++ b/tools/inc/tools/svwin.h
@@ -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
diff --git a/tools/inc/tools/table.hxx b/tools/inc/tools/table.hxx
index 1ac3fbe27b6f..13cd4016b68f 100644
--- a/tools/inc/tools/table.hxx
+++ b/tools/inc/tools/table.hxx
@@ -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
@@ -40,47 +40,47 @@
 class TOOLS_DLLPUBLIC Table : private Container
 {
 private:
-    ULONG   nCount;
+    ULONG	nCount;
 //#if 0 // _SOLAR__PRIVATE
-    TOOLS_DLLPRIVATE ULONG  ImplGetIndex( ULONG nKey, ULONG* pIndex = NULL ) const;
+    TOOLS_DLLPRIVATE ULONG	ImplGetIndex( ULONG nKey, ULONG* pIndex = NULL ) const;
 //#endif
 public:
             Table( USHORT nInitSize = 16, USHORT nReSize = 16 );
             Table( const Table& rTable ) : Container( rTable )
                 { nCount = rTable.nCount; }
 
-    BOOL    Insert( ULONG nKey, void* p );
-    void*   Remove( ULONG nKey );
-    void*   Replace( ULONG nKey, void* p );
-    void*   Get( ULONG nKey ) const;
+    BOOL	Insert( ULONG nKey, void* p );
+    void*	Remove( ULONG nKey );
+    void*	Replace( ULONG nKey, void* p );
+    void*	Get( ULONG nKey ) const;
 
-    void    Clear() { Container::Clear(); nCount = 0; }
-    ULONG   Count() const { return( nCount ); }
+    void	Clear() { Container::Clear(); nCount = 0; }
+    ULONG	Count() const { return( nCount ); }
 
-    void*   GetCurObject() const;
-    ULONG   GetCurKey() const { return (ULONG)Container::GetCurObject(); }
-    ULONG   GetKey( const void* p ) const;
-    BOOL    IsKeyValid( ULONG nKey ) const;
+    void*	GetCurObject() const;
+    ULONG	GetCurKey() const { return (ULONG)Container::GetCurObject(); }
+    ULONG	GetKey( const void* p ) const;
+    BOOL	IsKeyValid( ULONG nKey ) const;
 
-    void*   GetObject( ULONG nPos ) const
+    void*	GetObject( ULONG nPos ) const
                 { return Container::GetObject( (nPos*2)+1 ); }
-    ULONG   GetObjectKey( ULONG nPos ) const
+    ULONG	GetObjectKey( ULONG nPos ) const
                 { return (ULONG)Container::GetObject( nPos*2 ); }
-    ULONG   GetUniqueKey( ULONG nStartKey = 1 ) const;
-    ULONG   SearchKey( ULONG nKey, ULONG* pPos = NULL ) const;
+    ULONG	GetUniqueKey( ULONG nStartKey = 1 ) const;
+    ULONG	SearchKey( ULONG nKey, ULONG* pPos = NULL ) const;
 
-    void*   Seek( ULONG nKey );
-    void*   Seek( void* p );
-    void*   First();
-    void*   Last();
-    void*   Next();
-    void*   Prev();
+    void*	Seek( ULONG nKey );
+    void*	Seek( void* p );
+    void*	First();
+    void*	Last();
+    void*	Next();
+    void*	Prev();
 
-    Table&  operator =( const Table& rTable );
+    Table&	operator =( const Table& rTable );
 
-    BOOL    operator ==( const Table& rTable ) const
+    BOOL	operator ==( const Table& rTable ) const
                 { return Container::operator ==( rTable ); }
-    BOOL    operator !=( const Table& rTable ) const
+    BOOL	operator !=( const Table& rTable ) const
                 { return Container::operator !=( rTable ); }
 };
 
@@ -95,58 +95,58 @@ inline Table& Table::operator =( const Table& r )
 // - DECLARE_TABLE -
 // -----------------
 
-#define DECLARE_TABLE( ClassName, Type )                                \
-class ClassName : private Table                                         \
-{                                                                       \
-public:                                                                 \
-                using Table::Clear;                                     \
-                using Table::Count;                                     \
-                using Table::GetCurKey;                                 \
-                using Table::GetObjectKey;                              \
-                using Table::GetUniqueKey;                              \
-                using Table::SearchKey;                                 \
-                using Table::IsKeyValid;                                \
+#define DECLARE_TABLE( ClassName, Type )								\
+class ClassName : private Table 										\
+{																		\
+public: 																\
+                using Table::Clear;										\
+                using Table::Count;	    								\
+                using Table::GetCurKey;									\
+                using Table::GetObjectKey;								\
+                using Table::GetUniqueKey;								\
+                using Table::SearchKey;									\
+                using Table::IsKeyValid;								\
                                                                         \
-                ClassName( USHORT _nInitSize = 16,                      \
-                           USHORT _nReSize = 16 ) :                     \
-                    Table( _nInitSize, _nReSize ) {}                    \
-                ClassName( const ClassName& rClassName ) :              \
-                    Table( rClassName ) {}                              \
+                ClassName( USHORT _nInitSize = 16,						\
+                           USHORT _nReSize = 16 ) : 					\
+                    Table( _nInitSize, _nReSize ) {}					\
+                ClassName( const ClassName& rClassName ) :				\
+                    Table( rClassName ) {}								\
                                                                         \
-    BOOL        Insert( ULONG nKey, Type p )                            \
-                    { return Table::Insert( nKey, (void*)p ); }         \
-    Type        Remove( ULONG nKey )                                    \
-                    { return (Type)Table::Remove( nKey ); }             \
-    Type        Replace( ULONG nKey, Type p )                           \
-                    { return (Type)Table::Replace( nKey, (void*)p ); }  \
-    Type        Get( ULONG nKey ) const                                 \
-                    { return (Type)Table::Get( nKey ); }                \
+    BOOL		Insert( ULONG nKey, Type p )							\
+                    { return Table::Insert( nKey, (void*)p ); } 		\
+    Type		Remove( ULONG nKey )									\
+                    { return (Type)Table::Remove( nKey ); } 			\
+    Type		Replace( ULONG nKey, Type p )							\
+                    { return (Type)Table::Replace( nKey, (void*)p ); }	\
+    Type		Get( ULONG nKey ) const 								\
+                    { return (Type)Table::Get( nKey ); }				\
                                                                         \
-    Type        GetCurObject() const                                    \
-                    { return (Type)Table::GetCurObject(); }             \
-    ULONG       GetKey( const Type p ) const                            \
-                    { return Table::GetKey( (const void*)p ); }         \
+    Type		GetCurObject() const									\
+                    { return (Type)Table::GetCurObject(); } 			\
+    ULONG		GetKey( const Type p ) const							\
+                    { return Table::GetKey( (const void*)p ); } 		\
                                                                         \
-    Type        GetObject( ULONG nPos ) const                           \
-                    { return (Type)Table::GetObject( nPos ); }          \
+    Type		GetObject( ULONG nPos ) const							\
+                    { return (Type)Table::GetObject( nPos ); }			\
                                                                         \
-    Type        Seek( ULONG nKey )                                      \
-                    { return (Type)Table::Seek( nKey ); }               \
-    Type        Seek( Type p )                                          \
-                    { return (Type)Table::Seek( (void*)p ); }           \
-    Type        First() { return (Type)Table::First(); }                \
-    Type        Last()  { return (Type)Table::Last(); }                 \
-    Type        Next()  { return (Type)Table::Next(); }                 \
-    Type        Prev()  { return (Type)Table::Prev(); }                 \
+    Type		Seek( ULONG nKey )										\
+                    { return (Type)Table::Seek( nKey ); }				\
+    Type		Seek( Type p )											\
+                    { return (Type)Table::Seek( (void*)p ); }			\
+    Type		First() { return (Type)Table::First(); }				\
+    Type		Last()	{ return (Type)Table::Last(); } 				\
+    Type		Next()	{ return (Type)Table::Next(); } 				\
+    Type		Prev()	{ return (Type)Table::Prev(); } 				\
                                                                         \
-    ClassName&  operator =( const ClassName& rClassName )               \
-                    { Table::operator =( rClassName );                  \
-                      return *this; }                                   \
+    ClassName&	operator =( const ClassName& rClassName )				\
+                    { Table::operator =( rClassName );					\
+                      return *this; }									\
                                                                         \
-    BOOL        operator ==( const ClassName& rTable ) const            \
-                    { return Table::operator ==( rTable ); }            \
-    BOOL        operator !=( const ClassName& rTable ) const            \
-                    { return Table::operator !=( rTable ); }            \
+    BOOL		operator ==( const ClassName& rTable ) const			\
+                    { return Table::operator ==( rTable ); }			\
+    BOOL		operator !=( const ClassName& rTable ) const			\
+                    { return Table::operator !=( rTable ); }			\
 };
 
 #endif // _TOOLS_TABLE_HXX
diff --git a/tools/inc/tools/tempfile.hxx b/tools/inc/tools/tempfile.hxx
index 896fed5da0cd..9771151df137 100644
--- a/tools/inc/tools/tempfile.hxx
+++ b/tools/inc/tools/tempfile.hxx
@@ -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
diff --git a/tools/inc/tools/tenccvt.hxx b/tools/inc/tools/tenccvt.hxx
index e24c2e259022..98db63166003 100644
--- a/tools/inc/tools/tenccvt.hxx
+++ b/tools/inc/tools/tenccvt.hxx
@@ -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
diff --git a/tools/inc/tools/testtoolloader.hxx b/tools/inc/tools/testtoolloader.hxx
index 04431d622959..3eaf51764e42 100644
--- a/tools/inc/tools/testtoolloader.hxx
+++ b/tools/inc/tools/testtoolloader.hxx
@@ -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
diff --git a/tools/inc/tools/time.hxx b/tools/inc/tools/time.hxx
index 269b104e57e6..9bb80c9d3b69 100644
--- a/tools/inc/tools/time.hxx
+++ b/tools/inc/tools/time.hxx
@@ -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
@@ -39,7 +39,7 @@ class ResId;
 class TOOLS_DLLPUBLIC Time
 {
 private:
-    sal_Int32           nTime;
+    sal_Int32			nTime;
 
 public:
                     Time();
@@ -49,64 +49,64 @@ public:
                     Time( ULONG nHour, ULONG nMin,
                           ULONG nSec = 0, ULONG n100Sec = 0 );
 
-    void            SetTime( sal_Int32 nNewTime ) { nTime = nNewTime; }
-    sal_Int32       GetTime() const { return nTime; }
+    void			SetTime( sal_Int32 nNewTime ) { nTime = nNewTime; }
+    sal_Int32		GetTime() const { return nTime; }
 
-    void            SetHour( USHORT nNewHour );
-    void            SetMin( USHORT nNewMin );
-    void            SetSec( USHORT nNewSec );
-    void            Set100Sec( USHORT nNew100Sec );
-    USHORT          GetHour() const
+    void			SetHour( USHORT nNewHour );
+    void			SetMin( USHORT nNewMin );
+    void			SetSec( USHORT nNewSec );
+    void			Set100Sec( USHORT nNew100Sec );
+    USHORT			GetHour() const
                         { ULONG nTempTime = (nTime >= 0) ? nTime : nTime*-1;
                           return (USHORT)(nTempTime / 1000000); }
-    USHORT          GetMin() const
+    USHORT			GetMin() const
                         { ULONG nTempTime = (nTime >= 0) ? nTime : nTime*-1;
                           return (USHORT)((nTempTime / 10000) % 100); }
-    USHORT          GetSec() const
+    USHORT			GetSec() const
                         { ULONG nTempTime = (nTime >= 0) ? nTime : nTime*-1;
                           return (USHORT)((nTempTime / 100) % 100); }
-    USHORT          Get100Sec() const
+    USHORT			Get100Sec() const
                         { ULONG nTempTime = (nTime >= 0) ? nTime : nTime*-1;
                           return (USHORT)(nTempTime % 100); }
 
-    sal_Int32       GetMSFromTime() const;
-    void            MakeTimeFromMS( sal_Int32 nMS );
+    sal_Int32		GetMSFromTime() const;
+    void			MakeTimeFromMS( sal_Int32 nMS );
 
                     /// 12 hours == 0.5 days
     double          GetTimeInDays() const;
 
-    BOOL            IsBetween( const Time& rFrom, const Time& rTo ) const
+    BOOL			IsBetween( const Time& rFrom, const Time& rTo ) const
                         { return ((nTime >= rFrom.nTime) && (nTime <= rTo.nTime)); }
 
     BOOL            IsEqualIgnore100Sec( const Time& rTime ) const;
 
-    BOOL            operator ==( const Time& rTime ) const
+    BOOL			operator ==( const Time& rTime ) const
                         { return (nTime == rTime.nTime); }
-    BOOL            operator !=( const Time& rTime ) const
+    BOOL			operator !=( const Time& rTime ) const
                         { return (nTime != rTime.nTime); }
-    BOOL            operator  >( const Time& rTime ) const
+    BOOL			operator  >( const Time& rTime ) const
                         { return (nTime > rTime.nTime); }
-    BOOL            operator  <( const Time& rTime ) const
+    BOOL			operator  <( const Time& rTime ) const
                         { return (nTime < rTime.nTime); }
-    BOOL            operator >=( const Time& rTime ) const
+    BOOL			operator >=( const Time& rTime ) const
                         { return (nTime >= rTime.nTime); }
-    BOOL            operator <=( const Time& rTime ) const
+    BOOL			operator <=( const Time& rTime ) const
                         { return (nTime <= rTime.nTime); }
 
-    static Time     GetUTCOffset();
-    static ULONG    GetSystemTicks();       // Elapsed time
-    static ULONG    GetProcessTicks();      // CPU time
+    static Time 	GetUTCOffset();
+    static ULONG	GetSystemTicks();		// Elapsed time
+    static ULONG	GetProcessTicks();		// CPU time
 
-    void            ConvertToUTC()       { *this -= Time::GetUTCOffset(); }
-    void            ConvertToLocalTime() { *this += Time::GetUTCOffset(); }
+    void			ConvertToUTC()		 { *this -= Time::GetUTCOffset(); }
+    void			ConvertToLocalTime() { *this += Time::GetUTCOffset(); }
 
-    Time&           operator =( const Time& rTime );
-    Time            operator -() const
+    Time&			operator =( const Time& rTime );
+    Time			operator -() const
                         { return Time( nTime * -1 ); }
-    Time&           operator +=( const Time& rTime );
-    Time&           operator -=( const Time& rTime );
-    TOOLS_DLLPUBLIC friend Time     operator +( const Time& rTime1, const Time& rTime2 );
-    TOOLS_DLLPUBLIC friend Time     operator -( const Time& rTime1, const Time& rTime2 );
+    Time&			operator +=( const Time& rTime );
+    Time&			operator -=( const Time& rTime );
+    TOOLS_DLLPUBLIC friend Time 	operator +( const Time& rTime1, const Time& rTime2 );
+    TOOLS_DLLPUBLIC friend Time 	operator -( const Time& rTime1, const Time& rTime2 );
 };
 
 #endif // _TOOLS_TIME_HXX
diff --git a/tools/inc/tools/tools.h b/tools/inc/tools/tools.h
index e1ad470cf620..0e2c35752116 100644
--- a/tools/inc/tools/tools.h
+++ b/tools/inc/tools/tools.h
@@ -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
diff --git a/tools/inc/tools/toolsdllapi.h b/tools/inc/tools/toolsdllapi.h
index fbd41130a145..4bacafc16529 100644
--- a/tools/inc/tools/toolsdllapi.h
+++ b/tools/inc/tools/toolsdllapi.h
@@ -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
@@ -27,15 +27,15 @@
 
 #ifndef INCLUDED_TOOLSDLLAPI_H
 #define INCLUDED_TOOLSDLLAPI_H
-
+                                                                                                                             
 #include "sal/types.h"
-
+                                                                                                                             
 #if defined(TOOLS_DLLIMPLEMENTATION)
 #define TOOLS_DLLPUBLIC  SAL_DLLPUBLIC_EXPORT
 #else
 #define TOOLS_DLLPUBLIC  SAL_DLLPUBLIC_IMPORT
 #endif
 #define TOOLS_DLLPRIVATE SAL_DLLPRIVATE
-
+                                                                                                                             
 #endif /* INCLUDED_TOOLSDLLAPI_H */
 
diff --git a/tools/inc/tools/unqid.hxx b/tools/inc/tools/unqid.hxx
index 4e255e0efdd1..102775175cd7 100644
--- a/tools/inc/tools/unqid.hxx
+++ b/tools/inc/tools/unqid.hxx
@@ -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
diff --git a/tools/inc/tools/unqidx.hxx b/tools/inc/tools/unqidx.hxx
index 95aac95d9cf4..8c4c06039688 100644
--- a/tools/inc/tools/unqidx.hxx
+++ b/tools/inc/tools/unqidx.hxx
@@ -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
@@ -99,7 +99,7 @@ inline void UniqueIndex::Clear()
 class ClassName : private UniqueIndex                                   \
 {                                                                       \
 public:                                                                 \
-                using UniqueIndex::Clear;                                       \
+                using UniqueIndex::Clear;										\
                 using UniqueIndex::Count;                                       \
                 using UniqueIndex::GetCurIndex;                             \
                 using UniqueIndex::IsIndexValid;                                \
diff --git a/tools/inc/tools/urlkeys.hxx b/tools/inc/tools/urlkeys.hxx
index 28122657b7d4..722e5a716679 100644
--- a/tools/inc/tools/urlkeys.hxx
+++ b/tools/inc/tools/urlkeys.hxx
@@ -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
@@ -32,46 +32,46 @@
 
 // ANSI version
 
-#define A_URLSECTION_SHORTCUT   "InternetShortcut"
-#define A_URLKEY_URL            "URL"
-#define A_URLKEY_TITLE          "Title"
-#define A_URLKEY_TARGET         "Target"
-#define A_URLKEY_FRAME          "Frame"
-#define A_URLKEY_OPENAS         "OpenAs"
-#define A_URLKEY_SOICON         "SOIcon"
-#define A_URLKEY_WIN_ICONFILE   "IconFile"
-#define A_URLKEY_WIN_ICONINDEX  "IconIndex"
-#define A_URLKEY_WORKDIR        "WorkingDirectory"
-#define A_URLKEY_ARGUMENTS      "Arguments"
-#define A_URLKEY_INTERN_ORIGURL "[URL]"
+#define A_URLSECTION_SHORTCUT	"InternetShortcut"
+#define A_URLKEY_URL			"URL"
+#define A_URLKEY_TITLE			"Title"
+#define A_URLKEY_TARGET			"Target"
+#define A_URLKEY_FRAME			"Frame"
+#define A_URLKEY_OPENAS			"OpenAs"
+#define A_URLKEY_SOICON			"SOIcon"
+#define A_URLKEY_WIN_ICONFILE	"IconFile"
+#define A_URLKEY_WIN_ICONINDEX	"IconIndex"
+#define A_URLKEY_WORKDIR		"WorkingDirectory"
+#define A_URLKEY_ARGUMENTS		"Arguments"
+#define A_URLKEY_INTERN_ORIGURL	"[URL]"
 
 // Unicode version
 
-#define U_URLSECTION_SHORTCUT   L"InternetShortcut"
-#define U_URLKEY_URL            L"URL"
-#define U_URLKEY_TITLE          L"Title"
-#define U_URLKEY_TARGET         L"Target"
-#define U_URLKEY_FRAME          L"Frame"
-#define U_URLKEY_OPENAS         L"OpenAs"
-#define U_URLKEY_SOICON         L"SOIcon"
-#define U_URLKEY_WIN_ICONFILE   L"IconFile"
-#define U_URLKEY_WIN_ICONINDEX  L"IconIndex"
-#define U_URLKEY_WORKDIR        L"WorkingDirectory"
-#define U_URLKEY_ARGUMENTS      L"Arguments"
-#define U_URLKEY_INTERN_ORIGURL L"[URL]"
+#define U_URLSECTION_SHORTCUT	L"InternetShortcut"
+#define U_URLKEY_URL			L"URL"
+#define U_URLKEY_TITLE			L"Title"
+#define U_URLKEY_TARGET			L"Target"
+#define U_URLKEY_FRAME			L"Frame"
+#define U_URLKEY_OPENAS			L"OpenAs"
+#define U_URLKEY_SOICON			L"SOIcon"
+#define U_URLKEY_WIN_ICONFILE	L"IconFile"
+#define U_URLKEY_WIN_ICONINDEX	L"IconIndex"
+#define U_URLKEY_WORKDIR		L"WorkingDirectory"
+#define U_URLKEY_ARGUMENTS		L"Arguments"
+#define U_URLKEY_INTERN_ORIGURL	L"[URL]"
 
-#   define URLSECTION_SHORTCUT  U_URLSECTION_SHORTCUT
-#   define URLKEY_URL           U_URLKEY_URL
-#   define URLKEY_TITLE         U_URLKEY_TITLE
-#   define URLKEY_TARGET        U_URLKEY_TARGET
-#   define URLKEY_FRAME         U_URLKEY_FRAME
-#   define URLKEY_OPENAS        U_URLKEY_OPENAS
-#   define URLKEY_SOICON        U_URLKEY_SOICON
-#   define URLKEY_WIN_ICONFILE  U_URLKEY_WIN_ICONFILE
-#   define URLKEY_WIN_ICONINDEX U_URLKEY_WIN_ICONINDEX
-#   define URLKEY_WORKDIR       U_URLKEY_WORKDIR
-#   define URLKEY_ARGUMENTS     U_URLKEY_ARGUMENTS
-#   define URLKEY_INTERN_ORIGURL U_URLKEY_INTERN_ORIGURL
+#	define URLSECTION_SHORTCUT	U_URLSECTION_SHORTCUT
+#	define URLKEY_URL			U_URLKEY_URL
+#	define URLKEY_TITLE			U_URLKEY_TITLE
+#	define URLKEY_TARGET		U_URLKEY_TARGET
+#	define URLKEY_FRAME			U_URLKEY_FRAME
+#	define URLKEY_OPENAS		U_URLKEY_OPENAS
+#	define URLKEY_SOICON		U_URLKEY_SOICON
+#	define URLKEY_WIN_ICONFILE	U_URLKEY_WIN_ICONFILE
+#	define URLKEY_WIN_ICONINDEX	U_URLKEY_WIN_ICONINDEX
+#	define URLKEY_WORKDIR		U_URLKEY_WORKDIR
+#	define URLKEY_ARGUMENTS		U_URLKEY_ARGUMENTS
+#	define URLKEY_INTERN_ORIGURL U_URLKEY_INTERN_ORIGURL
 
 #endif // __URLKEYS_HXX
 
diff --git a/tools/inc/tools/urlobj.hxx b/tools/inc/tools/urlobj.hxx
index 17d52432e206..05fe49fd9fc4 100644
--- a/tools/inc/tools/urlobj.hxx
+++ b/tools/inc/tools/urlobj.hxx
@@ -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
@@ -54,7 +54,7 @@ namespace com { namespace sun { namespace star { namespace util {
 
 //============================================================================
 // Common URL prefixes for various schemes:
-#define INET_FTP_SCHEME "ftp://"
+#define	INET_FTP_SCHEME "ftp://"
 #define INET_HTTP_SCHEME "http://"
 #define INET_HTTPS_SCHEME "https://"
 #define INET_FILE_SCHEME "file://"
@@ -152,7 +152,7 @@ public:
     /** The way input strings that represent (parts of) URIs are interpreted
         in set-methods.
 
-        @descr  Most set-methods accept either a ByteString or a rtl::OUString
+        @descr  Most set-methods accept either a ByteString or a rtl::OUString 
         as input.  Using a ByteString, octets in the range 0x80--0xFF are
         replaced by single escape sequences.  Using a rtl::OUString , UTF-32
         characters in the range 0x80--0x10FFFF are replaced by sequences of
@@ -811,7 +811,7 @@ public:
         the specified segment does not exist, false is returned.  If false is
         returned, the object is not modified.
      */
-    bool setName(rtl::OUString const & rTheName,
+    bool setName(rtl::OUString const & rTheName, 
                  sal_Int32 nIndex = LAST_SEGMENT,
                  bool bIgnoreFinalSlash = true,
                  EncodeMechanism eMechanism = WAS_ENCODED,
@@ -858,7 +858,7 @@ public:
         the specified segment does not exist, false is returned.  If false is
         returned, the object is not modified.
      */
-    bool setBase(rtl::OUString const & rTheBase,
+    bool setBase(rtl::OUString const & rTheBase, 
                  sal_Int32 nIndex = LAST_SEGMENT,
                  bool bIgnoreFinalSlash = true,
                  EncodeMechanism eMechanism = WAS_ENCODED,
@@ -1181,7 +1181,7 @@ public:
                                    rtl_TextEncoding eCharset
                                        = RTL_TEXTENCODING_UTF8);
 
-    static void appendUCS4Escape(rtl::OUStringBuffer & rTheText,
+    static void appendUCS4Escape(rtl::OUStringBuffer & rTheText, 
                                  sal_Char cEscapePrefix,
                                  sal_uInt32 nUCS4);
 
@@ -1332,7 +1332,7 @@ private:
 
         inline void operator +=(sal_Int32 nDelta);
 
-        int compare(SubString const & rOther,
+        int compare(SubString const & rOther, 
             rtl::OUStringBuffer const & rThisString,
             rtl::OUStringBuffer const & rOtherString) const;
     };
@@ -1495,9 +1495,9 @@ private:
     // Coding:
 
     static inline rtl::OUString extend(ByteString const & rOctets)
-    {
-        return rtl::OUString(rOctets.GetBuffer(), rOctets.Len(),
-            RTL_TEXTENCODING_ISO_8859_1);
+    { 
+        return rtl::OUString(rOctets.GetBuffer(), rOctets.Len(), 
+            RTL_TEXTENCODING_ISO_8859_1); 
     }
 
     static inline sal_Char getEscapePrefix(INetProtocol eTheScheme)
diff --git a/tools/inc/tools/vcompat.hxx b/tools/inc/tools/vcompat.hxx
index f6ee6922faac..87c8a7adf621 100644
--- a/tools/inc/tools/vcompat.hxx
+++ b/tools/inc/tools/vcompat.hxx
@@ -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
@@ -35,9 +35,9 @@
 // -----------
 
 #define COMPAT_FORMAT( char1, char2, char3, char4 ) \
-    ((UINT32)((((UINT32)(char)(char1)))|                \
-    (((UINT32)(char)(char2))<<8UL)|                 \
-    (((UINT32)(char)(char3))<<16UL)|                    \
+    ((UINT32)((((UINT32)(char)(char1)))|				\
+    (((UINT32)(char)(char2))<<8UL)|					\
+    (((UINT32)(char)(char3))<<16UL)|					\
     ((UINT32)(char)(char4))<<24UL))
 
 // --------------
@@ -48,23 +48,23 @@ class SvStream;
 
 class TOOLS_DLLPUBLIC VersionCompat
 {
-    SvStream*       mpRWStm;
-    UINT32          mnCompatPos;
-    UINT32          mnTotalSize;
-    UINT16          mnStmMode;
-    UINT16          mnVersion;
+    SvStream*		mpRWStm;
+    UINT32			mnCompatPos;
+    UINT32			mnTotalSize;
+    UINT16			mnStmMode;
+    UINT16			mnVersion;
 
                     VersionCompat() {}
                     VersionCompat( const VersionCompat& ) {}
-    VersionCompat&  operator=( const VersionCompat& ) { return *this; }
-    BOOL            operator==( const VersionCompat& ) { return FALSE; }
+    VersionCompat&	operator=( const VersionCompat& ) { return *this; }
+    BOOL			operator==( const VersionCompat& ) { return FALSE; }
 
 public:
 
                     VersionCompat( SvStream& rStm, USHORT nStreamMode, UINT16 nVersion = 1 );
                     ~VersionCompat();
 
-    UINT16          GetVersion() const { return mnVersion; }
+    UINT16			GetVersion() const { return mnVersion; }
 };
 
 #endif // _VCOMPAT_HXX
diff --git a/tools/inc/tools/vector2d.hxx b/tools/inc/tools/vector2d.hxx
index d346e1af2bbf..7c04cd8089de 100644
--- a/tools/inc/tools/vector2d.hxx
+++ b/tools/inc/tools/vector2d.hxx
@@ -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
@@ -38,10 +38,10 @@
 class Vector2D
 {
 private:
-    double                      mfX;
-    double                      mfY;
-
-public:
+    double						mfX;
+    double						mfY;
+                        
+public:					
     inline Vector2D() : mfX( 0.0 ), mfY( 0.0 ) {}
     inline Vector2D( double fX, double fY ) : mfX( fX ), mfY( fY ) {}
     inline Vector2D( const Vector2D& rVec ) : mfX( rVec.mfX ), mfY( rVec.mfY ) {}
@@ -62,46 +62,46 @@ public:
     inline void Max(const Vector2D& rVec) { if(rVec.mfX > mfX) mfX = rVec.mfX; if(rVec.mfY > mfY) mfY = rVec.mfY; }
     inline void Abs() { if(mfX < 0.0) mfX = -mfX; if(mfY < 0.0) mfY = -mfY; }
 
-    inline void CalcInBetween(Vector2D& rOld1, Vector2D& rOld2, double t)
+    inline void CalcInBetween(Vector2D& rOld1, Vector2D& rOld2, double t) 
         { mfX = ((rOld2.mfX - rOld1.mfX) + t) + rOld1.mfX; mfY = ((rOld2.mfY - rOld1.mfY) + t) + rOld1.mfY; }
-    inline void CalcMiddle(Vector2D& rOld1, Vector2D& rOld2)
+    inline void CalcMiddle(Vector2D& rOld1, Vector2D& rOld2) 
         { mfX = (rOld1.mfX + rOld2.mfX) / 2.0; mfY = (rOld1.mfY + rOld2.mfY) / 2.0; }
     inline void CalcMiddle(Vector2D& rOld1, Vector2D& rOld2, Vector2D& rOld3)
         { mfX = (rOld1.mfX + rOld2.mfX + rOld3.mfX) / 3.0; mfY = (rOld1.mfY + rOld2.mfY + rOld3.mfY) / 3.0; }
-
-    inline Vector2D&    operator+=( const Vector2D& rVec ) { mfX += rVec.mfX, mfY += rVec.mfY; return *this; }
-    inline Vector2D&    operator-=( const Vector2D& rVec ) { mfX -= rVec.mfX, mfY -= rVec.mfY; return *this; }
-    inline Vector2D     operator+(const Vector2D& rVec) const { Vector2D aSum(*this); aSum += rVec; return aSum; }
-    inline Vector2D     operator-(const Vector2D& rVec) const { Vector2D aSub(*this); aSub -= rVec; return aSub; }
-    inline Vector2D     operator-(void) const { return Vector2D(-mfX, -mfY); }
-
-    inline double       Scalar( const Vector2D& rVec ) const { return( mfX * rVec.mfX + mfY * rVec.mfY ); }
-
-    inline Vector2D&    operator/=( const Vector2D& rVec ) { mfX /= rVec.mfX, mfY /= rVec.mfY; return *this; }
-    inline Vector2D&    operator*=( const Vector2D& rVec ) { mfX *= rVec.mfX, mfY *= rVec.mfY; return *this; }
-    inline Vector2D     operator/(const Vector2D& rVec) const { Vector2D aDiv(*this); aDiv /= rVec; return aDiv; }
-    inline Vector2D     operator*(const Vector2D& rVec) const { Vector2D aMul(*this); aMul *= rVec; return aMul; }
-
-    inline Vector2D&    operator*=(double t) { mfX *= t; mfY *= t; return *this; }
-    inline Vector2D     operator*(double t) const { Vector2D aNew(*this); aNew *= t; return aNew; }
-    inline Vector2D&    operator/=(double t) { mfX /= t; mfY /= t; return *this; }
-    inline Vector2D     operator/(double t) const { Vector2D aNew(*this); aNew /= t; return aNew; }
-
-    inline BOOL         operator==( const Vector2D& rVec ) const { return( mfX == rVec.mfX && mfY == rVec.mfY ); }
-    inline BOOL         operator!=( const Vector2D& rVec ) const { return !( *this == rVec ); }
-
-    inline Vector2D&    operator=( const Vector2D& rVec ) { mfX = rVec.mfX, mfY = rVec.mfY; return *this; }
-    inline Vector2D&    operator=( const Pair& rPair ) { mfX = rPair.nA, mfY = rPair.nB; return *this; }
-    inline Vector2D&    operator-=( const Pair& rPair ) { mfX -= rPair.nA, mfY -= rPair.nB; return *this; }
-    inline Vector2D&    operator+=( const Pair& rPair ) { mfX += rPair.nA, mfY += rPair.nB; return *this; }
-    inline Vector2D&    operator*=( const Pair& rPair ) { mfX *= rPair.nA, mfY *= rPair.nB; return *this; }
-    inline Vector2D&    operator/=( const Pair& rPair ) { mfX /= rPair.nA, mfY /= rPair.nB; return *this; }
-
-    inline BOOL         operator==( const Pair& rPair ) const { return( mfX == rPair.nA && mfY == rPair.nB ); }
-    inline BOOL         operator!=( const Pair& rPair ) const { return !( *this == rPair ); }
-
-    inline BOOL         IsPositive( Vector2D& rVec ) const { return( ( mfX * rVec.mfY - mfY * rVec.mfX ) >= 0.0 ); }
-    inline BOOL         IsNegative( Vector2D& rVec ) const { return !IsPositive( rVec ); }
+    
+    inline Vector2D&	operator+=( const Vector2D& rVec ) { mfX += rVec.mfX, mfY += rVec.mfY; return *this; }
+    inline Vector2D&	operator-=( const Vector2D& rVec ) { mfX -= rVec.mfX, mfY -= rVec.mfY; return *this; }
+    inline Vector2D		operator+(const Vector2D& rVec) const { Vector2D aSum(*this); aSum += rVec; return aSum; }
+    inline Vector2D		operator-(const Vector2D& rVec) const { Vector2D aSub(*this); aSub -= rVec; return aSub; }
+    inline Vector2D		operator-(void) const {	return Vector2D(-mfX, -mfY); }
+                        
+    inline double		Scalar( const Vector2D& rVec ) const { return( mfX * rVec.mfX + mfY * rVec.mfY ); }
+
+    inline Vector2D&	operator/=( const Vector2D& rVec ) { mfX /= rVec.mfX, mfY /= rVec.mfY; return *this; }
+    inline Vector2D&	operator*=( const Vector2D& rVec ) { mfX *= rVec.mfX, mfY *= rVec.mfY; return *this; }
+    inline Vector2D		operator/(const Vector2D& rVec) const { Vector2D aDiv(*this); aDiv /= rVec; return aDiv; }
+    inline Vector2D		operator*(const Vector2D& rVec) const { Vector2D aMul(*this); aMul *= rVec; return aMul; }
+
+    inline Vector2D&	operator*=(double t) { mfX *= t; mfY *= t; return *this; }
+    inline Vector2D		operator*(double t) const { Vector2D aNew(*this); aNew *= t; return aNew; }
+    inline Vector2D&	operator/=(double t) { mfX /= t; mfY /= t; return *this; }
+    inline Vector2D		operator/(double t) const { Vector2D aNew(*this); aNew /= t; return aNew; }
+    
+    inline BOOL			operator==( const Vector2D& rVec ) const { return( mfX == rVec.mfX && mfY == rVec.mfY ); }
+    inline BOOL			operator!=( const Vector2D& rVec ) const { return !( *this == rVec ); }
+    
+    inline Vector2D&	operator=( const Vector2D& rVec ) { mfX = rVec.mfX, mfY = rVec.mfY; return *this; }
+    inline Vector2D&	operator=( const Pair& rPair ) { mfX = rPair.nA, mfY = rPair.nB; return *this; }
+    inline Vector2D&	operator-=( const Pair& rPair ) { mfX -= rPair.nA, mfY -= rPair.nB; return *this; }
+    inline Vector2D&	operator+=( const Pair& rPair ) { mfX += rPair.nA, mfY += rPair.nB; return *this; }
+    inline Vector2D&	operator*=( const Pair& rPair ) { mfX *= rPair.nA, mfY *= rPair.nB; return *this; }
+    inline Vector2D&	operator/=( const Pair& rPair ) { mfX /= rPair.nA, mfY /= rPair.nB; return *this; }
+    
+    inline BOOL			operator==( const Pair& rPair ) const { return( mfX == rPair.nA && mfY == rPair.nB ); }
+    inline BOOL			operator!=( const Pair& rPair ) const { return !( *this == rPair ); }
+    
+    inline BOOL			IsPositive( Vector2D& rVec ) const { return( ( mfX * rVec.mfY - mfY * rVec.mfX ) >= 0.0 ); }
+    inline BOOL			IsNegative( Vector2D& rVec ) const { return !IsPositive( rVec ); }
 };
 
 // -----------------------------------------------------------------------------
diff --git a/tools/inc/tools/weakbase.h b/tools/inc/tools/weakbase.h
index a66da8c7c33f..7aff87446cb8 100644
--- a/tools/inc/tools/weakbase.h
+++ b/tools/inc/tools/weakbase.h
@@ -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
@@ -69,8 +69,8 @@ namespace tools
 template <class reference_type>
 struct WeakConnection
 {
-    sal_Int32   mnRefCount;
-    reference_type* mpReference;
+    sal_Int32	mnRefCount;
+    reference_type*	mpReference;
 
     WeakConnection( reference_type* pReference ) : mnRefCount( 0 ), mpReference( pReference ) {};
     void acquire() { mnRefCount++; }
@@ -114,13 +114,13 @@ public:
     inline sal_Bool operator== (const WeakReference<reference_type> & handle) const;
 
     /** only needed for using this class with stl containers */
-    inline sal_Bool operator!= (const WeakReference<reference_type> & handle) const;
+    inline sal_Bool	operator!= (const WeakReference<reference_type> & handle) const;
 
     /** only needed for using this class with stl containers */
-    inline sal_Bool operator< (const WeakReference<reference_type> & handle) const;
+    inline sal_Bool	operator< (const WeakReference<reference_type> & handle) const;
 
     /** only needed for using this class with stl containers */
-    inline sal_Bool operator> (const WeakReference<reference_type> & handle) const;
+    inline sal_Bool	operator> (const WeakReference<reference_type> & handle) const;
 
     /** the assignment operator */
     inline WeakReference<reference_type>& operator= (const WeakReference<reference_type> & handle);
diff --git a/tools/inc/tools/weakbase.hxx b/tools/inc/tools/weakbase.hxx
index 81f53fb3516b..32aae7f7ee22 100644
--- a/tools/inc/tools/weakbase.hxx
+++ b/tools/inc/tools/weakbase.hxx
@@ -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
@@ -111,19 +111,19 @@ inline sal_Bool WeakReference< reference_type >::operator==(const WeakReference<
 }
 
 template< class reference_type >
-inline sal_Bool WeakReference< reference_type >::operator!=(const WeakReference<reference_type> & handle) const
+inline sal_Bool	WeakReference< reference_type >::operator!=(const WeakReference<reference_type> & handle) const
 {
     return mpWeakConnection != handle.mpWeakConnection;
 }
 
 template< class reference_type >
-inline sal_Bool WeakReference< reference_type >::operator<(const WeakReference<reference_type> & handle) const
+inline sal_Bool	WeakReference< reference_type >::operator<(const WeakReference<reference_type> & handle) const
 {
     return mpWeakConnection->mpReference < handle.mpWeakConnection->mpReference;
 }
 
 template< class reference_type >
-inline sal_Bool WeakReference< reference_type >::operator>(const WeakReference<reference_type> & handle) const
+inline sal_Bool	WeakReference< reference_type >::operator>(const WeakReference<reference_type> & handle) const
 {
     return mpWeakConnection->mpReference > handle.mpWeakConnection->mpReference;
 }
diff --git a/tools/inc/tools/wintypes.hxx b/tools/inc/tools/wintypes.hxx
index 7d6296b76e8c..87a9bbe5ca8c 100644
--- a/tools/inc/tools/wintypes.hxx
+++ b/tools/inc/tools/wintypes.hxx
@@ -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
@@ -35,89 +35,89 @@
 // ----------------
 
 typedef USHORT WindowType;
-#define WINDOW_BASE                 0x0100
-#define WINDOW_FIRST                (WINDOW_BASE + 0x30)
-#define WINDOW_MESSBOX              (WINDOW_FIRST)
-#define WINDOW_INFOBOX              (WINDOW_FIRST + 0x01)
-#define WINDOW_WARNINGBOX           (WINDOW_FIRST + 0x02)
-#define WINDOW_ERRORBOX             (WINDOW_FIRST + 0x03)
-#define WINDOW_QUERYBOX             (WINDOW_FIRST + 0x04)
-#define WINDOW_WINDOW               (WINDOW_FIRST + 0x05)
-#define WINDOW_SYSWINDOW            (WINDOW_FIRST + 0x06)
-#define WINDOW_WORKWINDOW           (WINDOW_FIRST + 0x07)
-// #define WINDOW_MDIWINDOW            (WINDOW_FIRST + 0x08)
-#define WINDOW_FLOATINGWINDOW       (WINDOW_FIRST + 0x09)
-#define WINDOW_DIALOG               (WINDOW_FIRST + 0x0a)
-#define WINDOW_MODELESSDIALOG       (WINDOW_FIRST + 0x0b)
-#define WINDOW_MODALDIALOG          (WINDOW_FIRST + 0x0c)
-#define WINDOW_SYSTEMDIALOG         (WINDOW_FIRST + 0x0d)
-#define WINDOW_PATHDIALOG           (WINDOW_FIRST + 0x0e)
-#define WINDOW_FILEDIALOG           (WINDOW_FIRST + 0x0f)
-#define WINDOW_PRINTERSETUPDIALOG   (WINDOW_FIRST + 0x10)
-#define WINDOW_PRINTDIALOG          (WINDOW_FIRST + 0x11)
-#define WINDOW_COLORDIALOG          (WINDOW_FIRST + 0x12)
-#define WINDOW_FONTDIALOG           (WINDOW_FIRST + 0x13)
-#define WINDOW_CONTROL              (WINDOW_FIRST + 0x14)
-#define WINDOW_BUTTON               (WINDOW_FIRST + 0x15)
-#define WINDOW_PUSHBUTTON           (WINDOW_FIRST + 0x16)
-#define WINDOW_OKBUTTON             (WINDOW_FIRST + 0x17)
-#define WINDOW_CANCELBUTTON         (WINDOW_FIRST + 0x18)
-#define WINDOW_HELPBUTTON           (WINDOW_FIRST + 0x19)
-#define WINDOW_IMAGEBUTTON          (WINDOW_FIRST + 0x1a)
-#define WINDOW_MENUBUTTON           (WINDOW_FIRST + 0x1b)
-#define WINDOW_MOREBUTTON           (WINDOW_FIRST + 0x1c)
-#define WINDOW_SPINBUTTON           (WINDOW_FIRST + 0x1d)
-#define WINDOW_RADIOBUTTON          (WINDOW_FIRST + 0x1e)
-#define WINDOW_IMAGERADIOBUTTON     (WINDOW_FIRST + 0x1f)
-#define WINDOW_CHECKBOX             (WINDOW_FIRST + 0x20)
-#define WINDOW_TRISTATEBOX          (WINDOW_FIRST + 0x21)
-#define WINDOW_EDIT                 (WINDOW_FIRST + 0x22)
-#define WINDOW_MULTILINEEDIT        (WINDOW_FIRST + 0x23)
-#define WINDOW_COMBOBOX             (WINDOW_FIRST + 0x24)
-#define WINDOW_LISTBOX              (WINDOW_FIRST + 0x25)
-#define WINDOW_MULTILISTBOX         (WINDOW_FIRST + 0x26)
-#define WINDOW_FIXEDTEXT            (WINDOW_FIRST + 0x27)
-#define WINDOW_FIXEDLINE            (WINDOW_FIRST + 0x28)
-#define WINDOW_FIXEDBITMAP          (WINDOW_FIRST + 0x29)
-#define WINDOW_FIXEDIMAGE           (WINDOW_FIRST + 0x2a)
-#define WINDOW_GROUPBOX             (WINDOW_FIRST + 0x2c)
-#define WINDOW_SCROLLBAR            (WINDOW_FIRST + 0x2d)
-#define WINDOW_SCROLLBARBOX         (WINDOW_FIRST + 0x2e)
-#define WINDOW_SPLITTER             (WINDOW_FIRST + 0x2f)
-#define WINDOW_SPLITWINDOW          (WINDOW_FIRST + 0x30)
-#define WINDOW_SPINFIELD            (WINDOW_FIRST + 0x31)
-#define WINDOW_PATTERNFIELD         (WINDOW_FIRST + 0x32)
-#define WINDOW_NUMERICFIELD         (WINDOW_FIRST + 0x33)
-#define WINDOW_METRICFIELD          (WINDOW_FIRST + 0x34)
-#define WINDOW_CURRENCYFIELD        (WINDOW_FIRST + 0x35)
-#define WINDOW_DATEFIELD            (WINDOW_FIRST + 0x36)
-#define WINDOW_TIMEFIELD            (WINDOW_FIRST + 0x37)
-#define WINDOW_PATTERNBOX           (WINDOW_FIRST + 0x38)
-#define WINDOW_NUMERICBOX           (WINDOW_FIRST + 0x39)
-#define WINDOW_METRICBOX            (WINDOW_FIRST + 0x3a)
-#define WINDOW_CURRENCYBOX          (WINDOW_FIRST + 0x3b)
-#define WINDOW_DATEBOX              (WINDOW_FIRST + 0x3c)
-#define WINDOW_TIMEBOX              (WINDOW_FIRST + 0x3d)
-#define WINDOW_LONGCURRENCYFIELD    (WINDOW_FIRST + 0x3e)
-#define WINDOW_LONGCURRENCYBOX      (WINDOW_FIRST + 0x3f)
-#define WINDOW_TOOLBOX              (WINDOW_FIRST + 0x41)
-#define WINDOW_DOCKINGWINDOW        (WINDOW_FIRST + 0x42)
-#define WINDOW_STATUSBAR            (WINDOW_FIRST + 0x43)
-#define WINDOW_TABPAGE              (WINDOW_FIRST + 0x44)
-#define WINDOW_TABCONTROL           (WINDOW_FIRST + 0x45)
-#define WINDOW_TABDIALOG            (WINDOW_FIRST + 0x46)
-#define WINDOW_BORDERWINDOW         (WINDOW_FIRST + 0x47)
-#define WINDOW_BUTTONDIALOG         (WINDOW_FIRST + 0x48)
-#define WINDOW_SYSTEMCHILDWINDOW    (WINDOW_FIRST + 0x49)
-#define WINDOW_FIXEDBORDER          (WINDOW_FIRST + 0x4a)
-#define WINDOW_SLIDER               (WINDOW_FIRST + 0x4b)
+#define WINDOW_BASE 				0x0100
+#define WINDOW_FIRST				(WINDOW_BASE + 0x30)
+#define WINDOW_MESSBOX				(WINDOW_FIRST)
+#define WINDOW_INFOBOX				(WINDOW_FIRST + 0x01)
+#define WINDOW_WARNINGBOX			(WINDOW_FIRST + 0x02)
+#define WINDOW_ERRORBOX 			(WINDOW_FIRST + 0x03)
+#define WINDOW_QUERYBOX 			(WINDOW_FIRST + 0x04)
+#define WINDOW_WINDOW				(WINDOW_FIRST + 0x05)
+#define WINDOW_SYSWINDOW			(WINDOW_FIRST + 0x06)
+#define WINDOW_WORKWINDOW			(WINDOW_FIRST + 0x07)
+// #define WINDOW_MDIWINDOW 		   (WINDOW_FIRST + 0x08)
+#define WINDOW_FLOATINGWINDOW		(WINDOW_FIRST + 0x09)
+#define WINDOW_DIALOG				(WINDOW_FIRST + 0x0a)
+#define WINDOW_MODELESSDIALOG		(WINDOW_FIRST + 0x0b)
+#define WINDOW_MODALDIALOG			(WINDOW_FIRST + 0x0c)
+#define WINDOW_SYSTEMDIALOG 		(WINDOW_FIRST + 0x0d)
+#define WINDOW_PATHDIALOG			(WINDOW_FIRST + 0x0e)
+#define WINDOW_FILEDIALOG			(WINDOW_FIRST + 0x0f)
+#define WINDOW_PRINTERSETUPDIALOG	(WINDOW_FIRST + 0x10)
+#define WINDOW_PRINTDIALOG			(WINDOW_FIRST + 0x11)
+#define WINDOW_COLORDIALOG			(WINDOW_FIRST + 0x12)
+#define WINDOW_FONTDIALOG			(WINDOW_FIRST + 0x13)
+#define WINDOW_CONTROL				(WINDOW_FIRST + 0x14)
+#define WINDOW_BUTTON				(WINDOW_FIRST + 0x15)
+#define WINDOW_PUSHBUTTON			(WINDOW_FIRST + 0x16)
+#define WINDOW_OKBUTTON 			(WINDOW_FIRST + 0x17)
+#define WINDOW_CANCELBUTTON 		(WINDOW_FIRST + 0x18)
+#define WINDOW_HELPBUTTON			(WINDOW_FIRST + 0x19)
+#define WINDOW_IMAGEBUTTON			(WINDOW_FIRST + 0x1a)
+#define WINDOW_MENUBUTTON			(WINDOW_FIRST + 0x1b)
+#define WINDOW_MOREBUTTON			(WINDOW_FIRST + 0x1c)
+#define WINDOW_SPINBUTTON			(WINDOW_FIRST + 0x1d)
+#define WINDOW_RADIOBUTTON			(WINDOW_FIRST + 0x1e)
+#define WINDOW_IMAGERADIOBUTTON 	(WINDOW_FIRST + 0x1f)
+#define WINDOW_CHECKBOX 			(WINDOW_FIRST + 0x20)
+#define WINDOW_TRISTATEBOX			(WINDOW_FIRST + 0x21)
+#define WINDOW_EDIT 				(WINDOW_FIRST + 0x22)
+#define WINDOW_MULTILINEEDIT		(WINDOW_FIRST + 0x23)
+#define WINDOW_COMBOBOX 			(WINDOW_FIRST + 0x24)
+#define WINDOW_LISTBOX				(WINDOW_FIRST + 0x25)
+#define WINDOW_MULTILISTBOX 		(WINDOW_FIRST + 0x26)
+#define WINDOW_FIXEDTEXT			(WINDOW_FIRST + 0x27)
+#define WINDOW_FIXEDLINE			(WINDOW_FIRST + 0x28)
+#define WINDOW_FIXEDBITMAP			(WINDOW_FIRST + 0x29)
+#define WINDOW_FIXEDIMAGE			(WINDOW_FIRST + 0x2a)
+#define WINDOW_GROUPBOX 			(WINDOW_FIRST + 0x2c)
+#define WINDOW_SCROLLBAR			(WINDOW_FIRST + 0x2d)
+#define WINDOW_SCROLLBARBOX 		(WINDOW_FIRST + 0x2e)
+#define WINDOW_SPLITTER 			(WINDOW_FIRST + 0x2f)
+#define WINDOW_SPLITWINDOW			(WINDOW_FIRST + 0x30)
+#define WINDOW_SPINFIELD			(WINDOW_FIRST + 0x31)
+#define WINDOW_PATTERNFIELD 		(WINDOW_FIRST + 0x32)
+#define WINDOW_NUMERICFIELD 		(WINDOW_FIRST + 0x33)
+#define WINDOW_METRICFIELD			(WINDOW_FIRST + 0x34)
+#define WINDOW_CURRENCYFIELD		(WINDOW_FIRST + 0x35)
+#define WINDOW_DATEFIELD			(WINDOW_FIRST + 0x36)
+#define WINDOW_TIMEFIELD			(WINDOW_FIRST + 0x37)
+#define WINDOW_PATTERNBOX			(WINDOW_FIRST + 0x38)
+#define WINDOW_NUMERICBOX			(WINDOW_FIRST + 0x39)
+#define WINDOW_METRICBOX			(WINDOW_FIRST + 0x3a)
+#define WINDOW_CURRENCYBOX			(WINDOW_FIRST + 0x3b)
+#define WINDOW_DATEBOX				(WINDOW_FIRST + 0x3c)
+#define WINDOW_TIMEBOX				(WINDOW_FIRST + 0x3d)
+#define WINDOW_LONGCURRENCYFIELD	(WINDOW_FIRST + 0x3e)
+#define WINDOW_LONGCURRENCYBOX		(WINDOW_FIRST + 0x3f)
+#define WINDOW_TOOLBOX				(WINDOW_FIRST + 0x41)
+#define WINDOW_DOCKINGWINDOW		(WINDOW_FIRST + 0x42)
+#define WINDOW_STATUSBAR			(WINDOW_FIRST + 0x43)
+#define WINDOW_TABPAGE				(WINDOW_FIRST + 0x44)
+#define WINDOW_TABCONTROL			(WINDOW_FIRST + 0x45)
+#define WINDOW_TABDIALOG			(WINDOW_FIRST + 0x46)
+#define WINDOW_BORDERWINDOW 		(WINDOW_FIRST + 0x47)
+#define WINDOW_BUTTONDIALOG 		(WINDOW_FIRST + 0x48)
+#define WINDOW_SYSTEMCHILDWINDOW	(WINDOW_FIRST + 0x49)
+#define WINDOW_FIXEDBORDER			(WINDOW_FIRST + 0x4a)
+#define WINDOW_SLIDER				(WINDOW_FIRST + 0x4b)
 #define WINDOW_MENUBARWINDOW        (WINDOW_FIRST + 0x4c)
-#define WINDOW_TREELISTBOX          (WINDOW_FIRST + 0x4d)
-#define WINDOW_HELPTEXTWINDOW       (WINDOW_FIRST + 0x4e)
-#define WINDOW_INTROWINDOW          (WINDOW_FIRST + 0x4f)
+#define WINDOW_TREELISTBOX	        (WINDOW_FIRST + 0x4d)
+#define WINDOW_HELPTEXTWINDOW		(WINDOW_FIRST + 0x4e)
+#define WINDOW_INTROWINDOW		    (WINDOW_FIRST + 0x4f)
 #define WINDOW_LISTBOXWINDOW        (WINDOW_FIRST + 0x50)
 #define WINDOW_DOCKINGAREA          (WINDOW_FIRST + 0x51)
-#define WINDOW_LAST                 (WINDOW_DOCKINGAREA)
+#define WINDOW_LAST 				(WINDOW_DOCKINGAREA)
 
 
 // ---------------
@@ -128,23 +128,23 @@ typedef USHORT WindowType;
 typedef sal_Int64 WinBits;
 
 // Window-Bits fuer Window
-#define WB_CLIPCHILDREN         ((WinBits)0x00000001)
-#define WB_DIALOGCONTROL        ((WinBits)0x00000002)
-#define WB_NODIALOGCONTROL      ((WinBits)0x00000004)
-#define WB_BORDER               ((WinBits)0x00000008)
-#define WB_NOBORDER             ((WinBits)0x00000010)
-#define WB_SIZEABLE             ((WinBits)0x00000020)
-#define WB_3DLOOK               ((WinBits)0x00000040)
-#define WB_AUTOSIZE             ((WinBits)0x00000080)
+#define WB_CLIPCHILDREN 		((WinBits)0x00000001)
+#define WB_DIALOGCONTROL		((WinBits)0x00000002)
+#define WB_NODIALOGCONTROL		((WinBits)0x00000004)
+#define WB_BORDER				((WinBits)0x00000008)
+#define WB_NOBORDER 			((WinBits)0x00000010)
+#define WB_SIZEABLE 			((WinBits)0x00000020)
+#define WB_3DLOOK				((WinBits)0x00000040)
+#define WB_AUTOSIZE 			((WinBits)0x00000080)
 
 // Window-Bits fuer SystemWindows
-#define WB_MOVEABLE             ((WinBits)0x00000100)
-#define WB_ROLLABLE             ((WinBits)0x00000200)
-#define WB_CLOSEABLE            ((WinBits)0x00000400)
-#define WB_STANDALONE           ((WinBits)0x00000800)
-#define WB_APP                  ((WinBits)0x00001000)
-#define WB_PINABLE              ((WinBits)0x00002000)
-#define WB_SYSTEMWINDOW         ((WinBits)SAL_CONST_INT64(0x40000000))
+#define WB_MOVEABLE 			((WinBits)0x00000100)
+#define WB_ROLLABLE 			((WinBits)0x00000200)
+#define WB_CLOSEABLE			((WinBits)0x00000400)
+#define WB_STANDALONE			((WinBits)0x00000800)
+#define WB_APP					((WinBits)0x00001000)
+#define WB_PINABLE				((WinBits)0x00002000)
+#define WB_SYSTEMWINDOW 		((WinBits)SAL_CONST_INT64(0x40000000))
 // warning: do not confuse WB_SYSTEMCHILDWINDOW with the SystemChildWindow class
 
 // the SystemChildWindow class was there first and is a very specialized
@@ -155,137 +155,139 @@ typedef sal_Int64 WinBits;
 // which should be created as system child windows with (more or less)
 // normal event handling
 #define WB_SYSTEMCHILDWINDOW    ((WinBits)SAL_CONST_INT64(0x8000000000))
-#define WB_SIZEMOVE             (WB_SIZEABLE | WB_MOVEABLE)
+#define WB_SIZEMOVE 			(WB_SIZEABLE | WB_MOVEABLE)
 
 // Standard-Window-Bits fuer ChildWindows
-#define WB_TABSTOP              ((WinBits)0x00000100)
-#define WB_NOTABSTOP            ((WinBits)0x00000200)
-#define WB_GROUP                ((WinBits)0x00000400)
-#define WB_NOGROUP              ((WinBits)0x00000800)
-#define WB_HORZ                 ((WinBits)0x00001000)
-#define WB_VERT                 ((WinBits)0x00002000)
-#define WB_LEFT                 ((WinBits)0x00004000)
-#define WB_CENTER               ((WinBits)0x00008000)
-#define WB_RIGHT                ((WinBits)0x00010000)
-#define WB_TOP                  ((WinBits)0x00020000)
-#define WB_VCENTER              ((WinBits)0x00040000)
-#define WB_BOTTOM               ((WinBits)0x00080000)
-#define WB_DRAG                 ((WinBits)0x00100000)
-#define WB_SPIN                 ((WinBits)0x00200000)
-#define WB_REPEAT               ((WinBits)0x00400000)
-#define WB_NOPOINTERFOCUS       ((WinBits)0x00800000)
-#define WB_WORDBREAK            ((WinBits)0x01000000)
-#define WB_NOLABEL              ((WinBits)0x02000000)
-#define WB_SORT                 ((WinBits)0x04000000)
-#define WB_DROPDOWN             ((WinBits)0x08000000)
-#define WB_HIDE                 ((WinBits)SAL_CONST_INT64(0x80000000))
-#define WB_AUTOHSCROLL          ((WinBits)SAL_CONST_INT64(0x10000000))
-#define WB_DOCKABLE             ((WinBits)SAL_CONST_INT64(0x20000000))
+#define WB_TABSTOP				((WinBits)0x00000100)
+#define WB_NOTABSTOP			((WinBits)0x00000200)
+#define WB_GROUP				((WinBits)0x00000400)
+#define WB_NOGROUP				((WinBits)0x00000800)
+#define WB_HORZ 				((WinBits)0x00001000)
+#define WB_VERT 				((WinBits)0x00002000)
+#define WB_LEFT 				((WinBits)0x00004000)
+#define WB_CENTER				((WinBits)0x00008000)
+#define WB_RIGHT				((WinBits)0x00010000)
+#define WB_TOP					((WinBits)0x00020000)
+#define WB_VCENTER				((WinBits)0x00040000)
+#define WB_BOTTOM				((WinBits)0x00080000)
+#define WB_DRAG 				((WinBits)0x00100000)
+#define WB_SPIN 				((WinBits)0x00200000)
+#define WB_REPEAT				((WinBits)0x00400000)
+#define WB_NOPOINTERFOCUS		((WinBits)0x00800000)
+#define WB_WORDBREAK			((WinBits)0x01000000)
+#define WB_NOLABEL				((WinBits)0x02000000)
+#define WB_SORT 				((WinBits)0x04000000)
+#define WB_DROPDOWN 			((WinBits)0x08000000)
+#define WB_HIDE 				((WinBits)SAL_CONST_INT64(0x80000000))
+#define WB_AUTOHSCROLL			((WinBits)SAL_CONST_INT64(0x10000000))
+#define WB_DOCKABLE 			((WinBits)SAL_CONST_INT64(0x20000000))
 #define WB_AUTOVSCROLL          ((WinBits)SAL_CONST_INT64(0x40000000))
 #define WB_HYPHENATION          (((WinBits)SAL_CONST_INT64(0x800000000)) | WB_WORDBREAK)
-#define WB_CHILDDLGCTRL         ((WinBits)SAL_CONST_INT64(0x100000000000))
+#define WB_CHILDDLGCTRL		    ((WinBits)SAL_CONST_INT64(0x100000000000))
 
 // system floating window
-#define WB_SYSTEMFLOATWIN       ((WinBits)SAL_CONST_INT64(0x100000000))
+#define WB_SYSTEMFLOATWIN		((WinBits)SAL_CONST_INT64(0x100000000))
 #define WB_INTROWIN             ((WinBits)SAL_CONST_INT64(0x200000000))
 #define WB_NOSHADOW             ((WinBits)SAL_CONST_INT64(0x400000000))
 #define WB_TOOLTIPWIN           ((WinBits)SAL_CONST_INT64(0x800000000))
 #define WB_OWNERDRAWDECORATION  ((WinBits)SAL_CONST_INT64(0x2000000000))
 #define WB_DEFAULTWIN           ((WinBits)SAL_CONST_INT64(0x4000000000))
 #define WB_NEEDSFOCUS           ((WinBits)SAL_CONST_INT64(0x1000000000))
+#define WB_POPUP                ((WinBits)SAL_CONST_INT64(0x20000000))
 
-#define WB_HSCROLL              WB_HORZ
-#define WB_VSCROLL              WB_VERT
-#define WB_TOPIMAGE             WB_TOP
+#define WB_HSCROLL				WB_HORZ
+#define WB_VSCROLL				WB_VERT
+#define WB_TOPIMAGE 			WB_TOP
 
 // Window-Bits for PushButtons
-#define WB_DEFBUTTON            ((WinBits)0x10000000)
-#define WB_NOLIGHTBORDER        ((WinBits)0x20000000)
-#define WB_RECTSTYLE            ((WinBits)0x08000000)
-#define WB_SMALLSTYLE           ((WinBits)0x04000000)
+#define WB_DEFBUTTON			((WinBits)0x10000000)
+#define WB_NOLIGHTBORDER		((WinBits)0x20000000)
+#define WB_RECTSTYLE			((WinBits)0x08000000)
+#define WB_SMALLSTYLE			((WinBits)0x04000000)
 #define WB_TOGGLE               ((WinBits)SAL_CONST_INT64(0x1000000000))
 #define WB_BEVELBUTTON          ((WinBits)SAL_CONST_INT64(0x2000000000))
 #define WB_FLATBUTTON           ((WinBits)SAL_CONST_INT64(0x4000000000))
 
 // Window-Bits for FixedText
-#define WB_PATHELLIPSIS         ((WinBits)0x00100000)
-#define WB_EXTRAOFFSET          ((WinBits)0x02000000)
-#define WB_NOMULTILINE          ((WinBits)0x10000000)
-#define WB_INFO                 ((WinBits)0x20000000)
+#define WB_PATHELLIPSIS 		((WinBits)0x00100000)
+#define WB_EXTRAOFFSET			((WinBits)0x02000000)
+#define WB_NOMULTILINE			((WinBits)0x10000000)
+#define WB_INFO 				((WinBits)0x20000000)
 
 // Window-Bits for CheckBox
 #define WB_CBLINESTYLE          ((WinBits)SAL_CONST_INT64(0x2000000000))
 #define WB_EARLYTOGGLE          ((WinBits)SAL_CONST_INT64(0x4000000000))
 
 // Window-Bits for Edit
-#define WB_PASSWORD             ((WinBits)0x01000000)
-#define WB_READONLY             ((WinBits)0x02000000)
-#define WB_NOHIDESELECTION      ((WinBits)SAL_CONST_INT64(0x1000000000))
+#define WB_PASSWORD 			((WinBits)0x01000000)
+#define WB_READONLY 			((WinBits)0x02000000)
+#define WB_NOHIDESELECTION		((WinBits)SAL_CONST_INT64(0x1000000000))
 #define WB_FORCECTRLBACKGROUND  ((WinBits)0x80000000)
 
 // Window-Bits for MultiLineEdit
-#define WB_IGNORETAB            ((WinBits)0x20000000)
+#define WB_IGNORETAB			((WinBits)0x20000000)
 
 // Window-Bits for ListBox and MultiListBox
-#define WB_SIMPLEMODE           ((WinBits)0x20000000)
+#define WB_SIMPLEMODE			((WinBits)0x20000000)
 
 // Window-Bits for FixedBitmap
-#define WB_FAST                 ((WinBits)0x04000000)
-#define WB_SCALE                ((WinBits)0x08000000)
-#define WB_TOPLEFTVISIBLE       ((WinBits)0x10000000)
+#define WB_FAST 				((WinBits)0x04000000)
+#define WB_SCALE				((WinBits)0x08000000)
+#define WB_TOPLEFTVISIBLE		((WinBits)0x10000000)
 
 // Window-Bits for ToolBox
-#define WB_LINESPACING          ((WinBits)0x01000000)
-#define WB_SCROLL               ((WinBits)0x02000000)
-#define WB_FORCETABCYCLE        ((WinBits)0x04000000)
+#define WB_LINESPACING			((WinBits)0x01000000)
+#define WB_SCROLL				((WinBits)0x02000000)
+#define WB_FORCETABCYCLE		((WinBits)0x04000000)
 
 // Window-Bits for TabControl
-#define WB_SINGLELINE           ((WinBits)0x02000000)
+#define WB_SINGLELINE			((WinBits)0x02000000)
 
 // Window-Bits for DockingWindows
-#define WB_DOCKBORDER           ((WinBits)0x00001000)
+#define WB_DOCKBORDER			((WinBits)0x00001000)
 
 // Window-Bits for SplitWindow
-#define WB_NOSPLITDRAW          ((WinBits)0x01000000)
-#define WB_FLATSPLITDRAW        ((WinBits)0x02000000)
+#define WB_NOSPLITDRAW			((WinBits)0x01000000)
+#define WB_FLATSPLITDRAW		((WinBits)0x02000000)
 
 // Window-Bits for MessageBoxen
-#define WB_OK                   ((WinBits)0x00100000)
-#define WB_OK_CANCEL            ((WinBits)0x00200000)
-#define WB_YES_NO               ((WinBits)0x00400000)
-#define WB_YES_NO_CANCEL        ((WinBits)0x00800000)
-#define WB_RETRY_CANCEL         ((WinBits)0x01000000)
-#define WB_DEF_OK               ((WinBits)0x02000000)
-#define WB_DEF_CANCEL           ((WinBits)0x04000000)
-#define WB_DEF_RETRY            ((WinBits)0x08000000)
-#define WB_DEF_YES              ((WinBits)SAL_CONST_INT64(0x10000000))
-#define WB_DEF_NO               ((WinBits)SAL_CONST_INT64(0x20000000))
+#define WB_OK					((WinBits)0x00100000)
+#define WB_OK_CANCEL			((WinBits)0x00200000)
+#define WB_YES_NO				((WinBits)0x00400000)
+#define WB_YES_NO_CANCEL		((WinBits)0x00800000)
+#define WB_RETRY_CANCEL 		((WinBits)0x01000000)
+#define WB_DEF_OK				((WinBits)0x02000000)
+#define WB_DEF_CANCEL			((WinBits)0x04000000)
+#define WB_DEF_RETRY			((WinBits)0x08000000)
+#define WB_DEF_YES				((WinBits)SAL_CONST_INT64(0x10000000))
+#define WB_DEF_NO				((WinBits)SAL_CONST_INT64(0x20000000))
 #define WB_ABORT_RETRY_IGNORE  ((WinBits)SAL_CONST_INT64(0x1000000000))
 #define WB_DEF_IGNORE          ((WinBits)SAL_CONST_INT64(0x2000000000))
 
 // Standard-WinBits
-#define WB_STDWORK              (WB_SIZEMOVE | WB_CLOSEABLE)
-#define WB_STDDOCKWIN           (WB_DOCKABLE | WB_MOVEABLE | WB_CLOSEABLE)
-#define WB_STDFLOATWIN          (WB_SIZEMOVE | WB_CLOSEABLE | WB_ROLLABLE)
-#define WB_STDDIALOG            (WB_MOVEABLE | WB_CLOSEABLE)
-#define WB_STDMODELESS          (WB_STDDIALOG)
-#define WB_STDMODAL             (WB_STDDIALOG)
-#define WB_STDTABDIALOG         (WB_STDDIALOG)
-#define WB_STDTABCONTROL        0
+#define WB_STDWORK				(WB_SIZEMOVE | WB_CLOSEABLE)
+#define WB_STDDOCKWIN			(WB_DOCKABLE | WB_MOVEABLE | WB_CLOSEABLE)
+#define WB_STDFLOATWIN			(WB_SIZEMOVE | WB_CLOSEABLE | WB_ROLLABLE)
+#define WB_STDDIALOG			(WB_MOVEABLE | WB_CLOSEABLE)
+#define WB_STDMODELESS			(WB_STDDIALOG)
+#define WB_STDMODAL 			(WB_STDDIALOG)
+#define WB_STDTABDIALOG 		(WB_STDDIALOG)
+#define WB_STDTABCONTROL		0
+#define WB_STDPOPUP				(WB_BORDER | WB_POPUP | WB_SYSTEMWINDOW | WB_3DLOOK | WB_DIALOGCONTROL)
 
 // For TreeListBox
-#define WB_HASBUTTONS           ((WinBits)0x00800000)
-#define WB_HASLINES             ((WinBits)0x01000000)
-#define WB_HASLINESATROOT       ((WinBits)0x02000000)
+#define WB_HASBUTTONS			((WinBits)0x00800000)
+#define WB_HASLINES 			((WinBits)0x01000000)
+#define WB_HASLINESATROOT		((WinBits)0x02000000)
 
 // For FileOpen Dialog
-#define WB_PATH                 ((WinBits)0x00100000)
-#define WB_OPEN                 ((WinBits)0x00200000)
-#define WB_SAVEAS               ((WinBits)0x00400000)
+#define WB_PATH 				((WinBits)0x00100000)
+#define WB_OPEN 				((WinBits)0x00200000)
+#define WB_SAVEAS				((WinBits)0x00400000)
 
 // For Slider
 // Window-Bits for TabControl
-#define WB_SLIDERSET            ((WinBits)0x02000000)
+#define WB_SLIDERSET    		((WinBits)0x02000000)
 
 
 // --------------------
@@ -319,18 +321,18 @@ enum TriState { STATE_NOCHECK, STATE_CHECK, STATE_DONTKNOW };
 // ----------------------
 
 typedef USHORT StandardButtonType;
-#define BUTTON_OK           ((StandardButtonType)0)
-#define BUTTON_CANCEL       ((StandardButtonType)1)
-#define BUTTON_YES          ((StandardButtonType)2)
-#define BUTTON_NO           ((StandardButtonType)3)
-#define BUTTON_RETRY        ((StandardButtonType)4)
-#define BUTTON_HELP         ((StandardButtonType)5)
-#define BUTTON_CLOSE        ((StandardButtonType)6)
-#define BUTTON_MORE         ((StandardButtonType)7)
-#define BUTTON_IGNORE       ((StandardButtonType)8)
-#define BUTTON_ABORT        ((StandardButtonType)9)
-#define BUTTON_LESS         ((StandardButtonType)10)
-#define BUTTON_COUNT        11
+#define BUTTON_OK			((StandardButtonType)0)
+#define BUTTON_CANCEL		((StandardButtonType)1)
+#define BUTTON_YES			((StandardButtonType)2)
+#define BUTTON_NO			((StandardButtonType)3)
+#define BUTTON_RETRY		((StandardButtonType)4)
+#define BUTTON_HELP 		((StandardButtonType)5)
+#define BUTTON_CLOSE		((StandardButtonType)6)
+#define BUTTON_MORE 		((StandardButtonType)7)
+#define BUTTON_IGNORE 		((StandardButtonType)8)
+#define BUTTON_ABORT 		((StandardButtonType)9)
+#define BUTTON_LESS 		((StandardButtonType)10)
+#define BUTTON_COUNT		11
 
 // --------------------------------------------
 // - prominent place for ListBox window types -
diff --git a/tools/inc/tools/wldcrd.hxx b/tools/inc/tools/wldcrd.hxx
index 478566ce9b44..29b2c7a47894 100644
--- a/tools/inc/tools/wldcrd.hxx
+++ b/tools/inc/tools/wldcrd.hxx
@@ -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
diff --git a/tools/inc/tools/zcodec.hxx b/tools/inc/tools/zcodec.hxx
index 430caa363663..d6dac6845262 100644
--- a/tools/inc/tools/zcodec.hxx
+++ b/tools/inc/tools/zcodec.hxx
@@ -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
@@ -35,33 +35,33 @@
 // - Defines -
 // -----------
 
-#define DEFAULT_IN_BUFSIZE          (0x00008000UL)
-#define DEFAULT_OUT_BUFSIZE         (0x00008000UL)
+#define DEFAULT_IN_BUFSIZE			(0x00008000UL)
+#define DEFAULT_OUT_BUFSIZE			(0x00008000UL)
 
 #define MAX_MEM_USAGE 8
 
 //
 // memory requirement using compress:
-//  [ INBUFFER ] + [ OUTBUFFER ] + 128KB + 1 << (MEM_USAGE+9)
+//	[ INBUFFER ] + [ OUTBUFFER ] + 128KB + 1 << (MEM_USAGE+9)
 //
 // memory requirement using decompress:
-//  [ INBUFFER ] + [ OUTBUFFER ] + 32KB
+//	[ INBUFFER ] + [ OUTBUFFER ] + 32KB
 //
 
-#define ZCODEC_NO_COMPRESSION       (0x00000000UL)
-#define ZCODEC_BEST_SPEED           (0x00000001UL)
-#define ZCODEC_DEFAULT_COMPRESSION  (0x00000006UL)
-#define ZCODEC_BEST_COMPRESSION     (0x00000009UL)
+#define ZCODEC_NO_COMPRESSION		(0x00000000UL)
+#define ZCODEC_BEST_SPEED			(0x00000001UL)
+#define	ZCODEC_DEFAULT_COMPRESSION	(0x00000006UL)
+#define ZCODEC_BEST_COMPRESSION		(0x00000009UL)
 
-#define ZCODEC_DEFAULT_STRATEGY     (0x00000000UL)
-#define ZCODEC_ZFILTERED            (0x00000100UL)
-#define ZCODEC_ZHUFFMAN_ONLY        (0x00000200UL)
+#define ZCODEC_DEFAULT_STRATEGY		(0x00000000UL)
+#define ZCODEC_ZFILTERED			(0x00000100UL)
+#define ZCODEC_ZHUFFMAN_ONLY		(0x00000200UL)
 
-#define ZCODEC_UPDATE_CRC           (0x00010000UL)
-#define ZCODEC_GZ_LIB               (0x00020000UL)
+#define ZCODEC_UPDATE_CRC			(0x00010000UL)
+#define ZCODEC_GZ_LIB				(0x00020000UL)
 
 #define ZCODEC_PNG_DEFAULT ( ZCODEC_NO_COMPRESSION | ZCODEC_DEFAULT_STRATEGY | ZCODEC_UPDATE_CRC )
-#define ZCODEC_DEFAULT  ( ZCODEC_DEFAULT_COMPRESSION | ZCODEC_DEFAULT_STRATEGY )
+#define ZCODEC_DEFAULT	( ZCODEC_DEFAULT_COMPRESSION | ZCODEC_DEFAULT_STRATEGY )
 
 // ----------
 // - ZCodec -
@@ -73,47 +73,47 @@ class TOOLS_DLLPUBLIC ZCodec
 {
 private:
 
-    ULONG           mbInit;
-    BOOL            mbStatus;
-    BOOL            mbFinish;
-    ULONG           mnMemUsage;
-    SvStream*       mpIStm;
-    BYTE*           mpInBuf;
-    ULONG           mnInBufSize;
-    ULONG           mnInToRead;
-    SvStream*       mpOStm;
-    BYTE*           mpOutBuf;
-    ULONG           mnOutBufSize;
-
-    ULONG           mnCRC;
-    ULONG           mnCompressMethod;
-    void*           mpsC_Stream;
-
-    void            ImplInitBuf( BOOL nIOFlag );
-    void            ImplWriteBack( void );
-
-public:
+    ULONG			mbInit;
+    BOOL			mbStatus;
+    BOOL			mbFinish;
+    ULONG			mnMemUsage;
+    SvStream*		mpIStm;
+    BYTE*			mpInBuf;
+    ULONG			mnInBufSize;
+    ULONG			mnInToRead;
+    SvStream*		mpOStm;
+    BYTE*			mpOutBuf;
+    ULONG			mnOutBufSize;
+
+    ULONG			mnCRC;
+    ULONG			mnCompressMethod;
+    void*			mpsC_Stream;
+
+    void			ImplInitBuf( BOOL nIOFlag );
+    void			ImplWriteBack( void );
+
+public:	
                     ZCodec( ULONG nInBuf, ULONG nOutBuf, ULONG nMemUsage = MAX_MEM_USAGE );
-                    ZCodec( void );
-    virtual         ~ZCodec();
+                    ZCodec( void );	
+    virtual			~ZCodec();
 
-    virtual void    BeginCompression( ULONG nCompressMethod = ZCODEC_DEFAULT );
-    virtual long    EndCompression();
+    virtual void	BeginCompression( ULONG nCompressMethod = ZCODEC_DEFAULT );
+    virtual long	EndCompression();
     BOOL            IsFinished () const { return mbFinish; }
 
-    long            Compress( SvStream& rIStm, SvStream& rOStm );
-    long            Decompress( SvStream& rIStm, SvStream& rOStm );
+    long			Compress( SvStream& rIStm, SvStream& rOStm );
+    long			Decompress( SvStream& rIStm, SvStream& rOStm );
 
-    long            Write( SvStream& rOStm, const BYTE* pData, ULONG nSize );
-    long            Read( SvStream& rIStm, BYTE* pData, ULONG nSize );
-    long            ReadAsynchron( SvStream& rIStm, BYTE* pData, ULONG nSize );
+    long			Write( SvStream& rOStm, const BYTE* pData, ULONG nSize );
+    long			Read( SvStream& rIStm, BYTE* pData, ULONG nSize );
+    long			ReadAsynchron( SvStream& rIStm, BYTE* pData, ULONG nSize );
 
-    void            SetBreak( ULONG );
-    ULONG           GetBreak( void );
-    void            SetCRC( ULONG nCurrentCRC );
-    ULONG           UpdateCRC( ULONG nLatestCRC, ULONG nSource );
-    ULONG           UpdateCRC( ULONG nLatestCRC, BYTE* pSource, long nDatSize );
-    ULONG           GetCRC();
+    void			SetBreak( ULONG );
+    ULONG			GetBreak( void );
+    void			SetCRC( ULONG nCurrentCRC );
+    ULONG			UpdateCRC( ULONG nLatestCRC, ULONG nSource );	
+    ULONG			UpdateCRC( ULONG nLatestCRC, BYTE* pSource, long nDatSize );
+    ULONG			GetCRC();
 };
 
 class GZCodec : public ZCodec
@@ -122,7 +122,7 @@ class GZCodec : public ZCodec
 public:
                     GZCodec(){};
                     ~GZCodec(){};
-    virtual void    BeginCompression( ULONG nCompressMethod = ZCODEC_DEFAULT );
+    virtual void	BeginCompression( ULONG nCompressMethod = ZCODEC_DEFAULT );
 };
 
 #endif // _ZCODEC_HXX
diff --git a/tools/inc/toolsin.hxx b/tools/inc/toolsin.hxx
index 7259682c9895..5c9bd33eafcb 100644
--- a/tools/inc/toolsin.hxx
+++ b/tools/inc/toolsin.hxx
@@ -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
@@ -41,10 +41,10 @@ struct Impl1ByteConvertTabData;
 
 struct TOOLSINDATA
 {
-    ImplRegisterLanguageData*   mpFirstLangData;
-    ImplRegisterFormatData*     mpFirstFormatData;
-    Impl1ByteUnicodeTabData*    mpFirstUniTabData;
-    Impl1ByteConvertTabData*    mpFirstConvertTabData;
+    ImplRegisterLanguageData*	mpFirstLangData;
+    ImplRegisterFormatData* 	mpFirstFormatData;
+    Impl1ByteUnicodeTabData*	mpFirstUniTabData;
+    Impl1ByteConvertTabData*	mpFirstConvertTabData;
 };
 
 TOOLSINDATA* ImplGetToolsInData();
diff --git a/tools/os2/inc/dll.hxx b/tools/os2/inc/dll.hxx
index 81a87a03ece7..69d92923f509 100644
--- a/tools/os2/inc/dll.hxx
+++ b/tools/os2/inc/dll.hxx
@@ -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
diff --git a/tools/os2/source/dll/toolsdll.cxx b/tools/os2/source/dll/toolsdll.cxx
index 0e0bdec3a9b0..f4f62e742e7b 100644
--- a/tools/os2/source/dll/toolsdll.cxx
+++ b/tools/os2/source/dll/toolsdll.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
diff --git a/tools/qa/test_pathutils.cxx b/tools/qa/test_pathutils.cxx
index 5966406e150f..3dbe09a6a675 100644
--- a/tools/qa/test_pathutils.cxx
+++ b/tools/qa/test_pathutils.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
diff --git a/tools/qa/version.map b/tools/qa/version.map
index 7321bbca16ad..f313c44bd7ad 100644
--- a/tools/qa/version.map
+++ b/tools/qa/version.map
@@ -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
diff --git a/tools/source/communi/geninfo.cxx b/tools/source/communi/geninfo.cxx
index 97326836de2d..b0878fee159b 100644
--- a/tools/source/communi/geninfo.cxx
+++ b/tools/source/communi/geninfo.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
@@ -87,7 +87,7 @@ BOOL GenericInformation::InsertSubInfo( GenericInformation *pInfo )
 }
 
 /*****************************************************************************/
-BOOL GenericInformation::InsertSubInfo( const ByteString &rPathKey, const ByteString &rValue,
+BOOL GenericInformation::InsertSubInfo( const ByteString &rPathKey,	const ByteString &rValue,
                     BOOL bSearchByPath, BOOL bNewPath )
 /*****************************************************************************/
 {
@@ -167,7 +167,7 @@ GenericInformationList::~GenericInformationList()
 {
     // delete all Informations stored in this List
     // ### GH: Hier werden dann wohl etwa die H�lfte der Eintr�ge gel�scht
-/*  for ( ULONG i = 0; i < Count(); i++ ) {
+/*	for ( ULONG i = 0; i < Count(); i++ ) {
         GetObject( i )->ListDeleted();
         delete GetObject( i );
         Remove( i );*/
@@ -292,7 +292,7 @@ ULONG GenericInformationList::InsertSorted( GenericInformation *pInfo,
         if ( sCandidate.ToUpperAscii() == sKey ) {
             // key allready exists in list
             if ( bOverwrite )
-                Replace( pInfo, ULONG(0));  // ### Laut NF scheint hier ein Memory Leak zu sein
+                Replace( pInfo, ULONG(0));	// ### Laut NF scheint hier ein Memory Leak zu sein
             return 0;
         }
         else if ( sCandidate > sKey ) {
@@ -312,7 +312,7 @@ ULONG GenericInformationList::InsertSorted( GenericInformation *pInfo,
     if ( sCandidate.ToUpperAscii() == sKey ) {
         // key allready exists in list
         if ( bOverwrite )
-            Replace( pInfo, nActPos );  // ### Laut NF scheint hier ein Memory Leak zu sein
+            Replace( pInfo, nActPos );	// ### Laut NF scheint hier ein Memory Leak zu sein
         return nActPos;
     }
 
@@ -387,7 +387,7 @@ void GenericInformationList::RemoveInfo( GenericInformation *pInfo,
     Remove( pInfo );
     if ( bDelete )
         delete pInfo;
-/*  if ( Count() == 0 && pOwner )   // Leere Listen entfernen;
+/*	if ( Count() == 0 && pOwner )	// Leere Listen entfernen;
     {
         SetOwner( NULL );
         delete this;
@@ -397,7 +397,7 @@ void GenericInformationList::RemoveInfo( GenericInformation *pInfo,
 GenericInformation* GenericInformationList::SetOwner( GenericInformation *pNewOwner )
 {
     GenericInformation *pOldOwner = pOwner;
-    if ( pOwner )   // bei parent austragen;
+    if ( pOwner )	// bei parent austragen;
         pOwner->SetSubList( NULL );
     if ( pNewOwner )
         pNewOwner->SetSubList( this );
diff --git a/tools/source/communi/parser.cxx b/tools/source/communi/parser.cxx
index 20c2bb3ba059..0160be984dea 100644
--- a/tools/source/communi/parser.cxx
+++ b/tools/source/communi/parser.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
@@ -113,8 +113,8 @@ ByteString &InformationParser::ReadLine()
             if ( nLevel ) {
                 sLine = "}";
                 fprintf( stdout, "Reached EOF parsing %s. Suplying extra '}'\n",ByteString( sStreamName, gsl_getSystemTextEncoding()).GetBuffer() );
-    //          nErrorCode = IP_UNEXPECTED_EOF;
-    //          nErrorLine = nActLine;
+    //	        nErrorCode = IP_UNEXPECTED_EOF;
+    //	        nErrorLine = nActLine;
             }
             else
                 sLine = "";
@@ -448,7 +448,7 @@ USHORT InformationParser::GetErrorCode()
 ByteString &InformationParser::GetErrorText()
 /*****************************************************************************/
 {
-  //    sErrorText = pActStream->GetFileName();
+  //	sErrorText = pActStream->GetFileName();
     sErrorText = ByteString( sStreamName, gsl_getSystemTextEncoding());
     sErrorText += ByteString( " (" );
     sErrorText += ByteString::CreateFromInt64(nErrorLine);
diff --git a/tools/source/datetime/datetime.cxx b/tools/source/datetime/datetime.cxx
index 8b679478c535..b2ef0c11919c 100644
--- a/tools/source/datetime/datetime.cxx
+++ b/tools/source/datetime/datetime.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
@@ -337,12 +337,12 @@ DateTime& DateTime::operator +=( double fTimeInDays )
         fInt = ::rtl::math::approxFloor( fTimeInDays );
         fFrac = fInt >= fTimeInDays ? 0.0 : fTimeInDays - fInt;
     }
-    Date::operator+=( long(fInt) );     // full days
+    Date::operator+=( long(fInt) );		// full days
     if ( fFrac )
     {
-        Time aTime(0);  // default ctor calls system time, we don't need that
-        fFrac *= 24UL * 60 * 60 * 1000;     // time expressed in milliseconds
-        aTime.MakeTimeFromMS( long(fFrac) );    // method handles negative ms
+        Time aTime(0);	// default ctor calls system time, we don't need that
+        fFrac *= 24UL * 60 * 60 * 1000;		// time expressed in milliseconds
+        aTime.MakeTimeFromMS( long(fFrac) );	// method handles negative ms
         operator+=( aTime );
     }
     return *this;
@@ -374,7 +374,7 @@ double operator -( const DateTime& rDateTime1, const DateTime& rDateTime2 )
     if ( nTime )
     {
         double fTime = double(nTime);
-        fTime /= 24UL * 60 * 60 * 1000; // convert from milliseconds to fraction
+        fTime /= 24UL * 60 * 60 * 1000;	// convert from milliseconds to fraction
         if ( nDays < 0 && fTime > 0.0 )
             fTime = 1.0 - fTime;
         return double(nDays) + fTime;
diff --git a/tools/source/datetime/tdate.cxx b/tools/source/datetime/tdate.cxx
index e6bb4345d9f9..4853a6b19f57 100644
--- a/tools/source/datetime/tdate.cxx
+++ b/tools/source/datetime/tdate.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
@@ -56,7 +56,7 @@ struct tm *localtime_r(const time_t *timep, struct tm *buffer);
 static USHORT aDaysInMonth[12] = { 31, 28, 31, 30, 31, 30,
                                    31, 31, 30, 31, 30, 31 };
 
-#define MAX_DAYS    3636532
+#define MAX_DAYS	3636532
 
 // =======================================================================
 
@@ -102,9 +102,9 @@ long Date::DateToDays( USHORT nDay, USHORT nMonth, USHORT nYear )
 static void DaysToDate( long nDays,
                         USHORT& rDay, USHORT& rMonth, USHORT& rYear )
 {
-    long    nTempDays;
-    long    i = 0;
-    BOOL    bCalc;
+    long	nTempDays;
+    long	i = 0;
+    BOOL	bCalc;
 
     do
     {
@@ -162,12 +162,12 @@ Date::Date()
             (((ULONG)aDateTime.wMonth)*100) +
             (((ULONG)aDateTime.wYear)*10000);
 #else
-    time_t     nTmpTime;
+    time_t	   nTmpTime;
     struct tm aTime;
 
     // Zeit ermitteln
     nTmpTime = time( 0 );
-
+    
     // Datum zusammenbauen
     if ( localtime_r( &nTmpTime, &aTime ) )
     {
@@ -194,8 +194,8 @@ void Date::SetDay( USHORT nNewDay )
 
 void Date::SetMonth( USHORT nNewMonth )
 {
-    ULONG  nDay      = GetDay();
-    ULONG  nYear     = GetYear();
+    ULONG  nDay 	 = GetDay();
+    ULONG  nYear	 = GetYear();
 
     nDate = nDay + (((ULONG)(nNewMonth%100))*100) + (nYear*10000);
 }
@@ -204,8 +204,8 @@ void Date::SetMonth( USHORT nNewMonth )
 
 void Date::SetYear( USHORT nNewYear )
 {
-    ULONG  nDay     = GetDay();
-    ULONG  nMonth   = GetMonth();
+    ULONG  nDay 	= GetDay();
+    ULONG  nMonth	= GetMonth();
 
     nDate = nDay + (nMonth*100) + (((ULONG)(nNewYear%10000))*10000);
 }
@@ -304,12 +304,12 @@ USHORT Date::GetWeekOfYear( DayOfWeek eStartDay,
             if ( nWeek == 53 )
             {
                 // naechster x_Sonntag == erster x_Sonntag im neuen Jahr
-                //                     == noch gleiche Woche
+                //					   == noch gleiche Woche
                 long nTempDays = DateToDays( GetDay(), GetMonth(), GetYear() );
                 nTempDays +=  6 - (GetDayOfWeek()+(7-(short)eStartDay)) % 7;
-                USHORT  nDay;
-                USHORT  nMonth;
-                USHORT  nYear;
+                USHORT	nDay;
+                USHORT	nMonth;
+                USHORT	nYear;
                 DaysToDate( nTempDays, nDay, nMonth, nYear );
                 nWeek = Date( nDay, nMonth, nYear ).GetWeekOfYear( eStartDay, nMinimumNumberOfDaysInWeek );
             }
@@ -363,10 +363,10 @@ BOOL Date::IsValid() const
 
 Date& Date::operator +=( long nDays )
 {
-    USHORT  nDay;
-    USHORT  nMonth;
-    USHORT  nYear;
-    long    nTempDays = DateToDays( GetDay(), GetMonth(), GetYear() );
+    USHORT	nDay;
+    USHORT	nMonth;
+    USHORT	nYear;
+    long	nTempDays = DateToDays( GetDay(), GetMonth(), GetYear() );
 
     nTempDays += nDays;
     if ( nTempDays > MAX_DAYS )
@@ -386,10 +386,10 @@ Date& Date::operator +=( long nDays )
 
 Date& Date::operator -=( long nDays )
 {
-    USHORT  nDay;
-    USHORT  nMonth;
-    USHORT  nYear;
-    long    nTempDays = DateToDays( GetDay(), GetMonth(), GetYear() );
+    USHORT	nDay;
+    USHORT	nMonth;
+    USHORT	nYear;
+    long	nTempDays = DateToDays( GetDay(), GetMonth(), GetYear() );
 
     nTempDays -= nDays;
     if ( nTempDays > MAX_DAYS )
@@ -409,10 +409,10 @@ Date& Date::operator -=( long nDays )
 
 Date& Date::operator ++()
 {
-    USHORT  nDay;
-    USHORT  nMonth;
-    USHORT  nYear;
-    long    nTempDays = DateToDays( GetDay(), GetMonth(), GetYear() );
+    USHORT	nDay;
+    USHORT	nMonth;
+    USHORT	nYear;
+    long	nTempDays = DateToDays( GetDay(), GetMonth(), GetYear() );
 
     if ( nTempDays < MAX_DAYS )
     {
@@ -428,10 +428,10 @@ Date& Date::operator ++()
 
 Date& Date::operator --()
 {
-    USHORT  nDay;
-    USHORT  nMonth;
-    USHORT  nYear;
-    long    nTempDays = DateToDays( GetDay(), GetMonth(), GetYear() );
+    USHORT	nDay;
+    USHORT	nMonth;
+    USHORT	nYear;
+    long	nTempDays = DateToDays( GetDay(), GetMonth(), GetYear() );
 
     if ( nTempDays > 1 )
     {
diff --git a/tools/source/datetime/ttime.cxx b/tools/source/datetime/ttime.cxx
index 9483cc10065e..20d499da8b11 100644
--- a/tools/source/datetime/ttime.cxx
+++ b/tools/source/datetime/ttime.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
@@ -66,13 +66,13 @@ static sal_Int32 TimeToSec100( const Time& rTime )
     sal_Int32   nSec    = rTime.GetSec();
     sal_Int32   n100Sec = rTime.Get100Sec();
 
-//  Wegen Interal Compiler Error bei MSC, etwas komplizierter
-//  return (n100Sec + (nSec*100) + (nMin*60*100) + (nHour*60*60*100) * nSign);
+//	Wegen Interal Compiler Error bei MSC, etwas komplizierter
+//	return (n100Sec + (nSec*100) + (nMin*60*100) + (nHour*60*60*100) * nSign);
 
     sal_Int32 nRet = n100Sec;
-    nRet     += nSec*100;
-    nRet     += nMin*60*100;
-    nRet     += nHour*60*60*100;
+    nRet	 += nSec*100;
+    nRet	 += nMin*60*100;
+    nRet	 += nHour*60*60*100;
 
     return (nRet * nSign);
 }
@@ -118,7 +118,7 @@ Time::Time()
             (((sal_Int32)aDateTime.wSecond)*100) +
             ((sal_Int32)aDateTime.wMilliseconds/10);
 #else
-    time_t     nTmpTime;
+    time_t	   nTmpTime;
     struct tm aTime;
 
     // Zeit ermitteln
@@ -148,12 +148,12 @@ Time::Time( const Time& rTime )
 Time::Time( ULONG nHour, ULONG nMin, ULONG nSec, ULONG n100Sec )
 {
     // Zeit normalisieren
-    nSec    += n100Sec / 100;
+    nSec	+= n100Sec / 100;
     n100Sec  = n100Sec % 100;
-    nMin    += nSec / 60;
-    nSec     = nSec % 60;
-    nHour   += nMin / 60;
-    nMin     = nMin % 60;
+    nMin	+= nSec / 60;
+    nSec	 = nSec % 60;
+    nHour	+= nMin / 60;
+    nMin	 = nMin % 60;
 
     // Zeit zusammenbauen
     nTime = (sal_Int32)(n100Sec + (nSec*100) + (nMin*10000) + (nHour*1000000));
@@ -163,10 +163,10 @@ Time::Time( ULONG nHour, ULONG nMin, ULONG nSec, ULONG n100Sec )
 
 void Time::SetHour( USHORT nNewHour )
 {
-    short  nSign      = (nTime >= 0) ? +1 : -1;
-    sal_Int32   nMin      = GetMin();
-    sal_Int32   nSec      = GetSec();
-    sal_Int32   n100Sec   = Get100Sec();
+    short  nSign	  = (nTime >= 0) ? +1 : -1;
+    sal_Int32   nMin 	  = GetMin();
+    sal_Int32   nSec 	  = GetSec();
+    sal_Int32   n100Sec	  = Get100Sec();
 
     nTime = (n100Sec + (nSec*100) + (nMin*10000) +
             (((sal_Int32)nNewHour)*1000000)) * nSign;
@@ -176,10 +176,10 @@ void Time::SetHour( USHORT nNewHour )
 
 void Time::SetMin( USHORT nNewMin )
 {
-    short  nSign      = (nTime >= 0) ? +1 : -1;
-    sal_Int32   nHour     = GetHour();
-    sal_Int32   nSec      = GetSec();
-    sal_Int32   n100Sec   = Get100Sec();
+    short  nSign	  = (nTime >= 0) ? +1 : -1;
+    sal_Int32   nHour	  = GetHour();
+    sal_Int32   nSec 	  = GetSec();
+    sal_Int32   n100Sec	  = Get100Sec();
 
     // kein Ueberlauf
     nNewMin = nNewMin % 60;
@@ -192,10 +192,10 @@ void Time::SetMin( USHORT nNewMin )
 
 void Time::SetSec( USHORT nNewSec )
 {
-    short       nSign     = (nTime >= 0) ? +1 : -1;
-    sal_Int32   nHour     = GetHour();
-    sal_Int32   nMin      = GetMin();
-    sal_Int32   n100Sec   = Get100Sec();
+    short       nSign	  = (nTime >= 0) ? +1 : -1;
+    sal_Int32   nHour	  = GetHour();
+    sal_Int32   nMin 	  = GetMin();
+    sal_Int32   n100Sec	  = Get100Sec();
 
     // kein Ueberlauf
     nNewSec = nNewSec % 60;
@@ -208,10 +208,10 @@ void Time::SetSec( USHORT nNewSec )
 
 void Time::Set100Sec( USHORT nNew100Sec )
 {
-    short       nSign     = (nTime >= 0) ? +1 : -1;
-    sal_Int32   nHour     = GetHour();
-    sal_Int32   nMin      = GetMin();
-    sal_Int32   nSec      = GetSec();
+    short       nSign	  = (nTime >= 0) ? +1 : -1;
+    sal_Int32   nHour	  = GetHour();
+    sal_Int32   nMin 	  = GetMin();
+    sal_Int32   nSec 	  = GetSec();
 
     // kein Ueberlauf
     nNew100Sec = nNew100Sec % 100;
@@ -224,11 +224,11 @@ void Time::Set100Sec( USHORT nNew100Sec )
 
 sal_Int32 Time::GetMSFromTime() const
 {
-    short       nSign     = (nTime >= 0) ? +1 : -1;
-    sal_Int32   nHour     = GetHour();
-    sal_Int32   nMin      = GetMin();
-    sal_Int32   nSec      = GetSec();
-    sal_Int32   n100Sec   = Get100Sec();
+    short       nSign	  = (nTime >= 0) ? +1 : -1;
+    sal_Int32   nHour	  = GetHour();
+    sal_Int32   nMin 	  = GetMin();
+    sal_Int32   nSec 	  = GetSec();
+    sal_Int32   n100Sec	  = Get100Sec();
 
     return (((nHour*3600000)+(nMin*60000)+(nSec*1000)+(n100Sec*10))*nSign);
 }
@@ -254,7 +254,7 @@ void Time::MakeTimeFromMS( sal_Int32 nMS )
 
 double Time::GetTimeInDays() const
 {
-    short  nSign      = (nTime >= 0) ? +1 : -1;
+    short  nSign	  = (nTime >= 0) ? +1 : -1;
     double nHour      = GetHour();
     double nMin       = GetMin();
     double nSec       = GetSec();
@@ -335,7 +335,7 @@ Time Time::GetUTCOffset()
     else
         return Time( 0 );
 #elif defined( WNT )
-    TIME_ZONE_INFORMATION   aTimeZone;
+    TIME_ZONE_INFORMATION	aTimeZone;
     aTimeZone.Bias = 0;
     DWORD nTimeZoneRet = GetTimeZoneInformation( &aTimeZone );
     sal_Int32 nTempTime = aTimeZone.Bias;
@@ -348,18 +348,18 @@ Time Time::GetUTCOffset()
         aTime = -aTime;
     return aTime;
 #else
-    static ULONG    nCacheTicks = 0;
-    static sal_Int32    nCacheSecOffset = -1;
-    ULONG           nTicks = Time::GetSystemTicks();
-    time_t          nTime;
-    tm              aTM;
-    sal_Int32           nLocalTime;
-    sal_Int32           nUTC;
-    short           nTempTime;
+    static ULONG	nCacheTicks = 0;
+    static sal_Int32 	nCacheSecOffset = -1;
+    ULONG			nTicks = Time::GetSystemTicks();
+    time_t			nTime;
+    tm 			    aTM;
+    sal_Int32			nLocalTime;
+    sal_Int32			nUTC;
+    short			nTempTime;
 
     // Evt. Wert neu ermitteln
-    if ( (nCacheSecOffset == -1)            ||
-         ((nTicks - nCacheTicks) > 360000)  ||
+    if ( (nCacheSecOffset == -1)			||
+         ((nTicks - nCacheTicks) > 360000)	||
          ( nTicks < nCacheTicks ) // handle overflow
          )
     {
@@ -424,16 +424,16 @@ ULONG Time::GetProcessTicks()
     DosQuerySysInfo( QSV_MS_COUNT, QSV_MS_COUNT, &nClock, sizeof( nClock ) );
     return (ULONG)nClock;
 #else
-    static ULONG    nImplTicksPerSecond = 0;
-    static double   dImplTicksPerSecond;
-    static double   dImplTicksULONGMAX;
-    ULONG           nTicks = (ULONG)clock();
+    static ULONG	nImplTicksPerSecond = 0;
+    static double	dImplTicksPerSecond;
+    static double	dImplTicksULONGMAX;
+    ULONG			nTicks = (ULONG)clock();
 
     if ( !nImplTicksPerSecond )
     {
         nImplTicksPerSecond = CLOCKS_PER_SEC;
         dImplTicksPerSecond = nImplTicksPerSecond;
-        dImplTicksULONGMAX  = (double)(ULONG)ULONG_MAX;
+        dImplTicksULONGMAX	= (double)(ULONG)ULONG_MAX;
     }
 
     double fTicks = nTicks;
diff --git a/tools/source/debug/debug.cxx b/tools/source/debug/debug.cxx
index ab1f414b0972..7de3195d82af 100644
--- a/tools/source/debug/debug.cxx
+++ b/tools/source/debug/debug.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
@@ -1206,7 +1206,7 @@ void* DbgFunc( USHORT nAction, void* pParam )
             case DBG_FUNC_SAVEDATA:
                 {
                 const DbgData* pData = static_cast< const DbgData* >( pParam );
-
+                
                 sal_Char aBuf[ 4096 ];
                 DbgGetDbgFileName( aBuf, sizeof( aBuf ) );
                 FILETYPE pIniFile = FileOpen( aBuf, "w" );
diff --git a/tools/source/debug/stcktree.cxx b/tools/source/debug/stcktree.cxx
index dccc4c198852..9a8601e178df 100644
--- a/tools/source/debug/stcktree.cxx
+++ b/tools/source/debug/stcktree.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
@@ -38,32 +38,32 @@
 
 struct ImpDbgStackTree
 {
-    ImpDbgStackTree*    pLeft_;
-    ImpDbgStackTree*    pRight_;
-    ImpDbgStackTree*    pCaller_;
-    ImpDbgStackTree*    pSub_;
-    ULONG               nIP_;
-    ULONG               nBytesLeak_;
-    ULONG               nBytesPeak_;
-    ULONG               nBytes_;
-    ULONG               nCountLeak_;
-    ULONG               nCountPeak_;
-    ULONG               nCount_;
-    ULONG               nMax_;
-    ULONG               nMin_;
+    ImpDbgStackTree*	pLeft_;
+    ImpDbgStackTree*	pRight_;
+    ImpDbgStackTree*	pCaller_;
+    ImpDbgStackTree*	pSub_;
+    ULONG				nIP_;
+    ULONG				nBytesLeak_;
+    ULONG				nBytesPeak_;
+    ULONG				nBytes_;
+    ULONG				nCountLeak_;
+    ULONG				nCountPeak_;
+    ULONG				nCount_;
+    ULONG				nMax_;
+    ULONG				nMin_;
 
                         ImpDbgStackTree( ImpDbgStackTree* pSub, ULONG nIP );
                         ~ImpDbgStackTree();
 
-    ImpDbgStackTree*    Add( ULONG nAlloc, ULONG* pBP, ULONG nIP );
-    void                Print( int nLevel, ULONG nCount, ULONG nCountLeak );
-    void                Print( int nLevel );
+    ImpDbgStackTree*	Add( ULONG nAlloc, ULONG* pBP, ULONG nIP );
+    void				Print( int nLevel, ULONG nCount, ULONG nCountLeak );
+    void				Print( int nLevel );
 };
 
-static ImpDbgStackTree* pImpDbgStackTreeRoot     = NULL;
-static ULONG*           pImpDbgStackTreeBP       = NULL;
-static ULONG            nImpDbgStackTreeMain     = 0;
-static int              nImpDbgStackTreeSem      = 0;
+static ImpDbgStackTree* pImpDbgStackTreeRoot	 = NULL;
+static ULONG*			pImpDbgStackTreeBP		 = NULL;
+static ULONG			nImpDbgStackTreeMain	 = 0;
+static int				nImpDbgStackTreeSem 	 = 0;
 
 // -----------------------------------------------------------------------
 
@@ -156,7 +156,7 @@ ImpDbgStackTree* ImpDbgStackTree::Add( ULONG nAlloc, ULONG *pBP, ULONG nIP )
     nCountLeak_++;
     if ( nCountLeak_ > nCountPeak_ )
         nCountPeak_ = nCountLeak_;
-    nBytes_     += nAlloc;
+    nBytes_ 	+= nAlloc;
     nBytesLeak_ += nAlloc;
     if ( nBytesLeak_ > nBytesPeak_ )
         nBytesPeak_ = nBytesLeak_;
@@ -193,7 +193,7 @@ void DbgStartStackTree()
         ULONG* pBP;
         __asm mov pBP, ebp;
 
-        pImpDbgStackTreeBP   = (ULONG*)pBP[0];
+        pImpDbgStackTreeBP	 = (ULONG*)pBP[0];
         nImpDbgStackTreeMain = pImpDbgStackTreeBP[1];
     }
 }
@@ -277,8 +277,8 @@ void DbgFreeStackTree( void* pVoid, ULONG nAlloc )
         {
             if ( p->nBytesLeak_ > p->nMax_ * p->nCountLeak_ )
             {
-                nAlloc         += p->nBytesLeak_ - p->nMax_ * p->nCountLeak_;
-                p->nBytesLeak_  = p->nMax_ * p->nCountLeak_;
+                nAlloc		   += p->nBytesLeak_ - p->nMax_ * p->nCountLeak_;
+                p->nBytesLeak_	= p->nMax_ * p->nCountLeak_;
             }
         }
 
diff --git a/tools/source/fsys/comdep.cxx b/tools/source/fsys/comdep.cxx
index fa1009ad5fd3..a4cfca226547 100644
--- a/tools/source/fsys/comdep.cxx
+++ b/tools/source/fsys/comdep.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
diff --git a/tools/source/fsys/comdep.hxx b/tools/source/fsys/comdep.hxx
index 043c5815f764..54f9df8d9298 100644
--- a/tools/source/fsys/comdep.hxx
+++ b/tools/source/fsys/comdep.hxx
@@ -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
@@ -68,17 +68,17 @@ char *volumeid( const char* pPfad );
 
 struct DirReader_Impl
 {
-    Dir*        pDir;
+    Dir*		pDir;
     DIR*        pDosDir;
     dirent*     pDosEntry;
     DirEntry*   pParent;
-    String      aPath;
+    String  	aPath;
     ByteString  aBypass;
     BOOL        bReady;
-    BOOL        bInUse;
+    BOOL		bInUse;
 
                 DirReader_Impl( Dir &rDir )
-                :   pDir( &rDir ),
+                :	pDir( &rDir ),
                     pDosEntry( 0 ),
                     pParent( 0 ),
                     aPath( GUI2FSYS(rDir.GetFull()) ),
@@ -119,18 +119,18 @@ struct DirReader_Impl
 
 struct FileCopier_Impl
 {
-    FSysAction      nActions;       // was zu tun ist (Copy/Move/recur)
-    Link            aErrorLink;     // bei Fehlern zu rufen
-    ErrCode         eErr;           // aktueller Fehlercode im Error-Handler
-    const DirEntry* pErrSource;     // fuer Error-Handler falls Source-Fehler
-    const DirEntry* pErrTarget;     // fuer Error-Handler falls Target-Fehler
+    FSysAction		nActions;		// was zu tun ist (Copy/Move/recur)
+    Link            aErrorLink;		// bei Fehlern zu rufen
+    ErrCode			eErr;           // aktueller Fehlercode im Error-Handler
+    const DirEntry*	pErrSource;		// fuer Error-Handler falls Source-Fehler
+    const DirEntry*	pErrTarget;		// fuer Error-Handler falls Target-Fehler
 
                     FileCopier_Impl()
-                    :   nActions( 0 ), eErr( 0 ),
+                    :	nActions( 0 ), eErr( 0 ),
                         pErrSource( 0 ), pErrTarget( 0 )
                     {}
                     FileCopier_Impl( const FileCopier_Impl &rOrig )
-                    :   nActions( rOrig.nActions ), eErr( 0 ),
+                    :	nActions( rOrig.nActions ), eErr( 0 ),
                         pErrSource( 0 ), pErrTarget( 0 )
                     {}
 
@@ -147,10 +147,10 @@ struct FileCopier_Impl
 #if defined WNT || defined OS2
 BOOL IsRedirectable_Impl( const ByteString &rPath );
 #else
-#define IsRedirectable_Impl( rPath )    TRUE
+#define IsRedirectable_Impl( rPath )	TRUE
 #endif
 
 //--------------------------------------------------------------------
-
+ 
 
 #endif
diff --git a/tools/source/fsys/dirent.cxx b/tools/source/fsys/dirent.cxx
index 1bd43bffc4e7..456e0aadbc9d 100644
--- a/tools/source/fsys/dirent.cxx
+++ b/tools/source/fsys/dirent.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
@@ -547,7 +547,7 @@ FSysError DirEntry::ImpParseOs2Name( const ByteString& rPfad, FSysPathStyle eSty
 FSysError DirEntry::ImpParseName( const ByteString& rbInitName,
                                   FSysPathStyle eStyle )
 {
-    String  rInitName( rbInitName, osl_getThreadTextEncoding() );
+    String	rInitName( rbInitName, osl_getThreadTextEncoding() );
     if ( eStyle == FSYS_STYLE_HOST )
         eStyle = DEFSTYLE;
 
diff --git a/tools/source/fsys/filecopy.cxx b/tools/source/fsys/filecopy.cxx
index 62d361aa4af4..104ab0cd6d9a 100644
--- a/tools/source/fsys/filecopy.cxx
+++ b/tools/source/fsys/filecopy.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
@@ -73,10 +73,10 @@ using namespace ::osl;
 
 FileCopier::FileCopier() :
 
-    nBytesTotal ( 0 ),
+    nBytesTotal	( 0 ),
     nBytesCopied( 0 ),
-    nBlockSize  ( 4096 ),
-    pImp        ( new FileCopier_Impl )
+    nBlockSize	( 4096 ),
+    pImp		( new FileCopier_Impl )
 
 {
 }
@@ -85,12 +85,12 @@ FileCopier::FileCopier() :
 
 FileCopier::FileCopier( const DirEntry& rSource, const DirEntry& rTarget ) :
 
-    aSource     ( rSource ),
-    aTarget     ( rTarget ),
-    nBytesTotal ( 0 ),
+    aSource		( rSource ),
+    aTarget		( rTarget ),
+    nBytesTotal	( 0 ),
     nBytesCopied( 0 ),
-    nBlockSize  ( 4096 ),
-    pImp        ( new FileCopier_Impl )
+    nBlockSize	( 4096 ),
+    pImp		( new FileCopier_Impl )
 
 {
 }
@@ -99,13 +99,13 @@ FileCopier::FileCopier( const DirEntry& rSource, const DirEntry& rTarget ) :
 
 FileCopier::FileCopier( const FileCopier& rCopier ) :
 
-    aSource         ( rCopier.aSource ),
-    aTarget         ( rCopier.aTarget ),
-    nBytesTotal     ( 0 ),
-    nBytesCopied    ( 0 ),
-    aProgressLink   ( rCopier.aProgressLink ),
-    nBlockSize      ( 4096 ),
-    pImp            ( new FileCopier_Impl )
+    aSource			( rCopier.aSource ),
+    aTarget			( rCopier.aTarget ),
+    nBytesTotal		( 0 ),
+    nBytesCopied	( 0 ),
+    aProgressLink	( rCopier.aProgressLink ),
+    nBlockSize		( 4096 ),
+    pImp			( new FileCopier_Impl )
 
 {
 }
@@ -412,10 +412,10 @@ FSysError FileCopier::DoCopy_Impl(
 
     if ( FSYS_ERR_OK == ERRCODE_TOERROR(eRet) )
     {
-        WIN32_FIND_DATA fdSource;
+        WIN32_FIND_DATA	fdSource;
         ByteString aFullSource(aSource.GetFull(), osl_getThreadTextEncoding());
         ByteString aFullTarget(aTgt.GetFull(), osl_getThreadTextEncoding());
-        HANDLE  hFind = FindFirstFile( aFullSource.GetBuffer() , &fdSource );
+        HANDLE	hFind = FindFirstFile( aFullSource.GetBuffer() , &fdSource );
         if ( hFind != INVALID_HANDLE_VALUE )
         {
             FindClose( hFind );
diff --git a/tools/source/fsys/fstat.cxx b/tools/source/fsys/fstat.cxx
index acdbe6bae510..41bd37fa5f2f 100644
--- a/tools/source/fsys/fstat.cxx
+++ b/tools/source/fsys/fstat.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
@@ -54,7 +54,7 @@
 *************************************************************************/
 
 FileStat::FileStat()
-:   // don't use Default-Ctors!
+:	// don't use Default-Ctors!
     aDateCreated( ULONG(0) ),
     aTimeCreated( ULONG(0) ),
     aDateModified( ULONG(0) ),
@@ -78,7 +78,7 @@ FileStat::FileStat()
 *************************************************************************/
 
 FileStat::FileStat( const DirEntry& rDirEntry, FSysAccess nAccess )
-:   // don't use Default-Ctors!
+:	// don't use Default-Ctors!
     aDateCreated( ULONG(0) ),
     aTimeCreated( ULONG(0) ),
     aDateModified( ULONG(0) ),
@@ -287,7 +287,7 @@ ULONG FileStat::SetReadOnlyFlag( const DirEntry &rEntry, BOOL bRO )
 |*
 |*    FileStat::SetDateTime
 |*
-|*    Ersterstellung    PB  27.06.97
+|*    Ersterstellung	PB  27.06.97
 |*    Letzte Aenderung
 |*
 *************************************************************************/
@@ -319,28 +319,28 @@ void FileStat::SetDateTime( const String& rFileName,
 
         if ( nDiff > 0 )
         {
-            aNewTime += aDiff;                  // Stundenkorrektur
+            aNewTime += aDiff;					// Stundenkorrektur
 
             // bei "Uberlauf korrigieren
             if ( aNewTime >= Time( 24, 0 ) )
                 aNewTime -= Time( 24, 0 );
 
             // Tages"uberlauf?
-            if ( aOldTime == Time( 0, 0 ) ||    // 00:00 -> 01:00
-                 aNewTime < aOldTime )          // 23:00 -> 00:00 | 01:00 ...
+            if ( aOldTime == Time( 0, 0 ) ||	// 00:00 -> 01:00
+                 aNewTime < aOldTime ) 			// 23:00 -> 00:00 | 01:00 ...
                 aNewDate++;
         }
         else if ( nDiff < 0 )
         {
-            aNewTime -= aDiff;                  // Stundenkorrektur
+            aNewTime -= aDiff;					// Stundenkorrektur
 
             // negative Zeit (-1:00) korrigieren: 23:00
             if (aNewTime < Time( 0, 0 ) )
                 aNewTime += Time( 24, 0 );
 
             // Tagesunterlauf ?
-            if ( aOldTime == Time( 0, 0 ) ||    // 00:00 -> 23:00
-                 aNewTime > aOldTime )          // 01:00 -> 23:00 | 22:00 ...
+            if ( aOldTime == Time( 0, 0 ) ||	// 00:00 -> 23:00
+                 aNewTime > aOldTime )			// 01:00 -> 23:00 | 22:00 ...
                 aNewDate--;
         }
     }
@@ -371,10 +371,10 @@ void FileStat::SetDateTime( const String& rFileName,
     // open file
     ULONG nAction = FILE_EXISTED;
     HFILE hFile = 0;
-    ULONG nFlags = OPEN_FLAGS_WRITE_THROUGH |
-                   OPEN_FLAGS_FAIL_ON_ERROR | OPEN_FLAGS_NO_CACHE   |
-                   OPEN_FLAGS_RANDOM        | OPEN_FLAGS_NOINHERIT  |
-                   OPEN_SHARE_DENYNONE      | OPEN_ACCESS_READWRITE;
+    ULONG nFlags = OPEN_FLAGS_WRITE_THROUGH	|
+                   OPEN_FLAGS_FAIL_ON_ERROR	| OPEN_FLAGS_NO_CACHE	|
+                   OPEN_FLAGS_RANDOM		| OPEN_FLAGS_NOINHERIT	|
+                   OPEN_SHARE_DENYNONE		| OPEN_ACCESS_READWRITE;
 
     APIRET nRet = DosOpen((PSZ)aFileName.GetBuffer(), &hFile, (PULONG)&nAction,
                           0/*size*/, FILE_NORMAL,
diff --git a/tools/source/fsys/os2.cxx b/tools/source/fsys/os2.cxx
index 03f8f9eb46ce..d34c389dc8e6 100644
--- a/tools/source/fsys/os2.cxx
+++ b/tools/source/fsys/os2.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
@@ -182,7 +182,7 @@ BOOL DirEntry::ToAbs()
 String DirEntry::GetVolume() const
 {
     DBG_CHKTHIS( DirEntry, ImpCheckDirEntry );
-
+    
     String aRet;
     const DirEntry *pTop = ImpGetTopPtr();
     ByteString aName = ByteString( pTop->aName ).ToLowerAscii();
@@ -327,7 +327,7 @@ USHORT DirReader_Impl::Init()
             sDrive[0] = c;
             sRoot[0] = c;
             DirEntry* pDrive = new DirEntry( sDrive, FSYS_FLAG_VOLUME, FSYS_STYLE_HOST );
-            if ( pDir->aNameMask.Matches( String( ByteString(sDrive), osl_getThreadTextEncoding()))
+            if ( pDir->aNameMask.Matches( String( ByteString(sDrive), osl_getThreadTextEncoding())) 
                 && aDriveMap[c-'a'].nKind != FSYS_KIND_UNKNOWN )
             {
                 if ( pDir->pStatLst ) //Status fuer Sort gewuenscht?
@@ -375,8 +375,8 @@ USHORT DirReader_Impl::Read()
         {
             DirEntryFlag eFlag =
                     0 == strcmp( pDosEntry->d_name, "." ) ? FSYS_FLAG_CURRENT
-                :   0 == strcmp( pDosEntry->d_name, ".." ) ? FSYS_FLAG_PARENT
-                :   FSYS_FLAG_NORMAL;
+                :	0 == strcmp( pDosEntry->d_name, ".." ) ? FSYS_FLAG_PARENT
+                :	FSYS_FLAG_NORMAL;
             DirEntry *pTemp = new DirEntry( ByteString(pDosEntry->d_name), eFlag, FSYS_STYLE_UNX );
             if ( pParent )
                 pTemp->ImpChangeParent( new DirEntry( *pParent ), FALSE);
@@ -716,7 +716,7 @@ void CreateCaseMapImpl()
     // build a string starting with code 0 as first character upto 255
     char sTemp[256];
     USHORT n;
-
+    
     for ( n = 0; n < 256; ++n )
         sTemp[n] = (char) n;
 
@@ -785,10 +785,10 @@ void CreateDriveMapImpl()
     aDriveMap[2].nKind = FSYS_KIND_FIXED;
     aDriveMap[2].nStyle = FSYS_STYLE_FAT;
 #else
-    FSQBUFFER_  aBuf;
+    FSQBUFFER_	aBuf;
     ULONG       nBufLen;
     APIRET      nRet;
-    USHORT      nDrive;
+    USHORT 		nDrive;
 
     // disable error-boxes for hard-errors
     DosError(FERR_DISABLEHARDERR);
@@ -932,7 +932,7 @@ FSysPathStyle DirEntry::GetPathStyle( const String &rDevice )
 |*
 |*    Beschreibung
 |*    Ersterstellung    TPF 26.02.1999
-|*    Letzte Aenderung
+|*    Letzte Aenderung  
 |*
 *************************************************************************/
 
@@ -940,7 +940,7 @@ BOOL DirEntry::IsCaseSensitive( FSysPathStyle eFormatter ) const
 {
     if (eFormatter==FSYS_STYLE_HOST)
     {
-        if  (GetPathStyle(GetDevice().GetName()) == FSYS_STYLE_UNX)
+        if 	(GetPathStyle(GetDevice().GetName()) == FSYS_STYLE_UNX)
         {
             return TRUE;
         }
@@ -951,7 +951,7 @@ BOOL DirEntry::IsCaseSensitive( FSysPathStyle eFormatter ) const
     }
     else
     {
-        BOOL isCaseSensitive = FALSE;           // ich bin unter OS2, also ist der default im Zweifelsfall case insensitiv
+        BOOL isCaseSensitive = FALSE;			// ich bin unter OS2, also ist der default im Zweifelsfall case insensitiv
         switch ( eFormatter )
         {
             case FSYS_STYLE_MAC:
@@ -973,7 +973,7 @@ BOOL DirEntry::IsCaseSensitive( FSysPathStyle eFormatter ) const
                 }
             default:
                 {
-                    isCaseSensitive = FALSE;    // ich bin unter OS2, also ist der default im Zweifelsfall case insensitiv
+                    isCaseSensitive = FALSE;	// ich bin unter OS2, also ist der default im Zweifelsfall case insensitiv
                     break;
                 }
         }
diff --git a/tools/source/fsys/os2.hxx b/tools/source/fsys/os2.hxx
index c5e54ba0ad47..e4315b7ffa8f 100644
--- a/tools/source/fsys/os2.hxx
+++ b/tools/source/fsys/os2.hxx
@@ -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
@@ -59,7 +59,7 @@ String ToLowerImpl( const String& );
 
 #define DEFSTYLE            FSYS_STYLE_OS2
 #define MKDIR( p )          mkdir( (unsigned char*) p )
-#define CMP_LOWER(s)    ( s.ToLowerAscii() )
+#define CMP_LOWER(s) 	( s.ToLowerAscii() )
 
 #define START_DRV       'a'
 
diff --git a/tools/source/fsys/tdir.cxx b/tools/source/fsys/tdir.cxx
index b6bf48a8cdf9..0b947304007b 100644
--- a/tools/source/fsys/tdir.cxx
+++ b/tools/source/fsys/tdir.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
@@ -322,7 +322,7 @@ void Dir::Reset()
     else
         pLst = new DirEntryList();
 
-    //  Alte File-Stat's Loeschen
+    //	Alte File-Stat's Loeschen
     if ( pStatLst )
     {
         //Erstmal die alten Loeschen
@@ -601,7 +601,7 @@ FSysError Dir::ImpSetSort( std::va_list pArgs, int nFirstSort )
     } while ( !bLast );
 
     va_end( pArgs );
-    delete pSort;           // JP:6.3.00 - delete the initial pointer
+    delete pSort;			// JP:6.3.00 - delete the initial pointer
 
     //Enfernen der alten Sort-Elemente
     if ( pSortLst )
diff --git a/tools/source/fsys/tempfile.cxx b/tools/source/fsys/tempfile.cxx
index b3f53d882467..c5f0b222a1c5 100644
--- a/tools/source/fsys/tempfile.cxx
+++ b/tools/source/fsys/tempfile.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
diff --git a/tools/source/fsys/unx.cxx b/tools/source/fsys/unx.cxx
index 13da80f6ccca..8f0923b5fe88 100644
--- a/tools/source/fsys/unx.cxx
+++ b/tools/source/fsys/unx.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
@@ -42,7 +42,7 @@
 #include <sys/mntctl.h>
 #include <sys/vmount.h>
 extern "C" int mntctl( int cmd, size_t size, char* buf );
-#elif defined(NETBSD)
+#elif defined(NETBSD) 
 #include <sys/mount.h>
 #elif defined(FREEBSD) || defined(MACOSX)
 #elif defined DECUNIX
@@ -71,11 +71,11 @@ DECLARE_LIST( FileStatList, FileStat* )
 
 #if defined SOLARIS || defined SINIX
 #define MOUNTSPECIAL mnt_special
-#define MOUNTPOINT   mnt_mountp
+#define MOUNTPOINT 	 mnt_mountp
 #define MOUNTOPTS    mnt_mntopts
 #define MOUNTFS      mnt_fstype
 #elif defined SCO
-#define MNTTAB       "/etc/mnttab"
+#define MNTTAB 		 "/etc/mnttab"
 #define MOUNTSPECIAL mt_dev
 #define MOUNTPOINT   mt_filsys
 #else
@@ -181,29 +181,29 @@ static BOOL GetMountEntry(dev_t dev, struct mymnttab *mytab)
             if ((stat (mnt->MOUNTPOINT, &buf) == -1) || (buf.st_dev != dev))
                 continue;
         }
-#       ifdef LINUX
+#		ifdef LINUX
         /* #61624# File mit setmntent oeffnen und mit fclose schliessen stoesst
            bei der glibc-2.1 auf wenig Gegenliebe */
         endmntent( fp );
-#       else
+#		else
         fclose (fp);
-#       endif
+#		endif
         mytab->mountspecial = mnt->MOUNTSPECIAL;
-        mytab->mountpoint   = mnt->MOUNTPOINT;
-        mytab->mountdevice  = dev;
+        mytab->mountpoint 	= mnt->MOUNTPOINT;
+        mytab->mountdevice 	= dev;
 #ifndef SCO
         mytab->mymnttab_filesystem = mnt->MOUNTFS;
 #else
-        mytab->mymnttab_filesystem = "ext2";        //default ist case sensitiv unter unix
+        mytab->mymnttab_filesystem = "ext2";		//default ist case sensitiv unter unix
 #endif
         return TRUE;
     }
-#   ifdef LINUX
+#	ifdef LINUX
     /* #61624# dito */
     endmntent( fp );
-#   else
+#	else
     fclose (fp);
-#   endif
+#	endif
     return FALSE;
 }
 
@@ -213,7 +213,7 @@ static BOOL GetMountEntry(dev_t dev, struct mymnttab *mytab)
 |*
 |*    DirEntry::IsCaseSensitive()
 |*
-|*    Beschreibung
+|*    Beschreibung      
 |*    Ersterstellung    TPF 25.02.1999
 |*    Letzte Aenderung  TPF 25.02.1999
 |*
@@ -235,7 +235,7 @@ BOOL DirEntry::IsCaseSensitive( FSysPathStyle eFormatter ) const
         {
             if (aPath.Level() == 1)
             {
-                return TRUE;    // ich bin unter UNIX, also ist der default im Zweifelsfall case sensitiv
+                return TRUE;	// ich bin unter UNIX, also ist der default im Zweifelsfall case sensitiv
             }
             aPath = aPath [1];
         }
@@ -246,7 +246,7 @@ BOOL DirEntry::IsCaseSensitive( FSysPathStyle eFormatter ) const
             (fsmnt.mymnttab_filesystem.CompareTo("umsdos")==COMPARE_EQUAL) ||
             (fsmnt.mymnttab_filesystem.CompareTo("vfat")==COMPARE_EQUAL) ||
             (fsmnt.mymnttab_filesystem.CompareTo("hpfs")==COMPARE_EQUAL) ||
-            (fsmnt.mymnttab_filesystem.CompareTo("smb") ==COMPARE_EQUAL) ||
+            (fsmnt.mymnttab_filesystem.CompareTo("smb")	==COMPARE_EQUAL) ||
             (fsmnt.mymnttab_filesystem.CompareTo("ncpfs")==COMPARE_EQUAL))
         {
             return FALSE;
@@ -259,7 +259,7 @@ BOOL DirEntry::IsCaseSensitive( FSysPathStyle eFormatter ) const
     }
     else
     {
-        BOOL isCaseSensitive = TRUE;    // ich bin unter UNIX, also ist der default im Zweifelsfall case sensitiv
+        BOOL isCaseSensitive = TRUE;	// ich bin unter UNIX, also ist der default im Zweifelsfall case sensitiv
         switch ( eFormatter )
         {
             case FSYS_STYLE_MAC:
@@ -281,7 +281,7 @@ BOOL DirEntry::IsCaseSensitive( FSysPathStyle eFormatter ) const
                 }
             default:
                 {
-                    isCaseSensitive = TRUE; // ich bin unter UNIX, also ist der default im Zweifelsfall case sensitiv
+                    isCaseSensitive = TRUE;	// ich bin unter UNIX, also ist der default im Zweifelsfall case sensitiv
                     break;
                 }
         }
@@ -343,8 +343,8 @@ String DirEntry::GetVolume() const
     }
     mymnttab &rMnt = mymnt::get();
     return ((buf.st_dev == rMnt.mountdevice ||
-                GetMountEntry(buf.st_dev, &rMnt)) ?
-                    String(rMnt.mountspecial, osl_getThreadTextEncoding()) :
+                GetMountEntry(buf.st_dev, &rMnt)) ? 
+                    String(rMnt.mountspecial, osl_getThreadTextEncoding()) : 
                     String());
 }
 
@@ -364,8 +364,8 @@ DirEntry DirEntry::GetDevice() const
     }
     mymnttab &rMnt = mymnt::get();
     return ((buf.st_dev == rMnt.mountdevice ||
-                GetMountEntry(buf.st_dev, &rMnt)) ?
-                    String( rMnt.mountpoint, osl_getThreadTextEncoding()) :
+                GetMountEntry(buf.st_dev, &rMnt)) ? 
+                    String( rMnt.mountpoint, osl_getThreadTextEncoding()) : 
                     String());
 }
 
@@ -433,8 +433,8 @@ USHORT DirReader_Impl::Read()
         {
             DirEntryFlag eFlag =
                     0 == strcmp( pDosEntry->d_name, "." ) ? FSYS_FLAG_CURRENT
-                :   0 == strcmp( pDosEntry->d_name, ".." ) ? FSYS_FLAG_PARENT
-                :   FSYS_FLAG_NORMAL;
+                :	0 == strcmp( pDosEntry->d_name, ".." ) ? FSYS_FLAG_PARENT
+                :	FSYS_FLAG_NORMAL;
             DirEntry *pTemp = new DirEntry( ByteString(pDosEntry->d_name), eFlag, FSYS_STYLE_UNX );
             if ( pParent )
                 pTemp->ImpChangeParent( new DirEntry( *pParent ), FALSE);
@@ -608,7 +608,7 @@ FSysPathStyle DirEntry::GetPathStyle( const String & )
 |*
 |*    FileStat::SetDateTime
 |*
-|*    Ersterstellung    PB  27.06.97
+|*    Ersterstellung	PB  27.06.97
 |*    Letzte Aenderung
 |*
 *************************************************************************/
@@ -618,8 +618,8 @@ void FileStat::SetDateTime( const String& rFileName,
 {
     tm times;
 
-    times.tm_year = rNewDateTime.GetYear()  - 1900;     // 1997 -> 97
-    times.tm_mon  = rNewDateTime.GetMonth() - 1;        // 0 == Januar!
+    times.tm_year = rNewDateTime.GetYear()  - 1900;  	// 1997 -> 97
+    times.tm_mon  = rNewDateTime.GetMonth() - 1;		// 0 == Januar!
     times.tm_mday = rNewDateTime.GetDay();
 
     times.tm_hour = rNewDateTime.GetHour();
diff --git a/tools/source/fsys/unx.hxx b/tools/source/fsys/unx.hxx
index b6723e8709a3..0ecef8df7892 100644
--- a/tools/source/fsys/unx.hxx
+++ b/tools/source/fsys/unx.hxx
@@ -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
@@ -52,7 +52,7 @@
 #define DEFSTYLE        FSYS_STYLE_BSD
 #endif
 
-#define CMP_LOWER(s)    (s)
+#define CMP_LOWER(s) 	(s)
 #define TEMPNAME()      tmpnam(0)
 #define LOWER(aString)  (aString.Lower())
 
diff --git a/tools/source/fsys/urlobj.cxx b/tools/source/fsys/urlobj.cxx
index a6d7bc6fd04e..50dacd93ed81 100644
--- a/tools/source/fsys/urlobj.cxx
+++ b/tools/source/fsys/urlobj.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
@@ -57,7 +57,7 @@ using namespace com::sun;
 
 //============================================================================
 //
-//  INetURLObject
+//	INetURLObject
 //
 //============================================================================
 
@@ -488,16 +488,16 @@ enum
 static sal_uInt32 const aMustEncodeMap[128]
     = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-/*   */                                                                         PY,
-/* ! */       PC+PD+PE   +PG+PH+PI+PJ+PK+PL+PM+PN+PO+PP+PQ+PR+PS+PT+PU+PV+PW+PX+PY+PZ+P1+P2,
-/* " */                                                             PU+PV      +PY,
-/* # */                                                             PU,
-/* $ */          PD+PE   +PG+PH+PI+PJ+PK+PL+PM+PN+PO+PP+PQ+PR+PS+PT+PU+PV+PW+PX+PY+PZ+P1+P2,
-/* % */                                                             PU,
+/*   */	                                                                        PY,
+/* ! */	      PC+PD+PE   +PG+PH+PI+PJ+PK+PL+PM+PN+PO+PP+PQ+PR+PS+PT+PU+PV+PW+PX+PY+PZ+P1+P2,
+/* " */	                                                            PU+PV      +PY,
+/* # */	                                                            PU,
+/* $ */	         PD+PE   +PG+PH+PI+PJ+PK+PL+PM+PN+PO+PP+PQ+PR+PS+PT+PU+PV+PW+PX+PY+PZ+P1+P2,
+/* % */	                                                            PU,
 /* & */ PA+PB+PC+PD+PE      +PH+PI+PJ+PK+PL+PM+PN+PO+PP   +PR+PS+PT+PU+PV+PW+PX   +PZ+P1+P2,
-/* ' */          PD+PE   +PG+PH+PI+PJ+PK+PL+PM+PN+PO+PP+PQ+PR+PS+PT+PU+PV+PW+PX+PY+PZ+P1+P2,
-/* ( */          PD+PE   +PG+PH+PI+PJ+PK+PL+PM+PN+PO+PP+PQ+PR+PS+PT+PU+PV+PW+PX+PY+PZ+P1+P2,
-/* ) */          PD+PE   +PG+PH+PI+PJ+PK+PL+PM+PN+PO+PP+PQ+PR+PS+PT+PU+PV+PW+PX+PY+PZ+P1+P2,
+/* ' */	         PD+PE   +PG+PH+PI+PJ+PK+PL+PM+PN+PO+PP+PQ+PR+PS+PT+PU+PV+PW+PX+PY+PZ+P1+P2,
+/* ( */	         PD+PE   +PG+PH+PI+PJ+PK+PL+PM+PN+PO+PP+PQ+PR+PS+PT+PU+PV+PW+PX+PY+PZ+P1+P2,
+/* ) */	         PD+PE   +PG+PH+PI+PJ+PK+PL+PM+PN+PO+PP+PQ+PR+PS+PT+PU+PV+PW+PX+PY+PZ+P1+P2,
 /* * */ PA+PB+PC+PD+PE   +PG+PH+PI+PJ+PK+PL+PM+PN+PO+PP+PQ+PR+PS+PT+PU+PV+PW+PX+PY+PZ+P1+P2,
 /* + */ PA+PB+PC+PD+PE   +PG+PH+PI+PJ+PK+PL+PM+PN+PO+PP+PQ+PR+PS+PT+PU+PV+PW+PX   +PZ+P1+P2,
 /* , */ PA+PB+PC+PD+PE   +PG+PH+PI+PJ+PK+PL+PM+PN+PO+PP+PQ+PR+PS+PT+PU+PV+PW      +PZ+P1+P2,
@@ -514,13 +514,13 @@ static sal_uInt32 const aMustEncodeMap[128]
 /* 7 */ PA+PB+PC+PD+PE+PF+PG+PH+PI+PJ+PK+PL+PM+PN+PO+PP+PQ+PR+PS+PT+PU+PV+PW+PX+PY+PZ+P1+P2,
 /* 8 */ PA+PB+PC+PD+PE+PF+PG+PH+PI+PJ+PK+PL+PM+PN+PO+PP+PQ+PR+PS+PT+PU+PV+PW+PX+PY+PZ+P1+P2,
 /* 9 */ PA+PB+PC+PD+PE+PF+PG+PH+PI+PJ+PK+PL+PM+PN+PO+PP+PQ+PR+PS+PT+PU+PV+PW+PX+PY+PZ+P1+P2,
-/* : */    PB+PC            +PH+PI+PJ   +PL+PM+PN+PO+PP+PQ+PR+PS+PT+PU+PV+PW+PX   +PZ+P1+P2,
-/* ; */       PC+PD            +PI+PJ+PK+PL+PM   +PO+PP+PQ+PR   +PT+PU   +PW      +PZ+P1+P2,
-/* < */       PC                                 +PO+PP            +PU+PV      +PY,
+/* : */	   PB+PC            +PH+PI+PJ   +PL+PM+PN+PO+PP+PQ+PR+PS+PT+PU+PV+PW+PX   +PZ+P1+P2,
+/* ; */	      PC+PD            +PI+PJ+PK+PL+PM   +PO+PP+PQ+PR   +PT+PU   +PW      +PZ+P1+P2,
+/* < */	      PC                                 +PO+PP            +PU+PV      +PY,
 /* = */ PA+PB+PC+PD+PE      +PH+PI+PJ+PK+PL+PM+PN         +PR+PS+PT+PU+PV+PW      +PZ+P1+P2,
-/* > */       PC                                 +PO+PP            +PU+PV      +PY,
-/* ? */       PC                        +PL                     +PT+PU   +PW+PX   +PZ   +P2,
-/* @ */       PC            +PH+PI+PJ+PK+PL+PM+PN+PO+PP+PQ+PR+PS+PT+PU+PV+PW+PX+PY+PZ+P1,
+/* > */	      PC                                 +PO+PP            +PU+PV      +PY,
+/* ? */	      PC                        +PL                     +PT+PU   +PW+PX   +PZ   +P2,
+/* @ */	      PC            +PH+PI+PJ+PK+PL+PM+PN+PO+PP+PQ+PR+PS+PT+PU+PV+PW+PX+PY+PZ+P1,
 /* A */ PA+PB+PC+PD+PE+PF+PG+PH+PI+PJ+PK+PL+PM+PN+PO+PP+PQ+PR+PS+PT+PU+PV+PW+PX+PY+PZ+P1+P2,
 /* B */ PA+PB+PC+PD+PE+PF+PG+PH+PI+PJ+PK+PL+PM+PN+PO+PP+PQ+PR+PS+PT+PU+PV+PW+PX+PY+PZ+P1+P2,
 /* C */ PA+PB+PC+PD+PE+PF+PG+PH+PI+PJ+PK+PL+PM+PN+PO+PP+PQ+PR+PS+PT+PU+PV+PW+PX+PY+PZ+P1+P2,
@@ -547,12 +547,12 @@ static sal_uInt32 const aMustEncodeMap[128]
 /* X */ PA+PB+PC+PD+PE+PF+PG+PH+PI+PJ+PK+PL+PM+PN+PO+PP+PQ+PR+PS+PT+PU+PV+PW+PX+PY+PZ+P1+P2,
 /* Y */ PA+PB+PC+PD+PE+PF+PG+PH+PI+PJ+PK+PL+PM+PN+PO+PP+PQ+PR+PS+PT+PU+PV+PW+PX+PY+PZ+P1+P2,
 /* Z */ PA+PB+PC+PD+PE+PF+PG+PH+PI+PJ+PK+PL+PM+PN+PO+PP+PQ+PR+PS+PT+PU+PV+PW+PX+PY+PZ+P1+P2,
-/* [ */                                  PL                        +PU+PV   +PX,
-/* \ */    PB                                                      +PU+PV      +PY,
-/* ] */                                  PL                        +PU+PV   +PX,
-/* ^ */                                                             PU+PV      +PY,
+/* [ */	                                 PL                        +PU+PV   +PX,
+/* \ */	   PB                                                      +PU+PV      +PY,
+/* ] */	                                 PL                        +PU+PV   +PX,
+/* ^ */	                                                            PU+PV      +PY,
 /* _ */ PA+PB+PC+PD+PE   +PG+PH+PI+PJ+PK+PL+PM+PN+PO+PP+PQ+PR+PS+PT+PU+PV+PW+PX+PY+PZ+P1+P2,
-/* ` */                                                             PU+PV      +PY,
+/* ` */	                                                            PU+PV      +PY,
 /* a */ PA+PB+PC+PD+PE+PF+PG+PH+PI+PJ+PK+PL+PM+PN+PO+PP+PQ+PR+PS+PT+PU+PV+PW+PX+PY+PZ+P1+P2,
 /* b */ PA+PB+PC+PD+PE+PF+PG+PH+PI+PJ+PK+PL+PM+PN+PO+PP+PQ+PR+PS+PT+PU+PV+PW+PX+PY+PZ+P1+P2,
 /* c */ PA+PB+PC+PD+PE+PF+PG+PH+PI+PJ+PK+PL+PM+PN+PO+PP+PQ+PR+PS+PT+PU+PV+PW+PX+PY+PZ+P1+P2,
@@ -579,9 +579,9 @@ static sal_uInt32 const aMustEncodeMap[128]
 /* x */ PA+PB+PC+PD+PE+PF+PG+PH+PI+PJ+PK+PL+PM+PN+PO+PP+PQ+PR+PS+PT+PU+PV+PW+PX+PY+PZ+P1+P2,
 /* y */ PA+PB+PC+PD+PE+PF+PG+PH+PI+PJ+PK+PL+PM+PN+PO+PP+PQ+PR+PS+PT+PU+PV+PW+PX+PY+PZ+P1+P2,
 /* z */ PA+PB+PC+PD+PE+PF+PG+PH+PI+PJ+PK+PL+PM+PN+PO+PP+PQ+PR+PS+PT+PU+PV+PW+PX+PY+PZ+P1+P2,
-/* { */                                                             PU+PV      +PY,
-/* | */    PB+PC                              +PN               +PT+PU+PV      +PY,
-/* } */                                                             PU+PV      +PY,
+/* { */	                                                            PU+PV      +PY,
+/* | */	   PB+PC                              +PN               +PT+PU+PV      +PY,
+/* } */	                                                            PU+PV      +PY,
 /* ~ */ PA+PB+PC+PD+PE      +PH+PI+PJ+PK+PL+PM+PN+PO+PP+PQ+PR+PS+PT+PU+PV+PW+PX+PY+PZ  +P2,
         0 };
 
@@ -722,43 +722,43 @@ bool INetURLObject::setAbsURIRef(rtl::OUString const & rTheAbsURIRef,
             // appropriate style bit is set in eStyle, if applicable)
             // determines the scheme. The productions use the auxiliary rules
             //
-            //    domain = label *("." label)
-            //    label = alphanum [*(alphanum / "-") alphanum]
-            //    alphanum = ALPHA / DIGIT
-            //    IPv6reference = "[" IPv6address "]"
-            //    IPv6address = hexpart [":" IPv4address]
-            //    IPv4address = 1*3DIGIT 3("." 1*3DIGIT)
-            //    hexpart = (hexseq ["::" [hexseq]]) / ("::" [hexseq])
-            //    hexseq = hex4 *(":" hex4)
-            //    hex4 = 1*4HEXDIG
-            //    UCS4 = <any UCS4 character>
+            //	  domain = label *("." label)
+            //	  label = alphanum [*(alphanum / "-") alphanum]
+            //	  alphanum = ALPHA / DIGIT
+            //	  IPv6reference = "[" IPv6address "]"
+            //	  IPv6address = hexpart [":" IPv4address]
+            //	  IPv4address = 1*3DIGIT 3("." 1*3DIGIT)
+            //	  hexpart = (hexseq ["::" [hexseq]]) / ("::" [hexseq])
+            //	  hexseq = hex4 *(":" hex4)
+            //	  hex4 = 1*4HEXDIG
+            //	  UCS4 = <any UCS4 character>
             //
             // 1st Production (known scheme):
-            //    <one of the known schemes, ignoring case> ":" *UCS4
+            //	  <one of the known schemes, ignoring case> ":" *UCS4
             //
             // 2nd Production (mailto):
-            //    domain "@" domain
+            //	  domain "@" domain
             //
             // 3rd Production (ftp):
-            //    "FTP" 2*("." label) ["/" *UCS4]
+            //	  "FTP" 2*("." label) ["/" *UCS4]
             //
             // 4th Production (http):
-            //    label 2*("." label) ["/" *UCS4]
+            //	  label 2*("." label) ["/" *UCS4]
             //
             // 5th Production (file):
-            //    "//" (domain / IPv6reference) ["/" *UCS4]
+            //	  "//" (domain / IPv6reference) ["/" *UCS4]
             //
             // 6th Production (Unix file):
             //    "/" *UCS4
             //
             // 7th Production (UNC file; FSYS_DOS only):
-            //    "\\" domain ["\" *UCS4]
+            //	  "\\" domain ["\" *UCS4]
             //
             // 8th Production (Unix-like DOS file; FSYS_DOS only):
-            //    ALPHA ":" ["/" *UCS4]
+            //	  ALPHA ":" ["/" *UCS4]
             //
             // 9th Production (DOS file; FSYS_DOS only):
-            //    ALPHA ":" ["\" *UCS4]
+            //	  ALPHA ":" ["\" *UCS4]
             //
             // For the 'non URL' file productions 6--9, the interpretation of
             // the input as a (degenerate) URI is turned off, i.e., escape
@@ -992,23 +992,23 @@ bool INetURLObject::setAbsURIRef(rtl::OUString const & rTheAbsURIRef,
                     // determines the used notation.  The productions use the
                     // auxiliary rules
                     //
-                    //    domain = label *("." label)
-                    //    label = alphanum [*(alphanum / "-") alphanum]
-                    //    alphanum = ALPHA / DIGIT
-                    //    IPv6reference = "[" IPv6address "]"
-                    //    IPv6address = hexpart [":" IPv4address]
-                    //    IPv4address = 1*3DIGIT 3("." 1*3DIGIT)
-                    //    hexpart = (hexseq ["::" [hexseq]]) / ("::" [hexseq])
-                    //    hexseq = hex4 *(":" hex4)
-                    //    hex4 = 1*4HEXDIG
-                    //    path = <any UCS4 character except "#">
-                    //    UCS4 = <any UCS4 character>
+                    //	  domain = label *("." label)
+                    //	  label = alphanum [*(alphanum / "-") alphanum]
+                    //	  alphanum = ALPHA / DIGIT
+                    //	  IPv6reference = "[" IPv6address "]"
+                    //	  IPv6address = hexpart [":" IPv4address]
+                    //	  IPv4address = 1*3DIGIT 3("." 1*3DIGIT)
+                    //	  hexpart = (hexseq ["::" [hexseq]]) / ("::" [hexseq])
+                    //	  hexseq = hex4 *(":" hex4)
+                    //	  hex4 = 1*4HEXDIG
+                    //	  path = <any UCS4 character except "#">
+                    //	  UCS4 = <any UCS4 character>
 
                     // 1st Production (URL):
-                    //    "//" [domain / IPv6reference] ["/" *path]
-                    //        ["#" *UCS4]
-                    //  becomes
-                    //    "file://" domain "/" *path ["#" *UCS4]
+                    //	  "//" [domain / IPv6reference] ["/" *path]
+                    //		  ["#" *UCS4]
+                    //	becomes
+                    //	  "file://" domain "/" *path ["#" *UCS4]
                     if (pEnd - pPos >= 2 && pPos[0] == '/' && pPos[1] == '/')
                     {
                         sal_Unicode const * p1 = pPos + 2;
@@ -1032,20 +1032,20 @@ bool INetURLObject::setAbsURIRef(rtl::OUString const & rTheAbsURIRef,
 
                     // 2nd Production (MS IE generated 1; FSYS_DOS only):
                     //    "//" ALPHA ":" ["/" *path] ["#" *UCS4]
-                    //  becomes
-                    //    "file:///" ALPHA ":" ["/" *path] ["#" *UCS4]
-                    //  replacing "\" by "/" within <*path>
+                    //	becomes
+                    //	  "file:///" ALPHA ":" ["/" *path] ["#" *UCS4]
+                    //	replacing "\" by "/" within <*path>
                     //
                     // 3rd Production (MS IE generated 2; FSYS_DOS only):
                     //    "//" ALPHA ":" ["\" *path] ["#" *UCS4]
-                    //  becomes
-                    //    "file:///" ALPHA ":" ["/" *path] ["#" *UCS4]
-                    //  replacing "\" by "/" within <*path>
+                    //	becomes
+                    //	  "file:///" ALPHA ":" ["/" *path] ["#" *UCS4]
+                    //	replacing "\" by "/" within <*path>
                     //
                     // 4th Production (misscounted slashes):
-                    //    "//" *path ["#" *UCS4]
-                    //  becomes
-                    //    "file:///" *path ["#" *UCS4]
+                    //	  "//" *path ["#" *UCS4]
+                    //	becomes
+                    //	  "file:///" *path ["#" *UCS4]
                     if (pEnd - pPos >= 2 && pPos[0] == '/' && pPos[1] == '/')
                     {
                         aSynAbsURIRef.
@@ -1063,9 +1063,9 @@ bool INetURLObject::setAbsURIRef(rtl::OUString const & rTheAbsURIRef,
                     }
 
                     // 5th Production (Unix):
-                    //    "/" *path ["#" *UCS4]
-                    //  becomes
-                    //    "file:///" *path ["#" *UCS4]
+                    //	  "/" *path ["#" *UCS4]
+                    //	becomes
+                    //	  "file:///" *path ["#" *UCS4]
                     if (pPos < pEnd && *pPos == '/')
                     {
                         aSynAbsURIRef.
@@ -1074,10 +1074,10 @@ bool INetURLObject::setAbsURIRef(rtl::OUString const & rTheAbsURIRef,
                     }
 
                     // 6th Production (UNC; FSYS_DOS only):
-                    //    "\\" domain ["\" *path] ["#" *UCS4]
-                    //  becomes
-                    //    "file://" domain "/" *path ["#" *UCS4]
-                    //  replacing "\" by "/" within <*path>
+                    //	  "\\" domain ["\" *path] ["#" *UCS4]
+                    //	becomes
+                    //	  "file://" domain "/" *path ["#" *UCS4]
+                    //	replacing "\" by "/" within <*path>
                     if (eStyle & FSYS_DOS
                         && pEnd - pPos >= 2
                         && pPos[0] == '\\'
@@ -1108,16 +1108,16 @@ bool INetURLObject::setAbsURIRef(rtl::OUString const & rTheAbsURIRef,
                     }
 
                     // 7th Production (Unix-like DOS; FSYS_DOS only):
-                    //    ALPHA ":" ["/" *path] ["#" *UCS4]
-                    //  becomes
-                    //    "file:///" ALPHA ":" ["/" *path] ["#" *UCS4]
-                    //  replacing "\" by "/" within <*path>
+                    //	  ALPHA ":" ["/" *path] ["#" *UCS4]
+                    //	becomes
+                    //	  "file:///" ALPHA ":" ["/" *path] ["#" *UCS4]
+                    //	replacing "\" by "/" within <*path>
                     //
                     // 8th Production (DOS; FSYS_DOS only):
-                    //    ALPHA ":" ["\" *path] ["#" *UCS4]
-                    //  becomes
-                    //    "file:///" ALPHA ":" ["/" *path] ["#" *UCS4]
-                    //  replacing "\" by "/" within <*path>
+                    //	  ALPHA ":" ["\" *path] ["#" *UCS4]
+                    //	becomes
+                    //	  "file:///" ALPHA ":" ["/" *path] ["#" *UCS4]
+                    //	replacing "\" by "/" within <*path>
                     if (eStyle & FSYS_DOS
                         && pEnd - pPos >= 2
                         && INetMIME::isAlpha(pPos[0])
@@ -1134,20 +1134,20 @@ bool INetURLObject::setAbsURIRef(rtl::OUString const & rTheAbsURIRef,
                     }
 
                     // 9th Production (any):
-                    //    *path ["#" *UCS4]
-                    //  becomes
-                    //    "file:///" *path ["#" *UCS4]
-                    //  replacing the delimiter by "/" within <*path>.  The
-                    //  delimiter is that character from the set { "/", "\",
-                    //  ":" } which appears most often in <*path> (if FSYS_UNX
+                    //	  *path ["#" *UCS4]
+                    //	becomes
+                    //	  "file:///" *path ["#" *UCS4]
+                    //	replacing the delimiter by "/" within <*path>.	The
+                    //	delimiter is that character from the set { "/", "\",
+                    //	":" } which appears most often in <*path> (if FSYS_UNX
                     //  is not among the style bits, "/" is removed from the
                     //  set; if FSYS_DOS is not among the style bits, "\" is
                     //  removed from the set; if FSYS_MAC is not among the
                     //  style bits, ":" is removed from the set).  If two or
-                    //  more characters appear the same number of times, the
-                    //  character mentioned first in that set is chosen.  If
-                    //  the first character of <*path> is the delimiter, that
-                    //  character is not copied.
+                    //	more characters appear the same number of times, the
+                    //	character mentioned first in that set is chosen.  If
+                    //	the first character of <*path> is the delimiter, that
+                    //	character is not copied.
                     if (eStyle & (FSYS_UNX | FSYS_DOS | FSYS_MAC))
                     {
                         aSynAbsURIRef.
@@ -1223,7 +1223,7 @@ bool INetURLObject::setAbsURIRef(rtl::OUString const & rTheAbsURIRef,
                         pUserInfoBegin = pAuthority;
                         pUserInfoEnd = pPos;
                     }
-                else if (getSchemeInfo().m_bHost)
+                else if (getSchemeInfo().m_bHost) 
                 {
                     pHostPortBegin = pAuthority;
                     pHostPortEnd = pPos;
@@ -1279,7 +1279,7 @@ bool INetURLObject::setAbsURIRef(rtl::OUString const & rTheAbsURIRef,
                 appendUCS4(aSynUser, nUTF32, eEscapeType, bOctets, ePart,
                            cEscapePrefix, eCharset, false);
             }
-            m_aUser.set(aSynAbsURIRef, aSynUser.makeStringAndClear(),
+            m_aUser.set(aSynAbsURIRef, aSynUser.makeStringAndClear(), 
                 aSynAbsURIRef.getLength());
             if (bHasAuth)
             {
@@ -1297,7 +1297,7 @@ bool INetURLObject::setAbsURIRef(rtl::OUString const & rTheAbsURIRef,
                         appendUCS4(aSynAuth, nUTF32, eEscapeType, bOctets,
                                    ePart, cEscapePrefix, eCharset, false);
                     }
-                    m_aAuth.set(aSynAbsURIRef, aSynAuth.makeStringAndClear(),
+                    m_aAuth.set(aSynAbsURIRef, aSynAuth.makeStringAndClear(), 
                         aSynAbsURIRef.getLength());
                 }
                 else
@@ -1320,7 +1320,7 @@ bool INetURLObject::setAbsURIRef(rtl::OUString const & rTheAbsURIRef,
                         appendUCS4(aSynAuth, nUTF32, eEscapeType, bOctets,
                                    ePart, cEscapePrefix, eCharset, false);
                     }
-                    m_aAuth.set(aSynAbsURIRef, aSynAuth.makeStringAndClear(),
+                    m_aAuth.set(aSynAbsURIRef, aSynAuth.makeStringAndClear(), 
                         aSynAbsURIRef.getLength());
                 }
             }
@@ -1375,12 +1375,12 @@ bool INetURLObject::setAbsURIRef(rtl::OUString const & rTheAbsURIRef,
                 setInvalid();
                 return false;
             }
-            m_aHost.set(aSynAbsURIRef, aSynHost.makeStringAndClear(),
+            m_aHost.set(aSynAbsURIRef, aSynHost.makeStringAndClear(), 
                 aSynAbsURIRef.getLength());
             if (pPort != pHostPortEnd)
             {
                 aSynAbsURIRef.append(sal_Unicode(':'));
-                m_aPort.set(aSynAbsURIRef,
+                m_aPort.set(aSynAbsURIRef, 
                     rtl::OUString(pPort + 1, pHostPortEnd - (pPort + 1)),
                     aSynAbsURIRef.getLength());
             }
@@ -1398,7 +1398,7 @@ bool INetURLObject::setAbsURIRef(rtl::OUString const & rTheAbsURIRef,
         setInvalid();
         return false;
     }
-    m_aPath.set(aSynAbsURIRef, aSynPath.makeStringAndClear(),
+    m_aPath.set(aSynAbsURIRef, aSynPath.makeStringAndClear(), 
         aSynAbsURIRef.getLength());
 
     // Parse ?<query>
@@ -1414,7 +1414,7 @@ bool INetURLObject::setAbsURIRef(rtl::OUString const & rTheAbsURIRef,
             appendUCS4(aSynQuery, nUTF32, eEscapeType, bOctets,
                        PART_URIC, cEscapePrefix, eCharset, true);
         }
-        m_aQuery.set(aSynAbsURIRef, aSynQuery.makeStringAndClear(),
+        m_aQuery.set(aSynAbsURIRef, aSynQuery.makeStringAndClear(), 
             aSynAbsURIRef.getLength());
     }
 
@@ -1431,7 +1431,7 @@ bool INetURLObject::setAbsURIRef(rtl::OUString const & rTheAbsURIRef,
             appendUCS4(aSynFragment, nUTF32, eEscapeType, bOctets, PART_URIC,
                        cEscapePrefix, eCharset, true);
         }
-        m_aFragment.set(aSynAbsURIRef, aSynFragment.makeStringAndClear(),
+        m_aFragment.set(aSynAbsURIRef, aSynFragment.makeStringAndClear(), 
             aSynAbsURIRef.getLength());
     }
 
@@ -1484,19 +1484,19 @@ bool INetURLObject::convertRelToAbs(rtl::OUString const & rTheRelURIRef,
         // interfere with the syntax of relative URI references.)  The
         // productions use the auxiliary rules
         //
-        //    domain = label *("." label)
-        //    label = alphanum [*(alphanum / "-") alphanum]
-        //    alphanum = ALPHA / DIGIT
-        //    UCS4 = <any UCS4 character>
+        //	  domain = label *("." label)
+        //	  label = alphanum [*(alphanum / "-") alphanum]
+        //	  alphanum = ALPHA / DIGIT
+        //	  UCS4 = <any UCS4 character>
         //
         // 1st Production (UNC file; FSYS_DOS only):
-        //    "\\" domain ["\" *UCS4]
+        //	  "\\" domain ["\" *UCS4]
         //
         // 2nd Production (Unix-like DOS file; FSYS_DOS only):
-        //    ALPHA ":" ["/" *UCS4]
+        //	  ALPHA ":" ["/" *UCS4]
         //
         // 3rd Production (DOS file; FSYS_DOS only):
-        //    ALPHA ":" ["\" *UCS4]
+        //	  ALPHA ":" ["\" *UCS4]
         if (eStyle & FSYS_DOS)
         {
             bool bFSys = false;
@@ -1959,7 +1959,7 @@ bool INetURLObject::convertAbsToRel(rtl::OUString const & rTheAbsURIRef,
     // path could go into the new relative URL instead, but some people don't
     // like that):
     rtl::OUStringBuffer aSynRelURIRef;
-//  if (nMatch <= 1) nMatch = 0; else // see comment above
+//	if (nMatch <= 1) nMatch = 0; else // see comment above
     for (sal_Unicode const * p = pBasePathBegin + nMatch; p != pBasePathEnd;
          ++p)
     {
@@ -2012,7 +2012,7 @@ bool INetURLObject::convertAbsToRel(rtl::OUString const & rTheAbsURIRef,
     if (aSubject.m_aFragment.isPresent())
     {
         aSynRelURIRef.append(sal_Unicode('#'));
-        aSynRelURIRef.append(aSubject.decode(aSubject.m_aFragment,
+        aSynRelURIRef.append(aSubject.decode(aSubject.m_aFragment, 
             cEscapePrefix, eDecodeMechanism, eCharset));
     }
 
@@ -2039,7 +2039,7 @@ bool INetURLObject::convertIntToExt(rtl::OUString const & rTheIntURIRef,
     bool bConvert = pPrefix && pPrefix->m_eKind == PrefixInfo::INTERNAL;
     if (bConvert)
     {
-        aSynExtURIRef =
+        aSynExtURIRef = 
             aSynExtURIRef.replaceAt(0, p - pBegin,
                 rtl::OUString::createFromAscii(pPrefix->m_pTranslatedPrefix));
     }
@@ -2067,7 +2067,7 @@ bool INetURLObject::convertExtToInt(rtl::OUString const & rTheExtURIRef,
     bool bConvert = pPrefix && pPrefix->m_eKind == PrefixInfo::EXTERNAL;
     if (bConvert)
     {
-        aSynIntURIRef =
+        aSynIntURIRef = 
             aSynIntURIRef.replaceAt(0, p - pBegin,
                 rtl::OUString::createFromAscii(pPrefix->m_pTranslatedPrefix));
     }
@@ -2247,7 +2247,7 @@ bool INetURLObject::setUser(rtl::OUString const & rTheUser,
                             rtl_TextEncoding eCharset)
 {
     if (
-         !getSchemeInfo().m_bUser ||
+         !getSchemeInfo().m_bUser || 
          (m_eScheme == INET_PROT_IMAP && rTheUser.getLength() == 0)
        )
     {
@@ -2299,7 +2299,7 @@ bool INetURLObject::clearPassword()
         return false;
     if (m_aAuth.isPresent())
     {
-        lcl_Erase(m_aAbsURIRef, m_aAuth.getBegin() - 1,
+        lcl_Erase(m_aAbsURIRef, m_aAuth.getBegin() - 1, 
             m_aAuth.getLength() + 1);
         sal_Int32 nDelta = m_aAuth.clear() - 1;
         m_aHost += nDelta;
@@ -2312,7 +2312,7 @@ bool INetURLObject::clearPassword()
 }
 
 //============================================================================
-bool INetURLObject::setPassword(rtl::OUString const & rThePassword,
+bool INetURLObject::setPassword(rtl::OUString const & rThePassword, 
                                 bool bOctets, EncodeMechanism eMechanism,
                                 rtl_TextEncoding eCharset)
 {
@@ -2390,7 +2390,7 @@ bool INetURLObject::parseHost(
                     aTheCanonic.append(sal_Unicode('['));
                     eState = STATE_IP6;
                 }
-                else if (INetMIME::isAlpha(*p))
+                else if (INetMIME::isAlpha(*p) || *p == '_')
                     eState = STATE_TOPLABEL;
                 else if (INetMIME::isDigit(*p))
                 {
@@ -2408,19 +2408,19 @@ bool INetURLObject::parseHost(
                     eState = STATE_LABEL_DOT;
                 else if (*p == '-')
                     eState = STATE_LABEL_HYPHEN;
-                else if (!INetMIME::isAlphanumeric(*p))
+                else if (!INetMIME::isAlphanumeric(*p) && *p != '_')
                     goto done;
                 break;
 
             case STATE_LABEL_HYPHEN:
-                if (INetMIME::isAlphanumeric(*p))
+                if (INetMIME::isAlphanumeric(*p) || *p == '_')
                     eState = STATE_LABEL;
                 else if (*p != '-')
                     goto done;
                 break;
 
             case STATE_LABEL_DOT:
-                if (INetMIME::isAlpha(*p))
+                if (INetMIME::isAlpha(*p) || *p == '_')
                     eState = STATE_TOPLABEL;
                 else if (INetMIME::isDigit(*p))
                     eState = STATE_LABEL;
@@ -2433,19 +2433,19 @@ bool INetURLObject::parseHost(
                     eState = STATE_TOPLABEL_DOT;
                 else if (*p == '-')
                     eState = STATE_TOPLABEL_HYPHEN;
-                else if (!INetMIME::isAlphanumeric(*p))
+                else if (!INetMIME::isAlphanumeric(*p) && *p != '_')
                     goto done;
                 break;
 
             case STATE_TOPLABEL_HYPHEN:
-                if (INetMIME::isAlphanumeric(*p))
+                if (INetMIME::isAlphanumeric(*p) || *p == '_')
                     eState = STATE_TOPLABEL;
                 else if (*p != '-')
                     goto done;
                 break;
 
             case STATE_TOPLABEL_DOT:
-                if (INetMIME::isAlpha(*p))
+                if (INetMIME::isAlpha(*p) || *p == '_')
                     eState = STATE_TOPLABEL;
                 else if (INetMIME::isDigit(*p))
                     eState = STATE_LABEL;
@@ -2467,7 +2467,7 @@ bool INetURLObject::parseHost(
                         eState = STATE_LABEL_DOT;
                 else if (*p == '-')
                     eState = STATE_LABEL_HYPHEN;
-                else if (INetMIME::isAlpha(*p))
+                else if (INetMIME::isAlpha(*p) || *p == '_')
                     eState = STATE_LABEL;
                 else if (INetMIME::isDigit(*p))
                     if (nDigits < 3)
@@ -2482,7 +2482,7 @@ bool INetURLObject::parseHost(
                 break;
 
             case STATE_IP4_DOT:
-                if (INetMIME::isAlpha(*p))
+                if (INetMIME::isAlpha(*p) || *p == '_')
                     eState = STATE_TOPLABEL;
                 else if (INetMIME::isDigit(*p))
                 {
@@ -3439,7 +3439,7 @@ bool INetURLObject::checkHierarchical() const {
 }
 
 //============================================================================
-bool INetURLObject::appendSegment(rtl::OUString const & rTheSegment,
+bool INetURLObject::appendSegment(rtl::OUString const & rTheSegment, 
                                   bool bOctets, EncodeMechanism eMechanism,
                                   rtl_TextEncoding eCharset)
 {
@@ -3578,7 +3578,7 @@ bool INetURLObject::insertName(rtl::OUString const & rTheName, bool bOctets,
     }
     aNewPath.append(pSuffixBegin, pPathEnd - pSuffixBegin);
 
-    return setPath(aNewPath.makeStringAndClear(), false, NOT_CANONIC,
+    return setPath(aNewPath.makeStringAndClear(), false, NOT_CANONIC, 
         RTL_TEXTENCODING_UTF8);
 }
 
@@ -3589,7 +3589,7 @@ bool INetURLObject::clearQuery()
         return false;
     if (m_aQuery.isPresent())
     {
-        lcl_Erase(m_aAbsURIRef, m_aQuery.getBegin() - 1,
+        lcl_Erase(m_aAbsURIRef, m_aQuery.getBegin() - 1, 
             m_aQuery.getLength() + 1);
         m_aFragment += m_aQuery.clear() - 1;
     }
@@ -3633,7 +3633,7 @@ bool INetURLObject::clearFragment()
 }
 
 //============================================================================
-bool INetURLObject::setFragment(rtl::OUString const & rTheFragment,
+bool INetURLObject::setFragment(rtl::OUString const & rTheFragment, 
                                 bool bOctets, EncodeMechanism eMechanism,
                                 rtl_TextEncoding eCharset)
 {
@@ -3775,7 +3775,7 @@ rtl::OUString INetURLObject::decode(sal_Unicode const * pBegin,
 
             case ESCAPE_UTF32:
                 if (
-                     INetMIME::isUSASCII(nUTF32) &&
+                     INetMIME::isUSASCII(nUTF32) && 
                      (
                        eMechanism == DECODE_TO_IURI ||
                        (
@@ -4215,7 +4215,7 @@ bool INetURLObject::ConcatData(INetProtocol eTheScheme,
                 setInvalid();
                 return false;
             }
-            m_aHost.set(m_aAbsURIRef, aSynHost.makeStringAndClear(),
+            m_aHost.set(m_aAbsURIRef, aSynHost.makeStringAndClear(), 
                 m_aAbsURIRef.getLength());
             if (nThePort != 0)
             {
@@ -4249,7 +4249,7 @@ bool INetURLObject::ConcatData(INetProtocol eTheScheme,
         setInvalid();
         return false;
     }
-    m_aPath.set(m_aAbsURIRef, aSynPath.makeStringAndClear(),
+    m_aPath.set(m_aAbsURIRef, aSynPath.makeStringAndClear(), 
         m_aAbsURIRef.getLength());
     return true;
 }
@@ -4339,12 +4339,12 @@ rtl::OUString INetURLObject::GetHostPort(DecodeMechanism eMechanism,
     // PROT_VND_SUN_STAR_PKG misuse m_aHost:
     if (!getSchemeInfo().m_bHost)
         return rtl::OUString();
-    rtl::OUStringBuffer aHostPort(decode(m_aHost, getEscapePrefix(),
+    rtl::OUStringBuffer aHostPort(decode(m_aHost, getEscapePrefix(), 
         eMechanism, eCharset));
     if (m_aPort.isPresent())
     {
         aHostPort.append(sal_Unicode(':'));
-        aHostPort.append(decode(m_aPort, getEscapePrefix(),
+        aHostPort.append(decode(m_aPort, getEscapePrefix(), 
             eMechanism, eCharset));
     }
     return aHostPort.makeStringAndClear();
@@ -4452,7 +4452,7 @@ bool INetURLObject::removeSegment(sal_Int32 nIndex, bool bIgnoreFinalSlash)
         aNewPath.append(sal_Unicode('/'));
     }
 
-    return setPath(aNewPath.makeStringAndClear(), false, NOT_CANONIC,
+    return setPath(aNewPath.makeStringAndClear(), false, NOT_CANONIC, 
         RTL_TEXTENCODING_UTF8);
 }
 
@@ -4507,7 +4507,7 @@ bool INetURLObject::setName(rtl::OUString const & rTheName, sal_Int32 nIndex,
         eMechanism, eCharset, true));
     aNewPath.append(p, pPathEnd - p);
 
-    return setPath(aNewPath.makeStringAndClear(), false, NOT_CANONIC,
+    return setPath(aNewPath.makeStringAndClear(), false, NOT_CANONIC, 
         RTL_TEXTENCODING_UTF8);
 }
 
@@ -4591,7 +4591,7 @@ bool INetURLObject::setBase(rtl::OUString const & rTheBase, sal_Int32 nIndex,
         eMechanism, eCharset, true));
     aNewPath.append(pExtension, pPathEnd - pExtension);
 
-    return setPath(aNewPath.makeStringAndClear(), false, NOT_CANONIC,
+    return setPath(aNewPath.makeStringAndClear(), false, NOT_CANONIC, 
         RTL_TEXTENCODING_UTF8);
 }
 
@@ -4657,7 +4657,7 @@ bool INetURLObject::setExtension(rtl::OUString const & rTheExtension,
         getEscapePrefix(), eMechanism, eCharset, true));
     aNewPath.append(p, pPathEnd - p);
 
-    return setPath(aNewPath.makeStringAndClear(), false, NOT_CANONIC,
+    return setPath(aNewPath.makeStringAndClear(), false, NOT_CANONIC, 
         RTL_TEXTENCODING_UTF8);
 }
 
@@ -4689,7 +4689,7 @@ bool INetURLObject::removeExtension(sal_Int32 nIndex, bool bIgnoreFinalSlash)
     aNewPath.append(pPathBegin, pExtension - pPathBegin);
     aNewPath.append(p, pPathEnd - p);
 
-    return setPath(aNewPath.makeStringAndClear(), false, NOT_CANONIC,
+    return setPath(aNewPath.makeStringAndClear(), false, NOT_CANONIC, 
         RTL_TEXTENCODING_UTF8);
 }
 
@@ -4721,7 +4721,7 @@ bool INetURLObject::setFinalSlash()
     aNewPath.append(pPathBegin, pPathEnd - pPathBegin);
     aNewPath.append(sal_Unicode('/'));
 
-    return setPath(aNewPath.makeStringAndClear(), false, NOT_CANONIC,
+    return setPath(aNewPath.makeStringAndClear(), false, NOT_CANONIC, 
         RTL_TEXTENCODING_UTF8);
 }
 
@@ -4762,7 +4762,7 @@ rtl::OUString INetURLObject::createFragment(rtl::OUString const & rText)
 }
 
 //============================================================================
-bool INetURLObject::setFSysPath(rtl::OUString const & rFSysPath,
+bool INetURLObject::setFSysPath(rtl::OUString const & rFSysPath, 
     FSysStyle eStyle)
 {
     sal_Unicode const * pFSysBegin = rFSysPath.getStr();
@@ -4948,7 +4948,7 @@ bool INetURLObject::setFSysPath(rtl::OUString const & rFSysPath,
             break;
     }
 
-    INetURLObject aTemp(aSynAbsURIRef.makeStringAndClear(), WAS_ENCODED,
+    INetURLObject aTemp(aSynAbsURIRef.makeStringAndClear(), WAS_ENCODED, 
         RTL_TEXTENCODING_UTF8);
     if (aTemp.HasError())
         return false;
@@ -5372,7 +5372,7 @@ sal_uInt32 INetURLObject::scanDomain(sal_Unicode const *& rBegin,
         switch (eState)
         {
             case STATE_DOT:
-                if (p != pEnd && INetMIME::isAlphanumeric(*p))
+                if (p != pEnd && (INetMIME::isAlphanumeric(*p) || *p == '_'))
                 {
                     ++nLabels;
                     eState = STATE_LABEL;
@@ -5386,7 +5386,7 @@ sal_uInt32 INetURLObject::scanDomain(sal_Unicode const *& rBegin,
             case STATE_LABEL:
                 if (p != pEnd)
                 {
-                    if (INetMIME::isAlphanumeric(*p))
+                    if (INetMIME::isAlphanumeric(*p) || *p == '_')
                         break;
                     else if (*p == '.')
                     {
@@ -5406,7 +5406,7 @@ sal_uInt32 INetURLObject::scanDomain(sal_Unicode const *& rBegin,
             case STATE_HYPHEN:
                 if (p != pEnd)
                 {
-                    if (INetMIME::isAlphanumeric(*p))
+                    if (INetMIME::isAlphanumeric(*p) || *p == '_')
                     {
                         eState = STATE_LABEL;
                         break;
@@ -5561,7 +5561,7 @@ rtl::OUString INetURLObject::CutExtension(DecodeMechanism eMechanism,
 {
     rtl::OUString aTheExtension(getExtension(LAST_SEGMENT, false, eMechanism,
                                          eCharset));
-    return removeExtension(LAST_SEGMENT, false)
+    return removeExtension(LAST_SEGMENT, false) 
         ? aTheExtension : rtl::OUString();
 }
 
diff --git a/tools/source/fsys/wldcrd.cxx b/tools/source/fsys/wldcrd.cxx
index 293d16877498..ea8190b5c388 100644
--- a/tools/source/fsys/wldcrd.cxx
+++ b/tools/source/fsys/wldcrd.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
@@ -121,7 +121,7 @@ BOOL WildCard::Matches( const String& rString ) const
 {
     ByteString aTmpWild = aWildString;
     ByteString aString(rString, osl_getThreadTextEncoding());
-
+    
     USHORT  nSepPos;
 
     if ( cSepSymbol != '\0' )
diff --git a/tools/source/fsys/wntmsc.cxx b/tools/source/fsys/wntmsc.cxx
index a8cf1c1eecec..0c08568791e1 100644
--- a/tools/source/fsys/wntmsc.cxx
+++ b/tools/source/fsys/wntmsc.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
@@ -527,21 +527,21 @@ void FileStat::ImpInit( void* p )
     FILETIME aLocTime;
 
     // use the last write date / time when the creation date / time isn't set
-    if ( ( pDirEnt->ftCreationTime.dwLowDateTime == 0 ) &&
+    if ( ( pDirEnt->ftCreationTime.dwLowDateTime == 0 ) && 
          ( pDirEnt->ftCreationTime.dwHighDateTime == 0 ) )
     {
         pDirEnt->ftCreationTime.dwLowDateTime = pDirEnt->ftLastWriteTime.dwLowDateTime;
         pDirEnt->ftCreationTime.dwHighDateTime = pDirEnt->ftLastWriteTime.dwHighDateTime;
     }
-
+    
     // use the last write date / time when the last accessed date / time isn't set
-    if ( ( pDirEnt->ftLastAccessTime.dwLowDateTime == 0 ) &&
+    if ( ( pDirEnt->ftLastAccessTime.dwLowDateTime == 0 ) && 
          ( pDirEnt->ftLastAccessTime.dwHighDateTime == 0 ) )
     {
         pDirEnt->ftLastAccessTime.dwLowDateTime = pDirEnt->ftLastWriteTime.dwLowDateTime;
         pDirEnt->ftLastAccessTime.dwHighDateTime = pDirEnt->ftLastWriteTime.dwHighDateTime;
     }
-
+    
     FileTimeToLocalFileTime( &pDirEnt->ftCreationTime, &aLocTime );
     FileTimeToSystemTime( &aLocTime, &aSysTime );
     aDateCreated  = Date( aSysTime.wDay, aSysTime.wMonth, aSysTime.wYear );
diff --git a/tools/source/fsys/wntmsc.hxx b/tools/source/fsys/wntmsc.hxx
index a6202cc71cc6..7fac28b56b09 100644
--- a/tools/source/fsys/wntmsc.hxx
+++ b/tools/source/fsys/wntmsc.hxx
@@ -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
@@ -84,7 +84,7 @@ typedef struct
 #define PATHDELIMITER   ";"
 #define DEFSTYLE        FSYS_STYLE_NTFS
 #define MKDIR( p )      mkdir( p )
-#define CMP_LOWER(s)    ( ByteString(s).ToLowerAscii() )
+#define CMP_LOWER(s) 	( ByteString(s).ToLowerAscii() )
 
 #define START_DRV 'a'
 
diff --git a/tools/source/generic/b3dtrans.cxx b/tools/source/generic/b3dtrans.cxx
index 9ed887457035..f3c29555f7bb 100644
--- a/tools/source/generic/b3dtrans.cxx
+++ b/tools/source/generic/b3dtrans.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
@@ -324,7 +324,7 @@ void B3dTransformationSet::CalcViewport()
                 {
                     // X vergroessern
                     fFactor = 1.0 / fActRatio;
-                    fRight  *= fFactor;
+                    fRight	*= fFactor;
                     fLeft *= fFactor;
                 }
                 else
@@ -350,7 +350,7 @@ void B3dTransformationSet::CalcViewport()
                 {
                     // X verkleinern
                     fFactor = 1.0 / fActRatio;
-                    fRight  *= fFactor;
+                    fRight	*= fFactor;
                     fLeft *= fFactor;
                 }
                 break;
@@ -798,7 +798,7 @@ const basegfx::B2DPoint B3dTransformationSet::TransTextureCoor(const basegfx::B2
 \************************************************************************/
 
 B3dViewport::B3dViewport()
-:   B3dTransformationSet(),
+:	B3dTransformationSet(),
     aVRP(0, 0, 0),
     aVPN(0, 0, 1),
     aVUV(0, 1, 0)
@@ -853,7 +853,7 @@ void B3dViewport::CalcOrientation()
 B3dCamera::B3dCamera(
     const basegfx::B3DPoint& rPos, const basegfx::B3DVector& rLkAt,
     double fFocLen, double fBnkAng, sal_Bool bUseFocLen)
-:   B3dViewport(),
+:	B3dViewport(),
     aPosition(rPos),
     aCorrectedPosition(rPos),
     aLookAt(rLkAt),
diff --git a/tools/source/generic/bigint.cxx b/tools/source/generic/bigint.cxx
index 7b10f31d733f..51dc70d242d6 100644
--- a/tools/source/generic/bigint.cxx
+++ b/tools/source/generic/bigint.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
diff --git a/tools/source/generic/color.cxx b/tools/source/generic/color.cxx
index 37e9dedf9259..07d7e87aaa82 100644
--- a/tools/source/generic/color.cxx
+++ b/tools/source/generic/color.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
@@ -63,9 +63,9 @@ Color::Color( const ResId& rResId )
         pResMgr->Increment( sizeof( RSHEADER_TYPE ) );
 
         // Daten laden
-        USHORT nRed     = pResMgr->ReadShort();
-        USHORT nGreen   = pResMgr->ReadShort();
-        USHORT nBlue    = pResMgr->ReadShort();
+        USHORT nRed		= pResMgr->ReadShort();
+        USHORT nGreen	= pResMgr->ReadShort();
+        USHORT nBlue	= pResMgr->ReadShort();
         // one more historical ULONG
         pResMgr->ReadLong();
 
@@ -79,8 +79,8 @@ Color::Color( const ResId& rResId )
 }
 UINT8 Color::GetColorError( const Color& rCompareColor ) const
 {
-    const long nErrAbs = labs( (long) rCompareColor.GetRed() - GetRed() ) +
-                         labs( (long) rCompareColor.GetGreen() - GetGreen() ) +
+    const long nErrAbs = labs( (long) rCompareColor.GetRed() - GetRed() ) + 
+                         labs( (long) rCompareColor.GetGreen() - GetGreen() ) + 
                          labs( (long) rCompareColor.GetBlue() - GetBlue() );
 
     return (UINT8) _FRound( nErrAbs * 0.3333333333 );
@@ -147,14 +147,14 @@ void Color::Invert()
 
 BOOL Color::IsDark() const
 {
-    return GetLuminance() <= 38;
+    return GetLuminance() <= 38; 
 }
 
 // -----------------------------------------------------------------------
 
 BOOL Color::IsBright() const
 {
-    return GetLuminance() >= 245;
+    return GetLuminance() >= 245; 
 }
 
 // -----------------------------------------------------------------------
@@ -249,12 +249,12 @@ ColorData Color::HSBtoRGB( USHORT nHue, USHORT nSat, USHORT nBri )
 
         switch( n )
         {
-            case 0: cR = nB;    cG = c;     cB = a;     break;
-            case 1: cR = b;     cG = nB;    cB = a;     break;
-            case 2: cR = a;     cG = nB;    cB = c;     break;
-            case 3: cR = a;     cG = b;     cB = nB;    break;
-            case 4: cR = c;     cG = a;     cB = nB;    break;
-            case 5: cR = nB;    cG = a;     cB = b;     break;
+            case 0: cR = nB;	cG = c;		cB = a; 	break;
+            case 1: cR = b;		cG = nB;	cB = a; 	break;
+            case 2: cR = a;		cG = nB;	cB = c;		break;
+            case 3: cR = a;		cG = b; 	cB = nB;	break;
+            case 4: cR = c;		cG = a; 	cB = nB;	break;
+            case 5: cR = nB; 	cG = a;		cB = b;		break;
         }
     }
 
@@ -287,13 +287,13 @@ SvStream& Color::Write( SvStream& rOStm, BOOL bNewFormat )
 
 // -----------------------------------------------------------------------
 
-#define COL_NAME_USER       ((USHORT)0x8000)
-#define COL_RED_1B          ((USHORT)0x0001)
-#define COL_RED_2B          ((USHORT)0x0002)
-#define COL_GREEN_1B        ((USHORT)0x0010)
-#define COL_GREEN_2B        ((USHORT)0x0020)
-#define COL_BLUE_1B         ((USHORT)0x0100)
-#define COL_BLUE_2B         ((USHORT)0x0200)
+#define COL_NAME_USER		((USHORT)0x8000)
+#define COL_RED_1B			((USHORT)0x0001)
+#define COL_RED_2B			((USHORT)0x0002)
+#define COL_GREEN_1B		((USHORT)0x0010)
+#define COL_GREEN_2B		((USHORT)0x0020)
+#define COL_BLUE_1B 		((USHORT)0x0100)
+#define COL_BLUE_2B 		((USHORT)0x0200)
 
 // -----------------------------------------------------------------------
 
@@ -301,10 +301,10 @@ SvStream& operator>>( SvStream& rIStream, Color& rColor )
 {
     DBG_ASSERTWARNING( rIStream.GetVersion(), "Color::>> - Solar-Version not set on rIStream" );
 
-    USHORT      nColorName;
-    USHORT      nRed;
-    USHORT      nGreen;
-    USHORT      nBlue;
+    USHORT		nColorName;
+    USHORT		nRed;
+    USHORT		nGreen;
+    USHORT		nBlue;
 
     rIStream >> nColorName;
 
@@ -312,12 +312,12 @@ SvStream& operator>>( SvStream& rIStream, Color& rColor )
     {
         if ( rIStream.GetCompressMode() == COMPRESSMODE_FULL )
         {
-            unsigned char   cAry[6];
-            USHORT          i = 0;
+            unsigned char	cAry[6];
+            USHORT			i = 0;
 
-            nRed    = 0;
-            nGreen  = 0;
-            nBlue   = 0;
+            nRed	= 0;
+            nGreen	= 0;
+            nBlue	= 0;
 
             if ( nColorName & COL_RED_2B )
                 i += 2;
@@ -391,37 +391,37 @@ SvStream& operator>>( SvStream& rIStream, Color& rColor )
     {
         static ColorData aColAry[] =
         {
-            COL_BLACK,                          // COL_BLACK
-            COL_BLUE,                           // COL_BLUE
-            COL_GREEN,                          // COL_GREEN
-            COL_CYAN,                           // COL_CYAN
-            COL_RED,                            // COL_RED
-            COL_MAGENTA,                        // COL_MAGENTA
-            COL_BROWN,                          // COL_BROWN
-            COL_GRAY,                           // COL_GRAY
-            COL_LIGHTGRAY,                      // COL_LIGHTGRAY
-            COL_LIGHTBLUE,                      // COL_LIGHTBLUE
-            COL_LIGHTGREEN,                     // COL_LIGHTGREEN
-            COL_LIGHTCYAN,                      // COL_LIGHTCYAN
-            COL_LIGHTRED,                       // COL_LIGHTRED
-            COL_LIGHTMAGENTA,                   // COL_LIGHTMAGENTA
-            COL_YELLOW,                         // COL_YELLOW
-            COL_WHITE,                          // COL_WHITE
-            COL_WHITE,                          // COL_MENUBAR
-            COL_BLACK,                          // COL_MENUBARTEXT
-            COL_WHITE,                          // COL_POPUPMENU
-            COL_BLACK,                          // COL_POPUPMENUTEXT
-            COL_BLACK,                          // COL_WINDOWTEXT
-            COL_WHITE,                          // COL_WINDOWWORKSPACE
-            COL_BLACK,                          // COL_HIGHLIGHT
-            COL_WHITE,                          // COL_HIGHLIGHTTEXT
-            COL_BLACK,                          // COL_3DTEXT
-            COL_LIGHTGRAY,                      // COL_3DFACE
-            COL_WHITE,                          // COL_3DLIGHT
-            COL_GRAY,                           // COL_3DSHADOW
-            COL_LIGHTGRAY,                      // COL_SCROLLBAR
-            COL_WHITE,                          // COL_FIELD
-            COL_BLACK                           // COL_FIELDTEXT
+            COL_BLACK,							// COL_BLACK
+            COL_BLUE,							// COL_BLUE
+            COL_GREEN,							// COL_GREEN
+            COL_CYAN,							// COL_CYAN
+            COL_RED,							// COL_RED
+            COL_MAGENTA,						// COL_MAGENTA
+            COL_BROWN,							// COL_BROWN
+            COL_GRAY,							// COL_GRAY
+            COL_LIGHTGRAY,						// COL_LIGHTGRAY
+            COL_LIGHTBLUE,						// COL_LIGHTBLUE
+            COL_LIGHTGREEN, 					// COL_LIGHTGREEN
+            COL_LIGHTCYAN,						// COL_LIGHTCYAN
+            COL_LIGHTRED,						// COL_LIGHTRED
+            COL_LIGHTMAGENTA,					// COL_LIGHTMAGENTA
+            COL_YELLOW, 						// COL_YELLOW
+            COL_WHITE,							// COL_WHITE
+            COL_WHITE,							// COL_MENUBAR
+            COL_BLACK,							// COL_MENUBARTEXT
+            COL_WHITE,							// COL_POPUPMENU
+            COL_BLACK,							// COL_POPUPMENUTEXT
+            COL_BLACK,							// COL_WINDOWTEXT
+            COL_WHITE,							// COL_WINDOWWORKSPACE
+            COL_BLACK,							// COL_HIGHLIGHT
+            COL_WHITE,							// COL_HIGHLIGHTTEXT
+            COL_BLACK,							// COL_3DTEXT
+            COL_LIGHTGRAY,						// COL_3DFACE
+            COL_WHITE,							// COL_3DLIGHT
+            COL_GRAY,							// COL_3DSHADOW
+            COL_LIGHTGRAY,						// COL_SCROLLBAR
+            COL_WHITE,							// COL_FIELD
+            COL_BLACK							// COL_FIELDTEXT
         };
 
         if ( nColorName < (sizeof( aColAry )/sizeof(ColorData)) )
@@ -439,18 +439,18 @@ SvStream& operator<<( SvStream& rOStream, const Color& rColor )
 {
     DBG_ASSERTWARNING( rOStream.GetVersion(), "Color::<< - Solar-Version not set on rOStream" );
 
-    USHORT nColorName   = COL_NAME_USER;
-    USHORT nRed         = rColor.GetRed();
-    USHORT nGreen       = rColor.GetGreen();
-    USHORT nBlue        = rColor.GetBlue();
-    nRed    = (nRed<<8) + nRed;
-    nGreen  = (nGreen<<8) + nGreen;
-    nBlue   = (nBlue<<8) + nBlue;
+    USHORT nColorName	= COL_NAME_USER;
+    USHORT nRed 		= rColor.GetRed();
+    USHORT nGreen		= rColor.GetGreen();
+    USHORT nBlue		= rColor.GetBlue();
+    nRed	= (nRed<<8) + nRed;
+    nGreen	= (nGreen<<8) + nGreen;
+    nBlue	= (nBlue<<8) + nBlue;
 
     if ( rOStream.GetCompressMode() == COMPRESSMODE_FULL )
     {
-        unsigned char   cAry[6];
-        USHORT          i = 0;
+        unsigned char	cAry[6];
+        USHORT			i = 0;
 
         if ( nRed & 0x00FF )
         {
diff --git a/tools/source/generic/config.cxx b/tools/source/generic/config.cxx
index 1a94c2b11198..c4ad3ae76ecd 100644
--- a/tools/source/generic/config.cxx
+++ b/tools/source/generic/config.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
@@ -45,7 +45,7 @@
 #include <tools/config.hxx>
 #include <osl/security.h>
 
-#define MAXBUFLEN   1024        // Fuer Buffer bei VOS-Funktionen
+#define MAXBUFLEN	1024		// Fuer Buffer bei VOS-Funktionen
 
 // -----------------
 // - ImplConfigData -
@@ -53,31 +53,31 @@
 
 struct ImplKeyData
 {
-    ImplKeyData*    mpNext;
-    ByteString      maKey;
-    ByteString      maValue;
-    BOOL            mbIsComment;
+    ImplKeyData*	mpNext;
+    ByteString		maKey;
+    ByteString		maValue;
+    BOOL			mbIsComment;
 };
 
 struct ImplGroupData
 {
-    ImplGroupData*  mpNext;
-    ImplKeyData*    mpFirstKey;
-    ByteString      maGroupName;
-    USHORT          mnEmptyLines;
+    ImplGroupData*	mpNext;
+    ImplKeyData*	mpFirstKey;
+    ByteString		maGroupName;
+    USHORT			mnEmptyLines;
 };
 
 struct ImplConfigData
 {
-    ImplGroupData*  mpFirstGroup;
-    XubString       maFileName;
-    ULONG           mnDataUpdateId;
-    ULONG           mnTimeStamp;
-    LineEnd         meLineEnd;
-    USHORT          mnRefCount;
-    BOOL            mbModified;
-    BOOL            mbRead;
-    BOOL            mbIsUTF8BOM;
+    ImplGroupData*	mpFirstGroup;
+    XubString		maFileName;
+    ULONG			mnDataUpdateId;
+    ULONG			mnTimeStamp;
+    LineEnd 		meLineEnd;
+    USHORT			mnRefCount;
+    BOOL			mbModified;
+    BOOL			mbRead;
+    BOOL			mbIsUTF8BOM;
 };
 
 // =======================================================================
@@ -93,7 +93,7 @@ static ByteString& getEmptyByteString()
 static String toUncPath( const String& rPath )
 {
     ::rtl::OUString aFileURL;
-
+    
     // check if rFileName is already a URL; if not make it so
     if( rPath.CompareToAscii( "file://", 7 ) == COMPARE_EQUAL )
         aFileURL = rPath;
@@ -115,7 +115,7 @@ static ULONG ImplSysGetConfigTimeStamp( const XubString& rFileName )
     {
         nTimeStamp = aStatus.getModifyTime().Seconds;
     }
-
+    
     return nTimeStamp;
 }
 
@@ -124,7 +124,7 @@ static ULONG ImplSysGetConfigTimeStamp( const XubString& rFileName )
 static BYTE* ImplSysReadConfig( const XubString& rFileName,
                                 sal_uInt64& rRead, BOOL& rbRead, BOOL& rbIsUTF8BOM, ULONG& rTimeStamp )
 {
-    BYTE*           pBuf = NULL;
+    BYTE*			pBuf = NULL;
     ::osl::File aFile( rFileName );
 
     if( aFile.open( osl_File_OpenFlag_Read ) == ::osl::FileBase::E_None )
@@ -250,7 +250,7 @@ static String ImplMakeConfigName( const XubString* pFileName,
     ::rtl::OUString aName( aPathName );
     aName += ::rtl::OUString::createFromAscii( "/" );
     aName += aFileName;
-
+    
     return aName;
 }
 
@@ -286,11 +286,11 @@ static void ImplMakeConfigList( ImplConfigData* pData,
     xub_StrLen      nNameLen;
     xub_StrLen      nKeyLen;
     sal_uInt64 i;
-    const BYTE*     pLine;
-    ImplKeyData*    pPrevKey = NULL;
-    ImplKeyData*    pKey;
-    ImplGroupData*  pPrevGroup = NULL;
-    ImplGroupData*  pGroup = NULL;
+    const BYTE* 	pLine;
+    ImplKeyData*	pPrevKey = NULL;
+    ImplKeyData*	pKey;
+    ImplGroupData*	pPrevGroup = NULL;
+    ImplGroupData*	pGroup = NULL;
     i = 0;
     while ( i < nLen )
     {
@@ -323,17 +323,17 @@ static void ImplMakeConfigList( ImplConfigData* pData,
         // Zeile auswerten
         if ( *pLine == '[' )
         {
-            pGroup               = new ImplGroupData;
-            pGroup->mpNext       = NULL;
-            pGroup->mpFirstKey   = NULL;
+            pGroup				 = new ImplGroupData;
+            pGroup->mpNext		 = NULL;
+            pGroup->mpFirstKey	 = NULL;
             pGroup->mnEmptyLines = 0;
             if ( pPrevGroup )
                 pPrevGroup->mpNext = pGroup;
             else
                 pData->mpFirstGroup = pGroup;
-            pPrevGroup  = pGroup;
-            pPrevKey    = NULL;
-            pKey        = NULL;
+            pPrevGroup	= pGroup;
+            pPrevKey	= NULL;
+            pKey		= NULL;
 
             // Gruppennamen rausfiltern
             pLine++;
@@ -362,16 +362,16 @@ static void ImplMakeConfigList( ImplConfigData* pData,
                 // Default-Gruppe
                 if ( !pGroup )
                 {
-                    pGroup              = new ImplGroupData;
-                    pGroup->mpNext      = NULL;
-                    pGroup->mpFirstKey  = NULL;
+                    pGroup				= new ImplGroupData;
+                    pGroup->mpNext		= NULL;
+                    pGroup->mpFirstKey	= NULL;
                     pGroup->mnEmptyLines = 0;
                     if ( pPrevGroup )
                         pPrevGroup->mpNext = pGroup;
                     else
                         pData->mpFirstGroup = pGroup;
-                    pPrevGroup  = pGroup;
-                    pPrevKey    = NULL;
+                    pPrevGroup	= pGroup;
+                    pPrevKey	= NULL;
                 }
 
                 // Falls Leerzeile vorhanden, dann anhaengen
@@ -379,16 +379,16 @@ static void ImplMakeConfigList( ImplConfigData* pData,
                 {
                     while ( pGroup->mnEmptyLines )
                     {
-                        pKey                = new ImplKeyData;
-                        pKey->mbIsComment   = TRUE;
-                        pPrevKey->mpNext    = pKey;
-                        pPrevKey            = pKey;
+                        pKey				= new ImplKeyData;
+                        pKey->mbIsComment	= TRUE;
+                        pPrevKey->mpNext	= pKey;
+                        pPrevKey			= pKey;
                         pGroup->mnEmptyLines--;
                     }
                 }
 
                 // Neuen Key erzeugen
-                pKey        = new ImplKeyData;
+                pKey		= new ImplKeyData;
                 pKey->mpNext = NULL;
                 if ( pPrevKey )
                     pPrevKey->mpNext = pKey;
@@ -451,15 +451,15 @@ static void ImplMakeConfigList( ImplConfigData* pData,
 
 static BYTE* ImplGetConfigBuffer( const ImplConfigData* pData, ULONG& rLen )
 {
-    BYTE*           pWriteBuf;
-    BYTE*           pBuf;
-    BYTE            aLineEndBuf[2] = {0, 0};
-    ImplKeyData*    pKey;
-    ImplGroupData*  pGroup;
-    unsigned int    nBufLen;
-    USHORT          nValueLen;
-    USHORT          nKeyLen;
-    USHORT          nLineEndLen;
+    BYTE*			pWriteBuf;
+    BYTE*			pBuf;
+    BYTE			aLineEndBuf[2] = {0, 0};
+    ImplKeyData*	pKey;
+    ImplGroupData*	pGroup;
+    unsigned int	nBufLen;
+    USHORT			nValueLen;
+    USHORT			nKeyLen;
+    USHORT			nLineEndLen;
 
     if ( pData->meLineEnd == LINEEND_CR )
     {
@@ -604,11 +604,11 @@ static BYTE* ImplGetConfigBuffer( const ImplConfigData* pData, ULONG& rLen )
 
 static void ImplReadConfig( ImplConfigData* pData )
 {
-    ULONG           nTimeStamp = 0;
+    ULONG			nTimeStamp = 0;
     sal_uInt64 nRead = 0;
-    BOOL            bRead = FALSE;
-    BOOL                bIsUTF8BOM =FALSE;
-    BYTE*           pBuf = ImplSysReadConfig( pData->maFileName, nRead, bRead, bIsUTF8BOM, nTimeStamp );
+    BOOL			bRead = FALSE;
+    BOOL            	bIsUTF8BOM =FALSE;
+    BYTE*			pBuf = ImplSysReadConfig( pData->maFileName, nRead, bRead, bIsUTF8BOM, nTimeStamp );
 
     // Aus dem Buffer die Config-Verwaltungsliste aufbauen
     if ( pBuf )
@@ -639,8 +639,8 @@ static void ImplWriteConfig( ImplConfigData* pData )
 #endif
 
     // Aus der Config-Liste einen Buffer zusammenbauen
-    ULONG   nBufLen;
-    BYTE*   pBuf = ImplGetConfigBuffer( pData, nBufLen );
+    ULONG	nBufLen;
+    BYTE*	pBuf = ImplGetConfigBuffer( pData, nBufLen );
     if ( pBuf )
     {
         if ( ImplSysWriteConfig( pData->maFileName, pBuf, nBufLen, pData->mbIsUTF8BOM, pData->mnTimeStamp ) )
@@ -655,10 +655,10 @@ static void ImplWriteConfig( ImplConfigData* pData )
 
 static void ImplDeleteConfigData( ImplConfigData* pData )
 {
-    ImplKeyData*    pTempKey;
-    ImplKeyData*    pKey;
-    ImplGroupData*  pTempGroup;
-    ImplGroupData*  pGroup = pData->mpFirstGroup;
+    ImplKeyData*	pTempKey;
+    ImplKeyData*	pKey;
+    ImplGroupData*	pTempGroup;
+    ImplGroupData*	pGroup = pData->mpFirstGroup;
     while ( pGroup )
     {
         pTempGroup = pGroup->mpNext;
@@ -686,13 +686,13 @@ static ImplConfigData* ImplGetConfigData( const XubString& rFileName )
 {
     ImplConfigData* pData;
 
-    pData                   = new ImplConfigData;
-    pData->maFileName       = rFileName;
-    pData->mpFirstGroup     = NULL;
-    pData->mnDataUpdateId   = 0;
-    pData->meLineEnd        = LINEEND_CRLF;
-    pData->mnRefCount       = 0;
-    pData->mbRead           = FALSE;
+    pData					= new ImplConfigData;
+    pData->maFileName		= rFileName;
+    pData->mpFirstGroup 	= NULL;
+    pData->mnDataUpdateId	= 0;
+    pData->meLineEnd		= LINEEND_CRLF;
+    pData->mnRefCount		= 0;
+    pData->mbRead			= FALSE;
     pData->mbIsUTF8BOM      = FALSE;
     ImplReadConfig( pData );
 
@@ -743,9 +743,9 @@ ImplGroupData* Config::ImplGetGroup() const
         // Falls Gruppe noch nicht existiert, dann dazufuegen
         if ( !pGroup )
         {
-            pGroup               = new ImplGroupData;
-            pGroup->mpNext       = NULL;
-            pGroup->mpFirstKey   = NULL;
+            pGroup				 = new ImplGroupData;
+            pGroup->mpNext		 = NULL;
+            pGroup->mpFirstKey	 = NULL;
             pGroup->mnEmptyLines = 1;
             if ( pPrevGroup )
                 pPrevGroup->mpNext = pGroup;
@@ -756,9 +756,9 @@ ImplGroupData* Config::ImplGetGroup() const
         // Gruppenname immer uebernehmen, da er auch in dieser Form
         // geschrieben werden soll. Ausserdem die Cache-Members der
         // Config-Klasse updaten
-        pGroup->maGroupName             = maGroupName;
+        pGroup->maGroupName 			= maGroupName;
         ((Config*)this)->mnDataUpdateId = mpData->mnDataUpdateId;
-        ((Config*)this)->mpActGroup     = pGroup;
+        ((Config*)this)->mpActGroup 	= pGroup;
     }
 
     return mpActGroup;
@@ -769,12 +769,12 @@ ImplGroupData* Config::ImplGetGroup() const
 Config::Config()
 {
     // Daten initialisieren und einlesen
-    maFileName      = ImplMakeConfigName( NULL, NULL );
-    mpData          = ImplGetConfigData( maFileName );
-    mpActGroup      = NULL;
-    mnDataUpdateId  = 0;
-    mnLockCount     = 1;
-    mbPersistence   = TRUE;
+    maFileName		= ImplMakeConfigName( NULL, NULL );
+    mpData			= ImplGetConfigData( maFileName );
+    mpActGroup		= NULL;
+    mnDataUpdateId	= 0;
+    mnLockCount 	= 1;
+    mbPersistence	= TRUE;
 
 #ifdef DBG_UTIL
     DBG_TRACE( "Config::Config()" );
@@ -786,12 +786,12 @@ Config::Config()
 Config::Config( const XubString& rFileName )
 {
     // Daten initialisieren und einlesen
-    maFileName      = toUncPath( rFileName );
-    mpData          = ImplGetConfigData( maFileName );
-    mpActGroup      = NULL;
-    mnDataUpdateId  = 0;
-    mnLockCount     = 1;
-    mbPersistence   = TRUE;
+    maFileName		= toUncPath( rFileName );
+    mpData			= ImplGetConfigData( maFileName );
+    mpActGroup		= NULL;
+    mnDataUpdateId	= 0;
+    mnLockCount 	= 1;
+    mbPersistence	= TRUE;
 
 #ifdef DBG_UTIL
     ByteString aTraceStr( "Config::Config( " );
@@ -841,8 +841,8 @@ void Config::SetGroup( const ByteString& rGroup )
     // Gruppe neu ermittelt werden
     if ( maGroupName != rGroup )
     {
-        maGroupName     = rGroup;
-        mnDataUpdateId  = mpData->mnDataUpdateId-1;
+        maGroupName 	= rGroup;
+        mnDataUpdateId	= mpData->mnDataUpdateId-1;
     }
 }
 
@@ -909,9 +909,9 @@ ByteString Config::GetGroupName( USHORT nGroup ) const
     if ( !mnLockCount )
         ImplUpdateConfig();
 
-    ImplGroupData*  pGroup = mpData->mpFirstGroup;
-    USHORT          nGroupCount = 0;
-    ByteString      aGroupName;
+    ImplGroupData*	pGroup = mpData->mpFirstGroup;
+    USHORT			nGroupCount = 0;
+    ByteString		aGroupName;
     while ( pGroup )
     {
         if ( nGroup == nGroupCount )
@@ -935,8 +935,8 @@ USHORT Config::GetGroupCount() const
     if ( !mnLockCount )
         ImplUpdateConfig();
 
-    ImplGroupData*  pGroup = mpData->mpFirstGroup;
-    USHORT          nGroupCount = 0;
+    ImplGroupData*	pGroup = mpData->mpFirstGroup;
+    USHORT			nGroupCount = 0;
     while ( pGroup )
     {
         nGroupCount++;
@@ -954,8 +954,8 @@ BOOL Config::HasGroup( const ByteString& rGroup ) const
     if ( !mnLockCount )
         ImplUpdateConfig();
 
-    ImplGroupData*  pGroup = mpData->mpFirstGroup;
-    BOOL            bRet = FALSE;
+    ImplGroupData*	pGroup = mpData->mpFirstGroup;
+    BOOL			bRet = FALSE;
 
     while( pGroup )
     {
@@ -1064,9 +1064,9 @@ void Config::WriteKey( const ByteString& rKey, const ByteString& rStr )
         BOOL bNewValue;
         if ( !pKey )
         {
-            pKey              = new ImplKeyData;
-            pKey->mpNext      = NULL;
-            pKey->maKey       = rKey;
+            pKey			  = new ImplKeyData;
+            pKey->mpNext	  = NULL;
+            pKey->maKey 	  = rKey;
             pKey->mbIsComment = FALSE;
             if ( pPrevKey )
                 pPrevKey->mpNext = pKey;
diff --git a/tools/source/generic/fract.cxx b/tools/source/generic/fract.cxx
index 0b8231d620ce..bacacac29aa6 100644
--- a/tools/source/generic/fract.cxx
+++ b/tools/source/generic/fract.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
@@ -144,7 +144,7 @@ Fraction::Fraction( long nN1, long nN2, long nD1, long nD2 )
     if( nN2 < 0 ) { i = -i; nN2 = -nN2; }
     if( nD1 < 0 ) { i = -i; nD1 = -nD1; }
     if( nD2 < 0 ) { i = -i; nD2 = -nD2; }
-
+    
     n = GetGGT( nN1, nD1 ); if( n > 1 ) { nN1 /= n; nD1 /= n; }
     n = GetGGT( nN1, nD2 ); if( n > 1 ) { nN1 /= n; nD2 /= n; }
     n = GetGGT( nN2, nD1 ); if( n > 1 ) { nN2 /= n; nD1 /= n; }
@@ -305,7 +305,7 @@ Fraction& Fraction::operator += ( const Fraction& rVal )
 
     BigInt nD( nDenominator );
     nD *= BigInt( rVal.nDenominator );
-
+    
     Reduce( nN, nD );
 
     if ( nN.bIsBig || nD.bIsBig )
@@ -513,7 +513,7 @@ const char nbits_table[32] =
 static int impl_NumberOfBits( unsigned long nNum )
 {
     // http://en.wikipedia.org/wiki/De_Bruijn_sequence
-    //
+    // 
     // background paper: Using de Bruijn Sequences to Index a 1 in a
     // Computer Word (1998) Charles E. Leiserson,
     // Harald Prokop, Keith H. Randall
diff --git a/tools/source/generic/gen.cxx b/tools/source/generic/gen.cxx
index b0eb57f1ab73..cbc5d4405024 100644
--- a/tools/source/generic/gen.cxx
+++ b/tools/source/generic/gen.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
@@ -39,12 +39,12 @@ SvStream& operator>>( SvStream& rIStream, Pair& rPair )
 
     if ( rIStream.GetCompressMode() == COMPRESSMODE_FULL )
     {
-        unsigned char   cId;
-        unsigned char   cAry[8];
-        int             i;
-        int             i1;
-        int             i2;
-        UINT32          nNum;
+        unsigned char	cId;
+        unsigned char	cAry[8];
+        int 			i;
+        int 			i1;
+        int 			i2;
+        UINT32			nNum;
 
         rIStream >> cId;
         i1 = (cId & 0x70) >> 4;
@@ -91,9 +91,9 @@ SvStream& operator<<( SvStream& rOStream, const Pair& rPair )
 
     if ( rOStream.GetCompressMode() == COMPRESSMODE_FULL )
     {
-        unsigned char   cAry[9];
-        int             i = 1;
-        UINT32          nNum;
+        unsigned char	cAry[9];
+        int 			i = 1;
+        UINT32			nNum;
 
         cAry[0] = 0;
 
@@ -394,15 +394,15 @@ SvStream& operator>>( SvStream& rIStream, Rectangle& rRect )
 
     if ( rIStream.GetCompressMode() == COMPRESSMODE_FULL )
     {
-        unsigned char   cIdAry[2];
-        unsigned char   cAry[16];
-        int             i;
-        int             iLast;
-        int             i1;
-        int             i2;
-        int             i3;
-        int             i4;
-        UINT32          nNum;
+        unsigned char	cIdAry[2];
+        unsigned char	cAry[16];
+        int 			i;
+        int 			iLast;
+        int 			i1;
+        int 			i2;
+        int 			i3;
+        int 			i4;
+        UINT32			nNum;
 
         rIStream.Read( cIdAry, 2 );
         i1 = (cIdAry[0] & 0x70) >> 4;
@@ -479,9 +479,9 @@ SvStream& operator<<( SvStream& rOStream, const Rectangle& rRect )
 
     if ( rOStream.GetCompressMode() == COMPRESSMODE_FULL )
     {
-        unsigned char   cAry[18];
-        int             i = 2;
-        UINT32          nNum;
+        unsigned char	cAry[18];
+        int 			i = 2;
+        UINT32			nNum;
 
         cAry[0] = 0;
         cAry[1] = 0;
diff --git a/tools/source/generic/line.cxx b/tools/source/generic/line.cxx
index 0c2de98d843d..0b0d75ea618a 100644
--- a/tools/source/generic/line.cxx
+++ b/tools/source/generic/line.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
@@ -49,8 +49,8 @@ double Line::GetLength() const
 
 BOOL Line::Intersection( const Line& rLine, Point& rIntersection ) const
 {
-    double  fX, fY;
-    BOOL    bRet;
+    double	fX, fY;
+    BOOL	bRet;
 
     if( Intersection( rLine, fX, fY ) )
     {
@@ -216,9 +216,9 @@ double Line::GetDistance( const double& rPtX, const double& rPtY ) const
     {
         const double    fDistX = maEnd.X() - maStart.X();
         const double    fDistY = maEnd.Y() - maStart.Y();
-        const double    fACX = maStart.X() - rPtX;
-        const double    fACY = maStart.Y() - rPtY;
-        const double    fL2 = fDistX * fDistX + fDistY * fDistY;
+        const double	fACX = maStart.X() - rPtX;
+        const double	fACY = maStart.Y() - rPtY;
+        const double	fL2 = fDistX * fDistX + fDistY * fDistY;
         const double    fR = ( fACY * -fDistY - fACX * fDistX ) / fL2;
         const double    fS = ( fACY * fDistX - fACX * fDistY ) / fL2;
 
@@ -227,7 +227,7 @@ double Line::GetDistance( const double& rPtX, const double& rPtY ) const
             fDist = hypot( maStart.X() - rPtX, maStart.Y() - rPtY );
 
             if( fS < 0.0 )
-                fDist *= -1.0;
+                fDist *= -1.0; 
         }
         else if( fR <= 1.0 )
             fDist = fS * sqrt( fL2 );
@@ -236,7 +236,7 @@ double Line::GetDistance( const double& rPtX, const double& rPtY ) const
             fDist = hypot( maEnd.X() - rPtX, maEnd.Y() - rPtY );
 
             if( fS < 0.0 )
-                fDist *= -1.0;
+                fDist *= -1.0; 
         }
     }
     else
@@ -311,12 +311,12 @@ void Line::Enum( const Link& rEnumLink )
     {
         const long  nDX = labs( maEnd.X() - maStart.X() );
         const long  nDY = labs( maEnd.Y() - maStart.Y() );
-        const long  nStartX = maStart.X();
-        const long  nStartY = maStart.Y();
-        const long  nEndX = maEnd.X();
-        const long  nEndY = maEnd.Y();
-        const long  nXInc = ( nStartX < nEndX ) ? 1L : -1L;
-        const long  nYInc = ( nStartY < nEndY ) ? 1L : -1L;
+        const long	nStartX = maStart.X();
+        const long	nStartY = maStart.Y();
+        const long	nEndX = maEnd.X();
+        const long	nEndY = maEnd.Y();	
+        const long	nXInc = ( nStartX < nEndX ) ? 1L : -1L;
+        const long	nYInc = ( nStartY < nEndY ) ? 1L : -1L;
 
         if( nDX >= nDY )
         {
diff --git a/tools/source/generic/link.cxx b/tools/source/generic/link.cxx
index 928251306901..349b2169460b 100644
--- a/tools/source/generic/link.cxx
+++ b/tools/source/generic/link.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
diff --git a/tools/source/generic/poly.cxx b/tools/source/generic/poly.cxx
index 2290cfdbe7c2..9cdf591d15b4 100644
--- a/tools/source/generic/poly.cxx
+++ b/tools/source/generic/poly.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
@@ -62,14 +62,14 @@ DBG_NAME( Polygon )
 
 // -----------------------------------------------------------------------
 
-#define EDGE_LEFT       1
-#define EDGE_TOP        2
-#define EDGE_RIGHT      4
-#define EDGE_BOTTOM     8
-#define EDGE_HORZ       (EDGE_RIGHT | EDGE_LEFT)
-#define EDGE_VERT       (EDGE_TOP | EDGE_BOTTOM)
-#define SMALL_DVALUE    0.0000001
-#define FSQRT2          1.4142135623730950488016887242097
+#define EDGE_LEFT		1
+#define EDGE_TOP		2
+#define EDGE_RIGHT		4
+#define EDGE_BOTTOM 	8
+#define EDGE_HORZ		(EDGE_RIGHT | EDGE_LEFT)
+#define EDGE_VERT		(EDGE_TOP | EDGE_BOTTOM)
+#define	SMALL_DVALUE	0.0000001
+#define FSQRT2			1.4142135623730950488016887242097
 
 // -----------------------------------------------------------------------
 
@@ -242,8 +242,13 @@ void ImplPolygon::ImplSetSize( USHORT nNewSize, BOOL bResize )
 
 void ImplPolygon::ImplSplit( USHORT nPos, USHORT nSpace, ImplPolygon* pInitPoly )
 {
-    const ULONG     nSpaceSize = nSpace * sizeof( Point );
-    const USHORT    nNewSize = mnPoints + nSpace;
+    const ULONG 	nSpaceSize = nSpace * sizeof( Point );
+
+    //Can't fit this in :-(, throw ?
+    if (mnPoints + nSpace > USHRT_MAX)
+        return;
+
+    const USHORT	nNewSize = mnPoints + nSpace;
 
     if( nPos >= mnPoints )
     {
@@ -262,8 +267,8 @@ void ImplPolygon::ImplSplit( USHORT nPos, USHORT nSpace, ImplPolygon* pInitPoly
     else
     {
         // PointArray ist in diesem Zweig immer vorhanden
-        const USHORT    nSecPos = nPos + nSpace;
-        const USHORT    nRest = mnPoints - nPos;
+        const USHORT	nSecPos = nPos + nSpace;
+        const USHORT	nRest = mnPoints - nPos;
 
         Point* pNewAry = (Point*) new char[ (ULONG) nNewSize * sizeof( Point ) ];
 
@@ -307,9 +312,9 @@ void ImplPolygon::ImplRemove( USHORT nPos, USHORT nCount )
 
     if( nRemoveCount )
     {
-        const USHORT    nNewSize = mnPoints - nRemoveCount;
-        const USHORT    nSecPos = nPos + nRemoveCount;
-        const USHORT    nRest = mnPoints - nSecPos;
+        const USHORT	nNewSize = mnPoints - nRemoveCount;
+        const USHORT	nSecPos = nPos + nRemoveCount;
+        const USHORT	nRest = mnPoints - nSecPos;
 
         Point* pNewAry = (Point*) new char[ (ULONG) nNewSize * sizeof( Point ) ];
 
@@ -441,7 +446,7 @@ Polygon::Polygon( const Rectangle& rRect, ULONG nHorzRound, ULONG nVertRound )
     else
     {
         Rectangle aRect( rRect );
-        aRect.Justify();            // SJ: i9140
+        aRect.Justify();			// SJ: i9140
 
         nHorzRound = Min( nHorzRound, (ULONG) labs( aRect.GetWidth() >> 1 ) );
         nVertRound = Min( nVertRound, (ULONG) labs( aRect.GetHeight() >> 1 ) );
@@ -457,17 +462,17 @@ Polygon::Polygon( const Rectangle& rRect, ULONG nHorzRound, ULONG nVertRound )
         }
         else
         {
-            const Point     aTL( aRect.Left() + nHorzRound, aRect.Top() + nVertRound );
-            const Point     aTR( aRect.Right() - nHorzRound, aRect.Top() + nVertRound );
-            const Point     aBR( aRect.Right() - nHorzRound, aRect.Bottom() - nVertRound );
-            const Point     aBL( aRect.Left() + nHorzRound, aRect.Bottom() - nVertRound );
-            Polygon*        pEllipsePoly = new Polygon( Point(), nHorzRound, nVertRound );
-            USHORT          i, nEnd, nSize4 = pEllipsePoly->GetSize() >> 2;
+            const Point		aTL( aRect.Left() + nHorzRound, aRect.Top() + nVertRound );
+            const Point		aTR( aRect.Right() - nHorzRound, aRect.Top() + nVertRound );
+            const Point		aBR( aRect.Right() - nHorzRound, aRect.Bottom() - nVertRound );
+            const Point		aBL( aRect.Left() + nHorzRound, aRect.Bottom() - nVertRound );
+            Polygon*		pEllipsePoly = new Polygon( Point(), nHorzRound, nVertRound );
+            USHORT			i, nEnd, nSize4 = pEllipsePoly->GetSize() >> 2;
 
             mpImplPolygon = new ImplPolygon( pEllipsePoly->GetSize() + 1 );
-
-            const Point*    pSrcAry = pEllipsePoly->GetConstPointAry();
-            Point*          pDstAry = mpImplPolygon->mpPointAry;
+            
+            const Point*	pSrcAry = pEllipsePoly->GetConstPointAry();
+            Point*			pDstAry = mpImplPolygon->mpPointAry;
 
             for( i = 0, nEnd = nSize4; i < nEnd; i++ )
                 ( pDstAry[ i ] = pSrcAry[ i ] ) += aTR;
@@ -523,16 +528,16 @@ Polygon::Polygon( const Point& rCenter, long nRadX, long nRadY, USHORT nPoints )
             long nY = FRound( -nRadY * sin( nAngle ) );
 
             pPt = &(mpImplPolygon->mpPointAry[i]);
-            pPt->X() =  nX + rCenter.X();
-            pPt->Y() =  nY + rCenter.Y();
+            pPt->X() =	nX + rCenter.X();
+            pPt->Y() =	nY + rCenter.Y();
             pPt = &(mpImplPolygon->mpPointAry[nPoints2-i-1]);
             pPt->X() = -nX + rCenter.X();
-            pPt->Y() =  nY + rCenter.Y();
+            pPt->Y() =	nY + rCenter.Y();
             pPt = &(mpImplPolygon->mpPointAry[i+nPoints2]);
             pPt->X() = -nX + rCenter.X();
             pPt->Y() = -nY + rCenter.Y();
             pPt = &(mpImplPolygon->mpPointAry[nPoints-i-1]);
-            pPt->X() =  nX + rCenter.X();
+            pPt->X() =	nX + rCenter.X();
             pPt->Y() = -nY + rCenter.Y();
         }
     }
@@ -547,15 +552,15 @@ Polygon::Polygon( const Rectangle& rBound,
 {
     DBG_CTOR( Polygon, NULL );
 
-    const long  nWidth = rBound.GetWidth();
-    const long  nHeight = rBound.GetHeight();
+    const long	nWidth = rBound.GetWidth();
+    const long	nHeight = rBound.GetHeight();
 
     if( ( nWidth > 1 ) && ( nHeight > 1 ) )
     {
         const Point aCenter( rBound.Center() );
-        const long  nRadX = aCenter.X() - rBound.Left();
-        const long  nRadY = aCenter.Y() - rBound.Top();
-        USHORT      nPoints;
+        const long	nRadX = aCenter.X() - rBound.Left();
+        const long	nRadY = aCenter.Y() - rBound.Top();
+        USHORT		nPoints;
 
         nPoints = (USHORT) ( F_PI * ( 1.5 * ( nRadX + nRadY ) -
                              sqrt( (double) labs( nRadX * nRadY ) ) ) );
@@ -566,16 +571,16 @@ Polygon::Polygon( const Rectangle& rBound,
             nPoints >>= 1;
 
         // Winkel berechnen
-        const double    fRadX = nRadX;
-        const double    fRadY = nRadY;
-        const double    fCenterX = aCenter.X();
-        const double    fCenterY = aCenter.Y();
-        double          fStart = ImplGetAngle( aCenter, rStart );
-        double          fEnd = ImplGetAngle( aCenter, rEnd );
-        double          fDiff = fEnd - fStart;
-        double          fStep;
-        USHORT          nStart;
-        USHORT          nEnd;
+        const double	fRadX = nRadX;
+        const double	fRadY = nRadY;
+        const double	fCenterX = aCenter.X();
+        const double	fCenterY = aCenter.Y();
+        double			fStart = ImplGetAngle( aCenter, rStart );
+        double			fEnd = ImplGetAngle( aCenter, rEnd );
+        double			fDiff = fEnd - fStart;
+        double			fStep;
+        USHORT			nStart;
+        USHORT			nEnd;
 
         if( fDiff < 0. )
             fDiff += F_2PI;
@@ -620,25 +625,25 @@ Polygon::Polygon( const Rectangle& rBound,
 
 // -----------------------------------------------------------------------
 
-Polygon::Polygon( const Point& rBezPt1, const Point& rCtrlPt1,
+Polygon::Polygon( const Point& rBezPt1, const Point& rCtrlPt1, 
                   const Point& rBezPt2, const Point& rCtrlPt2,
                   USHORT nPoints )
 {
     DBG_CTOR( Polygon, NULL );
-
+    
     nPoints = ( 0 == nPoints ) ? 25 : ( ( nPoints < 2 ) ? 2 : nPoints );
 
-    const double    fInc = 1.0 / ( nPoints - 1 );
-    double          fK_1 = 0.0, fK1_1 = 1.0;
-    double          fK_2, fK_3, fK1_2, fK1_3, fK12, fK21;
-    const double    fX0 = rBezPt1.X();
-    const double    fY0 = rBezPt1.Y();
-    const double    fX1 = 3.0 * rCtrlPt1.X();
-    const double    fY1 = 3.0 * rCtrlPt1.Y();
-    const double    fX2 = 3.0 * rCtrlPt2.X();;
-    const double    fY2 = 3.0 * rCtrlPt2.Y();;
-    const double    fX3 = rBezPt2.X();
-    const double    fY3 = rBezPt2.Y();
+    const double	fInc = 1.0 / ( nPoints - 1 );
+    double			fK_1 = 0.0, fK1_1 = 1.0;
+    double			fK_2, fK_3, fK1_2, fK1_3, fK12, fK21;
+    const double	fX0 = rBezPt1.X();
+    const double	fY0 = rBezPt1.Y();
+    const double	fX1 = 3.0 * rCtrlPt1.X();
+    const double	fY1 = 3.0 * rCtrlPt1.Y();
+    const double	fX2 = 3.0 * rCtrlPt2.X();;
+    const double	fY2 = 3.0 * rCtrlPt2.Y();;
+    const double	fX3 = rBezPt2.X();
+    const double	fY3 = rBezPt2.Y();
 
     mpImplPolygon = new ImplPolygon( nPoints );
 
@@ -820,7 +825,7 @@ BOOL Polygon::IsRect() const
 void Polygon::SetSize( USHORT nNewSize )
 {
     DBG_CHKTHIS( Polygon, NULL );
-
+    
     if( nNewSize != mpImplPolygon->mnPoints )
     {
         ImplMakeUnique();
@@ -884,18 +889,18 @@ void Polygon::Optimize( ULONG nOptimizeFlags, const PolyOptimizeData* pData )
     {
         if( nOptimizeFlags & POLY_OPTIMIZE_EDGES )
         {
-            const Rectangle aBound( GetBoundRect() );
-            const double    fArea = ( aBound.GetWidth() + aBound.GetHeight() ) * 0.5;
-            const USHORT    nPercent = pData ? pData->GetPercentValue() : 50;
+            const Rectangle	aBound( GetBoundRect() );
+            const double	fArea = ( aBound.GetWidth() + aBound.GetHeight() ) * 0.5;
+            const USHORT	nPercent = pData ? pData->GetPercentValue() : 50;
 
             Optimize( POLY_OPTIMIZE_NO_SAME );
             ImplReduceEdges( *this, fArea, nPercent );
         }
         else if( nOptimizeFlags & ( POLY_OPTIMIZE_REDUCE | POLY_OPTIMIZE_NO_SAME ) )
         {
-            Polygon         aNewPoly;
-            const Point&    rFirst = mpImplPolygon->mpPointAry[ 0 ];
-            ULONG           nReduce;
+            Polygon			aNewPoly;
+            const Point&	rFirst = mpImplPolygon->mpPointAry[ 0 ];
+            ULONG			nReduce;
 
             if( nOptimizeFlags & ( POLY_OPTIMIZE_REDUCE ) )
                 nReduce = pData ? pData->GetAbsValue() : 4UL;
@@ -934,13 +939,13 @@ void Polygon::Optimize( ULONG nOptimizeFlags, const PolyOptimizeData* pData )
 
         if( nSize > 1 )
         {
-            if( ( nOptimizeFlags & POLY_OPTIMIZE_CLOSE ) &&
+            if( ( nOptimizeFlags & POLY_OPTIMIZE_CLOSE ) && 
                 ( mpImplPolygon->mpPointAry[ 0 ] != mpImplPolygon->mpPointAry[ nSize - 1 ] ) )
             {
                 SetSize( mpImplPolygon->mnPoints + 1 );
                 mpImplPolygon->mpPointAry[ mpImplPolygon->mnPoints - 1 ] = mpImplPolygon->mpPointAry[ 0 ];
             }
-            else if( ( nOptimizeFlags & POLY_OPTIMIZE_OPEN ) &&
+            else if( ( nOptimizeFlags & POLY_OPTIMIZE_OPEN ) && 
                      ( mpImplPolygon->mpPointAry[ 0 ] == mpImplPolygon->mpPointAry[ nSize - 1 ] ) )
             {
                 const Point& rFirst = mpImplPolygon->mpPointAry[ 0 ];
@@ -956,8 +961,8 @@ void Polygon::Optimize( ULONG nOptimizeFlags, const PolyOptimizeData* pData )
 
 // =======================================================================
 
-/* Recursively subdivide cubic bezier curve via deCasteljau.
-
+/* Recursively subdivide cubic bezier curve via deCasteljau. 
+    
    @param rPointIter
    Output iterator, where the subdivided polylines are written to.
 
@@ -967,8 +972,8 @@ void Polygon::Optimize( ULONG nOptimizeFlags, const PolyOptimizeData* pData )
    @param P*
    Exactly four points, interpreted as support and control points of
    a cubic bezier curve. Must be in device coordinates, since stop
-   criterion is based on the following assumption: the device has a
-   finite resolution, it is thus sufficient to stop subdivision if the
+   criterion is based on the following assumption: the device has a 
+   finite resolution, it is thus sufficient to stop subdivision if the 
    curve does not deviate more than one pixel from a straight line.
 
 */
@@ -998,7 +1003,7 @@ static void ImplAdaptiveSubdivide( ::std::back_insert_iterator< ::std::vector< P
     const double fJ1y( P2y - P1y - 1.0/3.0*(P4y - P1y) );
     const double fJ2x( P3x - P1x - 2.0/3.0*(P4x - P1x) );
     const double fJ2y( P3y - P1y - 2.0/3.0*(P4y - P1y) );
-    const double distance2( ::std::max( fJ1x*fJ1x + fJ1y*fJ1y,
+    const double distance2( ::std::max( fJ1x*fJ1x + fJ1y*fJ1y, 
                                         fJ2x*fJ2x + fJ2y*fJ2y) );
 
     // stop if error measure does not improve anymore. This is a
@@ -1012,15 +1017,15 @@ static void ImplAdaptiveSubdivide( ::std::back_insert_iterator< ::std::vector< P
     {
         // deCasteljau bezier arc, split at t=0.5
         // Foley/vanDam, p. 508
-        const double L1x( P1x ),             L1y( P1y );
+        const double L1x( P1x ), 		   	 L1y( P1y );
         const double L2x( (P1x + P2x)*0.5 ), L2y( (P1y + P2y)*0.5 );
         const double Hx ( (P2x + P3x)*0.5 ), Hy ( (P2y + P3y)*0.5 );
         const double L3x( (L2x + Hx)*0.5 ),  L3y( (L2y + Hy)*0.5 );
-        const double R4x( P4x ),             R4y( P4y );
+        const double R4x( P4x ), 		   	 R4y( P4y );
         const double R3x( (P3x + P4x)*0.5 ), R3y( (P3y + P4y)*0.5 );
         const double R2x( (Hx + R3x)*0.5 ),  R2y( (Hy + R3y)*0.5 );
         const double R1x( (L3x + R2x)*0.5 ), R1y( (L3y + R2y)*0.5 );
-        const double L4x( R1x ),             L4y( R1y );
+        const double L4x( R1x ), 		     L4y( R1y );
 
         // subdivide further
         ++recursionDepth;
@@ -1055,7 +1060,7 @@ void Polygon::AdaptiveSubdivide( Polygon& rResult, const double d ) const
         for(i=0; i<nPts;)
         {
             if( ( i + 3 ) < nPts )
-            {
+            { 
                 BYTE P1( mpImplPolygon->mpFlagAry[ i ] );
                 BYTE P4( mpImplPolygon->mpFlagAry[ i + 3 ] );
 
@@ -1093,7 +1098,7 @@ void Polygon::GetIntersection( const PolyPolygon& rPolyPoly, PolyPolygon& rResul
 
 // -----------------------------------------------------------------------
 
-void Polygon::GetUnion( const PolyPolygon& rPolyPoly, PolyPolygon& rResult ) const
+void Polygon::GetUnion( const PolyPolygon& rPolyPoly, PolyPolygon& rResult ) const 
 {
     const PolyPolygon aTmp( *this );
     aTmp.GetUnion( rPolyPoly, rResult );
@@ -1119,14 +1124,14 @@ void Polygon::GetXOR( const PolyPolygon& rPolyPoly, PolyPolygon& rResult ) const
 
 void Polygon::ImplReduceEdges( Polygon& rPoly, const double& rArea, USHORT nPercent )
 {
-    const double    fBound = 2000.0 * ( 100 - nPercent ) * 0.01;
-    USHORT          nNumNoChange = 0, nNumRuns = 0;
+    const double	fBound = 2000.0 * ( 100 - nPercent ) * 0.01;
+    USHORT			nNumNoChange = 0, nNumRuns = 0;
 
-    while( nNumNoChange < 2 )
+    while( nNumNoChange < 2 ) 
     {
-        USHORT  nPntCnt = rPoly.GetSize(), nNewPos = 0;
-        Polygon aNewPoly( nPntCnt );
-        BOOL    bChangeInThisRun = FALSE;
+        USHORT	nPntCnt = rPoly.GetSize(), nNewPos = 0;
+        Polygon	aNewPoly( nPntCnt );
+        BOOL	bChangeInThisRun = FALSE;
 
         for( USHORT n = 0; n < nPntCnt; n++ )
         {
@@ -1134,29 +1139,29 @@ void Polygon::ImplReduceEdges( Polygon& rPoly, const double& rArea, USHORT nPerc
 
             if( ( n + nNumRuns ) % 2 )
             {
-                USHORT      nIndPrev = !n ? nPntCnt - 1 : n - 1;
-                USHORT      nIndPrevPrev = !nIndPrev ? nPntCnt - 1 : nIndPrev - 1;
-                USHORT      nIndNext = ( n == nPntCnt-1 ) ? 0 : n + 1;
-                USHORT      nIndNextNext = ( nIndNext == nPntCnt - 1 ) ? 0 : nIndNext + 1;
-                Vector2D    aVec1( rPoly[ nIndPrev ] ); aVec1 -= rPoly[ nIndPrevPrev ];
-                Vector2D    aVec2( rPoly[ n ] ); aVec2 -= rPoly[ nIndPrev ];
-                Vector2D    aVec3( rPoly[ nIndNext ] ); aVec3 -= rPoly[ n ];
-                Vector2D    aVec4( rPoly[ nIndNextNext ] ); aVec4 -= rPoly[ nIndNext ];
-                double      fDist1 = aVec1.GetLength(), fDist2 = aVec2.GetLength();
-                double      fDist3 = aVec3.GetLength(), fDist4 = aVec4.GetLength();
-                double      fTurnB = aVec2.Normalize().Scalar( aVec3.Normalize() );
+                USHORT		nIndPrev = !n ? nPntCnt - 1 : n - 1;
+                USHORT		nIndPrevPrev = !nIndPrev ? nPntCnt - 1 : nIndPrev - 1;
+                USHORT		nIndNext = ( n == nPntCnt-1 ) ? 0 : n + 1;
+                USHORT		nIndNextNext = ( nIndNext == nPntCnt - 1 ) ? 0 : nIndNext + 1;
+                Vector2D	aVec1( rPoly[ nIndPrev ] ); aVec1 -= rPoly[ nIndPrevPrev ];
+                Vector2D	aVec2( rPoly[ n ] ); aVec2 -= rPoly[ nIndPrev ];
+                Vector2D	aVec3( rPoly[ nIndNext ] ); aVec3 -= rPoly[ n ];
+                Vector2D	aVec4( rPoly[ nIndNextNext ] ); aVec4 -= rPoly[ nIndNext ];
+                double		fDist1 = aVec1.GetLength(), fDist2 = aVec2.GetLength(); 
+                double		fDist3 = aVec3.GetLength(), fDist4 = aVec4.GetLength();
+                double		fTurnB = aVec2.Normalize().Scalar( aVec3.Normalize() );
 
                 if( fabs( fTurnB ) < ( 1.0 + SMALL_DVALUE ) && fabs( fTurnB ) > ( 1.0 - SMALL_DVALUE ) )
                     bDeletePoint = TRUE;
                 else
                 {
-                    Vector2D    aVecB( rPoly[ nIndNext ] );
-                    double      fDistB = ( aVecB -= rPoly[ nIndPrev ] ).GetLength();
-                    double      fLenWithB = fDist2 + fDist3;
-                    double      fLenFact = ( fDistB != 0.0 ) ? fLenWithB / fDistB : 1.0;
-                    double      fTurnPrev = aVec1.Normalize().Scalar( aVec2 );
-                    double      fTurnNext = aVec3.Scalar( aVec4.Normalize() );
-                    double      fGradPrev, fGradB, fGradNext;
+                    Vector2D	aVecB( rPoly[ nIndNext ] );
+                    double		fDistB = ( aVecB -= rPoly[ nIndPrev ] ).GetLength();
+                    double		fLenWithB = fDist2 + fDist3;
+                    double		fLenFact = ( fDistB != 0.0 ) ? fLenWithB / fDistB : 1.0;
+                    double		fTurnPrev = aVec1.Normalize().Scalar( aVec2 );
+                    double		fTurnNext = aVec3.Scalar( aVec4.Normalize() );
+                    double		fGradPrev, fGradB, fGradNext;
 
                     if( fabs( fTurnPrev ) < ( 1.0 + SMALL_DVALUE ) && fabs( fTurnPrev ) > ( 1.0 - SMALL_DVALUE ) )
                         fGradPrev = 0.0;
@@ -1170,7 +1175,7 @@ void Polygon::ImplReduceEdges( Polygon& rPoly, const double& rArea, USHORT nPerc
                     else
                         fGradNext = acos( fTurnNext ) / ( aVec3.IsNegative( aVec4 ) ? -F_PI180 : F_PI180 );
 
-                    if( ( fGradPrev > 0.0 && fGradB < 0.0 && fGradNext > 0.0 ) ||
+                    if( ( fGradPrev > 0.0 && fGradB < 0.0 && fGradNext > 0.0 ) || 
                         ( fGradPrev < 0.0 && fGradB > 0.0 && fGradNext < 0.0 ) )
                     {
                         if( ( fLenFact < ( FSQRT2 + SMALL_DVALUE ) ) &&
@@ -1188,7 +1193,7 @@ void Polygon::ImplReduceEdges( Polygon& rPoly, const double& rArea, USHORT nPerc
                         else if( fRelLen > 1.0 )
                             fRelLen = 1.0;
 
-                        if( ( (UINT32) ( ( ( fLenFact - 1.0 ) * 1000000.0 ) + 0.5 ) < fBound ) &&
+                        if( ( (UINT32) ( ( ( fLenFact - 1.0 ) * 1000000.0 ) + 0.5 ) < fBound ) && 
                             ( fabs( fGradB ) <= ( fRelLen * fBound * 0.01 ) ) )
                         {
                             bDeletePoint = TRUE;
@@ -1309,8 +1314,8 @@ void Polygon::SlantX( long nYRef, double fSin, double fCos )
 
     for( USHORT i = 0, nCount = mpImplPolygon->mnPoints; i < nCount; i++ )
     {
-        Point&      rPnt = mpImplPolygon->mpPointAry[ i ];
-        const long  nDy = rPnt.Y() - nYRef;
+        Point&		rPnt = mpImplPolygon->mpPointAry[ i ];
+        const long	nDy = rPnt.Y() - nYRef;
 
         rPnt.X() += (long)( fSin * nDy );
         rPnt.Y() = nYRef + (long)( fCos * nDy );
@@ -1326,8 +1331,8 @@ void Polygon::SlantY( long nXRef, double fSin, double fCos )
 
     for( USHORT i = 0, nCount = mpImplPolygon->mnPoints; i < nCount; i++ )
     {
-        Point&      rPnt = mpImplPolygon->mpPointAry[ i ];
-        const long  nDx = rPnt.X() - nXRef;
+        Point&		rPnt = mpImplPolygon->mpPointAry[ i ];
+        const long	nDx = rPnt.X() - nXRef;
 
         rPnt.X() = nXRef + (long)( fCos * nDx );
         rPnt.Y() -= (long)( fSin * nDx );
@@ -1341,9 +1346,9 @@ void Polygon::Distort( const Rectangle& rRefRect, const Polygon& rDistortedRect
     DBG_CHKTHIS( Polygon, NULL );
     ImplMakeUnique();
 
-    long    Xr, Wr, X1, X2, X3, X4;
-    long    Yr, Hr, Y1, Y2, Y3, Y4;
-    double  fTx, fTy, fUx, fUy;
+    long	Xr, Wr, X1, X2, X3, X4;
+    long	Yr, Hr, Y1, Y2, Y3, Y4;
+    double	fTx, fTy, fUx, fUy;
 
     Xr = rRefRect.Left();
     Yr = rRefRect.Top();
@@ -1390,8 +1395,8 @@ public:
 class ImplPolygonPointFilter : public ImplPointFilter
 {
 public:
-    ImplPolygon*    mpPoly;     // Nicht loeschen, wird dem Polygon zugewiesen
-    USHORT          mnSize;
+    ImplPolygon*	mpPoly; 	// Nicht loeschen, wird dem Polygon zugewiesen
+    USHORT			mnSize;
 
                     ImplPolygonPointFilter( USHORT nDestSize ) :
                         mnSize( 0 )
@@ -1399,8 +1404,8 @@ public:
                         mpPoly = new ImplPolygon( nDestSize );
                     }
 
-    virtual void    LastPoint();
-    virtual void    Input( const Point& rPoint );
+    virtual void	LastPoint();
+    virtual void	Input( const Point& rPoint );
 };
 
 void ImplPolygonPointFilter::Input( const Point& rPoint )
@@ -1422,14 +1427,14 @@ void ImplPolygonPointFilter::LastPoint()
 
 class ImplEdgePointFilter : public ImplPointFilter
 {
-    Point               maFirstPoint;
-    Point               maLastPoint;
-    ImplPointFilter&    mrNextFilter;
-    const long          mnLow;
-    const long          mnHigh;
-    const int           mnEdge;
-    int                 mnLastOutside;
-    BOOL                mbFirst;
+    Point				maFirstPoint;
+    Point				maLastPoint;
+    ImplPointFilter&	mrNextFilter;
+    const long			mnLow;
+    const long			mnHigh;
+    const int			mnEdge;
+    int 				mnLastOutside;
+    BOOL				mbFirst;
 
 public:
                         ImplEdgePointFilter( int nEdge, long nLow, long nHigh,
@@ -1442,13 +1447,13 @@ public:
                         {
                         }
 
-    Point               EdgeSection( const Point& rPoint, int nEdge ) const;
-    int                 VisibleSide( const Point& rPoint ) const;
-    int                 IsPolygon() const
+    Point				EdgeSection( const Point& rPoint, int nEdge ) const;
+    int 				VisibleSide( const Point& rPoint ) const;
+    int 				IsPolygon() const
                             { return maFirstPoint == maLastPoint; }
 
-    virtual void        Input( const Point& rPoint );
-    virtual void        LastPoint();
+    virtual void		Input( const Point& rPoint );
+    virtual void		LastPoint();
 };
 
 inline int ImplEdgePointFilter::VisibleSide( const Point& rPoint ) const
@@ -1537,7 +1542,7 @@ void ImplEdgePointFilter::Input( const Point& rPoint )
     if ( mbFirst )
     {
         maFirstPoint = rPoint;
-        mbFirst      = FALSE;
+        mbFirst 	 = FALSE;
         if ( !nOutside )
             mrNextFilter.Input( rPoint );
     }
@@ -1578,14 +1583,14 @@ void ImplEdgePointFilter::LastPoint()
 void Polygon::Clip( const Rectangle& rRect, BOOL bPolygon )
 {
     // #105251# Justify rect befor edge filtering
-    Rectangle               aJustifiedRect( rRect );
+    Rectangle				aJustifiedRect( rRect );    
     aJustifiedRect.Justify();
 
-    USHORT                  nSourceSize = mpImplPolygon->mnPoints;
-    ImplPolygonPointFilter  aPolygon( nSourceSize );
-    ImplEdgePointFilter     aHorzFilter( EDGE_HORZ, aJustifiedRect.Left(), aJustifiedRect.Right(),
+    USHORT					nSourceSize = mpImplPolygon->mnPoints;
+    ImplPolygonPointFilter	aPolygon( nSourceSize );
+    ImplEdgePointFilter 	aHorzFilter( EDGE_HORZ, aJustifiedRect.Left(), aJustifiedRect.Right(),
                                          aPolygon );
-    ImplEdgePointFilter     aVertFilter( EDGE_VERT, aJustifiedRect.Top(), aJustifiedRect.Bottom(),
+    ImplEdgePointFilter 	aVertFilter( EDGE_VERT, aJustifiedRect.Top(), aJustifiedRect.Bottom(),
                                          aHorzFilter );
 
     for ( USHORT i = 0; i < nSourceSize; i++ )
@@ -1614,7 +1619,7 @@ Rectangle Polygon::GetBoundRect() const
     DBG_CHKTHIS( Polygon, NULL );
     // Removing the assert. Bezier curves have the attribute that each single
     // curve segment defined by four points can not exit the four-point polygon
-    // defined by that points. This allows to say that the curve segment can also
+    // defined by that points. This allows to say that the curve segment can also 
     // never leave the Range of it's defining points.
     // The result is that Polygon::GetBoundRect() may not create the minimal
     // BoundRect of the Polygon (to get that, use basegfx::B2DPolygon classes),
@@ -1623,11 +1628,11 @@ Rectangle Polygon::GetBoundRect() const
     //
     // DBG_ASSERT( !mpImplPolygon->mpFlagAry, "GetBoundRect could fail with beziers!" );
 
-    USHORT  nCount = mpImplPolygon->mnPoints;
+    USHORT	nCount = mpImplPolygon->mnPoints;
     if( ! nCount )
         return Rectangle();
 
-    long    nXMin, nXMax, nYMin, nYMax;
+    long	nXMin, nXMax, nYMin, nYMax;
 
     const Point* pPt = &(mpImplPolygon->mpPointAry[0]);
     nXMin = nXMax = pPt->X();
@@ -1636,7 +1641,7 @@ Rectangle Polygon::GetBoundRect() const
     for ( USHORT i = 0; i < nCount; i++ )
     {
         pPt = &(mpImplPolygon->mpPointAry[i]);
-
+    
         if ( pPt->X() < nXMin )
             nXMin = pPt->X();
         if ( pPt->X() > nXMax )
@@ -1694,15 +1699,15 @@ BOOL Polygon::IsInside( const Point& rPoint ) const
     DBG_ASSERT( !mpImplPolygon->mpFlagAry, "IsInside could fail with beziers!" );
 
     const Rectangle aBound( GetBoundRect() );
-    const Line      aLine( rPoint, Point( aBound.Right() + 100L, rPoint.Y() ) );
-    USHORT          nCount = mpImplPolygon->mnPoints;
-    USHORT          nPCounter = 0;
+    const Line		aLine( rPoint, Point( aBound.Right() + 100L, rPoint.Y() ) );
+    USHORT			nCount = mpImplPolygon->mnPoints;
+    USHORT			nPCounter = 0;
 
     if ( ( nCount > 2 ) && aBound.IsInside( rPoint ) )
     {
-        Point   aPt1( mpImplPolygon->mpPointAry[ 0 ] );
-        Point   aIntersection;
-        Point   aLastIntersection;
+        Point	aPt1( mpImplPolygon->mpPointAry[ 0 ] );
+        Point	aIntersection;
+        Point	aLastIntersection;
 
         while ( ( aPt1 == mpImplPolygon->mpPointAry[ nCount - 1 ] ) && ( nCount > 3 ) )
             nCount--;
@@ -1880,15 +1885,15 @@ SvStream& operator>>( SvStream& rIStream, Polygon& rPoly )
     DBG_CHKOBJ( &rPoly, Polygon, NULL );
     DBG_ASSERTWARNING( rIStream.GetVersion(), "Polygon::>> - Solar-Version not set on rIStream" );
 
-    USHORT          i;
-    USHORT          nStart;
-    USHORT          nCurPoints;
-    USHORT          nPoints;
-    unsigned char   bShort;
-    short           nShortX;
-    short           nShortY;
-    long            nLongX;
-    long            nLongY;
+    USHORT			i;
+    USHORT			nStart;
+    USHORT			nCurPoints;
+    USHORT			nPoints;
+    unsigned char	bShort;
+    short			nShortX;
+    short			nShortY;
+    long			nLongX;
+    long			nLongY;
 
     // Anzahl der Punkte einlesen und Array erzeugen
     rIStream >> nPoints;
@@ -1962,11 +1967,11 @@ SvStream& operator<<( SvStream& rOStream, const Polygon& rPoly )
     DBG_CHKOBJ( &rPoly, Polygon, NULL );
     DBG_ASSERTWARNING( rOStream.GetVersion(), "Polygon::<< - Solar-Version not set on rOStream" );
 
-    unsigned char   bShort;
-    unsigned char   bCurShort;
-    USHORT          nStart;
-    USHORT          i;
-    USHORT          nPoints = rPoly.GetSize();
+    unsigned char	bShort;
+    unsigned char	bCurShort;
+    USHORT			nStart;
+    USHORT			i;
+    USHORT			nPoints = rPoly.GetSize();
 
     // Anzahl der Punkte rausschreiben
     rOStream << nPoints;
@@ -2062,7 +2067,7 @@ SvStream& operator<<( SvStream& rOStream, const Polygon& rPoly )
 
 void Polygon::ImplRead( SvStream& rIStream )
 {
-    sal_uInt8   bHasPolyFlags;
+    sal_uInt8	bHasPolyFlags;
 
     rIStream >> *this
              >> bHasPolyFlags;
@@ -2087,7 +2092,7 @@ void Polygon::Read( SvStream& rIStream )
 
 void Polygon::ImplWrite( SvStream& rOStream ) const
 {
-    sal_uInt8   bHasPolyFlags = mpImplPolygon->mpFlagAry != NULL;
+    sal_uInt8	bHasPolyFlags = mpImplPolygon->mpFlagAry != NULL;
     rOStream << *this
              << bHasPolyFlags;
 
@@ -2198,7 +2203,7 @@ basegfx::B2DPolygon Polygon::getB2DPolygon() const
 
             // if exist, remove double first/last points, set closed and correct control points
             basegfx::tools::checkClosed(aRetval);
-
+            
             if(aRetval.isClosed())
             {
                 // closeWithGeometryChange did really close, so last point(s) were removed.
@@ -2232,7 +2237,7 @@ basegfx::B2DPolygon Polygon::getB2DPolygon() const
 // and a memcopy at ImplPolygon creation, but contains no zero-controlpoints
 // for straight edges.
 Polygon::Polygon(const basegfx::B2DPolygon& rPolygon)
-:   mpImplPolygon(0)
+:	mpImplPolygon(0)
 {
     DBG_CTOR( Polygon, NULL );
 
@@ -2327,7 +2332,7 @@ Polygon::Polygon(const basegfx::B2DPolygon& rPolygon)
             }
 
             DBG_ASSERT(nArrayInsert <= nMaxTargetCount, "Polygon::Polygon from basegfx::B2DPolygon: wrong max point count estimation (!)");
-
+            
             if(nArrayInsert != nMaxTargetCount)
             {
                 mpImplPolygon->ImplSetSize(static_cast< sal_uInt16 >(nArrayInsert), true);
diff --git a/tools/source/generic/poly2.cxx b/tools/source/generic/poly2.cxx
index 46459353fa35..c85e2c1488f2 100644
--- a/tools/source/generic/poly2.cxx
+++ b/tools/source/generic/poly2.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
@@ -55,21 +55,21 @@ DBG_NAME( PolyPolygon )
 
 ImplPolyPolygon::ImplPolyPolygon( USHORT nInitSize )
 {
-    mnRefCount  = 1;
-    mnCount     = nInitSize;
-    mnSize      = nInitSize;
-    mnResize    = 16;
-    mpPolyAry   = new SVPPOLYGON[ nInitSize ];
+    mnRefCount	= 1;
+    mnCount 	= nInitSize;
+    mnSize		= nInitSize;
+    mnResize	= 16;
+    mpPolyAry	= new SVPPOLYGON[ nInitSize ];
 }
 
 // -----------------------------------------------------------------------
 
 ImplPolyPolygon::ImplPolyPolygon( const ImplPolyPolygon& rImplPolyPoly )
 {
-    mnRefCount  = 1;
-    mnCount     = rImplPolyPoly.mnCount;
-    mnSize      = rImplPolyPoly.mnSize;
-    mnResize    = rImplPolyPoly.mnResize;
+    mnRefCount	= 1;
+    mnCount 	= rImplPolyPoly.mnCount;
+    mnSize		= rImplPolyPoly.mnSize;
+    mnResize	= rImplPolyPoly.mnResize;
 
     if ( rImplPolyPoly.mpPolyAry )
     {
@@ -190,8 +190,8 @@ void PolyPolygon::Insert( const Polygon& rPoly, USHORT nPos )
         mpImplPolyPolygon->mpPolyAry = new SVPPOLYGON[mpImplPolyPolygon->mnSize];
     else if ( mpImplPolyPolygon->mnCount == mpImplPolyPolygon->mnSize )
     {
-        USHORT      nOldSize = mpImplPolyPolygon->mnSize;
-        USHORT      nNewSize = nOldSize + mpImplPolyPolygon->mnResize;
+        USHORT		nOldSize = mpImplPolyPolygon->mnSize;
+        USHORT		nNewSize = nOldSize + mpImplPolyPolygon->mnResize;
         SVPPOLYGON* pNewAry;
 
         if ( nNewSize >= MAX_POLYGONS )
@@ -292,8 +292,8 @@ void PolyPolygon::Clear()
                 delete mpImplPolyPolygon->mpPolyAry[i];
             delete[] mpImplPolyPolygon->mpPolyAry;
             mpImplPolyPolygon->mpPolyAry = NULL;
-            mpImplPolyPolygon->mnCount   = 0;
-            mpImplPolyPolygon->mnSize    = mpImplPolyPolygon->mnResize;
+            mpImplPolyPolygon->mnCount	 = 0;
+            mpImplPolyPolygon->mnSize	 = mpImplPolyPolygon->mnResize;
         }
     }
 }
@@ -306,9 +306,9 @@ void PolyPolygon::Optimize( ULONG nOptimizeFlags, const PolyOptimizeData* pData
 
     if( nOptimizeFlags )
     {
-        double      fArea;
-        const BOOL  bEdges = ( nOptimizeFlags & POLY_OPTIMIZE_EDGES ) == POLY_OPTIMIZE_EDGES;
-        USHORT      nPercent = 0;
+        double		fArea;
+        const BOOL	bEdges = ( nOptimizeFlags & POLY_OPTIMIZE_EDGES ) == POLY_OPTIMIZE_EDGES;
+        USHORT		nPercent = 0;
 
         if( bEdges )
         {
@@ -361,7 +361,7 @@ void PolyPolygon::AdaptiveSubdivide( PolyPolygon& rResult, const double d ) cons
 // -----------------------------------------------------------------------
 
 void PolyPolygon::GetIntersection( const PolyPolygon& rPolyPoly, PolyPolygon& rResult ) const
-{
+{	
     ImplDoOperation( rPolyPoly, rResult, POLY_CLIP_INT );
 }
 
@@ -389,7 +389,7 @@ void PolyPolygon::GetXOR( const PolyPolygon& rPolyPoly, PolyPolygon& rResult ) c
 // -----------------------------------------------------------------------
 
 void PolyPolygon::ImplDoOperation( const PolyPolygon& rPolyPoly, PolyPolygon& rResult, ULONG nOperation ) const
-{
+{ 
     // Convert to B2DPolyPolygon, temporarily. It might be
     // advantageous in the future, to have a PolyPolygon adaptor that
     // just simulates a B2DPolyPolygon here...
@@ -397,7 +397,7 @@ void PolyPolygon::ImplDoOperation( const PolyPolygon& rPolyPoly, PolyPolygon& rR
     basegfx::B2DPolyPolygon aMergePolyPolygonB( rPolyPoly.getB2DPolyPolygon() );
 
     // normalize the two polypolygons before. Force properly oriented
-    // polygons.
+    // polygons. 
     aMergePolyPolygonA = basegfx::tools::prepareForPolygonOperation( aMergePolyPolygonA );
     aMergePolyPolygonB = basegfx::tools::prepareForPolygonOperation( aMergePolyPolygonB );
 
@@ -628,15 +628,15 @@ Rectangle PolyPolygon::GetBoundRect() const
 {
     DBG_CHKTHIS( PolyPolygon, NULL );
 
-    long    nXMin=0, nXMax=0, nYMin=0, nYMax=0;
-    BOOL    bFirst = TRUE;
-    USHORT  nPolyCount = mpImplPolyPolygon->mnCount;
+    long	nXMin=0, nXMax=0, nYMin=0, nYMax=0;
+    BOOL	bFirst = TRUE;
+    USHORT	nPolyCount = mpImplPolyPolygon->mnCount;
 
     for ( USHORT n = 0; n < nPolyCount; n++ )
     {
-        const Polygon*  pPoly = mpImplPolyPolygon->mpPolyAry[n];
-        const Point*    pAry = pPoly->GetConstPointAry();
-        USHORT          nPointCount = pPoly->GetSize();
+        const Polygon*	pPoly = mpImplPolyPolygon->mpPolyAry[n];
+        const Point*	pAry = pPoly->GetConstPointAry();
+        USHORT			nPointCount = pPoly->GetSize();
 
         for ( USHORT i = 0; i < nPointCount; i++ )
         {
@@ -746,7 +746,7 @@ SvStream& operator>>( SvStream& rIStream, PolyPolygon& rPolyPoly )
     DBG_ASSERTWARNING( rIStream.GetVersion(), "PolyPolygon::>> - Solar-Version not set on rIStream" );
 
     Polygon* pPoly;
-    USHORT   nPolyCount;
+    USHORT	 nPolyCount;
 
     // Anzahl der Polygone einlesen
     rIStream >> nPolyCount;
@@ -803,7 +803,7 @@ void PolyPolygon::Read( SvStream& rIStream )
     DBG_ASSERTWARNING( rIStream.GetVersion(), "PolyPolygon::>> - Solar-Version not set on rIStream" );
 
     Polygon* pPoly;
-    USHORT   nPolyCount;
+    USHORT	 nPolyCount;
 
     // Anzahl der Polygone einlesen
     rIStream >> nPolyCount;
@@ -869,7 +869,7 @@ PolyPolygon::PolyPolygon(const basegfx::B2DPolyPolygon& rPolyPolygon)
 {
     DBG_CTOR( PolyPolygon, NULL );
     const sal_uInt16 nCount(sal_uInt16(rPolyPolygon.count()));
-    DBG_ASSERT(sal_uInt32(nCount) == rPolyPolygon.count(),
+    DBG_ASSERT(sal_uInt32(nCount) == rPolyPolygon.count(), 
         "PolyPolygon::PolyPolygon: Too many sub-polygons in given basegfx::B2DPolyPolygon (!)");
 
     if ( nCount )
diff --git a/tools/source/generic/svborder.cxx b/tools/source/generic/svborder.cxx
index eb254faf2310..62b804faf2c9 100644
--- a/tools/source/generic/svborder.cxx
+++ b/tools/source/generic/svborder.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
@@ -43,17 +43,17 @@ SvBorder::SvBorder( const Rectangle & rOuter, const Rectangle & rInner )
 
     OSL_ENSURE( aOuter.IsInside( aInner ),
                 "SvBorder::SvBorder: FALSE == aOuter.IsInside( aInner )" );
-    nTop    = aInner.Top()    - aOuter.Top();
-    nRight  = aOuter.Right()  - aInner.Right();
+    nTop	= aInner.Top()	  - aOuter.Top();
+    nRight	= aOuter.Right()  - aInner.Right();
     nBottom = aOuter.Bottom() - aInner.Bottom();
-    nLeft   = aInner.Left()   - aOuter.Left();
+    nLeft	= aInner.Left()   - aOuter.Left();
 }
 
 Rectangle & operator += ( Rectangle & rRect, const SvBorder & rBorder )
 {
     // wegen Empty-Rect, GetSize muss als erstes gerufen werden
     Size aS( rRect.GetSize() );
-    aS.Width()  += rBorder.Left() + rBorder.Right();
+    aS.Width()	+= rBorder.Left() + rBorder.Right();
     aS.Height() += rBorder.Top() + rBorder.Bottom();
 
     rRect.Left()   -= rBorder.Left();
@@ -66,7 +66,7 @@ Rectangle & operator -= ( Rectangle & rRect, const SvBorder & rBorder )
 {
     // wegen Empty-Rect, GetSize muss als erstes gerufen werden
     Size aS( rRect.GetSize() );
-    aS.Width()  -= rBorder.Left() + rBorder.Right();
+    aS.Width()	-= rBorder.Left() + rBorder.Right();
     aS.Height() -= rBorder.Top() + rBorder.Bottom();
 
     rRect.Left()   += rBorder.Left();
diff --git a/tools/source/generic/svlibrary.cxx b/tools/source/generic/svlibrary.cxx
index 6ebfd0086b5c..c38c6d63f5ec 100644
--- a/tools/source/generic/svlibrary.cxx
+++ b/tools/source/generic/svlibrary.cxx
@@ -96,7 +96,7 @@ static uno::Sequence< rtl::OUString > GetMultiPaths_Impl()
 
 bool SvLibrary::LoadModule( osl::Module& rModule, const rtl::OUString& rLibName, ::oslGenericFunction baseModule, ::sal_Int32 mode )
 {
-    static uno::Sequence < rtl::OUString > aPaths = GetMultiPaths_Impl();   
+    static uno::Sequence < rtl::OUString > aPaths = GetMultiPaths_Impl();	
     bool bLoaded = false;
 
     for (sal_Int32 n=0; n<aPaths.getLength(); n++)
diff --git a/tools/source/generic/toolsin.cxx b/tools/source/generic/toolsin.cxx
index 50c9c0187b16..586b27851c27 100644
--- a/tools/source/generic/toolsin.cxx
+++ b/tools/source/generic/toolsin.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
@@ -67,8 +67,8 @@ void InitTools()
 
 void DeInitTools()
 {
-    TOOLSINDATA**   ppData = (TOOLSINDATA**)GetAppData( SHL_TOOLS );
-    TOOLSINDATA*    pData = *ppData;
+    TOOLSINDATA**	ppData = (TOOLSINDATA**)GetAppData( SHL_TOOLS );
+    TOOLSINDATA*	pData = *ppData;
 
     if ( pData )
     {
diff --git a/tools/source/inet/inetmime.cxx b/tools/source/inet/inetmime.cxx
index 5324e9be07b8..39df87f6249f 100644
--- a/tools/source/inet/inetmime.cxx
+++ b/tools/source/inet/inetmime.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
@@ -799,7 +799,7 @@ const sal_Char * INetMIME::skipQuotedString(const sal_Char * pBegin,
                         || !isWhiteSpace(*p++))
                         return pBegin;
                     break;
-
+                    
                 case '"':
                     return p;
 
@@ -828,7 +828,7 @@ const sal_Unicode * INetMIME::skipQuotedString(const sal_Unicode * pBegin,
                         || !isWhiteSpace(*p++))
                         return pBegin;
                     break;
-
+                    
                 case '"':
                     return p;
 
@@ -1087,7 +1087,7 @@ const sal_Unicode * INetMIME::scanQuotedBlock(const sal_Unicode * pBegin,
                             }
                             else
                                 ++pBegin;
-                        }
+                        } 
                         break;
 
                     default:
@@ -3347,22 +3347,22 @@ UniString INetMIME::decodeHeaderFieldBody(HeaderFieldType eType,
 
             bEncodedWord = bEncodedWord && q != pEnd && *q++ == '=';
 
-//          if (bEncodedWord && q != pEnd)
-//              switch (*q)
-//              {
-//                  case '\t':
-//                  case ' ':
-//                  case '"':
-//                  case ')':
-//                  case ',':
-//                  case '.':
-//                  case '=':
-//                      break;
+//			if (bEncodedWord && q != pEnd)
+//				switch (*q)
+//				{
+//					case '\t':
+//					case ' ':
+//					case '"':
+//					case ')':
+//					case ',':
+//					case '.':
+//					case '=':
+//						break;
 //
-//                  default:
-//                      bEncodedWord = false;
-//                      break;
-//              }
+//					default:
+//						bEncodedWord = false;
+//						break;
+//				}
 
             sal_Unicode * pUnicodeBuffer = 0;
             sal_Size nUnicodeSize = 0;
@@ -3464,13 +3464,13 @@ UniString INetMIME::decodeHeaderFieldBody(HeaderFieldType eType,
 
         switch (*p++)
         {
-//          case '\t':
-//          case ' ':
-//          case ',':
-//          case '.':
-//          case '=':
-//              bStartEncodedWord = true;
-//              break;
+//			case '\t':
+//			case ' ':
+//			case ',':
+//			case '.':
+//			case '=':
+//				bStartEncodedWord = true;
+//				break;
 
             case '"':
                 if (eType != HEADER_FIELD_TEXT && nCommentLevel == 0)
diff --git a/tools/source/inet/inetmsg.cxx b/tools/source/inet/inetmsg.cxx
index feec97168b59..397c4239da18 100644
--- a/tools/source/inet/inetmsg.cxx
+++ b/tools/source/inet/inetmsg.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
@@ -234,7 +234,7 @@ INetMessageHeaderIterator::~INetMessageHeaderIterator (void)
  * ImplINetRFC822MessageHeaderData.
  */
 namespace
-{
+{ 
     struct ImplINetRFC822MessageHeaderDataImpl
     {
         const ByteString* operator()()
@@ -262,8 +262,8 @@ namespace
         }
     };
 
-    struct ImplINetRFC822MessageHeaderData
-        : public rtl::StaticAggregate< const ByteString, ImplINetRFC822MessageHeaderDataImpl > {};
+    struct ImplINetRFC822MessageHeaderData 
+        : public rtl::StaticAggregate< const ByteString, ImplINetRFC822MessageHeaderDataImpl > {}; 
 }
 
 #define HDR(n) ImplINetRFC822MessageHeaderData::get()[(n)]
@@ -971,8 +971,8 @@ namespace
         }
     };
 
-    struct ImplINetMIMEMessageHeaderData
-        : public rtl::StaticAggregate< const ByteString, ImplINetMIMEMessageHeaderDataImpl > {};
+    struct ImplINetMIMEMessageHeaderData 
+        : public rtl::StaticAggregate< const ByteString, ImplINetMIMEMessageHeaderDataImpl > {}; 
 }
 
 #define MIMEHDR(n) ImplINetMIMEMessageHeaderData::get()[(n)]
diff --git a/tools/source/inet/inetstrm.cxx b/tools/source/inet/inetstrm.cxx
index ca76d8750bf8..76d9a434c53a 100644
--- a/tools/source/inet/inetstrm.cxx
+++ b/tools/source/inet/inetstrm.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
diff --git a/tools/source/memtools/contnr.cxx b/tools/source/memtools/contnr.cxx
index 4a4ee47886ee..9bbff759e4b9 100644
--- a/tools/source/memtools/contnr.cxx
+++ b/tools/source/memtools/contnr.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
@@ -51,11 +51,11 @@ DBG_NAME( Container )
 
 /*************************************************************************
 |*
-|*    DbgCheckCBlock()
+|*	  DbgCheckCBlock()
 |*
-|*    Beschreibung      Pruefung eines CBlock fuer Debug-Utilities
-|*    Ersterstellung    MI 30.01.92
-|*    Letzte Aenderung  TH 24.01.96
+|*	  Beschreibung		Pruefung eines CBlock fuer Debug-Utilities
+|*	  Ersterstellung	MI 30.01.92
+|*	  Letzte Aenderung	TH 24.01.96
 |*
 *************************************************************************/
 
@@ -76,11 +76,11 @@ const char* CBlock::DbgCheckCBlock( const void* pBlock )
 
 /*************************************************************************
 |*
-|*    CBlock::CBlock()
+|*	  CBlock::CBlock()
 |*
-|*    Beschreibung      Construktor des Verwaltungsblocks
-|*    Ersterstellung    TH 17.09.91
-|*    Letzte Aenderung  TH 17.09.91
+|*	  Beschreibung		Construktor des Verwaltungsblocks
+|*	  Ersterstellung	TH 17.09.91
+|*	  Letzte Aenderung	TH 17.09.91
 |*
 *************************************************************************/
 
@@ -88,10 +88,10 @@ CBlock::CBlock( USHORT nInitSize, CBlock* _pPrev, CBlock* _pNext )
 {
     DBG_CTOR( CBlock, DbgCheckCBlock );
 
-    pPrev   = _pPrev;
-    pNext   = _pNext;
-    nSize   = nInitSize;
-    nCount  = 0;
+    pPrev	= _pPrev;
+    pNext	= _pNext;
+    nSize	= nInitSize;
+    nCount	= 0;
 
     // Datenpuffer anlegen
     pNodes = new PVOID[nSize];
@@ -99,11 +99,11 @@ CBlock::CBlock( USHORT nInitSize, CBlock* _pPrev, CBlock* _pNext )
 
 /*************************************************************************
 |*
-|*    CBlock::CBlock()
+|*	  CBlock::CBlock()
 |*
-|*    Beschreibung      Construktor des Verwaltungsblocks
-|*    Ersterstellung    TH 17.09.91
-|*    Letzte Aenderung  TH 17.09.91
+|*	  Beschreibung		Construktor des Verwaltungsblocks
+|*	  Ersterstellung	TH 17.09.91
+|*	  Letzte Aenderung	TH 17.09.91
 |*
 *************************************************************************/
 
@@ -112,10 +112,10 @@ CBlock::CBlock( USHORT _nSize, CBlock* _pPrev )
     DBG_CTOR( CBlock, DbgCheckCBlock );
     DBG_ASSERT( _nSize, "CBlock::CBlock(): nSize == 0" );
 
-    pPrev   = _pPrev;
-    pNext   = NULL;
-    nSize   = _nSize;
-    nCount  = _nSize;
+    pPrev	= _pPrev;
+    pNext	= NULL;
+    nSize	= _nSize;
+    nCount	= _nSize;
 
     // Datenpuffer anlegen und initialisieren
     pNodes = new PVOID[nSize];
@@ -124,11 +124,11 @@ CBlock::CBlock( USHORT _nSize, CBlock* _pPrev )
 
 /*************************************************************************
 |*
-|*    CBlock::CBlock()
+|*	  CBlock::CBlock()
 |*
-|*    Beschreibung      Copy-Construktor des Verwaltungsblocks
-|*    Ersterstellung    TH 17.09.91
-|*    Letzte Aenderung  TH 17.09.91
+|*	  Beschreibung		Copy-Construktor des Verwaltungsblocks
+|*	  Ersterstellung	TH 17.09.91
+|*	  Letzte Aenderung	TH 17.09.91
 |*
 *************************************************************************/
 
@@ -137,10 +137,10 @@ CBlock::CBlock( const CBlock& r, CBlock* _pPrev )
     DBG_CTOR( CBlock, DbgCheckCBlock );
     DBG_CHKOBJ( &r, CBlock, DbgCheckCBlock );
 
-    pPrev   = _pPrev;
-    pNext   = NULL;
-    nSize   = r.nSize;
-    nCount  = r.nCount;
+    pPrev	= _pPrev;
+    pNext	= NULL;
+    nSize	= r.nSize;
+    nCount	= r.nCount;
 
     // Datenpuffer anlegen und Daten kopieren
     pNodes = new PVOID[nSize];
@@ -149,11 +149,11 @@ CBlock::CBlock( const CBlock& r, CBlock* _pPrev )
 
 /*************************************************************************
 |*
-|*    CBlock::~CBlock()
+|*	  CBlock::~CBlock()
 |*
-|*    Beschreibung      Destruktor des Verwaltungsblocks
-|*    Ersterstellung    TH 17.09.91
-|*    Letzte Aenderung  TH 17.09.91
+|*	  Beschreibung		Destruktor des Verwaltungsblocks
+|*	  Ersterstellung	TH 17.09.91
+|*	  Letzte Aenderung	TH 17.09.91
 |*
 *************************************************************************/
 
@@ -167,11 +167,11 @@ inline CBlock::~CBlock()
 
 /*************************************************************************
 |*
-|*    CBlock::Insert()
+|*	  CBlock::Insert()
 |*
-|*    Beschreibung      Fuegt einen Pointer ein
-|*    Ersterstellung    TH 17.09.91
-|*    Letzte Aenderung  TH 17.09.91
+|*	  Beschreibung		Fuegt einen Pointer ein
+|*	  Ersterstellung	TH 17.09.91
+|*	  Letzte Aenderung	TH 17.09.91
 |*
 *************************************************************************/
 
@@ -223,11 +223,11 @@ void CBlock::Insert( void* p, USHORT nIndex, USHORT nReSize )
 
 /*************************************************************************
 |*
-|*    CBlock::Split()
+|*	  CBlock::Split()
 |*
-|*    Beschreibung      Fuegt einen Pointer ein und splittet den Block
-|*    Ersterstellung    TH 17.09.91
-|*    Letzte Aenderung  TH 17.09.91
+|*	  Beschreibung		Fuegt einen Pointer ein und splittet den Block
+|*	  Ersterstellung	TH 17.09.91
+|*	  Letzte Aenderung	TH 17.09.91
 |*
 *************************************************************************/
 
@@ -235,8 +235,8 @@ CBlock* CBlock::Split( void* p, USHORT nIndex, USHORT nReSize )
 {
     DBG_CHKTHIS( CBlock, DbgCheckCBlock );
 
-    USHORT  nNewSize;
-    USHORT  nMiddle;
+    USHORT	nNewSize;
+    USHORT	nMiddle;
     CBlock* pNewBlock;
 
     nMiddle = nCount/2;
@@ -360,11 +360,11 @@ CBlock* CBlock::Split( void* p, USHORT nIndex, USHORT nReSize )
 
 /*************************************************************************
 |*
-|*    CBlock::Remove()
+|*	  CBlock::Remove()
 |*
-|*    Beschreibung      Entfernt einen Pointer
-|*    Ersterstellung    TH 17.09.91
-|*    Letzte Aenderung  TH 17.09.91
+|*	  Beschreibung		Entfernt einen Pointer
+|*	  Ersterstellung	TH 17.09.91
+|*	  Letzte Aenderung	TH 17.09.91
 |*
 *************************************************************************/
 
@@ -419,11 +419,11 @@ void* CBlock::Remove( USHORT nIndex, USHORT nReSize )
 
 /*************************************************************************
 |*
-|*    CBlock::Replace()
+|*	  CBlock::Replace()
 |*
-|*    Beschreibung      Ersetzt einen Pointer
-|*    Ersterstellung    TH 17.09.91
-|*    Letzte Aenderung  TH 17.09.91
+|*	  Beschreibung		Ersetzt einen Pointer
+|*	  Ersterstellung	TH 17.09.91
+|*	  Letzte Aenderung	TH 17.09.91
 |*
 *************************************************************************/
 
@@ -439,12 +439,12 @@ inline void* CBlock::Replace( void* p, USHORT nIndex )
 
 /*************************************************************************
 |*
-|*    CBlock::GetObjectPtr()
+|*	  CBlock::GetObjectPtr()
 |*
-|*    Beschreibung      Gibt einen Pointer auf den Pointer aus dem Block
-|*                      zurueck
-|*    Ersterstellung    TH 26.01.93
-|*    Letzte Aenderung  TH 26.01.93
+|*	  Beschreibung		Gibt einen Pointer auf den Pointer aus dem Block
+|*						zurueck
+|*	  Ersterstellung	TH 26.01.93
+|*	  Letzte Aenderung	TH 26.01.93
 |*
 *************************************************************************/
 
@@ -457,11 +457,11 @@ inline void** CBlock::GetObjectPtr( USHORT nIndex )
 
 /*************************************************************************
 |*
-|*    CBlock::SetSize()
+|*	  CBlock::SetSize()
 |*
-|*    Beschreibung      Aendert die Groesse des Blocks
-|*    Ersterstellung    TH 17.09.91
-|*    Letzte Aenderung  TH 17.09.91
+|*	  Beschreibung		Aendert die Groesse des Blocks
+|*	  Ersterstellung	TH 17.09.91
+|*	  Letzte Aenderung	TH 17.09.91
 |*
 *************************************************************************/
 
@@ -499,11 +499,11 @@ void CBlock::SetSize( USHORT nNewSize )
 
 /*************************************************************************
 |*
-|*    DbgCheckContainer()
+|*	  DbgCheckContainer()
 |*
-|*    Beschreibung      Pruefung eines Container fuer Debug-Utilities
-|*    Ersterstellung    MI 30.01.92
-|*    Letzte Aenderung  TH 24.01.96
+|*	  Beschreibung		Pruefung eines Container fuer Debug-Utilities
+|*	  Ersterstellung	MI 30.01.92
+|*	  Letzte Aenderung	TH 24.01.96
 |*
 *************************************************************************/
 
@@ -521,18 +521,18 @@ const char* Container::DbgCheckContainer( const void* pCont )
 
 /*************************************************************************
 |*
-|*    ImpCopyContainer()
+|*	  ImpCopyContainer()
 |*
-|*    Beschreibung      Kopiert alle Daten des Containers
-|*    Ersterstellung    TH 24.01.96
-|*    Letzte Aenderung  TH 24.01.96
+|*	  Beschreibung		Kopiert alle Daten des Containers
+|*	  Ersterstellung	TH 24.01.96
+|*	  Letzte Aenderung	TH 24.01.96
 |*
 *************************************************************************/
 
 void Container::ImpCopyContainer( const Container* pCont2 )
 {
     // Werte vom uebergebenen Container uebernehmen
-    nCount     = pCont2->nCount;
+    nCount	   = pCont2->nCount;
     nCurIndex  = pCont2->nCurIndex;
     nInitSize  = pCont2->nInitSize;
     nReSize    = pCont2->nReSize;
@@ -574,18 +574,18 @@ void Container::ImpCopyContainer( const Container* pCont2 )
     else
     {
         pFirstBlock = NULL;
-        pLastBlock  = NULL;
-        pCurBlock   = NULL;
+        pLastBlock	= NULL;
+        pCurBlock	= NULL;
     }
 }
 
 /*************************************************************************
 |*
-|*    Container::Container()
+|*	  Container::Container()
 |*
-|*    Beschreibung      CONTNR.SDW
-|*    Ersterstellung    TH 17.09.91
-|*    Letzte Aenderung  TH 17.09.91
+|*	  Beschreibung		CONTNR.SDW
+|*	  Ersterstellung	TH 17.09.91
+|*	  Letzte Aenderung	TH 17.09.91
 |*
 *************************************************************************/
 
@@ -638,19 +638,19 @@ Container::Container( USHORT _nBlockSize, USHORT _nInitSize, USHORT _nReSize )
 
     // Werte initialisieren
     pFirstBlock = NULL;
-    pLastBlock  = NULL;
-    pCurBlock   = NULL;
-    nCount      = 0;
-    nCurIndex   = 0;
+    pLastBlock	= NULL;
+    pCurBlock	= NULL;
+    nCount		= 0;
+    nCurIndex	= 0;
 }
 
 /*************************************************************************
 |*
-|*    Container::Container()
+|*	  Container::Container()
 |*
-|*    Beschreibung      CONTNR.SDW
-|*    Ersterstellung    TH 17.09.91
-|*    Letzte Aenderung  TH 17.09.91
+|*	  Beschreibung		CONTNR.SDW
+|*	  Ersterstellung	TH 17.09.91
+|*	  Letzte Aenderung	TH 17.09.91
 |*
 *************************************************************************/
 
@@ -658,7 +658,7 @@ Container::Container( ULONG nSize )
 {
     DBG_CTOR( Container, DbgCheckContainer );
 
-    nCount     = nSize;
+    nCount	   = nSize;
     nCurIndex  = 0;
     nBlockSize = CONTAINER_MAXBLOCKSIZE;
     nInitSize  = 1;
@@ -667,8 +667,8 @@ Container::Container( ULONG nSize )
     if ( !nSize )
     {
         pFirstBlock = NULL;
-        pLastBlock  = NULL;
-        pCurBlock   = NULL;
+        pLastBlock	= NULL;
+        pCurBlock	= NULL;
     }
     else
     {
@@ -706,11 +706,11 @@ Container::Container( ULONG nSize )
 
 /*************************************************************************
 |*
-|*    Container::Container()
+|*	  Container::Container()
 |*
-|*    Beschreibung      CONTNR.SDW
-|*    Ersterstellung    TH 17.09.91
-|*    Letzte Aenderung  TH 17.09.91
+|*	  Beschreibung		CONTNR.SDW
+|*	  Ersterstellung	TH 17.09.91
+|*	  Letzte Aenderung	TH 17.09.91
 |*
 *************************************************************************/
 
@@ -724,11 +724,11 @@ Container::Container( const Container& r )
 
 /*************************************************************************
 |*
-|*    Container::~Container()
+|*	  Container::~Container()
 |*
-|*    Beschreibung      CONTNR.SDW
-|*    Ersterstellung    TH 17.09.91
-|*    Letzte Aenderung  TH 17.09.91
+|*	  Beschreibung		CONTNR.SDW
+|*	  Ersterstellung	TH 17.09.91
+|*	  Letzte Aenderung	TH 17.09.91
 |*
 *************************************************************************/
 
@@ -748,11 +748,11 @@ Container::~Container()
 
 /*************************************************************************
 |*
-|*    Container::ImpInsert()
+|*	  Container::ImpInsert()
 |*
-|*    Beschreibung      Interne Methode zum Einfuegen eines Pointers
-|*    Ersterstellung    TH 17.09.91
-|*    Letzte Aenderung  DV 01.07.97
+|*	  Beschreibung		Interne Methode zum Einfuegen eines Pointers
+|*	  Ersterstellung	TH 17.09.91
+|*	  Letzte Aenderung	DV 01.07.97
 |*
 *************************************************************************/
 
@@ -765,8 +765,8 @@ void Container::ImpInsert( void* p, CBlock* pBlock, USHORT nIndex )
         if ( !pBlock )
         {
             pFirstBlock = new CBlock( nInitSize, NULL, NULL );
-            pLastBlock  = pFirstBlock;
-            pCurBlock   = pFirstBlock;
+            pLastBlock	= pFirstBlock;
+            pCurBlock	= pFirstBlock;
         }
         pFirstBlock->Insert( p, nIndex, nReSize );
     }
@@ -833,11 +833,11 @@ void Container::ImpInsert( void* p, CBlock* pBlock, USHORT nIndex )
 
 /*************************************************************************
 |*
-|*    Container::Insert()
+|*	  Container::Insert()
 |*
-|*    Beschreibung      CONTNR.SDW
-|*    Ersterstellung    TH 17.09.91
-|*    Letzte Aenderung  TH 17.09.91
+|*	  Beschreibung		CONTNR.SDW
+|*	  Ersterstellung	TH 17.09.91
+|*	  Letzte Aenderung	TH 17.09.91
 |*
 *************************************************************************/
 
@@ -848,11 +848,11 @@ void Container::Insert( void* p )
 
 /*************************************************************************
 |*
-|*    Container::Insert()
+|*	  Container::Insert()
 |*
-|*    Beschreibung      CONTNR.SDW
-|*    Ersterstellung    TH 17.09.91
-|*    Letzte Aenderung  TH 17.09.91
+|*	  Beschreibung		CONTNR.SDW
+|*	  Ersterstellung	TH 17.09.91
+|*	  Letzte Aenderung	TH 17.09.91
 |*
 *************************************************************************/
 
@@ -872,7 +872,7 @@ void Container::Insert( void* p, ULONG nIndex )
         while ( pTemp->Count() < nIndex )
         {
             nIndex -= pTemp->Count();
-            pTemp   = pTemp->GetNextBlock();
+            pTemp	= pTemp->GetNextBlock();
         }
 
         ImpInsert( p, pTemp, (USHORT)nIndex );
@@ -881,11 +881,11 @@ void Container::Insert( void* p, ULONG nIndex )
 
 /*************************************************************************
 |*
-|*    Container::Insert()
+|*	  Container::Insert()
 |*
-|*    Beschreibung      CONTNR.SDW
-|*    Ersterstellung    TH 17.09.91
-|*    Letzte Aenderung  TH 17.09.91
+|*	  Beschreibung		CONTNR.SDW
+|*	  Ersterstellung	TH 17.09.91
+|*	  Letzte Aenderung	TH 17.09.91
 |*
 *************************************************************************/
 
@@ -898,11 +898,11 @@ void Container::Insert( void* pNew, void* pOld )
 
 /*************************************************************************
 |*
-|*    Container::ImpRemove()
+|*	  Container::ImpRemove()
 |*
-|*    Beschreibung      Interne Methode zum Entfernen eines Pointers
-|*    Ersterstellung    TH 17.09.91
-|*    Letzte Aenderung  TH 17.09.91
+|*	  Beschreibung		Interne Methode zum Entfernen eines Pointers
+|*	  Ersterstellung	TH 17.09.91
+|*	  Letzte Aenderung	TH 17.09.91
 |*
 *************************************************************************/
 
@@ -975,11 +975,11 @@ void* Container::ImpRemove( CBlock* pBlock, USHORT nIndex )
 
 /*************************************************************************
 |*
-|*    Container::Remove()
+|*	  Container::Remove()
 |*
-|*    Beschreibung      CONTNR.SDW
-|*    Ersterstellung    TH 17.09.91
-|*    Letzte Aenderung  TH 17.09.91
+|*	  Beschreibung		CONTNR.SDW
+|*	  Ersterstellung	TH 17.09.91
+|*	  Letzte Aenderung	TH 17.09.91
 |*
 *************************************************************************/
 
@@ -994,11 +994,11 @@ void* Container::Remove()
 
 /*************************************************************************
 |*
-|*    Container::Remove()
+|*	  Container::Remove()
 |*
-|*    Beschreibung      CONTNR.SDW
-|*    Ersterstellung    TH 17.09.91
-|*    Letzte Aenderung  TH 17.09.91
+|*	  Beschreibung		CONTNR.SDW
+|*	  Ersterstellung	TH 17.09.91
+|*	  Letzte Aenderung	TH 17.09.91
 |*
 *************************************************************************/
 
@@ -1014,7 +1014,7 @@ void* Container::Remove( ULONG nIndex )
         while ( pTemp->Count() <= nIndex )
         {
             nIndex -= pTemp->Count();
-            pTemp   = pTemp->GetNextBlock();
+            pTemp	= pTemp->GetNextBlock();
         }
 
         return ImpRemove( pTemp, (USHORT)nIndex );
@@ -1023,11 +1023,11 @@ void* Container::Remove( ULONG nIndex )
 
 /*************************************************************************
 |*
-|*    Container::Replace()
+|*	  Container::Replace()
 |*
-|*    Beschreibung      CONTNR.SDW
-|*    Ersterstellung    TH 17.09.91
-|*    Letzte Aenderung  TH 17.09.91
+|*	  Beschreibung		CONTNR.SDW
+|*	  Ersterstellung	TH 17.09.91
+|*	  Letzte Aenderung	TH 17.09.91
 |*
 *************************************************************************/
 
@@ -1043,11 +1043,11 @@ void* Container::Replace( void* p )
 
 /*************************************************************************
 |*
-|*    Container::Replace()
+|*	  Container::Replace()
 |*
-|*    Beschreibung      CONTNR.SDW
-|*    Ersterstellung    TH 17.09.91
-|*    Letzte Aenderung  TH 17.09.91
+|*	  Beschreibung		CONTNR.SDW
+|*	  Ersterstellung	TH 17.09.91
+|*	  Letzte Aenderung	TH 17.09.91
 |*
 *************************************************************************/
 
@@ -1065,7 +1065,7 @@ void* Container::Replace( void* p, ULONG nIndex )
         while ( pTemp->Count() <= nIndex )
         {
             nIndex -= pTemp->Count();
-            pTemp   = pTemp->GetNextBlock();
+            pTemp	= pTemp->GetNextBlock();
         }
 
         return pTemp->Replace( p, (USHORT)nIndex );
@@ -1074,11 +1074,11 @@ void* Container::Replace( void* p, ULONG nIndex )
 
 /*************************************************************************
 |*
-|*    Container::SetSize()
+|*	  Container::SetSize()
 |*
-|*    Beschreibung      CONTNR.SDW
-|*    Ersterstellung    TH 17.09.91
-|*    Letzte Aenderung  TH 17.09.91
+|*	  Beschreibung		CONTNR.SDW
+|*	  Ersterstellung	TH 17.09.91
+|*	  Letzte Aenderung	TH 17.09.91
 |*
 *************************************************************************/
 
@@ -1092,7 +1092,7 @@ void Container::SetSize( ULONG nNewSize )
         if ( nNewSize != nCount )
         {
             CBlock* pTemp;
-            ULONG   nTemp;
+            ULONG	nTemp;
 
             // Wird verkleinert
             if ( nNewSize < nCount )
@@ -1106,7 +1106,7 @@ void Container::SetSize( ULONG nNewSize )
                 }
 
                 // Alle folgenden Bloecke loeschen
-                BOOL    bLast = FALSE;
+                BOOL	bLast = FALSE;
                 CBlock* pDelNext;
                 CBlock* pDelBlock = pTemp->GetNextBlock();
                 while ( pDelBlock )
@@ -1218,11 +1218,11 @@ void Container::SetSize( ULONG nNewSize )
 
 /*************************************************************************
 |*
-|*    Container::Clear()
+|*	  Container::Clear()
 |*
-|*    Beschreibung      CONTNR.SDW
-|*    Ersterstellung    TH 17.09.91
-|*    Letzte Aenderung  TH 17.09.91
+|*	  Beschreibung		CONTNR.SDW
+|*	  Ersterstellung	TH 17.09.91
+|*	  Letzte Aenderung	TH 17.09.91
 |*
 *************************************************************************/
 
@@ -1241,19 +1241,19 @@ void Container::Clear()
 
     // Werte zuruecksetzen
     pFirstBlock = NULL;
-    pLastBlock  = NULL;
-    pCurBlock   = NULL;
-    nCount      = 0;
-    nCurIndex   = 0;
+    pLastBlock	= NULL;
+    pCurBlock	= NULL;
+    nCount		= 0;
+    nCurIndex	= 0;
 }
 
 /*************************************************************************
 |*
-|*    Container::GetCurObject()
+|*	  Container::GetCurObject()
 |*
-|*    Beschreibung      CONTNR.SDW
-|*    Ersterstellung    TH 17.09.91
-|*    Letzte Aenderung  TH 17.09.91
+|*	  Beschreibung		CONTNR.SDW
+|*	  Ersterstellung	TH 17.09.91
+|*	  Letzte Aenderung	TH 17.09.91
 |*
 *************************************************************************/
 
@@ -1270,11 +1270,11 @@ void* Container::GetCurObject() const
 
 /*************************************************************************
 |*
-|*    Container::GetCurPos()
+|*	  Container::GetCurPos()
 |*
-|*    Beschreibung      CONTNR.SDW
-|*    Ersterstellung    TH 17.09.91
-|*    Letzte Aenderung  TH 17.09.91
+|*	  Beschreibung		CONTNR.SDW
+|*	  Ersterstellung	TH 17.09.91
+|*	  Letzte Aenderung	TH 17.09.91
 |*
 *************************************************************************/
 
@@ -1289,7 +1289,7 @@ ULONG Container::GetCurPos() const
     {
         // Block suchen
         CBlock* pTemp = pFirstBlock;
-        ULONG   nTemp = 0;
+        ULONG	nTemp = 0;
         while ( pTemp != pCurBlock )
         {
             nTemp += pTemp->Count();
@@ -1302,11 +1302,11 @@ ULONG Container::GetCurPos() const
 
 /*************************************************************************
 |*
-|*    Container::GetObjectPtr()
+|*	  Container::GetObjectPtr()
 |*
-|*    Beschreibung      Interne Methode fuer Referenz-Container
-|*    Ersterstellung    TH 26.01.93
-|*    Letzte Aenderung  TH 26.01.93
+|*	  Beschreibung		Interne Methode fuer Referenz-Container
+|*	  Ersterstellung	TH 26.01.93
+|*	  Letzte Aenderung	TH 26.01.93
 |*
 *************************************************************************/
 
@@ -1324,7 +1324,7 @@ void** Container::GetObjectPtr( ULONG nIndex )
         while ( pTemp->Count() <= nIndex )
         {
             nIndex -= pTemp->Count();
-            pTemp   = pTemp->GetNextBlock();
+            pTemp	= pTemp->GetNextBlock();
         }
 
         // Item innerhalb des gefundenen Blocks zurueckgeben
@@ -1334,11 +1334,11 @@ void** Container::GetObjectPtr( ULONG nIndex )
 
 /*************************************************************************
 |*
-|*    Container::GetObject()
+|*	  Container::GetObject()
 |*
-|*    Beschreibung      CONTNR.SDW
-|*    Ersterstellung    TH 17.09.91
-|*    Letzte Aenderung  TH 17.09.91
+|*	  Beschreibung		CONTNR.SDW
+|*	  Ersterstellung	TH 17.09.91
+|*	  Letzte Aenderung	TH 17.09.91
 |*
 *************************************************************************/
 
@@ -1356,7 +1356,7 @@ void* Container::GetObject( ULONG nIndex ) const
         while ( pTemp->Count() <= nIndex )
         {
             nIndex -= pTemp->Count();
-            pTemp   = pTemp->GetNextBlock();
+            pTemp	= pTemp->GetNextBlock();
         }
 
         // Item innerhalb des gefundenen Blocks zurueckgeben
@@ -1366,11 +1366,11 @@ void* Container::GetObject( ULONG nIndex ) const
 
 /*************************************************************************
 |*
-|*    Container::GetPos()
+|*	  Container::GetPos()
 |*
-|*    Beschreibung      CONTNR.SDW
-|*    Ersterstellung    TH 17.09.91
-|*    Letzte Aenderung  TH 17.09.91
+|*	  Beschreibung		CONTNR.SDW
+|*	  Ersterstellung	TH 17.09.91
+|*	  Letzte Aenderung	TH 17.09.91
 |*
 *************************************************************************/
 
@@ -1378,11 +1378,11 @@ ULONG Container::GetPos( const void* p ) const
 {
     DBG_CHKTHIS( Container, DbgCheckContainer );
 
-    void**  pNodes;
+    void**	pNodes;
     CBlock* pTemp;
-    ULONG   nTemp;
-    USHORT  nBlockCount;
-    USHORT  i;
+    ULONG	nTemp;
+    USHORT	nBlockCount;
+    USHORT	i;
 
     // Block suchen
     pTemp = pFirstBlock;
@@ -1408,11 +1408,11 @@ ULONG Container::GetPos( const void* p ) const
 
 /*************************************************************************
 |*
-|*    Container::GetPos()
+|*	  Container::GetPos()
 |*
-|*    Beschreibung      CONTNR.SDW
-|*    Ersterstellung    TH 14.09.94
-|*    Letzte Aenderung  TH 14.09.94
+|*	  Beschreibung		CONTNR.SDW
+|*	  Ersterstellung	TH 14.09.94
+|*	  Letzte Aenderung	TH 14.09.94
 |*
 *************************************************************************/
 
@@ -1426,13 +1426,13 @@ ULONG Container::GetPos( const void* p, ULONG nStartIndex,
         return CONTAINER_ENTRY_NOTFOUND;
     else
     {
-        void**  pNodes;
-        USHORT  nBlockCount;
-        USHORT  i;
+        void**	pNodes;
+        USHORT	nBlockCount;
+        USHORT	i;
 
         // Block suchen
         CBlock* pTemp = pFirstBlock;
-        ULONG   nTemp = 0;
+        ULONG	nTemp = 0;
         while ( nTemp+pTemp->Count() <= nStartIndex )
         {
             nTemp += pTemp->Count();
@@ -1503,11 +1503,11 @@ ULONG Container::GetPos( const void* p, ULONG nStartIndex,
 
 /*************************************************************************
 |*
-|*    Container::Seek()
+|*	  Container::Seek()
 |*
-|*    Beschreibung      CONTNR.SDW
-|*    Ersterstellung    TH 17.09.91
-|*    Letzte Aenderung  TH 17.09.91
+|*	  Beschreibung		CONTNR.SDW
+|*	  Ersterstellung	TH 17.09.91
+|*	  Letzte Aenderung	TH 17.09.91
 |*
 *************************************************************************/
 
@@ -1525,7 +1525,7 @@ void* Container::Seek( ULONG nIndex )
         while ( pTemp->Count() <= nIndex )
         {
             nIndex -= pTemp->Count();
-            pTemp   = pTemp->GetNextBlock();
+            pTemp	= pTemp->GetNextBlock();
         }
 
         // Item innerhalb des gefundenen Blocks zurueckgeben
@@ -1537,11 +1537,11 @@ void* Container::Seek( ULONG nIndex )
 
 /*************************************************************************
 |*
-|*    Container::First()
+|*	  Container::First()
 |*
-|*    Beschreibung      CONTNR.SDW
-|*    Ersterstellung    TH 17.09.91
-|*    Letzte Aenderung  TH 17.09.91
+|*	  Beschreibung		CONTNR.SDW
+|*	  Ersterstellung	TH 17.09.91
+|*	  Letzte Aenderung	TH 17.09.91
 |*
 *************************************************************************/
 
@@ -1563,11 +1563,11 @@ void* Container::First()
 
 /*************************************************************************
 |*
-|*    Container::Last()
+|*	  Container::Last()
 |*
-|*    Beschreibung      CONTNR.SDW
-|*    Ersterstellung    TH 17.09.91
-|*    Letzte Aenderung  TH 17.09.91
+|*	  Beschreibung		CONTNR.SDW
+|*	  Ersterstellung	TH 17.09.91
+|*	  Letzte Aenderung	TH 17.09.91
 |*
 *************************************************************************/
 
@@ -1589,11 +1589,11 @@ void* Container::Last()
 
 /*************************************************************************
 |*
-|*    Container::Next()
+|*	  Container::Next()
 |*
-|*    Beschreibung      CONTNR.SDW
-|*    Ersterstellung    TH 17.09.91
-|*    Letzte Aenderung  TH 17.09.91
+|*	  Beschreibung		CONTNR.SDW
+|*	  Ersterstellung	TH 17.09.91
+|*	  Letzte Aenderung	TH 17.09.91
 |*
 *************************************************************************/
 
@@ -1621,11 +1621,11 @@ void* Container::Next()
 
 /*************************************************************************
 |*
-|*    Container::Prev()
+|*	  Container::Prev()
 |*
-|*    Beschreibung      CONTNR.SDW
-|*    Ersterstellung    TH 17.09.91
-|*    Letzte Aenderung  TH 17.09.91
+|*	  Beschreibung		CONTNR.SDW
+|*	  Ersterstellung	TH 17.09.91
+|*	  Letzte Aenderung	TH 17.09.91
 |*
 *************************************************************************/
 
@@ -1653,11 +1653,11 @@ void* Container::Prev()
 
 /*************************************************************************
 |*
-|*    Container::operator =()
+|*	  Container::operator =()
 |*
-|*    Beschreibung      CONTNR.SDW
-|*    Ersterstellung    TH 17.09.91
-|*    Letzte Aenderung  TH 17.09.91
+|*	  Beschreibung		CONTNR.SDW
+|*	  Ersterstellung	TH 17.09.91
+|*	  Letzte Aenderung	TH 17.09.91
 |*
 *************************************************************************/
 
@@ -1681,11 +1681,11 @@ Container& Container::operator =( const Container& r )
 
 /*************************************************************************
 |*
-|*    Container::operator ==()
+|*	  Container::operator ==()
 |*
-|*    Beschreibung      CONTNR.SDW
-|*    Ersterstellung    TH 17.09.91
-|*    Letzte Aenderung  TH 17.09.91
+|*	  Beschreibung		CONTNR.SDW
+|*	  Ersterstellung	TH 17.09.91
+|*	  Letzte Aenderung	TH 17.09.91
 |*
 *************************************************************************/
 
diff --git a/tools/source/memtools/mempool.cxx b/tools/source/memtools/mempool.cxx
index 45d6d2ea9367..1ce4680fc096 100644
--- a/tools/source/memtools/mempool.cxx
+++ b/tools/source/memtools/mempool.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
diff --git a/tools/source/memtools/multisel.cxx b/tools/source/memtools/multisel.cxx
index 1e4da74348f4..beca496b11a3 100644
--- a/tools/source/memtools/multisel.cxx
+++ b/tools/source/memtools/multisel.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
@@ -147,12 +147,12 @@ MultiSelection::MultiSelection( const UniString& rString, sal_Unicode cRange, sa
     // an die verschiedenen Systeme (UNIX etc.)
     // und die gewuenschte Eingabe-Syntax angepasst werden.
 
-    UniString           aStr( rString );
-    sal_Unicode*        pStr   = aStr.GetBufferAccess();
-    sal_Unicode*        pOld = pStr;
-    BOOL                bReady = FALSE;
-    BOOL                bUntil = FALSE;
-    xub_StrLen          nCut   = 0;
+    UniString			aStr( rString );
+    sal_Unicode*		pStr   = aStr.GetBufferAccess();
+    sal_Unicode*		pOld = pStr;
+    BOOL				bReady = FALSE;
+    BOOL				bUntil = FALSE;
+    xub_StrLen			nCut   = 0;
 
     // Hier normieren wir den String, sodass nur Ziffern,
     // Semikola als Trenn- und Minus als VonBis-Zeichen
@@ -228,11 +228,11 @@ MultiSelection::MultiSelection( const UniString& rString, sal_Unicode cRange, sa
     aStr.ReleaseBufferAccess( nCut );
 
     // Jetzt wird der normierte String ausgewertet ..
-    UniString           aNumStr;
-    Range               aRg( 1, RANGE_MAX );
-    const sal_Unicode*  pCStr = aStr.GetBuffer();
-    long                nPage = 1;
-    long                nNum  = 1;
+    UniString			aNumStr;
+    Range				aRg( 1, RANGE_MAX );
+    const sal_Unicode*	pCStr = aStr.GetBuffer();
+    long				nPage = 1;
+    long				nNum  = 1;
     bUntil = FALSE;
     while ( *pCStr )
     {
@@ -880,7 +880,7 @@ StringRangeEnumerator::StringRangeEnumerator( const rtl::OUString& i_rInput,
     : mnCount( 0 )
     , mnMin( i_nMinNumber )
     , mnMax( i_nMaxNumber )
-    , mnOffset( i_nLogicalOffset )
+    , mnOffset( i_nLogicalOffset )                   
 {
     setRange( i_rInput );
 }
@@ -951,7 +951,7 @@ bool StringRangeEnumerator::insertRange( sal_Int32 i_nFirst, sal_Int32 i_nLast,
                 bSuccess = false;
         }
     }
-
+    
     return bSuccess;
 }
 
@@ -969,7 +969,7 @@ bool StringRangeEnumerator::setRange( const rtl::OUString& i_rNewRange, bool i_b
         }
         return true;
     }
-
+    
     const sal_Unicode* pInput = i_rNewRange.getStr();
     rtl::OUStringBuffer aNumberBuf( 16 );
     sal_Int32 nLastNumber = -1, nNumber = -1;
@@ -1018,11 +1018,11 @@ bool StringRangeEnumerator::setRange( const rtl::OUString& i_rNewRange, bool i_b
             bInsertRange = true;
         else if( *pInput )
         {
-
+            
             bSuccess = false;
             break; // parse error
         }
-
+        
         if( bInsertRange )
         {
             if( ! insertRange( nLastNumber, nNumber, bSequence, ! i_bStrict ) && i_bStrict )
@@ -1038,7 +1038,7 @@ bool StringRangeEnumerator::setRange( const rtl::OUString& i_rNewRange, bool i_b
     }
     // insert last entries
     insertRange( nLastNumber, nNumber, bSequence, ! i_bStrict );
-
+    
     return bSuccess;
 }
 
diff --git a/tools/source/memtools/table.cxx b/tools/source/memtools/table.cxx
index 50ac46e99758..ae5bcfbd3e16 100644
--- a/tools/source/memtools/table.cxx
+++ b/tools/source/memtools/table.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
@@ -43,11 +43,11 @@ ULONG Table::ImplGetIndex( ULONG nKey, ULONG* pIndex ) const
     if ( !nCount || (nKey < (ULONG)Container::ImpGetObject(0)) )
         return TABLE_ENTRY_NOTFOUND;
 
-    ULONG   nLow;
-    ULONG   nHigh;
-    ULONG   nMid;
-    ULONG   nCompareKey;
-    void**  pNodes = Container::ImpGetOnlyNodes();
+    ULONG	nLow;
+    ULONG	nHigh;
+    ULONG	nMid;
+    ULONG	nCompareKey;
+    void**	pNodes = Container::ImpGetOnlyNodes();
 
     // Binaeres Suchen
     nLow  = 0;
@@ -122,7 +122,7 @@ BOOL Table::Insert( ULONG nKey, void* p )
         {
             USHORT n = 0;
             USHORT nTempCount = (USHORT)nCount * 2;
-            //<!--Modified by PengYunQuan for resolving a NULL pointer access
+            //<!--Modified by PengYunQuan for resolving a NULL pointer access 
 
             if( void** pNodes = Container::ImpGetOnlyNodes() )
             {
@@ -152,7 +152,7 @@ BOOL Table::Insert( ULONG nKey, void* p )
                 if ( ImplGetIndex( nKey, &i ) != TABLE_ENTRY_NOTFOUND )
                     return FALSE;
             }
-            //-->Modified by PengYunQuan for resolving a NULL pointer access
+            //-->Modified by PengYunQuan for resolving a NULL pointer access 
         }
         else
         {
diff --git a/tools/source/memtools/unqidx.cxx b/tools/source/memtools/unqidx.cxx
index 94624c3ac905..985dbae1783c 100644
--- a/tools/source/memtools/unqidx.cxx
+++ b/tools/source/memtools/unqidx.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
@@ -45,10 +45,10 @@ UniqueIndex::UniqueIndex( ULONG _nStartIndex,
                           ULONG _nInitSize, ULONG _nReSize ) :
                  Container( _nInitSize )
 {
-    nReSize         = _nReSize;
-    nStartIndex     = _nStartIndex;
-    nUniqIndex      = 0;
-    nCount          = 0;
+    nReSize     	= _nReSize;
+    nStartIndex 	= _nStartIndex;
+    nUniqIndex  	= 0;
+    nCount      	= 0;
 }
 
 /*************************************************************************
diff --git a/tools/source/misc/appendunixshellword.cxx b/tools/source/misc/appendunixshellword.cxx
index af2a05b00716..6d65438542c7 100644
--- a/tools/source/misc/appendunixshellword.cxx
+++ b/tools/source/misc/appendunixshellword.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
diff --git a/tools/source/misc/extendapplicationenvironment.cxx b/tools/source/misc/extendapplicationenvironment.cxx
index fe76e5329cbb..80ed43fac29a 100644
--- a/tools/source/misc/extendapplicationenvironment.cxx
+++ b/tools/source/misc/extendapplicationenvironment.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
diff --git a/tools/source/misc/getprocessworkingdir.cxx b/tools/source/misc/getprocessworkingdir.cxx
index 8cad594befca..60d7e24bdd30 100644
--- a/tools/source/misc/getprocessworkingdir.cxx
+++ b/tools/source/misc/getprocessworkingdir.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
diff --git a/tools/source/misc/pathutils.cxx b/tools/source/misc/pathutils.cxx
index 397bade136e7..ba4c78fa9f3a 100644
--- a/tools/source/misc/pathutils.cxx
+++ b/tools/source/misc/pathutils.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
diff --git a/tools/source/misc/solarmutex.cxx b/tools/source/misc/solarmutex.cxx
index 5abdfef5e37f..95f37bef6fba 100644
--- a/tools/source/misc/solarmutex.cxx
+++ b/tools/source/misc/solarmutex.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
diff --git a/tools/source/rc/isofallback.cxx b/tools/source/rc/isofallback.cxx
index 002a90f580aa..d59e4175b46d 100644
--- a/tools/source/rc/isofallback.cxx
+++ b/tools/source/rc/isofallback.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
diff --git a/tools/source/rc/rc.cxx b/tools/source/rc/rc.cxx
index e24b8f8824d4..567588c51713 100644
--- a/tools/source/rc/rc.cxx
+++ b/tools/source/rc/rc.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
diff --git a/tools/source/rc/resary.cxx b/tools/source/rc/resary.cxx
index a55a4f644a9f..eda5de6c40b3 100644
--- a/tools/source/rc/resary.cxx
+++ b/tools/source/rc/resary.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
@@ -50,7 +50,7 @@ ResStringArray::ResStringArray( const ResId& rResId )
             {
                 // load string
                 m_aStrings.push_back( ImplResStringItem( pMgr->ReadString() ) );
-
+    
                 // load value
                 m_aStrings[i].m_nValue = pMgr->ReadLong();
             }
diff --git a/tools/source/rc/resmgr.cxx b/tools/source/rc/resmgr.cxx
index daeaf8e4c3a5..6349298aefdc 100644
--- a/tools/source/rc/resmgr.cxx
+++ b/tools/source/rc/resmgr.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
@@ -93,13 +93,13 @@ class InternalResMgr
     friend class SimpleResMgr;
     friend class ResMgrContainer;
 
-    ImpContent *                    pContent;
-    UINT32                          nOffCorrection;
-    BYTE *                          pStringBlock;
-    SvStream *                      pStm;
-    BOOL                            bEqual2Content;
-    UINT32                          nEntries;
-    OUString                        aFileName;
+    ImpContent *			        pContent;
+    UINT32					        nOffCorrection;
+    BYTE *					        pStringBlock;
+    SvStream *				        pStm;
+    BOOL					        bEqual2Content;
+    UINT32					        nEntries;
+    OUString				        aFileName;
     OUString                        aPrefix;
     OUString                        aResName;
     bool                            bSingular;
@@ -111,15 +111,15 @@ class InternalResMgr
                                             const OUString& aResName,
                                             const com::sun::star::lang::Locale& rLocale );
                             ~InternalResMgr();
-    BOOL                    Create();
+    BOOL					Create();
 
-    BOOL                    IsGlobalAvailable( RESOURCE_TYPE nRT, sal_uInt32 nId ) const;
-    void *                  LoadGlobalRes( RESOURCE_TYPE nRT, sal_uInt32 nId,
+    BOOL					IsGlobalAvailable( RESOURCE_TYPE nRT, sal_uInt32 nId ) const;
+    void *					LoadGlobalRes( RESOURCE_TYPE nRT, sal_uInt32 nId,
                                            void **pResHandle );
 public:
-    void                    FreeGlobalRes( void *, void * );
+    void					FreeGlobalRes( void *, void * );
 
-    SvStream *              GetBitmapStream( sal_uInt32 nResId );
+    SvStream *				GetBitmapStream( sal_uInt32 nResId );
 };
 
 // =======================================================================
@@ -127,39 +127,39 @@ public:
 class ResMgrContainer
 {
     static ResMgrContainer*     pOneInstance;
-
+    
     struct ContainerElement
     {
         InternalResMgr* pResMgr;
         OUString        aFileURL;
         int             nRefCount;
         int             nLoadCount;
-
+        
         ContainerElement() :
             pResMgr( NULL ),
             nRefCount( 0 ),
             nLoadCount( 0 )
             {}
     };
-
+    
     std::hash_map< OUString, ContainerElement, OUStringHash> m_aResFiles;
     com::sun::star::lang::Locale                             m_aDefLocale;
-
+    
     ResMgrContainer() { init(); }
     ~ResMgrContainer();
-
+    
     void init();
     public:
 
-    static ResMgrContainer& get();
+    static ResMgrContainer& get();    
     static void release();
-
+    
     InternalResMgr* getResMgr( const OUString& rPrefix,
                                com::sun::star::lang::Locale& rLocale,
                                bool bForceNewInstance = false
                                );
     InternalResMgr* getNextFallback( InternalResMgr* pResMgr );
-
+    
     void freeResMgr( InternalResMgr* pResMgr );
 
     void setDefLocale( const com::sun::star::lang::Locale& rLocale )
@@ -200,7 +200,7 @@ void ResMgrContainer::init()
     // get resource path
     std::list< OUString > aDirs;
     sal_Int32 nIndex = 0;
-
+    
     // 1. fixed locations
     rtl::OUString uri(
         RTL_CONSTASCII_USTRINGPARAM("$BRAND_BASE_DIR/program/resource"));
@@ -210,7 +210,7 @@ void ResMgrContainer::init()
         RTL_CONSTASCII_USTRINGPARAM("$OOO_BASE_DIR/program/resource"));
     rtl::Bootstrap::expandMacros(uri);
     aDirs.push_back(uri);
-
+    
     // 2. in STAR_RESOURCEPATH
     const sal_Char* pEnv = getenv( "STAR_RESOURCEPATH" );
     if( pEnv )
@@ -286,7 +286,7 @@ InternalResMgr* ResMgrContainer::getResMgr( const OUString& rPrefix,
     com::sun::star::lang::Locale aLocale( rLocale );
     OUStringBuffer aSearch( rPrefix.getLength() + 16 );
     std::hash_map< OUString, ContainerElement, OUStringHash >::iterator it = m_aResFiles.end();
-
+    
     int nTries = 0;
     if( aLocale.Language.getLength() > 0 )
         nTries = 1;
@@ -405,10 +405,10 @@ InternalResMgr* ResMgrContainer::getResMgr( const OUString& rPrefix,
     // at this point it->second.pResMgr must be filled either by creating a new one
     // (then the refcount is still 0) or because we already had one
     InternalResMgr* pImp = it->second.pResMgr;
-
+    
     if( it->second.nRefCount == 0 )
         it->second.nLoadCount++;
-
+    
     // for SimpleResMgr
     if( bForceNewInstance )
     {
@@ -434,7 +434,7 @@ InternalResMgr* ResMgrContainer::getResMgr( const OUString& rPrefix,
     }
     else
         it->second.nRefCount++;
-
+    
     return pImp;
 }
 
@@ -499,7 +499,7 @@ struct ImpContent
 
 struct ImpContentLessCompare : public ::std::binary_function< ImpContent, ImpContent, bool>
 {
-    inline bool operator() (const ImpContent& lhs, const ImpContent& rhs) const
+    inline bool operator() (const ImpContent& lhs, const ImpContent& rhs) const 
     {
         return lhs.nTypeAndId < rhs.nTypeAndId;
     }
@@ -507,11 +507,11 @@ struct ImpContentLessCompare : public ::std::binary_function< ImpContent, ImpCon
 
 struct ImpContentMixLessCompare : public ::std::binary_function< ImpContent, sal_uInt64, bool>
 {
-    inline bool operator() (const ImpContent& lhs, const sal_uInt64& rhs) const
+    inline bool operator() (const ImpContent& lhs, const sal_uInt64& rhs) const 
     {
         return lhs.nTypeAndId < rhs;
     }
-    inline bool operator() (const sal_uInt64& lhs, const ImpContent& rhs) const
+    inline bool operator() (const sal_uInt64& lhs, const ImpContent& rhs) const 
     {
         return lhs < rhs.nTypeAndId;
     }
@@ -664,7 +664,7 @@ BOOL InternalResMgr::Create()
         OSL_ENSURE( bEqual2Content, "resource structure wrong" );
         if( !bSorted )
             ::std::sort(pContent,pContent+nEntries,ImpContentLessCompare());
-            //  qsort( pContent, nEntries, sizeof( ImpContent ), Compare );
+            //	qsort( pContent, nEntries, sizeof( ImpContent ), Compare );
 
         bDone = TRUE;
     }
@@ -697,7 +697,7 @@ void* InternalResMgr::LoadGlobalRes( RESOURCE_TYPE nRT, sal_uInt32 nId,
     // Anfang der Strings suchen
     sal_uInt64 nValue = ((sal_uInt64(nRT) << 32) | nId);
     ImpContent* pEnd = (pContent + nEntries);
-    ImpContent* pFind = ::std::lower_bound( pContent,
+    ImpContent* pFind = ::std::lower_bound(	pContent,
                                             pEnd,
                                             nValue,
                                             ImpContentMixLessCompare());
@@ -801,7 +801,7 @@ void ResMgr::RscError_Impl( const sal_Char* pMessage, ResMgr* pResMgr,
         ResMgrContainer::get().getResMgr( pResMgr->pImpRes->aPrefix,
                                           pResMgr->pImpRes->aLocale,
                                           true );
-
+                                          
     ResMgr* pNewResMgr = new ResMgr( pImp );
 
     ByteString aStr = OUStringToOString( pResMgr->GetFileName(), RTL_TEXTENCODING_UTF8 );
@@ -990,7 +990,7 @@ ResMgr::~ResMgr()
     osl::Guard<osl::Mutex> aGuard( getResMgrMutex() );
 
     ResMgrContainer::get().freeResMgr( pImpRes );
-
+    
     // clean up possible left rc stack frames
     while( nCurStack > 0 )
     {
@@ -1008,7 +1008,7 @@ void ResMgr::incStack()
     if( nCurStack >= int(aStack.size()) )
         aStack.push_back( ImpRCStack() );
     aStack[nCurStack].Clear();
-
+    
     DBG_ASSERT( nCurStack < 32, "Resource stack unreasonably large" );
 }
 
@@ -1028,7 +1028,7 @@ void ResMgr::decStack()
         {
             #if OSL_DEBUG_LEVEL > 1
             OSL_TRACE( "returning from fallback %s\n",
-                     OUStringToOString(pFallbackResMgr->GetFileName(), osl_getThreadTextEncoding() ).getStr() );
+                     OUStringToOString(pFallbackResMgr->GetFileName(), osl_getThreadTextEncoding() ).getStr() ); 
             #endif
             delete pFallbackResMgr;
             pFallbackResMgr = NULL;
@@ -1081,14 +1081,14 @@ BOOL ResMgr::IsAvailable( const ResId& rId, const Resource* pResObj ) const
 
     if ( !pMgr )
         pMgr = this;
-
+    
     if( pMgr->pFallbackResMgr )
     {
         ResId aId( rId );
         aId.SetResMgr( NULL );
         return pMgr->pFallbackResMgr->IsAvailable( aId, pResObj );
     }
-
+    
     if ( !pResObj || pResObj == pMgr->aStack[pMgr->nCurStack].pResObj )
     {
         if ( !pClassRes )
@@ -1115,7 +1115,7 @@ void* ResMgr::GetClass()
 
     if( pFallbackResMgr )
         return pFallbackResMgr->GetClass();
-
+    
     return aStack[nCurStack].pClassRes;
 }
 
@@ -1135,7 +1135,7 @@ BOOL ResMgr::GetResource( const ResId& rId, const Resource* pResObj )
     ResMgr* pMgr = rId.GetResMgr();
     if ( pMgr && (this != pMgr) )
         return pMgr->GetResource( rId, pResObj );
-
+    
     // normally Increment will pop the context; this is
     // not possible in RC_NOTFOUND case, so pop a frame here
     ImpRCStack* pTop = &aStack[nCurStack];
@@ -1248,7 +1248,7 @@ void ResMgr::PopContext( const Resource* pResObj )
         pFallbackResMgr->PopContext( pResObj );
         return;
     }
-
+    
 #ifdef DBG_UTIL
     if ( DbgIsResource() )
     {
@@ -1299,7 +1299,7 @@ RSHEADER_TYPE* ResMgr::CreateBlock( const ResId& rId )
         aId.SetResMgr( NULL );
         return pFallbackResMgr->CreateBlock( aId );
     }
-
+    
     RSHEADER_TYPE* pHeader = NULL;
     if ( GetResource( rId ) )
     {
@@ -1385,7 +1385,7 @@ sal_uInt32 ResMgr::GetRemainSize()
 
     if( pFallbackResMgr )
         return pFallbackResMgr->GetRemainSize();
-
+    
     const ImpRCStack& rTop = aStack[nCurStack];
     return  (sal_uInt32)((long)(BYTE *)rTop.pResource +
                      rTop.pResource->GetLocalOff() -
@@ -1400,11 +1400,11 @@ void* ResMgr::Increment( sal_uInt32 nSize )
 
     if( pFallbackResMgr )
         return pFallbackResMgr->Increment( nSize );
-
+    
     ImpRCStack& rStack = aStack[nCurStack];
     if( (rStack.Flags & RC_NOTFOUND) )
         return rStack.pClassRes;
-
+    
     BYTE* pClassRes = (BYTE*)rStack.pClassRes + nSize;
 
     rStack.pClassRes = pClassRes;
@@ -1680,9 +1680,9 @@ ResMgr* ResMgr::CreateResMgr( const sal_Char* pPrefixName,
     osl::Guard<osl::Mutex> aGuard( getResMgrMutex() );
 
     OUString aPrefix( pPrefixName, strlen( pPrefixName ), osl_getThreadTextEncoding() );
-
+    
     if( ! aLocale.Language.getLength() )
-        aLocale = ResMgrContainer::get().getDefLocale();
+        aLocale = ResMgrContainer::get().getDefLocale();    
 
     InternalResMgr* pImp = ResMgrContainer::get().getResMgr( aPrefix, aLocale );
     return pImp ? new ResMgr( pImp ) : NULL;
@@ -1700,7 +1700,7 @@ ResMgr* ResMgr::SearchCreateResMgr(
 
     if( ! rLocale.Language.getLength() )
         rLocale = ResMgrContainer::get().getDefLocale();
-
+    
     InternalResMgr* pImp = ResMgrContainer::get().getResMgr( aPrefix, rLocale );
     return pImp ? new ResMgr( pImp ) : NULL;
 }
@@ -1713,7 +1713,7 @@ INT16 ResMgr::ReadShort()
 
     if( pFallbackResMgr )
         return pFallbackResMgr->ReadShort();
-
+    
     INT16 n = GetShort( GetClass() );
     Increment( sizeof( INT16 ) );
     return n;
@@ -1727,7 +1727,7 @@ INT32 ResMgr::ReadLong()
 
     if( pFallbackResMgr )
         return pFallbackResMgr->ReadLong();
-
+    
     INT32 n = GetLong( GetClass() );
     Increment( sizeof( INT32 ) );
     return n;
@@ -1741,7 +1741,7 @@ UniString ResMgr::ReadStringWithoutHook()
 
     if( pFallbackResMgr )
         return pFallbackResMgr->ReadStringWithoutHook();
-
+    
     UniString aRet;
 
     const ImpRCStack& rTop = aStack[nCurStack];
@@ -1753,7 +1753,7 @@ UniString ResMgr::ReadStringWithoutHook()
     }
     else
         Increment( GetStringWithoutHook( aRet, (const BYTE*)GetClass() ) );
-
+    
     return aRet;
 }
 
@@ -1773,7 +1773,7 @@ ULONG ResMgr::GetAutoHelpId()
 
     if( pFallbackResMgr )
         return pFallbackResMgr->GetAutoHelpId();
-
+    
     DBG_ASSERT( nCurStack, "resource stack empty in Auto help id generation" );
     if( nCurStack < 1 || nCurStack > 2 )
         return 0;
@@ -1785,7 +1785,7 @@ ULONG ResMgr::GetAutoHelpId()
 
     if( !nGID || nGID > 32767 )
         return 0;
-
+    
     ULONG nHID = 0;
 
     // GGGg gggg::gggg gggg::ggLL LLLl::llll llll
@@ -1847,7 +1847,7 @@ ULONG ResMgr::GetAutoHelpId()
             return 0;
     } // of switch
     nHID |= nGID << 14;
-
+    
     return nHID;
 }
 
@@ -1891,9 +1891,9 @@ SimpleResMgr::SimpleResMgr( const sal_Char* pPrefixName,
 
     osl::Guard<osl::Mutex> aGuard( getResMgrMutex() );
     if( ! aLocale.Language.getLength() )
-        aLocale = ResMgrContainer::get().getDefLocale();
-
-    m_pResImpl = ResMgrContainer::get().getResMgr( aPrefix, aLocale, true );
+        aLocale = ResMgrContainer::get().getDefLocale(); 
+    
+    m_pResImpl = ResMgrContainer::get().getResMgr( aPrefix, aLocale, true );     
     DBG_ASSERT( m_pResImpl, "SimpleResMgr::SimpleResMgr : have no impl class !" );
 }
 
@@ -1901,7 +1901,7 @@ SimpleResMgr::SimpleResMgr( const sal_Char* pPrefixName,
 SimpleResMgr::SimpleResMgr( const ::rtl::OUString& _rPrefixName, ::com::sun::star::lang::Locale& _inout_Locale )
 {
     osl::Guard<osl::Mutex> aGuard( getResMgrMutex() );
-    m_pResImpl = ResMgrContainer::get().getResMgr( _rPrefixName, _inout_Locale, true );
+    m_pResImpl = ResMgrContainer::get().getResMgr( _rPrefixName, _inout_Locale, true );     
 }
 
 // -----------------------------------------------------------------------
diff --git a/tools/source/ref/errinf.cxx b/tools/source/ref/errinf.cxx
index 2f9c75a4b71c..fc70fd09d9ef 100644
--- a/tools/source/ref/errinf.cxx
+++ b/tools/source/ref/errinf.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
@@ -370,7 +370,7 @@ USHORT ErrorHandler::HandleError_Impl(
     // Error 1 ist General Error im Sfx
     if(pInfo->GetErrorCode()!=1) {
         HandleError_Impl(1, USHRT_MAX, bJustCreateString, rError);
-    }
+    } 
     else {
         DBG_ERROR("Error 1 nicht gehandeled");
     }
diff --git a/tools/source/ref/globname.cxx b/tools/source/ref/globname.cxx
index 2d45e470e688..e341ccf7ceb3 100644
--- a/tools/source/ref/globname.cxx
+++ b/tools/source/ref/globname.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
@@ -50,7 +50,7 @@ ImpSvGlobalName::ImpSvGlobalName( int )
 }
 
 /*************************************************************************
-|*    ImpSvGlobalName::operator ==()
+|*	  ImpSvGlobalName::operator ==()
 *************************************************************************/
 BOOL ImpSvGlobalName::operator == ( const ImpSvGlobalName & rObj ) const
 {
@@ -58,7 +58,7 @@ BOOL ImpSvGlobalName::operator == ( const ImpSvGlobalName & rObj ) const
 }
 
 /*************************************************************************
-|*    SvGlobalName::SvGlobalName()
+|*	  SvGlobalName::SvGlobalName()
 *************************************************************************/
 SvGlobalName::SvGlobalName()
 {
@@ -94,7 +94,7 @@ SvGlobalName::SvGlobalName( UINT32 n1, USHORT n2, USHORT n3,
     pImp = new ImpSvGlobalName();
     pImp->nRefCount++;
 
-    *(UINT32 *)pImp->szData       = n1;
+    *(UINT32 *)pImp->szData 	  = n1;
     *(USHORT *)&pImp->szData[ 4 ] = n2;
     *(USHORT *)&pImp->szData[ 6 ] = n3;
     pImp->szData[ 8  ] = b8;
@@ -108,7 +108,7 @@ SvGlobalName::SvGlobalName( UINT32 n1, USHORT n2, USHORT n3,
 }
 
 /*************************************************************************
-|*    SvGlobalName::~SvGlobalName()
+|*	  SvGlobalName::~SvGlobalName()
 *************************************************************************/
 SvGlobalName::~SvGlobalName()
 {
@@ -118,7 +118,7 @@ SvGlobalName::~SvGlobalName()
 }
 
 /*************************************************************************
-|*    SvGlobalName::operator = ()
+|*	  SvGlobalName::operator = ()
 *************************************************************************/
 SvGlobalName & SvGlobalName::operator = ( const SvGlobalName & rObj )
 {
@@ -131,7 +131,7 @@ SvGlobalName & SvGlobalName::operator = ( const SvGlobalName & rObj )
 }
 
 /*************************************************************************
-|*    SvGlobalName::NewImp()
+|*	  SvGlobalName::NewImp()
 *************************************************************************/
 void SvGlobalName::NewImp()
 {
@@ -144,8 +144,8 @@ void SvGlobalName::NewImp()
 }
 
 /*************************************************************************
-|*    SvGlobalName::operator << ()
-|*    SvGlobalName::operator >> ()
+|*	  SvGlobalName::operator << ()
+|*	  SvGlobalName::operator >> ()
 *************************************************************************/
 SvStream& operator << ( SvStream& rOStr, const SvGlobalName & rObj )
 {
@@ -168,7 +168,7 @@ SvStream& operator >> ( SvStream& rStr, SvGlobalName & rObj )
 
 
 /*************************************************************************
-|*    SvGlobalName::operator < ()
+|*	  SvGlobalName::operator < ()
 *************************************************************************/
 BOOL SvGlobalName::operator < ( const SvGlobalName & rObj ) const
 {
@@ -181,14 +181,14 @@ BOOL SvGlobalName::operator < ( const SvGlobalName & rObj ) const
     else if( *(USHORT *)&pImp->szData[ 4 ] < *(USHORT *)&rObj.pImp->szData[ 4 ] )
         return TRUE;
     else if( *(USHORT *)&pImp->szData[ 4 ] == *(USHORT *)&rObj.pImp->szData[ 4 ] )
-        return *(UINT32 *)pImp->szData  < *(UINT32 *)rObj.pImp->szData;
+        return *(UINT32 *)pImp->szData	< *(UINT32 *)rObj.pImp->szData;
     else
         return FALSE;
 
 }
 
 /*************************************************************************
-|*    SvGlobalName::operator +=()
+|*	  SvGlobalName::operator +=()
 *************************************************************************/
 SvGlobalName & SvGlobalName::operator += ( UINT32 n )
 {
@@ -202,7 +202,7 @@ SvGlobalName & SvGlobalName::operator += ( UINT32 n )
 }
 
 /*************************************************************************
-|*    SvGlobalName::operator ==()
+|*	  SvGlobalName::operator ==()
 *************************************************************************/
 BOOL SvGlobalName::operator == ( const SvGlobalName & rObj ) const
 {
@@ -216,11 +216,11 @@ void SvGlobalName::MakeFromMemory( void * pData )
 }
 
 /*************************************************************************
-|*    SvGlobalName::MakeId()
+|*	  SvGlobalName::MakeId()
 *************************************************************************/
 BOOL SvGlobalName::MakeId( const String & rIdStr )
 {
-    ByteString  aStr( rIdStr, RTL_TEXTENCODING_ASCII_US );
+    ByteString	aStr( rIdStr, RTL_TEXTENCODING_ASCII_US );
     sal_Char * pStr = (sal_Char *)aStr.GetBuffer();
     if( rIdStr.Len() == 36
       && '-' == pStr[ 8 ]  && '-' == pStr[ 13 ]
@@ -286,7 +286,7 @@ BOOL SvGlobalName::MakeId( const String & rIdStr )
         }
 
         NewImp();
-        *(UINT32 *)pImp->szData       = nFirst;
+        *(UINT32 *)pImp->szData 	  = nFirst;
         *(USHORT *)&pImp->szData[ 4 ] = nSec;
         *(USHORT *)&pImp->szData[ 6 ] = nThird;
         memcpy( &pImp->szData[ 8 ], szRemain, 8 );
@@ -296,7 +296,7 @@ BOOL SvGlobalName::MakeId( const String & rIdStr )
 }
 
 /*************************************************************************
-|*    SvGlobalName::GetctorName()
+|*	  SvGlobalName::GetctorName()
 *************************************************************************/
 String SvGlobalName::GetctorName() const
 {
@@ -322,7 +322,7 @@ String SvGlobalName::GetctorName() const
 }
 
 /*************************************************************************
-|*    SvGlobalName::GetHexName()
+|*	  SvGlobalName::GetHexName()
 *************************************************************************/
 String SvGlobalName::GetHexName() const
 {
@@ -356,7 +356,7 @@ String SvGlobalName::GetHexName() const
 /************** SvGlobalNameList ****************************************/
 /************************************************************************/
 /*************************************************************************
-|*    SvGlobalNameList::SvGlobalNameList()
+|*	  SvGlobalNameList::SvGlobalNameList()
 *************************************************************************/
 SvGlobalNameList::SvGlobalNameList()
     : aList( 1, 1 )
@@ -364,7 +364,7 @@ SvGlobalNameList::SvGlobalNameList()
 }
 
 /*************************************************************************
-|*    SvGlobalNameList::~SvGlobalNameList()
+|*	  SvGlobalNameList::~SvGlobalNameList()
 *************************************************************************/
 SvGlobalNameList::~SvGlobalNameList()
 {
@@ -378,7 +378,7 @@ SvGlobalNameList::~SvGlobalNameList()
 }
 
 /*************************************************************************
-|*    SvGlobalNameList::Append()
+|*	  SvGlobalNameList::Append()
 *************************************************************************/
 void SvGlobalNameList::Append( const SvGlobalName & rName )
 {
@@ -387,7 +387,7 @@ void SvGlobalNameList::Append( const SvGlobalName & rName )
 }
 
 /*************************************************************************
-|*    SvGlobalNameList::GetObject()
+|*	  SvGlobalNameList::GetObject()
 *************************************************************************/
 SvGlobalName SvGlobalNameList::GetObject( ULONG nPos )
 {
@@ -395,7 +395,7 @@ SvGlobalName SvGlobalNameList::GetObject( ULONG nPos )
 }
 
 /*************************************************************************
-|*    SvGlobalNameList::IsEntry()
+|*	  SvGlobalNameList::IsEntry()
 *************************************************************************/
 BOOL SvGlobalNameList::IsEntry( const SvGlobalName & rName )
 {
diff --git a/tools/source/ref/pstm.cxx b/tools/source/ref/pstm.cxx
index e0412fd5d675..e9d6ea191682 100644
--- a/tools/source/ref/pstm.cxx
+++ b/tools/source/ref/pstm.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
@@ -35,7 +35,7 @@
 
 /***********************************************************************/
 /************************************************************************
-|*    SvClassManager::Register()
+|*	  SvClassManager::Register()
 *************************************************************************/
 void SvClassManager::Register( USHORT nClassId, SvCreateInstancePersist pFunc )
 {
@@ -48,7 +48,7 @@ void SvClassManager::Register( USHORT nClassId, SvCreateInstancePersist pFunc )
 }
 
 /************************************************************************
-|*    SvClassManager::Get()
+|*	  SvClassManager::Get()
 *************************************************************************/
 SvCreateInstancePersist SvClassManager::Get( USHORT nClassId )
 {
@@ -66,11 +66,11 @@ SvPersistBaseMemberList::SvPersistBaseMemberList(
     USHORT nInitSz, USHORT nResize )
     : SuperSvPersistBaseMemberList( nInitSz, nResize ){}
 
-#define PERSIST_LIST_VER        (BYTE)0
-#define PERSIST_LIST_DBGUTIL    (BYTE)0x80
+#define PERSIST_LIST_VER		(BYTE)0
+#define PERSIST_LIST_DBGUTIL	(BYTE)0x80
 
 /************************************************************************
-|*    SvPersistBaseMemberList::WriteOnlyStreamedObjects()
+|*	  SvPersistBaseMemberList::WriteOnlyStreamedObjects()
 *************************************************************************/
 void SvPersistBaseMemberList::WriteObjects( SvPersistStream & rStm,
                                             BOOL bOnlyStreamed ) const
@@ -111,7 +111,7 @@ void SvPersistBaseMemberList::WriteObjects( SvPersistStream & rStm,
 }
 
 /************************************************************************
-|*    operator << ()
+|*	  operator << ()
 *************************************************************************/
 SvPersistStream& operator << ( SvPersistStream & rStm,
                                const SvPersistBaseMemberList & rLst )
@@ -121,7 +121,7 @@ SvPersistStream& operator << ( SvPersistStream & rStm,
 }
 
 /************************************************************************
-|*    operator >> ()
+|*	  operator >> ()
 *************************************************************************/
 SvPersistStream& operator >> ( SvPersistStream & rStm,
                                SvPersistBaseMemberList & rLst )
@@ -164,11 +164,11 @@ SvPersistStream& operator >> ( SvPersistStream & rStm,
 //=========================================================================
 SvPersistStream::SvPersistStream
 (
-    SvClassManager & rMgr,  /* Alle Factorys, deren Objekt geladen und
+    SvClassManager & rMgr,	/* Alle Factorys, deren Objekt geladen und
                                gespeichert werdn k"onnen */
-    SvStream * pStream,     /* Dieser Stream wird als Medium genommen, auf
+    SvStream * pStream,		/* Dieser Stream wird als Medium genommen, auf
                                dem der PersistStream arbeitet */
-    UINT32 nStartIdxP       /* Ab diesem Index werden die Id's f"ur
+    UINT32 nStartIdxP		/* Ab diesem Index werden die Id's f"ur
                                die Objekte vergeben, er muss gr"osser
                                als Null sein. */
 )
@@ -178,7 +178,7 @@ SvPersistStream::SvPersistStream
     , nStartIdx( nStartIdxP )
     , pRefStm( NULL )
     , nFlags( 0 )
-/*  [Beschreibung]
+/*	[Beschreibung]
 
     Der Konstruktor der Klasse SvPersistStream. Die Objekte rMgr und
     pStream d"urfen nicht ver"andert werden, solange sie in einem
@@ -199,9 +199,9 @@ SvPersistStream::SvPersistStream
 //=========================================================================
 SvPersistStream::SvPersistStream
 (
-    SvClassManager & rMgr,  /* Alle Factorys, deren Objekt geladen und
+    SvClassManager & rMgr,	/* Alle Factorys, deren Objekt geladen und
                                gespeichert werdn k"onnen */
-    SvStream * pStream,     /* Dieser Stream wird als Medium genommen, auf
+    SvStream * pStream,		/* Dieser Stream wird als Medium genommen, auf
                                dem der PersistStream arbeitet */
     const SvPersistStream & rPersStm
                             /* Wenn PersistStream's verschachtelt werden,
@@ -214,7 +214,7 @@ SvPersistStream::SvPersistStream
     , nStartIdx( rPersStm.GetCurMaxIndex() +1 )
     , pRefStm( &rPersStm )
     , nFlags( 0 )
-/*  [Beschreibung]
+/*	[Beschreibung]
 
     Der Konstruktor der Klasse SvPersistStream. Die Objekte rMgr und
     pStream d"urfen nicht ver"andert werden, solange sie in einem
@@ -236,7 +236,7 @@ SvPersistStream::SvPersistStream
 
 //=========================================================================
 SvPersistStream::~SvPersistStream()
-/*  [Beschreibung]
+/*	[Beschreibung]
 
     Der Detruktor ruft die Methode <SvPersistStream::SetStream>
     mit NULL.
@@ -248,10 +248,10 @@ SvPersistStream::~SvPersistStream()
 //=========================================================================
 void SvPersistStream::SetStream
 (
-    SvStream * pStream  /* auf diesem Stream arbeitet der PersistStream */
+    SvStream * pStream	/* auf diesem Stream arbeitet der PersistStream */
 
 )
-/*  [Beschreibung]
+/*	[Beschreibung]
 
     Es wird ein Medium (pStream) eingesetzt, auf dem PersistStream arbeitet.
     Dieses darf nicht von aussen modifiziert werden, solange es
@@ -280,13 +280,13 @@ void SvPersistStream::SetStream
 
 //=========================================================================
 USHORT SvPersistStream::IsA() const
-/*  [Beschreibung]
+/*	[Beschreibung]
 
     Gibt den Identifier dieses Streamklasse zur"uck.
 
     [R"uckgabewert]
 
-    USHORT      ID_PERSISTSTREAM wird zur"uckgegeben.
+    USHORT		ID_PERSISTSTREAM wird zur"uckgegeben.
 
 
     [Querverweise]
@@ -299,7 +299,7 @@ USHORT SvPersistStream::IsA() const
 
 
 /*************************************************************************
-|*    SvPersistStream::ResetError()
+|*	  SvPersistStream::ResetError()
 *************************************************************************/
 void SvPersistStream::ResetError()
 {
@@ -309,7 +309,7 @@ void SvPersistStream::ResetError()
 }
 
 /*************************************************************************
-|*    SvPersistStream::GetData()
+|*	  SvPersistStream::GetData()
 *************************************************************************/
 ULONG SvPersistStream::GetData( void* pData, ULONG nSize )
 {
@@ -320,7 +320,7 @@ ULONG SvPersistStream::GetData( void* pData, ULONG nSize )
 }
 
 /*************************************************************************
-|*    SvPersistStream::PutData()
+|*	  SvPersistStream::PutData()
 *************************************************************************/
 ULONG SvPersistStream::PutData( const void* pData, ULONG nSize )
 {
@@ -331,7 +331,7 @@ ULONG SvPersistStream::PutData( const void* pData, ULONG nSize )
 }
 
 /*************************************************************************
-|*    SvPersistStream::Seek()
+|*	  SvPersistStream::Seek()
 *************************************************************************/
 ULONG SvPersistStream::SeekPos( ULONG nPos )
 {
@@ -342,14 +342,14 @@ ULONG SvPersistStream::SeekPos( ULONG nPos )
 }
 
 /*************************************************************************
-|*    SvPersistStream::FlushData()
+|*	  SvPersistStream::FlushData()
 *************************************************************************/
 void SvPersistStream::FlushData()
 {
 }
 
 /*************************************************************************
-|*    SvPersistStream::GetCurMaxIndex()
+|*	  SvPersistStream::GetCurMaxIndex()
 *************************************************************************/
 ULONG SvPersistStream::GetCurMaxIndex( const SvPersistUIdx & rIdx ) const
 {
@@ -366,7 +366,7 @@ ULONG SvPersistStream::GetCurMaxIndex( const SvPersistUIdx & rIdx ) const
 }
 
 /*************************************************************************
-|*    SvPersistStream::GetIndex()
+|*	  SvPersistStream::GetIndex()
 *************************************************************************/
 ULONG SvPersistStream::GetIndex( SvPersistBase * pObj ) const
 {
@@ -377,7 +377,7 @@ ULONG SvPersistStream::GetIndex( SvPersistBase * pObj ) const
 }
 
 /*************************************************************************
-|*    SvPersistStream::GetObject)
+|*	  SvPersistStream::GetObject)
 *************************************************************************/
 SvPersistBase * SvPersistStream::GetObject( ULONG nIdx ) const
 {
@@ -389,30 +389,30 @@ SvPersistBase * SvPersistStream::GetObject( ULONG nIdx ) const
 }
 
 //=========================================================================
-#define LEN_1           0x80
-#define LEN_2           0x40
-#define LEN_4           0x20
-#define LEN_5           0x10
+#define LEN_1			0x80
+#define LEN_2			0x40
+#define LEN_4			0x20
+#define LEN_5			0x10
 UINT32 SvPersistStream::ReadCompressed
 (
-    SvStream & rStm /* Aus diesem Stream werden die komprimierten Daten
+    SvStream & rStm	/* Aus diesem Stream werden die komprimierten Daten
                        gelesen */
 )
-/*  [Beschreibung]
+/*	[Beschreibung]
 
     Ein im Stream komprimiert abgelegtes Wort wird gelesen. In welchem
     Format komprimiert wird, siehe <SvPersistStream::WriteCompressed>.
 
     [R"uckgabewert]
 
-    UINT32      Das nicht komprimierte Wort wird zur"uckgegeben.
+    UINT32		Das nicht komprimierte Wort wird zur"uckgegeben.
 
     [Querverweise]
 
 */
 {
     UINT32 nRet(0);
-    BYTE    nMask;
+    BYTE	nMask;
     rStm >> nMask;
     if( nMask & LEN_1 )
         nRet = ~LEN_1 & nMask;
@@ -456,16 +456,16 @@ void SvPersistStream::WriteCompressed
 (
     SvStream & rStm,/* Aus diesem Stream werden die komprimierten Daten
                        gelesen */
-    UINT32 nVal     /* Dieser Wert wird komprimiert geschrieben */
+    UINT32 nVal		/* Dieser Wert wird komprimiert geschrieben */
 )
-/*  [Beschreibung]
+/*	[Beschreibung]
 
     Das "ubergebene Wort wird komprimiert und in den Stream
      geschrieben. Folgendermassen wir komprimiert.
-    nVal < 0x80         =>  0x80        + nVal ist 1 Byte gross.
-    nVal < 0x4000       =>  0x4000      + nVal ist 2 Byte gross.
-    nVal < 0x20000000   =>  0x20000000  + nVal ist 4 Byte gross.
-    nVal > 0x1FFFFFFF   =>  0x1000000000+ nVal ist 5 Byte gross.
+    nVal < 0x80			=>	0x80 		+ nVal ist 1 Byte gross.
+    nVal < 0x4000		=>	0x4000 		+ nVal ist 2 Byte gross.
+    nVal < 0x20000000   =>	0x20000000	+ nVal ist 4 Byte gross.
+    nVal > 0x1FFFFFFF   =>	0x1000000000+ nVal ist 5 Byte gross.
 
     [Querverweise]
 
@@ -498,14 +498,14 @@ void SvPersistStream::WriteCompressed
 
 //=========================================================================
 UINT32 SvPersistStream::WriteDummyLen()
-/*  [Beschreibung]
+/*	[Beschreibung]
 
     Die Methode schreibt 4 Byte in den Stream und gibt die Streamposition
     zur"uck.
 
     [R"uckgabewert]
 
-    UINT32      Die Position hinter der L"angenangabe wird zur"uckgegeben.
+    UINT32		Die Position hinter der L"angenangabe wird zur"uckgegeben.
 
     [Beispiel]
 
@@ -536,10 +536,10 @@ UINT32 SvPersistStream::WriteDummyLen()
 //=========================================================================
 void SvPersistStream::WriteLen
 (
-    UINT32 nObjPos  /* die Position + 4, an der die L"ange geschrieben
+    UINT32 nObjPos	/* die Position + 4, an der die L"ange geschrieben
                        wird. */
 )
-/*  [Beschreibung]
+/*	[Beschreibung]
 
     Die Methode schreibt die Differenz zwischen der aktuellen und
      nObjPos als UINT32 an die Position nObjPos -4 im Stream. Danach
@@ -573,11 +573,11 @@ void SvPersistStream::WriteLen
 //=========================================================================
 UINT32 SvPersistStream::ReadLen
 (
-    UINT32 * pTestPos   /* Die Position des Streams, nach dem Lesen der
+    UINT32 * pTestPos	/* Die Position des Streams, nach dem Lesen der
                            L"ange, wird zur"uckgegeben. Es darf auch NULL
                            "ubergeben werden. */
 )
-/*  [Beschreibung]
+/*	[Beschreibung]
 
     Liest die L"ange die vorher mit <SvPersistStream::WriteDummyLen>
     und <SvPersistStream::WriteLen> geschrieben wurde.
@@ -593,19 +593,19 @@ UINT32 SvPersistStream::ReadLen
 //=========================================================================
 // Dateirormat abw"arts kompatibel
 #ifdef STOR_NO_OPTIMIZE
-#define P_VER       (BYTE)0x00
+#define P_VER		(BYTE)0x00
 #else
-#define P_VER       (BYTE)0x01
+#define P_VER		(BYTE)0x01
 #endif
-#define P_VER_MASK  (BYTE)0x0F
-#define P_ID_0      (BYTE)0x80
-#define P_OBJ       (BYTE)0x40
-#define P_DBGUTIL   (BYTE)0x20
-#define P_ID        (BYTE)0x10
+#define P_VER_MASK	(BYTE)0x0F
+#define P_ID_0		(BYTE)0x80
+#define P_OBJ		(BYTE)0x40
+#define P_DBGUTIL	(BYTE)0x20
+#define P_ID		(BYTE)0x10
 #ifdef STOR_NO_OPTIMIZE
-#define P_STD   P_DBGUTIL
+#define P_STD	P_DBGUTIL
 #else
-#define P_STD   0
+#define P_STD	0
 #endif
 
 static void WriteId
@@ -725,15 +725,15 @@ SvPersistStream& SvPersistStream::WritePointer
 //=========================================================================
 UINT32 SvPersistStream::ReadObj
 (
-    SvPersistBase * &   rpObj,
-    BOOL                bRegister
+    SvPersistBase * &	rpObj,
+    BOOL				bRegister
 )
 {
-    BYTE    nHdr;
-    UINT32  nId = 0;
-    USHORT  nClassId;
+    BYTE	nHdr;
+    UINT32	nId = 0;
+    USHORT	nClassId;
 
-    rpObj = NULL;   // Spezifikation: Im Fehlerfall 0.
+    rpObj = NULL;	// Spezifikation: Im Fehlerfall 0.
     ReadId( *this, nHdr, nId, nClassId );
 
     // reine Versionsnummer durch maskieren
diff --git a/tools/source/ref/ref.cxx b/tools/source/ref/ref.cxx
index eeee931f9182..eb38694da74d 100644
--- a/tools/source/ref/ref.cxx
+++ b/tools/source/ref/ref.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
@@ -34,14 +34,14 @@
 SV_IMPL_REF_LIST( SvRefBase,SvRefBase* )
 
 /**************************************************************************
-#*  SvRefBase::~SvRefBase()
+#*	SvRefBase::~SvRefBase()
 **************************************************************************/
 SvRefBase::~SvRefBase()
 {
 }
 
 /**************************************************************************
-#*  SvRefBase::QueryDelete()
+#*	SvRefBase::QueryDelete()
 **************************************************************************/
 void SvRefBase::QueryDelete()
 {
diff --git a/tools/source/solar/solar.c b/tools/source/solar/solar.c
index 608f0baf5129..a331fcd8a355 100644
--- a/tools/source/solar/solar.c
+++ b/tools/source/solar/solar.c
@@ -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
@@ -55,20 +55,20 @@
 #include <setjmp.h>
 #endif
 
-#define printTypeSize(Type,Name)    printf( "sizeof(%s)\t= %d\n", Name, sizeof (Type) )
+#define printTypeSize(Type,Name)	printf(	"sizeof(%s)\t= %d\n", Name, sizeof (Type) )
 
-#define isSignedType(Type)  (((Type)-1) < 0)
-#define printTypeSign(Type,Name)    printf( "%s\t= %s %s\n", Name, ( isSignedType(Type) ? "signed" : "unsigned" ), Name )
+#define isSignedType(Type)	(((Type)-1) < 0)
+#define printTypeSign(Type,Name)	printf(	"%s\t= %s %s\n", Name, ( isSignedType(Type) ? "signed" : "unsigned" ), Name )
 
 
 /*************************************************************************
 |*
-|*  IsBigEndian()
+|*	IsBigEndian()
 |*
-|*  Beschreibung        True, wenn CPU BigEndian ist
+|*	Beschreibung		True, wenn CPU BigEndian ist
 |*
-|*  Ersterstellung      EG 26.06.96
-|*  Letzte Aenderung
+|*	Ersterstellung		EG 26.06.96
+|*	Letzte Aenderung
 |*
 *************************************************************************/
 int IsBigEndian()
@@ -79,12 +79,12 @@ int IsBigEndian()
 
 /*************************************************************************
 |*
-|*  IsStackGrowingDown()
+|*	IsStackGrowingDown()
 |*
-|*  Beschreibung        True, wenn der Stack nach unten waechst
+|*	Beschreibung		True, wenn der Stack nach unten waechst
 |*
-|*  Ersterstellung      EG 26.06.96
-|*  Letzte Aenderung
+|*	Ersterstellung		EG 26.06.96
+|*	Letzte Aenderung
 |*
 *************************************************************************/
 int IsStackGrowingDown_2( int * pI )
@@ -101,13 +101,13 @@ int IsStackGrowingDown()
 
 /*************************************************************************
 |*
-|*  GetStackAlignment()
+|*	GetStackAlignment()
 |*
-|*  Beschreibung        Alignment von char Parametern, die (hoffentlich)
-|*                      ueber den Stack uebergeben werden
+|*	Beschreibung		Alignment von char Parametern, die (hoffentlich)
+|*						ueber den Stack uebergeben werden
 |*
-|*  Ersterstellung      EG 26.06.96
-|*  Letzte Aenderung
+|*	Ersterstellung		EG 26.06.96
+|*	Letzte Aenderung
 |*
 *************************************************************************/
 int GetStackAlignment_3( char*p, long l, int i, short s, char b, char c, ... )
@@ -137,7 +137,7 @@ int GetStackAlignment()
 
 /*************************************************************************
 |*
-|*  Typdeclarations for memory access test functions
+|*	Typdeclarations for memory access test functions
 |*
 *************************************************************************/
 typedef enum { t_char, t_short, t_int, t_long, t_double } Type;
@@ -146,12 +146,12 @@ typedef int (*TestFunc)( Type, void* );
 
 /*************************************************************************
 |*
-|*  PrintArgs()
+|*	PrintArgs()
 |*
-|*  Beschreibung        Testfunktion fuer variable Parameter
+|*	Beschreibung		Testfunktion fuer variable Parameter
 |*
-|*  Ersterstellung      EG 26.06.96
-|*  Letzte Aenderung
+|*	Ersterstellung		EG 26.06.96
+|*	Letzte Aenderung
 |*
 *************************************************************************/
 #ifdef I_STDARG
@@ -183,12 +183,12 @@ va_dcl
 #ifndef USE_FORK_TO_CHECK
 /*************************************************************************
 |*
-|*  SignalHdl()
+|*	SignalHdl()
 |*
-|*  Beschreibung        faengt SIGBUS und SIGSEGV in check() ab
+|*	Beschreibung		faengt SIGBUS und SIGSEGV in check() ab
 |*
-|*  Ersterstellung      EG 26.06.96
-|*  Letzte Aenderung
+|*	Ersterstellung		EG 26.06.96
+|*	Letzte Aenderung
 |*
 *************************************************************************/
 static jmp_buf check_env;
@@ -196,22 +196,22 @@ static int bSignal;
 void SignalHdl( int sig )
 {
   bSignal = 1;
-
+  
   fprintf( stderr, "Signal %d caught\n", sig );
-  signal( SIGSEGV,  SIG_DFL );
-  signal( SIGBUS,   SIG_DFL );
+  signal( SIGSEGV,	SIG_DFL );
+  signal( SIGBUS,	SIG_DFL );
   siglongjmp( check_env, sig );
 }
 #endif
 
 /*************************************************************************
 |*
-|*  check()
+|*	check()
 |*
-|*  Beschreibung        Testet MemoryZugriff (read/write)
+|*	Beschreibung		Testet MemoryZugriff (read/write)
 |*
-|*  Ersterstellung      EG 26.06.96
-|*  Letzte Aenderung
+|*	Ersterstellung		EG 26.06.96
+|*	Letzte Aenderung
 |*
 *************************************************************************/
 int check( TestFunc func, Type eT, void* p )
@@ -238,11 +238,11 @@ int check( TestFunc func, Type eT, void* p )
 
   if ( !sigsetjmp( check_env, 1 ) )
   {
-    signal( SIGSEGV,    SignalHdl );
-    signal( SIGBUS,     SignalHdl );
+    signal( SIGSEGV,	SignalHdl );
+    signal( SIGBUS,		SignalHdl );
     result = func( eT, p );
-    signal( SIGSEGV,    SIG_DFL );
-    signal( SIGBUS,     SIG_DFL );
+    signal( SIGSEGV,	SIG_DFL );
+    signal( SIGBUS,		SIG_DFL );
   }
 
   if ( bSignal )
@@ -254,46 +254,46 @@ int check( TestFunc func, Type eT, void* p )
 
 /*************************************************************************
 |*
-|*  GetAtAddress()
+|*	GetAtAddress()
 |*
-|*  Beschreibung        memory read access
+|*	Beschreibung		memory read access
 |*
-|*  Ersterstellung      EG 26.06.96
-|*  Letzte Aenderung
+|*	Ersterstellung		EG 26.06.96
+|*	Letzte Aenderung
 |*
 *************************************************************************/
 int GetAtAddress( Type eT, void* p )
 {
   switch ( eT )
   {
-  case t_char:      return *((char*)p);
-  case t_short:     return *((short*)p);
-  case t_int:       return *((int*)p);
-  case t_long:      return *((long*)p);
-  case t_double:    return *((double*)p);
+  case t_char:		return *((char*)p);
+  case t_short:		return *((short*)p);
+  case t_int:		return *((int*)p);
+  case t_long:		return *((long*)p);
+  case t_double:	return *((double*)p);
   }
   abort();
 }
 
 /*************************************************************************
 |*
-|*  SetAtAddress()
+|*	SetAtAddress()
 |*
-|*  Beschreibung        memory write access
+|*	Beschreibung		memory write access
 |*
-|*  Ersterstellung      EG 26.06.96
-|*  Letzte Aenderung
+|*	Ersterstellung		EG 26.06.96
+|*	Letzte Aenderung
 |*
 *************************************************************************/
 int SetAtAddress( Type eT, void* p )
 {
   switch ( eT )
   {
-  case t_char:      return *((char*)p)  = 0;
-  case t_short:     return *((short*)p) = 0;
-  case t_int:       return *((int*)p)   = 0;
-  case t_long:      return *((long*)p)  = 0;
-  case t_double:    return *((double*)p)= 0;
+  case t_char:		return *((char*)p)	= 0;
+  case t_short:		return *((short*)p)	= 0;
+  case t_int:		return *((int*)p)	= 0;
+  case t_long:		return *((long*)p)	= 0;
+  case t_double:	return *((double*)p)= 0;
   }
   abort();
 }
@@ -302,24 +302,24 @@ char* TypeName( Type eT )
 {
   switch ( eT )
   {
-  case t_char:      return "char";
-  case t_short:     return "short";
-  case t_int:       return "int";
-  case t_long:      return "long";
-  case t_double:    return "double";
+  case t_char:		return "char";
+  case t_short:		return "short";
+  case t_int:		return "int";
+  case t_long:		return "long";
+  case t_double:	return "double";
   }
   abort();
 }
 
 /*************************************************************************
 |*
-|*  Check(Get|Set)Access()
+|*	Check(Get|Set)Access()
 |*
-|*  Beschreibung        Testet MemoryZugriff (read/write)
-|*                      Zugriffsverletzungen werden abgefangen
+|*	Beschreibung		Testet MemoryZugriff (read/write)
+|*						Zugriffsverletzungen werden abgefangen
 |*
-|*  Ersterstellung      EG 26.06.96
-|*  Letzte Aenderung
+|*	Ersterstellung		EG 26.06.96
+|*	Letzte Aenderung
 |*
 *************************************************************************/
 int CheckGetAccess( Type eT, void* p )
@@ -348,19 +348,19 @@ int CheckSetAccess( Type eT, void* p )
 
 /*************************************************************************
 |*
-|*  GetAlignment()
+|*	GetAlignment()
 |*
-|*  Beschreibung        Bestimmt das Alignment verschiedener Typen
+|*	Beschreibung		Bestimmt das Alignment verschiedener Typen
 |*
-|*  Ersterstellung      EG 26.06.96
-|*  Letzte Aenderung
+|*	Ersterstellung		EG 26.06.96
+|*	Letzte Aenderung
 |*
 *************************************************************************/
 int GetAlignment( Type eT )
 {
-  char  a[ 16*8 ];
-  long  p = (long)(void*)a;
-  int   i;
+  char	a[ 16*8 ];
+  long	p = (long)(void*)a;
+  int	i;
 
   /* clear a[...] to set legal value for double access */
   for ( i = 0; i < 16*8; i++ )
@@ -375,37 +375,37 @@ int GetAlignment( Type eT )
 
 /*************************************************************************
 |*
-|*  struct Description
+|*	struct Description
 |*
-|*  Beschreibung        Beschreibt die Parameter der Architektur
+|*	Beschreibung		Beschreibt die Parameter der Architektur
 |*
-|*  Ersterstellung      EG 26.06.96
-|*  Letzte Aenderung
+|*	Ersterstellung		EG 26.06.96
+|*	Letzte Aenderung
 |*
 *************************************************************************/
 struct Description
 {
-  int   bBigEndian;
-  int   bStackGrowsDown;
-  int   nStackAlignment;
-  int   nAlignment[3];  /* 2,4,8 */
+  int	bBigEndian;
+  int	bStackGrowsDown;
+  int	nStackAlignment;
+  int	nAlignment[3];	/* 2,4,8 */
 };
 
 /*************************************************************************
 |*
-|*  Description_Ctor()
+|*	Description_Ctor()
 |*
-|*  Beschreibung        Bestimmt die Parameter der Architektur
+|*	Beschreibung		Bestimmt die Parameter der Architektur
 |*
-|*  Ersterstellung      EG 26.06.96
-|*  Letzte Aenderung
+|*	Ersterstellung		EG 26.06.96
+|*	Letzte Aenderung
 |*
 *************************************************************************/
 void Description_Ctor( struct Description* pThis )
 {
-  pThis->bBigEndian         = IsBigEndian();
-  pThis->bStackGrowsDown    = IsStackGrowingDown();
-  pThis->nStackAlignment    = GetStackAlignment();
+  pThis->bBigEndian			= IsBigEndian();
+  pThis->bStackGrowsDown	= IsStackGrowingDown();
+  pThis->nStackAlignment	= GetStackAlignment();
 
   if ( sizeof(short) != 2 )
     abort();
@@ -414,7 +414,7 @@ void Description_Ctor( struct Description* pThis )
     abort();
   pThis->nAlignment[1] = GetAlignment( t_int );
 
-  if      ( sizeof(long) == 8 )
+  if	  ( sizeof(long) == 8 )
     pThis->nAlignment[2] = GetAlignment( t_long );
   else if ( sizeof(double) == 8 )
     pThis->nAlignment[2] = GetAlignment( t_double );
@@ -424,12 +424,12 @@ void Description_Ctor( struct Description* pThis )
 
 /*************************************************************************
 |*
-|*  Description_Print()
+|*	Description_Print()
 |*
-|*  Beschreibung        Schreibt die Parameter der Architektur als Header
+|*	Beschreibung		Schreibt die Parameter der Architektur als Header
 |*
-|*  Ersterstellung      EG 26.06.96
-|*  Letzte Aenderung
+|*	Ersterstellung		EG 26.06.96
+|*	Letzte Aenderung
 |*
 *************************************************************************/
 void Description_Print( struct Description* pThis, char* name )
@@ -461,12 +461,12 @@ void Description_Print( struct Description* pThis, char* name )
 
 /*************************************************************************
 |*
-|*  InfoMemoryAccess()
+|*	InfoMemoryAccess()
 |*
-|*  Beschreibung        Informeller Bytezugriffstest
+|*	Beschreibung		Informeller Bytezugriffstest
 |*
-|*  Ersterstellung      EG 26.06.96
-|*  Letzte Aenderung
+|*	Ersterstellung		EG 26.06.96
+|*	Letzte Aenderung
 |*
 *************************************************************************/
 void InfoMemoryAccess( char* p )
@@ -484,12 +484,12 @@ void InfoMemoryAccess( char* p )
 
 /*************************************************************************
 |*
-|*  InfoMemoryTypeAccess()
+|*	InfoMemoryTypeAccess()
 |*
-|*  Beschreibung        Informeller Zugriffstest verschiedener Typen
+|*	Beschreibung		Informeller Zugriffstest verschiedener Typen
 |*
-|*  Ersterstellung      EG 15.08.96
-|*  Letzte Aenderung
+|*	Ersterstellung		EG 15.08.96
+|*	Letzte Aenderung
 |*
 *************************************************************************/
 void InfoMemoryTypeAccess( Type eT )
@@ -509,7 +509,7 @@ void InfoMemoryTypeAccess( Type eT )
 }
 /************************************************************************
  *
- *  Use C code to determine the characteristics of the building platform.
+ * 	Use C code to determine the characteristics of the building platform.
  *
  ************************************************************************/
 int main( int argc, char* argv[] )
diff --git a/tools/source/stream/cachestr.cxx b/tools/source/stream/cachestr.cxx
index 0233dc25fb52..62e3e107e2ed 100644
--- a/tools/source/stream/cachestr.cxx
+++ b/tools/source/stream/cachestr.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
@@ -48,10 +48,10 @@ SvCacheStream::SvCacheStream( ULONG nMaxMemSize )
     if( !nMaxMemSize )
         nMaxMemSize = 20480;
     SvStream::bIsWritable = TRUE;
-    nMaxSize        = nMaxMemSize;
-    bPersistent     = FALSE;
-    pSwapStream     = 0;
-    pCurrentStream  = new SvMemoryStream( nMaxMemSize );
+    nMaxSize		= nMaxMemSize;
+    bPersistent		= FALSE;
+    pSwapStream		= 0;
+    pCurrentStream	= new SvMemoryStream( nMaxMemSize );
     pTempFile       = 0;
 }
 
@@ -78,11 +78,11 @@ SvCacheStream::SvCacheStream( const String &rFileName,
         nExpectedSize = 4096;
 
     SvStream::bIsWritable = TRUE;
-    nMaxSize        = nMaxMemSize;
-    bPersistent     = TRUE;
-    aFileName       = rFileName;
-    pSwapStream     = 0;
-    pCurrentStream  = new SvMemoryStream( nExpectedSize );
+    nMaxSize		= nMaxMemSize;
+    bPersistent		= TRUE;
+    aFileName		= rFileName;
+    pSwapStream		= 0;
+    pCurrentStream	= new SvMemoryStream( nExpectedSize );
     pTempFile       = 0;
 }
 
diff --git a/tools/source/stream/stream.cxx b/tools/source/stream/stream.cxx
index 9fdef8436f1a..e4395cf1ac7d 100644
--- a/tools/source/stream/stream.cxx
+++ b/tools/source/stream/stream.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
@@ -862,9 +862,9 @@ sal_Bool SvStream::ReadCString( ByteString& rStr )
         while( *pPtr && nLen )
             ++pPtr, --nLen;
 
-        bEnd =  ( nReallyRead < sizeof(buf)-1 )         // read less than attempted to read
+        bEnd =	( nReallyRead < sizeof(buf)-1 )			// read less than attempted to read
                 ||  (  ( nLen > 0 )                    // OR it is inside the block we read
-                    &&  ( 0 == *pPtr )                  //    AND found a string terminator
+                    &&	( 0 == *pPtr )					//    AND found a string terminator
                     );
 
         rStr.Append( buf, ::sal::static_int_cast< xub_StrLen >( pPtr - buf ) );
diff --git a/tools/source/stream/strmos2.cxx b/tools/source/stream/strmos2.cxx
index d211d7790b08..932eca1fb6d2 100644
--- a/tools/source/stream/strmos2.cxx
+++ b/tools/source/stream/strmos2.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
@@ -663,7 +663,7 @@ void SvFileStream::Open( const String& rFilename, StreamMode nOpenMode )
         createLongNameEA(aFileNameA.GetBuffer(),  FILE_NORMAL, aDirEntry.GetName());
 
         // und wieder oeffnen
-        ReOpen();
+        ReOpen();		
     }
 #endif
 
diff --git a/tools/source/stream/strmsys.cxx b/tools/source/stream/strmsys.cxx
index a373ad985214..99490146c9db 100644
--- a/tools/source/stream/strmsys.cxx
+++ b/tools/source/stream/strmsys.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
diff --git a/tools/source/stream/strmunx.cxx b/tools/source/stream/strmunx.cxx
index 88ccb2113e0d..753b9a684763 100644
--- a/tools/source/stream/strmunx.cxx
+++ b/tools/source/stream/strmunx.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
@@ -34,7 +34,7 @@
 #include <errno.h>
 #include <unistd.h>
 #include <limits.h>
-#include <stdlib.h> // fuer getenv()
+#include <stdlib.h>	// fuer getenv()
 
 #include <tools/debug.hxx>
 #include <tools/fsys.hxx>
@@ -65,10 +65,10 @@ namespace { struct LockMutex : public rtl::Static< NAMESPACE_VOS(OMutex), LockMu
 
 class InternalStreamLock
 {
-    sal_Size            m_nStartPos;
-    sal_Size            m_nEndPos;
-    SvFileStream*   m_pStream;
-    struct stat     m_aStat;
+    sal_Size			m_nStartPos;
+    sal_Size			m_nEndPos;
+    SvFileStream*	m_pStream;
+    struct stat		m_aStat;
 
     InternalStreamLock( sal_Size, sal_Size, SvFileStream* );
     ~InternalStreamLock();
@@ -228,9 +228,9 @@ static sal_uInt32 GetSvError( int nErrno )
         { ENOLINK,      SVSTREAM_PATH_NOT_FOUND },
 #endif
         { ENOTDIR,      SVSTREAM_PATH_NOT_FOUND },
-        { ETXTBSY,      SVSTREAM_ACCESS_DENIED  },
-        { EEXIST,       SVSTREAM_CANNOT_MAKE    },
-        { ENOSPC,       SVSTREAM_DISK_FULL      },
+        { ETXTBSY,		SVSTREAM_ACCESS_DENIED	},
+        { EEXIST,		SVSTREAM_CANNOT_MAKE    },
+        { ENOSPC,		SVSTREAM_DISK_FULL 		},
         { (int)0xFFFF,  SVSTREAM_GENERALERROR }
     };
 
@@ -524,10 +524,10 @@ sal_Bool SvFileStream::LockRange( sal_Size nByteOffset, sal_Size nBytes )
     // um einen Haenger im Zusammenspiel mit einem Linux
     // NFS-2-Server (kein Lockdaemon) zu verhindern.
     // File-Locking ?ber NFS ist generell ein Performancekiller.
-    //                      HR, 22.10.1997 fuer SOLARIS
-    //                      CP, 30.11.1997 fuer HPUX
-    //                      ER, 18.12.1997 fuer IRIX
-    //                      HR, 18.05.1998 Environmentvariable
+    //						HR, 22.10.1997 fuer SOLARIS
+    //						CP, 30.11.1997 fuer HPUX
+    //						ER, 18.12.1997 fuer IRIX
+    //						HR, 18.05.1998 Environmentvariable
 
     if ( pFileLockEnvVar == (char*)1 )
         pFileLockEnvVar = getenv("STAR_ENABLE_FILE_LOCKING");
diff --git a/tools/source/stream/strmwnt.cxx b/tools/source/stream/strmwnt.cxx
index d9e7da92296b..c806e7562322 100644
--- a/tools/source/stream/strmwnt.cxx
+++ b/tools/source/stream/strmwnt.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
@@ -482,7 +482,7 @@ void SvFileStream::Open( const String& rFilename, StreamMode nMode )
     ByteString aFileNameA( aFilename, osl_getThreadTextEncoding());
     FSysRedirector::DoRedirect( aFilename );
 #endif
-    SetLastError( ERROR_SUCCESS );  // ggf. durch Redirector geaendert!
+    SetLastError( ERROR_SUCCESS );	// ggf. durch Redirector geaendert!
 
     /*
     #ifdef DBG_UTIL
diff --git a/tools/source/stream/vcompat.cxx b/tools/source/stream/vcompat.cxx
index 8430eb17659b..fc5567fe3a52 100644
--- a/tools/source/stream/vcompat.cxx
+++ b/tools/source/stream/vcompat.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
diff --git a/tools/source/string/debugprint.cxx b/tools/source/string/debugprint.cxx
index 7acff963b1b9..9a21d2a4a5d7 100644
--- a/tools/source/string/debugprint.cxx
+++ b/tools/source/string/debugprint.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
diff --git a/tools/source/string/strascii.cxx b/tools/source/string/strascii.cxx
index 775e1ca7f142..047bc14dc463 100644
--- a/tools/source/string/strascii.cxx
+++ b/tools/source/string/strascii.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
diff --git a/tools/source/string/strcvt.cxx b/tools/source/string/strcvt.cxx
index ef55dee5bfe2..9369724ebc8b 100644
--- a/tools/source/string/strcvt.cxx
+++ b/tools/source/string/strcvt.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
@@ -114,19 +114,19 @@ ByteString::ByteString( const sal_Unicode* pUniStr, xub_StrLen nLen,
 
 static sal_uChar aImplByteTab[256] =
 {
-    0,   1,   2,   3,   4,   5,   6,   7,
-    8,   9,  10,  11,  12,  13,  14,  15,
-   16,  17,  18,  19,  20,  21,  22,  23,
-   24,  25,  26,  27,  28,  29,  30,  31,
-   32,  33,  34,  35,  36,  37,  38,  39,
-   40,  41,  42,  43,  44,  45,  46,  47,
-   48,  49,  50,  51,  52,  53,  54,  55,
-   56,  57,  58,  59,  60,  61,  62,  63,
-   64,  65,  66,  67,  68,  69,  70,  71,
-   72,  73,  74,  75,  76,  77,  78,  79,
-   80,  81,  82,  83,  84,  85,  86,  87,
-   88,  89,  90,  91,  92,  93,  94,  95,
-   96,  97,  98,  99, 100, 101, 102, 103,
+    0,	 1,   2,   3,	4,	 5,   6,   7,
+    8,	 9,  10,  11,  12,	13,  14,  15,
+   16,	17,  18,  19,  20,	21,  22,  23,
+   24,	25,  26,  27,  28,	29,  30,  31,
+   32,	33,  34,  35,  36,	37,  38,  39,
+   40,	41,  42,  43,  44,	45,  46,  47,
+   48,	49,  50,  51,  52,	53,  54,  55,
+   56,	57,  58,  59,  60,	61,  62,  63,
+   64,	65,  66,  67,  68,	69,  70,  71,
+   72,	73,  74,  75,  76,	77,  78,  79,
+   80,	81,  82,  83,  84,	85,  86,  87,
+   88,	89,  90,  91,  92,	93,  94,  95,
+   96,	97,  98,  99, 100, 101, 102, 103,
   104, 105, 106, 107, 108, 109, 110, 111,
   112, 113, 114, 115, 116, 117, 118, 119,
   120, 121, 122, 123, 124, 125, 126, 127,
@@ -152,20 +152,20 @@ static sal_uChar aImplByteTab[256] =
 
 struct Impl1ByteUnicodeTabData
 {
-    rtl_TextEncoding            meTextEncoding;
-    sal_Unicode                 maUniTab[256];
-    Impl1ByteUnicodeTabData*    mpNext;
+    rtl_TextEncoding			meTextEncoding;
+    sal_Unicode 				maUniTab[256];
+    Impl1ByteUnicodeTabData*	mpNext;
 };
 
 // -----------------------------------------------------------------------
 
 struct Impl1ByteConvertTabData
 {
-    rtl_TextEncoding            meSrcTextEncoding;
-    rtl_TextEncoding            meDestTextEncoding;
-    sal_uChar                   maConvertTab[256];
-    sal_uChar                   maRepConvertTab[256];
-    Impl1ByteConvertTabData*    mpNext;
+    rtl_TextEncoding			meSrcTextEncoding;
+    rtl_TextEncoding			meDestTextEncoding;
+    sal_uChar					maConvertTab[256];
+    sal_uChar					maRepConvertTab[256];
+    Impl1ByteConvertTabData*	mpNext;
 };
 
 // =======================================================================
@@ -173,11 +173,11 @@ struct Impl1ByteConvertTabData
 sal_Unicode* ImplGet1ByteUnicodeTab( rtl_TextEncoding eTextEncoding )
 {
 #ifndef BOOTSTRAP
-    TOOLSINDATA*                pToolsData = ImplGetToolsInData();
+    TOOLSINDATA*				pToolsData = ImplGetToolsInData();
 #else
-    TOOLSINDATA*                pToolsData = 0x0;
+    TOOLSINDATA*				pToolsData = 0x0;
 #endif
-    Impl1ByteUnicodeTabData*    pTab = pToolsData->mpFirstUniTabData;
+    Impl1ByteUnicodeTabData*	pTab = pToolsData->mpFirstUniTabData;
 
     while ( pTab )
     {
@@ -197,10 +197,10 @@ sal_Unicode* ImplGet1ByteUnicodeTab( rtl_TextEncoding eTextEncoding )
         pTab->meTextEncoding = eTextEncoding;
         pTab->mpNext = pToolsData->mpFirstUniTabData;
 
-        rtl_TextToUnicodeConverter  hConverter;
-        sal_uInt32                  nInfo;
-        sal_Size                    nSrcBytes;
-        sal_Size                    nDestChars;
+        rtl_TextToUnicodeConverter	hConverter;
+        sal_uInt32					nInfo;
+        sal_Size					nSrcBytes;
+        sal_Size					nDestChars;
         hConverter = rtl_createTextToUnicodeConverter( eTextEncoding );
         nDestChars = rtl_convertTextToUnicode( hConverter, 0,
                                                (const sal_Char*)aImplByteTab, 256,
@@ -230,11 +230,11 @@ static sal_uChar* ImplGet1ByteConvertTab( rtl_TextEncoding eSrcTextEncoding,
                                           BOOL bReplace )
 {
 #ifndef BOOTSTRAP
-    TOOLSINDATA*                pToolsData = ImplGetToolsInData();
+    TOOLSINDATA*				pToolsData = ImplGetToolsInData();
 #else
-    TOOLSINDATA*                pToolsData = 0x0;
+    TOOLSINDATA*				pToolsData = 0x0;
 #endif
-    Impl1ByteConvertTabData*    pTab = pToolsData->mpFirstConvertTabData;
+    Impl1ByteConvertTabData*	pTab = pToolsData->mpFirstConvertTabData;
 
     while ( pTab )
     {
@@ -265,14 +265,14 @@ static sal_uChar* ImplGet1ByteConvertTab( rtl_TextEncoding eSrcTextEncoding,
         pTab->meDestTextEncoding = eDestTextEncoding;
         pTab->mpNext = pToolsData->mpFirstConvertTabData;
 
-        rtl_TextToUnicodeConverter  hConverter;
-        rtl_UnicodeToTextConverter  hConverter2;
-        sal_uInt32                  nInfo;
-        sal_Size                    nSrcBytes;
-        sal_Size                    nDestChars;
-        sal_Size                    nSrcChars;
-        sal_Size                    nDestBytes;
-        sal_Unicode                 aTempBuf[256];
+        rtl_TextToUnicodeConverter	hConverter;
+        rtl_UnicodeToTextConverter	hConverter2;
+        sal_uInt32					nInfo;
+        sal_Size					nSrcBytes;
+        sal_Size					nDestChars;
+        sal_Size					nSrcChars;
+        sal_Size					nDestBytes;
+        sal_Unicode 				aTempBuf[256];
         hConverter = rtl_createTextToUnicodeConverter( eSrcTextEncoding );
         nDestChars = rtl_convertTextToUnicode( hConverter, 0,
                                                (const sal_Char*)aImplByteTab, 256,
@@ -325,12 +325,12 @@ static sal_uChar* ImplGet1ByteConvertTab( rtl_TextEncoding eSrcTextEncoding,
 void ImplDeleteCharTabData()
 {
 #ifndef BOOTSTRAP
-    TOOLSINDATA*                pToolsData = ImplGetToolsInData();
+    TOOLSINDATA*				pToolsData = ImplGetToolsInData();
 #else
-    TOOLSINDATA*                pToolsData = 0x0;
+    TOOLSINDATA*				pToolsData = 0x0;
 #endif
-    Impl1ByteUnicodeTabData*    pTempUniTab;
-    Impl1ByteUnicodeTabData*    pUniTab = pToolsData->mpFirstUniTabData;
+    Impl1ByteUnicodeTabData*	pTempUniTab;
+    Impl1ByteUnicodeTabData*	pUniTab = pToolsData->mpFirstUniTabData;
     while ( pUniTab )
     {
         pTempUniTab = pUniTab->mpNext;
@@ -339,8 +339,8 @@ void ImplDeleteCharTabData()
     }
     pToolsData->mpFirstUniTabData = NULL;
 
-    Impl1ByteConvertTabData*    pTempConvertTab;
-    Impl1ByteConvertTabData*    pConvertTab = pToolsData->mpFirstConvertTabData;
+    Impl1ByteConvertTabData*	pTempConvertTab;
+    Impl1ByteConvertTabData*	pConvertTab = pToolsData->mpFirstConvertTabData;
     while ( pConvertTab )
     {
         pTempConvertTab = pConvertTab->mpNext;
@@ -374,12 +374,12 @@ void ByteString::ImplStringConvert(
     }
     else
     {
-        rtl_UnicodeToTextConverter  hSrcConverter = rtl_createTextToUnicodeConverter( eSource );
-        sal_uInt32                  nInfo;
-        sal_Size                    nSrcBytes;
-        sal_Size                    nDestChars;
-        sal_Size                    nTempLen;
-        sal_Unicode*                pTempBuf;
+        rtl_UnicodeToTextConverter	hSrcConverter = rtl_createTextToUnicodeConverter( eSource );
+        sal_uInt32					nInfo;
+        sal_Size					nSrcBytes;
+        sal_Size					nDestChars;
+        sal_Size					nTempLen;
+        sal_Unicode*				pTempBuf;
         nTempLen = mpData->mnLen;
         pTempBuf = new sal_Unicode[nTempLen];
         nDestChars = rtl_convertTextToUnicode( hSrcConverter, 0,
@@ -482,8 +482,8 @@ sal_Unicode ByteString::ConvertToUnicode( char c, rtl_TextEncoding eTextEncoding
 
 char ByteString::ConvertFromUnicode( sal_Unicode c, rtl_TextEncoding eTextEncoding, BOOL bReplace )
 {
-    sal_Size    nLen;
-    char        aBuf[30];
+    sal_Size	nLen;
+    char		aBuf[30];
     nLen = ConvertFromUnicode( c, aBuf, sizeof( aBuf ), eTextEncoding, bReplace );
     if ( nLen == 1 )
         return aBuf[0];
@@ -499,11 +499,11 @@ sal_Unicode ByteString::ConvertToUnicode( const char* pChar, sal_Size* pLen, rtl
     if ( eTextEncoding == RTL_TEXTENCODING_DONTKNOW )
         return 0;
 
-    rtl_TextToUnicodeConverter  hConverter;
-    sal_uInt32                  nInfo;
-    sal_Size                    nSrcBytes;
-    sal_Size                    nDestChars;
-    sal_Unicode                 nConvChar;
+    rtl_TextToUnicodeConverter	hConverter;
+    sal_uInt32					nInfo;
+    sal_Size					nSrcBytes;
+    sal_Size					nDestChars;
+    sal_Unicode 				nConvChar;
     hConverter = rtl_createTextToUnicodeConverter( eTextEncoding );
     nDestChars = rtl_convertTextToUnicode( hConverter, 0,
                                            (const sal_Char*)pChar, *pLen,
@@ -536,12 +536,12 @@ sal_Size ByteString::ConvertFromUnicode( sal_Unicode c, char* pBuf, sal_Size nBu
     if ( eTextEncoding == RTL_TEXTENCODING_DONTKNOW )
         return '\0';
 
-    rtl_UnicodeToTextConverter  hConverter;
-    sal_uInt32                  nInfo;
-    sal_Size                    nSrcChars;
-    sal_Size                    nDestBytes;
-    sal_Unicode                 cUni = c;
-    sal_uInt32                  nFlags = RTL_UNICODETOTEXT_FLAGS_NONSPACING_IGNORE |
+    rtl_UnicodeToTextConverter	hConverter;
+    sal_uInt32					nInfo;
+    sal_Size					nSrcChars;
+    sal_Size					nDestBytes;
+    sal_Unicode 				cUni = c;
+    sal_uInt32					nFlags = RTL_UNICODETOTEXT_FLAGS_NONSPACING_IGNORE |
                                          RTL_UNICODETOTEXT_FLAGS_CONTROL_IGNORE |
                                          RTL_UNICODETOTEXT_FLAGS_FLUSH;
     if ( bReplace )
diff --git a/tools/source/string/strimp.cxx b/tools/source/string/strimp.cxx
index 34038c576aa0..704bdd0e5c3a 100644
--- a/tools/source/string/strimp.cxx
+++ b/tools/source/string/strimp.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
@@ -81,9 +81,9 @@ static sal_Int32 ImplStringCompareWithoutZero( const STRCODE* pStr1, const STRCO
 
 static sal_Int32 ImplStringICompare( const STRCODE* pStr1, const STRCODE* pStr2 )
 {
-    sal_Int32   nRet;
-    STRCODE     c1;
-    STRCODE     c2;
+    sal_Int32	nRet;
+    STRCODE 	c1;
+    STRCODE 	c2;
     do
     {
         // Ist das Zeichen zwischen 'A' und 'Z' dann umwandeln
@@ -110,9 +110,9 @@ static sal_Int32 ImplStringICompare( const STRCODE* pStr1, const STRCODE* pStr2
 static sal_Int32 ImplStringICompare( const STRCODE* pStr1, const STRCODE* pStr2,
                                      xub_StrLen nCount )
 {
-    sal_Int32   nRet = 0;
-    STRCODE     c1;
-    STRCODE     c2;
+    sal_Int32	nRet = 0;
+    STRCODE 	c1;
+    STRCODE 	c2;
     do
     {
         if ( !nCount )
@@ -143,9 +143,9 @@ static sal_Int32 ImplStringICompare( const STRCODE* pStr1, const STRCODE* pStr2,
 static sal_Int32 ImplStringICompareWithoutZero( const STRCODE* pStr1, const STRCODE* pStr2,
                                                 sal_Int32 nCount )
 {
-    sal_Int32   nRet = 0;
-    STRCODE     c1;
-    STRCODE     c2;
+    sal_Int32	nRet = 0;
+    STRCODE 	c1;
+    STRCODE 	c2;
     do
     {
         if ( !nCount )
@@ -188,10 +188,10 @@ const char* DBGCHECKSTRING( const void* pString )
 static STRINGDATA* ImplAllocData( sal_Int32 nLen )
 {
     // Dann kopiere die Daten
-    STRINGDATA* pData   = (STRINGDATA*)rtl_allocateMemory( sizeof(STRINGDATA)+(nLen*sizeof( STRCODE )) );
-    pData->mnRefCount   = 1;
-    pData->mnLen        = nLen;
-    pData->maStr[nLen]  = 0;
+    STRINGDATA* pData	= (STRINGDATA*)rtl_allocateMemory( sizeof(STRINGDATA)+(nLen*sizeof( STRCODE )) );
+    pData->mnRefCount	= 1;
+    pData->mnLen		= nLen;
+    pData->maStr[nLen]	= 0;
     return pData;
 }
 
@@ -199,8 +199,8 @@ static STRINGDATA* ImplAllocData( sal_Int32 nLen )
 
 static STRINGDATA* _ImplCopyData( STRINGDATA* pData )
 {
-    unsigned int    nSize       = sizeof(STRINGDATA)+(pData->mnLen*sizeof( STRCODE ));
-    STRINGDATA*     pNewData    = (STRINGDATA*)rtl_allocateMemory( nSize );
+    unsigned int	nSize		= sizeof(STRINGDATA)+(pData->mnLen*sizeof( STRCODE ));
+    STRINGDATA* 	pNewData	= (STRINGDATA*)rtl_allocateMemory( nSize );
     memcpy( pNewData, pData, nSize );
     pNewData->mnRefCount = 1;
     STRING_RELEASE((STRING_TYPE *)pData);
@@ -246,7 +246,7 @@ inline sal_Int32 ImplGetCopyLen( sal_Int32 nStrLen, sal_Int32 nCopyLen )
 
 // =======================================================================
 
-STRING::STRING()
+STRING::STRING() 
     : mpData(NULL)
 {
     DBG_CTOR( STRING, DBGCHECKSTRING );
@@ -1090,7 +1090,7 @@ STRING& STRING::ToLowerAscii()
 
     sal_Int32 nIndex = 0;
     sal_Int32 nLen = mpData->mnLen;
-    STRCODE*    pStr = mpData->maStr;
+    STRCODE*	pStr = mpData->maStr;
     while ( nIndex < nLen )
     {
         // Ist das Zeichen zwischen 'A' und 'Z' dann umwandeln
@@ -1116,7 +1116,7 @@ STRING& STRING::ToUpperAscii()
 
     sal_Int32 nIndex = 0;
     sal_Int32 nLen = mpData->mnLen;
-    STRCODE*    pStr = mpData->maStr;
+    STRCODE*	pStr = mpData->maStr;
     while ( nIndex < nLen )
     {
         // Ist das Zeichen zwischen 'a' und 'z' dann umwandeln
@@ -1141,11 +1141,11 @@ STRING& STRING::ConvertLineEnd( LineEnd eLineEnd )
     DBG_CHKTHIS( STRING, DBGCHECKSTRING );
 
     // Zeilenumbrueche ermitteln und neue Laenge berechnen
-    BOOL            bConvert    = FALSE;            // Muss konvertiert werden
-    const STRCODE*  pStr        = mpData->maStr;    // damit es schneller geht
-    xub_StrLen      nLineEndLen = (eLineEnd == LINEEND_CRLF) ? 2 : 1;
-    xub_StrLen      nLen        = 0;                // Ziel-Laenge
-    xub_StrLen      i           = 0;                // Source-Zaehler
+    BOOL			bConvert	= FALSE;			// Muss konvertiert werden
+    const STRCODE*	pStr		= mpData->maStr;	// damit es schneller geht
+    xub_StrLen		nLineEndLen = (eLineEnd == LINEEND_CRLF) ? 2 : 1;
+    xub_StrLen		nLen		= 0;				// Ziel-Laenge
+    xub_StrLen		i			= 0;				// Source-Zaehler
 
     while ( i < mpData->mnLen )
     {
@@ -1186,7 +1186,7 @@ STRING& STRING::ConvertLineEnd( LineEnd eLineEnd )
     {
         // Neuen String anlegen
         STRINGDATA* pNewData = ImplAllocData( nLen );
-        xub_StrLen  j = 0;
+        xub_StrLen	j = 0;
         i = 0;
         while ( i < mpData->mnLen )
         {
@@ -1195,7 +1195,7 @@ STRING& STRING::ConvertLineEnd( LineEnd eLineEnd )
             {
                 if ( eLineEnd == LINEEND_CRLF )
                 {
-                    pNewData->maStr[j]   = _CR;
+                    pNewData->maStr[j]	 = _CR;
                     pNewData->maStr[j+1] = _LF;
                     j += 2;
                 }
@@ -1463,9 +1463,9 @@ xub_StrLen STRING::Match( const STRING& rStr ) const
         return STRING_MATCH;
 
     // Suche bis Stringende nach dem ersten nicht uebereinstimmenden Zeichen
-    const STRCODE*  pStr1 = mpData->maStr;
-    const STRCODE*  pStr2 = rStr.mpData->maStr;
-    xub_StrLen      i = 0;
+    const STRCODE*	pStr1 = mpData->maStr;
+    const STRCODE*	pStr2 = rStr.mpData->maStr;
+    xub_StrLen		i = 0;
     while ( i < mpData->mnLen )
     {
         // Stimmt das Zeichen nicht ueberein, dann abbrechen
@@ -1490,8 +1490,8 @@ xub_StrLen STRING::Match( const STRCODE* pCharStr ) const
         return STRING_MATCH;
 
     // Suche bis Stringende nach dem ersten nicht uebereinstimmenden Zeichen
-    const STRCODE*  pStr = mpData->maStr;
-    xub_StrLen      i = 0;
+    const STRCODE*	pStr = mpData->maStr;
+    xub_StrLen		i = 0;
     while ( i < mpData->mnLen )
     {
         // Stimmt das Zeichen nicht ueberein, dann abbrechen
@@ -1511,8 +1511,8 @@ xub_StrLen STRING::Search( STRCODE c, xub_StrLen nIndex ) const
 {
     DBG_CHKTHIS( STRING, DBGCHECKSTRING );
 
-    sal_Int32       nLen = mpData->mnLen;
-    const STRCODE*  pStr = mpData->maStr;
+    sal_Int32		nLen = mpData->mnLen;
+    const STRCODE*	pStr = mpData->maStr;
     pStr += nIndex;
     while ( nIndex < nLen )
     {
@@ -1579,7 +1579,7 @@ xub_StrLen STRING::Search( const STRCODE* pCharStr, xub_StrLen nIndex ) const
     DBG_CHKTHIS( STRING, DBGCHECKSTRING );
 
     sal_Int32 nLen = mpData->mnLen;
-    xub_StrLen nStrLen  = ImplStringLen( pCharStr );
+    xub_StrLen nStrLen	= ImplStringLen( pCharStr );
 
     // Falls die Laenge des uebergebenen Strings 0 ist oder der Index
     // hinter dem String liegt, dann wurde der String nicht gefunden
@@ -1645,13 +1645,13 @@ xub_StrLen STRING::SearchChar( const STRCODE* pChars, xub_StrLen nIndex ) const
 {
     DBG_CHKTHIS( STRING, DBGCHECKSTRING );
 
-    sal_Int32       nLen = mpData->mnLen;
-    const STRCODE*  pStr = mpData->maStr;
+    sal_Int32		nLen = mpData->mnLen;
+    const STRCODE*	pStr = mpData->maStr;
     pStr += nIndex;
     while ( nIndex < nLen )
     {
-        STRCODE         c = *pStr;
-        const STRCODE*  pCompStr = pChars;
+        STRCODE 		c = *pStr;
+        const STRCODE*	pCompStr = pChars;
         while ( *pCompStr )
         {
             if ( *pCompStr == c )
@@ -1682,8 +1682,8 @@ xub_StrLen STRING::SearchCharBackward( const STRCODE* pChars, xub_StrLen nIndex
         nIndex--;
         pStr--;
 
-        STRCODE         c =*pStr;
-        const STRCODE*  pCompStr = pChars;
+        STRCODE 		c =*pStr;
+        const STRCODE*	pCompStr = pChars;
         while ( *pCompStr )
         {
             if ( *pCompStr == c )
@@ -1701,8 +1701,8 @@ xub_StrLen STRING::SearchAndReplace( STRCODE c, STRCODE cRep, xub_StrLen nIndex
 {
     DBG_CHKTHIS( STRING, DBGCHECKSTRING );
 
-    sal_Int32       nLen = mpData->mnLen;
-    const STRCODE*  pStr = mpData->maStr;
+    sal_Int32		nLen = mpData->mnLen;
+    const STRCODE*	pStr = mpData->maStr;
     pStr += nIndex;
     while ( nIndex < nLen )
     {
@@ -1756,9 +1756,9 @@ void STRING::SearchAndReplaceAll( STRCODE c, STRCODE cRep )
 {
     DBG_CHKTHIS( STRING, DBGCHECKSTRING );
 
-    sal_Int32       nLen    = mpData->mnLen;
-    const STRCODE*  pStr    = mpData->maStr;
-    sal_Int32       nIndex  = 0;
+    sal_Int32		nLen	= mpData->mnLen;
+    const STRCODE*	pStr	= mpData->maStr;
+    sal_Int32		nIndex	= 0;
     while ( nIndex < nLen )
     {
         if ( *pStr == c )
@@ -1815,10 +1815,10 @@ xub_StrLen STRING::GetTokenCount( STRCODE cTok ) const
     if ( !mpData->mnLen )
         return 0;
 
-    xub_StrLen      nTokCount       = 1;
-    sal_Int32       nLen            = mpData->mnLen;
-    const STRCODE*  pStr            = mpData->maStr;
-    sal_Int32       nIndex          = 0;
+    xub_StrLen		nTokCount		= 1;
+    sal_Int32		nLen			= mpData->mnLen;
+    const STRCODE*	pStr			= mpData->maStr;
+    sal_Int32		nIndex			= 0;
     while ( nIndex < nLen )
     {
         // Stimmt das Tokenzeichen ueberein, dann erhoehe TokCount
@@ -1839,11 +1839,11 @@ void STRING::SetToken( xub_StrLen nToken, STRCODE cTok, const STRING& rStr,
     DBG_CHKTHIS( STRING, DBGCHECKSTRING );
     DBG_CHKOBJ( &rStr, STRING, DBGCHECKSTRING );
 
-    const STRCODE*  pStr            = mpData->maStr;
-    xub_StrLen      nLen            = (xub_StrLen)mpData->mnLen;
-    xub_StrLen      nTok            = 0;
-    xub_StrLen      nFirstChar      = nIndex;
-    xub_StrLen      i               = nFirstChar;
+    const STRCODE*	pStr			= mpData->maStr;
+    xub_StrLen		nLen			= (xub_StrLen)mpData->mnLen;
+    xub_StrLen		nTok			= 0;
+    xub_StrLen		nFirstChar		= nIndex;
+    xub_StrLen		i				= nFirstChar;
 
     // Bestimme die Token-Position und Laenge
     pStr += i;
@@ -1877,11 +1877,11 @@ STRING STRING::GetToken( xub_StrLen nToken, STRCODE cTok, xub_StrLen& rIndex ) c
 {
     DBG_CHKTHIS( STRING, DBGCHECKSTRING );
 
-    const STRCODE*  pStr            = mpData->maStr;
-    xub_StrLen      nLen            = (xub_StrLen)mpData->mnLen;
-    xub_StrLen      nTok            = 0;
-    xub_StrLen      nFirstChar      = rIndex;
-    xub_StrLen      i               = nFirstChar;
+    const STRCODE*	pStr			= mpData->maStr;
+    xub_StrLen		nLen			= (xub_StrLen)mpData->mnLen;
+    xub_StrLen		nTok			= 0;
+    xub_StrLen		nFirstChar		= rIndex;
+    xub_StrLen		i				= nFirstChar;
 
     // Bestimme die Token-Position und Laenge
     pStr += i;
@@ -1933,13 +1933,13 @@ xub_StrLen STRING::GetQuotedTokenCount( const STRING& rQuotedPairs, STRCODE cTok
     if ( !mpData->mnLen )
         return 0;
 
-    xub_StrLen      nTokCount       = 1;
-    sal_Int32       nLen            = mpData->mnLen;
-    xub_StrLen      nQuotedLen      = rQuotedPairs.Len();
-    STRCODE         cQuotedEndChar  = 0;
-    const STRCODE*  pQuotedStr      = rQuotedPairs.mpData->maStr;
-    const STRCODE*  pStr            = mpData->maStr;
-    sal_Int32       nIndex          = 0;
+    xub_StrLen		nTokCount		= 1;
+    sal_Int32		nLen			= mpData->mnLen;
+    xub_StrLen		nQuotedLen		= rQuotedPairs.Len();
+    STRCODE 		cQuotedEndChar	= 0;
+    const STRCODE*	pQuotedStr		= rQuotedPairs.mpData->maStr;
+    const STRCODE*	pStr			= mpData->maStr;
+    sal_Int32		nIndex			= 0;
     while ( nIndex < nLen )
     {
         STRCODE c = *pStr;
@@ -1986,14 +1986,14 @@ STRING STRING::GetQuotedToken( xub_StrLen nToken, const STRING& rQuotedPairs,
     DBG_ASSERT( !(rQuotedPairs.Len()%2), "String::GetQuotedToken() - QuotedString%2 != 0" );
     DBG_ASSERT( rQuotedPairs.Search(cTok) == STRING_NOTFOUND, "String::GetQuotedToken() - cTok in QuotedString" );
 
-    const STRCODE*  pStr            = mpData->maStr;
-    const STRCODE*  pQuotedStr      = rQuotedPairs.mpData->maStr;
-    STRCODE         cQuotedEndChar  = 0;
-    xub_StrLen      nQuotedLen      = rQuotedPairs.Len();
-    xub_StrLen      nLen            = (xub_StrLen)mpData->mnLen;
-    xub_StrLen      nTok            = 0;
-    xub_StrLen      nFirstChar      = rIndex;
-    xub_StrLen      i               = nFirstChar;
+    const STRCODE*	pStr			= mpData->maStr;
+    const STRCODE*	pQuotedStr		= rQuotedPairs.mpData->maStr;
+    STRCODE 		cQuotedEndChar	= 0;
+    xub_StrLen		nQuotedLen		= rQuotedPairs.Len();
+    xub_StrLen		nLen			= (xub_StrLen)mpData->mnLen;
+    xub_StrLen		nTok			= 0;
+    xub_StrLen		nFirstChar		= rIndex;
+    xub_StrLen		i				= nFirstChar;
 
     // Bestimme die Token-Position und Laenge
     pStr += i;
diff --git a/tools/source/string/strucvt.cxx b/tools/source/string/strucvt.cxx
index 9c9ef1dc4b5a..c2d716dbe5c2 100644
--- a/tools/source/string/strucvt.cxx
+++ b/tools/source/string/strucvt.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
@@ -142,8 +142,8 @@ UniString& UniString::Assign( const rtl::OUString& rStr )
 
     OSL_ENSURE(rStr.pData->length < STRING_MAXLEN,
                "Overflowing rtl::OUString -> UniString cut to zero length");
-
-
+    
+    
     if (rStr.pData->length < STRING_MAXLEN)
     {
         STRING_RELEASE((STRING_TYPE *)mpData);
@@ -204,7 +204,7 @@ UniString::UniString( const ResId& rResId )
         if( pResMgr )
             pResMgr->PopContext();
     }
-
+        
 
     ResHookProc pImplResHookProc = ResMgr::GetReadStringHook();
     if ( pImplResHookProc )
diff --git a/tools/source/string/tenccvt.cxx b/tools/source/string/tenccvt.cxx
index 5237b24948a7..3209c072cb62 100644
--- a/tools/source/string/tenccvt.cxx
+++ b/tools/source/string/tenccvt.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
diff --git a/tools/source/string/tstring.cxx b/tools/source/string/tstring.cxx
index f2525e3bca84..698ade9050ae 100644
--- a/tools/source/string/tstring.cxx
+++ b/tools/source/string/tstring.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
@@ -62,11 +62,11 @@ DBG_NAMEEX( UniString )
 
 // -----------------------------------------------------------------------
 
-#define STRCODE         sal_Char
+#define STRCODE 		sal_Char
 #define STRCODEU        unsigned char
-#define STRING          ByteString
-#define STRINGDATA      ByteStringData
-#define DBGCHECKSTRING  DbgCheckByteString
+#define STRING			ByteString
+#define STRINGDATA		ByteStringData
+#define DBGCHECKSTRING	DbgCheckByteString
 #define STRING_TYPE     rtl_String
 #define STRING_ACQUIRE  rtl_string_acquire
 #define STRING_RELEASE  rtl_string_release
@@ -240,7 +240,7 @@ BOOL ByteString::IsAlphaAscii() const
     while ( nIndex < nLen )
     {
         if ( !(((*pStr >= 97) && (*pStr <= 122)) ||
-               ((*pStr >= 65) && (*pStr <=  90))) )
+               ((*pStr >= 65) && (*pStr <=	90))) )
             return FALSE;
 
         ++pStr,
@@ -283,8 +283,8 @@ BOOL ByteString::IsAlphaNumericAscii() const
     while ( nIndex < nLen )
     {
         if ( !(((*pStr >= 97) && (*pStr <= 122)) ||
-               ((*pStr >= 65) && (*pStr <=  90)) ||
-               ((*pStr >= 48) && (*pStr <=  57))) )
+               ((*pStr >= 65) && (*pStr <=	90)) ||
+               ((*pStr >= 48) && (*pStr <=	57))) )
             return FALSE;
 
         ++pStr,
diff --git a/tools/source/string/tustring.cxx b/tools/source/string/tustring.cxx
index 27dab841124d..99d207b7ded4 100644
--- a/tools/source/string/tustring.cxx
+++ b/tools/source/string/tustring.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
@@ -56,11 +56,11 @@ DBG_NAMEEX( ByteString )
 
 // -----------------------------------------------------------------------
 
-#define STRCODE         sal_Unicode
+#define STRCODE 		sal_Unicode
 #define STRCODEU        sal_Unicode
-#define STRING          UniString
-#define STRINGDATA      UniStringData
-#define DBGCHECKSTRING  DbgCheckUniString
+#define STRING			UniString
+#define STRINGDATA		UniStringData
+#define DBGCHECKSTRING	DbgCheckUniString
 #define STRING_TYPE     rtl_uString
 #define STRING_ACQUIRE  rtl_uString_acquire
 #define STRING_RELEASE  rtl_uString_release
diff --git a/tools/source/testtoolloader/testtoolloader.cxx b/tools/source/testtoolloader/testtoolloader.cxx
index ca269ef6eea2..0c42ba4338f1 100644
--- a/tools/source/testtoolloader/testtoolloader.cxx
+++ b/tools/source/testtoolloader/testtoolloader.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
@@ -48,7 +48,7 @@ namespace tools
     typedef void ( *pfunc_CreateEventLogger)();
     typedef void ( *pfunc_DestroyEventLogger)();
 
-static oslModule    aTestToolModule = 0;
+static oslModule	aTestToolModule	= 0;
 // are we to be automated at all?
 static bool bAutomate = false;
 static bool bLoggerStarted = false;
@@ -105,7 +105,7 @@ void InitTestToolLib()
 
     if ( bAutomate )
     {
-        OUString    aFuncName( RTL_CONSTASCII_USTRINGPARAM( "CreateRemoteControl" ));
+        OUString	aFuncName( RTL_CONSTASCII_USTRINGPARAM( "CreateRemoteControl" ));
 
         LoadLib();
         if ( aTestToolModule )
@@ -127,7 +127,7 @@ void InitTestToolLib()
 
     if ( ::comphelper::UiEventsLogger::isEnabled() )
     {
-        OUString    aFuncName( RTL_CONSTASCII_USTRINGPARAM( "CreateEventLogger" ));
+        OUString	aFuncName( RTL_CONSTASCII_USTRINGPARAM( "CreateEventLogger" ));
 
         LoadLib();
         if ( aTestToolModule )
@@ -157,7 +157,7 @@ void DeInitTestToolLib()
     {
         if ( bAutomate )
         {
-            OUString    aFuncName( RTL_CONSTASCII_USTRINGPARAM( "DestroyRemoteControl" ));
+            OUString	aFuncName( RTL_CONSTASCII_USTRINGPARAM( "DestroyRemoteControl" ));
 
             oslGenericFunction pDeInitFunc = osl_getFunctionSymbol(
                 aTestToolModule, aFuncName.pData );
@@ -167,7 +167,7 @@ void DeInitTestToolLib()
 
         if ( bLoggerStarted /*::comphelper::UiEventsLogger::isEnabled()*/ )
         {
-            OUString    aFuncName( RTL_CONSTASCII_USTRINGPARAM( "DestroyEventLogger" ));
+            OUString	aFuncName( RTL_CONSTASCII_USTRINGPARAM( "DestroyEventLogger" ));
 
             oslGenericFunction pDeInitFunc = osl_getFunctionSymbol(
                 aTestToolModule, aFuncName.pData );
diff --git a/tools/source/zcodec/zcodec.cxx b/tools/source/zcodec/zcodec.cxx
index f4f62162854a..f2a3ab7602a1 100644
--- a/tools/source/zcodec/zcodec.cxx
+++ b/tools/source/zcodec/zcodec.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
@@ -34,7 +34,7 @@
 #else
 #include "zlib/zlib.h"
 #endif
-#endif
+#endif 
 #include <tools/zcodec.hxx>
 #include <rtl/crc.h>
 #include <osl/endian.h>
@@ -79,7 +79,7 @@ ZCodec::ZCodec( void )
 }
 
 // ------------------------------------------------------------------------
-
+                                                        
 ZCodec::~ZCodec()
 {
     delete (z_stream*) mpsC_Stream;
@@ -111,10 +111,10 @@ long ZCodec::EndCompression()
 
     if ( mbInit != 0 )
     {
-        if ( mbInit & 2 )   // 1->decompress, 3->compress
+        if ( mbInit & 2 )	// 1->decompress, 3->compress
         {
             do
-            {
+            {		
                 ImplWriteBack();
             }
             while ( deflate( PZSTREAM, Z_FINISH ) != Z_STREAM_END );
@@ -124,7 +124,7 @@ long ZCodec::EndCompression()
             retvalue = PZSTREAM->total_in;
             deflateEnd( PZSTREAM );
         }
-        else
+        else 
         {
             retvalue = PZSTREAM->total_out;
             inflateEnd( PZSTREAM );
@@ -139,9 +139,9 @@ long ZCodec::EndCompression()
 // ------------------------------------------------------------------------
 
 long ZCodec::Compress( SvStream& rIStm, SvStream& rOStm )
-{
+{	
     long nOldTotal_In = PZSTREAM->total_in;
-
+    
     if ( mbInit == 0 )
     {
         mpIStm = &rIStm;
@@ -151,9 +151,9 @@ long ZCodec::Compress( SvStream& rIStm, SvStream& rOStm )
     }
     while (( PZSTREAM->avail_in = mpIStm->Read( PZSTREAM->next_in = mpInBuf, mnInBufSize )) != 0 )
     {
-        if ( PZSTREAM->avail_out == 0 )
+        if ( PZSTREAM->avail_out == 0 ) 
             ImplWriteBack();
-        if ( deflate( PZSTREAM, Z_NO_FLUSH ) < 0 )
+        if ( deflate( PZSTREAM, Z_NO_FLUSH ) < 0 ) 
         {
             mbStatus = FALSE;
             break;
@@ -167,10 +167,10 @@ long ZCodec::Compress( SvStream& rIStm, SvStream& rOStm )
 long ZCodec::Decompress( SvStream& rIStm, SvStream& rOStm )
 {
     int err;
-    ULONG   nInToRead;
-    long    nOldTotal_Out = PZSTREAM->total_out;
+    ULONG	nInToRead;
+    long	nOldTotal_Out = PZSTREAM->total_out;
 
-    if ( mbFinish )
+    if ( mbFinish )	
         return PZSTREAM->total_out - nOldTotal_Out;
 
     if ( mbInit == 0 )
@@ -184,7 +184,7 @@ long ZCodec::Decompress( SvStream& rIStm, SvStream& rOStm )
     {
         if ( PZSTREAM->avail_out == 0 ) ImplWriteBack();
         if ( PZSTREAM->avail_in == 0 && mnInToRead )
-        {
+        {		
             nInToRead = ( mnInBufSize > mnInToRead ) ? mnInToRead : mnInBufSize;
             PZSTREAM->avail_in = mpIStm->Read( PZSTREAM->next_in = mpInBuf, nInToRead );
             mnInToRead -= nInToRead;
@@ -199,36 +199,36 @@ long ZCodec::Decompress( SvStream& rIStm, SvStream& rOStm )
             mbStatus = FALSE;
             break;
         }
-
-    }
+        
+    }		
     while ( ( err != Z_STREAM_END)  && ( PZSTREAM->avail_in || mnInToRead ) );
     ImplWriteBack();
-
-    if ( err == Z_STREAM_END )
-        mbFinish = TRUE;
+    
+    if ( err == Z_STREAM_END ) 
+        mbFinish = TRUE;	
     return ( mbStatus ) ? (long)(PZSTREAM->total_out - nOldTotal_Out) : -1;
 }
 
 // ------------------------------------------------------------------------
 
 long ZCodec::Write( SvStream& rOStm, const BYTE* pData, ULONG nSize )
-{
+{		
     if ( mbInit == 0 )
     {
         mpOStm = &rOStm;
         ImplInitBuf( FALSE );
     }
-
+        
     PZSTREAM->avail_in = nSize;
     PZSTREAM->next_in = (unsigned char*)pData;
-
+    
     while ( PZSTREAM->avail_in || ( PZSTREAM->avail_out == 0 ) )
     {
         if ( PZSTREAM->avail_out == 0 )
             ImplWriteBack();
 
         if ( deflate( PZSTREAM, Z_NO_FLUSH ) < 0 )
-        {
+        {	
             mbStatus = FALSE;
             break;
         }
@@ -241,10 +241,10 @@ long ZCodec::Write( SvStream& rOStm, const BYTE* pData, ULONG nSize )
 long ZCodec::Read( SvStream& rIStm, BYTE* pData, ULONG nSize )
 {
     int err;
-    ULONG   nInToRead;
+    ULONG	nInToRead;
 
-    if ( mbFinish )
-        return 0;           // PZSTREAM->total_out;
+    if ( mbFinish )	
+        return 0;			// PZSTREAM->total_out;
 
     mpIStm = &rIStm;
     if ( mbInit == 0 )
@@ -277,7 +277,7 @@ long ZCodec::Read( SvStream& rIStm, BYTE* pData, ULONG nSize )
     while ( (err != Z_STREAM_END) &&
             (PZSTREAM->avail_out != 0) &&
             (PZSTREAM->avail_in || mnInToRead) );
-    if ( err == Z_STREAM_END )
+    if ( err == Z_STREAM_END ) 
         mbFinish = TRUE;
 
     return (mbStatus ? (long)(nSize - PZSTREAM->avail_out) : -1);
@@ -288,10 +288,10 @@ long ZCodec::Read( SvStream& rIStm, BYTE* pData, ULONG nSize )
 long ZCodec::ReadAsynchron( SvStream& rIStm, BYTE* pData, ULONG nSize )
 {
     int err = 0;
-    ULONG   nInToRead;
+    ULONG	nInToRead;
 
-    if ( mbFinish )
-        return 0;           // PZSTREAM->total_out;
+    if ( mbFinish )	
+        return 0;			// PZSTREAM->total_out;
 
     if ( mbInit == 0 )
     {
@@ -336,7 +336,7 @@ long ZCodec::ReadAsynchron( SvStream& rIStm, BYTE* pData, ULONG nSize )
     while ( (err != Z_STREAM_END) &&
             (PZSTREAM->avail_out != 0) &&
             (PZSTREAM->avail_in || mnInToRead) );
-    if ( err == Z_STREAM_END )
+    if ( err == Z_STREAM_END ) 
         mbFinish = TRUE;
 
     return (mbStatus ? (long)(nSize - PZSTREAM->avail_out) : -1);
@@ -347,7 +347,7 @@ long ZCodec::ReadAsynchron( SvStream& rIStm, BYTE* pData, ULONG nSize )
 void ZCodec::ImplWriteBack()
 {
     ULONG nAvail = mnOutBufSize - PZSTREAM->avail_out;
-
+    
     if ( nAvail )
     {
         if ( mbInit & 2 && ( mnCompressMethod & ZCODEC_UPDATE_CRC ) )
@@ -392,12 +392,12 @@ void ZCodec::ImplInitBuf ( BOOL nIOFlag )
     if ( mbInit == 0 )
     {
         if ( nIOFlag )
-        {
+        {	
             mbInit = 1;
             if ( mbStatus && ( mnCompressMethod & ZCODEC_GZ_LIB ) )
             {
                 BYTE n1, n2, j, nMethod, nFlags;
-                for ( int i = 0; i < 2; i++ )   // gz - magic number
+                for ( int i = 0; i < 2; i++ )	// gz - magic number
                 {
                     *mpIStm >> j;
                     if ( j != gz_magic[ i ] )
@@ -423,7 +423,7 @@ void ZCodec::ImplInitBuf ( BOOL nIOFlag )
                     do
                     {
                         *mpIStm >> j;
-                    }
+                    }									
                     while ( j && !mpIStm->IsEof() );
                 }
                 /* skip the .gz file comment */
@@ -436,7 +436,7 @@ void ZCodec::ImplInitBuf ( BOOL nIOFlag )
                     while ( j && !mpIStm->IsEof() );
                 }
                 /* skip the header crc */
-                if ( nFlags & GZ_HEAD_CRC )
+                if ( nFlags & GZ_HEAD_CRC ) 
                     mpIStm->SeekRel( 2 );
                 if ( mbStatus )
                     mbStatus = ( inflateInit2( PZSTREAM, -MAX_WBITS) != Z_OK ) ? FALSE : TRUE;
@@ -448,11 +448,11 @@ void ZCodec::ImplInitBuf ( BOOL nIOFlag )
             mpInBuf = new BYTE[ mnInBufSize ];
         }
         else
-        {
+        {	
             mbInit = 3;
 
-            mbStatus = ( deflateInit2_( PZSTREAM, mnCompressMethod & 0xff, Z_DEFLATED,
-                MAX_WBITS, mnMemUsage, ( mnCompressMethod >> 8 ) & 0xff,
+            mbStatus = ( deflateInit2_( PZSTREAM, mnCompressMethod & 0xff, Z_DEFLATED, 
+                MAX_WBITS, mnMemUsage, ( mnCompressMethod >> 8 ) & 0xff, 
                     ZLIB_VERSION, sizeof( z_stream ) ) >= 0 );
 
             PZSTREAM->next_out = mpOutBuf = new BYTE[ PZSTREAM->avail_out = mnOutBufSize ];
diff --git a/tools/test/export.map b/tools/test/export.map
index 7321bbca16ad..f313c44bd7ad 100644
--- a/tools/test/export.map
+++ b/tools/test/export.map
@@ -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
diff --git a/tools/test/tests.cxx b/tools/test/tests.cxx
index 5a1e21f172a4..077e0ba966d9 100644
--- a/tools/test/tests.cxx
+++ b/tools/test/tests.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
diff --git a/tools/unx/source/dll/toolsdll.cxx b/tools/unx/source/dll/toolsdll.cxx
index 71b01e20bd4f..e7f2baa5360d 100644
--- a/tools/unx/source/dll/toolsdll.cxx
+++ b/tools/unx/source/dll/toolsdll.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
diff --git a/tools/win/inc/dll.hxx b/tools/win/inc/dll.hxx
index 2a91aefc0fa9..25e1e55278e8 100644
--- a/tools/win/inc/dll.hxx
+++ b/tools/win/inc/dll.hxx
@@ -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
diff --git a/tools/win/inc/parser.hxx b/tools/win/inc/parser.hxx
index 08b0d7968d54..e4d42632060a 100644
--- a/tools/win/inc/parser.hxx
+++ b/tools/win/inc/parser.hxx
@@ -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
@@ -41,7 +41,7 @@ String GetURLFromHostNotation( const String & rPath );
 String GetHostNotationFromURL( const String & rURL );
 
 CItemIDList MakeIDToken( const String &rToken );
-CItemIDList ParseSpecialURL( const String & rURL );
+CItemIDList	ParseSpecialURL( const String & rURL );
 
 #endif
 
diff --git a/tools/win/inc/shellex.h b/tools/win/inc/shellex.h
index f81502a3382b..e6371527e9b4 100644
--- a/tools/win/inc/shellex.h
+++ b/tools/win/inc/shellex.h
@@ -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
@@ -31,54 +31,54 @@
 #include <shlobj.h>
 #endif
 
-#ifdef  __cplusplus
+#ifdef	__cplusplus
 extern "C" {
-#define WINSHELLCALL    inline
+#define WINSHELLCALL	inline
 #else
-#define WINSHELLCALL    static
+#define WINSHELLCALL	static
 #endif
 
-#define SHChangeNotifyRegister_PROC_STR         MAKEINTRESOURCE(2)
-#define SHChangeNotifyDeregister_PROC_STR       MAKEINTRESOURCE(4)
+#define	SHChangeNotifyRegister_PROC_STR			MAKEINTRESOURCE(2)
+#define	SHChangeNotifyDeregister_PROC_STR		MAKEINTRESOURCE(4)
 
-#define SHCNF_ACCEPT_INTERRUPTS         0x0001
-#define SHCNF_ACCEPT_NON_INTERRUPTS     0x0002
-#define SHCNF_NO_PROXY                  0x8000
+#define	SHCNF_ACCEPT_INTERRUPTS			0x0001
+#define	SHCNF_ACCEPT_NON_INTERRUPTS		0x0002
+#define	SHCNF_NO_PROXY					0x8000
 
-#define SHCNF_ACCEPT_ALL                (SHCNF_ACCEPT_INTERRUPTS | SHCNF_ACCEPT_NON_INTERRUPTS)
+#define SHCNF_ACCEPT_ALL				(SHCNF_ACCEPT_INTERRUPTS | SHCNF_ACCEPT_NON_INTERRUPTS)
 
 typedef struct tagNOTIFYREGISTER {
-    LPCITEMIDLIST   pidlPath;
-    BOOL            bWatchSubtree;
+    LPCITEMIDLIST	pidlPath;
+    BOOL			bWatchSubtree;
 } NOTIFYREGISTER;
 
 typedef NOTIFYREGISTER *LPNOTIFYREGISTER;
 typedef NOTIFYREGISTER const *LPCNOTIFYREGISTER;
 
 typedef HANDLE (WINAPI *SHChangeNotifyRegister_PROC)(
-    HWND    hWnd,
-    DWORD   dwFlags,
-    LONG    wEventMask,
-    UINT    uMsg,
-    ULONG   cItems,
-    LPCNOTIFYREGISTER   lpItems);
+    HWND	hWnd,
+    DWORD	dwFlags,
+    LONG	wEventMask,
+    UINT	uMsg,
+    ULONG	cItems,
+    LPCNOTIFYREGISTER	lpItems);
 
 
 WINSHELLCALL HANDLE WINAPI SHChangeNotifyRegister(
-    HWND    hWnd,
-    DWORD   dwFlags,
-    LONG    wEventMask,
-    UINT    uMsg,
-    ULONG   cItems,
-    LPCNOTIFYREGISTER   lpItems)
+    HWND	hWnd,
+    DWORD	dwFlags,
+    LONG	wEventMask,
+    UINT	uMsg,
+    ULONG	cItems,
+    LPCNOTIFYREGISTER	lpItems)
 
 {
-    HMODULE hModule = GetModuleHandle( "SHELL32" );
-    HANDLE  hNotify = NULL;
+    HMODULE	hModule = GetModuleHandle( "SHELL32" );
+    HANDLE	hNotify = NULL;
 
     if ( hModule )
     {
-        SHChangeNotifyRegister_PROC lpfnSHChangeNotifyRegister = (SHChangeNotifyRegister_PROC)GetProcAddress( hModule, SHChangeNotifyRegister_PROC_STR );
+        SHChangeNotifyRegister_PROC	lpfnSHChangeNotifyRegister = (SHChangeNotifyRegister_PROC)GetProcAddress( hModule, SHChangeNotifyRegister_PROC_STR );
         if ( lpfnSHChangeNotifyRegister )
             hNotify = lpfnSHChangeNotifyRegister( hWnd, dwFlags, wEventMask, uMsg, cItems, lpItems );
     }
@@ -89,16 +89,16 @@ WINSHELLCALL HANDLE WINAPI SHChangeNotifyRegister(
 
 
 typedef BOOL (WINAPI *SHChangeNotifyDeregister_PROC)(
-    HANDLE  hNotify);
+    HANDLE	hNotify);
 
 WINSHELLCALL BOOL WINAPI SHChangeNotifyDeregister( HANDLE hNotify )
 {
-    HMODULE hModule = GetModuleHandle( "SHELL32" );
-    BOOL    fSuccess = FALSE;
+    HMODULE	hModule = GetModuleHandle( "SHELL32" );
+    BOOL	fSuccess = FALSE;
 
     if ( hModule )
     {
-        SHChangeNotifyDeregister_PROC   lpfnSHChangeNotifyDeregister = (SHChangeNotifyDeregister_PROC)GetProcAddress( hModule, SHChangeNotifyDeregister_PROC_STR );
+        SHChangeNotifyDeregister_PROC	lpfnSHChangeNotifyDeregister = (SHChangeNotifyDeregister_PROC)GetProcAddress( hModule, SHChangeNotifyDeregister_PROC_STR );
         if ( lpfnSHChangeNotifyDeregister )
             fSuccess = lpfnSHChangeNotifyDeregister( hNotify );
     }
@@ -107,7 +107,7 @@ WINSHELLCALL BOOL WINAPI SHChangeNotifyDeregister( HANDLE hNotify )
 }
 
 
-#ifdef  __cplusplus
+#ifdef	__cplusplus
 }
 #endif
 
diff --git a/tools/win/inc/shutil.h b/tools/win/inc/shutil.h
index 1daae442292d..d9e56ccf7584 100644
--- a/tools/win/inc/shutil.h
+++ b/tools/win/inc/shutil.h
@@ -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
@@ -38,38 +38,38 @@
 extern "C" {
 #endif
 
-#define PROTOCOL_FILE   "file:"
-#define MAX_URL         (MAX_PATH + sizeof(PROTOCOL_FILE))
+#define PROTOCOL_FILE	"file:"
+#define MAX_URL			(MAX_PATH + sizeof(PROTOCOL_FILE))
 
 #define SHUTIL_TO_DELIVER
 
 //--------------------------------------------------------------------------
 
-void *  WINAPI WIN_SHAlloc( ULONG cb );
-void *  WINAPI WIN_SHRealloc( void *pv, ULONG cb );
-void    WINAPI WIN_SHFree( void *pv );
+void *	WINAPI WIN_SHAlloc( ULONG cb );
+void *	WINAPI WIN_SHRealloc( void *pv, ULONG cb );
+void	WINAPI WIN_SHFree( void *pv );
 
 //--------------------------------------------------------------------------
 
-ULONG   WINAPI WIN_SHGetIDListSize( LPCITEMIDLIST pidl );
-BOOL    WINAPI WIN_SHCloneIDList( LPCITEMIDLIST pidl, LPITEMIDLIST *ppidl );
-BOOL    WINAPI WIN_SHAppendIDList( LPCITEMIDLIST pidl, LPITEMIDLIST *ppidl );
-LONG    WINAPI WIN_SHCompareIDList( LPCITEMIDLIST pidl1, LPCITEMIDLIST pidl2 );
+ULONG	WINAPI WIN_SHGetIDListSize( LPCITEMIDLIST pidl );
+BOOL	WINAPI WIN_SHCloneIDList( LPCITEMIDLIST pidl, LPITEMIDLIST *ppidl );
+BOOL	WINAPI WIN_SHAppendIDList( LPCITEMIDLIST pidl, LPITEMIDLIST *ppidl );
+LONG	WINAPI WIN_SHCompareIDList( LPCITEMIDLIST pidl1, LPCITEMIDLIST pidl2 );
 
-LONG    WINAPI WIN_SHGetIDListTokenCount( LPCITEMIDLIST pidl );
-BOOL    WINAPI WIN_SHGetIDListToken( LPCITEMIDLIST pidl, ULONG nToken, LPITEMIDLIST *ppidl );
+LONG	WINAPI WIN_SHGetIDListTokenCount( LPCITEMIDLIST pidl );
+BOOL	WINAPI WIN_SHGetIDListToken( LPCITEMIDLIST pidl, ULONG nToken, LPITEMIDLIST *ppidl );
 
-BOOL    WINAPI WIN_SHSplitIDList(
-    LPCITEMIDLIST   pidl,
-    LPITEMIDLIST *  pidlFolder,
-    LPITEMIDLIST *  pidlItem
+BOOL	WINAPI WIN_SHSplitIDList(
+    LPCITEMIDLIST	pidl,
+    LPITEMIDLIST *	pidlFolder,
+    LPITEMIDLIST *	pidlItem
     );
 
-BOOL    WINAPI WIN_SHSplitIDListEx(
-    LPCITEMIDLIST   pidl,
-    LPITEMIDLIST *  pidlParent,
-    LPITEMIDLIST *  pidlChild,
-    ULONG           nLevel
+BOOL	WINAPI WIN_SHSplitIDListEx(
+    LPCITEMIDLIST	pidl,
+    LPITEMIDLIST *	pidlParent,
+    LPITEMIDLIST *	pidlChild,
+    ULONG			nLevel
     );
 
 //--------------------------------------------------------------------------
@@ -80,22 +80,22 @@ BOOL    WINAPI WIN_SHSplitIDListEx(
 #define WIN_SHGetPathFromIDList( pidl, pszPath ) \
     SHGetPathFromIDList( pidl, pszPath )
 
-// #define  SHGP_CLSID  0x00000001
+// #define	SHGP_CLSID	0x00000001
 
-// BOOL WINAPI WIN_SHGetPathFromIDListEx( LPCITEMIDLIST pidl, LPSTR pszBuffer, UINT uFlags );
+// BOOL	WINAPI WIN_SHGetPathFromIDListEx( LPCITEMIDLIST pidl, LPSTR pszBuffer, UINT uFlags );
 
-BOOL    WINAPI WIN_SHGetIDListFromPath( LPCSTR pszPath, LPITEMIDLIST *ppidl );
+BOOL	WINAPI WIN_SHGetIDListFromPath( LPCSTR pszPath, LPITEMIDLIST *ppidl );
 
-BOOL    WINAPI WIN_SHGetPathFromURL( LPCSTR pszURL, LPSTR pszPath );
-BOOL    WINAPI WIN_SHGetURLFromPath( LPCSTR pszPath, LPSTR pszURL );
+BOOL	WINAPI WIN_SHGetPathFromURL( LPCSTR pszURL, LPSTR pszPath );
+BOOL	WINAPI WIN_SHGetURLFromPath( LPCSTR pszPath, LPSTR pszURL );
 
-BOOL    WINAPI WIN_SHGetFolderFromIDList( LPCITEMIDLIST pidl, LPSHELLFOLDER *ppshf );
-BOOL    WINAPI WIN_SHGetSpecialFolder( int nFolder, LPSHELLFOLDER *ppshf  );
-BOOL    WINAPI WIN_SHGetFolderFromPath( LPCSTR pszPath, LPSHELLFOLDER *ppshf );
+BOOL	WINAPI WIN_SHGetFolderFromIDList( LPCITEMIDLIST pidl, LPSHELLFOLDER *ppshf );
+BOOL	WINAPI WIN_SHGetSpecialFolder( int nFolder, LPSHELLFOLDER *ppshf  );
+BOOL	WINAPI WIN_SHGetFolderFromPath( LPCSTR pszPath, LPSHELLFOLDER *ppshf );
 
-BOOL    WINAPI WIN_SHGetSpecialFolderPath( int nFolder, LPSTR pszPath );
+BOOL	WINAPI WIN_SHGetSpecialFolderPath( int nFolder, LPSTR pszPath );
 
-HRESULT WINAPI WIN_SHGetDataFromIDList(
+HRESULT	WINAPI WIN_SHGetDataFromIDList(
     LPSHELLFOLDER psf,
     LPCITEMIDLIST pidl,
     int nFormat,
@@ -106,53 +106,53 @@ HRESULT WINAPI WIN_SHGetDataFromIDList(
 
 //--------------------------------------------------------------------------
 
-#define SHIC_PIDL   0x00000001
-#define SHIC_NO_UI  0x00000002
+#define SHIC_PIDL	0x00000001
+#define SHIC_NO_UI	0x00000002
 
-#define CMDSTR_OPENA        "open"
-#define CMDSTR_EXPLOREA     "explore"
-#define CMDSTR_FINDA        "find"
+#define CMDSTR_OPENA		"open"
+#define CMDSTR_EXPLOREA		"explore"
+#define CMDSTR_FINDA		"find"
 
-#define CMDSTR_OPENW        L"open"
-#define CMDSTR_EXPLOREW     L"explore"
-#define CMDSTR_FINDW        L"find"
+#define CMDSTR_OPENW		L"open"
+#define CMDSTR_EXPLOREW		L"explore"
+#define CMDSTR_FINDW		L"find"
 
 #ifdef UNICODE
-#define CMDSTR_OPEN     CMDSTR_OPENW
-#define CMDSTR_EXPLORE  CMDSTR_EXPLOREW
-#define CMDSTR_FIND     CMDSTR_FINDW
+#define CMDSTR_OPEN		CMDSTR_OPENW
+#define CMDSTR_EXPLORE	CMDSTR_EXPLOREW
+#define CMDSTR_FIND		CMDSTR_FINDW
 #else
-#define CMDSTR_OPEN     CMDSTR_OPENA
-#define CMDSTR_EXPLORE  CMDSTR_EXPLOREA
-#define CMDSTR_FIND     CMDSTR_FINDA
+#define CMDSTR_OPEN		CMDSTR_OPENA
+#define CMDSTR_EXPLORE	CMDSTR_EXPLOREA
+#define CMDSTR_FIND		CMDSTR_FINDA
 #endif
 
-#define CMDSTR_DEFAULT      MAKEINTRESOURCE(0x00)
+#define CMDSTR_DEFAULT		MAKEINTRESOURCE(0x00)
 
-#define CMDSTR_LINK         MAKEINTRESOURCE(0x10)
-#define CMDSTR_DELETE       MAKEINTRESOURCE(0x11)
-#define CMDSTR_RENAME       MAKEINTRESOURCE(0x12)
-#define CMDSTR_PROPERTIES   MAKEINTRESOURCE(0x13)
-#define CMDSTR_CUT          MAKEINTRESOURCE(0x18)
-#define CMDSTR_COPY         MAKEINTRESOURCE(0x19)
+#define CMDSTR_LINK			MAKEINTRESOURCE(0x10)
+#define CMDSTR_DELETE		MAKEINTRESOURCE(0x11)
+#define CMDSTR_RENAME		MAKEINTRESOURCE(0x12)
+#define CMDSTR_PROPERTIES	MAKEINTRESOURCE(0x13)
+#define CMDSTR_CUT			MAKEINTRESOURCE(0x18)
+#define CMDSTR_COPY			MAKEINTRESOURCE(0x19)
 
 BOOL WINAPI WIN_SHInvokeCommand(
-    HWND    hwndOwner,
-    DWORD   dwFlags,
-    LPCTSTR lpPath,
-    LPCSTR  lpVerb,
-    LPCSTR  lpParameters,
-    LPCSTR  lpDirectory,
-    int     nShow
+    HWND	hwndOwner,
+    DWORD	dwFlags,
+    LPCTSTR	lpPath,
+    LPCSTR	lpVerb,
+    LPCSTR	lpParameters,
+    LPCSTR	lpDirectory,
+    int		nShow
     );
 
 //--------------------------------------------------------------------------
 
 BOOL WINAPI WIN_SHStrRetToMultiByte(
-    LPCITEMIDLIST   pidl,
-    const STRRET *  pStr,
-    LPSTR           lpMultiByte,
-    int             cchMultiByte
+    LPCITEMIDLIST	pidl,
+    const STRRET *	pStr,
+    LPSTR			lpMultiByte,
+    int				cchMultiByte
     );
 
 DWORD WIN_SHBuildCRC( LPVOID pBytes, ULONG nBytes );
@@ -166,43 +166,43 @@ HIMAGELIST WINAPI WIN_SHGetSystemImageList( UINT uFlags );
 /*
 
 ULONG WINAPI WIN_CreateStringFromBinary (
-    LPCVOID pv,
-    ULONG   cbSize,
-    LPSTR   pszString,
-    ULONG   cbStringSize
+    LPCVOID	pv,
+    ULONG	cbSize,
+    LPSTR	pszString,
+    ULONG	cbStringSize
     );
 
 ULONG WINAPI WIN_CreateBinaryFromString(
-    LPCSTR  pszStr,
-    LPVOID  pBuffer,
-    ULONG   cbSize
+    LPCSTR	pszStr,
+    LPVOID	pBuffer,
+    ULONG	cbSize
     );
 */
 
 //--------------------------------------------------------------------------
 
-DWORD WINAPI WIN_SHSetValue(
-    HKEY    hKey,
-    LPCTSTR pszSubKey,
-    LPCTSTR pszValue,
-    DWORD   dwType,
-    LPCVOID pvData,
-    DWORD   cbData
+DWORD WINAPI WIN_SHSetValue( 
+    HKEY	hKey,
+    LPCTSTR	pszSubKey,
+    LPCTSTR	pszValue,
+    DWORD	dwType,
+    LPCVOID	pvData,
+    DWORD	cbData
     );
 
-DWORD WINAPI WIN_SHGetValue(
-    HKEY    hKey,
-    LPCTSTR pszSubKey,
-    LPCTSTR pszValue,
-    LPDWORD pdwType,
-    LPVOID  pvData,
-    LPDWORD pcbData
+DWORD WINAPI WIN_SHGetValue( 
+    HKEY	hKey,
+    LPCTSTR	pszSubKey,
+    LPCTSTR	pszValue,
+    LPDWORD	pdwType,
+    LPVOID	pvData,
+    LPDWORD	pcbData
     );
 
 DWORD WINAPI WIN_SHDeleteValue(
-    HKEY    hKey,
-    LPCTSTR pszSubKey,
-    LPCTSTR pszValue
+    HKEY	hKey,
+    LPCTSTR	pszSubKey,
+    LPCTSTR	pszValue
     );
 
 #ifdef __cplusplus
@@ -211,5 +211,5 @@ DWORD WINAPI WIN_SHDeleteValue(
 
 #endif
 
-#endif  // _SHUTIL_H_
+#endif	// _SHUTIL_H_
 
diff --git a/tools/win/inc/toolsdll.hxx b/tools/win/inc/toolsdll.hxx
index a6b1546763bc..1e8671e628ed 100644
--- a/tools/win/inc/toolsdll.hxx
+++ b/tools/win/inc/toolsdll.hxx
@@ -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
diff --git a/tools/win/inc/winshell.hxx b/tools/win/inc/winshell.hxx
index a8be1e7d1344..a09db9f39b38 100644
--- a/tools/win/inc/winshell.hxx
+++ b/tools/win/inc/winshell.hxx
@@ -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,14 +79,14 @@ public:
         { return m_nFolder; }
 
 protected:
-    ITEMIDLIST  *m_pidl;
-    int         m_nFolder;
+    ITEMIDLIST	*m_pidl;
+    int			m_nFolder;
 };
 
 
 inline CItemIDList CItemIDList::operator + ( const CItemIDList & rIDList ) const
 {
-    CItemIDList aCopy( *this );
+    CItemIDList	aCopy( *this );
     aCopy += rIDList;
     return aCopy;
 }
@@ -108,81 +108,81 @@ enum NotificationEvent
 
 typedef struct _WIN32_VOLUME_DATA
 {
-    TCHAR   cDeviceName[MAX_PATH];
-    TCHAR   cVolumeName[MAX_PATH];
-    TCHAR   cFileSystemName[MAX_PATH];
-    DWORD   dwSerialNumber;
-    DWORD   dwFileSystemFlags;
-    DWORD   nMaxComponentLength;
+    TCHAR	cDeviceName[MAX_PATH];
+    TCHAR	cVolumeName[MAX_PATH];
+    TCHAR	cFileSystemName[MAX_PATH];
+    DWORD	dwSerialNumber;
+    DWORD	dwFileSystemFlags;
+    DWORD	nMaxComponentLength;
 } WIN32_VOLUME_DATA;
 
 // Bekannte Class-IDs fuer wichtige Ordner
 
-// {871C5380-42A0-1069-A2EA-08002B30309D}   Internet Explorer 4.0
-static const GUID CLSID_IE4 =
+// {871C5380-42A0-1069-A2EA-08002B30309D}	Internet Explorer 4.0
+static const GUID CLSID_IE4 = 
 { 0x871C5380, 0x42A0, 0x1069, { 0xA2, 0xEA, 0x08, 0x00, 0x2B, 0x30, 0x30, 0x9D } };
 
-// {208D2C60-3AEA-1069-A2D7-08002B30309D}   Netzwerkumgebung
-static const GUID CLSID_Network =
+// {208D2C60-3AEA-1069-A2D7-08002B30309D}	Netzwerkumgebung
+static const GUID CLSID_Network = 
 { 0x208D2C60, 0x3AEA, 0x1069, { 0xA2, 0xD7, 0x08, 0x00, 0x2B, 0x30, 0x30, 0x9D } };
 
-// {645FF040-5081-101B-9F08-00AA002F954E}   Papierkorb
-static const GUID CLSID_RecycleBin =
+// {645FF040-5081-101B-9F08-00AA002F954E}	Papierkorb
+static const GUID CLSID_RecycleBin = 
 { 0x645FF040, 0x5081, 0x101B, { 0x9F, 0x08, 0x00, 0xAA, 0x00, 0x2F, 0x95, 0x4E } };
 
-// {20D04FE0-3AEA-1069-A2D8-08002B30309D}   Arbeitsplatz
-static const GUID CLSID_MyComputer =
+// {20D04FE0-3AEA-1069-A2D8-08002B30309D}	Arbeitsplatz
+static const GUID CLSID_MyComputer = 
 { 0x20D04FE0, 0x3AEA, 0x1069, { 0xA2, 0xD8, 0x08, 0x00, 0x2B, 0x30, 0x30, 0x9D } };
 
-// {D6277990-4C6A-11CF-8D87-00AA0060F5BF}   Geplante Vorg�nge
-static const GUID CLSID_Tasks =
+// {D6277990-4C6A-11CF-8D87-00AA0060F5BF}	Geplante Vorg�nge
+static const GUID CLSID_Tasks = 
 { 0xD6277990, 0x4C6A, 0x11CF, { 0x8D, 0x87, 0x00, 0xAA, 0x00, 0x60, 0xF5, 0xBF } };
 
 // Fehlt im Header
 
-#define SHGDN_INCLUDE_NONFILESYS    0x2000
+#define SHGDN_INCLUDE_NONFILESYS	0x2000
 
-#define CSIDL_UNKNOWN   -1
-#define CSIDL_ROOT      -2
-#define CSIDL_SYSTEM    -3
+#define CSIDL_UNKNOWN	-1
+#define CSIDL_ROOT		-2
+#define CSIDL_SYSTEM	-3
 
 // Suchmaske fuer IEnumIDList
 
-#define SHCONTF_ALL (SHCONTF_FOLDERS | SHCONTF_NONFOLDERS | SHCONTF_INCLUDEHIDDEN)
+#define SHCONTF_ALL	(SHCONTF_FOLDERS | SHCONTF_NONFOLDERS | SHCONTF_INCLUDEHIDDEN)
 
 // SHITEM Prefix Kinds
 
-#define SHGII_CONTAINER_MASK        0x70
+#define SHGII_CONTAINER_MASK		0x70
 
-#define SHGII_COMPUTER              0x20
+#define SHGII_COMPUTER				0x20
 
-#define SHGII_COMPUTER_REMOVABLE    0x22
-#define SHGII_COMPUTER_FIXED        0x23
-#define SHGII_COMPUTER_REMOTE       0x24
-#define SHGII_COMPUTER_CDROM        0x25
-#define SHGII_COMPUTER_RAMDISK      0x26
-#define SHGII_COMPUTER_FLOPPY525    0x28
-#define SHGII_COMPUTER_FLOPPY35     0x29
-#define SHGII_COMPUTER_NETWORK      0x2A
-#define SHGII_COMPUTER_REGITEM      0x2E
+#define SHGII_COMPUTER_REMOVABLE	0x22
+#define SHGII_COMPUTER_FIXED		0x23
+#define SHGII_COMPUTER_REMOTE		0x24
+#define SHGII_COMPUTER_CDROM		0x25
+#define SHGII_COMPUTER_RAMDISK		0x26
+#define SHGII_COMPUTER_FLOPPY525	0x28
+#define SHGII_COMPUTER_FLOPPY35		0x29
+#define SHGII_COMPUTER_NETWORK		0x2A
+#define SHGII_COMPUTER_REGITEM		0x2E
 
-#define SHGII_ROOT                  0x10
-#define SHGII_ROOT_REGITEM          0x1F
+#define SHGII_ROOT					0x10
+#define SHGII_ROOT_REGITEM			0x1F
 
-#define SHGII_NETWORK               0x40
-#define SHGII_NETWORK_TREE          0x47
-#define SHGII_NETWORK_SERVER        0x42
-#define SHGII_NETWORK_DIRECTORY     0x43
-#define SHGII_NETWORK_PRINTER       0x41
+#define SHGII_NETWORK				0x40
+#define SHGII_NETWORK_TREE			0x47
+#define SHGII_NETWORK_SERVER		0x42
+#define SHGII_NETWORK_DIRECTORY		0x43
+#define SHGII_NETWORK_PRINTER		0x41
 
-#define SHGII_FILESYSTEM            0x30
-#define SHGII_FILESYSTEM_FILE       0x31
-#define SHGII_FILESYSTEM_DIRECTORY  0x32
+#define SHGII_FILESYSTEM			0x30
+#define SHGII_FILESYSTEM_FILE		0x31
+#define SHGII_FILESYSTEM_DIRECTORY	0x32
 
-#define SHGII_ANCESTOR              0x80
+#define SHGII_ANCESTOR				0x80
 
-#define SHITEMCONTAINER( pidl )     ((pidl)->mkid.abID[0] & SHGII_CONTAINER_MASK)
-#define SHITEMKIND( pidl )          ((pidl)->mkid.abID[0] & 0x7F)
+#define SHITEMCONTAINER( pidl )		((pidl)->mkid.abID[0] & SHGII_CONTAINER_MASK)
+#define SHITEMKIND( pidl )			((pidl)->mkid.abID[0] & 0x7F)
 
 //----------------------------------------------------------------------------
 // CShellFolderData
@@ -194,12 +194,12 @@ protected:
     CShellFolderData();
     virtual ~CShellFolderData();
 
-    IShellFolder    *m_pShellFolder;
-    IEnumIDList     *m_pEnumIDList;
-    IShellIcon      *m_pShellIcon;
-    BOOL            m_bIsOpen;
-    HANDLE          m_hCancelEvent;
-    DWORD           m_dwContentFlags;
+    IShellFolder	*m_pShellFolder;
+    IEnumIDList		*m_pEnumIDList;
+    IShellIcon		*m_pShellIcon;
+    BOOL			m_bIsOpen;
+    HANDLE			m_hCancelEvent;
+    DWORD			m_dwContentFlags;
 };
 
 //----------------------------------------------------------------------------
@@ -233,7 +233,7 @@ public:
     virtual BOOL GetVolumeInfo( const CItemIDList & rIDList, WIN32_VOLUME_DATA * );
 
     // Modifying the folder contents
-
+    
     virtual BOOL SetNameOf( const CItemIDList &, const String &, CItemIDList & );
     virtual BOOL DeleteItem( const CItemIDList & );
 
@@ -276,7 +276,7 @@ protected:
 
     void Initialize( LPCTSTR pszPath );
 
-    TCHAR   m_szPath[MAX_PATH];
+    TCHAR	m_szPath[MAX_PATH];
 };
 
 //----------------------------------------------------------------------------
@@ -295,7 +295,7 @@ protected:
 
     void Initialize( int nFolder );
 
-    int m_nFolder;
+    int	m_nFolder;
 };
 
 //----------------------------------------------------------------------------
diff --git a/tools/win/source/dll/toolsdll.cxx b/tools/win/source/dll/toolsdll.cxx
index 8fc9888021bb..fd73adacd72b 100644
--- a/tools/win/source/dll/toolsdll.cxx
+++ b/tools/win/source/dll/toolsdll.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
diff --git a/tools/workben/fstest.cxx b/tools/workben/fstest.cxx
index 8048f2c166b0..2d33516840af 100644
--- a/tools/workben/fstest.cxx
+++ b/tools/workben/fstest.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
@@ -91,4 +91,4 @@ void CheckTimes(DirEntry aDE)
         aDateModified.GetDate(), aTimeModified.GetTime());
     return;
 }
-
+                
diff --git a/tools/workben/hashtbl.cxx b/tools/workben/hashtbl.cxx
index bcd9f903ab64..26b5535904ea 100644
--- a/tools/workben/hashtbl.cxx
+++ b/tools/workben/hashtbl.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
@@ -33,12 +33,12 @@
 
 #include <algorithm>
 
-// -------------------------------------------------------------
+// ------------------------------------------------------------- 
 // class HashItem
 //
 class HashItem
 {
-    enum ETag { TAG_EMPTY, TAG_USED, TAG_DELETED };
+    enum ETag { TAG_EMPTY, TAG_USED, TAG_DELETED };   
 
     void*   m_pObject;
     ETag    m_Tag;
@@ -49,13 +49,13 @@ public:
 
     BOOL IsDeleted() const
     {   return m_Tag == TAG_DELETED; }
-
+    
     BOOL IsEmpty() const
-    {   return m_Tag == TAG_DELETED || m_Tag == TAG_EMPTY; }
+    {   return m_Tag == TAG_DELETED || m_Tag == TAG_EMPTY; } 
 
     BOOL IsFree() const
     {   return m_Tag == TAG_EMPTY; }
-
+    
     BOOL IsUsed() const
     {   return m_Tag == TAG_USED; }
 
@@ -75,7 +75,7 @@ public:
 // #define MIN(a,b) (a)<(b)?(a):(b)
 // #define MAX(a,b) (a)>(b)?(a):(b)
 
-// -------------------------------------------------------------
+// ------------------------------------------------------------- 
 // class HashTable
 //
 
@@ -88,14 +88,14 @@ HashTable::HashTable(ULONG lSize, BOOL bOwner, double dMaxLoadFactor, double dGr
     m_bOwner         = bOwner;
     m_lElem          = 0;
     m_dMaxLoadFactor = std::max(0.5,std::min(1.0,dMaxLoadFactor));  // 0.5 ... 1.0
-    m_dGrowFactor    = std::max(1.3,(5.0,dGrowFactor));     // 1.3 ... 5.0
+    m_dGrowFactor    = std::max(1.3,(5.0,dGrowFactor));     // 1.3 ... 5.0    
     m_pData          = new HashItem [lSize];
 
 // Statistik
 #ifdef DBG_UTIL
     m_aStatistic.m_lSingleHash = 0;
     m_aStatistic.m_lDoubleHash = 0;
-    m_aStatistic.m_lProbe      = 0;
+    m_aStatistic.m_lProbe	   = 0;
 #endif
 }
 
@@ -129,7 +129,7 @@ void* HashTable::GetObjectAt(ULONG lPos) const
 // Gibt Objekt zur�ck, wenn es eines gibt, sonst NULL;
 {
     DBG_ASSERT(lPos<m_lSize, "HashTable::GetObjectAt()");
-
+    
     HashItem *pItem = &m_pData[lPos];
 
     return pItem->IsUsed() ? pItem->GetObject() : NULL;
@@ -145,9 +145,9 @@ ULONG HashTable::Hash(String const& Key) const
     /*
     ULONG lHash = 0;
     ULONG i,n;
-
+    
     for (i=0,n=Key.Len(); i<n; i++)
-    {
+    {   
         lHash *= 256L;
         lHash += (ULONG)(USHORT)Key.GetStr()[i];
         lHash %= m_lSize;
@@ -160,7 +160,7 @@ ULONG HashTable::Hash(String const& Key) const
     ULONG i,n;
     ULONG h = 0;
     ULONG g = 0;
-
+    
     for (i=0,n=Key.Len(); i<n; i++)
     {
         h = (h<<4) + (ULONG)(USHORT)Key.GetStr()[i];
@@ -174,28 +174,28 @@ ULONG HashTable::Hash(String const& Key) const
     }
 
     return h % m_lSize;
-}
+} 
 
 ULONG HashTable::DHash(String const& Key, ULONG lOldHash) const
 {
     ULONG lHash = lOldHash;
     ULONG i,n;
-
+    
     for (i=0,n=Key.Len(); i<n; i++)
-    {
+    {   
         lHash *= 256L;
         lHash += (ULONG)(USHORT)Key.GetStr()[i];
         lHash %= m_lSize;
     }
     return lHash;
 
-/*    return
+/*    return 
         (
             lHash
-        +   (char)Key.GetStr()[0] * 256
-        +   (char)Key.GetStr()[Key.Len()-1]
-        +   1
-        )
+        +	(char)Key.GetStr()[0] * 256
+        +	(char)Key.GetStr()[Key.Len()-1]
+        +	1
+        ) 
         % m_lSize;
 */
 }
@@ -206,10 +206,10 @@ ULONG HashTable::Probe(ULONG lPos) const
     lPos++; if (lPos==m_lSize) lPos=0;
     return lPos;
 }
-
+ 
 BOOL HashTable::IsFull() const
-{
-    return m_lElem>=m_lSize;
+{   
+    return m_lElem>=m_lSize; 
 }
 
 BOOL HashTable::Insert(String const& Key, void* pObject)
@@ -234,7 +234,7 @@ BOOL HashTable::Insert(String const& Key, void* pObject)
     // first hashing
     //
     if (pItem->IsEmpty())
-    {
+    {                    
         pItem->SetObject(Key, pObject);
         m_lElem++;
 
@@ -243,13 +243,13 @@ BOOL HashTable::Insert(String const& Key, void* pObject)
         #endif
 
         return TRUE;
-    }
-
+    } 
+                          
     // double hashing
     //
     lPos  = DHash(Key,lPos);
     pItem = &m_pData[lPos];
-
+    
     if (pItem->IsEmpty())
     {
         pItem->SetObject(Key, pObject);
@@ -263,7 +263,7 @@ BOOL HashTable::Insert(String const& Key, void* pObject)
     }
 
     // linear probing
-    //
+    //                  
     do
     {
         #ifdef DBG_UTIL
@@ -291,55 +291,55 @@ HashItem* HashTable::FindPos(String const& Key) const
     //
     ULONG     lPos  = Hash(Key);
     HashItem *pItem = &m_pData[lPos];
-
+    
     if (pItem->IsUsed()
     &&  pItem->GetKey() == Key)
     {
         return pItem;
-    }
-
+    }   
+                        
     // double hashing
     //
     if (pItem->IsDeleted() || pItem->IsUsed())
     {
         lPos  = DHash(Key,lPos);
         pItem = &m_pData[lPos];
-
+            
         if (pItem->IsUsed()
         &&  pItem->GetKey() == Key)
         {
             return pItem;
-        }
+        }        
 
         // linear probing
-        //
+        //                  
         if (pItem->IsDeleted() || pItem->IsUsed())
-        {
+        { 
             ULONG n      = 0;
             BOOL  bFound = FALSE;
             BOOL  bEnd   = FALSE;
-
+            
             do
-            {
+            {                      
                 n++;
                 lPos   = Probe(lPos);
                 pItem  = &m_pData[lPos];
 
-                bFound =  pItem->IsUsed()
+                bFound =  pItem->IsUsed() 
                        && pItem->GetKey() == Key;
-
-                bEnd = !(n<m_lSize || pItem->IsFree());
+                       
+                bEnd = !(n<m_lSize || pItem->IsFree());       
             }
             while(!bFound && !bEnd);
-
-            return bFound ? pItem : NULL;
+            
+            return bFound ? pItem : NULL;       
         }
-    }
+    }      
 
     // nicht gefunden
     //
     return NULL;
-}
+}   
 
 void* HashTable::Find(String const& Key) const
 // Gibt Verweis des Objektes zur�ck, das unter Key abgespeichert ist,
@@ -347,9 +347,9 @@ void* HashTable::Find(String const& Key) const
 //
 // pre:  -
 // post: -
-{
+{                  
     HashItem *pItem = FindPos(Key);
-
+    
     if (pItem != NULL
     &&  pItem->GetKey() == Key)
         return pItem->GetObject();
@@ -367,7 +367,7 @@ void* HashTable::Delete(String const& Key)
 //       Wenn die HashTable der Owner ist, wurde das Object gel�scht
 {
     HashItem *pItem = FindPos(Key);
-
+    
     if (pItem != NULL
     &&  pItem->GetKey() == Key)
     {
@@ -399,10 +399,10 @@ void HashTable::SmartGrow()
     double dLoadFactor = CalcLoadFactor();
 
     if (dLoadFactor <= m_dMaxLoadFactor)
-        return; // nothing to grow
+        return; // nothing to grow 
 
     ULONG     lOldSize = m_lSize;              // alte Daten sichern
-    HashItem* pOldData = m_pData;
+    HashItem* pOldData = m_pData;              
 
     m_lSize = ULONG (m_dGrowFactor * m_lSize); // neue Gr��e
     m_pData = new HashItem[m_lSize];           // neue Daten holen
@@ -417,7 +417,7 @@ void HashTable::SmartGrow()
         return;
     }
 
-    m_lElem = 0;                               // noch keine neuen Daten
+    m_lElem = 0;                               // noch keine neuen Daten 
 
     // Umkopieren der Daten
     //
@@ -471,26 +471,26 @@ void* HashTableIterator::GetPrev()
     return FindValidObject(FALSE /* backward */);
 }
 
-void* HashTableIterator::FindValidObject(BOOL bForward)
+void* HashTableIterator::FindValidObject(BOOL bForward) 
 // Sucht nach einem vorhandenen Objekt ab der aktuellen
 // Position.
 //
 // pre:  ab inkl. m_lAt soll die Suche beginnen
 // post: if not found then
-//          if bForward == TRUE then
-//              m_lAt == m_aTable.GetSize() -1
-//          else
-//              m_lAt == 0
-//       else
-//          m_lAt ist die gefundene Position
+//			if bForward == TRUE then
+//				m_lAt == m_aTable.GetSize() -1
+//			else
+//				m_lAt == 0
+//		 else
+//			m_lAt ist die gefundene Position
 {
     void *pObject = m_aTable.GetObjectAt(m_lAt);
 
     if (pObject != NULL)
         return pObject;
-
+    
     while (pObject == NULL
-       && (bForward ? ((m_lAt+1) < m_aTable.GetSize())
+       && (bForward ? ((m_lAt+1) < m_aTable.GetSize()) 
                     :   m_lAt    > 0))
     {
         if (bForward)
@@ -499,7 +499,7 @@ void* HashTableIterator::FindValidObject(BOOL bForward)
             m_lAt--;
 
         pObject = m_aTable.GetObjectAt(m_lAt);
-    }
+    } 
 
 #ifdef DBG_UTIL
 
@@ -511,5 +511,5 @@ void* HashTableIterator::FindValidObject(BOOL bForward)
 
 #endif
 
-    return pObject;
+    return pObject; 
 }
diff --git a/tools/workben/hashtbl.hxx b/tools/workben/hashtbl.hxx
index f4593b8148cf..60b78afe5205 100644
--- a/tools/workben/hashtbl.hxx
+++ b/tools/workben/hashtbl.hxx
@@ -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
@@ -31,8 +31,8 @@
 #include <tlgen.hxx>
 
 // ADT hash table
-//
-// Invariante:
+//               
+// Invariante: 
 //    1. m_lElem < m_lSize
 //    2. die Elemente in m_Array wurden double-hashed erzeugt
 //
@@ -46,24 +46,24 @@ class HashTable
     double    m_dMaxLoadFactor;
     double    m_dGrowFactor;
     BOOL      m_bOwner;
-
+    
     ULONG Hash(String const& Key) const;
-    ULONG DHash(String const& Key, ULONG lHash) const;
+    ULONG DHash(String const& Key, ULONG lHash) const;  
     ULONG Probe(ULONG lPos) const;
-
-    HashItem* FindPos(String const& Key) const;
+    
+    HashItem* FindPos(String const& Key) const; 
     void      SmartGrow();
     double    CalcLoadFactor() const;
 
 // Statistik
 #ifdef DBG_UTIL
-private:
+private: 
     struct
     {
         ULONG m_lSingleHash;
         ULONG m_lDoubleHash;
         ULONG m_lProbe;
-    }
+    } 
         m_aStatistic;
 #endif
 
@@ -75,36 +75,36 @@ protected:
     void* GetObjectAt(ULONG lPos) const;
 
 // Default-Werte
-public:
+public: 
     static double m_defMaxLoadFactor;
     static double m_defDefGrowFactor;
 
 public:
     HashTable
     (
-        ULONG   lSize,
-        BOOL    bOwner,
-        double  dMaxLoadFactor = HashTable::m_defMaxLoadFactor /* 0.8 */,
-        double  dGrowFactor = HashTable::m_defDefGrowFactor /* 2.0 */
+        ULONG	lSize, 
+        BOOL	bOwner, 
+        double	dMaxLoadFactor = HashTable::m_defMaxLoadFactor /* 0.8 */, 
+        double	dGrowFactor = HashTable::m_defDefGrowFactor /* 2.0 */
     );
 
     ~HashTable();
-
+    
     BOOL  IsFull() const;
     ULONG GetSize() const { return m_lSize; }
 
     void* Find   (String const& Key) const;
     BOOL  Insert (String const& Key, void* pObject);
     void* Delete (String const& Key);
-};
+};  
 
 // ADT hash table iterator
 //
 // Invariante: 0 <= m_lAt < m_aTable.GetCount()
-//
+//	
 class HashTableIterator
 {
-    ULONG            m_lAt;
+    ULONG			 m_lAt;
     HashTable const& m_aTable;
 
     void* FindValidObject(BOOL bForward);
@@ -125,12 +125,12 @@ public:
     class ClassName : public HashTable                                  \
     {                                                                   \
     public:                                                             \
-        ClassName                                                       \
-        (                                                               \
-            ULONG   lSize,                                              \
-            double  dMaxLoadFactor = HashTable::m_defMaxLoadFactor,     \
-            double  dGrowFactor = HashTable::m_defDefGrowFactor         \
-        )                                                               \
+        ClassName														\
+        (																\
+            ULONG	lSize,												\
+            double	dMaxLoadFactor = HashTable::m_defMaxLoadFactor,		\
+            double	dGrowFactor = HashTable::m_defDefGrowFactor			\
+        )																\
         : HashTable(lSize,Owner,dMaxLoadFactor,dGrowFactor) {}          \
                                                                         \
         ObjType  Find (KeyType const& Key) const                        \
@@ -141,7 +141,7 @@ public:
                                                                         \
         ObjType  Delete (KeyType const&Key)                             \
         { return (ObjType) HashTable::Delete (String(Key)); }           \
-    };
+    };                                                                      
 
 // HashTable OHNE Owner-Verhalten
 #define DECLARE_HASHTABLE(ClassName,KeyType,ObjType)                 \
@@ -155,15 +155,15 @@ public:
     protected:                                                       \
         virtual void OnDeleteObject(void* pObject);                  \
     public:                                                          \
-        ClassName                                                    \
-        (                                                            \
-            ULONG   lSize,                                           \
-            double  dMaxLoadFactor = HashTable::m_defMaxLoadFactor,  \
-            double  dGrowFactor = HashTable::m_defDefGrowFactor      \
-        )                                                            \
-        : ClassName##2(lSize,dMaxLoadFactor,dGrowFactor) {}          \
+        ClassName													 \
+        (															 \
+            ULONG	lSize,											 \
+            double	dMaxLoadFactor = HashTable::m_defMaxLoadFactor,	 \
+            double	dGrowFactor = HashTable::m_defDefGrowFactor		 \
+        )															 \
+        : ClassName##2(lSize,dMaxLoadFactor,dGrowFactor) {}			 \
         ~ClassName();                                                \
-    };
+    };                                                               
 
 #define IMPLEMENT_HASHTABLE_OWNER(ClassName,KeyType,ObjType)         \
     void ClassName::OnDeleteObject(void* pObject)                    \
@@ -181,23 +181,23 @@ public:
 
 // Iterator-Makros --------------------------------------------------
 
-#define DECLARE_HASHTABLE_ITERATOR(ClassName,ObjType)               \
-    class ClassName : public HashTableIterator                      \
-    {                                                               \
-    public:                                                         \
-        ClassName(HashTable const& aTable)                          \
-        : HashTableIterator(aTable) {}                              \
+#define DECLARE_HASHTABLE_ITERATOR(ClassName,ObjType)				\
+    class ClassName : public HashTableIterator						\
+    {																\
+    public:															\
+        ClassName(HashTable const& aTable)							\
+        : HashTableIterator(aTable)	{}								\
                                                                     \
-        ObjType GetFirst()                                          \
-            { return (ObjType)HashTableIterator::GetFirst(); }      \
-        ObjType GetNext()                                           \
-            { return (ObjType)HashTableIterator::GetNext();  }      \
-        ObjType GetLast()                                           \
-            { return (ObjType)HashTableIterator::GetLast();  }      \
-        ObjType GetPrev()                                           \
-            { return (ObjType)HashTableIterator::GetPrev();  }      \
+        ObjType GetFirst()		 									\
+            { return (ObjType)HashTableIterator::GetFirst(); }		\
+        ObjType GetNext()		 									\
+            { return (ObjType)HashTableIterator::GetNext();  }		\
+        ObjType GetLast()		 									\
+            { return (ObjType)HashTableIterator::GetLast();  }		\
+        ObjType GetPrev()		 									\
+            { return (ObjType)HashTableIterator::GetPrev();  }		\
     };
 
-
+                                                                    
 #endif // _HASHTBL_HXX
 
diff --git a/tools/workben/helloworld.c b/tools/workben/helloworld.c
index 5d86cf2db21b..5a1f76c1e8d7 100644
--- a/tools/workben/helloworld.c
+++ b/tools/workben/helloworld.c
@@ -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
diff --git a/tools/workben/inetmimetest.cxx b/tools/workben/inetmimetest.cxx
index e380fb7f6fbe..66c07e938ea2 100644
--- a/tools/workben/inetmimetest.cxx
+++ b/tools/workben/inetmimetest.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
diff --git a/tools/workben/solar.c b/tools/workben/solar.c
index 06c4a787ec72..b7458d834da4 100644
--- a/tools/workben/solar.c
+++ b/tools/workben/solar.c
@@ -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
@@ -67,11 +67,11 @@ int check( TestFunc func, Type eT, void* p );
 #else
 #endif
 
-#define printTypeSize(Type,Name)    printf( "sizeof(%s)\t= %d\n", Name, \
+#define printTypeSize(Type,Name)	printf(	"sizeof(%s)\t= %d\n", Name,	\
                 sizeof (Type) )
 
-#define isSignedType(Type)  (((Type)-1) < 0)
-#define printTypeSign(Type,Name)    printf( "%s\t= %s %s\n", Name,      \
+#define isSignedType(Type)	(((Type)-1) < 0)
+#define printTypeSign(Type,Name)	printf(	"%s\t= %s %s\n", Name,		\
                 ( isSignedType(Type) ? "unsigned" : "signed" ), Name )
 
 
@@ -162,7 +162,7 @@ void __cdecl SignalHandler( int sig )
   bSignal = 1;
   /*
   fprintf( stderr, "Signal %d caught\n", sig );
-  signal( sig,  SignalHandler );
+  signal( sig,	SignalHandler );
   */
   longjmp( check_env, sig );
 }
@@ -192,15 +192,15 @@ int check( TestFunc func, Type eT, void* p )
 
   if ( !setjmp( check_env ) )
   {
-    signal( SIGSEGV,    SignalHandler );
+    signal( SIGSEGV,	SignalHandler );
 #ifdef UNX
-    signal( SIGBUS, SignalHandler );
+    signal( SIGBUS,	SignalHandler );
 #else
 #endif
     result = func( eT, p );
-    signal( SIGSEGV,    SIG_DFL );
+    signal( SIGSEGV,	SIG_DFL );
 #ifdef UNX
-    signal( SIGBUS, SIG_DFL );
+    signal( SIGBUS,	SIG_DFL );
 #else
 #endif
   }
@@ -219,11 +219,11 @@ int GetAtAddress( Type eT, void* p )
 {
   switch ( eT )
   {
-  case t_char:      return *((char*)p);
-  case t_short:     return *((short*)p);
-  case t_int:       return *((int*)p);
-  case t_long:      return *((long*)p);
-  case t_double:    return *((double*)p);
+  case t_char:		return *((char*)p);
+  case t_short:		return *((short*)p);
+  case t_int:		return *((int*)p);
+  case t_long:		return *((long*)p);
+  case t_double:	return *((double*)p);
   }
   abort();
 }
@@ -232,11 +232,11 @@ int SetAtAddress( Type eT, void* p )
 {
   switch ( eT )
   {
-  case t_char:      return *((char*)p)  = 0;
-  case t_short:     return *((short*)p) = 0;
-  case t_int:       return *((int*)p)   = 0;
-  case t_long:      return *((long*)p)  = 0;
-  case t_double:    return *((double*)p)= 0;
+  case t_char:		return *((char*)p)	= 0;
+  case t_short:		return *((short*)p)	= 0;
+  case t_int:		return *((int*)p)	= 0;
+  case t_long:		return *((long*)p)	= 0;
+  case t_double:	return *((double*)p)= 0;
   }
   abort();
 }
@@ -245,11 +245,11 @@ char* TypeName( Type eT )
 {
   switch ( eT )
   {
-  case t_char:      return "char";
-  case t_short:     return "short";
-  case t_int:       return "int";
-  case t_long:      return "long";
-  case t_double:    return "double";
+  case t_char:		return "char";
+  case t_short:		return "short";
+  case t_int:		return "int";
+  case t_long:		return "long";
+  case t_double:	return "double";
   }
   abort();
 }
@@ -279,9 +279,9 @@ int CheckSetAccess( Type eT, void* p )
 
 int GetAlignment( Type eT )
 {
-  char  a[ 16*8 ];
-  int   p = (int)(void*)&a;
-  int   i;
+  char	a[ 16*8 ];
+  int	p = (int)(void*)&a;
+  int	i;
   p = ( p + 0xF ) & ~0xF;
   for ( i = 1; i < 16; i++ )
     if ( CheckGetAccess( eT, (void*)(p+i) ) )
@@ -306,17 +306,17 @@ int CheckCharAccess( char* p )
 
 struct Description
 {
-  int   bBigEndian;
-  int   bStackGrowsDown;
-  int   nStackAlignment;
-  int   nAlignment[3];  /* 2,4,8 */
+  int	bBigEndian;
+  int	bStackGrowsDown;
+  int	nStackAlignment;
+  int	nAlignment[3];	/* 2,4,8 */
 };
 
 void Description_Ctor( struct Description* pThis )
 {
-  pThis->bBigEndian         = IsBigEndian();
-  pThis->bStackGrowsDown    = IsStackGrowingDown();
-  pThis->nStackAlignment    = GetStackAlignment();
+  pThis->bBigEndian			= IsBigEndian();
+  pThis->bStackGrowsDown	= IsStackGrowingDown();
+  pThis->nStackAlignment	= GetStackAlignment();
 
   if ( sizeof(short) != 2 )
     abort();
diff --git a/tools/workben/tldem.cxx b/tools/workben/tldem.cxx
index 9571d3ff9b94..f83c3aa8ee90 100644
--- a/tools/workben/tldem.cxx
+++ b/tools/workben/tldem.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,4 +79,4 @@ main( int argc, char **argv )
     return 0;
 }
 
-
+    
diff --git a/tools/workben/urltest.cxx b/tools/workben/urltest.cxx
index 0930dfcc5239..bab1728255b5 100644
--- a/tools/workben/urltest.cxx
+++ b/tools/workben/urltest.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
@@ -190,7 +190,7 @@ bool testSetFSys(SetFSysTest const * pTest, std::size_t nSize)
         {
             String aTestA = aUrl1.GetMainURL(INetURLObject::NO_DECODE);
             String aTestB = aUrl2.GetMainURL(INetURLObject::NO_DECODE);
-
+                
             printf(" BAD %s %s -> %s, %s (%s)\n",
                    ByteString(aPath, RTL_TEXTENCODING_ISO_8859_1).GetBuffer(),
                    toString(pTest[i].m_eStyle),
diff --git a/transex3/java/jpropex/build.xml b/transex3/java/jpropex/build.xml
deleted file mode 100755
index d74fb3975d0f..000000000000
--- a/transex3/java/jpropex/build.xml
+++ /dev/null
@@ -1,169 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
-  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
-
-  This file is part of OpenOffice.org.
-
-  OpenOffice.org is free software: you can redistribute it and/or modify
-  it under the terms of the GNU Lesser General Public License version 3
-  only, as published by the Free Software Foundation.
-
-  OpenOffice.org is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU Lesser General Public License version 3 for more details
-  (a copy is included in the LICENSE file that accompanied this code).
-
-  You should have received a copy of the GNU Lesser General Public License
-  version 3 along with OpenOffice.org.  If not, see
-  <http://www.openoffice.org/license.html>
-  for a copy of the LGPLv3 License.
-
--->
-<project name="jpropex" default="main" basedir=".">
-
-    <!-- ================================================================= -->
-    <!-- settings                                                          -->
-    <!-- ================================================================= -->
-
-    <!-- name of this sub target used in recursive builds -->
-    <property name="target" value="jpropex"/>
-
-    <!-- name of jar file created, without .jar extension -->
-    <property name="jarname" value="jpropex"/>
-
-    <!-- relative path to project directory -->
-    <property name="prj" value="."/>
-
-    <!-- build output directory -->
-    <property name="out" value="build"/>
-
-    <!-- build directories -->
-    <property name="build.dir" value="${out}"/>
-    <property name="build.class" value="${build.dir}/class/jpropex"/>
-    <property name="build.misc"  value="${build.dir}/misc/jpropex"/>
-
-    <!-- start of java source code package structure -->
-    <property name="java.dir" value="java"/>
-
-    <!-- define how to handle CLASSPATH environment -->
-    <property name="build.sysclasspath" value="ignore"/>
-
-    <!-- classpath settings for compile and javadoc tasks -->
-    <path id="classpath">
-        <pathelement location="."/>
-        <pathelement location="${build.class}"/>
-    </path>
-
-    <!-- name to display in documentation -->
-    <!--    <property name="docname" value="l10n converter"/> -->
-
-    <!-- set "modern" java compiler -->
-    <property name="build.compiler" value="modern"/>
-
-    <!-- set wether we want to compile with debug information -->
-    <property name="debug" value="on"/>
-
-    <!-- set wether we want to compile with optimisation -->
-    <property name="optimize" value="off"/>
-
-    <!-- set wether we want to compile with or without deprecation -->
-    <property name="deprecation" value="on"/>
-
-    <target name="info">
-        <echo message="--------------------"/>
-        <echo message="${target}"/>
-        <echo message="--------------------"/>
-    </target>
-
-    <!-- ================================================================= -->
-    <!-- custom targets                                                    -->
-    <!-- ================================================================= -->
-
-    <!-- the main target, called in recursive builds -->
-    <target name="main" depends="info,prepare,compile,jar"/>
-
-    <!-- prepare output directories -->
-    <target name="prepare">
-        <mkdir dir="${build.dir}"/>
-        <mkdir dir="${build.class}"/>
-        <mkdir dir="${build.misc}"/>
-    </target>
-
-
-    <target name="res" depends="prepare">
-        <copy todir="${build.class}">
-             <fileset dir="${java.dir}">
-                 <include name="**/*.properties"/>
-                 <include name="**/*.css"/>
-                 <include name="**/*.dtd"/>
-                 <include name="**/*.form"/>
-                 <include name="**/*.gif "/>
-                 <include name="**/*.htm"/>
-                 <include name="**/*.html"/>
-                 <include name="**/*.js"/>
-                 <include name="**/*.mod"/>
-                 <include name="**/*.sql"/>
-                 <include name="**/*.xml"/>
-                 <include name="**/*.xsl"/>
-                 <include name="**/*.map"/>
-
-             </fileset>
-        </copy>
-    </target>
-
-
-    <target name="compile" depends="prepare,res">
-    <javac destdir="${build.class}"
-           debug="${debug}"
-               deprecation="${deprication}"
-           optimize="${optimize}"
-           classpathref="classpath">
-            <src path="${java.dir}"/>
-        <include name="**/*.java"/>
-    </javac>
-    </target>
-
-    <!-- clean up -->
-    <target name="clean" depends="prepare">
-        <delete includeEmptyDirs="true">
-            <fileset dir="${build.class}">
-                <patternset>
-                    <include name="${package}/**/*.class"/>
-                </patternset>
-            </fileset>
-        </delete>
-    </target>
-
-    <!-- create jar file -->
-    <target name="jar" depends="prepare,compile" if="build.class">
-        <jar jarfile="${build.class}/${jarname}.jar"
-             basedir="${build.class}"
-             manifest="${jarname}.MF">
-                 <include name="**/*.class"/>
-                 <include name="**/*.properties"/>
-                 <include name="**/*.css"/>
-                 <include name="**/*.dtd"/>
-                 <include name="**/*.form"/>
-                 <include name="**/*.gif "/>
-                 <include name="**/*.htm"/>
-                 <include name="**/*.html"/>
-                 <include name="**/*.js"/>
-                 <include name="**/*.mod"/>
-                 <include name="**/*.sql"/>
-                 <include name="**/*.xml"/>
-                 <include name="**/*.xsl"/>
-                 <include name="**/*.map"/>
-        </jar>
-    </target>
-
-    <target name="test" depends="prepare">
-    </target>
-
-</project>
-
diff --git a/transex3/java/jpropex/java/JPropEx.java b/transex3/java/jpropex/java/JPropEx.java
deleted file mode 100644
index 20175febe5d5..000000000000
--- a/transex3/java/jpropex/java/JPropEx.java
+++ /dev/null
@@ -1,400 +0,0 @@
-/*************************************************************************
- *
- * 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
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-
-import java.util.*;
-import java.io.*;
-
-public class JPropEx
-{
-    private String inputFileArg;
-    private String outputFileArg;
-    private String pathPrefixArg;
-    private String pathPostfixArg;
-    private String projectArg;
-    private String rootArg;
-    private Vector forcedLangsArg;
-    private Vector langsArg;
-    private String inputSdfFileArg;
-    private boolean isQuiet             = false;
-    private final String resourceType   = "javaproperties";
-    private final String sourceLanguage = "en-US";
-    //private SdfData data;
-
-    public JPropEx()
-    {
-        //data = new SdfData();
-    }
-
-    public JPropEx( String args[] )
-    {
-        super();
-        parseArguments( args );
-        testArguments();
-        if( inputSdfFileArg != null && inputSdfFileArg.length() > 0 )
-            merge();
-        else
-            extract();
-    }
-
-    private String getSimpleArg( String[] args , int x )
-    {
-        if( x < args.length ) x++;
-        else
-        {
-            System.err.println("ERROR: Missing arg for "+args[ x ]+"\n");
-            help();
-        }
-        return args[ x ];
-    }
-    private Vector getComplexArg( String[] args , int x )
-    {
-        if( x < args.length ) x++;
-        else
-        {
-            System.err.println("ERROR: Missing arg for "+args[ x ]+"\n");
-            help();
-        }
-        String value = args[ x ];
-        Vector values = new Vector( Arrays.asList( value.split(",") ) );
-        return values;
-    }
-
-    private void help()
-    {
-        System.out.println("jpropex       extract / merge java properties files");
-        System.exit( -1 );
-    }
-
-    private void extract()
-    {
-        SdfData data = new SdfData();
-        java.util.Properties prop = loadProp( inputFileArg );
-
-        // Get a prototype that already contains the most common settings
-        SdfEntity dolly = prepareSdfObj();
-        String key;
-        SdfEntity currentStr;
-        String value;
-        for( Enumeration e = prop.propertyNames() ; e.hasMoreElements() ; )
-        {
-            key         = (String)      e.nextElement();
-            currentStr  = (SdfEntity)   dolly.clone();
-            // Set the new LID and the string text
-            currentStr.setLid( key );
-            value            = prop.getProperty( key , "" );
-            //if( value.equals("") )  System.err.println("Warning: in file "+inputFileArg+" the string with the key "+key+" has a empty string!");
-            currentStr.setText( (prop.getProperty( key )).replaceAll("\t" , " " ) );     // TODO: Quoting!!!!
-            data.add( currentStr );
-        }
-        data.write( outputFileArg );
-    }
-
-    private SdfEntity prepareSdfObj()
-    {
-        String path = makeAbs( inputFileArg );
-        path = path.replace( rootArg + "/" , "" );
-        path = path.replace("/","\\");
-        return new SdfEntity( projectArg , path , "" /* dummy1 */ , resourceType , "", "" , "" , "" , "" /* dummy2 */ ,
-                              sourceLanguage , "",  "" , ""  , "" , "2002-02-02 02:02:02" );
-    }
-
-    private void merge()
-    {
-        SdfData data = getSdfData();
-        if( inputFileArg.startsWith("@") )
-        {
-            // Read files
-            Vector fileList = readFileList( inputFileArg );
-            for( Enumeration e = fileList.elements(); e.hasMoreElements(); )
-                mergeFile( (String) e.nextElement() , data );
-        }
-        else
-        {
-            // Single file
-            mergeFile( inputFileArg , data );
-        }
-    }
-
-    private Vector readFileList( String filename )
-    {
-        Vector lines = new Vector();
-        try
-        {
-            BufferedReader in = new BufferedReader( new FileReader( filename.substring( 1 ) ) );
-            while( in.ready() )
-                lines.add( in.readLine() );
-        }
-        catch( IOException e )
-        {
-            System.out.println("ERROR: Can't open file '"+filename.substring( 1 )+"'");
-            System.exit( -1 );
-        }
-        return lines;
-    }
-
-    private void mergeFile( String filename , SdfData data )
-    {
-        java.util.Properties sourceProp = loadProp( filename );
-        Vector langs = getLanguages( data );
-        HashMap props = new HashMap();
-        // Create a properties object for every language
-        for( Enumeration e = langs.elements(); e.hasMoreElements();)
-        {
-
-            props.put( (String)e.nextElement() , new java.util.Properties() );
-        }
-        // Get a prototype that already contains the most common settings
-
-        SdfEntity dolly = prepareSdfObj();
-        String key;
-        String sourceString;
-        SdfEntity curStr;
-        SdfEntity curEntity;
-        SdfEntity mergedEntity;
-        String curLang;
-        for( Enumeration e = sourceProp.propertyNames() ; e.hasMoreElements() ; )     // For all property keys
-        {
-            key          = (String) e.nextElement();
-            sourceString = sourceProp.getProperty( key );
-            curStr       = (SdfEntity) dolly.clone();
-            curStr.setLid( key );
-            for( Enumeration lang = langs.elements(); lang.hasMoreElements(); ) // merge in every language
-            {
-                curEntity   = (SdfEntity) curStr.clone();
-                curLang     = (String)    lang.nextElement();
-                curEntity.setLangid( curLang );
-                mergedEntity = data.get( curEntity );
-                if( mergedEntity == null )
-                {
-                    // if case there is not translation the fallback to the en-US source string
-                    ( (java.util.Properties) props.get( curLang )).setProperty( curEntity.getLid() , sourceString  );
-                }
-                else
-                {
-                    // Set the merged text from the sdf file
-                    ( (java.util.Properties) props.get( curLang )).setProperty( mergedEntity.getLid() , mergedEntity.getText() );  // TODO: Quoting ???
-                }
-            }
-
-        }
-        // Now write them out
-        String lang;
-        for( Iterator i = props.keySet().iterator() ; i.hasNext() ; )
-        {
-            lang = (String) i.next();
-            writeSinglePropertiesFile( filename , (java.util.Properties) props.get( lang ) , lang );
-        }
-    }
-    private void writeSinglePropertiesFile( String filename , java.util.Properties prop , String lang )
-    {
-        // Prepare path to file
-        int filenameIdx = filename.lastIndexOf( "/" ) > 0 ? filename.lastIndexOf( "/" )+1 : 0 ;
-        String path = new String();
-        String name = new String();
-        if( pathPrefixArg != null && pathPrefixArg.length()>0 && pathPostfixArg != null && pathPostfixArg.length()>0 )
-        {
-            path = new StringBuffer().append( pathPrefixArg ).append( "/" ).append( lang ).append( "/" ).append( pathPostfixArg ).append( "/" ).toString();
-            name = new StringBuffer().append( filename.substring( filenameIdx , filename.lastIndexOf( ".properties" ) ) )
-                                        .append( "_" ).append( lang.replaceAll("-","_") ).append( ".properties" ).toString();
-        }
-        else if( outputFileArg != null && outputFileArg.length()>0 )
-        {
-            name = outputFileArg;
-            name += new StringBuffer().append( inputFileArg.substring( filenameIdx , filename.lastIndexOf( ".properties" ) ) )
-                                     .append( "_" ).append( lang.replaceAll("-","_") ).append( ".properties" ).toString();
-
-            //name = outputFileArg;
-        }
-        else
-        {
-            System.err.println("ERROR: No outputfile specified .. either -o or -x -y !");
-            System.exit( -1 );
-        }
-
-        File dir = new File( path );
-        try
-        {
-            if( !dir.exists() && path.length()>0 )
-            {
-                if( !dir.mkdirs() )
-                {
-                    System.out.println("ERROR: Can't create directory '"+path+"' !!!");
-                    System.exit( -1 );
-                }
-            }
-        }
-        catch( SecurityException e )
-        {
-            System.out.println("ERROR: Can't create directory '"+path+"'!!!Wrong Permissions?");
-            System.exit( -1 );
-        }
-        path += name;
-        // Write the properties file
-        System.out.println("DBG: Writing to "+path);
-        try{
-            BufferedOutputStream out = new BufferedOutputStream( new FileOutputStream( path ) );
-            if( prop == null )
-                System.out.println("DBG: prop == null!!!");
-            prop.store( out , "" );     // Legal headers?
-        }
-        catch( IOException e )
-        {
-            System.out.println("ERROR: Can't write file '"+path+"' !!!!");
-            System.exit( -1 );
-        }
-    }
-
-    private SdfData getSdfData()
-    {
-        SdfData data = new SdfData( inputSdfFileArg );
-        data.read();
-        return data;
-    }
-    private Vector getLanguages( SdfData data )
-    {
-        Vector langs = new Vector();
-
-        if( ((String)langsArg.get( 0 )).equalsIgnoreCase( "all" ) ) // for "-l all" use all languages found in the -m sdf file
-            langs.addAll( data.getLanguages() );
-        else
-            langs.addAll( langsArg );              // use the langs giving by -l
-
-        if( forcedLangsArg != null )
-            langs.addAll( forcedLangsArg );
-
-        return removeDupes( langs );
-    }
-    private Vector removeDupes( Vector vec )
-    {
-        Collection coll = new LinkedHashSet( vec );
-        return new Vector( coll );
-    }
-    private java.util.Properties loadProp( String filename )
-    {
-        java.util.Properties prop = new java.util.Properties();
-        try
-        {
-            prop.load( new BufferedInputStream( new NoLocalizeFilter( new FileInputStream( filename ) ) ) );
-        }
-        catch( IOException e )
-        {
-            System.err.println("ERROR: Can't read file '"+filename+"'!!!");
-        }
-        return prop;
-    }
-    private void parseArguments( String[] args )
-    {
-
-        if( args.length == 0 )
-        {
-            System.out.println("ERROR: No args???");
-            help();
-            System.exit( -1 );
-        }
-        for( int x = 0; x < args.length ; x++ )
-        {
-            if( args[ x ].equalsIgnoreCase("-i") )
-            {
-                // Input resource file
-                inputFileArg = getSimpleArg( args , x );
-            }
-            else if( args[ x ].equalsIgnoreCase("-o") )
-            {
-                // Output sdf file
-                outputFileArg = getSimpleArg( args , x );
-            }
-            else if( args[ x ].equalsIgnoreCase("-x") )
-            {
-                // path prefix
-                pathPrefixArg = getSimpleArg( args , x );
-            }
-            else if( args[ x ].equalsIgnoreCase("-y") )
-            {
-                // path postfix
-                pathPostfixArg = getSimpleArg( args , x );
-            }
-            else if( args[ x ].equalsIgnoreCase("-p") )
-            {
-                // project
-                projectArg = getSimpleArg( args , x );
-            }
-            else if( args[ x ].equalsIgnoreCase("-r") )
-            {
-                // root
-                rootArg = getSimpleArg( args , x );
-                rootArg = makeAbs( rootArg );
-            }
-            else if( args[ x ].equalsIgnoreCase("-lf") )
-            {
-                // forced langs
-                forcedLangsArg = getComplexArg( args , x );
-            }
-            else if( args[ x ].equalsIgnoreCase("-l") )
-            {
-                // langs
-                langsArg = getComplexArg( args , x );
-            }
-            else if( args[ x ].equalsIgnoreCase("-m") )
-            {
-                // input sdf file
-                inputSdfFileArg = getSimpleArg( args , x );
-            }
-            else if( args[ x ].equalsIgnoreCase("-qq") )
-            {
-                isQuiet = true;
-            }
-        }
-    }
-    private String makeAbs( String path )
-    {
-        File file;
-        try
-        {
-            file = new File( path );
-            return file.getCanonicalPath();
-        }catch( IOException e )
-        {
-            e.printStackTrace();
-            System.exit( -1 );
-        }
-        return null;
-    }
-    private boolean testArguments()
-    {
-        // nice merge
-        if( inputSdfFileArg != null && inputSdfFileArg.length()>0 )
-            // nice merge
-            return  projectArg != null  && rootArg != null && inputFileArg != null && pathPrefixArg != null && pathPostfixArg != null && langsArg != null &&
-                    projectArg.length()>0 && rootArg.length()>0 && inputFileArg.length()>0 && pathPrefixArg.length()>0 && pathPostfixArg.length()>0 && langsArg.size()>0 ;
-        else
-            // nice extract
-            return  projectArg != null && rootArg != null && inputFileArg != null && outputFileArg != null && langsArg != null &&
-                    projectArg.length()>0 && rootArg.length()>0 && inputFileArg.length()>0 && outputFileArg.length()>0 && langsArg.size()>0;
-    }
-
-}
diff --git a/transex3/java/jpropex/java/Main.java b/transex3/java/jpropex/java/Main.java
deleted file mode 100644
index 23dc477ddec3..000000000000
--- a/transex3/java/jpropex/java/Main.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*************************************************************************
- *
- * 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
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-
-class Main
-{
-
-    public static void main( String args[] )
-    {
-        JPropEx jpropex = new JPropEx( args );
-        //jpropex.init();
-    }
-}
-
diff --git a/transex3/java/jpropex/java/NoLocalizeFilter.java b/transex3/java/jpropex/java/NoLocalizeFilter.java
deleted file mode 100644
index c1e62fc951a8..000000000000
--- a/transex3/java/jpropex/java/NoLocalizeFilter.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/*************************************************************************
- *
- * 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
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-
-import java.io.*;
-import java.util.regex.*;
-
-// exit if the sequence x-no-localize is found in stream!
-public class NoLocalizeFilter extends FilterInputStream
-{
-    InputStream in;
-//    Pattern p = Pattern.compile("[\\s]*#[\\s]*x-no-translate");
-
-    public NoLocalizeFilter( InputStream in ) {
-        super(in);
-        this.in = in;
-    }
-    public int read(byte[] b, int off, int len) throws IOException
-    {
-        String search = new String( b );
-//        Matcher m = p.matcher( search );
-        if( search.contains("x-no-translate" ) )  // TODO: fixme!
-        {
-//            System.out.println("found x-no-translate");
-            in.close();
-            close();
-            System.exit( 0 );
-        }
-        return in.read( b , off , len );
-    }
-}
diff --git a/transex3/java/jpropex/java/OrderedHashMap.java b/transex3/java/jpropex/java/OrderedHashMap.java
deleted file mode 100644
index a462d598b307..000000000000
--- a/transex3/java/jpropex/java/OrderedHashMap.java
+++ /dev/null
@@ -1,96 +0,0 @@
-/*************************************************************************
- *
- * 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
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-
-import java.util.*;
-
-// LinkedHashMap implrementation
-public class OrderedHashMap
-{
-    private HashMap hm = new HashMap();
-    private LinkedList list  = new LinkedList();
-
-    public Iterator    iterator()   { return list.iterator(); }
-
-    public boolean isEmpty()        { return hm.isEmpty(); }
-    public Object get( Object key ) { return hm.get( key ); }
-    public Object get( int index )  { return hm.get( list.get( index ) ); }
-    public Iterator keys()       { return list.iterator(); }
-    public Object add( Object key , Object value )
-    {
-        list.add( key );
-        return hm.put( key, value );
-    }
-    public Object add( int index , Object key , Object value )
-    {
-        list.add( index , key );
-        return hm.put( key, value );
-    }
-    public Object remove( Object key )
-    {
-        list.remove( list.indexOf( key ) );
-        return hm.remove( key );
-    }
-    public void move( int idxFrom , int idxTo )
-    {
-        Object key = list.get( idxFrom );
-        list.remove( idxFrom );
-        list.add( idxTo , key );
-    }
-    public void move( Object key , int idxTo )
-    {
-       move( list.indexOf( key ) , idxTo );
-    }
-    public int size()
-    {
-        return hm.size();
-    }
-    public Enumeration elements()
-    {
-        return new OHMenum( this );
-    }
-}
-
-final class OHMenum implements Enumeration
-{
-    OrderedHashMap ohm;
-    int index = 0;
-
-    private OHMenum(){};
-    public OHMenum( OrderedHashMap ohm ){
-        this.ohm = ohm ;
-    }
-
-    public boolean hasMoreElements()
-    {
-        return index < ohm.size();
-    }
-    public Object nextElement()
-    {
-        return ohm.get( index++ );
-    }
-}
diff --git a/transex3/java/jpropex/java/SdfData.java b/transex3/java/jpropex/java/SdfData.java
deleted file mode 100644
index 60f218c0ae15..000000000000
--- a/transex3/java/jpropex/java/SdfData.java
+++ /dev/null
@@ -1,108 +0,0 @@
-/*************************************************************************
- *
- * 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
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-
-import java.util.*;
-import java.io.*;
-
-public class SdfData
-{
-    private String filename;
-    private OrderedHashMap ohm;
-    private LinkedHashSet languagesFound;
-
-    public SdfData()
-    {
-        languagesFound = new LinkedHashSet();
-        ohm = new OrderedHashMap();
-        languagesFound = new LinkedHashSet();
-    }
-    public SdfData( String filename ){
-        this();
-        this.filename = filename;
-    }
-
-    public LinkedHashSet getLanguages()
-    {
-        return languagesFound;
-    }
-    public SdfEntity get( SdfEntity obj )
-    {
-        return (SdfEntity) ohm.get( (String)obj.getId() );
-    }
-    public SdfEntity get( String key ){
-        return (SdfEntity) ohm.get( key );
-    }
-    public void add( SdfEntity obj )
-    {
-        ohm.add( obj.getId() , obj );
-    }
-
-    public void read()
-    {
-        BufferedReader in;
-        try
-        {
-            in = new BufferedReader( new FileReader( filename ) );
-            SdfEntity entity;
-            while( in.ready() )
-            {
-                String line = in.readLine();
-                if( line.length() > 0 )
-                {
-                    entity = new SdfEntity( line );
-                    ohm.add( entity.getId() , entity );        // test if is valid
-                    languagesFound.add( entity.getLangid() );
-                }
-            }
-            in.close();
-        }
-        catch( IOException e )
-        {
-            System.out.println("Error: reading file " + filename);
-            System.exit( -1 );
-        }
-    }
-    public void write( String filename )
-    {
-        FileWriter out;
-        try
-        {
-            out = new FileWriter( filename , true );  // Always append
-            for( Enumeration e = ohm.elements(); e.hasMoreElements(); )
-            {
-                out.write( ( (SdfEntity) e.nextElement() ).toString() + "\n" );
-            }
-            out.close();
-        }
-        catch( IOException e )
-        {
-            System.out.println("Error: Can't write to file " + filename);
-            System.exit( -1 );
-        }
-    }
-}
diff --git a/transex3/java/jpropex/java/SdfEntity.java b/transex3/java/jpropex/java/SdfEntity.java
deleted file mode 100644
index e2c1606ee7c2..000000000000
--- a/transex3/java/jpropex/java/SdfEntity.java
+++ /dev/null
@@ -1,254 +0,0 @@
-/*************************************************************************
- *
- * 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
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-
-public class SdfEntity implements Cloneable{
-    private String project      = new String("");
-    private String source_file  = new String("");
-    private String dummy1       = new String("");
-    private String resource_type= new String("");
-    private String gid          = new String("");
-    private String lid          = new String("");
-    private String helpid       = new String("");
-    private String platform     = new String("");
-    private String dummy2       = new String("");
-    private String langid       = new String("");
-    private String text         = new String("");
-    private String helptext     = new String("");
-    private String quickhelptext= new String("");
-    private String title        = new String("");
-    private String date         = new String("");
-
-    public static int PROJECT_POS       = 0;
-    public static int SOURCE_FILE_POS   = 1;
-    public static int DUMMY1_POS        = 2;
-    public static int RESOURCE_TYPE_POS = 3;
-    public static int GID_POS           = 4;
-    public static int LID_POS           = 5;
-    public static int HELPID_POS        = 6;
-    public static int PLATFORM_POS      = 7;
-    public static int DUMMY2_POS        = 8;
-    public static int LANGID_POS        = 9;
-    public static int TEXT_POS          = 10;
-    public static int HELPTEXT_POS      = 11;
-    public static int QUICKHELPTEXT_POS = 12;
-    public static int TITLE_POS         = 13;
-    public static int DATE_POS          = 14;
-
-    public Object clone()
-    {
-        try
-        {
-            return super.clone();
-        }
-        catch( CloneNotSupportedException e )
-        {
-            System.out.println("ERROR: Can not clone, soemthing is broken here ....");
-            System.exit( -1 );
-        }
-        return null; // dummy
-    }
-
-    public SdfEntity( String line ){
-        // isValid?
-        setProperties( line ) ;
-    }
-    public SdfEntity(String project, String source_file, String dummy1, String resource_type, String gid, String lid, String helpid, String platform, String dummy2, String langid, String text, String helptext, String quickhelptext, String title , String date) {
-        super();
-        this.project        = project;
-        this.source_file    = source_file;
-        this.dummy1         = dummy1;
-        this.resource_type  = resource_type;
-        this.gid            = gid;
-        this.lid            = lid;
-        this.helpid         = helpid;
-        this.platform       = platform;
-        this.dummy2         = dummy2;
-        this.langid         = langid;
-        this.text           = text;
-        this.helptext       = helptext;
-        this.quickhelptext  = quickhelptext;
-        this.title          = title;
-        this.date           = date;
-    }
-
-    public void setProperties( String line ){
-
-        String[] splitted       = line.split("\t");
-
-        setProject(         splitted[ SdfEntity.PROJECT_POS ]       );
-        setSource_file(     splitted[ SdfEntity.SOURCE_FILE_POS ]   );
-        setDummy1(          splitted[ SdfEntity.DUMMY1_POS ]        );
-        setResource_type(   splitted[ SdfEntity.RESOURCE_TYPE_POS ] );
-        setGid(             splitted[ SdfEntity.GID_POS ]           );
-        setLid(             splitted[ SdfEntity.LID_POS ]           );
-        setHelpid(          splitted[ SdfEntity.HELPID_POS ]        );
-        setPlatform(        splitted[ SdfEntity.PLATFORM_POS ]      );
-        setDummy2(          splitted[ SdfEntity.DUMMY2_POS ]        );
-        setLangid(          splitted[ SdfEntity.LANGID_POS ]        );
-        setText(            splitted[ SdfEntity.TEXT_POS ]          );
-        setHelptext(        splitted[ SdfEntity.HELPTEXT_POS ]      );
-        setQuickhelptext(   splitted[ SdfEntity.QUICKHELPTEXT_POS ] );
-        setTitle(           splitted[ SdfEntity.TITLE_POS ]         );
-        setDate(            splitted[ SdfEntity.DATE_POS ]          );
-    }
-
-    public String getFileId(){
-        return project+"\\"+source_file;
-    }
-    public String getResourcePath(){
-        return source_file.substring(0 , source_file.lastIndexOf( "\\" )-1 );
-    }
-    public String toString(){
-        return project+"\t"+source_file+"\t"+dummy1+"\t"+resource_type+"\t"+gid+"\t"
-              +lid+"\t"+helpid+"\t"+platform+"\t"+dummy2+"\t"+langid+"\t"
-              +text+"\t"+helptext+"\t"+quickhelptext+"\t"+title+"\t"+date;
-    }
-    public String getId(){
-        return project+gid+lid+source_file+resource_type+platform+helpid;
-    }
-
-    public String getDummy1() {
-        return dummy1;
-    }
-
-    public void setDummy1(String dummy1) {
-        this.dummy1 = dummy1;
-    }
-
-    public String getPlatform() {
-        return platform;
-    }
-
-    public void setPlatform(String platform) {
-        this.platform = platform;
-    }
-
-    public String getDummy2() {
-        return dummy2;
-    }
-
-    public void setDummy2(String dummy2) {
-        this.dummy2 = dummy2;
-    }
-
-    public String getGid() {
-        return gid;
-    }
-
-    public void setGid(String gid) {
-        this.gid = gid;
-    }
-
-    public String getHelpid() {
-        return helpid;
-    }
-
-    public void setHelpid(String helpid) {
-        this.helpid = helpid;
-    }
-
-    public String getHelptext() {
-        return helptext;
-    }
-
-    public void setHelptext(String helptext) {
-        this.helptext = helptext;
-    }
-
-    public String getLangid() {
-        return langid;
-    }
-
-    public void setLangid(String langid) {
-        this.langid = langid;
-    }
-
-    public String getLid() {
-        return lid;
-    }
-
-    public void setLid(String lid) {
-        this.lid = lid;
-    }
-
-    public String getProject() {
-        return project;
-    }
-
-    public void setProject(String project) {
-        this.project = project;
-    }
-
-    public String getQuickhelptext() {
-        return quickhelptext;
-    }
-
-    public void setQuickhelptext(String quickhelptext) {
-        this.quickhelptext = quickhelptext;
-    }
-
-    public String getResource_type() {
-        return resource_type;
-    }
-
-    public void setResource_type(String resource_type) {
-        this.resource_type = resource_type;
-    }
-
-    public String getSource_file() {
-        return source_file;
-    }
-
-    public void setSource_file(String source_file) {
-        this.source_file = source_file;
-    }
-
-    public String getText() {
-        return text;
-    }
-
-    public void setText(String text) {
-        this.text = text;
-    }
-
-    public String getTitle() {
-        return title;
-    }
-
-    public void setTitle(String title) {
-        this.title = title;
-    }
-    public String getDate() {
-        return date;
-    }
-    public void setDate(String date) {
-        this.date = date;
-    }
-
-
-}
diff --git a/transex3/java/jpropex/jpropex b/transex3/java/jpropex/jpropex
deleted file mode 100755
index 2d62d13b093e..000000000000
--- a/transex3/java/jpropex/jpropex
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/sh
-if [ x${SOLARENV}x = xx ]; then
-    echo No environment found, please use 'configure' or 'setsolar'
-    exit 1
-fi
-if [ x${JAVA_HOME}x = xx ]; then
-    echo No Java found!
-    exit 1
-fi
-exec java -DSOLARSRC=${SOLARSRC} -DWORK_STAMP=${WORK_STAMP} -DUSE_SHELL=  -jar ${SOLARVER}/${INPATH}/bin${UPDMINOREXT}/jpropex.jar "$@"
diff --git a/transex3/java/jpropex/jpropex.MF b/transex3/java/jpropex/jpropex.MF
deleted file mode 100755
index 3e22e7e9bfbf..000000000000
--- a/transex3/java/jpropex/jpropex.MF
+++ /dev/null
@@ -1 +0,0 @@
-Main-Class: Main
diff --git a/ucbhelper/inc/pch/precompiled_ucbhelper.cxx b/ucbhelper/inc/pch/precompiled_ucbhelper.cxx
index 2c78a928b111..9be6544573ec 100644
--- a/ucbhelper/inc/pch/precompiled_ucbhelper.cxx
+++ b/ucbhelper/inc/pch/precompiled_ucbhelper.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
diff --git a/ucbhelper/inc/pch/precompiled_ucbhelper.hxx b/ucbhelper/inc/pch/precompiled_ucbhelper.hxx
index 6ce32849d6ff..b941069f2ce3 100644
--- a/ucbhelper/inc/pch/precompiled_ucbhelper.hxx
+++ b/ucbhelper/inc/pch/precompiled_ucbhelper.hxx
@@ -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
diff --git a/ucbhelper/inc/ucbhelper/activedatasink.hxx b/ucbhelper/inc/ucbhelper/activedatasink.hxx
index f7cb0582fa56..88fd34adefb8 100644
--- a/ucbhelper/inc/ucbhelper/activedatasink.hxx
+++ b/ucbhelper/inc/ucbhelper/activedatasink.hxx
@@ -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
diff --git a/ucbhelper/inc/ucbhelper/activedatastreamer.hxx b/ucbhelper/inc/ucbhelper/activedatastreamer.hxx
index 996f52c3884e..d2bc94aed954 100644
--- a/ucbhelper/inc/ucbhelper/activedatastreamer.hxx
+++ b/ucbhelper/inc/ucbhelper/activedatastreamer.hxx
@@ -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
diff --git a/ucbhelper/inc/ucbhelper/cancelcommandexecution.hxx b/ucbhelper/inc/ucbhelper/cancelcommandexecution.hxx
index a23c6fc6b0fe..66a79084e771 100644
--- a/ucbhelper/inc/ucbhelper/cancelcommandexecution.hxx
+++ b/ucbhelper/inc/ucbhelper/cancelcommandexecution.hxx
@@ -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
diff --git a/ucbhelper/inc/ucbhelper/commandenvironment.hxx b/ucbhelper/inc/ucbhelper/commandenvironment.hxx
index ddcdd5712901..3ef385fe13cf 100644
--- a/ucbhelper/inc/ucbhelper/commandenvironment.hxx
+++ b/ucbhelper/inc/ucbhelper/commandenvironment.hxx
@@ -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
@@ -55,8 +55,8 @@ class UCBHELPER_DLLPUBLIC CommandEnvironment : public cppu::OWeakObject,
     CommandEnvironment_Impl* m_pImpl;
 
 private:
-    UCBHELPER_DLLPRIVATE CommandEnvironment( const CommandEnvironment& );               // n.i.
-    UCBHELPER_DLLPRIVATE CommandEnvironment& operator=( const CommandEnvironment& );    // n.i.
+    UCBHELPER_DLLPRIVATE CommandEnvironment( const CommandEnvironment& ); 				// n.i.
+    UCBHELPER_DLLPRIVATE CommandEnvironment& operator=( const CommandEnvironment& ); 	// n.i.
 
 public:
     /**
diff --git a/ucbhelper/inc/ucbhelper/commandenvironmentproxy.hxx b/ucbhelper/inc/ucbhelper/commandenvironmentproxy.hxx
index 00724ceb4b46..9632b7a9657f 100644
--- a/ucbhelper/inc/ucbhelper/commandenvironmentproxy.hxx
+++ b/ucbhelper/inc/ucbhelper/commandenvironmentproxy.hxx
@@ -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
@@ -59,7 +59,7 @@ class CommandEnvironmentProxy : public cppu::OWeakObject,
     CommandEnvironmentProxy_Impl* m_pImpl;
 
 private:
-    CommandEnvironmentProxy( const CommandEnvironmentProxy& );            // n.i.
+    CommandEnvironmentProxy( const CommandEnvironmentProxy& ); 			  // n.i.
     CommandEnvironmentProxy& operator=( const CommandEnvironmentProxy& ); // n.i.
 
 public:
@@ -70,7 +70,7 @@ public:
       */
     CommandEnvironmentProxy(
             const com::sun::star::uno::Reference<
-                com::sun::star::ucb::XCommandEnvironment >& rxEnv );
+                com::sun::star::ucb::XCommandEnvironment >&	rxEnv );
     /**
       * Destructor.
       */
diff --git a/ucbhelper/inc/ucbhelper/configurationkeys.hxx b/ucbhelper/inc/ucbhelper/configurationkeys.hxx
index ca928b8b52bf..2960a651b3d2 100644
--- a/ucbhelper/inc/ucbhelper/configurationkeys.hxx
+++ b/ucbhelper/inc/ucbhelper/configurationkeys.hxx
@@ -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
diff --git a/ucbhelper/inc/ucbhelper/content.hxx b/ucbhelper/inc/ucbhelper/content.hxx
index 0a20592fe82a..5ee43d216cf7 100644
--- a/ucbhelper/inc/ucbhelper/content.hxx
+++ b/ucbhelper/inc/ucbhelper/content.hxx
@@ -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
diff --git a/ucbhelper/inc/ucbhelper/contentbroker.hxx b/ucbhelper/inc/ucbhelper/contentbroker.hxx
index 54139d3ffdea..a8ececfb0707 100644
--- a/ucbhelper/inc/ucbhelper/contentbroker.hxx
+++ b/ucbhelper/inc/ucbhelper/contentbroker.hxx
@@ -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
@@ -59,26 +59,26 @@ class ContentBroker_Impl;
   */
 class UCBHELPER_DLLPUBLIC ContentBroker
 {
-    ContentBroker_Impl*     m_pImpl;
+    ContentBroker_Impl* 	m_pImpl;
     // The "one and only" Broker.
-    static ContentBroker*   m_pTheBroker;
+    static ContentBroker* 	m_pTheBroker;
 
 private:
-    UCBHELPER_DLLPRIVATE ContentBroker( const ContentBroker& );                 // n.i.
-    UCBHELPER_DLLPRIVATE ContentBroker& operator=( const ContentBroker& );  // n.i.
+    UCBHELPER_DLLPRIVATE ContentBroker( const ContentBroker& ); 				// n.i.
+    UCBHELPER_DLLPRIVATE ContentBroker& operator=( const ContentBroker& ); 	// n.i.
 
     /** Constructor.
       *
       * @param rxSMgr is a Service Manager.
-      * @param rArguments are the arguments to pass to the
-      *        com.sun.star.ucb.UniversalContentBroker service when creating it.
-      *        Currently, this must be a sequence containing exactly two
+      *	@param rArguments are the arguments to pass to the
+      *	       com.sun.star.ucb.UniversalContentBroker service when creating it.
+      *	       Currently, this must be a sequence containing exactly two
       *        strings, a primary and a secondary configuration key.
       *        Refer to http://ucb.openoffice.org/docs/ucb-configuration.html
       *        for more information on UCB configuration.
       */
     UCBHELPER_DLLPRIVATE ContentBroker( const ::com::sun::star::uno::Reference<
-                     ::com::sun::star::lang::XMultiServiceFactory >&    rSMgr,
+                     ::com::sun::star::lang::XMultiServiceFactory >&	rSMgr,
                    const ::com::sun::star::uno::Sequence<
                     ::com::sun::star::uno::Any >& rArguments );
 
@@ -89,7 +89,7 @@ private:
       *        the new UCB.
       */
     UCBHELPER_DLLPRIVATE ContentBroker( const ::com::sun::star::uno::Reference<
-                     ::com::sun::star::lang::XMultiServiceFactory >&    rSMgr,
+                     ::com::sun::star::lang::XMultiServiceFactory >&	rSMgr,
                    const ContentProviderDataList & rData );
 
 protected:
@@ -100,20 +100,20 @@ protected:
 
 public:
     /** Initialize "the one and only" Broker.  This method must be called
-      * exactly once, before the Broker is used in any way.
+      *	exactly once, before the Broker is used in any way.
       *
-      * @param rSMgr is a factory to create services needed in the Broker's
-      *        implementation.
+      *	@param rSMgr is a factory to create services needed in the Broker's
+      *	       implementation.
       *
-      * @param rArguments are the arguments to pass to the
-      *        com.sun.star.ucb.UniversalContentBroker service when creating
+      *	@param rArguments are the arguments to pass to the
+      *	       com.sun.star.ucb.UniversalContentBroker service when creating
       *        it. Currently, this must be a sequence containing exactly two
       *        strings, a primary and a secondary configuration key.
       *        Refer to http://ucb.openoffice.org/docs/ucb-configuration.html
       *        for more information on UCB configuration.
       *
-      * @return True if creation and possible configuration of the Broker
-      *         was successful.
+      *	@return True if creation and possible configuration of the Broker
+      *	        was successful.
       */
     static sal_Bool
     initialize( const::com::sun::star::uno::Reference<
@@ -122,16 +122,16 @@ public:
                     ::com::sun::star::uno::Any >& rArguments );
 
     /** Initialize "the one and only" Broker.  This method must be called
-      * exactly once, before the Broker is used in any way.
+      *	exactly once, before the Broker is used in any way.
       *
-      * @param rSMgr is a factory to create services needed in the Broker's
-      *        implementation.
+      *	@param rSMgr is a factory to create services needed in the Broker's
+      *	       implementation.
       *
       * @param rData are the data for the for the content providers for
       *        the UCB to initialize.
       *
-      * @return True if creation and possible configuration of the Broker
-      *         was successful.
+      *	@return True if creation and possible configuration of the Broker
+      *	        was successful.
       */
     static sal_Bool
     initialize( const::com::sun::star::uno::Reference<
@@ -139,7 +139,7 @@ public:
                 const ContentProviderDataList & rData );
 
     /** Deinitialize "the one and only" Broker.  Once this method has been
-      * called, the Broker must not be used any longer.
+      *	called, the Broker must not be used any longer.
       */
     static void
     deinitialize();
diff --git a/ucbhelper/inc/ucbhelper/contenthelper.hxx b/ucbhelper/inc/ucbhelper/contenthelper.hxx
index 7950f9b84053..b2fad035bd05 100644
--- a/ucbhelper/inc/ucbhelper/contenthelper.hxx
+++ b/ucbhelper/inc/ucbhelper/contenthelper.hxx
@@ -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
@@ -76,16 +76,16 @@ class ContentProviderImplHelper;
   *
   * Features of the base class implementation:
   * - standard interfaces ( XInterface, XTypeProvider, XServiceInfo )
-  * - all required interfaces for service com::sun::star::ucb::Content
+  *	- all required interfaces for service com::sun::star::ucb::Content
   * - all required listener containers
   *   ( XComponent, XPropertiesChangeNotifier, XPropertySetInfoChangeNotifier,
   *     XCommandInfoChangeNotifier )
-  * - XPropertyContainer implementation ( persistence is implemented using
+  *	- XPropertyContainer implementation ( persistence is implemented using
   *   service com.sun.star.ucb.Store )
   * - complete XPropertySetInfo implementation ( including Additioanl Core
   *   Properties supplied via XPropertyContainer interface )
   *   -> protected method: getPropertySetInfo
-  * - complete XCommandInfo implementation
+  *	- complete XCommandInfo implementation
   *    -> protected method: getCommandInfo
   */
 class UCBHELPER_DLLPUBLIC ContentImplHelper :
@@ -107,14 +107,14 @@ class UCBHELPER_DLLPUBLIC ContentImplHelper :
     ucbhelper_impl::ContentImplHelper_Impl* m_pImpl;
 
 protected:
-    osl::Mutex                       m_aMutex;
+    osl::Mutex						 m_aMutex;
     com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory >
                                      m_xSMgr;
     com::sun::star::uno::Reference< com::sun::star::ucb::XContentIdentifier >
                                      m_xIdentifier;
     rtl::Reference< ContentProviderImplHelper >
                                      m_xProvider;
-    sal_uInt32                       m_nCommandId;
+    sal_uInt32						 m_nCommandId;
 
 private:
     /**
@@ -129,7 +129,7 @@ private:
       * @param xEnv is an environment to use for example, for interactions.
       * @return a sequence containing the property meta data.
       */
-    UCBHELPER_DLLPRIVATE
+    UCBHELPER_DLLPRIVATE 
     virtual com::sun::star::uno::Sequence< com::sun::star::beans::Property >
     getProperties( const com::sun::star::uno::Reference<
                     com::sun::star::ucb::XCommandEnvironment > & xEnv ) = 0;
@@ -141,7 +141,7 @@ private:
       * @param xEnv is an environment to use for example, for interactions.
       * @return a sequence containing the command meta data.
       */
-    UCBHELPER_DLLPRIVATE
+    UCBHELPER_DLLPRIVATE 
     virtual com::sun::star::uno::Sequence< com::sun::star::ucb::CommandInfo >
     getCommands( const com::sun::star::uno::Reference<
                     com::sun::star::ucb::XCommandEnvironment > & xEnv ) = 0;
@@ -160,7 +160,7 @@ private:
 
 protected:
     /**
-      * This method returns complete meta data for the properties ( including
+      *	This method returns complete meta data for the properties ( including
       * Additional Core Properties supplied via XPropertyContainer interface )
       * supported by the content. To implement the required command
       * "getPropertySetInfo" simply return the return value of this method.
@@ -177,7 +177,7 @@ protected:
                         sal_Bool bCache = sal_True );
 
     /**
-      * This method returns complete meta data for the commands supported by
+      *	This method returns complete meta data for the commands supported by
       * the content. To implement the required command "getCommandInfo" simply
       * return the return value of this method.
       *
@@ -237,15 +237,15 @@ protected:
             const com::sun::star::ucb::ContentEvent& evt ) const;
 
     /**
-      * Use this method to announce the insertion of this content at
-      * the end of your implementation of the command "insert". The
+      *	Use this method to announce the insertion of this content at
+      *	the end of your implementation of the command "insert". The
       * implementation of is method propagates a ContentEvent( INSERTED ).
       */
     void inserted();
 
     /**
-      * Use this method to announce the destruction of this content at
-      * the end of your implementation of the command "delete". The
+      *	Use this method to announce the destruction of this content at
+      *	the end of your implementation of the command "delete". The
       * implementation of is method propagates a ContentEvent( DELETED )
       * and a ContentEvent( REMOVED ) at the parent of the deleted content,
       * if a parent exists.
@@ -253,7 +253,7 @@ protected:
     void deleted();
 
     /**
-      * Use this method to change the identity of a content. The implementation
+      *	Use this method to change the identity of a content. The implementation
       * of this method will replace the content identifier of the content and
       * propagate the appropriate ContentEvent( EXCHANGED ).
       *
@@ -264,8 +264,8 @@ protected:
                         com::sun::star::ucb::XContentIdentifier >& rNewId );
 
     /**
-      * Use this method to get access to the Additional Core Properties of
-      * the content ( added using content's XPropertyContainer interface ).
+      *	Use this method to get access to the Additional Core Properties of
+      *	the content ( added using content's XPropertyContainer interface ).
       * If you supply your own XPropertyContainer implementation, this method
       * will always return an empty propertyset.
       *
@@ -274,12 +274,12 @@ protected:
       * @return the implementation of the service
       *         com.sun.star.ucb.PersistentPropertySet.
       */
-    com::sun::star::uno::Reference<
+    com::sun::star::uno::Reference<	
         com::sun::star::ucb::XPersistentPropertySet >
     getAdditionalPropertySet( sal_Bool bCreate );
 
     /**
-      * This method renames the propertyset containing the Additional Core
+      *	This method renames the propertyset containing the Additional Core
       * Properties of the content.
       *
       * @param  rOldKey is the old key of the propertyset.
@@ -293,7 +293,7 @@ protected:
                                           sal_Bool bRecursive );
 
     /**
-      * This method copies the propertyset containing the Additional Core
+      *	This method copies the propertyset containing the Additional Core
       * Properties of the content.
       *
       * @param  rSourceKey is the key of the source propertyset.
@@ -307,7 +307,7 @@ protected:
                                         sal_Bool bRecursive );
 
     /**
-      * This method removes the propertyset containing the Additional Core
+      *	This method removes the propertyset containing the Additional Core
       * Properties of the content.
       *
       * @param  bRecursive is a flag indicating whether propertysets for
diff --git a/ucbhelper/inc/ucbhelper/contentidentifier.hxx b/ucbhelper/inc/ucbhelper/contentidentifier.hxx
index 2bd1cca50e36..84b4cc4abc6e 100644
--- a/ucbhelper/inc/ucbhelper/contentidentifier.hxx
+++ b/ucbhelper/inc/ucbhelper/contentidentifier.hxx
@@ -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
diff --git a/ucbhelper/inc/ucbhelper/contentinfo.hxx b/ucbhelper/inc/ucbhelper/contentinfo.hxx
index 1584645771c7..f6756bf93cb7 100644
--- a/ucbhelper/inc/ucbhelper/contentinfo.hxx
+++ b/ucbhelper/inc/ucbhelper/contentinfo.hxx
@@ -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
@@ -59,14 +59,14 @@ class PropertySetInfo :
                 public com::sun::star::lang::XTypeProvider,
                 public com::sun::star::beans::XPropertySetInfo
 {
-    com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory >
+    com::sun::star::uno::Reference<	com::sun::star::lang::XMultiServiceFactory >
                                 m_xSMgr;
-    com::sun::star::uno::Reference< com::sun::star::ucb::XCommandEnvironment >
+    com::sun::star::uno::Reference<	com::sun::star::ucb::XCommandEnvironment >
                                 m_xEnv;
     com::sun::star::uno::Sequence< com::sun::star::beans::Property >*
                                 m_pProps;
-    osl::Mutex                  m_aMutex;
-    ContentImplHelper*          m_pContent;
+    osl::Mutex					m_aMutex;
+    ContentImplHelper*			m_pContent;
 
 private:
     sal_Bool queryProperty( const rtl::OUString& rName,
@@ -119,14 +119,14 @@ class CommandProcessorInfo :
                 public com::sun::star::lang::XTypeProvider,
                 public com::sun::star::ucb::XCommandInfo
 {
-    com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory >
+    com::sun::star::uno::Reference<	com::sun::star::lang::XMultiServiceFactory >
                                 m_xSMgr;
-    com::sun::star::uno::Reference< com::sun::star::ucb::XCommandEnvironment >
+    com::sun::star::uno::Reference<	com::sun::star::ucb::XCommandEnvironment >
                                 m_xEnv;
     com::sun::star::uno::Sequence< com::sun::star::ucb::CommandInfo >*
                                 m_pCommands;
-    osl::Mutex                  m_aMutex;
-    ContentImplHelper*          m_pContent;
+    osl::Mutex					m_aMutex;
+    ContentImplHelper*			m_pContent;
 
 private:
     sal_Bool queryCommand( const rtl::OUString& rName,
diff --git a/ucbhelper/inc/ucbhelper/fileidentifierconverter.hxx b/ucbhelper/inc/ucbhelper/fileidentifierconverter.hxx
index 15db85760619..7389e0f17578 100644
--- a/ucbhelper/inc/ucbhelper/fileidentifierconverter.hxx
+++ b/ucbhelper/inc/ucbhelper/fileidentifierconverter.hxx
@@ -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
diff --git a/ucbhelper/inc/ucbhelper/handleinteractionrequest.hxx b/ucbhelper/inc/ucbhelper/handleinteractionrequest.hxx
index 9ce8122efc3f..23915624ddfc 100644
--- a/ucbhelper/inc/ucbhelper/handleinteractionrequest.hxx
+++ b/ucbhelper/inc/ucbhelper/handleinteractionrequest.hxx
@@ -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
diff --git a/ucbhelper/inc/ucbhelper/interactionrequest.hxx b/ucbhelper/inc/ucbhelper/interactionrequest.hxx
index 197abb36ea34..6d033acf9a61 100644
--- a/ucbhelper/inc/ucbhelper/interactionrequest.hxx
+++ b/ucbhelper/inc/ucbhelper/interactionrequest.hxx
@@ -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
@@ -505,7 +505,7 @@ public:
         throw( com::sun::star::uno::RuntimeException );
 
     // XInteractionSupplyAuthentication2
-    virtual ::sal_Bool SAL_CALL canUseSystemCredentials( ::sal_Bool& Default )
+    virtual ::sal_Bool SAL_CALL canUseSystemCredentials( ::sal_Bool& Default ) 
         throw ( ::com::sun::star::uno::RuntimeException );
     virtual void SAL_CALL setUseSystemCredentials( ::sal_Bool UseSystemCredentials )
         throw ( ::com::sun::star::uno::RuntimeException );
@@ -626,7 +626,7 @@ inline InteractionSupplyAuthentication::InteractionSupplyAuthentication(
   m_bCanSetPassword( bCanSetPassword ),
   m_bCanSetAccount( bCanSetAccount ),
   m_bCanUseSystemCredentials( bCanUseSystemCredentials ),
-  m_bDefaultUseSystemCredentials( bDefaultUseSystemCredentials ),
+  m_bDefaultUseSystemCredentials( bDefaultUseSystemCredentials ), 
   m_bUseSystemCredentials( bDefaultUseSystemCredentials & bCanUseSystemCredentials )
 {
 }
diff --git a/ucbhelper/inc/ucbhelper/interceptedinteraction.hxx b/ucbhelper/inc/ucbhelper/interceptedinteraction.hxx
index 23ed0fb4d60b..47a4f383ed40 100644
--- a/ucbhelper/inc/ucbhelper/interceptedinteraction.hxx
+++ b/ucbhelper/inc/ucbhelper/interceptedinteraction.hxx
@@ -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
@@ -53,7 +53,7 @@ namespace ucbhelper{
 
 /** @short  it wraps any other interaction handler and intercept
             its handle() requests.
-
+              
     @descr  This class can be used as:
             - instance if special interactions must be supressed
               only
@@ -64,28 +64,28 @@ class UCBHELPER_DLLPUBLIC InterceptedInteraction : public ::cppu::WeakImplHelper
     //-------------------------------------------
     // types
     public:
-
+    
         struct InterceptedRequest
         {
             //-----------------------------------
             /** @short  marks an Handle as invalid.
              */
             static const sal_Int32 INVALID_HANDLE = -1;
-
+            
             //-----------------------------------
             /** @short  contains the interaction request, which should be intercepted. */
             ::com::sun::star::uno::Any Request;
-
+            
             //-----------------------------------
             /** @short  specify the fix continuation, which must be selected, if the
                         interaction could be intercepted successfully.
               */
             ::com::sun::star::uno::Type Continuation;
-
+            
             //-----------------------------------
             /** @short  specify, if both interactions must have the same type
                         or can be derived from.
-
+                        
                 @descr  Interaction base on exceptions - and exceptions are real types.
                         So they can be checked in its type. These parameter "MatchExact"
                         influence the type-check in the following way:
@@ -93,24 +93,24 @@ class UCBHELPER_DLLPUBLIC InterceptedInteraction : public ::cppu::WeakImplHelper
                                      if it supports exactly the same type ...
                                      or
                             FALSE => derived exceptions will be intercepted too.
-
+                            
                 @attention  This parameter does not influence the check of the continuation
                             type! The continuation must be matched exactly everytimes ...
              */
             sal_Bool MatchExact;
-
+            
             //-----------------------------------
             /** @short  its an unique identifier, which must be managed by the outside code.
-
+            
                 @descr  If there is a derived class, which overwrites the InterceptedInteraction::intercepted()
                         method, it will be called with a reference to an InterceptedRequest struct.
                         Then it can use the handle to react without checking the request type again.
              */
             sal_Int32 Handle;
-
+            
             //-----------------------------------
             /** @short  default ctor.
-
+            
                 @descr  Such constructed object cant be used realy.
                         Might it will crash if its used!
                         Dont forget to initialize all(!) members ...
@@ -120,17 +120,17 @@ class UCBHELPER_DLLPUBLIC InterceptedInteraction : public ::cppu::WeakImplHelper
                 MatchExact = sal_False;
                 Handle     = INVALID_HANDLE;
             }
-
+            
             //-----------------------------------
             /** @short  initialize this instance.
-
+            
                 @param  nHandle
                         used to identify every intercepted request
-
+            
                 @param  aRequest
                         must contain an exception object, which can be checked
                         in its uno-type against the later handled interaction.
-
+                        
                 @param  aContinuation
                         must contain a continuation object, which is used
                         in its uno-type to locate the same continuation
@@ -151,12 +151,12 @@ class UCBHELPER_DLLPUBLIC InterceptedInteraction : public ::cppu::WeakImplHelper
                 MatchExact   = bMatchExact;
             }
         };
-
+    
         //---------------------------------------
         /** @short  represent the different states, which can occure
                     as result of an interception.
-
-            @see    impl_interceptRequest()
+                    
+            @see    impl_interceptRequest()                    
          */
         enum EInterceptionState
         {
@@ -169,26 +169,26 @@ class UCBHELPER_DLLPUBLIC InterceptedInteraction : public ::cppu::WeakImplHelper
             /** the request could be intercepted and the specified continuation could be selected successfully. */
             E_INTERCEPTED
         };
-
+        
     //-------------------------------------------
     // member
     protected:
-
+    
         //---------------------------------------
         /** @short  reference to the intercepted interaction handler.
-
+        
             @descr  NULL is allowed for this member!
                     All interaction will be aborted then ...
                     expecting th handle() was overwritten by
                     a derived class.
          */
         ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionHandler > m_xInterceptedHandler;
-
+        
         //---------------------------------------
         /** @short  these list contains the requests, which should be intercepted.
          */
-        ::std::vector< InterceptedRequest > m_lInterceptions;
-
+        ::std::vector< InterceptedRequest > m_lInterceptions;        
+    
     //-------------------------------------------
     // native interface
     public:
@@ -197,14 +197,14 @@ class UCBHELPER_DLLPUBLIC InterceptedInteraction : public ::cppu::WeakImplHelper
         /** @short  initialize a new instance with default values.
          */
         InterceptedInteraction();
-
+        
         //---------------------------------------
         /** @short  initialize a new instance with real values.
-
+        
             @param  xInterceptedHandler
                     the outside interaction handler, which should
                     be intercepted here.
-
+                    
             @param  lInterceptions
                     the list of intercepted requests.
          */
@@ -218,82 +218,82 @@ class UCBHELPER_DLLPUBLIC InterceptedInteraction : public ::cppu::WeakImplHelper
             @attention  If such interaction handler isnt set here,
                         all incoming requests will be aborted ...
                         if the right continuation is available!
-
+                    
             @param  xInterceptedHandler
                     the outside interaction handler, which should
                     be intercepted here.
-         */
+         */                    
         void setInterceptedHandler(const ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionHandler >& xInterceptedHandler);
-
+        
         //---------------------------------------
         /** @short  set a new list of intercepted interactions.
 
             @attention  If the interface method handle() will be overwritten by
                         a derived class, the functionality behind these static list
                         cant be used.
-
+                    
             @param  lInterceptions
                     the list of intercepted requests.
-         */
+         */                    
         void setInterceptions(const ::std::vector< InterceptedRequest >& lInterceptions);
-
+                    
         //---------------------------------------
         /** @short  extract a requested continuation from te list of available ones.
-
+        
             @param  lContinuations
                     the list of available continuations.
-
+                    
             @param  aType
                     is used to locate the right continuation,
                     by checking its interface type.
-
+                    
             @return A valid reference to the continuation, if it could be located ...
                     or an empty reference otherwhise.
          */
         static ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionContinuation > extractContinuation(
                     const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionContinuation > >& lContinuations,
                     const ::com::sun::star::uno::Type&                                                                                             aType         );
-
+                    
     //-------------------------------------------
     // useable for derived classes
     protected:
-
+    
         //---------------------------------------
         /** @short  can be overwritten by a derived class to handle interceptions
                     outside.
-
+                    
             @descr  This base implementation checks, if the request could be intercepted
                     successfully. Then this method intercepted() is called.
                     The default implementation returns "NOT_INTERCEPTED" everytimes.
                     So the method impl_interceptRequest() uses the right continuation automaticly.
-
+                    
                     If this method was overwritten and something different "NO_INTERCEPTED"
                     is returned, the method impl_interceptRequest() will return immediatly with
                     the result, which is returned by this intercepted() method.
                     Then the continuations must be selected inside the intercepted() call!
-
+                    
             @param  rRequest
                     it points to the intercepted request (means the item of the
                     set interception list). e.g. its "Handle" member can be used
                     to identify it and react very easy, without the need to check the
                     type of the exception ...
-
+                    
             @param  xOrgRequest
                     points to the original interaction, which was intercepted.
                     It provides access to the exception and the list of possible
                     continuations.
-
+                    
             @return The result of this operation.
                     Note: If E_NOT_INTERCEPTED is returned the default handling of the base class
                     will be used automaticly for this request!
          */
         virtual EInterceptionState intercepted(const InterceptedRequest&                                                             rRequest   ,
                                                const ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionRequest >& xOrgRequest);
-
+    
     //-------------------------------------------
     // uno interface
     public:
-
+    
         //---------------------------------------
         /** @short  implements the default handling of this class ....
                     or can be overwritten by any derived class.
@@ -307,39 +307,39 @@ class UCBHELPER_DLLPUBLIC InterceptedInteraction : public ::cppu::WeakImplHelper
                     If this method was overwritten by a derived implementation
                     -> the new implementation has to do everything by itself.
                     Of course it can access all members/helpers and work with it.
-                    But the default implementation isnt used automaticly then.
-
+                    But the default implementation isnt used automaticly then.                    
+                    
             @param  xRequest
                     the interaction request, which should be intercepted.
-         */
+         */                    
         virtual void SAL_CALL handle(const ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionRequest >& xRequest)
             throw(::com::sun::star::uno::RuntimeException);
-
+            
     //-------------------------------------------
     // helper
     private:
-
+    
         //---------------------------------------
         /** @short  implements the default handling:
                     - intercept or forward to internal handler.
          */
         UCBHELPER_DLLPRIVATE void impl_handleDefault(const ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionRequest >& xRequest);
-
+        
         //---------------------------------------
         /** @short  implements the interception of requests.
-
+        
             @descr  The incoming request will be analyzed, if it match
                     any request of the m_lIntercepions list.
                     If an interception could be found, its continuation will be
                     searched and selected.
-
+                    
                     The method return the state of that operation.
                     But it doesnt call the intercepted and here set
                     interaction handler. That has to be done in the outside method.
-
+                    
             @param  xRequest
                     the interaction request, which should be intercepted.
-
+                    
             @return A identifier, which inidicates if the request was intercepted,
                     the continuation was found and selected ... or not.
          */
diff --git a/ucbhelper/inc/ucbhelper/macros.hxx b/ucbhelper/inc/ucbhelper/macros.hxx
index f32f1130c216..ef5095d5c727 100644
--- a/ucbhelper/inc/ucbhelper/macros.hxx
+++ b/ucbhelper/inc/ucbhelper/macros.hxx
@@ -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
@@ -38,8 +38,8 @@
 
 //=========================================================================
 
-#define CPPU_TYPE( T )      getCppuType( static_cast< T * >( 0 ) )
-#define CPPU_TYPE_REF( T )  CPPU_TYPE( com::sun::star::uno::Reference< T > )
+#define CPPU_TYPE( T ) 		getCppuType( static_cast< T * >( 0 ) )
+#define CPPU_TYPE_REF( T ) 	CPPU_TYPE( com::sun::star::uno::Reference< T > )
 
 //=========================================================================
 //
@@ -47,12 +47,12 @@
 //
 //=========================================================================
 
-#define XINTERFACE_DECL()                                                   \
-    virtual com::sun::star::uno::Any SAL_CALL                               \
+#define XINTERFACE_DECL()													\
+    virtual com::sun::star::uno::Any SAL_CALL                				\
     queryInterface( const com::sun::star::uno::Type & rType )               \
         throw( com::sun::star::uno::RuntimeException );                     \
-    virtual void SAL_CALL                                                   \
-    acquire()                                                               \
+    virtual void SAL_CALL                               					\
+    acquire()                                           					\
         throw();                                                            \
     virtual void SAL_CALL                                                   \
     release()                                                               \
@@ -64,20 +64,20 @@
 //
 //=========================================================================
 
-#define XINTERFACE_COMMON_IMPL( Class )                                     \
+#define XINTERFACE_COMMON_IMPL( Class )										\
 void SAL_CALL Class::acquire()                                              \
     throw()                                                                 \
 {                                                                           \
-    OWeakObject::acquire();                                                 \
+    OWeakObject::acquire();                                 				\
 }                                                                           \
                                                                             \
 void SAL_CALL Class::release()                                              \
     throw()                                                                 \
 {                                                                           \
-    OWeakObject::release();                                                 \
+    OWeakObject::release();                                 				\
 }
 
-#define QUERYINTERFACE_IMPL_START( Class )                                  \
+#define QUERYINTERFACE_IMPL_START( Class )									\
 com::sun::star::uno::Any SAL_CALL Class::queryInterface(                    \
                                 const com::sun::star::uno::Type & rType )   \
     throw( com::sun::star::uno::RuntimeException )                          \
@@ -86,7 +86,7 @@ com::sun::star::uno::Any SAL_CALL Class::queryInterface(                    \
 
 #define QUERYINTERFACE_IMPL_END                                             \
                     );                                                      \
-    return aRet.hasValue() ? aRet : OWeakObject::queryInterface( rType );   \
+    return aRet.hasValue() ? aRet : OWeakObject::queryInterface( rType ); 	\
 }
 
 //=========================================================================
@@ -96,14 +96,14 @@ com::sun::star::uno::Any SAL_CALL Class::queryInterface(                    \
 //=========================================================================
 
 // 1 interface implemented
-#define XINTERFACE_IMPL_1( Class, Ifc1 )                                    \
+#define XINTERFACE_IMPL_1( Class, Ifc1 )									\
 XINTERFACE_COMMON_IMPL( Class )                                             \
 QUERYINTERFACE_IMPL_START( Class )                                          \
     SAL_STATIC_CAST( Ifc1*, this )                                          \
 QUERYINTERFACE_IMPL_END
 
 // 2 interfaces implemented
-#define XINTERFACE_IMPL_2( Class, Ifc1, Ifc2 )                              \
+#define XINTERFACE_IMPL_2( Class, Ifc1, Ifc2 )								\
 XINTERFACE_COMMON_IMPL( Class )                                             \
 QUERYINTERFACE_IMPL_START( Class )                                          \
     SAL_STATIC_CAST( Ifc1*, this ),                                         \
@@ -111,7 +111,7 @@ QUERYINTERFACE_IMPL_START( Class )                                          \
 QUERYINTERFACE_IMPL_END
 
 // 3 interfaces implemented
-#define XINTERFACE_IMPL_3( Class, Ifc1, Ifc2, Ifc3 )                        \
+#define XINTERFACE_IMPL_3( Class, Ifc1, Ifc2, Ifc3 )						\
 XINTERFACE_COMMON_IMPL( Class )                                             \
 QUERYINTERFACE_IMPL_START( Class )                                          \
     SAL_STATIC_CAST( Ifc1*, this ),                                         \
@@ -120,7 +120,7 @@ QUERYINTERFACE_IMPL_START( Class )                                          \
 QUERYINTERFACE_IMPL_END
 
 // 4 interfaces implemented
-#define XINTERFACE_IMPL_4( Class, Ifc1, Ifc2, Ifc3, Ifc4 )                  \
+#define XINTERFACE_IMPL_4( Class, Ifc1, Ifc2, Ifc3, Ifc4 )					\
 XINTERFACE_COMMON_IMPL( Class )                                             \
 QUERYINTERFACE_IMPL_START( Class )                                          \
     SAL_STATIC_CAST( Ifc1*, this ),                                         \
@@ -130,7 +130,7 @@ QUERYINTERFACE_IMPL_START( Class )                                          \
 QUERYINTERFACE_IMPL_END
 
 // 5 interfaces implemented
-#define XINTERFACE_IMPL_5( Class, Ifc1, Ifc2, Ifc3, Ifc4, Ifc5 )            \
+#define XINTERFACE_IMPL_5( Class, Ifc1, Ifc2, Ifc3, Ifc4, Ifc5 )			\
 XINTERFACE_COMMON_IMPL( Class )                                             \
 QUERYINTERFACE_IMPL_START( Class )                                          \
     SAL_STATIC_CAST( Ifc1*, this ),                                         \
@@ -141,168 +141,168 @@ QUERYINTERFACE_IMPL_START( Class )                                          \
 QUERYINTERFACE_IMPL_END
 
 // 6 interfaces implemented
-#define XINTERFACE_IMPL_6( Class,I1,I2,I3,I4,I5,I6 )                        \
+#define XINTERFACE_IMPL_6( Class,I1,I2,I3,I4,I5,I6 )						\
 XINTERFACE_COMMON_IMPL( Class )                                             \
 QUERYINTERFACE_IMPL_START( Class )                                          \
-    SAL_STATIC_CAST( I1*, this ),                                           \
-    SAL_STATIC_CAST( I2*, this ),                                           \
-    SAL_STATIC_CAST( I3*, this ),                                           \
-    SAL_STATIC_CAST( I4*, this ),                                           \
-    SAL_STATIC_CAST( I5*, this ),                                           \
-    SAL_STATIC_CAST( I6*, this )                                            \
+    SAL_STATIC_CAST( I1*, this ),                                         	\
+    SAL_STATIC_CAST( I2*, this ),                                         	\
+    SAL_STATIC_CAST( I3*, this ),                                         	\
+    SAL_STATIC_CAST( I4*, this ),                                         	\
+    SAL_STATIC_CAST( I5*, this ),                                         	\
+    SAL_STATIC_CAST( I6*, this )                                         	\
 QUERYINTERFACE_IMPL_END
 
 // 7 interfaces implemented
-#define XINTERFACE_IMPL_7( Class,I1,I2,I3,I4,I5,I6,I7 )                     \
+#define XINTERFACE_IMPL_7( Class,I1,I2,I3,I4,I5,I6,I7 )						\
 XINTERFACE_COMMON_IMPL( Class )                                             \
 QUERYINTERFACE_IMPL_START( Class )                                          \
-    SAL_STATIC_CAST( I1*, this ),                                           \
-    SAL_STATIC_CAST( I2*, this ),                                           \
-    SAL_STATIC_CAST( I3*, this ),                                           \
-    SAL_STATIC_CAST( I4*, this ),                                           \
-    SAL_STATIC_CAST( I5*, this ),                                           \
-    SAL_STATIC_CAST( I6*, this ),                                           \
-    SAL_STATIC_CAST( I7*, this )                                            \
+    SAL_STATIC_CAST( I1*, this ),                                         	\
+    SAL_STATIC_CAST( I2*, this ),                                         	\
+    SAL_STATIC_CAST( I3*, this ),                                         	\
+    SAL_STATIC_CAST( I4*, this ),                                         	\
+    SAL_STATIC_CAST( I5*, this ),                                         	\
+    SAL_STATIC_CAST( I6*, this ),                                         	\
+    SAL_STATIC_CAST( I7*, this )                                         	\
 QUERYINTERFACE_IMPL_END
 
 // 8 interfaces implemented
-#define XINTERFACE_IMPL_8( Class,I1,I2,I3,I4,I5,I6,I7,I8 )                  \
+#define XINTERFACE_IMPL_8( Class,I1,I2,I3,I4,I5,I6,I7,I8 )					\
 XINTERFACE_COMMON_IMPL( Class )                                             \
 QUERYINTERFACE_IMPL_START( Class )                                          \
-    SAL_STATIC_CAST( I1*, this ),                                           \
-    SAL_STATIC_CAST( I2*, this ),                                           \
-    SAL_STATIC_CAST( I3*, this ),                                           \
-    SAL_STATIC_CAST( I4*, this ),                                           \
-    SAL_STATIC_CAST( I5*, this ),                                           \
-    SAL_STATIC_CAST( I6*, this ),                                           \
-    SAL_STATIC_CAST( I7*, this ),                                           \
-    SAL_STATIC_CAST( I8*, this )                                            \
+    SAL_STATIC_CAST( I1*, this ),                                         	\
+    SAL_STATIC_CAST( I2*, this ),                                         	\
+    SAL_STATIC_CAST( I3*, this ),                                         	\
+    SAL_STATIC_CAST( I4*, this ),                                         	\
+    SAL_STATIC_CAST( I5*, this ),                                         	\
+    SAL_STATIC_CAST( I6*, this ),                                         	\
+    SAL_STATIC_CAST( I7*, this ),                                         	\
+    SAL_STATIC_CAST( I8*, this )                                         	\
 QUERYINTERFACE_IMPL_END
 
 // 9 interfaces implemented
-#define XINTERFACE_IMPL_9( Class,I1,I2,I3,I4,I5,I6,I7,I8,I9 )               \
+#define XINTERFACE_IMPL_9( Class,I1,I2,I3,I4,I5,I6,I7,I8,I9 )				\
 XINTERFACE_COMMON_IMPL( Class )                                             \
 QUERYINTERFACE_IMPL_START( Class )                                          \
-    SAL_STATIC_CAST( I1*, this ),                                           \
-    SAL_STATIC_CAST( I2*, this ),                                           \
-    SAL_STATIC_CAST( I3*, this ),                                           \
-    SAL_STATIC_CAST( I4*, this ),                                           \
-    SAL_STATIC_CAST( I5*, this ),                                           \
-    SAL_STATIC_CAST( I6*, this ),                                           \
-    SAL_STATIC_CAST( I7*, this ),                                           \
-    SAL_STATIC_CAST( I8*, this ),                                           \
-    SAL_STATIC_CAST( I9*, this )                                            \
+    SAL_STATIC_CAST( I1*, this ),                                         	\
+    SAL_STATIC_CAST( I2*, this ),                                         	\
+    SAL_STATIC_CAST( I3*, this ),                                         	\
+    SAL_STATIC_CAST( I4*, this ),                                         	\
+    SAL_STATIC_CAST( I5*, this ),                                         	\
+    SAL_STATIC_CAST( I6*, this ),                                         	\
+    SAL_STATIC_CAST( I7*, this ),                                         	\
+    SAL_STATIC_CAST( I8*, this ),                                         	\
+    SAL_STATIC_CAST( I9*, this )                                         	\
 QUERYINTERFACE_IMPL_END
 
 // 10 interfaces implemented
-#define XINTERFACE_IMPL_10( Class,I1,I2,I3,I4,I5,I6,I7,I8,I9,I10 )          \
+#define XINTERFACE_IMPL_10( Class,I1,I2,I3,I4,I5,I6,I7,I8,I9,I10 )			\
 XINTERFACE_COMMON_IMPL( Class )                                             \
 QUERYINTERFACE_IMPL_START( Class )                                          \
-    SAL_STATIC_CAST( I1*, this ),                                           \
-    SAL_STATIC_CAST( I2*, this ),                                           \
-    SAL_STATIC_CAST( I3*, this ),                                           \
-    SAL_STATIC_CAST( I4*, this ),                                           \
-    SAL_STATIC_CAST( I5*, this ),                                           \
-    SAL_STATIC_CAST( I6*, this ),                                           \
-    SAL_STATIC_CAST( I7*, this ),                                           \
-    SAL_STATIC_CAST( I8*, this ),                                           \
-    SAL_STATIC_CAST( I9*, this ),                                           \
-    SAL_STATIC_CAST( I10*, this )                                           \
+    SAL_STATIC_CAST( I1*, this ),                                         	\
+    SAL_STATIC_CAST( I2*, this ),                                         	\
+    SAL_STATIC_CAST( I3*, this ),                                         	\
+    SAL_STATIC_CAST( I4*, this ),                                         	\
+    SAL_STATIC_CAST( I5*, this ),                                         	\
+    SAL_STATIC_CAST( I6*, this ),                                         	\
+    SAL_STATIC_CAST( I7*, this ),                                         	\
+    SAL_STATIC_CAST( I8*, this ),                                         	\
+    SAL_STATIC_CAST( I9*, this ),                                         	\
+    SAL_STATIC_CAST( I10*, this )                                         	\
 QUERYINTERFACE_IMPL_END
 
 // 11 interfaces implemented
-#define XINTERFACE_IMPL_11( Class,I1,I2,I3,I4,I5,I6,I7,I8,I9,I10,I11 )      \
+#define XINTERFACE_IMPL_11( Class,I1,I2,I3,I4,I5,I6,I7,I8,I9,I10,I11 )		\
 XINTERFACE_COMMON_IMPL( Class )                                             \
 QUERYINTERFACE_IMPL_START( Class )                                          \
-    SAL_STATIC_CAST( I1*, this ),                                           \
-    SAL_STATIC_CAST( I2*, this ),                                           \
-    SAL_STATIC_CAST( I3*, this ),                                           \
-    SAL_STATIC_CAST( I4*, this ),                                           \
-    SAL_STATIC_CAST( I5*, this ),                                           \
-    SAL_STATIC_CAST( I6*, this ),                                           \
-    SAL_STATIC_CAST( I7*, this ),                                           \
-    SAL_STATIC_CAST( I8*, this ),                                           \
-    SAL_STATIC_CAST( I9*, this ),                                           \
-    SAL_STATIC_CAST( I10*, this ),                                          \
-    SAL_STATIC_CAST( I11*, this )                                           \
+    SAL_STATIC_CAST( I1*, this ),                                         	\
+    SAL_STATIC_CAST( I2*, this ),                                         	\
+    SAL_STATIC_CAST( I3*, this ),                                         	\
+    SAL_STATIC_CAST( I4*, this ),                                         	\
+    SAL_STATIC_CAST( I5*, this ),                                         	\
+    SAL_STATIC_CAST( I6*, this ),                                         	\
+    SAL_STATIC_CAST( I7*, this ),                                         	\
+    SAL_STATIC_CAST( I8*, this ),                                         	\
+    SAL_STATIC_CAST( I9*, this ),                                         	\
+    SAL_STATIC_CAST( I10*, this ),                                         	\
+    SAL_STATIC_CAST( I11*, this )                                         	\
 QUERYINTERFACE_IMPL_END
 
 // 12 interfaces implemented
-#define XINTERFACE_IMPL_12( Class,I1,I2,I3,I4,I5,I6,I7,I8,I9,I10,I11,I12 )  \
+#define XINTERFACE_IMPL_12( Class,I1,I2,I3,I4,I5,I6,I7,I8,I9,I10,I11,I12 )	\
 XINTERFACE_COMMON_IMPL( Class )                                             \
 QUERYINTERFACE_IMPL_START( Class )                                          \
-    SAL_STATIC_CAST( I1*, this ),                                           \
-    SAL_STATIC_CAST( I2*, this ),                                           \
-    SAL_STATIC_CAST( I3*, this ),                                           \
-    SAL_STATIC_CAST( I4*, this ),                                           \
-    SAL_STATIC_CAST( I5*, this ),                                           \
-    SAL_STATIC_CAST( I6*, this ),                                           \
-    SAL_STATIC_CAST( I7*, this ),                                           \
-    SAL_STATIC_CAST( I8*, this ),                                           \
-    SAL_STATIC_CAST( I9*, this ),                                           \
-    SAL_STATIC_CAST( I10*, this ),                                          \
-    SAL_STATIC_CAST( I11*, this ),                                          \
-    SAL_STATIC_CAST( I12*, this )                                           \
+    SAL_STATIC_CAST( I1*, this ),                                         	\
+    SAL_STATIC_CAST( I2*, this ),                                         	\
+    SAL_STATIC_CAST( I3*, this ),                                         	\
+    SAL_STATIC_CAST( I4*, this ),                                         	\
+    SAL_STATIC_CAST( I5*, this ),                                         	\
+    SAL_STATIC_CAST( I6*, this ),                                         	\
+    SAL_STATIC_CAST( I7*, this ),                                         	\
+    SAL_STATIC_CAST( I8*, this ),                                         	\
+    SAL_STATIC_CAST( I9*, this ),                                         	\
+    SAL_STATIC_CAST( I10*, this ),                                         	\
+    SAL_STATIC_CAST( I11*, this ),                                         	\
+    SAL_STATIC_CAST( I12*, this )                                         	\
 QUERYINTERFACE_IMPL_END
 
 // 13 interfaces implemented
 #define XINTERFACE_IMPL_13( Class,I1,I2,I3,I4,I5,I6,I7,I8,I9,I10,I11,I12,I13 ) \
 XINTERFACE_COMMON_IMPL( Class )                                             \
 QUERYINTERFACE_IMPL_START( Class )                                          \
-    SAL_STATIC_CAST( I1*, this ),                                           \
-    SAL_STATIC_CAST( I2*, this ),                                           \
-    SAL_STATIC_CAST( I3*, this ),                                           \
-    SAL_STATIC_CAST( I4*, this ),                                           \
-    SAL_STATIC_CAST( I5*, this ),                                           \
-    SAL_STATIC_CAST( I6*, this ),                                           \
-    SAL_STATIC_CAST( I7*, this ),                                           \
-    SAL_STATIC_CAST( I8*, this ),                                           \
-    SAL_STATIC_CAST( I9*, this ),                                           \
-    SAL_STATIC_CAST( I10*, this ),                                          \
-    SAL_STATIC_CAST( I11*, this ),                                          \
-    SAL_STATIC_CAST( I12*, this ),                                          \
-    SAL_STATIC_CAST( I13*, this )                                           \
+    SAL_STATIC_CAST( I1*, this ),                                         	\
+    SAL_STATIC_CAST( I2*, this ),                                         	\
+    SAL_STATIC_CAST( I3*, this ),                                         	\
+    SAL_STATIC_CAST( I4*, this ),                                         	\
+    SAL_STATIC_CAST( I5*, this ),                                         	\
+    SAL_STATIC_CAST( I6*, this ),                                         	\
+    SAL_STATIC_CAST( I7*, this ),                                         	\
+    SAL_STATIC_CAST( I8*, this ),                                         	\
+    SAL_STATIC_CAST( I9*, this ),                                         	\
+    SAL_STATIC_CAST( I10*, this ),                                         	\
+    SAL_STATIC_CAST( I11*, this ),                                         	\
+    SAL_STATIC_CAST( I12*, this ),                                         	\
+    SAL_STATIC_CAST( I13*, this )                                          	\
 QUERYINTERFACE_IMPL_END
 
 // 14 interfaces implemented
-#define XINTERFACE_IMPL_14( Class,I1,I2,I3,I4,I5,I6,I7,I8,I9,I10,I11,I12,I13,I14 )  \
+#define XINTERFACE_IMPL_14( Class,I1,I2,I3,I4,I5,I6,I7,I8,I9,I10,I11,I12,I13,I14 )	\
 XINTERFACE_COMMON_IMPL( Class )                                             \
 QUERYINTERFACE_IMPL_START( Class )                                          \
-    SAL_STATIC_CAST( I1*, this ),                                           \
-    SAL_STATIC_CAST( I2*, this ),                                           \
-    SAL_STATIC_CAST( I3*, this ),                                           \
-    SAL_STATIC_CAST( I4*, this ),                                           \
-    SAL_STATIC_CAST( I5*, this ),                                           \
-    SAL_STATIC_CAST( I6*, this ),                                           \
-    SAL_STATIC_CAST( I7*, this ),                                           \
-    SAL_STATIC_CAST( I8*, this ),                                           \
-    SAL_STATIC_CAST( I9*, this ),                                           \
-    SAL_STATIC_CAST( I10*, this ),                                          \
-    SAL_STATIC_CAST( I11*, this ),                                          \
-    SAL_STATIC_CAST( I12*, this ),                                          \
-    SAL_STATIC_CAST( I13*, this ),                                          \
-    SAL_STATIC_CAST( I14*, this )                                           \
+    SAL_STATIC_CAST( I1*, this ),                                         	\
+    SAL_STATIC_CAST( I2*, this ),                                         	\
+    SAL_STATIC_CAST( I3*, this ),                                         	\
+    SAL_STATIC_CAST( I4*, this ),                                         	\
+    SAL_STATIC_CAST( I5*, this ),                                         	\
+    SAL_STATIC_CAST( I6*, this ),                                         	\
+    SAL_STATIC_CAST( I7*, this ),                                         	\
+    SAL_STATIC_CAST( I8*, this ),                                         	\
+    SAL_STATIC_CAST( I9*, this ),                                         	\
+    SAL_STATIC_CAST( I10*, this ),                                         	\
+    SAL_STATIC_CAST( I11*, this ),                                         	\
+    SAL_STATIC_CAST( I12*, this ),                                         	\
+    SAL_STATIC_CAST( I13*, this ),                                         	\
+    SAL_STATIC_CAST( I14*, this )                                          	\
 QUERYINTERFACE_IMPL_END
 
 // 15 interfaces implemented
-#define XINTERFACE_IMPL_15( Class,I1,I2,I3,I4,I5,I6,I7,I8,I9,I10,I11,I12,I13,I14,I15 )  \
+#define XINTERFACE_IMPL_15( Class,I1,I2,I3,I4,I5,I6,I7,I8,I9,I10,I11,I12,I13,I14,I15 )	\
 XINTERFACE_COMMON_IMPL( Class )                                             \
 QUERYINTERFACE_IMPL_START( Class )                                          \
-    SAL_STATIC_CAST( I1*, this ),                                           \
-    SAL_STATIC_CAST( I2*, this ),                                           \
-    SAL_STATIC_CAST( I3*, this ),                                           \
-    SAL_STATIC_CAST( I4*, this ),                                           \
-    SAL_STATIC_CAST( I5*, this ),                                           \
-    SAL_STATIC_CAST( I6*, this ),                                           \
-    SAL_STATIC_CAST( I7*, this ),                                           \
-    SAL_STATIC_CAST( I8*, this ),                                           \
-    SAL_STATIC_CAST( I9*, this ),                                           \
-    SAL_STATIC_CAST( I10*, this ),                                          \
-    SAL_STATIC_CAST( I11*, this ),                                          \
-    SAL_STATIC_CAST( I12*, this ),                                          \
-    SAL_STATIC_CAST( I13*, this ),                                          \
-    SAL_STATIC_CAST( I14*, this ),                                          \
-    SAL_STATIC_CAST( I15*, this )                                           \
+    SAL_STATIC_CAST( I1*, this ),                                         	\
+    SAL_STATIC_CAST( I2*, this ),                                         	\
+    SAL_STATIC_CAST( I3*, this ),                                         	\
+    SAL_STATIC_CAST( I4*, this ),                                         	\
+    SAL_STATIC_CAST( I5*, this ),                                         	\
+    SAL_STATIC_CAST( I6*, this ),                                         	\
+    SAL_STATIC_CAST( I7*, this ),                                         	\
+    SAL_STATIC_CAST( I8*, this ),                                         	\
+    SAL_STATIC_CAST( I9*, this ),                                         	\
+    SAL_STATIC_CAST( I10*, this ),                                         	\
+    SAL_STATIC_CAST( I11*, this ),                                         	\
+    SAL_STATIC_CAST( I12*, this ),                                         	\
+    SAL_STATIC_CAST( I13*, this ),                                         	\
+    SAL_STATIC_CAST( I14*, this ),                                         	\
+    SAL_STATIC_CAST( I15*, this )                                          	\
 QUERYINTERFACE_IMPL_END
 
 //=========================================================================
@@ -311,12 +311,12 @@ QUERYINTERFACE_IMPL_END
 //
 //=========================================================================
 
-#define XTYPEPROVIDER_DECL()                                                \
+#define XTYPEPROVIDER_DECL()										  		\
     virtual com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL              \
     getImplementationId()                                                   \
-        throw( com::sun::star::uno::RuntimeException );                     \
+        throw( com::sun::star::uno::RuntimeException );						\
     virtual com::sun::star::uno::Sequence< com::sun::star::uno::Type > SAL_CALL \
-    getTypes()                                                              \
+    getTypes()         														\
         throw( com::sun::star::uno::RuntimeException );
 
 //=========================================================================
@@ -325,7 +325,7 @@ QUERYINTERFACE_IMPL_END
 //
 //=========================================================================
 
-#define XTYPEPROVIDER_COMMON_IMPL( Class )                                  \
+#define XTYPEPROVIDER_COMMON_IMPL( Class )									\
 com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL                          \
 Class::getImplementationId()                                                \
     throw( com::sun::star::uno::RuntimeException )                          \
@@ -343,12 +343,12 @@ Class::getImplementationId()                                                \
       return (*pId).getImplementationId();                                    \
 }
 
-#define GETTYPES_IMPL_START( Class )                                        \
+#define GETTYPES_IMPL_START( Class )										\
 com::sun::star::uno::Sequence< com::sun::star::uno::Type > SAL_CALL         \
 Class::getTypes()                                                           \
     throw( com::sun::star::uno::RuntimeException )                          \
 {                                                                           \
-    static cppu::OTypeCollection* pCollection = NULL;                       \
+    static cppu::OTypeCollection* pCollection = NULL;						\
       if ( !pCollection )                                                     \
       {                                                                       \
         osl::Guard< osl::Mutex > aGuard( osl::Mutex::getGlobalMutex() );    \
@@ -356,7 +356,7 @@ Class::getTypes()                                                           \
         {                                                                   \
             static cppu::OTypeCollection collection(
 
-#define GETTYPES_IMPL_END                                                   \
+#define GETTYPES_IMPL_END													\
                 );                                                          \
             pCollection = &collection;                                      \
         }                                                                   \
@@ -371,213 +371,213 @@ Class::getTypes()                                                           \
 //=========================================================================
 
 // 1 interface supported
-#define XTYPEPROVIDER_IMPL_1( Class, I1 )                                   \
-XTYPEPROVIDER_COMMON_IMPL( Class )                                          \
-GETTYPES_IMPL_START( Class )                                                \
-    CPPU_TYPE_REF( I1 )                                                 \
+#define XTYPEPROVIDER_IMPL_1( Class, I1 )									\
+XTYPEPROVIDER_COMMON_IMPL( Class )											\
+GETTYPES_IMPL_START( Class )                                  				\
+    CPPU_TYPE_REF( I1 )													\
 GETTYPES_IMPL_END
 
 // 2 interfaces supported
-#define XTYPEPROVIDER_IMPL_2( Class, I1,I2 )                                \
-XTYPEPROVIDER_COMMON_IMPL( Class )                                          \
-GETTYPES_IMPL_START( Class )                                                \
-    CPPU_TYPE_REF( I1 ),                                                    \
-    CPPU_TYPE_REF( I2 )                                                     \
+#define XTYPEPROVIDER_IMPL_2( Class, I1,I2 )  								\
+XTYPEPROVIDER_COMMON_IMPL( Class )											\
+GETTYPES_IMPL_START( Class )                                  				\
+    CPPU_TYPE_REF( I1 ),													\
+    CPPU_TYPE_REF( I2 )             										\
 GETTYPES_IMPL_END
 
 // 3 interfaces supported
-#define XTYPEPROVIDER_IMPL_3( Class, I1,I2,I3 )                             \
-XTYPEPROVIDER_COMMON_IMPL( Class )                                          \
-GETTYPES_IMPL_START( Class )                                                \
-    CPPU_TYPE_REF( I1 ),                                                    \
-    CPPU_TYPE_REF( I2 ),                                                    \
-    CPPU_TYPE_REF( I3 )                                                     \
+#define XTYPEPROVIDER_IMPL_3( Class, I1,I2,I3 )  							\
+XTYPEPROVIDER_COMMON_IMPL( Class )											\
+GETTYPES_IMPL_START( Class )                                  				\
+    CPPU_TYPE_REF( I1 ),													\
+    CPPU_TYPE_REF( I2 ),             										\
+    CPPU_TYPE_REF( I3 )             										\
 GETTYPES_IMPL_END
 
 // 4 interfaces supported
-#define XTYPEPROVIDER_IMPL_4( Class, I1,I2,I3,I4 )                          \
-XTYPEPROVIDER_COMMON_IMPL( Class )                                          \
-GETTYPES_IMPL_START( Class )                                                \
-    CPPU_TYPE_REF( I1 ),                                                    \
-    CPPU_TYPE_REF( I2 ),                                                    \
-    CPPU_TYPE_REF( I3 ),                                                    \
-    CPPU_TYPE_REF( I4 )                                                     \
+#define XTYPEPROVIDER_IMPL_4( Class, I1,I2,I3,I4 )  						\
+XTYPEPROVIDER_COMMON_IMPL( Class )											\
+GETTYPES_IMPL_START( Class )                                  				\
+    CPPU_TYPE_REF( I1 ),													\
+    CPPU_TYPE_REF( I2 ),             										\
+    CPPU_TYPE_REF( I3 ),             										\
+    CPPU_TYPE_REF( I4 )             										\
 GETTYPES_IMPL_END
 
 // 5 interfaces supported
-#define XTYPEPROVIDER_IMPL_5( Class, I1,I2,I3,I4,I5 )                       \
-XTYPEPROVIDER_COMMON_IMPL( Class )                                          \
-GETTYPES_IMPL_START( Class )                                                \
-    CPPU_TYPE_REF( I1 ),                                                    \
-    CPPU_TYPE_REF( I2 ),                                                    \
-    CPPU_TYPE_REF( I3 ),                                                    \
-    CPPU_TYPE_REF( I4 ),                                                    \
-    CPPU_TYPE_REF( I5 )                                                     \
+#define XTYPEPROVIDER_IMPL_5( Class, I1,I2,I3,I4,I5 )  						\
+XTYPEPROVIDER_COMMON_IMPL( Class )											\
+GETTYPES_IMPL_START( Class )                                  				\
+    CPPU_TYPE_REF( I1 ),													\
+    CPPU_TYPE_REF( I2 ),             										\
+    CPPU_TYPE_REF( I3 ),             										\
+    CPPU_TYPE_REF( I4 ),             										\
+    CPPU_TYPE_REF( I5 )             										\
 GETTYPES_IMPL_END
 
 // 6 interfaces supported
-#define XTYPEPROVIDER_IMPL_6( Class, I1,I2,I3,I4,I5,I6 )                    \
-XTYPEPROVIDER_COMMON_IMPL( Class )                                          \
-GETTYPES_IMPL_START( Class )                                                \
-    CPPU_TYPE_REF( I1 ),                                                    \
-    CPPU_TYPE_REF( I2 ),                                                    \
-    CPPU_TYPE_REF( I3 ),                                                    \
-    CPPU_TYPE_REF( I4 ),                                                    \
-    CPPU_TYPE_REF( I5 ),                                                    \
-    CPPU_TYPE_REF( I6 )                                                     \
+#define XTYPEPROVIDER_IMPL_6( Class, I1,I2,I3,I4,I5,I6 )  					\
+XTYPEPROVIDER_COMMON_IMPL( Class )											\
+GETTYPES_IMPL_START( Class )                                  				\
+    CPPU_TYPE_REF( I1 ),													\
+    CPPU_TYPE_REF( I2 ),             										\
+    CPPU_TYPE_REF( I3 ),             										\
+    CPPU_TYPE_REF( I4 ),             										\
+    CPPU_TYPE_REF( I5 ),             										\
+    CPPU_TYPE_REF( I6 )	            										\
 GETTYPES_IMPL_END
 
 // 7 interfaces supported
-#define XTYPEPROVIDER_IMPL_7( Class, I1,I2,I3,I4,I5,I6,I7 )                 \
-XTYPEPROVIDER_COMMON_IMPL( Class )                                          \
-GETTYPES_IMPL_START( Class )                                                \
-    CPPU_TYPE_REF( I1 ),                                                    \
-    CPPU_TYPE_REF( I2 ),                                                    \
-    CPPU_TYPE_REF( I3 ),                                                    \
-    CPPU_TYPE_REF( I4 ),                                                    \
-    CPPU_TYPE_REF( I5 ),                                                    \
-    CPPU_TYPE_REF( I6 ),                                                    \
-    CPPU_TYPE_REF( I7 )                                                     \
+#define XTYPEPROVIDER_IMPL_7( Class, I1,I2,I3,I4,I5,I6,I7 )   				\
+XTYPEPROVIDER_COMMON_IMPL( Class )											\
+GETTYPES_IMPL_START( Class )                                  				\
+    CPPU_TYPE_REF( I1 ),													\
+    CPPU_TYPE_REF( I2 ),             										\
+    CPPU_TYPE_REF( I3 ),             										\
+    CPPU_TYPE_REF( I4 ),             										\
+    CPPU_TYPE_REF( I5 ),             										\
+    CPPU_TYPE_REF( I6 ),            										\
+    CPPU_TYPE_REF( I7 )             										\
 GETTYPES_IMPL_END
 
 // 8 interfaces supported
-#define XTYPEPROVIDER_IMPL_8( Class, I1,I2,I3,I4,I5,I6,I7,I8 )              \
-XTYPEPROVIDER_COMMON_IMPL( Class )                                          \
-GETTYPES_IMPL_START( Class )                                                \
-    CPPU_TYPE_REF( I1 ),                                                    \
-    CPPU_TYPE_REF( I2 ),                                                    \
-    CPPU_TYPE_REF( I3 ),                                                    \
-    CPPU_TYPE_REF( I4 ),                                                    \
-    CPPU_TYPE_REF( I5 ),                                                    \
-    CPPU_TYPE_REF( I6 ),                                                    \
-    CPPU_TYPE_REF( I7 ),                                                    \
-    CPPU_TYPE_REF( I8 )                                                     \
+#define XTYPEPROVIDER_IMPL_8( Class, I1,I2,I3,I4,I5,I6,I7,I8 )				\
+XTYPEPROVIDER_COMMON_IMPL( Class )											\
+GETTYPES_IMPL_START( Class )                                  				\
+    CPPU_TYPE_REF( I1 ),													\
+    CPPU_TYPE_REF( I2 ),             										\
+    CPPU_TYPE_REF( I3 ),             										\
+    CPPU_TYPE_REF( I4 ),             										\
+    CPPU_TYPE_REF( I5 ),             										\
+    CPPU_TYPE_REF( I6 ),            										\
+    CPPU_TYPE_REF( I7 ),             										\
+    CPPU_TYPE_REF( I8 )             										\
 GETTYPES_IMPL_END
 
 // 9 interfaces supported
-#define XTYPEPROVIDER_IMPL_9( Class, I1,I2,I3,I4,I5,I6,I7,I8,I9 )           \
-XTYPEPROVIDER_COMMON_IMPL( Class )                                          \
-GETTYPES_IMPL_START( Class )                                                \
-    CPPU_TYPE_REF( I1 ),                                                    \
-    CPPU_TYPE_REF( I2 ),                                                    \
-    CPPU_TYPE_REF( I3 ),                                                    \
-    CPPU_TYPE_REF( I4 ),                                                    \
-    CPPU_TYPE_REF( I5 ),                                                    \
-    CPPU_TYPE_REF( I6 ),                                                    \
-    CPPU_TYPE_REF( I7 ),                                                    \
-    CPPU_TYPE_REF( I8 ),                                                    \
-    CPPU_TYPE_REF( I9 )                                                     \
+#define XTYPEPROVIDER_IMPL_9( Class, I1,I2,I3,I4,I5,I6,I7,I8,I9 )			\
+XTYPEPROVIDER_COMMON_IMPL( Class )											\
+GETTYPES_IMPL_START( Class )                                  				\
+    CPPU_TYPE_REF( I1 ),													\
+    CPPU_TYPE_REF( I2 ),             										\
+    CPPU_TYPE_REF( I3 ),             										\
+    CPPU_TYPE_REF( I4 ),             										\
+    CPPU_TYPE_REF( I5 ),             										\
+    CPPU_TYPE_REF( I6 ),            										\
+    CPPU_TYPE_REF( I7 ),             										\
+    CPPU_TYPE_REF( I8 ),             										\
+    CPPU_TYPE_REF( I9 )             										\
 GETTYPES_IMPL_END
 
 // 10 interfaces supported
-#define XTYPEPROVIDER_IMPL_10( Class, I1,I2,I3,I4,I5,I6,I7,I8,I9,I10 )      \
-XTYPEPROVIDER_COMMON_IMPL( Class )                                          \
-GETTYPES_IMPL_START( Class )                                                \
-    CPPU_TYPE_REF( I1 ),                                                    \
-    CPPU_TYPE_REF( I2 ),                                                    \
-    CPPU_TYPE_REF( I3 ),                                                    \
-    CPPU_TYPE_REF( I4 ),                                                    \
-    CPPU_TYPE_REF( I5 ),                                                    \
-    CPPU_TYPE_REF( I6 ),                                                    \
-    CPPU_TYPE_REF( I7 ),                                                    \
-    CPPU_TYPE_REF( I8 ),                                                    \
-    CPPU_TYPE_REF( I9 ),                                                    \
-    CPPU_TYPE_REF( I10 )                                                    \
+#define XTYPEPROVIDER_IMPL_10( Class, I1,I2,I3,I4,I5,I6,I7,I8,I9,I10 )		\
+XTYPEPROVIDER_COMMON_IMPL( Class )											\
+GETTYPES_IMPL_START( Class )                                  				\
+    CPPU_TYPE_REF( I1 ),													\
+    CPPU_TYPE_REF( I2 ),             										\
+    CPPU_TYPE_REF( I3 ),             										\
+    CPPU_TYPE_REF( I4 ),             										\
+    CPPU_TYPE_REF( I5 ),             										\
+    CPPU_TYPE_REF( I6 ),            										\
+    CPPU_TYPE_REF( I7 ),             										\
+    CPPU_TYPE_REF( I8 ),             										\
+    CPPU_TYPE_REF( I9 ),             										\
+    CPPU_TYPE_REF( I10 )            										\
 GETTYPES_IMPL_END
 
 // 11 interfaces supported
-#define XTYPEPROVIDER_IMPL_11( Class, I1,I2,I3,I4,I5,I6,I7,I8,I9,I10,I11 )  \
-XTYPEPROVIDER_COMMON_IMPL( Class )                                          \
-GETTYPES_IMPL_START( Class )                                                \
-    CPPU_TYPE_REF( I1 ),                                                    \
-    CPPU_TYPE_REF( I2 ),                                                    \
-    CPPU_TYPE_REF( I3 ),                                                    \
-    CPPU_TYPE_REF( I4 ),                                                    \
-    CPPU_TYPE_REF( I5 ),                                                    \
-    CPPU_TYPE_REF( I6 ),                                                    \
-    CPPU_TYPE_REF( I7 ),                                                    \
-    CPPU_TYPE_REF( I8 ),                                                    \
-    CPPU_TYPE_REF( I9 ),                                                    \
-    CPPU_TYPE_REF( I10 ),                                                   \
-    CPPU_TYPE_REF( I11 )                                                    \
+#define XTYPEPROVIDER_IMPL_11( Class, I1,I2,I3,I4,I5,I6,I7,I8,I9,I10,I11 )	\
+XTYPEPROVIDER_COMMON_IMPL( Class )											\
+GETTYPES_IMPL_START( Class )                                  				\
+    CPPU_TYPE_REF( I1 ),													\
+    CPPU_TYPE_REF( I2 ),             										\
+    CPPU_TYPE_REF( I3 ),             										\
+    CPPU_TYPE_REF( I4 ),             										\
+    CPPU_TYPE_REF( I5 ),             										\
+    CPPU_TYPE_REF( I6 ),            										\
+    CPPU_TYPE_REF( I7 ),             										\
+    CPPU_TYPE_REF( I8 ),             										\
+    CPPU_TYPE_REF( I9 ),             										\
+    CPPU_TYPE_REF( I10 ),            										\
+    CPPU_TYPE_REF( I11 )            										\
 GETTYPES_IMPL_END
 
 // 12 interfaces supported
-#define XTYPEPROVIDER_IMPL_12( Class, I1,I2,I3,I4,I5,I6,I7,I8,I9,I10,I11,I12 )  \
-XTYPEPROVIDER_COMMON_IMPL( Class )                                          \
-GETTYPES_IMPL_START( Class )                                                \
-    CPPU_TYPE_REF( I1 ),                                                    \
-    CPPU_TYPE_REF( I2 ),                                                    \
-    CPPU_TYPE_REF( I3 ),                                                    \
-    CPPU_TYPE_REF( I4 ),                                                    \
-    CPPU_TYPE_REF( I5 ),                                                    \
-    CPPU_TYPE_REF( I6 ),                                                    \
-    CPPU_TYPE_REF( I7 ),                                                    \
-    CPPU_TYPE_REF( I8 ),                                                    \
-    CPPU_TYPE_REF( I9 ),                                                    \
-    CPPU_TYPE_REF( I10 ),                                                   \
-    CPPU_TYPE_REF( I11 ),                                                   \
-    CPPU_TYPE_REF( I12 )                                                    \
+#define XTYPEPROVIDER_IMPL_12( Class, I1,I2,I3,I4,I5,I6,I7,I8,I9,I10,I11,I12 )	\
+XTYPEPROVIDER_COMMON_IMPL( Class )											\
+GETTYPES_IMPL_START( Class )                                  				\
+    CPPU_TYPE_REF( I1 ),													\
+    CPPU_TYPE_REF( I2 ),             										\
+    CPPU_TYPE_REF( I3 ),             										\
+    CPPU_TYPE_REF( I4 ),             										\
+    CPPU_TYPE_REF( I5 ),             										\
+    CPPU_TYPE_REF( I6 ),            										\
+    CPPU_TYPE_REF( I7 ),             										\
+    CPPU_TYPE_REF( I8 ),             										\
+    CPPU_TYPE_REF( I9 ),             										\
+    CPPU_TYPE_REF( I10 ),            										\
+    CPPU_TYPE_REF( I11 ),            										\
+    CPPU_TYPE_REF( I12 )            										\
 GETTYPES_IMPL_END
 
 // 13 interfaces supported
-#define XTYPEPROVIDER_IMPL_13( Class, I1,I2,I3,I4,I5,I6,I7,I8,I9,I10,I11,I12,I13 )  \
-XTYPEPROVIDER_COMMON_IMPL( Class )                                          \
-GETTYPES_IMPL_START( Class )                                                \
-    CPPU_TYPE_REF( I1 ),                                                    \
-    CPPU_TYPE_REF( I2 ),                                                    \
-    CPPU_TYPE_REF( I3 ),                                                    \
-    CPPU_TYPE_REF( I4 ),                                                    \
-    CPPU_TYPE_REF( I5 ),                                                    \
-    CPPU_TYPE_REF( I6 ),                                                    \
-    CPPU_TYPE_REF( I7 ),                                                    \
-    CPPU_TYPE_REF( I8 ),                                                    \
-    CPPU_TYPE_REF( I9 ),                                                    \
-    CPPU_TYPE_REF( I10 ),                                                   \
-    CPPU_TYPE_REF( I11 ),                                                   \
-    CPPU_TYPE_REF( I12 ),                                                   \
-    CPPU_TYPE_REF( I13 )                                                    \
+#define XTYPEPROVIDER_IMPL_13( Class, I1,I2,I3,I4,I5,I6,I7,I8,I9,I10,I11,I12,I13 )	\
+XTYPEPROVIDER_COMMON_IMPL( Class )											\
+GETTYPES_IMPL_START( Class )                                  				\
+    CPPU_TYPE_REF( I1 ),													\
+    CPPU_TYPE_REF( I2 ),             										\
+    CPPU_TYPE_REF( I3 ),             										\
+    CPPU_TYPE_REF( I4 ),             										\
+    CPPU_TYPE_REF( I5 ),             										\
+    CPPU_TYPE_REF( I6 ),            										\
+    CPPU_TYPE_REF( I7 ),             										\
+    CPPU_TYPE_REF( I8 ),             										\
+    CPPU_TYPE_REF( I9 ),             										\
+    CPPU_TYPE_REF( I10 ),            										\
+    CPPU_TYPE_REF( I11 ),            										\
+    CPPU_TYPE_REF( I12 ),            										\
+    CPPU_TYPE_REF( I13 )            										\
 GETTYPES_IMPL_END
 
 // 14 interfaces supported
-#define XTYPEPROVIDER_IMPL_14( Class, I1,I2,I3,I4,I5,I6,I7,I8,I9,I10,I11,I12,I13,I14 )  \
-XTYPEPROVIDER_COMMON_IMPL( Class )                                          \
-GETTYPES_IMPL_START( Class )                                                \
-    CPPU_TYPE_REF( I1 ),                                                    \
-    CPPU_TYPE_REF( I2 ),                                                    \
-    CPPU_TYPE_REF( I3 ),                                                    \
-    CPPU_TYPE_REF( I4 ),                                                    \
-    CPPU_TYPE_REF( I5 ),                                                    \
-    CPPU_TYPE_REF( I6 ),                                                    \
-    CPPU_TYPE_REF( I7 ),                                                    \
-    CPPU_TYPE_REF( I8 ),                                                    \
-    CPPU_TYPE_REF( I9 ),                                                    \
-    CPPU_TYPE_REF( I10 ),                                                   \
-    CPPU_TYPE_REF( I11 ),                                                   \
-    CPPU_TYPE_REF( I12 ),                                                   \
-    CPPU_TYPE_REF( I13 ),                                                   \
-    CPPU_TYPE_REF( I14 )                                                    \
+#define XTYPEPROVIDER_IMPL_14( Class, I1,I2,I3,I4,I5,I6,I7,I8,I9,I10,I11,I12,I13,I14 )	\
+XTYPEPROVIDER_COMMON_IMPL( Class )											\
+GETTYPES_IMPL_START( Class )                                  				\
+    CPPU_TYPE_REF( I1 ),													\
+    CPPU_TYPE_REF( I2 ),             										\
+    CPPU_TYPE_REF( I3 ),             										\
+    CPPU_TYPE_REF( I4 ),             										\
+    CPPU_TYPE_REF( I5 ),             										\
+    CPPU_TYPE_REF( I6 ),            										\
+    CPPU_TYPE_REF( I7 ),             										\
+    CPPU_TYPE_REF( I8 ),             										\
+    CPPU_TYPE_REF( I9 ),             										\
+    CPPU_TYPE_REF( I10 ),            										\
+    CPPU_TYPE_REF( I11 ),            										\
+    CPPU_TYPE_REF( I12 ),            										\
+    CPPU_TYPE_REF( I13 ),            										\
+    CPPU_TYPE_REF( I14 )            										\
 GETTYPES_IMPL_END
 
 // 15 interfaces supported
-#define XTYPEPROVIDER_IMPL_15( Class, I1,I2,I3,I4,I5,I6,I7,I8,I9,I10,I11,I12,I13,I14,I15 )  \
-XTYPEPROVIDER_COMMON_IMPL( Class )                                          \
-GETTYPES_IMPL_START( Class )                                                \
-    CPPU_TYPE_REF( I1 ),                                                    \
-    CPPU_TYPE_REF( I2 ),                                                    \
-    CPPU_TYPE_REF( I3 ),                                                    \
-    CPPU_TYPE_REF( I4 ),                                                    \
-    CPPU_TYPE_REF( I5 ),                                                    \
-    CPPU_TYPE_REF( I6 ),                                                    \
-    CPPU_TYPE_REF( I7 ),                                                    \
-    CPPU_TYPE_REF( I8 ),                                                    \
-    CPPU_TYPE_REF( I9 ),                                                    \
-    CPPU_TYPE_REF( I10 ),                                                   \
-    CPPU_TYPE_REF( I11 ),                                                   \
-    CPPU_TYPE_REF( I12 ),                                                   \
-    CPPU_TYPE_REF( I13 ),                                                   \
-    CPPU_TYPE_REF( I14 ),                                                   \
-    CPPU_TYPE_REF( I15 )                                                    \
+#define XTYPEPROVIDER_IMPL_15( Class, I1,I2,I3,I4,I5,I6,I7,I8,I9,I10,I11,I12,I13,I14,I15 )	\
+XTYPEPROVIDER_COMMON_IMPL( Class )											\
+GETTYPES_IMPL_START( Class )                                  				\
+    CPPU_TYPE_REF( I1 ),													\
+    CPPU_TYPE_REF( I2 ),             										\
+    CPPU_TYPE_REF( I3 ),             										\
+    CPPU_TYPE_REF( I4 ),             										\
+    CPPU_TYPE_REF( I5 ),             										\
+    CPPU_TYPE_REF( I6 ),            										\
+    CPPU_TYPE_REF( I7 ),             										\
+    CPPU_TYPE_REF( I8 ),             										\
+    CPPU_TYPE_REF( I9 ),             										\
+    CPPU_TYPE_REF( I10 ),            										\
+    CPPU_TYPE_REF( I11 ),            										\
+    CPPU_TYPE_REF( I12 ),            										\
+    CPPU_TYPE_REF( I13 ),            										\
+    CPPU_TYPE_REF( I14 ),            										\
+    CPPU_TYPE_REF( I15 )             										\
 GETTYPES_IMPL_END
 
 //=========================================================================
@@ -586,24 +586,24 @@ GETTYPES_IMPL_END
 //
 //=========================================================================
 
-#define XSERVICEINFO_NOFACTORY_DECL()                                       \
-    virtual rtl::OUString SAL_CALL                                          \
+#define XSERVICEINFO_NOFACTORY_DECL()										\
+    virtual rtl::OUString SAL_CALL											\
     getImplementationName()                                                 \
         throw( com::sun::star::uno::RuntimeException );                     \
     virtual sal_Bool SAL_CALL                                               \
-    supportsService( const rtl::OUString& ServiceName )                     \
+    supportsService( const rtl::OUString& ServiceName )                   	\
         throw( com::sun::star::uno::RuntimeException );                     \
     virtual com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL         \
     getSupportedServiceNames()                                              \
         throw( com::sun::star::uno::RuntimeException );                     \
                                                                             \
-    static rtl::OUString                                                    \
+    static rtl::OUString                                                  	\
     getImplementationName_Static();                                         \
     static com::sun::star::uno::Sequence< rtl::OUString >                   \
     getSupportedServiceNames_Static();
 
-#define XSERVICEINFO_DECL()                                                 \
-    XSERVICEINFO_NOFACTORY_DECL()                                           \
+#define XSERVICEINFO_DECL()													\
+    XSERVICEINFO_NOFACTORY_DECL()											\
                                                                             \
     static com::sun::star::uno::Reference<                                  \
             com::sun::star::lang::XSingleServiceFactory >                   \
@@ -616,25 +616,25 @@ GETTYPES_IMPL_END
 //
 //=========================================================================
 
-#define XSERVICEINFO_COMMOM_IMPL( Class, ImplName )                         \
-rtl::OUString SAL_CALL Class::getImplementationName()                       \
-    throw( com::sun::star::uno::RuntimeException )                          \
+#define XSERVICEINFO_COMMOM_IMPL( Class, ImplName )							\
+rtl::OUString SAL_CALL Class::getImplementationName()						\
+    throw( com::sun::star::uno::RuntimeException )                         	\
 {                                                                           \
     return getImplementationName_Static();                                  \
 }                                                                           \
                                                                             \
-rtl::OUString Class::getImplementationName_Static()                         \
+rtl::OUString Class::getImplementationName_Static()                       	\
 {                                                                           \
     return ImplName;                                                        \
 }                                                                           \
                                                                             \
 sal_Bool SAL_CALL                                                           \
-Class::supportsService( const rtl::OUString& ServiceName )                  \
+Class::supportsService(	const rtl::OUString& ServiceName )                	\
     throw( com::sun::star::uno::RuntimeException )                          \
 {                                                                           \
     com::sun::star::uno::Sequence< rtl::OUString > aSNL =                   \
                                         getSupportedServiceNames();         \
-    const rtl::OUString* pArray = aSNL.getArray();                          \
+    const rtl::OUString* pArray = aSNL.getArray();                       	\
     for( sal_Int32 i = 0; i < aSNL.getLength(); i++ )                       \
     {                                                                       \
         if( pArray[ i ] == ServiceName )                                    \
@@ -651,9 +651,9 @@ Class::getSupportedServiceNames()                                           \
     return getSupportedServiceNames_Static();                               \
 }
 
-#define XSERVICEINFO_CREATE_INSTANCE_IMPL( Class )                          \
-static com::sun::star::uno::Reference<                                      \
-                                com::sun::star::uno::XInterface > SAL_CALL  \
+#define XSERVICEINFO_CREATE_INSTANCE_IMPL( Class )							\
+static com::sun::star::uno::Reference<										\
+                                com::sun::star::uno::XInterface > SAL_CALL	\
 Class##_CreateInstance( const com::sun::star::uno::Reference<               \
                 com::sun::star::lang::XMultiServiceFactory> & rSMgr )       \
     throw( com::sun::star::uno::Exception )                                 \
@@ -670,30 +670,30 @@ Class##_CreateInstance( const com::sun::star::uno::Reference<               \
 //
 //=========================================================================
 
-#define ONE_INSTANCE_SERVICE_FACTORY_IMPL( Class )                          \
+#define ONE_INSTANCE_SERVICE_FACTORY_IMPL( Class )	  						\
 com::sun::star::uno::Reference<                                             \
-                        com::sun::star::lang::XSingleServiceFactory >       \
-Class::createServiceFactory( const com::sun::star::uno::Reference<          \
+                        com::sun::star::lang::XSingleServiceFactory >    	\
+Class::createServiceFactory( const com::sun::star::uno::Reference<         	\
             com::sun::star::lang::XMultiServiceFactory >& rxServiceMgr )    \
 {                                                                           \
-    return com::sun::star::uno::Reference<                                  \
+    return com::sun::star::uno::Reference<                					\
         com::sun::star::lang::XSingleServiceFactory >(                      \
-            cppu::createOneInstanceFactory(                                 \
+            cppu::createOneInstanceFactory(                               	\
                 rxServiceMgr,                                               \
                 Class::getImplementationName_Static(),                      \
                 Class##_CreateInstance,                                     \
                 Class::getSupportedServiceNames_Static() ) );               \
 }
 
-#define SINGLE_SERVICE_FACTORY_IMPL( Class )                                \
-com::sun::star::uno::Reference<                                             \
-                        com::sun::star::lang::XSingleServiceFactory >       \
-Class::createServiceFactory( const com::sun::star::uno::Reference<          \
+#define SINGLE_SERVICE_FACTORY_IMPL( Class )							   	\
+com::sun::star::uno::Reference< 											\
+                        com::sun::star::lang::XSingleServiceFactory >    	\
+Class::createServiceFactory( const com::sun::star::uno::Reference<         	\
             com::sun::star::lang::XMultiServiceFactory >& rxServiceMgr )    \
 {                                                                           \
-    return com::sun::star::uno::Reference<                                  \
+    return com::sun::star::uno::Reference<                 					\
         com::sun::star::lang::XSingleServiceFactory >(                      \
-            cppu::createSingleFactory(                                      \
+            cppu::createSingleFactory(                               		\
                 rxServiceMgr,                                               \
                 Class::getImplementationName_Static(),                      \
                 Class##_CreateInstance,                                     \
@@ -703,15 +703,15 @@ Class::createServiceFactory( const com::sun::star::uno::Reference<          \
 // Service without service factory.
 
 // Own implementation of getSupportedServiceNames_Static().
-#define XSERVICEINFO_NOFACTORY_IMPL_0( Class, ImplName )                    \
-XSERVICEINFO_COMMOM_IMPL( Class, ImplName )                                 \
+#define XSERVICEINFO_NOFACTORY_IMPL_0( Class, ImplName )					\
+XSERVICEINFO_COMMOM_IMPL( Class, ImplName )									\
                                                                             \
 com::sun::star::uno::Sequence< rtl::OUString >                              \
 Class::getSupportedServiceNames_Static()
 
 // 1 service name
-#define XSERVICEINFO_NOFACTORY_IMPL_1( Class, ImplName, Service1 )          \
-XSERVICEINFO_COMMOM_IMPL( Class, ImplName )                                 \
+#define XSERVICEINFO_NOFACTORY_IMPL_1( Class, ImplName, Service1 )			\
+XSERVICEINFO_COMMOM_IMPL( Class, ImplName )									\
                                                                             \
 com::sun::star::uno::Sequence< rtl::OUString >                              \
 Class::getSupportedServiceNames_Static()                                    \
@@ -724,17 +724,17 @@ Class::getSupportedServiceNames_Static()                                    \
 // Service with service factory.
 
 // Own implementation of getSupportedServiceNames_Static().
-#define XSERVICEINFO_IMPL_0( Class, ImplName )                              \
-XSERVICEINFO_COMMOM_IMPL( Class, ImplName )                                 \
-XSERVICEINFO_CREATE_INSTANCE_IMPL( Class )                                  \
+#define XSERVICEINFO_IMPL_0( Class, ImplName )								\
+XSERVICEINFO_COMMOM_IMPL( Class, ImplName )									\
+XSERVICEINFO_CREATE_INSTANCE_IMPL( Class )									\
                                                                             \
 com::sun::star::uno::Sequence< rtl::OUString >                              \
 Class::getSupportedServiceNames_Static()
 
 // 1 service name
-#define XSERVICEINFO_IMPL_1( Class, ImplName, Service1 )                    \
-XSERVICEINFO_COMMOM_IMPL( Class, ImplName )                                 \
-XSERVICEINFO_CREATE_INSTANCE_IMPL( Class )                                  \
+#define XSERVICEINFO_IMPL_1( Class, ImplName, Service1 )					\
+XSERVICEINFO_COMMOM_IMPL( Class, ImplName )									\
+XSERVICEINFO_CREATE_INSTANCE_IMPL( Class )									\
                                                                             \
 com::sun::star::uno::Sequence< rtl::OUString >                              \
 Class::getSupportedServiceNames_Static()                                    \
diff --git a/ucbhelper/inc/ucbhelper/propertyvalueset.hxx b/ucbhelper/inc/ucbhelper/propertyvalueset.hxx
index 82d440df0c02..0a909e392220 100644
--- a/ucbhelper/inc/ucbhelper/propertyvalueset.hxx
+++ b/ucbhelper/inc/ucbhelper/propertyvalueset.hxx
@@ -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
@@ -71,10 +71,10 @@ class UCBHELPER_DLLPUBLIC PropertyValueSet :
                                      m_xSMgr;
     com::sun::star::uno::Reference< com::sun::star::script::XTypeConverter >
                                      m_xTypeConverter;
-    osl::Mutex      m_aMutex;
+    osl::Mutex		m_aMutex;
     PropertyValues* m_pValues;
-    sal_Bool        m_bWasNull;
-    sal_Bool        m_bTriedToGetTypeConverter;
+    sal_Bool 		m_bWasNull;
+    sal_Bool    	m_bTriedToGetTypeConverter;
 
 private:
     UCBHELPER_DLLPRIVATE const com::sun::star::uno::Reference<
@@ -406,10 +406,10 @@ public:
     }
 
     /**
-      * This method tries to append all property values contained in a
+      *	This method tries to append all property values contained in a
       * property set to the value set.
       *
-       *    @param  rSet is a property set containing the property values.
+       *	@param  rSet is a property set containing the property values.
       */
     void appendPropertySet( const ::com::sun::star::uno::Reference<
                                 ::com::sun::star::beans::XPropertySet >& rSet );
@@ -417,10 +417,10 @@ public:
     /** This method tries to append a single property value contained in a
       * property set to the value set.
       *
-       *    @param  rSet is a property set containing the property values.
-       *    @param  rProperty is the property for that the value shall be obtained
-      *         from the given property set.
-       *    @return False, if the property value cannot be obtained from the
+       *	@param  rSet is a property set containing the property values.
+       *	@param  rProperty is the property for that the value shall be obtained
+      *	        from the given property set.
+       *	@return False, if the property value cannot be obtained	from the
       *         given property pet. True, otherwise.
        */
     sal_Bool appendPropertySetValue(
diff --git a/ucbhelper/inc/ucbhelper/providerhelper.hxx b/ucbhelper/inc/ucbhelper/providerhelper.hxx
index 2c9c89294fc8..50be222b7e4b 100644
--- a/ucbhelper/inc/ucbhelper/providerhelper.hxx
+++ b/ucbhelper/inc/ucbhelper/providerhelper.hxx
@@ -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
@@ -85,7 +85,7 @@ class UCBHELPER_DLLPUBLIC ContentProviderImplHelper : public cppu::OWeakObject,
 protected:
     osl::Mutex m_aMutex;
     ::com::sun::star::uno::Reference<
-            ::com::sun::star::lang::XMultiServiceFactory >  m_xSMgr;
+            ::com::sun::star::lang::XMultiServiceFactory >	m_xSMgr;
 
 private:
     UCBHELPER_DLLPRIVATE void removeContent( ContentImplHelper* pContent );
@@ -98,8 +98,8 @@ private:
 
 protected:
     /**
-      * This method returns a content with the given id, if it already exists.
-      * Use this method in your "queryContent" implementation to ensure unique
+      *	This method returns a content with the given id, if it already exists.
+      *	Use this method in your "queryContent" implementation to ensure unique
       * objects.
       *
       * @param  Identifier is the content identifier, for that an existing
@@ -112,7 +112,7 @@ protected:
                    ::com::sun::star::ucb::XContentIdentifier >& Identifier );
 
     /**
-      * This method returns a content with the given URL, if it already exists.
+      *	This method returns a content with the given URL, if it already exists.
       *
       * @param  rURL is the URL ( content identifier string ), for that an
       *         existing content object is requested.
@@ -123,21 +123,21 @@ protected:
     queryExistingContent( const ::rtl::OUString& rURL );
 
     /**
-      * This method registers a newly created content instance with the
+      *	This method registers a newly created content instance with the
       * content provider. It should be called directly after creating a new
       * content instance. The provider can reuse a registered instance upon
       * subsedent requests for content instances with an idententifier
-      * of a registered instance.
-      * Note that the provider does not hold a hard reference on the
-      * registered instance. If last external reference is gone, the provider
+      * of a registered instance. 
+      * Note that the provider does not hold a hard reference on the 
+      * registered instance. If last external reference is gone, the provider 
       * will remove the instance from its inventory of known instances.
       * Nothing will happen in case an already registered instance shall
       * be registered more than once.
       *
       * @param  the content instance that is to be registered.
      */
-    void registerNewContent(
-        const com::sun::star::uno::Reference<
+    void registerNewContent( 
+        const com::sun::star::uno::Reference< 
             ::com::sun::star::ucb::XContent > & xContent );
 
 public:
@@ -182,15 +182,15 @@ public:
     //////////////////////////////////////////////////////////////////////
 
     /**
-      * This method returns a content with the requested id.
+      *	This method returns a content with the requested id.
       *
-      * The implementation should:
+      *	The implementation should:
       *
-      * - Check, whether the Identifier is valid ( URL syntax ).
-      * - Use queryExistingContent(...) to determine, whether there exists
-      *   already a content with the given id.
-      * - Return the possibly existing content.Create and return a new
-      *   content, otherwise
+      *	- Check, whether the Identifier is valid ( URL syntax ).
+      *	- Use queryExistingContent(...) to determine, whether there exists
+      *	  already a content with the given id.
+      *	- Return the possibly existing content.Create and return a new
+      *	  content, otherwise
       */
     virtual ::com::sun::star::uno::Reference<
                 ::com::sun::star::ucb::XContent > SAL_CALL
@@ -210,7 +210,7 @@ public:
     //////////////////////////////////////////////////////////////////////
 
     /**
-      * This method returns a mutex, which protects the content list of the
+      *	This method returns a mutex, which protects the content list of the
       * provider. So you can prevent modifications of that list easyly.
       *
       * @return the mutex.
@@ -218,7 +218,7 @@ public:
     osl::Mutex& getContentListMutex() { return m_aMutex; }
 
     /**
-      * This method fills a list with all contents existing at calling time.
+      *	This method fills a list with all contents existing at calling time.
       * Note: You may prevent modifications of the content list at any time
       * by acquiring the content list mutex of the provider.
       *
@@ -227,7 +227,7 @@ public:
     void queryExistingContents( ContentRefList& rContents );
 
     /**
-      * This method returns the propertyset containing the Additional Core
+      *	This method returns the propertyset containing the Additional Core
       * Properties of a content.
       *
       * @param  rKey is the key for the propertyset.
@@ -240,7 +240,7 @@ public:
     getAdditionalPropertySet( const ::rtl::OUString& rKey, sal_Bool bCreate );
 
     /**
-      * This method renames the propertyset containing the Additional Core
+      *	This method renames the propertyset containing the Additional Core
       * Properties of a content.
       *
       * @param  rOldKey is the old key of the propertyset.
@@ -254,7 +254,7 @@ public:
                                           sal_Bool bRecursive );
 
     /**
-      * This method copies the propertyset containing the Additional Core
+      *	This method copies the propertyset containing the Additional Core
       * Properties of a content.
       *
       * @param  rSourceKey is the key of the source propertyset.
@@ -268,7 +268,7 @@ public:
                                         sal_Bool bRecursive );
 
     /**
-      * This method removes the propertyset containing the Additional Core
+      *	This method removes the propertyset containing the Additional Core
       * Properties of a content.
       *
       * @param  rKey is the key of the propertyset.
diff --git a/ucbhelper/inc/ucbhelper/proxydecider.hxx b/ucbhelper/inc/ucbhelper/proxydecider.hxx
index 861a33bbf5e4..bb88e36bcd86 100644
--- a/ucbhelper/inc/ucbhelper/proxydecider.hxx
+++ b/ucbhelper/inc/ucbhelper/proxydecider.hxx
@@ -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
diff --git a/ucbhelper/inc/ucbhelper/resultset.hxx b/ucbhelper/inc/ucbhelper/resultset.hxx
index 4835ea9f1eb0..1c7c302022f9 100644
--- a/ucbhelper/inc/ucbhelper/resultset.hxx
+++ b/ucbhelper/inc/ucbhelper/resultset.hxx
@@ -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
@@ -50,7 +50,7 @@ namespace ucbhelper {
 
 //=========================================================================
 
-#define RESULTSET_SERVICE_NAME  "com.sun.star.ucb.ContentResultSet"
+#define RESULTSET_SERVICE_NAME 	"com.sun.star.ucb.ContentResultSet"
 
 //=========================================================================
 
diff --git a/ucbhelper/inc/ucbhelper/resultsethelper.hxx b/ucbhelper/inc/ucbhelper/resultsethelper.hxx
index b0c54a2779c2..b66b18cf93e4 100644
--- a/ucbhelper/inc/ucbhelper/resultsethelper.hxx
+++ b/ucbhelper/inc/ucbhelper/resultsethelper.hxx
@@ -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
@@ -59,7 +59,7 @@ namespace ucbhelper {
   *
   * Features of the base class implementation:
   * - standard interfaces ( XInterface, XTypeProvider, XServiceInfo )
-  * - all required interfaces for service com::sun::star::ucb::DynamicResultSet
+  *	- all required interfaces for service com::sun::star::ucb::DynamicResultSet
   */
 class UCBHELPER_DLLPUBLIC ResultSetImplHelper :
                 public cppu::OWeakObject,
@@ -68,20 +68,20 @@ class UCBHELPER_DLLPUBLIC ResultSetImplHelper :
                 public com::sun::star::ucb::XDynamicResultSet
 {
     cppu::OInterfaceContainerHelper* m_pDisposeEventListeners;
-    sal_Bool                         m_bStatic;
-    sal_Bool                         m_bInitDone;
+    sal_Bool						 m_bStatic;
+    sal_Bool						 m_bInitDone;
 
 protected:
-    osl::Mutex                                           m_aMutex;
-    com::sun::star::ucb::OpenCommandArgument2            m_aCommand;
+    osl::Mutex						 					 m_aMutex;
+    com::sun::star::ucb::OpenCommandArgument2			 m_aCommand;
     com::sun::star::uno::Reference<
-        com::sun::star::lang::XMultiServiceFactory >     m_xSMgr;
+        com::sun::star::lang::XMultiServiceFactory >	 m_xSMgr;
     // Resultset #1
     com::sun::star::uno::Reference<
-        com::sun::star::sdbc::XResultSet >               m_xResultSet1;
+        com::sun::star::sdbc::XResultSet > 				 m_xResultSet1;
     // Resultset #2
     com::sun::star::uno::Reference<
-        com::sun::star::sdbc::XResultSet >               m_xResultSet2;
+        com::sun::star::sdbc::XResultSet > 				 m_xResultSet2;
     // Resultset changes listener.
     com::sun::star::uno::Reference<
         com::sun::star::ucb::XDynamicResultSetListener > m_xListener;
diff --git a/ucbhelper/inc/ucbhelper/resultsetmetadata.hxx b/ucbhelper/inc/ucbhelper/resultsetmetadata.hxx
index cc1e4b550e19..2574fe0bc897 100644
--- a/ucbhelper/inc/ucbhelper/resultsetmetadata.hxx
+++ b/ucbhelper/inc/ucbhelper/resultsetmetadata.hxx
@@ -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
@@ -39,7 +39,7 @@
 #include "ucbhelper/ucbhelperdllapi.h"
 
 namespace com { namespace sun { namespace star {
-    namespace lang  { class XMultiServiceFactory; }
+    namespace lang	{ class XMultiServiceFactory; }
     namespace beans { struct Property; }
 } } }
 
@@ -87,10 +87,10 @@ struct ResultSetColumnData
     ::rtl::OUString schemaName;
 
     /** @see ResultSetMetaData::getPrecision */
-    sal_Int32       precision;
+    sal_Int32 		precision;
 
     /** @see ResultSetMetaData::getScale */
-    sal_Int32       scale;
+    sal_Int32 		scale;
 
     /** @see ResultSetMetaData::getTableName */
     ::rtl::OUString tableName;
@@ -102,13 +102,13 @@ struct ResultSetColumnData
     ::rtl::OUString columnTypeName;
 
     /** @see ResultSetMetaData::isReadOnly */
-    sal_Bool        isReadOnly;
+    sal_Bool 		isReadOnly;
 
     /** @see ResultSetMetaData::isWritable */
-    sal_Bool        isWritable;
+    sal_Bool 		isWritable;
 
     /** @see ResultSetMetaData::isDefinitelyWritable */
-    sal_Bool        isDefinitelyWritable;
+    sal_Bool 		isDefinitelyWritable;
 
     /** @see ResultSetMetaData::getColumnServiceName */
     ::rtl::OUString columnServiceName;
@@ -155,16 +155,16 @@ protected:
     ::com::sun::star::uno::Reference<
         ::com::sun::star::lang::XMultiServiceFactory > m_xSMgr;
     ::com::sun::star::uno::Sequence<
-        ::com::sun::star::beans::Property >            m_aProps;
+        ::com::sun::star::beans::Property > 		   m_aProps;
     sal_Bool m_bReadOnly;
 
 public:
 
     /**
-      * Constructor.
+      *	Constructor.
       *
-      * @param rxSMgr is a Servive Manager.
-      * @param rProps is a sequence of properties (partially) describing the
+      *	@param rxSMgr is a Servive Manager.
+      *	@param rProps is a sequence of properties (partially) describing the
       *        columns of a resultset.
       * @param bReadOnly is used to specify whether the whole(!) resultset
       *        is read-only.
@@ -177,17 +177,17 @@ public:
             sal_Bool bReadOnly = sal_True );
 
     /**
-      * Constructor.
+      *	Constructor.
       *
-      * @param rxSMgr is a Servive Manager.
-      * @param rProps is a sequence of properties (partially) describing the
+      *	@param rxSMgr is a Servive Manager.
+      *	@param rProps is a sequence of properties (partially) describing the
       *        columns of a resultset.
-      * @param rColumnData contains additional meta data for the columns of
-      *        a resultset, which override the default values returned by the
-      *        appropriate methods of this class. The length of rColumnData
-      *        must be the same as length of rProps.
-      *        rColumnData[ 0 ] corresponds to data in rProps[ 0 ],
-      *        rColumnData[ 1 ] corresponds to data in rProps[ 1 ], ...
+      *	@param rColumnData contains additional meta data for the columns of
+      *	       a resultset, which override the default values returned by the
+      *		   appropriate methods of this class. The length of rColumnData
+      *		   must be the same as length of rProps.
+      *		   rColumnData[ 0 ] corresponds to data in rProps[ 0 ],
+      *		   rColumnData[ 1 ] corresponds to data in rProps[ 1 ], ...
       */
     ResultSetMetaData(
             const ::com::sun::star::uno::Reference<
@@ -197,7 +197,7 @@ public:
             const std::vector< ResultSetColumnData >& rColumnData );
 
     /**
-      * Destructor.
+      *	Destructor.
       */
     virtual ~ResultSetMetaData();
 
@@ -212,30 +212,30 @@ public:
     /**
       * Returns the number of columns of the resultset.
       *
-      * @return the length of the property sequence.
+      *	@return the length of the property sequence.
       */
     virtual sal_Int32 SAL_CALL
     getColumnCount()
         throw( ::com::sun::star::sdbc::SQLException,
                ::com::sun::star::uno::RuntimeException );
     /**
-      * Checks whether column is automatically numbered, which makes it
-      * read-only.
+      *	Checks whether column is automatically numbered, which makes it
+      *	read-only.
       *
       * @param  column is the number of the column for that a value shall
       *         be returned. The first column is 1, the second is 2, ...
-      * @return true, if column is automatically numbered.
+      *	@return true, if column is automatically numbered.
       */
     virtual sal_Bool SAL_CALL
     isAutoIncrement( sal_Int32 column )
         throw( ::com::sun::star::sdbc::SQLException,
                ::com::sun::star::uno::RuntimeException );
     /**
-      * Checks whether column is case sensitive.
+      *	Checks whether column is case sensitive.
       *
       * @param  column is the number of the column for that a value shall
       *         be returned. The first column is 1, the second is 2, ...
-      * @return true, if column is case sensitive.
+      *	@return true, if column is case sensitive.
       */
     virtual sal_Bool SAL_CALL
     isCaseSensitive( sal_Int32 column )
@@ -243,35 +243,35 @@ public:
                ::com::sun::star::uno::RuntimeException );
     /**
       * Checks whether the value stored in column can be used in a
-      * WHERE clause.
+      *	WHERE clause.
       *
       * @param  column is the number of the column for that a value shall
       *         be returned. The first column is 1, the second is 2, ...
-      * @return true, if the column is searchable.
+      *	@return true, if the column is searchable.
       */
     virtual sal_Bool SAL_CALL
     isSearchable( sal_Int32 column )
         throw( ::com::sun::star::sdbc::SQLException,
                ::com::sun::star::uno::RuntimeException );
     /**
-      * Checks whether column is a cash value.
+      *	Checks whether column is a cash value.
       *
       * @param  column is the number of the column for that a value shall
       *         be returned. The first column is 1, the second is 2, ...
-      * @return true, if the column is a cash value.
+      *	@return true, if the column is a cash value.
       */
     virtual sal_Bool SAL_CALL
     isCurrency( sal_Int32 column )
         throw( ::com::sun::star::sdbc::SQLException,
                ::com::sun::star::uno::RuntimeException );
     /**
-      * Checks whether a NULL can be stored in column.
+      *	Checks whether a NULL can be stored in column.
       *
-      * @see com::sun::star::sdbc::ColumnValue
+      *	@see com::sun::star::sdbc::ColumnValue
       *
       * @param  column is the number of the column for that a value shall
       *         be returned. The first column is 1, the second is 2, ...
-      * @return ::com::sun::star::sdbc::ColumnValue::NULLABLE, if a NULL
+      *	@return ::com::sun::star::sdbc::ColumnValue::NULLABLE, if a NULL
       *         can be stored in the column.
       */
     virtual sal_Int32 SAL_CALL
@@ -279,100 +279,100 @@ public:
         throw( ::com::sun::star::sdbc::SQLException,
                ::com::sun::star::uno::RuntimeException );
     /**
-      * Checks whether the value stored in column is a signed number.
+      *	Checks whether the value stored in column is a signed number.
       *
       * @param  column is the number of the column for that a value shall
       *         be returned. The first column is 1, the second is 2, ...
-      * @return true, if the value stored in column is a signed number.
+      *	@return true, if the value stored in column is a signed number.
       */
     virtual sal_Bool SAL_CALL
     isSigned( sal_Int32 column )
         throw( ::com::sun::star::sdbc::SQLException,
                ::com::sun::star::uno::RuntimeException );
     /**
-      * Gets the normal maximum width in characters for column.
+      *	Gets the normal maximum width in characters for column.
       *
       * @param  column is the number of the column for that a value shall
       *         be returned. The first column is 1, the second is 2, ...
-      * @return the normal maximum width in characters for column.
+      *	@return the normal maximum width in characters for column.
       */
     virtual sal_Int32 SAL_CALL
     getColumnDisplaySize( sal_Int32 column )
         throw( ::com::sun::star::sdbc::SQLException,
                ::com::sun::star::uno::RuntimeException );
     /**
-      * Gets the suggested column title for column, to be used in print-
-      * outs and displays.
+      *	Gets the suggested column title for column, to be used in print-
+      *	outs and displays.
       *
       * @param  column is the number of the column for that a value shall
       *         be returned. The first column is 1, the second is 2, ...
-      * @return the column label.
+      *	@return the column label.
       */
     virtual ::rtl::OUString SAL_CALL
     getColumnLabel( sal_Int32 column )
         throw( ::com::sun::star::sdbc::SQLException,
                ::com::sun::star::uno::RuntimeException );
     /**
-      * Gets the name of column.
+      *	Gets the name of column.
       *
       * @param  column is the number of the column for that a value shall
       *         be returned. The first column is 1, the second is 2, ...
-      * @return the name of the property that corresponds to column.
+      *	@return the name of the property that corresponds to column.
       */
     virtual ::rtl::OUString SAL_CALL
     getColumnName( sal_Int32 column )
         throw( ::com::sun::star::sdbc::SQLException,
                ::com::sun::star::uno::RuntimeException );
     /**
-      * Gets the schema name for the table from which column of this
-      * result set was derived.
-      * Because this feature is not widely supported, the return value
-      * for many DBMSs will be an empty string.
+      *	Gets the schema name for the table from which column of this
+      *	result set was derived.
+      *	Because this feature is not widely supported, the return value
+      *	for many DBMSs will be an empty string.
       *
       * @param  column is the number of the column for that a value shall
       *         be returned. The first column is 1, the second is 2, ...
-      * @return the schema name of column or an empty string.
+      *	@return the schema name of column or an empty string.
       */
     virtual ::rtl::OUString SAL_CALL
     getSchemaName( sal_Int32 column )
         throw( ::com::sun::star::sdbc::SQLException,
                ::com::sun::star::uno::RuntimeException );
     /**
-      * For number types, getprecision gets the number of decimal digits
-      * in column.
-      * For character types, it gets the maximum length in characters for
-      * column.
-      * For binary types, it gets the maximum length in bytes for column.
+      *	For number types, getprecision gets the number of decimal digits
+      *	in column.
+      *	For character types, it gets the maximum length in characters for
+      *	column.
+      *	For binary types, it gets the maximum length in bytes for column.
       *
       * @param  column is the number of the column for that a value shall
       *         be returned. The first column is 1, the second is 2, ...
-      * @return the precision for the column.
+      *	@return the precision for the column.
       */
     virtual sal_Int32 SAL_CALL
     getPrecision( sal_Int32 column )
         throw( ::com::sun::star::sdbc::SQLException,
                ::com::sun::star::uno::RuntimeException );
     /**
-      * Gets the number of digits to the right of the decimal point for
-      * values in column.
+      *	Gets the number of digits to the right of the decimal point for
+      *	values in column.
       *
       * @param  column is the number of the column for that a value shall
       *         be returned. The first column is 1, the second is 2, ...
-      * @return the scale of the column.
+      *	@return the scale of the column.
       */
     virtual sal_Int32 SAL_CALL
     getScale( sal_Int32 column )
         throw( ::com::sun::star::sdbc::SQLException,
                ::com::sun::star::uno::RuntimeException );
     /**
-      * Gets the name of the table from which column of this result set
-      * was derived or "" if there is none (for example, for a join).
-      * Because this feature is not widely supported, the return value
-      * for many DBMSs will be an empty string.
+      *	Gets the name of the table from which column of this result set
+      *	was derived or "" if there is none (for example, for a join).
+      *	Because this feature is not widely supported, the return value
+      *	for many DBMSs will be an empty string.
       *
       * @param  column is the number of the column for that a value shall
       *         be returned. The first column is 1, the second is 2, ...
-      * @return the table name for column or an empty string.
+      *	@return the table name for column or an empty string.
       */
     virtual ::rtl::OUString SAL_CALL
     getTableName( sal_Int32 column )
@@ -380,27 +380,27 @@ public:
                ::com::sun::star::uno::RuntimeException );
     virtual ::rtl::OUString SAL_CALL
     /**
-      * Gets the catalog name for the table from which column of this
-      * result set was derived.
-      * Because this feature is not widely supported, the return value
-      * for many DBMSs will be an empty string.
+      *	Gets the catalog name for the table from which column of this
+      *	result set was derived.
+      *	Because this feature is not widely supported, the return value
+      *	for many DBMSs will be an empty string.
       *
       * @param  column is the number of the column for that a value shall
       *         be returned. The first column is 1, the second is 2, ...
-      * @return the catalog name for column or an empty string.
+      *	@return the catalog name for column or an empty string.
       */
     getCatalogName( sal_Int32 column )
         throw( ::com::sun::star::sdbc::SQLException,
                ::com::sun::star::uno::RuntimeException );
     /**
-      * Gets the JDBC type for the value stored in column. ... The STRUCT
-      * and DISTINCT type codes are always returned for structured and
-      * distinct types, regardless of whether the value will be mapped
-      * according to the standard mapping or be a custom mapping.
+      *	Gets the JDBC type for the value stored in column. ... The STRUCT
+      *	and DISTINCT type codes are always returned for structured and
+      *	distinct types, regardless of whether the value will be mapped
+      *	according to the standard mapping or be a custom mapping.
       *
       * @param  column is the number of the column for that a value shall
       *         be returned. The first column is 1, the second is 2, ...
-      * @return the type of the property that corresponds to column - mapped
+      *	@return the type of the property that corresponds to column - mapped
       *         from UNO-Type to SQL-Type.
       */
     virtual sal_Int32 SAL_CALL
@@ -408,14 +408,14 @@ public:
         throw( ::com::sun::star::sdbc::SQLException,
                ::com::sun::star::uno::RuntimeException );
     /**
-      * Gets the type name used by this particular data source for the
-      * values stored in column. If the type code for the type of value
-      * stored in column is STRUCT, DISTINCT or JAVA_OBJECT, this method
-      * returns a fully-qualified SQL type name.
+      *	Gets the type name used by this particular data source for the
+      *	values stored in column. If the type code for the type of value
+      *	stored in column is STRUCT, DISTINCT or JAVA_OBJECT, this method
+      *	returns a fully-qualified SQL type name.
       *
       * @param  column is the number of the column for that a value shall
       *         be returned. The first column is 1, the second is 2, ...
-      * @return the column type name.
+      *	@return the column type name.
       */
     virtual ::rtl::OUString SAL_CALL
     getColumnTypeName( sal_Int32 column )
@@ -426,7 +426,7 @@ public:
       *
       * @param  column is the number of the column for that a value shall
       *         be returned. The first column is 1, the second is 2, ...
-      * @return true, if the column is definetely not writable.
+      *	@return true, if the column is definetely not writable.
       */
     virtual sal_Bool SAL_CALL
     isReadOnly( sal_Int32 column )
@@ -437,7 +437,7 @@ public:
       *
       * @param  column is the number of the column for that a value shall
       *         be returned. The first column is 1, the second is 2, ...
-      * @return true, if it is possible for a write to succeed.
+      *	@return true, if it is possible for a write to succeed.
       */
     virtual sal_Bool SAL_CALL
     isWritable( sal_Int32 column )
@@ -448,7 +448,7 @@ public:
       *
       * @param  column is the number of the column for that a value shall
       *         be returned. The first column is 1, the second is 2, ...
-      * @return true, if a write on the column will definetely succeed.
+      *	@return true, if a write on the column will definetely succeed.
       */
     virtual sal_Bool SAL_CALL
     isDefinitelyWritable( sal_Int32 column )
@@ -456,13 +456,13 @@ public:
                ::com::sun::star::uno::RuntimeException );
     /**
       * Returns the fully-qualified name of the service whose instances
-      * are manufactured if the method
+      *	are manufactured if the method
       * com::sun::star::sdbc::ResultSet::getObject is called to retrieve a
       * value from the column.
       *
       * @param  column is the number of the column for that a value shall
       *         be returned. The first column is 1, the second is 2, ...
-      * @return the service name for column or an empty string, if no service
+      *	@return the service name for column or an empty string, if no service
       *         is applicable.
       */
     virtual ::rtl::OUString SAL_CALL
diff --git a/ucbhelper/inc/ucbhelper/simpleauthenticationrequest.hxx b/ucbhelper/inc/ucbhelper/simpleauthenticationrequest.hxx
index 87fcb1b55dd7..699850b02e60 100644
--- a/ucbhelper/inc/ucbhelper/simpleauthenticationrequest.hxx
+++ b/ucbhelper/inc/ucbhelper/simpleauthenticationrequest.hxx
@@ -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
@@ -113,7 +113,7 @@ public:
       * @param rPassword contains a password, if available (for instance from
       *        a previous try).
       * @param rAccount contains an account, if applicable.
-      * @param bAllowPersistentStoring specifies if the credentials should
+      * @param bAllowPersistentStoring specifies if the credentials should 
       *        be stored in the passowrd container persistently
       * @param bAllowUseSystemCredntials specifies if requesting client is
       *        able to obtain and use system credentials for authentication
@@ -178,7 +178,7 @@ public:
       * @param eAccountType specifies whether an account is applicable and
                modifiable.
       * @param rAccount contains an account, if applicable.
-      * @param bAllowPersistentStoring specifies if the credentials should
+      * @param bAllowPersistentStoring specifies if the credentials should 
       *        be stored in the passowrd container persistently
       * @param bAllowUseSystemCredntials specifies if requesting client is
       *        able to obtain and use system credentials for authentication
diff --git a/ucbhelper/inc/ucbhelper/simplecertificatevalidationrequest.hxx b/ucbhelper/inc/ucbhelper/simplecertificatevalidationrequest.hxx
index 213f504c7f61..b7e9c0a61a9e 100755
--- a/ucbhelper/inc/ucbhelper/simplecertificatevalidationrequest.hxx
+++ b/ucbhelper/inc/ucbhelper/simplecertificatevalidationrequest.hxx
@@ -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
diff --git a/ucbhelper/inc/ucbhelper/simpleinteractionrequest.hxx b/ucbhelper/inc/ucbhelper/simpleinteractionrequest.hxx
index 9bb1d0bff119..0bd2d80f026f 100644
--- a/ucbhelper/inc/ucbhelper/simpleinteractionrequest.hxx
+++ b/ucbhelper/inc/ucbhelper/simpleinteractionrequest.hxx
@@ -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
diff --git a/ucbhelper/inc/ucbhelper/simpleioerrorrequest.hxx b/ucbhelper/inc/ucbhelper/simpleioerrorrequest.hxx
index 44987fadd0aa..af05f19316a8 100644
--- a/ucbhelper/inc/ucbhelper/simpleioerrorrequest.hxx
+++ b/ucbhelper/inc/ucbhelper/simpleioerrorrequest.hxx
@@ -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
diff --git a/ucbhelper/inc/ucbhelper/simplenameclashresolverequest.hxx b/ucbhelper/inc/ucbhelper/simplenameclashresolverequest.hxx
index 7f3da27ece7c..9187c6286b52 100644
--- a/ucbhelper/inc/ucbhelper/simplenameclashresolverequest.hxx
+++ b/ucbhelper/inc/ucbhelper/simplenameclashresolverequest.hxx
@@ -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
diff --git a/ucbhelper/inc/ucbhelper/ucbhelperdllapi.h b/ucbhelper/inc/ucbhelper/ucbhelperdllapi.h
index edb8c0ee350e..031538429af7 100644
--- a/ucbhelper/inc/ucbhelper/ucbhelperdllapi.h
+++ b/ucbhelper/inc/ucbhelper/ucbhelperdllapi.h
@@ -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
@@ -27,15 +27,15 @@
 
 #ifndef INCLUDED_UCBHELPERDLLAPI_H
 #define INCLUDED_UCBHELPERDLLAPI_H
-
+                                                                                                                             
 #include "sal/types.h"
-
+                                                                                                                             
 #if defined(UCBHELPER_DLLIMPLEMENTATION)
 #define UCBHELPER_DLLPUBLIC  SAL_DLLPUBLIC_EXPORT
 #else
 #define UCBHELPER_DLLPUBLIC  SAL_DLLPUBLIC_IMPORT
 #endif
 #define UCBHELPER_DLLPRIVATE SAL_DLLPRIVATE
-
+                                                                                                                             
 #endif /* INCLUDED_UCBHELPERDLLAPI_H */
 
diff --git a/ucbhelper/source/client/activedatasink.cxx b/ucbhelper/source/client/activedatasink.cxx
index 029fb60e616f..a812a5b933d1 100644
--- a/ucbhelper/source/client/activedatasink.cxx
+++ b/ucbhelper/source/client/activedatasink.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
diff --git a/ucbhelper/source/client/activedatastreamer.cxx b/ucbhelper/source/client/activedatastreamer.cxx
index 5f26334ab376..eab31594304a 100644
--- a/ucbhelper/source/client/activedatastreamer.cxx
+++ b/ucbhelper/source/client/activedatastreamer.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
diff --git a/ucbhelper/source/client/commandenvironment.cxx b/ucbhelper/source/client/commandenvironment.cxx
index 75a137faeb5b..1786ae31e30d 100644
--- a/ucbhelper/source/client/commandenvironment.cxx
+++ b/ucbhelper/source/client/commandenvironment.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
@@ -63,7 +63,7 @@ struct CommandEnvironment_Impl
     Reference< XProgressHandler >    m_xProgressHandler;
 
     CommandEnvironment_Impl(
-        const Reference< XInteractionHandler >& rxInteractionHandler,
+        const Reference< XInteractionHandler >&	rxInteractionHandler,
         const Reference< XProgressHandler >& rxProgressHandler )
     : m_xInteractionHandler( rxInteractionHandler ),
       m_xProgressHandler( rxProgressHandler ) {}
@@ -78,7 +78,7 @@ struct CommandEnvironment_Impl
 //=========================================================================
 
 CommandEnvironment::CommandEnvironment(
-        const Reference< XInteractionHandler >& rxInteractionHandler,
+        const Reference< XInteractionHandler >&	rxInteractionHandler,
         const Reference< XProgressHandler >& rxProgressHandler )
 {
     m_pImpl = new CommandEnvironment_Impl( rxInteractionHandler,
diff --git a/ucbhelper/source/client/content.cxx b/ucbhelper/source/client/content.cxx
index 4debb1728bfe..d167d38f1fd1 100644
--- a/ucbhelper/source/client/content.cxx
+++ b/ucbhelper/source/client/content.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
diff --git a/ucbhelper/source/client/contentbroker.cxx b/ucbhelper/source/client/contentbroker.cxx
index 408ff6af0dee..1e627564df8b 100644
--- a/ucbhelper/source/client/contentbroker.cxx
+++ b/ucbhelper/source/client/contentbroker.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
@@ -257,10 +257,10 @@ ContentBroker* ContentBroker::get()
 
 ContentBroker_Impl::~ContentBroker_Impl()
 {
-    Reference< XComponent > xComponent( m_xProvider, UNO_QUERY );
+    Reference< XComponent > xComponent(	m_xProvider, UNO_QUERY );
     if ( xComponent.is() )
     {
-        m_xIdFac       = 0;
+        m_xIdFac 	   = 0;
         m_xProvider    = 0;
         m_xProviderMgr = 0;
 
diff --git a/ucbhelper/source/client/fileidentifierconverter.cxx b/ucbhelper/source/client/fileidentifierconverter.cxx
index 64bc428a9934..a37c1ec7fe1e 100644
--- a/ucbhelper/source/client/fileidentifierconverter.cxx
+++ b/ucbhelper/source/client/fileidentifierconverter.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
diff --git a/ucbhelper/source/client/interceptedinteraction.cxx b/ucbhelper/source/client/interceptedinteraction.cxx
index a23206f615f3..abccf33a0c78 100644
--- a/ucbhelper/source/client/interceptedinteraction.cxx
+++ b/ucbhelper/source/client/interceptedinteraction.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
@@ -62,7 +62,7 @@ void InterceptedInteraction::setInterceptedHandler(const css::uno::Reference< cs
 -----------------------------------------------*/
 void InterceptedInteraction::setInterceptions(const ::std::vector< InterceptedRequest >& lInterceptions)
 {
-    m_lInterceptions = lInterceptions;
+    m_lInterceptions = lInterceptions; 
 }
 
 /*-----------------------------------------------
@@ -83,18 +83,18 @@ css::uno::Reference< css::task::XInteractionContinuation > InterceptedInteractio
                                                                                                        const css::uno::Type&                                                                   aType         )
 {
     const css::uno::Reference< css::task::XInteractionContinuation >* pContinuations = lContinuations.getConstArray();
-
+    
     sal_Int32 c = lContinuations.getLength();
     sal_Int32 i = 0;
-
+    
     for (i=0; i<c; ++i)
     {
         css::uno::Reference< css::uno::XInterface > xCheck(pContinuations[i], css::uno::UNO_QUERY);
         if (xCheck->queryInterface(aType).hasValue())
             return pContinuations[i];
     }
-
-    return css::uno::Reference< css::task::XInteractionContinuation >();
+    
+    return css::uno::Reference< css::task::XInteractionContinuation >(); 
 }
 
 /*-----------------------------------------------
@@ -112,7 +112,7 @@ void SAL_CALL InterceptedInteraction::handle(const css::uno::Reference< css::tas
 void InterceptedInteraction::impl_handleDefault(const ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionRequest >& xRequest)
 {
     EInterceptionState eState = impl_interceptRequest(xRequest);
-
+    
     switch(eState)
     {
         case E_NOT_INTERCEPTED:
@@ -123,7 +123,7 @@ void InterceptedInteraction::impl_handleDefault(const ::com::sun::star::uno::Ref
                 m_xInterceptedHandler->handle(xRequest);
         }
         break;
-
+        
         case E_NO_CONTINUATION_FOUND:
         {
             // Runtime error! The defined continuation could not be located
@@ -132,7 +132,7 @@ void InterceptedInteraction::impl_handleDefault(const ::com::sun::star::uno::Ref
             OSL_ENSURE(sal_False, "InterceptedInteraction::handle()\nCould intercept this interaction request - but cant locate the right continuation!");
         }
         break;
-
+        
         case E_INTERCEPTED:
         break;
     }
@@ -146,7 +146,7 @@ InterceptedInteraction::EInterceptionState InterceptedInteraction::impl_intercep
     css::uno::Any                                                                    aRequest       = xRequest->getRequest();
     css::uno::Type                                                                   aRequestType   = aRequest.getValueType();
     css::uno::Sequence< css::uno::Reference< css::task::XInteractionContinuation > > lContinuations = xRequest->getContinuations();
-
+    
     // check against the list of static requests
     sal_Int32 nHandle = 0;
     ::std::vector< InterceptedRequest >::const_iterator pIt;
@@ -155,15 +155,15 @@ InterceptedInteraction::EInterceptionState InterceptedInteraction::impl_intercep
          ++pIt                            )
     {
         const InterceptedRequest& rInterception = *pIt;
-        css::uno::Type aInterceptedType = rInterception.Request.getValueType();
-
+        css::uno::Type aInterceptedType = rInterception.Request.getValueType(); 
+        
         // check the request
         sal_Bool bMatch = sal_False;
         if (rInterception.MatchExact)
             bMatch = aInterceptedType.equals(aRequestType);
         else
             bMatch = aInterceptedType.isAssignableFrom(aRequestType); // dont change intercepted and request type here -> it will check the wrong direction!
-
+        
         // intercepted ...
         // Call they might existing derived class, so they can handle that by its own.
         // If its not interested on that (may be its not overwritten and the default implementation
@@ -175,10 +175,10 @@ InterceptedInteraction::EInterceptionState InterceptedInteraction::impl_intercep
                 break;
             return eState;
         }
-
-        ++nHandle;
+        
+        ++nHandle;        
     }
-
+    
     if (pIt != m_lInterceptions.end()) // => can be true only if bMatch=TRUE!
     {
         // match -> search required continuation
@@ -189,12 +189,12 @@ InterceptedInteraction::EInterceptionState InterceptedInteraction::impl_intercep
             xContinuation->select();
             return E_INTERCEPTED;
         }
-
+        
         // Can be reached only, if the request does not support the given continuation!
         // => RuntimeError!?
         return E_NO_CONTINUATION_FOUND;
     }
-
+    
     return E_NOT_INTERCEPTED;
 }
 
diff --git a/ucbhelper/source/client/proxydecider.cxx b/ucbhelper/source/client/proxydecider.cxx
index 8505472e1b1f..e14c5eacbe7e 100644
--- a/ucbhelper/source/client/proxydecider.cxx
+++ b/ucbhelper/source/client/proxydecider.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
@@ -92,7 +92,7 @@ class HostnameCache
     typedef std::pair< rtl::OUString, rtl::OUString > HostListEntry;
 
     std::list< HostListEntry >     m_aHostList;
-    sal_uInt32                     m_nCapacity;
+    sal_uInt32                     m_nCapacity;                           
 
 public:
     explicit HostnameCache( sal_uInt32 nCapacity )
@@ -109,7 +109,7 @@ public:
         {
             if ( (*it).first == rKey )
             {
-                rValue = (*it).second;
+                rValue = (*it).second; 
                 return true;
             }
             it++;
@@ -122,7 +122,7 @@ public:
         if ( m_aHostList.size() == m_nCapacity )
             m_aHostList.resize( m_nCapacity / 2 );
 
-        m_aHostList.push_front( HostListEntry( rKey, rValue ) );
+        m_aHostList.push_front( HostListEntry( rKey, rValue ) ); 
     }
 };
 
@@ -555,7 +555,7 @@ const InternetProxyServer & InternetProxyDecider_Impl::getProxy(
             // This might be quite expensive (DNS lookup).
             const osl::SocketAddr aAddr( aHost, nPort );
             aFullyQualifiedHost = aAddr.getHostname().toAsciiLowerCase();
-            m_aHostnames.put( aHost, aFullyQualifiedHost );
+            m_aHostnames.put( aHost, aFullyQualifiedHost ); 
         }
 
         // Error resolving name? -> fallback.
diff --git a/ucbhelper/source/provider/cancelcommandexecution.cxx b/ucbhelper/source/provider/cancelcommandexecution.cxx
index 8be75ee8aabd..352098d304a3 100644
--- a/ucbhelper/source/provider/cancelcommandexecution.cxx
+++ b/ucbhelper/source/provider/cancelcommandexecution.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
diff --git a/ucbhelper/source/provider/commandenvironmentproxy.cxx b/ucbhelper/source/provider/commandenvironmentproxy.cxx
index 33b8dd3fdfca..f437a442ffc9 100644
--- a/ucbhelper/source/provider/commandenvironmentproxy.cxx
+++ b/ucbhelper/source/provider/commandenvironmentproxy.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
@@ -60,7 +60,7 @@ namespace ucbhelper
 
 struct CommandEnvironmentProxy_Impl
 {
-    osl::Mutex                       m_aMutex;
+    osl::Mutex 						 m_aMutex;
     Reference< XCommandEnvironment > m_xEnv;
     Reference< XInteractionHandler > m_xInteractionHandler;
     Reference< XProgressHandler >    m_xProgressHandler;
@@ -68,7 +68,7 @@ struct CommandEnvironmentProxy_Impl
     sal_Bool m_bGotProgressHandler;
 
     CommandEnvironmentProxy_Impl(
-        const Reference< XCommandEnvironment >& rxEnv )
+        const Reference< XCommandEnvironment >&	rxEnv )
     : m_xEnv( rxEnv ), m_bGotInteractionHandler( sal_False ),
       m_bGotProgressHandler( sal_False ) {}
 };
diff --git a/ucbhelper/source/provider/configureucb.cxx b/ucbhelper/source/provider/configureucb.cxx
index ee881c97ecbf..6aabd44f7357 100644
--- a/ucbhelper/source/provider/configureucb.cxx
+++ b/ucbhelper/source/provider/configureucb.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
diff --git a/ucbhelper/source/provider/contenthelper.cxx b/ucbhelper/source/provider/contenthelper.cxx
index 17b494e00437..94650ccd1fdf 100644
--- a/ucbhelper/source/provider/contenthelper.cxx
+++ b/ucbhelper/source/provider/contenthelper.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
@@ -147,13 +147,13 @@ typedef cppu::OMultiTypeInterfaceContainerHelperVar
 
 struct ContentImplHelper_Impl
 {
-    rtl::Reference< ::ucbhelper::PropertySetInfo >      m_xPropSetInfo;
+    rtl::Reference< ::ucbhelper::PropertySetInfo > 	    m_xPropSetInfo;
     rtl::Reference< ::ucbhelper::CommandProcessorInfo > m_xCommandsInfo;
     cppu::OInterfaceContainerHelper*              m_pDisposeEventListeners;
     cppu::OInterfaceContainerHelper*              m_pContentEventListeners;
     cppu::OInterfaceContainerHelper*              m_pPropSetChangeListeners;
     cppu::OInterfaceContainerHelper*              m_pCommandChangeListeners;
-    PropertyChangeListeners*                      m_pPropertyChangeListeners;
+    PropertyChangeListeners*    	              m_pPropertyChangeListeners;
 
     ContentImplHelper_Impl()
     : m_pDisposeEventListeners( 0 ),
@@ -189,7 +189,7 @@ namespace ucbhelper {
 ContentImplHelper::ContentImplHelper(
             const uno::Reference< lang::XMultiServiceFactory >& rxSMgr,
             const rtl::Reference< ContentProviderImplHelper >& rxProvider,
-            const uno::Reference<
+            const uno::Reference< 
             com::sun::star::ucb::XContentIdentifier >& Identifier )
 : m_pImpl( new ContentImplHelper_Impl ),
   m_xSMgr( rxSMgr ),
@@ -223,7 +223,7 @@ void SAL_CALL ContentImplHelper::release()
 {
     // #144882# - Call to OWeakObject::release may destroy m_xProvider.
     //            Prevent this.
-    rtl::Reference< ContentProviderImplHelper > xKeepProviderAlive(
+    rtl::Reference< ContentProviderImplHelper > xKeepProviderAlive( 
         m_xProvider );
 
     {
@@ -321,7 +321,7 @@ void SAL_CALL ContentImplHelper::dispose()
          m_pImpl->m_pPropSetChangeListeners->getLength() )
     {
         lang::EventObject aEvt;
-        aEvt.Source
+        aEvt.Source 
             = static_cast< beans::XPropertySetInfoChangeNotifier * >( this );
         m_pImpl->m_pPropSetChangeListeners->disposeAndClear( aEvt );
     }
@@ -337,7 +337,7 @@ void SAL_CALL ContentImplHelper::dispose()
     if ( m_pImpl->m_pPropertyChangeListeners )
     {
         lang::EventObject aEvt;
-        aEvt.Source
+        aEvt.Source 
             = static_cast< beans::XPropertiesChangeNotifier * >( this );
         m_pImpl->m_pPropertyChangeListeners->disposeAndClear( aEvt );
     }
@@ -377,7 +377,7 @@ void SAL_CALL ContentImplHelper::removeEventListener(
 //=========================================================================
 
 // virtual
-uno::Reference< com::sun::star::ucb::XContentIdentifier > SAL_CALL
+uno::Reference< com::sun::star::ucb::XContentIdentifier > SAL_CALL 
 ContentImplHelper::getIdentifier()
     throw( uno::RuntimeException )
 {
@@ -539,8 +539,8 @@ void SAL_CALL ContentImplHelper::removeCommandInfoChangeListener(
 
 // virtual
 void SAL_CALL ContentImplHelper::addProperty(
-        const rtl::OUString& Name,
-        sal_Int16 Attributes,
+        const rtl::OUString& Name, 
+        sal_Int16 Attributes, 
         const uno::Any& DefaultValue )
     throw( beans::PropertyExistException,
            beans::IllegalTypeException,
@@ -573,15 +573,15 @@ void SAL_CALL ContentImplHelper::addProperty(
     uno::Reference< com::sun::star::ucb::XPersistentPropertySet > xSet(
                                     getAdditionalPropertySet( sal_True ) );
 
-    OSL_ENSURE( xSet.is(),
+    OSL_ENSURE( xSet.is(), 
                 "ContentImplHelper::addProperty - No property set!" );
 
     if ( xSet.is() )
     {
-        uno::Reference< beans::XPropertyContainer > xContainer(
+        uno::Reference< beans::XPropertyContainer > xContainer( 
             xSet, uno::UNO_QUERY );
 
-        OSL_ENSURE(
+        OSL_ENSURE( 
             xContainer.is(),
             "ContentImplHelper::addProperty - No property container!" );
 
@@ -652,7 +652,7 @@ void SAL_CALL ContentImplHelper::removeProperty( const rtl::OUString& Name )
         //     XCommandProcessor commands!
         uno::Reference< com::sun::star::ucb::XCommandEnvironment > xEnv;
 
-        beans::Property aProp
+        beans::Property aProp 
             = getPropertySetInfo( xEnv )->getPropertyByName( Name );
 
         if ( !( aProp.Attributes & beans::PropertyAttribute::REMOVEABLE ) )
@@ -676,10 +676,10 @@ void SAL_CALL ContentImplHelper::removeProperty( const rtl::OUString& Name )
         getAdditionalPropertySet( sal_False ) );
     if ( xSet.is() )
     {
-        uno::Reference< beans::XPropertyContainer > xContainer(
+        uno::Reference< beans::XPropertyContainer > xContainer( 
             xSet, uno::UNO_QUERY );
 
-        OSL_ENSURE(
+        OSL_ENSURE( 
             xContainer.is(),
             "ContentImplHelper::removeProperty - No property container!" );
 
@@ -697,7 +697,7 @@ void SAL_CALL ContentImplHelper::removeProperty( const rtl::OUString& Name )
             }
             catch ( beans::NotRemoveableException const & )
             {
-                OSL_ENSURE(
+                OSL_ENSURE( 
                     sal_False,
                     "ContentImplHelper::removeProperty - Unremoveable!" );
                 throw;
@@ -710,7 +710,7 @@ void SAL_CALL ContentImplHelper::removeProperty( const rtl::OUString& Name )
             if ( xSet->getPropertySetInfo()->getProperties().getLength() == 0 )
             {
                 // Remove empty propertyset from registry.
-                uno::Reference< com::sun::star::ucb::XPropertySetRegistry >
+                uno::Reference< com::sun::star::ucb::XPropertySetRegistry > 
                     xReg = xSet->getRegistry();
                 if ( xReg.is() )
                 {
@@ -864,7 +864,7 @@ void ContentImplHelper::notifyPropertiesChange(
     {
         // First, notify listeners interested in changes of every property.
         cppu::OInterfaceContainerHelper* pAllPropsContainer
-            = m_pImpl->m_pPropertyChangeListeners->getContainer(
+            = m_pImpl->m_pPropertyChangeListeners->getContainer( 
                 rtl::OUString() );
         if ( pAllPropsContainer )
         {
@@ -965,7 +965,7 @@ void ContentImplHelper::notifyCommandInfoChange(
         return;
 
     // Notify event listeners.
-    cppu::OInterfaceIteratorHelper aIter(
+    cppu::OInterfaceIteratorHelper aIter( 
         *m_pImpl->m_pCommandChangeListeners );
     while ( aIter.hasMoreElements() )
     {
@@ -978,7 +978,7 @@ void ContentImplHelper::notifyCommandInfoChange(
 }
 
 //=========================================================================
-void ContentImplHelper::notifyContentEvent(
+void ContentImplHelper::notifyContentEvent( 
     const com::sun::star::ucb::ContentEvent& evt ) const
 {
     if ( !m_pImpl->m_pContentEventListeners )
@@ -989,8 +989,8 @@ void ContentImplHelper::notifyContentEvent(
     while ( aIter.hasMoreElements() )
     {
         // Propagate event.
-        uno::Reference<
-            com::sun::star::ucb::XContentEventListener > xListener(
+        uno::Reference< 
+            com::sun::star::ucb::XContentEventListener > xListener( 
                 aIter.next(), uno::UNO_QUERY );
         if ( xListener.is() )
             xListener->contentEvent( evt );
@@ -1011,11 +1011,11 @@ void ContentImplHelper::inserted()
 
     if ( xParent.is() )
     {
-        com::sun::star::ucb::ContentEvent aEvt(
+        com::sun::star::ucb::ContentEvent aEvt( 
             static_cast< cppu::OWeakObject * >( xParent.get() ), // Source
-            com::sun::star::ucb::ContentAction::INSERTED,        // Action
-            this,                                                // Content
-            xParent->getIdentifier() );                          // Id
+            com::sun::star::ucb::ContentAction::INSERTED,		 // Action
+            this,									             // Content
+            xParent->getIdentifier() );				             // Id
         xParent->notifyContentEvent( aEvt );
     }
 }
@@ -1031,16 +1031,16 @@ void ContentImplHelper::deleted()
     if ( xParent.is() )
     {
         // Let parent notify "REMOVED" event.
-        com::sun::star::ucb::ContentEvent aEvt(
+        com::sun::star::ucb::ContentEvent aEvt( 
             static_cast< cppu::OWeakObject * >( xParent.get() ),
             com::sun::star::ucb::ContentAction::REMOVED,
             this,
-            xParent->getIdentifier()    );
+            xParent->getIdentifier()	);
         xParent->notifyContentEvent( aEvt );
     }
 
     // Notify "DELETED" event.
-    com::sun::star::ucb::ContentEvent aEvt1(
+    com::sun::star::ucb::ContentEvent aEvt1( 
         static_cast< cppu::OWeakObject * >( this ),
         com::sun::star::ucb::ContentAction::DELETED,
         this,
@@ -1068,7 +1068,7 @@ sal_Bool ContentImplHelper::exchange(
         return sal_False;
     }
 
-    uno::Reference< com::sun::star::ucb::XContentIdentifier > xOldId
+    uno::Reference< com::sun::star::ucb::XContentIdentifier > xOldId 
         = getIdentifier();
 
     // Re-insert at provider.
@@ -1079,7 +1079,7 @@ sal_Bool ContentImplHelper::exchange(
     aGuard.clear();
 
     // Notify "EXCHANGED" event.
-    com::sun::star::ucb::ContentEvent aEvt(
+    com::sun::star::ucb::ContentEvent aEvt( 
         static_cast< cppu::OWeakObject * >( this ),
         com::sun::star::ucb::ContentAction::EXCHANGED,
         this,
@@ -1089,9 +1089,9 @@ sal_Bool ContentImplHelper::exchange(
 }
 
 //=========================================================================
-uno::Reference< com::sun::star::ucb::XCommandInfo >
+uno::Reference< com::sun::star::ucb::XCommandInfo > 
 ContentImplHelper::getCommandInfo(
-    const uno::Reference< com::sun::star::ucb::XCommandEnvironment > & xEnv,
+    const uno::Reference< com::sun::star::ucb::XCommandEnvironment > & xEnv, 
     sal_Bool bCache )
 {
     osl::MutexGuard aGuard( m_aMutex );
@@ -1102,14 +1102,14 @@ ContentImplHelper::getCommandInfo(
     else if ( !bCache )
         m_pImpl->m_xCommandsInfo->reset();
 
-    return uno::Reference< com::sun::star::ucb::XCommandInfo >(
+    return uno::Reference< com::sun::star::ucb::XCommandInfo >( 
         m_pImpl->m_xCommandsInfo.get() );
 }
 
 //=========================================================================
-uno::Reference< beans::XPropertySetInfo >
+uno::Reference< beans::XPropertySetInfo > 
 ContentImplHelper::getPropertySetInfo(
-    const uno::Reference< com::sun::star::ucb::XCommandEnvironment > & xEnv,
+    const uno::Reference< com::sun::star::ucb::XCommandEnvironment > & xEnv, 
     sal_Bool bCache )
 {
     osl::MutexGuard aGuard( m_aMutex );
diff --git a/ucbhelper/source/provider/contentidentifier.cxx b/ucbhelper/source/provider/contentidentifier.cxx
index 7324c2cd5835..08324cef4c4c 100644
--- a/ucbhelper/source/provider/contentidentifier.cxx
+++ b/ucbhelper/source/provider/contentidentifier.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
@@ -57,9 +57,9 @@ namespace ucbhelper
 struct ContentIdentifier_Impl
 {
     Reference< XMultiServiceFactory > m_xSMgr;
-    OUString                          m_aContentId;
-    OUString                          m_aProviderScheme;
-    osl::Mutex                        m_aMutex;
+    OUString 						  m_aContentId;
+    OUString 						  m_aProviderScheme;
+    osl::Mutex						  m_aMutex;
 
     ContentIdentifier_Impl( const Reference< XMultiServiceFactory >& rSMgr,
                               const OUString& rURL );
diff --git a/ucbhelper/source/provider/contentinfo.cxx b/ucbhelper/source/provider/contentinfo.cxx
index 72dc633bd274..7d2d41bdd731 100644
--- a/ucbhelper/source/provider/contentinfo.cxx
+++ b/ucbhelper/source/provider/contentinfo.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
@@ -128,7 +128,7 @@ uno::Sequence< beans::Property > SAL_CALL PropertySetInfo::getProperties()
             // Get info for additional properties.
             //////////////////////////////////////////////////////////////
 
-            uno::Reference< com::sun::star::ucb::XPersistentPropertySet >
+            uno::Reference< com::sun::star::ucb::XPersistentPropertySet > 
                 xSet ( m_pContent->getAdditionalPropertySet( sal_False ) );
 
             if ( xSet.is() )
@@ -147,7 +147,7 @@ uno::Sequence< beans::Property > SAL_CALL PropertySetInfo::getProperties()
                         m_pProps->realloc( nPos + nAddProps );
 
                         beans::Property* pProps = m_pProps->getArray();
-                        const beans::Property* pAddProps
+                        const beans::Property* pAddProps 
                             = rAddProps.getConstArray();
 
                         for ( sal_Int32 n = 0; n < nAddProps; ++n, ++nPos )
@@ -162,7 +162,7 @@ uno::Sequence< beans::Property > SAL_CALL PropertySetInfo::getProperties()
 
 //=========================================================================
 // virtual
-beans::Property SAL_CALL PropertySetInfo::getPropertyByName(
+beans::Property SAL_CALL PropertySetInfo::getPropertyByName( 
         const rtl::OUString& aName )
     throw( beans::UnknownPropertyException, uno::RuntimeException )
 {
@@ -175,7 +175,7 @@ beans::Property SAL_CALL PropertySetInfo::getPropertyByName(
 
 //=========================================================================
 // virtual
-sal_Bool SAL_CALL PropertySetInfo::hasPropertyByName(
+sal_Bool SAL_CALL PropertySetInfo::hasPropertyByName( 
         const rtl::OUString& Name )
     throw( uno::RuntimeException )
 {
@@ -272,7 +272,7 @@ XTYPEPROVIDER_IMPL_2( CommandProcessorInfo,
 //=========================================================================
 
 // virtual
-uno::Sequence< com::sun::star::ucb::CommandInfo > SAL_CALL
+uno::Sequence< com::sun::star::ucb::CommandInfo > SAL_CALL 
 CommandProcessorInfo::getCommands()
     throw( uno::RuntimeException )
 {
@@ -289,8 +289,8 @@ CommandProcessorInfo::getCommands()
             {
                 uno::Sequence< com::sun::star::ucb::CommandInfo > aCmds
                     = m_pContent->getCommands( m_xEnv );
-                m_pCommands
-                    = new uno::Sequence< com::sun::star::ucb::CommandInfo >(
+                m_pCommands 
+                    = new uno::Sequence< com::sun::star::ucb::CommandInfo >( 
                         aCmds );
             }
             catch ( uno::RuntimeException const & )
@@ -299,8 +299,8 @@ CommandProcessorInfo::getCommands()
             }
             catch ( uno::Exception const & )
             {
-                m_pCommands
-                    = new uno::Sequence< com::sun::star::ucb::CommandInfo >(
+                m_pCommands 
+                    = new uno::Sequence< com::sun::star::ucb::CommandInfo >( 
                         0 );
             }
         }
@@ -310,10 +310,10 @@ CommandProcessorInfo::getCommands()
 
 //=========================================================================
 // virtual
-com::sun::star::ucb::CommandInfo SAL_CALL
+com::sun::star::ucb::CommandInfo SAL_CALL 
 CommandProcessorInfo::getCommandInfoByName(
         const rtl::OUString& Name )
-    throw( com::sun::star::ucb::UnsupportedCommandException,
+    throw( com::sun::star::ucb::UnsupportedCommandException, 
            uno::RuntimeException )
 {
     com::sun::star::ucb::CommandInfo aInfo;
@@ -325,9 +325,9 @@ CommandProcessorInfo::getCommandInfoByName(
 
 //=========================================================================
 // virtual
-com::sun::star::ucb::CommandInfo SAL_CALL
+com::sun::star::ucb::CommandInfo SAL_CALL 
 CommandProcessorInfo::getCommandInfoByHandle( sal_Int32 Handle )
-    throw( com::sun::star::ucb::UnsupportedCommandException,
+    throw( com::sun::star::ucb::UnsupportedCommandException, 
            uno::RuntimeException )
 {
     com::sun::star::ucb::CommandInfo aInfo;
@@ -339,7 +339,7 @@ CommandProcessorInfo::getCommandInfoByHandle( sal_Int32 Handle )
 
 //=========================================================================
 // virtual
-sal_Bool SAL_CALL CommandProcessorInfo::hasCommandByName(
+sal_Bool SAL_CALL CommandProcessorInfo::hasCommandByName( 
        const rtl::OUString& Name )
     throw( uno::RuntimeException )
 {
@@ -371,7 +371,7 @@ void CommandProcessorInfo::reset()
 
 
 //=========================================================================
-sal_Bool CommandProcessorInfo::queryCommand(
+sal_Bool CommandProcessorInfo::queryCommand( 
     const rtl::OUString& rName,
     com::sun::star::ucb::CommandInfo& rCommand )
 {
@@ -379,7 +379,7 @@ sal_Bool CommandProcessorInfo::queryCommand(
 
     getCommands();
 
-    const com::sun::star::ucb::CommandInfo* pCommands
+    const com::sun::star::ucb::CommandInfo* pCommands 
         = m_pCommands->getConstArray();
     sal_Int32 nCount = m_pCommands->getLength();
     for ( sal_Int32 n = 0; n < nCount; ++n )
@@ -396,7 +396,7 @@ sal_Bool CommandProcessorInfo::queryCommand(
 }
 
 //=========================================================================
-sal_Bool CommandProcessorInfo::queryCommand(
+sal_Bool CommandProcessorInfo::queryCommand( 
     sal_Int32 nHandle,
     com::sun::star::ucb::CommandInfo& rCommand )
 {
@@ -404,7 +404,7 @@ sal_Bool CommandProcessorInfo::queryCommand(
 
     getCommands();
 
-    const com::sun::star::ucb::CommandInfo* pCommands
+    const com::sun::star::ucb::CommandInfo* pCommands 
         = m_pCommands->getConstArray();
     sal_Int32 nCount = m_pCommands->getLength();
     for ( sal_Int32 n = 0; n < nCount; ++n )
diff --git a/ucbhelper/source/provider/handleinteractionrequest.cxx b/ucbhelper/source/provider/handleinteractionrequest.cxx
index 395a81c36fed..31f58d4d7158 100644
--- a/ucbhelper/source/provider/handleinteractionrequest.cxx
+++ b/ucbhelper/source/provider/handleinteractionrequest.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
diff --git a/ucbhelper/source/provider/interactionrequest.cxx b/ucbhelper/source/provider/interactionrequest.cxx
index 3704a0f1546c..90d6a6b0435c 100644
--- a/ucbhelper/source/provider/interactionrequest.cxx
+++ b/ucbhelper/source/provider/interactionrequest.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
@@ -908,10 +908,10 @@ void SAL_CALL InteractionSupplyAuthentication::setRememberAccount(
 //
 //=========================================================================
 
-// virtual
-::sal_Bool SAL_CALL
-InteractionSupplyAuthentication::canUseSystemCredentials(
-        ::sal_Bool& Default )
+// virtual 
+::sal_Bool SAL_CALL 
+InteractionSupplyAuthentication::canUseSystemCredentials( 
+        ::sal_Bool& Default ) 
     throw ( uno::RuntimeException )
 {
     Default = m_bDefaultUseSystemCredentials;
@@ -920,7 +920,7 @@ InteractionSupplyAuthentication::canUseSystemCredentials(
 
 //=========================================================================
 // virtual
-void SAL_CALL InteractionSupplyAuthentication::setUseSystemCredentials(
+void SAL_CALL InteractionSupplyAuthentication::setUseSystemCredentials( 
         ::sal_Bool UseSystemCredentials )
     throw ( uno::RuntimeException )
 {
diff --git a/ucbhelper/source/provider/propertyvalueset.cxx b/ucbhelper/source/provider/propertyvalueset.cxx
index 1c857ca467f0..a43b9f0c580a 100644
--- a/ucbhelper/source/provider/propertyvalueset.cxx
+++ b/ucbhelper/source/provider/propertyvalueset.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
@@ -66,55 +66,55 @@ namespace ucbhelper_impl
 //
 //=========================================================================
 
-const sal_uInt32 NO_VALUE_SET               = 0x00000000;
-const sal_uInt32 STRING_VALUE_SET           = 0x00000001;
-const sal_uInt32 BOOLEAN_VALUE_SET          = 0x00000002;
-const sal_uInt32 BYTE_VALUE_SET             = 0x00000004;
-const sal_uInt32 SHORT_VALUE_SET            = 0x00000008;
-const sal_uInt32 INT_VALUE_SET              = 0x00000010;
-const sal_uInt32 LONG_VALUE_SET             = 0x00000020;
-const sal_uInt32 FLOAT_VALUE_SET            = 0x00000040;
-const sal_uInt32 DOUBLE_VALUE_SET           = 0x00000080;
-const sal_uInt32 BYTES_VALUE_SET            = 0x00000100;
-const sal_uInt32 DATE_VALUE_SET             = 0x00000200;
-const sal_uInt32 TIME_VALUE_SET             = 0x00000400;
-const sal_uInt32 TIMESTAMP_VALUE_SET        = 0x00000800;
-const sal_uInt32 BINARYSTREAM_VALUE_SET     = 0x00001000;
-const sal_uInt32 CHARACTERSTREAM_VALUE_SET  = 0x00002000;
-const sal_uInt32 REF_VALUE_SET              = 0x00004000;
-const sal_uInt32 BLOB_VALUE_SET             = 0x00008000;
-const sal_uInt32 CLOB_VALUE_SET             = 0x00010000;
-const sal_uInt32 ARRAY_VALUE_SET            = 0x00020000;
-const sal_uInt32 OBJECT_VALUE_SET           = 0x00040000;
+const sal_uInt32 NO_VALUE_SET 				= 0x00000000;
+const sal_uInt32 STRING_VALUE_SET 		 	= 0x00000001;
+const sal_uInt32 BOOLEAN_VALUE_SET 		 	= 0x00000002;
+const sal_uInt32 BYTE_VALUE_SET 			= 0x00000004;
+const sal_uInt32 SHORT_VALUE_SET 			= 0x00000008;
+const sal_uInt32 INT_VALUE_SET 			 	= 0x00000010;
+const sal_uInt32 LONG_VALUE_SET 			= 0x00000020;
+const sal_uInt32 FLOAT_VALUE_SET 			= 0x00000040;
+const sal_uInt32 DOUBLE_VALUE_SET 		 	= 0x00000080;
+const sal_uInt32 BYTES_VALUE_SET 			= 0x00000100;
+const sal_uInt32 DATE_VALUE_SET 			= 0x00000200;
+const sal_uInt32 TIME_VALUE_SET 			= 0x00000400;
+const sal_uInt32 TIMESTAMP_VALUE_SET 		= 0x00000800;
+const sal_uInt32 BINARYSTREAM_VALUE_SET 	= 0x00001000;
+const sal_uInt32 CHARACTERSTREAM_VALUE_SET 	= 0x00002000;
+const sal_uInt32 REF_VALUE_SET 			 	= 0x00004000;
+const sal_uInt32 BLOB_VALUE_SET 			= 0x00008000;
+const sal_uInt32 CLOB_VALUE_SET 			= 0x00010000;
+const sal_uInt32 ARRAY_VALUE_SET 			= 0x00020000;
+const sal_uInt32 OBJECT_VALUE_SET 		 	= 0x00040000;
 
 struct PropertyValue
 {
     ::rtl::OUString
                 sPropertyName;
 
-    sal_uInt32  nPropsSet;
+    sal_uInt32	nPropsSet;
     sal_uInt32  nOrigValue;
 
-    OUString    aString;    // getString
-    sal_Bool    bBoolean;   // getBoolean
-    sal_Int8    nByte;      // getByte
-    sal_Int16   nShort;     // getShort
-    sal_Int32   nInt;       // getInt
-    sal_Int64   nLong;      // getLong
-    float       nFloat;     // getFloat
-    double      nDouble;    // getDouble
-
-    Sequence< sal_Int8 >        aBytes;             // getBytes
-    Date                        aDate;              // getDate
-    Time                        aTime;              // getTime
-    DateTime                    aTimestamp;         // getTimestamp
-    Reference< XInputStream >   xBinaryStream;      // getBinaryStream
-    Reference< XInputStream >   xCharacterStream;   // getCharacterStream
-    Reference< XRef >           xRef;               // getRef
-    Reference< XBlob >          xBlob;              // getBlob
-    Reference< XClob >          xClob;              // getClob
-    Reference< XArray >         xArray;             // getArray
-    Any                         aObject;            // getObject
+    OUString	aString;	// getString
+    sal_Bool 	bBoolean;	// getBoolean
+    sal_Int8	nByte;		// getByte
+    sal_Int16	nShort;		// getShort
+    sal_Int32 	nInt;		// getInt
+    sal_Int64 	nLong;		// getLong
+    float		nFloat;		// getFloat
+    double		nDouble;	// getDouble
+
+    Sequence< sal_Int8 > 		aBytes; 			// getBytes
+    Date                		aDate;				// getDate
+    Time                		aTime;				// getTime
+    DateTime            		aTimestamp;			// getTimestamp
+    Reference< XInputStream >	xBinaryStream;		// getBinaryStream
+    Reference< XInputStream >	xCharacterStream;	// getCharacterStream
+    Reference< XRef >			xRef;				// getRef
+    Reference< XBlob >			xBlob;				// getBlob
+    Reference< XClob >			xClob;				// getClob
+    Reference< XArray >			xArray;				// getArray
+    Any							aObject;			// getObject
 
     inline PropertyValue()
         : nPropsSet( NO_VALUE_SET ), nOrigValue( NO_VALUE_SET ),
@@ -156,12 +156,12 @@ class PropertyValues : public PropertyValuesVector {};
                                                                               \
     osl::MutexGuard aGuard( m_aMutex );                                       \
                                                                               \
-    _type_ aValue = _type_();   /* default ctor */                            \
+    _type_ aValue = _type_();	/* default ctor	*/							  \
                                                                               \
-    m_bWasNull = sal_True;                                                    \
+    m_bWasNull = sal_True;                                					  \
                                                                               \
-    if ( ( columnIndex < 1 )                                                  \
-         || ( columnIndex > sal_Int32( m_pValues->size() ) ) )                \
+    if ( ( columnIndex < 1 )												  \
+         || ( columnIndex > sal_Int32( m_pValues->size() ) ) )         		  \
     {                                                                         \
         OSL_ENSURE( sal_False, "PropertyValueSet - index out of range!" );    \
     }                                                                         \
@@ -170,13 +170,13 @@ class PropertyValues : public PropertyValuesVector {};
         ucbhelper_impl::PropertyValue& rValue                                 \
             = (*m_pValues)[ columnIndex - 1 ];                                \
                                                                               \
-        if ( rValue.nOrigValue != NO_VALUE_SET )                              \
+        if ( rValue.nOrigValue != NO_VALUE_SET )							  \
         {                                                                     \
-            if ( rValue.nPropsSet & _type_name_ )                             \
+            if ( rValue.nPropsSet & _type_name_ )							  \
             {                                                                 \
-                /* Values is present natively... */                           \
+                /* Values is present natively... */							  \
                 aValue = rValue._member_name_;                                \
-                m_bWasNull = sal_False;                                       \
+                m_bWasNull = sal_False;                   					  \
             }                                                                 \
             else                                                              \
             {                                                                 \
@@ -187,37 +187,37 @@ class PropertyValues : public PropertyValuesVector {};
                 }                                                             \
                                                                               \
                 if ( rValue.nPropsSet & OBJECT_VALUE_SET )                    \
-                {                                                             \
+                {															  \
                     /* Value is available as Any. */                          \
                                                                               \
-                    if ( rValue.aObject.hasValue() )                          \
+                    if ( rValue.aObject.hasValue() )						  \
                     {                                                         \
                         /* Try to convert into native value. */               \
                         if ( rValue.aObject >>= aValue )                      \
                         {                                                     \
-                            rValue._member_name_ = aValue;                    \
-                            rValue.nPropsSet |= _type_name_;                  \
-                            m_bWasNull = sal_False;                           \
+                            rValue._member_name_ = aValue;					  \
+                            rValue.nPropsSet |= _type_name_;				  \
+                            m_bWasNull = sal_False;           				  \
                         }                                                     \
                         else                                                  \
                         {                                                     \
                             /* Last chance. Try type converter service... */  \
                                                                               \
                             Reference< XTypeConverter > xConverter            \
-                                                    = getTypeConverter();     \
+                                                    = getTypeConverter(); 	  \
                             if ( xConverter.is() )                            \
                             {                                                 \
                                 try                                           \
                                 {                                             \
                                     Any aConvAny = xConverter->convertTo(     \
-                                                             rValue.aObject,      \
-                                                            _cppu_type_ );    \
+                                                             rValue.aObject,	  \
+                                                            _cppu_type_ );	  \
                                                                               \
                                     if ( aConvAny >>= aValue )                \
-                                    {                                         \
-                                        rValue._member_name_ = aValue;        \
+                                    {                           			  \
+                                        rValue._member_name_ = aValue;		  \
                                         rValue.nPropsSet |= _type_name_;      \
-                                        m_bWasNull = sal_False;               \
+                                        m_bWasNull = sal_False;   			  \
                                     }                                         \
                                 }                                             \
                                 catch ( IllegalArgumentException )            \
@@ -231,24 +231,24 @@ class PropertyValues : public PropertyValuesVector {};
                     }                                                         \
                 }                                                             \
             }                                                                 \
-        }                                                                     \
+        }																	  \
     }                                                                         \
     return aValue;
 
-#define GETVALUE_IMPL( _type_, _type_name_, _member_name_ )                   \
-    GETVALUE_IMPL_TYPE( _type_,                                               \
-                        _type_name_,                                          \
+#define GETVALUE_IMPL( _type_, _type_name_, _member_name_ )					  \
+    GETVALUE_IMPL_TYPE( _type_,												  \
+                        _type_name_,										  \
                         _member_name_,                                        \
                         getCppuType( static_cast< const _type_ * >( 0 ) ) )
 
-#define SETVALUE_IMPL( _prop_name_, _type_name_, _member_name_, _value_ )     \
+#define SETVALUE_IMPL( _prop_name_, _type_name_, _member_name_, _value_ ) 	  \
                                                                               \
-    osl::MutexGuard aGuard( m_aMutex );                                       \
+    osl::MutexGuard aGuard( m_aMutex );				                          \
                                                                               \
     ucbhelper_impl::PropertyValue aNewValue;                                  \
     aNewValue.sPropertyName = _prop_name_;                                    \
-    aNewValue.nPropsSet     = _type_name_;                                    \
-    aNewValue.nOrigValue    = _type_name_;                                    \
+    aNewValue.nPropsSet  	= _type_name_;                                    \
+    aNewValue.nOrigValue 	= _type_name_;                                    \
     aNewValue._member_name_ = _value_;                                        \
                                                                               \
     m_pValues->push_back( aNewValue );
@@ -263,10 +263,10 @@ namespace ucbhelper {
 //=========================================================================
 //=========================================================================
 
-#define PROPERTYVALUESET_INIT()             \
-  m_xSMgr( rxSMgr ),                        \
-  m_pValues( new PropertyValues ),          \
-  m_bWasNull( sal_False ),                  \
+#define PROPERTYVALUESET_INIT() 			\
+  m_xSMgr( rxSMgr ),						\
+  m_pValues( new PropertyValues ),			\
+  m_bWasNull( sal_False ),      			\
   m_bTriedToGetTypeConverter( sal_False )
 
 //=========================================================================
@@ -483,7 +483,7 @@ Any SAL_CALL PropertyValueSet::getObject(
     }
     else
     {
-        ucbhelper_impl::PropertyValue& rValue
+        ucbhelper_impl::PropertyValue& rValue 
             = (*m_pValues)[ columnIndex - 1 ];
 
         if ( rValue.nPropsSet & OBJECT_VALUE_SET )
@@ -832,9 +832,9 @@ void PropertyValueSet::appendPropertySet(
         Reference< XPropertySetInfo > xInfo = rxSet->getPropertySetInfo();
         if ( xInfo.is() )
         {
-            Sequence< Property > aProps      = xInfo->getProperties();
-            const Property*      pProps      = aProps.getConstArray();
-            sal_Int32            nPropsCount = aProps.getLength();
+            Sequence< Property > aProps 	 = xInfo->getProperties();
+            const Property* 	 pProps 	 = aProps.getConstArray();
+            sal_Int32 			 nPropsCount = aProps.getLength();
 
             Reference< XPropertyAccess > xPropertyAccess( rxSet, UNO_QUERY );
             if ( xPropertyAccess.is() )
diff --git a/ucbhelper/source/provider/provconf.cxx b/ucbhelper/source/provider/provconf.cxx
index df1917b45413..5d06c988dab9 100644
--- a/ucbhelper/source/provider/provconf.cxx
+++ b/ucbhelper/source/provider/provconf.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
@@ -48,7 +48,7 @@ using namespace com::sun::star;
 
 //=========================================================================
 
-#define CONFIG_CONTENTPROVIDERS_KEY \
+#define CONFIG_CONTENTPROVIDERS_KEY	\
                 "/org.openoffice.ucb.Configuration/ContentProviders"
 
 //=========================================================================
diff --git a/ucbhelper/source/provider/provconf.hxx b/ucbhelper/source/provider/provconf.hxx
index 66d6a63d47b8..6d172d976397 100644
--- a/ucbhelper/source/provider/provconf.hxx
+++ b/ucbhelper/source/provider/provconf.hxx
@@ -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
diff --git a/ucbhelper/source/provider/providerhelper.cxx b/ucbhelper/source/provider/providerhelper.cxx
index ac35df0e3420..9673fdb96581 100644
--- a/ucbhelper/source/provider/providerhelper.cxx
+++ b/ucbhelper/source/provider/providerhelper.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
@@ -61,7 +61,7 @@ namespace ucbhelper_impl
 
 struct equalString
 {
-    bool operator()(
+    bool operator()( 
         const rtl::OUString& rKey11, const rtl::OUString& rKey22 ) const
       {
           return !!( rKey11 == rKey22 );
@@ -93,9 +93,9 @@ Contents;
 
 struct ContentProviderImplHelper_Impl
 {
-    uno::Reference< com::sun::star::ucb::XPropertySetRegistry >
+    uno::Reference< com::sun::star::ucb::XPropertySetRegistry > 
         m_xPropertySetRegistry;
-    Contents
+    Contents 
         m_aContents;
 };
 
@@ -225,7 +225,7 @@ void ContentProviderImplHelper::removeContent( ContentImplHelper* pContent )
 
     cleanupRegisteredContents();
 
-    const rtl::OUString aURL(
+    const rtl::OUString aURL( 
         pContent->getIdentifier()->getContentIdentifier() );
 
     ucbhelper_impl::Contents::iterator it = m_pImpl->m_aContents.find( aURL );
@@ -237,7 +237,7 @@ void ContentProviderImplHelper::removeContent( ContentImplHelper* pContent )
 //=========================================================================
 rtl::Reference< ContentImplHelper >
 ContentProviderImplHelper::queryExistingContent(
-    const uno::Reference< com::sun::star::ucb::XContentIdentifier >&
+    const uno::Reference< com::sun::star::ucb::XContentIdentifier >& 
         Identifier )
 {
     return queryExistingContent( Identifier->getContentIdentifier() );
@@ -253,7 +253,7 @@ ContentProviderImplHelper::queryExistingContent( const rtl::OUString& rURL )
 
     // Check, if a content with given id already exists...
 
-    ucbhelper_impl::Contents::const_iterator it
+    ucbhelper_impl::Contents::const_iterator it 
         = m_pImpl->m_aContents.find( rURL );
     if ( it != m_pImpl->m_aContents.end() )
     {
@@ -275,9 +275,9 @@ void ContentProviderImplHelper::queryExistingContents(
 
     cleanupRegisteredContents();
 
-    ucbhelper_impl::Contents::const_iterator it
+    ucbhelper_impl::Contents::const_iterator it  
         = m_pImpl->m_aContents.begin();
-    ucbhelper_impl::Contents::const_iterator end
+    ucbhelper_impl::Contents::const_iterator end 
         = m_pImpl->m_aContents.end();
 
     while ( it != end )
@@ -294,7 +294,7 @@ void ContentProviderImplHelper::queryExistingContents(
 }
 
 //=========================================================================
-void ContentProviderImplHelper::registerNewContent(
+void ContentProviderImplHelper::registerNewContent( 
     const uno::Reference< ucb::XContent > & xContent )
 {
     if ( xContent.is() )
@@ -303,9 +303,9 @@ void ContentProviderImplHelper::registerNewContent(
 
         cleanupRegisteredContents();
 
-        const rtl::OUString aURL(
+        const rtl::OUString aURL( 
             xContent->getIdentifier()->getContentIdentifier() );
-        ucbhelper_impl::Contents::const_iterator it
+        ucbhelper_impl::Contents::const_iterator it 
             = m_pImpl->m_aContents.find( aURL );
         if ( it == m_pImpl->m_aContents.end() )
             m_pImpl->m_aContents[ aURL ] = xContent;
@@ -322,10 +322,10 @@ ContentProviderImplHelper::getAdditionalPropertySetRegistry()
 
     if ( !m_pImpl->m_xPropertySetRegistry.is() )
     {
-        uno::Reference< com::sun::star::ucb::XPropertySetRegistryFactory >
+        uno::Reference< com::sun::star::ucb::XPropertySetRegistryFactory > 
             xRegFac(
                 m_xSMgr->createInstance(
-                    rtl::OUString::createFromAscii(
+                    rtl::OUString::createFromAscii( 
                         "com.sun.star.ucb.Store" ) ),
                 uno::UNO_QUERY );
 
@@ -351,7 +351,7 @@ ContentProviderImplHelper::getAdditionalPropertySetRegistry()
 
 //=========================================================================
 uno::Reference< com::sun::star::ucb::XPersistentPropertySet >
-ContentProviderImplHelper::getAdditionalPropertySet(
+ContentProviderImplHelper::getAdditionalPropertySet( 
     const rtl::OUString& rKey, sal_Bool bCreate )
 {
     // Get propertyset registry.
@@ -361,7 +361,7 @@ ContentProviderImplHelper::getAdditionalPropertySet(
     {
         // Open/create persistent property set.
         return uno::Reference< com::sun::star::ucb::XPersistentPropertySet >(
-            m_pImpl->m_xPropertySetRegistry->openPropertySet(
+            m_pImpl->m_xPropertySetRegistry->openPropertySet( 
                 rKey, bCreate ) );
     }
 
@@ -390,30 +390,30 @@ sal_Bool ContentProviderImplHelper::renameAdditionalPropertySet(
                 m_pImpl->m_xPropertySetRegistry, uno::UNO_QUERY );
             if ( xNameAccess.is() )
             {
-                uno::Sequence< rtl::OUString > aKeys
+                uno::Sequence< rtl::OUString > aKeys 
                     = xNameAccess->getElementNames();
                 sal_Int32 nCount = aKeys.getLength();
                 if ( nCount > 0 )
                 {
                     rtl::OUString aOldKeyWithSlash = rOldKey;
                     rtl::OUString aOldKeyWithoutSlash;
-                    if ( aOldKeyWithSlash.lastIndexOf(
-                             sal_Unicode('/')
+                    if ( aOldKeyWithSlash.lastIndexOf( 
+                             sal_Unicode('/') 
                                  != aOldKeyWithSlash.getLength() - 1 ) )
                     {
                         aOldKeyWithSlash += rtl::OUString( sal_Unicode('/') );
                         aOldKeyWithoutSlash = rOldKey;
                     }
                     else if ( rOldKey.getLength() )
-                        aOldKeyWithoutSlash
+                        aOldKeyWithoutSlash 
                             = rOldKey.copy( 0, rOldKey.getLength() - 1 );
 
                     const rtl::OUString* pKeys = aKeys.getConstArray();
                     for ( sal_Int32 n = 0; n < nCount; ++n )
                     {
                         const rtl::OUString& rKey = pKeys[ n ];
-                        if ( rKey.compareTo(
-                                 aOldKeyWithSlash,
+                        if ( rKey.compareTo( 
+                                 aOldKeyWithSlash, 
                                  aOldKeyWithSlash.getLength() ) == 0
                              || rKey.equals( aOldKeyWithoutSlash ) )
                         {
@@ -441,7 +441,7 @@ sal_Bool ContentProviderImplHelper::renameAdditionalPropertySet(
         if ( xOldSet.is() )
         {
             // Rename property set.
-            uno::Reference< container::XNamed > xNamed(
+            uno::Reference< container::XNamed > xNamed( 
                 xOldSet, uno::UNO_QUERY );
             if ( xNamed.is() )
             {
@@ -477,30 +477,30 @@ sal_Bool ContentProviderImplHelper::copyAdditionalPropertySet(
                 m_pImpl->m_xPropertySetRegistry, uno::UNO_QUERY );
             if ( xNameAccess.is() )
             {
-                uno::Sequence< rtl::OUString > aKeys
+                uno::Sequence< rtl::OUString > aKeys 
                     = xNameAccess->getElementNames();
                 sal_Int32 nCount = aKeys.getLength();
                 if ( nCount > 0 )
                 {
                     rtl::OUString aSrcKeyWithSlash = rSourceKey;
                     rtl::OUString aSrcKeyWithoutSlash;
-                    if ( aSrcKeyWithSlash.lastIndexOf(
-                             sal_Unicode('/')
+                    if ( aSrcKeyWithSlash.lastIndexOf( 
+                             sal_Unicode('/') 
                              != aSrcKeyWithSlash.getLength() - 1 ) )
                     {
                         aSrcKeyWithSlash += rtl::OUString( sal_Unicode('/') );
                         aSrcKeyWithoutSlash = rSourceKey;
                     }
                     else if ( rSourceKey.getLength() )
-                        aSrcKeyWithoutSlash = rSourceKey.copy(
+                        aSrcKeyWithoutSlash = rSourceKey.copy( 
                             0, rSourceKey.getLength() - 1 );
 
                     const rtl::OUString* pKeys = aKeys.getConstArray();
                     for ( sal_Int32 n = 0; n < nCount; ++n )
                     {
                         const rtl::OUString& rKey = pKeys[ n ];
-                        if ( rKey.compareTo(
-                                 aSrcKeyWithSlash,
+                        if ( rKey.compareTo( 
+                                 aSrcKeyWithSlash, 
                                  aSrcKeyWithSlash.getLength() ) == 0
                              || rKey.equals( aSrcKeyWithoutSlash ) )
                         {
@@ -523,34 +523,34 @@ sal_Bool ContentProviderImplHelper::copyAdditionalPropertySet(
     else
     {
         // Get old property set, if exists.
-        uno::Reference< com::sun::star::ucb::XPersistentPropertySet >
+        uno::Reference< com::sun::star::ucb::XPersistentPropertySet > 
             xOldPropSet = getAdditionalPropertySet( rSourceKey, sal_False );
         if ( !xOldPropSet.is() )
             return sal_False;
 
-        uno::Reference< beans::XPropertySetInfo > xPropSetInfo
+        uno::Reference< beans::XPropertySetInfo > xPropSetInfo 
             = xOldPropSet->getPropertySetInfo();
         if ( !xPropSetInfo.is() )
             return sal_False;
 
-        uno::Reference< beans::XPropertyAccess > xOldPropAccess(
+        uno::Reference< beans::XPropertyAccess > xOldPropAccess( 
             xOldPropSet, uno::UNO_QUERY );
         if ( !xOldPropAccess.is() )
             return sal_False;
 
         // Obtain all values from old set.
-        uno::Sequence< beans::PropertyValue > aValues
+        uno::Sequence< beans::PropertyValue > aValues 
             = xOldPropAccess->getPropertyValues();
         sal_Int32 nCount = aValues.getLength();
 
-        uno::Sequence< beans::Property > aProps
+        uno::Sequence< beans::Property > aProps 
             = xPropSetInfo->getProperties();
 
         if ( nCount )
         {
             // Fail, if property set with new key already exists.
-            uno::Reference< com::sun::star::ucb::XPersistentPropertySet >
-                xNewPropSet
+            uno::Reference< com::sun::star::ucb::XPersistentPropertySet > 
+                xNewPropSet	
                     = getAdditionalPropertySet( rTargetKey, sal_False );
             if ( xNewPropSet.is() )
                 return sal_False;
@@ -616,30 +616,30 @@ sal_Bool ContentProviderImplHelper::removeAdditionalPropertySet(
                 m_pImpl->m_xPropertySetRegistry, uno::UNO_QUERY );
             if ( xNameAccess.is() )
             {
-                uno::Sequence< rtl::OUString > aKeys
+                uno::Sequence< rtl::OUString > aKeys 
                     = xNameAccess->getElementNames();
                 sal_Int32 nCount = aKeys.getLength();
                 if ( nCount > 0 )
                 {
                     rtl::OUString aKeyWithSlash = rKey;
                     rtl::OUString aKeyWithoutSlash;
-                    if ( aKeyWithSlash.lastIndexOf(
-                             sal_Unicode('/')
+                    if ( aKeyWithSlash.lastIndexOf( 
+                             sal_Unicode('/') 
                              != aKeyWithSlash.getLength() - 1 ) )
                     {
                         aKeyWithSlash += rtl::OUString( (sal_Unicode)'/' );
                         aKeyWithoutSlash = rKey;
                     }
                     else if ( rKey.getLength() )
-                        aKeyWithoutSlash
+                        aKeyWithoutSlash 
                             = rKey.copy( 0, rKey.getLength() - 1 );
 
                     const rtl::OUString* pKeys = aKeys.getConstArray();
                     for ( sal_Int32 n = 0; n < nCount; ++n )
                     {
                         const rtl::OUString& rCurrKey = pKeys[ n ];
-                        if ( rCurrKey.compareTo(
-                                 aKeyWithSlash,
+                        if ( rCurrKey.compareTo( 
+                                 aKeyWithSlash, 
                                  aKeyWithSlash.getLength() ) == 0
                              || rCurrKey.equals( aKeyWithoutSlash ) )
                         {
diff --git a/ucbhelper/source/provider/registerucb.cxx b/ucbhelper/source/provider/registerucb.cxx
index e6ccaf4743a8..604ca3d862a4 100644
--- a/ucbhelper/source/provider/registerucb.cxx
+++ b/ucbhelper/source/provider/registerucb.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
diff --git a/ucbhelper/source/provider/resultset.cxx b/ucbhelper/source/provider/resultset.cxx
index 47825f15c6b1..d2c00428142e 100644
--- a/ucbhelper/source/provider/resultset.cxx
+++ b/ucbhelper/source/provider/resultset.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
@@ -47,7 +47,7 @@ namespace ucbhelper_impl
 
 struct PropertyInfo
 {
-    const char* pName;
+    const char*	pName;
     sal_Int32   nHandle;
     sal_Int16   nAttributes;
     const uno::Type& (*pGetCppuType)();
@@ -91,19 +91,19 @@ static const PropertyInfo aPropertyTable[] =
 //=========================================================================
 
 class PropertySetInfo :
-        public cppu::OWeakObject,
-        public lang::XTypeProvider,
+        public cppu::OWeakObject,	
+        public lang::XTypeProvider, 
         public beans::XPropertySetInfo
 {
     uno::Reference< lang::XMultiServiceFactory > m_xSMgr;
-    uno::Sequence< beans::Property >*            m_pProps;
+    uno::Sequence< beans::Property >* 			 m_pProps;
 
 private:
-    sal_Bool queryProperty(
+    sal_Bool queryProperty(	
         const rtl::OUString& aName, beans::Property& rProp );
 
 public:
-    PropertySetInfo(
+    PropertySetInfo( 
         const uno::Reference< lang::XMultiServiceFactory >& rxSMgr,
         const PropertyInfo* pProps,
         sal_Int32 nProps );
@@ -118,7 +118,7 @@ public:
     // XPropertySetInfo
     virtual uno::Sequence< beans::Property > SAL_CALL getProperties()
         throw( uno::RuntimeException );
-    virtual beans::Property SAL_CALL getPropertyByName(
+    virtual beans::Property SAL_CALL getPropertyByName( 
             const rtl::OUString& aName )
         throw( beans::UnknownPropertyException, uno::RuntimeException );
     virtual sal_Bool SAL_CALL hasPropertyByName( const rtl::OUString& Name )
@@ -182,24 +182,24 @@ namespace ucbhelper
 
 struct ResultSet_Impl
 {
-    uno::Reference< lang::XMultiServiceFactory >    m_xSMgr;
-    uno::Reference< com::sun::star::ucb::XCommandEnvironment >  m_xEnv;
-    uno::Reference< beans::XPropertySetInfo >       m_xPropSetInfo;
-    uno::Reference< sdbc::XResultSetMetaData >      m_xMetaData;
-    uno::Sequence< beans::Property >                m_aProperties;
-    rtl::Reference< ResultSetDataSupplier >         m_xDataSupplier;
-    osl::Mutex                          m_aMutex;
-    cppu::OInterfaceContainerHelper*    m_pDisposeEventListeners;
-    PropertyChangeListeners*            m_pPropertyChangeListeners;
-    sal_Int32                           m_nPos;
-    sal_Bool                            m_bWasNull;
-    sal_Bool                            m_bAfterLast;
-
-    inline ResultSet_Impl(
+    uno::Reference< lang::XMultiServiceFactory > 	m_xSMgr;
+    uno::Reference< com::sun::star::ucb::XCommandEnvironment > 	m_xEnv;
+    uno::Reference< beans::XPropertySetInfo >     	m_xPropSetInfo;
+    uno::Reference< sdbc::XResultSetMetaData >   	m_xMetaData;
+    uno::Sequence< beans::Property >              	m_aProperties;
+    rtl::Reference< ResultSetDataSupplier >	        m_xDataSupplier;
+    osl::Mutex						 	m_aMutex;
+    cppu::OInterfaceContainerHelper* 	m_pDisposeEventListeners;
+    PropertyChangeListeners*			m_pPropertyChangeListeners;
+    sal_Int32						 	m_nPos;
+    sal_Bool 						 	m_bWasNull;
+    sal_Bool 						 	m_bAfterLast;
+
+    inline ResultSet_Impl( 
         const uno::Reference< lang::XMultiServiceFactory >& rxSMgr,
         const uno::Sequence< beans::Property >& rProperties,
         const rtl::Reference< ResultSetDataSupplier >& rDataSupplier,
-        const uno::Reference< com::sun::star::ucb::XCommandEnvironment >&
+        const uno::Reference< com::sun::star::ucb::XCommandEnvironment >& 
             rxEnv );
     inline ~ResultSet_Impl();
 };
@@ -236,11 +236,11 @@ inline ResultSet_Impl::~ResultSet_Impl()
 //=========================================================================
 //=========================================================================
 
-ResultSet::ResultSet(
+ResultSet::ResultSet( 
     const uno::Reference< lang::XMultiServiceFactory >& rxSMgr,
     const uno::Sequence< beans::Property >& rProperties,
     const rtl::Reference< ResultSetDataSupplier >& rDataSupplier )
-: m_pImpl( new ResultSet_Impl(
+: m_pImpl( new ResultSet_Impl( 
                rxSMgr,
                rProperties,
                rDataSupplier,
@@ -250,7 +250,7 @@ ResultSet::ResultSet(
 }
 
 //=========================================================================
-ResultSet::ResultSet(
+ResultSet::ResultSet( 
     const uno::Reference< lang::XMultiServiceFactory >& rxSMgr,
     const uno::Sequence< beans::Property >& rProperties,
     const rtl::Reference< ResultSetDataSupplier >& rDataSupplier,
@@ -609,7 +609,7 @@ sal_Bool SAL_CALL ResultSet::absolute( sal_Int32 row )
     else if ( row == 0 )
     {
         // @throws SQLException
-        //      ... if row is 0 ...
+        //		... if row is 0 ...
         throw sdbc::SQLException();
     }
     else // row > 0
@@ -648,8 +648,8 @@ sal_Bool SAL_CALL ResultSet::relative( sal_Int32 rows )
     Calling relative( 0 ) is valid, but does not change the cursor position.
 
     Calling relative( 1 ) is different from calling next() because it makes
-    sense to call next() when there is no current row, for example, when
-    the cursor is positioned before the first row or after the last row of
+    sense to call next() when there is no current row, for example,	when
+    the cursor is positioned before the first row or after the last	row of
     the result set.
 */
     if ( m_pImpl->m_bAfterLast || ( m_pImpl->m_nPos == 0 ) )
@@ -1147,7 +1147,7 @@ ResultSet::getCharacterStream( sal_Int32 columnIndex )
 
 //=========================================================================
 // virtual
-uno::Any SAL_CALL ResultSet::getObject(
+uno::Any SAL_CALL ResultSet::getObject( 
         sal_Int32 columnIndex,
         const uno::Reference< container::XNameAccess >& typeMap )
     throw( sdbc::SQLException, uno::RuntimeException )
@@ -1172,7 +1172,7 @@ uno::Any SAL_CALL ResultSet::getObject(
 
 //=========================================================================
 // virtual
-uno::Reference< sdbc::XRef > SAL_CALL
+uno::Reference< sdbc::XRef > SAL_CALL 
 ResultSet::getRef( sal_Int32 columnIndex )
     throw( sdbc::SQLException, uno::RuntimeException )
 {
@@ -1196,7 +1196,7 @@ ResultSet::getRef( sal_Int32 columnIndex )
 
 //=========================================================================
 // virtual
-uno::Reference< sdbc::XBlob > SAL_CALL
+uno::Reference< sdbc::XBlob > SAL_CALL 
 ResultSet::getBlob( sal_Int32 columnIndex )
     throw( sdbc::SQLException, uno::RuntimeException )
 {
@@ -1220,7 +1220,7 @@ ResultSet::getBlob( sal_Int32 columnIndex )
 
 //=========================================================================
 // virtual
-uno::Reference< sdbc::XClob > SAL_CALL
+uno::Reference< sdbc::XClob > SAL_CALL 
 ResultSet::getClob( sal_Int32 columnIndex )
     throw( sdbc::SQLException, uno::RuntimeException )
 {
@@ -1244,7 +1244,7 @@ ResultSet::getClob( sal_Int32 columnIndex )
 
 //=========================================================================
 // virtual
-uno::Reference< sdbc::XArray > SAL_CALL
+uno::Reference< sdbc::XArray > SAL_CALL 
 ResultSet::getArray( sal_Int32 columnIndex )
     throw( sdbc::SQLException, uno::RuntimeException )
 {
@@ -1299,7 +1299,7 @@ rtl::OUString SAL_CALL ResultSet::queryContentIdentifierString()
 
 //=========================================================================
 // virtual
-uno::Reference< com::sun::star::ucb::XContentIdentifier > SAL_CALL
+uno::Reference< com::sun::star::ucb::XContentIdentifier > SAL_CALL 
 ResultSet::queryContentIdentifier()
     throw( uno::RuntimeException )
 {
@@ -1312,7 +1312,7 @@ ResultSet::queryContentIdentifier()
 
 //=========================================================================
 // virtual
-uno::Reference< com::sun::star::ucb::XContent > SAL_CALL
+uno::Reference< com::sun::star::ucb::XContent > SAL_CALL 
 ResultSet::queryContent()
     throw( uno::RuntimeException )
 {
@@ -1329,7 +1329,7 @@ ResultSet::queryContent()
 //=========================================================================
 
 // virtual
-uno::Reference< beans::XPropertySetInfo > SAL_CALL
+uno::Reference< beans::XPropertySetInfo > SAL_CALL 
 ResultSet::getPropertySetInfo()
     throw( uno::RuntimeException )
 {
@@ -1376,7 +1376,7 @@ void SAL_CALL ResultSet::setPropertyValue( const rtl::OUString& aPropertyName,
 
 //=========================================================================
 // virtual
-uno::Any SAL_CALL ResultSet::getPropertyValue(
+uno::Any SAL_CALL ResultSet::getPropertyValue( 
         const rtl::OUString& PropertyName )
     throw( beans::UnknownPropertyException,
            lang::WrappedTargetException,
@@ -1466,7 +1466,7 @@ void SAL_CALL ResultSet::addVetoableChangeListener(
            lang::WrappedTargetException,
            uno::RuntimeException )
 {
-    //  No constrained props, at the moment.
+    //	No constrained props, at the moment.
 }
 
 //=========================================================================
@@ -1478,7 +1478,7 @@ void SAL_CALL ResultSet::removeVetoableChangeListener(
            lang::WrappedTargetException,
            uno::RuntimeException )
 {
-    //  No constrained props, at the moment.
+    //	No constrained props, at the moment.
 }
 
 //=========================================================================
@@ -1533,12 +1533,12 @@ void ResultSet::rowCountChanged( sal_uInt32 nOld, sal_uInt32 nNew )
         return;
 
     propertyChanged(
-        beans::PropertyChangeEvent(
+        beans::PropertyChangeEvent( 
             static_cast< cppu::OWeakObject * >( this ),
             rtl::OUString::createFromAscii( "RowCount" ),
             sal_False,
             1001,
-            uno::makeAny( nOld ),     // old value
+            uno::makeAny( nOld ),	  // old value
             uno::makeAny( nNew ) ) ); // new value
 }
 
@@ -1549,23 +1549,23 @@ void ResultSet::rowCountFinal()
         return;
 
     propertyChanged(
-        beans::PropertyChangeEvent(
+        beans::PropertyChangeEvent( 
             static_cast< cppu::OWeakObject * >( this ),
             rtl::OUString::createFromAscii( "IsRowCountFinal" ),
             sal_False,
             1000,
-            uno:: makeAny( sal_False ),   // old value
+            uno:: makeAny( sal_False ),	  // old value
             uno::makeAny( sal_True ) ) ); // new value
 }
 
 //=========================================================================
-const uno::Sequence< beans::Property >& ResultSet::getProperties()
+const uno::Sequence< beans::Property >&	ResultSet::getProperties()
 {
     return m_pImpl->m_aProperties;
 }
 
 //=========================================================================
-const uno::Reference< com::sun::star::ucb::XCommandEnvironment >&
+const uno::Reference< com::sun::star::ucb::XCommandEnvironment >& 
 ResultSet::getEnvironment()
 {
     return m_pImpl->m_xEnv;
@@ -1600,9 +1600,9 @@ PropertySetInfo::PropertySetInfo(
         {
             beans::Property& rProp = pProperties[ n ];
 
-            rProp.Name       = rtl::OUString::createFromAscii( pEntry->pName );
-            rProp.Handle     = pEntry->nHandle;
-            rProp.Type       = pEntry->pGetCppuType();
+            rProp.Name		 = rtl::OUString::createFromAscii( pEntry->pName );
+            rProp.Handle	 = pEntry->nHandle;
+            rProp.Type		 = pEntry->pGetCppuType();
             rProp.Attributes = pEntry->nAttributes;
 
             pEntry++;
@@ -1652,7 +1652,7 @@ uno::Sequence< beans::Property > SAL_CALL PropertySetInfo::getProperties()
 
 //=========================================================================
 // virtual
-beans::Property SAL_CALL PropertySetInfo::getPropertyByName(
+beans::Property SAL_CALL PropertySetInfo::getPropertyByName( 
         const rtl::OUString& aName )
     throw( beans::UnknownPropertyException, uno::RuntimeException )
 {
@@ -1665,7 +1665,7 @@ beans::Property SAL_CALL PropertySetInfo::getPropertyByName(
 
 //=========================================================================
 // virtual
-sal_Bool SAL_CALL PropertySetInfo::hasPropertyByName(
+sal_Bool SAL_CALL PropertySetInfo::hasPropertyByName( 
         const rtl::OUString& Name )
     throw( uno::RuntimeException )
 {
diff --git a/ucbhelper/source/provider/resultsethelper.cxx b/ucbhelper/source/provider/resultsethelper.cxx
index a10f527b2ba9..9d0665b4b8ec 100644
--- a/ucbhelper/source/provider/resultsethelper.cxx
+++ b/ucbhelper/source/provider/resultsethelper.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
@@ -116,9 +116,9 @@ XTYPEPROVIDER_IMPL_3( ResultSetImplHelper,
 //=========================================================================
 
 XSERVICEINFO_NOFACTORY_IMPL_1( ResultSetImplHelper,
-                               rtl::OUString::createFromAscii(
+                               rtl::OUString::createFromAscii( 
                                    "ResultSetImplHelper" ),
-                               rtl::OUString::createFromAscii(
+                               rtl::OUString::createFromAscii( 
                                    DYNAMICRESULTSET_SERVICE_NAME ) );
 
 //=========================================================================
@@ -150,7 +150,7 @@ void SAL_CALL ResultSetImplHelper::addEventListener(
     osl::MutexGuard aGuard( m_aMutex );
 
     if ( !m_pDisposeEventListeners )
-        m_pDisposeEventListeners
+        m_pDisposeEventListeners 
             = new cppu::OInterfaceContainerHelper( m_aMutex );
 
     m_pDisposeEventListeners->addInterface( Listener );
@@ -175,9 +175,9 @@ void SAL_CALL ResultSetImplHelper::removeEventListener(
 //=========================================================================
 
 // virtual
-uno::Reference< sdbc::XResultSet > SAL_CALL
+uno::Reference< sdbc::XResultSet > SAL_CALL 
 ResultSetImplHelper::getStaticResultSet()
-    throw( com::sun::star::ucb::ListenerAlreadySetException,
+    throw( com::sun::star::ucb::ListenerAlreadySetException,	
            uno::RuntimeException )
 {
     osl::MutexGuard aGuard( m_aMutex );
@@ -216,13 +216,13 @@ void SAL_CALL ResultSetImplHelper::setListener(
     init( sal_False );
 
     uno::Any aInfo;
-    aInfo <<= com::sun::star::ucb::WelcomeDynamicResultSetStruct(
+    aInfo <<= com::sun::star::ucb::WelcomeDynamicResultSetStruct( 
         m_xResultSet1 /* "old" */,
         m_xResultSet2 /* "new" */ );
 
     uno::Sequence< com::sun::star::ucb::ListAction > aActions( 1 );
-    aActions.getArray()[ 0 ]
-        = com::sun::star::ucb::ListAction(
+    aActions.getArray()[ 0 ] 
+        = com::sun::star::ucb::ListAction( 
             0, // Position; not used
             0, // Count; not used
             com::sun::star::ucb::ListActionType::WELCOME,
@@ -230,7 +230,7 @@ void SAL_CALL ResultSetImplHelper::setListener(
     aGuard.clear();
 
     Listener->notify(
-        com::sun::star::ucb::ListEvent(
+        com::sun::star::ucb::ListEvent( 
             static_cast< cppu::OWeakObject * >( this ), aActions ) );
 }
 
@@ -246,7 +246,7 @@ sal_Int16 SAL_CALL ResultSetImplHelper::getCapabilities()
 //=========================================================================
 // virtual
 void SAL_CALL ResultSetImplHelper::connectToCache(
-        const uno::Reference< com::sun::star::ucb::XDynamicResultSet > &
+        const uno::Reference< com::sun::star::ucb::XDynamicResultSet > & 
             xCache )
     throw( com::sun::star::ucb::ListenerAlreadySetException,
            com::sun::star::ucb::AlreadyInitializedException,
@@ -259,17 +259,17 @@ void SAL_CALL ResultSetImplHelper::connectToCache(
     if ( m_bStatic )
         throw com::sun::star::ucb::ListenerAlreadySetException();
 
-    uno::Reference< com::sun::star::ucb::XSourceInitialization >
+    uno::Reference< com::sun::star::ucb::XSourceInitialization > 
         xTarget( xCache, uno::UNO_QUERY );
     if ( xTarget.is() )
     {
-        uno::Reference<
-            com::sun::star::ucb::XCachedDynamicResultSetStubFactory >
+        uno::Reference< 
+            com::sun::star::ucb::XCachedDynamicResultSetStubFactory > 
                 xStubFactory;
         try
         {
-            xStubFactory
-                = uno::Reference<
+            xStubFactory 
+                = uno::Reference< 
                     com::sun::star::ucb::XCachedDynamicResultSetStubFactory >(
                         m_xSMgr->createInstance(
                             rtl::OUString::createFromAscii(
diff --git a/ucbhelper/source/provider/resultsetmetadata.cxx b/ucbhelper/source/provider/resultsetmetadata.cxx
index 30ba735943bc..2c024a489cff 100644
--- a/ucbhelper/source/provider/resultsetmetadata.cxx
+++ b/ucbhelper/source/provider/resultsetmetadata.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
@@ -61,10 +61,10 @@ namespace ucbhelper_impl {
 
 struct ResultSetMetaData_Impl
 {
-    osl::Mutex                                      m_aMutex;
+    osl::Mutex						   	            m_aMutex;
     std::vector< ::ucbhelper::ResultSetColumnData > m_aColumnData;
-    sal_Bool                                        m_bObtainedTypes;
-    sal_Bool                                        m_bGlobalReadOnlyValue;
+    sal_Bool 						   	            m_bObtainedTypes;
+    sal_Bool							            m_bGlobalReadOnlyValue;
 
     ResultSetMetaData_Impl( sal_Int32 nSize )
     : m_aColumnData( nSize ), m_bObtainedTypes( sal_False ),
@@ -482,34 +482,34 @@ sal_Int32 SAL_CALL ResultSetMetaData::getColumnType( sal_Int32 column )
     if ( rType == getCppuType( static_cast< const rtl::OUString * >( 0 ) ) )
         nType = DataType::VARCHAR;  // XRow::getString
     else if ( rType == getCppuBooleanType() )
-        nType = DataType::BIT;      // XRow::getBoolean
+        nType = DataType::BIT;		// XRow::getBoolean
     else if ( rType == getCppuType( static_cast< const sal_Int32 * >( 0 ) ) )
-        nType = DataType::INTEGER;  // XRow::getInt
+        nType = DataType::INTEGER;	// XRow::getInt
     else if ( rType == getCppuType( static_cast< const sal_Int64 * >( 0 ) ) )
-        nType = DataType::BIGINT;   // XRow::getLong
+        nType = DataType::BIGINT;	// XRow::getLong
     else if ( rType == getCppuType( static_cast< const sal_Int16 * >( 0 ) ) )
-        nType = DataType::SMALLINT; // XRow::getShort
+        nType = DataType::SMALLINT;	// XRow::getShort
     else if ( rType == getCppuType( static_cast< const sal_Int8 * >( 0 ) ) )
-        nType = DataType::TINYINT;  // XRow::getByte
+        nType = DataType::TINYINT;	// XRow::getByte
     else if ( rType == getCppuType( static_cast< const float * >( 0 ) ) )
-        nType = DataType::REAL;     // XRow::getFloat
+        nType = DataType::REAL;  	// XRow::getFloat
     else if ( rType == getCppuType( static_cast< const double * >( 0 ) ) )
-        nType = DataType::DOUBLE;   // XRow::getDouble
+        nType = DataType::DOUBLE;  	// XRow::getDouble
     else if ( rType == getCppuType( static_cast< const Sequence< sal_Int8 > * >( 0 ) ) )
         nType = DataType::VARBINARY;// XRow::getBytes
     else if ( rType == getCppuType( static_cast< const Date * >( 0 ) ) )
-        nType = DataType::DATE;     // XRow::getDate
+        nType = DataType::DATE;		// XRow::getDate
     else if ( rType == getCppuType( static_cast< const Time * >( 0 ) ) )
-        nType = DataType::TIME;     // XRow::getTime
+        nType = DataType::TIME;		// XRow::getTime
     else if ( rType == getCppuType( static_cast< const DateTime * >( 0 ) ) )
         nType = DataType::TIMESTAMP;// XRow::getTimestamp
     else if ( rType == getCppuType( static_cast< Reference< XInputStream > * >( 0 ) ) )
-        nType = DataType::LONGVARBINARY;    // XRow::getBinaryStream
-//      nType = DataType::LONGVARCHAR;      // XRow::getCharacterStream
+        nType = DataType::LONGVARBINARY;	// XRow::getBinaryStream
+//		nType = DataType::LONGVARCHAR;		// XRow::getCharacterStream
     else if ( rType == getCppuType( static_cast< Reference< XClob > * >( 0 ) ) )
-        nType = DataType::CLOB; // XRow::getClob
+        nType = DataType::CLOB;	// XRow::getClob
     else if ( rType == getCppuType( static_cast< Reference< XBlob > * >( 0 ) ) )
-        nType = DataType::BLOB; // XRow::getBlob
+        nType = DataType::BLOB;	// XRow::getBlob
     else if ( rType == getCppuType( static_cast< Reference< XArray > * >( 0 ) ) )
         nType = DataType::ARRAY;// XRow::getArray
     else if ( rType == getCppuType( static_cast< Reference< XRef > * >( 0 ) ) )
diff --git a/ucbhelper/source/provider/simplecertificatevalidationrequest.cxx b/ucbhelper/source/provider/simplecertificatevalidationrequest.cxx
index 8a34dc3c4e13..a8f694d1c698 100755
--- a/ucbhelper/source/provider/simplecertificatevalidationrequest.cxx
+++ b/ucbhelper/source/provider/simplecertificatevalidationrequest.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
@@ -34,7 +34,7 @@ using namespace com::sun::star;
 using namespace ucbhelper;
 
 //=========================================================================
-SimpleCertificateValidationRequest::SimpleCertificateValidationRequest( const sal_Int32 & lCertificateValidity,
+SimpleCertificateValidationRequest::SimpleCertificateValidationRequest( const sal_Int32 & lCertificateValidity, 
                                                                         const com::sun::star::uno::Reference<com::sun::star::security::XCertificate> pCertificate,
                                                                         const rtl::OUString & hostname)
 {
@@ -43,9 +43,9 @@ SimpleCertificateValidationRequest::SimpleCertificateValidationRequest( const sa
     aRequest.CertificateValidity = lCertificateValidity;
     aRequest.Certificate = pCertificate;
     aRequest.HostName = hostname;
-
+    
     setRequest( uno::makeAny( aRequest ) );
-
+ 
     uno::Sequence< uno::Reference< task::XInteractionContinuation > > aContinuations( 2 );
     aContinuations[ 0 ] = new InteractionAbort( this );
     aContinuations[ 1 ] = new InteractionApprove( this );
diff --git a/ucbhelper/source/provider/simpleinteractionrequest.cxx b/ucbhelper/source/provider/simpleinteractionrequest.cxx
index 6f5fb5d4e820..98ab8950419e 100644
--- a/ucbhelper/source/provider/simpleinteractionrequest.cxx
+++ b/ucbhelper/source/provider/simpleinteractionrequest.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
diff --git a/ucbhelper/source/provider/simpleioerrorrequest.cxx b/ucbhelper/source/provider/simpleioerrorrequest.cxx
index da6eea06cda0..ae5196789c7c 100644
--- a/ucbhelper/source/provider/simpleioerrorrequest.cxx
+++ b/ucbhelper/source/provider/simpleioerrorrequest.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
diff --git a/ucbhelper/source/provider/simplenameclashresolverequest.cxx b/ucbhelper/source/provider/simplenameclashresolverequest.cxx
index 3c3c69d93b3e..c6d693d13348 100644
--- a/ucbhelper/source/provider/simplenameclashresolverequest.cxx
+++ b/ucbhelper/source/provider/simplenameclashresolverequest.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
diff --git a/ucbhelper/util/ucbhelper.xml b/ucbhelper/util/ucbhelper.xml
index 8e13b5f7bc0c..4b3dca3f5f03 100644
--- a/ucbhelper/util/ucbhelper.xml
+++ b/ucbhelper/util/ucbhelper.xml
@@ -9,10 +9,10 @@
     <project-build-dependency> cppu               </project-build-dependency>
     <project-build-dependency> cppuhelper         </project-build-dependency>
 
-    <runtime-module-dependency> sal3              </runtime-module-dependency>
-    <runtime-module-dependency> salhelper3$(COM)  </runtime-module-dependency>
-    <runtime-module-dependency> cppu3             </runtime-module-dependency>
-    <runtime-module-dependency> cppuhelper3$(COM) </runtime-module-dependency>
+    <runtime-module-dependency>	sal3		  	  </runtime-module-dependency>
+    <runtime-module-dependency>	salhelper3$(COM)  </runtime-module-dependency>
+    <runtime-module-dependency>	cppu3		  	  </runtime-module-dependency>
+    <runtime-module-dependency>	cppuhelper3$(COM) </runtime-module-dependency>
 
     <service-dependency>
     com.sun.star.configuration.ConfigurationAccess
diff --git a/ucbhelper/workben/myucp/myucp_content.cxx b/ucbhelper/workben/myucp/myucp_content.cxx
index bea998b60f28..d8223ec110b5 100644
--- a/ucbhelper/workben/myucp/myucp_content.cxx
+++ b/ucbhelper/workben/myucp/myucp_content.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
@@ -182,7 +182,7 @@ uno::Sequence< uno::Type > SAL_CALL Content::getTypes()
 rtl::OUString SAL_CALL Content::getImplementationName()
     throw( uno::RuntimeException )
 {
-    // @@@ Adjust implementation name.
+    // @@@ Adjust implementation name. 
     // Prefix with reversed company domain name.
     return rtl::OUString::createFromAscii( "com.sun.star.comp.myucp.Content" );
 }
@@ -438,7 +438,7 @@ uno::Any SAL_CALL Content::execute(
         removeAdditionalPropertySet( sal_True );
 
         // Remove own and all childrens(!) persistent data.
-//      removeData();
+//		removeData();
     }
 #endif // IMPLEMENT_COMMAND_DELETE
     else
@@ -491,7 +491,7 @@ uno::Reference< sdbc::XRow > Content::getPropertyValues(
             const uno::Reference< lang::XMultiServiceFactory >& rSMgr,
             const uno::Sequence< beans::Property >& rProperties,
             const ContentProperties& rData,
-            const rtl::Reference<
+            const rtl::Reference< 
                 ::ucbhelper::ContentProviderImplHelper >& rProvider,
             const rtl::OUString& rContentId )
 {
@@ -659,11 +659,11 @@ uno::Sequence< uno::Any > Content::setPropertyValues(
 
     beans::PropertyChangeEvent aEvent;
     aEvent.Source         = static_cast< cppu::OWeakObject * >( this );
-    aEvent.Further        = sal_False;
-//  aEvent.PropertyName   =
+    aEvent.Further 		  = sal_False;
+//	aEvent.PropertyName	  =
     aEvent.PropertyHandle = -1;
-//  aEvent.OldValue       =
-//  aEvent.NewValue       =
+//	aEvent.OldValue		  =
+//	aEvent.NewValue       =
 
     const beans::PropertyValue* pValues = rValues.getConstArray();
     sal_Int32 nCount = rValues.getLength();
@@ -769,7 +769,7 @@ uno::Sequence< uno::Any > Content::setPropertyValues(
                                                 rValue.Name, rValue.Value );
 
                         aEvent.PropertyName = rValue.Name;
-                        aEvent.OldValue     = aOldValue;
+                        aEvent.OldValue		= aOldValue;
                         aEvent.NewValue     = rValue.Value;
 
                         aChanges.getArray()[ nChanged ] = aEvent;
@@ -810,7 +810,7 @@ uno::Sequence< uno::Any > Content::setPropertyValues(
     if ( nChanged > 0 )
     {
         // @@@ Save changes.
-//      storeData();
+//		storeData();
 
         aGuard.clear();
         aChanges.realloc( nChanged );
@@ -851,7 +851,7 @@ void Content::queryChildren( ContentRefList& rChildren )
     while ( it != end )
     {
         ::ucbhelper::ContentImplHelperRef xChild = (*it);
-        ::rtl::OUString aChildURL
+        ::rtl::OUString aChildURL 
               = xChild->getIdentifier()->getContentIdentifier();
 
         // Is aURL a prefix of aChildURL?
@@ -885,7 +885,7 @@ void Content::insert(
     // Check, if all required properties were set.
 
 #if 0
-    // @@@ add checks for property presence
+    // @@@ add checks for property presence 
     if ( m_aProps.xxxx == yyyyy )
     {
         OSL_ENSURE( sal_False, "Content::insert - property value missing!" );
@@ -941,7 +941,7 @@ void Content::insert(
     m_xIdentifier = xId;
 
 //  @@@
-//  storeData();
+//	storeData();
 
     aGuard.clear();
     inserted();
diff --git a/ucbhelper/workben/myucp/myucp_content.hxx b/ucbhelper/workben/myucp/myucp_content.hxx
index 0645b0262683..566ad3019d17 100644
--- a/ucbhelper/workben/myucp/myucp_content.hxx
+++ b/ucbhelper/workben/myucp/myucp_content.hxx
@@ -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
@@ -62,10 +62,10 @@ namespace myucp
 
 struct ContentProperties
 {
-    ::rtl::OUString aTitle;         // Title
-    ::rtl::OUString aContentType;   // ContentType
+    ::rtl::OUString aTitle;    		// Title
+    ::rtl::OUString aContentType;	// ContentType
     sal_Bool        bIsDocument;    // IsDocument
-    sal_Bool        bIsFolder;      // IsFolder
+    sal_Bool        bIsFolder;    	// IsFolder
 
     // @@@ Add other properties supported by your content.
 
diff --git a/ucbhelper/workben/myucp/myucp_contentcaps.cxx b/ucbhelper/workben/myucp/myucp_contentcaps.cxx
index d6981fd2f598..3a6ba295b6b9 100644
--- a/ucbhelper/workben/myucp/myucp_contentcaps.cxx
+++ b/ucbhelper/workben/myucp/myucp_contentcaps.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
@@ -82,7 +82,7 @@ uno::Sequence< beans::Property > Content::getProperties(
     //           is preferred! In fact you should return a table conatining
     //           even that dynamicly added properties.
 
-//  osl::Guard< osl::Mutex > aGuard( m_aMutex );
+//	osl::Guard< osl::Mutex > aGuard( m_aMutex );
 
     //=================================================================
     //
@@ -140,7 +140,7 @@ uno::Sequence< ucb::CommandInfo > Content::getCommands(
 {
     // @@@ Add additional commands...
 
-//  osl::Guard< osl::Mutex > aGuard( m_aMutex );
+//	osl::Guard< osl::Mutex > aGuard( m_aMutex );
 
     //=================================================================
     //
diff --git a/ucbhelper/workben/myucp/myucp_datasupplier.cxx b/ucbhelper/workben/myucp/myucp_datasupplier.cxx
index 467d7ec0c505..0dc6e24ba6f0 100644
--- a/ucbhelper/workben/myucp/myucp_datasupplier.cxx
+++ b/ucbhelper/workben/myucp/myucp_datasupplier.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
@@ -56,11 +56,11 @@ namespace myucp
 
 struct ResultListEntry
 {
-    rtl::OUString                             aId;
+    rtl::OUString						      aId;
     uno::Reference< ucb::XContentIdentifier > xId;
-    uno::Reference< ucb::XContent >           xContent;
-    uno::Reference< sdbc::XRow >              xRow;
-    const ContentProperties&                  rData;
+    uno::Reference< ucb::XContent > 		  xContent;
+    uno::Reference< sdbc::XRow > 			  xRow;
+    const ContentProperties& 		          rData;
 
     ResultListEntry( const ContentProperties& rEntry ) : rData( rEntry ) {}
 };
@@ -81,21 +81,21 @@ typedef std::vector< ResultListEntry* > ResultList;
 
 struct DataSupplier_Impl
 {
-    osl::Mutex                                   m_aMutex;
-    ResultList                                   m_aResults;
-    rtl::Reference< Content >                    m_xContent;
+    osl::Mutex					                 m_aMutex;
+    ResultList					                 m_aResults;
+    rtl::Reference< Content >     	             m_xContent;
     uno::Reference< lang::XMultiServiceFactory > m_xSMgr;
 // @@@ The data source and an iterator for it
-//  Entry                                        m_aFolder;
-//  Entry::iterator                              m_aIterator;
-      sal_Int32                                  m_nOpenMode;
-      sal_Bool                                   m_bCountFinal;
+//	Entry 		 	      	  		             m_aFolder;
+//	Entry::iterator 		  		             m_aIterator;
+      sal_Int32					                 m_nOpenMode;
+      sal_Bool					                 m_bCountFinal;
 
     DataSupplier_Impl( const uno::Reference< lang::XMultiServiceFactory >& rxSMgr,
                        const rtl::Reference< Content >& rContent,
                        sal_Int32 nOpenMode )
     : m_xContent( rContent ), m_xSMgr( rxSMgr ),
-//    m_aFolder( rxSMgr, rContent->getIdentifier()->getContentIdentifier() ),
+//	  m_aFolder( rxSMgr, rContent->getIdentifier()->getContentIdentifier() ),
       m_nOpenMode( nOpenMode ), m_bCountFinal( sal_False ) {}
     ~DataSupplier_Impl();
 };
@@ -166,7 +166,7 @@ rtl::OUString DataSupplier::queryContentIdentifierString( sal_uInt32 nIndex )
 
 //=========================================================================
 // virtual
-uno::Reference< ucb::XContentIdentifier >
+uno::Reference< ucb::XContentIdentifier > 
 DataSupplier::queryContentIdentifier( sal_uInt32 nIndex )
 {
     osl::Guard< osl::Mutex > aGuard( m_pImpl->m_aMutex );
@@ -185,7 +185,7 @@ DataSupplier::queryContentIdentifier( sal_uInt32 nIndex )
     rtl::OUString aId = queryContentIdentifierString( nIndex );
     if ( aId.getLength() )
     {
-        uno::Reference< ucb::XContentIdentifier > xId
+        uno::Reference< ucb::XContentIdentifier > xId 
             = new ::ucbhelper::ContentIdentifier( aId );
         m_pImpl->m_aResults[ nIndex ]->xId = xId;
         return xId;
@@ -195,7 +195,7 @@ DataSupplier::queryContentIdentifier( sal_uInt32 nIndex )
 
 //=========================================================================
 // virtual
-uno::Reference< ucb::XContent >
+uno::Reference< ucb::XContent > 
 DataSupplier::queryContent( sal_uInt32 nIndex )
 {
     osl::Guard< osl::Mutex > aGuard( m_pImpl->m_aMutex );
@@ -211,7 +211,7 @@ DataSupplier::queryContent( sal_uInt32 nIndex )
         }
     }
 
-    uno::Reference< ucb::XContentIdentifier > xId
+    uno::Reference< ucb::XContentIdentifier > xId 
         = queryContentIdentifier( nIndex );
     if ( xId.is() )
     {
@@ -342,7 +342,7 @@ sal_Bool DataSupplier::isCountFinal()
 
 //=========================================================================
 // virtual
-uno::Reference< sdbc::XRow >
+uno::Reference< sdbc::XRow > 
 DataSupplier::queryPropertyValues( sal_uInt32 nIndex  )
 {
     osl::Guard< osl::Mutex > aGuard( m_pImpl->m_aMutex );
diff --git a/ucbhelper/workben/myucp/myucp_datasupplier.hxx b/ucbhelper/workben/myucp/myucp_datasupplier.hxx
index 7d4cea7ec09e..cbba0d038107 100644
--- a/ucbhelper/workben/myucp/myucp_datasupplier.hxx
+++ b/ucbhelper/workben/myucp/myucp_datasupplier.hxx
@@ -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
diff --git a/ucbhelper/workben/myucp/myucp_provider.cxx b/ucbhelper/workben/myucp/myucp_provider.cxx
index 9fa3c1625fc2..c79756929fc6 100644
--- a/ucbhelper/workben/myucp/myucp_provider.cxx
+++ b/ucbhelper/workben/myucp/myucp_provider.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
diff --git a/ucbhelper/workben/myucp/myucp_provider.hxx b/ucbhelper/workben/myucp/myucp_provider.hxx
index 5fd9fe31ffad..cbaed9de16ca 100644
--- a/ucbhelper/workben/myucp/myucp_provider.hxx
+++ b/ucbhelper/workben/myucp/myucp_provider.hxx
@@ -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
@@ -42,14 +42,14 @@ namespace myucp {
 // create instances of the provider. Prefix with reversed company domain name.
 #define MYUCP_CONTENT_PROVIDER_SERVICE_NAME \
                 "com.sun.star.ucb.MyContentProvider"
-#define MYUCP_CONTENT_PROVIDER_SERVICE_NAME_LENGTH  34
+#define MYUCP_CONTENT_PROVIDER_SERVICE_NAME_LENGTH	34
 
 // URL scheme. This is the scheme the provider will be able to create
 // contents for. The UCB will select the provider ( i.e. in order to create
 // contents ) according to this scheme.
 #define MYUCP_URL_SCHEME \
                 "vnd.sun.star.myucp"
-#define MYUCP_URL_SCHEME_LENGTH 18
+#define MYUCP_URL_SCHEME_LENGTH	18
 
 // UCB Content Type.
 #define MYUCP_CONTENT_TYPE \
diff --git a/ucbhelper/workben/myucp/myucp_resultset.cxx b/ucbhelper/workben/myucp/myucp_resultset.cxx
index d5d45ddfb97c..5ca1cf2d78f8 100644
--- a/ucbhelper/workben/myucp/myucp_resultset.cxx
+++ b/ucbhelper/workben/myucp/myucp_resultset.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
diff --git a/ucbhelper/workben/myucp/myucp_resultset.hxx b/ucbhelper/workben/myucp/myucp_resultset.hxx
index 3430e944cb13..38583109a3fa 100644
--- a/ucbhelper/workben/myucp/myucp_resultset.hxx
+++ b/ucbhelper/workben/myucp/myucp_resultset.hxx
@@ -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
diff --git a/ucbhelper/workben/myucp/myucp_services.cxx b/ucbhelper/workben/myucp/myucp_services.cxx
index a0cd8a00925b..f860fcc4e65e 100644
--- a/ucbhelper/workben/myucp/myucp_services.cxx
+++ b/ucbhelper/workben/myucp/myucp_services.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
diff --git a/ucbhelper/workben/ucbexplorer/ucbexplorer.cxx b/ucbhelper/workben/ucbexplorer/ucbexplorer.cxx
index 4ca6cb71881d..86d715bb25b7 100644
--- a/ucbhelper/workben/ucbexplorer/ucbexplorer.cxx
+++ b/ucbhelper/workben/ucbexplorer/ucbexplorer.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
diff --git a/ucbhelper/workben/ucbexplorer/ucbexplorer.hrc b/ucbhelper/workben/ucbexplorer/ucbexplorer.hrc
index e93730da99ef..919ca605a859 100644
--- a/ucbhelper/workben/ucbexplorer/ucbexplorer.hrc
+++ b/ucbhelper/workben/ucbexplorer/ucbexplorer.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
@@ -37,29 +37,29 @@
 #ifndef _UCBEXPLORER_HRC
 #define _UCBEXPLORER_HRC
 
-#define MENU_MAIN           1000
+#define MENU_MAIN          	1000
 #define MENU_FILE           100
 #define MENU_EXIT           10
 
-#define MENU_POPUP          1001
-#define MENU_NEW            10
-#define MENU_RENAME         11
-#define MENU_DELETE         12
+#define MENU_POPUP			1001
+#define MENU_NEW			10
+#define MENU_RENAME			11
+#define MENU_DELETE			12
 
-#define TEXT_TITLEBAR       5000
+#define TEXT_TITLEBAR     	5000
 
-#define BMP_FOLDER_CLOSED   6001
-#define BMP_FOLDER_OPENED   6002
-#define BMP_DOCUMENT        6003
-#define BMP_LINK            6004
+#define BMP_FOLDER_CLOSED	6001
+#define BMP_FOLDER_OPENED	6002
+#define BMP_DOCUMENT		6003
+#define BMP_LINK			6004
 
-#define DLG_STRINGINPUT             7000
-#define FT_STRINGINPUT_DLG_NAME     10
-#define ED_STRINGINPUT_DLG_NAME     11
-#define GB_STRINGINPUT_DLG_NAME     12
-#define BT_STRINGINPUT_DLG_OK       13
-#define BT_STRINGINPUT_DLG_CANCEL   14
-#define BT_STRINGINPUT_DLG_HELP     15
+#define DLG_STRINGINPUT				7000
+#define FT_STRINGINPUT_DLG_NAME		10
+#define ED_STRINGINPUT_DLG_NAME		11
+#define GB_STRINGINPUT_DLG_NAME		12
+#define BT_STRINGINPUT_DLG_OK		13
+#define BT_STRINGINPUT_DLG_CANCEL	14
+#define BT_STRINGINPUT_DLG_HELP		15
 
 
 #endif /* !_UCBEXPLORER_HRC */
diff --git a/ucbhelper/workben/ucbexplorer/ucbexplorer.src b/ucbhelper/workben/ucbexplorer/ucbexplorer.src
index 4bee5900eaaf..8e7a1193934d 100644
--- a/ucbhelper/workben/ucbexplorer/ucbexplorer.src
+++ b/ucbhelper/workben/ucbexplorer/ucbexplorer.src
@@ -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
diff --git a/unotools/inc/pch/precompiled_unotools.cxx b/unotools/inc/pch/precompiled_unotools.cxx
index 56609a47e969..d3121e5d7654 100644
--- a/unotools/inc/pch/precompiled_unotools.cxx
+++ b/unotools/inc/pch/precompiled_unotools.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
diff --git a/unotools/inc/pch/precompiled_unotools.hxx b/unotools/inc/pch/precompiled_unotools.hxx
index dec72c148da6..cd6956c38af4 100644
--- a/unotools/inc/pch/precompiled_unotools.hxx
+++ b/unotools/inc/pch/precompiled_unotools.hxx
@@ -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
diff --git a/unotools/inc/unotools/accelcfg.hxx b/unotools/inc/unotools/accelcfg.hxx
index a1884d34fbc3..30a5fec00a5c 100644
--- a/unotools/inc/unotools/accelcfg.hxx
+++ b/unotools/inc/unotools/accelcfg.hxx
@@ -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
@@ -60,7 +60,7 @@ public:
 
                     // get special accelerators
     static SvtAcceleratorConfiguration* CreateFromStream( SvStream& rStream );
-    static String   GetStreamName();
+    static String	GetStreamName();
     static SvStream* GetDefaultStream( StreamMode );
 
                     virtual ~SvtAcceleratorConfiguration();
diff --git a/unotools/inc/unotools/accessiblerelationsethelper.hxx b/unotools/inc/unotools/accessiblerelationsethelper.hxx
index ba853381329f..1726b16eb2a6 100644
--- a/unotools/inc/unotools/accessiblerelationsethelper.hxx
+++ b/unotools/inc/unotools/accessiblerelationsethelper.hxx
@@ -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
@@ -53,12 +53,12 @@ namespace utl
 {
 //.........................................................................
 
-/** @descr
+/**	@descr
         This base class provides an implementation of the
         <code>AccessibleRelationSet</code> service.
 */
 class UNOTOOLS_DLLPUBLIC AccessibleRelationSetHelper
-    :   public cppu::WeakImplHelper1<
+    :	public cppu::WeakImplHelper1<
         ::com::sun::star::accessibility::XAccessibleRelationSet
         >
 {
@@ -67,7 +67,7 @@ public:
     AccessibleRelationSetHelper ();
     AccessibleRelationSetHelper (const AccessibleRelationSetHelper& rHelper);
 protected:
-    virtual ~AccessibleRelationSetHelper    (void);
+    virtual ~AccessibleRelationSetHelper	(void);
 public:
 
     //=====  XAccessibleRelationSet  ==========================================
@@ -134,25 +134,25 @@ public:
 
     //=====  XTypeProvider  ===================================================
 
-    /** Returns a sequence of all supported interfaces.
+    /**	Returns a sequence of all supported interfaces.
     */
     virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type> SAL_CALL
         getTypes (void)
         throw (::com::sun::star::uno::RuntimeException);
 
-    /** Returns a implementation id.
+    /**	Returns a implementation id.
     */
     virtual ::com::sun::star::uno::Sequence<sal_Int8> SAL_CALL
         getImplementationId (void)
         throw (::com::sun::star::uno::RuntimeException);
 
 protected:
-    /// Mutex guarding this object.
+    ///	Mutex guarding this object.
     ::vos::OMutex maMutex;
 
 private:
-    /// The implementation of this helper interface.
-    AccessibleRelationSetHelperImpl*    mpHelperImpl;
+    ///	The implementation of this helper interface.
+    AccessibleRelationSetHelperImpl*	mpHelperImpl;
 };
 
 //.........................................................................
diff --git a/unotools/inc/unotools/accessiblestatesethelper.hxx b/unotools/inc/unotools/accessiblestatesethelper.hxx
index 3847beeee146..40e4b4a2dda3 100644
--- a/unotools/inc/unotools/accessiblestatesethelper.hxx
+++ b/unotools/inc/unotools/accessiblestatesethelper.hxx
@@ -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
@@ -52,12 +52,12 @@ namespace utl
 {
 //.........................................................................
 
-/** @descr
+/**	@descr
         This base class provides an implementation of the
         <code>AccessibleStateSet</code> service.
 */
 class UNOTOOLS_DLLPUBLIC AccessibleStateSetHelper
-    :   public cppu::WeakImplHelper1<
+    :	public cppu::WeakImplHelper1<
         ::com::sun::star::accessibility::XAccessibleStateSet
         >
 {
@@ -78,7 +78,7 @@ public:
 
     AccessibleStateSetHelper ( const AccessibleStateSetHelper& rHelper );
 protected:
-    virtual ~AccessibleStateSetHelper   (void);
+    virtual ~AccessibleStateSetHelper	(void);
 public:
 
     //=====  XAccessibleStateSet  ==============================================
@@ -132,12 +132,12 @@ public:
 
     /** Adds a state to the set.
     */
-    void    AddState(sal_Int16 aState)
+    void	AddState(sal_Int16 aState)
         throw (::com::sun::star::uno::RuntimeException);
 
     /** Removes a state from the set if the set contains the state, otherwise nothing is done.
     */
-    void    RemoveState(sal_Int16 aState)
+    void	RemoveState(sal_Int16 aState)
         throw (::com::sun::star::uno::RuntimeException);
 
     /** Compares the set with the set given by rComparativeValue and puts the results
@@ -156,25 +156,25 @@ public:
 
     //=====  XTypeProvider  ===================================================
 
-    /** Returns a sequence of all supported interfaces.
+    /**	Returns a sequence of all supported interfaces.
     */
     virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type> SAL_CALL
         getTypes (void)
         throw (::com::sun::star::uno::RuntimeException);
 
-    /** Returns a implementation id.
+    /**	Returns a implementation id.
     */
     virtual ::com::sun::star::uno::Sequence<sal_Int8> SAL_CALL
         getImplementationId (void)
         throw (::com::sun::star::uno::RuntimeException);
 
 protected:
-    /// Mutex guarding this object.
+    ///	Mutex guarding this object.
     ::vos::OMutex maMutex;
 
 private:
-    /// The implementation of this helper interface.
-    AccessibleStateSetHelperImpl*   mpHelperImpl;
+    ///	The implementation of this helper interface.
+    AccessibleStateSetHelperImpl*	mpHelperImpl;
 };
 
 //.........................................................................
diff --git a/unotools/inc/unotools/atom.hxx b/unotools/inc/unotools/atom.hxx
index 8576b31f6970..0671931f9128 100644
--- a/unotools/inc/unotools/atom.hxx
+++ b/unotools/inc/unotools/atom.hxx
@@ -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
diff --git a/unotools/inc/unotools/bootstrap.hxx b/unotools/inc/unotools/bootstrap.hxx
index bbb476fdaf9e..8ff10e6bcc22 100644
--- a/unotools/inc/unotools/bootstrap.hxx
+++ b/unotools/inc/unotools/bootstrap.hxx
@@ -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
diff --git a/unotools/inc/unotools/cacheoptions.hxx b/unotools/inc/unotools/cacheoptions.hxx
index 432a91e67070..46aceacfa771 100644
--- a/unotools/inc/unotools/cacheoptions.hxx
+++ b/unotools/inc/unotools/cacheoptions.hxx
@@ -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
@@ -29,7 +29,7 @@
 #define INCLUDED_unotools_CACHEOPTIONS_HXX
 
 //_________________________________________________________________________________________________________________
-//  includes
+//	includes
 //_________________________________________________________________________________________________________________
 
 #include "unotools/unotoolsdllapi.h"
@@ -38,12 +38,12 @@
 #include <rtl/ustring.hxx>
 
 //_________________________________________________________________________________________________________________
-//  forward declarations
+//	forward declarations
 //_________________________________________________________________________________________________________________
 
 /*-************************************************************************************************************//**
-    @short          forward declaration to our private date container implementation
-    @descr          We use these class as internal member to support small memory requirements.
+    @short			forward declaration to our private date container implementation
+    @descr			We use these class as internal member to support small memory requirements.
                     You can create the container if it is neccessary. The class which use these mechanism
                     is faster and smaller then a complete implementation!
 *//*-*************************************************************************************************************/
@@ -51,108 +51,108 @@
 class SvtCacheOptions_Impl;
 
 //_________________________________________________________________________________________________________________
-//  declarations
+//	declarations
 //_________________________________________________________________________________________________________________
 
 /*-************************************************************************************************************//**
-    @short          collect informations about startup features
+    @short			collect informations about startup features
     @descr          -
 
-    @implements     -
-    @base           -
+    @implements		-
+    @base			-
 
-    @devstatus      ready to use
+    @devstatus		ready to use
 *//*-*************************************************************************************************************/
 
 class UNOTOOLS_DLLPUBLIC SvtCacheOptions
 {
     //-------------------------------------------------------------------------------------------------------------
-    //  public methods
+    //	public methods
     //-------------------------------------------------------------------------------------------------------------
 
     public:
 
         //---------------------------------------------------------------------------------------------------------
-        //  constructor / destructor
+        //	constructor / destructor
         //---------------------------------------------------------------------------------------------------------
 
         /*-****************************************************************************************************//**
-            @short      standard constructor and destructor
-            @descr      This will initialize an instance with default values.
+            @short		standard constructor and destructor
+            @descr		This will initialize an instance with default values.
                         We implement these class with a refcount mechanism! Every instance of this class increase it
                         at create and decrease it at delete time - but all instances use the same data container!
                         He is implemented as a static member ...
 
-            @seealso    member m_nRefCount
-            @seealso    member m_pDataContainer
+            @seealso	member m_nRefCount
+            @seealso	member m_pDataContainer
 
-            @param      -
-            @return     -
+            @param		-
+            @return		-
 
-            @onerror    -
+            @onerror	-
         *//*-*****************************************************************************************************/
 
          SvtCacheOptions();
         ~SvtCacheOptions();
 
         //---------------------------------------------------------------------------------------------------------
-        //  interface
+        //	interface
         //---------------------------------------------------------------------------------------------------------
 
         /*-****************************************************************************************************//**
-            @short      interface methods to get and set value of config key "org.openoffice.Office.Common/_3D-Engine/..."
+            @short		interface methods to get and set value of config key "org.openoffice.Office.Common/_3D-Engine/..."
             @descr      These options describe internal states to enable/disable features of installed office.
 
                         GetWriterOLE_Objects()
-                        SetWriterOLE_Objects()              =>  set the number of Writer OLE objects to be cached
+                        SetWriterOLE_Objects()				=>	set the number of Writer OLE objects to be cached
 
                         GetDrawingEngineOLE_Objects()
-                        SetDrawingEngineOLE_Objects()       =>  set the number of DrawingEngine OLE objects to be cached
+                        SetDrawingEngineOLE_Objects()		=>	set the number of DrawingEngine OLE objects to be cached
 
                         GetGraphicManagerTotalCacheSize()
-                        SetGraphicManagerTotalCacheSize()   =>  set the maximum cache size used by GraphicManager to cache graphic objects
+                        SetGraphicManagerTotalCacheSize()	=>	set the maximum cache size used by GraphicManager to cache graphic objects
 
                         GetGraphicManagerObjectCacheSize()
-                        SetGraphicManagerObjectCacheSize()  =>  set the maximum cache size for one GraphicObject to be cached by GraphicManager
+                        SetGraphicManagerObjectCacheSize()	=>	set the maximum cache size for one GraphicObject to be cached by GraphicManager
 
-            @seealso    configuration package "org.openoffice.Office.Common/_3D-Engine"
+            @seealso	configuration package "org.openoffice.Office.Common/_3D-Engine"
         *//*-*****************************************************************************************************/
 
-        sal_Int32   GetWriterOLE_Objects() const;
-        sal_Int32   GetDrawingEngineOLE_Objects() const;
-        sal_Int32   GetGraphicManagerTotalCacheSize() const;
-        sal_Int32   GetGraphicManagerObjectCacheSize() const;
-        sal_Int32   GetGraphicManagerObjectReleaseTime() const;
+        sal_Int32	GetWriterOLE_Objects() const;
+        sal_Int32	GetDrawingEngineOLE_Objects() const;
+        sal_Int32	GetGraphicManagerTotalCacheSize() const;
+        sal_Int32	GetGraphicManagerObjectCacheSize() const;
+        sal_Int32	GetGraphicManagerObjectReleaseTime() const;
 
-        void        SetWriterOLE_Objects( sal_Int32 nObjects );
-        void        SetDrawingEngineOLE_Objects( sal_Int32 nObjects );
-        void        SetGraphicManagerTotalCacheSize( sal_Int32 nTotalCacheSize );
-        void        SetGraphicManagerObjectCacheSize( sal_Int32 nObjectCacheSize );
+        void		SetWriterOLE_Objects( sal_Int32 nObjects );
+        void		SetDrawingEngineOLE_Objects( sal_Int32 nObjects );
+        void		SetGraphicManagerTotalCacheSize( sal_Int32 nTotalCacheSize );
+        void		SetGraphicManagerObjectCacheSize( sal_Int32 nObjectCacheSize );
         void        SetGraphicManagerObjectReleaseTime( sal_Int32 nReleaseTimeSeconds );
 
     //-------------------------------------------------------------------------------------------------------------
-    //  private methods
+    //	private methods
     //-------------------------------------------------------------------------------------------------------------
 
     private:
 
         /*-****************************************************************************************************//**
-            @short      return a reference to a static mutex
-            @descr      These class use his own static mutex to be threadsafe.
+            @short		return a reference to a static mutex
+            @descr		These class use his own static mutex to be threadsafe.
                         We create a static mutex only for one ime and use at different times.
 
-            @seealso    -
+            @seealso	-
 
-            @param      -
-            @return     A reference to a static mutex member.
+            @param		-
+            @return		A reference to a static mutex member.
 
-            @onerror    -
+            @onerror	-
         *//*-*****************************************************************************************************/
 
         UNOTOOLS_DLLPRIVATE static ::osl::Mutex& GetOwnStaticMutex();
 
     //-------------------------------------------------------------------------------------------------------------
-    //  private member
+    //	private member
     //-------------------------------------------------------------------------------------------------------------
 
     private:
@@ -165,8 +165,8 @@ class UNOTOOLS_DLLPUBLIC SvtCacheOptions
             Do it in your source only.
          */
 
-        static SvtCacheOptions_Impl*    m_pDataContainer    ;   /// impl. data container as dynamic pointer for smaller memory requirements!
-        static sal_Int32                m_nRefCount         ;   /// internal ref count mechanism
+        static SvtCacheOptions_Impl*	m_pDataContainer	;	/// impl. data container as dynamic pointer for smaller memory requirements!
+        static sal_Int32				m_nRefCount			;	/// internal ref count mechanism
 
 };
 
diff --git a/unotools/inc/unotools/calendarwrapper.hxx b/unotools/inc/unotools/calendarwrapper.hxx
index f5a8a06b1f6c..8ac8a240b667 100644
--- a/unotools/inc/unotools/calendarwrapper.hxx
+++ b/unotools/inc/unotools/calendarwrapper.hxx
@@ -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
@@ -52,9 +52,9 @@ namespace com { namespace sun { namespace star {
 class UNOTOOLS_DLLPUBLIC CalendarWrapper
 {
     ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > xSMgr;
-    ::com::sun::star::uno::Reference< ::com::sun::star::i18n::XExtendedCalendar >   xC;
+    ::com::sun::star::uno::Reference< ::com::sun::star::i18n::XExtendedCalendar >	xC;
 
-            DateTime            aEpochStart;        // 1Jan1970
+            DateTime			aEpochStart;		// 1Jan1970
 
 public:
                                 CalendarWrapper(
@@ -114,11 +114,11 @@ public:
                                     { return aEpochStart; }
 
     /// set a local (!) Gregorian DateTime
-    inline  void                setGregorianDateTime( const DateTime& rDateTime )
+    inline	void				setGregorianDateTime( const DateTime& rDateTime )
                                     { setLocalDateTime( rDateTime - aEpochStart ); }
 
     /// get the DateTime as a local (!) Gregorian DateTime
-    inline  DateTime            getGregorianDateTime() const
+    inline	DateTime			getGregorianDateTime() const
                                     { return aEpochStart + getLocalDateTime(); }
 
 private:
diff --git a/unotools/inc/unotools/charclass.hxx b/unotools/inc/unotools/charclass.hxx
index 4469ed8ffc3d..8d6f7f211d2d 100644
--- a/unotools/inc/unotools/charclass.hxx
+++ b/unotools/inc/unotools/charclass.hxx
@@ -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
@@ -29,7 +29,7 @@
 #ifndef _UNOTOOLS_CHARCLASS_HXX
 #define _UNOTOOLS_CHARCLASS_HXX
 
-#include <ctype.h>      // isdigit(), isalpha()
+#include <ctype.h>		// isdigit(), isalpha()
 #include <tools/string.hxx>
 #include <tools/solar.h>
 #include <com/sun/star/i18n/KCharacterType.hpp>
@@ -75,17 +75,17 @@ const sal_Int32 nCharClassNumericTypeMask =
 
 class UNOTOOLS_DLLPUBLIC CharClass
 {
-    ::com::sun::star::lang::Locale  aLocale;
-    ::com::sun::star::uno::Reference< ::com::sun::star::i18n::XCharacterClassification >    xCC;
+    ::com::sun::star::lang::Locale	aLocale;
+    ::com::sun::star::uno::Reference< ::com::sun::star::i18n::XCharacterClassification >	xCC;
     ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > xSMgr;
     mutable ::osl::Mutex        aMutex;
 
                                 // not implemented, prevent usage
                                 CharClass( const CharClass& );
-            CharClass&          operator=( const CharClass& );
+            CharClass&			operator=( const CharClass& );
 
                                 // instantiate component somehow
-            void                getComponentInstance();
+            void				getComponentInstance();
 
 public:
     /// Preferred ctor with service manager specified
@@ -103,49 +103,49 @@ public:
                                 ~CharClass();
 
     /// set a new Locale
-            void                setLocale( const ::com::sun::star::lang::Locale& rLocale );
+            void				setLocale( const ::com::sun::star::lang::Locale& rLocale );
 
     /// get current Locale
     const ::com::sun::star::lang::Locale& getLocale() const;
 
 
     /// isdigit() on ascii values
-    static  inline  sal_Bool    isAsciiDigit( sal_Unicode c )
+    static	inline	sal_Bool	isAsciiDigit( sal_Unicode c )
         { return c < 128 ? sal_Bool(isdigit( (unsigned char) c ) != 0) : sal_False; }
 
     /// isalpha() on ascii values
-    static  inline  sal_Bool    isAsciiAlpha( sal_Unicode c )
+    static	inline	sal_Bool	isAsciiAlpha( sal_Unicode c )
         { return c < 128 ? sal_Bool(isalpha( (unsigned char) c ) != 0) : sal_False; }
 
     /// isalnum() on ascii values
-    static  inline  sal_Bool    isAsciiAlphaNumeric( sal_Unicode c )
+    static	inline	sal_Bool	isAsciiAlphaNumeric( sal_Unicode c )
         { return c < 128 ? sal_Bool(isalnum( (unsigned char) c ) != 0) : sal_False; }
 
     /// isdigit() on ascii values of entire string
-    static  sal_Bool            isAsciiNumeric( const String& rStr );
+    static	sal_Bool			isAsciiNumeric( const String& rStr );
 
     /// isalpha() on ascii values of entire string
-    static  sal_Bool            isAsciiAlpha( const String& rStr );
+    static	sal_Bool			isAsciiAlpha( const String& rStr );
 
     /// isalnum() on ascii values of entire string
-    static  sal_Bool            isAsciiAlphaNumeric( const String& rStr );
+    static	sal_Bool			isAsciiAlphaNumeric( const String& rStr );
 
     /// whether type is pure alpha or not, e.g. return of getStringType
-    static  inline  sal_Bool    isAlphaType( sal_Int32 nType )
+    static	inline	sal_Bool	isAlphaType( sal_Int32 nType )
         {
             return ((nType & nCharClassAlphaType) != 0) &&
                 ((nType & ~(nCharClassAlphaTypeMask)) == 0);
         }
 
     /// whether type is pure numeric or not, e.g. return of getStringType
-    static  inline  sal_Bool    isNumericType( sal_Int32 nType )
+    static	inline	sal_Bool	isNumericType( sal_Int32 nType )
         {
             return ((nType & nCharClassNumericType) != 0) &&
                 ((nType & ~(nCharClassNumericTypeMask)) == 0);
         }
 
     /// whether type is pure alphanumeric or not, e.g. return of getStringType
-    static  inline  sal_Bool    isAlphaNumericType( sal_Int32 nType )
+    static	inline	sal_Bool	isAlphaNumericType( sal_Int32 nType )
         {
             return ((nType & (nCharClassAlphaType |
                 nCharClassNumericType)) != 0) &&
@@ -154,14 +154,14 @@ public:
         }
 
     /// whether type is pure letter or not, e.g. return of getStringType
-    static  inline  sal_Bool    isLetterType( sal_Int32 nType )
+    static	inline	sal_Bool	isLetterType( sal_Int32 nType )
         {
             return ((nType & nCharClassLetterType) != 0) &&
                 ((nType & ~(nCharClassLetterTypeMask)) == 0);
         }
 
     /// whether type is pure letternumeric or not, e.g. return of getStringType
-    static  inline  sal_Bool    isLetterNumericType( sal_Int32 nType )
+    static	inline	sal_Bool	isLetterNumericType( sal_Int32 nType )
         {
             return ((nType & (nCharClassLetterType |
                 nCharClassNumericType)) != 0) &&
@@ -172,20 +172,20 @@ public:
 
     // Wrapper implementations of class CharacterClassification
 
-            String              toUpper( const String& rStr, xub_StrLen nPos, xub_StrLen nCount ) const;
-            String              toLower( const String& rStr, xub_StrLen nPos, xub_StrLen nCount ) const;
-            String              toTitle( const String& rStr, xub_StrLen nPos, xub_StrLen nCount ) const;
+            String				toUpper( const String& rStr, xub_StrLen nPos, xub_StrLen nCount ) const;
+            String				toLower( const String& rStr, xub_StrLen nPos, xub_StrLen nCount ) const;
+            String				toTitle( const String& rStr, xub_StrLen nPos, xub_StrLen nCount ) const;
 
-            ::rtl::OUString     toUpper_rtl( const ::rtl::OUString& rStr, sal_Int32 nPos, sal_Int32 nCount ) const;
-            ::rtl::OUString     toLower_rtl( const ::rtl::OUString& rStr, sal_Int32 nPos, sal_Int32 nCount ) const;
+            ::rtl::OUString		toUpper_rtl( const ::rtl::OUString& rStr, sal_Int32 nPos, sal_Int32 nCount ) const;
+            ::rtl::OUString		toLower_rtl( const ::rtl::OUString& rStr, sal_Int32 nPos, sal_Int32 nCount ) const;
                 // use the postfix because compilers could get confused by the both similar versions
                 // (me thinks they shouldn't, but in fact MSCV 6 does)
 
-            sal_Int16           getType( const String& rStr, xub_StrLen nPos ) const;
-            sal_Int16           getCharacterDirection( const String& rStr, xub_StrLen nPos ) const;
-            sal_Int16           getScript( const String& rStr, xub_StrLen nPos ) const;
-            sal_Int32           getCharacterType( const String& rStr, xub_StrLen nPos ) const;
-            sal_Int32           getStringType( const String& rStr, xub_StrLen nPos, xub_StrLen nCount ) const;
+            sal_Int16			getType( const String& rStr, xub_StrLen nPos ) const;
+            sal_Int16			getCharacterDirection( const String& rStr, xub_StrLen nPos ) const;
+            sal_Int16			getScript( const String& rStr, xub_StrLen nPos ) const;
+            sal_Int32			getCharacterType( const String& rStr, xub_StrLen nPos ) const;
+            sal_Int32			getStringType( const String& rStr, xub_StrLen nPos, xub_StrLen nCount ) const;
 
     ::com::sun::star::i18n::ParseResult parseAnyToken(
                                     const String& rStr,
@@ -207,28 +207,28 @@ public:
 
     // Functionality of class International methods
 
-            sal_Bool            isAlpha( const String& rStr, xub_StrLen nPos ) const;
-            sal_Bool            isLetter( const String& rStr, xub_StrLen nPos ) const;
-            sal_Bool            isDigit( const String& rStr, xub_StrLen nPos ) const;
-            sal_Bool            isAlphaNumeric( const String& rStr, xub_StrLen nPos ) const;
-            sal_Bool            isLetterNumeric( const String& rStr, xub_StrLen nPos ) const;
-            sal_Bool            isAlpha( const String& rStr ) const;
-            sal_Bool            isLetter( const String& rStr ) const;
-            sal_Bool            isNumeric( const String& rStr ) const;
-            sal_Bool            isAlphaNumeric( const String& rStr ) const;
-            sal_Bool            isLetterNumeric( const String& rStr ) const;
-
-            void                toUpper( String& rStr ) const
+            sal_Bool			isAlpha( const String& rStr, xub_StrLen nPos ) const;
+            sal_Bool			isLetter( const String& rStr, xub_StrLen nPos ) const;
+            sal_Bool			isDigit( const String& rStr, xub_StrLen nPos ) const;
+            sal_Bool			isAlphaNumeric( const String& rStr, xub_StrLen nPos ) const;
+            sal_Bool			isLetterNumeric( const String& rStr, xub_StrLen nPos ) const;
+            sal_Bool			isAlpha( const String& rStr ) const;
+            sal_Bool			isLetter( const String& rStr ) const;
+            sal_Bool			isNumeric( const String& rStr ) const;
+            sal_Bool			isAlphaNumeric( const String& rStr ) const;
+            sal_Bool			isLetterNumeric( const String& rStr ) const;
+
+            void				toUpper( String& rStr ) const
                                     { rStr = toUpper( rStr, 0, rStr.Len() ); }
-            void                toLower( String& rStr ) const
+            void				toLower( String& rStr ) const
                                     { rStr = toLower( rStr, 0, rStr.Len() ); }
-    inline  String              upper( const String& rStr ) const
+    inline	String				upper( const String& rStr ) const
                                     { return toUpper( rStr, 0, rStr.Len() ); }
-    inline  String              lower( const String& rStr ) const
+    inline	String				lower( const String& rStr ) const
                                     { return toLower( rStr, 0, rStr.Len() ); }
 
-        const ::rtl::OUString&  toUpper_rtl( ::rtl::OUString& _rStr ) const { return _rStr = toUpper_rtl( _rStr, 0, _rStr.getLength() ); }
-        const ::rtl::OUString&  toLower_rtl( ::rtl::OUString& _rStr ) const { return _rStr = toLower_rtl( _rStr, 0, _rStr.getLength() ); }
+        const ::rtl::OUString&	toUpper_rtl( ::rtl::OUString& _rStr ) const { return _rStr = toUpper_rtl( _rStr, 0, _rStr.getLength() ); }
+        const ::rtl::OUString&	toLower_rtl( ::rtl::OUString& _rStr ) const { return _rStr = toLower_rtl( _rStr, 0, _rStr.getLength() ); }
 };
 
 
diff --git a/unotools/inc/unotools/cmdoptions.hxx b/unotools/inc/unotools/cmdoptions.hxx
index c2454d9582ee..160646067953 100644
--- a/unotools/inc/unotools/cmdoptions.hxx
+++ b/unotools/inc/unotools/cmdoptions.hxx
@@ -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
@@ -28,7 +28,7 @@
 #define INCLUDED_unotools_CMDOPTIONS_HXX
 
 //_________________________________________________________________________________________________________________
-//  includes
+//	includes
 //_________________________________________________________________________________________________________________
 
 #include "unotools/unotoolsdllapi.h"
@@ -40,22 +40,22 @@
 #include <unotools/options.hxx>
 
 //_________________________________________________________________________________________________________________
-//  types, enums, ...
+//	types, enums, ...
 //_________________________________________________________________________________________________________________
 
 /*-************************************************************************************************************//**
-    @descr          The method GetList() returns a list of property values.
+    @descr			The method GetList() returns a list of property values.
                     Use follow defines to seperate values by names.
 *//*-*************************************************************************************************************/
 #define CMDOPTIONS_PROPERTYNAME_URL                    ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "CommandURL" ))
 
 //_________________________________________________________________________________________________________________
-//  forward declarations
+//	forward declarations
 //_________________________________________________________________________________________________________________
 
 /*-************************************************************************************************************//**
-    @short          forward declaration to our private date container implementation
-    @descr          We use these class as internal member to support small memory requirements.
+    @short			forward declaration to our private date container implementation
+    @descr			We use these class as internal member to support small memory requirements.
                     You can create the container if it is neccessary. The class which use these mechanism
                     is faster and smaller then a complete implementation!
 *//*-*************************************************************************************************************/
@@ -63,17 +63,17 @@
 class SvtCommandOptions_Impl;
 
 //_________________________________________________________________________________________________________________
-//  declarations
+//	declarations
 //_________________________________________________________________________________________________________________
 
 /*-************************************************************************************************************//**
     @short          collect informations about dynamic menus
     @descr          Make it possible to configure dynamic menu structures of menus like "new" or "wizard".
 
-    @implements     -
-    @base           -
+    @implements		-
+    @base			-
 
-    @devstatus      ready to use
+    @devstatus		ready to use
 *//*-*************************************************************************************************************/
 
 class UNOTOOLS_DLLPUBLIC SvtCommandOptions: public utl::detail::Options
@@ -81,7 +81,7 @@ class UNOTOOLS_DLLPUBLIC SvtCommandOptions: public utl::detail::Options
     friend class SvtCommandOptions_Impl;
 
     //-------------------------------------------------------------------------------------------------------------
-    //  public methods
+    //	public methods
     //-------------------------------------------------------------------------------------------------------------
 
     public:
@@ -93,43 +93,43 @@ class UNOTOOLS_DLLPUBLIC SvtCommandOptions: public utl::detail::Options
         };
 
         //---------------------------------------------------------------------------------------------------------
-        //  constructor / destructor
+        //	constructor / destructor
         //---------------------------------------------------------------------------------------------------------
 
         /*-****************************************************************************************************//**
-            @short      standard constructor and destructor
-            @descr      This will initialize an instance with default values.
+            @short		standard constructor and destructor
+            @descr		This will initialize an instance with default values.
                         We implement these class with a refcount mechanism! Every instance of this class increase it
                         at create and decrease it at delete time - but all instances use the same data container!
                         He is implemented as a static member ...
 
-            @seealso    member m_nRefCount
-            @seealso    member m_pDataContainer
+            @seealso	member m_nRefCount
+            @seealso	member m_pDataContainer
 
-            @param      -
-            @return     -
+            @param		-
+            @return		-
 
-            @onerror    -
+            @onerror	-
         *//*-*****************************************************************************************************/
 
          SvtCommandOptions();
         virtual ~SvtCommandOptions();
 
         //---------------------------------------------------------------------------------------------------------
-        //  interface
+        //	interface
         //---------------------------------------------------------------------------------------------------------
 
         /*-****************************************************************************************************//**
-            @short      clear complete sepcified list
+            @short		clear complete sepcified list
             @descr      Call this methods to clear the whole list.
                         To fill it again use AppendItem().
 
-            @seealso    -
+            @seealso	-
 
             @param      "eMenu" select right menu to clear.
-            @return     -
+            @return		-
 
-            @onerror    -
+            @onerror	-
         *//*-*****************************************************************************************************/
 
         void Clear( CmdOption eOption );
@@ -139,7 +139,7 @@ class UNOTOOLS_DLLPUBLIC SvtCommandOptions: public utl::detail::Options
             @descr      Call it to get all entries of an dynamic menu.
                         We return a list of all nodes with his names and properties.
 
-            @seealso    -
+            @seealso	-
 
             @param      "eOption" select the list to retrieve.
             @return     A list of command strings is returned.
@@ -150,16 +150,16 @@ class UNOTOOLS_DLLPUBLIC SvtCommandOptions: public utl::detail::Options
         sal_Bool HasEntries( CmdOption eOption ) const;
 
         /*-****************************************************************************************************//**
-            @short      Lookup if a command URL is inside a given list
+            @short		Lookup if a command URL is inside a given list
             @descr      Lookup if a command URL is inside a given lst
 
-            @seealso    -
+            @seealso	-
 
             @param      "eOption" select right command list
-            @param      "aCommandURL" a command URL that is used for the look up
-            @return     "sal_True" if the command is inside the list otherwise "sal_False"
+            @param		"aCommandURL" a command URL that is used for the look up
+            @return		"sal_True" if the command is inside the list otherwise "sal_False"
 
-            @onerror    -
+            @onerror	-
         *//*-*****************************************************************************************************/
 
         sal_Bool Lookup( CmdOption eOption, const ::rtl::OUString& aCommandURL ) const;
@@ -169,7 +169,7 @@ class UNOTOOLS_DLLPUBLIC SvtCommandOptions: public utl::detail::Options
             @descr      Call it to get all entries of an dynamic menu.
                         We return a list of all nodes with his names and properties.
 
-            @seealso    -
+            @seealso	-
 
             @param      "eOption" select the list to retrieve.
             @return     A list of command strings is returned.
@@ -183,13 +183,13 @@ class UNOTOOLS_DLLPUBLIC SvtCommandOptions: public utl::detail::Options
             @short      adds a new command to specified options list
             @descr      You can add a command to specified options list!
 
-            @seealso    method Clear()
+            @seealso	method Clear()
 
-            @param      "eOption"           specifies the command list
+            @param		"eOption"			specifies the command list
             @param      "sURL"              URL for dispatch
-            @return     -
+            @return		-
 
-            @onerror    -
+            @onerror	-
         *//*-*****************************************************************************************************/
 
         void AddCommand( CmdOption eOption, const ::rtl::OUString& sURL );
@@ -212,29 +212,29 @@ class UNOTOOLS_DLLPUBLIC SvtCommandOptions: public utl::detail::Options
         void EstablisFrameCallback(const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& xFrame);
 
     //-------------------------------------------------------------------------------------------------------------
-    //  private methods
+    //	private methods
     //-------------------------------------------------------------------------------------------------------------
 
     private:
 
         /*-****************************************************************************************************//**
-            @short      return a reference to a static mutex
-            @descr      These class is partially threadsafe (for de-/initialization only).
+            @short		return a reference to a static mutex
+            @descr		These class is partially threadsafe (for de-/initialization only).
                         All access methods are'nt safe!
                         We create a static mutex only for one ime and use at different times.
 
-            @seealso    -
+            @seealso	-
 
-            @param      -
-            @return     A reference to a static mutex member.
+            @param		-
+            @return		A reference to a static mutex member.
 
-            @onerror    -
+            @onerror	-
         *//*-*****************************************************************************************************/
 
         UNOTOOLS_DLLPRIVATE static ::osl::Mutex& GetOwnStaticMutex();
 
     //-------------------------------------------------------------------------------------------------------------
-    //  private member
+    //	private member
     //-------------------------------------------------------------------------------------------------------------
 
     private:
@@ -247,8 +247,8 @@ class UNOTOOLS_DLLPUBLIC SvtCommandOptions: public utl::detail::Options
             Do it in your source only.
          */
 
-        static SvtCommandOptions_Impl*  m_pDataContainer    ;   /// impl. data container as dynamic pointer for smaller memory requirements!
-        static sal_Int32                m_nRefCount         ;   /// internal ref count mechanism
+        static SvtCommandOptions_Impl*	m_pDataContainer    ;   /// impl. data container as dynamic pointer for smaller memory requirements!
+        static sal_Int32				m_nRefCount         ;   /// internal ref count mechanism
 
 };      // class SvtCmdOptions
 
diff --git a/unotools/inc/unotools/collatorwrapper.hxx b/unotools/inc/unotools/collatorwrapper.hxx
index e4f2a3443f1d..edcdec5da9ff 100644
--- a/unotools/inc/unotools/collatorwrapper.hxx
+++ b/unotools/inc/unotools/collatorwrapper.hxx
@@ -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
diff --git a/unotools/inc/unotools/compatibility.hxx b/unotools/inc/unotools/compatibility.hxx
index eb01e43f3ba0..65e92fa050e7 100644
--- a/unotools/inc/unotools/compatibility.hxx
+++ b/unotools/inc/unotools/compatibility.hxx
@@ -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
@@ -28,7 +28,7 @@
 #define INCLUDED_unotools_COMPATIBILITY_HXX
 
 //_________________________________________________________________________________________________________________
-//  includes
+//	includes
 //_________________________________________________________________________________________________________________
 
 #include "unotools/unotoolsdllapi.h"
@@ -39,7 +39,7 @@
 #include <unotools/options.hxx>
 
 //_________________________________________________________________________________________________________________
-//  types, enums, ...
+//	types, enums, ...
 //_________________________________________________________________________________________________________________
 
 enum CompatibilityOptions
@@ -58,7 +58,7 @@ enum CompatibilityOptions
 };
 
 /*-************************************************************************************************************//**
-    @descr          The method GetList() returns a list of property values.
+    @descr			The method GetList() returns a list of property values.
                     Use follow defines to seperate values by names.
 *//*-*************************************************************************************************************/
 #define COMPATIBILITY_PROPERTYNAME_NAME                     OUString( RTL_CONSTASCII_USTRINGPARAM( "Name" ) )
@@ -78,12 +78,12 @@ enum CompatibilityOptions
 #define COMPATIBILITY_DEFAULT_NAME                          OUString( RTL_CONSTASCII_USTRINGPARAM( "_default" ) )
 
 //_________________________________________________________________________________________________________________
-//  forward declarations
+//	forward declarations
 //_________________________________________________________________________________________________________________
 
 /*-************************************************************************************************************//**
-    @short          forward declaration to our private date container implementation
-    @descr          We use these class as internal member to support small memory requirements.
+    @short			forward declaration to our private date container implementation
+    @descr			We use these class as internal member to support small memory requirements.
                     You can create the container if it is neccessary. The class which use these mechanism
                     is faster and smaller then a complete implementation!
 *//*-*************************************************************************************************************/
@@ -91,74 +91,76 @@ enum CompatibilityOptions
 class SvtCompatibilityOptions_Impl;
 
 //_________________________________________________________________________________________________________________
-//  declarations
+//	declarations
 //_________________________________________________________________________________________________________________
 
 /*-************************************************************************************************************//**
     @short          collect informations about dynamic menus
     @descr          Make it possible to configure dynamic menu structures of menus like "new" or "wizard".
 
-    @implements     -
-    @base           -
+    @implements		-
+    @base			-
 
-    @devstatus      ready to use
+    @devstatus		ready to use
 *//*-*************************************************************************************************************/
 
 class UNOTOOLS_DLLPUBLIC SvtCompatibilityOptions: public utl::detail::Options
 {
     //-------------------------------------------------------------------------------------------------------------
-    //  public methods
+    //	public methods
     //-------------------------------------------------------------------------------------------------------------
 
     public:
 
         //---------------------------------------------------------------------------------------------------------
-        //  constructor / destructor
+        //	constructor / destructor
         //---------------------------------------------------------------------------------------------------------
 
         /*-****************************************************************************************************//**
-            @short      standard constructor and destructor
-            @descr      This will initialize an instance with default values.
+            @short		standard constructor and destructor
+            @descr		This will initialize an instance with default values.
                         We implement these class with a refcount mechanism! Every instance of this class increase it
                         at create and decrease it at delete time - but all instances use the same data container!
                         He is implemented as a static member ...
 
-            @seealso    member m_nRefCount
-            @seealso    member m_pDataContainer
+            @seealso	member m_nRefCount
+            @seealso	member m_pDataContainer
 
-            @param      -
-            @return     -
+            @param		-
+            @return		-
 
-            @onerror    -
+            @onerror	-
         *//*-*****************************************************************************************************/
 
          SvtCompatibilityOptions();
         virtual ~SvtCompatibilityOptions();
 
         //---------------------------------------------------------------------------------------------------------
-        //  interface
+        //	interface
         //---------------------------------------------------------------------------------------------------------
 
         /*-****************************************************************************************************//**
-            @short      clear complete specified list
+            @short		clear complete specified list
             @descr      Call this methods to clear the whole list.
 
-            @seealso    -
+            @seealso	-
 
             @param      -
-            @return     -
+            @return		-
 
-            @onerror    -
+            @onerror	-
         *//*-*****************************************************************************************************/
 
         void Clear();
 
+        void SetDefault( ::rtl::OUString sName, bool bValue );
+
         /*-****************************************************************************************************//**
             @short      return complete specified list
             @descr      Call it to get all entries of compatibility options.
                         We return a list of all nodes with its names and properties.
 
-            @seealso    -
+            @seealso	-
 
             @param      -
             @return     A list of compatibility options is returned.
@@ -172,14 +174,14 @@ class UNOTOOLS_DLLPUBLIC SvtCompatibilityOptions: public utl::detail::Options
             @short      append a new item
             @descr
 
-            @seealso    method Clear()
+            @seealso	method Clear()
 
             @param      "sName"             Name
             @param      "sModule"           Module
 
-            @return     -
+            @return		-
 
-            @onerror    -
+            @onerror	-
         *//*-*****************************************************************************************************/
 
         void AppendItem( const ::rtl::OUString& sName,
@@ -196,42 +198,42 @@ class UNOTOOLS_DLLPUBLIC SvtCompatibilityOptions: public utl::detail::Options
                          bool bConsiderWrappingStyle,
                          bool bExpandWordSpace );
 
-        bool        IsUsePrtDevice() const;
-        bool        IsAddSpacing() const;
-        bool        IsAddSpacingAtPages() const;
-        bool        IsUseOurTabStops() const;
-        bool        IsNoExtLeading() const;
-        bool        IsUseLineSpacing() const;
-        bool        IsAddTableSpacing() const;
-        bool        IsUseObjectPositioning() const;
-        bool        IsUseOurTextWrapping() const;
+        bool		IsUsePrtDevice() const;
+        bool		IsAddSpacing() const;
+        bool		IsAddSpacingAtPages() const;
+        bool		IsUseOurTabStops() const;
+        bool		IsNoExtLeading() const;
+        bool		IsUseLineSpacing() const;
+        bool		IsAddTableSpacing() const;
+        bool		IsUseObjectPositioning() const;
+        bool		IsUseOurTextWrapping() const;
         bool        IsConsiderWrappingStyle() const;
         bool        IsExpandWordSpace() const;
 
     //-------------------------------------------------------------------------------------------------------------
-    //  private methods
+    //	private methods
     //-------------------------------------------------------------------------------------------------------------
 
     private:
 
         /*-****************************************************************************************************//**
-            @short      return a reference to a static mutex
-            @descr      These class is partially threadsafe (for de-/initialization only).
+            @short		return a reference to a static mutex
+            @descr		These class is partially threadsafe (for de-/initialization only).
                         All access methods are'nt safe!
                         We create a static mutex only for one ime and use at different times.
 
-            @seealso    -
+            @seealso	-
 
-            @param      -
-            @return     A reference to a static mutex member.
+            @param		-
+            @return		A reference to a static mutex member.
 
-            @onerror    -
+            @onerror	-
         *//*-*****************************************************************************************************/
 
         UNOTOOLS_DLLPRIVATE static ::osl::Mutex& GetOwnStaticMutex();
 
     //-------------------------------------------------------------------------------------------------------------
-    //  private member
+    //	private member
     //-------------------------------------------------------------------------------------------------------------
 
     private:
@@ -244,8 +246,8 @@ class UNOTOOLS_DLLPUBLIC SvtCompatibilityOptions: public utl::detail::Options
             Do it in your source only.
          */
 
-        static SvtCompatibilityOptions_Impl*    m_pDataContainer;   /// impl. data container as dynamic pointer for smaller memory requirements!
-        static sal_Int32                        m_nRefCount     ;   /// internal ref count mechanism
+        static SvtCompatibilityOptions_Impl*	m_pDataContainer;	/// impl. data container as dynamic pointer for smaller memory requirements!
+        static sal_Int32						m_nRefCount		;	/// internal ref count mechanism
 
 };      // class SvtCompatibilityOptions
 
diff --git a/unotools/inc/unotools/componentresmodule.hxx b/unotools/inc/unotools/componentresmodule.hxx
index 0fe4e126ea74..f3b3bf5a5a02 100644
--- a/unotools/inc/unotools/componentresmodule.hxx
+++ b/unotools/inc/unotools/componentresmodule.hxx
@@ -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
diff --git a/unotools/inc/unotools/configitem.hxx b/unotools/inc/unotools/configitem.hxx
index d1477cba1b74..b50a34c58457 100644
--- a/unotools/inc/unotools/configitem.hxx
+++ b/unotools/inc/unotools/configitem.hxx
@@ -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
@@ -198,7 +198,7 @@ namespace utl
             sal_Bool                IsModified() const;
 
             /** writes the changed values into the sub tree. Always called in the Dtor of the derived class.  */
-            virtual void            Commit()=0;
+            virtual void            Commit()=0; 
 
             sal_Bool                IsInValueChange() const;
 
@@ -206,7 +206,7 @@ namespace utl
 
             /** checks if the configuration manager used by this item is valid.
             */
-            sal_Bool                IsValidConfigMgr() const;
+            sal_Bool				IsValidConfigMgr() const;
     };
 }//namespace utl
 #endif //_UTL_CONFIGITEM_HXX_
diff --git a/unotools/inc/unotools/configmgr.hxx b/unotools/inc/unotools/configmgr.hxx
index c26ff5245739..b1a349b1ee74 100644
--- a/unotools/inc/unotools/configmgr.hxx
+++ b/unotools/inc/unotools/configmgr.hxx
@@ -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
diff --git a/unotools/inc/unotools/confignode.hxx b/unotools/inc/unotools/confignode.hxx
index 57b5f5bd2afb..77300edfec3f 100644
--- a/unotools/inc/unotools/confignode.hxx
+++ b/unotools/inc/unotools/confignode.hxx
@@ -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
@@ -57,16 +57,16 @@ namespace utl
     {
     private:
         ::com::sun::star::uno::Reference< ::com::sun::star::container::XHierarchicalNameAccess >
-                    m_xHierarchyAccess;     /// accessing children grandchildren (mandatory interface of our UNO object)
+                    m_xHierarchyAccess;		/// accessing children grandchildren (mandatory interface of our UNO object)
         ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess >
-                    m_xDirectAccess;        /// accessing children  (mandatory interface of our UNO object)
+                    m_xDirectAccess;		/// accessing children  (mandatory interface of our UNO object)
         ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameReplace >
-                    m_xReplaceAccess;       /// replacing child values
+                    m_xReplaceAccess;		/// replacing child values
         ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >
-                    m_xContainerAccess;     /// modifying set nodes  (optional interface of our UNO object)
+                    m_xContainerAccess;		/// modifying set nodes  (optional interface of our UNO object)
         ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >
                     m_xDummy;
-        sal_Bool    m_bEscapeNames;         /// escape names before accessing children ?
+        sal_Bool	m_bEscapeNames;			/// escape names before accessing children ?
 
         ::rtl::OUString
                     m_sCompletePath;
@@ -101,11 +101,11 @@ namespace utl
         ::rtl::OUString     getNodePath() const;
 
         /** open a sub node
-            @param      _rPath      access path of the to-be-opened sub node. May be a hierarchical path.
+            @param		_rPath		access path of the to-be-opened sub node. May be a hierarchical path.
         */
-        OConfigurationNode  openNode(const ::rtl::OUString& _rPath) const throw();
+        OConfigurationNode	openNode(const ::rtl::OUString& _rPath) const throw();
 
-        OConfigurationNode  openNode( const sal_Char* _pAsciiPath ) const
+        OConfigurationNode	openNode( const sal_Char* _pAsciiPath ) const
         {
             return openNode( ::rtl::OUString::createFromAscii( _pAsciiPath ) );
         }
@@ -116,11 +116,11 @@ namespace utl
             method will fail.<br/>
             Unless the respective operations on the pure configuration API, the to-be-created node immediately
             becomes a part of it's hierarchy, no explicit insertion is necessary.
-            @param      _rName      name for the new child. Must be level-1-depth.
+            @param		_rName		name for the new child. Must be level-1-depth.
         */
-        OConfigurationNode  createNode(const ::rtl::OUString& _rName) const throw();
+        OConfigurationNode	createNode(const ::rtl::OUString& _rName) const throw();
 
-        OConfigurationNode  createNode( const sal_Char* _pAsciiName ) const
+        OConfigurationNode	createNode( const sal_Char* _pAsciiName ) const
         {
             return createNode( ::rtl::OUString::createFromAscii( _pAsciiName ) );
         }
@@ -131,8 +131,8 @@ namespace utl
             method will fail.<br/>
             Unless the respective operations on the pure configuration API, the to-be-created node immediately
             becomes a part of it's hierarchy, no explicit insertion is necessary.
-            @param      _rName      name for the new child. Must be level-1-depth.
-            @param      _aNewNode   the node which should be appended
+            @param		_rName		name for the new child. Must be level-1-depth.
+            @param		_aNewNode	the node which should be appended
         */
         OConfigurationNode  appendNode(const ::rtl::OUString& _rName,const OConfigurationNode& _aNewNode) const throw();
 
@@ -146,9 +146,9 @@ namespace utl
             If the object represents a set node, this method may be used to delete an existent child. For non-set-nodes,
             the method will fail.
         */
-        sal_Bool            removeNode(const ::rtl::OUString& _rName) const throw();
+        sal_Bool			removeNode(const ::rtl::OUString& _rName) const throw();
 
-        sal_Bool            removeNode( const sal_Char* _pAsciiName ) const
+        sal_Bool			removeNode( const sal_Char* _pAsciiName ) const
         {
             return removeNode( ::rtl::OUString::createFromAscii( _pAsciiName ) );
         }
@@ -173,11 +173,11 @@ namespace utl
             The value given is written into the node specified by the given relative path.<br/>
             In opposite to <method>getNodeValue</method>, _rName must refer to a leaf in the configuration tree, not an inner
             node.
-            @return     sal_True if and only if the write was successfull.
+            @return		sal_True if and only if the write was successfull.
         */
-        sal_Bool            setNodeValue(const ::rtl::OUString& _rPath, const ::com::sun::star::uno::Any& _rValue) const throw();
+        sal_Bool			setNodeValue(const ::rtl::OUString& _rPath, const ::com::sun::star::uno::Any& _rValue) const throw();
 
-        sal_Bool            setNodeValue( const sal_Char* _pAsciiPath, const ::com::sun::star::uno::Any& _rValue ) const
+        sal_Bool			setNodeValue( const sal_Char* _pAsciiPath, const ::com::sun::star::uno::Any& _rValue ) const
         {
             return setNodeValue( ::rtl::OUString::createFromAscii( _pAsciiPath ), _rValue );
         }
@@ -192,11 +192,11 @@ namespace utl
             escaping for such names may not be supported by the underlying API objects.
             @see getEscape
         */
-        void        setEscape(sal_Bool _bEnable = sal_True);
+        void		setEscape(sal_Bool _bEnable = sal_True);
         /** get the flag specifying the current escape behaviour
             @see setEscape
         */
-        sal_Bool    getEscape() const { return m_bEscapeNames; }
+        sal_Bool	getEscape() const { return m_bEscapeNames; }
 
         /// invalidate the object
         virtual void clear() throw();
@@ -228,8 +228,8 @@ namespace utl
     protected:
         enum NAMEORIGIN
         {
-            NO_CONFIGURATION,       /// the name came from a configuration node
-            NO_CALLER               /// the name came from a client of this class
+            NO_CONFIGURATION,		/// the name came from a configuration node
+            NO_CALLER				/// the name came from a client of this class
         };
         ::rtl::OUString normalizeName(const ::rtl::OUString& _rName, NAMEORIGIN _eOrigin) const;
     };
@@ -303,12 +303,12 @@ namespace utl
             In opposite to <method>createWithServiceFactory</method>, createWithProvider expects a configuration provider
             to work with.
 
-            @param      _rxConfProvider configuration provider to use when retrieving the node.
-            @param      _rPath          path to the node the object should represent
-            @param      _nDepth         depth for node retrieval
-            @param      _eMode          specifies which privileges should be applied when retrieving the node
+            @param		_rxConfProvider	configuration provider to use when retrieving the node.
+            @param		_rPath			path to the node the object should represent
+            @param		_nDepth			depth for node retrieval
+            @param		_eMode			specifies which privileges should be applied when retrieving the node
 
-            @see    createWithServiceFactory
+            @see	createWithServiceFactory
         */
         static OConfigurationTreeRoot createWithProvider(
                 const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rxConfProvider,
@@ -324,11 +324,11 @@ namespace utl
             or such).<br/>
             In opposite to <method>createWithProvider</method>, createWithProvider expects a service factory. This factory
             is used to create a configuration provider, and this provider is used to retrieve the node
-            @see    createWithProvider
-            @param      _rxORB          service factory to use to create the configuration provider.
-            @param      _rPath          path to the node the object should represent
-            @param      _nDepth         depth for node retrieval
-            @param      _eMode          specifies which privileges should be applied when retrieving the node
+            @see	createWithProvider
+            @param		_rxORB			service factory to use to create the configuration provider.
+            @param		_rPath			path to the node the object should represent
+            @param		_nDepth			depth for node retrieval
+            @param		_eMode			specifies which privileges should be applied when retrieving the node
         */
         static OConfigurationTreeRoot createWithServiceFactory(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rxORB,
             const ::rtl::OUString& _rPath, sal_Int32 _nDepth = -1, CREATION_MODE _eMode = CM_UPDATABLE, sal_Bool _bLazyWrite = sal_True);
@@ -345,7 +345,7 @@ namespace utl
         /** commit all changes made on the subtree the object is the root for<p/>
             All changes made on any <type>OConfigurationNode</type> object retrieved (maybe indirect) from this root
             object are committed when calling this method.
-            @return     sal_True if and only if the commit was successfull
+            @return		sal_True if and only if the commit was successfull
         */
         sal_Bool commit() const throw();
 
@@ -354,7 +354,7 @@ namespace utl
     };
 
 //........................................................................
-}   // namespace utl
+}	// namespace utl
 //........................................................................
 
 #endif // _UNOTOOLS_CONFIGNODE_HXX_
diff --git a/unotools/inc/unotools/configpathes.hxx b/unotools/inc/unotools/configpathes.hxx
index 2a1e76abf1fc..d58049f01525 100644
--- a/unotools/inc/unotools/configpathes.hxx
+++ b/unotools/inc/unotools/configpathes.hxx
@@ -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
@@ -39,24 +39,24 @@ namespace rtl
 namespace utl
 {
 //----------------------------------------------------------------------------
-    /** extract the local nodename and the parent nodepath
+    /** extract the local nodename and the parent nodepath 
         from a configuration path.
 
         @param _sInPath
             A configuration path that is not an empty or root path.<BR/>
-            If this is not a valid configuration path, it is interpreted as
+            If this is not a valid configuration path, it is interpreted as 
             local name of a node.
 
         @param _rsOutPath
-            On exit: The configuration path obtained by dropping
+            On exit: The configuration path obtained by dropping 
                      the last level off <var>_sInPath</var>.<BR/>
-                     If <var>_sInPath</var> could not be parsed as a valid
+                     If <var>_sInPath</var> could not be parsed as a valid 
                      configuration path, this is set to an empty string.
 
         @param _rsLocalName
             On exit: The plain (non-escaped) name of the node identified by
                      <var>_sInPath</var>. <BR/>
-                     If <var>_sInPath</var> could not be parsed as a valid
+                     If <var>_sInPath</var> could not be parsed as a valid 
                      configuration path, this is set to <var>_sInPath</var>.
 
         @returns
@@ -64,7 +64,7 @@ namespace utl
             <FALSE/>, if the path was a one-level path or an invalid path
 
     */
-    UNOTOOLS_DLLPUBLIC sal_Bool splitLastFromConfigurationPath(::rtl::OUString const& _sInPath,
+    UNOTOOLS_DLLPUBLIC sal_Bool splitLastFromConfigurationPath(::rtl::OUString const& _sInPath, 
                                             ::rtl::OUString& _rsOutPath,
                                             ::rtl::OUString& _rsLocalName);
 
@@ -73,9 +73,12 @@ namespace utl
 
         @param _sInPath
             A relative configuration path that is not empty.<BR/>
-            If this is not a valid configuration path, it is interpreted as
+            If this is not a valid configuration path, it is interpreted as 
             a single name of a node.
 
+        @param _sOutPath
+            If non-null, contains the remainder of the path upon return.
+
         @returns
             The plain (non-escaped) name of the node that is the first step
             when traversing <var>_sInPath</var>.<BR/>
@@ -83,7 +86,8 @@ namespace utl
             configuration path, it is returned unaltered.
 
     */
-    UNOTOOLS_DLLPUBLIC ::rtl::OUString extractFirstFromConfigurationPath(::rtl::OUString const& _sInPath);
+    UNOTOOLS_DLLPUBLIC ::rtl::OUString extractFirstFromConfigurationPath(
+        ::rtl::OUString const& _sInPath, ::rtl::OUString* _sOutPath = 0);
 
 //----------------------------------------------------------------------------
     /** check whether a path is to a nested node with respect to a parent path.
@@ -106,7 +110,7 @@ namespace utl
             If both pathes are equal <TRUE/> is returned.
 
     */
-    sal_Bool isPrefixOfConfigurationPath(::rtl::OUString const& _sNestedPath,
+    sal_Bool isPrefixOfConfigurationPath(::rtl::OUString const& _sNestedPath, 
                                          ::rtl::OUString const& _sPrefixPath);
 
 //----------------------------------------------------------------------------
@@ -131,38 +135,38 @@ namespace utl
             <var>_sNestedPath</var> is returned unaltered.
 
     */
-    UNOTOOLS_DLLPUBLIC ::rtl::OUString dropPrefixFromConfigurationPath(::rtl::OUString const& _sNestedPath,
+    UNOTOOLS_DLLPUBLIC ::rtl::OUString dropPrefixFromConfigurationPath(::rtl::OUString const& _sNestedPath, 
                                                     ::rtl::OUString const& _sPrefixPath);
 
 //----------------------------------------------------------------------------
-    /** Create a one-level relative configuration path from a set element name
+    /** Create a one-level relative configuration path from a set element name 
         without a known set element type.
 
         @param _sElementName
-            An arbitrary string that is to be interpreted as
+            An arbitrary string that is to be interpreted as 
             name of a configuration set element.
 
         @returns
-            A one-level relative path to the element, of the form
+            A one-level relative path to the element, of the form 
             "*['<Name>']", where <Name> is properly escaped.
 
     */
     UNOTOOLS_DLLPUBLIC ::rtl::OUString wrapConfigurationElementName(::rtl::OUString const& _sElementName);
 
 //----------------------------------------------------------------------------
-    /** Create a one-level relative configuration path from a set element name
+    /** Create a one-level relative configuration path from a set element name 
         and a known set element type.
 
         @param _sElementName
-            An arbitrary string that is to be interpreted as
+            An arbitrary string that is to be interpreted as 
             name of a configuration set element.
 
         @param _sTypeName
-            An string identifying the type of the element. Usually this is be
+            An string identifying the type of the element. Usually this is be 
             the name of the element-template of the set.<BR/>
 
         @returns
-            A one-level relative path to the element, of the form
+            A one-level relative path to the element, of the form 
             "<Type>['<Name>']", where <Name> is properly escaped.
 
     */
@@ -170,7 +174,7 @@ namespace utl
                                                  ::rtl::OUString const& _sTypeName);
 
 //----------------------------------------------------------------------------
-}   // namespace utl
+}	// namespace utl
 //----------------------------------------------------------------------------
 
 #endif // UNOTOOLS_CONFIGPATHES_HXX_INCLUDED
diff --git a/unotools/inc/unotools/configvaluecontainer.hxx b/unotools/inc/unotools/configvaluecontainer.hxx
index a66ca4cb753a..e4e9216d5bc0 100644
--- a/unotools/inc/unotools/configvaluecontainer.hxx
+++ b/unotools/inc/unotools/configvaluecontainer.hxx
@@ -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
@@ -36,11 +36,11 @@ namespace utl
 {
 //.........................................................................
 
-#define CVC_READONLY_ACCESS     0x0000
-#define CVC_UPDATE_ACCESS       0x0001
+#define CVC_READONLY_ACCESS		0x0000
+#define CVC_UPDATE_ACCESS		0x0001
 
-#define CVC_LAZY_UPDATE         0x0000
-#define CVC_IMMEDIATE_UPDATE    0x0002
+#define CVC_LAZY_UPDATE			0x0000
+#define CVC_IMMEDIATE_UPDATE	0x0002
 
     struct OConfigurationValueContainerImpl;
     struct NodeValueAccessor;
@@ -148,7 +148,7 @@ namespace utl
             @param _rValueType
                 is the type of your accessort. This type must be supported by the configuration.
         */
-        void    registerExchangeLocation(
+        void	registerExchangeLocation(
             const sal_Char* _pRelativePathAscii,
             void* _pContainer,
             const ::com::sun::star::uno::Type& _rValueType
@@ -164,7 +164,7 @@ namespace utl
             @param _pContainer
                 points to the Any you want to hold the value
         */
-        void    registerNullValueExchangeLocation(
+        void	registerNullValueExchangeLocation(
             const sal_Char* _pRelativePathAscii,
             ::com::sun::star::uno::Any* _pContainer
         );
@@ -180,7 +180,7 @@ namespace utl
 
             @see write
         */
-        void    read( );
+        void	read( );
 
         /** updates the configuration data
 
@@ -199,7 +199,7 @@ namespace utl
             @see read
             @see commit
         */
-        void    write( sal_Bool _bCommit = sal_True );
+        void	write( sal_Bool _bCommit = sal_True );
 
         /** commits any changes done
 
@@ -214,7 +214,7 @@ namespace utl
                 If <FALSE/>, only the current values in the config nodes (as present since the last call to
                 <method>write</method>) are committed.
         */
-        void    commit( sal_Bool _bWrite = sal_True );
+        void	commit( sal_Bool _bWrite = sal_True );
 
     private:
         /// implements the ctors
@@ -225,11 +225,11 @@ namespace utl
         );
 
         /// registers a value container
-        void    implRegisterExchangeLocation( const NodeValueAccessor& _rAccessor );
+        void	implRegisterExchangeLocation( const NodeValueAccessor& _rAccessor );
     };
 
 //.........................................................................
-}   // namespace utl
+}	// namespace utl
 //.........................................................................
 
 #endif // UNOTOOLS_CONFIGVALUECONTAINER_HXX
diff --git a/unotools/inc/unotools/datetime.hxx b/unotools/inc/unotools/datetime.hxx
index ef02822f1dc5..f33bf394e609 100644
--- a/unotools/inc/unotools/datetime.hxx
+++ b/unotools/inc/unotools/datetime.hxx
@@ -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,7 +56,7 @@ namespace utl
     UNOTOOLS_DLLPUBLIC void typeConvert(const starutil::DateTime& _rDateTime, DateTime& _rOut);
 
 //.........................................................................
-}   // namespace utl
+}	// namespace utl
 //.........................................................................
 
 #endif // _UNOTOOLS_DATETIME_HXX_
diff --git a/unotools/inc/unotools/defaultoptions.hxx b/unotools/inc/unotools/defaultoptions.hxx
index ecd6b7928629..3457b7881a85 100644
--- a/unotools/inc/unotools/defaultoptions.hxx
+++ b/unotools/inc/unotools/defaultoptions.hxx
@@ -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
@@ -40,14 +40,14 @@ class SvtDefaultOptions_Impl;
 class UNOTOOLS_DLLPUBLIC SvtDefaultOptions: public utl::detail::Options
 {
 private:
-    SvtDefaultOptions_Impl* pImp;
+    SvtDefaultOptions_Impl*	pImp;
 
 public:
 
     SvtDefaultOptions();
     virtual ~SvtDefaultOptions();
 
-    String  GetDefaultPath( USHORT nId ) const;
+    String	GetDefaultPath( USHORT nId ) const;
 };
 
 #endif // #ifndef INCLUDED_unotools_DEFAULTOPTIONS_HXX
diff --git a/unotools/inc/unotools/desktopterminationobserver.hxx b/unotools/inc/unotools/desktopterminationobserver.hxx
index 6b1f0d3e52f6..95c41ac8b7b0 100644
--- a/unotools/inc/unotools/desktopterminationobserver.hxx
+++ b/unotools/inc/unotools/desktopterminationobserver.hxx
@@ -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
diff --git a/unotools/inc/unotools/digitgroupingiterator.hxx b/unotools/inc/unotools/digitgroupingiterator.hxx
index 19f3ebf37abb..048417d80d4a 100644
--- a/unotools/inc/unotools/digitgroupingiterator.hxx
+++ b/unotools/inc/unotools/digitgroupingiterator.hxx
@@ -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
@@ -38,7 +38,7 @@ namespace utl {
     The iterator advances over the digit groupings, returning the number of
     digits per group. If the last group was encountered the iterator will
     always return the last grouping.
-
+    
     Grouping values are sanitized to be 0 <= value <= SAL_MAX_UINT16, even if
     originally Int32, to be able to easily cast it down to String's xub_StrLen.
     This shouldn't make any difference in practice.
diff --git a/unotools/inc/unotools/docinfohelper.hxx b/unotools/inc/unotools/docinfohelper.hxx
index 9ce9d346af20..58a43484c1b2 100644
--- a/unotools/inc/unotools/docinfohelper.hxx
+++ b/unotools/inc/unotools/docinfohelper.hxx
@@ -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
@@ -40,7 +40,7 @@ public:
 
 };
 
-}   // namespace utl
+}	// namespace utl
 
 
 #endif // _UNOTOOLS_DOCINFOHELPER_HXX_
diff --git a/unotools/inc/unotools/dynamicmenuoptions.hxx b/unotools/inc/unotools/dynamicmenuoptions.hxx
index 9d695e166471..5fba07c217b1 100644
--- a/unotools/inc/unotools/dynamicmenuoptions.hxx
+++ b/unotools/inc/unotools/dynamicmenuoptions.hxx
@@ -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
@@ -28,7 +28,7 @@
 #define INCLUDED_unotools_DYNAMICMENUOPTIONS_HXX
 
 //_________________________________________________________________________________________________________________
-//  includes
+//	includes
 //_________________________________________________________________________________________________________________
 
 #include "unotools/unotoolsdllapi.h"
@@ -39,11 +39,11 @@
 #include <unotools/options.hxx>
 
 //_________________________________________________________________________________________________________________
-//  types, enums, ...
+//	types, enums, ...
 //_________________________________________________________________________________________________________________
 
 /*-************************************************************************************************************//**
-    @descr          The method GetList() returns a list of property values.
+    @descr			The method GetList() returns a list of property values.
                     Use follow defines to seperate values by names.
 *//*-*************************************************************************************************************/
 #define DYNAMICMENU_PROPERTYNAME_URL                    ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("URL"             ))
@@ -61,12 +61,12 @@ enum EDynamicMenuType
     E_HELPBOOKMARKS =   2
 };
 //_________________________________________________________________________________________________________________
-//  forward declarations
+//	forward declarations
 //_________________________________________________________________________________________________________________
 
 /*-************************************************************************************************************//**
-    @short          forward declaration to our private date container implementation
-    @descr          We use these class as internal member to support small memory requirements.
+    @short			forward declaration to our private date container implementation
+    @descr			We use these class as internal member to support small memory requirements.
                     You can create the container if it is neccessary. The class which use these mechanism
                     is faster and smaller then a complete implementation!
 *//*-*************************************************************************************************************/
@@ -74,65 +74,65 @@ enum EDynamicMenuType
 class SvtDynamicMenuOptions_Impl;
 
 //_________________________________________________________________________________________________________________
-//  declarations
+//	declarations
 //_________________________________________________________________________________________________________________
 
 /*-************************************************************************************************************//**
     @short          collect informations about dynamic menus
     @descr          Make it possible to configure dynamic menu structures of menus like "new" or "wizard".
 
-    @implements     -
-    @base           -
+    @implements		-
+    @base			-
 
-    @devstatus      ready to use
+    @devstatus		ready to use
 *//*-*************************************************************************************************************/
 
 class UNOTOOLS_DLLPUBLIC SvtDynamicMenuOptions: public utl::detail::Options
 {
     //-------------------------------------------------------------------------------------------------------------
-    //  public methods
+    //	public methods
     //-------------------------------------------------------------------------------------------------------------
 
     public:
 
         //---------------------------------------------------------------------------------------------------------
-        //  constructor / destructor
+        //	constructor / destructor
         //---------------------------------------------------------------------------------------------------------
 
         /*-****************************************************************************************************//**
-            @short      standard constructor and destructor
-            @descr      This will initialize an instance with default values.
+            @short		standard constructor and destructor
+            @descr		This will initialize an instance with default values.
                         We implement these class with a refcount mechanism! Every instance of this class increase it
                         at create and decrease it at delete time - but all instances use the same data container!
                         He is implemented as a static member ...
 
-            @seealso    member m_nRefCount
-            @seealso    member m_pDataContainer
+            @seealso	member m_nRefCount
+            @seealso	member m_pDataContainer
 
-            @param      -
-            @return     -
+            @param		-
+            @return		-
 
-            @onerror    -
+            @onerror	-
         *//*-*****************************************************************************************************/
 
          SvtDynamicMenuOptions();
         virtual ~SvtDynamicMenuOptions();
 
         //---------------------------------------------------------------------------------------------------------
-        //  interface
+        //	interface
         //---------------------------------------------------------------------------------------------------------
 
         /*-****************************************************************************************************//**
-            @short      clear complete sepcified list
+            @short		clear complete sepcified list
             @descr      Call this methods to clear the whole list.
                         To fill it again use AppendItem().
 
-            @seealso    -
+            @seealso	-
 
             @param      "eMenu" select right menu to clear.
-            @return     -
+            @return		-
 
-            @onerror    -
+            @onerror	-
         *//*-*****************************************************************************************************/
 
         void Clear( EDynamicMenuType eMenu );
@@ -142,7 +142,7 @@ class UNOTOOLS_DLLPUBLIC SvtDynamicMenuOptions: public utl::detail::Options
             @descr      Call it to get all entries of an dynamic menu.
                         We return a list of all nodes with his names and properties.
 
-            @seealso    -
+            @seealso	-
 
             @param      "eMenu" select right menu.
             @return     A list of menu items is returned.
@@ -157,16 +157,16 @@ class UNOTOOLS_DLLPUBLIC SvtDynamicMenuOptions: public utl::detail::Options
             @descr      You can append items to a menu only - removing isn't allowed for a special item!
                         We support a nothing or all mechanism only! Clear all or append something ...
 
-            @seealso    method Clear()
+            @seealso	method Clear()
 
             @param      "eMenu"             select right menu.
             @param      "sURL"              URL for dispatch
             @param      "sTitle"            label of menu entry
             @param      "sImageIdentifier"  icon identifier
             @param      "sTargetName"       target for dispatch
-            @return     -
+            @return		-
 
-            @onerror    -
+            @onerror	-
         *//*-*****************************************************************************************************/
 
         void AppendItem(            EDynamicMenuType    eMenu            ,
@@ -176,29 +176,29 @@ class UNOTOOLS_DLLPUBLIC SvtDynamicMenuOptions: public utl::detail::Options
                             const   ::rtl::OUString&    sTargetName      );
 
     //-------------------------------------------------------------------------------------------------------------
-    //  private methods
+    //	private methods
     //-------------------------------------------------------------------------------------------------------------
 
     private:
 
         /*-****************************************************************************************************//**
-            @short      return a reference to a static mutex
-            @descr      These class is partially threadsafe (for de-/initialization only).
+            @short		return a reference to a static mutex
+            @descr		These class is partially threadsafe (for de-/initialization only).
                         All access methods are'nt safe!
                         We create a static mutex only for one ime and use at different times.
 
-            @seealso    -
+            @seealso	-
 
-            @param      -
-            @return     A reference to a static mutex member.
+            @param		-
+            @return		A reference to a static mutex member.
 
-            @onerror    -
+            @onerror	-
         *//*-*****************************************************************************************************/
 
         UNOTOOLS_DLLPRIVATE static ::osl::Mutex& GetOwnStaticMutex();
 
     //-------------------------------------------------------------------------------------------------------------
-    //  private member
+    //	private member
     //-------------------------------------------------------------------------------------------------------------
 
     private:
diff --git a/unotools/inc/unotools/eventcfg.hxx b/unotools/inc/unotools/eventcfg.hxx
index 839811f9dd80..34b547fda898 100644
--- a/unotools/inc/unotools/eventcfg.hxx
+++ b/unotools/inc/unotools/eventcfg.hxx
@@ -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
@@ -37,30 +37,30 @@
 #include <hash_map>
 #include <vector>
 
-#define STR_EVENT_STARTAPP                   0
-#define STR_EVENT_CLOSEAPP                   1
-#define STR_EVENT_DOCCREATED                 2
-#define STR_EVENT_CREATEDOC                  3
+#define STR_EVENT_STARTAPP					 0
+#define STR_EVENT_CLOSEAPP					 1
+#define STR_EVENT_DOCCREATED				 2
+#define STR_EVENT_CREATEDOC 				 3
 #define STR_EVENT_LOADFINISHED               4
-#define STR_EVENT_OPENDOC                    5
-#define STR_EVENT_PREPARECLOSEDOC            6
-#define STR_EVENT_CLOSEDOC                   7
-#define STR_EVENT_SAVEDOC                    8
-#define STR_EVENT_SAVEDOCDONE                9
+#define STR_EVENT_OPENDOC					 5
+#define STR_EVENT_PREPARECLOSEDOC			 6
+#define STR_EVENT_CLOSEDOC				     7
+#define STR_EVENT_SAVEDOC					 8
+#define STR_EVENT_SAVEDOCDONE				 9
 #define STR_EVENT_SAVEDOCFAILED             10
-#define STR_EVENT_SAVEASDOC                 11
-#define STR_EVENT_SAVEASDOCDONE             12
+#define STR_EVENT_SAVEASDOC 				11
+#define STR_EVENT_SAVEASDOCDONE				12
 #define STR_EVENT_SAVEASDOCFAILED           13
 #define STR_EVENT_SAVETODOC                 14
 #define STR_EVENT_SAVETODOCDONE             15
 #define STR_EVENT_SAVETODOCFAILED           16
-#define STR_EVENT_ACTIVATEDOC               17
-#define STR_EVENT_DEACTIVATEDOC             18
-#define STR_EVENT_PRINTDOC                  19
+#define STR_EVENT_ACTIVATEDOC				17
+#define STR_EVENT_DEACTIVATEDOC 			18
+#define STR_EVENT_PRINTDOC 					19
 #define STR_EVENT_VIEWCREATED               20
 #define STR_EVENT_PREPARECLOSEVIEW          21
 #define STR_EVENT_CLOSEVIEW                 22
-#define STR_EVENT_MODIFYCHANGED             23
+#define STR_EVENT_MODIFYCHANGED				23
 #define STR_EVENT_TITLECHANGED              24
 #define STR_EVENT_VISAREACHANGED            25
 #define STR_EVENT_MODECHANGED               26
@@ -83,8 +83,8 @@ public:
     ~GlobalEventConfig_Impl( );
 
     void EstablishFrameCallback(const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& xFrame);
-    void            Notify( const com::sun::star::uno::Sequence<rtl::OUString>& aPropertyNames);
-    void            Commit();
+    void 			Notify( const com::sun::star::uno::Sequence<rtl::OUString>& aPropertyNames);
+    void			Commit();
 
     ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameReplace > SAL_CALL getEvents(  ) throw (::com::sun::star::uno::RuntimeException);
     void SAL_CALL replaceByName( const ::rtl::OUString& aName, const ::com::sun::star::uno::Any& aElement ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
diff --git a/unotools/inc/unotools/eventlisteneradapter.hxx b/unotools/inc/unotools/eventlisteneradapter.hxx
index c46cabc4dffb..02d151a5c471 100644
--- a/unotools/inc/unotools/eventlisteneradapter.hxx
+++ b/unotools/inc/unotools/eventlisteneradapter.hxx
@@ -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
@@ -46,11 +46,11 @@ namespace utl
         friend class OEventListenerImpl;
 
     private:
-        UNOTOOLS_DLLPRIVATE OEventListenerAdapter( const OEventListenerAdapter& _rSource ); // never implemented
-        UNOTOOLS_DLLPRIVATE const OEventListenerAdapter& operator=( const OEventListenerAdapter& _rSource );    // never implemented
+        UNOTOOLS_DLLPRIVATE OEventListenerAdapter( const OEventListenerAdapter& _rSource );	// never implemented
+        UNOTOOLS_DLLPRIVATE const OEventListenerAdapter& operator=( const OEventListenerAdapter& _rSource );	// never implemented
 
     protected:
-        OEventListenerAdapterImpl*  m_pImpl;
+        OEventListenerAdapterImpl*	m_pImpl;
 
     protected:
                 OEventListenerAdapter();
@@ -64,7 +64,7 @@ namespace utl
     };
 
 //.........................................................................
-}   // namespace utl
+}	// namespace utl
 //.........................................................................
 
 #endif // _UNOTOOLS_EVENTLISTENERADAPTER_HXX_
diff --git a/unotools/inc/unotools/extendedsecurityoptions.hxx b/unotools/inc/unotools/extendedsecurityoptions.hxx
index 6e6b04472d31..fa15ab1a7c0d 100644
--- a/unotools/inc/unotools/extendedsecurityoptions.hxx
+++ b/unotools/inc/unotools/extendedsecurityoptions.hxx
@@ -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
@@ -28,7 +28,7 @@
 #define INCLUDED_unotools_EXTENDEDSECURITYOPTIONS_HXX
 
 //_________________________________________________________________________________________________________________
-//  includes
+//	includes
 //_________________________________________________________________________________________________________________
 
 #include "unotools/unotoolsdllapi.h"
@@ -39,12 +39,12 @@
 #include <unotools/options.hxx>
 
 //_________________________________________________________________________________________________________________
-//  forward declarations
+//	forward declarations
 //_________________________________________________________________________________________________________________
 
 /*-************************************************************************************************************//**
-    @short          forward declaration to our private date container implementation
-    @descr          We use these class as internal member to support small memory requirements.
+    @short			forward declaration to our private date container implementation
+    @descr			We use these class as internal member to support small memory requirements.
                     You can create the container if it is neccessary. The class which use these mechanism
                     is faster and smaller then a complete implementation!
 *//*-*************************************************************************************************************/
@@ -52,94 +52,94 @@
 class SvtExtendedSecurityOptions_Impl;
 
 //_________________________________________________________________________________________________________________
-//  declarations
+//	declarations
 //_________________________________________________________________________________________________________________
 
 /*-************************************************************************************************************//**
-    @short          collect informations about security features
+    @short			collect informations about security features
     @descr          -
 
-    @implements     -
-    @base           -
+    @implements		-
+    @base			-
 
-    @ATTENTION      This class is partially threadsafe.
+    @ATTENTION		This class is partially threadsafe.
 
-    @devstatus      ready to use
+    @devstatus		ready to use
 *//*-*************************************************************************************************************/
 
 class UNOTOOLS_DLLPUBLIC SvtExtendedSecurityOptions: public utl::detail::Options
 {
     //-------------------------------------------------------------------------------------------------------------
-    //  public methods
+    //	public methods
     //-------------------------------------------------------------------------------------------------------------
 
     public:
         // Must be zero based!
         enum OpenHyperlinkMode
         {
-            OPEN_NEVER                  = 0,
+            OPEN_NEVER					= 0,
             OPEN_WITHSECURITYCHECK,
             OPEN_ALWAYS
         };
 
         //---------------------------------------------------------------------------------------------------------
-        //  constructor / destructor
+        //	constructor / destructor
         //---------------------------------------------------------------------------------------------------------
 
         /*-****************************************************************************************************//**
-            @short      standard constructor and destructor
-            @descr      This will initialize an instance with default values.
+            @short		standard constructor and destructor
+            @descr		This will initialize an instance with default values.
                         We implement these class with a refcount mechanism! Every instance of this class increase it
                         at create and decrease it at delete time - but all instances use the same data container!
                         He is implemented as a static member ...
 
-            @seealso    member m_nRefCount
-            @seealso    member m_pDataContainer
+            @seealso	member m_nRefCount
+            @seealso	member m_pDataContainer
 
-            @param      -
-            @return     -
+            @param		-
+            @return		-
 
-            @onerror    -
+            @onerror	-
         *//*-*****************************************************************************************************/
 
          SvtExtendedSecurityOptions();
         virtual ~SvtExtendedSecurityOptions();
 
         //---------------------------------------------------------------------------------------------------------
-        //  interface
+        //	interface
         //---------------------------------------------------------------------------------------------------------
 
-        sal_Bool                                        IsSecureHyperlink( const rtl::OUString& aURL ) const;
-        com::sun::star::uno::Sequence< rtl::OUString >  GetSecureExtensionList() const;
+        sal_Bool										IsSecureHyperlink( const rtl::OUString& aURL ) const;
+        com::sun::star::uno::Sequence< rtl::OUString >	GetSecureExtensionList() const;
 
-        OpenHyperlinkMode                               GetOpenHyperlinkMode();
-        void                                            SetOpenHyperlinkMode( OpenHyperlinkMode aMode );
+        OpenHyperlinkMode								GetOpenHyperlinkMode();
+        void											SetOpenHyperlinkMode( OpenHyperlinkMode aMode );
         sal_Bool                                        IsOpenHyperlinkModeReadOnly() const;
 
     //-------------------------------------------------------------------------------------------------------------
-    //  private methods
+    //	private methods
     //-------------------------------------------------------------------------------------------------------------
 
     private:
 
         /*-****************************************************************************************************//**
-            @short      return a reference to a static mutex
-            @descr      These class is partially threadsafe (for de-/initialization only).
+            @short		return a reference to a static mutex
+            @descr		These class is partially threadsafe (for de-/initialization only).
                         All access methods are'nt safe!
                         We create a static mutex only for one ime and use at different times.
 
-            @seealso    -
+            @seealso	-
 
-            @param      -
-            @return     A reference to a static mutex member.
+            @param		-
+            @return		A reference to a static mutex member.
 
-            @onerror    -
+            @onerror	-
         *//*-*****************************************************************************************************/
 
         UNOTOOLS_DLLPRIVATE static ::osl::Mutex& GetInitMutex();
 
     //-------------------------------------------------------------------------------------------------------------
-    //  private member
+    //	private member
     //-------------------------------------------------------------------------------------------------------------
 
     private:
@@ -152,9 +152,9 @@ class UNOTOOLS_DLLPUBLIC SvtExtendedSecurityOptions: public utl::detail::Options
             Do it in your source only.
          */
 
-        static SvtExtendedSecurityOptions_Impl* m_pDataContainer    ;   /// impl. data container as dynamic pointer for smaller memory requirements!
-        static sal_Int32                        m_nRefCount         ;   /// internal ref count mechanism
+        static SvtExtendedSecurityOptions_Impl*	m_pDataContainer	;	/// impl. data container as dynamic pointer for smaller memory requirements!
+        static sal_Int32						m_nRefCount			;	/// internal ref count mechanism
 
-};      // class SvtExtendedSecurityOptions
+};		// class SvtExtendedSecurityOptions
 
 #endif  // #ifndef INCLUDED_unotools_EXTENDEDSECURITYOPTIONS_HXX
diff --git a/unotools/inc/unotools/fltrcfg.hxx b/unotools/inc/unotools/fltrcfg.hxx
index 890efebde071..26a1b2205932 100644
--- a/unotools/inc/unotools/fltrcfg.hxx
+++ b/unotools/inc/unotools/fltrcfg.hxx
@@ -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
@@ -40,11 +40,11 @@ class UNOTOOLS_DLLPUBLIC SvtFilterOptions : public utl::ConfigItem
     const com::sun::star::uno::Sequence<rtl::OUString>& GetPropertyNames();
 public:
                     SvtFilterOptions();
-    virtual        ~SvtFilterOptions();
+    virtual 	   ~SvtFilterOptions();
 
-    virtual void            Notify( const com::sun::star::uno::Sequence<rtl::OUString>& aPropertyNames);
-    virtual void            Commit();
-    void                    Load();
+    virtual void 			Notify( const com::sun::star::uno::Sequence<rtl::OUString>& aPropertyNames);
+    virtual void			Commit();
+    void					Load();
 
     void SetLoadWordBasicCode( sal_Bool bFlag );
     sal_Bool IsLoadWordBasicCode() const;
diff --git a/unotools/inc/unotools/fontcfg.hxx b/unotools/inc/unotools/fontcfg.hxx
index 633c12c4c99c..4f71c740a549 100644
--- a/unotools/inc/unotools/fontcfg.hxx
+++ b/unotools/inc/unotools/fontcfg.hxx
@@ -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
@@ -75,7 +75,7 @@ class UNOTOOLS_DLLPUBLIC DefaultFontConfiguration
             m_xConfigProvider;
     com::sun::star::uno::Reference< com::sun::star::container::XNameAccess >
             m_xConfigAccess;
-
+            
     struct LocaleAccess
     {
         // the real string used in the configuration
@@ -84,22 +84,22 @@ class UNOTOOLS_DLLPUBLIC DefaultFontConfiguration
         // xAccess is mutable to be able to be filled on demand
         mutable com::sun::star::uno::Reference< com::sun::star::container::XNameAccess > xAccess;
     };
-
+            
     std::hash_map< com::sun::star::lang::Locale,
                    LocaleAccess,
                    utl::LocaleHash >
             m_aConfig;
-
+    
     rtl::OUString tryLocale( const com::sun::star::lang::Locale& rLocale, const rtl::OUString& rType ) const;
-
+    
     DefaultFontConfiguration();
     public:
     ~DefaultFontConfiguration();
-
+    
     static DefaultFontConfiguration* get();
-
+    
     rtl::OUString getDefaultFont( const com::sun::star::lang::Locale& rLocale, int nType ) const;
-    rtl::OUString getUserInterfaceFont( const com::sun::star::lang::Locale& rLocale ) const;
+    rtl::OUString getUserInterfaceFont( const com::sun::star::lang::Locale& rLocale ) const;    
 };
 
 // IMPL_FONT_ATTR_DEFAULT       - Default-Font like Andale Sans UI, Palace Script, Albany, Thorndale, Cumberland, ...
@@ -162,14 +162,14 @@ class UNOTOOLS_DLLPUBLIC DefaultFontConfiguration
 
 struct UNOTOOLS_DLLPUBLIC FontNameAttr
 {
-    String                              Name;
-    ::std::vector< String >             Substitutions;
-    ::std::vector< String >             MSSubstitutions;
-    ::std::vector< String >             PSSubstitutions;
-    ::std::vector< String >             HTMLSubstitutions;
-    FontWeight                          Weight;
-    FontWidth                           Width;
-    unsigned long                       Type; // bitfield of IMPL_FONT_ATTR_*
+    String								Name;
+    ::std::vector< String >				Substitutions;
+    ::std::vector< String >				MSSubstitutions;
+    ::std::vector< String >				PSSubstitutions;
+    ::std::vector< String >				HTMLSubstitutions;
+    FontWeight							Weight;
+    FontWidth							Width;
+    unsigned long						Type; // bitfield of IMPL_FONT_ATTR_*
 };
 
 class UNOTOOLS_DLLPUBLIC FontSubstConfiguration
@@ -188,14 +188,14 @@ private:
         // a minimal match is sufficient (that is e.g. "Thorndale" will match
         // "Thorndale BlaBlub"). Also names must be lower case.
         mutable std::vector< FontNameAttr >     aSubstAttributes;
-
+        
         LocaleSubst() : bConfigRead( false ) {}
     };
     std::hash_map< com::sun::star::lang::Locale, LocaleSubst, utl::LocaleHash > m_aSubst;
     typedef std::hash_set< rtl::OUString, rtl::OUStringHash > UniqueSubstHash;
     mutable UniqueSubstHash maSubstHash;
 
-
+    
     void fillSubstVector( const com::sun::star::uno::Reference< com::sun::star::container::XNameAccess > xFont,
                           const rtl::OUString& rType,
                           std::vector< String >& rSubstVector ) const;
diff --git a/unotools/inc/unotools/fontcvt.hxx b/unotools/inc/unotools/fontcvt.hxx
index 333ee36e706d..ab8c4aafd61e 100644
--- a/unotools/inc/unotools/fontcvt.hxx
+++ b/unotools/inc/unotools/fontcvt.hxx
@@ -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
@@ -74,6 +74,6 @@ public:
 //allow somewhat more dubious transformations that are nevertheless
 //recognizably similiar. Even in this mode there will be characters that fail.
 //The users of this might want to make a distinction between failed characters
-//which were inside and those outside the unicode private area.
+//which were inside and those outside the unicode private area. 
 UNOTOOLS_DLLPUBLIC StarSymbolToMSMultiFont *CreateStarSymbolToMSMultiFont(bool bPerfectOnly=false);
 #endif // _UNOTOOLS_FONTCVT_HXX
diff --git a/unotools/inc/unotools/fontdefs.hxx b/unotools/inc/unotools/fontdefs.hxx
index 12868aabe525..9cd2915570c9 100644
--- a/unotools/inc/unotools/fontdefs.hxx
+++ b/unotools/inc/unotools/fontdefs.hxx
@@ -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
@@ -72,8 +72,8 @@ public:
     const sal_Unicode*  mpCvtTab;
     const char*         mpSubsFontName;
     sal_Unicode         (*mpCvtFunc)( sal_Unicode );
-    sal_Unicode         RecodeChar( sal_Unicode c ) const;
-    void                RecodeString( String& rStra, xub_StrLen nIndex, xub_StrLen nLen ) const;
+    sal_Unicode			RecodeChar( sal_Unicode c ) const;
+    void				RecodeString( String& rStra, xub_StrLen nIndex, xub_StrLen nLen ) const;
     static const ConvertChar* GetRecodeData( const String& rOrgFontName, const String& rMapFontName );
 };
 
diff --git a/unotools/inc/unotools/fontoptions.hxx b/unotools/inc/unotools/fontoptions.hxx
index 7809fb4380cf..6d728a94de18 100644
--- a/unotools/inc/unotools/fontoptions.hxx
+++ b/unotools/inc/unotools/fontoptions.hxx
@@ -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
@@ -28,7 +28,7 @@
 #define INCLUDED_unotools_FONTOPTIONS_HXX
 
 //_________________________________________________________________________________________________________________
-//  includes
+//	includes
 //_________________________________________________________________________________________________________________
 
 #include "unotools/unotoolsdllapi.h"
@@ -38,12 +38,12 @@
 #include <unotools/options.hxx>
 
 //_________________________________________________________________________________________________________________
-//  forward declarations
+//	forward declarations
 //_________________________________________________________________________________________________________________
 
 /*-************************************************************************************************************//**
-    @short          forward declaration to our private date container implementation
-    @descr          We use these class as internal member to support small memory requirements.
+    @short			forward declaration to our private date container implementation
+    @descr			We use these class as internal member to support small memory requirements.
                     You can create the container if it is neccessary. The class which use these mechanism
                     is faster and smaller then a complete implementation!
 *//*-*************************************************************************************************************/
@@ -51,108 +51,108 @@
 class SvtFontOptions_Impl;
 
 //_________________________________________________________________________________________________________________
-//  declarations
+//	declarations
 //_________________________________________________________________________________________________________________
 
 /*-************************************************************************************************************//**
-    @short          collect informations about font features
+    @short			collect informations about font features
     @descr          -
 
-    @implements     -
-    @base           -
+    @implements		-
+    @base			-
 
-    @devstatus      ready to use
+    @devstatus		ready to use
 *//*-*************************************************************************************************************/
 
 class UNOTOOLS_DLLPUBLIC SvtFontOptions: public utl::detail::Options
 {
     //-------------------------------------------------------------------------------------------------------------
-    //  public methods
+    //	public methods
     //-------------------------------------------------------------------------------------------------------------
 
     public:
 
         //---------------------------------------------------------------------------------------------------------
-        //  constructor / destructor
+        //	constructor / destructor
         //---------------------------------------------------------------------------------------------------------
 
         /*-****************************************************************************************************//**
-            @short      standard constructor and destructor
-            @descr      This will initialize an instance with default values.
+            @short		standard constructor and destructor
+            @descr		This will initialize an instance with default values.
                         We implement these class with a refcount mechanism! Every instance of this class increase it
                         at create and decrease it at delete time - but all instances use the same data container!
                         He is implemented as a static member ...
 
-            @seealso    member m_nRefCount
-            @seealso    member m_pDataContainer
+            @seealso	member m_nRefCount
+            @seealso	member m_pDataContainer
 
-            @param      -
-            @return     -
+            @param		-
+            @return		-
 
-            @onerror    -
+            @onerror	-
         *//*-*****************************************************************************************************/
 
          SvtFontOptions();
         virtual ~SvtFontOptions();
 
         //---------------------------------------------------------------------------------------------------------
-        //  interface
+        //	interface
         //---------------------------------------------------------------------------------------------------------
 
         /*-****************************************************************************************************//**
-            @short      interface methods to get and set value of config key "org.openoffice.Office.Common/Font"
-            @descr      These values defines different states of font handling.
+            @short		interface methods to get and set value of config key "org.openoffice.Office.Common/Font"
+            @descr		These values defines different states of font handling.
 
-                        ..ReplacementTable..()  =>  Determines if the list of font replacements is applied or not.
+                        ..ReplacementTable..()	=>  Determines if the list of font replacements is applied or not.
 
-                        ..FontHistory..()       =>  The last 5 fonts will be shown and the last one will be the
+                        ..FontHistory..()		=>  The last 5 fonts will be shown and the last one will be the
                                                     first name on the list. These will be displayed in the Font name
                                                     combo box on the Object bar.
 
-                        ..FontWYSIWYG..()       =>  With this option the names of the selectable fonts
+                        ..FontWYSIWYG..()		=>  With this option the names of the selectable fonts
                                                     (for example, the fonts in the Font field in the object bar)
                                                     will be formatted as the current font.
 
-            @seealso    -
+            @seealso	-
 
-            @param      -
-            @return     -
+            @param		-
+            @return		-
 
-            @onerror    No error should occurre!
+            @onerror	No error should occurre!
         *//*-*****************************************************************************************************/
 
-        sal_Bool    IsReplacementTableEnabled   (                   ) const ;
-        void        EnableReplacementTable      ( sal_Bool bState   )       ;
+        sal_Bool	IsReplacementTableEnabled	(					) const	;
+        void		EnableReplacementTable		( sal_Bool bState	)		;
 
-        sal_Bool    IsFontHistoryEnabled        (                   ) const ;
-        void        EnableFontHistory           ( sal_Bool bState   )       ;
+        sal_Bool	IsFontHistoryEnabled		(					) const	;
+        void		EnableFontHistory			( sal_Bool bState	)		;
 
-        sal_Bool    IsFontWYSIWYGEnabled        (                   ) const ;
-        void        EnableFontWYSIWYG           ( sal_Bool bState   )       ;
+        sal_Bool	IsFontWYSIWYGEnabled		(					) const	;
+        void		EnableFontWYSIWYG			( sal_Bool bState	)		;
 
     //-------------------------------------------------------------------------------------------------------------
-    //  private methods
+    //	private methods
     //-------------------------------------------------------------------------------------------------------------
 
     private:
 
         /*-****************************************************************************************************//**
-            @short      return a reference to a static mutex
-            @descr      These class use his own static mutex to be threadsafe.
+            @short		return a reference to a static mutex
+            @descr		These class use his own static mutex to be threadsafe.
                         We create a static mutex only for one ime and use at different times.
 
-            @seealso    -
+            @seealso	-
 
-            @param      -
-            @return     A reference to a static mutex member.
+            @param		-
+            @return		A reference to a static mutex member.
 
-            @onerror    -
+            @onerror	-
         *//*-*****************************************************************************************************/
 
         UNOTOOLS_DLLPRIVATE static ::osl::Mutex& impl_GetOwnStaticMutex();
 
     //-------------------------------------------------------------------------------------------------------------
-    //  private member
+    //	private member
     //-------------------------------------------------------------------------------------------------------------
 
     private:
@@ -165,9 +165,9 @@ class UNOTOOLS_DLLPUBLIC SvtFontOptions: public utl::detail::Options
             Do it in your source only.
          */
 
-        static SvtFontOptions_Impl*         m_pDataContainer    ;   /// impl. data container as dynamic pointer for smaller memory requirements!
-        static sal_Int32                    m_nRefCount         ;   /// internal ref count mechanism
+        static SvtFontOptions_Impl*			m_pDataContainer	;	/// impl. data container as dynamic pointer for smaller memory requirements!
+        static sal_Int32					m_nRefCount			;	/// internal ref count mechanism
 
-};      // class SvtFontOptions
+};		// class SvtFontOptions
 
 #endif  // #ifndef INCLUDED_unotools_FONTOPTIONS_HXX
diff --git a/unotools/inc/unotools/historyoptions.hxx b/unotools/inc/unotools/historyoptions.hxx
index 50b411e5d17e..6d86505eb61c 100644
--- a/unotools/inc/unotools/historyoptions.hxx
+++ b/unotools/inc/unotools/historyoptions.hxx
@@ -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
@@ -28,7 +28,7 @@
 #define INCLUDED_SVTOOLS_HISTORYOPTIONS_HXX
 
 //_________________________________________________________________________________________________________________
-//  includes
+//	includes
 //_________________________________________________________________________________________________________________
 
 #include "unotools/unotoolsdllapi.h"
@@ -40,21 +40,21 @@
 #include <unotools/options.hxx>
 
 //_________________________________________________________________________________________________________________
-//  types, enums, ...
+//	types, enums, ...
 //_________________________________________________________________________________________________________________
 
 /*-************************************************************************************************************//**
-    @descr          The method GetList() returns a list of property values.
+    @descr			The method GetList() returns a list of property values.
                     Use follow defines to seperate values by names.
 *//*-*************************************************************************************************************/
 
-#define HISTORY_PROPERTYNAME_URL            ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("URL"       ))
-#define HISTORY_PROPERTYNAME_FILTER         ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Filter"    ))
-#define HISTORY_PROPERTYNAME_TITLE          ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Title"     ))
-#define HISTORY_PROPERTYNAME_PASSWORD       ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Password"  ))
+#define	HISTORY_PROPERTYNAME_URL			::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("URL"		))
+#define	HISTORY_PROPERTYNAME_FILTER			::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Filter"	))
+#define	HISTORY_PROPERTYNAME_TITLE			::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Title"		))
+#define	HISTORY_PROPERTYNAME_PASSWORD		::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Password"	))
 
 /*-************************************************************************************************************//**
-    @descr          You can use these enum values to specify right history if you call ouer interface methods.
+    @descr			You can use these enum values to specify right history if you call ouer interface methods.
 *//*-*************************************************************************************************************/
 
 enum EHistoryType
@@ -65,12 +65,12 @@ enum EHistoryType
 };
 
 //_________________________________________________________________________________________________________________
-//  forward declarations
+//	forward declarations
 //_________________________________________________________________________________________________________________
 
 /*-************************************************************************************************************//**
-    @short          forward declaration to our private date container implementation
-    @descr          We use these class as internal member to support small memory requirements.
+    @short			forward declaration to our private date container implementation
+    @descr			We use these class as internal member to support small memory requirements.
                     You can create the container if it is neccessary. The class which use these mechanism
                     is faster and smaller then a complete implementation!
 *//*-*************************************************************************************************************/
@@ -78,156 +78,156 @@ enum EHistoryType
 class SvtHistoryOptions_Impl;
 
 //_________________________________________________________________________________________________________________
-//  declarations
+//	declarations
 //_________________________________________________________________________________________________________________
 
 /*-************************************************************************************************************//**
-    @short          collect informations about history features
+    @short			collect informations about history features
     @descr          -
 
-    @implements     -
-    @base           -
+    @implements		-
+    @base			-
 
-    @devstatus      ready to use
+    @devstatus		ready to use
 *//*-*************************************************************************************************************/
 
 class UNOTOOLS_DLLPUBLIC SvtHistoryOptions: public utl::detail::Options
 {
     //-------------------------------------------------------------------------------------------------------------
-    //  public methods
+    //	public methods
     //-------------------------------------------------------------------------------------------------------------
 
     public:
 
         //---------------------------------------------------------------------------------------------------------
-        //  constructor / destructor
+        //	constructor / destructor
         //---------------------------------------------------------------------------------------------------------
 
         /*-****************************************************************************************************//**
-            @short      standard constructor and destructor
-            @descr      This will initialize an instance with default values.
+            @short		standard constructor and destructor
+            @descr		This will initialize an instance with default values.
                         We implement these class with a refcount mechanism! Every instance of this class increase it
                         at create and decrease it at delete time - but all instances use the same data container!
                         He is implemented as a static member ...
 
-            @seealso    member m_nRefCount
-            @seealso    member m_pDataContainer
+            @seealso	member m_nRefCount
+            @seealso	member m_pDataContainer
 
-            @param      -
-            @return     -
+            @param		-
+            @return		-
 
-            @onerror    -
+            @onerror	-
         *//*-*****************************************************************************************************/
 
          SvtHistoryOptions();
         virtual ~SvtHistoryOptions();
 
         //---------------------------------------------------------------------------------------------------------
-        //  interface
+        //	interface
         //---------------------------------------------------------------------------------------------------------
 
         /*-****************************************************************************************************//**
-            @short      interface methods to get and set value of config key "org.openoffice.Office.Common/History/..."
-            @descr      key "PickList"  : The last used documents displayed in the file menu.
-                        key "History"   : The last opened documents general.
+            @short		interface methods to get and set value of config key "org.openoffice.Office.Common/History/..."
+            @descr		key "PickList"	: The last used documents displayed in the file menu.
+                        key "History"	: The last opened documents general.
         *//*-*****************************************************************************************************/
 
         /*-****************************************************************************************************//**
-            @short      set/get max size of specified history
-            @descr      Call this methods to get information about max. size of specified list.
+            @short		set/get max size of specified history
+            @descr		Call this methods to get information about max. size of specified list.
                         These value lay down the max count of items in these history. If a new one
                         is add to it the oldest one is deleted automaticly!
 
-            @seealso    -
+            @seealso	-
 
-            @param      "eHistory" select right history.
-            @param      "nSize" is the new max size of specified list. If new size smaller then the old one
+            @param		"eHistory" select right history.
+            @param		"nSize" is the new max size of specified list. If new size smaller then the old one
                         some oldest entries will be destroyed automaticly!
-            @return     Current max size of specified list.
+            @return		Current max size of specified list.
 
-            @onerror    -
+            @onerror	-
         *//*-*****************************************************************************************************/
 
-        sal_uInt32  GetSize( EHistoryType eHistory                      ) const ;
-        void        SetSize( EHistoryType eHistory, sal_uInt32 nSize    )       ;
+        sal_uInt32	GetSize( EHistoryType eHistory						) const	;
+        void		SetSize( EHistoryType eHistory, sal_uInt32 nSize	)		;
 
         /*-****************************************************************************************************//**
-            @short      clear complete sepcified list
-            @descr      Call this methods to clear the whole list. After that GetItemCount() will return 0 ...
+            @short		clear complete sepcified list
+            @descr		Call this methods to clear the whole list. After that GetItemCount() will return 0 ...
                         but GetSize() will return the old value!
 
-            @seealso    -
+            @seealso	-
 
-            @param      "eHistory" select right history.
-            @return     -
+            @param		"eHistory" select right history.
+            @return		-
 
-            @onerror    -
+            @onerror	-
         *//*-*****************************************************************************************************/
 
         void Clear( EHistoryType eHistory );
 
         /*-****************************************************************************************************//**
-            @short      return complete sepcified list
-            @descr      If you will show the whole list call this method to get it completly.
+            @short		return complete sepcified list
+            @descr		If you will show the whole list call this method to get it completly.
 
-            @seealso    -
+            @seealso	-
 
-            @param      "eHistory" select right history.
-            @return     A list of history items is returned.
+            @param		"eHistory" select right history.
+            @return		A list of history items is returned.
 
-            @onerror    -
+            @onerror	-
         *//*-*****************************************************************************************************/
 
         ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > > GetList( EHistoryType eHistory ) const ;
 
         /*-****************************************************************************************************//**
-            @short      append a new item to specified list
-            @descr      You can append items to a list only - removing isn't allowed for a special item!
+            @short		append a new item to specified list
+            @descr		You can append items to a list only - removing isn't allowed for a special item!
                         The oldest entry is deleted automaticly if max size arrived or you can call Clear() ...
                         It exist two different overload methods to do this.
                         One for user which have an complete history item and another one for uncompletly data sets!
 
-            @seealso    method SetSize()
-            @seealso    method Clear()
+            @seealso	method SetSize()
+            @seealso	method Clear()
 
-            @param      "eHistory" select right history.
-            @param      "sURL" URL to save in history
-            @param      "sFilter" filter name to save in history
-            @param      "sTitle" document title to save in history
-            @param      "sPassword" password to save in history
-            @return     -
+            @param		"eHistory" select right history.
+            @param		"sURL" URL to save in history
+            @param		"sFilter" filter name to save in history
+            @param		"sTitle" document title to save in history
+            @param		"sPassword" password to save in history
+            @return		-
 
-            @onerror    -
+            @onerror	-
         *//*-*****************************************************************************************************/
 
-        void AppendItem(            EHistoryType        eHistory    ,
-                            const   ::rtl::OUString&    sURL        ,
-                            const   ::rtl::OUString&    sFilter     ,
-                            const   ::rtl::OUString&    sTitle      ,
-                            const   ::rtl::OUString&    sPassword   );
+        void AppendItem(			EHistoryType		eHistory	,
+                            const	::rtl::OUString&	sURL		,
+                            const	::rtl::OUString&	sFilter		,
+                            const	::rtl::OUString&	sTitle		,
+                            const	::rtl::OUString&	sPassword	);
 
     //-------------------------------------------------------------------------------------------------------------
-    //  private methods
+    //	private methods
     //-------------------------------------------------------------------------------------------------------------
 
     private:
 
         /*-****************************************************************************************************//**
-            @short      return a reference to a static mutex
-            @descr      Make these class threadsafe.
+            @short		return a reference to a static mutex
+            @descr		Make these class threadsafe.
 
-            @seealso    -
+            @seealso	-
 
-            @param      -
-            @return     A reference to a static mutex member.
+            @param		-
+            @return		A reference to a static mutex member.
 
-            @onerror    -
+            @onerror	-
         *//*-*****************************************************************************************************/
 
         UNOTOOLS_DLLPRIVATE static ::osl::Mutex& GetOwnStaticMutex();
 
     //-------------------------------------------------------------------------------------------------------------
-    //  private member
+    //	private member
     //-------------------------------------------------------------------------------------------------------------
 
     private:
@@ -240,9 +240,9 @@ class UNOTOOLS_DLLPUBLIC SvtHistoryOptions: public utl::detail::Options
             Do it in your source only.
          */
 
-        static SvtHistoryOptions_Impl*  m_pDataContainer    ;   /// impl. data container as dynamic pointer for smaller memory requirements!
-        static sal_Int32                m_nRefCount         ;   /// internal ref count mechanism
+        static SvtHistoryOptions_Impl*	m_pDataContainer	;	/// impl. data container as dynamic pointer for smaller memory requirements!
+        static sal_Int32				m_nRefCount			;	/// internal ref count mechanism
 
-};      // class SvtHistoryOptions
+};		// class SvtHistoryOptions
 
-#endif  // #ifndef INCLUDED_SVTOOLS_HISTORYOPTIONS_HXX
+#endif	// #ifndef INCLUDED_SVTOOLS_HISTORYOPTIONS_HXX
diff --git a/unotools/inc/unotools/historyoptions_const.hxx b/unotools/inc/unotools/historyoptions_const.hxx
index 1d57d5146666..e3acd20b5d60 100644
--- a/unotools/inc/unotools/historyoptions_const.hxx
+++ b/unotools/inc/unotools/historyoptions_const.hxx
@@ -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
diff --git a/unotools/inc/unotools/idhelper.hxx b/unotools/inc/unotools/idhelper.hxx
index d8c734025b12..57a2aa5a9d92 100644
--- a/unotools/inc/unotools/idhelper.hxx
+++ b/unotools/inc/unotools/idhelper.hxx
@@ -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
@@ -42,7 +42,7 @@ namespace utl
 
 //=========================================================================
 // to shorten some lines ...
-typedef ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type >  TypeSequence;
+typedef ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type >	TypeSequence;
 
 // compare to Sequences of Types
 struct TypeSequenceLess : public ::std::binary_function<TypeSequence, TypeSequence, bool>
@@ -77,14 +77,14 @@ public:
 };
 
 // declare the map
-DECLARE_STL_MAP (   TypeSequence,
+DECLARE_STL_MAP	(	TypeSequence,
                     ::cppu::OImplementationId,
                     TypeSequenceLess,
                     MapType2Id
                 );
 
 //.........................................................................
-}   // namespace utl
+}	// namespace utl
 //.........................................................................
 
 //=========================================================================
@@ -106,39 +106,39 @@ DECLARE_STL_MAP (   TypeSequence,
     cleared. The less classes use it, the earlier map entries which may have
     been reused will be cleared.
 */
-#define DECLARE_IMPLEMENTATIONID_HELPER(_namespace, classname)      \
-namespace _namespace {                                              \
-class classname                                                     \
-{                                                                   \
-    friend class classname##Ref;                                \
+#define DECLARE_IMPLEMENTATIONID_HELPER(_namespace, classname)		\
+namespace _namespace {												\
+class classname														\
+{																	\
+    friend class classname##Ref;								\
                                                                     \
-    static sal_Int32    s_nReferenced;                              \
-    static void*        s_pMap;                                     \
+    static sal_Int32	s_nReferenced;								\
+    static void*		s_pMap;										\
                                                                     \
-    static ::osl::Mutex s_aMutex;                                   \
+    static ::osl::Mutex	s_aMutex;									\
                                                                     \
-public:                                                             \
-    static void acquire();                                          \
-    static void release();                                          \
+public:																\
+    static void acquire();											\
+    static void release();											\
                                                                     \
-    static ::com::sun::star::uno::Sequence< sal_Int8 > getImplementationId( \
-        const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type >& _rTypes); \
+    static ::com::sun::star::uno::Sequence< sal_Int8 > getImplementationId(	\
+        const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type >& _rTypes);	\
                                                                     \
-private:                                                            \
-    static void implCreateMap();                                    \
+private:															\
+    static void implCreateMap();									\
                                                                     \
-    classname() { }                                                 \
-};                                                                  \
+    classname() { }													\
+};																	\
                                                                     \
-/*=======================================================================*/ \
-class classname##Ref                                                \
-{                                                                   \
-public:                                                             \
-    classname##Ref() { classname::acquire(); }  \
-    ~classname##Ref() { classname::release(); } \
-};                                                                  \
+/*=======================================================================*/	\
+class classname##Ref												\
+{																	\
+public:																\
+    classname##Ref() { classname::acquire(); }	\
+    ~classname##Ref() { classname::release(); }	\
+};																	\
                                                                     \
-}   /* _namespace */                                                \
+}	/* _namespace */												\
                                                                     \
 
 /*************************************************************************
@@ -147,62 +147,62 @@ public:                                                             \
 
 /** implement an id helper
 */
-#define IMPLEMENT_IMPLEMENTATIONID_HELPER(_namespace, classname)        \
-namespace _namespace {  \
+#define IMPLEMENT_IMPLEMENTATIONID_HELPER(_namespace, classname)		\
+namespace _namespace {	\
     \
-/*=======================================================================*/ \
+/*=======================================================================*/	\
     \
-sal_Int32       classname::s_nReferenced(0);    \
-void*           classname::s_pMap = NULL;   \
-::osl::Mutex    classname::s_aMutex;    \
+sal_Int32		classname::s_nReferenced(0);	\
+void*			classname::s_pMap = NULL;	\
+::osl::Mutex	classname::s_aMutex;	\
     \
-/*-----------------------------------------------------------------------*/ \
-void classname::acquire()   \
-{   \
-    ::osl::MutexGuard aGuard(s_aMutex); \
-    ++s_nReferenced;    \
-}   \
+/*-----------------------------------------------------------------------*/	\
+void classname::acquire()	\
+{	\
+    ::osl::MutexGuard aGuard(s_aMutex);	\
+    ++s_nReferenced;	\
+}	\
     \
-/*-----------------------------------------------------------------------*/ \
-void classname::release()   \
-{   \
-    ::osl::MutexGuard aGuard(s_aMutex); \
-    if (!--s_nReferenced)   \
-    {   \
-        delete static_cast< ::utl::MapType2Id *>( s_pMap ); \
-        s_pMap = NULL;  \
-    }   \
-}   \
+/*-----------------------------------------------------------------------*/	\
+void classname::release()	\
+{	\
+    ::osl::MutexGuard aGuard(s_aMutex);	\
+    if (!--s_nReferenced)	\
+    {	\
+        delete static_cast< ::utl::MapType2Id *>( s_pMap );	\
+        s_pMap = NULL;	\
+    }	\
+}	\
     \
-/*-----------------------------------------------------------------------*/ \
-::com::sun::star::uno::Sequence< sal_Int8 > classname::getImplementationId( \
-        const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type >& _rTypes)  \
-{   \
-    ::osl::MutexGuard aGuard(s_aMutex); \
-    DBG_ASSERT(s_nReferenced,   \
-        "classname::getImplementationId : you need to hold a reference to this class in order to use it !");    \
-        /* give the calling class a member of type classname##Ref and all is fine .... */   \
+/*-----------------------------------------------------------------------*/	\
+::com::sun::star::uno::Sequence< sal_Int8 > classname::getImplementationId(	\
+        const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type >& _rTypes)	\
+{	\
+    ::osl::MutexGuard aGuard(s_aMutex);	\
+    DBG_ASSERT(s_nReferenced,	\
+        "classname::getImplementationId : you need to hold a reference to this class in order to use it !");	\
+        /* give the calling class a member of type classname##Ref and all is fine .... */	\
     \
-    implCreateMap();    \
+    implCreateMap();	\
     \
-    ::utl::MapType2Id* pMap = static_cast< ::utl::MapType2Id *>(s_pMap);    \
+    ::utl::MapType2Id* pMap = static_cast< ::utl::MapType2Id *>(s_pMap);	\
     \
-    ::cppu::OImplementationId& rId = (*pMap)[_rTypes];  \
-    /* this will create an entry for the given type sequence, if neccessary */  \
+    ::cppu::OImplementationId& rId = (*pMap)[_rTypes];	\
+    /* this will create an entry for the given type sequence, if neccessary */	\
     \
-    return rId.getImplementationId();   \
-}   \
+    return rId.getImplementationId();	\
+}	\
     \
-/*-----------------------------------------------------------------------*/ \
-void classname::implCreateMap() \
-{   \
-    if (s_pMap) \
-        return; \
-    s_pMap = new ::utl::MapType2Id();   \
-}   \
+/*-----------------------------------------------------------------------*/	\
+void classname::implCreateMap()	\
+{	\
+    if (s_pMap)	\
+        return;	\
+    s_pMap = new ::utl::MapType2Id();	\
+}	\
     \
     \
-}   /* _namespace */    \
+}	/* _namespace */	\
     \
 
 
diff --git a/unotools/inc/unotools/inetoptions.hxx b/unotools/inc/unotools/inetoptions.hxx
index f69d3d211c9c..1a6d1b8fcc7c 100644
--- a/unotools/inc/unotools/inetoptions.hxx
+++ b/unotools/inc/unotools/inetoptions.hxx
@@ -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
diff --git a/unotools/inc/unotools/internaloptions.hxx b/unotools/inc/unotools/internaloptions.hxx
index 7e2be078811d..0c8ad67f61bf 100644
--- a/unotools/inc/unotools/internaloptions.hxx
+++ b/unotools/inc/unotools/internaloptions.hxx
@@ -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
@@ -28,7 +28,7 @@
 #define INCLUDED_unotools_INTERNALOPTIONS_HXX
 
 //_________________________________________________________________________________________________________________
-//  includes
+//	includes
 //_________________________________________________________________________________________________________________
 
 #include "unotools/unotoolsdllapi.h"
@@ -38,19 +38,19 @@
 #include <unotools/options.hxx>
 
 //_________________________________________________________________________________________________________________
-//  namespaces!
+//	namespaces!
 //_________________________________________________________________________________________________________________
 
-#define MUTEX           ::osl::Mutex
-#define OUSTRING        ::rtl::OUString
+#define	MUTEX			::osl::Mutex
+#define	OUSTRING		::rtl::OUString
 
 //_________________________________________________________________________________________________________________
-//  forward declarations
+//	forward declarations
 //_________________________________________________________________________________________________________________
 
 /*-************************************************************************************************************//**
-    @short          forward declaration to our private date container implementation
-    @descr          We use these class as internal member to support small memory requirements.
+    @short			forward declaration to our private date container implementation
+    @descr			We use these class as internal member to support small memory requirements.
                     You can create the container if it is neccessary. The class which use these mechanism
                     is faster and smaller then a complete implementation!
 *//*-*************************************************************************************************************/
@@ -58,108 +58,108 @@
 class SvtInternalOptions_Impl;
 
 //_________________________________________________________________________________________________________________
-//  declarations
+//	declarations
 //_________________________________________________________________________________________________________________
 
 /*-************************************************************************************************************//**
-    @short          collect informations about internal features
+    @short			collect informations about internal features
     @descr          -
 
-    @implements     -
-    @base           -
+    @implements		-
+    @base			-
 
-    @ATTENTION      This class is partially threadsafe.
+    @ATTENTION		This class is partially threadsafe.
 
-    @devstatus      ready to use
+    @devstatus		ready to use
 *//*-*************************************************************************************************************/
 
 class UNOTOOLS_DLLPUBLIC SvtInternalOptions: public utl::detail::Options
 {
     //-------------------------------------------------------------------------------------------------------------
-    //  public methods
+    //	public methods
     //-------------------------------------------------------------------------------------------------------------
 
     public:
 
         //---------------------------------------------------------------------------------------------------------
-        //  constructor / destructor
+        //	constructor / destructor
         //---------------------------------------------------------------------------------------------------------
 
         /*-****************************************************************************************************//**
-            @short      standard constructor and destructor
-            @descr      This will initialize an instance with default values.
+            @short		standard constructor and destructor
+            @descr		This will initialize an instance with default values.
                         We implement these class with a refcount mechanism! Every instance of this class increase it
                         at create and decrease it at delete time - but all instances use the same data container!
                         He is implemented as a static member ...
 
-            @seealso    member m_nRefCount
-            @seealso    member m_pDataContainer
+            @seealso	member m_nRefCount
+            @seealso	member m_pDataContainer
 
-            @param      -
-            @return     -
+            @param		-
+            @return		-
 
-            @onerror    -
+            @onerror	-
         *//*-*****************************************************************************************************/
 
          SvtInternalOptions();
         virtual ~SvtInternalOptions();
 
         //---------------------------------------------------------------------------------------------------------
-        //  interface
+        //	interface
         //---------------------------------------------------------------------------------------------------------
 
         /*-****************************************************************************************************//**
-            @short      interface methods to get and set value of config key "org.openoffice.Office.Common/Internal/..."
+            @short		interface methods to get and set value of config key "org.openoffice.Office.Common/Internal/..."
             @descr      These options describe internal states to enable/disable features of installed office.
                         The values are fixed at runtime - and implemented as readonly!
 
-                        SlotCFGEnabled()    =>  If this option is set (true), StarOffice is searching for the slot.cfg.
+                        SlotCFGEnabled()	=>  If this option is set (true), StarOffice is searching for the slot.cfg.
                                                 If the slot.cfg cannot be found, the start is aborted.
                                                 If this option is not set (false), the slot.cfg must not be available,
                                                 otherwise the start is also aborted.
 
-                        CrashMailEnabled()  =>  Crash-Mail-Feature to document program crashes. After a crash,
+                        CrashMailEnabled()	=>  Crash-Mail-Feature to document program crashes. After a crash,
                                                 an e-mail with information about the system used is generated
                                                 automatically when starting StarOffice.
 
-            @seealso    configuration package "org.openoffice.Office.Common/Internal"
+            @seealso	configuration package "org.openoffice.Office.Common/Internal"
         *//*-*****************************************************************************************************/
 
-        sal_Bool    SlotCFGEnabled      () const;
-        sal_Bool    CrashMailEnabled    () const;
-        sal_Bool    MailUIEnabled      () const;
-        sal_Bool    IsRemoveMenuEntryClose() const;
-        sal_Bool    IsRemoveMenuEntryBackToWebtop() const;
-        sal_Bool    IsRemoveMenuEntryNewWebtop() const;
-        sal_Bool    IsRemoveMenuEntryLogout() const;
+        sal_Bool	SlotCFGEnabled		() const;
+        sal_Bool	CrashMailEnabled	() const;
+        sal_Bool	MailUIEnabled      () const;
+        sal_Bool	IsRemoveMenuEntryClose() const;
+        sal_Bool	IsRemoveMenuEntryBackToWebtop() const;
+        sal_Bool	IsRemoveMenuEntryNewWebtop() const;
+        sal_Bool	IsRemoveMenuEntryLogout() const;
 
-        OUSTRING    GetCurrentTempURL() const;
-        void        SetCurrentTempURL( const OUSTRING& aNewCurrentTempURL );
+        OUSTRING	GetCurrentTempURL() const;
+        void		SetCurrentTempURL( const OUSTRING& aNewCurrentTempURL );
 
     //-------------------------------------------------------------------------------------------------------------
-    //  private methods
+    //	private methods
     //-------------------------------------------------------------------------------------------------------------
 
     private:
 
         /*-****************************************************************************************************//**
-            @short      return a reference to a static mutex
-            @descr      These class is partially threadsafe (for de-/initialization only).
+            @short		return a reference to a static mutex
+            @descr		These class is partially threadsafe (for de-/initialization only).
                         All access methods are'nt safe!
                         We create a static mutex only for one ime and use at different times.
 
-            @seealso    -
+            @seealso	-
 
-            @param      -
-            @return     A reference to a static mutex member.
+            @param		-
+            @return		A reference to a static mutex member.
 
-            @onerror    -
+            @onerror	-
         *//*-*****************************************************************************************************/
 
         UNOTOOLS_DLLPRIVATE static MUTEX& GetOwnStaticMutex();
 
     //-------------------------------------------------------------------------------------------------------------
-    //  private member
+    //	private member
     //-------------------------------------------------------------------------------------------------------------
 
     private:
@@ -172,9 +172,9 @@ class UNOTOOLS_DLLPUBLIC SvtInternalOptions: public utl::detail::Options
             Do it in your source only.
          */
 
-        static SvtInternalOptions_Impl* m_pDataContainer    ;   /// impl. data container as dynamic pointer for smaller memory requirements!
-        static sal_Int32                m_nRefCount         ;   /// internal ref count mechanism
+        static SvtInternalOptions_Impl*	m_pDataContainer	;	/// impl. data container as dynamic pointer for smaller memory requirements!
+        static sal_Int32				m_nRefCount			;	/// internal ref count mechanism
 
-};      // class SvtInternalOptions
+};		// class SvtInternalOptions
 
 #endif  // #ifndef INCLUDED_unotools_INTERNALOPTIONS_HXX
diff --git a/unotools/inc/unotools/intlwrapper.hxx b/unotools/inc/unotools/intlwrapper.hxx
index e35f4cc9268f..49754e473e73 100644
--- a/unotools/inc/unotools/intlwrapper.hxx
+++ b/unotools/inc/unotools/intlwrapper.hxx
@@ -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
@@ -55,7 +55,7 @@ class UNOTOOLS_DLLPUBLIC IntlWrapper
 {
 private:
 
-    ::com::sun::star::lang::Locale  aLocale;
+    ::com::sun::star::lang::Locale	aLocale;
     ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > xSMgr;
 
             CharClass*          pCharClass;
diff --git a/unotools/inc/unotools/itemholderbase.hxx b/unotools/inc/unotools/itemholderbase.hxx
index df1892d41a12..060357c6fb77 100644
--- a/unotools/inc/unotools/itemholderbase.hxx
+++ b/unotools/inc/unotools/itemholderbase.hxx
@@ -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
diff --git a/unotools/inc/unotools/javaoptions.hxx b/unotools/inc/unotools/javaoptions.hxx
index 38e023556716..b01836063f47 100644
--- a/unotools/inc/unotools/javaoptions.hxx
+++ b/unotools/inc/unotools/javaoptions.hxx
@@ -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
diff --git a/unotools/inc/unotools/lingucfg.hxx b/unotools/inc/unotools/lingucfg.hxx
index 9a26bdd73021..9b785a2e6f64 100755
--- a/unotools/inc/unotools/lingucfg.hxx
+++ b/unotools/inc/unotools/lingucfg.hxx
@@ -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
@@ -49,14 +49,14 @@ class SvtLinguConfigItem;
 
 struct UNOTOOLS_DLLPUBLIC SvtLinguOptions
 {
-    ::com::sun::star::uno::Sequence< rtl::OUString >    aActiveDics;
+    ::com::sun::star::uno::Sequence< rtl::OUString >	aActiveDics;
     ::com::sun::star::uno::Sequence< rtl::OUString >    aActiveConvDics;
 
     BOOL                                                bROActiveDics;
     BOOL                                                bROActiveConvDics;
 
     // Hyphenator service specific options
-    INT16   nHyphMinLeading,
+    INT16	nHyphMinLeading,
             nHyphMinTrailing,
             nHyphMinWordLength;
 
@@ -65,39 +65,39 @@ struct UNOTOOLS_DLLPUBLIC SvtLinguOptions
             bROHyphMinWordLength;
 
     // misc options (non-service specific)
-    INT16   nDefaultLanguage;
-    INT16   nDefaultLanguage_CJK;
-    INT16   nDefaultLanguage_CTL;
+    INT16	nDefaultLanguage;
+    INT16	nDefaultLanguage_CJK;
+    INT16	nDefaultLanguage_CTL;
 
     BOOL    bRODefaultLanguage;
     BOOL    bRODefaultLanguage_CJK;
     BOOL    bRODefaultLanguage_CTL;
 
     // spelling options (non-service specific)
-    BOOL    bIsSpellSpecial;
-    BOOL    bIsSpellAuto;
-    BOOL    bIsSpellReverse;
+    BOOL	bIsSpellSpecial;
+    BOOL	bIsSpellAuto;
+    BOOL	bIsSpellReverse;
 
     BOOL    bROIsSpellSpecial;
     BOOL    bROIsSpellAuto;
     BOOL    bROIsSpellReverse;
 
     // hyphenation options (non-service specific)
-    BOOL    bIsHyphSpecial;
-    BOOL    bIsHyphAuto;
+    BOOL	bIsHyphSpecial;
+    BOOL	bIsHyphAuto;
 
     BOOL    bROIsHyphSpecial;
     BOOL    bROIsHyphAuto;
 
     // common to SpellChecker, Hyphenator and Thesaurus service
-    BOOL    bIsUseDictionaryList;
-    BOOL    bIsIgnoreControlCharacters;
+    BOOL	bIsUseDictionaryList;
+    BOOL	bIsIgnoreControlCharacters;
 
     BOOL    bROIsUseDictionaryList;
     BOOL    bROIsIgnoreControlCharacters;
 
     // SpellChecker service specific options
-    BOOL    bIsSpellWithDigits,
+    BOOL	bIsSpellWithDigits,
             bIsSpellUpperCase,
             bIsSpellCapitalization;
 
@@ -144,11 +144,11 @@ struct UNOTOOLS_DLLPUBLIC SvtLinguOptions
 struct UNOTOOLS_DLLPUBLIC SvtLinguConfigDictionaryEntry
 {
     // the URL's pointing to the location of the files the dictionary consists of
-    com::sun::star::uno::Sequence< rtl::OUString >  aLocations;
+    com::sun::star::uno::Sequence< rtl::OUString >	aLocations;
     // the name of the dictionary format implement
-    rtl::OUString                                   aFormatName;
+    rtl::OUString									aFormatName;
     // the list of languages (ISO names) the dictionary can be used for
-    com::sun::star::uno::Sequence< rtl::OUString >  aLocaleNames;
+    com::sun::star::uno::Sequence< rtl::OUString >	aLocaleNames;
 };
 
 //////////////////////////////////////////////////////////////////////
diff --git a/unotools/inc/unotools/linguprops.hxx b/unotools/inc/unotools/linguprops.hxx
index 4f2640116454..add07cd6e3d9 100644
--- a/unotools/inc/unotools/linguprops.hxx
+++ b/unotools/inc/unotools/linguprops.hxx
@@ -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
@@ -30,35 +30,35 @@
 
 
 // UNO property names for general options
-#define UPN_IS_GERMAN_PRE_REFORM            "IsGermanPreReform"     /*! deprecated #i91949 !*/
-#define UPN_IS_USE_DICTIONARY_LIST          "IsUseDictionaryList"
-#define UPN_IS_IGNORE_CONTROL_CHARACTERS    "IsIgnoreControlCharacters"
-#define UPN_ACTIVE_DICTIONARIES             "ActiveDictionaries"
+#define UPN_IS_GERMAN_PRE_REFORM			"IsGermanPreReform"		/*! deprecated #i91949 !*/
+#define	UPN_IS_USE_DICTIONARY_LIST      	"IsUseDictionaryList"
+#define UPN_IS_IGNORE_CONTROL_CHARACTERS	"IsIgnoreControlCharacters"
+#define UPN_ACTIVE_DICTIONARIES				"ActiveDictionaries"
 
 // UNO property names for SpellChecker
-#define UPN_IS_SPELL_UPPER_CASE             "IsSpellUpperCase"
-#define UPN_IS_SPELL_WITH_DIGITS            "IsSpellWithDigits"
-#define UPN_IS_SPELL_CAPITALIZATION         "IsSpellCapitalization"
+#define UPN_IS_SPELL_UPPER_CASE				"IsSpellUpperCase"
+#define UPN_IS_SPELL_WITH_DIGITS			"IsSpellWithDigits"
+#define UPN_IS_SPELL_CAPITALIZATION			"IsSpellCapitalization"
 
 // UNO property names for Hyphenator
-#define UPN_HYPH_MIN_LEADING                "HyphMinLeading"
-#define UPN_HYPH_MIN_TRAILING               "HyphMinTrailing"
-#define UPN_HYPH_MIN_WORD_LENGTH            "HyphMinWordLength"
+#define UPN_HYPH_MIN_LEADING				"HyphMinLeading"
+#define UPN_HYPH_MIN_TRAILING				"HyphMinTrailing"
+#define UPN_HYPH_MIN_WORD_LENGTH			"HyphMinWordLength"
 
 // UNO property names for Lingu
 // (those not covered by the SpellChecker and Hyphenator
 // properties and more likely to be used in other modules only)
-#define UPN_DEFAULT_LANGUAGE                "DefaultLanguage"
-#define UPN_DEFAULT_LOCALE                  "DefaultLocale"
-#define UPN_DEFAULT_LOCALE_CJK              "DefaultLocale_CJK"
-#define UPN_DEFAULT_LOCALE_CTL              "DefaultLocale_CTL"
-#define UPN_IS_HYPH_AUTO                    "IsHyphAuto"
-#define UPN_IS_HYPH_SPECIAL                 "IsHyphSpecial"
-#define UPN_IS_SPELL_AUTO                   "IsSpellAuto"
-#define UPN_IS_SPELL_HIDE                   "IsSpellHide"           /*! deprecated #i91949 !*/
-#define UPN_IS_SPELL_IN_ALL_LANGUAGES       "IsSpellInAllLanguages" /*! deprecated #i91949 !*/
-#define UPN_IS_SPELL_SPECIAL                "IsSpellSpecial"
-#define UPN_IS_WRAP_REVERSE                 "IsWrapReverse"
+#define UPN_DEFAULT_LANGUAGE				"DefaultLanguage"
+#define UPN_DEFAULT_LOCALE					"DefaultLocale"
+#define UPN_DEFAULT_LOCALE_CJK				"DefaultLocale_CJK"
+#define UPN_DEFAULT_LOCALE_CTL				"DefaultLocale_CTL"
+#define UPN_IS_HYPH_AUTO					"IsHyphAuto"
+#define UPN_IS_HYPH_SPECIAL					"IsHyphSpecial"
+#define UPN_IS_SPELL_AUTO					"IsSpellAuto"
+#define UPN_IS_SPELL_HIDE					"IsSpellHide"			/*! deprecated #i91949 !*/
+#define UPN_IS_SPELL_IN_ALL_LANGUAGES		"IsSpellInAllLanguages"	/*! deprecated #i91949 !*/
+#define UPN_IS_SPELL_SPECIAL				"IsSpellSpecial"
+#define UPN_IS_WRAP_REVERSE					"IsWrapReverse"
 #define UPN_DATA_FILES_CHANGED_CHECK_VALUE  "DataFilesChangedCheckValue"
 
 // UNO property names for text conversion options
@@ -84,28 +84,28 @@
 #define UPN_IS_GRAMMAR_INTERACTIVE          "IsInteractiveGrammarCheck"
 
 // uno property handles
-#define UPH_IS_GERMAN_PRE_REFORM             0
-#define UPH_IS_USE_DICTIONARY_LIST           1
-#define UPH_IS_IGNORE_CONTROL_CHARACTERS     2
-#define UPH_IS_SPELL_UPPER_CASE              3
-#define UPH_IS_SPELL_WITH_DIGITS             4
-#define UPH_IS_SPELL_CAPITALIZATION          5
-#define UPH_HYPH_MIN_LEADING                 6
-#define UPH_HYPH_MIN_TRAILING                7
-#define UPH_HYPH_MIN_WORD_LENGTH             8
-#define UPH_DEFAULT_LOCALE                   9
-#define UPH_IS_SPELL_AUTO                   10
-#define UPH_IS_SPELL_HIDE                   11
-#define UPH_IS_SPELL_IN_ALL_LANGUAGES       12
-#define UPH_IS_SPELL_SPECIAL                13
-#define UPH_IS_HYPH_AUTO                    14
-#define UPH_IS_HYPH_SPECIAL                 15
-#define UPH_IS_WRAP_REVERSE                 16
+#define UPH_IS_GERMAN_PRE_REFORM			 0
+#define	UPH_IS_USE_DICTIONARY_LIST			 1
+#define UPH_IS_IGNORE_CONTROL_CHARACTERS	 2
+#define UPH_IS_SPELL_UPPER_CASE				 3
+#define UPH_IS_SPELL_WITH_DIGITS			 4
+#define UPH_IS_SPELL_CAPITALIZATION			 5
+#define UPH_HYPH_MIN_LEADING				 6
+#define UPH_HYPH_MIN_TRAILING				 7
+#define UPH_HYPH_MIN_WORD_LENGTH			 8
+#define UPH_DEFAULT_LOCALE					 9
+#define UPH_IS_SPELL_AUTO					10
+#define UPH_IS_SPELL_HIDE					11
+#define UPH_IS_SPELL_IN_ALL_LANGUAGES		12
+#define UPH_IS_SPELL_SPECIAL				13
+#define UPH_IS_HYPH_AUTO					14
+#define UPH_IS_HYPH_SPECIAL					15
+#define UPH_IS_WRAP_REVERSE					16
 #define UPH_DATA_FILES_CHANGED_CHECK_VALUE  17
-#define UPH_DEFAULT_LANGUAGE                21
-#define UPH_DEFAULT_LOCALE_CJK              22
-#define UPH_DEFAULT_LOCALE_CTL              23
-#define UPH_ACTIVE_DICTIONARIES             24
+#define UPH_DEFAULT_LANGUAGE				21
+#define UPH_DEFAULT_LOCALE_CJK				22
+#define UPH_DEFAULT_LOCALE_CTL				23
+#define UPH_ACTIVE_DICTIONARIES				24
 #define UPH_ACTIVE_CONVERSION_DICTIONARIES  25
 #define UPH_IS_IGNORE_POST_POSITIONAL_WORD  26
 #define UPH_IS_AUTO_CLOSE_DIALOG            27
diff --git a/unotools/inc/unotools/localedatawrapper.hxx b/unotools/inc/unotools/localedatawrapper.hxx
index fd09b07e58cb..a72fb91fc182 100644
--- a/unotools/inc/unotools/localedatawrapper.hxx
+++ b/unotools/inc/unotools/localedatawrapper.hxx
@@ -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
@@ -75,50 +75,50 @@ class UNOTOOLS_DLLPUBLIC LocaleDataWrapper
     ::com::sun::star::uno::Sequence< ::rtl::OUString >                                  aReservedWordSeq;
     ::com::sun::star::uno::Sequence< sal_Int32 >                                        aGrouping;
     // cached items
-    String                      aLocaleItem[::com::sun::star::i18n::LocaleItem::COUNT];
-    String                      aReservedWord[::com::sun::star::i18n::reservedWords::COUNT];
-    String                      aCurrSymbol;
-    String                      aCurrBankSymbol;
-    int                         nDateFormat;
-    int                         nLongDateFormat;
-    USHORT                      nCurrPositiveFormat;
-    USHORT                      nCurrNegativeFormat;
-    USHORT                      nCurrDigits;
-    BOOL                        bLocaleDataItemValid;
-    BOOL                        bReservedWordValid;
+    String						aLocaleItem[::com::sun::star::i18n::LocaleItem::COUNT];
+    String						aReservedWord[::com::sun::star::i18n::reservedWords::COUNT];
+    String						aCurrSymbol;
+    String						aCurrBankSymbol;
+    int							nDateFormat;
+    int							nLongDateFormat;
+    USHORT						nCurrPositiveFormat;
+    USHORT						nCurrNegativeFormat;
+    USHORT						nCurrDigits;
+    BOOL						bLocaleDataItemValid;
+    BOOL						bReservedWordValid;
     mutable ::utl::ReadWriteMutex   aMutex;
 
     // dummies, to be implemented or provided by XML locale data
-    sal_Unicode                 cCurrZeroChar;
+    sal_Unicode					cCurrZeroChar;
 
 
                                 // not implemented, prevent usage
                                 LocaleDataWrapper( const LocaleDataWrapper& );
-            LocaleDataWrapper&  operator=( const LocaleDataWrapper& );
+            LocaleDataWrapper&	operator=( const LocaleDataWrapper& );
 
                                 // whenever Locale changes
-            void                invalidateData();
+            void				invalidateData();
 
-            void                getOneLocaleItemImpl( sal_Int16 nItem );
-            const String&       getOneLocaleItem( sal_Int16 nItem ) const;
+            void				getOneLocaleItemImpl( sal_Int16 nItem );
+            const String&		getOneLocaleItem( sal_Int16 nItem ) const;
 
-            void                getOneReservedWordImpl( sal_Int16 nWord );
-            const String&       getOneReservedWord( sal_Int16 nWord ) const;
+            void				getOneReservedWordImpl( sal_Int16 nWord );
+            const String&		getOneReservedWord( sal_Int16 nWord ) const;
 
-            void                getCurrSymbolsImpl();
-            void                getCurrFormatsImpl();
+            void				getCurrSymbolsImpl();
+            void				getCurrFormatsImpl();
 
             void                scanCurrFormatImpl( const String& rCode,
                                     xub_StrLen nStart, xub_StrLen& nSign,
                                     xub_StrLen& nPar, xub_StrLen& nNum,
                                     xub_StrLen& nBlank, xub_StrLen& nSym );
 
-            void                getDateFormatsImpl();
+            void				getDateFormatsImpl();
             DateFormat          scanDateFormatImpl( const String& rCode );
 
             void                getDefaultCalendarImpl();
 
-            sal_Unicode*        ImplAddFormatNum( sal_Unicode* pBuf,
+            sal_Unicode*		ImplAddFormatNum( sal_Unicode* pBuf,
                                     sal_Int64 nNumber, USHORT nDecimals,
                                     BOOL bUseThousandSep, BOOL bTrailingZeros ) const;
 
@@ -141,7 +141,7 @@ public:
         const { return xSMgr; }
 
     /// set a new Locale to request
-            void                setLocale( const ::com::sun::star::lang::Locale& rLocale );
+            void				setLocale( const ::com::sun::star::lang::Locale& rLocale );
 
     /// get current requested Locale
     const ::com::sun::star::lang::Locale& getLocale() const;
@@ -177,7 +177,7 @@ public:
     static ::com::sun::star::uno::Sequence< sal_uInt16 > getInstalledLanguageTypes();
 
     /// maps the LocaleData string to the International enum
-            MeasurementSystem   mapMeasurementStringToEnum( const String& rMS ) const;
+            MeasurementSystem	mapMeasurementStringToEnum( const String& rMS ) const;
 
     /// Convenience method to obtain the default calendar.
     const ::boost::shared_ptr< ::com::sun::star::i18n::Calendar > getDefaultCalendar() const;
@@ -202,56 +202,56 @@ public:
 
     // Functionality of class International methods, LocaleItem
 
-    inline  const String&       getDateSep() const
+    inline	const String&		getDateSep() const
                                     { return getOneLocaleItem( ::com::sun::star::i18n::LocaleItem::DATE_SEPARATOR ); }
-    inline  const String&       getNumThousandSep() const
+    inline	const String&		getNumThousandSep() const
                                     { return getOneLocaleItem( ::com::sun::star::i18n::LocaleItem::THOUSAND_SEPARATOR ); }
-    inline  const String&       getNumDecimalSep() const
+    inline	const String&		getNumDecimalSep() const
                                     { return getOneLocaleItem( ::com::sun::star::i18n::LocaleItem::DECIMAL_SEPARATOR ); }
-    inline  const String&       getTimeSep() const
+    inline	const String&		getTimeSep() const
                                     { return getOneLocaleItem( ::com::sun::star::i18n::LocaleItem::TIME_SEPARATOR ); }
-    inline  const String&       getTime100SecSep() const
+    inline	const String&		getTime100SecSep() const
                                     { return getOneLocaleItem( ::com::sun::star::i18n::LocaleItem::TIME_100SEC_SEPARATOR ); }
-    inline  const String&       getListSep() const
+    inline	const String&		getListSep() const
                                     { return getOneLocaleItem( ::com::sun::star::i18n::LocaleItem::LIST_SEPARATOR ); }
-    inline  const String&       getQuotationMarkStart() const
+    inline	const String&		getQuotationMarkStart() const
                                     { return getOneLocaleItem( ::com::sun::star::i18n::LocaleItem::SINGLE_QUOTATION_START ); }
-    inline  const String&       getQuotationMarkEnd() const
+    inline	const String&		getQuotationMarkEnd() const
                                     { return getOneLocaleItem( ::com::sun::star::i18n::LocaleItem::SINGLE_QUOTATION_END ); }
-    inline  const String&       getDoubleQuotationMarkStart() const
+    inline	const String&		getDoubleQuotationMarkStart() const
                                     { return getOneLocaleItem( ::com::sun::star::i18n::LocaleItem::DOUBLE_QUOTATION_START ); }
-    inline  const String&       getDoubleQuotationMarkEnd() const
+    inline	const String&		getDoubleQuotationMarkEnd() const
                                     { return getOneLocaleItem( ::com::sun::star::i18n::LocaleItem::DOUBLE_QUOTATION_END ); }
-    inline  const String&       getMeasurementSystem() const
+    inline	const String&		getMeasurementSystem() const
                                     { return getOneLocaleItem( ::com::sun::star::i18n::LocaleItem::MEASUREMENT_SYSTEM ); }
-    inline  MeasurementSystem   getMeasurementSystemEnum() const
+    inline	MeasurementSystem	getMeasurementSystemEnum() const
                                     { return mapMeasurementStringToEnum( getOneLocaleItem( ::com::sun::star::i18n::LocaleItem::MEASUREMENT_SYSTEM ) ); }
-    inline  const String&       getTimeAM() const
+    inline	const String&		getTimeAM() const
                                     { return getOneLocaleItem( ::com::sun::star::i18n::LocaleItem::TIME_AM ); }
-    inline  const String&       getTimePM() const
+    inline	const String&		getTimePM() const
                                     { return getOneLocaleItem( ::com::sun::star::i18n::LocaleItem::TIME_PM ); }
-    inline  const String&       getLongDateDayOfWeekSep() const
+    inline	const String&		getLongDateDayOfWeekSep() const
                                     { return getOneLocaleItem( ::com::sun::star::i18n::LocaleItem::LONG_DATE_DAY_OF_WEEK_SEPARATOR ); }
-    inline  const String&       getLongDateDaySep() const
+    inline	const String&		getLongDateDaySep() const
                                     { return getOneLocaleItem( ::com::sun::star::i18n::LocaleItem::LONG_DATE_DAY_SEPARATOR ); }
-    inline  const String&       getLongDateMonthSep() const
+    inline	const String&		getLongDateMonthSep() const
                                     { return getOneLocaleItem( ::com::sun::star::i18n::LocaleItem::LONG_DATE_MONTH_SEPARATOR ); }
-    inline  const String&       getLongDateYearSep() const
+    inline	const String&		getLongDateYearSep() const
                                     { return getOneLocaleItem( ::com::sun::star::i18n::LocaleItem::LONG_DATE_YEAR_SEPARATOR ); }
 
     // currency
-            const String&       getCurrSymbol() const;
-            const String&       getCurrBankSymbol() const;
-            USHORT              getCurrPositiveFormat() const;
-            USHORT              getCurrNegativeFormat() const;
-            USHORT              getCurrDigits() const;
+            const String&		getCurrSymbol() const;
+            const String&		getCurrBankSymbol() const;
+            USHORT				getCurrPositiveFormat() const;
+            USHORT				getCurrNegativeFormat() const;
+            USHORT				getCurrDigits() const;
 
     // simple date and time formatting
-            DateFormat          getDateFormat() const;
-            DateFormat          getLongDateFormat() const;
+            DateFormat			getDateFormat() const;
+            DateFormat			getLongDateFormat() const;
                                 /// only numerical values of Gregorian calendar
-            String              getDate( const Date& rDate ) const;
-            String              getTime( const Time& rTime, BOOL bSec = TRUE,
+            String				getDate( const Date& rDate ) const;
+            String				getTime( const Time& rTime, BOOL bSec = TRUE,
                                     BOOL b100Sec = FALSE ) const;
             String              getDuration( const Time& rTime,
                                     BOOL bSec = TRUE, BOOL b100Sec = FALSE ) const;
@@ -305,7 +305,7 @@ public:
                                         getCurrSymbol(), bUseThousandSep ); }
 
     // dummy returns, to be implemented
-    inline  sal_Unicode         getCurrZeroChar() const
+    inline	sal_Unicode			getCurrZeroChar() const
                                     { return cCurrZeroChar; }
     inline  BOOL                isNumLeadingZero() const
                                     { return TRUE; }
@@ -318,16 +318,16 @@ public:
 
     // reserved words
 
-    inline  const String&       getTrueWord() const
+    inline	const String&		getTrueWord() const
                                     { return getOneReservedWord( ::com::sun::star::i18n::reservedWords::TRUE_WORD ); }
-    inline  const String&       getFalseWord() const
+    inline	const String&		getFalseWord() const
                                     { return getOneReservedWord( ::com::sun::star::i18n::reservedWords::FALSE_WORD ); }
     /// return a quarter string matching nQuarter (0..3) => "1st quarter" .. "4th quarter"
     inline  const String&       getQuarterWord( sal_Int16 nQuarter ) const
                                     { return getOneReservedWord( ::com::sun::star::i18n::reservedWords::QUARTER1_WORD + nQuarter ); }
-    inline  const String&       getAboveWord() const
+    inline	const String&		getAboveWord() const
                                     { return getOneReservedWord( ::com::sun::star::i18n::reservedWords::ABOVE_WORD ); }
-    inline  const String&       getBelowWord() const
+    inline	const String&		getBelowWord() const
                                     { return getOneReservedWord( ::com::sun::star::i18n::reservedWords::BELOW_WORD ); }
     /// return a quarter abbreviation string matching nQuarter (0..3) => "Q1" .. "Q2"
     inline  const String&       getQuarterAbbreviation( sal_Int16 nQuarter ) const
@@ -347,7 +347,7 @@ public:
 
     /** Append locale info to string, used with locale data checking.
         A string similar to "de_DE requested\n en_US loaded" is appended. */
-            String&             appendLocaleInfo( String& rDebugMsg ) const;
+            String&			    appendLocaleInfo( String& rDebugMsg ) const;
 
     /** Ouput a message during locale data checking. The (UTF-8) string is
         written to stderr and in a non-product build or if DBG_UTIL is enabled
diff --git a/unotools/inc/unotools/localfilehelper.hxx b/unotools/inc/unotools/localfilehelper.hxx
index 11e0851c3298..6409d8331aad 100644
--- a/unotools/inc/unotools/localfilehelper.hxx
+++ b/unotools/inc/unotools/localfilehelper.hxx
@@ -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
diff --git a/unotools/inc/unotools/localisationoptions.hxx b/unotools/inc/unotools/localisationoptions.hxx
index acce942f6a42..56110659e8c1 100644
--- a/unotools/inc/unotools/localisationoptions.hxx
+++ b/unotools/inc/unotools/localisationoptions.hxx
@@ -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
@@ -28,7 +28,7 @@
 #define INCLUDED_unotools_LOCALISATIONOPTIONS_HXX
 
 //_________________________________________________________________________________________________________________
-//  includes
+//	includes
 //_________________________________________________________________________________________________________________
 
 #include <sal/types.h>
@@ -37,12 +37,12 @@
 #include <unotools/options.hxx>
 
 //_________________________________________________________________________________________________________________
-//  forward declarations
+//	forward declarations
 //_________________________________________________________________________________________________________________
 
 /*-************************************************************************************************************//**
-    @short          forward declaration to our private date container implementation
-    @descr          We use these class as internal member to support small memory requirements.
+    @short			forward declaration to our private date container implementation
+    @descr			We use these class as internal member to support small memory requirements.
                     You can create the container if it is neccessary. The class which use these mechanism
                     is faster and smaller then a complete implementation!
 *//*-*************************************************************************************************************/
@@ -50,114 +50,114 @@
 class SvtLocalisationOptions_Impl;
 
 //_________________________________________________________________________________________________________________
-//  declarations
+//	declarations
 //_________________________________________________________________________________________________________________
 
 /*-************************************************************************************************************//**
-    @short          collect informations about localisation features
+    @short			collect informations about localisation features
     @descr          -
 
-    @implements     -
-    @base           -
+    @implements		-
+    @base			-
 
-    @devstatus      ready to use
+    @devstatus		ready to use
 *//*-*************************************************************************************************************/
 
 class UNOTOOLS_DLLPUBLIC SvtLocalisationOptions: public utl::detail::Options
 {
     //-------------------------------------------------------------------------------------------------------------
-    //  public methods
+    //	public methods
     //-------------------------------------------------------------------------------------------------------------
 
     public:
 
         //---------------------------------------------------------------------------------------------------------
-        //  constructor / destructor
+        //	constructor / destructor
         //---------------------------------------------------------------------------------------------------------
 
         /*-****************************************************************************************************//**
-            @short      standard constructor and destructor
-            @descr      This will initialize an instance with default values.
+            @short		standard constructor and destructor
+            @descr		This will initialize an instance with default values.
                         We implement these class with a refcount mechanism! Every instance of this class increase it
                         at create and decrease it at delete time - but all instances use the same data container!
                         He is implemented as a static member ...
 
-            @seealso    member m_nRefCount
-            @seealso    member m_pDataContainer
+            @seealso	member m_nRefCount
+            @seealso	member m_pDataContainer
 
-            @param      -
-            @return     -
+            @param		-
+            @return		-
 
-            @onerror    -
+            @onerror	-
         *//*-*****************************************************************************************************/
 
          SvtLocalisationOptions();
         virtual ~SvtLocalisationOptions();
 
         //---------------------------------------------------------------------------------------------------------
-        //  interface
+        //	interface
         //---------------------------------------------------------------------------------------------------------
 
         /*-****************************************************************************************************//**
-            @short      interface methods to get and set value of config key "org.openoffice.Office.Common/View/Localisation/AutoMnemonic"
-            @descr      These value specifies if shortcuts should be assigned automatically.
+            @short		interface methods to get and set value of config key "org.openoffice.Office.Common/View/Localisation/AutoMnemonic"
+            @descr		These value specifies if shortcuts should be assigned automatically.
 
-            @seealso    -
+            @seealso	-
 
-            @param      "bState", new value to set it in configuration.
-            @return     The value which represent current state of internal variable.
+            @param		"bState", new value to set it in configuration.
+            @return		The value which represent current state of internal variable.
 
-            @onerror    No error should occurre!
+            @onerror	No error should occurre!
         *//*-*****************************************************************************************************/
 
-        sal_Bool    IsAutoMnemonic  (                   ) const ;
-        void        SetAutoMnemonic ( sal_Bool bState   )       ;
+        sal_Bool	IsAutoMnemonic	(					) const	;
+        void		SetAutoMnemonic	( sal_Bool bState	)		;
 
         /*-****************************************************************************************************//**
-            @short      interface methods to get and set value of config key "org.openoffice.Office.Common/View/Localisation/DialogScale"
-            @descr      These value specifies the factor for increasing controls.
+            @short		interface methods to get and set value of config key "org.openoffice.Office.Common/View/Localisation/DialogScale"
+            @descr		These value specifies the factor for increasing controls.
                         Value from [0..100] are allowed.
 
-            @ATTENTION  These methods don't check for valid or invalid values!
+            @ATTENTION	These methods don't check for valid or invalid values!
                         Our configuration server can do it ... but these implementation don't get any notifications
                         about wrong commits ...!
                         => If you set an invalid value - nothing will be changed. The information will lost.
 
-            @seealso    baseclass ConfigItem
+            @seealso	baseclass ConfigItem
 
-            @param      "nScale" new value to set it in configuration.
-            @return     The value which represent current state of internal variable.
+            @param		"nScale" new value to set it in configuration.
+            @return		The value which represent current state of internal variable.
 
-            @onerror    No error should occurre!
+            @onerror	No error should occurre!
         *//*-*****************************************************************************************************/
 
-        sal_Int32   GetDialogScale(                     ) const ;
-        void        SetDialogScale( sal_Int32 nScale    )       ;
+        sal_Int32	GetDialogScale(						) const	;
+        void		SetDialogScale( sal_Int32 nScale	)		;
 
     //-------------------------------------------------------------------------------------------------------------
-    //  private methods
+    //	private methods
     //-------------------------------------------------------------------------------------------------------------
 
     private:
 
         /*-****************************************************************************************************//**
-            @short      return a reference to a static mutex
-            @descr      These class is partially threadsafe (for de-/initialization only).
+            @short		return a reference to a static mutex
+            @descr		These class is partially threadsafe (for de-/initialization only).
                         All access methods are'nt safe!
                         We create a static mutex only for one ime and use at different times.
 
-            @seealso    -
+            @seealso	-
 
-            @param      -
-            @return     A reference to a static mutex member.
+            @param		-
+            @return		A reference to a static mutex member.
 
-            @onerror    -
+            @onerror	-
         *//*-*****************************************************************************************************/
 
         UNOTOOLS_DLLPRIVATE static ::osl::Mutex& GetOwnStaticMutex();
 
     //-------------------------------------------------------------------------------------------------------------
-    //  private member
+    //	private member
     //-------------------------------------------------------------------------------------------------------------
 
     private:
@@ -170,9 +170,9 @@ class UNOTOOLS_DLLPUBLIC SvtLocalisationOptions: public utl::detail::Options
             Do it in your source only.
          */
 
-        static SvtLocalisationOptions_Impl* m_pDataContainer    ;   /// impl. data container as dynamic pointer for smaller memory requirements!
-        static sal_Int32                    m_nRefCount         ;   /// internal ref count mechanism
+        static SvtLocalisationOptions_Impl*	m_pDataContainer	;	/// impl. data container as dynamic pointer for smaller memory requirements!
+        static sal_Int32					m_nRefCount			;	/// internal ref count mechanism
 
-};      // class SvtLocalisationOptions
+};		// class SvtLocalisationOptions
 
 #endif  // #ifndef INCLUDED_unotools_LOCALISATIONOPTIONS_HXX
diff --git a/unotools/inc/unotools/loghelper.hxx b/unotools/inc/unotools/loghelper.hxx
index d5421089dff4..1b106ba74b50 100644
--- a/unotools/inc/unotools/loghelper.hxx
+++ b/unotools/inc/unotools/loghelper.hxx
@@ -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
diff --git a/unotools/inc/unotools/misccfg.hxx b/unotools/inc/unotools/misccfg.hxx
index 01b8db21138f..b9af389c2175 100644
--- a/unotools/inc/unotools/misccfg.hxx
+++ b/unotools/inc/unotools/misccfg.hxx
@@ -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
@@ -40,23 +40,23 @@ namespace utl
 
 class UNOTOOLS_DLLPUBLIC MiscCfg : public detail::Options
 {
-    SfxMiscCfg*     pImpl;
+    SfxMiscCfg*		pImpl;
 
 public:
     MiscCfg( );
     virtual ~MiscCfg( );
 
-    BOOL        IsNotFoundWarning()     const;
-    void        SetNotFoundWarning( BOOL bSet);
+    BOOL		IsNotFoundWarning() 	const;
+    void		SetNotFoundWarning(	BOOL bSet);
 
-    BOOL        IsPaperSizeWarning()    const;
-    void        SetPaperSizeWarning(BOOL bSet);
+    BOOL		IsPaperSizeWarning() 	const;
+    void		SetPaperSizeWarning(BOOL bSet);
 
-    BOOL        IsPaperOrientationWarning()     const;
-    void        SetPaperOrientationWarning( BOOL bSet);
+    BOOL		IsPaperOrientationWarning() 	const;
+    void		SetPaperOrientationWarning(	BOOL bSet);
 
                 // 0 ... 99
-    sal_Int32   GetYear2000()           const;
+    sal_Int32	GetYear2000()			const;
     void        SetYear2000( sal_Int32 nSet );
 };
 
diff --git a/unotools/inc/unotools/moduleoptions.hxx b/unotools/inc/unotools/moduleoptions.hxx
index d48a390a30bc..5d53c81142fd 100644
--- a/unotools/inc/unotools/moduleoptions.hxx
+++ b/unotools/inc/unotools/moduleoptions.hxx
@@ -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
@@ -29,7 +29,7 @@
 #define INCLUDED_SVTOOLS_MODULEOPTIONS_HXX
 
 //_________________________________________________________________________________________________________________
-//  includes
+//	includes
 //_________________________________________________________________________________________________________________
 
 #include "unotools/unotoolsdllapi.h"
@@ -42,44 +42,44 @@
 #include <unotools/options.hxx>
 
 //_________________________________________________________________________________________________________________
-//  const
+//	const
 //_________________________________________________________________________________________________________________
 
 #define FEATUREFLAG_BASICIDE                0x00000020
-#define FEATUREFLAG_MATH                    0x00000100
-#define FEATUREFLAG_CHART                   0x00000200
-#define FEATUREFLAG_CALC                    0x00000800
-#define FEATUREFLAG_DRAW                    0x00001000
-#define FEATUREFLAG_WRITER                  0x00002000
-#define FEATUREFLAG_IMPRESS                 0x00008000
-#define FEATUREFLAG_INSIGHT                 0x00010000
+#define FEATUREFLAG_MATH           			0x00000100
+#define FEATUREFLAG_CHART          			0x00000200
+#define FEATUREFLAG_CALC           			0x00000800
+#define FEATUREFLAG_DRAW           			0x00001000
+#define FEATUREFLAG_WRITER     				0x00002000
+#define FEATUREFLAG_IMPRESS     			0x00008000
+#define FEATUREFLAG_INSIGHT     			0x00010000
 
 //_________________________________________________________________________________________________________________
-//  forward declarations
+//	forward declarations
 //_________________________________________________________________________________________________________________
 
 /*-************************************************************************************************************//**
-    @short          forward declaration to our private date container implementation
-    @descr          We use these class as internal member to support small memory requirements.
+    @short			forward declaration to our private date container implementation
+    @descr			We use these class as internal member to support small memory requirements.
                     You can create the container if it is neccessary. The class which use these mechanism
                     is faster and smaller then a complete implementation!
 *//*-*************************************************************************************************************/
 class SvtModuleOptions_Impl;
 
 //_________________________________________________________________________________________________________________
-//  declarations
+//	declarations
 //_________________________________________________________________________________________________________________
 
 /*-************************************************************************************************************//**
-    @short          collect informations about installation state of modules
+    @short			collect informations about installation state of modules
     @descr          Use these class to get installation state of different office modules like writer, calc etc
                     Further you can ask for additional informations; e.g. name of standard template file, which
                     should be used by corresponding module; or short/long name of these module factory.
 
-    @implements     -
-    @base           -
+    @implements		-
+    @base			-
 
-    @devstatus      ready to use
+    @devstatus		ready to use
     @threadsafe     yes
 *//*-*************************************************************************************************************/
 class UNOTOOLS_DLLPUBLIC SvtModuleOptions: public utl::detail::Options
@@ -120,24 +120,24 @@ class UNOTOOLS_DLLPUBLIC SvtModuleOptions: public utl::detail::Options
             E_MATH          =  6,
             E_CHART         =  7,
             E_STARTMODULE   =  8,
-            E_DATABASE      =  9,
+            E_DATABASE		=  9,
             E_BASIC         = 10
 
         };
 
     //-------------------------------------------------------------------------------------------------------------
-    //  public methods
+    //	public methods
     //-------------------------------------------------------------------------------------------------------------
     public:
 
         //---------------------------------------------------------------------------------------------------------
-        //  constructor / destructor
+        //	constructor / destructor
         //---------------------------------------------------------------------------------------------------------
          SvtModuleOptions();
         virtual ~SvtModuleOptions();
 
         //---------------------------------------------------------------------------------------------------------
-        //  interface
+        //	interface
         //---------------------------------------------------------------------------------------------------------
         sal_Bool        IsModuleInstalled         (       EModule          eModule    ) const;
         ::rtl::OUString GetModuleName             (       EModule          eModule    ) const;
@@ -231,13 +231,13 @@ class UNOTOOLS_DLLPUBLIC SvtModuleOptions: public utl::detail::Options
         ::com::sun::star::uno::Sequence < ::rtl::OUString > GetAllServiceNames();
 
     //-------------------------------------------------------------------------------------------------------------
-    //  private methods
+    //	private methods
     //-------------------------------------------------------------------------------------------------------------
     private:
         UNOTOOLS_DLLPRIVATE static ::osl::Mutex& impl_GetOwnStaticMutex();
 
     //-------------------------------------------------------------------------------------------------------------
-    //  private member
+    //	private member
     //-------------------------------------------------------------------------------------------------------------
     private:
 
@@ -249,9 +249,9 @@ class UNOTOOLS_DLLPUBLIC SvtModuleOptions: public utl::detail::Options
             Do it in your source only.
          */
 
-        static SvtModuleOptions_Impl*   m_pDataContainer    ;   /// impl. data container as dynamic pointer for smaller memory requirements!
-        static sal_Int32                m_nRefCount         ;   /// internal ref count mechanism
+        static SvtModuleOptions_Impl*	m_pDataContainer	;	/// impl. data container as dynamic pointer for smaller memory requirements!
+        static sal_Int32				m_nRefCount			;	/// internal ref count mechanism
 
-};      // class SvtModuleOptions
+};		// class SvtModuleOptions
 
-#endif  // #ifndef INCLUDED_SVTOOLS_MODULEOPTIONS_HXX
+#endif	// #ifndef INCLUDED_SVTOOLS_MODULEOPTIONS_HXX
diff --git a/unotools/inc/unotools/nativenumberwrapper.hxx b/unotools/inc/unotools/nativenumberwrapper.hxx
index 9b7d5c130a51..95690cc91f7b 100644
--- a/unotools/inc/unotools/nativenumberwrapper.hxx
+++ b/unotools/inc/unotools/nativenumberwrapper.hxx
@@ -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
@@ -60,14 +60,14 @@ public:
                         sal_Int16 nNativeNumberMode ) const;
 
     sal_Bool        isValidNatNum(
-                        const ::com::sun::star::lang::Locale& rLocale,
+                        const ::com::sun::star::lang::Locale& rLocale, 
                         sal_Int16 nNativeNumberMode ) const;
 
     ::com::sun::star::i18n::NativeNumberXmlAttributes convertToXmlAttributes(
                         const ::com::sun::star::lang::Locale& rLocale,
                         sal_Int16 nNativeNumberMode ) const;
 
-    sal_Int16       convertFromXmlAttributes(
+    sal_Int16       convertFromXmlAttributes( 
                         const ::com::sun::star::i18n::NativeNumberXmlAttributes& rAttr ) const;
 
 };
diff --git a/unotools/inc/unotools/numberformatcodewrapper.hxx b/unotools/inc/unotools/numberformatcodewrapper.hxx
index 394346275b14..8fc436ded794 100644
--- a/unotools/inc/unotools/numberformatcodewrapper.hxx
+++ b/unotools/inc/unotools/numberformatcodewrapper.hxx
@@ -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
@@ -41,12 +41,12 @@ namespace com { namespace sun { namespace star {
 class UNOTOOLS_DLLPUBLIC NumberFormatCodeWrapper
 {
     ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > xSMgr;
-    ::com::sun::star::uno::Reference< ::com::sun::star::i18n::XNumberFormatCode >   xNFC;
-    ::com::sun::star::lang::Locale          aLocale;
+    ::com::sun::star::uno::Reference< ::com::sun::star::i18n::XNumberFormatCode >	xNFC;
+    ::com::sun::star::lang::Locale			aLocale;
 
                                 // not implemented, prevent usage
                                 NumberFormatCodeWrapper( const NumberFormatCodeWrapper& );
-            NumberFormatCodeWrapper&    operator=( const NumberFormatCodeWrapper& );
+            NumberFormatCodeWrapper&	operator=( const NumberFormatCodeWrapper& );
 
 public:
                                 NumberFormatCodeWrapper(
@@ -58,10 +58,10 @@ public:
 
 
     /// set a new Locale
-            void                setLocale( const ::com::sun::star::lang::Locale& rLocale );
+            void				setLocale( const ::com::sun::star::lang::Locale& rLocale );
 
     /// get current Locale
-    const ::com::sun::star::lang::Locale& getLocale() const { return aLocale; }
+    const ::com::sun::star::lang::Locale& getLocale() const	{ return aLocale; }
 
 
     // Wrapper implementations of class NumberFormatCodeMapper
diff --git a/unotools/inc/unotools/options.hxx b/unotools/inc/unotools/options.hxx
index 0279e16df1d9..4bfc33024394 100644
--- a/unotools/inc/unotools/options.hxx
+++ b/unotools/inc/unotools/options.hxx
@@ -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
@@ -57,7 +57,7 @@ namespace utl {
     {
         IMPL_ConfigurationListenerList* mpList;
         sal_Int32               m_nBroadcastBlocked;     // broadcast only if this is 0
-        sal_uInt32              m_nBlockedHint;
+        sal_uInt32				m_nBlockedHint;
 
     public:
         void AddListener( utl::ConfigurationListener* pListener );
diff --git a/unotools/inc/unotools/optionsdlg.hxx b/unotools/inc/unotools/optionsdlg.hxx
index 833e8d5700c3..293040a82909 100644
--- a/unotools/inc/unotools/optionsdlg.hxx
+++ b/unotools/inc/unotools/optionsdlg.hxx
@@ -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
diff --git a/unotools/inc/unotools/pathoptions.hxx b/unotools/inc/unotools/pathoptions.hxx
index 4d94c93cca4a..d36fe0e31478 100644
--- a/unotools/inc/unotools/pathoptions.hxx
+++ b/unotools/inc/unotools/pathoptions.hxx
@@ -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
@@ -40,7 +40,7 @@ class SvtPathOptions_Impl;
 class UNOTOOLS_DLLPUBLIC SvtPathOptions: public utl::detail::Options
 {
 private:
-    SvtPathOptions_Impl*    pImp;
+    SvtPathOptions_Impl*	pImp;
 
 public:
     enum Pathes
@@ -76,28 +76,28 @@ public:
     virtual ~SvtPathOptions();
 
     // get the pathes, not const because of using a mutex
-    const String&   GetAddinPath() const;
-    const String&   GetAutoCorrectPath() const;
-    const String&   GetAutoTextPath() const;
-    const String&   GetBackupPath() const;
-    const String&   GetBasicPath() const;
-    const String&   GetBitmapPath() const;
-    const String&   GetConfigPath() const;
-    const String&   GetDictionaryPath() const;
-    const String&   GetFavoritesPath() const;
-    const String&   GetFilterPath() const;
-    const String&   GetGalleryPath() const;
-    const String&   GetGraphicPath() const;
-    const String&   GetHelpPath() const;
-    const String&   GetLinguisticPath() const;
-    const String&   GetModulePath() const;
-    const String&   GetPalettePath() const;
-    const String&   GetPluginPath() const;
-    const String&   GetStoragePath() const;
-    const String&   GetTempPath() const;
-    const String&   GetTemplatePath() const;
-    const String&   GetUserConfigPath() const;
-    const String&   GetWorkPath() const;
+    const String&	GetAddinPath() const;
+    const String&	GetAutoCorrectPath() const;
+    const String&	GetAutoTextPath() const;
+    const String&	GetBackupPath() const;
+    const String&	GetBasicPath() const;
+    const String&	GetBitmapPath() const;
+    const String&	GetConfigPath() const;
+    const String&	GetDictionaryPath() const;
+    const String&	GetFavoritesPath() const;
+    const String&	GetFilterPath() const;
+    const String&	GetGalleryPath() const;
+    const String&	GetGraphicPath() const;
+    const String&	GetHelpPath() const;
+    const String&	GetLinguisticPath() const;
+    const String&	GetModulePath() const;
+    const String&	GetPalettePath() const;
+    const String&	GetPluginPath() const;
+    const String&	GetStoragePath() const;
+    const String&	GetTempPath() const;
+    const String&	GetTemplatePath() const;
+    const String&	GetUserConfigPath() const;
+    const String&	GetWorkPath() const;
     const String&   GetUIConfigPath() const;
     const String&   GetFingerprintPath() const;
 
@@ -105,33 +105,33 @@ public:
     const String&   GetPath(Pathes ePath) const;
 
     // set the pathes
-    void            SetAddinPath( const String& rPath );
-    void            SetAutoCorrectPath( const String& rPath );
-    void            SetAutoTextPath( const String& rPath );
-    void            SetBackupPath( const String& rPath );
-    void            SetBasicPath( const String& rPath );
-    void            SetBitmapPath( const String& rPath );
-    void            SetConfigPath( const String& rPath );
-    void            SetDictionaryPath( const String& rPath );
-    void            SetFavoritesPath( const String& rPath );
-    void            SetFilterPath( const String& rPath );
-    void            SetGalleryPath( const String& rPath );
-    void            SetGraphicPath( const String& rPath );
-    void            SetHelpPath( const String& rPath );
-    void            SetLinguisticPath( const String& rPath );
-    void            SetModulePath( const String& rPath );
-    void            SetPalettePath( const String& rPath );
-    void            SetPluginPath( const String& rPath );
-    void            SetStoragePath( const String& rPath );
-    void            SetTempPath( const String& rPath );
-    void            SetTemplatePath( const String& rPath );
-    void            SetUserConfigPath( const String& rPath );
-    void            SetWorkPath( const String& rPath );
+    void			SetAddinPath( const String& rPath );
+    void			SetAutoCorrectPath( const String& rPath );
+    void			SetAutoTextPath( const String& rPath );
+    void			SetBackupPath( const String& rPath );
+    void			SetBasicPath( const String& rPath );
+    void			SetBitmapPath( const String& rPath );
+    void			SetConfigPath( const String& rPath );
+    void			SetDictionaryPath( const String& rPath );
+    void			SetFavoritesPath( const String& rPath );
+    void			SetFilterPath( const String& rPath );
+    void			SetGalleryPath( const String& rPath );
+    void			SetGraphicPath( const String& rPath );
+    void			SetHelpPath( const String& rPath );
+    void			SetLinguisticPath( const String& rPath );
+    void			SetModulePath( const String& rPath );
+    void			SetPalettePath( const String& rPath );
+    void			SetPluginPath( const String& rPath );
+    void			SetStoragePath( const String& rPath );
+    void			SetTempPath( const String& rPath );
+    void			SetTemplatePath( const String& rPath );
+    void			SetUserConfigPath( const String& rPath );
+    void			SetWorkPath( const String& rPath );
     void            SetPath( SvtPathOptions::Pathes ePath, const String& rNewPath );
 
-    String          SubstituteVariable( const String& rVar );
-    String          UseVariable( const String& rVar );
-    sal_Bool        SearchFile( String& rIniFile, Pathes ePath = PATH_USERCONFIG );
+    String			SubstituteVariable( const String& rVar );
+    String			UseVariable( const String& rVar );
+    sal_Bool		SearchFile( String& rIniFile, Pathes ePath = PATH_USERCONFIG );
     ::com::sun::star::lang::Locale GetLocale() const;
     sal_Bool        IsReadonly() const;
 };
diff --git a/unotools/inc/unotools/printwarningoptions.hxx b/unotools/inc/unotools/printwarningoptions.hxx
index 94f3bc6a3ddb..709e22691cef 100644
--- a/unotools/inc/unotools/printwarningoptions.hxx
+++ b/unotools/inc/unotools/printwarningoptions.hxx
@@ -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
diff --git a/unotools/inc/unotools/processfactory.hxx b/unotools/inc/unotools/processfactory.hxx
index fd852f2c46fa..b43dc2f0a335 100644
--- a/unotools/inc/unotools/processfactory.hxx
+++ b/unotools/inc/unotools/processfactory.hxx
@@ -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
@@ -32,12 +32,12 @@
 #include <com/sun/star/uno/Reference.hxx>
 
 namespace com { namespace sun { namespace star { namespace lang {
-    class XMultiServiceFactory;
+    class XMultiServiceFactory;	
 } } } }
 
 namespace utl
 {
-
+    
 /**
  * This function set the process service factory.
  *
diff --git a/unotools/inc/unotools/progresshandlerwrap.hxx b/unotools/inc/unotools/progresshandlerwrap.hxx
index 4326da0a331f..900ab9dc0083 100644
--- a/unotools/inc/unotools/progresshandlerwrap.hxx
+++ b/unotools/inc/unotools/progresshandlerwrap.hxx
@@ -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
@@ -43,15 +43,15 @@ public:
     ProgressHandlerWrap( ::com::sun::star::uno::Reference< ::com::sun::star::task::XStatusIndicator > xSI );
 
     // XProgressHandler
-    virtual void SAL_CALL push( const ::com::sun::star::uno::Any& Status )
+    virtual void SAL_CALL push( const ::com::sun::star::uno::Any& Status ) 
         throw (::com::sun::star::uno::RuntimeException);
     virtual void SAL_CALL update( const ::com::sun::star::uno::Any& Status )
         throw (::com::sun::star::uno::RuntimeException);
-    virtual void SAL_CALL pop()
+    virtual void SAL_CALL pop() 
         throw (::com::sun::star::uno::RuntimeException);
 };
 
-}   // namespace utl
+}	// namespace utl
 
 #endif // _UTL_PROGRESSHANDLERWRAP_HXX_
 
diff --git a/unotools/inc/unotools/propertysethelper.hxx b/unotools/inc/unotools/propertysethelper.hxx
index ad6508e76df3..2943a0d2eb5c 100644
--- a/unotools/inc/unotools/propertysethelper.hxx
+++ b/unotools/inc/unotools/propertysethelper.hxx
@@ -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
diff --git a/unotools/inc/unotools/propertysetinfo.hxx b/unotools/inc/unotools/propertysetinfo.hxx
index 7e3f26dfc73b..0ccc76f8ba76 100644
--- a/unotools/inc/unotools/propertysetinfo.hxx
+++ b/unotools/inc/unotools/propertysetinfo.hxx
@@ -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
diff --git a/unotools/inc/unotools/querydeep.hxx b/unotools/inc/unotools/querydeep.hxx
index fd57f38147d0..5b09650216db 100644
--- a/unotools/inc/unotools/querydeep.hxx
+++ b/unotools/inc/unotools/querydeep.hxx
@@ -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
@@ -34,48 +34,48 @@
 
 /** */ //for docpp
 namespace utl
-{
+{     
 
 //--------------------------------------------------------------------------------------------------------
 /**
  * Inspect interfaces types whether they are related by inheritance.
  *<BR>
- * @return      true if rType is derived from rBaseType
- * @param       rBaseType   a <type>Type</type> of an interface.
- * @param       rType       a <type>Type</type> of an interface.
+ * @return		true if rType is derived from rBaseType
+ * @param		rBaseType	a <type>Type</type> of an interface.
+ * @param		rType		a <type>Type</type> of an interface.
  */
 sal_Bool isDerivedFrom(
-    const ::com::sun::star::uno::Type & rBaseType,
+    const ::com::sun::star::uno::Type & rBaseType, 
     const ::com::sun::star::uno::Type & rType );
 
 //--------------------------------------------------------------------------------------------------------
 /**
  * Inspect interface types whether they are related by inheritance.
  *<BR>
- * @return      true if p is of a type derived from rBaseType
- * @param       rBaseType   a <type>Type</type> of an interface.
- * @param       p           a pointer to an interface.
+ * @return		true if p is of a type derived from rBaseType
+ * @param		rBaseType	a <type>Type</type> of an interface.
+ * @param		p			a pointer to an interface.
  */
 template <class Interface>
 inline sal_Bool isDerivedFrom(
-    const ::com::sun::star::uno::Type& rBaseType,
+    const ::com::sun::star::uno::Type& rBaseType, 
     Interface* /*p*/)
 {
-    return isDerivedFrom(
-                rBaseType,
+    return isDerivedFrom( 
+                rBaseType, 
                 ::getCppuType(static_cast<const ::com::sun::star::uno::Reference<Interface> *>(0)));
 }
 
 //--------------------------------------------------------------------------------------------------------
 // possible optimization ?
-//  Any aRet(::cppu::queryInterface(rType, p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11, p12));
-//  if (aRet.hasValue())
-//      return aRet;
+//	Any aRet(::cppu::queryInterface(rType, p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11, p12));
+//	if (aRet.hasValue())
+//		return aRet;
 
 /**
  * Inspect types and choose return proper interface.
  *<BR>
- * @param       p1      a pointer to an interface.
+ * @param		p1		a pointer to an interface.
  */
 template< class Interface1 >
 inline ::com::sun::star::uno::Any queryDeepInterface(
@@ -91,8 +91,8 @@ inline ::com::sun::star::uno::Any queryDeepInterface(
 /**
  * Inspect types and choose return proper interface.
  *<BR>
- * @param       p1      a pointer to an interface.
- * @param       p2      a pointer to an interface.
+ * @param		p1		a pointer to an interface.
+ * @param		p2		a pointer to an interface.
  */
 template< class Interface1, class Interface2 >
 inline ::com::sun::star::uno::Any queryDeepInterface(
@@ -110,9 +110,9 @@ inline ::com::sun::star::uno::Any queryDeepInterface(
 /**
  * Inspect types and choose return proper interface.
  *<BR>
- * @param       p1      a pointer to an interface.
- * @param       p2      a pointer to an interface.
- * @param       p3      a pointer to an interface.
+ * @param		p1		a pointer to an interface.
+ * @param		p2		a pointer to an interface.
+ * @param		p3		a pointer to an interface.
  */
 template< class Interface1, class Interface2, class Interface3 >
 inline ::com::sun::star::uno::Any queryDeepInterface(
@@ -132,10 +132,10 @@ inline ::com::sun::star::uno::Any queryDeepInterface(
 /**
  * Inspect types and choose return proper interface.
  *<BR>
- * @param       p1      a pointer to an interface.
- * @param       p2      a pointer to an interface.
- * @param       p3      a pointer to an interface.
- * @param       p4      a pointer to an interface.
+ * @param		p1		a pointer to an interface.
+ * @param		p2		a pointer to an interface.
+ * @param		p3		a pointer to an interface.
+ * @param		p4		a pointer to an interface.
  */
 template< class Interface1, class Interface2, class Interface3, class Interface4 >
 inline ::com::sun::star::uno::Any queryDeepInterface(
@@ -157,11 +157,11 @@ inline ::com::sun::star::uno::Any queryDeepInterface(
 /**
  * Inspect types and choose return proper interface.
  *<BR>
- * @param       p1      a pointer to an interface.
- * @param       p2      a pointer to an interface.
- * @param       p3      a pointer to an interface.
- * @param       p4      a pointer to an interface.
- * @param       p5      a pointer to an interface.
+ * @param		p1		a pointer to an interface.
+ * @param		p2		a pointer to an interface.
+ * @param		p3		a pointer to an interface.
+ * @param		p4		a pointer to an interface.
+ * @param		p5		a pointer to an interface.
  */
 template< class Interface1, class Interface2, class Interface3, class Interface4, class Interface5 >
 inline ::com::sun::star::uno::Any queryDeepInterface(
@@ -185,12 +185,12 @@ inline ::com::sun::star::uno::Any queryDeepInterface(
 /**
  * Inspect types and choose return proper interface.
  *<BR>
- * @param       p1      a pointer to an interface.
- * @param       p2      a pointer to an interface.
- * @param       p3      a pointer to an interface.
- * @param       p4      a pointer to an interface.
- * @param       p5      a pointer to an interface.
- * @param       p6      a pointer to an interface.
+ * @param		p1		a pointer to an interface.
+ * @param		p2		a pointer to an interface.
+ * @param		p3		a pointer to an interface.
+ * @param		p4		a pointer to an interface.
+ * @param		p5		a pointer to an interface.
+ * @param		p6		a pointer to an interface.
  */
 template< class Interface1, class Interface2, class Interface3, class Interface4, class Interface5,
           class Interface6 >
@@ -218,13 +218,13 @@ inline ::com::sun::star::uno::Any queryDeepInterface(
 /**
  * Inspect types and choose return proper interface.
  *<BR>
- * @param       p1      a pointer to an interface.
- * @param       p2      a pointer to an interface.
- * @param       p3      a pointer to an interface.
- * @param       p4      a pointer to an interface.
- * @param       p5      a pointer to an interface.
- * @param       p6      a pointer to an interface.
- * @param       p7      a pointer to an interface.
+ * @param		p1		a pointer to an interface.
+ * @param		p2		a pointer to an interface.
+ * @param		p3		a pointer to an interface.
+ * @param		p4		a pointer to an interface.
+ * @param		p5		a pointer to an interface.
+ * @param		p6		a pointer to an interface.
+ * @param		p7		a pointer to an interface.
  */
 template< class Interface1, class Interface2, class Interface3, class Interface4, class Interface5,
           class Interface6, class Interface7 >
@@ -254,14 +254,14 @@ inline ::com::sun::star::uno::Any queryDeepInterface(
 /**
  * Inspect types and choose return proper interface.
  *<BR>
- * @param       p1      a pointer to an interface.
- * @param       p2      a pointer to an interface.
- * @param       p3      a pointer to an interface.
- * @param       p4      a pointer to an interface.
- * @param       p5      a pointer to an interface.
- * @param       p6      a pointer to an interface.
- * @param       p7      a pointer to an interface.
- * @param       p8      a pointer to an interface.
+ * @param		p1		a pointer to an interface.
+ * @param		p2		a pointer to an interface.
+ * @param		p3		a pointer to an interface.
+ * @param		p4		a pointer to an interface.
+ * @param		p5		a pointer to an interface.
+ * @param		p6		a pointer to an interface.
+ * @param		p7		a pointer to an interface.
+ * @param		p8		a pointer to an interface.
  */
 template< class Interface1, class Interface2, class Interface3, class Interface4, class Interface5,
           class Interface6, class Interface7, class Interface8 >
@@ -293,15 +293,15 @@ inline ::com::sun::star::uno::Any queryDeepInterface(
 /**
  * Inspect types and choose return proper interface.
  *<BR>
- * @param       p1      a pointer to an interface.
- * @param       p2      a pointer to an interface.
- * @param       p3      a pointer to an interface.
- * @param       p4      a pointer to an interface.
- * @param       p5      a pointer to an interface.
- * @param       p6      a pointer to an interface.
- * @param       p7      a pointer to an interface.
- * @param       p8      a pointer to an interface.
- * @param       p9      a pointer to an interface.
+ * @param		p1		a pointer to an interface.
+ * @param		p2		a pointer to an interface.
+ * @param		p3		a pointer to an interface.
+ * @param		p4		a pointer to an interface.
+ * @param		p5		a pointer to an interface.
+ * @param		p6		a pointer to an interface.
+ * @param		p7		a pointer to an interface.
+ * @param		p8		a pointer to an interface.
+ * @param		p9		a pointer to an interface.
  */
 template< class Interface1, class Interface2, class Interface3, class Interface4, class Interface5,
           class Interface6, class Interface7, class Interface8, class Interface9 >
@@ -335,16 +335,16 @@ inline ::com::sun::star::uno::Any queryDeepInterface(
 /**
  * Inspect types and choose return proper interface.
  *<BR>
- * @param       p1      a pointer to an interface.
- * @param       p2      a pointer to an interface.
- * @param       p3      a pointer to an interface.
- * @param       p4      a pointer to an interface.
- * @param       p5      a pointer to an interface.
- * @param       p6      a pointer to an interface.
- * @param       p7      a pointer to an interface.
- * @param       p8      a pointer to an interface.
- * @param       p9      a pointer to an interface.
- * @param       p10     a pointer to an interface.
+ * @param		p1		a pointer to an interface.
+ * @param		p2		a pointer to an interface.
+ * @param		p3		a pointer to an interface.
+ * @param		p4		a pointer to an interface.
+ * @param		p5		a pointer to an interface.
+ * @param		p6		a pointer to an interface.
+ * @param		p7		a pointer to an interface.
+ * @param		p8		a pointer to an interface.
+ * @param		p9		a pointer to an interface.
+ * @param		p10		a pointer to an interface.
  */
 template< class Interface1, class Interface2, class Interface3, class Interface4, class Interface5,
           class Interface6, class Interface7, class Interface8, class Interface9, class Interface10 >
@@ -380,17 +380,17 @@ inline ::com::sun::star::uno::Any queryDeepInterface(
 /**
  * Inspect types and choose return proper interface.
  *<BR>
- * @param       p1      a pointer to an interface.
- * @param       p2      a pointer to an interface.
- * @param       p3      a pointer to an interface.
- * @param       p4      a pointer to an interface.
- * @param       p5      a pointer to an interface.
- * @param       p6      a pointer to an interface.
- * @param       p7      a pointer to an interface.
- * @param       p8      a pointer to an interface.
- * @param       p9      a pointer to an interface.
- * @param       p10     a pointer to an interface.
- * @param       p11     a pointer to an interface.
+ * @param		p1		a pointer to an interface.
+ * @param		p2		a pointer to an interface.
+ * @param		p3		a pointer to an interface.
+ * @param		p4		a pointer to an interface.
+ * @param		p5		a pointer to an interface.
+ * @param		p6		a pointer to an interface.
+ * @param		p7		a pointer to an interface.
+ * @param		p8		a pointer to an interface.
+ * @param		p9		a pointer to an interface.
+ * @param		p10		a pointer to an interface.
+ * @param		p11		a pointer to an interface.
  */
 template< class Interface1, class Interface2, class Interface3, class Interface4, class Interface5,
           class Interface6, class Interface7, class Interface8, class Interface9, class Interface10,
@@ -430,18 +430,18 @@ inline ::com::sun::star::uno::Any queryDeepInterface(
 /**
  * Inspect types and choose return proper interface.
  *<BR>
- * @param       p1      a pointer to an interface.
- * @param       p2      a pointer to an interface.
- * @param       p3      a pointer to an interface.
- * @param       p4      a pointer to an interface.
- * @param       p5      a pointer to an interface.
- * @param       p6      a pointer to an interface.
- * @param       p7      a pointer to an interface.
- * @param       p8      a pointer to an interface.
- * @param       p9      a pointer to an interface.
- * @param       p10     a pointer to an interface.
- * @param       p11     a pointer to an interface.
- * @param       p12     a pointer to an interface.
+ * @param		p1		a pointer to an interface.
+ * @param		p2		a pointer to an interface.
+ * @param		p3		a pointer to an interface.
+ * @param		p4		a pointer to an interface.
+ * @param		p5		a pointer to an interface.
+ * @param		p6		a pointer to an interface.
+ * @param		p7		a pointer to an interface.
+ * @param		p8		a pointer to an interface.
+ * @param		p9		a pointer to an interface.
+ * @param		p10		a pointer to an interface.
+ * @param		p11		a pointer to an interface.
+ * @param		p12		a pointer to an interface.
  */
 template< class Interface1, class Interface2, class Interface3, class Interface4, class Interface5,
           class Interface6, class Interface7, class Interface8, class Interface9, class Interface10,
diff --git a/unotools/inc/unotools/readwritemutexguard.hxx b/unotools/inc/unotools/readwritemutexguard.hxx
index 3035d5bda878..d19cace57a06 100644
--- a/unotools/inc/unotools/readwritemutexguard.hxx
+++ b/unotools/inc/unotools/readwritemutexguard.hxx
@@ -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
diff --git a/unotools/inc/unotools/regoptions.hxx b/unotools/inc/unotools/regoptions.hxx
index 1cca531886ca..2bb10a561a0f 100644
--- a/unotools/inc/unotools/regoptions.hxx
+++ b/unotools/inc/unotools/regoptions.hxx
@@ -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
@@ -45,7 +45,7 @@ namespace utl
     class UNOTOOLS_DLLPUBLIC RegOptions
     {
     private:
-        RegOptionsImpl*     m_pImpl;
+        RegOptionsImpl*		m_pImpl;
 
         // the impl class is constructed upon need only (as this is expensive)
         UNOTOOLS_DLLPRIVATE void ensureImpl( );
@@ -55,24 +55,24 @@ namespace utl
         ~RegOptions( );
 
         // retrieves the URL which should be used for online registration
-        String              getRegistrationURL( ) const;
+        String				getRegistrationURL( ) const;
 
         // checks if the menu item which can be used to trigger the online registration should be available
-        sal_Bool            allowMenu( ) const;
+        sal_Bool			allowMenu( ) const;
 
         enum DialogPermission
-        {                       // the registration dialog shall be executed ....
-            dpDisabled,         // ... never - it has been disabled
-            dpNotThisSession,   // ... later - no statement when, but _not now_
-            dpRemindLater,      // ... later at a reminder date
-            dpThisSession       // ... during this session
+        {						// the registration dialog shall be executed ....
+            dpDisabled,			// ... never - it has been disabled
+            dpNotThisSession,	// ... later - no statement when, but _not now_
+            dpRemindLater,		// ... later at a reminder date
+            dpThisSession		// ... during this session
         };
 
         /** checks if the registration dialog is allowed
             <p>A return value of <TRUE/> does not mean that during this session, the dialog is allowed to
             be executed. It simply means executing it is allowed <em>in general</em></p>
         */
-        DialogPermission    getDialogPermission( ) const;
+        DialogPermission	getDialogPermission( ) const;
 
         /** claims that the current session is done with respect to the registration dialog.
 
@@ -87,7 +87,7 @@ namespace utl
                     <method>getDialogPermission</method> <em>may</em> return dpThisSession</li>
             </ul></p>
         */
-        void                markSessionDone( );
+        void				markSessionDone( );
 
         /** activates the reminder
 
diff --git a/unotools/inc/unotools/regpathhelper.hxx b/unotools/inc/unotools/regpathhelper.hxx
index 1f48dda63fc8..331195a8b9d9 100644
--- a/unotools/inc/unotools/regpathhelper.hxx
+++ b/unotools/inc/unotools/regpathhelper.hxx
@@ -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
@@ -38,13 +38,13 @@ namespace utl
  * Search for the user registry using the following rules:
  * <dl>
  * <dt> 1. (for further use) search in sversion.ini (.sversionrc) for an entry
- *      REGISTRY_VERSION_STRING (example: UserRegistry 5.0/505=test.rdb) in the section
- *      [Registry]. If found, then take this value instead of the name "user.rdb".
- * <dt> 2. Search in the config directory of the user for a file "user.rdb". If
- *      found return the full path and name of the file. If not found, retry this
- *      step with a dot before ".user.rdb".
- * <dt> 3. If not found a new user registry with name "user.rdb" will be created in the user
- *      config directory.
+ *		REGISTRY_VERSION_STRING (example: UserRegistry 5.0/505=test.rdb) in the section 
+ *		[Registry]. If found, then take this value instead of the name "user.rdb".
+ * <dt> 2. Search in the config directory of the user for a file "user.rdb". If 
+ *		found return the full path and name of the file. If not found, retry this 
+ *		step with a dot before ".user.rdb".
+ * <dt> 3. If not found a new user registry with name "user.rdb" will be created in the user 
+ *		config directory. 
  * </dl>
  *<BR>
  * @author Juergen Schmidt
@@ -54,7 +54,7 @@ namespace utl
 /**
  * This function returns a path to the system registry file.
  * The system registry will always be searched in the same directory of the
- * executable. The name of the system registry is "applicat.rdb". If the system
+ * executable. The name of the system registry is "applicat.rdb". If the system 
  * registry was not found, then the environment variable STAR_REGISTRY will be checked.
  * If this variable was set, it must contain a full path to a valid system registry.
  * Search for the user registry using the following rules:
diff --git a/unotools/inc/unotools/saveopt.hxx b/unotools/inc/unotools/saveopt.hxx
index 22cf75c5be3d..c1a5510d268d 100644
--- a/unotools/inc/unotools/saveopt.hxx
+++ b/unotools/inc/unotools/saveopt.hxx
@@ -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
@@ -101,14 +101,14 @@ public:
     void                    SetSaveRelFSys( sal_Bool b );
     sal_Bool                IsSaveRelFSys() const;
 
-    void                    SetSaveUnpacked( sal_Bool b );
-    sal_Bool                IsSaveUnpacked() const;
+    void					SetSaveUnpacked( sal_Bool b );
+    sal_Bool				IsSaveUnpacked() const;
 
     void                    SetLoadUserSettings(sal_Bool b);
     sal_Bool                IsLoadUserSettings() const;
 
-    void                    SetPrettyPrinting( sal_Bool _bEnable );
-    sal_Bool                IsPrettyPrinting( ) const;
+    void					SetPrettyPrinting( sal_Bool _bEnable );
+    sal_Bool				IsPrettyPrinting( ) const;
 
     void                    SetWarnAlienFormat( sal_Bool _bEnable );
     sal_Bool                IsWarnAlienFormat( ) const;
diff --git a/unotools/inc/unotools/searchopt.hxx b/unotools/inc/unotools/searchopt.hxx
index ed4110011df7..6aeee1280ca4 100644
--- a/unotools/inc/unotools/searchopt.hxx
+++ b/unotools/inc/unotools/searchopt.hxx
@@ -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
@@ -35,7 +35,7 @@ class SvtSearchOptions_Impl;
 
 class UNOTOOLS_DLLPUBLIC SvtSearchOptions
 {
-    SvtSearchOptions_Impl   *pImpl;
+    SvtSearchOptions_Impl	*pImpl;
 
     // disallow copy-constructor and assignment-operator for now
     SvtSearchOptions( const SvtSearchOptions & );
@@ -47,71 +47,71 @@ public:
     SvtSearchOptions();
     ~SvtSearchOptions();
 
-    INT32   GetTransliterationFlags() const;
+    INT32	GetTransliterationFlags() const;
 
     //
     // General Options
     //
 
-    BOOL    IsWholeWordsOnly() const;
-    BOOL    IsBackwards() const;
-    BOOL    IsUseRegularExpression() const;
-    BOOL    IsSearchForStyles() const;
-    BOOL    IsSimilaritySearch() const;
-    BOOL    IsUseAsianOptions() const;
-    BOOL    IsMatchCase() const;            // also Japanese search option
-    BOOL    IsNotes() const;
-
-    void    SetWholeWordsOnly( BOOL bVal );
-    void    SetBackwards( BOOL bVal );
-    void    SetUseRegularExpression( BOOL bVal );
-    void    SetSearchForStyles( BOOL bVal );
-    void    SetSimilaritySearch( BOOL bVal );
-    void    SetUseAsianOptions( BOOL bVal );
-    void    SetMatchCase( BOOL bVal );      // also Japanese search option
-    void    SetNotes( BOOL bVal);
+    BOOL	IsWholeWordsOnly() const;
+    BOOL	IsBackwards() const;
+    BOOL	IsUseRegularExpression() const;
+    BOOL	IsSearchForStyles() const;
+    BOOL	IsSimilaritySearch() const;
+    BOOL	IsUseAsianOptions() const;
+    BOOL	IsMatchCase() const;			// also Japanese search option
+    BOOL	IsNotes() const;
+
+    void	SetWholeWordsOnly( BOOL bVal );
+    void	SetBackwards( BOOL bVal );
+    void	SetUseRegularExpression( BOOL bVal );
+    void	SetSearchForStyles( BOOL bVal );
+    void	SetSimilaritySearch( BOOL bVal );
+    void	SetUseAsianOptions( BOOL bVal );
+    void	SetMatchCase( BOOL bVal );		// also Japanese search option
+    void 	SetNotes( BOOL bVal);
 
     //
     // Japanese search options
     //
 
-    BOOL    IsMatchFullHalfWidthForms() const;
-    BOOL    IsMatchHiraganaKatakana() const;
-    BOOL    IsMatchContractions() const;
-    BOOL    IsMatchMinusDashChoon() const;
-    BOOL    IsMatchRepeatCharMarks() const;
-    BOOL    IsMatchVariantFormKanji() const;
-    BOOL    IsMatchOldKanaForms() const;
-    BOOL    IsMatchDiziDuzu() const;
-    BOOL    IsMatchBavaHafa() const;
-    BOOL    IsMatchTsithichiDhizi() const;
-    BOOL    IsMatchHyuiyuByuvyu() const;
-    BOOL    IsMatchSesheZeje() const;
-    BOOL    IsMatchIaiya() const;
-    BOOL    IsMatchKiku() const;
-    BOOL    IsIgnorePunctuation() const;
-    BOOL    IsIgnoreWhitespace() const;
-    BOOL    IsIgnoreProlongedSoundMark() const;
-    BOOL    IsIgnoreMiddleDot() const;
-
-    void    SetMatchFullHalfWidthForms( BOOL bVal );
-    void    SetMatchHiraganaKatakana( BOOL bVal );
-    void    SetMatchContractions( BOOL bVal );
-    void    SetMatchMinusDashChoon( BOOL bVal );
-    void    SetMatchRepeatCharMarks( BOOL bVal );
-    void    SetMatchVariantFormKanji( BOOL bVal );
-    void    SetMatchOldKanaForms( BOOL bVal );
-    void    SetMatchDiziDuzu( BOOL bVal );
-    void    SetMatchBavaHafa( BOOL bVal );
-    void    SetMatchTsithichiDhizi( BOOL bVal );
-    void    SetMatchHyuiyuByuvyu( BOOL bVal );
-    void    SetMatchSesheZeje( BOOL bVal );
-    void    SetMatchIaiya( BOOL bVal );
-    void    SetMatchKiku( BOOL bVal );
-    void    SetIgnorePunctuation( BOOL bVal );
-    void    SetIgnoreWhitespace( BOOL bVal );
-    void    SetIgnoreProlongedSoundMark( BOOL bVal );
-    void    SetIgnoreMiddleDot( BOOL bVal );
+    BOOL	IsMatchFullHalfWidthForms() const;
+    BOOL	IsMatchHiraganaKatakana() const;
+    BOOL	IsMatchContractions() const;
+    BOOL	IsMatchMinusDashChoon() const;
+    BOOL	IsMatchRepeatCharMarks() const;
+    BOOL	IsMatchVariantFormKanji() const;
+    BOOL	IsMatchOldKanaForms() const;
+    BOOL	IsMatchDiziDuzu() const;
+    BOOL	IsMatchBavaHafa() const;
+    BOOL	IsMatchTsithichiDhizi() const;
+    BOOL	IsMatchHyuiyuByuvyu() const;
+    BOOL	IsMatchSesheZeje() const;
+    BOOL	IsMatchIaiya() const;
+    BOOL	IsMatchKiku() const;
+    BOOL	IsIgnorePunctuation() const;
+    BOOL	IsIgnoreWhitespace() const;
+    BOOL	IsIgnoreProlongedSoundMark() const;
+    BOOL	IsIgnoreMiddleDot() const;
+
+    void	SetMatchFullHalfWidthForms( BOOL bVal );
+    void	SetMatchHiraganaKatakana( BOOL bVal );
+    void	SetMatchContractions( BOOL bVal );
+    void	SetMatchMinusDashChoon( BOOL bVal );
+    void	SetMatchRepeatCharMarks( BOOL bVal );
+    void	SetMatchVariantFormKanji( BOOL bVal );
+    void	SetMatchOldKanaForms( BOOL bVal );
+    void	SetMatchDiziDuzu( BOOL bVal );
+    void	SetMatchBavaHafa( BOOL bVal );
+    void	SetMatchTsithichiDhizi( BOOL bVal );
+    void	SetMatchHyuiyuByuvyu( BOOL bVal );
+    void	SetMatchSesheZeje( BOOL bVal );
+    void	SetMatchIaiya( BOOL bVal );
+    void	SetMatchKiku( BOOL bVal );
+    void	SetIgnorePunctuation( BOOL bVal );
+    void	SetIgnoreWhitespace( BOOL bVal );
+    void	SetIgnoreProlongedSoundMark( BOOL bVal );
+    void	SetIgnoreMiddleDot( BOOL bVal );
 };
 
 
diff --git a/unotools/inc/unotools/securityoptions.hxx b/unotools/inc/unotools/securityoptions.hxx
index ddeed4b94520..838a98dc682f 100644
--- a/unotools/inc/unotools/securityoptions.hxx
+++ b/unotools/inc/unotools/securityoptions.hxx
@@ -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
@@ -28,7 +28,7 @@
 #define INCLUDED_unotools_SECURITYOPTIONS_HXX
 
 //_________________________________________________________________________________________________________________
-//  includes
+//	includes
 //_________________________________________________________________________________________________________________
 
 #include "unotools/unotoolsdllapi.h"
@@ -39,12 +39,12 @@
 #include <unotools/options.hxx>
 
 //_________________________________________________________________________________________________________________
-//  forward declarations
+//	forward declarations
 //_________________________________________________________________________________________________________________
 
 /*-************************************************************************************************************//**
-    @short          forward declaration to our private date container implementation
-    @descr          We use these class as internal member to support small memory requirements.
+    @short			forward declaration to our private date container implementation
+    @descr			We use these class as internal member to support small memory requirements.
                     You can create the container if it is neccessary. The class which use these mechanism
                     is faster and smaller then a complete implementation!
 *//*-*************************************************************************************************************/
@@ -52,7 +52,7 @@
 class SvtSecurityOptions_Impl;
 
 //_________________________________________________________________________________________________________________
-//  declarations
+//	declarations
 //_________________________________________________________________________________________________________________
 
 /*-************************************************************************************************************//**
@@ -62,21 +62,21 @@ class SvtSecurityOptions_Impl;
 
 enum EBasicSecurityMode
 {
-    eNEVER_EXECUTE  = 0,
-    eFROM_LIST      = 1,
+    eNEVER_EXECUTE	= 0,
+    eFROM_LIST		= 1,
     eALWAYS_EXECUTE = 2
 };
 
 /*-************************************************************************************************************//**
-    @short          collect informations about security features
+    @short			collect informations about security features
     @descr          -
 
-    @implements     -
-    @base           -
+    @implements		-
+    @base			-
 
-    @ATTENTION      This class is partially threadsafe.
+    @ATTENTION		This class is partially threadsafe.
 
-    @devstatus      ready to use
+    @devstatus		ready to use
 *//*-*************************************************************************************************************/
 
 class UNOTOOLS_DLLPUBLIC SvtSecurityOptions: public utl::detail::Options
@@ -89,10 +89,10 @@ class UNOTOOLS_DLLPUBLIC SvtSecurityOptions: public utl::detail::Options
         enum EOption
         {
             E_SECUREURLS,
-            E_BASICMODE,                    // xmlsec05 depricated
-            E_EXECUTEPLUGINS,               // xmlsec05 depricated
-            E_WARNING,                      // xmlsec05 depricated
-            E_CONFIRMATION,                 // xmlsec05 depricated
+            E_BASICMODE,					// xmlsec05 depricated
+            E_EXECUTEPLUGINS,				// xmlsec05 depricated
+            E_WARNING,						// xmlsec05 depricated
+            E_CONFIRMATION,					// xmlsec05 depricated
             E_DOCWARN_SAVEORSEND,
             E_DOCWARN_SIGNING,
             E_DOCWARN_PRINT,
@@ -125,36 +125,36 @@ class UNOTOOLS_DLLPUBLIC SvtSecurityOptions: public utl::detail::Options
         */
 
     //-------------------------------------------------------------------------------------------------------------
-    //  public methods
+    //	public methods
     //-------------------------------------------------------------------------------------------------------------
 
     public:
 
         //---------------------------------------------------------------------------------------------------------
-        //  constructor / destructor
+        //	constructor / destructor
         //---------------------------------------------------------------------------------------------------------
 
         /*-****************************************************************************************************//**
-            @short      standard constructor and destructor
-            @descr      This will initialize an instance with default values.
+            @short		standard constructor and destructor
+            @descr		This will initialize an instance with default values.
                         We implement these class with a refcount mechanism! Every instance of this class increase it
                         at create and decrease it at delete time - but all instances use the same data container!
                         He is implemented as a static member ...
 
-            @seealso    member m_nRefCount
-            @seealso    member m_pDataContainer
+            @seealso	member m_nRefCount
+            @seealso	member m_pDataContainer
 
-            @param      -
-            @return     -
+            @param		-
+            @return		-
 
-            @onerror    -
+            @onerror	-
         *//*-*****************************************************************************************************/
 
          SvtSecurityOptions();
         virtual ~SvtSecurityOptions();
 
         //---------------------------------------------------------------------------------------------------------
-        //  interface
+        //	interface
         //---------------------------------------------------------------------------------------------------------
 
         /*-****************************************************************************************************//**
@@ -171,111 +171,111 @@ class UNOTOOLS_DLLPUBLIC SvtSecurityOptions: public utl::detail::Options
         sal_Bool IsReadOnly( EOption eOption ) const ;
 
         /*-****************************************************************************************************//**
-            @short      interface methods to get and set value of config key "org.openoffice.Office.Common/Security/Scripting/SecureURL"
-            @descr      These value displays the list of all trustworthy URLs.
-                        zB.:    file:/                  => All scripts from the local file system including a LAN;
-                                private:explorer        => Scripts from the Explorer;
-                                private:help            => Scripts in the help system;
-                                private:newmenu         => Scripts that are executed by the commands File-New and AutoPilot;
-                                private:schedule        => Scripts of  the scheduler;
-                                private:searchfolder    => Scripts of the searchfolder;
-                                private:user            => Scripts that are entered in the URL field.
-            @seealso    -
-
-            @param      "seqURLList", new values to set it in configuration.
-            @return     The values which represent current state of internal variable.
-
-            @onerror    No error should occurre!
+            @short		interface methods to get and set value of config key "org.openoffice.Office.Common/Security/Scripting/SecureURL"
+            @descr		These value displays the list of all trustworthy URLs.
+                        zB.:	file:/					=> All scripts from the local file system including a LAN;
+                                private:explorer		=> Scripts from the Explorer;
+                                private:help			=> Scripts in the help system;
+                                private:newmenu			=> Scripts that are executed by the commands File-New and AutoPilot;
+                                private:schedule		=> Scripts of  the scheduler;
+                                private:searchfolder	=> Scripts of the searchfolder;
+                                private:user			=> Scripts that are entered in the URL field.
+            @seealso	-
+
+            @param		"seqURLList", new values to set it in configuration.
+            @return		The values which represent current state of internal variable.
+
+            @onerror	No error should occurre!
         *//*-*****************************************************************************************************/
 
-        ::com::sun::star::uno::Sequence< ::rtl::OUString >  GetSecureURLs(                                                                      ) const ;
-        void                                                SetSecureURLs( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& seqURLList )       ;
+        ::com::sun::star::uno::Sequence< ::rtl::OUString >	GetSecureURLs(																		) const	;
+        void												SetSecureURLs( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& seqURLList	)		;
 
         /*-****************************************************************************************************//**
-            @short      interface methods to get and set value of config key "org.openoffice.Office.Common/Security/Scripting/StarOfficeBasic"
-            @descr      These value determines how StarOffice Basic scripts should be handled.
+            @short		interface methods to get and set value of config key "org.openoffice.Office.Common/Security/Scripting/StarOfficeBasic"
+            @descr		These value determines how StarOffice Basic scripts should be handled.
                         It exist 3 different modes:
                             0 = never execute
                             1 = from list
                             2 = always execute
 
-            @ATTENTION  These methods don't check for valid or invalid values!
+            @ATTENTION	These methods don't check for valid or invalid values!
                         Our configuration server can do it ... but these implementation don't get any notifications
                         about wrong commits ...!
                         => If you set an invalid value - nothing will be changed. The information will lost.
 
-            @seealso    enum EBasicSecurityMode
+            @seealso	enum EBasicSecurityMode
 
-            @param      "eMode" to set new mode ... Value must defined as an enum of type EBasicSecurityMode!
-            @return     An enum value, which present current mode.
+            @param		"eMode" to set new mode ... Value must defined as an enum of type EBasicSecurityMode!
+            @return		An enum value, which present current mode.
 
-            @onerror    No error should occurre!
+            @onerror	No error should occurre!
         *//*-*****************************************************************************************************/
 
-        sal_Int32           GetMacroSecurityLevel       (                   ) const ;
-        void                SetMacroSecurityLevel       ( sal_Int32 _nLevel )       ;
+        sal_Int32			GetMacroSecurityLevel		(					) const	;
+        void				SetMacroSecurityLevel		( sal_Int32 _nLevel	)		;
 
-        sal_Bool            IsMacroDisabled             (                   ) const ;
+        sal_Bool			IsMacroDisabled				(					) const	;
 
         /*-****************************************************************************************************//**
-            @short      special method to check an URL and his referer corresponding to ouer internal security cessation
-            @descr      Give us an URL and his referer and we will say you if these url can be scripted or not!
+            @short		special method to check an URL and his referer corresponding to ouer internal security cessation
+            @descr		Give us an URL and his referer and we will say you if these url can be scripted or not!
 
-            @seealso    -
+            @seealso	-
 
-            @param      "sURL" reference to URL for checking
-            @param      "sReferer" reference to referer which whish to run script by given URL
-            @return     sal_True if URL is secure or security is obsolete(!) or sal_False otherwise.
+            @param		"sURL" reference to URL for checking
+            @param		"sReferer" reference to referer which whish to run script by given URL
+            @return		sal_True if URL is secure or security is obsolete(!) or sal_False otherwise.
 
-            @onerror    No error should occurre!
+            @onerror	No error should occurre!
         *//*-*****************************************************************************************************/
 
-        sal_Bool IsSecureURL(   const   ::rtl::OUString&    sURL        ,
-                                const   ::rtl::OUString&    sReferer    ) const ;
+        sal_Bool IsSecureURL(	const	::rtl::OUString&	sURL		,
+                                const	::rtl::OUString&	sReferer	) const ;
 
-        ::com::sun::star::uno::Sequence< Certificate >  GetTrustedAuthors       (                                                                   ) const ;
-        void                                            SetTrustedAuthors       ( const ::com::sun::star::uno::Sequence< Certificate >& rAuthors    )       ;
-        sal_Bool                                        IsTrustedAuthorsEnabled (                                                                   )       ;
+        ::com::sun::star::uno::Sequence< Certificate >	GetTrustedAuthors		(																	) const	;
+        void											SetTrustedAuthors		( const ::com::sun::star::uno::Sequence< Certificate >& rAuthors	)		;
+        sal_Bool										IsTrustedAuthorsEnabled	(																	)		;
 
         // for bool options only!
-        bool        IsOptionSet     ( EOption eOption                   ) const ;
-        bool        SetOption       ( EOption eOption, bool bValue      )       ;
-        bool        IsOptionEnabled ( EOption eOption                   ) const ;
+        bool		IsOptionSet		( EOption eOption					) const	;
+        bool		SetOption		( EOption eOption, bool bValue		)		;
+        bool		IsOptionEnabled	( EOption eOption					) const	;
 
         // xmlsec05 depricated methods
         sal_Bool    IsExecutePlugins() const;
         void        SetExecutePlugins( sal_Bool bSet );
-        EBasicSecurityMode  GetBasicMode(                           ) const ;
-        void                SetBasicMode( EBasicSecurityMode eMode  )       ;
+        EBasicSecurityMode	GetBasicMode(							) const	;
+        void				SetBasicMode( EBasicSecurityMode eMode	)		;
         sal_Bool IsWarningEnabled() const;
         void SetWarningEnabled( sal_Bool bSet );
         sal_Bool IsConfirmationEnabled() const;
         void SetConfirmationEnabled( sal_Bool bSet );
 
     //-------------------------------------------------------------------------------------------------------------
-    //  private methods
+    //	private methods
     //-------------------------------------------------------------------------------------------------------------
 
     private:
 
         /*-****************************************************************************************************//**
-            @short      return a reference to a static mutex
-            @descr      These class is partially threadsafe (for de-/initialization only).
+            @short		return a reference to a static mutex
+            @descr		These class is partially threadsafe (for de-/initialization only).
                         All access methods are'nt safe!
                         We create a static mutex only for one ime and use at different times.
 
-            @seealso    -
+            @seealso	-
 
-            @param      -
-            @return     A reference to a static mutex member.
+            @param		-
+            @return		A reference to a static mutex member.
 
-            @onerror    -
+            @onerror	-
         *//*-*****************************************************************************************************/
 
         UNOTOOLS_DLLPRIVATE static ::osl::Mutex& GetInitMutex();
 
     //-------------------------------------------------------------------------------------------------------------
-    //  private member
+    //	private member
     //-------------------------------------------------------------------------------------------------------------
 
     private:
@@ -288,9 +288,9 @@ class UNOTOOLS_DLLPUBLIC SvtSecurityOptions: public utl::detail::Options
             Do it in your source only.
          */
 
-        static SvtSecurityOptions_Impl* m_pDataContainer    ;   /// impl. data container as dynamic pointer for smaller memory requirements!
-        static sal_Int32                m_nRefCount         ;   /// internal ref count mechanism
+        static SvtSecurityOptions_Impl*	m_pDataContainer	;	/// impl. data container as dynamic pointer for smaller memory requirements!
+        static sal_Int32				m_nRefCount			;	/// internal ref count mechanism
 
-};      // class SvtSecurityOptions
+};		// class SvtSecurityOptions
 
 #endif  // #ifndef INCLUDED_unotools_SECURITYOPTIONS_HXX
diff --git a/unotools/inc/unotools/sharedunocomponent.hxx b/unotools/inc/unotools/sharedunocomponent.hxx
index 70c01b0cc0af..0883370201c6 100644
--- a/unotools/inc/unotools/sharedunocomponent.hxx
+++ b/unotools/inc/unotools/sharedunocomponent.hxx
@@ -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
diff --git a/unotools/inc/unotools/sourceviewconfig.hxx b/unotools/inc/unotools/sourceviewconfig.hxx
index 5f66d6d05c76..90c4f9cfbe60 100644
--- a/unotools/inc/unotools/sourceviewconfig.hxx
+++ b/unotools/inc/unotools/sourceviewconfig.hxx
@@ -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
diff --git a/unotools/inc/unotools/startoptions.hxx b/unotools/inc/unotools/startoptions.hxx
index 4fbb2c091864..d7717e68ae12 100644
--- a/unotools/inc/unotools/startoptions.hxx
+++ b/unotools/inc/unotools/startoptions.hxx
@@ -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
diff --git a/unotools/inc/unotools/streamhelper.hxx b/unotools/inc/unotools/streamhelper.hxx
index d6250e7b0306..0aee7552f221 100644
--- a/unotools/inc/unotools/streamhelper.hxx
+++ b/unotools/inc/unotools/streamhelper.hxx
@@ -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
@@ -38,23 +38,23 @@
 
 namespace utl
 {
-    namespace stario    = ::com::sun::star::io;
-    namespace staruno   = ::com::sun::star::uno;
+    namespace stario	= ::com::sun::star::io;
+    namespace staruno	= ::com::sun::star::uno;
 
 /**
  * The helper implementation for a using input streams based on SvLockBytes.
  *
- * @author  Dirk Grobler
- * @since   00/28/03
+ * @author	Dirk Grobler
+ * @since	00/28/03
  */
     typedef ::cppu::WeakImplHelper2<stario::XInputStream, stario::XSeekable> InputStreamHelper_Base;
     // needed for some compilers
 class UNOTOOLS_DLLPUBLIC OInputStreamHelper : public InputStreamHelper_Base
 {
-    ::osl::Mutex    m_aMutex;
-    SvLockBytesRef  m_xLockBytes;
-    sal_uInt32      m_nActPos;
-    sal_Int32       m_nAvailable;   // this is typically the chunk(buffer) size
+    ::osl::Mutex	m_aMutex;
+    SvLockBytesRef	m_xLockBytes;
+    sal_uInt32		m_nActPos;
+    sal_Int32		m_nAvailable;	// this is typically the chunk(buffer) size
 
 public:
     OInputStreamHelper(const SvLockBytesRef& _xLockBytes,
@@ -83,16 +83,16 @@ public:
 /**
  * The helper implementation for a using output streams based on SvLockBytes.
  *
- * @author  Dirk Grobler
- * @since   00/28/03
+ * @author	Dirk Grobler
+ * @since	00/28/03
  */
 typedef ::cppu::WeakImplHelper1<stario::XOutputStream> OutputStreamHelper_Base;
     // needed for some compilers
 class UNOTOOLS_DLLPUBLIC OOutputStreamHelper : public OutputStreamHelper_Base
 {
-    ::osl::Mutex    m_aMutex;
-    SvLockBytesRef  m_xLockBytes;
-    sal_uInt32      m_nActPos;
+    ::osl::Mutex	m_aMutex;
+    SvLockBytesRef	m_xLockBytes;
+    sal_uInt32		m_nActPos;
 
 public:
     OOutputStreamHelper(const SvLockBytesRef& _xLockBytes, sal_uInt32 _nPos = 0)
@@ -109,7 +109,7 @@ public:
     virtual void SAL_CALL closeOutput(  ) throw(stario::NotConnectedException, stario::BufferSizeExceededException, stario::IOException, staruno::RuntimeException);
 };
 
-}   // namespace utl
+}	// namespace utl
 
 
 #endif // _UNOTOOLS_STREAM_WRAPPER_HXX_
diff --git a/unotools/inc/unotools/streamsection.hxx b/unotools/inc/unotools/streamsection.hxx
index 4c51ed648eb1..0765138bd237 100644
--- a/unotools/inc/unotools/streamsection.hxx
+++ b/unotools/inc/unotools/streamsection.hxx
@@ -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
@@ -35,37 +35,37 @@
 namespace utl
 {
 
-    namespace stario    = ::com::sun::star::io;
-    namespace staruno   = ::com::sun::star::uno;
+    namespace stario	= ::com::sun::star::io;
+    namespace staruno	= ::com::sun::star::uno;
 
 /** implements handling for compatibly reading/writing data from/into an input/output stream.
     data written in a block secured by this class should be readable by older versions which
     use the same mechanism.
 
-    @author Frank Schoenheit
-    @since  00/26/05
+    @author	Frank Schoenheit
+    @since	00/26/05
 */
 
 class OStreamSection
 {
-    staruno::Reference< stario::XMarkableStream >       m_xMarkStream;
-    staruno::Reference< stario::XDataInputStream >      m_xInStream;
-    staruno::Reference< stario::XDataOutputStream >     m_xOutStream;
+    staruno::Reference< stario::XMarkableStream >		m_xMarkStream;
+    staruno::Reference< stario::XDataInputStream >		m_xInStream;
+    staruno::Reference< stario::XDataOutputStream >		m_xOutStream;
 
-    sal_Int32   m_nBlockStart;
-    sal_Int32   m_nBlockLen;
+    sal_Int32	m_nBlockStart;
+    sal_Int32	m_nBlockLen;
 
 public:
-    /** starts reading of a "skippable" section of data within the given input stream<BR>
-        @param      _rxInput    the stream to read from. Must support the
+    /**	starts reading of a "skippable" section of data within the given input stream<BR>
+        @param		_rxInput	the stream to read from. Must support the
                                 <type scope="com::sun::star::io">XMarkableStream</type> interface
     */
     OStreamSection(const staruno::Reference< stario::XDataInputStream >& _rxInput);
 
-    /** starts writing of a "skippable" section of data into the given output stream
-        @param      _rxOutput           the stream the stream to write to. Must support the
+    /**	starts writing of a "skippable" section of data into the given output stream
+        @param		_rxOutput			the stream the stream to write to. Must support the
                                         <type scope="com::sun::star::io">XMarkableStream</type> interface
-        @param      _nPresumedLength    estimation for the length of the upcoming section. If greater 0, this
+        @param		_nPresumedLength	estimation for the length of the upcoming section. If greater 0, this
                                         value will be written as section length and corrected (in the dtor) only if
                                         needed. If you know how much bytes you are about to write, you may
                                         want to use this param, saving some stream operations this way.
@@ -78,7 +78,7 @@ public:
     ~OStreamSection();
 };
 
-}   // namespace utl
+}	// namespace utl
 
 #endif // _UNOTOOLS_STREAMSECTION_HXX_
 
diff --git a/unotools/inc/unotools/streamwrap.hxx b/unotools/inc/unotools/streamwrap.hxx
index d8544cc25f3e..a74f5d93ba20 100644
--- a/unotools/inc/unotools/streamwrap.hxx
+++ b/unotools/inc/unotools/streamwrap.hxx
@@ -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
@@ -42,22 +42,22 @@ class SvStream;
 
 namespace utl
 {
-    namespace stario    = ::com::sun::star::io;
-    namespace staruno   = ::com::sun::star::uno;
+    namespace stario	= ::com::sun::star::io;
+    namespace staruno	= ::com::sun::star::uno;
 
 //==================================================================
 //= OInputStreamWrapper
 //==================================================================
-typedef ::cppu::WeakImplHelper1 <   stario::XInputStream
+typedef ::cppu::WeakImplHelper1	<	stario::XInputStream
                                 > InputStreamWrapper_Base;
     // needed for some compilers
 /// helper class for wrapping an SvStream into an <type scope="com.sun.star.io">XInputStream</type>
 class UNOTOOLS_DLLPUBLIC OInputStreamWrapper : public InputStreamWrapper_Base
 {
 protected:
-    ::osl::Mutex    m_aMutex;
-    SvStream*       m_pSvStream;
-    sal_Bool        m_bSvStreamOwner : 1;
+    ::osl::Mutex	m_aMutex;
+    SvStream*		m_pSvStream;
+    sal_Bool		m_bSvStreamOwner : 1;
     OInputStreamWrapper()
                     { m_pSvStream = 0; m_bSvStreamOwner = sal_False; }
     void            SetStream(SvStream* _pStream, sal_Bool bOwner )
@@ -72,11 +72,11 @@ public:
     DECLARE_UNO3_AGG_DEFAULTS(OInputStreamWrapper, InputStreamWrapper_Base);
 
 // stario::XInputStream
-    virtual sal_Int32   SAL_CALL    readBytes(staruno::Sequence< sal_Int8 >& aData, sal_Int32 nBytesToRead) throw(stario::NotConnectedException, stario::BufferSizeExceededException, staruno::RuntimeException);
-    virtual sal_Int32   SAL_CALL    readSomeBytes(staruno::Sequence< sal_Int8 >& aData, sal_Int32 nMaxBytesToRead) throw(stario::NotConnectedException, stario::BufferSizeExceededException, staruno::RuntimeException);
-    virtual void        SAL_CALL    skipBytes(sal_Int32 nBytesToSkip) throw(stario::NotConnectedException, stario::BufferSizeExceededException, staruno::RuntimeException);
-    virtual sal_Int32   SAL_CALL    available() throw(stario::NotConnectedException, staruno::RuntimeException);
-    virtual void        SAL_CALL    closeInput() throw(stario::NotConnectedException, staruno::RuntimeException);
+    virtual sal_Int32	SAL_CALL	readBytes(staruno::Sequence< sal_Int8 >& aData, sal_Int32 nBytesToRead) throw(stario::NotConnectedException, stario::BufferSizeExceededException, staruno::RuntimeException);
+    virtual sal_Int32	SAL_CALL	readSomeBytes(staruno::Sequence< sal_Int8 >& aData, sal_Int32 nMaxBytesToRead) throw(stario::NotConnectedException, stario::BufferSizeExceededException, staruno::RuntimeException);
+    virtual void		SAL_CALL	skipBytes(sal_Int32 nBytesToSkip) throw(stario::NotConnectedException, stario::BufferSizeExceededException, staruno::RuntimeException);
+    virtual sal_Int32	SAL_CALL	available() throw(stario::NotConnectedException, staruno::RuntimeException);
+    virtual void		SAL_CALL	closeInput() throw(stario::NotConnectedException, staruno::RuntimeException);
 
 protected:
     /// throws a NotConnectedException if the object is not connected anymore
@@ -88,8 +88,8 @@ protected:
 //==================================================================
 //= OSeekableInputStreamWrapper
 //==================================================================
-typedef ::cppu::ImplHelper1 <   ::com::sun::star::io::XSeekable
-                            >   OSeekableInputStreamWrapper_Base;
+typedef ::cppu::ImplHelper1	<	::com::sun::star::io::XSeekable
+                            >	OSeekableInputStreamWrapper_Base;
 /** helper class for wrapping an SvStream into an <type scope="com.sun.star.io">XInputStream</type>
     which is seekable (i.e. supports the <type scope="com.sun.star.io">XSeekable</type> interface).
 */
@@ -116,7 +116,7 @@ class UNOTOOLS_DLLPUBLIC OOutputStreamWrapper : public OutputStreamWrapper_Base
 {
 protected:
     // TODO: thread safety!
-    SvStream&       rStream;
+    SvStream&		rStream;
 
 public:
     OOutputStreamWrapper(SvStream& _rStream) :rStream(_rStream) { }
@@ -137,8 +137,8 @@ protected:
 //==================================================================
 //= OSeekableOutputStreamWrapper
 //==================================================================
-typedef ::cppu::ImplHelper1 <   ::com::sun::star::io::XSeekable
-                            >   OSeekableOutputStreamWrapper_Base;
+typedef ::cppu::ImplHelper1	<	::com::sun::star::io::XSeekable
+                            >	OSeekableOutputStreamWrapper_Base;
 /** helper class for wrapping an SvStream into an <type scope="com.sun.star.io">XOutputStream</type>
     which is seekable (i.e. supports the <type scope="com.sun.star.io">XSeekable</type> interface).
 */
diff --git a/unotools/inc/unotools/syslocale.hxx b/unotools/inc/unotools/syslocale.hxx
index 5d653297fde1..d37d8b75d5bb 100644
--- a/unotools/inc/unotools/syslocale.hxx
+++ b/unotools/inc/unotools/syslocale.hxx
@@ -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
@@ -72,11 +72,11 @@ public:
      */
             const LocaleDataWrapper*    GetLocaleDataPtr() const;
             const CharClass*            GetCharClassPtr() const;
-            SvtSysLocaleOptions&        GetOptions() const;
+            SvtSysLocaleOptions&		GetOptions() const;
             com::sun::star::lang::Locale GetLocale() const;
-            LanguageType                GetLanguage() const;
+            LanguageType				GetLanguage() const;
             com::sun::star::lang::Locale GetUILocale() const;
-            LanguageType                GetUILanguage() const;
+            LanguageType				GetUILanguage() const;
 
     /** Get the best MIME encoding matching the system locale, or if that isn't
         determinable one that matches the UI locale, or UTF8 if everything else
diff --git a/unotools/inc/unotools/syslocaleoptions.hxx b/unotools/inc/unotools/syslocaleoptions.hxx
index 63e271f1c435..7a3dbef82c2a 100644
--- a/unotools/inc/unotools/syslocaleoptions.hxx
+++ b/unotools/inc/unotools/syslocaleoptions.hxx
@@ -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
@@ -105,14 +105,14 @@ public:
             void                SetLocaleConfigString( const ::rtl::OUString& rStr );
             com::sun::star::lang::Locale GetLocale() const;
             com::sun::star::lang::Locale GetRealLocale() const;
-            LanguageType        GetRealLanguage() const;
+            LanguageType		GetRealLanguage() const;
 
     /// The config string may be empty to denote the SYSTEM locale
             const ::rtl::OUString&  GetUILocaleConfigString() const;
             void                SetUILocaleConfigString( const ::rtl::OUString& rStr );
             com::sun::star::lang::Locale GetUILocale() const;
             com::sun::star::lang::Locale GetRealUILocale() const;
-            LanguageType        GetRealUILanguage() const;
+            LanguageType		GetRealUILanguage() const;
 
     /// The config string may be empty to denote the default currency of the locale
             const ::rtl::OUString&  GetCurrencyConfigString() const;
diff --git a/unotools/inc/unotools/tempfile.hxx b/unotools/inc/unotools/tempfile.hxx
index 29ca06a23c71..65ac64eb3034 100644
--- a/unotools/inc/unotools/tempfile.hxx
+++ b/unotools/inc/unotools/tempfile.hxx
@@ -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
diff --git a/unotools/inc/unotools/textsearch.hxx b/unotools/inc/unotools/textsearch.hxx
index e4cd095fcc14..56706bfd7d16 100644
--- a/unotools/inc/unotools/textsearch.hxx
+++ b/unotools/inc/unotools/textsearch.hxx
@@ -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
@@ -61,12 +61,12 @@ public:
 
 private:
     String sSrchStr;            // the search string
-    String sReplaceStr;         // the replace string
+    String sReplaceStr;			// the replace string
 
     SearchType eSrchType;       // search normal/regular/LevDist
 
-    int bWordOnly   : 1;        // used by normal search
-    int bSrchInSel  : 1;        // search only in the selection
+    int bWordOnly	: 1;		// used by normal search
+    int bSrchInSel	: 1;		// search only in the selection
     int bCaseSense  : 1;        //
 
     // values for the "weight Levenshtein-Distance"
@@ -86,44 +86,44 @@ public:
                     BOOL bSrchInSel = FALSE );
     SearchParam( const SearchParam& );
 
-    const String&   GetSrchStr() const          { return sSrchStr; }
-    const String&   GetReplaceStr() const       { return sReplaceStr; }
+    const String& 	GetSrchStr() const			{ return sSrchStr; }
+    const String& 	GetReplaceStr() const		{ return sReplaceStr; }
     SearchType      GetSrchType() const         { return eSrchType; }
 
     int             IsCaseSensitive() const     { return bCaseSense; }
-    int             IsSrchInSelection() const   { return bSrchInSel; }
-    int             IsSrchWordOnly() const      { return bWordOnly; }
+    int				IsSrchInSelection() const	{ return bSrchInSel; }
+    int 			IsSrchWordOnly() const		{ return bWordOnly; }
 
 
-    void SetSrchStr( const String& rStr )       { sSrchStr = rStr; }
-    void SetReplaceStr( const String& rStr )    { sReplaceStr = rStr; }
+    void SetSrchStr( const String& rStr ) 		{ sSrchStr = rStr; }
+    void SetReplaceStr( const String& rStr )	{ sReplaceStr = rStr; }
     void SetSrchType( SearchType eType )        { eSrchType = eType; }
 
     void SetCaseSensitive( int bFlag )          { bCaseSense = bFlag; }
     void SetSrchInSelection( int bFlag )        { bSrchInSel = bFlag; }
     void SetSrchWordOnly( int bFlag )           { bWordOnly = bFlag; }
 
-    int             IsSrchRelaxed() const       { return bLEV_Relaxed; }
-    int             GetLEVOther() const         { return nLEV_OtherX; }
-    int             GetLEVShorter() const       { return nLEV_ShorterY; }
-    int             GetLEVLonger() const        { return nLEV_LongerZ; }
+    int 			IsSrchRelaxed() const		{ return bLEV_Relaxed; }
+    int				GetLEVOther() const			{ return nLEV_OtherX; }
+    int				GetLEVShorter() const		{ return nLEV_ShorterY; }
+    int				GetLEVLonger() const		{ return nLEV_LongerZ; }
 
     void SetSrchRelaxed( int bFlag )            { bLEV_Relaxed = bFlag; }
-    void SetLEVOther( int nValue )              { nLEV_OtherX = nValue; }
-    void SetLEVShorter( int nValue )            { nLEV_ShorterY = nValue; }
-    void SetLEVLonger( int nValue )             { nLEV_LongerZ = nValue; }
+    void SetLEVOther( int nValue )				{ nLEV_OtherX = nValue; }
+    void SetLEVShorter( int nValue )			{ nLEV_ShorterY = nValue; }
+    void SetLEVLonger( int nValue )				{ nLEV_LongerZ = nValue; }
 
-    long GetTransliterationFlags() const        { return nTransliterationFlags; }
-    void SetTransliterationFlags( long nValue ) { nTransliterationFlags = nValue; }
+    long GetTransliterationFlags() const		{ return nTransliterationFlags; }
+    void SetTransliterationFlags( long nValue )	{ nTransliterationFlags = nValue; }
 };
 
-//  Klasse zum Suchen eines Strings in einem String.
-//  Unterstuetzt werden folgende Verfahren:
-//      - normalen Text (Bayer/Moore)
-//      - regulaere Ausdruecke
-//      - gewichtete Levenshtein Distanz
+//	Klasse zum Suchen eines Strings in einem String.
+//	Unterstuetzt werden folgende Verfahren:
+//		- normalen Text (Bayer/Moore)
+//		- regulaere Ausdruecke
+// 		- gewichtete Levenshtein Distanz
 //
-//  Es kann Vorwaerts und Rueckwaerts gesucht werden!
+//	Es kann Vorwaerts und Rueckwaerts gesucht werden!
 
 class UNOTOOLS_DLLPUBLIC TextSearch
 {
@@ -156,7 +156,7 @@ public:
 
     /* search in the (selected) text the search string:
         rScrTxt - the text, in in which we search
-        pStart  - start position for the search
+        pStart	- start position for the search
         pEnde   - end position for the search
 
         RETURN values   ==  TRUE: something is found
@@ -189,7 +189,7 @@ public:
 };
 
 // ............................................................................
-}   // namespace utl
+}	// namespace utl
 // ............................................................................
 
 #endif
diff --git a/unotools/inc/unotools/transliterationwrapper.hxx b/unotools/inc/unotools/transliterationwrapper.hxx
index acd3bbf5dcf4..4b1b96ebc778 100644
--- a/unotools/inc/unotools/transliterationwrapper.hxx
+++ b/unotools/inc/unotools/transliterationwrapper.hxx
@@ -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
@@ -54,7 +54,7 @@ class UNOTOOLS_DLLPUBLIC TransliterationWrapper
 
                                 // not implemented, prevent usage
     TransliterationWrapper( const TransliterationWrapper& );
-    TransliterationWrapper& operator=( const TransliterationWrapper& );
+    TransliterationWrapper&	operator=( const TransliterationWrapper& );
 
     void loadModuleImpl() const;
     void setLanguageLocaleImpl( sal_uInt16 nLang );
@@ -67,7 +67,7 @@ public:
     ~TransliterationWrapper();
 
     // get current Locale / Language
-    const ::com::sun::star::lang::Locale& getLocale() const { return aLocale;}
+    const ::com::sun::star::lang::Locale& getLocale() const	{ return aLocale;}
     sal_uInt16 getLanguage() const { return nLanguage; }
 
     sal_uInt32 getType() const { return nType; }
diff --git a/unotools/inc/unotools/ucbhelper.hxx b/unotools/inc/unotools/ucbhelper.hxx
index 687868adbdb4..686e954c46ef 100644
--- a/unotools/inc/unotools/ucbhelper.hxx
+++ b/unotools/inc/unotools/ucbhelper.hxx
@@ -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
@@ -67,9 +67,9 @@ namespace utl
 
         static sal_Bool             CanMakeFolder( const String& rFolder );
         static sal_Bool             MakeFolder( const String& rFolder, sal_Bool bNewOnly = sal_False );
-        static sal_Bool             MakeFolder( ::ucbhelper::Content& rParent,
-                                                const String& rTitle,
-                                                ::ucbhelper::Content& rNewFolder,
+        static sal_Bool             MakeFolder( ::ucbhelper::Content& rParent, 
+                                                const String& rTitle, 
+                                                ::ucbhelper::Content& rNewFolder, 
                                                 sal_Bool bNewOnly = sal_False );
         static sal_Bool             HasParentFolder( const String& rFolder );
 
@@ -79,7 +79,8 @@ namespace utl
         static sal_Bool             Exists( const String& rContent );
         static sal_Bool             FindInPath( const String& rPath, const String& rName, String& rFile, char cDelim = ';', BOOL bAllowWildCards = TRUE );
         static sal_Bool             Find( const String& rFolder, const String& rName, String& rFile, BOOL bAllowWildCards = FALSE );
-        static sal_Bool             IsSubPath( const ::rtl::OUString& rPath, const ::rtl::OUString& rChildCandidate, const ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XContentProvider >& xContentProvider = ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XContentProvider >() );
+        static sal_Bool				IsSubPath( const ::rtl::OUString& rPath, const ::rtl::OUString& rChildCandidate, const ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XContentProvider >& xContentProvider = ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XContentProvider >() );
+        static sal_Bool             EqualURLs( const ::rtl::OUString& aFirstURL, const ::rtl::OUString& aSecondURL );
     };
 }
 
diff --git a/unotools/inc/unotools/ucblockbytes.hxx b/unotools/inc/unotools/ucblockbytes.hxx
index 2ba0a683745a..3295e607a59a 100644
--- a/unotools/inc/unotools/ucblockbytes.hxx
+++ b/unotools/inc/unotools/ucblockbytes.hxx
@@ -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
@@ -104,9 +104,9 @@ SV_DECL_IMPL_REF( UcbLockBytesHandler )
 
 class UNOTOOLS_DLLPUBLIC UcbLockBytes : public virtual SvLockBytes
 {
-    vos::OCondition         m_aInitialized;
-    vos::OCondition         m_aTerminated;
-    vos::OMutex             m_aMutex;
+    vos::OCondition			m_aInitialized;
+    vos::OCondition			m_aTerminated;
+    vos::OMutex				m_aMutex;
 
     String                  m_aContentType;
     String                  m_aRealURL;
@@ -115,7 +115,7 @@ class UNOTOOLS_DLLPUBLIC UcbLockBytes : public virtual SvLockBytes
     NS_UNO::Reference < NS_IO::XInputStream >  m_xInputStream;
     NS_UNO::Reference < NS_IO::XOutputStream > m_xOutputStream;
     NS_UNO::Reference < NS_IO::XSeekable >     m_xSeekable;
-    void*                   m_pCommandThread; // is alive only for compatibility reasons
+    void*					m_pCommandThread; // is alive only for compatibility reasons
     UcbLockBytesHandlerRef  m_xHandler;
 
     sal_uInt32              m_nRead;
@@ -126,7 +126,7 @@ class UNOTOOLS_DLLPUBLIC UcbLockBytes : public virtual SvLockBytes
     sal_Bool                m_bDontClose : 1;
     sal_Bool                m_bStreamValid : 1;
 
-    DECL_LINK(              DataAvailHdl, void * );
+    DECL_LINK(				DataAvailHdl, void * );
 
                             UcbLockBytes( UcbLockBytesHandler* pHandler=NULL );
 protected:
diff --git a/unotools/inc/unotools/ucbstreamhelper.hxx b/unotools/inc/unotools/ucbstreamhelper.hxx
index 2c06d925ddb2..a6a1b9be04fb 100644
--- a/unotools/inc/unotools/ucbstreamhelper.hxx
+++ b/unotools/inc/unotools/ucbstreamhelper.hxx
@@ -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
diff --git a/unotools/inc/unotools/undoopt.hxx b/unotools/inc/unotools/undoopt.hxx
index 319f5f4edf32..6504f2a31deb 100644
--- a/unotools/inc/unotools/undoopt.hxx
+++ b/unotools/inc/unotools/undoopt.hxx
@@ -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
diff --git a/unotools/inc/unotools/unotoolsdllapi.h b/unotools/inc/unotools/unotoolsdllapi.h
index 521c9c3af3f6..43bd5df8027f 100644
--- a/unotools/inc/unotools/unotoolsdllapi.h
+++ b/unotools/inc/unotools/unotoolsdllapi.h
@@ -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
@@ -27,15 +27,15 @@
 
 #ifndef INCLUDED_UNOTOOLSDLLAPI_H
 #define INCLUDED_UNOTOOLSDLLAPI_H
-
+                                                                                                                             
 #include "sal/types.h"
-
+                                                                                                                             
 #if defined(UNOTOOLS_DLLIMPLEMENTATION)
 #define UNOTOOLS_DLLPUBLIC  SAL_DLLPUBLIC_EXPORT
 #else
 #define UNOTOOLS_DLLPUBLIC  SAL_DLLPUBLIC_IMPORT
 #endif
 #define UNOTOOLS_DLLPRIVATE SAL_DLLPRIVATE
-
+                                                                                                                             
 #endif /* INCLUDED_UNOTOOLSDLLAPI_H */
 
diff --git a/unotools/inc/unotools/unotunnelhelper.hxx b/unotools/inc/unotools/unotunnelhelper.hxx
index ec4f1243f4d9..862b6df18c74 100644
--- a/unotools/inc/unotools/unotunnelhelper.hxx
+++ b/unotools/inc/unotools/unotunnelhelper.hxx
@@ -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
@@ -114,7 +114,7 @@ public:
 
     sal_Bool equalTo(staruno::Sequence<sal_Int8> const& rIdentifier) throw()
     {
-        return  rIdentifier.getLength() == sizeof(tunnelId) &&
+        return	rIdentifier.getLength() == sizeof(tunnelId) &&
                 rtl_compareMemory(tunnelId, rIdentifier.getConstArray(), sizeof(tunnelId)) == 0;
     }
 
diff --git a/unotools/inc/unotools/useroptions.hxx b/unotools/inc/unotools/useroptions.hxx
index 020ddd657eaf..b89d3482a899 100644
--- a/unotools/inc/unotools/useroptions.hxx
+++ b/unotools/inc/unotools/useroptions.hxx
@@ -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
@@ -35,21 +35,21 @@
 
 // define ----------------------------------------------------------------
 
-#define USER_OPT_CITY               ((USHORT)0)
-#define USER_OPT_COMPANY            ((USHORT)1)
-#define USER_OPT_COUNTRY            ((USHORT)2)
-#define USER_OPT_EMAIL              ((USHORT)3)
-#define USER_OPT_FAX                ((USHORT)4)
-#define USER_OPT_FIRSTNAME          ((USHORT)5)
-#define USER_OPT_LASTNAME           ((USHORT)6)
-#define USER_OPT_POSITION           ((USHORT)7)
-#define USER_OPT_STATE              ((USHORT)8)
-#define USER_OPT_STREET             ((USHORT)9)
-#define USER_OPT_TELEPHONEHOME      ((USHORT)10)
-#define USER_OPT_TELEPHONEWORK      ((USHORT)11)
-#define USER_OPT_TITLE              ((USHORT)12)
-#define USER_OPT_ID                 ((USHORT)13)
-#define USER_OPT_ZIP                ((USHORT)14)
+#define USER_OPT_CITY				((USHORT)0)
+#define USER_OPT_COMPANY			((USHORT)1)
+#define USER_OPT_COUNTRY			((USHORT)2)
+#define USER_OPT_EMAIL				((USHORT)3)
+#define USER_OPT_FAX				((USHORT)4)
+#define USER_OPT_FIRSTNAME			((USHORT)5)
+#define USER_OPT_LASTNAME			((USHORT)6)
+#define USER_OPT_POSITION			((USHORT)7)
+#define USER_OPT_STATE				((USHORT)8)
+#define USER_OPT_STREET				((USHORT)9)
+#define USER_OPT_TELEPHONEHOME		((USHORT)10)
+#define USER_OPT_TELEPHONEWORK		((USHORT)11)
+#define USER_OPT_TITLE				((USHORT)12)
+#define USER_OPT_ID					((USHORT)13)
+#define USER_OPT_ZIP				((USHORT)14)
 #define USER_OPT_FATHERSNAME        ((USHORT)15)
 #define USER_OPT_APARTMENT          ((USHORT)16)
 
@@ -60,58 +60,58 @@ class SvtUserOptions_Impl;
 class UNOTOOLS_DLLPUBLIC SvtUserOptions: public utl::detail::Options
 {
 private:
-    SvtUserOptions_Impl*    pImp;
+    SvtUserOptions_Impl*	pImp;
 
 public:
     SvtUserOptions();
     virtual ~SvtUserOptions();
 
-    static ::osl::Mutex&    GetInitMutex();
+    static ::osl::Mutex&	GetInitMutex();
 
     // get the address token
-     ::rtl::OUString    GetCompany() const;
-     ::rtl::OUString    GetFirstName() const;
-     ::rtl::OUString    GetLastName() const;
-     ::rtl::OUString    GetID() const;
-     ::rtl::OUString    GetStreet() const;
-     ::rtl::OUString    GetCity() const;
-     ::rtl::OUString    GetState() const;
-     ::rtl::OUString    GetZip() const;
-     ::rtl::OUString    GetCountry() const;
-     ::rtl::OUString    GetPosition() const;
-     ::rtl::OUString    GetTitle() const;
-     ::rtl::OUString    GetTelephoneHome() const;
-     ::rtl::OUString    GetTelephoneWork() const;
-     ::rtl::OUString    GetFax() const;
-     ::rtl::OUString    GetEmail() const;
-     ::rtl::OUString    GetCustomerNumber() const;
+     ::rtl::OUString	GetCompany() const;
+     ::rtl::OUString	GetFirstName() const;
+     ::rtl::OUString	GetLastName() const;
+     ::rtl::OUString	GetID() const;
+     ::rtl::OUString	GetStreet() const;
+     ::rtl::OUString	GetCity() const;
+     ::rtl::OUString	GetState() const;
+     ::rtl::OUString	GetZip() const;
+     ::rtl::OUString	GetCountry() const;
+     ::rtl::OUString	GetPosition() const;
+     ::rtl::OUString	GetTitle() const;
+     ::rtl::OUString	GetTelephoneHome() const;
+     ::rtl::OUString	GetTelephoneWork() const;
+     ::rtl::OUString	GetFax() const;
+     ::rtl::OUString	GetEmail() const;
+     ::rtl::OUString	GetCustomerNumber() const;
      ::rtl::OUString    GetFathersName() const;
      ::rtl::OUString    GetApartment() const;
 
-     ::rtl::OUString    GetFullName() const;
-     ::rtl::OUString    GetLocale() const;
+     ::rtl::OUString	GetFullName() const;
+     ::rtl::OUString	GetLocale() const;
 
     // set the address token
-    void            SetCompany( const ::rtl::OUString& rNewToken );
-    void            SetFirstName( const ::rtl::OUString& rNewToken );
-    void            SetLastName( const ::rtl::OUString& rNewToken );
-    void            SetID( const ::rtl::OUString& rNewToken );
-    void            SetStreet( const ::rtl::OUString& rNewToken );
-    void            SetCity( const ::rtl::OUString& rNewToken );
-    void            SetState( const ::rtl::OUString& rNewToken );
-    void            SetZip( const ::rtl::OUString& rNewToken );
-    void            SetCountry( const ::rtl::OUString& rNewToken );
-    void            SetPosition( const ::rtl::OUString& rNewToken );
-    void            SetTitle( const ::rtl::OUString& rNewToken );
-    void            SetTelephoneHome( const ::rtl::OUString& rNewToken );
-    void            SetTelephoneWork( const ::rtl::OUString& rNewToken );
-    void            SetFax( const ::rtl::OUString& rNewToken );
-    void            SetEmail( const ::rtl::OUString& rNewToken );
-    void            SetCustomerNumber( const ::rtl::OUString& rNewToken );
+    void			SetCompany( const ::rtl::OUString& rNewToken );
+    void			SetFirstName( const ::rtl::OUString& rNewToken );
+    void			SetLastName( const ::rtl::OUString& rNewToken );
+    void			SetID( const ::rtl::OUString& rNewToken );
+    void			SetStreet( const ::rtl::OUString& rNewToken );
+    void			SetCity( const ::rtl::OUString& rNewToken );
+    void			SetState( const ::rtl::OUString& rNewToken );
+    void			SetZip( const ::rtl::OUString& rNewToken );
+    void			SetCountry( const ::rtl::OUString& rNewToken );
+    void			SetPosition( const ::rtl::OUString& rNewToken );
+    void			SetTitle( const ::rtl::OUString& rNewToken );
+    void			SetTelephoneHome( const ::rtl::OUString& rNewToken );
+    void			SetTelephoneWork( const ::rtl::OUString& rNewToken );
+    void			SetFax( const ::rtl::OUString& rNewToken );
+    void			SetEmail( const ::rtl::OUString& rNewToken );
+    void			SetCustomerNumber( const ::rtl::OUString& rNewToken );
     void            SetFathersName( const ::rtl::OUString& rNewToken );
     void            SetApartment( const ::rtl::OUString& rNewToken );
 
-    sal_Bool        IsTokenReadonly( USHORT nToken ) const;
+    sal_Bool		IsTokenReadonly( USHORT nToken ) const;
     ::rtl::OUString GetToken(USHORT nToken) const;
 };
 
diff --git a/unotools/inc/unotools/useroptions_const.hxx b/unotools/inc/unotools/useroptions_const.hxx
index 34a12f6519bf..44e2a9bb2962 100644
--- a/unotools/inc/unotools/useroptions_const.hxx
+++ b/unotools/inc/unotools/useroptions_const.hxx
@@ -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
@@ -32,7 +32,7 @@
 
 namespace
 {
-    static const ::rtl::OUString s_sData                     = ::rtl::OUString::createFromAscii("org.openoffice.UserProfile/Data");
+    static const ::rtl::OUString s_sData                     = ::rtl::OUString::createFromAscii("org.openoffice.UserProfile/Data");	
     static const ::rtl::OUString s_so                        = ::rtl::OUString::createFromAscii("o"); // USER_OPT_COMPANY
     static const ::rtl::OUString s_sgivenname                = ::rtl::OUString::createFromAscii("givenname"); // USER_OPT_FIRSTNAME
     static const ::rtl::OUString s_ssn                       = ::rtl::OUString::createFromAscii("sn"); // USER_OPT_LASTNAME
diff --git a/unotools/inc/unotools/viewoptions.hxx b/unotools/inc/unotools/viewoptions.hxx
index 6fa60ea3fb05..5058e2ec6324 100644
--- a/unotools/inc/unotools/viewoptions.hxx
+++ b/unotools/inc/unotools/viewoptions.hxx
@@ -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
@@ -28,7 +28,7 @@
 #define INCLUDED_unotools_VIEWOPTIONS_HXX
 
 //_________________________________________________________________________________________________________________
-//  includes
+//	includes
 //_________________________________________________________________________________________________________________
 
 #include "unotools/unotoolsdllapi.h"
@@ -42,29 +42,29 @@
 #include <unotools/options.hxx>
 
 //_________________________________________________________________________________________________________________
-//  forward declarations
+//	forward declarations
 //_________________________________________________________________________________________________________________
 
 class SvtViewOptionsBase_Impl;
 
 //_________________________________________________________________________________________________________________
-//  declarations
+//	declarations
 //_________________________________________________________________________________________________________________
 
 /*-************************************************************************************************************//**
-    @descr          Use these enum values to specify right list in configuration in which your view data are saved.
+    @descr			Use these enum values to specify right list in configuration in which your view data are saved.
 *//*-*************************************************************************************************************/
 
 enum EViewType
 {
-    E_DIALOG    =   0,
-    E_TABDIALOG =   1,
-    E_TABPAGE   =   2,
-    E_WINDOW    =   3
+    E_DIALOG	=	0,
+    E_TABDIALOG	=	1,
+    E_TABPAGE	=	2,
+    E_WINDOW	=	3
 };
 
 /*-************************************************************************************************************//**
-    @short          collect informations about view features
+    @short			collect informations about view features
     @descr          We support different basetypes of views like dialogs, tab-dialogs, tab-pages and normal windows.
                     You must specify your basetype by using right enum value and must give us a valid name for your
                     subkey in registry! We support some fix features for some bastypes and user data as string for all!
@@ -88,35 +88,35 @@ enum EViewType
 
                     structure of configuration:
 
-                        org.openoffice.Office.Views [package]
-                                                    /Dialogs    [set]
-                                                                /Dialog_FileOpen            [DialogType]
-                                                                /Dialog_ImportGraphics      [DialogType]
+                        org.openoffice.Office.Views	[package]
+                                                    /Dialogs	[set]
+                                                                /Dialog_FileOpen			[DialogType]
+                                                                /Dialog_ImportGraphics		[DialogType]
                                                                 ...
-                                                                /Dialog_<YourName>          [DialogType]
+                                                                /Dialog_<YourName>			[DialogType]
 
-                                                    /TabDialogs [set]
-                                                                /TabDialog_001              [TabDialogType]
-                                                                /TabDialog_Blubber          [TabDialogType]
+                                                    /TabDialogs	[set]
+                                                                /TabDialog_001				[TabDialogType]
+                                                                /TabDialog_Blubber			[TabDialogType]
                                                                 ...
-                                                                /TabDialog_<YourName>       [TabDialogType]
+                                                                /TabDialog_<YourName>		[TabDialogType]
 
-                                                    /TabPages   [set]
-                                                                /TabPage_XXX                [TabPageType]
-                                                                /TabPage_Date               [TabPageType]
+                                                    /TabPages	[set]
+                                                                /TabPage_XXX				[TabPageType]
+                                                                /TabPage_Date				[TabPageType]
                                                                 ...
-                                                                /TabPage_<YourName>         [TabPageType]
+                                                                /TabPage_<YourName>			[TabPageType]
 
-                                                    /Windows    [set]
-                                                                /Window_User                [WindowType]
-                                                                /Window_Options             [WindowType]
+                                                    /Windows	[set]
+                                                                /Window_User				[WindowType]
+                                                                /Window_Options				[WindowType]
                                                                 ...
-                                                                /Window_<YourName>          [WindowType]
+                                                                /Window_<YourName>			[WindowType]
 
-    @implements     -
-    @base           -
+    @implements		-
+    @base			-
 
-    @devstatus      ready to use
+    @devstatus		ready to use
 *//*-*************************************************************************************************************/
 
 class UNOTOOLS_DLLPUBLIC SvtViewOptions: public utl::detail::Options
@@ -144,28 +144,28 @@ class UNOTOOLS_DLLPUBLIC SvtViewOptions: public utl::detail::Options
     */
 
     //-------------------------------------------------------------------------------------------------------------
-    //  public methods
+    //	public methods
     //-------------------------------------------------------------------------------------------------------------
 
     public:
 
         //---------------------------------------------------------------------------------------------------------
-        //  constructor / destructor
+        //	constructor / destructor
         //---------------------------------------------------------------------------------------------------------
 
         /*-****************************************************************************************************//**
-            @short      standard constructor and destructor
-            @descr      This will de-/initialize an instance with default values.
+            @short		standard constructor and destructor
+            @descr		This will de-/initialize an instance with default values.
                         You must give us the basic type of your view and a name which specify right entry
                         in dynamical configuration list. If entry not exist, we create a new one!
 
-            @seealso    enum EViewType
+            @seealso	enum EViewType
 
-            @param      "eType" specify type of your view and is used to use right data container!
-            @param      "sViewName" specify the name of your view and is the key name in data list too.
-            @return     -
+            @param		"eType" specify type of your view and is used to use right data container!
+            @param		"sViewName" specify the name of your view and is the key name in data list too.
+            @return		-
 
-            @onerror    An assertion is thrown in debug version. Otherwise we do nothing!
+            @onerror	An assertion is thrown in debug version. Otherwise we do nothing!
         *//*-*****************************************************************************************************/
 
          SvtViewOptions(       EViewType        eType     ,
@@ -179,7 +179,7 @@ class UNOTOOLS_DLLPUBLIC SvtViewOptions: public utl::detail::Options
             @seealso    -
 
             @param      -
-            @return     -
+            @return		-
 
             @onerror    -
         *//*-*****************************************************************************************************/
@@ -188,35 +188,35 @@ class UNOTOOLS_DLLPUBLIC SvtViewOptions: public utl::detail::Options
         static void ReleaseOptions();
 
         //---------------------------------------------------------------------------------------------------------
-        //  interface
+        //	interface
         //---------------------------------------------------------------------------------------------------------
 
         /*-****************************************************************************************************//**
-            @short      use it to get information about existing entries in configuration
-            @descr      The methods to set/get the position or size will create a new entry automaticly if
+            @short		use it to get information about existing entries in configuration
+            @descr		The methods to set/get the position or size will create a new entry automaticly if
                         it not already exist and work with default values!
                         If this a problem for you - you MUST call these method before and
                         you must make up your own mind about that.
 
             @seealso    -
 
-            @onerror    No error should occure.
+            @onerror	No error should occure.
         *//*-*****************************************************************************************************/
 
         sal_Bool Exists() const;
 
         /*-****************************************************************************************************//**
-            @short      use it to delete an entry of dynamic view set
-            @descr      You can use this method to delete anexisting node in configuration.
+            @short		use it to delete an entry of dynamic view set
+            @descr		You can use this method to delete anexisting node in configuration.
                         But if you call a Set- or Get- method again on this instance
                         the item is created again! If you do nothing after this call
                         your view will die relay in configuration ...
 
-            @seealso    method Exist()
+            @seealso	method Exist()
 
-            @return     True if delete OK, False otherwise.
+            @return		True if delete OK, False otherwise.
 
-            @onerror    We return sal_False.
+            @onerror	We return sal_False.
         *//*-*****************************************************************************************************/
 
         sal_Bool Delete();
@@ -236,41 +236,41 @@ class UNOTOOLS_DLLPUBLIC SvtViewOptions: public utl::detail::Options
         void            SetWindowState( const ::rtl::OUString& sState );
 
         /*-****************************************************************************************************//**
-            @short      use it to set/get the page number which was the last active one
-            @descr      It's only supported for:    - tab-dialogs
+            @short		use it to set/get the page number which was the last active one
+            @descr		It's only supported for:	- tab-dialogs
                         If you call it for other ones you will get an assertion in debug version.
                         In a product version we do nothing!
 
-            @seealso    -
+            @seealso	-
 
-            @onerror    An assertion is thrown in debug version. Otherwise we do nothing!
+            @onerror	An assertion is thrown in debug version. Otherwise we do nothing!
         *//*-*****************************************************************************************************/
 
         sal_Int32 GetPageID(               ) const;
         void      SetPageID( sal_Int32 nID );
 
         /*-****************************************************************************************************//**
-            @short      use it to set/get the visual state of a window
-            @descr      It's only supported for:    - windows
+            @short		use it to set/get the visual state of a window
+            @descr		It's only supported for:	- windows
                         If you call it for other ones you will get an assertion in debug version.
                         In a product version we do nothing!
 
-            @seealso    -
+            @seealso	-
 
-            @onerror    An assertion is thrown in debug version. Otherwise we do nothing!
+            @onerror	An assertion is thrown in debug version. Otherwise we do nothing!
         *//*-*****************************************************************************************************/
 
         sal_Bool IsVisible (                 ) const;
         void     SetVisible( sal_Bool bState );
 
         /*-****************************************************************************************************//**
-            @short      use it to set/get the extended user data (consisting of a set of named scalar values)
-            @descr      It's supported for ALL types!
+            @short		use it to set/get the extended user data (consisting of a set of named scalar values)
+            @descr		It's supported for ALL types!
                         Every view can handle its own user defined data set.
 
             @seealso    -
 
-            @onerror    In the non-product version, an assertion is made. In a product version, errors are silently ignored.
+            @onerror	In the non-product version, an assertion is made. In a product version, errors are silently ignored.
         *//*-*****************************************************************************************************/
 /*
 #ifdef TF_OLDVIEW
@@ -288,7 +288,7 @@ class UNOTOOLS_DLLPUBLIC SvtViewOptions: public utl::detail::Options
 
             @seealso    -
 
-            @onerror    In the non-product version, an assertion is made. In a product version, errors are silently ignored.
+            @onerror	In the non-product version, an assertion is made. In a product version, errors are silently ignored.
         *//*-*****************************************************************************************************/
 
         ::com::sun::star::uno::Any GetUserItem( const ::rtl::OUString&            sName  ) const;
@@ -296,37 +296,37 @@ class UNOTOOLS_DLLPUBLIC SvtViewOptions: public utl::detail::Options
                                                 const ::com::sun::star::uno::Any& aValue );
 
     //-------------------------------------------------------------------------------------------------------------
-    //  private methods
+    //	private methods
     //-------------------------------------------------------------------------------------------------------------
 
     private:
 
         /*-****************************************************************************************************//**
-            @short      return a reference to a static mutex
-            @descr      These class is threadsafe.
+            @short		return a reference to a static mutex
+            @descr		These class is threadsafe.
                         We create a static mutex only for one time and use it to protect our refcount and container
                         member!
 
-            @seealso    -
+            @seealso	-
 
-            @param      -
-            @return     A reference to a static mutex member.
+            @param		-
+            @return		A reference to a static mutex member.
 
-            @onerror    -
+            @onerror	-
         *//*-*****************************************************************************************************/
 
         UNOTOOLS_DLLPRIVATE static ::osl::Mutex& GetOwnStaticMutex();
 
     //-------------------------------------------------------------------------------------------------------------
-    //  private member
+    //	private member
     //-------------------------------------------------------------------------------------------------------------
 
     private:
 
         /// specify which list of views in configuration is used! This can't be a static value!!!
         /// ... because we need this value to work with right static data container.
-        EViewType           m_eViewType     ;
-        ::rtl::OUString     m_sViewName     ;
+        EViewType			m_eViewType		;
+        ::rtl::OUString		m_sViewName		;
 
         /// - impl. data container as dynamic pointer for smaller memory requirements!
         /// - internal ref count mechanism
@@ -348,6 +348,6 @@ class UNOTOOLS_DLLPUBLIC SvtViewOptions: public utl::detail::Options
         static SvtViewOptionsBase_Impl*    m_pDataContainer_Windows    ;   /// hold data for all windows
         static sal_Int32                   m_nRefCount_Windows         ;
 
-};      // class SvtViewOptions
+};		// class SvtViewOptions
 
 #endif  // #ifndef INCLUDED_unotools_VIEWOPTIONS_HXX
diff --git a/unotools/inc/unotools/workingsetoptions.hxx b/unotools/inc/unotools/workingsetoptions.hxx
index 04a4a0bea6cb..2072adc6e1cd 100644
--- a/unotools/inc/unotools/workingsetoptions.hxx
+++ b/unotools/inc/unotools/workingsetoptions.hxx
@@ -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
@@ -28,7 +28,7 @@
 #define INCLUDED_unotools_WORKINGSETOPTIONS_HXX
 
 //_________________________________________________________________________________________________________________
-//  includes
+//	includes
 //_________________________________________________________________________________________________________________
 
 #include <sal/types.h>
@@ -38,12 +38,12 @@
 #include <unotools/options.hxx>
 
 //_________________________________________________________________________________________________________________
-//  forward declarations
+//	forward declarations
 //_________________________________________________________________________________________________________________
 
 /*-************************************************************************************************************//**
-    @short          forward declaration to our private date container implementation
-    @descr          We use these class as internal member to support small memory requirements.
+    @short			forward declaration to our private date container implementation
+    @descr			We use these class as internal member to support small memory requirements.
                     You can create the container if it is neccessary. The class which use these mechanism
                     is faster and smaller then a complete implementation!
 *//*-*************************************************************************************************************/
@@ -51,91 +51,91 @@
 class SvtWorkingSetOptions_Impl;
 
 //_________________________________________________________________________________________________________________
-//  declarations
+//	declarations
 //_________________________________________________________________________________________________________________
 
 /*-************************************************************************************************************//**
-    @short          collect informations about security features
+    @short			collect informations about security features
     @descr          -
 
-    @implements     -
-    @base           -
+    @implements		-
+    @base			-
 
-    @devstatus      ready to use
+    @devstatus		ready to use
 *//*-*************************************************************************************************************/
 
 class SvtWorkingSetOptions: public utl::detail::Options
 {
     //-------------------------------------------------------------------------------------------------------------
-    //  public methods
+    //	public methods
     //-------------------------------------------------------------------------------------------------------------
 
     public:
 
         //---------------------------------------------------------------------------------------------------------
-        //  constructor / destructor
+        //	constructor / destructor
         //---------------------------------------------------------------------------------------------------------
 
         /*-****************************************************************************************************//**
-            @short      standard constructor and destructor
-            @descr      This will initialize an instance with default values.
+            @short		standard constructor and destructor
+            @descr		This will initialize an instance with default values.
                         We implement these class with a refcount mechanism! Every instance of this class increase it
                         at create and decrease it at delete time - but all instances use the same data container!
                         He is implemented as a static member ...
 
-            @seealso    member m_nRefCount
-            @seealso    member m_pDataContainer
+            @seealso	member m_nRefCount
+            @seealso	member m_pDataContainer
 
-            @param      -
-            @return     -
+            @param		-
+            @return		-
 
-            @onerror    -
+            @onerror	-
         *//*-*****************************************************************************************************/
 
          SvtWorkingSetOptions();
         virtual ~SvtWorkingSetOptions();
 
         //---------------------------------------------------------------------------------------------------------
-        //  interface
+        //	interface
         //---------------------------------------------------------------------------------------------------------
 
         /*-****************************************************************************************************//**
-            @short      interface methods to get and set value of config key "org.openoffice.Office.Common/Security/Scripting/SecureURL"
-            @descr      These value defines the editing view for documents and windows, which have to be restored
+            @short		interface methods to get and set value of config key "org.openoffice.Office.Common/Security/Scripting/SecureURL"
+            @descr		These value defines the editing view for documents and windows, which have to be restored
                         when restarting StarOffice. The list gets filled, if Save/WorkingSet = true.
 
-            @seealso    -
+            @seealso	-
 
-            @param      "seqWindowList", new values to set it in configuration.
-            @return     The values which represent current state of internal variable.
+            @param		"seqWindowList", new values to set it in configuration.
+            @return		The values which represent current state of internal variable.
 
-            @onerror    No error should occurre!
+            @onerror	No error should occurre!
         *//*-*****************************************************************************************************/
 
-        ::com::sun::star::uno::Sequence< ::rtl::OUString >  GetWindowList(                                                                          ) const ;
-        void                                                SetWindowList( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& seqWindowList  )       ;
+        ::com::sun::star::uno::Sequence< ::rtl::OUString >	GetWindowList(																			) const	;
+        void												SetWindowList( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& seqWindowList	)		;
 
     //-------------------------------------------------------------------------------------------------------------
-    //  private methods
+    //	private methods
     //-------------------------------------------------------------------------------------------------------------
 
         /*-****************************************************************************************************//**
-            @short      return a reference to a static mutex
-            @descr      These class use his own static mutex to be threadsafe.
+            @short		return a reference to a static mutex
+            @descr		These class use his own static mutex to be threadsafe.
                         We create a static mutex only for one ime and use at different times.
 
-            @seealso    -
+            @seealso	-
 
-            @param      -
-            @return     A reference to a static mutex member.
+            @param		-
+            @return		A reference to a static mutex member.
 
-            @onerror    -
+            @onerror	-
         *//*-*****************************************************************************************************/
 
         static ::osl::Mutex& GetOwnStaticMutex();
 
     //-------------------------------------------------------------------------------------------------------------
-    //  private member
+    //	private member
     //-------------------------------------------------------------------------------------------------------------
 
     private:
@@ -148,9 +148,9 @@ class SvtWorkingSetOptions: public utl::detail::Options
             Do it in your source only.
          */
 
-        static SvtWorkingSetOptions_Impl*   m_pDataContainer    ;   /// impl. data container as dynamic pointer for smaller memory requirements!
-        static sal_Int32                    m_nRefCount         ;   /// internal ref count mechanism
+        static SvtWorkingSetOptions_Impl*	m_pDataContainer	;	/// impl. data container as dynamic pointer for smaller memory requirements!
+        static sal_Int32					m_nRefCount			;	/// internal ref count mechanism
 
-};      // class SvtWorkingSetOptions
+};		// class SvtWorkingSetOptions
 
 #endif  // #ifndef INCLUDED_unotools_WORKINGSETOPTIONS_HXX
diff --git a/unotools/inc/unotools/xmlaccelcfg.hxx b/unotools/inc/unotools/xmlaccelcfg.hxx
index db561660d3c2..66c4e3738066 100644
--- a/unotools/inc/unotools/xmlaccelcfg.hxx
+++ b/unotools/inc/unotools/xmlaccelcfg.hxx
@@ -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,10 +79,10 @@ class OReadAccelatorDocumentHandler : public ::com::sun::star::xml::sax::XDocume
     private:
         ::rtl::OUString getErrorLineString();
 
-        int                     m_nElementDepth;
-        sal_Bool                m_bAcceleratorMode;
-        sal_Bool                m_bItemCloseExpected;
-        ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XLocator >    m_xLocator;
+        int						m_nElementDepth;
+        sal_Bool				m_bAcceleratorMode;
+        sal_Bool				m_bItemCloseExpected;
+        ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XLocator >	m_xLocator;
         SvtAcceleratorItemList& m_aReadAcceleratorList;
 };
 
@@ -102,8 +102,8 @@ class OWriteAccelatorDocumentHandler
 
         ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XDocumentHandler > m_xWriteDocumentHandler;
         ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > m_xEmptyList;
-        ::rtl::OUString                                         m_aAttributeType;
-        const SvtAcceleratorItemList&                           m_aWriteAcceleratorList;
+        ::rtl::OUString											m_aAttributeType;
+        const SvtAcceleratorItemList&							m_aWriteAcceleratorList;
 };
 
 #endif // INCLUDED_unotools_XMLACCELCFG_HXX
diff --git a/unotools/qa/complex/tempfile/TempFileTest.java b/unotools/qa/complex/tempfile/TempFileTest.java
index fa50bdeee043..581d7ae97b15 100644
--- a/unotools/qa/complex/tempfile/TempFileTest.java
+++ b/unotools/qa/complex/tempfile/TempFileTest.java
@@ -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
diff --git a/unotools/qa/complex/tempfile/TempFileUnitTest.java b/unotools/qa/complex/tempfile/TempFileUnitTest.java
index 5cd0b7292105..bdecf39c0602 100644
--- a/unotools/qa/complex/tempfile/TempFileUnitTest.java
+++ b/unotools/qa/complex/tempfile/TempFileUnitTest.java
@@ -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
@@ -37,17 +37,17 @@ import com.sun.star.uno.UnoRuntime;
 public class TempFileUnitTest extends ComplexTestCase {
     private XMultiServiceFactory m_xMSF = null;
     private XSimpleFileAccess m_xSFA = null;
-
+    
     public String[] getTestMethodNames() {
         return new String[] {
             "ExecuteTest01",
             "ExecuteTest02"};
     }
-
+    
     public String getTestObjectName() {
         return "TempFileUnitTest";
     }
-
+    
     public void before() {
         m_xMSF = (XMultiServiceFactory)param.getMSF();
         if ( m_xMSF == null ) {
@@ -67,17 +67,17 @@ public class TempFileUnitTest extends ComplexTestCase {
             failed ( "Cannot get simple file access!" );
         }
     }
-
+    
     public void after() {
         m_xMSF = null;
         m_xSFA = null;
     }
-
+    
     public void ExecuteTest01() {
         TempFileTest aTest = new Test01( m_xMSF, m_xSFA, log );
         assure( "Test01 failed!", aTest.test() );
     }
-
+    
     public void ExecuteTest02() {
         TempFileTest aTest = new Test02( m_xMSF, m_xSFA, log );
         assure( "Test02 failed!", aTest.test() );
diff --git a/unotools/qa/complex/tempfile/Test01.java b/unotools/qa/complex/tempfile/Test01.java
index dbf3d6c15de2..ba8da9d0d189 100644
--- a/unotools/qa/complex/tempfile/Test01.java
+++ b/unotools/qa/complex/tempfile/Test01.java
@@ -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
@@ -41,13 +41,13 @@ public class Test01 implements TempFileTest {
     XMultiServiceFactory m_xMSF = null;
     XSimpleFileAccess m_xSFA = null;
     TestHelper m_aTestHelper = null;
-
+    
     public Test01(XMultiServiceFactory xMSF, XSimpleFileAccess xSFA, LogWriter aLogWriter) {
         m_xMSF = xMSF;
         m_xSFA = xSFA;
         m_aTestHelper = new TestHelper(aLogWriter, "Test01: ");
     }
-
+    
     public boolean test() {
         XTempFile xTempFile = null;
         XTruncate xTruncate = null;
@@ -65,19 +65,19 @@ public class Test01 implements TempFileTest {
             m_aTestHelper.Error( "Cannot create TempFile. exception: " + e );
             return false;
         }
-
+        
         //retrieve the tempfile URL
         if ( xTempFile == null ) {
             m_aTestHelper.Error( "Cannot get XTempFile interface." );
             return false;
         }
-
+        
         try {
             //compare the file name with the name in the URL.
             sFileURL = m_aTestHelper.GetTempFileURL( xTempFile );
             sFileName = m_aTestHelper.GetTempFileName( xTempFile );
             m_aTestHelper.CompareFileNameAndURL( sFileName, sFileURL );
-
+            
             //write to the stream using the service.
             byte pBytesIn[] = new byte[9];
             byte pBytesOut1[][] = new byte [1][9];
@@ -85,7 +85,7 @@ public class Test01 implements TempFileTest {
             Random oRandom = new Random();
             oRandom.nextBytes( pBytesIn );
             m_aTestHelper.WriteBytesWithStream( pBytesIn, xTempFile );
-
+            
             //check the result by reading from the service.
             xTempFile.seek(0);
             m_aTestHelper.ReadBytesWithStream( pBytesOut1, pBytesIn.length + 1, xTempFile );
@@ -94,7 +94,7 @@ public class Test01 implements TempFileTest {
                     m_aTestHelper.Error( "Tempfile outputs false data!" );
                 }
             }
-
+            
             //check the result by reading from the file directly.
             m_aTestHelper.ReadDirectlyFromTempFile( pBytesOut2, pBytesIn.length + 1, m_xSFA, sFileURL );
             for ( int i = 0; i < pBytesIn.length; i++ ) {
@@ -102,7 +102,7 @@ public class Test01 implements TempFileTest {
                     m_aTestHelper.Error( "Tempfile contains false data!" );
                 }
             }
-
+            
             //close the object(by closing input and output), check that the file was removed.
             xTempFile.setRemoveFile( false );
             m_aTestHelper.CloseTempFile( xTempFile );
diff --git a/unotools/qa/complex/tempfile/Test02.java b/unotools/qa/complex/tempfile/Test02.java
index 18ca4de2e04b..b30231ad2fdb 100644
--- a/unotools/qa/complex/tempfile/Test02.java
+++ b/unotools/qa/complex/tempfile/Test02.java
@@ -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
@@ -37,17 +37,17 @@ import java.util.Random;
 import share.LogWriter;
 
 public class Test02 implements TempFileTest {
-
+    
     XMultiServiceFactory m_xMSF;
     XSimpleFileAccess m_xSFA;
     TestHelper m_aTestHelper;
-
+    
     public Test02(XMultiServiceFactory xMSF, XSimpleFileAccess xSFA, LogWriter aLogWriter) {
         m_xMSF = xMSF;
         m_xSFA = xSFA;
         m_aTestHelper = new TestHelper(aLogWriter, "Test02: ");
     }
-
+    
     public boolean test() {
         Object oTempFile = null;
         XTempFile xTempFile = null;
@@ -73,16 +73,16 @@ public class Test02 implements TempFileTest {
             Random oRandom = new Random();
             oRandom.nextBytes( pBytesIn );
             m_aTestHelper.WriteBytesWithStream( pBytesIn, xTempFile );
-
+            
             //get the URL.
             sFileURL = m_aTestHelper.GetTempFileURL( xTempFile );
-
+            
             //let the service not to remove the URL.
             m_aTestHelper.SetTempFileRemove( xTempFile, false );
-
+            
             //close the tempfile by closing input and output.
             m_aTestHelper.CloseTempFile( xTempFile );
-
+            
             //check that the file is still available.
             //xTempFile.seek(0);
             m_aTestHelper.ReadDirectlyFromTempFile( pBytesOut, pBytesIn.length + 1, m_xSFA, sFileURL );
diff --git a/unotools/qa/complex/tempfile/TestHelper.java b/unotools/qa/complex/tempfile/TestHelper.java
index 6edc2c362fa8..09d524b51005 100644
--- a/unotools/qa/complex/tempfile/TestHelper.java
+++ b/unotools/qa/complex/tempfile/TestHelper.java
@@ -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
@@ -39,7 +39,7 @@ import share.LogWriter;
 public class TestHelper {
     LogWriter m_aLogWriter;
     String m_sTestPrefix;
-
+    
     public TestHelper( LogWriter aLogWriter, String sTestPrefix ) {
         m_aLogWriter = aLogWriter;
         m_sTestPrefix = sTestPrefix;
@@ -51,7 +51,7 @@ public class TestHelper {
             Error( "Cannot set TempFileRemove. exception: " + e );
         }
     }
-
+    
     public boolean GetTempFileRemove ( XTempFile xTempFile ) {
         boolean b = false;
         try {
@@ -61,7 +61,7 @@ public class TestHelper {
         }
         return b;
     }
-
+    
     public String GetTempFileURL ( XTempFile xTempFile ) {
         String sTempFileURL = null;
         try {
@@ -74,7 +74,7 @@ public class TestHelper {
         }
         return sTempFileURL;
     }
-
+    
     public String GetTempFileName( XTempFile xTempFile ) {
         String sTempFileName = null;
         try {
@@ -87,7 +87,7 @@ public class TestHelper {
         }
         return sTempFileName;
     }
-
+    
     public boolean CompareFileNameAndURL ( String sTempFileName, String sTempFileURL ) {
         boolean bRet = false;
         try {
@@ -100,7 +100,7 @@ public class TestHelper {
         }
         return bRet;
     }
-
+    
     public void WriteBytesWithStream( byte [] pBytes, XTempFile xTempFile ) {
         try {
             XOutputStream xOutTemp = xTempFile.getOutputStream();
@@ -114,7 +114,7 @@ public class TestHelper {
             Error( "Cannot write to stream. exception: " + e );
         }
     }
-
+    
     public void ReadBytesWithStream( byte [][] pBytes, int nBytes, XTempFile xTempFile ) {
         try {
             XInputStream xInTemp = xTempFile.getInputStream();
@@ -150,7 +150,7 @@ public class TestHelper {
                     "ReadDirectlyFromTempFile(). exception: " + e );
         }
     }
-
+    
     public void CloseTempFile( XTempFile xTempFile ) {
         XOutputStream xOutTemp = null;
         XInputStream xInTemp = null;
@@ -182,7 +182,7 @@ public class TestHelper {
             Error( "Cannot close input stream. exception:" + e );
         }
     }
-
+    
     public void KillTempFile ( String sTempFileURL, XSimpleFileAccess xSFA ) {
         try {
             if ( sTempFileURL != null ) {
@@ -197,7 +197,7 @@ public class TestHelper {
                     "KillTempFile(): " + e);
         }
     }
-
+    
     public boolean IfTempFileExists( XSimpleFileAccess xSFA, String sTempFileURL ) {
         boolean bRet = false;
         try {
@@ -206,7 +206,7 @@ public class TestHelper {
                     bRet = xSFA.exists( sTempFileURL );
                     Message ( "Tempfile " + ( bRet ? "still " : "no longer " ) + "exists." );
                 }
-            }
+            } 
         }
         catch( Exception e ) {
             Error( "Exception caught in TestHelper." +
@@ -214,11 +214,11 @@ public class TestHelper {
         }
         return bRet;
     }
-
+    
     public void Error( String sError ) {
         m_aLogWriter.println( m_sTestPrefix + "Error: " + sError );
     }
-
+    
     public void Message( String sMessage ) {
         m_aLogWriter.println( m_sTestPrefix + sMessage );
     }
diff --git a/unotools/source/accessibility/accessiblerelationsethelper.cxx b/unotools/source/accessibility/accessiblerelationsethelper.cxx
index 60e807ee9320..dc05cadba1fb 100644
--- a/unotools/source/accessibility/accessiblerelationsethelper.cxx
+++ b/unotools/source/accessibility/accessiblerelationsethelper.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
@@ -34,10 +34,10 @@
 #include <vector>
 #include <comphelper/sequence.hxx>
 
-using namespace ::utl;
-using namespace ::rtl;
-using namespace ::com::sun::star;
-using namespace ::com::sun::star::accessibility;
+using namespace	::utl;
+using namespace	::rtl;
+using namespace	::com::sun::star;
+using namespace	::com::sun::star::accessibility;
 
 class AccessibleRelationSetHelperImpl
 {
diff --git a/unotools/source/accessibility/accessiblestatesethelper.cxx b/unotools/source/accessibility/accessiblestatesethelper.cxx
index be7bf3fbeb28..b54c5166cf06 100644
--- a/unotools/source/accessibility/accessiblestatesethelper.cxx
+++ b/unotools/source/accessibility/accessiblestatesethelper.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
@@ -41,10 +41,10 @@
 // it has the size of 64 because I use a uInt64
 #define BITFIELDSIZE 64
 
-using namespace ::utl;
-using namespace ::rtl;
-using namespace ::com::sun::star;
-using namespace ::com::sun::star::accessibility;
+using namespace	::utl;
+using namespace	::rtl;
+using namespace	::com::sun::star;
+using namespace	::com::sun::star::accessibility;
 
 class AccessibleStateSetHelperImpl
 {
@@ -68,7 +68,7 @@ public:
                         AccessibleStateSetHelperImpl* pNewStates)
         throw (uno::RuntimeException);
 
-    inline void AddStates( const sal_Int64 _nStates ) SAL_THROW( ( ) );
+    inline void	AddStates( const sal_Int64 _nStates ) SAL_THROW( ( ) );
 
 private:
 #if 0
diff --git a/unotools/source/config/accelcfg.cxx b/unotools/source/config/accelcfg.cxx
index fc0e6108138b..9e2602bd88cd 100644
--- a/unotools/source/config/accelcfg.cxx
+++ b/unotools/source/config/accelcfg.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
@@ -68,14 +68,14 @@ class SvtAcceleratorConfig_Impl
 public:
 
     SvtAcceleratorItemList aList;
-    bool            bModified;
+    bool			bModified;
 
                     SvtAcceleratorConfig_Impl()
                         : bModified( FALSE )
                     {}
 
                     SvtAcceleratorConfig_Impl( Reference< XInputStream >& xInputStream );
-    bool            Commit( Reference< XOutputStream >& xOutputStream );
+    bool			Commit( Reference< XOutputStream >& xOutputStream );
 };
 
 // -----------------------------------------------------------------------
diff --git a/unotools/source/config/bootstrap.cxx b/unotools/source/config/bootstrap.cxx
index b2e1bf1739f8..cb5a49e7d5c1 100644
--- a/unotools/source/config/bootstrap.cxx
+++ b/unotools/source/config/bootstrap.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
@@ -50,26 +50,26 @@
 // ---------------------------------------------------------------------------------------
 #define BOOTSTRAP_DATA_NAME                 SAL_CONFIGFILE("bootstrap")
 
-#define BOOTSTRAP_ITEM_PRODUCT_KEY          "ProductKey"
+#define BOOTSTRAP_ITEM_PRODUCT_KEY			"ProductKey"
 #define BOOTSTRAP_ITEM_PRODUCT_SOURCE       "ProductSource"
-#define BOOTSTRAP_ITEM_VERSIONFILE          "Location"
-#define BOOTSTRAP_ITEM_BUILDID              "buildid"
+#define BOOTSTRAP_ITEM_VERSIONFILE			"Location"
+#define BOOTSTRAP_ITEM_BUILDID				"buildid"
 
-#define BOOTSTRAP_ITEM_BASEINSTALLATION     "BaseInstallation"
-#define BOOTSTRAP_ITEM_USERINSTALLATION     "UserInstallation"
+#define BOOTSTRAP_ITEM_BASEINSTALLATION		"BaseInstallation"
+#define BOOTSTRAP_ITEM_USERINSTALLATION		"UserInstallation"
 
-#define BOOTSTRAP_ITEM_SHAREDIR             "SharedDataDir"
-#define BOOTSTRAP_ITEM_USERDIR              "UserDataDir"
+#define BOOTSTRAP_ITEM_SHAREDIR		        "SharedDataDir"
+#define BOOTSTRAP_ITEM_USERDIR		        "UserDataDir"
 
-#define BOOTSTRAP_DEFAULT_BASEINSTALL       "$SYSBINDIR/.."
+#define BOOTSTRAP_DEFAULT_BASEINSTALL	    "$SYSBINDIR/.."
 
-#define BOOTSTRAP_DIRNAME_SHAREDIR          "share"
-#define BOOTSTRAP_DIRNAME_USERDIR           "user"
+#define BOOTSTRAP_DIRNAME_SHAREDIR		    "share"
+#define BOOTSTRAP_DIRNAME_USERDIR		    "user"
 
-#define VERSIONFILE_SECTION                 "Versions"
+#define VERSIONFILE_SECTION         		"Versions"
 
-#define SETUP_DATA_NAME                     SAL_CONFIGFILE("setup")
-#define SETUP_ITEM_ALLUSERS                 "ALLUSERS"
+#define SETUP_DATA_NAME                 	SAL_CONFIGFILE("setup")
+#define SETUP_ITEM_ALLUSERS         		"ALLUSERS"
 // ---------------------------------------------------------------------------------------
 typedef char const * AsciiString;
 // ---------------------------------------------------------------------------------------
@@ -195,23 +195,23 @@ PathStatus implCheckStatusOfURL(OUString const& _sURL, osl::DirectoryItem& aDirI
     {
         switch( DirectoryItem::get(_sURL, aDirItem) )
         {
-        case DirectoryItem::E_None:         // Success
+        case DirectoryItem::E_None:		    // Success
             eStatus = Bootstrap::PATH_EXISTS;
             break;
 
-        case DirectoryItem::E_NOENT:        // No such file or directory<br>
+        case DirectoryItem::E_NOENT:		// No such file or directory<br>
             eStatus = Bootstrap::PATH_VALID;
             break;
 
-        case DirectoryItem::E_INVAL:        // the format of the parameters was not valid<br>
-        case DirectoryItem::E_NAMETOOLONG:  // File name too long<br>
-        case DirectoryItem::E_NOTDIR:       // A component of the path prefix of path is not a directory<p>
+        case DirectoryItem::E_INVAL:		// the format of the parameters was not valid<br>
+        case DirectoryItem::E_NAMETOOLONG:	// File name too long<br>
+        case DirectoryItem::E_NOTDIR:		// A component of the path prefix of path is not a directory<p>
             eStatus = Bootstrap::DATA_INVALID;
             break;
 
         // how to handle these ?
-        case DirectoryItem::E_LOOP:         // Too many symbolic links encountered<br>
-        case DirectoryItem::E_ACCES:        // permission denied<br>
+        case DirectoryItem::E_LOOP:			// Too many symbolic links encountered<br>
+        case DirectoryItem::E_ACCES:		// permission denied<br>
         // any other error - what to do ?
         default:
             eStatus = Bootstrap::DATA_UNKNOWN;
diff --git a/unotools/source/config/cacheoptions.cxx b/unotools/source/config/cacheoptions.cxx
index 2b2b612274ac..af2565f9b6ab 100644
--- a/unotools/source/config/cacheoptions.cxx
+++ b/unotools/source/config/cacheoptions.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
@@ -31,7 +31,7 @@
 #endif
 
 //_________________________________________________________________________________________________________________
-//  includes
+//	includes
 //_________________________________________________________________________________________________________________
 
 #include <unotools/cacheoptions.hxx>
@@ -42,7 +42,7 @@
 #include <com/sun/star/uno/Sequence.hxx>
 
 //_________________________________________________________________________________________________________________
-//  namespaces
+//	namespaces
 //_________________________________________________________________________________________________________________
 
 using namespace ::utl;
@@ -51,66 +51,66 @@ using namespace ::osl;
 using namespace ::com::sun::star::uno;
 
 //_________________________________________________________________________________________________________________
-//  const
+//	const
 //_________________________________________________________________________________________________________________
 
-#define ROOTNODE_START                      OUString(RTL_CONSTASCII_USTRINGPARAM("Office.Common/Cache"  ))
-#define DEFAULT_WRITEROLE                   20
-#define DEFAULT_DRAWINGOLE                  20
-#define DEFAULT_GRFMGR_TOTALSIZE            10000000
-#define DEFAULT_GRFMGR_OBJECTSIZE           2400000
-#define DEFAULT_GRFMGR_OBJECTRELEASE        600
-
-#define PROPERTYNAME_WRITEROLE              OUString(RTL_CONSTASCII_USTRINGPARAM("Writer/OLE_Objects"))
-#define PROPERTYNAME_DRAWINGOLE             OUString(RTL_CONSTASCII_USTRINGPARAM("DrawingEngine/OLE_Objects"))
-#define PROPERTYNAME_GRFMGR_TOTALSIZE       OUString(RTL_CONSTASCII_USTRINGPARAM("GraphicManager/TotalCacheSize"))
-#define PROPERTYNAME_GRFMGR_OBJECTSIZE      OUString(RTL_CONSTASCII_USTRINGPARAM("GraphicManager/ObjectCacheSize"))
+#define	ROOTNODE_START			   			OUString(RTL_CONSTASCII_USTRINGPARAM("Office.Common/Cache"	))
+#define	DEFAULT_WRITEROLE					20
+#define	DEFAULT_DRAWINGOLE					20
+#define	DEFAULT_GRFMGR_TOTALSIZE			10000000
+#define	DEFAULT_GRFMGR_OBJECTSIZE			2400000
+#define	DEFAULT_GRFMGR_OBJECTRELEASE	    600
+
+#define	PROPERTYNAME_WRITEROLE				OUString(RTL_CONSTASCII_USTRINGPARAM("Writer/OLE_Objects"))
+#define	PROPERTYNAME_DRAWINGOLE				OUString(RTL_CONSTASCII_USTRINGPARAM("DrawingEngine/OLE_Objects"))
+#define	PROPERTYNAME_GRFMGR_TOTALSIZE		OUString(RTL_CONSTASCII_USTRINGPARAM("GraphicManager/TotalCacheSize"))
+#define	PROPERTYNAME_GRFMGR_OBJECTSIZE		OUString(RTL_CONSTASCII_USTRINGPARAM("GraphicManager/ObjectCacheSize"))
 #define PROPERTYNAME_GRFMGR_OBJECTRELEASE   OUString(RTL_CONSTASCII_USTRINGPARAM("GraphicManager/ObjectReleaseTime"))
 
-#define PROPERTYHANDLE_WRITEROLE            0
-#define PROPERTYHANDLE_DRAWINGOLE           1
-#define PROPERTYHANDLE_GRFMGR_TOTALSIZE     2
-#define PROPERTYHANDLE_GRFMGR_OBJECTSIZE    3
+#define	PROPERTYHANDLE_WRITEROLE			0
+#define	PROPERTYHANDLE_DRAWINGOLE			1
+#define	PROPERTYHANDLE_GRFMGR_TOTALSIZE		2
+#define	PROPERTYHANDLE_GRFMGR_OBJECTSIZE	3
 #define PROPERTYHANDLE_GRFMGR_OBJECTRELEASE 4
 
-#define PROPERTYCOUNT                       5
+#define	PROPERTYCOUNT						5
 
 class SvtCacheOptions_Impl : public ConfigItem
 {
 public:
 
 //---------------------------------------------------------------------------------------------------------
-//  constructor / destructor
+//	constructor / destructor
 //---------------------------------------------------------------------------------------------------------
 
      SvtCacheOptions_Impl();
     ~SvtCacheOptions_Impl();
 
 //---------------------------------------------------------------------------------------------------------
-//  overloaded methods of baseclass
+//	overloaded methods of baseclass
 //---------------------------------------------------------------------------------------------------------
 
-    virtual void    Commit();
+    virtual void	Commit();
     virtual void    Notify( const com::sun::star::uno::Sequence< rtl::OUString >& aPropertyNames );
 
 //---------------------------------------------------------------------------------------------------------
-//  public interface
+//	public interface
 //---------------------------------------------------------------------------------------------------------
 
-    sal_Int32       GetWriterOLE_Objects() const;
-    sal_Int32       GetDrawingEngineOLE_Objects() const;
-    sal_Int32       GetGraphicManagerTotalCacheSize() const;
-    sal_Int32       GetGraphicManagerObjectCacheSize() const;
-    sal_Int32       GetGraphicManagerObjectReleaseTime() const;
+    sal_Int32		GetWriterOLE_Objects() const;
+    sal_Int32		GetDrawingEngineOLE_Objects() const;
+    sal_Int32		GetGraphicManagerTotalCacheSize() const;
+    sal_Int32		GetGraphicManagerObjectCacheSize() const;
+    sal_Int32		GetGraphicManagerObjectReleaseTime() const;
 
-    void            SetWriterOLE_Objects( sal_Int32 nObjects );
-    void            SetDrawingEngineOLE_Objects( sal_Int32 nObjects );
-    void            SetGraphicManagerTotalCacheSize( sal_Int32 nTotalCacheSize );
-    void            SetGraphicManagerObjectCacheSize( sal_Int32 nObjectCacheSize );
+    void			SetWriterOLE_Objects( sal_Int32 nObjects );
+    void			SetDrawingEngineOLE_Objects( sal_Int32 nObjects );
+    void			SetGraphicManagerTotalCacheSize( sal_Int32 nTotalCacheSize );
+    void			SetGraphicManagerObjectCacheSize( sal_Int32 nObjectCacheSize );
     void            SetGraphicManagerObjectReleaseTime( sal_Int32 nReleaseTimeSeconds );
 
 //-------------------------------------------------------------------------------------------------------------
-//  private methods
+//	private methods
 //-------------------------------------------------------------------------------------------------------------
 
 private:
@@ -118,41 +118,41 @@ private:
     static Sequence< OUString > impl_GetPropertyNames();
 
 //-------------------------------------------------------------------------------------------------------------
-//  private member
+//	private member
 //-------------------------------------------------------------------------------------------------------------
 
 private:
 
-        sal_Int32   mnWriterOLE;
-        sal_Int32   mnDrawingOLE;
-        sal_Int32   mnGrfMgrTotalSize;
-        sal_Int32   mnGrfMgrObjectSize;
+        sal_Int32	mnWriterOLE;
+        sal_Int32	mnDrawingOLE;
+        sal_Int32	mnGrfMgrTotalSize;
+        sal_Int32	mnGrfMgrObjectSize;
         sal_Int32   mnGrfMgrObjectRelease;
 };
 
 //_________________________________________________________________________________________________________________
-//  definitions
+//	definitions
 //_________________________________________________________________________________________________________________
 
 //*****************************************************************************************************************
-//  constructor
+//	constructor
 //*****************************************************************************************************************
 SvtCacheOptions_Impl::SvtCacheOptions_Impl() :
-    ConfigItem( ROOTNODE_START  ),
+    ConfigItem( ROOTNODE_START	),
     mnWriterOLE( DEFAULT_WRITEROLE ),
     mnDrawingOLE( DEFAULT_DRAWINGOLE ),
     mnGrfMgrTotalSize( DEFAULT_GRFMGR_TOTALSIZE ),
     mnGrfMgrObjectSize( DEFAULT_GRFMGR_OBJECTSIZE ),
     mnGrfMgrObjectRelease( DEFAULT_GRFMGR_OBJECTRELEASE )
 {
-    Sequence< OUString >    seqNames( impl_GetPropertyNames() );
-    Sequence< Any >         seqValues   = GetProperties( seqNames ) ;
+    Sequence< OUString >	seqNames( impl_GetPropertyNames() );
+    Sequence< Any >			seqValues	= GetProperties( seqNames )	;
 
     DBG_ASSERT( !(seqNames.getLength()!=seqValues.getLength()), "SvtCacheOptions_Impl::SvtCacheOptions_Impl()\nI miss some values of configuration keys!\n" );
 
     // Copy values from list in right order to ouer internal member.
     sal_Int32 nPropertyCount = seqValues.getLength();
-    sal_Int32 nProperty = 0;
+    sal_Int32 nProperty	= 0;
 
     for( nProperty=0; nProperty<nPropertyCount; ++nProperty )
     {
@@ -200,7 +200,7 @@ SvtCacheOptions_Impl::SvtCacheOptions_Impl() :
 }
 
 //*****************************************************************************************************************
-//  destructor
+//	destructor
 //*****************************************************************************************************************
 SvtCacheOptions_Impl::~SvtCacheOptions_Impl()
 {
@@ -209,12 +209,12 @@ SvtCacheOptions_Impl::~SvtCacheOptions_Impl()
 }
 
 //*****************************************************************************************************************
-//  Commit
+//	Commit
 //*****************************************************************************************************************
 void SvtCacheOptions_Impl::Commit()
 {
-    Sequence< OUString >    aSeqNames( impl_GetPropertyNames() );
-    Sequence< Any >         aSeqValues( aSeqNames.getLength() );
+    Sequence< OUString >	aSeqNames( impl_GetPropertyNames() );
+    Sequence< Any >			aSeqValues( aSeqNames.getLength() );
 
     for( sal_Int32 nProperty = 0, nCount = aSeqNames.getLength(); nProperty < nCount; ++nProperty )
     {
@@ -250,7 +250,7 @@ void SvtCacheOptions_Impl::Notify( const Sequence< rtl::OUString >&  )
 }
 
 //*****************************************************************************************************************
-//  public method
+//	public method
 //*****************************************************************************************************************
 sal_Int32 SvtCacheOptions_Impl::GetWriterOLE_Objects() const
 {
@@ -258,7 +258,7 @@ sal_Int32 SvtCacheOptions_Impl::GetWriterOLE_Objects() const
 }
 
 //*****************************************************************************************************************
-//  public method
+//	public method
 //*****************************************************************************************************************
 sal_Int32 SvtCacheOptions_Impl::GetDrawingEngineOLE_Objects() const
 {
@@ -266,7 +266,7 @@ sal_Int32 SvtCacheOptions_Impl::GetDrawingEngineOLE_Objects() const
 }
 
 //*****************************************************************************************************************
-//  public method
+//	public method
 //*****************************************************************************************************************
 sal_Int32 SvtCacheOptions_Impl::GetGraphicManagerTotalCacheSize() const
 {
@@ -274,7 +274,7 @@ sal_Int32 SvtCacheOptions_Impl::GetGraphicManagerTotalCacheSize() const
 }
 
 //*****************************************************************************************************************
-//  public method
+//	public method
 //*****************************************************************************************************************
 sal_Int32 SvtCacheOptions_Impl::GetGraphicManagerObjectCacheSize() const
 {
@@ -282,7 +282,7 @@ sal_Int32 SvtCacheOptions_Impl::GetGraphicManagerObjectCacheSize() const
 }
 
 //*****************************************************************************************************************
-//  public method
+//	public method
 //*****************************************************************************************************************
 sal_Int32 SvtCacheOptions_Impl::GetGraphicManagerObjectReleaseTime() const
 {
@@ -290,7 +290,7 @@ sal_Int32 SvtCacheOptions_Impl::GetGraphicManagerObjectReleaseTime() const
 }
 
 //*****************************************************************************************************************
-//  public method
+//	public method
 //*****************************************************************************************************************
 void SvtCacheOptions_Impl::SetWriterOLE_Objects( sal_Int32 nWriterOLE )
 {
@@ -299,7 +299,7 @@ void SvtCacheOptions_Impl::SetWriterOLE_Objects( sal_Int32 nWriterOLE )
 }
 
 //*****************************************************************************************************************
-//  public method
+//	public method
 //*****************************************************************************************************************
 void SvtCacheOptions_Impl::SetDrawingEngineOLE_Objects( sal_Int32 nDrawingOLE )
 {
@@ -308,7 +308,7 @@ void SvtCacheOptions_Impl::SetDrawingEngineOLE_Objects( sal_Int32 nDrawingOLE )
 }
 
 //*****************************************************************************************************************
-//  public method
+//	public method
 //*****************************************************************************************************************
 void SvtCacheOptions_Impl::SetGraphicManagerTotalCacheSize( sal_Int32 nGrfMgrTotalSize )
 {
@@ -317,7 +317,7 @@ void SvtCacheOptions_Impl::SetGraphicManagerTotalCacheSize( sal_Int32 nGrfMgrTot
 }
 
 //*****************************************************************************************************************
-//  public method
+//	public method
 //*****************************************************************************************************************
 void SvtCacheOptions_Impl::SetGraphicManagerObjectCacheSize( sal_Int32 nGrfMgrObjectSize )
 {
@@ -326,7 +326,7 @@ void SvtCacheOptions_Impl::SetGraphicManagerObjectCacheSize( sal_Int32 nGrfMgrOb
 }
 
 //*****************************************************************************************************************
-//  public method
+//	public method
 //*****************************************************************************************************************
 void SvtCacheOptions_Impl::SetGraphicManagerObjectReleaseTime( sal_Int32 nGrfMgrObjectReleaseTime )
 {
@@ -335,7 +335,7 @@ void SvtCacheOptions_Impl::SetGraphicManagerObjectReleaseTime( sal_Int32 nGrfMgr
 }
 
 //*****************************************************************************************************************
-//  private method
+//	private method
 //*****************************************************************************************************************
 Sequence< OUString > SvtCacheOptions_Impl::impl_GetPropertyNames()
 {
@@ -355,15 +355,15 @@ Sequence< OUString > SvtCacheOptions_Impl::impl_GetPropertyNames()
 }
 
 //*****************************************************************************************************************
-//  initialize static member
-//  DON'T DO IT IN YOUR HEADER!
-//  see definition for further informations
+//	initialize static member
+//	DON'T DO IT IN YOUR HEADER!
+//	see definition for further informations
 //*****************************************************************************************************************
-SvtCacheOptions_Impl*   SvtCacheOptions::m_pDataContainer = NULL;
-sal_Int32               SvtCacheOptions::m_nRefCount = 0;
+SvtCacheOptions_Impl*	SvtCacheOptions::m_pDataContainer = NULL;
+sal_Int32				SvtCacheOptions::m_nRefCount = 0;
 
 //*****************************************************************************************************************
-//  constructor
+//	constructor
 //*****************************************************************************************************************
 SvtCacheOptions::SvtCacheOptions()
 {
@@ -379,7 +379,7 @@ SvtCacheOptions::SvtCacheOptions()
 }
 
 //*****************************************************************************************************************
-//  destructor
+//	destructor
 //*****************************************************************************************************************
 SvtCacheOptions::~SvtCacheOptions()
 {
@@ -397,7 +397,7 @@ SvtCacheOptions::~SvtCacheOptions()
 }
 
 //*****************************************************************************************************************
-//  public method
+//	public method
 //*****************************************************************************************************************
 sal_Int32 SvtCacheOptions::GetWriterOLE_Objects() const
 {
@@ -406,7 +406,7 @@ sal_Int32 SvtCacheOptions::GetWriterOLE_Objects() const
 }
 
 //*****************************************************************************************************************
-//  public method
+//	public method
 //*****************************************************************************************************************
 sal_Int32 SvtCacheOptions::GetDrawingEngineOLE_Objects() const
 {
@@ -415,7 +415,7 @@ sal_Int32 SvtCacheOptions::GetDrawingEngineOLE_Objects() const
 }
 
 //*****************************************************************************************************************
-//  public method
+//	public method
 //*****************************************************************************************************************
 sal_Int32 SvtCacheOptions::GetGraphicManagerTotalCacheSize() const
 {
@@ -424,7 +424,7 @@ sal_Int32 SvtCacheOptions::GetGraphicManagerTotalCacheSize() const
 }
 
 //*****************************************************************************************************************
-//  public method
+//	public method
 //*****************************************************************************************************************
 sal_Int32 SvtCacheOptions::GetGraphicManagerObjectCacheSize() const
 {
@@ -433,7 +433,7 @@ sal_Int32 SvtCacheOptions::GetGraphicManagerObjectCacheSize() const
 }
 
 //*****************************************************************************************************************
-//  public method
+//	public method
 //*****************************************************************************************************************
 sal_Int32 SvtCacheOptions::GetGraphicManagerObjectReleaseTime() const
 {
@@ -442,7 +442,7 @@ sal_Int32 SvtCacheOptions::GetGraphicManagerObjectReleaseTime() const
 }
 
 //*****************************************************************************************************************
-//  public method
+//	public method
 //*****************************************************************************************************************
 void SvtCacheOptions::SetWriterOLE_Objects( sal_Int32 nWriterOLE )
 {
@@ -451,7 +451,7 @@ void SvtCacheOptions::SetWriterOLE_Objects( sal_Int32 nWriterOLE )
 }
 
 //*****************************************************************************************************************
-//  public method
+//	public method
 //*****************************************************************************************************************
 void SvtCacheOptions::SetDrawingEngineOLE_Objects( sal_Int32 nDrawingOLE )
 {
@@ -460,7 +460,7 @@ void SvtCacheOptions::SetDrawingEngineOLE_Objects( sal_Int32 nDrawingOLE )
 }
 
 //*****************************************************************************************************************
-//  public method
+//	public method
 //*****************************************************************************************************************
 void SvtCacheOptions::SetGraphicManagerTotalCacheSize( sal_Int32 nGrfMgrTotalSize )
 {
@@ -469,7 +469,7 @@ void SvtCacheOptions::SetGraphicManagerTotalCacheSize( sal_Int32 nGrfMgrTotalSiz
 }
 
 //*****************************************************************************************************************
-//  public method
+//	public method
 //*****************************************************************************************************************
 void SvtCacheOptions::SetGraphicManagerObjectCacheSize( sal_Int32 nGrfMgrObjectSize )
 {
@@ -478,7 +478,7 @@ void SvtCacheOptions::SetGraphicManagerObjectCacheSize( sal_Int32 nGrfMgrObjectS
 }
 
 //*****************************************************************************************************************
-//  public method
+//	public method
 //*****************************************************************************************************************
 void SvtCacheOptions::SetGraphicManagerObjectReleaseTime( sal_Int32 nGrfMgrObjectReleaseTime )
 {
@@ -487,7 +487,7 @@ void SvtCacheOptions::SetGraphicManagerObjectReleaseTime( sal_Int32 nGrfMgrObjec
 }
 
 //*****************************************************************************************************************
-//  private method
+//	private method
 //*****************************************************************************************************************
 Mutex& SvtCacheOptions::GetOwnStaticMutex()
 {
diff --git a/unotools/source/config/cmdoptions.cxx b/unotools/source/config/cmdoptions.cxx
index fd4fb07e7918..724ea8658997 100644
--- a/unotools/source/config/cmdoptions.cxx
+++ b/unotools/source/config/cmdoptions.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
@@ -29,7 +29,7 @@
 #include "precompiled_unotools.hxx"
 
 //_________________________________________________________________________________________________________________
-//  includes
+//	includes
 //_________________________________________________________________________________________________________________
 
 #include <unotools/cmdoptions.hxx>
@@ -48,33 +48,33 @@
 #include <hash_map>
 
 //_________________________________________________________________________________________________________________
-//  namespaces
+//	namespaces
 //_________________________________________________________________________________________________________________
 
-using namespace ::std                   ;
-using namespace ::utl                   ;
-using namespace ::rtl                   ;
-using namespace ::osl                   ;
-using namespace ::com::sun::star::uno   ;
-using namespace ::com::sun::star::beans ;
+using namespace ::std					;
+using namespace ::utl					;
+using namespace ::rtl					;
+using namespace ::osl					;
+using namespace ::com::sun::star::uno	;
+using namespace ::com::sun::star::beans	;
 
 //_________________________________________________________________________________________________________________
-//  const
+//	const
 //_________________________________________________________________________________________________________________
 
-#define ROOTNODE_CMDOPTIONS                             OUString(RTL_CONSTASCII_USTRINGPARAM("Office.Commands/Execute"  ))
-#define PATHDELIMITER                                   OUString(RTL_CONSTASCII_USTRINGPARAM("/"                        ))
+#define ROOTNODE_CMDOPTIONS								OUString(RTL_CONSTASCII_USTRINGPARAM("Office.Commands/Execute"	))
+#define PATHDELIMITER                                   OUString(RTL_CONSTASCII_USTRINGPARAM("/"						))
 
-#define SETNODE_DISABLED                                OUString(RTL_CONSTASCII_USTRINGPARAM("Disabled"                 ))
+#define SETNODE_DISABLED                                OUString(RTL_CONSTASCII_USTRINGPARAM("Disabled"					))
 
-#define PROPERTYNAME_CMD                                OUString(RTL_CONSTASCII_USTRINGPARAM("Command"                  ))
+#define PROPERTYNAME_CMD                                OUString(RTL_CONSTASCII_USTRINGPARAM("Command"					))
 
 #define PROPERTYCOUNT                                   1
 
 #define OFFSET_CMD                                      0
 
 //_________________________________________________________________________________________________________________
-//  private declarations!
+//	private declarations!
 //_________________________________________________________________________________________________________________
 
 // Method to retrieve a hash code from a string. May be we have to change it to decrease collisions in the hash map
@@ -130,9 +130,9 @@ class SvtCmdOptions
         //           special strings "sEmpty" and "sSeperator" to perform too ...
         Sequence< OUString > GetList() const
         {
-            sal_Int32               nCount = (sal_Int32)m_aCommandHashMap.size();
-            sal_Int32               nIndex = 0;
-            Sequence< OUString >    aList( nCount );
+            sal_Int32				nCount = (sal_Int32)m_aCommandHashMap.size();
+            sal_Int32				nIndex = 0;
+            Sequence< OUString >	aList( nCount );
 
             CommandHashMap::const_iterator pEntry = m_aCommandHashMap.begin();
             while ( pEntry != m_aCommandHashMap.end() )
@@ -142,10 +142,10 @@ class SvtCmdOptions
         }
 
     private:
-        class CommandHashMap : public ::std::hash_map< ::rtl::OUString      ,
-                                                        sal_Int32           ,
-                                                        OUStringHashCode    ,
-                                                        ::std::equal_to< ::rtl::OUString >  >
+        class CommandHashMap : public ::std::hash_map< ::rtl::OUString		,
+                                                        sal_Int32			,
+                                                        OUStringHashCode	,
+                                                        ::std::equal_to< ::rtl::OUString >	>
         {
             public:
                 inline void free()
@@ -162,55 +162,55 @@ typedef ::std::vector< ::com::sun::star::uno::WeakReference< ::com::sun::star::f
 class SvtCommandOptions_Impl : public ConfigItem
 {
     //-------------------------------------------------------------------------------------------------------------
-    //  public methods
+    //	public methods
     //-------------------------------------------------------------------------------------------------------------
 
     public:
 
         //---------------------------------------------------------------------------------------------------------
-        //  constructor / destructor
+        //	constructor / destructor
         //---------------------------------------------------------------------------------------------------------
 
          SvtCommandOptions_Impl();
         ~SvtCommandOptions_Impl();
 
         //---------------------------------------------------------------------------------------------------------
-        //  overloaded methods of baseclass
+        //	overloaded methods of baseclass
         //---------------------------------------------------------------------------------------------------------
 
         /*-****************************************************************************************************//**
-            @short      called for notify of configmanager
-            @descr      These method is called from the ConfigManager before application ends or from the
+            @short		called for notify of configmanager
+            @descr		These method is called from the ConfigManager before application ends or from the
                          PropertyChangeListener if the sub tree broadcasts changes. You must update your
                         internal values.
 
-            @seealso    baseclass ConfigItem
+            @seealso	baseclass ConfigItem
 
             @param      "lPropertyNames" is the list of properties which should be updated.
-            @return     -
+            @return		-
 
-            @onerror    -
+            @onerror	-
         *//*-*****************************************************************************************************/
 
         virtual void Notify( const Sequence< OUString >& lPropertyNames );
 
         /*-****************************************************************************************************//**
-            @short      write changes to configuration
-            @descr      These method writes the changed values into the sub tree
+            @short		write changes to configuration
+            @descr		These method writes the changed values into the sub tree
                         and should always called in our destructor to guarantee consistency of config data.
 
-            @seealso    baseclass ConfigItem
+            @seealso	baseclass ConfigItem
 
-            @param      -
-            @return     -
+            @param		-
+            @return		-
 
-            @onerror    -
+            @onerror	-
         *//*-*****************************************************************************************************/
 
         virtual void Commit();
 
         //---------------------------------------------------------------------------------------------------------
-        //  public interface
+        //	public interface
         //---------------------------------------------------------------------------------------------------------
 
         /*-****************************************************************************************************//**
@@ -218,45 +218,45 @@ class SvtCommandOptions_Impl : public ConfigItem
             @descr      These class is used as static member of "SvtDynamicMenuOptions" ...
                         => The code exist only for one time and isn't duplicated for every instance!
 
-            @seealso    -
+            @seealso	-
 
-            @param      -
-            @return     -
+            @param		-
+            @return		-
 
-            @onerror    -
+            @onerror	-
         *//*-*****************************************************************************************************/
 
-        void                    Clear       (   SvtCommandOptions::CmdOption    eCmdOption  );
+        void					Clear       (	SvtCommandOptions::CmdOption	eCmdOption	);
         sal_Bool                HasEntries  (   SvtCommandOptions::CmdOption    eOption     ) const;
-        sal_Bool                Lookup      (   SvtCommandOptions::CmdOption    eCmdOption, const OUString& ) const;
-        Sequence< OUString >    GetList     (   SvtCommandOptions::CmdOption    eCmdOption  ) const ;
-        void                    AddCommand  (   SvtCommandOptions::CmdOption    eCmdOption,
-                                                const OUString& sURL        );
+        sal_Bool				Lookup		(	SvtCommandOptions::CmdOption	eCmdOption,	const OUString& ) const;
+        Sequence< OUString >	GetList		(	SvtCommandOptions::CmdOption	eCmdOption	) const ;
+        void					AddCommand	(	SvtCommandOptions::CmdOption	eCmdOption,
+                                                const OUString& sURL		);
         void EstablisFrameCallback(const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& xFrame);
 
     //-------------------------------------------------------------------------------------------------------------
-    //  private methods
+    //	private methods
     //-------------------------------------------------------------------------------------------------------------
 
     private:
 
         /*-****************************************************************************************************//**
             @short      return list of key names of our configuration management which represent oue module tree
-            @descr      These methods return the current list of key names! We need it to get needed values from our
+            @descr		These methods return the current list of key names! We need it to get needed values from our
                         configuration management and support dynamical menu item lists!
 
-            @seealso    -
+            @seealso	-
 
-            @param      "nDisabledCount"    ,   returns count of menu entries for "new"
-            @return     A list of configuration key names is returned.
+            @param      "nDisabledCount"	,   returns count of menu entries for "new"
+            @return		A list of configuration key names is returned.
 
-            @onerror    -
+            @onerror	-
         *//*-*****************************************************************************************************/
 
         Sequence< OUString > impl_GetPropertyNames();
 
     //-------------------------------------------------------------------------------------------------------------
-    //  private member
+    //	private member
     //-------------------------------------------------------------------------------------------------------------
 
     private:
@@ -265,11 +265,11 @@ class SvtCommandOptions_Impl : public ConfigItem
 };
 
 //_________________________________________________________________________________________________________________
-//  definitions
+//	definitions
 //_________________________________________________________________________________________________________________
 
 //*****************************************************************************************************************
-//  constructor
+//	constructor
 //*****************************************************************************************************************
 SvtCommandOptions_Impl::SvtCommandOptions_Impl()
     // Init baseclasses first
@@ -288,8 +288,8 @@ SvtCommandOptions_Impl::SvtCommandOptions_Impl()
 
     // Copy values from list in right order to ouer internal member.
     // Attention: List for names and values have an internal construction pattern!
-    sal_Int32   nItem     = 0 ;
-    OUString    sCmd          ;
+    sal_Int32	nItem     = 0 ;
+    OUString    sCmd		  ;
 
     // Set size of hash_map reach a used size of approx. 60%
     m_aDisabledCommands.SetContainerSize( lNames.getLength() * 10 / 6 );
@@ -311,7 +311,7 @@ SvtCommandOptions_Impl::SvtCommandOptions_Impl()
 }
 
 //*****************************************************************************************************************
-//  destructor
+//	destructor
 //*****************************************************************************************************************
 SvtCommandOptions_Impl::~SvtCommandOptions_Impl()
 {
@@ -323,7 +323,7 @@ SvtCommandOptions_Impl::~SvtCommandOptions_Impl()
 }
 
 //*****************************************************************************************************************
-//  public method
+//	public method
 //*****************************************************************************************************************
 void SvtCommandOptions_Impl::Notify( const Sequence< OUString >& )
 {
@@ -339,8 +339,8 @@ void SvtCommandOptions_Impl::Notify( const Sequence< OUString >& )
 
     // Copy values from list in right order to ouer internal member.
     // Attention: List for names and values have an internal construction pattern!
-    sal_Int32   nItem     = 0 ;
-    OUString    sCmd          ;
+    sal_Int32	nItem     = 0 ;
+    OUString    sCmd		  ;
 
     // Set size of hash_map reach a used size of approx. 60%
     m_aDisabledCommands.Clear();
@@ -367,7 +367,7 @@ void SvtCommandOptions_Impl::Notify( const Sequence< OUString >& )
 }
 
 //*****************************************************************************************************************
-//  public method
+//	public method
 //*****************************************************************************************************************
 void SvtCommandOptions_Impl::Commit()
 {
@@ -375,7 +375,7 @@ void SvtCommandOptions_Impl::Commit()
 }
 
 //*****************************************************************************************************************
-//  public method
+//	public method
 //*****************************************************************************************************************
 void SvtCommandOptions_Impl::Clear( SvtCommandOptions::CmdOption eCmdOption )
 {
@@ -394,7 +394,7 @@ void SvtCommandOptions_Impl::Clear( SvtCommandOptions::CmdOption eCmdOption )
 }
 
 //*****************************************************************************************************************
-//  public method
+//	public method
 //*****************************************************************************************************************
 sal_Bool SvtCommandOptions_Impl::HasEntries( SvtCommandOptions::CmdOption eOption ) const
 {
@@ -405,7 +405,7 @@ sal_Bool SvtCommandOptions_Impl::HasEntries( SvtCommandOptions::CmdOption eOptio
 }
 
 //*****************************************************************************************************************
-//  public method
+//	public method
 //*****************************************************************************************************************
 Sequence< OUString > SvtCommandOptions_Impl::GetList( SvtCommandOptions::CmdOption eCmdOption ) const
 {
@@ -427,7 +427,7 @@ Sequence< OUString > SvtCommandOptions_Impl::GetList( SvtCommandOptions::CmdOpti
 }
 
 //*****************************************************************************************************************
-//  public method
+//	public method
 //*****************************************************************************************************************
 sal_Bool SvtCommandOptions_Impl::Lookup( SvtCommandOptions::CmdOption eCmdOption, const OUString& aCommand ) const
 {
@@ -445,7 +445,7 @@ sal_Bool SvtCommandOptions_Impl::Lookup( SvtCommandOptions::CmdOption eCmdOption
 }
 
 //*****************************************************************************************************************
-//  public method
+//	public method
 //*****************************************************************************************************************
 void SvtCommandOptions_Impl::AddCommand( SvtCommandOptions::CmdOption eCmdOption, const OUString& sCmd )
 {
@@ -478,7 +478,7 @@ void SvtCommandOptions_Impl::EstablisFrameCallback(const ::com::sun::star::uno::
 }
 
 //*****************************************************************************************************************
-//  private method
+//	private method
 //*****************************************************************************************************************
 Sequence< OUString > SvtCommandOptions_Impl::impl_GetPropertyNames()
 {
@@ -506,15 +506,15 @@ Sequence< OUString > SvtCommandOptions_Impl::impl_GetPropertyNames()
 }
 
 //*****************************************************************************************************************
-//  initialize static member
-//  DON'T DO IT IN YOUR HEADER!
-//  see definition for further informations
+//	initialize static member
+//	DON'T DO IT IN YOUR HEADER!
+//	see definition for further informations
 //*****************************************************************************************************************
 SvtCommandOptions_Impl*     SvtCommandOptions::m_pDataContainer = NULL  ;
 sal_Int32                   SvtCommandOptions::m_nRefCount      = 0     ;
 
 //*****************************************************************************************************************
-//  constructor
+//	constructor
 //*****************************************************************************************************************
 SvtCommandOptions::SvtCommandOptions()
 {
@@ -531,7 +531,7 @@ SvtCommandOptions::SvtCommandOptions()
 }
 
 //*****************************************************************************************************************
-//  destructor
+//	destructor
 //*****************************************************************************************************************
 SvtCommandOptions::~SvtCommandOptions()
 {
@@ -549,7 +549,7 @@ SvtCommandOptions::~SvtCommandOptions()
 }
 
 //*****************************************************************************************************************
-//  public method
+//	public method
 //*****************************************************************************************************************
 void SvtCommandOptions::Clear( CmdOption eCmdOption )
 {
@@ -558,7 +558,7 @@ void SvtCommandOptions::Clear( CmdOption eCmdOption )
 }
 
 //*****************************************************************************************************************
-//  public method
+//	public method
 //*****************************************************************************************************************
 sal_Bool SvtCommandOptions::HasEntries( CmdOption eOption ) const
 {
@@ -567,7 +567,7 @@ sal_Bool SvtCommandOptions::HasEntries( CmdOption eOption ) const
 }
 
 //*****************************************************************************************************************
-//  public method
+//	public method
 //*****************************************************************************************************************
 sal_Bool SvtCommandOptions::Lookup( CmdOption eCmdOption, const OUString& aCommandURL ) const
 {
@@ -576,7 +576,7 @@ sal_Bool SvtCommandOptions::Lookup( CmdOption eCmdOption, const OUString& aComma
 }
 
 //*****************************************************************************************************************
-//  public method
+//	public method
 //*****************************************************************************************************************
 Sequence< OUString > SvtCommandOptions::GetList( CmdOption eCmdOption ) const
 {
@@ -585,7 +585,7 @@ Sequence< OUString > SvtCommandOptions::GetList( CmdOption eCmdOption ) const
 }
 
 //*****************************************************************************************************************
-//  public method
+//	public method
 //*****************************************************************************************************************
 void SvtCommandOptions::AddCommand( CmdOption eCmdOption, const OUString& sURL )
 {
@@ -603,7 +603,7 @@ void SvtCommandOptions::EstablisFrameCallback(const ::com::sun::star::uno::Refer
 }
 
 //*****************************************************************************************************************
-//  private method
+//	private method
 //*****************************************************************************************************************
 Mutex& SvtCommandOptions::GetOwnStaticMutex()
 {
diff --git a/unotools/source/config/compatibility.cxx b/unotools/source/config/compatibility.cxx
index 61ebe0211817..4640cf9bb662 100644
--- a/unotools/source/config/compatibility.cxx
+++ b/unotools/source/config/compatibility.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
@@ -29,12 +29,13 @@
 #include "precompiled_unotools.hxx"
 
 //_________________________________________________________________________________________________________________
-//  includes
+//	includes
 //_________________________________________________________________________________________________________________
 
 #include <unotools/compatibility.hxx>
 #include <unotools/configmgr.hxx>
 #include <unotools/configitem.hxx>
+#include <unotools/syslocale.hxx>
 #include <tools/debug.hxx>
 #include <com/sun/star/uno/Any.hxx>
 #include <com/sun/star/uno/Sequence.hxx>
@@ -48,7 +49,7 @@
 #include <algorithm>
 
 //_________________________________________________________________________________________________________________
-//  namespaces
+//	namespaces
 //_________________________________________________________________________________________________________________
 
 using namespace ::std;
@@ -59,12 +60,12 @@ using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::beans;
 
 //_________________________________________________________________________________________________________________
-//  const
+//	const
 //_________________________________________________________________________________________________________________
 
-#define ROOTNODE_OPTIONS        OUString( RTL_CONSTASCII_USTRINGPARAM( "Office.Compatibility/" ) )
-#define PATHDELIMITER           OUString( RTL_CONSTASCII_USTRINGPARAM( "/" ) )
-#define SETNODE_ALLFILEFORMATS  OUString( RTL_CONSTASCII_USTRINGPARAM( "AllFileFormats" ) )
+#define ROOTNODE_OPTIONS		OUString( RTL_CONSTASCII_USTRINGPARAM( "Office.Compatibility/" ) )
+#define PATHDELIMITER			OUString( RTL_CONSTASCII_USTRINGPARAM( "/" ) )
+#define SETNODE_ALLFILEFORMATS	OUString( RTL_CONSTASCII_USTRINGPARAM( "AllFileFormats" ) )
 
 #define PROPERTYNAME_NAME               COMPATIBILITY_PROPERTYNAME_NAME
 #define PROPERTYNAME_MODULE             COMPATIBILITY_PROPERTYNAME_MODULE
@@ -97,7 +98,7 @@ using namespace ::com::sun::star::beans;
 #define OFFSET_EXPANDWORDSPACE          12
 
 //_________________________________________________________________________________________________________________
-//  private declarations!
+//	private declarations!
 //_________________________________________________________________________________________________________________
 
 /*-****************************************************************************************************************
@@ -123,30 +124,30 @@ struct SvtCompatibilityEntry
                 bUseOurTextWrapping( false ), bConsiderWrappingStyle( false ),
                 bExpandWordSpace( true ) {}
 
-        inline void     SetUsePrtMetrics( bool _bSet ) { bUsePrtMetrics = _bSet; }
-        inline void     SetAddSpacing( bool _bSet ) { bAddSpacing = _bSet; }
-        inline void     SetAddSpacingAtPages( bool _bSet ) { bAddSpacingAtPages = _bSet; }
-        inline void     SetUseOurTabStops( bool _bSet ) { bUseOurTabStops = _bSet; }
-        inline void     SetNoExtLeading( bool _bSet ) { bNoExtLeading = _bSet; }
-        inline void     SetUseLineSpacing( bool _bSet ) { bUseLineSpacing = _bSet; }
-        inline void     SetAddTableSpacing( bool _bSet ) { bAddTableSpacing = _bSet; }
-        inline void     SetUseObjPos( bool _bSet ) { bUseObjPos = _bSet; }
-        inline void     SetUseOurTextWrapping( bool _bSet ) { bUseOurTextWrapping = _bSet; }
+        inline void		SetUsePrtMetrics( bool _bSet ) { bUsePrtMetrics = _bSet; }
+        inline void		SetAddSpacing( bool _bSet ) { bAddSpacing = _bSet; }
+        inline void		SetAddSpacingAtPages( bool _bSet ) { bAddSpacingAtPages = _bSet; }
+        inline void		SetUseOurTabStops( bool _bSet ) { bUseOurTabStops = _bSet; }
+        inline void		SetNoExtLeading( bool _bSet ) { bNoExtLeading = _bSet; }
+        inline void		SetUseLineSpacing( bool _bSet ) { bUseLineSpacing = _bSet; }
+        inline void		SetAddTableSpacing( bool _bSet ) { bAddTableSpacing = _bSet; }
+        inline void		SetUseObjPos( bool _bSet ) { bUseObjPos = _bSet; }
+        inline void		SetUseOurTextWrapping( bool _bSet ) { bUseOurTextWrapping = _bSet; }
         inline void     SetConsiderWrappingStyle( bool _bSet ) { bConsiderWrappingStyle = _bSet; }
         inline void     SetExpandWordSpace( bool _bSet ) { bExpandWordSpace = _bSet; }
 
     public:
         OUString    sName;
         OUString    sModule;
-        bool        bUsePrtMetrics;
-        bool        bAddSpacing;
-        bool        bAddSpacingAtPages;
-        bool        bUseOurTabStops;
-        bool        bNoExtLeading;
-        bool        bUseLineSpacing;
-        bool        bAddTableSpacing;
-        bool        bUseObjPos;
-        bool        bUseOurTextWrapping;
+        bool		bUsePrtMetrics;
+        bool		bAddSpacing;
+        bool		bAddSpacingAtPages;
+        bool		bUseOurTabStops;
+        bool		bNoExtLeading;
+        bool		bUseLineSpacing;
+        bool		bAddTableSpacing;
+        bool		bUseObjPos;
+        bool		bUseOurTextWrapping;
         bool        bConsiderWrappingStyle;
         bool        bExpandWordSpace;
 };
@@ -181,7 +182,7 @@ class SvtCompatibility
             Sequence< Sequence< PropertyValue > > lResult( nCount );
             const vector< SvtCompatibilityEntry >* pList = &lEntries;
 
-            lProperties[ OFFSET_NAME ].Name = PROPERTYNAME_NAME;
+            lProperties[ OFFSET_NAME ].Name	= PROPERTYNAME_NAME;
             lProperties[ OFFSET_MODULE ].Name = PROPERTYNAME_MODULE;
             lProperties[ OFFSET_USEPRTMETRICS ].Name = PROPERTYNAME_USEPRTMETRICS;
             lProperties[ OFFSET_ADDSPACING ].Name = PROPERTYNAME_ADDSPACING;
@@ -218,7 +219,7 @@ class SvtCompatibility
             return lResult;
         }
 
-        int size() const
+        int	size() const
         {
             return lEntries.size();
         }
@@ -235,55 +236,57 @@ class SvtCompatibility
 class SvtCompatibilityOptions_Impl : public ConfigItem
 {
     //-------------------------------------------------------------------------------------------------------------
-    //  public methods
+    //	public methods
     //-------------------------------------------------------------------------------------------------------------
 
     public:
 
         //---------------------------------------------------------------------------------------------------------
-        //  constructor / destructor
+        //	constructor / destructor
         //---------------------------------------------------------------------------------------------------------
 
          SvtCompatibilityOptions_Impl();
         ~SvtCompatibilityOptions_Impl();
 
+        void SetDefault( OUString sName, bool bValue );
+
         //---------------------------------------------------------------------------------------------------------
-        //  overloaded methods of baseclass
+        //	overloaded methods of baseclass
         //---------------------------------------------------------------------------------------------------------
 
         /*-****************************************************************************************************//**
-            @short      called for notify of configmanager
-            @descr      These method is called from the ConfigManager before application ends or from the
+            @short		called for notify of configmanager
+            @descr		These method is called from the ConfigManager before application ends or from the
                          PropertyChangeListener if the sub tree broadcasts changes. You must update your
                         internal values.
 
-            @seealso    baseclass ConfigItem
+            @seealso	baseclass ConfigItem
 
             @param      "lPropertyNames" is the list of properties which should be updated.
-            @return     -
+            @return		-
 
-            @onerror    -
+            @onerror	-
         *//*-*****************************************************************************************************/
 
         virtual void Notify( const Sequence< OUString >& lPropertyNames );
 
         /*-****************************************************************************************************//**
-            @short      write changes to configuration
-            @descr      These method writes the changed values into the sub tree
+            @short		write changes to configuration
+            @descr		These method writes the changed values into the sub tree
                         and should always called in our destructor to guarantee consistency of config data.
 
-            @seealso    baseclass ConfigItem
+            @seealso	baseclass ConfigItem
 
-            @param      -
-            @return     -
+            @param		-
+            @return		-
 
-            @onerror    -
+            @onerror	-
         *//*-*****************************************************************************************************/
 
         virtual void Commit();
 
         //---------------------------------------------------------------------------------------------------------
-        //  public interface
+        //	public interface
         //---------------------------------------------------------------------------------------------------------
 
         /*-****************************************************************************************************//**
@@ -291,17 +294,17 @@ class SvtCompatibilityOptions_Impl : public ConfigItem
             @descr      These class is used as static member of "SvtCompatibilityOptions" ...
                         => The code exist only for one time and isn't duplicated for every instance!
 
-            @seealso    -
+            @seealso	-
 
-            @param      -
-            @return     -
+            @param		-
+            @return		-
 
-            @onerror    -
+            @onerror	-
         *//*-*****************************************************************************************************/
 
         void                                    Clear();
         Sequence< Sequence< PropertyValue > >   GetList() const;
-        void                                    AppendItem( const ::rtl::OUString& _sName,
+        void 									AppendItem( const ::rtl::OUString& _sName,
                                                             const ::rtl::OUString& _sModule,
                                                             bool _bUsePrtMetrics,
                                                             bool _bAddSpacing,
@@ -328,22 +331,22 @@ class SvtCompatibilityOptions_Impl : public ConfigItem
         inline bool IsExpandWordSpace() const { return m_aDefOptions.bExpandWordSpace; }
 
     //-------------------------------------------------------------------------------------------------------------
-    //  private methods
+    //	private methods
     //-------------------------------------------------------------------------------------------------------------
 
     private:
 
         /*-****************************************************************************************************//**
             @short      return list of key names of our configuration management which represent one module tree
-            @descr      These methods return the current list of key names! We need it to get needed values from our
+            @descr		These methods return the current list of key names! We need it to get needed values from our
                         configuration management and support dynamical menu item lists!
 
-            @seealso    -
+            @seealso	-
 
             @param      -
-            @return     A list of configuration key names is returned.
+            @return		A list of configuration key names is returned.
 
-            @onerror    -
+            @onerror	-
         *//*-*****************************************************************************************************/
 
         Sequence< OUString > impl_GetPropertyNames( Sequence< OUString >& rItems );
@@ -357,30 +360,30 @@ class SvtCompatibilityOptions_Impl : public ConfigItem
 
             @param      "lSource"      ,   original list
             @param      "lDestination" ,   destination of operation
-            @return     A list of configuration key names is returned.
+            @return		A list of configuration key names is returned.
 
-            @onerror    -
+            @onerror	-
         *//*-*****************************************************************************************************/
 
         void impl_ExpandPropertyNames( const Sequence< OUString >& lSource,
                                              Sequence< OUString >& lDestination );
 
     //-------------------------------------------------------------------------------------------------------------
-    //  private member
+    //	private member
     //-------------------------------------------------------------------------------------------------------------
 
     private:
 
-        SvtCompatibility        m_aOptions;
-        SvtCompatibilityEntry   m_aDefOptions;
+        SvtCompatibility		m_aOptions;
+        SvtCompatibilityEntry	m_aDefOptions;
 };
 
 //_________________________________________________________________________________________________________________
-//  definitions
+//	definitions
 //_________________________________________________________________________________________________________________
 
 //*****************************************************************************************************************
-//  constructor
+//	constructor
 //*****************************************************************************************************************
 SvtCompatibilityOptions_Impl::SvtCompatibilityOptions_Impl()
     // Init baseclasses first
@@ -425,6 +428,12 @@ SvtCompatibilityOptions_Impl::SvtCompatibilityOptions_Impl()
 
         if ( !bDefaultFound && aItem.sName.equals( COMPATIBILITY_DEFAULT_NAME ) != sal_False )
         {
+            SvtSysLocale aSysLocale;
+            com::sun::star::lang::Locale aLocale = aSysLocale.GetLocale();
+            if ( aLocale.Language.equalsAscii( "zh" ) || aLocale.Language.equalsAscii( "ja" ) ||
+                    aLocale.Language.equalsAscii( "ko" ) )
+                aItem.bExpandWordSpace = false;
+
             m_aDefOptions = aItem;
             bDefaultFound = true;
         }
@@ -432,7 +441,7 @@ SvtCompatibilityOptions_Impl::SvtCompatibilityOptions_Impl()
 }
 
 //*****************************************************************************************************************
-//  destructor
+//	destructor
 //*****************************************************************************************************************
 SvtCompatibilityOptions_Impl::~SvtCompatibilityOptions_Impl()
 {
@@ -443,8 +452,34 @@ SvtCompatibilityOptions_Impl::~SvtCompatibilityOptions_Impl()
     }
 }
 
+void SvtCompatibilityOptions_Impl::SetDefault( OUString sName, bool bValue )
+{
+    if ( COMPATIBILITY_PROPERTYNAME_USEPRTMETRICS.equals( sName ) )
+        m_aDefOptions.SetUsePrtMetrics( bValue );
+    else if ( COMPATIBILITY_PROPERTYNAME_ADDSPACING.equals( sName ) )
+        m_aDefOptions.SetAddSpacing( bValue );
+    else if ( COMPATIBILITY_PROPERTYNAME_ADDSPACINGATPAGES.equals( sName ) )
+        m_aDefOptions.SetAddSpacingAtPages( bValue );
+    else if ( COMPATIBILITY_PROPERTYNAME_USEOURTABSTOPS.equals( sName ) )
+        m_aDefOptions.SetUseOurTabStops( bValue );
+    else if ( COMPATIBILITY_PROPERTYNAME_NOEXTLEADING.equals( sName ) )
+        m_aDefOptions.SetNoExtLeading( bValue );
+    else if ( COMPATIBILITY_PROPERTYNAME_USELINESPACING.equals( sName ) )
+        m_aDefOptions.SetUseLineSpacing( bValue );
+    else if ( COMPATIBILITY_PROPERTYNAME_ADDTABLESPACING.equals( sName ) )
+        m_aDefOptions.SetAddTableSpacing( bValue );
+    else if ( COMPATIBILITY_PROPERTYNAME_USEOBJECTPOSITIONING.equals( sName ) )
+        m_aDefOptions.SetUseObjPos( bValue );
+    else if ( COMPATIBILITY_PROPERTYNAME_USEOURTEXTWRAPPING.equals( sName ) )
+        m_aDefOptions.SetUseOurTextWrapping( bValue );
+    else if ( COMPATIBILITY_PROPERTYNAME_CONSIDERWRAPPINGSTYLE.equals( sName ) )
+        m_aDefOptions.SetConsiderWrappingStyle( bValue );
+    else if ( COMPATIBILITY_PROPERTYNAME_EXPANDWORDSPACE.equals( sName ) )
+        m_aDefOptions.SetExpandWordSpace( bValue );
+}
+
 //*****************************************************************************************************************
-//  public method
+//	public method
 //*****************************************************************************************************************
 void SvtCompatibilityOptions_Impl::Notify( const Sequence< OUString >& )
 {
@@ -452,7 +487,7 @@ void SvtCompatibilityOptions_Impl::Notify( const Sequence< OUString >& )
 }
 
 //*****************************************************************************************************************
-//  public method
+//	public method
 //*****************************************************************************************************************
 void SvtCompatibilityOptions_Impl::Commit()
 {
@@ -470,29 +505,29 @@ void SvtCompatibilityOptions_Impl::Commit()
         aItem = m_aOptions[ nItem ];
         sNode = SETNODE_ALLFILEFORMATS + PATHDELIMITER + aItem.sName + PATHDELIMITER;
 
-        lPropertyValues[ OFFSET_MODULE - 1                  ].Name = sNode + PROPERTYNAME_MODULE;
-        lPropertyValues[ OFFSET_USEPRTMETRICS - 1           ].Name = sNode + PROPERTYNAME_USEPRTMETRICS;
-        lPropertyValues[ OFFSET_ADDSPACING - 1              ].Name = sNode + PROPERTYNAME_ADDSPACING;
-        lPropertyValues[ OFFSET_ADDSPACINGATPAGES - 1       ].Name = sNode + PROPERTYNAME_ADDSPACINGATPAGES;
-        lPropertyValues[ OFFSET_USEOURTABSTOPS - 1          ].Name = sNode + PROPERTYNAME_USEOURTABSTOPS;
-        lPropertyValues[ OFFSET_NOEXTLEADING - 1            ].Name = sNode + PROPERTYNAME_NOEXTLEADING;
-        lPropertyValues[ OFFSET_USELINESPACING - 1          ].Name = sNode + PROPERTYNAME_USELINESPACING;
-        lPropertyValues[ OFFSET_ADDTABLESPACING - 1         ].Name = sNode + PROPERTYNAME_ADDTABLESPACING;
-        lPropertyValues[ OFFSET_USEOBJPOS - 1               ].Name = sNode + PROPERTYNAME_USEOBJPOS;
-        lPropertyValues[ OFFSET_USEOURTEXTWRAPPING - 1      ].Name = sNode + PROPERTYNAME_USEOURTEXTWRAP;
+        lPropertyValues[ OFFSET_MODULE - 1					].Name = sNode + PROPERTYNAME_MODULE;
+        lPropertyValues[ OFFSET_USEPRTMETRICS - 1			].Name = sNode + PROPERTYNAME_USEPRTMETRICS;
+        lPropertyValues[ OFFSET_ADDSPACING - 1				].Name = sNode + PROPERTYNAME_ADDSPACING;
+        lPropertyValues[ OFFSET_ADDSPACINGATPAGES - 1		].Name = sNode + PROPERTYNAME_ADDSPACINGATPAGES;
+        lPropertyValues[ OFFSET_USEOURTABSTOPS - 1			].Name = sNode + PROPERTYNAME_USEOURTABSTOPS;
+        lPropertyValues[ OFFSET_NOEXTLEADING - 1			].Name = sNode + PROPERTYNAME_NOEXTLEADING;
+        lPropertyValues[ OFFSET_USELINESPACING - 1			].Name = sNode + PROPERTYNAME_USELINESPACING;
+        lPropertyValues[ OFFSET_ADDTABLESPACING - 1			].Name = sNode + PROPERTYNAME_ADDTABLESPACING;
+        lPropertyValues[ OFFSET_USEOBJPOS - 1				].Name = sNode + PROPERTYNAME_USEOBJPOS;
+        lPropertyValues[ OFFSET_USEOURTEXTWRAPPING - 1		].Name = sNode + PROPERTYNAME_USEOURTEXTWRAP;
         lPropertyValues[ OFFSET_CONSIDERWRAPPINGSTYLE - 1   ].Name = sNode + PROPERTYNAME_CONSIDERWRAPSTYLE;
         lPropertyValues[ OFFSET_EXPANDWORDSPACE - 1         ].Name = sNode + PROPERTYNAME_EXPANDWORDSPACE;
 
-        lPropertyValues[ OFFSET_MODULE - 1                  ].Value <<= aItem.sModule;
-        lPropertyValues[ OFFSET_USEPRTMETRICS - 1           ].Value <<= aItem.bUsePrtMetrics;
-        lPropertyValues[ OFFSET_ADDSPACING - 1              ].Value <<= aItem.bAddSpacing;
-        lPropertyValues[ OFFSET_ADDSPACINGATPAGES - 1       ].Value <<= aItem.bAddSpacingAtPages;
-        lPropertyValues[ OFFSET_USEOURTABSTOPS - 1          ].Value <<= aItem.bUseOurTabStops;
-        lPropertyValues[ OFFSET_NOEXTLEADING - 1            ].Value <<= aItem.bNoExtLeading;
-        lPropertyValues[ OFFSET_USELINESPACING - 1          ].Value <<= aItem.bUseLineSpacing;
-        lPropertyValues[ OFFSET_ADDTABLESPACING - 1         ].Value <<= aItem.bAddTableSpacing;
-        lPropertyValues[ OFFSET_USEOBJPOS - 1               ].Value <<= aItem.bUseObjPos;
-        lPropertyValues[ OFFSET_USEOURTEXTWRAPPING - 1      ].Value <<= aItem.bUseOurTextWrapping;
+        lPropertyValues[ OFFSET_MODULE - 1					].Value <<= aItem.sModule;
+        lPropertyValues[ OFFSET_USEPRTMETRICS - 1			].Value <<= aItem.bUsePrtMetrics;
+        lPropertyValues[ OFFSET_ADDSPACING - 1				].Value <<= aItem.bAddSpacing;
+        lPropertyValues[ OFFSET_ADDSPACINGATPAGES - 1		].Value <<= aItem.bAddSpacingAtPages;
+        lPropertyValues[ OFFSET_USEOURTABSTOPS - 1			].Value <<= aItem.bUseOurTabStops;
+        lPropertyValues[ OFFSET_NOEXTLEADING - 1			].Value <<= aItem.bNoExtLeading;
+        lPropertyValues[ OFFSET_USELINESPACING - 1			].Value <<= aItem.bUseLineSpacing;
+        lPropertyValues[ OFFSET_ADDTABLESPACING - 1			].Value <<= aItem.bAddTableSpacing;
+        lPropertyValues[ OFFSET_USEOBJPOS - 1				].Value <<= aItem.bUseObjPos;
+        lPropertyValues[ OFFSET_USEOURTEXTWRAPPING - 1  	].Value <<= aItem.bUseOurTextWrapping;
         lPropertyValues[ OFFSET_CONSIDERWRAPPINGSTYLE - 1   ].Value <<= aItem.bConsiderWrappingStyle;
         lPropertyValues[ OFFSET_EXPANDWORDSPACE - 1         ].Value <<= aItem.bExpandWordSpace;
 
@@ -501,7 +536,7 @@ void SvtCompatibilityOptions_Impl::Commit()
 }
 
 //*****************************************************************************************************************
-//  public method
+//	public method
 //*****************************************************************************************************************
 void SvtCompatibilityOptions_Impl::Clear()
 {
@@ -510,7 +545,7 @@ void SvtCompatibilityOptions_Impl::Clear()
 }
 
 //*****************************************************************************************************************
-//  public method
+//	public method
 //*****************************************************************************************************************
 Sequence< Sequence< PropertyValue > > SvtCompatibilityOptions_Impl::GetList() const
 {
@@ -520,10 +555,10 @@ Sequence< Sequence< PropertyValue > > SvtCompatibilityOptions_Impl::GetList() co
 }
 
 //*****************************************************************************************************************
-//  public method
+//	public method
 //*****************************************************************************************************************
 
-void SvtCompatibilityOptions_Impl::AppendItem(  const ::rtl::OUString& _sName,
+void SvtCompatibilityOptions_Impl::AppendItem(	const ::rtl::OUString& _sName,
                                                 const ::rtl::OUString& _sModule,
                                                 bool _bUsePrtMetrics,
                                                 bool _bAddSpacing,
@@ -559,7 +594,7 @@ void SvtCompatibilityOptions_Impl::AppendItem(  const ::rtl::OUString& _sName,
 }
 
 //*****************************************************************************************************************
-//  private method
+//	private method
 //*****************************************************************************************************************
 Sequence< OUString > SvtCompatibilityOptions_Impl::impl_GetPropertyNames( Sequence< OUString >& rItems )
 {
@@ -573,7 +608,7 @@ Sequence< OUString > SvtCompatibilityOptions_Impl::impl_GetPropertyNames( Sequen
 }
 
 //*****************************************************************************************************************
-//  private method
+//	private method
 //*****************************************************************************************************************
 void SvtCompatibilityOptions_Impl::impl_ExpandPropertyNames(
     const Sequence< OUString >& lSource, Sequence< OUString >& lDestination )
@@ -629,15 +664,15 @@ void SvtCompatibilityOptions_Impl::impl_ExpandPropertyNames(
 }
 
 //*****************************************************************************************************************
-//  initialize static member
-//  DON'T DO IT IN YOUR HEADER!
-//  see definition for further informations
+//	initialize static member
+//	DON'T DO IT IN YOUR HEADER!
+//	see definition for further informations
 //*****************************************************************************************************************
-SvtCompatibilityOptions_Impl*   SvtCompatibilityOptions::m_pDataContainer = NULL;
-sal_Int32                       SvtCompatibilityOptions::m_nRefCount = 0;
+SvtCompatibilityOptions_Impl*	SvtCompatibilityOptions::m_pDataContainer = NULL;
+sal_Int32						SvtCompatibilityOptions::m_nRefCount = 0;
 
 //*****************************************************************************************************************
-//  constructor
+//	constructor
 //*****************************************************************************************************************
 SvtCompatibilityOptions::SvtCompatibilityOptions()
 {
@@ -654,7 +689,7 @@ SvtCompatibilityOptions::SvtCompatibilityOptions()
 }
 
 //*****************************************************************************************************************
-//  destructor
+//	destructor
 //*****************************************************************************************************************
 SvtCompatibilityOptions::~SvtCompatibilityOptions()
 {
@@ -672,7 +707,7 @@ SvtCompatibilityOptions::~SvtCompatibilityOptions()
 }
 
 //*****************************************************************************************************************
-//  public method
+//	public method
 //*****************************************************************************************************************
 void SvtCompatibilityOptions::Clear()
 {
@@ -680,8 +715,13 @@ void SvtCompatibilityOptions::Clear()
     m_pDataContainer->Clear();
 }
 
+void SvtCompatibilityOptions::SetDefault( ::rtl::OUString sName, bool bValue )
+{
+    m_pDataContainer->SetDefault( sName, bValue );
+}
+
 //*****************************************************************************************************************
-//  public method
+//	public method
 //*****************************************************************************************************************
 void SvtCompatibilityOptions::AppendItem( const ::rtl::OUString& sName,
                                           const ::rtl::OUString& sModule,
@@ -778,7 +818,7 @@ Sequence< Sequence< PropertyValue > > SvtCompatibilityOptions::GetList() const
 }
 
 //*****************************************************************************************************************
-//  private method
+//	private method
 //*****************************************************************************************************************
 Mutex& SvtCompatibilityOptions::GetOwnStaticMutex()
 {
diff --git a/unotools/source/config/configitem.cxx b/unotools/source/config/configitem.cxx
index e191f471057a..a3268cffc38f 100644
--- a/unotools/source/config/configitem.cxx
+++ b/unotools/source/config/configitem.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
@@ -94,8 +94,8 @@ namespace utl{
     >
     {
         public:
-            ConfigItem*                 pParent;
-            const Sequence< OUString >  aPropertyNames;
+            ConfigItem* 				pParent;
+            const Sequence< OUString > 	aPropertyNames;
             ConfigChangeListener_Impl(ConfigItem& rItem, const Sequence< OUString >& rNames);
             ~ConfigChangeListener_Impl();
 
@@ -110,12 +110,12 @@ namespace utl{
  ---------------------------------------------------------------------------*/
 struct ConfigItem_Impl
 {
-    utl::ConfigManager*         pManager;
-       sal_Int16                    nMode;
-    sal_Bool                    bIsModified;
+    utl::ConfigManager* 		pManager;
+       sal_Int16 					nMode;
+    sal_Bool					bIsModified;
     sal_Bool                    bEnableInternalNotification;
 
-    sal_Int16                   nInValueChange;
+    sal_Int16					nInValueChange;
     ConfigItem_Impl() :
         pManager(0),
         nMode(0),
@@ -200,7 +200,7 @@ void ConfigChangeListener_Impl::changesOccurred( const ChangesEvent& rEvent ) th
 {
     const ElementChange* pElementChanges = rEvent.Changes.getConstArray();
 
-    Sequence<OUString>  aChangedNames(rEvent.Changes.getLength());
+    Sequence<OUString>	aChangedNames(rEvent.Changes.getLength());
     OUString* pNames = aChangedNames.getArray();
 
     const OUString* pCheckPropertyNames = aPropertyNames.getConstArray();
@@ -254,7 +254,7 @@ ConfigItem::ConfigItem(const OUString rSubTree, sal_Int16 nSetMode ) :
 /* -----------------------------17.11.00 13:53--------------------------------
 
  ---------------------------------------------------------------------------*/
-ConfigItem::ConfigItem(utl::ConfigManager&  rManager, const rtl::OUString rSubTree) :
+ConfigItem::ConfigItem(utl::ConfigManager& 	rManager, const rtl::OUString rSubTree) :
     sSubTree(rSubTree),
     pImpl(new ConfigItem_Impl)
 {
@@ -284,7 +284,7 @@ ConfigItem::~ConfigItem()
 /* -----------------------------29.08.00 12:52--------------------------------
 
  ---------------------------------------------------------------------------*/
-void    ConfigItem::ReleaseConfigMgr()
+void	ConfigItem::ReleaseConfigMgr()
 {
     Reference<XHierarchicalNameAccess> xHierarchyAccess = GetTree();
     if(xHierarchyAccess.is())
@@ -340,30 +340,30 @@ sal_Bool lcl_IsLocalProperty(const OUString& rSubTree, const OUString& rProperty
 /* -----------------------------10.04.01 15:00--------------------------------
 
  ---------------------------------------------------------------------------*/
-void ConfigItem::impl_packLocalizedProperties(  const   Sequence< OUString >&   lInNames    ,
-                                                const   Sequence< Any >&        lInValues   ,
-                                                        Sequence< Any >&        lOutValues  )
+void ConfigItem::impl_packLocalizedProperties(	const	Sequence< OUString >&	lInNames	,
+                                                const	Sequence< Any >&		lInValues	,
+                                                        Sequence< Any >&		lOutValues	)
 {
     // Safe impossible cases.
     // This method should be called for special ConfigItem-mode only!
     OSL_ENSURE( ((pImpl->nMode & CONFIG_MODE_ALL_LOCALES ) == CONFIG_MODE_ALL_LOCALES), "ConfigItem::impl_packLocalizedProperties()\nWrong call of this method detected!\n" );
 
-    sal_Int32                   nSourceCounter      ;   // used to step during input lists
-    sal_Int32                   nSourceSize         ;   // marks end of loop over input lists
-    sal_Int32                   nDestinationCounter ;   // actual position in output lists
-    sal_Int32                   nPropertyCounter    ;   // counter of inner loop for Sequence< PropertyValue >
-    sal_Int32                   nPropertiesSize     ;   // marks end of inner loop
-    Sequence< OUString >        lPropertyNames      ;   // list of all locales for localized entry
-    Sequence< PropertyValue >   lProperties         ;   // localized values of an configuration entry packed for return
-    Reference< XInterface >     xLocalizedNode      ;   // if cfg entry is localized ... lInValues contains an XInterface!
+    sal_Int32					nSourceCounter		;	// used to step during input lists
+    sal_Int32					nSourceSize			;	// marks end of loop over input lists
+    sal_Int32					nDestinationCounter	;	// actual position in output lists
+    sal_Int32					nPropertyCounter	;	// counter of inner loop for Sequence< PropertyValue >
+    sal_Int32					nPropertiesSize		;	// marks end of inner loop
+    Sequence< OUString >		lPropertyNames		;	// list of all locales for localized entry
+    Sequence< PropertyValue >	lProperties			;	// localized values of an configuration entry packed for return
+    Reference< XInterface >		xLocalizedNode		;	// if cfg entry is localized ... lInValues contains an XInterface!
 
     // Optimise follow algorithm ... A LITTLE BIT :-)
     // There exist two different possibilities:
-    //  i ) There exist no localized entries ...                        =>  size of lOutValues will be the same like lInNames/lInValues!
-    //  ii) There exist some (mostly one or two) localized entries ...  =>  size of lOutValues will be the same like lInNames/lInValues!
-    //  ... Why? If a localized value exist - the any is filled with an XInterface object (is a SetNode-service).
-    //      We read all his child nodes and pack it into Sequence< PropertyValue >.
-    //      The result list we pack into the return any. We never change size of lists!
+    //	i )	There exist no localized entries ...						=>	size of lOutValues will be the same like lInNames/lInValues!
+    //	ii)	There exist some (mostly one or two) localized entries ...	=>	size of lOutValues will be the same like lInNames/lInValues!
+    //	... Why? If a localized value exist - the any is filled with an XInterface object (is a SetNode-service).
+    //		We read all his child nodes and pack it into Sequence< PropertyValue >.
+    //		The result list we pack into the return any. We never change size of lists!
     nSourceSize = lInNames.getLength();
     lOutValues.realloc( nSourceSize );
 
@@ -383,9 +383,9 @@ void ConfigItem::impl_packLocalizedProperties(  const   Sequence< OUString >&
             Reference< XNameContainer > xSetAccess( xLocalizedNode, UNO_QUERY );
             if( xSetAccess.is() == sal_True )
             {
-                lPropertyNames  =   xSetAccess->getElementNames()   ;
-                nPropertiesSize =   lPropertyNames.getLength()      ;
-                lProperties.realloc( nPropertiesSize )              ;
+                lPropertyNames	=	xSetAccess->getElementNames()	;
+                nPropertiesSize	=	lPropertyNames.getLength()		;
+                lProperties.realloc( nPropertiesSize )				;
 
                 for( nPropertyCounter=0; nPropertyCounter<nPropertiesSize; ++nPropertyCounter )
                 {
@@ -394,10 +394,10 @@ void ConfigItem::impl_packLocalizedProperties(  const   Sequence< OUString >&
                     OUString sPropName   = lInNames[nSourceCounter];
                     OUString sLocaleName = lPropertyNames[nPropertyCounter];
                     #endif
-                    lProperties[nPropertyCounter].Name  =   lPropertyNames[nPropertyCounter]                            ;
+                    lProperties[nPropertyCounter].Name	=	lPropertyNames[nPropertyCounter]							;
                     OUString sLocaleValue;
-                    xSetAccess->getByName( lPropertyNames[nPropertyCounter] ) >>= sLocaleValue  ;
-                    lProperties[nPropertyCounter].Value <<= sLocaleValue;
+                    xSetAccess->getByName( lPropertyNames[nPropertyCounter] ) >>= sLocaleValue	;
+                    lProperties[nPropertyCounter].Value	<<=	sLocaleValue;
                 }
 
                 lOutValues[nDestinationCounter] <<= lProperties;
@@ -414,35 +414,35 @@ void ConfigItem::impl_packLocalizedProperties(  const   Sequence< OUString >&
 /* -----------------------------10.04.01 15:00--------------------------------
 
  ---------------------------------------------------------------------------*/
-void ConfigItem::impl_unpackLocalizedProperties(    const   Sequence< OUString >&   lInNames    ,
-                                                    const   Sequence< Any >&        lInValues   ,
-                                                            Sequence< OUString >&   lOutNames   ,
-                                                            Sequence< Any >&        lOutValues  )
+void ConfigItem::impl_unpackLocalizedProperties(	const	Sequence< OUString >&	lInNames	,
+                                                    const	Sequence< Any >&		lInValues	,
+                                                            Sequence< OUString >&	lOutNames	,
+                                                            Sequence< Any >&		lOutValues	)
 {
     // Safe impossible cases.
     // This method should be called for special ConfigItem-mode only!
     OSL_ENSURE( ((pImpl->nMode & CONFIG_MODE_ALL_LOCALES ) == CONFIG_MODE_ALL_LOCALES), "ConfigItem::impl_unpackLocalizedProperties()\nWrong call of this method detected!\n" );
 
-    sal_Int32                   nSourceCounter      ;   // used to step during input lists
-    sal_Int32                   nSourceSize         ;   // marks end of loop over input lists
-    sal_Int32                   nDestinationCounter ;   // actual position in output lists
-    sal_Int32                   nPropertyCounter    ;   // counter of inner loop for Sequence< PropertyValue >
-    sal_Int32                   nPropertiesSize     ;   // marks end of inner loop
-    OUString                    sNodeName           ;   // base name of node ( e.g. "UIName/" ) ... expand to locale ( e.g. "UIName/de" )
-    Sequence< PropertyValue >   lProperties         ;   // localized values of an configuration entry getted from lInValues-Any
+    sal_Int32					nSourceCounter		;	// used to step during input lists
+    sal_Int32					nSourceSize			;	// marks end of loop over input lists
+    sal_Int32					nDestinationCounter	;	// actual position in output lists
+    sal_Int32					nPropertyCounter	;	// counter of inner loop for Sequence< PropertyValue >
+    sal_Int32					nPropertiesSize		;	// marks end of inner loop
+    OUString					sNodeName			;	// base name of node ( e.g. "UIName/" ) ... expand to locale ( e.g. "UIName/de" )
+    Sequence< PropertyValue >	lProperties			;	// localized values of an configuration entry getted from lInValues-Any
 
     // Optimise follow algorithm ... A LITTLE BIT :-)
     // There exist two different possibilities:
-    //  i ) There exist no localized entries ...                        =>  size of lOutNames/lOutValues will be the same like lInNames/lInValues!
-    //  ii) There exist some (mostly one or two) localized entries ...  =>  size of lOutNames/lOutValues will be some bytes greater then lInNames/lInValues.
-    //  =>  I think we should make it fast for i). ii) is a special case and mustn't be SOOOO... fast.
-    //      We should reserve same space for output list like input ones first.
-    //      Follow algorithm looks for these borders and change it for ii) only!
-    //      It will be faster then a "realloc()" call in every loop ...
+    //	i )	There exist no localized entries ...						=>	size of lOutNames/lOutValues will be the same like lInNames/lInValues!
+    //	ii)	There exist some (mostly one or two) localized entries ...	=>	size of lOutNames/lOutValues will be some bytes greater then lInNames/lInValues.
+    //	=>	I think we should make it fast for i). ii) is a special case and mustn't be SOOOO... fast.
+    //		We should reserve same space for output list like input ones first.
+    //		Follow algorithm looks for these borders and change it for ii) only!
+    //		It will be faster then a "realloc()" call in every loop ...
     nSourceSize = lInNames.getLength();
 
-    lOutNames.realloc   ( nSourceSize );
-    lOutValues.realloc  ( nSourceSize );
+    lOutNames.realloc	( nSourceSize );
+    lOutValues.realloc	( nSourceSize );
 
     // Algorithm:
     // Copy all names and values from const to return lists.
@@ -455,21 +455,21 @@ void ConfigItem::impl_unpackLocalizedProperties(    const   Sequence< OUString >
         // If item a special localized one ... split it and insert his parts to output lists ...
         if( lInValues[nSourceCounter].getValueType() == ::getCppuType( (const Sequence< PropertyValue >*)NULL ) )
         {
-            lInValues[nSourceCounter]   >>= lProperties             ;
-            sNodeName               =   lInNames[nSourceCounter]    ;
-            sNodeName               +=  C2U("/")                    ;
-            nPropertiesSize         =   lProperties.getLength()     ;
+            lInValues[nSourceCounter]	>>=	lProperties				;
+            sNodeName				=	lInNames[nSourceCounter] 	;
+            sNodeName				+=	C2U("/")					;
+            nPropertiesSize			=	lProperties.getLength()		;
 
             if( (nDestinationCounter+nPropertiesSize) > lOutNames.getLength() )
             {
-                lOutNames.realloc   ( nDestinationCounter+nPropertiesSize );
-                lOutValues.realloc  ( nDestinationCounter+nPropertiesSize );
+                lOutNames.realloc	( nDestinationCounter+nPropertiesSize );
+                lOutValues.realloc	( nDestinationCounter+nPropertiesSize );
             }
 
             for( nPropertyCounter=0; nPropertyCounter<nPropertiesSize; ++nPropertyCounter )
             {
-                 lOutNames [nDestinationCounter] = sNodeName + lProperties[nPropertyCounter].Name   ;
-                lOutValues[nDestinationCounter] = lProperties[nPropertyCounter].Value               ;
+                 lOutNames [nDestinationCounter] = sNodeName + lProperties[nPropertyCounter].Name	;
+                lOutValues[nDestinationCounter] = lProperties[nPropertyCounter].Value				;
                 ++nDestinationCounter;
             }
         }
@@ -478,8 +478,8 @@ void ConfigItem::impl_unpackLocalizedProperties(    const   Sequence< OUString >
         {
             if( (nDestinationCounter+1) > lOutNames.getLength() )
             {
-                lOutNames.realloc   ( nDestinationCounter+1 );
-                lOutValues.realloc  ( nDestinationCounter+1 );
+                lOutNames.realloc	( nDestinationCounter+1 );
+                lOutValues.realloc	( nDestinationCounter+1 );
             }
 
             lOutNames [nDestinationCounter] = lInNames [nSourceCounter];
@@ -647,11 +647,11 @@ sal_Bool ConfigItem::PutProperties( const Sequence< OUString >& rNames,
     sal_Bool bRet = xHierarchyAccess.is() && xTopNodeReplace.is();
     if(bRet)
     {
-        Sequence< OUString >    lNames          ;
-        Sequence< Any >         lValues         ;
-        const OUString*         pNames  = NULL  ;
-        const Any*              pValues = NULL  ;
-        sal_Int32               nNameCount      ;
+        Sequence< OUString >	lNames			;
+        Sequence< Any >			lValues			;
+        const OUString*			pNames	= NULL	;
+        const Any*				pValues	= NULL	;
+        sal_Int32				nNameCount		;
         if(( pImpl->nMode & CONFIG_MODE_ALL_LOCALES ) == CONFIG_MODE_ALL_LOCALES )
         {
             // If ConfigItem works in "ALL_LOCALES"-mode ... we must support a Sequence< PropertyValue >
@@ -659,17 +659,17 @@ sal_Bool ConfigItem::PutProperties( const Sequence< OUString >& rNames,
             // How we can do that?
             // We must split all PropertyValues to "Sequence< OUString >" AND "Sequence< Any >"!
             impl_unpackLocalizedProperties( rNames, rValues, lNames, lValues );
-            pNames      = lNames.getConstArray  ();
-            pValues     = lValues.getConstArray ();
-            nNameCount  = lNames.getLength      ();
+            pNames		= lNames.getConstArray	();
+            pValues		= lValues.getConstArray	();
+            nNameCount	= lNames.getLength		();
         }
         else
         {
             // This is the normal mode ...
             // Use given input lists directly.
-            pNames      = rNames.getConstArray  ();
-            pValues     = rValues.getConstArray ();
-            nNameCount  = rNames.getLength      ();
+            pNames		= rNames.getConstArray	();
+            pValues		= rValues.getConstArray	();
+            nNameCount	= rNames.getLength		();
         }
         for(int i = 0; i < nNameCount; i++)
         {
@@ -1194,7 +1194,7 @@ sal_Bool ConfigItem::ReplaceSetProperties(
                         xCont->insertByName(pSubNodeNames[j], aVal);
                     }
                 }
-                try { xBatch->commitChanges(); }
+                try	{ xBatch->commitChanges(); }
                 CATCH_INFO("Exception from commitChanges(): ")
 
                 const PropertyValue* pProperties = rValues.getConstArray();
@@ -1356,14 +1356,14 @@ sal_Bool ConfigItem::AddNode(const rtl::OUString& rNode, const rtl::OUString& rN
 /* -----------------------------12.02.01 11:38--------------------------------
 
  ---------------------------------------------------------------------------*/
-sal_Int16   ConfigItem::GetMode() const
+sal_Int16 	ConfigItem::GetMode() const
 {
     return pImpl->nMode;
 }
 /* -----------------------------12.02.01 13:31--------------------------------
 
  ---------------------------------------------------------------------------*/
-void    ConfigItem::SetModified()
+void 	ConfigItem::SetModified()
 {
     pImpl->bIsModified = sal_True;
 }
diff --git a/unotools/source/config/configmgr.cxx b/unotools/source/config/configmgr.cxx
index 0df6d49afe59..9f8b9045c3e0 100644
--- a/unotools/source/config/configmgr.cxx
+++ b/unotools/source/config/configmgr.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
@@ -90,15 +90,15 @@ namespace
 //-----------------------------------------------------------------------------
 struct ConfigItemListEntry_Impl
 {
-    ConfigItem*                 pConfigItem;
+    ConfigItem* 				pConfigItem;
 
-    ConfigItemListEntry_Impl(ConfigItem*    pItem ) :
+    ConfigItemListEntry_Impl(ConfigItem* 	pItem ) :
         pConfigItem(pItem){}
 };
 typedef std::list<ConfigItemListEntry_Impl> ConfigItemList;
 struct utl::ConfigMgr_Impl
 {
-    ConfigItemList                          aItemList;
+    ConfigItemList 							aItemList;
 };
 
 /* -----------------------------28.08.00 15:35--------------------------------
@@ -352,11 +352,11 @@ void ConfigManager::StoreConfigItems()
         }
     }
 }
-ConfigManager*   ConfigManager::pConfigManager = 0;
+ConfigManager*	 ConfigManager::pConfigManager = 0;
 /* -----------------------------07.09.00 11:06--------------------------------
 
  ---------------------------------------------------------------------------*/
-ConfigManager*  ConfigManager::GetConfigManager()
+ConfigManager*	ConfigManager::GetConfigManager()
 {
     if(!pConfigManager)
     {
@@ -367,7 +367,7 @@ ConfigManager*  ConfigManager::GetConfigManager()
 /* -----------------------------07.09.00 11:06--------------------------------
 
  ---------------------------------------------------------------------------*/
-void    ConfigManager::RemoveConfigManager()
+void	ConfigManager::RemoveConfigManager()
 {
     if(pConfigManager)
     {
@@ -495,7 +495,7 @@ Any ConfigManager::GetDirectConfigProperty(ConfigProperty eProp)
     OUString sPath = C2U(cConfigBaseURL);
     switch(eProp)
     {
-        case LOCALE:                        sPath += C2U("Setup/L10N"); break;
+        case LOCALE:						sPath += C2U("Setup/L10N"); break;
 
         case PRODUCTNAME:
         case PRODUCTVERSION:
@@ -506,7 +506,7 @@ Any ConfigManager::GetDirectConfigProperty(ConfigProperty eProp)
         case OOOVENDOR:
         case ABOUTBOXPRODUCTVERSION:        sPath += C2U("Setup/Product"); break;
 
-        case DEFAULTCURRENCY:               sPath += C2U("Setup/L10N"); break;
+        case DEFAULTCURRENCY:				sPath += C2U("Setup/L10N"); break;
 
         case WRITERCOMPATIBILITYVERSIONOOO11:
             sPath += C2U("Office.Compatibility/WriterCompatibilityVersion"); break;
@@ -533,17 +533,17 @@ Any ConfigManager::GetDirectConfigProperty(ConfigProperty eProp)
         OUString sProperty;
         switch(eProp)
         {
-            case LOCALE:                            sProperty = C2U("ooLocale"); break;
-            case PRODUCTNAME:                       sProperty = C2U("ooName"); break;
-            case PRODUCTVERSION:                    sProperty = C2U("ooSetupVersion"); break;
-            case ABOUTBOXPRODUCTVERSION:            sProperty = C2U("ooSetupVersionAboutBox"); break;
+            case LOCALE:							sProperty = C2U("ooLocale"); break;
+            case PRODUCTNAME:						sProperty = C2U("ooName"); break;
+            case PRODUCTVERSION:					sProperty = C2U("ooSetupVersion"); break;
+            case ABOUTBOXPRODUCTVERSION: 			sProperty = C2U("ooSetupVersionAboutBox"); break;
             case OOOVENDOR:                         sProperty = C2U("ooVendor"); break;
-            case PRODUCTEXTENSION:                  sProperty = C2U("ooSetupExtension"); break;
+            case PRODUCTEXTENSION:					sProperty = C2U("ooSetupExtension"); break;
             case PRODUCTXMLFILEFORMATNAME:          sProperty = C2U("ooXMLFileFormatName"); break;
             case PRODUCTXMLFILEFORMATVERSION:       sProperty = C2U("ooXMLFileFormatVersion"); break;
             case OPENSOURCECONTEXT:                 sProperty = C2U("ooOpenSourceContext"); break;
             case DEFAULTCURRENCY:                   sProperty = C2U("ooSetupCurrency"); break;
-            case WRITERCOMPATIBILITYVERSIONOOO11:   sProperty = C2U("OOo11"); break;
+            case WRITERCOMPATIBILITYVERSIONOOO11:	sProperty = C2U("OOo11"); break;
             default:
                 break;
         }
@@ -740,7 +740,7 @@ void ConfigManager::PutLocalProperty(const OUString& rProperty, const Any& rValu
 /* -----------------------------13.12.00 08:47--------------------------------
 
  ---------------------------------------------------------------------------*/
-sal_Bool    ConfigManager::IsLocalConfigProvider()
+sal_Bool	ConfigManager::IsLocalConfigProvider()
 {
     return false;
 }
diff --git a/unotools/source/config/confignode.cxx b/unotools/source/config/confignode.cxx
index 181c7ca46c8f..9426e4b5b863 100644
--- a/unotools/source/config/confignode.cxx
+++ b/unotools/source/config/confignode.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
@@ -280,7 +280,7 @@ namespace utl
         Reference< XSingleServiceFactory > xChildFactory(m_xContainerAccess, UNO_QUERY);
         OSL_ENSURE(xChildFactory.is(), "OConfigurationNode::createNode: object is invalid or read-only!");
 
-        if (xChildFactory.is()) // implies m_xContainerAccess.is()
+        if (xChildFactory.is())	// implies m_xContainerAccess.is()
         {
             Reference< XInterface > xNewChild;
             try
@@ -660,6 +660,6 @@ namespace utl
     }
 
 //........................................................................
-}   // namespace utl
+}	// namespace utl
 //........................................................................
 
diff --git a/unotools/source/config/configpathes.cxx b/unotools/source/config/configpathes.cxx
index dc66854a8d43..538b0a7aead6 100644
--- a/unotools/source/config/configpathes.cxx
+++ b/unotools/source/config/configpathes.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
@@ -68,7 +68,7 @@ void lcl_resolveCharEntities(OUString & aLocalString)
         if (ch)
         {
             aResult.append(aLocalString.copy(nStart,nEscapePos-nStart)).append(ch);
-
+            
             sal_Int32 nEscapeEnd=aLocalString.indexOf(';',nEscapePos);
             nStart = nEscapeEnd+1;
             nEscapePos=aLocalString.indexOf('&',nStart);
@@ -81,12 +81,12 @@ void lcl_resolveCharEntities(OUString & aLocalString)
     while ( nEscapePos > 0);
 
     aResult.append(aLocalString.copy(nStart));
-
+   
     aLocalString = aResult.makeStringAndClear();
 }
 
 //----------------------------------------------------------------------------
-sal_Bool splitLastFromConfigurationPath(OUString const& _sInPath,
+sal_Bool splitLastFromConfigurationPath(OUString const& _sInPath, 
                                         OUString& _rsOutPath,
                                         OUString& _rsLocalName)
 {
@@ -138,8 +138,8 @@ sal_Bool splitLastFromConfigurationPath(OUString const& _sInPath,
         nPos = _sInPath.lastIndexOf('/',nEnd);
         nStart = nPos + 1;
     }
-    OSL_ASSERT( -1 <= nPos &&
-                nPos < nStart &&
+    OSL_ASSERT( -1 <= nPos && 
+                nPos < nStart && 
                 nStart < nEnd &&
                 nEnd <= _sInPath.getLength() );
 
@@ -154,7 +154,7 @@ sal_Bool splitLastFromConfigurationPath(OUString const& _sInPath,
 }
 
 //----------------------------------------------------------------------------
-OUString extractFirstFromConfigurationPath(OUString const& _sInPath)
+OUString extractFirstFromConfigurationPath(OUString const& _sInPath, OUString* _sOutPath)
 {
     sal_Int32 nSep      = _sInPath.indexOf('/');
     sal_Int32 nBracket  = _sInPath.indexOf('[');
@@ -179,8 +179,7 @@ OUString extractFirstFromConfigurationPath(OUString const& _sInPath)
                 nBracket = nEnd;
             }
             OSL_ENSURE(nEnd > nStart && _sInPath[nBracket] == ']', "Invalid config path: improper mismatch of quote or bracket");
-            OSL_DEBUG_ONLY(nSep = nBracket+1);
-            OSL_ENSURE(nSep == _sInPath.getLength() || _sInPath[nSep] == '/', "Invalid config path: brackets not followed by slash");
+            OSL_ENSURE((nBracket+1 == _sInPath.getLength() && nSep == -1) || (_sInPath[nBracket+1] == '/' && nSep == nBracket+1), "Invalid config path: brackets not followed by slash");
         }
         else // ... but our initial element name is in simple form
             nStart = 0;
@@ -188,6 +187,12 @@ OUString extractFirstFromConfigurationPath(OUString const& _sInPath)
 
     OUString sResult = (nEnd >= 0) ? _sInPath.copy(nStart, nEnd-nStart) : _sInPath;
     lcl_resolveCharEntities(sResult);
+
+    if (_sOutPath != 0)
+    {
+        *_sOutPath = (nSep >= 0) ? _sInPath.copy(nSep + 1) : OUString();
+    }
+
     return sResult;
 }
 
@@ -202,7 +207,7 @@ sal_Int32 lcl_findPrefixEnd(OUString const& _sNestedPath, OUString const& _sPref
 
     OSL_ENSURE(nPrefixLength == 0 || _sPrefixPath[nPrefixLength-1] != '/',
                 "Cannot handle slash-terminated prefix pathes");
-
+        
     sal_Bool bIsPrefix;
     if (_sNestedPath.getLength() > nPrefixLength)
     {
@@ -218,19 +223,19 @@ sal_Int32 lcl_findPrefixEnd(OUString const& _sNestedPath, OUString const& _sPref
     {
         bIsPrefix = false;
     }
-
+    
     return bIsPrefix ? nPrefixLength : 0;
 }
 
 //----------------------------------------------------------------------------
-sal_Bool isPrefixOfConfigurationPath(OUString const& _sNestedPath,
+sal_Bool isPrefixOfConfigurationPath(OUString const& _sNestedPath, 
                                      OUString const& _sPrefixPath)
 {
     return _sPrefixPath.getLength() == 0 || lcl_findPrefixEnd(_sNestedPath,_sPrefixPath) != 0;
 }
 
 //----------------------------------------------------------------------------
-OUString dropPrefixFromConfigurationPath(OUString const& _sNestedPath,
+OUString dropPrefixFromConfigurationPath(OUString const& _sNestedPath, 
                                          OUString const& _sPrefixPath)
 {
     if ( sal_Int32 nPrefixEnd = lcl_findPrefixEnd(_sNestedPath,_sPrefixPath) )
@@ -274,7 +279,7 @@ OUString lcl_wrapName(const OUString& _sContent, const OUString& _sType)
         case sal_Unicode('\"'): aNormalized.appendAscii( RTL_CONSTASCII_STRINGPARAM("&quot;") ); break;
 
         default: aNormalized.append( *pCur );
-        }
+        }            
     }
 
     // suffix: closing quote and bracket
diff --git a/unotools/source/config/configvaluecontainer.cxx b/unotools/source/config/configvaluecontainer.cxx
index 653305f92f74..47ee26d4ae6a 100644
--- a/unotools/source/config/configvaluecontainer.cxx
+++ b/unotools/source/config/configvaluecontainer.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
@@ -60,10 +60,10 @@ namespace utl
     struct NodeValueAccessor
     {
     private:
-        ::rtl::OUString     sRelativePath;      // the relative path of the node
-        LocationType        eLocationType;      // the type of location where the value is stored
-        void*               pLocation;          // the pointer to the location
-        Type                aDataType;          // the type object pointed to by pLocation
+        ::rtl::OUString		sRelativePath;		// the relative path of the node
+        LocationType		eLocationType;		// the type of location where the value is stored
+        void*				pLocation;			// the pointer to the location
+        Type				aDataType;			// the type object pointed to by pLocation
 
     public:
         NodeValueAccessor( const ::rtl::OUString& _rNodePath );
@@ -71,11 +71,11 @@ namespace utl
         void bind( void* _pLocation, const Type& _rType );
         void bind( Any* _pLocation );
 
-        bool                    isBound( ) const        { return ( ltUnbound != eLocationType ) && ( NULL != pLocation ); }
-        const ::rtl::OUString&  getPath( ) const        { return sRelativePath; }
-        LocationType            getLocType( ) const     { return eLocationType; }
-        void*                   getLocation( ) const    { return pLocation; }
-        const Type&             getDataType( ) const    { return aDataType; }
+        bool					isBound( ) const		{ return ( ltUnbound != eLocationType ) && ( NULL != pLocation ); }
+        const ::rtl::OUString&	getPath( ) const		{ return sRelativePath; }
+        LocationType			getLocType( ) const		{ return eLocationType; }
+        void*					getLocation( ) const	{ return pLocation; }
+        const Type&				getDataType( ) const	{ return aDataType; }
 
         bool operator == ( const NodeValueAccessor& rhs ) const;
         bool operator != ( const NodeValueAccessor& rhs ) const { return !operator == ( rhs ); }
@@ -96,9 +96,9 @@ namespace utl
 
     bool NodeValueAccessor::operator == ( const NodeValueAccessor& rhs ) const
     {
-        return  (   sRelativePath   ==  rhs.sRelativePath   )
-            &&  (   eLocationType   ==  rhs.eLocationType   )
-            &&  (   pLocation       ==  rhs.pLocation       );
+        return	(	sRelativePath	==	rhs.sRelativePath	)
+            &&	(	eLocationType	==	rhs.eLocationType	)
+            &&	(	pLocation		==	rhs.pLocation		);
     }
 
     //---------------------------------------------------------------------
@@ -156,7 +156,7 @@ namespace utl
                     aBuf.append("::utl::lcl_copyData( Accessor, Any ): could not assign the data (node path: ");
                     aBuf.append( rtl::OUStringToOString( _rAccessor.getPath(), RTL_TEXTENCODING_ASCII_US ) );
                     aBuf.append( " !" );
-                    DBG_ASSERT( bSuccess, aBuf.getStr() );
+                    DBG_ASSERT( bSuccess, aBuf.getStr()	);
                     #endif
                 }
                 else {
@@ -211,8 +211,8 @@ namespace utl
     struct SubNodeAccess : public ::std::unary_function< NodeValueAccessor, void >
     {
     protected:
-        const OConfigurationNode&   m_rRootNode;
-        ::osl::Mutex&               m_rMutex;
+        const OConfigurationNode&	m_rRootNode;
+        ::osl::Mutex&				m_rMutex;
 
     public:
         SubNodeAccess( const OConfigurationNode& _rRootNode, ::osl::Mutex& _rMutex )
@@ -262,11 +262,11 @@ namespace utl
     //=====================================================================
     struct OConfigurationValueContainerImpl
     {
-        Reference< XMultiServiceFactory >       xORB;           // the service factory
-        ::osl::Mutex&                           rMutex;         // the mutex for accessing the data containers
-        OConfigurationTreeRoot                  aConfigRoot;    // the configuration node we're accessing
+        Reference< XMultiServiceFactory >		xORB;			// the service factory
+        ::osl::Mutex&							rMutex;			// the mutex for accessing the data containers
+        OConfigurationTreeRoot					aConfigRoot;	// the configuration node we're accessing
 
-        NodeValueAccessors                      aAccessors;     // the accessors to the node values
+        NodeValueAccessors						aAccessors;		// the accessors to the node values
 
         OConfigurationValueContainerImpl( const Reference< XMultiServiceFactory >& _rxORB, ::osl::Mutex& _rMutex )
             :xORB( _rxORB )
@@ -351,14 +351,14 @@ namespace utl
     {
         // checks ....
         DBG_ASSERT( _pContainer, "OConfigurationValueContainer::registerExchangeLocation: invalid container location!" );
-        DBG_ASSERT( (   TypeClass_CHAR      ==  _rValueType.getTypeClass( ) )
-                ||  (   TypeClass_BOOLEAN   ==  _rValueType.getTypeClass( ) )
-                ||  (   TypeClass_BYTE      ==  _rValueType.getTypeClass( ) )
-                ||  (   TypeClass_SHORT     ==  _rValueType.getTypeClass( ) )
-                ||  (   TypeClass_LONG      ==  _rValueType.getTypeClass( ) )
-                ||  (   TypeClass_DOUBLE    ==  _rValueType.getTypeClass( ) )
-                ||  (   TypeClass_STRING    ==  _rValueType.getTypeClass( ) )
-                ||  (   TypeClass_SEQUENCE  ==  _rValueType.getTypeClass( ) ),
+        DBG_ASSERT(	(	TypeClass_CHAR		==	_rValueType.getTypeClass( )	)
+                ||	(	TypeClass_BOOLEAN	==	_rValueType.getTypeClass( )	)
+                ||	(	TypeClass_BYTE		==	_rValueType.getTypeClass( )	)
+                ||	(	TypeClass_SHORT		==	_rValueType.getTypeClass( )	)
+                ||	(	TypeClass_LONG		==	_rValueType.getTypeClass( )	)
+                ||	(	TypeClass_DOUBLE	==	_rValueType.getTypeClass( )	)
+                ||	(	TypeClass_STRING	==	_rValueType.getTypeClass( )	)
+                ||	(	TypeClass_SEQUENCE	==	_rValueType.getTypeClass( )	),
                 "OConfigurationValueContainer::registerExchangeLocation: invalid type!" );
 
         // build an accessor for this container
@@ -451,6 +451,6 @@ namespace utl
     }
 
 //.........................................................................
-}   // namespace utl
+}	// namespace utl
 //.........................................................................
 
diff --git a/unotools/source/config/defaultoptions.cxx b/unotools/source/config/defaultoptions.cxx
index 1567bd1b841d..1d6913e1b66d 100644
--- a/unotools/source/config/defaultoptions.cxx
+++ b/unotools/source/config/defaultoptions.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
@@ -52,28 +52,28 @@ using namespace com::sun::star::uno;
 
 // define ----------------------------------------------------------------
 
-#define ASCII_STR(s)                OUString( RTL_CONSTASCII_USTRINGPARAM(s) )
-
-#define DEFAULTPATH__ADDIN          0
-#define DEFAULTPATH__AUTOCORRECT    1
-#define DEFAULTPATH__AUTOTEXT       2
-#define DEFAULTPATH__BACKUP         3
-#define DEFAULTPATH__BASIC          4
-#define DEFAULTPATH__BITMAP         5
-#define DEFAULTPATH__CONFIG         6
-#define DEFAULTPATH__DICTIONARY     7
-#define DEFAULTPATH__FAVORITES      8
-#define DEFAULTPATH__FILTER         9
-#define DEFAULTPATH__GALLERY        10
-#define DEFAULTPATH__GRAPHIC        11
-#define DEFAULTPATH__HELP           12
-#define DEFAULTPATH__LINGUISTIC     13
-#define DEFAULTPATH__MODULE         14
-#define DEFAULTPATH__PALETTE        15
-#define DEFAULTPATH__PLUGIN         16
-#define DEFAULTPATH__TEMP           17
-#define DEFAULTPATH__TEMPLATE       18
-#define DEFAULTPATH__USERCONFIG     19
+#define ASCII_STR(s)				OUString( RTL_CONSTASCII_USTRINGPARAM(s) )
+
+#define DEFAULTPATH__ADDIN			0
+#define DEFAULTPATH__AUTOCORRECT	1
+#define DEFAULTPATH__AUTOTEXT		2
+#define DEFAULTPATH__BACKUP			3
+#define DEFAULTPATH__BASIC			4
+#define DEFAULTPATH__BITMAP			5
+#define DEFAULTPATH__CONFIG			6
+#define DEFAULTPATH__DICTIONARY		7
+#define DEFAULTPATH__FAVORITES		8
+#define DEFAULTPATH__FILTER			9
+#define DEFAULTPATH__GALLERY		10
+#define DEFAULTPATH__GRAPHIC		11
+#define DEFAULTPATH__HELP			12
+#define DEFAULTPATH__LINGUISTIC		13
+#define DEFAULTPATH__MODULE			14
+#define DEFAULTPATH__PALETTE		15
+#define DEFAULTPATH__PLUGIN			16
+#define DEFAULTPATH__TEMP			17
+#define DEFAULTPATH__TEMPLATE		18
+#define DEFAULTPATH__USERCONFIG		19
 #define DEFAULTPATH__WORK           20
 #define DEFAULTPATH__USERDICTIONARY 21
 
@@ -82,47 +82,47 @@ using namespace com::sun::star::uno;
 class SvtDefaultOptions_Impl : public utl::ConfigItem
 {
 public:
-    String          m_aAddinPath;
-    String          m_aAutoCorrectPath;
-    String          m_aAutoTextPath;
-    String          m_aBackupPath;
-    String          m_aBasicPath;
-    String          m_aBitmapPath;
-    String          m_aConfigPath;
-    String          m_aDictionaryPath;
-    String          m_aFavoritesPath;
-    String          m_aFilterPath;
-    String          m_aGalleryPath;
-    String          m_aGraphicPath;
-    String          m_aHelpPath;
-    String          m_aLinguisticPath;
-    String          m_aModulePath;
-    String          m_aPalettePath;
-    String          m_aPluginPath;
-    String          m_aTempPath;
-    String          m_aTemplatePath;
-    String          m_aUserConfigPath;
-    String          m_aWorkPath;
+    String			m_aAddinPath;
+    String			m_aAutoCorrectPath;
+    String			m_aAutoTextPath;
+    String			m_aBackupPath;
+    String			m_aBasicPath;
+    String			m_aBitmapPath;
+    String			m_aConfigPath;
+    String			m_aDictionaryPath;
+    String			m_aFavoritesPath;
+    String			m_aFilterPath;
+    String			m_aGalleryPath;
+    String			m_aGraphicPath;
+    String			m_aHelpPath;
+    String			m_aLinguisticPath;
+    String			m_aModulePath;
+    String			m_aPalettePath;
+    String			m_aPluginPath;
+    String			m_aTempPath;
+    String			m_aTemplatePath;
+    String			m_aUserConfigPath;
+    String			m_aWorkPath;
     String          m_aUserDictionaryPath;
 
                     SvtDefaultOptions_Impl();
 
-    String          GetDefaultPath( USHORT nId ) const;
+    String			GetDefaultPath( USHORT nId ) const;
     virtual void    Commit();
     virtual void    Notify( const com::sun::star::uno::Sequence<rtl::OUString>& aPropertyNames);
 };
 
 // global ----------------------------------------------------------------
 
-static SvtDefaultOptions_Impl*  pOptions = NULL;
-static sal_Int32                nRefCount = 0;
+static SvtDefaultOptions_Impl*	pOptions = NULL;
+static sal_Int32				nRefCount = 0;
 
 typedef String SvtDefaultOptions_Impl:: *PathStrPtr;
 
 struct PathToDefaultMapping_Impl
 {
-    SvtPathOptions::Pathes  _ePath;
-    PathStrPtr              _pDefaultPath;
+    SvtPathOptions::Pathes	_ePath;
+    PathStrPtr				_pDefaultPath;
 };
 
 static PathToDefaultMapping_Impl __READONLY_DATA PathMap_Impl[] =
@@ -156,27 +156,27 @@ Sequence< OUString > GetDefaultPropertyNames()
 {
     static const char* aPropNames[] =
     {
-        "Addin",            // PATH_ADDIN
-        "AutoCorrect",      // PATH_AUTOCORRECT
-        "AutoText",         // PATH_AUTOTEXT
-        "Backup",           // PATH_BACKUP
-        "Basic",            // PATH_BASIC
-        "Bitmap",           // PATH_BITMAP
-        "Config",           // PATH_CONFIG
-        "Dictionary",       // PATH_DICTIONARY
-        "Favorite",         // PATH_FAVORITES
-        "Filter",           // PATH_FILTER
-        "Gallery",          // PATH_GALLERY
-        "Graphic",          // PATH_GRAPHIC
-        "Help",             // PATH_HELP
-        "Linguistic",       // PATH_LINGUISTIC
-        "Module",           // PATH_MODULE
-        "Palette",          // PATH_PALETTE
-        "Plugin",           // PATH_PLUGIN
-        "Temp",             // PATH_TEMP
-        "Template",         // PATH_TEMPLATE
-        "UserConfig",       // PATH_USERCONFIG
-        "Work"              // PATH_WORK
+        "Addin",			// PATH_ADDIN
+        "AutoCorrect",		// PATH_AUTOCORRECT
+        "AutoText",			// PATH_AUTOTEXT
+        "Backup",			// PATH_BACKUP
+        "Basic",			// PATH_BASIC
+        "Bitmap",			// PATH_BITMAP
+        "Config",			// PATH_CONFIG
+        "Dictionary",		// PATH_DICTIONARY
+        "Favorite",			// PATH_FAVORITES
+        "Filter",			// PATH_FILTER
+        "Gallery",			// PATH_GALLERY
+        "Graphic",			// PATH_GRAPHIC
+        "Help",				// PATH_HELP
+        "Linguistic",		// PATH_LINGUISTIC
+        "Module",			// PATH_MODULE
+        "Palette",			// PATH_PALETTE
+        "Plugin",			// PATH_PLUGIN
+        "Temp",		 		// PATH_TEMP
+        "Template",			// PATH_TEMPLATE
+        "UserConfig",		// PATH_USERCONFIG
+        "Work"				// PATH_WORK
     };
 
     const int nCount = sizeof( aPropNames ) / sizeof( const char* );
@@ -293,27 +293,27 @@ SvtDefaultOptions_Impl::SvtDefaultOptions_Impl() : ConfigItem( ASCII_STR("Office
 
                 switch ( nProp )
                 {
-                    case DEFAULTPATH__ADDIN:            m_aAddinPath = String( aFullPath );         break;
-                    case DEFAULTPATH__AUTOCORRECT:      m_aAutoCorrectPath = String( aFullPath );   break;
-                    case DEFAULTPATH__AUTOTEXT:         m_aAutoTextPath = String( aFullPath );      break;
-                    case DEFAULTPATH__BACKUP:           m_aBackupPath = String( aFullPath );        break;
-                    case DEFAULTPATH__BASIC:            m_aBasicPath = String( aFullPath );         break;
-                    case DEFAULTPATH__BITMAP:           m_aBitmapPath = String( aFullPath );        break;
-                    case DEFAULTPATH__CONFIG:           m_aConfigPath = String( aFullPath );        break;
-                    case DEFAULTPATH__DICTIONARY:       m_aDictionaryPath = String( aFullPath );    break;
-                    case DEFAULTPATH__FAVORITES:        m_aFavoritesPath = String( aFullPath );     break;
-                    case DEFAULTPATH__FILTER:           m_aFilterPath = String( aFullPath );        break;
-                    case DEFAULTPATH__GALLERY:          m_aGalleryPath = String( aFullPath );       break;
-                    case DEFAULTPATH__GRAPHIC:          m_aGraphicPath = String( aFullPath );       break;
-                    case DEFAULTPATH__HELP:             m_aHelpPath = String( aFullPath );          break;
-                    case DEFAULTPATH__LINGUISTIC:       m_aLinguisticPath = String( aFullPath );    break;
-                    case DEFAULTPATH__MODULE:           m_aModulePath = String( aFullPath );        break;
-                    case DEFAULTPATH__PALETTE:          m_aPalettePath = String( aFullPath );       break;
-                    case DEFAULTPATH__PLUGIN:           m_aPluginPath = String( aFullPath );        break;
-                    case DEFAULTPATH__TEMP:             m_aTempPath = String( aFullPath );          break;
-                    case DEFAULTPATH__TEMPLATE:         m_aTemplatePath = String( aFullPath );      break;
-                    case DEFAULTPATH__USERCONFIG:       m_aUserConfigPath = String( aFullPath );    break;
-                    case DEFAULTPATH__WORK:             m_aWorkPath = String( aFullPath );          break;
+                    case DEFAULTPATH__ADDIN:			m_aAddinPath = String( aFullPath );			break;
+                    case DEFAULTPATH__AUTOCORRECT:		m_aAutoCorrectPath = String( aFullPath );	break;
+                    case DEFAULTPATH__AUTOTEXT:			m_aAutoTextPath = String( aFullPath );		break;
+                    case DEFAULTPATH__BACKUP:			m_aBackupPath = String( aFullPath );		break;
+                    case DEFAULTPATH__BASIC:			m_aBasicPath = String( aFullPath );			break;
+                    case DEFAULTPATH__BITMAP:			m_aBitmapPath = String( aFullPath );		break;
+                    case DEFAULTPATH__CONFIG:			m_aConfigPath = String( aFullPath );		break;
+                    case DEFAULTPATH__DICTIONARY:		m_aDictionaryPath = String( aFullPath );	break;
+                    case DEFAULTPATH__FAVORITES:		m_aFavoritesPath = String( aFullPath );		break;
+                    case DEFAULTPATH__FILTER:			m_aFilterPath = String( aFullPath );		break;
+                    case DEFAULTPATH__GALLERY:			m_aGalleryPath = String( aFullPath );		break;
+                    case DEFAULTPATH__GRAPHIC:			m_aGraphicPath = String( aFullPath );		break;
+                    case DEFAULTPATH__HELP:				m_aHelpPath = String( aFullPath );			break;
+                    case DEFAULTPATH__LINGUISTIC:		m_aLinguisticPath = String( aFullPath );	break;
+                    case DEFAULTPATH__MODULE:			m_aModulePath = String( aFullPath );		break;
+                    case DEFAULTPATH__PALETTE:			m_aPalettePath = String( aFullPath );		break;
+                    case DEFAULTPATH__PLUGIN:			m_aPluginPath = String( aFullPath );		break;
+                    case DEFAULTPATH__TEMP:				m_aTempPath = String( aFullPath );			break;
+                    case DEFAULTPATH__TEMPLATE:			m_aTemplatePath = String( aFullPath );		break;
+                    case DEFAULTPATH__USERCONFIG:		m_aUserConfigPath = String( aFullPath );	break;
+                    case DEFAULTPATH__WORK:				m_aWorkPath = String( aFullPath );			break;
                     case DEFAULTPATH__USERDICTIONARY:   m_aUserDictionaryPath = String( aFullPath );break;
 
                     default:
diff --git a/unotools/source/config/docinfohelper.cxx b/unotools/source/config/docinfohelper.cxx
index 677432e1f7d3..f75d0c00909b 100644
--- a/unotools/source/config/docinfohelper.cxx
+++ b/unotools/source/config/docinfohelper.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
diff --git a/unotools/source/config/dynamicmenuoptions.cxx b/unotools/source/config/dynamicmenuoptions.cxx
index 6ef88002a442..44a4d05d59da 100644
--- a/unotools/source/config/dynamicmenuoptions.cxx
+++ b/unotools/source/config/dynamicmenuoptions.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
@@ -31,7 +31,7 @@
 #endif
 
 //_________________________________________________________________________________________________________________
-//  includes
+//	includes
 //_________________________________________________________________________________________________________________
 
 #include <unotools/dynamicmenuoptions.hxx>
@@ -51,18 +51,18 @@
 #include <algorithm>
 
 //_________________________________________________________________________________________________________________
-//  namespaces
+//	namespaces
 //_________________________________________________________________________________________________________________
 
-using namespace ::std                   ;
-using namespace ::utl                   ;
-using namespace ::rtl                   ;
-using namespace ::osl                   ;
-using namespace ::com::sun::star::uno   ;
-using namespace ::com::sun::star::beans ;
+using namespace ::std					;
+using namespace ::utl					;
+using namespace ::rtl					;
+using namespace ::osl					;
+using namespace ::com::sun::star::uno	;
+using namespace ::com::sun::star::beans	;
 
 //_________________________________________________________________________________________________________________
-//  const
+//	const
 //_________________________________________________________________________________________________________________
 
 #define ROOTNODE_MENUS                                  OUString(RTL_CONSTASCII_USTRINGPARAM("Office.Common/Menus/"     ))
@@ -88,7 +88,7 @@ using namespace ::com::sun::star::beans ;
 #define PATHPREFIX_USER                                 OUString(RTL_CONSTASCII_USTRINGPARAM("u"                        ))
 
 //_________________________________________________________________________________________________________________
-//  private declarations!
+//	private declarations!
 //_________________________________________________________________________________________________________________
 
 /*-****************************************************************************************************************
@@ -254,55 +254,55 @@ class SvtDynMenu
 class SvtDynamicMenuOptions_Impl : public ConfigItem
 {
     //-------------------------------------------------------------------------------------------------------------
-    //  public methods
+    //	public methods
     //-------------------------------------------------------------------------------------------------------------
 
     public:
 
         //---------------------------------------------------------------------------------------------------------
-        //  constructor / destructor
+        //	constructor / destructor
         //---------------------------------------------------------------------------------------------------------
 
          SvtDynamicMenuOptions_Impl();
         ~SvtDynamicMenuOptions_Impl();
 
         //---------------------------------------------------------------------------------------------------------
-        //  overloaded methods of baseclass
+        //	overloaded methods of baseclass
         //---------------------------------------------------------------------------------------------------------
 
         /*-****************************************************************************************************//**
-            @short      called for notify of configmanager
-            @descr      These method is called from the ConfigManager before application ends or from the
+            @short		called for notify of configmanager
+            @descr		These method is called from the ConfigManager before application ends or from the
                          PropertyChangeListener if the sub tree broadcasts changes. You must update your
                         internal values.
 
-            @seealso    baseclass ConfigItem
+            @seealso	baseclass ConfigItem
 
             @param      "lPropertyNames" is the list of properties which should be updated.
-            @return     -
+            @return		-
 
-            @onerror    -
+            @onerror	-
         *//*-*****************************************************************************************************/
 
         virtual void Notify( const Sequence< OUString >& lPropertyNames );
 
         /*-****************************************************************************************************//**
-            @short      write changes to configuration
-            @descr      These method writes the changed values into the sub tree
+            @short		write changes to configuration
+            @descr		These method writes the changed values into the sub tree
                         and should always called in our destructor to guarantee consistency of config data.
 
-            @seealso    baseclass ConfigItem
+            @seealso	baseclass ConfigItem
 
-            @param      -
-            @return     -
+            @param		-
+            @return		-
 
-            @onerror    -
+            @onerror	-
         *//*-*****************************************************************************************************/
 
         virtual void Commit();
 
         //---------------------------------------------------------------------------------------------------------
-        //  public interface
+        //	public interface
         //---------------------------------------------------------------------------------------------------------
 
         /*-****************************************************************************************************//**
@@ -310,12 +310,12 @@ class SvtDynamicMenuOptions_Impl : public ConfigItem
             @descr      These class is used as static member of "SvtDynamicMenuOptions" ...
                         => The code exist only for one time and isn't duplicated for every instance!
 
-            @seealso    -
+            @seealso	-
 
-            @param      -
-            @return     -
+            @param		-
+            @return		-
 
-            @onerror    -
+            @onerror	-
         *//*-*****************************************************************************************************/
 
         void                                    Clear       (           EDynamicMenuType    eMenu           );
@@ -327,23 +327,23 @@ class SvtDynamicMenuOptions_Impl : public ConfigItem
                                                                 const   OUString&           sTargetName     );
 
     //-------------------------------------------------------------------------------------------------------------
-    //  private methods
+    //	private methods
     //-------------------------------------------------------------------------------------------------------------
 
     private:
 
         /*-****************************************************************************************************//**
             @short      return list of key names of our configuration management which represent oue module tree
-            @descr      These methods return the current list of key names! We need it to get needed values from our
+            @descr		These methods return the current list of key names! We need it to get needed values from our
                         configuration management and support dynamical menu item lists!
 
-            @seealso    -
+            @seealso	-
 
             @param      "nNewCount"     ,   returns count of menu entries for "new"
             @param      "nWizardCount"  ,   returns count of menu entries for "wizard"
-            @return     A list of configuration key names is returned.
+            @return		A list of configuration key names is returned.
 
-            @onerror    -
+            @onerror	-
         *//*-*****************************************************************************************************/
 
         Sequence< OUString > impl_GetPropertyNames( sal_uInt32& nNewCount, sal_uInt32& nWizardCount, sal_uInt32& nHelpBookmarksCount );
@@ -382,9 +382,9 @@ class SvtDynamicMenuOptions_Impl : public ConfigItem
             @param      "lSource"      ,   original list (e.g. [m1-m2-m3-m6-m0] )
             @param      "lDestination" ,   destination of operation
             @param      "sSetNode"     ,   name of configuration set to build complete path
-            @return     A list of configuration key names is returned.
+            @return		A list of configuration key names is returned.
 
-            @onerror    -
+            @onerror	-
         *//*-*****************************************************************************************************/
 
         void impl_SortAndExpandPropertyNames( const Sequence< OUString >& lSource      ,
@@ -392,7 +392,7 @@ class SvtDynamicMenuOptions_Impl : public ConfigItem
                                               const OUString&             sSetNode     );
 
     //-------------------------------------------------------------------------------------------------------------
-    //  private member
+    //	private member
     //-------------------------------------------------------------------------------------------------------------
 
     private:
@@ -403,11 +403,11 @@ class SvtDynamicMenuOptions_Impl : public ConfigItem
 };
 
 //_________________________________________________________________________________________________________________
-//  definitions
+//	definitions
 //_________________________________________________________________________________________________________________
 
 //*****************************************************************************************************************
-//  constructor
+//	constructor
 //*****************************************************************************************************************
 SvtDynamicMenuOptions_Impl::SvtDynamicMenuOptions_Impl()
     // Init baseclasses first
@@ -522,7 +522,7 @@ SvtDynamicMenuOptions_Impl::SvtDynamicMenuOptions_Impl()
 }
 
 //*****************************************************************************************************************
-//  destructor
+//	destructor
 //*****************************************************************************************************************
 SvtDynamicMenuOptions_Impl::~SvtDynamicMenuOptions_Impl()
 {
@@ -534,7 +534,7 @@ SvtDynamicMenuOptions_Impl::~SvtDynamicMenuOptions_Impl()
 }
 
 //*****************************************************************************************************************
-//  public method
+//	public method
 //*****************************************************************************************************************
 void SvtDynamicMenuOptions_Impl::Notify( const Sequence< OUString >& )
 {
@@ -542,7 +542,7 @@ void SvtDynamicMenuOptions_Impl::Notify( const Sequence< OUString >& )
 }
 
 //*****************************************************************************************************************
-//  public method
+//	public method
 //*****************************************************************************************************************
 void SvtDynamicMenuOptions_Impl::Commit()
 {
@@ -631,7 +631,7 @@ void SvtDynamicMenuOptions_Impl::Commit()
 }
 
 //*****************************************************************************************************************
-//  public method
+//	public method
 //*****************************************************************************************************************
 void SvtDynamicMenuOptions_Impl::Clear( EDynamicMenuType eMenu )
 {
@@ -658,7 +658,7 @@ void SvtDynamicMenuOptions_Impl::Clear( EDynamicMenuType eMenu )
 }
 
 //*****************************************************************************************************************
-//  public method
+//	public method
 //*****************************************************************************************************************
 Sequence< Sequence< PropertyValue > > SvtDynamicMenuOptions_Impl::GetMenu( EDynamicMenuType eMenu ) const
 {
@@ -684,7 +684,7 @@ Sequence< Sequence< PropertyValue > > SvtDynamicMenuOptions_Impl::GetMenu( EDyna
 }
 
 //*****************************************************************************************************************
-//  public method
+//	public method
 //*****************************************************************************************************************
 void SvtDynamicMenuOptions_Impl::AppendItem(            EDynamicMenuType    eMenu           ,
                                                 const   OUString&           sURL            ,
@@ -717,7 +717,7 @@ void SvtDynamicMenuOptions_Impl::AppendItem(            EDynamicMenuType    eMen
 }
 
 //*****************************************************************************************************************
-//  private method
+//	private method
 //*****************************************************************************************************************
 Sequence< OUString > SvtDynamicMenuOptions_Impl::impl_GetPropertyNames( sal_uInt32& nNewCount, sal_uInt32& nWizardCount, sal_uInt32& nHelpBookmarksCount )
 {
@@ -772,7 +772,7 @@ class SelectByPrefix
 };
 
 //*****************************************************************************************************************
-//  private method
+//	private method
 //*****************************************************************************************************************
 void SvtDynamicMenuOptions_Impl::impl_SortAndExpandPropertyNames( const Sequence< OUString >& lSource      ,
                                                                         Sequence< OUString >& lDestination ,
@@ -821,15 +821,15 @@ void SvtDynamicMenuOptions_Impl::impl_SortAndExpandPropertyNames( const Sequence
 }
 
 //*****************************************************************************************************************
-//  initialize static member
-//  DON'T DO IT IN YOUR HEADER!
-//  see definition for further informations
+//	initialize static member
+//	DON'T DO IT IN YOUR HEADER!
+//	see definition for further informations
 //*****************************************************************************************************************
 SvtDynamicMenuOptions_Impl*     SvtDynamicMenuOptions::m_pDataContainer = NULL  ;
 sal_Int32                       SvtDynamicMenuOptions::m_nRefCount      = 0     ;
 
 //*****************************************************************************************************************
-//  constructor
+//	constructor
 //*****************************************************************************************************************
 SvtDynamicMenuOptions::SvtDynamicMenuOptions()
 {
@@ -846,7 +846,7 @@ SvtDynamicMenuOptions::SvtDynamicMenuOptions()
 }
 
 //*****************************************************************************************************************
-//  destructor
+//	destructor
 //*****************************************************************************************************************
 SvtDynamicMenuOptions::~SvtDynamicMenuOptions()
 {
@@ -864,7 +864,7 @@ SvtDynamicMenuOptions::~SvtDynamicMenuOptions()
 }
 
 //*****************************************************************************************************************
-//  public method
+//	public method
 //*****************************************************************************************************************
 void SvtDynamicMenuOptions::Clear( EDynamicMenuType eMenu )
 {
@@ -873,7 +873,7 @@ void SvtDynamicMenuOptions::Clear( EDynamicMenuType eMenu )
 }
 
 //*****************************************************************************************************************
-//  public method
+//	public method
 //*****************************************************************************************************************
 Sequence< Sequence< PropertyValue > > SvtDynamicMenuOptions::GetMenu( EDynamicMenuType eMenu ) const
 {
@@ -882,7 +882,7 @@ Sequence< Sequence< PropertyValue > > SvtDynamicMenuOptions::GetMenu( EDynamicMe
 }
 
 //*****************************************************************************************************************
-//  public method
+//	public method
 //*****************************************************************************************************************
 void SvtDynamicMenuOptions::AppendItem(         EDynamicMenuType    eMenu           ,
                                         const   OUString&           sURL            ,
@@ -895,7 +895,7 @@ void SvtDynamicMenuOptions::AppendItem(         EDynamicMenuType    eMenu
 }
 
 //*****************************************************************************************************************
-//  private method
+//	private method
 //*****************************************************************************************************************
 Mutex& SvtDynamicMenuOptions::GetOwnStaticMutex()
 {
diff --git a/unotools/source/config/eventcfg.cxx b/unotools/source/config/eventcfg.cxx
index a07c99b70381..2c35715b375e 100644
--- a/unotools/source/config/eventcfg.cxx
+++ b/unotools/source/config/eventcfg.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
@@ -47,11 +47,11 @@
 
 #include <algorithm>
 
-using namespace ::std                   ;
-using namespace ::utl                   ;
-using namespace ::rtl                   ;
-using namespace ::osl                   ;
-using namespace ::com::sun::star::uno   ;
+using namespace ::std					;
+using namespace ::utl					;
+using namespace ::rtl					;
+using namespace ::osl					;
+using namespace ::com::sun::star::uno	;
 using namespace ::com::sun::star;
 
 #define ROOTNODE_EVENTS OUString(RTL_CONSTASCII_USTRINGPARAM("Office.Events/ApplicationEvents" ))
@@ -135,7 +135,7 @@ GlobalEventConfig_Impl::GlobalEventConfig_Impl()
 }
 
 //*****************************************************************************************************************
-//  destructor
+//	destructor
 //*****************************************************************************************************************
 GlobalEventConfig_Impl::~GlobalEventConfig_Impl()
 {
@@ -155,7 +155,7 @@ GlobalEventConfig_Impl::~GlobalEventConfig_Impl()
 }
 
 //*****************************************************************************************************************
-//  public method
+//	public method
 //*****************************************************************************************************************
 void GlobalEventConfig_Impl::Notify( const Sequence< OUString >& )
 {
@@ -176,7 +176,7 @@ void GlobalEventConfig_Impl::Notify( const Sequence< OUString >& )
 }
 
 //*****************************************************************************************************************
-//  public method
+//	public method
 //*****************************************************************************************************************
 void GlobalEventConfig_Impl::Commit()
 {
@@ -220,7 +220,7 @@ void GlobalEventConfig_Impl::EstablishFrameCallback(const ::com::sun::star::uno:
 }
 
 //*****************************************************************************************************************
-//  private method
+//	private method
 //*****************************************************************************************************************
 void GlobalEventConfig_Impl::initBindingInfo()
 {
diff --git a/unotools/source/config/extendedsecurityoptions.cxx b/unotools/source/config/extendedsecurityoptions.cxx
index 716733e2d090..1e29a1339b73 100644
--- a/unotools/source/config/extendedsecurityoptions.cxx
+++ b/unotools/source/config/extendedsecurityoptions.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
@@ -29,7 +29,7 @@
 #include "precompiled_unotools.hxx"
 
 //_________________________________________________________________________________________________________________
-//  includes
+//	includes
 //_________________________________________________________________________________________________________________
 
 #include <unotools/extendedsecurityoptions.hxx>
@@ -50,31 +50,31 @@
 #include "itemholder1.hxx"
 
 //_________________________________________________________________________________________________________________
-//  namespaces
+//	namespaces
 //_________________________________________________________________________________________________________________
 
-using namespace ::utl                   ;
-using namespace ::rtl                   ;
-using namespace ::osl                   ;
-using namespace ::com::sun::star::uno   ;
+using namespace ::utl					;
+using namespace ::rtl					;
+using namespace ::osl					;
+using namespace ::com::sun::star::uno	;
 
 //_________________________________________________________________________________________________________________
-//  const
+//	const
 //_________________________________________________________________________________________________________________
 
-#define ROOTNODE_SECURITY               OUString(RTL_CONSTASCII_USTRINGPARAM("Office.Security"))
+#define	ROOTNODE_SECURITY				OUString(RTL_CONSTASCII_USTRINGPARAM("Office.Security"))
 
-#define SECURE_EXTENSIONS_SET           OUString(RTL_CONSTASCII_USTRINGPARAM("SecureExtensions"))
-#define EXTENSION_PROPNAME              OUString(RTL_CONSTASCII_USTRINGPARAM("/Extension"))
+#define SECURE_EXTENSIONS_SET			OUString(RTL_CONSTASCII_USTRINGPARAM("SecureExtensions"))
+#define EXTENSION_PROPNAME				OUString(RTL_CONSTASCII_USTRINGPARAM("/Extension"))
 
-#define PROPERTYNAME_HYPERLINKS_OPEN    OUString(RTL_CONSTASCII_USTRINGPARAM("Hyperlinks/Open"))
+#define PROPERTYNAME_HYPERLINKS_OPEN	OUString(RTL_CONSTASCII_USTRINGPARAM("Hyperlinks/Open"))
 
-#define PROPERTYHANDLE_HYPERLINKS_OPEN  0
+#define PROPERTYHANDLE_HYPERLINKS_OPEN	0
 
 #define PROPERTYCOUNT                   1
 
 //_________________________________________________________________________________________________________________
-//  private declarations!
+//	private declarations!
 //_________________________________________________________________________________________________________________
 
 struct OUStringHashCode
@@ -100,134 +100,134 @@ class ExtensionHashMap : public ::std::hash_map< ::rtl::OUString,
 class SvtExtendedSecurityOptions_Impl : public ConfigItem
 {
     //-------------------------------------------------------------------------------------------------------------
-    //  public methods
+    //	public methods
     //-------------------------------------------------------------------------------------------------------------
 
     public:
 
         //---------------------------------------------------------------------------------------------------------
-        //  constructor / destructor
+        //	constructor / destructor
         //---------------------------------------------------------------------------------------------------------
 
          SvtExtendedSecurityOptions_Impl();
         ~SvtExtendedSecurityOptions_Impl();
 
         //---------------------------------------------------------------------------------------------------------
-        //  overloaded methods of baseclass
+        //	overloaded methods of baseclass
         //---------------------------------------------------------------------------------------------------------
 
         /*-****************************************************************************************************//**
-            @short      called for notify of configmanager
-            @descr      These method is called from the ConfigManager before application ends or from the
+            @short		called for notify of configmanager
+            @descr		These method is called from the ConfigManager before application ends or from the
                          PropertyChangeListener if the sub tree broadcasts changes. You must update your
                         internal values.
 
-            @seealso    baseclass ConfigItem
+            @seealso	baseclass ConfigItem
 
-            @param      "seqPropertyNames" is the list of properties which should be updated.
-            @return     -
+            @param		"seqPropertyNames" is the list of properties which should be updated.
+            @return		-
 
-            @onerror    -
+            @onerror	-
         *//*-*****************************************************************************************************/
 
         virtual void Notify( const Sequence< OUString >& seqPropertyNames );
 
         /*-****************************************************************************************************//**
-            @short      write changes to configuration
-            @descr      These method writes the changed values into the sub tree
+            @short		write changes to configuration
+            @descr		These method writes the changed values into the sub tree
                         and should always called in our destructor to guarantee consistency of config data.
 
-            @seealso    baseclass ConfigItem
+            @seealso	baseclass ConfigItem
 
-            @param      -
-            @return     -
+            @param		-
+            @return		-
 
-            @onerror    -
+            @onerror	-
         *//*-*****************************************************************************************************/
 
         virtual void Commit();
 
         //---------------------------------------------------------------------------------------------------------
-        //  public interface
+        //	public interface
         //---------------------------------------------------------------------------------------------------------
 
         /*-****************************************************************************************************//**
-            @short      Access method to check for security problems
-            @descr      Different methods to check for security related problems.
+            @short		Access method to check for security problems
+            @descr		Different methods to check for security related problems.
 
-            @seealso    -
+            @seealso	-
 
-            @param      -
-            @return     -
+            @param		-
+            @return		-
 
-            @onerror    -
+            @onerror	-
         *//*-*****************************************************************************************************/
 
-        sal_Bool                                        IsSecureHyperlink( const rtl::OUString& aURL ) const;
-        Sequence< rtl::OUString >                       GetSecureExtensionList() const;
+        sal_Bool										IsSecureHyperlink( const rtl::OUString& aURL ) const;
+        Sequence< rtl::OUString >						GetSecureExtensionList() const;
 
-        SvtExtendedSecurityOptions::OpenHyperlinkMode   GetOpenHyperlinkMode();
-        void                                            SetOpenHyperlinkMode( SvtExtendedSecurityOptions::OpenHyperlinkMode aMode );
+        SvtExtendedSecurityOptions::OpenHyperlinkMode	GetOpenHyperlinkMode();
+        void											SetOpenHyperlinkMode( SvtExtendedSecurityOptions::OpenHyperlinkMode aMode );
         sal_Bool                                        IsOpenHyperlinkModeReadOnly() const;
 
     //-------------------------------------------------------------------------------------------------------------
-    //  private methods
+    //	private methods
     //-------------------------------------------------------------------------------------------------------------
 
     private:
 
         /*-****************************************************************************************************//**
-            @short      return list of key names of ouer configuration management which represent oue module tree
-            @descr      These methods return a static const list of key names. We need it to get needed values from our
+            @short		return list of key names of ouer configuration management which represent oue module tree
+            @descr		These methods return a static const list of key names. We need it to get needed values from our
                         configuration management.
 
-            @seealso    -
+            @seealso	-
 
-            @param      -
-            @return     A list of needed configuration keys is returned.
+            @param		-
+            @return		A list of needed configuration keys is returned.
 
-            @onerror    -
+            @onerror	-
         *//*-*****************************************************************************************************/
 
         static Sequence< OUString > GetPropertyNames();
 
         /*-****************************************************************************************************//**
-            @short      Fills the hash map with all extensions known to be secure
-            @descr      These methods fills the given hash map object with all extensions known to be secure.
+            @short		Fills the hash map with all extensions known to be secure
+            @descr		These methods fills the given hash map object with all extensions known to be secure.
 
-            @seealso    -
+            @seealso	-
 
-            @param      aHashMap
+            @param		aHashMap
                         A hash map to be filled with secure extension strings.
-            @return     -
+            @return		-
 
-            @onerror    -
+            @onerror	-
         *//*-*****************************************************************************************************/
         void FillExtensionHashMap( ExtensionHashMap& aHashMap );
 
     //-------------------------------------------------------------------------------------------------------------
-    //  private member
+    //	private member
     //-------------------------------------------------------------------------------------------------------------
 
     private:
-        OUString                                        m_aSecureExtensionsSetName;
-        OUString                                        m_aExtensionPropName;
+        OUString										m_aSecureExtensionsSetName;
+        OUString										m_aExtensionPropName;
 
-        SvtExtendedSecurityOptions::OpenHyperlinkMode   m_eOpenHyperlinkMode;
+        SvtExtendedSecurityOptions::OpenHyperlinkMode	m_eOpenHyperlinkMode;
         sal_Bool                                        m_bROOpenHyperlinkMode;
-        ExtensionHashMap                                m_aExtensionHashMap;
+        ExtensionHashMap								m_aExtensionHashMap;
 };
 
 //_________________________________________________________________________________________________________________
-//  definitions
+//	definitions
 //_________________________________________________________________________________________________________________
 
 //*****************************************************************************************************************
-//  constructor
+//	constructor
 //*****************************************************************************************************************
 SvtExtendedSecurityOptions_Impl::SvtExtendedSecurityOptions_Impl()
     // Init baseclasses first
-    :   ConfigItem          ( ROOTNODE_SECURITY         ),
+    :	ConfigItem			( ROOTNODE_SECURITY			),
     m_aSecureExtensionsSetName( SECURE_EXTENSIONS_SET ),
     m_aExtensionPropName( EXTENSION_PROPNAME ),
     m_bROOpenHyperlinkMode(sal_False)
@@ -236,8 +236,8 @@ SvtExtendedSecurityOptions_Impl::SvtExtendedSecurityOptions_Impl()
     // Fill the extension hash map with all secure extension strings
     FillExtensionHashMap( m_aExtensionHashMap );
 
-    Sequence< OUString >    seqNames    = GetPropertyNames();
-    Sequence< Any >         seqValues   = GetProperties( seqNames );
+    Sequence< OUString >	seqNames	= GetPropertyNames();
+    Sequence< Any >			seqValues	= GetProperties( seqNames );
     Sequence< sal_Bool >    seqRO       = GetReadOnlyStates ( seqNames  );
 
     sal_Int32 nPropertyCount = seqValues.getLength();
@@ -272,7 +272,7 @@ SvtExtendedSecurityOptions_Impl::SvtExtendedSecurityOptions_Impl()
 }
 
 //*****************************************************************************************************************
-//  destructor
+//	destructor
 //*****************************************************************************************************************
 SvtExtendedSecurityOptions_Impl::~SvtExtendedSecurityOptions_Impl()
 {
@@ -284,7 +284,7 @@ SvtExtendedSecurityOptions_Impl::~SvtExtendedSecurityOptions_Impl()
 }
 
 //*****************************************************************************************************************
-//  public method
+//	public method
 //*****************************************************************************************************************
 void SvtExtendedSecurityOptions_Impl::Notify( const Sequence< OUString >& )
 {
@@ -292,19 +292,19 @@ void SvtExtendedSecurityOptions_Impl::Notify( const Sequence< OUString >& )
 }
 
 //*****************************************************************************************************************
-//  public method
+//	public method
 //*****************************************************************************************************************
 void SvtExtendedSecurityOptions_Impl::Commit()
 {
     // Get names of supported properties, create a list for values and copy current values to it.
-    Sequence< OUString >    seqNames    = GetPropertyNames  ();
-    sal_Int32               nCount      = seqNames.getLength();
-    Sequence< Any >         seqValues   ( nCount );
+    Sequence< OUString >	seqNames	= GetPropertyNames	();
+    sal_Int32				nCount		= seqNames.getLength();
+    Sequence< Any >			seqValues	( nCount );
     for( sal_Int32 nProperty=0; nProperty<nCount; ++nProperty )
     {
         switch( nProperty )
         {
-            case PROPERTYHANDLE_HYPERLINKS_OPEN:    {
+            case PROPERTYHANDLE_HYPERLINKS_OPEN:	{
                                                         seqValues[nProperty] <<= (sal_Int32)m_eOpenHyperlinkMode;
                                                     }
                                                     break;
@@ -316,7 +316,7 @@ void SvtExtendedSecurityOptions_Impl::Commit()
 }
 
 //*****************************************************************************************************************
-//  public method
+//	public method
 //*****************************************************************************************************************
 sal_Bool SvtExtendedSecurityOptions_Impl::IsSecureHyperlink( const OUString& aURL ) const
 {
@@ -333,7 +333,7 @@ sal_Bool SvtExtendedSecurityOptions_Impl::IsSecureHyperlink( const OUString& aUR
 }
 
 //*****************************************************************************************************************
-//  public method
+//	public method
 //*****************************************************************************************************************
 Sequence< OUString > SvtExtendedSecurityOptions_Impl::GetSecureExtensionList() const
 {
@@ -350,7 +350,7 @@ Sequence< OUString > SvtExtendedSecurityOptions_Impl::GetSecureExtensionList() c
 }
 
 //*****************************************************************************************************************
-//  public method
+//	public method
 //*****************************************************************************************************************
 SvtExtendedSecurityOptions::OpenHyperlinkMode SvtExtendedSecurityOptions_Impl::GetOpenHyperlinkMode()
 {
@@ -365,7 +365,7 @@ sal_Bool SvtExtendedSecurityOptions_Impl::IsOpenHyperlinkModeReadOnly() const
 }
 
 //*****************************************************************************************************************
-//  public method
+//	public method
 //*****************************************************************************************************************
 void SvtExtendedSecurityOptions_Impl::SetOpenHyperlinkMode( SvtExtendedSecurityOptions::OpenHyperlinkMode eNewMode )
 {
@@ -374,16 +374,16 @@ void SvtExtendedSecurityOptions_Impl::SetOpenHyperlinkMode( SvtExtendedSecurityO
 }
 
 //*****************************************************************************************************************
-//  private method
+//	private method
 //*****************************************************************************************************************
 void SvtExtendedSecurityOptions_Impl::FillExtensionHashMap( ExtensionHashMap& aHashMap )
 {
     // Get sequence with secure extensions from configuration
-    Sequence< OUString >    seqNodes = GetNodeNames( m_aSecureExtensionsSetName );
+    Sequence< OUString >	seqNodes = GetNodeNames( m_aSecureExtensionsSetName );
 
-    OUString                aValue;
-    Sequence< Any >         aValues;
-    Sequence< OUString >    aPropSeq( 1 );
+    OUString				aValue;
+    Sequence< Any >			aValues;
+    Sequence< OUString >	aPropSeq( 1 );
     for ( int i = 0; i < seqNodes.getLength(); i++ )
     {
         // Create access name for property
@@ -409,7 +409,7 @@ void SvtExtendedSecurityOptions_Impl::FillExtensionHashMap( ExtensionHashMap& aH
 }
 
 //*****************************************************************************************************************
-//  private method (currently not used)
+//	private method (currently not used)
 //*****************************************************************************************************************
 Sequence< OUString > SvtExtendedSecurityOptions_Impl::GetPropertyNames()
 {
@@ -425,15 +425,15 @@ Sequence< OUString > SvtExtendedSecurityOptions_Impl::GetPropertyNames()
 }
 
 //*****************************************************************************************************************
-//  initialize static member
-//  DON'T DO IT IN YOUR HEADER!
-//  see definition for further informations
+//	initialize static member
+//	DON'T DO IT IN YOUR HEADER!
+//	see definition for further informations
 //*****************************************************************************************************************
-SvtExtendedSecurityOptions_Impl*    SvtExtendedSecurityOptions::m_pDataContainer    = NULL  ;
-sal_Int32                           SvtExtendedSecurityOptions::m_nRefCount         = 0     ;
+SvtExtendedSecurityOptions_Impl*	SvtExtendedSecurityOptions::m_pDataContainer	= NULL	;
+sal_Int32							SvtExtendedSecurityOptions::m_nRefCount			= 0		;
 
 //*****************************************************************************************************************
-//  constructor
+//	constructor
 //*****************************************************************************************************************
 SvtExtendedSecurityOptions::SvtExtendedSecurityOptions()
 {
@@ -452,7 +452,7 @@ SvtExtendedSecurityOptions::SvtExtendedSecurityOptions()
 }
 
 //*****************************************************************************************************************
-//  destructor
+//	destructor
 //*****************************************************************************************************************
 SvtExtendedSecurityOptions::~SvtExtendedSecurityOptions()
 {
@@ -470,7 +470,7 @@ SvtExtendedSecurityOptions::~SvtExtendedSecurityOptions()
 }
 
 //*****************************************************************************************************************
-//  public method
+//	public method
 //*****************************************************************************************************************
 sal_Bool SvtExtendedSecurityOptions::IsSecureHyperlink( const rtl::OUString& aURL ) const
 {
@@ -479,7 +479,7 @@ sal_Bool SvtExtendedSecurityOptions::IsSecureHyperlink( const rtl::OUString& aUR
 }
 
 //*****************************************************************************************************************
-//  public method
+//	public method
 //*****************************************************************************************************************
 Sequence< rtl::OUString > SvtExtendedSecurityOptions::GetSecureExtensionList() const
 {
@@ -488,7 +488,7 @@ Sequence< rtl::OUString > SvtExtendedSecurityOptions::GetSecureExtensionList() c
 }
 
 //*****************************************************************************************************************
-//  public method
+//	public method
 //*****************************************************************************************************************
 SvtExtendedSecurityOptions::OpenHyperlinkMode SvtExtendedSecurityOptions::GetOpenHyperlinkMode()
 {
@@ -504,7 +504,7 @@ sal_Bool SvtExtendedSecurityOptions::IsOpenHyperlinkModeReadOnly() const
 }
 
 //*****************************************************************************************************************
-//  public method
+//	public method
 //*****************************************************************************************************************
 void SvtExtendedSecurityOptions::SetOpenHyperlinkMode( SvtExtendedSecurityOptions::OpenHyperlinkMode eMode )
 {
@@ -513,7 +513,7 @@ void SvtExtendedSecurityOptions::SetOpenHyperlinkMode( SvtExtendedSecurityOption
 }
 
 //*****************************************************************************************************************
-//  private method
+//	private method
 //*****************************************************************************************************************
 Mutex& SvtExtendedSecurityOptions::GetInitMutex()
 {
diff --git a/unotools/source/config/fltrcfg.cxx b/unotools/source/config/fltrcfg.cxx
index 94f7ff07d7d7..35f13c0aba59 100644
--- a/unotools/source/config/fltrcfg.cxx
+++ b/unotools/source/config/fltrcfg.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
@@ -42,25 +42,25 @@ using namespace com::sun::star::uno;
 #define C2U(cChar) OUString::createFromAscii(cChar)
 
 // -----------------------------------------------------------------------
-#define FILTERCFG_WORD_CODE             0x0001
-#define FILTERCFG_WORD_STORAGE          0x0002
-#define FILTERCFG_EXCEL_CODE            0x0004
-#define FILTERCFG_EXCEL_STORAGE         0x0008
-#define FILTERCFG_PPOINT_CODE           0x0010
-#define FILTERCFG_PPOINT_STORAGE        0x0020
-#define FILTERCFG_MATH_LOAD             0x0100
-#define FILTERCFG_MATH_SAVE             0x0200
-#define FILTERCFG_WRITER_LOAD           0x0400
-#define FILTERCFG_WRITER_SAVE           0x0800
-#define FILTERCFG_CALC_LOAD             0x1000
-#define FILTERCFG_CALC_SAVE             0x2000
-#define FILTERCFG_IMPRESS_LOAD          0x4000
-#define FILTERCFG_IMPRESS_SAVE          0x8000
-#define FILTERCFG_EXCEL_EXECTBL         0x10000
+#define FILTERCFG_WORD_CODE 			0x0001
+#define FILTERCFG_WORD_STORAGE 			0x0002
+#define FILTERCFG_EXCEL_CODE 			0x0004
+#define FILTERCFG_EXCEL_STORAGE 		0x0008
+#define FILTERCFG_PPOINT_CODE 			0x0010
+#define FILTERCFG_PPOINT_STORAGE 		0x0020
+#define FILTERCFG_MATH_LOAD				0x0100
+#define FILTERCFG_MATH_SAVE				0x0200
+#define FILTERCFG_WRITER_LOAD			0x0400
+#define FILTERCFG_WRITER_SAVE			0x0800
+#define FILTERCFG_CALC_LOAD				0x1000
+#define FILTERCFG_CALC_SAVE				0x2000
+#define FILTERCFG_IMPRESS_LOAD			0x4000
+#define FILTERCFG_IMPRESS_SAVE			0x8000
+#define FILTERCFG_EXCEL_EXECTBL			0x10000
 #define FILTERCFG_ENABLE_PPT_PREVIEW    0x20000
 #define FILTERCFG_ENABLE_EXCEL_PREVIEW  0x40000
 #define FILTERCFG_ENABLE_WORD_PREVIEW   0x80000
-#define FILTERCFG_USE_ENHANCED_FIELDS   0x100000
+#define FILTERCFG_USE_ENHANCED_FIELDS	0x100000
 
 static SvtFilterOptions* pOptions=0;
 
@@ -69,27 +69,27 @@ static SvtFilterOptions* pOptions=0;
  ---------------------------------------------------------------------------*/
 class SvtAppFilterOptions_Impl : public utl::ConfigItem
 {
-    sal_Bool                bLoadVBA;
-    sal_Bool                bSaveVBA;
+    sal_Bool				bLoadVBA;
+    sal_Bool				bSaveVBA;
 public:
     SvtAppFilterOptions_Impl(const OUString& rRoot) :
         utl::ConfigItem(rRoot),
         bLoadVBA(sal_False),
-        bSaveVBA(sal_False)  {}
+        bSaveVBA(sal_False)	 {}
     ~SvtAppFilterOptions_Impl();
-    virtual void            Commit();
-    virtual void            Notify( const com::sun::star::uno::Sequence<rtl::OUString>& aPropertyNames);
-    void                    Load();
+    virtual void			Commit();
+    virtual void    		Notify( const com::sun::star::uno::Sequence<rtl::OUString>& aPropertyNames);
+    void					Load();
 
-    sal_Bool                IsLoad() const {return bLoadVBA;}
-    void                    SetLoad(sal_Bool bSet)
+    sal_Bool				IsLoad() const {return bLoadVBA;}
+    void					SetLoad(sal_Bool bSet)
                             {
                                 if(bSet != bLoadVBA)
                                     SetModified();
                                 bLoadVBA = bSet;
                             }
-    sal_Bool                IsSave() const {return bSaveVBA;}
-    void                    SetSave(sal_Bool bSet)
+    sal_Bool				IsSave() const {return bSaveVBA;}
+    void					SetSave(sal_Bool bSet)
                             {
                                 if(bSet != bSaveVBA)
                                     SetModified();
@@ -108,7 +108,7 @@ SvtAppFilterOptions_Impl::~SvtAppFilterOptions_Impl()
 /* -----------------------------22.01.01 10:38--------------------------------
 
  ---------------------------------------------------------------------------*/
-void    SvtAppFilterOptions_Impl::Commit()
+void	SvtAppFilterOptions_Impl::Commit()
 {
     Sequence<OUString> aNames(2);
     OUString* pNames = aNames.getArray();
@@ -133,7 +133,7 @@ void SvtAppFilterOptions_Impl::Notify( const Sequence< rtl::OUString >&  )
 /* -----------------------------22.01.01 10:38--------------------------------
 
  ---------------------------------------------------------------------------*/
-void    SvtAppFilterOptions_Impl::Load()
+void	SvtAppFilterOptions_Impl::Load()
 {
     Sequence<OUString> aNames(2);
     OUString* pNames = aNames.getArray();
@@ -152,17 +152,17 @@ void    SvtAppFilterOptions_Impl::Load()
 // -----------------------------------------------------------------------
 class SvtCalcFilterOptions_Impl : public SvtAppFilterOptions_Impl
 {
-    sal_Bool                bLoadExecutable;
+    sal_Bool				bLoadExecutable;
 public:
     SvtCalcFilterOptions_Impl(const OUString& rRoot) :
         SvtAppFilterOptions_Impl(rRoot),
         bLoadExecutable(sal_False)
     {}
-    virtual void            Commit();
-    void                    Load();
+    virtual void			Commit();
+    void					Load();
 
-    sal_Bool                IsLoadExecutable() const {return bLoadExecutable;}
-    void                    SetLoadExecutable(sal_Bool bSet)
+    sal_Bool				IsLoadExecutable() const {return bLoadExecutable;}
+    void					SetLoadExecutable(sal_Bool bSet)
                             {
                                 if(bSet != bLoadExecutable)
                                     SetModified();
@@ -244,13 +244,13 @@ void SvtFilterOptions_Impl::SetFlag( ULONG nFlag, BOOL bSet )
 {
     switch(nFlag)
     {
-        case FILTERCFG_WORD_CODE:       aWriterCfg.SetLoad(bSet);break;
-        case FILTERCFG_WORD_STORAGE:    aWriterCfg.SetSave(bSet);break;
-        case FILTERCFG_EXCEL_CODE:      aCalcCfg.SetLoad(bSet);break;
-        case FILTERCFG_EXCEL_STORAGE:   aCalcCfg.SetSave(bSet);break;
-        case FILTERCFG_EXCEL_EXECTBL:   aCalcCfg.SetLoadExecutable(bSet);break;
-        case FILTERCFG_PPOINT_CODE:     aImpressCfg.SetLoad(bSet);break;
-        case FILTERCFG_PPOINT_STORAGE:  aImpressCfg.SetSave(bSet);break;
+        case FILTERCFG_WORD_CODE:		aWriterCfg.SetLoad(bSet);break;
+        case FILTERCFG_WORD_STORAGE:	aWriterCfg.SetSave(bSet);break;
+        case FILTERCFG_EXCEL_CODE:		aCalcCfg.SetLoad(bSet);break;
+        case FILTERCFG_EXCEL_STORAGE:	aCalcCfg.SetSave(bSet);break;
+        case FILTERCFG_EXCEL_EXECTBL:	aCalcCfg.SetLoadExecutable(bSet);break;
+        case FILTERCFG_PPOINT_CODE:		aImpressCfg.SetLoad(bSet);break;
+        case FILTERCFG_PPOINT_STORAGE:	aImpressCfg.SetSave(bSet);break;
         default:
             if( bSet )
                 nFlags |= nFlag;
@@ -266,13 +266,13 @@ BOOL SvtFilterOptions_Impl::IsFlag( ULONG nFlag ) const
     BOOL bRet;
     switch(nFlag)
     {
-        case FILTERCFG_WORD_CODE        : bRet = aWriterCfg.IsLoad();break;
-        case FILTERCFG_WORD_STORAGE     : bRet = aWriterCfg.IsSave();break;
-        case FILTERCFG_EXCEL_CODE       : bRet = aCalcCfg.IsLoad();break;
+        case FILTERCFG_WORD_CODE 		: bRet = aWriterCfg.IsLoad();break;
+        case FILTERCFG_WORD_STORAGE   	: bRet = aWriterCfg.IsSave();break;
+        case FILTERCFG_EXCEL_CODE 	    : bRet = aCalcCfg.IsLoad();break;
         case FILTERCFG_EXCEL_STORAGE    : bRet = aCalcCfg.IsSave();break;
-        case FILTERCFG_EXCEL_EXECTBL    : bRet = aCalcCfg.IsLoadExecutable();break;
-        case FILTERCFG_PPOINT_CODE      : bRet = aImpressCfg.IsLoad();break;
-        case FILTERCFG_PPOINT_STORAGE   : bRet = aImpressCfg.IsSave();break;
+        case FILTERCFG_EXCEL_EXECTBL	: bRet = aCalcCfg.IsLoadExecutable();break;
+        case FILTERCFG_PPOINT_CODE 	 	: bRet = aImpressCfg.IsLoad();break;
+        case FILTERCFG_PPOINT_STORAGE	: bRet = aImpressCfg.IsSave();break;
         default:
             bRet = 0 != (nFlags & nFlag );
     }
@@ -306,17 +306,17 @@ const Sequence<OUString>& SvtFilterOptions::GetPropertyNames()
         aNames.realloc(nCount);
         static const char* aPropNames[] =
         {
-            "Import/MathTypeToMath",            //  0
-            "Import/WinWordToWriter",           //  1
-            "Import/PowerPointToImpress",       //  2
-            "Import/ExcelToCalc",               //  3
+            "Import/MathTypeToMath",			//  0
+            "Import/WinWordToWriter",			//  1
+            "Import/PowerPointToImpress",		//  2
+            "Import/ExcelToCalc",				//  3
             "Export/MathToMathType",            //  4
             "Export/WriterToWinWord",           //  5
             "Export/ImpressToPowerPoint",       //  6
-            "Export/CalcToExcel",               //  7
-            "Export/EnablePowerPointPreview",   //  8
-            "Export/EnableExcelPreview",        //  9
-            "Export/EnableWordPreview",         // 10
+            "Export/CalcToExcel",            	//  7
+            "Export/EnablePowerPointPreview",	//	8
+            "Export/EnableExcelPreview",		//	9
+            "Export/EnableWordPreview",			// 10
             "Import/ImportWWFieldsAsEnhancedFields" // 11
         };
         OUString* pNames = aNames.getArray();
@@ -530,8 +530,7 @@ void SvtFilterOptions::SetWriter2WinWord( BOOL bFlag )
 
 BOOL SvtFilterOptions::IsUseEnhancedFields() const
 {
-    return false; // disable for now;
-//    return pImp->IsFlag( FILTERCFG_USE_ENHANCED_FIELDS );
+    return pImp->IsFlag( FILTERCFG_USE_ENHANCED_FIELDS );
 }
 
 void SvtFilterOptions::SetUseEnhancedFields( BOOL bFlag )
diff --git a/unotools/source/config/fontcfg.cxx b/unotools/source/config/fontcfg.cxx
index e8ae78d0aed2..6713679f4600 100644
--- a/unotools/source/config/fontcfg.cxx
+++ b/unotools/source/config/fontcfg.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
@@ -232,7 +232,7 @@ OUString DefaultFontConfiguration::tryLocale( const Locale& rLocale, const OUStr
             }
         }
     }
-
+    
     return aRet;
 }
 
@@ -242,7 +242,7 @@ OUString DefaultFontConfiguration::getDefaultFont( const Locale& rLocale, int nT
     aLocale.Language = rLocale.Language.toAsciiLowerCase();
     aLocale.Country = rLocale.Country.toAsciiUpperCase();
     aLocale.Variant = rLocale.Variant.toAsciiUpperCase();
-
+    
     OUString aType = OUString::createFromAscii( getKeyType( nType ) );
     OUString aRet = tryLocale( aLocale, aType );
     if( ! aRet.getLength() && aLocale.Variant.getLength() )
@@ -569,7 +569,7 @@ struct ImplFontAttrWeightSearchData
 static ImplFontAttrWeightSearchData const aImplWeightAttrSearchList[] =
 {
 // the attribute names are ordered by "first match wins"
-// e.g. "semilight" should wins over "semi"
+// e.g. "semilight" should wins over "semi" 
 {   "extrablack",           WEIGHT_BLACK },
 {   "ultrablack",           WEIGHT_BLACK },
 {   "ultrabold",            WEIGHT_ULTRABOLD },
@@ -1085,7 +1085,7 @@ unsigned long FontSubstConfiguration::getSubstType( const com::sun::star::uno::R
     catch( WrappedTargetException )
     {
     }
-
+    
     return type;
 }
 
@@ -1117,7 +1117,7 @@ void FontSubstConfiguration::readLocaleSubst( const com::sun::star::lang::Locale
                 const OUString* pFontNames = aFonts.getConstArray();
                 // improve performance, heap fragmentation
                 it->second.aSubstAttributes.reserve( nFonts );
-
+                
                 // strings for subst retrieval, construct only once
                 OUString aSubstFontsStr     ( RTL_CONSTASCII_USTRINGPARAM( "SubstFonts" ) );
                 OUString aSubstFontsMSStr   ( RTL_CONSTASCII_USTRINGPARAM( "SubstFontsMS" ) );
@@ -1159,7 +1159,7 @@ void FontSubstConfiguration::readLocaleSubst( const com::sun::star::lang::Locale
                     aAttr.Weight = getSubstWeight( xFont, aSubstWeightStr );
                     aAttr.Width = getSubstWidth( xFont, aSubstWidthStr );
                     aAttr.Type = getSubstType( xFont, aSubstTypeStr );
-
+                    
                     // finally insert this entry
                     it->second.aSubstAttributes.push_back( aAttr );
                 }
diff --git a/unotools/source/config/fontoptions.cxx b/unotools/source/config/fontoptions.cxx
index 5853dd36af98..151c57a6eaf7 100644
--- a/unotools/source/config/fontoptions.cxx
+++ b/unotools/source/config/fontoptions.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
@@ -31,7 +31,7 @@
 #endif
 
 //_________________________________________________________________________________________________________________
-//  includes
+//	includes
 //_________________________________________________________________________________________________________________
 
 #include <unotools/fontoptions.hxx>
@@ -45,160 +45,160 @@
 #include "itemholder1.hxx"
 
 //_________________________________________________________________________________________________________________
-//  namespaces
+//	namespaces
 //_________________________________________________________________________________________________________________
 
-using namespace ::utl                   ;
-using namespace ::rtl                   ;
-using namespace ::osl                   ;
-using namespace ::com::sun::star::uno   ;
+using namespace ::utl					;
+using namespace ::rtl					;
+using namespace ::osl					;
+using namespace ::com::sun::star::uno	;
 
 //_________________________________________________________________________________________________________________
-//  const
+//	const
 //_________________________________________________________________________________________________________________
 
-#define ROOTNODE_FONT                       OUString(RTL_CONSTASCII_USTRINGPARAM("Office.Common/Font"           ))
+#define	ROOTNODE_FONT						OUString(RTL_CONSTASCII_USTRINGPARAM("Office.Common/Font"			))
 
-#define PROPERTYNAME_REPLACEMENTTABLE       OUString(RTL_CONSTASCII_USTRINGPARAM("Substitution/Replacement"     ))
-#define PROPERTYNAME_FONTHISTORY            OUString(RTL_CONSTASCII_USTRINGPARAM("View/History"                 ))
-#define PROPERTYNAME_FONTWYSIWYG            OUString(RTL_CONSTASCII_USTRINGPARAM("View/ShowFontBoxWYSIWYG"      ))
+#define	PROPERTYNAME_REPLACEMENTTABLE		OUString(RTL_CONSTASCII_USTRINGPARAM("Substitution/Replacement"		))
+#define	PROPERTYNAME_FONTHISTORY			OUString(RTL_CONSTASCII_USTRINGPARAM("View/History"					))
+#define	PROPERTYNAME_FONTWYSIWYG			OUString(RTL_CONSTASCII_USTRINGPARAM("View/ShowFontBoxWYSIWYG"		))
 
-#define PROPERTYHANDLE_REPLACEMENTTABLE     0
-#define PROPERTYHANDLE_FONTHISTORY          1
-#define PROPERTYHANDLE_FONTWYSIWYG          2
+#define	PROPERTYHANDLE_REPLACEMENTTABLE		0
+#define	PROPERTYHANDLE_FONTHISTORY			1
+#define	PROPERTYHANDLE_FONTWYSIWYG			2
 
-#define PROPERTYCOUNT                       3
+#define	PROPERTYCOUNT						3
 
 //_________________________________________________________________________________________________________________
-//  private declarations!
+//	private declarations!
 //_________________________________________________________________________________________________________________
 
 class SvtFontOptions_Impl : public ConfigItem
 {
     //-------------------------------------------------------------------------------------------------------------
-    //  public methods
+    //	public methods
     //-------------------------------------------------------------------------------------------------------------
 
     public:
 
         //---------------------------------------------------------------------------------------------------------
-        //  constructor / destructor
+        //	constructor / destructor
         //---------------------------------------------------------------------------------------------------------
 
          SvtFontOptions_Impl();
         ~SvtFontOptions_Impl();
 
         //---------------------------------------------------------------------------------------------------------
-        //  overloaded methods of baseclass
+        //	overloaded methods of baseclass
         //---------------------------------------------------------------------------------------------------------
 
         /*-****************************************************************************************************//**
-            @short      called for notify of configmanager
-            @descr      These method is called from the ConfigManager before application ends or from the
+            @short		called for notify of configmanager
+            @descr		These method is called from the ConfigManager before application ends or from the
                          PropertyChangeListener if the sub tree broadcasts changes. You must update your
                         internal values.
 
-            @seealso    baseclass ConfigItem
+            @seealso	baseclass ConfigItem
 
-            @param      "seqPropertyNames" is the list of properties which should be updated.
-            @return     -
+            @param		"seqPropertyNames" is the list of properties which should be updated.
+            @return		-
 
-            @onerror    -
+            @onerror	-
         *//*-*****************************************************************************************************/
 
         virtual void Notify( const Sequence< OUString >& seqPropertyNames );
 
         /*-****************************************************************************************************//**
-            @short      write changes to configuration
-            @descr      These method writes the changed values into the sub tree
+            @short		write changes to configuration
+            @descr		These method writes the changed values into the sub tree
                         and should always called in our destructor to guarantee consistency of config data.
 
-            @seealso    baseclass ConfigItem
+            @seealso	baseclass ConfigItem
 
-            @param      -
-            @return     -
+            @param		-
+            @return		-
 
-            @onerror    -
+            @onerror	-
         *//*-*****************************************************************************************************/
 
         virtual void Commit();
 
         //---------------------------------------------------------------------------------------------------------
-        //  public interface
+        //	public interface
         //---------------------------------------------------------------------------------------------------------
 
         /*-****************************************************************************************************//**
-            @short      access method to get internal values
-            @descr      These method give us a chance to regulate acces to ouer internal values.
+            @short		access method to get internal values
+            @descr		These method give us a chance to regulate acces to ouer internal values.
                         It's not used in the moment - but it's possible for the feature!
 
-            @seealso    -
+            @seealso	-
 
-            @param      -
-            @return     -
+            @param		-
+            @return		-
 
-            @onerror    -
+            @onerror	-
         *//*-*****************************************************************************************************/
 
-        sal_Bool    IsReplacementTableEnabled   (                   ) const ;
-        void        EnableReplacementTable      ( sal_Bool bState   )       ;
+        sal_Bool	IsReplacementTableEnabled	(					) const	;
+        void		EnableReplacementTable		( sal_Bool bState	)		;
 
-        sal_Bool    IsFontHistoryEnabled        (                   ) const ;
-        void        EnableFontHistory           ( sal_Bool bState   )       ;
+        sal_Bool	IsFontHistoryEnabled		(					) const	;
+        void		EnableFontHistory			( sal_Bool bState	)		;
 
-        sal_Bool    IsFontWYSIWYGEnabled        (                   ) const ;
-        void        EnableFontWYSIWYG           ( sal_Bool bState   )       ;
+        sal_Bool	IsFontWYSIWYGEnabled		(					) const	;
+        void		EnableFontWYSIWYG			( sal_Bool bState	)		;
 
     //-------------------------------------------------------------------------------------------------------------
-    //  private methods
+    //	private methods
     //-------------------------------------------------------------------------------------------------------------
 
     private:
 
         /*-****************************************************************************************************//**
-            @short      return list of key names of ouer configuration management which represent oue module tree
-            @descr      These methods return a static const list of key names. We need it to get needed values from our
+            @short		return list of key names of ouer configuration management which represent oue module tree
+            @descr		These methods return a static const list of key names. We need it to get needed values from our
                         configuration management.
 
-            @seealso    -
+            @seealso	-
 
-            @param      -
-            @return     A list of needed configuration keys is returned.
+            @param		-
+            @return		A list of needed configuration keys is returned.
 
-            @onerror    -
+            @onerror	-
         *//*-*****************************************************************************************************/
 
         static Sequence< OUString > impl_GetPropertyNames();
 
     //-------------------------------------------------------------------------------------------------------------
-    //  private member
+    //	private member
     //-------------------------------------------------------------------------------------------------------------
 
     private:
 
-        sal_Bool        m_bReplacementTable     ;
-        sal_Bool        m_bFontHistory          ;
-        sal_Bool        m_bFontWYSIWYG          ;
+        sal_Bool		m_bReplacementTable		;
+        sal_Bool		m_bFontHistory			;
+        sal_Bool		m_bFontWYSIWYG			;
 };
 
 //_________________________________________________________________________________________________________________
-//  definitions
+//	definitions
 //_________________________________________________________________________________________________________________
 
 //*****************************************************************************************************************
-//  constructor
+//	constructor
 //*****************************************************************************************************************
 SvtFontOptions_Impl::SvtFontOptions_Impl()
     // Init baseclasses first
-    :   ConfigItem          ( ROOTNODE_FONT )
+    :	ConfigItem			( ROOTNODE_FONT	)
     // Init member then.
-    ,   m_bReplacementTable ( sal_False     )
-    ,   m_bFontHistory      ( sal_False     )
-    ,   m_bFontWYSIWYG      ( sal_False     )
+    ,	m_bReplacementTable	( sal_False		)
+    ,	m_bFontHistory		( sal_False		)
+    ,	m_bFontWYSIWYG		( sal_False		)
 {
     // Use our static list of configuration keys to get his values.
-    Sequence< OUString >    seqNames    = impl_GetPropertyNames (           );
-    Sequence< Any >         seqValues   = GetProperties         ( seqNames  );
+    Sequence< OUString >	seqNames	= impl_GetPropertyNames	(			);
+    Sequence< Any >			seqValues	= GetProperties			( seqNames	);
 
     // Safe impossible cases.
     // We need values from ALL configuration keys.
@@ -214,17 +214,17 @@ SvtFontOptions_Impl::SvtFontOptions_Impl()
         DBG_ASSERT( !(seqValues[nProperty].hasValue()==sal_False), "SvtFontOptions_Impl::SvtFontOptions_Impl()\nInvalid property value detected!\n" );
         switch( nProperty )
         {
-            case PROPERTYHANDLE_REPLACEMENTTABLE    :   {
+            case PROPERTYHANDLE_REPLACEMENTTABLE	:	{
                                                             DBG_ASSERT(!(seqValues[nProperty].getValueTypeClass()!=TypeClass_BOOLEAN), "SvtFontOptions_Impl::SvtFontOptions_Impl()\nWho has changed the value type of \"Office.Common\\Font\\Substitution\\Replacement\"?" );
                                                             seqValues[nProperty] >>= m_bReplacementTable;
                                                         }
                                                         break;
-            case PROPERTYHANDLE_FONTHISTORY         :   {
+            case PROPERTYHANDLE_FONTHISTORY			:	{
                                                             DBG_ASSERT(!(seqValues[nProperty].getValueTypeClass()!=TypeClass_BOOLEAN), "SvtFontOptions_Impl::SvtFontOptions_Impl()\nWho has changed the value type of \"Office.Common\\Font\\View\\History\"?" );
                                                             seqValues[nProperty] >>= m_bFontHistory;
                                                         }
                                                         break;
-            case PROPERTYHANDLE_FONTWYSIWYG         :   {
+            case PROPERTYHANDLE_FONTWYSIWYG			:	{
                                                             DBG_ASSERT(!(seqValues[nProperty].getValueTypeClass()!=TypeClass_BOOLEAN), "SvtFontOptions_Impl::SvtFontOptions_Impl()\nWho has changed the value type of \"Office.Common\\Font\\View\\ShowFontBoxWYSIWYG\"?" );
                                                             seqValues[nProperty] >>= m_bFontWYSIWYG;
                                                         }
@@ -238,7 +238,7 @@ SvtFontOptions_Impl::SvtFontOptions_Impl()
 }
 
 //*****************************************************************************************************************
-//  destructor
+//	destructor
 //*****************************************************************************************************************
 SvtFontOptions_Impl::~SvtFontOptions_Impl()
 {
@@ -250,7 +250,7 @@ SvtFontOptions_Impl::~SvtFontOptions_Impl()
 }
 
 //*****************************************************************************************************************
-//  public method
+//	public method
 //*****************************************************************************************************************
 void SvtFontOptions_Impl::Notify( const Sequence< OUString >& seqPropertyNames )
 {
@@ -287,27 +287,27 @@ void SvtFontOptions_Impl::Notify( const Sequence< OUString >& seqPropertyNames )
 }
 
 //*****************************************************************************************************************
-//  public method
+//	public method
 //*****************************************************************************************************************
 void SvtFontOptions_Impl::Commit()
 {
     // Get names of supported properties, create a list for values and copy current values to it.
-    Sequence< OUString >    seqNames    = impl_GetPropertyNames();
-    sal_Int32               nCount      = seqNames.getLength();
-    Sequence< Any >         seqValues   ( nCount );
+    Sequence< OUString >	seqNames	= impl_GetPropertyNames();
+    sal_Int32				nCount		= seqNames.getLength();
+    Sequence< Any >			seqValues	( nCount );
     for( sal_Int32 nProperty=0; nProperty<nCount; ++nProperty )
     {
         switch( nProperty )
         {
-            case PROPERTYHANDLE_REPLACEMENTTABLE    :   {
+            case PROPERTYHANDLE_REPLACEMENTTABLE	:	{
                                                             seqValues[nProperty] <<= m_bReplacementTable;
                                                         }
                                                         break;
-            case PROPERTYHANDLE_FONTHISTORY         :   {
+            case PROPERTYHANDLE_FONTHISTORY			:	{
                                                             seqValues[nProperty] <<= m_bFontHistory;
                                                         }
                                                         break;
-            case PROPERTYHANDLE_FONTWYSIWYG         :   {
+            case PROPERTYHANDLE_FONTWYSIWYG			:	{
                                                             seqValues[nProperty] <<= m_bFontWYSIWYG;
                                                         }
                                                         break;
@@ -318,7 +318,7 @@ void SvtFontOptions_Impl::Commit()
 }
 
 //*****************************************************************************************************************
-//  public method
+//	public method
 //*****************************************************************************************************************
 sal_Bool SvtFontOptions_Impl::IsReplacementTableEnabled() const
 {
@@ -326,7 +326,7 @@ sal_Bool SvtFontOptions_Impl::IsReplacementTableEnabled() const
 }
 
 //*****************************************************************************************************************
-//  public method
+//	public method
 //*****************************************************************************************************************
 void SvtFontOptions_Impl::EnableReplacementTable( sal_Bool bState )
 {
@@ -335,7 +335,7 @@ void SvtFontOptions_Impl::EnableReplacementTable( sal_Bool bState )
 }
 
 //*****************************************************************************************************************
-//  public method
+//	public method
 //*****************************************************************************************************************
 sal_Bool SvtFontOptions_Impl::IsFontHistoryEnabled() const
 {
@@ -343,7 +343,7 @@ sal_Bool SvtFontOptions_Impl::IsFontHistoryEnabled() const
 }
 
 //*****************************************************************************************************************
-//  public method
+//	public method
 //*****************************************************************************************************************
 void SvtFontOptions_Impl::EnableFontHistory( sal_Bool bState )
 {
@@ -352,7 +352,7 @@ void SvtFontOptions_Impl::EnableFontHistory( sal_Bool bState )
 }
 
 //*****************************************************************************************************************
-//  public method
+//	public method
 //*****************************************************************************************************************
 sal_Bool SvtFontOptions_Impl::IsFontWYSIWYGEnabled() const
 {
@@ -360,7 +360,7 @@ sal_Bool SvtFontOptions_Impl::IsFontWYSIWYGEnabled() const
 }
 
 //*****************************************************************************************************************
-//  public method
+//	public method
 //*****************************************************************************************************************
 void SvtFontOptions_Impl::EnableFontWYSIWYG( sal_Bool bState )
 {
@@ -369,16 +369,16 @@ void SvtFontOptions_Impl::EnableFontWYSIWYG( sal_Bool bState )
 }
 
 //*****************************************************************************************************************
-//  private method
+//	private method
 //*****************************************************************************************************************
 Sequence< OUString > SvtFontOptions_Impl::impl_GetPropertyNames()
 {
     // Build static list of configuration key names.
     static const OUString pProperties[] =
     {
-        PROPERTYNAME_REPLACEMENTTABLE   ,
-        PROPERTYNAME_FONTHISTORY        ,
-        PROPERTYNAME_FONTWYSIWYG        ,
+        PROPERTYNAME_REPLACEMENTTABLE	,
+        PROPERTYNAME_FONTHISTORY		,
+        PROPERTYNAME_FONTWYSIWYG		,
     };
     // Initialize return sequence with these list ...
     static const Sequence< OUString > seqPropertyNames( pProperties, PROPERTYCOUNT );
@@ -387,15 +387,15 @@ Sequence< OUString > SvtFontOptions_Impl::impl_GetPropertyNames()
 }
 
 //*****************************************************************************************************************
-//  initialize static member
-//  DON'T DO IT IN YOUR HEADER!
-//  see definition for further informations
+//	initialize static member
+//	DON'T DO IT IN YOUR HEADER!
+//	see definition for further informations
 //*****************************************************************************************************************
-SvtFontOptions_Impl*    SvtFontOptions::m_pDataContainer    = NULL  ;
-sal_Int32               SvtFontOptions::m_nRefCount         = 0     ;
+SvtFontOptions_Impl*	SvtFontOptions::m_pDataContainer	= NULL	;
+sal_Int32				SvtFontOptions::m_nRefCount			= 0		;
 
 //*****************************************************************************************************************
-//  constructor
+//	constructor
 //*****************************************************************************************************************
 SvtFontOptions::SvtFontOptions()
 {
@@ -414,7 +414,7 @@ SvtFontOptions::SvtFontOptions()
 }
 
 //*****************************************************************************************************************
-//  destructor
+//	destructor
 //*****************************************************************************************************************
 SvtFontOptions::~SvtFontOptions()
 {
@@ -432,7 +432,7 @@ SvtFontOptions::~SvtFontOptions()
 }
 
 //*****************************************************************************************************************
-//  public method
+//	public method
 //*****************************************************************************************************************
 sal_Bool SvtFontOptions::IsReplacementTableEnabled() const
 {
@@ -441,7 +441,7 @@ sal_Bool SvtFontOptions::IsReplacementTableEnabled() const
 }
 
 //*****************************************************************************************************************
-//  public method
+//	public method
 //*****************************************************************************************************************
 void SvtFontOptions::EnableReplacementTable( sal_Bool bState )
 {
@@ -450,7 +450,7 @@ void SvtFontOptions::EnableReplacementTable( sal_Bool bState )
 }
 
 //*****************************************************************************************************************
-//  public method
+//	public method
 //*****************************************************************************************************************
 sal_Bool SvtFontOptions::IsFontHistoryEnabled() const
 {
@@ -459,7 +459,7 @@ sal_Bool SvtFontOptions::IsFontHistoryEnabled() const
 }
 
 //*****************************************************************************************************************
-//  public method
+//	public method
 //*****************************************************************************************************************
 void SvtFontOptions::EnableFontHistory( sal_Bool bState )
 {
@@ -468,7 +468,7 @@ void SvtFontOptions::EnableFontHistory( sal_Bool bState )
 }
 
 //*****************************************************************************************************************
-//  public method
+//	public method
 //*****************************************************************************************************************
 sal_Bool SvtFontOptions::IsFontWYSIWYGEnabled() const
 {
@@ -477,7 +477,7 @@ sal_Bool SvtFontOptions::IsFontWYSIWYGEnabled() const
 }
 
 //*****************************************************************************************************************
-//  public method
+//	public method
 //*****************************************************************************************************************
 void SvtFontOptions::EnableFontWYSIWYG( sal_Bool bState )
 {
@@ -486,7 +486,7 @@ void SvtFontOptions::EnableFontWYSIWYG( sal_Bool bState )
 }
 
 //*****************************************************************************************************************
-//  private method
+//	private method
 //*****************************************************************************************************************
 Mutex& SvtFontOptions::impl_GetOwnStaticMutex()
 {
diff --git a/unotools/source/config/historyoptions.cxx b/unotools/source/config/historyoptions.cxx
index 5cb74f9bbf35..653e4104da04 100644
--- a/unotools/source/config/historyoptions.cxx
+++ b/unotools/source/config/historyoptions.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
diff --git a/unotools/source/config/inetoptions.cxx b/unotools/source/config/inetoptions.cxx
index 15bf425af744..5686ea822b1b 100644
--- a/unotools/source/config/inetoptions.cxx
+++ b/unotools/source/config/inetoptions.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
diff --git a/unotools/source/config/internaloptions.cxx b/unotools/source/config/internaloptions.cxx
index 310b52f8c98f..281a8eaa3046 100644
--- a/unotools/source/config/internaloptions.cxx
+++ b/unotools/source/config/internaloptions.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
@@ -31,7 +31,7 @@
 #endif
 
 //_________________________________________________________________________________________________________________
-//  includes
+//	includes
 //_________________________________________________________________________________________________________________
 
 #include <deque>
@@ -48,39 +48,39 @@
 #include "itemholder1.hxx"
 
 //_________________________________________________________________________________________________________________
-//  namespaces
+//	namespaces
 //_________________________________________________________________________________________________________________
 
-using namespace ::utl                   ;
-using namespace ::rtl                   ;
-using namespace ::osl                   ;
-using namespace ::std                   ;
-using namespace ::com::sun::star::uno   ;
-using namespace ::com::sun::star::beans ;
+using namespace ::utl					;
+using namespace ::rtl					;
+using namespace ::osl					;
+using namespace ::std					;
+using namespace ::com::sun::star::uno	;
+using namespace ::com::sun::star::beans	;
 
 //_________________________________________________________________________________________________________________
-//  const
+//	const
 //_________________________________________________________________________________________________________________
 
-#define ROOTNODE_INTERNAL                   OUString(RTL_CONSTASCII_USTRINGPARAM("Office.Common/Internal"   ))
-#define DEFAULT_SLOTCFG                     sal_False
-#define DEFAULT_SENDCRASHMAIL               sal_False
+#define	ROOTNODE_INTERNAL					OUString(RTL_CONSTASCII_USTRINGPARAM("Office.Common/Internal"	))
+#define	DEFAULT_SLOTCFG						sal_False
+#define	DEFAULT_SENDCRASHMAIL				sal_False
 #define DEFAULT_USEMAILUI                   sal_True
-#define DEFAULT_CURRENTTEMPURL              OUString(RTL_CONSTASCII_USTRINGPARAM(""))
+#define DEFAULT_CURRENTTEMPURL				OUString(RTL_CONSTASCII_USTRINGPARAM(""))
 
-#define FIXPROPERTYNAME_SLOTCFG             OUString(RTL_CONSTASCII_USTRINGPARAM("Slot"                     ))
-#define FIXPROPERTYNAME_SENDCRASHMAIL       OUString(RTL_CONSTASCII_USTRINGPARAM("SendCrashMail"            ))
+#define	FIXPROPERTYNAME_SLOTCFG				OUString(RTL_CONSTASCII_USTRINGPARAM("Slot"						))
+#define	FIXPROPERTYNAME_SENDCRASHMAIL		OUString(RTL_CONSTASCII_USTRINGPARAM("SendCrashMail"			))
 #define FIXPROPERTYNAME_USEMAILUI           OUString(RTL_CONSTASCII_USTRINGPARAM("UseMailUI"                ))
-#define FIXPROPERTYNAME_CURRENTTEMPURL      OUString(RTL_CONSTASCII_USTRINGPARAM("CurrentTempURL"           ))
+#define FIXPROPERTYNAME_CURRENTTEMPURL		OUString(RTL_CONSTASCII_USTRINGPARAM("CurrentTempURL"			))
 //#define FIXPROPERTYNAME_REMOVEMENUENTRYCLOSE           OUString(RTL_CONSTASCII_USTRINGPARAM("RemoveMenuEntryClose"))
 //#define FIXPROPERTYNAME_REMOVEMENUENTRYBACKTOWEBTOP    OUString(RTL_CONSTASCII_USTRINGPARAM("RemoveMenuEntryBackToWebtop"))
 //#define FIXPROPERTYNAME_REMOVEMENUENTRYNEWWEBTOP       OUString(RTL_CONSTASCII_USTRINGPARAM("RemoveMenuEntryNewWebtop"))
 //#define FIXPROPERTYNAME_REMOVEMENUENTRYLOGOUT          OUString(RTL_CONSTASCII_USTRINGPARAM("RemoveMenuEntryLogout"))
 
-#define FIXPROPERTYHANDLE_SLOTCFG           0
-#define FIXPROPERTYHANDLE_SENDCRASHMAIL     1
+#define	FIXPROPERTYHANDLE_SLOTCFG			0
+#define	FIXPROPERTYHANDLE_SENDCRASHMAIL		1
 #define FIXPROPERTYHANDLE_USEMAILUI         2
-#define FIXPROPERTYHANDLE_CURRENTTEMPURL    3
+#define FIXPROPERTYHANDLE_CURRENTTEMPURL	3
 //#define FIXPROPERTYHANDLE_REMOVEMENUENTRYCLOSE   3
 //#define FIXPROPERTYHANDLE_REMOVEMENUENTRYBACKTOWEBTOP         4
 //#define FIXPROPERTYHANDLE_REMOVEMENUENTRYNEWWEBTOP         5
@@ -88,42 +88,42 @@ using namespace ::com::sun::star::beans ;
 
 #define FIXPROPERTYCOUNT                    4
 /*
-#define PROPERTYNAME_RECOVERYLIST           OUString(RTL_CONSTASCII_USTRINGPARAM("RecoveryList"             ))
-#define PROPERTYNAME_URL                    OUString(RTL_CONSTASCII_USTRINGPARAM("OrgURL"                   ))
-#define PROPERTYNAME_FILTER                 OUString(RTL_CONSTASCII_USTRINGPARAM("FilterName"               ))
-#define PROPERTYNAME_TEMPNAME               OUString(RTL_CONSTASCII_USTRINGPARAM("TempURL"                  ))
-
-#define OFFSET_URL                          0
-#define OFFSET_FILTER                       1
-#define OFFSET_TEMPNAME                     2
+#define	PROPERTYNAME_RECOVERYLIST			OUString(RTL_CONSTASCII_USTRINGPARAM("RecoveryList"				))
+#define	PROPERTYNAME_URL					OUString(RTL_CONSTASCII_USTRINGPARAM("OrgURL"					))
+#define	PROPERTYNAME_FILTER					OUString(RTL_CONSTASCII_USTRINGPARAM("FilterName"  			    ))
+#define	PROPERTYNAME_TEMPNAME				OUString(RTL_CONSTASCII_USTRINGPARAM("TempURL"					))
+
+#define	OFFSET_URL							0
+#define	OFFSET_FILTER						1
+#define	OFFSET_TEMPNAME						2
 */
-#define PATHDELIMITER                       OUString(RTL_CONSTASCII_USTRINGPARAM("/"                        ))
-#define FIXR                                OUString(RTL_CONSTASCII_USTRINGPARAM("r"                        ))
+#define	PATHDELIMITER						OUString(RTL_CONSTASCII_USTRINGPARAM("/"						))
+#define	FIXR								OUString(RTL_CONSTASCII_USTRINGPARAM("r"						))
 
 //_________________________________________________________________________________________________________________
-//  private declarations!
+//	private declarations!
 //_________________________________________________________________________________________________________________
 /*
 struct tIMPL_RecoveryEntry
 {
-    OUString    sURL        ;
-    OUString    sFilter     ;
-    OUString    sTempName   ;
+    OUString	sURL		;
+    OUString	sFilter		;
+    OUString	sTempName	;
 
     tIMPL_RecoveryEntry()
     {
-        sURL        =   OUString();
-        sFilter     =   OUString();
-        sTempName   =   OUString();
+        sURL		=	OUString();
+        sFilter		=	OUString();
+        sTempName	=	OUString();
     }
 
-    tIMPL_RecoveryEntry(    const   OUString&   sNewURL         ,
-                            const   OUString&   sNewFilter      ,
-                            const   OUString&   sNewTempName    )
+    tIMPL_RecoveryEntry(	const	OUString&	sNewURL			,
+                            const	OUString&	sNewFilter		,
+                            const	OUString&	sNewTempName	)
     {
-        sURL        =   sNewURL         ;
-        sFilter     =   sNewFilter      ;
-        sTempName   =   sNewTempName    ;
+        sURL		=	sNewURL			;
+        sFilter		=	sNewFilter		;
+        sTempName	=	sNewTempName	;
     }
 };
 
@@ -132,7 +132,7 @@ typedef deque< tIMPL_RecoveryEntry > tIMPL_RecoveryStack;
 class SvtInternalOptions_Impl : public ConfigItem
 {
     //-------------------------------------------------------------------------------------------------------------
-    //  private member
+    //	private member
     //-------------------------------------------------------------------------------------------------------------
 
     private:
@@ -142,39 +142,39 @@ class SvtInternalOptions_Impl : public ConfigItem
         sal_Bool                m_bRemoveMenuEntryNewWebtop;
         sal_Bool                m_bRemoveMenuEntryLogout;
         sal_Bool                m_bSlotCFG          ;   /// cache "Slot" of Internal section
-        sal_Bool                m_bSendCrashMail    ;   /// cache "SendCrashMail" of Internal section
+        sal_Bool				m_bSendCrashMail	;	/// cache "SendCrashMail" of Internal section
         sal_Bool                m_bUseMailUI;
-        OUString                m_aCurrentTempURL   ;
-    //  tIMPL_RecoveryStack     m_aRecoveryList     ;   /// cache "RecoveryList" of Internal section
+        OUString				m_aCurrentTempURL	;
+    //	tIMPL_RecoveryStack		m_aRecoveryList		;	/// cache "RecoveryList" of Internal section
     //-------------------------------------------------------------------------------------------------------------
-    //  public methods
+    //	public methods
     //-------------------------------------------------------------------------------------------------------------
 
     public:
 
         //---------------------------------------------------------------------------------------------------------
-        //  constructor / destructor
+        //	constructor / destructor
         //---------------------------------------------------------------------------------------------------------
 
          SvtInternalOptions_Impl();
         ~SvtInternalOptions_Impl();
 
         //---------------------------------------------------------------------------------------------------------
-        //  overloaded methods of baseclass
+        //	overloaded methods of baseclass
         //---------------------------------------------------------------------------------------------------------
 
         /*-****************************************************************************************************//**
-            @short      called for notify of configmanager
-            @descr      These method is called from the ConfigManager before application ends or from the
+            @short		called for notify of configmanager
+            @descr		These method is called from the ConfigManager before application ends or from the
                          PropertyChangeListener if the sub tree broadcasts changes. You must update your
                         internal values.
 
-            @seealso    baseclass ConfigItem
+            @seealso	baseclass ConfigItem
 
-            @param      "seqPropertyNames" is the list of properties which should be updated.
-            @return     -
+            @param		"seqPropertyNames" is the list of properties which should be updated.
+            @return		-
 
-            @onerror    -
+            @onerror	-
         *//*-*****************************************************************************************************/
 
         virtual void Notify( const Sequence< OUString >& )
@@ -183,35 +183,35 @@ class SvtInternalOptions_Impl : public ConfigItem
         }
 
         /*-****************************************************************************************************//**
-            @short      write changes to configuration
-            @descr      These method writes the changed values into the sub tree
+            @short		write changes to configuration
+            @descr		These method writes the changed values into the sub tree
                         and should always called in our destructor to guarantee consistency of config data.
 
-            @seealso    baseclass ConfigItem
+            @seealso	baseclass ConfigItem
 
-            @param      -
-            @return     -
+            @param		-
+            @return		-
 
-            @onerror    -
+            @onerror	-
         *//*-*****************************************************************************************************/
 
         virtual void Commit();
 
         //---------------------------------------------------------------------------------------------------------
-        //  public interface
+        //	public interface
         //---------------------------------------------------------------------------------------------------------
 
         /*-****************************************************************************************************//**
-            @short      access method to get internal values
-            @descr      These method give us a chance to regulate acces to ouer internal values.
+            @short		access method to get internal values
+            @descr		These method give us a chance to regulate acces to ouer internal values.
                         It's not used in the moment - but it's possible for the feature!
 
-            @seealso    -
+            @seealso	-
 
-            @param      -
-            @return     -
+            @param		-
+            @return		-
 
-            @onerror    -
+            @onerror	-
         *//*-*****************************************************************************************************/
 
         sal_Bool    IsRemoveMenuEntryClose() const { return m_bRemoveMenuEntryClose; }
@@ -222,46 +222,46 @@ class SvtInternalOptions_Impl : public ConfigItem
         sal_Bool    CrashMailEnabled    () const { return m_bSendCrashMail; }
         sal_Bool    MailUIEnabled       () const { return m_bUseMailUI; }
 
-        OUString    GetCurrentTempURL() const { return m_aCurrentTempURL; }
-        void        SetCurrentTempURL( const OUString& aNewCurrentTempURL );
+        OUString	GetCurrentTempURL() const { return m_aCurrentTempURL; }
+        void		SetCurrentTempURL( const OUString& aNewCurrentTempURL );
 /*
-        void        PushRecoveryItem    (   const   OUString&   sURL        ,
-                                            const   OUString&   sFilter     ,
-                                             const  OUString&   sTempName   );
-        void        PopRecoveryItem     (           OUString&   sURL        ,
-                                                    OUString&   sFilter     ,
-                                                    OUString&   sTempName   );
-        sal_Bool    IsRecoveryListEmpty (                                   ) const;
+        void		PushRecoveryItem	(	const	OUString&	sURL		,
+                                            const	OUString&	sFilter		,
+                                             const	OUString&	sTempName	);
+        void		PopRecoveryItem		(			OUString&	sURL		,
+                                                    OUString&	sFilter		,
+                                                    OUString&	sTempName	);
+        sal_Bool	IsRecoveryListEmpty	(									) const;
 */
     //-------------------------------------------------------------------------------------------------------------
-    //  private methods
+    //	private methods
     //-------------------------------------------------------------------------------------------------------------
 
     private:
 
         /*-****************************************************************************************************//**
-            @short      return list of fix key names of ouer configuration management which represent oue module tree
-            @descr      These methods return a static const list of key names. We need it to get needed values from our
+            @short		return list of fix key names of ouer configuration management which represent oue module tree
+            @descr		These methods return a static const list of key names. We need it to get needed values from our
                         configuration management. We return well known key names only - because the "UserData" node
                         is handled in a special way!
 
-            @seealso    -
+            @seealso	-
 
-            @param      -
-            @return     A list of needed configuration keys is returned.
+            @param		-
+            @return		A list of needed configuration keys is returned.
 
-            @onerror    -
+            @onerror	-
         *//*-*****************************************************************************************************/
 
         Sequence< OUString > impl_GetPropertyNames();
 };
 
 //_________________________________________________________________________________________________________________
-//  definitions
+//	definitions
 //_________________________________________________________________________________________________________________
 
 //*****************************************************************************************************************
-//  constructor
+//	constructor
 //*****************************************************************************************************************
 SvtInternalOptions_Impl::SvtInternalOptions_Impl()
     // Init baseclasses first
@@ -271,24 +271,24 @@ SvtInternalOptions_Impl::SvtInternalOptions_Impl()
     , m_bRemoveMenuEntryBackToWebtop ( sal_False )
     , m_bRemoveMenuEntryNewWebtop ( sal_False )
     , m_bRemoveMenuEntryLogout ( sal_False )
-    ,   m_bSlotCFG          ( DEFAULT_SLOTCFG           )
-    ,   m_bSendCrashMail    ( DEFAULT_SENDCRASHMAIL     )
-    ,   m_bUseMailUI        ( DEFAULT_USEMAILUI         )
-    ,   m_aCurrentTempURL   ( DEFAULT_CURRENTTEMPURL    )
+    ,	m_bSlotCFG			( DEFAULT_SLOTCFG			)
+    ,	m_bSendCrashMail	( DEFAULT_SENDCRASHMAIL		)
+    ,   m_bUseMailUI        ( DEFAULT_USEMAILUI			)
+    ,	m_aCurrentTempURL	( DEFAULT_CURRENTTEMPURL	)
 {
     // Use our list of configuration keys to get his values.
     // structure of internal section: (first 2 entries are fixed - all other are member of a set!)
-    //      "Slot"
-    //      "SendCrashMail"
-    //      "RecoveryList/r1/URL"
-    //      "RecoveryList/r1/Filter"
-    //      "RecoveryList/r1/TempName"
-    //      "RecoveryList/r2/URL"
-    //      "RecoveryList/r2/Filter"
-    //      "RecoveryList/r2/TempName"
-    //      "RecoveryList/.."
-    Sequence< OUString >    seqNames    = impl_GetPropertyNames()   ;
-    Sequence< Any >         seqValues   = GetProperties( seqNames ) ;
+    //		"Slot"
+    //		"SendCrashMail"
+    //		"RecoveryList/r1/URL"
+    //		"RecoveryList/r1/Filter"
+    //		"RecoveryList/r1/TempName"
+    //		"RecoveryList/r2/URL"
+    //		"RecoveryList/r2/Filter"
+    //		"RecoveryList/r2/TempName"
+    //		"RecoveryList/.."
+    Sequence< OUString >	seqNames	= impl_GetPropertyNames()	;
+    Sequence< Any >			seqValues	= GetProperties( seqNames )	;
 
     // Safe impossible cases.
     // We need values from ALL configuration keys.
@@ -296,12 +296,12 @@ SvtInternalOptions_Impl::SvtInternalOptions_Impl()
     DBG_ASSERT( !(seqNames.getLength()!=seqValues.getLength()), "SvtInternalOptions_Impl::SvtInternalOptions_Impl()\nI miss some values of configuration keys!\n" );
 
     // Read fixed values first!
-    DBG_ASSERT(!(seqValues[FIXPROPERTYHANDLE_SLOTCFG].getValueTypeClass()!=TypeClass_BOOLEAN)       , "SvtInternalOptions_Impl::SvtInternalOptions_Impl()\nWho has changed the value type of \"Office.Common\\Internal\\Slot\"?"            );
-    DBG_ASSERT(!(seqValues[FIXPROPERTYHANDLE_SENDCRASHMAIL].getValueTypeClass()!=TypeClass_BOOLEAN) , "SvtInternalOptions_Impl::SvtInternalOptions_Impl()\nWho has changed the value type of \"Office.Common\\Internal\\SendCrashMail\"?"   );
-    seqValues[FIXPROPERTYHANDLE_SLOTCFG         ] >>= m_bSlotCFG        ;
-    seqValues[FIXPROPERTYHANDLE_SENDCRASHMAIL   ] >>= m_bSendCrashMail  ;
+    DBG_ASSERT(!(seqValues[FIXPROPERTYHANDLE_SLOTCFG].getValueTypeClass()!=TypeClass_BOOLEAN)		, "SvtInternalOptions_Impl::SvtInternalOptions_Impl()\nWho has changed the value type of \"Office.Common\\Internal\\Slot\"?"			);
+    DBG_ASSERT(!(seqValues[FIXPROPERTYHANDLE_SENDCRASHMAIL].getValueTypeClass()!=TypeClass_BOOLEAN)	, "SvtInternalOptions_Impl::SvtInternalOptions_Impl()\nWho has changed the value type of \"Office.Common\\Internal\\SendCrashMail\"?"	);
+    seqValues[FIXPROPERTYHANDLE_SLOTCFG			] >>= m_bSlotCFG		;
+    seqValues[FIXPROPERTYHANDLE_SENDCRASHMAIL	] >>= m_bSendCrashMail	;
     seqValues[FIXPROPERTYHANDLE_USEMAILUI       ] >>= m_bUseMailUI  ;
-    seqValues[FIXPROPERTYHANDLE_CURRENTTEMPURL  ] >>= m_aCurrentTempURL ;
+    seqValues[FIXPROPERTYHANDLE_CURRENTTEMPURL	] >>= m_aCurrentTempURL	;
 //    seqValues[FIXPROPERTYHANDLE_REMOVEMENUENTRYCLOSE ] >>= m_bRemoveMenuEntryClose  ;
 //    seqValues[FIXPROPERTYHANDLE_REMOVEMENUENTRYBACKTOWEBTOP ] >>= m_bRemoveMenuEntryBackToWebtop  ;
 //    seqValues[FIXPROPERTYHANDLE_REMOVEMENUENTRYNEWWEBTOP ] >>= m_bRemoveMenuEntryNewWebtop  ;
@@ -311,16 +311,16 @@ SvtInternalOptions_Impl::SvtInternalOptions_Impl()
     // 3 subkeys for every item!
     // Attention: Start at next element after last fixed entry! We must ignore "Slot" and "SendCrashMail" ...
     tIMPL_RecoveryEntry aEntry;
-    sal_uInt32 nCount       = seqValues.getLength() ;
-    sal_uInt32 nPosition    = FIXPROPERTYCOUNT      ;
+    sal_uInt32 nCount		= seqValues.getLength()	;
+    sal_uInt32 nPosition	= FIXPROPERTYCOUNT		;
 
     while( nPosition<nCount )
     {
-        seqValues[nPosition] >>= aEntry.sURL        ;
+        seqValues[nPosition] >>= aEntry.sURL		;
         ++nPosition;
-        seqValues[nPosition] >>= aEntry.sFilter     ;
+        seqValues[nPosition] >>= aEntry.sFilter		;
         ++nPosition;
-        seqValues[nPosition] >>= aEntry.sTempName   ;
+        seqValues[nPosition] >>= aEntry.sTempName	;
         ++nPosition;
         m_aRecoveryList.push_front( aEntry );
     }
@@ -331,7 +331,7 @@ SvtInternalOptions_Impl::SvtInternalOptions_Impl()
 }
 
 //*****************************************************************************************************************
-//  destructor
+//	destructor
 //*****************************************************************************************************************
 SvtInternalOptions_Impl::~SvtInternalOptions_Impl()
 {
@@ -342,7 +342,7 @@ SvtInternalOptions_Impl::~SvtInternalOptions_Impl()
 }
 
 //*****************************************************************************************************************
-//  public method
+//	public method
 //*****************************************************************************************************************
 void SvtInternalOptions_Impl::Commit()
 {
@@ -361,9 +361,9 @@ void SvtInternalOptions_Impl::Commit()
     // Write set of dynamic properties then.
     ClearNodeSet( PROPERTYNAME_RECOVERYLIST );
 
-    tIMPL_RecoveryEntry         aItem                   ;
-    OUString                    sNode                   ;
-    Sequence< PropertyValue >   seqPropertyValues( 3 )  ;   // Every node in set has 3 sub-nodes!( url, filter, tempname )
+    tIMPL_RecoveryEntry			aItem					;
+    OUString					sNode					;
+    Sequence< PropertyValue >	seqPropertyValues( 3 )	;	// Every node in set has 3 sub-nodes!( url, filter, tempname )
 
     // Copy list entries to save-list and write it to configuration.
 
@@ -373,12 +373,12 @@ void SvtInternalOptions_Impl::Commit()
         aItem = m_aRecoveryList.top();
         m_aRecoveryList.pop();
         sNode = PROPERTYNAME_RECOVERYLIST + PATHDELIMITER + FIXR + OUString::valueOf( (sal_Int32)nItem ) + PATHDELIMITER;
-        seqPropertyValues[OFFSET_URL        ].Name  =   sNode + PROPERTYNAME_URL        ;
-        seqPropertyValues[OFFSET_FILTER     ].Name  =   sNode + PROPERTYNAME_FILTER     ;
-        seqPropertyValues[OFFSET_TEMPNAME   ].Name  =   sNode + PROPERTYNAME_TEMPNAME   ;
-        seqPropertyValues[OFFSET_URL        ].Value <<= aItem.sURL                      ;
-        seqPropertyValues[OFFSET_FILTER     ].Value <<= aItem.sFilter                   ;
-        seqPropertyValues[OFFSET_TEMPNAME   ].Value <<= aItem.sTempName                 ;
+        seqPropertyValues[OFFSET_URL		].Name  =	sNode + PROPERTYNAME_URL		;
+        seqPropertyValues[OFFSET_FILTER		].Name  =	sNode + PROPERTYNAME_FILTER		;
+        seqPropertyValues[OFFSET_TEMPNAME	].Name  =	sNode + PROPERTYNAME_TEMPNAME	;
+        seqPropertyValues[OFFSET_URL		].Value <<=	aItem.sURL						;
+        seqPropertyValues[OFFSET_FILTER		].Value <<=	aItem.sFilter					;
+        seqPropertyValues[OFFSET_TEMPNAME	].Value <<=	aItem.sTempName					;
 
         SetSetProperties( PROPERTYNAME_RECOVERYLIST, seqPropertyValues );
     }
@@ -389,12 +389,12 @@ void SvtInternalOptions_Impl::Commit()
         aItem = *iRecovery;
         sNode = PROPERTYNAME_RECOVERYLIST + PATHDELIMITER + FIXR +
             OUString::valueOf( (sal_Int32)nItem ) + PATHDELIMITER;
-        seqPropertyValues[OFFSET_URL        ].Name  =   sNode + PROPERTYNAME_URL        ;
-        seqPropertyValues[OFFSET_FILTER     ].Name  =   sNode + PROPERTYNAME_FILTER     ;
-        seqPropertyValues[OFFSET_TEMPNAME   ].Name  =   sNode + PROPERTYNAME_TEMPNAME   ;
-        seqPropertyValues[OFFSET_URL        ].Value <<= iRecovery->sURL                 ;
-        seqPropertyValues[OFFSET_FILTER     ].Value <<= iRecovery->sFilter              ;
-        seqPropertyValues[OFFSET_TEMPNAME   ].Value <<= iRecovery->sTempName            ;
+        seqPropertyValues[OFFSET_URL		].Name  =	sNode + PROPERTYNAME_URL		;
+        seqPropertyValues[OFFSET_FILTER		].Name  =	sNode + PROPERTYNAME_FILTER		;
+        seqPropertyValues[OFFSET_TEMPNAME	].Name  =	sNode + PROPERTYNAME_TEMPNAME	;
+        seqPropertyValues[OFFSET_URL		].Value <<=	iRecovery->sURL					;
+        seqPropertyValues[OFFSET_FILTER		].Value <<=	iRecovery->sFilter				;
+        seqPropertyValues[OFFSET_TEMPNAME	].Value <<=	iRecovery->sTempName			;
         SetSetProperties( PROPERTYNAME_RECOVERYLIST, seqPropertyValues );
     }
 
@@ -402,7 +402,7 @@ void SvtInternalOptions_Impl::Commit()
 }
 
 //*****************************************************************************************************************
-//  public method
+//	public method
 //*****************************************************************************************************************
 void SvtInternalOptions_Impl::SetCurrentTempURL( const OUString& aNewCurrentTempURL )
 {
@@ -413,11 +413,11 @@ void SvtInternalOptions_Impl::SetCurrentTempURL( const OUString& aNewCurrentTemp
 
 #if 0
 //*****************************************************************************************************************
-//  public method
+//	public method
 //*****************************************************************************************************************
-void SvtInternalOptions_Impl::PushRecoveryItem( const   OUString&   sURL        ,
-                                                const   OUString&   sFilter     ,
-                                                const   OUString&   sTempName   )
+void SvtInternalOptions_Impl::PushRecoveryItem(	const	OUString&	sURL		,
+                                                const	OUString&	sFilter		,
+                                                const	OUString&	sTempName	)
 {
     tIMPL_RecoveryEntry aEntry( sURL, sFilter, sTempName );
     m_aRecoveryList.push_front( aEntry );
@@ -425,22 +425,22 @@ void SvtInternalOptions_Impl::PushRecoveryItem( const   OUString&   sURL
 }
 
 //*****************************************************************************************************************
-//  public method
+//	public method
 //*****************************************************************************************************************
-void SvtInternalOptions_Impl::PopRecoveryItem(  OUString&   sURL        ,
-                                                OUString&   sFilter     ,
-                                                OUString&   sTempName   )
+void SvtInternalOptions_Impl::PopRecoveryItem(	OUString&	sURL		,
+                                                OUString&	sFilter		,
+                                                OUString&	sTempName	)
 {
     tIMPL_RecoveryEntry aEntry = m_aRecoveryList.front();
     m_aRecoveryList.pop_front();
-    SetModified();  // Don't forget it - we delete an entry here!
-    sURL        = aEntry.sURL       ;
-    sFilter     = aEntry.sFilter    ;
-    sTempName   = aEntry.sTempName  ;
+    SetModified();	// Don't forget it - we delete an entry here!
+    sURL		= aEntry.sURL		;
+    sFilter		= aEntry.sFilter	;
+    sTempName	= aEntry.sTempName	;
 }
 
 //*****************************************************************************************************************
-//  public method
+//	public method
 //*****************************************************************************************************************
 sal_Bool SvtInternalOptions_Impl::IsRecoveryListEmpty() const
 {
@@ -449,7 +449,7 @@ sal_Bool SvtInternalOptions_Impl::IsRecoveryListEmpty() const
 #endif
 
 //*****************************************************************************************************************
-//  private method
+//	private method
 //*****************************************************************************************************************
 Sequence< OUString > SvtInternalOptions_Impl::impl_GetPropertyNames()
 {
@@ -465,9 +465,9 @@ Sequence< OUString > SvtInternalOptions_Impl::impl_GetPropertyNames()
 
     // Add names of fix properties to list.
     seqProperties[FIXPROPERTYHANDLE_SLOTCFG         ]   =   FIXPROPERTYNAME_SLOTCFG         ;
-    seqProperties[FIXPROPERTYHANDLE_SENDCRASHMAIL   ]   =   FIXPROPERTYNAME_SENDCRASHMAIL   ;
+    seqProperties[FIXPROPERTYHANDLE_SENDCRASHMAIL	]	=	FIXPROPERTYNAME_SENDCRASHMAIL	;
     seqProperties[FIXPROPERTYHANDLE_USEMAILUI       ]   =   FIXPROPERTYNAME_USEMAILUI       ;
-    seqProperties[FIXPROPERTYHANDLE_CURRENTTEMPURL  ]   =   FIXPROPERTYNAME_CURRENTTEMPURL  ;
+    seqProperties[FIXPROPERTYHANDLE_CURRENTTEMPURL	]	=	FIXPROPERTYNAME_CURRENTTEMPURL	;
 //    seqProperties[FIXPROPERTYHANDLE_REMOVEMENUENTRYCLOSE        ]   =   FIXPROPERTYNAME_REMOVEMENUENTRYCLOSE;
 //    seqProperties[FIXPROPERTYHANDLE_REMOVEMENUENTRYBACKTOWEBTOP ]   =   FIXPROPERTYNAME_REMOVEMENUENTRYBACKTOWEBTOP;
 //    seqProperties[FIXPROPERTYHANDLE_REMOVEMENUENTRYNEWWEBTOP    ]   =   FIXPROPERTYNAME_REMOVEMENUENTRYNEWWEBTOP;
@@ -479,11 +479,11 @@ Sequence< OUString > SvtInternalOptions_Impl::impl_GetPropertyNames()
     // nPosition is the start point of an list item, nItem an index into right list of node names!
     for( sal_Int32 nItem=0; nItem<nRecoveryCount; ++nItem )
     {
-        seqProperties[nPosition] = PROPERTYNAME_RECOVERYLIST + PATHDELIMITER + seqRecoveryItems[nItem] + PATHDELIMITER + PROPERTYNAME_URL       ;
+        seqProperties[nPosition] = PROPERTYNAME_RECOVERYLIST + PATHDELIMITER + seqRecoveryItems[nItem] + PATHDELIMITER + PROPERTYNAME_URL		;
         ++nPosition;
-        seqProperties[nPosition] = PROPERTYNAME_RECOVERYLIST + PATHDELIMITER + seqRecoveryItems[nItem] + PATHDELIMITER + PROPERTYNAME_FILTER    ;
+        seqProperties[nPosition] = PROPERTYNAME_RECOVERYLIST + PATHDELIMITER + seqRecoveryItems[nItem] + PATHDELIMITER + PROPERTYNAME_FILTER	;
         ++nPosition;
-        seqProperties[nPosition] = PROPERTYNAME_RECOVERYLIST + PATHDELIMITER + seqRecoveryItems[nItem] + PATHDELIMITER + PROPERTYNAME_TEMPNAME  ;
+        seqProperties[nPosition] = PROPERTYNAME_RECOVERYLIST + PATHDELIMITER + seqRecoveryItems[nItem] + PATHDELIMITER + PROPERTYNAME_TEMPNAME	;
         ++nPosition;
     }
 */
@@ -492,15 +492,15 @@ Sequence< OUString > SvtInternalOptions_Impl::impl_GetPropertyNames()
 }
 
 //*****************************************************************************************************************
-//  initialize static member
-//  DON'T DO IT IN YOUR HEADER!
-//  see definition for further informations
+//	initialize static member
+//	DON'T DO IT IN YOUR HEADER!
+//	see definition for further informations
 //*****************************************************************************************************************
-SvtInternalOptions_Impl*    SvtInternalOptions::m_pDataContainer    = NULL  ;
-sal_Int32                   SvtInternalOptions::m_nRefCount         = 0     ;
+SvtInternalOptions_Impl*	SvtInternalOptions::m_pDataContainer	= NULL	;
+sal_Int32					SvtInternalOptions::m_nRefCount			= 0		;
 
 //*****************************************************************************************************************
-//  constructor
+//	constructor
 //*****************************************************************************************************************
 SvtInternalOptions::SvtInternalOptions()
 {
@@ -519,7 +519,7 @@ SvtInternalOptions::SvtInternalOptions()
 }
 
 //*****************************************************************************************************************
-//  destructor
+//	destructor
 //*****************************************************************************************************************
 SvtInternalOptions::~SvtInternalOptions()
 {
@@ -537,7 +537,7 @@ SvtInternalOptions::~SvtInternalOptions()
 }
 
 //*****************************************************************************************************************
-//  public method
+//	public method
 //*****************************************************************************************************************
 sal_Bool SvtInternalOptions::SlotCFGEnabled() const
 {
@@ -546,7 +546,7 @@ sal_Bool SvtInternalOptions::SlotCFGEnabled() const
 }
 
 //*****************************************************************************************************************
-//  public method
+//	public method
 //*****************************************************************************************************************
 sal_Bool SvtInternalOptions::CrashMailEnabled() const
 {
@@ -555,7 +555,7 @@ sal_Bool SvtInternalOptions::CrashMailEnabled() const
 }
 
 //*****************************************************************************************************************
-//  public method
+//	public method
 //*****************************************************************************************************************
 sal_Bool SvtInternalOptions::MailUIEnabled() const
 {
@@ -603,7 +603,7 @@ void SvtInternalOptions::SetCurrentTempURL( const OUString& aNewCurrentTempURL )
 }
 
 //*****************************************************************************************************************
-//  private method
+//	private method
 //*****************************************************************************************************************
 Mutex& SvtInternalOptions::GetOwnStaticMutex()
 {
diff --git a/unotools/source/config/itemholder1.cxx b/unotools/source/config/itemholder1.cxx
index 48b1decc4983..241c9fd7a75d 100644
--- a/unotools/source/config/itemholder1.cxx
+++ b/unotools/source/config/itemholder1.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
diff --git a/unotools/source/config/itemholder1.hxx b/unotools/source/config/itemholder1.hxx
index 8e7fd285cc0a..ba35ae1d6f4b 100644
--- a/unotools/source/config/itemholder1.hxx
+++ b/unotools/source/config/itemholder1.hxx
@@ -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
diff --git a/unotools/source/config/javaoptions.cxx b/unotools/source/config/javaoptions.cxx
index 8c41aac2d3de..eef64a0f21dd 100644
--- a/unotools/source/config/javaoptions.cxx
+++ b/unotools/source/config/javaoptions.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
diff --git a/unotools/source/config/lingucfg.cxx b/unotools/source/config/lingucfg.cxx
index 39233f022534..da10593f2f05 100755
--- a/unotools/source/config/lingucfg.cxx
+++ b/unotools/source/config/lingucfg.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
@@ -74,7 +74,7 @@ static BOOL lcl_SetLocale( INT16 &rLanguage, const uno::Any &rVal )
     BOOL bSucc = FALSE;
 
     lang::Locale aNew;
-    if (rVal >>= aNew)  // conversion successful?
+    if (rVal >>= aNew)	// conversion successful?
     {
         INT16 nNew = MsLangId::convertLocaleToLanguage( aNew );
         if (nNew != rLanguage)
@@ -113,16 +113,16 @@ SvtLinguOptions::SvtLinguOptions()
     nDefaultLanguage_CTL = LANGUAGE_NONE;
 
     // general options
-    bIsUseDictionaryList    =
-    bIsIgnoreControlCharacters  = TRUE;
+    bIsUseDictionaryList	=
+    bIsIgnoreControlCharacters	= TRUE;
 
     // spelling options
-    bIsSpellCapitalization  =
-    bIsSpellSpecial         = TRUE;
-    bIsSpellAuto            =
-    bIsSpellReverse         =
-    bIsSpellWithDigits      =
-    bIsSpellUpperCase       = FALSE;
+    bIsSpellCapitalization	=
+    bIsSpellSpecial			= TRUE;
+    bIsSpellAuto			=
+    bIsSpellReverse			=
+    bIsSpellWithDigits		=
+    bIsSpellUpperCase		= FALSE;
 
     // text conversion options
     bIsIgnorePostPositionalWord     = TRUE;
@@ -140,11 +140,11 @@ SvtLinguOptions::SvtLinguOptions()
     bROIsReverseMapping             = FALSE;
 
     // hyphenation options
-    bIsHyphSpecial          = TRUE;
-    bIsHyphAuto             = FALSE;
-    nHyphMinLeading         =
-    nHyphMinTrailing        = 2;
-    nHyphMinWordLength      = 0;
+    bIsHyphSpecial			= TRUE;
+    bIsHyphAuto				= FALSE;
+    nHyphMinLeading			=
+    nHyphMinTrailing		= 2;
+    nHyphMinWordLength		= 0;
 
     nDataFilesChangedCheckValue = 0;
 
@@ -279,7 +279,7 @@ static struct NamesToHdl
 {/* 31 */    "GrammarChecking/IsInteractiveCheck",            UPN_IS_GRAMMAR_INTERACTIVE,               UPH_IS_GRAMMAR_INTERACTIVE},
 
             /* similar to entry 0 (thus no own configuration entry) but with different property name and type */
-{            NULL,                                           UPN_DEFAULT_LANGUAGE,                      UPH_DEFAULT_LANGUAGE},
+{            NULL,											 UPN_DEFAULT_LANGUAGE,                      UPH_DEFAULT_LANGUAGE},
 
 {            NULL,                                            NULL,                                      -1}
 };
@@ -1128,8 +1128,8 @@ BOOL SvtLinguConfig::GetDictionaryEntry(
         xNA.set( xNA->getByName( rNodeName ), uno::UNO_QUERY_THROW );
 
         // read group data...
-        uno::Sequence< rtl::OUString >  aLocations;
-        rtl::OUString                   aFormatName;
+        uno::Sequence< rtl::OUString >	aLocations;
+        rtl::OUString					aFormatName;
         uno::Sequence< rtl::OUString >  aLocaleNames;
         bSuccess =  (xNA->getByName( aG_Locations ) >>= aLocations)  &&
                     (xNA->getByName( aG_Format )    >>= aFormatName) &&
@@ -1406,8 +1406,8 @@ rtl::OUString SvtLinguConfig::GetSpellAndGrammarContextDictionaryImage(
 }
 
 
-::rtl::OUString SvtLinguConfig::GetThesaurusDialogImage(
-    const ::rtl::OUString &rServiceImplName,
+::rtl::OUString SvtLinguConfig::GetThesaurusDialogImage( 
+    const ::rtl::OUString &rServiceImplName, 
     bool bHighContrast ) const
 {
     rtl::OUString   aRes;
@@ -1420,9 +1420,9 @@ rtl::OUString SvtLinguConfig::GetSpellAndGrammarContextDictionaryImage(
     return aRes;
 }
 
-
-::rtl::OUString SvtLinguConfig::GetSynonymsContextImage(
-    const ::rtl::OUString &rServiceImplName,
+    
+::rtl::OUString SvtLinguConfig::GetSynonymsContextImage( 
+    const ::rtl::OUString &rServiceImplName, 
     bool bHighContrast ) const
 {
     rtl::OUString   aRes;
@@ -1434,7 +1434,7 @@ rtl::OUString SvtLinguConfig::GetSpellAndGrammarContextDictionaryImage(
     }
     return aRes;
 }
-
+    
 
 bool SvtLinguConfig::HasVendorImages( const char *pImageName ) const
 {
@@ -1464,9 +1464,9 @@ bool SvtLinguConfig::HasVendorImages( const char *pImageName ) const
                     {
                         bRes = true;
                         break;
-                    }
-                }
-            }
+                    }    
+                }    
+            }    
         }
         catch (uno::Exception &)
         {
@@ -1475,7 +1475,7 @@ bool SvtLinguConfig::HasVendorImages( const char *pImageName ) const
     }
     return bRes;
 }
-
+    
 
 bool SvtLinguConfig::HasGrammarChecker() const
 {
diff --git a/unotools/source/config/localisationoptions.cxx b/unotools/source/config/localisationoptions.cxx
index f4b8bbd087ef..523c8b936a3a 100644
--- a/unotools/source/config/localisationoptions.cxx
+++ b/unotools/source/config/localisationoptions.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
@@ -31,7 +31,7 @@
 #endif
 
 //_________________________________________________________________________________________________________________
-//  includes
+//	includes
 //_________________________________________________________________________________________________________________
 
 #include <unotools/localisationoptions.hxx>
@@ -45,154 +45,154 @@
 #include "itemholder1.hxx"
 
 //_________________________________________________________________________________________________________________
-//  namespaces
+//	namespaces
 //_________________________________________________________________________________________________________________
 
-using namespace ::utl                   ;
-using namespace ::rtl                   ;
-using namespace ::osl                   ;
-using namespace ::com::sun::star::uno   ;
+using namespace ::utl					;
+using namespace ::rtl					;
+using namespace ::osl					;
+using namespace ::com::sun::star::uno	;
 
 //_________________________________________________________________________________________________________________
-//  const
+//	const
 //_________________________________________________________________________________________________________________
 
-#define ROOTNODE_LOCALISATION           OUString(RTL_CONSTASCII_USTRINGPARAM("Office.Common/View/Localisation"))
-#define DEFAULT_AUTOMNEMONIC            sal_False
-#define DEFAULT_DIALOGSCALE             0
+#define	ROOTNODE_LOCALISATION			OUString(RTL_CONSTASCII_USTRINGPARAM("Office.Common/View/Localisation"))
+#define	DEFAULT_AUTOMNEMONIC			sal_False
+#define	DEFAULT_DIALOGSCALE				0
 
-#define PROPERTYNAME_AUTOMNEMONIC       OUString(RTL_CONSTASCII_USTRINGPARAM("AutoMnemonic" ))
-#define PROPERTYNAME_DIALOGSCALE        OUString(RTL_CONSTASCII_USTRINGPARAM("DialogScale"  ))
+#define	PROPERTYNAME_AUTOMNEMONIC		OUString(RTL_CONSTASCII_USTRINGPARAM("AutoMnemonic"	))
+#define	PROPERTYNAME_DIALOGSCALE		OUString(RTL_CONSTASCII_USTRINGPARAM("DialogScale"	))
 
-#define PROPERTYHANDLE_AUTOMNEMONIC     0
-#define PROPERTYHANDLE_DIALOGSCALE      1
+#define	PROPERTYHANDLE_AUTOMNEMONIC		0
+#define	PROPERTYHANDLE_DIALOGSCALE		1
 
-#define PROPERTYCOUNT                   2
+#define	PROPERTYCOUNT					2
 
 //_________________________________________________________________________________________________________________
-//  private declarations!
+//	private declarations!
 //_________________________________________________________________________________________________________________
 
 class SvtLocalisationOptions_Impl : public ConfigItem
 {
     //-------------------------------------------------------------------------------------------------------------
-    //  public methods
+    //	public methods
     //-------------------------------------------------------------------------------------------------------------
 
     public:
 
         //---------------------------------------------------------------------------------------------------------
-        //  constructor / destructor
+        //	constructor / destructor
         //---------------------------------------------------------------------------------------------------------
 
          SvtLocalisationOptions_Impl();
         ~SvtLocalisationOptions_Impl();
 
         //---------------------------------------------------------------------------------------------------------
-        //  overloaded methods of baseclass
+        //	overloaded methods of baseclass
         //---------------------------------------------------------------------------------------------------------
 
         /*-****************************************************************************************************//**
-            @short      called for notify of configmanager
-            @descr      These method is called from the ConfigManager before application ends or from the
+            @short		called for notify of configmanager
+            @descr		These method is called from the ConfigManager before application ends or from the
                          PropertyChangeListener if the sub tree broadcasts changes. You must update your
                         internal values.
 
-            @seealso    baseclass ConfigItem
+            @seealso	baseclass ConfigItem
 
-            @param      "seqPropertyNames" is the list of properties which should be updated.
-            @return     -
+            @param		"seqPropertyNames" is the list of properties which should be updated.
+            @return		-
 
-            @onerror    -
+            @onerror	-
         *//*-*****************************************************************************************************/
 
         virtual void Notify( const Sequence< OUString >& seqPropertyNames );
 
         /*-****************************************************************************************************//**
-            @short      write changes to configuration
-            @descr      These method writes the changed values into the sub tree
+            @short		write changes to configuration
+            @descr		These method writes the changed values into the sub tree
                         and should always called in our destructor to guarantee consistency of config data.
 
-            @seealso    baseclass ConfigItem
+            @seealso	baseclass ConfigItem
 
-            @param      -
-            @return     -
+            @param		-
+            @return		-
 
-            @onerror    -
+            @onerror	-
         *//*-*****************************************************************************************************/
 
         virtual void Commit();
 
         //---------------------------------------------------------------------------------------------------------
-        //  public interface
+        //	public interface
         //---------------------------------------------------------------------------------------------------------
 
         /*-****************************************************************************************************//**
-            @short      access method to get internal values
-            @descr      These method give us a chance to regulate acces to ouer internal values.
+            @short		access method to get internal values
+            @descr		These method give us a chance to regulate acces to ouer internal values.
                         It's not used in the moment - but it's possible for the feature!
 
-            @seealso    -
+            @seealso	-
 
-            @param      -
-            @return     -
+            @param		-
+            @return		-
 
-            @onerror    -
+            @onerror	-
         *//*-*****************************************************************************************************/
 
-        sal_Bool    IsAutoMnemonic  (                   ) const ;
-        void        SetAutoMnemonic ( sal_Bool  bState  )       ;
-        sal_Int32   GetDialogScale  (                   ) const ;
-        void        SetDialogScale  ( sal_Int32 nScale  )       ;
+        sal_Bool	IsAutoMnemonic	(					) const	;
+        void		SetAutoMnemonic	( sal_Bool	bState	)		;
+        sal_Int32	GetDialogScale	(					) const	;
+        void		SetDialogScale	( sal_Int32	nScale	)		;
 
     //-------------------------------------------------------------------------------------------------------------
-    //  private methods
+    //	private methods
     //-------------------------------------------------------------------------------------------------------------
 
     private:
 
         /*-****************************************************************************************************//**
-            @short      return list of key names of ouer configuration management which represent oue module tree
-            @descr      These methods return a static const list of key names. We need it to get needed values from our
+            @short		return list of key names of ouer configuration management which represent oue module tree
+            @descr		These methods return a static const list of key names. We need it to get needed values from our
                         configuration management.
 
-            @seealso    -
+            @seealso	-
 
-            @param      -
-            @return     A list of needed configuration keys is returned.
+            @param		-
+            @return		A list of needed configuration keys is returned.
 
-            @onerror    -
+            @onerror	-
         *//*-*****************************************************************************************************/
 
         static Sequence< OUString > GetPropertyNames();
 
     //-------------------------------------------------------------------------------------------------------------
-    //  private member
+    //	private member
     //-------------------------------------------------------------------------------------------------------------
 
     private:
 
-        sal_Bool    m_bAutoMnemonic     ;
-        sal_Int32   m_nDialogScale      ;
+        sal_Bool	m_bAutoMnemonic		;
+        sal_Int32	m_nDialogScale		;
 };
 
 //_________________________________________________________________________________________________________________
-//  definitions
+//	definitions
 //_________________________________________________________________________________________________________________
 
 //*****************************************************************************************************************
-//  constructor
+//	constructor
 //*****************************************************************************************************************
 SvtLocalisationOptions_Impl::SvtLocalisationOptions_Impl()
     // Init baseclasses first
-    :   ConfigItem          ( ROOTNODE_LOCALISATION )
+    :	ConfigItem			( ROOTNODE_LOCALISATION	)
     // Init member then.
-    ,   m_bAutoMnemonic     ( DEFAULT_AUTOMNEMONIC  )
-    ,   m_nDialogScale      ( DEFAULT_DIALOGSCALE   )
+    ,	m_bAutoMnemonic		( DEFAULT_AUTOMNEMONIC	)
+    ,	m_nDialogScale		( DEFAULT_DIALOGSCALE	)
 {
     // Use our static list of configuration keys to get his values.
-    Sequence< OUString >    seqNames    = GetPropertyNames  (           );
-    Sequence< Any >         seqValues   = GetProperties     ( seqNames  );
+    Sequence< OUString >	seqNames	= GetPropertyNames	(			);
+    Sequence< Any >			seqValues	= GetProperties		( seqNames	);
 
     // Safe impossible cases.
     // We need values from ALL configuration keys.
@@ -208,13 +208,13 @@ SvtLocalisationOptions_Impl::SvtLocalisationOptions_Impl()
         DBG_ASSERT( !(seqValues[nProperty].hasValue()==sal_False), "SvtLocalisationOptions_Impl::SvtLocalisationOptions_Impl()\nInvalid property value detected!\n" );
         switch( nProperty )
         {
-            case PROPERTYHANDLE_AUTOMNEMONIC    :   {
+            case PROPERTYHANDLE_AUTOMNEMONIC	:	{
                                                         DBG_ASSERT(!(seqValues[nProperty].getValueTypeClass()!=TypeClass_BOOLEAN), "SvtLocalisationOptions_Impl::SvtLocalisationOptions_Impl()\nWho has changed the value type of \"Office.Common\\View\\Localisation\\AutoMnemonic\"?" );
                                                         seqValues[nProperty] >>= m_bAutoMnemonic;
                                                     }
                                                     break;
 
-            case PROPERTYHANDLE_DIALOGSCALE     :   {
+            case PROPERTYHANDLE_DIALOGSCALE		:	{
                                                         DBG_ASSERT(!(seqValues[nProperty].getValueTypeClass()!=TypeClass_LONG), "SvtLocalisationOptions_Impl::SvtLocalisationOptions_Impl()\nWho has changed the value type of \"Office.Common\\View\\Localisation\\DialogScale\"?" );
                                                         seqValues[nProperty] >>= m_nDialogScale;
                                                     }
@@ -228,7 +228,7 @@ SvtLocalisationOptions_Impl::SvtLocalisationOptions_Impl()
 }
 
 //*****************************************************************************************************************
-//  destructor
+//	destructor
 //*****************************************************************************************************************
 SvtLocalisationOptions_Impl::~SvtLocalisationOptions_Impl()
 {
@@ -240,7 +240,7 @@ SvtLocalisationOptions_Impl::~SvtLocalisationOptions_Impl()
 }
 
 //*****************************************************************************************************************
-//  public method
+//	public method
 //*****************************************************************************************************************
 void SvtLocalisationOptions_Impl::Notify( const Sequence< OUString >& seqPropertyNames )
 {
@@ -273,24 +273,24 @@ void SvtLocalisationOptions_Impl::Notify( const Sequence< OUString >& seqPropert
 }
 
 //*****************************************************************************************************************
-//  public method
+//	public method
 //*****************************************************************************************************************
 void SvtLocalisationOptions_Impl::Commit()
 {
     // Get names of supported properties, create a list for values and copy current values to it.
-    Sequence< OUString >    seqNames    = GetPropertyNames  ();
-    sal_Int32               nCount      = seqNames.getLength();
-    Sequence< Any >         seqValues   ( nCount );
+    Sequence< OUString >	seqNames	= GetPropertyNames	();
+    sal_Int32				nCount		= seqNames.getLength();
+    Sequence< Any >			seqValues	( nCount );
     for( sal_Int32 nProperty=0; nProperty<nCount; ++nProperty )
     {
         switch( nProperty )
         {
-            case PROPERTYHANDLE_AUTOMNEMONIC    :   {
+            case PROPERTYHANDLE_AUTOMNEMONIC	:	{
                                                         seqValues[nProperty] <<= m_bAutoMnemonic;
                                                     }
                                                     break;
 
-            case PROPERTYHANDLE_DIALOGSCALE     :   {
+            case PROPERTYHANDLE_DIALOGSCALE		:	{
                                                         seqValues[nProperty] <<= m_nDialogScale;
                                                     }
                                                     break;
@@ -301,7 +301,7 @@ void SvtLocalisationOptions_Impl::Commit()
 }
 
 //*****************************************************************************************************************
-//  public method
+//	public method
 //*****************************************************************************************************************
 sal_Bool SvtLocalisationOptions_Impl::IsAutoMnemonic() const
 {
@@ -309,7 +309,7 @@ sal_Bool SvtLocalisationOptions_Impl::IsAutoMnemonic() const
 }
 
 //*****************************************************************************************************************
-//  public method
+//	public method
 //*****************************************************************************************************************
 void SvtLocalisationOptions_Impl::SetAutoMnemonic( sal_Bool bState )
 {
@@ -318,7 +318,7 @@ void SvtLocalisationOptions_Impl::SetAutoMnemonic( sal_Bool bState )
 }
 
 //*****************************************************************************************************************
-//  public method
+//	public method
 //*****************************************************************************************************************
 sal_Int32 SvtLocalisationOptions_Impl::GetDialogScale() const
 {
@@ -326,7 +326,7 @@ sal_Int32 SvtLocalisationOptions_Impl::GetDialogScale() const
 }
 
 //*****************************************************************************************************************
-//  public method
+//	public method
 //*****************************************************************************************************************
 void SvtLocalisationOptions_Impl::SetDialogScale( sal_Int32 nScale )
 {
@@ -335,15 +335,15 @@ void SvtLocalisationOptions_Impl::SetDialogScale( sal_Int32 nScale )
 }
 
 //*****************************************************************************************************************
-//  private method
+//	private method
 //*****************************************************************************************************************
 Sequence< OUString > SvtLocalisationOptions_Impl::GetPropertyNames()
 {
     // Build static list of configuration key names.
     static const OUString pProperties[] =
     {
-        PROPERTYNAME_AUTOMNEMONIC   ,
-        PROPERTYNAME_DIALOGSCALE    ,
+        PROPERTYNAME_AUTOMNEMONIC	,
+        PROPERTYNAME_DIALOGSCALE	,
     };
     // Initialize return sequence with these list ...
     static const Sequence< OUString > seqPropertyNames( pProperties, PROPERTYCOUNT );
@@ -352,15 +352,15 @@ Sequence< OUString > SvtLocalisationOptions_Impl::GetPropertyNames()
 }
 
 //*****************************************************************************************************************
-//  initialize static member
-//  DON'T DO IT IN YOUR HEADER!
-//  see definition for further informations
+//	initialize static member
+//	DON'T DO IT IN YOUR HEADER!
+//	see definition for further informations
 //*****************************************************************************************************************
-SvtLocalisationOptions_Impl*    SvtLocalisationOptions::m_pDataContainer    = NULL  ;
-sal_Int32                       SvtLocalisationOptions::m_nRefCount         = 0     ;
+SvtLocalisationOptions_Impl*	SvtLocalisationOptions::m_pDataContainer	= NULL	;
+sal_Int32						SvtLocalisationOptions::m_nRefCount			= 0		;
 
 //*****************************************************************************************************************
-//  constructor
+//	constructor
 //*****************************************************************************************************************
 SvtLocalisationOptions::SvtLocalisationOptions()
 {
@@ -379,7 +379,7 @@ SvtLocalisationOptions::SvtLocalisationOptions()
 }
 
 //*****************************************************************************************************************
-//  destructor
+//	destructor
 //*****************************************************************************************************************
 SvtLocalisationOptions::~SvtLocalisationOptions()
 {
@@ -397,7 +397,7 @@ SvtLocalisationOptions::~SvtLocalisationOptions()
 }
 
 //*****************************************************************************************************************
-//  public method
+//	public method
 //*****************************************************************************************************************
 sal_Bool SvtLocalisationOptions::IsAutoMnemonic() const
 {
@@ -406,7 +406,7 @@ sal_Bool SvtLocalisationOptions::IsAutoMnemonic() const
 }
 
 //*****************************************************************************************************************
-//  public method
+//	public method
 //*****************************************************************************************************************
 void SvtLocalisationOptions::SetAutoMnemonic( sal_Bool bState )
 {
@@ -415,7 +415,7 @@ void SvtLocalisationOptions::SetAutoMnemonic( sal_Bool bState )
 }
 
 //*****************************************************************************************************************
-//  public method
+//	public method
 //*****************************************************************************************************************
 sal_Int32 SvtLocalisationOptions::GetDialogScale() const
 {
@@ -424,7 +424,7 @@ sal_Int32 SvtLocalisationOptions::GetDialogScale() const
 }
 
 //*****************************************************************************************************************
-//  public method
+//	public method
 //*****************************************************************************************************************
 void SvtLocalisationOptions::SetDialogScale( sal_Int32 nScale )
 {
@@ -433,7 +433,7 @@ void SvtLocalisationOptions::SetDialogScale( sal_Int32 nScale )
 }
 
 //*****************************************************************************************************************
-//  private method
+//	private method
 //*****************************************************************************************************************
 Mutex& SvtLocalisationOptions::GetOwnStaticMutex()
 {
diff --git a/unotools/source/config/menuoptions.cxx b/unotools/source/config/menuoptions.cxx
index 2c5756c2140c..080c511345dd 100644
--- a/unotools/source/config/menuoptions.cxx
+++ b/unotools/source/config/menuoptions.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
@@ -31,7 +31,7 @@
 #endif
 
 //_________________________________________________________________________________________________________________
-//  includes
+//	includes
 //_________________________________________________________________________________________________________________
 
 #include <unotools/menuoptions.hxx>
@@ -46,30 +46,30 @@
 #include "itemholder1.hxx"
 
 //_________________________________________________________________________________________________________________
-//  namespaces
+//	namespaces
 //_________________________________________________________________________________________________________________
 
-using namespace ::utl                   ;
-using namespace ::rtl                   ;
-using namespace ::osl                   ;
-using namespace ::com::sun::star::uno   ;
+using namespace ::utl					;
+using namespace ::rtl					;
+using namespace ::osl					;
+using namespace ::com::sun::star::uno	;
 
 //_________________________________________________________________________________________________________________
-//  const
+//	const
 //_________________________________________________________________________________________________________________
 
-#define ROOTNODE_MENU                           OUString(RTL_CONSTASCII_USTRINGPARAM("Office.Common/View/Menu"  ))
-#define DEFAULT_DONTHIDEDISABLEDENTRIES         sal_False
-#define DEFAULT_FOLLOWMOUSE                     sal_True
-#define DEFAULT_MENUICONS                       2
+#define	ROOTNODE_MENU							OUString(RTL_CONSTASCII_USTRINGPARAM("Office.Common/View/Menu"	))
+#define	DEFAULT_DONTHIDEDISABLEDENTRIES			sal_False
+#define	DEFAULT_FOLLOWMOUSE						sal_True
+#define	DEFAULT_MENUICONS						2
 
-#define PROPERTYNAME_DONTHIDEDISABLEDENTRIES    OUString(RTL_CONSTASCII_USTRINGPARAM("DontHideDisabledEntry"    ))
-#define PROPERTYNAME_FOLLOWMOUSE                OUString(RTL_CONSTASCII_USTRINGPARAM("FollowMouse"              ))
+#define	PROPERTYNAME_DONTHIDEDISABLEDENTRIES	OUString(RTL_CONSTASCII_USTRINGPARAM("DontHideDisabledEntry"	))
+#define	PROPERTYNAME_FOLLOWMOUSE				OUString(RTL_CONSTASCII_USTRINGPARAM("FollowMouse"				))
 #define PROPERTYNAME_SHOWICONSINMENUES          OUString(RTL_CONSTASCII_USTRINGPARAM("ShowIconsInMenues"        ))
 #define PROPERTYNAME_SYSTEMICONSINMENUES        OUString(RTL_CONSTASCII_USTRINGPARAM("IsSystemIconsInMenus"     ))
 
-#define PROPERTYHANDLE_DONTHIDEDISABLEDENTRIES  0
-#define PROPERTYHANDLE_FOLLOWMOUSE              1
+#define	PROPERTYHANDLE_DONTHIDEDISABLEDENTRIES	0
+#define	PROPERTYHANDLE_FOLLOWMOUSE				1
 #define PROPERTYHANDLE_SHOWICONSINMENUES        2
 #define PROPERTYHANDLE_SYSTEMICONSINMENUES      3
 
@@ -80,29 +80,29 @@ using namespace ::com::sun::star::uno   ;
 DECLARE_LIST( LinkList, Link * )
 
 //_________________________________________________________________________________________________________________
-//  private declarations!
+//	private declarations!
 //_________________________________________________________________________________________________________________
 
 class SvtMenuOptions_Impl : public ConfigItem
 {
     //-------------------------------------------------------------------------------------------------------------
-    //  private member
+    //	private member
     //-------------------------------------------------------------------------------------------------------------
 
     private:
         LinkList    aList;
-        sal_Bool    m_bDontHideDisabledEntries          ;   /// cache "DontHideDisabledEntries" of Menu section
-        sal_Bool    m_bFollowMouse                      ;   /// cache "FollowMouse" of Menu section
-        sal_Int16   m_nMenuIcons                        ;   /// cache "MenuIcons" of Menu section
+        sal_Bool	m_bDontHideDisabledEntries			;	/// cache "DontHideDisabledEntries" of Menu section
+        sal_Bool	m_bFollowMouse						;	/// cache "FollowMouse" of Menu section
+        sal_Int16	m_nMenuIcons						;	/// cache "MenuIcons" of Menu section
 
     //-------------------------------------------------------------------------------------------------------------
-    //  public methods
+    //	public methods
     //-------------------------------------------------------------------------------------------------------------
 
     public:
 
         //---------------------------------------------------------------------------------------------------------
-        //  constructor / destructor
+        //	constructor / destructor
         //---------------------------------------------------------------------------------------------------------
 
          SvtMenuOptions_Impl();
@@ -112,67 +112,67 @@ class SvtMenuOptions_Impl : public ConfigItem
         void RemoveListener( const Link& rLink );
 
         //---------------------------------------------------------------------------------------------------------
-        //  overloaded methods of baseclass
+        //	overloaded methods of baseclass
         //---------------------------------------------------------------------------------------------------------
 
         /*-****************************************************************************************************//**
-            @short      called for notify of configmanager
-            @descr      These method is called from the ConfigManager before application ends or from the
+            @short		called for notify of configmanager
+            @descr		These method is called from the ConfigManager before application ends or from the
                          PropertyChangeListener if the sub tree broadcasts changes. You must update your
                         internal values.
 
-            @seealso    baseclass ConfigItem
+            @seealso	baseclass ConfigItem
 
-            @param      "seqPropertyNames" is the list of properties which should be updated.
-            @return     -
+            @param		"seqPropertyNames" is the list of properties which should be updated.
+            @return		-
 
-            @onerror    -
+            @onerror	-
         *//*-*****************************************************************************************************/
 
         virtual void Notify( const Sequence< OUString >& seqPropertyNames );
 
         /*-****************************************************************************************************//**
-            @short      write changes to configuration
-            @descr      These method writes the changed values into the sub tree
+            @short		write changes to configuration
+            @descr		These method writes the changed values into the sub tree
                         and should always called in our destructor to guarantee consistency of config data.
 
-            @seealso    baseclass ConfigItem
+            @seealso	baseclass ConfigItem
 
-            @param      -
-            @return     -
+            @param		-
+            @return		-
 
-            @onerror    -
+            @onerror	-
         *//*-*****************************************************************************************************/
 
         virtual void Commit();
 
         //---------------------------------------------------------------------------------------------------------
-        //  public interface
+        //	public interface
         //---------------------------------------------------------------------------------------------------------
 
         /*-****************************************************************************************************//**
-            @short      access method to get internal values
-            @descr      These method give us a chance to regulate acces to ouer internal values.
+            @short		access method to get internal values
+            @descr		These method give us a chance to regulate acces to ouer internal values.
                         It's not used in the moment - but it's possible for the feature!
 
-            @seealso    -
+            @seealso	-
 
-            @param      -
-            @return     -
+            @param		-
+            @return		-
 
-            @onerror    -
+            @onerror	-
         *//*-*****************************************************************************************************/
 
-        sal_Bool    IsEntryHidingEnabled() const
+        sal_Bool	IsEntryHidingEnabled() const
                     { return m_bDontHideDisabledEntries; }
 
-        sal_Bool    IsFollowMouseEnabled() const
+        sal_Bool	IsFollowMouseEnabled() const
                     { return m_bFollowMouse; }
 
-        sal_Int16   GetMenuIconsState() const
+        sal_Int16	GetMenuIconsState() const
                     { return m_nMenuIcons; }
 
-        void        SetEntryHidingState ( sal_Bool bState )
+        void		SetEntryHidingState	( sal_Bool bState )
                     {
                         m_bDontHideDisabledEntries = bState;
                         SetModified();
@@ -181,7 +181,7 @@ class SvtMenuOptions_Impl : public ConfigItem
                         Commit();
                     }
 
-        void        SetFollowMouseState ( sal_Bool bState )
+        void		SetFollowMouseState	( sal_Bool bState )
                     {
                         m_bFollowMouse = bState;
                         SetModified();
@@ -190,7 +190,7 @@ class SvtMenuOptions_Impl : public ConfigItem
                         Commit();
                     }
 
-        void        SetMenuIconsState ( sal_Int16 bState    )
+        void		SetMenuIconsState ( sal_Int16 bState	)
                     {
                         m_nMenuIcons = bState;
                         SetModified();
@@ -200,45 +200,45 @@ class SvtMenuOptions_Impl : public ConfigItem
                     }
 
     //-------------------------------------------------------------------------------------------------------------
-    //  private methods
+    //	private methods
     //-------------------------------------------------------------------------------------------------------------
 
     private:
 
         /*-****************************************************************************************************//**
-            @short      return list of fix key names of ouer configuration management which represent oue module tree
-            @descr      These methods return a static const list of key names. We need it to get needed values from our
+            @short		return list of fix key names of ouer configuration management which represent oue module tree
+            @descr		These methods return a static const list of key names. We need it to get needed values from our
                         configuration management.
 
-            @seealso    -
+            @seealso	-
 
-            @param      -
-            @return     A list of needed configuration keys is returned.
+            @param		-
+            @return		A list of needed configuration keys is returned.
 
-            @onerror    -
+            @onerror	-
         *//*-*****************************************************************************************************/
 
         static Sequence< OUString > impl_GetPropertyNames();
 };
 
 //_________________________________________________________________________________________________________________
-//  definitions
+//	definitions
 //_________________________________________________________________________________________________________________
 
 //*****************************************************************************************************************
-//  constructor
+//	constructor
 //*****************************************************************************************************************
 SvtMenuOptions_Impl::SvtMenuOptions_Impl()
     // Init baseclasses first
-    :   ConfigItem                  ( ROOTNODE_MENU                     )
+    :	ConfigItem					( ROOTNODE_MENU						)
     // Init member then.
-    ,   m_bDontHideDisabledEntries  ( DEFAULT_DONTHIDEDISABLEDENTRIES   )
-    ,   m_bFollowMouse              ( DEFAULT_FOLLOWMOUSE               )
-    ,   m_nMenuIcons                ( DEFAULT_MENUICONS                 )
+    ,	m_bDontHideDisabledEntries	( DEFAULT_DONTHIDEDISABLEDENTRIES	)
+    ,	m_bFollowMouse				( DEFAULT_FOLLOWMOUSE				)
+    ,   m_nMenuIcons				( DEFAULT_MENUICONS 				)
 {
     // Use our static list of configuration keys to get his values.
-    Sequence< OUString >    seqNames    = impl_GetPropertyNames();
-    Sequence< Any >         seqValues   = GetProperties( seqNames ) ;
+    Sequence< OUString >	seqNames	= impl_GetPropertyNames();
+    Sequence< Any >			seqValues	= GetProperties( seqNames )	;
 
     // Safe impossible cases.
     // We need values from ALL configuration keys.
@@ -249,8 +249,8 @@ SvtMenuOptions_Impl::SvtMenuOptions_Impl()
     sal_Bool bSystemMenuIcons = true;
 
     // Copy values from list in right order to ouer internal member.
-    sal_Int32 nPropertyCount    =   seqValues.getLength()   ;
-    sal_Int32 nProperty         =   0                       ;
+    sal_Int32 nPropertyCount	=	seqValues.getLength()	;
+    sal_Int32 nProperty			=	0						;
     for( nProperty=0; nProperty<nPropertyCount; ++nProperty )
     {
         // Safe impossible cases.
@@ -258,13 +258,13 @@ SvtMenuOptions_Impl::SvtMenuOptions_Impl()
         DBG_ASSERT( !(seqValues[nProperty].hasValue()==sal_False), "SvtMenuOptions_Impl::SvtMenuOptions_Impl()\nInvalid property value for property detected!\n" );
         switch( nProperty )
         {
-            case PROPERTYHANDLE_DONTHIDEDISABLEDENTRIES :   {
+            case PROPERTYHANDLE_DONTHIDEDISABLEDENTRIES	:	{
                                                                 DBG_ASSERT(!(seqValues[nProperty].getValueTypeClass()!=TypeClass_BOOLEAN), "SvtMenuOptions_Impl::SvtMenuOptions_Impl()\nWho has changed the value type of \"Office.Common\\View\\Menu\\DontHideDisabledEntry\"?" );
                                                                 seqValues[nProperty] >>= m_bDontHideDisabledEntries;
                                                             }
                                                             break;
 
-            case PROPERTYHANDLE_FOLLOWMOUSE             :   {
+            case PROPERTYHANDLE_FOLLOWMOUSE				:	{
                                                                 DBG_ASSERT(!(seqValues[nProperty].getValueTypeClass()!=TypeClass_BOOLEAN), "SvtMenuOptions_Impl::SvtMenuOptions_Impl()\nWho has changed the value type of \"Office.Common\\View\\Menu\\FollowMouse\"?" );
                                                                 seqValues[nProperty] >>= m_bFollowMouse;
                                                             }
@@ -274,7 +274,7 @@ SvtMenuOptions_Impl::SvtMenuOptions_Impl()
                                                                 seqValues[nProperty] >>= bMenuIcons;
                                                             }
                                                             break;
-            case PROPERTYHANDLE_SYSTEMICONSINMENUES     :   {
+            case PROPERTYHANDLE_SYSTEMICONSINMENUES		:   {
                                                                 DBG_ASSERT(!(seqValues[nProperty].getValueTypeClass()!=TypeClass_BOOLEAN), "SvtMenuOptions_Impl::SvtMenuOptions_Impl()\nWho has changed the value type of \"Office.Common\\View\\Menu\\IsSystemIconsInMenus\"?" );
                                                                 seqValues[nProperty] >>= bSystemMenuIcons;
                                                             }
@@ -288,7 +288,7 @@ SvtMenuOptions_Impl::SvtMenuOptions_Impl()
 }
 
 //*****************************************************************************************************************
-//  destructor
+//	destructor
 //*****************************************************************************************************************
 SvtMenuOptions_Impl::~SvtMenuOptions_Impl()
 {
@@ -304,7 +304,7 @@ SvtMenuOptions_Impl::~SvtMenuOptions_Impl()
 }
 
 //*****************************************************************************************************************
-//  public method
+//	public method
 //*****************************************************************************************************************
 void SvtMenuOptions_Impl::Notify( const Sequence< OUString >& seqPropertyNames )
 {
@@ -354,24 +354,24 @@ void SvtMenuOptions_Impl::Notify( const Sequence< OUString >& seqPropertyNames )
 }
 
 //*****************************************************************************************************************
-//  public method
+//	public method
 //*****************************************************************************************************************
 void SvtMenuOptions_Impl::Commit()
 {
     // Get names of supported properties, create a list for values and copy current values to it.
-    Sequence< OUString >    seqNames    = impl_GetPropertyNames();
-    sal_Int32               nCount      = seqNames.getLength();
-    Sequence< Any >         seqValues   ( nCount );
+    Sequence< OUString >	seqNames	= impl_GetPropertyNames();
+    sal_Int32				nCount		= seqNames.getLength();
+    Sequence< Any >			seqValues	( nCount );
     for( sal_Int32 nProperty=0; nProperty<nCount; ++nProperty )
     {
         switch( nProperty )
         {
-            case PROPERTYHANDLE_DONTHIDEDISABLEDENTRIES :   {
+            case PROPERTYHANDLE_DONTHIDEDISABLEDENTRIES	:	{
                                                                 seqValues[nProperty] <<= m_bDontHideDisabledEntries;
                                                             }
                                                             break;
 
-            case PROPERTYHANDLE_FOLLOWMOUSE             :   {
+            case PROPERTYHANDLE_FOLLOWMOUSE				:	{
                                                                 seqValues[nProperty] <<= m_bFollowMouse;
                                                             }
                                                             break;
@@ -380,7 +380,7 @@ void SvtMenuOptions_Impl::Commit()
                                                                 seqValues[nProperty] <<=(sal_Bool)(Application::GetSettings().GetStyleSettings().GetUseImagesInMenus());
                                                             }
                                                             break;
-            case PROPERTYHANDLE_SYSTEMICONSINMENUES     :   {
+            case PROPERTYHANDLE_SYSTEMICONSINMENUES		:   {
                                                                 seqValues[nProperty] <<= (m_nMenuIcons == 2 ? sal_True : sal_False) ;
                                                             }
                                                             break;
@@ -391,16 +391,16 @@ void SvtMenuOptions_Impl::Commit()
 }
 
 //*****************************************************************************************************************
-//  private method
+//	private method
 //*****************************************************************************************************************
 Sequence< OUString > SvtMenuOptions_Impl::impl_GetPropertyNames()
 {
     // Build static list of configuration key names.
     static const OUString pProperties[] =
     {
-        PROPERTYNAME_DONTHIDEDISABLEDENTRIES    ,
-        PROPERTYNAME_FOLLOWMOUSE                ,
-        PROPERTYNAME_SHOWICONSINMENUES          ,
+        PROPERTYNAME_DONTHIDEDISABLEDENTRIES	,
+        PROPERTYNAME_FOLLOWMOUSE				,
+        PROPERTYNAME_SHOWICONSINMENUES			,
         PROPERTYNAME_SYSTEMICONSINMENUES
     };
     // Initialize return sequence with these list ...
@@ -427,15 +427,15 @@ void SvtMenuOptions_Impl::RemoveListener( const Link& rLink )
 }
 
 //*****************************************************************************************************************
-//  initialize static member
-//  DON'T DO IT IN YOUR HEADER!
-//  see definition for further informations
+//	initialize static member
+//	DON'T DO IT IN YOUR HEADER!
+//	see definition for further informations
 //*****************************************************************************************************************
-SvtMenuOptions_Impl*    SvtMenuOptions::m_pDataContainer    = NULL  ;
-sal_Int32               SvtMenuOptions::m_nRefCount         = 0     ;
+SvtMenuOptions_Impl*	SvtMenuOptions::m_pDataContainer	= NULL	;
+sal_Int32				SvtMenuOptions::m_nRefCount			= 0		;
 
 //*****************************************************************************************************************
-//  constructor
+//	constructor
 //*****************************************************************************************************************
 SvtMenuOptions::SvtMenuOptions()
 {
@@ -454,7 +454,7 @@ SvtMenuOptions::SvtMenuOptions()
 }
 
 //*****************************************************************************************************************
-//  destructor
+//	destructor
 //*****************************************************************************************************************
 SvtMenuOptions::~SvtMenuOptions()
 {
@@ -472,7 +472,7 @@ SvtMenuOptions::~SvtMenuOptions()
 }
 
 //*****************************************************************************************************************
-//  public method
+//	public method
 //*****************************************************************************************************************
 sal_Bool SvtMenuOptions::IsEntryHidingEnabled() const
 {
@@ -481,7 +481,7 @@ sal_Bool SvtMenuOptions::IsEntryHidingEnabled() const
 }
 
 //*****************************************************************************************************************
-//  public method
+//	public method
 //*****************************************************************************************************************
 sal_Bool SvtMenuOptions::IsFollowMouseEnabled() const
 {
@@ -490,7 +490,7 @@ sal_Bool SvtMenuOptions::IsFollowMouseEnabled() const
 }
 
 //*****************************************************************************************************************
-//  public method
+//	public method
 //*****************************************************************************************************************
 void SvtMenuOptions::SetEntryHidingState( sal_Bool bState )
 {
@@ -499,7 +499,7 @@ void SvtMenuOptions::SetEntryHidingState( sal_Bool bState )
 }
 
 //*****************************************************************************************************************
-//  public method
+//	public method
 //*****************************************************************************************************************
 void SvtMenuOptions::SetFollowMouseState( sal_Bool bState )
 {
@@ -508,7 +508,7 @@ void SvtMenuOptions::SetFollowMouseState( sal_Bool bState )
 }
 
 //*****************************************************************************************************************
-//  public method
+//	public method
 //*****************************************************************************************************************
 sal_Int16 SvtMenuOptions::GetMenuIconsState() const
 {
@@ -517,7 +517,7 @@ sal_Int16 SvtMenuOptions::GetMenuIconsState() const
 }
 
 //*****************************************************************************************************************
-//  public method
+//	public method
 //*****************************************************************************************************************
 void SvtMenuOptions::SetMenuIconsState( sal_Int16 bState )
 {
@@ -526,7 +526,7 @@ void SvtMenuOptions::SetMenuIconsState( sal_Int16 bState )
 }
 
 //*****************************************************************************************************************
-//  private method
+//	private method
 //*****************************************************************************************************************
 Mutex& SvtMenuOptions::GetOwnStaticMutex()
 {
diff --git a/unotools/source/config/misccfg.cxx b/unotools/source/config/misccfg.cxx
index e2cc8686d444..9a8b01c45908 100644
--- a/unotools/source/config/misccfg.cxx
+++ b/unotools/source/config/misccfg.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
@@ -42,8 +42,8 @@
 
 #define DEFAULT_TAB 2000
 
-#define DEF_INCH    2540L
-#define DEF_RELTWIP 1440L
+#define DEF_INCH	2540L
+#define DEF_RELTWIP	1440L
 
 using namespace rtl;
 using namespace com::sun::star::uno;
@@ -58,32 +58,32 @@ static sal_Int32 nRefCount = 0;
 
 class SfxMiscCfg : public utl::ConfigItem
 {
-    BOOL            bPaperSize;     // printer warnings
-    BOOL            bPaperOrientation;
-    BOOL            bNotFound;
-    sal_Int32       nYear2000;      // two digit year representation
+    BOOL			bPaperSize;     // printer warnings
+    BOOL			bPaperOrientation;
+    BOOL			bNotFound;
+    sal_Int32		nYear2000;		// two digit year representation
 
     const com::sun::star::uno::Sequence<rtl::OUString>& GetPropertyNames();
-    void                    Load();
+    void					Load();
 
 public:
     SfxMiscCfg( );
     ~SfxMiscCfg( );
 
-    virtual void            Notify( const com::sun::star::uno::Sequence<rtl::OUString>& aPropertyNames);
-    virtual void            Commit();
+    virtual void 			Notify( const com::sun::star::uno::Sequence<rtl::OUString>& aPropertyNames);
+    virtual void			Commit();
 
-    BOOL        IsNotFoundWarning()     const {return bNotFound;}
-    void        SetNotFoundWarning( BOOL bSet);
+    BOOL		IsNotFoundWarning() 	const {return bNotFound;}
+    void		SetNotFoundWarning(	BOOL bSet);
 
-    BOOL        IsPaperSizeWarning()    const {return bPaperSize;}
-    void        SetPaperSizeWarning(BOOL bSet);
+    BOOL		IsPaperSizeWarning() 	const {return bPaperSize;}
+    void		SetPaperSizeWarning(BOOL bSet);
 
-    BOOL        IsPaperOrientationWarning()     const {return bPaperOrientation;}
-    void        SetPaperOrientationWarning( BOOL bSet);
+    BOOL		IsPaperOrientationWarning() 	const {return bPaperOrientation;}
+    void		SetPaperOrientationWarning(	BOOL bSet);
 
                 // 0 ... 99
-    sal_Int32   GetYear2000()           const { return nYear2000; }
+    sal_Int32	GetYear2000()			const { return nYear2000; }
     void        SetYear2000( sal_Int32 nSet );
 
 };
@@ -99,7 +99,7 @@ SfxMiscCfg::SfxMiscCfg() :
     nYear2000( 1930 )
 {
     RTL_LOGFILE_CONTEXT(aLog, "svl SfxMiscCfg::SfxMiscCfg()");
-
+    
     Load();
 }
 /* -----------------------------02.03.01 15:31--------------------------------
@@ -159,10 +159,10 @@ const Sequence<OUString>& SfxMiscCfg::GetPropertyNames()
     {
         static const char* aPropNames[] =
         {
-               "Print/Warning/PaperSize",               //  0
-               "Print/Warning/PaperOrientation",        //  1
-               "Print/Warning/NotFound",                //  2
-            "DateFormat/TwoDigitYear",              //  3
+               "Print/Warning/PaperSize",				//  0
+               "Print/Warning/PaperOrientation",		//  1
+               "Print/Warning/NotFound",				//  2
+            "DateFormat/TwoDigitYear",            	//  3
         };
         const int nCount = 4;
         aNames.realloc(nCount);
@@ -190,7 +190,7 @@ void SfxMiscCfg::Load()
             {
                 switch(nProp)
                 {
-                    case  0: bPaperSize        = *(sal_Bool*)pValues[nProp].getValue(); break;      //"Print/Warning/PaperSize",
+                    case  0: bPaperSize 	   = *(sal_Bool*)pValues[nProp].getValue(); break;		//"Print/Warning/PaperSize",
                     case  1: bPaperOrientation = *(sal_Bool*)pValues[nProp].getValue();  break;     //"Print/Warning/PaperOrientation",
                     case  2: bNotFound         = *(sal_Bool*)pValues[nProp].getValue()  ;  break;   //"Print/Warning/NotFound",
                     case  3: pValues[nProp] >>= nYear2000;break;                                    //"DateFormat/TwoDigitYear",
@@ -220,7 +220,7 @@ void SfxMiscCfg::Commit()
     {
         switch(nProp)
         {
-            case  0: pValues[nProp].setValue(&bPaperSize, rType);break;  //"Print/Warning/PaperSize",
+            case  0: pValues[nProp].setValue(&bPaperSize, rType);break;	 //"Print/Warning/PaperSize",
             case  1: pValues[nProp].setValue(&bPaperOrientation, rType);break;     //"Print/Warning/PaperOrientation",
             case  2: pValues[nProp].setValue(&bNotFound, rType);break;   //"Print/Warning/NotFound",
             case  3: pValues[nProp] <<= nYear2000;break;                 //"DateFormat/TwoDigitYear",
@@ -266,17 +266,17 @@ MiscCfg::~MiscCfg( )
     }
 }
 
-BOOL MiscCfg::IsNotFoundWarning()   const
+BOOL MiscCfg::IsNotFoundWarning() 	const
 {
     return pImpl->IsNotFoundWarning();
 }
 
-void MiscCfg::SetNotFoundWarning(   BOOL bSet)
+void MiscCfg::SetNotFoundWarning(	BOOL bSet)
 {
     pImpl->SetNotFoundWarning( bSet );
 }
 
-BOOL MiscCfg::IsPaperSizeWarning()  const
+BOOL MiscCfg::IsPaperSizeWarning() 	const
 {
     return pImpl->IsPaperSizeWarning();
 }
@@ -286,12 +286,12 @@ void MiscCfg::SetPaperSizeWarning(BOOL bSet)
     pImpl->SetPaperSizeWarning( bSet );
 }
 
-BOOL MiscCfg::IsPaperOrientationWarning()   const
+BOOL MiscCfg::IsPaperOrientationWarning() 	const
 {
     return pImpl->IsPaperOrientationWarning();
 }
 
-void MiscCfg::SetPaperOrientationWarning(   BOOL bSet)
+void MiscCfg::SetPaperOrientationWarning(	BOOL bSet)
 {
     pImpl->SetPaperOrientationWarning( bSet );
 }
diff --git a/unotools/source/config/moduleoptions.cxx b/unotools/source/config/moduleoptions.cxx
index afce713ccc49..7414a8342d39 100644
--- a/unotools/source/config/moduleoptions.cxx
+++ b/unotools/source/config/moduleoptions.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
@@ -31,7 +31,7 @@
 #endif
 
 //_________________________________________________________________________________________________________________
-//  includes
+//	includes
 //_________________________________________________________________________________________________________________
 
 #include <unotools/moduleoptions.hxx>
@@ -55,7 +55,7 @@
 #include "itemholder1.hxx"
 
 //_________________________________________________________________________________________________________________
-//  namespaces
+//	namespaces
 //_________________________________________________________________________________________________________________
 
 #ifndef css
@@ -63,7 +63,7 @@ namespace css = ::com::sun::star;
 #endif
 
 //_________________________________________________________________________________________________________________
-//  const
+//	const
 //_________________________________________________________________________________________________________________
 
 /*-************************************************************************************************************//**
@@ -373,32 +373,32 @@ typedef FactoryInfo   FactoryInfoList[FACTORYCOUNT];
                     a refcount and make it threadsafe by using an osl mutex. So we don't must do anything for that.
                     We can implement pure functionality to read/write configuration data only.
 
-    @implements     -
+    @implements		-
     @base           ConfigItem
 
-    @devstatus      ready to use
+    @devstatus		ready to use
     @threadsafe     no
 *//*-*************************************************************************************************************/
 class SvtModuleOptions_Impl : public ::utl::ConfigItem
 {
     //-------------------------------------------------------------------------------------------------------------
-    //  public methods
+    //	public methods
     //-------------------------------------------------------------------------------------------------------------
     public:
         //---------------------------------------------------------------------------------------------------------
-        //  constructor / destructor
+        //	constructor / destructor
         //---------------------------------------------------------------------------------------------------------
          SvtModuleOptions_Impl(SvtModuleOptions* pOutsideClass);
         ~SvtModuleOptions_Impl();
 
         //---------------------------------------------------------------------------------------------------------
-        //  overloaded methods of baseclass
+        //	overloaded methods of baseclass
         //---------------------------------------------------------------------------------------------------------
         virtual void Notify( const css::uno::Sequence< ::rtl::OUString >& lPropertyNames );
         virtual void Commit(                                                             );
 
         //---------------------------------------------------------------------------------------------------------
-        //  public interface
+        //	public interface
         //---------------------------------------------------------------------------------------------------------
         sal_Bool        IsModuleInstalled         (       SvtModuleOptions::EModule     eModule    ) const;
         ::com::sun::star::uno::Sequence < ::rtl::OUString > GetAllServiceNames();
@@ -421,7 +421,7 @@ class SvtModuleOptions_Impl : public ::utl::ConfigItem
         void            MakeReadonlyStatesAvailable();
 
     //-------------------------------------------------------------------------------------------------------------
-    //  private methods
+    //	private methods
     //-------------------------------------------------------------------------------------------------------------
     private:
         static css::uno::Sequence< ::rtl::OUString > impl_ExpandSetNames ( const css::uno::Sequence< ::rtl::OUString >& lSetNames   );
@@ -433,7 +433,7 @@ class SvtModuleOptions_Impl : public ::utl::ConfigItem
     private:
 
     //-------------------------------------------------------------------------------------------------------------
-    //  private member
+    //	private member
     //-------------------------------------------------------------------------------------------------------------
     private:
         FactoryInfoList     m_lFactories;
@@ -442,7 +442,7 @@ class SvtModuleOptions_Impl : public ::utl::ConfigItem
 };
 
 //_________________________________________________________________________________________________________________
-//  definitions
+//	definitions
 //_________________________________________________________________________________________________________________
 
 /*-************************************************************************************************************//**
@@ -560,8 +560,8 @@ void SvtModuleOptions_Impl::Commit()
         sBasePath  = PATHSEPERATOR + pInfo->getFactory() + PATHSEPERATOR;
 
         const css::uno::Sequence< css::beans::PropertyValue > lChangedProperties = pInfo->getChangedProperties ( sBasePath );
-        const css::beans::PropertyValue*                      pChangedProperties = lChangedProperties.getConstArray();
-        sal_Int32                                             nPropertyCount     = lChangedProperties.getLength();
+        const css::beans::PropertyValue*					  pChangedProperties = lChangedProperties.getConstArray();
+        sal_Int32											  nPropertyCount     = lChangedProperties.getLength();
         for( sal_Int32 nProperty=0; nProperty<nPropertyCount; ++nProperty )
         {
             lCommitProperties[nRealCount] = pChangedProperties[nProperty];
@@ -881,7 +881,7 @@ css::uno::Sequence< ::rtl::OUString > SvtModuleOptions_Impl::impl_ExpandSetNames
 {
     sal_Int32                             nCount     = lSetNames.getLength() ;
     css::uno::Sequence< ::rtl::OUString > lPropNames ( nCount*PROPERTYCOUNT );
-    ::rtl::OUString*                      pPropNames = lPropNames.getArray() ;
+    ::rtl::OUString*					  pPropNames = lPropNames.getArray() ;
     sal_Int32                             nPropStart = 0                     ;
 
     for( sal_Int32 nName=0; nName<nCount; ++nName )
@@ -1091,9 +1091,9 @@ void SvtModuleOptions_Impl::MakeReadonlyStatesAvailable()
 }
 
 //*****************************************************************************************************************
-//  initialize static member
-//  DON'T DO IT IN YOUR HEADER!
-//  see definition for further informations
+//	initialize static member
+//	DON'T DO IT IN YOUR HEADER!
+//	see definition for further informations
 //*****************************************************************************************************************
 SvtModuleOptions_Impl*  SvtModuleOptions::m_pDataContainer  = NULL  ;
 sal_Int32               SvtModuleOptions::m_nRefCount       = 0     ;
@@ -1393,7 +1393,7 @@ sal_uInt32 SvtModuleOptions::GetFeatures() const
         case SvtModuleOptions::E_MATH           :   { return ::rtl::OUString::createFromAscii("Math"); }
         case SvtModuleOptions::E_CHART          :   { return ::rtl::OUString::createFromAscii("Chart"); }
         case SvtModuleOptions::E_BASIC          :   { return ::rtl::OUString::createFromAscii("Basic"); }
-        case SvtModuleOptions::E_DATABASE       :   { return ::rtl::OUString::createFromAscii("Database"); }
+        case SvtModuleOptions::E_DATABASE		:   { return ::rtl::OUString::createFromAscii("Database"); }
         default:
             OSL_ASSERT( "unknown factory" );
             break;
diff --git a/unotools/source/config/options.cxx b/unotools/source/config/options.cxx
index c65fd09efd0c..4adbe616df84 100644
--- a/unotools/source/config/options.cxx
+++ b/unotools/source/config/options.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
diff --git a/unotools/source/config/optionsdlg.cxx b/unotools/source/config/optionsdlg.cxx
index cb98e8514358..ae2b625ea640 100644
--- a/unotools/source/config/optionsdlg.cxx
+++ b/unotools/source/config/optionsdlg.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
diff --git a/unotools/source/config/optionsdrawinglayer.cxx b/unotools/source/config/optionsdrawinglayer.cxx
index c15f5a97e435..71e21355d9a3 100644
--- a/unotools/source/config/optionsdrawinglayer.cxx
+++ b/unotools/source/config/optionsdrawinglayer.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
@@ -29,7 +29,7 @@
 #endif
 
 //_________________________________________________________________________________________________________________
-//  includes
+//	includes
 //_________________________________________________________________________________________________________________
 
 #include <unotools/optionsdrawinglayer.hxx>
@@ -42,188 +42,188 @@
 #include <vcl/outdev.hxx>
 
 //_________________________________________________________________________________________________________________
-//  namespaces
+//	namespaces
 //_________________________________________________________________________________________________________________
 
-using namespace ::utl                   ;
-using namespace ::rtl                   ;
-using namespace ::osl                   ;
-using namespace ::com::sun::star::uno   ;
+using namespace ::utl					;
+using namespace ::rtl					;
+using namespace ::osl					;
+using namespace ::com::sun::star::uno	;
 
 //_________________________________________________________________________________________________________________
-//  const
+//	const
 //_________________________________________________________________________________________________________________
 
-#define ROOTNODE_START                  OUString(RTL_CONSTASCII_USTRINGPARAM("Office.Common/Drawinglayer"   ))
-#define DEFAULT_OVERLAYBUFFER           sal_True
-#define DEFAULT_PAINTBUFFER             sal_True
-#define DEFAULT_STRIPE_COLOR_A          0
-#define DEFAULT_STRIPE_COLOR_B          16581375
-#define DEFAULT_STRIPE_LENGTH           4
+#define	ROOTNODE_START			   		OUString(RTL_CONSTASCII_USTRINGPARAM("Office.Common/Drawinglayer"	))
+#define	DEFAULT_OVERLAYBUFFER			sal_True
+#define	DEFAULT_PAINTBUFFER				sal_True
+#define	DEFAULT_STRIPE_COLOR_A			0
+#define	DEFAULT_STRIPE_COLOR_B			16581375
+#define	DEFAULT_STRIPE_LENGTH			4
 
 // #i73602#
 // #i74769#, #i75172# : Change default for Calc and Writer to True
-#define DEFAULT_OVERLAYBUFFER_CALC          sal_True
-#define DEFAULT_OVERLAYBUFFER_WRITER        sal_True
-#define DEFAULT_OVERLAYBUFFER_DRAWIMPRESS   sal_True
+#define	DEFAULT_OVERLAYBUFFER_CALC			sal_True
+#define	DEFAULT_OVERLAYBUFFER_WRITER		sal_True
+#define	DEFAULT_OVERLAYBUFFER_DRAWIMPRESS	sal_True
 
 // #i74769#, #i75172#
-#define DEFAULT_PAINTBUFFER_CALC            sal_True
-#define DEFAULT_PAINTBUFFER_WRITER          sal_True
-#define DEFAULT_PAINTBUFFER_DRAWIMPRESS     sal_True
+#define	DEFAULT_PAINTBUFFER_CALC			sal_True
+#define	DEFAULT_PAINTBUFFER_WRITER			sal_True
+#define	DEFAULT_PAINTBUFFER_DRAWIMPRESS		sal_True
 
 // #i4219#
-#define DEFAULT_MAXIMUMPAPERWIDTH           300
-#define DEFAULT_MAXIMUMPAPERHEIGHT          300
-#define DEFAULT_MAXIMUMPAPERLEFTMARGIN      9999
-#define DEFAULT_MAXIMUMPAPERRIGHTMARGIN     9999
-#define DEFAULT_MAXIMUMPAPERTOPMARGIN       9999
-#define DEFAULT_MAXIMUMPAPERBOTTOMMARGIN    9999
+#define	DEFAULT_MAXIMUMPAPERWIDTH			300
+#define	DEFAULT_MAXIMUMPAPERHEIGHT			300
+#define	DEFAULT_MAXIMUMPAPERLEFTMARGIN		9999
+#define	DEFAULT_MAXIMUMPAPERRIGHTMARGIN		9999
+#define	DEFAULT_MAXIMUMPAPERTOPMARGIN		9999
+#define	DEFAULT_MAXIMUMPAPERBOTTOMMARGIN	9999
 
 // primitives
-#define DEFAULT_ANTIALIASING                        sal_True
-#define DEFAULT_SNAPHORVERLINESTODISCRETE           sal_True
-#define DEFAULT_SOLIDDRAGCREATE                     sal_True
-#define DEFAULT_RENDERDECORATEDTEXTDIRECT           sal_True
-#define DEFAULT_RENDERSIMPLETEXTDIRECT              sal_True
-#define DEFAULT_QUADRATIC3DRENDERLIMIT              1000000
-#define DEFAULT_QUADRATICFORMCONTROLRENDERLIMIT     45000
+#define	DEFAULT_ANTIALIASING                        sal_True
+#define	DEFAULT_SNAPHORVERLINESTODISCRETE			sal_True
+#define	DEFAULT_SOLIDDRAGCREATE                     sal_True
+#define	DEFAULT_RENDERDECORATEDTEXTDIRECT           sal_True
+#define	DEFAULT_RENDERSIMPLETEXTDIRECT              sal_True
+#define	DEFAULT_QUADRATIC3DRENDERLIMIT              1000000
+#define	DEFAULT_QUADRATICFORMCONTROLRENDERLIMIT     45000
 
 // #i97672# selection settings
-#define DEFAULT_TRANSPARENTSELECTION                sal_True
-#define DEFAULT_TRANSPARENTSELECTIONPERCENT         75
+#define	DEFAULT_TRANSPARENTSELECTION                sal_True
+#define DEFAULT_TRANSPARENTSELECTIONPERCENT			75
 #define DEFAULT_SELECTIONMAXIMUMLUMINANCEPERCENT    70
 
-#define PROPERTYNAME_OVERLAYBUFFER      OUString(RTL_CONSTASCII_USTRINGPARAM("OverlayBuffer"    ))
-#define PROPERTYNAME_PAINTBUFFER        OUString(RTL_CONSTASCII_USTRINGPARAM("PaintBuffer"      ))
-#define PROPERTYNAME_STRIPE_COLOR_A     OUString(RTL_CONSTASCII_USTRINGPARAM("StripeColorA"     ))
-#define PROPERTYNAME_STRIPE_COLOR_B     OUString(RTL_CONSTASCII_USTRINGPARAM("StripeColorB"     ))
-#define PROPERTYNAME_STRIPE_LENGTH      OUString(RTL_CONSTASCII_USTRINGPARAM("StripeLength"     ))
+#define	PROPERTYNAME_OVERLAYBUFFER		OUString(RTL_CONSTASCII_USTRINGPARAM("OverlayBuffer"	))
+#define	PROPERTYNAME_PAINTBUFFER		OUString(RTL_CONSTASCII_USTRINGPARAM("PaintBuffer"		))
+#define	PROPERTYNAME_STRIPE_COLOR_A		OUString(RTL_CONSTASCII_USTRINGPARAM("StripeColorA"		))
+#define	PROPERTYNAME_STRIPE_COLOR_B		OUString(RTL_CONSTASCII_USTRINGPARAM("StripeColorB"		))
+#define	PROPERTYNAME_STRIPE_LENGTH		OUString(RTL_CONSTASCII_USTRINGPARAM("StripeLength"		))
 
 // #i73602#
-#define PROPERTYNAME_OVERLAYBUFFER_CALC         OUString(RTL_CONSTASCII_USTRINGPARAM("OverlayBuffer_Calc"))
-#define PROPERTYNAME_OVERLAYBUFFER_WRITER       OUString(RTL_CONSTASCII_USTRINGPARAM("OverlayBuffer_Writer"))
-#define PROPERTYNAME_OVERLAYBUFFER_DRAWIMPRESS  OUString(RTL_CONSTASCII_USTRINGPARAM("OverlayBuffer_DrawImpress"))
+#define	PROPERTYNAME_OVERLAYBUFFER_CALC			OUString(RTL_CONSTASCII_USTRINGPARAM("OverlayBuffer_Calc"))
+#define	PROPERTYNAME_OVERLAYBUFFER_WRITER		OUString(RTL_CONSTASCII_USTRINGPARAM("OverlayBuffer_Writer"))
+#define	PROPERTYNAME_OVERLAYBUFFER_DRAWIMPRESS	OUString(RTL_CONSTASCII_USTRINGPARAM("OverlayBuffer_DrawImpress"))
 
 // #i74769#, #i75172#
-#define PROPERTYNAME_PAINTBUFFER_CALC           OUString(RTL_CONSTASCII_USTRINGPARAM("PaintBuffer_Calc"))
-#define PROPERTYNAME_PAINTBUFFER_WRITER         OUString(RTL_CONSTASCII_USTRINGPARAM("PaintBuffer_Writer"))
-#define PROPERTYNAME_PAINTBUFFER_DRAWIMPRESS    OUString(RTL_CONSTASCII_USTRINGPARAM("PaintBuffer_DrawImpress"))
+#define	PROPERTYNAME_PAINTBUFFER_CALC			OUString(RTL_CONSTASCII_USTRINGPARAM("PaintBuffer_Calc"))
+#define	PROPERTYNAME_PAINTBUFFER_WRITER			OUString(RTL_CONSTASCII_USTRINGPARAM("PaintBuffer_Writer"))
+#define	PROPERTYNAME_PAINTBUFFER_DRAWIMPRESS	OUString(RTL_CONSTASCII_USTRINGPARAM("PaintBuffer_DrawImpress"))
 
 // #i4219#
-#define PROPERTYNAME_MAXIMUMPAPERWIDTH OUString(RTL_CONSTASCII_USTRINGPARAM("MaximumPaperWidth"))
-#define PROPERTYNAME_MAXIMUMPAPERHEIGHT OUString(RTL_CONSTASCII_USTRINGPARAM("MaximumPaperHeight"))
-#define PROPERTYNAME_MAXIMUMPAPERLEFTMARGIN OUString(RTL_CONSTASCII_USTRINGPARAM("MaximumPaperLeftMargin"))
-#define PROPERTYNAME_MAXIMUMPAPERRIGHTMARGIN OUString(RTL_CONSTASCII_USTRINGPARAM("MaximumPaperRightMargin"))
-#define PROPERTYNAME_MAXIMUMPAPERTOPMARGIN OUString(RTL_CONSTASCII_USTRINGPARAM("MaximumPaperTopMargin"))
-#define PROPERTYNAME_MAXIMUMPAPERBOTTOMMARGIN OUString(RTL_CONSTASCII_USTRINGPARAM("MaximumPaperBottomMargin"))
+#define	PROPERTYNAME_MAXIMUMPAPERWIDTH OUString(RTL_CONSTASCII_USTRINGPARAM("MaximumPaperWidth"))
+#define	PROPERTYNAME_MAXIMUMPAPERHEIGHT OUString(RTL_CONSTASCII_USTRINGPARAM("MaximumPaperHeight"))
+#define	PROPERTYNAME_MAXIMUMPAPERLEFTMARGIN OUString(RTL_CONSTASCII_USTRINGPARAM("MaximumPaperLeftMargin"))
+#define	PROPERTYNAME_MAXIMUMPAPERRIGHTMARGIN OUString(RTL_CONSTASCII_USTRINGPARAM("MaximumPaperRightMargin"))
+#define	PROPERTYNAME_MAXIMUMPAPERTOPMARGIN OUString(RTL_CONSTASCII_USTRINGPARAM("MaximumPaperTopMargin"))
+#define	PROPERTYNAME_MAXIMUMPAPERBOTTOMMARGIN OUString(RTL_CONSTASCII_USTRINGPARAM("MaximumPaperBottomMargin"))
 
 // primitives
-#define PROPERTYNAME_ANTIALIASING OUString(RTL_CONSTASCII_USTRINGPARAM("AntiAliasing"))
-#define PROPERTYNAME_SNAPHORVERLINESTODISCRETE OUString(RTL_CONSTASCII_USTRINGPARAM("SnapHorVerLinesToDiscrete"))
-#define PROPERTYNAME_SOLIDDRAGCREATE OUString(RTL_CONSTASCII_USTRINGPARAM("SolidDragCreate"))
-#define PROPERTYNAME_RENDERDECORATEDTEXTDIRECT OUString(RTL_CONSTASCII_USTRINGPARAM("RenderDecoratedTextDirect"))
-#define PROPERTYNAME_RENDERSIMPLETEXTDIRECT OUString(RTL_CONSTASCII_USTRINGPARAM("RenderSimpleTextDirect"))
-#define PROPERTYNAME_QUADRATIC3DRENDERLIMIT OUString(RTL_CONSTASCII_USTRINGPARAM("Quadratic3DRenderLimit"))
-#define PROPERTYNAME_QUADRATICFORMCONTROLRENDERLIMIT OUString(RTL_CONSTASCII_USTRINGPARAM("QuadraticFormControlRenderLimit"))
+#define	PROPERTYNAME_ANTIALIASING OUString(RTL_CONSTASCII_USTRINGPARAM("AntiAliasing"))
+#define	PROPERTYNAME_SNAPHORVERLINESTODISCRETE OUString(RTL_CONSTASCII_USTRINGPARAM("SnapHorVerLinesToDiscrete"))
+#define	PROPERTYNAME_SOLIDDRAGCREATE OUString(RTL_CONSTASCII_USTRINGPARAM("SolidDragCreate"))
+#define	PROPERTYNAME_RENDERDECORATEDTEXTDIRECT OUString(RTL_CONSTASCII_USTRINGPARAM("RenderDecoratedTextDirect"))
+#define	PROPERTYNAME_RENDERSIMPLETEXTDIRECT OUString(RTL_CONSTASCII_USTRINGPARAM("RenderSimpleTextDirect"))
+#define	PROPERTYNAME_QUADRATIC3DRENDERLIMIT OUString(RTL_CONSTASCII_USTRINGPARAM("Quadratic3DRenderLimit"))
+#define	PROPERTYNAME_QUADRATICFORMCONTROLRENDERLIMIT OUString(RTL_CONSTASCII_USTRINGPARAM("QuadraticFormControlRenderLimit"))
 
 // #i97672# selection settings
-#define PROPERTYNAME_TRANSPARENTSELECTION OUString(RTL_CONSTASCII_USTRINGPARAM("TransparentSelection"))
-#define PROPERTYNAME_TRANSPARENTSELECTIONPERCENT OUString(RTL_CONSTASCII_USTRINGPARAM("TransparentSelectionPercent"))
-#define PROPERTYNAME_SELECTIONMAXIMUMLUMINANCEPERCENT OUString(RTL_CONSTASCII_USTRINGPARAM("SelectionMaximumLuminancePercent"))
+#define	PROPERTYNAME_TRANSPARENTSELECTION OUString(RTL_CONSTASCII_USTRINGPARAM("TransparentSelection"))
+#define	PROPERTYNAME_TRANSPARENTSELECTIONPERCENT OUString(RTL_CONSTASCII_USTRINGPARAM("TransparentSelectionPercent"))
+#define	PROPERTYNAME_SELECTIONMAXIMUMLUMINANCEPERCENT OUString(RTL_CONSTASCII_USTRINGPARAM("SelectionMaximumLuminancePercent"))
 
-#define PROPERTYHANDLE_OVERLAYBUFFER                0
-#define PROPERTYHANDLE_PAINTBUFFER                  1
-#define PROPERTYHANDLE_STRIPE_COLOR_A               2
-#define PROPERTYHANDLE_STRIPE_COLOR_B               3
-#define PROPERTYHANDLE_STRIPE_LENGTH                4
+#define	PROPERTYHANDLE_OVERLAYBUFFER				0
+#define	PROPERTYHANDLE_PAINTBUFFER					1
+#define	PROPERTYHANDLE_STRIPE_COLOR_A				2
+#define	PROPERTYHANDLE_STRIPE_COLOR_B				3
+#define	PROPERTYHANDLE_STRIPE_LENGTH				4
 
 // #i73602#
-#define PROPERTYHANDLE_OVERLAYBUFFER_CALC           5
-#define PROPERTYHANDLE_OVERLAYBUFFER_WRITER         6
-#define PROPERTYHANDLE_OVERLAYBUFFER_DRAWIMPRESS    7
+#define	PROPERTYHANDLE_OVERLAYBUFFER_CALC			5
+#define	PROPERTYHANDLE_OVERLAYBUFFER_WRITER			6
+#define	PROPERTYHANDLE_OVERLAYBUFFER_DRAWIMPRESS	7
 
 // #i74769#, #i75172#
-#define PROPERTYHANDLE_PAINTBUFFER_CALC             8
-#define PROPERTYHANDLE_PAINTBUFFER_WRITER           9
-#define PROPERTYHANDLE_PAINTBUFFER_DRAWIMPRESS      10
+#define	PROPERTYHANDLE_PAINTBUFFER_CALC				8
+#define	PROPERTYHANDLE_PAINTBUFFER_WRITER			9
+#define	PROPERTYHANDLE_PAINTBUFFER_DRAWIMPRESS		10
 
 // #i4219#
-#define PROPERTYHANDLE_MAXIMUMPAPERWIDTH            11
-#define PROPERTYHANDLE_MAXIMUMPAPERHEIGHT           12
-#define PROPERTYHANDLE_MAXIMUMPAPERLEFTMARGIN       13
-#define PROPERTYHANDLE_MAXIMUMPAPERRIGHTMARGIN      14
-#define PROPERTYHANDLE_MAXIMUMPAPERTOPMARGIN        15
-#define PROPERTYHANDLE_MAXIMUMPAPERBOTTOMMARGIN     16
+#define	PROPERTYHANDLE_MAXIMUMPAPERWIDTH			11
+#define	PROPERTYHANDLE_MAXIMUMPAPERHEIGHT			12
+#define	PROPERTYHANDLE_MAXIMUMPAPERLEFTMARGIN		13
+#define	PROPERTYHANDLE_MAXIMUMPAPERRIGHTMARGIN		14
+#define	PROPERTYHANDLE_MAXIMUMPAPERTOPMARGIN		15
+#define	PROPERTYHANDLE_MAXIMUMPAPERBOTTOMMARGIN		16
 
 // primitives
-#define PROPERTYHANDLE_ANTIALIASING                     17
-#define PROPERTYHANDLE_SNAPHORVERLINESTODISCRETE        18
-#define PROPERTYHANDLE_SOLIDDRAGCREATE                  19
-#define PROPERTYHANDLE_RENDERDECORATEDTEXTDIRECT        20
-#define PROPERTYHANDLE_RENDERSIMPLETEXTDIRECT           21
-#define PROPERTYHANDLE_QUADRATIC3DRENDERLIMIT           22
-#define PROPERTYHANDLE_QUADRATICFORMCONTROLRENDERLIMIT  23
+#define	PROPERTYHANDLE_ANTIALIASING                     17
+#define	PROPERTYHANDLE_SNAPHORVERLINESTODISCRETE        18
+#define	PROPERTYHANDLE_SOLIDDRAGCREATE					19
+#define	PROPERTYHANDLE_RENDERDECORATEDTEXTDIRECT        20
+#define	PROPERTYHANDLE_RENDERSIMPLETEXTDIRECT           21
+#define	PROPERTYHANDLE_QUADRATIC3DRENDERLIMIT           22
+#define	PROPERTYHANDLE_QUADRATICFORMCONTROLRENDERLIMIT  23
 
 // #i97672# selection settings
-#define PROPERTYHANDLE_TRANSPARENTSELECTION             24
-#define PROPERTYHANDLE_TRANSPARENTSELECTIONPERCENT      25
-#define PROPERTYHANDLE_SELECTIONMAXIMUMLUMINANCEPERCENT 26
+#define	PROPERTYHANDLE_TRANSPARENTSELECTION             24
+#define	PROPERTYHANDLE_TRANSPARENTSELECTIONPERCENT      25
+#define	PROPERTYHANDLE_SELECTIONMAXIMUMLUMINANCEPERCENT 26
 
-#define PROPERTYCOUNT                               27
+#define	PROPERTYCOUNT								27
 
 class SvtOptionsDrawinglayer_Impl : public ConfigItem
 {
 public:
 
 //---------------------------------------------------------------------------------------------------------
-//  constructor / destructor
+//	constructor / destructor
 //---------------------------------------------------------------------------------------------------------
 
      SvtOptionsDrawinglayer_Impl();
     ~SvtOptionsDrawinglayer_Impl();
 
 //---------------------------------------------------------------------------------------------------------
-//  overloaded methods of baseclass
+//	overloaded methods of baseclass
 //---------------------------------------------------------------------------------------------------------
 
     virtual void Commit();
 
 //---------------------------------------------------------------------------------------------------------
-//  public interface
+//	public interface
 //---------------------------------------------------------------------------------------------------------
 
-    sal_Bool    IsOverlayBuffer() const;
-    sal_Bool    IsPaintBuffer() const;
-    Color       GetStripeColorA() const;
-    Color       GetStripeColorB() const;
-    sal_uInt16  GetStripeLength() const;
+    sal_Bool	IsOverlayBuffer() const;
+    sal_Bool	IsPaintBuffer() const;
+    Color		GetStripeColorA() const;
+    Color		GetStripeColorB() const;
+    sal_uInt16	GetStripeLength() const;
 
     // #i73602#
-    sal_Bool    IsOverlayBuffer_Calc() const;
-    sal_Bool    IsOverlayBuffer_Writer() const;
-    sal_Bool    IsOverlayBuffer_DrawImpress() const;
+    sal_Bool	IsOverlayBuffer_Calc() const;
+    sal_Bool	IsOverlayBuffer_Writer() const;
+    sal_Bool	IsOverlayBuffer_DrawImpress() const;
 
     // #i74769#, #i75172#
-    sal_Bool    IsPaintBuffer_Calc() const;
-    sal_Bool    IsPaintBuffer_Writer() const;
-    sal_Bool    IsPaintBuffer_DrawImpress() const;
+    sal_Bool	IsPaintBuffer_Calc() const;
+    sal_Bool	IsPaintBuffer_Writer() const;
+    sal_Bool	IsPaintBuffer_DrawImpress() const;
 
-    void        SetOverlayBuffer( sal_Bool bState );
-    void        SetPaintBuffer( sal_Bool bState );
-    void        SetStripeColorA( Color aColor );
-    void        SetStripeColorB( Color aColor );
-    void        SetStripeLength( sal_uInt16 nLength );
+    void		SetOverlayBuffer( sal_Bool bState );
+    void		SetPaintBuffer( sal_Bool bState );
+    void		SetStripeColorA( Color aColor );
+    void		SetStripeColorB( Color aColor );
+    void		SetStripeLength( sal_uInt16 nLength );
 
     // #i73602#
-    void        SetOverlayBuffer_Calc( sal_Bool bState );
-    void        SetOverlayBuffer_Writer( sal_Bool bState );
-    void        SetOverlayBuffer_DrawImpress( sal_Bool bState );
+    void		SetOverlayBuffer_Calc( sal_Bool bState );
+    void		SetOverlayBuffer_Writer( sal_Bool bState );
+    void		SetOverlayBuffer_DrawImpress( sal_Bool bState );
 
     // #i74769#, #i75172#
-    void        SetPaintBuffer_Calc( sal_Bool bState );
-    void        SetPaintBuffer_Writer( sal_Bool bState );
-    void        SetPaintBuffer_DrawImpress( sal_Bool bState );
+    void		SetPaintBuffer_Calc( sal_Bool bState );
+    void		SetPaintBuffer_Writer( sal_Bool bState );
+    void		SetPaintBuffer_DrawImpress( sal_Bool bState );
 
     // #i4219#
     sal_uInt32 GetMaximumPaperWidth() const;
@@ -244,33 +244,33 @@ public:
     sal_Bool IsAAPossibleOnThisSystem() const;
 
     // primitives
-    sal_Bool    IsAntiAliasing() const;
-    sal_Bool    IsSnapHorVerLinesToDiscrete() const;
-    sal_Bool    IsSolidDragCreate() const;
-    sal_Bool    IsRenderDecoratedTextDirect() const;
-    sal_Bool    IsRenderSimpleTextDirect() const;
+    sal_Bool	IsAntiAliasing() const;
+    sal_Bool	IsSnapHorVerLinesToDiscrete() const;
+    sal_Bool	IsSolidDragCreate() const;
+    sal_Bool	IsRenderDecoratedTextDirect() const;
+    sal_Bool	IsRenderSimpleTextDirect() const;
     sal_uInt32  GetQuadratic3DRenderLimit() const;
     sal_uInt32  GetQuadraticFormControlRenderLimit() const;
 
-    void        SetAntiAliasing( sal_Bool bState );
-    void        SetSnapHorVerLinesToDiscrete( sal_Bool bState );
-    void        SetSolidDragCreate( sal_Bool bState );
-    void        SetRenderDecoratedTextDirect( sal_Bool bState );
-    void        SetRenderSimpleTextDirect( sal_Bool bState );
+    void		SetAntiAliasing( sal_Bool bState );
+    void		SetSnapHorVerLinesToDiscrete( sal_Bool bState );
+    void		SetSolidDragCreate( sal_Bool bState );
+    void		SetRenderDecoratedTextDirect( sal_Bool bState );
+    void		SetRenderSimpleTextDirect( sal_Bool bState );
     void        SetQuadratic3DRenderLimit(sal_uInt32 nNew);
     void        SetQuadraticFormControlRenderLimit(sal_uInt32 nNew);
 
     // #i97672# selection settings
-    sal_Bool    IsTransparentSelection() const;
-    sal_uInt16  GetTransparentSelectionPercent() const;
-    sal_uInt16  GetSelectionMaximumLuminancePercent() const;
+    sal_Bool	IsTransparentSelection() const;
+    sal_uInt16	GetTransparentSelectionPercent() const;
+    sal_uInt16	GetSelectionMaximumLuminancePercent() const;
 
-    void        SetTransparentSelection( sal_Bool bState );
-    void        SetTransparentSelectionPercent( sal_uInt16 nPercent );
-    void        SetSelectionMaximumLuminancePercent( sal_uInt16 nPercent );
+    void		SetTransparentSelection( sal_Bool bState );
+    void		SetTransparentSelectionPercent( sal_uInt16 nPercent );
+    void		SetSelectionMaximumLuminancePercent( sal_uInt16 nPercent );
 
 //-------------------------------------------------------------------------------------------------------------
-//  private methods
+//	private methods
 //-------------------------------------------------------------------------------------------------------------
 
 private:
@@ -278,48 +278,48 @@ private:
     static Sequence< OUString > impl_GetPropertyNames();
 
 //-------------------------------------------------------------------------------------------------------------
-//  private member
+//	private member
 //-------------------------------------------------------------------------------------------------------------
 
 private:
 
-        sal_Bool    m_bOverlayBuffer;
-        sal_Bool    m_bPaintBuffer;
-        Color       m_bStripeColorA;
-        Color       m_bStripeColorB;
-        sal_uInt16  m_nStripeLength;
+        sal_Bool	m_bOverlayBuffer;
+        sal_Bool	m_bPaintBuffer;
+        Color		m_bStripeColorA;
+        Color		m_bStripeColorB;
+        sal_uInt16	m_nStripeLength;
 
         // #i73602#
-        sal_Bool    m_bOverlayBuffer_Calc;
-        sal_Bool    m_bOverlayBuffer_Writer;
-        sal_Bool    m_bOverlayBuffer_DrawImpress;
+        sal_Bool	m_bOverlayBuffer_Calc;
+        sal_Bool	m_bOverlayBuffer_Writer;
+        sal_Bool	m_bOverlayBuffer_DrawImpress;
 
         // #i74769#, #i75172#
-        sal_Bool    m_bPaintBuffer_Calc;
-        sal_Bool    m_bPaintBuffer_Writer;
-        sal_Bool    m_bPaintBuffer_DrawImpress;
+        sal_Bool	m_bPaintBuffer_Calc;
+        sal_Bool	m_bPaintBuffer_Writer;
+        sal_Bool	m_bPaintBuffer_DrawImpress;
 
         // #i4219#
-        sal_uInt32  m_nMaximumPaperWidth;
-        sal_uInt32  m_nMaximumPaperHeight;
-        sal_uInt32  m_nMaximumPaperLeftMargin;
-        sal_uInt32  m_nMaximumPaperRightMargin;
-        sal_uInt32  m_nMaximumPaperTopMargin;
-        sal_uInt32  m_nMaximumPaperBottomMargin;
+        sal_uInt32	m_nMaximumPaperWidth;
+        sal_uInt32	m_nMaximumPaperHeight;
+        sal_uInt32	m_nMaximumPaperLeftMargin;
+        sal_uInt32	m_nMaximumPaperRightMargin;
+        sal_uInt32	m_nMaximumPaperTopMargin;
+        sal_uInt32	m_nMaximumPaperBottomMargin;
 
         // primitives
-        sal_Bool    m_bAntiAliasing;
-        sal_Bool    m_bSnapHorVerLinesToDiscrete;
-        sal_Bool    m_bSolidDragCreate;
-        sal_Bool    m_bRenderDecoratedTextDirect;
-        sal_Bool    m_bRenderSimpleTextDirect;
-        sal_uInt32  m_nQuadratic3DRenderLimit;
-        sal_uInt32  m_nQuadraticFormControlRenderLimit;
+        sal_Bool	m_bAntiAliasing;
+        sal_Bool	m_bSnapHorVerLinesToDiscrete;
+        sal_Bool	m_bSolidDragCreate;
+        sal_Bool	m_bRenderDecoratedTextDirect;
+        sal_Bool	m_bRenderSimpleTextDirect;
+        sal_uInt32	m_nQuadratic3DRenderLimit;
+        sal_uInt32	m_nQuadraticFormControlRenderLimit;
 
         // #i97672# selection settings
-        sal_uInt16  m_nTransparentSelectionPercent;
-        sal_uInt16  m_nSelectionMaximumLuminancePercent;
-        sal_Bool    m_bTransparentSelection;
+        sal_uInt16	m_nTransparentSelectionPercent;
+        sal_uInt16	m_nSelectionMaximumLuminancePercent;
+        sal_Bool	m_bTransparentSelection;
 
         // local values
         bool        m_bAllowAA : 1;
@@ -327,14 +327,14 @@ private:
 };
 
 //_________________________________________________________________________________________________________________
-//  definitions
+//	definitions
 //_________________________________________________________________________________________________________________
 
 //*****************************************************************************************************************
-//  constructor
+//	constructor
 //*****************************************************************************************************************
 SvtOptionsDrawinglayer_Impl::SvtOptionsDrawinglayer_Impl() :
-    ConfigItem( ROOTNODE_START  ),
+    ConfigItem( ROOTNODE_START	),
     m_bOverlayBuffer( DEFAULT_OVERLAYBUFFER ),
     m_bPaintBuffer( DEFAULT_PAINTBUFFER ),
     m_bStripeColorA(Color(DEFAULT_STRIPE_COLOR_A)),
@@ -377,14 +377,14 @@ SvtOptionsDrawinglayer_Impl::SvtOptionsDrawinglayer_Impl() :
     m_bAllowAA(true),
     m_bAllowAAChecked(false)
 {
-    Sequence< OUString >    seqNames( impl_GetPropertyNames() );
-    Sequence< Any >         seqValues   = GetProperties( seqNames ) ;
+    Sequence< OUString >	seqNames( impl_GetPropertyNames() );
+    Sequence< Any >			seqValues	= GetProperties( seqNames )	;
 
     DBG_ASSERT( !(seqNames.getLength()!=seqValues.getLength()), "SvtOptionsDrawinglayer_Impl::SvtOptionsDrawinglayer_Impl()\nI miss some values of configuration keys!\n" );
 
     // Copy values from list in right order to ouer internal member.
     sal_Int32 nPropertyCount = seqValues.getLength();
-    sal_Int32 nProperty = 0;
+    sal_Int32 nProperty	= 0;
 
     for( nProperty=0; nProperty<nPropertyCount; ++nProperty )
     {
@@ -594,7 +594,7 @@ SvtOptionsDrawinglayer_Impl::SvtOptionsDrawinglayer_Impl() :
 }
 
 //*****************************************************************************************************************
-//  destructor
+//	destructor
 //*****************************************************************************************************************
 SvtOptionsDrawinglayer_Impl::~SvtOptionsDrawinglayer_Impl()
 {
@@ -603,12 +603,12 @@ SvtOptionsDrawinglayer_Impl::~SvtOptionsDrawinglayer_Impl()
 }
 
 //*****************************************************************************************************************
-//  Commit
+//	Commit
 //*****************************************************************************************************************
 void SvtOptionsDrawinglayer_Impl::Commit()
 {
-    Sequence< OUString >    aSeqNames( impl_GetPropertyNames() );
-    Sequence< Any >         aSeqValues( aSeqNames.getLength() );
+    Sequence< OUString >	aSeqNames( impl_GetPropertyNames() );
+    Sequence< Any >			aSeqValues( aSeqNames.getLength() );
 
     for( sal_Int32 nProperty = 0, nCount = aSeqNames.getLength(); nProperty < nCount; ++nProperty )
     {
@@ -733,7 +733,7 @@ void SvtOptionsDrawinglayer_Impl::Commit()
 }
 
 //*****************************************************************************************************************
-//  public method
+//	public method
 //*****************************************************************************************************************
 sal_Bool SvtOptionsDrawinglayer_Impl::IsOverlayBuffer() const
 {
@@ -741,7 +741,7 @@ sal_Bool SvtOptionsDrawinglayer_Impl::IsOverlayBuffer() const
 }
 
 //*****************************************************************************************************************
-//  public method
+//	public method
 //*****************************************************************************************************************
 sal_Bool SvtOptionsDrawinglayer_Impl::IsPaintBuffer() const
 {
@@ -749,7 +749,7 @@ sal_Bool SvtOptionsDrawinglayer_Impl::IsPaintBuffer() const
 }
 
 //*****************************************************************************************************************
-//  public method
+//	public method
 //*****************************************************************************************************************
 Color SvtOptionsDrawinglayer_Impl::GetStripeColorA() const
 {
@@ -757,7 +757,7 @@ Color SvtOptionsDrawinglayer_Impl::GetStripeColorA() const
 }
 
 //*****************************************************************************************************************
-//  public method
+//	public method
 //*****************************************************************************************************************
 Color SvtOptionsDrawinglayer_Impl::GetStripeColorB() const
 {
@@ -765,7 +765,7 @@ Color SvtOptionsDrawinglayer_Impl::GetStripeColorB() const
 }
 
 //*****************************************************************************************************************
-//  public method
+//	public method
 //*****************************************************************************************************************
 sal_uInt16 SvtOptionsDrawinglayer_Impl::GetStripeLength() const
 {
@@ -836,7 +836,7 @@ sal_uInt32 SvtOptionsDrawinglayer_Impl::GetMaximumPaperBottomMargin() const
 }
 
 //*****************************************************************************************************************
-//  public method
+//	public method
 //*****************************************************************************************************************
 void SvtOptionsDrawinglayer_Impl::SetOverlayBuffer( sal_Bool bState )
 {
@@ -848,7 +848,7 @@ void SvtOptionsDrawinglayer_Impl::SetOverlayBuffer( sal_Bool bState )
 }
 
 //*****************************************************************************************************************
-//  public method
+//	public method
 //*****************************************************************************************************************
 void SvtOptionsDrawinglayer_Impl::SetPaintBuffer( sal_Bool bState )
 {
@@ -860,7 +860,7 @@ void SvtOptionsDrawinglayer_Impl::SetPaintBuffer( sal_Bool bState )
 }
 
 //*****************************************************************************************************************
-//  public method
+//	public method
 //*****************************************************************************************************************
 void SvtOptionsDrawinglayer_Impl::SetStripeColorA( Color aColor )
 {
@@ -872,7 +872,7 @@ void SvtOptionsDrawinglayer_Impl::SetStripeColorA( Color aColor )
 }
 
 //*****************************************************************************************************************
-//  public method
+//	public method
 //*****************************************************************************************************************
 void SvtOptionsDrawinglayer_Impl::SetStripeColorB( Color aColor )
 {
@@ -884,7 +884,7 @@ void SvtOptionsDrawinglayer_Impl::SetStripeColorB( Color aColor )
 }
 
 //*****************************************************************************************************************
-//  public method
+//	public method
 //*****************************************************************************************************************
 void SvtOptionsDrawinglayer_Impl::SetStripeLength( sal_uInt16 nLength )
 {
@@ -1174,18 +1174,18 @@ sal_uInt16 SvtOptionsDrawinglayer_Impl::GetSelectionMaximumLuminancePercent() co
 }
 
 //*****************************************************************************************************************
-//  private method
+//	private method
 //*****************************************************************************************************************
 Sequence< OUString > SvtOptionsDrawinglayer_Impl::impl_GetPropertyNames()
 {
     // Build static list of configuration key names.
     static const OUString pProperties[] =
     {
-        PROPERTYNAME_OVERLAYBUFFER      ,
-        PROPERTYNAME_PAINTBUFFER        ,
-        PROPERTYNAME_STRIPE_COLOR_A     ,
-        PROPERTYNAME_STRIPE_COLOR_B     ,
-        PROPERTYNAME_STRIPE_LENGTH      ,
+        PROPERTYNAME_OVERLAYBUFFER		,
+        PROPERTYNAME_PAINTBUFFER		,
+        PROPERTYNAME_STRIPE_COLOR_A		,
+        PROPERTYNAME_STRIPE_COLOR_B		,
+        PROPERTYNAME_STRIPE_LENGTH		,
 
         // #i73602#
         PROPERTYNAME_OVERLAYBUFFER_CALC,
@@ -1227,15 +1227,15 @@ Sequence< OUString > SvtOptionsDrawinglayer_Impl::impl_GetPropertyNames()
 }
 
 //*****************************************************************************************************************
-//  initialize static member
-//  DON'T DO IT IN YOUR HEADER!
-//  see definition for further informations
+//	initialize static member
+//	DON'T DO IT IN YOUR HEADER!
+//	see definition for further informations
 //*****************************************************************************************************************
 SvtOptionsDrawinglayer_Impl* SvtOptionsDrawinglayer::m_pDataContainer = NULL;
 sal_Int32 SvtOptionsDrawinglayer::m_nRefCount = 0;
 
 //*****************************************************************************************************************
-//  constructor
+//	constructor
 //*****************************************************************************************************************
 SvtOptionsDrawinglayer::SvtOptionsDrawinglayer()
 {
@@ -1251,7 +1251,7 @@ SvtOptionsDrawinglayer::SvtOptionsDrawinglayer()
 }
 
 //*****************************************************************************************************************
-//  destructor
+//	destructor
 //*****************************************************************************************************************
 SvtOptionsDrawinglayer::~SvtOptionsDrawinglayer()
 {
@@ -1269,7 +1269,7 @@ SvtOptionsDrawinglayer::~SvtOptionsDrawinglayer()
 }
 
 //*****************************************************************************************************************
-//  public method
+//	public method
 //*****************************************************************************************************************
 sal_Bool SvtOptionsDrawinglayer::IsOverlayBuffer() const
 {
@@ -1278,7 +1278,7 @@ sal_Bool SvtOptionsDrawinglayer::IsOverlayBuffer() const
 }
 
 //*****************************************************************************************************************
-//  public method
+//	public method
 //*****************************************************************************************************************
 sal_Bool SvtOptionsDrawinglayer::IsPaintBuffer() const
 {
@@ -1287,7 +1287,7 @@ sal_Bool SvtOptionsDrawinglayer::IsPaintBuffer() const
 }
 
 //*****************************************************************************************************************
-//  public method
+//	public method
 //*****************************************************************************************************************
 Color SvtOptionsDrawinglayer::GetStripeColorA() const
 {
@@ -1296,7 +1296,7 @@ Color SvtOptionsDrawinglayer::GetStripeColorA() const
 }
 
 //*****************************************************************************************************************
-//  public method
+//	public method
 //*****************************************************************************************************************
 Color SvtOptionsDrawinglayer::GetStripeColorB() const
 {
@@ -1305,7 +1305,7 @@ Color SvtOptionsDrawinglayer::GetStripeColorB() const
 }
 
 //*****************************************************************************************************************
-//  public method
+//	public method
 //*****************************************************************************************************************
 sal_uInt16 SvtOptionsDrawinglayer::GetStripeLength() const
 {
@@ -1389,7 +1389,7 @@ sal_uInt32 SvtOptionsDrawinglayer::GetMaximumPaperBottomMargin() const
 }
 
 //*****************************************************************************************************************
-//  public method
+//	public method
 //*****************************************************************************************************************
 void SvtOptionsDrawinglayer::SetOverlayBuffer( sal_Bool bState )
 {
@@ -1398,7 +1398,7 @@ void SvtOptionsDrawinglayer::SetOverlayBuffer( sal_Bool bState )
 }
 
 //*****************************************************************************************************************
-//  public method
+//	public method
 //*****************************************************************************************************************
 void SvtOptionsDrawinglayer::SetPaintBuffer( sal_Bool bState )
 {
@@ -1407,7 +1407,7 @@ void SvtOptionsDrawinglayer::SetPaintBuffer( sal_Bool bState )
 }
 
 //*****************************************************************************************************************
-//  public method
+//	public method
 //*****************************************************************************************************************
 void SvtOptionsDrawinglayer::SetStripeColorA( Color aColor )
 {
@@ -1416,7 +1416,7 @@ void SvtOptionsDrawinglayer::SetStripeColorA( Color aColor )
 }
 
 //*****************************************************************************************************************
-//  public method
+//	public method
 //*****************************************************************************************************************
 void SvtOptionsDrawinglayer::SetStripeColorB( Color aColor )
 {
@@ -1425,7 +1425,7 @@ void SvtOptionsDrawinglayer::SetStripeColorB( Color aColor )
 }
 
 //*****************************************************************************************************************
-//  public method
+//	public method
 //*****************************************************************************************************************
 void SvtOptionsDrawinglayer::SetStripeLength( sal_uInt16 nLength )
 {
@@ -1677,7 +1677,7 @@ void SvtOptionsDrawinglayer::SetSelectionMaximumLuminancePercent( sal_uInt16 nPe
 }
 
 //*****************************************************************************************************************
-//  private method
+//	private method
 //*****************************************************************************************************************
 Mutex& SvtOptionsDrawinglayer::GetOwnStaticMutex()
 {
diff --git a/unotools/source/config/pathoptions.cxx b/unotools/source/config/pathoptions.cxx
index 2ae6f0c97f0c..b02f912a9cf9 100644
--- a/unotools/source/config/pathoptions.cxx
+++ b/unotools/source/config/pathoptions.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
@@ -69,30 +69,30 @@ using namespace com::sun::star::lang;
 
 // define ----------------------------------------------------------------
 
-#define SEARCHPATH_DELIMITER            ';'
+#define SEARCHPATH_DELIMITER			';'
 
-#define ASCII_STR(s)                    OUString( RTL_CONSTASCII_USTRINGPARAM(s) )
+#define ASCII_STR(s)					OUString( RTL_CONSTASCII_USTRINGPARAM(s) )
 
-#define SIGN_STARTVARIABLE              ASCII_STR("$(")
-#define SIGN_ENDVARIABLE                ASCII_STR(")")
+#define	SIGN_STARTVARIABLE				ASCII_STR("$(")
+#define	SIGN_ENDVARIABLE				ASCII_STR(")")
 
 // Supported variables by the old SvtPathOptions implementation
-#define SUBSTITUTE_INST                 "$(inst)"
-#define SUBSTITUTE_PROG                 "$(prog)"
-#define SUBSTITUTE_USER                 "$(user)"
+#define	SUBSTITUTE_INST					"$(inst)"
+#define	SUBSTITUTE_PROG					"$(prog)"
+#define	SUBSTITUTE_USER					"$(user)"
 #define SUBSTITUTE_INSTPATH             "$(instpath)"
 #define SUBSTITUTE_PROGPATH             "$(progpath)"
 #define SUBSTITUTE_USERPATH             "$(userpath)"
-#define SUBSTITUTE_INSTURL              "$(insturl)"
-#define SUBSTITUTE_PROGURL              "$(progurl)"
-#define SUBSTITUTE_USERURL              "$(userurl)"
-#define SUBSTITUTE_PATH                 "$(path)"
-//#define   SUBSTITUTE_LANG                 "$(lang)"
-#define SUBSTITUTE_LANGID               "$(langid)"
-#define SUBSTITUTE_VLANG                "$(vlang)"
-#define SUBSTITUTE_WORKDIRURL           "$(workdirurl)"
+#define	SUBSTITUTE_INSTURL				"$(insturl)"
+#define	SUBSTITUTE_PROGURL				"$(progurl)"
+#define	SUBSTITUTE_USERURL				"$(userurl)"
+#define	SUBSTITUTE_PATH					"$(path)"
+//#define	SUBSTITUTE_LANG					"$(lang)"
+#define	SUBSTITUTE_LANGID				"$(langid)"
+#define	SUBSTITUTE_VLANG				"$(vlang)"
+#define	SUBSTITUTE_WORKDIRURL			"$(workdirurl)"
 
-#define STRPOS_NOTFOUND                 -1
+#define STRPOS_NOTFOUND					-1
 
 struct OUStringHashCode
 {
@@ -108,7 +108,7 @@ enum VarNameProperty
     VAR_NEEDS_FILEURL
 };
 
-class NameToHandleMap : public ::std::hash_map< ::rtl::OUString, sal_Int32, OUStringHashCode, ::std::equal_to< ::rtl::OUString > >
+class NameToHandleMap : public ::std::hash_map<	::rtl::OUString, sal_Int32, OUStringHashCode, ::std::equal_to< ::rtl::OUString > >
 {
     public:
         inline void free() { NameToHandleMap().swap( *this ); }
@@ -132,14 +132,14 @@ class SvtPathOptions_Impl
 {
     private:
         // Local variables to return const references
-        std::vector< String >               m_aPathArray;
-        Reference< XFastPropertySet >       m_xPathSettings;
-        Reference< XStringSubstitution >    m_xSubstVariables;
+        std::vector< String >				m_aPathArray;
+        Reference< XFastPropertySet >		m_xPathSettings;
+        Reference< XStringSubstitution >	m_xSubstVariables;
         mutable EnumToHandleMap             m_aMapEnumToPropHandle;
-        VarNameToEnumMap                    m_aMapVarNamesToEnum;
+        VarNameToEnumMap					m_aMapVarNamesToEnum;
 
-        ::com::sun::star::lang::Locale                      m_aLocale;
-        String                              m_aEmptyString;
+        ::com::sun::star::lang::Locale 						m_aLocale;
+        String								m_aEmptyString;
         mutable ::osl::Mutex                m_aMutex;
 
     public:
@@ -148,60 +148,60 @@ class SvtPathOptions_Impl
         // get the pathes, not const because of using a mutex
         const String&   GetPath( SvtPathOptions::Pathes );
         const String&   GetAddinPath() { return GetPath( SvtPathOptions::PATH_ADDIN ); }
-        const String&   GetAutoCorrectPath() { return GetPath( SvtPathOptions::PATH_AUTOCORRECT ); }
-        const String&   GetAutoTextPath() { return GetPath( SvtPathOptions::PATH_AUTOTEXT ); }
-        const String&   GetBackupPath() { return GetPath( SvtPathOptions::PATH_BACKUP ); }
-        const String&   GetBasicPath() { return GetPath( SvtPathOptions::PATH_BASIC ); }
-        const String&   GetBitmapPath() { return GetPath( SvtPathOptions::PATH_BITMAP ); }
-        const String&   GetConfigPath() { return GetPath( SvtPathOptions::PATH_CONFIG ); }
-        const String&   GetDictionaryPath() { return GetPath( SvtPathOptions::PATH_DICTIONARY ); }
-        const String&   GetFavoritesPath() { return GetPath( SvtPathOptions::PATH_FAVORITES ); }
-        const String&   GetFilterPath() { return GetPath( SvtPathOptions::PATH_FILTER ); }
-        const String&   GetGalleryPath() { return GetPath( SvtPathOptions::PATH_GALLERY ); }
-        const String&   GetGraphicPath() { return GetPath( SvtPathOptions::PATH_GRAPHIC ); }
-        const String&   GetHelpPath() { return GetPath( SvtPathOptions::PATH_HELP ); }
-        const String&   GetLinguisticPath() { return GetPath( SvtPathOptions::PATH_LINGUISTIC ); }
-        const String&   GetModulePath() { return GetPath( SvtPathOptions::PATH_MODULE ); }
-        const String&   GetPalettePath() { return GetPath( SvtPathOptions::PATH_PALETTE ); }
-        const String&   GetPluginPath() { return GetPath( SvtPathOptions::PATH_PLUGIN ); }
-        const String&   GetStoragePath() { return GetPath( SvtPathOptions::PATH_STORAGE ); }
-        const String&   GetTempPath() { return GetPath( SvtPathOptions::PATH_TEMP ); }
-        const String&   GetTemplatePath() { return GetPath( SvtPathOptions::PATH_TEMPLATE ); }
-        const String&   GetUserConfigPath() { return GetPath( SvtPathOptions::PATH_USERCONFIG ); }
-        const String&   GetWorkPath() { return GetPath( SvtPathOptions::PATH_WORK ); }
+        const String&	GetAutoCorrectPath() { return GetPath( SvtPathOptions::PATH_AUTOCORRECT ); }
+        const String&	GetAutoTextPath() { return GetPath( SvtPathOptions::PATH_AUTOTEXT ); }
+        const String&	GetBackupPath() { return GetPath( SvtPathOptions::PATH_BACKUP ); }
+        const String&	GetBasicPath() { return GetPath( SvtPathOptions::PATH_BASIC ); }
+        const String&	GetBitmapPath() { return GetPath( SvtPathOptions::PATH_BITMAP ); }
+        const String&	GetConfigPath() { return GetPath( SvtPathOptions::PATH_CONFIG ); }
+        const String&	GetDictionaryPath() { return GetPath( SvtPathOptions::PATH_DICTIONARY ); }
+        const String&	GetFavoritesPath() { return GetPath( SvtPathOptions::PATH_FAVORITES ); }
+        const String&	GetFilterPath() { return GetPath( SvtPathOptions::PATH_FILTER ); }
+        const String&	GetGalleryPath() { return GetPath( SvtPathOptions::PATH_GALLERY ); }
+        const String&	GetGraphicPath() { return GetPath( SvtPathOptions::PATH_GRAPHIC ); }
+        const String&	GetHelpPath() { return GetPath( SvtPathOptions::PATH_HELP ); }
+        const String&	GetLinguisticPath() { return GetPath( SvtPathOptions::PATH_LINGUISTIC ); }
+        const String&	GetModulePath() { return GetPath( SvtPathOptions::PATH_MODULE ); }
+        const String&	GetPalettePath() { return GetPath( SvtPathOptions::PATH_PALETTE ); }
+        const String&	GetPluginPath() { return GetPath( SvtPathOptions::PATH_PLUGIN ); }
+        const String&	GetStoragePath() { return GetPath( SvtPathOptions::PATH_STORAGE ); }
+        const String&	GetTempPath() { return GetPath( SvtPathOptions::PATH_TEMP ); }
+        const String&	GetTemplatePath() { return GetPath( SvtPathOptions::PATH_TEMPLATE ); }
+        const String&	GetUserConfigPath() { return GetPath( SvtPathOptions::PATH_USERCONFIG ); }
+        const String&	GetWorkPath() { return GetPath( SvtPathOptions::PATH_WORK ); }
         const String&   GetUIConfigPath() { return GetPath( SvtPathOptions::PATH_UICONFIG ); }
         const String&   GetFingerprintPath() { return GetPath( SvtPathOptions::PATH_FINGERPRINT ); }
 
         // set the pathes
         void            SetPath( SvtPathOptions::Pathes, const String& rNewPath );
         void            SetAddinPath( const String& rPath ) { SetPath( SvtPathOptions::PATH_ADDIN, rPath ); }
-        void            SetAutoCorrectPath( const String& rPath ) { SetPath( SvtPathOptions::PATH_AUTOCORRECT, rPath ); }
-        void            SetAutoTextPath( const String& rPath ) { SetPath( SvtPathOptions::PATH_AUTOTEXT, rPath ); }
-        void            SetBackupPath( const String& rPath ) { SetPath( SvtPathOptions::PATH_BACKUP, rPath ); }
-        void            SetBasicPath( const String& rPath ) { SetPath( SvtPathOptions::PATH_BASIC, rPath ); }
-        void            SetBitmapPath( const String& rPath ) { SetPath( SvtPathOptions::PATH_BITMAP, rPath ); }
-        void            SetConfigPath( const String& rPath ) { SetPath( SvtPathOptions::PATH_CONFIG, rPath ); }
-        void            SetDictionaryPath( const String& rPath ) { SetPath( SvtPathOptions::PATH_DICTIONARY, rPath ); }
-        void            SetFavoritesPath( const String& rPath ) { SetPath( SvtPathOptions::PATH_FAVORITES, rPath ); }
-        void            SetFilterPath( const String& rPath ) { SetPath( SvtPathOptions::PATH_FILTER, rPath ); }
-        void            SetGalleryPath( const String& rPath ) { SetPath( SvtPathOptions::PATH_GALLERY, rPath ); }
-        void            SetGraphicPath( const String& rPath ) { SetPath( SvtPathOptions::PATH_GRAPHIC, rPath ); }
-        void            SetHelpPath( const String& rPath ) { SetPath( SvtPathOptions::PATH_HELP, rPath ); }
-        void            SetLinguisticPath( const String& rPath ) { SetPath( SvtPathOptions::PATH_LINGUISTIC, rPath ); }
-        void            SetModulePath( const String& rPath ) { SetPath( SvtPathOptions::PATH_MODULE, rPath ); }
-        void            SetPalettePath( const String& rPath ) { SetPath( SvtPathOptions::PATH_PALETTE, rPath ); }
-        void            SetPluginPath( const String& rPath ) { SetPath( SvtPathOptions::PATH_PLUGIN, rPath ); }
-        void            SetStoragePath( const String& rPath ) { SetPath( SvtPathOptions::PATH_STORAGE, rPath ); }
-        void            SetTempPath( const String& rPath ) { SetPath( SvtPathOptions::PATH_TEMP, rPath ); }
-        void            SetTemplatePath( const String& rPath ) { SetPath( SvtPathOptions::PATH_TEMPLATE, rPath ); }
-        void            SetUserConfigPath( const String& rPath ) { SetPath( SvtPathOptions::PATH_USERCONFIG, rPath ); }
-        void            SetWorkPath( const String& rPath ) { SetPath( SvtPathOptions::PATH_WORK, rPath ); }
-
-        rtl::OUString   SubstVar( const rtl::OUString& rVar );
-        rtl::OUString   SubstituteAndConvert( const rtl::OUString& rPath );
-        rtl::OUString   UsePathVariables( const rtl::OUString& rPath );
-
-        ::com::sun::star::lang::Locale  GetLocale() const { return m_aLocale; }
+        void			SetAutoCorrectPath( const String& rPath ) { SetPath( SvtPathOptions::PATH_AUTOCORRECT, rPath ); }
+        void			SetAutoTextPath( const String& rPath ) { SetPath( SvtPathOptions::PATH_AUTOTEXT, rPath ); }
+        void			SetBackupPath( const String& rPath ) { SetPath( SvtPathOptions::PATH_BACKUP, rPath ); }
+        void			SetBasicPath( const String& rPath ) { SetPath( SvtPathOptions::PATH_BASIC, rPath ); }
+        void			SetBitmapPath( const String& rPath ) { SetPath( SvtPathOptions::PATH_BITMAP, rPath ); }
+        void			SetConfigPath( const String& rPath ) { SetPath( SvtPathOptions::PATH_CONFIG, rPath ); }
+        void			SetDictionaryPath( const String& rPath ) { SetPath( SvtPathOptions::PATH_DICTIONARY, rPath ); }
+        void			SetFavoritesPath( const String& rPath ) { SetPath( SvtPathOptions::PATH_FAVORITES, rPath ); }
+        void			SetFilterPath( const String& rPath ) { SetPath( SvtPathOptions::PATH_FILTER, rPath ); }
+        void			SetGalleryPath( const String& rPath ) { SetPath( SvtPathOptions::PATH_GALLERY, rPath ); }
+        void			SetGraphicPath( const String& rPath ) { SetPath( SvtPathOptions::PATH_GRAPHIC, rPath ); }
+        void			SetHelpPath( const String& rPath ) { SetPath( SvtPathOptions::PATH_HELP, rPath ); }
+        void			SetLinguisticPath( const String& rPath ) { SetPath( SvtPathOptions::PATH_LINGUISTIC, rPath ); }
+        void			SetModulePath( const String& rPath ) { SetPath( SvtPathOptions::PATH_MODULE, rPath ); }
+        void			SetPalettePath( const String& rPath ) { SetPath( SvtPathOptions::PATH_PALETTE, rPath ); }
+        void			SetPluginPath( const String& rPath ) { SetPath( SvtPathOptions::PATH_PLUGIN, rPath ); }
+        void			SetStoragePath( const String& rPath ) { SetPath( SvtPathOptions::PATH_STORAGE, rPath ); }
+        void			SetTempPath( const String& rPath ) { SetPath( SvtPathOptions::PATH_TEMP, rPath ); }
+        void			SetTemplatePath( const String& rPath ) { SetPath( SvtPathOptions::PATH_TEMPLATE, rPath ); }
+        void			SetUserConfigPath( const String& rPath ) { SetPath( SvtPathOptions::PATH_USERCONFIG, rPath ); }
+        void			SetWorkPath( const String& rPath ) { SetPath( SvtPathOptions::PATH_WORK, rPath ); }
+
+        rtl::OUString	SubstVar( const rtl::OUString& rVar );
+        rtl::OUString	SubstituteAndConvert( const rtl::OUString& rPath );
+        rtl::OUString	UsePathVariables( const rtl::OUString& rPath );
+
+        ::com::sun::star::lang::Locale	GetLocale() const { return m_aLocale; }
 
         BOOL            IsPathReadonly(SvtPathOptions::Pathes ePath)const;
 };
@@ -214,50 +214,50 @@ static sal_Int32 nRefCount = 0;
 // functions -------------------------------------------------------------
 struct PropertyStruct
 {
-    const char*             pPropName;  // The ascii name of the Office path
-    SvtPathOptions::Pathes  ePath;      // The enum value used by SvtPathOptions
+    const char*				pPropName;	// The ascii name of the Office path
+    SvtPathOptions::Pathes	ePath;		// The enum value used by SvtPathOptions
 };
 
 struct VarNameAttribute
 {
-    const char*             pVarName;       // The name of the path variable
-    VarNameProperty         eVarProperty;   // Which return value is needed by this path variable
+    const char*				pVarName;		// The name of the path variable
+    VarNameProperty			eVarProperty;	// Which return value is needed by this path variable
 };
 
 static PropertyStruct aPropNames[] =
 {
-    { "Addin",          SvtPathOptions::PATH_ADDIN          },
-    { "AutoCorrect",    SvtPathOptions::PATH_AUTOCORRECT    },
-    { "AutoText",       SvtPathOptions::PATH_AUTOTEXT       },
-    { "Backup",         SvtPathOptions::PATH_BACKUP         },
-    { "Basic",          SvtPathOptions::PATH_BASIC          },
-    { "Bitmap",         SvtPathOptions::PATH_BITMAP         },
-    { "Config",         SvtPathOptions::PATH_CONFIG         },
-    { "Dictionary",     SvtPathOptions::PATH_DICTIONARY     },
-    { "Favorite",       SvtPathOptions::PATH_FAVORITES      },
-    { "Filter",         SvtPathOptions::PATH_FILTER         },
-    { "Gallery",        SvtPathOptions::PATH_GALLERY        },
-    { "Graphic",        SvtPathOptions::PATH_GRAPHIC        },
-    { "Help",           SvtPathOptions::PATH_HELP           },
-    { "Linguistic",     SvtPathOptions::PATH_LINGUISTIC     },
-    { "Module",         SvtPathOptions::PATH_MODULE         },
-    { "Palette",        SvtPathOptions::PATH_PALETTE        },
-    { "Plugin",         SvtPathOptions::PATH_PLUGIN         },
-    { "Storage",        SvtPathOptions::PATH_STORAGE        },
-    { "Temp",           SvtPathOptions::PATH_TEMP           },
-    { "Template",       SvtPathOptions::PATH_TEMPLATE       },
-    { "UserConfig",     SvtPathOptions::PATH_USERCONFIG     },
-    { "Work",           SvtPathOptions::PATH_WORK           },
-    { "UIConfig",       SvtPathOptions::PATH_UICONFIG       },
-    { "Fingerprint",    SvtPathOptions::PATH_FINGERPRINT    }
+    { "Addin",			SvtPathOptions::PATH_ADDIN			},
+    { "AutoCorrect",	SvtPathOptions::PATH_AUTOCORRECT	},
+    { "AutoText",		SvtPathOptions::PATH_AUTOTEXT		},
+    { "Backup",			SvtPathOptions::PATH_BACKUP			},
+    { "Basic",			SvtPathOptions::PATH_BASIC			},
+    { "Bitmap",			SvtPathOptions::PATH_BITMAP			},
+    { "Config",			SvtPathOptions::PATH_CONFIG			},
+    { "Dictionary",		SvtPathOptions::PATH_DICTIONARY		},
+    { "Favorite",		SvtPathOptions::PATH_FAVORITES		},
+    { "Filter",			SvtPathOptions::PATH_FILTER			},
+    { "Gallery",		SvtPathOptions::PATH_GALLERY		},
+    { "Graphic",		SvtPathOptions::PATH_GRAPHIC		},
+    { "Help",			SvtPathOptions::PATH_HELP			},
+    { "Linguistic",		SvtPathOptions::PATH_LINGUISTIC		},
+    { "Module",			SvtPathOptions::PATH_MODULE			},
+    { "Palette",		SvtPathOptions::PATH_PALETTE		},
+    { "Plugin",			SvtPathOptions::PATH_PLUGIN			},
+    { "Storage",		SvtPathOptions::PATH_STORAGE		},
+    { "Temp",			SvtPathOptions::PATH_TEMP			},
+    { "Template",		SvtPathOptions::PATH_TEMPLATE		},
+    { "UserConfig",		SvtPathOptions::PATH_USERCONFIG		},
+    { "Work",           SvtPathOptions::PATH_WORK			},
+    { "UIConfig",       SvtPathOptions::PATH_UICONFIG		},
+    { "Fingerprint",    SvtPathOptions::PATH_FINGERPRINT	}
 };
 
 static VarNameAttribute aVarNameAttribute[] =
 {
-    { SUBSTITUTE_INSTPATH,  VAR_NEEDS_SYSTEM_PATH },    // $(instpath)
-    { SUBSTITUTE_PROGPATH,  VAR_NEEDS_SYSTEM_PATH },    // $(progpath)
-    { SUBSTITUTE_USERPATH,  VAR_NEEDS_SYSTEM_PATH },    // $(userpath)
-    { SUBSTITUTE_PATH,      VAR_NEEDS_SYSTEM_PATH },    // $(path)
+    { SUBSTITUTE_INSTPATH,	VAR_NEEDS_SYSTEM_PATH },	// $(instpath)
+    { SUBSTITUTE_PROGPATH,	VAR_NEEDS_SYSTEM_PATH },	// $(progpath)
+    { SUBSTITUTE_USERPATH,	VAR_NEEDS_SYSTEM_PATH },	// $(userpath)
+    { SUBSTITUTE_PATH,		VAR_NEEDS_SYSTEM_PATH },	// $(path)
 };
 
 #if 0
@@ -282,12 +282,12 @@ const String& SvtPathOptions_Impl::GetPath( SvtPathOptions::Pathes ePath )
 
     if ( ePath < SvtPathOptions::PATH_COUNT )
     {
-        OUString    aPathValue;
-        String      aResult;
-        sal_Int32   nHandle = m_aMapEnumToPropHandle[ (sal_Int32)ePath ];
+        OUString 	aPathValue;
+        String		aResult;
+        sal_Int32	nHandle = m_aMapEnumToPropHandle[ (sal_Int32)ePath ];
 
         // Substitution is done by the service itself using the substition service
-        Any         a = m_xPathSettings->getFastPropertyValue( nHandle );
+        Any 		a = m_xPathSettings->getFastPropertyValue( nHandle );
         a >>= aPathValue;
         if( ePath == SvtPathOptions::PATH_ADDIN     ||
             ePath == SvtPathOptions::PATH_FILTER    ||
@@ -335,9 +335,9 @@ void SvtPathOptions_Impl::SetPath( SvtPathOptions::Pathes ePath, const String& r
 
     if ( ePath < SvtPathOptions::PATH_COUNT )
     {
-        String      aResult;
-        OUString    aNewValue;
-        Any         a;
+        String 		aResult;
+        OUString	aNewValue;
+        Any			a;
 
         switch ( ePath )
         {
@@ -395,8 +395,8 @@ OUString SvtPathOptions_Impl::SubstVar( const OUString& rVar )
     BOOL bConvertLocal = FALSE;
 
     // Search for first occure of "$(...".
-    sal_Int32 nPosition = aWorkText.indexOf( SIGN_STARTVARIABLE );  // = first position of "$(" in string
-    sal_Int32 nLength   = 0;                                        // = count of letters from "$(" to ")" in string
+    sal_Int32 nPosition	= aWorkText.indexOf( SIGN_STARTVARIABLE );	// = first position of "$(" in string
+    sal_Int32 nLength	= 0;										// = count of letters from "$(" to ")" in string
 
     // Have we found any variable like "$(...)"?
     if ( nPosition != STRPOS_NOTFOUND )
@@ -439,7 +439,7 @@ OUString SvtPathOptions_Impl::SubstVar( const OUString& rVar )
             if ( nPosition != STRPOS_NOTFOUND )
             {
                 // Yes; Get length of found variable. If no ")" was found - nLength must set to 0!
-                nLength = 0;
+                nLength	= 0;
                 sal_Int32 nEndPosition = aWorkText.indexOf( SIGN_ENDVARIABLE, nPosition );
                 if ( nEndPosition != STRPOS_NOTFOUND )
                     nLength = nEndPosition - nPosition + 1;
@@ -516,8 +516,8 @@ SvtPathOptions_Impl::SvtPathOptions_Impl() :
 
         if ( pIter != aTempHashMap.end() )
         {
-            sal_Int32 nHandle   = pIter->second;
-            sal_Int32 nEnum     = aPropNames[i].ePath;
+            sal_Int32 nHandle	= pIter->second;
+            sal_Int32 nEnum		= aPropNames[i].ePath;
             m_aMapEnumToPropHandle.insert( EnumToHandleMap::value_type( nEnum, nHandle ));
         }
     }
@@ -958,30 +958,30 @@ sal_Bool SvtPathOptions::SearchFile( String& rIniFile, Pathes ePath )
             String aPath;
             switch ( ePath )
             {
-                case PATH_ADDIN:        aPath = GetAddinPath();         break;
-                case PATH_AUTOCORRECT:  aPath = GetAutoCorrectPath();   break;
-                case PATH_AUTOTEXT:     aPath = GetAutoTextPath();      break;
-                case PATH_BACKUP:       aPath = GetBackupPath();        break;
-                case PATH_BASIC:        aPath = GetBasicPath();         break;
-                case PATH_BITMAP:       aPath = GetBitmapPath();        break;
-                case PATH_CONFIG:       aPath = GetConfigPath();        break;
-                case PATH_DICTIONARY:   aPath = GetDictionaryPath();    break;
-                case PATH_FAVORITES:    aPath = GetFavoritesPath();     break;
-                case PATH_FILTER:       aPath = GetFilterPath();        break;
-                case PATH_GALLERY:      aPath = GetGalleryPath();       break;
-                case PATH_GRAPHIC:      aPath = GetGraphicPath();       break;
-                case PATH_HELP:         aPath = GetHelpPath();          break;
-                case PATH_LINGUISTIC:   aPath = GetLinguisticPath();    break;
-                case PATH_MODULE:       aPath = GetModulePath();        break;
-                case PATH_PALETTE:      aPath = GetPalettePath();       break;
-                case PATH_PLUGIN:       aPath = GetPluginPath();        break;
-                case PATH_STORAGE:      aPath = GetStoragePath();       break;
-                case PATH_TEMP:         aPath = GetTempPath();          break;
-                case PATH_TEMPLATE:     aPath = GetTemplatePath();      break;
-                case PATH_WORK:         aPath = GetWorkPath();          break;
+                case PATH_ADDIN:		aPath = GetAddinPath();			break;
+                case PATH_AUTOCORRECT:	aPath = GetAutoCorrectPath();	break;
+                case PATH_AUTOTEXT:		aPath = GetAutoTextPath();		break;
+                case PATH_BACKUP:		aPath = GetBackupPath();		break;
+                case PATH_BASIC:		aPath = GetBasicPath();			break;
+                case PATH_BITMAP:		aPath = GetBitmapPath();		break;
+                case PATH_CONFIG:		aPath = GetConfigPath();		break;
+                case PATH_DICTIONARY:	aPath = GetDictionaryPath();	break;
+                case PATH_FAVORITES:	aPath = GetFavoritesPath();		break;
+                case PATH_FILTER:		aPath = GetFilterPath();		break;
+                case PATH_GALLERY:		aPath = GetGalleryPath();		break;
+                case PATH_GRAPHIC:		aPath = GetGraphicPath();		break;
+                case PATH_HELP:			aPath = GetHelpPath();			break;
+                case PATH_LINGUISTIC:	aPath = GetLinguisticPath();	break;
+                case PATH_MODULE:		aPath = GetModulePath();		break;
+                case PATH_PALETTE:		aPath = GetPalettePath();		break;
+                case PATH_PLUGIN:		aPath = GetPluginPath();		break;
+                case PATH_STORAGE:		aPath = GetStoragePath();		break;
+                case PATH_TEMP:			aPath = GetTempPath();			break;
+                case PATH_TEMPLATE:		aPath = GetTemplatePath();		break;
+                case PATH_WORK:			aPath = GetWorkPath();			break;
                 case PATH_UICONFIG:     aPath = GetUIConfigPath();      break;
                 case PATH_FINGERPRINT:  aPath = GetFingerprintPath();    break;
-                case PATH_USERCONFIG:/*-Wall???*/           break;
+                case PATH_USERCONFIG:/*-Wall???*/			break;
                 case PATH_COUNT: /*-Wall???*/ break;
             }
 
@@ -1049,14 +1049,14 @@ void SvtPathOptions::SetPath( SvtPathOptions::Pathes ePath, const String& rNewPa
 
 class PathService : public ::cppu::WeakImplHelper2< ::com::sun::star::frame::XConfigManager, ::com::sun::star::lang::XServiceInfo >
 {
-    virtual ::rtl::OUString SAL_CALL    getImplementationName(  ) throw(::com::sun::star::uno::RuntimeException);
-    virtual sal_Bool SAL_CALL           supportsService( const ::rtl::OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException);
+    virtual ::rtl::OUString	SAL_CALL	getImplementationName(  ) throw(::com::sun::star::uno::RuntimeException);
+    virtual sal_Bool SAL_CALL			supportsService( const ::rtl::OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException);
     virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL
                                         getSupportedServiceNames(  ) throw(::com::sun::star::uno::RuntimeException);
-    virtual ::rtl::OUString SAL_CALL    substituteVariables( const ::rtl::OUString& sText ) throw(::com::sun::star::uno::RuntimeException);
-    virtual void SAL_CALL               addPropertyChangeListener( const ::rtl::OUString& sKeyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw(::com::sun::star::uno::RuntimeException);
-    virtual void SAL_CALL               removePropertyChangeListener( const ::rtl::OUString& sKeyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw(::com::sun::star::uno::RuntimeException);
-    virtual void SAL_CALL               flush(  ) throw(::com::sun::star::uno::RuntimeException);
+    virtual ::rtl::OUString SAL_CALL	substituteVariables( const ::rtl::OUString& sText ) throw(::com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL				addPropertyChangeListener( const ::rtl::OUString& sKeyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw(::com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL				removePropertyChangeListener( const ::rtl::OUString& sKeyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw(::com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL				flush(  ) throw(::com::sun::star::uno::RuntimeException);
 };
 
 // class PathService -----------------------------------------------------
diff --git a/unotools/source/config/printwarningoptions.cxx b/unotools/source/config/printwarningoptions.cxx
index d723b3c068d4..482b267970cb 100644
--- a/unotools/source/config/printwarningoptions.cxx
+++ b/unotools/source/config/printwarningoptions.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
@@ -31,7 +31,7 @@
 #endif
 
 //_________________________________________________________________________________________________________________
-//  includes
+//	includes
 //_________________________________________________________________________________________________________________
 
 #include <unotools/printwarningoptions.hxx>
@@ -44,16 +44,16 @@
 #include <itemholder1.hxx>
 
 //_________________________________________________________________________________________________________________
-//  namespaces
+//	namespaces
 //_________________________________________________________________________________________________________________
 
-using namespace ::utl                   ;
-using namespace ::rtl                   ;
-using namespace ::osl                   ;
-using namespace ::com::sun::star::uno   ;
+using namespace ::utl					;
+using namespace ::rtl					;
+using namespace ::osl					;
+using namespace ::com::sun::star::uno	;
 
 //_________________________________________________________________________________________________________________
-//  const
+//	const
 //_________________________________________________________________________________________________________________
 
 #define ROOTNODE_START                  OUString(RTL_CONSTASCII_USTRINGPARAM("Office.Common/Print"))
@@ -64,10 +64,10 @@ using namespace ::com::sun::star::uno   ;
 #define PROPERTYNAME_TRANSPARENCY       OUString(RTL_CONSTASCII_USTRINGPARAM("Warning/Transparency"))
 #define PROPERTYNAME_PRINTINGMODIFIESDOCUMENT  OUString(RTL_CONSTASCII_USTRINGPARAM("PrintingModifiesDocument"))
 
-#define PROPERTYHANDLE_PAPERSIZE        0
-#define PROPERTYHANDLE_PAPERORIENTATION 1
-#define PROPERTYHANDLE_NOTFOUND         2
-#define PROPERTYHANDLE_TRANSPARENCY     3
+#define	PROPERTYHANDLE_PAPERSIZE		0
+#define	PROPERTYHANDLE_PAPERORIENTATION	1
+#define	PROPERTYHANDLE_NOTFOUND	        2
+#define	PROPERTYHANDLE_TRANSPARENCY 	3
 #define PROPERTYHDL_PRINTINGMODIFIESDOCUMENT            4
 
 #define PROPERTYCOUNT                   5
@@ -77,37 +77,37 @@ class SvtPrintWarningOptions_Impl : public ConfigItem
 public:
 
 //---------------------------------------------------------------------------------------------------------
-//  constructor / destructor
+//	constructor / destructor
 //---------------------------------------------------------------------------------------------------------
 
      SvtPrintWarningOptions_Impl();
     ~SvtPrintWarningOptions_Impl();
 
 //---------------------------------------------------------------------------------------------------------
-//  overloaded methods of baseclass
+//	overloaded methods of baseclass
 //---------------------------------------------------------------------------------------------------------
 
     virtual void Commit();
     virtual void    Notify( const com::sun::star::uno::Sequence< rtl::OUString >& aPropertyNames );
 
 //---------------------------------------------------------------------------------------------------------
-//  public interface
+//	public interface
 //---------------------------------------------------------------------------------------------------------
 
-    sal_Bool    IsPaperSize() const { return m_bPaperSize; }
-    sal_Bool    IsPaperOrientation() const { return m_bPaperOrientation; }
-    sal_Bool    IsNotFound() const { return m_bNotFound; }
-    sal_Bool    IsTransparency() const { return m_bTransparency; }
+    sal_Bool	IsPaperSize() const { return m_bPaperSize; }
+    sal_Bool	IsPaperOrientation() const { return m_bPaperOrientation; }
+    sal_Bool	IsNotFound() const { return m_bNotFound; }
+    sal_Bool	IsTransparency() const { return m_bTransparency; }
     sal_Bool    IsModifyDocumentOnPrintingAllowed() const { return m_bModifyDocumentOnPrintingAllowed; }
 
-    void        SetPaperSize( sal_Bool bState ) { m_bPaperSize = bState; SetModified(); }
-    void        SetPaperOrientation( sal_Bool bState ) { m_bPaperOrientation = bState; SetModified(); }
-    void        SetNotFound( sal_Bool bState ) { m_bNotFound = bState; SetModified(); }
-    void        SetTransparency( sal_Bool bState ) { m_bTransparency = bState; SetModified(); }
+    void		SetPaperSize( sal_Bool bState ) { m_bPaperSize = bState; SetModified(); }
+    void		SetPaperOrientation( sal_Bool bState ) { m_bPaperOrientation = bState; SetModified(); }
+    void		SetNotFound( sal_Bool bState ) { m_bNotFound = bState; SetModified(); }
+    void		SetTransparency( sal_Bool bState ) { m_bTransparency = bState; SetModified(); }
     void        SetModifyDocumentOnPrintingAllowed( sal_Bool bState ) { m_bModifyDocumentOnPrintingAllowed = bState; SetModified(); }
 
 //-------------------------------------------------------------------------------------------------------------
-//  private methods
+//	private methods
 //-------------------------------------------------------------------------------------------------------------
 
 private:
@@ -115,41 +115,41 @@ private:
     static Sequence< OUString > impl_GetPropertyNames();
 
 //-------------------------------------------------------------------------------------------------------------
-//  private member
+//	private member
 //-------------------------------------------------------------------------------------------------------------
 
 private:
 
-    sal_Bool    m_bPaperSize;
-    sal_Bool    m_bPaperOrientation;
-    sal_Bool    m_bNotFound;
-    sal_Bool    m_bTransparency;
+    sal_Bool	m_bPaperSize;
+    sal_Bool	m_bPaperOrientation;
+    sal_Bool	m_bNotFound;
+    sal_Bool	m_bTransparency;
     sal_Bool    m_bModifyDocumentOnPrintingAllowed;
 };
 
 //_________________________________________________________________________________________________________________
-//  definitions
+//	definitions
 //_________________________________________________________________________________________________________________
 
 //*****************************************************************************************************************
-//  constructor
+//	constructor
 //*****************************************************************************************************************
 SvtPrintWarningOptions_Impl::SvtPrintWarningOptions_Impl() :
-    ConfigItem( ROOTNODE_START  ),
+    ConfigItem( ROOTNODE_START	),
     m_bPaperSize( sal_False ),
     m_bPaperOrientation( sal_False ),
     m_bNotFound( sal_False ),
     m_bTransparency( sal_True ),
     m_bModifyDocumentOnPrintingAllowed( sal_True )
 {
-    Sequence< OUString >    seqNames( impl_GetPropertyNames() );
-    Sequence< Any >         seqValues( GetProperties( seqNames ) );
+    Sequence< OUString >	seqNames( impl_GetPropertyNames() );
+    Sequence< Any >			seqValues( GetProperties( seqNames ) );
 
     DBG_ASSERT( !(seqNames.getLength()!=seqValues.getLength()), "SvtPrintWarningOptions_Impl::SvtPrintWarningOptions_Impl()\nI miss some values of configuration keys!\n" );
 
     // Copy values from list in right order to our internal member.
     sal_Int32 nPropertyCount = seqValues.getLength();
-    sal_Int32 nProperty = 0;
+    sal_Int32 nProperty	= 0;
 
     for( nProperty=0; nProperty<nPropertyCount; ++nProperty )
     {
@@ -196,7 +196,7 @@ SvtPrintWarningOptions_Impl::SvtPrintWarningOptions_Impl() :
 }
 
 //*****************************************************************************************************************
-//  destructor
+//	destructor
 //*****************************************************************************************************************
 SvtPrintWarningOptions_Impl::~SvtPrintWarningOptions_Impl()
 {
@@ -205,12 +205,12 @@ SvtPrintWarningOptions_Impl::~SvtPrintWarningOptions_Impl()
 }
 
 //*****************************************************************************************************************
-//  Commit
+//	Commit
 //*****************************************************************************************************************
 void SvtPrintWarningOptions_Impl::Commit()
 {
-    Sequence< OUString >    aSeqNames( impl_GetPropertyNames() );
-    Sequence< Any >         aSeqValues( aSeqNames.getLength() );
+    Sequence< OUString >	aSeqNames( impl_GetPropertyNames() );
+    Sequence< Any >			aSeqValues( aSeqNames.getLength() );
 
     for( sal_Int32 nProperty = 0, nCount = aSeqNames.getLength(); nProperty < nCount; ++nProperty )
     {
@@ -245,7 +245,7 @@ void SvtPrintWarningOptions_Impl::Notify( const Sequence< rtl::OUString >&  )
 }
 
 //*****************************************************************************************************************
-//  private method
+//	private method
 //*****************************************************************************************************************
 Sequence< OUString > SvtPrintWarningOptions_Impl::impl_GetPropertyNames()
 {
@@ -266,15 +266,15 @@ Sequence< OUString > SvtPrintWarningOptions_Impl::impl_GetPropertyNames()
 }
 
 //*****************************************************************************************************************
-//  initialize static member
-//  DON'T DO IT IN YOUR HEADER!
-//  see definition for further informations
+//	initialize static member
+//	DON'T DO IT IN YOUR HEADER!
+//	see definition for further informations
 //*****************************************************************************************************************
 SvtPrintWarningOptions_Impl*    SvtPrintWarningOptions::m_pDataContainer = NULL;
-sal_Int32                       SvtPrintWarningOptions::m_nRefCount = 0;
+sal_Int32				        SvtPrintWarningOptions::m_nRefCount = 0;
 
 //*****************************************************************************************************************
-//  constructor
+//	constructor
 //*****************************************************************************************************************
 SvtPrintWarningOptions::SvtPrintWarningOptions()
 {
@@ -291,7 +291,7 @@ SvtPrintWarningOptions::SvtPrintWarningOptions()
 }
 
 //*****************************************************************************************************************
-//  destructor
+//	destructor
 //*****************************************************************************************************************
 SvtPrintWarningOptions::~SvtPrintWarningOptions()
 {
@@ -309,7 +309,7 @@ SvtPrintWarningOptions::~SvtPrintWarningOptions()
 }
 
 //*****************************************************************************************************************
-//  public method
+//	public method
 //*****************************************************************************************************************
 sal_Bool SvtPrintWarningOptions::IsPaperSize() const
 {
@@ -318,7 +318,7 @@ sal_Bool SvtPrintWarningOptions::IsPaperSize() const
 }
 
 //*****************************************************************************************************************
-//  public method
+//	public method
 //*****************************************************************************************************************
 sal_Bool SvtPrintWarningOptions::IsPaperOrientation() const
 {
@@ -327,7 +327,7 @@ sal_Bool SvtPrintWarningOptions::IsPaperOrientation() const
 }
 
 //*****************************************************************************************************************
-//  public method
+//	public method
 //*****************************************************************************************************************
 sal_Bool SvtPrintWarningOptions::IsNotFound() const
 {
@@ -336,7 +336,7 @@ sal_Bool SvtPrintWarningOptions::IsNotFound() const
 }
 
 //*****************************************************************************************************************
-//  public method
+//	public method
 //*****************************************************************************************************************
 sal_Bool SvtPrintWarningOptions::IsTransparency() const
 {
@@ -345,7 +345,7 @@ sal_Bool SvtPrintWarningOptions::IsTransparency() const
 }
 
 //*****************************************************************************************************************
-//  public method
+//	public method
 //*****************************************************************************************************************
 void SvtPrintWarningOptions::SetPaperSize( sal_Bool bState )
 {
@@ -354,7 +354,7 @@ void SvtPrintWarningOptions::SetPaperSize( sal_Bool bState )
 }
 
 //*****************************************************************************************************************
-//  public method
+//	public method
 //*****************************************************************************************************************
 void SvtPrintWarningOptions::SetPaperOrientation( sal_Bool bState )
 {
@@ -363,7 +363,7 @@ void SvtPrintWarningOptions::SetPaperOrientation( sal_Bool bState )
 }
 
 //*****************************************************************************************************************
-//  public method
+//	public method
 //*****************************************************************************************************************
 void SvtPrintWarningOptions::SetNotFound( sal_Bool bState )
 {
@@ -372,7 +372,7 @@ void SvtPrintWarningOptions::SetNotFound( sal_Bool bState )
 }
 
 //*****************************************************************************************************************
-//  public method
+//	public method
 //*****************************************************************************************************************
 void SvtPrintWarningOptions::SetTransparency( sal_Bool bState )
 {
@@ -396,7 +396,7 @@ void SvtPrintWarningOptions::SetModifyDocumentOnPrintingAllowed( sal_Bool bState
 }
 
 //*****************************************************************************************************************
-//  private method
+//	private method
 //*****************************************************************************************************************
 Mutex& SvtPrintWarningOptions::GetOwnStaticMutex()
 {
diff --git a/unotools/source/config/regoptions.cxx b/unotools/source/config/regoptions.cxx
index 81f089919dfd..1aa06418b75d 100644
--- a/unotools/source/config/regoptions.cxx
+++ b/unotools/source/config/regoptions.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
@@ -56,20 +56,20 @@ namespace utl
     static sal_Int32 lcl_convertString2Date( const ::rtl::OUString& _rStringRep )
     {
         sal_Int32 nDateIntRep = 0;
-        if ( _rStringRep.getLength() == 2 + 1 + 2 + 1 + 4 ) // DD.MM.YYYY
+        if ( _rStringRep.getLength() == 2 + 1 + 2 + 1 + 4 )	// DD.MM.YYYY
         {
             // validate the string
             sal_Bool bValid = sal_True;
 
             const sal_Unicode* pStringRep = _rStringRep.getStr();
             sal_Int32 nLen = _rStringRep.getLength();
-            for (   sal_Int32 nPos = 0;
+            for	(	sal_Int32 nPos = 0;
                     bValid && ( nPos < nLen );
                     ++nPos, ++pStringRep
                 )
             {
                 if ( ( 2 == nPos ) || ( 5 == nPos ) )
-                    bValid = '.' == *pStringRep;        // the number separators
+                    bValid = '.' == *pStringRep;		// the number separators
                 else
                     bValid = ( *pStringRep >= '0' ) && ( *pStringRep <= '9' );
             }
@@ -78,9 +78,9 @@ namespace utl
             if ( bValid )
             {
                 Date aDate;
-                aDate.SetDay    ( (USHORT)_rStringRep.copy( 0, 2 ).toInt32( ) );
-                aDate.SetMonth  ( (USHORT)_rStringRep.copy( 3, 2 ).toInt32( ) );
-                aDate.SetYear   ( (USHORT)_rStringRep.copy( 6, 4 ).toInt32( ) );
+                aDate.SetDay	( (USHORT)_rStringRep.copy( 0, 2 ).toInt32( ) );
+                aDate.SetMonth	( (USHORT)_rStringRep.copy( 3, 2 ).toInt32( ) );
+                aDate.SetYear	( (USHORT)_rStringRep.copy( 6, 4 ).toInt32( ) );
                 nDateIntRep = aDate.GetDate();
             }
         }
@@ -95,7 +95,7 @@ namespace utl
         ::rtl::OUString sLeanToken = ::rtl::OUString::valueOf( _nToken );
         // check length
         if ( sLeanToken.getLength() < _nDigits )
-        {   // fill
+        {	// fill
             OSL_ENSURE( _nDigits <= 4, "lcl_fillToken: invalid digit number!" );
             _rToken = ::rtl::OUString( "0000", _nDigits - sLeanToken.getLength(), RTL_TEXTENCODING_ASCII_US );
             _rToken += sLeanToken;
@@ -135,11 +135,11 @@ namespace utl
     }
 
     //--------------------------------------------------------------------
-    #define DECLARE_STATIC_LAZY_USTRING( name ) \
-    static const ::rtl::OUString& lcl_get##name##Name() \
-    {   \
-        static const ::rtl::OUString sName = ::rtl::OUString::createFromAscii( #name ); \
-        return sName;   \
+    #define DECLARE_STATIC_LAZY_USTRING( name )	\
+    static const ::rtl::OUString& lcl_get##name##Name()	\
+    {	\
+        static const ::rtl::OUString sName = ::rtl::OUString::createFromAscii( #name );	\
+        return sName;	\
     }
 
     DECLARE_STATIC_LAZY_USTRING( ReminderDate );
@@ -153,47 +153,47 @@ namespace utl
     class RegOptionsImpl
     {
     private:
-        OConfigurationTreeRoot  m_aRegistrationNode;        // the configuration node we need to access our persistent data
+        OConfigurationTreeRoot	m_aRegistrationNode;		// the configuration node we need to access our persistent data
 
-        String                  m_sRegistrationURL;         // the URL to use when doing an online registration
-        Date                    m_aReminderDate;            // the reminder date as found in the configuration
-        sal_Int32               m_nDialogCounter;           // the dialog counter - see getDialogPermission
-        sal_Bool                m_bShowMenuItem;            // the flag indicating if the registration menu item is allowed
+        String					m_sRegistrationURL;			// the URL to use when doing an online registration
+        Date					m_aReminderDate;			// the reminder date as found in the configuration
+        sal_Int32				m_nDialogCounter;			// the dialog counter - see getDialogPermission
+        sal_Bool				m_bShowMenuItem;			// the flag indicating if the registration menu item is allowed
 
-        static  RegOptionsImpl* s_pSingleInstance;          // the one and only instance of this class
-        static  sal_Int32       s_nInstanceCount;           // reference counter for the instances
-        static  sal_Bool        s_bThisSessionDone;         // the flag indicating if for this session, everything beeing relevant has already been done
+        static	RegOptionsImpl*	s_pSingleInstance;			// the one and only instance of this class
+        static	sal_Int32		s_nInstanceCount;			// reference counter for the instances
+        static	sal_Bool		s_bThisSessionDone;			// the flag indicating if for this session, everything beeing relevant has already been done
 
     private:
         RegOptionsImpl( );
 
-        static  ::osl::Mutex&   getStaticMutex();           // get the mutex used to protect the static members of this class
+        static	::osl::Mutex&	getStaticMutex();			// get the mutex used to protect the static members of this class
 
-        void                    commit( );
+        void					commit( );
         sal_Int32               getBuildId() const;
 
     private:
-        RegOptions::DialogPermission    implGetDialogPermission( ) const;
+        RegOptions::DialogPermission	implGetDialogPermission( ) const;
 
     public:
-        static RegOptionsImpl*  registerClient( );
-        static void             revokeClient( );
+        static RegOptionsImpl*	registerClient( );
+        static void				revokeClient( );
 
-        inline sal_Bool         hasURL( ) const             { return ( 0 != m_sRegistrationURL.Len() ); }
-        inline sal_Bool         allowMenu( ) const          { return hasURL() && m_bShowMenuItem; }
-        inline String           getRegistrationURL( ) const { return m_sRegistrationURL; }
+        inline sal_Bool			hasURL( ) const				{ return ( 0 != m_sRegistrationURL.Len() ); }
+        inline sal_Bool			allowMenu( ) const			{ return hasURL() && m_bShowMenuItem; }
+        inline String			getRegistrationURL( ) const	{ return m_sRegistrationURL; }
 
-        RegOptions::DialogPermission    getDialogPermission( ) const;
-        void                            markSessionDone( );
+        RegOptions::DialogPermission	getDialogPermission( ) const;
+        void							markSessionDone( );
         void                            activateReminder( sal_Int32 _nDaysFromNow );
         void                            removeReminder();
         bool                            hasReminderDateCome() const;
     };
 
     //--------------------------------------------------------------------
-    RegOptionsImpl* RegOptionsImpl::s_pSingleInstance = NULL;
-    sal_Bool        RegOptionsImpl::s_bThisSessionDone = sal_False;
-    sal_Int32       RegOptionsImpl::s_nInstanceCount = 0;
+    RegOptionsImpl*	RegOptionsImpl::s_pSingleInstance = NULL;
+    sal_Bool		RegOptionsImpl::s_bThisSessionDone = sal_False;
+    sal_Int32		RegOptionsImpl::s_nInstanceCount = 0;
 
     //--------------------------------------------------------------------
     ::osl::Mutex& RegOptionsImpl::getStaticMutex()
@@ -252,8 +252,8 @@ namespace utl
 
     //--------------------------------------------------------------------
     RegOptionsImpl::RegOptionsImpl( )
-        :m_nDialogCounter   ( 0 )
-        ,m_bShowMenuItem    ( sal_False )
+        :m_nDialogCounter	( 0 )
+        ,m_bShowMenuItem	( sal_False )
     {
         // create the config node for all our registration information
         m_aRegistrationNode = OConfigurationTreeRoot::createWithServiceFactory(
@@ -297,7 +297,7 @@ namespace utl
             if ( 1 == m_nDialogCounter )
             {
                 if ( m_aReminderDate.IsValid( ) )
-                {   // valid reminder date
+                {	// valid reminder date
                     // assume remind later
                     eResult = RegOptions::dpRemindLater;
                     // and check if we reached the reminder date
@@ -305,16 +305,16 @@ namespace utl
                         eResult = RegOptions::dpThisSession;
                 }
                 else
-                    eResult = RegOptions::dpThisSession;    // execute in this session
+                    eResult = RegOptions::dpThisSession;	// execute in this session
             }
             else
-                eResult = RegOptions::dpNotThisSession;     // first trigger session not reached
+                eResult = RegOptions::dpNotThisSession;		// first trigger session not reached
 
             // a last check ....
-            if  (   ( s_bThisSessionDone )                  // this session is already marked as "done"
-                &&  ( RegOptions::dpThisSession == eResult )// but without this, the state would be "now"
+            if	(	( s_bThisSessionDone )					// this session is already marked as "done"
+                &&	( RegOptions::dpThisSession == eResult )// but without this, the state would be "now"
                 )
-                eResult = RegOptions::dpDisabled;           // -> change state to "disabled"
+                eResult = RegOptions::dpDisabled;			// -> change state to "disabled"
         }
 
         return eResult;
@@ -337,7 +337,7 @@ namespace utl
         OSL_ENSURE( _nDaysFromNow > 0, "RegOptionsImpl::activateReminder: invalid argument!" );
 
         // calc the reminder
-        m_aReminderDate = Date() + _nDaysFromNow;   // today (default ctor) + days
+        m_aReminderDate = Date() + _nDaysFromNow;	// today (default ctor) + days
 
         // remember the date
         m_aRegistrationNode.setNodeValue(
@@ -439,7 +439,7 @@ namespace utl
             s_bThisSessionDone = sal_True;
 
             if ( RegOptions::dpRemindLater == eOldPermission )
-            {   // no action required. If we shall remind later, the counter is already at 1, we should not change this,
+            {	// no action required. If we shall remind later, the counter is already at 1, we should not change this,
                 // as the next smaller number (which is 0 :) means that the dialog would be disabled
                 OSL_ENSURE( 1 == m_nDialogCounter, "RegOptionsImpl::markSessionDone: invalid session counter (1)!" );
             }
@@ -519,7 +519,7 @@ namespace utl
     {
         /// we cache this setting, 'cause it is needed very often
         static sal_Bool bKnowMenuPermission = sal_False;
-        static sal_Bool bAllowMenu          = sal_False;
+        static sal_Bool bAllowMenu			= sal_False;
 
         if ( !bKnowMenuPermission )
         {
diff --git a/unotools/source/config/saveopt.cxx b/unotools/source/config/saveopt.cxx
index cbb7e763b38a..6f9aefe0b189 100644
--- a/unotools/source/config/saveopt.cxx
+++ b/unotools/source/config/saveopt.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
diff --git a/unotools/source/config/searchopt.cxx b/unotools/source/config/searchopt.cxx
index f9318f150589..13ade93a93df 100644
--- a/unotools/source/config/searchopt.cxx
+++ b/unotools/source/config/searchopt.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
@@ -43,39 +43,39 @@ using namespace utl;
 using namespace com::sun::star::uno;
 using namespace com::sun::star::i18n;
 
-#define MAX_FLAGS_OFFSET    25
+#define MAX_FLAGS_OFFSET	25
 
 //////////////////////////////////////////////////////////////////////
 
 
 class SvtSearchOptions_Impl : public ConfigItem
 {
-    INT32   nFlags;
-    BOOL    bModified;
+    INT32	nFlags;
+    BOOL	bModified;
 
     // disallow copy-constructor and assignment-operator for now
     SvtSearchOptions_Impl( const SvtSearchOptions_Impl & );
     SvtSearchOptions_Impl & operator = ( const SvtSearchOptions_Impl & );
 
 protected:
-    BOOL            IsModified() const { return bModified; }
+    BOOL			IsModified() const { return bModified; }
     using ConfigItem::SetModified;
-    void            SetModified( BOOL bVal );
-    BOOL            Load();
-    BOOL            Save();
+    void			SetModified( BOOL bVal );
+    BOOL			Load();
+    BOOL			Save();
 
-    Sequence< OUString >    GetPropertyNames() const;
+    Sequence< OUString >	GetPropertyNames() const;
 
 public:
     SvtSearchOptions_Impl();
     virtual ~SvtSearchOptions_Impl();
 
     // ConfigItem
-    virtual void    Commit();
+    virtual void	Commit();
     virtual void    Notify( const com::sun::star::uno::Sequence< rtl::OUString >& aPropertyNames );
 
-    BOOL            GetFlag( USHORT nOffset ) const;
-    void            SetFlag( USHORT nOffset, BOOL bVal );
+    BOOL			GetFlag( USHORT nOffset ) const;
+    void			SetFlag( USHORT nOffset, BOOL bVal );
 };
 
 
@@ -84,7 +84,7 @@ SvtSearchOptions_Impl::SvtSearchOptions_Impl() :
     ConfigItem( OUString::createFromAscii( "Office.Common/SearchOptions" ) )
 {
     RTL_LOGFILE_CONTEXT(aLog, "unotools SvtSearchOptions_Impl::SvtSearchOptions_Impl()");
-    nFlags = 0x0003FFFF;    // set all options values to 'true'
+    nFlags = 0x0003FFFF;	// set all options values to 'true'
     Load();
     SetModified( FALSE );
 }
@@ -142,33 +142,33 @@ Sequence< OUString > SvtSearchOptions_Impl::GetPropertyNames() const
 {
     static const char* aPropNames[ MAX_FLAGS_OFFSET + 1 ] =
     {
-        "IsWholeWordsOnly",                     //  0
-        "IsBackwards",                          //  1
-        "IsUseRegularExpression",               //  2
-        //"IsCurrentSelectionOnly",             // interactively set or not...
-        "IsSearchForStyles",                    //  3
-        "IsSimilaritySearch",                   //  4
-        "IsUseAsianOptions",                    //  5
-        "IsMatchCase",                          //  6
-        "Japanese/IsMatchFullHalfWidthForms",   //  7
-        "Japanese/IsMatchHiraganaKatakana",     //  8
-        "Japanese/IsMatchContractions",         //  9
-        "Japanese/IsMatchMinusDashCho-on",      // 10
-        "Japanese/IsMatchRepeatCharMarks",      // 11
-        "Japanese/IsMatchVariantFormKanji",     // 12
-        "Japanese/IsMatchOldKanaForms",         // 13
-        "Japanese/IsMatch_DiZi_DuZu",           // 14
-        "Japanese/IsMatch_BaVa_HaFa",           // 15
-        "Japanese/IsMatch_TsiThiChi_DhiZi",     // 16
-        "Japanese/IsMatch_HyuIyu_ByuVyu",       // 17
-        "Japanese/IsMatch_SeShe_ZeJe",          // 18
-        "Japanese/IsMatch_IaIya",               // 19
-        "Japanese/IsMatch_KiKu",                // 20
-        "Japanese/IsIgnorePunctuation",         // 21
-        "Japanese/IsIgnoreWhitespace",          // 22
-        "Japanese/IsIgnoreProlongedSoundMark",      // 23
-        "Japanese/IsIgnoreMiddleDot",           // 24
-        "IsNotes"                   // 25
+        "IsWholeWordsOnly",						//  0
+        "IsBackwards",							//  1
+        "IsUseRegularExpression",				//  2
+        //"IsCurrentSelectionOnly",				// interactively set or not...
+        "IsSearchForStyles",					//  3
+        "IsSimilaritySearch",					//  4
+        "IsUseAsianOptions",					//  5
+        "IsMatchCase",							//  6
+        "Japanese/IsMatchFullHalfWidthForms",	//  7
+        "Japanese/IsMatchHiraganaKatakana",		//  8
+        "Japanese/IsMatchContractions",			//  9
+        "Japanese/IsMatchMinusDashCho-on",		// 10
+        "Japanese/IsMatchRepeatCharMarks",		// 11
+        "Japanese/IsMatchVariantFormKanji",		// 12
+        "Japanese/IsMatchOldKanaForms",			// 13
+        "Japanese/IsMatch_DiZi_DuZu",			// 14
+        "Japanese/IsMatch_BaVa_HaFa",			// 15
+        "Japanese/IsMatch_TsiThiChi_DhiZi",		// 16
+        "Japanese/IsMatch_HyuIyu_ByuVyu",		// 17
+        "Japanese/IsMatch_SeShe_ZeJe",			// 18
+        "Japanese/IsMatch_IaIya",				// 19
+        "Japanese/IsMatch_KiKu",				// 20
+        "Japanese/IsIgnorePunctuation",			// 21
+        "Japanese/IsIgnoreWhitespace",			// 22
+        "Japanese/IsIgnoreProlongedSoundMark",		// 23
+        "Japanese/IsIgnoreMiddleDot",			// 24
+        "IsNotes"					// 25
     };
 
     const int nCount = sizeof( aPropNames ) / sizeof( aPropNames[0] );
diff --git a/unotools/source/config/securityoptions.cxx b/unotools/source/config/securityoptions.cxx
index 526e33d1917c..b8b6bb63efa1 100644
--- a/unotools/source/config/securityoptions.cxx
+++ b/unotools/source/config/securityoptions.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
@@ -31,7 +31,7 @@
 #endif
 
 //_________________________________________________________________________________________________________________
-//  includes
+//	includes
 //_________________________________________________________________________________________________________________
 
 #include <unotools/securityoptions.hxx>
@@ -51,78 +51,78 @@
 #include "itemholder1.hxx"
 
 //_________________________________________________________________________________________________________________
-//  namespaces
+//	namespaces
 //_________________________________________________________________________________________________________________
 
-using namespace ::utl                   ;
-using namespace ::rtl                   ;
-using namespace ::osl                   ;
-using namespace ::com::sun::star::uno   ;
+using namespace ::utl					;
+using namespace ::rtl					;
+using namespace ::osl					;
+using namespace ::com::sun::star::uno	;
 
 //_________________________________________________________________________________________________________________
-//  const
+//	const
 //_________________________________________________________________________________________________________________
 
-#define ROOTNODE_SECURITY               OUString(RTL_CONSTASCII_USTRINGPARAM("Office.Common/Security/Scripting"))
-#define DEFAULT_SECUREURL               Sequence< OUString >()
-#define DEFAULT_SECLEVEL                3
-#define DEFAULT_TRUSTEDAUTHORS          Sequence< SvtSecurityOptions::Certificate >()
+#define	ROOTNODE_SECURITY				OUString(RTL_CONSTASCII_USTRINGPARAM("Office.Common/Security/Scripting"))
+#define	DEFAULT_SECUREURL				Sequence< OUString >()
+#define	DEFAULT_SECLEVEL				3
+#define DEFAULT_TRUSTEDAUTHORS			Sequence< SvtSecurityOptions::Certificate >()
 
 // xmlsec05 depricated
-#define DEFAULT_STAROFFICEBASIC         eALWAYS_EXECUTE
-
-#define CSTR_SECUREURL                  "SecureURL"
-#define CSTR_DOCWARN_SAVEORSEND         "WarnSaveOrSendDoc"
-#define CSTR_DOCWARN_SIGNING            "WarnSignDoc"
-#define CSTR_DOCWARN_PRINT              "WarnPrintDoc"
-#define CSTR_DOCWARN_CREATEPDF          "WarnCreatePDF"
-#define CSTR_DOCWARN_REMOVEPERSONALINFO "RemovePersonalInfoOnSaving"
-#define CSTR_DOCWARN_RECOMMENDPASSWORD  "RecommendPasswordProtection"
+#define	DEFAULT_STAROFFICEBASIC			eALWAYS_EXECUTE
+
+#define	CSTR_SECUREURL					"SecureURL"
+#define CSTR_DOCWARN_SAVEORSEND			"WarnSaveOrSendDoc"
+#define CSTR_DOCWARN_SIGNING			"WarnSignDoc"
+#define CSTR_DOCWARN_PRINT				"WarnPrintDoc"
+#define CSTR_DOCWARN_CREATEPDF			"WarnCreatePDF"
+#define CSTR_DOCWARN_REMOVEPERSONALINFO	"RemovePersonalInfoOnSaving"
+#define CSTR_DOCWARN_RECOMMENDPASSWORD	"RecommendPasswordProtection"
 #define CSTR_CTRLCLICK_HYPERLINK        "HyperlinksWithCtrlClick"
-#define CSTR_MACRO_SECLEVEL             "MacroSecurityLevel"
-#define CSTR_MACRO_TRUSTEDAUTHORS       "TrustedAuthors"
-#define CSTR_MACRO_DISABLE              "DisableMacrosExecution"
-#define CSTR_TRUSTEDAUTHOR_SUBJECTNAME  "SubjectName"
-#define CSTR_TRUSTEDAUTHOR_SERIALNUMBER "SerialNumber"
-#define CSTR_TRUSTEDAUTHOR_RAWDATA      "RawData"
-
-#define PROPERTYNAME_SECUREURL                  OUString(RTL_CONSTASCII_USTRINGPARAM(CSTR_SECUREURL                     ))
-#define PROPERTYNAME_DOCWARN_SAVEORSEND         OUString(RTL_CONSTASCII_USTRINGPARAM(CSTR_DOCWARN_SAVEORSEND            ))
-#define PROPERTYNAME_DOCWARN_SIGNING            OUString(RTL_CONSTASCII_USTRINGPARAM(CSTR_DOCWARN_SIGNING               ))
-#define PROPERTYNAME_DOCWARN_PRINT              OUString(RTL_CONSTASCII_USTRINGPARAM(CSTR_DOCWARN_PRINT                 ))
-#define PROPERTYNAME_DOCWARN_CREATEPDF          OUString(RTL_CONSTASCII_USTRINGPARAM(CSTR_DOCWARN_CREATEPDF             ))
-#define PROPERTYNAME_DOCWARN_REMOVEPERSONALINFO OUString(RTL_CONSTASCII_USTRINGPARAM(CSTR_DOCWARN_REMOVEPERSONALINFO    ))
+#define CSTR_MACRO_SECLEVEL				"MacroSecurityLevel"
+#define CSTR_MACRO_TRUSTEDAUTHORS		"TrustedAuthors"
+#define CSTR_MACRO_DISABLE				"DisableMacrosExecution"
+#define CSTR_TRUSTEDAUTHOR_SUBJECTNAME	"SubjectName"
+#define CSTR_TRUSTEDAUTHOR_SERIALNUMBER	"SerialNumber"
+#define CSTR_TRUSTEDAUTHOR_RAWDATA		"RawData"
+
+#define	PROPERTYNAME_SECUREURL					OUString(RTL_CONSTASCII_USTRINGPARAM(CSTR_SECUREURL						))
+#define PROPERTYNAME_DOCWARN_SAVEORSEND			OUString(RTL_CONSTASCII_USTRINGPARAM(CSTR_DOCWARN_SAVEORSEND			))
+#define PROPERTYNAME_DOCWARN_SIGNING			OUString(RTL_CONSTASCII_USTRINGPARAM(CSTR_DOCWARN_SIGNING				))
+#define PROPERTYNAME_DOCWARN_PRINT				OUString(RTL_CONSTASCII_USTRINGPARAM(CSTR_DOCWARN_PRINT					))
+#define PROPERTYNAME_DOCWARN_CREATEPDF			OUString(RTL_CONSTASCII_USTRINGPARAM(CSTR_DOCWARN_CREATEPDF				))
+#define PROPERTYNAME_DOCWARN_REMOVEPERSONALINFO	OUString(RTL_CONSTASCII_USTRINGPARAM(CSTR_DOCWARN_REMOVEPERSONALINFO	))
 #define PROPERTYNAME_DOCWARN_RECOMMENDPASSWORD  OUString(RTL_CONSTASCII_USTRINGPARAM(CSTR_DOCWARN_RECOMMENDPASSWORD     ))
 #define PROPERTYNAME_CTRLCLICK_HYPERLINK        OUString(RTL_CONSTASCII_USTRINGPARAM(CSTR_CTRLCLICK_HYPERLINK           ))
-#define PROPERTYNAME_MACRO_SECLEVEL             OUString(RTL_CONSTASCII_USTRINGPARAM(CSTR_MACRO_SECLEVEL                ))
-#define PROPERTYNAME_MACRO_TRUSTEDAUTHORS       OUString(RTL_CONSTASCII_USTRINGPARAM(CSTR_MACRO_TRUSTEDAUTHORS          ))
-#define PROPERTYNAME_MACRO_DISABLE              OUString(RTL_CONSTASCII_USTRINGPARAM(CSTR_MACRO_DISABLE                 ))
-#define PROPERTYNAME_TRUSTEDAUTHOR_SUBJECTNAME  OUString(RTL_CONSTASCII_USTRINGPARAM(CSTR_TRUSTEDAUTHOR_SUBJECTNAME))
-#define PROPERTYNAME_TRUSTEDAUTHOR_SERIALNUMBER OUString(RTL_CONSTASCII_USTRINGPARAM(CSTR_TRUSTEDAUTHOR_SERIALNUMBER))
-#define PROPERTYNAME_TRUSTEDAUTHOR_RAWDATA      OUString(RTL_CONSTASCII_USTRINGPARAM(CSTR_TRUSTEDAUTHOR_RAWDATA))
+#define PROPERTYNAME_MACRO_SECLEVEL				OUString(RTL_CONSTASCII_USTRINGPARAM(CSTR_MACRO_SECLEVEL				))
+#define PROPERTYNAME_MACRO_TRUSTEDAUTHORS		OUString(RTL_CONSTASCII_USTRINGPARAM(CSTR_MACRO_TRUSTEDAUTHORS			))
+#define PROPERTYNAME_MACRO_DISABLE				OUString(RTL_CONSTASCII_USTRINGPARAM(CSTR_MACRO_DISABLE					))
+#define PROPERTYNAME_TRUSTEDAUTHOR_SUBJECTNAME	OUString(RTL_CONSTASCII_USTRINGPARAM(CSTR_TRUSTEDAUTHOR_SUBJECTNAME))
+#define PROPERTYNAME_TRUSTEDAUTHOR_SERIALNUMBER	OUString(RTL_CONSTASCII_USTRINGPARAM(CSTR_TRUSTEDAUTHOR_SERIALNUMBER))
+#define PROPERTYNAME_TRUSTEDAUTHOR_RAWDATA		OUString(RTL_CONSTASCII_USTRINGPARAM(CSTR_TRUSTEDAUTHOR_RAWDATA))
 
 // xmlsec05 depricated
-#define PROPERTYNAME_STAROFFICEBASIC    OUString(RTL_CONSTASCII_USTRINGPARAM("OfficeBasic"  ))
+#define	PROPERTYNAME_STAROFFICEBASIC	OUString(RTL_CONSTASCII_USTRINGPARAM("OfficeBasic"	))
 #define PROPERTYNAME_EXECUTEPLUGINS     OUString(RTL_CONSTASCII_USTRINGPARAM("ExecutePlugins"  ))
 #define PROPERTYNAME_WARNINGENABLED     OUString(RTL_CONSTASCII_USTRINGPARAM("Warning"  ))
 #define PROPERTYNAME_CONFIRMATIONENABLED OUString(RTL_CONSTASCII_USTRINGPARAM("Confirmation"  ))
 // xmlsec05 depricated
 
 
-#define PROPERTYHANDLE_SECUREURL                    0
+#define	PROPERTYHANDLE_SECUREURL					0
 
 // xmlsec05 depricated
-#define PROPERTYHANDLE_STAROFFICEBASIC  1
+#define	PROPERTYHANDLE_STAROFFICEBASIC	1
 #define PROPERTYHANDLE_EXECUTEPLUGINS   2
 #define PROPERTYHANDLE_WARNINGENABLED   3
 #define PROPERTYHANDLE_CONFIRMATIONENABLED 4
 // xmlsec05 depricated
 
-#define PROPERTYHANDLE_DOCWARN_SAVEORSEND           5
-#define PROPERTYHANDLE_DOCWARN_SIGNING              6
-#define PROPERTYHANDLE_DOCWARN_PRINT                7
-#define PROPERTYHANDLE_DOCWARN_CREATEPDF            8
-#define PROPERTYHANDLE_DOCWARN_REMOVEPERSONALINFO   9
+#define PROPERTYHANDLE_DOCWARN_SAVEORSEND			5
+#define PROPERTYHANDLE_DOCWARN_SIGNING				6
+#define PROPERTYHANDLE_DOCWARN_PRINT				7
+#define PROPERTYHANDLE_DOCWARN_CREATEPDF			8
+#define PROPERTYHANDLE_DOCWARN_REMOVEPERSONALINFO	9
 #define PROPERTYHANDLE_DOCWARN_RECOMMENDPASSWORD    10
 #define PROPERTYHANDLE_CTRLCLICK_HYPERLINK          11
 #define PROPERTYHANDLE_MACRO_SECLEVEL               12
@@ -130,131 +130,131 @@ using namespace ::com::sun::star::uno   ;
 #define PROPERTYHANDLE_MACRO_DISABLE                14
 
 #define PROPERTYCOUNT                               15
-#define PROPERTYHANDLE_INVALID                      -1
+#define PROPERTYHANDLE_INVALID						-1
 
-#define CFG_READONLY_DEFAULT                        sal_False
+#define CFG_READONLY_DEFAULT						sal_False
 
 //_________________________________________________________________________________________________________________
-//  private declarations!
+//	private declarations!
 //_________________________________________________________________________________________________________________
 
 class SvtSecurityOptions_Impl : public ConfigItem
 {
     //-------------------------------------------------------------------------------------------------------------
-    //  public methods
+    //	public methods
     //-------------------------------------------------------------------------------------------------------------
 
     public:
 
         //---------------------------------------------------------------------------------------------------------
-        //  constructor / destructor
+        //	constructor / destructor
         //---------------------------------------------------------------------------------------------------------
 
          SvtSecurityOptions_Impl();
         ~SvtSecurityOptions_Impl();
 
         //---------------------------------------------------------------------------------------------------------
-        //  overloaded methods of baseclass
+        //	overloaded methods of baseclass
         //---------------------------------------------------------------------------------------------------------
 
         /*-****************************************************************************************************//**
-            @short      called for notify of configmanager
-            @descr      These method is called from the ConfigManager before application ends or from the
+            @short		called for notify of configmanager
+            @descr		These method is called from the ConfigManager before application ends or from the
                          PropertyChangeListener if the sub tree broadcasts changes. You must update your
                         internal values.
 
-            @seealso    baseclass ConfigItem
+            @seealso	baseclass ConfigItem
 
-            @param      "seqPropertyNames" is the list of properties which should be updated.
-            @return     -
+            @param		"seqPropertyNames" is the list of properties which should be updated.
+            @return		-
 
-            @onerror    -
+            @onerror	-
         *//*-*****************************************************************************************************/
 
         virtual void Notify( const Sequence< OUString >& seqPropertyNames );
 
         /*-****************************************************************************************************//**
-            @short      write changes to configuration
-            @descr      These method writes the changed values into the sub tree
+            @short		write changes to configuration
+            @descr		These method writes the changed values into the sub tree
                         and should always called in our destructor to guarantee consistency of config data.
 
-            @seealso    baseclass ConfigItem
+            @seealso	baseclass ConfigItem
 
-            @param      -
-            @return     -
+            @param		-
+            @return		-
 
-            @onerror    -
+            @onerror	-
         *//*-*****************************************************************************************************/
 
         virtual void Commit();
 
         //---------------------------------------------------------------------------------------------------------
-        //  public interface
+        //	public interface
         //---------------------------------------------------------------------------------------------------------
 
-        sal_Bool                IsReadOnly      ( SvtSecurityOptions::EOption eOption                   ) const ;
+        sal_Bool				IsReadOnly		( SvtSecurityOptions::EOption eOption					) const	;
 
-        Sequence< OUString >    GetSecureURLs   (                                                       ) const ;
-        void                    SetSecureURLs   (   const   Sequence< OUString >&   seqURLList          )       ;
-        sal_Bool                IsSecureURL     (   const   OUString&               sURL,
-                                                    const   OUString&               sReferer            ) const ;
-        inline sal_Int32        GetMacroSecurityLevel   (                                               ) const ;
-        void                    SetMacroSecurityLevel   ( sal_Int32 _nLevel                             )       ;
+        Sequence< OUString >	GetSecureURLs	(														) const	;
+        void					SetSecureURLs	(	const	Sequence< OUString >&	seqURLList			)		;
+        sal_Bool				IsSecureURL		(	const	OUString&				sURL,
+                                                    const	OUString&				sReferer			) const	;
+        inline sal_Int32		GetMacroSecurityLevel	(												) const	;
+        void					SetMacroSecurityLevel	( sal_Int32 _nLevel								)		;
 
-        inline sal_Bool         IsMacroDisabled         (                                               ) const ;
+        inline sal_Bool			IsMacroDisabled			(												) const	;
 
-        Sequence< SvtSecurityOptions::Certificate > GetTrustedAuthors       (                                                                                       ) const ;
-        void                                        SetTrustedAuthors       ( const Sequence< SvtSecurityOptions::Certificate >& rAuthors                           )       ;
-        sal_Bool                                    IsTrustedAuthorsEnabled (                                                                                       )       ;
+        Sequence< SvtSecurityOptions::Certificate >	GetTrustedAuthors		(																						) const	;
+        void										SetTrustedAuthors		( const Sequence< SvtSecurityOptions::Certificate >& rAuthors							)		;
+        sal_Bool									IsTrustedAuthorsEnabled	(																						)		;
 
-        sal_Bool                IsOptionSet     ( SvtSecurityOptions::EOption eOption                   ) const ;
-        sal_Bool                SetOption       ( SvtSecurityOptions::EOption eOption, sal_Bool bValue  )       ;
-        sal_Bool                IsOptionEnabled ( SvtSecurityOptions::EOption eOption                   ) const ;
+        sal_Bool				IsOptionSet		( SvtSecurityOptions::EOption eOption					) const	;
+        sal_Bool				SetOption		( SvtSecurityOptions::EOption eOption, sal_Bool bValue	)		;
+        sal_Bool				IsOptionEnabled	( SvtSecurityOptions::EOption eOption					) const	;
 private:
 
         /*-****************************************************************************************************//**
-            @short      return list of key names of ouer configuration management which represent our module tree
-            @descr      These methods return a static const list of key names. We need it to get needed values from our
+            @short		return list of key names of ouer configuration management which represent our module tree
+            @descr		These methods return a static const list of key names. We need it to get needed values from our
                         configuration management.
 
-            @seealso    -
+            @seealso	-
 
-            @param      -
-            @return     A list of needed configuration keys is returned.
+            @param		-
+            @return		A list of needed configuration keys is returned.
 
-            @onerror    -
+            @onerror	-
         *//*-*****************************************************************************************************/
 
-        void                    SetProperty( sal_Int32 nHandle, const Any& rValue, sal_Bool bReadOnly );
-        void                    LoadAuthors( void );
-        static sal_Int32        GetHandle( const OUString& rPropertyName );
-        bool                    GetOption( SvtSecurityOptions::EOption eOption, sal_Bool*& rpValue, sal_Bool*& rpRO );
+        void					SetProperty( sal_Int32 nHandle, const Any& rValue, sal_Bool bReadOnly );
+        void					LoadAuthors( void );
+        static sal_Int32		GetHandle( const OUString& rPropertyName );
+        bool					GetOption( SvtSecurityOptions::EOption eOption, sal_Bool*& rpValue, sal_Bool*& rpRO );
 
         static Sequence< OUString > GetPropertyNames();
 
-        Sequence< OUString >                        m_seqSecureURLs;
-        sal_Bool                                    m_bSaveOrSend;
-        sal_Bool                                    m_bSigning;
-        sal_Bool                                    m_bPrint;
-        sal_Bool                                    m_bCreatePDF;
-        sal_Bool                                    m_bRemoveInfo;
+        Sequence< OUString >					    m_seqSecureURLs;
+        sal_Bool									m_bSaveOrSend;
+        sal_Bool									m_bSigning;
+        sal_Bool									m_bPrint;
+        sal_Bool									m_bCreatePDF;
+        sal_Bool									m_bRemoveInfo;
         sal_Bool                                    m_bRecommendPwd;
         sal_Bool                                    m_bCtrlClickHyperlink;
-        sal_Int32                                   m_nSecLevel;
-        Sequence< SvtSecurityOptions::Certificate > m_seqTrustedAuthors;
-        sal_Bool                                    m_bDisableMacros;
-
-        sal_Bool                                    m_bROSecureURLs;
-        sal_Bool                                    m_bROSaveOrSend;
-        sal_Bool                                    m_bROSigning;
-        sal_Bool                                    m_bROPrint;
-        sal_Bool                                    m_bROCreatePDF;
-        sal_Bool                                    m_bRORemoveInfo;
+        sal_Int32									m_nSecLevel;
+        Sequence< SvtSecurityOptions::Certificate >	m_seqTrustedAuthors;
+        sal_Bool									m_bDisableMacros;
+
+        sal_Bool                					m_bROSecureURLs;
+        sal_Bool									m_bROSaveOrSend;
+        sal_Bool									m_bROSigning;
+        sal_Bool									m_bROPrint;
+        sal_Bool									m_bROCreatePDF;
+        sal_Bool									m_bRORemoveInfo;
         sal_Bool                                    m_bRORecommendPwd;
         sal_Bool                                    m_bROCtrlClickHyperlink;
-        sal_Bool                                    m_bROSecLevel;
-        sal_Bool                                    m_bROTrustedAuthors;
-        sal_Bool                                    m_bRODisableMacros;
+        sal_Bool									m_bROSecLevel;
+        sal_Bool									m_bROTrustedAuthors;
+        sal_Bool									m_bRODisableMacros;
 
 
         // xmlsec05 depricated
@@ -274,37 +274,37 @@ private:
         void SetConfirmationEnabled( sal_Bool bSet );
         sal_Bool    IsExecutePlugins() const;
         void        SetExecutePlugins( sal_Bool bSet );
-        EBasicSecurityMode      GetBasicMode    (                                               ) const ;
-        void                    SetBasicMode    (           EBasicSecurityMode      eMode       )       ;
+        EBasicSecurityMode		GetBasicMode	(												) const	;
+        void					SetBasicMode	(			EBasicSecurityMode		eMode		)		;
 };
 
 //_________________________________________________________________________________________________________________
-//  definitions
+//	definitions
 //_________________________________________________________________________________________________________________
 
 //*****************************************************************************************************************
-//  constructor
+//	constructor
 //*****************************************************************************************************************
 SvtSecurityOptions_Impl::SvtSecurityOptions_Impl()
-    :ConfigItem             ( ROOTNODE_SECURITY         )
-    ,m_seqSecureURLs        ( DEFAULT_SECUREURL         )
-    ,m_bSaveOrSend          ( sal_True                  )
-    ,m_bSigning             ( sal_True                  )
-    ,m_bPrint               ( sal_True                  )
-    ,m_bCreatePDF           ( sal_True                  )
-    ,m_bRemoveInfo          ( sal_True                  )
-    ,m_nSecLevel            ( sal_True                  )
-    ,m_seqTrustedAuthors    ( DEFAULT_TRUSTEDAUTHORS    )
-    ,m_bDisableMacros       ( sal_False                 )
-    ,m_bROSecureURLs        ( CFG_READONLY_DEFAULT      )
-    ,m_bROSaveOrSend        ( CFG_READONLY_DEFAULT      )
-    ,m_bROSigning           ( CFG_READONLY_DEFAULT      )
-    ,m_bROPrint             ( CFG_READONLY_DEFAULT      )
-    ,m_bROCreatePDF         ( CFG_READONLY_DEFAULT      )
-    ,m_bRORemoveInfo        ( CFG_READONLY_DEFAULT      )
-    ,m_bROSecLevel          ( CFG_READONLY_DEFAULT      )
-    ,m_bROTrustedAuthors    ( CFG_READONLY_DEFAULT      )
-    ,m_bRODisableMacros     ( sal_True                  ) // currently is not intended to be changed
+    :ConfigItem				( ROOTNODE_SECURITY			)
+    ,m_seqSecureURLs		( DEFAULT_SECUREURL			)
+    ,m_bSaveOrSend			( sal_True					)
+    ,m_bSigning				( sal_True					)
+    ,m_bPrint				( sal_True					)
+    ,m_bCreatePDF			( sal_True					)
+    ,m_bRemoveInfo			( sal_True					)
+    ,m_nSecLevel			( sal_True					)
+    ,m_seqTrustedAuthors	( DEFAULT_TRUSTEDAUTHORS	)
+    ,m_bDisableMacros		( sal_False					)
+    ,m_bROSecureURLs		( CFG_READONLY_DEFAULT		)
+    ,m_bROSaveOrSend		( CFG_READONLY_DEFAULT		)
+    ,m_bROSigning			( CFG_READONLY_DEFAULT		)
+    ,m_bROPrint				( CFG_READONLY_DEFAULT		)
+    ,m_bROCreatePDF			( CFG_READONLY_DEFAULT		)
+    ,m_bRORemoveInfo		( CFG_READONLY_DEFAULT		)
+    ,m_bROSecLevel			( CFG_READONLY_DEFAULT		)
+    ,m_bROTrustedAuthors	( CFG_READONLY_DEFAULT		)
+    ,m_bRODisableMacros		( sal_True					) // currently is not intended to be changed
 
     // xmlsec05 depricated
     ,   m_eBasicMode        ( DEFAULT_STAROFFICEBASIC )
@@ -318,9 +318,9 @@ SvtSecurityOptions_Impl::SvtSecurityOptions_Impl()
     // xmlsec05 depricated
 
 {
-    Sequence< OUString >    seqNames    = GetPropertyNames  (           );
-    Sequence< Any >         seqValues   = GetProperties     ( seqNames  );
-    Sequence< sal_Bool >    seqRO       = GetReadOnlyStates ( seqNames  );
+    Sequence< OUString >	seqNames	= GetPropertyNames	(			);
+    Sequence< Any >			seqValues	= GetProperties		( seqNames	);
+    Sequence< sal_Bool >	seqRO		= GetReadOnlyStates	( seqNames	);
 
     // Safe impossible cases.
     // We need values from ALL configuration keys.
@@ -328,7 +328,7 @@ SvtSecurityOptions_Impl::SvtSecurityOptions_Impl()
     DBG_ASSERT( !(seqNames.getLength()!=seqValues.getLength()), "SvtSecurityOptions_Impl::SvtSecurityOptions_Impl()\nI miss some values of configuration keys!\n" );
 
     // Copy values from list in right order to our internal member.
-    sal_Int32               nPropertyCount = seqValues.getLength();
+    sal_Int32				nPropertyCount = seqValues.getLength();
     for( sal_Int32 nProperty = 0 ; nProperty < nPropertyCount ; ++nProperty )
         SetProperty( nProperty, seqValues[ nProperty ], seqRO[ nProperty ] );
 
@@ -341,7 +341,7 @@ SvtSecurityOptions_Impl::SvtSecurityOptions_Impl()
 }
 
 //*****************************************************************************************************************
-//  destructor
+//	destructor
 //*****************************************************************************************************************
 SvtSecurityOptions_Impl::~SvtSecurityOptions_Impl()
 {
@@ -357,8 +357,8 @@ void SvtSecurityOptions_Impl::SetProperty( sal_Int32 nProperty, const Any& rValu
         {
             m_seqSecureURLs.realloc( 0 );
             rValue >>= m_seqSecureURLs;
-            SvtPathOptions  aOpt;
-            sal_uInt32      nCount = m_seqSecureURLs.getLength();
+            SvtPathOptions	aOpt;
+            sal_uInt32		nCount = m_seqSecureURLs.getLength();
             for( sal_uInt32 nItem = 0 ; nItem < nCount ; ++nItem )
                 m_seqSecureURLs[ nItem ] = aOpt.SubstituteVariable( m_seqSecureURLs[ nItem ] );
             m_bROSecureURLs = bRO;
@@ -475,17 +475,17 @@ void SvtSecurityOptions_Impl::SetProperty( sal_Int32 nProperty, const Any& rValu
 
 void SvtSecurityOptions_Impl::LoadAuthors( void )
 {
-    m_seqTrustedAuthors.realloc( 0 );       // first clear
-    Sequence< OUString >    lAuthors = GetNodeNames( PROPERTYNAME_MACRO_TRUSTEDAUTHORS );
-    sal_Int32               c1 = lAuthors.getLength();
+    m_seqTrustedAuthors.realloc( 0 );		// first clear
+    Sequence< OUString >	lAuthors = GetNodeNames( PROPERTYNAME_MACRO_TRUSTEDAUTHORS );
+    sal_Int32				c1 = lAuthors.getLength();
     if( c1 )
     {
-        sal_Int32               c2 = c1 * 3;                // 3 Properties inside Struct TrustedAuthor
-        Sequence< OUString >    lAllAuthors( c2 );
+        sal_Int32				c2 = c1 * 3;				// 3 Properties inside Struct TrustedAuthor
+        Sequence< OUString >	lAllAuthors( c2 );
 
-        sal_Int32               i1;
-        sal_Int32               i2;
-        OUString                aSep( RTL_CONSTASCII_USTRINGPARAM( "/" ) );
+        sal_Int32				i1;
+        sal_Int32				i2;
+        OUString				aSep( RTL_CONSTASCII_USTRINGPARAM( "/" ) );
         for( i1 = 0, i2 = 0 ; i1 < c1 ; ++i1 )
         {
             lAllAuthors[ i2 ] = PROPERTYNAME_MACRO_TRUSTEDAUTHORS + aSep + lAuthors[ i1 ] + aSep + PROPERTYNAME_TRUSTEDAUTHOR_SUBJECTNAME;
@@ -496,7 +496,7 @@ void SvtSecurityOptions_Impl::LoadAuthors( void )
             ++i2;
         }
 
-        Sequence< Any >         lValues = GetProperties( lAllAuthors );
+        Sequence< Any >			lValues = GetProperties( lAllAuthors );
         if( lValues.getLength() == c2 )
         {
             m_seqTrustedAuthors.realloc( c1 );
@@ -517,7 +517,7 @@ void SvtSecurityOptions_Impl::LoadAuthors( void )
 
 sal_Int32 SvtSecurityOptions_Impl::GetHandle( const OUString& rName )
 {
-    sal_Int32   nHandle;
+    sal_Int32	nHandle;
 
     if( rName.compareToAscii( CSTR_SECUREURL ) == 0 )
         nHandle = PROPERTYHANDLE_SECUREURL;
@@ -603,13 +603,13 @@ bool SvtSecurityOptions_Impl::GetOption( SvtSecurityOptions::EOption eOption, sa
 void SvtSecurityOptions_Impl::Notify( const Sequence< OUString >& seqPropertyNames )
 {
     // Use given list of updated properties to get his values from configuration directly!
-    Sequence< Any >         seqValues = GetProperties( seqPropertyNames );
-    Sequence< sal_Bool >    seqRO = GetReadOnlyStates( seqPropertyNames );
+    Sequence< Any >			seqValues = GetProperties( seqPropertyNames );
+    Sequence< sal_Bool >	seqRO = GetReadOnlyStates( seqPropertyNames );
     // Safe impossible cases.
     // We need values from ALL notified configuration keys.
     DBG_ASSERT( !(seqPropertyNames.getLength()!=seqValues.getLength()), "SvtSecurityOptions_Impl::Notify()\nI miss some values of configuration keys!\n" );
     // Step over list of property names and get right value from coreesponding value list to set it on internal members!
-    sal_Int32               nCount = seqPropertyNames.getLength();
+    sal_Int32				nCount = seqPropertyNames.getLength();
     for( sal_Int32 nProperty = 0 ; nProperty < nCount ; ++nProperty )
         SetProperty( GetHandle( seqPropertyNames[ nProperty ] ), seqValues[ nProperty ], seqRO[ nProperty ] );
 
@@ -626,7 +626,7 @@ void SvtSecurityOptions_Impl::Commit()
     Sequence< OUString >    lNames(nOrgCount);
     Sequence< Any >         lValues(nOrgCount);
     sal_Int32               nRealCount = 0;
-    bool                    bDone;
+    bool					bDone;
 
     ClearNodeSet( PROPERTYNAME_MACRO_TRUSTEDAUTHORS );
 
@@ -639,9 +639,9 @@ void SvtSecurityOptions_Impl::Commit()
                 bDone = !m_bROSecureURLs;
                 if( bDone )
                 {
-                    Sequence< OUString >    lURLs( m_seqSecureURLs );
-                    SvtPathOptions          aOpt;
-                    sal_Int32               nURLsCnt = lURLs.getLength();
+                    Sequence< OUString >	lURLs( m_seqSecureURLs );
+                    SvtPathOptions			aOpt;
+                    sal_Int32				nURLsCnt = lURLs.getLength();
                     for( sal_Int32 nItem = 0 ; nItem < nURLsCnt ; ++nItem )
                         lURLs[ nItem ] = aOpt.UseVariable( lURLs[ nItem ] );
                     lValues[ nRealCount ] <<= lURLs;
@@ -718,20 +718,20 @@ void SvtSecurityOptions_Impl::Commit()
                 bDone = !m_bROTrustedAuthors;
                 if( bDone )
                 {
-                    sal_Int32   nCnt = m_seqTrustedAuthors.getLength();
+                    sal_Int32	nCnt = m_seqTrustedAuthors.getLength();
                     if( nCnt )
                     {
-                        String  s;
+                        String	s;
                         s.AppendAscii( CSTR_MACRO_TRUSTEDAUTHORS );
                         s.AppendAscii( "/a" );
 
                         Sequence< Sequence< com::sun::star::beans::PropertyValue > > lPropertyValuesSeq( nCnt );
                         for( sal_Int32 i = 0 ; i < nCnt ; ++i )
                         {
-                            String  aPrefix( s );
+                            String	aPrefix( s );
                             aPrefix += String::CreateFromInt32( i );
                             aPrefix.AppendAscii( "/" );
-                            Sequence< com::sun::star::beans::PropertyValue >    lPropertyValues( 3 );
+                            Sequence< com::sun::star::beans::PropertyValue >	lPropertyValues( 3 );
                             lPropertyValues[ 0 ].Name = aPrefix + PROPERTYNAME_TRUSTEDAUTHOR_SUBJECTNAME;
                             lPropertyValues[ 0 ].Value <<= m_seqTrustedAuthors[ i ][0];
                             lPropertyValues[ 1 ].Name = aPrefix + PROPERTYNAME_TRUSTEDAUTHOR_SERIALNUMBER;
@@ -743,7 +743,7 @@ void SvtSecurityOptions_Impl::Commit()
                             SetSetProperties( PROPERTYNAME_MACRO_TRUSTEDAUTHORS, lPropertyValues );
                         }
 
-                        bDone = false;      // because we save in loop above!
+                        bDone = false;		// because we save in loop above!
                     }
                     else
                         bDone = false;
@@ -810,7 +810,7 @@ void SvtSecurityOptions_Impl::Commit()
 
 sal_Bool SvtSecurityOptions_Impl::IsReadOnly( SvtSecurityOptions::EOption eOption ) const
 {
-    sal_Bool    bReadonly;
+    sal_Bool	bReadonly;
     switch(eOption)
     {
         case SvtSecurityOptions::E_SECUREURLS :
@@ -886,8 +886,8 @@ void SvtSecurityOptions_Impl::SetSecureURLs( const Sequence< OUString >& seqURLL
     }
 }
 
-sal_Bool SvtSecurityOptions_Impl::IsSecureURL(  const   OUString&   sURL    ,
-                                                const   OUString&   sReferer) const
+sal_Bool SvtSecurityOptions_Impl::IsSecureURL(	const	OUString&	sURL	,
+                                                const	OUString&	sReferer) const
 {
     sal_Bool bState = sal_False;
 
@@ -982,9 +982,9 @@ sal_Bool SvtSecurityOptions_Impl::IsTrustedAuthorsEnabled()
 
 sal_Bool SvtSecurityOptions_Impl::IsOptionSet( SvtSecurityOptions::EOption eOption ) const
 {
-    sal_Bool*   pValue;
-    sal_Bool*   pRO;
-    sal_Bool    bRet = sal_False;
+    sal_Bool*	pValue;
+    sal_Bool*	pRO;
+    sal_Bool	bRet = sal_False;
 
     if( ( const_cast< SvtSecurityOptions_Impl* >( this ) )->GetOption( eOption, pValue, pRO ) )
         bRet = *pValue;
@@ -994,9 +994,9 @@ sal_Bool SvtSecurityOptions_Impl::IsOptionSet( SvtSecurityOptions::EOption eOpti
 
 sal_Bool SvtSecurityOptions_Impl::SetOption( SvtSecurityOptions::EOption eOption, sal_Bool bValue )
 {
-    sal_Bool*   pValue;
-    sal_Bool*   pRO;
-    sal_Bool    bRet = sal_False;
+    sal_Bool*	pValue;
+    sal_Bool*	pRO;
+    sal_Bool	bRet = sal_False;
 
     if( GetOption( eOption, pValue, pRO ) )
     {
@@ -1016,9 +1016,9 @@ sal_Bool SvtSecurityOptions_Impl::SetOption( SvtSecurityOptions::EOption eOption
 
 sal_Bool SvtSecurityOptions_Impl::IsOptionEnabled( SvtSecurityOptions::EOption eOption ) const
 {
-    sal_Bool*   pValue;
-    sal_Bool*   pRO;
-    sal_Bool    bRet = sal_False;
+    sal_Bool*	pValue;
+    sal_Bool*	pRO;
+    sal_Bool	bRet = sal_False;
 
     if( ( const_cast< SvtSecurityOptions_Impl* >( this ) )->GetOption( eOption, pValue, pRO ) )
         bRet = !*pRO;
@@ -1054,12 +1054,12 @@ Sequence< OUString > SvtSecurityOptions_Impl::GetPropertyNames()
 }
 
 //*****************************************************************************************************************
-//  initialize static member
-//  DON'T DO IT IN YOUR HEADER!
-//  see definition for further informations
+//	initialize static member
+//	DON'T DO IT IN YOUR HEADER!
+//	see definition for further informations
 //*****************************************************************************************************************
-SvtSecurityOptions_Impl*    SvtSecurityOptions::m_pDataContainer    = NULL  ;
-sal_Int32                   SvtSecurityOptions::m_nRefCount         = 0     ;
+SvtSecurityOptions_Impl*	SvtSecurityOptions::m_pDataContainer	= NULL	;
+sal_Int32					SvtSecurityOptions::m_nRefCount			= 0		;
 
 SvtSecurityOptions::SvtSecurityOptions()
 {
@@ -1110,8 +1110,8 @@ void SvtSecurityOptions::SetSecureURLs( const Sequence< OUString >& seqURLList )
     m_pDataContainer->SetSecureURLs( seqURLList );
 }
 
-sal_Bool SvtSecurityOptions::IsSecureURL(   const   OUString&   sURL        ,
-                                            const   OUString&   sReferer    ) const
+sal_Bool SvtSecurityOptions::IsSecureURL(	const	OUString&	sURL		,
+                                            const	OUString&	sReferer	) const
 {
     MutexGuard aGuard( GetInitMutex() );
     return m_pDataContainer->IsSecureURL( sURL, sReferer );
@@ -1141,7 +1141,7 @@ Sequence< SvtSecurityOptions::Certificate > SvtSecurityOptions::GetTrustedAuthor
     return m_pDataContainer->GetTrustedAuthors();
 }
 
-void SvtSecurityOptions::SetTrustedAuthors( const Sequence< Certificate >& rAuthors )
+void SvtSecurityOptions::SetTrustedAuthors( const Sequence< Certificate >& rAuthors	)
 {
     MutexGuard aGuard( GetInitMutex() );
     m_pDataContainer->SetTrustedAuthors( rAuthors );
diff --git a/unotools/source/config/sourceviewconfig.cxx b/unotools/source/config/sourceviewconfig.cxx
index cb37db74138d..0c85132478c9 100644
--- a/unotools/source/config/sourceviewconfig.cxx
+++ b/unotools/source/config/sourceviewconfig.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
@@ -57,7 +57,7 @@ public:
     ~SourceViewConfig_Impl();
 
     virtual void    Notify( const Sequence< rtl::OUString >& aPropertyNames );
-    virtual void    Commit();
+    virtual void	Commit();
 
     const rtl::OUString&    GetFontName() const
                                 {return m_sFontName;}
diff --git a/unotools/source/config/startoptions.cxx b/unotools/source/config/startoptions.cxx
index d6012c0ad84f..a4a0572f2eda 100644
--- a/unotools/source/config/startoptions.cxx
+++ b/unotools/source/config/startoptions.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
@@ -31,7 +31,7 @@
 #endif
 
 //_________________________________________________________________________________________________________________
-//  includes
+//	includes
 //_________________________________________________________________________________________________________________
 
 #include <unotools/startoptions.hxx>
@@ -44,158 +44,158 @@
 #include <rtl/logfile.hxx>
 #include "itemholder1.hxx"
 //_________________________________________________________________________________________________________________
-//  namespaces
+//	namespaces
 //_________________________________________________________________________________________________________________
 
-using namespace ::utl                   ;
-using namespace ::rtl                   ;
-using namespace ::osl                   ;
-using namespace ::com::sun::star::uno   ;
+using namespace ::utl					;
+using namespace ::rtl					;
+using namespace ::osl					;
+using namespace ::com::sun::star::uno	;
 
 //_________________________________________________________________________________________________________________
-//  const
+//	const
 //_________________________________________________________________________________________________________________
 
-#define DEFAULT_SHOWINTRO               sal_True
-#define DEFAULT_CONNECTIONURL           OUString()
+#define	DEFAULT_SHOWINTRO				sal_True
+#define	DEFAULT_CONNECTIONURL			OUString()
 
-#define ROOTNODE_START                  OUString(RTL_CONSTASCII_USTRINGPARAM("Setup/Office" ))
-#define PROPERTYNAME_SHOWINTRO          OUString(RTL_CONSTASCII_USTRINGPARAM("ooSetupShowIntro" ))
-#define PROPERTYNAME_CONNECTIONURL      OUString(RTL_CONSTASCII_USTRINGPARAM("ooSetupConnectionURL" ))
+#define	ROOTNODE_START			   		OUString(RTL_CONSTASCII_USTRINGPARAM("Setup/Office"	))
+#define	PROPERTYNAME_SHOWINTRO			OUString(RTL_CONSTASCII_USTRINGPARAM("ooSetupShowIntro"	))
+#define	PROPERTYNAME_CONNECTIONURL		OUString(RTL_CONSTASCII_USTRINGPARAM("ooSetupConnectionURL"	))
 
-#define PROPERTYHANDLE_SHOWINTRO        0
-#define PROPERTYHANDLE_CONNECTIONURL    1
+#define	PROPERTYHANDLE_SHOWINTRO		0
+#define	PROPERTYHANDLE_CONNECTIONURL	1
 
-#define PROPERTYCOUNT                   2
+#define	PROPERTYCOUNT					2
 
 //_________________________________________________________________________________________________________________
-//  private declarations!
+//	private declarations!
 //_________________________________________________________________________________________________________________
 
 class SvtStartOptions_Impl : public ConfigItem
 {
     //-------------------------------------------------------------------------------------------------------------
-    //  public methods
+    //	public methods
     //-------------------------------------------------------------------------------------------------------------
 
     public:
 
         //---------------------------------------------------------------------------------------------------------
-        //  constructor / destructor
+        //	constructor / destructor
         //---------------------------------------------------------------------------------------------------------
 
          SvtStartOptions_Impl();
         ~SvtStartOptions_Impl();
 
         //---------------------------------------------------------------------------------------------------------
-        //  overloaded methods of baseclass
+        //	overloaded methods of baseclass
         //---------------------------------------------------------------------------------------------------------
 
         /*-****************************************************************************************************//**
-            @short      called for notify of configmanager
-            @descr      These method is called from the ConfigManager before application ends or from the
+            @short		called for notify of configmanager
+            @descr		These method is called from the ConfigManager before application ends or from the
                          PropertyChangeListener if the sub tree broadcasts changes. You must update your
                         internal values.
 
-            @ATTENTION  We don't implement these method - because we support readonly values at runtime only!
+            @ATTENTION	We don't implement these method - because we support readonly values at runtime only!
 
-            @seealso    baseclass ConfigItem
+            @seealso	baseclass ConfigItem
 
-            @param      "seqPropertyNames" is the list of properties which should be updated.
-            @return     -
+            @param		"seqPropertyNames" is the list of properties which should be updated.
+            @return		-
 
-            @onerror    -
+            @onerror	-
         *//*-*****************************************************************************************************/
 
         virtual void Notify( const Sequence< OUString >& seqPropertyNames );
 
         /*-****************************************************************************************************//**
-            @short      write changes to configuration
-            @descr      These method writes the changed values into the sub tree
+            @short		write changes to configuration
+            @descr		These method writes the changed values into the sub tree
                         and should always called in our destructor to guarantee consistency of config data.
 
-            @ATTENTION  We don't implement these method - because we support readonly values at runtime only!
+            @ATTENTION	We don't implement these method - because we support readonly values at runtime only!
 
-            @seealso    baseclass ConfigItem
+            @seealso	baseclass ConfigItem
 
-            @param      -
-            @return     -
+            @param		-
+            @return		-
 
-            @onerror    -
+            @onerror	-
         *//*-*****************************************************************************************************/
 
         virtual void Commit();
 
         //---------------------------------------------------------------------------------------------------------
-        //  public interface
+        //	public interface
         //---------------------------------------------------------------------------------------------------------
 
         /*-****************************************************************************************************//**
-            @short      access method to get internal values
-            @descr      These method give us a chance to regulate acces to ouer internal values.
+            @short		access method to get internal values
+            @descr		These method give us a chance to regulate acces to ouer internal values.
                         It's not used in the moment - but it's possible for the feature!
 
-            @seealso    -
+            @seealso	-
 
-            @param      -
-            @return     -
+            @param		-
+            @return		-
 
-            @onerror    -
+            @onerror	-
         *//*-*****************************************************************************************************/
 
-        sal_Bool    IsIntroEnabled  (                       ) const ;
-        void        EnableIntro     ( sal_Bool bState       )       ;
-        OUString    GetConnectionURL(                       ) const ;
-        void        SetConnectionURL( const OUString& sURL  )       ;
+        sal_Bool	IsIntroEnabled	(						) const	;
+        void		EnableIntro		( sal_Bool bState		)		;
+        OUString	GetConnectionURL(						) const	;
+        void		SetConnectionURL( const OUString& sURL	)		;
 
     //-------------------------------------------------------------------------------------------------------------
-    //  private methods
+    //	private methods
     //-------------------------------------------------------------------------------------------------------------
 
     private:
 
         /*-****************************************************************************************************//**
-            @short      return list of fix key names of ouer configuration management which represent oue module tree
-            @descr      These methods return a static const list of key names. We need it to get needed values from our
+            @short		return list of fix key names of ouer configuration management which represent oue module tree
+            @descr		These methods return a static const list of key names. We need it to get needed values from our
                         configuration management. We return well known key names only - because the "UserData" node
                         is handled in a special way!
 
-            @seealso    -
+            @seealso	-
 
-            @param      -
-            @return     A list of needed configuration keys is returned.
+            @param		-
+            @return		A list of needed configuration keys is returned.
 
-            @onerror    -
+            @onerror	-
         *//*-*****************************************************************************************************/
 
         static Sequence< OUString > impl_GetPropertyNames();
 
     //-------------------------------------------------------------------------------------------------------------
-    //  private member
+    //	private member
     //-------------------------------------------------------------------------------------------------------------
 
     private:
 
-        sal_Bool    m_bShowIntro        ;   /// cache "ShowIntro" of Start section
-        OUString    m_sConnectionURL    ;   /// cache "Connection" of Start section
+        sal_Bool	m_bShowIntro		;	/// cache "ShowIntro" of Start section
+        OUString	m_sConnectionURL	;	/// cache "Connection" of Start section
 };
 
 //_________________________________________________________________________________________________________________
-//  definitions
+//	definitions
 //_________________________________________________________________________________________________________________
 
 //*****************************************************************************************************************
-//  constructor
+//	constructor
 //*****************************************************************************************************************
 SvtStartOptions_Impl::SvtStartOptions_Impl()
     // Init baseclasses first
-    :   ConfigItem          ( ROOTNODE_START    )
+    :	ConfigItem			( ROOTNODE_START	)
     // Init member then.
-    ,   m_bShowIntro        ( DEFAULT_SHOWINTRO )
+    ,	m_bShowIntro		( DEFAULT_SHOWINTRO	)
 {
     // Use our static list of configuration keys to get his values.
-    Sequence< OUString >    seqNames    = impl_GetPropertyNames();
-    Sequence< Any >         seqValues   = GetProperties( seqNames ) ;
+    Sequence< OUString >	seqNames	= impl_GetPropertyNames();
+    Sequence< Any >			seqValues	= GetProperties( seqNames )	;
 
     // Safe impossible cases.
     // We need values from ALL configuration keys.
@@ -203,8 +203,8 @@ SvtStartOptions_Impl::SvtStartOptions_Impl()
     DBG_ASSERT( !(seqNames.getLength()!=seqValues.getLength()), "SvtStartOptions_Impl::SvtStartOptions_Impl()\nI miss some values of configuration keys!\n" );
 
     // Copy values from list in right order to ouer internal member.
-    sal_Int32 nPropertyCount    =   seqValues.getLength()   ;
-    sal_Int32 nProperty         =   0                       ;
+    sal_Int32 nPropertyCount	=	seqValues.getLength()	;
+    sal_Int32 nProperty			=	0						;
     for( nProperty=0; nProperty<nPropertyCount; ++nProperty )
     {
         // Safe impossible cases.
@@ -212,13 +212,13 @@ SvtStartOptions_Impl::SvtStartOptions_Impl()
         DBG_ASSERT( !(seqValues[nProperty].hasValue()==sal_False), "SvtStartOptions_Impl::SvtStartOptions_Impl()\nInvalid property value for property detected!\n" );
         switch( nProperty )
         {
-            case PROPERTYHANDLE_SHOWINTRO       :   {
+            case PROPERTYHANDLE_SHOWINTRO		:	{
                                                             DBG_ASSERT(!(seqValues[nProperty].getValueTypeClass()!=TypeClass_BOOLEAN), "SvtStartOptions_Impl::SvtStartOptions_Impl()\nWho has changed the value type of \"Office.Common\\Start\\ShowIntro\"?" );
                                                         seqValues[nProperty] >>= m_bShowIntro;
                                                     }
                                                     break;
 
-            case PROPERTYHANDLE_CONNECTIONURL   :   {
+            case PROPERTYHANDLE_CONNECTIONURL	:	{
                                                          DBG_ASSERT(!(seqValues[nProperty].getValueTypeClass()!=TypeClass_STRING), "SvtStartOptions_Impl::SvtStartOptions_Impl()\nWho has changed the value type of \"Office.Common\\Start\\Connection\"?" );
                                                         seqValues[nProperty] >>= m_sConnectionURL;
                                                     }
@@ -231,7 +231,7 @@ SvtStartOptions_Impl::SvtStartOptions_Impl()
 }
 
 //*****************************************************************************************************************
-//  destructor
+//	destructor
 //*****************************************************************************************************************
 SvtStartOptions_Impl::~SvtStartOptions_Impl()
 {
@@ -243,7 +243,7 @@ SvtStartOptions_Impl::~SvtStartOptions_Impl()
 }
 
 //*****************************************************************************************************************
-//  public method
+//	public method
 //*****************************************************************************************************************
 void SvtStartOptions_Impl::Notify( const Sequence< OUString >& seqPropertyNames )
 {
@@ -274,23 +274,23 @@ void SvtStartOptions_Impl::Notify( const Sequence< OUString >& seqPropertyNames
 }
 
 //*****************************************************************************************************************
-//  public method
+//	public method
 //*****************************************************************************************************************
 void SvtStartOptions_Impl::Commit()
 {
     // Get names of supported properties, create a list for values and copy current values to it.
-    Sequence< OUString >    seqNames    = impl_GetPropertyNames();
-    sal_Int32               nCount      = seqNames.getLength();
-    Sequence< Any >         seqValues   ( nCount );
+    Sequence< OUString >	seqNames	= impl_GetPropertyNames();
+    sal_Int32				nCount		= seqNames.getLength();
+    Sequence< Any >			seqValues	( nCount );
     for( sal_Int32 nProperty=0; nProperty<nCount; ++nProperty )
     {
         switch( nProperty )
         {
-            case PROPERTYHANDLE_SHOWINTRO       :   {
+            case PROPERTYHANDLE_SHOWINTRO		:	{
                                                          seqValues[nProperty] <<= m_bShowIntro;
                                                      }
                                                      break;
-            case PROPERTYHANDLE_CONNECTIONURL   :   {
+            case PROPERTYHANDLE_CONNECTIONURL	:	{
                                                          seqValues[nProperty] <<= m_sConnectionURL;
                                                      }
                                                      break;
@@ -301,7 +301,7 @@ void SvtStartOptions_Impl::Commit()
 }
 
 //*****************************************************************************************************************
-//  public method
+//	public method
 //*****************************************************************************************************************
 sal_Bool SvtStartOptions_Impl::IsIntroEnabled() const
 {
@@ -309,7 +309,7 @@ sal_Bool SvtStartOptions_Impl::IsIntroEnabled() const
 }
 
 //*****************************************************************************************************************
-//  public method
+//	public method
 //*****************************************************************************************************************
 void SvtStartOptions_Impl::EnableIntro( sal_Bool bState )
 {
@@ -318,7 +318,7 @@ void SvtStartOptions_Impl::EnableIntro( sal_Bool bState )
 }
 
 //*****************************************************************************************************************
-//  public method
+//	public method
 //*****************************************************************************************************************
 OUString SvtStartOptions_Impl::GetConnectionURL() const
 {
@@ -326,7 +326,7 @@ OUString SvtStartOptions_Impl::GetConnectionURL() const
 }
 
 //*****************************************************************************************************************
-//  public method
+//	public method
 //*****************************************************************************************************************
 void SvtStartOptions_Impl::SetConnectionURL( const OUString& sURL )
 {
@@ -335,15 +335,15 @@ void SvtStartOptions_Impl::SetConnectionURL( const OUString& sURL )
 }
 
 //*****************************************************************************************************************
-//  private method
+//	private method
 //*****************************************************************************************************************
 Sequence< OUString > SvtStartOptions_Impl::impl_GetPropertyNames()
 {
     // Build static list of configuration key names.
     static const OUString pProperties[] =
     {
-        PROPERTYNAME_SHOWINTRO      ,
-        PROPERTYNAME_CONNECTIONURL  ,
+        PROPERTYNAME_SHOWINTRO		,
+        PROPERTYNAME_CONNECTIONURL	,
     };
     // Initialize return sequence with these list ...
     static const Sequence< OUString > seqPropertyNames( pProperties, PROPERTYCOUNT );
@@ -352,15 +352,15 @@ Sequence< OUString > SvtStartOptions_Impl::impl_GetPropertyNames()
 }
 
 //*****************************************************************************************************************
-//  initialize static member
-//  DON'T DO IT IN YOUR HEADER!
-//  see definition for further informations
+//	initialize static member
+//	DON'T DO IT IN YOUR HEADER!
+//	see definition for further informations
 //*****************************************************************************************************************
-SvtStartOptions_Impl*   SvtStartOptions::m_pDataContainer   = NULL  ;
-sal_Int32               SvtStartOptions::m_nRefCount        = 0     ;
+SvtStartOptions_Impl*	SvtStartOptions::m_pDataContainer	= NULL	;
+sal_Int32				SvtStartOptions::m_nRefCount		= 0		;
 
 //*****************************************************************************************************************
-//  constructor
+//	constructor
 //*****************************************************************************************************************
 SvtStartOptions::SvtStartOptions()
 {
@@ -379,7 +379,7 @@ SvtStartOptions::SvtStartOptions()
 }
 
 //*****************************************************************************************************************
-//  destructor
+//	destructor
 //*****************************************************************************************************************
 SvtStartOptions::~SvtStartOptions()
 {
@@ -397,7 +397,7 @@ SvtStartOptions::~SvtStartOptions()
 }
 
 //*****************************************************************************************************************
-//  public method
+//	public method
 //*****************************************************************************************************************
 sal_Bool SvtStartOptions::IsIntroEnabled() const
 {
@@ -406,7 +406,7 @@ sal_Bool SvtStartOptions::IsIntroEnabled() const
 }
 
 //*****************************************************************************************************************
-//  public method
+//	public method
 //*****************************************************************************************************************
 void SvtStartOptions::EnableIntro( sal_Bool bState )
 {
@@ -415,7 +415,7 @@ void SvtStartOptions::EnableIntro( sal_Bool bState )
 }
 
 //*****************************************************************************************************************
-//  public method
+//	public method
 //*****************************************************************************************************************
 OUString SvtStartOptions::GetConnectionURL() const
 {
@@ -424,7 +424,7 @@ OUString SvtStartOptions::GetConnectionURL() const
 }
 
 //*****************************************************************************************************************
-//  public method
+//	public method
 //*****************************************************************************************************************
 void SvtStartOptions::SetConnectionURL( const OUString& sURL )
 {
@@ -433,7 +433,7 @@ void SvtStartOptions::SetConnectionURL( const OUString& sURL )
 }
 
 //*****************************************************************************************************************
-//  private method
+//	private method
 //*****************************************************************************************************************
 Mutex& SvtStartOptions::GetOwnStaticMutex()
 {
diff --git a/unotools/source/config/syslocaleoptions.cxx b/unotools/source/config/syslocaleoptions.cxx
index 35333b0db6a8..67c435c8c12c 100644
--- a/unotools/source/config/syslocaleoptions.cxx
+++ b/unotools/source/config/syslocaleoptions.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
@@ -81,10 +81,10 @@ com::sun::star::lang::Locale lcl_str_to_locale( const ::rtl::OUString rStr )
 
 class SvtSysLocaleOptions_Impl : public utl::ConfigItem
 {
-        Locale                  m_aRealLocale;
-        Locale                  m_aRealUILocale;
-        LanguageType            m_eRealLanguage;
-        LanguageType            m_eRealUILanguage;
+        Locale					m_aRealLocale;
+        Locale					m_aRealUILocale;
+        LanguageType			m_eRealLanguage;
+        LanguageType			m_eRealUILanguage;
         OUString                m_aLocaleString;    // en-US or de-DE or empty for SYSTEM
         OUString                m_aUILocaleString;    // en-US or de-DE or empty for SYSTEM
         OUString                m_aCurrencyString;  // USD-en-US or EUR-de-DE
@@ -97,8 +97,8 @@ class SvtSysLocaleOptions_Impl : public utl::ConfigItem
         sal_Bool                m_bRODecimalSeparator;
 
         static  const Sequence< /* const */ OUString >  GetPropertyNames();
-        void                    MakeRealLocale();
-        void                    MakeRealUILocale();
+        void					MakeRealLocale();
+        void					MakeRealUILocale();
 
 public:
                                 SvtSysLocaleOptions_Impl();
@@ -123,26 +123,26 @@ public:
             void                SetDecimalSeparatorAsLocale( sal_Bool bSet);
 
             sal_Bool            IsReadOnly( SvtSysLocaleOptions::EOption eOption ) const;
-            const Locale&       GetRealLocale() { return m_aRealLocale; }
-            const Locale&       GetRealUILocale() { return m_aRealUILocale; }
-            LanguageType        GetRealLanguage() { return m_eRealLanguage; }
-            LanguageType        GetRealUILanguage() { return m_eRealUILanguage; }
+            const Locale&		GetRealLocale() { return m_aRealLocale; }
+            const Locale&		GetRealUILocale() { return m_aRealUILocale; }
+            LanguageType		GetRealLanguage() { return m_eRealLanguage; }
+            LanguageType		GetRealUILanguage() { return m_eRealUILanguage; }
 };
 
 
-#define ROOTNODE_SYSLOCALE              OUString(RTL_CONSTASCII_USTRINGPARAM("Setup/L10N"))
+#define ROOTNODE_SYSLOCALE  			OUString(RTL_CONSTASCII_USTRINGPARAM("Setup/L10N"))
 
-#define PROPERTYNAME_LOCALE             OUString(RTL_CONSTASCII_USTRINGPARAM("ooSetupSystemLocale"))
-#define PROPERTYNAME_UILOCALE           OUString(RTL_CONSTASCII_USTRINGPARAM("ooLocale"))
-#define PROPERTYNAME_CURRENCY           OUString(RTL_CONSTASCII_USTRINGPARAM("ooSetupCurrency"))
-#define PROPERTYNAME_DECIMALSEPARATOR   OUString(RTL_CONSTASCII_USTRINGPARAM("DecimalSeparatorAsLocale"))
+#define PROPERTYNAME_LOCALE         	OUString(RTL_CONSTASCII_USTRINGPARAM("ooSetupSystemLocale"))
+#define PROPERTYNAME_UILOCALE       	OUString(RTL_CONSTASCII_USTRINGPARAM("ooLocale"))
+#define PROPERTYNAME_CURRENCY       	OUString(RTL_CONSTASCII_USTRINGPARAM("ooSetupCurrency"))
+#define PROPERTYNAME_DECIMALSEPARATOR 	OUString(RTL_CONSTASCII_USTRINGPARAM("DecimalSeparatorAsLocale"))
 
-#define PROPERTYHANDLE_LOCALE           0
-#define PROPERTYHANDLE_UILOCALE         1
-#define PROPERTYHANDLE_CURRENCY         2
+#define PROPERTYHANDLE_LOCALE       	0
+#define PROPERTYHANDLE_UILOCALE       	1
+#define PROPERTYHANDLE_CURRENCY     	2
 #define PROPERTYHANDLE_DECIMALSEPARATOR 3
 
-#define PROPERTYCOUNT                   4
+#define PROPERTYCOUNT               	4
 
 const Sequence< OUString > SvtSysLocaleOptions_Impl::GetPropertyNames()
 {
diff --git a/unotools/source/config/undoopt.cxx b/unotools/source/config/undoopt.cxx
index 25cb7837008f..db229baf4f5c 100644
--- a/unotools/source/config/undoopt.cxx
+++ b/unotools/source/config/undoopt.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
diff --git a/unotools/source/config/useroptions.cxx b/unotools/source/config/useroptions.cxx
index 6c63bbfee34b..e8292ae7031b 100644
--- a/unotools/source/config/useroptions.cxx
+++ b/unotools/source/config/useroptions.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
@@ -108,26 +108,26 @@ public:
     ::rtl::OUString   GetLocale() const { return m_aLocale; }
 
     // set the address token
-    void              SetCompany( const ::rtl::OUString& rNewToken );
-    void              SetFirstName( const ::rtl::OUString& rNewToken );
-    void              SetLastName( const ::rtl::OUString& rNewToken );
-    void              SetID( const ::rtl::OUString& rNewToken );
-    void              SetStreet( const ::rtl::OUString& rNewToken );
-    void              SetCity( const ::rtl::OUString& rNewToken );
-    void              SetState( const ::rtl::OUString& rNewToken );
-    void              SetZip( const ::rtl::OUString& rNewToken );
-    void              SetCountry( const ::rtl::OUString& rNewToken );
-    void              SetPosition( const ::rtl::OUString& rNewToken );
-    void              SetTitle( const ::rtl::OUString& rNewToken );
-    void              SetTelephoneHome( const ::rtl::OUString& rNewToken );
-    void              SetTelephoneWork( const ::rtl::OUString& rNewToken );
-    void              SetFax( const ::rtl::OUString& rNewToken );
-    void              SetEmail( const ::rtl::OUString& rNewToken );
-    void              SetCustomerNumber( const ::rtl::OUString& rNewToken );
+    void			  SetCompany( const ::rtl::OUString& rNewToken );
+    void			  SetFirstName( const ::rtl::OUString& rNewToken );
+    void			  SetLastName( const ::rtl::OUString& rNewToken );
+    void			  SetID( const ::rtl::OUString& rNewToken );
+    void			  SetStreet( const ::rtl::OUString& rNewToken );
+    void			  SetCity( const ::rtl::OUString& rNewToken );
+    void			  SetState( const ::rtl::OUString& rNewToken );
+    void			  SetZip( const ::rtl::OUString& rNewToken );
+    void			  SetCountry( const ::rtl::OUString& rNewToken );
+    void			  SetPosition( const ::rtl::OUString& rNewToken );
+    void			  SetTitle( const ::rtl::OUString& rNewToken );
+    void			  SetTelephoneHome( const ::rtl::OUString& rNewToken );
+    void			  SetTelephoneWork( const ::rtl::OUString& rNewToken );
+    void			  SetFax( const ::rtl::OUString& rNewToken );
+    void			  SetEmail( const ::rtl::OUString& rNewToken );
+    void			  SetCustomerNumber( const ::rtl::OUString& rNewToken );
     void              SetFathersName( const ::rtl::OUString& rNewToken );
     void              SetApartment( const ::rtl::OUString& rNewToken );
 
-    sal_Bool          IsTokenReadonly( USHORT nToken ) const;
+    sal_Bool 		  IsTokenReadonly( USHORT nToken ) const;
     ::rtl::OUString   GetToken(USHORT nToken) const;
     void              Notify();
 
@@ -140,10 +140,10 @@ private:
 
 // global ----------------------------------------------------------------
 
-static SvtUserOptions_Impl* pOptions = NULL;
-static sal_Int32            nRefCount = 0;
+static SvtUserOptions_Impl*	pOptions = NULL;
+static sal_Int32			nRefCount = 0;
 
-#define READONLY_DEFAULT    sal_False
+#define READONLY_DEFAULT	sal_False
 
 /*-- 16.06.2009 14:22:56---------------------------------------------------
 
@@ -950,7 +950,7 @@ SvtUserOptions::~SvtUserOptions()
     if ( !--nRefCount )
     {
         //if ( pOptions->IsModified() )
-        //  pOptions->Commit();
+        //	pOptions->Commit();
         DELETEZ( pOptions );
     }
 }
diff --git a/unotools/source/config/viewoptions.cxx b/unotools/source/config/viewoptions.cxx
index 7f2250c611fc..a13641504430 100644
--- a/unotools/source/config/viewoptions.cxx
+++ b/unotools/source/config/viewoptions.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
@@ -28,7 +28,7 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_unotools.hxx"
 //_________________________________________________________________________________________________________________
-//  includes
+//	includes
 //_________________________________________________________________________________________________________________
 
 #include <unotools/viewoptions.hxx>
@@ -47,13 +47,13 @@
 #include <itemholder1.hxx>
 
 //_________________________________________________________________________________________________________________
-//  namespaces
+//	namespaces
 //_________________________________________________________________________________________________________________
 
 namespace css = ::com::sun::star;
 
 //_________________________________________________________________________________________________________________
-//  const
+//	const
 //_________________________________________________________________________________________________________________
 
 #ifdef CONST_ASCII
@@ -107,7 +107,7 @@ namespace css = ::com::sun::star;
     }
 
 //_________________________________________________________________________________________________________________
-//  initialization!
+//	initialization!
 //_________________________________________________________________________________________________________________
 
 SvtViewOptionsBase_Impl*     SvtViewOptions::m_pDataContainer_Dialogs    =   NULL    ;
@@ -120,7 +120,7 @@ SvtViewOptionsBase_Impl*     SvtViewOptions::m_pDataContainer_Windows    =   NUL
 sal_Int32                    SvtViewOptions::m_nRefCount_Windows         =   0       ;
 
 //_________________________________________________________________________________________________________________
-//  private declarations!
+//	private declarations!
 //_________________________________________________________________________________________________________________
 
 /*-************************************************************************************************************//**
@@ -797,16 +797,16 @@ css::uno::Reference< css::uno::XInterface > SvtViewOptionsBase_Impl::impl_getSet
 }
 
 //_________________________________________________________________________________________________________________
-//  definitions
+//	definitions
 //_________________________________________________________________________________________________________________
 
 //*****************************************************************************************************************
-//  constructor
+//	constructor
 //*****************************************************************************************************************
 SvtViewOptions::SvtViewOptions(       EViewType        eType     ,
                                 const ::rtl::OUString& sViewName )
-    :   m_eViewType ( eType     )
-    ,   m_sViewName ( sViewName )
+    :	m_eViewType	( eType		)
+    ,	m_sViewName	( sViewName	)
 {
     // Global access, must be guarded (multithreading!)
     ::osl::MutexGuard aGuard( GetOwnStaticMutex() );
@@ -814,7 +814,7 @@ SvtViewOptions::SvtViewOptions(       EViewType        eType     ,
     // Search for right dat container for this view type and initialize right data container or set right ref count!
     switch( eType )
     {
-        case E_DIALOG       :   {
+        case E_DIALOG		:	{
                                     // Increase ref count for dialog data container first.
                                     ++m_nRefCount_Dialogs;
                                     // If these instance the first user of the dialog data container - create these impl static container!
@@ -826,7 +826,7 @@ SvtViewOptions::SvtViewOptions(       EViewType        eType     ,
                                     }
                                 }
                                 break;
-        case E_TABDIALOG    :   {
+        case E_TABDIALOG	:	{
                                     // Increase ref count for tab-dialog data container first.
                                     ++m_nRefCount_TabDialogs;
                                     // If these instance the first user of the tab-dialog data container - create these impl static container!
@@ -837,7 +837,7 @@ SvtViewOptions::SvtViewOptions(       EViewType        eType     ,
                                     }
                                 }
                                 break;
-        case E_TABPAGE      :   {
+        case E_TABPAGE		:	{
                                     // Increase ref count for tab-page data container first.
                                     ++m_nRefCount_TabPages;
                                     // If these instance the first user of the tab-page data container - create these impl static container!
@@ -848,7 +848,7 @@ SvtViewOptions::SvtViewOptions(       EViewType        eType     ,
                                     }
                                 }
                                 break;
-        case E_WINDOW       :   {
+        case E_WINDOW		:	{
                                     // Increase ref count for window data container first.
                                     ++m_nRefCount_Windows;
                                     // If these instance the first user of the window data container - create these impl static container!
@@ -864,7 +864,7 @@ SvtViewOptions::SvtViewOptions(       EViewType        eType     ,
 }
 
 //*****************************************************************************************************************
-//  destructor
+//	destructor
 //*****************************************************************************************************************
 SvtViewOptions::~SvtViewOptions()
 {
@@ -874,7 +874,7 @@ SvtViewOptions::~SvtViewOptions()
     // Search for right dat container for this view type and deinitialize right data container or set right ref count!
     switch( m_eViewType )
     {
-        case E_DIALOG       :   {
+        case E_DIALOG		:	{
                                     // Decrease ref count for dialog data container first.
                                     --m_nRefCount_Dialogs;
                                     // If these instance the last user of the dialog data container - delete these impl static container!
@@ -885,7 +885,7 @@ SvtViewOptions::~SvtViewOptions()
                                     }
                                 }
                                 break;
-        case E_TABDIALOG    :   {
+        case E_TABDIALOG	:	{
                                     // Decrease ref count for tab-dialog data container first.
                                     --m_nRefCount_TabDialogs;
                                     // If these instance the last user of the tab-dialog data container - delete these impl static container!
@@ -896,7 +896,7 @@ SvtViewOptions::~SvtViewOptions()
                                     }
                                 }
                                 break;
-        case E_TABPAGE      :   {
+        case E_TABPAGE		:	{
                                     // Decrease ref count for tab-page data container first.
                                     --m_nRefCount_TabPages;
                                     // If these instance the last user of the tab-page data container - delete these impl static container!
@@ -907,7 +907,7 @@ SvtViewOptions::~SvtViewOptions()
                                     }
                                 }
                                 break;
-        case E_WINDOW       :   {
+        case E_WINDOW		:	{
                                     // Decrease ref count for window data container first.
                                     --m_nRefCount_Windows;
                                     // If these instance the last user of the window data container - delete these impl static container!
@@ -922,7 +922,7 @@ SvtViewOptions::~SvtViewOptions()
 }
 
 //*****************************************************************************************************************
-//  public method
+//	public method
 //*****************************************************************************************************************
 sal_Bool SvtViewOptions::Exists() const
 {
@@ -932,19 +932,19 @@ sal_Bool SvtViewOptions::Exists() const
     sal_Bool bExists = sal_False;
     switch( m_eViewType )
     {
-        case E_DIALOG       :   {
+        case E_DIALOG		:	{
                                     bExists = m_pDataContainer_Dialogs->Exists( m_sViewName );
                                 }
                                 break;
-        case E_TABDIALOG    :   {
+        case E_TABDIALOG	:	{
                                     bExists = m_pDataContainer_TabDialogs->Exists( m_sViewName );
                                 }
                                 break;
-        case E_TABPAGE      :   {
+        case E_TABPAGE		:	{
                                     bExists = m_pDataContainer_TabPages->Exists( m_sViewName );
                                 }
                                 break;
-        case E_WINDOW       :   {
+        case E_WINDOW		:	{
                                     bExists = m_pDataContainer_Windows->Exists( m_sViewName );
                                 }
                                 break;
@@ -953,7 +953,7 @@ sal_Bool SvtViewOptions::Exists() const
 }
 
 //*****************************************************************************************************************
-//  public method
+//	public method
 //*****************************************************************************************************************
 sal_Bool SvtViewOptions::Delete()
 {
@@ -963,19 +963,19 @@ sal_Bool SvtViewOptions::Delete()
     sal_Bool bState = sal_False;
     switch( m_eViewType )
     {
-        case E_DIALOG       :   {
+        case E_DIALOG		:	{
                                     bState = m_pDataContainer_Dialogs->Delete( m_sViewName );
                                 }
                                 break;
-        case E_TABDIALOG    :   {
+        case E_TABDIALOG	:	{
                                     bState = m_pDataContainer_TabDialogs->Delete( m_sViewName );
                                 }
                                 break;
-        case E_TABPAGE      :   {
+        case E_TABPAGE		:	{
                                     bState = m_pDataContainer_TabPages->Delete( m_sViewName );
                                 }
                                 break;
-        case E_WINDOW       :   {
+        case E_WINDOW		:	{
                                     bState = m_pDataContainer_Windows->Delete( m_sViewName );
                                 }
                                 break;
@@ -984,7 +984,7 @@ sal_Bool SvtViewOptions::Delete()
 }
 
 //*****************************************************************************************************************
-//  public method
+//	public method
 //*****************************************************************************************************************
 ::rtl::OUString SvtViewOptions::GetWindowState() const
 {
@@ -994,19 +994,19 @@ sal_Bool SvtViewOptions::Delete()
     ::rtl::OUString sState;
     switch( m_eViewType )
     {
-        case E_DIALOG       :   {
+        case E_DIALOG		:	{
                                     sState = m_pDataContainer_Dialogs->GetWindowState( m_sViewName );
                                 }
                                 break;
-        case E_TABDIALOG    :   {
+        case E_TABDIALOG	:	{
                                     sState = m_pDataContainer_TabDialogs->GetWindowState( m_sViewName );
                                 }
                                 break;
-        case E_TABPAGE      :   {
+        case E_TABPAGE		:	{
                                     sState = m_pDataContainer_TabPages->GetWindowState( m_sViewName );
                                 }
                                 break;
-        case E_WINDOW       :   {
+        case E_WINDOW		:	{
                                     sState = m_pDataContainer_Windows->GetWindowState( m_sViewName );
                                 }
                                 break;
@@ -1015,7 +1015,7 @@ sal_Bool SvtViewOptions::Delete()
 }
 
 //*****************************************************************************************************************
-//  public method
+//	public method
 //*****************************************************************************************************************
 void SvtViewOptions::SetWindowState( const ::rtl::OUString& sState )
 {
@@ -1024,19 +1024,19 @@ void SvtViewOptions::SetWindowState( const ::rtl::OUString& sState )
 
     switch( m_eViewType )
     {
-        case E_DIALOG       :   {
+        case E_DIALOG		:	{
                                     m_pDataContainer_Dialogs->SetWindowState( m_sViewName, sState );
                                 }
                                 break;
-        case E_TABDIALOG    :   {
+        case E_TABDIALOG	:	{
                                     m_pDataContainer_TabDialogs->SetWindowState( m_sViewName, sState );
                                 }
                                 break;
-        case E_TABPAGE      :   {
+        case E_TABPAGE		:	{
                                     m_pDataContainer_TabPages->SetWindowState( m_sViewName, sState );
                                 }
                                 break;
-        case E_WINDOW       :   {
+        case E_WINDOW		:	{
                                     m_pDataContainer_Windows->SetWindowState( m_sViewName, sState );
                                 }
                                 break;
@@ -1044,7 +1044,7 @@ void SvtViewOptions::SetWindowState( const ::rtl::OUString& sState )
 }
 
 //*****************************************************************************************************************
-//  public method
+//	public method
 //*****************************************************************************************************************
 sal_Int32 SvtViewOptions::GetPageID() const
 {
@@ -1062,7 +1062,7 @@ sal_Int32 SvtViewOptions::GetPageID() const
 }
 
 //*****************************************************************************************************************
-//  public method
+//	public method
 //*****************************************************************************************************************
 void SvtViewOptions::SetPageID( sal_Int32 nID )
 {
@@ -1078,7 +1078,7 @@ void SvtViewOptions::SetPageID( sal_Int32 nID )
 }
 
 //*****************************************************************************************************************
-//  public method
+//	public method
 //*****************************************************************************************************************
 sal_Bool SvtViewOptions::IsVisible() const
 {
@@ -1097,7 +1097,7 @@ sal_Bool SvtViewOptions::IsVisible() const
 }
 
 //*****************************************************************************************************************
-//  public method
+//	public method
 //*****************************************************************************************************************
 void SvtViewOptions::SetVisible( sal_Bool bState )
 {
@@ -1121,19 +1121,19 @@ css::uno::Sequence< css::beans::NamedValue > SvtViewOptions::GetUserData() const
     css::uno::Sequence< css::beans::NamedValue > lData;
     switch( m_eViewType )
     {
-        case E_DIALOG       :   {
+        case E_DIALOG		:	{
                                     lData = m_pDataContainer_Dialogs->GetUserData( m_sViewName );
                                 }
                                 break;
-        case E_TABDIALOG    :   {
+        case E_TABDIALOG	:	{
                                     lData = m_pDataContainer_TabDialogs->GetUserData( m_sViewName );
                                 }
                                 break;
-        case E_TABPAGE      :   {
+        case E_TABPAGE		:	{
                                     lData = m_pDataContainer_TabPages->GetUserData( m_sViewName );
                                 }
                                 break;
-        case E_WINDOW       :   {
+        case E_WINDOW		:	{
                                     lData = m_pDataContainer_Windows->GetUserData( m_sViewName );
                                 }
                                 break;
@@ -1149,19 +1149,19 @@ void SvtViewOptions::SetUserData( const css::uno::Sequence< css::beans::NamedVal
 
     switch( m_eViewType )
     {
-        case E_DIALOG       :   {
+        case E_DIALOG		:	{
                                     m_pDataContainer_Dialogs->SetUserData( m_sViewName, lData );
                                 }
                                 break;
-        case E_TABDIALOG    :   {
+        case E_TABDIALOG	:	{
                                     m_pDataContainer_TabDialogs->SetUserData( m_sViewName, lData );
                                 }
                                 break;
-        case E_TABPAGE      :   {
+        case E_TABPAGE		:	{
                                     m_pDataContainer_TabPages->SetUserData( m_sViewName, lData );
                                 }
                                 break;
-        case E_WINDOW       :   {
+        case E_WINDOW		:	{
                                     m_pDataContainer_Windows->SetUserData( m_sViewName, lData );
                                 }
                                 break;
@@ -1177,19 +1177,19 @@ css::uno::Any SvtViewOptions::GetUserItem( const ::rtl::OUString& sName ) const
     css::uno::Any aItem;
     switch( m_eViewType )
     {
-        case E_DIALOG       :   {
+        case E_DIALOG		:	{
                                     aItem = m_pDataContainer_Dialogs->GetUserItem( m_sViewName, sName );
                                 }
                                 break;
-        case E_TABDIALOG    :   {
+        case E_TABDIALOG	:	{
                                     aItem = m_pDataContainer_TabDialogs->GetUserItem( m_sViewName, sName );
                                 }
                                 break;
-        case E_TABPAGE      :   {
+        case E_TABPAGE		:	{
                                     aItem = m_pDataContainer_TabPages->GetUserItem( m_sViewName, sName );
                                 }
                                 break;
-        case E_WINDOW       :   {
+        case E_WINDOW		:	{
                                     aItem = m_pDataContainer_Windows->GetUserItem( m_sViewName, sName );
                                 }
                                 break;
@@ -1206,19 +1206,19 @@ void SvtViewOptions::SetUserItem( const ::rtl::OUString& sName  ,
 
     switch( m_eViewType )
     {
-        case E_DIALOG       :   {
+        case E_DIALOG		:	{
                                     m_pDataContainer_Dialogs->SetUserItem( m_sViewName, sName, aValue );
                                 }
                                 break;
-        case E_TABDIALOG    :   {
+        case E_TABDIALOG	:	{
                                     m_pDataContainer_TabDialogs->SetUserItem( m_sViewName, sName, aValue );
                                 }
                                 break;
-        case E_TABPAGE      :   {
+        case E_TABPAGE		:	{
                                     m_pDataContainer_TabPages->SetUserItem( m_sViewName, sName, aValue );
                                 }
                                 break;
-        case E_WINDOW       :   {
+        case E_WINDOW		:	{
                                     m_pDataContainer_Windows->SetUserItem( m_sViewName, sName, aValue );
                                 }
                                 break;
@@ -1226,7 +1226,7 @@ void SvtViewOptions::SetUserItem( const ::rtl::OUString& sName  ,
 }
 
 //*****************************************************************************************************************
-//  private method
+//	private method
 //*****************************************************************************************************************
 ::osl::Mutex& SvtViewOptions::GetOwnStaticMutex()
 {
diff --git a/unotools/source/config/workingsetoptions.cxx b/unotools/source/config/workingsetoptions.cxx
index aebac3377510..f581cc4e0106 100644
--- a/unotools/source/config/workingsetoptions.cxx
+++ b/unotools/source/config/workingsetoptions.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
@@ -31,7 +31,7 @@
 #endif
 
 //_________________________________________________________________________________________________________________
-//  includes
+//	includes
 //_________________________________________________________________________________________________________________
 
 #include <unotools/workingsetoptions.hxx>
@@ -44,147 +44,147 @@
 #include <itemholder1.hxx>
 
 //_________________________________________________________________________________________________________________
-//  namespaces
+//	namespaces
 //_________________________________________________________________________________________________________________
 
-using namespace ::utl                   ;
-using namespace ::rtl                   ;
-using namespace ::osl                   ;
-using namespace ::com::sun::star::uno   ;
+using namespace ::utl					;
+using namespace ::rtl					;
+using namespace ::osl					;
+using namespace ::com::sun::star::uno	;
 
 //_________________________________________________________________________________________________________________
-//  const
+//	const
 //_________________________________________________________________________________________________________________
 
-#define ROOTNODE_WORKINGSET             OUString(RTL_CONSTASCII_USTRINGPARAM("Office.Common/WorkingSet"))
-#define DEFAULT_WINDOWLIST              Sequence< OUString >()
+#define	ROOTNODE_WORKINGSET				OUString(RTL_CONSTASCII_USTRINGPARAM("Office.Common/WorkingSet"))
+#define	DEFAULT_WINDOWLIST				Sequence< OUString >()
 
-#define PROPERTYNAME_WINDOWLIST         OUString(RTL_CONSTASCII_USTRINGPARAM("WindowList"       ))
+#define	PROPERTYNAME_WINDOWLIST			OUString(RTL_CONSTASCII_USTRINGPARAM("WindowList"		))
 
-#define PROPERTYHANDLE_WINDOWLIST       0
+#define	PROPERTYHANDLE_WINDOWLIST		0
 
-#define PROPERTYCOUNT                   1
+#define	PROPERTYCOUNT					1
 
 //_________________________________________________________________________________________________________________
-//  private declarations!
+//	private declarations!
 //_________________________________________________________________________________________________________________
 
 class SvtWorkingSetOptions_Impl : public ConfigItem
 {
     //-------------------------------------------------------------------------------------------------------------
-    //  public methods
+    //	public methods
     //-------------------------------------------------------------------------------------------------------------
 
     public:
 
         //---------------------------------------------------------------------------------------------------------
-        //  constructor / destructor
+        //	constructor / destructor
         //---------------------------------------------------------------------------------------------------------
 
          SvtWorkingSetOptions_Impl();
         ~SvtWorkingSetOptions_Impl();
 
         //---------------------------------------------------------------------------------------------------------
-        //  overloaded methods of baseclass
+        //	overloaded methods of baseclass
         //---------------------------------------------------------------------------------------------------------
 
         /*-****************************************************************************************************//**
-            @short      called for notify of configmanager
-            @descr      These method is called from the ConfigManager before application ends or from the
+            @short		called for notify of configmanager
+            @descr		These method is called from the ConfigManager before application ends or from the
                          PropertyChangeListener if the sub tree broadcasts changes. You must update your
                         internal values.
 
-            @seealso    baseclass ConfigItem
+            @seealso	baseclass ConfigItem
 
-            @param      "seqPropertyNames" is the list of properties which should be updated.
-            @return     -
+            @param		"seqPropertyNames" is the list of properties which should be updated.
+            @return		-
 
-            @onerror    -
+            @onerror	-
         *//*-*****************************************************************************************************/
 
         virtual void Notify( const Sequence< OUString >& seqPropertyNames );
 
         /*-****************************************************************************************************//**
-            @short      write changes to configuration
-            @descr      These method writes the changed values into the sub tree
+            @short		write changes to configuration
+            @descr		These method writes the changed values into the sub tree
                         and should always called in our destructor to guarantee consistency of config data.
 
-            @seealso    baseclass ConfigItem
+            @seealso	baseclass ConfigItem
 
-            @param      -
-            @return     -
+            @param		-
+            @return		-
 
-            @onerror    -
+            @onerror	-
         *//*-*****************************************************************************************************/
 
         virtual void Commit();
 
         //---------------------------------------------------------------------------------------------------------
-        //  public interface
+        //	public interface
         //---------------------------------------------------------------------------------------------------------
 
         /*-****************************************************************************************************//**
-            @short      access method to get internal values
-            @descr      These method give us a chance to regulate acces to ouer internal values.
+            @short		access method to get internal values
+            @descr		These method give us a chance to regulate acces to ouer internal values.
                         It's not used in the moment - but it's possible for the feature!
 
-            @seealso    -
+            @seealso	-
 
-            @param      -
-            @return     -
+            @param		-
+            @return		-
 
-            @onerror    -
+            @onerror	-
         *//*-*****************************************************************************************************/
 
-        Sequence< OUString >    GetWindowList(                                              ) const ;
-        void                    SetWindowList( const Sequence< OUString >&  seqWindowList   )       ;
+        Sequence< OUString >	GetWindowList(												) const	;
+        void					SetWindowList( const Sequence< OUString >&	seqWindowList	)		;
 
     //-------------------------------------------------------------------------------------------------------------
-    //  private methods
+    //	private methods
     //-------------------------------------------------------------------------------------------------------------
 
     private:
 
         /*-****************************************************************************************************//**
-            @short      return list of key names of ouer configuration management which represent oue module tree
-            @descr      These methods return a static const list of key names. We need it to get needed values from our
+            @short		return list of key names of ouer configuration management which represent oue module tree
+            @descr		These methods return a static const list of key names. We need it to get needed values from our
                         configuration management.
 
-            @seealso    -
+            @seealso	-
 
-            @param      -
-            @return     A list of needed configuration keys is returned.
+            @param		-
+            @return		A list of needed configuration keys is returned.
 
-            @onerror    -
+            @onerror	-
         *//*-*****************************************************************************************************/
 
         static Sequence< OUString > GetPropertyNames();
 
     //-------------------------------------------------------------------------------------------------------------
-    //  private member
+    //	private member
     //-------------------------------------------------------------------------------------------------------------
 
     private:
 
-        Sequence< OUString >    m_seqWindowList     ;
+        Sequence< OUString >	m_seqWindowList		;
 };
 
 //_________________________________________________________________________________________________________________
-//  definitions
+//	definitions
 //_________________________________________________________________________________________________________________
 
 //*****************************************************************************************************************
-//  constructor
+//	constructor
 //*****************************************************************************************************************
 SvtWorkingSetOptions_Impl::SvtWorkingSetOptions_Impl()
     // Init baseclasses first
-    :   ConfigItem          ( ROOTNODE_WORKINGSET   )
+    :	ConfigItem			( ROOTNODE_WORKINGSET	)
     // Init member then.
-    ,   m_seqWindowList     ( DEFAULT_WINDOWLIST    )
+    ,	m_seqWindowList		( DEFAULT_WINDOWLIST	)
 {
     // Use our static list of configuration keys to get his values.
-    Sequence< OUString >    seqNames    = GetPropertyNames  (           );
-    Sequence< Any >         seqValues   = GetProperties     ( seqNames  );
+    Sequence< OUString >	seqNames	= GetPropertyNames	(			);
+    Sequence< Any >			seqValues	= GetProperties		( seqNames	);
 
     // Safe impossible cases.
     // We need values from ALL configuration keys.
@@ -200,7 +200,7 @@ SvtWorkingSetOptions_Impl::SvtWorkingSetOptions_Impl()
         DBG_ASSERT( !(seqValues[nProperty].hasValue()==sal_False), "SvtWorkingSetOptions_Impl::SvtWorkingSetOptions_Impl()\nInvalid property value detected!\n" );
         switch( nProperty )
         {
-            case PROPERTYHANDLE_WINDOWLIST      :   {
+            case PROPERTYHANDLE_WINDOWLIST		:	{
                                                         DBG_ASSERT(!(seqValues[nProperty].getValueTypeClass()!=TypeClass_SEQUENCE), "SvtWorkingSetOptions_Impl::SvtWorkingSetOptions_Impl()\nWho has changed the value type of \"Office.Common\\WorkingSet\\WindowList\"?" );
                                                         seqValues[nProperty] >>= m_seqWindowList;
                                                     }
@@ -214,7 +214,7 @@ SvtWorkingSetOptions_Impl::SvtWorkingSetOptions_Impl()
 }
 
 //*****************************************************************************************************************
-//  destructor
+//	destructor
 //*****************************************************************************************************************
 SvtWorkingSetOptions_Impl::~SvtWorkingSetOptions_Impl()
 {
@@ -226,7 +226,7 @@ SvtWorkingSetOptions_Impl::~SvtWorkingSetOptions_Impl()
 }
 
 //*****************************************************************************************************************
-//  public method
+//	public method
 //*****************************************************************************************************************
 void SvtWorkingSetOptions_Impl::Notify( const Sequence< OUString >& seqPropertyNames )
 {
@@ -251,19 +251,19 @@ void SvtWorkingSetOptions_Impl::Notify( const Sequence< OUString >& seqPropertyN
 }
 
 //*****************************************************************************************************************
-//  public method
+//	public method
 //*****************************************************************************************************************
 void SvtWorkingSetOptions_Impl::Commit()
 {
     // Get names of supported properties, create a list for values and copy current values to it.
-    Sequence< OUString >    seqNames    = GetPropertyNames  ();
-    sal_Int32               nCount      = seqNames.getLength();
-    Sequence< Any >         seqValues   ( nCount );
+    Sequence< OUString >	seqNames	= GetPropertyNames	();
+    sal_Int32				nCount		= seqNames.getLength();
+    Sequence< Any >			seqValues	( nCount );
     for( sal_Int32 nProperty=0; nProperty<nCount; ++nProperty )
     {
         switch( nProperty )
         {
-            case PROPERTYHANDLE_WINDOWLIST      :   {
+            case PROPERTYHANDLE_WINDOWLIST		:	{
                                                         seqValues[nProperty] <<= m_seqWindowList;
                                                     }
                                                     break;
@@ -274,7 +274,7 @@ void SvtWorkingSetOptions_Impl::Commit()
 }
 
 //*****************************************************************************************************************
-//  public method
+//	public method
 //*****************************************************************************************************************
 Sequence< OUString > SvtWorkingSetOptions_Impl::GetWindowList() const
 {
@@ -282,7 +282,7 @@ Sequence< OUString > SvtWorkingSetOptions_Impl::GetWindowList() const
 }
 
 //*****************************************************************************************************************
-//  public method
+//	public method
 //*****************************************************************************************************************
 void SvtWorkingSetOptions_Impl::SetWindowList( const Sequence< OUString >& seqWindowList )
 {
@@ -291,14 +291,14 @@ void SvtWorkingSetOptions_Impl::SetWindowList( const Sequence< OUString >& seqWi
 }
 
 //*****************************************************************************************************************
-//  private method
+//	private method
 //*****************************************************************************************************************
 Sequence< OUString > SvtWorkingSetOptions_Impl::GetPropertyNames()
 {
     // Build static list of configuration key names.
     static const OUString pProperties[] =
     {
-        PROPERTYNAME_WINDOWLIST ,
+        PROPERTYNAME_WINDOWLIST	,
     };
     // Initialize return sequence with these list ...
     static const Sequence< OUString > seqPropertyNames( pProperties, PROPERTYCOUNT );
@@ -307,15 +307,15 @@ Sequence< OUString > SvtWorkingSetOptions_Impl::GetPropertyNames()
 }
 
 //*****************************************************************************************************************
-//  initialize static member
-//  DON'T DO IT IN YOUR HEADER!
-//  see definition for further informations
+//	initialize static member
+//	DON'T DO IT IN YOUR HEADER!
+//	see definition for further informations
 //*****************************************************************************************************************
-SvtWorkingSetOptions_Impl*  SvtWorkingSetOptions::m_pDataContainer  = NULL  ;
-sal_Int32                   SvtWorkingSetOptions::m_nRefCount       = 0     ;
+SvtWorkingSetOptions_Impl*	SvtWorkingSetOptions::m_pDataContainer	= NULL	;
+sal_Int32					SvtWorkingSetOptions::m_nRefCount		= 0		;
 
 //*****************************************************************************************************************
-//  constructor
+//	constructor
 //*****************************************************************************************************************
 SvtWorkingSetOptions::SvtWorkingSetOptions()
 {
@@ -332,7 +332,7 @@ SvtWorkingSetOptions::SvtWorkingSetOptions()
 }
 
 //*****************************************************************************************************************
-//  destructor
+//	destructor
 //*****************************************************************************************************************
 SvtWorkingSetOptions::~SvtWorkingSetOptions()
 {
@@ -350,7 +350,7 @@ SvtWorkingSetOptions::~SvtWorkingSetOptions()
 }
 
 //*****************************************************************************************************************
-//  public method
+//	public method
 //*****************************************************************************************************************
 Sequence< OUString > SvtWorkingSetOptions::GetWindowList() const
 {
@@ -359,7 +359,7 @@ Sequence< OUString > SvtWorkingSetOptions::GetWindowList() const
 }
 
 //*****************************************************************************************************************
-//  public method
+//	public method
 //*****************************************************************************************************************
 void SvtWorkingSetOptions::SetWindowList( const Sequence< OUString >& seqWindowList )
 {
@@ -368,7 +368,7 @@ void SvtWorkingSetOptions::SetWindowList( const Sequence< OUString >& seqWindowL
 }
 
 //*****************************************************************************************************************
-//  private method
+//	private method
 //*****************************************************************************************************************
 Mutex& SvtWorkingSetOptions::GetOwnStaticMutex()
 {
diff --git a/unotools/source/config/xmlaccelcfg.cxx b/unotools/source/config/xmlaccelcfg.cxx
index a446c60bbdc5..880f1705bb09 100644
--- a/unotools/source/config/xmlaccelcfg.cxx
+++ b/unotools/source/config/xmlaccelcfg.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
@@ -38,14 +38,14 @@ using namespace rtl;
 using namespace com::sun::star::uno;
 using namespace com::sun::star::xml::sax;
 
-#define ELEMENT_ACCELERATORLIST     "acceleratorlist"
-#define ELEMENT_ACCELERATORITEM     "item"
+#define	ELEMENT_ACCELERATORLIST		"acceleratorlist"
+#define ELEMENT_ACCELERATORITEM		"item"
 
-#define ATTRIBUTE_KEYCODE           "code"
-#define ATTRIBUTE_MODIFIER          "modifier"
-#define ATTRIBUTE_URL               "url"
+#define ATTRIBUTE_KEYCODE			"code"
+#define ATTRIBUTE_MODIFIER			"modifier"
+#define ATTRIBUTE_URL				"url"
 
-#define ATTRIBUTE_TYPE_CDATA        "CDATA"
+#define ATTRIBUTE_TYPE_CDATA		"CDATA"
 
 // ------------------------------------------------------------------
 
@@ -80,9 +80,9 @@ struct TagAttribute
     TagAttribute(){}
     TagAttribute( const OUString &aName, const OUString &aType , const OUString &aValue )
     {
-        sName   = aName;
-        sType   = aType;
-        sValue  = aValue;
+        sName 	= aName;
+        sType 	= aType;
+        sValue 	= aValue;
     }
 
     OUString sName;
@@ -179,7 +179,7 @@ AttributeListImpl::~AttributeListImpl()
 }
 
 
-void AttributeListImpl::addAttribute(   const OUString &sName ,
+void AttributeListImpl::addAttribute( 	const OUString &sName ,
                                         const OUString &sType ,
                                         const OUString &sValue )
 {
@@ -219,7 +219,7 @@ throw( SAXException, RuntimeException )
 
 void SAL_CALL OReadAccelatorDocumentHandler::setDocumentLocator(
     const Reference< XLocator > &xLocator)
-throw(  SAXException, RuntimeException )
+throw(	SAXException, RuntimeException )
 {
     m_xLocator = xLocator;
 }
@@ -314,7 +314,7 @@ throw( SAXException, RuntimeException )
 
 
 void SAL_CALL OReadAccelatorDocumentHandler::characters(const rtl::OUString&)
-throw(  SAXException, RuntimeException )
+throw(	SAXException, RuntimeException )
 {
 }
 
diff --git a/unotools/source/i18n/calendarwrapper.cxx b/unotools/source/i18n/calendarwrapper.cxx
index ebf8146ef0fa..41696717a75e 100644
--- a/unotools/source/i18n/calendarwrapper.cxx
+++ b/unotools/source/i18n/calendarwrapper.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
@@ -78,7 +78,7 @@ CalendarWrapper::CalendarWrapper(
         }
     }
     else
-    {   // try to get an instance somehow
+    {	// try to get an instance somehow
         DBG_ERRORFILE( "CalendarWrapper: no service manager, trying own" );
         try
         {
diff --git a/unotools/source/i18n/charclass.cxx b/unotools/source/i18n/charclass.cxx
index e82fd7a603ad..ad5fbe208e01 100644
--- a/unotools/source/i18n/charclass.cxx
+++ b/unotools/source/i18n/charclass.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
@@ -68,7 +68,7 @@ CharClass::CharClass(
         }
     }
     else
-    {   // try to get an instance somehow
+    {	// try to get an instance somehow
         getComponentInstance();
     }
 }
@@ -290,7 +290,7 @@ sal_Bool CharClass::isNumeric( const String& rStr ) const
 }
 
 
-sal_Bool CharClass::isAlphaNumeric( const String& rStr, xub_StrLen nPos ) const
+sal_Bool CharClass::isAlphaNumeric( const String& rStr,	xub_StrLen nPos ) const
 {
     sal_Unicode c = rStr.GetChar( nPos );
     if ( c < 128 )
diff --git a/unotools/source/i18n/collatorwrapper.cxx b/unotools/source/i18n/collatorwrapper.cxx
index f4d679607424..fb6652d34221 100644
--- a/unotools/source/i18n/collatorwrapper.cxx
+++ b/unotools/source/i18n/collatorwrapper.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
diff --git a/unotools/source/i18n/intlwrapper.cxx b/unotools/source/i18n/intlwrapper.cxx
index 9f52cc60bfeb..97d6b3c9df37 100644
--- a/unotools/source/i18n/intlwrapper.cxx
+++ b/unotools/source/i18n/intlwrapper.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
diff --git a/unotools/source/i18n/localedatawrapper.cxx b/unotools/source/i18n/localedatawrapper.cxx
index 8bbe6f182862..baa63e09b3a8 100644
--- a/unotools/source/i18n/localedatawrapper.cxx
+++ b/unotools/source/i18n/localedatawrapper.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
@@ -111,7 +111,7 @@ LocaleDataWrapper::LocaleDataWrapper(
         }
     }
     else
-    {   // try to get an instance somehow
+    {	// try to get an instance somehow
         DBG_ERRORFILE( "LocaleDataWrapper: no service manager, trying own" );
         try
         {
@@ -466,7 +466,7 @@ void LocaleDataWrapper::invalidateData()
 
         // In checks, exclude known problems because no MS-LCID defined.
         if (areChecksEnabled() && eLang == LANGUAGE_DONTKNOW
-//              && !aDebugLocale.EqualsAscii( "br_AE" ) // ?!? Breton in United Arabic Emirates
+//				&& !aDebugLocale.EqualsAscii( "br_AE" )	// ?!? Breton in United Arabic Emirates
             )
         {
             String aMsg( RTL_CONSTASCII_USTRINGPARAM(
@@ -491,10 +491,10 @@ void LocaleDataWrapper::invalidateData()
                 // In checks, exclude known problems because no MS-LCID defined
                 // and default for Language found.
                 if ( areChecksEnabled()
-                        && !aDebugLocale.EqualsAscii( "ar_SD" ) // Sudan/ar
-                        && !aDebugLocale.EqualsAscii( "en_CB" ) // Carribean is not a country
-//                      && !aDebugLocale.EqualsAscii( "en_BG" ) // ?!? Bulgaria/en
-//                      && !aDebugLocale.EqualsAscii( "es_BR" ) // ?!? Brazil/es
+                        && !aDebugLocale.EqualsAscii( "ar_SD" )	// Sudan/ar
+                        && !aDebugLocale.EqualsAscii( "en_CB" )	// Carribean is not a country
+//						&& !aDebugLocale.EqualsAscii( "en_BG" )	// ?!? Bulgaria/en
+//						&& !aDebugLocale.EqualsAscii( "es_BR" )	// ?!? Brazil/es
                     )
                 {
                     String aMsg( RTL_CONSTASCII_USTRINGPARAM(
@@ -533,7 +533,7 @@ const String& LocaleDataWrapper::getOneLocaleItem( sal_Int16 nItem ) const
         return aLocaleItem[0];
     }
     if ( aLocaleItem[nItem].Len() == 0 )
-    {   // no cached content
+    {	// no cached content
         aGuard.changeReadToWrite();
         ((LocaleDataWrapper*)this)->getOneLocaleItemImpl( nItem );
     }
@@ -629,7 +629,7 @@ const String& LocaleDataWrapper::getOneReservedWord( sal_Int16 nWord ) const
         nWord = reservedWords::FALSE_WORD;
     }
     if ( aReservedWord[nWord].Len() == 0 )
-    {   // no cached content
+    {	// no cached content
         aGuard.changeReadToWrite();
         ((LocaleDataWrapper*)this)->getOneReservedWordImpl( nWord );
     }
@@ -675,7 +675,7 @@ const ::boost::shared_ptr< ::com::sun::star::i18n::Calendar > LocaleDataWrapper:
 {
     ::utl::ReadWriteGuard aGuard( aMutex );
     if (!xDefaultCalendar)
-    {   // no cached content
+    {	// no cached content
         aGuard.changeReadToWrite();
         ((LocaleDataWrapper*)this)->getDefaultCalendarImpl();
     }
@@ -859,7 +859,7 @@ void LocaleDataWrapper::scanCurrFormatImpl( const String& rCode,
                 break;
                 default:
                     if ( !nInSection && nSym == STRING_NOTFOUND && rCode.Equals( aCurrSymbol, (xub_StrLen)(p-pStr), aCurrSymbol.Len() ) )
-                    {   // currency symbol not surrounded by [$...]
+                    {	// currency symbol not surrounded by [$...]
                         nSym = (xub_StrLen)(p - pStr);
                         if ( nBlank == STRING_NOTFOUND && pStr < p && *(p-1) == ' ' )
                             nBlank = (xub_StrLen)(p - pStr - 1);
@@ -881,7 +881,7 @@ void LocaleDataWrapper::getCurrFormatsImpl()
         = aNumberFormatCode.getAllFormatCode( KNumberFormatUsage::CURRENCY );
     sal_Int32 nCnt = aFormatSeq.getLength();
     if ( !nCnt )
-    {   // bad luck
+    {	// bad luck
         if (areChecksEnabled())
         {
             String aMsg( RTL_CONSTASCII_USTRINGPARAM(
@@ -940,16 +940,16 @@ void LocaleDataWrapper::getCurrFormatsImpl()
     if ( nBlank == STRING_NOTFOUND )
     {
         if ( nSym < nNum )
-            nCurrPositiveFormat = 0;    // $1
+            nCurrPositiveFormat = 0;	// $1
         else
-            nCurrPositiveFormat = 1;    // 1$
+            nCurrPositiveFormat = 1;	// 1$
     }
     else
     {
         if ( nSym < nNum )
-            nCurrPositiveFormat = 2;    // $ 1
+            nCurrPositiveFormat = 2;	// $ 1
         else
-            nCurrPositiveFormat = 3;    // 1 $
+            nCurrPositiveFormat = 3;	// 1 $
     }
 
     // negative format
@@ -973,24 +973,24 @@ void LocaleDataWrapper::getCurrFormatsImpl()
             if ( nSym < nNum )
             {
                 if ( nPar < nSym )
-                    nCurrNegativeFormat = 0;    // ($1)
+                    nCurrNegativeFormat = 0;	// ($1)
                 else if ( nSign < nSym )
-                    nCurrNegativeFormat = 1;    // -$1
+                    nCurrNegativeFormat = 1;	// -$1
                 else if ( nNum < nSign )
-                    nCurrNegativeFormat = 3;    // $1-
+                    nCurrNegativeFormat = 3;	// $1-
                 else
-                    nCurrNegativeFormat = 2;    // $-1
+                    nCurrNegativeFormat = 2;	// $-1
             }
             else
             {
                 if ( nPar < nNum )
-                    nCurrNegativeFormat = 4;    // (1$)
+                    nCurrNegativeFormat = 4;	// (1$)
                 else if ( nSign < nNum )
-                    nCurrNegativeFormat = 5;    // -1$
+                    nCurrNegativeFormat = 5;	// -1$
                 else if ( nSym < nSign )
-                    nCurrNegativeFormat = 7;    // 1$-
+                    nCurrNegativeFormat = 7;	// 1$-
                 else
-                    nCurrNegativeFormat = 6;    // 1-$
+                    nCurrNegativeFormat = 6;	// 1-$
             }
         }
         else
@@ -998,24 +998,24 @@ void LocaleDataWrapper::getCurrFormatsImpl()
             if ( nSym < nNum )
             {
                 if ( nPar < nSym )
-                    nCurrNegativeFormat = 14;   // ($ 1)
+                    nCurrNegativeFormat = 14;	// ($ 1)
                 else if ( nSign < nSym )
-                    nCurrNegativeFormat = 9;    // -$ 1
+                    nCurrNegativeFormat = 9;	// -$ 1
                 else if ( nNum < nSign )
-                    nCurrNegativeFormat = 12;   // $ 1-
+                    nCurrNegativeFormat = 12;	// $ 1-
                 else
-                    nCurrNegativeFormat = 11;   // $ -1
+                    nCurrNegativeFormat = 11;	// $ -1
             }
             else
             {
                 if ( nPar < nNum )
-                    nCurrNegativeFormat = 15;   // (1 $)
+                    nCurrNegativeFormat = 15;	// (1 $)
                 else if ( nSign < nNum )
-                    nCurrNegativeFormat = 8;    // -1 $
+                    nCurrNegativeFormat = 8;	// -1 $
                 else if ( nSym < nSign )
-                    nCurrNegativeFormat = 10;   // 1 $-
+                    nCurrNegativeFormat = 10;	// 1 $-
                 else
-                    nCurrNegativeFormat = 13;   // 1- $
+                    nCurrNegativeFormat = 13;	// 1- $
             }
         }
     }
@@ -1060,9 +1060,9 @@ DateFormat LocaleDataWrapper::scanDateFormatImpl( const String& rCode )
     xub_StrLen nMonth = rCode.Search( 'M' );
     xub_StrLen nYear = rCode.Search( 'Y' );
     if ( nDay == STRING_NOTFOUND || nMonth == STRING_NOTFOUND || nYear == STRING_NOTFOUND )
-    {   // This algorithm assumes that all three parts (DMY) are present
+    {	// This algorithm assumes that all three parts (DMY) are present
         if ( nMonth == STRING_NOTFOUND )
-        {   // only Finnish has something else than 'M' for month
+        {	// only Finnish has something else than 'M' for month
             nMonth = rCode.Search( 'K' );
             if ( nMonth != STRING_NOTFOUND )
             {
@@ -1071,30 +1071,30 @@ DateFormat LocaleDataWrapper::scanDateFormatImpl( const String& rCode )
             }
         }
         else if ( nDay == STRING_NOTFOUND )
-        {   // We have a month 'M' if we reach this branch.
+        {	// We have a month 'M' if we reach this branch.
             // Possible languages containing 'M' but no 'D':
             // German, French, Italian
-            nDay = rCode.Search( 'T' );         // German
+            nDay = rCode.Search( 'T' );			// German
             if ( nDay != STRING_NOTFOUND )
                 nYear = rCode.Search( 'J' );
             else
             {
-                nYear = rCode.Search( 'A' );    // French, Italian
+                nYear = rCode.Search( 'A' );	// French, Italian
                 if ( nYear != STRING_NOTFOUND )
                 {
-                    nDay = rCode.Search( 'J' ); // French
+                    nDay = rCode.Search( 'J' );	// French
                     if ( nDay == STRING_NOTFOUND )
-                        nDay = rCode.Search( 'G' ); // Italian
+                        nDay = rCode.Search( 'G' );	// Italian
                 }
             }
         }
         else
-        {   // We have a month 'M' and a day 'D'.
+        {	// We have a month 'M' and a day 'D'.
             // Possible languages containing 'D' and 'M' but not 'Y':
             // Spanish, Dutch
-            nYear = rCode.Search( 'A' );        // Spanish
+            nYear = rCode.Search( 'A' );		// Spanish
             if ( nYear == STRING_NOTFOUND )
-                nYear = rCode.Search( 'J' );    // Dutch
+                nYear = rCode.Search( 'J' );	// Dutch
         }
         if ( nDay == STRING_NOTFOUND || nMonth == STRING_NOTFOUND || nYear == STRING_NOTFOUND )
         {
@@ -1114,7 +1114,7 @@ DateFormat LocaleDataWrapper::scanDateFormatImpl( const String& rCode )
     }
     // compare with <= because each position may equal rCode.Len()
     if ( nDay <= nMonth && nMonth <= nYear )
-        return DMY;     // also if every position equals rCode.Len()
+        return DMY;		// also if every position equals rCode.Len()
     else if ( nMonth <= nDay && nDay <= nYear )
         return MDY;
     else if ( nYear <= nMonth && nMonth <= nDay )
@@ -1139,7 +1139,7 @@ void LocaleDataWrapper::getDateFormatsImpl()
         = aNumberFormatCode.getAllFormatCode( KNumberFormatUsage::DATE );
     sal_Int32 nCnt = aFormatSeq.getLength();
     if ( !nCnt )
-    {   // bad luck
+    {	// bad luck
         if (areChecksEnabled())
         {
             String aMsg( RTL_CONSTASCII_USTRINGPARAM(
@@ -1263,7 +1263,7 @@ const ::com::sun::star::uno::Sequence< sal_Int32 > LocaleDataWrapper::getDigitGr
 {
     ::utl::ReadWriteGuard aGuard( aMutex );
     if (!aGrouping.getLength() || aGrouping[0] == 0)
-    {   // no cached content
+    {	// no cached content
         aGuard.changeReadToWrite();
         ((LocaleDataWrapper*)this)->getDigitGroupingImpl();
     }
@@ -1400,9 +1400,9 @@ sal_Unicode* LocaleDataWrapper::ImplAddFormatNum( sal_Unicode* pBuf,
 {
     sal_Unicode aNumBuf[64];
     sal_Unicode* pNumBuf;
-    USHORT  nNumLen;
-    USHORT  i = 0;
-    BOOL    bNeg;
+    USHORT	nNumLen;
+    USHORT	i = 0;
+    BOOL	bNeg;
 
     // negative number
     if ( nNumber < 0 )
@@ -1714,7 +1714,7 @@ String LocaleDataWrapper::getNum( sal_Int64 nNumber, USHORT nDecimals,
         BOOL bUseThousandSep, BOOL bTrailingZeros ) const
 {
     ::utl::ReadWriteGuard aGuard( aMutex, ::utl::ReadWriteGuardMode::nBlockCritical );
-    sal_Unicode aBuf[128];      // big enough for 64-bit long and crazy grouping
+    sal_Unicode aBuf[128];		// big enough for 64-bit long and crazy grouping
     // check if digits and separators will fit into fixed buffer or allocate
     size_t nGuess = ImplGetNumberStringLengthGuess( *this, nDecimals );
     sal_Unicode* const pBuffer = (nGuess < 118 ? aBuf :
diff --git a/unotools/source/i18n/nativenumberwrapper.cxx b/unotools/source/i18n/nativenumberwrapper.cxx
index f6df87615c6c..ac6a59517647 100644
--- a/unotools/source/i18n/nativenumberwrapper.cxx
+++ b/unotools/source/i18n/nativenumberwrapper.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
diff --git a/unotools/source/i18n/numberformatcodewrapper.cxx b/unotools/source/i18n/numberformatcodewrapper.cxx
index 2638e6730164..1d4169fd4e67 100644
--- a/unotools/source/i18n/numberformatcodewrapper.cxx
+++ b/unotools/source/i18n/numberformatcodewrapper.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
@@ -68,7 +68,7 @@ NumberFormatCodeWrapper::NumberFormatCodeWrapper(
         }
     }
     else
-    {   // try to get an instance somehow
+    {	// try to get an instance somehow
         DBG_ERRORFILE( "NumberFormatCodeWrapper: no service manager, trying own" );
         try
         {
diff --git a/unotools/source/i18n/readwritemutexguard.cxx b/unotools/source/i18n/readwritemutexguard.cxx
index 6adc5bab14bf..d57639541f8d 100644
--- a/unotools/source/i18n/readwritemutexguard.cxx
+++ b/unotools/source/i18n/readwritemutexguard.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
diff --git a/unotools/source/i18n/textsearch.cxx b/unotools/source/i18n/textsearch.cxx
index 3f722adb0dba..814816e7cca7 100644
--- a/unotools/source/i18n/textsearch.cxx
+++ b/unotools/source/i18n/textsearch.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
@@ -179,7 +179,7 @@ void TextSearch::Init( const SearchParam & rParam,
             aSOpt.searchFlag |= SearchFlags::LEV_RELAXED;
         break;
 
-//  case SearchParam::SRCH_NORMAL:
+//	case SearchParam::SRCH_NORMAL:
     default:
         aSOpt.algorithmType = SearchAlgorithms_ABSOLUTE;
         if( rParam.IsSrchWordOnly() )
@@ -301,7 +301,7 @@ void TextSearch::ReplaceBackReferences( String& rReplaceStr, const String &rStr,
             {
                 USHORT nStart = (USHORT)(rResult.startOffset[0]);
                 USHORT nLength = (USHORT)(rResult.endOffset[0] - rResult.startOffset[0]);
-                rReplaceStr.Erase( nPos, 1 );   // delete ampersand
+                rReplaceStr.Erase( nPos, 1 );	// delete ampersand
                 // replace by found string
                 rReplaceStr.Insert( rStr, nStart, nLength, nPos );
                 // jump over
@@ -325,8 +325,8 @@ void TextSearch::ReplaceBackReferences( String& rReplaceStr, const String &rStr,
                         case '8':
                         case '9':
                         {
-                            rReplaceStr.Erase( nPos, 2 );   // delete both
-                            int i = sFndChar - '0'; // index
+                            rReplaceStr.Erase( nPos, 2 );	// delete both
+                            int i = sFndChar - '0';	// index
                             if(i < rResult.subRegExpressions)
                             {
                                 USHORT nSttReg = (USHORT)(rResult.startOffset[i]);
@@ -369,10 +369,10 @@ void TextSearch::ReplaceBackReferences( String& rReplaceStr, const String &rStr,
                             rReplaceStr.Erase( nPos, 1 );
                             nPos++;
                         break;
-                        case 't':
+                        case 't': 
                             rReplaceStr.Erase( nPos, 2 ); // delete both
                             rReplaceStr.Insert( sTab, nPos ); // insert tabulator
-                            nPos++; // step over
+                            nPos++;	// step over
                         break;
                         default:
                             nPos += 2; // ignore both characters
@@ -393,6 +393,6 @@ void TextSearch::ReplaceBackReferences( String& rReplaceStr, const String &rStr,
 #endif
 
 // ............................................................................
-}   // namespace utl
+}	// namespace utl
 // ............................................................................
 
diff --git a/unotools/source/i18n/transliterationwrapper.cxx b/unotools/source/i18n/transliterationwrapper.cxx
index a10a52802e19..d8082166e6e2 100644
--- a/unotools/source/i18n/transliterationwrapper.cxx
+++ b/unotools/source/i18n/transliterationwrapper.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
@@ -65,7 +65,7 @@ TransliterationWrapper::TransliterationWrapper(
         }
     }
     else
-    {   // try to get an instance somehow
+    {	// try to get an instance somehow
         DBG_ERRORFILE( "TransliterationWrapper: no service manager, trying own" );
         try
         {
@@ -192,7 +192,7 @@ void TransliterationWrapper::loadModuleIfNeeded( sal_uInt16 nLang )
             if( !bLoad )
                 bLoad = needLanguageForTheMode();
         }
-        if( bLoad )
+        if( bLoad ) 
             loadModuleImpl();
     }
 }
diff --git a/unotools/source/misc/atom.cxx b/unotools/source/misc/atom.cxx
index 3d7ccd1dd10e..60bb85d0d236 100644
--- a/unotools/source/misc/atom.cxx
+++ b/unotools/source/misc/atom.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
@@ -65,8 +65,8 @@ void AtomProvider::getAll( ::std::list< ::utl::AtomDescription >& atoms )
     ::utl::AtomDescription aDesc;
     while( it != m_aAtomMap.end() )
     {
-        aDesc.atom          = it->second;
-        aDesc.description   = it->first;
+        aDesc.atom			= it->second;
+        aDesc.description	= it->first;
         atoms.push_back( aDesc );
         ++it;
     }
@@ -75,7 +75,7 @@ void AtomProvider::getAll( ::std::list< ::utl::AtomDescription >& atoms )
 void AtomProvider::getRecent( int atom, ::std::list< ::utl::AtomDescription >& atoms )
 {
     atoms.clear();
-
+    
     ::std::hash_map< ::rtl::OUString, int, ::rtl::OUStringHash >::const_iterator it = m_aAtomMap.begin();
 
     ::utl::AtomDescription aDesc;
@@ -83,8 +83,8 @@ void AtomProvider::getRecent( int atom, ::std::list< ::utl::AtomDescription >& a
     {
         if( it->second > atom )
         {
-            aDesc.atom          = it->second;
-            aDesc.description   = it->first;
+            aDesc.atom			= it->second;
+            aDesc.description	= it->first;
             atoms.push_back( aDesc );
         }
         ++it;
@@ -95,7 +95,7 @@ const ::rtl::OUString& AtomProvider::getString( int nAtom ) const
 {
     static ::rtl::OUString aEmpty;
     ::std::hash_map< int, ::rtl::OUString, ::std::hash< int > >::const_iterator it = m_aStringMap.find( nAtom );
-
+    
     return it == m_aStringMap.end() ? aEmpty : it->second;
 }
 
@@ -243,8 +243,8 @@ Sequence< NMSP_UTIL::AtomDescription > AtomServer::getClass( sal_Int32 atomClass
     Sequence< NMSP_UTIL::AtomDescription > aRet( atoms.size() );
     for( int i = aRet.getLength()-1; i >= 0; i-- )
     {
-        aRet.getArray()[i].atom         = atoms.back().atom;
-        aRet.getArray()[i].description  = atoms.back().description;
+        aRet.getArray()[i].atom			= atoms.back().atom;
+        aRet.getArray()[i].description	= atoms.back().description;
         atoms.pop_back();
     }
 
@@ -261,8 +261,8 @@ Sequence< NMSP_UTIL::AtomDescription > AtomServer::getRecentAtoms( sal_Int32 ato
     Sequence< NMSP_UTIL::AtomDescription > aRet( atoms.size() );
     for( int i = aRet.getLength()-1; i >= 0; i-- )
     {
-        aRet.getArray()[i].atom         = atoms.back().atom;
-        aRet.getArray()[i].description  = atoms.back().description;
+        aRet.getArray()[i].atom			= atoms.back().atom;
+        aRet.getArray()[i].description	= atoms.back().description;
         atoms.pop_back();
     }
 
diff --git a/unotools/source/misc/componentresmodule.cxx b/unotools/source/misc/componentresmodule.cxx
index 21c50d9ec7f1..8333193233d1 100644
--- a/unotools/source/misc/componentresmodule.cxx
+++ b/unotools/source/misc/componentresmodule.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
@@ -49,7 +49,7 @@ namespace utl
     class OComponentResModuleImpl
     {
     private:
-        ResMgr*         m_pRessources;
+        ResMgr*		    m_pRessources;
         bool            m_bInitialized;
         ::rtl::OString  m_sResFilePrefix;
 
@@ -72,7 +72,7 @@ namespace utl
 
         /** retrieves our resource manager
         */
-        ResMgr* getResManager();
+        ResMgr*	getResManager();
 
     private:
         OComponentResModuleImpl();                                              // never implemented
@@ -88,7 +88,7 @@ namespace utl
     }
 
     //--------------------------------------------------------------------
-    ResMgr* OComponentResModuleImpl::getResManager()
+    ResMgr*	OComponentResModuleImpl::getResManager()
     {
         if ( !m_pRessources && !m_bInitialized )
         {
@@ -96,10 +96,10 @@ namespace utl
             ByteString aMgrName = m_sResFilePrefix;
 
             m_pRessources = ResMgr::CreateResMgr( aMgrName.GetBuffer() );
-            OSL_ENSURE( m_pRessources,
+            OSL_ENSURE( m_pRessources, 
                     ( ByteString( "OModuleImpl::getResManager: could not create the resource manager (file name: " )
-                +=  aMgrName
-                +=  ByteString( ")!" ) ).GetBuffer() );
+                +=	aMgrName
+                +=	ByteString( ")!" ) ).GetBuffer() );
 
             m_bInitialized = sal_True;
         }
@@ -122,7 +122,7 @@ namespace utl
     }
 
     //-------------------------------------------------------------------------
-    ResMgr* OComponentResourceModule::getResManager()
+    ResMgr*	OComponentResourceModule::getResManager()
     {
         ::osl::MutexGuard aGuard( m_aMutex );
         return m_pImpl->getResManager();
diff --git a/unotools/source/misc/datetime.cxx b/unotools/source/misc/datetime.cxx
index 6bfd053b3fe9..3963f7b4b0bc 100644
--- a/unotools/source/misc/datetime.cxx
+++ b/unotools/source/misc/datetime.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
@@ -87,7 +87,7 @@ void typeConvert(const starutil::DateTime& _rDateTime, DateTime& _rOut)
 }
 
 //-------------------------------------------------------------------------
-sal_Bool    operator ==(const starutil::DateTime& _rLeft, const starutil::DateTime& _rRight)
+sal_Bool	operator ==(const starutil::DateTime& _rLeft, const starutil::DateTime& _rRight)
 {
     return ( _rLeft.HundredthSeconds == _rRight.HundredthSeconds) &&
     ( _rLeft.Seconds == _rRight.Seconds) &&
@@ -99,7 +99,7 @@ sal_Bool    operator ==(const starutil::DateTime& _rLeft, const starutil::DateTi
 }
 
 //-------------------------------------------------------------------------
-sal_Bool    operator ==(const starutil::Date& _rLeft, const starutil::Date& _rRight)
+sal_Bool	operator ==(const starutil::Date& _rLeft, const starutil::Date& _rRight)
 {
     return ( _rLeft.Day == _rRight.Day) &&
     ( _rLeft.Month == _rRight.Month) &&
@@ -107,7 +107,7 @@ sal_Bool    operator ==(const starutil::Date& _rLeft, const starutil::Date& _rRi
 }
 
 //-------------------------------------------------------------------------
-sal_Bool    operator ==(const starutil::Time& _rLeft, const starutil::Time& _rRight)
+sal_Bool	operator ==(const starutil::Time& _rLeft, const starutil::Time& _rRight)
 {
     return ( _rLeft.HundredthSeconds == _rRight.HundredthSeconds) &&
     ( _rLeft.Seconds == _rRight.Seconds) &&
@@ -116,6 +116,6 @@ sal_Bool    operator ==(const starutil::Time& _rLeft, const starutil::Time& _rRi
 }
 
 //.........................................................................
-}   // namespace utl
+}	// namespace utl
 //.........................................................................
 
diff --git a/unotools/source/misc/desktopterminationobserver.cxx b/unotools/source/misc/desktopterminationobserver.cxx
index 3900449f03c9..36fc7ebd1d83 100644
--- a/unotools/source/misc/desktopterminationobserver.cxx
+++ b/unotools/source/misc/desktopterminationobserver.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
@@ -144,7 +144,7 @@ namespace utl
                     throw TerminationVetoException();
             }
         }
-
+        
         //--------------------------------------------------------------------
         void SAL_CALL OObserverImpl::notifyTermination( const EventObject& /*Event*/ ) throw (RuntimeException)
         {
diff --git a/unotools/source/misc/eventlisteneradapter.cxx b/unotools/source/misc/eventlisteneradapter.cxx
index 0e14a54cd3c0..b658f27db88d 100644
--- a/unotools/source/misc/eventlisteneradapter.cxx
+++ b/unotools/source/misc/eventlisteneradapter.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
@@ -46,17 +46,17 @@ namespace utl
     class OEventListenerImpl : public ::cppu::WeakImplHelper1< XEventListener >
     {
     protected:
-        OEventListenerAdapter*          m_pAdapter;
-        Reference< XEventListener >     m_xKeepMeAlive;
+        OEventListenerAdapter*			m_pAdapter;
+        Reference< XEventListener >		m_xKeepMeAlive;
             // imagine an implementation of XComponent which holds it's listeners with a weak reference ...
             // would be very bad if we don't hold ourself
-        Reference< XComponent >         m_xComponent;
+        Reference< XComponent >			m_xComponent;
 
     public:
         OEventListenerImpl( OEventListenerAdapter* _pAdapter, const Reference< XComponent >& _rxComp );
 
-        void                            dispose();
-        const Reference< XComponent >&  getComponent() const { return m_xComponent; }
+        void							dispose();
+        const Reference< XComponent >&	getComponent() const { return m_xComponent; }
 
     protected:
         virtual void SAL_CALL disposing( const EventObject& _rSource ) throw (RuntimeException);
@@ -106,7 +106,7 @@ namespace utl
     struct OEventListenerAdapterImpl
     {
     public:
-        ::std::vector< void* >  aListeners;
+        ::std::vector< void* >	aListeners;
     };
 
     //=====================================================================
@@ -151,7 +151,7 @@ namespace utl
     //---------------------------------------------------------------------
     void OEventListenerAdapter::stopAllComponentListening(  )
     {
-        for (   ::std::vector< void* >::const_iterator aDisposeLoop = m_pImpl->aListeners.begin();
+        for (	::std::vector< void* >::const_iterator aDisposeLoop = m_pImpl->aListeners.begin();
                 aDisposeLoop != m_pImpl->aListeners.end();
                 ++aDisposeLoop
             )
@@ -178,5 +178,5 @@ namespace utl
     }
 
 //.........................................................................
-}   // namespace utl
+}	// namespace utl
 //.........................................................................
diff --git a/unotools/source/misc/fontcvt.cxx b/unotools/source/misc/fontcvt.cxx
index 2bb682e4915b..93cb093c6491 100644
--- a/unotools/source/misc/fontcvt.cxx
+++ b/unotools/source/misc/fontcvt.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
diff --git a/unotools/source/misc/fontdefs.cxx b/unotools/source/misc/fontdefs.cxx
index c1c222755599..3f72799f06c7 100644
--- a/unotools/source/misc/fontdefs.cxx
+++ b/unotools/source/misc/fontdefs.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
diff --git a/unotools/source/misc/sharedunocomponent.cxx b/unotools/source/misc/sharedunocomponent.cxx
index 5402ebc06085..b7dc6bf3eff4 100644
--- a/unotools/source/misc/sharedunocomponent.cxx
+++ b/unotools/source/misc/sharedunocomponent.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
@@ -91,7 +91,7 @@ namespace utl
         CloseableComponentImpl( const Reference< XInterface >& _rxComponent );
 
         /** closes the component
-
+        
             @nofail
         */
         void    nf_closeComponent();
@@ -194,7 +194,7 @@ namespace utl
         DBG_ASSERT( Source.Source == m_xCloseable, "CloseableComponentImpl::queryClosing: where did this come from?" );
         throw CloseVetoException();
     }
-
+    
     //--------------------------------------------------------------------
     void SAL_CALL CloseableComponentImpl::notifyClosing( const EventObject&
     #ifdef DBG_UTIL
diff --git a/unotools/source/misc/syslocale.cxx b/unotools/source/misc/syslocale.cxx
index f51ef35512cb..e6da1757506c 100644
--- a/unotools/source/misc/syslocale.cxx
+++ b/unotools/source/misc/syslocale.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
@@ -56,10 +56,10 @@ public:
         CharClass*              pCharClass;
 
                                     SvtSysLocale_Impl();
-    virtual                         ~SvtSysLocale_Impl();
+    virtual                     	~SvtSysLocale_Impl();
 
-    CharClass*                      GetCharClass();
-    virtual void                    ConfigurationChanged( utl::ConfigurationBroadcaster*, sal_uInt32 );
+    CharClass*                  	GetCharClass();
+    virtual void 					ConfigurationChanged( utl::ConfigurationBroadcaster*, sal_uInt32 );
 };
 
 // -----------------------------------------------------------------------
@@ -69,7 +69,7 @@ SvtSysLocale_Impl::SvtSysLocale_Impl() : pCharClass(NULL)
     pLocaleData = new LocaleDataWrapper( ::comphelper::getProcessServiceFactory(), aSysLocaleOptions.GetRealLocale() );
 
     // listen for further changes
-    aSysLocaleOptions.AddListener( this );
+    aSysLocaleOptions.AddListener( this );  
 }
 
 
@@ -195,7 +195,7 @@ rtl_TextEncoding SvtSysLocale::GetBestMimeEncoding()
     const sal_Char* pCharSet = rtl_getBestMimeCharsetFromTextEncoding(
             gsl_getSystemTextEncoding() );
     if ( !pCharSet )
-    {
+    {   
         // If the system locale is unknown to us, e.g. LC_ALL=xx, match the UI
         // language if possible.
         ::com::sun::star::lang::Locale aLocale( SvtSysLocale().GetUILocale() );
diff --git a/unotools/source/processfactory/componentfactory.cxx b/unotools/source/processfactory/componentfactory.cxx
index 67055ee215ca..dc8efaacc579 100644
--- a/unotools/source/processfactory/componentfactory.cxx
+++ b/unotools/source/processfactory/componentfactory.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
@@ -183,4 +183,4 @@ Reference< XSingleServiceFactory > loadLibComponentFactory(
     return xRet;
 }
 
-}   // namespace utl
+}	// namespace utl
diff --git a/unotools/source/processfactory/processfactory.cxx b/unotools/source/processfactory/processfactory.cxx
index e1f0cc876dce..f487227e8dbd 100644
--- a/unotools/source/processfactory/processfactory.cxx
+++ b/unotools/source/processfactory/processfactory.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
@@ -43,12 +43,12 @@ namespace utl
     void setProcessServiceFactory(const Reference< XMultiServiceFactory >& xSMgr)
     {
         ::comphelper::setProcessServiceFactory(xSMgr);
-    }
+    }	
 
     Reference< XMultiServiceFactory > getProcessServiceFactory()
     {
         return ::comphelper::getProcessServiceFactory();
-    }
+    }	
 
 } // namesapce utl
 
diff --git a/unotools/source/property/propertysethelper.cxx b/unotools/source/property/propertysethelper.cxx
index fac76bbe882a..868530dcdb9d 100644
--- a/unotools/source/property/propertysethelper.cxx
+++ b/unotools/source/property/propertysethelper.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
@@ -47,7 +47,7 @@ class PropertySetHelperImpl
 {
 public:
     PropertyMapEntry* find( const OUString& aName ) const throw();
-
+    
     PropertySetInfo* mpInfo;
 };
 }
diff --git a/unotools/source/property/propertysetinfo.cxx b/unotools/source/property/propertysetinfo.cxx
index a5b8381de942..022f059b2c24 100644
--- a/unotools/source/property/propertysetinfo.cxx
+++ b/unotools/source/property/propertysetinfo.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
diff --git a/unotools/source/streaming/streamhelper.cxx b/unotools/source/streaming/streamhelper.cxx
index 0ca20cf1c5e2..a7d8f4e96438 100644
--- a/unotools/source/streaming/streamhelper.cxx
+++ b/unotools/source/streaming/streamhelper.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
diff --git a/unotools/source/streaming/streamwrap.cxx b/unotools/source/streaming/streamwrap.cxx
index eefaa7498070..390c433f967b 100644
--- a/unotools/source/streaming/streamwrap.cxx
+++ b/unotools/source/streaming/streamwrap.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
@@ -237,8 +237,8 @@ void SAL_CALL OOutputStreamWrapper::writeBytes(const staruno::Sequence< sal_Int8
 {
     sal_uInt32 nWritten = rStream.Write(aData.getConstArray(),aData.getLength());
     ErrCode err = rStream.GetError();
-    if  (   (ERRCODE_NONE != err)
-        ||  (nWritten != (sal_uInt32)aData.getLength())
+    if	(	(ERRCODE_NONE != err)
+        ||	(nWritten != (sal_uInt32)aData.getLength())
         )
     {
         throw stario::BufferSizeExceededException(::rtl::OUString(),static_cast<staruno::XWeak*>(this));
@@ -348,8 +348,8 @@ void SAL_CALL OStreamWrapper::writeBytes(const staruno::Sequence< sal_Int8 >& aD
 {
     sal_uInt32 nWritten = m_pSvStream->Write(aData.getConstArray(),aData.getLength());
     ErrCode err = m_pSvStream->GetError();
-    if  (   (ERRCODE_NONE != err)
-        ||  (nWritten != (sal_uInt32)aData.getLength())
+    if	(	(ERRCODE_NONE != err)
+        ||	(nWritten != (sal_uInt32)aData.getLength())
         )
     {
         throw stario::BufferSizeExceededException(::rtl::OUString(),static_cast<staruno::XWeak*>(this));
diff --git a/unotools/source/ucbhelper/XTempFile.hxx b/unotools/source/ucbhelper/XTempFile.hxx
index 115f6cf823a7..af921ac54cda 100644
--- a/unotools/source/ucbhelper/XTempFile.hxx
+++ b/unotools/source/ucbhelper/XTempFile.hxx
@@ -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
@@ -45,28 +45,28 @@
 class SvStream;
 namespace utl { class TempFile; }
 
-typedef  ::cppu::WeakImplHelper5<   ::com::sun::star::io::XTempFile
-                                    ,   ::com::sun::star::io::XInputStream
-                                                  , ::com::sun::star::io::XOutputStream
-                                                  , ::com::sun::star::io::XTruncate
-                                                  , ::com::sun::star::lang::XServiceInfo
+typedef	 ::cppu::WeakImplHelper5<	::com::sun::star::io::XTempFile
+                                    ,	::com::sun::star::io::XInputStream
+                                                  ,	::com::sun::star::io::XOutputStream
+                                                  ,	::com::sun::star::io::XTruncate
+                                                  ,	::com::sun::star::lang::XServiceInfo
                                                   >
                                     OTempFileBase;
 
-class OTempFileService :
+class OTempFileService : 
     public OTempFileBase,
     public ::cppu::PropertySetMixin< ::com::sun::star::io::XTempFile >
 {
 protected:
-    ::utl::TempFile*    mpTempFile;
-    ::osl::Mutex        maMutex;
-    SvStream*           mpStream;
-    sal_Bool            mbRemoveFile;
-    sal_Bool            mbInClosed;
-    sal_Bool            mbOutClosed;
+    ::utl::TempFile* 	mpTempFile;
+    ::osl::Mutex		maMutex;
+    SvStream* 			mpStream;
+    sal_Bool			mbRemoveFile;
+    sal_Bool			mbInClosed;
+    sal_Bool			mbOutClosed;
 
-    sal_Int64           mnCachedPos;
-    sal_Bool            mbHasCachedPos;
+    sal_Int64			mnCachedPos;
+    sal_Bool			mbHasCachedPos;
 
     void checkError () const;
     void checkConnected ();
@@ -75,20 +75,20 @@ public:
     OTempFileService (::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > const & context);
 
     //Methods
-    //  XInterface
+    //	XInterface
     virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& aType )
         throw (::com::sun::star::uno::RuntimeException);
     virtual void SAL_CALL acquire(  )
         throw ();
     virtual void SAL_CALL release(  )
         throw ();
-    //  XTypeProvider
+    //	XTypeProvider
     virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes(  )
         throw (::com::sun::star::uno::RuntimeException);
     virtual ::com::sun::star::uno::Sequence< ::sal_Int8 > SAL_CALL getImplementationId(  )
         throw (::com::sun::star::uno::RuntimeException);
 
-    //  XTempFile
+    //	XTempFile
     virtual ::sal_Bool SAL_CALL getRemoveFile()
         throw (::com::sun::star::uno::RuntimeException);
     virtual void SAL_CALL setRemoveFile( ::sal_Bool _removefile )
diff --git a/unotools/source/ucbhelper/localfilehelper.cxx b/unotools/source/ucbhelper/localfilehelper.cxx
index 5ddd1f811923..1955998934e8 100644
--- a/unotools/source/ucbhelper/localfilehelper.cxx
+++ b/unotools/source/ucbhelper/localfilehelper.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
diff --git a/unotools/source/ucbhelper/progresshandlerwrap.cxx b/unotools/source/ucbhelper/progresshandlerwrap.cxx
index 7fdbdacabc4b..064eacdd382e 100644
--- a/unotools/source/ucbhelper/progresshandlerwrap.cxx
+++ b/unotools/source/ucbhelper/progresshandlerwrap.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
@@ -58,7 +58,7 @@ sal_Bool getStatusFromAny_Impl( const Any& aAny, ::rtl::OUString& aText, sal_Int
     return bNumIsSet;
 }
 
-void SAL_CALL ProgressHandlerWrap::push( const Any& Status )
+void SAL_CALL ProgressHandlerWrap::push( const Any& Status ) 
     throw( RuntimeException )
 {
     if( !m_xStatusIndicator.is() )
@@ -87,7 +87,7 @@ void SAL_CALL ProgressHandlerWrap::update( const Any& Status )
     }
 }
 
-void SAL_CALL ProgressHandlerWrap::pop()
+void SAL_CALL ProgressHandlerWrap::pop() 
         throw( RuntimeException )
 {
     if( m_xStatusIndicator.is() )
diff --git a/unotools/source/ucbhelper/tempfile.cxx b/unotools/source/ucbhelper/tempfile.cxx
index e77dc529e410..530892afbc4f 100644
--- a/unotools/source/ucbhelper/tempfile.cxx
+++ b/unotools/source/ucbhelper/tempfile.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
@@ -254,8 +254,8 @@ umask(old_mode);
 
                  DirectoryItem aTmpItem;
                  FileStatus aTmpStatus( FileStatusMask_Type );
-                 if ( DirectoryItem::get( aTmp, aTmpItem ) != FileBase::E_None
-                   || aTmpItem.getFileStatus( aTmpStatus ) != FileBase::E_None
+                 if ( DirectoryItem::get( aTmp, aTmpItem ) != FileBase::E_None 
+                   || aTmpItem.getFileStatus( aTmpStatus ) != FileBase::E_None 
                    || aTmpStatus.getFileType() != FileStatus::Directory )
                      break;
             }
@@ -319,8 +319,8 @@ umask(old_mode);
 
                 DirectoryItem aTmpItem;
                 FileStatus aTmpStatus( FileStatusMask_Type );
-                if ( DirectoryItem::get( aTmp, aTmpItem ) != FileBase::E_None
-                  || aTmpItem.getFileStatus( aTmpStatus ) != FileBase::E_None
+                if ( DirectoryItem::get( aTmp, aTmpItem ) != FileBase::E_None 
+                  || aTmpItem.getFileStatus( aTmpStatus ) != FileBase::E_None 
                   || aTmpStatus.getFileType() != FileStatus::Directory )
                     break;
             }
diff --git a/unotools/source/ucbhelper/ucbhelper.cxx b/unotools/source/ucbhelper/ucbhelper.cxx
index 4160f2f2f443..e2010656cacb 100644
--- a/unotools/source/ucbhelper/ucbhelper.cxx
+++ b/unotools/source/ucbhelper/ucbhelper.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
@@ -872,5 +872,54 @@ sal_Bool UCBContentHelper::IsSubPath( const ::rtl::OUString& rPath, const ::rtl:
     return bResult;
 }
 
+// -----------------------------------------------------------------------
+sal_Bool UCBContentHelper::EqualURLs( const ::rtl::OUString& aFirstURL, const ::rtl::OUString& aSecondURL )
+{
+    sal_Bool bResult = sal_False;
+
+    if ( aFirstURL.getLength() && aSecondURL.getLength() )
+    {
+        INetURLObject aFirst( aFirstURL );
+        INetURLObject aSecond( aSecondURL );
+
+        if ( aFirst.GetProtocol() != INET_PROT_NOT_VALID && aSecond.GetProtocol() != INET_PROT_NOT_VALID )
+        {
+            try
+            {
+                ::ucbhelper::ContentBroker* pBroker = ::ucbhelper::ContentBroker::get();
+                if ( !pBroker )
+                    throw uno::RuntimeException();
+
+                uno::Reference< ::com::sun::star::ucb::XContentIdentifierFactory > xIdFac
+                    = pBroker->getContentIdentifierFactoryInterface();
+                if ( !xIdFac.is() )
+                    throw uno::RuntimeException();
+
+                uno::Reference< ::com::sun::star::ucb::XContentIdentifier > xIdFirst
+                    = xIdFac->createContentIdentifier( aFirst.GetMainURL( INetURLObject::NO_DECODE ) );
+                uno::Reference< ::com::sun::star::ucb::XContentIdentifier > xIdSecond
+                    = xIdFac->createContentIdentifier( aSecond.GetMainURL( INetURLObject::NO_DECODE ) );
+
+                if ( xIdFirst.is() && xIdSecond.is() )
+                {
+                    uno::Reference< ::com::sun::star::ucb::XContentProvider > xProvider =
+                                                            pBroker->getContentProviderInterface();
+                    if ( !xProvider.is() )
+                        throw uno::RuntimeException();
+                    bResult = !xProvider->compareContentIds( xIdFirst, xIdSecond );
+                }
+            }
+            catch( uno::Exception& )
+            {
+                OSL_ENSURE( sal_False, "Can't compare URL's, treat as different!\n" );
+            }
+        }
+    }
+
+    return bResult;
+}
+
+
+
 } // namespace utl
 
diff --git a/unotools/source/ucbhelper/ucblockbytes.cxx b/unotools/source/ucbhelper/ucblockbytes.cxx
index f21855d20aed..1ea67341c5b1 100644
--- a/unotools/source/ucbhelper/ucblockbytes.cxx
+++ b/unotools/source/ucbhelper/ucblockbytes.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
diff --git a/unotools/source/ucbhelper/ucbstreamhelper.cxx b/unotools/source/ucbhelper/ucbstreamhelper.cxx
index f27f663b3698..93d020a4d94d 100644
--- a/unotools/source/ucbhelper/ucbstreamhelper.cxx
+++ b/unotools/source/ucbhelper/ucbstreamhelper.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
diff --git a/unotools/source/ucbhelper/xtempfile.cxx b/unotools/source/ucbhelper/xtempfile.cxx
index 023211dc3527..36a848be1381 100644
--- a/unotools/source/ucbhelper/xtempfile.cxx
+++ b/unotools/source/ucbhelper/xtempfile.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
@@ -44,7 +44,7 @@ namespace css = com::sun::star;
 
 // copy define from desktop\source\app\appinit.cxx
 
-#define DESKTOP_TEMPNAMEBASE_DIR    "/temp/soffice.tmp"
+#define DESKTOP_TEMPNAMEBASE_DIR	"/temp/soffice.tmp"
 
 OTempFileService::OTempFileService(::css::uno::Reference< ::css::uno::XComponentContext > const & context)
 : ::cppu::PropertySetMixin< ::css::io::XTempFile >(
@@ -91,7 +91,7 @@ throw ()
     OTempFileBase::release();
 }
 
-//  XTypeProvider
+//	XTypeProvider
 
 ::css::uno::Sequence< ::css::uno::Type > SAL_CALL OTempFileService::getTypes(  )
 throw ( ::css::uno::RuntimeException )
@@ -117,7 +117,7 @@ throw ( ::css::uno::RuntimeException )
     return OTempFileBase::getImplementationId();
 }
 
-//  XTempFile
+//	XTempFile
 
 sal_Bool SAL_CALL OTempFileService::getRemoveFile()
 throw ( ::css::uno::RuntimeException )
@@ -297,7 +297,7 @@ throw ( ::css::io::NotConnectedException, ::css::io::BufferSizeExceededException
     checkConnected();
     sal_uInt32 nWritten = mpStream->Write(aData.getConstArray(),aData.getLength());
     checkError();
-    if  ( nWritten != (sal_uInt32)aData.getLength())
+    if	( nWritten != (sal_uInt32)aData.getLength())
         throw ::css::io::BufferSizeExceededException( ::rtl::OUString(),static_cast < ::css::uno::XWeak * > ( this ) );
 }
 void SAL_CALL OTempFileService::flush(  )
diff --git a/vcl/aqua/inc/aqua11yfactory.h b/vcl/aqua/inc/aqua11yfactory.h
index 1982093f8bba..8d00cf757985 100644
--- a/vcl/aqua/inc/aqua11yfactory.h
+++ b/vcl/aqua/inc/aqua11yfactory.h
@@ -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
@@ -42,6 +42,6 @@
 +(AquaA11yWrapper *)wrapperForAccessibleContext: (::com::sun::star::uno::Reference < ::com::sun::star::accessibility::XAccessibleContext >) rxAccessibleContext createIfNotExists:(MacOSBOOL) bCreate asRadioGroup:(MacOSBOOL) asRadioGroup;
 +(void)removeFromWrapperRepositoryFor: (::com::sun::star::uno::Reference < ::com::sun::star::accessibility::XAccessibleContext >) rxAccessibleContext;
 +(void)registerView: (NSView *) theView;
-+(void)revokeView: (NSView *) theViewt;
++(void)revokeView: (NSView *) theViewt; 
 @end
 #endif // _SV_AQUA11FACTORY_H
diff --git a/vcl/aqua/inc/aqua11yfocustracker.hxx b/vcl/aqua/inc/aqua11yfocustracker.hxx
index 1dbf68c4a5ef..6b8e2f843147 100644
--- a/vcl/aqua/inc/aqua11yfocustracker.hxx
+++ b/vcl/aqua/inc/aqua11yfocustracker.hxx
@@ -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
@@ -53,7 +53,7 @@ class AquaA11yFocusTracker : public rtl::Static< AquaA11yFocusTracker, AquaA11yF
 
 public:
     AquaA11yFocusTracker();
-
+    
     ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > getFocusedObject() { return m_xFocusedObject; };
 
     // sets the currently focus object and notifies the FocusEventListener (if any)
@@ -61,24 +61,24 @@ public:
 
     // may evolve to add/remove later
     void setFocusListener(const rtl::Reference< KeyboardFocusListener >& aFocusListener) { m_aFocusListener = aFocusListener; };
-
+    
 protected:
 
     // received a WINDOW_GETFOCUS event for this window
     virtual void window_got_focus(Window *pWindow);
-
+    
     // received a TOOLBOX_HIGHLIGHT event for this window
     virtual void toolbox_highlight_on(Window *pWindow);
 
     // received a TOOLBOX_HIGHLIGHTOFF event for this window
     virtual void toolbox_highlight_off(Window *pWindow);
-
+    
     // received a TABPAGE_ACTIVATE event for this window
     virtual void tabpage_activated(Window *pWindow);
-
+    
     // received a MENU_HIGHLIGHT event for this window
     virtual void menu_highlighted(const ::VclMenuEvent *pEvent);
-
+    
     // toolbox items are widgets in gtk+ and Cocoa
     virtual void notify_toolbox_item_focus(ToolBox *pToolBox);
 
@@ -88,21 +88,21 @@ protected:
     // callback function for Application::addEventListener
     static long WindowEventHandler(AquaA11yFocusTracker *pFocusTracker, ::VclSimpleEvent const *pEvent);
 
-private:
+private:    
     // the accessible object that has the keyboard focus (if any)
     ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > m_xFocusedObject;
-
+    
     // the listener for focus events
     rtl::Reference< KeyboardFocusListener > m_aFocusListener;
-
+    
     // the list of Windows that need deeper (focus) investigation
     std::set< Window *> m_aDocumentWindowList;
-
+    
     // the link object needed for Application::addEventListener
     Link m_aWindowEventLink;
-
+    
     // the UNO XAccessibilityEventListener for Documents and other non VCL objects
     const ::com::sun::star::uno::Reference< DocumentFocusListener > m_xDocumentFocusListener;
 };
 
-#endif  // _AQUA11YFOCUSTRACKER_HXX_
+#endif	// _AQUA11YFOCUSTRACKER_HXX_
diff --git a/vcl/aqua/inc/aqua11ylistener.hxx b/vcl/aqua/inc/aqua11ylistener.hxx
index 461b149e4650..b57e7296fdbb 100644
--- a/vcl/aqua/inc/aqua11ylistener.hxx
+++ b/vcl/aqua/inc/aqua11ylistener.hxx
@@ -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
@@ -24,7 +24,7 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-
+ 
 #ifndef _AQUA11YLISTENER_HXX_
 #define _AQUA11YLISTENER_HXX_
 
@@ -40,7 +40,7 @@
 // - AquaA11yEventListener -
 // -------------------------
 
-class AquaA11yEventListener :
+class AquaA11yEventListener :  
     public ::cppu::WeakImplHelper1< ::com::sun::star::accessibility::XAccessibleEventListener >
 {
 
@@ -49,13 +49,13 @@ public:
     virtual ~AquaA11yEventListener();
 
     // XEventListener
-    virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source )
+    virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) 
         throw (::com::sun::star::uno::RuntimeException);
 
     // XAccessibleEventListener
-    virtual void SAL_CALL notifyEvent( const ::com::sun::star::accessibility::AccessibleEventObject& aEvent )
+    virtual void SAL_CALL notifyEvent( const ::com::sun::star::accessibility::AccessibleEventObject& aEvent ) 
         throw( ::com::sun::star::uno::RuntimeException );
-
+        
 private:
     const id m_wrapperObject;
     const sal_Int16 m_role;
diff --git a/vcl/aqua/inc/aqua11ywrapper.h b/vcl/aqua/inc/aqua11ywrapper.h
index 079dcfe7f112..16d92bad6c55 100644
--- a/vcl/aqua/inc/aqua11ywrapper.h
+++ b/vcl/aqua/inc/aqua11ywrapper.h
@@ -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
diff --git a/vcl/aqua/inc/aquaprintview.h b/vcl/aqua/inc/aquaprintview.h
index 84d9dd54d6aa..b44683528dc5 100755
--- a/vcl/aqua/inc/aquaprintview.h
+++ b/vcl/aqua/inc/aquaprintview.h
@@ -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
@@ -40,7 +40,7 @@ struct PrintAccessoryViewState
 {
     bool        bNeedRestart;
     sal_Int32   nLastPage;
-
+    
     PrintAccessoryViewState()
     : bNeedRestart( false ), nLastPage( 0 ) {}
 };
@@ -60,7 +60,7 @@ struct PrintAccessoryViewState
 @interface AquaPrintAccessoryView : NSObject
 {
 }
-+(NSObject*)setupPrinterPanel: (NSPrintOperation*)pOp withController: (vcl::PrinterController*)pController withState: (PrintAccessoryViewState*)pState;
++(NSObject*)setupPrinterPanel: (NSPrintOperation*)pOp withController: (vcl::PrinterController*)pController withState: (PrintAccessoryViewState*)pState; 
 @end
 
 
diff --git a/vcl/aqua/inc/aquavclevents.hxx b/vcl/aqua/inc/aquavclevents.hxx
index 8e03c59d0954..24f8cac237ba 100644
--- a/vcl/aqua/inc/aquavclevents.hxx
+++ b/vcl/aqua/inc/aquavclevents.hxx
@@ -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
diff --git a/vcl/aqua/inc/aquavcltypes.h b/vcl/aqua/inc/aquavcltypes.h
index 7346282963d7..bc4e89d710f0 100644
--- a/vcl/aqua/inc/aquavcltypes.h
+++ b/vcl/aqua/inc/aquavcltypes.h
@@ -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
diff --git a/vcl/aqua/inc/keyboardfocuslistener.hxx b/vcl/aqua/inc/keyboardfocuslistener.hxx
index 71eba2f46c02..899a6ca4f93c 100644
--- a/vcl/aqua/inc/keyboardfocuslistener.hxx
+++ b/vcl/aqua/inc/keyboardfocuslistener.hxx
@@ -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
diff --git a/vcl/aqua/inc/salatsuifontutils.hxx b/vcl/aqua/inc/salatsuifontutils.hxx
index 81e60871ae86..092e49754748 100644
--- a/vcl/aqua/inc/salatsuifontutils.hxx
+++ b/vcl/aqua/inc/salatsuifontutils.hxx
@@ -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
@@ -46,7 +46,7 @@ class SystemFontList
 public:
     SystemFontList();
     ~SystemFontList();
-
+    
     void AnnounceFonts( ImplDevFontList& ) const;
     ImplMacFontData* GetFontDataFromId( ATSUFontID ) const;
 
@@ -56,8 +56,8 @@ private:
     typedef std::hash_map<ATSUFontID,ImplMacFontData*> MacFontContainer;
     MacFontContainer maFontContainer;
 
-    void InitGlyphFallbacks();
+    void InitGlyphFallbacks();	
 };
-
-#endif  // _SV_SALATSUIFONTUTILS_HXX
+                             
+#endif	// _SV_SALATSUIFONTUTILS_HXX
 
diff --git a/vcl/aqua/inc/salbmp.h b/vcl/aqua/inc/salbmp.h
index 1c427cce0cd5..1dd2b5568b96 100644
--- a/vcl/aqua/inc/salbmp.h
+++ b/vcl/aqua/inc/salbmp.h
@@ -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
@@ -41,45 +41,45 @@
 #include "basebmp/bitmapdevice.hxx"
 
 // --------------
-// - SalBitmap  -
+// - SalBitmap	-
 // --------------
 
-struct  BitmapBuffer;
-class   BitmapColor;
-class   BitmapPalette;
-class   AquaSalVirtualDevice;
-class   AquaSalGraphics;
+struct	BitmapBuffer;
+class	BitmapColor;
+class	BitmapPalette;
+class	AquaSalVirtualDevice;
+class	AquaSalGraphics;
 
 class AquaSalBitmap : public SalBitmap
 {
 public:
-    CGContextRef                    mxGraphicContext;
-    mutable CGImageRef              mxCachedImage;
-    BitmapPalette                   maPalette;
-    basebmp::RawMemorySharedArray   maUserBuffer;
-    basebmp::RawMemorySharedArray   maContextBuffer;
-    sal_uInt16                      mnBits;
-    int                             mnWidth;
-    int                             mnHeight;
-    sal_uInt32                      mnBytesPerRow;
+    CGContextRef					mxGraphicContext;
+    mutable CGImageRef				mxCachedImage;
+    BitmapPalette					maPalette;
+    basebmp::RawMemorySharedArray	maUserBuffer;
+    basebmp::RawMemorySharedArray	maContextBuffer;
+    sal_uInt16						mnBits;
+    int								mnWidth;
+    int								mnHeight;
+    sal_uInt32						mnBytesPerRow;
 
 public:
     AquaSalBitmap();
     virtual ~AquaSalBitmap();
-
+    
 public:
-
+       
     // SalBitmap methods
     bool            Create( const Size& rSize, USHORT nBitCount, const BitmapPalette& rPal );
     bool            Create( const SalBitmap& rSalBmp );
     bool            Create( const SalBitmap& rSalBmp, SalGraphics* pGraphics );
     bool            Create( const SalBitmap& rSalBmp, USHORT nNewBitCount );
-
+    
     void            Destroy();
-
+    
     Size            GetSize() const;
     USHORT          GetBitCount() const;
-
+    
     BitmapBuffer   *AcquireBuffer( bool bReadOnly );
     void            ReleaseBuffer( BitmapBuffer* pBuffer, bool bReadOnly );
 
@@ -87,21 +87,21 @@ public:
 
 private:
     // quartz helper
-    bool            CreateContext();
+    bool			CreateContext();
     void            DestroyContext();
-    bool            AllocateUserData();
+    bool			AllocateUserData();
 
-    void            ConvertBitmapData( sal_uInt32 nWidth, sal_uInt32 nHeight,
+    void			ConvertBitmapData( sal_uInt32 nWidth, sal_uInt32 nHeight, 
                                        sal_uInt16 nDestBits, sal_uInt32 nDestBytesPerRow, const BitmapPalette& rDestPalette, sal_uInt8* pDestData,
                                        sal_uInt16 nSrcBits, sal_uInt32 nSrcBytesPerRow, const BitmapPalette& rSrcPalette, sal_uInt8* pSrcData );
 
 public:
-    bool            Create( CGLayerRef xLayer, int nBitCount, int nX, int nY, int nWidth, int nHeight, bool bMirrorVert = true );
+    bool			Create( CGLayerRef xLayer, int nBitCount, int nX, int nY, int nWidth, int nHeight, bool bMirrorVert = true );
 
 public:
-    CGImageRef      CreateWithMask( const AquaSalBitmap& rMask, int nX, int nY, int nWidth, int nHeight ) const;
-    CGImageRef      CreateColorMask( int nX, int nY, int nWidth, int nHeight, SalColor nMaskColor ) const;
-    CGImageRef      CreateCroppedImage( int nX, int nY, int nWidth, int nHeight ) const;
+    CGImageRef		CreateWithMask( const AquaSalBitmap& rMask, int nX, int nY, int nWidth, int nHeight ) const;
+    CGImageRef		CreateColorMask( int nX, int nY, int nWidth, int nHeight, SalColor nMaskColor ) const;
+    CGImageRef		CreateCroppedImage( int nX, int nY, int nWidth, int nHeight ) const;
 };
 
 #endif // _SV_SALBMP_HXX
diff --git a/vcl/aqua/inc/salcolorutils.hxx b/vcl/aqua/inc/salcolorutils.hxx
index 74ccb69756fd..efca5712881e 100755
--- a/vcl/aqua/inc/salcolorutils.hxx
+++ b/vcl/aqua/inc/salcolorutils.hxx
@@ -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
@@ -49,4 +49,4 @@ void SetSalColor( const SalColor& rColor, float* pQuartzColor );
 
 // ------------------------------------------------------------------
 
-#endif  // _SV_SALCOLORUTILS_HXX
+#endif	// _SV_SALCOLORUTILS_HXX
diff --git a/vcl/aqua/inc/salconst.h b/vcl/aqua/inc/salconst.h
index 2046ec20a806..353c8a03cf7c 100755
--- a/vcl/aqua/inc/salconst.h
+++ b/vcl/aqua/inc/salconst.h
@@ -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
diff --git a/vcl/aqua/inc/saldata.hxx b/vcl/aqua/inc/saldata.hxx
index fb7c8cddd6d4..ef38a330daae 100644
--- a/vcl/aqua/inc/saldata.hxx
+++ b/vcl/aqua/inc/saldata.hxx
@@ -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
@@ -80,48 +80,48 @@ struct FrameHash : public std::hash<sal_IntPtr>
 
 struct SalData
 {
-
-    SALTIMERPROC                                  mpTimerProc;      // timer callback proc
-    AquaSalInstance                              *mpFirstInstance;  // pointer of first instance
-    std::list<AquaSalFrame*>                      maFrames;         // pointer of first frame
+    
+    SALTIMERPROC                                  mpTimerProc;		// timer callback proc
+    AquaSalInstance                              *mpFirstInstance;	// pointer of first instance
+    std::list<AquaSalFrame*>                      maFrames;	        // pointer of first frame
     std::hash_set<const AquaSalFrame*,FrameHash>  maFrameCheck;     // for fast check of frame existance
-    SalObject                                    *mpFirstObject;    // pointer of first object window
-    SalVirtualDevice                             *mpFirstVD;        // first VirDev
-    SalPrinter                                   *mpFirstPrinter;   // first printing printer
+    SalObject                                    *mpFirstObject;	// pointer of first object window
+    SalVirtualDevice                             *mpFirstVD;    	// first VirDev
+    SalPrinter                                   *mpFirstPrinter; 	// first printing printer
     SystemFontList                               *mpFontList;
     NSStatusItem*                                 mpStatusItem;     // one status item that draws all our stati
                                                                     // at the moment this is only one add menu button
-
+    
     CGColorSpaceRef                               mxRGBSpace;
     CGColorSpaceRef                               mxGraySpace;
     CGColorSpaceRef                               mxP50Space;
     CGPatternRef                                  mxP50Pattern;
-
+    
     std::vector< NSCursor* >                      maCursors;
     std::vector< NSMenuItem* >                    maFallbackMenu;
     std::map< NSEvent*, bool >                    maKeyEventAnswer;
-
+    
     static oslThreadKey                           s_aAutoReleaseKey;
 
-    bool                                          mbIsScrollbarDoubleMax;   // TODO: support DoubleMin and DoubleBoth too
+    bool			                              mbIsScrollbarDoubleMax;	// TODO: support DoubleMin and DoubleBoth too
     SInt32                                        mnSystemVersion;          // Store System Version
     MainController*                               mpMainController;         // Apple Remote
-
+    
     NSObject*                                     mpDockIconClickHandler;
     long                                          mnDPIX;           // #i100617# read DPI only once per office life
     long                                          mnDPIY;           // #i100617# read DPI only once per office life
-
+    
     com::sun::star::uno::Reference< com::sun::star::uno::XInterface >
                                                   mxClipboard;
 
     SalData();
     ~SalData();
-
+    
     NSCursor* getCursor( PointerStyle i_eStyle );
-
+    
     static void ensureThreadAutoreleasePool();
     static void drainThreadAutoreleasePool();
-
+    
     static NSStatusItem* getStatusItem();
 };
 
@@ -135,4 +135,4 @@ BOOL ImplSalYieldMutexTryToAcquire();
 void ImplSalYieldMutexAcquire();
 void ImplSalYieldMutexRelease();
 
-#endif  // _SV_SALDATA_HXX
+#endif	// _SV_SALDATA_HXX
diff --git a/vcl/aqua/inc/salfontutils.hxx b/vcl/aqua/inc/salfontutils.hxx
index 6f9f61efda70..e86eb3106b5f 100644
--- a/vcl/aqua/inc/salfontutils.hxx
+++ b/vcl/aqua/inc/salfontutils.hxx
@@ -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
@@ -62,5 +62,5 @@ static const char *kFontWeightRegular1 = "Regular";
 static const char *kFontWeightRegular2 = "regular";
 
 
-#endif  // _SV_SALFONTUTILS_HXX
+#endif	// _SV_SALFONTUTILS_HXX
 
diff --git a/vcl/aqua/inc/salframe.h b/vcl/aqua/inc/salframe.h
index c2ded3267f45..af8811aa4ce5 100644
--- a/vcl/aqua/inc/salframe.h
+++ b/vcl/aqua/inc/salframe.h
@@ -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
@@ -60,47 +60,47 @@ class AquaSalFrame : public SalFrame
 {
 public:
     NSWindow*                       mpWindow;               // Cocoa window
-    NSView*                         mpView;                 // Cocoa view (actually a custom view, see below
+    NSView*                         mpView;				    // Cocoa view (actually a custom view, see below
     NSMenuItem*                     mpDockMenuEntry;        // entry in the dynamic dock menu
     NSRect                          maScreenRect;           // for mirroring purposes
-    AquaSalGraphics*                mpGraphics;             // current frame graphics
-    AquaSalFrame*                   mpParent;               // pointer to parent frame
-     SystemEnvData                  maSysData;              // system data
+    AquaSalGraphics*		        mpGraphics; 			// current frame graphics
+    AquaSalFrame*			        mpParent;				// pointer to parent frame
+     SystemEnvData			        maSysData;				// system data
     int                             mnMinWidth;             // min. client width in pixels
     int                             mnMinHeight;            // min. client height in pixels
     int                             mnMaxWidth;             // max. client width in pixels
     int                             mnMaxHeight;            // max. client height in pixels
     NSRect                          maFullScreenRect;       // old window size when in FullScreen
-    bool                            mbGraphics:1;           // is Graphics used?
+    bool					        mbGraphics:1; 			// is Graphics used?
     bool                            mbFullScreen:1;         // is Window in FullScreen?
     bool                            mbShown:1;
     bool                            mbInitShow:1;
     bool                            mbPositioned:1;
     bool                            mbSized:1;
     bool                            mbPresentation:1;
-
+    
     ULONG                           mnStyle;
     unsigned int                    mnStyleMask;            // our style mask from NSWindow creation
-
+    
     ULONG                           mnLastEventTime;
     unsigned int                    mnLastModifierFlags;
     AquaSalMenu*                    mpMenu;
-
+    
     SalExtStyle                     mnExtStyle;             // currently document frames are marked this way
-
+    
     PointerStyle                    mePointerStyle;         // currently active pointer style
-
+    
     NSTrackingRectTag               mnTrackingRectTag;      // used to get enter/leave messages
 
     CGMutablePathRef                mrClippingPath;         // used for "shaping"
     std::vector< CGRect >           maClippingRects;
-
+    
     std::list<AquaBlinker*>         maBlinkers;
-
+    
     Rectangle                       maInvalidRect;
-
+    
     ULONG                           mnICOptions;
-
+    
     boost::shared_ptr< Timer >      mpActivityTimer; // Timer to prevent system sleep during presentation
 public:
     /** Constructor
@@ -113,47 +113,47 @@ public:
 
     virtual ~AquaSalFrame();
 
-    virtual SalGraphics*        GetGraphics();
-    virtual void                ReleaseGraphics( SalGraphics* pGraphics );
-    virtual BOOL                PostEvent( void* pData );
-    virtual void                SetTitle( const XubString& rTitle );
-    virtual void                SetIcon( USHORT nIcon );
+    virtual SalGraphics*		GetGraphics();
+    virtual void				ReleaseGraphics( SalGraphics* pGraphics );
+    virtual BOOL				PostEvent( void* pData );
+    virtual void				SetTitle( const XubString& rTitle );
+    virtual void				SetIcon( USHORT nIcon );
     virtual void                SetRepresentedURL( const rtl::OUString& );
     virtual void                SetMenu( SalMenu* pSalMenu );
     virtual void                DrawMenuBar();
-    virtual void                Show( BOOL bVisible, BOOL bNoActivate = FALSE );
-    virtual void                Enable( BOOL bEnable );
+    virtual void				Show( BOOL bVisible, BOOL bNoActivate = FALSE );
+    virtual void				Enable( BOOL bEnable );
     virtual void                SetMinClientSize( long nWidth, long nHeight );
     virtual void                SetMaxClientSize( long nWidth, long nHeight );
-    virtual void                SetPosSize( long nX, long nY, long nWidth, long nHeight, USHORT nFlags );
-    virtual void                GetClientSize( long& rWidth, long& rHeight );
-    virtual void                GetWorkArea( Rectangle& rRect );
-    virtual SalFrame*           GetParent() const;
-    virtual void                SetWindowState( const SalFrameState* pState );
-    virtual BOOL                GetWindowState( SalFrameState* pState );
-    virtual void                ShowFullScreen( BOOL bFullScreen, sal_Int32 nDisplay );
-    virtual void                StartPresentation( BOOL bStart );
-    virtual void                SetAlwaysOnTop( BOOL bOnTop );
-    virtual void                ToTop( USHORT nFlags );
-    virtual void                SetPointer( PointerStyle ePointerStyle );
-    virtual void                CaptureMouse( BOOL bMouse );
-    virtual void                SetPointerPos( long nX, long nY );
-    virtual void                Flush( void );
-    virtual void                Flush( const Rectangle& );
-    virtual void                Sync();
-    virtual void                SetInputContext( SalInputContext* pContext );
-    virtual void                EndExtTextInput( USHORT nFlags );
-    virtual String              GetKeyName( USHORT nKeyCode );
-    virtual String              GetSymbolKeyName( const XubString& rFontName, USHORT nKeyCode );
+    virtual void				SetPosSize( long nX, long nY, long nWidth, long nHeight, USHORT nFlags );
+    virtual void				GetClientSize( long& rWidth, long& rHeight );
+    virtual void				GetWorkArea( Rectangle& rRect );
+    virtual SalFrame*			GetParent() const;
+    virtual void				SetWindowState( const SalFrameState* pState );
+    virtual BOOL				GetWindowState( SalFrameState* pState );
+    virtual void				ShowFullScreen( BOOL bFullScreen, sal_Int32 nDisplay );
+    virtual void				StartPresentation( BOOL bStart );
+    virtual void				SetAlwaysOnTop( BOOL bOnTop );
+    virtual void				ToTop( USHORT nFlags );
+    virtual void				SetPointer( PointerStyle ePointerStyle );
+    virtual void				CaptureMouse( BOOL bMouse );
+    virtual void				SetPointerPos( long nX, long nY );
+    virtual void				Flush( void );
+    virtual void				Flush( const Rectangle& );
+    virtual void				Sync();
+    virtual void				SetInputContext( SalInputContext* pContext );
+    virtual void				EndExtTextInput( USHORT nFlags );
+    virtual String				GetKeyName( USHORT nKeyCode );
+    virtual String				GetSymbolKeyName( const XubString& rFontName, USHORT nKeyCode );
     virtual BOOL                MapUnicodeToKeyCode( sal_Unicode aUnicode, LanguageType aLangType, KeyCode& rKeyCode );
-    virtual LanguageType        GetInputLanguage();
-    virtual SalBitmap*          SnapShot();
-    virtual void                UpdateSettings( AllSettings& rSettings );
-    virtual void                Beep( SoundType eSoundType );
-    virtual const SystemEnvData*    GetSystemData() const;
-    virtual SalPointerState     GetPointerState();
-    virtual void                SetParent( SalFrame* pNewParent );
-    virtual bool                SetPluginParent( SystemParentData* pNewParent );
+    virtual LanguageType		GetInputLanguage();
+    virtual SalBitmap*			SnapShot();
+    virtual void				UpdateSettings( AllSettings& rSettings );
+    virtual void				Beep( SoundType eSoundType );
+    virtual const SystemEnvData*	GetSystemData() const;
+    virtual SalPointerState		GetPointerState();
+    virtual void				SetParent( SalFrame* pNewParent );
+    virtual bool				SetPluginParent( SystemParentData* pNewParent );
     virtual void                SetExtendedFrameStyle( SalExtStyle );
     virtual void                SetBackgroundBitmap( SalBitmap* );
     virtual void                SetScreenNumber(unsigned int);
@@ -171,21 +171,21 @@ public:
     virtual void SetClientSize( long nWidth, long nHeight );
 
     void UpdateFrameGeometry();
-
+    
     // trigger painting of the window
     void SendPaintEvent( const Rectangle* pRect = NULL );
 
     static bool isAlive( const AquaSalFrame* pFrame )
     { return GetSalData()->maFrameCheck.find( pFrame ) != GetSalData()->maFrameCheck.end(); }
-
+    
     static AquaSalFrame* GetCaptureFrame() { return s_pCaptureFrame; }
-
+    
     NSWindow* getWindow() const { return mpWindow; }
     NSView* getView() const { return mpView; }
     unsigned int getStyleMask() const { return mnStyleMask; }
-
+    
     void getResolution( long& o_rDPIX, long& o_rDPIY );
-
+    
     // actually the follwing methods do the same thing: flipping y coordinates
     // but having two of them makes clearer what the coordinate system
     // is supposed to be before and after
@@ -194,11 +194,11 @@ public:
 
     void VCLToCocoa( NSPoint& io_rPoint, bool bRelativeToScreen = true );
     void CocoaToVCL( NSPoint& io_Point, bool bRelativeToScreen = true );
-
+    
     NSCursor* getCurrentCursor() const;
-
+    
     CGMutablePathRef getClipPath() const { return mrClippingPath; }
-
+    
     // called by VCL_NSApplication to indicate screen settings have changed
     void screenParametersChanged();
 
@@ -206,12 +206,12 @@ public:
     /** do things on initial show (like centering on parent or on screen)
     */
     void initShow();
-
+    
     void initWindowAndView();
 
- private: // data
+ private: // data    
     static AquaSalFrame*                   s_pCaptureFrame;
-
+    
     // make AquaSalFrame non copyable
     AquaSalFrame( const AquaSalFrame& );
     AquaSalFrame& operator=(const AquaSalFrame&);
diff --git a/vcl/aqua/inc/salframeview.h b/vcl/aqua/inc/salframeview.h
index 0174c1a68832..25048cc8d1b1 100755
--- a/vcl/aqua/inc/salframeview.h
+++ b/vcl/aqua/inc/salframeview.h
@@ -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
@@ -182,10 +182,10 @@
   actual mouse event initiating this drag operation.
   Mouse events can only be received by subclassing
   NSView and overriding methods like 'mouseDown' etc.
-  hence we implement a event hook here so that the
-  D&D service can register as listener for mouse
-  messages and use the last 'mouseDown' or
-  'mouseDragged' message to initiate the drag
+  hence we implement a event hook here so that the 
+  D&D service can register as listener for mouse 
+  messages and use the last 'mouseDown' or 
+  'mouseDragged' message to initiate the drag 
   operation.
 */
 -(void)registerMouseEventListener: (id)theListener;
diff --git a/vcl/aqua/inc/salgdi.h b/vcl/aqua/inc/salgdi.h
index 8867d1d26078..aba4b67f1740 100644
--- a/vcl/aqua/inc/salgdi.h
+++ b/vcl/aqua/inc/salgdi.h
@@ -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
@@ -58,21 +58,21 @@ public:
     virtual ImplFontData*   Clone() const;
     virtual ImplFontEntry*  CreateFontInstance( ImplFontSelectData& ) const;
     virtual sal_IntPtr      GetFontId() const;
+    
+    ImplFontCharMap*		GetImplFontCharMap() const;
+    bool					HasChar( sal_uInt32 cChar ) const;
 
-    ImplFontCharMap*        GetImplFontCharMap() const;
-    bool                    HasChar( sal_uInt32 cChar ) const;
-
-    void                    ReadOs2Table() const;
-    void                    ReadMacCmapEncoding() const;
-    bool                    HasCJKSupport() const;
+    void					ReadOs2Table() const;
+    void					ReadMacCmapEncoding() const;
+    bool					HasCJKSupport() const;
 
 private:
-    const ATSUFontID            mnFontId;
-    mutable ImplFontCharMap*    mpCharMap;
-    mutable bool                mbOs2Read;       // true if OS2-table related info is valid
-    mutable bool                mbHasOs2Table;
-    mutable bool                mbCmapEncodingRead; // true if cmap encoding of Mac font is read
-    mutable bool                mbHasCJKSupport; // #i78970# CJK fonts need extra leading
+    const ATSUFontID			mnFontId;
+    mutable ImplFontCharMap*	mpCharMap;
+    mutable bool				mbOs2Read;		 // true if OS2-table related info is valid
+    mutable bool				mbHasOs2Table;
+    mutable bool				mbCmapEncodingRead; // true if cmap encoding of Mac font is read
+    mutable bool				mbHasCJKSupport; // #i78970# CJK fonts need extra leading
 };
 
 // abstracting quartz color instead of having to use an CGFloat[] array
@@ -81,9 +81,9 @@ class RGBAColor
 public:
     RGBAColor( SalColor );
     RGBAColor( float fRed, float fGreen, float fBlue, float fAlpha ); //NOTUSEDYET
-    const float* AsArray() const    { return &mfRed; }
-    bool IsVisible() const          { return (mfAlpha > 0); }
-    void SetAlpha( float fAlpha )   { mfAlpha = fAlpha; }
+    const float* AsArray() const	{ return &mfRed; }
+    bool IsVisible() const			{ return (mfAlpha > 0); }
+    void SetAlpha( float fAlpha )	{ mfAlpha = fAlpha; }
 private:
     float mfRed, mfGreen, mfBlue, mfAlpha;
 };
@@ -96,13 +96,13 @@ class AquaSalGraphics : public SalGraphics
     friend class ATSLayout;
 protected:
     AquaSalFrame*                           mpFrame;
-    CGLayerRef                              mxLayer;    // Quartz graphics layer
-    CGContextRef                            mrContext;  // Quartz drawing context
-    class XorEmulation*                     mpXorEmulation;
+    CGLayerRef								mxLayer;	// Quartz graphics layer
+    CGContextRef		                    mrContext;	// Quartz drawing context
+    class XorEmulation*						mpXorEmulation;
     int                                     mnXorMode; // 0: off 1: on 2: invert only
-    int                                     mnWidth;
-    int                                     mnHeight;
-    int                                     mnBitmapDepth;  // zero unless bitmap
+    int										mnWidth;
+    int										mnHeight;
+    int										mnBitmapDepth;	// zero unless bitmap
     /// device resolution of this graphics
     long                                    mnRealDPIX;
     long                                    mnRealDPIY;
@@ -114,7 +114,7 @@ protected:
     /// path representing current clip region
     CGMutablePathRef                        mxClipPath;
 
-    /// Drawing colors
+    /// Drawing colors    
     /// pen color RGBA
     RGBAColor                               maLineColor;
     /// brush color RGBA
@@ -123,7 +123,7 @@ protected:
     // Device Font settings
      const ImplMacFontData*                  mpMacFontData;
     /// ATSU style object which carries all font attributes
-    ATSUStyle                               maATSUStyle;
+    ATSUStyle			                    maATSUStyle;
     /// text rotation as ATSU angle
     Fixed                                   mnATSUIRotation;
     /// workaround to prevent ATSU overflows for huge font sizes
@@ -134,7 +134,7 @@ protected:
     bool                                    mbNonAntialiasedText;
 
     // Graphics types
-
+    
     /// is this a printer graphics
     bool                                    mbPrinter;
     /// is this a virtual device graphics
@@ -143,12 +143,12 @@ protected:
     bool                                    mbWindow;
 
 public:
-    AquaSalGraphics();
+    AquaSalGraphics();	
     virtual ~AquaSalGraphics();
 
-    bool                IsPenVisible() const    { return maLineColor.IsVisible(); }
-    bool                IsBrushVisible() const  { return maFillColor.IsVisible(); }
-
+    bool                IsPenVisible() const	{ return maLineColor.IsVisible(); }
+    bool                IsBrushVisible() const	{ return maFillColor.IsVisible(); }
+    
     void                SetWindowGraphics( AquaSalFrame* pFrame );
     void                SetPrinterGraphics( CGContextRef, long nRealDPIX, long nRealDPIY, double fFakeScale );
     void                SetVirDevGraphics( CGLayerRef, CGContextRef, int nBitDepth = 0 );
@@ -156,7 +156,7 @@ public:
     void                initResolution( NSWindow* );
     void                copyResolution( AquaSalGraphics& );
     void                updateResolution();
-
+    
     bool                IsWindowGraphics()      const   { return mbWindow; }
     bool                IsPrinterGraphics()     const   { return mbPrinter; }
     bool                IsVirDevGraphics()      const   { return mbVirDev; }
@@ -164,67 +164,67 @@ public:
     void                setGraphicsFrame( AquaSalFrame* pFrame ) { mpFrame = pFrame; }
 
     void                ImplDrawPixel( long nX, long nY, const RGBAColor& ); // helper to draw single pixels
-
+    
     bool                CheckContext();
     void                UpdateWindow( NSRect& ); // delivered in NSView coordinates
-    void                RefreshRect( const CGRect& );
-    void                RefreshRect( const NSRect& );
-    void                RefreshRect(float lX, float lY, float lWidth, float lHeight);
+    void				RefreshRect( const CGRect& );
+    void				RefreshRect( const NSRect& );
+    void				RefreshRect(float lX, float lY, float lWidth, float lHeight);
 
     void                SetState();
     void                UnsetState();
     // InvalidateContext does an UnsetState and sets mrContext to 0
     void                InvalidateContext();
 
-    virtual BOOL        unionClipRegion( long nX, long nY, long nWidth, long nHeight );
-    virtual bool        unionClipRegion( const ::basegfx::B2DPolyPolygon& );
+    virtual BOOL		unionClipRegion( long nX, long nY, long nWidth, long nHeight );
+    virtual bool		unionClipRegion( const ::basegfx::B2DPolyPolygon& );
 
     // draw --> LineColor and FillColor and RasterOp and ClipRegion
-    virtual void        drawPixel( long nX, long nY );
-    virtual void        drawPixel( long nX, long nY, SalColor nSalColor );
-    virtual void        drawLine( long nX1, long nY1, long nX2, long nY2 );
-    virtual void        drawRect( long nX, long nY, long nWidth, long nHeight );
-    virtual void        drawPolyLine( ULONG nPoints, const SalPoint* pPtAry );
-    virtual void        drawPolygon( ULONG nPoints, const SalPoint* pPtAry );
-    virtual void        drawPolyPolygon( ULONG nPoly, const ULONG* pPoints, PCONSTSALPOINT* pPtAry );
+    virtual void		drawPixel( long nX, long nY );
+    virtual void		drawPixel( long nX, long nY, SalColor nSalColor );
+    virtual void		drawLine( long nX1, long nY1, long nX2, long nY2 );
+    virtual void		drawRect( long nX, long nY, long nWidth, long nHeight );
+    virtual void		drawPolyLine( ULONG nPoints, const SalPoint* pPtAry );
+    virtual void		drawPolygon( ULONG nPoints, const SalPoint* pPtAry );
+    virtual void		drawPolyPolygon( ULONG nPoly, const ULONG* pPoints, PCONSTSALPOINT* pPtAry );
     virtual bool        drawPolyPolygon( const ::basegfx::B2DPolyPolygon&, double fTransparency );
-    virtual sal_Bool    drawPolyLineBezier( ULONG nPoints, const SalPoint* pPtAry, const BYTE* pFlgAry );
-    virtual sal_Bool    drawPolygonBezier( ULONG nPoints, const SalPoint* pPtAry, const BYTE* pFlgAry );
-    virtual sal_Bool    drawPolyPolygonBezier( ULONG nPoly, const ULONG* pPoints, const SalPoint* const* pPtAry, const BYTE* const* pFlgAry );
+    virtual sal_Bool	drawPolyLineBezier( ULONG nPoints, const SalPoint* pPtAry, const BYTE* pFlgAry );
+    virtual sal_Bool	drawPolygonBezier( ULONG nPoints, const SalPoint* pPtAry, const BYTE* pFlgAry );
+    virtual sal_Bool	drawPolyPolygonBezier( ULONG nPoly, const ULONG* pPoints, const SalPoint* const* pPtAry, const BYTE* const* pFlgAry );
     virtual bool        drawPolyLine( const ::basegfx::B2DPolygon&, double fTransparency, const ::basegfx::B2DVector& rLineWidths, basegfx::B2DLineJoin );
 
     // CopyArea --> No RasterOp, but ClipRegion
-    virtual void        copyArea( long nDestX, long nDestY, long nSrcX, long nSrcY, long nSrcWidth,
+    virtual void		copyArea( long nDestX, long nDestY, long nSrcX, long nSrcY, long nSrcWidth,
                                   long nSrcHeight, USHORT nFlags );
 
     // CopyBits and DrawBitmap --> RasterOp and ClipRegion
     // CopyBits() --> pSrcGraphics == NULL, then CopyBits on same Graphics
-    virtual void        copyBits( const SalTwoRect* pPosAry, SalGraphics* pSrcGraphics );
-    virtual void        drawBitmap( const SalTwoRect* pPosAry, const SalBitmap& rSalBitmap );
-    virtual void        drawBitmap( const SalTwoRect* pPosAry,
+    virtual void		copyBits( const SalTwoRect* pPosAry, SalGraphics* pSrcGraphics );
+    virtual void		drawBitmap( const SalTwoRect* pPosAry, const SalBitmap& rSalBitmap );
+    virtual void		drawBitmap( const SalTwoRect* pPosAry,
                                     const SalBitmap& rSalBitmap,
                                     SalColor nTransparentColor );
-    virtual void        drawBitmap( const SalTwoRect* pPosAry,
+    virtual void		drawBitmap( const SalTwoRect* pPosAry,
                                     const SalBitmap& rSalBitmap,
                                     const SalBitmap& rTransparentBitmap );
-    virtual void        drawMask( const SalTwoRect* pPosAry,
+    virtual void		drawMask( const SalTwoRect* pPosAry,
                                   const SalBitmap& rSalBitmap,
                                   SalColor nMaskColor );
 
-    virtual SalBitmap*  getBitmap( long nX, long nY, long nWidth, long nHeight );
-    virtual SalColor    getPixel( long nX, long nY );
+    virtual SalBitmap*	getBitmap( long nX, long nY, long nWidth, long nHeight );
+    virtual SalColor	getPixel( long nX, long nY );
 
     // invert --> ClipRegion (only Windows or VirDevs)
-    virtual void        invert( long nX, long nY, long nWidth, long nHeight, SalInvert nFlags);
-    virtual void        invert( ULONG nPoints, const SalPoint* pPtAry, SalInvert nFlags );
+    virtual void		invert( long nX, long nY, long nWidth, long nHeight, SalInvert nFlags);
+    virtual void		invert( ULONG nPoints, const SalPoint* pPtAry, SalInvert nFlags );
 
-    virtual BOOL        drawEPS( long nX, long nY, long nWidth, long nHeight, void* pPtr, ULONG nSize );
+    virtual BOOL		drawEPS( long nX, long nY, long nWidth, long nHeight, void* pPtr, ULONG nSize );
 
-    virtual bool            drawAlphaBitmap( const SalTwoRect&,
+    virtual bool 			drawAlphaBitmap( const SalTwoRect&,
                                              const SalBitmap& rSourceBitmap,
                                              const SalBitmap& rAlphaBitmap );
 
-    virtual bool            drawAlphaRect( long nX, long nY, long nWidth,
+    virtual bool		    drawAlphaRect( long nX, long nY, long nWidth,
                                            long nHeight, sal_uInt8 nTransparency );
 
     CGPoint*                makeCGptArray(ULONG nPoints, const SalPoint*  pPtAry);
@@ -242,52 +242,52 @@ public:
                                                 Rectangle &rNativeBoundingRegion, Rectangle &rNativeContentRegion );
 
     // get device resolution
-    virtual void            GetResolution( long& rDPIX, long& rDPIY );
+    virtual void			GetResolution( long& rDPIX, long& rDPIY );
     // get the depth of the device
-    virtual USHORT          GetBitCount();
+    virtual USHORT			GetBitCount();
     // get the width of the device
-    virtual long            GetGraphicsWidth() const;
+    virtual long			GetGraphicsWidth() const;
 
     // set the clip region to empty
-    virtual void            ResetClipRegion();
+    virtual void			ResetClipRegion();
     // begin setting the clip region, add rectangles to the
     // region with the UnionClipRegion call
-    virtual void            BeginSetClipRegion( ULONG nCount );
+    virtual void			BeginSetClipRegion( ULONG nCount );
     // all rectangles were added and the clip region should be set now
-    virtual void            EndSetClipRegion();
+    virtual void			EndSetClipRegion();
 
     // set the line color to transparent (= don't draw lines)
-    virtual void            SetLineColor();
+    virtual void			SetLineColor();
     // set the line color to a specific color
-    virtual void            SetLineColor( SalColor nSalColor );
+    virtual void			SetLineColor( SalColor nSalColor );
     // set the fill color to transparent (= don't fill)
-    virtual void            SetFillColor();
+    virtual void			SetFillColor();
     // set the fill color to a specific color, shapes will be
     // filled accordingly
-    virtual void            SetFillColor( SalColor nSalColor );
+    virtual void          	SetFillColor( SalColor nSalColor );
     // enable/disable XOR drawing
-    virtual void            SetXORMode( bool bSet, bool bInvertOnly );
+    virtual void			SetXORMode( bool bSet, bool bInvertOnly );
     // set line color for raster operations
-    virtual void            SetROPLineColor( SalROPColor nROPColor );
+    virtual void			SetROPLineColor( SalROPColor nROPColor );
     // set fill color for raster operations
-    virtual void            SetROPFillColor( SalROPColor nROPColor );
+    virtual void			SetROPFillColor( SalROPColor nROPColor );
     // set the text color to a specific color
-    virtual void            SetTextColor( SalColor nSalColor );
+    virtual void			SetTextColor( SalColor nSalColor );
     // set the font
     virtual USHORT         SetFont( ImplFontSelectData*, int nFallbackLevel );
     // get the current font's etrics
-    virtual void            GetFontMetric( ImplFontMetricData* );
+    virtual void			GetFontMetric( ImplFontMetricData* );
     // get kernign pairs of the current font
     // return only PairCount if (pKernPairs == NULL)
-    virtual ULONG           GetKernPairs( ULONG nPairs, ImplKernPairData* pKernPairs );
+    virtual ULONG			GetKernPairs( ULONG nPairs, ImplKernPairData* pKernPairs );
     // get the repertoire of the current font
     virtual ImplFontCharMap* GetImplFontCharMap() const;
     // graphics must fill supplied font list
-    virtual void            GetDevFontList( ImplDevFontList* );
+    virtual void			GetDevFontList( ImplDevFontList* );
     // graphics should call ImplAddDevFontSubstitute on supplied
     // OutputDevice for all its device specific preferred font substitutions
-    virtual void            GetDevFontSubstList( OutputDevice* );
-    virtual bool            AddTempDevFont( ImplDevFontList*, const String& rFileURL, const String& rFontName );
+    virtual void			GetDevFontSubstList( OutputDevice* );
+    virtual bool			AddTempDevFont( ImplDevFontList*, const String& rFileURL, const String& rFontName );
     // CreateFontSubset: a method to get a subset of glyhps of a font
     // inside a new valid font file
     // returns TRUE if creation of subset was successfull
@@ -300,7 +300,7 @@ public:
     //             rInfo: additional outgoing information
     // implementation note: encoding 0 with glyph id 0 should be added implicitly
     // as "undefined character"
-    virtual BOOL            CreateFontSubset( const rtl::OUString& rToFile,
+    virtual BOOL			CreateFontSubset( const rtl::OUString& rToFile,
                                               const ImplFontData* pFont,
                                               long* pGlyphIDs,
                                               sal_uInt8* pEncoding,
@@ -325,13 +325,13 @@ public:
     //                      pWidths MUST support at least 256 members;
     //             rInfo: additional outgoing information
     //             pDataLen: out parameter, contains the byte length of the returned buffer
-    virtual const void* GetEmbedFontData( const ImplFontData*,
+    virtual const void*	GetEmbedFontData( const ImplFontData*,
                                           const sal_Ucs* pUnicodes,
                                           sal_Int32* pWidths,
                                           FontSubsetInfo& rInfo,
                                           long* pDataLen );
     // frees the font data again
-    virtual void            FreeEmbedFontData( const void* pData, long nDataLen );
+    virtual void			FreeEmbedFontData( const void* pData, long nDataLen );
 
     virtual void            GetGlyphWidths( const ImplFontData*,
                                             bool bVertical,
@@ -342,7 +342,7 @@ public:
     virtual BOOL                    GetGlyphOutline( long nIndex, basegfx::B2DPolyPolygon& );
 
     virtual SalLayout*              GetTextLayout( ImplLayoutArgs&, int nFallbackLevel );
-    virtual void                     DrawServerFontLayout( const ServerFontLayout& );
+    virtual void					 DrawServerFontLayout( const ServerFontLayout& );
     virtual bool                    supportsOperation( OutDevSupportType ) const;
 
     // Query the platform layer for control support
@@ -366,25 +366,25 @@ class XorEmulation
 {
 public:
                     XorEmulation();
-    /*final*/       ~XorEmulation();
+    /*final*/		~XorEmulation();
 
-    void            SetTarget( int nWidth, int nHeight, int nBitmapDepth, CGContextRef, CGLayerRef );
-    bool            UpdateTarget();
-    void            Enable()            { mbIsEnabled = true; }
-    void            Disable()           { mbIsEnabled = false; }
-    bool            IsEnabled() const   { return mbIsEnabled; }
-    CGContextRef    GetTargetContext() const { return mxTargetContext; }
-    CGContextRef    GetMaskContext() const { return (mbIsEnabled ? mxMaskContext : NULL); }
+    void			SetTarget( int nWidth, int nHeight, int nBitmapDepth, CGContextRef, CGLayerRef );
+    bool			UpdateTarget();
+    void			Enable()			{ mbIsEnabled = true; }
+    void			Disable()			{ mbIsEnabled = false; }
+    bool 			IsEnabled() const	{ return mbIsEnabled; }
+    CGContextRef	GetTargetContext() const { return mxTargetContext; }
+    CGContextRef	GetMaskContext() const { return (mbIsEnabled ? mxMaskContext : NULL); }
 
 private:
-    CGLayerRef      mxTargetLayer;
-    CGContextRef    mxTargetContext;
-    CGContextRef    mxMaskContext;
-    CGContextRef    mxTempContext;
-    ULONG*          mpMaskBuffer;
-    ULONG*          mpTempBuffer;
-    int             mnBufferLongs;
-    bool            mbIsEnabled;
+    CGLayerRef		mxTargetLayer;
+    CGContextRef	mxTargetContext;
+    CGContextRef	mxMaskContext;
+    CGContextRef	mxTempContext;
+    ULONG*			mpMaskBuffer;
+    ULONG*			mpTempBuffer;
+    int				mnBufferLongs;
+    bool			mbIsEnabled;
 };
 
 
@@ -401,17 +401,17 @@ inline void AquaSalGraphics::RefreshRect( const NSRect& rRect )
 }
 
 inline RGBAColor::RGBAColor( SalColor nSalColor )
-:   mfRed( SALCOLOR_RED(nSalColor) * (1.0/255))
-,   mfGreen( SALCOLOR_GREEN(nSalColor) * (1.0/255))
-,   mfBlue( SALCOLOR_BLUE(nSalColor) * (1.0/255))
-,   mfAlpha( 1.0 )  // opaque
+:	mfRed( SALCOLOR_RED(nSalColor) * (1.0/255))
+,	mfGreen( SALCOLOR_GREEN(nSalColor) * (1.0/255))
+,	mfBlue( SALCOLOR_BLUE(nSalColor) * (1.0/255))
+,	mfAlpha( 1.0 )	// opaque
 {}
 
 inline RGBAColor::RGBAColor( float fRed, float fGreen, float fBlue, float fAlpha )
-:   mfRed( fRed )
-,   mfGreen( fGreen )
-,   mfBlue( fBlue )
-,   mfAlpha( fAlpha )
+:	mfRed( fRed )
+,	mfGreen( fGreen )
+,	mfBlue( fBlue )
+,	mfAlpha( fAlpha )
 {}
 
 #endif // _SV_SALGDI_H
diff --git a/vcl/aqua/inc/salinst.h b/vcl/aqua/inc/salinst.h
index 0bceb99d1d0e..38c987819b64 100644
--- a/vcl/aqua/inc/salinst.h
+++ b/vcl/aqua/inc/salinst.h
@@ -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
@@ -48,15 +48,15 @@ class Image;
 
 class SalYieldMutex : public vos::OMutex
 {
-    ULONG                                       mnCount;
+    ULONG										mnCount;
     vos::OThread::TThreadIdentifier             mnThreadId;
 
 public:
                                                 SalYieldMutex();
-    virtual void                                acquire();
-    virtual void                                release();
-    virtual sal_Bool                            tryToAcquire();
-    ULONG                                       GetAcquireCount() const { return mnCount; }
+    virtual void								acquire();
+    virtual void								release();
+    virtual sal_Bool							tryToAcquire();
+    ULONG										GetAcquireCount() const { return mnCount; }
     vos::OThread::TThreadIdentifier             GetThreadId() const { return mnThreadId; }
 };
 
@@ -83,14 +83,14 @@ class AquaSalInstance : public SalInstance
         AquaSalFrame*   mpFrame;
         void*           mpData;
         USHORT          mnType;
-
+        
         SalUserEvent( AquaSalFrame* pFrame, void* pData, USHORT nType ) :
             mpFrame( pFrame ), mpData( pData ), mnType( nType )
         {}
     };
-
+    
 public:
-    SalYieldMutex*                          mpSalYieldMutex;        // Sal-Yield-Mutex
+    SalYieldMutex*		                    mpSalYieldMutex;		// Sal-Yield-Mutex
     rtl::OUString                           maDefaultPrinter;
     vos::OThread::TThreadIdentifier         maMainThread;
     bool                                    mbWaitingYield;
@@ -101,47 +101,47 @@ public:
 
     typedef std::list<const ApplicationEvent*> AppEventList;
     static AppEventList aAppEventList;
-
+    
 public:
     AquaSalInstance();
     virtual ~AquaSalInstance();
 
     virtual SalSystem*      CreateSystem();
     virtual void            DestroySystem(SalSystem*);
-    virtual SalFrame*       CreateChildFrame( SystemParentData* pParent, ULONG nStyle );
-    virtual SalFrame*       CreateFrame( SalFrame* pParent, ULONG nStyle );
-    virtual void            DestroyFrame( SalFrame* pFrame );
-    virtual SalObject*      CreateObject( SalFrame* pParent, SystemWindowData* pWindowData, BOOL bShow = TRUE );
-    virtual void            DestroyObject( SalObject* pObject );
-    virtual SalVirtualDevice*   CreateVirtualDevice( SalGraphics* pGraphics,
+    virtual SalFrame*      	CreateChildFrame( SystemParentData* pParent, ULONG nStyle );
+    virtual SalFrame*      	CreateFrame( SalFrame* pParent, ULONG nStyle );
+    virtual void			DestroyFrame( SalFrame* pFrame );
+    virtual SalObject*		CreateObject( SalFrame* pParent, SystemWindowData* pWindowData, BOOL bShow = TRUE );
+    virtual void			DestroyObject( SalObject* pObject );
+    virtual SalVirtualDevice*	CreateVirtualDevice( SalGraphics* pGraphics,
                                                      long nDX, long nDY,
                                                      USHORT nBitCount, const SystemGraphicsData *pData );
-    virtual void            DestroyVirtualDevice( SalVirtualDevice* pDevice );
+    virtual void			DestroyVirtualDevice( SalVirtualDevice* pDevice );
 
-    virtual SalInfoPrinter* CreateInfoPrinter( SalPrinterQueueInfo* pQueueInfo,
+    virtual SalInfoPrinter*	CreateInfoPrinter( SalPrinterQueueInfo* pQueueInfo,
                                                ImplJobSetup* pSetupData );
-    virtual void            DestroyInfoPrinter( SalInfoPrinter* pPrinter );
-    virtual SalPrinter*     CreatePrinter( SalInfoPrinter* pInfoPrinter );
-    virtual void            DestroyPrinter( SalPrinter* pPrinter );
-    virtual void            GetPrinterQueueInfo( ImplPrnQueueList* pList );
-    virtual void            GetPrinterQueueState( SalPrinterQueueInfo* pInfo );
-    virtual void            DeletePrinterQueueInfo( SalPrinterQueueInfo* pInfo );
+    virtual void			DestroyInfoPrinter( SalInfoPrinter* pPrinter );
+    virtual SalPrinter*		CreatePrinter( SalInfoPrinter* pInfoPrinter );
+    virtual void			DestroyPrinter( SalPrinter* pPrinter );
+    virtual void			GetPrinterQueueInfo( ImplPrnQueueList* pList );
+    virtual void			GetPrinterQueueState( SalPrinterQueueInfo* pInfo );
+    virtual void			DeletePrinterQueueInfo( SalPrinterQueueInfo* pInfo );
     virtual String             GetDefaultPrinter();
-    virtual SalTimer*           CreateSalTimer();
-    virtual SalI18NImeStatus*   CreateI18NImeStatus();
-    virtual SalSystem*          CreateSalSystem();
-    virtual SalBitmap*          CreateSalBitmap();
-    virtual vos::IMutex*        GetYieldMutex();
-    virtual ULONG               ReleaseYieldMutex();
-    virtual void                AcquireYieldMutex( ULONG nCount );
-    virtual void                Yield( bool bWait, bool bHandleAllCurrentEvents );
-    virtual bool                AnyInput( USHORT nType );
-    virtual SalMenu*            CreateMenu( BOOL bMenuBar );
-    virtual void                DestroyMenu( SalMenu* );
-    virtual SalMenuItem*        CreateMenuItem( const SalItemParams* pItemData );
-    virtual void                DestroyMenuItem( SalMenuItem* );
+    virtual SalTimer*			CreateSalTimer();
+    virtual SalI18NImeStatus*	CreateI18NImeStatus();
+    virtual SalSystem*			CreateSalSystem();
+    virtual SalBitmap*			CreateSalBitmap();
+    virtual vos::IMutex*		GetYieldMutex();
+    virtual ULONG				ReleaseYieldMutex();
+    virtual void				AcquireYieldMutex( ULONG nCount );
+    virtual void				Yield( bool bWait, bool bHandleAllCurrentEvents );
+    virtual bool				AnyInput( USHORT nType );
+    virtual SalMenu*			CreateMenu( BOOL bMenuBar );
+    virtual void				DestroyMenu( SalMenu* );
+    virtual SalMenuItem*		CreateMenuItem( const SalItemParams* pItemData );
+    virtual void				DestroyMenuItem( SalMenuItem* );
     virtual SalSession*         CreateSalSession();
-    virtual void*               GetConnectionIdentifier( ConnectionIdentifierType& rReturnedType, int& rReturnedBytes );
+    virtual void*				GetConnectionIdentifier( ConnectionIdentifierType& rReturnedType, int& rReturnedBytes );
     virtual void                AddToRecentDocumentList(const rtl::OUString& rFileUrl, const rtl::OUString& rMimeType);
     virtual void            SetEventCallback( void* pInstance, bool(*pCallback)(void*,void*,int) );
     virtual void            SetErrorEventCallback( void* pInstance, bool(*pCallback)(void*,void*,int) );
@@ -153,31 +153,31 @@ public:
     virtual com::sun::star::uno::Reference< com::sun::star::uno::XInterface > CreateDropTarget();
 
     static void handleAppDefinedEvent( NSEvent* pEvent );
-
+    
     // check whether a particular string is passed on the command line
     // this is needed to avoid duplicate open events through a) command line and b) NSApp's openFile
     static bool isOnCommandLine( const rtl::OUString& );
-
+    
     void wakeupYield();
 
  public:
     friend class AquaSalFrame;
-
+    
     void PostUserEvent( AquaSalFrame* pFrame, USHORT nType, void* pData );
     void delayedSettingsChanged( bool bInvalidate );
-
+    
     bool isNSAppThread() const;
-
+    
     void startedPrintJob() { mnActivePrintJobs++; }
     void endedPrintJob() { mnActivePrintJobs--; }
-
+    
     // event subtypes for NSApplicationDefined events
     static const short AppExecuteSVMain   = 0x7fff;
     static const short AppEndLoopEvent    = 1;
     static const short AppStartTimerEvent = 10;
     static const short AppleRemoteEvent   = 15;
     static const short YieldWakeupEvent   = 20;
-
+    
     static NSMenu* GetDynamicDockMenu();
 };
 
diff --git a/vcl/aqua/inc/salmathutils.hxx b/vcl/aqua/inc/salmathutils.hxx
index 6106dc328740..e85abf861b6b 100755
--- a/vcl/aqua/inc/salmathutils.hxx
+++ b/vcl/aqua/inc/salmathutils.hxx
@@ -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
@@ -54,7 +54,7 @@ struct LRectCoor
 //
 // ------------------------------------------------------------------
 
-// LRectCoorVec is an abreviation for vectors in rectangular
+// LRectCoorVec is an abreviation for vectors in rectangular 
 // coordinates represented as long integers
 
 typedef struct LRectCoor   LRectCoor;
@@ -84,4 +84,4 @@ unsigned long  Euclidian2Norm ( const LRectCoorVector  pVec );
 }
 #endif
 
-#endif  // _SV_SALMATHUTILS_HXX
+#endif	// _SV_SALMATHUTILS_HXX
diff --git a/vcl/aqua/inc/salmenu.h b/vcl/aqua/inc/salmenu.h
index 100e8c22972c..b072d8d31fb1 100644
--- a/vcl/aqua/inc/salmenu.h
+++ b/vcl/aqua/inc/salmenu.h
@@ -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
@@ -57,7 +57,7 @@ public: // for OOStatusView
     };
 private:
     std::vector< MenuBarButtonEntry >   maButtons;
-
+    
     MenuBarButtonEntry* findButtonItem( USHORT i_nItemId );
     void releaseButtonEntry( MenuBarButtonEntry& i_rEntry );
     static void statusLayout();
@@ -85,14 +85,14 @@ public:
 
     int getItemIndexByPos( USHORT nPos ) const;
     const AquaSalFrame* getFrame() const;
-
+    
     void setMainMenu();
     static void unsetMainMenu();
     static void setDefaultMenu();
     static void enableMainMenu( bool bEnable );
     static void addFallbackMenuItem( NSMenuItem* NewItem );
     static void removeFallbackMenuItem( NSMenuItem* pOldItem );
-
+    
     const std::vector< MenuBarButtonEntry >& getButtons() const { return maButtons; }
 
     bool                    mbMenuBar;          // true - Menubar, false - Menu
@@ -100,9 +100,9 @@ public:
     Menu*                   mpVCLMenu;          // the corresponding vcl Menu object
     const AquaSalFrame*     mpFrame;            // the frame to dispatch the menu events to
     AquaSalMenu*            mpParentSalMenu;    // the parent menu that contains us (and perhaps has a frame)
-
+    
     static const AquaSalMenu* pCurrentMenuBar;
-
+    
 };
 
 class AquaSalMenuItem : public SalMenuItem
diff --git a/vcl/aqua/inc/salnativewidgets.h b/vcl/aqua/inc/salnativewidgets.h
index 11d4ea5c1c62..83e62adb2aa3 100755
--- a/vcl/aqua/inc/salnativewidgets.h
+++ b/vcl/aqua/inc/salnativewidgets.h
@@ -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
@@ -36,7 +36,7 @@
 //tabs
 #define TAB_HEIGHT_NORMAL 20
 #define TAB_HEIGHT_SMALL  17
-#define TAB_HEIGHT_MINI   15
+#define TAB_HEIGHT_MINI   15 
 
 #define TAB_TEXT_OFFSET     12
 #define VCL_TAB_TEXT_OFFSET 2
@@ -68,4 +68,4 @@
 
 #define CLIP_FUZZ 1
 
-#endif  // _SV_NATIVEWIDGETS_H
+#endif	// _SV_NATIVEWIDGETS_H
diff --git a/vcl/aqua/inc/salnsmenu.h b/vcl/aqua/inc/salnsmenu.h
index e9b2cbe922b8..69fa52fefeae 100755
--- a/vcl/aqua/inc/salnsmenu.h
+++ b/vcl/aqua/inc/salnsmenu.h
@@ -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
diff --git a/vcl/aqua/inc/salnstimer.h b/vcl/aqua/inc/salnstimer.h
index e29fef43b6b4..0b4d9cae1198 100755
--- a/vcl/aqua/inc/salnstimer.h
+++ b/vcl/aqua/inc/salnstimer.h
@@ -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
diff --git a/vcl/aqua/inc/salobj.h b/vcl/aqua/inc/salobj.h
index 0041b22c16a0..811b1743ec67 100644
--- a/vcl/aqua/inc/salobj.h
+++ b/vcl/aqua/inc/salobj.h
@@ -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
@@ -47,40 +47,40 @@ struct SalObjectData
 class AquaSalObject : public SalObject
 {
 public:
-    AquaSalFrame*               mpFrame;                // parent frame
+    AquaSalFrame*				mpFrame;				// parent frame
     NSClipView*                 mpClipView;
     SystemEnvData               maSysData;
-
+    
     long                        mnClipX;
     long                        mnClipY;
     long                        mnClipWidth;
     long                        mnClipHeight;
     bool                        mbClip;
-
+    
     long                        mnX;
     long                        mnY;
     long                        mnWidth;
     long                        mnHeight;
-
-
+    
+    
     void setClippedPosSize();
 
-
+    
     AquaSalObject( AquaSalFrame* pFrame );
     virtual ~AquaSalObject();
-
-    virtual void                    ResetClipRegion();
-    virtual USHORT                  GetClipRegionType();
-    virtual void                    BeginSetClipRegion( ULONG nRects );
-    virtual void                    UnionClipRegion( long nX, long nY, long nWidth, long nHeight );
-    virtual void                    EndSetClipRegion();
-    virtual void                    SetPosSize( long nX, long nY, long nWidth, long nHeight );
-    virtual void                    Show( BOOL bVisible );
-    virtual void                    Enable( BOOL nEnable );
-    virtual void                    GrabFocus();
-    virtual void                    SetBackground();
-    virtual void                    SetBackground( SalColor nSalColor );
-    virtual const SystemEnvData*    GetSystemData() const;
+    
+    virtual void					ResetClipRegion();
+    virtual USHORT					GetClipRegionType();
+    virtual void					BeginSetClipRegion( ULONG nRects );
+    virtual void					UnionClipRegion( long nX, long nY, long nWidth, long nHeight );
+    virtual void					EndSetClipRegion();
+    virtual void					SetPosSize( long nX, long nY, long nWidth, long nHeight );
+    virtual void					Show( BOOL bVisible );
+    virtual void					Enable( BOOL nEnable );
+    virtual void					GrabFocus();
+    virtual void					SetBackground();
+    virtual void					SetBackground( SalColor nSalColor );
+    virtual const SystemEnvData*	GetSystemData() const;
 };
 
 #endif // _SV_SALOBJ_H
diff --git a/vcl/aqua/inc/salprn.h b/vcl/aqua/inc/salprn.h
index 6bcafa2ee2e3..509a57312ea6 100644
--- a/vcl/aqua/inc/salprn.h
+++ b/vcl/aqua/inc/salprn.h
@@ -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
@@ -44,56 +44,56 @@ class AquaSalGraphics;
 class AquaSalInfoPrinter : public SalInfoPrinter
 {
     /// Printer graphics
-    AquaSalGraphics*        mpGraphics;
+    AquaSalGraphics*		mpGraphics;
     /// is Graphics used
-    bool                    mbGraphics;
+    bool					mbGraphics;
     /// job active ?
     bool                    mbJob;
-
+    
     /// cocoa printer object
     NSPrinter*              mpPrinter;
     /// cocoa print info object
     NSPrintInfo*            mpPrintInfo;
-
+    
     /// FIXME: get real printer context for infoprinter if possible
     /// fake context for info printer
     /// graphics context for Quartz 2D
-    CGContextRef                            mrContext;
+    CGContextRef		                    mrContext;
     /// memory for graphics bitmap context for querying metrics
     boost::shared_array< sal_uInt8 >        maContextMemory;
-
+    
     // since changes to NSPrintInfo during a job are ignored
     // we have to care for some settings ourselves
     // currently we do this for orientation;
     // really needed however is a solution for paper formats
     Orientation               mePageOrientation;
-
+    
     int                       mnStartPageOffsetX;
     int                       mnStartPageOffsetY;
     sal_Int32                 mnCurPageRangeStart;
     sal_Int32                 mnCurPageRangeCount;
-
+    
     public:
     AquaSalInfoPrinter( const SalPrinterQueueInfo& pInfo );
     virtual ~AquaSalInfoPrinter();
-
+    
     void                        SetupPrinterGraphics( CGContextRef i_xContext ) const;
-
-    virtual SalGraphics*        GetGraphics();
-    virtual void                ReleaseGraphics( SalGraphics* i_pGraphics );
-    virtual BOOL                Setup( SalFrame* i_pFrame, ImplJobSetup* i_pSetupData );
-    virtual BOOL                SetPrinterData( ImplJobSetup* pSetupData );
-    virtual BOOL                SetData( ULONG i_nFlags, ImplJobSetup* i_pSetupData );
-    virtual void                GetPageInfo( const ImplJobSetup* i_pSetupData,
+    
+    virtual SalGraphics*		GetGraphics();
+    virtual void				ReleaseGraphics( SalGraphics* i_pGraphics );
+    virtual BOOL				Setup( SalFrame* i_pFrame, ImplJobSetup* i_pSetupData );
+    virtual BOOL				SetPrinterData( ImplJobSetup* pSetupData );
+    virtual BOOL				SetData( ULONG i_nFlags, ImplJobSetup* i_pSetupData );
+    virtual void				GetPageInfo( const ImplJobSetup* i_pSetupData,
                                              long& o_rOutWidth, long& o_rOutHeight,
                                              long& o_rPageOffX, long& o_rPageOffY,
                                              long& o_rPageWidth, long& o_rPageHeight );
-    virtual ULONG               GetCapabilities( const ImplJobSetup* i_pSetupData, USHORT i_nType );
-    virtual ULONG               GetPaperBinCount( const ImplJobSetup* i_pSetupData );
-    virtual String              GetPaperBinName( const ImplJobSetup* i_pSetupData, ULONG i_nPaperBin );
-    virtual void                InitPaperFormats( const ImplJobSetup* i_pSetupData );
-    virtual int                 GetLandscapeAngle( const ImplJobSetup* i_pSetupData );
-
+    virtual ULONG				GetCapabilities( const ImplJobSetup* i_pSetupData, USHORT i_nType );
+    virtual ULONG				GetPaperBinCount( const ImplJobSetup* i_pSetupData );
+    virtual String				GetPaperBinName( const ImplJobSetup* i_pSetupData, ULONG i_nPaperBin );
+    virtual void				InitPaperFormats( const ImplJobSetup* i_pSetupData );
+    virtual int					GetLandscapeAngle( const ImplJobSetup* i_pSetupData );
+    
     // the artificial separation between InfoPrinter and Printer
     // is not really useful for us
     // so let's make AquaSalPrinter just a forwarder to AquaSalInfoPrinter
@@ -104,21 +104,21 @@ class AquaSalInfoPrinter : public SalInfoPrinter
                                           const String& i_rAppName,
                                           ImplJobSetup* i_pSetupData,
                                           vcl::PrinterController& i_rController );
-    BOOL                        EndJob();
-    BOOL                        AbortJob();
-    SalGraphics*                StartPage( ImplJobSetup* i_pSetupData, BOOL i_bNewJobData );
-    BOOL                        EndPage();
-    ULONG                       GetErrorCode() const;
-
+    BOOL					    EndJob();
+    BOOL    					AbortJob();
+    SalGraphics*    			StartPage( ImplJobSetup* i_pSetupData, BOOL i_bNewJobData );
+    BOOL    					EndPage();
+    ULONG	    				GetErrorCode() const;
+    
     NSPrintInfo* getPrintInfo() const { return mpPrintInfo; }
     void setStartPageOffset( int nOffsetX, int nOffsetY ) { mnStartPageOffsetX = nOffsetX; mnStartPageOffsetY = nOffsetY; }
     sal_Int32 getCurPageRangeStart() const { return mnCurPageRangeStart; }
     sal_Int32 getCurPageRangeCount() const { return mnCurPageRangeCount; }
-
+    
     // match width/height against known paper formats, possibly switching orientation
     const PaperInfo* matchPaper( long i_nWidth, long i_nHeight, Orientation& o_rOrientation ) const;
     void setPaperSize( long i_nWidth, long i_nHeight, Orientation i_eSetOrientation );
-
+    
     private:
     AquaSalInfoPrinter( const AquaSalInfoPrinter& );
     AquaSalInfoPrinter& operator=(const AquaSalInfoPrinter&);
@@ -130,12 +130,12 @@ class AquaSalInfoPrinter : public SalInfoPrinter
 
 class AquaSalPrinter : public SalPrinter
 {
-    AquaSalInfoPrinter*         mpInfoPrinter;          // pointer to the compatible InfoPrinter
+    AquaSalInfoPrinter* 		mpInfoPrinter;			// pointer to the compatible InfoPrinter
     public:
     AquaSalPrinter( AquaSalInfoPrinter* i_pInfoPrinter );
     virtual ~AquaSalPrinter();
-
-    virtual BOOL                    StartJob( const XubString* i_pFileName,
+    
+    virtual BOOL					StartJob( const XubString* i_pFileName,
                                               const XubString& i_rJobName,
                                               const XubString& i_rAppName,
                                               ULONG i_nCopies,
@@ -148,13 +148,13 @@ class AquaSalPrinter : public SalPrinter
                                               const String& i_rAppName,
                                               ImplJobSetup* i_pSetupData,
                                               vcl::PrinterController& i_rListener );
-
-    virtual BOOL                    EndJob();
-    virtual BOOL                    AbortJob();
-    virtual SalGraphics*            StartPage( ImplJobSetup* i_pSetupData, BOOL i_bNewJobData );
-    virtual BOOL                    EndPage();
-    virtual ULONG                   GetErrorCode();
-
+    
+    virtual BOOL					EndJob();
+    virtual BOOL					AbortJob();
+    virtual SalGraphics*			StartPage( ImplJobSetup* i_pSetupData, BOOL i_bNewJobData );
+    virtual BOOL					EndPage();
+    virtual ULONG					GetErrorCode();
+    
     private:
     AquaSalPrinter( const AquaSalPrinter& );
     AquaSalPrinter& operator=(const AquaSalPrinter&);
diff --git a/vcl/aqua/inc/salsys.h b/vcl/aqua/inc/salsys.h
index 6f5c45880e68..de0d9aba2979 100644
--- a/vcl/aqua/inc/salsys.h
+++ b/vcl/aqua/inc/salsys.h
@@ -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
diff --git a/vcl/aqua/inc/saltimer.h b/vcl/aqua/inc/saltimer.h
index 374b9c5a45c5..c175c2d359d1 100644
--- a/vcl/aqua/inc/saltimer.h
+++ b/vcl/aqua/inc/saltimer.h
@@ -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
@@ -43,7 +43,7 @@ class AquaSalTimer : public SalTimer
 
     void Start( ULONG nMS );
     void Stop();
-
+    
     static void handleStartTimerEvent( NSEvent* pEvent );
 
 
diff --git a/vcl/aqua/inc/salvd.h b/vcl/aqua/inc/salvd.h
index 865cb7b5b766..b09e8412e488 100644
--- a/vcl/aqua/inc/salvd.h
+++ b/vcl/aqua/inc/salvd.h
@@ -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
@@ -82,9 +82,9 @@ private:
 public:
     AquaSalVirtualDevice( AquaSalGraphics* pGraphic, long nDX, long nDY, USHORT nBitCount, const SystemGraphicsData *pData );
     virtual ~AquaSalVirtualDevice();
-
-    virtual SalGraphics*            GetGraphics();
-    virtual void                    ReleaseGraphics( SalGraphics* pGraphics );
+    
+    virtual SalGraphics*			GetGraphics();
+    virtual void					ReleaseGraphics( SalGraphics* pGraphics );
     virtual BOOL                    SetSize( long nNewDX, long nNewDY );
     virtual void                       GetSize( long& rWidth, long& rHeight );
 };
diff --git a/vcl/aqua/inc/svsys.h b/vcl/aqua/inc/svsys.h
index 1edce25cea28..fbc63c3f744f 100644
--- a/vcl/aqua/inc/svsys.h
+++ b/vcl/aqua/inc/svsys.h
@@ -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
diff --git a/vcl/aqua/inc/vclnsapp.h b/vcl/aqua/inc/vclnsapp.h
index 59b070b421ea..5545ff20d33d 100755
--- a/vcl/aqua/inc/vclnsapp.h
+++ b/vcl/aqua/inc/vclnsapp.h
@@ -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
diff --git a/vcl/aqua/source/a11y/aqua11yactionwrapper.h b/vcl/aqua/source/a11y/aqua11yactionwrapper.h
index 3a7f13f8a545..b3dca45db868 100644
--- a/vcl/aqua/source/a11y/aqua11yactionwrapper.h
+++ b/vcl/aqua/source/a11y/aqua11yactionwrapper.h
@@ -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
diff --git a/vcl/aqua/source/a11y/aqua11ycomponentwrapper.h b/vcl/aqua/source/a11y/aqua11ycomponentwrapper.h
index c1806054e253..29ed17b65bf3 100644
--- a/vcl/aqua/source/a11y/aqua11ycomponentwrapper.h
+++ b/vcl/aqua/source/a11y/aqua11ycomponentwrapper.h
@@ -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
diff --git a/vcl/aqua/source/a11y/aqua11yfocuslistener.cxx b/vcl/aqua/source/a11y/aqua11yfocuslistener.cxx
index 9ac9401abd62..7d7f3f273972 100644
--- a/vcl/aqua/source/a11y/aqua11yfocuslistener.cxx
+++ b/vcl/aqua/source/a11y/aqua11yfocuslistener.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
@@ -46,7 +46,7 @@ rtl::Reference< AquaA11yFocusListener > AquaA11yFocusListener::get()
 {
     if ( ! theListener.is() )
         theListener = new AquaA11yFocusListener();
-
+    
     return theListener;
 }
 
@@ -72,20 +72,20 @@ id AquaA11yFocusListener::getFocusedUIElement()
             // intentionally do nothing ..
         }
     }
-
+    
     return m_focusedObject;
 }
 
 //------------------------------------------------------------------------------
 
-void SAL_CALL
+void SAL_CALL 
 AquaA11yFocusListener::focusedObjectChanged(const Reference< XAccessible >& xAccessible)
 {
     if ( nil != m_focusedObject ) {
         [ m_focusedObject release ];
         m_focusedObject = nil;
     }
-
+    
     try {
         if( xAccessible.is() ) {
             Reference< XAccessibleContext > xContext(xAccessible->getAccessibleContext());
@@ -102,17 +102,17 @@ AquaA11yFocusListener::focusedObjectChanged(const Reference< XAccessible >& xAcc
 
 //------------------------------------------------------------------------------
 
-oslInterlockedCount SAL_CALL
+oslInterlockedCount SAL_CALL 
 AquaA11yFocusListener::acquire() SAL_THROW(())
-{
-    return ReferenceObject::acquire();
+{ 
+    return ReferenceObject::acquire(); 
 }
 
 //------------------------------------------------------------------------------
 
-oslInterlockedCount SAL_CALL
+oslInterlockedCount SAL_CALL 
 AquaA11yFocusListener::release() SAL_THROW(())
-{
-    return ReferenceObject::release();
+{ 
+    return ReferenceObject::release(); 
 }
 
diff --git a/vcl/aqua/source/a11y/aqua11yfocuslistener.hxx b/vcl/aqua/source/a11y/aqua11yfocuslistener.hxx
index 1fdd340c698e..aae6fb37b0cc 100644
--- a/vcl/aqua/source/a11y/aqua11yfocuslistener.hxx
+++ b/vcl/aqua/source/a11y/aqua11yfocuslistener.hxx
@@ -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
@@ -35,12 +35,12 @@
 
 // #include <com/sun/star/accessibility/XAccessibleContext.hpp>
 
-class AquaA11yFocusListener :
+class AquaA11yFocusListener : 
     public KeyboardFocusListener,
     public salhelper::ReferenceObject
 {
     id m_focusedObject;
-
+    
     static rtl::Reference< AquaA11yFocusListener > theListener;
 
     AquaA11yFocusListener::AquaA11yFocusListener();
@@ -48,15 +48,15 @@ class AquaA11yFocusListener :
 public:
 
     static rtl::Reference< AquaA11yFocusListener > get();
-
+    
     id getFocusedUIElement();
 
     // KeyboardFocusListener
     virtual void SAL_CALL focusedObjectChanged(const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >& xAccessible);
-
+    
     // rtl::IReference
     virtual oslInterlockedCount SAL_CALL acquire() SAL_THROW(());
-    virtual oslInterlockedCount SAL_CALL release() SAL_THROW(());
+    virtual oslInterlockedCount SAL_CALL release() SAL_THROW(());	
 };
 
 #endif // _AQUA11YFOCUSLISTENER_HXX_
 \ No newline at end of file
diff --git a/vcl/aqua/source/a11y/aqua11yfocustracker.cxx b/vcl/aqua/source/a11y/aqua11yfocustracker.cxx
index 2a8ebb39bd80..da623f8612c7 100644
--- a/vcl/aqua/source/a11y/aqua11yfocustracker.cxx
+++ b/vcl/aqua/source/a11y/aqua11yfocustracker.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
@@ -47,7 +47,7 @@ using namespace ::com::sun::star::uno;
 
 //------------------------------------------------------------------------------
 
-static inline Window *
+static inline Window * 
 getWindow(const ::VclSimpleEvent *pEvent)
 {
     return static_cast< const ::VclWindowEvent *> (pEvent)->GetWindow();
@@ -86,13 +86,13 @@ long AquaA11yFocusTracker::WindowEventHandler(AquaA11yFocusTracker *pFocusTracke
     default:
         break;
     };
-
+    
     return 0;
 }
 
 //------------------------------------------------------------------------------
 
-AquaA11yFocusTracker::AquaA11yFocusTracker() :
+AquaA11yFocusTracker::AquaA11yFocusTracker() : 
     m_aWindowEventLink(this, (PSTUB) WindowEventHandler),
     m_xDocumentFocusListener(new DocumentFocusListener(*this))
 {
@@ -105,9 +105,9 @@ AquaA11yFocusTracker::AquaA11yFocusTracker() :
 void AquaA11yFocusTracker::setFocusedObject(const Reference< XAccessible >& xAccessible)
 {
     if( xAccessible != m_xFocusedObject )
-    {
+    { 
         m_xFocusedObject = xAccessible;
-
+    
         if( m_aFocusListener.is() )
             m_aFocusListener->focusedObjectChanged(xAccessible);
     }
@@ -118,7 +118,7 @@ void AquaA11yFocusTracker::setFocusedObject(const Reference< XAccessible >& xAcc
 void AquaA11yFocusTracker::notify_toolbox_item_focus(ToolBox *pToolBox)
 {
     Reference< XAccessible > xAccessible( pToolBox->GetAccessible() );
-
+    
     if( xAccessible.is() )
     {
         Reference< XAccessibleContext > xContext(xAccessible->getAccessibleContext());
@@ -178,7 +178,7 @@ void AquaA11yFocusTracker::toolbox_highlight_on(Window *pWindow)
         if ( ! pToolBoxParent || ! pToolBoxParent->HasFocus() )
             return;
     }
-
+    
     notify_toolbox_item_focus(static_cast <ToolBox *> (pWindow));
 }
 
@@ -187,7 +187,7 @@ void AquaA11yFocusTracker::toolbox_highlight_on(Window *pWindow)
 void AquaA11yFocusTracker::toolbox_highlight_off(Window *pWindow)
 {
     ToolBox* pToolBoxParent = dynamic_cast< ToolBox * >( pWindow->GetParent() );
-
+    
     // Notify when leaving sub toolboxes
     if( pToolBoxParent && pToolBoxParent->HasFocus() )
         notify_toolbox_item_focus( pToolBoxParent );
@@ -198,14 +198,14 @@ void AquaA11yFocusTracker::toolbox_highlight_off(Window *pWindow)
 void AquaA11yFocusTracker::tabpage_activated(Window *pWindow)
 {
     Reference< XAccessible > xAccessible( pWindow->GetAccessible() );
-
+    
     if( xAccessible.is() )
     {
         Reference< XAccessibleSelection > xSelection(xAccessible->getAccessibleContext(), UNO_QUERY);
-
+        
         if( xSelection.is() )
             setFocusedObject( xSelection->getSelectedAccessibleChild(0) );
-    }
+    }    
 }
 
 //------------------------------------------------------------------------------
@@ -213,7 +213,7 @@ void AquaA11yFocusTracker::tabpage_activated(Window *pWindow)
 void AquaA11yFocusTracker::menu_highlighted(const VclMenuEvent *pEvent)
 {
     Menu * pMenu = pEvent->GetMenu();
-
+    
     if( pMenu )
     {
         Reference< XAccessible > xAccessible( pMenu->GetAccessible() );
@@ -230,34 +230,34 @@ void AquaA11yFocusTracker::window_got_focus(Window *pWindow)
     // The menu bar is handled through VCLEVENT_MENU_HIGHLIGHTED
     if( ! pWindow || !pWindow->IsReallyVisible() || pWindow->GetType() == WINDOW_MENUBARWINDOW )
         return;
-
+    
     // ToolBoxes are handled through VCLEVENT_TOOLBOX_HIGHLIGHT
     if( pWindow->GetType() == WINDOW_TOOLBOX )
         return;
-
+    
     if( pWindow->GetType() == WINDOW_TABCONTROL )
     {
         tabpage_activated( pWindow );
         return;
     }
-
+    
     Reference< XAccessible > xAccessible(pWindow->GetAccessible());
-
+    
     if( ! xAccessible.is() )
         return;
-
+    
     Reference< XAccessibleContext > xContext = xAccessible->getAccessibleContext();
-
+        
     if( ! xContext.is() )
         return;
-
+    
     Reference< XAccessibleStateSet > xStateSet = xContext->getAccessibleStateSet();
-
+        
     if( ! xStateSet.is() )
         return;
-
+    
 /* the UNO ToolBox wrapper does not (yet?) support XAccessibleSelection, so we
- * need to add listeners to the children instead of re-using the tabpage stuff
+ * need to add listeners to the children instead of re-using the tabpage stuff 
  */
     if( xStateSet->contains(AccessibleStateType::FOCUSED) && (pWindow->GetType() != WINDOW_TREELISTBOX) )
     {
diff --git a/vcl/aqua/source/a11y/aqua11ylistener.cxx b/vcl/aqua/source/a11y/aqua11ylistener.cxx
index 7f680f43b3a6..4eac807f3b0e 100644
--- a/vcl/aqua/source/a11y/aqua11ylistener.cxx
+++ b/vcl/aqua/source/a11y/aqua11ylistener.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
@@ -24,7 +24,7 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-
+ 
 #include "aqua11ylistener.hxx"
 #include "aqua11yfactory.h"
 #include "aqua11yfocustracker.hxx"
@@ -46,16 +46,16 @@ NSString * getTableNotification( const AccessibleEventObject& aEvent )
 {
     AccessibleTableModelChange aChange;
     NSString * notification = nil;
-
+    
     if( (aEvent.NewValue >>= aChange) &&
         ( AccessibleTableModelChangeType::INSERT == aChange.Type || AccessibleTableModelChangeType::DELETE == aChange.Type ) &&
         aChange.FirstRow != aChange.LastRow )
     {
         notification = NSAccessibilityRowCountChangedNotification;
     }
-
+    
     return notification;
-}
+}        
 
 //------------------------------------------------------------------------------
 
@@ -66,14 +66,14 @@ AquaA11yEventListener::AquaA11yEventListener(id wrapperObject, sal_Int16 role) :
 
 //------------------------------------------------------------------------------
 
-AquaA11yEventListener::~AquaA11yEventListener()
+AquaA11yEventListener::~AquaA11yEventListener() 
 {
     [ m_wrapperObject release ];
 }
 
 //------------------------------------------------------------------------------
 
-void SAL_CALL
+void SAL_CALL 
 AquaA11yEventListener::disposing( const EventObject& Source ) throw( RuntimeException )
 {
     [ AquaA11yFactory removeFromWrapperRepositoryFor: [ (AquaA11yWrapper *) m_wrapperObject accessibleContext ] ];
@@ -81,13 +81,13 @@ AquaA11yEventListener::disposing( const EventObject& Source ) throw( RuntimeExce
 
 //------------------------------------------------------------------------------
 
-void SAL_CALL
+void SAL_CALL 
 AquaA11yEventListener::notifyEvent( const AccessibleEventObject& aEvent ) throw( RuntimeException )
 {
     NSString * notification = nil;
     id element = m_wrapperObject;
     Rectangle bounds;
-
+    
     // TODO: NSAccessibilityValueChanged, NSAccessibilitySelectedRowsChangedNotification
     switch( aEvent.EventId )
     {
@@ -98,11 +98,11 @@ AquaA11yEventListener::notifyEvent( const AccessibleEventObject& aEvent ) throw(
                     AquaA11yFocusTracker::get().setFocusedObject( xAccessible );
             }
             break;
-
+            
         case AccessibleEventId::NAME_CHANGED:
             notification = NSAccessibilityTitleChangedNotification;
             break;
-
+            
         case AccessibleEventId::CHILD:
             // only needed for tooltips (says Apple)
             if ( m_role == AccessibleRole::TOOL_TIP ) {
@@ -113,11 +113,11 @@ AquaA11yEventListener::notifyEvent( const AccessibleEventObject& aEvent ) throw(
                 }
             }
             break;
-
+            
         case AccessibleEventId::INVALIDATE_ALL_CHILDREN:
-            // TODO: depricate or remember all children
+            // TODO: depricate or remember all children 
             break;
-
+             
         case AccessibleEventId::BOUNDRECT_CHANGED:
             bounds = [ element accessibleComponent ] -> getBounds();
             if ( m_oldBounds.X != 0 && ( bounds.X != m_oldBounds.X || bounds.Y != m_oldBounds.Y ) ) {
@@ -128,23 +128,23 @@ AquaA11yEventListener::notifyEvent( const AccessibleEventObject& aEvent ) throw(
             }
             m_oldBounds = bounds;
             break;
-
+                
         case AccessibleEventId::SELECTION_CHANGED:
             notification = NSAccessibilitySelectedChildrenChangedNotification;
             break;
-
+            
         case AccessibleEventId::TEXT_SELECTION_CHANGED:
             notification = NSAccessibilitySelectedTextChangedNotification;
             break;
-
+ 
         case AccessibleEventId::TABLE_MODEL_CHANGED:
             notification = getTableNotification(aEvent);
             break;
-
+        
         case AccessibleEventId::CARET_CHANGED:
             notification = NSAccessibilitySelectedTextChangedNotification;
             break;
-
+        
         case AccessibleEventId::TEXT_CHANGED:
             notification = NSAccessibilityValueChangedNotification;
             break;
@@ -152,7 +152,7 @@ AquaA11yEventListener::notifyEvent( const AccessibleEventObject& aEvent ) throw(
         default:
             break;
     }
-
+    
     if( nil != notification )
         NSAccessibilityPostNotification(element, notification);
 }
diff --git a/vcl/aqua/source/a11y/aqua11yrolehelper.h b/vcl/aqua/source/a11y/aqua11yrolehelper.h
index f847eb3f41c3..e81b8b197bb3 100644
--- a/vcl/aqua/source/a11y/aqua11yrolehelper.h
+++ b/vcl/aqua/source/a11y/aqua11yrolehelper.h
@@ -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
diff --git a/vcl/aqua/source/a11y/aqua11yselectionwrapper.h b/vcl/aqua/source/a11y/aqua11yselectionwrapper.h
index a88e6c71c04b..d57b00179767 100644
--- a/vcl/aqua/source/a11y/aqua11yselectionwrapper.h
+++ b/vcl/aqua/source/a11y/aqua11yselectionwrapper.h
@@ -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
diff --git a/vcl/aqua/source/a11y/aqua11ytablewrapper.h b/vcl/aqua/source/a11y/aqua11ytablewrapper.h
index 7bf3e44a2945..c2d5b32e21ed 100644
--- a/vcl/aqua/source/a11y/aqua11ytablewrapper.h
+++ b/vcl/aqua/source/a11y/aqua11ytablewrapper.h
@@ -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
diff --git a/vcl/aqua/source/a11y/aqua11ytextattributeswrapper.h b/vcl/aqua/source/a11y/aqua11ytextattributeswrapper.h
index fcf185ca5478..048231762d41 100644
--- a/vcl/aqua/source/a11y/aqua11ytextattributeswrapper.h
+++ b/vcl/aqua/source/a11y/aqua11ytextattributeswrapper.h
@@ -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
diff --git a/vcl/aqua/source/a11y/aqua11ytextwrapper.h b/vcl/aqua/source/a11y/aqua11ytextwrapper.h
index dfdab349bafe..44f331ee6f28 100644
--- a/vcl/aqua/source/a11y/aqua11ytextwrapper.h
+++ b/vcl/aqua/source/a11y/aqua11ytextwrapper.h
@@ -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
diff --git a/vcl/aqua/source/a11y/aqua11yutil.h b/vcl/aqua/source/a11y/aqua11yutil.h
index adf565f4d9bb..7f72497ada68 100644
--- a/vcl/aqua/source/a11y/aqua11yutil.h
+++ b/vcl/aqua/source/a11y/aqua11yutil.h
@@ -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
diff --git a/vcl/aqua/source/a11y/aqua11yvaluewrapper.h b/vcl/aqua/source/a11y/aqua11yvaluewrapper.h
index d3afebf7f828..6f6733f1ad0f 100644
--- a/vcl/aqua/source/a11y/aqua11yvaluewrapper.h
+++ b/vcl/aqua/source/a11y/aqua11yvaluewrapper.h
@@ -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
diff --git a/vcl/aqua/source/a11y/aqua11ywrapperbutton.h b/vcl/aqua/source/a11y/aqua11ywrapperbutton.h
index aa35062d15c4..ea8a89dc7882 100644
--- a/vcl/aqua/source/a11y/aqua11ywrapperbutton.h
+++ b/vcl/aqua/source/a11y/aqua11ywrapperbutton.h
@@ -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
diff --git a/vcl/aqua/source/a11y/aqua11ywrappercheckbox.h b/vcl/aqua/source/a11y/aqua11ywrappercheckbox.h
index 95fee9a3ec4b..821d741f47d1 100644
--- a/vcl/aqua/source/a11y/aqua11ywrappercheckbox.h
+++ b/vcl/aqua/source/a11y/aqua11ywrappercheckbox.h
@@ -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
diff --git a/vcl/aqua/source/a11y/aqua11ywrappercombobox.h b/vcl/aqua/source/a11y/aqua11ywrappercombobox.h
index 7ed76d607176..c1c3e715cab4 100644
--- a/vcl/aqua/source/a11y/aqua11ywrappercombobox.h
+++ b/vcl/aqua/source/a11y/aqua11ywrappercombobox.h
@@ -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
diff --git a/vcl/aqua/source/a11y/aqua11ywrappergroup.h b/vcl/aqua/source/a11y/aqua11ywrappergroup.h
index 7757e067ee22..0736825a93b4 100644
--- a/vcl/aqua/source/a11y/aqua11ywrappergroup.h
+++ b/vcl/aqua/source/a11y/aqua11ywrappergroup.h
@@ -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
diff --git a/vcl/aqua/source/a11y/aqua11ywrapperlist.h b/vcl/aqua/source/a11y/aqua11ywrapperlist.h
index 95df8323467b..ba162effbdc7 100644
--- a/vcl/aqua/source/a11y/aqua11ywrapperlist.h
+++ b/vcl/aqua/source/a11y/aqua11ywrapperlist.h
@@ -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
diff --git a/vcl/aqua/source/a11y/aqua11ywrapperradiobutton.h b/vcl/aqua/source/a11y/aqua11ywrapperradiobutton.h
index 13ceee6f826f..fcab796c294b 100644
--- a/vcl/aqua/source/a11y/aqua11ywrapperradiobutton.h
+++ b/vcl/aqua/source/a11y/aqua11ywrapperradiobutton.h
@@ -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
diff --git a/vcl/aqua/source/a11y/aqua11ywrapperradiogroup.h b/vcl/aqua/source/a11y/aqua11ywrapperradiogroup.h
index 544b709223b3..f4c2fbdc758b 100644
--- a/vcl/aqua/source/a11y/aqua11ywrapperradiogroup.h
+++ b/vcl/aqua/source/a11y/aqua11ywrapperradiogroup.h
@@ -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
diff --git a/vcl/aqua/source/a11y/aqua11ywrapperrow.h b/vcl/aqua/source/a11y/aqua11ywrapperrow.h
index 252af6f5987f..4aff5d836c70 100644
--- a/vcl/aqua/source/a11y/aqua11ywrapperrow.h
+++ b/vcl/aqua/source/a11y/aqua11ywrapperrow.h
@@ -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
diff --git a/vcl/aqua/source/a11y/aqua11ywrapperscrollarea.h b/vcl/aqua/source/a11y/aqua11ywrapperscrollarea.h
index 2c206fd0904b..8b3c03f6024c 100644
--- a/vcl/aqua/source/a11y/aqua11ywrapperscrollarea.h
+++ b/vcl/aqua/source/a11y/aqua11ywrapperscrollarea.h
@@ -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
diff --git a/vcl/aqua/source/a11y/aqua11ywrapperscrollbar.h b/vcl/aqua/source/a11y/aqua11ywrapperscrollbar.h
index 1070c682cd5e..3921b5c31213 100644
--- a/vcl/aqua/source/a11y/aqua11ywrapperscrollbar.h
+++ b/vcl/aqua/source/a11y/aqua11ywrapperscrollbar.h
@@ -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
diff --git a/vcl/aqua/source/a11y/aqua11ywrappersplitter.h b/vcl/aqua/source/a11y/aqua11ywrappersplitter.h
index 084a72ea7a18..ca67c3975188 100644
--- a/vcl/aqua/source/a11y/aqua11ywrappersplitter.h
+++ b/vcl/aqua/source/a11y/aqua11ywrappersplitter.h
@@ -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
diff --git a/vcl/aqua/source/a11y/aqua11ywrapperstatictext.h b/vcl/aqua/source/a11y/aqua11ywrapperstatictext.h
index c21e5573d125..d049fd7b8fd1 100644
--- a/vcl/aqua/source/a11y/aqua11ywrapperstatictext.h
+++ b/vcl/aqua/source/a11y/aqua11ywrapperstatictext.h
@@ -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
diff --git a/vcl/aqua/source/a11y/aqua11ywrappertabgroup.h b/vcl/aqua/source/a11y/aqua11ywrappertabgroup.h
index be72b9e27396..778047e24e69 100644
--- a/vcl/aqua/source/a11y/aqua11ywrappertabgroup.h
+++ b/vcl/aqua/source/a11y/aqua11ywrappertabgroup.h
@@ -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
diff --git a/vcl/aqua/source/a11y/aqua11ywrappertextarea.h b/vcl/aqua/source/a11y/aqua11ywrappertextarea.h
index 724f85994053..d72aaa639189 100644
--- a/vcl/aqua/source/a11y/aqua11ywrappertextarea.h
+++ b/vcl/aqua/source/a11y/aqua11ywrappertextarea.h
@@ -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
diff --git a/vcl/aqua/source/a11y/aqua11ywrappertoolbar.h b/vcl/aqua/source/a11y/aqua11ywrappertoolbar.h
index e7ac0a25acec..d27d733bc63c 100644
--- a/vcl/aqua/source/a11y/aqua11ywrappertoolbar.h
+++ b/vcl/aqua/source/a11y/aqua11ywrappertoolbar.h
@@ -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
diff --git a/vcl/aqua/source/a11y/documentfocuslistener.cxx b/vcl/aqua/source/a11y/documentfocuslistener.cxx
index 02a7337ce397..95f76dca5e88 100644
--- a/vcl/aqua/source/a11y/documentfocuslistener.cxx
+++ b/vcl/aqua/source/a11y/documentfocuslistener.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
@@ -24,7 +24,7 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-
+ 
 #include "documentfocuslistener.hxx"
 
 #ifndef _COM_SUN_STAR_ACCESSIBILITY_XACCESSIBLEEVENTBROADCASTER_HPP_
@@ -38,16 +38,16 @@
 #ifndef _COM_SUN_STAR_ACCESSIBILITY_ACCESSIBLESTATETYPE_HPP_
 #include <com/sun/star/accessibility/AccessibleStateType.hpp>
 #endif
-
+ 
 using namespace ::com::sun::star::accessibility;
 using namespace ::com::sun::star::lang;
 using namespace ::com::sun::star::uno;
-
+ 
 
 //------------------------------------------------------------------------------
 
 DocumentFocusListener::DocumentFocusListener(AquaA11yFocusTracker& rTracker) :
-    m_aFocusTracker(rTracker)
+    m_aFocusTracker(rTracker)    
 {
 }
 
@@ -57,7 +57,7 @@ void SAL_CALL
 DocumentFocusListener::disposing( const EventObject& aEvent )
     throw (RuntimeException)
 {
-    // Unref the object here, but do not remove as listener since the object
+    // Unref the object here, but do not remove as listener since the object 
     // might no longer be in a state that safely allows this.
     if( aEvent.Source.is() )
         m_aRefList.erase(aEvent.Source);
@@ -65,18 +65,18 @@ DocumentFocusListener::disposing( const EventObject& aEvent )
 
 //------------------------------------------------------------------------------
 
-void SAL_CALL
-DocumentFocusListener::notifyEvent( const AccessibleEventObject& aEvent )
+void SAL_CALL 
+DocumentFocusListener::notifyEvent( const AccessibleEventObject& aEvent ) 
     throw( RuntimeException )
 {
     switch( aEvent.EventId )
     {
         case AccessibleEventId::STATE_CHANGED:
-            try
+            try 
             {
                 sal_Int16 nState = AccessibleStateType::INVALID;
                 aEvent.NewValue >>= nState;
-
+            
                 if( AccessibleStateType::FOCUSED == nState )
                     m_aFocusTracker.setFocusedObject( getAccessible(aEvent) );
             }
@@ -85,18 +85,18 @@ DocumentFocusListener::notifyEvent( const AccessibleEventObject& aEvent )
                 OSL_TRACE("Focused object has invalid index in parent");
             }
             break;
-
+            
         case AccessibleEventId::CHILD:
         {
             Reference< XAccessible > xChild;
             if( (aEvent.OldValue >>= xChild) && xChild.is() )
                 detachRecursive(xChild);
-
+            
             if( (aEvent.NewValue >>= xChild) && xChild.is() )
                 attachRecursive(xChild);
         }
             break;
-
+            
         case AccessibleEventId::INVALIDATE_ALL_CHILDREN:
         {
             Reference< XAccessible > xAccessible( getAccessible(aEvent) );
@@ -117,10 +117,10 @@ Reference< XAccessible > DocumentFocusListener::getAccessible(const EventObject&
     throw (IndexOutOfBoundsException, RuntimeException)
 {
     Reference< XAccessible > xAccessible(aEvent.Source, UNO_QUERY);
-
+    
     if( xAccessible.is() )
         return xAccessible;
-
+    
     Reference< XAccessibleContext > xContext(aEvent.Source, UNO_QUERY);
 
     if( xContext.is() )
@@ -135,13 +135,13 @@ Reference< XAccessible > DocumentFocusListener::getAccessible(const EventObject&
             }
         }
     }
-
+    
     return Reference< XAccessible >();
 }
 
 //------------------------------------------------------------------------------
 
-void DocumentFocusListener::attachRecursive(const Reference< XAccessible >& xAccessible)
+void DocumentFocusListener::attachRecursive(const Reference< XAccessible >& xAccessible) 
     throw (IndexOutOfBoundsException, RuntimeException)
 {
     Reference< XAccessibleContext > xContext = xAccessible->getAccessibleContext();
@@ -153,8 +153,8 @@ void DocumentFocusListener::attachRecursive(const Reference< XAccessible >& xAcc
 //------------------------------------------------------------------------------
 
 void DocumentFocusListener::attachRecursive(
-    const Reference< XAccessible >& xAccessible,
-    const Reference< XAccessibleContext >& xContext
+    const Reference< XAccessible >& xAccessible, 
+    const Reference< XAccessibleContext >& xContext 
 )  throw (IndexOutOfBoundsException, RuntimeException)
 {
     if( xContext.is() )
@@ -169,13 +169,13 @@ void DocumentFocusListener::attachRecursive(
 //------------------------------------------------------------------------------
 
 void DocumentFocusListener::attachRecursive(
-    const Reference< XAccessible >& xAccessible,
+    const Reference< XAccessible >& xAccessible, 
     const Reference< XAccessibleContext >& xContext,
-    const Reference< XAccessibleStateSet >& xStateSet
+    const Reference< XAccessibleStateSet >& xStateSet 
 ) throw (IndexOutOfBoundsException,RuntimeException)
 {
     if( xStateSet->contains(AccessibleStateType::FOCUSED ) )
-        m_aFocusTracker.setFocusedObject( xAccessible );
+        m_aFocusTracker.setFocusedObject( xAccessible );       
 
     Reference< XAccessibleEventBroadcaster > xBroadcaster =
         Reference< XAccessibleEventBroadcaster >(xContext, UNO_QUERY);
@@ -191,7 +191,7 @@ void DocumentFocusListener::attachRecursive(
             for( n = 0; n < nmax; n++ )
             {
                 Reference< XAccessible > xChild( xContext->getAccessibleChild( n ) );
-
+            
                 if( xChild.is() )
                     attachRecursive(xChild);
             }
@@ -201,7 +201,7 @@ void DocumentFocusListener::attachRecursive(
 
 //------------------------------------------------------------------------------
 
-void DocumentFocusListener::detachRecursive(const Reference< XAccessible >& xAccessible)
+void DocumentFocusListener::detachRecursive(const Reference< XAccessible >& xAccessible) 
     throw (IndexOutOfBoundsException, RuntimeException)
 {
     Reference< XAccessibleContext > xContext = xAccessible->getAccessibleContext();
@@ -213,8 +213,8 @@ void DocumentFocusListener::detachRecursive(const Reference< XAccessible >& xAcc
 //------------------------------------------------------------------------------
 
 void DocumentFocusListener::detachRecursive(
-    const Reference< XAccessible >& xAccessible,
-    const Reference< XAccessibleContext >& xContext
+    const Reference< XAccessible >& xAccessible, 
+    const Reference< XAccessibleContext >& xContext 
 )  throw (IndexOutOfBoundsException, RuntimeException)
 {
     Reference< XAccessibleStateSet > xStateSet = xContext->getAccessibleStateSet();
@@ -226,9 +226,9 @@ void DocumentFocusListener::detachRecursive(
 //------------------------------------------------------------------------------
 
 void DocumentFocusListener::detachRecursive(
-    const Reference< XAccessible >&,
+    const Reference< XAccessible >&, 
     const Reference< XAccessibleContext >& xContext,
-    const Reference< XAccessibleStateSet >& xStateSet
+    const Reference< XAccessibleStateSet >& xStateSet 
 ) throw (IndexOutOfBoundsException, RuntimeException)
 {
     Reference< XAccessibleEventBroadcaster > xBroadcaster =
@@ -237,17 +237,17 @@ void DocumentFocusListener::detachRecursive(
     if( xBroadcaster.is() && 0 < m_aRefList.erase(xBroadcaster) )
     {
         xBroadcaster->removeEventListener(static_cast< XAccessibleEventListener *>(this));
-
+        
         if( ! xStateSet->contains(AccessibleStateType::MANAGES_DESCENDANTS ) )
         {
             sal_Int32 n, nmax = xContext->getAccessibleChildCount();
             for( n = 0; n < nmax; n++ )
             {
                 Reference< XAccessible > xChild( xContext->getAccessibleChild( n ) );
-
+            
                 if( xChild.is() )
                     detachRecursive(xChild);
             }
         }
-    }
+    }   
 }
diff --git a/vcl/aqua/source/a11y/documentfocuslistener.hxx b/vcl/aqua/source/a11y/documentfocuslistener.hxx
index 863bc59d173f..cf32314fcec0 100644
--- a/vcl/aqua/source/a11y/documentfocuslistener.hxx
+++ b/vcl/aqua/source/a11y/documentfocuslistener.hxx
@@ -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
@@ -43,7 +43,7 @@
 // - DocumentFocusListener -
 // -------------------------
 
-class DocumentFocusListener :
+class DocumentFocusListener :  
     public ::cppu::WeakImplHelper1< ::com::sun::star::accessibility::XAccessibleEventListener >
 {
 
@@ -85,16 +85,16 @@ public:
         throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException);
 
     // XEventListener
-    virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source )
+    virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) 
         throw (::com::sun::star::uno::RuntimeException);
 
     // XAccessibleEventListener
-    virtual void SAL_CALL notifyEvent( const ::com::sun::star::accessibility::AccessibleEventObject& aEvent )
+    virtual void SAL_CALL notifyEvent( const ::com::sun::star::accessibility::AccessibleEventObject& aEvent ) 
         throw( ::com::sun::star::uno::RuntimeException );
 
 private:
     std::set< ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > > m_aRefList;
-
+    
     AquaA11yFocusTracker& m_aFocusTracker;
 };
 
diff --git a/vcl/aqua/source/app/saldata.cxx b/vcl/aqua/source/app/saldata.cxx
index 3cb878636ad3..afaac2e17842 100644
--- a/vcl/aqua/source/app/saldata.cxx
+++ b/vcl/aqua/source/app/saldata.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
@@ -65,7 +65,7 @@ SalData::SalData()
     if( s_aAutoReleaseKey == 0 )
         s_aAutoReleaseKey = osl_createThreadKey( releasePool );
 }
-
+    
 SalData::~SalData()
 {
     CGPatternRelease( mxP50Pattern );
@@ -88,7 +88,7 @@ SalData::~SalData()
             osl_setThreadKeyData( s_aAutoReleaseKey, NULL );
             [pPool release];
         }
-
+        
         osl_destroyThreadKey( s_aAutoReleaseKey );
         s_aAutoReleaseKey = 0;
     }
@@ -246,11 +246,11 @@ NSCursor* SalData::getCursor( PointerStyle i_eStyle )
 {
     if( i_eStyle >= POINTER_COUNT )
         return nil;
-
+    
     NSCursor* pCurs = maCursors[ i_eStyle ];
     if( pCurs == INVALID_CURSOR_PTR )
     {
-        pCurs = nil;
+        pCurs = nil;        
         if( aCursorTab[ i_eStyle ].pBaseName )
         {
             NSPoint aHotSpot = aCursorTab[ i_eStyle ].aHotSpot;
diff --git a/vcl/aqua/source/app/salinst.cxx b/vcl/aqua/source/app/salinst.cxx
index b8a2261ed9db..fb2785a9fa59 100644
--- a/vcl/aqua/source/app/salinst.cxx
+++ b/vcl/aqua/source/app/salinst.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
@@ -87,13 +87,13 @@ class AquaDelayedSettingsChanged : public Timer
         mbInvalidate( bInvalidate )
     {
     }
-
+    
     virtual void Timeout()
     {
         SalData* pSalData = GetSalData();
         if( ! pSalData->maFrames.empty() )
             pSalData->maFrames.front()->CallCallback( SALEVENT_SETTINGSCHANGED, NULL );
-
+        
         if( mbInvalidate )
         {
             for( std::list< AquaSalFrame* >::iterator it = pSalData->maFrames.begin();
@@ -104,7 +104,7 @@ class AquaDelayedSettingsChanged : public Timer
             }
         }
         Stop();
-        delete this;
+        delete this;                                        
     }
 };
 
@@ -140,7 +140,7 @@ bool AquaSalInstance::isOnCommandLine( const rtl::OUString& rArg )
     }
     return false;
 }
-
+ 
 
 // initialize the cocoa VCL_NSApplication object
 // returns an NSAutoreleasePool that must be released when the event loop begins
@@ -148,7 +148,7 @@ static void initNSApp()
 {
     // create our cocoa NSApplication
     [VCL_NSApplication sharedApplication];
-
+    
     SalData::ensureThreadAutoreleasePool();
 
     // put cocoa into multithreaded mode
@@ -156,7 +156,7 @@ static void initNSApp()
 
     // activate our delegate methods
     [NSApp setDelegate: NSApp];
-
+    
     [[NSNotificationCenter defaultCenter] addObserver: NSApp
                                           selector: @selector(systemColorsChanged:)
                                           name: NSSystemColorsDidChangeNotification
@@ -180,7 +180,7 @@ static void initNSApp()
     // get System Version and store the value in GetSalData()->mnSystemVersion
     OSErr err = noErr;
     SInt32 systemVersion = VER_TIGER; // Initialize with minimal requirement
-    if( (err = Gestalt(gestaltSystemVersion, &systemVersion)) == noErr )
+    if( (err = Gestalt(gestaltSystemVersion, &systemVersion)) == noErr ) 
     {
         GetSalData()->mnSystemVersion = systemVersion;
 #if OSL_DEBUG_LEVEL > 1
@@ -197,7 +197,7 @@ static void initNSApp()
                                            selector: @selector(applicationWillBecomeActive:)
                                            name: @"AppleRemoteWillBecomeActive"
                                            object: nil ];
-
+                                         
     [[NSDistributedNotificationCenter defaultCenter] addObserver: NSApp
                                            selector: @selector(applicationWillResignActive:)
                                            name: @"AppleRemoteWillResignActive"
@@ -210,10 +210,10 @@ static void initNSApp()
 BOOL ImplSVMainHook( BOOL * pbInit )
 {
     gpbInit = pbInit;
-
+    
     bNoSVMain = false;
     initNSApp();
-
+    
     NSPoint aPt = { 0, 0 };
     NSEvent* pEvent = [NSEvent otherEventWithType: NSApplicationDefined
                                location: aPt
@@ -227,12 +227,12 @@ BOOL ImplSVMainHook( BOOL * pbInit )
     if( pEvent )
     {
         [NSApp postEvent: pEvent atStart: NO];
-
+        
         rtl::OUString aExeURL, aExe;
         osl_getExecutableFile( &aExeURL.pData );
         osl_getSystemPathFromFileURL( aExeURL.pData, &aExe.pData );
         rtl::OString aByteExe( rtl::OUStringToOString( aExe, osl_getThreadTextEncoding() ) );
-
+        
 #ifdef DEBUG
         aByteExe += OString ( " NSAccessibilityDebugLogLevel 1" );
         const char* pArgv[] = { aByteExe.getStr(), NULL };
@@ -364,7 +364,7 @@ void DeInitSalMain()
 
 SalYieldMutex::SalYieldMutex()
 {
-    mnCount  = 0;
+    mnCount	 = 0;
     mnThreadId  = 0;
 }
 
@@ -437,7 +437,7 @@ SalInstance* CreateSalInstance()
     SalData* pSalData = GetSalData();
     DBG_ASSERT( pSalData->mpFirstInstance == NULL, "more than one instance created" );
     AquaSalInstance* pInst = new AquaSalInstance;
-
+    
     // init instance (only one instance in this version !!!)
     pSalData->mpFirstInstance = pInst;
     // this one is for outside AquaSalInstance::Yield
@@ -452,7 +452,7 @@ SalInstance* CreateSalInstance()
     ImplGetSVData()->maGDIData.mbPrinterPullModel = true;
     ImplGetSVData()->maGDIData.mbNoXORClipping = true;
     ImplGetSVData()->maWinData.mbNoSaveBackground = true;
-
+    
     return pInst;
 }
 
@@ -518,7 +518,7 @@ void AquaSalInstance::PostUserEvent( AquaSalFrame* pFrame, USHORT nType, void* p
     osl_acquireMutex( maUserEventListMutex );
     maUserEvents.push_back( SalUserEvent( pFrame, pData, nType ) );
     osl_releaseMutex( maUserEventListMutex );
-
+    
     // notify main loop that an event has arrived
     wakeupYield();
 }
@@ -611,7 +611,7 @@ void AquaSalInstance::handleAppDefinedEvent( NSEvent* pEvent )
             it++;
         }
 
-        switch ([pEvent data1])
+        switch ([pEvent data1]) 
         {
             case kRemoteButtonPlay:
                 nCommand = ( bIsFullScreenMode == true ) ? MEDIA_COMMAND_PLAY_PAUSE : MEDIA_COMMAND_PLAY;
@@ -620,8 +620,8 @@ void AquaSalInstance::handleAppDefinedEvent( NSEvent* pEvent )
             // kept for experimentation purpose (scheduled for future implementation)
             // case kRemoteButtonMenu:         nCommand = MEDIA_COMMAND_MENU; break;
 
-            case kRemoteButtonPlus:         nCommand = MEDIA_COMMAND_VOLUME_UP; break;
-
+            case kRemoteButtonPlus:     	nCommand = MEDIA_COMMAND_VOLUME_UP; break;
+            
             case kRemoteButtonMinus:        nCommand = MEDIA_COMMAND_VOLUME_DOWN; break;
 
             case kRemoteButtonRight:        nCommand = MEDIA_COMMAND_NEXTTRACK; break;
@@ -685,18 +685,18 @@ void AquaSalInstance::Yield( bool bWait, bool bHandleAllCurrentEvents )
     // ensure that the per thread autorelease pool is top level and
     // will therefore not be destroyed by cocoa implicitly
     SalData::ensureThreadAutoreleasePool();
-
+    
     // NSAutoreleasePool documentation suggests we should have
     // an own pool for each yield level
     ReleasePoolHolder aReleasePool;
-
+    
     // Release all locks so that we don't deadlock when we pull pending
     // events from the event queue
     bool bDispatchUser = true;
     while( bDispatchUser )
     {
         ULONG nCount = ReleaseYieldMutex();
-
+    
         // get one user event
         osl_acquireMutex( maUserEventListMutex );
         SalUserEvent aEvent( NULL, NULL, 0 );
@@ -708,9 +708,9 @@ void AquaSalInstance::Yield( bool bWait, bool bHandleAllCurrentEvents )
         else
             bDispatchUser = false;
         osl_releaseMutex( maUserEventListMutex );
-
+        
         AcquireYieldMutex( nCount );
-
+        
         // dispatch it
         if( aEvent.mpFrame && AquaSalFrame::isAlive( aEvent.mpFrame ) )
         {
@@ -721,7 +721,7 @@ void AquaSalInstance::Yield( bool bWait, bool bHandleAllCurrentEvents )
                 return;
         }
     }
-
+    
     // handle cocoa event queue
     // cocoa events mye be only handled in the thread the NSApp was created
     if( isNSAppThread() && mnActivePrintJobs == 0 )
@@ -737,7 +737,7 @@ void AquaSalInstance::Yield( bool bWait, bool bHandleAllCurrentEvents )
         do
         {
             ULONG nCount = ReleaseYieldMutex();
-
+    
             pEvent = [NSApp nextEventMatchingMask: NSAnyEventMask untilDate: nil
                             inMode: NSDefaultRunLoopMode dequeue: YES];
             if( pEvent )
@@ -746,22 +746,22 @@ void AquaSalInstance::Yield( bool bWait, bool bHandleAllCurrentEvents )
                 bHadEvent = true;
             }
             [NSApp updateWindows];
-
+        
             AcquireYieldMutex( nCount );
         } while( bHandleAllCurrentEvents && pEvent );
-
+        
         // if we had no event yet, wait for one if requested
         if( bWait && ! bHadEvent )
         {
             ULONG nCount = ReleaseYieldMutex();
-
+    
             NSDate* pDt = AquaSalTimer::pRunningTimer ? [AquaSalTimer::pRunningTimer fireDate] : [NSDate distantFuture];
             pEvent = [NSApp nextEventMatchingMask: NSAnyEventMask untilDate: pDt
                             inMode: NSDefaultRunLoopMode dequeue: YES];
             if( pEvent )
                 [NSApp sendEvent: pEvent];
             [NSApp updateWindows];
-
+        
             AcquireYieldMutex( nCount );
 
             // #i86581#
@@ -777,7 +777,7 @@ void AquaSalInstance::Yield( bool bWait, bool bHandleAllCurrentEvents )
         }
 
         mbWaitingYield = bOldWaitingYield;
-
+        
         // collect update rectangles
         const std::list< AquaSalFrame* > rFrames( GetSalData()->maFrames );
         for( std::list< AquaSalFrame* >::const_iterator it = rFrames.begin(); it != rFrames.end(); ++it )
@@ -801,7 +801,7 @@ void AquaSalInstance::Yield( bool bWait, bool bHandleAllCurrentEvents )
         osl_waitCondition( maWaitingYieldCond, &aVal );
         AcquireYieldMutex( nCount );
     }
-
+    
     // we get some apple events way too early
     // before the application is ready to handle them,
     // so their corresponding application events need to be delayed
@@ -837,7 +837,7 @@ bool AquaSalInstance::AnyInput( USHORT nType )
         if( nType == INPUT_APPEVENT )
             return false;
     }
-
+    
     if( nType & INPUT_TIMER )
     {
         if( AquaSalTimer::pRunningTimer )
@@ -849,7 +849,7 @@ bool AquaSalInstance::AnyInput( USHORT nType )
             }
         }
     }
-
+        
     unsigned/*NSUInteger*/ nEventMask = 0;
     if( nType & INPUT_MOUSE)
         nEventMask |=
@@ -884,7 +884,7 @@ SalFrame* AquaSalInstance::CreateChildFrame( SystemParentData* pSystemParentData
 SalFrame* AquaSalInstance::CreateFrame( SalFrame* pParent, ULONG nSalFrameStyle )
 {
     SalData::ensureThreadAutoreleasePool();
-
+    
     SalFrame* pFrame = new AquaSalFrame( pParent, nSalFrameStyle );
     return pFrame;
 }
@@ -952,7 +952,7 @@ void AquaSalInstance::GetPrinterQueueInfo( ImplPrnQueueList* pList )
             pInfo->mnStatus         = 0;
             pInfo->mnJobs           = 0;
             pInfo->mpSysData        = NULL;
-
+            
             pList->Add( pInfo );
         }
     }
@@ -1047,8 +1047,8 @@ void AquaSalInstance::SetErrorEventCallback( void* pInstance, bool(*pCallback)(v
 
 void* AquaSalInstance::GetConnectionIdentifier( ConnectionIdentifierType& rReturnedType, int& rReturnedBytes )
 {
-    rReturnedBytes  = 1;
-    rReturnedType   = AsciiCString;
+    rReturnedBytes	= 1;
+    rReturnedType	= AsciiCString;
     return (void*)"";
 }
 
@@ -1057,7 +1057,7 @@ void* AquaSalInstance::GetConnectionIdentifier( ConnectionIdentifierType& rRetur
 static rtl::OUString translateToExternalUrl(const rtl::OUString& internalUrl)
 {
     rtl::OUString extUrl;
-
+        
     uno::Reference< lang::XMultiServiceFactory > sm = comphelper::getProcessServiceFactory();
     if (sm.is())
     {
@@ -1112,7 +1112,7 @@ void AquaSalInstance::AddToRecentDocumentList(const rtl::OUString& rFileUrl, con
     rtl::OUString externalUrl = translateToExternalUrl(rFileUrl);
     if( 0 == externalUrl.getLength() )
         externalUrl = rFileUrl;
-
+    
     if( externalUrl.getLength() && !isDangerousUrl( externalUrl ) )
     {
         NSString* pString = CreateNSString( externalUrl );
@@ -1221,7 +1221,7 @@ rtl::OUString GetOUString( NSString* pStr )
     int nLen = [pStr length];
     if( nLen == 0 )
         return rtl::OUString();
-
+    
     rtl::OUStringBuffer aBuf( nLen+1 );
     aBuf.setLength( nLen );
     [pStr getCharacters: const_cast<sal_Unicode*>(aBuf.getStr())];
@@ -1242,16 +1242,16 @@ CGImageRef CreateCGImage( const Image& rImage )
 {
     BitmapEx aBmpEx( rImage.GetBitmapEx() );
     Bitmap aBmp( aBmpEx.GetBitmap() );
-
+        
     if( ! aBmp || ! aBmp.ImplGetImpBitmap() )
         return NULL;
-
+    
     // simple case, no transparency
     AquaSalBitmap* pSalBmp = static_cast<AquaSalBitmap*>(aBmp.ImplGetImpBitmap()->ImplGetSalBitmap());
-
+    
     if( ! pSalBmp )
         return NULL;
-
+    
     CGImageRef xImage = NULL;
     if( ! (aBmpEx.IsAlpha() || aBmpEx.IsTransparent() ) )
         xImage = pSalBmp->CreateCroppedImage( 0, 0, pSalBmp->mnWidth, pSalBmp->mnHeight );
@@ -1280,30 +1280,30 @@ CGImageRef CreateCGImage( const Image& rImage )
         SalColor nTransColor = MAKE_SALCOLOR( aTransColor.GetRed(), aTransColor.GetGreen(), aTransColor.GetBlue() );
         xImage = pSalBmp->CreateColorMask( 0, 0, pSalBmp->mnWidth, pSalBmp->mnHeight, nTransColor );
     }
-
+    
     return xImage;
 }
 
 NSImage* CreateNSImage( const Image& rImage )
 {
     CGImageRef xImage = CreateCGImage( rImage );
-
+    
     if( ! xImage )
         return nil;
-
+    
     Size aSize( rImage.GetSizePixel() );
     NSImage* pImage = [[NSImage alloc] initWithSize: NSMakeSize( aSize.Width(), aSize.Height() )];
     if( pImage )
     {
         [pImage setFlipped: YES];
         [pImage lockFocus];
-
+        
         NSGraphicsContext* pContext = [NSGraphicsContext currentContext];
         CGContextRef rCGContext = reinterpret_cast<CGContextRef>([pContext graphicsPort]);
-
+        
         const CGRect aDstRect = { {0, 0}, { aSize.Width(), aSize.Height() } };
         CGContextDrawImage( rCGContext, aDstRect, xImage );
-
+        
         [pImage unlockFocus];
     }
 
diff --git a/vcl/aqua/source/app/salsys.cxx b/vcl/aqua/source/app/salsys.cxx
index 3b548099feef..60eb699f5095 100644
--- a/vcl/aqua/source/app/salsys.cxx
+++ b/vcl/aqua/source/app/salsys.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
@@ -68,7 +68,7 @@ Rectangle AquaSalSystem::GetDisplayScreenPosSizePixel( unsigned int nScreen )
         pScreen = [pScreens objectAtIndex: nScreen];
     else
         pScreen = [NSScreen mainScreen];
-
+        
     if( pScreen )
     {
         NSRect aFrame = [pScreen frame];
@@ -87,7 +87,7 @@ Rectangle AquaSalSystem::GetDisplayWorkAreaPosSizePixel( unsigned int nScreen )
         pScreen = [pScreens objectAtIndex: nScreen];
     else
         pScreen = [NSScreen mainScreen];
-
+        
     if( pScreen )
     {
         NSRect aFrame = [pScreen visibleFrame];
diff --git a/vcl/aqua/source/app/saltimer.cxx b/vcl/aqua/source/app/saltimer.cxx
index 724857e92a0c..b379e5c7fbf2 100644
--- a/vcl/aqua/source/app/saltimer.cxx
+++ b/vcl/aqua/source/app/saltimer.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
diff --git a/vcl/aqua/source/dtrans/DataFlavorMapping.cxx b/vcl/aqua/source/dtrans/DataFlavorMapping.cxx
index e0a95a532bf8..e317a57a5cef 100644
--- a/vcl/aqua/source/dtrans/DataFlavorMapping.cxx
+++ b/vcl/aqua/source/dtrans/DataFlavorMapping.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
@@ -57,7 +57,7 @@ namespace // private
   const Type CPPUTYPE_SEQINT8  = getCppuType((Sequence<sal_Int8>*)0);
   const Type CPPUTYPE_OUSTRING = getCppuType( (OUString*)0 );
 
-  /* Determine whether or not a DataFlavor is valid.
+  /* Determine whether or not a DataFlavor is valid. 
    */
   bool isValidFlavor(const DataFlavor& aFlavor)
   {
@@ -111,7 +111,7 @@ namespace // private
   const char* FLAVOR_GDIMF = "application/x-openoffice-gdimetafile;windows_formatname=\"GDIMetaFile\"";
   const char* FLAVOR_WMF = "application/x-openoffice-wmf;windows_formatname=\"Image WMF\"";
   const char* FLAVOR_EMF = "application/x-openoffice-emf;windows_formatname=\"Image EMF\"";
-
+  
   const char* FLAVOR_DUMMY_INTERNAL = "application/x-openoffice-internal";
 
 
@@ -123,7 +123,7 @@ namespace // private
     Type DataType;
   };
 
-  /* At the moment it appears as if only MS Office pastes "public.html" to the clipboard.
+  /* At the moment it appears as if only MS Office pastes "public.html" to the clipboard. 
    */
   FlavorMap flavorMap[] =
     {
@@ -132,7 +132,7 @@ namespace // private
       { NSTIFFPboardType, "image/bmp", "Windows Bitmap", CPPUTYPE_SEQINT8 },
       { NSPICTPboardType, "image/bmp", "Windows Bitmap", CPPUTYPE_SEQINT8 },
       { NSHTMLPboardType, "text/html", "Plain Html", CPPUTYPE_SEQINT8 },
-      { NSFilenamesPboardType, "application/x-openoffice-filelist;windows_formatname=\"FileList\"", "FileList", CPPUTYPE_SEQINT8 },
+      { NSFilenamesPboardType, "application/x-openoffice-filelist;windows_formatname=\"FileList\"", "FileList", CPPUTYPE_SEQINT8 }, 
       { PBTYPE_SESX, FLAVOR_SESX, "Star Embed Source (XML)", CPPUTYPE_SEQINT8 },
       { PBTYPE_SLSDX, FLAVOR_SLSDX, "Star Link Source Descriptor (XML)", CPPUTYPE_SEQINT8 },
       { PBTYPE_ESX, FLAVOR_ESX, "Star Embed Source (XML)", CPPUTYPE_SEQINT8 },
@@ -165,7 +165,7 @@ namespace // private
 
 //###########################
 
-/* A base class for other data provider.
+/* A base class for other data provider. 
  */
 class DataProviderBaseImpl : public DataProvider
 {
@@ -186,7 +186,7 @@ DataProviderBaseImpl::DataProviderBaseImpl(const Any& data) :
 {
 }
 
-DataProviderBaseImpl::DataProviderBaseImpl(id data) :
+DataProviderBaseImpl::DataProviderBaseImpl(id data) : 
   mSystemData(data)
 {
   [mSystemData retain];
@@ -207,7 +207,7 @@ class UniDataProvider : public DataProviderBaseImpl
 {
 public:
   UniDataProvider(const Any& data);
-
+  
   UniDataProvider(NSData* data);
 
   virtual NSData* getSystemData();
@@ -242,8 +242,8 @@ Any UniDataProvider::getOOoData()
 
   if (mSystemData)
     {
-      oOOData = makeAny(OUString(reinterpret_cast<const sal_Char*>([mSystemData bytes]),
-                                 [mSystemData length],
+      oOOData = makeAny(OUString(reinterpret_cast<const sal_Char*>([mSystemData bytes]), 
+                                 [mSystemData length], 
                                  RTL_TEXTENCODING_UTF8));
     }
   else
@@ -284,7 +284,7 @@ NSData* ByteSequenceDataProvider::getSystemData()
    Sequence<sal_Int8> rawData;
    mData >>= rawData;
 
-   return [NSData dataWithBytes: rawData.getArray() length: rawData.getLength()];
+   return [NSData dataWithBytes: rawData.getArray()	length: rawData.getLength()];
 }
 
 Any ByteSequenceDataProvider::getOOoData()
@@ -303,7 +303,7 @@ Any ByteSequenceDataProvider::getOOoData()
     {
       oOOData =  mData;
     }
-
+  
   return oOOData;
 }
 
@@ -362,14 +362,14 @@ Any HTMLFormatDataProvider::getOOoData()
           plainHtml = HTMLFormatToTextHtml(unkHtmlData);
           pPlainHtml = &plainHtml;
         }
-
+      
       oOOData = makeAny(*pPlainHtml);
     }
   else
     {
       oOOData = mData;
     }
-
+  
   return oOOData;
 }
 
@@ -419,7 +419,7 @@ NSData* BMPDataProvider::getSystemData()
 /* At the moment the OOo 'PCT' filter is not good enough to be used
    and there is no flavor defined for exchanging 'PCT' with OOo so
    we will at the moment convert 'PCT' to a Windows BMP and provide
-   this to OOo
+   this to OOo 
 */
 Any BMPDataProvider::getOOoData()
 {
@@ -433,7 +433,7 @@ Any BMPDataProvider::getOOoData()
       memcpy(pictData.getArray(), [mSystemData bytes], flavorDataLength);
 
       Sequence<sal_Int8> bmpData;
-
+      
       if (ImageToBMP(pictData, bmpData, meImageType))
         {
           oOOData = makeAny(bmpData);
@@ -443,7 +443,7 @@ Any BMPDataProvider::getOOoData()
     {
       oOOData = mData;
     }
-
+  
   return oOOData;
 }
 
@@ -492,7 +492,7 @@ Any FileListDataProvider::getOOoData()
       Sequence<sal_Int8> oOOFileList(lenSeqRequired);
       unichar* pBuffer = reinterpret_cast<unichar*>(oOOFileList.getArray());
       rtl_zeroMemory(pBuffer, lenSeqRequired);
-
+      
       for (size_t i = 0; i < length; i++)
         {
           NSString* fname = [mSystemData objectAtIndex: i];
@@ -507,7 +507,7 @@ Any FileListDataProvider::getOOoData()
     {
       oOOData = mData;
     }
-
+  
   return oOOData;
 }
 
@@ -572,7 +572,7 @@ DataProviderPtr_t DataFlavorMapper::getDataProvider(NSString* systemFlavor, Refe
       DataFlavor oOOFlavor = systemToOpenOfficeFlavor(systemFlavor);
 
       Any data = rTransferable->getTransferData(oOOFlavor);
-
+      
       if (isByteSequenceType(data.getValueType()))
         {
           if ([systemFlavor caseInsensitiveCompare: NSHTMLPboardType] == NSOrderedSame)
@@ -679,7 +679,7 @@ NSArray* DataFlavorMapper::flavorSequenceToTypesArray(const com::sun::star::uno:
       else
       {
           NSString* str = openOfficeToSystemFlavor(flavors[i]);
-
+          
           if (str != NULL)
           {
               [array addObject: str];
@@ -689,7 +689,7 @@ NSArray* DataFlavorMapper::flavorSequenceToTypesArray(const com::sun::star::uno:
 
    // #i89462# #i90747#
    // in case no system flavor was found to report
-   // report at least one so D&D between OOo targets works
+   // report at least one so D&D between OOo targets works 
   if( [array count] == 0 )
   {
       [array addObject: PBTYPE_DUMMY_INTERNAL];
diff --git a/vcl/aqua/source/dtrans/DataFlavorMapping.hxx b/vcl/aqua/source/dtrans/DataFlavorMapping.hxx
index 9847fcbd3987..c5bd33abac9d 100644
--- a/vcl/aqua/source/dtrans/DataFlavorMapping.hxx
+++ b/vcl/aqua/source/dtrans/DataFlavorMapping.hxx
@@ -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
@@ -41,14 +41,14 @@
 #include <boost/shared_ptr.hpp>
 
 
-/* An interface to get the clipboard data in either
+/* An interface to get the clipboard data in either 
    system or OOo format.
  */
 class DataProvider
 {
 public:
   virtual ~DataProvider() {};
-
+  
   /* Get the clipboard data in the system format.
      The caller has to retain/release the returned
      CFDataRef on demand.
@@ -75,8 +75,8 @@ public:
   DataFlavorMapper();
 
 
-  /* Map a system data flavor to an OpenOffice data flavor.
-     Return an empty string if there is not suiteable
+  /* Map a system data flavor to an OpenOffice data flavor. 
+     Return an empty string if there is not suiteable 
      mapping from a system data flavor to a OpenOffice data
      flavor.
   */
@@ -98,11 +98,11 @@ public:
   /* Get a data provider which is able to provide the data 'rTransferable' offers in a format that can
      be put on to the system clipboard.
    */
-  DataProviderPtr_t getDataProvider(NSString* systemFlavor,
+  DataProviderPtr_t getDataProvider(NSString* systemFlavor, 
                                     const com::sun::star::uno::Reference< com::sun::star::datatransfer::XTransferable > rTransferable) const;
 
-
-
+  
+  
   /* Get a data provider which is able to provide 'systemData' in the OOo expected format.
    */
   DataProviderPtr_t getDataProvider(const NSString* systemFlavor, NSArray* systemData) const;
@@ -114,12 +114,12 @@ public:
 
 
   /* Translate a sequence of DataFlavors into a NSArray of system types.
-     Only those DataFlavors for which a suitable mapping to a system
+     Only those DataFlavors for which a suitable mapping to a system 
      type exist will be contained in the returned types array.
    */
   NSArray* flavorSequenceToTypesArray(const com::sun::star::uno::Sequence<com::sun::star::datatransfer::DataFlavor>& flavors) const;
 
-  /* Translate a NSArray of system types into a sequence of DataFlavors.
+  /* Translate a NSArray of system types into a sequence of DataFlavors. 
      Only those types for which a suitable mapping to a DataFlavor
      exist will be contained in the new DataFlavor Sequence.
   */
@@ -140,4 +140,4 @@ private:
 
 typedef boost::shared_ptr<DataFlavorMapper> DataFlavorMapperPtr_t;
 
-#endif
+#endif 
diff --git a/vcl/aqua/source/dtrans/DragActionConversion.cxx b/vcl/aqua/source/dtrans/DragActionConversion.cxx
index 06ce57e8748f..21976194165f 100644
--- a/vcl/aqua/source/dtrans/DragActionConversion.cxx
+++ b/vcl/aqua/source/dtrans/DragActionConversion.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
@@ -32,7 +32,7 @@
 using namespace com::sun::star::datatransfer::dnd;
 
 
-/* Convert office drag actions as defined in
+/* Convert office drag actions as defined in 
    <type>com::sun::star::datatransfer::dnd::DNDConstants</type>
    into system conform drag actions.
  */
@@ -40,12 +40,12 @@ unsigned int OfficeToSystemDragActions(sal_Int8 dragActions)
 {
   unsigned int actions = NSDragOperationNone;
 
-  if (dragActions & DNDConstants::ACTION_COPY)
+  if (dragActions & DNDConstants::ACTION_COPY) 
     {
       actions |= NSDragOperationCopy;
     }
 
-  if (dragActions & DNDConstants::ACTION_MOVE)
+  if (dragActions & DNDConstants::ACTION_MOVE) 
     {
       actions |= NSDragOperationMove;
     }
@@ -59,7 +59,7 @@ unsigned int OfficeToSystemDragActions(sal_Int8 dragActions)
 }
 
 /* Convert system conform drag actions into office conform
-   drag actions as defined in
+   drag actions as defined in 
    <type>com::sun::star::datatransfer::dnd::DNDConstants</type>.
  */
 sal_Int8 SystemToOfficeDragActions(unsigned int dragActions)
diff --git a/vcl/aqua/source/dtrans/DragActionConversion.hxx b/vcl/aqua/source/dtrans/DragActionConversion.hxx
index 7facfef794b6..b36dd75a1041 100644
--- a/vcl/aqua/source/dtrans/DragActionConversion.hxx
+++ b/vcl/aqua/source/dtrans/DragActionConversion.hxx
@@ -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
@@ -33,14 +33,14 @@
 #include <postmac.h>
 
 
-/* Convert office drag actions as defined in
+/* Convert office drag actions as defined in 
    <type>com::sun::star::datatransfer::dnd::DNDConstants</type>
    into system conform drag actions.
  */
 unsigned int OfficeToSystemDragActions(sal_Int8 dragActions);
 
 /* Convert system conform drag actions into office conform
-   drag actions as defined in
+   drag actions as defined in 
    <type>com::sun::star::datatransfer::dnd::DNDConstants</type>.
  */
 sal_Int8 SystemToOfficeDragActions(unsigned int dragActions);
diff --git a/vcl/aqua/source/dtrans/DragSource.cxx b/vcl/aqua/source/dtrans/DragSource.cxx
index adb247d70711..856564012150 100644
--- a/vcl/aqua/source/dtrans/DragSource.cxx
+++ b/vcl/aqua/source/dtrans/DragSource.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
@@ -112,13 +112,13 @@ Sequence<OUString> dragSource_getSupportedServiceNames()
 
 -(void)draggedImage:(NSImage*)anImage beganAt:(NSPoint)aPoint
 {
-  DragSourceDragEvent dsde(static_cast<OWeakObject*>(mDragSource),
-                           new DragSourceContext(mDragSource),
-                           mDragSource,
-                           DNDConstants::ACTION_COPY,
+  DragSourceDragEvent dsde(static_cast<OWeakObject*>(mDragSource), 
+                           new DragSourceContext(mDragSource), 
+                           mDragSource, 
+                           DNDConstants::ACTION_COPY, 
                            DNDConstants::ACTION_COPY);
 
-  mDragSource->mXDragSrcListener->dragEnter(dsde);
+  mDragSource->mXDragSrcListener->dragEnter(dsde);	
 }
 
 
@@ -129,7 +129,7 @@ Sequence<OUString> dragSource_getSupportedServiceNames()
   bool bDropSuccess = operation != NSDragOperationNone;
   if( DragSource::g_DropSuccessSet )
       bDropSuccess = DragSource::g_DropSuccess;
-
+  
   DragSourceDropEvent dsde(static_cast<OWeakObject*>(mDragSource),
                            new DragSourceContext(mDragSource),
                            static_cast< XDragSource* >(mDragSource),
@@ -169,7 +169,7 @@ DragSource::~DragSource()
   [(id <MouseEventListener>)mView unregisterMouseEventListener: mDragSourceHelper];
   [mDragSourceHelper release];
 }
-
+ 
 
 void SAL_CALL DragSource::initialize(const Sequence< Any >& aArguments)
   throw(Exception)
@@ -187,7 +187,7 @@ void SAL_CALL DragSource::initialize(const Sequence< Any >& aArguments)
 
   /* All SalFrameView the base class for all VCL system views inherits from
      NSView in order to get mouse and other events. This is the only way to
-     get these events. In order to start a drag operation we need to provide
+     get these events. In order to start a drag operation we need to provide 
      the mouse event which was the trigger. SalFrameView therefor implements
      a hook mechanism so that we can get mouse events for our purpose.
   */
@@ -197,7 +197,7 @@ void SAL_CALL DragSource::initialize(const Sequence< Any >& aArguments)
       throw Exception(OUString(RTL_CONSTASCII_USTRINGPARAM("DragSource::initialize: Provided view doesn't support mouse listener")),
                       static_cast<OWeakObject*>(this));
     }
-
+      
   mDragSourceHelper = [[DragSourceHelper alloc] initWithDragSource: this];
 
   if (mDragSourceHelper == nil)
@@ -233,16 +233,16 @@ void SAL_CALL DragSource::startDrag(const DragGestureEvent& trigger,
                                     sal_Int32 cursor,
                                     sal_Int32 image,
                                     const Reference<XTransferable >& transferable,
-                                    const Reference<XDragSourceListener >& listener )
+                                    const Reference<XDragSourceListener >& listener ) 
   throw( RuntimeException)
 {
   MutexGuard guard(m_aMutex);
-
+  
   OSL_ASSERT(listener.is() && "DragSource::startDrag: No XDragSourceListener provided\n");
   OSL_ASSERT(transferable.is() && "DragSource::startDrag: No transferable provided\n");
-
-  trigger.Event >>= mMouseEvent;
-  m_MouseButton= mMouseEvent.Buttons;
+  
+  trigger.Event >>= mMouseEvent; 
+  m_MouseButton= mMouseEvent.Buttons; 
   mXDragSrcListener = listener;
   mXCurrentContext = static_cast<XDragSourceContext*>(new DragSourceContext(this));
   auto_ptr<AquaClipboard> clipb(new AquaClipboard(NULL, false));
@@ -257,11 +257,11 @@ void SAL_CALL DragSource::startDrag(const DragGestureEvent& trigger,
 
   NSImage* dragImage;
   dragImage = [[NSImage alloc] initWithSize: sz];
-
+  
   NSRect bounds;
   bounds.origin = NSMakePoint(0,0);
   bounds.size = sz;
-
+  
   [dragImage lockFocus];
   [[NSColor blackColor] set];
   [NSBezierPath fillRect: bounds];
@@ -277,9 +277,9 @@ void SAL_CALL DragSource::startDrag(const DragGestureEvent& trigger,
   g_DropSuccessSet = false;
   g_DropSuccess = false;
 
-  [mView dragImage: dragImage
-   at: p
-   offset: NSMakeSize(0,0)
+  [mView dragImage: dragImage 
+   at: p 
+   offset: NSMakeSize(0,0) 
    event: mLastMouseEventBeforeStartDrag
    pasteboard: clipb->getPasteboard()
    source: mDragSourceHelper
@@ -298,7 +298,7 @@ void SAL_CALL DragSource::startDrag(const DragGestureEvent& trigger,
 
 // In order to initiate a D&D operation we need to
 // provide the triggering mouse event which we get
-// from the SalFrameView that is associated with
+// from the SalFrameView that is associated with 
 // this DragSource
 void DragSource::saveMouseEvent(NSEvent* theEvent)
 {
@@ -321,9 +321,9 @@ unsigned int DragSource::getSupportedDragOperations(bool isLocal) const
   if (isLocal)
     {
       // Support NSDragOperation generic which means we can
-      // decide which D&D operation to choose. We map
+      // decide which D&D operation to choose. We map 
       // NSDragOperationGenric to DNDConstants::ACTION_DEFAULT
-      // in SystemToOfficeDragActions to signal this and
+      // in SystemToOfficeDragActions to signal this and 
       // use it in DropTarget::determineDropAction
       srcActions |= NSDragOperationGeneric;
     }
diff --git a/vcl/aqua/source/dtrans/DragSource.hxx b/vcl/aqua/source/dtrans/DragSource.hxx
index 5d02b9874149..21de121a1972 100644
--- a/vcl/aqua/source/dtrans/DragSource.hxx
+++ b/vcl/aqua/source/dtrans/DragSource.hxx
@@ -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
@@ -47,7 +47,7 @@
 
 class DragSource;
 
-/* The functions declared in this protocol are actually
+/* The functions declared in this protocol are actually 
    declared in vcl/aqua/inc/salframe.h. Because we want
    to avoid importing VCL headers in UNO services and
    on the other hand want to avoid warnings caused by
@@ -80,8 +80,8 @@ class DragSource;
 
 
 class DragSource : public ::cppu::BaseMutex,
-                   public ::cppu::WeakComponentImplHelper3< com::sun::star::datatransfer::dnd::XDragSource,
-                                                            com::sun::star::lang::XInitialization,
+                   public ::cppu::WeakComponentImplHelper3< com::sun::star::datatransfer::dnd::XDragSource, 
+                                                            com::sun::star::lang::XInitialization, 
                                                             com::sun::star::lang::XServiceInfo >,
                    private ::boost::noncopyable
 {
@@ -98,7 +98,7 @@ public:
 
   virtual sal_Int32 SAL_CALL getDefaultCursor(sal_Int8 dragAction)
     throw(com::sun::star::lang::IllegalArgumentException, com::sun::star::uno::RuntimeException);
-
+  
   virtual void SAL_CALL startDrag( const com::sun::star::datatransfer::dnd::DragGestureEvent& trigger,
                                    sal_Int8 sourceActions,
                                    sal_Int32 cursor,
@@ -128,7 +128,7 @@ public:
   // The mouse button that set off the drag and drop operation
   short m_MouseButton;
   sal_Int8 mDragSourceActions;
-
+  
   static com::sun::star::uno::Reference< com::sun::star::datatransfer::XTransferable > g_XTransferable;
   static NSView* g_DragSourceView;
   static bool    g_DropSuccessSet;
diff --git a/vcl/aqua/source/dtrans/DragSourceContext.cxx b/vcl/aqua/source/dtrans/DragSourceContext.cxx
index cd70dc55c896..6f77eb6ba527 100644
--- a/vcl/aqua/source/dtrans/DragSourceContext.cxx
+++ b/vcl/aqua/source/dtrans/DragSourceContext.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
diff --git a/vcl/aqua/source/dtrans/DragSourceContext.hxx b/vcl/aqua/source/dtrans/DragSourceContext.hxx
index 5d84c165d851..378ae2a3657d 100644
--- a/vcl/aqua/source/dtrans/DragSourceContext.hxx
+++ b/vcl/aqua/source/dtrans/DragSourceContext.hxx
@@ -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
@@ -51,16 +51,16 @@ public:
   DragSourceContext(DragSource* pSource);
   ~DragSourceContext();
 
-  virtual sal_Int32 SAL_CALL getCurrentCursor(  )
+  virtual sal_Int32 SAL_CALL getCurrentCursor(  ) 
     throw( com::sun::star::uno::RuntimeException);
 
-  virtual void SAL_CALL setCursor( sal_Int32 cursorId )
+  virtual void SAL_CALL setCursor( sal_Int32 cursorId ) 
     throw( com::sun::star::uno::RuntimeException);
 
-  virtual void SAL_CALL setImage( sal_Int32 imageId )
+  virtual void SAL_CALL setImage( sal_Int32 imageId ) 
     throw( com::sun::star::uno::RuntimeException);
 
-  virtual void SAL_CALL transferablesFlavorsChanged(  )
+  virtual void SAL_CALL transferablesFlavorsChanged(  ) 
     throw( com::sun::star::uno::RuntimeException);
 
 private:
diff --git a/vcl/aqua/source/dtrans/DropTarget.cxx b/vcl/aqua/source/dtrans/DropTarget.cxx
index c928d66e156d..2261629f7fd6 100644
--- a/vcl/aqua/source/dtrans/DropTarget.cxx
+++ b/vcl/aqua/source/dtrans/DropTarget.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
@@ -99,7 +99,7 @@ namespace /* private */
 {
   self = [super init];
 
-  if (self)
+  if (self) 
     {
       mDropTarget = pdt;
     }
@@ -170,8 +170,8 @@ sal_Int8 DropTarget::determineDropAction(sal_Int8 dropActions, id sender) const
 {
   sal_Int8 dropAct = dropActions;
   bool srcAndDestEqual = false;
-
-  if ([sender draggingSource] != nil)
+  
+  if ([sender draggingSource] != nil) 
     {
       // Internal DnD
       NSView* destView = [[sender draggingDestinationWindow] contentView];
@@ -179,8 +179,8 @@ sal_Int8 DropTarget::determineDropAction(sal_Int8 dropActions, id sender) const
     }
 
   // If ACTION_DEFAULT is set this means NSDragOperationGeneric
-  // has been set and we map this to ACTION_MOVE or ACTION_COPY
-  // depending on whether or not source and dest are equal,
+  // has been set and we map this to ACTION_MOVE or ACTION_COPY 
+  // depending on whether or not source and dest are equal, 
   // this hopefully satisfies all parties
   if( (dropActions == DNDConstants::ACTION_DEFAULT)
   || ((dropActions == mDragSourceSupportedActions)
@@ -189,8 +189,8 @@ sal_Int8 DropTarget::determineDropAction(sal_Int8 dropActions, id sender) const
       dropAct = srcAndDestEqual ? DNDConstants::ACTION_MOVE :
         DNDConstants::ACTION_COPY;
     }
-     // if more than one drop actions have been specified
-     // set ACTION_DEFAULT in order to let the drop target
+     // if more than one drop actions have been specified 
+     // set ACTION_DEFAULT in order to let the drop target 
      // decide which one to use
   else if (dropActions != DNDConstants::ACTION_NONE &&
            dropActions != DNDConstants::ACTION_MOVE &&
@@ -208,7 +208,7 @@ sal_Int8 DropTarget::determineDropAction(sal_Int8 dropActions, id sender) const
           else if (dropActions & DNDConstants::ACTION_MOVE)
             dropAct = DNDConstants::ACTION_MOVE;
           else if (dropActions & DNDConstants::ACTION_LINK)
-            dropAct = DNDConstants::ACTION_LINK;
+            dropAct = DNDConstants::ACTION_LINK;		 
         }
 
       dropAct |= DNDConstants::ACTION_DEFAULT;
@@ -221,56 +221,56 @@ sal_Int8 DropTarget::determineDropAction(sal_Int8 dropActions, id sender) const
 NSDragOperation DropTarget::draggingEntered(id sender)
 {
   // Initially when DnD will be started no modifier key can be pressed yet
-  // thus we are getting all actions that the drag source supports, we save
+  // thus we are getting all actions that the drag source supports, we save 
   // this value because later the system masks the drag source actions if
   // a modifier key will be pressed
   mDragSourceSupportedActions = SystemToOfficeDragActions([sender draggingSourceOperationMask]);
-
+  
   // Only if the drop target is really interessted in the drag actions
   // supported by the source
   if (mDragSourceSupportedActions & mDefaultActions)
     {
-      sal_Int8 currentAction = determineDropAction(mDragSourceSupportedActions, sender);
+      sal_Int8 currentAction = determineDropAction(mDragSourceSupportedActions, sender);	  
 
       NSRect bounds = [mView bounds];
       NSPoint dragLocation = [sender draggedImageLocation];
-
+  
       CocoaToVCL(dragLocation, bounds);
-
+      
       sal_Int32 posX = static_cast<sal_Int32>(dragLocation.x);
       sal_Int32 posY = static_cast<sal_Int32>(dragLocation.y);
 
       NSPasteboard* dragPboard = [sender draggingPasteboard];
       mXCurrentDragClipboard = new AquaClipboard(dragPboard, false);
-
+      
       Reference<XTransferable> xTransferable = DragSource::g_XTransferable.is() ?
         DragSource::g_XTransferable : mXCurrentDragClipboard->getContents();
 
-      DropTargetDragEnterEvent dtdee(static_cast<OWeakObject*>(this),
-                                     0,
-                                     this,
-                                     currentAction,
-                                     posX,
-                                     posY,
-                                     mDragSourceSupportedActions,
+      DropTargetDragEnterEvent dtdee(static_cast<OWeakObject*>(this), 
+                                     0, 
+                                     this, 
+                                     currentAction, 
+                                     posX, 
+                                     posY, 
+                                     mDragSourceSupportedActions, 
                                      xTransferable->getTransferDataFlavors());
 
-      fire_dragEnter(dtdee);
+      fire_dragEnter(dtdee);	  
     }
 
-  return OfficeToSystemDragActions(mSelectedDropAction);
+  return OfficeToSystemDragActions(mSelectedDropAction); 
 }
 
 
 NSDragOperation DropTarget::draggingUpdated(id sender)
 {
-  sal_Int8 currentDragSourceActions =
+  sal_Int8 currentDragSourceActions = 
     SystemToOfficeDragActions([sender draggingSourceOperationMask]);
   NSDragOperation dragOp = NSDragOperationNone;
 
   if (currentDragSourceActions & mDefaultActions)
     {
-      sal_Int8 currentAction = determineDropAction(currentDragSourceActions, sender);
+      sal_Int8 currentAction = determineDropAction(currentDragSourceActions, sender);	  
       NSRect bounds = [mView bounds];
       NSPoint dragLocation = [sender draggedImageLocation];
 
@@ -279,24 +279,24 @@ NSDragOperation DropTarget::draggingUpdated(id sender)
       sal_Int32 posX = static_cast<sal_Int32>(dragLocation.x);
       sal_Int32 posY = static_cast<sal_Int32>(dragLocation.y);
 
-      DropTargetDragEvent dtde(static_cast<OWeakObject*>(this),
-                               0,
-                               this,
+      DropTargetDragEvent dtde(static_cast<OWeakObject*>(this), 
+                               0, 
+                               this, 
                                currentAction,
                                posX,
-                               posY,
+                               posY, 
                                mDragSourceSupportedActions);
 
       fire_dragOver(dtde);
 
-      // drag over callbacks likely have rendered something
+      // drag over callbacks likely have rendered something 
       [mView setNeedsDisplay: TRUE];
-
+      
       dragOp = OfficeToSystemDragActions(mSelectedDropAction);
 
       //NSLog(@"Drag update: Source actions: %x proposed action %x selected action %x", mDragSourceSupportedActions, currentAction, mSelectedDropAction);
     }
-
+ 
   // Weird but it appears as if there is no method in Cocoa
   // to create a kThemeCopyArrowCursor hence we have to use
   // Carbon to do it
@@ -304,7 +304,7 @@ NSDragOperation DropTarget::draggingUpdated(id sender)
     SetThemeCursor(kThemeNotAllowedCursor);
   else if (dragOp == NSDragOperationCopy)
     SetThemeCursor(kThemeCopyArrowCursor);
-  else
+  else 
     SetThemeCursor(kThemeArrowCursor);
 
   return dragOp;
@@ -335,11 +335,11 @@ MacOSBOOL DropTarget::performDragOperation(id sender)
     {
       Reference<XTransferable> xTransferable = DragSource::g_XTransferable;
 
-      if (!DragSource::g_XTransferable.is())
+      if (!DragSource::g_XTransferable.is())			
         {
           xTransferable = mXCurrentDragClipboard->getContents();
         }
-
+          
       NSRect bounds = [mView bounds];
       NSPoint dragLocation = [sender draggedImageLocation];
 
@@ -353,10 +353,10 @@ MacOSBOOL DropTarget::performDragOperation(id sender)
                                this,
                                mSelectedDropAction,
                                posX,
-                               posY,
+                               posY, 
                                mDragSourceSupportedActions,
                                xTransferable);
-
+          
       fire_drop(dtde);
 
       bSuccess = true;
@@ -398,10 +398,10 @@ MacOSBOOL DropTarget::performDragOperation(id sender)
     mView = (id)tmp;
 
     mDropTargetHelper = [[DropTargetHelper alloc] initWithDropTarget: this];
-
+    
     [(id <DraggingDestinationHandler>)mView registerDraggingDestinationHandler:mDropTargetHelper];
     [mView registerForDraggedTypes: mDataFlavorMapper->getAllSupportedPboardTypes()];
-
+    
     id wnd = [mView window];
     NSWindow* parentWnd = [wnd parentWindow];
     unsigned int topWndStyle = (NSTitledWindowMask | NSClosableWindowMask | NSResizableWindowMask);
@@ -484,7 +484,7 @@ MacOSBOOL DropTarget::performDragOperation(id sender)
 
   void SAL_CALL DropTarget::dropComplete(sal_Bool success) throw (RuntimeException)
   {
-    // Reset the internal transferable used as shortcut in case this is
+    // Reset the internal transferable used as shortcut in case this is 
     // an internal D&D operation
     DragSource::g_XTransferable = Reference<XTransferable>();
     DragSource::g_DropSuccessSet = true;
@@ -536,7 +536,7 @@ MacOSBOOL DropTarget::performDragOperation(id sender)
         while( iter.hasMoreElements())
           {
             Reference<XDropTargetListener> listener( static_cast<XDropTargetListener*>( iter.next()));
-
+            
             try { listener->dragExit( dte); }
             catch (RuntimeException&) {}
           }
@@ -582,7 +582,7 @@ MacOSBOOL DropTarget::performDragOperation(id sender)
 
   OUString SAL_CALL DropTarget::getImplementationName() throw (RuntimeException)
   {
-    return dropTarget_getImplementationName();
+    return dropTarget_getImplementationName();   
   }
 
 
diff --git a/vcl/aqua/source/dtrans/DropTarget.hxx b/vcl/aqua/source/dtrans/DropTarget.hxx
index 6baa8bb69d01..9492e635d468 100644
--- a/vcl/aqua/source/dtrans/DropTarget.hxx
+++ b/vcl/aqua/source/dtrans/DropTarget.hxx
@@ -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
@@ -52,7 +52,7 @@
 
 class DropTarget;
 
-/* The functions declared in this protocol are actually
+/* The functions declared in this protocol are actually 
    declared in vcl/aqua/inc/salframe.h. Because we want
    to avoid importing VCL headers in UNO services and
    on the other hand want to avoid warnings caused by
@@ -84,8 +84,8 @@ class DropTarget;
 
 
 class DropTarget: public cppu::BaseMutex,
-                  public cppu::WeakComponentImplHelper5< com::sun::star::lang::XInitialization,
-                                                         com::sun::star::datatransfer::dnd::XDropTarget,
+                  public cppu::WeakComponentImplHelper5< com::sun::star::lang::XInitialization, 
+                                                         com::sun::star::datatransfer::dnd::XDropTarget, 
                                                          com::sun::star::datatransfer::dnd::XDropTargetDragContext,
                                                          com::sun::star::datatransfer::dnd::XDropTargetDropContext,
                                                          com::sun::star::lang::XServiceInfo >,
@@ -121,7 +121,7 @@ public:
   virtual void SAL_CALL acceptDrag(sal_Int8 dragOperation) throw(com::sun::star::uno::RuntimeException);
   virtual void SAL_CALL rejectDrag() throw(com::sun::star::uno::RuntimeException);
 
-  // XDropTargetDragContext
+  // XDropTargetDragContext 
   virtual void SAL_CALL acceptDrop(sal_Int8 dropOperation) throw (com::sun::star::uno::RuntimeException);
   virtual void SAL_CALL rejectDrop() throw (com::sun::star::uno::RuntimeException);
   virtual void SAL_CALL dropComplete(sal_Bool success) throw (com::sun::star::uno::RuntimeException);
diff --git a/vcl/aqua/source/dtrans/HtmlFmtFlt.cxx b/vcl/aqua/source/dtrans/HtmlFmtFlt.cxx
index 3f558b0a5b4f..50dc23e5835d 100644
--- a/vcl/aqua/source/dtrans/HtmlFmtFlt.cxx
+++ b/vcl/aqua/source/dtrans/HtmlFmtFlt.cxx
@@ -16,23 +16,23 @@ using namespace com::sun::star::uno;
 // well known under MS Windows
 // the MS HTML Format has a header before the real html data
 //
-// Version:1.0      Version number of the clipboard. Staring is 0.9
-// StartHTML:       Byte count from the beginning of the clipboard to the start
-//                  of the context, or -1 if no context
-// EndHTML:         Byte count from the beginning of the clipboard to the end
-//                  of the context, or -1 if no context
-// StartFragment:   Byte count from the beginning of the clipboard to the
-//                  start of the fragment
-// EndFragment:     Byte count from the beginning of the clipboard to the
-//                  end of the fragment
-// StartSelection:  Byte count from the beginning of the clipboard to the
-//                  start of the selection
-// EndSelection:    Byte count from the beginning of the clipboard to the
-//                  end of the selection
+// Version:1.0		Version number of the clipboard. Staring is 0.9
+// StartHTML:		Byte count from the beginning of the clipboard to the start
+//					of the context, or -1 if no context
+// EndHTML:			Byte count from the beginning of the clipboard to the end
+//					of the context, or -1 if no context
+// StartFragment:	Byte count from the beginning of the clipboard to the 
+//					start of the fragment
+// EndFragment:		Byte count from the beginning of the clipboard to the
+//					end of the fragment
+// StartSelection:	Byte count from the beginning of the clipboard to the
+//					start of the selection
+// EndSelection:	Byte count from the beginning of the clipboard to the
+//					end of the selection
 //
 // StartSelection and EndSelection are optional
 // The fragment should be preceded and followed by the HTML comments
-// <!--StartFragment--> and <!--EndFragment--> (no space between !-- and the
+// <!--StartFragment--> and <!--EndFragment--> (no space between !-- and the 
 // text
 //------------------------------------------------------------------------------
 
@@ -65,37 +65,37 @@ const std::string TAG_END_BODY = std::string("</BODY");
 Sequence<sal_Int8> SAL_CALL TextHtmlToHTMLFormat(Sequence<sal_Int8>& aTextHtml)
 {
     OSL_ASSERT(aTextHtml.getLength() > 0);
-
+    
     if (!(aTextHtml.getLength() > 0))
         return Sequence<sal_Int8>();
-
+                    
     // fill the buffer with dummy values to calc the exact length
-    std::string dummyHtmlHeader = GetHtmlFormatHeader(0, 0, 0, 0);
+    std::string dummyHtmlHeader = GetHtmlFormatHeader(0, 0, 0, 0);		
     size_t lHtmlFormatHeader = dummyHtmlHeader.length();
-
+               
     std::string textHtml(
-        reinterpret_cast<const sal_Char*>(aTextHtml.getConstArray()),
+        reinterpret_cast<const sal_Char*>(aTextHtml.getConstArray()), 
         reinterpret_cast<const sal_Char*>(aTextHtml.getConstArray()) + aTextHtml.getLength());
-
+                                                            
     std::string::size_type nStartHtml = textHtml.find(TAG_HTML) + lHtmlFormatHeader - 1; // we start one before '<HTML>' Word 2000 does also so
     std::string::size_type nEndHtml = textHtml.find(TAG_END_HTML) + lHtmlFormatHeader + TAG_END_HTML.length() + 1; // our SOffice 5.2 wants 2 behind </HTML>?
-
+    
     // The body tag may have parameters so we need to search for the
     // closing '>' manually e.g. <BODY param> #92840#
-    std::string::size_type nStartFragment = textHtml.find(">", textHtml.find(TAG_BODY)) + lHtmlFormatHeader + 1;
+    std::string::size_type nStartFragment = textHtml.find(">", textHtml.find(TAG_BODY)) + lHtmlFormatHeader + 1; 
     std::string::size_type nEndFragment = textHtml.find(TAG_END_BODY) + lHtmlFormatHeader;
 
-    std::string htmlFormat = GetHtmlFormatHeader(nStartHtml, nEndHtml, nStartFragment, nEndFragment);
+    std::string htmlFormat = GetHtmlFormatHeader(nStartHtml, nEndHtml, nStartFragment, nEndFragment);	
     htmlFormat += textHtml;
-
+        
     Sequence<sal_Int8> byteSequence(htmlFormat.length() + 1); // space the trailing '\0'
-    rtl_zeroMemory(byteSequence.getArray(), byteSequence.getLength());
-
+    rtl_zeroMemory(byteSequence.getArray(), byteSequence.getLength());						
+        
     rtl_copyMemory(
         static_cast<void*>(byteSequence.getArray()),
         static_cast<const void*>(htmlFormat.c_str()),
         htmlFormat.length());
-
+    
     return byteSequence;
 }
 
@@ -112,7 +112,7 @@ Sequence<sal_Int8> HTMLFormatToTextHtml(const Sequence<sal_Int8>& aHTMLFormat)
 
   BOOST_ASSERT(htmlStartTag && "Seems to be no HTML at all");
 
-  // It doesn't seem to be HTML? Well then simply return what has been
+  // It doesn't seem to be HTML? Well then simply return what has been 
   // provided in non-debug builds
   if (htmlStartTag == NULL)
     {
@@ -130,7 +130,7 @@ Sequence<sal_Int8> HTMLFormatToTextHtml(const Sequence<sal_Int8>& aHTMLFormat)
 /* A simple format detection. We are just comparing the first few bytes
    of the provided byte sequence to see whether or not it is the MS
    Office Html format. If it shows that this is not reliable enough we
-   can improve this
+   can improve this 
 */
 const char HtmlFormatStart[] = "Version:";
 int HtmlFormatStartLen = (sizeof(HtmlFormatStart) - 1);
@@ -140,8 +140,8 @@ bool isHTMLFormat(const Sequence<sal_Int8>& aHtmlSequence)
   if (aHtmlSequence.getLength() < HtmlFormatStartLen)
     return false;
 
-  return rtl_str_compareIgnoreAsciiCase_WithLength(HtmlFormatStart,
-                                                   HtmlFormatStartLen,
-                                                   reinterpret_cast<const sal_Char*>(aHtmlSequence.getConstArray()),
+  return rtl_str_compareIgnoreAsciiCase_WithLength(HtmlFormatStart, 
+                                                   HtmlFormatStartLen, 
+                                                   reinterpret_cast<const sal_Char*>(aHtmlSequence.getConstArray()), 
                                                    HtmlFormatStartLen) == 0;
 }
diff --git a/vcl/aqua/source/dtrans/HtmlFmtFlt.hxx b/vcl/aqua/source/dtrans/HtmlFmtFlt.hxx
index 49f0cc70590c..a900c58a4e2c 100644
--- a/vcl/aqua/source/dtrans/HtmlFmtFlt.hxx
+++ b/vcl/aqua/source/dtrans/HtmlFmtFlt.hxx
@@ -3,7 +3,7 @@
 
 #include <com/sun/star/uno/Sequence.hxx>
 
-/* Transform plain HTML into the format expected by MS Office.
+/* Transform plain HTML into the format expected by MS Office. 
  */
 com::sun::star::uno::Sequence<sal_Int8> TextHtmlToHTMLFormat(com::sun::star::uno::Sequence<sal_Int8>& aTextHtml);
 
diff --git a/vcl/aqua/source/dtrans/OSXTransferable.cxx b/vcl/aqua/source/dtrans/OSXTransferable.cxx
index 2e6b327de446..9a8605ff4a00 100644
--- a/vcl/aqua/source/dtrans/OSXTransferable.cxx
+++ b/vcl/aqua/source/dtrans/OSXTransferable.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
@@ -48,7 +48,7 @@ using namespace com::sun::star::container;
 const Type CPPUTYPE_SEQINT8  = getCppuType((Sequence<sal_Int8>*)0);
 const Type CPPUTYPE_OUSTRING = getCppuType((OUString*)0);
 
-namespace // private
+namespace // private 
 {
     bool isValidFlavor( const DataFlavor& aFlavor )
     {
@@ -61,12 +61,12 @@ namespace // private
 
 
 OSXTransferable::OSXTransferable(const Reference<XMimeContentTypeFactory> rXMimeCntFactory,
-                                 DataFlavorMapperPtr_t pDataFlavorMapper,
+                                 DataFlavorMapperPtr_t pDataFlavorMapper,		  
                                  NSPasteboard* pasteboard) :
   mrXMimeCntFactory(rXMimeCntFactory),
   mDataFlavorMapper(pDataFlavorMapper),
   mPasteboard(pasteboard)
-{
+{		
   [mPasteboard retain];
 
   initClipboardItemList();
@@ -79,7 +79,7 @@ OSXTransferable::~OSXTransferable()
 }
 
 
-Any SAL_CALL OSXTransferable::getTransferData( const DataFlavor& aFlavor )
+Any SAL_CALL OSXTransferable::getTransferData( const DataFlavor& aFlavor ) 
   throw( UnsupportedFlavorException, IOException, RuntimeException )
 {
   if (!isValidFlavor(aFlavor) || !isDataFlavorSupported(aFlavor))
@@ -88,7 +88,7 @@ Any SAL_CALL OSXTransferable::getTransferData( const DataFlavor& aFlavor )
                                        static_cast<XTransferable*>(this));
     }
 
-  NSString* sysFormat =
+  NSString* sysFormat = 
       (aFlavor.MimeType.compareToAscii( "image/bmp", 9 ) == 0)
       ? mDataFlavorMapper->openOfficeImageToSystemFlavor( mPasteboard )
       : mDataFlavorMapper->openOfficeToSystemFlavor(aFlavor);
@@ -121,14 +121,14 @@ bool OSXTransferable::isUnicodeText(const DataFlavor& flavor)
 }
 
 
-Sequence< DataFlavor > SAL_CALL OSXTransferable::getTransferDataFlavors(  )
+Sequence< DataFlavor > SAL_CALL OSXTransferable::getTransferDataFlavors(  ) 
     throw( RuntimeException )
-{
+{	
   return mFlavorList;
 }
 
 
-sal_Bool SAL_CALL OSXTransferable::isDataFlavorSupported(const DataFlavor& aFlavor)
+sal_Bool SAL_CALL OSXTransferable::isDataFlavorSupported(const DataFlavor& aFlavor) 
     throw( RuntimeException )
 {
     for (sal_Int32 i = 0; i < mFlavorList.getLength(); i++)
@@ -142,13 +142,13 @@ sal_Bool SAL_CALL OSXTransferable::isDataFlavorSupported(const DataFlavor& aFlav
 void OSXTransferable::initClipboardItemList()
 {
   NSArray* pboardFormats = [mPasteboard types];
-
+  
   if (pboardFormats == NULL)
     {
-      throw RuntimeException(OUString(RTL_CONSTASCII_USTRINGPARAM("AquaClipboard: Cannot get clipboard data")),
+      throw RuntimeException(OUString(RTL_CONSTASCII_USTRINGPARAM("AquaClipboard: Cannot get clipboard data")), 
                              static_cast<XTransferable*>(this));
     }
-
+  
   mFlavorList = mDataFlavorMapper->typesArrayToFlavorSequence(pboardFormats);
 }
 
@@ -180,7 +180,7 @@ bool OSXTransferable::compareDataFlavors(const DataFlavor& lhs, const DataFlavor
 }
 
 
-bool OSXTransferable::cmpAllContentTypeParameter(const Reference<XMimeContentType> xLhs,
+bool OSXTransferable::cmpAllContentTypeParameter(const Reference<XMimeContentType> xLhs, 
                                                const Reference<XMimeContentType> xRhs) const
 {
   Sequence<OUString> xLhsFlavors = xLhs->getParameters();
@@ -191,12 +191,12 @@ bool OSXTransferable::cmpAllContentTypeParameter(const Reference<XMimeContentTyp
     return false;
 
   try
-    {
+    {	  
       OUString pLhs;
       OUString pRhs;
 
       for (sal_Int32 i = 0; i < xLhsFlavors.getLength(); i++)
-        {
+        {	
           pLhs = xLhs->getParameterValue(xLhsFlavors[i]);
           pRhs = xRhs->getParameterValue(xLhsFlavors[i]);
 
diff --git a/vcl/aqua/source/dtrans/OSXTransferable.hxx b/vcl/aqua/source/dtrans/OSXTransferable.hxx
index 6601905f1610..dde914db9d74 100644
--- a/vcl/aqua/source/dtrans/OSXTransferable.hxx
+++ b/vcl/aqua/source/dtrans/OSXTransferable.hxx
@@ -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
@@ -57,7 +57,7 @@ public:
 
   explicit OSXTransferable(com::sun::star::uno::Reference< ::com::sun::star::datatransfer::XMimeContentTypeFactory> rXMimeCntFactory,
                            DataFlavorMapperPtr_t pDataFlavorMapper,
-                           NSPasteboard* pasteboard);
+                           NSPasteboard* pasteboard); 
 
   virtual ~OSXTransferable();
 
@@ -65,13 +65,13 @@ public:
   // XTransferable
   //------------------------------------------------------------------------
 
-  virtual ::com::sun::star::uno::Any SAL_CALL getTransferData( const ::com::sun::star::datatransfer::DataFlavor& aFlavor )
+  virtual ::com::sun::star::uno::Any SAL_CALL getTransferData( const ::com::sun::star::datatransfer::DataFlavor& aFlavor ) 
     throw( ::com::sun::star::datatransfer::UnsupportedFlavorException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException );
 
-  virtual ::com::sun::star::uno::Sequence< ::com::sun::star::datatransfer::DataFlavor > SAL_CALL getTransferDataFlavors(  )
+  virtual ::com::sun::star::uno::Sequence< ::com::sun::star::datatransfer::DataFlavor > SAL_CALL getTransferDataFlavors(  ) 
     throw( ::com::sun::star::uno::RuntimeException );
-
-  virtual sal_Bool SAL_CALL isDataFlavorSupported( const ::com::sun::star::datatransfer::DataFlavor& aFlavor )
+    
+  virtual sal_Bool SAL_CALL isDataFlavorSupported( const ::com::sun::star::datatransfer::DataFlavor& aFlavor ) 
     throw( ::com::sun::star::uno::RuntimeException );
 
   //------------------------------------------------------------------------
@@ -87,11 +87,11 @@ public:
   bool compareDataFlavors( const com::sun::star::datatransfer::DataFlavor& lhs,
                            const com::sun::star::datatransfer::DataFlavor& rhs );
 
-  bool cmpAllContentTypeParameter( const com::sun::star::uno::Reference< com::sun::star::datatransfer::XMimeContentType > xLhs,
+  bool cmpAllContentTypeParameter( const com::sun::star::uno::Reference< com::sun::star::datatransfer::XMimeContentType > xLhs, 
                                    const com::sun::star::uno::Reference< com::sun::star::datatransfer::XMimeContentType > xRhs ) const;
 
 private:
-  com::sun::star::uno::Sequence< com::sun::star::datatransfer::DataFlavor > mFlavorList;
+  com::sun::star::uno::Sequence< com::sun::star::datatransfer::DataFlavor > mFlavorList;	
   ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::XMimeContentTypeFactory> mrXMimeCntFactory;
   DataFlavorMapperPtr_t mDataFlavorMapper;
   NSPasteboard* mPasteboard;
diff --git a/vcl/aqua/source/dtrans/PictToBmpFlt.cxx b/vcl/aqua/source/dtrans/PictToBmpFlt.cxx
index 1410fc2bd66d..a2db2ddd9250 100644
--- a/vcl/aqua/source/dtrans/PictToBmpFlt.cxx
+++ b/vcl/aqua/source/dtrans/PictToBmpFlt.cxx
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2008 by Sun Microsystems, Inc.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -28,14 +28,14 @@
  *
  ************************************************************************/
 
-/* This is a work-around to prevent 'deprecated' warning for 'KillPicture' API
+/* This is a work-around to prevent 'deprecated' warning for 'KillPicture' API 
    Hopefully we can get rid of this whole code again when the OOo PICT filter
    are good enough to be used see #i78953 thus this hack would vanish to again.
  */
 #include <premac.h>
 #include <AvailabilityMacros.h>
 #undef DEPRECATED_ATTRIBUTE
-#define DEPRECATED_ATTRIBUTE
+#define DEPRECATED_ATTRIBUTE 
 
 #include <Carbon/Carbon.h>
 #include <QuickTime/QuickTime.h>
@@ -43,10 +43,10 @@
 
 #include "PictToBmpFlt.hxx"
 
-bool PICTtoBMP(com::sun::star::uno::Sequence<sal_Int8>& aPict,
+bool PICTtoBMP(com::sun::star::uno::Sequence<sal_Int8>& aPict, 
                com::sun::star::uno::Sequence<sal_Int8>& aBmp)
 {
-
+    
   bool result = false;
 
   ComponentInstance bmpExporter;
@@ -64,7 +64,7 @@ bool PICTtoBMP(com::sun::star::uno::Sequence<sal_Int8>& aPict,
     }
 
   Handle hBmp;
-  if ((GraphicsExportSetInputPicture(bmpExporter, (PicHandle)hPict) != noErr) ||
+  if ((GraphicsExportSetInputPicture(bmpExporter, (PicHandle)hPict) != noErr) || 
       ((hBmp = NewHandleClear(0)) == NULL))
     {
       CloseComponent(bmpExporter);
@@ -83,7 +83,7 @@ bool PICTtoBMP(com::sun::star::uno::Sequence<sal_Int8>& aPict,
       HUnlock(hBmp);
 
       result = true;
-    }
+    } 
 
   DisposeHandle(hPict);
   DisposeHandle(hBmp);
@@ -92,14 +92,14 @@ bool PICTtoBMP(com::sun::star::uno::Sequence<sal_Int8>& aPict,
   return result;
 }
 
-bool BMPtoPICT(com::sun::star::uno::Sequence<sal_Int8>& aBmp,
+bool BMPtoPICT(com::sun::star::uno::Sequence<sal_Int8>& aBmp, 
                com::sun::star::uno::Sequence<sal_Int8>& aPict)
 {
   bool result = false;
 
   Handle hBmp;
   ComponentInstance pictExporter;
-  if ((PtrToHand(aBmp.getArray(), &hBmp, aBmp.getLength()) != noErr))
+  if ((PtrToHand(aBmp.getArray(), &hBmp, aBmp.getLength()) != noErr)) 
     {
       return result;
     }
@@ -111,7 +111,7 @@ bool BMPtoPICT(com::sun::star::uno::Sequence<sal_Int8>& aBmp,
       DisposeHandle(hBmp);
       return result;
     }
-
+  
   if (GraphicsImportSetDataHandle(pictExporter, hBmp) != noErr)
     {
       DisposeHandle(hBmp);
@@ -130,28 +130,28 @@ bool BMPtoPICT(com::sun::star::uno::Sequence<sal_Int8>& aBmp,
       HUnlock((Handle)hPict);
 
       // Release the data associated with the picture
-      // Note: This function is deprecated in Mac OS X
+      // Note: This function is deprecated in Mac OS X 
       // 10.4.
-      KillPicture(hPict);
+      KillPicture(hPict); 
 
       result = true;
     }
-
+  
   DisposeHandle(hBmp);
   CloseComponent(pictExporter);
-
+  
   return result;
 }
 
-bool ImageToBMP( com::sun::star::uno::Sequence<sal_Int8>& aPict,
+bool ImageToBMP( com::sun::star::uno::Sequence<sal_Int8>& aPict, 
                  com::sun::star::uno::Sequence<sal_Int8>& aBmp,
                  NSBitmapImageFileType eInFormat)
 {
     if( eInFormat == PICTImageFileType )
         return PICTtoBMP( aPict, aBmp );
-
+    
     bool bResult = false;
-
+    
     NSData* pData = [NSData dataWithBytesNoCopy: (void*)aPict.getConstArray() length: aPict.getLength() freeWhenDone: 0];
     if( pData )
     {
@@ -167,20 +167,20 @@ bool ImageToBMP( com::sun::star::uno::Sequence<sal_Int8>& aPict,
             }
         }
     }
-
+    
     return bResult;
 }
 
-bool BMPToImage( com::sun::star::uno::Sequence<sal_Int8>& aBmp,
+bool BMPToImage( com::sun::star::uno::Sequence<sal_Int8>& aBmp, 
                  com::sun::star::uno::Sequence<sal_Int8>& aPict,
                  NSBitmapImageFileType eOutFormat
                 )
 {
     if( eOutFormat == PICTImageFileType )
         return BMPtoPICT( aBmp, aPict );
-
+    
     bool bResult = false;
-
+    
     NSData* pData = [NSData dataWithBytesNoCopy: const_cast<sal_Int8*>(aBmp.getConstArray()) length: aBmp.getLength() freeWhenDone: 0];
     if( pData )
     {
@@ -196,6 +196,6 @@ bool BMPToImage( com::sun::star::uno::Sequence<sal_Int8>& aBmp,
             }
         }
     }
-
+    
     return bResult;
 }
diff --git a/vcl/aqua/source/dtrans/PictToBmpFlt.hxx b/vcl/aqua/source/dtrans/PictToBmpFlt.hxx
index 12a73452ad7b..24a8dba567a5 100644
--- a/vcl/aqua/source/dtrans/PictToBmpFlt.hxx
+++ b/vcl/aqua/source/dtrans/PictToBmpFlt.hxx
@@ -9,10 +9,10 @@
 
 /* Transform PICT into the a Window BMP.
 
-   Returns true if the conversion was successful false
+   Returns true if the conversion was successful false 
    otherwise.
  */
-bool PICTtoBMP(com::sun::star::uno::Sequence<sal_Int8>& aPict,
+bool PICTtoBMP(com::sun::star::uno::Sequence<sal_Int8>& aPict, 
                com::sun::star::uno::Sequence<sal_Int8>& aBmp);
 
 /* Transform a Windows BMP to a PICT.
@@ -20,16 +20,16 @@ bool PICTtoBMP(com::sun::star::uno::Sequence<sal_Int8>& aPict,
    Returns true if the conversion was successful false
    otherwise.
  */
-bool BMPtoPICT(com::sun::star::uno::Sequence<sal_Int8>& aBmp,
+bool BMPtoPICT(com::sun::star::uno::Sequence<sal_Int8>& aBmp, 
                com::sun::star::uno::Sequence<sal_Int8>& aPict);
 
 #define PICTImageFileType ((NSBitmapImageFileType)~0)
 
-bool ImageToBMP( com::sun::star::uno::Sequence<sal_Int8>& aPict,
+bool ImageToBMP( com::sun::star::uno::Sequence<sal_Int8>& aPict, 
                  com::sun::star::uno::Sequence<sal_Int8>& aBmp,
                  NSBitmapImageFileType eInFormat);
 
-bool BMPToImage( com::sun::star::uno::Sequence<sal_Int8>& aBmp,
+bool BMPToImage( com::sun::star::uno::Sequence<sal_Int8>& aBmp, 
                  com::sun::star::uno::Sequence<sal_Int8>& aPict,
                  NSBitmapImageFileType eOutFormat
                 );
diff --git a/vcl/aqua/source/dtrans/aqua_clipboard.cxx b/vcl/aqua/source/dtrans/aqua_clipboard.cxx
index 52fb13e1e11f..9b219238a957 100644
--- a/vcl/aqua/source/dtrans/aqua_clipboard.cxx
+++ b/vcl/aqua/source/dtrans/aqua_clipboard.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
@@ -52,12 +52,12 @@ using namespace comphelper;
 @implementation EventListener;
 
 -(EventListener*)initWithAquaClipboard: (AquaClipboard*) pcb
-{
+{ 
     self = [super init];
-
+    
     if (self)
         pAquaClipboard = pcb;
-
+    
     return self;
 }
 
@@ -102,9 +102,9 @@ AquaClipboard::AquaClipboard(NSPasteboard* pasteboard, bool bUseSystemPasteboard
      OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.datatransfer.MimeContentTypeFactory"))), UNO_QUERY);
 
   if (!mrXMimeCntFactory.is())
-    {
+    {	
       throw RuntimeException(OUString(
-            RTL_CONSTASCII_USTRINGPARAM("AquaClipboard: Cannot create com.sun.star.datatransfer.MimeContentTypeFactory")),
+            RTL_CONSTASCII_USTRINGPARAM("AquaClipboard: Cannot create com.sun.star.datatransfer.MimeContentTypeFactory")), 
             static_cast<XClipboardEx*>(this));
     }
 
@@ -117,13 +117,13 @@ AquaClipboard::AquaClipboard(NSPasteboard* pasteboard, bool bUseSystemPasteboard
     }
   else
     {
-      mPasteboard = bUseSystemPasteboard ? [NSPasteboard generalPasteboard] :
+      mPasteboard = bUseSystemPasteboard ? [NSPasteboard generalPasteboard] : 
         [NSPasteboard pasteboardWithName: NSDragPboard];
 
       if (mPasteboard == nil)
-        {
+        {	
           throw RuntimeException(OUString(
-                RTL_CONSTASCII_USTRINGPARAM("AquaClipboard: Cannot create Cocoa pasteboard")),
+                RTL_CONSTASCII_USTRINGPARAM("AquaClipboard: Cannot create Cocoa pasteboard")), 
                 static_cast<XClipboardEx*>(this));
         }
     }
@@ -137,7 +137,7 @@ AquaClipboard::AquaClipboard(NSPasteboard* pasteboard, bool bUseSystemPasteboard
       [mPasteboard release];
 
       throw RuntimeException(
-            OUString(RTL_CONSTASCII_USTRINGPARAM("AquaClipboard: Cannot create pasteboard change listener")),
+            OUString(RTL_CONSTASCII_USTRINGPARAM("AquaClipboard: Cannot create pasteboard change listener")), 
             static_cast<XClipboardEx*>(this));
     }
 
@@ -145,10 +145,10 @@ AquaClipboard::AquaClipboard(NSPasteboard* pasteboard, bool bUseSystemPasteboard
     {
       NSNotificationCenter* notificationCenter = [NSNotificationCenter defaultCenter];
 
-      [notificationCenter addObserver: mEventListener
-       selector: @selector(applicationDidBecomeActive:)
-       name: @"NSApplicationDidBecomeActiveNotification"
-       object: [NSApplication sharedApplication]];
+      [notificationCenter addObserver: mEventListener 
+       selector: @selector(applicationDidBecomeActive:) 
+       name: @"NSApplicationDidBecomeActiveNotification" 
+       object: [NSApplication sharedApplication]]; 
     }
 
   mPasteboardChangeCount = [mPasteboard changeCount];
@@ -157,7 +157,7 @@ AquaClipboard::AquaClipboard(NSPasteboard* pasteboard, bool bUseSystemPasteboard
 
 AquaClipboard::~AquaClipboard()
 {
-  if (mIsSystemPasteboard)
+  if (mIsSystemPasteboard) 
     {
       [[NSNotificationCenter defaultCenter] removeObserver: mEventListener];
     }
@@ -171,22 +171,22 @@ AquaClipboard::~AquaClipboard()
 Reference<XTransferable> SAL_CALL AquaClipboard::getContents() throw(RuntimeException)
 {
   MutexGuard aGuard(m_aMutex);
-
-  // Shortcut: If we are clipboard owner already we don't need
+  
+  // Shortcut: If we are clipboard owner already we don't need 
   // to drag the data through the system clipboard
   if (mXClipboardContent.is())
     {
       return mXClipboardContent;
     }
 
-  return Reference<XTransferable>(new OSXTransferable(mrXMimeCntFactory,
-                                                      mpDataFlavorMapper,
+  return Reference<XTransferable>(new OSXTransferable(mrXMimeCntFactory, 
+                                                      mpDataFlavorMapper, 
                                                       mPasteboard));
 }
 
 
-void SAL_CALL AquaClipboard::setContents(const Reference<XTransferable>& xTransferable,
-    const Reference<XClipboardOwner>& xClipboardOwner)
+void SAL_CALL AquaClipboard::setContents(const Reference<XTransferable>& xTransferable, 
+    const Reference<XClipboardOwner>& xClipboardOwner) 
         throw( RuntimeException )
 {
     NSArray* types = xTransferable.is() ?
@@ -194,24 +194,24 @@ void SAL_CALL AquaClipboard::setContents(const Reference<XTransferable>& xTransf
         [NSArray array];
 
     ClearableMutexGuard aGuard(m_aMutex);
-
+    
     Reference<XClipboardOwner> oldOwner(mXClipboardOwner);
     mXClipboardOwner = xClipboardOwner;
-
+    
     Reference<XTransferable> oldContent(mXClipboardContent);
     mXClipboardContent = xTransferable;
-
+    
     mPasteboardChangeCount = [mPasteboard declareTypes: types owner: mEventListener];
 
     aGuard.clear();
-
+    
     // if we are already the owner of the clipboard
     // then fire lost ownership event
     if (oldOwner.is())
     {
         fireLostClipboardOwnershipEvent(oldOwner, oldContent);
     }
-
+    
     fireClipboardChangedEvent();
 }
 
@@ -228,26 +228,26 @@ sal_Int8 SAL_CALL AquaClipboard::getRenderingCapabilities() throw( RuntimeExcept
 }
 
 
-void SAL_CALL AquaClipboard::addClipboardListener(const Reference< XClipboardListener >& listener)
+void SAL_CALL AquaClipboard::addClipboardListener(const Reference< XClipboardListener >& listener) 
   throw( RuntimeException )
 {
   MutexGuard aGuard(m_aMutex);
-
+  
   if (!listener.is())
-     throw IllegalArgumentException(OUString(RTL_CONSTASCII_USTRINGPARAM("empty reference")),
+     throw IllegalArgumentException(OUString(RTL_CONSTASCII_USTRINGPARAM("empty reference")), 
                                    static_cast<XClipboardEx*>(this), 1);
-
+  
   mClipboardListeners.push_back(listener);
 }
 
 
-void SAL_CALL AquaClipboard::removeClipboardListener(const Reference< XClipboardListener >& listener)
+void SAL_CALL AquaClipboard::removeClipboardListener(const Reference< XClipboardListener >& listener) 
   throw( RuntimeException )
 {
   MutexGuard aGuard(m_aMutex);
 
   if (!listener.is())
-     throw IllegalArgumentException(OUString(RTL_CONSTASCII_USTRINGPARAM("empty reference")),
+     throw IllegalArgumentException(OUString(RTL_CONSTASCII_USTRINGPARAM("empty reference")), 
                                    static_cast<XClipboardEx*>(this), 1);
 
   mClipboardListeners.remove(listener);
@@ -316,7 +316,7 @@ void AquaClipboard::fireLostClipboardOwnershipEvent(Reference<XClipboardOwner> o
   BOOST_ASSERT(oldOwner.is());
 
   try { oldOwner->lostOwnership(static_cast<XClipboardEx*>(this), oldContent); }
-  catch(RuntimeException&) { }
+  catch(RuntimeException&) { }	
 }
 
 
@@ -324,10 +324,10 @@ void AquaClipboard::provideDataForType(NSPasteboard* sender, NSString* type)
 {
   DataProviderPtr_t dp = mpDataFlavorMapper->getDataProvider(type, mXClipboardContent);
   NSData* pBoardData = NULL;
-
+  
   if (dp.get() != NULL)
   {
-      pBoardData = (NSData*)dp->getSystemData();
+      pBoardData = (NSData*)dp->getSystemData();      
       [sender setData: pBoardData forType: type];
   }
 }
@@ -336,19 +336,19 @@ void AquaClipboard::provideDataForType(NSPasteboard* sender, NSString* type)
 //------------------------------------------------
 // XFlushableClipboard
 //------------------------------------------------
-
-void SAL_CALL AquaClipboard::flushClipboard()
+    
+void SAL_CALL AquaClipboard::flushClipboard() 
   throw(RuntimeException)
 {
   if (mXClipboardContent.is())
     {
-          Sequence<DataFlavor> flavorList = mXClipboardContent->getTransferDataFlavors();
+          Sequence<DataFlavor> flavorList = mXClipboardContent->getTransferDataFlavors();	
         sal_uInt32 nFlavors = flavorList.getLength();
-
+        
         for (sal_uInt32 i = 0; i < nFlavors; i++)
           {
             NSString* sysType = mpDataFlavorMapper->openOfficeToSystemFlavor(flavorList[i]);
-
+            
             if (sysType != NULL)
               {
                 provideDataForType(mPasteboard, sysType);
diff --git a/vcl/aqua/source/dtrans/aqua_clipboard.hxx b/vcl/aqua/source/dtrans/aqua_clipboard.hxx
index 8f45f50717f3..660997311c96 100644
--- a/vcl/aqua/source/dtrans/aqua_clipboard.hxx
+++ b/vcl/aqua/source/dtrans/aqua_clipboard.hxx
@@ -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
@@ -71,22 +71,22 @@ class AquaClipboard;
 
 
 class AquaClipboard : public ::cppu::BaseMutex,
-                      public ::cppu::WeakComponentImplHelper4< com::sun::star::datatransfer::clipboard::XClipboardEx,
-                                                               com::sun::star::datatransfer::clipboard::XClipboardNotifier,
+                      public ::cppu::WeakComponentImplHelper4< com::sun::star::datatransfer::clipboard::XClipboardEx, 
+                                                               com::sun::star::datatransfer::clipboard::XClipboardNotifier, 
                                                                com::sun::star::datatransfer::clipboard::XFlushableClipboard,
                                                                com::sun::star::lang::XServiceInfo >,
                       private ::boost::noncopyable
 {
 public:
-  /* Create a clipboard instance.
-
-     @param pasteboard
+  /* Create a clipboard instance. 
+     
+     @param pasteboard 
      If not equal NULL the instance will be instantiated with the provided
      pasteboard reference and 'bUseSystemClipboard' will be ignored
 
      @param bUseSystemClipboard
      If 'pasteboard' is NULL 'bUseSystemClipboard' determines whether the
-     system clipboard will be created (bUseSystemClipboard == true) or if
+     system clipboard will be created (bUseSystemClipboard == true) or if 
      the DragPasteboard if bUseSystemClipboard == false
    */
   AquaClipboard(NSPasteboard* pasteboard = NULL,
@@ -97,51 +97,51 @@ public:
   //------------------------------------------------
   // XClipboard
   //------------------------------------------------
-
-  virtual ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::XTransferable > SAL_CALL getContents()
+    
+  virtual ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::XTransferable > SAL_CALL getContents() 
     throw( ::com::sun::star::uno::RuntimeException );
 
-  virtual void SAL_CALL setContents( const ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::XTransferable >& xTransferable,
-                                     const ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::clipboard::XClipboardOwner >& xClipboardOwner )
+  virtual void SAL_CALL setContents( const ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::XTransferable >& xTransferable, 
+                                     const ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::clipboard::XClipboardOwner >& xClipboardOwner ) 
     throw( ::com::sun::star::uno::RuntimeException );
 
-  virtual ::rtl::OUString SAL_CALL getName()
+  virtual ::rtl::OUString SAL_CALL getName() 
     throw( ::com::sun::star::uno::RuntimeException );
 
   //------------------------------------------------
-  // XClipboardEx
+  // XClipboardEx 
   //------------------------------------------------
 
   virtual sal_Int8 SAL_CALL getRenderingCapabilities()
     throw( ::com::sun::star::uno::RuntimeException );
 
   //------------------------------------------------
-  // XClipboardNotifier
+  // XClipboardNotifier 
   //------------------------------------------------
 
-  virtual void SAL_CALL addClipboardListener( const ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::clipboard::XClipboardListener >& listener )
+  virtual void SAL_CALL addClipboardListener( const ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::clipboard::XClipboardListener >& listener ) 
     throw( ::com::sun::star::uno::RuntimeException );
 
-  virtual void SAL_CALL removeClipboardListener( const ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::clipboard::XClipboardListener >& listener )
+  virtual void SAL_CALL removeClipboardListener( const ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::clipboard::XClipboardListener >& listener ) 
     throw( ::com::sun::star::uno::RuntimeException );
 
   //------------------------------------------------
   // XFlushableClipboard
   //------------------------------------------------
-
+    
   virtual void SAL_CALL flushClipboard( ) throw( com::sun::star::uno::RuntimeException );
 
   //------------------------------------------------
   // XServiceInfo
-  //------------------------------------------------
+  //------------------------------------------------ 
 
   virtual ::rtl::OUString SAL_CALL getImplementationName()
     throw(::com::sun::star::uno::RuntimeException);
 
-  virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName )
+  virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) 
     throw(::com::sun::star::uno::RuntimeException);
 
-  virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames()
+  virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() 
     throw(::com::sun::star::uno::RuntimeException);
 
   /* Get a reference to the used pastboard.
diff --git a/vcl/aqua/source/dtrans/aqua_service.cxx b/vcl/aqua/source/dtrans/aqua_service.cxx
index 571bea2e554f..728feea0ddd5 100644
--- a/vcl/aqua/source/dtrans/aqua_service.cxx
+++ b/vcl/aqua/source/dtrans/aqua_service.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
@@ -49,7 +49,7 @@ Reference< XInterface > SAL_CALL createInstance( const Reference< XMultiServiceF
 
 } // namespace aqua
 
-extern "C"
+extern "C" 
 {
 
 void SAL_CALL component_getImplementationEnvironment(
@@ -66,13 +66,13 @@ sal_Bool SAL_CALL component_writeInfo( void* pServiceManager, void* pRegistryKey
     {
         try
         {
-            Reference< XRegistryKey > pXNewKey( static_cast< XRegistryKey* >( pRegistryKey ) );
+            Reference< XRegistryKey > pXNewKey( static_cast< XRegistryKey* >( pRegistryKey ) );							
             pXNewKey->createKey( OUString( RTL_CONSTASCII_USTRINGPARAM( AQUA_CLIPBOARD_REGKEY_NAME ) ) );
             bRetVal = sal_True;
         }
         catch( InvalidRegistryException& )
-        {
-            OSL_ENSURE(sal_False, "InvalidRegistryException caught");
+        {			
+            OSL_ENSURE(sal_False, "InvalidRegistryException caught");			
             bRetVal = sal_False;
         }
     }
@@ -87,8 +87,8 @@ void* SAL_CALL component_getFactory( const sal_Char* pImplName, uno_Interface* p
     if ( pSrvManager && ( 0 == rtl_str_compare( pImplName, AQUA_CLIPBOARD_IMPL_NAME ) ) )
     {
         Sequence< OUString > aSNS( 1 );
-        aSNS.getArray()[0] = OUString( RTL_CONSTASCII_USTRINGPARAM( AQUA_CLIPBOARD_SERVICE_NAME ) );
-
+        aSNS.getArray()[0] = OUString( RTL_CONSTASCII_USTRINGPARAM( AQUA_CLIPBOARD_SERVICE_NAME ) );		
+        
         //OUString( RTL_CONSTASCII_USTRINGPARAM( FPS_IMPL_NAME ) )
         Reference< XSingleServiceFactory > xFactory ( createOneInstanceFactory(
             reinterpret_cast< XMultiServiceFactory* > ( pSrvManager ),
@@ -99,7 +99,7 @@ void* SAL_CALL component_getFactory( const sal_Char* pImplName, uno_Interface* p
         {
             xFactory->acquire();
             pRet = xFactory.get();
-        }
+        }			
     }
 
     return pRet;
diff --git a/vcl/aqua/source/dtrans/service_entry.cxx b/vcl/aqua/source/dtrans/service_entry.cxx
index 16308951bcfe..75a40b4274bd 100644
--- a/vcl/aqua/source/dtrans/service_entry.cxx
+++ b/vcl/aqua/source/dtrans/service_entry.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
diff --git a/vcl/aqua/source/dtrans/test_aquacb.cxx b/vcl/aqua/source/dtrans/test_aquacb.cxx
index 85c87c6b9ba9..4dba710c9ae0 100644
--- a/vcl/aqua/source/dtrans/test_aquacb.cxx
+++ b/vcl/aqua/source/dtrans/test_aquacb.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
@@ -45,26 +45,26 @@
 
 #include <stdio.h>
 
-using namespace ::rtl;
+using namespace	::rtl;
 using namespace ::std;
 using namespace ::cppu;
 using namespace ::com::sun::star::datatransfer;
 using namespace ::com::sun::star::datatransfer::clipboard;
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::io;
-using namespace ::com::sun::star::lang;
+using namespace	::com::sun::star::lang;
 
 Reference< XTransferable > rXTransfRead;
 
 class TestTransferable : public WeakImplHelper2< XClipboardOwner, XTransferable >
 {
-public:
+public:	
     TestTransferable();
     virtual Any SAL_CALL getTransferData( const DataFlavor& aFlavor ) throw(UnsupportedFlavorException, IOException, RuntimeException);
     virtual Sequence< DataFlavor > SAL_CALL getTransferDataFlavors() throw(RuntimeException);
     virtual sal_Bool SAL_CALL isDataFlavorSupported( const DataFlavor& aFlavor ) throw(RuntimeException);
     virtual void SAL_CALL lostOwnership( const Reference< XClipboard >& xClipboard, const Reference< XTransferable >& xTrans ) throw(RuntimeException);
-
+    
 private:
     Sequence< DataFlavor > m_seqDFlv;
     OUString               m_Data;
@@ -75,16 +75,16 @@ TestTransferable::TestTransferable() :
     m_Data( RTL_CONSTASCII_USTRINGPARAM( "This is a test string" ) )
 {
     DataFlavor df;
-
+    
     df.MimeType = OUString::createFromAscii( "text/html" );
     df.DataType = getCppuType( ( Sequence< sal_Int8 >* )0 );
 
-    m_seqDFlv[0] = df;
+    m_seqDFlv[0] = df;	
 }
 
-Any SAL_CALL TestTransferable::getTransferData( const DataFlavor& aFlavor )
+Any SAL_CALL TestTransferable::getTransferData( const DataFlavor& aFlavor ) 
     throw(UnsupportedFlavorException, IOException, RuntimeException)
-{
+{	
     Any anyData;
 
     if ( aFlavor.MimeType == m_seqDFlv[0].MimeType )
@@ -102,13 +102,13 @@ Any SAL_CALL TestTransferable::getTransferData( const DataFlavor& aFlavor )
     return anyData;
 }
 
-Sequence< DataFlavor > SAL_CALL TestTransferable::getTransferDataFlavors()
+Sequence< DataFlavor > SAL_CALL TestTransferable::getTransferDataFlavors() 
     throw(RuntimeException)
 {
     return m_seqDFlv;
 }
 
-sal_Bool SAL_CALL TestTransferable::isDataFlavorSupported( const DataFlavor& aFlavor )
+sal_Bool SAL_CALL TestTransferable::isDataFlavorSupported( const DataFlavor& aFlavor ) 
     throw(RuntimeException)
 {
     sal_Int32 nLength = m_seqDFlv.getLength();
@@ -126,7 +126,7 @@ sal_Bool SAL_CALL TestTransferable::isDataFlavorSupported( const DataFlavor& aFl
     return bRet;
 }
 
-void SAL_CALL TestTransferable::lostOwnership( const Reference< XClipboard >& xClipboard, const Reference< XTransferable >& xTrans )
+void SAL_CALL TestTransferable::lostOwnership( const Reference< XClipboard >& xClipboard, const Reference< XTransferable >& xTrans ) 
     throw(RuntimeException)
 {
 }
@@ -198,11 +198,11 @@ int SAL_CALL main( int argc, char** argv )
 
     if ( !xComponent.is() )
         OSL_ENSURE(sal_False, "Error shuting down");
-
+    
     // Dispose and clear factory
     xComponent->dispose();
     g_xFactory.clear();
     g_xFactory = Reference< XMultiServiceFactory >();
 
-    return 0;
+    return 0;	
 }
diff --git a/vcl/aqua/source/gdi/salatslayout.cxx b/vcl/aqua/source/gdi/salatslayout.cxx
index 335505de85ac..3157afe74113 100755
--- a/vcl/aqua/source/gdi/salatslayout.cxx
+++ b/vcl/aqua/source/gdi/salatslayout.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
@@ -42,11 +42,11 @@ public:
                     ATSLayout( ATSUStyle&, float fFontScale );
     virtual         ~ATSLayout();
 
-    virtual bool    LayoutText( ImplLayoutArgs& );
-    virtual void    AdjustLayout( ImplLayoutArgs& );
-    virtual void    DrawText( SalGraphics& ) const;
+    virtual bool	LayoutText( ImplLayoutArgs& );
+    virtual void	AdjustLayout( ImplLayoutArgs& );
+    virtual void	DrawText( SalGraphics& ) const;
 
-    virtual int     GetNextGlyphs( int nLen, sal_GlyphId* pGlyphs, Point& rPos, int&,
+    virtual int		GetNextGlyphs( int nLen, sal_GlyphId* pGlyphs, Point& rPos, int&,
                         sal_Int32* pGlyphAdvances, int* pCharIndexes ) const;
 
     virtual long    GetTextWidth() const;
@@ -64,49 +64,49 @@ public:
     virtual void    Simplify( bool bIsBase );
 
 private:
-    ATSUStyle&          mrATSUStyle;
-    ATSUTextLayout      maATSULayout;
-    int                 mnCharCount;        // ==mnEndCharPos-mnMinCharPos
+    ATSUStyle&			mrATSUStyle;
+    ATSUTextLayout		maATSULayout;
+    int					mnCharCount;		// ==mnEndCharPos-mnMinCharPos
     // to prevent ATS overflowing the Fixed16.16 values
     // ATS font requests get size limited by downscaling huge fonts
     // in these cases the font scale becomes something bigger than 1.0
-    float               mfFontScale;
+    float				mfFontScale;
 
 private:
-    bool    InitGIA( ImplLayoutArgs* pArgs = NULL ) const;
-    bool    GetIdealX() const;
-    bool    GetDeltaY() const;
-    void    InvalidateMeasurements();
+    bool	InitGIA( ImplLayoutArgs* pArgs = NULL ) const;
+    bool	GetIdealX() const;
+    bool	GetDeltaY() const;
+    void	InvalidateMeasurements();
 
-    int Fixed2Vcl( Fixed ) const;       // convert ATSU-Fixed units to VCL units
-    int AtsuPix2Vcl( int ) const;       // convert ATSU-Pixel units to VCL units
-    Fixed   Vcl2Fixed( int ) const;     // convert VCL units to ATSU-Fixed units
+    int	Fixed2Vcl( Fixed ) const;       // convert ATSU-Fixed units to VCL units
+    int	AtsuPix2Vcl( int ) const;       // convert ATSU-Pixel units to VCL units
+    Fixed	Vcl2Fixed( int ) const;     // convert VCL units to ATSU-Fixed units
 
     // cached details about the resulting layout
     // mutable members since these details are all lazy initialized
-    mutable int         mnGlyphCount;           // glyph count
-    mutable Fixed       mnCachedWidth;          // cached value of resulting typographical width
-    int                 mnTrailingSpaceWidth;   // in Pixels
-
-    mutable ATSGlyphRef*    mpGlyphIds;         // ATSU glyph ids
-    mutable Fixed*          mpCharWidths;       // map relative charpos to charwidth
-    mutable int*            mpChars2Glyphs;     // map relative charpos to absolute glyphpos
-    mutable int*            mpGlyphs2Chars;     // map absolute glyphpos to absolute charpos
-    mutable bool*           mpGlyphRTLFlags;    // BiDi status for glyphs: true if RTL
-    mutable Fixed*          mpGlyphAdvances;    // contains glyph widths for the justified layout
-    mutable Fixed*          mpGlyphOrigAdvs;    // contains glyph widths for the unjustified layout
-    mutable Fixed*          mpDeltaY;           // vertical offset from the baseline
+    mutable int			mnGlyphCount;			// glyph count
+    mutable Fixed		mnCachedWidth;			// cached value of resulting typographical width
+    int					mnTrailingSpaceWidth;   // in Pixels
+
+    mutable ATSGlyphRef*	mpGlyphIds;			// ATSU glyph ids
+    mutable Fixed*			mpCharWidths;       // map relative charpos to charwidth
+    mutable int*			mpChars2Glyphs;     // map relative charpos to absolute glyphpos
+    mutable int*			mpGlyphs2Chars;     // map absolute glyphpos to absolute charpos
+    mutable bool*			mpGlyphRTLFlags;    // BiDi status for glyphs: true if RTL
+    mutable Fixed*			mpGlyphAdvances;	// contains glyph widths for the justified layout
+    mutable Fixed*			mpGlyphOrigAdvs;	// contains glyph widths for the unjustified layout
+    mutable Fixed*			mpDeltaY;			// vertical offset from the baseline
 
     struct SubPortion { int mnMinCharPos, mnEndCharPos; Fixed mnXOffset; };
     typedef std::vector<SubPortion> SubPortionVector;
-    mutable SubPortionVector    maSubPortions;      // Writer&ATSUI layouts can differ quite a bit...
+    mutable SubPortionVector	maSubPortions;		// Writer&ATSUI layouts can differ quite a bit... 
 
     // storing details about fonts used in glyph-fallback for this layout
-    mutable class FallbackInfo* mpFallbackInfo;
+    mutable class FallbackInfo*	mpFallbackInfo;
 
     // x-offset relative to layout origin
     // currently only used in RTL-layouts
-    mutable Fixed           mnBaseAdv;
+    mutable Fixed			mnBaseAdv;
 };
 
 class FallbackInfo
@@ -154,7 +154,7 @@ ATSLayout::~ATSLayout()
 
     if( maATSULayout )
         ATSUDisposeTextLayout( maATSULayout );
-
+        
     delete[] mpGlyphRTLFlags;
     delete[] mpGlyphs2Chars;
     delete[] mpChars2Glyphs;
@@ -180,7 +180,7 @@ inline int ATSLayout::Fixed2Vcl( Fixed nFixed ) const
 inline int ATSLayout::AtsuPix2Vcl( int nAtsuPixel) const
 {
     float fVclPixel = mfFontScale * nAtsuPixel;
-    fVclPixel += (fVclPixel>=0) ? +0.5 : -0.5;  // prepare rounding to int
+    fVclPixel += (fVclPixel>=0) ? +0.5 : -0.5;	// prepare rounding to int
     int nVclPixel = static_cast<int>( fVclPixel);
     return nVclPixel;
 }
@@ -199,8 +199,8 @@ inline Fixed ATSLayout::Vcl2Fixed( int nPixel ) const
  * @param rArgs: contains array of char to be layouted, starting and ending position of the text to layout
  *
  * Typographic layout of text by using the style maATSUStyle
- *
- * @return : true if everything is ok
+ *	
+ * @return : true if everything is ok	
 **/
 bool ATSLayout::LayoutText( ImplLayoutArgs& rArgs )
 {
@@ -210,7 +210,7 @@ bool ATSLayout::LayoutText( ImplLayoutArgs& rArgs )
     maATSULayout = NULL;
 
     // Layout text
-    // set up our locals, verify parameters...
+    // set up our locals, verify parameters... 
     DBG_ASSERT( (rArgs.mpStr!=NULL), "ATSLayout::LayoutText() with rArgs.mpStr==NULL !!!");
     DBG_ASSERT( (mrATSUStyle!=NULL), "ATSLayout::LayoutText() with ATSUStyle==NULL !!!");
 
@@ -290,8 +290,8 @@ bool ATSLayout::LayoutText( ImplLayoutArgs& rArgs )
  * @param rArgs: contains attributes relevant to do a text specific layout
  *
  * Adjust text layout by moving glyphs to match the requested logical widths
- *
- * @return : none
+ *	
+ * @return : none	
 **/
 void ATSLayout::AdjustLayout( ImplLayoutArgs& rArgs )
 {
@@ -333,7 +333,7 @@ void ATSLayout::AdjustLayout( ImplLayoutArgs& rArgs )
 
     // changing the layout will make all previous measurements invalid
     InvalidateMeasurements();
-
+        
     ATSUAttributeTag nTags[3];
     ATSUAttributeValuePtr nVals[3];
     ByteCount nBytes[3];
@@ -370,17 +370,17 @@ void ATSLayout::AdjustLayout( ImplLayoutArgs& rArgs )
  *
  * Draw the layouted text to the CGContext
  *
- * @return : none
+ * @return : none	
 **/
 void ATSLayout::DrawText( SalGraphics& rGraphics ) const
 {
     AquaSalGraphics& rAquaGraphics = static_cast<AquaSalGraphics&>(rGraphics);
-
-    // short circuit if there is nothing to do
+    
+    // short circuit if there is nothing to do	
     if( (mnCharCount <= 0)
     ||  !rAquaGraphics.CheckContext() )
         return;
-
+        
     // the view is vertically flipped => flipped glyphs
     // so apply a temporary transformation that it flips back
     // also compensate if the font was size limited
@@ -472,7 +472,7 @@ void ATSLayout::DrawText( SalGraphics& rGraphics ) const
  * ATSLayout::GetNextGlyphs : Get info about next glyphs in the layout
  *
  * @param nLen: max number of char
- * @param pGlyphs: returned array of glyph ids
+ * @param pGlyphs: returned array of glyph ids 
  * @param rPos: returned x starting position
  * @param nStart: index of the first requested glyph
  * @param pGlyphAdvances: returned array of glyphs advances
@@ -579,14 +579,14 @@ int ATSLayout::GetNextGlyphs( int nLen, sal_GlyphId* pGlyphIDs, Point& rPos, int
                 nCharPos = nStart + mnMinCharPos;
             *(pCharIndexes++) = nCharPos;
         }
-
+            
         // stop at last glyph
         if( ++nStart >= mnGlyphCount )
             break;
 
         // stop when next the x-position is unexpected
         if( !maSubPortions.empty() )
-            break;   // TODO: finish the complete sub-portion
+            break;	 // TODO: finish the complete sub-portion
         if( !pGlyphAdvances && mpGlyphOrigAdvs )
             if( mpGlyphAdvances[nStart-1] != mpGlyphOrigAdvs[nStart-1] )
                 break;
@@ -606,7 +606,7 @@ int ATSLayout::GetNextGlyphs( int nLen, sal_GlyphId* pGlyphIDs, Point& rPos, int
  *
  * Get typographic bounds of the text
  *
- * @return : text width
+ * @return : text width	
 **/
 long ATSLayout::GetTextWidth() const
 {
@@ -683,7 +683,7 @@ long ATSLayout::FillDXArray( long* pDXArray ) const
     DBG_ASSERT( !mnTrailingSpaceWidth, "ATSLayout::FillDXArray() with nTSW!=0" );
 
     // initialize details about the resulting layout
-    InitGIA();
+    InitGIA(); 
 
     // distribute the widths among the string elements
     int nPixWidth = 0;
@@ -711,7 +711,7 @@ long ATSLayout::FillDXArray( long* pDXArray ) const
  * Measure the layouted text to find the typographical line break
  * the result is needed by the language specific line breaking
  *
- * @return : string index corresponding to the suggested line break
+ * @return : string index corresponding to the suggested line break	
 **/
 int ATSLayout::GetTextBreak( long nMaxWidth, long nCharExtra, int nFactor ) const
 {
@@ -753,7 +753,7 @@ int ATSLayout::GetTextBreak( long nMaxWidth, long nCharExtra, int nFactor ) cons
 
     // initial measurement of text break position
     UniCharArrayOffset nBreakPos = mnMinCharPos;
-    const ATSUTextMeasurement nATSUMaxWidth = Vcl2Fixed( nPixelWidth );
+    const ATSUTextMeasurement nATSUMaxWidth = Vcl2Fixed( nPixelWidth ); 
     OSStatus eStatus = ATSUBreakLine( maATSULayout, mnMinCharPos,
         nATSUMaxWidth, false, &nBreakPos );
 
@@ -796,7 +796,7 @@ int ATSLayout::GetTextBreak( long nMaxWidth, long nCharExtra, int nFactor ) cons
  *
  * Fill the array of positions of carets (for cursors and selections)
  *
- * @return : none
+ * @return : none	
 **/
 void ATSLayout::GetCaretPositions( int nMaxIndex, long* pCaretXArray ) const
 {
@@ -819,7 +819,7 @@ void ATSLayout::GetCaretPositions( int nMaxIndex, long* pCaretXArray ) const
             &aCaret0, &aCaret1, &bIsSplit );
         if( eStatus != noErr )
             continue;
-        const Fixed nFixedPos = mnBaseAdv + aCaret0.fX;
+        const Fixed nFixedPos = mnBaseAdv + aCaret0.fX; 
         // convert the measurement to pixel units
         const int nPixelPos = Fixed2Vcl( nFixedPos );
         // update previous trailing position
@@ -840,7 +840,7 @@ void ATSLayout::GetCaretPositions( int nMaxIndex, long* pCaretXArray ) const
  *
  * Get ink bounds of the text
  *
- * @return : measurement valid
+ * @return : measurement valid	
 **/
 bool ATSLayout::GetBoundRect( SalGraphics&, Rectangle& rVCLRect ) const
 {
@@ -867,7 +867,7 @@ bool ATSLayout::GetBoundRect( SalGraphics&, Rectangle& rVCLRect ) const
  * ATSLayout::InitGIA() : get many informations about layouted text
  *
  * Fills arrays of information about the gylph layout previously done
- *  in ASTLayout::LayoutText() : glyph advance (width), glyph delta Y (from baseline),
+ *	in ASTLayout::LayoutText() : glyph advance (width), glyph delta Y (from baseline),
  *  mapping between glyph index and character index, chars widths
  *
  * @return : true if everything could be computed, otherwise false
@@ -878,14 +878,14 @@ bool ATSLayout::InitGIA( ImplLayoutArgs* pArgs ) const
     if( mnGlyphCount >= 0 )
         return true;
     mnGlyphCount = 0;
-
+        
     // Workaround a bug in ATSUI with empty string
     if( mnCharCount <=  0 )
         return false;
 
     // initialize character details
-    mpCharWidths    = new Fixed[ mnCharCount ];
-    mpChars2Glyphs  = new int[ mnCharCount ];
+    mpCharWidths	= new Fixed[ mnCharCount ];
+    mpChars2Glyphs	= new int[ mnCharCount ];
     for( int n = 0; n < mnCharCount; ++n )
     {
         mpCharWidths[ n ] = 0;
@@ -905,8 +905,8 @@ bool ATSLayout::InitGIA( ImplLayoutArgs* pArgs ) const
 
     // initialize glyph details
     mpGlyphIds      = new ATSGlyphRef[ iLayoutDataCount ];
-    mpGlyphAdvances = new Fixed[ iLayoutDataCount ];
-    mpGlyphs2Chars  = new int[ iLayoutDataCount ];
+    mpGlyphAdvances	= new Fixed[ iLayoutDataCount ];
+    mpGlyphs2Chars	= new int[ iLayoutDataCount ];
 
     // measure details of the glyph layout
     Fixed nLeftPos = 0;
@@ -918,7 +918,7 @@ bool ATSLayout::InitGIA( ImplLayoutArgs* pArgs ) const
         const int nRelativeIdx = (rALR.originalOffset / 2);
         if( i+1 < iLayoutDataCount )
             mpCharWidths[ nRelativeIdx ] += pALR[i+1].realPos - rALR.realPos;
-
+        
         // new glyph is available => finish measurement of old glyph
         if( mnGlyphCount > 0 )
             mpGlyphAdvances[ mnGlyphCount-1 ] = rALR.realPos - nLeftPos;
@@ -1060,17 +1060,17 @@ bool ATSLayout::GetDeltaY() const
 
     if( mpDeltaY == NULL )
         return true;
-
+    
     if( nDeltaCount != (ItemCount)mnGlyphCount )
     {
         DBG_WARNING( "ATSLayout::GetDeltaY() : wrong deltaY count!" );
         ATSUDirectReleaseLayoutDataArrayPtr( NULL,
-            kATSUDirectDataBaselineDeltaFixedArray, (void**)&mpDeltaY );
+            kATSUDirectDataBaselineDeltaFixedArray,	(void**)&mpDeltaY );
         mpDeltaY = NULL;
         return false;
     }
 #endif
-
+    
     return true;
 }
 
@@ -1101,34 +1101,34 @@ public:
                 PolyArgs();
                 ~PolyArgs();
 
-    void        Init( PolyPolygon* pPolyPoly, long nXOffset, long nYOffset );
-    void        AddPoint( const Float32Point&, PolyFlags );
-    void        ClosePolygon();
+    void		Init( PolyPolygon* pPolyPoly, long nXOffset, long nYOffset );
+    void		AddPoint( const Float32Point&, PolyFlags );
+    void		ClosePolygon();
 
 private:
     PolyPolygon* mpPolyPoly;
-    long        mnXOffset, mnYOffset;
+    long		mnXOffset, mnYOffset;
 
-    Point*      mpPointAry;
-    BYTE*       mpFlagAry;
-    USHORT      mnMaxPoints;
+    Point*		mpPointAry;
+    BYTE*		mpFlagAry;
+    USHORT		mnMaxPoints;
 
-    USHORT      mnPointCount;
-    USHORT      mnPolyCount;
-    bool        mbHasOffline;
+    USHORT		mnPointCount;
+    USHORT		mnPolyCount;
+    bool		mbHasOffline;
 };
 
 // -----------------------------------------------------------------------
 
 PolyArgs::PolyArgs()
-:   mpPolyPoly(NULL),
+:	mpPolyPoly(NULL),
     mnPointCount(0),
     mnPolyCount(0),
     mbHasOffline(false)
 {
     mnMaxPoints = 256;
-    mpPointAry  = new Point[ mnMaxPoints ];
-    mpFlagAry   = new BYTE [ mnMaxPoints ];
+    mpPointAry	= new Point[ mnMaxPoints ];
+    mpFlagAry	= new BYTE [ mnMaxPoints ];
 }
 
 // -----------------------------------------------------------------------
diff --git a/vcl/aqua/source/gdi/salatsuifontutils.cxx b/vcl/aqua/source/gdi/salatsuifontutils.cxx
index 8281c41ceeab..b051aafbd254 100644
--- a/vcl/aqua/source/gdi/salatsuifontutils.cxx
+++ b/vcl/aqua/source/gdi/salatsuifontutils.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
@@ -215,10 +215,10 @@ static bool GetDevFontAttributes( ATSUFontID nFontID, ImplDevFontAttributes& rDF
         return false;
 
     // all scalable fonts on this platform are subsettable
-    rDFA.mbSubsettable  = true;
-    rDFA.mbEmbeddable   = false;
+    rDFA.mbSubsettable	= true;
+    rDFA.mbEmbeddable	= false;
 
-    // prepare iterating over all name strings of the font
+    // prepare iterating over all name strings of the font	
     ItemCount nFontNameCount = 0;
     rc = ATSUCountFontNames( nFontID, &nFontNameCount );
     if( rc != noErr )
@@ -235,9 +235,9 @@ static bool GetDevFontAttributes( ATSUFontID nFontID, ImplDevFontAttributes& rDF
     {
         ByteCount nNameLength = 0;
 
-        FontNameCode     eFontNameCode;
-        FontPlatformCode eFontNamePlatform;
-        FontScriptCode   eFontNameScript;
+        FontNameCode     eFontNameCode; 
+        FontPlatformCode eFontNamePlatform; 
+        FontScriptCode   eFontNameScript; 
         FontLanguageCode eFontNameLanguage;
         rc = ATSUGetIndFontName( nFontID, nNameIndex, 0, NULL,
             &nNameLength, &eFontNameCode, &eFontNamePlatform, &eFontNameScript, &eFontNameLanguage );
@@ -266,13 +266,13 @@ static bool GetDevFontAttributes( ATSUFontID nFontID, ImplDevFontAttributes& rDF
             case 0x30A: nNameValue += 0;            // Win-UCS-4
                         eEncoding = RTL_TEXTENCODING_UCS4;
                         break;
-            case 0x100: nNameValue += 21;           // Mac Roman
+            case 0x100: nNameValue += 21; 	        // Mac Roman
                         eEncoding = RTL_TEXTENCODING_APPLE_ROMAN;
                         break;
             case 0x300: nNameValue =  0;            // Win Symbol encoded name!
                         rDFA.mbSymbolFlag = true;   // (often seen for symbol fonts)
                         break;
-            default:    nNameValue = 0;             // ignore other encodings
+            default:    nNameValue = 0;	            // ignore other encodings
             break;
         }
 
@@ -344,7 +344,7 @@ static bool GetDevFontAttributes( ATSUFontID nFontID, ImplDevFontAttributes& rDF
     }
 
 #if 0 // multiple-master fonts are mostly obsolete nowadays
-      // if we still want to support them this should probably be done one frame higher
+      // if we still want to support them this should probably be done one frame higher 
     ItemCount nMaxInstances = 0;
     rc = ATSUCountFontInstances ( nFontID, &nMaxInstances );
     for( ItemCount nInstanceIndex = 0; nInstanceIndex < nMaxInstances; ++nInstanceIndex )
@@ -359,7 +359,7 @@ static bool GetDevFontAttributes( ATSUFontID nFontID, ImplDevFontAttributes& rDF
             VariationAxisVector aVariationAxes( nMaxVariations );
             VariationValueVector aVariationValues( nMaxVariations );
             ItemCount nVariationCount = 0;
-            rc = ATSUGetFontInstance ( nFontID, nInstanceIndex, nMaxVariations,
+            rc = ATSUGetFontInstance ( nFontID, nInstanceIndex, nMaxVariations, 
                 &aVariationAxes[0], &aVariationValues[0], &nVariationCount );
             fprintf(stderr,"\tnVariationCount=%d\n",(int)nVariationCount);
             for( ItemCount nVariationIndex = 0; nVariationIndex < nMaxVariations; ++nVariationIndex )
diff --git a/vcl/aqua/source/gdi/salbmp.cxx b/vcl/aqua/source/gdi/salbmp.cxx
index 0e58c35b5fad..c008d4ea9fbf 100644
--- a/vcl/aqua/source/gdi/salbmp.cxx
+++ b/vcl/aqua/source/gdi/salbmp.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
@@ -135,7 +135,7 @@ bool AquaSalBitmap::Create( const SalBitmap& rSalBmp, USHORT nNewBitCount )
 {
     const AquaSalBitmap& rSourceBitmap = static_cast<const AquaSalBitmap&>(rSalBmp);
 
-    if( isValidBitCount( nNewBitCount ) &&  rSourceBitmap.maUserBuffer.get() )
+    if( isValidBitCount( nNewBitCount ) && 	rSourceBitmap.maUserBuffer.get() )
     {
         mnBits = nNewBitCount;
         mnWidth = rSourceBitmap.mnWidth;
@@ -250,17 +250,17 @@ bool AquaSalBitmap::AllocateUserData()
 
         switch( mnBits )
         {
-        case 1:     mnBytesPerRow = (mnWidth + 7) >> 3; break;
-        case 4:     mnBytesPerRow = (mnWidth + 1) >> 1; break;
-        case 8:     mnBytesPerRow = mnWidth; break;
-        case 16:    mnBytesPerRow = mnWidth << 1; break;
-        case 24:    mnBytesPerRow = (mnWidth << 1) + mnWidth; break;
-        case 32:    mnBytesPerRow = mnWidth << 2; break;
+        case 1:		mnBytesPerRow = (mnWidth + 7) >> 3; break;
+        case 4:		mnBytesPerRow = (mnWidth + 1) >> 1; break;
+        case 8:		mnBytesPerRow = mnWidth; break;
+        case 16:	mnBytesPerRow = mnWidth << 1; break;
+        case 24:	mnBytesPerRow = (mnWidth << 1) + mnWidth; break;
+        case 32:	mnBytesPerRow = mnWidth << 2; break;
         default:
             DBG_ERROR("vcl::AquaSalBitmap::AllocateUserData(), illegal bitcount!");
         }
     }
-
+    
     try
     {
         if( mnBytesPerRow )
@@ -272,7 +272,7 @@ bool AquaSalBitmap::AllocateUserData()
         maUserBuffer.reset( NULL );
         mnBytesPerRow = 0;
     }
-
+    
     return maUserBuffer.get() != 0;
 }
 
@@ -284,7 +284,7 @@ protected:
     sal_uInt8* pData;
 public:
     static ImplPixelFormat* GetFormat( sal_uInt16 nBits, const BitmapPalette& rPalette );
-
+    
     virtual void StartLine( sal_uInt8* pLine ) { pData = pLine; }
     virtual void SkipPixel( sal_uInt32 nPixel ) = 0;
     virtual ColorData ReadPixel() = 0;
@@ -342,7 +342,7 @@ class ImplPixelFormat16 : public ImplPixelFormat
 protected:
     sal_uInt16* pData16;
 public:
-
+    
     virtual void StartLine( sal_uInt8* pLine )
     {
         pData16 = (sal_uInt16*)pLine;
@@ -359,7 +359,7 @@ public:
     }
     virtual void WritePixel( ColorData nColor )
     {
-        *pData++ =  ((COLORDATA_RED( nColor ) & 0xf8 ) << 7 ) ||
+        *pData++ =	((COLORDATA_RED( nColor ) & 0xf8 ) << 7 ) ||
                     ((COLORDATA_GREEN( nColor ) & 0xf8 ) << 2 ) ||
                     ((COLORDATA_BLUE( nColor ) & 0xf8 ) >> 3 );
     }
@@ -416,14 +416,14 @@ public:
     }
     virtual ColorData ReadPixel()
     {
-        const BitmapColor& rColor = mrPalette[( pData[mnX >> 1] >> mnShift) & 0x0f];
+        const BitmapColor& rColor = mrPalette[( pData[mnX >> 1] >> mnShift) & 0x0f]; 
         mnX++;
         mnShift ^= 4;
         return rColor.operator Color().GetColor();
     }
     virtual void WritePixel( ColorData nColor )
     {
-        const BitmapColor aColor( COLORDATA_RED( nColor ), COLORDATA_GREEN( nColor ), COLORDATA_BLUE( nColor ) );
+        const BitmapColor aColor( COLORDATA_RED( nColor ), COLORDATA_GREEN( nColor ), COLORDATA_BLUE( nColor ) ); 
         pData[mnX>>1] &= (0xf0 >> mnShift);
         pData[mnX>>1] |= (static_cast< sal_uInt8 >( mrPalette.GetBestIndex( aColor ) ) & 0x0f);
         mnX++;
@@ -453,13 +453,13 @@ public:
     }
     virtual ColorData ReadPixel()
     {
-        const BitmapColor& rColor = mrPalette[ (pData[mnX >> 3 ] >> ( 7 - ( mnX & 7 ) )) & 1];
+        const BitmapColor& rColor = mrPalette[ (pData[mnX >> 3 ] >> ( 7 - ( mnX & 7 ) )) & 1]; 
         mnX++;
         return rColor.operator Color().GetColor();
     }
     virtual void WritePixel( ColorData nColor )
     {
-        const BitmapColor aColor( COLORDATA_RED( nColor ), COLORDATA_GREEN( nColor ), COLORDATA_BLUE( nColor ) );
+        const BitmapColor aColor( COLORDATA_RED( nColor ), COLORDATA_GREEN( nColor ), COLORDATA_BLUE( nColor ) ); 
         if( mrPalette.GetBestIndex( aColor ) & 1 )
             pData[ mnX >> 3 ] |= 1 << ( 7 - ( mnX & 7 ) );
         else
@@ -479,7 +479,7 @@ ImplPixelFormat* ImplPixelFormat::GetFormat( sal_uInt16 nBits, const BitmapPalet
     case 24: return new ImplPixelFormat24;
     case 32: return new ImplPixelFormat32;
     }
-
+    
     return 0;
 }
 
@@ -541,7 +541,7 @@ void AquaSalBitmap::ConvertBitmapData( sal_uInt32 nWidth, sal_uInt32 nHeight,
                 sal_uInt32 nX = nWidth;
                 while( nX-- )
                     pD->WritePixel( pS->ReadPixel() );
-
+    
                 pSrcData += nSrcBytesPerRow;
                 pDestData += nDestBytesPerRow;
             }
@@ -575,21 +575,21 @@ static struct pal_entry
 }
 const aImplSalSysPalEntryAry[ 16 ] =
 {
-{    0,    0,    0 },
-{    0,    0, 0x80 },
-{    0, 0x80,    0 },
-{    0, 0x80, 0x80 },
-{ 0x80,    0,    0 },
+{	 0,    0,	 0 },
+{	 0,    0, 0x80 },
+{	 0, 0x80,	 0 },
+{	 0, 0x80, 0x80 },
+{ 0x80,    0,	 0 },
 { 0x80,    0, 0x80 },
-{ 0x80, 0x80,    0 },
+{ 0x80, 0x80,	 0 },
 { 0x80, 0x80, 0x80 },
 { 0xC0, 0xC0, 0xC0 },
-{    0,    0, 0xFF },
-{    0, 0xFF,    0 },
-{    0, 0xFF, 0xFF },
-{ 0xFF,    0,    0 },
+{	 0,    0, 0xFF },
+{	 0, 0xFF,	 0 },
+{	 0, 0xFF, 0xFF },
+{ 0xFF,    0,	 0 },
 { 0xFF,    0, 0xFF },
-{ 0xFF, 0xFF,    0 },
+{ 0xFF, 0xFF,	 0 },
 { 0xFF, 0xFF, 0xFF }
 };
 
@@ -610,7 +610,7 @@ const BitmapPalette& GetDefaultPalette( int mnBits, bool bMonochrome )
         aDefPalette256.SetEntryCount( 256 );
         aDefPalette16.SetEntryCount( 16 );
         aDefPalette2.SetEntryCount( 2 );
-
+            
         // Standard colors
         unsigned int i;
         for( i = 0; i < 16; i++ )
@@ -658,7 +658,7 @@ const BitmapPalette& GetDefaultPalette( int mnBits, bool bMonochrome )
 BitmapBuffer* AquaSalBitmap::AcquireBuffer( bool bReadOnly )
 {
     if( !maUserBuffer.get() )
-//  || maContextBuffer.get() && (maUserBuffer.get() != maContextBuffer.get()) )
+//	|| maContextBuffer.get() && (maUserBuffer.get() != maContextBuffer.get()) )
     {
         fprintf(stderr,"ASB::Acq(%dx%d,d=%d)\n",mnWidth,mnHeight,mnBits);
         // TODO: AllocateUserData();
@@ -674,14 +674,14 @@ BitmapBuffer* AquaSalBitmap::AcquireBuffer( bool bReadOnly )
     pBuffer->mnBitCount = mnBits;
     switch( mnBits )
     {
-    case 1:     pBuffer->mnFormat = BMP_FORMAT_1BIT_MSB_PAL; break;
-    case 4:     pBuffer->mnFormat = BMP_FORMAT_4BIT_MSN_PAL; break;
-    case 8:     pBuffer->mnFormat = BMP_FORMAT_8BIT_PAL; break;
-    case 16:    pBuffer->mnFormat = BMP_FORMAT_16BIT_TC_MSB_MASK;
+    case 1:		pBuffer->mnFormat = BMP_FORMAT_1BIT_MSB_PAL; break;
+    case 4:		pBuffer->mnFormat = BMP_FORMAT_4BIT_MSN_PAL; break;
+    case 8:		pBuffer->mnFormat = BMP_FORMAT_8BIT_PAL; break;
+    case 16:	pBuffer->mnFormat = BMP_FORMAT_16BIT_TC_MSB_MASK;
                 pBuffer->maColorMask  = ColorMask( k16BitRedColorMask, k16BitGreenColorMask, k16BitBlueColorMask );
                 break;
-    case 24:    pBuffer->mnFormat = BMP_FORMAT_24BIT_TC_BGR; break;
-    case 32:    pBuffer->mnFormat = BMP_FORMAT_32BIT_TC_ARGB;
+    case 24:	pBuffer->mnFormat = BMP_FORMAT_24BIT_TC_BGR; break;
+    case 32:	pBuffer->mnFormat = BMP_FORMAT_32BIT_TC_ARGB;
                 pBuffer->maColorMask  = ColorMask( k32BitRedColorMask, k32BitGreenColorMask, k32BitBlueColorMask );
                 break;
     }
@@ -705,7 +705,7 @@ void AquaSalBitmap::ReleaseBuffer( BitmapBuffer* pBuffer, bool bReadOnly )
         if( mxGraphicContext )
             DestroyContext();
     }
-
+    
     delete pBuffer;
 }
 
@@ -762,7 +762,7 @@ CGImageRef AquaSalBitmap::CreateWithMask( const AquaSalBitmap& rMask,
     if( !CGImageIsMask(xMask) || (CGImageGetColorSpace(xMask) != GetSalData()->mxGraySpace) )
     {
         const CGRect xImageRect=CGRectMake( 0, 0, nWidth, nHeight );//the rect has no offset
-
+    
         // create the alpha mask image fitting our image
         // TODO: is caching the full mask or the subimage mask worth it?
         int nMaskBytesPerRow = ((nWidth + 3) & ~3);
@@ -777,13 +777,13 @@ CGImageRef AquaSalBitmap::CreateWithMask( const AquaSalBitmap& rMask,
         xMask = CGImageMaskCreate( nWidth, nHeight, 8, 8, nMaskBytesPerRow, xDataProvider, pDecode, false );
         CFRelease( xDataProvider );
         CFRelease( xMaskContext );
-    }
-
+    }    
+    
     if( !xMask )
         return xImage;
 
     // combine image and alpha mask
-    CGImageRef xMaskedImage = CGImageCreateWithMask( xImage, xMask );
+    CGImageRef xMaskedImage = CGImageCreateWithMask( xImage, xMask );                        
     CFRelease( xMask );
     CFRelease( xImage );
     return xMaskedImage;
@@ -814,7 +814,7 @@ CGImageRef AquaSalBitmap::CreateColorMask( int nX, int nY, int nWidth, int nHeig
             sal_uInt8* pSource = maUserBuffer.get();
             if( nY )
                 pSource += nY * mnBytesPerRow;
-
+                
             int y = nHeight;
             while( y-- )
             {
@@ -845,7 +845,7 @@ CGImageRef AquaSalBitmap::CreateColorMask( int nX, int nY, int nWidth, int nHeig
 // =======================================================================
 
 /** AquaSalBitmap::GetSystemData Get platform native image data from existing image
- *
+ *  
  *  @param rData struct BitmapSystemData, defined in vcl/inc/bitmap.hxx
  *  @return true if successful
 **/
@@ -855,7 +855,7 @@ bool AquaSalBitmap::GetSystemData( BitmapSystemData& rData )
 
     if( !mxGraphicContext )
         CreateContext();
-
+    
     if ( mxGraphicContext )
     {
         bRet = true;
@@ -867,9 +867,9 @@ bool AquaSalBitmap::GetSystemData( BitmapSystemData& rData )
              * We need to hack things because VCL does not use kCGBitmapByteOrder32Host, while Cairo requires it.
              */
             OSL_TRACE("AquaSalBitmap::%s(): kCGBitmapByteOrder32Host not found => inserting it.",__func__);
-
+            
             CGImageRef xImage = CGBitmapContextCreateImage (mxGraphicContext);
-
+            
             // re-create the context with single change: include kCGBitmapByteOrder32Host flag.
             CGContextRef mxGraphicContextNew = CGBitmapContextCreate( CGBitmapContextGetData(mxGraphicContext),
                                                                       CGBitmapContextGetWidth(mxGraphicContext),
@@ -879,26 +879,26 @@ bool AquaSalBitmap::GetSystemData( BitmapSystemData& rData )
                                                                       CGBitmapContextGetColorSpace(mxGraphicContext),
                                                                       CGBitmapContextGetBitmapInfo(mxGraphicContext) | kCGBitmapByteOrder32Host);
             CFRelease(mxGraphicContext);
-
+            
             // Needs to be flipped
             CGContextSaveGState( mxGraphicContextNew );
             CGContextTranslateCTM (mxGraphicContextNew, 0, CGBitmapContextGetHeight(mxGraphicContextNew));
             CGContextScaleCTM (mxGraphicContextNew, 1.0, -1.0);
-
+            
             CGContextDrawImage(mxGraphicContextNew, CGRectMake( 0, 0, CGImageGetWidth(xImage), CGImageGetHeight(xImage)), xImage);
-
+            
             // Flip back
             CGContextRestoreGState( mxGraphicContextNew );
-
+            
             CGImageRelease( xImage );
             mxGraphicContext = mxGraphicContextNew;
-        }
+        } 
 #endif
 
         rData.rImageContext = (void *) mxGraphicContext;
         rData.mnWidth = mnWidth;
         rData.mnHeight = mnHeight;
     }
-
+    
     return bRet;
 }
diff --git a/vcl/aqua/source/gdi/salcolorutils.cxx b/vcl/aqua/source/gdi/salcolorutils.cxx
index ec33b2dd8f8d..64a9801ec026 100755
--- a/vcl/aqua/source/gdi/salcolorutils.cxx
+++ b/vcl/aqua/source/gdi/salcolorutils.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
diff --git a/vcl/aqua/source/gdi/salgdi.cxx b/vcl/aqua/source/gdi/salgdi.cxx
index 8a4744d1efcd..c2caa5817938 100644
--- a/vcl/aqua/source/gdi/salgdi.cxx
+++ b/vcl/aqua/source/gdi/salgdi.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
@@ -67,11 +67,11 @@ typedef std::vector<unsigned char> ByteVector;
 ImplMacFontData::ImplMacFontData( const ImplDevFontAttributes& rDFA, ATSUFontID nFontId )
 :   ImplFontData( rDFA, 0 )
 ,   mnFontId( nFontId )
-,   mpCharMap( NULL )
-,   mbOs2Read( false )
-,   mbHasOs2Table( false )
-,   mbCmapEncodingRead( false )
-,   mbHasCJKSupport( false )
+,	mpCharMap( NULL )
+,	mbOs2Read( false )
+,	mbHasOs2Table( false )
+,	mbCmapEncodingRead( false )
+,	mbHasCJKSupport( false )
 {}
 
 // -----------------------------------------------------------------------
@@ -259,7 +259,7 @@ bool ImplMacFontData::HasCJKSupport( void ) const
 
     return mbHasCJKSupport;
 }
-
+        
 // =======================================================================
 
 AquaSalGraphics::AquaSalGraphics()
@@ -346,24 +346,24 @@ void AquaSalGraphics::initResolution( NSWindow* pWin )
     // #i100617# read DPI only once; there is some kind of weird caching going on
     // if the main screen changes
     // FIXME: this is really unfortunate and needs to be investigated
-
+    
     SalData* pSalData = GetSalData();
     if( pSalData->mnDPIX == 0 || pSalData->mnDPIY == 0 )
     {
         NSScreen* pScreen = nil;
-
+        
         /* #i91301#
         many woes went into the try to have different resolutions
         on different screens. The result of these trials is that OOo is not ready
         for that yet, vcl and applications would need to be adapted.
-
+        
         Unfortunately this is not possible in the 3.0 timeframe.
         So let's stay with one resolution for all Windows and VirtualDevices
         which is the resolution of the main screen
-
+        
         This of course also means that measurements are exact only on the main screen.
         For activating different resolutions again just comment out the two lines below.
-
+        
         if( pWin )
         pScreen = [pWin screen];
         */
@@ -373,7 +373,7 @@ void AquaSalGraphics::initResolution( NSWindow* pWin )
             if( pScreens )
                 pScreen = [pScreens objectAtIndex: 0];
         }
-
+        
         mnRealDPIX = mnRealDPIY = 96;
         if( pScreen )
         {
@@ -404,7 +404,7 @@ void AquaSalGraphics::initResolution( NSWindow* pWin )
         {
             DBG_ERROR( "no screen found" );
         }
-
+        
         // #i107076# maintaining size-WYSIWYG-ness causes many problems for
         //           low-DPI, high-DPI or for mis-reporting devices
         //           => it is better to limit the calculation result then
@@ -437,7 +437,7 @@ void AquaSalGraphics::GetResolution( long& rDPIX, long& rDPIY )
 
     rDPIX = static_cast<long>(mfFakeDPIScale * mnRealDPIX);
     rDPIY = static_cast<long>(mfFakeDPIScale * mnRealDPIY);
-}
+} 
 
 void AquaSalGraphics::copyResolution( AquaSalGraphics& rGraphics )
 {
@@ -447,7 +447,7 @@ void AquaSalGraphics::copyResolution( AquaSalGraphics& rGraphics )
     mnRealDPIX = rGraphics.mnRealDPIX;
     mnRealDPIY = rGraphics.mnRealDPIY;
     mfFakeDPIScale = rGraphics.mfFakeDPIScale;
-}
+} 
 
 // -----------------------------------------------------------------------
 
@@ -509,9 +509,9 @@ static void AddPolygonToPath( CGMutablePathRef xPath,
             bPendingCurve |= rPolygon.isPrevControlPointUsed( nClosedIdx );
         }
 
-        if( !bPendingCurve )    // line segment
+        if( !bPendingCurve )	// line segment
             CGPathAddLineToPoint( xPath, pTransform, aPoint.getX(), aPoint.getY() );
-        else                        // cubic bezier segment
+        else						// cubic bezier segment
         {
             basegfx::B2DPoint aCP1 = rPolygon.getNextControlPoint( nPrevIdx );
             basegfx::B2DPoint aCP2 = rPolygon.getPrevControlPoint( nClosedIdx );
@@ -612,7 +612,7 @@ void AquaSalGraphics::SetLineColor()
     maLineColor.SetAlpha( 0.0 );   // transparent
     if( CheckContext() )
         CGContextSetStrokeColor( mrContext, maLineColor.AsArray() );
-}
+} 
 
 // -----------------------------------------------------------------------
 
@@ -639,7 +639,7 @@ void AquaSalGraphics::SetFillColor( SalColor nSalColor )
     maFillColor = RGBAColor( nSalColor );
     if( CheckContext() )
         CGContextSetFillColor( mrContext, maFillColor.AsArray() );
-}
+} 
 
 // -----------------------------------------------------------------------
 
@@ -657,7 +657,7 @@ void AquaSalGraphics::SetROPLineColor( SalROPColor nROPColor )
 {
     if( ! mbPrinter )
         SetLineColor( ImplGetROPSalColor( nROPColor ) );
-}
+} 
 
 // -----------------------------------------------------------------------
 
@@ -688,13 +688,13 @@ void AquaSalGraphics::drawPixel( long nX, long nY )
 {
     // draw pixel with current line color
     ImplDrawPixel( nX, nY, maLineColor );
-}
+} 
 
 void AquaSalGraphics::drawPixel( long nX, long nY, SalColor nSalColor )
 {
     const RGBAColor aPixelColor( nSalColor );
     ImplDrawPixel( nX, nY, aPixelColor );
-}
+} 
 
 // -----------------------------------------------------------------------
 
@@ -706,7 +706,7 @@ void AquaSalGraphics::drawLine( long nX1, long nY1, long nX2, long nY2 )
         drawPixel( nX1, nY1 );
         return;
     }
-
+    
     if( !CheckContext() )
         return;
 
@@ -733,10 +733,10 @@ void AquaSalGraphics::drawRect( long nX, long nY, long nWidth, long nHeight )
          aRect.size.width    -= 1;
          aRect.size.height -= 1;
      }
-
+     
      if( IsBrushVisible() )
          CGContextFillRect( mrContext, aRect );
-
+    
      if( IsPenVisible() )
          CGContextStrokeRect( mrContext, aRect );
 
@@ -784,9 +784,9 @@ void AquaSalGraphics::drawPolyLine( ULONG nPoints, const SalPoint *pPtAry )
 
     long nX = 0, nY = 0, nWidth = 0, nHeight = 0;
     getBoundRect( nPoints, pPtAry, nX, nY, nWidth, nHeight );
-
+    
     float fX, fY;
-
+    
     CGContextBeginPath( mrContext );
     alignLinePoint( pPtAry, fX, fY );
     CGContextMoveToPoint( mrContext, fX, fY );
@@ -798,7 +798,7 @@ void AquaSalGraphics::drawPolyLine( ULONG nPoints, const SalPoint *pPtAry )
     }
     CGContextDrawPath( mrContext, kCGPathStroke );
 
-    RefreshRect( nX, nY, nWidth, nHeight );
+    RefreshRect( nX, nY, nWidth, nHeight );        
 }
 
 // -----------------------------------------------------------------------
@@ -824,7 +824,7 @@ void AquaSalGraphics::drawPolygon( ULONG nPoints, const SalPoint *pPtAry )
         return;
 
     CGContextBeginPath( mrContext );
-
+    
     if( IsPenVisible() )
     {
         float fX, fY;
@@ -846,7 +846,7 @@ void AquaSalGraphics::drawPolygon( ULONG nPoints, const SalPoint *pPtAry )
     }
 
     CGContextDrawPath( mrContext, eMode );
-    RefreshRect( nX, nY, nWidth, nHeight );
+    RefreshRect( nX, nY, nWidth, nHeight );        
 }
 
 // -----------------------------------------------------------------------
@@ -931,11 +931,11 @@ void AquaSalGraphics::drawPolyPolygon( ULONG nPolyCount, const ULONG *pPoints, P
             }
         }
     }
-
+    
     CGContextDrawPath( mrContext, eMode );
-
+        
     RefreshRect( leftX, topY, maxWidth, maxHeight );
-}
+} 
 
 // -----------------------------------------------------------------------
 
@@ -969,16 +969,16 @@ bool AquaSalGraphics::drawPolyPolygon( const ::basegfx::B2DPolyPolygon& rPolyPol
         CGContextSaveGState( mrContext );
         CGContextBeginPath( mrContext );
         CGContextAddPath( mrContext, xPath );
-
+    
         // draw path with antialiased polygon
         CGContextSetShouldAntialias( mrContext, true );
-        CGContextSetAlpha( mrContext, 1.0 - fTransparency );
+        CGContextSetAlpha( mrContext, 1.0 - fTransparency ); 
         CGContextDrawPath( mrContext, kCGPathEOFillStroke );
         CGContextRestoreGState( mrContext );
-
+    
         // mark modified rectangle as updated
         RefreshRect( aRefreshRect );
-    }
+    }        
 
     CGPathRelease( xPath );
 
@@ -1011,11 +1011,11 @@ bool AquaSalGraphics::drawPolyLine( const ::basegfx::B2DPolygon& rPolyLine,
     // setup line attributes
     CGLineJoin aCGLineJoin = kCGLineJoinMiter;
     switch( eLineJoin ) {
-        case ::basegfx::B2DLINEJOIN_NONE:       aCGLineJoin = /*TODO?*/kCGLineJoinMiter; break;
-        case ::basegfx::B2DLINEJOIN_MIDDLE:     aCGLineJoin = /*TODO?*/kCGLineJoinMiter; break;
-        case ::basegfx::B2DLINEJOIN_BEVEL:      aCGLineJoin = kCGLineJoinBevel; break;
-        case ::basegfx::B2DLINEJOIN_MITER:      aCGLineJoin = kCGLineJoinMiter; break;
-        case ::basegfx::B2DLINEJOIN_ROUND:      aCGLineJoin = kCGLineJoinRound; break;
+        case ::basegfx::B2DLINEJOIN_NONE:		aCGLineJoin = /*TODO?*/kCGLineJoinMiter; break;
+        case ::basegfx::B2DLINEJOIN_MIDDLE:		aCGLineJoin = /*TODO?*/kCGLineJoinMiter; break;
+        case ::basegfx::B2DLINEJOIN_BEVEL:		aCGLineJoin = kCGLineJoinBevel; break;
+        case ::basegfx::B2DLINEJOIN_MITER:		aCGLineJoin = kCGLineJoinMiter; break;
+        case ::basegfx::B2DLINEJOIN_ROUND:		aCGLineJoin = kCGLineJoinRound; break;
     }
 
     // setup poly-polygon path
@@ -1027,21 +1027,21 @@ bool AquaSalGraphics::drawPolyLine( const ::basegfx::B2DPolygon& rPolyLine,
     // #i97317# workaround for Quartz having problems with drawing small polygons
     if( ! ((aRefreshRect.size.width <= 0.125) && (aRefreshRect.size.height <= 0.125)) )
 #endif
-    {
+    {	
         // use the path to prepare the graphics context
         CGContextSaveGState( mrContext );
         CGContextAddPath( mrContext, xPath );
         // draw path with antialiased line
         CGContextSetShouldAntialias( mrContext, true );
-        CGContextSetAlpha( mrContext, 1.0 - fTransparency );
+        CGContextSetAlpha( mrContext, 1.0 - fTransparency ); 
         CGContextSetLineJoin( mrContext, aCGLineJoin );
         CGContextSetLineWidth( mrContext, rLineWidths.getX() );
         CGContextDrawPath( mrContext, kCGPathStroke );
         CGContextRestoreGState( mrContext );
-
+        
         // mark modified rectangle as updated
         RefreshRect( aRefreshRect );
-    }
+    }        
 
     CGPathRelease( xPath );
 
@@ -1114,7 +1114,7 @@ void AquaSalGraphics::copyBits( const SalTwoRect *pPosAry, SalGraphics *pSrcGrap
         (!mnBitmapDepth || (aDstPoint.x + pSrc->mnWidth) <= mnWidth) ) // workaround a Quartz crasher
     {
         // in XOR mode the drawing context is redirected to the XOR mask
-        // if source and target are identical then copyBits() paints onto the target context though
+        // if source and target are identical then copyBits() paints onto the target context though 
         CGContextRef xCopyContext = mrContext;
         if( mpXorEmulation && mpXorEmulation->IsEnabled() )
             if( pSrcGraphics == this )
@@ -1183,7 +1183,7 @@ void AquaSalGraphics::copyArea( long nDstX, long nDstY,long nSrcX, long nSrcY, l
     // drawing a layer onto its own context causes trouble on OSX => copy it first
     // TODO: is it possible to get rid of this unneeded copy more often?
     //       e.g. on OSX>=10.5 only this situation causes problems:
-    //          mnBitmapDepth && (aDstPoint.x + pSrc->mnWidth) > mnWidth
+    //			mnBitmapDepth && (aDstPoint.x + pSrc->mnWidth) > mnWidth
     CGLayerRef xSrcLayer = mxLayer;
     // TODO: if( mnBitmapDepth > 0 )
     {
@@ -1353,7 +1353,7 @@ void AquaSalGraphics::Pattern50Fill()
                                                       CGAffineTransformIdentity, 4, 4,
                                                       kCGPatternTilingConstantSpacing,
                                                       false, &aCallback );
-
+        
     CGContextSetFillColorSpace( mrContext, GetSalData()->mxP50Space );
     CGContextSetFillPattern( mrContext, GetSalData()->mxP50Pattern, aFillCol );
     CGContextFillPath( mrContext );
@@ -1417,7 +1417,7 @@ void AquaSalGraphics::invert( ULONG nPoints, const SalPoint*  pPtAry, SalInvert
             CGContextSetBlendMode(mrContext, kCGBlendModeDifference);
             Pattern50Fill();
         }
-        else // just invert
+        else // just invert                   
         {
             CGContextSetBlendMode( mrContext, kCGBlendModeDifference );
             CGContextSetRGBFillColor( mrContext, 1.0, 1.0, 1.0, 1.0 );
@@ -1447,7 +1447,7 @@ BOOL AquaSalGraphics::drawEPS( long nX, long nY, long nWidth, long nHeight,
 
     // NOTE: flip drawing, else the nsimage would be drawn upside down
     CGContextSaveGState( mrContext );
-//  CGContextTranslateCTM( mrContext, 0, +mnHeight );
+//	CGContextTranslateCTM( mrContext, 0, +mnHeight );
     CGContextScaleCTM( mrContext, +1, -1 );
     nY = /*mnHeight*/ - (nY + nHeight);
 
@@ -1504,10 +1504,10 @@ bool AquaSalGraphics::drawAlphaRect( long nX, long nY, long nWidth,
 {
     if( !CheckContext() )
         return true;
-
+        
     // save the current state
     CGContextSaveGState( mrContext );
-    CGContextSetAlpha( mrContext, (100-nTransparency) * (1.0/100) );
+    CGContextSetAlpha( mrContext, (100-nTransparency) * (1.0/100) ); 
 
     CGRect aRect = {{nX,nY},{nWidth-1,nHeight-1}};
     if( IsPenVisible() )
@@ -1552,7 +1552,7 @@ void AquaSalGraphics::GetFontMetric( ImplFontMetricData* pMetric )
     // get the ATSU font metrics (in point units)
     // of the font that has eventually been size-limited
 
-    ATSUFontID fontId;
+    ATSUFontID fontId; 	 
     OSStatus err = ATSUGetAttribute( maATSUStyle, kATSUFontTag, sizeof(ATSUFontID), &fontId, 0 );
     DBG_ASSERT( (err==noErr), "AquaSalGraphics::GetFontMetric() : could not get font id\n");
 
@@ -1641,12 +1641,12 @@ static bool AddLocalTempFontDirs( void )
     bFirst = false;
 
     // add private font files found in brand and base layer
-
+    
     rtl::OUString aBrandStr( RTL_CONSTASCII_USTRINGPARAM( "$BRAND_BASE_DIR" ) );
     rtl_bootstrap_expandMacros( &aBrandStr.pData );
     rtl::OUString aBrandSysPath;
     OSL_VERIFY( osl_getSystemPathFromFileURL( aBrandStr.pData, &aBrandSysPath.pData ) == osl_File_E_None );
-
+    
     rtl::OStringBuffer aBrandFontDir( aBrandSysPath.getLength()*2 );
     aBrandFontDir.append( rtl::OUStringToOString( aBrandSysPath, RTL_TEXTENCODING_UTF8 ) );
     aBrandFontDir.append( "/share/fonts/truetype/" );
@@ -1656,7 +1656,7 @@ static bool AddLocalTempFontDirs( void )
     rtl_bootstrap_expandMacros( &aBaseStr.pData );
     rtl::OUString aBaseSysPath;
     OSL_VERIFY( osl_getSystemPathFromFileURL( aBaseStr.pData, &aBaseSysPath.pData ) == osl_File_E_None );
-
+    
     rtl::OStringBuffer aBaseFontDir( aBaseSysPath.getLength()*2 );
     aBaseFontDir.append( rtl::OUStringToOString( aBaseSysPath, RTL_TEXTENCODING_UTF8 ) );
     aBaseFontDir.append( "/share/fonts/truetype/" );
@@ -1670,11 +1670,11 @@ void AquaSalGraphics::GetDevFontList( ImplDevFontList* pFontList )
     DBG_ASSERT( pFontList, "AquaSalGraphics::GetDevFontList(NULL) !");
 
     AddLocalTempFontDirs();
-
-    // The idea is to cache the list of system fonts once it has been generated.
-    // SalData seems to be a good place for this caching. However we have to
-    // carefully make the access to the font list thread-safe. If we register
-    // a font-change event handler to update the font list in case fonts have
+ 
+    // The idea is to cache the list of system fonts once it has been generated. 
+    // SalData seems to be a good place for this caching. However we have to 
+    // carefully make the access to the font list thread-safe. If we register 
+    // a font-change event handler to update the font list in case fonts have 
     // changed on the system we have to lock access to the list. The right
     // way to do that is the solar mutex since GetDevFontList is protected
     // through it as should be all event handlers
@@ -1713,7 +1713,7 @@ bool AquaSalGraphics::AddTempDevFont( ImplDevFontList* pFontList,
 #else
     FSSpec aFontFSSpec;
     eStatus = ::FSGetCatalogInfo( &aNewRef, kFSCatInfoNone,
-        NULL, NULL, &aFontFSSpec, NULL );
+        NULL, NULL,	&aFontFSSpec, NULL );
     if( eStatus != noErr )
         return false;
 
@@ -1779,7 +1779,7 @@ BOOL AquaSalGraphics::GetGlyphOutline( long nGlyphId, basegfx::B2DPolyPolygon& r
     aGgoData.mpPolyPoly = &rPolyPoly;
     rPolyPoly.clear();
 
-    ATSUStyle rATSUStyle = maATSUStyle; // TODO: handle glyph fallback when CWS pdffix02 is integrated
+    ATSUStyle rATSUStyle = maATSUStyle;	// TODO: handle glyph fallback when CWS pdffix02 is integrated
     OSStatus eGgoStatus = noErr;
     OSStatus eStatus = ATSUGlyphGetCubicPaths( rATSUStyle, nGlyphId,
         GgoMoveToProc, GgoLineToProc, GgoCurveToProc, GgoClosePathProc,
@@ -1803,13 +1803,13 @@ long AquaSalGraphics::GetGraphicsWidth() const
     {
         w = mnWidth;
     }
-
+    
     if( w == 0 )
     {
         if( mbWindow && mpFrame )
             w = mpFrame->maGeometry.nWidth;
     }
-
+    
     return w;
 }
 
@@ -1817,7 +1817,7 @@ long AquaSalGraphics::GetGraphicsWidth() const
 
 BOOL AquaSalGraphics::GetGlyphBoundRect( long nGlyphId, Rectangle& rRect )
 {
-    ATSUStyle rATSUStyle = maATSUStyle; // TODO: handle glyph fallback
+    ATSUStyle rATSUStyle = maATSUStyle;	// TODO: handle glyph fallback
     GlyphID aGlyphId = nGlyphId;
     ATSGlyphScreenMetrics aGlyphMetrics;
     OSStatus eStatus = ATSUGlyphGetScreenMetrics( rATSUStyle,
@@ -1888,7 +1888,7 @@ USHORT AquaSalGraphics::SetFont( ImplFontSelectData* pReqFont, int nFallbackLeve
     mbNonAntialiasedText = pReqFont->mbNonAntialiased;
     UInt32 nStyleRenderingOptions = kATSStyleNoOptions;
     if( pReqFont->mbNonAntialiased )
-        nStyleRenderingOptions |= kATSStyleNoAntiAliasing;
+        nStyleRenderingOptions |= kATSStyleNoAntiAliasing; 
 
     // set horizontal/vertical mode
     ATSUVerticalCharacterType aVerticalCharacterType = kATSUStronglyHorizontal;
@@ -1911,21 +1911,21 @@ USHORT AquaSalGraphics::SetFont( ImplFontSelectData* pReqFont, int nFallbackLeve
         kATSUVerticalCharacterTag
     };
 
-    const ByteCount aValueSize[] =
+    const ByteCount aValueSize[] = 
     {
         sizeof(ATSUFontID),
         sizeof(fFixedSize),
-        sizeof(bFakeBold),
+        sizeof(bFakeBold), 
         sizeof(bFakeItalic),
         sizeof(nStyleRenderingOptions),
         sizeof(aVerticalCharacterType)
     };
-
-    const ATSUAttributeValuePtr aValue[] =
+ 
+    const ATSUAttributeValuePtr aValue[] = 
     {
         &nFontID,
         &fFixedSize,
-        &bFakeBold,
+        &bFakeBold, 
         &bFakeItalic,
         &nStyleRenderingOptions,
         &aVerticalCharacterType
@@ -1989,7 +1989,7 @@ ImplFontCharMap* AquaSalGraphics::GetImplFontCharMap() const
 
     return mpMacFontData->GetImplFontCharMap();
 }
-
+    
 // -----------------------------------------------------------------------
 
 // fake a SFNT font directory entry for a font table
@@ -2003,8 +2003,8 @@ static void FakeDirEntry( FourCharCode eFCC, ByteCount nOfs, ByteCount nLen,
     rpDest[ 2] = (char)(eFCC >>  8);
     rpDest[ 3] = (char)(eFCC >>  0);
     // TODO: get entry checksum and write it
-    //      not too important since the subsetter doesn't care currently
-    //      for( pData+nOfs ... pData+nOfs+nLen )
+    // 		not too important since the subsetter doesn't care currently
+    // 		for( pData+nOfs ... pData+nOfs+nLen )
     // write entry offset
     rpDest[ 8] = (char)(nOfs >> 24);
     rpDest[ 9] = (char)(nOfs >> 16);
@@ -2042,34 +2042,34 @@ static bool GetRawFontData( const ImplFontData* pFontData,
     }
 
     // get font table availability and size in bytes
-    ByteCount nHeadLen  = 0;
+    ByteCount nHeadLen	= 0;
     eStatus = ATSFontGetTable( rFont, GetTag("head"), 0, 0, NULL, &nHeadLen);
     if( (eStatus != noErr) || (nHeadLen <= 0) )
         return false;
-    ByteCount nMaxpLen  = 0;
+    ByteCount nMaxpLen	= 0;
     eStatus = ATSFontGetTable( rFont, GetTag("maxp"), 0, 0, NULL, &nMaxpLen);
     if( (eStatus != noErr) || (nMaxpLen <= 0) )
         return false;
-    ByteCount nCmapLen  = 0;
+    ByteCount nCmapLen	= 0;
     eStatus = ATSFontGetTable( rFont, GetTag("cmap"), 0, 0, NULL, &nCmapLen);
     if( (eStatus != noErr) || (nCmapLen <= 0) )
         return false;
-    ByteCount nNameLen  = 0;
+    ByteCount nNameLen	= 0;
     eStatus = ATSFontGetTable( rFont, GetTag("name"), 0, 0, NULL, &nNameLen);
     if( (eStatus != noErr) || (nNameLen <= 0) )
         return false;
-    ByteCount nHheaLen  = 0;
+    ByteCount nHheaLen	= 0;
     eStatus = ATSFontGetTable( rFont, GetTag("hhea"), 0, 0, NULL, &nHheaLen);
     if( (eStatus != noErr) || (nHheaLen <= 0) )
         return false;
-    ByteCount nHmtxLen  = 0;
+    ByteCount nHmtxLen	= 0;
     eStatus = ATSFontGetTable( rFont, GetTag("hmtx"), 0, 0, NULL, &nHmtxLen);
     if( (eStatus != noErr) || (nHmtxLen <= 0) )
         return false;
 
     // get the glyph outline tables
-    ByteCount nLocaLen  = 0;
-    ByteCount nGlyfLen  = 0;
+    ByteCount nLocaLen	= 0;
+    ByteCount nGlyfLen	= 0;
     if( (eStatus != noErr) || (nCffLen <= 0) )
     {
         eStatus = ATSFontGetTable( rFont, GetTag("loca"), 0, 0, NULL, &nLocaLen);
@@ -2081,13 +2081,13 @@ static bool GetRawFontData( const ImplFontData* pFontData,
     }
 
     ByteCount nPrepLen=0, nCvtLen=0, nFpgmLen=0;
-    if( nGlyfLen )  // TODO: reduce PDF size by making hint subsetting optional
+    if( nGlyfLen )	// TODO: reduce PDF size by making hint subsetting optional
     {
         eStatus = ATSFontGetTable( rFont, GetTag("prep"), 0, 0, NULL, &nPrepLen);
         eStatus = ATSFontGetTable( rFont, GetTag("cvt "), 0, 0, NULL, &nCvtLen);
         eStatus = ATSFontGetTable( rFont, GetTag("fpgm"), 0, 0, NULL, &nFpgmLen);
     }
-
+    
     // prepare a byte buffer for a fake font
     int nTableCount = 7;
     nTableCount += (nPrepLen>0) + (nCvtLen>0) + (nFpgmLen>0) + (nGlyfLen>0);
@@ -2107,11 +2107,11 @@ static bool GetRawFontData( const ImplFontData* pFontData,
     {
         int nLog2 = 0;
         while( (nTableCount >> nLog2) > 1 ) ++nLog2;
-        rBuffer[ 1] = 1;                        // Win-TTF style scaler
-        rBuffer[ 5] = nTableCount;              // table count
-        rBuffer[ 7] = nLog2*16;                 // searchRange
-        rBuffer[ 9] = nLog2;                    // entrySelector
-        rBuffer[11] = (nTableCount-nLog2)*16;   // rangeShift
+        rBuffer[ 1] = 1;						// Win-TTF style scaler
+        rBuffer[ 5] = nTableCount;				// table count
+        rBuffer[ 7] = nLog2*16;					// searchRange
+        rBuffer[ 9] = nLog2;					// entrySelector
+        rBuffer[11] = (nTableCount-nLog2)*16;	// rangeShift
     }
 
     // get font table raw data and update the fake directory entries
@@ -2219,17 +2219,17 @@ BOOL AquaSalGraphics::CreateFontSubset( const rtl::OUString& rToFile,
     ::GetTTGlobalFontInfo( pSftFont, &aTTInfo );
     rInfo.m_nFontType   = FontSubsetInfo::SFNT_TTF;
     rInfo.m_aPSName     = String( aTTInfo.psname, RTL_TEXTENCODING_UTF8 );
-    rInfo.m_aFontBBox   = Rectangle( Point( aTTInfo.xMin, aTTInfo.yMin ),
+    rInfo.m_aFontBBox	= Rectangle( Point( aTTInfo.xMin, aTTInfo.yMin ),
                                     Point( aTTInfo.xMax, aTTInfo.yMax ) );
-    rInfo.m_nCapHeight  = aTTInfo.yMax; // Well ...
-    rInfo.m_nAscent     = +aTTInfo.winAscent;
+    rInfo.m_nCapHeight	= aTTInfo.yMax; // Well ...
+    rInfo.m_nAscent	    = +aTTInfo.winAscent;
     rInfo.m_nDescent    = -aTTInfo.winDescent;
     // mac fonts usually do not have an OS2-table
     // => get valid ascent/descent values from other tables
     if( !rInfo.m_nAscent )
-        rInfo.m_nAscent = +aTTInfo.typoAscender;
+        rInfo.m_nAscent	= +aTTInfo.typoAscender;
     if( !rInfo.m_nAscent )
-        rInfo.m_nAscent = +aTTInfo.ascender;
+        rInfo.m_nAscent	= +aTTInfo.ascender;
     if( !rInfo.m_nDescent )
         rInfo.m_nDescent = +aTTInfo.typoDescender;
     if( !rInfo.m_nDescent )
@@ -2287,9 +2287,9 @@ BOOL AquaSalGraphics::CreateFontSubset( const rtl::OUString& rToFile,
         ::GetTTSimpleGlyphMetrics( pSftFont, aShortIDs, nGlyphCount, bVertical );
     if( !pGlyphMetrics )
         return FALSE;
-    sal_uInt16 nNotDefAdv       = pGlyphMetrics[0].adv;
-    pGlyphMetrics[0].adv        = pGlyphMetrics[nNotDef].adv;
-    pGlyphMetrics[nNotDef].adv  = nNotDefAdv;
+    sal_uInt16 nNotDefAdv   	= pGlyphMetrics[0].adv;
+    pGlyphMetrics[0].adv    	= pGlyphMetrics[nNotDef].adv;
+    pGlyphMetrics[nNotDef].adv	= nNotDefAdv;
     for( int i = 0; i < nOrigCount; ++i )
         pGlyphWidths[i] = pGlyphMetrics[i].adv;
     free( pGlyphMetrics );
@@ -2378,7 +2378,7 @@ void AquaSalGraphics::GetGlyphWidths( const ImplFontData* pFontData, bool bVerti
 #else
         DBG_ERROR("not implemented for non-subsettable fonts!\n");
 #endif
-    }
+    }    
 }
 
 // -----------------------------------------------------------------------
@@ -2391,7 +2391,7 @@ const Ucs2SIntMap* AquaSalGraphics::GetFontEncodingVector(
 
 // -----------------------------------------------------------------------
 
-const void* AquaSalGraphics::GetEmbedFontData( const ImplFontData* pFontData,
+const void*	AquaSalGraphics::GetEmbedFontData( const ImplFontData* pFontData,
                               const sal_Ucs* pUnicodes,
                               sal_Int32* pWidths,
                               FontSubsetInfo& rInfo,
@@ -2405,7 +2405,7 @@ const void* AquaSalGraphics::GetEmbedFontData( const ImplFontData* pFontData,
 void AquaSalGraphics::FreeEmbedFontData( const void* pData, long nDataLen )
 {
     // TODO: implementing this only makes sense when the implementation of
-    //      AquaSalGraphics::GetEmbedFontData() returns non-NULL
+    //		AquaSalGraphics::GetEmbedFontData() returns non-NULL
     DBG_ASSERT( (pData!=NULL), "AquaSalGraphics::FreeEmbedFontData() is not implemented\n");
 }
 
@@ -2418,7 +2418,7 @@ SystemFontData AquaSalGraphics::GetSysFontData( int /* nFallbacklevel */ ) const
     aSysFontData.nSize = sizeof( SystemFontData );
 
     // NOTE: Native ATSU font fallbacks are used, not the VCL fallbacks.
-    ATSUFontID fontId;
+    ATSUFontID fontId; 	 
     err = ATSUGetAttribute( maATSUStyle, kATSUFontTag, sizeof(fontId), &fontId, 0 );
     if (err) fontId = 0;
     aSysFontData.aATSUFontID = (void *) fontId;
@@ -2427,8 +2427,8 @@ SystemFontData AquaSalGraphics::GetSysFontData( int /* nFallbacklevel */ ) const
     err = ATSUGetAttribute( maATSUStyle, kATSUQDBoldfaceTag, sizeof(bFbold), &bFbold, 0 );
     if (err) bFbold = FALSE;
     aSysFontData.bFakeBold = (bool) bFbold;
-
-    Boolean bFItalic;
+    
+    Boolean bFItalic;    
     err = ATSUGetAttribute( maATSUStyle, kATSUQDItalicTag, sizeof(bFItalic), &bFItalic, 0 );
     if (err) bFItalic = FALSE;
     aSysFontData.bFakeItalic = (bool) bFItalic;
@@ -2463,7 +2463,7 @@ void AquaSalGraphics::SetXORMode( bool bSet, bool bInvertOnly )
     // return early if XOR mode remains unchanged
     if( mbPrinter )
         return;
-
+    
     if( ! bSet && mnXorMode == 2 )
     {
         CGContextSetBlendMode( mrContext, kCGBlendModeNormal );
@@ -2521,14 +2521,14 @@ void AquaSalGraphics::ApplyXorContext()
 // ======================================================================
 
 XorEmulation::XorEmulation()
-:   mxTargetLayer( NULL )
-,   mxTargetContext( NULL )
-,   mxMaskContext( NULL )
-,   mxTempContext( NULL )
-,   mpMaskBuffer( NULL )
-,   mpTempBuffer( NULL )
-,   mnBufferLongs( 0 )
-,   mbIsEnabled( false )
+:	mxTargetLayer( NULL )
+,	mxTargetContext( NULL )
+,	mxMaskContext( NULL )
+,	mxTempContext( NULL )
+,	mpMaskBuffer( NULL )
+,	mpTempBuffer( NULL )
+,	mnBufferLongs( 0 )
+,	mbIsEnabled( false )
 {}
 
 // ----------------------------------------------------------------------
diff --git a/vcl/aqua/source/gdi/salgdiutils.cxx b/vcl/aqua/source/gdi/salgdiutils.cxx
index f7c234d2c4c4..bf0f42d561ed 100755
--- a/vcl/aqua/source/gdi/salgdiutils.cxx
+++ b/vcl/aqua/source/gdi/salgdiutils.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
@@ -59,7 +59,7 @@ void AquaSalGraphics::SetPrinterGraphics( CGContextRef xContext, long nDPIX, lon
     mbWindow    = false;
     mbPrinter   = true;
     mbVirDev    = false;
-
+    
     mrContext   = xContext;
     mfFakeDPIScale = fScale;
     mnRealDPIX  = nDPIX;
@@ -89,7 +89,7 @@ void AquaSalGraphics::SetVirDevGraphics( CGLayerRef xLayer, CGContextRef xContex
     mbVirDev    = true;
 
     // set graphics properties
-    mxLayer = xLayer;
+    mxLayer	= xLayer;
     mrContext = xContext;
     mnBitmapDepth = nBitmapDepth;
 
@@ -247,7 +247,7 @@ void AquaSalGraphics::RefreshRect(float lX, float lY, float lWidth, float lHeigh
         // this helps with antialiased rendering
         const Rectangle aVclRect(Point(static_cast<long int>(lX-1),
                     static_cast<long int>(lY-1) ),
-                 Size(  static_cast<long int>(lWidth+2),
+                 Size( 	static_cast<long int>(lWidth+2), 
                     static_cast<long int>(lHeight+2) ) );
         mpFrame->maInvalidRect.Union( aVclRect );
     }
@@ -256,14 +256,14 @@ void AquaSalGraphics::RefreshRect(float lX, float lY, float lWidth, float lHeigh
 CGPoint* AquaSalGraphics::makeCGptArray(ULONG nPoints, const SalPoint*  pPtAry)
 {
     CGPoint *CGpoints = new (CGPoint[nPoints]);
-    if ( CGpoints )
+    if ( CGpoints ) 
       {
         for(ULONG i=0;i<nPoints;i++)
           {
-            CGpoints[i].x = (float)(pPtAry[i].mnX);
-            CGpoints[i].y = (float)(pPtAry[i].mnY);
+            CGpoints[i].x = (float)(pPtAry[i].mnX);  
+            CGpoints[i].y = (float)(pPtAry[i].mnY);  
           }
-      }
+      }    
     return CGpoints;
 }
 
diff --git a/vcl/aqua/source/gdi/salmathutils.cxx b/vcl/aqua/source/gdi/salmathutils.cxx
index 8df44acbf730..febf3e5af95f 100755
--- a/vcl/aqua/source/gdi/salmathutils.cxx
+++ b/vcl/aqua/source/gdi/salmathutils.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
@@ -101,7 +101,7 @@ void ULSwap ( unsigned long &rX, unsigned long &rY )
 // -----------------------------------------------------------------------
 //
 // This way of measuring distance is also called the "Manhattan distance."
-// Manhattan distance takes advantage of the fact that the sum of the
+// Manhattan distance takes advantage of the fact that the sum of the 
 // lengths of the three components of a 3D vector is a rough approxima-
 // tion of the vector's length.
 //
@@ -110,7 +110,7 @@ void ULSwap ( unsigned long &rX, unsigned long &rY )
 unsigned long  Euclidian2Norm ( const LRectCoorVector  pVec )
 {
     unsigned long  ndist = 0;
-
+    
     if ( pVec )
     {
         long           nDX  = 0;
@@ -119,29 +119,29 @@ unsigned long  Euclidian2Norm ( const LRectCoorVector  pVec )
         unsigned long  nMax = 0;
         unsigned long  nMed = 0;
         unsigned long  nMin = 0;
-
+        
         // Find |x'-x|, |y'-y|, and |z'-z| from (x,y,z) and (x',y',z')
-
+        
         nDX = pVec[1].x - pVec[0].x;
         nDY = pVec[1].y - pVec[0].y;
         nDZ = pVec[1].z - pVec[0].z;
-
+            
         nMax = (unsigned long)abs( nDX );
         nMed = (unsigned long)abs( nDY );
         nMin = (unsigned long)abs( nDZ );
-
+        
         // Sort them (3 compares, 0-3 swaps)
-
+        
         if ( nMax < nMed )
         {
             Swap( nMax, nMed );
         } // if
-
+        
         if ( nMax < nMin )
         {
             Swap( nMax, nMin );
         } // if
-
+        
         // Approximate Euclidian distance:
         //
         //    d = max + (11/32)*med + (1/4)*min
@@ -149,11 +149,11 @@ unsigned long  Euclidian2Norm ( const LRectCoorVector  pVec )
         // with +/- 8% error, where the exact formulae for d is
         //
         //  || (x',y',z') - (x,y,z) || = { |x'-x|^2 + |y'-y|^2 + |z'-z|^2 }^(1/2)
-
-        ndist = nMax + ( nMin >> 2UL )
+        
+        ndist = nMax + ( nMin >> 2UL ) 
                      + ( ( ( nMed << 3UL ) + ( nMed << 1UL ) + nMed ) >> 5UL );
     } // if
-
+        
     return ndist;
 } // RGBDistance
 
diff --git a/vcl/aqua/source/gdi/salnativewidgets.cxx b/vcl/aqua/source/gdi/salnativewidgets.cxx
index 6e206977b5c4..1f552f538d3c 100644
--- a/vcl/aqua/source/gdi/salnativewidgets.cxx
+++ b/vcl/aqua/source/gdi/salnativewidgets.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
@@ -50,11 +50,11 @@ class AquaBlinker : public Timer
     {
         mpFrame->maBlinkers.push_back( this );
     }
-
+    
     public:
-
+    
     static void Blink( AquaSalFrame*, const Rectangle&, int nTimeout = 80 );
-
+    
     virtual void Timeout()
     {
         Stop();
@@ -218,7 +218,7 @@ static bool AquaGetScrollRect( /* TODO: int nScreen, */  ControlPart nPart,
             if( GetSalData()->mbIsScrollbarDoubleMax )
                 rResultRect.Bottom() += 8;
             else
-                rResultRect.Bottom() += 4;
+                rResultRect.Bottom() += 4;                
             break;
         case PART_TRACK_VERT_LOWER:
             if( GetSalData()->mbIsScrollbarDoubleMax )
@@ -266,25 +266,25 @@ BOOL AquaSalGraphics::IsNativeControlSupported( ControlType nType, ControlPart n
                 nPart == HAS_THREE_BUTTONS )
                 return true;
             break;
-
+            
         case CTRL_SLIDER:
             if( nPart == PART_TRACK_HORZ_AREA || nPart == PART_TRACK_VERT_AREA )
                 return true;
             break;
 
-        case CTRL_EDITBOX:
+        case CTRL_EDITBOX: 
             if( nPart == PART_ENTIRE_CONTROL ||
                 nPart == HAS_BACKGROUND_TEXTURE )
                 return true;
             break;
 
-        case CTRL_MULTILINE_EDITBOX:
+        case CTRL_MULTILINE_EDITBOX: 
             if( nPart == PART_ENTIRE_CONTROL ||
                 nPart == HAS_BACKGROUND_TEXTURE )
                 return true;
             break;
 
-        case CTRL_SPINBOX:
+        case CTRL_SPINBOX: 
             if( nPart == PART_ENTIRE_CONTROL ||
                 nPart == PART_ALL_BUTTONS    ||
                 nPart == HAS_BACKGROUND_TEXTURE )
@@ -423,14 +423,14 @@ BOOL AquaSalGraphics::hitTestNativeControl( ControlType nType, ControlPart nPart
    kThemeStatePressedUp = 2,
    kThemeStatePressedDown = 3
 
-#define CTRL_STATE_ENABLED      0x0001
-#define CTRL_STATE_FOCUSED      0x0002
-#define CTRL_STATE_PRESSED      0x0004
-#define CTRL_STATE_ROLLOVER     0x0008
-#define CTRL_STATE_HIDDEN       0x0010
-#define CTRL_STATE_DEFAULT      0x0020
-#define CTRL_STATE_SELECTED     0x0040
-#define CTRL_CACHING_ALLOWED    0x8000  // set when the control is completely visible (i.e. not clipped)
+#define CTRL_STATE_ENABLED		0x0001
+#define CTRL_STATE_FOCUSED		0x0002
+#define CTRL_STATE_PRESSED		0x0004
+#define CTRL_STATE_ROLLOVER		0x0008
+#define CTRL_STATE_HIDDEN		0x0010
+#define CTRL_STATE_DEFAULT		0x0020
+#define CTRL_STATE_SELECTED		0x0040
+#define CTRL_CACHING_ALLOWED	0x8000  // set when the control is completely visible (i.e. not clipped)
 */
 UInt32 AquaSalGraphics::getState( ControlState nState )
 {
@@ -466,9 +466,9 @@ UInt32 AquaSalGraphics::getTrackState( ControlState nState )
  *
  *  Draws the requested control described by nPart/nState.
  *
- *  rControlRegion: The bounding region of the complete control in VCL frame coordinates.
- *  aValue:     An optional value (tristate/numerical/string)
- *  aCaption:   A caption or title string (like button text etc)
+ *  rControlRegion:	The bounding region of the complete control in VCL frame coordinates.
+ *  aValue:		An optional value (tristate/numerical/string)
+ *  aCaption:	A caption or title string (like button text etc)
  */
 BOOL AquaSalGraphics::drawNativeControl(ControlType nType,
                     ControlPart nPart,
@@ -587,22 +587,22 @@ BOOL AquaSalGraphics::drawNativeControl(ControlType nType,
                 if( nState & CTRL_STATE_PRESSED ) {//checked, else it is not displayed (see vcl/source/window/menu.cxx)
                     HIThemeTextInfo aTextInfo;
                     aTextInfo.version = 0;
-                    aTextInfo.state = ((nState & CTRL_STATE_ENABLED)==0) ? kThemeStateInactive: kThemeStateActive;
+                    aTextInfo.state = ((nState & CTRL_STATE_ENABLED)==0) ? kThemeStateInactive: kThemeStateActive; 
                     aTextInfo.fontID = kThemeMenuItemMarkFont;
                     aTextInfo.horizontalFlushness=kHIThemeTextHorizontalFlushCenter;
                     aTextInfo.verticalFlushness=kHIThemeTextVerticalFlushTop;
                     aTextInfo.options=kHIThemeTextBoxOptionNone;
                     aTextInfo.truncationPosition=kHIThemeTextTruncationNone;
                     //aTextInfo.truncationMaxLines unused because of kHIThemeTextTruncationNone
-
+                    
                     if( nState & CTRL_STATE_SELECTED) aTextInfo.state = kThemeStatePressed; //item highlighted
-
+                    
                     UniChar mark=( nPart == PART_MENU_ITEM_CHECK_MARK ) ? kCheckUnicode: kBulletUnicode;//0x2713;
                     CFStringRef cfString = CFStringCreateWithCharactersNoCopy(kCFAllocatorDefault, &mark, 1, kCFAllocatorNull);
-                    HIThemeDrawTextBox(cfString, &rc, &aTextInfo, mrContext, kHIThemeOrientationNormal);
+                    HIThemeDrawTextBox(cfString, &rc, &aTextInfo, mrContext, kHIThemeOrientationNormal); 
                     if (cfString)
                         CFRelease(cfString);
-
+                    
                     bOK = true;
                 }
             }
@@ -623,7 +623,7 @@ BOOL AquaSalGraphics::drawNativeControl(ControlType nType,
             aPushInfo.animation.time.current = 0;
             PushButtonValue* pPBVal = aValue.getType() == CTRL_PUSHBUTTON ? (PushButtonValue*)&aValue : NULL;
             int nPaintHeight = static_cast<int>(rc.size.height);
-
+            
             if( pPBVal && pPBVal->mbBevelButton )
             {
                 aPushInfo.kind = kThemeRoundedBevelButton;
@@ -637,7 +637,7 @@ BOOL AquaSalGraphics::drawNativeControl(ControlType nType,
             {
                 aPushInfo.kind = kThemePushButtonNormal;
                 nPaintHeight = PB_Norm_Height;
-
+                
                 // avoid clipping when focused
                 rc.origin.x += FOCUS_RING_WIDTH/2;
                 rc.size.width -= FOCUS_RING_WIDTH;
@@ -700,11 +700,11 @@ BOOL AquaSalGraphics::drawNativeControl(ControlType nType,
             bOK = true;
         }
         break;
-
+        
     case CTRL_LISTNODE:
         {
             ButtonValue aButtonValue = aValue.getTristateVal();
-
+    
             if( Application::GetSettings().GetLayoutRTL() && aButtonValue == BUTTONVALUE_OFF )
             {
                 // FIXME: a value of kThemeDisclosureLeft
@@ -712,7 +712,7 @@ BOOL AquaSalGraphics::drawNativeControl(ControlType nType,
                 // sadly this does not seem to work, so we'll draw a left
                 // grey equilateral triangle here ourselves.
                 // Perhaps some other HIThemeButtonDrawInfo setting would do the trick ?
-
+                
                 CGContextSetShouldAntialias( mrContext, true );
                 float aGrey[] = { 0.45, 0.45, 0.45, 1.0 };
                 CGContextSetFillColor( mrContext, aGrey );
@@ -734,9 +734,9 @@ BOOL AquaSalGraphics::drawNativeControl(ControlType nType,
                 aInfo.kind = kThemeDisclosureTriangle;
                 aInfo.value = kThemeDisclosureRight;
                 aInfo.state = getState( nState );
-
+    
                 aInfo.adornment = kThemeAdornmentNone;
-
+                
                 switch( aButtonValue ) {
                     case BUTTONVALUE_ON: aInfo.value = kThemeDisclosureDown;//expanded
                         break;
@@ -752,13 +752,13 @@ BOOL AquaSalGraphics::drawNativeControl(ControlType nType,
                     default:
                         break;
                 }
-
+                
                 HIThemeDrawButton( &rc, &aInfo, mrContext, kHIThemeOrientationNormal, NULL );
             }
             bOK = true;
         }
         break;
-
+        
     case CTRL_PROGRESS:
     case CTRL_INTROPROGRESS:
         {
@@ -782,12 +782,12 @@ BOOL AquaSalGraphics::drawNativeControl(ControlType nType,
                 aTrackInfo.enableState          = kThemeTrackActive;
             aTrackInfo.filler1              = 0;
             aTrackInfo.trackInfo.progress.phase   = static_cast<UInt8>(CFAbsoluteTimeGetCurrent()*10.0);
-
+            
             HIThemeDrawTrack( &aTrackInfo, NULL, mrContext, kHIThemeOrientationNormal );
             bOK = true;
         }
         break;
-
+        
     case CTRL_SLIDER:
         {
             SliderValue* pSLVal = (SliderValue*)&aValue;
@@ -872,8 +872,8 @@ BOOL AquaSalGraphics::drawNativeControl(ControlType nType,
             }
         }
         break;
-
-//#define OLD_TAB_STYLE
+        
+//#define OLD_TAB_STYLE    
 #ifdef OLD_TAB_STYLE
     case CTRL_TAB_PANE:
         {
@@ -882,17 +882,17 @@ BOOL AquaSalGraphics::drawNativeControl(ControlType nType,
             aTabPaneDrawInfo.state = kThemeStateActive;
             aTabPaneDrawInfo.direction=kThemeTabNorth;
             aTabPaneDrawInfo.size=kHIThemeTabSizeNormal;
-
+            
             //the border is outside the rect rc for Carbon
             //but for VCL it should be inside
             rc.origin.x+=1;
             rc.size.width-=2;
-
+            
             HIThemeDrawTabPane(&rc, &aTabPaneDrawInfo, mrContext, kHIThemeOrientationNormal);
             bOK = true;
         }
         break;
-
+        
     case CTRL_TAB_ITEM:
         {
             HIThemeTabDrawInfo aTabItemDrawInfo;
@@ -901,25 +901,25 @@ BOOL AquaSalGraphics::drawNativeControl(ControlType nType,
             aTabItemDrawInfo.direction=kThemeTabNorth;
             aTabItemDrawInfo.size=kHIThemeTabSizeNormal;
             aTabItemDrawInfo.adornment=kHIThemeTabAdornmentNone;
-
+            
             if(nState & CTRL_STATE_SELECTED) {
                 aTabItemDrawInfo.style=kThemeTabFront;
             }
             if(nState & CTRL_STATE_FOCUSED) {
                 aTabItemDrawInfo.adornment=kHIThemeTabAdornmentFocus;
             }
-
+            
             /*if(rc.size.height>=TAB_HEIGHT_NORMAL) rc.size.height=TAB_HEIGHT_NORMAL;
             else if(rc.size.height>=TAB_HEIGHT_SMALL) rc.size.height=TAB_HEIGHT_SMALL;
             else rc.size.height=TAB_HEIGHT_MINI;*/
             //now we only use the default size
             rc.size.height=TAB_HEIGHT_NORMAL;
-
+            
             HIThemeDrawTab(&rc, &aTabItemDrawInfo, mrContext, kHIThemeOrientationNormal, &rc );
-
+            
             bOK=true;
         }
-        break;
+        break;    
 #else
     case CTRL_TAB_PANE:
         {
@@ -929,20 +929,20 @@ BOOL AquaSalGraphics::drawNativeControl(ControlType nType,
             aTabPaneDrawInfo.direction=kThemeTabNorth;
             aTabPaneDrawInfo.size=kHIThemeTabSizeNormal;
             aTabPaneDrawInfo.kind=kHIThemeTabKindNormal;
-
+            
             //the border is outside the rect rc for Carbon
             //but for VCL it should be inside
             rc.origin.x+=1;
             rc.origin.y-=TAB_HEIGHT_NORMAL/2;
             rc.size.height+=TAB_HEIGHT_NORMAL/2;
             rc.size.width-=2;
-
+            
             HIThemeDrawTabPane(&rc, &aTabPaneDrawInfo, mrContext, kHIThemeOrientationNormal);
-
+            
             bOK = true;
         }
         break;
-
+        
     case CTRL_TAB_ITEM:
         {
             HIThemeTabDrawInfo aTabItemDrawInfo;
@@ -951,22 +951,22 @@ BOOL AquaSalGraphics::drawNativeControl(ControlType nType,
             aTabItemDrawInfo.direction=kThemeTabNorth;
             aTabItemDrawInfo.size=kHIThemeTabSizeNormal;
             aTabItemDrawInfo.adornment=kHIThemeTabAdornmentTrailingSeparator;
-            //State
+            //State 
             if(nState & CTRL_STATE_SELECTED) {
                 aTabItemDrawInfo.style=kThemeTabFront;
             }
             if(nState & CTRL_STATE_FOCUSED) {
                 aTabItemDrawInfo.adornment|=kHIThemeTabAdornmentFocus;
             }
-
+            
             //first, last or middle tab
             aTabItemDrawInfo.position=kHIThemeTabPositionMiddle;
-
+            
             TabitemValue* pTabValue = (TabitemValue *) &aValue;
             unsigned int nAlignment = pTabValue->mnAlignment;
             //TABITEM_LEFTALIGNED (and TABITEM_RIGHTALIGNED) for the leftmost (or rightmost) tab
-            //when there are several lines of tabs because there is only one first tab and one
-            //last tab and TABITEM_FIRST_IN_GROUP (and TABITEM_LAST_IN_GROUP) because when the
+            //when there are several lines of tabs because there is only one first tab and one 
+            //last tab and TABITEM_FIRST_IN_GROUP (and TABITEM_LAST_IN_GROUP) because when the 
             //line width is different from window width, there may not be TABITEM_RIGHTALIGNED
             if( ( (nAlignment & TABITEM_LEFTALIGNED)&&(nAlignment & TABITEM_RIGHTALIGNED) ) ||
                 ( (nAlignment & TABITEM_FIRST_IN_GROUP)&&(nAlignment & TABITEM_LAST_IN_GROUP) )
@@ -974,26 +974,26 @@ BOOL AquaSalGraphics::drawNativeControl(ControlType nType,
                 aTabItemDrawInfo.position=kHIThemeTabPositionOnly;
             else if((nAlignment & TABITEM_LEFTALIGNED)||(nAlignment & TABITEM_FIRST_IN_GROUP))
                 aTabItemDrawInfo.position=kHIThemeTabPositionFirst;
-            else if((nAlignment & TABITEM_RIGHTALIGNED)||(nAlignment & TABITEM_LAST_IN_GROUP))
+            else if((nAlignment & TABITEM_RIGHTALIGNED)||(nAlignment & TABITEM_LAST_IN_GROUP)) 
                 aTabItemDrawInfo.position=kHIThemeTabPositionLast;
-
+            
             //support for RTL
             //see issue 79748
             if( Application::GetSettings().GetLayoutRTL() ) {
-                if( aTabItemDrawInfo.position == kHIThemeTabPositionFirst )
+                if( aTabItemDrawInfo.position == kHIThemeTabPositionFirst ) 
                         aTabItemDrawInfo.position = kHIThemeTabPositionLast;
-                else if( aTabItemDrawInfo.position == kHIThemeTabPositionLast )
+                else if( aTabItemDrawInfo.position == kHIThemeTabPositionLast ) 
                         aTabItemDrawInfo.position = kHIThemeTabPositionFirst;
             }
-
+            
             rc.size.width+=2;//because VCL has 2 empty pixels between 2 tabs
             rc.origin.x-=1;
-
+            
             HIThemeDrawTab(&rc, &aTabItemDrawInfo, mrContext, kHIThemeOrientationNormal, &rc );
-
+            
             bOK=true;
         }
-        break;
+        break; 
 #endif
 
     case  CTRL_LISTBOX:
@@ -1011,7 +1011,7 @@ BOOL AquaSalGraphics::drawNativeControl(ControlType nType,
                 aListInfo.adornment = kThemeAdornmentDefault;
                 if( (nState & CTRL_STATE_FOCUSED) != 0 )
                     aListInfo.adornment |= kThemeAdornmentFocus;
-
+                
                 HIThemeDrawButton(&rc, &aListInfo, mrContext, kHIThemeOrientationNormal,&rc);
                 bOK = true;
                 break;
@@ -1023,19 +1023,19 @@ BOOL AquaSalGraphics::drawNativeControl(ControlType nType,
                 aTextDrawInfo.kind=kHIThemeFrameTextFieldSquare;
                 aTextDrawInfo.state=getState( nState );
                 aTextDrawInfo.isFocused=false;
-
+                
                 rc.size.width+=1;//else there's a white space because aqua theme hasn't a 3D border
                 rc.size.height+=1;
                 HIThemeDrawFrame(&rc, &aTextDrawInfo, mrContext, kHIThemeOrientationNormal);
-
+                
                 if(nState & CTRL_STATE_FOCUSED) HIThemeDrawFocusRect(&rc, true, mrContext, kHIThemeOrientationNormal);
-
+                
                 bOK=true;
                 break;
             }
         }
         break;
-
+        
     case CTRL_EDITBOX:
     case CTRL_MULTILINE_EDITBOX:
         {
@@ -1044,11 +1044,11 @@ BOOL AquaSalGraphics::drawNativeControl(ControlType nType,
             aTextDrawInfo.kind=kHIThemeFrameTextFieldSquare;
             aTextDrawInfo.state=getState( nState );
             aTextDrawInfo.isFocused=false;
-
+            
             rc.size.width  += 1; // else there may be a white space because aqua theme hasn't a 3D border
             // change rc so that the frame will encompass only the content region
             // see counterpart in GetNativeControlRegion
-            rc.size.width  += 2;
+            rc.size.width  += 2; 
             rc.size.height += 2;
 
             //CGContextSetFillColorWithColor
@@ -1056,13 +1056,13 @@ BOOL AquaSalGraphics::drawNativeControl(ControlType nType,
             //fill a white background, because drawFrame only draws the border
 
             HIThemeDrawFrame(&rc, &aTextDrawInfo, mrContext, kHIThemeOrientationNormal);
-
+            
             if(nState & CTRL_STATE_FOCUSED) HIThemeDrawFocusRect(&rc, true, mrContext, kHIThemeOrientationNormal);
-
+            
             bOK=true;
         }
         break;
-
+        
     case CTRL_SPINBOX:
         {
             if(nPart == PART_ENTIRE_CONTROL)
@@ -1073,7 +1073,7 @@ BOOL AquaSalGraphics::drawNativeControl(ControlType nType,
                 aTextDrawInfo.kind=kHIThemeFrameTextFieldSquare;
                 aTextDrawInfo.state=getState( nState );
                 aTextDrawInfo.isFocused=false;
-
+                
                 //rc.size.width contains the full size of the spinbox ie textfield + button
                 //so we remove the button width and the space between the button and the textfield
                 rc.size.width -= SPIN_BUTTON_SPACE + SPIN_BUTTON_WIDTH + 2*FOCUS_RING_WIDTH;
@@ -1085,9 +1085,9 @@ BOOL AquaSalGraphics::drawNativeControl(ControlType nType,
                 //fill a white background, because drawFrame only draws the border
 
                 HIThemeDrawFrame(&rc, &aTextDrawInfo, mrContext, kHIThemeOrientationNormal);
-
+                
                 if(nState & CTRL_STATE_FOCUSED) HIThemeDrawFocusRect(&rc, true, mrContext, kHIThemeOrientationNormal);
-
+                
                 //buttons:
                 SpinbuttonValue* pSpinButtonVal = (SpinbuttonValue *)&aValue;
                 ControlState nUpperState = CTRL_STATE_ENABLED;//state of the upper button
@@ -1110,17 +1110,17 @@ BOOL AquaSalGraphics::drawNativeControl(ControlType nType,
                         aSpinInfo.state = kThemeStateInactive;
                     else if((nUpperState & CTRL_STATE_ROLLOVER)||(nLowerState & CTRL_STATE_ROLLOVER))
                         aSpinInfo.state = kThemeStateRollover;
-
+                
                     Rectangle aSpinRect( pSpinButtonVal->maUpperRect );
                     aSpinRect.Union( pSpinButtonVal->maLowerRect );
                     HIRect buttonRc = ImplGetHIRectFromRectangle(aSpinRect);
-
+                    
                     // FIXME: without this fuzz factor there is some unwanted clipping
                     if( Application::GetSettings().GetLayoutRTL() )
                         buttonRc.origin.x -= FOCUS_RING_WIDTH - CLIP_FUZZ;
                     else
                         buttonRc.origin.x += FOCUS_RING_WIDTH + CLIP_FUZZ;
-
+                    
                     switch( aValue.getTristateVal() )
                     {
                         case BUTTONVALUE_ON:        aSpinInfo.value = kThemeButtonOn;
@@ -1128,27 +1128,27 @@ BOOL AquaSalGraphics::drawNativeControl(ControlType nType,
                         case BUTTONVALUE_OFF:       aSpinInfo.value = kThemeButtonOff;
                                                     break;
                         case BUTTONVALUE_MIXED:
-                        case BUTTONVALUE_DONTKNOW:
+                        case BUTTONVALUE_DONTKNOW: 
                         default:                    aSpinInfo.value = kThemeButtonMixed;
                                                     break;
                     }
-
+                    
                     aSpinInfo.adornment = ( ((nUpperState & CTRL_STATE_DEFAULT) != 0 ) ||
                                             ((nLowerState & CTRL_STATE_DEFAULT) != 0 )) ?
-                                       kThemeAdornmentDefault :
+                                       kThemeAdornmentDefault : 
                                        kThemeAdornmentNone;
                     if( ((nUpperState & CTRL_STATE_FOCUSED) != 0 ) || ((nLowerState & CTRL_STATE_FOCUSED) != 0 ))
                         aSpinInfo.adornment |= kThemeAdornmentFocus;
-
+                    
                     HIThemeDrawButton( &buttonRc, &aSpinInfo, mrContext, kHIThemeOrientationNormal, NULL );
                 }
-
+                
                 bOK=true;
             }
-
+            
         }
         break;
-
+        
     case CTRL_FRAME:
         {
             USHORT nStyle = aValue.getNumericVal();
@@ -1162,38 +1162,38 @@ BOOL AquaSalGraphics::drawNativeControl(ControlType nType,
                     {
                         CGMutablePathRef rPath = CGPathCreateMutable();
                         CGPathAddRect( rPath, NULL, CGRectMake( 0, 0, mpFrame->maGeometry.nWidth-1, mpFrame->maGeometry.nHeight-1 ) );
-
+    
                         CGContextBeginPath( mrContext );
                         CGContextAddPath( mrContext, rPath );
-                        CGContextClip( mrContext );
+                        CGContextClip( mrContext );                    
                         CGPathRelease( rPath );
                     }
-
+                    
                     HIThemeFrameDrawInfo aTextDrawInfo;
                     aTextDrawInfo.version=0;
                     aTextDrawInfo.kind=kHIThemeFrameListBox;
                     aTextDrawInfo.state=kThemeStateActive;
                     aTextDrawInfo.isFocused=false;
-
+                    
                     HIThemeDrawFrame(&rc, &aTextDrawInfo, mrContext, kHIThemeOrientationNormal);
-
+                    
                     bOK=true;
                 }
             }
         }
         break;
-
+    
     case CTRL_LISTNET:
         {
            //do nothing as there isn't net for listviews on macos
             bOK=true;
         }
         break;
-
+        
     }
 
     CGContextRestoreGState( mrContext );
-
+    
     /* #i90291# in most cases invalidating the whole control region instead
        of just the unclipped part of it is sufficient (and probably faster).
        However for the window background we should not unnecessarily enlarge
@@ -1209,10 +1209,10 @@ BOOL AquaSalGraphics::drawNativeControl(ControlType nType,
         if( aRect.size.width != 0 && aRect.size.height != 0 )
             buttonRect.Intersection( Rectangle( Point( static_cast<long int>(aRect.origin.x),
                             static_cast<long int>(aRect.origin.y) ),
-                                                Size(   static_cast<long int>(aRect.size.width),
+                                                Size( 	static_cast<long int>(aRect.size.width),
                             static_cast<long int>(aRect.size.height) ) ) );
     }
-
+    
     RefreshRect( buttonRect.Left(), buttonRect.Top(), buttonRect.GetWidth(), buttonRect.GetHeight() );
 
     return bOK;
@@ -1224,9 +1224,9 @@ BOOL AquaSalGraphics::drawNativeControl(ControlType nType,
  *  OPTIONAL.  Draws the requested text for the control described by nPart/nState.
  *     Used if text not drawn by DrawNativeControl().
  *
- *  rControlRegion: The bounding region of the complete control in VCL frame coordinates.
- *  aValue:     An optional value (tristate/numerical/string)
- *  aCaption:   A caption or title string (like button text etc)
+ *  rControlRegion:	The bounding region of the complete control in VCL frame coordinates.
+ *  aValue:		An optional value (tristate/numerical/string)
+ *  aCaption:	A caption or title string (like button text etc)
  */
 BOOL AquaSalGraphics::drawNativeControlText( ControlType nType, ControlPart nPart, const Rectangle& rControlRegion,
                                                ControlState nState, const ImplControlValue& aValue,
@@ -1245,9 +1245,9 @@ BOOL AquaSalGraphics::drawNativeControlText( ControlType nType, ControlPart nPar
  *  within the control that can be safely drawn into without drawing over
  *  the borders of the control.
  *
- *  rControlRegion: The bounding region of the control in VCL frame coordinates.
- *  aValue:     An optional value (tristate/numerical/string)
- *  aCaption:       A caption or title string (like button text etc)
+ *  rControlRegion:	The bounding region of the control in VCL frame coordinates.
+ *  aValue:		An optional value (tristate/numerical/string)
+ *  aCaption:		A caption or title string (like button text etc)
  */
 BOOL AquaSalGraphics::getNativeControlRegion( ControlType nType, ControlPart nPart, const Rectangle& rControlRegion, ControlState nState,
                                                const ImplControlValue& aValue, const rtl::OUString& aCaption,
@@ -1260,7 +1260,7 @@ BOOL AquaSalGraphics::getNativeControlRegion( ControlType nType, ControlPart nPa
     short x = aCtrlBoundRect.Left();
     short y = aCtrlBoundRect.Top();
     short w, h;
-
+    
     sal_uInt8 nBorderCleanup = 0;
 
     switch (nType)
@@ -1283,7 +1283,7 @@ BOOL AquaSalGraphics::getNativeControlRegion( ControlType nType, ControlPart nPa
                 }
             }
             break;
-
+            
         case CTRL_SCROLLBAR:
             {
                 Rectangle aRect;
@@ -1309,16 +1309,16 @@ BOOL AquaSalGraphics::getNativeControlRegion( ControlType nType, ControlPart nPa
                 {
                     // checkbox and radio borders need cleanup after unchecking them
                     nBorderCleanup = 4;
-
+    
                     // TEXT_SEPARATOR to respect Aqua HIG
                     w = BUTTON_WIDTH + TEXT_SEPARATOR;
                     h = BUTTON_HEIGHT;
-
+    
                 }
-
+    
                 rNativeContentRegion = Rectangle( Point( x, y ), Size( w, h + nBorderCleanup) );
                 rNativeBoundingRegion = Rectangle( Point( x, y ), Size( w, h ) );
-
+    
                 toReturn = TRUE;
             }
             break;
@@ -1334,7 +1334,7 @@ BOOL AquaSalGraphics::getNativeControlRegion( ControlType nType, ControlPart nPa
                 toReturn = TRUE;
             }
             break;
-
+            
         case CTRL_INTROPROGRESS:
             {
                 Rectangle aRect( aCtrlBoundRect );
@@ -1344,11 +1344,11 @@ BOOL AquaSalGraphics::getNativeControlRegion( ControlType nType, ControlPart nPa
                 toReturn = TRUE;
             }
             break;
-
+            
          case CTRL_TAB_ITEM:
-
+         
             w = aCtrlBoundRect.GetWidth() + 2*TAB_TEXT_OFFSET - 2*VCL_TAB_TEXT_OFFSET;
-
+            
 #ifdef OLD_TAB_STYLE
             h = TAB_HEIGHT_NORMAL;
 #else
@@ -1358,9 +1358,9 @@ BOOL AquaSalGraphics::getNativeControlRegion( ControlType nType, ControlPart nPa
             rNativeBoundingRegion = Rectangle( Point( x, y ), Size( w, h ) );
 
             toReturn = TRUE;
-
+         
             break;
-
+            
         case CTRL_EDITBOX:
             {
                 w = aCtrlBoundRect.GetWidth();
@@ -1370,7 +1370,7 @@ BOOL AquaSalGraphics::getNativeControlRegion( ControlType nType, ControlPart nPa
 
                 rNativeContentRegion = Rectangle( Point( x+FOCUS_RING_WIDTH, y+FOCUS_RING_WIDTH ), Size( w-2*FOCUS_RING_WIDTH-2, h-2 ) );
                 rNativeBoundingRegion = Rectangle( Point( x, y ), Size( w, h+2*FOCUS_RING_WIDTH ) );
-
+                
                 toReturn = TRUE;
             }
             break;
@@ -1381,10 +1381,10 @@ BOOL AquaSalGraphics::getNativeControlRegion( ControlType nType, ControlPart nPa
                 {
                     w = aCtrlBoundRect.GetWidth();
                     h = COMBOBOX_HEIGHT_NORMAL;//listboxes and comboxes have the same height
-
+                    
                     rNativeContentRegion = Rectangle( Point( x+FOCUS_RING_WIDTH, y+FOCUS_RING_WIDTH ), Size( w-2*FOCUS_RING_WIDTH, h ) );
                     rNativeBoundingRegion = Rectangle( Point( x, y ), Size( w, h+2*FOCUS_RING_WIDTH ) );
-
+                    
                     toReturn = TRUE;
                 }
                 else if( nPart == PART_BUTTON_DOWN )
@@ -1393,14 +1393,14 @@ BOOL AquaSalGraphics::getNativeControlRegion( ControlType nType, ControlPart nPa
                 if( w < 3+2*FOCUS_RING_WIDTH )
                     w = 3+2*FOCUS_RING_WIDTH;
                     h = COMBOBOX_HEIGHT_NORMAL;//listboxes and comboxes have the same height
-
+                    
                     x += w-DROPDOWN_BUTTON_WIDTH - FOCUS_RING_WIDTH;
                     y += FOCUS_RING_WIDTH;
                     w = DROPDOWN_BUTTON_WIDTH;
-
+                    
                     rNativeContentRegion = Rectangle( Point( x, y ), Size( w, h ) );
                     rNativeBoundingRegion = Rectangle( Point( x, y ), Size( w+FOCUS_RING_WIDTH, h+2*FOCUS_RING_WIDTH ) );
-
+                    
                     toReturn = true;
                 }
                 else if( nPart == PART_SUB_EDIT )
@@ -1416,10 +1416,10 @@ BOOL AquaSalGraphics::getNativeControlRegion( ControlType nType, ControlPart nPa
                     if( nType == CTRL_LISTBOX )
                         w -= 9; // HIG specifies 9 units distance between dropdown button area and content
                     h -= 4; // don't draw into lower border
-
+                    
                     rNativeContentRegion = Rectangle( Point( x, y ), Size( w, h ) );
                     rNativeBoundingRegion = Rectangle( Point( x, y ), Size( w+FOCUS_RING_WIDTH, h+2*FOCUS_RING_WIDTH ) );
-
+                    
                     toReturn = true;
                 }
             }
@@ -1430,10 +1430,10 @@ BOOL AquaSalGraphics::getNativeControlRegion( ControlType nType, ControlPart nPa
                     if( w < 3+2*FOCUS_RING_WIDTH+SPIN_BUTTON_SPACE+SPIN_BUTTON_WIDTH )
                         w = 3+2*FOCUS_RING_WIDTH+SPIN_BUTTON_SPACE+SPIN_BUTTON_WIDTH;
                     h = TEXT_EDIT_HEIGHT_NORMAL;
-
+                    
                     rNativeContentRegion = Rectangle( Point( x+FOCUS_RING_WIDTH, y ), Size( w-2*FOCUS_RING_WIDTH, h ) );
                     rNativeBoundingRegion = Rectangle( Point( x, y ), Size( w, h+2*FOCUS_RING_WIDTH ) );
-
+                    
                     toReturn = TRUE;
                 }
                 else if( nPart == PART_SUB_EDIT ) {
@@ -1443,10 +1443,10 @@ BOOL AquaSalGraphics::getNativeControlRegion( ControlType nType, ControlPart nPa
                     y += 2; // don't draw into upper border
                     w -= 8; // offset for left and right rounded border
                     h -= 4; // don't draw into upper or ower border
-
+                    
                     rNativeContentRegion = Rectangle( Point( x + FOCUS_RING_WIDTH, y + FOCUS_RING_WIDTH ), Size( w - 2* FOCUS_RING_WIDTH, h ) );
                     rNativeBoundingRegion = Rectangle( Point( x, y ), Size( w, h+2*FOCUS_RING_WIDTH ) );
-
+                    
                     toReturn = TRUE;
                 }
                 else if( nPart == PART_BUTTON_UP ) {
@@ -1457,10 +1457,10 @@ BOOL AquaSalGraphics::getNativeControlRegion( ControlType nType, ControlPart nPa
                     y += FOCUS_RING_WIDTH - CLIP_FUZZ;
                     w = SPIN_BUTTON_WIDTH + 2*CLIP_FUZZ;
                     h = SPIN_UPPER_BUTTON_HEIGHT + 2*CLIP_FUZZ;
-
+                    
                     rNativeContentRegion = Rectangle( Point( x, y ), Size( w, h ) );
                     rNativeBoundingRegion = Rectangle( Point( x, y ), Size( w, h ) );
-
+                    
                     toReturn = TRUE;
                 }
                 else if( nPart == PART_BUTTON_DOWN ) {
@@ -1468,10 +1468,10 @@ BOOL AquaSalGraphics::getNativeControlRegion( ControlType nType, ControlPart nPa
                     y += SPIN_UPPER_BUTTON_HEIGHT + FOCUS_RING_WIDTH - CLIP_FUZZ;
                     w = SPIN_BUTTON_WIDTH + 2*CLIP_FUZZ;
                     h = SPIN_LOWER_BUTTON_HEIGHT + 2*CLIP_FUZZ;
-
+                    
                     rNativeContentRegion = Rectangle( Point( x, y ), Size( w, h ) );
                     rNativeBoundingRegion = Rectangle( Point( x, y ), Size( w, h ) );
-
+                    
                     toReturn = TRUE;
                 }
             break;
@@ -1484,38 +1484,38 @@ BOOL AquaSalGraphics::getNativeControlRegion( ControlType nType, ControlPart nPa
                     Rectangle aRect(aCtrlBoundRect);
                     if( nStyle & FRAME_DRAW_DOUBLEIN )
                     {
-                        aRect.Left()    += 1;
-                        aRect.Top()     += 1;
-                        //rRect.Right() -= 1;
-                        //rRect.Bottom()    -= 1;
+                        aRect.Left()	+= 1;
+                        aRect.Top() 	+= 1;
+                        //rRect.Right()	-= 1;
+                        //rRect.Bottom()	-= 1;
                     }
                     else
                     {
-                        aRect.Left()    += 1;
-                        aRect.Top()     += 1;
-                        aRect.Right()   -= 1;
-                        aRect.Bottom()  -= 1;
+                        aRect.Left()	+= 1;
+                        aRect.Top() 	+= 1;
+                        aRect.Right()	-= 1;
+                        aRect.Bottom()	-= 1;
                     }
 
                     rNativeContentRegion = aRect;
                     rNativeBoundingRegion = aRect;
-
+                    
                     toReturn = TRUE;
                 }
             }
             break;
-
+            
         case CTRL_MENUBAR:
         case CTRL_MENU_POPUP:
             {
                 if(( nPart == PART_MENU_ITEM_CHECK_MARK )||( nPart == PART_MENU_ITEM_RADIO_MARK )) {
-
+                    
                     w=10;
                     h=10;//dimensions of the mark (10px font)
-
+                    
                     rNativeContentRegion = Rectangle( Point( x, y ), Size( w, h ) );
                     rNativeBoundingRegion = Rectangle( Point( x, y ), Size( w, h ) );
-
+                    
                     toReturn = TRUE;
                 }
             }
diff --git a/vcl/aqua/source/gdi/salprn.cxx b/vcl/aqua/source/gdi/salprn.cxx
index ff4edcbf83f9..544bc039ef98 100644
--- a/vcl/aqua/source/gdi/salprn.cxx
+++ b/vcl/aqua/source/gdi/salprn.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
@@ -72,7 +72,7 @@ AquaSalInfoPrinter::AquaSalInfoPrinter( const SalPrinterQueueInfo& i_rQueue ) :
     NSString* pStr = CreateNSString( i_rQueue.maPrinterName );
     mpPrinter = [NSPrinter printerWithName: pStr];
     [pStr release];
-
+    
     NSPrintInfo* pShared = [NSPrintInfo sharedPrintInfo];
     if( pShared )
     {
@@ -81,13 +81,13 @@ AquaSalInfoPrinter::AquaSalInfoPrinter( const SalPrinterQueueInfo& i_rQueue ) :
         mePageOrientation = ([mpPrintInfo orientation] == NSLandscapeOrientation) ? ORIENTATION_LANDSCAPE : ORIENTATION_PORTRAIT;
         [mpPrintInfo setOrientation: NSPortraitOrientation];
     }
-
+    
     mpGraphics = new AquaSalGraphics();
-
+    
     const int nWidth = 100, nHeight = 100;
     maContextMemory.reset( reinterpret_cast<sal_uInt8*>( rtl_allocateMemory( nWidth * 4 * nHeight ) ),
                            boost::bind( rtl_freeMemory, _1 ) );
-
+    
     if( maContextMemory )
     {
         mrContext = CGBitmapContextCreate( maContextMemory.get(), nWidth, nHeight, 8, nWidth * 4, GetSalData()->mxRGBSpace, kCGImageAlphaNoneSkipFirst );
@@ -124,7 +124,7 @@ void AquaSalInfoPrinter::SetupPrinterGraphics( CGContextRef i_rContext ) const
             // FIXME: get printer resolution
             long nDPIX = 720, nDPIY = 720;
             NSSize aPaperSize = [mpPrintInfo paperSize];
-
+            
             NSRect aImageRect = [mpPrintInfo imageablePageBounds];
             if( mePageOrientation == ORIENTATION_PORTRAIT )
             {
@@ -232,7 +232,7 @@ static Paper recognizePaper( double i_fWidth, double i_fHeight )
         aPaper = PAPER_USER;
         break;
     }
-
+    
     if( aPaper == PAPER_USER )
     {
         // search with fuzz factor
@@ -247,7 +247,7 @@ static Paper recognizePaper( double i_fWidth, double i_fHeight )
             }
         }
     }
-
+    
     return aPaper;
 }
 
@@ -257,9 +257,9 @@ BOOL AquaSalInfoPrinter::SetPrinterData( ImplJobSetup* io_pSetupData )
     if( io_pSetupData && io_pSetupData->mpDriverData )
         return SetData( ~0, io_pSetupData );
 
-
+    
     BOOL bSuccess = TRUE;
-
+    
     // set system type
     io_pSetupData->mnSystem = JOBSETUP_SYSTEM_MAC;
 
@@ -281,17 +281,17 @@ BOOL AquaSalInfoPrinter::SetPrinterData( ImplJobSetup* io_pSetupData )
             io_pSetupData->mnPaperHeight = 0;
         }
 
-        // set orientation
+        // set orientation        
         io_pSetupData->meOrientation = mePageOrientation;
-
+        
         io_pSetupData->mnPaperBin = 0;
         io_pSetupData->mpDriverData = reinterpret_cast<BYTE*>(rtl_allocateMemory( 4 ));
         io_pSetupData->mnDriverDataLen = 4;
     }
     else
         bSuccess = FALSE;
-
-
+    
+    
     return bSuccess;
 }
 
@@ -299,10 +299,10 @@ BOOL AquaSalInfoPrinter::SetPrinterData( ImplJobSetup* io_pSetupData )
 
 void AquaSalInfoPrinter::setPaperSize( long i_nWidth, long i_nHeight, Orientation i_eSetOrientation )
 {
-
+            
     Orientation ePaperOrientation = ORIENTATION_PORTRAIT;
     const PaperInfo* pPaper = matchPaper( i_nWidth, i_nHeight, ePaperOrientation );
-
+    
     if( pPaper )
     {
         NSString* pPaperName = [CreateNSString( rtl::OStringToOUString(PaperInfo::toPSName(pPaper->getPaper()), RTL_TEXTENCODING_ASCII_US) ) autorelease];
@@ -324,7 +324,7 @@ BOOL AquaSalInfoPrinter::SetData( ULONG i_nFlags, ImplJobSetup* io_pSetupData )
     if( ! io_pSetupData || io_pSetupData->mnSystem != JOBSETUP_SYSTEM_MAC )
         return FALSE;
 
-
+    
     if( mpPrintInfo )
     {
         if( (i_nFlags & SAL_JOBSET_ORIENTATION) != 0 )
@@ -350,11 +350,11 @@ BOOL AquaSalInfoPrinter::SetData( ULONG i_nFlags, ImplJobSetup* io_pSetupData )
                 width = static_cast<long>(PtTo10Mu( w ));
                 height = static_cast<long>(PtTo10Mu( h ));
             }
-
+            
             setPaperSize( width, height, mePageOrientation );
-        }
+        }        
     }
-
+    
     return mpPrintInfo != nil;
 }
 
@@ -488,7 +488,7 @@ void AquaSalInfoPrinter::GetPageInfo( const ImplJobSetup*,
         o_rPageOffY   = static_cast<long>( (aPaperSize.height - aImageRect.size.height - aImageRect.origin.y) * fYScaling );
         o_rOutWidth   = static_cast<long>( aImageRect.size.width * fXScaling );
         o_rOutHeight  = static_cast<long>( aImageRect.size.height * fYScaling );
-
+        
         if( mePageOrientation == ORIENTATION_LANDSCAPE )
         {
             std::swap( o_rOutWidth, o_rOutHeight );
@@ -525,20 +525,20 @@ BOOL AquaSalInfoPrinter::StartJob( const String* i_pFileName,
 {
     if( mbJob )
         return FALSE;
-
+    
     BOOL bSuccess = FALSE;
     bool bWasAborted = false;
     AquaSalInstance* pInst = GetSalData()->mpFirstInstance;
     PrintAccessoryViewState aAccViewState;
     sal_Int32 nAllPages = 0;
-
+    
     // reset IsLastPage
     i_rController.setLastPage( sal_False );
 
     // update job data
     if( i_pSetupData )
         SetData( ~0, i_pSetupData );
-
+    
     // do we want a progress panel ?
     sal_Bool bShowProgressPanel = sal_True;
     beans::PropertyValue* pMonitor = i_rController.getValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "MonitorVisible" ) ) );
@@ -579,21 +579,21 @@ BOOL AquaSalInfoPrinter::StartJob( const String* i_pFileName,
                 mnCurPageRangeCount = 0;
                 nAllPages = i_rController.getFilteredPageCount();
             }
-
+            
             aAccViewState.bNeedRestart = false;
-
+            
             Size aCurSize( 21000, 29700 );
             if( nAllPages > 0 )
             {
                 mnCurPageRangeCount = 1;
                 aCurSize = getPageSize( i_rController, mnCurPageRangeStart );
                 Size aNextSize( aCurSize );
-
+                
                 // print pages up to a different size
                 while( mnCurPageRangeCount + mnCurPageRangeStart < nAllPages )
                 {
                     aNextSize = getPageSize( i_rController, mnCurPageRangeStart + mnCurPageRangeCount );
-                    if( aCurSize == aNextSize // same page size
+                    if( aCurSize == aNextSize // same page size 
                         ||
                         (aCurSize.Width() == aNextSize.Height() && aCurSize.Height() == aNextSize.Width()) // same size, but different orientation
                         )
@@ -606,7 +606,7 @@ BOOL AquaSalInfoPrinter::StartJob( const String* i_pFileName,
             }
             else
                 mnCurPageRangeCount = 0;
-
+    
             // now for the current run
             mnStartPageOffsetX = mnStartPageOffsetY = 0;
             // setup the paper size and orientation
@@ -618,12 +618,12 @@ BOOL AquaSalInfoPrinter::StartJob( const String* i_pFileName,
             boost::shared_ptr<Printer> pPrinter( i_rController.getPrinter() );
             pPrinter->SetMapMode( MapMode( MAP_100TH_MM ) );
             pPrinter->SetPaperSizeUser( aCurSize, true );
-
+    
             // create view
             NSView* pPrintView = [[AquaPrintView alloc] initWithController: &i_rController withInfoPrinter: this];
-
+            
             NSMutableDictionary* pPrintDict = [mpPrintInfo dictionary];
-
+                
             // set filename
             if( i_pFileName )
             {
@@ -632,7 +632,7 @@ BOOL AquaSalInfoPrinter::StartJob( const String* i_pFileName,
                 [pPrintDict setObject: pPath forKey: NSPrintSavePath];
                 [pPath release];
             }
-
+         
             [pPrintDict setObject: [[NSNumber numberWithInt: nCopies] autorelease] forKey: NSPrintCopies];
             if( nCopies > 1 )
                 [pPrintDict setObject: [[NSNumber numberWithBool: pPrinter->IsCollateCopy()] autorelease] forKey: NSPrintMustCollate];
@@ -642,25 +642,25 @@ BOOL AquaSalInfoPrinter::StartJob( const String* i_pFileName,
             // leads do a double free malloc error. Why this value should behave differently from all the others
             // is a mystery.
             [pPrintDict setObject: [NSNumber numberWithInt: mnCurPageRangeCount] forKey: NSPrintLastPage];
-
-
+                
+                
             // create print operation
             NSPrintOperation* pPrintOperation = [NSPrintOperation printOperationWithView: pPrintView printInfo: mpPrintInfo];
-
+            
             if( pPrintOperation )
             {
                 NSObject* pReleaseAfterUse = nil;
                 bool bShowPanel = (! i_rController.isDirectPrint() && getUseNativeDialog() && i_rController.isShowDialogs() );
                 [pPrintOperation setShowsPrintPanel: bShowPanel ? YES : NO ];
                 [pPrintOperation setShowsProgressPanel: bShowProgressPanel ? YES : NO];
-
+    
                 // set job title (since MacOSX 10.5)
                 if( [pPrintOperation respondsToSelector: @selector(setJobTitle:)] )
                     [pPrintOperation performSelector: @selector(setJobTitle:) withObject: [CreateNSString( i_rJobName ) autorelease]];
-
+    
                 if( bShowPanel && mnCurPageRangeStart == 0 && nCurJob == 0) // only the first range of pages (in the first job) gets the accesory view
                     pReleaseAfterUse = [AquaPrintAccessoryView setupPrinterPanel: pPrintOperation withController: &i_rController withState: &aAccViewState];
-
+        
                 bSuccess = TRUE;
                 mbJob = true;
                 pInst->startedPrintJob();
@@ -671,12 +671,12 @@ BOOL AquaSalInfoPrinter::StartJob( const String* i_pFileName,
                 if( pReleaseAfterUse )
                     [pReleaseAfterUse release];
             }
-
+            
             mnCurPageRangeStart += mnCurPageRangeCount;
             mnCurPageRangeCount = 1;
         } while( aAccViewState.bNeedRestart || mnCurPageRangeStart + mnCurPageRangeCount < nAllPages );
     }
-
+    
     // inform application that it can release its data
     // this is awkward, but the XRenderable interface has no method for this,
     // so we need to call XRenderadble::render one last time with IsLastPage = TRUE
@@ -685,11 +685,11 @@ BOOL AquaSalInfoPrinter::StartJob( const String* i_pFileName,
     if( mrContext )
         SetupPrinterGraphics( mrContext );
     i_rController.getFilteredPageFile( 0, aPageFile );
-
+    
     i_rController.setJobState( bWasAborted
                              ? view::PrintableState_JOB_ABORTED
                              : view::PrintableState_JOB_SPOOLED );
-
+    
     mnCurPageRangeStart = mnCurPageRangeCount = 0;
 
     return bSuccess;
@@ -709,7 +709,7 @@ BOOL AquaSalInfoPrinter::EndJob()
 BOOL AquaSalInfoPrinter::AbortJob()
 {
     mbJob = false;
-
+    
     // FIXME: implementation
     return FALSE;
 }
@@ -720,11 +720,11 @@ SalGraphics* AquaSalInfoPrinter::StartPage( ImplJobSetup* i_pSetupData, BOOL i_b
 {
     if( i_bNewJobData && i_pSetupData )
         SetPrinterData( i_pSetupData );
-
+    
     CGContextRef rContext = reinterpret_cast<CGContextRef>([[NSGraphicsContext currentContext] graphicsPort]);
-
+    
     SetupPrinterGraphics( rContext );
-
+    
     return mpGraphics;
 }
 
@@ -820,7 +820,7 @@ void AquaSalInfoPrinter::InitPaperFormats( const ImplJobSetup* i_pSetupData )
 {
     m_aPaperFormats.clear();
     m_bPapersInit = true;
-
+    
     if( mpPrinter )
     {
         if( [mpPrinter statusForTable: @"PPD"] == NSPrinterTableOK )
@@ -849,7 +849,7 @@ const PaperInfo* AquaSalInfoPrinter::matchPaper( long i_nWidth, long i_nHeight,
 {
     if( ! m_bPapersInit )
         const_cast<AquaSalInfoPrinter*>(this)->InitPaperFormats( NULL );
-
+    
     const PaperInfo* pMatch = NULL;
     o_rOrientation = ORIENTATION_PORTRAIT;
     for( int n = 0; n < 2 ; n++ )
diff --git a/vcl/aqua/source/gdi/salvd.cxx b/vcl/aqua/source/gdi/salvd.cxx
index eb09a44f5edd..b91faf6892ee 100644
--- a/vcl/aqua/source/gdi/salvd.cxx
+++ b/vcl/aqua/source/gdi/salvd.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
@@ -43,7 +43,7 @@ SalVirtualDevice* AquaSalInstance::CreateVirtualDevice( SalGraphics* pGraphics,
 {
     // #i92075# can be called first in a thread
     SalData::ensureThreadAutoreleasePool();
-
+    
     return new AquaSalVirtualDevice( static_cast< AquaSalGraphics* >( pGraphics ), nDX, nDY, nBitCount, pData );
 }
 
@@ -57,10 +57,10 @@ void AquaSalInstance::DestroyVirtualDevice( SalVirtualDevice* pDevice )
 // =======================================================================
 
 AquaSalVirtualDevice::AquaSalVirtualDevice( AquaSalGraphics* pGraphic, long nDX, long nDY, USHORT nBitCount, const SystemGraphicsData *pData )
-:   mbGraphicsUsed( false )
-,   mxBitmapContext( NULL )
-,   mnBitmapDepth( 0 )
-,   mxLayer( NULL )
+:	mbGraphicsUsed( false )
+,	mxBitmapContext( NULL )
+,	mnBitmapDepth( 0 )
+,	mxLayer( NULL )
 {
     if( pGraphic && pData && pData->rCGContext )
     {
@@ -90,7 +90,7 @@ AquaSalVirtualDevice::AquaSalVirtualDevice( AquaSalGraphics* pGraphic, long nDX,
 
         if( nDX && nDY )
             SetSize( nDX, nDY );
-
+        
         // NOTE: if SetSize does not succeed, we just ignore the nDX and nDY
     }
 }
@@ -202,9 +202,9 @@ BOOL AquaSalVirtualDevice::SetSize( long nDX, long nDY )
                 xCGContext = reinterpret_cast<CGContextRef>([pNSContext graphicsPort]);
         }
     }
-
+    
     DBG_ASSERT( xCGContext, "no context" );
-
+    
     const CGSize aNewSize = { nDX, nDY };
     mxLayer = CGLayerCreateWithContext( xCGContext, aNewSize, NULL );
 
diff --git a/vcl/aqua/source/window/salframe.cxx b/vcl/aqua/source/window/salframe.cxx
index b14354e1b4bd..9406e783ef06 100644
--- a/vcl/aqua/source/window/salframe.cxx
+++ b/vcl/aqua/source/window/salframe.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
@@ -92,7 +92,7 @@ AquaSalFrame::AquaSalFrame( SalFrame* pParent, ULONG salFrameStyle ) :
     maSysData.nSize     = sizeof( SystemEnvData );
 
     mpParent = dynamic_cast<AquaSalFrame*>(pParent);
-
+    
     initWindowAndView();
 
     SalData* pSalData = GetSalData();
@@ -111,20 +111,20 @@ AquaSalFrame::~AquaSalFrame()
 
     // cleanup clipping stuff
     ResetClipRegion();
-
+    
     [SalFrameView unsetMouseFrame: this];
-
+    
     SalData* pSalData = GetSalData();
     pSalData->maFrames.remove( this );
     pSalData->maFrameCheck.erase( this );
-
+    
     DBG_ASSERT( this != s_pCaptureFrame, "capture frame destroyed" );
     if( this == s_pCaptureFrame )
         s_pCaptureFrame = NULL;
 
     if ( mpGraphics )
         delete mpGraphics;
-
+    
     if( mpDockMenuEntry )
         // life cycle comment: the menu has ownership of the item, so no release
         [AquaSalInstance::GetDynamicDockMenu() removeItem: mpDockMenuEntry];
@@ -150,12 +150,12 @@ void AquaSalFrame::initWindowAndView()
     // calculate some default geometry
     NSRect aVisibleRect = [pScreen visibleFrame];
     CocoaToVCL( aVisibleRect );
-
+    
     maGeometry.nX = static_cast<int>(aVisibleRect.origin.x + aVisibleRect.size.width / 10);
     maGeometry.nY = static_cast<int>(aVisibleRect.origin.y + aVisibleRect.size.height / 10);
     maGeometry.nWidth = static_cast<unsigned int>(aVisibleRect.size.width * 0.8);
     maGeometry.nHeight = static_cast<unsigned int>(aVisibleRect.size.height * 0.8);
-
+    
     // calculate style mask
     if( (mnStyle & SAL_FRAME_STYLE_FLOAT) ||
         (mnStyle & SAL_FRAME_STYLE_OWNERDRAWDECORATION) )
@@ -190,7 +190,7 @@ void AquaSalFrame::initWindowAndView()
         if( mnStyleMask != 0 )
             mnStyleMask |= NSTitledWindowMask;
     }
-
+    
     mpWindow = [[SalFrameWindow alloc] initWithSalFrame: this];
     mpView = [[SalFrameView alloc] initWithSalFrame: this];
     if( (mnStyle & SAL_FRAME_STYLE_TOOLTIP) )
@@ -199,14 +199,14 @@ void AquaSalFrame::initWindowAndView()
         [mpWindow setAcceptsMouseMovedEvents: YES];
     [mpWindow setHasShadow: YES];
     [mpWindow setDelegate: mpWindow];
-
+    
     NSRect aRect = { { 0,0 }, { maGeometry.nWidth, maGeometry.nHeight } };
     mnTrackingRectTag = [mpView addTrackingRect: aRect owner: mpView userData: nil assumeInside: NO];
-
+    
     maSysData.pView = mpView;
-
+    
     UpdateFrameGeometry();
-
+    
     // setContentView causes a display; in multithreaded use this can deadlock
     //YieldMutexReleaser aRel;
     [mpWindow setContentView: mpView];
@@ -251,7 +251,7 @@ void AquaSalFrame::VCLToCocoa( NSPoint& io_rPoint, bool bRelativeToScreen )
 void AquaSalFrame::screenParametersChanged()
 {
     UpdateFrameGeometry();
-
+    
     if( mpGraphics )
         mpGraphics->updateResolution();
     CallCallback( SALEVENT_DISPLAYCHANGED, 0 );
@@ -295,7 +295,7 @@ void AquaSalFrame::SetTitle(const XubString& rTitle)
 {
     NSString* pTitle = CreateNSString( rTitle );
     [mpWindow setTitle: pTitle];
-
+    
     // create an entry in the dock menu
     const ULONG nAppWindowStyle = (SAL_FRAME_STYLE_CLOSEABLE | SAL_FRAME_STYLE_MOVEABLE);
     if( mpParent == NULL &&
@@ -309,14 +309,14 @@ void AquaSalFrame::SetTitle(const XubString& rTitle)
                                      keyEquivalent: @""
                                      atIndex: 0];
             [mpDockMenuEntry setTarget: mpWindow];
-
+            
             // TODO: image (either the generic window image or an icon
             // check mark (for "main" window ?)
         }
         else
             [mpDockMenuEntry setTitle: pTitle];
     }
-
+    
     if (pTitle)
         [pTitle release];
 }
@@ -378,7 +378,7 @@ void AquaSalFrame::initShow()
             SetPosSize( nNewX, nNewY, 0, 0,  SAL_FRAME_POSSIZE_X | SAL_FRAME_POSSIZE_Y );
         }
     }
-
+    
     // make sure the view is present in the wrapper list before any children receive focus
     [AquaA11yFactory registerView: mpView];
 }
@@ -393,7 +393,7 @@ void AquaSalFrame::SendPaintEvent( const Rectangle* pRect )
         aPaintEvt.mnBoundWidth  = pRect->GetWidth();
         aPaintEvt.mnBoundHeight = pRect->GetHeight();
     }
-
+    
     CallCallback(SALEVENT_PAINT, &aPaintEvt);
 }
 
@@ -406,23 +406,23 @@ void AquaSalFrame::Show(BOOL bVisible, BOOL bNoActivate)
     {
         if( mbInitShow )
             initShow();
-
+        
         CallCallback(SALEVENT_RESIZE, 0);
         // trigger filling our backbuffer
         SendPaintEvent();
-
+        
         //YieldMutexReleaser aRel;
 
         if( bNoActivate || [mpWindow canBecomeKeyWindow] == NO )
             [mpWindow orderFront: NSApp];
         else
             [mpWindow makeKeyAndOrderFront: NSApp];
-
+        
         if( mpParent )
         {
             /* #i92674# #i96433# we do not want an invisible parent to show up (which adding a visible
                child implicitly does). However we also do not want a parentless toolbar.
-
+               
                HACK: try to decide when we should not insert a child to its parent
                floaters and ownerdraw windows have not yet shown up in cases where
                we don't want the parent to become visible
@@ -432,7 +432,7 @@ void AquaSalFrame::Show(BOOL bVisible, BOOL bNoActivate)
                 [mpParent->mpWindow addChildWindow: mpWindow ordered: NSWindowAbove];
             }
         }
-
+        
         if( mbPresentation )
             [mpWindow makeMainWindow];
     }
@@ -449,11 +449,11 @@ void AquaSalFrame::Show(BOOL bVisible, BOOL bNoActivate)
         // if a child gets hidden for a parent window
         if( mpParent && mpParent->mbShown && [mpWindow isKeyWindow] )
             [mpParent->mpWindow makeKeyAndOrderFront: NSApp];
-
+        
         [SalFrameView unsetMouseFrame: this];
         if( mpParent && [mpWindow parentWindow] == mpParent->mpWindow )
             [mpParent->mpWindow removeChildWindow: mpWindow];
-
+        
         [mpWindow orderOut: NSApp];
     }
 }
@@ -519,7 +519,7 @@ void AquaSalFrame::SetClientSize( long nWidth, long nHeight )
     if( mpWindow )
     {
         NSSize aSize = { nWidth, nHeight };
-
+        
         [mpWindow setContentSize: aSize];
         UpdateFrameGeometry();
         if( mbShown )
@@ -562,7 +562,7 @@ void AquaSalFrame::SetWindowState( const SalFrameState* pState )
         aStateRect.size.height = float(pState->mnHeight);
     VCLToCocoa( aStateRect );
     aStateRect = [NSWindow frameRectForContentRect: aStateRect styleMask: mnStyleMask];
-
+    
     // relase and acquire mutex again since this call can block waiting for an internal lock
     {
         //YieldMutexReleaser aRel;
@@ -570,10 +570,10 @@ void AquaSalFrame::SetWindowState( const SalFrameState* pState )
     }
 
     // FIXME: HTH maximized state ?
-
+    
     // get new geometry
     UpdateFrameGeometry();
-
+    
     USHORT nEvent = 0;
     if( pState->mnMask & (SAL_FRAMESTATE_MASK_X | SAL_FRAMESTATE_MASK_X) )
     {
@@ -597,7 +597,7 @@ void AquaSalFrame::SetWindowState( const SalFrameState* pState )
 
         // tell the system the views need to be updated
         //YieldMutexReleaser aRel;
-
+        
         [mpWindow display];
     }
 }
@@ -625,9 +625,9 @@ BOOL AquaSalFrame::GetWindowState( SalFrameState* pState )
     pState->mnY         = long(aStateRect.origin.y);
     pState->mnWidth     = long(aStateRect.size.width);
     pState->mnHeight    = long(aStateRect.size.height);
-
+    
     // FIXME: HTH maximized state ?
-
+    
     if( [mpWindow isMiniaturized] )
         pState->mnState = SAL_FRAMESTATE_MINIMIZED;
     else if( ! [mpWindow isZoomed] )
@@ -650,7 +650,7 @@ void AquaSalFrame::SetScreenNumber(unsigned int nScreen)
         // get new screen frame
         pScreen = [pScreens objectAtIndex: nScreen];
         NSRect aNewScreen = [pScreen frame];
-
+        
         // get current screen frame
         pScreen = [mpWindow screen];
         if( pScreen )
@@ -675,14 +675,14 @@ void AquaSalFrame::ShowFullScreen( BOOL bFullScreen, sal_Int32 nDisplay )
 {
     if( mbFullScreen == bFullScreen )
         return;
-
+    
     mbFullScreen = bFullScreen;
     if( bFullScreen )
     {
         // hide the dock and the menubar if we are on the menu screen
         // which is always on index 0 according to documentation
         bool bHideMenu = (nDisplay == 0);
-
+        
         NSRect aNewContentRect = { { 0, 0 }, { 0, 0 } };
         // get correct screen
         NSScreen* pScreen = nil;
@@ -722,7 +722,7 @@ void AquaSalFrame::ShowFullScreen( BOOL bFullScreen, sal_Int32 nDisplay )
                 pScreen = [mpWindow screen];
             if( pScreen == nil )
                 pScreen = [NSScreen mainScreen];
-
+            
             aNewContentRect = [pScreen frame];
         }
 
@@ -769,11 +769,11 @@ public:
         SetTimeout( 30000 );
         Start();
     }
-
+    
     virtual ~PreventSleepTimer()
     {
     }
-
+    
     virtual void Timeout()
     {
         UpdateSystemActivity(OverallAct);
@@ -844,12 +844,12 @@ NSCursor* AquaSalFrame::getCurrentCursor() const
     case POINTER_WINDOW_WSIZE:
                             pCursor = [NSCursor resizeLeftRightCursor]; break;
     case POINTER_REFHAND:   pCursor = [NSCursor pointingHandCursor];    break;
-
+        
     default:
         pCursor = GetSalData()->getCursor( mePointerStyle );
         if( pCursor == nil )
         {
-            DBG_ERROR( "unmapped cursor" );
+            DBG_ERROR( "unmapped cursor" ); 
             pCursor = [NSCursor arrowCursor];
         }
         break;
@@ -862,7 +862,7 @@ void AquaSalFrame::SetPointer( PointerStyle ePointerStyle )
     if( ePointerStyle >= POINTER_COUNT || ePointerStyle == mePointerStyle )
         return;
     mePointerStyle = ePointerStyle;
-
+    
     [mpWindow invalidateCursorRectsForView: mpView];
 }
 
@@ -871,7 +871,7 @@ void AquaSalFrame::SetPointer( PointerStyle ePointerStyle )
 void AquaSalFrame::SetPointerPos( long nX, long nY )
 {
     // FIXME: use Cocoa functions
-
+    
     // FIXME: multiscreen support
     CGPoint aPoint = { nX + maGeometry.nX, nY + maGeometry.nY };
     CGDirectDisplayID mainDisplayID = CGMainDisplayID();
@@ -923,7 +923,7 @@ void AquaSalFrame::Sync()
     if( mbGraphics && mpGraphics && mpView && mbShown )
     {
         //YieldMutexReleaser aRel;
-
+        
         [mpView setNeedsDisplay: YES];
         [mpView display];
     }
@@ -938,7 +938,7 @@ void AquaSalFrame::SetInputContext( SalInputContext* pContext )
         mnICOptions = 0;
         return;
     }
-
+    
     mnICOptions = pContext->mnOptions;
 
     if(!(pContext->mnOptions & SAL_INPUTCONTEXT_TEXT))
@@ -970,7 +970,7 @@ XubString AquaSalFrame::GetKeyName( USHORT nKeyCode )
             aKey.append( sal_Int32( i - KEY_F1 + 1 ) );
             aKeyMap[ i ] = aKey.makeStringAndClear();
         }
-
+        
         aKeyMap[ KEY_DOWN ]     = rtl::OUString( sal_Unicode( 0x21e3 ) );
         aKeyMap[ KEY_UP ]       = rtl::OUString( sal_Unicode( 0x21e1 ) );
         aKeyMap[ KEY_LEFT ]     = rtl::OUString( sal_Unicode( 0x21e0 ) );
@@ -992,7 +992,7 @@ XubString AquaSalFrame::GetKeyName( USHORT nKeyCode )
         aKeyMap[ KEY_POINT ]    = rtl::OUString( sal_Unicode( '.' ) );
         aKeyMap[ KEY_COMMA ]    = rtl::OUString( sal_Unicode( ',' ) );
         aKeyMap[ KEY_LESS ]     = rtl::OUString( sal_Unicode( '<' ) );
-        aKeyMap[ KEY_GREATER ]  = rtl::OUString( sal_Unicode( '>' ) );
+        aKeyMap[ KEY_GREATER ]  = rtl::OUString( sal_Unicode( '>' ) );        
         aKeyMap[ KEY_EQUAL ]    = rtl::OUString( sal_Unicode( '=' ) );
         aKeyMap[ KEY_OPEN ]     = rtl::OUString( sal_Unicode( 0x23cf ) );
 
@@ -1016,9 +1016,9 @@ XubString AquaSalFrame::GetKeyName( USHORT nKeyCode )
         */
 
     }
-
+    
     rtl::OUStringBuffer aResult( 16 );
-
+    
     USHORT nUnmodifiedCode = (nKeyCode & KEY_CODE);
     std::map< USHORT, rtl::OUString >::const_iterator it = aKeyMap.find( nUnmodifiedCode );
     if( it != aKeyMap.end() )
@@ -1031,10 +1031,10 @@ XubString AquaSalFrame::GetKeyName( USHORT nKeyCode )
         // we map it to MOD3, whichis actually Command
         if( (nKeyCode & (KEY_MOD2|KEY_MOD3)) != 0 )
             aResult.append( sal_Unicode( 0x2303 ) );
-
+        
         aResult.append( it->second );
     }
-
+    
     return aResult.makeStringAndClear();
 }
 
@@ -1054,7 +1054,7 @@ static void getAppleScrollBarVariant(void)
     CFStringRef AppleScrollBarType = CFSTR("AppleScrollBarVariant");
     if( AppleScrollBarType )
     {
-        CFStringRef ScrollBarVariant = ((CFStringRef)CFPreferencesCopyAppValue( AppleScrollBarType, kCFPreferencesCurrentApplication ));
+        CFStringRef ScrollBarVariant = ((CFStringRef)CFPreferencesCopyAppValue( AppleScrollBarType, kCFPreferencesCurrentApplication ));    
         if( ScrollBarVariant )
         {
             if( CFGetTypeID( ScrollBarVariant ) == CFStringGetTypeID() )
@@ -1080,7 +1080,7 @@ static void getAppleScrollBarVariant(void)
     CFStringRef jumpScroll = CFSTR("AppleScrollerPagingBehavior");
     if( jumpScroll )
     {
-        CFBooleanRef jumpStr = ((CFBooleanRef)CFPreferencesCopyAppValue( jumpScroll, kCFPreferencesCurrentApplication ));
+        CFBooleanRef jumpStr = ((CFBooleanRef)CFPreferencesCopyAppValue( jumpScroll, kCFPreferencesCurrentApplication ));    
         if( jumpStr )
         {
             if( CFGetTypeID( jumpStr ) == CFBooleanGetTypeID() )
@@ -1124,7 +1124,7 @@ static Font getFont( NSFont* pFont, long nDPIY, const Font& rDefault )
         aResult.SetItalic( ([pFont italicAngle] != 0.0) ? ITALIC_NORMAL : ITALIC_NONE );
         // FIMXE: bold ?
     }
-
+    
     return aResult;
 }
 
@@ -1147,7 +1147,7 @@ void AquaSalFrame::getResolution( long& o_rDPIX, long& o_rDPIY )
 void AquaSalFrame::UpdateSettings( AllSettings& rSettings )
 {
     [mpView lockFocus];
-
+    
     StyleSettings aStyleSettings = rSettings.GetStyleSettings();
 
     // Background Color
@@ -1157,7 +1157,7 @@ void AquaSalFrame::UpdateSettings( AllSettings& rSettings )
     Color aInactiveTabColor( aBackgroundColor );
     aInactiveTabColor.DecreaseLuminance( 32 );
     aStyleSettings.SetInactiveTabColor( aInactiveTabColor );
-
+    
     aStyleSettings.SetDialogColor( aBackgroundColor );
     aStyleSettings.SetLightBorderColor( aBackgroundColor );
     Color aShadowColor( aStyleSettings.GetShadowColor() );
@@ -1175,7 +1175,7 @@ void AquaSalFrame::UpdateSettings( AllSettings& rSettings )
     aStyleSettings.SetAppFont( aAppFont );
     aStyleSettings.SetHelpFont( aAppFont );
     aStyleSettings.SetPushButtonFont( aAppFont );
-
+    
     Font aTitleFont( getFont( [NSFont titleBarFontOfSize: 0], nDPIY, aAppFont ) );
     aStyleSettings.SetTitleFont( aTitleFont );
     aStyleSettings.SetFloatTitleFont( aTitleFont );
@@ -1199,14 +1199,14 @@ void AquaSalFrame::UpdateSettings( AllSettings& rSettings )
     Color aHighlightTextColor( getColor( [NSColor selectedTextColor],
                                          aStyleSettings.GetHighlightTextColor(), mpWindow ) );
     aStyleSettings.SetHighlightTextColor( aHighlightTextColor );
-
+    
     Color aMenuHighlightColor( getColor( [NSColor selectedMenuItemColor],
                                          aStyleSettings.GetMenuHighlightColor(), mpWindow ) );
     aStyleSettings.SetMenuHighlightColor( aMenuHighlightColor );
     Color aMenuHighlightTextColor( getColor( [NSColor selectedMenuItemTextColor],
                                              aStyleSettings.GetMenuHighlightTextColor(), mpWindow ) );
     aStyleSettings.SetMenuHighlightTextColor( aMenuHighlightTextColor );
-
+    
     aStyleSettings.SetMenuColor( aBackgroundColor );
     Color aMenuTextColor( getColor( [NSColor textColor],
                                     aStyleSettings.GetMenuTextColor(), mpWindow ) );
@@ -1214,18 +1214,18 @@ void AquaSalFrame::UpdateSettings( AllSettings& rSettings )
     aStyleSettings.SetMenuBarTextColor( aMenuTextColor );
 
     aStyleSettings.SetCursorBlinkTime( 500 );
-
+    
     // no mnemonics on aqua
     aStyleSettings.SetOptions( aStyleSettings.GetOptions() | STYLE_OPTION_NOMNEMONICS );
-
+    
     getAppleScrollBarVariant();
-
+    
     // set scrollbar size
     aStyleSettings.SetScrollBarSize( static_cast<long int>([NSScroller scrollerWidth]) );
 
     // images in menus false for MacOSX
     aStyleSettings.SetUseImagesInMenus( false );
-
+    
     rSettings.SetStyleSettings( aStyleSettings );
 
     [mpView unlockFocus];
@@ -1276,7 +1276,7 @@ void AquaSalFrame::SetPosSize(long nX, long nY, long nWidth, long nHeight, USHOR
 
     NSRect aFrameRect = [mpWindow frame];
     NSRect aContentRect = [NSWindow contentRectForFrameRect: aFrameRect styleMask: mnStyleMask];
-
+    
     // position is always relative to parent frame
     NSRect aParentContentRect;
 
@@ -1294,10 +1294,10 @@ void AquaSalFrame::SetPosSize(long nX, long nY, long nWidth, long nHeight, USHOR
     }
     else
         aParentContentRect = maScreenRect; // use screen if no parent
-
+    
     CocoaToVCL( aContentRect );
     CocoaToVCL( aParentContentRect );
-
+    
     bool bPaint = false;
     if( (nFlags & (SAL_FRAME_POSSIZE_WIDTH | SAL_FRAME_POSSIZE_HEIGHT)) != 0 )
     {
@@ -1316,7 +1316,7 @@ void AquaSalFrame::SetPosSize(long nX, long nY, long nWidth, long nHeight, USHOR
         aContentRect.size.width = nWidth;
     if( (nFlags & SAL_FRAME_POSSIZE_HEIGHT) != 0)
         aContentRect.size.height = nHeight;
-
+    
     VCLToCocoa( aContentRect );
 
     // do not display yet, we need to update our backbuffer
@@ -1324,7 +1324,7 @@ void AquaSalFrame::SetPosSize(long nX, long nY, long nWidth, long nHeight, USHOR
         //YieldMutexReleaser aRel;
         [mpWindow setFrame: [NSWindow frameRectForContentRect: aContentRect styleMask: mnStyleMask] display: NO];
     }
-
+    
     UpdateFrameGeometry();
 
     if (nEvent)
@@ -1354,11 +1354,11 @@ void AquaSalFrame::GetWorkArea( Rectangle& rRect )
     rRect.nBottom   = static_cast<long>(aRect.origin.y + aRect.size.height - 1);
 }
 
-SalPointerState AquaSalFrame::GetPointerState()
+SalPointerState	AquaSalFrame::GetPointerState()
 {
     SalPointerState state;
     state.mnState = 0;
-
+    
     // get position
     NSPoint aPt = [mpWindow mouseLocationOutsideOfEventStream];
     CocoaToVCL( aPt, false );
@@ -1398,7 +1398,7 @@ SalPointerState AquaSalFrame::GetPointerState()
             state.mnState |= KEY_MOD2;
         if( (nMask & NSCommandKeyMask) != 0 )
             state.mnState |= KEY_MOD1;
-
+        
     }
     else
     {
@@ -1409,7 +1409,7 @@ SalPointerState AquaSalFrame::GetPointerState()
         // and all mouse events for button state in VCL_NSApllication::sendEvent,
         // but it is unclear whether this will get us the same result.
         // leave in GetCurrentEventButtonState and GetCurrentEventKeyModifiers for now
-
+        
         // fill in button state
         UInt32 nState = GetCurrentEventButtonState();
         state.mnState = 0;
@@ -1419,7 +1419,7 @@ SalPointerState AquaSalFrame::GetPointerState()
             state.mnState |= MOUSE_RIGHT;   // secondary button
         if( nState & 4 )
             state.mnState |= MOUSE_MIDDLE;  // tertiary button
-
+        
         // fill in modifier state
         nState = GetCurrentEventKeyModifiers();
         if( nState & shiftKey )
@@ -1431,8 +1431,8 @@ SalPointerState AquaSalFrame::GetPointerState()
         if( nState & cmdKey )
             state.mnState |= KEY_MOD1;
     }
-
-
+    
+    
     return state;
 }
 
@@ -1500,13 +1500,13 @@ void AquaSalFrame::SetParent( SalFrame* pNewParent )
     mpParent = (AquaSalFrame*)pNewParent;
     // insert to correct parent and paint
     Show( bShown );
-}
+} 
 
 void AquaSalFrame::UpdateFrameGeometry()
 {
     // keep in mind that view and window coordinates are lower left
     // whereas vcl's are upper left
-
+    
     // update screen rect
     NSScreen * pScreen = [mpWindow screen];
     if( pScreen )
@@ -1516,7 +1516,7 @@ void AquaSalFrame::UpdateFrameGeometry()
         if( pScreens )
             maGeometry.nScreenNumber = [pScreens indexOfObject: pScreen];
     }
-
+    
     NSRect aFrameRect = [mpWindow frame];
     NSRect aContentRect = [NSWindow contentRectForFrameRect: aFrameRect styleMask: mnStyleMask];
 
@@ -1536,7 +1536,7 @@ void AquaSalFrame::UpdateFrameGeometry()
     maGeometry.nLeftDecoration = static_cast<unsigned int>(aContentRect.origin.x - aFrameRect.origin.x);
     maGeometry.nRightDecoration = static_cast<unsigned int>((aFrameRect.origin.x + aFrameRect.size.width) -
                                   (aContentRect.origin.x + aContentRect.size.width));
-
+    
     maGeometry.nTopDecoration = static_cast<unsigned int>(aContentRect.origin.y - aFrameRect.origin.y);
     maGeometry.nBottomDecoration = static_cast<unsigned int>((aFrameRect.origin.y + aFrameRect.size.height) -
                                    (aContentRect.origin.y + aContentRect.size.height));
@@ -1554,15 +1554,15 @@ void AquaSalFrame::CaptureMouse( BOOL bCapture )
        on MacOSX (neither carbon nor cocoa) there is a
        CaptureMouse equivalent (in Carbon there is TrackMouseLocation
        but this is useless to use since it is blocking)
-
+       
        However on cocoa the active frame seems to get mouse events
        also outside the window, so we'll try to forward mouse events
        to the capture frame in the hope that one of our frames
        gets a mouse event.
-
+       
        This will break as soon as the user activates another app, but
        a mouse click will normally lead to a release of the mouse anyway.
-
+       
        Let's see how far we get this way. Alternatively we could use one
        large overlay window like we did for the carbon implementation,
        however that is resource intensive.
@@ -1579,7 +1579,7 @@ void AquaSalFrame::ResetClipRegion()
     // release old path and indicate no clipping
     CGPathRelease( mrClippingPath );
     mrClippingPath = NULL;
-
+    
     if( mpView && mbShown )
         [mpView setNeedsDisplay: YES];
     if( mpWindow )
@@ -1597,7 +1597,7 @@ void AquaSalFrame::BeginSetClipRegion( ULONG nRects )
         CGPathRelease( mrClippingPath );
         mrClippingPath = NULL;
     }
-
+    
     if( maClippingRects.size() > SAL_CLIPRECT_COUNT && nRects < maClippingRects.size() )
     {
         std::vector<CGRect> aEmptyVec;
diff --git a/vcl/aqua/source/window/salmenu.cxx b/vcl/aqua/source/window/salmenu.cxx
index ed3086d8506f..ad2693293c2e 100644
--- a/vcl/aqua/source/window/salmenu.cxx
+++ b/vcl/aqua/source/window/salmenu.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
@@ -107,7 +107,7 @@ static void initAppMenu()
             {
                 // create the action selector
                 pMainMenuSelector = [[MainMenuSelector alloc] init];
-
+                
                 // get the proper submenu
                 NSMenu* pAppMenu = [[pMainMenu itemAtIndex: 0] submenu];
                 if( pAppMenu )
@@ -126,7 +126,7 @@ static void initAppMenu()
                         [pNewItem setTarget: pMainMenuSelector];
                         [pAppMenu insertItem: [NSMenuItem separatorItem] atIndex: 1];
                     }
-
+                    
                     // insert preferences entry
                     String aPref( ResId( SV_STDTEXT_PREFERENCES, *pMgr ) );
                     pString = CreateNSString( aPref );
@@ -142,9 +142,9 @@ static void initAppMenu()
                         [pNewItem setTarget: pMainMenuSelector];
                         [pAppMenu insertItem: [NSMenuItem separatorItem] atIndex: 3];
                     }
-
+                    
                     // WARNING: ultra ugly code ahead
-
+                    
                     // rename standard entries
                     // rename "Services"
                     pNewItem = [pAppMenu itemAtIndex: 4];
@@ -206,7 +206,7 @@ static void initAppMenu()
 SalMenu* AquaSalInstance::CreateMenu( BOOL bMenuBar )
 {
     initAppMenu();
-
+    
     AquaSalMenu *pAquaSalMenu = new AquaSalMenu( bMenuBar );
 
     return pAquaSalMenu;
@@ -266,11 +266,11 @@ AquaSalMenu::~AquaSalMenu()
     if( mpFrame && AquaSalFrame::isAlive( mpFrame ) && mpFrame->mpMenu == this )
         const_cast<AquaSalFrame*>(mpFrame)->mpMenu = NULL;
 
-    // this should normally be empty already, but be careful...
+    // this should normally be empty already, but be careful...    
     for( size_t i = 0; i < maButtons.size(); i++ )
         releaseButtonEntry( maButtons[i] );
     maButtons.clear();
-
+    
     // is this leaking in some cases ? the release often leads to a duplicate release
     // it seems the parent item gets ownership of the menu
     if( mpMenu )
@@ -278,7 +278,7 @@ AquaSalMenu::~AquaSalMenu()
         if( mbMenuBar )
         {
             if( pCurrentMenuBar == this )
-            {
+            {                
                 // if the current menubar gets destroyed, set the default menubar
                 setDefaultMenu();
             }
@@ -288,7 +288,7 @@ AquaSalMenu::~AquaSalMenu()
         {
             // so set the pointer to this AquaSalMenu to NULL
             // to protect from calling a dead object
-
+            
             // in ! mbMenuBar case our mpMenu is actually a SalNSMenu*
             // so we can safely cast here
             [static_cast<SalNSMenu*>(mpMenu) setSalMenu: NULL];
@@ -350,7 +350,7 @@ bool AquaSalMenu::ShowNativePopupMenu(FloatingWindow * pWin, const Rectangle& rR
     NSView * pParentNSView = [pParentNSWindow contentView];
     NSView * pPopupNSView = ((AquaSalFrame *) pWin->ImplGetWindow()->ImplGetFrame())->mpView;
     NSRect popupFrame = [pPopupNSView frame];
-
+    
     // since we manipulate the menu below (removing entries)
     // let's rather make a copy here and work with that
     NSMenu* pCopyMenu = [mpMenu copy];
@@ -369,11 +369,11 @@ bool AquaSalMenu::ShowNativePopupMenu(FloatingWindow * pWin, const Rectangle& rR
     displayPopupFrame.origin.x = pWin->ImplGetFrame()->maGeometry.nX - pParentAquaSalFrame->maGeometry.nX + offset;
     displayPopupFrame.origin.y = pWin->ImplGetFrame()->maGeometry.nY - pParentAquaSalFrame->maGeometry.nY + offset;
     pParentAquaSalFrame->VCLToCocoa(displayPopupFrame, false);
-
+    
     // #i111992# if this menu was opened due to a key event, prevent dispatching that yet again
     if( [pParentNSView respondsToSelector: @selector(clearLastEvent)] )
         [pParentNSView performSelector:@selector(clearLastEvent)];
-
+    
     // open popup menu
     NSPopUpButtonCell * pPopUpButtonCell = [[NSPopUpButtonCell alloc] initTextCell:@"" pullsDown:NO];
     [pPopUpButtonCell setMenu: pCopyMenu];
@@ -382,7 +382,7 @@ bool AquaSalMenu::ShowNativePopupMenu(FloatingWindow * pWin, const Rectangle& rR
     [pPopUpButtonCell performClickWithFrame:displayPopupFrame inView:pParentNSView];
     [pPopUpButtonCell release];
     [AquaA11yWrapper setPopupMenuOpen: NO];
-
+    
     // clean up the copy
     [pCopyMenu release];
     return true;
@@ -413,7 +413,7 @@ void AquaSalMenu::unsetMainMenu()
     // remove items from main menu
     NSMenu* pMenu = [NSApp mainMenu];
     for( int nItems = [pMenu numberOfItems]; nItems > 1; nItems-- )
-        [pMenu removeItemAtIndex: 1];
+        [pMenu removeItemAtIndex: 1];    
 }
 
 void AquaSalMenu::setMainMenu()
@@ -431,7 +431,7 @@ void AquaSalMenu::setMainMenu()
                 [mpMenu insertItem: pItem atIndex: i+1];
             }
             pCurrentMenuBar = this;
-
+            
             // change status item
             statusLayout();
         }
@@ -487,7 +487,7 @@ void AquaSalMenu::addFallbackMenuItem( NSMenuItem* pNewItem )
     // push the item to the back and retain it
     [pNewItem retain];
     rFallbackMenu.push_back( pNewItem );
-
+    
     if( pCurrentMenuBar == NULL )
         setDefaultMenu();
 }
@@ -579,9 +579,9 @@ void AquaSalMenu::RemoveItem( unsigned nPos )
         DBG_ERROR( "invalid item index in remove" );
         return;
     }
-
+    
     pRemoveItem->mpParentMenu = NULL;
-
+    
     if( ! mbMenuBar || pCurrentMenuBar == this )
         [mpMenu removeItemAtIndex: getItemIndexByPos(nPos)];
 }
@@ -598,7 +598,7 @@ void AquaSalMenu::SetSubMenu( SalMenuItem* pSalMenuItem, SalMenu* pSubMenu, unsi
         {
             subAquaSalMenu->mpParentSalMenu = this;
             [pAquaSalMenuItem->mpMenuItem setSubmenu: subAquaSalMenu->mpMenu];
-
+            
             // set title of submenu
             [subAquaSalMenu->mpMenu setTitle: [pAquaSalMenuItem->mpMenuItem title]];
         }
@@ -609,7 +609,7 @@ void AquaSalMenu::SetSubMenu( SalMenuItem* pSalMenuItem, SalMenu* pSubMenu, unsi
             // let's hope that NSMenu copy does the right thing
             NSMenu* pCopy = [subAquaSalMenu->mpMenu copy];
             [pAquaSalMenuItem->mpMenuItem setSubmenu: pCopy];
-
+            
             // set title of submenu
             [pCopy setTitle: [pAquaSalMenuItem->mpMenuItem title]];
         }
@@ -651,7 +651,7 @@ void AquaSalMenu::SetItemImage( unsigned nPos, SalMenuItem* pSMI, const Image& r
         return;
 
     NSImage* pImage = CreateNSImage( rImage );
-
+    
     [pSalMenuItem->mpMenuItem setImage: pImage];
     if( pImage )
         [pImage release];
@@ -668,7 +668,7 @@ void AquaSalMenu::SetItemText( unsigned i_nPos, SalMenuItem* i_pSalMenuItem, con
 
     // Delete mnemonics
     aText.EraseAllChars( '~' );
-
+    
     /* #i90015# until there is a correct solution
        strip out any appended (.*) in menubar entries
     */
@@ -682,7 +682,7 @@ void AquaSalMenu::SetItemText( unsigned i_nPos, SalMenuItem* i_pSalMenuItem, con
                 aText.Erase( nPos, nPos2-nPos+1 );
         }
     }
-
+    
     NSString* pString = CreateNSString( aText );
     if (pString)
     {
@@ -745,7 +745,7 @@ void AquaSalMenu::SetAccelerator( unsigned nPos, SalMenuItem* pSalMenuItem, cons
     }
     else // not even a code ? nonsense -> ignore
         return;
-
+    
     DBG_ASSERT( nCommandKey, "unmapped accelerator key" );
 
     nModifier=rKeyCode.GetAllModifier();
@@ -765,7 +765,7 @@ void AquaSalMenu::SetAccelerator( unsigned nPos, SalMenuItem* pSalMenuItem, cons
 
     if(nModifier & KEY_MOD2)
         nItemModifier |= NSAlternateKeyMask;
-
+    
     if(nModifier & KEY_MOD3)
         nItemModifier |= NSControlKeyMask;
 
@@ -821,7 +821,7 @@ bool AquaSalMenu::AddMenuBarButton( const SalMenuButtonItem& i_rNewItem )
 {
     if( ! mbMenuBar || ! VisibleMenuBar() )
         return false;
-
+    
     MenuBarButtonEntry* pEntry = findButtonItem( i_rNewItem.mnId );
     if( pEntry )
     {
@@ -837,13 +837,13 @@ bool AquaSalMenu::AddMenuBarButton( const SalMenuButtonItem& i_rNewItem )
         maButtons.back().mpNSImage = CreateNSImage( i_rNewItem.maImage );
         maButtons.back().mpToolTipString = CreateNSString( i_rNewItem.maToolTipText );
     }
-
+    
     // lazy create status item
     SalData::getStatusItem();
-
+    
     if( pCurrentMenuBar == this )
         statusLayout();
-
+    
     return true;
 }
 
@@ -865,19 +865,19 @@ Rectangle AquaSalMenu::GetMenuBarButtonRectPixel( USHORT i_nItemId, SalFrame* i_
 {
     if( GetSalData()->mnSystemVersion < VER_LEOPARD )
         return Rectangle( Point( -1, -1 ), Size( 1, 1 ) );
-
+    
     if( ! i_pReferenceFrame || ! AquaSalFrame::isAlive( static_cast<AquaSalFrame*>(i_pReferenceFrame) ) )
         return Rectangle();
-
+    
     MenuBarButtonEntry* pEntry = findButtonItem( i_nItemId );
-
+    
     if( ! pEntry )
         return Rectangle();
-
+    
     NSStatusItem* pItem = SalData::getStatusItem();
     if( ! pItem )
         return Rectangle();
-
+    
     NSView* pView = [pItem view];
     if( ! pView )
         return Rectangle();
@@ -887,18 +887,18 @@ Rectangle AquaSalMenu::GetMenuBarButtonRectPixel( USHORT i_nItemId, SalFrame* i_
 
     NSRect aRect = [pWin frame];
     aRect.origin = [pWin convertBaseToScreen: NSMakePoint( 0, 0 )];
-
+    
     // make coordinates relative to reference frame
     static_cast<AquaSalFrame*>(i_pReferenceFrame)->CocoaToVCL( aRect.origin );
     aRect.origin.x -= i_pReferenceFrame->maGeometry.nX;
     aRect.origin.y -= i_pReferenceFrame->maGeometry.nY + aRect.size.height;
-
-    return Rectangle( Point(static_cast<long int>(aRect.origin.x),
+    
+    return Rectangle( Point(static_cast<long int>(aRect.origin.x), 
                 static_cast<long int>(aRect.origin.y)
-                ),
+                ), 
               Size( static_cast<long int>(aRect.size.width),
                 static_cast<long int>(aRect.size.height)
-              )
+              ) 
             );
 }
 
diff --git a/vcl/aqua/source/window/salobj.cxx b/vcl/aqua/source/window/salobj.cxx
index 07d337dcc81a..4c28991d4268 100644
--- a/vcl/aqua/source/window/salobj.cxx
+++ b/vcl/aqua/source/window/salobj.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
@@ -50,7 +50,7 @@ AquaSalObject::AquaSalObject( AquaSalFrame* pFrame ) :
 {
     maSysData.nSize = sizeof( maSysData );
     maSysData.pView = NULL;
-
+    
     NSRect aInitFrame = { { 0, 0 }, { 20, 20 } };
     mpClipView = [[NSClipView alloc] initWithFrame: aInitFrame ];
     if( mpClipView )
@@ -90,7 +90,7 @@ AquaSalObject::~AquaSalObject()
    similar effect to non-rectangular windows is achieved by using a
    non-opaque window and not painting where one wants the background
    to shine through.
-
+   
    With respect to SalObject this leaves us to having an NSClipView
    containing the child view. Even a QTMovieView respects the boundaries of
    that, which gives us a clip "region" consisting of one rectangle.
@@ -178,7 +178,7 @@ void AquaSalObject::setClippedPosSize()
         NSView *pView = maSysData.pView;
         [pView setFrame: aViewRect];
     }
-
+    
     NSRect aClipViewRect = { { mnX, mnY }, { mnWidth, mnHeight } };
     NSPoint aClipPt = { 0, 0 };
     if( mbClip )
@@ -191,10 +191,10 @@ void AquaSalObject::setClippedPosSize()
         if( mnClipY == 0 )
             aClipPt.y = mnHeight - mnClipHeight;;
     }
-
+    
     mpFrame->VCLToCocoa( aClipViewRect, false );
     [mpClipView setFrame: aClipViewRect];
-
+    
     [mpClipView scrollToPoint: aClipPt];
 }
 
diff --git a/vcl/inc/cupsmgr.hxx b/vcl/inc/cupsmgr.hxx
index b413184f477f..9e853b1cb2d7 100644
--- a/vcl/inc/cupsmgr.hxx
+++ b/vcl/inc/cupsmgr.hxx
@@ -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
@@ -47,23 +47,23 @@ struct FPtrHash
 
 class CUPSManager : public PrinterInfoManager
 {
-    CUPSWrapper*                                                m_pCUPSWrapper;
-    std::hash_map< FILE*, rtl::OString, FPtrHash >              m_aSpoolFiles;
-    int                                                         m_nDests;
-    void*                                                       m_pDests;
-    bool                                                        m_bNewDests;
-    std::hash_map< rtl::OUString, int, rtl::OUStringHash >      m_aCUPSDestMap;
+    CUPSWrapper*												m_pCUPSWrapper;
+    std::hash_map< FILE*, rtl::OString, FPtrHash >				m_aSpoolFiles;
+    int															m_nDests;
+    void*														m_pDests;
+    bool														m_bNewDests;
+    std::hash_map< rtl::OUString, int, rtl::OUStringHash >		m_aCUPSDestMap;
 
     std::hash_map< rtl::OUString, PPDContext, rtl::OUStringHash > m_aDefaultContexts;
 
-    rtl::OString                                                m_aUser;
+    rtl::OString												m_aUser;
     // this is a security risk, but the CUPS API demands
     // to deliver a pointer to a static buffer containing
     // the password, so this cannot be helped
-    rtl::OString                                                m_aPassword;
+    rtl::OString												m_aPassword;
 
-    osl::Mutex                                                  m_aCUPSMutex;
-    oslThread                                                   m_aDestThread;
+    osl::Mutex													m_aCUPSMutex;
+    oslThread													m_aDestThread;
 
     CUPSManager( CUPSWrapper* );
     virtual ~CUPSManager();
@@ -75,7 +75,7 @@ class CUPSManager : public PrinterInfoManager
 public:
     // public for stub
     static void runDestThread(void* pMgr);
-
+    
     static CUPSManager* tryLoadCUPS();
 
     const PPDParser* createCUPSParser( const rtl::OUString& rPrinter );
@@ -99,7 +99,7 @@ public:
     virtual bool removePrinter( const rtl::OUString& rPrinterName, bool bCheckOnly = false );
     virtual bool writePrinterConfig();
     virtual bool setDefaultPrinter( const rtl::OUString& rPrinterName );
-
+    
     virtual bool addOrRemovePossible() const;
 };
 
diff --git a/vcl/inc/list.h b/vcl/inc/list.h
index 82fff328681b..828ff9e16dac 100644
--- a/vcl/inc/list.h
+++ b/vcl/inc/list.h
@@ -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
@@ -47,7 +47,7 @@ extern "C"
 
     typedef struct _list *list;
     typedef void (*list_destructor)(void *);
-
+    
 /*- constructors and a destructor */
     list listNewEmpty(void);
 #ifdef TEST
diff --git a/vcl/inc/pch/precompiled_vcl.cxx b/vcl/inc/pch/precompiled_vcl.cxx
index af8e2048bd88..0c77562f689d 100644
--- a/vcl/inc/pch/precompiled_vcl.cxx
+++ b/vcl/inc/pch/precompiled_vcl.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
diff --git a/vcl/inc/pch/precompiled_vcl.hxx b/vcl/inc/pch/precompiled_vcl.hxx
index 37ba36569834..2d64293fabd5 100644
--- a/vcl/inc/pch/precompiled_vcl.hxx
+++ b/vcl/inc/pch/precompiled_vcl.hxx
@@ -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
diff --git a/vcl/inc/sft.hxx b/vcl/inc/sft.hxx
index 88ba2844e1e0..e11a42ed82fa 100644
--- a/vcl/inc/sft.hxx
+++ b/vcl/inc/sft.hxx
@@ -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
@@ -55,7 +55,7 @@
  *        C3 - CRC-32 of the array of encoding numbers used to generate the subset
  *
  */
-
+ 
 
 #ifndef __SUBFONT_H
 #define __SUBFONT_H
@@ -72,7 +72,7 @@
 
 namespace vcl
 {
-
+    
 /*@{*/
     typedef sal_Int16       F2Dot14;            /**< fixed: 2.14 */
     typedef sal_Int32       F16Dot16;           /**< fixed: 16.16 */
@@ -165,8 +165,8 @@ namespace vcl
     };
 #endif
 
-
-
+    
+    
 
 /** Structure used by GetTTSimpleGlyphMetrics() and GetTTSimpleCharMetrics() functions */
     typedef struct {
@@ -207,11 +207,11 @@ namespace vcl
 
     typedef struct {
         char *family;             /**< family name                                             */
-        sal_uInt16 *ufamily;          /**< family name UCS2                                         */
+        sal_uInt16 *ufamily;		  /**< family name UCS2                                         */
         char *subfamily;          /**< subfamily name                                          */
         sal_uInt16 *usubfamily;   /**< subfamily name UCS2 */
         char *psname;             /**< PostScript name                                         */
-        sal_uInt16 macStyle;      /**< macstyle bits from 'HEAD' table */
+        sal_uInt16 macStyle;	  /**< macstyle bits from 'HEAD' table */
         int   weight;             /**< value of WeightClass or 0 if can't be determined        */
         int   width;              /**< value of WidthClass or 0 if can't be determined         */
         int   pitch;              /**< 0: proportianal font, otherwise: monospaced             */
@@ -279,7 +279,7 @@ namespace vcl
 
 
 /**
- * TrueTypeFont constructor.
+ * TrueTypeFont constructor. 
  * The font file has to be provided as a memory buffer and length
  * @param  facenum - logical font number within a TTC file. This value is ignored
  *                   for TrueType fonts
@@ -289,7 +289,7 @@ namespace vcl
     int OpenTTFontBuffer(void* pBuffer, sal_uInt32 nLen, sal_uInt32 facenum, TrueTypeFont** ttf); /*FOLD01*/
 #if !defined(WIN32) && !defined(OS2)
 /**
- * TrueTypeFont constructor.
+ * TrueTypeFont constructor. 
  * Reads the font file and allocates the memory for the structure.
  * on WIN32 the font has to be provided as a memory buffer and length
  * @param  facenum - logical font number within a TTC file. This value is ignored
@@ -560,23 +560,23 @@ namespace vcl
  * Returns nonzero if font is a symbol encoded font
  */
     int CheckSymbolEncoding(TrueTypeFont* ttf);
-
+    
 /**
  * returns the number of glyphs in a font
  */
  int GetTTGlyphCount( TrueTypeFont* ttf );
-
+ 
 /**
  * provide access to the raw data of a SFNT-container's subtable
  */
  bool GetSfntTable( TrueTypeFont* ttf, int nSubtableIndex,
      const sal_uInt8** ppRawBytes, int* pRawLength );
-
+    
 /*- private definitions */ /*FOLD00*/
 
     struct _TrueTypeFont {
         sal_uInt32 tag;
-
+    
         char        *fname;
         sal_Int32   fsize;
         sal_uInt8   *ptr;
diff --git a/vcl/inc/vcl/ImageListProvider.hxx b/vcl/inc/vcl/ImageListProvider.hxx
index 5c0640d21ea4..8c85320e0cf4 100644
--- a/vcl/inc/vcl/ImageListProvider.hxx
+++ b/vcl/inc/vcl/ImageListProvider.hxx
@@ -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
diff --git a/vcl/inc/vcl/abstdlg.hxx b/vcl/inc/vcl/abstdlg.hxx
index 2fa134af5078..222d59562f1a 100755
--- a/vcl/inc/vcl/abstdlg.hxx
+++ b/vcl/inc/vcl/abstdlg.hxx
@@ -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
@@ -40,9 +40,9 @@ class Link;
 class VCL_DLLPUBLIC VclAbstractDialog
 {
 public:
-    virtual short           Execute() = 0;
-    //virtual void          Show( BOOL bVisible = TRUE, USHORT nFlags = 0 ) = 0;
-    virtual                 ~VclAbstractDialog();
+    virtual	short			Execute() = 0;
+    //virtual void			Show( BOOL bVisible = TRUE, USHORT nFlags = 0 ) = 0;
+    virtual					~VclAbstractDialog();
 };
 
 class VCL_DLLPUBLIC VclAbstractDialog2
@@ -56,7 +56,7 @@ public:
 class VCL_DLLPUBLIC VclAbstractTerminatedDialog : public VclAbstractDialog
 {
 public:
-    virtual void            EndDialog(long nResult =0) = 0;
+    virtual void			EndDialog(long nResult =0) = 0;
 };
 
 class VCL_DLLPUBLIC VclAbstractRefreshableDialog : public VclAbstractDialog
@@ -79,13 +79,13 @@ public:
 class VCL_DLLPUBLIC VclAbstractDialogFactory
 {
 public:
-                                        virtual ~VclAbstractDialogFactory();    // needed for export of vtable
-    static VclAbstractDialogFactory*    Create();
+                                        virtual ~VclAbstractDialogFactory();	// needed for export of vtable
+    static VclAbstractDialogFactory*	Create();
     // nDialogId was previously a ResId without ResMgr; the ResourceId is now
     // an implementation detail of the factory
-    virtual VclAbstractDialog*          CreateVclDialog( Window* pParent, sal_uInt32 nResId ) = 0;
-
-    // creates instance of PasswordToOpenModifyDialog from cui
+    virtual VclAbstractDialog* 			CreateVclDialog( Window* pParent, sal_uInt32 nResId ) = 0;
+    
+    // creates instance of PasswordToOpenModifyDialog from cui 
     virtual AbstractPasswordToOpenModifyDialog *    CreatePasswordToOpenModifyDialog( Window * pParent, sal_uInt16 nMinPasswdLen, sal_uInt16 nMaxPasswdLen, bool bIsPasswordToModify ) = 0;
 };
 
diff --git a/vcl/inc/vcl/accel.h b/vcl/inc/vcl/accel.h
index e726d04e7c99..94dbe7065c06 100644
--- a/vcl/inc/vcl/accel.h
+++ b/vcl/inc/vcl/accel.h
@@ -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
@@ -42,11 +42,11 @@ class Accelerator;
 class ImplAccelEntry
 {
 public:
-    USHORT          mnId;
-    KeyCode         maKeyCode;
-    Accelerator*    mpAccel;
-    Accelerator*    mpAutoAccel;
-    BOOL            mbEnabled;
+    USHORT			mnId;
+    KeyCode 		maKeyCode;
+    Accelerator*	mpAccel;
+    Accelerator*	mpAutoAccel;
+    BOOL			mbEnabled;
 };
 
 // -----------------
@@ -56,4 +56,4 @@ public:
 // in KEYCOD.CXX
 void ImplGetKeyCode( KeyFuncType eFunc, USHORT& rCode1, USHORT& rCode2, USHORT& rCode3, USHORT& rCode4 );
 
-#endif  // _SV_ACCEL_H
+#endif	// _SV_ACCEL_H
diff --git a/vcl/inc/vcl/accel.hxx b/vcl/inc/vcl/accel.hxx
index ad2f03dfd942..72ac805f7ecd 100644
--- a/vcl/inc/vcl/accel.hxx
+++ b/vcl/inc/vcl/accel.hxx
@@ -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
@@ -46,18 +46,18 @@ class VCL_DLLPUBLIC Accelerator : public Resource
     friend class ImplAccelManager;
 
 private:
-    ImplAccelData*  mpData;
-    XubString       maHelpStr;
-    Link            maActivateHdl;
-    Link            maDeactivateHdl;
-    Link            maSelectHdl;
+    ImplAccelData*	mpData;
+    XubString		maHelpStr;
+    Link			maActivateHdl;
+    Link			maDeactivateHdl;
+    Link			maSelectHdl;
 
     // Werden vom AcceleratorManager gesetzt
-    KeyCode         maCurKeyCode;
-    USHORT          mnCurId;
-    USHORT          mnCurRepeat;
-    BOOL            mbIsCancel;
-    BOOL*           mpDel;
+    KeyCode 		maCurKeyCode;
+    USHORT			mnCurId;
+    USHORT			mnCurRepeat;
+    BOOL			mbIsCancel;
+    BOOL*			mpDel;
 
 //#if 0 // _SOLAR__PRIVATE
     SAL_DLLPRIVATE  void        ImplInit();
@@ -76,53 +76,53 @@ public:
                     Accelerator();
                     Accelerator( const Accelerator& rAccel );
                     Accelerator( const ResId& rResId );
-    virtual         ~Accelerator();
-
-    virtual void    Activate();
-    virtual void    Deactivate();
-    virtual void    Select();
-
-    void            InsertItem( USHORT nItemId, const KeyCode& rKeyCode );
-    void            InsertItem( const ResId& rResId );
-    void            RemoveItem( USHORT nItemId );
-    void            RemoveItem( const KeyCode rKeyCode );
-    void            Clear();
-
-    USHORT          GetCurItemId() const { return mnCurId; }
-    const KeyCode&  GetCurKeyCode() const { return maCurKeyCode; }
-    USHORT          GetCurRepeat() const { return mnCurRepeat; }
-    BOOL            IsCancel() const { return mbIsCancel; }
-
-    USHORT          GetItemCount() const;
-    USHORT          GetItemId( USHORT nPos ) const;
-    KeyCode         GetItemKeyCode( USHORT nPos ) const;
-    USHORT          GetItemId( const KeyCode& rKeyCode ) const;
-    KeyCode         GetKeyCode( USHORT nItemId ) const;
-    BOOL            IsIdValid( USHORT nItemId ) const;
-    BOOL            IsKeyCodeValid( const KeyCode rKeyCode ) const;
-    BOOL            Call( const KeyCode& rKeyCode, USHORT nRepeat = 0 );
-
-    void            SetAccel( USHORT nItemId, Accelerator* pAccel );
-    Accelerator*    GetAccel( USHORT nItemId ) const;
-    void            SetAccel( const KeyCode rKeyCode, Accelerator* pAccel );
-    Accelerator*    GetAccel( const KeyCode rKeyCode ) const;
-
-    void            EnableItem( USHORT nItemId, BOOL bEnable = TRUE );
-    BOOL            IsItemEnabled( USHORT nItemId ) const;
-    void            EnableItem( const KeyCode rKeyCode, BOOL bEnable = TRUE );
-    BOOL            IsItemEnabled( const KeyCode rKeyCode ) const;
-
-    void            SetHelpText( const XubString& rHelpText ) { maHelpStr = rHelpText; }
+    virtual			~Accelerator();
+
+    virtual void	Activate();
+    virtual void	Deactivate();
+    virtual void	Select();
+
+    void			InsertItem( USHORT nItemId, const KeyCode& rKeyCode );
+    void			InsertItem( const ResId& rResId );
+    void			RemoveItem( USHORT nItemId );
+    void			RemoveItem( const KeyCode rKeyCode );
+    void			Clear();
+
+    USHORT			GetCurItemId() const { return mnCurId; }
+    const KeyCode&	GetCurKeyCode() const { return maCurKeyCode; }
+    USHORT			GetCurRepeat() const { return mnCurRepeat; }
+    BOOL			IsCancel() const { return mbIsCancel; }
+
+    USHORT			GetItemCount() const;
+    USHORT			GetItemId( USHORT nPos ) const;
+    KeyCode 		GetItemKeyCode( USHORT nPos ) const;
+    USHORT			GetItemId( const KeyCode& rKeyCode ) const;
+    KeyCode 		GetKeyCode( USHORT nItemId ) const;
+    BOOL			IsIdValid( USHORT nItemId ) const;
+    BOOL			IsKeyCodeValid( const KeyCode rKeyCode ) const;
+    BOOL			Call( const KeyCode& rKeyCode, USHORT nRepeat = 0 );
+
+    void			SetAccel( USHORT nItemId, Accelerator* pAccel );
+    Accelerator*	GetAccel( USHORT nItemId ) const;
+    void			SetAccel( const KeyCode rKeyCode, Accelerator* pAccel );
+    Accelerator*	GetAccel( const KeyCode rKeyCode ) const;
+
+    void			EnableItem( USHORT nItemId, BOOL bEnable = TRUE );
+    BOOL			IsItemEnabled( USHORT nItemId ) const;
+    void			EnableItem( const KeyCode rKeyCode, BOOL bEnable = TRUE );
+    BOOL			IsItemEnabled( const KeyCode rKeyCode ) const;
+
+    void			SetHelpText( const XubString& rHelpText ) { maHelpStr = rHelpText; }
     const XubString& GetHelpText() const { return maHelpStr; }
 
-    void            SetActivateHdl( const Link& rLink ) { maActivateHdl = rLink; }
-    const Link&     GetActivateHdl() const { return maActivateHdl; }
-    void            SetDeactivateHdl( const Link& rLink ) { maDeactivateHdl = rLink; }
-    const Link&     GetDeactivateHdl() const { return maDeactivateHdl; }
-    void            SetSelectHdl( const Link& rLink ) { maSelectHdl = rLink; }
-    const Link&     GetSelectHdl() const { return maSelectHdl; }
+    void			SetActivateHdl( const Link& rLink ) { maActivateHdl = rLink; }
+    const Link& 	GetActivateHdl() const { return maActivateHdl; }
+    void			SetDeactivateHdl( const Link& rLink ) { maDeactivateHdl = rLink; }
+    const Link& 	GetDeactivateHdl() const { return maDeactivateHdl; }
+    void			SetSelectHdl( const Link& rLink ) { maSelectHdl = rLink; }
+    const Link& 	GetSelectHdl() const { return maSelectHdl; }
 
-    Accelerator&    operator=( const Accelerator& rAccel );
+    Accelerator&	operator=( const Accelerator& rAccel );
 };
 
-#endif  // _SV_ACCEL_HXX
+#endif	// _SV_ACCEL_HXX
diff --git a/vcl/inc/vcl/accmgr.hxx b/vcl/inc/vcl/accmgr.hxx
index a60322eac403..9e8a75fc7b5b 100644
--- a/vcl/inc/vcl/accmgr.hxx
+++ b/vcl/inc/vcl/accmgr.hxx
@@ -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
diff --git a/vcl/inc/vcl/alpha.hxx b/vcl/inc/vcl/alpha.hxx
index ef48793cf8ce..dc8d304cdf29 100644
--- a/vcl/inc/vcl/alpha.hxx
+++ b/vcl/inc/vcl/alpha.hxx
@@ -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
@@ -57,25 +57,25 @@ public:
                             AlphaMask( const Size& rSizePixel, BYTE* pEraseTransparency = NULL );
                             ~AlphaMask();
 
-    AlphaMask&              operator=( const Bitmap& rBitmap );
-    AlphaMask&              operator=( const AlphaMask& rAlphaMask ) { return (AlphaMask&) Bitmap::operator=( rAlphaMask ); }
-    BOOL                    operator!() const { return Bitmap::operator!(); }
-    BOOL                    operator==( const AlphaMask& rAlphaMask ) const { return Bitmap::operator==( rAlphaMask ); }
-    BOOL                    operator!=( const AlphaMask& rAlphaMask ) const { return Bitmap::operator!=( rAlphaMask ); }
+    AlphaMask&				operator=( const Bitmap& rBitmap );
+    AlphaMask&				operator=( const AlphaMask& rAlphaMask ) { return (AlphaMask&) Bitmap::operator=( rAlphaMask ); }
+    BOOL					operator!() const { return Bitmap::operator!(); }
+    BOOL					operator==( const AlphaMask& rAlphaMask ) const { return Bitmap::operator==( rAlphaMask ); }
+    BOOL					operator!=( const AlphaMask& rAlphaMask ) const { return Bitmap::operator!=( rAlphaMask ); }
 
-    const MapMode&          GetPrefMapMode() const { return Bitmap::GetPrefMapMode(); }
-    void                    SetPrefMapMode( const MapMode& rMapMode ) { Bitmap::SetPrefMapMode( rMapMode ); }
+    const MapMode&			GetPrefMapMode() const { return Bitmap::GetPrefMapMode(); }
+    void					SetPrefMapMode( const MapMode& rMapMode ) { Bitmap::SetPrefMapMode( rMapMode ); }
 
-    const Size&             GetPrefSize() const { return Bitmap::GetPrefSize(); }
-    void                    SetPrefSize( const Size& rSize ) { Bitmap::SetPrefSize( rSize ); }
+    const Size&				GetPrefSize() const { return Bitmap::GetPrefSize(); }
+    void					SetPrefSize( const Size& rSize ) { Bitmap::SetPrefSize( rSize ); }
 
-    Size                    GetSizePixel() const { return Bitmap::GetSizePixel(); }
-    void                    SetSizePixel( const Size& rNewSize ) { Bitmap::SetSizePixel( rNewSize ); }
+    Size					GetSizePixel() const { return Bitmap::GetSizePixel(); }
+    void					SetSizePixel( const Size& rNewSize ) { Bitmap::SetSizePixel( rNewSize ); }
 
-    ULONG                   GetSizeBytes() const { return Bitmap::GetSizeBytes(); }
-    ULONG                   GetChecksum() const { return Bitmap::GetChecksum(); }
+    ULONG					GetSizeBytes() const { return Bitmap::GetSizeBytes(); }
+    ULONG					GetChecksum() const { return Bitmap::GetChecksum(); }
 
-    Bitmap                  GetBitmap() const;
+    Bitmap					GetBitmap() const;
 
 public:
 
@@ -95,14 +95,14 @@ public:
 
 public:
 
-    BitmapReadAccess*       AcquireReadAccess() { return Bitmap::AcquireReadAccess(); }
-    BitmapWriteAccess*      AcquireWriteAccess() { return Bitmap::AcquireWriteAccess(); }
-    void                    ReleaseAccess( BitmapReadAccess* pAccess );
+    BitmapReadAccess*		AcquireReadAccess() { return Bitmap::AcquireReadAccess(); }
+    BitmapWriteAccess*		AcquireWriteAccess() { return Bitmap::AcquireWriteAccess(); }
+    void					ReleaseAccess( BitmapReadAccess* pAccess );
 
 public:
 
-    BOOL                    Read( SvStream& rIStm, BOOL bFileHeader = TRUE ) { return Bitmap::Read( rIStm, bFileHeader ); }
-    BOOL                    Write( SvStream& rOStm, BOOL bCompressed = TRUE, BOOL bFileHeader = TRUE ) const { return Bitmap::Write( rOStm, bCompressed, bFileHeader ); }
+    BOOL					Read( SvStream& rIStm, BOOL bFileHeader = TRUE ) { return Bitmap::Read( rIStm, bFileHeader ); }
+    BOOL					Write( SvStream& rOStm, BOOL bCompressed = TRUE, BOOL bFileHeader = TRUE ) const { return Bitmap::Write( rOStm, bCompressed, bFileHeader ); }
 
     friend VCL_DLLPUBLIC SvStream& operator<<( SvStream& rOStm, const BitmapEx& rBitmapEx );
     friend VCL_DLLPUBLIC SvStream& operator>>( SvStream& rIStm, BitmapEx& rBitmapEx );
diff --git a/vcl/inc/vcl/animate.hxx b/vcl/inc/vcl/animate.hxx
index fc793fc12714..8bb4cd98035d 100644
--- a/vcl/inc/vcl/animate.hxx
+++ b/vcl/inc/vcl/animate.hxx
@@ -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
@@ -47,7 +47,7 @@ enum Disposal
     DISPOSE_NOT,
     DISPOSE_BACK,
     DISPOSE_FULL,
-    DISPOSE_PREVIOUS
+    DISPOSE_PREVIOUS 
 };
 
 enum CycleMode
@@ -65,25 +65,25 @@ enum CycleMode
 
 struct VCL_DLLPUBLIC AnimationBitmap
 {
-    BitmapEx    aBmpEx;
-    Point       aPosPix;
-    Size        aSizePix;
-    long        nWait;
-    Disposal    eDisposal;
-    BOOL        bUserInput;
+    BitmapEx	aBmpEx;
+    Point		aPosPix;
+    Size		aSizePix;
+    long		nWait;
+    Disposal	eDisposal;
+    BOOL		bUserInput;
 
                 AnimationBitmap() {}
                 AnimationBitmap( const BitmapEx& rBmpEx, const Point& rPosPix,
                                  const Size& rSizePix, long _nWait = 0L,
                                  Disposal _eDisposal = DISPOSE_NOT ) :
-                            aBmpEx      ( rBmpEx ),
-                            aPosPix     ( rPosPix ),
-                            aSizePix    ( rSizePix ),
-                            nWait       ( _nWait ),
-                            eDisposal   ( _eDisposal ),
-                            bUserInput  ( FALSE ) {}
-
-    BOOL        operator==( const AnimationBitmap& rAnimBmp ) const
+                            aBmpEx		( rBmpEx ),
+                            aPosPix		( rPosPix ),
+                            aSizePix	( rSizePix ),
+                            nWait		( _nWait ),
+                            eDisposal	( _eDisposal ),
+                            bUserInput	( FALSE ) {}
+
+    BOOL		operator==( const AnimationBitmap& rAnimBmp ) const
                 {
                     return( rAnimBmp.aBmpEx == aBmpEx &&
                             rAnimBmp.aPosPix == aPosPix &&
@@ -93,9 +93,9 @@ struct VCL_DLLPUBLIC AnimationBitmap
                             rAnimBmp.bUserInput == bUserInput );
                 }
 
-    BOOL        operator!=( const AnimationBitmap& rAnimBmp ) const { return !( *this == rAnimBmp ); }
+    BOOL		operator!=( const AnimationBitmap& rAnimBmp ) const { return !( *this == rAnimBmp ); }
 
-    BOOL        IsEqual( const AnimationBitmap& rAnimBmp ) const
+    BOOL		IsEqual( const AnimationBitmap& rAnimBmp ) const
                 {
                     return( rAnimBmp.aPosPix == aPosPix &&
                             rAnimBmp.aSizePix == aSizePix &&
@@ -105,7 +105,7 @@ struct VCL_DLLPUBLIC AnimationBitmap
                             rAnimBmp.aBmpEx.IsEqual( aBmpEx ) );
                 }
 
-    ULONG       GetChecksum() const;
+    ULONG		GetChecksum() const;
 };
 
 // -------------------
@@ -114,21 +114,21 @@ struct VCL_DLLPUBLIC AnimationBitmap
 
 struct AInfo
 {
-    Bitmap          aLastSaveBitmap;
-    Bitmap          aBackBitmap;
-    Rectangle       aClipRect;
-    Size            aLastSaveSize;
-    Point           aLastSavePoint;
-    Point           aStartOrg;
-    Size            aStartSize;
-    OutputDevice*   pOutDev;
-    void*           pViewData;
-    long            nExtraData;
-    BOOL            bWithSize;
-    BOOL            bPause;
-
-                    AInfo() : pOutDev( NULL ),
-                              pViewData( NULL ),
+    Bitmap			aLastSaveBitmap;
+    Bitmap			aBackBitmap;
+    Rectangle		aClipRect;
+    Size			aLastSaveSize;
+    Point			aLastSavePoint;
+    Point			aStartOrg;
+    Size			aStartSize;
+    OutputDevice*	pOutDev;
+    void*			pViewData;
+    long			nExtraData;
+    BOOL			bWithSize;
+    BOOL			bPause;
+
+                    AInfo() : pOutDev( NULL ), 
+                              pViewData( NULL ), 
                               nExtraData( 0L ),
                               bWithSize( FALSE ),
                               bPause( FALSE ) {}
@@ -140,28 +140,28 @@ struct AInfo
 
 class VCL_DLLPUBLIC Animation
 {
-    SAL_DLLPRIVATE static ULONG         mnAnimCount;
-
-    List                    maList;
-    List                    maAInfoList;
-    Link                    maNotifyLink;
-    BitmapEx                maBitmapEx;
-    Timer                   maTimer;
-    Size                    maGlobalSize;
-    List*                   mpViewList;
-    void*                   mpExtraData;
-    long                    mnLoopCount;
-    long                    mnLoops;
-    long                    mnPos;
-    Disposal                meLastDisposal;
-    CycleMode               meCycleMode;
-    BOOL                    mbFirst;
-    BOOL                    mbIsInAnimation;
-    BOOL                    mbWithSize;
-    BOOL                    mbLoopTerminated;
-    BOOL                    mbIsWaiting;
-
-//#if 0 // _SOLAR__PRIVATE
+    SAL_DLLPRIVATE static ULONG			mnAnimCount;
+
+    List					maList;
+    List					maAInfoList;
+    Link					maNotifyLink;
+    BitmapEx				maBitmapEx;
+    Timer					maTimer;
+    Size					maGlobalSize;
+    List*					mpViewList;
+    void*					mpExtraData;
+    long					mnLoopCount;
+    long					mnLoops;
+    long					mnPos;
+    Disposal				meLastDisposal;
+    CycleMode				meCycleMode;
+    BOOL					mbFirst;
+    BOOL					mbIsInAnimation;
+    BOOL					mbWithSize;
+    BOOL					mbLoopTerminated;
+    BOOL					mbIsWaiting;
+
+//#if 0 // _SOLAR__PRIVATE				
 
     SAL_DLLPRIVATE void     ImplRestartTimer( ULONG nTimeout );
     DECL_DLLPRIVATE_LINK(   ImplTimeoutHdl, Timer* );
@@ -172,83 +172,83 @@ public:
     SAL_DLLPRIVATE static void  ImplDecAnimCount() { mnAnimCount--; }
     SAL_DLLPRIVATE ULONG        ImplGetCurPos() const { return mnPos; }
 
-//#endif
+//#endif						
 
-public:
+public:						
                             Animation();
                             Animation( const Animation& rAnimation );
                             ~Animation();
 
-    Animation&              operator=( const Animation& rAnimation );
-    BOOL                    operator==( const Animation& rAnimation ) const;
-    BOOL                    operator!=( const Animation& rAnimation ) const { return !(*this==rAnimation); }
+    Animation&				operator=( const Animation& rAnimation );
+    BOOL					operator==( const Animation& rAnimation ) const;
+    BOOL					operator!=( const Animation& rAnimation ) const { return !(*this==rAnimation); }
 
-    BOOL                    IsEqual( const Animation& rAnimation ) const;
+    BOOL					IsEqual( const Animation& rAnimation ) const;
 
-    BOOL                    IsEmpty() const;
-    void                    SetEmpty();
+    BOOL					IsEmpty() const;
+    void					SetEmpty();
 
-    void                    Clear();
+    void					Clear();
 
-    BOOL                    Start( OutputDevice* pOutDev, const Point& rDestPt, long nExtraData = 0,
+    BOOL					Start( OutputDevice* pOutDev, const Point& rDestPt, long nExtraData = 0, 
                                    OutputDevice* pFirstFrameOutDev = NULL );
-    BOOL                    Start( OutputDevice* pOutDev, const Point& rDestPt, const Size& rDestSz, long nExtraData = 0,
+    BOOL					Start( OutputDevice* pOutDev, const Point& rDestPt, const Size& rDestSz, long nExtraData = 0,
                                    OutputDevice* pFirstFrameOutDev = NULL );
-    void                    Stop( OutputDevice* pOutDev = NULL, long nExtraData = 0 );
+    void					Stop( OutputDevice* pOutDev = NULL, long nExtraData = 0 );
 
-    void                    Draw( OutputDevice* pOutDev, const Point& rDestPt ) const;
-    void                    Draw( OutputDevice* pOutDev, const Point& rDestPt, const Size& rDestSz ) const;
+    void					Draw( OutputDevice* pOutDev, const Point& rDestPt ) const;
+    void					Draw( OutputDevice* pOutDev, const Point& rDestPt, const Size& rDestSz ) const;
 
-    BOOL                    IsInAnimation() const { return mbIsInAnimation; }
-    BOOL                    IsTransparent() const;
-    BOOL                    IsTerminated() const { return mbLoopTerminated; }
+    BOOL					IsInAnimation() const { return mbIsInAnimation; }
+    BOOL					IsTransparent() const;
+    BOOL					IsTerminated() const { return mbLoopTerminated; }
 
-    const Size&             GetDisplaySizePixel() const { return maGlobalSize; }
-    void                    SetDisplaySizePixel( const Size& rSize ) { maGlobalSize = rSize; }
+    const Size&				GetDisplaySizePixel() const { return maGlobalSize; }
+    void					SetDisplaySizePixel( const Size& rSize ) { maGlobalSize = rSize; }
 
-    const BitmapEx&         GetBitmapEx() const { return maBitmapEx; }
-    void                    SetBitmapEx( const BitmapEx& rBmpEx ) { maBitmapEx = rBmpEx; }
+    const BitmapEx&			GetBitmapEx() const { return maBitmapEx; }
+    void					SetBitmapEx( const BitmapEx& rBmpEx ) { maBitmapEx = rBmpEx; }
 
-    ULONG                   GetLoopCount() const { return mnLoopCount; }
-    void                    SetLoopCount( const ULONG nLoopCount );
-    void                    ResetLoopCount();
+    ULONG					GetLoopCount() const { return mnLoopCount; }
+    void					SetLoopCount( const ULONG nLoopCount );
+    void					ResetLoopCount();
 
-    void                    SetCycleMode( CycleMode eMode );
-    CycleMode               GetCycleMode() const { return meCycleMode; }
+    void					SetCycleMode( CycleMode eMode );
+    CycleMode				GetCycleMode() const { return meCycleMode; }
 
-    void                    SetNotifyHdl( const Link& rLink ) { maNotifyLink = rLink; }
-    const Link&             GetNotifyHdl() const { return maNotifyLink; }
+    void					SetNotifyHdl( const Link& rLink ) { maNotifyLink = rLink; }
+    const Link&				GetNotifyHdl() const { return maNotifyLink; }
 
-    USHORT                  Count() const { return (USHORT) maList.Count(); }
-    BOOL                    Insert( const AnimationBitmap& rAnimationBitmap );
-    const AnimationBitmap&  Get( USHORT nAnimation ) const;
-    void                    Replace( const AnimationBitmap& rNewAnimationBmp, USHORT nAnimation );
+    USHORT					Count() const { return (USHORT) maList.Count(); }
+    BOOL					Insert( const AnimationBitmap& rAnimationBitmap );
+    const AnimationBitmap&	Get( USHORT nAnimation ) const;
+    void					Replace( const AnimationBitmap& rNewAnimationBmp, USHORT nAnimation );
 
-    List*                   GetAInfoList() { return &maAInfoList; }
-    ULONG                   GetSizeBytes() const;
-    ULONG                   GetChecksum() const;
+    List*					GetAInfoList() { return &maAInfoList; }
+    ULONG					GetSizeBytes() const;
+    ULONG					GetChecksum() const;
 
 public:
 
-    BOOL                    Convert( BmpConversion eConversion );
-    BOOL                    ReduceColors( USHORT nNewColorCount,
+    BOOL					Convert( BmpConversion eConversion );
+    BOOL					ReduceColors( USHORT nNewColorCount, 
                                           BmpReduce eReduce = BMP_REDUCE_SIMPLE );
-    BOOL                    Invert();
-    BOOL                    Mirror( ULONG nMirrorFlags );
-    BOOL                    Dither( ULONG nDitherFlags = BMP_DITHER_MATRIX );
-    BOOL                    Adjust( short nLuminancePercent = 0,
+    BOOL					Invert();
+    BOOL					Mirror( ULONG nMirrorFlags );
+    BOOL					Dither( ULONG nDitherFlags = BMP_DITHER_MATRIX );
+    BOOL					Adjust( short nLuminancePercent = 0,
                                     short nContrastPercent = 0,
-                                    short nChannelRPercent = 0,
-                                    short nChannelGPercent = 0,
+                                    short nChannelRPercent = 0, 
+                                    short nChannelGPercent = 0, 
                                     short nChannelBPercent = 0,
                                     double fGamma = 1.0,
                                     BOOL bInvert = FALSE );
-    BOOL                    Filter( BmpFilter eFilter,
+    BOOL					Filter( BmpFilter eFilter, 
                                     const BmpFilterParam* pFilterParam = NULL,
                                     const Link* pProgress = NULL );
 
-    friend VCL_DLLPUBLIC SvStream&      operator>>( SvStream& rIStream, Animation& rAnimation );
-    friend VCL_DLLPUBLIC SvStream&      operator<<( SvStream& rOStream, const Animation& rAnimation );
+    friend VCL_DLLPUBLIC SvStream&		operator>>( SvStream& rIStream, Animation& rAnimation );
+    friend VCL_DLLPUBLIC SvStream&		operator<<( SvStream& rOStream, const Animation& rAnimation );
 };
 
 #endif // _SV_ANIMATE_HXX
diff --git a/vcl/inc/vcl/apptypes.hxx b/vcl/inc/vcl/apptypes.hxx
index a2d02dcbb066..6f5192ff2c6e 100644
--- a/vcl/inc/vcl/apptypes.hxx
+++ b/vcl/inc/vcl/apptypes.hxx
@@ -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
diff --git a/vcl/inc/vcl/arrange.hxx b/vcl/inc/vcl/arrange.hxx
index 8846d9bbe948..3e758052cbf2 100644
--- a/vcl/inc/vcl/arrange.hxx
+++ b/vcl/inc/vcl/arrange.hxx
@@ -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
@@ -89,7 +89,7 @@ namespace vcl
             {}
 
             void deleteChild() { m_pChild.reset(); }
-
+            
             sal_Int32 getExpandPriority() const;
             Size getOptimalSize( WindowSizeType ) const;
             bool isVisible() const;
@@ -100,11 +100,11 @@ namespace vcl
         WindowArranger*             m_pParentArranger;
         Rectangle                   m_aManagedArea;
         long                        m_nOuterBorder;
-
+        
         virtual Element* getElement( size_t i_nIndex ) = 0;
         const Element* getConstElement( size_t i_nIndex ) const
         { return const_cast<WindowArranger*>(this)->getElement( i_nIndex ); }
-
+ 
 
     public:
         WindowArranger( WindowArranger* i_pParent = NULL )
@@ -124,7 +124,7 @@ namespace vcl
         // be direct children of that window
         // violating that condition will result in undefined behavior
         virtual void setParentWindow( Window* );
-
+        
         virtual void setParent( WindowArranger* );
 
         virtual size_t countElements() const = 0;
@@ -138,21 +138,21 @@ namespace vcl
             const Element* pEle = getConstElement( i_nIndex );
             return pEle ? pEle->m_pElement : NULL;
         }
-
+        
         virtual bool isVisible() const; // true if any element is visible
-
+        
         sal_Int32 getExpandPriority( size_t i_nIndex ) const
         {
             const Element* pEle = getConstElement( i_nIndex );
             return pEle ? pEle->getExpandPriority() : 0;
         }
-
+        
         Size getMinimumSize( size_t i_nIndex ) const
         {
             const Element* pEle = getConstElement( i_nIndex );
             return pEle ? pEle->m_aMinSize : Size();
         }
-
+        
         bool setMinimumSize( size_t i_nIndex, const Size& i_rMinSize )
         {
             Element* pEle = getElement( i_nIndex );
@@ -172,7 +172,7 @@ namespace vcl
                 pEle->m_nBottomBorder = i_nBottom;
             }
         }
-
+        
         void show( bool i_bShow = true, bool i_bImmediateUpdate = true );
 
         void setManagedArea( const Rectangle& i_rArea )
@@ -226,7 +226,7 @@ namespace vcl
         size_t addChild( WindowArranger* i_pNewChild, sal_Int32 i_nExpandPrio = 0, size_t i_nIndex = ~0 )
         { return addChild( boost::shared_ptr<WindowArranger>( i_pNewChild ), i_nExpandPrio, i_nIndex ); }
         void remove( boost::shared_ptr<WindowArranger> const & );
-
+        
         long getBorderWidth() const { return m_nBorderWidth; }
     };
 
@@ -267,13 +267,13 @@ namespace vcl
         void setElement( boost::shared_ptr<WindowArranger> const & );
         void setLabelColumnWidth( long i_nWidth )
         { m_nLabelColumnWidth = i_nWidth; }
-
+        
         Size getLabelSize( WindowSizeType i_eType ) const
         { return m_aLabel.getOptimalSize( i_eType ); }
         Size getElementSize( WindowSizeType i_eType ) const
         { return m_aElement.getOptimalSize( i_eType ); }
     };
-
+    
     class LabelColumn : public RowOrColumn
     {
         long getLabelWidth() const;
@@ -282,10 +282,10 @@ namespace vcl
         : RowOrColumn( i_pParent, true, i_nBorderWidth )
         {}
         virtual ~LabelColumn();
-
+        
         virtual Size getOptimalSize( WindowSizeType ) const;
         virtual void resize();
-
+        
         // returns the index of the added label
         size_t addRow( Window* i_pLabel, boost::shared_ptr<WindowArranger> const& i_rElement, long i_nIndent = 0 );
         size_t addRow( Window* i_pLabel, Window* i_pElement, long i_nIndent = 0 );
@@ -324,7 +324,7 @@ namespace vcl
         void setChild( WindowArranger* i_pChild, sal_Int32 i_nExpandPrio = 0 )
         { setChild( boost::shared_ptr<WindowArranger>( i_pChild ), i_nExpandPrio ); }
     };
-
+    
     class Spacer : public WindowArranger
     {
         WindowArranger::Element     m_aElement;
@@ -355,18 +355,18 @@ namespace vcl
     {
         long    m_nBorderX;
         long    m_nBorderY;
-
+        
         struct MatrixElement : public WindowArranger::Element
         {
             sal_uInt32  m_nX;
             sal_uInt32  m_nY;
-
+            
             MatrixElement()
             : WindowArranger::Element()
             , m_nX( 0 )
             , m_nY( 0 )
             {}
-
+            
             MatrixElement( Window* i_pWin,
                            sal_uInt32 i_nX, sal_uInt32 i_nY,
                            boost::shared_ptr<WindowArranger> const & i_pChild = boost::shared_ptr<WindowArranger>(),
@@ -381,7 +381,7 @@ namespace vcl
 
         std::vector< MatrixElement >            m_aElements;
         std::map< sal_uInt64, size_t >          m_aMatrixMap;  // maps (x | (y << 32)) to index in m_aElements
-
+        
         sal_uInt64 getMap( sal_uInt32 i_nX, sal_uInt32 i_nY )
         { return static_cast< sal_uInt64 >(i_nX) | (static_cast< sal_uInt64>(i_nY) << 32 ); }
 
diff --git a/vcl/inc/vcl/bitmap.hxx b/vcl/inc/vcl/bitmap.hxx
index 7483f54014a4..435e4c6a6de9 100644
--- a/vcl/inc/vcl/bitmap.hxx
+++ b/vcl/inc/vcl/bitmap.hxx
@@ -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
@@ -38,35 +38,35 @@
 // - Defines -
 // -----------
 
-#define BMP_MIRROR_NONE             0x00000000UL
-#define BMP_MIRROR_HORZ             0x00000001UL
-#define BMP_MIRROR_VERT             0x00000002UL
+#define BMP_MIRROR_NONE				0x00000000UL
+#define BMP_MIRROR_HORZ				0x00000001UL
+#define BMP_MIRROR_VERT				0x00000002UL
 
 // -----------------------------------------------------------------------------
 
-#define BMP_SCALE_NONE              0x00000000UL
-#define BMP_SCALE_FAST              0x00000001UL
-#define BMP_SCALE_INTERPOLATE       0x00000002UL
+#define BMP_SCALE_NONE				0x00000000UL
+#define BMP_SCALE_FAST				0x00000001UL
+#define BMP_SCALE_INTERPOLATE		0x00000002UL
 
 // -----------------------------------------------------------------------------
 
-#define BMP_DITHER_NONE             0x00000000UL
-#define BMP_DITHER_MATRIX           0x00000001UL
-#define BMP_DITHER_FLOYD            0x00000002UL
-#define BMP_DITHER_FLOYD_16         0x00000004UL
+#define BMP_DITHER_NONE				0x00000000UL
+#define BMP_DITHER_MATRIX			0x00000001UL
+#define BMP_DITHER_FLOYD			0x00000002UL
+#define BMP_DITHER_FLOYD_16			0x00000004UL
 
 // -----------------------------------------------------------------------------
 
-#define BMP_VECTORIZE_NONE          BMP_VECTORIZE_OUTER
-#define BMP_VECTORIZE_INNER         0x00000001UL
-#define BMP_VECTORIZE_OUTER         0x00000002UL
-#define BMP_VECTORIZE_BOUND_ONLY    0x00000004UL
-#define BMP_VECTORIZE_REDUCE_EDGES  0x00000008UL
+#define BMP_VECTORIZE_NONE			BMP_VECTORIZE_OUTER
+#define BMP_VECTORIZE_INNER			0x00000001UL
+#define BMP_VECTORIZE_OUTER			0x00000002UL
+#define BMP_VECTORIZE_BOUND_ONLY	0x00000004UL
+#define BMP_VECTORIZE_REDUCE_EDGES	0x00000008UL
 
 // -----------------------------------------------------------------------------
 
-#define BMP_COL_TRANS                   Color( 252, 3, 251 )
-#define BMP_COLOR_MONOCHROME_THRESHOLD  128
+#define BMP_COL_TRANS					Color( 252, 3, 251 )
+#define BMP_COLOR_MONOCHROME_THRESHOLD	128
 
 // ---------
 // - Enums -
@@ -163,9 +163,9 @@ class VCL_DLLPUBLIC BmpFilterParam
     friend class Animation;
 
 private:
-    BmpFilter   meFilter;
-    ULONG       mnProgressStart;
-    ULONG       mnProgressEnd;
+    BmpFilter	meFilter;
+    ULONG		mnProgressStart;
+    ULONG		mnProgressEnd;
 
 public:
     struct MosaicTileSize
@@ -183,8 +183,8 @@ public:
 private:
     union
     {
-        USHORT  mnSepiaPercent;
-        BYTE    mcSolarGreyThreshold;
+        USHORT	mnSepiaPercent;
+        BYTE	mcSolarGreyThreshold;
 
         MosaicTileSize maMosaicTileSize;
         EmbossAngles maEmbossAngles;
@@ -230,8 +230,8 @@ class   Color;
 class   SvStream;
 struct  DIBInfoHeader;
 class   ResId;
-class   GDIMetaFile;
-class   AlphaMask;
+class	GDIMetaFile;
+class	AlphaMask;
 class   OutputDevice;
 class   SalBitmap;
 
@@ -288,25 +288,25 @@ public:
     SAL_DLLPRIVATE BOOL                 ImplMakeGreyscales( USHORT nGreyscales );
     SAL_DLLPRIVATE BOOL                 ImplConvertUp( USHORT nBitCount, Color* pExtColor = NULL );
     SAL_DLLPRIVATE BOOL                 ImplConvertDown( USHORT nBitCount, Color* pExtColor = NULL );
-    SAL_DLLPRIVATE BOOL                 ImplConvertGhosted();
-    SAL_DLLPRIVATE BOOL                 ImplDitherMatrix();
-    SAL_DLLPRIVATE BOOL                 ImplDitherFloyd();
-    SAL_DLLPRIVATE BOOL                 ImplDitherFloyd16();
-    SAL_DLLPRIVATE BOOL                 ImplReduceSimple( USHORT nColorCount );
-    SAL_DLLPRIVATE BOOL                 ImplReducePopular( USHORT nColorCount );
-    SAL_DLLPRIVATE BOOL                 ImplReduceMedian( USHORT nColorCount );
-    SAL_DLLPRIVATE void                 ImplMedianCut( ULONG* pColBuf, BitmapPalette& rPal,
+    SAL_DLLPRIVATE BOOL					ImplConvertGhosted();
+    SAL_DLLPRIVATE BOOL					ImplDitherMatrix();
+    SAL_DLLPRIVATE BOOL					ImplDitherFloyd();
+    SAL_DLLPRIVATE BOOL					ImplDitherFloyd16();
+    SAL_DLLPRIVATE BOOL					ImplReduceSimple( USHORT nColorCount );
+    SAL_DLLPRIVATE BOOL					ImplReducePopular( USHORT nColorCount );
+    SAL_DLLPRIVATE BOOL					ImplReduceMedian( USHORT nColorCount );
+    SAL_DLLPRIVATE void					ImplMedianCut( ULONG* pColBuf, BitmapPalette& rPal, 
                                            long nR1, long nR2, long nG1, long nG2, long nB1, long nB2,
                                            long nColors, long nPixels, long& rIndex );
-    SAL_DLLPRIVATE BOOL                 ImplConvolute3( const long* pMatrix, long nDivisor,
+    SAL_DLLPRIVATE BOOL					ImplConvolute3( const long* pMatrix, long nDivisor, 
                                             const BmpFilterParam* pFilterParam, const Link* pProgress );
-    SAL_DLLPRIVATE BOOL                 ImplMedianFilter( const BmpFilterParam* pFilterParam, const Link* pProgress );
-    SAL_DLLPRIVATE BOOL                 ImplSobelGrey( const BmpFilterParam* pFilterParam, const Link* pProgress );
-    SAL_DLLPRIVATE BOOL                 ImplEmbossGrey( const BmpFilterParam* pFilterParam, const Link* pProgress );
-    SAL_DLLPRIVATE BOOL                 ImplSolarize( const BmpFilterParam* pFilterParam, const Link* pProgress );
-    SAL_DLLPRIVATE BOOL                 ImplSepia( const BmpFilterParam* pFilterParam, const Link* pProgress );
-    SAL_DLLPRIVATE BOOL                 ImplMosaic( const BmpFilterParam* pFilterParam, const Link* pProgress );
-    SAL_DLLPRIVATE BOOL                 ImplPopArt( const BmpFilterParam* pFilterParam, const Link* pProgress );
+    SAL_DLLPRIVATE BOOL					ImplMedianFilter( const BmpFilterParam* pFilterParam, const Link* pProgress );
+    SAL_DLLPRIVATE BOOL					ImplSobelGrey( const BmpFilterParam* pFilterParam, const Link* pProgress );
+    SAL_DLLPRIVATE BOOL					ImplEmbossGrey( const BmpFilterParam* pFilterParam, const Link* pProgress );
+    SAL_DLLPRIVATE BOOL					ImplSolarize( const BmpFilterParam* pFilterParam, const Link* pProgress );
+    SAL_DLLPRIVATE BOOL					ImplSepia( const BmpFilterParam* pFilterParam, const Link* pProgress );
+    SAL_DLLPRIVATE BOOL					ImplMosaic( const BmpFilterParam* pFilterParam, const Link* pProgress );
+    SAL_DLLPRIVATE BOOL					ImplPopArt( const BmpFilterParam* pFilterParam, const Link* pProgress );
 
 //#endif // PRIVATE
 
@@ -324,11 +324,11 @@ public:
     inline BOOL             operator==( const Bitmap& rBitmap ) const;
     inline BOOL             operator!=( const Bitmap& rBitmap ) const;
 
-    inline BOOL             IsSameInstance( const Bitmap& rBmp ) const;
-    BOOL                    IsEqual( const Bitmap& rBmp ) const;
+    inline BOOL				IsSameInstance( const Bitmap& rBmp ) const;
+    BOOL					IsEqual( const Bitmap& rBmp ) const;
 
-    inline BOOL             IsEmpty() const;
-    void                    SetEmpty();
+    inline BOOL				IsEmpty() const;
+    void					SetEmpty();
 
     inline const MapMode&   GetPrefMapMode() const;
     inline void             SetPrefMapMode( const MapMode& rMapMode );
@@ -337,7 +337,7 @@ public:
     inline void             SetPrefSize( const Size& rSize );
 
     Size                    GetSizePixel() const;
-    void                    SetSizePixel( const Size& rNewSize );
+    void					SetSizePixel( const Size& rNewSize );
 
     /**
      * The pixel size of a bitmap's source (e.g. an image file)
@@ -351,17 +351,17 @@ public:
     USHORT                  GetBitCount() const;
     inline ULONG            GetColorCount() const;
     inline ULONG            GetSizeBytes() const;
-    BOOL                    HasGreyPalette() const;
+    BOOL					HasGreyPalette() const;
     /** get system dependent bitmap data
-
+    
         @param rData
         The system dependent BitmapSystemData structure to be filled
-
+        
         @return TRUE if the bitmap has a valid system object (e.g. not empty)
     */
     bool                    GetSystemData( BitmapSystemData& rData ) const;
 
-    ULONG                   GetChecksum() const;
+    ULONG					GetChecksum() const;
 
     Bitmap                  CreateDisplayBitmap( OutputDevice* pDisplay );
     Bitmap                  GetColorTransformedBitmap( BmpColorMode eColorMode ) const;
@@ -392,7 +392,7 @@ public:
 
         @return TRUE, if the color reduction operation was completed successfully.
      */
-    BOOL                    ReduceColors( USHORT nNewColorCount,
+    BOOL					ReduceColors( USHORT nNewColorCount, 
                                           BmpReduce eReduce = BMP_REDUCE_SIMPLE );
 
     /** Apply a dither algorithm to the bitmap
@@ -407,7 +407,7 @@ public:
         @param pDitherPal
         A custom palette to be used when dithering (not yet implemented, leave NULL)
      */
-    BOOL                    Dither( ULONG nDitherFlags = BMP_DITHER_MATRIX );
+    BOOL					Dither( ULONG nDitherFlags = BMP_DITHER_MATRIX );
 
     /** Crop the bitmap
 
@@ -427,7 +427,7 @@ public:
 
     /** Expand the bitmap by pixel padding
 
-        @param nDX
+        @param nDX 
         Number of pixel to pad at the right border of the bitmap
 
         @param nDY
@@ -440,7 +440,7 @@ public:
         not only returned when the operation failed, but also if
         nothing had to be done, e.g. because nDX and nDY were zero.
      */
-    BOOL                    Expand( ULONG nDX, ULONG nDY,
+    BOOL                    Expand( ULONG nDX, ULONG nDY, 
                                     const Color* pInitColor = NULL );
 
     /** Copy a rectangular area from another bitmap
@@ -473,7 +473,7 @@ public:
 
         @param rMask
         The mask bitmap in the selected combine operation
-
+        
         @param eCombine
         The combine operation to perform on the bitmap
 
@@ -498,8 +498,8 @@ public:
 
         @return TRUE, if blending was successful, FALSE otherwise
      */
-    BOOL                    Blend( const AlphaMask& rAlpha,
-                                   const Color&     rBackgroundColor );
+    BOOL 					Blend( const AlphaMask& rAlpha, 
+                                   const Color& 	rBackgroundColor );
 
     /** Fill the entire bitmap with the given color
 
@@ -515,13 +515,13 @@ public:
         @return TRUE, if the operation was completed successfully.
      */
     BOOL                    Invert();
-
+    
     /** Mirror the bitmap
 
         @param nMirrorFlags
         About which axis (horizontal, vertical, or both) to mirror
 
-        @return TRUE, if the operation was completed successfully.
+        @return TRUE, if the operation was completed successfully.        
      */
     BOOL                    Mirror( ULONG nMirrorFlags );
 
@@ -533,7 +533,7 @@ public:
         @param nScaleFlag
         The algorithm to be used for scaling
 
-        @return TRUE, if the operation was completed successfully.
+        @return TRUE, if the operation was completed successfully.        
      */
     BOOL                    Scale( const Size& rNewSize,
                                    ULONG nScaleFlag = BMP_SCALE_FAST );
@@ -546,9 +546,9 @@ public:
         @param rScaleY
         The scale factor in y direction.
 
-        @return TRUE, if the operation was completed successfully.
+        @return TRUE, if the operation was completed successfully.        
      */
-    BOOL                    Scale( const double& rScaleX, const double& rScaleY,
+    BOOL                    Scale( const double& rScaleX, const double& rScaleY, 
                                    ULONG nScaleFlag = BMP_SCALE_FAST );
 
     /** Rotate bitmap by the specified angle
@@ -562,7 +562,7 @@ public:
         in. The empty spaces around that rotated original bitmap are
         then filled with this color.
 
-        @return TRUE, if the operation was completed successfully.
+        @return TRUE, if the operation was completed successfully.        
      */
     BOOL                    Rotate( long nAngle10, const Color& rFillColor );
 
@@ -595,17 +595,17 @@ public:
 
         @return the generated region.
      */
-    Region                  CreateRegion( const Color& rColor, const Rectangle& rRect ) const;
+    Region					CreateRegion( const Color& rColor, const Rectangle& rRect ) const;
 
     /** Replace all pixel where the given mask is on with the specified color
 
         @param rMask
         Mask specifying which pixel should be replaced
-
+        
         @param rReplaceColor
         Color to be placed in all changed pixel
 
-        @return TRUE, if the operation was completed successfully.
+        @return TRUE, if the operation was completed successfully.        
      */
     BOOL                    Replace( const Bitmap& rMask, const Color& rReplaceColor );
 
@@ -613,11 +613,11 @@ public:
 
         @param rAlpha
         Alpha mask specifying the amount of background color to merge in
-
+        
         @param rMergeColor
         Background color to be used for merging
 
-        @return TRUE, if the operation was completed successfully.
+        @return TRUE, if the operation was completed successfully.        
      */
     BOOL                    Replace( const AlphaMask& rAlpha, const Color& rMergeColor );
 
@@ -625,7 +625,7 @@ public:
 
         @param rSearchColor
         Color specifying which pixel should be replaced
-
+        
         @param rReplaceColor
         Color to be placed in all changed pixel
 
@@ -634,7 +634,7 @@ public:
         rSearchColor and the individual pixel values, such that the
         corresponding pixel is still regarded a match.
 
-        @return TRUE, if the operation was completed successfully.
+        @return TRUE, if the operation was completed successfully.        
      */
     BOOL                    Replace( const Color& rSearchColor, const Color& rReplaceColor, ULONG nTol = 0 );
 
@@ -642,7 +642,7 @@ public:
 
         @param pSearchColor
         Array of colors specifying which pixel should be replaced
-
+        
         @param pReplaceColor
         Array of colors to be placed in all changed pixel
 
@@ -654,12 +654,12 @@ public:
         pSearchColor colors and the individual pixel values, such that
         the corresponding pixel is still regarded a match.
 
-        @return TRUE, if the operation was completed successfully.
+        @return TRUE, if the operation was completed successfully.        
      */
-    BOOL                    Replace( const Color* pSearchColors, const Color* rReplaceColors,
+    BOOL                    Replace( const Color* pSearchColors, const Color* rReplaceColors, 
                                      ULONG nColorCount, ULONG* pTols = NULL );
 
-    /** Convert the bitmap to a PolyPolygon
+    /** Convert the bitmap to a PolyPolygon    	
 
         This works by putting continuous areas of the same color into
         a polygon, by tracing its bounding line.
@@ -674,9 +674,9 @@ public:
         @param pProgress
         A callback for showing the progress of the vectorization
 
-        @return TRUE, if the operation was completed successfully.
+        @return TRUE, if the operation was completed successfully.        
      */
-    BOOL                    Vectorize( PolyPolygon& rPolyPoly,
+    BOOL					Vectorize( PolyPolygon& rPolyPoly, 
                                        ULONG nFlags = BMP_VECTORIZE_OUTER,
                                        const Link* pProgress = NULL );
 
@@ -699,9 +699,9 @@ public:
         @param pProgress
         A callback for showing the progress of the vectorization
 
-        @return TRUE, if the operation was completed successfully.
+        @return TRUE, if the operation was completed successfully.        
      */
-    BOOL                    Vectorize( GDIMetaFile& rMtf, BYTE cReduce = 0,
+    BOOL					Vectorize( GDIMetaFile& rMtf, BYTE cReduce = 0,
                                        ULONG nFlags = BMP_VECTORIZE_INNER,
                                        const Link* pProgress = NULL );
 
@@ -730,12 +730,12 @@ public:
         @param bInvert
         If TRUE, invert the channel values with the logical 'not' operator
 
-        @return TRUE, if the operation was completed successfully.
+        @return TRUE, if the operation was completed successfully.        
      */
-    BOOL                    Adjust( short nLuminancePercent = 0,
+    BOOL					Adjust( short nLuminancePercent = 0,
                                     short nContrastPercent = 0,
-                                    short nChannelRPercent = 0,
-                                    short nChannelGPercent = 0,
+                                    short nChannelRPercent = 0, 
+                                    short nChannelGPercent = 0, 
                                     short nChannelBPercent = 0,
                                     double fGamma = 1.0,
                                     BOOL bInvert = FALSE );
@@ -750,10 +750,10 @@ public:
 
         @param pProgress
         A callback for showing the progress of the vectorization
-
-        @return TRUE, if the operation was completed successfully.
+        
+        @return TRUE, if the operation was completed successfully.        
      */
-    BOOL                    Filter( BmpFilter eFilter,
+    BOOL					Filter( BmpFilter eFilter, 
                                     const BmpFilterParam* pFilterParam = NULL,
                                     const Link* pProgress = NULL );
 
@@ -803,7 +803,7 @@ inline BOOL Bitmap::IsSameInstance( const Bitmap& rBitmap ) const
 
 // ------------------------------------------------------------------
 
-inline BOOL Bitmap::IsEmpty() const
+inline BOOL	Bitmap::IsEmpty() const
 {
     return( mpImpBmp == NULL );
 }
diff --git a/vcl/inc/vcl/bitmapex.hxx b/vcl/inc/vcl/bitmapex.hxx
index c19e1a9cbc39..a7185da8aca5 100644
--- a/vcl/inc/vcl/bitmapex.hxx
+++ b/vcl/inc/vcl/bitmapex.hxx
@@ -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
@@ -39,7 +39,7 @@
 
 enum TransparentType
 {
-    TRANSPARENT_NONE,
+    TRANSPARENT_NONE, 
     TRANSPARENT_COLOR,
     TRANSPARENT_BITMAP
 };
@@ -54,12 +54,12 @@ class VCL_DLLPUBLIC BitmapEx
 
 private:
 
-    Bitmap              aBitmap;
-    Bitmap              aMask;
-    Size                aBitmapSize;
-    Color               aTransparentColor;
-    TransparentType     eTransparent;
-    BOOL                bAlpha;
+    Bitmap				aBitmap;
+    Bitmap				aMask;
+    Size				aBitmapSize;
+    Color				aTransparentColor;
+    TransparentType		eTransparent;
+    BOOL				bAlpha;
 
 public:
 
@@ -82,51 +82,51 @@ public:
                         BitmapEx( const Bitmap& rBmp, const Color& rTransparentColor );
                         ~BitmapEx();
 
-    BitmapEx&           operator=( const BitmapEx& rBitmapEx );
-    BOOL                operator==( const BitmapEx& rBitmapEx ) const;
-    BOOL                operator!=( const BitmapEx& rBitmapEx ) const { return !(*this==rBitmapEx); }
-    BOOL                operator!() const { return !aBitmap; }
+    BitmapEx&			operator=( const BitmapEx& rBitmapEx );
+    BOOL				operator==( const BitmapEx& rBitmapEx ) const;
+    BOOL				operator!=( const BitmapEx& rBitmapEx ) const { return !(*this==rBitmapEx); }
+    BOOL				operator!() const { return !aBitmap; }
 
-    BOOL                IsEqual( const BitmapEx& rBmpEx ) const;
+    BOOL				IsEqual( const BitmapEx& rBmpEx ) const;
 
-    BOOL                IsEmpty() const;
-    void                SetEmpty();
-    void                Clear();
+    BOOL				IsEmpty() const;
+    void				SetEmpty();
+    void				Clear();
 
-    void                Draw( OutputDevice* pOutDev,
+    void				Draw( OutputDevice* pOutDev, 
                               const Point& rDestPt ) const;
-    void                Draw( OutputDevice* pOutDev,
+    void				Draw( OutputDevice* pOutDev, 
                               const Point& rDestPt, const Size& rDestSize ) const;
-    void                Draw( OutputDevice* pOutDev,
+    void				Draw( OutputDevice* pOutDev, 
                               const Point& rDestPt, const Size& rDestSize,
                               const Point& rSrcPtPixel, const Size& rSrcSizePixel ) const;
 
-    BOOL                IsTransparent() const;
-    TransparentType     GetTransparentType() const { return eTransparent; }
+    BOOL				IsTransparent() const;
+    TransparentType		GetTransparentType() const { return eTransparent; }
 
-    Bitmap              GetBitmap( const Color* pTransReplaceColor = NULL ) const;
-    Bitmap              GetMask() const;
+    Bitmap				GetBitmap( const Color* pTransReplaceColor = NULL ) const;
+    Bitmap				GetMask() const;
 
     BitmapEx            GetColorTransformedBitmapEx( BmpColorMode eColorMode ) const;
 
-    BOOL                IsAlpha() const;
-    AlphaMask           GetAlpha() const;
+    BOOL				IsAlpha() const;
+    AlphaMask			GetAlpha() const;
 
     const Size&         GetSizePixel() const { return aBitmapSize; }
-    void                SetSizePixel( const Size& rNewSize );
+    void				SetSizePixel( const Size& rNewSize );
 
-    const Size&         GetPrefSize() const { return aBitmap.GetPrefSize(); }
-    void                SetPrefSize( const Size& rPrefSize ) { aBitmap.SetPrefSize( rPrefSize ); }
+    const Size&			GetPrefSize() const { return aBitmap.GetPrefSize(); }
+    void				SetPrefSize( const Size& rPrefSize ) { aBitmap.SetPrefSize( rPrefSize ); }
 
-    const MapMode&      GetPrefMapMode() const { return aBitmap.GetPrefMapMode(); }
-    void                SetPrefMapMode( const MapMode& rPrefMapMode ) { aBitmap.SetPrefMapMode( rPrefMapMode ); }
+    const MapMode&		GetPrefMapMode() const { return aBitmap.GetPrefMapMode(); }
+    void				SetPrefMapMode( const MapMode& rPrefMapMode ) { aBitmap.SetPrefMapMode( rPrefMapMode ); }
 
-    const Color&        GetTransparentColor() const { return aTransparentColor; }
-    void                SetTransparentColor( const Color& rColor ) { aTransparentColor = rColor; }
+    const Color&		GetTransparentColor() const { return aTransparentColor; }
+    void				SetTransparentColor( const Color& rColor ) { aTransparentColor = rColor; }
 
-    USHORT              GetBitCount() const { return aBitmap.GetBitCount(); }
-    ULONG               GetSizeBytes() const;
-    ULONG               GetChecksum() const;
+    USHORT				GetBitCount() const { return aBitmap.GetBitCount(); }
+    ULONG				GetSizeBytes() const;
+    ULONG				GetChecksum() const;
 
 public:
 
@@ -137,7 +137,7 @@ public:
 
         @return TRUE, if the conversion was completed successfully.
      */
-    BOOL                Convert( BmpConversion eConversion );
+    BOOL				Convert( BmpConversion eConversion );
 
     /** Reduce number of colors for the bitmap
 
@@ -149,7 +149,7 @@ public:
 
         @return TRUE, if the color reduction operation was completed successfully.
      */
-    BOOL                ReduceColors( USHORT nNewColorCount,
+    BOOL				ReduceColors( USHORT nNewColorCount, 
                                       BmpReduce eReduce = BMP_REDUCE_SIMPLE );
 
     /** Apply a dither algorithm to the bitmap
@@ -161,7 +161,7 @@ public:
         @param nDitherFlags
         The algorithm to be used for dithering
      */
-    BOOL                Dither( ULONG nDitherFlags = BMP_DITHER_MATRIX );
+    BOOL				Dither( ULONG nDitherFlags = BMP_DITHER_MATRIX );
 
     /** Crop the bitmap
 
@@ -177,11 +177,11 @@ public:
         nothing had to be cropped, because e.g. the crop rectangle
         included the bitmap, FALSE is returned, too!
      */
-    BOOL                Crop( const Rectangle& rRectPixel );
+    BOOL				Crop( const Rectangle& rRectPixel );
 
     /** Expand the bitmap by pixel padding
 
-        @param nDX
+        @param nDX 
         Number of pixel to pad at the right border of the bitmap
 
         @param nDY
@@ -194,8 +194,8 @@ public:
         not only returned when the operation failed, but also if
         nothing had to be done, e.g. because nDX and nDY were zero.
      */
-    BOOL                Expand( ULONG nDX, ULONG nDY,
-                                const Color* pInitColor = NULL,
+    BOOL				Expand( ULONG nDX, ULONG nDY, 
+                                const Color* pInitColor = NULL, 
                                 BOOL bExpandTransparent = FALSE );
 
     /** Copy a rectangular area from another bitmap
@@ -220,7 +220,7 @@ public:
         nothing had to be done, e.g. because one of the rectangles are
         empty.
      */
-    BOOL                CopyPixel( const Rectangle& rRectDst,
+    BOOL				CopyPixel( const Rectangle& rRectDst,
                                    const Rectangle& rRectSrc,
                                    const BitmapEx* pBmpExSrc = NULL );
 
@@ -232,22 +232,22 @@ public:
 
         @return TRUE, if the operation was completed successfully.
      */
-    BOOL                Erase( const Color& rFillColor );
+    BOOL				Erase( const Color& rFillColor );
 
     /** Perform the Invert operation on every pixel
 
         @return TRUE, if the operation was completed successfully.
      */
-    BOOL                Invert();
+    BOOL				Invert();
 
     /** Mirror the bitmap
 
         @param nMirrorFlags
         About which axis (horizontal, vertical, or both) to mirror
 
-        @return TRUE, if the operation was completed successfully.
+        @return TRUE, if the operation was completed successfully.        
      */
-    BOOL                Mirror( ULONG nMirrorFlags );
+    BOOL				Mirror( ULONG nMirrorFlags );
 
     /** Scale the bitmap
 
@@ -257,9 +257,9 @@ public:
         @param nScaleFlag
         The algorithm to be used for scaling
 
-        @return TRUE, if the operation was completed successfully.
+        @return TRUE, if the operation was completed successfully.        
      */
-    BOOL                Scale( const Size& rNewSize, ULONG nScaleFlag = BMP_SCALE_FAST );
+    BOOL				Scale( const Size& rNewSize, ULONG nScaleFlag = BMP_SCALE_FAST );
 
     /** Scale the bitmap
 
@@ -269,9 +269,9 @@ public:
         @param rScaleY
         The scale factor in y direction.
 
-        @return TRUE, if the operation was completed successfully.
+        @return TRUE, if the operation was completed successfully.        
      */
-    BOOL                Scale( const double& rScaleX, const double& rScaleY, ULONG nScaleFlag = BMP_SCALE_FAST );
+    BOOL				Scale( const double& rScaleX, const double& rScaleY, ULONG nScaleFlag = BMP_SCALE_FAST );
 
     /** Rotate bitmap by the specified angle
 
@@ -284,15 +284,15 @@ public:
         in. The empty spaces around that rotated original bitmap are
         then filled with this color.
 
-        @return TRUE, if the operation was completed successfully.
+        @return TRUE, if the operation was completed successfully.        
      */
-    BOOL                Rotate( long nAngle10, const Color& rFillColor );
+    BOOL				Rotate( long nAngle10, const Color& rFillColor );
 
     /** Replace all pixel having the search color with the specified color
 
         @param rSearchColor
         Color specifying which pixel should be replaced
-
+        
         @param rReplaceColor
         Color to be placed in all changed pixel
 
@@ -301,15 +301,15 @@ public:
         rSearchColor and the individual pixel values, such that the
         corresponding pixel is still regarded a match.
 
-        @return TRUE, if the operation was completed successfully.
+        @return TRUE, if the operation was completed successfully.        
      */
-    BOOL                Replace( const Color& rSearchColor, const Color& rReplaceColor, ULONG nTol = 0 );
+    BOOL				Replace( const Color& rSearchColor, const Color& rReplaceColor, ULONG nTol = 0 );
 
     /** Replace all pixel having one the search colors with the corresponding replace color
 
         @param pSearchColor
         Array of colors specifying which pixel should be replaced
-
+        
         @param pReplaceColor
         Array of colors to be placed in all changed pixel
 
@@ -321,9 +321,9 @@ public:
         pSearchColor colors and the individual pixel values, such that
         the corresponding pixel is still regarded a match.
 
-        @return TRUE, if the operation was completed successfully.
+        @return TRUE, if the operation was completed successfully.        
      */
-    BOOL                Replace( const Color* pSearchColors, const Color* pReplaceColors,
+    BOOL				Replace( const Color* pSearchColors, const Color* pReplaceColors, 
                                  ULONG nColorCount, const ULONG* pTols = NULL );
 
     /** Change various global color characteristics
@@ -351,12 +351,12 @@ public:
         @param bInvert
         If TRUE, invert the channel values with the logical 'not' operator
 
-        @return TRUE, if the operation was completed successfully.
+        @return TRUE, if the operation was completed successfully.        
      */
-    BOOL                Adjust( short nLuminancePercent = 0,
+    BOOL				Adjust( short nLuminancePercent = 0,
                                 short nContrastPercent = 0,
-                                short nChannelRPercent = 0,
-                                short nChannelGPercent = 0,
+                                short nChannelRPercent = 0, 
+                                short nChannelGPercent = 0, 
                                 short nChannelBPercent = 0,
                                 double fGamma = 1.0,
                                 BOOL bInvert = FALSE );
@@ -371,10 +371,10 @@ public:
 
         @param pProgress
         A callback for showing the progress of the vectorization
-
-        @return TRUE, if the operation was completed successfully.
+        
+        @return TRUE, if the operation was completed successfully.        
      */
-    BOOL                Filter( BmpFilter eFilter,
+    BOOL				Filter( BmpFilter eFilter, 
                                 const BmpFilterParam* pFilterParam = NULL,
                                 const Link* pProgress = NULL );
 
@@ -393,8 +393,8 @@ public:
 
 public:
 
-    friend VCL_DLLPUBLIC SvStream&  operator<<( SvStream& rOStm, const BitmapEx& rBitmapEx );
-    friend VCL_DLLPUBLIC SvStream&  operator>>( SvStream& rIStm, BitmapEx& rBitmapEx );
+    friend VCL_DLLPUBLIC SvStream&	operator<<( SvStream& rOStm, const BitmapEx& rBitmapEx );
+    friend VCL_DLLPUBLIC SvStream&	operator>>( SvStream& rIStm, BitmapEx& rBitmapEx );
 };
 
 #endif // _SV_BITMAPEX_HXX
diff --git a/vcl/inc/vcl/bmpacc.hxx b/vcl/inc/vcl/bmpacc.hxx
index f83b4c73a903..18cd3904ec0d 100644
--- a/vcl/inc/vcl/bmpacc.hxx
+++ b/vcl/inc/vcl/bmpacc.hxx
@@ -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
@@ -90,7 +90,7 @@ private:
 
                                 BitmapReadAccess() {}
                                 BitmapReadAccess( const BitmapReadAccess& ) {}
-    BitmapReadAccess&           operator=( const BitmapReadAccess& ) { return *this; }
+    BitmapReadAccess&    		operator=( const BitmapReadAccess& ) { return *this; }
 
 protected:
     Bitmap                      maBitmap;
@@ -172,8 +172,8 @@ public:
     inline BitmapColor          GetPixelFromData( const BYTE* pData, long nX ) const;
     inline void                 SetPixelOnData( BYTE* pData, long nX, const BitmapColor& rBitmapColor );
     inline BitmapColor          GetPixel( long nY, long nX ) const;
-    inline BitmapColor          GetColor( long nY, long nX ) const;
-    inline BYTE                 GetLuminance( long nY, long nX ) const;
+    inline BitmapColor			GetColor( long nY, long nX ) const;
+    inline BYTE					GetLuminance( long nY, long nX ) const;
 };
 
 // ---------------------
@@ -188,7 +188,7 @@ public:
     virtual                     ~BitmapWriteAccess();
 
     void                        CopyScanline( long nY, const BitmapReadAccess& rReadAcc );
-    void                        CopyScanline( long nY, ConstScanline aSrcScanline,
+    void                        CopyScanline( long nY, ConstScanline aSrcScanline, 
                                               ULONG nSrcScanlineFormat, ULONG nSrcScanlineSize );
 
     void                        CopyBuffer( const BitmapReadAccess& rReadAcc );
@@ -199,15 +199,15 @@ public:
 
     inline void                 SetPixel( long nY, long nX, const BitmapColor& rBitmapColor );
 
-    void                        SetLineColor();
-    void                        SetLineColor( const Color& rColor );
-    Color                       GetLineColor() const;
+    void                 		SetLineColor();
+    void                 		SetLineColor( const Color& rColor );
+    Color		   				GetLineColor() const;
 
-    void                        SetFillColor();
-    void                        SetFillColor( const Color& rColor );
-    Color                       GetFillColor() const;
+    void                 		SetFillColor();
+    void                 		SetFillColor( const Color& rColor );
+    Color				   		GetFillColor() const;
 
-    void                        Erase( const Color& rColor );
+    void						Erase( const Color& rColor );
 
     void                        DrawLine( const Point& rStart, const Point& rEnd );
 
@@ -223,18 +223,18 @@ public:
 private:
 
     BitmapColor*                mpLineColor;
-    BitmapColor*                mpFillColor;
+    BitmapColor*           		mpFillColor;
 
                                 BitmapWriteAccess() {}
                                 BitmapWriteAccess( const BitmapWriteAccess& ) : BitmapReadAccess() {}
-    BitmapWriteAccess&          operator=( const BitmapWriteAccess& ) { return *this; }
+    BitmapWriteAccess& 			operator=( const BitmapWriteAccess& ) { return *this; } 
 };
 
 // -------------------
 // - Accessor Helper -
 // -------------------
 
-/** This template handles BitmapAccess the RAII way.
+/** This template handles BitmapAccess the RAII way. 
 
     Please don't use directly, but the ready-made typedefs for
     BitmapReadAccess and BitmapWriteAccess below.
@@ -254,23 +254,23 @@ public:
         mrBitmap.ReleaseAccess( mpAccess );
     }
 
-    Access*         get() { return mpAccess; }
-    const Access*   get() const { return mpAccess; }
+    Access* 		get() { return mpAccess; }
+    const Access* 	get() const { return mpAccess; }
 
-    Access*         operator->() { return mpAccess; }
-    const Access*   operator->() const { return mpAccess; }
+    Access* 		operator->() { return mpAccess; }
+    const Access* 	operator->() const { return mpAccess; }
 
-    Access&         operator*() { return *mpAccess; }
-    const Access&   operator*() const { return *mpAccess; }
+    Access& 		operator*() { return *mpAccess; }
+    const Access& 	operator*() const { return *mpAccess; }
 
 private:
-    Access*     mpAccess;
-    Bitmap&     mrBitmap;
+    Access*		mpAccess;
+    Bitmap&		mrBitmap;
 };
 
 /** This wrapper handles BitmapReadAccess the RAII way.
 
-    Use as follows:
+    Use as follows: 
     Bitmap aBitmap
     ScopedBitmapReadAccess pReadAccess( aBitmap.AcquireReadAccess(), aBitmap );
     pReadAccess->SetPixel()...
@@ -284,7 +284,7 @@ typedef ScopedBitmapAccess< BitmapReadAccess > ScopedBitmapReadAccess;
 
 /** This wrapper handles BitmapWriteAccess the RAII way.
 
-    Use as follows:
+    Use as follows: 
     Bitmap aBitmap
     ScopedBitmapWriteAccess pWriteAccess( aBitmap.AcquireWriteAccess(), aBitmap );
     pWriteAccess->SetPixel()...
diff --git a/vcl/inc/vcl/bmpfast.hxx b/vcl/inc/vcl/bmpfast.hxx
index de330704b74f..bbf0402c55ac 100644
--- a/vcl/inc/vcl/bmpfast.hxx
+++ b/vcl/inc/vcl/bmpfast.hxx
@@ -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
diff --git a/vcl/inc/vcl/brdwin.hxx b/vcl/inc/vcl/brdwin.hxx
index bf76174150e2..1202f9a9c564 100644
--- a/vcl/inc/vcl/brdwin.hxx
+++ b/vcl/inc/vcl/brdwin.hxx
@@ -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
@@ -37,54 +37,55 @@ class ImplBorderWindowView;
 // - ImplBorderWindow-Types -
 // --------------------------
 
-#define BORDERWINDOW_STYLE_OVERLAP          ((USHORT)0x0001)
-#define BORDERWINDOW_STYLE_BORDER           ((USHORT)0x0002)
-#define BORDERWINDOW_STYLE_FLOAT            ((USHORT)0x0004)
-#define BORDERWINDOW_STYLE_FRAME            ((USHORT)0x0008)
-#define BORDERWINDOW_STYLE_APP              ((USHORT)0x0010)
-
-#define BORDERWINDOW_HITTEST_TITLE          ((USHORT)0x0001)
-#define BORDERWINDOW_HITTEST_LEFT           ((USHORT)0x0002)
-#define BORDERWINDOW_HITTEST_MENU           ((USHORT)0x0004)
-#define BORDERWINDOW_HITTEST_TOP            ((USHORT)0x0008)
-#define BORDERWINDOW_HITTEST_RIGHT          ((USHORT)0x0010)
-#define BORDERWINDOW_HITTEST_BOTTOM         ((USHORT)0x0020)
-#define BORDERWINDOW_HITTEST_TOPLEFT        ((USHORT)0x0040)
-#define BORDERWINDOW_HITTEST_TOPRIGHT       ((USHORT)0x0080)
-#define BORDERWINDOW_HITTEST_BOTTOMLEFT     ((USHORT)0x0100)
-#define BORDERWINDOW_HITTEST_BOTTOMRIGHT    ((USHORT)0x0200)
-#define BORDERWINDOW_HITTEST_CLOSE          ((USHORT)0x0400)
-#define BORDERWINDOW_HITTEST_ROLL           ((USHORT)0x0800)
-#define BORDERWINDOW_HITTEST_DOCK           ((USHORT)0x1000)
-#define BORDERWINDOW_HITTEST_HIDE           ((USHORT)0x2000)
-#define BORDERWINDOW_HITTEST_HELP           ((USHORT)0x4000)
-#define BORDERWINDOW_HITTEST_PIN            ((USHORT)0x8000)
-
-#define BORDERWINDOW_DRAW_TITLE             ((USHORT)0x0001)
-#define BORDERWINDOW_DRAW_BORDER            ((USHORT)0x0002)
-#define BORDERWINDOW_DRAW_FRAME             ((USHORT)0x0004)
-#define BORDERWINDOW_DRAW_CLOSE             ((USHORT)0x0008)
-#define BORDERWINDOW_DRAW_ROLL              ((USHORT)0x0010)
-#define BORDERWINDOW_DRAW_DOCK              ((USHORT)0x0020)
-#define BORDERWINDOW_DRAW_HIDE              ((USHORT)0x0040)
-#define BORDERWINDOW_DRAW_HELP              ((USHORT)0x0080)
-#define BORDERWINDOW_DRAW_PIN               ((USHORT)0x0100)
-#define BORDERWINDOW_DRAW_MENU              ((USHORT)0x0200)
-#define BORDERWINDOW_DRAW_ALL               (BORDERWINDOW_DRAW_TITLE |      \
-                                             BORDERWINDOW_DRAW_BORDER |     \
-                                             BORDERWINDOW_DRAW_FRAME |      \
-                                             BORDERWINDOW_DRAW_CLOSE |      \
-                                             BORDERWINDOW_DRAW_ROLL |       \
-                                             BORDERWINDOW_DRAW_DOCK |       \
-                                             BORDERWINDOW_DRAW_HIDE |       \
-                                             BORDERWINDOW_DRAW_HELP |       \
-                                             BORDERWINDOW_DRAW_PIN  |       \
+#define BORDERWINDOW_STYLE_OVERLAP			((USHORT)0x0001)
+#define BORDERWINDOW_STYLE_BORDER			((USHORT)0x0002)
+#define BORDERWINDOW_STYLE_FLOAT			((USHORT)0x0004)
+#define BORDERWINDOW_STYLE_FRAME			((USHORT)0x0008)
+#define BORDERWINDOW_STYLE_APP				((USHORT)0x0010)
+
+#define BORDERWINDOW_HITTEST_TITLE			((USHORT)0x0001)
+#define BORDERWINDOW_HITTEST_LEFT			((USHORT)0x0002)
+#define BORDERWINDOW_HITTEST_MENU			((USHORT)0x0004)
+#define BORDERWINDOW_HITTEST_TOP			((USHORT)0x0008)
+#define BORDERWINDOW_HITTEST_RIGHT			((USHORT)0x0010)
+#define BORDERWINDOW_HITTEST_BOTTOM 		((USHORT)0x0020)
+#define BORDERWINDOW_HITTEST_TOPLEFT		((USHORT)0x0040)
+#define BORDERWINDOW_HITTEST_TOPRIGHT		((USHORT)0x0080)
+#define BORDERWINDOW_HITTEST_BOTTOMLEFT 	((USHORT)0x0100)
+#define BORDERWINDOW_HITTEST_BOTTOMRIGHT	((USHORT)0x0200)
+#define BORDERWINDOW_HITTEST_CLOSE			((USHORT)0x0400)
+#define BORDERWINDOW_HITTEST_ROLL			((USHORT)0x0800)
+#define BORDERWINDOW_HITTEST_DOCK			((USHORT)0x1000)
+#define BORDERWINDOW_HITTEST_HIDE			((USHORT)0x2000)
+#define BORDERWINDOW_HITTEST_HELP			((USHORT)0x4000)
+#define BORDERWINDOW_HITTEST_PIN			((USHORT)0x8000)
+
+#define BORDERWINDOW_DRAW_TITLE 			((USHORT)0x0001)
+#define BORDERWINDOW_DRAW_BORDER			((USHORT)0x0002)
+#define BORDERWINDOW_DRAW_FRAME 			((USHORT)0x0004)
+#define BORDERWINDOW_DRAW_CLOSE 			((USHORT)0x0008)
+#define BORDERWINDOW_DRAW_ROLL				((USHORT)0x0010)
+#define BORDERWINDOW_DRAW_DOCK				((USHORT)0x0020)
+#define BORDERWINDOW_DRAW_HIDE				((USHORT)0x0040)
+#define BORDERWINDOW_DRAW_HELP				((USHORT)0x0080)
+#define BORDERWINDOW_DRAW_PIN				((USHORT)0x0100)
+#define BORDERWINDOW_DRAW_MENU				((USHORT)0x0200)
+#define BORDERWINDOW_DRAW_ALL				(BORDERWINDOW_DRAW_TITLE |		\
+                                             BORDERWINDOW_DRAW_BORDER | 	\
+                                             BORDERWINDOW_DRAW_FRAME |		\
+                                             BORDERWINDOW_DRAW_CLOSE |		\
+                                             BORDERWINDOW_DRAW_ROLL |		\
+                                             BORDERWINDOW_DRAW_DOCK |		\
+                                             BORDERWINDOW_DRAW_HIDE |		\
+                                             BORDERWINDOW_DRAW_HELP |		\
+                                             BORDERWINDOW_DRAW_PIN  |		\
                                              BORDERWINDOW_DRAW_MENU)
 
-#define BORDERWINDOW_TITLE_NORMAL           ((USHORT)0x0001)
-#define BORDERWINDOW_TITLE_SMALL            ((USHORT)0x0002)
-#define BORDERWINDOW_TITLE_TEAROFF          ((USHORT)0x0004)
-#define BORDERWINDOW_TITLE_NONE             ((USHORT)0x0008)
+#define BORDERWINDOW_TITLE_NORMAL			((USHORT)0x0001)
+#define BORDERWINDOW_TITLE_SMALL			((USHORT)0x0002)
+#define BORDERWINDOW_TITLE_TEAROFF			((USHORT)0x0004)
+#define BORDERWINDOW_TITLE_POPUP			((USHORT)0x0008)
+#define BORDERWINDOW_TITLE_NONE 			((USHORT)0x0010)
 
 // --------------------
 // - ImplBorderWindow -
@@ -98,34 +99,34 @@ class ImplBorderWindow : public Window
     friend class ImplStdBorderWindowView;
 
 private:
-    ImplBorderWindowView*   mpBorderView;
-    Window*                 mpMenuBarWindow;
-    long                    mnMinWidth;
-    long                    mnMinHeight;
-    long                    mnMaxWidth;
-    long                    mnMaxHeight;
-    long                    mnRollHeight;
-    long                    mnOrgMenuHeight;
-    USHORT                  mnTitleType;
-    USHORT                  mnBorderStyle;
-    BOOL                    mbFloatWindow;
-    BOOL                    mbSmallOutBorder;
-    BOOL                    mbFrameBorder;
-    BOOL                    mbPined;
-    BOOL                    mbRollUp;
-    BOOL                    mbMenuHide;
-    BOOL                    mbDockBtn;
-    BOOL                    mbHideBtn;
-    BOOL                    mbHelpBtn;
+    ImplBorderWindowView*	mpBorderView;
+    Window* 				mpMenuBarWindow;
+    long					mnMinWidth;
+    long					mnMinHeight;
+    long					mnMaxWidth;
+    long					mnMaxHeight;
+    long					mnRollHeight;
+    long					mnOrgMenuHeight;
+    USHORT					mnTitleType;
+    USHORT					mnBorderStyle;
+    BOOL					mbFloatWindow;
+    BOOL					mbSmallOutBorder;
+    BOOL					mbFrameBorder;
+    BOOL					mbPined;
+    BOOL					mbRollUp;
+    BOOL					mbMenuHide;
+    BOOL					mbDockBtn;
+    BOOL					mbHideBtn;
+    BOOL					mbHelpBtn;
     BOOL                    mbMenuBtn;
-    BOOL                    mbDisplayActive;
+    BOOL					mbDisplayActive;
 
     using Window::ImplInit;
-    void                    ImplInit( Window* pParent,
+    void					ImplInit( Window* pParent,
                                       WinBits nStyle, USHORT nTypeStyle,
                                       SystemParentData* pParentData );
-    void                    ImplInit( Window* pParent,
-                                      WinBits nStyle, USHORT nTypeStyle,
+    void					ImplInit( Window* pParent,
+                                      WinBits nStyle, USHORT nTypeStyle, 
                                       const ::com::sun::star::uno::Any& );
 
                             // Copy assignment is forbidden and not implemented.
@@ -140,53 +141,53 @@ public:
                             ImplBorderWindow( Window* pParent, WinBits nStyle = 0,
                                               USHORT nTypeStyle = 0 );
                             ImplBorderWindow( Window* pParent,
-                                              WinBits nStyle, USHORT nTypeStyle,
+                                              WinBits nStyle, USHORT nTypeStyle, 
                                               const ::com::sun::star::uno::Any& );
                             ~ImplBorderWindow();
 
-    virtual void            MouseMove( const MouseEvent& rMEvt );
-    virtual void            MouseButtonDown( const MouseEvent& rMEvt );
-    virtual void            Tracking( const TrackingEvent& rTEvt );
-    virtual void            Paint( const Rectangle& rRect );
-    virtual void            Activate();
-    virtual void            Deactivate();
-    virtual void            Resize();
-    virtual void            RequestHelp( const HelpEvent& rHEvt );
-    virtual void            StateChanged( StateChangedType nType );
-    virtual void            DataChanged( const DataChangedEvent& rDCEvt );
-
-    void                    InitView();
-    void                    UpdateView( BOOL bNewView, const Size& rNewOutSize );
-    void                    InvalidateBorder();
+    virtual void			MouseMove( const MouseEvent& rMEvt );
+    virtual void			MouseButtonDown( const MouseEvent& rMEvt );
+    virtual void			Tracking( const TrackingEvent& rTEvt );
+    virtual void			Paint( const Rectangle& rRect );
+    virtual void			Activate();
+    virtual void			Deactivate();
+    virtual void			Resize();
+    virtual void			RequestHelp( const HelpEvent& rHEvt );
+    virtual void			StateChanged( StateChangedType nType );
+    virtual void			DataChanged( const DataChangedEvent& rDCEvt );
+
+    void					InitView();
+    void					UpdateView( BOOL bNewView, const Size& rNewOutSize );
+    void					InvalidateBorder();
 
     using Window::Draw;
-    void                    Draw( const Rectangle& rRect, OutputDevice* pDev, const Point& rPos );
-
-    void                    SetDisplayActive( BOOL bActive );
-    BOOL                    IsDisplayActive() const { return mbDisplayActive; }
-    void                    SetTitleType( USHORT nTitleType, const Size& rSize );
-    void                    SetBorderStyle( USHORT nStyle );
-    USHORT                  GetBorderStyle() const { return mnBorderStyle; }
-    void                    SetPin( BOOL bPin );
-    void                    SetRollUp( BOOL bRollUp, const Size& rSize );
-    void                    SetCloser();
-    void                    SetDockButton( BOOL bDockButton );
-    void                    SetHideButton( BOOL bHideButton );
-    void                    SetHelpButton( BOOL bHelpButton );
-    void                    SetMenuButton( BOOL bMenuButton );
-
-    void                    UpdateMenuHeight();
-    void                    SetMenuBarWindow( Window* pWindow );
-    void                    SetMenuBarMode( BOOL bHide );
-
-    void                    SetMinOutputSize( long nWidth, long nHeight )
+    void					Draw( const Rectangle& rRect, OutputDevice* pDev, const Point& rPos );
+
+    void					SetDisplayActive( BOOL bActive );
+    BOOL					IsDisplayActive() const { return mbDisplayActive; }
+    void					SetTitleType( USHORT nTitleType, const Size& rSize );
+    void					SetBorderStyle( USHORT nStyle );
+    USHORT					GetBorderStyle() const { return mnBorderStyle; }
+    void					SetPin( BOOL bPin );
+    void					SetRollUp( BOOL bRollUp, const Size& rSize );
+    void					SetCloser();
+    void					SetDockButton( BOOL bDockButton );
+    void					SetHideButton( BOOL bHideButton );
+    void					SetHelpButton( BOOL bHelpButton );
+    void					SetMenuButton( BOOL bMenuButton );
+
+    void					UpdateMenuHeight();
+    void					SetMenuBarWindow( Window* pWindow );
+    void					SetMenuBarMode( BOOL bHide );
+
+    void					SetMinOutputSize( long nWidth, long nHeight )
                                 { mnMinWidth = nWidth; mnMinHeight = nHeight; }
-    void                    SetMaxOutputSize( long nWidth, long nHeight )
+    void					SetMaxOutputSize( long nWidth, long nHeight )
                                 { mnMaxWidth = nWidth; mnMaxHeight = nHeight; }
 
-    void                    GetBorder( sal_Int32& rLeftBorder, sal_Int32& rTopBorder,
+    void					GetBorder( sal_Int32& rLeftBorder, sal_Int32& rTopBorder,
                                        sal_Int32& rRightBorder, sal_Int32& rBottomBorder ) const;
-    long                    CalcTitleWidth() const;
+    long					CalcTitleWidth() const;
 
     Rectangle               GetMenuRect() const;
 };
@@ -199,42 +200,42 @@ public:
 
 struct ImplBorderFrameData
 {
-    ImplBorderWindow*       mpBorderWindow;
-    OutputDevice*           mpOutDev;
-    Rectangle               maTitleRect;
-    Rectangle               maPinRect;
-    Rectangle               maCloseRect;
-    Rectangle               maRollRect;
-    Rectangle               maDockRect;
-    Rectangle               maMenuRect;
-    Rectangle               maHideRect;
-    Rectangle               maHelpRect;
-    Point                   maMouseOff;
-    long                    mnWidth;
-    long                    mnHeight;
-    long                    mnTrackX;
-    long                    mnTrackY;
-    long                    mnTrackWidth;
-    long                    mnTrackHeight;
-    sal_Int32               mnLeftBorder;
-    sal_Int32               mnTopBorder;
-    sal_Int32               mnRightBorder;
-    sal_Int32               mnBottomBorder;
-    long                    mnNoTitleTop;
-    long                    mnBorderSize;
-    long                    mnTitleHeight;
-    long                    mnTitleOff;
-    USHORT                  mnHitTest;
-    USHORT                  mnPinState;
-    USHORT                  mnCloseState;
-    USHORT                  mnRollState;
-    USHORT                  mnDockState;
-    USHORT                  mnMenuState;
-    USHORT                  mnHideState;
-    USHORT                  mnHelpState;
-    USHORT                  mnTitleType;
-    BOOL                    mbFloatWindow;
-    BOOL                    mbDragFull;
+    ImplBorderWindow*		mpBorderWindow;
+    OutputDevice*			mpOutDev;
+    Rectangle				maTitleRect;
+    Rectangle				maPinRect;
+    Rectangle				maCloseRect;
+    Rectangle				maRollRect;
+    Rectangle				maDockRect;
+    Rectangle				maMenuRect;
+    Rectangle				maHideRect;
+    Rectangle				maHelpRect;
+    Point					maMouseOff;
+    long					mnWidth;
+    long					mnHeight;
+    long					mnTrackX;
+    long					mnTrackY;
+    long					mnTrackWidth;
+    long					mnTrackHeight;
+    sal_Int32				mnLeftBorder;
+    sal_Int32				mnTopBorder;
+    sal_Int32				mnRightBorder;
+    sal_Int32				mnBottomBorder;
+    long					mnNoTitleTop;
+    long					mnBorderSize;
+    long					mnTitleHeight;
+    long					mnTitleOff;
+    USHORT					mnHitTest;
+    USHORT					mnPinState;
+    USHORT					mnCloseState;
+    USHORT					mnRollState;
+    USHORT					mnDockState;
+    USHORT					mnMenuState;
+    USHORT					mnHideState;
+    USHORT					mnHelpState;
+    USHORT					mnTitleType;
+    BOOL					mbFloatWindow;
+    BOOL					mbDragFull;
     BOOL                    mbTitleClipped;
 };
 
@@ -247,27 +248,27 @@ struct ImplBorderFrameData
 class ImplBorderWindowView
 {
 public:
-    virtual                 ~ImplBorderWindowView();
+    virtual 				~ImplBorderWindowView();
 
-    virtual BOOL            MouseMove( const MouseEvent& rMEvt );
-    virtual BOOL            MouseButtonDown( const MouseEvent& rMEvt );
-    virtual BOOL            Tracking( const TrackingEvent& rTEvt );
-    virtual String          RequestHelp( const Point& rPos, Rectangle& rHelpRect );
+    virtual BOOL			MouseMove( const MouseEvent& rMEvt );
+    virtual BOOL			MouseButtonDown( const MouseEvent& rMEvt );
+    virtual BOOL			Tracking( const TrackingEvent& rTEvt );
+    virtual String  		RequestHelp( const Point& rPos, Rectangle& rHelpRect );
 
-    virtual void            Init( OutputDevice* pDev, long nWidth, long nHeight ) = 0;
-    virtual void            GetBorder( sal_Int32& rLeftBorder, sal_Int32& rTopBorder,
+    virtual void			Init( OutputDevice* pDev, long nWidth, long nHeight ) = 0;
+    virtual void			GetBorder( sal_Int32& rLeftBorder, sal_Int32& rTopBorder,
                                        sal_Int32& rRightBorder, sal_Int32& rBottomBorder ) const = 0;
-    virtual long            CalcTitleWidth() const = 0;
-    virtual void            DrawWindow( USHORT nDrawFlags, OutputDevice* pOutDev = NULL, const Point* pOffset = NULL ) = 0;
+    virtual long			CalcTitleWidth() const = 0;
+    virtual void			DrawWindow( USHORT nDrawFlags, OutputDevice* pOutDev = NULL, const Point* pOffset = NULL ) = 0;
     virtual Rectangle       GetMenuRect() const;
 
-    void                    ImplInitTitle( ImplBorderFrameData* pData );
-    USHORT                  ImplHitTest( ImplBorderFrameData* pData, const Point& rPos );
-    BOOL                    ImplMouseMove( ImplBorderFrameData* pData, const MouseEvent& rMEvt );
-    BOOL                    ImplMouseButtonDown( ImplBorderFrameData* pData, const MouseEvent& rMEvt );
-    BOOL                    ImplTracking( ImplBorderFrameData* pData, const TrackingEvent& rTEvt );
-    String                  ImplRequestHelp( ImplBorderFrameData* pData, const Point& rPos, Rectangle& rHelpRect );
-    long                    ImplCalcTitleWidth( const ImplBorderFrameData* pData ) const;
+    void					ImplInitTitle( ImplBorderFrameData* pData );
+    USHORT					ImplHitTest( ImplBorderFrameData* pData, const Point& rPos );
+    BOOL					ImplMouseMove( ImplBorderFrameData* pData, const MouseEvent& rMEvt );
+    BOOL					ImplMouseButtonDown( ImplBorderFrameData* pData, const MouseEvent& rMEvt );
+    BOOL					ImplTracking( ImplBorderFrameData* pData, const TrackingEvent& rTEvt );
+    String					ImplRequestHelp( ImplBorderFrameData* pData, const Point& rPos, Rectangle& rHelpRect );
+    long					ImplCalcTitleWidth( const ImplBorderFrameData* pData ) const;
 };
 
 // =======================================================================
@@ -281,11 +282,11 @@ class ImplNoBorderWindowView : public ImplBorderWindowView
 public:
                             ImplNoBorderWindowView( ImplBorderWindow* pBorderWindow );
 
-    virtual void            Init( OutputDevice* pDev, long nWidth, long nHeight );
-    virtual void            GetBorder( sal_Int32& rLeftBorder, sal_Int32& rTopBorder,
+    virtual void			Init( OutputDevice* pDev, long nWidth, long nHeight );
+    virtual void			GetBorder( sal_Int32& rLeftBorder, sal_Int32& rTopBorder,
                                        sal_Int32& rRightBorder, sal_Int32& rBottomBorder ) const;
-    virtual long            CalcTitleWidth() const;
-    virtual void            DrawWindow( USHORT nDrawFlags, OutputDevice* pOutDev, const Point* pOffset );
+    virtual long			CalcTitleWidth() const;
+    virtual void			DrawWindow( USHORT nDrawFlags, OutputDevice* pOutDev, const Point* pOffset );
 };
 
 
@@ -297,24 +298,24 @@ public:
 
 class ImplSmallBorderWindowView : public ImplBorderWindowView
 {
-    ImplBorderWindow*       mpBorderWindow;
-    OutputDevice*           mpOutDev;
-    long                    mnWidth;
-    long                    mnHeight;
-    sal_Int32               mnLeftBorder;
-    sal_Int32               mnTopBorder;
-    sal_Int32               mnRightBorder;
-    sal_Int32               mnBottomBorder;
+    ImplBorderWindow*		mpBorderWindow;
+    OutputDevice*			mpOutDev;
+    long					mnWidth;
+    long					mnHeight;
+    sal_Int32				mnLeftBorder;
+    sal_Int32				mnTopBorder;
+    sal_Int32				mnRightBorder;
+    sal_Int32				mnBottomBorder;
     bool                    mbNWFBorder;
 
 public:
                             ImplSmallBorderWindowView( ImplBorderWindow* pBorderWindow );
 
-    virtual void            Init( OutputDevice* pOutDev, long nWidth, long nHeight );
-    virtual void            GetBorder( sal_Int32& rLeftBorder, sal_Int32& rTopBorder,
+    virtual void			Init( OutputDevice* pOutDev, long nWidth, long nHeight );
+    virtual void			GetBorder( sal_Int32& rLeftBorder, sal_Int32& rTopBorder,
                                        sal_Int32& rRightBorder, sal_Int32& rBottomBorder ) const;
-    virtual long            CalcTitleWidth() const;
-    virtual void            DrawWindow( USHORT nDrawFlags, OutputDevice* pOutDev, const Point* pOffset );
+    virtual long			CalcTitleWidth() const;
+    virtual void			DrawWindow( USHORT nDrawFlags, OutputDevice* pOutDev, const Point* pOffset );
 };
 
 
@@ -327,26 +328,26 @@ public:
 
 class ImplStdBorderWindowView : public ImplBorderWindowView
 {
-    ImplBorderFrameData     maFrameData;
-    VirtualDevice*          mpATitleVirDev;
-    VirtualDevice*          mpDTitleVirDev;
+    ImplBorderFrameData 	maFrameData;
+    VirtualDevice*			mpATitleVirDev;
+    VirtualDevice*			mpDTitleVirDev;
 
 public:
                             ImplStdBorderWindowView( ImplBorderWindow* pBorderWindow );
                             ~ImplStdBorderWindowView();
 
-    virtual BOOL            MouseMove( const MouseEvent& rMEvt );
-    virtual BOOL            MouseButtonDown( const MouseEvent& rMEvt );
-    virtual BOOL            Tracking( const TrackingEvent& rTEvt );
-    virtual String          RequestHelp( const Point& rPos, Rectangle& rHelpRect );
+    virtual BOOL			MouseMove( const MouseEvent& rMEvt );
+    virtual BOOL			MouseButtonDown( const MouseEvent& rMEvt );
+    virtual BOOL			Tracking( const TrackingEvent& rTEvt );
+    virtual String  		RequestHelp( const Point& rPos, Rectangle& rHelpRect );
     virtual Rectangle       GetMenuRect() const;
 
-    virtual void            Init( OutputDevice* pDev, long nWidth, long nHeight );
-    virtual void            GetBorder( sal_Int32& rLeftBorder, sal_Int32& rTopBorder,
+    virtual void			Init( OutputDevice* pDev, long nWidth, long nHeight );
+    virtual void			GetBorder( sal_Int32& rLeftBorder, sal_Int32& rTopBorder,
                                        sal_Int32& rRightBorder, sal_Int32& rBottomBorder ) const;
-    virtual long            CalcTitleWidth() const;
-    virtual void            DrawWindow( USHORT nDrawFlags, OutputDevice* pOutDev, const Point* pOffset );
+    virtual long			CalcTitleWidth() const;
+    virtual void			DrawWindow( USHORT nDrawFlags, OutputDevice* pOutDev, const Point* pOffset );
 };
 
 
-#endif  // _SV_BRDWIN_HXX
+#endif	// _SV_BRDWIN_HXX
diff --git a/vcl/inc/vcl/btndlg.hxx b/vcl/inc/vcl/btndlg.hxx
index dbeb8350a0d4..842efe467993 100644
--- a/vcl/inc/vcl/btndlg.hxx
+++ b/vcl/inc/vcl/btndlg.hxx
@@ -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
@@ -40,13 +40,13 @@ class PushButton;
 // - ButtonDialog-Types -
 // ----------------------
 
-#define BUTTONDIALOG_BUTTON_NOTFOUND            ((USHORT)0xFFFF)
+#define BUTTONDIALOG_BUTTON_NOTFOUND			((USHORT)0xFFFF)
 
-#define BUTTONDIALOG_DEFBUTTON                  ((USHORT)0x0001)
-#define BUTTONDIALOG_OKBUTTON                   ((USHORT)0x0002)
-#define BUTTONDIALOG_CANCELBUTTON               ((USHORT)0x0004)
-#define BUTTONDIALOG_HELPBUTTON                 ((USHORT)0x0008)
-#define BUTTONDIALOG_FOCUSBUTTON                ((USHORT)0x0010)
+#define BUTTONDIALOG_DEFBUTTON					((USHORT)0x0001)
+#define BUTTONDIALOG_OKBUTTON					((USHORT)0x0002)
+#define BUTTONDIALOG_CANCELBUTTON				((USHORT)0x0004)
+#define BUTTONDIALOG_HELPBUTTON 				((USHORT)0x0008)
+#define BUTTONDIALOG_FOCUSBUTTON				((USHORT)0x0010)
 
 // ----------------
 // - ButtonDialog -
@@ -56,19 +56,19 @@ class VCL_DLLPUBLIC ButtonDialog : public Dialog
 {
 private:
     ImplBtnDlgItemList* mpItemList;
-    Size                maPageSize;
-    Size                maCtrlSize;
-    long                mnButtonSize;
-    USHORT              mnCurButtonId;
-    USHORT              mnFocusButtonId;
-    BOOL                mbFormat;
-    Link                maClickHdl;
-
-    SAL_DLLPRIVATE void             ImplInitButtonDialogData();
-    SAL_DLLPRIVATE PushButton*      ImplCreatePushButton( USHORT nBtnFlags );
-    SAL_DLLPRIVATE ImplBtnDlgItem*  ImplGetItem( USHORT nId ) const;
+    Size				maPageSize;
+    Size				maCtrlSize;
+    long				mnButtonSize;
+    USHORT				mnCurButtonId;
+    USHORT				mnFocusButtonId;
+    BOOL				mbFormat;
+    Link				maClickHdl;
+
+    SAL_DLLPRIVATE void				ImplInitButtonDialogData();
+    SAL_DLLPRIVATE PushButton* 		ImplCreatePushButton( USHORT nBtnFlags );
+    SAL_DLLPRIVATE ImplBtnDlgItem* 	ImplGetItem( USHORT nId ) const;
     DECL_DLLPRIVATE_LINK(           ImplClickHdl, PushButton* pBtn );
-    SAL_DLLPRIVATE void             ImplPosControls();
+    SAL_DLLPRIVATE void				ImplPosControls();
 
     // Copy assignment is forbidden and not implemented.
     SAL_DLLPRIVATE      ButtonDialog( const ButtonDialog & );
@@ -82,36 +82,36 @@ public:
                         ButtonDialog( Window* pParent, const ResId& rResId );
                         ~ButtonDialog();
 
-    virtual void        Resize();
-    virtual void        StateChanged( StateChangedType nStateChange );
+    virtual void		Resize();
+    virtual void		StateChanged( StateChangedType nStateChange );
 
-    virtual void        Click();
+    virtual void		Click();
 
-    void                SetPageSizePixel( const Size& rSize ) { maPageSize = rSize; }
-    const Size&         GetPageSizePixel() const { return maPageSize; }
+    void				SetPageSizePixel( const Size& rSize ) { maPageSize = rSize; }
+    const Size& 		GetPageSizePixel() const { return maPageSize; }
 
-    USHORT              GetCurButtonId() const { return mnCurButtonId; }
+    USHORT				GetCurButtonId() const { return mnCurButtonId; }
 
-    void                AddButton( const XubString& rText, USHORT nId, USHORT nBtnFlags, long nSepPixel = 0 );
-    void                AddButton( StandardButtonType eType, USHORT nId, USHORT nBtnFlags, long nSepPixel = 0 );
-    void                AddButton( PushButton* pBtn, USHORT nId, USHORT nBtnFlags, long nSepPixel = 0 );
-    void                RemoveButton( USHORT nId );
-    void                Clear();
-    USHORT              GetButtonCount() const;
-    USHORT              GetButtonId( USHORT nButton ) const;
-    PushButton*         GetPushButton( USHORT nId ) const;
-    void                SetButtonText( USHORT nId, const XubString& rText );
-    XubString           GetButtonText( USHORT nId ) const;
-    void                SetButtonHelpText( USHORT nId, const XubString& rText );
-    XubString           GetButtonHelpText( USHORT nId ) const;
-    void                SetButtonHelpId( USHORT nId, ULONG nHelpId );
-    ULONG               GetButtonHelpId( USHORT nId ) const;
+    void				AddButton( const XubString& rText, USHORT nId, USHORT nBtnFlags, long nSepPixel = 0 );
+    void				AddButton( StandardButtonType eType, USHORT nId, USHORT nBtnFlags, long nSepPixel = 0 );
+    void				AddButton( PushButton* pBtn, USHORT nId, USHORT nBtnFlags, long nSepPixel = 0 );
+    void				RemoveButton( USHORT nId );
+    void				Clear();
+    USHORT				GetButtonCount() const;
+    USHORT				GetButtonId( USHORT nButton ) const;
+    PushButton* 		GetPushButton( USHORT nId ) const;
+    void				SetButtonText( USHORT nId, const XubString& rText );
+    XubString			GetButtonText( USHORT nId ) const;
+    void				SetButtonHelpText( USHORT nId, const XubString& rText );
+    XubString			GetButtonHelpText( USHORT nId ) const;
+    void				SetButtonHelpId( USHORT nId, ULONG nHelpId );
+    ULONG				GetButtonHelpId( USHORT nId ) const;
 
-    void                SetFocusButton( USHORT nId = BUTTONDIALOG_BUTTON_NOTFOUND ) { mnFocusButtonId = nId; }
-    USHORT              GetFocusButton() const { return mnFocusButtonId; }
+    void				SetFocusButton( USHORT nId = BUTTONDIALOG_BUTTON_NOTFOUND ) { mnFocusButtonId = nId; }
+    USHORT				GetFocusButton() const { return mnFocusButtonId; }
 
-    void                SetClickHdl( const Link& rLink ) { maClickHdl = rLink; }
-    const Link&         GetClickHdl() const { return maClickHdl; }
+    void				SetClickHdl( const Link& rLink ) { maClickHdl = rLink; }
+    const Link& 		GetClickHdl() const { return maClickHdl; }
 };
 
-#endif  // _SV_BTNDLG_HXX
+#endif	// _SV_BTNDLG_HXX
diff --git a/vcl/inc/vcl/button.hxx b/vcl/inc/vcl/button.hxx
index fa185c32dcda..f12760d5c107 100644
--- a/vcl/inc/vcl/button.hxx
+++ b/vcl/inc/vcl/button.hxx
@@ -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
@@ -78,7 +78,7 @@ public:
                        ~Button();
 
     virtual void        Click();
-    virtual void        DataChanged( const DataChangedEvent& rDCEvt );
+    virtual void		DataChanged( const DataChangedEvent& rDCEvt );
 
     void                SetClickHdl( const Link& rLink ) { maClickHdl = rLink; }
     const Link&         GetClickHdl() const { return maClickHdl; }
@@ -339,14 +339,14 @@ protected:
     virtual const Color&
                     GetCanonicalTextColor( const StyleSettings& _rStyle ) const;
 
-    inline void             SetMouseRect( const Rectangle& _rMouseRect )    { maMouseRect = _rMouseRect; }
-    inline const Rectangle& GetMouseRect( ) const                           { return maMouseRect; }
-    inline void             SetStateRect( const Rectangle& _rStateRect )    { maStateRect = _rStateRect; }
-    inline const Rectangle& GetStateRect( ) const                           { return maStateRect; }
+    inline void				SetMouseRect( const Rectangle& _rMouseRect )	{ maMouseRect = _rMouseRect; }
+    inline const Rectangle&	GetMouseRect( ) const							{ return maMouseRect; }
+    inline void				SetStateRect( const Rectangle& _rStateRect )	{ maStateRect = _rStateRect; }
+    inline const Rectangle&	GetStateRect( ) const							{ return maStateRect; }
 
     // draws the radio button (the knob image), in it's current state (pressed/checked)
     // at the usual location, which can be overridden with SetStateRect
-    void            DrawRadioButtonState( );
+    void			DrawRadioButtonState( );
 
 public:
                     RadioButton( Window* pParent, WinBits nWinStyle = 0 );
@@ -390,17 +390,17 @@ public:
 
     void            SetToggleHdl( const Link& rLink ) { maToggleHdl = rLink; }
     const Link&     GetToggleHdl() const { return maToggleHdl; }
-
+    
     /** GetRadioButtonGroup returns a list of pointers to <code>RadioButton</code>s in the same group.
-
+    
     The pointers in the returned list are valid at the time call returns. However rescheduling
     or giving up the SolarMutex may mean events get executed that lead to the pointers getting
     invalid.
-
+    
     @param io_rGroup
     gets cleared on entering the function. on return contains the <code>RadioButton</code>s
     in the same group as this <code>RadioButton</code>.
-
+    
     @param bIncludeThis
     defines whether <code>this</code> is contained in the returned list
     */
@@ -450,9 +450,9 @@ protected:
 
     SAL_DLLPRIVATE virtual void ImplDrawCheckBoxState();
     SAL_DLLPRIVATE const Rectangle& GetStateRect() const { return maStateRect; }
-    SAL_DLLPRIVATE const Rectangle& GetMouseRect() const { return maMouseRect; }
+    SAL_DLLPRIVATE const Rectangle&	GetMouseRect() const { return maMouseRect; }
 public:
-    SAL_DLLPRIVATE void         ImplCheck();
+    SAL_DLLPRIVATE void         ImplCheck();    
     SAL_DLLPRIVATE void         ImplSetMinimumNWFSize();
 public:
                     CheckBox( Window* pParent, WinBits nStyle = 0 );
diff --git a/vcl/inc/vcl/canvasbitmap.hxx b/vcl/inc/vcl/canvasbitmap.hxx
index 85c0aa795c8c..88b28455be32 100644
--- a/vcl/inc/vcl/canvasbitmap.hxx
+++ b/vcl/inc/vcl/canvasbitmap.hxx
@@ -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
@@ -41,7 +41,7 @@ namespace vcl
 {
 namespace unotools
 {
-    class VCL_DLLPUBLIC VclCanvasBitmap :
+    class VCL_DLLPUBLIC VclCanvasBitmap : 
         public cppu::WeakImplHelper3< com::sun::star::rendering::XIntegerReadOnlyBitmap,
                                       com::sun::star::rendering::XBitmapPalette,
                                       com::sun::star::rendering::XIntegerBitmapColorSpace >
@@ -119,7 +119,7 @@ namespace unotools
             are not reflected in this object (copy on write).
          */
         explicit VclCanvasBitmap( const BitmapEx& rBitmap );
-
+        
         /// Retrieve contained bitmap. Call me with locked Solar mutex!
         BitmapEx getBitmapEx() const;
    };
diff --git a/vcl/inc/vcl/canvastools.hxx b/vcl/inc/vcl/canvastools.hxx
index c6f1710cdae5..71dd0fd1a04e 100644
--- a/vcl/inc/vcl/canvastools.hxx
+++ b/vcl/inc/vcl/canvastools.hxx
@@ -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,7 +56,7 @@ namespace basegfx
     class B2DPolyPolygon;
 }
 
-namespace com { namespace sun { namespace star { namespace geometry
+namespace com { namespace sun { namespace star { namespace geometry 
 {
     struct RealPoint2D;
     struct RealSize2D;
@@ -67,7 +67,7 @@ namespace com { namespace sun { namespace star { namespace geometry
     struct RealBezierSegment2D;
 } } } }
 
-namespace com { namespace sun { namespace star { namespace rendering
+namespace com { namespace sun { namespace star { namespace rendering 
 {
     class  XGraphicDevice;
     class  XBitmap;
@@ -85,40 +85,40 @@ namespace vcl
 
         /** Create an XPolyPolygon from VCL/Tools polygon
          */
-        ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XPolyPolygon2D >
-            VCL_DLLPUBLIC xPolyPolygonFromPolygon( const ::com::sun::star::uno::Reference<
-                                                         ::com::sun::star::rendering::XGraphicDevice >&     xGraphicDevice,
-                                                   const ::Polygon&                                         inputPolygon );
+        ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XPolyPolygon2D > 
+            VCL_DLLPUBLIC xPolyPolygonFromPolygon( const ::com::sun::star::uno::Reference< 
+                                                         ::com::sun::star::rendering::XGraphicDevice >& 	xGraphicDevice,
+                                                   const ::Polygon&											inputPolygon );
 
         /** Create an XPolyPolygon from VCL/Tools polyPolygon
          */
-        ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XPolyPolygon2D >
-            VCL_DLLPUBLIC xPolyPolygonFromPolyPolygon( const ::com::sun::star::uno::Reference<
-                                                             ::com::sun::star::rendering::XGraphicDevice >&     xGraphicDevice,
-                                                       const ::PolyPolygon&                                     inputPolyPolygon );
+        ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XPolyPolygon2D > 
+            VCL_DLLPUBLIC xPolyPolygonFromPolyPolygon( const ::com::sun::star::uno::Reference< 
+                                                             ::com::sun::star::rendering::XGraphicDevice >& 	xGraphicDevice,
+                                                       const ::PolyPolygon&										inputPolyPolygon );
 
         /** Create an VCL/Tools polygon from a point sequence
          */
-        ::Polygon VCL_DLLPUBLIC polygonFromPoint2DSequence(
-            const ::com::sun::star::uno::Sequence<
+        ::Polygon VCL_DLLPUBLIC polygonFromPoint2DSequence( 
+            const ::com::sun::star::uno::Sequence< 
                 ::com::sun::star::geometry::RealPoint2D >& rPoints );
 
         /** Create an VCL/Tools polyPolygon from a point sequence sequence
          */
-        ::PolyPolygon VCL_DLLPUBLIC polyPolygonFromPoint2DSequenceSequence(
-            const ::com::sun::star::uno::Sequence<
+        ::PolyPolygon VCL_DLLPUBLIC polyPolygonFromPoint2DSequenceSequence( 
+            const ::com::sun::star::uno::Sequence< 
                 ::com::sun::star::uno::Sequence< ::com::sun::star::geometry::RealPoint2D > >& rPoints );
 
         /** Create an VCL/Tools polygon from a bezier segment sequence
          */
-        ::Polygon VCL_DLLPUBLIC polygonFromBezier2DSequence(
-            const ::com::sun::star::uno::Sequence<
+        ::Polygon VCL_DLLPUBLIC polygonFromBezier2DSequence( 
+            const ::com::sun::star::uno::Sequence< 
                 ::com::sun::star::geometry::RealBezierSegment2D >& rPoints );
 
         /** Create an VCL/Tools polyPolygon from a bezier segment sequence sequence
          */
-        ::PolyPolygon VCL_DLLPUBLIC polyPolygonFromBezier2DSequenceSequence(
-            const ::com::sun::star::uno::Sequence<
+        ::PolyPolygon VCL_DLLPUBLIC polyPolygonFromBezier2DSequenceSequence( 
+            const ::com::sun::star::uno::Sequence< 
                 ::com::sun::star::uno::Sequence< ::com::sun::star::geometry::RealBezierSegment2D > >& rPoints );
 
         // Bitmap conversions
@@ -126,21 +126,21 @@ namespace vcl
 
         /** Create an XBitmap from VCL Bitmap
          */
-        ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XBitmap >
-            VCL_DLLPUBLIC xBitmapFromBitmap( const ::com::sun::star::uno::Reference<
-                                                   ::com::sun::star::rendering::XGraphicDevice >&   xGraphicDevice,
-                                             const ::Bitmap&                                        inputBitmap );
+        ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XBitmap > 
+            VCL_DLLPUBLIC xBitmapFromBitmap( const ::com::sun::star::uno::Reference< 
+                                                   ::com::sun::star::rendering::XGraphicDevice >& 	xGraphicDevice,
+                                             const ::Bitmap&										inputBitmap );
 
         /** Create an XBitmap from VCL BitmapEx
          */
-        ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XBitmap >
-            VCL_DLLPUBLIC xBitmapFromBitmapEx( const ::com::sun::star::uno::Reference<
-                                                     ::com::sun::star::rendering::XGraphicDevice >&     xGraphicDevice,
-                                               const ::BitmapEx&                                        inputBitmap );
+        ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XBitmap > 
+            VCL_DLLPUBLIC xBitmapFromBitmapEx( const ::com::sun::star::uno::Reference< 
+                                                     ::com::sun::star::rendering::XGraphicDevice >& 	xGraphicDevice,
+                                               const ::BitmapEx&										inputBitmap );
 
         /** Create a BitmapEx from an XBitmap
          */
-        ::BitmapEx VCL_DLLPUBLIC bitmapExFromXBitmap( const ::com::sun::star::uno::Reference<
+        ::BitmapEx VCL_DLLPUBLIC bitmapExFromXBitmap( const ::com::sun::star::uno::Reference< 
                                                             ::com::sun::star::rendering::XIntegerReadOnlyBitmap >& xInputBitmap );
 
         /** get a unique identifier for identification in XUnoTunnel interface
@@ -156,7 +156,7 @@ namespace vcl
             Note that this method assumes a color space equivalent to
             the one returned from createStandardColorSpace()
          */
-        ::com::sun::star::uno::Sequence< double >
+        ::com::sun::star::uno::Sequence< double > 
             VCL_DLLPUBLIC colorToStdColorSpaceSequence( const Color& rColor );
 
         /** Convert color to device color sequence
@@ -167,9 +167,9 @@ namespace vcl
             @param xColorSpace
             Color space to convert into
          */
-        ::com::sun::star::uno::Sequence< double >
+        ::com::sun::star::uno::Sequence< double > 
         VCL_DLLPUBLIC colorToDoubleSequence( const Color&                                      rColor,
-                                             const ::com::sun::star::uno::Reference<
+                                             const ::com::sun::star::uno::Reference< 
                                                    ::com::sun::star::rendering::XColorSpace >& xColorSpace );
 
         /** Convert from standard device color space to VCL/Tools color
@@ -177,7 +177,7 @@ namespace vcl
             Note that this method assumes a color space equivalent to
             the one returned from createStandardColorSpace()
          */
-        Color VCL_DLLPUBLIC stdColorSpaceSequenceToColor(
+        Color VCL_DLLPUBLIC stdColorSpaceSequenceToColor( 
             const ::com::sun::star::uno::Sequence< double >& rColor );
 
         /** Convert color to device color sequence
@@ -189,7 +189,7 @@ namespace vcl
             Color space to convert from
          */
         Color VCL_DLLPUBLIC doubleSequenceToColor( const ::com::sun::star::uno::Sequence< double >   rColor,
-                                                   const ::com::sun::star::uno::Reference<
+                                                   const ::com::sun::star::uno::Reference< 
                                                          ::com::sun::star::rendering::XColorSpace >& xColorSpace );
 
         /// Convert [0,1] double value to [0,255] int
@@ -212,41 +212,41 @@ namespace vcl
         // Geometry conversions (vcl/tools <-> x)
         // ===================================================================
 
-        // geometry::Real
-        ::com::sun::star::geometry::RealSize2D          VCL_DLLPUBLIC size2DFromSize( const Size& );
-        ::com::sun::star::geometry::RealPoint2D         VCL_DLLPUBLIC point2DFromPoint( const Point& );
-        ::com::sun::star::geometry::RealRectangle2D     VCL_DLLPUBLIC rectangle2DFromRectangle( const Rectangle& );
+        // geometry::Real        
+        ::com::sun::star::geometry::RealSize2D  		VCL_DLLPUBLIC size2DFromSize( const Size& );
+        ::com::sun::star::geometry::RealPoint2D 		VCL_DLLPUBLIC point2DFromPoint( const Point& );
+        ::com::sun::star::geometry::RealRectangle2D 	VCL_DLLPUBLIC rectangle2DFromRectangle( const Rectangle& );
 
-        Size                                            VCL_DLLPUBLIC sizeFromRealSize2D( const ::com::sun::star::geometry::RealSize2D& );
-        Point                                           VCL_DLLPUBLIC pointFromRealPoint2D( const ::com::sun::star::geometry::RealPoint2D& );
-        Rectangle                                       VCL_DLLPUBLIC rectangleFromRealRectangle2D( const ::com::sun::star::geometry::RealRectangle2D& );
+        Size  											VCL_DLLPUBLIC sizeFromRealSize2D( const ::com::sun::star::geometry::RealSize2D& );
+        Point 											VCL_DLLPUBLIC pointFromRealPoint2D( const ::com::sun::star::geometry::RealPoint2D& );
+        Rectangle 										VCL_DLLPUBLIC rectangleFromRealRectangle2D( const ::com::sun::star::geometry::RealRectangle2D& );
 
-        // geometry::Integer
-        ::com::sun::star::geometry::IntegerSize2D       VCL_DLLPUBLIC integerSize2DFromSize( const Size& );
-        ::com::sun::star::geometry::IntegerPoint2D      VCL_DLLPUBLIC integerPoint2DFromPoint( const Point& );
-        ::com::sun::star::geometry::IntegerRectangle2D  VCL_DLLPUBLIC integerRectangle2DFromRectangle( const Rectangle& );
+        // geometry::Integer        
+        ::com::sun::star::geometry::IntegerSize2D  		VCL_DLLPUBLIC integerSize2DFromSize( const Size& );
+        ::com::sun::star::geometry::IntegerPoint2D 		VCL_DLLPUBLIC integerPoint2DFromPoint( const Point& );
+        ::com::sun::star::geometry::IntegerRectangle2D 	VCL_DLLPUBLIC integerRectangle2DFromRectangle( const Rectangle& );
 
-        Size                                            VCL_DLLPUBLIC sizeFromIntegerSize2D( const ::com::sun::star::geometry::IntegerSize2D& );
-        Point                                           VCL_DLLPUBLIC pointFromIntegerPoint2D( const ::com::sun::star::geometry::IntegerPoint2D& );
-        Rectangle                                       VCL_DLLPUBLIC rectangleFromIntegerRectangle2D( const ::com::sun::star::geometry::IntegerRectangle2D& );
+        Size  											VCL_DLLPUBLIC sizeFromIntegerSize2D( const ::com::sun::star::geometry::IntegerSize2D& );
+        Point 											VCL_DLLPUBLIC pointFromIntegerPoint2D( const ::com::sun::star::geometry::IntegerPoint2D& );
+        Rectangle 										VCL_DLLPUBLIC rectangleFromIntegerRectangle2D( const ::com::sun::star::geometry::IntegerRectangle2D& );
 
-        // basegfx::B2D
-        Size                        VCL_DLLPUBLIC sizeFromB2DSize( const ::basegfx::B2DVector& );
-        Point                       VCL_DLLPUBLIC pointFromB2DPoint( const ::basegfx::B2DPoint& );
-        Rectangle                   VCL_DLLPUBLIC rectangleFromB2DRectangle( const ::basegfx::B2DRange& );
+        // basegfx::B2D        
+        Size  						VCL_DLLPUBLIC sizeFromB2DSize( const ::basegfx::B2DVector& );
+        Point 						VCL_DLLPUBLIC pointFromB2DPoint( const ::basegfx::B2DPoint& );
+        Rectangle 					VCL_DLLPUBLIC rectangleFromB2DRectangle( const ::basegfx::B2DRange& );
 
-        basegfx::B2DVector          VCL_DLLPUBLIC b2DSizeFromSize( const Size& );
-        basegfx::B2DPoint           VCL_DLLPUBLIC b2DPointFromPoint( const Point& );
-        basegfx::B2DRange           VCL_DLLPUBLIC b2DRectangleFromRectangle( const Rectangle& );
+        basegfx::B2DVector  		VCL_DLLPUBLIC b2DSizeFromSize( const Size& );
+        basegfx::B2DPoint			VCL_DLLPUBLIC b2DPointFromPoint( const Point& );
+        basegfx::B2DRange			VCL_DLLPUBLIC b2DRectangleFromRectangle( const Rectangle& );
 
         // basegfx::B2I
-        Size                        VCL_DLLPUBLIC sizeFromB2ISize( const ::basegfx::B2IVector& );
-        Point                       VCL_DLLPUBLIC pointFromB2IPoint( const ::basegfx::B2IPoint& );
-        Rectangle                   VCL_DLLPUBLIC rectangleFromB2IRectangle( const ::basegfx::B2IRange& );
+        Size  						VCL_DLLPUBLIC sizeFromB2ISize( const ::basegfx::B2IVector& );
+        Point 						VCL_DLLPUBLIC pointFromB2IPoint( const ::basegfx::B2IPoint& );
+        Rectangle 					VCL_DLLPUBLIC rectangleFromB2IRectangle( const ::basegfx::B2IRange& );
 
-        basegfx::B2IVector          VCL_DLLPUBLIC b2ISizeFromSize( const Size& );
-        basegfx::B2IPoint           VCL_DLLPUBLIC b2IPointFromPoint( const Point& );
-        basegfx::B2IRange           VCL_DLLPUBLIC b2IRectangleFromRectangle( const Rectangle& );
+        basegfx::B2IVector  		VCL_DLLPUBLIC b2ISizeFromSize( const Size& );
+        basegfx::B2IPoint			VCL_DLLPUBLIC b2IPointFromPoint( const Point& );
+        basegfx::B2IRange			VCL_DLLPUBLIC b2IRectangleFromRectangle( const Rectangle& );
     }
 }
 
diff --git a/vcl/inc/vcl/cmdevt.h b/vcl/inc/vcl/cmdevt.h
index 4594da8b7d56..58571596ef6c 100644
--- a/vcl/inc/vcl/cmdevt.h
+++ b/vcl/inc/vcl/cmdevt.h
@@ -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
@@ -32,31 +32,31 @@
 // - CommandVoiceData -
 // --------------------
 
-#define DICTATIONCOMMAND_SYSTEM         0x1000
-#define DICTATIONCOMMAND_USER           0x2000
-
-#define DICTATIONCOMMAND_UNKNOWN        0x0001
-#define DICTATIONCOMMAND_NEWPARAGRAPH   0x0002
-#define DICTATIONCOMMAND_NEWLINE        0x0003
-#define DICTATIONCOMMAND_BOLD_ON        0x0004
-#define DICTATIONCOMMAND_BOLD_OFF       0x0005
-#define DICTATIONCOMMAND_ITALIC_ON      0x0006
-#define DICTATIONCOMMAND_ITALIC_OFF     0x0007
-#define DICTATIONCOMMAND_UNDERLINE_ON   0x0008
-#define DICTATIONCOMMAND_UNDERLINE_OFF  0x0009
-#define DICTATIONCOMMAND_NUMBERING_ON   0x0010
-#define DICTATIONCOMMAND_NUMBERING_OFF  0x0011
-#define DICTATIONCOMMAND_TAB            0x0012
-#define DICTATIONCOMMAND_LEFT           0x0013
-#define DICTATIONCOMMAND_RIGHT          0x0014
-#define DICTATIONCOMMAND_UP             0x0015
-#define DICTATIONCOMMAND_DOWN           0x0016
-#define DICTATIONCOMMAND_UNDO           0x0017
-#define DICTATIONCOMMAND_REPEAT         0x0018
-#define DICTATIONCOMMAND_DEL            0x0019
-
-#define DICTATIONCOMMAND_COMMANDMODE    (DICTATIONCOMMAND_SYSTEM + 1)
-#define DICTATIONCOMMAND_DICTATIONMODE  (DICTATIONCOMMAND_SYSTEM + 2)
+#define DICTATIONCOMMAND_SYSTEM			0x1000
+#define DICTATIONCOMMAND_USER			0x2000
+
+#define DICTATIONCOMMAND_UNKNOWN		0x0001
+#define DICTATIONCOMMAND_NEWPARAGRAPH	0x0002
+#define DICTATIONCOMMAND_NEWLINE		0x0003
+#define DICTATIONCOMMAND_BOLD_ON		0x0004
+#define DICTATIONCOMMAND_BOLD_OFF		0x0005
+#define DICTATIONCOMMAND_ITALIC_ON		0x0006
+#define DICTATIONCOMMAND_ITALIC_OFF		0x0007
+#define DICTATIONCOMMAND_UNDERLINE_ON	0x0008
+#define DICTATIONCOMMAND_UNDERLINE_OFF	0x0009
+#define DICTATIONCOMMAND_NUMBERING_ON	0x0010
+#define DICTATIONCOMMAND_NUMBERING_OFF	0x0011
+#define DICTATIONCOMMAND_TAB			0x0012
+#define DICTATIONCOMMAND_LEFT			0x0013
+#define DICTATIONCOMMAND_RIGHT			0x0014
+#define DICTATIONCOMMAND_UP				0x0015
+#define DICTATIONCOMMAND_DOWN			0x0016
+#define DICTATIONCOMMAND_UNDO			0x0017
+#define DICTATIONCOMMAND_REPEAT			0x0018
+#define DICTATIONCOMMAND_DEL			0x0019
+
+#define DICTATIONCOMMAND_COMMANDMODE	(DICTATIONCOMMAND_SYSTEM + 1)
+#define DICTATIONCOMMAND_DICTATIONMODE	(DICTATIONCOMMAND_SYSTEM + 2)
 
 #endif // _VCL_CMDEVT_H
 
diff --git a/vcl/inc/vcl/cmdevt.hxx b/vcl/inc/vcl/cmdevt.hxx
index 7e968b6c7a54..854643297c5e 100644
--- a/vcl/inc/vcl/cmdevt.hxx
+++ b/vcl/inc/vcl/cmdevt.hxx
@@ -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
@@ -163,7 +163,7 @@ public:
                         { return ((mnCode & KEY_MOD1) != 0); }
     BOOL            IsMod2() const
                         { return ((mnCode & KEY_MOD2) != 0); }
-    BOOL            IsMod3() const
+    BOOL	        IsMod3() const
                         { return ((mnCode & KEY_MOD3) != 0); }
 };
 
@@ -318,7 +318,7 @@ class VCL_DLLPUBLIC CommandDialogData
     CommandDialogData( int nDialogId = SHOWDIALOG_ID_PREFERENCES )
     : m_nDialogId( nDialogId )
     {}
-
+    
     int GetDialogId() const { return m_nDialogId; }
 };
 
@@ -326,23 +326,23 @@ class VCL_DLLPUBLIC CommandDialogData
 // Media Commands
 // --------------
 
-#define MEDIA_COMMAND_CHANNEL_DOWN           ((sal_Int16)1) // Decrement the channel value, for example, for a TV or radio tuner.
-#define MEDIA_COMMAND_CHANNEL_UP             ((sal_Int16)2) // Increment the channel value, for example, for a TV or radio tuner.
-#define MEDIA_COMMAND_NEXTTRACK              ((sal_Int16)3) // Go to next media track/slide.
-#define MEDIA_COMMAND_PAUSE                  ((sal_Int16)4) // Pause. If already paused, take no further action. This is a direct PAUSE command that has no state.
-#define MEDIA_COMMAND_PLAY                   ((sal_Int16)5) // Begin playing at the current position. If already paused, it will resume. This is a direct PLAY command that has no state.
-#define MEDIA_COMMAND_PLAY_PAUSE             ((sal_Int16)6) // Play or pause playback.
-#define MEDIA_COMMAND_PREVIOUSTRACK          ((sal_Int16)7) // Go to previous media track/slide.
-#define MEDIA_COMMAND_RECORD                 ((sal_Int16)8) // Begin recording the current stream.
-#define MEDIA_COMMAND_REWIND                 ((sal_Int16)9)// Go backward in a stream at a higher rate of speed.
-#define MEDIA_COMMAND_STOP                   ((sal_Int16)10)// Stop playback.
-#define MEDIA_COMMAND_MIC_ON_OFF_TOGGLE      ((sal_Int16)11)// Toggle the microphone.
+#define MEDIA_COMMAND_CHANNEL_DOWN			 ((sal_Int16)1)	// Decrement the channel value, for example, for a TV or radio tuner. 
+#define MEDIA_COMMAND_CHANNEL_UP			 ((sal_Int16)2)	// Increment the channel value, for example, for a TV or radio tuner. 
+#define MEDIA_COMMAND_NEXTTRACK				 ((sal_Int16)3)	// Go to next media track/slide.
+#define MEDIA_COMMAND_PAUSE					 ((sal_Int16)4) // Pause. If already paused, take no further action. This is a direct PAUSE command that has no state.
+#define MEDIA_COMMAND_PLAY					 ((sal_Int16)5)	// Begin playing at the current position. If already paused, it will resume. This is a direct PLAY command that has no state.
+#define MEDIA_COMMAND_PLAY_PAUSE			 ((sal_Int16)6)	// Play or pause playback.
+#define MEDIA_COMMAND_PREVIOUSTRACK			 ((sal_Int16)7)	// Go to previous media track/slide.
+#define MEDIA_COMMAND_RECORD				 ((sal_Int16)8)	// Begin recording the current stream.
+#define MEDIA_COMMAND_REWIND				 ((sal_Int16)9)// Go backward in a stream at a higher rate of speed.
+#define MEDIA_COMMAND_STOP					 ((sal_Int16)10)// Stop playback.
+#define MEDIA_COMMAND_MIC_ON_OFF_TOGGLE		 ((sal_Int16)11)// Toggle the microphone.
 #define MEDIA_COMMAND_MICROPHONE_VOLUME_DOWN ((sal_Int16)12)// Increase microphone volume.
 #define MEDIA_COMMAND_MICROPHONE_VOLUME_MUTE ((sal_Int16)13)// Mute the microphone.
 #define MEDIA_COMMAND_MICROPHONE_VOLUME_UP   ((sal_Int16)14)// Decrease microphone volume.
-#define MEDIA_COMMAND_VOLUME_DOWN            ((sal_Int16)15)// Lower the volume.
-#define MEDIA_COMMAND_VOLUME_MUTE            ((sal_Int16)16)// Mute the volume.
-#define MEDIA_COMMAND_VOLUME_UP              ((sal_Int16)17)// Raise the volume.
+#define MEDIA_COMMAND_VOLUME_DOWN			 ((sal_Int16)15)// Lower the volume.
+#define MEDIA_COMMAND_VOLUME_MUTE			 ((sal_Int16)16)// Mute the volume.
+#define MEDIA_COMMAND_VOLUME_UP				 ((sal_Int16)17)// Raise the volume.
 #define MEDIA_COMMAND_MENU                   ((sal_Int16)18)// Button Menu pressed.
 #define MEDIA_COMMAND_MENU_HOLD              ((sal_Int16)19)// Button Menu (long) pressed.
 #define MEDIA_COMMAND_PLAY_HOLD              ((sal_Int16)20)// Button Play (long) pressed.
@@ -400,7 +400,7 @@ inline CommandSelectionChangeData::CommandSelectionChangeData( ULONG nStart,
 #define COMMAND_HANGUL_HANJA_CONVERSION ((USHORT)14)
 #define COMMAND_INPUTLANGUAGECHANGE     ((USHORT)15)
 #define COMMAND_SHOWDIALOG              ((USHORT)16)
-#define COMMAND_MEDIA                   ((USHORT)17)
+#define COMMAND_MEDIA					((USHORT)17)
 #define COMMAND_SELECTIONCHANGE         ((USHORT)18)
 #define COMMAND_PREPARERECONVERSION     ((USHORT)19)
 #define COMMAND_USER                    ((USHORT)4096)
@@ -428,9 +428,9 @@ public:
     const CommandWheelData*             GetWheelData() const;
     const CommandScrollData*            GetAutoScrollData() const;
     const CommandVoiceData*             GetVoiceData() const;
-    const CommandModKeyData*            GetModKeyData() const;
+    const CommandModKeyData*			GetModKeyData() const;
     const CommandDialogData*            GetDialogData() const;
-    sal_Int16                           GetMediaCommand() const;
+    sal_Int16							GetMediaCommand() const;
     const CommandSelectionChangeData*   GetSelectionChangeData() const;
 };
 
diff --git a/vcl/inc/vcl/combobox.h b/vcl/inc/vcl/combobox.h
index f4fc39f021b2..d2733f90ecb7 100644
--- a/vcl/inc/vcl/combobox.h
+++ b/vcl/inc/vcl/combobox.h
@@ -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
@@ -28,10 +28,10 @@
 #ifndef _SV_COMBOBOX_H
 #define _SV_COMBOBOX_H
 
-#define COMBOBOX_APPEND             ((USHORT)0xFFFF)
-#define COMBOBOX_ENTRY_NOTFOUND     ((USHORT)0xFFFF)
-#define COMBOBOX_ERROR              ((USHORT)0xFFFF)
+#define COMBOBOX_APPEND			   	((USHORT)0xFFFF)
+#define COMBOBOX_ENTRY_NOTFOUND	   	((USHORT)0xFFFF)
+#define COMBOBOX_ERROR			   	((USHORT)0xFFFF)
 
-#define COMBOBOX_USERDRAW_SELECTED  ((USHORT)0x0001)
+#define COMBOBOX_USERDRAW_SELECTED	((USHORT)0x0001)
 
-#endif  // _SV_COMBOBOX_H
+#endif	// _SV_COMBOBOX_H
diff --git a/vcl/inc/vcl/combobox.hxx b/vcl/inc/vcl/combobox.hxx
index e35474a84d53..bec2e9cb6870 100644
--- a/vcl/inc/vcl/combobox.hxx
+++ b/vcl/inc/vcl/combobox.hxx
@@ -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
@@ -108,11 +108,11 @@ public:
     virtual void    SetPosSizePixel( long nX, long nY, long nWidth, long nHeight, USHORT nFlags = WINDOW_POSSIZE_ALL );
     void            SetPosSizePixel( const Point& rNewPos, const Size& rNewSize )
                         { Edit::SetPosSizePixel( rNewPos, rNewSize ); }
-    void            SetDropDownSizePixel( const Size& rNewSize )
+    void			SetDropDownSizePixel( const Size& rNewSize )
     { if( IsDropDownBox() ) SetPosSizePixel( 0, 0, rNewSize.Width(), rNewSize.Height(), WINDOW_POSSIZE_SIZE | WINDOW_POSSIZE_DROPDOWN ); }
 
-    Rectangle       GetDropDownPosSizePixel() const;
-    Rectangle       GetListPosSizePixel() const;
+    Rectangle		GetDropDownPosSizePixel() const;
+    Rectangle		GetListPosSizePixel() const;
     // returns empty rectangle in DropDown mode,
     // else it returns the PosSize of the ListBox
 
@@ -138,12 +138,13 @@ public:
 
     USHORT          GetEntryPos( const XubString& rStr ) const;
     USHORT          GetEntryPos( const void* pData ) const;
+    Image           GetEntryImage( USHORT nPos ) const;
     XubString       GetEntry( USHORT nPos ) const;
     USHORT          GetEntryCount() const;
 
     BOOL            IsTravelSelect() const;
     BOOL            IsInDropDown() const;
-    void            ToggleDropDown();
+    void			ToggleDropDown();
 
     long            CalcWindowSizePixel( USHORT nLines ) const;
 
@@ -188,20 +189,20 @@ public:
     void            SetEntryData( USHORT nPos, void* pNewData );
     void*           GetEntryData( USHORT nPos ) const;
 
-    void            SetTopEntry( USHORT nPos );
+    void			SetTopEntry( USHORT nPos );
     void            ShowProminentEntry( USHORT nPos );
-    USHORT          GetTopEntry() const;
+    USHORT			GetTopEntry() const;
 
     void            SetProminentEntryType( ProminentEntry eType );
     ProminentEntry  GetProminentEntryType() const;
 
-    USHORT          GetDisplayLineCount() const;
+    USHORT			GetDisplayLineCount() const;
 
-    USHORT          GetSelectEntryCount() const;
-    USHORT          GetSelectEntryPos( USHORT nSelIndex = 0 ) const;
-    BOOL            IsEntryPosSelected( USHORT nPos ) const;
-    void            SelectEntryPos( USHORT nPos, BOOL bSelect = TRUE );
-    void            SetNoSelection();
+    USHORT			GetSelectEntryCount() const;
+    USHORT			GetSelectEntryPos( USHORT nSelIndex = 0 ) const;
+    BOOL			IsEntryPosSelected( USHORT nPos ) const;
+    void			SelectEntryPos( USHORT nPos, BOOL bSelect = TRUE );
+    void			SetNoSelection();
     Rectangle       GetBoundingRectangle( USHORT nItem ) const;
 
     /** checks whether a certain point lies within the bounds of
diff --git a/vcl/inc/vcl/configsettings.hxx b/vcl/inc/vcl/configsettings.hxx
index 779c6450e804..7bc960aba4fb 100644
--- a/vcl/inc/vcl/configsettings.hxx
+++ b/vcl/inc/vcl/configsettings.hxx
@@ -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
@@ -61,7 +61,7 @@ namespace vcl
 
         const rtl::OUString& getValue( const rtl::OUString& rGroup, const rtl::OUString& rKey ) const;
         void setValue( const rtl::OUString& rGroup, const rtl::OUString& rKey, const rtl::OUString& rValue );
-
+        
         virtual void Commit();
     };
 
diff --git a/vcl/inc/vcl/controldata.hxx b/vcl/inc/vcl/controldata.hxx
index 0be0f5bd402e..23cd4371731d 100644
--- a/vcl/inc/vcl/controldata.hxx
+++ b/vcl/inc/vcl/controldata.hxx
@@ -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
diff --git a/vcl/inc/vcl/controllayout.hxx b/vcl/inc/vcl/controllayout.hxx
index 574d80ea9e02..69338219c7ee 100644
--- a/vcl/inc/vcl/controllayout.hxx
+++ b/vcl/inc/vcl/controllayout.hxx
@@ -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
@@ -43,14 +43,14 @@ struct VCL_DLLPUBLIC ControlLayoutData
     // contains the string really displayed
     // there must be exactly one bounding rectangle in m_aUnicodeBoundRects
     // for every character in m_aDisplayText
-    String                              m_aDisplayText;
+    String								m_aDisplayText;
     // the bounding rectangle of every character
     // where one character may consist of many glyphs
-    std::vector< Rectangle >            m_aUnicodeBoundRects;
+    std::vector< Rectangle >			m_aUnicodeBoundRects;
     // start indices of lines
-    std::vector< long >                 m_aLineIndices;
+    std::vector< long >					m_aLineIndices;
     // notify parent control on destruction
-    const Control*                      m_pParent;
+    const Control*						m_pParent;
 
     ControlLayoutData() : m_pParent( NULL ) {}
     ~ControlLayoutData();
diff --git a/vcl/inc/vcl/ctrl.hxx b/vcl/inc/vcl/ctrl.hxx
index 3838b29a6d0a..d7cf1d92a2a6 100644
--- a/vcl/inc/vcl/ctrl.hxx
+++ b/vcl/inc/vcl/ctrl.hxx
@@ -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
@@ -47,9 +47,9 @@ protected:
     ::vcl::ImplControlData* mpControlData;
 
 private:
-    BOOL                    mbHasFocus;
-    Link                    maGetFocusHdl;
-    Link                    maLoseFocusHdl;
+    BOOL					mbHasFocus;
+    Link					maGetFocusHdl;
+    Link					maLoseFocusHdl;
 
     SAL_DLLPRIVATE void     ImplInitControlData();
 
@@ -59,10 +59,10 @@ private:
 
 protected:
                     Control( WindowType nType );
-    virtual void    FillLayoutData() const;
+    virtual void	FillLayoutData() const;
 
     // helper method for composite controls
-    void            AppendLayoutData( const Control& rSubControl ) const;
+    void			AppendLayoutData( const Control& rSubControl ) const;
 
     /// creates the mpData->mpLayoutData structure
     void            CreateLayoutData() const;
@@ -86,7 +86,7 @@ protected:
         @return
             if the Control instance has been destroyed in any of the call
     */
-    BOOL        ImplCallEventListenersAndHandler(
+    BOOL        ImplCallEventListenersAndHandler( 
                     ULONG nEvent, const Link& rHandler, void* pCaller
                 );
 
@@ -131,22 +131,22 @@ public:
             by the space occupied by the drawn pixels.
     */
     SAL_DLLPRIVATE void ImplDrawFrame( OutputDevice* pDev, Rectangle& rRect );
-//#endif
+//#endif    
 
 public:
                     Control( Window* pParent, WinBits nWinStyle = 0 );
                     Control( Window* pParent, const ResId& rResId );
                     ~Control();
 
-    virtual void    GetFocus();
-    virtual void    LoseFocus();
-    virtual long    Notify( NotifyEvent& rNEvt );
-    virtual void    StateChanged( StateChangedType nStateChange );
+    virtual void	GetFocus();
+    virtual void	LoseFocus();
+    virtual long	Notify( NotifyEvent& rNEvt );
+    virtual void	StateChanged( StateChangedType nStateChange );
     virtual void    Resize();
     virtual void    DataChanged( const DataChangedEvent& rDCEvt );
 
     // invalidates layout data
-    virtual void    SetText( const String& rStr );
+    virtual void	SetText( const String& rStr );
     // gets the displayed text
     virtual String GetDisplayText() const;
     // returns the bounding box for the character at index nIndex (in control coordinates)
@@ -174,12 +174,12 @@ public:
     */
     long ToRelativeLineIndex( long nIndex ) const;
 
-    void            SetGetFocusHdl( const Link& rLink ) { maGetFocusHdl = rLink; }
-    const Link&     GetGetFocusHdl() const   { return maGetFocusHdl; }
-    void            SetLoseFocusHdl( const Link& rLink ) { maLoseFocusHdl = rLink; }
-    const Link&     GetLoseFocusHdl() const { return maLoseFocusHdl; }
+    void			SetGetFocusHdl( const Link& rLink ) { maGetFocusHdl = rLink; }
+    const Link& 	GetGetFocusHdl() const	 { return maGetFocusHdl; }
+    void			SetLoseFocusHdl( const Link& rLink ) { maLoseFocusHdl = rLink; }
+    const Link& 	GetLoseFocusHdl() const { return maLoseFocusHdl; }
 
-    void            SetLayoutDataParent( const Control* pParent ) const;
+    void			SetLayoutDataParent( const Control* pParent ) const;
 
     virtual Size    GetOptimalSize(WindowSizeType eType) const;
 
@@ -198,4 +198,4 @@ public:
     }
 };
 
-#endif  // _SV_CTRL_HXX
+#endif	// _SV_CTRL_HXX
diff --git a/vcl/inc/vcl/cursor.hxx b/vcl/inc/vcl/cursor.hxx
index db8f5efd0566..f1ecb408af5c 100644
--- a/vcl/inc/vcl/cursor.hxx
+++ b/vcl/inc/vcl/cursor.hxx
@@ -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
@@ -41,7 +41,7 @@ class Window;
 // - Cursor-Styles -
 // -----------------
 
-#define CURSOR_SHADOW                   ((USHORT)0x0001)
+#define CURSOR_SHADOW					((USHORT)0x0001)
 #define CURSOR_DIRECTION_NONE           ((unsigned char)0x00)
 #define CURSOR_DIRECTION_LTR            ((unsigned char)0x01)
 #define CURSOR_DIRECTION_RTL            ((unsigned char)0x02)
@@ -53,25 +53,25 @@ class Window;
 class VCL_DLLPUBLIC Cursor
 {
 private:
-    ImplCursorData* mpData;             // Interne Daten
-    Window*         mpWindow;           // Window (only for shadow cursor)
-    long            mnSlant;            // Schraegstellung
-    long            mnOffsetY;          // Offset fuer Rotation
-    Size            maSize;             // Groesse
-    Point           maPos;              // Position
-    short           mnOrientation;      // Rotation
-    USHORT          mnStyle;            // Style
-    BOOL            mbVisible;          // Ist Cursor sichtbar
-    unsigned char   mnDirection;        // indicates direction
+    ImplCursorData* mpData; 			// Interne Daten
+    Window* 		mpWindow;			// Window (only for shadow cursor)
+    long			mnSlant;			// Schraegstellung
+    long			mnOffsetY;			// Offset fuer Rotation
+    Size			maSize; 			// Groesse
+    Point			maPos;				// Position
+    short			mnOrientation;		// Rotation
+    USHORT			mnStyle;			// Style
+    BOOL			mbVisible;			// Ist Cursor sichtbar
+    unsigned char	mnDirection;		// indicates direction
 
 //#if 0 // _SOLAR__PRIVATE
 public:
-    SAL_DLLPRIVATE void         ImplDraw();
-    SAL_DLLPRIVATE void         ImplRestore();
+    SAL_DLLPRIVATE void			ImplDraw();
+    SAL_DLLPRIVATE void			ImplRestore();
     DECL_DLLPRIVATE_LINK(       ImplTimerHdl, AutoTimer* );
-    SAL_DLLPRIVATE void         ImplShow( BOOL bDrawDirect = TRUE );
-    SAL_DLLPRIVATE void         ImplHide();
-    SAL_DLLPRIVATE void         ImplNew();
+    SAL_DLLPRIVATE void			ImplShow( BOOL bDrawDirect = TRUE );
+    SAL_DLLPRIVATE void			ImplHide();
+    SAL_DLLPRIVATE void			ImplNew();
 //#endif
 
 public:
@@ -79,41 +79,41 @@ public:
                     Cursor( const Cursor& rCursor );
                     ~Cursor();
 
-    void            SetStyle( USHORT nStyle );
-    USHORT          GetStyle() const { return mnStyle; }
+    void			SetStyle( USHORT nStyle );
+    USHORT			GetStyle() const { return mnStyle; }
 
-    void            Show();
-    void            Hide();
-    BOOL            IsVisible() const { return mbVisible; }
+    void			Show();
+    void			Hide();
+    BOOL			IsVisible() const { return mbVisible; }
 
-    void            SetWindow( Window* pWindow );
-    Window*         GetWindow() const { return mpWindow; }
+    void			SetWindow( Window* pWindow );
+    Window* 		GetWindow() const { return mpWindow; }
 
-    void            SetPos( const Point& rNewPos );
-    const Point&    GetPos() const { return maPos; }
-    void            SetOffsetY( long mnOffsetY = 0 );
-    long            GetOffsetY() const { return mnOffsetY; }
+    void			SetPos( const Point& rNewPos );
+    const Point&	GetPos() const { return maPos; }
+    void			SetOffsetY( long mnOffsetY = 0 );
+    long			GetOffsetY() const { return mnOffsetY; }
 
-    void            SetSize( const Size& rNewSize );
-    const Size&     GetSize() const { return maSize; }
-    void            SetWidth( long nNewWidth );
-    long            GetWidth() const { return maSize.Width(); }
-    void            SetHeight( long nNewHeight );
-    long            GetHeight() const { return maSize.Height(); }
+    void			SetSize( const Size& rNewSize );
+    const Size& 	GetSize() const { return maSize; }
+    void			SetWidth( long nNewWidth );
+    long			GetWidth() const { return maSize.Width(); }
+    void			SetHeight( long nNewHeight );
+    long			GetHeight() const { return maSize.Height(); }
 
-    void            SetSlant( long nSlant = 0 );
-    long            GetSlant() const { return mnSlant; }
+    void			SetSlant( long nSlant = 0 );
+    long			GetSlant() const { return mnSlant; }
 
-    void            SetOrientation( short nOrientation = 0 );
-    short           GetOrientation() const { return mnOrientation; }
+    void			SetOrientation( short nOrientation = 0 );
+    short			GetOrientation() const { return mnOrientation; }
 
-    void            SetDirection( unsigned char nDirection = 0 );
-    unsigned char   GetDirection() const { return mnDirection; }
+    void			SetDirection( unsigned char nDirection = 0 );
+    unsigned char	GetDirection() const { return mnDirection; }
 
-    Cursor&         operator=( const Cursor& rCursor );
-    BOOL            operator==( const Cursor& rCursor ) const;
-    BOOL            operator!=( const Cursor& rCursor ) const
+    Cursor& 		operator=( const Cursor& rCursor );
+    BOOL			operator==( const Cursor& rCursor ) const;
+    BOOL			operator!=( const Cursor& rCursor ) const
                         { return !(Cursor::operator==( rCursor )); }
 };
 
-#endif  // _SV_CURSOR_HXX
+#endif	// _SV_CURSOR_HXX
diff --git a/vcl/inc/vcl/cvtgrf.hxx b/vcl/inc/vcl/cvtgrf.hxx
index 97541c1b8f9f..3ee418f868d0 100644
--- a/vcl/inc/vcl/cvtgrf.hxx
+++ b/vcl/inc/vcl/cvtgrf.hxx
@@ -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
@@ -36,15 +36,15 @@
 // - GraphicConverter -
 // --------------------
 
-struct  ConvertData;
-class   Graphic;
+struct	ConvertData;
+class	Graphic;
 
 class VCL_DLLPUBLIC GraphicConverter
 {
 private:
 
-    Link                maFilterHdl;
-    ConvertData*        mpConvertData;
+    Link				maFilterHdl;
+    ConvertData*		mpConvertData;
 
 //#if 0 // _SOLAR__PRIVATE
 public:
@@ -57,13 +57,13 @@ public:
                         GraphicConverter();
                         ~GraphicConverter();
 
-    static ULONG        Import( SvStream& rIStm, Graphic& rGraphic, ULONG nFormat = CVT_UNKNOWN );
-    static ULONG        Export( SvStream& rOStm, const Graphic& rGraphic, ULONG nFormat );
+    static ULONG		Import( SvStream& rIStm, Graphic& rGraphic, ULONG nFormat = CVT_UNKNOWN );
+    static ULONG		Export( SvStream& rOStm, const Graphic& rGraphic, ULONG nFormat );
 
-    ConvertData*        GetConvertData() { return mpConvertData; }
+    ConvertData*		GetConvertData() { return mpConvertData; }
 
-    void                SetFilterHdl( const Link& rLink ) { maFilterHdl = rLink; }
-    const Link&         GetFilterHdl() const { return maFilterHdl; }
+    void				SetFilterHdl( const Link& rLink ) { maFilterHdl = rLink; }
+    const Link&			GetFilterHdl() const { return maFilterHdl; }
 };
 
 #endif // _SV_CVTGRF_HXX
diff --git a/vcl/inc/vcl/cvtsvm.hxx b/vcl/inc/vcl/cvtsvm.hxx
index 03948ac56690..5c3365364c42 100644
--- a/vcl/inc/vcl/cvtsvm.hxx
+++ b/vcl/inc/vcl/cvtsvm.hxx
@@ -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
@@ -36,55 +36,55 @@
 // - Defines -
 // -----------
 
-#define CONVERT_TO_SVM1                 0x00000001UL
-#define CONVERT_FROM_SVM1               0x00000002UL
+#define CONVERT_TO_SVM1 				0x00000001UL
+#define CONVERT_FROM_SVM1				0x00000002UL
 
-#define GDI_PIXEL_ACTION                1
-#define GDI_POINT_ACTION                2
-#define GDI_LINE_ACTION                 3
-#define GDI_RECT_ACTION                 4
-#define GDI_ELLIPSE_ACTION              5
-#define GDI_ARC_ACTION                  6
-#define GDI_PIE_ACTION                  7
-#define GDI_INVERTRECT_ACTION           8
-#define GDI_HIGHLIGHTRECT_ACTION        9
-#define GDI_POLYLINE_ACTION             10
-#define GDI_POLYGON_ACTION              11
-#define GDI_POLYPOLYGON_ACTION          12
-#define GDI_TEXT_ACTION                 13
-#define GDI_TEXTARRAY_ACTION            14
-#define GDI_STRETCHTEXT_ACTION          15
-#define GDI_ICON_ACTION                 16
-#define GDI_BITMAP_ACTION               17
-#define GDI_BITMAPSCALE_ACTION          18
-#define GDI_PEN_ACTION                  19
-#define GDI_FONT_ACTION                 20
-#define GDI_BACKBRUSH_ACTION            21
-#define GDI_FILLBRUSH_ACTION            22
-#define GDI_MAPMODE_ACTION              23
-#define GDI_CLIPREGION_ACTION           24
-#define GDI_RASTEROP_ACTION             25
-#define GDI_PUSH_ACTION                 26
-#define GDI_POP_ACTION                  27
-#define GDI_MOVECLIPREGION_ACTION       28
-#define GDI_ISECTCLIPREGION_ACTION      29
-#define GDI_MTF_ACTION                  30
-#define GDI_BITMAPSCALEPART_ACTION      32
-#define GDI_GRADIENT_ACTION             33
+#define GDI_PIXEL_ACTION				1
+#define GDI_POINT_ACTION				2
+#define GDI_LINE_ACTION 				3
+#define GDI_RECT_ACTION 				4
+#define GDI_ELLIPSE_ACTION				5
+#define GDI_ARC_ACTION					6
+#define GDI_PIE_ACTION					7
+#define GDI_INVERTRECT_ACTION			8
+#define GDI_HIGHLIGHTRECT_ACTION		9
+#define GDI_POLYLINE_ACTION 			10
+#define GDI_POLYGON_ACTION				11
+#define GDI_POLYPOLYGON_ACTION			12
+#define GDI_TEXT_ACTION 				13
+#define GDI_TEXTARRAY_ACTION			14
+#define GDI_STRETCHTEXT_ACTION			15
+#define GDI_ICON_ACTION 				16
+#define GDI_BITMAP_ACTION				17
+#define GDI_BITMAPSCALE_ACTION			18
+#define GDI_PEN_ACTION					19
+#define GDI_FONT_ACTION 				20
+#define GDI_BACKBRUSH_ACTION			21
+#define GDI_FILLBRUSH_ACTION			22
+#define GDI_MAPMODE_ACTION				23
+#define GDI_CLIPREGION_ACTION			24
+#define GDI_RASTEROP_ACTION 			25
+#define GDI_PUSH_ACTION 				26
+#define GDI_POP_ACTION					27
+#define GDI_MOVECLIPREGION_ACTION		28
+#define GDI_ISECTCLIPREGION_ACTION		29
+#define GDI_MTF_ACTION					30
+#define GDI_BITMAPSCALEPART_ACTION		32
+#define GDI_GRADIENT_ACTION 			33
 
-#define GDI_TRANSPARENT_COMMENT         1024
-#define GDI_HATCH_COMMENT               1025
-#define GDI_REFPOINT_COMMENT            1026
-#define GDI_TEXTLINECOLOR_COMMENT       1027
-#define GDI_TEXTLINE_COMMENT            1028
-#define GDI_FLOATTRANSPARENT_COMMENT    1029
-#define GDI_GRADIENTEX_COMMENT          1030
-#define GDI_COMMENT_COMMENT             1031
-#define GDI_UNICODE_COMMENT             1032
+#define GDI_TRANSPARENT_COMMENT 		1024
+#define GDI_HATCH_COMMENT				1025
+#define GDI_REFPOINT_COMMENT			1026
+#define GDI_TEXTLINECOLOR_COMMENT		1027
+#define GDI_TEXTLINE_COMMENT			1028
+#define GDI_FLOATTRANSPARENT_COMMENT	1029
+#define GDI_GRADIENTEX_COMMENT			1030
+#define GDI_COMMENT_COMMENT 			1031
+#define GDI_UNICODE_COMMENT				1032
 
-#define GDI_LINEJOIN_ACTION             1033
-#define GDI_EXTENDEDPOLYGON_ACTION      1034
-#define GDI_LINEDASHDOT_ACTION          1035
+#define GDI_LINEJOIN_ACTION				1033
+#define GDI_EXTENDEDPOLYGON_ACTION		1034
+#define GDI_LINEDASHDOT_ACTION			1035
 
 // ----------------
 // - SVMConverter -
@@ -96,9 +96,9 @@ class VCL_DLLPUBLIC SVMConverter
 {
 private:
 //#if 0 // _SOLAR__PRIVATE
-    SAL_DLLPRIVATE void             ImplConvertFromSVM1( SvStream& rIStm, GDIMetaFile& rMtf );
-    SAL_DLLPRIVATE void             ImplConvertToSVM1( SvStream& rOStm, GDIMetaFile& rMtf );
-    SAL_DLLPRIVATE ULONG            ImplWriteActions( SvStream& rOStm, GDIMetaFile& rMtf,
+    SAL_DLLPRIVATE void				ImplConvertFromSVM1( SvStream& rIStm, GDIMetaFile& rMtf );
+    SAL_DLLPRIVATE void				ImplConvertToSVM1( SvStream& rOStm, GDIMetaFile& rMtf );
+    SAL_DLLPRIVATE ULONG			ImplWriteActions( SvStream& rOStm, GDIMetaFile& rMtf,
                                           VirtualDevice& rSaveVDev, BOOL& rRop_0_1,
                                           Color& rLineCol, Stack& rLineColStack,
                                           rtl_TextEncoding& rActualCharSet );
@@ -111,7 +111,7 @@ public:
 private:
                         // Not implemented
                         SVMConverter( const SVMConverter& );
-    SVMConverter&       operator=( const SVMConverter& );
+    SVMConverter&		operator=( const SVMConverter& );
 };
 
 #endif // _SV_CVTMTF_HXX
diff --git a/vcl/inc/vcl/dbggui.hxx b/vcl/inc/vcl/dbggui.hxx
index 7ed23706e6f3..8e06ad85d9e4 100644
--- a/vcl/inc/vcl/dbggui.hxx
+++ b/vcl/inc/vcl/dbggui.hxx
@@ -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
diff --git a/vcl/inc/vcl/decoview.hxx b/vcl/inc/vcl/decoview.hxx
index 2412ceda8431..9c992b387d2b 100644
--- a/vcl/inc/vcl/decoview.hxx
+++ b/vcl/inc/vcl/decoview.hxx
@@ -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
@@ -42,45 +42,45 @@ class OutputDevice;
 // ------------------------
 
 // Flags for DrawSymbol()
-#define SYMBOL_DRAW_MONO                    ((USHORT)0x0001)
-#define SYMBOL_DRAW_DISABLE                 ((USHORT)0x0002)
+#define SYMBOL_DRAW_MONO					((USHORT)0x0001)
+#define SYMBOL_DRAW_DISABLE 				((USHORT)0x0002)
 
 // Flags for DrawFrame()
-#define FRAME_DRAW_IN                       ((USHORT)0x0001)
-#define FRAME_DRAW_OUT                      ((USHORT)0x0002)
-#define FRAME_DRAW_GROUP                    ((USHORT)0x0003)
-#define FRAME_DRAW_DOUBLEIN                 ((USHORT)0x0004)
-#define FRAME_DRAW_DOUBLEOUT                ((USHORT)0x0005)
+#define FRAME_DRAW_IN						((USHORT)0x0001)
+#define FRAME_DRAW_OUT						((USHORT)0x0002)
+#define FRAME_DRAW_GROUP					((USHORT)0x0003)
+#define FRAME_DRAW_DOUBLEIN 				((USHORT)0x0004)
+#define FRAME_DRAW_DOUBLEOUT				((USHORT)0x0005)
 #define FRAME_DRAW_MENU                     ((USHORT)0x0010)
 #define FRAME_DRAW_WINDOWBORDER             ((USHORT)0x0020)
 #define FRAME_DRAW_BORDERWINDOWBORDER       ((USHORT)0x0040)
-#define FRAME_DRAW_MONO                     ((USHORT)0x1000)
-#define FRAME_DRAW_NODRAW                   ((USHORT)0x8000)
-#define FRAME_DRAW_STYLE                    ((USHORT)0x000F)
+#define FRAME_DRAW_MONO 					((USHORT)0x1000)
+#define FRAME_DRAW_NODRAW					((USHORT)0x8000)
+#define FRAME_DRAW_STYLE					((USHORT)0x000F)
 
 // Flags for DrawHighlightFrame()
-#define FRAME_HIGHLIGHT_IN                  ((USHORT)0x0001)
-#define FRAME_HIGHLIGHT_OUT                 ((USHORT)0x0002)
-#define FRAME_HIGHLIGHT_TESTBACKGROUND      ((USHORT)0x4000)
-#define FRAME_HIGHLIGHT_STYLE               ((USHORT)0x000F)
+#define FRAME_HIGHLIGHT_IN					((USHORT)0x0001)
+#define FRAME_HIGHLIGHT_OUT 				((USHORT)0x0002)
+#define FRAME_HIGHLIGHT_TESTBACKGROUND		((USHORT)0x4000)
+#define FRAME_HIGHLIGHT_STYLE				((USHORT)0x000F)
 
 // Flags for DrawButton()
-#define BUTTON_DRAW_DEFAULT                 ((USHORT)0x0001)
-#define BUTTON_DRAW_NOLIGHTBORDER           ((USHORT)0x0002)
-#define BUTTON_DRAW_PRESSED                 ((USHORT)0x0004)
-#define BUTTON_DRAW_CHECKED                 ((USHORT)0x0008)
-#define BUTTON_DRAW_DONTKNOW                ((USHORT)0x0010)
-#define BUTTON_DRAW_MONO                    ((USHORT)0x0020)
-#define BUTTON_DRAW_NOFILL                  ((USHORT)0x0040)
-#define BUTTON_DRAW_DISABLED                ((USHORT)0x0080)
-#define BUTTON_DRAW_HIGHLIGHT               ((USHORT)0x0100)
-#define BUTTON_DRAW_FLAT                    ((USHORT)0x0200)
-#define BUTTON_DRAW_NOTOPLIGHTBORDER        ((USHORT)0x0400)
-#define BUTTON_DRAW_NOBOTTOMSHADOWBORDER    ((USHORT)0x0800)
-#define BUTTON_DRAW_NOLEFTLIGHTBORDER       ((USHORT)0x1000)
-#define BUTTON_DRAW_NOTEXT                  ((USHORT)0x2000)
-#define BUTTON_DRAW_NOIMAGE             ((USHORT)0x4000)
-#define BUTTON_DRAW_NODRAW                  ((USHORT)0x8000)
+#define BUTTON_DRAW_DEFAULT 				((USHORT)0x0001)
+#define BUTTON_DRAW_NOLIGHTBORDER			((USHORT)0x0002)
+#define BUTTON_DRAW_PRESSED 				((USHORT)0x0004)
+#define BUTTON_DRAW_CHECKED 				((USHORT)0x0008)
+#define BUTTON_DRAW_DONTKNOW				((USHORT)0x0010)
+#define BUTTON_DRAW_MONO					((USHORT)0x0020)
+#define BUTTON_DRAW_NOFILL					((USHORT)0x0040)
+#define BUTTON_DRAW_DISABLED				((USHORT)0x0080)
+#define BUTTON_DRAW_HIGHLIGHT				((USHORT)0x0100)
+#define BUTTON_DRAW_FLAT					((USHORT)0x0200)
+#define BUTTON_DRAW_NOTOPLIGHTBORDER		((USHORT)0x0400)
+#define BUTTON_DRAW_NOBOTTOMSHADOWBORDER	((USHORT)0x0800)
+#define BUTTON_DRAW_NOLEFTLIGHTBORDER		((USHORT)0x1000)
+#define BUTTON_DRAW_NOTEXT					((USHORT)0x2000)
+#define BUTTON_DRAW_NOIMAGE				((USHORT)0x4000)
+#define BUTTON_DRAW_NODRAW					((USHORT)0x8000)
 
 // ------------------
 // - DecorationView -
@@ -89,21 +89,21 @@ class OutputDevice;
 class VCL_DLLPUBLIC DecorationView
 {
 private:
-    OutputDevice*       mpOutDev;
+    OutputDevice*		mpOutDev;
 
 public:
                         DecorationView( OutputDevice* pOutDev )
                             { mpOutDev = pOutDev; }
 
-    void                DrawSymbol( const Rectangle& rRect, SymbolType eType,
+    void				DrawSymbol( const Rectangle& rRect, SymbolType eType,
                                     const Color& rColor, USHORT nStyle = 0 );
-    void                DrawFrame( const Rectangle& rRect,
+    void				DrawFrame( const Rectangle& rRect,
                                    const Color& rLeftTopColor,
                                    const Color& rRightBottomColor );
-    void                DrawHighlightFrame( const Rectangle& rRect,
+    void				DrawHighlightFrame( const Rectangle& rRect,
                                             USHORT nStyle = FRAME_HIGHLIGHT_OUT );
-    Rectangle           DrawFrame( const Rectangle& rRect, USHORT nStyle = FRAME_DRAW_OUT );
-    Rectangle           DrawButton( const Rectangle& rRect, USHORT nStyle );
+    Rectangle			DrawFrame( const Rectangle& rRect, USHORT nStyle = FRAME_DRAW_OUT );
+    Rectangle			DrawButton( const Rectangle& rRect, USHORT nStyle );
     void                DrawSeparator( const Point& rStart, const Point& rStop, bool bVertical = true );
 };
 
diff --git a/vcl/inc/vcl/dialog.hxx b/vcl/inc/vcl/dialog.hxx
index 60fe97225b4b..1032908d0030 100644
--- a/vcl/inc/vcl/dialog.hxx
+++ b/vcl/inc/vcl/dialog.hxx
@@ -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
@@ -45,14 +45,14 @@ struct DialogImpl;
 class VCL_DLLPUBLIC Dialog : public SystemWindow
 {
 private:
-    Window*         mpDialogParent;
-    Dialog*         mpPrevExecuteDlg;
+    Window* 		mpDialogParent;
+    Dialog* 		mpPrevExecuteDlg;
     DialogImpl*     mpDialogImpl;
-    long            mnMousePositioned;
-    BOOL            mbInExecute;
-    BOOL            mbOldSaveBack;
-    BOOL            mbInClose;
-    BOOL            mbModalMode;
+    long			mnMousePositioned;
+    BOOL			mbInExecute;
+    BOOL			mbOldSaveBack;
+    BOOL			mbInClose;
+    BOOL			mbModalMode;
 
     SAL_DLLPRIVATE void    ImplInitDialogData();
     SAL_DLLPRIVATE void    ImplInitSettings();
@@ -75,21 +75,21 @@ public:
 
 protected:
                     Dialog( WindowType nType );
-    virtual void    Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, ULONG nFlags );
+    virtual void	Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, ULONG nFlags );
 
 public:
                     Dialog( Window* pParent, WinBits nStyle = WB_STDDIALOG );
                     Dialog( Window* pParent, const ResId& rResId );
     virtual         ~Dialog();
 
-    virtual long    Notify( NotifyEvent& rNEvt );
-    virtual void    StateChanged( StateChangedType nStateChange );
-    virtual void    DataChanged( const DataChangedEvent& rDCEvt );
+    virtual long	Notify( NotifyEvent& rNEvt );
+    virtual void	StateChanged( StateChangedType nStateChange );
+    virtual void	DataChanged( const DataChangedEvent& rDCEvt );
 
-    virtual BOOL    Close();
+    virtual BOOL	Close();
 
-    virtual short   Execute();
-    BOOL            IsInExecute() const { return mbInExecute; }
+    virtual short	Execute();
+    BOOL			IsInExecute() const { return mbInExecute; }
 
     ////////////////////////////////////////
     // Dialog::Execute replacement API
@@ -106,17 +106,17 @@ public:
     // Dialog::Execute replacement API
     ////////////////////////////////////////
 
-    void            EndDialog( long nResult = 0 );
-    static void     EndAllDialogs( Window* pParent=NULL );
+    void			EndDialog( long nResult = 0 );
+    static void		EndAllDialogs( Window* pParent=NULL );
 
     void            GetDrawWindowBorder( sal_Int32& rLeftBorder, sal_Int32& rTopBorder,
                                          sal_Int32& rRightBorder, sal_Int32& rBottomBorder ) const;
 
-    void            SetModalInputMode( BOOL bModal );
-    void            SetModalInputMode( BOOL bModal, BOOL bSubModalDialogs );
-    BOOL            IsModalInputMode() const { return mbModalMode; }
+    void			SetModalInputMode( BOOL bModal );
+    void			SetModalInputMode( BOOL bModal, BOOL bSubModalDialogs );
+    BOOL			IsModalInputMode() const { return mbModalMode; }
 
-    void            GrabFocusToFirstControl();
+    void			GrabFocusToFirstControl();
 };
 
 // ------------------
@@ -148,9 +148,9 @@ public:
 
 private:
     using Window::Show;
-    void            Show( BOOL bVisible = TRUE );
+    void			Show( BOOL bVisible = TRUE );
     using Window::Hide;
-    void            Hide();
+    void			Hide();
 
 //#if 0 // _SOLAR__PRIVATE
     // Copy assignment is forbidden and not implemented.
@@ -159,4 +159,4 @@ private:
 //#endif
 };
 
-#endif  // _SV_DIALOG_HXX
+#endif	// _SV_DIALOG_HXX
diff --git a/vcl/inc/vcl/dllapi.h b/vcl/inc/vcl/dllapi.h
index bcf4001aa671..04e5c1f9e551 100644
--- a/vcl/inc/vcl/dllapi.h
+++ b/vcl/inc/vcl/dllapi.h
@@ -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
diff --git a/vcl/inc/vcl/dndevdis.hxx b/vcl/inc/vcl/dndevdis.hxx
index 5b91bd0713ec..b5560cc0ebe0 100644
--- a/vcl/inc/vcl/dndevdis.hxx
+++ b/vcl/inc/vcl/dndevdis.hxx
@@ -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
@@ -37,10 +37,10 @@
 #include <cppuhelper/implbase3.hxx>
 #include <vcl/window.hxx>
 
-class DNDEventDispatcher: public ::cppu::WeakImplHelper3<
+class DNDEventDispatcher: public ::cppu::WeakImplHelper3< 
     ::com::sun::star::datatransfer::dnd::XDropTargetListener,
     ::com::sun::star::datatransfer::dnd::XDropTargetDragContext,
-    ::com::sun::star::datatransfer::dnd::XDragGestureListener >
+    ::com::sun::star::datatransfer::dnd::XDragGestureListener > 
 {
     Window * m_pTopWindow;
     Window * m_pCurrentWindow;
@@ -51,24 +51,24 @@ class DNDEventDispatcher: public ::cppu::WeakImplHelper3<
     /*
      * fire the events on the dnd listener container of the specified window
      */
-
-    sal_Int32 fireDragEnterEvent( Window *pWindow, const ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::dnd::XDropTargetDragContext >& xContext,
-        const sal_Int8 nDropAction, const Point& rLocation, const sal_Int8 nSourceAction,
+     
+    sal_Int32 fireDragEnterEvent( Window *pWindow, const ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::dnd::XDropTargetDragContext >& xContext, 
+        const sal_Int8 nDropAction,	const Point& rLocation, const sal_Int8 nSourceAction,
         const ::com::sun::star::uno::Sequence< ::com::sun::star::datatransfer::DataFlavor >& aFlavorList ) throw(::com::sun::star::uno::RuntimeException);
 
-    sal_Int32 fireDragOverEvent( Window *pWindow, const ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::dnd::XDropTargetDragContext >& xContext,
-        const sal_Int8 nDropAction, const Point& rLocation, const sal_Int8 nSourceAction ) throw(::com::sun::star::uno::RuntimeException);
+    sal_Int32 fireDragOverEvent( Window *pWindow, const ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::dnd::XDropTargetDragContext >& xContext, 
+        const sal_Int8 nDropAction,	const Point& rLocation, const sal_Int8 nSourceAction ) throw(::com::sun::star::uno::RuntimeException);
 
     sal_Int32 fireDragExitEvent( Window *pWindow ) throw(::com::sun::star::uno::RuntimeException);
 
-    sal_Int32 fireDropActionChangedEvent( Window *pWindow, const ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::dnd::XDropTargetDragContext >& xContext,
-        const sal_Int8 nDropAction, const Point& rLocation, const sal_Int8 nSourceAction ) throw(::com::sun::star::uno::RuntimeException);
+    sal_Int32 fireDropActionChangedEvent( Window *pWindow, const ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::dnd::XDropTargetDragContext >& xContext, 
+        const sal_Int8 nDropAction,	const Point& rLocation, const sal_Int8 nSourceAction ) throw(::com::sun::star::uno::RuntimeException);
 
-    sal_Int32 fireDropEvent( Window *pWindow, const ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::dnd::XDropTargetDropContext >& xContext,
-        const sal_Int8 nDropAction, const Point& rLocation, const sal_Int8 nSourceAction,
+    sal_Int32 fireDropEvent( Window *pWindow, const ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::dnd::XDropTargetDropContext >& xContext, 
+        const sal_Int8 nDropAction,	const Point& rLocation, const sal_Int8 nSourceAction,
         const ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::XTransferable >& xTransferable ) throw(::com::sun::star::uno::RuntimeException);
 
-    sal_Int32 fireDragGestureEvent( Window *pWindow, const ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::dnd::XDragSource >& xSource,
+    sal_Int32 fireDragGestureEvent( Window *pWindow, const ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::dnd::XDragSource >& xSource, 
         const ::com::sun::star::uno::Any event, const Point& rOrigin, const sal_Int8 nDragAction )throw(::com::sun::star::uno::RuntimeException);
 
 public:
@@ -96,7 +96,7 @@ public:
     /*
      * XDragGestureListener
      */
-
+     
     virtual void SAL_CALL dragGestureRecognized( const ::com::sun::star::datatransfer::dnd::DragGestureEvent& dge ) throw(::com::sun::star::uno::RuntimeException);
 
 
@@ -104,11 +104,11 @@ public:
      * XEventListener
      */
 
-    virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& eo ) throw(::com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& eo ) throw(::com::sun::star::uno::RuntimeException); 
 };
 
 //==================================================================================================
-//
+// 
 //==================================================================================================
 
 #endif
diff --git a/vcl/inc/vcl/dndhelp.hxx b/vcl/inc/vcl/dndhelp.hxx
index 3929bc1ebafc..14e66a0c4fe6 100644
--- a/vcl/inc/vcl/dndhelp.hxx
+++ b/vcl/inc/vcl/dndhelp.hxx
@@ -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
@@ -90,14 +90,14 @@ class VCL_DLLPUBLIC DragAndDropWrapper :
 private:
     DragAndDropClient* mpClient;
 
-public:
+public:	
                     DragAndDropWrapper( DragAndDropClient* pClient );
                     ~DragAndDropWrapper();
 
     // ::com::sun::star::uno::XInterface
-    ::com::sun::star::uno::Any                  SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException);
-    void                                        SAL_CALL acquire() throw()  { OWeakObject::acquire(); }
-    void                                        SAL_CALL release() throw()  { OWeakObject::release(); }
+    ::com::sun::star::uno::Any					SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException);
+    void										SAL_CALL acquire() throw()	{ OWeakObject::acquire(); }
+    void										SAL_CALL release() throw()	{ OWeakObject::release(); }
 
     // ::com::sun::star::lang::XEventListener
     void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw (::com::sun::star::uno::RuntimeException);
@@ -120,7 +120,7 @@ public:
     void SAL_CALL dropActionChanged( const ::com::sun::star::datatransfer::dnd::DropTargetDragEvent& dtde ) throw (::com::sun::star::uno::RuntimeException);
 };
 
-}}  // namespace vcl::unohelper
+}}	// namespace vcl::unohelper
 
 #endif  // _VCL_DNDHELP_HXX
 
diff --git a/vcl/inc/vcl/dndlcon.hxx b/vcl/inc/vcl/dndlcon.hxx
index 5a41a20e4271..cab391876033 100644
--- a/vcl/inc/vcl/dndlcon.hxx
+++ b/vcl/inc/vcl/dndlcon.hxx
@@ -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
@@ -37,8 +37,8 @@
 
 #include <vcl/unohelp2.hxx>
 
-class DNDListenerContainer :    public ::vcl::unohelper::MutexHelper,
-                                public ::cppu::WeakComponentImplHelper4<
+class DNDListenerContainer :    public ::vcl::unohelper::MutexHelper, 
+                                public ::cppu::WeakComponentImplHelper4< 
     ::com::sun::star::datatransfer::dnd::XDragGestureRecognizer, \
     ::com::sun::star::datatransfer::dnd::XDropTargetDragContext,
     ::com::sun::star::datatransfer::dnd::XDropTargetDropContext,
@@ -55,7 +55,7 @@ public:
     DNDListenerContainer( sal_Int8 nDefaultActions );
     virtual ~DNDListenerContainer();
 
-    sal_uInt32 fireDropEvent(
+    sal_uInt32 fireDropEvent( 
         const ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::dnd::XDropTargetDropContext >& context,
         sal_Int8 dropAction, sal_Int32 locationX, sal_Int32 locationY, sal_Int8 sourceActions,
         const ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::XTransferable >& transferable );
@@ -76,14 +76,14 @@ public:
         sal_Int8 dropAction, sal_Int32 locationX, sal_Int32 locationY, sal_Int8 sourceActions );
 
     sal_uInt32 fireDragGestureEvent(
-        sal_Int8 dragAction, sal_Int32 dragOriginX, sal_Int32 dragOriginY,
+        sal_Int8 dragAction, sal_Int32 dragOriginX, sal_Int32 dragOriginY, 
         const ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::dnd::XDragSource >& dragSource,
         const ::com::sun::star::uno::Any& triggerEvent );
 
     /*
      * XDragGestureRecognizer
      */
-
+     
     virtual void SAL_CALL addDragGestureListener( const ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::dnd::XDragGestureListener >& dgl ) throw(::com::sun::star::uno::RuntimeException);
     virtual void SAL_CALL removeDragGestureListener( const ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::dnd::XDragGestureListener >& dgl ) throw(::com::sun::star::uno::RuntimeException);
     virtual void SAL_CALL resetRecognizer(  ) throw(::com::sun::star::uno::RuntimeException);
@@ -107,7 +107,7 @@ public:
     /*
      * XDropTarget
      */
-
+     
     virtual void SAL_CALL addDropTargetListener( const ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::dnd::XDropTargetListener >& dtl ) throw(::com::sun::star::uno::RuntimeException);
     virtual void SAL_CALL removeDropTargetListener( const ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::dnd::XDropTargetListener >& dtl ) throw(::com::sun::star::uno::RuntimeException);
     virtual sal_Bool SAL_CALL isActive(  ) throw(::com::sun::star::uno::RuntimeException);
@@ -118,7 +118,7 @@ public:
 
 
 //==================================================================================================
-//
+// 
 //==================================================================================================
 
 #endif
diff --git a/vcl/inc/vcl/dockingarea.hxx b/vcl/inc/vcl/dockingarea.hxx
index 848ecac72770..92c4b2faaa52 100644
--- a/vcl/inc/vcl/dockingarea.hxx
+++ b/vcl/inc/vcl/dockingarea.hxx
@@ -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
@@ -32,7 +32,7 @@
 #include <vcl/window.hxx>
 
 // ------------------------------------------
-//  A simple container for docked toolbars
+//  A simple container for docked toolbars 
 //  - its main purpose is theming support
 // ------------------------------------------
 
diff --git a/vcl/inc/vcl/dockwin.hxx b/vcl/inc/vcl/dockwin.hxx
index 61464400d595..086c1b370446 100644
--- a/vcl/inc/vcl/dockwin.hxx
+++ b/vcl/inc/vcl/dockwin.hxx
@@ -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
@@ -87,30 +87,30 @@ class ImplDockingWindowWrapper
 private:
 
     // the original 'Docking'window
-    Window *mpDockingWindow;
+    Window *mpDockingWindow;  
 
     // the original DockingWindow members
     FloatingWindow* mpFloatWin;
-    Window*         mpOldBorderWin;
-    Window*         mpParent;
-    Point           maFloatPos;
-    Point           maDockPos;
-    Point           maMouseOff;
-    Point           maMouseStart;
-    Size            maRollUpOutSize;
-    Size            maMinOutSize;
-    Size            maMaxOutSize;
+    Window* 		mpOldBorderWin;
+    Window* 		mpParent;
+    Point			maFloatPos;
+    Point			maDockPos;
+    Point			maMouseOff;
+    Point			maMouseStart;
+    Size			maRollUpOutSize;
+    Size			maMinOutSize;
+    Size			maMaxOutSize;
     Rectangle       maDragArea;
-    long            mnTrackX;
-    long            mnTrackY;
-    long            mnTrackWidth;
-    long            mnTrackHeight;
-    sal_Int32       mnDockLeft;
-    sal_Int32       mnDockTop;
-    sal_Int32       mnDockRight;
-    sal_Int32       mnDockBottom;
-    WinBits         mnFloatBits;
-    BOOL            mbDockCanceled:1,
+    long			mnTrackX;
+    long			mnTrackY;
+    long			mnTrackWidth;
+    long			mnTrackHeight;
+    sal_Int32		mnDockLeft;
+    sal_Int32		mnDockTop;
+    sal_Int32		mnDockRight;
+    sal_Int32		mnDockBottom;
+    WinBits 		mnFloatBits;
+    BOOL			mbDockCanceled:1,
                     mbFloatPrevented:1,
                     mbDockable:1,
                     mbDocking:1,
@@ -125,7 +125,7 @@ private:
                     mbStartDockingEnabled:1,
                     mbLocked:1;
 
-    void            ImplInitData();
+    void			ImplInitData();
 
                     DECL_LINK( PopupModeEnd, void* );
     void            ImplEnableStartDocking( BOOL bEnable = TRUE )  { mbStartDockingEnabled = bEnable; }
@@ -139,11 +139,11 @@ public:
     BOOL            ImplStartDocking( const Point& rPos );
 
     // those methods actually call the corresponding handlers
-    void            StartDocking( const Point& rPos, Rectangle& rRect );
-    BOOL            Docking( const Point& rPos, Rectangle& rRect );
-    void            EndDocking( const Rectangle& rRect, BOOL bFloatMode );
-    BOOL            PrepareToggleFloatingMode();
-    void            ToggleFloatingMode();
+    void	        StartDocking( const Point& rPos, Rectangle& rRect );
+    BOOL	        Docking( const Point& rPos, Rectangle& rRect );
+    void	        EndDocking( const Rectangle& rRect, BOOL bFloatMode );
+    BOOL	        PrepareToggleFloatingMode();
+    void	        ToggleFloatingMode();
 
     void            SetDragArea( const Rectangle& rRect );
     Rectangle       GetDragArea() const;
@@ -155,60 +155,60 @@ public:
     void            StartPopupMode( ToolBox* pParentToolBox, ULONG nPopupModeFlags );
     BOOL            IsInPopupMode() const;
 
-    void            TitleButtonClick( USHORT nButton );
-    void            Pin();
-    void            Roll();
-    void            PopupModeEnd();
-    void            Resizing( Size& rSize );
-    BOOL            Close();
-    void            Tracking( const TrackingEvent& rTEvt );
-    long            Notify( NotifyEvent& rNEvt );
+    void	        TitleButtonClick( USHORT nButton );
+    void	        Pin();
+    void	        Roll();
+    void	        PopupModeEnd();
+    void	        Resizing( Size& rSize );
+    BOOL	        Close();
+    void	        Tracking( const TrackingEvent& rTEvt );
+    long	        Notify( NotifyEvent& rNEvt );
 
-    void            ShowTitleButton( USHORT nButton, BOOL bVisible = TRUE );
-    BOOL            IsTitleButtonVisible( USHORT nButton ) const;
+    void			ShowTitleButton( USHORT nButton, BOOL bVisible = TRUE );
+    BOOL			IsTitleButtonVisible( USHORT nButton ) const;
 
-    void            SetPin( BOOL bPin );
-    BOOL            IsPined() const;
+    void			SetPin( BOOL bPin );
+    BOOL			IsPined() const;
 
-    void            RollUp();
-    void            RollDown();
-    BOOL            IsRollUp() const;
+    void			RollUp();
+    void			RollDown();
+    BOOL			IsRollUp() const;
 
-    void            SetRollUpOutputSizePixel( const Size& rSize );
-    Size            GetRollUpOutputSizePixel() const;
+    void			SetRollUpOutputSizePixel( const Size& rSize );
+    Size			GetRollUpOutputSizePixel() const;
 
-    void            SetMinOutputSizePixel( const Size& rSize );
-    const Size&     GetMinOutputSizePixel() const;
+    void			SetMinOutputSizePixel( const Size& rSize );
+    const Size& 	GetMinOutputSizePixel() const;
 
-    void            SetMaxOutputSizePixel( const Size& rSize );
-    const Size&     GetMaxOutputSizePixel() const;
+    void			SetMaxOutputSizePixel( const Size& rSize );
+    const Size& 	GetMaxOutputSizePixel() const;
 
-    BOOL            IsDocking() const { return mbDocking; }
-    BOOL            IsDockable() const { return mbDockable; }
-    BOOL            IsDockingCanceled() const { return mbDockCanceled; }
-    BOOL            IsFloatingPrevented() const { return mbFloatPrevented; }
+    BOOL			IsDocking() const { return mbDocking; }
+    BOOL			IsDockable() const { return mbDockable; }
+    BOOL			IsDockingCanceled() const { return mbDockCanceled; }
+    BOOL			IsFloatingPrevented() const { return mbFloatPrevented; }
 
-    void            SetFloatingMode( BOOL bFloatMode = FALSE );
-    BOOL            IsFloatingMode() const;
+    void			SetFloatingMode( BOOL bFloatMode = FALSE );
+    BOOL			IsFloatingMode() const;
     FloatingWindow* GetFloatingWindow() const { return mpFloatWin; }
 
-    void            SetFloatingPos( const Point& rNewPos );
-    Point           GetFloatingPos() const;
+    void			SetFloatingPos( const Point& rNewPos );
+    Point			GetFloatingPos() const;
 
-    void            SetFloatStyle( WinBits nWinStyle );
-    WinBits         GetFloatStyle() const;
-    void            SetTabStop();
+    void			SetFloatStyle( WinBits nWinStyle );
+    WinBits 		GetFloatStyle() const;
+    void			SetTabStop();
 
-    virtual void    SetPosSizePixel( long nX, long nY,
+    virtual void	SetPosSizePixel( long nX, long nY,
                                      long nWidth, long nHeight,
                                      USHORT nFlags = WINDOW_POSSIZE_ALL );
-    void            SetPosSizePixel( const Point& rNewPos,
+    void			SetPosSizePixel( const Point& rNewPos,
                                      const Size& rNewSize )
                         { mpDockingWindow->SetPosSizePixel( rNewPos, rNewSize ); }
-    Point           GetPosPixel() const;
-    Size            GetSizePixel() const;
-    void            SetOutputSizePixel( const Size& rNewSize );
-    Size            GetOutputSizePixel() const;
+    Point			GetPosPixel() const;
+    Size			GetSizePixel() const;
+    void			SetOutputSizePixel( const Size& rNewSize );
+    Size			GetOutputSizePixel() const;
 };
 
 class VCL_DLLPUBLIC DockingManager
@@ -237,11 +237,11 @@ public:
     void    StartPopupMode( ToolBox *pParentToolBox, const Window *pWin, ULONG nPopupModeFlags );
 
     BOOL    IsInPopupMode( const Window *pWin );
-    void    EndPopupMode( const Window *pWin );
+    void	EndPopupMode( const Window *pWin );
 
     // required because those methods are not virtual in Window (!!!) and must
     // be availbale from the toolkit
-    void        SetPosSizePixel( Window *pWin, long nX, long nY,
+    void	    SetPosSizePixel( Window *pWin, long nX, long nY,
                                 long nWidth, long nHeight,
                                 USHORT nFlags = WINDOW_POSSIZE_ALL );
     Rectangle   GetPosSizePixel( const Window *pWin );
@@ -256,24 +256,24 @@ class VCL_DLLPUBLIC DockingWindow : public Window
     class   ImplData;
 private:
     FloatingWindow* mpFloatWin;
-    Window*         mpOldBorderWin;
+    Window* 		mpOldBorderWin;
     ImplData*       mpImplData;
-    Point           maFloatPos;
-    Point           maDockPos;
-    Point           maMouseOff;
-    Point           maMouseStart;
-    Size            maRollUpOutSize;
-    Size            maMinOutSize;
-    long            mnTrackX;
-    long            mnTrackY;
-    long            mnTrackWidth;
-    long            mnTrackHeight;
-    sal_Int32           mnDockLeft;
-    sal_Int32           mnDockTop;
-    sal_Int32           mnDockRight;
-    sal_Int32           mnDockBottom;
-    WinBits         mnFloatBits;
-    BOOL            mbDockCanceled:1,
+    Point			maFloatPos;
+    Point			maDockPos;
+    Point			maMouseOff;
+    Point			maMouseStart;
+    Size			maRollUpOutSize;
+    Size			maMinOutSize;
+    long			mnTrackX;
+    long			mnTrackY;
+    long			mnTrackWidth;
+    long			mnTrackHeight;
+    sal_Int32			mnDockLeft;
+    sal_Int32			mnDockTop;
+    sal_Int32			mnDockRight;
+    sal_Int32			mnDockBottom;
+    WinBits 		mnFloatBits;
+    BOOL			mbDockCanceled:1,
                     mbDockPrevented:1,
                     mbFloatPrevented:1,
                     mbDockable:1,
@@ -312,69 +312,69 @@ public:
                     DockingWindow( Window* pParent, const ResId& rResId );
                     ~DockingWindow();
 
-    virtual void    StartDocking();
-    virtual BOOL    Docking( const Point& rPos, Rectangle& rRect );
-    virtual void    EndDocking( const Rectangle& rRect, BOOL bFloatMode );
-    virtual BOOL    PrepareToggleFloatingMode();
-    virtual void    ToggleFloatingMode();
-
-    virtual void    TitleButtonClick( USHORT nButton );
-    virtual void    Pin();
-    virtual void    Roll();
-    virtual void    PopupModeEnd();
-    virtual void    Resizing( Size& rSize );
-    virtual BOOL    Close();
-    virtual void    Tracking( const TrackingEvent& rTEvt );
-    virtual long    Notify( NotifyEvent& rNEvt );
-    virtual void    StateChanged( StateChangedType nType );
-    virtual void    DataChanged( const DataChangedEvent& rDCEvt );
-
-    void            ShowTitleButton( USHORT nButton, BOOL bVisible = TRUE );
-    BOOL            IsTitleButtonVisible( USHORT nButton ) const;
-
-    void            SetPin( BOOL bPin );
-    BOOL            IsPined() const;
-
-    void            RollUp();
-    void            RollDown();
-    BOOL            IsRollUp() const;
-
-    void            SetRollUpOutputSizePixel( const Size& rSize );
-    Size            GetRollUpOutputSizePixel() const;
-
-    void            SetMinOutputSizePixel( const Size& rSize );
-    const Size&     GetMinOutputSizePixel() const;
-
-    void            SetMaxOutputSizePixel( const Size& rSize );
-    const Size&     GetMaxOutputSizePixel() const;
-
-    BOOL            IsDocking() const { return mbDocking; }
-    BOOL            IsDockable() const { return mbDockable; }
-    BOOL            IsDockingCanceled() const { return mbDockCanceled; }
-    BOOL            IsDockingPrevented() const { return mbDockPrevented; }
-    BOOL            IsFloatingPrevented() const { return mbFloatPrevented; }
-
-    void            SetFloatingMode( BOOL bFloatMode = FALSE );
-    BOOL            IsFloatingMode() const;
+    virtual void	StartDocking();
+    virtual BOOL	Docking( const Point& rPos, Rectangle& rRect );
+    virtual void	EndDocking( const Rectangle& rRect, BOOL bFloatMode );
+    virtual BOOL	PrepareToggleFloatingMode();
+    virtual void	ToggleFloatingMode();
+
+    virtual void	TitleButtonClick( USHORT nButton );
+    virtual void	Pin();
+    virtual void	Roll();
+    virtual void	PopupModeEnd();
+    virtual void	Resizing( Size& rSize );
+    virtual BOOL	Close();
+    virtual void	Tracking( const TrackingEvent& rTEvt );
+    virtual long	Notify( NotifyEvent& rNEvt );
+    virtual void	StateChanged( StateChangedType nType );
+    virtual void	DataChanged( const DataChangedEvent& rDCEvt );
+
+    void			ShowTitleButton( USHORT nButton, BOOL bVisible = TRUE );
+    BOOL			IsTitleButtonVisible( USHORT nButton ) const;
+
+    void			SetPin( BOOL bPin );
+    BOOL			IsPined() const;
+
+    void			RollUp();
+    void			RollDown();
+    BOOL			IsRollUp() const;
+
+    void			SetRollUpOutputSizePixel( const Size& rSize );
+    Size			GetRollUpOutputSizePixel() const;
+
+    void			SetMinOutputSizePixel( const Size& rSize );
+    const Size& 	GetMinOutputSizePixel() const;
+
+    void			SetMaxOutputSizePixel( const Size& rSize );
+    const Size& 	GetMaxOutputSizePixel() const;
+
+    BOOL			IsDocking() const { return mbDocking; }
+    BOOL			IsDockable() const { return mbDockable; }
+    BOOL			IsDockingCanceled() const { return mbDockCanceled; }
+    BOOL			IsDockingPrevented() const { return mbDockPrevented; }
+    BOOL			IsFloatingPrevented() const { return mbFloatPrevented; }
+
+    void			SetFloatingMode( BOOL bFloatMode = FALSE );
+    BOOL			IsFloatingMode() const;
     FloatingWindow* GetFloatingWindow() const { return mpFloatWin; }
 
-    void            SetFloatingPos( const Point& rNewPos );
-    Point           GetFloatingPos() const;
+    void			SetFloatingPos( const Point& rNewPos );
+    Point			GetFloatingPos() const;
 
-    void            SetFloatStyle( WinBits nWinStyle );
-    WinBits         GetFloatStyle() const;
-    void            SetTabStop();
+    void			SetFloatStyle( WinBits nWinStyle );
+    WinBits 		GetFloatStyle() const;
+    void			SetTabStop();
 
-    virtual void    SetPosSizePixel( long nX, long nY,
+    virtual void	SetPosSizePixel( long nX, long nY,
                                      long nWidth, long nHeight,
                                      USHORT nFlags = WINDOW_POSSIZE_ALL );
-    void            SetPosSizePixel( const Point& rNewPos,
+    void			SetPosSizePixel( const Point& rNewPos,
                                      const Size& rNewSize )
                         { Window::SetPosSizePixel( rNewPos, rNewSize ); }
-    Point           GetPosPixel() const;
-    Size            GetSizePixel() const;
-    void            SetOutputSizePixel( const Size& rNewSize );
-    Size            GetOutputSizePixel() const;
+    Point			GetPosPixel() const;
+    Size			GetSizePixel() const;
+    void			SetOutputSizePixel( const Size& rNewSize );
+    Size			GetOutputSizePixel() const;
 };
 
 inline void DockingWindow::SetPin( BOOL bPin )
@@ -449,4 +449,4 @@ inline void DockingWindow::SetFloatingPos( const Point& rNewPos )
 }
 
 
-#endif  // _SV_DOCKWIN_HXX
+#endif	// _SV_DOCKWIN_HXX
diff --git a/vcl/inc/vcl/edit.hxx b/vcl/inc/vcl/edit.hxx
index a40de9503367..1b50a74ae4f5 100644
--- a/vcl/inc/vcl/edit.hxx
+++ b/vcl/inc/vcl/edit.hxx
@@ -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
@@ -52,8 +52,8 @@ struct Impl_IMEInfos;
 // - Edit-Types -
 // --------------
 
-#define EDIT_NOLIMIT                STRING_LEN
-#define EDIT_UPDATEDATA_TIMEOUT     350
+#define EDIT_NOLIMIT				STRING_LEN
+#define EDIT_UPDATEDATA_TIMEOUT 	350
 
 typedef XubString (*FncGetSpecialChars)( Window* pWin, const Font& rFont );
 
@@ -67,20 +67,20 @@ class VCL_DLLPUBLIC Edit : public Control, public vcl::unohelper::DragAndDropCli
 {
 private:
     Edit*               mpSubEdit;
-    Timer*              mpUpdateDataTimer;
-    DDInfo*             mpDDInfo;
-    Impl_IMEInfos*      mpIMEInfos;
-    XubString           maText;
-    XubString           maSaveValue;
-    XubString           maUndoText;
-    XubString           maRedoText;
-    long                mnXOffset;
-    Selection           maSelection;
-    USHORT              mnAlign;
-    xub_StrLen          mnMaxTextLen;
-    AutocompleteAction  meAutocompleteAction;
-    xub_Unicode         mcEchoChar;
-    BOOL                mbModified:1,
+    Timer*				mpUpdateDataTimer;
+    DDInfo* 			mpDDInfo;
+    Impl_IMEInfos*		mpIMEInfos;
+    XubString			maText;
+    XubString			maSaveValue;
+    XubString			maUndoText;
+    XubString			maRedoText;
+    long				mnXOffset;
+    Selection			maSelection;
+    USHORT				mnAlign;
+    xub_StrLen			mnMaxTextLen;
+    AutocompleteAction	meAutocompleteAction;
+    xub_Unicode 		mcEchoChar;
+    BOOL				mbModified:1,
                         mbInternModified:1,
                         mbReadOnly:1,
                         mbInsertMode:1,
@@ -88,9 +88,9 @@ private:
                         mbIsSubEdit:1,
                         mbInMBDown:1,
                         mbActivePopup:1;
-    Link                maModifyHdl;
-    Link                maUpdateDataHdl;
-    Link                maAutocompleteHdl;
+    Link				maModifyHdl;
+    Link				maUpdateDataHdl;
+    Link				maAutocompleteHdl;
 
     DECL_DLLPRIVATE_LINK(      ImplUpdateDataHdl, Timer* );
 
@@ -110,7 +110,7 @@ private:
     SAL_DLLPRIVATE void        ImplAlignAndPaint();
     SAL_DLLPRIVATE xub_StrLen  ImplGetCharPos( const Point& rWindowPos ) const;
     SAL_DLLPRIVATE void        ImplSetCursorPos( xub_StrLen nChar, BOOL bSelect );
-    SAL_DLLPRIVATE void        ImplShowDDCursor();
+    SAL_DLLPRIVATE void	       ImplShowDDCursor();
     SAL_DLLPRIVATE void        ImplHideDDCursor();
     SAL_DLLPRIVATE BOOL        ImplHandleKeyEvent( const KeyEvent& rKEvt );
     SAL_DLLPRIVATE void        ImplCopyToSelectionClipboard();
@@ -159,91 +159,91 @@ public:
                         Edit( Window* pParent, const ResId& rResId, bool bDisableAccessibleLabeledByRelation );
                         virtual ~Edit();
 
-    virtual void        MouseButtonDown( const MouseEvent& rMEvt );
-    virtual void        MouseButtonUp( const MouseEvent& rMEvt );
-    virtual void        KeyInput( const KeyEvent& rKEvt );
-    virtual void        Paint( const Rectangle& rRect );
-    virtual void        Resize();
-    virtual void        Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, ULONG nFlags );
-    virtual void        GetFocus();
-    virtual void        LoseFocus();
-    virtual void        Tracking( const TrackingEvent& rTEvt );
-    virtual void        Command( const CommandEvent& rCEvt );
-    virtual void        StateChanged( StateChangedType nType );
-    virtual void        DataChanged( const DataChangedEvent& rDCEvt );
+    virtual void		MouseButtonDown( const MouseEvent& rMEvt );
+    virtual void		MouseButtonUp( const MouseEvent& rMEvt );
+    virtual void		KeyInput( const KeyEvent& rKEvt );
+    virtual void		Paint( const Rectangle& rRect );
+    virtual void		Resize();
+    virtual void		Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, ULONG nFlags );
+    virtual void		GetFocus();
+    virtual void		LoseFocus();
+    virtual void		Tracking( const TrackingEvent& rTEvt );
+    virtual void		Command( const CommandEvent& rCEvt );
+    virtual void		StateChanged( StateChangedType nType );
+    virtual void		DataChanged( const DataChangedEvent& rDCEvt );
     virtual Window*     GetPreferredKeyInputWindow();
 
-    virtual void        Modify();
-    virtual void        UpdateData();
+    virtual void		Modify();
+    virtual void		UpdateData();
 
-    static BOOL         IsCharInput( const KeyEvent& rKEvt );
+    static BOOL 		IsCharInput( const KeyEvent& rKEvt );
 
-    virtual void        SetModifyFlag();
-    virtual void        ClearModifyFlag();
-    virtual BOOL        IsModified() const { return mpSubEdit ? mpSubEdit->mbModified : mbModified; }
+    virtual void		SetModifyFlag();
+    virtual void		ClearModifyFlag();
+    virtual BOOL		IsModified() const { return mpSubEdit ? mpSubEdit->mbModified : mbModified; }
 
-    virtual void        EnableUpdateData( ULONG nTimeout = EDIT_UPDATEDATA_TIMEOUT );
-    virtual void        DisableUpdateData() { delete mpUpdateDataTimer; mpUpdateDataTimer = NULL; }
-    virtual ULONG       IsUpdateDataEnabled() const;
+    virtual void		EnableUpdateData( ULONG nTimeout = EDIT_UPDATEDATA_TIMEOUT );
+    virtual void		DisableUpdateData() { delete mpUpdateDataTimer; mpUpdateDataTimer = NULL; }
+    virtual ULONG		IsUpdateDataEnabled() const;
 
-    void                SetEchoChar( xub_Unicode c );
-    xub_Unicode         GetEchoChar() const { return mcEchoChar; }
+    void				SetEchoChar( xub_Unicode c );
+    xub_Unicode 		GetEchoChar() const { return mcEchoChar; }
 
-    virtual void        SetReadOnly( BOOL bReadOnly = TRUE );
-    virtual BOOL        IsReadOnly() const { return mbReadOnly; }
+    virtual void		SetReadOnly( BOOL bReadOnly = TRUE );
+    virtual BOOL		IsReadOnly() const { return mbReadOnly; }
 
-    void                SetInsertMode( BOOL bInsert );
-    BOOL                IsInsertMode() const;
+    void				SetInsertMode( BOOL bInsert );
+    BOOL				IsInsertMode() const;
 
-    virtual void        SetMaxTextLen( xub_StrLen nMaxLen = EDIT_NOLIMIT );
-    virtual xub_StrLen  GetMaxTextLen() const { return mnMaxTextLen; }
+    virtual void		SetMaxTextLen( xub_StrLen nMaxLen = EDIT_NOLIMIT );
+    virtual xub_StrLen	GetMaxTextLen() const { return mnMaxTextLen; }
 
-    virtual void        SetSelection( const Selection& rSelection );
-    virtual const Selection&    GetSelection() const;
+    virtual void		SetSelection( const Selection& rSelection );
+    virtual const Selection&	GetSelection() const;
 
-    virtual void        ReplaceSelected( const XubString& rStr );
-    virtual void        DeleteSelected();
-    virtual XubString   GetSelected() const;
+    virtual void		ReplaceSelected( const XubString& rStr );
+    virtual void		DeleteSelected();
+    virtual XubString	GetSelected() const;
 
-    virtual void        Cut();
-    virtual void        Copy();
-    virtual void        Paste();
-    void                Undo();
+    virtual void		Cut();
+    virtual void		Copy();
+    virtual void		Paste();
+    void				Undo();
 
-    virtual void        SetText( const XubString& rStr );
-    virtual void        SetText( const XubString& rStr, const Selection& rNewSelection );
-    virtual XubString   GetText() const;
+    virtual void		SetText( const XubString& rStr );
+    virtual void		SetText( const XubString& rStr, const Selection& rNewSelection );
+    virtual XubString	GetText() const;
 
-    void                SaveValue() { maSaveValue = GetText(); }
-    const XubString&    GetSavedValue() const { return maSaveValue; }
+    void				SaveValue() { maSaveValue = GetText(); }
+    const XubString&	GetSavedValue() const { return maSaveValue; }
 
-    virtual void        SetModifyHdl( const Link& rLink ) { maModifyHdl = rLink; }
-    virtual const Link& GetModifyHdl() const { return maModifyHdl; }
-    virtual void        SetUpdateDataHdl( const Link& rLink ) { maUpdateDataHdl = rLink; }
+    virtual void		SetModifyHdl( const Link& rLink ) { maModifyHdl = rLink; }
+    virtual const Link&	GetModifyHdl() const { return maModifyHdl; }
+    virtual void		SetUpdateDataHdl( const Link& rLink ) { maUpdateDataHdl = rLink; }
     virtual const Link& GetUpdateDataHdl() const { return maUpdateDataHdl; }
 
-    void                SetSubEdit( Edit* pEdit );
-    Edit*               GetSubEdit() const { return mpSubEdit; }
+    void				SetSubEdit( Edit* pEdit );
+    Edit*				GetSubEdit() const { return mpSubEdit; }
 
-    void                SetAutocompleteHdl( const Link& rHdl );
-    const Link&         GetAutocompleteHdl() const { return maAutocompleteHdl; }
-    AutocompleteAction  GetAutocompleteAction() const { return meAutocompleteAction; }
+    void				SetAutocompleteHdl( const Link& rHdl );
+    const Link& 		GetAutocompleteHdl() const { return maAutocompleteHdl; }
+    AutocompleteAction	GetAutocompleteAction() const { return meAutocompleteAction; }
 
-    virtual Size        CalcMinimumSize() const;
+    virtual Size		CalcMinimumSize() const;
     virtual Size        GetOptimalSize(WindowSizeType eType) const;
-    virtual Size        CalcSize( USHORT nChars ) const;
-    virtual xub_StrLen  GetMaxVisChars() const;
+    virtual Size		CalcSize( USHORT nChars ) const;
+    virtual xub_StrLen	GetMaxVisChars() const;
 
     xub_StrLen          GetCharPos( const Point& rWindowPos ) const;
-
+    
     // shows a warning box saying "text too long, truncated"
     static void         ShowTruncationWarning( Window* pParent );
 
-    static void                 SetGetSpecialCharsFunction( FncGetSpecialChars fn );
-    static FncGetSpecialChars   GetGetSpecialCharsFunction();
+    static void 				SetGetSpecialCharsFunction( FncGetSpecialChars fn );
+    static FncGetSpecialChars	GetGetSpecialCharsFunction();
 
-    static PopupMenu*   CreatePopupMenu();
-    static void         DeletePopupMenu( PopupMenu* pMenu );
+    static PopupMenu*	CreatePopupMenu();
+    static void 		DeletePopupMenu( PopupMenu* pMenu );
 
     virtual XubString GetSurroundingText() const;
     virtual Selection GetSurroundingTextSelection() const;
@@ -257,4 +257,4 @@ inline ULONG Edit::IsUpdateDataEnabled() const
         return FALSE;
 }
 
-#endif  // _SV_EDIT_HXX
+#endif	// _SV_EDIT_HXX
diff --git a/vcl/inc/vcl/event.hxx b/vcl/inc/vcl/event.hxx
index 9458a4298c33..3a69a37847a1 100644
--- a/vcl/inc/vcl/event.hxx
+++ b/vcl/inc/vcl/event.hxx
@@ -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
@@ -47,7 +47,7 @@ namespace com { namespace sun { namespace star { namespace awt {
 enum TextDirectionality {
     TextDirectionality_LeftToRight_TopToBottom,
     TextDirectionality_RightToLeft_TopToBottom,
-    TextDirectionality_TopToBottom_RightToLeft
+    TextDirectionality_TopToBottom_RightToLeft 
 };
 
 // ------------
@@ -218,7 +218,7 @@ public:
     const Point&    GetMousePosPixel() const;
     USHORT          GetMode() const { return mnMode; }
     BOOL            KeyboardActivated() const { return mbKeyboardActivated; }
-    void            SetKeyboardActivated( BOOL bKeyboard ) { mbKeyboardActivated = bKeyboard; }
+    void			SetKeyboardActivated( BOOL bKeyboard ) { mbKeyboardActivated = bKeyboard; }
 };
 
 inline HelpEvent::HelpEvent()
diff --git a/vcl/inc/vcl/evntpost.hxx b/vcl/inc/vcl/evntpost.hxx
index 9e9badb7157b..6b58a61d2fe1 100644
--- a/vcl/inc/vcl/evntpost.hxx
+++ b/vcl/inc/vcl/evntpost.hxx
@@ -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
@@ -45,7 +45,7 @@ namespace vcl
         ULONG           m_nId;
         Link            m_aLink;
 
-//#if 0 // _SOLAR__PRIVATE
+//#if 0 // _SOLAR__PRIVATE 
         DECL_DLLPRIVATE_LINK( DoEvent_Impl, UserEvent* );
 //#endif
 
diff --git a/vcl/inc/vcl/extoutdevdata.hxx b/vcl/inc/vcl/extoutdevdata.hxx
index cfe7b74533d8..2606ca9581e5 100644
--- a/vcl/inc/vcl/extoutdevdata.hxx
+++ b/vcl/inc/vcl/extoutdevdata.hxx
@@ -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
diff --git a/vcl/inc/vcl/field.hxx b/vcl/inc/vcl/field.hxx
index e1f39cc78966..ceed2244866e 100644
--- a/vcl/inc/vcl/field.hxx
+++ b/vcl/inc/vcl/field.hxx
@@ -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
@@ -208,10 +208,10 @@ public:
 
     void                    SetUseThousandSep( BOOL b );
     BOOL                    IsUseThousandSep() const { return mbThousandSep; }
-
+    
     void                    SetShowTrailingZeros( BOOL bShowTrailingZeros );
     BOOL                    IsShowTrailingZeros() const { return mbShowTrailingZeros; }
-
+    
 
     void                    SetUserValue( sal_Int64 nNewValue );
     virtual void            SetValue( sal_Int64 nNewValue );
@@ -255,7 +255,7 @@ public:
     virtual void            CustomConvert() = 0;
     virtual void            Reformat();
 
-    void                    SetUnit( FieldUnit meUnit );
+    virtual void            SetUnit( FieldUnit meUnit );
     FieldUnit               GetUnit() const { return meUnit; }
     void                    SetCustomUnitText( const XubString& rStr );
     const XubString&        GetCustomUnitText() const { return maCustomUnitText; }
@@ -569,6 +569,8 @@ public:
     virtual void            Last();
     virtual void            CustomConvert();
 
+    virtual void            SetUnit( FieldUnit meUnit );
+
     void                    SetFirst( sal_Int64 nNewFirst, FieldUnit eInUnit );
     inline void             SetFirst(sal_Int64 first) { SetFirst(first, FUNIT_NONE); }
     sal_Int64               GetFirst( FieldUnit eOutUnit ) const;
@@ -595,7 +597,7 @@ public:
                                                 FieldUnit eInUnit, MapUnit eOutUnit );
     static double           ConvertDoubleValue( double nValue, USHORT nDecDigits,
                                                 MapUnit eInUnit, FieldUnit eOutUnit );
-
+                                                
     // for backwards compatibility
     // caution: conversion to double loses precision
     static double           ConvertDoubleValue( sal_Int64 nValue, sal_Int64 nBaseValue, USHORT nDecDigits,
diff --git a/vcl/inc/vcl/fixbrd.hxx b/vcl/inc/vcl/fixbrd.hxx
index 2bf0d8e1cb31..287c08a9c3c9 100644
--- a/vcl/inc/vcl/fixbrd.hxx
+++ b/vcl/inc/vcl/fixbrd.hxx
@@ -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
@@ -37,11 +37,11 @@
 // - FixedBorder-Types -
 // ---------------------
 
-#define FIXEDBORDER_TYPE_IN                     (FRAME_DRAW_IN)
-#define FIXEDBORDER_TYPE_OUT                    (FRAME_DRAW_OUT)
-#define FIXEDBORDER_TYPE_GROUP                  (FRAME_DRAW_GROUP)
-#define FIXEDBORDER_TYPE_DOUBLEIN               (FRAME_DRAW_DOUBLEIN)
-#define FIXEDBORDER_TYPE_DOUBLEOUT              (FRAME_DRAW_DOUBLEOUT)
+#define FIXEDBORDER_TYPE_IN 					(FRAME_DRAW_IN)
+#define FIXEDBORDER_TYPE_OUT					(FRAME_DRAW_OUT)
+#define FIXEDBORDER_TYPE_GROUP					(FRAME_DRAW_GROUP)
+#define FIXEDBORDER_TYPE_DOUBLEIN				(FRAME_DRAW_DOUBLEIN)
+#define FIXEDBORDER_TYPE_DOUBLEOUT				(FRAME_DRAW_DOUBLEOUT)
 
 // ---------------
 // - FixedBorder -
@@ -50,16 +50,16 @@
 class VCL_DLLPUBLIC FixedBorder : public Control
 {
 private:
-    USHORT          mnType;
-    BOOL            mbTransparent;
+    USHORT			mnType;
+    BOOL			mbTransparent;
 
 private:
     using Control::ImplInitSettings;
     using Window::ImplInit;
     SAL_DLLPRIVATE void    ImplInit( Window* pParent, WinBits nStyle );
     SAL_DLLPRIVATE WinBits ImplInitStyle( WinBits nStyle );
-    SAL_DLLPRIVATE void    ImplInitSettings();
-    SAL_DLLPRIVATE void    ImplDraw( OutputDevice* pDev, ULONG nDrawFlags,
+    SAL_DLLPRIVATE void	   ImplInitSettings();
+    SAL_DLLPRIVATE void	   ImplDraw( OutputDevice* pDev, ULONG nDrawFlags,
                               const Point& rPos, const Size& rSize );
 
 public:
@@ -67,16 +67,16 @@ public:
                     FixedBorder( Window* pParent, const ResId& rResId );
                     ~FixedBorder();
 
-    virtual void    Paint( const Rectangle& rRect );
-    virtual void    Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, ULONG nFlags );
-    virtual void    Resize();
-    virtual void    StateChanged( StateChangedType nType );
-    virtual void    DataChanged( const DataChangedEvent& rDCEvt );
+    virtual void	Paint( const Rectangle& rRect );
+    virtual void	Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, ULONG nFlags );
+    virtual void	Resize();
+    virtual void	StateChanged( StateChangedType nType );
+    virtual void	DataChanged( const DataChangedEvent& rDCEvt );
 
-    void            SetTransparent( BOOL bTransparent );
-    BOOL            IsTransparent() const { return mbTransparent; }
-    void            SetBorderType( USHORT nType );
-    USHORT          GetBorderType() const { return mnType; }
+    void			SetTransparent( BOOL bTransparent );
+    BOOL			IsTransparent() const { return mbTransparent; }
+    void			SetBorderType( USHORT nType );
+    USHORT			GetBorderType() const { return mnType; }
 };
 
-#endif  // _SV_FIXBRD_HXX
+#endif	// _SV_FIXBRD_HXX
diff --git a/vcl/inc/vcl/fixed.hxx b/vcl/inc/vcl/fixed.hxx
index 4460694420a0..c8f6376771c5 100644
--- a/vcl/inc/vcl/fixed.hxx
+++ b/vcl/inc/vcl/fixed.hxx
@@ -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
@@ -92,7 +92,7 @@ private:
     SAL_DLLPRIVATE void    ImplDraw( bool bLayout = false );
 
 protected:
-    virtual void    FillLayoutData() const;
+    virtual void	FillLayoutData() const;
     virtual const Font&
                     GetCanonicalFont( const StyleSettings& _rStyle ) const;
     virtual const Color&
diff --git a/vcl/inc/vcl/fldunit.hxx b/vcl/inc/vcl/fldunit.hxx
index aa76f34332d6..e22216173850 100644
--- a/vcl/inc/vcl/fldunit.hxx
+++ b/vcl/inc/vcl/fldunit.hxx
@@ -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
diff --git a/vcl/inc/vcl/floatwin.hxx b/vcl/inc/vcl/floatwin.hxx
index 8b7c9be6499c..51f1953499d5 100644
--- a/vcl/inc/vcl/floatwin.hxx
+++ b/vcl/inc/vcl/floatwin.hxx
@@ -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
@@ -39,33 +39,34 @@ class PopupModeEvent;
 // - FloatingWindow-Types -
 // ------------------------
 
-#define FLOATWIN_POPUPMODE_ALLOWTEAROFF         ((ULONG)0x00000001)
-#define FLOATWIN_POPUPMODE_ANIMATIONSLIDE       ((ULONG)0x00000002)
-#define FLOATWIN_POPUPMODE_NOAUTOARRANGE        ((ULONG)0x00000004)
-#define FLOATWIN_POPUPMODE_NOANIMATION          ((ULONG)0x00000008)
-#define FLOATWIN_POPUPMODE_DOWN                 ((ULONG)0x00000010)
-#define FLOATWIN_POPUPMODE_UP                   ((ULONG)0x00000020)
-#define FLOATWIN_POPUPMODE_LEFT                 ((ULONG)0x00000040)
-#define FLOATWIN_POPUPMODE_RIGHT                ((ULONG)0x00000080)
-#define FLOATWIN_POPUPMODE_NOFOCUSCLOSE         ((ULONG)0x00000100)
-#define FLOATWIN_POPUPMODE_NOKEYCLOSE           ((ULONG)0x00000200)
-#define FLOATWIN_POPUPMODE_NOMOUSECLOSE         ((ULONG)0x00000400)
-#define FLOATWIN_POPUPMODE_NOMOUSERECTCLOSE     ((ULONG)0x00000800)
-#define FLOATWIN_POPUPMODE_ALLMOUSEBUTTONCLOSE  ((ULONG)0x00001000)
-#define FLOATWIN_POPUPMODE_NOAPPFOCUSCLOSE      ((ULONG)0x00002000)
+#define FLOATWIN_POPUPMODE_ALLOWTEAROFF 		((ULONG)0x00000001)
+#define FLOATWIN_POPUPMODE_ANIMATIONSLIDE		((ULONG)0x00000002)
+#define FLOATWIN_POPUPMODE_NOAUTOARRANGE		((ULONG)0x00000004)
+#define FLOATWIN_POPUPMODE_NOANIMATION			((ULONG)0x00000008)
+#define FLOATWIN_POPUPMODE_DOWN 				((ULONG)0x00000010)
+#define FLOATWIN_POPUPMODE_UP					((ULONG)0x00000020)
+#define FLOATWIN_POPUPMODE_LEFT 				((ULONG)0x00000040)
+#define FLOATWIN_POPUPMODE_RIGHT				((ULONG)0x00000080)
+#define FLOATWIN_POPUPMODE_NOFOCUSCLOSE 		((ULONG)0x00000100)
+#define FLOATWIN_POPUPMODE_NOKEYCLOSE			((ULONG)0x00000200)
+#define FLOATWIN_POPUPMODE_NOMOUSECLOSE 		((ULONG)0x00000400)
+#define FLOATWIN_POPUPMODE_NOMOUSERECTCLOSE 	((ULONG)0x00000800)
+#define FLOATWIN_POPUPMODE_ALLMOUSEBUTTONCLOSE	((ULONG)0x00001000)
+#define FLOATWIN_POPUPMODE_NOAPPFOCUSCLOSE		((ULONG)0x00002000)
 #define FLOATWIN_POPUPMODE_PATHMOUSECANCELCLICK ((ULONG)0x00004000)
-#define FLOATWIN_POPUPMODE_NEWLEVEL             ((ULONG)0x00008000)
-#define FLOATWIN_POPUPMODE_NOMOUSEUPCLOSE       ((ULONG)0x00010000)
-#define FLOATWIN_POPUPMODE_GRABFOCUS            ((ULONG)0x00020000)
+#define FLOATWIN_POPUPMODE_NEWLEVEL 			((ULONG)0x00008000)
+#define FLOATWIN_POPUPMODE_NOMOUSEUPCLOSE		((ULONG)0x00010000)
+#define FLOATWIN_POPUPMODE_GRABFOCUS        	((ULONG)0x00020000)
 
-#define FLOATWIN_POPUPMODEEND_CANCEL            ((USHORT)0x0001)
-#define FLOATWIN_POPUPMODEEND_TEAROFF           ((USHORT)0x0002)
-#define FLOATWIN_POPUPMODEEND_DONTCALLHDL       ((USHORT)0x0004)
-#define FLOATWIN_POPUPMODEEND_CLOSEALL          ((USHORT)0x0008)
+#define FLOATWIN_POPUPMODEEND_CANCEL			((USHORT)0x0001)
+#define FLOATWIN_POPUPMODEEND_TEAROFF			((USHORT)0x0002)
+#define FLOATWIN_POPUPMODEEND_DONTCALLHDL		((USHORT)0x0004)
+#define FLOATWIN_POPUPMODEEND_CLOSEALL			((USHORT)0x0008)
 
-#define FLOATWIN_TITLE_NORMAL                   ((USHORT)0x0001)
-#define FLOATWIN_TITLE_TEAROFF                  ((USHORT)0x0002)
-#define FLOATWIN_TITLE_NONE                     ((USHORT)0x0004)
+#define FLOATWIN_TITLE_NORMAL					((USHORT)0x0001)
+#define FLOATWIN_TITLE_TEAROFF					((USHORT)0x0002)
+#define FLOATWIN_TITLE_POPUP					((USHORT)0x0004)
+#define FLOATWIN_TITLE_NONE 					((USHORT)0x0008)
 
 // ------------------
 // - FloatingWindow -
@@ -76,22 +77,22 @@ class VCL_DLLPUBLIC FloatingWindow : public SystemWindow
     class   ImplData;
 private:
     FloatingWindow* mpNextFloat;
-    Window*         mpFirstPopupModeWin;
+    Window* 		mpFirstPopupModeWin;
     ImplData*       mpImplData;
-    Rectangle       maFloatRect;
-    ULONG           mnPostId;
-    ULONG           mnPopupModeFlags;
-    USHORT          mnTitle;
-    USHORT          mnOldTitle;
-    BOOL            mbInPopupMode;
-    BOOL            mbPopupMode;
-    BOOL            mbPopupModeCanceled;
-    BOOL            mbPopupModeTearOff;
-    BOOL            mbMouseDown;
-    BOOL            mbOldSaveBackMode;
-    BOOL            mbGrabFocus;    // act as key input window, although focus is not set
-    BOOL            mbInCleanUp;
-    Link            maPopupModeEndHdl;
+    Rectangle		maFloatRect;
+    ULONG			mnPostId;
+    ULONG			mnPopupModeFlags;
+    USHORT			mnTitle;
+    USHORT			mnOldTitle;
+    BOOL			mbInPopupMode;
+    BOOL			mbPopupMode;
+    BOOL			mbPopupModeCanceled;
+    BOOL			mbPopupModeTearOff;
+    BOOL			mbMouseDown;
+    BOOL			mbOldSaveBackMode;
+    BOOL			mbGrabFocus;    // act as key input window, although focus is not set
+    BOOL			mbInCleanUp;
+    Link			maPopupModeEndHdl;
 
 //#if 0 // _SOLAR__PRIVATE
     SAL_DLLPRIVATE void    ImplCallPopupModeEnd();
@@ -108,18 +109,18 @@ protected:
     SAL_DLLPRIVATE void    ImplLoadRes( const ResId& rResId );
 
 public:
-#define IMPL_FLOATWIN_HITTEST_OUTSIDE       ((USHORT)0x0001)
-#define IMPL_FLOATWIN_HITTEST_WINDOW        ((USHORT)0x0002)
-#define IMPL_FLOATWIN_HITTEST_RECT          ((USHORT)0x0004)
+#define IMPL_FLOATWIN_HITTEST_OUTSIDE		((USHORT)0x0001)
+#define IMPL_FLOATWIN_HITTEST_WINDOW		((USHORT)0x0002)
+#define IMPL_FLOATWIN_HITTEST_RECT			((USHORT)0x0004)
     SAL_DLLPRIVATE FloatingWindow*  ImplFloatHitTest( Window* pReference, const Point& rPos, USHORT& rHitTest );
     SAL_DLLPRIVATE FloatingWindow*  ImplFindLastLevelFloat();
-    SAL_DLLPRIVATE BOOL             ImplIsFloatPopupModeWindow( const Window* pWindow );
-    SAL_DLLPRIVATE void             ImplSetMouseDown() { mbMouseDown = TRUE; }
-    SAL_DLLPRIVATE BOOL             ImplIsMouseDown() const  { return mbMouseDown; }
-    SAL_DLLPRIVATE static Point     ImplCalcPos( Window* pWindow,
+    SAL_DLLPRIVATE BOOL			    ImplIsFloatPopupModeWindow( const Window* pWindow );
+    SAL_DLLPRIVATE void			    ImplSetMouseDown() { mbMouseDown = TRUE; }
+    SAL_DLLPRIVATE BOOL    			ImplIsMouseDown() const  { return mbMouseDown; }
+    SAL_DLLPRIVATE static Point    	ImplCalcPos( Window* pWindow,
                                                  const Rectangle& rRect, ULONG nFlags,
                                                  USHORT& rArrangeIndex );
-    SAL_DLLPRIVATE void             ImplEndPopupMode( USHORT nFlags = 0, ULONG nFocusId = 0 );
+    SAL_DLLPRIVATE void			    ImplEndPopupMode( USHORT nFlags = 0, ULONG nFocusId = 0 );
     SAL_DLLPRIVATE Rectangle&       ImplGetItemEdgeClipRect();
     SAL_DLLPRIVATE BOOL             ImplIsInPrivatePopupMode() const { return mbInPopupMode; }
 //#endif
@@ -129,29 +130,29 @@ public:
                     FloatingWindow( Window* pParent, const ResId& rResId );
                     ~FloatingWindow();
 
-    virtual long    Notify( NotifyEvent& rNEvt );
-    virtual void    StateChanged( StateChangedType nType );
-    virtual void    DataChanged( const DataChangedEvent& rDCEvt );
-
-    virtual void    PopupModeEnd();
-
-    void            SetTitleType( USHORT nTitle );
-    USHORT          GetTitleType() const { return mnTitle; }
-
-    void            StartPopupMode( const Rectangle& rRect, ULONG nFlags = 0 );
-    void            StartPopupMode( ToolBox* pBox, ULONG nFlags = 0  );
-    void            EndPopupMode( USHORT nFlags = 0 );
-    void            AddPopupModeWindow( Window* pWindow );
-    void            RemovePopupModeWindow( Window* pWindow );
-    ULONG           GetPopupModeFlags() const { return mnPopupModeFlags; }
-    void            SetPopupModeFlags( ULONG nFlags ) { mnPopupModeFlags = nFlags; }
-    BOOL            IsInPopupMode() const { return mbPopupMode; }
-    BOOL            IsInCleanUp() const { return mbInCleanUp; }
-    BOOL            IsPopupModeCanceled() const { return mbPopupModeCanceled; }
-    BOOL            IsPopupModeTearOff() const { return mbPopupModeTearOff; }
-
-    void            SetPopupModeEndHdl( const Link& rLink ) { maPopupModeEndHdl = rLink; }
-    const Link&     GetPopupModeEndHdl() const  { return maPopupModeEndHdl; }
+    virtual long	Notify( NotifyEvent& rNEvt );
+    virtual void	StateChanged( StateChangedType nType );
+    virtual void	DataChanged( const DataChangedEvent& rDCEvt );
+
+    virtual void	PopupModeEnd();
+
+    void			SetTitleType( USHORT nTitle );
+    USHORT			GetTitleType() const { return mnTitle; }
+
+    void			StartPopupMode( const Rectangle& rRect, ULONG nFlags = 0 );
+    void			StartPopupMode( ToolBox* pBox, ULONG nFlags = 0  );
+    void			EndPopupMode( USHORT nFlags = 0 );
+    void			AddPopupModeWindow( Window* pWindow );
+    void			RemovePopupModeWindow( Window* pWindow );
+    ULONG			GetPopupModeFlags() const { return mnPopupModeFlags; }
+    void			SetPopupModeFlags( ULONG nFlags ) { mnPopupModeFlags = nFlags; }
+    BOOL			IsInPopupMode() const { return mbPopupMode; }
+    BOOL			IsInCleanUp() const { return mbInCleanUp; }
+    BOOL			IsPopupModeCanceled() const { return mbPopupModeCanceled; }
+    BOOL			IsPopupModeTearOff() const { return mbPopupModeTearOff; }
+
+    void			SetPopupModeEndHdl( const Link& rLink ) { maPopupModeEndHdl = rLink; }
+    const Link& 	GetPopupModeEndHdl() const	{ return maPopupModeEndHdl; }
 
     BOOL            GrabsFocus() const { return mbGrabFocus; }
 
diff --git a/vcl/inc/vcl/fntstyle.hxx b/vcl/inc/vcl/fntstyle.hxx
index 4b4ccc9f6d02..265eb5fcbe43 100644
--- a/vcl/inc/vcl/fntstyle.hxx
+++ b/vcl/inc/vcl/fntstyle.hxx
@@ -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
@@ -47,7 +47,7 @@ enum FontRelief { RELIEF_NONE, RELIEF_EMBOSSED, RELIEF_ENGRAVED, FontRelief_FORC
 // --------------
 
 typedef BYTE FontKerning;
-#define KERNING_FONTSPECIFIC        ((FontKerning)0x01)
-#define KERNING_ASIAN               ((FontKerning)0x02)
+#define KERNING_FONTSPECIFIC		((FontKerning)0x01)
+#define KERNING_ASIAN				((FontKerning)0x02)
 
-#endif  // _VCL_FNTSTYLE_HXX
+#endif	// _VCL_FNTSTYLE_HXX
diff --git a/vcl/inc/vcl/font.hxx b/vcl/inc/vcl/font.hxx
index 80fd31ebf6dc..edc0c4f88ab8 100644
--- a/vcl/inc/vcl/font.hxx
+++ b/vcl/inc/vcl/font.hxx
@@ -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
@@ -49,8 +49,8 @@ class ImplFontAttributes;
 class VCL_DLLPUBLIC Font
 {
 private:
-    Impl_Font*          mpImplFont;
-    void                MakeUnique();
+    Impl_Font*			mpImplFont;
+    void				MakeUnique();
 
 public:
                         Font();
@@ -60,81 +60,81 @@ public:
                         Font( FontFamily eFamily, const Size& );
                         ~Font();
 
-    void                SetColor( const Color& );
-    const Color&        GetColor() const;
-    void                SetFillColor( const Color& );
-    const Color&        GetFillColor() const;
-    void                SetTransparent( BOOL bTransparent );
-    BOOL                IsTransparent() const;
-    void                SetAlign( FontAlign );
-    FontAlign           GetAlign() const;
-
-    void                SetName( const String& rFamilyName );
-    const String&       GetName() const;
-    void                SetStyleName( const String& rStyleName );
-    const String&       GetStyleName() const;
-    void                SetSize( const Size& );
-    const Size&         GetSize() const;
-    void                SetHeight( long nHeight );
-    long                GetHeight() const;
-    void                SetWidth( long nWidth );
-    long                GetWidth() const;
-
-    void                SetFamily( FontFamily );
-    FontFamily          GetFamily() const;
-    void                SetCharSet( rtl_TextEncoding );
-    rtl_TextEncoding    GetCharSet() const;
-    void                SetLanguage( LanguageType );
-    LanguageType        GetLanguage() const;
-    void                SetCJKContextLanguage( LanguageType );
-    LanguageType        GetCJKContextLanguage() const;
-    void                SetPitch( FontPitch ePitch );
-    FontPitch           GetPitch() const;
-
-    void                SetOrientation( short nLineOrientation );
-    short               GetOrientation() const;
-    void                SetVertical( BOOL bVertical );
-    BOOL                IsVertical() const;
-    void                SetKerning( FontKerning nKerning );
-    FontKerning         GetKerning() const;
-    BOOL                IsKerning() const;
-
-    void                SetWeight( FontWeight );
-    FontWeight          GetWeight() const;
-    void                SetWidthType( FontWidth );
-    FontWidth           GetWidthType() const;
-    void                SetItalic( FontItalic );
-    FontItalic          GetItalic() const;
-    void                SetOutline( BOOL bOutline );
-    BOOL                IsOutline() const;
-    void                SetShadow( BOOL bShadow );
-    BOOL                IsShadow() const;
-    void                SetRelief( FontRelief );
-    FontRelief          GetRelief() const;
-    void                SetUnderline( FontUnderline );
-    FontUnderline       GetUnderline() const;
-    void                SetOverline( FontUnderline );
-    FontUnderline       GetOverline() const;
-    void                SetStrikeout( FontStrikeout );
-    FontStrikeout       GetStrikeout() const;
-    void                SetEmphasisMark( FontEmphasisMark );
-    FontEmphasisMark    GetEmphasisMark() const;
-    void                SetWordLineMode( BOOL bWordLine );
-    BOOL                IsWordLineMode() const;
-
-    void                Merge( const Font& rFont );
+    void				SetColor( const Color& );
+    const Color&		GetColor() const;
+    void				SetFillColor( const Color& );
+    const Color&		GetFillColor() const;
+    void				SetTransparent( BOOL bTransparent );
+    BOOL				IsTransparent() const;
+    void				SetAlign( FontAlign );
+    FontAlign			GetAlign() const;
+
+    void				SetName( const String& rFamilyName );
+    const String&		GetName() const;
+    void				SetStyleName( const String& rStyleName );
+    const String&		GetStyleName() const;
+    void				SetSize( const Size& );
+    const Size& 		GetSize() const;
+    void				SetHeight( long nHeight );
+    long				GetHeight() const;
+    void				SetWidth( long nWidth );
+    long				GetWidth() const;
+
+    void				SetFamily( FontFamily );
+    FontFamily			GetFamily() const;
+    void				SetCharSet( rtl_TextEncoding );
+    rtl_TextEncoding	GetCharSet() const;
+    void				SetLanguage( LanguageType );
+    LanguageType		GetLanguage() const;
+    void				SetCJKContextLanguage( LanguageType );
+    LanguageType		GetCJKContextLanguage() const;
+    void				SetPitch( FontPitch ePitch );
+    FontPitch			GetPitch() const;
+
+    void				SetOrientation( short nLineOrientation );
+    short				GetOrientation() const;
+    void				SetVertical( BOOL bVertical );
+    BOOL				IsVertical() const;
+    void				SetKerning( FontKerning nKerning );
+    FontKerning 		GetKerning() const;
+    BOOL				IsKerning() const;
+
+    void				SetWeight( FontWeight );
+    FontWeight			GetWeight() const;
+    void				SetWidthType( FontWidth );
+    FontWidth			GetWidthType() const;
+    void				SetItalic( FontItalic );
+    FontItalic			GetItalic() const;
+    void				SetOutline( BOOL bOutline );
+    BOOL				IsOutline() const;
+    void				SetShadow( BOOL bShadow );
+    BOOL				IsShadow() const;
+    void				SetRelief( FontRelief );
+    FontRelief			GetRelief() const;
+    void				SetUnderline( FontUnderline );
+    FontUnderline		GetUnderline() const;
+    void				SetOverline( FontUnderline );
+    FontUnderline		GetOverline() const;
+    void				SetStrikeout( FontStrikeout );
+    FontStrikeout		GetStrikeout() const;
+    void				SetEmphasisMark( FontEmphasisMark );
+    FontEmphasisMark	GetEmphasisMark() const;
+    void				SetWordLineMode( BOOL bWordLine );
+    BOOL				IsWordLineMode() const;
+
+    void				Merge( const Font& rFont );
     void                GetFontAttributes( ImplFontAttributes& rAttrs ) const;
 
-    Font&               operator=( const Font& );
-    BOOL                operator==( const Font& ) const;
-    BOOL                operator!=( const Font& rFont ) const
+    Font&				operator=( const Font& );
+    BOOL				operator==( const Font& ) const;
+    BOOL				operator!=( const Font& rFont ) const
                             { return !(Font::operator==( rFont )); }
-    BOOL                IsSameInstance( const Font& ) const;
-
-    friend VCL_DLLPUBLIC SvStream&  operator>>( SvStream& rIStm, Font& );
-    friend VCL_DLLPUBLIC SvStream&  operator<<( SvStream& rOStm, const Font& );
+    BOOL				IsSameInstance( const Font& ) const;
 
+    friend VCL_DLLPUBLIC SvStream&	operator>>( SvStream& rIStm, Font& );
+    friend VCL_DLLPUBLIC SvStream&	operator<<( SvStream& rOStm, const Font& );
+    
     static Font identifyFont( const void* pBuffer, sal_uInt32 nLen );
 };
 
-#endif  // _VCL_FONT_HXX
+#endif	// _VCL_FONT_HXX
diff --git a/vcl/inc/vcl/fontcache.hxx b/vcl/inc/vcl/fontcache.hxx
index b18748ed5791..28bac8675d41 100644
--- a/vcl/inc/vcl/fontcache.hxx
+++ b/vcl/inc/vcl/fontcache.hxx
@@ -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
@@ -48,24 +48,24 @@ class VCL_DLLPUBLIC FontCache
     typedef std::list< PrintFontManager::PrintFont* > FontCacheEntry;
     struct FontFile
     {
-        FontCacheEntry      m_aEntry;
+        FontCacheEntry		m_aEntry;
     };
 
     typedef std::hash_map< ::rtl::OString, FontFile, ::rtl::OStringHash > FontDirMap;
     struct FontDir
     {
-        sal_Int64   m_nTimestamp;
-        bool        m_bNoFiles;
+        sal_Int64	m_nTimestamp;
+        bool		m_bNoFiles;
         bool        m_bUserOverrideOnly;
-        FontDirMap  m_aEntries;
+        FontDirMap	m_aEntries;
 
         FontDir() : m_nTimestamp(0), m_bNoFiles(false), m_bUserOverrideOnly( false ) {}
     };
-
+    
     typedef std::hash_map< int, FontDir > FontCacheData;
-    FontCacheData   m_aCache;
-    String          m_aCacheFile;
-    bool            m_bDoFlush;
+    FontCacheData	m_aCache;
+    String			m_aCacheFile;
+    bool			m_bDoFlush;
 
     void read();
     void clearCache();
diff --git a/vcl/inc/vcl/fontmanager.hxx b/vcl/inc/vcl/fontmanager.hxx
index 33fece8d88e1..538515e3039d 100644
--- a/vcl/inc/vcl/fontmanager.hxx
+++ b/vcl/inc/vcl/fontmanager.hxx
@@ -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,7 +79,7 @@ enum type {
     UltraExpanded = 9
 };
 }
-
+    
 namespace pitch
 {
 enum type {
@@ -109,13 +109,13 @@ enum type {
 namespace family
 {
 enum type {
-    Unknown = 0,
-    Decorative = 1,
+    Unknown = 0, 
+    Decorative = 1, 
     Modern = 2,
-    Roman = 3,
-    Script = 4,
-    Swiss = 5,
-    System = 6
+    Roman = 3, 
+    Script = 4, 
+    Swiss = 5, 
+    System = 6 
 };
 }
 
@@ -129,12 +129,12 @@ enum type {
 };
 }
 
-namespace fcstatus
+namespace fcstatus 
 {
-enum type {
+enum type { 
     istrue,
     isunset,
-    isfalse
+    isfalse 
 };
 }
 
@@ -150,19 +150,19 @@ enum type {
 
 struct FastPrintFontInfo
 {
-    fontID                              m_nID; // FontID
-    fonttype::type                      m_eType;
-
+    fontID                  			m_nID; // FontID
+    fonttype::type          			m_eType;
+        
     // font attributes
-    rtl::OUString                       m_aFamilyName;
+    rtl::OUString         				m_aFamilyName;
     rtl::OUString                       m_aStyleName;
-    std::list< rtl::OUString >          m_aAliases;
-    family::type                        m_eFamilyStyle;
-    italic::type                        m_eItalic;
-    width::type                         m_eWidth;
-    weight::type                        m_eWeight;
-    pitch::type                         m_ePitch;
-    rtl_TextEncoding                    m_aEncoding;
+    std::list< rtl::OUString >			m_aAliases;
+    family::type            			m_eFamilyStyle;
+    italic::type            			m_eItalic;
+    width::type             			m_eWidth;
+    weight::type            			m_eWeight;
+    pitch::type             			m_ePitch;
+    rtl_TextEncoding        			m_aEncoding;
     bool                                m_bSubsettable;
     bool                                m_bEmbeddable;
 
@@ -180,10 +180,10 @@ struct FastPrintFontInfo
 
 struct PrintFontInfo : public FastPrintFontInfo
 {
-    int                                     m_nAscend;
-    int                                     m_nDescend;
-    int                                     m_nLeading;
-    int                                     m_nWidth;
+    int                     				m_nAscend;
+    int                     				m_nDescend;
+    int                     				m_nLeading;
+    int                     				m_nWidth;
 
     PrintFontInfo() :
             FastPrintFontInfo(),
@@ -256,20 +256,20 @@ class VCL_DLLPUBLIC PrintFontManager
         bool                                        m_bKernPairsQueried;
         std::list< KernPair >                     m_aXKernPairs;
         std::list< KernPair >                     m_aYKernPairs;
-        std::hash_map< sal_Unicode, bool >      m_bVerticalSubstitutions;
+        std::hash_map< sal_Unicode, bool >		m_bVerticalSubstitutions;
 
         PrintFontMetrics() : m_bKernPairsQueried( false ) {}
-
+        
         bool isEmpty() const { return m_aMetrics.empty(); }
     };
 
     struct PrintFont
     {
         fonttype::type                              m_eType;
-
+            
         // font attributes
         int                                         m_nFamilyName;  // atom
-        std::list< int >                            m_aAliases;
+        std::list< int >							m_aAliases;
         int                                         m_nPSName;      // atom
         rtl::OUString                               m_aStyleName;
         italic::type                                m_eItalic;
@@ -277,22 +277,22 @@ class VCL_DLLPUBLIC PrintFontManager
         weight::type                                m_eWeight;
         pitch::type                                 m_ePitch;
         rtl_TextEncoding                            m_aEncoding;
-        bool                                        m_bFontEncodingOnly; // set if font should be only accessed by builtin encoding
+        bool										m_bFontEncodingOnly; // set if font should be only accessed by builtin encoding
         CharacterMetric                             m_aGlobalMetricX;
         CharacterMetric                             m_aGlobalMetricY;
         PrintFontMetrics*                           m_pMetrics;
         int                                         m_nAscend;
         int                                         m_nDescend;
         int                                         m_nLeading;
-        int                                         m_nXMin; // font bounding box
-        int                                         m_nYMin;
-        int                                         m_nXMax;
-        int                                         m_nYMax;
-        bool                                        m_bHaveVerticalSubstitutedGlyphs;
+        int											m_nXMin; // font bounding box
+        int											m_nYMin;
+        int											m_nXMax;
+        int											m_nYMax;
+        bool										m_bHaveVerticalSubstitutedGlyphs;
         bool                                        m_bUserOverride;
 
-        std::map< sal_Unicode, sal_Int32 >          m_aEncodingVector;
-        std::map< sal_Unicode, rtl::OString >       m_aNonEncoded;
+        std::map< sal_Unicode, sal_Int32 >			m_aEncodingVector;
+        std::map< sal_Unicode, rtl::OString >		m_aNonEncoded;
 
         PrintFont( fonttype::type eType );
         virtual ~PrintFont();
@@ -318,11 +318,11 @@ class VCL_DLLPUBLIC PrintFontManager
 
     struct TrueTypeFontFile : public PrintFont
     {
-        int                     m_nDirectory;       // atom containing system dependent path
+        int					    m_nDirectory;       // atom containing system dependent path
         rtl::OString          m_aFontFile;        // relative to directory
         rtl::OString          m_aXLFD;            // mainly for administration, contains the XLFD from fonts.dir
         int                     m_nCollectionEntry; // -1 for regular fonts, 0 to ... for fonts stemming from collections
-        unsigned int           m_nTypeFlags;        // copyright bits and PS-OpenType flag
+        unsigned int           m_nTypeFlags;		// copyright bits and PS-OpenType flag
 
         TrueTypeFontFile();
         virtual ~TrueTypeFontFile();
@@ -341,25 +341,25 @@ class VCL_DLLPUBLIC PrintFontManager
 
     struct XLFDEntry
     {
-        static const int MaskFoundry    = 1;
-        static const int MaskFamily     = 2;
-        static const int MaskAddStyle   = 4;
-        static const int MaskItalic     = 8;
-        static const int MaskWeight     = 16;
-        static const int MaskWidth      = 32;
-        static const int MaskPitch      = 64;
-        static const int MaskEncoding   = 128;
-
-        int                 nMask; // contains a bit set for every valid member
-
-        rtl::OString        aFoundry;
-        rtl::OString        aFamily;
-        rtl::OString        aAddStyle;
-        italic::type        eItalic;
-        weight::type        eWeight;
-        width::type         eWidth;
-        pitch::type         ePitch;
-        rtl_TextEncoding    aEncoding;
+        static const int MaskFoundry	= 1;
+        static const int MaskFamily		= 2;
+        static const int MaskAddStyle	= 4;
+        static const int MaskItalic		= 8;
+        static const int MaskWeight		= 16;
+        static const int MaskWidth		= 32;
+        static const int MaskPitch		= 64;
+        static const int MaskEncoding	= 128;
+
+        int					nMask; // contains a bit set for every valid member
+
+        rtl::OString		aFoundry;
+        rtl::OString		aFamily;
+        rtl::OString		aAddStyle;
+        italic::type		eItalic;
+        weight::type		eWeight;
+        width::type			eWidth;
+        pitch::type			ePitch;
+        rtl_TextEncoding	aEncoding;
 
         XLFDEntry() { nMask = 0; }
 
@@ -374,7 +374,7 @@ class VCL_DLLPUBLIC PrintFontManager
     std::hash_map< int, family::type >        m_aFamilyTypes;
     std::list< rtl::OUString >              m_aPrinterDrivers;
     std::list< rtl::OString >               m_aFontDirectories;
-    std::list< int >                            m_aPrivateFontDirectories;
+    std::list< int >							m_aPrivateFontDirectories;
     std::map< struct XLFDEntry, std::list< struct XLFDEntry > >
     m_aXLFD_Aliases;
     utl::MultiAtomProvider*                   m_pAtoms;
@@ -391,14 +391,14 @@ class VCL_DLLPUBLIC PrintFontManager
         m_aAdobenameToUnicode;
     std::hash_multimap< sal_Unicode, rtl::OString >
         m_aUnicodeToAdobename;
-    std::hash_multimap< sal_Unicode, sal_uInt8 >    m_aUnicodeToAdobecode;
-    std::hash_multimap< sal_uInt8, sal_Unicode >    m_aAdobecodeToUnicode;
+    std::hash_multimap< sal_Unicode, sal_uInt8 >	m_aUnicodeToAdobecode;
+    std::hash_multimap< sal_uInt8, sal_Unicode >	m_aAdobecodeToUnicode;
 
     mutable FontCache*                                                        m_pFontCache;
     bool m_bFontconfigSuccess;
 
     mutable std::vector< fontID >               m_aOverrideFonts;
-
+        
     rtl::OString getAfmFile( PrintFont* pFont ) const;
     rtl::OString getFontFile( PrintFont* pFont ) const;
 
@@ -446,18 +446,18 @@ class VCL_DLLPUBLIC PrintFontManager
 
     since fontconfig is asked for font substitutes before OOo will check for font availability
     and fontconfig will happily substitute fonts it doesn't know (e.g. "Arial Narrow" -> "DejaVu Sans Book"!)
-    it becomes necessary to tell the library about all the hidden font treasures
-
+    it becomes necessary to tell the library about all the hidden font treasures 
+ 
     @returns
     true if libfontconfig accepted the directory
     false else (e.g. no libfontconfig found)
     */
     bool addFontconfigDir(const rtl::OString& rDirectory);
-
+    
     static bool parseXLFD( const rtl::OString& rXLFD, XLFDEntry& rEntry );
     void parseXLFD_appendAliases( const std::list< rtl::OString >& rXLFDs, std::list< XLFDEntry >& rEntries ) const;
     void initFontsAlias();
-
+    
     bool readOverrideMetrics();
 
     PrintFontManager();
@@ -465,17 +465,17 @@ class VCL_DLLPUBLIC PrintFontManager
 public:
     static PrintFontManager& get(); // one instance only
 
-    int addFontFile( const rtl::OString& rFileName, int nFaceNum );
+    int addFontFile( const rtl::OString& rFileName, int nFaceNum ); 
 
     void initialize();
 
     // returns the number of managed fonts
     int getFontCount() const { return m_aFonts.size(); }
-
+    
     // caution: the getFontList* methods can change the font list on demand
     // depending on the pParser argument. That is getFontCount() may
     // return a larger value after getFontList()
-
+    
     // returns the ids of all managed fonts. on pParser != NULL
     // all fonttype::Builtin type fonts are not listed
     // which do not occur in the PPD of pParser
@@ -502,7 +502,7 @@ public:
 
     // get a specific fonts family name aliases
     void getFontFamilyAliases( fontID nFontID ) const;
-
+        
     // get a specific fonts type
     fonttype::type getFontType( fontID nFontID ) const
     {
@@ -732,8 +732,8 @@ public:
     bool matchFont( FastPrintFontInfo& rInfo, const com::sun::star::lang::Locale& rLocale );
     bool getFontOptions( const FastPrintFontInfo&, int nSize, void (*subcallback)(void*), ImplFontOptions& rResult ) const;
 
-    rtl::OUString Substitute( const rtl::OUString& rFontName, rtl::OUString& rMissingCodes,
-        const rtl::OString& rLangAttrib, italic::type& rItalic, weight::type& rWeight,
+    rtl::OUString Substitute( const rtl::OUString& rFontName, rtl::OUString& rMissingCodes, 
+        const rtl::OString& rLangAttrib, italic::type& rItalic, weight::type& rWeight, 
         width::type& rWidth, pitch::type& rPitch) const;
     bool hasFontconfig() const { return m_bFontconfigSuccess; }
 
diff --git a/vcl/inc/vcl/fontsubset.hxx b/vcl/inc/vcl/fontsubset.hxx
index a34212128741..6c0bffd3d2b7 100644
--- a/vcl/inc/vcl/fontsubset.hxx
+++ b/vcl/inc/vcl/fontsubset.hxx
@@ -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
@@ -37,60 +37,60 @@ namespace vcl { struct _TrueTypeFont; } // SFT's idea of a TTF font
 class FontSubsetInfo
 {
 public:
-    explicit    FontSubsetInfo( void );
-    virtual     ~FontSubsetInfo( void );
+    explicit	FontSubsetInfo( void );
+    virtual		~FontSubsetInfo( void );
 
     enum FontType {
-        NO_FONT     = 0,
-        SFNT_TTF    = 1<<1,     // SFNT container with TrueType glyphs
-        SFNT_CFF    = 1<<2,     // SFNT container with CFF-container
-        TYPE1_PFA   = 1<<3,     // PSType1 Postscript Font Ascii
-        TYPE1_PFB   = 1<<4,     // PSType1 Postscript Font Binary
-        CFF_FONT    = 1<<5,     // CFF-container with PSType2 glyphs
-        TYPE3_FONT  = 1<<6,     // PSType3 Postscript font
-        TYPE42_FONT = 1<<7,     // PSType42 wrapper for an SFNT_TTF
-        ANY_SFNT    = SFNT_TTF | SFNT_CFF,
-        ANY_TYPE1   = TYPE1_PFA | TYPE1_PFB,
-        ANY_FONT    = 0xFF
+        NO_FONT		= 0,
+        SFNT_TTF	= 1<<1,		// SFNT container with TrueType glyphs
+        SFNT_CFF	= 1<<2,		// SFNT container with CFF-container
+        TYPE1_PFA	= 1<<3,		// PSType1 Postscript Font Ascii
+        TYPE1_PFB	= 1<<4,		// PSType1 Postscript Font Binary
+        CFF_FONT	= 1<<5,		// CFF-container with PSType2 glyphs
+        TYPE3_FONT	= 1<<6,		// PSType3 Postscript font
+        TYPE42_FONT	= 1<<7,		// PSType42 wrapper for an SFNT_TTF
+        ANY_SFNT	= SFNT_TTF | SFNT_CFF,
+        ANY_TYPE1	= TYPE1_PFA | TYPE1_PFB,
+        ANY_FONT	= 0xFF
     };
 
-    bool        LoadFont( FontType eInFontType,
+    bool		LoadFont( FontType eInFontType,
                     const unsigned char* pFontBytes, int nByteLength );
-    bool        LoadFont( vcl::_TrueTypeFont* pSftTrueTypeFont );
+    bool		LoadFont( vcl::_TrueTypeFont* pSftTrueTypeFont );
 
-    bool        CreateFontSubset( int nOutFontTypeMask,
+    bool		CreateFontSubset( int nOutFontTypeMask,
                     FILE* pOutFile, const char* pOutFontName,
                     const long* pReqGlyphIds, const sal_uInt8* pEncodedIds,
                     int nReqGlyphCount, sal_Int32* pOutGlyphWidths = NULL );
 
 public: // TODO: make subsetter results private and provide accessor methods instead
     // subsetter-provided subset details needed by e.g. Postscript or PDF
-    String      m_aPSName;
-    int         m_nAscent; // all metrics in PS font units
-    int         m_nDescent;
-    int         m_nCapHeight;
-    Rectangle   m_aFontBBox;
-    FontType    m_nFontType;    // font-type of subset result
+    String		m_aPSName;
+    int			m_nAscent; // all metrics in PS font units
+    int			m_nDescent;
+    int			m_nCapHeight;
+    Rectangle	m_aFontBBox;
+    FontType	m_nFontType;	// font-type of subset result
 
 private:
     // input-font-specific details
-    unsigned const char*    mpInFontBytes;
-    int                     mnInByteLength;
-    FontType                meInFontType;   // allowed mask of input font-types
-    vcl::_TrueTypeFont*     mpSftTTFont;
+    unsigned const char*	mpInFontBytes;
+    int						mnInByteLength;
+    FontType				meInFontType;	// allowed mask of input font-types
+    vcl::_TrueTypeFont*		mpSftTTFont;
 
     // subset-request details
-    int                     mnReqFontTypeMask;  // allowed subset-target font types
-    FILE*                   mpOutFile;
-    const char*             mpReqFontName;
-    const long*             mpReqGlyphIds;
-    const sal_uInt8*        mpReqEncodedIds;
-    int                     mnReqGlyphCount;
+    int						mnReqFontTypeMask;	// allowed subset-target font types
+    FILE*					mpOutFile;
+    const char*				mpReqFontName;
+    const long*				mpReqGlyphIds;
+    const sal_uInt8*		mpReqEncodedIds;
+    int						mnReqGlyphCount;
 
 protected:
-    bool    CreateFontSubsetFromCff( sal_Int32* pOutGlyphWidths = NULL );
-    bool    CreateFontSubsetFromSfnt( sal_Int32* pOutGlyphWidths = NULL );
-    bool    CreateFontSubsetFromType1( sal_Int32* pOutGlyphWidths = NULL );
+    bool	CreateFontSubsetFromCff( sal_Int32* pOutGlyphWidths = NULL );
+    bool	CreateFontSubsetFromSfnt( sal_Int32* pOutGlyphWidths = NULL );
+    bool	CreateFontSubsetFromType1( sal_Int32* pOutGlyphWidths = NULL );
 };
 
 #endif // _SV_FONTSUBSET_HXX
diff --git a/vcl/inc/vcl/gdimtf.hxx b/vcl/inc/vcl/gdimtf.hxx
index 06f7a0d14a2e..8fa5c17a3438 100644
--- a/vcl/inc/vcl/gdimtf.hxx
+++ b/vcl/inc/vcl/gdimtf.hxx
@@ -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
@@ -53,20 +53,20 @@ class Gradient;
 #define GDI_METAFILE_LABEL_NOTFOUND     ((ULONG)0xFFFFFFFF)
 
 #ifndef METAFILE_END
-#define METAFILE_END                    GDI_METAFILE_END
+#define METAFILE_END					GDI_METAFILE_END
 #endif
 
 #ifndef METAFILE_LABEL_NOTFOUND
-#define METAFILE_LABEL_NOTFOUND         GDI_METAFILE_LABEL_NOTFOUND
+#define METAFILE_LABEL_NOTFOUND			GDI_METAFILE_LABEL_NOTFOUND
 #endif
 
 // -----------
 // - Defines -
 // -----------
 
-#define MTF_MIRROR_NONE             0x00000000UL
-#define MTF_MIRROR_HORZ             0x00000001UL
-#define MTF_MIRROR_VERT             0x00000002UL
+#define MTF_MIRROR_NONE				0x00000000UL
+#define MTF_MIRROR_HORZ				0x00000001UL
+#define MTF_MIRROR_VERT				0x00000002UL
 
 // ---------
 // - Enums -
@@ -113,28 +113,28 @@ private:
     SAL_DLLPRIVATE static Color    ImplColAdjustFnc( const Color& rColor, const void* pColParam );
     SAL_DLLPRIVATE static BitmapEx ImplBmpAdjustFnc( const BitmapEx& rBmpEx, const void* pBmpParam );
 
-    SAL_DLLPRIVATE static Color    ImplColConvertFnc( const Color& rColor, const void* pColParam );
+    SAL_DLLPRIVATE static Color	   ImplColConvertFnc( const Color& rColor, const void* pColParam );
     SAL_DLLPRIVATE static BitmapEx ImplBmpConvertFnc( const BitmapEx& rBmpEx, const void* pBmpParam );
 
-    SAL_DLLPRIVATE static Color    ImplColMonoFnc( const Color& rColor, const void* pColParam );
+    SAL_DLLPRIVATE static Color	   ImplColMonoFnc( const Color& rColor, const void* pColParam );
     SAL_DLLPRIVATE static BitmapEx ImplBmpMonoFnc( const BitmapEx& rBmpEx, const void* pBmpParam );
 
-    SAL_DLLPRIVATE static Color    ImplColReplaceFnc( const Color& rColor, const void* pColParam );
+    SAL_DLLPRIVATE static Color	   ImplColReplaceFnc( const Color& rColor, const void* pColParam );
     SAL_DLLPRIVATE static BitmapEx ImplBmpReplaceFnc( const BitmapEx& rBmpEx, const void* pBmpParam );
 
-    SAL_DLLPRIVATE void            ImplExchangeColors( ColorExchangeFnc pFncCol, const void* pColParam,
+    SAL_DLLPRIVATE void			   ImplExchangeColors( ColorExchangeFnc pFncCol, const void* pColParam, 
                                                        BmpExchangeFnc pFncBmp, const void* pBmpParam );
 
-    SAL_DLLPRIVATE Point           ImplGetRotatedPoint( const Point& rPt, const Point& rRotatePt,
+    SAL_DLLPRIVATE Point           ImplGetRotatedPoint( const Point& rPt, const Point& rRotatePt, 
                                                         const Size& rOffset, double fSin, double fCos );
-    SAL_DLLPRIVATE Polygon         ImplGetRotatedPolygon( const Polygon& rPoly, const Point& rRotatePt,
+    SAL_DLLPRIVATE Polygon         ImplGetRotatedPolygon( const Polygon& rPoly, const Point& rRotatePt, 
                                                           const Size& rOffset, double fSin, double fCos );
-    SAL_DLLPRIVATE PolyPolygon     ImplGetRotatedPolyPolygon( const PolyPolygon& rPoly, const Point& rRotatePt,
+    SAL_DLLPRIVATE PolyPolygon     ImplGetRotatedPolyPolygon( const PolyPolygon& rPoly, const Point& rRotatePt, 
                                                               const Size& rOffset, double fSin, double fCos );
-    SAL_DLLPRIVATE void            ImplAddGradientEx( GDIMetaFile&          rMtf,
+    SAL_DLLPRIVATE void            ImplAddGradientEx( GDIMetaFile&          rMtf, 
                                                       const OutputDevice&   rMapDev,
                                                       const PolyPolygon&    rPolyPoly,
-                                                      const Gradient&       rGrad       );
+                                                      const Gradient&	  	rGrad 		);
 
 //#endif // __PRIVATE
 
@@ -146,18 +146,20 @@ protected:
 public:
                     GDIMetaFile();
                     GDIMetaFile( const GDIMetaFile& rMtf );
-    virtual         ~GDIMetaFile();
+    virtual			~GDIMetaFile();
 
     using List::operator==;
     using List::operator!=;
     GDIMetaFile&    operator=( const GDIMetaFile& rMtf );
-    BOOL            operator==( const GDIMetaFile& rMtf ) const;
-    BOOL            operator!=( const GDIMetaFile& rMtf ) const { return !( *this == rMtf ); }
+    BOOL			operator==( const GDIMetaFile& rMtf ) const;
+    BOOL			operator!=( const GDIMetaFile& rMtf ) const { return !( *this == rMtf ); }
 
     void            Clear();
-    sal_Bool        IsEqual( const GDIMetaFile& rMtf ) const;
+    sal_Bool		IsEqual( const GDIMetaFile& rMtf ) const;
     BOOL            Mirror( ULONG nMirrorFlags );
     void            Move( long nX, long nY );
+    // additional Move method getting specifics how to handle MapMode( MAP_PIXEL )
+    void            Move( long nX, long nY, long nDPIX, long nDPIY );
     void            Scale( double fScaleX, double fScaleY );
     void            Scale( const Fraction& rScaleX, const Fraction& rScaleY );
     void            Rotate( long nAngle10 );
@@ -171,12 +173,12 @@ public:
     */
     Rectangle       GetBoundRect( OutputDevice& i_rReference );
 
-    void            Adjust( short nLuminancePercent = 0, short nContrastPercent = 0,
-                            short nChannelRPercent = 0, short nChannelGPercent = 0,
+    void			Adjust( short nLuminancePercent = 0, short nContrastPercent = 0,
+                            short nChannelRPercent = 0, short nChannelGPercent = 0, 
                             short nChannelBPercent = 0, double fGamma = 1.0, BOOL bInvert = FALSE );
-    void            Convert( MtfConversion eConversion );
-    void            ReplaceColors( const Color& rSearchColor, const Color& rReplaceColor, ULONG nTol = 0 );
-    void            ReplaceColors( const Color* pSearchColors, const Color* rReplaceColors,
+    void			Convert( MtfConversion eConversion );
+    void			ReplaceColors( const Color& rSearchColor, const Color& rReplaceColor, ULONG nTol = 0 );
+    void			ReplaceColors( const Color* pSearchColors, const Color* rReplaceColors, 
                                    ULONG nColorCount, ULONG* pTols = NULL );
 
     GDIMetaFile     GetMonochromeMtf( const Color& rCol ) const;
@@ -203,12 +205,12 @@ public:
     ULONG           GetActionCount() const { return Count(); }
     void            AddAction( MetaAction* pAction );
     void            AddAction( MetaAction* pAction, ULONG nPos );
-    void            RemoveAction( ULONG nPos );
+    void 			RemoveAction( ULONG nPos );
     MetaAction*     CopyAction( ULONG nPos ) const;
     MetaAction*     GetCurAction() const { return (MetaAction*) GetCurObject(); }
     MetaAction*     GetAction( ULONG nAction ) const { return (MetaAction*) GetObject( nAction ); }
-    MetaAction*     FirstAction() { return (MetaAction*) First(); }
-    MetaAction*     NextAction() {  return (MetaAction*) Next(); }
+    MetaAction*     FirstAction() {	return (MetaAction*) First(); }
+    MetaAction*     NextAction() { 	return (MetaAction*) Next(); }
     MetaAction*     ReplaceAction( MetaAction* pAction, ULONG nAction ) { return (MetaAction*) Replace( pAction, nAction ); }
 
     ULONG           GetActionPos( const String& rLabel );
@@ -229,13 +231,13 @@ public:
     void            SetHookHdl( const Link& rLink ) { aHookHdlLink = rLink; }
     const Link&     GetHookHdl() const { return aHookHdlLink; }
 
-    ULONG           GetChecksum() const;
+    ULONG			GetChecksum() const;
     ULONG           GetSizeBytes() const;
 
     // Methoden zum Lesen und Schreiben des neuen Formats;
     // die Read-Methode kann auch das alte Format lesen
-    SvStream&       Read( SvStream& rIStm );
-    SvStream&       Write( SvStream& rOStm );
+    SvStream&		Read( SvStream& rIStm );
+    SvStream&		Write( SvStream& rOStm );
 
     // Stream-Operatoren schreiben das alte Format (noch)
     // und lesen sowohl das alte wie auch das neue Format
diff --git a/vcl/inc/vcl/gfxlink.hxx b/vcl/inc/vcl/gfxlink.hxx
index dced5a19c461..ad173a0c4615 100644
--- a/vcl/inc/vcl/gfxlink.hxx
+++ b/vcl/inc/vcl/gfxlink.hxx
@@ -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
@@ -39,8 +39,8 @@
 
 struct ImpBuffer
 {
-    ULONG       mnRefCount;
-    BYTE*       mpBuffer;
+    ULONG		mnRefCount;
+    BYTE*		mpBuffer;
 
                 ImpBuffer( ULONG nSize )
                 {
@@ -59,18 +59,18 @@ struct ImpBuffer
 
 struct ImpSwap
 {
-    rtl::OUString   maURL;
-    ULONG           mnDataSize;
-    ULONG           mnRefCount;
+    rtl::OUString	maURL;
+    ULONG			mnDataSize;
+    ULONG			mnRefCount;
 
                     ImpSwap( BYTE* pData, ULONG nDataSize );
                     ~ImpSwap();
 
-    BYTE*           GetData() const;
+    BYTE*			GetData() const;
 
-    BOOL            IsSwapped() const { return maURL.getLength() > 0; }
+    BOOL			IsSwapped() const { return maURL.getLength() > 0; }
 
-    void            WriteTo( SvStream& rOStm ) const;
+    void			WriteTo( SvStream& rOStm ) const;
 };
 
 // --------------
@@ -81,14 +81,14 @@ struct ImpGfxLink
 {
     MapMode         maPrefMapMode;
     Size            maPrefSize;
-    bool            mbPrefMapModeValid;
-    bool            mbPrefSizeValid;
+    bool			mbPrefMapModeValid;
+    bool			mbPrefSizeValid;
 
-    ImpGfxLink() :
+    ImpGfxLink() : 
         maPrefMapMode(),
         maPrefSize(),
-        mbPrefMapModeValid( false ),
-        mbPrefSizeValid( false )
+        mbPrefMapModeValid( false ), 
+        mbPrefSizeValid( false ) 
     {}
 };
 
@@ -100,20 +100,20 @@ struct ImpGfxLink
 
 enum GfxLinkType
 {
-    GFX_LINK_TYPE_NONE          = 0,
-    GFX_LINK_TYPE_EPS_BUFFER    = 1,
-    GFX_LINK_TYPE_NATIVE_GIF    = 2,    // Don't forget to update the following defines
-    GFX_LINK_TYPE_NATIVE_JPG    = 3,    // Don't forget to update the following defines
-    GFX_LINK_TYPE_NATIVE_PNG    = 4,    // Don't forget to update the following defines
-    GFX_LINK_TYPE_NATIVE_TIF    = 5,    // Don't forget to update the following defines
-    GFX_LINK_TYPE_NATIVE_WMF    = 6,    // Don't forget to update the following defines
-    GFX_LINK_TYPE_NATIVE_MET    = 7,    // Don't forget to update the following defines
-    GFX_LINK_TYPE_NATIVE_PCT    = 8,    // Don't forget to update the following defines
-    GFX_LINK_TYPE_USER          = 0xffff
+    GFX_LINK_TYPE_NONE			= 0,
+    GFX_LINK_TYPE_EPS_BUFFER	= 1,
+    GFX_LINK_TYPE_NATIVE_GIF	= 2,	// Don't forget to update the following defines
+    GFX_LINK_TYPE_NATIVE_JPG	= 3,	// Don't forget to update the following defines
+    GFX_LINK_TYPE_NATIVE_PNG	= 4,	// Don't forget to update the following defines
+    GFX_LINK_TYPE_NATIVE_TIF	= 5,	// Don't forget to update the following defines
+    GFX_LINK_TYPE_NATIVE_WMF	= 6,	// Don't forget to update the following defines
+    GFX_LINK_TYPE_NATIVE_MET	= 7,	// Don't forget to update the following defines
+    GFX_LINK_TYPE_NATIVE_PCT	= 8,	// Don't forget to update the following defines
+    GFX_LINK_TYPE_USER			= 0xffff
 };
 
-#define GFX_LINK_FIRST_NATIVE_ID    GFX_LINK_TYPE_NATIVE_GIF
-#define GFX_LINK_LAST_NATIVE_ID     GFX_LINK_TYPE_NATIVE_PCT
+#define GFX_LINK_FIRST_NATIVE_ID	GFX_LINK_TYPE_NATIVE_GIF
+#define GFX_LINK_LAST_NATIVE_ID		GFX_LINK_TYPE_NATIVE_PCT
 
 // -----------
 // - GfxLink -
@@ -128,58 +128,58 @@ class VCL_DLLPUBLIC GfxLink
 {
 private:
 
-    GfxLinkType         meType;
-    ImpBuffer*          mpBuf;
-    ImpSwap*            mpSwap;
-    sal_uInt32          mnBufSize;
-    sal_uInt32          mnUserId;
+    GfxLinkType			meType;
+    ImpBuffer*			mpBuf;
+    ImpSwap*			mpSwap;
+    sal_uInt32			mnBufSize;
+    sal_uInt32			mnUserId;
     ImpGfxLink*         mpImpData;
-    ULONG               mnExtra2;
+    ULONG				mnExtra2;
 
-    SAL_DLLPRIVATE void ImplCopy( const GfxLink& rGfxLink );
+    SAL_DLLPRIVATE void	ImplCopy( const GfxLink& rGfxLink );
 
-public:
+public:					
                         GfxLink();
                         GfxLink( const GfxLink& );
                         GfxLink( const String& rPath, GfxLinkType nType );
                         GfxLink( BYTE* pBuf, sal_uInt32 nBufSize, GfxLinkType nType, BOOL bOwns );
                         ~GfxLink();
 
-    GfxLink&            operator=( const GfxLink& );
-    sal_Bool            IsEqual( const GfxLink& ) const;
+    GfxLink&			operator=( const GfxLink& );
+    sal_Bool			IsEqual( const GfxLink& ) const;
 
-    GfxLinkType         GetType() const;
+    GfxLinkType			GetType() const;
 
-    void                SetUserId( sal_uInt32 nUserId ) { mnUserId = nUserId; }
-    sal_uInt32          GetUserId() const { return mnUserId; }
+    void				SetUserId( sal_uInt32 nUserId ) { mnUserId = nUserId; }
+    sal_uInt32			GetUserId() const { return mnUserId; }
 
-    sal_uInt32          GetDataSize() const;
-    void                SetData( BYTE* pBuf, sal_uInt32 nSize, GfxLinkType nType, BOOL bOwns );
-    const BYTE*         GetData() const;
+    sal_uInt32			GetDataSize() const;	
+    void				SetData( BYTE* pBuf, sal_uInt32 nSize, GfxLinkType nType, BOOL bOwns );
+    const BYTE*			GetData() const;
 
-    const Size&         GetPrefSize() const;
-    void                SetPrefSize( const Size& rPrefSize );
-    bool                IsPrefSizeValid();
+    const Size&			GetPrefSize() const;
+    void				SetPrefSize( const Size& rPrefSize );
+    bool 				IsPrefSizeValid();
 
-    const MapMode&      GetPrefMapMode() const;
-    void                SetPrefMapMode( const MapMode& rPrefMapMode );
-    bool                IsPrefMapModeValid();
+    const MapMode&		GetPrefMapMode() const;
+    void				SetPrefMapMode( const MapMode& rPrefMapMode );
+    bool 				IsPrefMapModeValid();
 
-    BOOL                IsNative() const;
-    BOOL                IsUser() const { return( GFX_LINK_TYPE_USER == meType ); }
+    BOOL				IsNative() const;
+    BOOL				IsUser() const { return( GFX_LINK_TYPE_USER == meType ); }
 
-    BOOL                LoadNative( Graphic& rGraphic );
+    BOOL				LoadNative( Graphic& rGraphic );
 
-    BOOL                ExportNative( SvStream& rOStream ) const;
+    BOOL				ExportNative( SvStream& rOStream ) const;
 
-    void                SwapOut();
-    void                SwapIn();
-    BOOL                IsSwappedOut() const { return( mpSwap != NULL ); }
+    void				SwapOut();
+    void				SwapIn();
+    BOOL				IsSwappedOut() const { return( mpSwap != NULL ); }
 
 public:
 
-    friend VCL_DLLPUBLIC SvStream&  operator<<( SvStream& rOStream, const GfxLink& rGfxLink );
-    friend VCL_DLLPUBLIC SvStream&  operator>>( SvStream& rIStream, GfxLink& rGfxLink );
+    friend VCL_DLLPUBLIC SvStream&	operator<<( SvStream& rOStream, const GfxLink& rGfxLink );
+    friend VCL_DLLPUBLIC SvStream&	operator>>( SvStream& rIStream, GfxLink& rGfxLink );
 };
 
 #endif
diff --git a/vcl/inc/vcl/glyphcache.hxx b/vcl/inc/vcl/glyphcache.hxx
index a77c1626dc24..b58f4add2679 100644
--- a/vcl/inc/vcl/glyphcache.hxx
+++ b/vcl/inc/vcl/glyphcache.hxx
@@ -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
@@ -64,7 +64,7 @@ public:
     explicit                    GlyphCache( GlyphCachePeer& );
     /*virtual*/                 ~GlyphCache();
 
-    static GlyphCache&      GetInstance();
+    static GlyphCache&		GetInstance();
     void                        LoadFonts();
 
     void                        ClearFontPath();
diff --git a/vcl/inc/vcl/gradient.hxx b/vcl/inc/vcl/gradient.hxx
index 8938627cf684..f29b1b5b2322 100644
--- a/vcl/inc/vcl/gradient.hxx
+++ b/vcl/inc/vcl/gradient.hxx
@@ -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,9 +79,9 @@ public:
 
 class VCL_DLLPUBLIC Gradient
 {
-private:
-    Impl_Gradient*  mpImplGradient;
-    void            MakeUnique();
+private:	
+    Impl_Gradient*	mpImplGradient;
+    void			MakeUnique();
 
 public:
                     Gradient();
diff --git a/vcl/inc/vcl/graph.h b/vcl/inc/vcl/graph.h
index c50a54b8802d..cb79ef09aeb1 100644
--- a/vcl/inc/vcl/graph.h
+++ b/vcl/inc/vcl/graph.h
@@ -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
diff --git a/vcl/inc/vcl/graph.hxx b/vcl/inc/vcl/graph.hxx
index aa860273fdb7..d71acf27a77c 100644
--- a/vcl/inc/vcl/graph.hxx
+++ b/vcl/inc/vcl/graph.hxx
@@ -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
@@ -206,7 +206,7 @@ public:
     GfxLink             GetLink() const;
     BOOL                IsLink() const;
 
-    BOOL                ExportNative( SvStream& rOStream ) const;
+    BOOL				ExportNative( SvStream& rOStream ) const;
 
     friend VCL_DLLPUBLIC SvStream&    operator<<( SvStream& rOStream, const Graphic& rGraphic );
     friend VCL_DLLPUBLIC SvStream&    operator>>( SvStream& rIStream, Graphic& rGraphic );
diff --git a/vcl/inc/vcl/graphictools.hxx b/vcl/inc/vcl/graphictools.hxx
index 3e3b9b3dc5b5..c522b13aa8c6 100644
--- a/vcl/inc/vcl/graphictools.hxx
+++ b/vcl/inc/vcl/graphictools.hxx
@@ -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
@@ -64,29 +64,29 @@ class VCL_DLLPUBLIC SvtGraphicStroke
 {
 public:
     /// Style for open stroke ends
-    enum CapType
+    enum CapType 
     {
         /// No additional cap
-        capButt=0,
+        capButt=0, 
         /// Half-round cap at the line end, the center lying at the end point
-        capRound,
+        capRound, 
         /// Half-square cap at the line end, the center lying at the end point
         capSquare
     };
     /// Style for joins of individual stroke segments
-    enum JoinType
+    enum JoinType 
     {
         /// Extend segment edges, until they cross
-        joinMiter=0,
+        joinMiter=0, 
         /// Connect segments by a filled round arc
-        joinRound,
+        joinRound, 
         /// Connect segments by a direct straight line
-        joinBevel,
+        joinBevel, 
         /// Perform no join, leads to visible gaps between thick line segments
         joinNone
     };
     enum
-    {
+    { 
         /// Width of stroke start/end arrow to exactly fit the joining stroke
         normalizedArrowWidth=65536
     };
@@ -97,19 +97,19 @@ public:
 
         See accessor method descriptions for argument description
      */
-    SvtGraphicStroke( const Polygon&        rPath,
-                      const PolyPolygon&    rStartArrow,
-                      const PolyPolygon&    rEndArrow,
-                      double                fTransparency,
-                      double                fStrokeWidth,
-                      CapType               aCap,
-                      JoinType              aJoin,
-                      double                fMiterLimit,
-                      const DashArray&      rDashArray  );      // TODO: Dash array offset (position where to start, see PS)
+    SvtGraphicStroke( const Polygon& 		rPath,
+                      const PolyPolygon&	rStartArrow,
+                      const PolyPolygon&	rEndArrow,
+                      double				fTransparency,
+                      double 				fStrokeWidth,
+                      CapType				aCap,
+                      JoinType				aJoin,
+                      double 				fMiterLimit,
+                      const DashArray&		rDashArray	);		// TODO: Dash array offset (position where to start, see PS)
 
     // accessors
     /// Query path to stroke
-    void            getPath             ( Polygon& ) const;
+    void		 	getPath				( Polygon& ) const;
     /** Get the polygon that is put at the start of the line
 
         The polygon is in a special normalized position: the center of
@@ -123,7 +123,7 @@ public:
         width, it has to fit every stroke with every stroke width
         exactly.
      */
-    void            getStartArrow       ( PolyPolygon& ) const;
+    void		 	getStartArrow		( PolyPolygon& ) const;
     /** Get the polygon that is put at the end of the line
 
         The polygon is in a special normalized position, and already
@@ -137,28 +137,28 @@ public:
         arrow does have this width, it has to fit every stroke with
         every stroke width exactly.
      */
-    void            getEndArrow         ( PolyPolygon& ) const;
+    void		 	getEndArrow			( PolyPolygon& ) const;
     /** Get stroke transparency
 
         @return the transparency, ranging from 0.0 (opaque) to 1.0 (fully translucent)
      */
-    double          getTransparency     () const;
+    double 			getTransparency		() const;
     /// Get width of the stroke
-    double          getStrokeWidth      () const;
+    double			getStrokeWidth		() const;
     /// Get the style in which open stroke ends are drawn
-    CapType         getCapType          () const;
+    CapType			getCapType			() const;
     /// Get the style in which the stroke segments are joined
-    JoinType        getJoinType         () const;
+    JoinType		getJoinType			() const;
     /// Get the maximum length of mitered joins
-    double          getMiterLimit       () const;
+    double			getMiterLimit		() const;
     /// Get an array of "on" and "off" lengths for stroke dashing
-    void            getDashArray        ( DashArray& ) const;
+    void			getDashArray		( DashArray& ) const;
     /// Query a textual representation of the object's content
-    ::rtl::OString  toString            () const;
+    ::rtl::OString	toString			() const;
 
     // mutators
     /// Set path to stroke
-    void    setPath             ( const Polygon& );
+    void	setPath				( const Polygon& );
     /** Set the polygon that is put at the start of the line
 
         The polygon has to be in a special normalized position, and
@@ -172,7 +172,7 @@ public:
         arrow does have this width, it will fit every stroke with
         every stroke width exactly.
      */
-    void    setStartArrow       ( const PolyPolygon& );
+    void	setStartArrow		( const PolyPolygon& );
     /** Set the polygon that is put at the end of the line
 
         The polygon has to be in a special normalized position, and
@@ -186,38 +186,38 @@ public:
         arrow does have this width, it will fit every stroke with
         every stroke width exactly.
      */
-    void    setEndArrow         ( const PolyPolygon& );
+    void	setEndArrow			( const PolyPolygon& );
     /** Set stroke transparency
 
         @param fTrans
         The transparency, ranging from 0.0 (opaque) to 1.0 (fully translucent)
      */
-    void    setTransparency     ( double fTrans );
+    void	setTransparency		( double fTrans );
     /// Set width of the stroke
-    void    setStrokeWidth      ( double );
+    void	setStrokeWidth		( double );
     /// Set the style in which open stroke ends are drawn
-    void    setCapType          ( CapType );
+    void 	setCapType			( CapType );
     /// Set the style in which the stroke segments are joined
-    void    setJoinType         ( JoinType );
+    void	setJoinType			( JoinType );
     /// Set the maximum length of mitered joins
-    void    setMiterLimit       ( double );
+    void	setMiterLimit		( double );
     /// Set the array of "on" and "off" lengths for stroke dashing
-    void    setDashArray        ( const DashArray& );
+    void	setDashArray		( const DashArray& );
 
 private:
     // friends
     VCL_DLLPUBLIC friend SvStream& operator<<( SvStream& rOStm, const SvtGraphicStroke& rClass );
     VCL_DLLPUBLIC friend SvStream& operator>>( SvStream& rIStm, SvtGraphicStroke& rClass );
 
-    Polygon         maPath;
-    PolyPolygon     maStartArrow;
-    PolyPolygon     maEndArrow;
-    double          mfTransparency;
-    double          mfStrokeWidth;
-    CapType         maCapType;
-    JoinType        maJoinType;
-    double          mfMiterLimit;
-    DashArray       maDashArray;
+    Polygon			maPath;
+    PolyPolygon		maStartArrow;
+    PolyPolygon		maEndArrow;
+    double			mfTransparency;
+    double			mfStrokeWidth;
+    CapType			maCapType;
+    JoinType		maJoinType;
+    double 			mfMiterLimit;
+    DashArray		maDashArray;
 };
 
 /** Encapsulates geometry and associated attributes of a filled area
@@ -248,7 +248,7 @@ public:
             one. The part of the scanline where the winding number is
             non-zero gets filled.
          */
-        fillNonZero=0,
+        fillNonZero=0, 
         /** Even-odd fill rule
 
             Fill shape scanline-wise. Starting at the left, count the
@@ -261,11 +261,11 @@ public:
     enum FillType
     {
         /// Fill with a specified solid color
-        fillSolid=0,
+        fillSolid=0, 
         /// Fill with the specified gradient
-        fillGradient,
+        fillGradient, 
         /// Fill with the specified hatch
-        fillHatch,
+        fillHatch, 
         /// Fill with the specified texture (a Graphic object)
         fillTexture
     };
@@ -273,9 +273,9 @@ public:
     enum HatchType
     {
         /// horizontal parallel lines, one unit apart
-        hatchSingle=0,
+        hatchSingle=0, 
         /// horizontal and verticall orthogonally crossing lines, one unit apart
-        hatchDouble,
+        hatchDouble, 
         /// three crossing lines, like HatchType::hatchDouble, but
         /// with an additional diagonal line, rising to the upper
         /// right corner. The first diagonal line goes through the
@@ -312,40 +312,40 @@ public:
 
         See accessor method descriptions for argument description
      */
-    SvtGraphicFill( const PolyPolygon&  rPath,
-                    Color               aFillColor,
-                    double              fTransparency,
-                    FillRule            aFillRule,
-                    FillType            aFillType,              // TODO: Multitexturing
-                    const Transform&    aFillTransform,
-                    bool                bTiling,
-                    HatchType           aHatchType,             // TODO: vector of directions and start points
-                    Color               aHatchColor,
-                    GradientType        aGradientType,          // TODO: Transparent gradients (orthogonal to normal ones)
-                    Color               aGradient1stColor,      // TODO: vector of colors and offsets
-                    Color               aGradient2ndColor,
-                    int                 aGradientStepCount,     // numbers of steps to render the gradient. gradientStepsInfinite means infinitely many.
-                    const Graphic&      aFillGraphic );
+    SvtGraphicFill( const PolyPolygon& 	rPath,
+                    Color				aFillColor,
+                    double				fTransparency,
+                    FillRule			aFillRule,
+                    FillType			aFillType,				// TODO: Multitexturing
+                    const Transform&	aFillTransform,
+                    bool				bTiling,
+                    HatchType			aHatchType,				// TODO: vector of directions and start points
+                    Color				aHatchColor,
+                    GradientType		aGradientType,			// TODO: Transparent gradients (orthogonal to normal ones)
+                    Color				aGradient1stColor,		// TODO: vector of colors and offsets
+                    Color				aGradient2ndColor,
+                    int					aGradientStepCount,		// numbers of steps to render the gradient. gradientStepsInfinite means infinitely many.
+                    const Graphic&		aFillGraphic );
 
     // accessors
     /// Query path to fill
-    void            getPath             ( PolyPolygon& ) const;
+    void		 	getPath				( PolyPolygon& ) const;
     /// Get color used for solid fills
-    Color           getFillColor        () const;
+    Color		 	getFillColor		() const;
     /** Get stroke transparency
 
         @return the transparency, ranging from 0.0 (opaque) to 1.0 (fully translucent)
      */
-    double          getTransparency     () const;
+    double 			getTransparency		() const;
     /// Get fill rule used
-    FillRule        getFillRule         () const;
+    FillRule		getFillRule			() const;
     /** Get fill type used
 
         Currently, only one of the fill types can be used
         simultaneously. If you specify e.g. FillRule::fillGradient,
         hatching, texture and solid fill color are ignored.
      */
-    FillType        getFillType         () const;
+    FillType		getFillType			() const;
     /** Get transformation applied to hatch, gradient or texture during fill
 
         A fill operation generally starts at the top left position of
@@ -357,29 +357,29 @@ public:
         top left corner plus the translation components.
 
      */
-    void            getTransform        ( Transform& ) const;
+    void			getTransform		( Transform& ) const;
     /// deprecated
-    bool            IsTiling            () const;
+    bool			IsTiling			() const;
     /** Query state of texture tiling
 
         @return true, if texture is tiled, false, if output only once.
      */
-    bool            isTiling            () const;
+    bool			isTiling			() const;
     /// Get type of hatch used
-    HatchType       getHatchType        () const;
+    HatchType		getHatchType		() const;
     /// Get color used for drawing the hatch
-    Color           getHatchColor       () const;
+    Color			getHatchColor		() const;
     /// Get type of gradient used
-    GradientType    getGradientType     () const;
+    GradientType	getGradientType		() const;
     /// Get start color of the gradient
-    Color           getGradient1stColor () const;
+    Color			getGradient1stColor	() const;
     /// Get end color of the gradient
-    Color           getGradient2ndColor () const;
-    /** Get the numbers of steps to render the gradient.
+    Color			getGradient2ndColor	() const;
+    /** Get the numbers of steps to render the gradient. 
 
         @return the step count. gradientStepsInfinite means infinitely many.
     */
-    int             getGradientStepCount() const;
+    int				getGradientStepCount() const;
     /** Get the texture graphic used
 
         The Graphic object returned is used to fill the geometry, if
@@ -387,76 +387,76 @@ public:
         assumed to be of size 1x1, the transformation is used to scale
         it to the appropriate size.
      */
-    void            getGraphic          ( Graphic& ) const;
+    void			getGraphic			( Graphic& ) const;
     /// Query a textual representation of the object's content
-    ::rtl::OString  toString            () const;
+    ::rtl::OString	toString			() const;
 
     // mutators
     /// Set path to fill
-    void    setPath             ( const PolyPolygon& rPath );
-    /// Set color used for solid fills
-    void    setFillColor        ( Color aFillColor );
+    void 	setPath				( const PolyPolygon& rPath );
+    /// Set color used for solid fills    
+    void 	setFillColor		( Color aFillColor );
     /** Set stroke transparency
 
         @param fTransparency
         The transparency, ranging from 0.0 (opaque) to 1.0 (fully translucent)
      */
-    void    setTransparency     ( double fTransparency );
+    void	setTransparency		( double fTransparency );
     /// Set fill rule used
-    void    setFillRule         ( FillRule aFillRule );
+    void	setFillRule			( FillRule aFillRule );
     /** Set fill type used
 
         Currently, only one of the fill types can be used
         simultaneously. If you specify e.g. FillRule::fillGradient,
         hatching, texture and solid fill color are ignored.
      */
-    void    setFillType         ( FillType aFillType );
+    void	setFillType			( FillType aFillType );
     /// Set transformation applied to hatch, gradient or texture during fill
-    void    setTransform        ( const Transform& pTransform );
+    void	setTransform		( const Transform& pTransform );
     /** Set state of texture tiling
 
         @param bTiling
         If set to true, texture is tiled, if set to false, texture is output only once.
      */
-    void    setTiling           ( bool bTiling = true );
+    void	setTiling			( bool bTiling = true );
     /// Set type of hatch used
-    void    setHatchType        ( HatchType aHatchType );
+    void	setHatchType		( HatchType aHatchType );
     /// Set color used for drawing the hatch
-    void    setHatchColor       ( Color aHatchColor );
+    void	setHatchColor		( Color aHatchColor );
     /// Set type of gradient used
-    void    setGradientType     ( GradientType aGradType );
+    void	setGradientType		( GradientType aGradType );
     /// Set start color of the gradient
-    void    setGradient1stColor ( Color aColor );
+    void	setGradient1stColor	( Color aColor );
     /// Set end color of the gradient
-    void    setGradient2ndColor ( Color aColor );
-    /** Set the numbers of steps to render the gradient.
+    void	setGradient2ndColor	( Color aColor );
+    /** Set the numbers of steps to render the gradient. 
 
         @param aCount
         The step count. gradientStepsInfinite means use infinitely many.
     */
-    void    setGradientStepCount( int aCount );
+    void	setGradientStepCount( int aCount );
     /// Set the texture graphic used
-    void    setGraphic          ( const Graphic& rGraphic );
+    void	setGraphic			( const Graphic& rGraphic );
 
 private:
     // friends
     VCL_DLLPUBLIC friend SvStream& operator<<( SvStream& rOStm, const SvtGraphicFill& rClass );
     VCL_DLLPUBLIC friend SvStream& operator>>( SvStream& rIStm, SvtGraphicFill& rClass );
 
-    PolyPolygon     maPath;
-    Color           maFillColor;
-    double          mfTransparency;
-    FillRule        maFillRule;
-    FillType        maFillType;
-    Transform       maFillTransform;
-    bool            mbTiling;
-    HatchType       maHatchType;
-    Color           maHatchColor;
-    GradientType    maGradientType;
-    Color           maGradient1stColor;
-    Color           maGradient2ndColor;
-    int             maGradientStepCount;
-    Graphic         maFillGraphic;
+    PolyPolygon 	maPath;
+    Color			maFillColor;
+    double			mfTransparency;
+    FillRule		maFillRule;
+    FillType		maFillType;
+    Transform		maFillTransform;
+    bool			mbTiling;
+    HatchType		maHatchType;
+    Color			maHatchColor;
+    GradientType	maGradientType;
+    Color			maGradient1stColor;
+    Color			maGradient2ndColor;
+    int				maGradientStepCount;
+    Graphic			maFillGraphic;
 };
 
 #endif /* _VCL_GRAPHICTOOLS_HXX_ */
diff --git a/vcl/inc/vcl/graphite_adaptors.hxx b/vcl/inc/vcl/graphite_adaptors.hxx
index e58881c9f463..0e722b261817 100644
--- a/vcl/inc/vcl/graphite_adaptors.hxx
+++ b/vcl/inc/vcl/graphite_adaptors.hxx
@@ -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
diff --git a/vcl/inc/vcl/graphite_cache.hxx b/vcl/inc/vcl/graphite_cache.hxx
index af1392ed4d4b..575e5bb4e889 100644
--- a/vcl/inc/vcl/graphite_cache.hxx
+++ b/vcl/inc/vcl/graphite_cache.hxx
@@ -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
diff --git a/vcl/inc/vcl/graphite_features.hxx b/vcl/inc/vcl/graphite_features.hxx
index 47f4c3a01e7f..6cd11dfbb384 100644
--- a/vcl/inc/vcl/graphite_features.hxx
+++ b/vcl/inc/vcl/graphite_features.hxx
@@ -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
diff --git a/vcl/inc/vcl/graphite_layout.hxx b/vcl/inc/vcl/graphite_layout.hxx
index 765a154a9898..5b897e1a7fdf 100644
--- a/vcl/inc/vcl/graphite_layout.hxx
+++ b/vcl/inc/vcl/graphite_layout.hxx
@@ -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
diff --git a/vcl/inc/vcl/graphite_serverfont.hxx b/vcl/inc/vcl/graphite_serverfont.hxx
index 19eb70b11908..c95b0bb71ca6 100644
--- a/vcl/inc/vcl/graphite_serverfont.hxx
+++ b/vcl/inc/vcl/graphite_serverfont.hxx
@@ -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
diff --git a/vcl/inc/vcl/group.hxx b/vcl/inc/vcl/group.hxx
index 48461ec18ac0..045993f25076 100644
--- a/vcl/inc/vcl/group.hxx
+++ b/vcl/inc/vcl/group.hxx
@@ -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
@@ -47,7 +47,7 @@ private:
     SAL_DLLPRIVATE void     ImplDraw( OutputDevice* pDev, ULONG nDrawFlags,
                                       const Point& rPos, const Size& rSize, bool bLayout = false );
 
-    virtual void    FillLayoutData() const;
+    virtual void	FillLayoutData() const;
     virtual const Font&
                     GetCanonicalFont( const StyleSettings& _rStyle ) const;
     virtual const Color&
diff --git a/vcl/inc/vcl/hatch.hxx b/vcl/inc/vcl/hatch.hxx
index 5a8e36088f2e..5a0f456e5ae2 100644
--- a/vcl/inc/vcl/hatch.hxx
+++ b/vcl/inc/vcl/hatch.hxx
@@ -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
@@ -41,17 +41,17 @@ class SvStream;
 
 struct ImplHatch
 {
-    ULONG               mnRefCount;
-    Color               maColor;
-    HatchStyle          meStyle;
-    long                mnDistance;
-    USHORT              mnAngle;
+    ULONG				mnRefCount;
+    Color				maColor;
+    HatchStyle			meStyle;
+    long				mnDistance;
+    USHORT				mnAngle;
 
                         ImplHatch();
                         ImplHatch( const ImplHatch& rImplHatch );
 
-    friend SvStream&    operator>>( SvStream& rIStm, ImplHatch& rImplHatch );
-    friend SvStream&    operator<<( SvStream& rOStm, const ImplHatch& rImplHatch );
+    friend SvStream&	operator>>( SvStream& rIStm, ImplHatch& rImplHatch );
+    friend SvStream&	operator<<( SvStream& rOStm, const ImplHatch& rImplHatch );
 };
 
 // ---------
@@ -60,10 +60,10 @@ struct ImplHatch
 
 class VCL_DLLPUBLIC Hatch
 {
-private:
+private:	
 
-    ImplHatch*          mpImplHatch;
-    SAL_DLLPRIVATE void ImplMakeUnique();
+    ImplHatch*		    mpImplHatch;
+    SAL_DLLPRIVATE void	ImplMakeUnique();
 
 public:
 
@@ -72,19 +72,19 @@ public:
                     Hatch( HatchStyle eStyle, const Color& rHatchColor, long nDistance, USHORT nAngle10 = 0 );
                     ~Hatch();
 
-    Hatch&          operator=( const Hatch& rHatch );
+    Hatch&			operator=( const Hatch& rHatch );
     BOOL            operator==( const Hatch& rHatch ) const;
     BOOL            operator!=( const Hatch& rHatch ) const { return !(Hatch::operator==( rHatch ) ); }
     BOOL            IsSameInstance( const Hatch& rHatch ) const { return( mpImplHatch == rHatch.mpImplHatch ); }
 
     void            SetStyle( HatchStyle eStyle );
-    HatchStyle      GetStyle() const { return mpImplHatch->meStyle; }
+    HatchStyle		GetStyle() const { return mpImplHatch->meStyle; }
 
     void            SetColor( const Color& rColor  );
-    const Color&    GetColor() const { return mpImplHatch->maColor; }
+    const Color&	GetColor() const { return mpImplHatch->maColor; }
 
     void            SetDistance( long nDistance  );
-    long            GetDistance() const { return mpImplHatch->mnDistance; }
+    long			GetDistance() const { return mpImplHatch->mnDistance; }
 
     void            SetAngle( USHORT nAngle10 );
     USHORT          GetAngle() const { return mpImplHatch->mnAngle; }
diff --git a/vcl/inc/vcl/help.hxx b/vcl/inc/vcl/help.hxx
index 30308aa8a723..6662be5b121c 100644
--- a/vcl/inc/vcl/help.hxx
+++ b/vcl/inc/vcl/help.hxx
@@ -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
@@ -40,20 +40,20 @@ class Window;
 // - Help-Types -
 // --------------
 
-#define QUICKHELP_LEFT      ((USHORT)0x0001)
-#define QUICKHELP_CENTER    ((USHORT)0x0002)
-#define QUICKHELP_RIGHT     ((USHORT)0x0004)
-#define QUICKHELP_TOP       ((USHORT)0x0008)
-#define QUICKHELP_VCENTER   ((USHORT)0x0010)
-#define QUICKHELP_BOTTOM    ((USHORT)0x0020)
+#define QUICKHELP_LEFT		((USHORT)0x0001)
+#define QUICKHELP_CENTER	((USHORT)0x0002)
+#define QUICKHELP_RIGHT 	((USHORT)0x0004)
+#define QUICKHELP_TOP		((USHORT)0x0008)
+#define QUICKHELP_VCENTER	((USHORT)0x0010)
+#define QUICKHELP_BOTTOM	((USHORT)0x0020)
 #define QUICKHELP_NOAUTOPOS (QUICKHELP_LEFT | QUICKHELP_CENTER | QUICKHELP_RIGHT | QUICKHELP_TOP | QUICKHELP_VCENTER | QUICKHELP_BOTTOM)
-#define QUICKHELP_CTRLTEXT  ((USHORT)0x0040)
+#define QUICKHELP_CTRLTEXT	((USHORT)0x0040)
 #define QUICKHELP_NOEVADEPOINTER ((USHORT)0x4000)
-#define QUICKHELP_BIDI_RTL  ((USHORT)0x8000)
+#define QUICKHELP_BIDI_RTL	((USHORT)0x8000)
 
 // By changes you must also change: rsc/vclrsc.hxx
-#define OOO_HELP_INDEX          ((ULONG)0xFFFFFFFF)
-#define OOO_HELP_HELPONHELP     ((ULONG)0xFFFFFFFE)
+#define OOO_HELP_INDEX			((ULONG)0xFFFFFFFF)
+#define OOO_HELP_HELPONHELP 	((ULONG)0xFFFFFFFE)
 
 // --------
 // - Help -
@@ -62,62 +62,62 @@ class Window;
 class VCL_DLLPUBLIC Help
 {
 private:
-    String              maHelpFile;
+    String				maHelpFile;
 
 public:
                         Help();
-    virtual             ~Help();
+    virtual				~Help();
 
-    void                SetHelpFile( const String& rFileName ) { maHelpFile = rFileName; }
-    const String&       GetHelpFile() const { return maHelpFile; }
+    void				SetHelpFile( const String& rFileName ) { maHelpFile = rFileName; }
+    const String&		GetHelpFile() const { return maHelpFile; }
 
-    virtual BOOL        Start( ULONG nHelpId, const Window* pWindow  );
-    virtual BOOL        Start( const XubString& rKeyWord, const Window* pWindow );
-    virtual void        OpenHelpAgent( ULONG nHelpId );
-    virtual XubString   GetHelpText( ULONG nHelpId, const Window* pWindow );
+    virtual BOOL		Start( ULONG nHelpId, const Window* pWindow  );
+    virtual BOOL		Start( const XubString& rKeyWord, const Window* pWindow );
+    virtual void		OpenHelpAgent( ULONG nHelpId );
+    virtual XubString	GetHelpText( ULONG nHelpId, const Window* pWindow );
     virtual XubString   GetHelpText( const String& aHelpURL, const Window* pWindow );
 
-    static void         EnableContextHelp();
-    static void         DisableContextHelp();
-    static BOOL         IsContextHelpEnabled();
-    static BOOL         StartContextHelp();
-
-    static void         EnableExtHelp();
-    static void         DisableExtHelp();
-    static BOOL         IsExtHelpEnabled();
-    static BOOL         StartExtHelp();
-    static BOOL         EndExtHelp();
-    static BOOL         IsExtHelpActive();
-
-    static void         EnableBalloonHelp();
-    static void         DisableBalloonHelp();
-    static BOOL         IsBalloonHelpEnabled();
-    static BOOL         ShowBalloon( Window* pParent,
+    static void 		EnableContextHelp();
+    static void 		DisableContextHelp();
+    static BOOL 		IsContextHelpEnabled();
+    static BOOL 		StartContextHelp();
+
+    static void 		EnableExtHelp();
+    static void 		DisableExtHelp();
+    static BOOL 		IsExtHelpEnabled();
+    static BOOL 		StartExtHelp();
+    static BOOL 		EndExtHelp();
+    static BOOL 		IsExtHelpActive();
+
+    static void 		EnableBalloonHelp();
+    static void 		DisableBalloonHelp();
+    static BOOL 		IsBalloonHelpEnabled();
+    static BOOL 		ShowBalloon( Window* pParent,
                                      const Point& rScreenPos,
                                      const XubString& rHelpText );
-    static BOOL         ShowBalloon( Window* pParent,
+    static BOOL 		ShowBalloon( Window* pParent,
                                      const Point& rScreenPos,
                                      const Rectangle&,
                                      const XubString& rHelpText );
 
-    static void         EnableQuickHelp();
-    static void         DisableQuickHelp();
-    static BOOL         IsQuickHelpEnabled();
-    static BOOL         ShowQuickHelp( Window* pParent,
+    static void 		EnableQuickHelp();
+    static void 		DisableQuickHelp();
+    static BOOL 		IsQuickHelpEnabled();
+    static BOOL 		ShowQuickHelp( Window* pParent,
                                        const Rectangle& rScreenRect,
                                        const XubString& rHelpText,
                                        const XubString& rLongHelpText,
                                        USHORT nStyle = 0 );
-    static BOOL         ShowQuickHelp( Window* pParent,
+    static BOOL 		ShowQuickHelp( Window* pParent,
                                        const Rectangle& rScreenRect,
                                        const XubString& rHelpText,
                                        USHORT nStyle = 0 )
                             { return Help::ShowQuickHelp( pParent, rScreenRect, rHelpText, XubString(), nStyle ); }
 
-    static ULONG        ShowTip( Window* pParent,
+    static ULONG		ShowTip( Window* pParent,
                                  const Rectangle& rScreenRect,
                                  const XubString& rText, USHORT nStyle = 0 );
-    static void         HideTip( ULONG nId );
+    static void 		HideTip( ULONG nId );
 };
 
-#endif  // _SV_HELP_HXX
+#endif	// _SV_HELP_HXX
diff --git a/vcl/inc/vcl/helper.hxx b/vcl/inc/vcl/helper.hxx
index 9047079f6be1..ebbd3b8a8199 100644
--- a/vcl/inc/vcl/helper.hxx
+++ b/vcl/inc/vcl/helper.hxx
@@ -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
diff --git a/vcl/inc/vcl/helpwin.hxx b/vcl/inc/vcl/helpwin.hxx
index 244ae1b7d846..46abcee9f50c 100644
--- a/vcl/inc/vcl/helpwin.hxx
+++ b/vcl/inc/vcl/helpwin.hxx
@@ -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
@@ -38,48 +38,48 @@
 class HelpTextWindow : public FloatingWindow
 {
 private:
-    Point               maPos;
-    Rectangle           maHelpArea; // Wenn naechste Hilfe fuers gleiche Rectangle, gleicher Text, dann Fenster stehen lassen
+    Point				maPos;
+    Rectangle			maHelpArea; // Wenn naechste Hilfe fuers gleiche Rectangle, gleicher Text, dann Fenster stehen lassen
 
-    Rectangle           maTextRect; // Bei umgebrochenen Text in QuickHelp
+    Rectangle			maTextRect; // Bei umgebrochenen Text in QuickHelp
 
-    String              maHelpText;
-    String              maStatusText;
+    String				maHelpText;
+    String				maStatusText;
 
-    Timer               maShowTimer;
-    Timer               maHideTimer;
+    Timer				maShowTimer;
+    Timer				maHideTimer;
 
-    USHORT              mnHelpWinStyle;
-    USHORT              mnStyle;
+    USHORT				mnHelpWinStyle;
+    USHORT				mnStyle;
 
 protected:
                         DECL_LINK( TimerHdl, Timer* );
-    virtual void        Paint( const Rectangle& );
-    virtual void        RequestHelp( const HelpEvent& rHEvt );
-    virtual String      GetText() const;
-    void                ImplShow();
+    virtual void		Paint( const Rectangle& );
+    virtual void		RequestHelp( const HelpEvent& rHEvt );
+    virtual String   	GetText() const;
+    void				ImplShow();
 
 public:
                         HelpTextWindow( Window* pParent, const String& rText, USHORT nHelpWinStyle, USHORT nStyle );
                         ~HelpTextWindow();
 
-    const String&       GetHelpText() const { return maHelpText; }
-    void                SetHelpText( const String& rHelpText );
-    USHORT              GetWinStyle() const { return mnHelpWinStyle; }
+    const String&		GetHelpText() const { return maHelpText; }
+    void				SetHelpText( const String& rHelpText );
+    USHORT				GetWinStyle() const { return mnHelpWinStyle; }
 
     // Nur merken:
-    void                SetStatusText( const String& rStatusText ) { maStatusText = rStatusText; }
-    void                SetHelpArea( const Rectangle& rRect ) { maHelpArea = rRect; }
+    void				SetStatusText( const String& rStatusText ) { maStatusText = rStatusText; }
+    void				SetHelpArea( const Rectangle& rRect ) { maHelpArea = rRect; }
 
-    void                ShowHelp( USHORT nDelayMode );
+    void				ShowHelp( USHORT nDelayMode );
 
-    Size                CalcOutSize() const;
-    const Rectangle&    GetHelpArea() const { return maHelpArea; }
+    Size				CalcOutSize() const;
+    const Rectangle&	GetHelpArea() const { return maHelpArea; }
 
     virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > CreateAccessible();
 
-    BOOL                RegisterAccessibleParent();
-    void                RevokeAccessibleParent();
+    BOOL				RegisterAccessibleParent();
+    void				RevokeAccessibleParent();
 };
 
 void ImplShowHelpWindow( Window* pParent, USHORT nHelpWinStyle, USHORT nStyle,
diff --git a/vcl/inc/vcl/i18nhelp.hxx b/vcl/inc/vcl/i18nhelp.hxx
index 8f6a12f95761..dd046b9a86e4 100644
--- a/vcl/inc/vcl/i18nhelp.hxx
+++ b/vcl/inc/vcl/i18nhelp.hxx
@@ -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
@@ -38,7 +38,7 @@ namespace com {
 namespace sun {
 namespace star {
 namespace lang {
-    class XMultiServiceFactory;
+    class XMultiServiceFactory; 
 }
 }}}
 
@@ -56,7 +56,7 @@ namespace vcl
 class VCL_DLLPUBLIC I18nHelper
 {
 private:
-    ::osl::Mutex                    maMutex;
+    ::osl::Mutex	                maMutex;
     ::com::sun::star::lang::Locale  maLocale;
     ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > mxMSF;
 
@@ -87,11 +87,11 @@ public:
 
     String      GetDate( const Date& rDate ) const;
     String      GetNum( long nNumber, USHORT nDecimals, BOOL bUseThousandSep = TRUE, BOOL bTrailingZeros = TRUE ) const;
-
+    
     static String filterFormattingChars( const String& );
 };
 
-}   // namespace vcl
+}	// namespace vcl
 
 #endif  // _VCL_I18NHELP_HXX
 
diff --git a/vcl/inc/vcl/idlemgr.hxx b/vcl/inc/vcl/idlemgr.hxx
index 6d7d7c8e531f..639d246188b7 100644
--- a/vcl/inc/vcl/idlemgr.hxx
+++ b/vcl/inc/vcl/idlemgr.hxx
@@ -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
diff --git a/vcl/inc/vcl/ilstbox.hxx b/vcl/inc/vcl/ilstbox.hxx
index ac278f76f65b..0ea56adb104f 100644
--- a/vcl/inc/vcl/ilstbox.hxx
+++ b/vcl/inc/vcl/ilstbox.hxx
@@ -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
@@ -44,8 +44,8 @@ class ScrollBarBox;
 // - ListBox-Types -
 // -----------------
 
-#define HORZ_SCROLL         4
-#define IMG_TXT_DISTANCE    6
+#define HORZ_SCROLL 		4
+#define IMG_TXT_DISTANCE	6
 
 enum LB_EVENT_TYPE
 {
@@ -62,11 +62,11 @@ enum LB_EVENT_TYPE
 
 struct ImplEntryType
 {
-    XubString   maStr;
-    Image       maImage;
-    void*       mpUserData;
-    BOOL        mbIsSelected;
-    long        mnFlags;
+    XubString	maStr;
+    Image		maImage;
+    void*		mpUserData;
+    BOOL		mbIsSelected;
+    long		mnFlags;
     long        mnHeight;
 
                 ImplEntryType( const XubString& rStr, const Image& rImage ) :
@@ -106,31 +106,31 @@ class ImplEntryList : private List
 {
 private:
     Window*         mpWindow;   // For getting the current locale when matching strings
-    USHORT          mnLastSelected;
-    USHORT          mnSelectionAnchor;
-    USHORT          mnImages;
+    USHORT			mnLastSelected;
+    USHORT			mnSelectionAnchor;
+    USHORT			mnImages;
 
-    USHORT          mnMRUCount;
-    USHORT          mnMaxMRUCount;
+    USHORT			mnMRUCount;
+    USHORT			mnMaxMRUCount;
 
-    Link            maSelectionChangedHdl;
-    BOOL            mbCallSelectionChangedHdl;
+    Link			maSelectionChangedHdl;
+    BOOL			mbCallSelectionChangedHdl;
 
-    ImplEntryType*  GetEntry( USHORT nPos ) const { return (ImplEntryType*)List::GetObject( nPos ); }
+    ImplEntryType*	GetEntry( USHORT nPos )	const { return (ImplEntryType*)List::GetObject( nPos ); }
 
 public:
                     ImplEntryList( Window* pWindow );
                     ~ImplEntryList();
 
-    USHORT                  InsertEntry( USHORT nPos, ImplEntryType* pNewEntry, BOOL bSort );
-    void                    RemoveEntry( USHORT nPos );
-    const ImplEntryType*    GetEntryPtr( USHORT nPos ) const { return (const ImplEntryType*) GetObject( nPos ); }
-    ImplEntryType*          GetMutableEntryPtr( USHORT nPos ) const { return (ImplEntryType*) GetObject( nPos ); }
-    void                    Clear();
+    USHORT					InsertEntry( USHORT nPos, ImplEntryType* pNewEntry, BOOL bSort );
+    void					RemoveEntry( USHORT nPos );
+    const ImplEntryType* 	GetEntryPtr( USHORT nPos ) const { return (const ImplEntryType*) GetObject( nPos ); }
+    ImplEntryType* 	        GetMutableEntryPtr( USHORT nPos ) const { return (ImplEntryType*) GetObject( nPos ); }
+    void					Clear();
 
-    USHORT          FindMatchingEntry( const XubString& rStr, USHORT nStart = 0, BOOL bForward = TRUE, BOOL bLazy = TRUE ) const;
-    USHORT          FindEntry( const XubString& rStr, BOOL bSearchMRUArea = FALSE ) const;
-    USHORT          FindEntry( const void* pData ) const;
+    USHORT			FindMatchingEntry( const XubString& rStr, USHORT nStart = 0, BOOL bForward = TRUE, BOOL bLazy = TRUE ) const;
+    USHORT			FindEntry( const XubString& rStr, BOOL bSearchMRUArea = FALSE ) const;
+    USHORT			FindEntry( const void* pData ) const;
 
     // helper: add up heights up to index nEndIndex.
     // GetAddedHeight( 0 ) returns 0
@@ -139,54 +139,54 @@ public:
     long            GetAddedHeight( USHORT nEndIndex, USHORT nBeginIndex = 0, long nBeginHeight = 0 ) const;
     long            GetEntryHeight( USHORT nPos ) const;
 
-    USHORT          GetEntryCount() const { return (USHORT)List::Count(); }
-    BOOL            HasImages() const { return mnImages ? TRUE : FALSE; }
+    USHORT			GetEntryCount() const { return (USHORT)List::Count(); }
+    BOOL			HasImages() const { return mnImages ? TRUE : FALSE; }
 
-    XubString       GetEntryText( USHORT nPos ) const;
+    XubString		GetEntryText( USHORT nPos ) const;
 
-    BOOL            HasEntryImage( USHORT nPos ) const;
-    Image           GetEntryImage( USHORT nPos ) const;
+    BOOL			HasEntryImage( USHORT nPos ) const;
+    Image			GetEntryImage( USHORT nPos ) const;
 
-    void            SetEntryData( USHORT nPos, void* pNewData );
-    void*           GetEntryData( USHORT nPos ) const;
+    void			SetEntryData( USHORT nPos, void* pNewData );
+    void*			GetEntryData( USHORT nPos ) const;
 
-    void            SetEntryFlags( USHORT nPos, long nFlags );
-    long            GetEntryFlags( USHORT nPos ) const;
+    void			SetEntryFlags( USHORT nPos, long nFlags );
+    long			GetEntryFlags( USHORT nPos ) const;
 
-    void            SelectEntry( USHORT nPos, BOOL bSelect );
+    void			SelectEntry( USHORT nPos, BOOL bSelect );
 
-    USHORT          GetSelectEntryCount() const;
-    XubString       GetSelectEntry( USHORT nIndex ) const;
-    USHORT          GetSelectEntryPos( USHORT nIndex ) const;
-    BOOL            IsEntrySelected( const XubString& rStr ) const;
-    BOOL            IsEntryPosSelected( USHORT nIndex ) const;
+    USHORT			GetSelectEntryCount() const;
+    XubString		GetSelectEntry( USHORT nIndex ) const;
+    USHORT			GetSelectEntryPos( USHORT nIndex ) const;
+    BOOL			IsEntrySelected( const XubString& rStr ) const;
+    BOOL			IsEntryPosSelected( USHORT nIndex ) const;
 
-    void            SetLastSelected( USHORT nPos )  { mnLastSelected = nPos; }
-    USHORT          GetLastSelected() const { return mnLastSelected; }
+    void			SetLastSelected( USHORT nPos )	{ mnLastSelected = nPos; }
+    USHORT			GetLastSelected() const { return mnLastSelected; }
 
-    void            SetSelectionAnchor( USHORT nPos )   { mnSelectionAnchor = nPos; }
-    USHORT          GetSelectionAnchor() const { return mnSelectionAnchor; }
+    void			SetSelectionAnchor( USHORT nPos )	{ mnSelectionAnchor = nPos; }
+    USHORT			GetSelectionAnchor() const { return mnSelectionAnchor; }
 
 
-    void            SetSelectionChangedHdl( const Link& rLnk )  { maSelectionChangedHdl = rLnk; }
-    void            SetCallSelectionChangedHdl( BOOL bCall )    { mbCallSelectionChangedHdl = bCall; }
+    void			SetSelectionChangedHdl( const Link& rLnk )	{ maSelectionChangedHdl = rLnk; }
+    void			SetCallSelectionChangedHdl( BOOL bCall )	{ mbCallSelectionChangedHdl = bCall; }
 
-    void            SetMRUCount( USHORT n ) { mnMRUCount = n; }
-    USHORT          GetMRUCount() const     { return mnMRUCount; }
+    void			SetMRUCount( USHORT n )	{ mnMRUCount = n; }
+    USHORT			GetMRUCount() const		{ return mnMRUCount; }
 
-    void            SetMaxMRUCount( USHORT n )  { mnMaxMRUCount = n; }
-    USHORT          GetMaxMRUCount() const      { return mnMaxMRUCount; }
+    void			SetMaxMRUCount( USHORT n )	{ mnMaxMRUCount = n; }
+    USHORT			GetMaxMRUCount() const		{ return mnMaxMRUCount; }
 
-    /** An Entry is selectable if its mnFlags does not have the
+    /**	An Entry is selectable if its mnFlags does not have the 
         LISTBOX_ENTRY_FLAG_DISABLE_SELECTION flag set. */
-    bool            IsEntrySelectable( USHORT nPos ) const;
+    bool			IsEntrySelectable( USHORT nPos ) const;
 
     /** returns the first entry found from the given position nPos that is selectable
         or LISTBOX_ENTRY_NOTFOUND if non is found. If the entry at nPos is not selectable,
         it returns the first selectable entry after nPos if bForward is true and the
         first selectable entry after nPos is bForward is false.
         */
-    USHORT          FindFirstSelectable( USHORT nPos, bool bForward = true );
+    USHORT			FindFirstSelectable( USHORT nPos, bool bForward = true );
 };
 
 // ---------------------
@@ -196,89 +196,89 @@ public:
 class ImplListBoxWindow : public Control
 {
 private:
-    ImplEntryList*  mpEntryList;     // EntryListe
-    Rectangle       maFocusRect;
-    String          maSearchStr;
-    Timer           maSearchTimeout;
+    ImplEntryList*	mpEntryList;	 // EntryListe
+    Rectangle		maFocusRect;
+    String			maSearchStr;
+    Timer			maSearchTimeout;
 
-    Size            maUserItemSize;
+    Size			maUserItemSize;
 
-    long            mnMaxTxtHeight;  // Maximale Hoehe eines Text-Items
-    long            mnMaxTxtWidth;   // Maximale Breite eines Text-Items
+    long			mnMaxTxtHeight;  // Maximale Hoehe eines Text-Items
+    long			mnMaxTxtWidth;	 // Maximale Breite eines Text-Items
                                      // Entry ohne Image
-    long            mnMaxImgTxtWidth;// Maximale Breite eines Text-Items
+    long			mnMaxImgTxtWidth;// Maximale Breite eines Text-Items
                                      // Entry UND Image
-    long            mnMaxImgWidth;   // Maximale Breite eines Image-Items
-    long            mnMaxImgHeight;  // Maximale Hoehe eines Image-Items
-    long            mnMaxWidth;      // Maximale Breite eines Eintrags
-    long            mnMaxHeight;     // Maximale Hoehe eines Eintrags
+    long			mnMaxImgWidth;	 // Maximale Breite eines Image-Items
+    long			mnMaxImgHeight;  // Maximale Hoehe eines Image-Items
+    long			mnMaxWidth; 	 // Maximale Breite eines Eintrags
+    long			mnMaxHeight;	 // Maximale Hoehe eines Eintrags
 
-    USHORT          mnCurrentPos;    // Position (Focus)
-    USHORT          mnTrackingSaveSelection; // Selektion vor Tracking();
+    USHORT			mnCurrentPos;	 // Position (Focus)
+    USHORT			mnTrackingSaveSelection; // Selektion vor Tracking();
 
-    USHORT          mnSeparatorPos; // Separator
+    USHORT			mnSeparatorPos;	// Separator
 
-    USHORT          mnUserDrawEntry;
+    USHORT			mnUserDrawEntry;
 
-    USHORT          mnTop;           // Ausgabe ab Zeile
-    long            mnLeft;          // Ausgabe ab Spalte
-    long            mnBorder;        // Abstand Rahmen - Text
-    long            mnTextHeight;    // Texthoehe
+    USHORT			mnTop;			 // Ausgabe ab Zeile
+    long			mnLeft; 		 // Ausgabe ab Spalte
+    long			mnBorder;		 // Abstand Rahmen - Text
+    long			mnTextHeight;	 // Texthoehe
     ProminentEntry  meProminentType; // where is the "prominent" entry
 
-    USHORT          mnSelectModifier;   // Modifiers
-
-    BOOL            mbHasFocusRect:         1,
-                    mbSort:                 1,  // ListBox sortiert
-                    mbTrack:                1,  // Tracking
-                    mbMulti:                1,  // MultiListBox
-                    mbStackMode:            1,  // StackSelection
-                    mbSimpleMode:           1,  // SimpleMode fuer MultiListBox
-                    mbImgsDiffSz:           1,  // Images haben verschiedene Groessen
-                    mbTravelSelect:         1,  // TravelSelect
-                    mbTrackingSelect:       1,  // Selektiert bei MouseMove
-                    mbSelectionChanged:     1,  // Select() nicht zu oft rufen...
-                    mbMouseMoveSelect:      1,  // Selektieren bei MouseMove
-                    mbGrabFocus:            1,  // Focus bei MBDown grabben
-                    mbUserDrawEnabled:      1,  // UserDraw possible
-                    mbInUserDraw:           1,  // In UserDraw
-                    mbReadOnly:             1,  // ReadOnly
-                    mbMirroring:            1,  // pb: #106948# explicit mirroring for calc
+    USHORT			mnSelectModifier;	// Modifiers
+
+    BOOL			mbHasFocusRect:         1,
+                    mbSort: 				1,	// ListBox sortiert
+                    mbTrack:				1,	// Tracking
+                    mbMulti:				1,	// MultiListBox
+                    mbStackMode:			1,	// StackSelection
+                    mbSimpleMode:			1,	// SimpleMode fuer MultiListBox
+                    mbImgsDiffSz:			1,	// Images haben verschiedene Groessen
+                    mbTravelSelect: 		1,	// TravelSelect
+                    mbTrackingSelect: 		1,	// Selektiert bei MouseMove
+                    mbSelectionChanged:		1,	// Select() nicht zu oft rufen...
+                    mbMouseMoveSelect:		1,  // Selektieren bei MouseMove
+                    mbGrabFocus:			1,  // Focus bei MBDown grabben
+                    mbUserDrawEnabled:		1,	// UserDraw possible
+                    mbInUserDraw:			1,	// In UserDraw
+                    mbReadOnly:				1,	// ReadOnly
+                    mbMirroring:			1,	// pb: #106948# explicit mirroring for calc
                     mbRight:                1,  // right align Text output
                     mbCenter:               1;  // center Text output
 
-    Link            maScrollHdl;
-    Link            maSelectHdl;
-    Link            maCancelHdl;
-    Link            maDoubleClickHdl;
-    Link            maUserDrawHdl;
-    Link            maMRUChangedHdl;
+    Link			maScrollHdl;
+    Link			maSelectHdl;
+    Link			maCancelHdl;
+    Link			maDoubleClickHdl;
+    Link			maUserDrawHdl;
+    Link			maMRUChangedHdl;
 
 protected:
-    DECL_LINK(      SearchStringTimeout, Timer* );
-
-    virtual void    KeyInput( const KeyEvent& rKEvt );
-    virtual void    MouseButtonDown( const MouseEvent& rMEvt );
-    virtual void    MouseMove( const MouseEvent& rMEvt );
-    virtual void    Tracking( const TrackingEvent& rTEvt );
-    virtual void    Paint( const Rectangle& rRect );
-    virtual void    Resize();
-    virtual void    GetFocus();
-    virtual void    LoseFocus();
-
-    BOOL            SelectEntries( USHORT nSelect, LB_EVENT_TYPE eLET, BOOL bShift = FALSE, BOOL bCtrl = FALSE );
-    void            ImplPaint( USHORT nPos, BOOL bErase = FALSE, bool bLayout = false );
-    void            ImplDoPaint( const Rectangle& rRect, bool bLayout = false );
-    void            ImplCalcMetrics();
-    void            ImplUpdateEntryMetrics( ImplEntryType& rEntry );
-    void            ImplCallSelect();
+    DECL_LINK(		SearchStringTimeout, Timer* );
+
+    virtual void	KeyInput( const KeyEvent& rKEvt );
+    virtual void	MouseButtonDown( const MouseEvent& rMEvt );
+    virtual void	MouseMove( const MouseEvent& rMEvt );
+    virtual void	Tracking( const TrackingEvent& rTEvt );
+    virtual void	Paint( const Rectangle& rRect );
+    virtual void	Resize();
+    virtual void	GetFocus();
+    virtual void	LoseFocus();
+
+    BOOL			SelectEntries( USHORT nSelect, LB_EVENT_TYPE eLET, BOOL bShift = FALSE, BOOL bCtrl = FALSE );
+    void			ImplPaint( USHORT nPos, BOOL bErase = FALSE, bool bLayout = false );
+    void			ImplDoPaint( const Rectangle& rRect, bool bLayout = false );
+    void			ImplCalcMetrics();
+    void			ImplUpdateEntryMetrics( ImplEntryType& rEntry );
+    void			ImplCallSelect();
 
     void            ImplShowFocusRect();
     void            ImplHideFocusRect();
 
 
-    virtual void    StateChanged( StateChangedType nType );
-    virtual void    DataChanged( const DataChangedEvent& rDCEvt );
+    virtual void	StateChanged( StateChangedType nType );
+    virtual void	DataChanged( const DataChangedEvent& rDCEvt );
 
 public:
     virtual void  FillLayoutData() const;
@@ -286,99 +286,99 @@ public:
                     ImplListBoxWindow( Window* pParent, WinBits nWinStyle );
                     ~ImplListBoxWindow();
 
-    ImplEntryList*  GetEntryList() const { return mpEntryList; }
+    ImplEntryList*	GetEntryList() const { return mpEntryList; }
 
-    USHORT          InsertEntry( USHORT nPos, ImplEntryType* pNewEntry );
-    void            RemoveEntry( USHORT nPos );
-    void            Clear();
-    void            ResetCurrentPos()               { mnCurrentPos = LISTBOX_ENTRY_NOTFOUND; }
-    USHORT          GetCurrentPos() const           { return mnCurrentPos; }
-    USHORT          GetDisplayLineCount() const;
+    USHORT			InsertEntry( USHORT nPos, ImplEntryType* pNewEntry );
+    void			RemoveEntry( USHORT nPos );
+    void			Clear();
+    void			ResetCurrentPos()				{ mnCurrentPos = LISTBOX_ENTRY_NOTFOUND; }
+    USHORT			GetCurrentPos()	const			{ return mnCurrentPos; }
+    USHORT			GetDisplayLineCount() const;
     void            SetEntryFlags( USHORT nPos, long nFlags );
 
-    void            DrawEntry( USHORT nPos, BOOL bDrawImage, BOOL bDrawText, BOOL bDrawTextAtImagePos = FALSE, bool bLayout = false );
+    void 			DrawEntry( USHORT nPos, BOOL bDrawImage, BOOL bDrawText, BOOL bDrawTextAtImagePos = FALSE, bool bLayout = false );
 
-    void            SelectEntry( USHORT nPos, BOOL bSelect );
-    void            DeselectAll();
-    USHORT          GetEntryPosForPoint( const Point& rPoint ) const;
+    void			SelectEntry( USHORT nPos, BOOL bSelect );
+    void			DeselectAll();
+    USHORT			GetEntryPosForPoint( const Point& rPoint ) const;
     USHORT          GetLastVisibleEntry() const;
 
-    BOOL            ProcessKeyInput( const KeyEvent& rKEvt );
+    BOOL			ProcessKeyInput( const KeyEvent& rKEvt );
 
-    void            SetTopEntry( USHORT nTop );
-    USHORT          GetTopEntry() const             { return mnTop; }
+    void			SetTopEntry( USHORT nTop );
+    USHORT			GetTopEntry() const 			{ return mnTop; }
     // ShowProminentEntry will set the entry correspoding to nEntryPos
     // either at top or in the middle depending on the chosen style
     void            ShowProminentEntry( USHORT nEntryPos );
     void            SetProminentEntryType( ProminentEntry eType ) { meProminentType = eType; }
     ProminentEntry  GetProminentEntryType() const { return meProminentType; }
     using Window::IsVisible;
-    BOOL            IsVisible( USHORT nEntry ) const;
+    BOOL			IsVisible( USHORT nEntry ) const;
 
-    long            GetLeftIndent() const           { return mnLeft; }
-    void            SetLeftIndent( long n );
-    void            ScrollHorz( long nDiff );
+    long			GetLeftIndent() const			{ return mnLeft; }
+    void			SetLeftIndent( long n );
+    void			ScrollHorz( long nDiff );
 
-    void            AllowGrabFocus( BOOL b )        { mbGrabFocus = b; }
-    BOOL            IsGrabFocusAllowed() const      { return mbGrabFocus; }
+    void			AllowGrabFocus( BOOL b )		{ mbGrabFocus = b; }
+    BOOL			IsGrabFocusAllowed() const		{ return mbGrabFocus; }
 
-    void            SetSeparatorPos( USHORT n )     { mnSeparatorPos = n; }
-    USHORT          GetSeparatorPos() const         { return mnSeparatorPos; }
+    void			SetSeparatorPos( USHORT n )		{ mnSeparatorPos = n; }
+    USHORT			GetSeparatorPos() const			{ return mnSeparatorPos; }
 
     void            SetTravelSelect( BOOL bTravelSelect ) { mbTravelSelect = bTravelSelect; }
-    BOOL            IsTravelSelect() const          { return mbTravelSelect; }
-    BOOL            IsTrackingSelect() const            { return mbTrackingSelect; }
+    BOOL			IsTravelSelect() const			{ return mbTravelSelect; }
+    BOOL			IsTrackingSelect() const			{ return mbTrackingSelect; }
 
-    void            SetUserItemSize( const Size& rSz );
-    const Size&     GetUserItemSize() const             { return maUserItemSize; }
+    void			SetUserItemSize( const Size& rSz );
+    const Size&		GetUserItemSize() const				{ return maUserItemSize; }
 
-    void            EnableUserDraw( BOOL bUserDraw ) { mbUserDrawEnabled = bUserDraw; }
-    BOOL            IsUserDrawEnabled() const   { return mbUserDrawEnabled; }
+    void			EnableUserDraw( BOOL bUserDraw ) { mbUserDrawEnabled = bUserDraw; }
+    BOOL			IsUserDrawEnabled() const 	{ return mbUserDrawEnabled; }
 
-    void            EnableMultiSelection( BOOL bMulti, BOOL bStackMode ) { mbMulti = bMulti; mbStackMode = bStackMode; }
-    BOOL            IsMultiSelectionEnabled() const     { return mbMulti; }
+    void			EnableMultiSelection( BOOL bMulti, BOOL bStackMode ) { mbMulti = bMulti; mbStackMode = bStackMode; }
+    BOOL			IsMultiSelectionEnabled() const 	{ return mbMulti; }
 
-    void            SetMultiSelectionSimpleMode( BOOL bSimple ) { mbSimpleMode = bSimple; }
-    BOOL            IsMultiSelectionSimpleMode() const          { return mbSimpleMode; }
+    void			SetMultiSelectionSimpleMode( BOOL bSimple )	{ mbSimpleMode = bSimple; }
+    BOOL			IsMultiSelectionSimpleMode() const 			{ return mbSimpleMode; }
 
-    void            EnableMouseMoveSelect( BOOL bMouseMoveSelect ) { mbMouseMoveSelect = bMouseMoveSelect; }
-    BOOL            IsMouseMoveSelectEnabled() const    { return mbMouseMoveSelect; }
-    BOOL            IsMouseMoveSelect() const   { return mbMouseMoveSelect||mbStackMode; }
+    void			EnableMouseMoveSelect( BOOL bMouseMoveSelect ) { mbMouseMoveSelect = bMouseMoveSelect; }
+    BOOL			IsMouseMoveSelectEnabled() const 	{ return mbMouseMoveSelect; }
+    BOOL			IsMouseMoveSelect() const 	{ return mbMouseMoveSelect||mbStackMode; }
 
-    Size            CalcSize( USHORT nMaxLines ) const;
+    Size			CalcSize( USHORT nMaxLines ) const;
     Rectangle       GetBoundingRectangle( USHORT nItem ) const;
 
-    long            GetEntryHeight() const              { return mnMaxHeight; }
-    long            GetMaxEntryWidth() const            { return mnMaxWidth; }
+    long			GetEntryHeight() const				{ return mnMaxHeight; }
+    long			GetMaxEntryWidth() const			{ return mnMaxWidth; }
 
-    void            SetScrollHdl( const Link& rLink )   { maScrollHdl = rLink; }
-    const Link&     GetScrollHdl() const                { return maScrollHdl; }
-    void            SetSelectHdl( const Link& rLink )   { maSelectHdl = rLink; }
-    const Link&     GetSelectHdl() const                { return maSelectHdl; }
-    void            SetCancelHdl( const Link& rLink )   { maCancelHdl = rLink; }
-    const Link&     GetCancelHdl() const                { return maCancelHdl; }
-    void            SetDoubleClickHdl( const Link& rLink )  { maDoubleClickHdl = rLink; }
-    const Link&     GetDoubleClickHdl() const               { return maDoubleClickHdl; }
-    void            SetUserDrawHdl( const Link& rLink ) { maUserDrawHdl = rLink; }
-    const Link&     GetUserDrawHdl() const              { return maUserDrawHdl; }
-    void            SetMRUChangedHdl( const Link& rLink )   { maMRUChangedHdl = rLink; }
-    const Link&     GetMRUChangedHdl() const                { return maMRUChangedHdl; }
+    void			SetScrollHdl( const Link& rLink )	{ maScrollHdl = rLink; }
+    const Link& 	GetScrollHdl() const				{ return maScrollHdl; }
+    void			SetSelectHdl( const Link& rLink )	{ maSelectHdl = rLink; }
+    const Link& 	GetSelectHdl() const				{ return maSelectHdl; }
+    void			SetCancelHdl( const Link& rLink )	{ maCancelHdl = rLink; }
+    const Link& 	GetCancelHdl() const				{ return maCancelHdl; }
+    void			SetDoubleClickHdl( const Link& rLink )	{ maDoubleClickHdl = rLink; }
+    const Link& 	GetDoubleClickHdl() const				{ return maDoubleClickHdl; }
+    void			SetUserDrawHdl( const Link& rLink )	{ maUserDrawHdl = rLink; }
+    const Link& 	GetUserDrawHdl() const				{ return maUserDrawHdl; }
+    void			SetMRUChangedHdl( const Link& rLink )	{ maMRUChangedHdl = rLink; }
+    const Link& 	GetMRUChangedHdl() const				{ return maMRUChangedHdl; }
 
-    BOOL            IsSelectionChanged() const { return mbSelectionChanged; }
-    USHORT          GetSelectModifier() const { return mnSelectModifier; }
+    BOOL			IsSelectionChanged() const { return mbSelectionChanged; }
+    USHORT			GetSelectModifier() const { return mnSelectModifier; }
 
-    void            EnableSort( BOOL b ) { mbSort = b; }
+    void			EnableSort( BOOL b ) { mbSort = b; }
 
-    void            SetReadOnly( BOOL bReadOnly )   { mbReadOnly = bReadOnly; }
-    BOOL            IsReadOnly() const              { return mbReadOnly; }
+    void			SetReadOnly( BOOL bReadOnly ) 	{ mbReadOnly = bReadOnly; }
+    BOOL			IsReadOnly() const 				{ return mbReadOnly; }
 
     using Control::ImplInitSettings;
-    void            ImplInitSettings( BOOL bFont, BOOL bForeground, BOOL bBackground );
+    void			ImplInitSettings( BOOL bFont, BOOL bForeground, BOOL bBackground );
     USHORT          ImplGetTextStyle() const;
 
     // pb: #106948# explicit mirroring for calc
-    inline void     EnableMirroring()       { mbMirroring = TRUE; }
-    inline BOOL     IsMirroring() const { return mbMirroring; }
+    inline void		EnableMirroring()		{ mbMirroring = TRUE; }
+    inline BOOL		IsMirroring() const { return mbMirroring; }
 };
 
 // ---------------
@@ -388,119 +388,119 @@ public:
 class ImplListBox : public Control
 {
 private:
-    ImplListBoxWindow   maLBWindow;
-    ScrollBar*          mpHScrollBar;
-    ScrollBar*          mpVScrollBar;
-    ScrollBarBox*       mpScrollBarBox;
-    BOOL                mbVScroll       : 1,    // VScroll an oder aus
-                        mbHScroll       : 1,    // HScroll an oder aus
-                        mbAutoHScroll   : 1;    // AutoHScroll an oder aus
-    Link                maScrollHdl;    // Weil der vom ImplListBoxWindow selbst benoetigt wird.
+    ImplListBoxWindow	maLBWindow;
+    ScrollBar*			mpHScrollBar;
+    ScrollBar*			mpVScrollBar;
+    ScrollBarBox*		mpScrollBarBox;
+    BOOL				mbVScroll		: 1,	// VScroll an oder aus
+                        mbHScroll		: 1,	// HScroll an oder aus
+                        mbAutoHScroll	: 1;	// AutoHScroll an oder aus
+    Link				maScrollHdl;	// Weil der vom ImplListBoxWindow selbst benoetigt wird.
     ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > mxDNDListenerContainer;
 
 protected:
-    virtual void        GetFocus();
-    virtual void        StateChanged( StateChangedType nType );
-    virtual void        DataChanged( const DataChangedEvent& rDCEvt );
+    virtual void		GetFocus();
+    virtual void		StateChanged( StateChangedType nType );
+    virtual void		DataChanged( const DataChangedEvent& rDCEvt );
 
-    long                Notify( NotifyEvent& rNEvt );
+    long 				Notify( NotifyEvent& rNEvt );
 
-    void                ImplResizeControls();
-    void                ImplCheckScrollBars();
-    void                ImplInitScrollBars();
+    void				ImplResizeControls();
+    void				ImplCheckScrollBars();
+    void				ImplInitScrollBars();
 
-    DECL_LINK(          ScrollBarHdl, ScrollBar* );
-    DECL_LINK(          LBWindowScrolled, void* );
-    DECL_LINK(          MRUChanged, void* );
+    DECL_LINK(			ScrollBarHdl, ScrollBar* );
+    DECL_LINK(			LBWindowScrolled, void* );
+    DECL_LINK(			MRUChanged, void* );
 
 public:
                     ImplListBox( Window* pParent, WinBits nWinStyle );
                     ~ImplListBox();
 
-    const ImplEntryList*    GetEntryList() const            { return maLBWindow.GetEntryList(); }
-    ImplListBoxWindow*      GetMainWindow()                 { return &maLBWindow; }
+    const ImplEntryList*	GetEntryList() const			{ return maLBWindow.GetEntryList(); }
+    ImplListBoxWindow* 		GetMainWindow() 				{ return &maLBWindow; }
 
-    virtual void    Resize();
+    virtual void	Resize();
     virtual const Wallpaper& GetDisplayBackground() const;
     virtual Window*     GetPreferredKeyInputWindow();
 
-    USHORT          InsertEntry( USHORT nPos, const XubString& rStr );
-    USHORT          InsertEntry( USHORT nPos, const Image& rImage );
-    USHORT          InsertEntry( USHORT nPos, const XubString& rStr, const Image& rImage );
-    void            RemoveEntry( USHORT nPos );
-    void            SetEntryData( USHORT nPos, void* pNewData ) { maLBWindow.GetEntryList()->SetEntryData( nPos, pNewData ); }
-    void            Clear();
+    USHORT			InsertEntry( USHORT nPos, const XubString& rStr );
+    USHORT			InsertEntry( USHORT nPos, const Image& rImage );
+    USHORT			InsertEntry( USHORT nPos, const XubString& rStr, const Image& rImage );
+    void			RemoveEntry( USHORT nPos );
+    void			SetEntryData( USHORT nPos, void* pNewData )	{ maLBWindow.GetEntryList()->SetEntryData( nPos, pNewData ); }
+    void			Clear();
 
-    void            SetEntryFlags( USHORT nPos, long nFlags );
-    long            GetEntryFlags( USHORT nPos ) const;
+    void			SetEntryFlags( USHORT nPos, long nFlags );
+    long			GetEntryFlags( USHORT nPos ) const;
 
-    void            SelectEntry( USHORT nPos, BOOL bSelect );
-    void            SetNoSelection();
-    void            ResetCurrentPos()               { maLBWindow.ResetCurrentPos(); }
-    USHORT          GetCurrentPos() const           { return maLBWindow.GetCurrentPos(); }
+    void			SelectEntry( USHORT nPos, BOOL bSelect );
+    void			SetNoSelection();
+    void			ResetCurrentPos()				{ maLBWindow.ResetCurrentPos(); }
+    USHORT			GetCurrentPos()	const			{ return maLBWindow.GetCurrentPos(); }
 
-    BOOL            ProcessKeyInput( const KeyEvent& rKEvt )    { return maLBWindow.ProcessKeyInput( rKEvt ); }
-    BOOL            HandleWheelAsCursorTravel( const CommandEvent& rCEvt );
+    BOOL			ProcessKeyInput( const KeyEvent& rKEvt )	{ return maLBWindow.ProcessKeyInput( rKEvt ); }
+    BOOL			HandleWheelAsCursorTravel( const CommandEvent& rCEvt );
 
-    void            SetSeparatorPos( USHORT n )     { maLBWindow.SetSeparatorPos( n ); }
-    USHORT          GetSeparatorPos() const         { return maLBWindow.GetSeparatorPos(); }
+    void			SetSeparatorPos( USHORT n )		{ maLBWindow.SetSeparatorPos( n ); }
+    USHORT			GetSeparatorPos() const			{ return maLBWindow.GetSeparatorPos(); }
 
-    void            SetTopEntry( USHORT nTop )      { maLBWindow.SetTopEntry( nTop ); }
-    USHORT          GetTopEntry() const             { return maLBWindow.GetTopEntry(); }
+    void			SetTopEntry( USHORT nTop )		{ maLBWindow.SetTopEntry( nTop ); }
+    USHORT			GetTopEntry() const 			{ return maLBWindow.GetTopEntry(); }
     void            ShowProminentEntry( USHORT nPos ) { maLBWindow.ShowProminentEntry( nPos ); }
     using Window::IsVisible;
-    BOOL            IsVisible( USHORT nEntry ) const { return maLBWindow.IsVisible( nEntry ); }
+    BOOL			IsVisible( USHORT nEntry ) const { return maLBWindow.IsVisible( nEntry ); }
 
     void            SetProminentEntryType( ProminentEntry eType ) { maLBWindow.SetProminentEntryType( eType ); }
     ProminentEntry  GetProminentEntryType() const { return maLBWindow.GetProminentEntryType(); }
 
-    long            GetLeftIndent() const           { return maLBWindow.GetLeftIndent(); }
-    void            SetLeftIndent( USHORT n )       { maLBWindow.SetLeftIndent( n ); }
-    void            ScrollHorz( short nDiff )       { maLBWindow.ScrollHorz( nDiff ); }
+    long			GetLeftIndent() const			{ return maLBWindow.GetLeftIndent(); }
+    void			SetLeftIndent( USHORT n )		{ maLBWindow.SetLeftIndent( n ); }
+    void			ScrollHorz( short nDiff )		{ maLBWindow.ScrollHorz( nDiff ); }
 
     void            SetTravelSelect( BOOL bTravelSelect ) { maLBWindow.SetTravelSelect( bTravelSelect ); }
-    BOOL            IsTravelSelect() const          { return maLBWindow.IsTravelSelect(); }
-    BOOL            IsTrackingSelect() const            { return maLBWindow.IsTrackingSelect(); }
-
-    void            EnableMultiSelection( BOOL bMulti, BOOL bStackMode ) { maLBWindow.EnableMultiSelection( bMulti, bStackMode ); }
-    BOOL            IsMultiSelectionEnabled() const     { return maLBWindow.IsMultiSelectionEnabled(); }
-
-    void            SetMultiSelectionSimpleMode( BOOL bSimple ) { maLBWindow.SetMultiSelectionSimpleMode( bSimple ); }
-    BOOL            IsMultiSelectionSimpleMode() const  { return maLBWindow.IsMultiSelectionSimpleMode(); }
-
-    void            SetReadOnly( BOOL b )           { maLBWindow.SetReadOnly( b ); }
-    BOOL            IsReadOnly() const              { return maLBWindow.IsReadOnly(); }
-
-
-    Size            CalcSize( USHORT nMaxLines ) const              { return maLBWindow.CalcSize( nMaxLines ); }
-    long            GetEntryHeight() const          { return maLBWindow.GetEntryHeight(); }
-    long            GetMaxEntryWidth() const        { return maLBWindow.GetMaxEntryWidth(); }
-
-    void            SetScrollHdl( const Link& rLink )   { maScrollHdl = rLink; }
-    const Link&     GetScrollHdl() const                { return maScrollHdl; }
-    void            SetSelectHdl( const Link& rLink )   { maLBWindow.SetSelectHdl( rLink ); }
-    const Link&     GetSelectHdl() const                { return maLBWindow.GetSelectHdl(); }
-    void            SetCancelHdl( const Link& rLink )   { maLBWindow.SetCancelHdl( rLink ); }
-    const Link&     GetCancelHdl() const                { return maLBWindow.GetCancelHdl(); }
-    void            SetDoubleClickHdl( const Link& rLink )  { maLBWindow.SetDoubleClickHdl( rLink ); }
-    const Link&     GetDoubleClickHdl() const               { return maLBWindow.GetDoubleClickHdl(); }
-    void            SetUserDrawHdl( const Link& rLink ) { maLBWindow.SetUserDrawHdl( rLink ); }
-    const Link&     GetUserDrawHdl() const              { return maLBWindow.GetUserDrawHdl(); }
-
-    void            SetSelectionChangedHdl( const Link& rLnk )  { maLBWindow.GetEntryList()->SetSelectionChangedHdl( rLnk ); }
-    void            SetCallSelectionChangedHdl( BOOL bCall )    { maLBWindow.GetEntryList()->SetCallSelectionChangedHdl( bCall ); }
-    BOOL            IsSelectionChanged() const                  { return maLBWindow.IsSelectionChanged(); }
-    USHORT          GetSelectModifier() const                   { return maLBWindow.GetSelectModifier(); }
-
-    void            SetMRUEntries( const XubString& rEntries, xub_Unicode cSep );
-    XubString       GetMRUEntries( xub_Unicode cSep ) const;
-    void            SetMaxMRUCount( USHORT n )                  { maLBWindow.GetEntryList()->SetMaxMRUCount( n ); }
-    USHORT          GetMaxMRUCount() const                      { return maLBWindow.GetEntryList()->GetMaxMRUCount(); }
-    USHORT          GetDisplayLineCount() const
+    BOOL			IsTravelSelect() const			{ return maLBWindow.IsTravelSelect(); }
+    BOOL			IsTrackingSelect() const			{ return maLBWindow.IsTrackingSelect(); }
+
+    void			EnableMultiSelection( BOOL bMulti, BOOL bStackMode ) { maLBWindow.EnableMultiSelection( bMulti, bStackMode ); }
+    BOOL			IsMultiSelectionEnabled() const 	{ return maLBWindow.IsMultiSelectionEnabled(); }
+
+    void			SetMultiSelectionSimpleMode( BOOL bSimple ) { maLBWindow.SetMultiSelectionSimpleMode( bSimple ); }
+    BOOL			IsMultiSelectionSimpleMode() const 	{ return maLBWindow.IsMultiSelectionSimpleMode(); }
+
+    void			SetReadOnly( BOOL b ) 			{ maLBWindow.SetReadOnly( b ); }
+    BOOL			IsReadOnly() const 				{ return maLBWindow.IsReadOnly(); }
+
+
+    Size			CalcSize( USHORT nMaxLines ) const				{ return maLBWindow.CalcSize( nMaxLines ); }
+    long			GetEntryHeight() const			{ return maLBWindow.GetEntryHeight(); }
+    long			GetMaxEntryWidth() const		{ return maLBWindow.GetMaxEntryWidth(); }
+
+    void			SetScrollHdl( const Link& rLink )	{ maScrollHdl = rLink; }
+    const Link& 	GetScrollHdl() const				{ return maScrollHdl; }
+    void			SetSelectHdl( const Link& rLink )	{ maLBWindow.SetSelectHdl( rLink ); }
+    const Link& 	GetSelectHdl() const				{ return maLBWindow.GetSelectHdl(); }
+    void			SetCancelHdl( const Link& rLink )	{ maLBWindow.SetCancelHdl( rLink ); }
+    const Link& 	GetCancelHdl() const				{ return maLBWindow.GetCancelHdl(); }
+    void			SetDoubleClickHdl( const Link& rLink )	{ maLBWindow.SetDoubleClickHdl( rLink ); }
+    const Link& 	GetDoubleClickHdl() const				{ return maLBWindow.GetDoubleClickHdl(); }
+    void			SetUserDrawHdl( const Link& rLink )	{ maLBWindow.SetUserDrawHdl( rLink ); }
+    const Link& 	GetUserDrawHdl() const				{ return maLBWindow.GetUserDrawHdl(); }
+
+    void			SetSelectionChangedHdl( const Link& rLnk )	{ maLBWindow.GetEntryList()->SetSelectionChangedHdl( rLnk ); }
+    void			SetCallSelectionChangedHdl( BOOL bCall )	{ maLBWindow.GetEntryList()->SetCallSelectionChangedHdl( bCall ); }
+    BOOL			IsSelectionChanged() const 					{ return maLBWindow.IsSelectionChanged(); }
+    USHORT			GetSelectModifier() const 					{ return maLBWindow.GetSelectModifier(); }
+
+    void			SetMRUEntries( const XubString& rEntries, xub_Unicode cSep );
+    XubString		GetMRUEntries( xub_Unicode cSep ) const;
+    void			SetMaxMRUCount( USHORT n )					{ maLBWindow.GetEntryList()->SetMaxMRUCount( n ); }
+    USHORT			GetMaxMRUCount() const						{ return maLBWindow.GetEntryList()->GetMaxMRUCount(); }
+    USHORT			GetDisplayLineCount() const
     { return maLBWindow.GetDisplayLineCount(); }
 
     // pb: #106948# explicit mirroring for calc
-    inline void     EnableMirroring()   { maLBWindow.EnableMirroring(); }
+    inline void		EnableMirroring()	{ maLBWindow.EnableMirroring(); }
     inline void     SetDropTraget(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& i_xDNDListenerContainer){ mxDNDListenerContainer= i_xDNDListenerContainer; }
 };
 
@@ -511,40 +511,40 @@ public:
 class ImplListBoxFloatingWindow : public FloatingWindow
 {
 private:
-    ImplListBox*    mpImplLB;
-    Size            maPrefSz;
-    USHORT          mnDDLineCount;
+    ImplListBox*	mpImplLB;
+    Size			maPrefSz;
+    USHORT			mnDDLineCount;
     USHORT          mnPopupModeStartSaveSelection;
-    BOOL            mbAutoWidth;
+    BOOL			mbAutoWidth;
 
 protected:
-    long            PreNotify( NotifyEvent& rNEvt );
+    long			PreNotify( NotifyEvent& rNEvt );
 
 public:
                     ImplListBoxFloatingWindow( Window* pParent );
 
-    void            SetImplListBox( ImplListBox* pLB )  { mpImplLB = pLB; }
+    void			SetImplListBox( ImplListBox* pLB )	{ mpImplLB = pLB; }
 
-    void            SetPrefSize( const Size& rSz )      { maPrefSz = rSz; }
-    const Size&     GetPrefSize() const                 { return maPrefSz; }
+    void			SetPrefSize( const Size& rSz )		{ maPrefSz = rSz; }
+    const Size& 	GetPrefSize() const 				{ return maPrefSz; }
 
-    void            SetAutoWidth( BOOL b )              { mbAutoWidth = b; }
+    void			SetAutoWidth( BOOL b )				{ mbAutoWidth = b; }
     BOOL            IsAutoWidth() const                 { return mbAutoWidth; }
 
-    Size            CalcFloatSize();
-    void            StartFloat( BOOL bStartTracking );
+    Size			CalcFloatSize();
+    void			StartFloat( BOOL bStartTracking );
 
-    virtual void    SetPosSizePixel( long nX, long nY,
+    virtual void	SetPosSizePixel( long nX, long nY,
                                      long nWidth, long nHeight, USHORT nFlags = WINDOW_POSSIZE_ALL );
-    void            SetPosSizePixel( const Point& rNewPos, const Size& rNewSize )
+    void			SetPosSizePixel( const Point& rNewPos, const Size& rNewSize )
                         { FloatingWindow::SetPosSizePixel( rNewPos, rNewSize ); }
 
-    void            SetDropDownLineCount( USHORT n ) { mnDDLineCount = n; }
-    USHORT          GetDropDownLineCount() const { return mnDDLineCount; }
+    void			SetDropDownLineCount( USHORT n ) { mnDDLineCount = n; }
+    USHORT			GetDropDownLineCount() const { return mnDDLineCount; }
 
     USHORT          GetPopupModeStartSaveSelection() const { return mnPopupModeStartSaveSelection; }
 
-    virtual void    Resize();
+    virtual void	Resize();
 };
 
 // -----------
@@ -555,19 +555,19 @@ class ImplWin : public Control
 {
 private:
 
-    USHORT          mnItemPos;  // wegen UserDraw muss ich wissen, welches Item ich darstelle.
-    XubString       maString;
-    Image           maImage;
-    Image           maImageHC;
+    USHORT			mnItemPos;	// wegen UserDraw muss ich wissen, welches Item ich darstelle.
+    XubString		maString;
+    Image			maImage;
+    Image			maImageHC;
 
-    Rectangle       maFocusRect;
-    Size            maUserItemSize;
+    Rectangle		maFocusRect;
+    Size			maUserItemSize;
 
-    Link            maMBDownHdl;
-    Link            maUserDrawHdl;
+    Link			maMBDownHdl;
+    Link			maUserDrawHdl;
 
-    BOOL            mbUserDrawEnabled   : 1,
-                    mbInUserDraw        : 1;
+    BOOL			mbUserDrawEnabled	: 1,
+                    mbInUserDraw		: 1;
 
 
     void ImplDraw( bool bLayout = false );
@@ -578,40 +578,40 @@ public:
                     ImplWin( Window* pParent, WinBits nWinStyle = 0 );
                     ~ImplWin() {};
 
-    virtual void    MouseButtonDown( const MouseEvent& rMEvt );
-    virtual void    Paint( const Rectangle& rRect );
-    virtual void    Resize();
-    virtual void    GetFocus();
-    virtual void    LoseFocus();
+    virtual void	MouseButtonDown( const MouseEvent& rMEvt );
+    virtual void	Paint( const Rectangle& rRect );
+    virtual void	Resize();
+    virtual void	GetFocus();
+    virtual void	LoseFocus();
     virtual long    PreNotify( NotifyEvent& rNEvt );
 
-    USHORT          GetItemPos() const { return mnItemPos; }
-    void            SetItemPos( USHORT n ) { mnItemPos = n; }
+    USHORT			GetItemPos() const { return mnItemPos; }
+    void			SetItemPos( USHORT n ) { mnItemPos = n; }
 
     const XubString& GetString() const { return maString; }
-    void            SetString( const XubString& rStr ) { maString = rStr; }
+    void			SetString( const XubString& rStr ) { maString = rStr; }
 
-    const Image&    GetImage() const { return maImage; }
-    void            SetImage( const Image& rImg ) { maImage = rImg; }
+    const Image&	GetImage() const { return maImage; }
+    void			SetImage( const Image& rImg ) { maImage = rImg; }
 
     BOOL            SetModeImage( const Image& rImage, BmpColorMode eMode = BMP_COLOR_NORMAL );
     const Image&    GetModeImage( BmpColorMode eMode = BMP_COLOR_NORMAL ) const;
 
 
-    virtual void    MBDown();
-    void            SetMBDownHdl( const Link& rLink ) { maMBDownHdl = rLink; }
-    const Link&     GetMBDownHdl() const { return maMBDownHdl; }
+    virtual void	MBDown();
+    void			SetMBDownHdl( const Link& rLink ) { maMBDownHdl = rLink; }
+    const Link& 	GetMBDownHdl() const { return maMBDownHdl; }
 
-    void            SetUserDrawHdl( const Link& rLink ) { maUserDrawHdl = rLink; }
-    const Link&     GetUserDrawHdl() const              { return maUserDrawHdl; }
+    void			SetUserDrawHdl( const Link& rLink )	{ maUserDrawHdl = rLink; }
+    const Link& 	GetUserDrawHdl() const				{ return maUserDrawHdl; }
 
-    void            SetUserItemSize( const Size& rSz )  { maUserItemSize = rSz; }
-    const Size&     GetUserItemSize() const             { return maUserItemSize; }
+    void			SetUserItemSize( const Size& rSz )	{ maUserItemSize = rSz; }
+    const Size&		GetUserItemSize() const				{ return maUserItemSize; }
 
-    void            EnableUserDraw( BOOL bUserDraw )    { mbUserDrawEnabled = bUserDraw; }
-    BOOL            IsUserDrawEnabled() const           { return mbUserDrawEnabled; }
+    void			EnableUserDraw( BOOL bUserDraw ) 	{ mbUserDrawEnabled = bUserDraw; }
+    BOOL			IsUserDrawEnabled() const 			{ return mbUserDrawEnabled; }
 
-    void            DrawEntry( BOOL bDrawImage, BOOL bDrawText, BOOL bDrawTextAtImagePos = FALSE, bool bLayout = false );
+    void 			DrawEntry( BOOL bDrawImage, BOOL bDrawText, BOOL bDrawTextAtImagePos = FALSE, bool bLayout = false );
 };
 
 // -----------
@@ -621,23 +621,23 @@ public:
 class ImplBtn : public PushButton
 {
 private:
-    BOOL            mbDown;
+    BOOL			mbDown;
 
-    Link            maMBDownHdl;
+    Link			maMBDownHdl;
 
 public:
                     ImplBtn( Window* pParent, WinBits nWinStyle = 0 );
                     ~ImplBtn() {};
 
-    virtual void    MouseButtonDown( const MouseEvent& rMEvt );
+    virtual void	MouseButtonDown( const MouseEvent& rMEvt );
 
-    virtual void    MBDown();
-    void            SetMBDownHdl( const Link& rLink ) { maMBDownHdl = rLink; }
-    const Link&     GetMBDownHdl() const { return maMBDownHdl; }
+    virtual void	MBDown();
+    void			SetMBDownHdl( const Link& rLink ) { maMBDownHdl = rLink; }
+    const Link& 	GetMBDownHdl() const { return maMBDownHdl; }
 };
 
 
 void ImplInitFieldSettings( Window* pWin, BOOL bFont, BOOL bForeground, BOOL bBackground );
 void ImplInitDropDownButton( PushButton* pButton );
 
-#endif  // _SV_ILSTBOX_HXX
+#endif	// _SV_ILSTBOX_HXX
diff --git a/vcl/inc/vcl/image.h b/vcl/inc/vcl/image.h
index 023b2c2d1a2c..422deeecd2a8 100644
--- a/vcl/inc/vcl/image.h
+++ b/vcl/inc/vcl/image.h
@@ -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
@@ -43,34 +43,34 @@ public:
                 ImplImageBmp();
                 ~ImplImageBmp();
 
-    void        Create( long nItemWidth, long nItemHeight, USHORT nInitSize );
-    void        Create( const BitmapEx& rBmpEx, long nItemWidth, long nItemHeight,USHORT nInitSize );
+    void		Create( long nItemWidth, long nItemHeight, USHORT nInitSize );
+    void		Create( const BitmapEx& rBmpEx, long nItemWidth, long nItemHeight,USHORT nInitSize );
 
-    void        Expand( USHORT nGrowSize );
+    void		Expand( USHORT nGrowSize );
 
-    void        Replace( USHORT nPos, USHORT nSrcPos );
-    void        Replace( USHORT nPos, const ImplImageBmp& rImageBmp, USHORT nSrcPos );
-    void        Replace( USHORT nPos, const BitmapEx& rBmpEx );
+    void		Replace( USHORT nPos, USHORT nSrcPos );
+    void		Replace( USHORT nPos, const ImplImageBmp& rImageBmp, USHORT nSrcPos );
+    void		Replace( USHORT nPos, const BitmapEx& rBmpEx );
 
     void        ReplaceColors( const Color* pSrcColors, const Color* pDstColors, ULONG nColorCount );
-    void        ColorTransform( BmpColorMode eColorMode );
-    void            Invert();
+    void		ColorTransform( BmpColorMode eColorMode );
+    void        	Invert();
 
-    BitmapEx    GetBitmapEx( USHORT nPosCount, USHORT* pPosAry ) const;
+    BitmapEx	GetBitmapEx( USHORT nPosCount, USHORT* pPosAry ) const;
 
-    void        Draw( USHORT nPos, OutputDevice* pDev, const Point& rPos, USHORT nStyle, const Size* pSize = NULL );
+    void		Draw( USHORT nPos, OutputDevice* pDev, const Point& rPos, USHORT nStyle, const Size* pSize = NULL );
 
 private:
 
-    BitmapEx    maBmpEx;
-    BitmapEx    maDisabledBmpEx;
-    BitmapEx*   mpDisplayBmp;
-    Size        maSize;
-    BYTE*       mpInfoAry;
-    USHORT      mnSize;
+    BitmapEx	maBmpEx;
+    BitmapEx	maDisabledBmpEx;
+    BitmapEx*	mpDisplayBmp;
+    Size		maSize;
+    BYTE*		mpInfoAry;
+    USHORT		mnSize;
 
-    void        ImplUpdateDisplayBmp( OutputDevice* pOutDev );
-    void        ImplUpdateDisabledBmpEx( int nPos );
+    void		ImplUpdateDisplayBmp( OutputDevice* pOutDev );
+    void		ImplUpdateDisabledBmpEx( int nPos );
 
 private:    // prevent assignment and copy construction
     ImplImageBmp( const ImplImageBmp& );
@@ -89,9 +89,9 @@ enum ImageType { IMAGETYPE_BITMAP, IMAGETYPE_IMAGE };
 
 struct ImageAryData
 {
-    ::rtl::OUString maName;
+    ::rtl::OUString	maName;
     // Images identified by either name, or by id
-    USHORT          mnId;
+    USHORT			mnId;
     BitmapEx        maBitmapEx;
 
     ImageAryData();
@@ -103,7 +103,7 @@ struct ImageAryData
     bool IsLoadable() { return maBitmapEx.IsEmpty() && maName.getLength(); }
     void Load(const rtl::OUString &rPrefix);
 
-    ImageAryData&   operator=( const ImageAryData& rData );
+    ImageAryData&	operator=( const ImageAryData& rData );
 };
 
 // ------------------------------------------------------------------------------
@@ -117,7 +117,7 @@ struct ImplImageList
     ImageAryDataVec             maImages;
     ImageAryDataNameHash        maNameHash;
     rtl::OUString               maPrefix;
-    Size                        maImageSize;
+    Size			            maImageSize;
     ULONG                       mnRefCount;
 
     ImplImageList();
@@ -136,13 +136,13 @@ struct ImplImageList
 
 struct ImplImageRefData
 {
-    ImplImageList*  mpImplData;
-    USHORT          mnIndex;
+    ImplImageList*	mpImplData;
+    USHORT			mnIndex;
 
-                    ImplImageRefData() {}    // Um Warning zu umgehen
+                    ImplImageRefData() {}	 // Um Warning zu umgehen
                     ~ImplImageRefData();
 
-    BOOL            IsEqual( const ImplImageRefData& rData );
+    BOOL			IsEqual( const ImplImageRefData& rData );
 };
 
 // ----------------
@@ -151,13 +151,13 @@ struct ImplImageRefData
 
 struct ImplImageData
 {
-    ImplImageBmp*   mpImageBitmap;
-    BitmapEx        maBmpEx;
+    ImplImageBmp*	mpImageBitmap;
+    BitmapEx		maBmpEx;
 
                     ImplImageData( const BitmapEx& rBmpEx );
                     ~ImplImageData();
 
-    BOOL            IsEqual( const ImplImageData& rData );
+    BOOL			IsEqual( const ImplImageData& rData );
 };
 
 // -------------
@@ -166,10 +166,10 @@ struct ImplImageData
 
 struct ImplImage
 {
-    ULONG           mnRefCount;
+    ULONG			mnRefCount;
     // TODO: use inheritance to get rid of meType+mpData
-    void*           mpData;
-    ImageType       meType;
+    void*			mpData;
+    ImageType		meType;
 
                     ImplImage();
                     ~ImplImage();
diff --git a/vcl/inc/vcl/image.hxx b/vcl/inc/vcl/image.hxx
index f4f642656783..ca25d739125f 100644
--- a/vcl/inc/vcl/image.hxx
+++ b/vcl/inc/vcl/image.hxx
@@ -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
@@ -45,8 +45,8 @@ namespace com { namespace sun { namespace star { namespace graphic { class XGrap
 // - Defines -
 // -----------
 
-#define IMAGE_STDBTN_COLOR          Color( 0xC0, 0xC0, 0xC0 )
-#define IMAGELIST_IMAGE_NOTFOUND    ((USHORT)0xFFFF)
+#define IMAGE_STDBTN_COLOR			Color( 0xC0, 0xC0, 0xC0 )
+#define IMAGELIST_IMAGE_NOTFOUND	((USHORT)0xFFFF)
 
 // -----------------------
 // - ImageColorTransform -
@@ -80,9 +80,9 @@ public:
                     Image( const ::com::sun::star::uno::Reference< ::com::sun::star::graphic::XGraphic >& rxGraphic );
                     ~Image();
 
-    Size            GetSizePixel() const;
+    Size			GetSizePixel() const;
 
-    BitmapEx        GetBitmapEx() const;
+    BitmapEx		GetBitmapEx() const;
     ::com::sun::star::uno::Reference< ::com::sun::star::graphic::XGraphic > GetXGraphic() const;
 
     Image           GetColorTransformedImage( ImageColorTransform eColorTransform ) const;
@@ -90,14 +90,14 @@ public:
 
     void            Invert();
 
-    BOOL            operator!() const { return( !mpImplData ? true : false ); }
-    Image&          operator=( const Image& rImage );
-    BOOL            operator==( const Image& rImage ) const;
-    BOOL            operator!=( const Image& rImage ) const { return !(Image::operator==( rImage )); }
+    BOOL			operator!() const { return( !mpImplData ? true : false ); }
+    Image&			operator=( const Image& rImage );
+    BOOL			operator==( const Image& rImage ) const;
+    BOOL			operator!=( const Image& rImage ) const { return !(Image::operator==( rImage )); }
 
 private:
 
-    ImplImage*             mpImplData;
+    ImplImage*		       mpImplData;
 
     SAL_DLLPRIVATE void    ImplInit( const BitmapEx& rBmpEx );
 };
@@ -117,53 +117,53 @@ public:
                     ImageList( const ImageList& rImageList );
                     ~ImageList();
 
-    void                Clear();
-    void                    InsertFromHorizontalStrip( const BitmapEx &rBitmapEx,
+    void				Clear();
+    void            		InsertFromHorizontalStrip( const BitmapEx &rBitmapEx,
                                    const std::vector< rtl::OUString > &rNameVector );
-    void                    InsertFromHorizontalBitmap( const ResId& rResId,
+    void            		InsertFromHorizontalBitmap( const ResId& rResId,
                                     USHORT       nCount,
                                     const Color *pNonAlphaMaskColor,
                                     const Color *pSearchColors = NULL,
                                     const Color *pReplaceColors = NULL,
                                     ULONG        nColorCount = 0);
-    BitmapEx        GetAsHorizontalStrip() const;
-    USHORT          GetImageCount() const;
-    Size            GetImageSize() const;
+    BitmapEx		GetAsHorizontalStrip() const;
+    USHORT			GetImageCount() const;
+    Size			GetImageSize() const;
 
-    void            AddImage( USHORT nNewId, const Image& rImage );
-    void            AddImage( const ::rtl::OUString& rImageName, const Image& rImage );
+    void			AddImage( USHORT nNewId, const Image& rImage );
+    void			AddImage( const ::rtl::OUString& rImageName, const Image& rImage );
 
-    void            ReplaceImage( USHORT nId, const Image& rImage );
-    void            ReplaceImage( const ::rtl::OUString& rImageName, const Image& rImage );
+    void			ReplaceImage( USHORT nId, const Image& rImage );
+    void			ReplaceImage( const ::rtl::OUString& rImageName, const Image& rImage );
 
-    void            ReplaceImage( USHORT nId, USHORT nReplaceId );
-    void            ReplaceImage( const ::rtl::OUString& rImageName, const ::rtl::OUString& rReplaceName );
+    void			ReplaceImage( USHORT nId, USHORT nReplaceId );
+    void			ReplaceImage( const ::rtl::OUString& rImageName, const ::rtl::OUString& rReplaceName );
 
-    void            RemoveImage( USHORT nId );
-    void            RemoveImage( const ::rtl::OUString& rImageName );
+    void			RemoveImage( USHORT nId );
+    void			RemoveImage( const ::rtl::OUString& rImageName );
 
-    Image           GetImage( USHORT nId ) const;
-    Image           GetImage( const ::rtl::OUString& rImageName ) const;
+    Image			GetImage( USHORT nId ) const;
+    Image			GetImage( const ::rtl::OUString& rImageName ) const;
 
-    USHORT          GetImagePos( USHORT nId ) const;
-    bool            HasImageAtPos( USHORT nId ) const;
-    USHORT          GetImagePos( const ::rtl::OUString& rImageName ) const;
+    USHORT			GetImagePos( USHORT nId ) const;
+    bool			HasImageAtPos( USHORT nId ) const;
+    USHORT			GetImagePos( const ::rtl::OUString& rImageName ) const;
 
-    USHORT          GetImageId( USHORT nPos ) const;
-    void            GetImageIds( ::std::vector< USHORT >& rIds ) const;
+    USHORT			GetImageId( USHORT nPos ) const;
+    void			GetImageIds( ::std::vector< USHORT >& rIds ) const;
 
-    ::rtl::OUString GetImageName( USHORT nPos ) const;
-    void            GetImageNames( ::std::vector< ::rtl::OUString >& rNames ) const;
+    ::rtl::OUString	GetImageName( USHORT nPos ) const;
+    void			GetImageNames( ::std::vector< ::rtl::OUString >& rNames ) const;
 
-    ImageList&      operator=( const ImageList& rImageList );
-    BOOL            operator==( const ImageList& rImageList ) const;
-    BOOL            operator!=( const ImageList& rImageList ) const { return !(ImageList::operator==( rImageList )); }
+    ImageList&		operator=( const ImageList& rImageList );
+    BOOL			operator==( const ImageList& rImageList ) const;
+    BOOL			operator!=( const ImageList& rImageList ) const { return !(ImageList::operator==( rImageList )); }
 
 private:
 
-    ImplImageList*  mpImplData;
-    USHORT          mnInitSize;
-    USHORT          mnGrowSize;
+    ImplImageList*	mpImplData;
+    USHORT			mnInitSize;
+    USHORT			mnGrowSize;
 
     SAL_DLLPRIVATE void    ImplInitBitmapEx( const ::rtl::OUString& rUserImageName,
                                              const ::std::vector< ::rtl::OUString >& rImageNames,
@@ -175,4 +175,4 @@ private:
     SAL_DLLPRIVATE void    ImplMakeUnique();
 };
 
-#endif  // _SV_IMAGE_HXX
+#endif	// _SV_IMAGE_HXX
diff --git a/vcl/inc/vcl/imagerepository.hxx b/vcl/inc/vcl/imagerepository.hxx
index f5809650fcf3..550abdd5e8fb 100644
--- a/vcl/inc/vcl/imagerepository.hxx
+++ b/vcl/inc/vcl/imagerepository.hxx
@@ -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
diff --git a/vcl/inc/vcl/imgctrl.hxx b/vcl/inc/vcl/imgctrl.hxx
index fa3b01463f34..a56f9d20dae5 100644
--- a/vcl/inc/vcl/imgctrl.hxx
+++ b/vcl/inc/vcl/imgctrl.hxx
@@ -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
@@ -40,8 +40,8 @@
 class VCL_DLLPUBLIC ImageControl : public FixedImage
 {
 private:
-    BitmapEx        maBmp;
-    BitmapEx        maBmpHC;
+    BitmapEx		maBmp;
+    BitmapEx		maBmpHC;
     ::sal_Int16     mnScaleMode;
 
 public:
@@ -51,17 +51,17 @@ public:
     void            SetScaleMode( const ::sal_Int16 _nMode );
     ::sal_Int16     GetScaleMode() const { return mnScaleMode; }
 
-    virtual void    Resize();
-    virtual void    UserDraw( const UserDrawEvent& rUDEvt );
+    virtual void	Resize();
+    virtual void	UserDraw( const UserDrawEvent& rUDEvt );
     virtual void    Paint( const Rectangle& rRect );
     virtual void    GetFocus();
     virtual void    LoseFocus();
 
-    void            SetBitmap( const BitmapEx& rBmp );
+    void			SetBitmap( const BitmapEx& rBmp );
     using OutputDevice::GetBitmap;
     const BitmapEx& GetBitmap() const { return maBmp; }
     BOOL            SetModeBitmap( const BitmapEx& rBitmap, BmpColorMode eMode = BMP_COLOR_NORMAL );
     const BitmapEx& GetModeBitmap( BmpColorMode eMode = BMP_COLOR_NORMAL ) const;
 };
 
-#endif  // _SV_IMGCTRL_HXX
+#endif	// _SV_IMGCTRL_HXX
diff --git a/vcl/inc/vcl/impbmp.hxx b/vcl/inc/vcl/impbmp.hxx
index dc40fdcd3181..9f06dce7f00a 100644
--- a/vcl/inc/vcl/impbmp.hxx
+++ b/vcl/inc/vcl/impbmp.hxx
@@ -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
@@ -39,7 +39,7 @@ struct BitmapBuffer;
 class SalBitmap;
 class BitmapPalette;
 class SalGraphics;
-class ImplServerBitmap;
+class ImplServerBitmap; 
 class Bitmap;
 class OutputDevice;
 class Color;
@@ -49,11 +49,11 @@ class ImpBitmap
 {
 private:
 
-    ULONG               mnRefCount;
-    ULONG               mnChecksum;
-    SalBitmap*          mpSalBitmap;
-    Size                maSourceSize;
-
+    ULONG				mnRefCount;
+    ULONG				mnChecksum;
+    SalBitmap*			mpSalBitmap;
+    Size				maSourceSize;
+    
 public:
 
                         ImpBitmap();
@@ -63,34 +63,34 @@ public:
 
 public:
 
-    void                ImplSetSalBitmap( SalBitmap* pSalBitmap );
-    SalBitmap*          ImplGetSalBitmap() const { return mpSalBitmap; }
+    void				ImplSetSalBitmap( SalBitmap* pSalBitmap );
+    SalBitmap*			ImplGetSalBitmap() const { return mpSalBitmap; }
 
 public:
 
-    BOOL                ImplCreate( const Size& rSize, USHORT nBitCount, const BitmapPalette& rPal );
-    BOOL                ImplCreate( const ImpBitmap& rImpBitmap );
-    BOOL                ImplCreate( const ImpBitmap& rImpBitmap, SalGraphics* pGraphics );
-    BOOL                ImplCreate( const ImpBitmap& rImpBitmap, USHORT nNewBitCount );
-
-    void                ImplDestroy();
-
-    Size                ImplGetSize() const;
-    Size                ImplGetSourceSize() const;
-    void                ImplSetSourceSize( const Size&);
-    USHORT              ImplGetBitCount() const;
-
-    BitmapBuffer*       ImplAcquireBuffer( BOOL bReadOnly );
-    void                ImplReleaseBuffer( BitmapBuffer* pBuffer, BOOL bReadOnly );
-
-public:
-
-    ULONG               ImplGetRefCount() const { return mnRefCount; }
-    void                ImplIncRefCount() { mnRefCount++; }
-    void                ImplDecRefCount() { mnRefCount--; }
-
-    inline void         ImplSetChecksum( ULONG nChecksum ) { mnChecksum = nChecksum; }
-    inline ULONG        ImplGetChecksum() const { return mnChecksum; }
+    BOOL				ImplCreate( const Size& rSize, USHORT nBitCount, const BitmapPalette& rPal );
+    BOOL				ImplCreate( const ImpBitmap& rImpBitmap );
+    BOOL				ImplCreate( const ImpBitmap& rImpBitmap, SalGraphics* pGraphics );
+    BOOL				ImplCreate( const ImpBitmap& rImpBitmap, USHORT nNewBitCount );
+                        
+    void				ImplDestroy();
+                        
+    Size				ImplGetSize() const;
+    Size				ImplGetSourceSize() const;
+    void				ImplSetSourceSize( const Size&);
+    USHORT				ImplGetBitCount() const;
+                        
+    BitmapBuffer*		ImplAcquireBuffer( BOOL bReadOnly );
+    void				ImplReleaseBuffer( BitmapBuffer* pBuffer, BOOL bReadOnly );
+                        
+public:					
+    
+    ULONG				ImplGetRefCount() const { return mnRefCount; }
+    void				ImplIncRefCount() { mnRefCount++; }
+    void				ImplDecRefCount() { mnRefCount--; }
+
+    inline void			ImplSetChecksum( ULONG nChecksum ) { mnChecksum = nChecksum; }
+    inline ULONG		ImplGetChecksum() const { return mnChecksum; }
 
 #endif // PRIVATE
 };
diff --git a/vcl/inc/vcl/impbmpconv.hxx b/vcl/inc/vcl/impbmpconv.hxx
index d95da9a4093a..2a3927cb3985 100644
--- a/vcl/inc/vcl/impbmpconv.hxx
+++ b/vcl/inc/vcl/impbmpconv.hxx
@@ -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
diff --git a/vcl/inc/vcl/impdel.hxx b/vcl/inc/vcl/impdel.hxx
index fc1796f0e402..a4fb666067ef 100644
--- a/vcl/inc/vcl/impdel.hxx
+++ b/vcl/inc/vcl/impdel.hxx
@@ -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
@@ -27,14 +27,14 @@
 
  #ifndef _VCL_IMPDEL_HXX
  #define _VCL_IMPDEL_HXX
-
+ 
  #include <list>
-
+ 
  namespace vcl
  {
-
+ 
  class DeletionListener;
-
+ 
  class DeletionNotifier
  {
      std::list< DeletionListener* > m_aListeners;
@@ -43,23 +43,23 @@
 
      ~DeletionNotifier()
      { notifyDelete(); }
-
+     
      inline void notifyDelete();
 
-     public:
+     public:	 
      void addDel( DeletionListener* pListener )
      { m_aListeners.push_back( pListener ); }
-
+     
      void removeDel( DeletionListener* pListener )
      { m_aListeners.remove( pListener ); }
  };
-
+ 
  class DeletionListener
  {
-     DeletionNotifier*  m_pNotifier;
+     DeletionNotifier*	m_pNotifier;
      public:
      DeletionListener( DeletionNotifier* pNotifier )
-     :  m_pNotifier( pNotifier )
+     : 	m_pNotifier( pNotifier )
         {
             if( m_pNotifier )
                 m_pNotifier->addDel( this );
@@ -78,10 +78,10 @@
      for( std::list< DeletionListener* >::const_iterator it =
              m_aListeners.begin(); it != m_aListeners.end(); ++it )
         (*it)->deleted();
-
+            
      m_aListeners.clear();
  }
-
+ 
  } // namespace vcl
-
+ 
  #endif // _VCL_IMPDEL_HXX
diff --git a/vcl/inc/vcl/impfont.hxx b/vcl/inc/vcl/impfont.hxx
index a1104bbf4a86..12e881c194ca 100644
--- a/vcl/inc/vcl/impfont.hxx
+++ b/vcl/inc/vcl/impfont.hxx
@@ -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
@@ -58,38 +58,38 @@ private:
     friend class Font;
     void                AskConfig();
 
-    int                 mnRefCount;
-    String              maFamilyName;
-    String              maStyleName;
-    Size                maSize;
-    Color               maColor;        // compatibility, now on output device
-    Color               maFillColor;    // compatibility, now on output device
-    rtl_TextEncoding    meCharSet;
-    LanguageType        meLanguage;
-    LanguageType        meCJKLanguage;
-    FontFamily          meFamily;
-    FontPitch           mePitch;
-    TextAlign           meAlign;
-    FontWeight          meWeight;
-    FontWidth           meWidthType;
-    FontItalic          meItalic;
-    FontUnderline       meUnderline;
-    FontUnderline       meOverline;
-    FontStrikeout       meStrikeout;
-    FontRelief          meRelief;
-    FontEmphasisMark    meEmphasisMark;
-    FontType            meType;         // used by metrics only
-    short               mnOrientation;
-    FontKerning         mnKerning;
-    BOOL                mbWordLine:1,
+    int					mnRefCount;
+    String				maFamilyName;
+    String				maStyleName;
+    Size				maSize;
+    Color				maColor;		// compatibility, now on output device
+    Color				maFillColor;	// compatibility, now on output device
+    rtl_TextEncoding	meCharSet;
+    LanguageType		meLanguage;
+    LanguageType		meCJKLanguage;
+    FontFamily			meFamily;
+    FontPitch			mePitch;
+    TextAlign			meAlign;
+    FontWeight			meWeight;
+    FontWidth			meWidthType;
+    FontItalic			meItalic;
+    FontUnderline		meUnderline;
+    FontUnderline		meOverline;
+    FontStrikeout		meStrikeout;
+    FontRelief			meRelief;
+    FontEmphasisMark	meEmphasisMark;
+    FontType			meType;			// used by metrics only
+    short				mnOrientation;
+    FontKerning 		mnKerning;
+    BOOL				mbWordLine:1,
                         mbOutline:1,
                         mbConfigLookup:1,   // there was a config lookup
                         mbShadow:1,
                         mbVertical:1,
-                        mbTransparent:1;    // compatibility, now on output device
+                        mbTransparent:1;	// compatibility, now on output device
 
-    friend SvStream&    operator>>( SvStream& rIStm, Impl_Font& );
-    friend SvStream&    operator<<( SvStream& rOStm, const Impl_Font& );
+    friend SvStream&	operator>>( SvStream& rIStm, Impl_Font& );
+    friend SvStream&	operator<<( SvStream& rOStm, const Impl_Font& );
 };
 
 // ------------------
@@ -147,18 +147,18 @@ public:
     FontHintStyle      meHintStyle;      // type of font hinting to be used
 public:
     ImplFontOptions() :
-        meEmbeddedBitmap(EMBEDDEDBITMAP_DONTKNOW),
-        meAntiAlias(ANTIALIAS_DONTKNOW),
-        meAutoHint(AUTOHINT_DONTKNOW),
-        meHinting(HINTING_DONTKNOW),
+        meEmbeddedBitmap(EMBEDDEDBITMAP_DONTKNOW), 
+        meAntiAlias(ANTIALIAS_DONTKNOW), 
+        meAutoHint(AUTOHINT_DONTKNOW), 
+        meHinting(HINTING_DONTKNOW), 
         meHintStyle(HINT_SLIGHT)
     {}
-    ImplFontOptions( FontEmbeddedBitmap eEmbeddedBitmap, FontAntiAlias eAntiAlias,
+    ImplFontOptions( FontEmbeddedBitmap eEmbeddedBitmap, FontAntiAlias eAntiAlias, 
         FontAutoHint eAutoHint, FontHinting eHinting, FontHintStyle eHintStyle) :
-        meEmbeddedBitmap(eEmbeddedBitmap),
-        meAntiAlias(eAntiAlias),
-        meAutoHint(eAutoHint),
-        meHinting(eHinting),
+        meEmbeddedBitmap(eEmbeddedBitmap), 
+        meAntiAlias(eAntiAlias), 
+        meAutoHint(eAutoHint), 
+        meHinting(eHinting), 
         meHintStyle(eHintStyle)
     {}
     FontAutoHint GetUseAutoHint() const { return meAutoHint; }
@@ -225,16 +225,16 @@ class
 CmapResult
 {
 public:
-    explicit    CmapResult( bool bSymbolic = false,
+    explicit	CmapResult( bool bSymbolic = false,
                     const sal_uInt32* pRangeCodes = NULL, int nRangeCount = 0,
                     const int* pStartGlyphs = 0, const USHORT* pGlyphIds = NULL );
 
     const sal_uInt32* mpRangeCodes;
     const int*        mpStartGlyphs;
     const USHORT*     mpGlyphIds;
-    int               mnRangeCount;
-    bool              mbSymbolic;
-    bool              mbRecoded;
+    int			      mnRangeCount;
+    bool		      mbSymbolic;
+    bool			  mbRecoded;
 };
 
 bool ParseCMAP( const unsigned char* pRawData, int nRawLength, CmapResult& );
diff --git a/vcl/inc/vcl/impgraph.hxx b/vcl/inc/vcl/impgraph.hxx
index bb28d801fe12..cb99a06dc0d1 100644
--- a/vcl/inc/vcl/impgraph.hxx
+++ b/vcl/inc/vcl/impgraph.hxx
@@ -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
@@ -41,17 +41,17 @@
 
 struct ImpSwapInfo
 {
-    MapMode     maPrefMapMode;
-    Size        maPrefSize;
+    MapMode		maPrefMapMode;
+    Size		maPrefSize;
 };
 
 // --------------
 // - ImpGraphic -
 // --------------
 
-class   OutputDevice;
-class   GfxLink;
-struct  ImpSwapFile;
+class	OutputDevice;
+class	GfxLink;
+struct	ImpSwapFile;
 class GraphicConversionParameters;
 
 class ImpGraphic
@@ -60,20 +60,20 @@ class ImpGraphic
 
 private:
 
-    GDIMetaFile         maMetaFile;
-    BitmapEx            maEx;
-    ImpSwapInfo         maSwapInfo;
-    Animation*          mpAnimation;
-    GraphicReader*      mpContext;
-    ImpSwapFile*        mpSwapFile;
-    GfxLink*            mpGfxLink;
-    GraphicType         meType;
-    String              maDocFileURLStr;
-    ULONG               mnDocFilePos;
+    GDIMetaFile			maMetaFile;
+    BitmapEx			maEx;
+    ImpSwapInfo			maSwapInfo;
+    Animation*			mpAnimation;
+    GraphicReader*		mpContext;
+    ImpSwapFile*		mpSwapFile;
+    GfxLink*			mpGfxLink;
+    GraphicType			meType;
+    String				maDocFileURLStr;
+    ULONG				mnDocFilePos;
     mutable ULONG       mnSizeBytes;
-    ULONG               mnRefCount;
-    BOOL                mbSwapOut;
-    BOOL                mbSwapUnderway;
+    ULONG				mnRefCount;
+    BOOL				mbSwapOut;
+    BOOL				mbSwapUnderway;
 
 private:
 
@@ -83,94 +83,94 @@ private:
                         ImpGraphic( const BitmapEx& rBmpEx );
                         ImpGraphic( const Animation& rAnimation );
                         ImpGraphic( const GDIMetaFile& rMtf );
-    virtual             ~ImpGraphic();
-
-    ImpGraphic&         operator=( const ImpGraphic& rImpGraphic );
-    BOOL                operator==( const ImpGraphic& rImpGraphic ) const;
-    BOOL                operator!=( const ImpGraphic& rImpGraphic ) const { return !( *this == rImpGraphic ); }
+    virtual				~ImpGraphic();
 
-    void                ImplClearGraphics( BOOL bCreateSwapInfo );
-    void                ImplClear();
+    ImpGraphic&			operator=( const ImpGraphic& rImpGraphic );
+    BOOL				operator==( const ImpGraphic& rImpGraphic ) const;
+    BOOL				operator!=( const ImpGraphic& rImpGraphic ) const { return !( *this == rImpGraphic ); }
 
-    GraphicType         ImplGetType() const;
-    void                ImplSetDefaultType();
-    BOOL                ImplIsSupportedGraphic() const;
+    void				ImplClearGraphics( BOOL bCreateSwapInfo );
+    void				ImplClear();
 
-    BOOL                ImplIsTransparent() const;
-    BOOL                ImplIsAlpha() const;
-    BOOL                ImplIsAnimated() const;
+    GraphicType			ImplGetType() const;
+    void				ImplSetDefaultType();
+    BOOL				ImplIsSupportedGraphic() const;
 
-    Bitmap              ImplGetBitmap(const GraphicConversionParameters& rParameters) const;
-    BitmapEx            ImplGetBitmapEx(const GraphicConversionParameters& rParameters) const;
-    Animation           ImplGetAnimation() const;
-    const GDIMetaFile&  ImplGetGDIMetaFile() const;
+    BOOL				ImplIsTransparent() const;
+    BOOL				ImplIsAlpha() const;
+    BOOL				ImplIsAnimated() const;
 
-    Size                ImplGetPrefSize() const;
-    void                ImplSetPrefSize( const Size& rPrefSize );
+    Bitmap				ImplGetBitmap(const GraphicConversionParameters& rParameters) const;
+    BitmapEx			ImplGetBitmapEx(const GraphicConversionParameters& rParameters) const;
+    Animation			ImplGetAnimation() const;
+    const GDIMetaFile&	ImplGetGDIMetaFile() const;
 
-    MapMode             ImplGetPrefMapMode() const;
-    void                ImplSetPrefMapMode( const MapMode& rPrefMapMode );
+    Size				ImplGetPrefSize() const;
+    void				ImplSetPrefSize( const Size& rPrefSize );
+    
+    MapMode				ImplGetPrefMapMode() const;
+    void				ImplSetPrefMapMode( const MapMode& rPrefMapMode );
 
-    ULONG               ImplGetSizeBytes() const;
+    ULONG				ImplGetSizeBytes() const;
 
-    void                ImplDraw( OutputDevice* pOutDev,
+    void				ImplDraw( OutputDevice* pOutDev, 
                                   const Point& rDestPt ) const;
-    void                ImplDraw( OutputDevice* pOutDev,
-                                  const Point& rDestPt,
+    void				ImplDraw( OutputDevice* pOutDev,
+                                  const Point& rDestPt, 
                                   const Size& rDestSize ) const;
 
-    void                ImplStartAnimation( OutputDevice* pOutDev,
+    void				ImplStartAnimation( OutputDevice* pOutDev, 
                                             const Point& rDestPt,
                                             long nExtraData = 0,
                                             OutputDevice* pFirstFrameOutDev = NULL );
-    void                ImplStartAnimation( OutputDevice* pOutDev,
+    void				ImplStartAnimation( OutputDevice* pOutDev,
                                             const Point& rDestPt,
-                                            const Size& rDestSize,
+                                            const Size& rDestSize, 
                                             long nExtraData = 0,
                                             OutputDevice* pFirstFrameOutDev = NULL );
-    void                ImplStopAnimation( OutputDevice* pOutputDevice = NULL,
+    void				ImplStopAnimation( OutputDevice* pOutputDevice = NULL, 
                                            long nExtraData = 0 );
 
-    void                ImplSetAnimationNotifyHdl( const Link& rLink );
-    Link                ImplGetAnimationNotifyHdl() const;
+    void				ImplSetAnimationNotifyHdl( const Link& rLink );
+    Link				ImplGetAnimationNotifyHdl() const;
 
-    ULONG               ImplGetAnimationLoopCount() const;
-    void                ImplResetAnimationLoopCount();
+    ULONG				ImplGetAnimationLoopCount() const;
+    void				ImplResetAnimationLoopCount();
 
-    List*               ImplGetAnimationInfoList() const;
+    List*				ImplGetAnimationInfoList() const;
 
 private:
 
-    GraphicReader*      ImplGetContext();
-    void                ImplSetContext( GraphicReader* pReader );
+    GraphicReader*		ImplGetContext();
+    void				ImplSetContext( GraphicReader* pReader );
 
 private:
 
-    void                ImplSetDocFileName( const String& rName, ULONG nFilePos );
-    const String&       ImplGetDocFileName() const;
-    ULONG               ImplGetDocFilePos() const;
+    void				ImplSetDocFileName( const String& rName, ULONG nFilePos );
+    const String&		ImplGetDocFileName() const;
+    ULONG				ImplGetDocFilePos() const;
 
-    BOOL                ImplReadEmbedded( SvStream& rIStream, BOOL bSwap = FALSE );
-    BOOL                ImplWriteEmbedded( SvStream& rOStream );
+    BOOL				ImplReadEmbedded( SvStream& rIStream, BOOL bSwap = FALSE );
+    BOOL				ImplWriteEmbedded( SvStream& rOStream );
 
-    BOOL                ImplSwapIn();
-    BOOL                ImplSwapIn( SvStream* pIStm );
+    BOOL				ImplSwapIn();
+    BOOL				ImplSwapIn( SvStream* pIStm );
 
-    BOOL                ImplSwapOut();
-    BOOL                ImplSwapOut( SvStream* pOStm );
+    BOOL				ImplSwapOut();
+    BOOL				ImplSwapOut( SvStream* pOStm );
 
-    BOOL                ImplIsSwapOut() const;
+    BOOL				ImplIsSwapOut() const;
 
-    void                ImplSetLink( const GfxLink& );
-    GfxLink             ImplGetLink();
-    BOOL                ImplIsLink() const;
+    void				ImplSetLink( const GfxLink& );
+    GfxLink				ImplGetLink();
+    BOOL				ImplIsLink() const;
 
-    ULONG               ImplGetChecksum() const;
+    ULONG				ImplGetChecksum() const;
 
-    BOOL                ImplExportNative( SvStream& rOStm ) const;
+    BOOL				ImplExportNative( SvStream& rOStm ) const;
 
-    friend SvStream&    operator<<( SvStream& rOStm, const ImpGraphic& rImpGraphic );
-    friend SvStream&    operator>>( SvStream& rIStm, ImpGraphic& rImpGraphic );
+    friend SvStream&	operator<<( SvStream& rOStm, const ImpGraphic& rImpGraphic );
+    friend SvStream&	operator>>( SvStream& rIStm, ImpGraphic& rImpGraphic );
 };
 
 #endif // _SV_IMPGRAPH_HXX
diff --git a/vcl/inc/vcl/impimagetree.hxx b/vcl/inc/vcl/impimagetree.hxx
index 9649fe2f5ec8..ec79fd5298d1 100644
--- a/vcl/inc/vcl/impimagetree.hxx
+++ b/vcl/inc/vcl/impimagetree.hxx
@@ -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
diff --git a/vcl/inc/vcl/impoct.hxx b/vcl/inc/vcl/impoct.hxx
index 543ab19d6a57..27736e7005a8 100644
--- a/vcl/inc/vcl/impoct.hxx
+++ b/vcl/inc/vcl/impoct.hxx
@@ -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
@@ -36,28 +36,28 @@
 
 class ImpErrorQuad
 {
-    long                    nRed;
-    long                    nGreen;
-    long                    nBlue;
-    long                    nReserved;
-
-public:
-
-    inline                  ImpErrorQuad() {}
-    inline                  ImpErrorQuad( const BitmapColor& rColor ) :
-                                nRed    ( (long) rColor.GetRed() << 5L ),
-                                nGreen  ( (long) rColor.GetGreen() << 5L ),
-                                nBlue   ( (long) rColor.GetBlue() << 5L ) {}
-
-    inline void             operator=( const BitmapColor& rColor );
-    inline ImpErrorQuad&    operator-=( const BitmapColor& rColor );
-
-    inline void             ImplAddColorError1( const ImpErrorQuad& rErrQuad );
-    inline void             ImplAddColorError3( const ImpErrorQuad& rErrQuad );
-    inline void             ImplAddColorError5( const ImpErrorQuad& rErrQuad );
-    inline void             ImplAddColorError7( const ImpErrorQuad& rErrQuad );
-
-    inline BitmapColor      ImplGetColor();
+    long					nRed;
+    long					nGreen;
+    long					nBlue;
+    long					nReserved;
+                            
+public:						
+                            
+    inline 					ImpErrorQuad() {}
+    inline					ImpErrorQuad( const BitmapColor& rColor ) :
+                                nRed	( (long) rColor.GetRed() << 5L ),
+                                nGreen	( (long) rColor.GetGreen() << 5L ),
+                                nBlue	( (long) rColor.GetBlue() << 5L ) {}
+                            
+    inline void				operator=( const BitmapColor& rColor );
+    inline ImpErrorQuad&	operator-=( const BitmapColor& rColor );
+                            
+    inline void				ImplAddColorError1( const ImpErrorQuad& rErrQuad );
+    inline void				ImplAddColorError3( const ImpErrorQuad& rErrQuad );
+    inline void				ImplAddColorError5( const ImpErrorQuad& rErrQuad );
+    inline void				ImplAddColorError7( const ImpErrorQuad& rErrQuad );
+                            
+    inline BitmapColor		ImplGetColor();
 };
 
 // ------------------------------------------------------------------------
@@ -120,8 +120,8 @@ inline void ImpErrorQuad::ImplAddColorError7( const ImpErrorQuad& rErrQuad )
 
 inline BitmapColor ImpErrorQuad::ImplGetColor()
 {
-    return BitmapColor( (BYTE) ( ( nRed < 0L ? 0L : nRed > 8160L ? 8160L : nRed ) >> 5L ),
-                        (BYTE) ( ( nGreen < 0L ? 0L : nGreen > 8160L ? 8160L : nGreen ) >> 5L ),
+    return BitmapColor( (BYTE) ( ( nRed < 0L ? 0L : nRed > 8160L ? 8160L : nRed ) >> 5L ), 
+                        (BYTE) ( ( nGreen < 0L ? 0L : nGreen > 8160L ? 8160L : nGreen ) >> 5L ), 
                         (BYTE) ( ( nBlue < 0L ? 0L : nBlue > 8160L ? 8160L : nBlue ) >> 5L ) );
 }
 
@@ -131,19 +131,19 @@ inline BitmapColor ImpErrorQuad::ImplGetColor()
 
 class ImpNodeCache
 {
-    OctreeNode*         pActNode;
-    ULONG               nNew;
-    ULONG               nDelete;
-    ULONG               nGet;
-    ULONG               nRelease;
-
-public:
-
+    OctreeNode*			pActNode;
+    ULONG				nNew;
+    ULONG				nDelete;
+    ULONG				nGet;
+    ULONG				nRelease;
+                        
+public:					
+                        
                         ImpNodeCache( const ULONG nInitSize );
                         ~ImpNodeCache();
 
-    inline OctreeNode*  ImplGetFreeNode();
-    inline void         ImplReleaseNode( OctreeNode* pNode );
+    inline OctreeNode*	ImplGetFreeNode();
+    inline void			ImplReleaseNode( OctreeNode* pNode );
 };
 
 // ------------------------------------------------------------------------
diff --git a/vcl/inc/vcl/impprn.hxx b/vcl/inc/vcl/impprn.hxx
index 954b2340d0c7..59cebc673bb0 100644
--- a/vcl/inc/vcl/impprn.hxx
+++ b/vcl/inc/vcl/impprn.hxx
@@ -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
@@ -48,7 +48,7 @@ struct QueuePage;
     normal drawing operations for each printed page to a metafile, then spooling
     the metafiles timer based to a normal printer. The application can act in the meantime
     including changing the original document without influencing the print job.
-
+    
     On some systems (currently Mac/Aqua Cocoa) ImplQPrinter has the additional
     purpose of adapting to the print system: here theprint systems starts a
     job and will not return from that function until it has ended; to do so
@@ -69,7 +69,7 @@ private:
     bool                            mbUserCopy;
     bool                            mbDestroyAllowed;
     bool                            mbDestroyed;
-
+    
     GDIMetaFile                     maCurPageMetaFile;
     long                            mnMaxBmpDPIX;
     long                            mnMaxBmpDPIY;
@@ -77,30 +77,30 @@ private:
     int                             mnCurCopyCount;
 
                 DECL_LINK( ImplPrintHdl, Timer* );
-
+    
                 ~ImplQPrinter();
 
-    void        ImplPrintMtf( GDIMetaFile& rMtf, long nMaxBmpDPIX, long nMaxBmpDPIY );
+    void		ImplPrintMtf( GDIMetaFile& rMtf, long nMaxBmpDPIX, long nMaxBmpDPIY );
 
                 ImplQPrinter( const ImplQPrinter& rPrinter );
     Printer&    operator =( const ImplQPrinter& rPrinter );
-
+    
     void        PrePrintPage( QueuePage* );
     void        PostPrintPage();
 
 public:
 
                 ImplQPrinter( Printer* pParent );
-    void        Destroy();
-
-    void        StartQueuePrint();
-    void        EndQueuePrint();
-    void        AbortQueuePrint();
-    void        AddQueuePage( GDIMetaFile* pPage, USHORT nPage, BOOL bNewJobSetup );
+    void		Destroy();
 
-    bool        IsUserCopy() const { return mbUserCopy; }
-    void        SetUserCopy( bool bSet ) { mbUserCopy = bSet; }
+    void		StartQueuePrint();
+    void		EndQueuePrint();
+    void		AbortQueuePrint();
+    void		AddQueuePage( GDIMetaFile* pPage, USHORT nPage, BOOL bNewJobSetup );
 
+    bool		IsUserCopy() const { return mbUserCopy; }
+    void		SetUserCopy( bool bSet ) { mbUserCopy = bSet; }
+    
     /**
     used by pull implementation to emit the next page
     */
@@ -110,31 +110,31 @@ public:
     (that is how often PrintNextPage should be called)
     */
     ULONG       GetPrintPageCount() const;
-
+    
     /**
     used by pull implementation to get ranges of physical pages that
     are to be printed on the same paper. If bIncludeOrientationChanges is true
     then orientation changes will not break a page run; the implementation has
     to rotate the page contents accordingly in that case.
-
+    
     The returned vector contains all pages indices beginning a new medium and additionally
     the index that of the last page+1 (for convenience, so the length of a range
     is always v[i+1] - v[i])
-
+    
     Example: 5 pages, all A4
     return: [0 5]
-
+    
     Example: 6 pages, beginning A4, switching tol A5 on fourth page, back to A4 on fifth page
     return [0 3 4 6]
-
+    
     returns an false in push model (error condition)
     */
     bool GetPaperRanges( std::vector< ULONG >& o_rRanges, bool i_bIncludeOrientationChanges ) const;
-
+    
     /**
     get the jobsetup for a page
     */
     ImplJobSetup* GetPageSetup( unsigned int nPage ) const;
 };
 
-#endif  // _SV_IMPPRN_HXX
+#endif	// _SV_IMPPRN_HXX
diff --git a/vcl/inc/vcl/inputctx.hxx b/vcl/inc/vcl/inputctx.hxx
index 5e7cffa29dc6..d028461db015 100644
--- a/vcl/inc/vcl/inputctx.hxx
+++ b/vcl/inc/vcl/inputctx.hxx
@@ -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
@@ -36,10 +36,10 @@
 // - InputContext-Flags -
 // ----------------------
 
-#define INPUTCONTEXT_TEXT               ((ULONG)0x00000001)
-#define INPUTCONTEXT_EXTTEXTINPUT       ((ULONG)0x00000002)
-#define INPUTCONTEXT_EXTTEXTINPUT_ON    ((ULONG)0x00000004)
-#define INPUTCONTEXT_EXTTEXTINPUT_OFF   ((ULONG)0x00000008)
+#define INPUTCONTEXT_TEXT				((ULONG)0x00000001)
+#define INPUTCONTEXT_EXTTEXTINPUT		((ULONG)0x00000002)
+#define INPUTCONTEXT_EXTTEXTINPUT_ON	((ULONG)0x00000004)
+#define INPUTCONTEXT_EXTTEXTINPUT_OFF	((ULONG)0x00000008)
 
 // ----------------
 // - InputContext -
@@ -48,8 +48,8 @@
 class VCL_DLLPUBLIC InputContext
 {
 private:
-    Font            maFont;
-    ULONG           mnOptions;
+    Font			maFont;
+    ULONG			mnOptions;
 
 public:
                     InputContext() { mnOptions = 0; }
@@ -60,29 +60,29 @@ public:
                         maFont( rFont )
                     { mnOptions = nOptions; }
 
-    void            SetFont( const Font& rFont ) { maFont = rFont; }
-    const Font&     GetFont() const { return maFont; }
+    void			SetFont( const Font& rFont ) { maFont = rFont; }
+    const Font& 	GetFont() const { return maFont; }
 
-    void            SetOptions( ULONG nOptions ) { mnOptions = nOptions; }
-    ULONG           GetOptions() const { return mnOptions; }
+    void			SetOptions( ULONG nOptions ) { mnOptions = nOptions; }
+    ULONG			GetOptions() const { return mnOptions; }
 
-    InputContext&   operator=( const InputContext& rInputContext );
-    BOOL            operator==( const InputContext& rInputContext ) const;
-    BOOL            operator!=( const InputContext& rInputContext ) const
+    InputContext&	operator=( const InputContext& rInputContext );
+    BOOL			operator==( const InputContext& rInputContext ) const;
+    BOOL			operator!=( const InputContext& rInputContext ) const
                         { return !(InputContext::operator==( rInputContext )); }
 };
 
 inline InputContext& InputContext::operator=( const InputContext& rInputContext )
 {
-    maFont      = rInputContext.maFont;
-    mnOptions   = rInputContext.mnOptions;
+    maFont		= rInputContext.maFont;
+    mnOptions	= rInputContext.mnOptions;
     return *this;
 }
 
 inline BOOL InputContext::operator==( const InputContext& rInputContext ) const
 {
-    return ((mnOptions  == rInputContext.mnOptions) &&
-            (maFont     == rInputContext.maFont));
+    return ((mnOptions	== rInputContext.mnOptions) &&
+            (maFont 	== rInputContext.maFont));
 }
 
 #endif // _VCL_INPUTCTX_HXX
diff --git a/vcl/inc/vcl/introwin.hxx b/vcl/inc/vcl/introwin.hxx
index 40644019bc15..d9dd5ae71f44 100644
--- a/vcl/inc/vcl/introwin.hxx
+++ b/vcl/inc/vcl/introwin.hxx
@@ -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
diff --git a/vcl/inc/vcl/javachild.hxx b/vcl/inc/vcl/javachild.hxx
index 62b447f26571..6e30551218a2 100644
--- a/vcl/inc/vcl/javachild.hxx
+++ b/vcl/inc/vcl/javachild.hxx
@@ -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
@@ -43,7 +43,7 @@ public:
                     JavaChildWindow( Window* pParent, const ResId& rResId );
                    ~JavaChildWindow();
 
-    sal_IntPtr      getParentWindowHandleForJava();
+    sal_IntPtr		getParentWindowHandleForJava();
 
 private:
 
diff --git a/vcl/inc/vcl/jobdata.hxx b/vcl/inc/vcl/jobdata.hxx
index f576b816dab0..be379546a1bc 100644
--- a/vcl/inc/vcl/jobdata.hxx
+++ b/vcl/inc/vcl/jobdata.hxx
@@ -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
@@ -70,7 +70,7 @@ struct JobData
     JobData& operator=(const psp::JobData& rRight);
 
     JobData( const JobData& rData ) { *this = rData; }
-
+    
     void setCollate( bool bCollate );
 
     // creates a new buffer using new
diff --git a/vcl/inc/vcl/jobset.h b/vcl/inc/vcl/jobset.h
index 2a8be4a6999e..b44e5905143f 100644
--- a/vcl/inc/vcl/jobset.h
+++ b/vcl/inc/vcl/jobset.h
@@ -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
@@ -39,11 +39,11 @@
 // ------------------
 
 // see com.sun.star.portal.client.JobSetupSystem.idl:
-#define JOBSETUP_SYSTEM_DONTKNOW    0
-#define JOBSETUP_SYSTEM_WINDOWS     1
-#define JOBSETUP_SYSTEM_OS2         2
-#define JOBSETUP_SYSTEM_UNIX        3
-#define JOBSETUP_SYSTEM_MAC         4
+#define JOBSETUP_SYSTEM_DONTKNOW	0
+#define JOBSETUP_SYSTEM_WINDOWS 	1
+#define JOBSETUP_SYSTEM_OS2 		2
+#define JOBSETUP_SYSTEM_UNIX		3
+#define JOBSETUP_SYSTEM_MAC 		4
 #define JOBSETUP_SYSTEM_JAVA        5
 
 // ----------------
@@ -52,19 +52,19 @@
 
 struct ImplJobSetup
 {
-    USHORT          mnRefCount;         // RefCount (only independ data)
-    USHORT          mnSystem;           // Sytem - JOBSETUP_SYSTEM_xxxx
-    String          maPrinterName;      // Printer-Name
-    String          maDriver;           // Driver-Name
-    Orientation     meOrientation;      // Orientation
+    USHORT			mnRefCount; 		// RefCount (only independ data)
+    USHORT			mnSystem;			// Sytem - JOBSETUP_SYSTEM_xxxx
+    String			maPrinterName;		// Printer-Name
+    String			maDriver;			// Driver-Name
+    Orientation 	meOrientation;		// Orientation
     DuplexMode      meDuplexMode;       // Duplex
-    USHORT          mnPaperBin;         // paper bin / in tray
-    Paper           mePaperFormat;      // paper format
-    long            mnPaperWidth;       // paper width (100th mm)
-    long            mnPaperHeight;      // paper height (100th mm)
-    ULONG           mnDriverDataLen;    // length of system specific data
-    BYTE*           mpDriverData;       // system specific data (will be streamed a byte block)
-    ::std::hash_map< ::rtl::OUString, ::rtl::OUString, ::rtl::OUStringHash >            maValueMap;
+    USHORT			mnPaperBin; 		// paper bin / in tray
+    Paper			mePaperFormat;		// paper format
+    long			mnPaperWidth;		// paper width (100th mm)
+    long			mnPaperHeight;		// paper height (100th mm)
+    ULONG			mnDriverDataLen;	// length of system specific data
+    BYTE*			mpDriverData;		// system specific data (will be streamed a byte block)
+    ::std::hash_map< ::rtl::OUString, ::rtl::OUString, ::rtl::OUStringHash >			maValueMap;
 
                     ImplJobSetup();
                     ImplJobSetup( const ImplJobSetup& rJobSetup );
@@ -76,4 +76,4 @@ struct ImplJobSetup
 // Papierbreite/hoehe wird wenn 0 im unabhaengigen Teil automatisch aus
 // Papierformat berechnet, wenn dieses ungleich PAPER_USER ist
 
-#endif  // _SV_JOBSET_H
+#endif	// _SV_JOBSET_H
diff --git a/vcl/inc/vcl/jobset.hxx b/vcl/inc/vcl/jobset.hxx
index 4228fc8e90e1..9864f373e43a 100644
--- a/vcl/inc/vcl/jobset.hxx
+++ b/vcl/inc/vcl/jobset.hxx
@@ -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
@@ -45,12 +45,12 @@ class VCL_DLLPUBLIC JobSetup
     friend class Printer;
 
 private:
-    ImplJobSetup*       mpData;
+    ImplJobSetup*		mpData;
 
 //#if 0 // _SOLAR__PRIVATE
 public:
-    SAL_DLLPRIVATE ImplJobSetup*        ImplGetData();
-    SAL_DLLPRIVATE ImplJobSetup*        ImplGetConstData();
+    SAL_DLLPRIVATE ImplJobSetup*		ImplGetData();
+    SAL_DLLPRIVATE ImplJobSetup*		ImplGetConstData();
     SAL_DLLPRIVATE const ImplJobSetup*  ImplGetConstData() const;
 //#endif
 
@@ -59,25 +59,25 @@ public:
                         JobSetup( const JobSetup& rJob );
                         ~JobSetup();
 
-    String              GetPrinterName() const;
-    String              GetDriverName() const;
+    String				GetPrinterName() const;
+    String				GetDriverName() const;
 
-    /*  Get/SetValue are used to read/store additional
-     *  Parameters in the job setup that may be used
-     *  by the printer driver. One possible use are phone
-     *  numbers for faxes (which disguise as printers)
+    /*	Get/SetValue are used to read/store additional
+     *	Parameters in the job setup that may be used
+     *	by the printer driver. One possible use are phone
+     *	numbers for faxes (which disguise as printers)
      */
-    String              GetValue( const String& rKey ) const;
-    void                SetValue( const String& rKey, const String& rValue );
+    String				GetValue( const String& rKey ) const;
+    void				SetValue( const String& rKey, const String& rValue );
 
-    JobSetup&           operator=( const JobSetup& rJob );
+    JobSetup&			operator=( const JobSetup& rJob );
 
-    BOOL                operator==( const JobSetup& rJobSetup ) const;
-    BOOL                operator!=( const JobSetup& rJobSetup ) const
+    BOOL				operator==( const JobSetup& rJobSetup ) const;
+    BOOL				operator!=( const JobSetup& rJobSetup ) const
                             { return !(JobSetup::operator==( rJobSetup )); }
 
-    friend VCL_DLLPUBLIC SvStream&  operator>>( SvStream& rIStream, JobSetup& rJobSetup );
-    friend VCL_DLLPUBLIC SvStream&  operator<<( SvStream& rOStream, const JobSetup& rJobSetup );
+    friend VCL_DLLPUBLIC SvStream&	operator>>( SvStream& rIStream, JobSetup& rJobSetup );
+    friend VCL_DLLPUBLIC SvStream&	operator<<( SvStream& rOStream, const JobSetup& rJobSetup );
 };
 
-#endif  // _SV_JOBSET_HXX
+#endif	// _SV_JOBSET_HXX
diff --git a/vcl/inc/vcl/keycod.hxx b/vcl/inc/vcl/keycod.hxx
index 487dea1d7c2f..b4e2d785364a 100644
--- a/vcl/inc/vcl/keycod.hxx
+++ b/vcl/inc/vcl/keycod.hxx
@@ -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
@@ -62,7 +62,7 @@ enum KeyFuncType { KEYFUNC_DONTKNOW, KEYFUNC_NEW, KEYFUNC_OPEN,
 class VCL_DLLPUBLIC KeyCode
 {
 private:
-    USHORT      nCode;
+    USHORT		nCode;
     KeyFuncType eFunc;
 
 public:
@@ -73,40 +73,40 @@ public:
                 KeyCode( USHORT nKey, BOOL bShift, BOOL bMod1, BOOL bMod2, BOOL bMod3 );
                 KeyCode( KeyFuncType eFunction );
 
-    USHORT      GetFullCode() const { return nCode; }
-    USHORT      GetFullKeyCode() const { return (nCode) ; }
+    USHORT		GetFullCode() const { return nCode; }
+    USHORT		GetFullKeyCode() const { return (nCode) ; }
     KeyFuncType GetFullFunction() const { return eFunc; }
-    BOOL        IsDefinedKeyCodeEqual( const KeyCode& rKeyCode ) const;
+    BOOL		IsDefinedKeyCodeEqual( const KeyCode& rKeyCode ) const;
 
-    USHORT      GetCode() const
+    USHORT		GetCode() const
                     { return (nCode & KEY_CODE); }
 
-    USHORT      GetModifier() const
+    USHORT		GetModifier() const
                     { return (nCode & KEY_MODTYPE); }
-    USHORT      GetAllModifier() const
+    USHORT		GetAllModifier() const
                     { return (nCode & KEY_ALLMODTYPE); }
-    BOOL        IsShift() const
+    BOOL		IsShift() const
                     { return ((nCode & KEY_SHIFT) != 0); }
-    BOOL        IsMod1() const
+    BOOL		IsMod1() const
                     { return ((nCode & KEY_MOD1) != 0); }
-    BOOL        IsMod2() const
+    BOOL		IsMod2() const
                     { return ((nCode & KEY_MOD2) != 0); }
-    BOOL        IsMod3() const
-                    { return ((nCode & KEY_MOD3) != 0); }
-    USHORT      GetGroup() const
+    BOOL		IsMod3() const
+                    { return ((nCode & KEY_MOD3) != 0); }	
+    USHORT		GetGroup() const
                     { return (nCode & KEYGROUP_TYPE); }
 
-    XubString   GetName( Window* pWindow = NULL ) const;
-    XubString   GetSymbolName( const XubString& rFontName, Window* pWindow = NULL ) const;
+    XubString	GetName( Window* pWindow = NULL ) const;
+    XubString	GetSymbolName( const XubString& rFontName, Window* pWindow = NULL ) const;
 
-    BOOL        IsFunction() const
+    BOOL		IsFunction() const
                     { return ((eFunc != KEYFUNC_DONTKNOW) ? TRUE : FALSE); }
 
     KeyFuncType GetFunction() const;
 
     KeyCode&    operator = ( const KeyCode& rKeyCode );
-    BOOL        operator ==( const KeyCode& rKeyCode ) const;
-    BOOL        operator !=( const KeyCode& rKeyCode ) const;
+    BOOL		operator ==( const KeyCode& rKeyCode ) const;
+    BOOL		operator !=( const KeyCode& rKeyCode ) const;
 };
 
 inline KeyCode::KeyCode( USHORT nKey, BOOL bShift, BOOL bMod1, BOOL bMod2, BOOL bMod3 )
diff --git a/vcl/inc/vcl/keycodes.hxx b/vcl/inc/vcl/keycodes.hxx
index cfd4d11c9a7c..bf036131cd93 100644
--- a/vcl/inc/vcl/keycodes.hxx
+++ b/vcl/inc/vcl/keycodes.hxx
@@ -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
@@ -39,132 +39,132 @@
 // By changes you must also change: rsc/vclrsc.hxx
 
 // Key-Gruppen
-#define KEYGROUP_NUM    ((USHORT)::com::sun::star::awt::KeyGroup::NUM)
-#define KEYGROUP_ALPHA  ((USHORT)::com::sun::star::awt::KeyGroup::ALPHA)
-#define KEYGROUP_FKEYS  ((USHORT)::com::sun::star::awt::KeyGroup::FKEYS)
+#define KEYGROUP_NUM	((USHORT)::com::sun::star::awt::KeyGroup::NUM)
+#define KEYGROUP_ALPHA	((USHORT)::com::sun::star::awt::KeyGroup::ALPHA)
+#define KEYGROUP_FKEYS	((USHORT)::com::sun::star::awt::KeyGroup::FKEYS)
 #define KEYGROUP_CURSOR ((USHORT)::com::sun::star::awt::KeyGroup::CURSOR)
-#define KEYGROUP_MISC   ((USHORT)::com::sun::star::awt::KeyGroup::MISC)
-#define KEYGROUP_TYPE   ((USHORT)::com::sun::star::awt::KeyGroup::TYPE)
+#define KEYGROUP_MISC	((USHORT)::com::sun::star::awt::KeyGroup::MISC)
+#define KEYGROUP_TYPE	((USHORT)::com::sun::star::awt::KeyGroup::TYPE)
 
 // Key-Codes
-#define KEY_0           ((USHORT)::com::sun::star::awt::Key::NUM0)
-#define KEY_1           ((USHORT)::com::sun::star::awt::Key::NUM1)
-#define KEY_2           ((USHORT)::com::sun::star::awt::Key::NUM2)
-#define KEY_3           ((USHORT)::com::sun::star::awt::Key::NUM3)
-#define KEY_4           ((USHORT)::com::sun::star::awt::Key::NUM4)
-#define KEY_5           ((USHORT)::com::sun::star::awt::Key::NUM5)
-#define KEY_6           ((USHORT)::com::sun::star::awt::Key::NUM6)
-#define KEY_7           ((USHORT)::com::sun::star::awt::Key::NUM7)
-#define KEY_8           ((USHORT)::com::sun::star::awt::Key::NUM8)
-#define KEY_9           ((USHORT)::com::sun::star::awt::Key::NUM9)
-
-#define KEY_A           ((USHORT)::com::sun::star::awt::Key::A)
-#define KEY_B           ((USHORT)::com::sun::star::awt::Key::B)
-#define KEY_C           ((USHORT)::com::sun::star::awt::Key::C)
-#define KEY_D           ((USHORT)::com::sun::star::awt::Key::D)
-#define KEY_E           ((USHORT)::com::sun::star::awt::Key::E)
-#define KEY_F           ((USHORT)::com::sun::star::awt::Key::F)
-#define KEY_G           ((USHORT)::com::sun::star::awt::Key::G)
-#define KEY_H           ((USHORT)::com::sun::star::awt::Key::H)
-#define KEY_I           ((USHORT)::com::sun::star::awt::Key::I)
-#define KEY_J           ((USHORT)::com::sun::star::awt::Key::J)
-#define KEY_K           ((USHORT)::com::sun::star::awt::Key::K)
-#define KEY_L           ((USHORT)::com::sun::star::awt::Key::L)
-#define KEY_M           ((USHORT)::com::sun::star::awt::Key::M)
-#define KEY_N           ((USHORT)::com::sun::star::awt::Key::N)
-#define KEY_O           ((USHORT)::com::sun::star::awt::Key::O)
-#define KEY_P           ((USHORT)::com::sun::star::awt::Key::P)
-#define KEY_Q           ((USHORT)::com::sun::star::awt::Key::Q)
-#define KEY_R           ((USHORT)::com::sun::star::awt::Key::R)
-#define KEY_S           ((USHORT)::com::sun::star::awt::Key::S)
-#define KEY_T           ((USHORT)::com::sun::star::awt::Key::T)
-#define KEY_U           ((USHORT)::com::sun::star::awt::Key::U)
-#define KEY_V           ((USHORT)::com::sun::star::awt::Key::V)
-#define KEY_W           ((USHORT)::com::sun::star::awt::Key::W)
-#define KEY_X           ((USHORT)::com::sun::star::awt::Key::X)
-#define KEY_Y           ((USHORT)::com::sun::star::awt::Key::Y)
-#define KEY_Z           ((USHORT)::com::sun::star::awt::Key::Z)
-
-#define KEY_F1          ((USHORT)::com::sun::star::awt::Key::F1)
-#define KEY_F2          ((USHORT)::com::sun::star::awt::Key::F2)
-#define KEY_F3          ((USHORT)::com::sun::star::awt::Key::F3)
-#define KEY_F4          ((USHORT)::com::sun::star::awt::Key::F4)
-#define KEY_F5          ((USHORT)::com::sun::star::awt::Key::F5)
-#define KEY_F6          ((USHORT)::com::sun::star::awt::Key::F6)
-#define KEY_F7          ((USHORT)::com::sun::star::awt::Key::F7)
-#define KEY_F8          ((USHORT)::com::sun::star::awt::Key::F8)
-#define KEY_F9          ((USHORT)::com::sun::star::awt::Key::F9)
-#define KEY_F10         ((USHORT)::com::sun::star::awt::Key::F10)
-#define KEY_F11         ((USHORT)::com::sun::star::awt::Key::F11)
-#define KEY_F12         ((USHORT)::com::sun::star::awt::Key::F12)
-#define KEY_F13         ((USHORT)::com::sun::star::awt::Key::F13)
-#define KEY_F14         ((USHORT)::com::sun::star::awt::Key::F14)
-#define KEY_F15         ((USHORT)::com::sun::star::awt::Key::F15)
-#define KEY_F16         ((USHORT)::com::sun::star::awt::Key::F16)
-#define KEY_F17         ((USHORT)::com::sun::star::awt::Key::F17)
-#define KEY_F18         ((USHORT)::com::sun::star::awt::Key::F18)
-#define KEY_F19         ((USHORT)::com::sun::star::awt::Key::F19)
-#define KEY_F20         ((USHORT)::com::sun::star::awt::Key::F20)
-#define KEY_F21         ((USHORT)::com::sun::star::awt::Key::F21)
-#define KEY_F22         ((USHORT)::com::sun::star::awt::Key::F22)
-#define KEY_F23         ((USHORT)::com::sun::star::awt::Key::F23)
-#define KEY_F24         ((USHORT)::com::sun::star::awt::Key::F24)
-#define KEY_F25         ((USHORT)::com::sun::star::awt::Key::F25)
-#define KEY_F26         ((USHORT)::com::sun::star::awt::Key::F26)
-
-#define KEY_DOWN        ((USHORT)::com::sun::star::awt::Key::DOWN)
-#define KEY_UP          ((USHORT)::com::sun::star::awt::Key::UP)
-#define KEY_LEFT        ((USHORT)::com::sun::star::awt::Key::LEFT)
-#define KEY_RIGHT       ((USHORT)::com::sun::star::awt::Key::RIGHT)
-#define KEY_HOME        ((USHORT)::com::sun::star::awt::Key::HOME)
-#define KEY_END         ((USHORT)::com::sun::star::awt::Key::END)
-#define KEY_PAGEUP      ((USHORT)::com::sun::star::awt::Key::PAGEUP)
-#define KEY_PAGEDOWN    ((USHORT)::com::sun::star::awt::Key::PAGEDOWN)
-
-#define KEY_RETURN      ((USHORT)::com::sun::star::awt::Key::RETURN)
-#define KEY_ESCAPE      ((USHORT)::com::sun::star::awt::Key::ESCAPE)
-#define KEY_TAB         ((USHORT)::com::sun::star::awt::Key::TAB)
-#define KEY_BACKSPACE   ((USHORT)::com::sun::star::awt::Key::BACKSPACE)
-#define KEY_SPACE       ((USHORT)::com::sun::star::awt::Key::SPACE)
-#define KEY_INSERT      ((USHORT)::com::sun::star::awt::Key::INSERT)
-#define KEY_DELETE      ((USHORT)::com::sun::star::awt::Key::DELETE)
-
-#define KEY_ADD         ((USHORT)::com::sun::star::awt::Key::ADD)
-#define KEY_SUBTRACT    ((USHORT)::com::sun::star::awt::Key::SUBTRACT)
-#define KEY_MULTIPLY    ((USHORT)::com::sun::star::awt::Key::MULTIPLY)
-#define KEY_DIVIDE      ((USHORT)::com::sun::star::awt::Key::DIVIDE)
-#define KEY_POINT       ((USHORT)::com::sun::star::awt::Key::POINT)
-#define KEY_COMMA       ((USHORT)::com::sun::star::awt::Key::COMMA)
-#define KEY_LESS        ((USHORT)::com::sun::star::awt::Key::LESS)
-#define KEY_GREATER     ((USHORT)::com::sun::star::awt::Key::GREATER)
-#define KEY_EQUAL       ((USHORT)::com::sun::star::awt::Key::EQUAL)
-
-#define KEY_OPEN        ((USHORT)::com::sun::star::awt::Key::OPEN)
-#define KEY_CUT         ((USHORT)::com::sun::star::awt::Key::CUT)
-#define KEY_COPY        ((USHORT)::com::sun::star::awt::Key::COPY)
-#define KEY_PASTE       ((USHORT)::com::sun::star::awt::Key::PASTE)
-#define KEY_UNDO        ((USHORT)::com::sun::star::awt::Key::UNDO)
-#define KEY_REPEAT      ((USHORT)::com::sun::star::awt::Key::REPEAT)
-#define KEY_FIND        ((USHORT)::com::sun::star::awt::Key::FIND)
-#define KEY_PROPERTIES  ((USHORT)::com::sun::star::awt::Key::PROPERTIES)
-#define KEY_FRONT       ((USHORT)::com::sun::star::awt::Key::FRONT)
+#define KEY_0			((USHORT)::com::sun::star::awt::Key::NUM0)
+#define KEY_1			((USHORT)::com::sun::star::awt::Key::NUM1)
+#define KEY_2			((USHORT)::com::sun::star::awt::Key::NUM2)
+#define KEY_3			((USHORT)::com::sun::star::awt::Key::NUM3)
+#define KEY_4			((USHORT)::com::sun::star::awt::Key::NUM4)
+#define KEY_5			((USHORT)::com::sun::star::awt::Key::NUM5)
+#define KEY_6			((USHORT)::com::sun::star::awt::Key::NUM6)
+#define KEY_7			((USHORT)::com::sun::star::awt::Key::NUM7)
+#define KEY_8			((USHORT)::com::sun::star::awt::Key::NUM8)
+#define KEY_9			((USHORT)::com::sun::star::awt::Key::NUM9)
+
+#define KEY_A			((USHORT)::com::sun::star::awt::Key::A)
+#define KEY_B			((USHORT)::com::sun::star::awt::Key::B)
+#define KEY_C			((USHORT)::com::sun::star::awt::Key::C)
+#define KEY_D			((USHORT)::com::sun::star::awt::Key::D)
+#define KEY_E			((USHORT)::com::sun::star::awt::Key::E)
+#define KEY_F			((USHORT)::com::sun::star::awt::Key::F)
+#define KEY_G			((USHORT)::com::sun::star::awt::Key::G)
+#define KEY_H			((USHORT)::com::sun::star::awt::Key::H)
+#define KEY_I			((USHORT)::com::sun::star::awt::Key::I)
+#define KEY_J			((USHORT)::com::sun::star::awt::Key::J)
+#define KEY_K			((USHORT)::com::sun::star::awt::Key::K)
+#define KEY_L			((USHORT)::com::sun::star::awt::Key::L)
+#define KEY_M			((USHORT)::com::sun::star::awt::Key::M)
+#define KEY_N			((USHORT)::com::sun::star::awt::Key::N)
+#define KEY_O			((USHORT)::com::sun::star::awt::Key::O)
+#define KEY_P			((USHORT)::com::sun::star::awt::Key::P)
+#define KEY_Q			((USHORT)::com::sun::star::awt::Key::Q)
+#define KEY_R			((USHORT)::com::sun::star::awt::Key::R)
+#define KEY_S			((USHORT)::com::sun::star::awt::Key::S)
+#define KEY_T			((USHORT)::com::sun::star::awt::Key::T)
+#define KEY_U			((USHORT)::com::sun::star::awt::Key::U)
+#define KEY_V			((USHORT)::com::sun::star::awt::Key::V)
+#define KEY_W			((USHORT)::com::sun::star::awt::Key::W)
+#define KEY_X			((USHORT)::com::sun::star::awt::Key::X)
+#define KEY_Y			((USHORT)::com::sun::star::awt::Key::Y)
+#define KEY_Z			((USHORT)::com::sun::star::awt::Key::Z)
+
+#define KEY_F1			((USHORT)::com::sun::star::awt::Key::F1)
+#define KEY_F2			((USHORT)::com::sun::star::awt::Key::F2)
+#define KEY_F3			((USHORT)::com::sun::star::awt::Key::F3)
+#define KEY_F4			((USHORT)::com::sun::star::awt::Key::F4)
+#define KEY_F5			((USHORT)::com::sun::star::awt::Key::F5)
+#define KEY_F6			((USHORT)::com::sun::star::awt::Key::F6)
+#define KEY_F7			((USHORT)::com::sun::star::awt::Key::F7)
+#define KEY_F8			((USHORT)::com::sun::star::awt::Key::F8)
+#define KEY_F9			((USHORT)::com::sun::star::awt::Key::F9)
+#define KEY_F10 		((USHORT)::com::sun::star::awt::Key::F10)
+#define KEY_F11 		((USHORT)::com::sun::star::awt::Key::F11)
+#define KEY_F12 		((USHORT)::com::sun::star::awt::Key::F12)
+#define KEY_F13 		((USHORT)::com::sun::star::awt::Key::F13)
+#define KEY_F14 		((USHORT)::com::sun::star::awt::Key::F14)
+#define KEY_F15 		((USHORT)::com::sun::star::awt::Key::F15)
+#define KEY_F16 		((USHORT)::com::sun::star::awt::Key::F16)
+#define KEY_F17 		((USHORT)::com::sun::star::awt::Key::F17)
+#define KEY_F18 		((USHORT)::com::sun::star::awt::Key::F18)
+#define KEY_F19 		((USHORT)::com::sun::star::awt::Key::F19)
+#define KEY_F20 		((USHORT)::com::sun::star::awt::Key::F20)
+#define KEY_F21 		((USHORT)::com::sun::star::awt::Key::F21)
+#define KEY_F22 		((USHORT)::com::sun::star::awt::Key::F22)
+#define KEY_F23 		((USHORT)::com::sun::star::awt::Key::F23)
+#define KEY_F24 		((USHORT)::com::sun::star::awt::Key::F24)
+#define KEY_F25 		((USHORT)::com::sun::star::awt::Key::F25)
+#define KEY_F26 		((USHORT)::com::sun::star::awt::Key::F26)
+
+#define KEY_DOWN		((USHORT)::com::sun::star::awt::Key::DOWN)
+#define KEY_UP			((USHORT)::com::sun::star::awt::Key::UP)
+#define KEY_LEFT		((USHORT)::com::sun::star::awt::Key::LEFT)
+#define KEY_RIGHT		((USHORT)::com::sun::star::awt::Key::RIGHT)
+#define KEY_HOME		((USHORT)::com::sun::star::awt::Key::HOME)
+#define KEY_END 		((USHORT)::com::sun::star::awt::Key::END)
+#define KEY_PAGEUP		((USHORT)::com::sun::star::awt::Key::PAGEUP)
+#define KEY_PAGEDOWN	((USHORT)::com::sun::star::awt::Key::PAGEDOWN)
+
+#define KEY_RETURN		((USHORT)::com::sun::star::awt::Key::RETURN)
+#define KEY_ESCAPE		((USHORT)::com::sun::star::awt::Key::ESCAPE)
+#define KEY_TAB 		((USHORT)::com::sun::star::awt::Key::TAB)
+#define KEY_BACKSPACE	((USHORT)::com::sun::star::awt::Key::BACKSPACE)
+#define KEY_SPACE		((USHORT)::com::sun::star::awt::Key::SPACE)
+#define KEY_INSERT		((USHORT)::com::sun::star::awt::Key::INSERT)
+#define KEY_DELETE		((USHORT)::com::sun::star::awt::Key::DELETE)
+
+#define KEY_ADD 		((USHORT)::com::sun::star::awt::Key::ADD)
+#define KEY_SUBTRACT	((USHORT)::com::sun::star::awt::Key::SUBTRACT)
+#define KEY_MULTIPLY	((USHORT)::com::sun::star::awt::Key::MULTIPLY)
+#define KEY_DIVIDE		((USHORT)::com::sun::star::awt::Key::DIVIDE)
+#define KEY_POINT		((USHORT)::com::sun::star::awt::Key::POINT)
+#define KEY_COMMA		((USHORT)::com::sun::star::awt::Key::COMMA)
+#define KEY_LESS		((USHORT)::com::sun::star::awt::Key::LESS)
+#define KEY_GREATER 	((USHORT)::com::sun::star::awt::Key::GREATER)
+#define KEY_EQUAL		((USHORT)::com::sun::star::awt::Key::EQUAL)
+
+#define KEY_OPEN		((USHORT)::com::sun::star::awt::Key::OPEN)
+#define KEY_CUT 		((USHORT)::com::sun::star::awt::Key::CUT)
+#define KEY_COPY		((USHORT)::com::sun::star::awt::Key::COPY)
+#define KEY_PASTE		((USHORT)::com::sun::star::awt::Key::PASTE)
+#define KEY_UNDO		((USHORT)::com::sun::star::awt::Key::UNDO)
+#define KEY_REPEAT		((USHORT)::com::sun::star::awt::Key::REPEAT)
+#define KEY_FIND		((USHORT)::com::sun::star::awt::Key::FIND)
+#define KEY_PROPERTIES	((USHORT)::com::sun::star::awt::Key::PROPERTIES)
+#define KEY_FRONT		((USHORT)::com::sun::star::awt::Key::FRONT)
 #define KEY_CONTEXTMENU ((USHORT)::com::sun::star::awt::Key::CONTEXTMENU)
-#define KEY_MENU        ((USHORT)::com::sun::star::awt::Key::MENU)
-#define KEY_HELP        ((USHORT)::com::sun::star::awt::Key::HELP)
+#define KEY_MENU		((USHORT)::com::sun::star::awt::Key::MENU)
+#define KEY_HELP		((USHORT)::com::sun::star::awt::Key::HELP)
 #define KEY_HANGUL_HANJA ((USHORT)::com::sun::star::awt::Key::HANGUL_HANJA)
 #define KEY_DECIMAL     ((USHORT)::com::sun::star::awt::Key::DECIMAL)
 #define KEY_TILDE       ((USHORT)::com::sun::star::awt::Key::TILDE)
 #define KEY_QUOTELEFT   ((USHORT)::com::sun::star::awt::Key::QUOTELEFT)
 
-#define KEY_CODE        ((USHORT)0x0FFF)
+#define KEY_CODE		((USHORT)0x0FFF)
 
 // Modifier-Tasten
-#define KEY_SHIFT       ((USHORT)0x1000)
-#define KEY_MOD1        ((USHORT)0x2000)
-#define KEY_MOD2        ((USHORT)0x4000)
-#define KEY_MOD3    ((USHORT)0x8000)
-#define KEY_MODTYPE ((USHORT)0xF000)
-#define KEY_ALLMODTYPE  ((USHORT)0xF000)
+#define KEY_SHIFT		((USHORT)0x1000)
+#define KEY_MOD1		((USHORT)0x2000)
+#define KEY_MOD2		((USHORT)0x4000)
+#define KEY_MOD3	((USHORT)0x8000)
+#define KEY_MODTYPE	((USHORT)0xF000)
+#define KEY_ALLMODTYPE	((USHORT)0xF000)
 
 // extended Modifier-Keys (only used for modkey events)
 #define MODKEY_LSHIFT    0x0001
@@ -184,8 +184,8 @@
 // - Mouse-Types -
 // ---------------
 
-#define MOUSE_LEFT      ((USHORT)0x0001)
-#define MOUSE_MIDDLE    ((USHORT)0x0002)
-#define MOUSE_RIGHT     ((USHORT)0x0004)
+#define MOUSE_LEFT		((USHORT)0x0001)
+#define MOUSE_MIDDLE	((USHORT)0x0002)
+#define MOUSE_RIGHT 	((USHORT)0x0004)
 
 #endif // _SV_KEYCODES_HXX
diff --git a/vcl/inc/vcl/lazydelete.hxx b/vcl/inc/vcl/lazydelete.hxx
index 4176d5b4454f..d53e408051d6 100644
--- a/vcl/inc/vcl/lazydelete.hxx
+++ b/vcl/inc/vcl/lazydelete.hxx
@@ -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
@@ -42,23 +42,23 @@
 namespace vcl
 {
     /* Helpers for lazy object deletion
-
+    
     With vcl it is often necessary to delete objects (especially Windows)
     in the right order as well as in a way ensuring that the deleted objects
     are not still on the stack (e.g. deleting a Window in its key handler). To
     make this easier a helper class is given here which takes care of both
     sorting as well as lazy deletion.
-
+    
     The grisly details:
     LazyDelete is a class that LazyDeletor register to. When vcl's event
     loop (that is Application::Yield or Application::Reschedule) comes out
     of the last level, the LazyDelete::flush is called. This will cause
     LazyDelete to delete all registered LazyDeletor objects.
-
+    
     LazyDeletor<T> is a one instance object that contains a list of
     <T> objects to be deleted in sorted order. It is derived from
     LazyDeletorBase as to be able to register itself in LazyDelete.
-
+    
     The user calls the static method LazyDeletor<T>::Delete( T* ) with the
     object to be destroyed lazy. The static method creates the LazyDeletor<T>
     (which in turn registers itself in LazyDelete) if this is the first time
@@ -67,19 +67,19 @@ namespace vcl
     that will ensure the correct order of deletion via the specialized is_less method
     (e.g. if a Window is a child of another Window and therefore should be destroyed
     first it is "less" in this sense)
-
+    
     LazyDelete::flush will be called when the top of the nested event loop is
     reached again and will then destroy each registered LazyDeletor<T> which
     in turn destroys the objects needed to be destroyed lazily. After this
     the state is as before entering the event loop.
-
+    
     Preconditions:
     - The class <T> of which objects are to be destroyed needs a virtual
     destructor or must be final, else the wrong type will be destroyed.
     - The destructor of <T> should call LazyDeletor<T>::Undelete( this ). This
     prevents duplicate deletionin case someone destroys the object prematurely.
     */
-
+    
     class LazyDeletorBase;
     class VCL_DLLPUBLIC LazyDelete
     {
@@ -104,27 +104,27 @@ namespace vcl
     class VCL_DLLPUBLIC LazyDeletor : public LazyDeletorBase
     {
         static LazyDeletor< T >*     s_pOneInstance;
-
+        
         struct DeleteObjectEntry
         {
             T*      m_pObject;
             bool    m_bDeleted;
-
+            
             DeleteObjectEntry() :
                 m_pObject( NULL ),
                 m_bDeleted( false )
             {}
-
+            
             DeleteObjectEntry( T* i_pObject ) :
                 m_pObject( i_pObject ),
                 m_bDeleted( false )
             {}
         };
-
+        
         std::vector< DeleteObjectEntry >    m_aObjects;
         typedef std::hash_map< sal_IntPtr, unsigned int > PtrToIndexMap;
         PtrToIndexMap                       m_aPtrToIndex;
-
+        
         /** strict weak ordering funtion to bring objects to be destroyed lazily
         in correct order, e.g. for Window objects children before parents
         */
@@ -139,7 +139,7 @@ namespace vcl
             #endif
             if( s_pOneInstance == this ) // sanity check
                 s_pOneInstance = NULL;
-
+            
             // do the actual work
             unsigned int nCount = m_aObjects.size();
             std::vector<T*> aRealDelete;
@@ -168,7 +168,7 @@ namespace vcl
                     delete aRealDelete[n];
             }
         }
-
+                
         public:
         /** mark an object for lazy deletion
         */
@@ -202,7 +202,7 @@ namespace vcl
             }
         }
     };
-
+    
     /*
     class DeleteOnDeinit matches a similar need as LazyDelete for static objects:
     you may not access vcl objects after DeInitVCL has been called this includes their destruction
@@ -210,36 +210,36 @@ namespace vcl
     To work around this use DeleteOnDeinit<BitmapEx> which will allow you to have a static object container,
     that will have its contents destroyed on DeinitVCL. The single drawback is that you need to check on the
     container object whether it still contains content before actually accessing it.
-
+    
     caveat: when constructing a vcl object, you certainly want to ensure that InitVCL has run already.
     However this is not necessarily the case when using a class static member or a file level static variable.
     In these cases make judicious use of the set() method of DeleteOnDeinit, but beware of the changing
     ownership.
-
+    
     example use case: use a lazy initialized on call BitmapEx in a paint method. Of course a paint method
     would not normally be called after DeInitVCL anyway, so the check might not be necessary in a
     Window::Paint implementation, but always checking is a good idea.
-
+    
     SomeWindow::Paint()
     {
         static vcl::DeleteOnDeinit< BitmapEx > aBmp( new BitmapEx( ResId( 1000, myResMgr ) ) );
-
+     
         if( aBmp.get() ) // check whether DeInitVCL has been called already
             DrawBitmapEx( Point( 10, 10 ), *aBmp.get() );
     }
     */
-
+    
     class VCL_DLLPUBLIC DeleteOnDeinitBase
     {
     public:
         static void SAL_DLLPRIVATE ImplDeleteOnDeInit();
         virtual ~DeleteOnDeinitBase();
     protected:
-        static void addDeinitContainer( DeleteOnDeinitBase* i_pContainer );
+        static void addDeinitContainer( DeleteOnDeinitBase* i_pContainer );        
 
         virtual void doCleanup() = 0;
     };
-
+    
     template < typename T >
     class DeleteOnDeinit : public DeleteOnDeinitBase
     {
@@ -248,10 +248,10 @@ namespace vcl
     public:
         DeleteOnDeinit( T* i_pT ) : m_pT( i_pT ) { addDeinitContainer( this ); }
         virtual ~DeleteOnDeinit() {}
-
+        
         // get contents
         T* get() { return m_pT; }
-
+        
         // set contents, returning old contents
         // ownership is transfered !
         T* set( T* i_pNew ) { T* pOld = m_pT; m_pT = i_pNew; return pOld; }
diff --git a/vcl/inc/vcl/lineinfo.hxx b/vcl/inc/vcl/lineinfo.hxx
index 9b12966a52ff..938a7feb015d 100644
--- a/vcl/inc/vcl/lineinfo.hxx
+++ b/vcl/inc/vcl/lineinfo.hxx
@@ -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
@@ -42,22 +42,22 @@ namespace basegfx { class B2DPolyPolygon; }
 
 struct ImplLineInfo
 {
-    ULONG                   mnRefCount;
-    LineStyle               meStyle;
-    long                    mnWidth;
-    USHORT                  mnDashCount;
-    long                    mnDashLen;
-    USHORT                  mnDotCount;
-    long                    mnDotLen;
-    long                    mnDistance;
-
+    ULONG				    mnRefCount;
+    LineStyle			    meStyle;
+    long				    mnWidth;
+    USHORT				    mnDashCount;
+    long				    mnDashLen;
+    USHORT				    mnDotCount;
+    long				    mnDotLen;
+    long				    mnDistance;
+    
     basegfx::B2DLineJoin    meLineJoin;
 
                         ImplLineInfo();
                         ImplLineInfo( const ImplLineInfo& rImplLineInfo );
 
-    friend SvStream&    operator>>( SvStream& rIStm, ImplLineInfo& rImplLineInfo );
-    friend SvStream&    operator<<( SvStream& rOStm, const ImplLineInfo& rImplLineInfo );
+    friend SvStream&	operator>>( SvStream& rIStm, ImplLineInfo& rImplLineInfo );
+    friend SvStream&	operator<<( SvStream& rOStm, const ImplLineInfo& rImplLineInfo );
 };
 
 // ------------
@@ -66,12 +66,12 @@ struct ImplLineInfo
 
 class VCL_DLLPUBLIC LineInfo
 {
-private:
+private:	
 
-    ImplLineInfo*   mpImplLineInfo;
-    long            n1;
-    long            n2;
-    long            n3;
+    ImplLineInfo*	mpImplLineInfo;
+    long			n1;
+    long			n2;
+    long			n3;
 
     SAL_DLLPRIVATE void ImplMakeUnique();
 
@@ -81,36 +81,36 @@ public:
                     LineInfo( const LineInfo& rLineInfo );
                     ~LineInfo();
 
-    LineInfo&       operator=( const LineInfo& rLineInfo );
+    LineInfo&		operator=( const LineInfo& rLineInfo );
     BOOL            operator==( const LineInfo& rLineInfo ) const;
     BOOL            operator!=( const LineInfo& rLineInfo ) const { return !(LineInfo::operator==( rLineInfo ) ); }
     BOOL            IsSameInstance( const LineInfo& rLineInfo ) const { return( mpImplLineInfo == rLineInfo.mpImplLineInfo ); }
 
     void            SetStyle( LineStyle eStyle );
-    LineStyle       GetStyle() const { return mpImplLineInfo->meStyle; }
+    LineStyle		GetStyle() const { return mpImplLineInfo->meStyle; }
 
     void            SetWidth( long nWidth );
-    long            GetWidth() const { return mpImplLineInfo->mnWidth; }
+    long			GetWidth() const { return mpImplLineInfo->mnWidth; }
 
-    void            SetDashCount( USHORT nDashCount );
-    USHORT          GetDashCount() const { return mpImplLineInfo->mnDashCount; }
+    void			SetDashCount( USHORT nDashCount );
+    USHORT			GetDashCount() const { return mpImplLineInfo->mnDashCount; }
 
-    void            SetDashLen( long nDashLen );
-    long            GetDashLen() const { return mpImplLineInfo->mnDashLen; }
+    void			SetDashLen( long nDashLen );
+    long			GetDashLen() const { return mpImplLineInfo->mnDashLen; }
 
-    void            SetDotCount( USHORT nDotCount );
-    USHORT          GetDotCount() const { return mpImplLineInfo->mnDotCount; }
+    void			SetDotCount( USHORT nDotCount );
+    USHORT			GetDotCount() const { return mpImplLineInfo->mnDotCount; }
 
-    void            SetDotLen( long nDotLen );
-    long            GetDotLen() const { return mpImplLineInfo->mnDotLen; }
+    void			SetDotLen( long nDotLen );
+    long			GetDotLen() const { return mpImplLineInfo->mnDotLen; }
 
-    void            SetDistance( long nDistance );
-    long            GetDistance() const { return mpImplLineInfo->mnDistance; }
+    void			SetDistance( long nDistance );
+    long			GetDistance() const { return mpImplLineInfo->mnDistance; }
 
     void SetLineJoin(basegfx::B2DLineJoin eLineJoin);
     basegfx::B2DLineJoin GetLineJoin() const { return mpImplLineInfo->meLineJoin; }
 
-    BOOL            IsDefault() const { return( !mpImplLineInfo->mnWidth && ( LINE_SOLID == mpImplLineInfo->meStyle ) ); }
+    BOOL			IsDefault() const { return( !mpImplLineInfo->mnWidth && ( LINE_SOLID == mpImplLineInfo->meStyle ) ); }
 
     friend VCL_DLLPUBLIC SvStream& operator>>( SvStream& rIStm, LineInfo& rLineInfo );
     friend VCL_DLLPUBLIC SvStream& operator<<( SvStream& rOStm, const LineInfo& rLineInfo );
diff --git a/vcl/inc/vcl/longcurr.hxx b/vcl/inc/vcl/longcurr.hxx
index 39bd75439ad9..ef234fe80a8c 100644
--- a/vcl/inc/vcl/longcurr.hxx
+++ b/vcl/inc/vcl/longcurr.hxx
@@ -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
@@ -47,24 +47,24 @@ private:
     SAL_DLLPRIVATE void        ImpInit();
 
 protected:
-    BigInt                  mnFieldValue;
-    BigInt                  mnLastValue;
-    BigInt                  mnMin;
-    BigInt                  mnMax;
-    BigInt                  mnCorrectedValue;
+    BigInt					mnFieldValue;
+    BigInt					mnLastValue;
+    BigInt					mnMin;
+    BigInt					mnMax;
+    BigInt					mnCorrectedValue;
     String                  maCurrencySymbol;
-    USHORT                  mnType;
+    USHORT					mnType;
     USHORT                  mnDecimalDigits;
     BOOL                    mbThousandSep;
 
                             LongCurrencyFormatter();
-    SAL_DLLPRIVATE void     ImplLoadRes( const ResId& rResId );
+    SAL_DLLPRIVATE void		ImplLoadRes( const ResId& rResId );
 
 public:
                             ~LongCurrencyFormatter();
 
-    virtual void            Reformat();
-    virtual void            ReformatAll();
+    virtual void			Reformat();
+    virtual void			ReformatAll();
 
     void                    SetUseThousandSep( BOOL b );
     BOOL                    IsUseThousandSep() const { return mbThousandSep; }
@@ -72,25 +72,25 @@ public:
     void                    SetCurrencySymbol( const String& rStr );
     String                  GetCurrencySymbol() const;
 
-    void                    SetMin( BigInt nNewMin );
-    BigInt                  GetMin() const { return mnMin; }
-    void                    SetMax( BigInt nNewMax );
-    BigInt                  GetMax() const { return mnMax; }
+    void					SetMin( BigInt nNewMin );
+    BigInt					GetMin() const { return mnMin; }
+    void					SetMax( BigInt nNewMax );
+    BigInt					GetMax() const { return mnMax; }
 
-    void                    SetDecimalDigits( USHORT nDigits );
-    USHORT                  GetDecimalDigits() const;
-    void                    SetValue( BigInt nNewValue );
-    void                    SetUserValue( BigInt nNewValue );
-    BigInt                  GetValue() const;
-    BOOL                    IsValueModified() const;
+    void					SetDecimalDigits( USHORT nDigits );
+    USHORT					GetDecimalDigits() const;
+    void					SetValue( BigInt nNewValue );
+    void					SetUserValue( BigInt nNewValue );
+    BigInt					GetValue() const;
+    BOOL					IsValueModified() const;
 
-    void                    SetEmptyValue();
-    BOOL                    IsEmptyValue() const { return !GetField()->GetText().Len(); }
+    void					SetEmptyValue();
+    BOOL					IsEmptyValue() const { return !GetField()->GetText().Len(); }
 
-    BigInt                  GetCorrectedValue() const { return mnCorrectedValue; }
+    BigInt					GetCorrectedValue() const { return mnCorrectedValue; }
 
-    BigInt                  Normalize( BigInt nValue ) const;
-    BigInt                  Denormalize( BigInt nValue ) const;
+    BigInt					Normalize( BigInt nValue ) const;
+    BigInt					Denormalize( BigInt nValue ) const;
 };
 
 // ---------------------
@@ -104,9 +104,9 @@ class VCL_DLLPUBLIC LongCurrencyField : public SpinField, public LongCurrencyFor
 //#endif
 
 private:
-    BigInt          mnSpinSize;
-    BigInt          mnFirst;
-    BigInt          mnLast;
+    BigInt			mnSpinSize;
+    BigInt			mnFirst;
+    BigInt			mnLast;
 
 protected:
     SAL_DLLPRIVATE void ImplLoadRes( const ResId& rResId );
@@ -116,21 +116,21 @@ public:
                     LongCurrencyField( Window* pParent, const ResId& rResId );
                     ~LongCurrencyField();
 
-    long            PreNotify( NotifyEvent& rNEvt );
-    long            Notify( NotifyEvent& rNEvt );
-
-    void            Modify();
-    void            Up();
-    void            Down();
-    void            First();
-    void            Last();
-
-    void            SetFirst( BigInt nNewFirst ) { mnFirst = nNewFirst; }
-    BigInt          GetFirst() const { return mnFirst; }
-    void            SetLast( BigInt nNewLast ) { mnLast = nNewLast; }
-    BigInt          GetLast() const { return mnLast; }
-    void            SetSpinSize( BigInt nNewSize ) { mnSpinSize = nNewSize; }
-    BigInt          GetSpinSize() const { return mnSpinSize; }
+    long			PreNotify( NotifyEvent& rNEvt );
+    long			Notify( NotifyEvent& rNEvt );
+
+    void			Modify();
+    void			Up();
+    void			Down();
+    void			First();
+    void			Last();
+
+    void			SetFirst( BigInt nNewFirst ) { mnFirst = nNewFirst; }
+    BigInt			GetFirst() const { return mnFirst; }
+    void			SetLast( BigInt nNewLast ) { mnLast = nNewLast; }
+    BigInt			GetLast() const { return mnLast; }
+    void			SetSpinSize( BigInt nNewSize ) { mnSpinSize = nNewSize; }
+    BigInt			GetSpinSize() const { return mnSpinSize; }
 };
 
 // -------------------
@@ -144,19 +144,19 @@ public:
                     LongCurrencyBox( Window* pParent, const ResId& rResId );
                     ~LongCurrencyBox();
 
-    long            PreNotify( NotifyEvent& rNEvt );
-    long            Notify( NotifyEvent& rNEvt );
+    long			PreNotify( NotifyEvent& rNEvt );
+    long			Notify( NotifyEvent& rNEvt );
 
-    void            Modify();
-    void            ReformatAll();
+    void			Modify();
+    void			ReformatAll();
 
-    void            InsertValue( BigInt nValue,
+    void			InsertValue( BigInt nValue,
                                  USHORT nPos = COMBOBOX_APPEND );
-    void            RemoveValue( BigInt nValue );
-    BigInt          GetValue() const
+    void			RemoveValue( BigInt nValue );
+    BigInt			GetValue() const
                         { return LongCurrencyFormatter::GetValue(); }
-    BigInt          GetValue( USHORT nPos ) const;
-    USHORT          GetValuePos( BigInt nValue ) const;
+    BigInt			GetValue( USHORT nPos ) const;
+    USHORT			GetValuePos( BigInt nValue ) const;
 };
 
 #endif // _LONGCURR_HXX
diff --git a/vcl/inc/vcl/lstbox.h b/vcl/inc/vcl/lstbox.h
index db800229b2d2..5d85abac2a7a 100644
--- a/vcl/inc/vcl/lstbox.h
+++ b/vcl/inc/vcl/lstbox.h
@@ -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
@@ -28,11 +28,11 @@
 #ifndef _SV_LSTBOX_H
 #define _SV_LSTBOX_H
 
-#define LISTBOX_APPEND              ((USHORT)0xFFFF)
-#define LISTBOX_ENTRY_NOTFOUND      ((USHORT)0xFFFF)
-#define LISTBOX_ERROR               ((USHORT)0xFFFF)
+#define LISTBOX_APPEND			  	((USHORT)0xFFFF)
+#define LISTBOX_ENTRY_NOTFOUND	  	((USHORT)0xFFFF)
+#define LISTBOX_ERROR			  	((USHORT)0xFFFF)
 
-#define LISTBOX_USERDRAW_SELECTED   ((USHORT)0x0001)
+#define LISTBOX_USERDRAW_SELECTED	((USHORT)0x0001)
 
 // --------------------------------------------------------------------
 
@@ -41,14 +41,14 @@
 
 // !! Do not use these flags for user data as they are reserved      !!
 // !! to change the internal behaviour of the ListBox implementation !!
-// !! for specific entries.                                          !!
+// !! for specific entries.											 !!
 
 /** this flag disables a selection of an entry completly. It is not
     possible to select such entries either from the user interface
     nor from the ListBox methods. Cursor traveling is handled correctly.
     This flag can be used to add titles to a ListBox.
 */
-#define LISTBOX_ENTRY_FLAG_DISABLE_SELECTION        0x0000001
+#define LISTBOX_ENTRY_FLAG_DISABLE_SELECTION		0x0000001
 
 /** this flag can be used to make an entry multine capable
     A normal entry is single line and will therefore be clipped
@@ -62,4 +62,4 @@
 */
 #define LISTBOX_ENTRY_FLAG_DRAW_DISABLED            0x0000004
 
-#endif  // _SV_LSTBOX_H
+#endif	// _SV_LSTBOX_H
diff --git a/vcl/inc/vcl/lstbox.hxx b/vcl/inc/vcl/lstbox.hxx
index 3659e5aee485..b5f9a4d580d1 100644
--- a/vcl/inc/vcl/lstbox.hxx
+++ b/vcl/inc/vcl/lstbox.hxx
@@ -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
@@ -39,21 +39,21 @@ class ImplBtn;
 class ImplWin;
 
 // --------------------------------------------------------------------
-//  - ListBox -
+//	- ListBox -
 // --------------------------------------------------------------------
 
 class VCL_DLLPUBLIC ListBox : public Control
 {
 private:
-    ImplListBox*                mpImplLB;
-    ImplListBoxFloatingWindow*  mpFloatWin;
-    ImplWin*                    mpImplWin;
-    ImplBtn*                    mpBtn;
-    USHORT                      mnDDHeight;
-    USHORT                      mnSaveValue;
-    BOOL                        mbDDAutoSize;
-    Link                        maSelectHdl;
-    Link                        maDoubleClickHdl;
+    ImplListBox*				mpImplLB;
+    ImplListBoxFloatingWindow*	mpFloatWin;
+    ImplWin*					mpImplWin;
+    ImplBtn*					mpBtn;
+    USHORT						mnDDHeight;
+    USHORT						mnSaveValue;
+    BOOL						mbDDAutoSize;
+    Link						maSelectHdl;
+    Link						maDoubleClickHdl;
     USHORT mnLineCount;
 
 //#if 0 // _SOLAR__PRIVATE
@@ -75,7 +75,7 @@ protected:
     SAL_DLLPRIVATE WinBits ImplInitStyle( WinBits nStyle );
     SAL_DLLPRIVATE void    ImplLoadRes( const ResId& rResId );
 //#endif
-    BOOL                IsDropDownBox() const { return mpFloatWin ? TRUE : FALSE; }
+    BOOL			    IsDropDownBox() const { return mpFloatWin ? TRUE : FALSE; }
 
 protected:
                         ListBox( WindowType nType );
@@ -87,66 +87,66 @@ public:
                         ListBox( Window* pParent, const ResId& rResId );
                         ~ListBox();
 
-    virtual void        Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, ULONG nFlags );
-    virtual void        Resize();
-    virtual long        PreNotify( NotifyEvent& rNEvt );
-    virtual void        StateChanged( StateChangedType nType );
-    virtual void        DataChanged( const DataChangedEvent& rDCEvt );
-    virtual void        UserDraw( const UserDrawEvent& rUDEvt );
-
-    virtual void        Select();
-    virtual void        DoubleClick();
-    virtual void        GetFocus();
-    virtual void        LoseFocus();
+    virtual void	    Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, ULONG nFlags );
+    virtual void	    Resize();
+    virtual long	    PreNotify( NotifyEvent& rNEvt );
+    virtual void	    StateChanged( StateChangedType nType );
+    virtual void	    DataChanged( const DataChangedEvent& rDCEvt );
+    virtual void	    UserDraw( const UserDrawEvent& rUDEvt );
+
+    virtual void    	Select();
+    virtual void	    DoubleClick();
+    virtual void	    GetFocus();
+    virtual void	    LoseFocus();
     virtual Window*     GetPreferredKeyInputWindow();
 
     virtual const Wallpaper& GetDisplayBackground() const;
 
-    virtual void        SetPosSizePixel( long nX, long nY,
+    virtual void	    SetPosSizePixel( long nX, long nY,
                                          long nWidth, long nHeight, USHORT nFlags = WINDOW_POSSIZE_ALL );
-    void                SetPosSizePixel( const Point& rNewPos, const Size& rNewSize )
+    void			    SetPosSizePixel( const Point& rNewPos, const Size& rNewSize )
                         { Control::SetPosSizePixel( rNewPos, rNewSize ); }
-    void                SetDropDownSizePixel( const Size& rNewSize )
+    void			    SetDropDownSizePixel( const Size& rNewSize )
     { if( IsDropDownBox() ) SetPosSizePixel( 0, 0, rNewSize.Width(), rNewSize.Height(), WINDOW_POSSIZE_SIZE | WINDOW_POSSIZE_DROPDOWN ); }
 
-    Rectangle           GetDropDownPosSizePixel() const;
+    Rectangle		    GetDropDownPosSizePixel() const;
 
-    void                SetDropDownLineCount( USHORT nLines );
-    USHORT              GetDropDownLineCount() const;
+    void			    SetDropDownLineCount( USHORT nLines );
+    USHORT			    GetDropDownLineCount() const;
 
-    void                EnableAutoSize( BOOL bAuto );
-    BOOL                IsAutoSizeEnabled() const { return mbDDAutoSize; }
+    void			    EnableAutoSize( BOOL bAuto );
+    BOOL			    IsAutoSizeEnabled() const { return mbDDAutoSize; }
 
     void                EnableDDAutoWidth( BOOL b );
     BOOL                IsDDAutoWidthEnabled() const;
 
-    virtual USHORT      InsertEntry( const XubString& rStr, USHORT nPos = LISTBOX_APPEND );
-    virtual USHORT      InsertEntry( const Image& rImage, USHORT nPos = LISTBOX_APPEND );
-    virtual USHORT      InsertEntry( const XubString& rStr, const Image& rImage, USHORT nPos = LISTBOX_APPEND );
-    virtual void        RemoveEntry( const XubString& rStr );
-    virtual void        RemoveEntry( USHORT nPos );
+    virtual USHORT	    InsertEntry( const XubString& rStr, USHORT nPos = LISTBOX_APPEND );
+    virtual USHORT	    InsertEntry( const Image& rImage, USHORT nPos = LISTBOX_APPEND );
+    virtual USHORT	    InsertEntry( const XubString& rStr, const Image& rImage, USHORT nPos = LISTBOX_APPEND );
+    virtual void	    RemoveEntry( const XubString& rStr );
+    virtual void	    RemoveEntry( USHORT nPos );
 
-    virtual void        Clear();
+    virtual void	    Clear();
 
-    virtual USHORT      GetEntryPos( const XubString& rStr ) const;
-    virtual USHORT      GetEntryPos( const void* pData ) const;
+    virtual USHORT	    GetEntryPos( const XubString& rStr ) const;
+    virtual USHORT	    GetEntryPos( const void* pData ) const;
             Image       GetEntryImage( USHORT nPos ) const;
     virtual XubString   GetEntry( USHORT nPos ) const;
-    virtual USHORT      GetEntryCount() const;
+    virtual USHORT	    GetEntryCount() const;
 
-    virtual void        SelectEntry( const XubString& rStr, BOOL bSelect = TRUE );
-    virtual void        SelectEntryPos( USHORT nPos, BOOL bSelect = TRUE );
+    virtual void	    SelectEntry( const XubString& rStr, BOOL bSelect = TRUE );
+    virtual void	    SelectEntryPos( USHORT nPos, BOOL bSelect = TRUE );
 
-    virtual USHORT      GetSelectEntryCount() const;
-    virtual XubString   GetSelectEntry( USHORT nSelIndex = 0 ) const;
-    virtual USHORT      GetSelectEntryPos( USHORT nSelIndex = 0 ) const;
+    virtual USHORT	    GetSelectEntryCount() const;
+    virtual XubString	GetSelectEntry( USHORT nSelIndex = 0 ) const;
+    virtual USHORT		GetSelectEntryPos( USHORT nSelIndex = 0 ) const;
 
-    virtual BOOL        IsEntrySelected( const XubString& rStr ) const;
-    virtual BOOL        IsEntryPosSelected( USHORT nPos ) const;
-    virtual void        SetNoSelection();
+    virtual BOOL		IsEntrySelected( const XubString& rStr ) const;
+    virtual BOOL		IsEntryPosSelected( USHORT nPos ) const;
+    virtual void		SetNoSelection();
 
-    void                SetEntryData( USHORT nPos, void* pNewData );
-    void*               GetEntryData( USHORT nPos ) const;
+    void		        SetEntryData( USHORT nPos, void* pNewData );
+    void*		        GetEntryData( USHORT nPos ) const;
 
     /** this methods stores a combination of flags from the
         LISTBOX_ENTRY_FLAG_* defines at the given entry.
@@ -156,71 +156,71 @@ public:
         to change the internal behaviour of the ListBox implementation
         for specific entries.
     */
-    void            SetEntryFlags( USHORT nPos, long nFlags );
+    void			SetEntryFlags( USHORT nPos, long nFlags );
 
     /** this methods gets the current combination of flags from the
         LISTBOX_ENTRY_FLAG_* defines from the given entry.
         See description of the possible LISTBOX_ENTRY_FLAG_* flags
         for details.
     */
-    long            GetEntryFlags( USHORT nPos ) const;
+    long			GetEntryFlags( USHORT nPos ) const;
 
-    void            SetTopEntry( USHORT nPos );
+    void			SetTopEntry( USHORT nPos );
     void            ShowProminentEntry( USHORT nPos );
-    void            SetTopEntryStr( const XubString& rStr );
-    USHORT          GetTopEntry() const;
+    void			SetTopEntryStr( const XubString& rStr );
+    USHORT			GetTopEntry() const;
 
     void            SetProminentEntryType( ProminentEntry eType );
     ProminentEntry  GetProminentEntryType() const;
 
-    void            SaveValue() { mnSaveValue = GetSelectEntryPos(); }
-    USHORT          GetSavedValue() const { return mnSaveValue; }
+    void			SaveValue() { mnSaveValue = GetSelectEntryPos(); }
+    USHORT			GetSavedValue() const { return mnSaveValue; }
 
-    void            SetSeparatorPos( USHORT n );
-    void            SetSeparatorPos();
-    USHORT          GetSeparatorPos() const;
+    void			SetSeparatorPos( USHORT n );
+    void			SetSeparatorPos();
+    USHORT			GetSeparatorPos() const;
 
-    BOOL            IsTravelSelect() const;
-    BOOL            IsInDropDown() const;
-    void            ToggleDropDown();
+    BOOL			IsTravelSelect() const;
+    BOOL			IsInDropDown() const;
+    void			ToggleDropDown();
 
-    void            EnableMultiSelection( BOOL bMulti, BOOL bStackSelection );
-    void            EnableMultiSelection( BOOL bMulti );
-    BOOL            IsMultiSelectionEnabled() const;
+    void			EnableMultiSelection( BOOL bMulti, BOOL bStackSelection );
+    void			EnableMultiSelection( BOOL bMulti );
+    BOOL			IsMultiSelectionEnabled() const;
 
-    void            SetReadOnly( BOOL bReadOnly = TRUE );
-    BOOL            IsReadOnly() const;
+    void			SetReadOnly( BOOL bReadOnly = TRUE );
+    BOOL			IsReadOnly() const;
 
-    long            CalcWindowSizePixel( USHORT nLines ) const;
+    long			CalcWindowSizePixel( USHORT nLines ) const;
     Rectangle       GetBoundingRectangle( USHORT nItem ) const;
 
-    void            SetUserItemSize( const Size& rSz );
-    const Size&     GetUserItemSize() const;
+    void			SetUserItemSize( const Size& rSz );
+    const Size& 	GetUserItemSize() const;
 
-    void            EnableUserDraw( BOOL bUserDraw );
-    BOOL            IsUserDrawEnabled() const;
+    void			EnableUserDraw( BOOL bUserDraw );
+    BOOL			IsUserDrawEnabled() const;
 
-    void            DrawEntry( const UserDrawEvent& rEvt, BOOL bDrawImage, BOOL bDrawText, BOOL bDrawTextAtImagePos = FALSE );
+    void			DrawEntry( const UserDrawEvent& rEvt, BOOL bDrawImage, BOOL bDrawText, BOOL bDrawTextAtImagePos = FALSE );
 
-    void            SetSelectHdl( const Link& rLink )       { maSelectHdl = rLink; }
-    const Link&     GetSelectHdl() const                    { return maSelectHdl; }
-    void            SetDoubleClickHdl( const Link& rLink )  { maDoubleClickHdl = rLink; }
-    const Link&     GetDoubleClickHdl() const               { return maDoubleClickHdl; }
+    void			SetSelectHdl( const Link& rLink )		{ maSelectHdl = rLink; }
+    const Link& 	GetSelectHdl() const					{ return maSelectHdl; }
+    void			SetDoubleClickHdl( const Link& rLink )	{ maDoubleClickHdl = rLink; }
+    const Link& 	GetDoubleClickHdl() const				{ return maDoubleClickHdl; }
 
-    Size            CalcMinimumSize() const;
+    Size			CalcMinimumSize() const;
     virtual Size    GetOptimalSize(WindowSizeType eType) const;
-    Size            CalcAdjustedSize( const Size& rPrefSize ) const;
-    Size            CalcSize( USHORT nColumns, USHORT nLines ) const;
-    void            GetMaxVisColumnsAndLines( USHORT& rnCols, USHORT& rnLines ) const;
+    Size			CalcAdjustedSize( const Size& rPrefSize ) const;
+    Size			CalcSize( USHORT nColumns, USHORT nLines ) const;
+    void			GetMaxVisColumnsAndLines( USHORT& rnCols, USHORT& rnLines ) const;
 
-    void            SetMRUEntries( const XubString& rEntries, xub_Unicode cSep = ';' );
-    XubString       GetMRUEntries( xub_Unicode cSep = ';' ) const;
-    void            SetMaxMRUCount( USHORT n );
-    USHORT          GetMaxMRUCount() const;
+    void			SetMRUEntries( const XubString& rEntries, xub_Unicode cSep = ';' );
+    XubString		GetMRUEntries( xub_Unicode cSep = ';' ) const;
+    void			SetMaxMRUCount( USHORT n );
+    USHORT			GetMaxMRUCount() const;
 
-    USHORT          GetDisplayLineCount() const;
+    USHORT			GetDisplayLineCount() const;
 
-    void            EnableMirroring();
+    void			EnableMirroring();
 
     /** checks whether a certain point lies within the bounds of
         a listbox item and returns the item as well as the character position
@@ -255,12 +255,12 @@ public:
     using ListBox::GetSavedValue;
 private:
     // Bei MultiListBox nicht erlaubt...
-    void            SaveValue();
-    USHORT          GetSavedValue();
+    void			SaveValue();
+    USHORT			GetSavedValue();
 
 public:
                     MultiListBox( Window* pParent, WinBits nStyle = 0 );
                     MultiListBox( Window* pParent, const ResId& rResId );
 };
 
-#endif  // _SV_LSTBOX_HXX
+#endif	// _SV_LSTBOX_HXX
diff --git a/vcl/inc/vcl/mapmod.hxx b/vcl/inc/vcl/mapmod.hxx
index b2ea32958e90..019098451cca 100644
--- a/vcl/inc/vcl/mapmod.hxx
+++ b/vcl/inc/vcl/mapmod.hxx
@@ -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
@@ -41,20 +41,20 @@ class SvStream;
 // - ImplMapMode -
 // --------------
 
-class   OutputDevice;
+class	OutputDevice;
 
 class ImplMapMode
 {
-    friend class    MapMode;
-    friend class    OutputDevice;
+    friend class	MapMode;
+    friend class	OutputDevice;
 
 private:
-    ULONG           mnRefCount;
-    MapUnit         meUnit;
-    Point           maOrigin;
-    Fraction        maScaleX;
-    Fraction        maScaleY;
-    BOOL            mbSimple;
+    ULONG			mnRefCount;
+    MapUnit 		meUnit;
+    Point			maOrigin;
+    Fraction		maScaleX;
+    Fraction		maScaleY;
+    BOOL			mbSimple;
 
     friend SvStream& operator>>( SvStream& rIStm, ImplMapMode& rMapMode );
     friend SvStream& operator<<( SvStream& rOStm, const ImplMapMode& rMapMode );
@@ -71,10 +71,10 @@ public:
 
 class VCL_DLLPUBLIC MapMode
 {
-    friend class        OutputDevice;
+    friend class	    OutputDevice;
 
 private:
-    ImplMapMode*        mpImplMapMode;
+    ImplMapMode*	    mpImplMapMode;
 
     SAL_DLLPRIVATE void ImplMakeUnique();
 
@@ -86,31 +86,31 @@ public:
                              const Fraction& rScaleX, const Fraction& rScaleY );
                     ~MapMode();
 
-    void            SetMapUnit( MapUnit eUnit );
-    MapUnit         GetMapUnit() const
+    void			SetMapUnit( MapUnit eUnit );
+    MapUnit 		GetMapUnit() const
                         { return mpImplMapMode->meUnit; }
 
-    void            SetOrigin( const Point& rOrigin );
-    const Point&    GetOrigin() const
+    void			SetOrigin( const Point& rOrigin );
+    const Point&	GetOrigin() const
                         { return mpImplMapMode->maOrigin; }
 
-    void            SetScaleX( const Fraction& rScaleX );
+    void			SetScaleX( const Fraction& rScaleX );
     const Fraction& GetScaleX() const
                         { return mpImplMapMode->maScaleX; }
-    void            SetScaleY( const Fraction& rScaleY );
+    void			SetScaleY( const Fraction& rScaleY );
     const Fraction& GetScaleY() const
                         { return mpImplMapMode->maScaleY; }
 
-    MapMode&        operator=( const MapMode& rMapMode );
-    BOOL            operator==( const MapMode& rMapMode ) const;
-    BOOL            operator!=( const MapMode& rMapMode ) const
+    MapMode&		operator=( const MapMode& rMapMode );
+    BOOL			operator==( const MapMode& rMapMode ) const;
+    BOOL			operator!=( const MapMode& rMapMode ) const
                         { return !(MapMode::operator==( rMapMode )); }
-    BOOL            IsDefault() const;
-    BOOL            IsSameInstance( const MapMode& rMapMode ) const
+    BOOL			IsDefault() const;
+    BOOL			IsSameInstance( const MapMode& rMapMode ) const
                         { return (mpImplMapMode == rMapMode.mpImplMapMode); }
 
     friend VCL_DLLPUBLIC SvStream& operator>>( SvStream& rIStm, MapMode& rMapMode );
     friend VCL_DLLPUBLIC SvStream& operator<<( SvStream& rOStm, const MapMode& rMapMode );
 };
 
-#endif  // _SV_MAPMOD_HXX
+#endif	// _SV_MAPMOD_HXX
diff --git a/vcl/inc/vcl/mapunit.hxx b/vcl/inc/vcl/mapunit.hxx
index b4c757c538e6..d3215b8a029e 100644
--- a/vcl/inc/vcl/mapunit.hxx
+++ b/vcl/inc/vcl/mapunit.hxx
@@ -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
@@ -30,4 +30,4 @@
 
 #include <tools/mapunit.hxx>
 
-#endif  // _VCL_MAPUNIT_HXX
+#endif	// _VCL_MAPUNIT_HXX
diff --git a/vcl/inc/vcl/menu.hxx b/vcl/inc/vcl/menu.hxx
index 908f3e30319c..9aa562370b2b 100644
--- a/vcl/inc/vcl/menu.hxx
+++ b/vcl/inc/vcl/menu.hxx
@@ -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
@@ -67,12 +67,12 @@ namespace vcl { struct MenuLayoutData; }
 // - Menu-Types -
 // --------------
 
-#define MENU_APPEND             ((USHORT)0xFFFF)
-#define MENU_ITEM_NOTFOUND      ((USHORT)0xFFFF)
+#define MENU_APPEND 			((USHORT)0xFFFF)
+#define MENU_ITEM_NOTFOUND		((USHORT)0xFFFF)
 
-#define POPUPMENU_EXECUTE_DOWN  ((USHORT)0x0001)
-#define POPUPMENU_EXECUTE_UP    ((USHORT)0x0002)
-#define POPUPMENU_EXECUTE_LEFT  ((USHORT)0x0004)
+#define POPUPMENU_EXECUTE_DOWN	((USHORT)0x0001)
+#define POPUPMENU_EXECUTE_UP	((USHORT)0x0002)
+#define POPUPMENU_EXECUTE_LEFT	((USHORT)0x0004)
 #define POPUPMENU_EXECUTE_RIGHT ((USHORT)0x0008)
 
 #define POPUPMENU_NOMOUSEUPCLOSE ((USHORT)0x0010)
@@ -83,22 +83,22 @@ enum MenuItemType { MENUITEM_DONTKNOW, MENUITEM_STRING, MENUITEM_IMAGE,
 
 // By changes you must also change: rsc/vclrsc.hxx
 typedef USHORT MenuItemBits;
-#define MIB_CHECKABLE           ((MenuItemBits)0x0001)
-#define MIB_RADIOCHECK          ((MenuItemBits)0x0002)
-#define MIB_AUTOCHECK           ((MenuItemBits)0x0004)
-#define MIB_ABOUT               ((MenuItemBits)0x0008)
-#define MIB_HELP                ((MenuItemBits)0x0010)
-#define MIB_POPUPSELECT         ((MenuItemBits)0x0020)
+#define MIB_CHECKABLE			((MenuItemBits)0x0001)
+#define MIB_RADIOCHECK			((MenuItemBits)0x0002)
+#define MIB_AUTOCHECK			((MenuItemBits)0x0004)
+#define MIB_ABOUT				((MenuItemBits)0x0008)
+#define MIB_HELP				((MenuItemBits)0x0010)
+#define MIB_POPUPSELECT 		((MenuItemBits)0x0020)
 // not in rsc/vclsrc.hxx because only a prelimitary solution
-#define MIB_NOSELECT            ((MenuItemBits)0x0040)
-#define MIB_ICON            ((MenuItemBits)0x0080)
-#define MIB_TEXT            ((MenuItemBits)0x0100)
+#define MIB_NOSELECT 		    ((MenuItemBits)0x0040)
+#define MIB_ICON 		    ((MenuItemBits)0x0080)
+#define MIB_TEXT 		    ((MenuItemBits)0x0100)
 
-#define MENU_FLAG_NOAUTOMNEMONICS       0x0001
-#define MENU_FLAG_HIDEDISABLEDENTRIES   0x0002
+#define MENU_FLAG_NOAUTOMNEMONICS		0x0001
+#define MENU_FLAG_HIDEDISABLEDENTRIES	0x0002
 
 // overrides default hiding of disabled entries in popup menus
-#define MENU_FLAG_ALWAYSSHOWDISABLEDENTRIES 0x0004
+#define MENU_FLAG_ALWAYSSHOWDISABLEDENTRIES	0x0004
 
 // forces images & toggle visibility for toolbar config popup
 #define MENU_FLAG_SHOWCHECKIMAGES     0x0008
@@ -120,9 +120,9 @@ struct ImplMenuDelData
 
 struct MenuLogo
 {
-    BitmapEx    aBitmap;
-    Color       aStartColor;
-    Color       aEndColor;
+    BitmapEx	aBitmap;
+    Color		aStartColor;
+    Color		aEndColor;
 };
 
 class VCL_DLLPUBLIC Menu : public Resource
@@ -134,205 +134,205 @@ class VCL_DLLPUBLIC Menu : public Resource
     friend class SystemWindow;
     friend struct ImplMenuDelData;
 private:
-    ImplMenuDelData*    mpFirstDel;
-    MenuItemList*       pItemList;          // Liste mit den MenuItems
-    MenuLogo*           pLogo;
-    Menu*               pStartedFrom;
-    Window*             pWindow;
-
-    Link                aActivateHdl;       // Active-Handler
-    Link                aDeactivateHdl;     // Deactivate-Handler
-    Link                aHighlightHdl;      // Highlight-Handler
-    Link                aSelectHdl;         // Highlight-Handler
-
+    ImplMenuDelData*	mpFirstDel;
+    MenuItemList*		pItemList;			// Liste mit den MenuItems
+    MenuLogo*			pLogo;
+    Menu*				pStartedFrom;
+    Window* 			pWindow;
+
+    Link				aActivateHdl;		// Active-Handler
+    Link				aDeactivateHdl; 	// Deactivate-Handler
+    Link				aHighlightHdl;		// Highlight-Handler
+    Link				aSelectHdl; 		// Highlight-Handler
+    
     VclEventListeners   maEventListeners;
     VclEventListeners   maChildEventListeners;
 
-    XubString           aTitleText;         // PopupMenu-Text
+    XubString			aTitleText; 		// PopupMenu-Text
 
-    ULONG               nEventId;
-    USHORT              mnHighlightedItemPos; // for native menues: keeps track of the highlighted item
-    USHORT              nMenuFlags;
-    USHORT              nDefaultItem;       // Id vom Default-Item
-    USHORT              nSelectedId;
+    ULONG				nEventId;
+    USHORT				mnHighlightedItemPos; // for native menues: keeps track of the highlighted item 
+    USHORT				nMenuFlags;
+    USHORT				nDefaultItem;		// Id vom Default-Item
+    USHORT				nSelectedId;
 
     // Fuer Ausgabe:
-    USHORT              nCheckPos;
-    USHORT              nImagePos;
-    USHORT              nTextPos;
+    USHORT				nCheckPos;
+    USHORT				nImagePos;
+    USHORT				nTextPos;
 
-    BOOL                bIsMenuBar  : 1,        // Handelt es sich um den MenuBar
-                        bCanceled   : 1,        // Waehrend eines Callbacks abgebrochen
-                        bInCallback : 1,        // In Activate/Deactivate
-                        bKilled     : 1;        // Gekillt...
+    BOOL				bIsMenuBar	: 1,		// Handelt es sich um den MenuBar
+                        bCanceled	: 1,		// Waehrend eines Callbacks abgebrochen
+                        bInCallback : 1,		// In Activate/Deactivate
+                        bKilled 	: 1;		// Gekillt...
 
     ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > mxAccessible;
     mutable vcl::MenuLayoutData* mpLayoutData;
-    SalMenu*            mpSalMenu;
+    SalMenu*			mpSalMenu;
 
 protected:
-    SAL_DLLPRIVATE void             ImplInit();
-    SAL_DLLPRIVATE void             ImplLoadRes( const ResId& rResId );
-    SAL_DLLPRIVATE Menu*            ImplGetStartMenu();
-    SAL_DLLPRIVATE Menu*            ImplFindSelectMenu();
-    SAL_DLLPRIVATE Menu*            ImplFindMenu( USHORT nId );
-    SAL_DLLPRIVATE Size             ImplCalcSize( Window* pWin );
-    SAL_DLLPRIVATE BOOL             ImplIsVisible( USHORT nPos ) const;
+    SAL_DLLPRIVATE void				ImplInit();
+    SAL_DLLPRIVATE void				ImplLoadRes( const ResId& rResId );
+    SAL_DLLPRIVATE Menu*			ImplGetStartMenu();
+    SAL_DLLPRIVATE Menu*			ImplFindSelectMenu();
+    SAL_DLLPRIVATE Menu*			ImplFindMenu( USHORT nId );
+    SAL_DLLPRIVATE Size				ImplCalcSize( Window* pWin );
+    SAL_DLLPRIVATE BOOL				ImplIsVisible( USHORT nPos ) const;
     SAL_DLLPRIVATE BOOL             ImplIsSelectable( USHORT nPos ) const;
-    SAL_DLLPRIVATE USHORT           ImplGetVisibleItemCount() const;
-    SAL_DLLPRIVATE USHORT           ImplGetFirstVisible() const;
-    SAL_DLLPRIVATE USHORT           ImplGetPrevVisible( USHORT nPos ) const;
-    SAL_DLLPRIVATE USHORT           ImplGetNextVisible( USHORT nPos ) const;
-    SAL_DLLPRIVATE void             ImplPaint( Window* pWin, USHORT nBorder, long nOffY = 0, MenuItemData* pThisDataOnly = 0, BOOL bHighlighted = FALSE, bool bLayout = false ) const;
-    SAL_DLLPRIVATE void             ImplSelect();
-    SAL_DLLPRIVATE void             ImplCallHighlight( USHORT nHighlightItem );
+    SAL_DLLPRIVATE USHORT			ImplGetVisibleItemCount() const;
+    SAL_DLLPRIVATE USHORT			ImplGetFirstVisible() const;
+    SAL_DLLPRIVATE USHORT			ImplGetPrevVisible( USHORT nPos ) const;
+    SAL_DLLPRIVATE USHORT			ImplGetNextVisible( USHORT nPos ) const;
+    SAL_DLLPRIVATE void				ImplPaint( Window* pWin, USHORT nBorder, long nOffY = 0, MenuItemData* pThisDataOnly = 0, BOOL bHighlighted = FALSE, bool bLayout = false ) const;
+    SAL_DLLPRIVATE void				ImplSelect();
+    SAL_DLLPRIVATE void				ImplCallHighlight( USHORT nHighlightItem );
     SAL_DLLPRIVATE void             ImplCallEventListeners( ULONG nEvent, USHORT nPos );
     DECL_DLLPRIVATE_LINK(           ImplCallSelect, Menu* );
 
-    SAL_DLLPRIVATE void             ImplFillLayoutData() const;
+    SAL_DLLPRIVATE void				ImplFillLayoutData() const;
     SAL_DLLPRIVATE SalMenu*         ImplGetSalMenu() { return mpSalMenu; }
     SAL_DLLPRIVATE void             ImplSetSalMenu( SalMenu *pMenu );
     SAL_DLLPRIVATE const XubString& ImplGetHelpText( USHORT nItemId ) const;
-
+    
     // returns native check and option menu symbol height;
-    // return value is Max( rCheckHeight, rRadioHeight )
+    // return value is Max( rCheckHeight, rRadioHeight ) 
     SAL_DLLPRIVATE long             ImplGetNativeCheckAndRadioSize( Window*, long& rCheckHeight, long& rRadioHeight, long &rMaxWidth ) const;
 
     SAL_DLLPRIVATE void                ImplAddDel( ImplMenuDelData &rDel );
     SAL_DLLPRIVATE void                ImplRemoveDel( ImplMenuDelData &rDel );
 public:
-    SAL_DLLPRIVATE void             ImplKillLayoutData() const;
+    SAL_DLLPRIVATE void				ImplKillLayoutData() const;
     SAL_DLLPRIVATE Menu*            ImplGetStartedFrom() const;
 
                             Menu();
                             Menu( BOOL bMenuBar );
     SAL_DLLPRIVATE Window*  ImplGetWindow() const { return pWindow; }
 
-
+    
     SAL_DLLPRIVATE void ImplSelectWithStart( Menu* pStartMenu = NULL );
 public:
-    virtual             ~Menu();
+    virtual 			~Menu();
 
-    virtual void        Activate();
-    virtual void        Deactivate();
-    virtual void        Highlight();
-    virtual void        Select();
-    virtual void        RequestHelp( const HelpEvent& rHEvt );
+    virtual void		Activate();
+    virtual void		Deactivate();
+    virtual void		Highlight();
+    virtual void		Select();
+    virtual void		RequestHelp( const HelpEvent& rHEvt );
 
-    void                InsertItem( USHORT nItemId, const XubString& rStr,
+    void				InsertItem( USHORT nItemId, const XubString& rStr,
                                     MenuItemBits nItemBits = 0,
                                     USHORT nPos = MENU_APPEND );
-    void                InsertItem( USHORT nItemId, const Image& rImage,
+    void				InsertItem( USHORT nItemId, const Image& rImage,
                                     MenuItemBits nItemBits = 0,
                                     USHORT nPos = MENU_APPEND );
-    void                InsertItem( USHORT nItemId,
+    void				InsertItem( USHORT nItemId,
                                     const XubString& rString, const Image& rImage,
                                     MenuItemBits nItemBits = 0,
                                     USHORT nPos = MENU_APPEND );
-    void                InsertItem( const ResId& rResId, USHORT nPos = MENU_APPEND );
-    void                InsertSeparator( USHORT nPos = MENU_APPEND );
-    void                RemoveItem( USHORT nPos );
-    void                CopyItem( const Menu& rMenu, USHORT nPos,
+    void				InsertItem( const ResId& rResId, USHORT nPos = MENU_APPEND );
+    void				InsertSeparator( USHORT nPos = MENU_APPEND );
+    void				RemoveItem( USHORT nPos );
+    void				CopyItem( const Menu& rMenu, USHORT nPos,
                                   USHORT nNewPos = MENU_APPEND );
-    void                Clear();
+    void				Clear();
 
     void                CreateAutoMnemonics();
 
-    void                SetMenuFlags( USHORT nFlags ) { nMenuFlags = nFlags; }
-    USHORT              GetMenuFlags() const { return nMenuFlags; }
+    void				SetMenuFlags( USHORT nFlags ) { nMenuFlags = nFlags; }
+    USHORT				GetMenuFlags() const { return nMenuFlags; }
 
-    USHORT              GetItemCount() const;
-    USHORT              GetItemId( USHORT nPos ) const;
-    USHORT              GetItemPos( USHORT nItemId ) const;
-    MenuItemType        GetItemType( USHORT nPos ) const;
-    USHORT              GetCurItemId() const;
+    USHORT				GetItemCount() const;
+    USHORT				GetItemId( USHORT nPos ) const;
+    USHORT				GetItemPos( USHORT nItemId ) const;
+    MenuItemType		GetItemType( USHORT nPos ) const;
+    USHORT				GetCurItemId() const;
 
-    void                SetDefaultItem( USHORT nItemId )    { nDefaultItem = nItemId; }
-    USHORT              GetDefaultItem() const              { return nDefaultItem; }
+    void				SetDefaultItem( USHORT nItemId )	{ nDefaultItem = nItemId; }
+    USHORT				GetDefaultItem() const				{ return nDefaultItem; }
 
-    void                SetItemBits( USHORT nItemId, MenuItemBits nBits );
-    MenuItemBits        GetItemBits( USHORT nItemId ) const;
+    void				SetItemBits( USHORT nItemId, MenuItemBits nBits );
+    MenuItemBits		GetItemBits( USHORT nItemId ) const;
 
-    void                SetUserValue( USHORT nItemId, ULONG nValue );
-    ULONG               GetUserValue( USHORT nItemId ) const;
+    void				SetUserValue( USHORT nItemId, ULONG nValue );
+    ULONG		        GetUserValue( USHORT nItemId ) const;
 
-    void                SetPopupMenu( USHORT nItemId, PopupMenu* pMenu );
-    PopupMenu*          GetPopupMenu( USHORT nItemId ) const;
+    void				SetPopupMenu( USHORT nItemId, PopupMenu* pMenu );
+    PopupMenu*			GetPopupMenu( USHORT nItemId ) const;
 
-    void                SetAccelKey( USHORT nItemId, const KeyCode& rKeyCode );
-    KeyCode             GetAccelKey( USHORT nItemId ) const;
+    void				SetAccelKey( USHORT nItemId, const KeyCode& rKeyCode );
+    KeyCode 			GetAccelKey( USHORT nItemId ) const;
 
-    void                CheckItem( USHORT nItemId, BOOL bCheck = TRUE );
-    BOOL                IsItemChecked( USHORT nItemId ) const;
+    void				CheckItem( USHORT nItemId, BOOL bCheck = TRUE );
+    BOOL				IsItemChecked( USHORT nItemId ) const;
 
-    void                SelectItem( USHORT nItemId );
-    void                DeSelect() { SelectItem( 0xFFFF ); } // MENUITEMPOS_INVALID
+    void				SelectItem( USHORT nItemId );
+    void				DeSelect() { SelectItem( 0xFFFF ); } // MENUITEMPOS_INVALID
 
-    void                EnableItem( USHORT nItemId, BOOL bEnable = TRUE );
-    BOOL                IsItemEnabled( USHORT nItemId ) const;
+    void				EnableItem( USHORT nItemId, BOOL bEnable = TRUE );
+    BOOL				IsItemEnabled( USHORT nItemId ) const;
 
     void                ShowItem( USHORT nItemId, BOOL bVisible = TRUE );
     void                HideItem( USHORT nItemId ) { ShowItem( nItemId, FALSE ); }
 
-    BOOL                IsItemVisible( USHORT nItemId ) const;
-    BOOL                IsItemPosVisible( USHORT nItemPos ) const;
-    BOOL                IsMenuVisible() const;
-    BOOL                IsMenuBar() const { return bIsMenuBar; }
+    BOOL				IsItemVisible( USHORT nItemId ) const;
+    BOOL				IsItemPosVisible( USHORT nItemPos ) const;
+    BOOL				IsMenuVisible() const;
+    BOOL				IsMenuBar() const { return bIsMenuBar; }
 
-    void                RemoveDisabledEntries( BOOL bCheckPopups = TRUE, BOOL bRemoveEmptyPopups = FALSE );
-    BOOL                HasValidEntries( BOOL bCheckPopups = TRUE );
+    void				RemoveDisabledEntries( BOOL bCheckPopups = TRUE, BOOL bRemoveEmptyPopups = FALSE );
+    BOOL				HasValidEntries( BOOL bCheckPopups = TRUE );
 
-    void                SetItemText( USHORT nItemId, const XubString& rStr );
-    XubString           GetItemText( USHORT nItemId ) const;
+    void				SetItemText( USHORT nItemId, const XubString& rStr );
+    XubString			GetItemText( USHORT nItemId ) const;
 
-    void                SetItemImage( USHORT nItemId, const Image& rImage );
-    Image               GetItemImage( USHORT nItemId ) const;
-    void                SetItemImageAngle( USHORT nItemId, long nAngle10 );
-    long                GetItemImageAngle( USHORT nItemId ) const;
-    void                SetItemImageMirrorMode( USHORT nItemId, BOOL bMirror );
-    BOOL                GetItemImageMirrorMode( USHORT ) const;
+    void				SetItemImage( USHORT nItemId, const Image& rImage );
+    Image				GetItemImage( USHORT nItemId ) const;
+    void				SetItemImageAngle( USHORT nItemId, long nAngle10 );
+    long				GetItemImageAngle( USHORT nItemId ) const;
+    void				SetItemImageMirrorMode( USHORT nItemId, BOOL bMirror );
+    BOOL				GetItemImageMirrorMode( USHORT ) const;
 
-    void                SetItemCommand( USHORT nItemId, const XubString& rCommand );
-    const XubString&    GetItemCommand( USHORT nItemId ) const;
+    void				SetItemCommand( USHORT nItemId, const XubString& rCommand );
+    const XubString&	GetItemCommand( USHORT nItemId ) const;
 
-    void                SetHelpText( USHORT nItemId, const XubString& rString );
-    const XubString&    GetHelpText( USHORT nItemId ) const;
+    void				SetHelpText( USHORT nItemId, const XubString& rString );
+    const XubString&	GetHelpText( USHORT nItemId ) const;
 
-    void                SetTipHelpText( USHORT nItemId, const XubString& rString );
-    const XubString&    GetTipHelpText( USHORT nItemId ) const;
+    void				SetTipHelpText( USHORT nItemId, const XubString& rString );
+    const XubString&	GetTipHelpText( USHORT nItemId ) const;
 
     void                SetHelpCommand( USHORT nItemId, const XubString& rString );
     const XubString&    GetHelpCommand( USHORT nItemId ) const;
+    
+    void				SetHelpId( USHORT nItemId, ULONG nHelpId );
+    ULONG				GetHelpId( USHORT nItemId ) const;
 
-    void                SetHelpId( USHORT nItemId, ULONG nHelpId );
-    ULONG               GetHelpId( USHORT nItemId ) const;
-
-    void                SetActivateHdl( const Link& rLink )     { aActivateHdl = rLink; }
-    const Link&         GetActivateHdl() const                  { return aActivateHdl; }
+    void				SetActivateHdl( const Link& rLink ) 	{ aActivateHdl = rLink; }
+    const Link& 		GetActivateHdl() const					{ return aActivateHdl; }
 
-    void                SetDeactivateHdl( const Link& rLink )   { aDeactivateHdl = rLink; }
-    const Link&         GetDeactivateHdl() const                { return aDeactivateHdl; }
+    void				SetDeactivateHdl( const Link& rLink )	{ aDeactivateHdl = rLink; }
+    const Link& 		GetDeactivateHdl() const				{ return aDeactivateHdl; }
 
-    void                SetHighlightHdl( const Link& rLink )    { aHighlightHdl = rLink; }
-    const Link&         GetHighlightHdl() const                 { return aHighlightHdl; }
+    void				SetHighlightHdl( const Link& rLink )	{ aHighlightHdl = rLink; }
+    const Link& 		GetHighlightHdl() const 				{ return aHighlightHdl; }
 
-    void                SetSelectHdl( const Link& rLink )       { aSelectHdl = rLink; }
-    const Link&         GetSelectHdl() const                    { return aSelectHdl; }
-
-    void                SetLogo( const MenuLogo& rLogo );
-    void                SetLogo();
-    BOOL                HasLogo() const { return pLogo ? TRUE : FALSE; }
-    MenuLogo            GetLogo() const;
+    void				SetSelectHdl( const Link& rLink )		{ aSelectHdl = rLink; }
+    const Link& 		GetSelectHdl() const					{ return aSelectHdl; }
 
+    void				SetLogo( const MenuLogo& rLogo );
+    void				SetLogo();
+    BOOL				HasLogo() const { return pLogo ? TRUE : FALSE; }
+    MenuLogo			GetLogo() const;
+    
     void                AddEventListener( const Link& rEventListener );
     void                RemoveEventListener( const Link& rEventListener );
     //void                AddChildEventListener( const Link& rEventListener );
     //void                RemoveChildEventListener( const Link& rEventListener );
-
-    Menu&               operator =( const Menu& rMenu );
+    
+    Menu&				operator =( const Menu& rMenu );
 
     // Fuer Menu-'Funktionen'
-    MenuItemList*       GetItemList() const                     { return pItemList; }
+    MenuItemList*		GetItemList() const 					{ return pItemList; }
 
     // returns the system's menu handle if native menues are supported
     // pData must point to a SystemMenuData structure
@@ -368,21 +368,21 @@ public:
     // gets the activation key of the specified item
     KeyEvent GetActivationKey( USHORT nItemId ) const;
 
-    Window*             GetWindow() const { return pWindow; }
-
-    void                SetAccessibleName( USHORT nItemId, const XubString& rStr );
-    XubString           GetAccessibleName( USHORT nItemId ) const;
+    Window* 			GetWindow() const { return pWindow; }
 
-    void                SetAccessibleDescription( USHORT nItemId, const XubString& rStr );
-    XubString           GetAccessibleDescription( USHORT nItemId ) const;
+    void				SetAccessibleName( USHORT nItemId, const XubString& rStr );
+    XubString			GetAccessibleName( USHORT nItemId ) const;
 
+    void				SetAccessibleDescription( USHORT nItemId, const XubString& rStr );
+    XubString			GetAccessibleDescription( USHORT nItemId ) const;
+    
     // returns whether the item a position nItemPos is highlighted or not.
     bool  IsHighlighted( USHORT nItemPos ) const;
 
     void                HighlightItem( USHORT nItemPos );
     void                DeHighlight() { HighlightItem( 0xFFFF ); } // MENUITEMPOS_INVALID
-
-
+    
+    
     void doLazyDelete();
 };
 
@@ -392,13 +392,13 @@ public:
 
 class VCL_DLLPUBLIC MenuBar : public Menu
 {
-    Link                maCloserHdl;
-    Link                maFloatHdl;
-    Link                maHideHdl;
-    BOOL                mbCloserVisible;
-    BOOL                mbFloatBtnVisible;
-    BOOL                mbHideBtnVisible;
-    BOOL                mbDisplayable;
+    Link				maCloserHdl;
+    Link				maFloatHdl;
+    Link				maHideHdl;
+    BOOL				mbCloserVisible;
+    BOOL				mbFloatBtnVisible;
+    BOOL				mbHideBtnVisible;
+    BOOL				mbDisplayable;
 
 //#if 0 // _SOLAR__PRIVATE
     friend class Application;
@@ -407,9 +407,9 @@ class VCL_DLLPUBLIC MenuBar : public Menu
     friend class MenuFloatingWindow;
     friend class SystemWindow;
 
-    SAL_DLLPRIVATE static Window*   ImplCreate( Window* pParent, Window* pWindow, MenuBar* pMenu );
-    SAL_DLLPRIVATE static void      ImplDestroy( MenuBar* pMenu, BOOL bDelete );
-    SAL_DLLPRIVATE BOOL             ImplHandleKeyEvent( const KeyEvent& rKEvent, BOOL bFromMenu = TRUE );
+    SAL_DLLPRIVATE static Window*	ImplCreate( Window* pParent, Window* pWindow, MenuBar* pMenu );
+    SAL_DLLPRIVATE static void 		ImplDestroy( MenuBar* pMenu, BOOL bDelete );
+    SAL_DLLPRIVATE BOOL				ImplHandleKeyEvent( const KeyEvent& rKEvent, BOOL bFromMenu = TRUE );
 //#endif
 
 public:
@@ -418,29 +418,29 @@ public:
                         MenuBar( const MenuBar& rMenu );
                         ~MenuBar();
 
-    MenuBar&            operator =( const MenuBar& rMenu );
+    MenuBar&			operator =( const MenuBar& rMenu );
 
-    void                ShowCloser( BOOL bShow = TRUE );
-    BOOL                HasCloser() const { return mbCloserVisible; }
-    void                ShowFloatButton( BOOL bShow = TRUE );
-    BOOL                HasFloatButton() const { return mbFloatBtnVisible; }
-    void                ShowHideButton( BOOL bShow = TRUE );
-    BOOL                HasHideButton() const { return mbHideBtnVisible; }
-    void                ShowButtons( BOOL bClose, BOOL bFloat, BOOL bHide );
+    void				ShowCloser( BOOL bShow = TRUE );
+    BOOL				HasCloser() const { return mbCloserVisible; }
+    void				ShowFloatButton( BOOL bShow = TRUE );
+    BOOL				HasFloatButton() const { return mbFloatBtnVisible; }
+    void				ShowHideButton( BOOL bShow = TRUE );
+    BOOL				HasHideButton() const { return mbHideBtnVisible; }
+    void				ShowButtons( BOOL bClose, BOOL bFloat, BOOL bHide );
 
-    void                SelectEntry( USHORT nId );
+    void				SelectEntry( USHORT nId );
     BOOL                HandleMenuActivateEvent( Menu *pMenu ) const;
     BOOL                HandleMenuDeActivateEvent( Menu *pMenu ) const;
     BOOL                HandleMenuHighlightEvent( Menu *pMenu, USHORT nEventId ) const;
     BOOL                HandleMenuCommandEvent( Menu *pMenu, USHORT nEventId ) const;
     BOOL                HandleMenuButtonEvent( Menu *pMenu, USHORT nEventId ) const;
 
-    void                SetCloserHdl( const Link& rLink )           { maCloserHdl = rLink; }
-    const Link&         GetCloserHdl() const                        { return maCloserHdl; }
-    void                SetFloatButtonClickHdl( const Link& rLink ) { maFloatHdl = rLink; }
-    const Link&         GetFloatButtonClickHdl() const              { return maFloatHdl; }
-    void                SetHideButtonClickHdl( const Link& rLink )  { maHideHdl = rLink; }
-    const Link&         GetHideButtonClickHdl() const               { return maHideHdl; }
+    void				SetCloserHdl( const Link& rLink )			{ maCloserHdl = rLink; }
+    const Link& 		GetCloserHdl() const						{ return maCloserHdl; }
+    void				SetFloatButtonClickHdl( const Link& rLink ) { maFloatHdl = rLink; }
+    const Link& 		GetFloatButtonClickHdl() const				{ return maFloatHdl; }
+    void				SetHideButtonClickHdl( const Link& rLink )	{ maHideHdl = rLink; }
+    const Link& 		GetHideButtonClickHdl() const				{ return maHideHdl; }
 
     //  - by default a menubar is displayable
     //  - if a menubar is not displayable, its MenuBarWindow will never be shown
@@ -492,14 +492,14 @@ class VCL_DLLPUBLIC PopupMenu : public Menu
     friend struct MenuItemData;
 
 private:
-    Menu**              pRefAutoSubMenu;    // keeps track if a pointer to this Menu is stored in the MenuItemData
+    Menu**				pRefAutoSubMenu;    // keeps track if a pointer to this Menu is stored in the MenuItemData
 
     SAL_DLLPRIVATE MenuFloatingWindow*   ImplGetFloatingWindow() const { return (MenuFloatingWindow*)Menu::ImplGetWindow(); }
 
 protected:
     SAL_DLLPRIVATE USHORT                ImplExecute( Window* pWindow, const Rectangle& rRect, ULONG nPopupFlags, Menu* pStaredFrom, BOOL bPreSelectFirst );
-    SAL_DLLPRIVATE long                  ImplCalcHeight( USHORT nEntries ) const;
-    SAL_DLLPRIVATE USHORT                ImplCalcVisEntries( long nMaxHeight, USHORT nStartEntry = 0, USHORT* pLastVisible = NULL ) const;
+    SAL_DLLPRIVATE long				     ImplCalcHeight( USHORT nEntries ) const;
+    SAL_DLLPRIVATE USHORT				 ImplCalcVisEntries( long nMaxHeight, USHORT nStartEntry = 0, USHORT* pLastVisible = NULL ) const;
 
 public:
                         PopupMenu();
@@ -507,21 +507,21 @@ public:
                         PopupMenu( const ResId& rResId );
                         ~PopupMenu();
 
-    void                SetText( const XubString& rTitle )  { aTitleText = rTitle; }
-    const XubString&    GetText() const                     { return aTitleText; }
+    void				SetText( const XubString& rTitle )	{ aTitleText = rTitle; }
+    const XubString&	GetText() const 					{ return aTitleText; }
 
-    USHORT              Execute( Window* pWindow, const Point& rPopupPos );
-    USHORT              Execute( Window* pWindow, const Rectangle& rRect, USHORT nFlags = 0 );
+    USHORT				Execute( Window* pWindow, const Point& rPopupPos );
+    USHORT				Execute( Window* pWindow, const Rectangle& rRect, USHORT nFlags = 0 );
 
     // Fuer das TestTool
-    void                EndExecute( USHORT nSelect = 0 );
-    void                SelectEntry( USHORT nId );
+    void				EndExecute( USHORT nSelect = 0 );
+    void				SelectEntry( USHORT nId );
     void                SetSelectedEntry( USHORT nId ); // for use by native submenu only
 
-    static BOOL         IsInExecute();
-    static PopupMenu*   GetActivePopupMenu();
+    static BOOL 		IsInExecute();
+    static PopupMenu*	GetActivePopupMenu();
 
-    PopupMenu&          operator =( const PopupMenu& rMenu );
+    PopupMenu&			operator =( const PopupMenu& rMenu );
 };
 
 inline PopupMenu& PopupMenu::operator =( const PopupMenu& rMenu )
diff --git a/vcl/inc/vcl/menubtn.hxx b/vcl/inc/vcl/menubtn.hxx
index 1c7122054a4f..acb0a3ea94f7 100644
--- a/vcl/inc/vcl/menubtn.hxx
+++ b/vcl/inc/vcl/menubtn.hxx
@@ -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
@@ -39,7 +39,7 @@ class PopupMenu;
 // - MenuButton-Types -
 // --------------------
 
-#define MENUBUTTON_MENUMODE_TIMED       ((USHORT)0x0001)
+#define MENUBUTTON_MENUMODE_TIMED		((USHORT)0x0001)
 
 // --------------
 // - MenuButton -
@@ -48,14 +48,14 @@ class PopupMenu;
 class VCL_DLLPUBLIC MenuButton : public PushButton
 {
 private:
-    Rectangle       maFocusRect;
-    Timer*          mpMenuTimer;
-    PopupMenu*      mpOwnMenu;
-    PopupMenu*      mpMenu;
-    USHORT          mnCurItemId;
-    USHORT          mnMenuMode;
-    Link            maActivateHdl;
-    Link            maSelectHdl;
+    Rectangle		maFocusRect;
+    Timer*			mpMenuTimer;
+    PopupMenu*		mpOwnMenu;
+    PopupMenu*		mpMenu;
+    USHORT			mnCurItemId;
+    USHORT			mnMenuMode;
+    Link			maActivateHdl;
+    Link			maSelectHdl;
 
     SAL_DLLPRIVATE void    ImplInitMenuButtonData();
     SAL_DLLPRIVATE void    ImplExecuteMenu();
@@ -75,24 +75,24 @@ public:
                     MenuButton( Window* pParent, const ResId& rResId );
                     ~MenuButton();
 
-    virtual void    MouseButtonDown( const MouseEvent& rMEvt );
-    virtual void    KeyInput( const KeyEvent& rKEvt );
+    virtual void	MouseButtonDown( const MouseEvent& rMEvt );
+    virtual void	KeyInput( const KeyEvent& rKEvt );
 
-    virtual void    Activate();
-    virtual void    Select();
+    virtual void	Activate();
+    virtual void	Select();
 
-    void            SetMenuMode( USHORT nMode );
-    USHORT          GetMenuMode() const { return mnMenuMode; }
+    void			SetMenuMode( USHORT nMode );
+    USHORT			GetMenuMode() const { return mnMenuMode; }
 
-    void            SetPopupMenu( PopupMenu* pNewMenu );
-    PopupMenu*      GetPopupMenu() const { return mpMenu; }
+    void			SetPopupMenu( PopupMenu* pNewMenu );
+    PopupMenu*		GetPopupMenu() const { return mpMenu; }
 
-    USHORT          GetCurItemId() const { return mnCurItemId; }
+    USHORT			GetCurItemId() const { return mnCurItemId; }
 
-    void            SetActivateHdl( const Link& rLink ) { maActivateHdl = rLink; }
-    const Link&     GetActivateHdl() const              { return maActivateHdl; }
-    void            SetSelectHdl( const Link& rLink )   { maSelectHdl = rLink; }
-    const Link&     GetSelectHdl() const                { return maSelectHdl; }
+    void			SetActivateHdl( const Link& rLink ) { maActivateHdl = rLink; }
+    const Link& 	GetActivateHdl() const				{ return maActivateHdl; }
+    void			SetSelectHdl( const Link& rLink )	{ maSelectHdl = rLink; }
+    const Link& 	GetSelectHdl() const				{ return maSelectHdl; }
 };
 
-#endif  // _SV_MENUBTN_HXX
+#endif	// _SV_MENUBTN_HXX
diff --git a/vcl/inc/vcl/metaact.hxx b/vcl/inc/vcl/metaact.hxx
index 38ceff6e0690..3354bbaa3e52 100644
--- a/vcl/inc/vcl/metaact.hxx
+++ b/vcl/inc/vcl/metaact.hxx
@@ -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
@@ -49,91 +49,91 @@ class SvStream;
 // - Defines -
 // -----------
 
-#define META_NULL_ACTION                    (0)
-#define META_PIXEL_ACTION                   (100)
-#define META_POINT_ACTION                   (101)
-#define META_LINE_ACTION                    (102)
-#define META_RECT_ACTION                    (103)
-#define META_ROUNDRECT_ACTION               (104)
-#define META_ELLIPSE_ACTION                 (105)
-#define META_ARC_ACTION                     (106)
-#define META_PIE_ACTION                     (107)
-#define META_CHORD_ACTION                   (108)
-#define META_POLYLINE_ACTION                (109)
-#define META_POLYGON_ACTION                 (110)
-#define META_POLYPOLYGON_ACTION             (111)
-#define META_TEXT_ACTION                    (112)
-#define META_TEXTARRAY_ACTION               (113)
-#define META_STRETCHTEXT_ACTION             (114)
-#define META_TEXTRECT_ACTION                (115)
-#define META_BMP_ACTION                     (116)
-#define META_BMPSCALE_ACTION                (117)
-#define META_BMPSCALEPART_ACTION            (118)
-#define META_BMPEX_ACTION                   (119)
-#define META_BMPEXSCALE_ACTION              (120)
-#define META_BMPEXSCALEPART_ACTION          (121)
-#define META_MASK_ACTION                    (122)
-#define META_MASKSCALE_ACTION               (123)
-#define META_MASKSCALEPART_ACTION           (124)
-#define META_GRADIENT_ACTION                (125)
-#define META_HATCH_ACTION                   (126)
-#define META_WALLPAPER_ACTION               (127)
-#define META_CLIPREGION_ACTION              (128)
-#define META_ISECTRECTCLIPREGION_ACTION     (129)
-#define META_ISECTREGIONCLIPREGION_ACTION   (130)
-#define META_MOVECLIPREGION_ACTION          (131)
-#define META_LINECOLOR_ACTION               (132)
-#define META_FILLCOLOR_ACTION               (133)
-#define META_TEXTCOLOR_ACTION               (134)
-#define META_TEXTFILLCOLOR_ACTION           (135)
-#define META_TEXTALIGN_ACTION               (136)
-#define META_MAPMODE_ACTION                 (137)
-#define META_FONT_ACTION                    (138)
-#define META_PUSH_ACTION                    (139)
-#define META_POP_ACTION                     (140)
-#define META_RASTEROP_ACTION                (141)
-#define META_TRANSPARENT_ACTION             (142)
-#define META_EPS_ACTION                     (143)
-#define META_REFPOINT_ACTION                (144)
-#define META_TEXTLINECOLOR_ACTION           (145)
-#define META_TEXTLINE_ACTION                (146)
-#define META_FLOATTRANSPARENT_ACTION        (147)
-#define META_GRADIENTEX_ACTION              (148)
-#define META_LAYOUTMODE_ACTION              (149)
-#define META_TEXTLANGUAGE_ACTION            (150)
-#define META_OVERLINECOLOR_ACTION           (151)
-
-#define META_COMMENT_ACTION                 (512)
+#define META_NULL_ACTION					(0)
+#define META_PIXEL_ACTION					(100)
+#define META_POINT_ACTION					(101)
+#define META_LINE_ACTION					(102)
+#define META_RECT_ACTION					(103)
+#define META_ROUNDRECT_ACTION				(104)
+#define META_ELLIPSE_ACTION 				(105)
+#define META_ARC_ACTION 					(106)
+#define META_PIE_ACTION 					(107)
+#define META_CHORD_ACTION					(108)
+#define META_POLYLINE_ACTION				(109)
+#define META_POLYGON_ACTION 				(110)
+#define META_POLYPOLYGON_ACTION 			(111)
+#define META_TEXT_ACTION					(112)
+#define META_TEXTARRAY_ACTION				(113)
+#define META_STRETCHTEXT_ACTION 			(114)
+#define META_TEXTRECT_ACTION				(115)
+#define META_BMP_ACTION 					(116)
+#define META_BMPSCALE_ACTION				(117)
+#define META_BMPSCALEPART_ACTION			(118)
+#define META_BMPEX_ACTION					(119)
+#define META_BMPEXSCALE_ACTION				(120)
+#define META_BMPEXSCALEPART_ACTION			(121)
+#define META_MASK_ACTION					(122)
+#define META_MASKSCALE_ACTION				(123)
+#define META_MASKSCALEPART_ACTION			(124)
+#define META_GRADIENT_ACTION				(125)
+#define META_HATCH_ACTION					(126)
+#define META_WALLPAPER_ACTION				(127)
+#define META_CLIPREGION_ACTION				(128)
+#define META_ISECTRECTCLIPREGION_ACTION 	(129)
+#define META_ISECTREGIONCLIPREGION_ACTION	(130)
+#define META_MOVECLIPREGION_ACTION			(131)
+#define META_LINECOLOR_ACTION				(132)
+#define META_FILLCOLOR_ACTION				(133)
+#define META_TEXTCOLOR_ACTION				(134)
+#define META_TEXTFILLCOLOR_ACTION			(135)
+#define META_TEXTALIGN_ACTION				(136)
+#define META_MAPMODE_ACTION 				(137)
+#define META_FONT_ACTION					(138)
+#define META_PUSH_ACTION					(139)
+#define META_POP_ACTION 					(140)
+#define META_RASTEROP_ACTION				(141)
+#define META_TRANSPARENT_ACTION 			(142)
+#define META_EPS_ACTION 					(143)
+#define META_REFPOINT_ACTION				(144)
+#define META_TEXTLINECOLOR_ACTION			(145)
+#define META_TEXTLINE_ACTION				(146)
+#define META_FLOATTRANSPARENT_ACTION		(147)
+#define META_GRADIENTEX_ACTION				(148)
+#define META_LAYOUTMODE_ACTION 				(149)
+#define META_TEXTLANGUAGE_ACTION 			(150)
+#define META_OVERLINECOLOR_ACTION			(151)
+
+#define META_COMMENT_ACTION 				(512)
 
 // ------------------------------------------------------------------------
 
 struct ImplMetaReadData
 {
-    rtl_TextEncoding        meActualCharSet;
+    rtl_TextEncoding		meActualCharSet;
 };
 
 // ------------------------------------------------------------------------
 
 struct ImplMetaWriteData
 {
-    rtl_TextEncoding        meActualCharSet;
+    rtl_TextEncoding		meActualCharSet;
 };
 
 // ------------------------------------------------------------------------
 
-#define DECL_META_ACTION( Name, nType )                                     \
-                        Meta##Name##Action();                               \
+#define DECL_META_ACTION( Name, nType ) 									\
+                        Meta##Name##Action();								\
 protected:                                                                  \
-    virtual             ~Meta##Name##Action();                              \
+    virtual 			~Meta##Name##Action();								\
 public:                                                                     \
-    virtual void        Execute( OutputDevice* pOut );                      \
-    virtual MetaAction* Clone();                                            \
-    virtual void        Write( SvStream& rOStm, ImplMetaWriteData* pData ); \
-    virtual void        Read( SvStream& rIStm, ImplMetaReadData* pData );
-
-#define IMPL_META_ACTION( Name, nType )                                 \
-Meta##Name##Action::Meta##Name##Action() :                              \
-    MetaAction( nType ) {}                                              \
+    virtual void		Execute( OutputDevice* pOut );						\
+    virtual MetaAction* Clone();											\
+    virtual void		Write( SvStream& rOStm, ImplMetaWriteData* pData ); \
+    virtual void		Read( SvStream& rIStm, ImplMetaReadData* pData );
+
+#define IMPL_META_ACTION( Name, nType ) 								\
+Meta##Name##Action::Meta##Name##Action() :								\
+    MetaAction( nType ) {}												\
 Meta##Name##Action::~Meta##Name##Action() {}
 
 // --------------
@@ -143,38 +143,38 @@ Meta##Name##Action::~Meta##Name##Action() {}
 class VCL_DLLPUBLIC MetaAction
 {
 private:
-    ULONG               mnRefCount;
-    UINT16              mnType;
+    ULONG				mnRefCount;
+    UINT16				mnType;
 
-    virtual sal_Bool    Compare( const MetaAction& ) const;
+    virtual	sal_Bool	Compare( const MetaAction& ) const;
 
 protected:
-    virtual             ~MetaAction();
+    virtual 			~MetaAction();
 
 public:
                         MetaAction();
                         MetaAction( USHORT nType );
 
-    virtual void        Execute( OutputDevice* pOut );
+    virtual void		Execute( OutputDevice* pOut );
 
     virtual MetaAction* Clone();
 
-    virtual void        Move( long nHorzMove, long nVertMove );
-    virtual void        Scale( double fScaleX, double fScaleY );
+    virtual void		Move( long nHorzMove, long nVertMove );
+    virtual void		Scale( double fScaleX, double fScaleY );
 
-    virtual void        Write( SvStream& rOStm, ImplMetaWriteData* pData );
-    virtual void        Read( SvStream& rIStm, ImplMetaReadData* pData );
+    virtual void		Write( SvStream& rOStm, ImplMetaWriteData* pData );
+    virtual void		Read( SvStream& rIStm, ImplMetaReadData* pData );
 
-    sal_Bool            IsEqual( const MetaAction& ) const;
+    sal_Bool			IsEqual( const MetaAction& ) const;
 
-    USHORT              GetType() const { return mnType; }
-    ULONG               GetRefCount() const { return mnRefCount; }
-    void                ResetRefCount() { mnRefCount = 1; }
-    void                Duplicate()  { mnRefCount++; }
-    void                Delete() { if ( 0 == --mnRefCount ) delete this; }
+    USHORT				GetType() const { return mnType; }
+    ULONG				GetRefCount() const { return mnRefCount; }
+    void				ResetRefCount() { mnRefCount = 1; }
+    void				Duplicate()  { mnRefCount++; }
+    void				Delete() { if ( 0 == --mnRefCount ) delete this; }
 
 public:
-    static MetaAction*  ReadMetaAction( SvStream& rIStm, ImplMetaReadData* pData );
+    static MetaAction*	ReadMetaAction( SvStream& rIStm, ImplMetaReadData* pData );
 };
 
 // -------------------
@@ -184,21 +184,21 @@ public:
 class VCL_DLLPUBLIC MetaPixelAction : public MetaAction
 {
 private:
-    Point               maPt;
-    Color               maColor;
+    Point				maPt;
+    Color				maColor;
 
-    virtual sal_Bool    Compare( const MetaAction& ) const;
+    virtual	sal_Bool	Compare( const MetaAction& ) const;
 
 public:
                         DECL_META_ACTION( Pixel, META_PIXEL_ACTION )
 
                         MetaPixelAction( const Point& rPt, const Color& rColor );
 
-    virtual void        Move( long nHorzMove, long nVertMove );
-    virtual void        Scale( double fScaleX, double fScaleY );
+    virtual void		Move( long nHorzMove, long nVertMove );
+    virtual void		Scale( double fScaleX, double fScaleY );
 
-    const Point&        GetPoint() const { return maPt; }
-    const Color&        GetColor() const { return maColor; }
+    const Point&		GetPoint() const { return maPt; }
+    const Color&		GetColor() const { return maColor; }
 };
 
 // -------------------
@@ -208,19 +208,19 @@ public:
 class VCL_DLLPUBLIC MetaPointAction : public MetaAction
 {
 private:
-    Point               maPt;
+    Point				maPt;
 
-    virtual sal_Bool    Compare( const MetaAction& ) const;
+    virtual	sal_Bool	Compare( const MetaAction& ) const;
 
 public:
                         DECL_META_ACTION( Point, META_POINT_ACTION )
 
                         MetaPointAction( const Point& rPt );
 
-    virtual void        Move( long nHorzMove, long nVertMove );
-    virtual void        Scale( double fScaleX, double fScaleY );
+    virtual void		Move( long nHorzMove, long nVertMove );
+    virtual void		Scale( double fScaleX, double fScaleY );
 
-    const Point&        GetPoint() const { return maPt; }
+    const Point&		GetPoint() const { return maPt; }
 };
 
 // ------------------
@@ -231,11 +231,11 @@ class VCL_DLLPUBLIC MetaLineAction : public MetaAction
 {
 private:
 
-    LineInfo            maLineInfo;
-    Point               maStartPt;
-    Point               maEndPt;
+    LineInfo			maLineInfo;
+    Point				maStartPt;
+    Point				maEndPt;
 
-    virtual sal_Bool    Compare( const MetaAction& ) const;
+    virtual	sal_Bool	Compare( const MetaAction& ) const;
 
 public:
                         DECL_META_ACTION( Line, META_LINE_ACTION )
@@ -244,12 +244,12 @@ public:
                         MetaLineAction( const Point& rStart, const Point& rEnd,
                                         const LineInfo& rLineInfo );
 
-    virtual void        Move( long nHorzMove, long nVertMove );
-    virtual void        Scale( double fScaleX, double fScaleY );
+    virtual void		Move( long nHorzMove, long nVertMove );
+    virtual void		Scale( double fScaleX, double fScaleY );
 
-    const Point&        GetStartPoint() const { return maStartPt; }
-    const Point&        GetEndPoint() const { return maEndPt; }
-    const LineInfo&     GetLineInfo() const { return maLineInfo; }
+    const Point&		GetStartPoint() const { return maStartPt; }
+    const Point&		GetEndPoint() const { return maEndPt; }
+    const LineInfo& 	GetLineInfo() const { return maLineInfo; }
 };
 
 // ------------------
@@ -260,18 +260,18 @@ class VCL_DLLPUBLIC MetaRectAction : public MetaAction
 {
 private:
 
-    Rectangle           maRect;
+    Rectangle			maRect;
 
-    virtual sal_Bool    Compare( const MetaAction& ) const;
+    virtual	sal_Bool	Compare( const MetaAction& ) const;
 public:
                         DECL_META_ACTION( Rect, META_RECT_ACTION )
 
                         MetaRectAction( const Rectangle& rRect );
 
-    virtual void        Move( long nHorzMove, long nVertMove );
-    virtual void        Scale( double fScaleX, double fScaleY );
+    virtual void		Move( long nHorzMove, long nVertMove );
+    virtual void		Scale( double fScaleX, double fScaleY );
 
-    const Rectangle&    GetRect() const { return maRect; }
+    const Rectangle&	GetRect() const { return maRect; }
 };
 
 // -----------------------
@@ -282,11 +282,11 @@ class VCL_DLLPUBLIC MetaRoundRectAction : public MetaAction
 {
 private:
 
-    Rectangle           maRect;
-    sal_uInt32          mnHorzRound;
-    sal_uInt32          mnVertRound;
+    Rectangle			maRect;
+    sal_uInt32			mnHorzRound;
+    sal_uInt32			mnVertRound;
 
-    virtual sal_Bool    Compare( const MetaAction& ) const;
+    virtual	sal_Bool	Compare( const MetaAction& ) const;
 
 public:
                         DECL_META_ACTION( RoundRect, META_ROUNDRECT_ACTION )
@@ -294,12 +294,12 @@ public:
                         MetaRoundRectAction( const Rectangle& rRect,
                                              sal_uInt32 nHorzRound, sal_uInt32 nVertRound );
 
-    virtual void        Move( long nHorzMove, long nVertMove );
-    virtual void        Scale( double fScaleX, double fScaleY );
+    virtual void		Move( long nHorzMove, long nVertMove );
+    virtual void		Scale( double fScaleX, double fScaleY );
 
-    const Rectangle&    GetRect() const { return maRect; }
-    sal_uInt32          GetHorzRound() const { return mnHorzRound; }
-    sal_uInt32          GetVertRound() const { return mnVertRound; }
+    const Rectangle&	GetRect() const { return maRect; }
+    sal_uInt32			GetHorzRound() const { return mnHorzRound; }
+    sal_uInt32			GetVertRound() const { return mnVertRound; }
 };
 
 // ---------------------
@@ -310,19 +310,19 @@ class VCL_DLLPUBLIC MetaEllipseAction : public MetaAction
 {
 private:
 
-    Rectangle           maRect;
+    Rectangle			maRect;
 
-    virtual sal_Bool    Compare( const MetaAction& ) const;
+    virtual	sal_Bool	Compare( const MetaAction& ) const;
 
 public:
                         DECL_META_ACTION( Ellipse, META_ELLIPSE_ACTION )
 
                         MetaEllipseAction( const Rectangle& rRect );
 
-    virtual void        Move( long nHorzMove, long nVertMove );
-    virtual void        Scale( double fScaleX, double fScaleY );
+    virtual void		Move( long nHorzMove, long nVertMove );
+    virtual void		Scale( double fScaleX, double fScaleY );
 
-    const Rectangle&    GetRect() const { return maRect; }
+    const Rectangle&	GetRect() const { return maRect; }
 };
 
 // -----------------
@@ -333,11 +333,11 @@ class VCL_DLLPUBLIC MetaArcAction : public MetaAction
 {
 private:
 
-    Rectangle           maRect;
-    Point               maStartPt;
-    Point               maEndPt;
+    Rectangle			maRect;
+    Point				maStartPt;
+    Point				maEndPt;
 
-    virtual sal_Bool    Compare( const MetaAction& ) const;
+    virtual	sal_Bool	Compare( const MetaAction& ) const;
 
 public:
                         DECL_META_ACTION( Arc, META_ARC_ACTION )
@@ -345,12 +345,12 @@ public:
                         MetaArcAction( const Rectangle& rRect,
                                        const Point& rStart, const Point& rEnd );
 
-    virtual void        Move( long nHorzMove, long nVertMove );
-    virtual void        Scale( double fScaleX, double fScaleY );
+    virtual void		Move( long nHorzMove, long nVertMove );
+    virtual void		Scale( double fScaleX, double fScaleY );
 
-    const Rectangle&    GetRect() const { return maRect; }
-    const Point&        GetStartPoint() const { return maStartPt; }
-    const Point&        GetEndPoint() const { return maEndPt; }
+    const Rectangle&	GetRect() const { return maRect; }
+    const Point&		GetStartPoint() const { return maStartPt; }
+    const Point&		GetEndPoint() const { return maEndPt; }
 };
 
 // -----------------
@@ -361,11 +361,11 @@ class VCL_DLLPUBLIC MetaPieAction : public MetaAction
 {
 private:
 
-    Rectangle           maRect;
-    Point               maStartPt;
-    Point               maEndPt;
+    Rectangle			maRect;
+    Point				maStartPt;
+    Point				maEndPt;
 
-    virtual sal_Bool    Compare( const MetaAction& ) const;
+    virtual	sal_Bool	Compare( const MetaAction& ) const;
 
 public:
                         DECL_META_ACTION( Pie, META_PIE_ACTION )
@@ -373,12 +373,12 @@ public:
                         MetaPieAction( const Rectangle& rRect,
                                        const Point& rStart, const Point& rEnd );
 
-    virtual void        Move( long nHorzMove, long nVertMove );
-    virtual void        Scale( double fScaleX, double fScaleY );
+    virtual void		Move( long nHorzMove, long nVertMove );
+    virtual void		Scale( double fScaleX, double fScaleY );
 
-    const Rectangle&    GetRect() const { return maRect; }
-    const Point&        GetStartPoint() const { return maStartPt; }
-    const Point&        GetEndPoint() const { return maEndPt; }
+    const Rectangle&	GetRect() const { return maRect; }
+    const Point&		GetStartPoint() const { return maStartPt; }
+    const Point&		GetEndPoint() const { return maEndPt; }
 };
 
 // -------------------
@@ -389,11 +389,11 @@ class VCL_DLLPUBLIC MetaChordAction : public MetaAction
 {
 private:
 
-    Rectangle           maRect;
-    Point               maStartPt;
-    Point               maEndPt;
+    Rectangle			maRect;
+    Point				maStartPt;
+    Point				maEndPt;
 
-    virtual sal_Bool    Compare( const MetaAction& ) const;
+    virtual	sal_Bool	Compare( const MetaAction& ) const;
 
 public:
                         DECL_META_ACTION( Chord, META_CHORD_ACTION )
@@ -401,12 +401,12 @@ public:
                         MetaChordAction( const Rectangle& rRect,
                                          const Point& rStart, const Point& rEnd );
 
-    virtual void        Move( long nHorzMove, long nVertMove );
-    virtual void        Scale( double fScaleX, double fScaleY );
+    virtual void		Move( long nHorzMove, long nVertMove );
+    virtual void		Scale( double fScaleX, double fScaleY );
 
-    const Rectangle&    GetRect() const { return maRect; }
-    const Point&        GetStartPoint() const { return maStartPt; }
-    const Point&        GetEndPoint() const { return maEndPt; }
+    const Rectangle&	GetRect() const { return maRect; }
+    const Point&		GetStartPoint() const { return maStartPt; }
+    const Point&		GetEndPoint() const { return maEndPt; }
 };
 
 // ----------------------
@@ -417,10 +417,10 @@ class VCL_DLLPUBLIC MetaPolyLineAction : public MetaAction
 {
 private:
 
-    LineInfo            maLineInfo;
-    Polygon             maPoly;
+    LineInfo			maLineInfo;
+    Polygon 			maPoly;
 
-    virtual sal_Bool    Compare( const MetaAction& ) const;
+    virtual	sal_Bool	Compare( const MetaAction& ) const;
 
 public:
                         DECL_META_ACTION( PolyLine, META_POLYLINE_ACTION )
@@ -428,11 +428,11 @@ public:
                         MetaPolyLineAction( const Polygon& rPoly );
                         MetaPolyLineAction( const Polygon& rPoly, const LineInfo& rLineInfo );
 
-    virtual void        Move( long nHorzMove, long nVertMove );
-    virtual void        Scale( double fScaleX, double fScaleY );
+    virtual void		Move( long nHorzMove, long nVertMove );
+    virtual void		Scale( double fScaleX, double fScaleY );
 
-    const Polygon&      GetPolygon() const { return maPoly; }
-    const LineInfo&     GetLineInfo() const { return maLineInfo; }
+    const Polygon&		GetPolygon() const { return maPoly; }
+    const LineInfo& 	GetLineInfo() const { return maLineInfo; }
 };
 
 // ---------------------
@@ -443,19 +443,19 @@ class VCL_DLLPUBLIC MetaPolygonAction : public MetaAction
 {
 private:
 
-    Polygon             maPoly;
+    Polygon 			maPoly;
 
-    virtual sal_Bool    Compare( const MetaAction& ) const;
+    virtual	sal_Bool	Compare( const MetaAction& ) const;
 
 public:
                         DECL_META_ACTION( Polygon, META_POLYGON_ACTION )
 
                         MetaPolygonAction( const Polygon& rPoly );
 
-    virtual void        Move( long nHorzMove, long nVertMove );
-    virtual void        Scale( double fScaleX, double fScaleY );
+    virtual void		Move( long nHorzMove, long nVertMove );
+    virtual void		Scale( double fScaleX, double fScaleY );
 
-    const Polygon&      GetPolygon() const { return maPoly; }
+    const Polygon&		GetPolygon() const { return maPoly; }
 };
 
 // -------------------------
@@ -466,19 +466,19 @@ class VCL_DLLPUBLIC MetaPolyPolygonAction : public MetaAction
 {
 private:
 
-    PolyPolygon         maPolyPoly;
+    PolyPolygon 		maPolyPoly;
 
-    virtual sal_Bool    Compare( const MetaAction& ) const;
+    virtual	sal_Bool	Compare( const MetaAction& ) const;
 
 public:
                         DECL_META_ACTION( PolyPolygon, META_POLYPOLYGON_ACTION )
 
                         MetaPolyPolygonAction( const PolyPolygon& rPolyPoly );
 
-    virtual void        Move( long nHorzMove, long nVertMove );
-    virtual void        Scale( double fScaleX, double fScaleY );
+    virtual void		Move( long nHorzMove, long nVertMove );
+    virtual void		Scale( double fScaleX, double fScaleY );
 
-    const PolyPolygon&  GetPolyPolygon() const { return maPolyPoly; }
+    const PolyPolygon&	GetPolyPolygon() const { return maPolyPoly; }
 };
 
 // ------------------
@@ -489,12 +489,12 @@ class VCL_DLLPUBLIC MetaTextAction : public MetaAction
 {
 private:
 
-    Point               maPt;
-    XubString           maStr;
-    USHORT              mnIndex;
-    USHORT              mnLen;
+    Point				maPt;
+    XubString			maStr;
+    USHORT				mnIndex;
+    USHORT				mnLen;
 
-    virtual sal_Bool    Compare( const MetaAction& ) const;
+    virtual	sal_Bool	Compare( const MetaAction& ) const;
 
 public:
                         DECL_META_ACTION( Text, META_TEXT_ACTION )
@@ -502,13 +502,13 @@ public:
                         MetaTextAction( const Point& rPt, const XubString& rStr,
                                         USHORT nIndex, USHORT nLen );
 
-    virtual void        Move( long nHorzMove, long nVertMove );
-    virtual void        Scale( double fScaleX, double fScaleY );
+    virtual void		Move( long nHorzMove, long nVertMove );
+    virtual void		Scale( double fScaleX, double fScaleY );
 
-    const Point&        GetPoint() const { return maPt; }
-    const XubString&    GetText() const { return maStr; }
-    USHORT              GetIndex() const { return mnIndex; }
-    USHORT              GetLen() const { return mnLen; }
+    const Point&		GetPoint() const { return maPt; }
+    const XubString&	GetText() const { return maStr; }
+    USHORT				GetIndex() const { return mnIndex; }
+    USHORT				GetLen() const { return mnLen; }
 };
 
 // -----------------------
@@ -519,16 +519,16 @@ class VCL_DLLPUBLIC MetaTextArrayAction : public MetaAction
 {
 private:
 
-    Point               maStartPt;
-    XubString           maStr;
-    sal_Int32*          mpDXAry;
-    USHORT              mnIndex;
-    USHORT              mnLen;
+    Point				maStartPt;
+    XubString			maStr;
+    sal_Int32*			mpDXAry;
+    USHORT				mnIndex;
+    USHORT				mnLen;
 
-    virtual sal_Bool    Compare( const MetaAction& ) const;
+    virtual	sal_Bool	Compare( const MetaAction& ) const;
 
 protected:
-    virtual             ~MetaTextArrayAction();
+    virtual 			~MetaTextArrayAction();
 
 public:
                         MetaTextArrayAction();
@@ -539,21 +539,21 @@ public:
                                              USHORT nIndex,
                                              USHORT nLen );
 
-    virtual void        Execute( OutputDevice* pOut );
+    virtual void		Execute( OutputDevice* pOut );
 
     virtual MetaAction* Clone();
 
-    virtual void        Move( long nHorzMove, long nVertMove );
-    virtual void        Scale( double fScaleX, double fScaleY );
+    virtual void		Move( long nHorzMove, long nVertMove );
+    virtual void		Scale( double fScaleX, double fScaleY );
 
-    virtual void        Write( SvStream& rOStm, ImplMetaWriteData* pData );
-    virtual void        Read( SvStream& rIStm, ImplMetaReadData* pData );
+    virtual void		Write( SvStream& rOStm, ImplMetaWriteData* pData );
+    virtual void		Read( SvStream& rIStm, ImplMetaReadData* pData );
 
-    const Point&        GetPoint() const { return maStartPt; }
-    const XubString&    GetText() const { return maStr; }
-    USHORT              GetIndex() const { return mnIndex; }
-    USHORT              GetLen() const { return mnLen; }
-    sal_Int32*          GetDXArray() const { return mpDXAry; }
+    const Point&		GetPoint() const { return maStartPt; }
+    const XubString&	GetText() const { return maStr; }
+    USHORT				GetIndex() const { return mnIndex; }
+    USHORT				GetLen() const { return mnLen; }
+    sal_Int32*			GetDXArray() const { return mpDXAry; }
 };
 
 // -------------------------
@@ -564,13 +564,13 @@ class VCL_DLLPUBLIC MetaStretchTextAction : public MetaAction
 {
 private:
 
-    Point               maPt;
-    XubString           maStr;
-    sal_uInt32          mnWidth;
-    USHORT              mnIndex;
-    USHORT              mnLen;
+    Point				maPt;
+    XubString			maStr;
+    sal_uInt32			mnWidth;
+    USHORT				mnIndex;
+    USHORT				mnLen;
 
-    virtual sal_Bool    Compare( const MetaAction& ) const;
+    virtual	sal_Bool	Compare( const MetaAction& ) const;
 
 public:
                         DECL_META_ACTION( StretchText, META_STRETCHTEXT_ACTION )
@@ -579,14 +579,14 @@ public:
                                                const XubString& rStr,
                                                USHORT nIndex, USHORT nLen );
 
-    virtual void        Move( long nHorzMove, long nVertMove );
-    virtual void        Scale( double fScaleX, double fScaleY );
+    virtual void		Move( long nHorzMove, long nVertMove );
+    virtual void		Scale( double fScaleX, double fScaleY );
 
-    const Point&        GetPoint() const { return maPt; }
-    const XubString&    GetText() const { return maStr; }
-    sal_uInt32          GetWidth() const { return mnWidth; }
-    USHORT              GetIndex() const { return mnIndex; }
-    USHORT              GetLen() const { return mnLen; }
+    const Point&		GetPoint() const { return maPt; }
+    const XubString&	GetText() const { return maStr; }
+    sal_uInt32			GetWidth() const { return mnWidth; }
+    USHORT				GetIndex() const { return mnIndex; }
+    USHORT				GetLen() const { return mnLen; }
 };
 
 // ----------------------
@@ -597,11 +597,11 @@ class VCL_DLLPUBLIC MetaTextRectAction : public MetaAction
 {
 private:
 
-    Rectangle           maRect;
-    XubString           maStr;
-    USHORT              mnStyle;
+    Rectangle			maRect;
+    XubString			maStr;
+    USHORT				mnStyle;
 
-    virtual sal_Bool    Compare( const MetaAction& ) const;
+    virtual	sal_Bool	Compare( const MetaAction& ) const;
 
 public:
                         DECL_META_ACTION( TextRect, META_TEXTRECT_ACTION )
@@ -609,12 +609,12 @@ public:
                         MetaTextRectAction( const Rectangle& rRect,
                                             const XubString& rStr, USHORT nStyle );
 
-    virtual void        Move( long nHorzMove, long nVertMove );
-    virtual void        Scale( double fScaleX, double fScaleY );
+    virtual void		Move( long nHorzMove, long nVertMove );
+    virtual void		Scale( double fScaleX, double fScaleY );
 
-    const Rectangle&    GetRect() const { return maRect; }
-    const XubString&    GetText() const { return maStr; }
-    USHORT              GetStyle() const { return mnStyle; }
+    const Rectangle&	GetRect() const { return maRect; }
+    const XubString&	GetText() const { return maStr; }
+    USHORT				GetStyle() const { return mnStyle; }
 };
 
 // ----------------------
@@ -625,13 +625,13 @@ class VCL_DLLPUBLIC MetaTextLineAction : public MetaAction
 {
 private:
 
-    Point               maPos;
-    long                mnWidth;
-    FontStrikeout       meStrikeout;
-    FontUnderline       meUnderline;
-    FontUnderline       meOverline;
+    Point				maPos;
+    long				mnWidth;
+    FontStrikeout		meStrikeout;
+    FontUnderline		meUnderline;
+    FontUnderline		meOverline;
 
-    virtual sal_Bool    Compare( const MetaAction& ) const;
+    virtual	sal_Bool	Compare( const MetaAction& ) const;
 
 public:
                         DECL_META_ACTION( TextLine, META_TEXTLINE_ACTION )
@@ -640,14 +640,14 @@ public:
                                             FontStrikeout eStrikeout,
                                             FontUnderline eUnderline,
                                             FontUnderline eOverline );
-    virtual void        Move( long nHorzMove, long nVertMove );
-    virtual void        Scale( double fScaleX, double fScaleY );
-
-    const Point&        GetStartPoint() const { return maPos; }
-    long                GetWidth() const { return mnWidth; }
-    FontStrikeout       GetStrikeout() const { return meStrikeout; }
-    FontUnderline       GetUnderline() const { return meUnderline; }
-    FontUnderline       GetOverline()  const { return meOverline; }
+    virtual void		Move( long nHorzMove, long nVertMove );
+    virtual void		Scale( double fScaleX, double fScaleY );
+
+    const Point&		GetStartPoint() const { return maPos; }
+    long				GetWidth() const { return mnWidth; }
+    FontStrikeout		GetStrikeout() const { return meStrikeout; }
+    FontUnderline		GetUnderline() const { return meUnderline; }
+    FontUnderline		GetOverline()  const { return meOverline; }
 };
 
 // -----------------
@@ -658,21 +658,21 @@ class VCL_DLLPUBLIC MetaBmpAction : public MetaAction
 {
 private:
 
-    Bitmap              maBmp;
-    Point               maPt;
+    Bitmap				maBmp;
+    Point				maPt;
 
-    virtual sal_Bool    Compare( const MetaAction& ) const;
+    virtual	sal_Bool	Compare( const MetaAction& ) const;
 
 public:
                         DECL_META_ACTION( Bmp, META_BMP_ACTION )
 
                         MetaBmpAction( const Point& rPt, const Bitmap& rBmp );
 
-    virtual void        Move( long nHorzMove, long nVertMove );
-    virtual void        Scale( double fScaleX, double fScaleY );
+    virtual void		Move( long nHorzMove, long nVertMove );
+    virtual void		Scale( double fScaleX, double fScaleY );
 
-    const Bitmap&       GetBitmap() const { return maBmp; }
-    const Point&        GetPoint() const { return maPt; }
+    const Bitmap&		GetBitmap() const { return maBmp; }
+    const Point&		GetPoint() const { return maPt; }
 };
 
 // ----------------------
@@ -683,11 +683,11 @@ class VCL_DLLPUBLIC MetaBmpScaleAction : public MetaAction
 {
 private:
 
-    Bitmap              maBmp;
-    Point               maPt;
-    Size                maSz;
+    Bitmap				maBmp;
+    Point				maPt;
+    Size				maSz;
 
-    virtual sal_Bool    Compare( const MetaAction& ) const;
+    virtual	sal_Bool	Compare( const MetaAction& ) const;
 
 public:
                         DECL_META_ACTION( BmpScale, META_BMPSCALE_ACTION )
@@ -695,12 +695,12 @@ public:
                         MetaBmpScaleAction( const Point& rPt, const Size& rSz,
                                             const Bitmap& rBmp );
 
-    virtual void        Move( long nHorzMove, long nVertMove );
-    virtual void        Scale( double fScaleX, double fScaleY );
+    virtual void		Move( long nHorzMove, long nVertMove );
+    virtual void		Scale( double fScaleX, double fScaleY );
 
-    const Bitmap&       GetBitmap() const { return maBmp; }
-    const Point&        GetPoint() const { return maPt; }
-    const Size&         GetSize() const { return maSz; }
+    const Bitmap&		GetBitmap() const { return maBmp; }
+    const Point&		GetPoint() const { return maPt; }
+    const Size& 		GetSize() const { return maSz; }
 };
 
 // --------------------------
@@ -711,13 +711,13 @@ class VCL_DLLPUBLIC MetaBmpScalePartAction : public MetaAction
 {
 private:
 
-    Bitmap              maBmp;
-    Point               maDstPt;
-    Size                maDstSz;
-    Point               maSrcPt;
-    Size                maSrcSz;
+    Bitmap				maBmp;
+    Point				maDstPt;
+    Size				maDstSz;
+    Point				maSrcPt;
+    Size				maSrcSz;
 
-    virtual sal_Bool    Compare( const MetaAction& ) const;
+    virtual	sal_Bool	Compare( const MetaAction& ) const;
 
 public:
                         DECL_META_ACTION( BmpScalePart, META_BMPSCALEPART_ACTION )
@@ -726,14 +726,14 @@ public:
                                                 const Point& rSrcPt, const Size& rSrcSz,
                                                 const Bitmap& rBmp );
 
-    virtual void        Move( long nHorzMove, long nVertMove );
-    virtual void        Scale( double fScaleX, double fScaleY );
+    virtual void		Move( long nHorzMove, long nVertMove );
+    virtual void		Scale( double fScaleX, double fScaleY );
 
-    const Bitmap&       GetBitmap() const { return maBmp; }
-    const Point&        GetDestPoint() const { return maDstPt; }
-    const Size&         GetDestSize() const { return maDstSz; }
-    const Point&        GetSrcPoint() const { return maSrcPt; }
-    const Size&         GetSrcSize() const { return maSrcSz; }
+    const Bitmap&		GetBitmap() const { return maBmp; }
+    const Point&		GetDestPoint() const { return maDstPt; }
+    const Size& 		GetDestSize() const { return maDstSz; }
+    const Point&		GetSrcPoint() const { return maSrcPt; }
+    const Size& 		GetSrcSize() const { return maSrcSz; }
 };
 
 // -----------------
@@ -744,21 +744,21 @@ class VCL_DLLPUBLIC MetaBmpExAction : public MetaAction
 {
 private:
 
-    BitmapEx            maBmpEx;
-    Point               maPt;
+    BitmapEx			maBmpEx;
+    Point				maPt;
 
-    virtual sal_Bool    Compare( const MetaAction& ) const;
+    virtual	sal_Bool	Compare( const MetaAction& ) const;
 
 public:
                         DECL_META_ACTION( BmpEx, META_BMPEX_ACTION )
 
                         MetaBmpExAction( const Point& rPt, const BitmapEx& rBmpEx );
 
-    virtual void        Move( long nHorzMove, long nVertMove );
-    virtual void        Scale( double fScaleX, double fScaleY );
+    virtual void		Move( long nHorzMove, long nVertMove );
+    virtual void		Scale( double fScaleX, double fScaleY );
 
-    const BitmapEx&     GetBitmapEx() const { return maBmpEx; }
-    const Point&        GetPoint() const { return maPt; }
+    const BitmapEx& 	GetBitmapEx() const { return maBmpEx; }
+    const Point&		GetPoint() const { return maPt; }
 };
 
 // ----------------------
@@ -769,11 +769,11 @@ class VCL_DLLPUBLIC MetaBmpExScaleAction : public MetaAction
 {
 private:
 
-    BitmapEx            maBmpEx;
-    Point               maPt;
-    Size                maSz;
+    BitmapEx			maBmpEx;
+    Point				maPt;
+    Size				maSz;
 
-    virtual sal_Bool    Compare( const MetaAction& ) const;
+    virtual	sal_Bool	Compare( const MetaAction& ) const;
 
 public:
                         DECL_META_ACTION( BmpExScale, META_BMPEXSCALE_ACTION )
@@ -781,12 +781,12 @@ public:
                         MetaBmpExScaleAction( const Point& rPt, const Size& rSz,
                                               const BitmapEx& rBmpEx ) ;
 
-    virtual void        Move( long nHorzMove, long nVertMove );
-    virtual void        Scale( double fScaleX, double fScaleY );
+    virtual void		Move( long nHorzMove, long nVertMove );
+    virtual void		Scale( double fScaleX, double fScaleY );
 
-    const BitmapEx&     GetBitmapEx() const { return maBmpEx; }
-    const Point&        GetPoint() const { return maPt; }
-    const Size&         GetSize() const { return maSz; }
+    const BitmapEx& 	GetBitmapEx() const { return maBmpEx; }
+    const Point&		GetPoint() const { return maPt; }
+    const Size& 		GetSize() const { return maSz; }
 };
 
 // ----------------------------
@@ -797,13 +797,13 @@ class VCL_DLLPUBLIC MetaBmpExScalePartAction : public MetaAction
 {
 private:
 
-    BitmapEx            maBmpEx;
-    Point               maDstPt;
-    Size                maDstSz;
-    Point               maSrcPt;
-    Size                maSrcSz;
+    BitmapEx			maBmpEx;
+    Point				maDstPt;
+    Size				maDstSz;
+    Point				maSrcPt;
+    Size				maSrcSz;
 
-    virtual sal_Bool    Compare( const MetaAction& ) const;
+    virtual	sal_Bool	Compare( const MetaAction& ) const;
 
 public:
                         DECL_META_ACTION( BmpExScalePart, META_BMPEXSCALEPART_ACTION )
@@ -812,14 +812,14 @@ public:
                                                   const Point& rSrcPt, const Size& rSrcSz,
                                                   const BitmapEx& rBmpEx );
 
-    virtual void        Move( long nHorzMove, long nVertMove );
-    virtual void        Scale( double fScaleX, double fScaleY );
+    virtual void		Move( long nHorzMove, long nVertMove );
+    virtual void		Scale( double fScaleX, double fScaleY );
 
-    const BitmapEx&     GetBitmapEx() const { return maBmpEx; }
-    const Point&        GetDestPoint() const { return maDstPt; }
-    const Size&         GetDestSize() const { return maDstSz; }
-    const Point&        GetSrcPoint() const { return maSrcPt; }
-    const Size&         GetSrcSize() const { return maSrcSz; }
+    const BitmapEx& 	GetBitmapEx() const { return maBmpEx; }
+    const Point&		GetDestPoint() const { return maDstPt; }
+    const Size& 		GetDestSize() const { return maDstSz; }
+    const Point&		GetSrcPoint() const { return maSrcPt; }
+    const Size& 		GetSrcSize() const { return maSrcSz; }
 };
 
 // ------------------
@@ -830,11 +830,11 @@ class VCL_DLLPUBLIC MetaMaskAction : public MetaAction
 {
 private:
 
-    Bitmap              maBmp;
-    Color               maColor;
-    Point               maPt;
+    Bitmap				maBmp;
+    Color				maColor;
+    Point				maPt;
 
-    virtual sal_Bool    Compare( const MetaAction& ) const;
+    virtual	sal_Bool	Compare( const MetaAction& ) const;
 
 public:
                         DECL_META_ACTION( Mask, META_MASK_ACTION )
@@ -843,12 +843,12 @@ public:
                                         const Bitmap& rBmp,
                                         const Color& rColor );
 
-    virtual void        Move( long nHorzMove, long nVertMove );
-    virtual void        Scale( double fScaleX, double fScaleY );
+    virtual void		Move( long nHorzMove, long nVertMove );
+    virtual void		Scale( double fScaleX, double fScaleY );
 
-    const Bitmap&       GetBitmap() const { return maBmp; }
-    const Color&        GetColor() const { return maColor; }
-    const Point&        GetPoint() const { return maPt; }
+    const Bitmap&		GetBitmap() const { return maBmp; }
+    const Color&		GetColor() const { return maColor; }
+    const Point&		GetPoint() const { return maPt; }
 };
 
 // -----------------------
@@ -859,12 +859,12 @@ class VCL_DLLPUBLIC MetaMaskScaleAction : public MetaAction
 {
 private:
 
-    Bitmap              maBmp;
-    Color               maColor;
-    Point               maPt;
-    Size                maSz;
+    Bitmap				maBmp;
+    Color				maColor;
+    Point				maPt;
+    Size				maSz;
 
-    virtual sal_Bool    Compare( const MetaAction& ) const;
+    virtual	sal_Bool	Compare( const MetaAction& ) const;
 
 public:
                         DECL_META_ACTION( MaskScale, META_MASKSCALE_ACTION )
@@ -873,13 +873,13 @@ public:
                                              const Bitmap& rBmp,
                                              const Color& rColor );
 
-    virtual void        Move( long nHorzMove, long nVertMove );
-    virtual void        Scale( double fScaleX, double fScaleY );
+    virtual void		Move( long nHorzMove, long nVertMove );
+    virtual void		Scale( double fScaleX, double fScaleY );
 
-    const Bitmap&       GetBitmap() const { return maBmp; }
-    const Color&        GetColor() const { return maColor; }
-    const Point&        GetPoint() const { return maPt; }
-    const Size&         GetSize() const { return maSz; }
+    const Bitmap&		GetBitmap() const { return maBmp; }
+    const Color&		GetColor() const { return maColor; }
+    const Point&		GetPoint() const { return maPt; }
+    const Size& 		GetSize() const { return maSz; }
 };
 
 // ---------------------------
@@ -890,14 +890,14 @@ class VCL_DLLPUBLIC MetaMaskScalePartAction : public MetaAction
 {
 private:
 
-    Bitmap              maBmp;
-    Color               maColor;
-    Point               maDstPt;
-    Size                maDstSz;
-    Point               maSrcPt;
-    Size                maSrcSz;
+    Bitmap				maBmp;
+    Color				maColor;
+    Point				maDstPt;
+    Size				maDstSz;
+    Point				maSrcPt;
+    Size				maSrcSz;
 
-    virtual sal_Bool    Compare( const MetaAction& ) const;
+    virtual	sal_Bool	Compare( const MetaAction& ) const;
 
 public:
                         DECL_META_ACTION( MaskScalePart, META_MASKSCALEPART_ACTION )
@@ -907,15 +907,15 @@ public:
                                                  const Bitmap& rBmp,
                                                  const Color& rColor );
 
-    virtual void        Move( long nHorzMove, long nVertMove );
-    virtual void        Scale( double fScaleX, double fScaleY );
+    virtual void		Move( long nHorzMove, long nVertMove );
+    virtual void		Scale( double fScaleX, double fScaleY );
 
-    const Bitmap&       GetBitmap() const { return maBmp; }
-    const Color&        GetColor() const { return maColor; }
-    const Point&        GetDestPoint() const { return maDstPt; }
-    const Size&         GetDestSize() const { return maDstSz; }
-    const Point&        GetSrcPoint() const { return maSrcPt; }
-    const Size&         GetSrcSize() const { return maSrcSz; }
+    const Bitmap&		GetBitmap() const { return maBmp; }
+    const Color&		GetColor() const { return maColor; }
+    const Point&		GetDestPoint() const { return maDstPt; }
+    const Size& 		GetDestSize() const { return maDstSz; }
+    const Point&		GetSrcPoint() const { return maSrcPt; }
+    const Size& 		GetSrcSize() const { return maSrcSz; }
 };
 
 // ----------------------
@@ -926,21 +926,21 @@ class VCL_DLLPUBLIC MetaGradientAction : public MetaAction
 {
 private:
 
-    Rectangle           maRect;
-    Gradient            maGradient;
+    Rectangle			maRect;
+    Gradient			maGradient;
 
-    virtual sal_Bool    Compare( const MetaAction& ) const;
+    virtual	sal_Bool	Compare( const MetaAction& ) const;
 
 public:
                         DECL_META_ACTION( Gradient, META_GRADIENT_ACTION )
 
                         MetaGradientAction( const Rectangle& rRect, const Gradient& rGradient );
 
-    virtual void        Move( long nHorzMove, long nVertMove );
-    virtual void        Scale( double fScaleX, double fScaleY );
+    virtual void		Move( long nHorzMove, long nVertMove );
+    virtual void		Scale( double fScaleX, double fScaleY );
 
-    const Rectangle&    GetRect() const { return maRect; }
-    const Gradient&     GetGradient() const { return maGradient; }
+    const Rectangle&	GetRect() const { return maRect; }
+    const Gradient& 	GetGradient() const { return maGradient; }
 };
 
 // ------------------------
@@ -951,21 +951,21 @@ class VCL_DLLPUBLIC MetaGradientExAction : public MetaAction
 {
 private:
 
-    PolyPolygon         maPolyPoly;
-    Gradient            maGradient;
+    PolyPolygon 		maPolyPoly;
+    Gradient			maGradient;
 
-    virtual sal_Bool    Compare( const MetaAction& ) const;
+    virtual	sal_Bool	Compare( const MetaAction& ) const;
 
 public:
                         DECL_META_ACTION( GradientEx, META_GRADIENTEX_ACTION )
 
                         MetaGradientExAction( const PolyPolygon& rPolyPoly, const Gradient& rGradient );
 
-    virtual void        Move( long nHorzMove, long nVertMove );
-    virtual void        Scale( double fScaleX, double fScaleY );
+    virtual void		Move( long nHorzMove, long nVertMove );
+    virtual void		Scale( double fScaleX, double fScaleY );
 
-    const PolyPolygon&  GetPolyPolygon() const { return maPolyPoly; }
-    const Gradient&     GetGradient() const { return maGradient; }
+    const PolyPolygon&	GetPolyPolygon() const { return maPolyPoly; }
+    const Gradient& 	GetGradient() const { return maGradient; }
 };
 
 // -------------------
@@ -976,21 +976,21 @@ class VCL_DLLPUBLIC MetaHatchAction : public MetaAction
 {
 private:
 
-    PolyPolygon         maPolyPoly;
-    Hatch               maHatch;
+    PolyPolygon 		maPolyPoly;
+    Hatch				maHatch;
 
-    virtual sal_Bool    Compare( const MetaAction& ) const;
+    virtual	sal_Bool	Compare( const MetaAction& ) const;
 
 public:
                         DECL_META_ACTION( Hatch, META_HATCH_ACTION )
 
                         MetaHatchAction( const PolyPolygon& rPolyPoly, const Hatch& rHatch );
 
-    virtual void        Move( long nHorzMove, long nVertMove );
-    virtual void        Scale( double fScaleX, double fScaleY );
+    virtual void		Move( long nHorzMove, long nVertMove );
+    virtual void		Scale( double fScaleX, double fScaleY );
 
-    const PolyPolygon&  GetPolyPolygon() const { return maPolyPoly; }
-    const Hatch&        GetHatch() const { return maHatch; }
+    const PolyPolygon&	GetPolyPolygon() const { return maPolyPoly; }
+    const Hatch&		GetHatch() const { return maHatch; }
 };
 
 // -----------------------
@@ -1001,10 +1001,10 @@ class VCL_DLLPUBLIC MetaWallpaperAction : public MetaAction
 {
 private:
 
-    Rectangle           maRect;
-    Wallpaper           maWallpaper;
+    Rectangle			maRect;
+    Wallpaper			maWallpaper;
 
-    virtual sal_Bool    Compare( const MetaAction& ) const;
+    virtual	sal_Bool	Compare( const MetaAction& ) const;
 
 public:
                         DECL_META_ACTION( Wallpaper, META_WALLPAPER_ACTION )
@@ -1012,11 +1012,11 @@ public:
                         MetaWallpaperAction( const Rectangle& rRect,
                                              const Wallpaper& rPaper );
 
-    virtual void        Move( long nHorzMove, long nVertMove );
-    virtual void        Scale( double fScaleX, double fScaleY );
+    virtual void		Move( long nHorzMove, long nVertMove );
+    virtual void		Scale( double fScaleX, double fScaleY );
 
-    const Rectangle&    GetRect() const { return maRect; }
-    const Wallpaper&    GetWallpaper() const { return maWallpaper; }
+    const Rectangle&	GetRect() const { return maRect; }
+    const Wallpaper&	GetWallpaper() const { return maWallpaper; }
 };
 
 // ------------------------
@@ -1027,21 +1027,21 @@ class VCL_DLLPUBLIC MetaClipRegionAction : public MetaAction
 {
 private:
 
-    Region              maRegion;
-    BOOL                mbClip;
+    Region				maRegion;
+    BOOL				mbClip;
 
-    virtual sal_Bool    Compare( const MetaAction& ) const;
+    virtual	sal_Bool	Compare( const MetaAction& ) const;
 
 public:
                         DECL_META_ACTION( ClipRegion, META_CLIPREGION_ACTION )
 
                         MetaClipRegionAction( const Region& rRegion, BOOL bClip );
 
-    virtual void        Move( long nHorzMove, long nVertMove );
-    virtual void        Scale( double fScaleX, double fScaleY );
+    virtual void		Move( long nHorzMove, long nVertMove );
+    virtual void		Scale( double fScaleX, double fScaleY );
 
-    const Region&       GetRegion() const { return maRegion; }
-    BOOL                IsClipping() const { return mbClip; }
+    const Region&		GetRegion() const { return maRegion; }
+    BOOL				IsClipping() const { return mbClip; }
 };
 
 // ---------------------------------
@@ -1052,19 +1052,19 @@ class VCL_DLLPUBLIC MetaISectRectClipRegionAction : public MetaAction
 {
 private:
 
-    Rectangle           maRect;
+    Rectangle			maRect;
 
-    virtual sal_Bool    Compare( const MetaAction& ) const;
+    virtual	sal_Bool	Compare( const MetaAction& ) const;
 
 public:
                         DECL_META_ACTION( ISectRectClipRegion, META_ISECTRECTCLIPREGION_ACTION )
 
                         MetaISectRectClipRegionAction( const Rectangle& rRect );
 
-    virtual void        Move( long nHorzMove, long nVertMove );
-    virtual void        Scale( double fScaleX, double fScaleY );
+    virtual void		Move( long nHorzMove, long nVertMove );
+    virtual void		Scale( double fScaleX, double fScaleY );
 
-    const Rectangle&    GetRect() const { return maRect; }
+    const Rectangle&	GetRect() const { return maRect; }
 };
 
 // -----------------------------------
@@ -1075,19 +1075,19 @@ class VCL_DLLPUBLIC MetaISectRegionClipRegionAction : public MetaAction
 {
 private:
 
-    Region              maRegion;
+    Region				maRegion;
 
-    virtual sal_Bool    Compare( const MetaAction& ) const;
+    virtual	sal_Bool	Compare( const MetaAction& ) const;
 
 public:
                         DECL_META_ACTION( ISectRegionClipRegion, META_ISECTREGIONCLIPREGION_ACTION )
 
                         MetaISectRegionClipRegionAction( const Region& rRegion );
 
-    virtual void        Move( long nHorzMove, long nVertMove );
-    virtual void        Scale( double fScaleX, double fScaleY );
+    virtual void		Move( long nHorzMove, long nVertMove );
+    virtual void		Scale( double fScaleX, double fScaleY );
 
-    const Region&       GetRegion() const { return maRegion; }
+    const Region&		GetRegion() const { return maRegion; }
 };
 
 // ----------------------------
@@ -1098,20 +1098,20 @@ class VCL_DLLPUBLIC MetaMoveClipRegionAction : public MetaAction
 {
 private:
 
-    long                mnHorzMove;
-    long                mnVertMove;
+    long				mnHorzMove;
+    long				mnVertMove;
 
-    virtual sal_Bool    Compare( const MetaAction& ) const;
+    virtual	sal_Bool	Compare( const MetaAction& ) const;
 
 public:
                         DECL_META_ACTION( MoveClipRegion, META_MOVECLIPREGION_ACTION )
 
                         MetaMoveClipRegionAction( long nHorzMove, long nVertMove );
 
-    virtual void        Scale( double fScaleX, double fScaleY );
+    virtual void		Scale( double fScaleX, double fScaleY );
 
-    long                GetHorzMove() const { return mnHorzMove; }
-    long                GetVertMove() const { return mnVertMove; }
+    long				GetHorzMove() const { return mnHorzMove; }
+    long				GetVertMove() const { return mnVertMove; }
 };
 
 // -----------------------
@@ -1122,18 +1122,18 @@ class VCL_DLLPUBLIC MetaLineColorAction : public MetaAction
 {
 private:
 
-    Color               maColor;
-    BOOL                mbSet;
+    Color				maColor;
+    BOOL				mbSet;
 
-    virtual sal_Bool    Compare( const MetaAction& ) const;
+    virtual	sal_Bool	Compare( const MetaAction& ) const;
 
 public:
                         DECL_META_ACTION( LineColor, META_LINECOLOR_ACTION )
 
                         MetaLineColorAction( const Color& rColor, BOOL bSet );
 
-    const Color&        GetColor() const { return maColor; }
-    BOOL                IsSetting() const { return mbSet; }
+    const Color&		GetColor() const { return maColor; }
+    BOOL				IsSetting() const { return mbSet; }
 };
 
 // -----------------------
@@ -1144,18 +1144,18 @@ class VCL_DLLPUBLIC MetaFillColorAction : public MetaAction
 {
 private:
 
-    Color               maColor;
-    BOOL                mbSet;
+    Color				maColor;
+    BOOL				mbSet;
 
-    virtual sal_Bool    Compare( const MetaAction& ) const;
+    virtual	sal_Bool	Compare( const MetaAction& ) const;
 
 public:
                         DECL_META_ACTION( FillColor, META_FILLCOLOR_ACTION )
 
                         MetaFillColorAction( const Color& rColor, BOOL bSet );
 
-    const Color&        GetColor() const { return maColor; }
-    BOOL                IsSetting() const { return mbSet; }
+    const Color&		GetColor() const { return maColor; }
+    BOOL				IsSetting() const { return mbSet; }
 };
 
 // -----------------------
@@ -1166,16 +1166,16 @@ class VCL_DLLPUBLIC MetaTextColorAction : public MetaAction
 {
 private:
 
-    Color               maColor;
+    Color				maColor;
 
-    virtual sal_Bool    Compare( const MetaAction& ) const;
+    virtual	sal_Bool	Compare( const MetaAction& ) const;
 
 public:
                         DECL_META_ACTION( TextColor, META_TEXTCOLOR_ACTION )
 
                         MetaTextColorAction( const Color& rColor );
 
-    const Color&        GetColor() const { return maColor; }
+    const Color&		GetColor() const { return maColor; }
 };
 
 // ---------------------------
@@ -1186,18 +1186,18 @@ class VCL_DLLPUBLIC MetaTextFillColorAction : public MetaAction
 {
 private:
 
-    Color               maColor;
-    BOOL                mbSet;
+    Color				maColor;
+    BOOL				mbSet;
 
-    virtual sal_Bool    Compare( const MetaAction& ) const;
+    virtual	sal_Bool	Compare( const MetaAction& ) const;
 
 public:
                         DECL_META_ACTION( TextFillColor, META_TEXTFILLCOLOR_ACTION )
 
                         MetaTextFillColorAction( const Color& rColor, BOOL bSet );
 
-    const Color&        GetColor() const { return maColor; }
-    BOOL                IsSetting() const { return mbSet; }
+    const Color&		GetColor() const { return maColor; }
+    BOOL				IsSetting() const { return mbSet; }
 };
 
 // ---------------------------
@@ -1208,18 +1208,18 @@ class VCL_DLLPUBLIC MetaTextLineColorAction : public MetaAction
 {
 private:
 
-    Color               maColor;
-    BOOL                mbSet;
+    Color				maColor;
+    BOOL				mbSet;
 
-    virtual sal_Bool    Compare( const MetaAction& ) const;
+    virtual	sal_Bool	Compare( const MetaAction& ) const;
 
 public:
                         DECL_META_ACTION( TextLineColor, META_TEXTLINECOLOR_ACTION )
 
                         MetaTextLineColorAction( const Color& rColor, BOOL bSet );
 
-    const Color&        GetColor() const { return maColor; }
-    BOOL                IsSetting() const { return mbSet; }
+    const Color&		GetColor() const { return maColor; }
+    BOOL				IsSetting() const { return mbSet; }
 };
 
 // ---------------------------
@@ -1230,18 +1230,18 @@ class VCL_DLLPUBLIC MetaOverlineColorAction : public MetaAction
 {
 private:
 
-    Color               maColor;
-    BOOL                mbSet;
+    Color				maColor;
+    BOOL				mbSet;
 
-    virtual sal_Bool    Compare( const MetaAction& ) const;
+    virtual	sal_Bool	Compare( const MetaAction& ) const;
 
 public:
                         DECL_META_ACTION( OverlineColor, META_OVERLINECOLOR_ACTION )
 
                         MetaOverlineColorAction( const Color& rColor, BOOL bSet );
 
-    const Color&        GetColor() const { return maColor; }
-    BOOL                IsSetting() const { return mbSet; }
+    const Color&		GetColor() const { return maColor; }
+    BOOL				IsSetting() const { return mbSet; }
 };
 
 // -----------------------
@@ -1252,16 +1252,16 @@ class VCL_DLLPUBLIC MetaTextAlignAction : public MetaAction
 {
 private:
 
-    TextAlign           maAlign;
+    TextAlign			maAlign;
 
-    virtual sal_Bool    Compare( const MetaAction& ) const;
+    virtual	sal_Bool	Compare( const MetaAction& ) const;
 
 public:
                         DECL_META_ACTION( TextAlign, META_TEXTALIGN_ACTION )
 
                         MetaTextAlignAction( TextAlign aAlign );
 
-    TextAlign           GetTextAlign() const { return maAlign; }
+    TextAlign			GetTextAlign() const { return maAlign; }
 };
 
 // ---------------------
@@ -1272,18 +1272,18 @@ class VCL_DLLPUBLIC MetaMapModeAction : public MetaAction
 {
 private:
 
-    MapMode             maMapMode;
+    MapMode 			maMapMode;
 
-    virtual sal_Bool    Compare( const MetaAction& ) const;
+    virtual	sal_Bool	Compare( const MetaAction& ) const;
 
 public:
                         DECL_META_ACTION( MapMode, META_MAPMODE_ACTION )
 
                         MetaMapModeAction( const MapMode& rMapMode );
 
-    virtual void        Scale( double fScaleX, double fScaleY );
+    virtual void		Scale( double fScaleX, double fScaleY );
 
-    const MapMode&      GetMapMode() const { return maMapMode; }
+    const MapMode&		GetMapMode() const { return maMapMode; }
 };
 
 // ---------------------
@@ -1294,18 +1294,18 @@ class VCL_DLLPUBLIC MetaFontAction : public MetaAction
 {
 private:
 
-    Font                maFont;
+    Font				maFont;
 
-    virtual sal_Bool    Compare( const MetaAction& ) const;
+    virtual	sal_Bool	Compare( const MetaAction& ) const;
 
 public:
                         DECL_META_ACTION( Font, META_FONT_ACTION )
 
                         MetaFontAction( const Font& rFont );
 
-    virtual void        Scale( double fScaleX, double fScaleY );
+    virtual void		Scale( double fScaleX, double fScaleY );
 
-    const Font&         GetFont() const { return maFont; }
+    const Font& 		GetFont() const { return maFont; }
 };
 
 // ------------------
@@ -1316,16 +1316,16 @@ class VCL_DLLPUBLIC MetaPushAction : public MetaAction
 {
 private:
 
-    USHORT              mnFlags;
+    USHORT				mnFlags;
 
-    virtual sal_Bool    Compare( const MetaAction& ) const;
+    virtual	sal_Bool	Compare( const MetaAction& ) const;
 
 public:
                         DECL_META_ACTION( Push, META_PUSH_ACTION )
 
                         MetaPushAction( USHORT nFlags );
 
-    USHORT              GetFlags() const { return mnFlags; }
+    USHORT				GetFlags() const { return mnFlags; }
 };
 
 // -----------------
@@ -1347,16 +1347,16 @@ class VCL_DLLPUBLIC MetaRasterOpAction : public MetaAction
 {
 private:
 
-    RasterOp            meRasterOp;
+    RasterOp			meRasterOp;
 
-    virtual sal_Bool    Compare( const MetaAction& ) const;
+    virtual	sal_Bool	Compare( const MetaAction& ) const;
 
 public:
                         DECL_META_ACTION( RasterOp, META_RASTEROP_ACTION )
 
                         MetaRasterOpAction( RasterOp eRasterOp );
 
-    RasterOp            GetRasterOp() const { return meRasterOp; }
+    RasterOp			GetRasterOp() const { return meRasterOp; }
 };
 
 // -------------------------
@@ -1367,21 +1367,21 @@ class VCL_DLLPUBLIC MetaTransparentAction : public MetaAction
 {
 private:
 
-    PolyPolygon         maPolyPoly;
-    USHORT              mnTransPercent;
+    PolyPolygon 		maPolyPoly;
+    USHORT				mnTransPercent;
 
-    virtual sal_Bool    Compare( const MetaAction& ) const;
+    virtual	sal_Bool	Compare( const MetaAction& ) const;
 
 public:
                         DECL_META_ACTION( Transparent, META_TRANSPARENT_ACTION )
 
                         MetaTransparentAction( const PolyPolygon& rPolyPoly, USHORT nTransPercent );
 
-    virtual void        Move( long nHorzMove, long nVertMove );
-    virtual void        Scale( double fScaleX, double fScaleY );
+    virtual void		Move( long nHorzMove, long nVertMove );
+    virtual void		Scale( double fScaleX, double fScaleY );
 
-    const PolyPolygon&  GetPolyPolygon() const { return maPolyPoly; }
-    USHORT              GetTransparence() const { return mnTransPercent; }
+    const PolyPolygon&	GetPolyPolygon() const { return maPolyPoly; }
+    USHORT				GetTransparence() const { return mnTransPercent; }
 };
 
 // ------------------------------
@@ -1392,12 +1392,12 @@ class VCL_DLLPUBLIC MetaFloatTransparentAction : public MetaAction
 {
 private:
 
-    GDIMetaFile         maMtf;
-    Point               maPoint;
-    Size                maSize;
-    Gradient            maGradient;
+    GDIMetaFile 		maMtf;
+    Point				maPoint;
+    Size				maSize;
+    Gradient			maGradient;
 
-    virtual sal_Bool    Compare( const MetaAction& ) const;
+    virtual	sal_Bool	Compare( const MetaAction& ) const;
 
 public:
                         DECL_META_ACTION( FloatTransparent, META_FLOATTRANSPARENT_ACTION )
@@ -1405,13 +1405,13 @@ public:
                         MetaFloatTransparentAction( const GDIMetaFile& rMtf, const Point& rPos,
                                                     const Size& rSize, const Gradient& rGradient );
 
-    virtual void        Move( long nHorzMove, long nVertMove );
-    virtual void        Scale( double fScaleX, double fScaleY );
+    virtual void		Move( long nHorzMove, long nVertMove );
+    virtual void		Scale( double fScaleX, double fScaleY );
 
-    const GDIMetaFile&  GetGDIMetaFile() const { return maMtf; }
-    const Point&        GetPoint() const { return maPoint; }
-    const Size&         GetSize() const { return maSize; }
-    const Gradient&     GetGradient() const { return maGradient; }
+    const GDIMetaFile&	GetGDIMetaFile() const { return maMtf; }
+    const Point&		GetPoint() const { return maPoint; }
+    const Size& 		GetSize() const { return maSize; }
+    const Gradient& 	GetGradient() const { return maGradient; }
 };
 
 // ---------------------
@@ -1422,12 +1422,12 @@ class VCL_DLLPUBLIC MetaEPSAction : public MetaAction
 {
 private:
 
-    GfxLink             maGfxLink;
-    GDIMetaFile         maSubst;
-    Point               maPoint;
-    Size                maSize;
+    GfxLink 			maGfxLink;
+    GDIMetaFile 		maSubst;
+    Point				maPoint;
+    Size				maSize;
 
-    virtual sal_Bool    Compare( const MetaAction& ) const;
+    virtual	sal_Bool	Compare( const MetaAction& ) const;
 
 public:
                         DECL_META_ACTION( EPS, META_EPS_ACTION )
@@ -1435,13 +1435,13 @@ public:
                         MetaEPSAction( const Point& rPoint, const Size& rSize,
                                        const GfxLink& rGfxLink, const GDIMetaFile& rSubst );
 
-    virtual void        Move( long nHorzMove, long nVertMove );
-    virtual void        Scale( double fScaleX, double fScaleY );
+    virtual void		Move( long nHorzMove, long nVertMove );
+    virtual void		Scale( double fScaleX, double fScaleY );
 
-    const GfxLink&      GetLink() const { return maGfxLink; }
-    const GDIMetaFile&  GetSubstitute() const { return maSubst; }
-    const Point&        GetPoint() const { return maPoint; }
-    const Size&         GetSize() const { return maSize; }
+    const GfxLink&		GetLink() const { return maGfxLink; }
+    const GDIMetaFile&	GetSubstitute() const { return maSubst; }
+    const Point&		GetPoint() const { return maPoint; }
+    const Size& 		GetSize() const { return maSize; }
 };
 
 // ----------------------
@@ -1452,18 +1452,18 @@ class VCL_DLLPUBLIC MetaRefPointAction : public MetaAction
 {
 private:
 
-    Point               maRefPoint;
-    BOOL                mbSet;
+    Point				maRefPoint;
+    BOOL				mbSet;
 
-    virtual sal_Bool    Compare( const MetaAction& ) const;
+    virtual	sal_Bool	Compare( const MetaAction& ) const;
 
 public:
                         DECL_META_ACTION( RefPoint, META_REFPOINT_ACTION )
 
                         MetaRefPointAction( const Point& rRefPoint, BOOL bSet );
 
-    const Point&        GetRefPoint() const { return maRefPoint; }
-    BOOL                IsSetting() const { return mbSet; }
+    const Point&		GetRefPoint() const { return maRefPoint; }
+    BOOL				IsSetting() const { return mbSet; }
 };
 
 // ---------------------
@@ -1474,13 +1474,13 @@ class VCL_DLLPUBLIC MetaCommentAction : public MetaAction
 {
 private:
 
-    ByteString          maComment;
-    sal_Int32           mnValue;
-    sal_uInt32          mnDataSize;
-    BYTE*               mpData;
+    ByteString			maComment;
+    sal_Int32			mnValue;
+    sal_uInt32			mnDataSize;
+    BYTE*				mpData;
 
-    SAL_DLLPRIVATE void ImplInitDynamicData( const BYTE* pData, sal_uInt32 nDataSize );
-    virtual sal_Bool    Compare( const MetaAction& ) const;
+    SAL_DLLPRIVATE void	ImplInitDynamicData( const BYTE* pData, sal_uInt32 nDataSize );
+    virtual	sal_Bool	Compare( const MetaAction& ) const;
 
 protected:
                         ~MetaCommentAction();
@@ -1491,18 +1491,18 @@ public:
                         MetaCommentAction( const ByteString& rComment, sal_Int32 nValue = 0L, const BYTE* pData = NULL, sal_uInt32 nDataSize = 0UL );
                         MetaCommentAction( const BYTE* pData, sal_uInt32 nDataSize );
 
-    virtual void        Move( long nHorzMove, long nVertMove );
-    virtual void        Scale( double fScaleX, double fScaleY );
+    virtual void		Move( long nHorzMove, long nVertMove );
+    virtual void		Scale( double fScaleX, double fScaleY );
 
-    virtual void        Execute( OutputDevice* pOut );
+    virtual void		Execute( OutputDevice* pOut );
     virtual MetaAction* Clone();
-    virtual void        Write( SvStream& rOStm, ImplMetaWriteData* pData );
-    virtual void        Read( SvStream& rIStm, ImplMetaReadData* pData );
+    virtual void		Write( SvStream& rOStm, ImplMetaWriteData* pData );
+    virtual void		Read( SvStream& rIStm, ImplMetaReadData* pData );
 
-    const ByteString&   GetComment() const { return maComment; }
-    sal_Int32           GetValue() const { return mnValue; }
-    sal_uInt32          GetDataSize() const { return mnDataSize; }
-    const BYTE*         GetData() const { return mpData; }
+    const ByteString&	GetComment() const { return maComment; }
+    sal_Int32			GetValue() const { return mnValue; }
+    sal_uInt32			GetDataSize() const { return mnDataSize; }
+    const BYTE* 		GetData() const { return mpData; }
 };
 
 // ------------------------
@@ -1513,15 +1513,15 @@ class VCL_DLLPUBLIC MetaLayoutModeAction : public MetaAction
 {
 private:
 
-    sal_uInt32          mnLayoutMode;
-    virtual sal_Bool    Compare( const MetaAction& ) const;
+    sal_uInt32 			mnLayoutMode;
+    virtual	sal_Bool	Compare( const MetaAction& ) const;
 
 public:
                         DECL_META_ACTION( LayoutMode, META_LAYOUTMODE_ACTION )
 
                         MetaLayoutModeAction( sal_uInt32 nLayoutMode );
 
-    sal_uInt32          GetLayoutMode() const { return mnLayoutMode; }
+    sal_uInt32			GetLayoutMode() const { return mnLayoutMode; }
 };
 
 // ------------------------
@@ -1532,15 +1532,15 @@ class VCL_DLLPUBLIC MetaTextLanguageAction : public MetaAction
 {
 private:
 
-    LanguageType        meTextLanguage;
-    virtual sal_Bool    Compare( const MetaAction& ) const;
+    LanguageType		meTextLanguage;
+    virtual	sal_Bool	Compare( const MetaAction& ) const;
 
 public:
                         DECL_META_ACTION( TextLanguage, META_TEXTLANGUAGE_ACTION )
 
                         MetaTextLanguageAction( LanguageType );
 
-    LanguageType        GetTextLanguage() const { return meTextLanguage; }
+    LanguageType		GetTextLanguage() const { return meTextLanguage; }
 };
 
 #endif // _SV_METAACT_HXX
diff --git a/vcl/inc/vcl/metric.hxx b/vcl/inc/vcl/metric.hxx
index eae6b38c5f9d..fd1db46d4685 100644
--- a/vcl/inc/vcl/metric.hxx
+++ b/vcl/inc/vcl/metric.hxx
@@ -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
@@ -45,22 +45,22 @@ class VCL_DLLPUBLIC FontInfo : public Font
     friend class OutputDevice;
 
 protected:
-    ImplFontMetric*     mpImplMetric;    // Implementation
+    ImplFontMetric* 	mpImplMetric;	 // Implementation
 
 public:
                         FontInfo();
                         FontInfo( const FontInfo& );
                         ~FontInfo();
 
-    FontType            GetType() const;
-    BOOL                IsDeviceFont() const;
-    BOOL                SupportsLatin() const;
-    BOOL                SupportsCJK() const;
-    BOOL                SupportsCTL() const;
+    FontType			GetType() const;
+    BOOL				IsDeviceFont() const;
+    BOOL				SupportsLatin() const;
+    BOOL				SupportsCJK() const;
+    BOOL				SupportsCTL() const;
 
-    FontInfo&           operator=( const FontInfo& );
-    BOOL                operator==( const FontInfo& ) const;
-    BOOL                operator!=( const FontInfo& rInfo ) const
+    FontInfo&			operator=( const FontInfo& );
+    BOOL				operator==( const FontInfo& ) const;
+    BOOL				operator!=( const FontInfo& rInfo ) const
                             { return !operator==( rInfo ); }
 };
 
@@ -75,16 +75,16 @@ public:
                         FontMetric( const FontMetric& );
                         ~FontMetric() {}
 
-    long                GetAscent() const;
-    long                GetDescent() const;
-    long                GetIntLeading() const;
-    long                GetExtLeading() const;
-    long                GetLineHeight() const;
-    long                GetSlant() const;
+    long				GetAscent() const;
+    long				GetDescent() const;
+    long				GetIntLeading() const;
+    long				GetExtLeading() const;
+    long				GetLineHeight() const;
+    long				GetSlant() const;
 
-    FontMetric&         operator=( const FontMetric& rMetric );
-    BOOL                operator==( const FontMetric& rMetric ) const;
-    BOOL                operator!=( const FontMetric& rMetric ) const
+    FontMetric& 		operator=( const FontMetric& rMetric );
+    BOOL				operator==( const FontMetric& rMetric ) const;
+    BOOL				operator!=( const FontMetric& rMetric ) const
                             { return !operator==( rMetric ); }
 };
 
@@ -134,30 +134,30 @@ class VCL_DLLPUBLIC TextRectInfo
     friend class OutputDevice;
 
 private:
-    long            mnMaxWidth;
-    USHORT          mnLineCount;
-    BOOL            mbEllipsis;
+    long			mnMaxWidth;
+    USHORT			mnLineCount;
+    BOOL			mbEllipsis;
 
 public:
                     TextRectInfo();
 
-    USHORT          GetLineCount() const { return mnLineCount; }
-    long            GetMaxLineWidth() const { return mnMaxWidth; }
-    BOOL            IsEllipses() const { return mbEllipsis; }
+    USHORT			GetLineCount() const { return mnLineCount; }
+    long			GetMaxLineWidth() const { return mnMaxWidth; }
+    BOOL			IsEllipses() const { return mbEllipsis; }
 
-    BOOL            operator ==( const TextRectInfo& rInfo ) const
-                        { return ((mnMaxWidth   == rInfo.mnMaxWidth)    &&
-                                  (mnLineCount  == rInfo.mnLineCount)   &&
-                                  (mbEllipsis   == rInfo.mbEllipsis)); }
-    BOOL            operator !=( const TextRectInfo& rInfo ) const
+    BOOL			operator ==( const TextRectInfo& rInfo ) const
+                        { return ((mnMaxWidth	== rInfo.mnMaxWidth)	&&
+                                  (mnLineCount	== rInfo.mnLineCount)	&&
+                                  (mbEllipsis	== rInfo.mbEllipsis)); }
+    BOOL			operator !=( const TextRectInfo& rInfo ) const
                         { return !(TextRectInfo::operator==( rInfo )); }
 };
 
 inline TextRectInfo::TextRectInfo()
 {
-    mnMaxWidth      = 0;
-    mnLineCount     = 0;
-    mbEllipsis      = FALSE;
+    mnMaxWidth		= 0;
+    mnLineCount 	= 0;
+    mbEllipsis		= FALSE;
 }
 
 #endif // _SV_METRIC_HXX
diff --git a/vcl/inc/vcl/mnemonic.hxx b/vcl/inc/vcl/mnemonic.hxx
index 804b261b79b4..1df4e01dbe4b 100644
--- a/vcl/inc/vcl/mnemonic.hxx
+++ b/vcl/inc/vcl/mnemonic.hxx
@@ -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
@@ -39,25 +39,25 @@
 
 // Mnemonic Chars, which we want support
 // Latin 0-9
-#define MNEMONIC_RANGE_1_START      0x30
-#define MNEMONIC_RANGE_1_END        0x39
+#define MNEMONIC_RANGE_1_START		0x30
+#define MNEMONIC_RANGE_1_END		0x39
 // Latin A-Z
-#define MNEMONIC_RANGE_2_START      0x41
-#define MNEMONIC_RANGE_2_END        0x5A
+#define MNEMONIC_RANGE_2_START		0x41
+#define MNEMONIC_RANGE_2_END		0x5A
 // Cyrillic
-#define MNEMONIC_RANGE_3_START      0x0410
-#define MNEMONIC_RANGE_3_END        0x042F
+#define MNEMONIC_RANGE_3_START		0x0410
+#define MNEMONIC_RANGE_3_END		0x042F
 // Greek
-#define MNEMONIC_RANGE_4_START      0x0391
-#define MNEMONIC_RANGE_4_END        0x03AB
-#define MNEMONIC_RANGES             4
-#define MAX_MNEMONICS               ((MNEMONIC_RANGE_1_END-MNEMONIC_RANGE_1_START+1)+\
+#define MNEMONIC_RANGE_4_START		0x0391
+#define MNEMONIC_RANGE_4_END		0x03AB
+#define MNEMONIC_RANGES 			4
+#define MAX_MNEMONICS				((MNEMONIC_RANGE_1_END-MNEMONIC_RANGE_1_START+1)+\
                                      (MNEMONIC_RANGE_2_END-MNEMONIC_RANGE_2_START+1)+\
                                      (MNEMONIC_RANGE_3_END-MNEMONIC_RANGE_3_START+1)+\
                                      (MNEMONIC_RANGE_4_END-MNEMONIC_RANGE_4_START+1))
 
-#define MNEMONIC_CHAR               ((sal_Unicode)'~')
-#define MNEMONIC_INDEX_NOTFOUND     ((USHORT)0xFFFF)
+#define MNEMONIC_CHAR				((sal_Unicode)'~')
+#define MNEMONIC_INDEX_NOTFOUND 	((USHORT)0xFFFF)
 
 // -------------------------
 // - MnemonicGenerator -
@@ -67,18 +67,18 @@ class VCL_DLLPUBLIC MnemonicGenerator
 {
 private:
     // 0 == Mnemonic; >0 == count of characters
-    BYTE                maMnemonics[MAX_MNEMONICS];
+    BYTE				maMnemonics[MAX_MNEMONICS];
     ::com::sun::star::uno::Reference< ::com::sun::star::i18n::XCharacterClassification > mxCharClass;
 
 protected:
-    SAL_DLLPRIVATE USHORT       ImplGetMnemonicIndex( sal_Unicode c );
-    SAL_DLLPRIVATE sal_Unicode  ImplFindMnemonic( const XubString& rKey );
+    SAL_DLLPRIVATE USHORT		ImplGetMnemonicIndex( sal_Unicode c );
+    SAL_DLLPRIVATE sal_Unicode 	ImplFindMnemonic( const XubString& rKey );
 
 public:
                         MnemonicGenerator();
 
-    void                RegisterMnemonic( const XubString& rKey );
-    BOOL                CreateMnemonic( XubString& rKey );
+    void				RegisterMnemonic( const XubString& rKey );
+    BOOL				CreateMnemonic( XubString& rKey );
     ::com::sun::star::uno::Reference< ::com::sun::star::i18n::XCharacterClassification > GetCharClass();
 
     // returns a string where all '~'-characters and CJK mnemonics of the form (~A) are completely removed
diff --git a/vcl/inc/vcl/mnemonicengine.hxx b/vcl/inc/vcl/mnemonicengine.hxx
index d12b3db2417e..ce6bafb99eac 100644
--- a/vcl/inc/vcl/mnemonicengine.hxx
+++ b/vcl/inc/vcl/mnemonicengine.hxx
@@ -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
diff --git a/vcl/inc/vcl/morebtn.hxx b/vcl/inc/vcl/morebtn.hxx
index 687ef7c40a01..3b0f59366271 100644
--- a/vcl/inc/vcl/morebtn.hxx
+++ b/vcl/inc/vcl/morebtn.hxx
@@ -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
@@ -55,7 +55,7 @@ private:
 protected:
     using Window::ImplInit;
     SAL_DLLPRIVATE void ImplInit( Window* pParent, WinBits nStyle );
-    SAL_DLLPRIVATE void ImplLoadRes( const ResId& rResId );
+    SAL_DLLPRIVATE void	ImplLoadRes( const ResId& rResId );
 
 public:
                         MoreButton( Window* pParent, WinBits nStyle = 0 );
diff --git a/vcl/inc/vcl/msgbox.hxx b/vcl/inc/vcl/msgbox.hxx
index a6cd60a9d5e3..7474cb4072bd 100644
--- a/vcl/inc/vcl/msgbox.hxx
+++ b/vcl/inc/vcl/msgbox.hxx
@@ -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
@@ -44,20 +44,20 @@ class CheckBox;
 // Return-Werte von Execute
 //!!! bei Aenderungen \basic\source\runtime\methods.cxx msgbox anpassen
 
-#define RET_OK               TRUE
-#define RET_CANCEL           FALSE
-#define RET_YES              2
-#define RET_NO               3
-#define RET_RETRY            4
+#define RET_OK				 TRUE
+#define RET_CANCEL			 FALSE
+#define RET_YES 			 2
+#define RET_NO				 3
+#define RET_RETRY			 4
 #define RET_IGNORE           5
 
-#define BUTTONID_OK          RET_OK
-#define BUTTONID_CANCEL      RET_CANCEL
-#define BUTTONID_YES         RET_YES
-#define BUTTONID_NO          RET_NO
-#define BUTTONID_RETRY       RET_RETRY
+#define BUTTONID_OK 		 RET_OK
+#define BUTTONID_CANCEL 	 RET_CANCEL
+#define BUTTONID_YES		 RET_YES
+#define BUTTONID_NO 		 RET_NO
+#define BUTTONID_RETRY		 RET_RETRY
 #define BUTTONID_IGNORE      RET_IGNORE
-#define BUTTONID_HELP        10
+#define BUTTONID_HELP		 10
 
 // -----------
 // - MessBox -
@@ -66,24 +66,24 @@ class CheckBox;
 class VCL_DLLPUBLIC MessBox : public ButtonDialog
 {
 protected:
-    FixedText*          mpFixedText;
-    FixedImage*         mpFixedImage;
-    XubString           maMessText;
-    Image               maImage;
-    Image               maImageHC;
-    USHORT              mnSoundType;
-    BOOL                mbHelpBtn;
-    BOOL                mbSound;
+    FixedText*			mpFixedText;
+    FixedImage* 		mpFixedImage;
+    XubString			maMessText;
+    Image				maImage;
+    Image				maImageHC;
+    USHORT				mnSoundType;
+    BOOL				mbHelpBtn;
+    BOOL				mbSound;
     CheckBox*           mpCheckBox;
     XubString           maCheckBoxText;
     BOOL                mbCheck;
 
-    SAL_DLLPRIVATE void ImplInitMessBoxData();
-    SAL_DLLPRIVATE void ImplInitButtons();
-    SAL_DLLPRIVATE void ImplPosControls();
+    SAL_DLLPRIVATE void	ImplInitMessBoxData();
+    SAL_DLLPRIVATE void	ImplInitButtons();
+    SAL_DLLPRIVATE void	ImplPosControls();
 
 protected:
-    SAL_DLLPRIVATE void ImplLoadRes( const ResId& rResId );
+    SAL_DLLPRIVATE void	ImplLoadRes( const ResId& rResId );
                         MessBox( WindowType nType );
 
 public:
@@ -92,13 +92,13 @@ public:
                         MessBox( Window* pParent, const ResId& rResId );
                         ~MessBox();
 
-    virtual void        StateChanged( StateChangedType nStateChange );
+    virtual void		StateChanged( StateChangedType nStateChange );
 
-    void                SetMessText( const XubString& rText ) { maMessText = rText; }
-    const XubString&    GetMessText() const { return maMessText; }
+    void				SetMessText( const XubString& rText ) { maMessText = rText; }
+    const XubString& 	GetMessText() const { return maMessText; }
 
-    void                SetImage( const Image& rImage ) { maImage = rImage; }
-    const Image&        GetImage() const { return maImage; }
+    void				SetImage( const Image& rImage ) { maImage = rImage; }
+    const Image&		GetImage() const { return maImage; }
 
     BOOL                SetModeImage( const Image& rImage, BmpColorMode eMode = BMP_COLOR_NORMAL );
     const Image&        GetModeImage( BmpColorMode eMode = BMP_COLOR_NORMAL ) const;
@@ -119,14 +119,14 @@ public:
 class VCL_DLLPUBLIC InfoBox : public MessBox
 {
 private:
-    SAL_DLLPRIVATE void ImplInitInfoBoxData();
+    SAL_DLLPRIVATE void	ImplInitInfoBoxData();
 
 public:
                         InfoBox( Window* pParent, const XubString& rMessage );
                         InfoBox( Window* pParent, const ResId & rResId );
 
-    static Image        GetStandardImage();
-    static Image        GetStandardImageHC();
+    static Image		GetStandardImage();
+    static Image		GetStandardImageHC();
 };
 
 // --------------
@@ -136,7 +136,7 @@ public:
 class VCL_DLLPUBLIC WarningBox : public MessBox
 {
 private:
-    SAL_DLLPRIVATE void ImplInitWarningBoxData();
+    SAL_DLLPRIVATE void	ImplInitWarningBoxData();
 
 public:
                         WarningBox( Window* pParent, WinBits nStyle,
@@ -145,8 +145,8 @@ public:
 
     void                SetDefaultCheckBoxText();
 
-    static Image        GetStandardImage();
-    static Image        GetStandardImageHC();
+    static Image		GetStandardImage();
+    static Image		GetStandardImageHC();
 };
 
 // ------------
@@ -156,15 +156,15 @@ public:
 class VCL_DLLPUBLIC ErrorBox : public MessBox
 {
 private:
-    SAL_DLLPRIVATE void ImplInitErrorBoxData();
+    SAL_DLLPRIVATE void	ImplInitErrorBoxData();
 
 public:
                         ErrorBox( Window* pParent, WinBits nStyle,
                                   const XubString& rMessage );
                         ErrorBox( Window* pParent, const ResId& rResId );
 
-    static Image        GetStandardImage();
-    static Image        GetStandardImageHC();
+    static Image		GetStandardImage();
+    static Image		GetStandardImageHC();
 };
 
 // ------------
@@ -174,7 +174,7 @@ public:
 class VCL_DLLPUBLIC QueryBox : public MessBox
 {
 private:
-    SAL_DLLPRIVATE void ImplInitQueryBoxData();
+    SAL_DLLPRIVATE void	ImplInitQueryBoxData();
 
 public:
                         QueryBox( Window* pParent, WinBits nStyle,
@@ -183,8 +183,8 @@ public:
 
     void                SetDefaultCheckBoxText();
 
-    static Image        GetStandardImage();
-    static Image        GetStandardImageHC();
+    static Image		GetStandardImage();
+    static Image		GetStandardImageHC();
 };
 
-#endif  // _SV_MSGBOX_HXX
+#endif	// _SV_MSGBOX_HXX
diff --git a/vcl/inc/vcl/octree.hxx b/vcl/inc/vcl/octree.hxx
index a7ce5e49c31d..916d2d3860da 100644
--- a/vcl/inc/vcl/octree.hxx
+++ b/vcl/inc/vcl/octree.hxx
@@ -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
@@ -35,8 +35,8 @@
 // - Defines -
 // -----------
 
-#define OCTREE_BITS     5
-#define OCTREE_BITS_1   10
+#define OCTREE_BITS		5
+#define OCTREE_BITS_1	10
 
 // --------------
 // - OctreeNode -
@@ -44,19 +44,19 @@
 
 typedef struct OctreeNode
 {
-    ULONG       nCount;
-    ULONG       nRed;
-    ULONG       nGreen;
-    ULONG       nBlue;
+    ULONG		nCount;
+    ULONG		nRed;
+    ULONG		nGreen;
+    ULONG		nBlue;
     OctreeNode* pChild[ 8 ];
-    OctreeNode* pNext;
-    OctreeNode* pNextInCache;
-    USHORT      nPalIndex;
-    BOOL        bLeaf;
+    OctreeNode*	pNext;
+    OctreeNode*	pNextInCache;
+    USHORT		nPalIndex;
+    BOOL		bLeaf;
 } NODE;
 
-typedef NODE*       PNODE;
-typedef PNODE*      PPNODE;
+typedef NODE*		PNODE;
+typedef PNODE*		PPNODE;
 
 // ----------
 // - Octree -
@@ -69,37 +69,37 @@ class VCL_DLLPUBLIC Octree
 {
 private:
 
-    BitmapPalette               aPal;
-    ULONG                       nMax;
-    ULONG                       nLeafCount;
-    ULONG                       nLevel;
-    PNODE                       pTree;
-    PNODE                       pReduce[ OCTREE_BITS + 1 ];
-    BitmapColor*                pColor;
-    ImpNodeCache*               pNodeCache;
-    const BitmapReadAccess*     pAcc;
-    USHORT                      nPalIndex;
+    BitmapPalette				aPal;
+    ULONG						nMax;
+    ULONG						nLeafCount;
+    ULONG						nLevel;
+    PNODE						pTree;
+    PNODE						pReduce[ OCTREE_BITS + 1 ];
+    BitmapColor*				pColor;
+    ImpNodeCache*				pNodeCache;
+    const BitmapReadAccess*		pAcc;
+    USHORT						nPalIndex;
 
                                 Octree() {};
 
-    void                        CreatePalette( PNODE pNode );
-    void                        GetPalIndex( PNODE pNode );
+    void						CreatePalette( PNODE pNode );
+    void						GetPalIndex( PNODE pNode );
 
     SAL_DLLPRIVATE void         ImplCreateOctree();
-    SAL_DLLPRIVATE void         ImplDeleteOctree( PPNODE ppNode );
-    SAL_DLLPRIVATE void         ImplAdd( PPNODE ppNode );
-    SAL_DLLPRIVATE void         ImplReduce();
+    SAL_DLLPRIVATE void			ImplDeleteOctree( PPNODE ppNode );
+    SAL_DLLPRIVATE void			ImplAdd( PPNODE ppNode );
+    SAL_DLLPRIVATE void			ImplReduce();
 
-public:
+public:							
 
                                 Octree( const BitmapReadAccess& rReadAcc, ULONG nColors );
                                 Octree( ULONG nColors );
                                 ~Octree();
 
-    void                        AddColor( const BitmapColor& rColor );
+    void						AddColor( const BitmapColor& rColor );
 
-    inline const BitmapPalette& GetPalette();
-    inline USHORT               GetBestPaletteIndex( const BitmapColor& rColor );
+    inline const BitmapPalette&	GetPalette();
+    inline USHORT				GetBestPaletteIndex( const BitmapColor& rColor );
 };
 
 // ------------------------------------------------------------------------
@@ -131,13 +131,13 @@ class VCL_DLLPUBLIC InverseColorMap
 {
 private:
 
-    BYTE*               pBuffer;
-    BYTE*               pMap;
-    const ULONG         nBits;
+    BYTE*				pBuffer;
+    BYTE*				pMap;
+    const ULONG			nBits;
 
-//#if 0 // _SOLAR__PRIVATE
+//#if 0 // _SOLAR__PRIVATE 
 
-    SAL_DLLPRIVATE void ImplCreateBuffers( const ULONG nMax );
+    SAL_DLLPRIVATE void	ImplCreateBuffers( const ULONG nMax );
 
 //#endif // __PRIVATE
 
@@ -146,15 +146,15 @@ public:
                         InverseColorMap( const BitmapPalette& rPal );
                         ~InverseColorMap();
 
-    inline USHORT       GetBestPaletteIndex( const BitmapColor& rColor );
+    inline USHORT		GetBestPaletteIndex( const BitmapColor& rColor );
 };
 
 // ------------------------------------------------------------------------
 
 inline USHORT InverseColorMap::GetBestPaletteIndex( const BitmapColor& rColor )
 {
-    return pMap[ ( ( (ULONG) rColor.GetRed() >> nBits ) << OCTREE_BITS_1 ) |
-                 ( ( (ULONG) rColor.GetGreen() >> nBits ) << OCTREE_BITS ) |
+    return pMap[ ( ( (ULONG) rColor.GetRed() >> nBits ) << OCTREE_BITS_1 ) | 
+                 ( ( (ULONG) rColor.GetGreen() >> nBits ) << OCTREE_BITS ) | 
                  ( (ULONG) rColor.GetBlue() >> nBits ) ];
 }
 
diff --git a/vcl/inc/vcl/oldprintadaptor.hxx b/vcl/inc/vcl/oldprintadaptor.hxx
index 3d7ccedc2ca1..0b5dad77f2d2 100644
--- a/vcl/inc/vcl/oldprintadaptor.hxx
+++ b/vcl/inc/vcl/oldprintadaptor.hxx
@@ -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
@@ -39,10 +39,10 @@ namespace vcl
     public:
         OldStylePrintAdaptor( const boost::shared_ptr< Printer >& );
         virtual ~OldStylePrintAdaptor();
-
+        
         void StartPage();
         void EndPage();
-
+        
         virtual int  getPageCount() const;
         virtual com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue > getPageParameters( int i_nPage ) const;
         virtual void printPage( int i_nPage ) const;
diff --git a/vcl/inc/vcl/outdata.hxx b/vcl/inc/vcl/outdata.hxx
index 5d2852444767..35d55a7abed9 100644
--- a/vcl/inc/vcl/outdata.hxx
+++ b/vcl/inc/vcl/outdata.hxx
@@ -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
diff --git a/vcl/inc/vcl/outdev.h b/vcl/inc/vcl/outdev.h
index 43a1e9cf2cea..481333e0ae2e 100644
--- a/vcl/inc/vcl/outdev.h
+++ b/vcl/inc/vcl/outdev.h
@@ -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
@@ -139,10 +139,10 @@ public:
 // nowadays these substitutions are needed for backward compatibility and tight platform integration:
 // - substitutions from configuration entries (Tools->Options->FontReplacement and/or fontconfig)
 // - device specific substitutions (e.g. for PS printer builtin fonts)
-// - substitutions for missing fonts defined by configuration entries (generic and/or platform dependent fallbacks)
+// - substitutions for missing fonts defined by configuration entries (generic and/or platform dependent fallbacks) 
 // - substitutions for missing fonts defined by multi-token fontnames (e.g. fontname="SpecialFont;FallbackA;FallbackB")
 // - substitutions for incomplete fonts (implicit, generic, EUDC and/or platform dependent fallbacks)
-// - substitutions for missing symbol fonts by translating code points into other symbol fonts
+// - substitutions for missing symbol fonts by translating code points into other symbol fonts 
 
 class ImplFontSubstitution
 {
@@ -249,14 +249,14 @@ namespace basegfx { class B2DHomMatrix; }
 
 struct ImplOutDevData
 {
-    VirtualDevice*              mpRotateDev;
-    vcl::ControlLayoutData*     mpRecordLayout;
-    Rectangle                   maRecordRect;
-    ImplDirectFontSubstitution      maDevFontSubst;
+    VirtualDevice*				mpRotateDev;
+    vcl::ControlLayoutData*		mpRecordLayout;
+    Rectangle					maRecordRect;
+    ImplDirectFontSubstitution		maDevFontSubst;
 
     // #i75163#
-    basegfx::B2DHomMatrix*      mpViewTransform;
-    basegfx::B2DHomMatrix*      mpInverseViewTransform;
+    basegfx::B2DHomMatrix*		mpViewTransform;
+    basegfx::B2DHomMatrix*		mpInverseViewTransform;
 };
 
 void ImplFreeOutDevFontData();
diff --git a/vcl/inc/vcl/outdev.hxx b/vcl/inc/vcl/outdev.hxx
index f787df3692ce..aae16928d9c3 100644
--- a/vcl/inc/vcl/outdev.hxx
+++ b/vcl/inc/vcl/outdev.hxx
@@ -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
@@ -195,10 +195,10 @@ struct KerningPair
 #define IMAGE_DRAW_DISABLE              ((USHORT)0x0001)
 #define IMAGE_DRAW_HIGHLIGHT            ((USHORT)0x0002)
 #define IMAGE_DRAW_DEACTIVE             ((USHORT)0x0004)
-#define IMAGE_DRAW_COLORTRANSFORM       ((USHORT)0x0008)
+#define IMAGE_DRAW_COLORTRANSFORM      	((USHORT)0x0008)
 #define IMAGE_DRAW_SEMITRANSPARENT      ((USHORT)0x0010)
-#define IMAGE_DRAW_MONOCHROME_BLACK     ((USHORT)0x0020)
-#define IMAGE_DRAW_MONOCHROME_WHITE     ((USHORT)0x0040)
+#define IMAGE_DRAW_MONOCHROME_BLACK  	((USHORT)0x0020)
+#define IMAGE_DRAW_MONOCHROME_WHITE  	((USHORT)0x0040)
 #define IMAGE_DRAW_3DLOOK               0
 #define IMAGE_DRAW_BTNLOOK              0
 
@@ -309,19 +309,19 @@ private:
     ImplOutDevData*     mpOutDevData;
     List*               mpUnoGraphicsList;
     vcl::PDFWriterImpl* mpPDFWriter;
-    vcl::ExtOutDevData* mpExtOutDevData;
+    vcl::ExtOutDevData*	mpExtOutDevData;
 
     // TEMP TEMP TEMP
     VirtualDevice*      mpAlphaVDev;
 
     /// Additional output pixel offset, applied in LogicToPixel (used by SetPixelOffset/GetPixelOffset)
-    long                mnOutOffOrigX;
+    long				mnOutOffOrigX;
     /// Additional output offset in _logical_ coordinates, applied in PixelToLogic (used by SetPixelOffset/GetPixelOffset)
-    long                mnOutOffLogicX;
+    long				mnOutOffLogicX;
     /// Additional output pixel offset, applied in LogicToPixel (used by SetPixelOffset/GetPixelOffset)
-    long                mnOutOffOrigY;
+    long				mnOutOffOrigY;
     /// Additional output offset in _logical_ coordinates, applied in PixelToLogic (used by SetPixelOffset/GetPixelOffset)
-    long                mnOutOffLogicY;
+    long				mnOutOffLogicY;
     /// Output offset for device output in pixel (pseudo window offset within window system's frames)
     long                mnOutOffX;
     /// Output offset for device output in pixel (pseudo window offset within window system's frames)
@@ -379,25 +379,25 @@ private:
                         mbEnableRTL:1;
 
 public:
-    SAL_DLLPRIVATE sal_Int32    ImplGetDPIX() const { return mnDPIX; }
-    SAL_DLLPRIVATE sal_Int32    ImplGetDPIY() const { return mnDPIY; }
-    SAL_DLLPRIVATE int          ImplGetGraphics() const;
-    SAL_DLLPRIVATE void         ImplReleaseGraphics( BOOL bRelease = TRUE );
+    SAL_DLLPRIVATE sal_Int32	ImplGetDPIX() const { return mnDPIX; }
+    SAL_DLLPRIVATE sal_Int32	ImplGetDPIY() const { return mnDPIY; }
+    SAL_DLLPRIVATE int 			ImplGetGraphics() const;
+    SAL_DLLPRIVATE void			ImplReleaseGraphics( BOOL bRelease = TRUE );
     SAL_DLLPRIVATE BOOL         ImplHasMirroredGraphics();
     SAL_DLLPRIVATE void         ImplReMirror( Point &rPoint ) const;
     SAL_DLLPRIVATE void         ImplReMirror( Rectangle &rRect ) const;
     SAL_DLLPRIVATE void         ImplReMirror( Region &rRegion ) const;
-    SAL_DLLPRIVATE void         ImplInitOutDevData();
-    SAL_DLLPRIVATE void         ImplDeInitOutDevData();
-    SAL_DLLPRIVATE void         ImplInitLineColor();
-    SAL_DLLPRIVATE void         ImplInitFillColor();
-    SAL_DLLPRIVATE bool         ImplNewFont() const;
-    SAL_DLLPRIVATE void         ImplInitFont() const;
-    SAL_DLLPRIVATE void         ImplInitTextColor();
-    SAL_DLLPRIVATE void         ImplInitClipRegion();
-    SAL_DLLPRIVATE bool         ImplSelectClipRegion( const Region&, SalGraphics* pGraphics = NULL );
-    SAL_DLLPRIVATE void         ImplSetClipRegion( const Region* pRegion );
-    SAL_DLLPRIVATE void         ImplSetTriangleClipRegion( const PolyPolygon &rPolyPolygon );
+    SAL_DLLPRIVATE void			ImplInitOutDevData();
+    SAL_DLLPRIVATE void			ImplDeInitOutDevData();
+    SAL_DLLPRIVATE void			ImplInitLineColor();
+    SAL_DLLPRIVATE void			ImplInitFillColor();
+    SAL_DLLPRIVATE bool			ImplNewFont() const;
+    SAL_DLLPRIVATE void			ImplInitFont() const;
+    SAL_DLLPRIVATE void			ImplInitTextColor();
+    SAL_DLLPRIVATE void			ImplInitClipRegion();
+    SAL_DLLPRIVATE bool 		ImplSelectClipRegion( const Region&, SalGraphics* pGraphics = NULL );
+    SAL_DLLPRIVATE void			ImplSetClipRegion( const Region* pRegion );
+    SAL_DLLPRIVATE void			ImplSetTriangleClipRegion( const PolyPolygon &rPolyPolygon );
 
     SAL_DLLPRIVATE SalLayout*   ImplLayout( const String&, xub_StrLen nIndex,
                                             xub_StrLen nLen, const Point& rLogicPos = Point(0,0),
@@ -424,78 +424,78 @@ public:
     SAL_DLLPRIVATE void         ImplDrawSpecialText( SalLayout& );
     SAL_DLLPRIVATE void         ImplDrawText( SalLayout& );
     SAL_DLLPRIVATE Rectangle    ImplGetTextBoundRect( const SalLayout& );
-    SAL_DLLPRIVATE void         ImplDrawEmphasisMarks( SalLayout& );
+    SAL_DLLPRIVATE void			ImplDrawEmphasisMarks( SalLayout& );
 
-    SAL_DLLPRIVATE void         ImplDrawTextRect( long nBaseX, long nBaseY, long nX, long nY, long nWidth, long nHeight );
+    SAL_DLLPRIVATE void			ImplDrawTextRect( long nBaseX, long nBaseY, long nX, long nY, long nWidth, long nHeight );
 
-    SAL_DLLPRIVATE void         ImplInitTextLineSize();
-    SAL_DLLPRIVATE void         ImplInitAboveTextLineSize();
-    SAL_DLLPRIVATE void         ImplDrawWaveLine( long nBaseX, long nBaseY, long nStartX, long nStartY, long nWidth, long nHeight, long nLineWidth, short nOrientation, const Color& rColor );
+    SAL_DLLPRIVATE void			ImplInitTextLineSize();
+    SAL_DLLPRIVATE void			ImplInitAboveTextLineSize();
+    SAL_DLLPRIVATE void			ImplDrawWaveLine( long nBaseX, long nBaseY, long nStartX, long nStartY, long nWidth, long nHeight, long nLineWidth, short nOrientation, const Color& rColor );
     SAL_DLLPRIVATE void         ImplDrawWaveTextLine( long nBaseX, long nBaseY, long nX, long nY, long nWidth, FontUnderline eTextLine, Color aColor, BOOL bIsAbove );
     SAL_DLLPRIVATE void         ImplDrawStraightTextLine( long nBaseX, long nBaseY, long nX, long nY, long nWidth, FontUnderline eTextLine, Color aColor, BOOL bIsAbove );
     SAL_DLLPRIVATE void         ImplDrawStrikeoutLine( long nBaseX, long nBaseY, long nX, long nY, long nWidth, FontStrikeout eStrikeout, Color aColor );
     SAL_DLLPRIVATE void         ImplDrawStrikeoutChar( long nBaseX, long nBaseY, long nX, long nY, long nWidth, FontStrikeout eStrikeout, Color aColor );
     SAL_DLLPRIVATE void         ImplDrawTextLine( long nBaseX, long nX, long nY, long nWidth, FontStrikeout eStrikeout, FontUnderline eUnderline, FontUnderline eOverline, BOOL bUnderlineAbove );
-    SAL_DLLPRIVATE void         ImplDrawMnemonicLine( long nX, long nY, long nWidth );
-    SAL_DLLPRIVATE void         ImplGetEmphasisMark( PolyPolygon& rPolyPoly, BOOL& rPolyLine, Rectangle& rRect1, Rectangle& rRect2, long& rYOff, long& rWidth, FontEmphasisMark eEmphasis, long nHeight, short nOrient );
-    SAL_DLLPRIVATE void         ImplDrawEmphasisMark( long nBaseX, long nX, long nY, const PolyPolygon& rPolyPoly, BOOL bPolyLine, const Rectangle& rRect1, const Rectangle& rRect2 );
+    SAL_DLLPRIVATE void			ImplDrawMnemonicLine( long nX, long nY, long nWidth );
+    SAL_DLLPRIVATE void			ImplGetEmphasisMark( PolyPolygon& rPolyPoly, BOOL& rPolyLine, Rectangle& rRect1, Rectangle& rRect2, long& rYOff, long& rWidth, FontEmphasisMark eEmphasis, long nHeight, short nOrient );
+    SAL_DLLPRIVATE void			ImplDrawEmphasisMark( long nBaseX, long nX, long nY, const PolyPolygon& rPolyPoly, BOOL bPolyLine, const Rectangle& rRect1, const Rectangle& rRect2 );
     static
     SAL_DLLPRIVATE long         ImplGetTextLines( ImplMultiTextLineInfo& rLineInfo, long nWidth, const XubString& rStr, USHORT nStyle, const ::vcl::ITextLayout& _rLayout );
-    SAL_DLLPRIVATE void         ImplInitFontList() const;
-    SAL_DLLPRIVATE void         ImplUpdateFontData( bool bNewFontLists );
-    SAL_DLLPRIVATE static void  ImplUpdateAllFontData( bool bNewFontLists );
-
-    SAL_DLLPRIVATE long         ImplLogicXToDevicePixel( long nX ) const;
-    SAL_DLLPRIVATE long         ImplLogicYToDevicePixel( long nY ) const;
-    SAL_DLLPRIVATE long         ImplLogicWidthToDevicePixel( long nWidth ) const;
-    SAL_DLLPRIVATE long         ImplLogicHeightToDevicePixel( long nHeight ) const;
-    SAL_DLLPRIVATE long         ImplDevicePixelToLogicWidth( long nWidth ) const;
-    SAL_DLLPRIVATE long         ImplDevicePixelToLogicHeight( long nHeight ) const;
-    SAL_DLLPRIVATE float        ImplFloatLogicWidthToDevicePixel( float ) const;
-    SAL_DLLPRIVATE float        ImplFloatLogicHeightToDevicePixel( float ) const;
-    SAL_DLLPRIVATE float        ImplFloatDevicePixelToLogicWidth( float ) const;
-    SAL_DLLPRIVATE float        ImplFloatDevicePixelToLogicHeight( float ) const;
-    SAL_DLLPRIVATE Point        ImplLogicToDevicePixel( const Point& rLogicPt ) const;
-    SAL_DLLPRIVATE Size         ImplLogicToDevicePixel( const Size& rLogicSize ) const;
-    SAL_DLLPRIVATE Rectangle    ImplLogicToDevicePixel( const Rectangle& rLogicRect ) const;
+    SAL_DLLPRIVATE void			ImplInitFontList() const;
+    SAL_DLLPRIVATE void			ImplUpdateFontData( bool bNewFontLists );
+    SAL_DLLPRIVATE static void 	ImplUpdateAllFontData( bool bNewFontLists );
+
+    SAL_DLLPRIVATE long			ImplLogicXToDevicePixel( long nX ) const;
+    SAL_DLLPRIVATE long			ImplLogicYToDevicePixel( long nY ) const;
+    SAL_DLLPRIVATE long			ImplLogicWidthToDevicePixel( long nWidth ) const;
+    SAL_DLLPRIVATE long			ImplLogicHeightToDevicePixel( long nHeight ) const;
+    SAL_DLLPRIVATE long			ImplDevicePixelToLogicWidth( long nWidth ) const;
+    SAL_DLLPRIVATE long			ImplDevicePixelToLogicHeight( long nHeight ) const;
+    SAL_DLLPRIVATE float		ImplFloatLogicWidthToDevicePixel( float ) const;
+    SAL_DLLPRIVATE float		ImplFloatLogicHeightToDevicePixel( float ) const;
+    SAL_DLLPRIVATE float		ImplFloatDevicePixelToLogicWidth( float ) const;
+    SAL_DLLPRIVATE float		ImplFloatDevicePixelToLogicHeight( float ) const;
+    SAL_DLLPRIVATE Point		ImplLogicToDevicePixel( const Point& rLogicPt ) const;
+    SAL_DLLPRIVATE Size			ImplLogicToDevicePixel( const Size& rLogicSize ) const;
+    SAL_DLLPRIVATE Rectangle	ImplLogicToDevicePixel( const Rectangle& rLogicRect ) const;
     SAL_DLLPRIVATE ::basegfx::B2DPolygon ImplLogicToDevicePixel( const ::basegfx::B2DPolygon&  ) const;
     SAL_DLLPRIVATE ::basegfx::B2DPolyPolygon ImplLogicToDevicePixel( const ::basegfx::B2DPolyPolygon& ) const;
-    SAL_DLLPRIVATE Polygon      ImplLogicToDevicePixel( const Polygon& rLogicPoly ) const;
-    SAL_DLLPRIVATE PolyPolygon  ImplLogicToDevicePixel( const PolyPolygon& rLogicPolyPoly ) const;
-    SAL_DLLPRIVATE LineInfo     ImplLogicToDevicePixel( const LineInfo& rLineInfo ) const;
-    SAL_DLLPRIVATE Rectangle    ImplDevicePixelToLogic( const Rectangle& rLogicRect ) const;
-    SAL_DLLPRIVATE Region       ImplPixelToDevicePixel( const Region& rRegion ) const;
-    SAL_DLLPRIVATE void         ImplInvalidateViewTransform();
+    SAL_DLLPRIVATE Polygon 		ImplLogicToDevicePixel( const Polygon& rLogicPoly ) const;
+    SAL_DLLPRIVATE PolyPolygon 	ImplLogicToDevicePixel( const PolyPolygon& rLogicPolyPoly ) const;
+    SAL_DLLPRIVATE LineInfo		ImplLogicToDevicePixel( const LineInfo& rLineInfo ) const;
+    SAL_DLLPRIVATE Rectangle	ImplDevicePixelToLogic( const Rectangle& rLogicRect ) const;
+    SAL_DLLPRIVATE Region		ImplPixelToDevicePixel( const Region& rRegion ) const;
+    SAL_DLLPRIVATE void			ImplInvalidateViewTransform();
     SAL_DLLPRIVATE basegfx::B2DHomMatrix ImplGetDeviceTransformation() const;
 
-    SAL_DLLPRIVATE void         ImplDrawPolygon( const Polygon& rPoly, const PolyPolygon* pClipPolyPoly = NULL );
-    SAL_DLLPRIVATE void         ImplDrawPolyPolygon( const PolyPolygon& rPolyPoly, const PolyPolygon* pClipPolyPoly = NULL );
-    SAL_DLLPRIVATE void         ImplDrawPolyPolygon( USHORT nPoly, const PolyPolygon& rPolyPoly );
-    SAL_DLLPRIVATE void         ImplDrawLinearGradient( const Rectangle& rRect, const Gradient& rGradient, BOOL bMtf, const PolyPolygon* pClipPolyPoly );
-    SAL_DLLPRIVATE void         ImplDrawComplexGradient( const Rectangle& rRect, const Gradient& rGradient, BOOL bMtf, const PolyPolygon* pClipPolyPoly );
+    SAL_DLLPRIVATE void			ImplDrawPolygon( const Polygon& rPoly, const PolyPolygon* pClipPolyPoly = NULL );
+    SAL_DLLPRIVATE void			ImplDrawPolyPolygon( const PolyPolygon& rPolyPoly, const PolyPolygon* pClipPolyPoly = NULL );
+    SAL_DLLPRIVATE void 		ImplDrawPolyPolygon( USHORT nPoly, const PolyPolygon& rPolyPoly );
+    SAL_DLLPRIVATE void			ImplDrawLinearGradient( const Rectangle& rRect, const Gradient& rGradient, BOOL bMtf, const PolyPolygon* pClipPolyPoly );
+    SAL_DLLPRIVATE void			ImplDrawComplexGradient( const Rectangle& rRect, const Gradient& rGradient, BOOL bMtf, const PolyPolygon* pClipPolyPoly );
 
-    SAL_DLLPRIVATE void         ImplDrawHatch( const PolyPolygon& rPolyPoly, const Hatch& rHatch, BOOL bMtf );
-    SAL_DLLPRIVATE void         ImplCalcHatchValues( const Rectangle& rRect, long nDist, USHORT nAngle10, Point& rPt1, Point& rPt2, Size& rInc, Point& rEndPt1 );
-    SAL_DLLPRIVATE void         ImplDrawHatchLine( const Line& rLine, const PolyPolygon& rPolyPoly, Point* pPtBuffer, BOOL bMtf );
+    SAL_DLLPRIVATE void			ImplDrawHatch( const PolyPolygon& rPolyPoly, const Hatch& rHatch, BOOL bMtf );
+    SAL_DLLPRIVATE void			ImplCalcHatchValues( const Rectangle& rRect, long nDist, USHORT nAngle10, Point& rPt1, Point& rPt2, Size& rInc, Point& rEndPt1 );
+    SAL_DLLPRIVATE void			ImplDrawHatchLine( const Line& rLine, const PolyPolygon& rPolyPoly, Point* pPtBuffer, BOOL bMtf );
 
-    SAL_DLLPRIVATE void         ImplDrawWallpaper( long nX, long nY, long nWidth, long nHeight, const Wallpaper& rWallpaper );
-    SAL_DLLPRIVATE void         ImplDrawColorWallpaper( long nX, long nY, long nWidth, long nHeight, const Wallpaper& rWallpaper );
-    SAL_DLLPRIVATE void         ImplDrawBitmapWallpaper( long nX, long nY, long nWidth, long nHeight, const Wallpaper& rWallpaper );
-    SAL_DLLPRIVATE void         ImplDrawGradientWallpaper( long nX, long nY, long nWidth, long nHeight, const Wallpaper& rWallpaper );
-    SAL_DLLPRIVATE void         ImplDraw2ColorFrame( const Rectangle& rRect, const Color& rLeftTopColor, const Color& rRightBottomColor );
+    SAL_DLLPRIVATE void			ImplDrawWallpaper( long nX, long nY, long nWidth, long nHeight, const Wallpaper& rWallpaper );
+    SAL_DLLPRIVATE void			ImplDrawColorWallpaper( long nX, long nY, long nWidth, long nHeight, const Wallpaper& rWallpaper );
+    SAL_DLLPRIVATE void			ImplDrawBitmapWallpaper( long nX, long nY, long nWidth, long nHeight, const Wallpaper& rWallpaper );
+    SAL_DLLPRIVATE void			ImplDrawGradientWallpaper( long nX, long nY, long nWidth, long nHeight, const Wallpaper& rWallpaper );
+    SAL_DLLPRIVATE void			ImplDraw2ColorFrame( const Rectangle& rRect, const Color& rLeftTopColor, const Color& rRightBottomColor );
 
-    SAL_DLLPRIVATE void         ImplDrawOutDevDirect( const OutputDevice* pSrcDev, void* pPosAry );
-    SAL_DLLPRIVATE void         ImplDrawBitmap( const Point& rDestPt, const Size& rDestSize,
+    SAL_DLLPRIVATE void			ImplDrawOutDevDirect( const OutputDevice* pSrcDev, void* pPosAry );
+    SAL_DLLPRIVATE void			ImplDrawBitmap( const Point& rDestPt, const Size& rDestSize,
                                         const Point& rSrcPtPixel, const Size& rSrcSizePixel,
                                         const Bitmap& rBitmap, const ULONG nAction );
-    SAL_DLLPRIVATE void         ImplDrawBitmapEx( const Point& rDestPt, const Size& rDestSize,
+    SAL_DLLPRIVATE void			ImplDrawBitmapEx( const Point& rDestPt, const Size& rDestSize,
                                         const Point& rSrcPtPixel, const Size& rSrcSizePixel,
                                         const BitmapEx& rBitmapEx, const ULONG nAction );
-    SAL_DLLPRIVATE void         ImplDrawMask( const Point& rDestPt, const Size& rDestSize,
+    SAL_DLLPRIVATE void			ImplDrawMask( const Point& rDestPt, const Size& rDestSize,
                                         const Point& rSrcPtPixel, const Size& rSrcSizePixel,
                                         const Bitmap& rBitmap, const Color& rMaskColor,
                                         const ULONG nAction );
-    SAL_DLLPRIVATE void         ImplDrawAlpha( const Bitmap& rBmp, const AlphaMask& rAlpha,
+    SAL_DLLPRIVATE void			ImplDrawAlpha( const Bitmap& rBmp, const AlphaMask& rAlpha,
                                         const Point& rDestPt, const Size& rDestSize,
                                         const Point& rSrcPtPixel, const Size& rSrcSizePixel );
     SAL_DLLPRIVATE Bitmap       ImplBlend( Bitmap              aBmp,
@@ -521,20 +521,20 @@ public:
                                                     const sal_Int32     nDstWidth,
                                                     const long*         pMapX,
                                                     const long*         pMapY );
-    SAL_DLLPRIVATE void         ImplPrintTransparent( const Bitmap& rBmp, const Bitmap& rMask,
+    SAL_DLLPRIVATE void			ImplPrintTransparent( const Bitmap& rBmp, const Bitmap& rMask,
                                         const Point& rDestPt, const Size& rDestSize,
                                         const Point& rSrcPtPixel, const Size& rSrcSizePixel );
-    SAL_DLLPRIVATE void         ImplPrintMask( const Bitmap& rMask, const Color& rMaskColor,
+    SAL_DLLPRIVATE void		    ImplPrintMask( const Bitmap& rMask, const Color& rMaskColor,
                                         const Point& rDestPt, const Size& rDestSize,
                                         const Point& rSrcPtPixel, const Size& rSrcSizePixel );
-    SAL_DLLPRIVATE void         ImplDrawFrameDev( const Point& rPt, const Point& rDevPt, const Size& rDevSize,
+    SAL_DLLPRIVATE void			ImplDrawFrameDev( const Point& rPt, const Point& rDevPt, const Size& rDevSize,
                                         const OutputDevice& rOutDev, const Region& rRegion );
-    SAL_DLLPRIVATE void         ImplGetFrameDev( const Point& rPt, const Point& rDevPt, const Size& rDevSize,
+    SAL_DLLPRIVATE void			ImplGetFrameDev( const Point& rPt, const Point& rDevPt, const Size& rDevSize,
                                         OutputDevice& rOutDev );
-    SAL_DLLPRIVATE void         ImplGetFrameBitmap( const Point& rPt, const Size& rSize,
+    SAL_DLLPRIVATE void			ImplGetFrameBitmap( const Point& rPt, const Size& rSize,
                                         Bitmap& rBitmap ) const;
 
-    SAL_DLLPRIVATE BOOL         ImplIsRecordLayout() const;
+    SAL_DLLPRIVATE BOOL			ImplIsRecordLayout() const;
 
                    void         ImplAddDevFontSubstitute( const XubString& rFontName,
                                                   const XubString& rReplaceFontName,
@@ -542,7 +542,7 @@ public:
 
     SAL_DLLPRIVATE static FontEmphasisMark ImplGetEmphasisMarkStyle( const Font& rFont );
     SAL_DLLPRIVATE static BOOL ImplIsUnderlineAbove( const Font& );
-
+ 
     // tells whether this output device is RTL in an LTR UI or LTR in a RTL UI
     SAL_DLLPRIVATE bool ImplIsAntiparallel() const ;
 
@@ -550,7 +550,7 @@ public:
     // Helper which holds the old line geometry creation and is extended to use AA when
     // switched on. Advantage is that line geometry is only temporarily used for paint
     SAL_DLLPRIVATE void ImpDrawPolyLineWithLineInfo(const Polygon& rPoly, const LineInfo& rLineInfo);
-
+    
     // #i101491#
     // Helper who implements the DrawPolyPolygon functionality for basegfx::B2DPolyPolygon
     // without MetaFile processing
@@ -584,8 +584,8 @@ public:
 
     vcl::PDFWriterImpl* GetPDFWriter() const { return mpPDFWriter; }
 
-    void                SetExtOutDevData( vcl::ExtOutDevData* pExtOutDevData ) { mpExtOutDevData = pExtOutDevData; }
-    vcl::ExtOutDevData* GetExtOutDevData() const { return mpExtOutDevData; }
+    void				SetExtOutDevData( vcl::ExtOutDevData* pExtOutDevData ) { mpExtOutDevData = pExtOutDevData; }
+    vcl::ExtOutDevData*	GetExtOutDevData() const { return mpExtOutDevData; }
 
     void                DrawTextLine( const Point& rPos, long nWidth,
                                       FontStrikeout eStrikeout,
@@ -835,7 +835,7 @@ public:
 
     void                SetClipRegion();
     void                SetClipRegion( const Region& rRegion );
-    void                SetTriangleClipRegion( const PolyPolygon &rRegion );
+    void				SetTriangleClipRegion( const PolyPolygon &rRegion );
     Region              GetClipRegion() const;
     BOOL                IsClipRegion() const { return mbClipRegion; }
     Region              GetActiveClipRegion() const;
@@ -931,7 +931,7 @@ public:
      // #i75163#
     basegfx::B2DHomMatrix GetViewTransformation() const;
     basegfx::B2DHomMatrix GetInverseViewTransformation() const;
-
+    
     basegfx::B2DHomMatrix GetViewTransformation( const MapMode& rMapMode ) const;
     basegfx::B2DHomMatrix GetInverseViewTransformation( const MapMode& rMapMode ) const;
 
@@ -958,7 +958,7 @@ public:
         @param rOffset
         The offset in pixel
      */
-    void                SetPixelOffset( const Size& rOffset );
+    void				SetPixelOffset( const Size& rOffset );
 
     /** Get the offset in pixel
 
@@ -966,7 +966,7 @@ public:
 
         @return the current offset in pixel
      */
-    Size                GetPixelOffset() const;
+    Size				GetPixelOffset() const;
 
     Point               LogicToPixel( const Point& rLogicPt ) const;
     Size                LogicToPixel( const Size& rLogicSize ) const;
@@ -1049,13 +1049,13 @@ public:
     static basegfx::B2DPolyPolygon LogicToLogic( const basegfx::B2DPolyPolygon& rPolyPoly,
                                                  const MapMode&    rMapModeSource,
                                                  const MapMode&    rMapModeDest );
-
+    
     Size                GetOutputSizePixel() const
                             { return Size( mnOutWidth, mnOutHeight ); }
-    long                GetOutputWidthPixel() const { return mnOutWidth; }
-    long                GetOutputHeightPixel() const { return mnOutHeight; }
-    long                GetOutOffXPixel() const { return mnOutOffX; }
-    long                GetOutOffYPixel() const { return mnOutOffY; }
+    long				GetOutputWidthPixel() const { return mnOutWidth; }
+    long				GetOutputHeightPixel() const { return mnOutHeight; }
+    long				GetOutOffXPixel() const { return mnOutOffX; }
+    long				GetOutOffYPixel() const { return mnOutOffY; }
 
     Size                GetOutputSize() const
                             { return PixelToLogic( GetOutputSizePixel() ); }
@@ -1083,7 +1083,7 @@ public:
     // i60594
     // validate kashida positions against the current font
     // returns count of invalid kashida positions
-    xub_StrLen          ValidateKashidas ( const String& rTxt,
+    xub_StrLen			ValidateKashidas ( const String& rTxt,
                                             xub_StrLen nIdx, xub_StrLen nLen,
                                             xub_StrLen nKashCount, // number of suggested kashida positions (in)
                                             const xub_StrLen* pKashidaPos, // suggested kashida positions (in)
@@ -1110,7 +1110,7 @@ public:
 
         @return TRUE, if this device has an alpha channel.
      */
-    BOOL                HasAlpha();
+    BOOL				HasAlpha();
 
     /** Added return value to see if EPS could be painted directly.
         Theoreticaly, handing over a matrix would be needed to handle
@@ -1189,14 +1189,14 @@ public:
     BOOL                IsNativeControlSupported( ControlType nType, ControlPart nPart );
 
     // Query the native control to determine if it was acted upon
-    BOOL                HitTestNativeControl(   ControlType nType,
+    BOOL				HitTestNativeControl(   ControlType nType,
                                                 ControlPart nPart,
                                                 const Rectangle& rControlRegion,
                                                 const Point& aPos,
                                                 BOOL& rIsInside );
 
     // Request rendering of a particular control and/or part
-    BOOL                DrawNativeControl(  ControlType nType,
+    BOOL				DrawNativeControl(  ControlType nType,
                                             ControlPart nPart,
                                             const Rectangle& rControlRegion,
                                             ControlState nState,
@@ -1204,7 +1204,7 @@ public:
                                             ::rtl::OUString aCaption );
 
      // Request rendering of a caption string for a control
-    BOOL                DrawNativeControlText(  ControlType nType,
+    BOOL				DrawNativeControlText(  ControlType nType,
                                                 ControlPart nPart,
                                                 const Rectangle& rControlRegion,
                                                 ControlState nState,
@@ -1212,7 +1212,7 @@ public:
                                                 ::rtl::OUString aCaption );
 
     // Query the native control's actual drawing region (including adornment)
-    BOOL                GetNativeControlRegion( ControlType nType,
+    BOOL				GetNativeControlRegion( ControlType nType,
                                                 ControlPart nPart,
                                                 const Rectangle& rControlRegion,
                                                 ControlState nState,
diff --git a/vcl/inc/vcl/outfont.hxx b/vcl/inc/vcl/outfont.hxx
index 4bbf7176ddb2..b1e2ac69e14d 100644
--- a/vcl/inc/vcl/outfont.hxx
+++ b/vcl/inc/vcl/outfont.hxx
@@ -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
@@ -272,7 +272,7 @@ public:
     void    ImplInitAboveTextLineSize();
 
 public: // TODO: hide members behind accessor methods
-    // font instance attributes from the font request
+    // font instance attributes from the font request 
     long                mnWidth;                    // Reference Width
     short               mnOrientation;              // Rotation in 1/10 degrees
 
diff --git a/vcl/inc/vcl/pdfextoutdevdata.hxx b/vcl/inc/vcl/pdfextoutdevdata.hxx
index 5dda4b0f79fa..b1a75dfff3fa 100644
--- a/vcl/inc/vcl/pdfextoutdevdata.hxx
+++ b/vcl/inc/vcl/pdfextoutdevdata.hxx
@@ -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
@@ -40,7 +40,7 @@
 
 class Graphic;
 
-namespace vcl { class PDFWriter; }
+namespace vcl {	class PDFWriter; }
 
 namespace vcl
 {
@@ -52,8 +52,8 @@ namespace vcl
 */
 struct PDFExtOutDevBookmarkEntry
 {
-    sal_Int32       nLinkId;
-    rtl::OUString   aBookmark;
+    sal_Int32		nLinkId;
+    rtl::OUString	aBookmark;
 };
 
 /*
@@ -68,19 +68,19 @@ class VCL_DLLPUBLIC PDFExtOutDevData : public ExtOutDevData
     const OutputDevice& mrOutDev;
 
     sal_Bool                        mbTaggedPDF;
-    sal_Bool                        mbExportNotes;
-    sal_Bool                        mbTransitionEffects;
-    sal_Bool                        mbUseLosslessCompression;
-    sal_Bool                        mbReduceImageResolution;
+    sal_Bool				    	mbExportNotes;
+    sal_Bool					    mbTransitionEffects;
+    sal_Bool					    mbUseLosslessCompression;
+    sal_Bool					    mbReduceImageResolution;
     sal_Bool                        mbExportFormFields;
     sal_Bool                        mbExportBookmarks;
     sal_Bool                        mbExportNDests; //i56629
     sal_Int32                       mnFormsFormat;
-    sal_Int32                       mnPage;
+    sal_Int32					    mnPage;
     com::sun::star::lang::Locale    maDocLocale;
 
-    PageSyncData*               mpPageSyncData;
-    GlobalSyncData*             mpGlobalSyncData;
+    PageSyncData*				mpPageSyncData;
+    GlobalSyncData*				mpGlobalSyncData;
 
     std::vector< PDFExtOutDevBookmarkEntry > maBookmarks;
 
@@ -97,20 +97,20 @@ public :
 
 
 
-    sal_Bool    GetIsExportNotes() const;
-    void        SetIsExportNotes( const sal_Bool bExportNotes );
+    sal_Bool	GetIsExportNotes() const;
+    void		SetIsExportNotes( const sal_Bool bExportNotes );
 
-    sal_Bool    GetIsExportTaggedPDF() const;
-    void        SetIsExportTaggedPDF( const sal_Bool bTaggedPDF );
+    sal_Bool	GetIsExportTaggedPDF() const;
+    void		SetIsExportTaggedPDF( const sal_Bool bTaggedPDF );
 
-    sal_Bool    GetIsExportTransitionEffects() const;
-    void        SetIsExportTransitionEffects( const sal_Bool bTransitionalEffects );
+    sal_Bool	GetIsExportTransitionEffects() const;
+    void		SetIsExportTransitionEffects( const sal_Bool bTransitionalEffects );
 
     sal_Bool    GetIsExportFormFields() const;
     void        SetIsExportFormFields( const sal_Bool bExportFormFields );
 
-    sal_Int32   GetFormsFormat() const;
-    void        SetFormsFormat( const sal_Int32 nFormsFormat );
+    sal_Int32	GetFormsFormat() const;
+    void		SetFormsFormat( const sal_Int32 nFormsFormat );
 
     sal_Bool    GetIsExportBookmarks() const;
     void        SetIsExportBookmarks( const sal_Bool bExportBookmarks );
@@ -119,14 +119,14 @@ public :
     void        SetIsExportNamedDestinations( const sal_Bool bExportNDests ); //i56629
 
     // PageNumber, Compression is being set by the PDFExport
-    sal_Int32   GetCurrentPageNumber() const;
-    void        SetCurrentPageNumber( const sal_Int32 nPage );
+    sal_Int32	GetCurrentPageNumber() const;
+    void		SetCurrentPageNumber( const sal_Int32 nPage );
 
-    sal_Bool    GetIsLosslessCompression() const;
-    void        SetIsLosslessCompression( const sal_Bool bLosslessCompression );
+    sal_Bool	GetIsLosslessCompression() const;
+    void		SetIsLosslessCompression( const sal_Bool bLosslessCompression );
 
-    sal_Bool    GetIsReduceImageResolution() const;
-    void        SetIsReduceImageResolution( const sal_Bool bReduceImageResolution );
+    sal_Bool	GetIsReduceImageResolution() const;
+    void		SetIsReduceImageResolution( const sal_Bool bReduceImageResolution );
 
     const com::sun::star::lang::Locale& GetDocumentLocale() const;
     void        SetDocumentLocale( const com::sun::star::lang::Locale& rLoc );
@@ -137,14 +137,14 @@ public :
 
         Use this method to group render output.
      */
-    void        BeginGroup();
+    void		BeginGroup();
 
     /** End render output
 
         This method ends grouped render output without
         further actions.
      */
-    void        EndGroup();
+    void		EndGroup();
 
     /** End render output
 
@@ -169,20 +169,20 @@ public :
         The visible part of the output. This might be less than
         rOutputRect, e.g. for cropped graphics.
      */
-    void        EndGroup( const Graphic&    rGraphic,
-                          BYTE              nTransparency,
-                          const Rectangle&  rOutputRect,
-                          const Rectangle&  rVisibleOutputRect );
+    void		EndGroup( const Graphic& 	rGraphic,
+                          BYTE				nTransparency,
+                          const Rectangle& 	rOutputRect,
+                          const Rectangle& 	rVisibleOutputRect );
 //--->i56629
     /** Create a new named destination to be used in a link to this document from another PDF document
  (see PDF spec 1.4, 8.2.1)
-
+ 
     @parm sDestName
     the name this destination will be addressed with from others PDF document
 
     @param rRect
     target rectangle on page to be displayed if dest is jumped to
-
+    
     @param nPageNr
     number of page the dest is on (as returned by NewPage)
     or -1 in which case the current page is used
@@ -201,7 +201,7 @@ public :
 
     @param rRect
     target rectangle on page to be displayed if dest is jumped to
-
+    
     @param nPageNr
     number of page the dest is on (as returned by NewPage)
     or -1 in which case the current page is used
@@ -247,14 +247,14 @@ public :
         <p>will change a dest type link to an URL type link if necessary</p>
         @param nLinkId
         the link to be changed
-
+       
         @param rURL
         the URL the link shall point to.
         there will be no error checking or any kind of
         conversion done to this parameter execept this:
         it will be output as 7bit Ascii. The URL
         will appear literally in the PDF file produced
-
+        
         @returns
         0 for success
         -1 in case the link id does not exist
@@ -306,7 +306,7 @@ public :
     -1 if the item does not exist
     */
     sal_Int32 SetOutlineItemText( sal_Int32 nItem, const rtl::OUString& rText );
-
+    
     /** Set an outline item's destination
 
     @param nItem
@@ -373,7 +373,7 @@ public :
      */
      sal_Int32 BeginStructureElement( PDFWriter::StructElement eType, const rtl::OUString& rAlias = rtl::OUString() );
     /** end a logical structure element
-
+        
     @see BeginStructureElement
      */
     void EndStructureElement();
@@ -398,14 +398,14 @@ public :
      */
     bool SetCurrentStructureElement( sal_Int32 nElement );
     /** get the current structure element id
-
+        
     @returns
     the id of the current structure element
     */
     sal_Int32 GetCurrentStructureElement();
 
     /** set a structure attribute on the current structural element
-
+        
     SetStructureAttribute sets an attribute of the current structural element to a
     new value. A consistency check is performed before actually setting the value;
     if the check fails, the function returns <FALSE/> and the attribute remains
@@ -423,7 +423,7 @@ public :
      */
     bool SetStructureAttribute( PDFWriter::StructAttribute eAttr, PDFWriter::StructAttributeValue eVal );
     /** set a structure attribute on the current structural element
-
+        
     SetStructureAttributeNumerical sets an attribute of the current structural element
     to a new numerical value. A consistency check is performed before actually setting
     the value; if the check fails, the function returns <FALSE/> and the attribute
diff --git a/vcl/inc/vcl/pdfwriter.hxx b/vcl/inc/vcl/pdfwriter.hxx
index 419814e5ce97..105a72560bc7 100644
--- a/vcl/inc/vcl/pdfwriter.hxx
+++ b/vcl/inc/vcl/pdfwriter.hxx
@@ -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
@@ -63,18 +63,18 @@ namespace vcl
 
 struct PDFDocInfo
 {
-    String          Title;          // document title
-    String          Author;         // document author
-    String          Subject;        // subject
-    String          Keywords;       // keywords
-    String          Creator;        // application that created the original document
-    String          Producer;       // OpenOffice
+    String			Title;			// document title
+    String			Author;			// document author
+    String			Subject;		// subject
+    String			Keywords;		// keywords
+    String			Creator;		// application that created the original document
+    String			Producer;		// OpenOffice
 };
 
 struct PDFNote
 {
-    String          Title;          // optional title for the popup containing the note
-    String          Contents;       // contents of the note
+    String			Title;			// optional title for the popup containing the note
+    String			Contents;		// contents of the note
 };
 
 class VCL_DLLPUBLIC PDFOutputStream
@@ -230,21 +230,21 @@ public:
     struct VCL_DLLPUBLIC AnyWidget
     {
     protected:
-        WidgetType          Type;       // primitive RTTI
+        WidgetType			Type;		// primitive RTTI
     public:
-        rtl::OUString       Name;       // a distinct name to identify the control
-        rtl::OUString       Description;// descriptive text for the contro (e.g. for tool tip)
-        rtl::OUString       Text;       // user text to appear on the control
-        USHORT              TextStyle;  // style flags
-        bool                ReadOnly;
-        Rectangle           Location;   // describes the area filled by the control
-        bool                Border;     // true: widget should have a border, false: no border
-        Color               BorderColor;// COL_TRANSPARENT and Border=true means get color from application settings
-        bool                Background; // true: widget shall draw its background, false: no background
-        Color               BackgroundColor; // COL_TRANSPARENT and Background=true means get color from application settings
-        Font                TextFont;   // an empty font will be replaced by the
+        rtl::OUString		Name;		// a distinct name to identify the control
+        rtl::OUString		Description;// descriptive text for the contro (e.g. for tool tip)
+        rtl::OUString		Text;		// user text to appear on the control
+        USHORT				TextStyle;	// style flags
+        bool				ReadOnly;
+        Rectangle			Location;	// describes the area filled by the control
+        bool				Border;		// true: widget should have a border, false: no border
+        Color				BorderColor;// COL_TRANSPARENT and Border=true means get color from application settings
+        bool				Background; // true: widget shall draw its background, false: no background
+        Color				BackgroundColor; // COL_TRANSPARENT and Background=true means get color from application settings
+        Font				TextFont;	// an empty font will be replaced by the
                                         // appropriate font from the user settings
-        Color               TextColor;  // COL_TRANSPARENT will be replaced by the appropriate color from application settings
+        Color				TextColor;  // COL_TRANSPARENT will be replaced by the appropriate color from application settings
         sal_Int32           TabOrder; // lowest number is first in tab order
 
         /* style flags for text are those for OutputDevice::DrawText
@@ -327,7 +327,7 @@ public:
            will appear literally in the PDF file produced
         */
         sal_Int32           Dest;
-        rtl::OUString       URL;
+        rtl::OUString		URL;
         bool                Submit;
         bool                SubmitGet;
 
@@ -344,8 +344,8 @@ public:
 
     struct CheckBoxWidget : public AnyWidget
     {
-        bool                Checked;
-        bool                ButtonIsLeft;
+        bool				Checked;
+        bool				ButtonIsLeft;
 
         CheckBoxWidget()
                 : AnyWidget( vcl::PDFWriter::CheckBox ),
@@ -361,9 +361,9 @@ public:
 
     struct RadioButtonWidget : public AnyWidget
     {
-        bool                Selected;
-        sal_Int32           RadioGroup;
-        bool                ButtonIsLeft;
+        bool				Selected;
+        sal_Int32			RadioGroup;
+        bool				ButtonIsLeft;
         rtl::OUString       OnValue; // the value of the radio button if it is selected
 
         RadioButtonWidget()
@@ -389,10 +389,10 @@ public:
 
     struct EditWidget : public AnyWidget
     {
-        bool                MultiLine;  // whether multiple lines are allowed
-        bool                Password;   // visible echo off
-        bool                FileSelect; // field is a file selector
-        sal_Int32           MaxLen;     // maximum field length in characters, 0 means unlimited
+        bool				MultiLine;	// whether multiple lines are allowed
+        bool				Password;	// visible echo off
+        bool				FileSelect;	// field is a file selector
+        sal_Int32			MaxLen;		// maximum field length in characters, 0 means unlimited
 
         EditWidget()
                 : AnyWidget( vcl::PDFWriter::Edit ),
@@ -410,10 +410,10 @@ public:
 
     struct ListBoxWidget : public AnyWidget
     {
-        bool                            DropDown;
-        bool                            Sort;
-        bool                            MultiSelect;
-        std::vector<rtl::OUString>      Entries;
+        bool							DropDown;
+        bool							Sort;
+        bool							MultiSelect;
+        std::vector<rtl::OUString>		Entries;
         std::vector<sal_Int32>          SelectedEntries;
          // if MultiSelect is false only the first entry of SelectedEntries
          // will be taken into account. the same is implicit for PDF < 1.4
@@ -435,8 +435,8 @@ public:
     // note: PDF only supports dropdown comboboxes
     struct ComboBoxWidget : public AnyWidget
     {
-        bool                            Sort;
-        std::vector<rtl::OUString>      Entries;
+        bool							Sort;
+        std::vector<rtl::OUString>		Entries;
         // set the current value in AnyWidget::Text
 
         ComboBoxWidget()
@@ -492,7 +492,7 @@ The following structure describes the permissions used in PDF security
     struct PDFSecPermissions
     {
 //for both 40 and 128 bit security, see 3.5.2 PDF v 1.4 table 3.15, v 1.5 and v 1.6 table 3.20.
-        bool    CanPrintTheDocument;
+        bool	CanPrintTheDocument;
         bool CanModifyTheContent;
         bool CanCopyOrExtract;
         bool CanAddOrModify;
@@ -503,23 +503,23 @@ The following structure describes the permissions used in PDF security
         bool CanPrintFull;
 //permission default set for 128 bit, accessibility only
         PDFSecPermissions() :
-            CanPrintTheDocument         ( false ),
-            CanModifyTheContent         ( false ),
-            CanCopyOrExtract            ( false ),
-            CanAddOrModify              ( false ),
-            CanFillInteractive          ( false ),
-            CanExtractForAccessibility  ( true ),
-            CanAssemble                 ( false ),
-            CanPrintFull                ( false )
+            CanPrintTheDocument			( false ),
+            CanModifyTheContent			( false ),
+            CanCopyOrExtract			( false ),
+            CanAddOrModify				( false ),
+            CanFillInteractive			( false ),
+            CanExtractForAccessibility	( true ),
+            CanAssemble					( false ),
+            CanPrintFull				( false )
             {}
     };
 
     struct PDFWriterContext
     {
         /* must be a valid file: URL usable by osl */
-        rtl::OUString                   URL;
+        rtl::OUString					URL;
         /* the URL of the document being exported, used for relative links*/
-        rtl::OUString                   BaseURL;
+        rtl::OUString					BaseURL;
         /*if relative to file system should be formed*/
         bool                            RelFsys;//i56629, i49415?, i64585?
         /*the action to set the PDF hyperlink to*/
@@ -531,17 +531,17 @@ The following structure describes the permissions used in PDF security
         bool                            ForcePDFAction;
 
         /* decides the PDF language level to be produced */
-        PDFVersion                      Version;
+        PDFVersion						Version;
         /* valid for PDF >= 1.4
            causes the MarkInfo entry in the document catalog to be set
         */
-        bool                            Tagged;
+        bool							Tagged;
         /* forces the embedding of PDF standard fonts */
         bool                            EmbedStandardFonts;
         /*  determines in which format a form
             will be submitted.
          */
-        PDFWriter::ExportDataFormat     SubmitFormat;
+        PDFWriter::ExportDataFormat		SubmitFormat;
         bool                            AllowDuplicateFieldNames;
         bool                            FieldsUseSystemFonts;
         /* the following data members are used to customize the PDF viewer
@@ -570,12 +570,12 @@ The following structure describes the permissions used in PDF security
         sal_Int32                       InitialPage;
         sal_Int32                       OpenBookmarkLevels; // -1 means all levels
 
-        struct PDFSecPermissions        AccessPermissions;
+        struct PDFSecPermissions		AccessPermissions;
 
-        bool                            Encrypt; // main encryption flag, must be true to encript
-        bool                            Security128bit; // true to select 128 bit encryption, false for 40 bit
-        rtl::OUString                   OwnerPassword; // owner password for PDF, in clear text
-        rtl::OUString                   UserPassword; // user password for PDF, in clear text
+        bool							Encrypt; // main encryption flag, must be true to encript
+        bool							Security128bit; // true to select 128 bit encryption, false for 40 bit
+        rtl::OUString					OwnerPassword; // owner password for PDF, in clear text
+        rtl::OUString					UserPassword; // user password for PDF, in clear text
 
         com::sun::star::lang::Locale    DocumentLocale; // defines the document default language
 
@@ -666,8 +666,8 @@ The following structure describes the permissions used in PDF security
 
     /* functions for graphics state */
     /* flag values: see vcl/outdev.hxx */
-    void                Push( USHORT nFlags = 0xffff );
-    void                Pop();
+    void				Push( USHORT nFlags = 0xffff );
+    void				Pop();
 
     void               SetClipRegion();
     void               SetClipRegion( const basegfx::B2DPolyPolygon& rRegion );
@@ -702,81 +702,81 @@ The following structure describes the permissions used in PDF security
 
 
     /* actual drawing functions */
-    void                DrawText( const Point& rPos, const String& rText );
+    void				DrawText( const Point& rPos, const String& rText );
 
-    void                DrawTextLine( const Point& rPos, long nWidth,
+    void				DrawTextLine( const Point& rPos, long nWidth,
                                       FontStrikeout eStrikeout,
                                       FontUnderline eUnderline,
                                       FontUnderline eOverline,
                                       BOOL bUnderlineAbove = FALSE );
-    void                DrawTextArray( const Point& rStartPt, const XubString& rStr,
+    void				DrawTextArray( const Point& rStartPt, const XubString& rStr,
                                        const sal_Int32* pDXAry = NULL,
                                        xub_StrLen nIndex = 0,
                                        xub_StrLen nLen = STRING_LEN );
-    void                DrawStretchText( const Point& rStartPt, ULONG nWidth,
+    void				DrawStretchText( const Point& rStartPt, ULONG nWidth,
                                          const XubString& rStr,
                                          xub_StrLen nIndex = 0, xub_StrLen nLen = STRING_LEN );
-    void                DrawText( const Rectangle& rRect,
+    void				DrawText( const Rectangle& rRect,
                                   const XubString& rStr, USHORT nStyle = 0 );
 
-    void                DrawPixel( const Point& rPt, const Color& rColor );
-    void                DrawPixel( const Point& rPt )
+    void				DrawPixel( const Point& rPt, const Color& rColor );
+    void				DrawPixel( const Point& rPt )
     { DrawPixel( rPt, Color( COL_TRANSPARENT ) ); }
-    void                DrawPixel( const Polygon& rPts, const Color* pColors = NULL );
-    void                DrawPixel( const Polygon& rPts, const Color& rColor )
+    void				DrawPixel( const Polygon& rPts, const Color* pColors = NULL );
+    void				DrawPixel( const Polygon& rPts, const Color& rColor )
     { Push(); SetLineColor( rColor ); DrawPixel( rPts ); Pop(); }
 
-    void                DrawLine( const Point& rStartPt, const Point& rEndPt );
-    void                DrawLine( const Point& rStartPt, const Point& rEndPt,
+    void				DrawLine( const Point& rStartPt, const Point& rEndPt );
+    void				DrawLine( const Point& rStartPt, const Point& rEndPt,
                                   const LineInfo& rLineInfo );
-    void                DrawPolyLine( const Polygon& rPoly );
-    void                DrawPolyLine( const Polygon& rPoly,
+    void				DrawPolyLine( const Polygon& rPoly );
+    void				DrawPolyLine( const Polygon& rPoly,
                                       const LineInfo& rLineInfo );
     void                DrawPolyLine( const Polygon& rPoly, const ExtLineInfo& rInfo );
-    void                DrawPolygon( const Polygon& rPoly );
-    void                DrawPolyPolygon( const PolyPolygon& rPolyPoly );
-    void                DrawRect( const Rectangle& rRect );
-    void                DrawRect( const Rectangle& rRect,
+    void				DrawPolygon( const Polygon& rPoly );
+    void				DrawPolyPolygon( const PolyPolygon& rPolyPoly );
+    void				DrawRect( const Rectangle& rRect );
+    void				DrawRect( const Rectangle& rRect,
                                   ULONG nHorzRount, ULONG nVertRound );
-    void                DrawEllipse( const Rectangle& rRect );
-    void                DrawArc( const Rectangle& rRect,
+    void				DrawEllipse( const Rectangle& rRect );
+    void				DrawArc( const Rectangle& rRect,
                                  const Point& rStartPt, const Point& rEndPt );
-    void                DrawPie( const Rectangle& rRect,
+    void				DrawPie( const Rectangle& rRect,
                                  const Point& rStartPt, const Point& rEndPt );
-    void                DrawChord( const Rectangle& rRect,
+    void				DrawChord( const Rectangle& rRect,
                                    const Point& rStartPt, const Point& rEndPt );
 
-    void                DrawBitmap( const Point& rDestPt,
+    void				DrawBitmap( const Point& rDestPt,
                                     const Bitmap& rBitmap );
-    void                DrawBitmap( const Point& rDestPt, const Size& rDestSize,
+    void				DrawBitmap( const Point& rDestPt, const Size& rDestSize,
                                     const Bitmap& rBitmap );
-    void                DrawBitmap( const Point& rDestPt, const Size& rDestSize,
+    void				DrawBitmap( const Point& rDestPt, const Size& rDestSize,
                                     const Point& rSrcPtPixel, const Size& rSrcSizePixel,
                                     const Bitmap& rBitmap );
 
-    void                DrawBitmapEx( const Point& rDestPt,
+    void				DrawBitmapEx( const Point& rDestPt,
                                       const BitmapEx& rBitmapEx );
-    void                DrawBitmapEx( const Point& rDestPt, const Size& rDestSize,
+    void				DrawBitmapEx( const Point& rDestPt, const Size& rDestSize,
                                       const BitmapEx& rBitmapEx );
-    void                DrawBitmapEx( const Point& rDestPt, const Size& rDestSize,
+    void				DrawBitmapEx( const Point& rDestPt, const Size& rDestSize,
                                       const Point& rSrcPtPixel, const Size& rSrcSizePixel,
                                       const BitmapEx& rBitmapEx );
 
-    void                DrawMask( const Point& rDestPt,
+    void				DrawMask( const Point& rDestPt,
                                   const Bitmap& rBitmap, const Color& rMaskColor );
-    void                DrawMask( const Point& rDestPt, const Size& rDestSize,
+    void				DrawMask( const Point& rDestPt, const Size& rDestSize,
                                   const Bitmap& rBitmap, const Color& rMaskColor );
-    void                DrawMask( const Point& rDestPt, const Size& rDestSize,
+    void				DrawMask( const Point& rDestPt, const Size& rDestSize,
                                   const Point& rSrcPtPixel, const Size& rSrcSizePixel,
                                   const Bitmap& rBitmap, const Color& rMaskColor );
 
-    void                DrawGradient( const Rectangle& rRect, const Gradient& rGradient );
-    void                DrawGradient( const PolyPolygon& rPolyPoly, const Gradient& rGradient );
+    void				DrawGradient( const Rectangle& rRect, const Gradient& rGradient );
+    void				DrawGradient( const PolyPolygon& rPolyPoly, const Gradient& rGradient );
 
-    void                DrawHatch( const PolyPolygon& rPolyPoly, const Hatch& rHatch );
+    void				DrawHatch( const PolyPolygon& rPolyPoly, const Hatch& rHatch );
 
-    void                DrawWallpaper( const Rectangle& rRect, const Wallpaper& rWallpaper );
-    void                DrawTransparent( const PolyPolygon& rPolyPoly,
+    void				DrawWallpaper( const Rectangle& rRect, const Wallpaper& rWallpaper );
+    void				DrawTransparent( const PolyPolygon& rPolyPoly,
                                          USHORT nTransparencePercent );
 
     /** Start a transparency group
@@ -797,7 +797,7 @@ The following structure describes the permissions used in PDF security
     will be ignored if the produced PDF has a lower version. The drawing
     operations will be emitted normally.
     */
-    void                BeginTransparencyGroup();
+    void				BeginTransparencyGroup();
 
     /** End a transparency group with constant transparency factor
 
@@ -810,7 +810,7 @@ The following structure describes the permissions used in PDF security
     @param nTransparencePercent
     The transparency factor
     */
-    void                EndTransparencyGroup( const Rectangle& rBoundRect, USHORT nTransparencePercent );
+    void				EndTransparencyGroup( const Rectangle& rBoundRect, USHORT nTransparencePercent );
 
     /** End a transparency group with an alpha mask
 
@@ -823,7 +823,7 @@ The following structure describes the permissions used in PDF security
     @param rAlphaMask
     The transparency mask; must be an 8 bit grayscale image
     */
-    void                EndTransparencyGroup( const Rectangle& rBoundRect, const Bitmap& rAlphaMask );
+    void				EndTransparencyGroup( const Rectangle& rBoundRect, const Bitmap& rAlphaMask );
 
     /** Insert a JPG encoded image (optionally with mask)
 
@@ -844,7 +844,7 @@ The following structure describes the permissions used in PDF security
     the same pixel size as the image and
     be either 1 bit black&white or 8 bit grey
     */
-    void                DrawJPGBitmap( SvStream& rJPGData, bool bIsTrueColor, const Size& rSrcSizePixel, const Rectangle& rTargetArea, const Bitmap& rMask );
+    void				DrawJPGBitmap( SvStream& rJPGData, bool bIsTrueColor, const Size& rSrcSizePixel, const Rectangle& rTargetArea, const Bitmap& rMask );
 
     /** Create a new named destination to be used in a link from another PDF document
 
@@ -865,7 +865,7 @@ The following structure describes the permissions used in PDF security
     the destination id (to be used in SetLinkDest) or
     -1 if page id does not exist
     */
-    sal_Int32           CreateNamedDest( const rtl::OUString& sDestName, const Rectangle& rRect, sal_Int32 nPageNr = -1, DestAreaType eType = XYZ );
+    sal_Int32			CreateNamedDest( const rtl::OUString& sDestName, const Rectangle& rRect, sal_Int32 nPageNr = -1, DestAreaType eType = XYZ );
     /** Create a new destination to be used in a link
 
     @param rRect
@@ -882,7 +882,7 @@ The following structure describes the permissions used in PDF security
     the destination id (to be used in SetLinkDest) or
     -1 if page id does not exist
     */
-    sal_Int32           CreateDest( const Rectangle& rRect, sal_Int32 nPageNr = -1, DestAreaType eType = XYZ );
+    sal_Int32			CreateDest( const Rectangle& rRect, sal_Int32 nPageNr = -1, DestAreaType eType = XYZ );
     /** Create a new link on a page
 
     @param rRect
@@ -897,7 +897,7 @@ The following structure describes the permissions used in PDF security
     the link id (to be used in SetLinkDest, SetLinkURL) or
     -1 if page id does not exist
     */
-    sal_Int32           CreateLink( const Rectangle& rRect, sal_Int32 nPageNr = -1 );
+    sal_Int32			CreateLink( const Rectangle& rRect, sal_Int32 nPageNr = -1 );
     /** Set the destination for a link
         <p>will change a URL type link to a dest link if necessary</p>
 
@@ -911,7 +911,7 @@ The following structure describes the permissions used in PDF security
         -1 in case the link id does not exist
         -2 in case the dest id does not exist
     */
-    sal_Int32           SetLinkDest( sal_Int32 nLinkId, sal_Int32 nDestId );
+    sal_Int32			SetLinkDest( sal_Int32 nLinkId, sal_Int32 nDestId );
     /** Set the URL for a link
         <p>will change a dest type link to an URL type link if necessary</p>
         @param nLinkId
@@ -926,7 +926,7 @@ The following structure describes the permissions used in PDF security
         0 for success
         -1 in case the link id does not exist
     */
-    sal_Int32           SetLinkURL( sal_Int32 nLinkId, const rtl::OUString& rURL );
+    sal_Int32			SetLinkURL( sal_Int32 nLinkId, const rtl::OUString& rURL );
     /** Resolve link in logical structure
         <p>
         If a link is created after the corresponding visual appearance was drawn
@@ -956,7 +956,7 @@ The following structure describes the permissions used in PDF security
         the arbitrary id set in a <code>Link</code> structure element to address
         the link with real id <code>nLinkId</code>
      */
-    void                SetLinkPropertyID( sal_Int32 nLinkId, sal_Int32 nPropertyID );
+    void				SetLinkPropertyID( sal_Int32 nLinkId, sal_Int32 nPropertyID );
     /** Create a new outline item
 
         @param nParent
diff --git a/vcl/inc/vcl/pngread.hxx b/vcl/inc/vcl/pngread.hxx
index d2879f8f182a..e351fa9fe240 100644
--- a/vcl/inc/vcl/pngread.hxx
+++ b/vcl/inc/vcl/pngread.hxx
@@ -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
@@ -42,7 +42,7 @@ namespace vcl
 
     class VCL_DLLPUBLIC PNGReader
     {
-        PNGReaderImpl*          mpImpl;
+        PNGReaderImpl*			mpImpl;
 
     public:
 
@@ -53,15 +53,15 @@ namespace vcl
 
         /* an empty preview size hint (=default) will read the whole image
         */
-        BitmapEx                        Read( const Size& i_rPreviewHint = Size() );
+        BitmapEx						Read( const Size& i_rPreviewHint = Size() );
 
         // retrieve every chunk that resides inside the PNG
         struct ChunkData
         {
-            sal_uInt32                  nType;
-            std::vector< sal_uInt8 >    aData;
+            sal_uInt32					nType;
+            std::vector< sal_uInt8 >	aData;
         };
-        const std::vector< ChunkData >& GetChunks() const;
+        const std::vector< ChunkData >&	GetChunks() const;
 
         void SetIgnoreGammaChunk( sal_Bool b );
     };
diff --git a/vcl/inc/vcl/pngwrite.hxx b/vcl/inc/vcl/pngwrite.hxx
index 38ca97a8c931..351bbea31075 100644
--- a/vcl/inc/vcl/pngwrite.hxx
+++ b/vcl/inc/vcl/pngwrite.hxx
@@ -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
@@ -44,7 +44,7 @@ namespace vcl
 
     class VCL_DLLPUBLIC PNGWriter
     {
-        PNGWriterImpl*          mpImpl;
+        PNGWriterImpl*			mpImpl;
 
     public:
 
@@ -57,8 +57,8 @@ namespace vcl
         // additional method to be able to modify all chunk before they are stored
         struct ChunkData
         {
-            sal_uInt32                  nType;
-            std::vector< sal_uInt8 >    aData;
+            sal_uInt32					nType;
+            std::vector< sal_uInt8 >	aData;
         };
         std::vector< vcl::PNGWriter::ChunkData >& GetChunks();
     };
diff --git a/vcl/inc/vcl/pointr.hxx b/vcl/inc/vcl/pointr.hxx
index b90b3b04d134..dde64dda744a 100644
--- a/vcl/inc/vcl/pointr.hxx
+++ b/vcl/inc/vcl/pointr.hxx
@@ -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
@@ -40,7 +40,7 @@ class Point;
 
 class VCL_DLLPUBLIC Pointer
 {
-    PointerStyle    meStyle;
+    PointerStyle	meStyle;
 
 public:
                     Pointer()
@@ -48,11 +48,11 @@ public:
                     Pointer( PointerStyle eStyle )
                         { meStyle = eStyle; }
 
-    PointerStyle    GetStyle() const { return meStyle; }
+    PointerStyle	GetStyle() const { return meStyle; }
 
-    BOOL            operator==( const Pointer& rPointer ) const
+    BOOL			operator==( const Pointer& rPointer ) const
                         { return (meStyle == rPointer.meStyle); }
-    BOOL            operator!=( const Pointer& rPointer ) const
+    BOOL			operator!=( const Pointer& rPointer ) const
                         { return !(Pointer::operator==( rPointer )); }
 };
 
diff --git a/vcl/inc/vcl/polyscan.hxx b/vcl/inc/vcl/polyscan.hxx
index 1c699e36623d..0ea3284a53ef 100644
--- a/vcl/inc/vcl/polyscan.hxx
+++ b/vcl/inc/vcl/polyscan.hxx
@@ -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
@@ -36,14 +36,14 @@
 
 struct ScanlinePoint
 {
-    long            mnX;
-    ScanlinePoint*  mpNext;
+    long			mnX;
+    ScanlinePoint*	mpNext;
 
                     ScanlinePoint() : mnX( 0L ), mpNext( NULL ) {};
                     ScanlinePoint( long nX, ScanlinePoint* pNext ) : mnX( nX ), mpNext( pNext ) {};
                     ~ScanlinePoint() {};
 
-    void            Set( long nX, ScanlinePoint* pNext ) { mnX = nX, mpNext = pNext; }
+    void			Set( long nX, ScanlinePoint* pNext ) { mnX = nX, mpNext = pNext; }
 };
 
 // -------------------
@@ -52,11 +52,11 @@ struct ScanlinePoint
 
 struct PolyScanSegment
 {
-    long            mnStart;
-    long            mnEnd;
-
+    long			mnStart;
+    long			mnEnd;
+                    
                     PolyScanSegment() : mnStart( 0L ), mnEnd( 0L ) {};
-                    PolyScanSegment( long nStart, long nEnd ) : mnStart( nStart ), mnEnd( nEnd ) {};
+                    PolyScanSegment( long nStart, long nEnd ) : mnStart( nStart ), mnEnd( nEnd ) {}; 
                     ~PolyScanSegment() {};
 };
 
@@ -64,36 +64,36 @@ struct PolyScanSegment
 // - PolyScanline -
 // ----------------
 
-struct  ScanlinePoint;
-class   Polygon;
-class   PolyPolygon;
+struct	ScanlinePoint;
+class	Polygon;
+class	PolyPolygon;
 
 class PolyScanline
 {
 private:
 
-    ScanlinePoint*          mpFirst;
-    ScanlinePoint*          mpLast;
-    ScanlinePoint*          mpAct;
-    long                    mnLeft;
-    long                    mnRight;
-
-    void                    ImplDelete();
-
+    ScanlinePoint*			mpFirst;
+    ScanlinePoint*			mpLast;
+    ScanlinePoint*			mpAct;
+    long					mnLeft;
+    long					mnRight;
+                            
+    void					ImplDelete();
+                            
 public:
-
+                            
                             PolyScanline();
                             ~PolyScanline();
-
-    void                    Insert( long nX );
-    void                    Set( long nStart, long nEnd );
-    void                    Set( const PolyScanSegment& rSegment ) { Set( rSegment.mnStart, rSegment.mnEnd ); }
-
-    inline BOOL             GetFirstX( long& rX );
-    inline BOOL             GetNextX( long& rX );
-
-    BOOL                    GetFirstSegment( PolyScanSegment& rSegment );
-    BOOL                    GetNextSegment( PolyScanSegment& rSegment );
+                            
+    void					Insert( long nX );
+    void					Set( long nStart, long nEnd );
+    void					Set( const PolyScanSegment& rSegment ) { Set( rSegment.mnStart, rSegment.mnEnd ); }
+                            
+    inline BOOL				GetFirstX( long& rX );
+    inline BOOL				GetNextX( long& rX );
+                            
+    BOOL					GetFirstSegment( PolyScanSegment& rSegment );
+    BOOL					GetNextSegment( PolyScanSegment& rSegment );
 };
 
 // ------------------------------------------------------------------------
@@ -118,18 +118,18 @@ inline BOOL PolyScanline::GetNextX( long& rX )
 class PolyScanner
 {
 private:
-
-    PolyScanline*   mpArray;
-    long            mnLeft;
-    long            mnTop;
-    long            mnRight;
-    long            mnBottom;
+    
+    PolyScanline*	mpArray;
+    long			mnLeft;
+    long			mnTop;
+    long			mnRight;
+    long			mnBottom;
 
                     PolyScanner() {};
 
 protected:
 
-    void            InsertLine( const Point& rStart, const Point& rEnd );
+    void			InsertLine( const Point& rStart, const Point& rEnd );
 
 public:
 
@@ -138,18 +138,18 @@ public:
                     PolyScanner( const PolyPolygon& rPolyPoly );
                     ~PolyScanner();
 
-    long            Left() const { return mnLeft; }
-    long            Top() const { return mnTop; }
-    long            Right() const { return mnRight; }
-    long            Bottom() const { return mnBottom; }
+    long			Left() const { return mnLeft; }
+    long			Top() const { return mnTop; }
+    long			Right() const { return mnRight; }
+    long			Bottom() const { return mnBottom; }
 
-    long            Width() const { return( mnRight - mnLeft + 1L ); }
-    long            Height() const { return( mnBottom - mnTop + 1L ); }
+    long			Width() const { return( mnRight - mnLeft + 1L ); }
+    long			Height() const { return( mnBottom - mnTop + 1L ); }
 
-    Rectangle       GetBoundRect() const { return Rectangle( mnLeft, mnTop, mnRight, mnBottom ); }
+    Rectangle		GetBoundRect() const { return Rectangle( mnLeft, mnTop, mnRight, mnBottom ); }
 
-    ULONG           Count() const { return Height(); }
-    PolyScanline*   operator[]( ULONG nPos ) const;
+    ULONG			Count() const { return Height(); }
+    PolyScanline*	operator[]( ULONG nPos ) const;
 };
 
 #endif // _SV_POLYSCAN_HXX
diff --git a/vcl/inc/vcl/popupmenuwindow.hxx b/vcl/inc/vcl/popupmenuwindow.hxx
index 5ed794ff56ca..0ea71869da84 100644
--- a/vcl/inc/vcl/popupmenuwindow.hxx
+++ b/vcl/inc/vcl/popupmenuwindow.hxx
@@ -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
diff --git a/vcl/inc/vcl/ppdparser.hxx b/vcl/inc/vcl/ppdparser.hxx
index c7a1e09b81e4..a6969b2360b9 100644
--- a/vcl/inc/vcl/ppdparser.hxx
+++ b/vcl/inc/vcl/ppdparser.hxx
@@ -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
@@ -65,22 +65,22 @@ class PPDKey
     typedef ::std::hash_map< ::rtl::OUString, PPDValue, ::rtl::OUStringHash > hash_type;
     typedef ::std::vector< PPDValue* > value_type;
 
-    String              m_aKey;
-    hash_type           m_aValues;
-    value_type          m_aOrderedValues;
-    const PPDValue*     m_pDefaultValue;
-    bool                m_bQueryValue;
-    PPDValue            m_aQueryValue;
+    String          	m_aKey;
+    hash_type			m_aValues;
+    value_type			m_aOrderedValues;
+    const PPDValue*		m_pDefaultValue;
+    bool            	m_bQueryValue;
+    PPDValue        	m_aQueryValue;
 
 public:
     enum UIType { PickOne, PickMany, Boolean };
     enum SetupType { ExitServer, Prolog, DocumentSetup, PageSetup, JCLSetup, AnySetup };
 private:
 
-    bool                m_bUIOption;
-    UIType              m_eUIType;
-    int                 m_nOrderDependency;
-    SetupType           m_eSetupType;
+    bool				m_bUIOption;
+    UIType				m_eUIType;
+    int					m_nOrderDependency;
+    SetupType			m_eSetupType;
 
     void eraseValue( const String& rOption );
 public:
@@ -145,42 +145,42 @@ private:
     static ::std::hash_map< rtl::OUString, rtl::OUString, rtl::OUStringHash >*
                                                 pAllPPDFiles;
 
-    hash_type                                   m_aKeys;
-    value_type                                  m_aOrderedKeys;
-    ::std::list< PPDConstraint >                m_aConstraints;
+    hash_type									m_aKeys;
+    value_type									m_aOrderedKeys;
+    ::std::list< PPDConstraint >				m_aConstraints;
 
     // some identifying fields
-    String                                      m_aPrinterName;
-    String                                      m_aNickName;
+    String                          			m_aPrinterName;
+    String                          			m_aNickName;
     // the full path of the PPD file
-    String                                      m_aFile;
+    String                          			m_aFile;
     // some basic attributes
-    bool                                        m_bColorDevice;
-    bool                                        m_bType42Capable;
-    ULONG                                       m_nLanguageLevel;
+    bool                            			m_bColorDevice;
+    bool                            			m_bType42Capable;
+    ULONG                           			m_nLanguageLevel;
     rtl_TextEncoding                            m_aFileEncoding;
 
 
     // shortcuts to important keys and their default values
     // imageable area
-    const PPDValue*                             m_pDefaultImageableArea;
-    const PPDKey*                               m_pImageableAreas;
+    const PPDValue*                     		m_pDefaultImageableArea;
+    const PPDKey*                       		m_pImageableAreas;
     // paper dimensions
-    const PPDValue*                             m_pDefaultPaperDimension;
-    const PPDKey*                               m_pPaperDimensions;
+    const PPDValue*                     		m_pDefaultPaperDimension;
+    const PPDKey*                       		m_pPaperDimensions;
     // paper trays
-    const PPDValue*                             m_pDefaultInputSlot;
-    const PPDKey*                               m_pInputSlots;
+    const PPDValue*                     		m_pDefaultInputSlot;
+    const PPDKey*                       		m_pInputSlots;
     // resolutions
-    const PPDValue*                             m_pDefaultResolution;
-    const PPDKey*                               m_pResolutions;
+    const PPDValue*                     		m_pDefaultResolution;
+    const PPDKey*                       		m_pResolutions;
     // duplex commands
-    const PPDValue*                             m_pDefaultDuplexType;
-    const PPDKey*                               m_pDuplexTypes;
+    const PPDValue*                     		m_pDefaultDuplexType;
+    const PPDKey*                       		m_pDuplexTypes;
 
     // fonts
-    const PPDKey*                               m_pFontList;
-
+    const PPDKey*                       		m_pFontList;
+    
     // translations
     PPDTranslator*                              m_pTranslator;
 
@@ -191,7 +191,7 @@ private:
     void parseOpenUI( const ByteString& rLine );
     void parseConstraint( const ByteString& rLine );
     void parse( std::list< ByteString >& rLines );
-
+    
     String handleTranslation( const ByteString& i_rString, bool i_bIsGlobalized );
 
     static void scanPPDDir( const String& rDir );
@@ -236,15 +236,15 @@ public:
 
     // match the best paper for width and height
     String          matchPaper( int nWidth, int nHeight ) const;
-
+    
     bool getMargins( const String& rPaperName,
                      int &rLeft, int& rRight,
                      int &rUpper, int& rLower ) const;
     // values in pt
     // returns true if paper found
-
+    
     // values int pt
-
+    
     String          getDefaultInputSlot() const;
     int             getInputSlots() const
     { return m_pInputSlots ? m_pInputSlots->countValues() : 0; }
@@ -276,8 +276,8 @@ public:
                                        String& rEncoding,
                                        String& rCharset ) const;
     String          getFont( int ) const;
-
-
+    
+    
     rtl::OUString   translateKey( const rtl::OUString& i_rKey,
                                   const com::sun::star::lang::Locale& i_rLocale = com::sun::star::lang::Locale() ) const;
     rtl::OUString   translateOption( const rtl::OUString& i_rKey,
diff --git a/vcl/inc/vcl/print.h b/vcl/inc/vcl/print.h
index 78c1bb647575..bb964d0049d4 100644
--- a/vcl/inc/vcl/print.h
+++ b/vcl/inc/vcl/print.h
@@ -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
@@ -47,8 +47,8 @@ namespace vcl
 
 struct ImplPrnQueueData
 {
-    QueueInfo*              mpQueueInfo;
-    SalPrinterQueueInfo*    mpSalQueueInfo;
+    QueueInfo*				mpQueueInfo;
+    SalPrinterQueueInfo*	mpSalQueueInfo;
 };
 
 // --------------------
@@ -66,7 +66,7 @@ public:
     ImplPrnQueueList() {}
     ~ImplPrnQueueList();
 
-    void                    Add( SalPrinterQueueInfo* pData );
+    void					Add( SalPrinterQueueInfo* pData );
     ImplPrnQueueData*       Get( const rtl::OUString& rPrinter );
 };
 
diff --git a/vcl/inc/vcl/print.hxx b/vcl/inc/vcl/print.hxx
index 96822d9bc756..7079b641d0b5 100644
--- a/vcl/inc/vcl/print.hxx
+++ b/vcl/inc/vcl/print.hxx
@@ -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
@@ -61,7 +61,7 @@ namespace vcl {
 // - Printer-Types -
 // -----------------
 
-#define PAGEQUEUE_ALLPAGES   0xFFFF
+#define PAGEQUEUE_ALLPAGES	 0xFFFF
 
 enum PrinterSupport { SUPPORT_SET_ORIENTATION, SUPPORT_SET_PAPERBIN,
                       SUPPORT_SET_PAPERSIZE, SUPPORT_SET_PAPER,
@@ -105,29 +105,29 @@ class VCL_DLLPUBLIC QueueInfo
     friend class Printer;
 
 private:
-    XubString                   maPrinterName;
-    XubString                   maDriver;
-    XubString                   maLocation;
-    XubString                   maComment;
-    sal_uInt32                  mnStatus;
-    sal_uInt32                  mnJobs;
+    XubString					maPrinterName;
+    XubString					maDriver;
+    XubString					maLocation;
+    XubString					maComment;
+    sal_uInt32					mnStatus;
+    sal_uInt32					mnJobs;
 
 public:
                                 QueueInfo();
                                 QueueInfo( const QueueInfo& rInfo );
                                 ~QueueInfo();
 
-    const XubString&            GetPrinterName() const { return maPrinterName; }
-    const XubString&            GetDriver() const { return maDriver; }
-    const XubString&            GetLocation() const { return maLocation; }
-    const XubString&            GetComment() const { return maComment; }
-    sal_uInt32                  GetStatus() const { return mnStatus; }
-    sal_uInt32                  GetJobs() const { return mnJobs; }
+    const XubString&			GetPrinterName() const { return maPrinterName; }
+    const XubString&			GetDriver() const { return maDriver; }
+    const XubString&			GetLocation() const { return maLocation; }
+    const XubString&			GetComment() const { return maComment; }
+    sal_uInt32					GetStatus() const { return mnStatus; }
+    sal_uInt32					GetJobs() const { return mnJobs; }
 
     bool operator==( const QueueInfo& rInfo ) const;
 
-    friend VCL_DLLPUBLIC SvStream&          operator>>( SvStream& rIStream, QueueInfo& rInfo );
-    friend VCL_DLLPUBLIC SvStream&          operator<<( SvStream& rOStream, const QueueInfo& rInfo );
+    friend VCL_DLLPUBLIC SvStream&			operator>>( SvStream& rIStream, QueueInfo& rInfo );
+    friend VCL_DLLPUBLIC SvStream&			operator<<( SvStream& rOStream, const QueueInfo& rInfo );
 };
 
 // ------------------
@@ -135,7 +135,7 @@ public:
 // ------------------
 
 enum PrinterTransparencyMode
-{
+{   
     PRINTER_TRANSPARENCY_AUTO = 0,
     PRINTER_TRANSPARENCY_NONE = 1
 };
@@ -143,7 +143,7 @@ enum PrinterTransparencyMode
 // -----------------------------------------------------------------------------
 
 enum PrinterGradientMode
-{
+{   
     PRINTER_GRADIENT_STRIPES = 0,
     PRINTER_GRADIENT_COLOR = 1
 };
@@ -151,7 +151,7 @@ enum PrinterGradientMode
 // -----------------------------------------------------------------------------
 
 enum PrinterBitmapMode
-{
+{   
     PRINTER_BITMAP_OPTIMAL = 0,
     PRINTER_BITMAP_NORMAL = 1,
     PRINTER_BITMAP_RESOLUTION = 2
@@ -175,31 +175,31 @@ private:
     BOOL                        mbConvertToGreyscales;
 
 public:
-
+                                   
                                 PrinterOptions();
                                 ~PrinterOptions();
 
     BOOL                        IsReduceTransparency() const { return mbReduceTransparency; }
     void                        SetReduceTransparency( BOOL bSet ) { mbReduceTransparency = bSet; }
-
+    
     PrinterTransparencyMode     GetReducedTransparencyMode() const { return meReducedTransparencyMode; }
     void                        SetReducedTransparencyMode( PrinterTransparencyMode eMode ) { meReducedTransparencyMode = eMode; }
-
+    
     BOOL                        IsReduceGradients() const { return mbReduceGradients; }
     void                        SetReduceGradients( BOOL bSet ) { mbReduceGradients = bSet; }
-
+    
     PrinterGradientMode         GetReducedGradientMode() const { return meReducedGradientsMode; }
     void                        SetReducedGradientMode( PrinterGradientMode eMode ) { meReducedGradientsMode = eMode; }
 
     USHORT                      GetReducedGradientStepCount() const { return mnReducedGradientStepCount; }
     void                        SetReducedGradientStepCount( USHORT nStepCount ) { mnReducedGradientStepCount = nStepCount; }
-
+    
     BOOL                        IsReduceBitmaps() const { return mbReduceBitmaps; }
     void                        SetReduceBitmaps( BOOL bSet ) { mbReduceBitmaps = bSet; }
-
+    
     PrinterBitmapMode           GetReducedBitmapMode() const { return meReducedBitmapMode; }
     void                        SetReducedBitmapMode( PrinterBitmapMode eMode ) { meReducedBitmapMode = eMode; }
-
+    
     USHORT                      GetReducedBitmapResolution() const { return mnReducedBitmapResolution; }
     void                        SetReducedBitmapResolution( USHORT nResolution ) { mnReducedBitmapResolution = nResolution; }
 
@@ -220,53 +220,53 @@ class VCL_DLLPUBLIC Printer : public OutputDevice
     friend class ImplQPrinter;
 
 private:
-    SalInfoPrinter*             mpInfoPrinter;
-    SalPrinter*                 mpPrinter;
-    SalGraphics*                mpJobGraphics;
-    Printer*                    mpPrev;
-    Printer*                    mpNext;
-    VirtualDevice*              mpDisplayDev;
+    SalInfoPrinter* 			mpInfoPrinter;
+    SalPrinter* 				mpPrinter;
+    SalGraphics*				mpJobGraphics;
+    Printer*					mpPrev;
+    Printer*					mpNext;
+    VirtualDevice*				mpDisplayDev;
     PrinterOptions*             mpPrinterOptions;
-    XubString                   maPrinterName;
-    XubString                   maDriver;
-    XubString                   maPrintFile;
-    XubString                   maJobName;
-    JobSetup                    maJobSetup;
-    Point                       maPageOffset;
-    Size                        maPaperSize;
-    ULONG                       mnError;
-    USHORT                      mnCurPage;
-    USHORT                      mnCurPrintPage;
-    USHORT                      mnPageQueueSize;
-    USHORT                      mnCopyCount;
-    BOOL                        mbDefPrinter;
-    BOOL                        mbPrinting;
-    BOOL                        mbJobActive;
-    BOOL                        mbCollateCopy;
-    BOOL                        mbPrintFile;
-    BOOL                        mbInPrintPage;
-    BOOL                        mbNewJobSetup;
-    BOOL                        mbIsQueuePrinter;
-    BOOL                        mbUserSetupCompleted;
-    BOOL                        mbUserSetupResult;
-    Link                        maErrorHdl;
-
-    SAL_DLLPRIVATE void         ImplInitData();
-    SAL_DLLPRIVATE void         ImplInit( SalPrinterQueueInfo* pInfo );
-    SAL_DLLPRIVATE void         ImplInitDisplay( const Window* pWindow );
+    XubString					maPrinterName;
+    XubString					maDriver;
+    XubString					maPrintFile;
+    XubString					maJobName;
+    JobSetup					maJobSetup;
+    Point						maPageOffset;
+    Size						maPaperSize;
+    ULONG						mnError;
+    USHORT						mnCurPage;
+    USHORT						mnCurPrintPage;
+    USHORT						mnPageQueueSize;
+    USHORT						mnCopyCount;
+    BOOL						mbDefPrinter;
+    BOOL						mbPrinting;
+    BOOL						mbJobActive;
+    BOOL						mbCollateCopy;
+    BOOL						mbPrintFile;
+    BOOL						mbInPrintPage;
+    BOOL						mbNewJobSetup;
+    BOOL						mbIsQueuePrinter;
+    BOOL						mbUserSetupCompleted;
+    BOOL						mbUserSetupResult;
+    Link						maErrorHdl;
+
+    SAL_DLLPRIVATE void			ImplInitData();
+    SAL_DLLPRIVATE void			ImplInit( SalPrinterQueueInfo* pInfo );
+    SAL_DLLPRIVATE void			ImplInitDisplay( const Window* pWindow );
     SAL_DLLPRIVATE static SalPrinterQueueInfo* ImplGetQueueInfo( const XubString& rPrinterName,
                                                   const XubString* pDriver );
-    SAL_DLLPRIVATE void         ImplUpdatePageData();
-    SAL_DLLPRIVATE void         ImplUpdateFontList();
-    SAL_DLLPRIVATE void         ImplFindPaperFormatForUserSize( JobSetup&, bool bMatchNearest );
+    SAL_DLLPRIVATE void			ImplUpdatePageData();
+    SAL_DLLPRIVATE void			ImplUpdateFontList();
+    SAL_DLLPRIVATE void			ImplFindPaperFormatForUserSize( JobSetup&, bool bMatchNearest );
     DECL_DLLPRIVATE_LINK(       ImplDestroyPrinterAsync, void* );
 
     SAL_DLLPRIVATE bool StartJob( const rtl::OUString& rJobName, boost::shared_ptr<vcl::PrinterController>& );
-
+    
     static SAL_DLLPRIVATE ULONG ImplSalPrinterErrorCodeToVCL( ULONG nError );
 
 private:
-    SAL_DLLPRIVATE void         ImplEndPrint();
+    SAL_DLLPRIVATE void			ImplEndPrint();
     SAL_DLLPRIVATE BOOL         EndJob();
     SAL_DLLPRIVATE              Printer( const Printer& rPrinter );
     SAL_DLLPRIVATE Printer&     operator =( const Printer& rPrinter );
@@ -279,8 +279,8 @@ public:
 
 protected:
 
-    void                        SetSelfAsQueuePrinter( BOOL bQueuePrinter ) { mbIsQueuePrinter = bQueuePrinter; }
-    BOOL                        IsQueuePrinter() const { return mbIsQueuePrinter; }
+    void						SetSelfAsQueuePrinter( BOOL bQueuePrinter ) { mbIsQueuePrinter = bQueuePrinter; }
+    BOOL						IsQueuePrinter() const { return mbIsQueuePrinter; }
 
 public:
                                 Printer();
@@ -288,84 +288,84 @@ public:
                                 Printer( const JobSetup& rJobSetup );
                                 Printer( const QueueInfo& rQueueInfo );
                                 Printer( const XubString& rPrinterName );
-    virtual                     ~Printer();
+    virtual 					~Printer();
 
     static const std::vector< rtl::OUString >& GetPrinterQueues();
     static const QueueInfo*     GetQueueInfo( const String& rPrinterName, bool bStatusUpdate );
-    static XubString            GetDefaultPrinterName();
+    static XubString			GetDefaultPrinterName();
 
-    virtual void                Error();
+    virtual void				Error();
 
-    const XubString&            GetName() const             { return maPrinterName; }
-    const XubString&            GetDriverName() const       { return maDriver; }
-    BOOL                        IsDefPrinter() const        { return mbDefPrinter; }
-    BOOL                        IsDisplayPrinter() const    { return mpDisplayDev != NULL; }
-    BOOL                        IsValid() const             { return !IsDisplayPrinter(); }
+    const XubString&			GetName() const 			{ return maPrinterName; }
+    const XubString&			GetDriverName() const		{ return maDriver; }
+    BOOL						IsDefPrinter() const		{ return mbDefPrinter; }
+    BOOL						IsDisplayPrinter() const	{ return mpDisplayDev != NULL; }
+    BOOL						IsValid() const 			{ return !IsDisplayPrinter(); }
 
-    ULONG                       GetCapabilities( USHORT nType ) const;
-    BOOL                        HasSupport( PrinterSupport eFeature ) const;
+    ULONG						GetCapabilities( USHORT nType ) const;
+    BOOL						HasSupport( PrinterSupport eFeature ) const;
 
-    BOOL                        SetJobSetup( const JobSetup& rSetup );
-    const JobSetup&             GetJobSetup() const { return maJobSetup; }
-    String                      GetJobValue( const String& rKey ) const { return maJobSetup.GetValue( rKey ); }
-    void                        SetJobValue( const String& rKey, const String& rValue ) { maJobSetup.SetValue( rKey, rValue ); }
+    BOOL						SetJobSetup( const JobSetup& rSetup );
+    const JobSetup& 			GetJobSetup() const { return maJobSetup; }
+    String						GetJobValue( const String& rKey ) const { return maJobSetup.GetValue( rKey ); }
+    void						SetJobValue( const String& rKey, const String& rValue ) { maJobSetup.SetValue( rKey, rValue ); }
 
-    BOOL                        Setup( Window* pWindow = NULL );
-    BOOL                        SetPrinterProps( const Printer* pPrinter );
+    BOOL						Setup( Window* pWindow = NULL );
+    BOOL						SetPrinterProps( const Printer* pPrinter );
 
     void                        SetPrinterOptions( const PrinterOptions& rOptions ) { *mpPrinterOptions = rOptions; }
     const PrinterOptions&       GetPrinterOptions() const { return( *mpPrinterOptions ); }
 
-    BOOL                        SetOrientation( Orientation eOrient );
-    Orientation                 GetOrientation() const;
+    BOOL						SetOrientation( Orientation eOrient );
+    Orientation 				GetOrientation() const;
     DuplexMode                  GetDuplexMode() const;
     BOOL                        SetDuplexMode( DuplexMode );
     // returns the angle that a landscape page will be turned counterclockwise
     // wrt to portrait. The return value may be only valid for
     // the current paper
-    int                         GetLandscapeAngle() const;
-    BOOL                        SetPaperBin( USHORT nPaperBin );
-    USHORT                      GetPaperBin() const;
-    BOOL                        SetPaper( Paper ePaper );
-    BOOL                        SetPaperSizeUser( const Size& rSize );
-    BOOL                        SetPaperSizeUser( const Size& rSize, bool bMatchNearest );
-    Paper                   GetPaper() const;
+    int							GetLandscapeAngle() const;
+    BOOL						SetPaperBin( USHORT nPaperBin );
+    USHORT						GetPaperBin() const;
+    BOOL						SetPaper( Paper ePaper );
+    BOOL						SetPaperSizeUser( const Size& rSize );
+    BOOL						SetPaperSizeUser( const Size& rSize, bool bMatchNearest );
+    Paper					GetPaper() const;
 
     // returns number of available paper formats
-    int                         GetPaperInfoCount() const;
+    int							GetPaperInfoCount() const;
     // returns info about paper format nPaper
-    const PaperInfo&            GetPaperInfo( int nPaper ) const;
-    USHORT                      GetPaperBinCount() const;
-    XubString                   GetPaperBinName( USHORT nPaperBin ) const;
-
-    const Size&                 GetPaperSizePixel() const { return maPaperSize; }
-    Size                        GetPaperSize() const { return PixelToLogic( maPaperSize ); }
-    const Point&                GetPageOffsetPixel() const { return maPageOffset; }
-    Point                       GetPageOffset() const { return PixelToLogic( maPageOffset ); }
-
-    BOOL                        SetCopyCount( USHORT nCopy, BOOL bCollate = FALSE );
-    USHORT                      GetCopyCount() const { return mnCopyCount; }
-    BOOL                        IsCollateCopy() const { return mbCollateCopy; }
-
-    BOOL                        IsPrinting() const { return mbPrinting; }
-
-    void                        SetPrintFile( const XubString& rFileName ) { maPrintFile = rFileName; }
-    const XubString&            GetPrintFile() const { return maPrintFile; }
-    void                        EnablePrintFile( BOOL bEnable ) { mbPrintFile = bEnable; }
-    BOOL                        IsPrintFileEnabled() const { return mbPrintFile; }
-    BOOL                        AbortJob();
-    const XubString&            GetCurJobName() const { return maJobName; }
-    USHORT                      GetCurPage() const { return mnCurPage; }
-    BOOL                        IsJobActive() const { return mbJobActive; }
-
-    ULONG                       GetError() const { return ERRCODE_TOERROR(mnError); }
-    ULONG                       GetErrorCode() const { return mnError; }
-
-    void                        SetErrorHdl( const Link& rLink ) { maErrorHdl = rLink; }
-    const Link&                 GetErrorHdl() const { return maErrorHdl; }
-
+    const PaperInfo&			GetPaperInfo( int nPaper ) const;
+    USHORT						GetPaperBinCount() const;
+    XubString					GetPaperBinName( USHORT nPaperBin ) const;
+
+    const Size& 				GetPaperSizePixel() const { return maPaperSize; }
+    Size						GetPaperSize() const { return PixelToLogic( maPaperSize ); }
+    const Point&				GetPageOffsetPixel() const { return maPageOffset; }
+    Point						GetPageOffset() const { return PixelToLogic( maPageOffset ); }
+
+    BOOL						SetCopyCount( USHORT nCopy, BOOL bCollate = FALSE );
+    USHORT						GetCopyCount() const { return mnCopyCount; }
+    BOOL						IsCollateCopy() const { return mbCollateCopy; }
+
+    BOOL						IsPrinting() const { return mbPrinting; }
+
+    void						SetPrintFile( const XubString& rFileName ) { maPrintFile = rFileName; }
+    const XubString&			GetPrintFile() const { return maPrintFile; }
+    void						EnablePrintFile( BOOL bEnable ) { mbPrintFile = bEnable; }
+    BOOL						IsPrintFileEnabled() const { return mbPrintFile; }
+    BOOL						AbortJob();
+    const XubString&			GetCurJobName() const { return maJobName; }
+    USHORT						GetCurPage() const { return mnCurPage; }
+    BOOL						IsJobActive() const { return mbJobActive; }
+
+    ULONG						GetError() const { return ERRCODE_TOERROR(mnError); }
+    ULONG						GetErrorCode() const { return mnError; }
+
+    void						SetErrorHdl( const Link& rLink ) { maErrorHdl = rLink; }
+    const Link& 				GetErrorHdl() const { return maErrorHdl; }
+    
     void                        Compat_OldPrinterMetrics( bool bSet );
-
+    
     /** checks the printer list and updates it necessary
     *
     *   sends a DataChanged event of type DATACHANGED_PRINTER
@@ -374,9 +374,9 @@ public:
     static void updatePrinters();
 
     /** execute a print job
-
+    
         starts a print job asynchronously (that is will return
-
+    
     */
     static void PrintJob( const boost::shared_ptr<vcl::PrinterController>& i_pController,
                           const JobSetup& i_rInitSetup
@@ -416,7 +416,7 @@ public:
         long                                   nVerticalSpacing;
         bool                                   bDrawBorder;
         PrinterController::NupOrderType        nOrder;
-
+        
         MultiPageSetup()
         : nRows( 1 ), nColumns( 1 ), nRepeat( 1 ), aPaperSize( 21000, 29700 )
         , nLeftMargin( 0 ), nTopMargin( 0 )
@@ -427,30 +427,30 @@ public:
         {
         }
     };
-
+    
     struct PageSize
     {
         Size        aSize;          // in 100th mm
         bool        bFullPaper;     // full paper, not only imageable area is printed
-
+        
         PageSize( const Size& i_rSize = Size( 21000, 29700 ),
                   bool i_bFullPaper = false
                   ) : aSize( i_rSize ), bFullPaper( i_bFullPaper ) {}
     };
-
+    
     PrinterController();
     virtual ~PrinterController();
-
+    
     const boost::shared_ptr<Printer>& getPrinter() const;
     /* for implementations: get current job properties as changed by e.g. print dialog
        this gets the current set of properties initially told to Printer::PrintJob
-
+    
        For convenience a second sequence will be merged in to get a combined sequence.
        In case of duplicate property names, the value of i_MergeList wins.
     */
     com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue >
         getJobProperties( const com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue >& i_rMergeList ) const;
-
+        
     /* get the PropertyValue of a Property
     */
     com::sun::star::beans::PropertyValue* getValue( const rtl::OUString& i_rPropertyName );
@@ -461,12 +461,12 @@ public:
        in case the property is unknown or not convertible to bool, i_bFallback is returned
     */
     sal_Bool getBoolProperty( const rtl::OUString& i_rPropertyName, sal_Bool i_bFallback ) const;
-
+    
     /* set a property value - can also be used to add another UI property
     */
     void setValue( const rtl::OUString& i_rPropertyName, const com::sun::star::uno::Any& i_rValue );
     void setValue( const com::sun::star::beans::PropertyValue& i_rValue );
-
+    
     /* return the currently active UI options. These are the same that were passed to setUIOptions.
     */
     const com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue >& getUIOptions() const;
@@ -485,7 +485,7 @@ public:
     /* makeEnabled will chage the property rPropName depends on to the value
        that makes rPropName enabled. If the dependency itself is also disabled,
        no action will be performed.
-
+       
        returns the property name rPropName depends on or an empty string
        if no change was made.
     */
@@ -504,14 +504,14 @@ public:
     virtual void printPage( int i_nPage ) const = 0; // must be overloaded by the app
     virtual void jobStarted(); // will be called after a possible dialog has been shown and the real printjob starts
     virtual void jobFinished( com::sun::star::view::PrintableState );
-
+    
     com::sun::star::view::PrintableState getJobState() const;
-
+    
     void abortJob();
-
+    
     bool isShowDialogs() const;
     bool isDirectPrint() const;
-
+    
     // implementation details, not usable outside vcl
     SAL_DLLPRIVATE int getFilteredPageCount();
     SAL_DLLPRIVATE PageSize getPageFile( int i_inUnfilteredPage, GDIMetaFile& rMtf, bool i_bMayUseCache = false );
@@ -520,6 +520,7 @@ public:
     SAL_DLLPRIVATE void setPrinter( const boost::shared_ptr<Printer>& );
     SAL_DLLPRIVATE void setOptionChangeHdl( const Link& );
     SAL_DLLPRIVATE void createProgressDialog();
+    SAL_DLLPRIVATE bool isProgressCanceled() const;
     SAL_DLLPRIVATE void setMultipage( const MultiPageSetup& );
     SAL_DLLPRIVATE const MultiPageSetup& getMultipage() const;
     SAL_DLLPRIVATE void setLastPage( sal_Bool i_bLastPage );
@@ -528,10 +529,10 @@ public:
     SAL_DLLPRIVATE void pushPropertiesToPrinter();
     SAL_DLLPRIVATE void setJobState( com::sun::star::view::PrintableState );
     SAL_DLLPRIVATE bool setupPrinter( Window* i_pDlgParent );
-
+    
     SAL_DLLPRIVATE int getPageCountProtected() const;
     SAL_DLLPRIVATE com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue > getPageParametersProtected( int i_nPage ) const;
-
+    
     SAL_DLLPRIVATE ULONG removeTransparencies( GDIMetaFile& i_rIn, GDIMetaFile& o_rOut );
 };
 
@@ -565,7 +566,7 @@ class VCL_DLLPUBLIC PrinterOptionsHelper
     bool hasProperty( const rtl::OUString& i_rPropertyName ) const;
     bool hasProperty( const char* i_pPropertyName ) const
     { return hasProperty( rtl::OUString::createFromAscii( i_pPropertyName ) ); }
-
+    
     // returns an empty Any for not existing properties
     com::sun::star::uno::Any getValue( const rtl::OUString& i_rPropertyName ) const;
     // change a value in the property set; this will not have an effect to an eventual PrinterController
@@ -599,7 +600,7 @@ class VCL_DLLPUBLIC PrinterOptionsHelper
         sal_Bool        mbInternalOnly;
         sal_Bool        mbEnabled;
         com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue > maAddProps;
-
+        
         UIControlOptions( const rtl::OUString& i_rDependsOnName = rtl::OUString(),
                           sal_Int32 i_nDependsOnEntry = -1,
                           sal_Bool i_bAttachToDependency = sal_False,
@@ -641,7 +642,7 @@ class VCL_DLLPUBLIC PrinterOptionsHelper
                                                        sal_Bool i_bValue,
                                                        const UIControlOptions& i_rControlOptions = UIControlOptions()
                                                        );
-
+    
     // create a set of choices (either a radio button group or a list box)
     static com::sun::star::uno::Any getChoiceControlOpt( const rtl::OUString& i_rTitle,
                                                          const com::sun::star::uno::Sequence< rtl::OUString >& i_rHelpText,
@@ -676,4 +677,4 @@ class VCL_DLLPUBLIC PrinterOptionsHelper
 }
 
 
-#endif  // _SV_PRINT_HXX
+#endif	// _SV_PRINT_HXX
diff --git a/vcl/inc/vcl/printergfx.hxx b/vcl/inc/vcl/printergfx.hxx
index 790021ae3adc..92a94969253d 100644
--- a/vcl/inc/vcl/printergfx.hxx
+++ b/vcl/inc/vcl/printergfx.hxx
@@ -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
@@ -60,10 +60,10 @@ private:
 
 public:
 
-    PrinterColor () :
-            meColorspace(eInvalid)
+    PrinterColor () : 
+            meColorspace(eInvalid) 
     {}
-    PrinterColor (sal_uInt16 nRed, sal_uInt16 nGreen,
+    PrinterColor (sal_uInt16 nRed, sal_uInt16 nGreen, 
                   sal_uInt16 nBlue) :
             mnRed   (nRed),
             mnGreen (nGreen),
@@ -91,11 +91,11 @@ public:
     sal_uInt16      GetBlue () const
     { return mnBlue; }
     sal_Bool        operator== (const PrinterColor& aColor) const
-    {
-        return aColor.Is() && this->Is()
-            && mnRed   == aColor.mnRed
-            && mnGreen == aColor.mnGreen
-            && mnBlue  == aColor.mnBlue;
+    {   
+        return aColor.Is() && this->Is() 
+            && mnRed   == aColor.mnRed 
+            && mnGreen == aColor.mnGreen 
+            && mnBlue  == aColor.mnBlue; 
     }
     sal_Bool        operator!= (const PrinterColor& aColor) const
     { return ! (aColor==*this); }
@@ -106,7 +106,7 @@ public:
         mnGreen = aColor.mnGreen;
         mnBlue  = aColor.mnBlue;
 
-        return *this;
+        return *this; 
     }
 
     PrinterColor&   operator= (sal_uInt32 nRGB)
@@ -116,7 +116,7 @@ public:
         mnGreen = (nRGB & 0x0000ff00) >>  8;
         mnRed   = (nRGB & 0x00ff0000) >> 16;
 
-        return *this;
+        return *this; 
     }
 };
 
@@ -134,7 +134,7 @@ struct CharacterMetric;
 /*
  * Bitmap Interface, this has to be filled with your actual bitmap implementation
  * sample implementations can be found in:
- *      psprint/workben/cui/pspdem.cxx
+ *      psprint/workben/cui/pspdem.cxx 
  *      vcl/unx/source/gdi/salgdi2.cxx
  */
 
@@ -155,22 +155,22 @@ public:
 
 typedef enum {
     InvalidType = 0,
-    TrueColorImage,
-    MonochromeImage,
-    PaletteImage,
+    TrueColorImage, 
+    MonochromeImage, 
+    PaletteImage, 
     GrayScaleImage
 } ImageType;
 
 /*
- * printer raster operations
+ * printer raster operations 
  */
 
 struct GraphicsStatus
 {
     rtl::OString        maFont;
-    rtl_TextEncoding    maEncoding;
-    bool                mbArtItalic;
-    bool                mbArtBold;
+    rtl_TextEncoding	maEncoding;
+    bool				mbArtItalic;
+    bool				mbArtBold;
     sal_Int32           mnTextHeight;
     sal_Int32           mnTextWidth;
     PrinterColor        maColor;
@@ -183,8 +183,8 @@ class Font3;
 
 class PrinterGfx
 {
-private:
-
+private:            
+    
     /* common settings */
 
     double          mfScaleX;
@@ -200,18 +200,18 @@ private:
     osl::File*      mpPageHeader;
     osl::File*      mpPageBody;
 
-    void            TranslateCoordinates (sal_Int32 &rXOut, sal_Int32 &rYOut,
+    void            TranslateCoordinates (sal_Int32 &rXOut, sal_Int32 &rYOut, 
                                           sal_Int32 nXIn, sal_Int32 nYIn )
     { rXOut = nXIn; rYOut = nYIn; }
     void            TranslateCoordinates (Point& rOut, const Point& rIn)
     { rOut = rIn; }
 
-    /* text/font related data, for a type1 font it has to be checked
+    /* text/font related data, for a type1 font it has to be checked 
        whether this font has already been downloaded. A TrueType font
        will be converted into one or more Type3 fonts, containing glyphs
-       in no particular order. In addition to the existence of the
-       glyph in one of the subfonts, the mapping from unicode to the
-       glyph has to be remembered */
+       in no particular order. In addition to the existence of the 
+       glyph in one of the subfonts, the mapping from unicode to the 
+       glyph has to be remembered */  
 
     std::list< sal_Int32 > maPS1Font;
     std::list< GlyphSet > maPS3Font;
@@ -220,10 +220,10 @@ private:
     sal_Int32       mnFallbackID;
     sal_Int32       mnTextAngle;
     bool           mbTextVertical;
-    PrintFontManager& mrFontMgr;
+    PrintFontManager& mrFontMgr; 
 
     /* bitmap drawing implementation */
-
+        
     sal_Bool    mbCompressBmp;
 
     void    DrawPS1GrayImage      (const PrinterBmp& rBitmap, const Rectangle& rArea);
@@ -253,9 +253,9 @@ private:
     /* font / font substitution */
     friend class Font3;
     const ::std::hash_map< fontID, fontID >*    mpFontSubstitutes;
-    int             getCharWidth (sal_Bool b_vert, sal_Unicode n_char,
+    int             getCharWidth (sal_Bool b_vert, sal_Unicode n_char, 
                                   CharacterMetric *p_bbox);
-    fontID          getCharMetric (const Font3 &rFont, sal_Unicode n_char,
+    fontID          getCharMetric (const Font3 &rFont, sal_Unicode n_char, 
                                    CharacterMetric *p_bbox);
     fontID          getFontSubstitute () const;
     fontID          getFallbackID () const { return mnFallbackID; }
@@ -272,7 +272,7 @@ public:
     { maVirtualStatus.maColor = rColor; }
 
     void            PSUploadPS1Font (sal_Int32 nFontID);
-    void            PSSetFont (const rtl::OString& rName,
+    void            PSSetFont (const rtl::OString& rName, 
                                rtl_TextEncoding nEncoding = RTL_TEXTENCODING_DONTKNOW)
     { maVirtualStatus.maFont = rName; maVirtualStatus.maEncoding = nEncoding; }
 
@@ -283,14 +283,14 @@ public:
 
     /* PS helpers */
     enum pspath_t { moveto = 0, lineto = 1 };
-    void            PSBinLineTo (const Point& rCurrent, Point& rOld,
+    void            PSBinLineTo (const Point& rCurrent, Point& rOld, 
                                  sal_Int32& nColumn);
-    void            PSBinMoveTo (const Point& rCurrent, Point& rOld,
+    void            PSBinMoveTo (const Point& rCurrent, Point& rOld, 
                                  sal_Int32& nColumn);
     void            PSBinStartPath ();
     void            PSBinEndPath ();
     void            PSBinCurrentPath (sal_uInt32 nPoints, const Point* pPath);
-    void            PSBinPath (const Point& rCurrent, Point& rOld,
+    void            PSBinPath (const Point& rCurrent, Point& rOld, 
                                pspath_t eType, sal_Int32& nColumn);
 
     void            PSRotate (sal_Int32 nAngle);
@@ -302,27 +302,27 @@ public:
     void            PSPointOp (const Point& rPoint, const sal_Char* pOperator);
     void            PSHexString (const sal_uChar* pString, sal_Int16 nLen);
     void            PSDeltaArray (const sal_Int32 *pArray, sal_Int16 nEntries);
-    void            PSShowText (const sal_uChar* pString,
-                                sal_Int16 nGlyphs, sal_Int16 nBytes,
+    void            PSShowText (const sal_uChar* pString, 
+                                sal_Int16 nGlyphs, sal_Int16 nBytes, 
                                 const sal_Int32* pDeltaArray = NULL);
-    void            PSComment (const sal_Char* pComment );
-    void            LicenseWarning (const Point& rPoint, const sal_Unicode* pStr,
-                                    sal_Int16 nLen, const sal_Int32* pDeltaArray);
+    void			PSComment (const sal_Char* pComment );
+    void            LicenseWarning (const Point& rPoint, const sal_Unicode* pStr, 
+                                    sal_Int16 nLen, const sal_Int32* pDeltaArray); 
 
-    void            OnEndPage ();
-    void            OnEndJob ();
-    void            writeResources( osl::File* pFile, std::list< rtl::OString >& rSuppliedFonts, std::list< rtl::OString >& rNeededFonts );
+    void			OnEndPage ();
+    void			OnEndJob ();
+    void			writeResources( osl::File* pFile, std::list< rtl::OString >& rSuppliedFonts, std::list< rtl::OString >& rNeededFonts );
     PrintFontManager& GetFontMgr () { return mrFontMgr; }
 
     void            drawVerticalizedText (const Point& rPoint,
                                           const sal_Unicode* pStr,
                                           sal_Int16 nLen,
                                           const sal_Int32* pDeltaArray );
-    void            drawText (const Point& rPoint,
-                              const sal_Unicode* pStr, sal_Int16 nLen,
+    void            drawText (const Point& rPoint, 
+                              const sal_Unicode* pStr, sal_Int16 nLen, 
                               const sal_Int32* pDeltaArray = NULL);
 
-    void            drawGlyphs( const Point& rPoint,
+    void			drawGlyphs( const Point& rPoint,
                                 sal_GlyphId* pGlyphIds,
                                 sal_Unicode* pUnicodes,
                                 sal_Int16 nLen,
@@ -334,14 +334,14 @@ public:
     sal_Bool        Init (const JobData& rData);
     void            Clear();
 
-    // query depth and size
+    // query depth and size 
     void            GetResolution (sal_Int32 &rDpiX, sal_Int32 &rDpiY) const;
     sal_uInt16      GetBitCount ();
 
     // clip region
     void            ResetClipRegion ();
     void            BeginSetClipRegion (sal_uInt32);
-    sal_Bool        UnionClipRegion (sal_Int32 nX, sal_Int32 nY,
+    sal_Bool        UnionClipRegion (sal_Int32 nX, sal_Int32 nY, 
                                      sal_Int32 nDX, sal_Int32 nDY);
     void            EndSetClipRegion ();
 
@@ -350,7 +350,7 @@ public:
     { maLineColor = rLineColor; }
     void            SetFillColor (const PrinterColor& rFillColor = PrinterColor())
     { maFillColor = rFillColor; }
-
+    
     // drawing primitives
     void            DrawPixel (const Point& rPoint, const PrinterColor& rPixelColor);
     void            DrawPixel (const Point& rPoint)
@@ -359,17 +359,17 @@ public:
     void            DrawRect  (const Rectangle& rRectangle);
     void            DrawPolyLine (sal_uInt32 nPoints, const Point* pPath );
     void            DrawPolygon  (sal_uInt32 nPoints, const Point* pPath);
-    void            DrawPolyPolygon (sal_uInt32 nPoly,
-                                     const sal_uInt32 *pPolygonSize,
+    void            DrawPolyPolygon (sal_uInt32 nPoly, 
+                                     const sal_uInt32 *pPolygonSize, 
                                      const Point** pPolygonList);
-    void            DrawPolyLineBezier (sal_uInt32 nPoints,
+    void            DrawPolyLineBezier (sal_uInt32 nPoints, 
                                      const Point* pPath,
                                      const BYTE* pFlgAry );
-    void            DrawPolygonBezier  (sal_uInt32 nPoints,
+    void            DrawPolygonBezier  (sal_uInt32 nPoints, 
                                      const Point* pPath,
                                      const BYTE* pFlgAry);
     void            DrawPolyPolygonBezier  (sal_uInt32 nPoly,
-                                     const sal_uInt32* pPoints,
+                                     const sal_uInt32* pPoints, 
                                      const Point* const* pPtAry,
                                      const BYTE* const* pFlgAry);
 
@@ -377,12 +377,12 @@ public:
     sal_Bool        DrawEPS ( const Rectangle& rBoundingBox, void* pPtr, sal_uInt32 nSize);
 
     // image drawing
-    void            DrawBitmap (const Rectangle& rDest, const Rectangle& rSrc,
+    void            DrawBitmap (const Rectangle& rDest, const Rectangle& rSrc, 
                                 const PrinterBmp& rBitmap);
-    void            DrawBitmap (const Rectangle& rDest, const Rectangle& rSrc,
-                                const PrinterBmp& rBitmap,
+    void            DrawBitmap (const Rectangle& rDest, const Rectangle& rSrc, 
+                                const PrinterBmp& rBitmap, 
                                 const PrinterBmp& rTransBitmap);
-    void            DrawMask   (const Rectangle& rDest, const Rectangle& rSrc,
+    void            DrawMask   (const Rectangle& rDest, const Rectangle& rSrc, 
                                 const PrinterBmp &rBitmap, PrinterColor& rMaskColor);
 
     // font and text handling
@@ -400,37 +400,37 @@ public:
     { return mnTextAngle; }
     sal_Int32       GetFontID () const
     { return mnFontID; }
-    bool            GetFontVertical() const
+    bool			GetFontVertical() const
     { return mbTextVertical; }
     sal_Int32       GetFontHeight () const
     { return maVirtualStatus.mnTextHeight; }
     sal_Int32       GetFontWidth () const
     { return maVirtualStatus.mnTextWidth; }
-    bool            GetArtificialItalic() const
+    bool			GetArtificialItalic() const
     { return maVirtualStatus.mbArtItalic; }
-    bool            GetArtificialBold() const
+    bool			GetArtificialBold() const
     { return maVirtualStatus.mbArtBold; }
-    void            DrawText (const Point& rPoint,
-                              const sal_Unicode* pStr, sal_Int16 nLen,
+    void            DrawText (const Point& rPoint, 
+                              const sal_Unicode* pStr, sal_Int16 nLen, 
                               const sal_Int32* pDeltaArray = NULL);
     void            SetTextColor (PrinterColor& rTextColor)
     { maTextColor = rTextColor; }
-    sal_Int32       GetCharWidth (sal_uInt16 nFrom, sal_uInt16 nTo,
+    sal_Int32       GetCharWidth (sal_uInt16 nFrom, sal_uInt16 nTo, 
                                   long *pWidthArray);
     const ::std::list< KernPair >& getKernPairs( bool bVertical = false ) const;
     // advanced font handling
     sal_Bool        GetGlyphBoundRect (sal_Unicode c, Rectangle& rOutRect);
-    sal_uInt32      GetGlyphOutline (sal_Unicode c,
-                                     sal_uInt16 **ppPolySizes, Point **ppPoints,
+    sal_uInt32      GetGlyphOutline (sal_Unicode c, 
+                                     sal_uInt16 **ppPolySizes, Point **ppPoints, 
                                      sal_uInt8 **ppFlags);
 
     // for CTL
-    void            DrawGlyphs( const Point& rPoint,
+    void			DrawGlyphs( const Point& rPoint,
                                 sal_GlyphId* pGlyphIds,
                                 sal_Unicode* pUnicodes,
                                 sal_Int16 nLen,
                                 sal_Int32* pDeltaArray );
-
+                                
     bool getStrictSO52Compatibility() const;
     void setStrictSO52Compatibility( bool );
 };
diff --git a/vcl/inc/vcl/printerinfomanager.hxx b/vcl/inc/vcl/printerinfomanager.hxx
index f2e0aad538c8..e152cdb24720 100644
--- a/vcl/inc/vcl/printerinfomanager.hxx
+++ b/vcl/inc/vcl/printerinfomanager.hxx
@@ -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
@@ -126,16 +126,16 @@ protected:
     std::list< WatchFile >            m_aWatchFiles;
     rtl::OUString                     m_aDefaultPrinter;
     rtl::OUString                     m_aSystemPrintCommand;
-
+    
     std::list< SystemPrintQueue >     m_aSystemPrintQueues;
 
-    SystemQueueInfo*                  m_pQueueInfo;
+    SystemQueueInfo*				  m_pQueueInfo;
 
-    Type                              m_eType;
+    Type						      m_eType;
     bool                              m_bUseIncludeFeature;
     bool                              m_bUseJobPatch;
     rtl::OUString                     m_aSystemDefaultPaper;
-
+    
     bool                              m_bDisableCUPS;
 
     PrinterInfoManager( Type eType = Default );
@@ -146,12 +146,12 @@ protected:
     // fill in font substitutions
     // the resulting hash_map maps from source to target font ids
     void fillFontSubstitutions( PrinterInfo& rInfo ) const;
-
+    
     // fill default paper if not configured in config file
     // default paper is e.g. locale dependent
     // if a paper is already set it will not be overwritten
     void setDefaultPaper( PPDContext& rInfo ) const;
-
+    
     void initSystemDefaultPaper();
 public:
 
@@ -169,7 +169,7 @@ public:
 
     // gets info about a named printer
     const PrinterInfo& getPrinterInfo( const rtl::OUString& rPrinter ) const;
-
+        
     // gets the name of the default printer
     const rtl::OUString& getDefaultPrinter() const { return m_aDefaultPrinter; }
 
@@ -208,7 +208,7 @@ public:
     // primarily used internally but also by padmin
     // returns the printer queue names
     virtual const std::list< SystemPrintQueue >& getSystemPrintQueues();
-
+        
     // similar but returnse whole commandlines
     virtual void getSystemPrintCommands( std::list< rtl::OUString >& rCommands );
 
@@ -219,23 +219,23 @@ public:
     // close the FILE* returned by startSpool and does the actual spooling
     // returns a numerical job id
     virtual int endSpool( const rtl::OUString& rPrinterName, const rtl::OUString& rJobTitle, FILE* pFile, const JobData& rDocumentJobData );
-
+    
     // for spadmin: whether adding or removing a printer is possible
     virtual bool addOrRemovePossible() const;
-
+    
     bool getUseIncludeFeature() const { return m_bUseIncludeFeature; }
     bool getUseJobPatch() const { return m_bUseJobPatch; }
-
+    
     // check whether a printer's feature string contains a subfeature
     bool checkFeatureToken( const rtl::OUString& rPrinterName, const char* pToken ) const;
-
+    
     // set m_bDisableCUPS and update printer config
     void setCUPSDisabled( bool );
-
+    
     // gets m_bDisableCUPS, initialized from printer config
     bool isCUPSDisabled() const;
 };
-
+    
 } // namespace
 
 #endif // _PSPRINT_PRINTERINFOMANAGER_HXX_
diff --git a/vcl/inc/vcl/printerjob.hxx b/vcl/inc/vcl/printerjob.hxx
index cdf8745febcc..89d3e2c6fa42 100644
--- a/vcl/inc/vcl/printerjob.hxx
+++ b/vcl/inc/vcl/printerjob.hxx
@@ -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
@@ -40,14 +40,14 @@ namespace psp {
 class PrinterGfx;
 
 
-class PrinterJob
+class PrinterJob 
 {
 private:            // private data
 
     rtl::OUString           maSpoolDirName;
     rtl::OUString           maFileName; // empty: spool to command, else spool to named file
-    rtl::OUString           maJobTitle;
-    int                     mnFileMode;
+    rtl::OUString			maJobTitle;
+    int						mnFileMode;
 
     osl::File*              mpJobHeader;
     osl::File*              mpJobTrailer;
@@ -79,21 +79,21 @@ private:            // private data
 
     sal_Int32       mnErrorCode;
     bool            m_bQuickJob;
-
+        
 private:            // private methods
 
-    osl::File*      CreateSpoolFile (const rtl::OUString& rName,
+    osl::File*      CreateSpoolFile (const rtl::OUString& rName, 
                                      const rtl::OUString& rExtension);
     void            InitPaperSize (const JobData& rJobSetup);
 
-    bool            writeFeatureList( osl::File* pFile, const JobData&, bool bDocumentSetup );
+    bool			writeFeatureList( osl::File* pFile, const JobData&, bool bDocumentSetup );
     bool            writeSetup( osl::File* pFile, const JobData& );
     bool            writePageSetup( osl::File* pFile, const JobData&, bool bWriteFeatures = true );
-    void            writeJobPatch( osl::File* File, const JobData& );
+    void			writeJobPatch( osl::File* File, const JobData& );
     bool            writeProlog (osl::File* pFile, const JobData& );
 
 public:             // for usage in PrinterGfx
-
+            
     sal_uInt32      GetResolution () const { return mnResolution; }
     void            GetScale (double &rXScale, double &rYScale) const;
     sal_uInt16      GetDepth () const;
@@ -137,7 +137,7 @@ public:
 
     sal_Bool        AbortJob ();
 
-    sal_Bool        StartPage (const JobData& rJobSetup);
+    sal_Bool		StartPage (const JobData& rJobSetup);
     sal_Bool        EndPage ();
 
     sal_uInt32      GetErrorCode ();
diff --git a/vcl/inc/vcl/prndlg.hxx b/vcl/inc/vcl/prndlg.hxx
index fdaf06c9854e..e1f17853f0a2 100644
--- a/vcl/inc/vcl/prndlg.hxx
+++ b/vcl/inc/vcl/prndlg.hxx
@@ -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
@@ -59,12 +59,12 @@ namespace vcl
             VirtualDevice       maPageVDev;
             rtl::OUString       maReplacementString;
             rtl::OUString       maToolTipString;
-
+            
             bool useHCColorReplacement() const;
         public:
             PrintPreviewWindow( Window* pParent, const ResId& );
             virtual ~PrintPreviewWindow();
-
+            
             virtual void Paint( const Rectangle& rRect );
             virtual void Command( const CommandEvent& );
             virtual void Resize();
@@ -74,7 +74,7 @@ namespace vcl
                              sal_Int32 i_nDPIX, sal_Int32 i_nDPIY
                             );
         };
-
+        
         class ShowNupOrderWindow : public Window
         {
             int mnOrderMode;
@@ -84,9 +84,9 @@ namespace vcl
         public:
             ShowNupOrderWindow( Window* pParent );
             virtual ~ShowNupOrderWindow();
-
+            
             virtual void Paint( const Rectangle& );
-
+            
             void setValues( int i_nOrderMode, int i_nColumns, int i_nRows )
             {
                 mnOrderMode = i_nOrderMode;
@@ -95,7 +95,7 @@ namespace vcl
                 Invalidate();
             }
         };
-
+        
         class NUpTabPage : public TabPage
         {
         public:
@@ -104,10 +104,10 @@ namespace vcl
             RadioButton                             maBrochureBtn;
             FixedText                               maPagesBoxTitleTxt;
             ListBox                                 maNupPagesBox;
-
+            
             // controls for "Custom" page mode
             FixedText                               maNupNumPagesTxt;
-            NumericField                            maNupColEdt;
+            NumericField                            maNupColEdt;            
             FixedText                               maNupTimesTxt;
             NumericField                            maNupRowsEdt;
             FixedText                               maPageMarginTxt1;
@@ -125,26 +125,26 @@ namespace vcl
             ShowNupOrderWindow                      maNupOrderWin;
             // border around each page
             CheckBox                                maBorderCB;
-
+            
             vcl::RowOrColumn                        maLayout;
             boost::shared_ptr< vcl::RowOrColumn >   mxBrochureDep;
             boost::shared_ptr< vcl::LabeledElement >mxPagesBtnLabel;
-
+            
             void setupLayout();
-
+            
             NUpTabPage( Window*, const ResId& );
             virtual ~NUpTabPage();
-
+            
             void readFromSettings();
             void storeToSettings();
             void initFromMultiPageSetup( const vcl::PrinterController::MultiPageSetup& );
             void enableNupControls( bool bEnable );
-
+            
             void showAdvancedControls( bool );
-
+            
             virtual void Resize();
         };
-
+        
         class JobTabPage : public TabPage
         {
         public:
@@ -157,38 +157,38 @@ namespace vcl
             FixedText                               maLocationTxt;
             FixedText                               maCommentLabel;
             FixedText                               maCommentTxt;
-
+            
             PushButton                              maSetupButton;
-
+            
             FixedLine                               maCopies;
             FixedLine                               maCopySpacer;
             FixedText                               maCopyCount;
             NumericField                            maCopyCountField;
             CheckBox                                maCollateBox;
             FixedImage                              maCollateImage;
-
+    
             Image                                   maCollateImg;
             Image                                   maCollateHCImg;
             Image                                   maNoCollateImg;
             Image                                   maNoCollateHCImg;
-
+            
             long                                    mnCollateUIMode;
 
             vcl::RowOrColumn                        maLayout;
             boost::shared_ptr<vcl::RowOrColumn>     mxPrintRange;
             boost::shared_ptr<vcl::WindowArranger>  mxDetails;
-
+    
             JobTabPage( Window*, const ResId& );
             virtual ~JobTabPage();
 
             void readFromSettings();
             void storeToSettings();
-
+            
             virtual void Resize();
-
+            
             void setupLayout();
         };
-
+        
         class OutputOptPage : public TabPage
         {
         public:
@@ -199,7 +199,7 @@ namespace vcl
 
             vcl::RowOrColumn                    maLayout;
             boost::shared_ptr<vcl::RowOrColumn> mxOptGroup;
-
+            
             OutputOptPage( Window*, const ResId& );
             virtual ~OutputOptPage();
 
@@ -219,21 +219,21 @@ namespace vcl
         FixedText                               maNumPagesText;
         PushButton                              maBackwardBtn;
         PushButton                              maForwardBtn;
-
+        
         TabControl                              maTabCtrl;
         NUpTabPage                              maNUpPage;
         JobTabPage                              maJobPage;
         OutputOptPage                           maOptionsPage;
-
+        
         FixedLine                               maButtonLine;
-
+        
         boost::shared_ptr< PrinterController >  maPController;
-
+        
         rtl::OUString                           maPageStr;
         rtl::OUString                           maNoPageStr;
         sal_Int32                               mnCurPage;
         sal_Int32                               mnCachedPages;
-
+        
         std::list< Window* >                    maControls;
         std::map< Window*, rtl::OUString >      maControlToPropertyMap;
         std::map< rtl::OUString, std::vector< Window* > >
@@ -243,22 +243,22 @@ namespace vcl
 
         Size                                    maNupPortraitSize;
         Size                                    maNupLandscapeSize;
-
+        
         // internal, used for automatic Nup-Portrait/landscape
         Size                                    maFirstPageSize;
-
+        
         rtl::OUString                           maPrintToFileText;
         rtl::OUString                           maPrintText;
         rtl::OUString                           maDefPrtText;
-
+        
         vcl::RowOrColumn                        maLayout;
         boost::shared_ptr<vcl::RowOrColumn>     mxPreviewCtrls;
-
+        
         Size                                    maDetailsCollapsedSize;
         Size                                    maDetailsExpandedSize;
-
+        
         sal_Bool                                mbShowLayoutPage;
-
+        
         Size getJobPageSize();
         void updateNup();
         void updateNupFromPages();
@@ -273,41 +273,41 @@ namespace vcl
         void readFromSettings();
         void storeToSettings();
         com::sun::star::beans::PropertyValue* getValueForWindow( Window* ) const;
-
+        
         virtual void Resize();
         virtual void Command( const CommandEvent& );
         virtual void DataChanged( const DataChangedEvent& );
-
+        
         DECL_LINK( SelectHdl, ListBox* );
         DECL_LINK( ClickHdl, Button* );
         DECL_LINK( ModifyHdl, Edit* );
         DECL_LINK( UIOptionsChanged, void* );
-
+        
         DECL_LINK( UIOption_CheckHdl, CheckBox* );
         DECL_LINK( UIOption_RadioHdl, RadioButton* );
         DECL_LINK( UIOption_SelectHdl, ListBox* );
         DECL_LINK( UIOption_ModifyHdl, Edit* );
-
+        
         void setupLayout();
     public:
         PrintDialog( Window*, const boost::shared_ptr< PrinterController >& );
         virtual ~PrintDialog();
-
+        
         bool isPrintToFile();
         int getCopyCount();
         bool isCollate();
         bool isSingleJobs();
-
+        
         void previewForward();
         void previewBackward();
     };
-
+    
     class PrintProgressDialog : public ModelessDialog
     {
         String              maStr;
         FixedText           maText;
         CancelButton        maButton;
-
+        
         bool                mbCanceled;
         sal_Int32           mnCur;
         sal_Int32           mnMax;
@@ -316,17 +316,17 @@ namespace vcl
         bool                mbNativeProgress;
 
         DECL_LINK( ClickHdl, Button* );
-
+        
         void implCalcProgressRect();
     public:
         PrintProgressDialog( Window* i_pParent, int i_nMax );
         ~PrintProgressDialog();
-
+        
         bool isCanceled() const { return mbCanceled; }
         void setProgress( int i_nCurrent, int i_nMax = -1 );
         void tick();
         void reset();
-
+        
         virtual void Paint( const Rectangle& );
     };
 }
diff --git a/vcl/inc/vcl/prntypes.hxx b/vcl/inc/vcl/prntypes.hxx
index 6b2af991f2dd..dd2f86a4c148 100644
--- a/vcl/inc/vcl/prntypes.hxx
+++ b/vcl/inc/vcl/prntypes.hxx
@@ -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
@@ -48,33 +48,33 @@ enum Orientation { ORIENTATION_PORTRAIT, ORIENTATION_LANDSCAPE };
 // - QueueInfo-Types -
 // -------------------
 
-#define QUEUE_STATUS_READY              ((ULONG)0x00000001)
-#define QUEUE_STATUS_PAUSED             ((ULONG)0x00000002)
-#define QUEUE_STATUS_PENDING_DELETION   ((ULONG)0x00000004)
-#define QUEUE_STATUS_BUSY               ((ULONG)0x00000008)
-#define QUEUE_STATUS_INITIALIZING       ((ULONG)0x00000010)
-#define QUEUE_STATUS_WAITING            ((ULONG)0x00000020)
-#define QUEUE_STATUS_WARMING_UP         ((ULONG)0x00000040)
-#define QUEUE_STATUS_PROCESSING         ((ULONG)0x00000080)
-#define QUEUE_STATUS_PRINTING           ((ULONG)0x00000100)
-#define QUEUE_STATUS_OFFLINE            ((ULONG)0x00000200)
-#define QUEUE_STATUS_ERROR              ((ULONG)0x00000400)
-#define QUEUE_STATUS_SERVER_UNKNOWN     ((ULONG)0x00000800)
-#define QUEUE_STATUS_PAPER_JAM          ((ULONG)0x00001000)
-#define QUEUE_STATUS_PAPER_OUT          ((ULONG)0x00002000)
-#define QUEUE_STATUS_MANUAL_FEED        ((ULONG)0x00004000)
-#define QUEUE_STATUS_PAPER_PROBLEM      ((ULONG)0x00008000)
-#define QUEUE_STATUS_IO_ACTIVE          ((ULONG)0x00010000)
-#define QUEUE_STATUS_OUTPUT_BIN_FULL    ((ULONG)0x00020000)
-#define QUEUE_STATUS_TONER_LOW          ((ULONG)0x00040000)
-#define QUEUE_STATUS_NO_TONER           ((ULONG)0x00080000)
-#define QUEUE_STATUS_PAGE_PUNT          ((ULONG)0x00100000)
-#define QUEUE_STATUS_USER_INTERVENTION  ((ULONG)0x00200000)
-#define QUEUE_STATUS_OUT_OF_MEMORY      ((ULONG)0x00400000)
-#define QUEUE_STATUS_DOOR_OPEN          ((ULONG)0x00800000)
-#define QUEUE_STATUS_POWER_SAVE         ((ULONG)0x01000000)
+#define QUEUE_STATUS_READY				((ULONG)0x00000001)
+#define QUEUE_STATUS_PAUSED 			((ULONG)0x00000002)
+#define QUEUE_STATUS_PENDING_DELETION	((ULONG)0x00000004)
+#define QUEUE_STATUS_BUSY				((ULONG)0x00000008)
+#define QUEUE_STATUS_INITIALIZING		((ULONG)0x00000010)
+#define QUEUE_STATUS_WAITING			((ULONG)0x00000020)
+#define QUEUE_STATUS_WARMING_UP 		((ULONG)0x00000040)
+#define QUEUE_STATUS_PROCESSING 		((ULONG)0x00000080)
+#define QUEUE_STATUS_PRINTING			((ULONG)0x00000100)
+#define QUEUE_STATUS_OFFLINE			((ULONG)0x00000200)
+#define QUEUE_STATUS_ERROR				((ULONG)0x00000400)
+#define QUEUE_STATUS_SERVER_UNKNOWN 	((ULONG)0x00000800)
+#define QUEUE_STATUS_PAPER_JAM			((ULONG)0x00001000)
+#define QUEUE_STATUS_PAPER_OUT			((ULONG)0x00002000)
+#define QUEUE_STATUS_MANUAL_FEED		((ULONG)0x00004000)
+#define QUEUE_STATUS_PAPER_PROBLEM		((ULONG)0x00008000)
+#define QUEUE_STATUS_IO_ACTIVE			((ULONG)0x00010000)
+#define QUEUE_STATUS_OUTPUT_BIN_FULL	((ULONG)0x00020000)
+#define QUEUE_STATUS_TONER_LOW			((ULONG)0x00040000)
+#define QUEUE_STATUS_NO_TONER			((ULONG)0x00080000)
+#define QUEUE_STATUS_PAGE_PUNT			((ULONG)0x00100000)
+#define QUEUE_STATUS_USER_INTERVENTION	((ULONG)0x00200000)
+#define QUEUE_STATUS_OUT_OF_MEMORY		((ULONG)0x00400000)
+#define QUEUE_STATUS_DOOR_OPEN			((ULONG)0x00800000)
+#define QUEUE_STATUS_POWER_SAVE 		((ULONG)0x01000000)
 
-#define QUEUE_JOBS_DONTKNOW             ((ULONG)0xFFFFFFFF)
+#define QUEUE_JOBS_DONTKNOW 			((ULONG)0xFFFFFFFF)
 
 // -----------------
 // - Printer-Types -
@@ -92,4 +92,4 @@ enum Orientation { ORIENTATION_PORTRAIT, ORIENTATION_LANDSCAPE };
 #define PRINTER_CAPABILITIES_EXTERNALDIALOG     ((USHORT)10)
 #define PRINTER_CAPABILITIES_SETDUPLEX          ((USHORT)11)
 
-#endif  // _SV_PRNTYPES_HXX
+#endif	// _SV_PRNTYPES_HXX
diff --git a/vcl/inc/vcl/ptrstyle.hxx b/vcl/inc/vcl/ptrstyle.hxx
index 796613bd5726..ec0c1dfe5705 100644
--- a/vcl/inc/vcl/ptrstyle.hxx
+++ b/vcl/inc/vcl/ptrstyle.hxx
@@ -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
@@ -36,94 +36,94 @@
 
 typedef USHORT PointerStyle;
 
-#define POINTER_ARROW                   ((PointerStyle)0)
-#define POINTER_NULL                    ((PointerStyle)1)
-#define POINTER_WAIT                    ((PointerStyle)2)
-#define POINTER_TEXT                    ((PointerStyle)3)
-#define POINTER_HELP                    ((PointerStyle)4)
-#define POINTER_CROSS                   ((PointerStyle)5)
-#define POINTER_MOVE                    ((PointerStyle)6)
-#define POINTER_NSIZE                   ((PointerStyle)7)
-#define POINTER_SSIZE                   ((PointerStyle)8)
-#define POINTER_WSIZE                   ((PointerStyle)9)
-#define POINTER_ESIZE                   ((PointerStyle)10)
-#define POINTER_NWSIZE                  ((PointerStyle)11)
-#define POINTER_NESIZE                  ((PointerStyle)12)
-#define POINTER_SWSIZE                  ((PointerStyle)13)
-#define POINTER_SESIZE                  ((PointerStyle)14)
-#define POINTER_WINDOW_NSIZE            ((PointerStyle)15)
-#define POINTER_WINDOW_SSIZE            ((PointerStyle)16)
-#define POINTER_WINDOW_WSIZE            ((PointerStyle)17)
-#define POINTER_WINDOW_ESIZE            ((PointerStyle)18)
-#define POINTER_WINDOW_NWSIZE           ((PointerStyle)19)
-#define POINTER_WINDOW_NESIZE           ((PointerStyle)20)
-#define POINTER_WINDOW_SWSIZE           ((PointerStyle)21)
-#define POINTER_WINDOW_SESIZE           ((PointerStyle)22)
-#define POINTER_HSPLIT                  ((PointerStyle)23)
-#define POINTER_VSPLIT                  ((PointerStyle)24)
-#define POINTER_HSIZEBAR                ((PointerStyle)25)
-#define POINTER_VSIZEBAR                ((PointerStyle)26)
-#define POINTER_HAND                    ((PointerStyle)27)
-#define POINTER_REFHAND                 ((PointerStyle)28)
-#define POINTER_PEN                     ((PointerStyle)29)
-#define POINTER_MAGNIFY                 ((PointerStyle)30)
-#define POINTER_FILL                    ((PointerStyle)31)
-#define POINTER_ROTATE                  ((PointerStyle)32)
-#define POINTER_HSHEAR                  ((PointerStyle)33)
-#define POINTER_VSHEAR                  ((PointerStyle)34)
-#define POINTER_MIRROR                  ((PointerStyle)35)
-#define POINTER_CROOK                   ((PointerStyle)36)
-#define POINTER_CROP                    ((PointerStyle)37)
-#define POINTER_MOVEPOINT               ((PointerStyle)38)
-#define POINTER_MOVEBEZIERWEIGHT        ((PointerStyle)39)
-#define POINTER_MOVEDATA                ((PointerStyle)40)
-#define POINTER_COPYDATA                ((PointerStyle)41)
-#define POINTER_LINKDATA                ((PointerStyle)42)
-#define POINTER_MOVEDATALINK            ((PointerStyle)43)
-#define POINTER_COPYDATALINK            ((PointerStyle)44)
-#define POINTER_MOVEFILE                ((PointerStyle)45)
-#define POINTER_COPYFILE                ((PointerStyle)46)
-#define POINTER_LINKFILE                ((PointerStyle)47)
-#define POINTER_MOVEFILELINK            ((PointerStyle)48)
-#define POINTER_COPYFILELINK            ((PointerStyle)49)
-#define POINTER_MOVEFILES               ((PointerStyle)50)
-#define POINTER_COPYFILES               ((PointerStyle)51)
-#define POINTER_NOTALLOWED              ((PointerStyle)52)
-#define POINTER_DRAW_LINE               ((PointerStyle)53)
-#define POINTER_DRAW_RECT               ((PointerStyle)54)
-#define POINTER_DRAW_POLYGON            ((PointerStyle)55)
-#define POINTER_DRAW_BEZIER             ((PointerStyle)56)
-#define POINTER_DRAW_ARC                ((PointerStyle)57)
-#define POINTER_DRAW_PIE                ((PointerStyle)58)
-#define POINTER_DRAW_CIRCLECUT          ((PointerStyle)59)
-#define POINTER_DRAW_ELLIPSE            ((PointerStyle)60)
-#define POINTER_DRAW_FREEHAND           ((PointerStyle)61)
-#define POINTER_DRAW_CONNECT            ((PointerStyle)62)
-#define POINTER_DRAW_TEXT               ((PointerStyle)63)
-#define POINTER_DRAW_CAPTION            ((PointerStyle)64)
-#define POINTER_CHART                   ((PointerStyle)65)
-#define POINTER_DETECTIVE               ((PointerStyle)66)
-#define POINTER_PIVOT_COL               ((PointerStyle)67)
-#define POINTER_PIVOT_ROW               ((PointerStyle)68)
-#define POINTER_PIVOT_FIELD             ((PointerStyle)69)
-#define POINTER_CHAIN                   ((PointerStyle)70)
-#define POINTER_CHAIN_NOTALLOWED        ((PointerStyle)71)
-#define POINTER_TIMEEVENT_MOVE          ((PointerStyle)72)
-#define POINTER_TIMEEVENT_SIZE          ((PointerStyle)73)
-#define POINTER_AUTOSCROLL_N            ((PointerStyle)74)
-#define POINTER_AUTOSCROLL_S            ((PointerStyle)75)
-#define POINTER_AUTOSCROLL_W            ((PointerStyle)76)
-#define POINTER_AUTOSCROLL_E            ((PointerStyle)77)
-#define POINTER_AUTOSCROLL_NW           ((PointerStyle)78)
-#define POINTER_AUTOSCROLL_NE           ((PointerStyle)79)
-#define POINTER_AUTOSCROLL_SW           ((PointerStyle)80)
-#define POINTER_AUTOSCROLL_SE           ((PointerStyle)81)
-#define POINTER_AUTOSCROLL_NS           ((PointerStyle)82)
-#define POINTER_AUTOSCROLL_WE           ((PointerStyle)83)
-#define POINTER_AUTOSCROLL_NSWE         ((PointerStyle)84)
-#define POINTER_AIRBRUSH                ((PointerStyle)85)
-#define POINTER_TEXT_VERTICAL           ((PointerStyle)86)
-#define POINTER_PIVOT_DELETE            ((PointerStyle)87)
+#define POINTER_ARROW					((PointerStyle)0)
+#define POINTER_NULL					((PointerStyle)1)
+#define POINTER_WAIT					((PointerStyle)2)
+#define POINTER_TEXT					((PointerStyle)3)
+#define POINTER_HELP					((PointerStyle)4)
+#define POINTER_CROSS					((PointerStyle)5)
+#define POINTER_MOVE					((PointerStyle)6)
+#define POINTER_NSIZE					((PointerStyle)7)
+#define POINTER_SSIZE					((PointerStyle)8)
+#define POINTER_WSIZE					((PointerStyle)9)
+#define POINTER_ESIZE					((PointerStyle)10)
+#define POINTER_NWSIZE					((PointerStyle)11)
+#define POINTER_NESIZE					((PointerStyle)12)
+#define POINTER_SWSIZE					((PointerStyle)13)
+#define POINTER_SESIZE					((PointerStyle)14)
+#define POINTER_WINDOW_NSIZE			((PointerStyle)15)
+#define POINTER_WINDOW_SSIZE			((PointerStyle)16)
+#define POINTER_WINDOW_WSIZE			((PointerStyle)17)
+#define POINTER_WINDOW_ESIZE			((PointerStyle)18)
+#define POINTER_WINDOW_NWSIZE			((PointerStyle)19)
+#define POINTER_WINDOW_NESIZE			((PointerStyle)20)
+#define POINTER_WINDOW_SWSIZE			((PointerStyle)21)
+#define POINTER_WINDOW_SESIZE			((PointerStyle)22)
+#define POINTER_HSPLIT					((PointerStyle)23)
+#define POINTER_VSPLIT					((PointerStyle)24)
+#define POINTER_HSIZEBAR				((PointerStyle)25)
+#define POINTER_VSIZEBAR				((PointerStyle)26)
+#define POINTER_HAND					((PointerStyle)27)
+#define POINTER_REFHAND 				((PointerStyle)28)
+#define POINTER_PEN 					((PointerStyle)29)
+#define POINTER_MAGNIFY 				((PointerStyle)30)
+#define POINTER_FILL					((PointerStyle)31)
+#define POINTER_ROTATE					((PointerStyle)32)
+#define POINTER_HSHEAR					((PointerStyle)33)
+#define POINTER_VSHEAR					((PointerStyle)34)
+#define POINTER_MIRROR					((PointerStyle)35)
+#define POINTER_CROOK					((PointerStyle)36)
+#define POINTER_CROP					((PointerStyle)37)
+#define POINTER_MOVEPOINT				((PointerStyle)38)
+#define POINTER_MOVEBEZIERWEIGHT		((PointerStyle)39)
+#define POINTER_MOVEDATA				((PointerStyle)40)
+#define POINTER_COPYDATA				((PointerStyle)41)
+#define POINTER_LINKDATA				((PointerStyle)42)
+#define POINTER_MOVEDATALINK			((PointerStyle)43)
+#define POINTER_COPYDATALINK			((PointerStyle)44)
+#define POINTER_MOVEFILE				((PointerStyle)45)
+#define POINTER_COPYFILE				((PointerStyle)46)
+#define POINTER_LINKFILE				((PointerStyle)47)
+#define POINTER_MOVEFILELINK			((PointerStyle)48)
+#define POINTER_COPYFILELINK			((PointerStyle)49)
+#define POINTER_MOVEFILES				((PointerStyle)50)
+#define POINTER_COPYFILES				((PointerStyle)51)
+#define POINTER_NOTALLOWED				((PointerStyle)52)
+#define POINTER_DRAW_LINE				((PointerStyle)53)
+#define POINTER_DRAW_RECT				((PointerStyle)54)
+#define POINTER_DRAW_POLYGON			((PointerStyle)55)
+#define POINTER_DRAW_BEZIER 			((PointerStyle)56)
+#define POINTER_DRAW_ARC				((PointerStyle)57)
+#define POINTER_DRAW_PIE				((PointerStyle)58)
+#define POINTER_DRAW_CIRCLECUT			((PointerStyle)59)
+#define POINTER_DRAW_ELLIPSE			((PointerStyle)60)
+#define POINTER_DRAW_FREEHAND			((PointerStyle)61)
+#define POINTER_DRAW_CONNECT			((PointerStyle)62)
+#define POINTER_DRAW_TEXT				((PointerStyle)63)
+#define POINTER_DRAW_CAPTION			((PointerStyle)64)
+#define POINTER_CHART					((PointerStyle)65)
+#define POINTER_DETECTIVE				((PointerStyle)66)
+#define POINTER_PIVOT_COL				((PointerStyle)67)
+#define POINTER_PIVOT_ROW				((PointerStyle)68)
+#define POINTER_PIVOT_FIELD 			((PointerStyle)69)
+#define POINTER_CHAIN					((PointerStyle)70)
+#define POINTER_CHAIN_NOTALLOWED		((PointerStyle)71)
+#define POINTER_TIMEEVENT_MOVE			((PointerStyle)72)
+#define POINTER_TIMEEVENT_SIZE			((PointerStyle)73)
+#define POINTER_AUTOSCROLL_N			((PointerStyle)74)
+#define POINTER_AUTOSCROLL_S			((PointerStyle)75)
+#define POINTER_AUTOSCROLL_W			((PointerStyle)76)
+#define POINTER_AUTOSCROLL_E			((PointerStyle)77)
+#define POINTER_AUTOSCROLL_NW			((PointerStyle)78)
+#define POINTER_AUTOSCROLL_NE			((PointerStyle)79)
+#define POINTER_AUTOSCROLL_SW			((PointerStyle)80)
+#define POINTER_AUTOSCROLL_SE			((PointerStyle)81)
+#define POINTER_AUTOSCROLL_NS			((PointerStyle)82)
+#define POINTER_AUTOSCROLL_WE			((PointerStyle)83)
+#define POINTER_AUTOSCROLL_NSWE 		((PointerStyle)84)
+#define POINTER_AIRBRUSH				((PointerStyle)85)
+#define POINTER_TEXT_VERTICAL			((PointerStyle)86)
+#define POINTER_PIVOT_DELETE 			((PointerStyle)87)
 
 // --> FME 2004-07-30 #i32329# Enhanced table selection
 #define POINTER_TAB_SELECT_S            ((PointerStyle)88)
diff --git a/vcl/inc/vcl/regband.hxx b/vcl/inc/vcl/regband.hxx
index 2e34fdcd5677..3b77c23a4191 100644
--- a/vcl/inc/vcl/regband.hxx
+++ b/vcl/inc/vcl/regband.hxx
@@ -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
@@ -54,10 +54,10 @@ IsOver.
 // element for the list with x-separations
 struct ImplRegionBandSep
 {
-    ImplRegionBandSep*          mpNextSep;
-    long                        mnXLeft;
-    long                        mnXRight;
-    BOOL                        mbRemoved;
+    ImplRegionBandSep*			mpNextSep;
+    long						mnXLeft;
+    long						mnXRight;
+    BOOL						mbRemoved;
 };
 
 enum LineType { LINE_ASCENDING, LINE_DESCENDING, LINE_HORIZONTAL };
@@ -65,11 +65,11 @@ enum LineType { LINE_ASCENDING, LINE_DESCENDING, LINE_HORIZONTAL };
 // element for the list with x-separations
 struct ImplRegionBandPoint
 {
-    ImplRegionBandPoint*        mpNextBandPoint;
-    long                        mnX;
-    long                        mnLineId;
-    BOOL                        mbEndPoint;
-    LineType                    meLineType;
+    ImplRegionBandPoint*		mpNextBandPoint;
+    long						mnX;
+    long						mnLineId;
+    BOOL						mbEndPoint;
+    LineType					meLineType;
 };
 
 // ------------------
@@ -79,13 +79,13 @@ struct ImplRegionBandPoint
 class ImplRegionBand
 {
 public:
-    ImplRegionBand*             mpNextBand;         // pointer to the next element of the list
-    ImplRegionBand*             mpPrevBand;         // pointer to the previous element of the list (only used temporaery)
-    ImplRegionBandSep*          mpFirstSep;         // root of the list with x-separations
-    ImplRegionBandPoint*        mpFirstBandPoint;   // root of the list with lines
-    long                        mnYTop;             // actual boundary of the band
-    long                        mnYBottom;
-    BOOL                        mbTouched;
+    ImplRegionBand* 			mpNextBand; 		// pointer to the next element of the list
+    ImplRegionBand* 			mpPrevBand; 		// pointer to the previous element of the list (only used temporaery)
+    ImplRegionBandSep*			mpFirstSep; 		// root of the list with x-separations
+    ImplRegionBandPoint*		mpFirstBandPoint;	// root of the list with lines
+    long						mnYTop; 			// actual boundary of the band
+    long						mnYBottom;
+    BOOL						mbTouched;
 
                                 // create y-band with boundaries
                                 ImplRegionBand( long nYTop, long nYBottom );
@@ -106,34 +106,34 @@ public:
                                                 const bool bIgnorePoints = true);
                                 ~ImplRegionBand();
 
-    long                        GetXLeftBoundary() const;
-    long                        GetXRightBoundary() const;
+    long						GetXLeftBoundary() const;
+    long						GetXRightBoundary() const;
 
                                 // combine overlapping bands
-    BOOL                        OptimizeBand();
+    BOOL						OptimizeBand();
 
                                 // generate separations from lines and process
                                 // union with existing separations
-    void                        ProcessPoints();
+    void						ProcessPoints();
                                 // insert point in the list for later processing
-    BOOL                        InsertPoint( long nX, long nLineID,
+    BOOL						InsertPoint( long nX, long nLineID,
                                              BOOL bEndPoint, LineType eLineType );
 
-    void                        Union( long nXLeft, long nXRight );
-    void                        Intersect( long nXLeft, long nXRight );
-    void                        Exclude( long nXLeft, long nXRight );
-    void                        XOr( long nXLeft, long nXRight );
+    void						Union( long nXLeft, long nXRight );
+    void						Intersect( long nXLeft, long nXRight );
+    void						Exclude( long nXLeft, long nXRight );
+    void						XOr( long nXLeft, long nXRight );
 
-    void                        MoveX( long nHorzMove );
-    void                        ScaleX( double fHorzScale );
+    void						MoveX( long nHorzMove );
+    void						ScaleX( double fHorzScale );
 
-    BOOL                        IsInside( long nX );
-    BOOL                        IsInside( long nLeft, long nRight );
-    BOOL                        IsOver( long nLeft, long nRight );
+    BOOL						IsInside( long nX );
+    BOOL						IsInside( long nLeft, long nRight );
+    BOOL						IsOver( long nLeft, long nRight );
 
-    BOOL                        IsEmpty() const { return ((!mpFirstSep) && (!mpFirstBandPoint)); }
+    BOOL						IsEmpty() const { return ((!mpFirstSep) && (!mpFirstBandPoint)); }
 
-    BOOL                        operator==( const ImplRegionBand& rRegionBand ) const;
+    BOOL						operator==( const ImplRegionBand& rRegionBand ) const;
 
     /** Split the called band at the given vertical coordinate.  After the
         split the called band will cover the upper part not including nY.
@@ -147,4 +147,4 @@ public:
     ImplRegionBand*             SplitBand (const sal_Int32 nY);
 };
 
-#endif  // _SV_REGBAND_HXX
+#endif	// _SV_REGBAND_HXX
diff --git a/vcl/inc/vcl/region.h b/vcl/inc/vcl/region.h
index b10f0eaf0f0f..9c3818f0b07e 100644
--- a/vcl/inc/vcl/region.h
+++ b/vcl/inc/vcl/region.h
@@ -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
@@ -46,10 +46,10 @@ const char* ImplDbgTestRegion( const void* pObj );
 
 struct ImplRegionHandle
 {
-    Region*             mpRegion;
-    ImplRegionBand*     mpCurrRectBand;
-    ImplRegionBandSep*  mpCurrRectBandSep;
-    BOOL                mbFirst;
+    Region* 			mpRegion;
+    ImplRegionBand* 	mpCurrRectBand;
+    ImplRegionBandSep*	mpCurrRectBandSep;
+    BOOL				mbFirst;
 };
 
 // ------------------
@@ -58,8 +58,8 @@ struct ImplRegionHandle
 
 struct ImplRegionInfo
 {
-    void*               mpVoidCurrRectBand;
-    void*               mpVoidCurrRectBandSep;
+    void*				mpVoidCurrRectBand;
+    void*				mpVoidCurrRectBandSep;
 };
 
 // --------------
@@ -72,9 +72,9 @@ public:
     ImplRegionBase( int nCount = 1 ); // TODO: replace manual refcounting
     virtual ~ImplRegionBase();
 public:
-    ULONG               mnRefCount;
-    ULONG               mnRectCount;
-    PolyPolygon*        mpPolyPoly;
+    ULONG				mnRefCount;
+    ULONG				mnRectCount;
+    PolyPolygon*		mpPolyPoly;
     basegfx::B2DPolyPolygon* mpB2DPolyPoly;
 };
 
@@ -83,8 +83,8 @@ class ImplRegion : public ImplRegionBase
     friend class Region;
 
 private:
-    ImplRegionBand*     mpFirstBand;        // root of the list with y-bands
-    ImplRegionBand*     mpLastCheckedBand;
+    ImplRegionBand* 	mpFirstBand;		// root of the list with y-bands
+    ImplRegionBand* 	mpLastCheckedBand;
 
 public:
                         ImplRegion();
@@ -93,17 +93,17 @@ public:
                         ImplRegion( const ImplRegion& rImplRegion );
                         ~ImplRegion();
 
-    ImplRegionBand*     ImplGetFirstRegionBand() const { return mpFirstBand; }
-    PolyPolygon*        ImplGetPolyPoly() const { return mpPolyPoly; }
+    ImplRegionBand* 	ImplGetFirstRegionBand() const { return mpFirstBand; }
+    PolyPolygon*		ImplGetPolyPoly() const { return mpPolyPoly; }
 
-    void                CreateBandRange( long nYTop, long nYBottom );
-    void                InsertBands( long nYTop, long nYBottom );
-    BOOL                InsertSingleBand( ImplRegionBand* mpImplRegionBand,
+    void				CreateBandRange( long nYTop, long nYBottom );
+    void				InsertBands( long nYTop, long nYBottom );
+    BOOL				InsertSingleBand( ImplRegionBand* mpImplRegionBand,
                                           long nYBandPosition );
-    BOOL                InsertLine( const Point & rFirstPoint,
+    BOOL				InsertLine( const Point & rFirstPoint,
                                     const Point & rSecondPoint,
                                     long nLineID );
-    BOOL                InsertPoint( const Point &rPoint,
+    BOOL				InsertPoint( const Point &rPoint,
                                      long nLineID,
                                      BOOL bEndPoint, LineType eLineType );
 
@@ -119,16 +119,16 @@ public:
     */
     void                InsertBand (ImplRegionBand* pPreviousBand,
                                     ImplRegionBand* pBandToInsert);
-
-    void                Union( long nLeft, long nTop, long nRight, long nBottom );
-    void                Exclude( long nLeft, long nTop, long nRight, long nBottom );
-    void                XOr( long nLeft, long nTop, long nRight, long nBottom );
+    
+    void				Union( long nLeft, long nTop, long nRight, long nBottom );
+    void				Exclude( long nLeft, long nTop, long nRight, long nBottom );
+    void				XOr( long nLeft, long nTop, long nRight, long nBottom );
 
                         // remove emtpy rects
-    BOOL                OptimizeBandList();
+    BOOL				OptimizeBandList();
 
-    friend SvStream&    operator>>( SvStream& rIStm, Region& rRegion );
-    friend SvStream&    operator<<( SvStream& rOStm, const Region& rRegion );
+    friend SvStream&	operator>>( SvStream& rIStm, Region& rRegion );
+    friend SvStream&	operator<<( SvStream& rOStm, const Region& rRegion );
 };
 
-#endif  // _SV_REGION_H
+#endif	// _SV_REGION_H
diff --git a/vcl/inc/vcl/region.hxx b/vcl/inc/vcl/region.hxx
index ddfba57ffdcf..3bdc3348e18d 100644
--- a/vcl/inc/vcl/region.hxx
+++ b/vcl/inc/vcl/region.hxx
@@ -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
@@ -60,25 +60,25 @@ class VCL_DLLPUBLIC Region
     friend class Bitmap;
 
 private:
-    ImplRegion*         mpImplRegion;
-
-    SAL_DLLPRIVATE void             ImplCopyData();
-    SAL_DLLPRIVATE void             ImplCreateRectRegion( const Rectangle& rRect );
-    SAL_DLLPRIVATE void             ImplCreatePolyPolyRegion( const PolyPolygon& rPolyPoly );
-    SAL_DLLPRIVATE void             ImplPolyPolyRegionToBandRegionFunc();
-    SAL_DLLPRIVATE inline void      ImplPolyPolyRegionToBandRegion();
-    SAL_DLLPRIVATE const ImplRegion*    ImplGetImplRegion() const { return mpImplRegion; }
-    SAL_DLLPRIVATE ImplRegion*      ImplGetImplRegion() { return mpImplRegion; }
-    SAL_DLLPRIVATE BOOL             ImplGetFirstRect( ImplRegionInfo& rImplRegionInfo,
+    ImplRegion* 		mpImplRegion;
+
+    SAL_DLLPRIVATE void				ImplCopyData();
+    SAL_DLLPRIVATE void				ImplCreateRectRegion( const Rectangle& rRect );
+    SAL_DLLPRIVATE void				ImplCreatePolyPolyRegion( const PolyPolygon& rPolyPoly );
+    SAL_DLLPRIVATE void				ImplPolyPolyRegionToBandRegionFunc();
+    SAL_DLLPRIVATE inline void 		ImplPolyPolyRegionToBandRegion();
+    SAL_DLLPRIVATE const ImplRegion*	ImplGetImplRegion() const { return mpImplRegion; }
+    SAL_DLLPRIVATE ImplRegion* 		ImplGetImplRegion() { return mpImplRegion; }
+    SAL_DLLPRIVATE BOOL				ImplGetFirstRect( ImplRegionInfo& rImplRegionInfo,
                                           long& nX, long& nY, long& nWidth, long& nHeight ) const;
-    SAL_DLLPRIVATE BOOL             ImplGetNextRect( ImplRegionInfo& rImplRegionInfo,
+    SAL_DLLPRIVATE BOOL				ImplGetNextRect( ImplRegionInfo& rImplRegionInfo,
                                          long& nX, long& nY, long& nWidth, long& nHeight ) const;
-    SAL_DLLPRIVATE void             ImplBeginAddRect( );
-    SAL_DLLPRIVATE BOOL             ImplAddRect( const Rectangle& rRect );
-    SAL_DLLPRIVATE void             ImplEndAddRect( );
+    SAL_DLLPRIVATE void				ImplBeginAddRect( );
+    SAL_DLLPRIVATE BOOL				ImplAddRect( const Rectangle& rRect );
+    SAL_DLLPRIVATE void				ImplEndAddRect( );
 
 #ifdef DBG_UTIL
-    friend const char*  ImplDbgTestRegion( const void* pObj );
+    friend const char*	ImplDbgTestRegion( const void* pObj );
 #endif
 
 public:
@@ -91,25 +91,25 @@ public:
                     Region( const Region& rRegion );
                     ~Region();
 
-    void            Move( long nHorzMove, long nVertMove );
-    void            Scale( double fScaleX, double fScaleY );
-    BOOL            Union( const Rectangle& rRegion );
-    BOOL            Intersect( const Rectangle& rRegion );
-    BOOL            Exclude( const Rectangle& rRegion );
-    BOOL            XOr( const Rectangle& rRegion );
-    BOOL            Union( const Region& rRegion );
-    BOOL            Intersect( const Region& rRegion );
-    BOOL            Exclude( const Region& rRegion );
-    BOOL            XOr( const Region& rRegion );
+    void			Move( long nHorzMove, long nVertMove );
+    void			Scale( double fScaleX, double fScaleY );
+    BOOL			Union( const Rectangle& rRegion );
+    BOOL			Intersect( const Rectangle& rRegion );
+    BOOL			Exclude( const Rectangle& rRegion );
+    BOOL			XOr( const Rectangle& rRegion );
+    BOOL			Union( const Region& rRegion );
+    BOOL			Intersect( const Region& rRegion );
+    BOOL			Exclude( const Region& rRegion );
+    BOOL			XOr( const Region& rRegion );
 
-    RegionType      GetType() const;
-    BOOL            IsEmpty() const { return GetType() == REGION_EMPTY; };
-    BOOL            IsNull() const { return GetType() == REGION_NULL; };
+    RegionType		GetType() const;
+    BOOL			IsEmpty() const { return GetType() == REGION_EMPTY; };
+    BOOL			IsNull() const { return GetType() == REGION_NULL; };
 
-    void            SetEmpty();
-    void            SetNull();
+    void			SetEmpty();
+    void			SetNull();
 
-    Rectangle       GetBoundRect() const;
+    Rectangle		GetBoundRect() const;
 
     BOOL            HasPolyPolygon() const;
     PolyPolygon     GetPolyPolygon() const;
@@ -119,22 +119,22 @@ public:
     // or created from the constituent rectangles
     basegfx::B2DPolyPolygon ConvertToB2DPolyPolygon();
 
-    ULONG           GetRectCount() const;
-    RegionHandle    BeginEnumRects();
-    BOOL            GetEnumRects( RegionHandle hRegionHandle, Rectangle& rRect );
-    BOOL            GetNextEnumRect( RegionHandle hRegionHandle, Rectangle& rRect )
+    ULONG			GetRectCount() const;
+    RegionHandle	BeginEnumRects();
+    BOOL			GetEnumRects( RegionHandle hRegionHandle, Rectangle& rRect );
+    BOOL			GetNextEnumRect( RegionHandle hRegionHandle, Rectangle& rRect )
                         { return GetEnumRects( hRegionHandle, rRect ); }
-    void            EndEnumRects( RegionHandle hRegionHandle );
+    void			EndEnumRects( RegionHandle hRegionHandle );
 
-    BOOL            IsInside( const Point& rPoint ) const;
-    BOOL            IsInside( const Rectangle& rRect ) const;
-    BOOL            IsOver( const Rectangle& rRect ) const;
+    BOOL			IsInside( const Point& rPoint ) const;
+    BOOL			IsInside( const Rectangle& rRect ) const;
+    BOOL			IsOver( const Rectangle& rRect ) const;
 
-    Region&         operator=( const Region& rRegion );
-    Region&         operator=( const Rectangle& rRect );
+    Region& 		operator=( const Region& rRegion );
+    Region& 		operator=( const Rectangle& rRect );
 
-    BOOL            operator==( const Region& rRegion ) const;
-    BOOL            operator!=( const Region& rRegion ) const
+    BOOL			operator==( const Region& rRegion ) const;
+    BOOL			operator!=( const Region& rRegion ) const
                         { return !(Region::operator==( rRegion )); }
 
     friend VCL_DLLPUBLIC SvStream& operator>>( SvStream& rIStm, Region& rRegion );
@@ -152,4 +152,4 @@ public:
     static Region GetRegionFromPolyPolygon( const PolyPolygon& rPolyPoly );
 };
 
-#endif  // _SV_REGION_HXX
+#endif	// _SV_REGION_HXX
diff --git a/vcl/inc/vcl/salatype.hxx b/vcl/inc/vcl/salatype.hxx
index d9e25c0cada9..2c535042ac2a 100644
--- a/vcl/inc/vcl/salatype.hxx
+++ b/vcl/inc/vcl/salatype.hxx
@@ -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
@@ -36,12 +36,12 @@
 
 // Derzeit doppelt und in apptypes.hxx auch vorhanden
 
-#define INPUT_MOUSE                 0x0001
-#define INPUT_KEYBOARD              0x0002
-#define INPUT_PAINT                 0x0004
-#define INPUT_TIMER                 0x0008
-#define INPUT_OTHER                 0x0010
-#define INPUT_MOUSEANDKEYBOARD      (INPUT_MOUSE | INPUT_KEYBOARD)
-#define INPUT_ANY                   (INPUT_MOUSEANDKEYBOARD | INPUT_PAINT | INPUT_TIMER | INPUT_OTHER)
+#define INPUT_MOUSE 				0x0001
+#define INPUT_KEYBOARD				0x0002
+#define INPUT_PAINT 				0x0004
+#define INPUT_TIMER 				0x0008
+#define INPUT_OTHER 				0x0010
+#define INPUT_MOUSEANDKEYBOARD		(INPUT_MOUSE | INPUT_KEYBOARD)
+#define INPUT_ANY					(INPUT_MOUSEANDKEYBOARD | INPUT_PAINT | INPUT_TIMER | INPUT_OTHER)
 
 #endif // _SV_SALATYPE_HXX
diff --git a/vcl/inc/vcl/salbmp.hxx b/vcl/inc/vcl/salbmp.hxx
index 4aca4a9277e9..2018023d857e 100644
--- a/vcl/inc/vcl/salbmp.hxx
+++ b/vcl/inc/vcl/salbmp.hxx
@@ -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
@@ -44,20 +44,20 @@ public:
     SalBitmap() {}
     virtual ~SalBitmap();
 
-    virtual bool            Create( const Size& rSize,
-                                    USHORT nBitCount,
+    virtual bool			Create( const Size& rSize, 
+                                    USHORT nBitCount, 
                                     const BitmapPalette& rPal ) = 0;
-    virtual bool            Create( const SalBitmap& rSalBmp ) = 0;
-    virtual bool            Create( const SalBitmap& rSalBmp,
+    virtual bool			Create( const SalBitmap& rSalBmp ) = 0;
+    virtual bool			Create( const SalBitmap& rSalBmp, 
                                     SalGraphics* pGraphics ) = 0;
-    virtual bool            Create( const SalBitmap& rSalBmp,
+    virtual bool			Create( const SalBitmap& rSalBmp,
                                     USHORT nNewBitCount ) = 0;
-    virtual void            Destroy() = 0;
-    virtual Size            GetSize() const = 0;
-    virtual USHORT          GetBitCount() const = 0;
+    virtual void			Destroy() = 0;
+    virtual Size			GetSize() const = 0;
+    virtual USHORT			GetBitCount() const = 0;
 
-    virtual BitmapBuffer*   AcquireBuffer( bool bReadOnly ) = 0;
-    virtual void            ReleaseBuffer( BitmapBuffer* pBuffer, bool bReadOnly ) = 0;
+    virtual BitmapBuffer*	AcquireBuffer( bool bReadOnly ) = 0;
+    virtual void			ReleaseBuffer( BitmapBuffer* pBuffer, bool bReadOnly ) = 0;
     virtual bool            GetSystemData( BitmapSystemData& rData ) = 0;
 
 };
diff --git a/vcl/inc/vcl/salbtype.hxx b/vcl/inc/vcl/salbtype.hxx
index bbb70efcdf22..8d3b37cb89f4 100644
--- a/vcl/inc/vcl/salbtype.hxx
+++ b/vcl/inc/vcl/salbtype.hxx
@@ -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
@@ -42,63 +42,63 @@
 // - Memory -
 // ----------
 
-typedef BYTE*       HPBYTE;
-typedef HPBYTE      Scanline;
-typedef const BYTE* ConstHPBYTE;
-typedef ConstHPBYTE ConstScanline;
+typedef BYTE*		HPBYTE;
+typedef HPBYTE		Scanline;
+typedef const BYTE*	ConstHPBYTE;
+typedef ConstHPBYTE	ConstScanline;
 
 // ------------------
 // - Bitmap formats -
 // ------------------
 
-#define BMP_FORMAT_BOTTOM_UP                        0x00000000UL
-#define BMP_FORMAT_TOP_DOWN                         0x80000000UL
+#define BMP_FORMAT_BOTTOM_UP						0x00000000UL
+#define BMP_FORMAT_TOP_DOWN 						0x80000000UL
 
-#define BMP_FORMAT_1BIT_MSB_PAL                     0x00000001UL
-#define BMP_FORMAT_1BIT_LSB_PAL                     0x00000002UL
+#define BMP_FORMAT_1BIT_MSB_PAL 					0x00000001UL
+#define BMP_FORMAT_1BIT_LSB_PAL 					0x00000002UL
 
-#define BMP_FORMAT_4BIT_MSN_PAL                     0x00000004UL
-#define BMP_FORMAT_4BIT_LSN_PAL                     0x00000008UL
+#define BMP_FORMAT_4BIT_MSN_PAL 					0x00000004UL
+#define BMP_FORMAT_4BIT_LSN_PAL 					0x00000008UL
 
-#define BMP_FORMAT_8BIT_PAL                         0x00000010UL
-#define BMP_FORMAT_8BIT_TC_MASK                     0x00000020UL
+#define BMP_FORMAT_8BIT_PAL 						0x00000010UL
+#define BMP_FORMAT_8BIT_TC_MASK 					0x00000020UL
 
-// #define BMP_FORMAT_16BIT_TC_MASK                 0x00000040UL
+// #define BMP_FORMAT_16BIT_TC_MASK					0x00000040UL
 
-#define BMP_FORMAT_24BIT_TC_BGR                     0x00000080UL
-#define BMP_FORMAT_24BIT_TC_RGB                     0x00000100UL
-#define BMP_FORMAT_24BIT_TC_MASK                    0x00000200UL
+#define BMP_FORMAT_24BIT_TC_BGR 					0x00000080UL
+#define BMP_FORMAT_24BIT_TC_RGB 					0x00000100UL
+#define BMP_FORMAT_24BIT_TC_MASK					0x00000200UL
 
-#define BMP_FORMAT_32BIT_TC_ABGR                    0x00000400UL
-#define BMP_FORMAT_32BIT_TC_ARGB                    0x00000800UL
-#define BMP_FORMAT_32BIT_TC_BGRA                    0x00001000UL
-#define BMP_FORMAT_32BIT_TC_RGBA                    0x00002000UL
-#define BMP_FORMAT_32BIT_TC_MASK                    0x00004000UL
+#define BMP_FORMAT_32BIT_TC_ABGR					0x00000400UL
+#define BMP_FORMAT_32BIT_TC_ARGB					0x00000800UL
+#define BMP_FORMAT_32BIT_TC_BGRA					0x00001000UL
+#define BMP_FORMAT_32BIT_TC_RGBA					0x00002000UL
+#define BMP_FORMAT_32BIT_TC_MASK					0x00004000UL
 
-#define BMP_FORMAT_16BIT_TC_MSB_MASK                0x00008000UL
-#define BMP_FORMAT_16BIT_TC_LSB_MASK                0x00010000UL
+#define BMP_FORMAT_16BIT_TC_MSB_MASK				0x00008000UL
+#define BMP_FORMAT_16BIT_TC_LSB_MASK				0x00010000UL
 
-#define BMP_SCANLINE_ADJUSTMENT( Mac_nBmpFormat )   ( (Mac_nBmpFormat) & 0x80000000UL )
-#define BMP_SCANLINE_FORMAT( Mac_nBmpFormat )       ( (Mac_nBmpFormat) & 0x7FFFFFFFUL )
+#define BMP_SCANLINE_ADJUSTMENT( Mac_nBmpFormat )	( (Mac_nBmpFormat) & 0x80000000UL )
+#define BMP_SCANLINE_FORMAT( Mac_nBmpFormat )		( (Mac_nBmpFormat) & 0x7FFFFFFFUL )
 
 // ------------------------------------------------------------------
 
-#define MASK_TO_COLOR( d_nVal, d_RM, d_GM, d_BM, d_RS, d_GS, d_BS, d_Col )                          \
-ULONG _def_cR = (BYTE) ( d_RS < 0L ? ( (d_nVal) & d_RM ) << -d_RS : ( (d_nVal) & d_RM ) >> d_RS );  \
-ULONG _def_cG = (BYTE) ( d_GS < 0L ? ( (d_nVal) & d_GM ) << -d_GS : ( (d_nVal) & d_GM ) >> d_GS );  \
-ULONG _def_cB = (BYTE) ( d_BS < 0L ? ( (d_nVal) & d_BM ) << -d_BS : ( (d_nVal) & d_BM ) >> d_BS );  \
-d_Col = BitmapColor( (BYTE) ( _def_cR | ( ( _def_cR & mnROr ) >> mnROrShift ) ),                    \
-                     (BYTE) ( _def_cG | ( ( _def_cG & mnGOr ) >> mnGOrShift ) ),                    \
+#define MASK_TO_COLOR( d_nVal, d_RM, d_GM, d_BM, d_RS, d_GS, d_BS, d_Col )							\
+ULONG _def_cR = (BYTE) ( d_RS < 0L ? ( (d_nVal) & d_RM ) << -d_RS : ( (d_nVal) & d_RM ) >> d_RS );	\
+ULONG _def_cG = (BYTE) ( d_GS < 0L ? ( (d_nVal) & d_GM ) << -d_GS : ( (d_nVal) & d_GM ) >> d_GS );	\
+ULONG _def_cB = (BYTE) ( d_BS < 0L ? ( (d_nVal) & d_BM ) << -d_BS : ( (d_nVal) & d_BM ) >> d_BS );	\
+d_Col = BitmapColor( (BYTE) ( _def_cR | ( ( _def_cR & mnROr ) >> mnROrShift ) ),					\
+                     (BYTE) ( _def_cG | ( ( _def_cG & mnGOr ) >> mnGOrShift ) ),					\
                      (BYTE) ( _def_cB | ( ( _def_cB & mnBOr ) >> mnBOrShift ) ) );
 
 // ------------------------------------------------------------------
 
 #define COLOR_TO_MASK( d_rCol, d_RM, d_GM, d_BM, d_RS, d_GS, d_BS ) \
-( ( ( ( d_RS < 0L ) ? ( (UINT32) (d_rCol).GetRed() >> -d_RS ) :     \
-    ( (UINT32) (d_rCol).GetRed() << d_RS ) ) & d_RM ) |             \
-  ( ( ( d_GS < 0L ) ? ( (UINT32) (d_rCol).GetGreen() >> -d_GS ) :   \
-    ( (UINT32) (d_rCol).GetGreen() << d_GS ) ) & d_GM ) |           \
-  ( ( ( d_BS < 0L ) ? ( (UINT32) (d_rCol).GetBlue() >> -d_BS ) :    \
+( ( ( ( d_RS < 0L ) ? ( (UINT32) (d_rCol).GetRed() >> -d_RS ) : 	\
+    ( (UINT32) (d_rCol).GetRed() << d_RS ) ) & d_RM ) | 			\
+  ( ( ( d_GS < 0L ) ? ( (UINT32) (d_rCol).GetGreen() >> -d_GS ) :	\
+    ( (UINT32) (d_rCol).GetGreen() << d_GS ) ) & d_GM ) |			\
+  ( ( ( d_BS < 0L ) ? ( (UINT32) (d_rCol).GetBlue() >> -d_BS ) :	\
     ( (UINT32) (d_rCol).GetBlue() << d_BS ) ) & d_BM ) )
 
 // ---------------
@@ -110,59 +110,59 @@ class Color;
 class VCL_DLLPUBLIC BitmapColor
 {
 private:
-
+                                             
 // !!! Achtung:
 // !!! da auf die Member dieser Klasse via memcpy
 // !!! zugegriffen wird, darf diese Klasse weder
 // !!! in der Groesse noch der Reihenfolge der
 // !!! Member veraendert werden (KA 02.09.97)
-    BYTE                mcBlueOrIndex;
-    BYTE                mcGreen;
-    BYTE                mcRed;
-    BYTE                mbIndex;
+    BYTE				mcBlueOrIndex;
+    BYTE				mcGreen;
+    BYTE				mcRed;
+    BYTE				mbIndex;
 
 public:
 
-    inline              BitmapColor();
-    inline              BitmapColor( const BitmapColor& rBitmapColor );
-    inline              BitmapColor( BYTE cRed, BYTE cGreen, BYTE cBlue );
-    inline              BitmapColor( const Color& rColor );
-    inline              BitmapColor( BYTE cIndex );
-    inline              ~BitmapColor() {};
+    inline				BitmapColor();
+    inline				BitmapColor( const BitmapColor& rBitmapColor );
+    inline				BitmapColor( BYTE cRed, BYTE cGreen, BYTE cBlue );
+    inline				BitmapColor( const Color& rColor );
+    inline				BitmapColor( BYTE cIndex );
+    inline				~BitmapColor() {};
 
-    inline BOOL         operator==( const BitmapColor& rBitmapColor ) const;
-    inline BOOL         operator!=( const BitmapColor& rBitmapColor ) const;
+    inline BOOL 		operator==( const BitmapColor& rBitmapColor ) const;
+    inline BOOL 		operator!=( const BitmapColor& rBitmapColor ) const;
     inline BitmapColor& operator=( const BitmapColor& rBitmapColor );
 
-    inline BOOL         IsIndex() const;
+    inline BOOL 		IsIndex() const;
 
-    inline BYTE         GetRed() const;
-    inline void         SetRed( BYTE cRed );
+    inline BYTE 		GetRed() const;
+    inline void 		SetRed( BYTE cRed );
 
-    inline BYTE         GetGreen() const;
-    inline void         SetGreen( BYTE cGreen );
+    inline BYTE 		GetGreen() const;
+    inline void 		SetGreen( BYTE cGreen );
 
-    inline BYTE         GetBlue() const;
-    inline void         SetBlue( BYTE cBlue );
+    inline BYTE 		GetBlue() const;
+    inline void 		SetBlue( BYTE cBlue );
 
-    inline BYTE         GetIndex() const;
-    inline void         SetIndex( BYTE cIndex );
+    inline BYTE 		GetIndex() const;
+    inline void 		SetIndex( BYTE cIndex );
 
-    operator            Color() const;
-    inline operator     BYTE() const;
+    operator			Color() const;
+    inline operator 	BYTE() const;
 
     inline BYTE         GetBlueOrIndex() const;
 
     inline BitmapColor& Invert();
 
-    inline BYTE         GetLuminance() const;
+    inline BYTE 		GetLuminance() const;
     inline BitmapColor& IncreaseLuminance( BYTE cGreyInc );
     inline BitmapColor& DecreaseLuminance( BYTE cGreyDec );
+    
+    inline BitmapColor&	Merge( const BitmapColor& rColor, BYTE cTransparency );
+    inline BitmapColor&	Merge( BYTE cR, BYTE cG, BYTE cB, BYTE cTransparency );
 
-    inline BitmapColor& Merge( const BitmapColor& rColor, BYTE cTransparency );
-    inline BitmapColor& Merge( BYTE cR, BYTE cG, BYTE cB, BYTE cTransparency );
-
-    inline ULONG        GetColorError( const BitmapColor& rBitmapColor ) const;
+    inline ULONG		GetColorError( const BitmapColor& rBitmapColor ) const;
 };
 
 // ---------------
@@ -178,37 +178,37 @@ class VCL_DLLPUBLIC BitmapPalette
 
 private:
 
-    BitmapColor*                mpBitmapColor;
-    USHORT                      mnCount;
+    BitmapColor*				mpBitmapColor;
+    USHORT						mnCount;
 
 //#if 0 // _SOLAR__PRIVATE
 
 public:
-
+    
     SAL_DLLPRIVATE inline BitmapColor* ImplGetColorBuffer() const;
 
 //#endif // __PRIVATE
 
 public:
 
-    inline                      BitmapPalette();
-    inline                      BitmapPalette( const BitmapPalette& rBitmapPalette );
-    inline                      BitmapPalette( USHORT nCount );
-    inline                      ~BitmapPalette();
+    inline						BitmapPalette();
+    inline						BitmapPalette( const BitmapPalette& rBitmapPalette );
+    inline						BitmapPalette( USHORT nCount );
+    inline						~BitmapPalette();
 
-    inline BitmapPalette&       operator=( const BitmapPalette& rBitmapPalette );
-    inline BOOL                 operator==( const BitmapPalette& rBitmapPalette ) const;
-    inline BOOL                 operator!=( const BitmapPalette& rBitmapPalette ) const;
-    inline BOOL                 operator!();
+    inline BitmapPalette&		operator=( const BitmapPalette& rBitmapPalette );
+    inline BOOL 				operator==( const BitmapPalette& rBitmapPalette ) const;
+    inline BOOL 				operator!=( const BitmapPalette& rBitmapPalette ) const;
+    inline BOOL 				operator!();
 
-    inline USHORT               GetEntryCount() const;
-    inline void                 SetEntryCount( USHORT nCount );
+    inline USHORT				GetEntryCount() const;
+    inline void 				SetEntryCount( USHORT nCount );
 
-    inline const BitmapColor&   operator[]( USHORT nIndex ) const;
-    inline BitmapColor&         operator[]( USHORT nIndex );
+    inline const BitmapColor&	operator[]( USHORT nIndex ) const;
+    inline BitmapColor& 		operator[]( USHORT nIndex );
 
-    inline USHORT               GetBestIndex( const BitmapColor& rCol ) const;
-    bool                        IsGreyPalette() const;
+    inline USHORT				GetBestIndex( const BitmapColor& rCol ) const;
+    bool						IsGreyPalette() const;
 };
 
 // ---------------
@@ -217,43 +217,43 @@ public:
 
 class VCL_DLLPUBLIC ColorMask
 {
-    ULONG               mnRMask;
-    ULONG               mnGMask;
-    ULONG               mnBMask;
-    long                mnRShift;
-    long                mnGShift;
-    long                mnBShift;
-    ULONG               mnROrShift;
-    ULONG               mnGOrShift;
-    ULONG               mnBOrShift;
-    ULONG               mnROr;
-    ULONG               mnGOr;
-    ULONG               mnBOr;
+    ULONG				mnRMask;
+    ULONG				mnGMask;
+    ULONG				mnBMask;
+    long				mnRShift;
+    long				mnGShift;
+    long				mnBShift;
+    ULONG				mnROrShift;
+    ULONG				mnGOrShift;
+    ULONG				mnBOrShift;
+    ULONG				mnROr;
+    ULONG				mnGOr;
+    ULONG				mnBOr;
 
     SAL_DLLPRIVATE inline long ImplCalcMaskShift( ULONG nMask, ULONG& rOr, ULONG& rOrShift ) const;
 
 public:
 
-    inline              ColorMask( ULONG nRedMask = 0UL, ULONG nGreenMask = 0UL, ULONG nBlueMask = 0UL );
-    inline              ~ColorMask() {}
+    inline				ColorMask( ULONG nRedMask = 0UL, ULONG nGreenMask = 0UL, ULONG nBlueMask = 0UL );
+    inline				~ColorMask() {}
 
-    inline ULONG        GetRedMask() const;
-    inline ULONG        GetGreenMask() const;
-    inline ULONG        GetBlueMask() const;
+    inline ULONG		GetRedMask() const;
+    inline ULONG		GetGreenMask() const;
+    inline ULONG		GetBlueMask() const;
 
-    inline void         GetColorFor8Bit( BitmapColor& rColor, ConstHPBYTE pPixel ) const;
-    inline void         SetColorFor8Bit( const BitmapColor& rColor, HPBYTE pPixel ) const;
+    inline void 		GetColorFor8Bit( BitmapColor& rColor, ConstHPBYTE pPixel ) const;
+    inline void 		SetColorFor8Bit( const BitmapColor& rColor, HPBYTE pPixel ) const;
 
-    inline void         GetColorFor16BitMSB( BitmapColor& rColor, ConstHPBYTE pPixel ) const;
-    inline void         SetColorFor16BitMSB( const BitmapColor& rColor, HPBYTE pPixel ) const;
-    inline void         GetColorFor16BitLSB( BitmapColor& rColor, ConstHPBYTE pPixel ) const;
-    inline void         SetColorFor16BitLSB( const BitmapColor& rColor, HPBYTE pPixel ) const;
+    inline void 		GetColorFor16BitMSB( BitmapColor& rColor, ConstHPBYTE pPixel ) const;
+    inline void 		SetColorFor16BitMSB( const BitmapColor& rColor, HPBYTE pPixel ) const;
+    inline void 		GetColorFor16BitLSB( BitmapColor& rColor, ConstHPBYTE pPixel ) const;
+    inline void 		SetColorFor16BitLSB( const BitmapColor& rColor, HPBYTE pPixel ) const;
 
-    inline void         GetColorFor24Bit( BitmapColor& rColor, ConstHPBYTE pPixel ) const;
-    inline void         SetColorFor24Bit( const BitmapColor& rColor, HPBYTE pPixel ) const;
+    inline void 		GetColorFor24Bit( BitmapColor& rColor, ConstHPBYTE pPixel ) const;
+    inline void 		SetColorFor24Bit( const BitmapColor& rColor, HPBYTE pPixel ) const;
 
-    inline void         GetColorFor32Bit( BitmapColor& rColor, ConstHPBYTE pPixel ) const;
-    inline void         SetColorFor32Bit( const BitmapColor& rColor, HPBYTE pPixel ) const;
+    inline void 		GetColorFor32Bit( BitmapColor& rColor, ConstHPBYTE pPixel ) const;
+    inline void 		SetColorFor32Bit( const BitmapColor& rColor, HPBYTE pPixel ) const;
 };
 
 // ---------------
@@ -262,14 +262,14 @@ public:
 
 struct VCL_DLLPUBLIC BitmapBuffer
 {
-    ULONG           mnFormat;
-    long            mnWidth;
-    long            mnHeight;
-    long            mnScanlineSize;
-    USHORT          mnBitCount;
-    ColorMask       maColorMask;
-    BitmapPalette   maPalette;
-    BYTE*           mpBits;
+    ULONG			mnFormat;
+    long			mnWidth;
+    long			mnHeight;
+    long			mnScanlineSize;
+    USHORT			mnBitCount;
+    ColorMask		maColorMask;
+    BitmapPalette	maPalette;
+    BYTE*			mpBits;
 
                     BitmapBuffer(){}
                     ~BitmapBuffer() {}
@@ -279,56 +279,56 @@ struct VCL_DLLPUBLIC BitmapBuffer
 // - StretchAndConvert -
 // ---------------------
 
-VCL_DLLPUBLIC BitmapBuffer* StretchAndConvert( const BitmapBuffer& rSrcBuffer, const SalTwoRect& rTwoRect,
+VCL_DLLPUBLIC BitmapBuffer* StretchAndConvert( const BitmapBuffer& rSrcBuffer, const SalTwoRect& rTwoRect, 
                                                ULONG nDstBitmapFormat, BitmapPalette* pDstPal = NULL, ColorMask* pDstMask = NULL );
 
 // ------------------------------------------------------------------
 
 inline BitmapColor::BitmapColor() :
-            mcBlueOrIndex   ( 0 ),
-            mcGreen         ( 0 ),
-            mcRed           ( 0 ),
-            mbIndex         ( FALSE )
+            mcBlueOrIndex	( 0 ),
+            mcGreen 		( 0 ),
+            mcRed			( 0 ),
+            mbIndex 		( FALSE )
 {
 }
 
 // ------------------------------------------------------------------
 
 inline BitmapColor::BitmapColor( BYTE cRed, BYTE cGreen, BYTE cBlue ) :
-            mcBlueOrIndex   ( cBlue ),
-            mcGreen         ( cGreen ),
-            mcRed           ( cRed ),
-            mbIndex         ( FALSE )
+            mcBlueOrIndex	( cBlue ),
+            mcGreen 		( cGreen ),
+            mcRed			( cRed ),
+            mbIndex 		( FALSE )
 {
 }
 
 // ------------------------------------------------------------------
 
 inline BitmapColor::BitmapColor( const BitmapColor& rBitmapColor ) :
-            mcBlueOrIndex   ( rBitmapColor.mcBlueOrIndex ),
-            mcGreen         ( rBitmapColor.mcGreen ),
-            mcRed           ( rBitmapColor.mcRed ),
-            mbIndex         ( rBitmapColor.mbIndex )
+            mcBlueOrIndex	( rBitmapColor.mcBlueOrIndex ),
+            mcGreen 		( rBitmapColor.mcGreen ),
+            mcRed			( rBitmapColor.mcRed ),
+            mbIndex 		( rBitmapColor.mbIndex )
 {
 }
 
 // ------------------------------------------------------------------
 
 inline BitmapColor::BitmapColor( const Color& rColor ) :
-            mcBlueOrIndex   ( rColor.GetBlue() ),
-            mcGreen         ( rColor.GetGreen() ),
-            mcRed           ( rColor.GetRed() ),
-            mbIndex         ( 0 )
+            mcBlueOrIndex	( rColor.GetBlue() ),
+            mcGreen 		( rColor.GetGreen() ),
+            mcRed			( rColor.GetRed() ),
+            mbIndex 		( 0 )
 {
 }
 
 // ------------------------------------------------------------------
 
 inline BitmapColor::BitmapColor( BYTE cIndex ) :
-            mcBlueOrIndex   ( cIndex ),
-            mcGreen         ( 0 ),
-            mcRed           ( 0 ),
-            mbIndex         ( TRUE )
+            mcBlueOrIndex	( cIndex ),
+            mcGreen 		( 0 ),
+            mcRed			( 0 ),
+            mbIndex 		( TRUE )
 {
 }
 
@@ -499,26 +499,26 @@ inline BitmapColor& BitmapColor::DecreaseLuminance( BYTE cGreyDec )
 
 // ------------------------------------------------------------------
 
-inline BitmapColor& BitmapColor::Merge( const BitmapColor& rBitmapColor, BYTE cTransparency )
+inline BitmapColor&	BitmapColor::Merge( const BitmapColor& rBitmapColor, BYTE cTransparency )
 {
     DBG_ASSERT( !mbIndex, "Pixel represents index into colortable!" );
     DBG_ASSERT( !rBitmapColor.mbIndex, "Pixel represents index into colortable!" );
     mcBlueOrIndex = COLOR_CHANNEL_MERGE( mcBlueOrIndex, rBitmapColor.mcBlueOrIndex, cTransparency );
     mcGreen = COLOR_CHANNEL_MERGE( mcGreen, rBitmapColor.mcGreen, cTransparency );
     mcRed = COLOR_CHANNEL_MERGE( mcRed, rBitmapColor.mcRed, cTransparency );
-
+    
     return *this;
 }
 
 // ------------------------------------------------------------------
 
-inline BitmapColor& BitmapColor::Merge( BYTE cR, BYTE cG, BYTE cB, BYTE cTransparency )
+inline BitmapColor&	BitmapColor::Merge( BYTE cR, BYTE cG, BYTE cB, BYTE cTransparency )
 {
     DBG_ASSERT( !mbIndex, "Pixel represents index into colortable!" );
     mcBlueOrIndex = COLOR_CHANNEL_MERGE( mcBlueOrIndex, cB, cTransparency );
     mcGreen = COLOR_CHANNEL_MERGE( mcGreen, cG, cTransparency );
     mcRed = COLOR_CHANNEL_MERGE( mcRed, cR, cTransparency );
-
+    
     return *this;
 }
 
@@ -536,8 +536,8 @@ inline ULONG BitmapColor::GetColorError( const BitmapColor& rBitmapColor ) const
 // ------------------------------------------------------------------
 
 inline BitmapPalette::BitmapPalette() :
-            mpBitmapColor   ( NULL ),
-            mnCount         ( 0 )
+            mpBitmapColor	( NULL ),
+            mnCount 		( 0 )
 {
 }
 
@@ -655,9 +655,9 @@ inline void BitmapPalette::SetEntryCount( USHORT nCount )
     {
         const ULONG nNewSize = nCount * sizeof( BitmapColor );
         const ULONG nMinSize = Min( mnCount, nCount ) * sizeof( BitmapColor );
-        BYTE*       pNewColor = new BYTE[ nNewSize ];
+        BYTE*		pNewColor = new BYTE[ nNewSize ];
 
-        if ( nMinSize && mpBitmapColor )
+        if ( nMinSize && mpBitmapColor ) 
             memcpy( pNewColor, mpBitmapColor, nMinSize );
         delete[] (BYTE*) mpBitmapColor;
         memset( pNewColor + nMinSize, 0, nNewSize - nMinSize );
@@ -740,9 +740,9 @@ inline ColorMask::ColorMask( ULONG nRedMask, ULONG nGreenMask, ULONG nBlueMask )
 
 inline long ColorMask::ImplCalcMaskShift( ULONG nMask, ULONG& rOr, ULONG& rOrShift ) const
 {
-    long    nShift;
-    long    nRet;
-    ULONG   nLen = 0UL;
+    long	nShift;
+    long	nRet;
+    ULONG	nLen = 0UL;
 
     // bei welchen Bits faengt die Maske an
     for( nShift = 31L; ( nShift >= 0L ) && !( nMask & ( 1 << (ULONG) nShift ) ); nShift-- )
diff --git a/vcl/inc/vcl/salctrlhandle.hxx b/vcl/inc/vcl/salctrlhandle.hxx
index 4a0a3a0f5b0a..265d9851ef97 100644
--- a/vcl/inc/vcl/salctrlhandle.hxx
+++ b/vcl/inc/vcl/salctrlhandle.hxx
@@ -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
@@ -42,7 +42,7 @@ class SalControlHandle
         virtual ~SalControlHandle();
 
         // TODO: derive Sal implementation
-        //SalControlHandleData  maData;
+        //SalControlHandleData	maData;
 };
 
 #endif
diff --git a/vcl/inc/vcl/salctype.hxx b/vcl/inc/vcl/salctype.hxx
index 1566f02a1299..846e95253ae1 100644
--- a/vcl/inc/vcl/salctype.hxx
+++ b/vcl/inc/vcl/salctype.hxx
@@ -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
@@ -34,17 +34,17 @@
 // - Defines -
 // -----------
 
-#define CVT_UNKNOWN (0x00000000UL)
-#define CVT_BMP     (0x00000001UL)
-#define CVT_GIF     (0x00000002UL)
-#define CVT_JPG     (0x00000003UL)
-#define CVT_MET     (0x00000004UL)
-#define CVT_PCT     (0x00000005UL)
-#define CVT_PNG     (0x00000006UL)
-#define CVT_SVM     (0x00000007UL)
-#define CVT_TIF     (0x00000008UL)
-#define CVT_WMF     (0x00000009UL)
-#define CVT_EMF     (0x0000000aUL)
+#define CVT_UNKNOWN	(0x00000000UL)
+#define CVT_BMP		(0x00000001UL)
+#define CVT_GIF		(0x00000002UL)
+#define CVT_JPG		(0x00000003UL)
+#define CVT_MET		(0x00000004UL)
+#define CVT_PCT		(0x00000005UL)
+#define CVT_PNG		(0x00000006UL)
+#define CVT_SVM		(0x00000007UL)
+#define CVT_TIF		(0x00000008UL)
+#define CVT_WMF		(0x00000009UL)
+#define CVT_EMF		(0x0000000aUL)
 
 // ---------------
 // - ConvertData -
@@ -60,9 +60,9 @@ private:
 
 public:
 
-    Graphic             maGraphic;
-    SvStream&           mrStm;
-    ULONG               mnFormat;
+    Graphic				maGraphic;
+    SvStream&			mrStm;
+    ULONG				mnFormat;
 
                         ConvertData( const Graphic& rGraphic, SvStream& rStm, ULONG nFormat ) :
                             maGraphic( rGraphic ), mrStm( rStm ), mnFormat( nFormat ) {}
@@ -73,7 +73,7 @@ public:
 // - Callback -
 // ------------
 
-typedef ULONG (*SALGRFCVTPROC)( void* pInst,
+typedef ULONG (*SALGRFCVTPROC)( void* pInst, 
                                 ULONG nInFormat, void* pInBuffer, ULONG nInBufSize,
                                 ULONG nOutFormat, void** ppOutBuffer );
 
diff --git a/vcl/inc/vcl/saldatabasic.hxx b/vcl/inc/vcl/saldatabasic.hxx
index 1df2a701fd1a..16ac6e264aea 100644
--- a/vcl/inc/vcl/saldatabasic.hxx
+++ b/vcl/inc/vcl/saldatabasic.hxx
@@ -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
@@ -35,8 +35,8 @@
 class VCL_DLLPUBLIC SalData
 {
 public:
-    SalInstance*        m_pInstance; // pointer to instance
-    oslModule           m_pPlugin;   // plugin library handle
+    SalInstance*		m_pInstance; // pointer to instance
+    oslModule		   	m_pPlugin;   // plugin library handle
 
     SalData();
     virtual ~SalData();
diff --git a/vcl/inc/vcl/salframe.hxx b/vcl/inc/vcl/salframe.hxx
index 08548d7dda40..37b0f5fa87cf 100644
--- a/vcl/inc/vcl/salframe.hxx
+++ b/vcl/inc/vcl/salframe.hxx
@@ -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
@@ -68,7 +68,7 @@ struct SystemEnvData;
 #define SAL_FRAME_TOTOP_RESTOREWHENMIN      ((USHORT)0x0001)
 #define SAL_FRAME_TOTOP_FOREGROUNDTASK      ((USHORT)0x0002)
 #define SAL_FRAME_TOTOP_GRABFOCUS           ((USHORT)0x0004)
-#define SAL_FRAME_TOTOP_GRABFOCUS_ONLY       ((USHORT)0x0008)
+#define SAL_FRAME_TOTOP_GRABFOCUS_ONLY		 ((USHORT)0x0008)
 
 #define SAL_FRAME_ENDEXTTEXTINPUT_COMPLETE  ((USHORT)0x0001)
 #define SAL_FRAME_ENDEXTTEXTINPUT_CANCEL    ((USHORT)0x0002)
@@ -146,76 +146,76 @@ struct SystemParentData;
 class VCL_DLLPUBLIC SalFrame : public vcl::DeletionNotifier
 {
     // the VCL window corresponding to this frame
-    Window*                 m_pWindow;
-    SALFRAMEPROC            m_pProc;
+    Window*					m_pWindow;
+    SALFRAMEPROC			m_pProc;
 public:                     // public for Sal Implementation
     SalFrame() : m_pWindow( NULL ), m_pProc( NULL ) {}
     virtual ~SalFrame();
 
 public:                     // public for Sal Implementation
-    SalFrameGeometry        maGeometry;
+    SalFrameGeometry		maGeometry;
 
 public:
     // SalGraphics or NULL, but two Graphics for all SalFrames
     // must be returned
-    virtual SalGraphics*        GetGraphics() = 0;
-    virtual void                ReleaseGraphics( SalGraphics* pGraphics ) = 0;
+    virtual SalGraphics*		GetGraphics() = 0;
+    virtual void				ReleaseGraphics( SalGraphics* pGraphics ) = 0;
 
     // Event must be destroyed, when Frame is destroyed
     // When Event is called, SalInstance::Yield() must be returned
-    virtual BOOL                PostEvent( void* pData ) = 0;
+    virtual BOOL				PostEvent( void* pData ) = 0;
 
-    virtual void                SetTitle( const XubString& rTitle ) = 0;
-    virtual void                SetIcon( USHORT nIcon ) = 0;
+    virtual void				SetTitle( const XubString& rTitle ) = 0;
+    virtual void				SetIcon( USHORT nIcon ) = 0;
     virtual void                SetRepresentedURL( const rtl::OUString& );
     virtual void                    SetMenu( SalMenu *pSalMenu ) = 0;
     virtual void                    DrawMenuBar() = 0;
 
     virtual void                SetExtendedFrameStyle( SalExtStyle nExtStyle ) = 0;
-
+    
     // Before the window is visible, a resize event
     // must be sent with the correct size
-    virtual void                Show( BOOL bVisible, BOOL bNoActivate = FALSE ) = 0;
-    virtual void                Enable( BOOL bEnable ) = 0;
+    virtual void				Show( BOOL bVisible, BOOL bNoActivate = FALSE ) = 0;
+    virtual void				Enable( BOOL bEnable ) = 0;
     // Set ClientSize and Center the Window to the desktop
     // and send/post a resize message
     virtual void                SetMinClientSize( long nWidth, long nHeight ) = 0;
     virtual void                SetMaxClientSize( long nWidth, long nHeight ) = 0;
-    virtual void                SetPosSize( long nX, long nY, long nWidth, long nHeight, USHORT nFlags ) = 0;
-    virtual void                GetClientSize( long& rWidth, long& rHeight ) = 0;
-    virtual void                GetWorkArea( Rectangle& rRect ) = 0;
-    virtual SalFrame*           GetParent() const = 0;
+    virtual void				SetPosSize( long nX, long nY, long nWidth, long nHeight, USHORT nFlags ) = 0;
+    virtual void				GetClientSize( long& rWidth, long& rHeight ) = 0;
+    virtual void				GetWorkArea( Rectangle& rRect ) = 0;
+    virtual SalFrame*			GetParent() const = 0;
     // Note: x will be mirrored at parent if UI mirroring is active
-    SalFrameGeometry            GetGeometry();
-    const SalFrameGeometry&     GetUnmirroredGeometry() const { return maGeometry; }
-    virtual void                SetWindowState( const SalFrameState* pState ) = 0;
-    virtual BOOL                GetWindowState( SalFrameState* pState ) = 0;
-    virtual void                ShowFullScreen( BOOL bFullScreen, sal_Int32 nDisplay ) = 0;
+    SalFrameGeometry			GetGeometry();
+    const SalFrameGeometry&		GetUnmirroredGeometry() const { return maGeometry; }
+    virtual void				SetWindowState( const SalFrameState* pState ) = 0;
+    virtual BOOL				GetWindowState( SalFrameState* pState ) = 0;
+    virtual void				ShowFullScreen( BOOL bFullScreen, sal_Int32 nDisplay ) = 0;
     // Enable/Disable ScreenSaver, SystemAgents, ...
-    virtual void                StartPresentation( BOOL bStart ) = 0;
+    virtual void				StartPresentation( BOOL bStart ) = 0;
     // Show Window over all other Windows
-    virtual void                SetAlwaysOnTop( BOOL bOnTop ) = 0;
+    virtual void				SetAlwaysOnTop( BOOL bOnTop ) = 0;
 
     // Window to top and grab focus
-    virtual void                ToTop( USHORT nFlags ) = 0;
+    virtual void				ToTop( USHORT nFlags ) = 0;
 
     // this function can call with the same
     // pointer style
-    virtual void                SetPointer( PointerStyle ePointerStyle ) = 0;
-    virtual void                CaptureMouse( BOOL bMouse ) = 0;
-    virtual void                SetPointerPos( long nX, long nY ) = 0;
+    virtual void				SetPointer( PointerStyle ePointerStyle ) = 0;
+    virtual void				CaptureMouse( BOOL bMouse ) = 0;
+    virtual void				SetPointerPos( long nX, long nY ) = 0;
 
     // flush output buffer
-    virtual void                Flush( void) = 0;
+    virtual void				Flush( void) = 0;
     virtual void                Flush( const Rectangle& );
     // flush output buffer, wait till outstanding operations are done
-    virtual void                Sync() = 0;
+    virtual void				Sync() = 0;
 
-    virtual void                SetInputContext( SalInputContext* pContext ) = 0;
-    virtual void                EndExtTextInput( USHORT nFlags ) = 0;
+    virtual void				SetInputContext( SalInputContext* pContext ) = 0;
+    virtual void				EndExtTextInput( USHORT nFlags ) = 0;
 
-    virtual String              GetKeyName( USHORT nKeyCode ) = 0;
-    virtual String              GetSymbolKeyName( const XubString& rFontName, USHORT nKeyCode ) = 0;
+    virtual String				GetKeyName( USHORT nKeyCode ) = 0;
+    virtual String				GetSymbolKeyName( const XubString& rFontName, USHORT nKeyCode ) = 0;
 
     // returns in 'rKeyCode' the single keycode that translates to the given unicode when using a keyboard layout of language 'aLangType'
     // returns FALSE if no mapping exists or function not supported
@@ -224,17 +224,17 @@ public:
 
     // returns the input language used for the last key stroke
     // may be LANGUAGE_DONTKNOW if not supported by the OS
-    virtual LanguageType        GetInputLanguage() = 0;
+    virtual LanguageType		GetInputLanguage() = 0;
 
-    virtual SalBitmap*          SnapShot() = 0;
+    virtual SalBitmap*			SnapShot() = 0;
 
-    virtual void                UpdateSettings( AllSettings& rSettings ) = 0;
+    virtual void				UpdateSettings( AllSettings& rSettings ) = 0;
 
-    virtual void                Beep( SoundType eSoundType ) = 0;
+    virtual void				Beep( SoundType eSoundType ) = 0;
 
     // returns system data (most prominent: window handle)
-    virtual const SystemEnvData*    GetSystemData() const = 0;
-
+    virtual const SystemEnvData*	GetSystemData() const = 0;
+    
     // sets a background bitmap on the frame; the implementation
     // must not make assumptions about the lifetime of the passed SalBitmap
     // but should copy its contents to an own buffer
@@ -248,32 +248,32 @@ public:
         Point   maPos;      // in frame coordinates
     };
 
-    virtual SalPointerState     GetPointerState() = 0;
+    virtual SalPointerState		GetPointerState() = 0;
 
     // set new parent window
-    virtual void                SetParent( SalFrame* pNewParent ) = 0;
+    virtual void				SetParent( SalFrame* pNewParent ) = 0;
     // reparent window to act as a plugin; implementation
     // may choose to use a new system window inetrnally
     // return false to indicate failure
-    virtual bool                SetPluginParent( SystemParentData* pNewParent ) = 0;
-
+    virtual bool				SetPluginParent( SystemParentData* pNewParent ) = 0;
+    
     // move the frame to a new screen
     virtual void                SetScreenNumber( unsigned int nScreen ) = 0;
 
     // shaped system windows
     // set clip region to none (-> rectangular windows, normal state)
-    virtual void                    ResetClipRegion() = 0;
+    virtual void					ResetClipRegion() = 0;
     // start setting the clipregion consisting of nRects rectangles
-    virtual void                    BeginSetClipRegion( ULONG nRects ) = 0;
+    virtual void					BeginSetClipRegion( ULONG nRects ) = 0;
     // add a rectangle to the clip region
-    virtual void                    UnionClipRegion( long nX, long nY, long nWidth, long nHeight ) = 0;
+    virtual void					UnionClipRegion( long nX, long nY, long nWidth, long nHeight ) = 0;
     // done setting up the clipregion
-    virtual void                    EndSetClipRegion() = 0;
+    virtual void					EndSetClipRegion() = 0;
 
 
     // Callbacks (indepent part in vcl/source/window/winproc.cxx)
     // for default message handling return 0
-    void                        SetCallback( Window* pWindow, SALFRAMEPROC pProc )
+    void						SetCallback( Window* pWindow, SALFRAMEPROC pProc )
     { m_pWindow = pWindow; m_pProc = pProc; }
 
     // returns the instance set
@@ -282,7 +282,7 @@ public:
     // Call the callback set; this sometimes necessary for implementation classes
     // that should not now more than necessary about the SalFrame implementation
     // (e.g. input methods, printer update handlers).
-    long                        CallCallback( USHORT nEvent, const void* pEvent ) const
+    long						CallCallback( USHORT nEvent, const void* pEvent ) const
     { return m_pProc ? m_pProc( m_pWindow, const_cast<SalFrame*>(this), nEvent, pEvent ) : 0; }
 };
 
diff --git a/vcl/inc/vcl/salgdi.hxx b/vcl/inc/vcl/salgdi.hxx
index f75817071304..991ff093baec 100644
--- a/vcl/inc/vcl/salgdi.hxx
+++ b/vcl/inc/vcl/salgdi.hxx
@@ -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
@@ -99,7 +99,7 @@ typedef std::vector< sal_Int32 > Int32Vector;
 
 class VCL_DLLPUBLIC SalGraphics
 {
-    int                     m_nLayout; // 0: mirroring off, 1: mirror x-axis
+    int						m_nLayout; // 0: mirroring off, 1: mirror x-axis
 
 protected:
     // flags which hold the SetAntialiasing() value from OutputDevice
@@ -114,48 +114,48 @@ public:
     virtual ~SalGraphics();
 
 protected:
-    virtual BOOL        unionClipRegion( long nX, long nY, long nWidth, long nHeight ) = 0;
-    virtual bool        unionClipRegion( const ::basegfx::B2DPolyPolygon& ) = 0;
+    virtual BOOL		unionClipRegion( long nX, long nY, long nWidth, long nHeight ) = 0;
+    virtual bool		unionClipRegion( const ::basegfx::B2DPolyPolygon& ) = 0;
     // draw --> LineColor and FillColor and RasterOp and ClipRegion
-    virtual void        drawPixel( long nX, long nY ) = 0;
-    virtual void        drawPixel( long nX, long nY, SalColor nSalColor ) = 0;
-    virtual void        drawLine( long nX1, long nY1, long nX2, long nY2 ) = 0;
-    virtual void        drawRect( long nX, long nY, long nWidth, long nHeight ) = 0;
-    virtual void        drawPolyLine( ULONG nPoints, const SalPoint* pPtAry ) = 0;
-    virtual void        drawPolygon( ULONG nPoints, const SalPoint* pPtAry ) = 0;
-    virtual void        drawPolyPolygon( sal_uInt32 nPoly, const sal_uInt32* pPoints, PCONSTSALPOINT* pPtAry ) = 0;
+    virtual void		drawPixel( long nX, long nY ) = 0;
+    virtual void		drawPixel( long nX, long nY, SalColor nSalColor ) = 0;
+    virtual void		drawLine( long nX1, long nY1, long nX2, long nY2 ) = 0;
+    virtual void		drawRect( long nX, long nY, long nWidth, long nHeight ) = 0;
+    virtual void		drawPolyLine( ULONG nPoints, const SalPoint* pPtAry ) = 0;
+    virtual void		drawPolygon( ULONG nPoints, const SalPoint* pPtAry ) = 0;
+    virtual void		drawPolyPolygon( sal_uInt32 nPoly, const sal_uInt32* pPoints, PCONSTSALPOINT* pPtAry ) = 0;
     virtual bool        drawPolyPolygon( const ::basegfx::B2DPolyPolygon&, double fTransparency ) = 0;
     virtual bool        drawPolyLine( const ::basegfx::B2DPolygon&, double fTransparency, const ::basegfx::B2DVector& rLineWidths, basegfx::B2DLineJoin ) = 0;
-    virtual sal_Bool    drawPolyLineBezier( ULONG nPoints, const SalPoint* pPtAry, const BYTE* pFlgAry ) = 0;
-    virtual sal_Bool    drawPolygonBezier( ULONG nPoints, const SalPoint* pPtAry, const BYTE* pFlgAry ) = 0;
-    virtual sal_Bool    drawPolyPolygonBezier( sal_uInt32 nPoly, const sal_uInt32* pPoints, const SalPoint* const* pPtAry, const BYTE* const* pFlgAry ) = 0;
+    virtual sal_Bool	drawPolyLineBezier( ULONG nPoints, const SalPoint* pPtAry, const BYTE* pFlgAry ) = 0;
+    virtual sal_Bool	drawPolygonBezier( ULONG nPoints, const SalPoint* pPtAry, const BYTE* pFlgAry ) = 0;
+    virtual sal_Bool	drawPolyPolygonBezier( sal_uInt32 nPoly, const sal_uInt32* pPoints, const SalPoint* const* pPtAry, const BYTE* const* pFlgAry ) = 0;
 
     // CopyArea --> No RasterOp, but ClipRegion
-    virtual void        copyArea( long nDestX, long nDestY, long nSrcX, long nSrcY, long nSrcWidth,
+    virtual void		copyArea( long nDestX, long nDestY, long nSrcX, long nSrcY, long nSrcWidth,
                                   long nSrcHeight, USHORT nFlags ) = 0;
 
     // CopyBits and DrawBitmap --> RasterOp and ClipRegion
     // CopyBits() --> pSrcGraphics == NULL, then CopyBits on same Graphics
-    virtual void        copyBits( const SalTwoRect* pPosAry, SalGraphics* pSrcGraphics ) = 0;
-    virtual void        drawBitmap( const SalTwoRect* pPosAry, const SalBitmap& rSalBitmap ) = 0;
-    virtual void        drawBitmap( const SalTwoRect* pPosAry,
+    virtual void		copyBits( const SalTwoRect* pPosAry, SalGraphics* pSrcGraphics ) = 0;
+    virtual void		drawBitmap( const SalTwoRect* pPosAry, const SalBitmap& rSalBitmap ) = 0;
+    virtual void		drawBitmap( const SalTwoRect* pPosAry,
                                     const SalBitmap& rSalBitmap,
                                     SalColor nTransparentColor ) = 0;
-    virtual void        drawBitmap( const SalTwoRect* pPosAry,
+    virtual void		drawBitmap( const SalTwoRect* pPosAry,
                                     const SalBitmap& rSalBitmap,
                                     const SalBitmap& rMaskBitmap ) = 0;
-    virtual void        drawMask( const SalTwoRect* pPosAry,
+    virtual void		drawMask( const SalTwoRect* pPosAry,
                                   const SalBitmap& rSalBitmap,
                                   SalColor nMaskColor ) = 0;
 
-    virtual SalBitmap*  getBitmap( long nX, long nY, long nWidth, long nHeight ) = 0;
-    virtual SalColor    getPixel( long nX, long nY ) = 0;
+    virtual SalBitmap*	getBitmap( long nX, long nY, long nWidth, long nHeight ) = 0;
+    virtual SalColor	getPixel( long nX, long nY ) = 0;
 
     // invert --> ClipRegion (only Windows or VirDevs)
-    virtual void        invert( long nX, long nY, long nWidth, long nHeight, SalInvert nFlags) = 0;
-    virtual void        invert( ULONG nPoints, const SalPoint* pPtAry, SalInvert nFlags ) = 0;
+    virtual void		invert( long nX, long nY, long nWidth, long nHeight, SalInvert nFlags) = 0;
+    virtual void		invert( ULONG nPoints, const SalPoint* pPtAry, SalInvert nFlags ) = 0;
 
-    virtual BOOL        drawEPS( long nX, long nY, long nWidth, long nHeight, void* pPtr, ULONG nSize ) = 0;
+    virtual BOOL		drawEPS( long nX, long nY, long nWidth, long nHeight, void* pPtr, ULONG nSize ) = 0;
 
     // native widget rendering methods that require mirroring
     virtual BOOL        hitTestNativeControl( ControlType nType, ControlPart nPart, const Rectangle& rControlRegion,
@@ -182,7 +182,7 @@ protected:
         otherwise. In this case, clients should try to emulate alpha
         compositing themselves
      */
-    virtual bool        drawAlphaBitmap( const SalTwoRect&,
+    virtual bool		drawAlphaBitmap( const SalTwoRect&,
                                          const SalBitmap& rSourceBitmap,
                                          const SalBitmap& rAlphaBitmap ) = 0;
     /** Render solid rectangle with given transparency
@@ -191,61 +191,61 @@ protected:
         Transparency value (0-255) to use. 0 blits and opaque, 255 a
         fully transparent rectangle
      */
-    virtual bool        drawAlphaRect( long nX, long nY, long nWidth, long nHeight, sal_uInt8 nTransparency ) = 0;
+    virtual bool		drawAlphaRect( long nX, long nY, long nWidth, long nHeight, sal_uInt8 nTransparency ) = 0;
 
 public:
     // public SalGraphics methods, the interface to the independent vcl part
 
     // get device resolution
-    virtual void            GetResolution( sal_Int32& rDPIX, sal_Int32& rDPIY ) = 0;
+    virtual void			GetResolution( sal_Int32& rDPIX, sal_Int32& rDPIY ) = 0;
     // get the depth of the device
-    virtual USHORT          GetBitCount() = 0;
+    virtual USHORT			GetBitCount() = 0;
     // get the width of the device
-    virtual long            GetGraphicsWidth() const = 0;
+    virtual long			GetGraphicsWidth() const = 0;
 
     // set the clip region to empty
-    virtual void            ResetClipRegion() = 0;
+    virtual void			ResetClipRegion() = 0;
     // begin setting the clip region, add rectangles to the
     // region with the UnionClipRegion call
-    virtual void            BeginSetClipRegion( ULONG nCount ) = 0;
+    virtual void			BeginSetClipRegion( ULONG nCount ) = 0;
     // all rectangles were added and the clip region should be set now
-    virtual void            EndSetClipRegion() = 0;
+    virtual void			EndSetClipRegion() = 0;
 
     // set the line color to transparent (= don't draw lines)
-    virtual void            SetLineColor() = 0;
+    virtual void			SetLineColor() = 0;
     // set the line color to a specific color
-    virtual void            SetLineColor( SalColor nSalColor ) = 0;
+    virtual void			SetLineColor( SalColor nSalColor ) = 0;
     // set the fill color to transparent (= don't fill)
-    virtual void            SetFillColor() = 0;
+    virtual void			SetFillColor() = 0;
     // set the fill color to a specific color, shapes will be
     // filled accordingly
-    virtual void            SetFillColor( SalColor nSalColor ) = 0;
+    virtual void          	SetFillColor( SalColor nSalColor ) = 0;
     // enable/disable XOR drawing
-    virtual void            SetXORMode( bool bSet, bool bInvertOnly ) = 0;
+    virtual void			SetXORMode( bool bSet, bool bInvertOnly ) = 0;
     // set line color for raster operations
-    virtual void            SetROPLineColor( SalROPColor nROPColor ) = 0;
+    virtual void			SetROPLineColor( SalROPColor nROPColor ) = 0;
     // set fill color for raster operations
-    virtual void            SetROPFillColor( SalROPColor nROPColor ) = 0;
+    virtual void			SetROPFillColor( SalROPColor nROPColor ) = 0;
     // set the text color to a specific color
-    virtual void            SetTextColor( SalColor nSalColor ) = 0;
+    virtual void			SetTextColor( SalColor nSalColor ) = 0;
     // set the font
     virtual USHORT         SetFont( ImplFontSelectData*, int nFallbackLevel ) = 0;
     // release the fonts
     void                   ReleaseFonts() { SetFont( NULL, 0 ); }
     // get the current font's metrics
-    virtual void            GetFontMetric( ImplFontMetricData* ) = 0;
+    virtual void			GetFontMetric( ImplFontMetricData* ) = 0;
 
     // get kernign pairs of the current font
     // return only PairCount if (pKernPairs == NULL)
-    virtual ULONG           GetKernPairs( ULONG nMaxPairCount, ImplKernPairData* ) = 0;
+    virtual ULONG			GetKernPairs( ULONG nMaxPairCount, ImplKernPairData* ) = 0;
     // get the repertoire of the current font
     virtual ImplFontCharMap* GetImplFontCharMap() const = 0;
     // graphics must fill supplied font list
-    virtual void            GetDevFontList( ImplDevFontList* ) = 0;
+    virtual void			GetDevFontList( ImplDevFontList* ) = 0;
     // graphics should call ImplAddDevFontSubstitute on supplied
     // OutputDevice for all its device specific preferred font substitutions
-    virtual void            GetDevFontSubstList( OutputDevice* ) = 0;
-    virtual bool            AddTempDevFont( ImplDevFontList*, const String& rFileURL, const String& rFontName ) = 0;
+    virtual void			GetDevFontSubstList( OutputDevice* ) = 0;
+    virtual bool			AddTempDevFont( ImplDevFontList*, const String& rFileURL, const String& rFontName ) = 0;
     // CreateFontSubset: a method to get a subset of glyhps of a font
     // inside a new valid font file
     // returns TRUE if creation of subset was successfull
@@ -258,7 +258,7 @@ public:
     //             rInfo: additional outgoing information
     // implementation note: encoding 0 with glyph id 0 should be added implicitly
     // as "undefined character"
-    virtual BOOL            CreateFontSubset( const rtl::OUString& rToFile,
+    virtual BOOL			CreateFontSubset( const rtl::OUString& rToFile,
                                               const ImplFontData* pFont,
                                               sal_Int32* pGlyphIDs,
                                               sal_uInt8* pEncoding,
@@ -291,8 +291,8 @@ public:
                                           FontSubsetInfo& rInfo,
                                           long* pDataLen ) = 0;
     // frees the font data again
-    virtual void            FreeEmbedFontData( const void* pData, long nDataLen ) = 0;
-
+    virtual void			FreeEmbedFontData( const void* pData, long nDataLen ) = 0;
+    
     // get the same widths as in CreateFontSubset and GetEmbedFontData
     // in case of an embeddable font also fill the mapping
     // between unicode and glyph id
@@ -306,7 +306,7 @@ public:
     virtual BOOL                    GetGlyphOutline( long nIndex, basegfx::B2DPolyPolygon& ) = 0;
 
     virtual SalLayout*              GetTextLayout( ImplLayoutArgs&, int nFallbackLevel ) = 0;
-    virtual void                     DrawServerFontLayout( const ServerFontLayout& ) = 0;
+    virtual void					 DrawServerFontLayout( const ServerFontLayout& ) = 0;
     /** Filter text from DrawText commands in a device specific manner
         <p>
         This function allows a device (or rather the corresponding SalGraphics
@@ -339,16 +339,16 @@ public:
         false: no substitution has taken place, rNewText, rLen, rCutStart, rCutStop remain unchanged
      */
     virtual bool            filterText( const String& rOrigText, String& rNewText, xub_StrLen nIndex, xub_StrLen& rLen, xub_StrLen& rCutStart, xub_StrLen& rCutStop );
-
+    
     virtual bool            supportsOperation( OutDevSupportType ) const = 0;
 
     // mirroring specifica
-    int                     GetLayout() { return m_nLayout; }
-    void                    SetLayout( int aLayout ) { m_nLayout = aLayout;}
+    int						GetLayout() { return m_nLayout; }
+    void					SetLayout( int aLayout ) { m_nLayout = aLayout;}
 
-    void                    mirror( long& nX, const OutputDevice *pOutDev, bool bBack = false ) const;
-    void                    mirror( long& nX, long& nWidth, const OutputDevice *pOutDev, bool bBack = false ) const;
-    BOOL                    mirror( sal_uInt32 nPoints, const SalPoint *pPtAry, SalPoint *pPtAry2, const OutputDevice *pOutDev, bool bBack = false ) const;
+    void					mirror( long& nX, const OutputDevice *pOutDev, bool bBack = false ) const;
+    void					mirror( long& nX, long& nWidth, const OutputDevice *pOutDev, bool bBack = false ) const;
+    BOOL					mirror( sal_uInt32 nPoints, const SalPoint *pPtAry, SalPoint *pPtAry2, const OutputDevice *pOutDev, bool bBack = false ) const;
     void                    mirror( Rectangle& rRect, const OutputDevice*, bool bBack = false ) const;
     void                    mirror( Region& rRgn, const OutputDevice *pOutDev, bool bBack = false ) const;
     void                    mirror( ControlType,const ImplControlValue&,const OutputDevice*,bool bBack = false) const;
@@ -358,8 +358,8 @@ public:
 
     // non virtual methods; these do eventual coordinate mirroring and
     // then delegate to protected virtual methods
-    BOOL                    UnionClipRegion( long nX, long nY, long nWidth, long nHeight, const OutputDevice *pOutDev );
-    BOOL                    UnionClipRegion( const ::basegfx::B2DPolyPolygon&, const OutputDevice* );
+    BOOL					UnionClipRegion( long nX, long nY, long nWidth, long nHeight, const OutputDevice *pOutDev );
+    BOOL					UnionClipRegion( const ::basegfx::B2DPolyPolygon&, const OutputDevice* );
 
     // draw --> LineColor and FillColor and RasterOp and ClipRegion
     void                    DrawPixel( long nX, long nY, const OutputDevice *pOutDev );
@@ -484,7 +484,7 @@ public:
                           const SalBitmap& rAlphaBitmap,
                           const OutputDevice *pOutDev );
 
-    bool DrawAlphaRect( long nX, long nY, long nWidth, long nHeight,
+    bool DrawAlphaRect( long nX, long nY, long nWidth, long nHeight, 
                         sal_uInt8 nTransparency, const OutputDevice *pOutDev );
 
     virtual SystemGraphicsData   GetGraphicsData() const = 0;
diff --git a/vcl/inc/vcl/salgeom.hxx b/vcl/inc/vcl/salgeom.hxx
index 3d59e6199fa7..06f707a7f190 100644
--- a/vcl/inc/vcl/salgeom.hxx
+++ b/vcl/inc/vcl/salgeom.hxx
@@ -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
@@ -39,7 +39,7 @@ typedef struct _SalFrameGeometry {
                         nRightDecoration,
                         nBottomDecoration;
     unsigned int        nScreenNumber;
-
+    
     _SalFrameGeometry() :
     nX( 0 ), nY( 0 ), nWidth( 1 ), nHeight( 1 ),
     nLeftDecoration( 0 ), nTopDecoration( 0 ),
diff --git a/vcl/inc/vcl/salgtype.hxx b/vcl/inc/vcl/salgtype.hxx
index f70a5c532f73..e80747caea40 100644
--- a/vcl/inc/vcl/salgtype.hxx
+++ b/vcl/inc/vcl/salgtype.hxx
@@ -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
@@ -35,11 +35,11 @@
 // ------------
 
 typedef UINT32 SalColor;
-#define MAKE_SALCOLOR( r, g, b )    ((SalColor)(((UINT32)((UINT8)(b))))|(((UINT32)((UINT8)(g)))<<8)|(((UINT32)((UINT8)(r)))<<16))
-#define SALCOLOR_RED( n )           ((UINT8)((n)>>16))
-#define SALCOLOR_GREEN( n )         ((UINT8)(((UINT16)(n)) >> 8))
-#define SALCOLOR_BLUE( n )          ((UINT8)(n))
-#define SALCOLOR_NONE           (~(SalColor)0)
+#define MAKE_SALCOLOR( r, g, b )	((SalColor)(((UINT32)((UINT8)(b))))|(((UINT32)((UINT8)(g)))<<8)|(((UINT32)((UINT8)(r)))<<16))
+#define SALCOLOR_RED( n )			((UINT8)((n)>>16))
+#define SALCOLOR_GREEN( n ) 		((UINT8)(((UINT16)(n)) >> 8))
+#define SALCOLOR_BLUE( n )			((UINT8)(n))
+#define SALCOLOR_NONE			(~(SalColor)0)
 // ------------
 // - SalPoint -
 // ------------
@@ -47,8 +47,8 @@ typedef UINT32 SalColor;
 // must equal to class Point
 struct SalPoint
 {
-    long        mnX;
-    long        mnY;
+    long		mnX;
+    long		mnY;
 };
 
 typedef const SalPoint*   PCONSTSALPOINT;
@@ -59,14 +59,14 @@ typedef const SalPoint*   PCONSTSALPOINT;
 
 struct SalTwoRect
 {
-    long        mnSrcX;
-    long        mnSrcY;
-    long        mnSrcWidth;
-    long        mnSrcHeight;
-    long        mnDestX;
-    long        mnDestY;
-    long        mnDestWidth;
-    long        mnDestHeight;
+    long		mnSrcX;
+    long		mnSrcY;
+    long		mnSrcWidth;
+    long		mnSrcHeight;
+    long		mnDestX;
+    long		mnDestY;
+    long		mnDestWidth;
+    long		mnDestHeight;
 };
 
 // ---------------
@@ -74,17 +74,17 @@ struct SalTwoRect
 // ---------------
 
 typedef USHORT SalROPColor;
-#define SAL_ROP_0                   ((SalROPColor)0)
-#define SAL_ROP_1                   ((SalROPColor)1)
-#define SAL_ROP_INVERT              ((SalROPColor)2)
+#define SAL_ROP_0					((SalROPColor)0)
+#define SAL_ROP_1					((SalROPColor)1)
+#define SAL_ROP_INVERT				((SalROPColor)2)
 
 // -------------
 // - SalInvert -
 // -------------
 
 typedef USHORT SalInvert;
-#define SAL_INVERT_HIGHLIGHT        ((SalInvert)0x0001)
-#define SAL_INVERT_50               ((SalInvert)0x0002)
-#define SAL_INVERT_TRACKFRAME       ((SalInvert)0x0004)
+#define SAL_INVERT_HIGHLIGHT		((SalInvert)0x0001)
+#define SAL_INVERT_50				((SalInvert)0x0002)
+#define SAL_INVERT_TRACKFRAME		((SalInvert)0x0004)
 
 #endif // _SV_SALGTYPE_HXX
diff --git a/vcl/inc/vcl/salimestatus.hxx b/vcl/inc/vcl/salimestatus.hxx
index 779a75c9afaa..e9e78ec2d6a4 100644
--- a/vcl/inc/vcl/salimestatus.hxx
+++ b/vcl/inc/vcl/salimestatus.hxx
@@ -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
diff --git a/vcl/inc/vcl/salinst.hxx b/vcl/inc/vcl/salinst.hxx
index 9b92bf95e3fe..287001a511c7 100644
--- a/vcl/inc/vcl/salinst.hxx
+++ b/vcl/inc/vcl/salinst.hxx
@@ -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
@@ -72,10 +72,10 @@ class VCL_DLLPUBLIC SalInstance
 public:
     typedef bool(*Callback)(void*,void*,int);
 private:
-    void*                       m_pEventInst;
-    void*                       m_pErrorInst;
-    Callback                    m_pEventCallback;
-    Callback                    m_pErrorCallback;
+    void*						m_pEventInst;
+    void*						m_pErrorInst;
+    Callback					m_pEventCallback;
+    Callback					m_pErrorCallback;
 
 public:
     SalInstance() :
@@ -88,57 +88,57 @@ public:
 
     // Frame
     // DisplayName for Unix ???
-    virtual SalFrame*       CreateChildFrame( SystemParentData* pParent, ULONG nStyle ) = 0;
-    virtual SalFrame*       CreateFrame( SalFrame* pParent, ULONG nStyle ) = 0;
-    virtual void                DestroyFrame( SalFrame* pFrame ) = 0;
+    virtual SalFrame*      	CreateChildFrame( SystemParentData* pParent, ULONG nStyle ) = 0;
+    virtual SalFrame*      	CreateFrame( SalFrame* pParent, ULONG nStyle ) = 0;
+    virtual void				DestroyFrame( SalFrame* pFrame ) = 0;
 
     // Object (System Child Window)
-    virtual SalObject*          CreateObject( SalFrame* pParent, SystemWindowData* pWindowData, BOOL bShow = TRUE ) = 0;
-    virtual void                DestroyObject( SalObject* pObject ) = 0;
+    virtual SalObject*			CreateObject( SalFrame* pParent, SystemWindowData* pWindowData, BOOL bShow = TRUE ) = 0;
+    virtual void				DestroyObject( SalObject* pObject ) = 0;
 
     // VirtualDevice
     // nDX and nDY in Pixel
     // nBitCount: 0 == Default(=as window) / 1 == Mono
     // pData allows for using a system dependent graphics or device context
-    virtual SalVirtualDevice*   CreateVirtualDevice( SalGraphics* pGraphics,
+    virtual SalVirtualDevice*	CreateVirtualDevice( SalGraphics* pGraphics,
                                                      long nDX, long nDY,
                                                      USHORT nBitCount, const SystemGraphicsData *pData = NULL ) = 0;
-    virtual void                DestroyVirtualDevice( SalVirtualDevice* pDevice ) = 0;
+    virtual void				DestroyVirtualDevice( SalVirtualDevice* pDevice ) = 0;
 
     // Printer
     // pSetupData->mpDriverData can be 0
     // pSetupData must be updatet with the current
     // JobSetup
-    virtual SalInfoPrinter* CreateInfoPrinter( SalPrinterQueueInfo* pQueueInfo,
+    virtual SalInfoPrinter*	CreateInfoPrinter( SalPrinterQueueInfo* pQueueInfo,
                                                ImplJobSetup* pSetupData ) = 0;
-    virtual void                DestroyInfoPrinter( SalInfoPrinter* pPrinter ) = 0;
-    virtual SalPrinter*     CreatePrinter( SalInfoPrinter* pInfoPrinter ) = 0;
-    virtual void                DestroyPrinter( SalPrinter* pPrinter ) = 0;
+    virtual void				DestroyInfoPrinter( SalInfoPrinter* pPrinter ) = 0;
+    virtual SalPrinter*		CreatePrinter( SalInfoPrinter* pInfoPrinter ) = 0;
+    virtual void				DestroyPrinter( SalPrinter* pPrinter ) = 0;
 
-    virtual void                GetPrinterQueueInfo( ImplPrnQueueList* pList ) = 0;
-    virtual void                GetPrinterQueueState( SalPrinterQueueInfo* pInfo ) = 0;
-    virtual void                DeletePrinterQueueInfo( SalPrinterQueueInfo* pInfo ) = 0;
+    virtual void				GetPrinterQueueInfo( ImplPrnQueueList* pList ) = 0;
+    virtual void				GetPrinterQueueState( SalPrinterQueueInfo* pInfo ) = 0;
+    virtual void				DeletePrinterQueueInfo( SalPrinterQueueInfo* pInfo ) = 0;
     virtual String             GetDefaultPrinter() = 0;
 
     // SalTimer
-    virtual SalTimer*           CreateSalTimer() = 0;
+    virtual SalTimer*			CreateSalTimer() = 0;
     // SalI18NImeStatus
-    virtual SalI18NImeStatus*   CreateI18NImeStatus() = 0;
+    virtual SalI18NImeStatus*	CreateI18NImeStatus() = 0;
     // SalSystem
-    virtual SalSystem*          CreateSalSystem() = 0;
+    virtual SalSystem*			CreateSalSystem() = 0;
     // SalBitmap
-    virtual SalBitmap*          CreateSalBitmap() = 0;
+    virtual SalBitmap*			CreateSalBitmap() = 0;
 
     // YieldMutex
-    virtual vos::IMutex*        GetYieldMutex() = 0;
-    virtual ULONG               ReleaseYieldMutex() = 0;
-    virtual void                AcquireYieldMutex( ULONG nCount ) = 0;
+    virtual vos::IMutex*		GetYieldMutex() = 0;
+    virtual ULONG				ReleaseYieldMutex() = 0;
+    virtual void				AcquireYieldMutex( ULONG nCount ) = 0;
 
     // wait next event and dispatch
     // must returned by UserEvent (SalFrame::PostEvent)
     // and timer
-    virtual void                Yield( bool bWait, bool bHandleAllCurrentEvents ) = 0;
-    virtual bool                AnyInput( USHORT nType ) = 0;
+    virtual void				Yield( bool bWait, bool bHandleAllCurrentEvents ) = 0;
+    virtual bool				AnyInput( USHORT nType ) = 0;
 
                             // Menues
     virtual SalMenu*        CreateMenu( BOOL bMenuBar ) = 0;
@@ -147,7 +147,7 @@ public:
     virtual void            DestroyMenuItem( SalMenuItem* pItem ) = 0;
 
     // may return NULL to disable session management
-    virtual SalSession*     CreateSalSession() = 0;
+    virtual SalSession*		CreateSalSession() = 0;
 
     // methods for XDisplayConnection
 
@@ -155,27 +155,27 @@ public:
     //    void* pInst:          pInstance form the SetCallback call
     //    void* pEvent:         address of the system specific event structure
     //    int   nBytes:         length of the system specific event structure
-    void                SetEventCallback( void* pInstance, Callback pCallback )
+    void				SetEventCallback( void* pInstance, Callback pCallback )
     { m_pEventInst = pInstance; m_pEventCallback = pCallback; }
-    Callback GetEventCallback() const
+    Callback GetEventCallback() const 
     { return m_pEventCallback; }
-    bool                CallEventCallback( void* pEvent, int nBytes )
+    bool				CallEventCallback( void* pEvent, int nBytes )
     { return m_pEventCallback ? m_pEventCallback( m_pEventInst, pEvent, nBytes ) : false; }
-    void                SetErrorEventCallback( void* pInstance, Callback pCallback )
+    void				SetErrorEventCallback( void* pInstance, Callback pCallback )
     { m_pErrorInst = pInstance; m_pErrorCallback = pCallback; }
-    Callback            GetErrorEventCallback() const
+    Callback			GetErrorEventCallback() const
     { return m_pErrorCallback; }
-    bool                CallErrorCallback( void* pEvent, int nBytes )
+    bool				CallErrorCallback( void* pEvent, int nBytes )
     { return m_pErrorCallback ? m_pErrorCallback( m_pErrorInst, pEvent, nBytes ) : false; }
 
     enum ConnectionIdentifierType { AsciiCString, Blob };
-    virtual void*               GetConnectionIdentifier( ConnectionIdentifierType& rReturnedType, int& rReturnedBytes ) = 0;
-
+    virtual void*				GetConnectionIdentifier( ConnectionIdentifierType& rReturnedType, int& rReturnedBytes ) = 0;
+    
     // this is a vehicle for PrintFontManager to bridge the gap between vcl and libvclplug_*
     // this is only necessary because PrintFontManager is an exported vcl API and therefore
     // needs to be in libvcl while libvclplug_* do not contain exported C++ API
     virtual void        FillFontPathList( std::list< rtl::OString >& o_rFontPaths );
-
+    
     // dtrans implementation
     virtual com::sun::star::uno::Reference< com::sun::star::uno::XInterface >
         CreateClipboard( const com::sun::star::uno::Sequence< com::sun::star::uno::Any >& i_rArguments );
diff --git a/vcl/inc/vcl/sallayout.hxx b/vcl/inc/vcl/sallayout.hxx
index e23090c42392..3846269ac4bd 100755
--- a/vcl/inc/vcl/sallayout.hxx
+++ b/vcl/inc/vcl/sallayout.hxx
@@ -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
@@ -196,7 +196,7 @@ public:
 
     int             GetUnitsPerPixel() const                { return mnUnitsPerPixel; }
     int             GetOrientation() const                  { return mnOrientation; }
-
+    
     virtual const ImplFontData* GetFallbackFontData( sal_GlyphId ) const;
 
     // methods using string indexing
@@ -329,9 +329,9 @@ public:
 
     enum{ FALLBACK_MASK=0xFF, IS_IN_CLUSTER=0x100, IS_RTL_GLYPH=0x200, IS_DIACRITIC=0x400 };
 
-    bool    IsClusterStart() const  { return ((mnFlags & IS_IN_CLUSTER) == 0); }
-    bool    IsRTLGlyph() const      { return ((mnFlags & IS_RTL_GLYPH) != 0); }
-    bool    IsDiacritic() const     { return ((mnFlags & IS_DIACRITIC) != 0); }
+    bool    IsClusterStart() const	{ return ((mnFlags & IS_IN_CLUSTER) == 0); }
+    bool    IsRTLGlyph() const		{ return ((mnFlags & IS_RTL_GLYPH) != 0); }
+    bool    IsDiacritic() const		{ return ((mnFlags & IS_DIACRITIC) != 0); }
 };
 
 // ---------------
diff --git a/vcl/inc/vcl/salmenu.hxx b/vcl/inc/vcl/salmenu.hxx
index cc0438c4e177..12afda91518f 100644
--- a/vcl/inc/vcl/salmenu.hxx
+++ b/vcl/inc/vcl/salmenu.hxx
@@ -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
@@ -40,12 +40,12 @@ class SalFrame;
 
 struct SalItemParams
 {
-    USHORT          nId;                    // item Id
-    MenuItemType    eType;                  // MenuItem-Type
-    MenuItemBits    nBits;                  // MenuItem-Bits
-    Menu*           pMenu;                  // Pointer to Menu
-    XubString       aText;                  // Menu-Text
-    Image           aImage;                 // Image
+    USHORT          nId;					// item Id
+    MenuItemType    eType;					// MenuItem-Type
+    MenuItemBits    nBits;					// MenuItem-Bits
+    Menu*           pMenu;				    // Pointer to Menu
+    XubString       aText;					// Menu-Text
+    Image           aImage;					// Image
 };
 
 
@@ -54,7 +54,7 @@ struct SalMenuButtonItem
     USHORT              mnId;
     Image               maImage;
     rtl::OUString       maToolTipText;
-
+    
     SalMenuButtonItem() : mnId( 0 ) {}
     SalMenuButtonItem( USHORT i_nId, const Image& rImg, const rtl::OUString& i_rTTText = rtl::OUString() )
     : mnId( i_nId ), maImage( rImg ), maToolTipText( i_rTTText ) {}
@@ -89,7 +89,7 @@ public:
     virtual bool ShowNativePopupMenu(FloatingWindow * pWin, const Rectangle& rRect, ULONG nFlags);
     virtual bool AddMenuBarButton( const SalMenuButtonItem& ); // return false if not implemented or failure
     virtual void RemoveMenuBarButton( USHORT nId );
-
+    
     // return an empty rectangle if not implemented
     // return Rectangle( Point( -1, -1 ), Size( 1, 1 ) ) if menu bar buttons implemented
     // but rectangle cannot be determined
diff --git a/vcl/inc/vcl/salnativewidgets.hxx b/vcl/inc/vcl/salnativewidgets.hxx
index 19c34cbc5e34..501ad7f9dd93 100644
--- a/vcl/inc/vcl/salnativewidgets.hxx
+++ b/vcl/inc/vcl/salnativewidgets.hxx
@@ -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
@@ -39,32 +39,32 @@
  *   control if it were composite).
  */
 
-typedef sal_uInt32      ControlType;
+typedef sal_uInt32		ControlType;
 
 // for use in general purpose ImplControlValue
 #define CTRL_GENERIC            0
 
 // Normal PushButton/Command Button
-#define CTRL_PUSHBUTTON         1
+#define CTRL_PUSHBUTTON			1
 
 // Normal single radio button
-#define CTRL_RADIOBUTTON            2
+#define CTRL_RADIOBUTTON			2
 
 // Normal single checkbox
-#define CTRL_CHECKBOX           10
+#define CTRL_CHECKBOX			10
 
 // Combobox, i.e. a ListBox
 // that allows data entry by user
-#define CTRL_COMBOBOX           20
+#define CTRL_COMBOBOX			20
 
 // Control that allows text entry
-#define CTRL_EDITBOX            30
+#define CTRL_EDITBOX			30
 
 // Control that allows text entry, but without the usual border
 // Has to be handled separately, because this one cannot handle
 // HAS_BACKGROUND_TEXTURE, which is drawn in the edit box'es
 // border window.
-#define CTRL_EDITBOX_NOBORDER   31
+#define CTRL_EDITBOX_NOBORDER	31
 
 // Control that allows text entry
 // ( some systems distingish between single and multi line edit boxes )
@@ -72,61 +72,61 @@ typedef sal_uInt32      ControlType;
 
 // Control that pops up a menu,
 // but does NOT allow data entry
-#define CTRL_LISTBOX            35
+#define CTRL_LISTBOX			35
 
-// An edit field together with two little
+// An edit field together with two little 
 // buttons on the side (aka spin field)
-#define CTRL_SPINBOX            40
+#define CTRL_SPINBOX			40
 
 // Two standalone spin buttons
 // without an edit field
-#define CTRL_SPINBUTTONS        45
+#define CTRL_SPINBUTTONS		45
 
 // A single tab
-#define CTRL_TAB_ITEM           50
+#define CTRL_TAB_ITEM			50
 
 // The border around a tab area,
 // but without the tabs themselves.
 // May have a gap at the top for
 // the active tab
-#define CTRL_TAB_PANE           55
+#define CTRL_TAB_PANE			55
 
 // Background of a Tab Pane
-#define CTRL_TAB_BODY           56
+#define CTRL_TAB_BODY			56
 
 // Normal scrollbar, including
 // all parts like slider, buttons
-#define CTRL_SCROLLBAR          60
+#define CTRL_SCROLLBAR			60
 
 #define CTRL_SLIDER             65
 
 // Border around a group of related
 // items, perhaps also displaying
 // a label of identification
-#define CTRL_GROUPBOX           70
+#define CTRL_GROUPBOX			70
 
 // A separator line
-#define CTRL_FIXEDLINE          80
+#define CTRL_FIXEDLINE			80
 
 // A rectangular border, like a
 // Tab Pane, but without the
 // possible gap for a tab
-#define CTRL_FIXEDBORDER        90
+#define CTRL_FIXEDBORDER		90
 
 // A toolbar control with buttons and a grip
-#define CTRL_TOOLBAR            100
+#define CTRL_TOOLBAR		    100
 
 // The menubar
-#define CTRL_MENUBAR            120
+#define CTRL_MENUBAR		    120
 // popup menu
 #define CTRL_MENU_POPUP         121
 
 // The statusbar
-#define CTRL_STATUSBAR          130
+#define CTRL_STATUSBAR		    130
 #define CTRL_PROGRESS           131
 // Progress bar for the intro window
 // (aka splash screen), in case some
-// wants native progress bar in the
+// wants native progress bar in the 
 // application but not for the splash
 // screen (used in desktop/)
 #define CTRL_INTROPROGRESS      132
@@ -154,24 +154,24 @@ typedef sal_uInt32      ControlType;
  *   for example the slider of a scroll bar.
  */
 
-typedef sal_uInt32      ControlPart;
+typedef sal_uInt32		ControlPart;
 
-#define PART_ENTIRE_CONTROL     1
+#define PART_ENTIRE_CONTROL		1
 #define PART_WINDOW             5       // the static listbox window containing the list
-#define PART_BUTTON             100
-#define PART_BUTTON_UP          101
-#define PART_BUTTON_DOWN            102 // Also for ComboBoxes/ListBoxes
-#define PART_BUTTON_LEFT            103
-#define PART_BUTTON_RIGHT       104
-#define PART_ALL_BUTTONS            105
-#define PART_TRACK_HORZ_LEFT        200
-#define PART_TRACK_VERT_UPPER       201
-#define PART_TRACK_HORZ_RIGHT       202
-#define PART_TRACK_VERT_LOWER       203
-#define PART_TRACK_HORZ_AREA        204
-#define PART_TRACK_VERT_AREA        205
-#define PART_THUMB_HORZ         210 // Also used as toolbar grip
-#define PART_THUMB_VERT         211 // Also used as toolbar grip
+#define PART_BUTTON				100
+#define PART_BUTTON_UP			101
+#define PART_BUTTON_DOWN			102	// Also for ComboBoxes/ListBoxes
+#define PART_BUTTON_LEFT			103
+#define PART_BUTTON_RIGHT		104
+#define PART_ALL_BUTTONS    		105
+#define PART_TRACK_HORZ_LEFT		200
+#define PART_TRACK_VERT_UPPER		201
+#define PART_TRACK_HORZ_RIGHT		202
+#define PART_TRACK_VERT_LOWER		203
+#define PART_TRACK_HORZ_AREA		204
+#define PART_TRACK_VERT_AREA		205
+#define PART_THUMB_HORZ			210 // Also used as toolbar grip
+#define PART_THUMB_VERT			211 // Also used as toolbar grip
 #define PART_MENU_ITEM              250
 #define PART_MENU_ITEM_CHECK_MARK   251
 #define PART_MENU_ITEM_RADIO_MARK   252
@@ -183,10 +183,10 @@ typedef sal_uInt32      ControlPart;
     However aqua draws a little outside. The canonical way would be to enhance the
     HitTestNativeControl passing a ScrollbarValue additionally so all necessary
     information is available in the call.
-    .
+    .    
     However since there is only this one small exception we will deviate a little and
     instead pass the respective rect as control region to allow for a small correction.
-
+    
     So all places using HitTestNativeControl on PART_THUMB_HORZ, PART_THUMB_VERT,
     PART_TRACK_HORZ_LEFT, PART_TRACK_HORZ_RIGHT, PART_TRACK_VERT_UPPER, PART_TRACK_VERT_LOWER
     do not use the control rectangle as region but the actuall part rectangle, making
@@ -207,12 +207,12 @@ typedef sal_uInt32      ControlPart;
 // in to draw this part is expected to be the entire
 // area of the control.
 // A control may respond to one or both.
-#define PART_DRAW_BACKGROUND_HORZ       1000
-#define PART_DRAW_BACKGROUND_VERT       1001
+#define PART_DRAW_BACKGROUND_HORZ		1000
+#define PART_DRAW_BACKGROUND_VERT		1001
 
-// GTK+ also draws tabs right->left since there is a
+// GTK+ also draws tabs right->left since there is a 
 // hardcoded 2 pixel overlap between adjacent tabs
-#define PART_TABS_DRAW_RTL          3000
+#define PART_TABS_DRAW_RTL			3000
 
 // For themes that do not want to have the focus
 // rectangle part drawn by VCL but take care of the
@@ -239,16 +239,16 @@ typedef sal_uInt32      ControlPart;
  *   in the ControlState.
  */
 
-typedef sal_uInt32      ControlState;
+typedef sal_uInt32		ControlState;
 
-#define CTRL_STATE_ENABLED      0x0001
-#define CTRL_STATE_FOCUSED      0x0002
-#define CTRL_STATE_PRESSED      0x0004
-#define CTRL_STATE_ROLLOVER     0x0008
-#define CTRL_STATE_HIDDEN       0x0010
-#define CTRL_STATE_DEFAULT      0x0020
-#define CTRL_STATE_SELECTED     0x0040
-#define CTRL_CACHING_ALLOWED    0x8000  // set when the control is completely visible (i.e. not clipped)
+#define CTRL_STATE_ENABLED		0x0001
+#define CTRL_STATE_FOCUSED		0x0002
+#define CTRL_STATE_PRESSED		0x0004
+#define CTRL_STATE_ROLLOVER		0x0008
+#define CTRL_STATE_HIDDEN		0x0010
+#define CTRL_STATE_DEFAULT		0x0020
+#define CTRL_STATE_SELECTED		0x0040
+#define CTRL_CACHING_ALLOWED	0x8000  // set when the control is completely visible (i.e. not clipped)
 
 /* ButtonValue:
  *
@@ -275,7 +275,7 @@ class VCL_DLLPUBLIC ImplControlValue
     private:
         ControlType     mType;
         ButtonValue     mTristate;    // Tristate value: on, off, mixed
-        long            mNumber;      // numeric value
+        long			mNumber;      // numeric value
     protected:
         ImplControlValue( ControlType i_eType, ButtonValue i_eTriState, long i_nNumber )
         : mType( i_eType )
@@ -292,35 +292,35 @@ class VCL_DLLPUBLIC ImplControlValue
             : mType( CTRL_GENERIC ), mTristate(BUTTONVALUE_DONTKNOW), mNumber(0) {}
 
         virtual ~ImplControlValue();
-
+        
         ControlType getType() const { return mType; }
 
-        inline ButtonValue      getTristateVal( void ) const { return mTristate; }
-        inline void         setTristateVal( ButtonValue nTristate ) { mTristate = nTristate; }
+        inline ButtonValue		getTristateVal( void ) const { return mTristate; }
+        inline void			setTristateVal( ButtonValue nTristate ) { mTristate = nTristate; }
 
-        inline long         getNumericVal( void ) const { return mNumber; }
-        inline void         setNumericVal( long nNumeric ) { mNumber = nNumeric; }
+        inline long			getNumericVal( void ) const { return mNumber; }
+        inline void			setNumericVal( long nNumeric ) { mNumber = nNumeric; }
 };
 
 /* ScrollbarValue:
  *
  *   Value container for scrollbars.
  */
- class VCL_DLLPUBLIC ScrollbarValue : public ImplControlValue
+ class VCL_DLLPUBLIC ScrollbarValue : public ImplControlValue 
 {
     public:
-        long            mnMin;
-        long            mnMax;
-        long            mnCur;
-        long            mnVisibleSize;
-        Rectangle       maThumbRect;
-        Rectangle       maButton1Rect;
-        Rectangle       maButton2Rect;
-        ControlState    mnButton1State;
-        ControlState    mnButton2State;
-        ControlState    mnThumbState;
-        ControlState    mnPage1State;
-        ControlState    mnPage2State;
+        long			mnMin;
+        long			mnMax;
+        long			mnCur;
+        long			mnVisibleSize;
+        Rectangle		maThumbRect;
+        Rectangle		maButton1Rect;
+        Rectangle		maButton2Rect;
+        ControlState	mnButton1State;
+        ControlState	mnButton2State;
+        ControlState	mnThumbState;
+        ControlState	mnPage1State;
+        ControlState	mnPage2State;
 
         inline ScrollbarValue()
         : ImplControlValue( CTRL_SCROLLBAR, BUTTONVALUE_DONTKNOW, 0 )
@@ -335,12 +335,12 @@ class VCL_DLLPUBLIC ImplControlValue
 class VCL_DLLPUBLIC SliderValue : public ImplControlValue
 {
     public:
-        long            mnMin;
-        long            mnMax;
-        long            mnCur;
+        long			mnMin;
+        long			mnMax;
+        long			mnCur;
         Rectangle       maThumbRect;
         ControlState    mnThumbState;
-
+        
         SliderValue()
         : ImplControlValue( CTRL_SLIDER, BUTTONVALUE_DONTKNOW, 0 )
         , mnMin( 0 ), mnMax( 0 ), mnCur( 0 ), mnThumbState( 0 )
@@ -389,12 +389,12 @@ class VCL_DLLPUBLIC TabitemValue : public ImplControlValue
 class VCL_DLLPUBLIC SpinbuttonValue : public ImplControlValue
 {
     public:
-        Rectangle       maUpperRect;
-        Rectangle       maLowerRect;
-        ControlState    mnUpperState;
-        ControlState    mnLowerState;
-        int         mnUpperPart;
-        int         mnLowerPart;
+        Rectangle		maUpperRect;
+        Rectangle		maLowerRect;
+        ControlState	mnUpperState;
+        ControlState	mnLowerState;
+        int			mnUpperPart;
+        int			mnLowerPart;
 
         inline SpinbuttonValue()
         : ImplControlValue( CTRL_SPINBUTTONS, BUTTONVALUE_DONTKNOW, 0 )
@@ -404,7 +404,7 @@ class VCL_DLLPUBLIC SpinbuttonValue : public ImplControlValue
         virtual ~SpinbuttonValue();
 };
 
-/*  Toolbarvalue:
+/*	Toolbarvalue:
  *
  *  Value container for toolbars detailing the grip position
  */
@@ -414,12 +414,12 @@ public:
     ToolbarValue() : ImplControlValue( CTRL_TOOLBAR, BUTTONVALUE_DONTKNOW, 0 )
     { mbIsTopDockingArea = FALSE; }
     virtual ~ToolbarValue();
-    Rectangle           maGripRect;
+    Rectangle			maGripRect;
     BOOL                mbIsTopDockingArea; // indicates that this is the top aligned dockingarea
                                             // adjacent to the menubar
 };
 
-/*  MenubarValue:
+/*	MenubarValue:
  *
  *  Value container for menubars specifying height of adjacent docking area
  */
@@ -432,7 +432,7 @@ public:
     int             maTopDockingAreaHeight;
 };
 
-/*  PushButtonValue:
+/*	PushButtonValue:
  *
  *  Value container for pushbuttons specifying additional drawing hints
  */
@@ -443,7 +443,7 @@ public:
     : ImplControlValue( CTRL_PUSHBUTTON, BUTTONVALUE_DONTKNOW, 0 )
     , mbBevelButton( false ), mbSingleLine( true ) {}
     virtual ~PushButtonValue();
-
+    
     bool            mbBevelButton:1;
     bool            mbSingleLine:1;
 };
diff --git a/vcl/inc/vcl/salobj.hxx b/vcl/inc/vcl/salobj.hxx
index e453bf5c6f87..b45287b0bafc 100644
--- a/vcl/inc/vcl/salobj.hxx
+++ b/vcl/inc/vcl/salobj.hxx
@@ -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
@@ -39,9 +39,9 @@ struct SystemEnvData;
 // - SalObject-Types -
 // -------------------
 
-#define SAL_OBJECT_CLIP_INCLUDERECTS            ((USHORT)0x0001)
-#define SAL_OBJECT_CLIP_EXCLUDERECTS            ((USHORT)0x0002)
-#define SAL_OBJECT_CLIP_ABSOLUTE                ((USHORT)0x0004)
+#define SAL_OBJECT_CLIP_INCLUDERECTS			((USHORT)0x0001)
+#define SAL_OBJECT_CLIP_EXCLUDERECTS			((USHORT)0x0002)
+#define SAL_OBJECT_CLIP_ABSOLUTE				((USHORT)0x0004)
 
 // -------------
 // - SalObject -
@@ -49,33 +49,33 @@ struct SystemEnvData;
 
 class VCL_DLLPUBLIC SalObject
 {
-    void*               m_pInst;
-    SALOBJECTPROC       m_pCallback;
+    void*				m_pInst;
+    SALOBJECTPROC		m_pCallback;
     BOOL                m_bMouseTransparent:1,
                         m_bEraseBackground:1;
 public:
     SalObject() : m_pInst( NULL ), m_pCallback( NULL ), m_bMouseTransparent( FALSE ), m_bEraseBackground( TRUE ) {}
     virtual ~SalObject();
 
-    virtual void                    ResetClipRegion() = 0;
-    virtual USHORT                  GetClipRegionType() = 0;
-    virtual void                    BeginSetClipRegion( ULONG nRects ) = 0;
-    virtual void                    UnionClipRegion( long nX, long nY, long nWidth, long nHeight ) = 0;
-    virtual void                    EndSetClipRegion() = 0;
+    virtual void					ResetClipRegion() = 0;
+    virtual USHORT					GetClipRegionType() = 0;
+    virtual void					BeginSetClipRegion( ULONG nRects ) = 0;
+    virtual void					UnionClipRegion( long nX, long nY, long nWidth, long nHeight ) = 0;
+    virtual void					EndSetClipRegion() = 0;
 
-    virtual void                    SetPosSize( long nX, long nY, long nWidth, long nHeight ) = 0;
-    virtual void                    Show( BOOL bVisible ) = 0;
-    virtual void                    Enable( BOOL nEnable ) = 0;
-    virtual void                    GrabFocus() = 0;
+    virtual void					SetPosSize( long nX, long nY, long nWidth, long nHeight ) = 0;
+    virtual void					Show( BOOL bVisible ) = 0;
+    virtual void					Enable( BOOL nEnable ) = 0;
+    virtual void					GrabFocus() = 0;
 
-    virtual void                    SetBackground() = 0;
-    virtual void                    SetBackground( SalColor nSalColor ) = 0;
+    virtual void					SetBackground() = 0;
+    virtual void					SetBackground( SalColor nSalColor ) = 0;
 
-    virtual const SystemEnvData*    GetSystemData() const = 0;
+    virtual const SystemEnvData*	GetSystemData() const = 0;
 
-    void                    SetCallback( void* pInst, SALOBJECTPROC pProc )
+    void					SetCallback( void* pInst, SALOBJECTPROC pProc )
     { m_pInst = pInst; m_pCallback = pProc; }
-    long                    CallCallback( USHORT nEvent, const void* pEvent )
+    long					CallCallback( USHORT nEvent, const void* pEvent )
     { return m_pCallback ? m_pCallback( m_pInst, this, nEvent, pEvent ) : 0; }
     void                    SetMouseTransparent( BOOL bMouseTransparent )
     { m_bMouseTransparent = bMouseTransparent; }
diff --git a/vcl/inc/vcl/salprn.hxx b/vcl/inc/vcl/salprn.hxx
index 19f023108349..fd051446b3d2 100644
--- a/vcl/inc/vcl/salprn.hxx
+++ b/vcl/inc/vcl/salprn.hxx
@@ -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
@@ -46,13 +46,13 @@ namespace vcl { class PrinterController; }
 
 struct VCL_DLLPUBLIC SalPrinterQueueInfo
 {
-    XubString               maPrinterName;
-    XubString               maDriver;
-    XubString               maLocation;
-    XubString               maComment;
-    ULONG                   mnStatus;
-    ULONG                   mnJobs;
-    void*                   mpSysData;
+    XubString				maPrinterName;
+    XubString				maDriver;
+    XubString				maLocation;
+    XubString				maComment;
+    ULONG					mnStatus;
+    ULONG					mnJobs;
+    void*					mpSysData;
 
                             SalPrinterQueueInfo();
                             ~SalPrinterQueueInfo();
@@ -65,8 +65,8 @@ struct VCL_DLLPUBLIC SalPrinterQueueInfo
 class VCL_DLLPUBLIC SalInfoPrinter
 {
 public:
-    std::vector< PaperInfo  >           m_aPaperFormats;    // all printer supported formats
-    bool                                m_bPapersInit;      // set to true after InitPaperFormats
+    std::vector< PaperInfo  >			m_aPaperFormats;	// all printer supported formats
+    bool								m_bPapersInit;		// set to true after InitPaperFormats
     bool                                m_bCompatMetrics;
 
     SalInfoPrinter() : m_bPapersInit( false ), m_bCompatMetrics( false ) {}
@@ -74,30 +74,30 @@ public:
 
     // SalGraphics or NULL, but two Graphics for all SalFrames
     // must be returned
-    virtual SalGraphics*            GetGraphics() = 0;
-    virtual void                    ReleaseGraphics( SalGraphics* pGraphics ) = 0;
+    virtual SalGraphics*			GetGraphics() = 0;
+    virtual void					ReleaseGraphics( SalGraphics* pGraphics ) = 0;
 
-    virtual BOOL                    Setup( SalFrame* pFrame, ImplJobSetup* pSetupData ) = 0;
+    virtual BOOL					Setup( SalFrame* pFrame, ImplJobSetup* pSetupData ) = 0;
     // This function set the driver data and
     // set the new indepen data in pSetupData
-    virtual BOOL                    SetPrinterData( ImplJobSetup* pSetupData ) = 0;
+    virtual BOOL					SetPrinterData( ImplJobSetup* pSetupData ) = 0;
     // This function merged the indepen driver data
     // and set the new indepen data in pSetupData
     // Only the data must changed, where the bit
     // in nFlags is set
-    virtual BOOL                    SetData( ULONG nFlags, ImplJobSetup* pSetupData ) = 0;
+    virtual BOOL					SetData( ULONG nFlags, ImplJobSetup* pSetupData ) = 0;
 
-    virtual void                    GetPageInfo( const ImplJobSetup* pSetupData,
+    virtual void					GetPageInfo( const ImplJobSetup* pSetupData,
                                                  long& rOutWidth, long& rOutHeight,
                                                  long& rPageOffX, long& rPageOffY,
                                                  long& rPageWidth, long& rPageHeight ) = 0;
-    virtual ULONG                   GetCapabilities( const ImplJobSetup* pSetupData, USHORT nType ) = 0;
-    virtual ULONG                   GetPaperBinCount( const ImplJobSetup* pSetupData ) = 0;
-    virtual String                  GetPaperBinName( const ImplJobSetup* pSetupData, ULONG nPaperBin ) = 0;
+    virtual ULONG					GetCapabilities( const ImplJobSetup* pSetupData, USHORT nType ) = 0;
+    virtual ULONG					GetPaperBinCount( const ImplJobSetup* pSetupData ) = 0;
+    virtual String					GetPaperBinName( const ImplJobSetup* pSetupData, ULONG nPaperBin ) = 0;
     // fills m_aPaperFormats and sets m_bPapersInit to true
-    virtual void                    InitPaperFormats( const ImplJobSetup* pSetupData ) = 0;
+    virtual void					InitPaperFormats( const ImplJobSetup* pSetupData ) = 0;
     // returns angle that a landscape page will be turned counterclockwise wrt to portrait
-    virtual int                 GetLandscapeAngle( const ImplJobSetup* pSetupData ) = 0;
+    virtual int					GetLandscapeAngle( const ImplJobSetup* pSetupData ) = 0;
 };
 
 // --------------
@@ -106,11 +106,11 @@ public:
 
 class VCL_DLLPUBLIC SalPrinter
 {
-public:                     // public for Sal Implementation
+public: 					// public for Sal Implementation
     SalPrinter() {}
     virtual ~SalPrinter();
 
-    virtual BOOL                    StartJob( const String* pFileName,
+    virtual BOOL					StartJob( const String* pFileName,
                                               const String& rJobName,
                                               const String& rAppName,
                                               ULONG nCopies,
@@ -126,12 +126,12 @@ public:                     // public for Sal Implementation
                                               ImplJobSetup* pSetupData,
                                               vcl::PrinterController& rController );
 
-    virtual BOOL                    EndJob() = 0;
-    virtual BOOL                    AbortJob() = 0;
-    virtual SalGraphics*            StartPage( ImplJobSetup* pSetupData, BOOL bNewJobData ) = 0;
-    virtual BOOL                    EndPage() = 0;
-    virtual ULONG                   GetErrorCode() = 0;
-
+    virtual BOOL					EndJob() = 0;
+    virtual BOOL					AbortJob() = 0;
+    virtual SalGraphics*			StartPage( ImplJobSetup* pSetupData, BOOL bNewJobData ) = 0;
+    virtual BOOL					EndPage() = 0;
+    virtual ULONG					GetErrorCode() = 0;
+    
 };
 
 #endif // _SV_SALPRN_HXX
diff --git a/vcl/inc/vcl/salptype.hxx b/vcl/inc/vcl/salptype.hxx
index 8613ead5301a..450bc0023286 100644
--- a/vcl/inc/vcl/salptype.hxx
+++ b/vcl/inc/vcl/salptype.hxx
@@ -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
@@ -47,8 +47,8 @@
 // - SalPrinterError -
 // -------------------
 
-#define SAL_PRINTER_ERROR_GENERALERROR          1
-#define SAL_PRINTER_ERROR_ABORT                 2
+#define SAL_PRINTER_ERROR_GENERALERROR			1
+#define SAL_PRINTER_ERROR_ABORT 				2
 
 // -------------------
 // - SalPrinterProcs -
diff --git a/vcl/inc/vcl/salsession.hxx b/vcl/inc/vcl/salsession.hxx
index 2da1ae551074..3215ad6afa69 100644
--- a/vcl/inc/vcl/salsession.hxx
+++ b/vcl/inc/vcl/salsession.hxx
@@ -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
@@ -40,18 +40,18 @@ enum SalSessionEventType
 
 struct SalSessionEvent
 {
-    SalSessionEventType         m_eType;
+    SalSessionEventType			m_eType;
 
-    SalSessionEvent( SalSessionEventType eType )
+    SalSessionEvent( SalSessionEventType eType ) 
             : m_eType( eType )
     {}
 };
 
 struct SalSessionInteractionEvent : public SalSessionEvent
 {
-    bool                        m_bInteractionGranted;
+    bool						m_bInteractionGranted;
 
-    SalSessionInteractionEvent( bool bGranted )
+    SalSessionInteractionEvent( bool bGranted ) 
             : SalSessionEvent( Interaction ),
               m_bInteractionGranted( bGranted )
     {}
@@ -59,10 +59,10 @@ struct SalSessionInteractionEvent : public SalSessionEvent
 
 struct SalSessionSaveRequestEvent : public SalSessionEvent
 {
-    bool                        m_bShutdown;
-    bool                        m_bCancelable;
+    bool						m_bShutdown;
+    bool						m_bCancelable;
 
-    SalSessionSaveRequestEvent( bool bShutdown, bool bCancelable )
+    SalSessionSaveRequestEvent( bool bShutdown, bool bCancelable ) 
             : SalSessionEvent( SaveRequest ),
               m_bShutdown( bShutdown ),
               m_bCancelable( bCancelable )
@@ -71,14 +71,14 @@ struct SalSessionSaveRequestEvent : public SalSessionEvent
 
 struct SalSessionShutdownCancelEvent : public SalSessionEvent
 {
-    SalSessionShutdownCancelEvent()
+    SalSessionShutdownCancelEvent() 
             : SalSessionEvent( ShutdownCancel )
     {}
 };
 
 struct SalSessionQuitEvent : public SalSessionEvent
 {
-    SalSessionQuitEvent()
+    SalSessionQuitEvent() 
             : SalSessionEvent( Quit )
     {}
 };
@@ -87,14 +87,14 @@ typedef void(*SessionProc)( SalSessionEvent *pEvent);
 
 class VCL_DLLPUBLIC SalSession
 {
-    SessionProc         m_aProc;
+    SessionProc			m_aProc;
 public:
-    SalSession()
+    SalSession() 
             : m_aProc( 0 )
     {}
     virtual ~SalSession();
-
-    void SetCallback( SessionProc aCallback )
+    
+    void SetCallback( SessionProc aCallback ) 
     {
         m_aProc = aCallback;
     }
@@ -103,7 +103,7 @@ public:
         if( m_aProc )
             m_aProc( pEvent );
     }
-
+    
     // query the session manager for a user interaction slot
     virtual void queryInteraction() = 0;
     // signal the session manager that we're done with user interaction
diff --git a/vcl/inc/vcl/salsys.hxx b/vcl/inc/vcl/salsys.hxx
index 310b0a27e30f..2dfd4d6fea2a 100644
--- a/vcl/inc/vcl/salsys.hxx
+++ b/vcl/inc/vcl/salsys.hxx
@@ -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
@@ -63,16 +63,16 @@ class VCL_DLLPUBLIC SalSystem
 public:
             SalSystem() {}
     virtual ~SalSystem();
-
+    
     // get info about the display
 
     /*  Gets the number of active screens attached to the display
-
+    
         @returns the number of active screens
     */
     virtual unsigned int GetDisplayScreenCount() = 0;
     /*  Queries whether multiple screens are truly separate
-
+    
         @returns true if screens are distinct and windows cannot
                   be moved between them or span multiple of them
                  false if screens form up one big display
@@ -81,57 +81,57 @@ public:
     /*  Queries the default screen number. The default screen is the
         screen on which windows will appear if no special positioning
         is made.
-
+    
         @returns the default screen number
     */
     virtual unsigned int GetDefaultDisplayNumber() = 0;
     /*  Gets relative position and size of the screens attached to the display
-
+    
         @param nScreen
         The screen number to be queried
-
+    
         @returns position: (0,0) in case of IsMultiscreen() == true
                            else position relative to whole display
                  size: size of the screen
     */
     virtual Rectangle GetDisplayScreenPosSizePixel( unsigned int nScreen ) = 0;
     /*  Gets position and size of the work area of a screen attached to the display
-
+    
         @param nScreen
         The screen number to be queried
-
+    
         @returns position and size relative to the scree
     */
     virtual Rectangle GetDisplayWorkAreaPosSizePixel( unsigned int nScreen ) = 0;
     /* Gets the name of a screen
-
+    
        @param nScreen
        The screen number to be queried
-
+    
        @returns the name of the screen
     */
     virtual rtl::OUString GetScreenName( unsigned int nScreen ) = 0;
 
     /*  Shows a native message box with the specified title, message and button
-        combination.
-
+        combination. 
+                
         @param  rTitle
         The title to be shown by the dialog box.
-
+            
         @param  rMessage
         The message to be shown by the dialog box.
-
+            
         @param  nButtonCombination
         Specify which button combination the message box should display.
         See button combinations above.
-
+                        
         @param  nDefaultButton
-        Specifies which button has the focus initially.
-        See button identifiers above.
+        Specifies which button has the focus initially. 
+        See button identifiers above. 
         The effect of specifying a button that doesn't belong
         to the specified button combination is undefined.
-
-        @returns the identifier of the button that was pressed by the user.
+                                             
+        @returns the identifier of the button that was pressed by the user.            
         See button identifier above. If the function fails the
         return value is 0.
     */
diff --git a/vcl/inc/vcl/saltimer.hxx b/vcl/inc/vcl/saltimer.hxx
index d693070138d2..ea0a0f92c5b0 100644
--- a/vcl/inc/vcl/saltimer.hxx
+++ b/vcl/inc/vcl/saltimer.hxx
@@ -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
@@ -44,22 +44,22 @@
 
 class VCL_DLLPUBLIC SalTimer
 {
-    SALTIMERPROC        m_pProc;
+    SALTIMERPROC		m_pProc;
 public:
     SalTimer() : m_pProc( NULL ) {}
     virtual ~SalTimer();
 
     // AutoRepeat and Restart
-    virtual void            Start( ULONG nMS ) = 0;
-    virtual void            Stop() = 0;
+    virtual void 			Start( ULONG nMS ) = 0;
+    virtual void 			Stop() = 0;
 
     // Callbacks (indepen in \sv\source\app\timer.cxx)
-    void            SetCallback( SALTIMERPROC pProc )
+    void 			SetCallback( SALTIMERPROC pProc )
     {
-        m_pProc = pProc;
+        m_pProc = pProc; 
     }
 
-    void            CallCallback()
+    void			CallCallback()
     {
         if( m_pProc )
             m_pProc();
diff --git a/vcl/inc/vcl/salvd.hxx b/vcl/inc/vcl/salvd.hxx
index fcbe1fb35383..13ef4c30a47a 100644
--- a/vcl/inc/vcl/salvd.hxx
+++ b/vcl/inc/vcl/salvd.hxx
@@ -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
@@ -45,14 +45,14 @@ public:                     // public for Sal Implementation
 
     // SalGraphics or NULL, but two Graphics for all SalVirtualDevices
     // must be returned
-    virtual SalGraphics*            GetGraphics() = 0;
-    virtual void                    ReleaseGraphics( SalGraphics* pGraphics ) = 0;
+    virtual SalGraphics*			GetGraphics() = 0;
+    virtual void					ReleaseGraphics( SalGraphics* pGraphics ) = 0;
 
                             // Set new size, without saving the old contents
     virtual BOOL                    SetSize( long nNewDX, long nNewDY ) = 0;
 
     /// Get actual VDev size in pixel
-    virtual void                    GetSize( long& rWidth, long& rHeight ) = 0;
+    virtual void				    GetSize( long& rWidth, long& rHeight ) = 0;
 };
 
 #endif // _SV_SALVD_HXX
diff --git a/vcl/inc/vcl/salwtype.hxx b/vcl/inc/vcl/salwtype.hxx
index 95b3806d648b..6dfb4ba3601d 100644
--- a/vcl/inc/vcl/salwtype.hxx
+++ b/vcl/inc/vcl/salwtype.hxx
@@ -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
@@ -135,7 +135,7 @@ struct SalMenuEvent
 {
     USHORT          mnId;           // Menu item ID
     void*           mpMenu;         // pointer to VCL menu (class Menu)
-
+    
     SalMenuEvent() : mnId( 0 ), mpMenu( NULL ) {}
     SalMenuEvent( USHORT i_nId, void* i_pMenu )
     : mnId( i_nId ), mpMenu( i_pMenu ) {}
@@ -157,7 +157,7 @@ struct SalPaintEvent
     long            mnBoundWidth;       // BoundRect - Width
     long            mnBoundHeight;      // BoundRect - Height
     bool            mbImmediateUpdate;  // set to true to force an immediate update
-
+    
     SalPaintEvent( long x, long y, long w, long h, bool bImmediate = false ) :
         mnBoundX( x ), mnBoundY( y ),
         mnBoundWidth( w ), mnBoundHeight( h ),
@@ -181,7 +181,7 @@ struct SalWheelMouseEvent
     USHORT          mnCode;         // SV-ModifierCode (KEY_SHIFT | KEY_MOD1 | KEY_MOD2 | MOUSE_LEFT | MOUSE_MIDDLE | MOUSE_RIGHT)
     BOOL            mbHorz;         // Horizontal
     BOOL            mbDeltaIsPixel; // delta value is a pixel value (on mac)
-
+    
     SalWheelMouseEvent()
     : mnTime( 0 ), mnX( 0 ), mnY( 0 ), mnDelta( 0 ), mnNotchDelta( 0 ), mnScrollLines( 0 ), mnCode( 0 ), mbHorz( FALSE ), mbDeltaIsPixel( FALSE )
     {}
diff --git a/vcl/inc/vcl/scrbar.hxx b/vcl/inc/vcl/scrbar.hxx
index f993cb7304e4..fb900bd2f7a0 100644
--- a/vcl/inc/vcl/scrbar.hxx
+++ b/vcl/inc/vcl/scrbar.hxx
@@ -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
@@ -78,19 +78,19 @@ private:
 
     SAL_DLLPRIVATE Rectangle*   ImplFindPartRect( const Point& rPt );
     using Window::ImplInit;
-    SAL_DLLPRIVATE void         ImplInit( Window* pParent, WinBits nStyle );
-    SAL_DLLPRIVATE void         ImplInitStyle( WinBits nStyle );
-    SAL_DLLPRIVATE void         ImplLoadRes( const ResId& rResId );
-    SAL_DLLPRIVATE void         ImplUpdateRects( BOOL bUpdate = TRUE );
-    SAL_DLLPRIVATE long         ImplCalcThumbPos( long nPixPos );
-    SAL_DLLPRIVATE long         ImplCalcThumbPosPix( long nPos );
-    SAL_DLLPRIVATE void         ImplCalc( BOOL bUpdate = TRUE );
-    SAL_DLLPRIVATE void         ImplDraw( USHORT nDrawFlags, OutputDevice* pOutDev  );
+    SAL_DLLPRIVATE void			ImplInit( Window* pParent, WinBits nStyle );
+    SAL_DLLPRIVATE void			ImplInitStyle( WinBits nStyle );
+    SAL_DLLPRIVATE void			ImplLoadRes( const ResId& rResId );
+    SAL_DLLPRIVATE void			ImplUpdateRects( BOOL bUpdate = TRUE );
+    SAL_DLLPRIVATE long			ImplCalcThumbPos( long nPixPos );
+    SAL_DLLPRIVATE long			ImplCalcThumbPosPix( long nPos );
+    SAL_DLLPRIVATE void			ImplCalc( BOOL bUpdate = TRUE );
+    SAL_DLLPRIVATE void			ImplDraw( USHORT nDrawFlags, OutputDevice* pOutDev  );
     using Window::ImplScroll;
-    SAL_DLLPRIVATE long         ImplScroll( long nNewPos, BOOL bCallEndScroll );
-    SAL_DLLPRIVATE long         ImplDoAction( BOOL bCallEndScroll );
-    SAL_DLLPRIVATE void         ImplDoMouseAction( const Point& rPos, BOOL bCallAction = TRUE );
-    SAL_DLLPRIVATE void         ImplInvert();
+    SAL_DLLPRIVATE long			ImplScroll( long nNewPos, BOOL bCallEndScroll );
+    SAL_DLLPRIVATE long			ImplDoAction( BOOL bCallEndScroll );
+    SAL_DLLPRIVATE void			ImplDoMouseAction( const Point& rPos, BOOL bCallAction = TRUE );
+    SAL_DLLPRIVATE void			ImplInvert();
     SAL_DLLPRIVATE BOOL         ImplDrawNative( USHORT nDrawFlags );
     SAL_DLLPRIVATE void         ImplDragThumb( const Point& rMousePos );
     DECL_DLLPRIVATE_LINK(       ImplTimerHdl, Timer* );
diff --git a/vcl/inc/vcl/seleng.hxx b/vcl/inc/vcl/seleng.hxx
index 65539c947778..3c31d09c6826 100644
--- a/vcl/inc/vcl/seleng.hxx
+++ b/vcl/inc/vcl/seleng.hxx
@@ -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
@@ -51,7 +51,7 @@ public:
     virtual void    BeginDrag() = 0;
 
     virtual void    CreateAnchor() = 0;  // Anker-Pos := Cursor-Pos
-    virtual void    DestroyAnchor() = 0;
+    virtual void	DestroyAnchor() = 0;
 
     // Cursor neu setzen, dabei die beim Anker beginnende
     // Selektion der neuen Cursor-Position anpassen. TRUE == Ok
@@ -76,7 +76,7 @@ public:
 #define SELENG_HAS_ANCH     0x0020
 #define SELENG_CMDEVT       0x0040
 #define SELENG_WAIT_UPEVT   0x0080
-#define SELENG_EXPANDONMOVE 0x0100
+#define SELENG_EXPANDONMOVE	0x0100
 
 class VCL_DLLPUBLIC SelectionEngine
 {
@@ -95,7 +95,7 @@ private:
     DECL_DLLPRIVATE_LINK( ImpWatchDog, Timer * );
 //#endif
 
-    inline BOOL         ShouldDeselect( BOOL bModifierKey1 ) const;
+    inline BOOL			ShouldDeselect( BOOL bModifierKey1 ) const;
                                 // determines to deselect or not when Ctrl-key is pressed on CursorPosChanging
 public:
 
@@ -160,7 +160,7 @@ public:
     void                SetAnchor( BOOL bAnchor );
 
     // wird im Ctor eingeschaltet
-    void                ExpandSelectionOnMouseMove( BOOL bExpand = TRUE )
+    void				ExpandSelectionOnMouseMove( BOOL bExpand = TRUE )
                         {
                             if( bExpand )
                                 nFlags |= SELENG_EXPANDONMOVE;
@@ -249,5 +249,5 @@ inline void SelectionEngine::SetAnchor( BOOL bAnchor )
         nFlags &= (~SELENG_HAS_ANCH);
 }
 
-#endif  // _SV_SELENG_HXX
+#endif	// _SV_SELENG_HXX
 
diff --git a/vcl/inc/vcl/settings.hxx b/vcl/inc/vcl/settings.hxx
index 24fd30750501..9ce011602cb1 100644
--- a/vcl/inc/vcl/settings.hxx
+++ b/vcl/inc/vcl/settings.hxx
@@ -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
@@ -338,7 +338,7 @@ class ImplStyleData
 private:
     ULONG                           mnRefCount;
 
-    void*                           mpStyleData_NotUsedYet;
+    void*							mpStyleData_NotUsedYet;
 
     Color                           maActiveBorderColor;
     Color                           maActiveColor;
@@ -511,19 +511,19 @@ private:
 #define STYLE_TABCONTROL_SINGLELINE ((USHORT)0x0001)
 #define STYLE_TABCONTROL_COLOR      ((USHORT)0x0002)
 
-#define STYLE_TOOLBAR_ICONSIZE_UNKNOWN      ((ULONG)0)
-#define STYLE_TOOLBAR_ICONSIZE_SMALL        ((ULONG)1)
-#define STYLE_TOOLBAR_ICONSIZE_LARGE        ((ULONG)2)
+#define STYLE_TOOLBAR_ICONSIZE_UNKNOWN		((ULONG)0)
+#define STYLE_TOOLBAR_ICONSIZE_SMALL		((ULONG)1)
+#define STYLE_TOOLBAR_ICONSIZE_LARGE		((ULONG)2)
 
-#define STYLE_SYMBOLS_AUTO          ((ULONG)0)
-#define STYLE_SYMBOLS_DEFAULT       ((ULONG)1)
-#define STYLE_SYMBOLS_HICONTRAST    ((ULONG)2)
-#define STYLE_SYMBOLS_INDUSTRIAL    ((ULONG)3)
-#define STYLE_SYMBOLS_CRYSTAL       ((ULONG)4)
+#define STYLE_SYMBOLS_AUTO			((ULONG)0)
+#define STYLE_SYMBOLS_DEFAULT		((ULONG)1)
+#define STYLE_SYMBOLS_HICONTRAST	((ULONG)2)
+#define STYLE_SYMBOLS_INDUSTRIAL	((ULONG)3)
+#define STYLE_SYMBOLS_CRYSTAL		((ULONG)4)
 #define STYLE_SYMBOLS_TANGO         ((ULONG)5)
 #define STYLE_SYMBOLS_OXYGEN        ((ULONG)6)
-#define STYLE_SYMBOLS_CLASSIC       ((ULONG)7)
-#define STYLE_SYMBOLS_THEMES_MAX    ((ULONG)8)
+#define STYLE_SYMBOLS_CLASSIC		((ULONG)7)
+#define STYLE_SYMBOLS_THEMES_MAX	((ULONG)8)
 
 #define STYLE_CURSOR_NOBLINKTIME    ((ULONG)0xFFFFFFFF)
 
@@ -729,30 +729,30 @@ public:
     const Color&                    GetInactiveTabColor() const
                                         { return mpData->maInactiveTabColor; }
 
-    void                            SetHighContrastMode( BOOL bHighContrast )
+    void							SetHighContrastMode( BOOL bHighContrast )
                                         { CopyData(); mpData->mnHighContrast = bHighContrast; }
-    BOOL                            GetHighContrastMode() const
+    BOOL							GetHighContrastMode() const
                                         { return (BOOL) mpData->mnHighContrast; }
-    BOOL                            IsHighContrastBlackAndWhite() const;
-    void                            SetUseSystemUIFonts( BOOL bUseSystemUIFonts )
+    BOOL							IsHighContrastBlackAndWhite() const;
+    void							SetUseSystemUIFonts( BOOL bUseSystemUIFonts )
                                         { CopyData(); mpData->mnUseSystemUIFonts = bUseSystemUIFonts; }
-    BOOL                            GetUseSystemUIFonts() const
+    BOOL							GetUseSystemUIFonts() const
                                         { return (BOOL) mpData->mnUseSystemUIFonts; }
-    void                            SetUseFlatBorders( BOOL bUseFlatBorders )
+    void							SetUseFlatBorders( BOOL bUseFlatBorders )
                                         { CopyData(); mpData->mnUseFlatBorders = bUseFlatBorders; }
-    BOOL                            GetUseFlatBorders() const
+    BOOL							GetUseFlatBorders() const
                                         { return (BOOL) mpData->mnUseFlatBorders; }
-    void                            SetUseFlatMenues( BOOL bUseFlatMenues )
+    void							SetUseFlatMenues( BOOL bUseFlatMenues )
                                         { CopyData(); mpData->mnUseFlatMenues = bUseFlatMenues; }
-    BOOL                            GetUseFlatMenues() const
+    BOOL							GetUseFlatMenues() const
                                         { return (BOOL) mpData->mnUseFlatMenues; }
-    void                            SetUseImagesInMenus( BOOL bUseImagesInMenus )
+    void							SetUseImagesInMenus( BOOL bUseImagesInMenus )
                                         { CopyData(); mpData->mnUseImagesInMenus = bUseImagesInMenus; }
-    BOOL                            GetUseImagesInMenus() const
+    BOOL							GetUseImagesInMenus() const
                                         { return (BOOL) mpData->mnUseImagesInMenus; }
-    void                            SetSkipDisabledInMenus( BOOL bSkipDisabledInMenus )
+    void							SetSkipDisabledInMenus( BOOL bSkipDisabledInMenus )
                                         { CopyData(); mpData->mnSkipDisabledInMenus = bSkipDisabledInMenus; }
-    BOOL                            GetSkipDisabledInMenus() const
+    BOOL							GetSkipDisabledInMenus() const
                                         { return (BOOL) mpData->mnSkipDisabledInMenus; }
 
     void                            SetCairoFontOptions( const void *pOptions )
@@ -927,9 +927,9 @@ public:
                                         { CopyData(); mpData->mnOptions = nOptions; }
     ULONG                           GetOptions() const
                                         { return mpData->mnOptions; }
-    void                            SetAutoMnemonic( BOOL bAutoMnemonic )
+    void							SetAutoMnemonic( BOOL bAutoMnemonic )
                                         { CopyData(); mpData->mnAutoMnemonic = (USHORT)bAutoMnemonic; }
-    BOOL                            GetAutoMnemonic() const
+    BOOL							GetAutoMnemonic() const
                                         { return mpData->mnAutoMnemonic ? TRUE : FALSE; }
 
     void                            SetFontColor( const Color& rColor )
@@ -937,34 +937,34 @@ public:
     const Color&                    GetFontColor() const
                                         { return mpData->maFontColor; }
 
-    void                            SetToolbarIconSize( ULONG nSize )
+    void							SetToolbarIconSize( ULONG nSize )
                                         { CopyData(); mpData->mnToolbarIconSize = nSize; }
-    ULONG                           GetToolbarIconSize() const
+    ULONG							GetToolbarIconSize() const
                                         { return mpData->mnToolbarIconSize; }
 
-    void                            SetSymbolsStyle( ULONG nStyle )
+    void							SetSymbolsStyle( ULONG nStyle )
                                         { CopyData(); mpData->mnSymbolsStyle = nStyle; }
-    ULONG                           GetSymbolsStyle() const
+    ULONG							GetSymbolsStyle() const
                                         { return mpData->mnSymbolsStyle; }
 
-    void                            SetPreferredSymbolsStyle( ULONG nStyle )
+    void							SetPreferredSymbolsStyle( ULONG nStyle )
                                         { CopyData(); mpData->mnPreferredSymbolsStyle = nStyle; }
-    void                            SetPreferredSymbolsStyleName( const ::rtl::OUString &rName );
-    ULONG                           GetPreferredSymbolsStyle() const
+    void							SetPreferredSymbolsStyleName( const ::rtl::OUString &rName );
+    ULONG							GetPreferredSymbolsStyle() const
                                         { return mpData->mnPreferredSymbolsStyle; }
-    // check whether the symbols style is supported (icons are installed)
-    bool                            CheckSymbolStyle( ULONG nStyle ) const;
+    // check whether the symbols style is supported (icons are installed)									
+    bool							CheckSymbolStyle( ULONG nStyle ) const;
     ULONG                           GetAutoSymbolsStyle() const;
 
-    ULONG                           GetCurrentSymbolsStyle() const;
+    ULONG							GetCurrentSymbolsStyle() const;
 
-    void                            SetSymbolsStyleName( const ::rtl::OUString &rName )
+    void							SetSymbolsStyleName( const ::rtl::OUString &rName )
                                         { return SetSymbolsStyle( ImplNameToSymbolsStyle( rName ) ); }
-    ::rtl::OUString                 GetSymbolsStyleName() const
+    ::rtl::OUString					GetSymbolsStyleName() const
                                         { return ImplSymbolsStyleToName( GetSymbolsStyle() ); }
-    ::rtl::OUString                 GetCurrentSymbolsStyleName() const
+    ::rtl::OUString					GetCurrentSymbolsStyleName() const
                                         { return ImplSymbolsStyleToName( GetCurrentSymbolsStyle() ); }
-
+                                        
     const Wallpaper&                GetWorkspaceGradient() const
                                         { return mpData->maWorkspaceGradient; }
     void                            SetWorkspaceGradient( const Wallpaper& rWall )
@@ -983,8 +983,8 @@ public:
                                         { return !(*this == rSet); }
 
 protected:
-    ::rtl::OUString                 ImplSymbolsStyleToName( ULONG nStyle ) const;
-    ULONG                           ImplNameToSymbolsStyle( const ::rtl::OUString &rName ) const;
+    ::rtl::OUString					ImplSymbolsStyleToName( ULONG nStyle ) const;
+    ULONG							ImplNameToSymbolsStyle( const ::rtl::OUString &rName ) const;
 };
 
 // ----------------
@@ -1021,12 +1021,12 @@ public:
                                     MiscSettings( const MiscSettings& rSet );
                                     ~MiscSettings();
 
-    void                            SetEnableATToolSupport( BOOL bEnable );
-    BOOL                            GetEnableATToolSupport() const;
-    void                            SetDisablePrinting( BOOL bEnable );
-    BOOL                            GetDisablePrinting() const;
-    void                            SetEnableLocalizedDecimalSep( BOOL bEnable );
-    BOOL                            GetEnableLocalizedDecimalSep() const;
+    void							SetEnableATToolSupport( BOOL bEnable );
+    BOOL							GetEnableATToolSupport() const;
+    void							SetDisablePrinting( BOOL bEnable );
+    BOOL							GetDisablePrinting() const;
+    void							SetEnableLocalizedDecimalSep( BOOL bEnable );
+    BOOL							GetEnableLocalizedDecimalSep() const;
     const MiscSettings&             operator =( const MiscSettings& rSet );
 
     BOOL                            operator ==( const MiscSettings& rSet ) const;
@@ -1146,7 +1146,7 @@ public:
 class LocaleConfigurationListener;
 class ImplAllSettingsData
 {
-    friend class    AllSettings;
+    friend class	AllSettings;
 
                     ImplAllSettingsData();
                     ImplAllSettingsData( const ImplAllSettingsData& rData );
@@ -1173,8 +1173,8 @@ private:
     CollatorWrapper*                        mpUICollatorWrapper;
     vcl::I18nHelper*                        mpI18nHelper;
     vcl::I18nHelper*                        mpUII18nHelper;
-    LocaleConfigurationListener*            mpLocaleCfgListener;
-    SvtSysLocale                            maSysLocale;
+    LocaleConfigurationListener*			mpLocaleCfgListener;
+    SvtSysLocale							maSysLocale;
 };
 
 // ---------------
@@ -1198,7 +1198,7 @@ private:
                                      SETTINGS_SOUND | SETTINGS_NOTIFICATION |\
                                      SETTINGS_HELP |\
                                      SETTINGS_LOCALE | SETTINGS_UILOCALE )
-#define SETTINGS_IN_UPDATE_SETTINGS ((ULONG)0x00000800)   // this flag indicates that the data changed event was created
+#define SETTINGS_IN_UPDATE_SETTINGS ((ULONG)0x00000800)	  // this flag indicates that the data changed event was created
                                                           // in Windows::UpdateSettings probably because of a global
                                                           // settings changed
 
@@ -1291,8 +1291,8 @@ public:
     BOOL                                    operator ==( const AllSettings& rSet ) const;
     BOOL                                    operator !=( const AllSettings& rSet ) const
                                                 { return !(*this == rSet); }
-    static void                             LocaleSettingsChanged( sal_uInt32 nHint );
-    SvtSysLocale&                           GetSysLocale() { return mpData->maSysLocale; }
+    static void								LocaleSettingsChanged( sal_uInt32 nHint );
+    SvtSysLocale&							GetSysLocale() { return mpData->maSysLocale; }
 };
 
 #endif // _SV_SETTINGS_HXX
diff --git a/vcl/inc/vcl/slider.hxx b/vcl/inc/vcl/slider.hxx
index 52af7a8bf343..ebe995996d75 100644
--- a/vcl/inc/vcl/slider.hxx
+++ b/vcl/inc/vcl/slider.hxx
@@ -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
@@ -41,92 +41,92 @@
 class VCL_DLLPUBLIC Slider : public Control
 {
 private:
-    Rectangle       maChannel1Rect;
-    Rectangle       maChannel2Rect;
-    Rectangle       maThumbRect;
-    long            mnStartPos;
-    long            mnMouseOff;
-    long            mnThumbPixOffset;
-    long            mnThumbPixRange;
-    long            mnThumbPixPos;
-    long            mnChannelPixOffset;
-    long            mnChannelPixRange;
-    long            mnChannelPixTop;
-    long            mnChannelPixBottom;
-    long            mnMinRange;
-    long            mnMaxRange;
-    long            mnThumbPos;
-    long            mnLineSize;
-    long            mnPageSize;
-    long            mnDelta;
-    USHORT          mnDragDraw;
-    USHORT          mnStateFlags;
-    ScrollType      meScrollType;
-    BOOL            mbCalcSize;
-    BOOL            mbFullDrag;
-    Link            maSlideHdl;
-    Link            maEndSlideHdl;
+    Rectangle		maChannel1Rect;
+    Rectangle		maChannel2Rect;
+    Rectangle		maThumbRect;
+    long			mnStartPos;
+    long			mnMouseOff;
+    long			mnThumbPixOffset;
+    long			mnThumbPixRange;
+    long			mnThumbPixPos;
+    long			mnChannelPixOffset;
+    long			mnChannelPixRange;
+    long			mnChannelPixTop;
+    long			mnChannelPixBottom;
+    long			mnMinRange;
+    long			mnMaxRange;
+    long			mnThumbPos;
+    long			mnLineSize;
+    long			mnPageSize;
+    long			mnDelta;
+    USHORT			mnDragDraw;
+    USHORT			mnStateFlags;
+    ScrollType		meScrollType;
+    BOOL			mbCalcSize;
+    BOOL			mbFullDrag;
+    Link			maSlideHdl;
+    Link			maEndSlideHdl;
 
     using Control::ImplInitSettings;
     using Window::ImplInit;
-    SAL_DLLPRIVATE void ImplInit( Window* pParent, WinBits nStyle );
-    SAL_DLLPRIVATE void ImplLoadRes( const ResId& rResId );
-    SAL_DLLPRIVATE void ImplInitSettings();
-    SAL_DLLPRIVATE void ImplUpdateRects( BOOL bUpdate = TRUE );
-    SAL_DLLPRIVATE long ImplCalcThumbPos( long nPixPos );
-    SAL_DLLPRIVATE long ImplCalcThumbPosPix( long nPos );
-    SAL_DLLPRIVATE void ImplCalc( BOOL bUpdate = TRUE );
-    SAL_DLLPRIVATE void ImplDraw( USHORT nDrawFlags );
-    SAL_DLLPRIVATE BOOL ImplIsPageUp( const Point& rPos );
-    SAL_DLLPRIVATE BOOL ImplIsPageDown( const Point& rPos );
-    SAL_DLLPRIVATE long ImplSlide( long nNewPos, BOOL bCallEndSlide );
-    SAL_DLLPRIVATE long ImplDoAction( BOOL bCallEndSlide );
-    SAL_DLLPRIVATE void ImplDoMouseAction( const Point& rPos, BOOL bCallAction = TRUE );
-    SAL_DLLPRIVATE long ImplDoSlide( long nNewPos );
-    SAL_DLLPRIVATE long ImplDoSlideAction( ScrollType eScrollType );
+    SAL_DLLPRIVATE void	ImplInit( Window* pParent, WinBits nStyle );
+    SAL_DLLPRIVATE void	ImplLoadRes( const ResId& rResId );
+    SAL_DLLPRIVATE void	ImplInitSettings();
+    SAL_DLLPRIVATE void	ImplUpdateRects( BOOL bUpdate = TRUE );
+    SAL_DLLPRIVATE long	ImplCalcThumbPos( long nPixPos );
+    SAL_DLLPRIVATE long	ImplCalcThumbPosPix( long nPos );
+    SAL_DLLPRIVATE void	ImplCalc( BOOL bUpdate = TRUE );
+    SAL_DLLPRIVATE void	ImplDraw( USHORT nDrawFlags );
+    SAL_DLLPRIVATE BOOL	ImplIsPageUp( const Point& rPos );
+    SAL_DLLPRIVATE BOOL	ImplIsPageDown( const Point& rPos );
+    SAL_DLLPRIVATE long	ImplSlide( long nNewPos, BOOL bCallEndSlide );
+    SAL_DLLPRIVATE long	ImplDoAction( BOOL bCallEndSlide );
+    SAL_DLLPRIVATE void	ImplDoMouseAction( const Point& rPos, BOOL bCallAction = TRUE );
+    SAL_DLLPRIVATE long	ImplDoSlide( long nNewPos );
+    SAL_DLLPRIVATE long	ImplDoSlideAction( ScrollType eScrollType );
 
 public:
                     Slider( Window* pParent, WinBits nStyle = WB_HORZ );
                     Slider( Window* pParent, const ResId& rResId );
 
-    virtual void    MouseButtonDown( const MouseEvent& rMEvt );
-    virtual void    MouseButtonUp( const MouseEvent& rMEvt );
-    virtual void    Tracking( const TrackingEvent& rTEvt );
-    virtual void    KeyInput( const KeyEvent& rKEvt );
-    virtual void    Paint( const Rectangle& rRect );
-    virtual void    Resize();
-    virtual void    RequestHelp( const HelpEvent& rHEvt );
-    virtual void    StateChanged( StateChangedType nType );
-    virtual void    DataChanged( const DataChangedEvent& rDCEvt );
+    virtual void	MouseButtonDown( const MouseEvent& rMEvt );
+    virtual void	MouseButtonUp( const MouseEvent& rMEvt );
+    virtual void	Tracking( const TrackingEvent& rTEvt );
+    virtual void	KeyInput( const KeyEvent& rKEvt );
+    virtual void	Paint( const Rectangle& rRect );
+    virtual void	Resize();
+    virtual void	RequestHelp( const HelpEvent& rHEvt );
+    virtual void	StateChanged( StateChangedType nType );
+    virtual void	DataChanged( const DataChangedEvent& rDCEvt );
 
-    virtual void    Slide();
-    virtual void    EndSlide();
+    virtual void	Slide();
+    virtual void	EndSlide();
 
-    void            EnableDrag( BOOL bEnable = TRUE )
+    void			EnableDrag( BOOL bEnable = TRUE )
                         { mbFullDrag = bEnable; }
-    BOOL            IsDragEnabled() const { return mbFullDrag; }
+    BOOL			IsDragEnabled() const { return mbFullDrag; }
 
-    void            SetRangeMin( long nNewRange );
-    long            GetRangeMin() const { return mnMinRange; }
-    void            SetRangeMax( long nNewRange );
-    long            GetRangeMax() const { return mnMaxRange; }
-    void            SetRange( const Range& rRange );
-    Range           GetRange() const { return Range( GetRangeMin(), GetRangeMax() ); }
-    void            SetThumbPos( long nThumbPos );
-    long            GetThumbPos() const { return mnThumbPos; }
-    void            SetLineSize( long nNewSize ) { mnLineSize = nNewSize; }
-    long            GetLineSize() const { return mnLineSize; }
-    void            SetPageSize( long nNewSize ) { mnPageSize = nNewSize; }
-    long            GetPageSize() const { return mnPageSize; }
+    void			SetRangeMin( long nNewRange );
+    long			GetRangeMin() const { return mnMinRange; }
+    void			SetRangeMax( long nNewRange );
+    long			GetRangeMax() const { return mnMaxRange; }
+    void			SetRange( const Range& rRange );
+    Range			GetRange() const { return Range( GetRangeMin(), GetRangeMax() ); }
+    void			SetThumbPos( long nThumbPos );
+    long			GetThumbPos() const { return mnThumbPos; }
+    void			SetLineSize( long nNewSize ) { mnLineSize = nNewSize; }
+    long			GetLineSize() const { return mnLineSize; }
+    void			SetPageSize( long nNewSize ) { mnPageSize = nNewSize; }
+    long			GetPageSize() const { return mnPageSize; }
 
-    long            GetDelta() const { return mnDelta; }
+    long			GetDelta() const { return mnDelta; }
 
-    Size            CalcWindowSizePixel();
+    Size			CalcWindowSizePixel();
 
-    void            SetSlideHdl( const Link& rLink ) { maSlideHdl = rLink; }
-    const Link&     GetSlideHdl() const { return maSlideHdl;    }
-    void            SetEndSlideHdl( const Link& rLink ) { maEndSlideHdl = rLink; }
-    const Link&     GetEndSlideHdl() const { return maEndSlideHdl; }
+    void			SetSlideHdl( const Link& rLink ) { maSlideHdl = rLink; }
+    const Link& 	GetSlideHdl() const { return maSlideHdl;	}
+    void			SetEndSlideHdl( const Link& rLink ) { maEndSlideHdl = rLink; }
+    const Link& 	GetEndSlideHdl() const { return maEndSlideHdl; }
 };
 
 #endif // _SV_SLIDER_HXX
diff --git a/vcl/inc/vcl/smartid.hxx b/vcl/inc/vcl/smartid.hxx
index 2cc5f347b2cb..6bf80347d536 100755
--- a/vcl/inc/vcl/smartid.hxx
+++ b/vcl/inc/vcl/smartid.hxx
@@ -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
diff --git a/vcl/inc/vcl/sndstyle.hxx b/vcl/inc/vcl/sndstyle.hxx
index 6e1401986b36..1f482f8f1807 100644
--- a/vcl/inc/vcl/sndstyle.hxx
+++ b/vcl/inc/vcl/sndstyle.hxx
@@ -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
diff --git a/vcl/inc/vcl/sound.hxx b/vcl/inc/vcl/sound.hxx
index edab9d7d8655..98aee7b6bd78 100644
--- a/vcl/inc/vcl/sound.hxx
+++ b/vcl/inc/vcl/sound.hxx
@@ -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
diff --git a/vcl/inc/vcl/spin.h b/vcl/inc/vcl/spin.h
index b600c18f0f9f..376fe00c651d 100644
--- a/vcl/inc/vcl/spin.h
+++ b/vcl/inc/vcl/spin.h
@@ -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
diff --git a/vcl/inc/vcl/spin.hxx b/vcl/inc/vcl/spin.hxx
index 2ca4709de4c5..a5e55041c514 100644
--- a/vcl/inc/vcl/spin.hxx
+++ b/vcl/inc/vcl/spin.hxx
@@ -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
diff --git a/vcl/inc/vcl/spinfld.hxx b/vcl/inc/vcl/spinfld.hxx
index 7df0b6d95bfc..e80ef3dd3a41 100644
--- a/vcl/inc/vcl/spinfld.hxx
+++ b/vcl/inc/vcl/spinfld.hxx
@@ -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
@@ -40,16 +40,16 @@
 class VCL_DLLPUBLIC SpinField : public Edit
 {
 protected:
-    Edit*           mpEdit;
-    AutoTimer       maRepeatTimer;
-    Rectangle       maUpperRect;
-    Rectangle       maLowerRect;
-    Rectangle       maDropDownRect; // noch nicht angebunden...
-    Link            maUpHdlLink;
-    Link            maDownHdlLink;
-    Link            maFirstHdlLink;
-    Link            maLastHdlLink;
-    BOOL            mbRepeat:1,
+    Edit*			mpEdit;
+    AutoTimer		maRepeatTimer;
+    Rectangle		maUpperRect;
+    Rectangle		maLowerRect;
+    Rectangle		maDropDownRect; // noch nicht angebunden...
+    Link			maUpHdlLink;
+    Link			maDownHdlLink;
+    Link			maFirstHdlLink;
+    Link			maLastHdlLink;
+    BOOL			mbRepeat:1,
                     mbSpin:1,
                     mbInitialUp:1,
                     mbInitialDown:1,
@@ -59,20 +59,20 @@ protected:
                     mbInDropDown:1;
 
     using Window::ImplInit;
-    SAL_DLLPRIVATE void   ImplInit( Window* pParent, WinBits nStyle );
+    SAL_DLLPRIVATE void	  ImplInit( Window* pParent, WinBits nStyle );
 
 private:
     DECL_DLLPRIVATE_LINK( ImplTimeout, Timer* );
-    SAL_DLLPRIVATE void   ImplInitSpinFieldData();
-    SAL_DLLPRIVATE void   ImplCalcButtonAreas( OutputDevice* pDev, const Size& rOutSz, Rectangle& rDDArea, Rectangle& rSpinUpArea, Rectangle& rSpinDownArea );
+    SAL_DLLPRIVATE void	  ImplInitSpinFieldData();
+    SAL_DLLPRIVATE void	  ImplCalcButtonAreas( OutputDevice* pDev, const Size& rOutSz, Rectangle& rDDArea, Rectangle& rSpinUpArea, Rectangle& rSpinDownArea );
 
 protected:
                     SpinField( WindowType nTyp );
 
-    virtual long    Notify( NotifyEvent& rNEvt );
-    virtual void    Command( const CommandEvent& rCEvt );
+    virtual long	Notify( NotifyEvent& rNEvt );
+    virtual void	Command( const CommandEvent& rCEvt );
 
-    void            EndDropDown();
+    void			EndDropDown();
 
     virtual void    FillLayoutData() const;
     Rectangle *     ImplFindPartRect( const Point& rPt );
@@ -81,35 +81,35 @@ public:
                     SpinField( Window* pParent, const ResId& rResId );
                     ~SpinField();
 
-    virtual BOOL    ShowDropDown( BOOL bShow );
-
-    virtual void    Up();
-    virtual void    Down();
-    virtual void    First();
-    virtual void    Last();
-
-    virtual void    MouseButtonDown( const MouseEvent& rMEvt );
-    virtual void    MouseButtonUp( const MouseEvent& rMEvt );
-    virtual void    MouseMove( const MouseEvent& rMEvt );
-    virtual void    Paint( const Rectangle& rRect );
-    virtual void    Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, ULONG nFlags );
-    virtual void    Resize();
-    virtual void    StateChanged( StateChangedType nType );
-    virtual void    DataChanged( const DataChangedEvent& rDCEvt );
+    virtual BOOL	ShowDropDown( BOOL bShow );
+
+    virtual void	Up();
+    virtual void	Down();
+    virtual void	First();
+    virtual void	Last();
+
+    virtual void	MouseButtonDown( const MouseEvent& rMEvt );
+    virtual void	MouseButtonUp( const MouseEvent& rMEvt );
+    virtual void	MouseMove( const MouseEvent& rMEvt );
+    virtual void	Paint( const Rectangle& rRect );
+    virtual void	Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, ULONG nFlags );
+    virtual void	Resize();
+    virtual void	StateChanged( StateChangedType nType );
+    virtual void	DataChanged( const DataChangedEvent& rDCEvt );
     virtual long    PreNotify( NotifyEvent& rNEvt );
 
-    void            SetUpHdl( const Link& rLink ) { maUpHdlLink = rLink; }
-    const Link&     GetUpHdl() const { return maUpHdlLink; }
-    void            SetDownHdl( const Link& rLink ) { maDownHdlLink = rLink; }
-    const Link&     GetDownHdl() const { return maDownHdlLink; }
-    void            SetFirstHdl( const Link& rLink ) { maFirstHdlLink = rLink; }
-    const Link&     GetFirstHdl() const { return maFirstHdlLink; }
-    void            SetLastHdl( const Link& rLink ) { maLastHdlLink = rLink; }
-    const Link&     GetLastHdl() const { return maLastHdlLink; }
+    void			SetUpHdl( const Link& rLink ) { maUpHdlLink = rLink; }
+    const Link& 	GetUpHdl() const { return maUpHdlLink; }
+    void			SetDownHdl( const Link& rLink ) { maDownHdlLink = rLink; }
+    const Link& 	GetDownHdl() const { return maDownHdlLink; }
+    void			SetFirstHdl( const Link& rLink ) { maFirstHdlLink = rLink; }
+    const Link& 	GetFirstHdl() const { return maFirstHdlLink; }
+    void			SetLastHdl( const Link& rLink ) { maLastHdlLink = rLink; }
+    const Link& 	GetLastHdl() const { return maLastHdlLink; }
 
-    virtual Size    CalcMinimumSize() const;
+    virtual Size	CalcMinimumSize() const;
     virtual Size    GetOptimalSize(WindowSizeType eType) const;
-    virtual Size    CalcSize( USHORT nChars ) const;
+    virtual Size	CalcSize( USHORT nChars ) const;
 };
 
 #endif // _SV_SPINFLD_HXX
diff --git a/vcl/inc/vcl/split.hxx b/vcl/inc/vcl/split.hxx
index 890ef5365fbc..7236d028e062 100644
--- a/vcl/inc/vcl/split.hxx
+++ b/vcl/inc/vcl/split.hxx
@@ -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,8 +56,8 @@ private:
     Link                maSplitHdl;
     Link                maEndSplitHdl;
 
-    SAL_DLLPRIVATE void      ImplInitSplitterData();
-    SAL_DLLPRIVATE void      ImplDrawSplitter();
+    SAL_DLLPRIVATE void 	 ImplInitSplitterData();
+    SAL_DLLPRIVATE void 	 ImplDrawSplitter();
     SAL_DLLPRIVATE void      ImplSplitMousePos( Point& rPos );
     SAL_DLLPRIVATE void      ImplStartKbdSplitting();
     SAL_DLLPRIVATE void      ImplKbdTracking( KeyCode aKeyCode );
@@ -71,7 +71,7 @@ private:
 
 protected:
     using Window::ImplInit;
-    SAL_DLLPRIVATE void      ImplInit( Window* pParent, WinBits nWinStyle );
+    SAL_DLLPRIVATE void 	 ImplInit( Window* pParent, WinBits nWinStyle );
 
 public:
                         Splitter( Window* pParent, WinBits nStyle = WB_VSCROLL );
diff --git a/vcl/inc/vcl/splitwin.hxx b/vcl/inc/vcl/splitwin.hxx
index 4aa1ca16785c..f96df4568614 100644
--- a/vcl/inc/vcl/splitwin.hxx
+++ b/vcl/inc/vcl/splitwin.hxx
@@ -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
@@ -45,18 +45,18 @@ typedef USHORT SplitWindowItemBits;
 // - Bits fuer SplitWindow-Items -
 // -------------------------------
 
-#define SWIB_FIXED                  ((SplitWindowItemBits)0x0001)
-#define SWIB_RELATIVESIZE           ((SplitWindowItemBits)0x0002)
-#define SWIB_PERCENTSIZE            ((SplitWindowItemBits)0x0004)
-#define SWIB_COLSET                 ((SplitWindowItemBits)0x0008)
-#define SWIB_INVISIBLE              ((SplitWindowItemBits)0x0010)
+#define SWIB_FIXED					((SplitWindowItemBits)0x0001)
+#define SWIB_RELATIVESIZE			((SplitWindowItemBits)0x0002)
+#define SWIB_PERCENTSIZE			((SplitWindowItemBits)0x0004)
+#define SWIB_COLSET 				((SplitWindowItemBits)0x0008)
+#define SWIB_INVISIBLE				((SplitWindowItemBits)0x0010)
 
 // ---------------------
 // - SplitWindow-Types -
 // ---------------------
 
-#define SPLITWINDOW_APPEND          ((USHORT)0xFFFF)
-#define SPLITWINDOW_ITEM_NOTFOUND   ((USHORT)0xFFFF)
+#define SPLITWINDOW_APPEND			((USHORT)0xFFFF)
+#define SPLITWINDOW_ITEM_NOTFOUND	((USHORT)0xFFFF)
 
 // ---------------
 // - SplitWindow -
@@ -65,27 +65,27 @@ typedef USHORT SplitWindowItemBits;
 class VCL_DLLPUBLIC SplitWindow : public DockingWindow
 {
 private:
-    ImplSplitSet*       mpMainSet;
-    ImplSplitSet*       mpBaseSet;
-    ImplSplitSet*       mpSplitSet;
-    long*               mpLastSizes;
-    Rectangle           maDragRect;
-    long                mnDX;
-    long                mnDY;
-    long                mnLeftBorder;
-    long                mnTopBorder;
-    long                mnRightBorder;
-    long                mnBottomBorder;
-    long                mnMaxSize;
-    long                mnMouseOff;
-    long                mnMStartPos;
-    long                mnMSplitPos;
-    WinBits             mnWinStyle;
-    WindowAlign         meAlign;
-    USHORT              mnSplitTest;
-    USHORT              mnSplitPos;
-    USHORT              mnMouseModifier;
-    BOOL                mbDragFull:1,
+    ImplSplitSet*		mpMainSet;
+    ImplSplitSet*		mpBaseSet;
+    ImplSplitSet*		mpSplitSet;
+    long*				mpLastSizes;
+    Rectangle			maDragRect;
+    long				mnDX;
+    long				mnDY;
+    long				mnLeftBorder;
+    long				mnTopBorder;
+    long				mnRightBorder;
+    long				mnBottomBorder;
+    long				mnMaxSize;
+    long				mnMouseOff;
+    long				mnMStartPos;
+    long				mnMSplitPos;
+    WinBits 			mnWinStyle;
+    WindowAlign 		meAlign;
+    USHORT				mnSplitTest;
+    USHORT				mnSplitPos;
+    USHORT				mnMouseModifier;
+    BOOL				mbDragFull:1,
                         mbHorz:1,
                         mbBottomRight:1,
                         mbCalc:1,
@@ -105,30 +105,30 @@ private:
                         mbFadeOutPressed:1,
                         mbFadeNoButtonMode:1,
                         mbNoAlign:1;
-    Link                maStartSplitHdl;
-    Link                maSplitHdl;
-    Link                maSplitResizeHdl;
-    Link                maAutoHideHdl;
-    Link                maFadeInHdl;
-    Link                maFadeOutHdl;
+    Link				maStartSplitHdl;
+    Link				maSplitHdl;
+    Link				maSplitResizeHdl;
+    Link				maAutoHideHdl;
+    Link				maFadeInHdl;
+    Link				maFadeOutHdl;
 
     using Window::ImplInit;
-    SAL_DLLPRIVATE void ImplInit( Window* pParent, WinBits nStyle );
-    SAL_DLLPRIVATE void ImplInitSettings();
-    SAL_DLLPRIVATE void ImplCalcLayout();
-    SAL_DLLPRIVATE void ImplUpdate();
-    SAL_DLLPRIVATE void ImplUpdateSet( ImplSplitSet* pSet );
-    SAL_DLLPRIVATE void ImplSetWindowSize( long nDelta );
-    SAL_DLLPRIVATE void ImplSplitMousePos( Point& rMousePos );
-    SAL_DLLPRIVATE void ImplGetButtonRect( Rectangle& rRect, long nEx, BOOL bTest ) const;
-    SAL_DLLPRIVATE void ImplGetAutoHideRect( Rectangle& rRect, BOOL bTest = FALSE ) const;
-    SAL_DLLPRIVATE void ImplGetFadeInRect( Rectangle& rRect, BOOL bTest = FALSE ) const;
-    SAL_DLLPRIVATE void ImplGetFadeOutRect( Rectangle& rRect, BOOL bTest = FALSE ) const;
-    SAL_DLLPRIVATE void ImplDrawButtonRect( const Rectangle& rRect, long nSize );
-    SAL_DLLPRIVATE void ImplDrawAutoHide( BOOL bInPaint );
-    SAL_DLLPRIVATE void ImplDrawFadeIn( BOOL bInPaint );
-    SAL_DLLPRIVATE void ImplDrawFadeOut( BOOL bInPaint );
-    SAL_DLLPRIVATE void ImplNewAlign();
+    SAL_DLLPRIVATE void	ImplInit( Window* pParent, WinBits nStyle );
+    SAL_DLLPRIVATE void	ImplInitSettings();
+    SAL_DLLPRIVATE void	ImplCalcLayout();
+    SAL_DLLPRIVATE void	ImplUpdate();
+    SAL_DLLPRIVATE void	ImplUpdateSet( ImplSplitSet* pSet );
+    SAL_DLLPRIVATE void	ImplSetWindowSize( long nDelta );
+    SAL_DLLPRIVATE void	ImplSplitMousePos( Point& rMousePos );
+    SAL_DLLPRIVATE void	ImplGetButtonRect( Rectangle& rRect, long nEx, BOOL bTest ) const;
+    SAL_DLLPRIVATE void	ImplGetAutoHideRect( Rectangle& rRect, BOOL bTest = FALSE ) const;
+    SAL_DLLPRIVATE void	ImplGetFadeInRect( Rectangle& rRect, BOOL bTest = FALSE ) const;
+    SAL_DLLPRIVATE void	ImplGetFadeOutRect( Rectangle& rRect, BOOL bTest = FALSE ) const;
+    SAL_DLLPRIVATE void	ImplDrawButtonRect( const Rectangle& rRect, long nSize );
+    SAL_DLLPRIVATE void	ImplDrawAutoHide( BOOL bInPaint );
+    SAL_DLLPRIVATE void	ImplDrawFadeIn( BOOL bInPaint );
+    SAL_DLLPRIVATE void	ImplDrawFadeOut( BOOL bInPaint );
+    SAL_DLLPRIVATE void	ImplNewAlign();
     SAL_DLLPRIVATE void ImplDrawGrip( const Rectangle& rRect, BOOL bHorz, BOOL bLeft );
     SAL_DLLPRIVATE void ImplDrawFadeArrow( const Point& rPt, BOOL bHorz, BOOL bLeft );
     SAL_DLLPRIVATE void ImplStartSplit( const MouseEvent& rMEvt );
@@ -155,114 +155,114 @@ public:
                         SplitWindow( Window* pParent, const ResId& rResId );
                         ~SplitWindow();
 
-    virtual void        StartSplit();
-    virtual void        Split();
-    virtual void        SplitResize();
-    virtual void        AutoHide();
-    virtual void        FadeIn();
-    virtual void        FadeOut();
+    virtual void		StartSplit();
+    virtual void		Split();
+    virtual void		SplitResize();
+    virtual void		AutoHide();
+    virtual void		FadeIn();
+    virtual void		FadeOut();
 
-    virtual void        MouseButtonDown( const MouseEvent& rMEvt );
-    virtual void        MouseMove( const MouseEvent& rMEvt );
-    virtual void        Tracking( const TrackingEvent& rTEvt );
-    virtual void        Paint( const Rectangle& rRect );
-    virtual void        Move();
-    virtual void        Resize();
-    virtual void        RequestHelp( const HelpEvent& rHEvt );
-    virtual void        StateChanged( StateChangedType nType );
-    virtual void        DataChanged( const DataChangedEvent& rDCEvt );
+    virtual void		MouseButtonDown( const MouseEvent& rMEvt );
+    virtual void		MouseMove( const MouseEvent& rMEvt );
+    virtual void		Tracking( const TrackingEvent& rTEvt );
+    virtual void		Paint( const Rectangle& rRect );
+    virtual void		Move();
+    virtual void		Resize();
+    virtual void		RequestHelp( const HelpEvent& rHEvt );
+    virtual void		StateChanged( StateChangedType nType );
+    virtual void		DataChanged( const DataChangedEvent& rDCEvt );
     virtual long        PreNotify( NotifyEvent& rNEvt );
 
-    void                InsertItem( USHORT nId, Window* pWindow, long nSize,
+    void				InsertItem( USHORT nId, Window* pWindow, long nSize,
                                     USHORT nPos = SPLITWINDOW_APPEND, USHORT nSetId = 0,
                                     SplitWindowItemBits nBits = 0 );
-    void                InsertItem( USHORT nId, long nSize,
+    void				InsertItem( USHORT nId, long nSize,
                                     USHORT nPos = SPLITWINDOW_APPEND, USHORT nSetId = 0,
                                     SplitWindowItemBits nBits = 0 );
-    void                MoveItem( USHORT nId, USHORT nNewPos, USHORT nNewSetId = 0 );
-    void                RemoveItem( USHORT nId, BOOL bHide = TRUE );
-    void                Clear();
+    void				MoveItem( USHORT nId, USHORT nNewPos, USHORT nNewSetId = 0 );
+    void				RemoveItem( USHORT nId, BOOL bHide = TRUE );
+    void				Clear();
 
-    void                SetBaseSet( USHORT nSetId = 0 );
-    USHORT              GetBaseSet() const;
+    void				SetBaseSet( USHORT nSetId = 0 );
+    USHORT				GetBaseSet() const;
 
-    void                SetSplitSize( USHORT nSetId, long nSplitSize,
+    void				SetSplitSize( USHORT nSetId, long nSplitSize,
                                       BOOL bWithChilds = FALSE );
-    long                GetSplitSize( USHORT nSetId ) const;
-    void                SetItemBackground( USHORT nSetId );
-    void                SetItemBackground( USHORT nSetId, const Wallpaper& rWallpaper );
-    Wallpaper           GetItemBackground( USHORT nSetId ) const;
-    BOOL                IsItemBackground( USHORT nSetId ) const;
-    void                SetItemBitmap( USHORT nSetId, const Bitmap& rBitmap );
-    Bitmap              GetItemBitmap( USHORT nSetId ) const;
+    long				GetSplitSize( USHORT nSetId ) const;
+    void				SetItemBackground( USHORT nSetId );
+    void				SetItemBackground( USHORT nSetId, const Wallpaper& rWallpaper );
+    Wallpaper			GetItemBackground( USHORT nSetId ) const;
+    BOOL				IsItemBackground( USHORT nSetId ) const;
+    void				SetItemBitmap( USHORT nSetId, const Bitmap& rBitmap );
+    Bitmap				GetItemBitmap( USHORT nSetId ) const;
 
-    void                SplitItem( USHORT nId, long nNewSize,
+    void				SplitItem( USHORT nId, long nNewSize,
                                    BOOL bPropSmall = FALSE,
                                    BOOL bPropGreat = FALSE );
-    void                SetItemSize( USHORT nId, long nNewSize );
-    long                GetItemSize( USHORT nId ) const;
-    long                GetItemSize( USHORT nId, SplitWindowItemBits nBits ) const;
-    void                SetItemBits( USHORT nId, SplitWindowItemBits nNewBits );
+    void				SetItemSize( USHORT nId, long nNewSize );
+    long				GetItemSize( USHORT nId ) const;
+    long				GetItemSize( USHORT nId, SplitWindowItemBits nBits ) const;
+    void				SetItemBits( USHORT nId, SplitWindowItemBits nNewBits );
     SplitWindowItemBits GetItemBits( USHORT nId ) const;
-    Window*             GetItemWindow( USHORT nId ) const;
-    USHORT              GetSet( USHORT nId ) const;
-    BOOL                GetSet( USHORT nId, USHORT& rSetId, USHORT& rPos ) const;
-    USHORT              GetItemId( Window* pWindow ) const;
-    USHORT              GetItemId( const Point& rPos ) const;
-    USHORT              GetItemPos( USHORT nId, USHORT nSetId = 0 ) const;
-    USHORT              GetItemId( USHORT nPos, USHORT nSetId = 0 ) const;
-    USHORT              GetItemCount( USHORT nSetId = 0 ) const;
-    BOOL                IsItemValid( USHORT nId ) const;
+    Window* 			GetItemWindow( USHORT nId ) const;
+    USHORT				GetSet( USHORT nId ) const;
+    BOOL				GetSet( USHORT nId, USHORT& rSetId, USHORT& rPos ) const;
+    USHORT				GetItemId( Window* pWindow ) const;
+    USHORT				GetItemId( const Point& rPos ) const;
+    USHORT				GetItemPos( USHORT nId, USHORT nSetId = 0 ) const;
+    USHORT				GetItemId( USHORT nPos, USHORT nSetId = 0 ) const;
+    USHORT				GetItemCount( USHORT nSetId = 0 ) const;
+    BOOL				IsItemValid( USHORT nId ) const;
 
-    void                SetNoAlign( BOOL bNoAlign );
-    BOOL                IsNoAlign() const { return mbNoAlign; }
-    void                SetAlign( WindowAlign eNewAlign = WINDOWALIGN_TOP );
-    WindowAlign         GetAlign() const { return meAlign; }
-    BOOL                IsHorizontal() const { return mbHorz; }
+    void				SetNoAlign( BOOL bNoAlign );
+    BOOL				IsNoAlign() const { return mbNoAlign; }
+    void				SetAlign( WindowAlign eNewAlign = WINDOWALIGN_TOP );
+    WindowAlign 		GetAlign() const { return meAlign; }
+    BOOL				IsHorizontal() const { return mbHorz; }
 
-    BOOL                IsSplitting() const { return IsTracking(); }
+    BOOL				IsSplitting() const { return IsTracking(); }
 
-    void                SetMaxSizePixel( long nNewMaxSize ) { mnMaxSize = nNewMaxSize; }
-    long                GetMaxSizePixel() const { return mnMaxSize; }
+    void				SetMaxSizePixel( long nNewMaxSize ) { mnMaxSize = nNewMaxSize; }
+    long				GetMaxSizePixel() const { return mnMaxSize; }
 
-    static Size         CalcWindowSizePixel( const Size& rSize,
+    static Size 		CalcWindowSizePixel( const Size& rSize,
                                              WindowAlign eAlign,
                                              WinBits nWinStyle,
                                              BOOL bExtra = FALSE );
-    Size                CalcWindowSizePixel( const Size& rSize )
+    Size				CalcWindowSizePixel( const Size& rSize )
                             { return CalcWindowSizePixel( rSize, meAlign, mnWinStyle, (mbAutoHide || mbFadeOut) ); }
 
-    Size                CalcLayoutSizePixel( const Size& aNewSize );
+    Size				CalcLayoutSizePixel( const Size& aNewSize );
 
-    void                ShowAutoHideButton( BOOL bShow = TRUE );
-    BOOL                IsAutoHideButtonVisible() const { return mbAutoHide; }
-    void                ShowFadeInHideButton( BOOL bShow = TRUE );
-    void                ShowFadeInButton( BOOL bShow = TRUE ) { ShowFadeInHideButton( bShow ); }
-    BOOL                IsFadeInButtonVisible() const { return mbFadeIn; }
-    void                ShowFadeOutButton( BOOL bShow = TRUE );
-    BOOL                IsFadeOutButtonVisible() const { return mbFadeOut; }
-    long                GetFadeInSize() const;
-    BOOL                IsFadeNoButtonMode() const { return mbFadeNoButtonMode; }
+    void				ShowAutoHideButton( BOOL bShow = TRUE );
+    BOOL				IsAutoHideButtonVisible() const { return mbAutoHide; }
+    void				ShowFadeInHideButton( BOOL bShow = TRUE );
+    void				ShowFadeInButton( BOOL bShow = TRUE ) { ShowFadeInHideButton( bShow ); }
+    BOOL				IsFadeInButtonVisible() const { return mbFadeIn; }
+    void				ShowFadeOutButton( BOOL bShow = TRUE );
+    BOOL				IsFadeOutButtonVisible() const { return mbFadeOut; }
+    long				GetFadeInSize() const;
+    BOOL				IsFadeNoButtonMode() const { return mbFadeNoButtonMode; }
 
-    void                SetAutoHideState( BOOL bAutoHide );
-    BOOL                GetAutoHideState() const { return mbAutoHideIn; }
+    void				SetAutoHideState( BOOL bAutoHide );
+    BOOL				GetAutoHideState() const { return mbAutoHideIn; }
 
-    Rectangle           GetAutoHideRect() const;
-    Rectangle           GetFadeInRect() const;
-    Rectangle           GetFadeOutRect() const;
+    Rectangle			GetAutoHideRect() const;
+    Rectangle			GetFadeInRect() const;
+    Rectangle			GetFadeOutRect() const;
 
-    void                SetStartSplitHdl( const Link& rLink ) { maStartSplitHdl = rLink; }
-    const Link&         GetStartSplitHdl() const { return maStartSplitHdl; }
-    void                SetSplitHdl( const Link& rLink ) { maSplitHdl = rLink; }
-    const Link&         GetSplitHdl() const { return maSplitHdl; }
-    void                SetSplitResizeHdl( const Link& rLink ) { maSplitResizeHdl = rLink; }
-    const Link&         GetSplitResizeHdl() const { return maSplitResizeHdl; }
-    void                SetAutoHideHdl( const Link& rLink ) { maAutoHideHdl = rLink; }
-    const Link&         GetAutoHideHdl() const { return maAutoHideHdl; }
-    void                SetFadeInHdl( const Link& rLink ) { maFadeInHdl = rLink; }
-    const Link&         GetFadeInHdl() const { return maFadeInHdl; }
-    void                SetFadeOutHdl( const Link& rLink ) { maFadeOutHdl = rLink; }
-    const Link&         GetFadeOutHdl() const { return maFadeOutHdl; }
+    void				SetStartSplitHdl( const Link& rLink ) { maStartSplitHdl = rLink; }
+    const Link& 		GetStartSplitHdl() const { return maStartSplitHdl; }
+    void				SetSplitHdl( const Link& rLink ) { maSplitHdl = rLink; }
+    const Link& 		GetSplitHdl() const { return maSplitHdl; }
+    void				SetSplitResizeHdl( const Link& rLink ) { maSplitResizeHdl = rLink; }
+    const Link& 		GetSplitResizeHdl() const { return maSplitResizeHdl; }
+    void				SetAutoHideHdl( const Link& rLink ) { maAutoHideHdl = rLink; }
+    const Link& 		GetAutoHideHdl() const { return maAutoHideHdl; }
+    void				SetFadeInHdl( const Link& rLink ) { maFadeInHdl = rLink; }
+    const Link& 		GetFadeInHdl() const { return maFadeInHdl; }
+    void				SetFadeOutHdl( const Link& rLink ) { maFadeOutHdl = rLink; }
+    const Link& 		GetFadeOutHdl() const { return maFadeOutHdl; }
 };
 
-#endif  // _SV_SPLITWIN_HXX
+#endif	// _SV_SPLITWIN_HXX
diff --git a/vcl/inc/vcl/status.hxx b/vcl/inc/vcl/status.hxx
index 810ecf230960..06ba7e344294 100644
--- a/vcl/inc/vcl/status.hxx
+++ b/vcl/inc/vcl/status.hxx
@@ -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
@@ -54,22 +54,22 @@ typedef USHORT StatusBarItemBits;
 // - Bits fuer StatusBarItems -
 // ----------------------------
 
-#define SIB_LEFT                    ((StatusBarItemBits)0x0001)
-#define SIB_CENTER                  ((StatusBarItemBits)0x0002)
-#define SIB_RIGHT                   ((StatusBarItemBits)0x0004)
-#define SIB_IN                      ((StatusBarItemBits)0x0008)
-#define SIB_OUT                     ((StatusBarItemBits)0x0010)
-#define SIB_FLAT                    ((StatusBarItemBits)0x0020)
-#define SIB_AUTOSIZE                ((StatusBarItemBits)0x0040)
-#define SIB_USERDRAW                ((StatusBarItemBits)0x0080)
+#define SIB_LEFT					((StatusBarItemBits)0x0001)
+#define SIB_CENTER					((StatusBarItemBits)0x0002)
+#define SIB_RIGHT					((StatusBarItemBits)0x0004)
+#define SIB_IN						((StatusBarItemBits)0x0008)
+#define SIB_OUT 					((StatusBarItemBits)0x0010)
+#define SIB_FLAT					((StatusBarItemBits)0x0020)
+#define SIB_AUTOSIZE				((StatusBarItemBits)0x0040)
+#define SIB_USERDRAW				((StatusBarItemBits)0x0080)
 
 // -------------------
 // - StatusBar-Types -
 // -------------------
 
-#define STATUSBAR_APPEND            ((USHORT)0xFFFF)
-#define STATUSBAR_ITEM_NOTFOUND     ((USHORT)0xFFFF)
-#define STATUSBAR_OFFSET            ((long)5)
+#define STATUSBAR_APPEND			((USHORT)0xFFFF)
+#define STATUSBAR_ITEM_NOTFOUND 	((USHORT)0xFFFF)
+#define STATUSBAR_OFFSET			((long)5)
 
 // -------------
 // - StatusBar -
@@ -81,40 +81,40 @@ class VCL_DLLPUBLIC StatusBar : public Window
 private:
     ImplStatusItemList* mpItemList;
     ImplData*           mpImplData;
-    XubString           maPrgsTxt;
-    Point               maPrgsTxtPos;
-    Rectangle           maPrgsFrameRect;
-    long                mnPrgsSize;
-    long                mnItemsWidth;
-    long                mnDX;
-    long                mnDY;
-    long                mnCalcHeight;
-    long                mnTextY;
-    long                mnItemY;
-    USHORT              mnCurItemId;
-    USHORT              mnPercent;
-    USHORT              mnPercentCount;
-    BOOL                mbVisibleItems;
-    BOOL                mbFormat;
-    BOOL                mbProgressMode;
-    BOOL                mbInUserDraw;
-    BOOL                mbBottomBorder;
-    Link                maClickHdl;
-    Link                maDoubleClickHdl;
+    XubString			maPrgsTxt;
+    Point				maPrgsTxtPos;
+    Rectangle			maPrgsFrameRect;
+    long				mnPrgsSize;
+    long				mnItemsWidth;
+    long				mnDX;
+    long				mnDY;
+    long				mnCalcHeight;
+    long				mnTextY;
+    long				mnItemY;
+    USHORT				mnCurItemId;
+    USHORT				mnPercent;
+    USHORT				mnPercentCount;
+    BOOL				mbVisibleItems;
+    BOOL				mbFormat;
+    BOOL				mbProgressMode;
+    BOOL				mbInUserDraw;
+    BOOL				mbBottomBorder;
+    Link				maClickHdl;
+    Link				maDoubleClickHdl;
 
     using Window::ImplInit;
-    SAL_DLLPRIVATE void      ImplInit( Window* pParent, WinBits nStyle );
-    SAL_DLLPRIVATE void      ImplInitSettings( BOOL bFont, BOOL bForeground, BOOL bBackground );
-    SAL_DLLPRIVATE void      ImplFormat();
-    SAL_DLLPRIVATE BOOL      ImplIsItemUpdate();
+    SAL_DLLPRIVATE void		 ImplInit( Window* pParent, WinBits nStyle );
+    SAL_DLLPRIVATE void		 ImplInitSettings( BOOL bFont, BOOL bForeground, BOOL bBackground );
+    SAL_DLLPRIVATE void		 ImplFormat();
+    SAL_DLLPRIVATE BOOL		 ImplIsItemUpdate();
 //    #if 0 // _SOLAR__PRIVATE
     using OutputDevice::ImplDrawText;
 //    #endif
-    SAL_DLLPRIVATE void      ImplDrawText( BOOL bOffScreen, long nOldTextWidth );
-    SAL_DLLPRIVATE void      ImplDrawItem( BOOL bOffScreen, USHORT nPos, BOOL bDrawText, BOOL bDrawFrame );
-    SAL_DLLPRIVATE void      ImplDrawProgress( BOOL bPaint,
+    SAL_DLLPRIVATE void		 ImplDrawText( BOOL bOffScreen, long nOldTextWidth );
+    SAL_DLLPRIVATE void		 ImplDrawItem( BOOL bOffScreen, USHORT nPos, BOOL bDrawText, BOOL bDrawFrame );
+    SAL_DLLPRIVATE void		 ImplDrawProgress( BOOL bPaint,
                                                USHORT nOldPerc, USHORT nNewPerc );
-    SAL_DLLPRIVATE void      ImplCalcProgressRect();
+    SAL_DLLPRIVATE void		 ImplCalcProgressRect();
     SAL_DLLPRIVATE Rectangle ImplGetItemRectPos( USHORT nPos ) const;
     SAL_DLLPRIVATE USHORT    ImplGetFirstVisiblePos() const;
     SAL_DLLPRIVATE void      ImplCalcBorder();
@@ -125,102 +125,102 @@ public:
                         StatusBar( Window* pParent, const ResId& rResId );
                         ~StatusBar();
 
-    virtual void        MouseButtonDown( const MouseEvent& rMEvt );
-    virtual void        Paint( const Rectangle& rRect );
-    virtual void        Move();
-    virtual void        Resize();
-    virtual void        RequestHelp( const HelpEvent& rHEvt );
-    virtual void        StateChanged( StateChangedType nType );
-    virtual void        DataChanged( const DataChangedEvent& rDCEvt );
+    virtual void		MouseButtonDown( const MouseEvent& rMEvt );
+    virtual void		Paint( const Rectangle& rRect );
+    virtual void		Move();
+    virtual void		Resize();
+    virtual void		RequestHelp( const HelpEvent& rHEvt );
+    virtual void		StateChanged( StateChangedType nType );
+    virtual void		DataChanged( const DataChangedEvent& rDCEvt );
 
-    virtual void        Click();
-    virtual void        DoubleClick();
-    virtual void        UserDraw( const UserDrawEvent& rUDEvt );
+    virtual void		Click();
+    virtual void		DoubleClick();
+    virtual void		UserDraw( const UserDrawEvent& rUDEvt );
 
-    void                InsertItem( USHORT nItemId, ULONG nWidth,
+    void				InsertItem( USHORT nItemId, ULONG nWidth,
                                     StatusBarItemBits nBits = SIB_CENTER | SIB_IN,
                                     long nOffset = STATUSBAR_OFFSET,
                                     USHORT nPos = STATUSBAR_APPEND );
-    void                RemoveItem( USHORT nItemId );
+    void				RemoveItem( USHORT nItemId );
 
-    void                ShowItem( USHORT nItemId );
-    void                HideItem( USHORT nItemId );
-    BOOL                IsItemVisible( USHORT nItemId ) const;
+    void				ShowItem( USHORT nItemId );
+    void				HideItem( USHORT nItemId );
+    BOOL				IsItemVisible( USHORT nItemId ) const;
 
-    void                ShowItems();
-    void                HideItems();
-    BOOL                AreItemsVisible() const { return mbVisibleItems; }
+    void				ShowItems();
+    void				HideItems();
+    BOOL				AreItemsVisible() const { return mbVisibleItems; }
 
-    void                CopyItems( const StatusBar& rStatusBar );
-    void                Clear();
+    void				CopyItems( const StatusBar& rStatusBar );
+    void				Clear();
 
-    USHORT              GetItemCount() const;
-    USHORT              GetItemId( USHORT nPos ) const;
-    USHORT              GetItemId( const Point& rPos ) const;
-    USHORT              GetItemPos( USHORT nItemId ) const;
-    Rectangle           GetItemRect( USHORT nItemId ) const;
-    Point               GetItemTextPos( USHORT nItemId ) const;
-    USHORT              GetCurItemId() const { return mnCurItemId; }
+    USHORT				GetItemCount() const;
+    USHORT				GetItemId( USHORT nPos ) const;
+    USHORT				GetItemId( const Point& rPos ) const;
+    USHORT				GetItemPos( USHORT nItemId ) const;
+    Rectangle			GetItemRect( USHORT nItemId ) const;
+    Point				GetItemTextPos( USHORT nItemId ) const;
+    USHORT				GetCurItemId() const { return mnCurItemId; }
 
-    ULONG               GetItemWidth( USHORT nItemId ) const;
-    StatusBarItemBits   GetItemBits( USHORT nItemId ) const;
-    long                GetItemOffset( USHORT nItemId ) const;
+    ULONG				GetItemWidth( USHORT nItemId ) const;
+    StatusBarItemBits	GetItemBits( USHORT nItemId ) const;
+    long				GetItemOffset( USHORT nItemId ) const;
 
-    void                SetItemText( USHORT nItemId, const XubString& rText );
-    const XubString&    GetItemText( USHORT nItemId ) const;
+    void				SetItemText( USHORT nItemId, const XubString& rText );
+    const XubString& 	GetItemText( USHORT nItemId ) const;
 
-    void                SetItemData( USHORT nItemId, void* pNewData );
-    void*               GetItemData( USHORT nItemId ) const;
+    void				SetItemData( USHORT nItemId, void* pNewData );
+    void*				GetItemData( USHORT nItemId ) const;
 
     void                SetItemCommand( USHORT nItemId, const XubString& rCommand );
     const XubString&    GetItemCommand( USHORT nItemId );
 
-    void                SetHelpText( USHORT nItemId, const XubString& rText );
-    const XubString&    GetHelpText( USHORT nItemId ) const;
+    void				SetHelpText( USHORT nItemId, const XubString& rText );
+    const XubString& 	GetHelpText( USHORT nItemId ) const;
 
     using Window::SetQuickHelpText;
     void                SetQuickHelpText( USHORT nItemId, const XubString& rText );
     using Window::GetQuickHelpText;
     const XubString&    GetQuickHelpText( USHORT nItemId ) const;
 
-    void                SetHelpId( USHORT nItemId, ULONG nHelpId );
-    ULONG               GetHelpId( USHORT nItemId ) const;
+    void				SetHelpId( USHORT nItemId, ULONG nHelpId );
+    ULONG				GetHelpId( USHORT nItemId ) const;
 
-    void                SetBottomBorder( BOOL bBottomBorder = TRUE );
-    BOOL                IsBottomBorder() const { return mbBottomBorder; }
+    void				SetBottomBorder( BOOL bBottomBorder = TRUE );
+    BOOL				IsBottomBorder() const { return mbBottomBorder; }
 
-    void                SetTopBorder( BOOL bTopBorder = TRUE );
-    BOOL                IsTopBorder() const;
+    void				SetTopBorder( BOOL bTopBorder = TRUE );
+    BOOL				IsTopBorder() const;
 
-    void                StartProgressMode( const XubString& rText );
-    void                SetProgressValue( USHORT nPercent );
-    void                EndProgressMode();
-    BOOL                IsProgressMode() const { return mbProgressMode; }
-    void                ResetProgressMode();
+    void				StartProgressMode( const XubString& rText );
+    void				SetProgressValue( USHORT nPercent );
+    void				EndProgressMode();
+    BOOL				IsProgressMode() const { return mbProgressMode; }
+    void				ResetProgressMode();
 
-    void                SetText( const XubString& rText );
+    void				SetText( const XubString& rText );
 
-    void                SetHelpText( const XubString& rText )
+    void				SetHelpText( const XubString& rText )
                             { Window::SetHelpText( rText ); }
-    const XubString&    GetHelpText() const
+    const XubString& 	GetHelpText() const
                             { return Window::GetHelpText(); }
 
-    void                SetHelpId( ULONG nId )
+    void				SetHelpId( ULONG nId )
                             { Window::SetHelpId( nId ); }
-    ULONG               GetHelpId() const
+    ULONG				GetHelpId() const
                             { return Window::GetHelpId(); }
 
-    Size                CalcWindowSizePixel() const;
+    Size				CalcWindowSizePixel() const;
 
-    void                SetClickHdl( const Link& rLink ) { maClickHdl = rLink; }
-    const Link&         GetClickHdl() const { return maClickHdl; }
-    void                SetDoubleClickHdl( const Link& rLink ) { maDoubleClickHdl = rLink; }
-    const Link&         GetDoubleClickHdl() const { return maDoubleClickHdl; }
+    void				SetClickHdl( const Link& rLink ) { maClickHdl = rLink; }
+    const Link& 		GetClickHdl() const { return maClickHdl; }
+    void				SetDoubleClickHdl( const Link& rLink ) { maDoubleClickHdl = rLink; }
+    const Link& 		GetDoubleClickHdl() const { return maDoubleClickHdl; }
 
     using Window::SetAccessibleName;
-    void                SetAccessibleName( USHORT nItemId, const XubString& rName );
+    void				SetAccessibleName( USHORT nItemId, const XubString& rName );
     using Window::GetAccessibleName;
-    const XubString&    GetAccessibleName( USHORT nItemId ) const;
+    const XubString& 	GetAccessibleName( USHORT nItemId ) const;
 };
 
-#endif  // _SV_STATUS_HXX
+#endif	// _SV_STATUS_HXX
diff --git a/vcl/inc/vcl/stdtext.hxx b/vcl/inc/vcl/stdtext.hxx
index 111e58aca5bf..7c5fdd3e79c9 100644
--- a/vcl/inc/vcl/stdtext.hxx
+++ b/vcl/inc/vcl/stdtext.hxx
@@ -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
@@ -38,9 +38,9 @@ class Window;
 // - Standard-Texte -
 // ------------------
 
-#define STANDARD_TEXT_FIRST                     STANDARD_TEXT_SERVICE_NOT_AVAILABLE
-#define STANDARD_TEXT_SERVICE_NOT_AVAILABLE     ((USHORT)0)
-#define STANDARD_TEXT_LAST                      STANDARD_TEXT_SERVICE_NOT_AVAILABLE
+#define STANDARD_TEXT_FIRST 					STANDARD_TEXT_SERVICE_NOT_AVAILABLE
+#define STANDARD_TEXT_SERVICE_NOT_AVAILABLE 	((USHORT)0)
+#define STANDARD_TEXT_LAST						STANDARD_TEXT_SERVICE_NOT_AVAILABLE
 
 XubString VCL_DLLPUBLIC GetStandardText( USHORT nStdText );
 
@@ -50,4 +50,4 @@ XubString VCL_DLLPUBLIC GetStandardText( USHORT nStdText );
 
 void VCL_DLLPUBLIC ShowServiceNotAvailableError( Window* pParent, const XubString& rServiceName, BOOL bError );
 
-#endif  // _VCL_STDTEXT_HXX
+#endif	// _VCL_STDTEXT_HXX
diff --git a/vcl/inc/vcl/strhelper.hxx b/vcl/inc/vcl/strhelper.hxx
index 8df83d6f33f4..8a2e2b999c98 100644
--- a/vcl/inc/vcl/strhelper.hxx
+++ b/vcl/inc/vcl/strhelper.hxx
@@ -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
diff --git a/vcl/inc/vcl/subedit.hxx b/vcl/inc/vcl/subedit.hxx
index 3ea1eaffa864..644038c0ed3b 100644
--- a/vcl/inc/vcl/subedit.hxx
+++ b/vcl/inc/vcl/subedit.hxx
@@ -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
diff --git a/vcl/inc/vcl/sv.h b/vcl/inc/vcl/sv.h
index 9296570a71bb..536df5ababa8 100644
--- a/vcl/inc/vcl/sv.h
+++ b/vcl/inc/vcl/sv.h
@@ -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
diff --git a/vcl/inc/vcl/svapp.hxx b/vcl/inc/vcl/svapp.hxx
index f90326ce50eb..dd87b6cfdd20 100644
--- a/vcl/inc/vcl/svapp.hxx
+++ b/vcl/inc/vcl/svapp.hxx
@@ -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
@@ -159,12 +159,12 @@ inline BOOL ApplicationAddress::IsConnectToSame( const ApplicationAddress& rAdr
         return FALSE;
 }
 
-#define APPEVENT_PARAM_DELIMITER        '\n'
+#define APPEVENT_PARAM_DELIMITER    	'\n'
 
-#define APPEVENT_OPEN_STRING            "Open"
-#define APPEVENT_PRINT_STRING           "Print"
-#define APPEVENT_DISKINSERT_STRING      "DiskInsert"
-#define APPEVENT_SAVEDOCUMENTS_STRING   "SaveDocuments"
+#define APPEVENT_OPEN_STRING        	"Open"
+#define APPEVENT_PRINT_STRING       	"Print"
+#define APPEVENT_DISKINSERT_STRING  	"DiskInsert"
+#define APPEVENT_SAVEDOCUMENTS_STRING	"SaveDocuments"
 
 class VCL_DLLPUBLIC ApplicationEvent
 {
@@ -315,7 +315,7 @@ public:
         <TRUE/> if the system font is suitable for our UI
         <FALSE/> if the test string could not be displayed with the system font
      */
-    static bool                 ValidateSystemFont();
+    static bool					ValidateSystemFont();
 
     static void                 SetSettings( const AllSettings& rSettings );
     static const AllSettings&   GetSettings();
@@ -328,11 +328,11 @@ public:
     static void                 ImplCallEventListeners( ULONG nEvent, Window* pWin, void* pData );
     static void                 ImplCallEventListeners( VclSimpleEvent* pEvent );
     static BOOL                 HandleKey( ULONG nEvent, Window *pWin, KeyEvent* pKeyEvent );
-
+    
     static ULONG                PostKeyEvent( ULONG nEvent, Window *pWin, KeyEvent* pKeyEvent );
     static ULONG                PostMouseEvent( ULONG nEvent, Window *pWin, MouseEvent* pMouseEvent );
-    static void                 RemoveMouseAndKeyEvents( Window *pWin );
-    static BOOL                 IsProcessedMouseOrKeyEvent( ULONG nEventId );
+    static void					RemoveMouseAndKeyEvents( Window *pWin );
+    static BOOL					IsProcessedMouseOrKeyEvent( ULONG nEventId );
 
     static ULONG                PostUserEvent( ULONG nEvent, void* pEventData = NULL );
     static ULONG                PostUserEvent( const Link& rLink, void* pCaller = NULL );
@@ -367,7 +367,7 @@ public:
 
     static void                 SetDisplayName( const UniString& rDisplayName );
     static UniString            GetDisplayName();
-
+    
     static unsigned int         GetScreenCount();
     // IsMultiDisplay returns:
     //        true:  different screens are separate and windows cannot be moved
@@ -378,7 +378,7 @@ public:
     static bool                 IsMultiDisplay();
     static Rectangle            GetScreenPosSizePixel( unsigned int nScreen );
     static Rectangle            GetWorkAreaPosSizePixel( unsigned int nScreen );
-    static rtl::OUString        GetScreenName( unsigned int nScreen );
+    static rtl::OUString		GetScreenName( unsigned int nScreen );
     static unsigned int         GetDefaultDisplayNumber();
     // if IsMultiDisplay() == false the return value will be
     // nearest screen of the target rectangle
@@ -440,12 +440,12 @@ public:
 
     static void                 SetFilterHdl( const Link& rLink );
     static const Link&          GetFilterHdl();
-
+    
     static BOOL                 IsAccessibilityEnabled();
 
     static void                 EnableHeadlessMode( BOOL bEnable = TRUE );
     static BOOL                 IsHeadlessModeEnabled();
-
+    
     static void                 ShowNativeErrorBox(const String& sTitle  ,
                                                    const String& sMessage);
 
@@ -473,19 +473,19 @@ public:
         Can be called without the Solar mutex locked.
      */
     static bool GetShowImeStatusWindowDefault();
-
-    /** Returns a string representing the desktop environment
+    
+    /** Returns a string representing the desktop environment 
         the process is currently running in.
      */
     static const ::rtl::OUString& GetDesktopEnvironment();
 
     /** Add a file to the system shells recent document list if there is any.
-          This function may have no effect under Unix because there is no
+          This function may have no effect under Unix because there is no 
           standard API among the different desktop managers.
-
+          
           @param rFileUrl
                     The file url of the document.
-
+                    
           @param rMimeType
           The mime content type of the document specified by aFileUrl.
           If an empty string will be provided "application/octet-stream"
diff --git a/vcl/inc/vcl/svcompat.hxx b/vcl/inc/vcl/svcompat.hxx
index 9e461da4e54b..fbc3dd041386 100644
--- a/vcl/inc/vcl/svcompat.hxx
+++ b/vcl/inc/vcl/svcompat.hxx
@@ -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
@@ -35,9 +35,9 @@
 // -----------
 
 #define COMPAT_FORMAT( char1, char2, char3, char4 ) \
-    ((ULONG)((((ULONG)(char)(char1)))|              \
-    (((ULONG)(char)(char2))<<8UL)|                  \
-    (((ULONG)(char)(char3))<<16UL)|                 \
+    ((ULONG)((((ULONG)(char)(char1)))|				\
+    (((ULONG)(char)(char2))<<8UL)|					\
+    (((ULONG)(char)(char3))<<16UL)|					\
     ((ULONG)(char)(char4))<<24UL))
 
 
diff --git a/vcl/inc/vcl/svdata.hxx b/vcl/inc/vcl/svdata.hxx
index 5cc8f32d7ac9..6619494fc47a 100644
--- a/vcl/inc/vcl/svdata.hxx
+++ b/vcl/inc/vcl/svdata.hxx
@@ -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
@@ -177,7 +177,7 @@ struct ImplSVAppData
     ImeStatusWindowMode meShowImeStatusWindow;
 
                             DECL_STATIC_LINK( ImplSVAppData, ImplQuitMsg, void* );
-
+                           
 };
 
 
@@ -239,7 +239,7 @@ struct ImplSVWinData
     USHORT                  mnTrackFlags;       // tracking flags
     USHORT                  mnAutoScrollFlags;  // auto scroll flags
     BOOL                    mbNoDeactivate;     // TRUE: keine Deactivate durchfuehren
-    BOOL                    mbNoSaveFocus;      // TRUE: menues must not save/restore focus
+    BOOL					mbNoSaveFocus;		// TRUE: menues must not save/restore focus
     BOOL                    mbNoSaveBackground; // TRUE: save background is unnecessary or even less performant
 };
 
@@ -335,9 +335,9 @@ struct ImplSVData
     ULONG                   mnThreadCount;      // is VCL MultiThread enabled
     ImplConfigData*         mpFirstConfigData;  // Zeiger auf ersten Config-Block
     ImplTimerData*          mpFirstTimerData;   // list of all running timers
-    SalTimer*               mpSalTimer;         // interface to sal event loop/timers
-    SalI18NImeStatus*       mpImeStatus;        // interface to ime status window
-    SalSystem*              mpSalSystem;        // SalSystem interface
+    SalTimer*				mpSalTimer;			// interface to sal event loop/timers
+    SalI18NImeStatus*		mpImeStatus;		// interface to ime status window
+    SalSystem*				mpSalSystem;		// SalSystem interface
     ResMgr*                 mpResMgr;           // SV-Resource-Manager
     ULONG                   mnTimerPeriod;      // current timer period
     ULONG                   mnTimerUpdate;      // TimerCallbackProcs on stack
@@ -355,12 +355,12 @@ struct ImplSVData
     BOOL                    mbIsTestTool;
 
     vos::OThread::TThreadIdentifier                     mnMainThreadId;
-    ::com::sun::star::uno::Reference<
+    ::com::sun::star::uno::Reference< 
         ::com::sun::star::awt::XDisplayConnection >     mxDisplayConnection;
 
     ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > mxAccessBridge;
     com::sun::star::uno::Reference< com::sun::star::frame::XSessionManagerClient > xSMClient;
-    ::vcl::SettingsConfigItem*          mpSettingsConfigItem;
+    ::vcl::SettingsConfigItem*			mpSettingsConfigItem;
     std::list< vcl::DeleteOnDeinitBase* >*   mpDeinitDeleteList;
 };
 
@@ -399,9 +399,9 @@ bool ImplInitAccessBridge( BOOL bAllowCancel, BOOL &rCancelled );
 
 // Empty-SV-String
 
-inline const String& ImplGetSVEmptyStr()
+inline const String& ImplGetSVEmptyStr() 
     { return String::EmptyString(); }
-inline const ByteString& ImplGetSVEmptyByteStr()
+inline const ByteString& ImplGetSVEmptyByteStr() 
     { return ByteString::EmptyString(); }
 
 // -----------------------------------------------------------------------
diff --git a/vcl/inc/vcl/svids.hrc b/vcl/inc/vcl/svids.hrc
index 059ed1524b7c..1f688bc1be2e 100644
--- a/vcl/inc/vcl/svids.hrc
+++ b/vcl/inc/vcl/svids.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
@@ -30,47 +30,47 @@
 
 #include "svl/solar.hrc"
 
-#define SV_RESID_STDOFFSET                  0
-#define SV_RESID_WINOFFSET                  1
-#define SV_RESID_OS2OFFSET                  2
-#define SV_RESID_MACOFFSET                  3
-#define SV_RESID_UNIXOFFSET                 4
-#define SV_RESID_MONOOFFSET                 5
+#define SV_RESID_STDOFFSET					0
+#define SV_RESID_WINOFFSET					1
+#define SV_RESID_OS2OFFSET					2
+#define SV_RESID_MACOFFSET					3
+#define SV_RESID_UNIXOFFSET 				4
+#define SV_RESID_MONOOFFSET 				5
 
 // Achtung: Diese Id's muessen min. 10 Werte auseinanderliegen, da
 // je nach Style noch ein Offset aufgerechnet wird
-#define SV_RESID_BITMAP_CHECK               1000
-#define SV_RESID_BITMAP_RADIO               1010
+#define SV_RESID_BITMAP_CHECK				1000
+#define SV_RESID_BITMAP_RADIO				1010
 
-#define SV_RESID_BITMAP_MSGBOX              1020
+#define SV_RESID_BITMAP_MSGBOX				1020
 #define SV_RESID_BITMAP_MSGBOX_HC           1021
 
-#define SV_RESID_BITMAP_PIN                 1030
+#define SV_RESID_BITMAP_PIN 				1030
 
-#define SV_RESID_BITMAP_SPLITHPIN           1040
-#define SV_RESID_BITMAP_SPLITVPIN           1041
-#define SV_RESID_BITMAP_SPLITHARW           1042
-#define SV_RESID_BITMAP_SPLITVARW           1043
+#define SV_RESID_BITMAP_SPLITHPIN			1040
+#define SV_RESID_BITMAP_SPLITVPIN			1041
+#define SV_RESID_BITMAP_SPLITHARW			1042
+#define SV_RESID_BITMAP_SPLITVARW			1043
 
-#define SV_RESID_BITMAP_SCROLLMSK           1050
-#define SV_RESID_BITMAP_SCROLLBMP           1051
-#define SV_RESID_BITMAP_CLOSEDOC            1052
-#define SV_RESID_BITMAP_CLOSEDOCHC          1053
+#define SV_RESID_BITMAP_SCROLLMSK			1050
+#define SV_RESID_BITMAP_SCROLLBMP			1051
+#define SV_RESID_BITMAP_CLOSEDOC			1052
+#define SV_RESID_BITMAP_CLOSEDOCHC			1053
 
 #define SV_DISCLOSURE_PLUS                  1060
 #define SV_DISCLOSURE_MINUS                 1061
 #define SV_DISCLOSURE_PLUS_HC               1062
 #define SV_DISCLOSURE_MINUS_HC              1063
 
-#define SV_RESID_MENU_EDIT                  2000
-#define SV_MENU_EDIT_UNDO                   1
-#define SV_MENU_EDIT_CUT                    2
-#define SV_MENU_EDIT_COPY                   3
-#define SV_MENU_EDIT_PASTE                  4
-#define SV_MENU_EDIT_DELETE                 5
-#define SV_MENU_EDIT_SELECTALL              6
-#define SV_MENU_EDIT_INSERTSYMBOL           7
-#define SV_RESID_STRING_NOSELECTIONPOSSIBLE 2001
+#define SV_RESID_MENU_EDIT					2000
+#define SV_MENU_EDIT_UNDO					1
+#define SV_MENU_EDIT_CUT					2
+#define SV_MENU_EDIT_COPY					3
+#define SV_MENU_EDIT_PASTE					4
+#define SV_MENU_EDIT_DELETE 				5
+#define SV_MENU_EDIT_SELECTALL				6
+#define SV_MENU_EDIT_INSERTSYMBOL			7
+#define SV_RESID_STRING_NOSELECTIONPOSSIBLE	2001
 
 #define SV_MENU_MAC_SERVICES                2002
 #define SV_MENU_MAC_HIDEAPP                 2003
@@ -164,34 +164,34 @@
 #define SV_PRINT_NOPRINTERWARNING         2051
 #define SV_PRINT_NOCONTENT                2052
 
-#define SV_HELPTEXT_CLOSE                   10000
-#define SV_HELPTEXT_MINIMIZE                10001
-#define SV_HELPTEXT_MAXIMIZE                10002
-#define SV_HELPTEXT_RESTORE                 10003
-#define SV_HELPTEXT_ROLLDOWN                10004
-#define SV_HELPTEXT_ROLLUP                  10005
-#define SV_HELPTEXT_HELP                    10006
-#define SV_HELPTEXT_ALWAYSVISIBLE           10007
-#define SV_HELPTEXT_FADEIN                  10008
-#define SV_HELPTEXT_FADEOUT                 10009
-#define SV_HELPTEXT_SPLITFLOATING           10010
-#define SV_HELPTEXT_SPLITFIXED              10011
+#define SV_HELPTEXT_CLOSE					10000
+#define SV_HELPTEXT_MINIMIZE				10001
+#define SV_HELPTEXT_MAXIMIZE				10002
+#define SV_HELPTEXT_RESTORE 				10003
+#define SV_HELPTEXT_ROLLDOWN				10004
+#define SV_HELPTEXT_ROLLUP					10005
+#define SV_HELPTEXT_HELP					10006
+#define SV_HELPTEXT_ALWAYSVISIBLE			10007
+#define SV_HELPTEXT_FADEIN					10008
+#define SV_HELPTEXT_FADEOUT 				10009
+#define SV_HELPTEXT_SPLITFLOATING			10010
+#define SV_HELPTEXT_SPLITFIXED				10011
 #define SV_HELPTEXT_CLOSEDOCUMENT           10012
 
-#define SV_BUTTONTEXT_OK                    10100
-#define SV_BUTTONTEXT_CANCEL                10101
-#define SV_BUTTONTEXT_YES                   10102
-#define SV_BUTTONTEXT_NO                    10103
-#define SV_BUTTONTEXT_RETRY                 10104
-#define SV_BUTTONTEXT_HELP                  10105
-#define SV_BUTTONTEXT_CLOSE                 SV_HELPTEXT_CLOSE
-#define SV_BUTTONTEXT_MORE                  10107
-#define SV_BUTTONTEXT_IGNORE                10108
-#define SV_BUTTONTEXT_ABORT             10109
-#define SV_BUTTONTEXT_LESS                  10110
+#define SV_BUTTONTEXT_OK					10100
+#define SV_BUTTONTEXT_CANCEL				10101
+#define SV_BUTTONTEXT_YES					10102
+#define SV_BUTTONTEXT_NO					10103
+#define SV_BUTTONTEXT_RETRY 				10104
+#define SV_BUTTONTEXT_HELP					10105
+#define SV_BUTTONTEXT_CLOSE 				SV_HELPTEXT_CLOSE
+#define SV_BUTTONTEXT_MORE					10107
+#define SV_BUTTONTEXT_IGNORE				10108
+#define SV_BUTTONTEXT_ABORT				10109
+#define SV_BUTTONTEXT_LESS					10110
 
-#define SV_STDTEXT_FIRST                    SV_STDTEXT_SERVICENOTAVAILABLE
-#define SV_STDTEXT_SERVICENOTAVAILABLE      10200
+#define SV_STDTEXT_FIRST					SV_STDTEXT_SERVICENOTAVAILABLE
+#define SV_STDTEXT_SERVICENOTAVAILABLE		10200
 #define SV_STDTEXT_DONTHINTAGAIN            10201
 #define SV_STDTEXT_DONTASKAGAIN             10202
 #define SV_STDTEXT_DONTWARNAGAIN            10203
@@ -199,20 +199,20 @@
 #define SV_STDTEXT_PREFERENCES              10205
 #define SV_MAC_SCREENNNAME                  10206
 #define SV_STDTEXT_ALLFILETYPES             10207
-#define SV_STDTEXT_LAST                     SV_STDTEXT_ALLFILETYPES
+#define SV_STDTEXT_LAST 					SV_STDTEXT_ALLFILETYPES
 
-#define SV_ACCESSERROR_FIRST                SV_ACCESSERROR_WRONG_VERSION
-#define SV_ACCESSERROR_WRONG_VERSION        10500
-#define SV_ACCESSERROR_BRIDGE_MSG           10501
+#define SV_ACCESSERROR_FIRST				SV_ACCESSERROR_WRONG_VERSION
+#define SV_ACCESSERROR_WRONG_VERSION		10500
+#define SV_ACCESSERROR_BRIDGE_MSG       	10501
 #define SV_ACCESSERROR_OK_CANCEL_MSG        10502
-#define SV_ACCESSERROR_MISSING_BRIDGE       10503
-#define SV_ACCESSERROR_FAULTY_JAVA          10504
-#define SV_ACCESSERROR_JAVA_MSG             10505
-#define SV_ACCESSERROR_MISSING_JAVA         10506
+#define SV_ACCESSERROR_MISSING_BRIDGE		10503
+#define SV_ACCESSERROR_FAULTY_JAVA			10504
+#define SV_ACCESSERROR_JAVA_MSG     		10505
+#define SV_ACCESSERROR_MISSING_JAVA		    10506
 #define SV_ACCESSERROR_JAVA_NOT_CONFIGURED  10507
 #define SV_ACCESSERROR_JAVA_DISABLED        10508
 #define SV_ACCESSERROR_TURNAROUND_MSG       10509
-#define SV_ACCESSERROR_LAST                 SV_ACCESSERROR_TURNAROUND_MSG
+#define SV_ACCESSERROR_LAST			    	SV_ACCESSERROR_TURNAROUND_MSG
 
 #define SV_SHORTCUT_HELP                    10600
 #define SV_SHORTCUT_CONTEXTHELP             10601
@@ -258,4 +258,4 @@
 
 #define HID_PRINTDLG                        HID_VCL_START
 
-#endif  // _SV_SVIDS_HRC
+#endif	// _SV_SVIDS_HRC
diff --git a/vcl/inc/vcl/symbol.hxx b/vcl/inc/vcl/symbol.hxx
index c7a745516856..39bfbedac6f5 100644
--- a/vcl/inc/vcl/symbol.hxx
+++ b/vcl/inc/vcl/symbol.hxx
@@ -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
@@ -36,46 +36,46 @@
 
 // By changes you must also change: rsc/vclrsc.hxx
 typedef USHORT SymbolType;
-#define SYMBOL_DONTKNOW         ((SymbolType)0)
-#define SYMBOL_IMAGE            ((SymbolType)1)
-#define SYMBOL_ARROW_UP         ((SymbolType)2)
-#define SYMBOL_ARROW_DOWN       ((SymbolType)3)
-#define SYMBOL_ARROW_LEFT       ((SymbolType)4)
-#define SYMBOL_ARROW_RIGHT      ((SymbolType)5)
-#define SYMBOL_SPIN_UP          ((SymbolType)6)
-#define SYMBOL_SPIN_DOWN        ((SymbolType)7)
-#define SYMBOL_SPIN_LEFT        ((SymbolType)8)
-#define SYMBOL_SPIN_RIGHT       ((SymbolType)9)
-#define SYMBOL_FIRST            ((SymbolType)10)
-#define SYMBOL_LAST             ((SymbolType)11)
-#define SYMBOL_PREV             ((SymbolType)12)
-#define SYMBOL_NEXT             ((SymbolType)13)
-#define SYMBOL_PAGEUP           ((SymbolType)14)
-#define SYMBOL_PAGEDOWN         ((SymbolType)15)
-#define SYMBOL_PLAY             ((SymbolType)16)
-#define SYMBOL_REVERSEPLAY      ((SymbolType)17)
-#define SYMBOL_RECORD           ((SymbolType)18)
-#define SYMBOL_STOP             ((SymbolType)19)
-#define SYMBOL_PAUSE            ((SymbolType)20)
-#define SYMBOL_WINDSTART        ((SymbolType)21)
-#define SYMBOL_WINDEND          ((SymbolType)22)
-#define SYMBOL_WINDBACKWARD     ((SymbolType)23)
-#define SYMBOL_WINDFORWARD      ((SymbolType)24)
-#define SYMBOL_CLOSE            ((SymbolType)25)
-#define SYMBOL_ROLLUP           ((SymbolType)26)
-#define SYMBOL_ROLLDOWN         ((SymbolType)27)
-#define SYMBOL_CHECKMARK        ((SymbolType)28)
-#define SYMBOL_RADIOCHECKMARK   ((SymbolType)29)
-#define SYMBOL_SPIN_UPDOWN      ((SymbolType)30)
-#define SYMBOL_FLOAT            ((SymbolType)31)
-#define SYMBOL_DOCK             ((SymbolType)32)
-#define SYMBOL_HIDE             ((SymbolType)33)
-#define SYMBOL_HELP             ((SymbolType)34)
-#define SYMBOL_OS2CLOSE         ((SymbolType)35)
-#define SYMBOL_OS2FLOAT         ((SymbolType)36)
-#define SYMBOL_OS2HIDE          ((SymbolType)37)
-#define SYMBOL_MENU             SYMBOL_SPIN_DOWN
+#define SYMBOL_DONTKNOW 		((SymbolType)0)
+#define SYMBOL_IMAGE			((SymbolType)1)
+#define SYMBOL_ARROW_UP 		((SymbolType)2)
+#define SYMBOL_ARROW_DOWN		((SymbolType)3)
+#define SYMBOL_ARROW_LEFT		((SymbolType)4)
+#define SYMBOL_ARROW_RIGHT		((SymbolType)5)
+#define SYMBOL_SPIN_UP			((SymbolType)6)
+#define SYMBOL_SPIN_DOWN		((SymbolType)7)
+#define SYMBOL_SPIN_LEFT		((SymbolType)8)
+#define SYMBOL_SPIN_RIGHT		((SymbolType)9)
+#define SYMBOL_FIRST			((SymbolType)10)
+#define SYMBOL_LAST 			((SymbolType)11)
+#define SYMBOL_PREV 			((SymbolType)12)
+#define SYMBOL_NEXT 			((SymbolType)13)
+#define SYMBOL_PAGEUP			((SymbolType)14)
+#define SYMBOL_PAGEDOWN 		((SymbolType)15)
+#define SYMBOL_PLAY 			((SymbolType)16)
+#define SYMBOL_REVERSEPLAY		((SymbolType)17)
+#define SYMBOL_RECORD			((SymbolType)18)
+#define SYMBOL_STOP 			((SymbolType)19)
+#define SYMBOL_PAUSE			((SymbolType)20)
+#define SYMBOL_WINDSTART		((SymbolType)21)
+#define SYMBOL_WINDEND			((SymbolType)22)
+#define SYMBOL_WINDBACKWARD 	((SymbolType)23)
+#define SYMBOL_WINDFORWARD		((SymbolType)24)
+#define SYMBOL_CLOSE			((SymbolType)25)
+#define SYMBOL_ROLLUP			((SymbolType)26)
+#define SYMBOL_ROLLDOWN 		((SymbolType)27)
+#define SYMBOL_CHECKMARK		((SymbolType)28)
+#define SYMBOL_RADIOCHECKMARK	((SymbolType)29)
+#define SYMBOL_SPIN_UPDOWN		((SymbolType)30)
+#define SYMBOL_FLOAT			((SymbolType)31)
+#define SYMBOL_DOCK 			((SymbolType)32)
+#define SYMBOL_HIDE 			((SymbolType)33)
+#define SYMBOL_HELP 			((SymbolType)34)
+#define SYMBOL_OS2CLOSE 		((SymbolType)35)
+#define SYMBOL_OS2FLOAT 		((SymbolType)36)
+#define SYMBOL_OS2HIDE			((SymbolType)37)
+#define SYMBOL_MENU 			SYMBOL_SPIN_DOWN
 
-#define SYMBOL_NOSYMBOL         (SYMBOL_DONTKNOW)
+#define SYMBOL_NOSYMBOL 		(SYMBOL_DONTKNOW)
 
 #endif // _SV_SYMBOL_HXX
diff --git a/vcl/inc/vcl/syschild.hxx b/vcl/inc/vcl/syschild.hxx
index da4ffcd51a22..ddf330456546 100644
--- a/vcl/inc/vcl/syschild.hxx
+++ b/vcl/inc/vcl/syschild.hxx
@@ -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,7 +56,7 @@ public:
                             SystemChildWindow( Window* pParent, const ResId& rResId );
                             ~SystemChildWindow();
 
-    const SystemEnvData*    GetSystemData() const;
+    const SystemEnvData*	GetSystemData() const;
 
     //  per default systemchildwindows erase their background for better plugin support
     //  however, this might not always be required
diff --git a/vcl/inc/vcl/sysdata.hxx b/vcl/inc/vcl/sysdata.hxx
index 1146f1b3b842..cf22c23c7c32 100644
--- a/vcl/inc/vcl/sysdata.hxx
+++ b/vcl/inc/vcl/sysdata.hxx
@@ -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
@@ -47,23 +47,23 @@ class NSView;
 
 struct SystemEnvData
 {
-    unsigned long       nSize;          // size in bytes of this structure
+    unsigned long		nSize;			// size in bytes of this structure
 #if defined( WNT ) || defined( OS2 )
-    HWND                hWnd;           // the window hwnd
+    HWND				hWnd;			// the window hwnd
 #elif defined( QUARTZ )
     NSView*               pView;          // the cocoa (NSView *) implementing this object
 #elif defined( UNX )
-    void*               pDisplay;       // the relevant display connection
-    long                aWindow;        // the window of the object
-    void*               pSalFrame;      // contains a salframe, if object has one
-    void*               pWidget;        // the corresponding widget
-    void*               pVisual;        // the visual in use
-    int             nScreen;        // the current screen of the window
-    int                 nDepth;         // depth of said visual
-    long                aColormap;      // the colormap being used
-    void*               pAppContext;    // the application context in use
-    long                aShellWindow;   // the window of the frame's shell
-    void*               pShellWidget;   // the frame's shell widget
+    void*				pDisplay;		// the relevant display connection
+    long				aWindow;		// the window of the object
+    void*				pSalFrame;		// contains a salframe, if object has one
+    void*				pWidget;		// the corresponding widget
+    void*				pVisual;		// the visual in use
+    int				nScreen;		// the current screen of the window
+    int					nDepth; 		// depth of said visual
+    long				aColormap;		// the colormap being used
+    void*				pAppContext;	// the application context in use
+    long				aShellWindow;	// the window of the frame's shell
+    void*				pShellWidget;	// the frame's shell widget
 #endif
 };
 
@@ -75,13 +75,13 @@ struct SystemEnvData
 
 struct SystemParentData
 {
-    unsigned long   nSize;            // size in bytes of this structure
+    unsigned long	nSize;			  // size in bytes of this structure
 #if defined( WNT ) || defined( OS2 )
-    HWND            hWnd;             // the window hwnd
+    HWND			hWnd;			  // the window hwnd
 #elif defined( QUARTZ )
     NSView*         pView;            // the cocoa (NSView *) implementing this object
 #elif defined( UNX )
-    long            aWindow;          // the window of the object
+    long		    aWindow;		  // the window of the object
     bool            bXEmbedSupport:1; // decides whether the object in question
                                       // should support the XEmbed protocol
 #endif
@@ -93,13 +93,13 @@ struct SystemParentData
 
 struct SystemMenuData
 {
-    unsigned long   nSize;          // size in bytes of this structure
+    unsigned long	nSize;			// size in bytes of this structure
 #if defined( WNT )
-    HMENU           hMenu;          // the menu handle of the menu bar
+    HMENU			hMenu;			// the menu handle of the menu bar
 #elif defined( QUARTZ )
     //not defined
 #elif defined( UNX )
-    long            aMenu;          // ???
+    long		    aMenu;		    // ???
 #endif
 };
 
@@ -109,19 +109,19 @@ struct SystemMenuData
 
 struct SystemGraphicsData
 {
-    unsigned long   nSize;          // size in bytes of this structure
+    unsigned long	nSize;			// size in bytes of this structure
 #if defined( WNT )
-    HDC             hDC;            // handle to a device context
+    HDC			    hDC;			// handle to a device context
 #elif defined( QUARTZ )
-    CGContextRef    rCGContext;     // QUARTZ graphic context
+    CGContextRef	rCGContext;		// QUARTZ graphic context
 #elif defined( UNX )
-    void*           pDisplay;       // the relevant display connection
-    long            hDrawable;      // a drawable
-    void*           pVisual;        // the visual in use
-    int         nScreen;        // the current screen of the drawable
-    int             nDepth;         // depth of said visual
-    long            aColormap;      // the colormap being used
-    void*           pRenderFormat;  // render format for drawable
+    void*			pDisplay;		// the relevant display connection
+    long		    hDrawable;      // a drawable
+    void*			pVisual;		// the visual in use
+    int			nScreen;		// the current screen of the drawable
+    int				nDepth; 		// depth of said visual
+    long			aColormap;		// the colormap being used
+    void*			pRenderFormat;  // render format for drawable
 #endif
 };
 
@@ -132,11 +132,11 @@ struct SystemGraphicsData
 
 struct SystemWindowData
 {
-    unsigned long   nSize;          // size in bytes of this structure
+    unsigned long	nSize;			// size in bytes of this structure
 #if defined( WNT )                  // meaningless on Windows
 #elif defined( QUARTZ )             // meaningless on Mac OS X / Quartz
 #elif defined( UNX )
-    void*           pVisual;        // the visual to be used
+    void*           pVisual;		// the visual to be used
 #endif
 };
 
@@ -159,10 +159,10 @@ struct SystemGlyphData
 
 struct SystemFontData
 {
-    unsigned long   nSize;          // size in bytes of this structure
+    unsigned long	nSize;			// size in bytes of this structure
 #if defined( WNT )
     HFONT           hFont;          // native font object
-#elif defined( QUARTZ )
+#elif defined( QUARTZ )             
     void*           aATSUFontID;    // native font object
 #elif defined( UNX )
     void*           nFontId;        // native font id
@@ -173,14 +173,14 @@ struct SystemFontData
     bool            bAntialias;     // Should this font be antialiased
     bool            bVerticalCharacterType;      // Is the font using vertical character type
 };
-
+    
 // --------------------
 // - SystemTextLayoutData -
 // --------------------
 
 struct SystemTextLayoutData
 {
-    unsigned long   nSize;                      // size in bytes of this structure
+    unsigned long	nSize;                      // size in bytes of this structure
     std::vector<SystemGlyphData> rGlyphData;    // glyph data
     int             orientation;                // Text orientation
     SystemFontData aSysFontData;                // Font data for the text layout
diff --git a/vcl/inc/vcl/syswin.hxx b/vcl/inc/vcl/syswin.hxx
index b3a7d9b8775e..c341c7d4e834 100644
--- a/vcl/inc/vcl/syswin.hxx
+++ b/vcl/inc/vcl/syswin.hxx
@@ -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
@@ -58,7 +58,7 @@ class TaskPaneList;
 #define ICON_MATH_DOCUMENT              15
 #define ICON_TEMPLATE                   16
 #define ICON_MACROLIBRARY               17
-#define ICON_PLAYER                     100
+#define	ICON_PLAYER						100
 #define ICON_SETUP                      500
 
 // -------------------
@@ -178,7 +178,7 @@ private:
     // Copy assignment is forbidden and not implemented.
     SystemWindow (const SystemWindow &);
     SystemWindow & operator= (const SystemWindow &);
-
+    
     SAL_DLLPRIVATE void ImplMoveToScreen( long& io_rX, long& io_rY, long i_nWidth, long i_nHeight, Window* i_pConfigureWin );
 
 protected:
@@ -238,34 +238,34 @@ public:
     void            SetMenuBarMode( USHORT nMode );
     USHORT          GetMenuBarMode() const { return mnMenuBarMode; }
 
-    TaskPaneList*   GetTaskPaneList();
+    TaskPaneList*	GetTaskPaneList();
     void            GetWindowStateData( WindowStateData& rData ) const;
-
+    
     /**
     Returns the screen number the window is on
-
+    
     The screen number is counted the same way that
     <code>Application::GetScreenPosSizePixel</code>,
     <code>Application::GetWorkAreaPosSizePixel</code>,
     <code>Application::GetScreenName</code>
     and of course <code>SystemWindow::SetScreenNumber</code>
     are counted in.
-
+    
     In case the window is positioned on multiple screens the
     screen number returned will be of the screen containing the
     upper left pixel of the frame area (that is of the client
     area on system decorated windows, or the frame area of
     undecorated resp. owner decorated windows.
-
+    
     @returns the screen number
-
+    
     @see SystemWindow::SetScreenNumber
     */
     unsigned int    GetScreenNumber() const;
     /**
     Move the Window to a new screen. The same rules for
     positioning apply as in <code>SystemWindow::GetScreenNumber</code>
-
+    
     The screen number is counted the same way that
     <code>Application::GetScreenPosSizePixel</code>,
     <code>Application::GetWorkAreaPosSizePixel</code>,
diff --git a/vcl/inc/vcl/tabctrl.hxx b/vcl/inc/vcl/tabctrl.hxx
index 4c63b12f15fe..da4014bc809a 100644
--- a/vcl/inc/vcl/tabctrl.hxx
+++ b/vcl/inc/vcl/tabctrl.hxx
@@ -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
@@ -90,10 +90,10 @@ private:
     SAL_DLLPRIVATE void         ImplSetFirstPagePos( USHORT nPagePos );
     SAL_DLLPRIVATE void         ImplShowFocus();
     SAL_DLLPRIVATE void         ImplDrawItem( ImplTabItem* pItem, const Rectangle& rCurRect, bool bLayout = false, bool bFirstInGroup = false, bool bLastInGroup = false, bool bIsCurrentItem = false );
-    SAL_DLLPRIVATE void         ImplPaint( const Rectangle& rRect, bool bLayout = false );
-    SAL_DLLPRIVATE void         ImplFreeLayoutData();
-    SAL_DLLPRIVATE long         ImplHandleKeyEvent( const KeyEvent& rKeyEvent );
-
+    SAL_DLLPRIVATE void			ImplPaint( const Rectangle& rRect, bool bLayout = false );
+    SAL_DLLPRIVATE void			ImplFreeLayoutData();
+    SAL_DLLPRIVATE long			ImplHandleKeyEvent( const KeyEvent& rKeyEvent );
+   
     DECL_DLLPRIVATE_LINK(       ImplScrollBtnHdl, PushButton* pBtn );
     DECL_DLLPRIVATE_LINK(       ImplListBoxSelectHdl, ListBox* );
     DECL_DLLPRIVATE_LINK(       ImplWindowEventListener, VclSimpleEvent* );
@@ -104,7 +104,7 @@ protected:
     SAL_DLLPRIVATE void         ImplInit( Window* pParent, WinBits nStyle );
     SAL_DLLPRIVATE void         ImplLoadRes( const ResId& rResId );
 
-    virtual void                FillLayoutData() const;
+    virtual void		        FillLayoutData() const;
     virtual const Font&         GetCanonicalFont( const StyleSettings& _rStyle ) const;
     virtual const Color&        GetCanonicalTextColor( const StyleSettings& _rStyle ) const;
     SAL_DLLPRIVATE Rectangle*   ImplFindPartRect( const Point& rPt );
@@ -179,7 +179,7 @@ public:
 
     void                SetHelpId( USHORT nPageId, ULONG nHelpId );
     ULONG               GetHelpId( USHORT nPageId ) const;
-
+    
     void                SetPageImage( USHORT nPageId, const Image& rImage );
     const Image*        GetPageImage( USHORT nPageId ) const;
 
diff --git a/vcl/inc/vcl/tabdlg.hxx b/vcl/inc/vcl/tabdlg.hxx
index 35543bb6aac0..2084bbf6b557 100644
--- a/vcl/inc/vcl/tabdlg.hxx
+++ b/vcl/inc/vcl/tabdlg.hxx
@@ -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
@@ -42,13 +42,13 @@ class TabControl;
 class VCL_DLLPUBLIC TabDialog : public Dialog
 {
 private:
-    FixedLine*          mpFixedLine;
-    Window*             mpViewWindow;
-    WindowAlign         meViewAlign;
-    BOOL                mbPosControls;
+    FixedLine*			mpFixedLine;
+    Window* 			mpViewWindow;
+    WindowAlign 		meViewAlign;
+    BOOL				mbPosControls;
 
-    SAL_DLLPRIVATE void ImplInitTabDialogData();
-    SAL_DLLPRIVATE void ImplPosControls();
+    SAL_DLLPRIVATE void	ImplInitTabDialogData();
+    SAL_DLLPRIVATE void	ImplPosControls();
 
 public:
                         TabDialog( Window* pParent,
@@ -56,15 +56,15 @@ public:
                         TabDialog( Window* pParent, const ResId& rResId );
                         ~TabDialog();
 
-    virtual void        Resize();
-    virtual void        StateChanged( StateChangedType nStateChange );
-
-    void                AdjustLayout();
+    virtual void		Resize();
+    virtual void		StateChanged( StateChangedType nStateChange );
+    
+    void				AdjustLayout();
 
-    void                SetViewWindow( Window* pWindow ) { mpViewWindow = pWindow; }
-    Window*             GetViewWindow() const { return mpViewWindow; }
-    void                SetViewAlign( WindowAlign eAlign ) { meViewAlign = eAlign; }
-    WindowAlign         GetViewAlign() const { return meViewAlign; }
+    void				SetViewWindow( Window* pWindow ) { mpViewWindow = pWindow; }
+    Window* 			GetViewWindow() const { return mpViewWindow; }
+    void				SetViewAlign( WindowAlign eAlign ) { meViewAlign = eAlign; }
+    WindowAlign 		GetViewAlign() const { return meViewAlign; }
 };
 
-#endif  // _SV_TABDLG_HXX
+#endif	// _SV_TABDLG_HXX
diff --git a/vcl/inc/vcl/tabpage.hxx b/vcl/inc/vcl/tabpage.hxx
index c653ccca5a30..ce1627a5ffab 100644
--- a/vcl/inc/vcl/tabpage.hxx
+++ b/vcl/inc/vcl/tabpage.hxx
@@ -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
@@ -40,8 +40,8 @@ class VCL_DLLPUBLIC TabPage : public Window
 {
 private:
     using Window::ImplInit;
-    SAL_DLLPRIVATE void ImplInit( Window* pParent, WinBits nStyle );
-    SAL_DLLPRIVATE void ImplInitSettings();
+    SAL_DLLPRIVATE void	ImplInit( Window* pParent, WinBits nStyle );
+    SAL_DLLPRIVATE void	ImplInitSettings();
 
 public:
                     TabPage( Window* pParent, WinBits nStyle = 0 );
@@ -50,13 +50,13 @@ public:
     virtual void    Paint( const Rectangle& rRect );
     virtual void    Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, ULONG nFlags );
 
-    virtual void    StateChanged( StateChangedType nStateChange );
-    virtual void    DataChanged( const DataChangedEvent& rDCEvt );
+    virtual void	StateChanged( StateChangedType nStateChange );
+    virtual void	DataChanged( const DataChangedEvent& rDCEvt );
 
-    virtual void    ActivatePage();
-    virtual void    DeactivatePage();
+    virtual void	ActivatePage();
+    virtual void	DeactivatePage();
 
     virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > CreateAccessible();
 };
 
-#endif  // _SV_TABPAGE_HXX
+#endif	// _SV_TABPAGE_HXX
diff --git a/vcl/inc/vcl/taskpanelist.hxx b/vcl/inc/vcl/taskpanelist.hxx
index 33d75d7e31bd..13cd2b66f61b 100644
--- a/vcl/inc/vcl/taskpanelist.hxx
+++ b/vcl/inc/vcl/taskpanelist.hxx
@@ -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
diff --git a/vcl/inc/vcl/textlayout.hxx b/vcl/inc/vcl/textlayout.hxx
index 418e1aa8bf64..fe9479b7d786 100644
--- a/vcl/inc/vcl/textlayout.hxx
+++ b/vcl/inc/vcl/textlayout.hxx
@@ -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
diff --git a/vcl/inc/vcl/threadex.hxx b/vcl/inc/vcl/threadex.hxx
index 1b48b5d63c9c..284680f31abf 100644
--- a/vcl/inc/vcl/threadex.hxx
+++ b/vcl/inc/vcl/threadex.hxx
@@ -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
@@ -40,9 +40,9 @@ namespace vcl
 {
     class VCL_DLLPUBLIC ThreadExecutor
     {
-        oslThread               m_aThread;
-        oslCondition            m_aFinish;
-        long                    m_nReturn;
+        oslThread				m_aThread;
+        oslCondition			m_aFinish;
+        long					m_nReturn;
 
     #ifdef THREADEX_IMPLEMENTATION
     public:
@@ -59,8 +59,8 @@ namespace vcl
     class VCL_DLLPUBLIC SolarThreadExecutor
     {
         oslCondition            m_aStart;
-        oslCondition            m_aFinish;
-        long                    m_nReturn;
+        oslCondition			m_aFinish;
+        long					m_nReturn;
         bool                    m_bTimeout;
 
         DECL_DLLPRIVATE_LINK( worker, void* );
diff --git a/vcl/inc/vcl/timer.hxx b/vcl/inc/vcl/timer.hxx
index bb325c118844..5b20f97234a1 100644
--- a/vcl/inc/vcl/timer.hxx
+++ b/vcl/inc/vcl/timer.hxx
@@ -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
@@ -51,7 +51,7 @@ protected:
 public:
                     Timer();
                     Timer( const Timer& rTimer );
-    virtual         ~Timer();
+    virtual			~Timer();
 
     virtual void    Timeout();
 
diff --git a/vcl/inc/vcl/toolbox.h b/vcl/inc/vcl/toolbox.h
index 33e4e8d2e013..8d8a16652610 100644
--- a/vcl/inc/vcl/toolbox.h
+++ b/vcl/inc/vcl/toolbox.h
@@ -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
@@ -58,28 +58,28 @@ class Window;
 
 struct ImplToolItem
 {
-    Window*             mpWindow;
-    void*               mpUserData;
-    Image               maImage;
-    Image               maHighImage;
-    long                mnImageAngle;
-    bool                mbMirrorMode;
-    XubString           maText;
-    XubString           maQuickHelpText;
-    XubString           maHelpText;
-    String              maCommandStr;
-    ULONG               mnHelpId;
-    Rectangle           maRect;
-    Rectangle           maCalcRect;
+    Window* 			mpWindow;
+    void*				mpUserData;
+    Image				maImage;
+    Image				maHighImage;
+    long				mnImageAngle;
+    bool				mbMirrorMode;
+    XubString			maText;
+    XubString			maQuickHelpText;
+    XubString			maHelpText;
+    String				maCommandStr;
+    ULONG				mnHelpId;
+    Rectangle			maRect;
+    Rectangle			maCalcRect;
     // the overall horizontal item size, including one or more of [image size + textlength + dropdown arrow]
-    Size                maItemSize;
-    long                mnSepSize;
+    Size                maItemSize;     
+    long				mnSepSize;
     long                mnDropDownArrowWidth;
-    ToolBoxItemType     meType;
-    ToolBoxItemBits     mnBits;
-    TriState            meState;
-    USHORT              mnId;
-    BOOL                mbEnabled:1,
+    ToolBoxItemType 	meType;
+    ToolBoxItemBits 	mnBits;
+    TriState			meState;
+    USHORT				mnId;
+    BOOL				mbEnabled:1,
                         mbVisible:1,
                         mbEmptyBtn:1,
                         mbShowWindow:1,
@@ -103,7 +103,7 @@ struct ImplToolItem
     // the default size is the precomputed size for standard items
     // ie those that are just ordinary buttons (no windows or text etc.)
     // bCheckMaxWidth indicates that item windows must not exceed maxWidth in which case they will be painted as buttons
-    Size                GetSize( BOOL bHorz, BOOL bCheckMaxWidth, long maxWidth, const Size& rDefaultSize );
+    Size                GetSize( BOOL bHorz, BOOL bCheckMaxWidth, long maxWidth, const Size& rDefaultSize );  
 
     // only useful for buttons: returns if the text or image part or both can be drawn according to current button drawing style
     void DetermineButtonDrawStyle( ButtonType eButtonType, BOOL& rbImage, BOOL& rbText ) const;
@@ -122,8 +122,8 @@ namespace vcl
 
 struct ToolBoxLayoutData : public ControlLayoutData
 {
-    std::vector< USHORT >               m_aLineItemIds;
-    std::vector< USHORT >               m_aLineItemPositions;
+    std::vector< USHORT >				m_aLineItemIds;
+    std::vector< USHORT >				m_aLineItemPositions;
 };
 
 
@@ -132,8 +132,8 @@ struct ToolBoxLayoutData : public ControlLayoutData
 
 struct ImplToolBoxPrivateData
 {
-    vcl::ToolBoxLayoutData*         m_pLayoutData;
-    std::vector< ImplToolItem >     m_aItems;
+    vcl::ToolBoxLayoutData*			m_pLayoutData;
+    std::vector< ImplToolItem >		m_aItems;
 
     ImplToolBoxPrivateData();
     ~ImplToolBoxPrivateData();
@@ -142,7 +142,7 @@ struct ImplToolBoxPrivateData
 
     // called when dropdown items are clicked
     Link    maDropdownClickHdl;
-    Timer   maDropdownTimer; // for opening dropdown items on "long click"
+    Timer	maDropdownTimer; // for opening dropdown items on "long click"
 
     // large or small buttons ?
     ToolBoxButtonSize   meButtonSize;
@@ -153,14 +153,14 @@ struct ImplToolBoxPrivateData
     ULONG       mnEventId;
 
     // called when menu button is clicked and before the popup menu is executed
-    Link        maMenuButtonHdl;
+    Link        maMenuButtonHdl; 
 
     // a dummy item representing the custom menu button
     ImplToolItem   maMenubuttonItem;
     long           mnMenuButtonWidth;
-
+    
     Wallpaper   maDisplayBackground;
-
+    
     // support for highcontrast
     vcl::IImageListProvider* mpImageListProvider;
     vcl::ImageListType       meImageListType;
@@ -169,8 +169,8 @@ struct ImplToolBoxPrivateData
             mbAssumeDocked:1,       // only used during calculations to override current floating/popup mode
             mbAssumeFloating:1,
             mbAssumePopupMode:1,
-            mbKeyInputDisabled:1,   // no KEY input if all items disabled, closing/docking will be allowed though
-            mbIsPaintLocked:1,      // don't allow paints
+            mbKeyInputDisabled:1,	// no KEY input if all items disabled, closing/docking will be allowed though
+            mbIsPaintLocked:1,		// don't allow paints
             mbMenubuttonSelected:1, // menu button is highlighted
             mbPageScroll:1,         // determines if we scroll a page at a time
             mbNativeButtons:1,      // system supports native toolbar buttons
@@ -179,4 +179,4 @@ struct ImplToolBoxPrivateData
 };
 
 
-#endif  // _SV_TOOLBOX_H
+#endif	// _SV_TOOLBOX_H
diff --git a/vcl/inc/vcl/toolbox.hxx b/vcl/inc/vcl/toolbox.hxx
index 5cc102842dc3..bc32ba90b029 100644
--- a/vcl/inc/vcl/toolbox.hxx
+++ b/vcl/inc/vcl/toolbox.hxx
@@ -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
@@ -169,8 +169,8 @@ class VCL_DLLPUBLIC ToolBox : public DockingWindow
     friend class ImplTBDragMgr;
 
 private:
-    ImplToolBoxPrivateData*     mpData;
-    VirtualDevice*              mpBtnDev; // TODO: remove unused member
+    ImplToolBoxPrivateData*		mpData;
+    VirtualDevice*      		mpBtnDev; // TODO: remove unused member
     ImplToolSizeArray*  mpFloatSizeAry;
     XubString           maCvtStr;
     XubString           maNextToolBoxStr;
@@ -198,7 +198,7 @@ private:
     long                mnLastResizeDY;
     long                mnActivateCount;
     USHORT              mnLastFocusItemId;
-    USHORT              mnFocusPos;
+    USHORT				mnFocusPos;
     USHORT              mnOutStyle;
     USHORT              mnHighItemId;
     USHORT              mnCurItemId;
@@ -271,8 +271,8 @@ private:
     SAL_DLLPRIVATE const XubString& ImplConvertMenuString( const XubString& rStr );
     SAL_DLLPRIVATE BOOL            ImplHandleMouseMove( const MouseEvent& rMEvt, BOOL bRepeat = FALSE );
     SAL_DLLPRIVATE BOOL            ImplHandleMouseButtonUp( const MouseEvent& rMEvt, BOOL bCancel = FALSE );
-    SAL_DLLPRIVATE void            ImplChangeHighlight( ImplToolItem* pItem, BOOL bNoGrabFocus = FALSE );
-    SAL_DLLPRIVATE BOOL            ImplChangeHighlightUpDn( BOOL bUp, BOOL bNoCycle = FALSE );
+    SAL_DLLPRIVATE void			   ImplChangeHighlight( ImplToolItem* pItem, BOOL bNoGrabFocus = FALSE );
+    SAL_DLLPRIVATE BOOL			   ImplChangeHighlightUpDn( BOOL bUp, BOOL bNoCycle = FALSE );
     SAL_DLLPRIVATE USHORT          ImplGetItemLine( ImplToolItem* pCurrentItem );
     SAL_DLLPRIVATE ImplToolItem*   ImplGetFirstValidItem( USHORT nLine );
     SAL_DLLPRIVATE ImplToolItem*   ImplGetLastValidItem( USHORT nLine );
@@ -280,8 +280,8 @@ private:
     SAL_DLLPRIVATE BOOL            ImplActivateItem( KeyCode aKeyCode );
     SAL_DLLPRIVATE void            ImplShowFocus();
     SAL_DLLPRIVATE void            ImplHideFocus();
-    SAL_DLLPRIVATE void            ImplUpdateInputEnable();
-    SAL_DLLPRIVATE void            ImplFillLayoutData() const;
+    SAL_DLLPRIVATE void			   ImplUpdateInputEnable();
+    SAL_DLLPRIVATE void			   ImplFillLayoutData() const;
     SAL_DLLPRIVATE void            ImplUpdateCustomMenu();
     SAL_DLLPRIVATE BOOL            ImplHasClippedItems();
     SAL_DLLPRIVATE Point           ImplGetPopupPosition( const Rectangle& rRect, const Size& rSize ) const;
@@ -413,7 +413,7 @@ public:
     void                RecalcItems();
 
     const ImageList&    GetImageList() const { return maImageList; }
-    void                SetImageList( const ImageList& rImageList );
+    void				SetImageList( const ImageList& rImageList );
 
     void                SetButtonType( ButtonType eNewType = BUTTON_SYMBOL );
     ButtonType          GetButtonType() const { return meButtonType; }
@@ -458,7 +458,7 @@ public:
     USHORT              GetDownItemId() const { return mnDownItemId; }
     USHORT              GetClicks() const { return mnMouseClicks; }
     USHORT              GetModifier() const { return mnMouseModifier; }
-    USHORT              GetKeyModifier() const { return mnKeyModifier; }
+    USHORT				GetKeyModifier() const { return mnKeyModifier; }
 
     void                SetItemBits( USHORT nItemId, ToolBoxItemBits nBits );
     ToolBoxItemBits     GetItemBits( USHORT nItemId ) const;
@@ -467,10 +467,10 @@ public:
     void*               GetItemData( USHORT nItemId ) const;
     void                SetItemImage( USHORT nItemId, const Image& rImage );
     Image               GetItemImage( USHORT nItemId ) const;
-    void                SetItemImageAngle( USHORT nItemId, long nAngle10 );
-    long                GetItemImageAngle( USHORT nItemId ) const;
-    void                SetItemImageMirrorMode( USHORT nItemId, BOOL bMirror );
-    BOOL                GetItemImageMirrorMode( USHORT ) const;
+    void				SetItemImageAngle( USHORT nItemId, long nAngle10 );
+    long				GetItemImageAngle( USHORT nItemId ) const;
+    void				SetItemImageMirrorMode( USHORT nItemId, BOOL bMirror );
+    BOOL				GetItemImageMirrorMode( USHORT ) const;
     void                SetItemHighImage( USHORT nItemId, const Image& rImage );
     Image               GetItemHighImage( USHORT nItemId ) const;
     void                SetItemText( USHORT nItemId, const XubString& rText );
diff --git a/vcl/inc/vcl/unobrok.hxx b/vcl/inc/vcl/unobrok.hxx
index af616e80351a..36bcc3462128 100644
--- a/vcl/inc/vcl/unobrok.hxx
+++ b/vcl/inc/vcl/unobrok.hxx
@@ -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
@@ -36,4 +36,4 @@ namespace vcl_accept
     sal_Bool accept(const ::rtl::OUString & accDcp, const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory> & rSMgr);
 }
 
-#endif  // _UNOBROK_HXX
+#endif	// _UNOBROK_HXX
diff --git a/vcl/inc/vcl/unohelp.hxx b/vcl/inc/vcl/unohelp.hxx
index 5d98b6872a26..6c239bd678d2 100644
--- a/vcl/inc/vcl/unohelp.hxx
+++ b/vcl/inc/vcl/unohelp.hxx
@@ -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
@@ -41,7 +41,7 @@ namespace i18n {
     class XCollator;
 }
 namespace lang {
-    class XMultiServiceFactory;
+    class XMultiServiceFactory; 
 }
 }}}
 
@@ -49,7 +49,7 @@ namespace com {
 namespace sun {
 namespace star {
 namespace accessibility {
-    struct AccessibleEventObject;
+    struct AccessibleEventObject; 
 }
 }}}
 
@@ -64,7 +64,7 @@ namespace unohelper
 ::com::sun::star::uno::Reference < ::com::sun::star::i18n::XCollator > VCL_DLLPUBLIC CreateCollator();
 ::rtl::OUString VCL_DLLPUBLIC CreateLibraryName( const sal_Char* pModName, sal_Bool bSUPD );
 void VCL_DLLPUBLIC NotifyAccessibleStateEventGlobally( const ::com::sun::star::accessibility::AccessibleEventObject& rEventObject );
-}}  // namespace vcl::unohelper
+}}	// namespace vcl::unohelper
 
 #endif  // _VCL_UNOHELP_HXX
 
diff --git a/vcl/inc/vcl/unohelp2.hxx b/vcl/inc/vcl/unohelp2.hxx
index e7d8d34e0595..406d77c42cbd 100644
--- a/vcl/inc/vcl/unohelp2.hxx
+++ b/vcl/inc/vcl/unohelp2.hxx
@@ -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
@@ -45,18 +45,18 @@ namespace vcl { namespace unohelper {
                             public ::cppu::OWeakObject
     {
     private:
-        String          maText;
+        String			maText;
 
-    public:
+    public:	
                         TextDataObject( const String& rText );
                         ~TextDataObject();
 
-        String&         GetString() { return maText; }
+        String&			GetString()	{ return maText; }
 
         // ::com::sun::star::uno::XInterface
-        ::com::sun::star::uno::Any                  SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException);
-        void                                        SAL_CALL acquire() throw()  { OWeakObject::acquire(); }
-        void                                        SAL_CALL release() throw()  { OWeakObject::release(); }
+        ::com::sun::star::uno::Any					SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException);
+        void										SAL_CALL acquire() throw()	{ OWeakObject::acquire(); }
+        void										SAL_CALL release() throw()	{ OWeakObject::release(); }
 
         // ::com::sun::star::datatransfer::XTransferable
         ::com::sun::star::uno::Any SAL_CALL getTransferData( const ::com::sun::star::datatransfer::DataFlavor& aFlavor ) throw(::com::sun::star::datatransfer::UnsupportedFlavorException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException);
@@ -78,7 +78,7 @@ namespace vcl { namespace unohelper {
             ::osl::Mutex& GetMutex() { return maMutex; }
     };
 
-}}  // namespace vcl::unohelper
+}}	// namespace vcl::unohelper
 
 #endif  // _VCL_UNOHELP2_HXX
 
diff --git a/vcl/inc/vcl/unowrap.hxx b/vcl/inc/vcl/unowrap.hxx
index b11842aa0c6b..ac091a640927 100644
--- a/vcl/inc/vcl/unowrap.hxx
+++ b/vcl/inc/vcl/unowrap.hxx
@@ -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
@@ -33,17 +33,17 @@
 #include <com/sun/star/uno/Reference.h>
 
 class XWindowPeer;
-class XToolkit;
-class XVclToolkit;
-class EventList;
+class XToolkit; 
+class XVclToolkit; 
+class EventList; 
 class Window;
-class OutputDevice;
+class OutputDevice; 
 class MouseEvent;
 class CommandEvent;
 class KeyEvent;
 class Rectangle;
 class XVclComponentPeer;
-class Menu;
+class Menu; 
 
 namespace com {
 namespace sun {
@@ -67,25 +67,25 @@ namespace accessibility {
 
 class VCL_DLLPUBLIC UnoWrapperBase
 {
-public:
-    virtual void                Destroy() = 0;
+public:	
+    virtual void 				Destroy() = 0;
 
     // Toolkit
     virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XToolkit > GetVCLToolkit() = 0;
 
     // Graphics
-    virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XGraphics >    CreateGraphics( OutputDevice* pOutDev ) = 0;
-    virtual void                ReleaseAllGraphics( OutputDevice* pOutDev ) = 0;
+    virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XGraphics >	CreateGraphics( OutputDevice* pOutDev ) = 0;
+    virtual void				ReleaseAllGraphics( OutputDevice* pOutDev ) = 0;
 
     // Window
     virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer> GetWindowInterface( Window* pWindow, sal_Bool bCreate ) = 0;
-    virtual void                SetWindowInterface( Window* pWindow, ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer > xIFace ) = 0;
+    virtual void				SetWindowInterface( Window* pWindow, ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer > xIFace ) = 0;
 
-    virtual void                WindowDestroyed( Window* pWindow ) = 0;
+    virtual void				WindowDestroyed( Window* pWindow ) = 0;
 
     // Accessibility
     virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >
                                 CreateAccessible( Menu* pMenu, sal_Bool bIsMenuBar ) = 0;
 };
 
-#endif  // _VCL_UNOWRAP_HXX
+#endif	// _VCL_UNOWRAP_HXX
diff --git a/vcl/inc/vcl/vclenum.hxx b/vcl/inc/vcl/vclenum.hxx
index a34c633479e7..815294191587 100644
--- a/vcl/inc/vcl/vclenum.hxx
+++ b/vcl/inc/vcl/vclenum.hxx
@@ -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
@@ -66,13 +66,13 @@ enum ExtDateFieldFormat { XTDATEF_SYSTEM_SHORT, XTDATEF_SYSTEM_SHORT_YY, XTDATEF
 // ------------------------------------------------------------
 
 // to avoid conflicts with enum's declared otherwise
-#define GRADIENT_LINEAR             GradientStyle_LINEAR
-#define GRADIENT_AXIAL              GradientStyle_AXIAL
-#define GRADIENT_RADIAL             GradientStyle_RADIAL
-#define GRADIENT_ELLIPTICAL         GradientStyle_ELLIPTICAL
-#define GRADIENT_SQUARE             GradientStyle_SQUARE
-#define GRADIENT_RECT               GradientStyle_RECT
-#define GRADIENT_FORCE_EQUAL_SIZE   GradientStyle_FORCE_EQUAL_SIZE
+#define GRADIENT_LINEAR 			GradientStyle_LINEAR
+#define GRADIENT_AXIAL				GradientStyle_AXIAL
+#define GRADIENT_RADIAL 			GradientStyle_RADIAL
+#define GRADIENT_ELLIPTICAL 		GradientStyle_ELLIPTICAL
+#define GRADIENT_SQUARE 			GradientStyle_SQUARE
+#define GRADIENT_RECT				GradientStyle_RECT
+#define GRADIENT_FORCE_EQUAL_SIZE	GradientStyle_FORCE_EQUAL_SIZE
 
 #ifndef ENUM_GRADIENTSTYLE_DECLARED
 #define ENUM_GRADIENTSTYLE_DECLARED
@@ -93,10 +93,10 @@ enum GradientStyle
 // ------------------------------------------------------------
 
 // to avoid conflicts with enum's declared otherwise
-#define HATCH_SINGLE            HatchStyle_SINGLE
-#define HATCH_DOUBLE            HatchStyle_DOUBLE
-#define HATCH_TRIPLE            HatchStyle_TRIPLE
-#define HATCH_FORCE_EQUAL_SIZE  HatchStyle_FORCE_EQUAL_SIZE
+#define HATCH_SINGLE			HatchStyle_SINGLE
+#define HATCH_DOUBLE			HatchStyle_DOUBLE
+#define HATCH_TRIPLE			HatchStyle_TRIPLE
+#define HATCH_FORCE_EQUAL_SIZE	HatchStyle_FORCE_EQUAL_SIZE
 
 #ifndef ENUM_HATCHSTYLE_DECLARED
 #define ENUM_HATCHSTYLE_DECLARED
@@ -114,10 +114,10 @@ enum HatchStyle
 // ------------------------------------------------------------
 
 // to avoid conflicts with enum's declared otherwise
-#define LINE_NONE               LineStyle_NONE
-#define LINE_SOLID              LineStyle_SOLID
-#define LINE_DASH               LineStyle_DASH
-#define LINE_FORCE_EQUAL_SIZE   LineStyle_FORCE_EQUAL_SIZE
+#define LINE_NONE				LineStyle_NONE
+#define LINE_SOLID				LineStyle_SOLID
+#define LINE_DASH				LineStyle_DASH
+#define LINE_FORCE_EQUAL_SIZE	LineStyle_FORCE_EQUAL_SIZE
 
 #ifndef ENUM_LINESTYLE_DECLARED
 #define ENUM_LINESTYLE_DECLARED
@@ -240,20 +240,20 @@ enum FontStrikeout { STRIKEOUT_NONE, STRIKEOUT_SINGLE, STRIKEOUT_DOUBLE,
 #define ENUM_FONTEMPHASISMARK_DECLARED
 
 typedef USHORT FontEmphasisMark;
-#define EMPHASISMARK_NONE           ((FontEmphasisMark)0x0000)
-#define EMPHASISMARK_DOT            ((FontEmphasisMark)0x0001)
-#define EMPHASISMARK_CIRCLE         ((FontEmphasisMark)0x0002)
-#define EMPHASISMARK_DISC           ((FontEmphasisMark)0x0003)
-#define EMPHASISMARK_ACCENT         ((FontEmphasisMark)0x0004)
-#define EMPHASISMARK_STYLE          ((FontEmphasisMark)0x00FF)
-#define EMPHASISMARK_POS_ABOVE      ((FontEmphasisMark)0x1000)
-#define EMPHASISMARK_POS_BELOW      ((FontEmphasisMark)0x2000)
+#define EMPHASISMARK_NONE			((FontEmphasisMark)0x0000)
+#define EMPHASISMARK_DOT			((FontEmphasisMark)0x0001)
+#define EMPHASISMARK_CIRCLE 		((FontEmphasisMark)0x0002)
+#define EMPHASISMARK_DISC			((FontEmphasisMark)0x0003)
+#define EMPHASISMARK_ACCENT 		((FontEmphasisMark)0x0004)
+#define EMPHASISMARK_STYLE			((FontEmphasisMark)0x00FF)
+#define EMPHASISMARK_POS_ABOVE		((FontEmphasisMark)0x1000)
+#define EMPHASISMARK_POS_BELOW		((FontEmphasisMark)0x2000)
 
 // Only for kompability
-#define EMPHASISMARK_DOTS_ABOVE     (EMPHASISMARK_DOT | EMPHASISMARK_POS_ABOVE)
-#define EMPHASISMARK_DOTS_BELOW     (EMPHASISMARK_DOT | EMPHASISMARK_POS_BELOW)
-#define EMPHASISMARK_SIDE_DOTS      (EMPHASISMARK_ACCENT | EMPHASISMARK_POS_ABOVE)
-#define EMPHASISMARK_CIRCLE_ABOVE   (EMPHASISMARK_CIRCLE | EMPHASISMARK_POS_ABOVE)
+#define EMPHASISMARK_DOTS_ABOVE 	(EMPHASISMARK_DOT | EMPHASISMARK_POS_ABOVE)
+#define EMPHASISMARK_DOTS_BELOW 	(EMPHASISMARK_DOT | EMPHASISMARK_POS_BELOW)
+#define EMPHASISMARK_SIDE_DOTS		(EMPHASISMARK_ACCENT | EMPHASISMARK_POS_ABOVE)
+#define EMPHASISMARK_CIRCLE_ABOVE	(EMPHASISMARK_CIRCLE | EMPHASISMARK_POS_ABOVE)
 
 #endif
 
@@ -316,7 +316,7 @@ enum KeyFuncType { KEYFUNC_DONTKNOW, KEYFUNC_NEW, KEYFUNC_OPEN, KEYFUNC_SAVE,
 
 #endif
 
-typedef sal_uInt32 sal_UCS4;    // TODO: this should be moved to rtl
+typedef sal_uInt32 sal_UCS4;	// TODO: this should be moved to rtl
 
 #ifndef ENUM_OUTDEVSUPPORT_DECLARED
 #define ENUM_OUTDEVSUPPORT_DECLARED
@@ -325,4 +325,4 @@ enum OutDevSupportType { OutDevSupport_TransparentRect, OutDevSupport_B2DClip, O
 
 #endif
 
-#endif  // _VCL_VCLENUM_HXX
+#endif	// _VCL_VCLENUM_HXX
diff --git a/vcl/inc/vcl/vclevent.hxx b/vcl/inc/vcl/vclevent.hxx
index 8ccb880fce34..b54977e4a35f 100644
--- a/vcl/inc/vcl/vclevent.hxx
+++ b/vcl/inc/vcl/vclevent.hxx
@@ -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
@@ -108,14 +108,14 @@ namespace com { namespace sun { namespace star {
 #define VCLEVENT_LISTBOX_SCROLLED           1127
 #define VCLEVENT_COMBOBOX_SCROLLED          1128
 #define VCLEVENT_EDIT_SELECTIONCHANGED      1129
-#define VCLEVENT_DROPDOWN_OPEN              1130
-#define VCLEVENT_DROPDOWN_CLOSE             1131
+#define VCLEVENT_DROPDOWN_OPEN				1130
+#define VCLEVENT_DROPDOWN_CLOSE			    1131
 
 #define VCLEVENT_TOOLBOX_ITEMADDED          1132        // pData = itempos
 #define VCLEVENT_TOOLBOX_ITEMREMOVED        1133        // pData = itempos
 #define VCLEVENT_TOOLBOX_ALLITEMSCHANGED    1134
 #define VCLEVENT_TOOLBOX_HIGHLIGHTOFF       1135        // pData = itempos
-#define VCLEVENT_WINDOW_MENUBARADDED        1136        // pData = pMenuBar
+#define VCLEVENT_WINDOW_MENUBARADDED		1136        // pData = pMenuBar
 #define VCLEVENT_TABPAGE_ACTIVATE           1137        // pData = pageid
 #define VCLEVENT_TABPAGE_DEACTIVATE         1138        // pData = pageid
 #define VCLEVENT_TABBAR_PAGEENABLED         1139        // pData = pageid
@@ -145,8 +145,8 @@ namespace com { namespace sun { namespace star {
 #define VCLEVENT_STATUSBAR_HIDEITEM         1163        // pData = itemid
 #define VCLEVENT_STATUSBAR_SHOWALLITEMS     1164
 #define VCLEVENT_STATUSBAR_HIDEALLITEMS     1165
-#define VCLEVENT_STATUSBAR_DRAWITEM         1166        // pData = itemid
-#define VCLEVENT_STATUSBAR_NAMECHANGED      1167        // pData = itemid
+#define VCLEVENT_STATUSBAR_DRAWITEM			1166		// pData = itemid
+#define VCLEVENT_STATUSBAR_NAMECHANGED		1167		// pData = itemid
 #define VCLEVENT_TOOLBOX_ITEMENABLED        1168        // pData = itempos
 #define VCLEVENT_TOOLBOX_ITEMDISABLED       1169        // pData = itempos
 #define VCLEVENT_TABPAGE_PAGETEXTCHANGED    1170        // pData = pageid
@@ -172,10 +172,10 @@ namespace com { namespace sun { namespace star {
 #define VCLEVENT_MENU_SUBMENUCHANGED        1209
 #define VCLEVENT_MENU_DEHIGHLIGHT           1210
 #define VCLEVENT_MENU_DISABLE               1211
-#define VCLEVENT_MENU_ITEMTEXTCHANGED       1212
-#define VCLEVENT_MENU_ITEMCHECKED           1213
-#define VCLEVENT_MENU_ITEMUNCHECKED         1214
-#define VCLEVENT_MENU_ACCESSIBLENAMECHANGED 1215
+#define VCLEVENT_MENU_ITEMTEXTCHANGED		1212
+#define VCLEVENT_MENU_ITEMCHECKED			1213
+#define VCLEVENT_MENU_ITEMUNCHECKED			1214
+#define VCLEVENT_MENU_ACCESSIBLENAMECHANGED	1215
 
 #define VCLEVENT_MENU_SHOW                  1250
 #define VCLEVENT_MENU_HIDE                  1251
@@ -192,7 +192,7 @@ namespace com { namespace sun { namespace star {
 
 #define VCLEVENT_TOOLBOX_BUTTONSTATECHANGED     1223    // pData = itempos
 #define VCLEVENT_TABLECELL_NAMECHANGED          1224    // pData = struct(Entry, Column, oldText)
-#define VCLEVENT_TABLEROW_SELECT                1225
+#define VCLEVENT_TABLEROW_SELECT				1225
 
 class VCL_DLLPUBLIC VclSimpleEvent
 {
@@ -278,7 +278,7 @@ class VCL_DLLPUBLIC VclEventListeners2 : public vcl::DeletionNotifier
     {
         std::list< Link >::iterator     m_aIt;
         bool                            m_bWasInvalidated;
-
+        
         ListenerIt(const std::list<Link>::iterator& rIt)
             : m_aIt(rIt)
             , m_bWasInvalidated( false )
@@ -286,15 +286,15 @@ class VCL_DLLPUBLIC VclEventListeners2 : public vcl::DeletionNotifier
     };
 
     std::vector< ListenerIt >      m_aIterators;
-
-
+    
+    
 public:
     VclEventListeners2();
     ~VclEventListeners2();
-
+    
     void addListener( const Link& );
     void removeListener( const Link& );
-
+    
     void callListeners( VclSimpleEvent* );
 };
 
diff --git a/vcl/inc/vcl/virdev.hxx b/vcl/inc/vcl/virdev.hxx
index 26270ec7703f..9659ed314e08 100644
--- a/vcl/inc/vcl/virdev.hxx
+++ b/vcl/inc/vcl/virdev.hxx
@@ -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
@@ -46,26 +46,26 @@ class VCL_DLLPUBLIC VirtualDevice : public OutputDevice
     friend class OutputDevice;
 
 private:
-    SalVirtualDevice*   mpVirDev;
-    VirtualDevice*      mpPrev;
-    VirtualDevice*      mpNext;
-    USHORT              mnBitCount;
-    BOOL                mbScreenComp;
-    sal_Int8            mnAlphaDepth;
-    BYTE                meRefDevMode;
+    SalVirtualDevice*	mpVirDev;
+    VirtualDevice*		mpPrev;
+    VirtualDevice*		mpNext;
+    USHORT				mnBitCount;
+    BOOL				mbScreenComp;
+    sal_Int8			mnAlphaDepth;
+    BYTE				meRefDevMode;
 
-    SAL_DLLPRIVATE void ImplInitVirDev( const OutputDevice* pOutDev, long nDX, long nDY, USHORT nBitCount, const SystemGraphicsData *pData = NULL );
-    SAL_DLLPRIVATE BOOL ImplSetOutputSizePixel( const Size& rNewSize, BOOL bErase );
+    SAL_DLLPRIVATE void	ImplInitVirDev( const OutputDevice* pOutDev, long nDX, long nDY, USHORT nBitCount, const SystemGraphicsData *pData = NULL );
+    SAL_DLLPRIVATE BOOL	ImplSetOutputSizePixel( const Size& rNewSize, BOOL bErase );
 
     // Copy assignment is forbidden and not implemented.
     VirtualDevice (const VirtualDevice &);
     VirtualDevice & operator= (const VirtualDevice &);
 
-    /** Used for alpha VDev, to set areas to opaque
+    /** Used for alpha VDev, to set areas to opaque 
 
         @since #i32109#
      */
-    SAL_DLLPRIVATE void ImplFillOpaqueRectangle( const Rectangle& rRect );
+    SAL_DLLPRIVATE void	ImplFillOpaqueRectangle( const Rectangle& rRect );
 
     // TODO: add extra member for refdev backward compatibility options
     #define REFDEV_FORCE_ZERO_EXTLEAD 0x80
@@ -100,10 +100,10 @@ public:
     */
                         VirtualDevice( const SystemGraphicsData *pData, USHORT nBitCount );
 
-    virtual             ~VirtualDevice();
+    virtual 			~VirtualDevice();
 
-    BOOL                SetOutputSizePixel( const Size& rNewSize, BOOL bErase = TRUE );
-    BOOL                SetOutputSize( const Size& rNewSize, BOOL bErase = TRUE )
+    BOOL				SetOutputSizePixel( const Size& rNewSize, BOOL bErase = TRUE );
+    BOOL				SetOutputSize( const Size& rNewSize, BOOL bErase = TRUE )
                             { return SetOutputSizePixel( LogicToPixel( rNewSize ), bErase ); }
 
     // reference device modes for different compatibility levels
@@ -118,7 +118,7 @@ public:
     void                SetReferenceDevice( RefDevMode );
 
     void                Compat_ZeroExtleadBug(); // enable workaround for #i60495#
-
+    
     void                SetReferenceDevice( sal_Int32 i_nDPIX, sal_Int32 i_nDPIY );
 
 private:
diff --git a/vcl/inc/vcl/waitobj.hxx b/vcl/inc/vcl/waitobj.hxx
index 1dcd42d8bcf9..03686a7d4a96 100644
--- a/vcl/inc/vcl/waitobj.hxx
+++ b/vcl/inc/vcl/waitobj.hxx
@@ -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
diff --git a/vcl/inc/vcl/wall.hxx b/vcl/inc/vcl/wall.hxx
index 07611aaf5edc..cc991bb6e937 100644
--- a/vcl/inc/vcl/wall.hxx
+++ b/vcl/inc/vcl/wall.hxx
@@ -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
@@ -41,37 +41,37 @@ class ImplWallpaper;
 // - Wallpaper-Types -
 // -------------------
 
-#define WALLPAPER_NULL                  WallpaperStyle_NULL
-#define WALLPAPER_TILE                  WallpaperStyle_TILE
-#define WALLPAPER_CENTER                WallpaperStyle_CENTER
-#define WALLPAPER_SCALE                 WallpaperStyle_SCALE
-#define WALLPAPER_TOPLEFT               WallpaperStyle_TOPLEFT
-#define WALLPAPER_TOP                   WallpaperStyle_TOP
-#define WALLPAPER_TOPRIGHT              WallpaperStyle_TOPRIGHT
-#define WALLPAPER_LEFT                  WallpaperStyle_LEFT
-#define WALLPAPER_RIGHT                 WallpaperStyle_RIGHT
-#define WALLPAPER_BOTTOMLEFT            WallpaperStyle_BOTTOMLEFT
-#define WALLPAPER_BOTTOM                WallpaperStyle_BOTTOM
-#define WALLPAPER_BOTTOMRIGHT           WallpaperStyle_BOTTOMRIGHT
-#define WALLPAPER_APPLICATIONGRADIENT   WallpaperStyle_APPLICATIONGRADIENT
-#define WALLPAPER_FORCE_EQUAL_SIZE      WallpaperStyle_FORCE_EQUAL_SIZE
+#define	WALLPAPER_NULL 					WallpaperStyle_NULL
+#define	WALLPAPER_TILE					WallpaperStyle_TILE
+#define	WALLPAPER_CENTER				WallpaperStyle_CENTER
+#define	WALLPAPER_SCALE					WallpaperStyle_SCALE
+#define	WALLPAPER_TOPLEFT				WallpaperStyle_TOPLEFT
+#define	WALLPAPER_TOP					WallpaperStyle_TOP
+#define	WALLPAPER_TOPRIGHT				WallpaperStyle_TOPRIGHT
+#define	WALLPAPER_LEFT					WallpaperStyle_LEFT
+#define	WALLPAPER_RIGHT					WallpaperStyle_RIGHT
+#define	WALLPAPER_BOTTOMLEFT			WallpaperStyle_BOTTOMLEFT
+#define	WALLPAPER_BOTTOM				WallpaperStyle_BOTTOM
+#define	WALLPAPER_BOTTOMRIGHT			WallpaperStyle_BOTTOMRIGHT
+#define	WALLPAPER_APPLICATIONGRADIENT	WallpaperStyle_APPLICATIONGRADIENT
+#define	WALLPAPER_FORCE_EQUAL_SIZE		WallpaperStyle_FORCE_EQUAL_SIZE
 
 #ifndef ENUM_WALLPAPERSTYLE_DECLARED
 #define ENUM_WALLPAPERSTYLE_DECLARED
 
-enum WallpaperStyle
+enum WallpaperStyle 
 {
-    WALLPAPER_NULL,
+    WALLPAPER_NULL, 
     WALLPAPER_TILE,
     WALLPAPER_CENTER,
     WALLPAPER_SCALE,
-    WALLPAPER_TOPLEFT,
-    WALLPAPER_TOP,
+    WALLPAPER_TOPLEFT,		
+    WALLPAPER_TOP,		
     WALLPAPER_TOPRIGHT,
-    WALLPAPER_LEFT,
+    WALLPAPER_LEFT,								
     WALLPAPER_RIGHT,
-    WALLPAPER_BOTTOMLEFT,
-    WALLPAPER_BOTTOM,
+    WALLPAPER_BOTTOMLEFT,	
+    WALLPAPER_BOTTOM,	
     WALLPAPER_BOTTOMRIGHT,
     WALLPAPER_APPLICATIONGRADIENT,          // defines a gradient that internally covers the whole application
                                             // and uses a color derived from the face color
@@ -87,9 +87,9 @@ enum WallpaperStyle
 class VCL_DLLPUBLIC Wallpaper
 {
 private:
-    ImplWallpaper*  mpImplWallpaper;
+    ImplWallpaper*	mpImplWallpaper;
 
-    SAL_DLLPRIVATE void           ImplMakeUnique( BOOL bReleaseCache = TRUE );
+    SAL_DLLPRIVATE void			  ImplMakeUnique( BOOL bReleaseCache = TRUE );
     SAL_DLLPRIVATE Gradient       ImplGetApplicationGradient() const;
 
 //#if 0 // _SOLAR__PRIVATE
@@ -105,39 +105,39 @@ public:
                     Wallpaper( const Gradient& rGradient );
                     ~Wallpaper();
 
-    void            SetColor( const Color& rColor );
-    const Color&    GetColor() const;
+    void			SetColor( const Color& rColor );
+    const Color&	GetColor() const;
 
-    void            SetStyle( WallpaperStyle eStyle );
-    WallpaperStyle  GetStyle() const;
+    void			SetStyle( WallpaperStyle eStyle );
+    WallpaperStyle	GetStyle() const;
 
-    void            SetBitmap( const BitmapEx& rBitmap );
-    void            SetBitmap();
-    BitmapEx        GetBitmap() const;
-    BOOL            IsBitmap() const;
+    void			SetBitmap( const BitmapEx& rBitmap );
+    void			SetBitmap();
+    BitmapEx		GetBitmap() const;
+    BOOL			IsBitmap() const;
 
-    void            SetGradient( const Gradient& rGradient );
-    void            SetGradient();
-    Gradient        GetGradient() const;
-    BOOL            IsGradient() const;
+    void			SetGradient( const Gradient& rGradient );
+    void			SetGradient();
+    Gradient		GetGradient() const;
+    BOOL			IsGradient() const;
 
-    void            SetRect( const Rectangle& rRect );
-    void            SetRect();
-    Rectangle       GetRect() const;
-    BOOL            IsRect() const;
+    void			SetRect( const Rectangle& rRect );
+    void			SetRect();
+    Rectangle		GetRect() const;
+    BOOL			IsRect() const;
 
-    BOOL            IsFixed() const;
-    BOOL            IsScrollable() const;
+    BOOL			IsFixed() const;
+    BOOL			IsScrollable() const;
 
-    Wallpaper&      operator=( const Wallpaper& rWallpaper );
-    BOOL            operator==( const Wallpaper& rWallpaper ) const;
-    BOOL            operator!=( const Wallpaper& rWallpaper ) const
+    Wallpaper&		operator=( const Wallpaper& rWallpaper );
+    BOOL			operator==( const Wallpaper& rWallpaper ) const;
+    BOOL			operator!=( const Wallpaper& rWallpaper ) const
                         { return !(Wallpaper::operator==( rWallpaper )); }
-    BOOL            IsSameInstance( const Wallpaper& rWallpaper ) const
+    BOOL			IsSameInstance( const Wallpaper& rWallpaper ) const
                         { return (mpImplWallpaper == rWallpaper.mpImplWallpaper); }
 
     friend VCL_DLLPUBLIC SvStream& operator>>( SvStream& rIStm, Wallpaper& rWallpaper );
     friend VCL_DLLPUBLIC SvStream& operator<<( SvStream& rOStm, const Wallpaper& rWallpaper );
 };
 
-#endif  // _SV_WALL_HXX
+#endif	// _SV_WALL_HXX
diff --git a/vcl/inc/vcl/wall2.hxx b/vcl/inc/vcl/wall2.hxx
index e93a8370ee7d..d5b95142c4fe 100644
--- a/vcl/inc/vcl/wall2.hxx
+++ b/vcl/inc/vcl/wall2.hxx
@@ -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
@@ -35,13 +35,13 @@ class ImplWallpaper
     friend class Wallpaper;
 
 private:
-    Color           maColor;
-    BitmapEx*       mpBitmap;
-    Gradient*       mpGradient;
-    Rectangle*      mpRect;
-    WallpaperStyle  meStyle;
-    ULONG           mnRefCount;
-    BitmapEx*       mpCache;
+    Color			maColor;
+    BitmapEx*		mpBitmap;
+    Gradient*		mpGradient;
+    Rectangle*		mpRect;
+    WallpaperStyle	meStyle;
+    ULONG			mnRefCount;
+    BitmapEx*		mpCache;
 
     friend SvStream& operator>>( SvStream& rIStm, ImplWallpaper& rImplWallpaper );
     friend SvStream& operator<<( SvStream& rOStm, const ImplWallpaper& rImplWallpaper );
@@ -51,10 +51,10 @@ public:
                     ImplWallpaper( const ImplWallpaper& rImplWallpaper );
                     ~ImplWallpaper();
 
-    void            ImplSetCachedBitmap( BitmapEx& rBmp );
-    const BitmapEx* ImplGetCachedBitmap() { return mpCache; }
-    void            ImplReleaseCachedBitmap();
+    void			ImplSetCachedBitmap( BitmapEx& rBmp );
+    const BitmapEx*	ImplGetCachedBitmap() { return mpCache; }
+    void			ImplReleaseCachedBitmap();
 };
 
 
-#endif  // _SV_WALL2_HXX
+#endif	// _SV_WALL2_HXX
diff --git a/vcl/inc/vcl/windata.hxx b/vcl/inc/vcl/windata.hxx
index 9436352e4927..9bb194462066 100644
--- a/vcl/inc/vcl/windata.hxx
+++ b/vcl/inc/vcl/windata.hxx
@@ -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
diff --git a/vcl/inc/vcl/window.h b/vcl/inc/vcl/window.h
index 691c3ed18421..5fbe3674c7df 100644
--- a/vcl/inc/vcl/window.h
+++ b/vcl/inc/vcl/window.h
@@ -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
@@ -117,7 +117,7 @@ struct ImplWinData
     Rectangle*          mpFocusRect;
     Rectangle*          mpTrackRect;
     USHORT              mnTrackFlags;
-    USHORT              mnIsTopWindow;
+    USHORT				mnIsTopWindow;
     BOOL                mbMouseOver;          // tracks mouse over for native widget paint effect
     BOOL                mbEnableNativeWidget; // toggle native widget rendering
     SmartId*            mpSmartHelpId;
@@ -147,7 +147,7 @@ struct ImplOverlapData
 struct ImplFrameData
 {
     Timer               maPaintTimer;       // paint timer
-    Timer               maResizeTimer;      // resize timer
+    Timer				maResizeTimer;		// resize timer
     InputContext        maOldInputContext;  // Last set Input Context
     Window*             mpNextFrame;        // next frame window
     Window*             mpFirstOverlap;     // first overlap window
@@ -235,7 +235,7 @@ public:
     VclEventListeners   maChildEventListeners;
 
     // The canvas interface for this VCL window. Is persistent after the first GetCanvas() call
-    ::com::sun::star::uno::WeakReference< ::com::sun::star::rendering::XCanvas >    mxCanvas;
+    ::com::sun::star::uno::WeakReference< ::com::sun::star::rendering::XCanvas > 	mxCanvas;
 
     ImplDelData*        mpFirstDel;
     void*               mpUserData;
diff --git a/vcl/inc/vcl/window.hxx b/vcl/inc/vcl/window.hxx
index 8264767e59ad..96588a80f218 100644
--- a/vcl/inc/vcl/window.hxx
+++ b/vcl/inc/vcl/window.hxx
@@ -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
@@ -326,7 +326,7 @@ typedef USHORT StateChangedType;
 #define DLGWINDOW_FIRST                 2
 //#endif
 
-enum WindowSizeType {
+enum WindowSizeType { 
     WINDOWSIZE_MINIMUM,
     WINDOWSIZE_PREFERRED,
     WINDOWSIZE_MAXIMUM
@@ -389,7 +389,7 @@ public:
     SAL_DLLPRIVATE WinBits             ImplInitRes( const ResId& rResId );
     SAL_DLLPRIVATE void                ImplLoadRes( const ResId& rResId );
     SAL_DLLPRIVATE void                ImplWindowRes( const ResId& rResId );
-    SAL_DLLPRIVATE void                ImplSetFrameParent( const Window* pParent );
+    SAL_DLLPRIVATE void				   ImplSetFrameParent( const Window* pParent );
     SAL_DLLPRIVATE void                ImplInsertWindow( Window* pParent );
     SAL_DLLPRIVATE void                ImplRemoveWindow( BOOL bRemoveFrameData );
     SAL_DLLPRIVATE Window*             ImplGetWindow();
@@ -489,7 +489,7 @@ public:
     <TRUE/> if the font can be used as UI font
     <FALSE/> if the font is unsuitable as UI font
      */
-    SAL_DLLPRIVATE bool        ImplCheckUIFont( const Font& rFont );
+    SAL_DLLPRIVATE bool		   ImplCheckUIFont( const Font& rFont );
     SAL_DLLPRIVATE void        ImplUpdateGlobalSettings( AllSettings& rSettings, BOOL bCallHdl = TRUE );
     SAL_DLLPRIVATE void        ImplAlignChilds();
     SAL_DLLPRIVATE void        ImplPosSizeWindow( long nX, long nY, long nWidth, long nHeight, USHORT nFlags );
@@ -554,15 +554,15 @@ public:
 
     SAL_DLLPRIVATE Rectangle   ImplGetWindowExtentsRelative( Window *pRelativeWindow, BOOL bClientOnly ) const;
     SAL_DLLPRIVATE void        ImplNotifyIconifiedState( BOOL bIconified );
-    SAL_DLLPRIVATE bool        ImplStopDnd();
-    SAL_DLLPRIVATE void        ImplStartDnd();
+    SAL_DLLPRIVATE bool		   ImplStopDnd();
+    SAL_DLLPRIVATE void		   ImplStartDnd();
 
     SAL_DLLPRIVATE static void ImplInitAppFontData( Window* pWindow );
-    SAL_DLLPRIVATE void        ImplPaintToDevice( OutputDevice* pTargetOutDev, const Point& rPos );
+    SAL_DLLPRIVATE void		   ImplPaintToDevice( OutputDevice* pTargetOutDev, const Point& rPos );
 
     SAL_DLLPRIVATE BOOL        ImplIsInTaskPaneList();
     SAL_DLLPRIVATE void        ImplIsInTaskPaneList( BOOL mbIsInTaskList );
-    SAL_DLLPRIVATE ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XCanvas >
+    SAL_DLLPRIVATE ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XCanvas > 
                                ImplGetCanvas( const Size& rFullscreenSize, bool bFullscreen, bool bSpriteCanvas ) const;
 
 private:
@@ -737,7 +737,7 @@ public:
     // while IsInPaint returns true ExpandPaintClipRegion adds the
     // submitted region to the paint clip region so you can
     // paint additional parts of your window if necessary
-    void                ExpandPaintClipRegion( const Region& rRegion );
+    void				ExpandPaintClipRegion( const Region& rRegion );
 
     void                SetParent( Window* pNewParent );
     Window*             GetParent() const;
@@ -759,16 +759,16 @@ public:
     void                EnableInput( BOOL bEnable, BOOL bChild, BOOL bSysWin,
                                      const Window* pExcludeWindow = NULL );
     BOOL                IsInputEnabled() const;
-
+    
     /** Override <code>EnableInput</code>. This can be necessary due to other people
         using EnableInput for whole window hierarchies.
-
-
+        
+        
         <code>AlwaysEnableInput</code> and <code>AlwaysDisableInput</code> are
         mutually exclusive; the last setter wins.
         @param bAlways
         sets always enabled flag
-
+        
         @param bChild
         if true children are recursively set to AlwaysEnableInput
     */
@@ -782,13 +782,13 @@ public:
         Windows with AlwaysDisableInput will not get key events even if enabled
         and input enabled.This can be necessary due to other people using EnableInput
         for whole window hierarchies.
-
+        
         <code>AlwaysEnableInput</code> and <code>AlwaysDisableInput</code> are
         mutually exclusive; the last setter wins.
-
+        
         @param bAlways
         sets always disable flag
-
+        
         @param bChild
         if true children are recursively set to AlwaysDisableInput
     */
@@ -804,25 +804,25 @@ public:
     not evaluate events but still react to those events externally. In these
     rare cases call SetCallHandlersOnInputDisabled( true ) to have your handler
     called anyway.
-
+    
     Currently only mouse events get this special treatment.
-
+    
     Use this sparingly, chances are if you want to use it you're wroking around
     the real problem.
-
+    
     @param bCall
     Enable/Disable calling event handlers for this disabled, modal or input disabled window.
     This call is implicity done recursively for possible child windows.
     */
     void                SetCallHandlersOnInputDisabled( bool bCall );
     /** get state of SetCallHandlersOnInputDisabled
-
+    
     @returns whether handlers are called regardless of input enabled state
     */
     bool                IsCallHandlersOnInputDisabled() const;
     /** A window is in modal mode if one of its children or subchildren
         is a running modal window (a modal dialog)
-
+        
         @returns TRUE if a child or subchild is a running modal window
     */
     BOOL                IsInModalMode() const;
@@ -896,10 +896,10 @@ public:
     BOOL                IsActive() const;
     BOOL                HasActiveChildFrame();
     USHORT              GetGetFocusFlags() const;
-    void                GrabFocusToDocument();
+    void				GrabFocusToDocument();
 
-    /**
-     * Set this when you need to act as if the window has focus even if it
+    /** 
+     * Set this when you need to act as if the window has focus even if it 
      * doesn't.  This is necessary for implementing tab stops inside floating
      * windows, but floating windows don't get focus from the system.
      */
@@ -937,11 +937,11 @@ public:
     long                CalcZoom( long n ) const;
 
     virtual void      SetText( const XubString& rStr );
-    virtual String      GetText() const;
+    virtual String   	GetText() const;
     // return the actual text displayed
     // this may have e.g. accellerators removed or portions
     // replaced by ellipsis
-    virtual String      GetDisplayText() const;
+    virtual String		GetDisplayText() const;
     // gets the visible background color. for transparent windows
     // this may be the parent's background color; for controls
     // this may be a child's background color (e.g. ListBox)
@@ -1044,19 +1044,19 @@ public:
     BOOL    IsAccessibilityEventsSuppressed( BOOL bTraverseParentPath = TRUE );
 
     /// request XCanvas render interface for this window
-    ::com::sun::star::uno::Reference<
+    ::com::sun::star::uno::Reference< 
         ::com::sun::star::rendering::XCanvas > GetCanvas() const;
     /// request XSpriteCanvas render interface for this window
-    ::com::sun::star::uno::Reference<
+    ::com::sun::star::uno::Reference< 
         ::com::sun::star::rendering::XSpriteCanvas > GetSpriteCanvas() const;
     /// request fullscreen XSpriteCanvas render interface for this window
-    ::com::sun::star::uno::Reference<
+    ::com::sun::star::uno::Reference< 
         ::com::sun::star::rendering::XSpriteCanvas > GetFullscreenSpriteCanvas( const Size& rFullscreenSize ) const;
 
     /*  records all DrawText operations within the passed rectangle;
      *  a synchronous paint is sent to achieve this
      */
-    void                RecordLayoutData( vcl::ControlLayoutData* pLayout, const Rectangle& rRect );
+    void				RecordLayoutData( vcl::ControlLayoutData* pLayout, const Rectangle& rRect );
 
     // Setzen und Abfragen fuer das Toolkit
     VCLXWindow*             GetWindowPeer() const;
@@ -1066,11 +1066,11 @@ public:
     BOOL                    IsCreatedWithToolkit() const;
     void                    SetCreatedWithToolkit( BOOL b );
 
-    Window*             GetLabelFor() const;
-    Window*             GetLabeledBy() const;
-    virtual Window* GetParentLabelFor( const Window* pLabel ) const;
-    virtual Window* GetParentLabeledBy( const Window* pLabeled ) const;
-    KeyEvent            GetActivationKey() const;
+    Window*				GetLabelFor() const;
+    Window*				GetLabeledBy() const;
+    virtual Window*	GetParentLabelFor( const Window* pLabel ) const;
+    virtual Window*	GetParentLabeledBy( const Window* pLabeled ) const;
+    KeyEvent			GetActivationKey() const;
 
     // Drag and Drop interfaces
     virtual ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::dnd::XDropTarget > GetDropTarget();
@@ -1096,7 +1096,7 @@ public:
 
     // a helper method for a Control's Draw method
     void PaintToDevice( OutputDevice* pDevice, const Point& rPos, const Size& rSize );
-
+    
     /* mark Window for deletion in top of event queue
     */
     void doLazyDelete();
diff --git a/vcl/inc/vcl/wintypes.hxx b/vcl/inc/vcl/wintypes.hxx
index 6da4e4e3d988..c0bcf1ad3612 100644
--- a/vcl/inc/vcl/wintypes.hxx
+++ b/vcl/inc/vcl/wintypes.hxx
@@ -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
diff --git a/vcl/inc/vcl/wrkwin.hxx b/vcl/inc/vcl/wrkwin.hxx
index c710434c79a4..685a283e54c0 100644
--- a/vcl/inc/vcl/wrkwin.hxx
+++ b/vcl/inc/vcl/wrkwin.hxx
@@ -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
@@ -96,13 +96,13 @@ public:
 
     BOOL            IsMinimized() const;
 
-    BOOL            SetPluginParent( SystemParentData* pParent );
+    BOOL			SetPluginParent( SystemParentData* pParent );
 
     void            Minimize();
     void            Restore();
 
-    void            Maximize( BOOL bMaximize = TRUE );
-    BOOL            IsMaximized() const;
+    void			Maximize( BOOL bMaximize = TRUE );
+    BOOL			IsMaximized() const;
 };
 
 #endif // _SV_WRKWIN_HXX
diff --git a/vcl/inc/vcl/xconnection.hxx b/vcl/inc/vcl/xconnection.hxx
index aa9d37430ea6..cab77f563f0d 100644
--- a/vcl/inc/vcl/xconnection.hxx
+++ b/vcl/inc/vcl/xconnection.hxx
@@ -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
@@ -42,12 +42,12 @@ namespace vcl {
     class DisplayConnection :
         public ::cppu::WeakImplHelper1< ::com::sun::star::awt::XDisplayConnection >
     {
-        ::osl::Mutex                    m_aMutex;
+        ::osl::Mutex					m_aMutex;
         ::std::list< ::com::sun::star::uno::Reference< ::com::sun::star::awt::XEventHandler > >
                                         m_aHandlers;
         ::std::list< ::com::sun::star::uno::Reference< ::com::sun::star::awt::XEventHandler > >
                                         m_aErrorHandlers;
-        ::com::sun::star::uno::Any      m_aAny;
+        ::com::sun::star::uno::Any		m_aAny;
     public:
         DisplayConnection();
         virtual ~DisplayConnection();
diff --git a/vcl/os2/inc/salbmp.h b/vcl/os2/inc/salbmp.h
index 14e51ffae8da..e041d4607f3e 100644
--- a/vcl/os2/inc/salbmp.h
+++ b/vcl/os2/inc/salbmp.h
@@ -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
@@ -49,8 +49,8 @@ class Os2SalBitmap : public SalBitmap
 private:
 
     Size                maSize;
-    HANDLE              mhDIB;
-    HANDLE              mhDIB1Subst;
+    HANDLE				mhDIB;
+    HANDLE				mhDIB1Subst;
     HBITMAP             mhDDB;
     USHORT              mnBitCount;
 
@@ -58,19 +58,19 @@ public:
 
     HANDLE              ImplGethDIB() const { return mhDIB; }
     HBITMAP             ImplGethDDB() const { return mhDDB; }
-    HANDLE              ImplGethDIB1Subst() const { return mhDIB1Subst; }
+    HANDLE				ImplGethDIB1Subst() const { return mhDIB1Subst; }
 
-    void                ImplReplacehDIB1Subst( HANDLE hDIB1Subst );
+    void				ImplReplacehDIB1Subst( HANDLE hDIB1Subst );
 
     static HANDLE       ImplCreateDIB( const Size& rSize, USHORT nBitCount, const BitmapPalette& rPal );
-    static HANDLE       ImplCreateDIB4FromDIB1( HANDLE hDIB1 );
+    static HANDLE		ImplCreateDIB4FromDIB1( HANDLE hDIB1 );
     static HANDLE       ImplCopyDIBOrDDB( HANDLE hHdl, BOOL bDIB );
     static USHORT       ImplGetDIBColorCount( HANDLE hDIB );
     static void         ImplDecodeRLEBuffer( const BYTE* pSrcBuf, BYTE* pDstBuf,
                                              const Size& rSizePixel, BOOL bRLE4 );
 
     //BOOL                Create( HANDLE hBitmap, BOOL bDIB, BOOL bCopyHandle );
-
+    
 public:
 
                         Os2SalBitmap();
@@ -88,8 +88,8 @@ public:
     //Size                GetSize() const { return maSize; }
     //USHORT              GetBitCount() const { return mnBitCount; }
 
-    //BitmapBuffer*     AcquireBuffer( bool bReadOnly );
-    //void              ReleaseBuffer( BitmapBuffer* pBuffer, bool bReadOnly );
+    //BitmapBuffer*		AcquireBuffer( bool bReadOnly );
+    //void				ReleaseBuffer( BitmapBuffer* pBuffer, bool bReadOnly );
     bool                        Create( HANDLE hBitmap, bool bDIB, bool bCopyHandle );
     virtual bool                Create( const Size& rSize, USHORT nBitCount, const BitmapPalette& rPal );
     virtual bool                Create( const SalBitmap& rSalBmpImpl );
@@ -101,7 +101,7 @@ public:
     virtual Size                GetSize() const { return maSize; }
     virtual USHORT              GetBitCount() const { return mnBitCount; }
 
-    virtual BitmapBuffer*       AcquireBuffer( bool bReadOnly );
+    virtual BitmapBuffer*		AcquireBuffer( bool bReadOnly );
     virtual void                ReleaseBuffer( BitmapBuffer* pBuffer, bool bReadOnly );
     virtual bool                GetSystemData( BitmapSystemData& rData );
 };
diff --git a/vcl/os2/inc/saldata.hxx b/vcl/os2/inc/saldata.hxx
index cf536a58d8dd..ce96715727b1 100644
--- a/vcl/os2/inc/saldata.hxx
+++ b/vcl/os2/inc/saldata.hxx
@@ -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
@@ -65,19 +65,19 @@ typedef APIRET (APIENTRY ImQueryIMModeFunc)( HIMI himi, PULONG pulInputMode, PUL
 
 struct SalIMEData
 {
-    HMODULE                         mhModIME;
-    ImAssociateInstanceFunc*        mpAssocIME;
-    ImGetInstanceFunc*              mpGetIME;
-    ImReleaseInstanceFunc*          mpReleaseIME;
-    ImSetConversionFontFunc*        mpSetConversionFont;
-    ImSetConversionFontSizeFunc*    mpSetConversionFontSize;
-    ImGetConversionStringFunc*      mpGetConversionString;
-    ImGetResultStringFunc*          mpGetResultString;
-    ImSetCandidateWindowPosFunc*    mpSetCandidateWin;
-    ImQueryIMEPropertyFunc*         mpQueryIMEProperty;
-    ImRequestIMEFunc*               mpRequestIME;
-    ImSetIMModeFunc*                mpSetIMEMode;
-    ImQueryIMModeFunc*              mpQueryIMEMode;
+    HMODULE 						mhModIME;
+    ImAssociateInstanceFunc*		mpAssocIME;
+    ImGetInstanceFunc*				mpGetIME;
+    ImReleaseInstanceFunc*			mpReleaseIME;
+    ImSetConversionFontFunc*		mpSetConversionFont;
+    ImSetConversionFontSizeFunc*	mpSetConversionFontSize;
+    ImGetConversionStringFunc*		mpGetConversionString;
+    ImGetResultStringFunc*			mpGetResultString;
+    ImSetCandidateWindowPosFunc*	mpSetCandidateWin;
+    ImQueryIMEPropertyFunc* 		mpQueryIMEProperty;
+    ImRequestIMEFunc*				mpRequestIME;
+    ImSetIMModeFunc*				mpSetIMEMode;
+    ImQueryIMModeFunc*				mpQueryIMEMode;
 };
 
 #endif
@@ -101,31 +101,31 @@ struct SalIcon
 
 struct SalData
 {
-    HAB                     mhAB;                   // anchor block handle
-    HMQ                     mhMQ;                   // handle of os2 message queue
-    int                     mnArgc;                 // commandline param count
-    char**                  mpArgv;                 // commandline
-    ULONG                   mnNewTimerMS;           // Neue Zeit, mit dem der Timer gestartet werden soll
-    ULONG                           mnTimerMS;                  // Current Time (in MS) of the Timer
-    ULONG                           mnTimerOrgMS;               // Current Original Time (in MS)
-    ULONG                   mnNextTimerTime;
-    ULONG                   mnLastEventTime;
-    ULONG                   mnTimerId;          // os2 timer id
-    BOOL                    mbInTimerProc;          // timer event is currently being dispatched
-    //SALTIMERPROC              mpTimerProc;            // timer callback proc
-    HWND                    mhWantLeaveMsg;         // window handle, that want a MOUSELEAVE message
-    AutoTimer*              mpMouseLeaveTimer;      // Timer for MouseLeave Test
-    Os2SalInstance*             mpFirstInstance;        // pointer of first instance
-    Os2SalFrame*                mpFirstFrame;           // pointer of first frame
-    Os2SalFrame*                mpCreateFrame;          // Create-Frame for WM_CREATE
-    Os2SalObject*               mpFirstObject;          // pointer of first object window
-    ULONG                   mnAppThreadId;          // Id from Applikation-Thread
-    ULONG                   mnFontMetricCount;      // number of entries in the font list
-    PFONTMETRICS                mpFontMetrics;          // cached font list
-    BOOL                    mbObjClassInit;         // Ist SALOBJECTCLASS initialised
+    HAB 					mhAB;					// anchor block handle
+    HMQ 					mhMQ;					// handle of os2 message queue
+    int 					mnArgc; 				// commandline param count
+    char**					mpArgv; 				// commandline
+    ULONG					mnNewTimerMS;			// Neue Zeit, mit dem der Timer gestartet werden soll
+    ULONG                   		mnTimerMS;              	// Current Time (in MS) of the Timer
+    ULONG                   		mnTimerOrgMS;          		// Current Original Time (in MS)
+    ULONG					mnNextTimerTime;
+    ULONG					mnLastEventTime;
+    ULONG					mnTimerId;			// os2 timer id
+    BOOL      				mbInTimerProc;			// timer event is currently being dispatched
+    //SALTIMERPROC				mpTimerProc;			// timer callback proc
+    HWND					mhWantLeaveMsg; 		// window handle, that want a MOUSELEAVE message
+    AutoTimer*				mpMouseLeaveTimer;		// Timer for MouseLeave Test
+    Os2SalInstance*				mpFirstInstance;		// pointer of first instance
+    Os2SalFrame*				mpFirstFrame;			// pointer of first frame
+    Os2SalFrame*				mpCreateFrame;			// Create-Frame for WM_CREATE
+    Os2SalObject*				mpFirstObject;			// pointer of first object window
+    ULONG					mnAppThreadId;			// Id from Applikation-Thread
+    ULONG					mnFontMetricCount;		// number of entries in the font list
+    PFONTMETRICS				mpFontMetrics;			// cached font list
+    BOOL					mbObjClassInit; 		// Ist SALOBJECTCLASS initialised
 #ifdef ENABLE_IME
-    SalIMEData*                 mpIMEData;              // SalIME-Data
-    BOOL                    mbIMEInit;              // SalIME-Data-Init
+    SalIMEData* 				mpIMEData;				// SalIME-Data
+    BOOL					mbIMEInit;				// SalIME-Data-Init
 #endif
 
     SalIcon*                mpFirstIcon;            // icon cache, points to first icon, NULL if none
@@ -140,15 +140,15 @@ inline SalData* GetAppSalData() { return (SalData*)ImplGetAppSVData()->mpSalData
 // - SalShlData -
 // --------------
 
-#define OS2_VER_211     211
-#define OS2_VER_WARP3   230
-#define OS2_VER_WARP4   240
+#define OS2_VER_211 	211
+#define OS2_VER_WARP3	230
+#define OS2_VER_WARP4	240
 
 struct SalShlData
 {
-    HMODULE mhMod;      // Module handle of SAL-DLL
-    USHORT  mnVersion;  // 211 = OS2 2.11; 230 = OS2 3.0; 240 = OS2 4.0
-    PFNWP   mpFrameProc;    // old frame proc
+    HMODULE	mhMod;		// Module handle of SAL-DLL
+    USHORT	mnVersion;	// 211 = OS2 2.11; 230 = OS2 3.0; 240 = OS2 4.0
+    PFNWP	mpFrameProc; 	// old frame proc
 };
 
 extern SalShlData aSalShlData;
@@ -204,46 +204,46 @@ void ImplReleaseSALIMEData();
 // - Defines -
 // -----------
 
-#define SAL_PROFILE_APPNAME         ((PSZ)"StarOffice")
-#define SAL_PROFILE_USEDJP          ((PSZ)"UseDJP")
-#define SAL_PROFILE_PRINTDJP        ((PSZ)"PrintDJP")
-#define SAL_PROFILE_PRINTRAW        ((PSZ)"PrintRAW")
+#define SAL_PROFILE_APPNAME 		((PSZ)"StarOffice")
+#define SAL_PROFILE_USEDJP			((PSZ)"UseDJP")
+#define SAL_PROFILE_PRINTDJP		((PSZ)"PrintDJP")
+#define SAL_PROFILE_PRINTRAW		((PSZ)"PrintRAW")
 
-#define SAL_FRAME_WNDEXTRA          sizeof(ULONG)
-#define SAL_FRAME_THIS              0
-#define SAL_FRAME_CLASSNAME         "SALFRAME"
-#define SAL_SUBFRAME_CLASSNAME      "SALSUBFRAME"
-#define SAL_OBJECT_WNDEXTRA         sizeof(ULONG)
-#define SAL_OBJECT_THIS             0
-#define SAL_OBJECT_CLASSNAME        "SALOBJECT"
-#define SAL_OBJECT_CHILDCLASSNAME   "SALOBJECTCHILD"
-#define SAL_OBJECT_CLIPCLASSNAME    "SALOBJECTCLIP"
-#define SAL_COM_CLASSNAME           "SALCOMWND"
+#define SAL_FRAME_WNDEXTRA			sizeof(ULONG)
+#define SAL_FRAME_THIS				0
+#define SAL_FRAME_CLASSNAME 		"SALFRAME"
+#define SAL_SUBFRAME_CLASSNAME 		"SALSUBFRAME"
+#define SAL_OBJECT_WNDEXTRA 		sizeof(ULONG)
+#define SAL_OBJECT_THIS 			0
+#define SAL_OBJECT_CLASSNAME		"SALOBJECT"
+#define SAL_OBJECT_CHILDCLASSNAME	"SALOBJECTCHILD"
+#define SAL_OBJECT_CLIPCLASSNAME	"SALOBJECTCLIP"
+#define SAL_COM_CLASSNAME			"SALCOMWND"
 
-#define SAL_MOUSELEAVE_TIMEOUT      300
+#define SAL_MOUSELEAVE_TIMEOUT		300
 
 // MP1 == 0; MP2 == pData
-#define SAL_MSG_USEREVENT           (WM_USER+111)
+#define SAL_MSG_USEREVENT			(WM_USER+111)
 // MP1 == 0; MP2 == MousePosition relativ to upper left of screen
-#define SAL_MSG_MOUSELEAVE          (WM_USER+112)
+#define SAL_MSG_MOUSELEAVE			(WM_USER+112)
 // MP1 == hDC; MP2 == 0
-#define SAL_MSG_PRINTABORTJOB       (WM_USER+113)
+#define SAL_MSG_PRINTABORTJOB		(WM_USER+113)
 // MP1 == 0; MP2 == 0
-#define SAL_MSG_STARTTIMER          (WM_USER+114)
+#define SAL_MSG_STARTTIMER			(WM_USER+114)
 // MP1 == nFrameStyle; MP2 == pParent; lResult pFrame
-#define SAL_MSG_CREATEFRAME         (WM_USER+115)
+#define SAL_MSG_CREATEFRAME 		(WM_USER+115)
 // MP1 == 0; MP2 == pParent; lResult pObject
-#define SAL_MSG_CREATEOBJECT        (WM_USER+116)
+#define SAL_MSG_CREATEOBJECT		(WM_USER+116)
 // MP1 == bWait; MP2 == pMutex
-#define SAL_MSG_THREADYIELD         (WM_USER+117)
+#define SAL_MSG_THREADYIELD 		(WM_USER+117)
 // MP1 == 0; MP2 == 0
-#define SAL_MSG_RELEASEWAITYIELD    (WM_USER+118)
+#define SAL_MSG_RELEASEWAITYIELD	(WM_USER+118)
 // MP1 == 0; MP2 == pData
-#define SAL_MSG_SYSPROCESSMENU      (WM_USER+119)
+#define SAL_MSG_SYSPROCESSMENU		(WM_USER+119)
 // POSTFOCUS-Message; MP1 == nMP1; MP2 == nMP2 (SHORT1( bFocus ), 0)
-#define SAL_MSG_POSTFOCUS           (WM_USER+120)
+#define SAL_MSG_POSTFOCUS			(WM_USER+120)
 // POSTSIZE-Message; MP1 == nMP1; MP2 == nMP2
-#define SAL_MSG_POSTSIZE            (WM_USER+121)
+#define SAL_MSG_POSTSIZE			(WM_USER+121)
 
 // wParam == wParam; lParam == lParam
 #define SAL_MSG_POSTMOVE            (WM_USER+136)
@@ -255,9 +255,9 @@ void ImplReleaseSALIMEData();
 #define SAL_MSG_SHOW                (WM_USER+143)
 
 // SysChild-ToTop; nMP1 = 0; nMP2 = 0
-#define SALOBJ_MSG_TOTOP            (WM_USER+150)
+#define SALOBJ_MSG_TOTOP			(WM_USER+150)
 // POSTFOCUS-Message; MP1 == nMP1; MP2 == nMP2 (SHORT1( bFocus ), 0)
-#define SALOBJ_MSG_POSTFOCUS        (WM_USER+151)
+#define SALOBJ_MSG_POSTFOCUS		(WM_USER+151)
 
 // wParam == 0; lParam == 0
 #define SAL_MSG_DESTROYFRAME        (WM_USER+160)
@@ -275,7 +275,7 @@ void ImplReleaseSALIMEData();
 #define SAL_MSG_RECREATEHWND         (WM_USER+166)
 // wParam == newParentHwnd; lParam == oldHwnd; lResult == newhWnd
 #define SAL_MSG_RECREATECHILDHWND    (WM_USER+167)
-// wParam == 0; lParam == HWND;
+// wParam == 0; lParam == HWND; 
 #define SAL_MSG_DESTROYHWND         (WM_USER+168)
 // POSTTIMER-Message; wparam = 0, lParam == time
 #define SAL_MSG_POSTTIMER           (WM_USER+169)
@@ -304,4 +304,4 @@ inline Os2SalObject* GetSalObjWindowPtr( HWND hWnd )
     return (Os2SalObject*)WinQueryWindowULong( hWnd, SAL_OBJECT_THIS );
 }
 
-#endif  // _SV_SALDATA_HXX
+#endif	// _SV_SALDATA_HXX
diff --git a/vcl/os2/inc/salframe.h b/vcl/os2/inc/salframe.h
index f02a39f80955..9c51ae495fa2 100644
--- a/vcl/os2/inc/salframe.h
+++ b/vcl/os2/inc/salframe.h
@@ -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
@@ -60,28 +60,28 @@ class Os2SalGraphics;
 class Os2SalFrame : public SalFrame
 {
 public:
-    HWND                    mhWndFrame;             // HWND-Frame
-    HWND                    mhWndClient;            // HWND-Client
-    HAB                     mhAB;                   // HAB
-    HPOINTER                mhPointer;              // Current MousePointer
-    void*                   mpInst;                 // VCL-Instance
-    //SALFRAMEPROC          mpProc;                 // VCL-Proc
-    Os2SalGraphics*         mpGraphics;             // current frame graphics
-    Os2SalFrame*                mpNextFrame;            // pointer to next frame
-    SystemEnvData           maSysData;              // system data
-    SalFrameState           maState;                // frame state
+    HWND					mhWndFrame; 			// HWND-Frame
+    HWND					mhWndClient;			// HWND-Client
+    HAB 					mhAB;					// HAB
+    HPOINTER				mhPointer;				// Current MousePointer
+    void*					mpInst; 				// VCL-Instance
+    //SALFRAMEPROC			mpProc; 				// VCL-Proc
+    Os2SalGraphics*			mpGraphics; 			// current frame graphics
+    Os2SalFrame*				mpNextFrame;			// pointer to next frame
+    SystemEnvData			maSysData;				// system data
+    SalFrameState			maState;				// frame state
     int                     mnShowState;            // show state
-    ULONG                   mnStyle;                // SalFrameStyle
-    long                    mnWidth;                // Window-Witdth
-    long                    mnHeight;               // Window-Height
-    SWP                     maFullScreenRect;       // WindowRect befor FullScreenMode
-    BOOL                    mbGraphics;             // is Graphics used
-    BOOL                    mbAllwayOnTop;          // Allways on top modus
-    BOOL                    mbVisible;              // Visible Show/Hide-Status
-    BOOL                    mbMinHide;              // hide called from OS2
-    BOOL                    mbHandleIME;            // TRUE: Wir handeln die IME-Messages
-    BOOL                    mbConversionMode;       // TRUE: Wir befinden uns im Conversion-Modus
-    BOOL                    mbCandidateMode;        // TRUE: Wir befinden uns im Candidate-Modus
+    ULONG					mnStyle;				// SalFrameStyle
+    long					mnWidth;				// Window-Witdth
+    long					mnHeight;				// Window-Height
+    SWP 					maFullScreenRect;		// WindowRect befor FullScreenMode
+    BOOL					mbGraphics; 			// is Graphics used
+    BOOL					mbAllwayOnTop;			// Allways on top modus
+    BOOL					mbVisible;				// Visible Show/Hide-Status
+    BOOL					mbMinHide;				// hide called from OS2
+    BOOL					mbHandleIME;			// TRUE: Wir handeln die IME-Messages
+    BOOL					mbConversionMode;		// TRUE: Wir befinden uns im Conversion-Modus
+    BOOL					mbCandidateMode;		// TRUE: Wir befinden uns im Candidate-Modus
     BOOL                    mbCaption;              // has window a caption
     BOOL                    mbBorder;               // has window a border
     BOOL                    mbFixBorder;            // has window a fixed border
@@ -107,59 +107,59 @@ public:
     static BOOL             mbInReparent;           // TRUE: ignore focus lost and gain due to reparenting
 
 private:
-    Os2SalFrame*            mpParentFrame;          // parent frame pointer
+    Os2SalFrame*			mpParentFrame;			// parent frame pointer
 
 public:
     Os2SalFrame();
     virtual ~Os2SalFrame();
 
-    virtual SalGraphics*        GetGraphics();
-    virtual void                ReleaseGraphics( SalGraphics* pGraphics );
-    virtual BOOL                PostEvent( void* pData );
-    virtual void                SetTitle( const XubString& rTitle );
-    virtual void                SetIcon( USHORT nIcon );
+    virtual SalGraphics*		GetGraphics();
+    virtual void				ReleaseGraphics( SalGraphics* pGraphics );
+    virtual BOOL				PostEvent( void* pData );
+    virtual void				SetTitle( const XubString& rTitle );
+    virtual void				SetIcon( USHORT nIcon );
     virtual void                                SetMenu( SalMenu* pSalMenu );
     virtual void                                DrawMenuBar();
     virtual void                SetExtendedFrameStyle( SalExtStyle nExtStyle );
-    virtual void                Show( BOOL bVisible, BOOL bNoActivate = FALSE );
-    virtual void                Enable( BOOL bEnable );
+    virtual void				Show( BOOL bVisible, BOOL bNoActivate = FALSE );
+    virtual void				Enable( BOOL bEnable );
     virtual void                SetMinClientSize( long nWidth, long nHeight );
     virtual void                SetMaxClientSize( long nWidth, long nHeight );
-    virtual void                SetPosSize( long nX, long nY, long nWidth, long nHeight, USHORT nFlags );
-    virtual void                GetClientSize( long& rWidth, long& rHeight );
-    virtual void                GetWorkArea( RECTL& rRect );
-    virtual void                GetWorkArea( Rectangle& rRect );
-    virtual SalFrame*           GetParent() const;
-    virtual void                SetWindowState( const SalFrameState* pState );
-    virtual BOOL                GetWindowState( SalFrameState* pState );
-    virtual void                ShowFullScreen( BOOL bFullScreen, sal_Int32 nDisplay );
-    virtual void                StartPresentation( BOOL bStart );
-    virtual void                SetAlwaysOnTop( BOOL bOnTop );
-    virtual void                ToTop( USHORT nFlags );
-    virtual void                SetPointer( PointerStyle ePointerStyle );
-    virtual void                CaptureMouse( BOOL bMouse );
-    virtual void                SetPointerPos( long nX, long nY );
-    virtual void                Flush();
-    virtual void                Sync();
-    virtual void                SetInputContext( SalInputContext* pContext );
-    virtual void                EndExtTextInput( USHORT nFlags );
-    virtual String              GetKeyName( USHORT nKeyCode );
-    virtual String              GetSymbolKeyName( const XubString& rFontName, USHORT nKeyCode );
+    virtual void				SetPosSize( long nX, long nY, long nWidth, long nHeight, USHORT nFlags );
+    virtual void				GetClientSize( long& rWidth, long& rHeight );
+    virtual void				GetWorkArea( RECTL& rRect );
+    virtual void				GetWorkArea( Rectangle& rRect );
+    virtual SalFrame*			GetParent() const;
+    virtual void				SetWindowState( const SalFrameState* pState );
+    virtual BOOL				GetWindowState( SalFrameState* pState );
+    virtual void				ShowFullScreen( BOOL bFullScreen, sal_Int32 nDisplay );
+    virtual void				StartPresentation( BOOL bStart );
+    virtual void				SetAlwaysOnTop( BOOL bOnTop );
+    virtual void				ToTop( USHORT nFlags );
+    virtual void				SetPointer( PointerStyle ePointerStyle );
+    virtual void				CaptureMouse( BOOL bMouse );
+    virtual void				SetPointerPos( long nX, long nY );
+    virtual void				Flush();
+    virtual void				Sync();
+    virtual void				SetInputContext( SalInputContext* pContext );
+    virtual void				EndExtTextInput( USHORT nFlags );
+    virtual String				GetKeyName( USHORT nKeyCode );
+    virtual String				GetSymbolKeyName( const XubString& rFontName, USHORT nKeyCode );
     virtual BOOL                MapUnicodeToKeyCode( sal_Unicode aUnicode, LanguageType aLangType, KeyCode& rKeyCode );
-    virtual LanguageType        GetInputLanguage();
-    virtual SalBitmap*          SnapShot();
-    virtual void                UpdateSettings( AllSettings& rSettings );
-    virtual void                Beep( SoundType eSoundType );
-    virtual const SystemEnvData*    GetSystemData() const;
-    virtual SalPointerState     GetPointerState();
-    virtual void                SetParent( SalFrame* pNewParent );
-    virtual bool                SetPluginParent( SystemParentData* pNewParent );
+    virtual LanguageType		GetInputLanguage();
+    virtual SalBitmap*			SnapShot();
+    virtual void				UpdateSettings( AllSettings& rSettings );
+    virtual void				Beep( SoundType eSoundType );
+    virtual const SystemEnvData*	GetSystemData() const;
+    virtual SalPointerState		GetPointerState();
+    virtual void				SetParent( SalFrame* pNewParent );
+    virtual bool				SetPluginParent( SystemParentData* pNewParent );
     virtual void                SetBackgroundBitmap( SalBitmap* );
     virtual void                SetScreenNumber( unsigned int );
-    virtual void                ResetClipRegion();
-    virtual void                BeginSetClipRegion( ULONG nRects );
-    virtual void                UnionClipRegion( long nX, long nY, long nWidth, long nHeight );
-    virtual void                EndSetClipRegion();
+    virtual void				ResetClipRegion();
+    virtual void				BeginSetClipRegion( ULONG nRects );
+    virtual void				UnionClipRegion( long nX, long nY, long nWidth, long nHeight );
+    virtual void				EndSetClipRegion();
 
 };
 
diff --git a/vcl/os2/inc/salgdi.h b/vcl/os2/inc/salgdi.h
index cf05ff15d7e2..57507d79bc12 100644
--- a/vcl/os2/inc/salgdi.h
+++ b/vcl/os2/inc/salgdi.h
@@ -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
@@ -118,81 +118,81 @@ public:
 class Os2SalGraphics : public SalGraphics
 {
 public:
-    HPS                     mhPS;               // HPS
-    HDC                     mhDC;               // HDC
-    HWND                    mhWnd;              // HWND
-    LONG                    mnHeight;           // Height of frame Window
-    ULONG                   mnClipElementCount; // number of clip rects in clip rect array
-    RECTL*                  mpClipRectlAry;     // clip rect array
-    ULONG                   mnFontMetricCount;  // number of entries in the font list
-    PFONTMETRICS            mpFontMetrics;      // cached font list
-    LONG                    mnOrientationX;     // X-Font orientation
-    LONG                    mnOrientationY;     // Y-Font orientation
-    BOOL                    mbLine;             // draw lines
-    BOOL                    mbFill;             // fill areas
-    BOOL                    mbPrinter;          // is Printer
-    BOOL                    mbVirDev;           // is VirDev
-    BOOL                    mbWindow;           // is Window
-    BOOL                    mbScreen;           // is Screen compatible
-    bool                    mbXORMode;          // _every_ output with RasterOp XOR
-    ULONG                   mhFonts[ MAX_FALLBACK ];        // Font + Fallbacks
-    const ImplOs2FontData*          mpOs2FontData[ MAX_FALLBACK ];  // pointer to the most recent font face
-    ImplOs2FontEntry*           mpOs2FontEntry[ MAX_FALLBACK ]; // pointer to the most recent font instance
-    ULONG                   mhDefFont;          // DefaultFont
-    float                   mfFontScale;            // allows metrics emulation of huge font sizes
-    BOOL                    mbFontKernInit;     // FALSE: FontKerns must be queried
-    KERNINGPAIRS*               mpFontKernPairs;    // Kerning Pairs of the current Font
-    ULONG                   mnFontKernPairCount;// Number of Kerning Pairs of the current Font
-
-    USHORT                  ImplDoSetFont( ImplFontSelectData* i_pFont, float& o_rFontScale, int );
+    HPS 					mhPS;				// HPS
+    HDC 					mhDC;				// HDC
+    HWND					mhWnd;				// HWND
+    LONG					mnHeight;			// Height of frame Window
+    ULONG					mnClipElementCount; // number of clip rects in clip rect array
+    RECTL*					mpClipRectlAry; 	// clip rect array
+    ULONG					mnFontMetricCount;	// number of entries in the font list
+    PFONTMETRICS			mpFontMetrics;		// cached font list
+    LONG					mnOrientationX; 	// X-Font orientation
+    LONG					mnOrientationY; 	// Y-Font orientation
+    BOOL					mbLine; 			// draw lines
+    BOOL					mbFill; 			// fill areas
+    BOOL					mbPrinter;			// is Printer
+    BOOL					mbVirDev;			// is VirDev
+    BOOL					mbWindow;			// is Window
+    BOOL					mbScreen;			// is Screen compatible
+    bool					mbXORMode;			// _every_ output with RasterOp XOR
+    ULONG					mhFonts[ MAX_FALLBACK ];        // Font + Fallbacks
+    const ImplOs2FontData*			mpOs2FontData[ MAX_FALLBACK ];  // pointer to the most recent font face
+    ImplOs2FontEntry*			mpOs2FontEntry[ MAX_FALLBACK ]; // pointer to the most recent font instance
+    ULONG					mhDefFont;			// DefaultFont
+    float					mfFontScale;			// allows metrics emulation of huge font sizes
+    BOOL					mbFontKernInit; 	// FALSE: FontKerns must be queried
+    KERNINGPAIRS*				mpFontKernPairs;	// Kerning Pairs of the current Font
+    ULONG					mnFontKernPairCount;// Number of Kerning Pairs of the current Font
+
+    USHORT					ImplDoSetFont( ImplFontSelectData* i_pFont, float& o_rFontScale, int );
 
 public:
     Os2SalGraphics();
     virtual ~Os2SalGraphics();
 
 protected:
-    virtual BOOL        unionClipRegion( long nX, long nY, long nWidth, long nHeight );
+    virtual BOOL		unionClipRegion( long nX, long nY, long nWidth, long nHeight );
     virtual bool                unionClipRegion( const ::basegfx::B2DPolyPolygon& );
     // draw --> LineColor and FillColor and RasterOp and ClipRegion
-    virtual void        drawPixel( long nX, long nY );
-    virtual void        drawPixel( long nX, long nY, SalColor nSalColor );
-    virtual void        drawLine( long nX1, long nY1, long nX2, long nY2 );
-    virtual void        drawRect( long nX, long nY, long nWidth, long nHeight );
-    virtual void        drawPolyLine( ULONG nPoints, const SalPoint* pPtAry );
-    virtual void        drawPolygon( ULONG nPoints, const SalPoint* pPtAry );
-    virtual void        drawPolyPolygon( ULONG nPoly, const ULONG* pPoints, PCONSTSALPOINT* pPtAry );
+    virtual void		drawPixel( long nX, long nY );
+    virtual void		drawPixel( long nX, long nY, SalColor nSalColor );
+    virtual void		drawLine( long nX1, long nY1, long nX2, long nY2 );
+    virtual void		drawRect( long nX, long nY, long nWidth, long nHeight );
+    virtual void		drawPolyLine( ULONG nPoints, const SalPoint* pPtAry );
+    virtual void		drawPolygon( ULONG nPoints, const SalPoint* pPtAry );
+    virtual void		drawPolyPolygon( ULONG nPoly, const ULONG* pPoints, PCONSTSALPOINT* pPtAry );
     virtual bool        drawPolyPolygon( const ::basegfx::B2DPolyPolygon&, double fTransparency );
     virtual bool        drawPolyLine( const ::basegfx::B2DPolygon&, double fTransparency, const ::basegfx::B2DVector& rLineWidth, basegfx::B2DLineJoin );
-    virtual sal_Bool    drawPolyLineBezier( ULONG nPoints, const SalPoint* pPtAry, const BYTE* pFlgAry );
-    virtual sal_Bool    drawPolygonBezier( ULONG nPoints, const SalPoint* pPtAry, const BYTE* pFlgAry );
-    virtual sal_Bool    drawPolyPolygonBezier( ULONG nPoly, const ULONG* pPoints, const SalPoint* const* pPtAry, const BYTE* const* pFlgAry );
+    virtual sal_Bool	drawPolyLineBezier( ULONG nPoints, const SalPoint* pPtAry, const BYTE* pFlgAry );
+    virtual sal_Bool	drawPolygonBezier( ULONG nPoints, const SalPoint* pPtAry, const BYTE* pFlgAry );
+    virtual sal_Bool	drawPolyPolygonBezier( ULONG nPoly, const ULONG* pPoints, const SalPoint* const* pPtAry, const BYTE* const* pFlgAry );
 
     // CopyArea --> No RasterOp, but ClipRegion
-    virtual void        copyArea( long nDestX, long nDestY, long nSrcX, long nSrcY, long nSrcWidth,
+    virtual void		copyArea( long nDestX, long nDestY, long nSrcX, long nSrcY, long nSrcWidth,
                                   long nSrcHeight, USHORT nFlags );
 
     // CopyBits and DrawBitmap --> RasterOp and ClipRegion
     // CopyBits() --> pSrcGraphics == NULL, then CopyBits on same Graphics
-    virtual void        copyBits( const SalTwoRect* pPosAry, SalGraphics* pSrcGraphics );
-    virtual void        drawBitmap( const SalTwoRect* pPosAry, const SalBitmap& rSalBitmap );
-    virtual void        drawBitmap( const SalTwoRect* pPosAry,
+    virtual void		copyBits( const SalTwoRect* pPosAry, SalGraphics* pSrcGraphics );
+    virtual void		drawBitmap( const SalTwoRect* pPosAry, const SalBitmap& rSalBitmap );
+    virtual void		drawBitmap( const SalTwoRect* pPosAry,
                                     const SalBitmap& rSalBitmap,
                                     SalColor nTransparentColor );
-    virtual void        drawBitmap( const SalTwoRect* pPosAry,
+    virtual void		drawBitmap( const SalTwoRect* pPosAry,
                                     const SalBitmap& rSalBitmap,
                                     const SalBitmap& rTransparentBitmap );
-    virtual void        drawMask( const SalTwoRect* pPosAry,
+    virtual void		drawMask( const SalTwoRect* pPosAry,
                                   const SalBitmap& rSalBitmap,
                                   SalColor nMaskColor );
 
-    virtual SalBitmap*  getBitmap( long nX, long nY, long nWidth, long nHeight );
-    virtual SalColor    getPixel( long nX, long nY );
+    virtual SalBitmap*	getBitmap( long nX, long nY, long nWidth, long nHeight );
+    virtual SalColor	getPixel( long nX, long nY );
 
     // invert --> ClipRegion (only Windows or VirDevs)
-    virtual void        invert( long nX, long nY, long nWidth, long nHeight, SalInvert nFlags);
-    virtual void        invert( ULONG nPoints, const SalPoint* pPtAry, SalInvert nFlags );
+    virtual void		invert( long nX, long nY, long nWidth, long nHeight, SalInvert nFlags);
+    virtual void		invert( ULONG nPoints, const SalPoint* pPtAry, SalInvert nFlags );
 
-    virtual BOOL        drawEPS( long nX, long nY, long nWidth, long nHeight, void* pPtr, ULONG nSize );
+    virtual BOOL		drawEPS( long nX, long nY, long nWidth, long nHeight, void* pPtr, ULONG nSize );
 
 #if 0
     // native widget rendering methods that require mirroring
@@ -209,61 +209,61 @@ protected:
                                                 Region &rNativeBoundingRegion, Region &rNativeContentRegion );
 #endif
 
-    virtual bool        drawAlphaBitmap( const SalTwoRect&,
+    virtual bool		drawAlphaBitmap( const SalTwoRect&,
                                          const SalBitmap& rSourceBitmap,
                                          const SalBitmap& rAlphaBitmap );
-    virtual bool        drawAlphaRect( long nX, long nY, long nWidth, long nHeight, sal_uInt8 nTransparency );
+    virtual bool		drawAlphaRect( long nX, long nY, long nWidth, long nHeight, sal_uInt8 nTransparency );
 
 public:
     // public SalGraphics methods, the interface to teh independent vcl part
 
     // get device resolution
-    virtual void            GetResolution( long& rDPIX, long& rDPIY );
+    virtual void			GetResolution( long& rDPIX, long& rDPIY );
     // get the depth of the device
-    virtual USHORT          GetBitCount();
+    virtual USHORT			GetBitCount();
     // get the width of the device
-    virtual long            GetGraphicsWidth() const;
+    virtual long			GetGraphicsWidth() const;
 
     // set the clip region to empty
-    virtual void            ResetClipRegion();
+    virtual void			ResetClipRegion();
     // begin setting the clip region, add rectangles to the
     // region with the UnionClipRegion call
-    virtual void            BeginSetClipRegion( ULONG nCount );
+    virtual void			BeginSetClipRegion( ULONG nCount );
     // all rectangles were added and the clip region should be set now
-    virtual void            EndSetClipRegion();
+    virtual void			EndSetClipRegion();
 
     // set the line color to transparent (= don't draw lines)
-    virtual void            SetLineColor();
+    virtual void			SetLineColor();
     // set the line color to a specific color
-    virtual void            SetLineColor( SalColor nSalColor );
+    virtual void			SetLineColor( SalColor nSalColor );
     // set the fill color to transparent (= don't fill)
-    virtual void            SetFillColor();
+    virtual void			SetFillColor();
     // set the fill color to a specific color, shapes will be
     // filled accordingly
-    virtual void            SetFillColor( SalColor nSalColor );
+    virtual void          	SetFillColor( SalColor nSalColor );
     // enable/disable XOR drawing
-    virtual void            SetXORMode( bool bSet, bool );
+    virtual void			SetXORMode( bool bSet, bool );
     // set line color for raster operations
-    virtual void            SetROPLineColor( SalROPColor nROPColor );
+    virtual void			SetROPLineColor( SalROPColor nROPColor );
     // set fill color for raster operations
-    virtual void            SetROPFillColor( SalROPColor nROPColor );
+    virtual void			SetROPFillColor( SalROPColor nROPColor );
     // set the text color to a specific color
-    virtual void            SetTextColor( SalColor nSalColor );
+    virtual void			SetTextColor( SalColor nSalColor );
     // set the font
     virtual USHORT         SetFont( ImplFontSelectData*, int nFallbackLevel );
     // get the current font's etrics
-    virtual void            GetFontMetric( ImplFontMetricData* );
+    virtual void			GetFontMetric( ImplFontMetricData* );
     // get kernign pairs of the current font
     // return only PairCount if (pKernPairs == NULL)
-    virtual ULONG           GetKernPairs( ULONG nPairs, ImplKernPairData* pKernPairs );
+    virtual ULONG			GetKernPairs( ULONG nPairs, ImplKernPairData* pKernPairs );
     // get the repertoire of the current font
     virtual ImplFontCharMap* GetImplFontCharMap() const;
     // graphics must fill supplied font list
-    virtual void            GetDevFontList( ImplDevFontList* );
+    virtual void			GetDevFontList( ImplDevFontList* );
     // graphics should call ImplAddDevFontSubstitute on supplied
     // OutputDevice for all its device specific preferred font substitutions
-    virtual void            GetDevFontSubstList( OutputDevice* );
-    virtual bool            AddTempDevFont( ImplDevFontList*, const String& rFileURL, const String& rFontName );
+    virtual void			GetDevFontSubstList( OutputDevice* );
+    virtual bool			AddTempDevFont( ImplDevFontList*, const String& rFileURL, const String& rFontName );
     // CreateFontSubset: a method to get a subset of glyhps of a font
     // inside a new valid font file
     // returns TRUE if creation of subset was successfull
@@ -276,7 +276,7 @@ public:
     //             rInfo: additional outgoing information
     // implementation note: encoding 0 with glyph id 0 should be added implicitly
     // as "undefined character"
-    virtual BOOL            CreateFontSubset( const rtl::OUString& rToFile,
+    virtual BOOL			CreateFontSubset( const rtl::OUString& rToFile,
                                               const ImplFontData* pFont,
                                               long* pGlyphIDs,
                                               sal_uInt8* pEncoding,
@@ -301,13 +301,13 @@ public:
     //                      pWidths MUST support at least 256 members;
     //             rInfo: additional outgoing information
     //             pDataLen: out parameter, contains the byte length of the returned buffer
-    virtual const void* GetEmbedFontData( const ImplFontData*,
+    virtual const void*	GetEmbedFontData( const ImplFontData*,
                                           const sal_Ucs* pUnicodes,
                                           sal_Int32* pWidths,
                                           FontSubsetInfo& rInfo,
                                           long* pDataLen );
     // frees the font data again
-    virtual void            FreeEmbedFontData( const void* pData, long nDataLen );
+    virtual void			FreeEmbedFontData( const void* pData, long nDataLen );
 
     virtual void            GetGlyphWidths( const ImplFontData* pFont,
                                             bool bVertical,
@@ -318,7 +318,7 @@ public:
     virtual BOOL                    GetGlyphOutline( long nIndex, ::basegfx::B2DPolyPolygon& );
 
     virtual SalLayout*              GetTextLayout( ImplLayoutArgs&, int nFallbackLevel );
-    virtual void                     DrawServerFontLayout( const ServerFontLayout& );
+    virtual void					 DrawServerFontLayout( const ServerFontLayout& );
     virtual bool            supportsOperation( OutDevSupportType ) const;
 
     // Query the platform layer for control support
@@ -336,11 +336,11 @@ void ImplSalDeInitGraphics( Os2SalGraphics* mpData );
 // - Defines -
 // -----------
 
-#define RGBCOLOR(r,g,b)     ((ULONG)(((BYTE)(b)|((USHORT)(g)<<8))|(((ULONG)(BYTE)(r))<<16)))
-#define TY( y )             (mnHeight-(y)-1)
+#define RGBCOLOR(r,g,b) 	((ULONG)(((BYTE)(b)|((USHORT)(g)<<8))|(((ULONG)(BYTE)(r))<<16)))
+#define TY( y ) 			(mnHeight-(y)-1)
 
 // offset for lcid field, used for fallback font selection
-#define LCID_BASE                       100
+#define LCID_BASE						100
 
 // -----------
 // - Inlines -
diff --git a/vcl/os2/inc/salids.hrc b/vcl/os2/inc/salids.hrc
index b5f2260d307f..7a8dcc8c0568 100644
--- a/vcl/os2/inc/salids.hrc
+++ b/vcl/os2/inc/salids.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
@@ -29,74 +29,74 @@
 #define _SV_SALIDS_HRC
 
 // Pointer
-#define SAL_RESID_POINTER_NULL                      10000
-#define SAL_RESID_POINTER_HELP                      10001
-#define SAL_RESID_POINTER_CROSS                     10002
-#define SAL_RESID_POINTER_MOVE                      10003
-#define SAL_RESID_POINTER_HSPLIT                    10004
-#define SAL_RESID_POINTER_VSPLIT                    10005
-#define SAL_RESID_POINTER_HSIZEBAR                  10006
-#define SAL_RESID_POINTER_VSIZEBAR                  10007
-#define SAL_RESID_POINTER_HAND                      10008
-#define SAL_RESID_POINTER_REFHAND                   10009
-#define SAL_RESID_POINTER_PEN                       10010
-#define SAL_RESID_POINTER_MAGNIFY                   10011
-#define SAL_RESID_POINTER_FILL                      10012
-#define SAL_RESID_POINTER_ROTATE                    10013
-#define SAL_RESID_POINTER_HSHEAR                    10014
-#define SAL_RESID_POINTER_VSHEAR                    10015
-#define SAL_RESID_POINTER_MIRROR                    10016
-#define SAL_RESID_POINTER_CROOK                     10017
-#define SAL_RESID_POINTER_CROP                      10018
-#define SAL_RESID_POINTER_MOVEPOINT                 10019
-#define SAL_RESID_POINTER_MOVEBEZIERWEIGHT          10020
-#define SAL_RESID_POINTER_MOVEDATA                  10021
-#define SAL_RESID_POINTER_COPYDATA                  10022
-#define SAL_RESID_POINTER_LINKDATA                  10023
-#define SAL_RESID_POINTER_MOVEDATALINK              10024
-#define SAL_RESID_POINTER_COPYDATALINK              10025
-#define SAL_RESID_POINTER_MOVEFILE                  10026
-#define SAL_RESID_POINTER_COPYFILE                  10027
-#define SAL_RESID_POINTER_LINKFILE                  10028
-#define SAL_RESID_POINTER_MOVEFILELINK              10029
-#define SAL_RESID_POINTER_COPYFILELINK              10030
-#define SAL_RESID_POINTER_MOVEFILES                 10031
-#define SAL_RESID_POINTER_COPYFILES                 10032
-#define SAL_RESID_POINTER_DRAW_LINE                 10033
-#define SAL_RESID_POINTER_DRAW_RECT                 10034
-#define SAL_RESID_POINTER_DRAW_POLYGON              10035
-#define SAL_RESID_POINTER_DRAW_BEZIER               10036
-#define SAL_RESID_POINTER_DRAW_ARC                  10037
-#define SAL_RESID_POINTER_DRAW_PIE                  10038
-#define SAL_RESID_POINTER_DRAW_CIRCLECUT            10039
-#define SAL_RESID_POINTER_DRAW_ELLIPSE              10040
-#define SAL_RESID_POINTER_DRAW_FREEHAND             10041
-#define SAL_RESID_POINTER_DRAW_CONNECT              10042
-#define SAL_RESID_POINTER_DRAW_TEXT                 10043
-#define SAL_RESID_POINTER_DRAW_CAPTION              10044
-#define SAL_RESID_POINTER_CHART                     10045
-#define SAL_RESID_POINTER_DETECTIVE                 10046
-#define SAL_RESID_POINTER_PIVOT_COL                 10047
-#define SAL_RESID_POINTER_PIVOT_ROW                 10048
-#define SAL_RESID_POINTER_PIVOT_FIELD               10049
-#define SAL_RESID_POINTER_CHAIN                     10050
-#define SAL_RESID_POINTER_CHAIN_NOTALLOWED          10051
-#define SAL_RESID_POINTER_TIMEEVENT_MOVE            10052
-#define SAL_RESID_POINTER_TIMEEVENT_SIZE            10053
-#define SAL_RESID_POINTER_AUTOSCROLL_N              10054
-#define SAL_RESID_POINTER_AUTOSCROLL_S              10055
-#define SAL_RESID_POINTER_AUTOSCROLL_W              10056
-#define SAL_RESID_POINTER_AUTOSCROLL_E              10057
-#define SAL_RESID_POINTER_AUTOSCROLL_NW             10058
-#define SAL_RESID_POINTER_AUTOSCROLL_NE             10059
-#define SAL_RESID_POINTER_AUTOSCROLL_SW             10060
-#define SAL_RESID_POINTER_AUTOSCROLL_SE             10061
-#define SAL_RESID_POINTER_AUTOSCROLL_NS             10062
-#define SAL_RESID_POINTER_AUTOSCROLL_WE             10063
-#define SAL_RESID_POINTER_AUTOSCROLL_NSWE           10064
+#define SAL_RESID_POINTER_NULL						10000
+#define SAL_RESID_POINTER_HELP						10001
+#define SAL_RESID_POINTER_CROSS 					10002
+#define SAL_RESID_POINTER_MOVE						10003
+#define SAL_RESID_POINTER_HSPLIT					10004
+#define SAL_RESID_POINTER_VSPLIT					10005
+#define SAL_RESID_POINTER_HSIZEBAR					10006
+#define SAL_RESID_POINTER_VSIZEBAR					10007
+#define SAL_RESID_POINTER_HAND						10008
+#define SAL_RESID_POINTER_REFHAND					10009
+#define SAL_RESID_POINTER_PEN						10010
+#define SAL_RESID_POINTER_MAGNIFY					10011
+#define SAL_RESID_POINTER_FILL						10012
+#define SAL_RESID_POINTER_ROTATE					10013
+#define SAL_RESID_POINTER_HSHEAR					10014
+#define SAL_RESID_POINTER_VSHEAR					10015
+#define SAL_RESID_POINTER_MIRROR					10016
+#define SAL_RESID_POINTER_CROOK 					10017
+#define SAL_RESID_POINTER_CROP						10018
+#define SAL_RESID_POINTER_MOVEPOINT 				10019
+#define SAL_RESID_POINTER_MOVEBEZIERWEIGHT			10020
+#define SAL_RESID_POINTER_MOVEDATA					10021
+#define SAL_RESID_POINTER_COPYDATA					10022
+#define SAL_RESID_POINTER_LINKDATA					10023
+#define SAL_RESID_POINTER_MOVEDATALINK				10024
+#define SAL_RESID_POINTER_COPYDATALINK				10025
+#define SAL_RESID_POINTER_MOVEFILE					10026
+#define SAL_RESID_POINTER_COPYFILE					10027
+#define SAL_RESID_POINTER_LINKFILE					10028
+#define SAL_RESID_POINTER_MOVEFILELINK				10029
+#define SAL_RESID_POINTER_COPYFILELINK				10030
+#define SAL_RESID_POINTER_MOVEFILES 				10031
+#define SAL_RESID_POINTER_COPYFILES 				10032
+#define SAL_RESID_POINTER_DRAW_LINE 				10033
+#define SAL_RESID_POINTER_DRAW_RECT 				10034
+#define SAL_RESID_POINTER_DRAW_POLYGON				10035
+#define SAL_RESID_POINTER_DRAW_BEZIER				10036
+#define SAL_RESID_POINTER_DRAW_ARC					10037
+#define SAL_RESID_POINTER_DRAW_PIE					10038
+#define SAL_RESID_POINTER_DRAW_CIRCLECUT			10039
+#define SAL_RESID_POINTER_DRAW_ELLIPSE				10040
+#define SAL_RESID_POINTER_DRAW_FREEHAND 			10041
+#define SAL_RESID_POINTER_DRAW_CONNECT				10042
+#define SAL_RESID_POINTER_DRAW_TEXT 				10043
+#define SAL_RESID_POINTER_DRAW_CAPTION				10044
+#define SAL_RESID_POINTER_CHART 					10045
+#define SAL_RESID_POINTER_DETECTIVE 				10046
+#define SAL_RESID_POINTER_PIVOT_COL 				10047
+#define SAL_RESID_POINTER_PIVOT_ROW 				10048
+#define SAL_RESID_POINTER_PIVOT_FIELD				10049
+#define SAL_RESID_POINTER_CHAIN 					10050
+#define SAL_RESID_POINTER_CHAIN_NOTALLOWED			10051
+#define SAL_RESID_POINTER_TIMEEVENT_MOVE			10052
+#define SAL_RESID_POINTER_TIMEEVENT_SIZE			10053
+#define SAL_RESID_POINTER_AUTOSCROLL_N				10054
+#define SAL_RESID_POINTER_AUTOSCROLL_S				10055
+#define SAL_RESID_POINTER_AUTOSCROLL_W				10056
+#define SAL_RESID_POINTER_AUTOSCROLL_E				10057
+#define SAL_RESID_POINTER_AUTOSCROLL_NW 			10058
+#define SAL_RESID_POINTER_AUTOSCROLL_NE 			10059
+#define SAL_RESID_POINTER_AUTOSCROLL_SW 			10060
+#define SAL_RESID_POINTER_AUTOSCROLL_SE 			10061
+#define SAL_RESID_POINTER_AUTOSCROLL_NS 			10062
+#define SAL_RESID_POINTER_AUTOSCROLL_WE 			10063
+#define SAL_RESID_POINTER_AUTOSCROLL_NSWE			10064
 #define SAL_RESID_POINTER_AIRBRUSH                              10070
-#define SAL_RESID_POINTER_TEXT_VERTICAL             10071
-#define SAL_RESID_POINTER_PIVOT_DELETE              10072
+#define SAL_RESID_POINTER_TEXT_VERTICAL 			10071
+#define SAL_RESID_POINTER_PIVOT_DELETE				10072
 #define SAL_RESID_POINTER_TAB_SELECT_S                          10073
 #define SAL_RESID_POINTER_TAB_SELECT_E                          10074
 #define SAL_RESID_POINTER_TAB_SELECT_SE                         10075
@@ -104,6 +104,6 @@
 #define SAL_RESID_POINTER_TAB_SELECT_SW                         10077
 #define SAL_RESID_POINTER_PAINTBRUSH                            10078
 
-#define SAL_RESID_ICON_DEFAULT                      1
+#define SAL_RESID_ICON_DEFAULT						1
 
 #endif // _SV_SALIDS_HRC
diff --git a/vcl/os2/inc/salinst.h b/vcl/os2/inc/salinst.h
index 0948f605c286..a13d083c1e32 100644
--- a/vcl/os2/inc/salinst.h
+++ b/vcl/os2/inc/salinst.h
@@ -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
@@ -39,61 +39,61 @@ namespace vos { class OMutex; }
 
 class SalYieldMutex;
 
-#define SAL_COMMANDLINENOINIT   ((USHORT)0xFFFF)
-#define SAL_MAXPARAM            40
+#define SAL_COMMANDLINENOINIT	((USHORT)0xFFFF)
+#define SAL_MAXPARAM			40
 
 class Os2SalInstance : public SalInstance
 {
 public:
-    HAB                     mhAB;                   // anchor block handle
-    HMQ                     mhMQ;                   // handle of os2 message queue
-    HPOINTER                mhAppIcon;              // app icon
-    int                     mnArgc;                 // commandline param count
-    char**                  mpArgv;                 // commandline
-    HWND                    mhComWnd;               // window, for communication (between threads and the main thread)
-    SalYieldMutex*          mpSalYieldMutex;        // Sal-Yield-Mutex
-    vos::OMutex*            mpSalWaitMutex;         // Sal-Wait-Mutex
-    USHORT              mnYieldWaitCount;       // Wait-Count
+    HAB 					mhAB;					// anchor block handle
+    HMQ 					mhMQ;					// handle of os2 message queue
+    HPOINTER				mhAppIcon;				// app icon
+    int 					mnArgc; 				// commandline param count
+    char**					mpArgv; 				// commandline
+    HWND					mhComWnd;				// window, for communication (between threads and the main thread)
+    SalYieldMutex*			mpSalYieldMutex;		// Sal-Yield-Mutex
+    vos::OMutex*			mpSalWaitMutex; 		// Sal-Wait-Mutex
+    USHORT				mnYieldWaitCount;		// Wait-Count
 
 public:
     Os2SalInstance();
     virtual ~Os2SalInstance();
 
-    virtual SalFrame*       CreateChildFrame( SystemParentData* pParent, ULONG nStyle );
-    virtual SalFrame*       CreateFrame( SalFrame* pParent, ULONG nStyle );
-    virtual void            DestroyFrame( SalFrame* pFrame );
-    virtual SalObject*      CreateObject( SalFrame* pParent, SystemWindowData* pWindowData, BOOL bShow = TRUE );
-    virtual void            DestroyObject( SalObject* pObject );
-    virtual SalVirtualDevice*   CreateVirtualDevice( SalGraphics* pGraphics,
+    virtual SalFrame*      	CreateChildFrame( SystemParentData* pParent, ULONG nStyle );
+    virtual SalFrame*      	CreateFrame( SalFrame* pParent, ULONG nStyle );
+    virtual void			DestroyFrame( SalFrame* pFrame );
+    virtual SalObject*		CreateObject( SalFrame* pParent, SystemWindowData* pWindowData, BOOL bShow = TRUE );
+    virtual void			DestroyObject( SalObject* pObject );
+    virtual SalVirtualDevice*	CreateVirtualDevice( SalGraphics* pGraphics,
                                                      long nDX, long nDY,
                                                      USHORT nBitCount, const SystemGraphicsData *pData );
-    virtual void            DestroyVirtualDevice( SalVirtualDevice* pDevice );
+    virtual void			DestroyVirtualDevice( SalVirtualDevice* pDevice );
 
-    virtual SalInfoPrinter* CreateInfoPrinter( SalPrinterQueueInfo* pQueueInfo,
+    virtual SalInfoPrinter*	CreateInfoPrinter( SalPrinterQueueInfo* pQueueInfo,
                                                ImplJobSetup* pSetupData );
-    virtual void            DestroyInfoPrinter( SalInfoPrinter* pPrinter );
-    virtual SalPrinter*     CreatePrinter( SalInfoPrinter* pInfoPrinter );
-    virtual void            DestroyPrinter( SalPrinter* pPrinter );
-    virtual void            GetPrinterQueueInfo( ImplPrnQueueList* pList );
-    virtual void            GetPrinterQueueState( SalPrinterQueueInfo* pInfo );
-    virtual void            DeletePrinterQueueInfo( SalPrinterQueueInfo* pInfo );
+    virtual void			DestroyInfoPrinter( SalInfoPrinter* pPrinter );
+    virtual SalPrinter*		CreatePrinter( SalInfoPrinter* pInfoPrinter );
+    virtual void			DestroyPrinter( SalPrinter* pPrinter );
+    virtual void			GetPrinterQueueInfo( ImplPrnQueueList* pList );
+    virtual void			GetPrinterQueueState( SalPrinterQueueInfo* pInfo );
+    virtual void			DeletePrinterQueueInfo( SalPrinterQueueInfo* pInfo );
     virtual String             GetDefaultPrinter();
-    virtual SalTimer*           CreateSalTimer();
-    virtual SalI18NImeStatus*   CreateI18NImeStatus();
-    virtual SalSystem*          CreateSalSystem();
-    virtual SalBitmap*          CreateSalBitmap();
-    virtual vos::IMutex*        GetYieldMutex();
-    virtual ULONG               ReleaseYieldMutex();
-    virtual void                AcquireYieldMutex( ULONG nCount );
-    virtual void                Yield( bool, bool );
-    virtual bool                AnyInput( USHORT nType );
-    virtual SalMenu*                CreateMenu( BOOL bMenuBar );
-    virtual void                DestroyMenu( SalMenu* );
-    virtual SalMenuItem*            CreateMenuItem( const SalItemParams* pItemData );
-    virtual void                DestroyMenuItem( SalMenuItem* );
+    virtual SalTimer*			CreateSalTimer();
+    virtual SalI18NImeStatus*	CreateI18NImeStatus();
+    virtual SalSystem*			CreateSalSystem();
+    virtual SalBitmap*			CreateSalBitmap();
+    virtual vos::IMutex*		GetYieldMutex();
+    virtual ULONG				ReleaseYieldMutex();
+    virtual void				AcquireYieldMutex( ULONG nCount );
+    virtual void				Yield( bool, bool );
+    virtual bool				AnyInput( USHORT nType );
+    virtual SalMenu*				CreateMenu( BOOL bMenuBar );
+    virtual void				DestroyMenu( SalMenu* );
+    virtual SalMenuItem*			CreateMenuItem( const SalItemParams* pItemData );
+    virtual void				DestroyMenuItem( SalMenuItem* );
     virtual SalSession*                         CreateSalSession();
-    virtual void*               GetConnectionIdentifier( ConnectionIdentifierType& rReturnedType, int& rReturnedBytes );
-    virtual void                AddToRecentDocumentList(const rtl::OUString& rFileUrl, const rtl::OUString& rMimeType);
+    virtual void*				GetConnectionIdentifier( ConnectionIdentifierType& rReturnedType, int& rReturnedBytes );
+    virtual void				AddToRecentDocumentList(const rtl::OUString& rFileUrl, const rtl::OUString& rMimeType);
 };
 
 SalFrame* ImplSalCreateFrame( Os2SalInstance* pInst, HWND hWndParent, ULONG nSalFrameStyle );
diff --git a/vcl/os2/inc/sallang.hxx b/vcl/os2/inc/sallang.hxx
index 72d2566571a6..22e80aa2377d 100644
--- a/vcl/os2/inc/sallang.hxx
+++ b/vcl/os2/inc/sallang.hxx
@@ -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
@@ -38,28 +38,28 @@
 // --------------------
 
 // --- Key-Namen ---
-#define LSTR_KEY_SHIFT                       0
-#define LSTR_KEY_CTRL                        1
-#define LSTR_KEY_ALT                         2
-#define LSTR_KEY_UP                          3
-#define LSTR_KEY_DOWN                        4
-#define LSTR_KEY_LEFT                        5
-#define LSTR_KEY_RIGHT                       6
-#define LSTR_KEY_HOME                        7
-#define LSTR_KEY_END                         8
-#define LSTR_KEY_PAGEUP                      9
-#define LSTR_KEY_PAGEDOWN                   10
-#define LSTR_KEY_RETURN                     11
-#define LSTR_KEY_ESC                        12
-#define LSTR_KEY_TAB                        13
-#define LSTR_KEY_BACKSPACE                  14
-#define LSTR_KEY_SPACE                      15
-#define LSTR_KEY_INSERT                     16
-#define LSTR_KEY_DELETE                     17
+#define LSTR_KEY_SHIFT						 0
+#define LSTR_KEY_CTRL						 1
+#define LSTR_KEY_ALT						 2
+#define LSTR_KEY_UP 						 3
+#define LSTR_KEY_DOWN						 4
+#define LSTR_KEY_LEFT						 5
+#define LSTR_KEY_RIGHT						 6
+#define LSTR_KEY_HOME						 7
+#define LSTR_KEY_END						 8
+#define LSTR_KEY_PAGEUP 					 9
+#define LSTR_KEY_PAGEDOWN					10
+#define LSTR_KEY_RETURN 					11
+#define LSTR_KEY_ESC						12
+#define LSTR_KEY_TAB						13
+#define LSTR_KEY_BACKSPACE					14
+#define LSTR_KEY_SPACE						15
+#define LSTR_KEY_INSERT 					16
+#define LSTR_KEY_DELETE 					17
 
 // --- Anzahl der Texte ---
 
-#define LSTR_COUNT                          18
+#define LSTR_COUNT							18
 
 // --------------------------------------------
 // - Methoden zum Abfragen der Sprach-Strings -
diff --git a/vcl/os2/inc/sallayout.h b/vcl/os2/inc/sallayout.h
index 8444b5e758a9..973b445eaa5b 100644
--- a/vcl/os2/inc/sallayout.h
+++ b/vcl/os2/inc/sallayout.h
@@ -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
@@ -43,8 +43,8 @@ public:
     virtual void    DrawText( SalGraphics& ) const;
 
 protected:
-    HPS                 mhPS;
-    FONTMETRICS         FontMetrics;
+    HPS					mhPS;
+    FONTMETRICS			FontMetrics;
     int                 mnBaseAdv;
 
 private:
diff --git a/vcl/os2/inc/salmenu.h b/vcl/os2/inc/salmenu.h
index 081158bf81f7..bd673294bde5 100644
--- a/vcl/os2/inc/salmenu.h
+++ b/vcl/os2/inc/salmenu.h
@@ -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
diff --git a/vcl/os2/inc/salobj.h b/vcl/os2/inc/salobj.h
index 5b4ac21ccdd6..43e3976e089b 100644
--- a/vcl/os2/inc/salobj.h
+++ b/vcl/os2/inc/salobj.h
@@ -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
@@ -38,32 +38,32 @@
 class Os2SalObject : public SalObject
 {
 public:
-    HWND                    mhWnd;                  // Window handle
-    HWND                    mhWndChild;             // Child Window handle
-    HWND                    mhLastFocusWnd;         // Child-Window, welches als letztes den Focus hatte
-    SystemChildData         maSysData;              // SystemEnvData
-    HWND                    mhLastClipWnd;          // LastClip-Window
-    HWND                    mhOldLastClipWnd;       // LastClip-Window befor BeginSetClipRegion
-    long                    mnHeight;               // Fenster-Hoehe fuer Positionsumrechnung
-    Os2SalObject*               mpNextObject;           // pointer to next object
-    void*                   mpInst;                 // instance handle for callback
-    SALOBJECTPROC           mpProc;                 // callback proc
+    HWND					mhWnd;					// Window handle
+    HWND					mhWndChild; 			// Child Window handle
+    HWND					mhLastFocusWnd; 		// Child-Window, welches als letztes den Focus hatte
+    SystemChildData 		maSysData;				// SystemEnvData
+    HWND					mhLastClipWnd;			// LastClip-Window
+    HWND					mhOldLastClipWnd;		// LastClip-Window befor BeginSetClipRegion
+    long					mnHeight;				// Fenster-Hoehe fuer Positionsumrechnung
+    Os2SalObject*				mpNextObject;			// pointer to next object
+    void*					mpInst; 				// instance handle for callback
+    SALOBJECTPROC			mpProc; 				// callback proc
 
     Os2SalObject();
     virtual ~Os2SalObject();
 
-    virtual void                    ResetClipRegion();
-    virtual USHORT                  GetClipRegionType();
-    virtual void                    BeginSetClipRegion( ULONG nRects );
-    virtual void                    UnionClipRegion( long nX, long nY, long nWidth, long nHeight );
-    virtual void                    EndSetClipRegion();
-    virtual void                    SetPosSize( long nX, long nY, long nWidth, long nHeight );
-    virtual void                    Show( BOOL bVisible );
-    virtual void                    Enable( BOOL nEnable );
-    virtual void                    GrabFocus();
-    virtual void                    SetBackground();
-    virtual void                    SetBackground( SalColor nSalColor );
-    virtual const SystemEnvData*    GetSystemData() const;
+    virtual void					ResetClipRegion();
+    virtual USHORT					GetClipRegionType();
+    virtual void					BeginSetClipRegion( ULONG nRects );
+    virtual void					UnionClipRegion( long nX, long nY, long nWidth, long nHeight );
+    virtual void					EndSetClipRegion();
+    virtual void					SetPosSize( long nX, long nY, long nWidth, long nHeight );
+    virtual void					Show( BOOL bVisible );
+    virtual void					Enable( BOOL nEnable );
+    virtual void					GrabFocus();
+    virtual void					SetBackground();
+    virtual void					SetBackground( SalColor nSalColor );
+    virtual const SystemEnvData*	GetSystemData() const;
 };
 
 #endif // _SV_SALOBJ_H
diff --git a/vcl/os2/inc/salprn.h b/vcl/os2/inc/salprn.h
index 4cb7700ffaae..9fd0ab1d7e10 100644
--- a/vcl/os2/inc/salprn.h
+++ b/vcl/os2/inc/salprn.h
@@ -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
@@ -47,39 +47,39 @@ typedef ImplTrayInfo* PIMPLTRAYINFO;
 class Os2SalInfoPrinter : public SalInfoPrinter
 {
 public:
-    Os2SalGraphics*         mpGraphics;             // Graphics
-    HDC                     mhDC;                   // printer hdc
-    HPS                     mhPS;                   // printer hps
-    ByteString                  maPrinterName;          // pszPrinters
-    ByteString                  maName;                 // pszName bzw. LogAdress
-    ByteString                  maDriverName;           // pszDriverName nach .
-    ByteString                  maDeviceName;           // pszDriverName bis .
-    ByteString                  maJobSetupDeviceName;   // DeviceName aus pDriverData
-    PIMPLFORMINFO*          mpFormArray;            // PaperForm-Names
-    USHORT                  mnFormCount;            // PaperForm-Count
-    PIMPLTRAYINFO*          mpTrayArray;            // PaperTray-Names
-    USHORT                  mnTrayCount;            // PaperTray-Count
-    BOOL                    mbDJPSupported;         // is driver DJP enabled
-    BOOL                    mbGraphics;             // is Graphics used
+    Os2SalGraphics*			mpGraphics; 			// Graphics
+    HDC 					mhDC;					// printer hdc
+    HPS 					mhPS;					// printer hps
+    ByteString					maPrinterName;			// pszPrinters
+    ByteString					maName; 				// pszName bzw. LogAdress
+    ByteString					maDriverName;			// pszDriverName nach .
+    ByteString					maDeviceName;			// pszDriverName bis .
+    ByteString					maJobSetupDeviceName;	// DeviceName aus pDriverData
+    PIMPLFORMINFO*			mpFormArray;			// PaperForm-Names
+    USHORT					mnFormCount;			// PaperForm-Count
+    PIMPLTRAYINFO*			mpTrayArray;			// PaperTray-Names
+    USHORT					mnTrayCount;			// PaperTray-Count
+    BOOL					mbDJPSupported; 		// is driver DJP enabled
+    BOOL					mbGraphics; 			// is Graphics used
 
 public:
     Os2SalInfoPrinter();
     virtual ~Os2SalInfoPrinter();
 
-    virtual SalGraphics*            GetGraphics();
-    virtual void                    ReleaseGraphics( SalGraphics* pGraphics );
-    virtual BOOL                    Setup( SalFrame* pFrame, ImplJobSetup* pSetupData );
-    virtual BOOL                    SetPrinterData( ImplJobSetup* pSetupData );
-    virtual BOOL                    SetData( ULONG nFlags, ImplJobSetup* pSetupData );
-    virtual void                    GetPageInfo( const ImplJobSetup* pSetupData,
+    virtual SalGraphics*			GetGraphics();
+    virtual void					ReleaseGraphics( SalGraphics* pGraphics );
+    virtual BOOL					Setup( SalFrame* pFrame, ImplJobSetup* pSetupData );
+    virtual BOOL					SetPrinterData( ImplJobSetup* pSetupData );
+    virtual BOOL					SetData( ULONG nFlags, ImplJobSetup* pSetupData );
+    virtual void					GetPageInfo( const ImplJobSetup* pSetupData,
                                                  long& rOutWidth, long& rOutHeight,
                                                  long& rPageOffX, long& rPageOffY,
                                                  long& rPageWidth, long& rPageHeight );
-    virtual ULONG                   GetCapabilities( const ImplJobSetup* pSetupData, USHORT nType );
-    virtual ULONG                   GetPaperBinCount( const ImplJobSetup* pSetupData );
-    virtual String                  GetPaperBinName( const ImplJobSetup* pSetupData, ULONG nPaperBin );
-    virtual void                    InitPaperFormats( const ImplJobSetup* pSetupData );
-    virtual int                 GetLandscapeAngle( const ImplJobSetup* pSetupData );
+    virtual ULONG					GetCapabilities( const ImplJobSetup* pSetupData, USHORT nType );
+    virtual ULONG					GetPaperBinCount( const ImplJobSetup* pSetupData );
+    virtual String					GetPaperBinName( const ImplJobSetup* pSetupData, ULONG nPaperBin );
+    virtual void					InitPaperFormats( const ImplJobSetup* pSetupData );
+    virtual int					GetLandscapeAngle( const ImplJobSetup* pSetupData );
 };
 
 // ------------------
@@ -89,16 +89,16 @@ public:
 class SalPrinterData00
 {
 public:
-    Os2SalGraphics*         mpGraphics;             // current Printer graphics
-    SalInfoPrinter*         mpInfoPrinter;          // pointer to the compatible InfoPrinter
-    HDC                     mhDC;                   // printer hdc
-    HPS                     mhPS;                   // printer hps
-    ULONG                   mnError;                // Error Code
-    BOOL                    mbFirstPage;            // IsFirstPage
-    BOOL                    mbAbort;                // JobAborted
-    BOOL                    mbPrintDJPSupported;    // is driver PrintDJP enabled (DEVESC_NEWFRAME_WPROP)
-    char                    maCommentBuf[33];       // Comment
-    char                    maCopyBuf[10];          // Kopien
+    Os2SalGraphics*			mpGraphics; 			// current Printer graphics
+    SalInfoPrinter* 		mpInfoPrinter;			// pointer to the compatible InfoPrinter
+    HDC 					mhDC;					// printer hdc
+    HPS 					mhPS;					// printer hps
+    ULONG					mnError;				// Error Code
+    BOOL					mbFirstPage;			// IsFirstPage
+    BOOL					mbAbort;				// JobAborted
+    BOOL					mbPrintDJPSupported;	// is driver PrintDJP enabled (DEVESC_NEWFRAME_WPROP)
+    char					maCommentBuf[33];		// Comment
+    char					maCopyBuf[10];			// Kopien
 };
 
 // -----------------
@@ -108,39 +108,39 @@ public:
 class Os2SalPrinter : public SalPrinter
 {
 public:
-    Os2SalGraphics*         mpGraphics;             // current Printer graphics
-    Os2SalInfoPrinter*      mpInfoPrinter;          // pointer to the compatible InfoPrinter
-    Os2SalPrinter*          mpNextPrinter;          // next printing printer
-    HDC                     mhDC;                   // printer hdc
-    HPS                     mhPS;                   // printer hps
-    ULONG                   mnError;                // Error Code
-    BOOL                    mbFirstPage;            // IsFirstPage
-    BOOL                    mbAbort;                // JobAborted
-    BOOL                    mbPrintDJPSupported;    // is driver PrintDJP enabled (DEVESC_NEWFRAME_WPROP)
-    char                    maCommentBuf[33];       // Comment
-    char                    maCopyBuf[16];          // Kopien
-    //HDC                   mhDC;                   // printer hdc
-    //ULONG                 mnError;                // Error Code
-    //ULONG                 mnCopies;               // Kopien
-    //BOOL                  mbCollate;              // Sortierte Kopien
-    //BOOL                  mbAbort;                // Job Aborted
+    Os2SalGraphics*			mpGraphics; 			// current Printer graphics
+    Os2SalInfoPrinter* 		mpInfoPrinter;			// pointer to the compatible InfoPrinter
+    Os2SalPrinter* 			mpNextPrinter;			// next printing printer
+    HDC 					mhDC;					// printer hdc
+    HPS 					mhPS;					// printer hps
+    ULONG					mnError;				// Error Code
+    BOOL					mbFirstPage;			// IsFirstPage
+    BOOL					mbAbort;				// JobAborted
+    BOOL					mbPrintDJPSupported;	// is driver PrintDJP enabled (DEVESC_NEWFRAME_WPROP)
+    char					maCommentBuf[33];		// Comment
+    char					maCopyBuf[16];			// Kopien
+    //HDC 					mhDC;					// printer hdc
+    //ULONG					mnError;				// Error Code
+    //ULONG					mnCopies;				// Kopien
+    //BOOL					mbCollate;				// Sortierte Kopien
+    //BOOL					mbAbort;				// Job Aborted
 
 public:
     Os2SalPrinter();
     virtual ~Os2SalPrinter();
 
-    virtual BOOL                    StartJob( const XubString* pFileName,
+    virtual BOOL					StartJob( const XubString* pFileName,
                                               const XubString& rJobName,
                                               const XubString& rAppName,
                                               ULONG nCopies,
                                               bool bCollate,
                                               bool bDirect,
                                               ImplJobSetup* pSetupData );
-    virtual BOOL                    EndJob();
-    virtual BOOL                    AbortJob();
-    virtual SalGraphics*            StartPage( ImplJobSetup* pSetupData, BOOL bNewJobData );
-    virtual BOOL                    EndPage();
-    virtual ULONG                   GetErrorCode();
+    virtual BOOL					EndJob();
+    virtual BOOL					AbortJob();
+    virtual SalGraphics*			StartPage( ImplJobSetup* pSetupData, BOOL bNewJobData );
+    virtual BOOL					EndPage();
+    virtual ULONG					GetErrorCode();
 };
 
 #endif // _SV_SALPRN_H
diff --git a/vcl/os2/inc/salsound.h b/vcl/os2/inc/salsound.h
index 62536678625d..06536a468bb7 100644
--- a/vcl/os2/inc/salsound.h
+++ b/vcl/os2/inc/salsound.h
@@ -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
@@ -45,50 +45,50 @@
 class Os2SalSound : public SalSound
 {
 private:
-
-    static HMODULE      mhMCILib;
-    static ULONG        mnSoundState;
-    static void*        mpMCIFnc;
-    SALSOUNDPROC        mpProc;
-    void*               mpInst;
-    ULONG               mnStartTime;
-    ULONG               mnPlayLen;
-    HWND                mhSoundWnd;
-    USHORT              mnDeviceId;
-    BOOL                mbLoop;
-    BOOL                mbPaused;
+                        
+    static HMODULE		mhMCILib;
+    static ULONG		mnSoundState;
+    static void*		mpMCIFnc;
+    SALSOUNDPROC		mpProc;
+    void*				mpInst;
+    ULONG				mnStartTime;
+    ULONG				mnPlayLen;
+    HWND				mhSoundWnd;
+    USHORT				mnDeviceId;
+    BOOL				mbLoop;
+    BOOL				mbPaused;
 
 public:
 
     void                ImplSetError( ULONG nMciErr );
-    void                ImplNotify( SoundNotification eNotification, ULONG nError );
+    void				ImplNotify( SoundNotification eNotification, ULONG nError );
 
-public:
+public:					
 
-    BOOL                Create();
-    //static BOOL           IsValid() { return( SOUND_STATE_VALID == Os2SalSound::mnSoundState ); }
-    //BOOL              Init( SalFrame* pFrame, const String& rSoundName, ULONG& rSoundLen );
-    //BOOL              Init( SalFrame* pFrame, const BYTE* pSound, ULONG nDataLen, ULONG& rSoundLen );
+    BOOL				Create();
+    //static BOOL			IsValid() { return( SOUND_STATE_VALID == Os2SalSound::mnSoundState ); } 
+    //BOOL				Init( SalFrame* pFrame, const String& rSoundName, ULONG& rSoundLen );
+    //BOOL				Init( SalFrame* pFrame, const BYTE* pSound, ULONG nDataLen, ULONG& rSoundLen );
 
-    void                SetNotifyProc( void* pInst, SALSOUNDPROC pProc )
+    void				SetNotifyProc( void* pInst, SALSOUNDPROC pProc ) 
                             { mpInst = pInst; mpProc = pProc; }
 public:
     Os2SalSound();
     virtual ~Os2SalSound();
+    
+    virtual bool		IsValid();
+    virtual bool		Init( const String& rSoundName, ULONG& rSoundLen );
+       virtual void		Play( ULONG nStartTime, ULONG nPlayTime, bool bLoop );
+    virtual void		Stop();
+    virtual void		Pause();
+    virtual void		Continue();
+    virtual bool		IsLoopMode() const;
+    virtual bool		IsPlaying() const;
+    virtual bool		IsPaused() const;
 
-    virtual bool        IsValid();
-    virtual bool        Init( const String& rSoundName, ULONG& rSoundLen );
-       virtual void     Play( ULONG nStartTime, ULONG nPlayTime, bool bLoop );
-    virtual void        Stop();
-    virtual void        Pause();
-    virtual void        Continue();
-    virtual bool        IsLoopMode() const;
-    virtual bool        IsPlaying() const;
-    virtual bool        IsPaused() const;
-
-    bool                ImplCreate();
-    void                ImplDestroy();
-    static void         Release();
+    bool				ImplCreate();
+    void				ImplDestroy();
+    static void 		Release();
 };
 
 #endif // _SV_SALSOUND_H
diff --git a/vcl/os2/inc/salsound.hxx b/vcl/os2/inc/salsound.hxx
index 7ec2aeed1720..4d1c43b6868b 100644
--- a/vcl/os2/inc/salsound.hxx
+++ b/vcl/os2/inc/salsound.hxx
@@ -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
@@ -44,40 +44,40 @@
 class SalSound
 {
 private:
-
-    static HMODULE      mhMCILib;
-    static ULONG        mnSoundState;
-    static void*        mpMCIFnc;
-    SALSOUNDPROC        mpProc;
-    void*               mpInst;
-    ULONG               mnStartTime;
-    ULONG               mnPlayLen;
-    HWND                mhSoundWnd;
-    USHORT              mnDeviceId;
-    BOOL                mbLoop;
-    BOOL                mbPaused;
+                        
+    static HMODULE		mhMCILib;
+    static ULONG		mnSoundState;
+    static void*		mpMCIFnc;
+    SALSOUNDPROC		mpProc;
+    void*				mpInst;
+    ULONG				mnStartTime;
+    ULONG				mnPlayLen;
+    HWND				mhSoundWnd;
+    USHORT				mnDeviceId;
+    BOOL				mbLoop;
+    BOOL				mbPaused;
 
 public:
 
     void                ImplSetError( ULONG nMciErr );
-    void                ImplNotify( SoundNotification eNotification, ULONG nError );
-
-public:
+    void				ImplNotify( SoundNotification eNotification, ULONG nError );
 
+public:					
+                        
                         SalSound();
                         ~SalSound();
 
-    BOOL                Create();
-    static void         Release();
-    static BOOL         IsValid() { return( SOUND_STATE_VALID == SalSound::mnSoundState ); }
+    BOOL				Create();
+    static void			Release();
+    static BOOL			IsValid() { return( SOUND_STATE_VALID == SalSound::mnSoundState ); } 
 
-    BOOL                Init( SalFrame* pFrame, const String& rSoundName, ULONG& rSoundLen );
-    BOOL                Init( SalFrame* pFrame, const BYTE* pSound, ULONG nDataLen, ULONG& rSoundLen );
-    void                Play( ULONG nStartTime, ULONG nPlayTime, BOOL bLoop );
-    void                Stop();
-    void                Pause();
+    BOOL				Init( SalFrame* pFrame, const String& rSoundName, ULONG& rSoundLen );
+    BOOL				Init( SalFrame* pFrame, const BYTE* pSound, ULONG nDataLen, ULONG& rSoundLen );
+    void				Play( ULONG nStartTime, ULONG nPlayTime, BOOL bLoop );
+    void				Stop();
+    void				Pause();
 
-    void                SetNotifyProc( void* pInst, SALSOUNDPROC pProc )
+    void				SetNotifyProc( void* pInst, SALSOUNDPROC pProc ) 
                             { mpInst = pInst; mpProc = pProc; }
 };
 
diff --git a/vcl/os2/inc/salsys.h b/vcl/os2/inc/salsys.h
index fa76ac349cc9..fb0466dd8876 100644
--- a/vcl/os2/inc/salsys.h
+++ b/vcl/os2/inc/salsys.h
@@ -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
diff --git a/vcl/os2/inc/saltimer.h b/vcl/os2/inc/saltimer.h
index 069e97755d05..04748d0af6a8 100644
--- a/vcl/os2/inc/saltimer.h
+++ b/vcl/os2/inc/saltimer.h
@@ -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
@@ -37,8 +37,8 @@ public:
     virtual ~Os2SalTimer();
 
     // overload all pure virtual methods
-    void            Start( ULONG nMS );
-    void            Stop();
+    void 			Start( ULONG nMS );
+    void 			Stop();
 };
 
 #endif
diff --git a/vcl/os2/inc/salvd.h b/vcl/os2/inc/salvd.h
index 8f841f941430..876ed73b05a5 100644
--- a/vcl/os2/inc/salvd.h
+++ b/vcl/os2/inc/salvd.h
@@ -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
@@ -41,21 +41,21 @@ class Os2SalGraphics;
 class Os2SalVirtualDevice : public SalVirtualDevice
 {
 public:
-    HPS                     mhPS;                   // HPS
-    HDC                     mhDC;                   // HDC
-    HBITMAP                 mhBmp;                  // Memory Bitmap
-    HBITMAP                 mhDefBmp;               // Default Bitmap
-    Os2SalGraphics*         mpGraphics;             // current VirDev graphics
-    USHORT                  mnBitCount;             // BitCount (0 or 1)
-    BOOL                    mbGraphics;             // is Graphics used
+    HPS 					mhPS;					// HPS
+    HDC 					mhDC;					// HDC
+    HBITMAP 				mhBmp;					// Memory Bitmap
+    HBITMAP 				mhDefBmp;				// Default Bitmap
+    Os2SalGraphics*			mpGraphics; 			// current VirDev graphics
+    USHORT					mnBitCount; 			// BitCount (0 or 1)
+    BOOL					mbGraphics; 			// is Graphics used
 
     Os2SalVirtualDevice();
     virtual ~Os2SalVirtualDevice();
 
-    virtual SalGraphics*            GetGraphics();
-    virtual void                    ReleaseGraphics( SalGraphics* pGraphics );
+    virtual SalGraphics*			GetGraphics();
+    virtual void					ReleaseGraphics( SalGraphics* pGraphics );
     virtual BOOL                    SetSize( long nNewDX, long nNewDY );
-    virtual void                    GetSize( long& rWidth, long& rHeight );
+    virtual void				    GetSize( long& rWidth, long& rHeight );
 };
 
 // Help-Functions
diff --git a/vcl/os2/inc/svsys.h b/vcl/os2/inc/svsys.h
index 39544b83d875..eb0756ad7ccd 100644
--- a/vcl/os2/inc/svsys.h
+++ b/vcl/os2/inc/svsys.h
@@ -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
diff --git a/vcl/os2/inc/wingdi.h b/vcl/os2/inc/wingdi.h
index d6085abbd262..bd83ebf5868b 100644
--- a/vcl/os2/inc/wingdi.h
+++ b/vcl/os2/inc/wingdi.h
@@ -38,11 +38,11 @@ typedef struct tagTTPOLYGONHEADER
 
 typedef struct
 {
-    UINT    gmBlackBoxX;
-    UINT    gmBlackBoxY;
-    POINT   gmptGlyphOrigin;
-    SHORT   gmCellIncX;
-    SHORT   gmCellIncY;
+    UINT	gmBlackBoxX;
+    UINT	gmBlackBoxY;
+    POINT	gmptGlyphOrigin;
+    SHORT	gmCellIncX;
+    SHORT	gmCellIncY;
 } GLYPHMETRICS, *LPGLYPHMETRICS;
 
 #define GGO_METRICS         0
diff --git a/vcl/os2/source/app/salinfo.cxx b/vcl/os2/source/app/salinfo.cxx
index e48aacd4c521..f4d9fba871e5 100644
--- a/vcl/os2/source/app/salinfo.cxx
+++ b/vcl/os2/source/app/salinfo.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
@@ -151,7 +151,7 @@ int Os2SalSystem::ShowNativeMessageBox(const String& rTitle, const String& rMess
         pSVData->mpIntroWindow->Hide();
 
     return WinMessageBox(
-        HWND_DESKTOP, HWND_DESKTOP,
+        HWND_DESKTOP, HWND_DESKTOP, 
         (PSZ)CHAR_POINTER(rMessage),
         (PSZ)CHAR_POINTER(rTitle),
         0, nFlags);
diff --git a/vcl/os2/source/app/salinst.cxx b/vcl/os2/source/app/salinst.cxx
index b08a9769ccf4..f4696fccb94f 100644
--- a/vcl/os2/source/app/salinst.cxx
+++ b/vcl/os2/source/app/salinst.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
@@ -88,9 +88,9 @@ MRESULT EXPENTRY SalComWndProc( HWND hWnd, ULONG nMsg, MPARAM nMP1, MPARAM nMP2
 class SalYieldMutex : public vos::OMutex
 {
 public:
-    Os2SalInstance*         mpInstData;
-    ULONG                   mnCount;
-    ULONG                   mnThreadId;
+    Os2SalInstance*			mpInstData;
+    ULONG					mnCount;
+    ULONG					mnThreadId;
 
 public:
                             SalYieldMutex( Os2SalInstance* pInstData );
@@ -99,16 +99,16 @@ public:
     virtual void SAL_CALL       release();
     virtual sal_Bool SAL_CALL   tryToAcquire();
 
-    ULONG                   GetAcquireCount( ULONG nThreadId );
+    ULONG					GetAcquireCount( ULONG nThreadId );
 };
 
 // -----------------------------------------------------------------------
 
 SalYieldMutex::SalYieldMutex( Os2SalInstance* pInstData )
 {
-    mpInstData  = pInstData;
-    mnCount     = 0;
-    mnThreadId  = 0;
+    mpInstData	= pInstData;
+    mnCount 	= 0;
+    mnThreadId	= 0;
 }
 
 // -----------------------------------------------------------------------
@@ -302,8 +302,8 @@ void ImplSalAcquireYieldMutex( ULONG nCount )
 
 void ImplDbgTestSolarMutex()
 {
-    SalData*    pSalData = GetSalData();
-    ULONG       nCurThreadId = GetCurrentThreadId();
+    SalData*	pSalData = GetSalData();
+    ULONG		nCurThreadId = GetCurrentThreadId();
     if ( pSalData->mnAppThreadId != nCurThreadId )
     {
         if ( pSalData->mpFirstInstance )
@@ -407,7 +407,7 @@ printf("DeInitSalMain\n");
 
 SalInstance* CreateSalInstance()
 {
-    SalData*        pSalData = GetSalData();
+    SalData*		pSalData = GetSalData();
 
     // determine the os2 version
     ULONG nMayor;
@@ -452,12 +452,12 @@ SalInstance* CreateSalInstance()
     Os2SalInstance* pInst = new Os2SalInstance;
 
     // init instance (only one instance in this version !!!)
-    pSalData->mpFirstInstance   = pInst;
-    pInst->mhAB     = pSalData->mhAB;
-    pInst->mhMQ     = pSalData->mhMQ;
-    pInst->mnArgc   = pSalData->mnArgc;
-    pInst->mpArgv   = pSalData->mpArgv;
-    pInst->mhComWnd = hComWnd;
+    pSalData->mpFirstInstance	= pInst;
+    pInst->mhAB		= pSalData->mhAB;
+    pInst->mhMQ		= pSalData->mhMQ;
+    pInst->mnArgc	= pSalData->mnArgc;
+    pInst->mpArgv	= pSalData->mpArgv;
+    pInst->mhComWnd	= hComWnd;
 
     // AppIcon ermitteln
     ImplLoadSalIcon( SAL_RESID_ICON_DEFAULT, pInst->mhAppIcon);
@@ -474,7 +474,7 @@ void DestroySalInstance( SalInstance* pInst )
 {
     SalData* pSalData = GetSalData();
 
-    //  (only one instance in this version !!!)
+    //	(only one instance in this version !!!)
     ImplFreeSalGDI();
 
 #ifdef ENABLE_IME
@@ -494,9 +494,9 @@ void DestroySalInstance( SalInstance* pInst )
 
 Os2SalInstance::Os2SalInstance()
 {
-    mhComWnd                = 0;
-    mpSalYieldMutex         = new SalYieldMutex( this );
-    mpSalWaitMutex          = new vos::OMutex;
+    mhComWnd				= 0;
+    mpSalYieldMutex			= new SalYieldMutex( this );
+    mpSalWaitMutex			= new vos::OMutex;
     mnYieldWaitCount         = 0;
     mpSalYieldMutex->acquire();
     ::tools::SolarMutex::SetSolarMutex( mpSalYieldMutex );
@@ -537,7 +537,7 @@ void Os2SalInstance::AcquireYieldMutex( ULONG nCount )
 
 static void ImplSalYield( BOOL bWait, BOOL bHandleAllCurrentEvents )
 {
-    QMSG            aMsg;
+    QMSG			aMsg;
     bool bWasMsg = false, bOneEvent = false;
     bool bQuit = false;
 
@@ -563,7 +563,7 @@ static void ImplSalYield( BOOL bWait, BOOL bHandleAllCurrentEvents )
         else
             bQuit = true;
     }
-
+    
     if (bQuit)
     {
         ImplSalYieldMutexAcquireWithWait();
@@ -582,11 +582,11 @@ static void ImplSalYield( BOOL bWait, BOOL bHandleAllCurrentEvents )
 
 void Os2SalInstance::Yield( bool bWait, bool bHandleAllCurrentEvents )
 {
-    SalYieldMutex*  pYieldMutex = mpSalYieldMutex;
-    SalData*        pSalData = GetSalData();
-    ULONG           nCurThreadId = GetCurrentThreadId();
-    ULONG           nCount = pYieldMutex->GetAcquireCount( nCurThreadId );
-    ULONG           n = nCount;
+    SalYieldMutex*	pYieldMutex = mpSalYieldMutex;
+    SalData*		pSalData = GetSalData();
+    ULONG			nCurThreadId = GetCurrentThreadId();
+    ULONG			nCount = pYieldMutex->GetAcquireCount( nCurThreadId );
+    ULONG			n = nCount;
     while ( n )
     {
         pYieldMutex->release();
@@ -594,7 +594,7 @@ void Os2SalInstance::Yield( bool bWait, bool bHandleAllCurrentEvents )
     }
     if ( pSalData->mnAppThreadId != nCurThreadId )
     {
-        // #97739# A SendMessage call blocks until the called thread (here: the main thread)
+        // #97739# A SendMessage call blocks until the called thread (here: the main thread) 
         // returns. During a yield however, messages are processed in the main thread that might
         // result in a new message loop due to opening a dialog. Thus, SendMessage would not
         // return which will block this thread!
@@ -664,7 +664,7 @@ MRESULT EXPENTRY SalComWndProc( HWND hWnd, ULONG nMsg,
             return 0;
         case SAL_MSG_DESTROYHWND:
             //We only destroy the native window here. We do NOT destroy the SalFrame contained
-            //in the structure (GetWindowPtr()).
+            //in the structure (GetWindowPtr()). 
             if (WinDestroyWindow((HWND)nMP2) == 0)
             {
                 OSL_ENSURE(0, "DestroyWindow failed!");
@@ -700,7 +700,7 @@ MRESULT EXPENTRY SalComWndProc( HWND hWnd, ULONG nMsg,
 bool Os2SalInstance::AnyInput( USHORT nType )
 {
     SalData* pSalData = GetSalData();
-    QMSG    aQMSG;
+    QMSG	aQMSG;
 
     if ( (nType & (INPUT_ANY)) == INPUT_ANY )
     {
@@ -788,7 +788,7 @@ void Os2SalInstance::DestroyFrame( SalFrame* pFrame )
 
 SalObject* Os2SalInstance::CreateObject( SalFrame* pParent,
                                          SystemWindowData* /*pWindowData*/, // SystemWindowData meaningless on Windows
-                                         BOOL /*bShow*/ )
+                                         BOOL /*bShow*/ ) 
 {
     // Um auf Main-Thread umzuschalten
     return (SalObject*)WinSendMsg( mhComWnd, SAL_MSG_CREATEOBJECT, 0, (MPARAM)pParent );
@@ -806,8 +806,8 @@ void Os2SalInstance::DestroyObject( SalObject* pObject )
 
 void* Os2SalInstance::GetConnectionIdentifier( ConnectionIdentifierType& rReturnedType, int& rReturnedBytes )
 {
-    rReturnedBytes  = 1;
-    rReturnedType   = AsciiCString;
+    rReturnedBytes	= 1;
+    rReturnedType	= AsciiCString;
     return (void*) "";
 }
 
@@ -836,7 +836,7 @@ class Os2ImeStatus : public SalI18NImeStatus
   public:
     Os2ImeStatus() {}
     virtual ~Os2ImeStatus() {}
-
+    
     // asks whether there is a status window available
     // to toggle into menubar
     virtual bool canToggle() { return false; }
diff --git a/vcl/os2/source/app/sallang.cxx b/vcl/os2/source/app/sallang.cxx
index f23705077ac3..ea0751c1c2df 100644
--- a/vcl/os2/source/app/sallang.cxx
+++ b/vcl/os2/source/app/sallang.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
diff --git a/vcl/os2/source/app/salshl.cxx b/vcl/os2/source/app/salshl.cxx
index 637ddd748f33..38aec339ca69 100644
--- a/vcl/os2/source/app/salshl.cxx
+++ b/vcl/os2/source/app/salshl.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
@@ -40,16 +40,16 @@ static HMODULE mhMod = ImplGetModule();
 
 // =======================================================================
 
-APIRET APIENTRY DosQueryModFromEIP (HMODULE *phMod, ULONG *pObjNum,
-          ULONG BuffLen, PCHAR pBuff, ULONG *pOffset, ULONG Address);
+APIRET APIENTRY DosQueryModFromEIP (HMODULE *phMod, ULONG *pObjNum, 
+          ULONG BuffLen, PCHAR pBuff, ULONG *pOffset, ULONG Address); 
 
 HMODULE ImplGetModule(void)
 {
-    HMODULE hMod;
-    ULONG   ObjNum;
-    CHAR    Buff[2*_MAX_PATH];
-    ULONG   Offset;
-    APIRET  rc;
+    HMODULE	hMod;
+    ULONG	ObjNum;
+    CHAR	Buff[2*_MAX_PATH];
+    ULONG	Offset;
+    APIRET	rc;
 
     // get module handle (and name)
     rc = DosQueryModFromEIP( &hMod, &ObjNum, sizeof( Buff), Buff, &Offset, (ULONG)ImplGetModule);
diff --git a/vcl/os2/source/app/saltimer.cxx b/vcl/os2/source/app/saltimer.cxx
index bcdeec94ef25..472f54c55879 100644
--- a/vcl/os2/source/app/saltimer.cxx
+++ b/vcl/os2/source/app/saltimer.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
@@ -35,14 +35,14 @@
 // =======================================================================
 
 // Maximale Periode
-#define MAX_SYSPERIOD     65533
-#define IDTIMER             10
+#define MAX_SYSPERIOD	  65533
+#define IDTIMER				10
 
 // =======================================================================
 
 void ImplSalStartTimer( ULONG nMS, BOOL bMutex )
 {
-    SalData*    pSalData = GetSalData();
+    SalData*	pSalData = GetSalData();
 
     // Periode darf nicht zu gross sein, da OS2 2.11 mit USHORT arbeitet
     // Remenber the time of the timer
@@ -90,7 +90,7 @@ void Os2SalTimer::Start( ULONG nMS )
 
 void Os2SalTimer::Stop()
 {
-    SalData*    pSalData = GetSalData();
+    SalData*	pSalData = GetSalData();
 
     // Exitstiert ein Timer, dann diesen zerstoeren
     if ( pSalData->mnTimerId ) {
diff --git a/vcl/os2/source/gdi/os2layout.cxx b/vcl/os2/source/gdi/os2layout.cxx
index 924770c86869..ce0cc9ae0825 100644
--- a/vcl/os2/source/gdi/os2layout.cxx
+++ b/vcl/os2/source/gdi/os2layout.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
@@ -73,7 +73,7 @@ public:
     void                    SetKernData( int, const KERNINGPAIRS* );
     int                     GetKerning( sal_Unicode, sal_Unicode ) const;
 private:
-    KERNINGPAIRS*           mpKerningPairs;
+    KERNINGPAIRS*        	mpKerningPairs;
     int                     mnKerningPairs;
 #endif // GCP_KERN_HACK
 
@@ -110,8 +110,8 @@ public:
     float               GetFontScale() const    { return mfFontScale; }
 
 protected:
-    HPS                 mhPS;               // OS2 device handle
-    FATTRS              mhFont;
+    HPS					mhPS;				// OS2 device handle
+    FATTRS   			mhFont;
     int                 mnBaseAdv;          // x-offset relative to Layout origin
     float               mfFontScale;        // allows metrics emulation of huge font sizes
 
@@ -342,7 +342,7 @@ bool Os2SalLayout::LayoutText( ImplLayoutArgs& rArgs )
         nGcpOption |= GCP_USEKERNING;
 #endif // GCP_KERN_HACK
 
-    LONG    lLcid = Ft2QueryCharSet( mhPS);
+    LONG	lLcid = Ft2QueryCharSet( mhPS);
 
     for( i = 0; i < mnGlyphCount; ++i )
         mpOutGlyphs[i] = pBidiStr[ i ];
@@ -578,9 +578,9 @@ void Os2SalLayout::DrawText( SalGraphics& rGraphics ) const
     if( mnGlyphCount <= 0 )
         return;
 
-    Point   aPos = GetDrawPosition( Point( mnBaseAdv, 0 ) );
-    POINTL  aPt;
-    APIRET  rc;
+    Point 	aPos = GetDrawPosition( Point( mnBaseAdv, 0 ) );
+    POINTL	aPt;
+    APIRET	rc;
 
     aPt.x = aPos.X();
     aPt.y = static_cast<Os2SalGraphics&>(rGraphics).mnHeight - aPos.Y();
@@ -591,13 +591,13 @@ void Os2SalLayout::DrawText( SalGraphics& rGraphics ) const
         // convert to codepage
         ByteString str( mpOutGlyphs, gsl_getSystemTextEncoding() );
         // gliph size is not recalculated, so it could be wrong!
-        rc = Ft2CharStringPosAtA( static_cast<Os2SalGraphics&>(rGraphics).mhPS,
-                    &aPt, NULL, CHS_VECTOR, mnGlyphCount, (PSZ)str.GetBuffer(),
+        rc = Ft2CharStringPosAtA( static_cast<Os2SalGraphics&>(rGraphics).mhPS, 
+                    &aPt, NULL, CHS_VECTOR, mnGlyphCount, (PSZ)str.GetBuffer(), 
                     (LONG*)mpGlyphAdvances, 0);
     } else {
         // try unicode rendering to screen
-        rc = Ft2CharStringPosAtW( static_cast<Os2SalGraphics&>(rGraphics).mhPS,
-                    &aPt, NULL, CHS_VECTOR, mnGlyphCount, (LPWSTR)mpOutGlyphs,
+        rc = Ft2CharStringPosAtW( static_cast<Os2SalGraphics&>(rGraphics).mhPS, 
+                    &aPt, NULL, CHS_VECTOR, mnGlyphCount, (LPWSTR)mpOutGlyphs, 
                     (LONG*)mpGlyphAdvances, 0);
         if (rc == GPI_ERROR) {
             // if *W fails, convert to codepage and use *A (fallback to GPI into ft2)
@@ -606,8 +606,8 @@ void Os2SalLayout::DrawText( SalGraphics& rGraphics ) const
             debug_printf("Os2SalLayout::DrawText HPS %08x PosAtW failed '%s'!\n",static_cast<Os2SalGraphics&>(rGraphics).mhPS,str.GetBuffer());
 #endif
             // gliph size is not recalculated, so it could be wrong!
-            rc = Ft2CharStringPosAtA( static_cast<Os2SalGraphics&>(rGraphics).mhPS,
-                        &aPt, NULL, CHS_VECTOR, mnGlyphCount, (PSZ)str.GetBuffer(),
+            rc = Ft2CharStringPosAtA( static_cast<Os2SalGraphics&>(rGraphics).mhPS, 
+                        &aPt, NULL, CHS_VECTOR, mnGlyphCount, (PSZ)str.GetBuffer(), 
                         (LONG*)mpGlyphAdvances, 0);
         }
     }
diff --git a/vcl/os2/source/gdi/salbmp.cxx b/vcl/os2/source/gdi/salbmp.cxx
index 3d8f86ddcd1e..df0cf31d9b4c 100644
--- a/vcl/os2/source/gdi/salbmp.cxx
+++ b/vcl/os2/source/gdi/salbmp.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
@@ -181,11 +181,11 @@ bool Os2SalBitmap::Create( const SalBitmap& rSSalBmp, SalGraphics* pSGraphics )
 
     if( rSalBmp.mhDIB )
     {
-        HPS                     hPS = pGraphics->mhPS;
-        HBITMAP                 hNewDDB;
-        BITMAPINFOHEADER2       aInfoHeader;
-        const Size              aSize( rSalBmp.GetSize() );
-        long                    nFormat[ 2 ];
+        HPS						hPS = pGraphics->mhPS;
+        HBITMAP					hNewDDB;
+        BITMAPINFOHEADER2		aInfoHeader;
+        const Size				aSize( rSalBmp.GetSize() );
+        long					nFormat[ 2 ];
 
         memset( &aInfoHeader, 0, sizeof( aInfoHeader ) );
         aInfoHeader.cbFix = 16;
@@ -205,8 +205,8 @@ bool Os2SalBitmap::Create( const SalBitmap& rSSalBmp, SalGraphics* pSGraphics )
         // BitCount == 1 ist wegen aller moeglichen Treiberfehler nicht moeglich
         if( rSalBmp.GetBitCount() == 1 )
         {
-            HANDLE  hTmp = ImplCreateDIB4FromDIB1( rSalBmp.mhDIB );
-            PBYTE   pBits = (PBYTE) hTmp + *(ULONG*) hTmp + ImplGetDIBColorCount( hTmp ) * sizeof( RGB2 );
+            HANDLE 	hTmp = ImplCreateDIB4FromDIB1( rSalBmp.mhDIB );
+            PBYTE	pBits = (PBYTE) hTmp + *(ULONG*) hTmp + ImplGetDIBColorCount( hTmp ) * sizeof( RGB2 );
 
             hNewDDB = GpiCreateBitmap( hPS, &aInfoHeader, CBM_INIT, pBits, (PBITMAPINFO2) hTmp );
             rtl_freeMemory( (void*)hTmp );
@@ -348,16 +348,16 @@ HANDLE Os2SalBitmap::ImplCreateDIB( const Size& rSize, USHORT nBits, const Bitma
 
     if ( rSize.Width() && rSize.Height() && ( nBits == 1 || nBits == 4 || nBits == 8 || nBits == 24 ) )
     {
-        const ULONG     nImageSize = AlignedWidth4Bytes( nBits * rSize.Width() ) * rSize.Height();
-        const USHORT    nColors = ( nBits <= 8 ) ? ( 1 << nBits ) : 0;
+        const ULONG		nImageSize = AlignedWidth4Bytes( nBits * rSize.Width() ) * rSize.Height();
+        const USHORT	nColors = ( nBits <= 8 ) ? ( 1 << nBits ) : 0;
 
         hDIB = (HANDLE) rtl_allocateZeroMemory( sizeof( BITMAPINFOHEADER2 ) + nColors * sizeof( RGB2 ) + nImageSize );
 
         if( hDIB )
         {
             // bitmap infos can be found at the beginning of the memory
-            PBITMAPINFO2        pBI = (PBITMAPINFO2) hDIB;
-            PBITMAPINFOHEADER2  pBIH = (PBITMAPINFOHEADER2) pBI;
+            PBITMAPINFO2		pBI = (PBITMAPINFO2) hDIB;
+            PBITMAPINFOHEADER2	pBIH = (PBITMAPINFOHEADER2) pBI;
 
             pBIH->cbFix = sizeof( BITMAPINFOHEADER2 );
             pBIH->cx = rSize.Width();
diff --git a/vcl/os2/source/gdi/salgdi.cxx b/vcl/os2/source/gdi/salgdi.cxx
index dff1557170fb..a44579109547 100644
--- a/vcl/os2/source/gdi/salgdi.cxx
+++ b/vcl/os2/source/gdi/salgdi.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
@@ -49,7 +49,7 @@
 // -----------
 
 // ClipRegions funktionieren immer noch nicht auf allen getesteten Druckern
-#define SAL_PRINTER_CLIPPATH    1
+#define SAL_PRINTER_CLIPPATH	1
 // #define SAL_PRINTER_POLYPATH 1
 
 // =======================================================================
@@ -62,7 +62,7 @@ void ImplInitSalGDI()
 
 void ImplFreeSalGDI()
 {
-    SalData*    pSalData = GetSalData();
+    SalData*	pSalData = GetSalData();
 
     // delete icon cache
     SalIcon* pIcon = pSalData->mpFirstIcon;
@@ -102,19 +102,19 @@ Os2SalGraphics::Os2SalGraphics()
 
     mfFontScale = 1.0;
 
-    mhPS            = 0;
-    mhDC            = 0;
-    mbLine              = FALSE;
-    mbFill              = FALSE;
-    mbXORMode           = FALSE;
-    mnFontMetricCount   = 0;
-    mpFontMetrics       = NULL;
-    mpClipRectlAry      = NULL;
+    mhPS 			= 0;
+    mhDC 			= 0;
+    mbLine				= FALSE;
+    mbFill				= FALSE;
+    mbXORMode			= FALSE;
+    mnFontMetricCount	= 0;
+    mpFontMetrics		= NULL;
+    mpClipRectlAry		= NULL;
 
-    mhDefFont           = 0;
-    mpFontKernPairs     = NULL;
-    mnFontKernPairCount = 0;
-    mbFontKernInit      = FALSE;
+    mhDefFont			= 0;
+    mpFontKernPairs		= NULL;
+    mnFontKernPairCount	= 0;
+    mbFontKernInit		= FALSE;
 
 }
 
@@ -219,7 +219,7 @@ void Os2SalGraphics::ResetClipRegion()
 
 void Os2SalGraphics::BeginSetClipRegion( ULONG nCount )
 {
-    mpClipRectlAry    = new RECTL[ nCount ];
+    mpClipRectlAry	  = new RECTL[ nCount ];
     mnClipElementCount = 0;
 }
 
@@ -494,11 +494,11 @@ void Os2SalGraphics::drawRect( long nX, long nY, long nWidth, long nHeight )
 void Os2SalGraphics::drawPolyLine( ULONG nPoints, const SalPoint* pPtAry )
 {
     // convert all points to sys orientation
-    POINTL*             pOS2PtAry = new POINTL[ nPoints ];
-    POINTL*             pTempOS2PtAry = pOS2PtAry;
-    const SalPoint*     pTempPtAry = pPtAry;
-    ULONG               nTempPoints = nPoints;
-    long                nHeight = mnHeight - 1;
+    POINTL* 			pOS2PtAry = new POINTL[ nPoints ];
+    POINTL* 			pTempOS2PtAry = pOS2PtAry;
+    const SalPoint* 	pTempPtAry = pPtAry;
+    ULONG				nTempPoints = nPoints;
+    long				nHeight = mnHeight - 1;
 
     while( nTempPoints-- )
     {
@@ -524,10 +524,10 @@ void Os2SalGraphics::drawPolygon( ULONG nPoints, const SalPoint* pPtAry )
     aPolygon.ulPoints = nPoints;
 
     // convert all points to sys orientation
-    POINTL*             pTempOS2PtAry = aPolygon.aPointl;
-    const SalPoint*     pTempPtAry = pPtAry;
-    ULONG               nTempPoints = nPoints;
-    long                nHeight = mnHeight - 1;
+    POINTL* 			pTempOS2PtAry = aPolygon.aPointl;
+    const SalPoint* 	pTempPtAry = pPtAry;
+    ULONG				nTempPoints = nPoints;
+    long				nHeight = mnHeight - 1;
 
     while( nTempPoints-- )
     {
@@ -586,9 +586,9 @@ void Os2SalGraphics::drawPolygon( ULONG nPoints, const SalPoint* pPtAry )
 void Os2SalGraphics::drawPolyPolygon( ULONG nPoly, const ULONG* pPoints,
                                    PCONSTSALPOINT* pPtAry )
 {
-    ULONG       i;
-    long        nHeight = mnHeight - 1;
-    PM_POLYGON* aPolygonAry = new PM_POLYGON[ nPoly ];
+    ULONG		i;
+    long		nHeight = mnHeight - 1;
+    PM_POLYGON*	aPolygonAry = new PM_POLYGON[ nPoly ];
 
     for( i = 0; i < nPoly; i++ )
     {
@@ -671,7 +671,7 @@ bool Os2SalGraphics::drawPolyPolygon( const ::basegfx::B2DPolyPolygon&, double /
 bool Os2SalGraphics::drawPolyLine(
     const basegfx::B2DPolygon& /*rPolygon*/,
     double /*fTransparency*/,
-    const basegfx::B2DVector& /*rLineWidths*/,
+    const basegfx::B2DVector& /*rLineWidths*/, 
     basegfx::B2DLineJoin /*eLineJoin*/)
 {
     // TODO: implement
@@ -703,15 +703,15 @@ sal_Bool Os2SalGraphics::drawPolyPolygonBezier( ULONG nPoly, const ULONG* pPoint
 // =======================================================================
 
 // MAXIMUM BUFSIZE EQ 0xFFFF
-#define POSTSCRIPT_BUFSIZE          0x4000
+#define POSTSCRIPT_BUFSIZE			0x4000
 // we only try to get the BoundingBox in the first 4096 bytes
-#define POSTSCRIPT_BOUNDINGSEARCH   0x1000
+#define POSTSCRIPT_BOUNDINGSEARCH	0x1000
 
 static BYTE* ImplSearchEntry( BYTE* pSource, BYTE* pDest, ULONG nComp, ULONG nSize )
 {
     while ( nComp-- >= nSize )
     {
-        ULONG   i;
+        ULONG	i;
         for ( i = 0; i < nSize; i++ )
         {
             if ( ( pSource[i]&~0x20 ) != ( pDest[i]&~0x20 ) )
@@ -727,7 +727,7 @@ static BYTE* ImplSearchEntry( BYTE* pSource, BYTE* pDest, ULONG nComp, ULONG nSi
 
 static BOOL ImplGetBoundingBox( double* nNumb, BYTE* pSource, ULONG nSize )
 {
-    BOOL    bRetValue = FALSE;
+    BOOL	bRetValue = FALSE;
     BYTE* pDest = ImplSearchEntry( pSource, (BYTE*)"%%BoundingBox:", nSize, 14 );
     if ( pDest )
     {
@@ -736,15 +736,15 @@ static BOOL ImplGetBoundingBox( double* nNumb, BYTE* pSource, ULONG nSize )
 
         int nSizeLeft = nSize - ( pDest - pSource );
         if ( nSizeLeft > 100 )
-            nSizeLeft = 100;    // only 100 bytes following the bounding box will be checked
+            nSizeLeft = 100;	// only 100 bytes following the bounding box will be checked
 
         int i;
         for ( i = 0; ( i < 4 ) && nSizeLeft; i++ )
         {
-            int     nDivision = 1;
-            BOOL    bDivision = FALSE;
-            BOOL    bNegative = FALSE;
-            BOOL    bValid = TRUE;
+            int 	nDivision = 1;
+            BOOL	bDivision = FALSE;
+            BOOL	bNegative = FALSE;
+            BOOL	bValid = TRUE;
 
             while ( ( --nSizeLeft ) && ( *pDest == ' ' ) || ( *pDest == 0x9 ) ) pDest++;
             BYTE nByte = *pDest;
@@ -763,7 +763,7 @@ static BOOL ImplGetBoundingBox( double* nNumb, BYTE* pSource, ULONG nSize )
                         break;
                     default :
                         if ( ( nByte < '0' ) || ( nByte > '9' ) )
-                            nSizeLeft = 1;  // error parsing the bounding box values
+                            nSizeLeft = 1; 	// error parsing the bounding box values
                         else if ( bValid )
                         {
                             if ( bDivision )
@@ -790,7 +790,7 @@ static BOOL ImplGetBoundingBox( double* nNumb, BYTE* pSource, ULONG nSize )
 #if 0
 static void ImplWriteDouble( BYTE** pBuf, double nNumber )
 {
-//  *pBuf += sprintf( (char*)*pBuf, "%f", nNumber );
+//	*pBuf += sprintf( (char*)*pBuf, "%f", nNumber );
 
     if ( nNumber < 0 )
     {
@@ -825,7 +825,7 @@ static void ImplWriteDouble( BYTE** pBuf, double nNumber )
     }
     *(*pBuf)++ = ' ';
 }
-#endif
+#endif 
 
 inline void ImplWriteString( BYTE** pBuf, const char* sString )
 {
@@ -838,18 +838,18 @@ BOOL Os2SalGraphics::drawEPS( long nX, long nY, long nWidth, long nHeight, void*
     if ( !mbPrinter )
         return FALSE;
 
-    BOOL    bRet  = FALSE;
-    LONG    nLong = 0;
+    BOOL	bRet  = FALSE;
+    LONG	nLong = 0;
     if ( !(DevQueryCaps( mhDC, CAPS_TECHNOLOGY, 1, &nLong ) &&
            (CAPS_TECH_POSTSCRIPT == nLong)) )
         return FALSE;
 
-    BYTE*   pBuf = new BYTE[ POSTSCRIPT_BUFSIZE ];
-    double  nBoundingBox[4];
+    BYTE*	pBuf = new BYTE[ POSTSCRIPT_BUFSIZE ];
+    double	nBoundingBox[4];
 
     if ( pBuf && ImplGetBoundingBox( nBoundingBox, (BYTE*)pPtr, nSize ) )
     {
-        LONG pOS2DXAry[4];        // hack -> print always 2 white space
+        LONG pOS2DXAry[4];		  // hack -> print always 2 white space
         POINTL aPt;
         aPt.x = 0;
         aPt.y = 0;
@@ -859,7 +859,7 @@ BOOL Os2SalGraphics::drawEPS( long nX, long nY, long nWidth, long nHeight, void*
         Ft2CharStringPosAt( mhPS, &aPt, NULL, 0, 2, (PCH)pStr,(PLONG)&pOS2DXAry[0] );
 
         OStringBuffer aBuf( POSTSCRIPT_BUFSIZE );
-
+        
                 // reserve place for a USHORT
                 aBuf.append( "aa" );
 
@@ -943,7 +943,7 @@ BOOL Os2SalGraphics::drawEPS( long nX, long nY, long nWidth, long nHeight, void*
                 //Escape ( mhDC, nEscape, aBuf.getLength(), (LPTSTR)aBuf.getStr(), 0 );
                 DevEscape( mhDC, DEVESC_RAWDATA, aBuf.getLength(),
                         (PBYTE)aBuf.getStr(), 0, NULL );
-
+        
         double dM11 = nWidth / ( nBoundingBox[2] - nBoundingBox[0] );
         double dM22 = - ( nHeight / (nBoundingBox[1] - nBoundingBox[3] ) );
 
@@ -998,7 +998,7 @@ BOOL Os2SalGraphics::drawEPS( long nX, long nY, long nWidth, long nHeight, void*
                 if ( DevEscape( mhDC, DEVESC_RAWDATA, 9, (PBYTE)pBuf,
                     0, NULL ) == DEV_OK ) bRet = TRUE;
             }
-
+            
                 // #107797# Write out EPS encapsulation footer
                 // ----------------------------------------------------------------------------------
                 // reserve a USHORT again
@@ -1011,7 +1011,7 @@ BOOL Os2SalGraphics::drawEPS( long nX, long nY, long nWidth, long nHeight, void*
                 DevEscape( mhDC, DEVESC_RAWDATA, aBuf.getLength(),
                         (PBYTE)aBuf.getStr(), 0, NULL );
                 bRet = TRUE;
-
+            
         }
     }
     delete [] pBuf;
diff --git a/vcl/os2/source/gdi/salgdi2.cxx b/vcl/os2/source/gdi/salgdi2.cxx
index 37621ee1f6a8..a246cd6022d1 100644
--- a/vcl/os2/source/gdi/salgdi2.cxx
+++ b/vcl/os2/source/gdi/salgdi2.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
@@ -50,7 +50,7 @@ BOOL bFastTransparent = FALSE;
 // -----------
 
 #define RGBCOLOR( r, g, b ) ((ULONG)(((BYTE)(b)|((USHORT)(g)<<8))|(((ULONG)(BYTE)(r))<<16)))
-#define TY( y )             (mnHeight-(y)-1)
+#define TY( y ) 			(mnHeight-(y)-1)
 
 // ---------------
 // - SalGraphics -
@@ -64,9 +64,9 @@ bool Os2SalGraphics::supportsOperation( OutDevSupportType ) const
 
 void Os2SalGraphics::copyBits( const SalTwoRect* pPosAry, SalGraphics* pSrcGraphics )
 {
-    HPS     hSrcPS;
-    POINTL  thePoints[4];
-    long    nSrcHeight;
+    HPS 	hSrcPS;
+    POINTL	thePoints[4];
+    long	nSrcHeight;
 
     if ( pSrcGraphics )
     {
@@ -133,39 +133,39 @@ void Os2SalGraphics::copyArea( long nDestX, long nDestY,
     if ( (nFlags & SAL_COPYAREA_WINDOWINVALIDATE) && mbWindow )
     {
         // Overlap-Bereich berechnen und invalidieren
-        Point       aVCLSrcPos( nSrcX, nSrcY );
-        Size        aVCLSrcSize( nSrcWidth, nSrcHeight );
-        Rectangle   aVCLSrcRect( aVCLSrcPos, aVCLSrcSize );
-        Rectangle   aVCLClipRect;
-        SWP         aSWP;
+        Point		aVCLSrcPos( nSrcX, nSrcY );
+        Size		aVCLSrcSize( nSrcWidth, nSrcHeight );
+        Rectangle	aVCLSrcRect( aVCLSrcPos, aVCLSrcSize );
+        Rectangle	aVCLClipRect;
+        SWP 		aSWP;
 
         WinQueryWindowPos( mhWnd, &aSWP );
-        aVCLClipRect.Right()    = aSWP.cx-1;
-        aVCLClipRect.Bottom()   = aSWP.cy-1;
+        aVCLClipRect.Right()	= aSWP.cx-1;
+        aVCLClipRect.Bottom()	= aSWP.cy-1;
         if ( !aVCLSrcRect.Intersection( aVCLClipRect ).IsEmpty() )
         {
-            RECTL   aSrcRect;
-            RECTL   aTempRect;
-            HRGN    hInvalidateRgn;
-            HRGN    hTempRgn;
-            HWND    hWnd;
-            long    nRgnType;
-
-            long nVCLScrHeight  = aVCLSrcRect.GetHeight();
-            aSrcRect.xLeft      = aVCLSrcRect.Left();
-            aSrcRect.yBottom    = TY( aVCLSrcRect.Top()+nVCLScrHeight-1 );
-            aSrcRect.xRight     = aSrcRect.xLeft+aVCLSrcRect.GetWidth();
-            aSrcRect.yTop       = aSrcRect.yBottom+nVCLScrHeight;
+            RECTL	aSrcRect;
+            RECTL	aTempRect;
+            HRGN	hInvalidateRgn;
+            HRGN	hTempRgn;
+            HWND	hWnd;
+            long	nRgnType;
+
+            long nVCLScrHeight	= aVCLSrcRect.GetHeight();
+            aSrcRect.xLeft		= aVCLSrcRect.Left();
+            aSrcRect.yBottom	= TY( aVCLSrcRect.Top()+nVCLScrHeight-1 );
+            aSrcRect.xRight 	= aSrcRect.xLeft+aVCLSrcRect.GetWidth();
+            aSrcRect.yTop		= aSrcRect.yBottom+nVCLScrHeight;
 
             // Rechteck in Screen-Koordinaaten umrechnen
-            POINTL  aPt;
-            long    nScreenDX = WinQuerySysValue( HWND_DESKTOP, SV_CXSCREEN );
-            long    nScreenDY = WinQuerySysValue( HWND_DESKTOP, SV_CYSCREEN );
+            POINTL	aPt;
+            long	nScreenDX = WinQuerySysValue( HWND_DESKTOP, SV_CXSCREEN );
+            long	nScreenDY = WinQuerySysValue( HWND_DESKTOP, SV_CYSCREEN );
             aPt.x = 0;
             aPt.y = 0;
             WinMapWindowPoints( mhWnd, HWND_DESKTOP, &aPt, 1 );
-            aSrcRect.xLeft   += aPt.x;
-            aSrcRect.yTop    += aPt.y;
+            aSrcRect.xLeft	 += aPt.x;
+            aSrcRect.yTop	 += aPt.y;
             aSrcRect.xRight  += aPt.x;
             aSrcRect.yBottom += aPt.y;
             hInvalidateRgn = 0;
@@ -174,10 +174,10 @@ void Os2SalGraphics::copyArea( long nDestX, long nDestY,
             {
                 if ( !hInvalidateRgn )
                     hInvalidateRgn = GpiCreateRegion( mhPS, 1, &aSrcRect );
-                aTempRect.xLeft     = -31999;
-                aTempRect.yBottom   = 0;
-                aTempRect.xRight    = 0;
-                aTempRect.yTop      = 31999;
+                aTempRect.xLeft 	= -31999;
+                aTempRect.yBottom	= 0;
+                aTempRect.xRight	= 0;
+                aTempRect.yTop		= 31999;
                 hTempRgn = GpiCreateRegion( mhPS, 1, &aTempRect );
                 GpiCombineRegion( mhPS, hInvalidateRgn, hInvalidateRgn, hTempRgn, CRGN_DIFF );
                 GpiDestroyRegion( mhPS, hTempRgn );
@@ -186,10 +186,10 @@ void Os2SalGraphics::copyArea( long nDestX, long nDestY,
             {
                 if ( !hInvalidateRgn )
                     hInvalidateRgn = GpiCreateRegion( mhPS, 1, &aSrcRect );
-                aTempRect.xLeft     = 0;
-                aTempRect.yBottom   = -31999;
-                aTempRect.xRight    = 31999;
-                aTempRect.yTop      = 0;
+                aTempRect.xLeft 	= 0;
+                aTempRect.yBottom	= -31999;
+                aTempRect.xRight	= 31999;
+                aTempRect.yTop		= 0;
                 hTempRgn = GpiCreateRegion( mhPS, 1, &aTempRect );
                 GpiCombineRegion( mhPS, hInvalidateRgn, hInvalidateRgn, hTempRgn, CRGN_DIFF );
                 GpiDestroyRegion( mhPS, hTempRgn );
@@ -198,10 +198,10 @@ void Os2SalGraphics::copyArea( long nDestX, long nDestY,
             {
                 if ( !hInvalidateRgn )
                     hInvalidateRgn = GpiCreateRegion( mhPS, 1, &aSrcRect );
-                aTempRect.xLeft     = nScreenDX;
-                aTempRect.yBottom   = 0;
-                aTempRect.xRight    = 31999;
-                aTempRect.yTop      = 31999;
+                aTempRect.xLeft 	= nScreenDX;
+                aTempRect.yBottom	= 0;
+                aTempRect.xRight	= 31999;
+                aTempRect.yTop		= 31999;
                 hTempRgn = GpiCreateRegion( mhPS, 1, &aTempRect );
                 GpiCombineRegion( mhPS, hInvalidateRgn, hInvalidateRgn, hTempRgn, CRGN_DIFF );
                 GpiDestroyRegion( mhPS, hTempRgn );
@@ -210,10 +210,10 @@ void Os2SalGraphics::copyArea( long nDestX, long nDestY,
             {
                 if ( !hInvalidateRgn )
                     hInvalidateRgn = GpiCreateRegion( mhPS, 1, &aSrcRect );
-                aTempRect.xLeft     = 0;
-                aTempRect.yBottom   = nScreenDY;
-                aTempRect.xRight    = 31999;
-                aTempRect.yTop      = 31999;
+                aTempRect.xLeft 	= 0;
+                aTempRect.yBottom	= nScreenDY;
+                aTempRect.xRight	= 31999;
+                aTempRect.yTop		= 31999;
                 hTempRgn = GpiCreateRegion( mhPS, 1, &aTempRect );
                 GpiCombineRegion( mhPS, hInvalidateRgn, hInvalidateRgn, hTempRgn, CRGN_DIFF );
                 GpiDestroyRegion( mhPS, hTempRgn );
@@ -238,10 +238,10 @@ void Os2SalGraphics::copyArea( long nDestX, long nDestY,
                         {
                             if ( !hInvalidateRgn )
                                 hInvalidateRgn = GpiCreateRegion( mhPS, 1, &aSrcRect );
-                            aTempRect.xLeft     = aSWP.x;
-                            aTempRect.yBottom   = aSWP.y;
-                            aTempRect.xRight    = aTempRect.xLeft+aSWP.cx;
-                            aTempRect.yTop      = aTempRect.yBottom+aSWP.cy;
+                            aTempRect.xLeft 	= aSWP.x;
+                            aTempRect.yBottom	= aSWP.y;
+                            aTempRect.xRight	= aTempRect.xLeft+aSWP.cx;
+                            aTempRect.yTop		= aTempRect.yBottom+aSWP.cy;
                             hTempRgn = GpiCreateRegion( mhPS, 1, &aTempRect );
                             GpiCombineRegion( mhPS, hInvalidateRgn, hInvalidateRgn, hTempRgn, CRGN_DIFF );
                             GpiDestroyRegion( mhPS, hTempRgn );
@@ -268,8 +268,8 @@ void Os2SalGraphics::copyArea( long nDestX, long nDestY,
                     // MainThread ist, damit es beim Bearbeiten der
                     // Paint-Message keinen Deadlock gibt, da der
                     // SolarMutex durch diesen Thread schon gelockt ist
-                    SalData*    pSalData = GetSalData();
-                    ULONG       nCurThreadId = GetCurrentThreadId();
+                    SalData*	pSalData = GetSalData();
+                    ULONG		nCurThreadId = GetCurrentThreadId();
                     if ( pSalData->mnAppThreadId == nCurThreadId )
                         WinUpdateWindow( mhWnd );
                 }
@@ -291,11 +291,11 @@ void ImplDrawBitmap( HPS hPS, long nScreenHeight,
 {
     if( hPS )
     {
-        HANDLE      hDrawDIB;
-        HBITMAP     hDrawDDB = rSalBitmap.ImplGethDDB();
-        Os2SalBitmap*   pTmpSalBmp = NULL;
-        BOOL        bPrintDDB = ( bPrinter && hDrawDDB );
-        BOOL        bDrawDDB1 = ( ( rSalBitmap.GetBitCount() == 1 ) && hDrawDDB );
+        HANDLE		hDrawDIB;
+        HBITMAP 	hDrawDDB = rSalBitmap.ImplGethDDB();
+        Os2SalBitmap*	pTmpSalBmp = NULL;
+        BOOL		bPrintDDB = ( bPrinter && hDrawDDB );
+        BOOL		bDrawDDB1 = ( ( rSalBitmap.GetBitCount() == 1 ) && hDrawDDB );
 
         if( bPrintDDB || bDrawDDB1 )
         {
@@ -308,13 +308,13 @@ void ImplDrawBitmap( HPS hPS, long nScreenHeight,
 
         if( hDrawDIB )
         {
-            HANDLE              hSubst = rSalBitmap.ImplGethDIB1Subst();
-            POINTL              pts[ 4 ];
-            BITMAPINFO2*        pBI = (BITMAPINFO2*) hDrawDIB;
-            BITMAPINFOHEADER2*  pBIH = (BITMAPINFOHEADER2*) pBI;
-            const long          nHeight = pBIH->cy;
-            long                nInfoSize = *(ULONG*) pBI + rSalBitmap.ImplGetDIBColorCount( hDrawDIB ) * sizeof( RGB2 );
-            BYTE*               pBits = (BYTE*) pBI + nInfoSize;
+            HANDLE				hSubst = rSalBitmap.ImplGethDIB1Subst();
+            POINTL				pts[ 4 ];
+            BITMAPINFO2*		pBI = (BITMAPINFO2*) hDrawDIB;
+            BITMAPINFOHEADER2*	pBIH = (BITMAPINFOHEADER2*) pBI;
+            const long			nHeight = pBIH->cy;
+            long				nInfoSize = *(ULONG*) pBI + rSalBitmap.ImplGetDIBColorCount( hDrawDIB ) * sizeof( RGB2 );
+            BYTE*				pBits = (BYTE*) pBI + nInfoSize;
 
             pts[0].x = pPosAry->mnDestX;
             pts[0].y = nScreenHeight - pPosAry->mnDestY - pPosAry->mnDestHeight;
@@ -353,12 +353,12 @@ void ImplDrawBitmap( HPS hPS, long nScreenHeight,
                 // have problems to print these DIB's (strange)
                 if( pBIH->cBitCount == 8 && pBIH->ulCompression == BCA_UNCOMP )
                 {
-                    const long          nWidth = pBIH->cx;
-                    const long          nHeight = pBIH->cy;
-                    const long          nWidthAl8 = AlignedWidth4Bytes( nWidth * 8 );
-                    const long          nWidthAl24 = AlignedWidth4Bytes( nWidth * 24 );
-                    const long          nNewImageSize = nHeight * nWidthAl24;
-                    BITMAPINFOHEADER2*  pNewInfo;
+                    const long			nWidth = pBIH->cx;
+                    const long			nHeight = pBIH->cy;
+                    const long			nWidthAl8 = AlignedWidth4Bytes( nWidth * 8 );
+                    const long			nWidthAl24 = AlignedWidth4Bytes( nWidth * 24 );
+                    const long			nNewImageSize = nHeight * nWidthAl24;
+                    BITMAPINFOHEADER2*	pNewInfo;
 
                     pDummy = new BYTE[ sizeof( BITMAPINFO2 ) + nNewImageSize ];
                     memset( pDummy, 0, sizeof( BITMAPINFO2 ) );
@@ -467,7 +467,7 @@ void Os2SalGraphics::drawBitmap( const SalTwoRect* pPosAry,
 
     const Os2SalBitmap& rSalBitmap = static_cast<const Os2SalBitmap&>(rSSalBitmap);
     const Os2SalBitmap& rTransparentBitmap = static_cast<const Os2SalBitmap&>(rSTransparentBitmap);
-
+    
     if( bFastTransparent )
     {
         ImplDrawBitmap( mhPS, mnHeight, pPosAry, rTransparentBitmap, FALSE, ROP_SRCAND );
@@ -475,25 +475,25 @@ void Os2SalGraphics::drawBitmap( const SalTwoRect* pPosAry,
     }
     else
     {
-        SalTwoRect      aPosAry = *pPosAry;
-        int             nDstX = (int) aPosAry.mnDestX;
-        int             nDstY = (int) aPosAry.mnDestY;
-        int             nDstWidth = (int) aPosAry.mnDestWidth;
-        int             nDstHeight = (int) aPosAry.mnDestHeight;
-        HAB             hAB = GetSalData()->mhAB;
-        HPS             hPS = mhPS;
-        DEVOPENSTRUC    aDevOpenStruc = { NULL, (PSZ)"DISPLAY", NULL, NULL, NULL, NULL, NULL, NULL, NULL };
-        SIZEL           aSizeL = { nDstWidth, nDstHeight };
-        POINTL          aPtL[ 3 ];
-
-        HDC                hMemDC = DevOpenDC( hAB, OD_MEMORY, (PSZ)"*", 5L, (PDEVOPENDATA)&aDevOpenStruc, 0 );
-        HPS                hMemPS = Ft2CreatePS( hAB, hMemDC, &aSizeL, GPIT_MICRO | GPIA_ASSOC | PU_PELS );
-        HBITMAP            hMemBitmap = ImplCreateVirDevBitmap( hMemDC, hMemPS, nDstWidth, nDstHeight, 0 );
-        HBITMAP            hMemOld = (HBITMAP) Ft2SetBitmap( hMemPS, hMemBitmap );
-        HDC                hMaskDC = DevOpenDC( hAB, OD_MEMORY, (PSZ)"*", 5L, (PDEVOPENDATA)&aDevOpenStruc, 0 );
-        HPS                hMaskPS = Ft2CreatePS( hAB, hMaskDC, &aSizeL, GPIT_MICRO | GPIA_ASSOC | PU_PELS );
-        HBITMAP            hMaskBitmap = ImplCreateVirDevBitmap( hMaskDC, hMaskPS, nDstWidth, nDstHeight, 0 );
-        HBITMAP            hMaskOld = (HBITMAP) Ft2SetBitmap( hMaskPS, hMaskBitmap );
+        SalTwoRect		aPosAry = *pPosAry;
+        int 			nDstX = (int) aPosAry.mnDestX;
+        int 			nDstY = (int) aPosAry.mnDestY;
+        int 			nDstWidth = (int) aPosAry.mnDestWidth;
+        int 			nDstHeight = (int) aPosAry.mnDestHeight;
+        HAB 			hAB = GetSalData()->mhAB;
+        HPS 			hPS = mhPS;
+        DEVOPENSTRUC	aDevOpenStruc = { NULL, (PSZ)"DISPLAY", NULL, NULL, NULL, NULL, NULL, NULL, NULL };
+        SIZEL			aSizeL = { nDstWidth, nDstHeight };
+        POINTL			aPtL[ 3 ];
+
+        HDC 			   hMemDC = DevOpenDC( hAB, OD_MEMORY, (PSZ)"*", 5L, (PDEVOPENDATA)&aDevOpenStruc, 0 );
+        HPS 			   hMemPS = Ft2CreatePS( hAB, hMemDC, &aSizeL, GPIT_MICRO | GPIA_ASSOC | PU_PELS );
+        HBITMAP 		   hMemBitmap = ImplCreateVirDevBitmap( hMemDC, hMemPS, nDstWidth, nDstHeight, 0 );
+        HBITMAP 		   hMemOld = (HBITMAP) Ft2SetBitmap( hMemPS, hMemBitmap );
+        HDC 			   hMaskDC = DevOpenDC( hAB, OD_MEMORY, (PSZ)"*", 5L, (PDEVOPENDATA)&aDevOpenStruc, 0 );
+        HPS 			   hMaskPS = Ft2CreatePS( hAB, hMaskDC, &aSizeL, GPIT_MICRO | GPIA_ASSOC | PU_PELS );
+        HBITMAP 		   hMaskBitmap = ImplCreateVirDevBitmap( hMaskDC, hMaskPS, nDstWidth, nDstHeight, 0 );
+        HBITMAP 		   hMaskOld = (HBITMAP) Ft2SetBitmap( hMaskPS, hMaskBitmap );
 /*
         HPS hMemPS = ImplGetCachedPS( CACHED_HPS_1, 0 );
         HPS hMaskPS = ImplGetCachedPS( CACHED_HPS_2, 0 );
@@ -544,7 +544,7 @@ void Os2SalGraphics::drawBitmap( const SalTwoRect* pPosAry,
 // -----------------------------------------------------------------------
 
 bool Os2SalGraphics::drawAlphaBitmap( const SalTwoRect& rTR,
-                      const SalBitmap&  rSrcBitmap,
+                      const SalBitmap&  rSrcBitmap, 
                       const SalBitmap&  rAlphaBmp )
 {
     // TODO(P3) implement alpha blending
@@ -553,7 +553,7 @@ bool Os2SalGraphics::drawAlphaBitmap( const SalTwoRect& rTR,
 
 // -----------------------------------------------------------------------
 
-bool Os2SalGraphics::drawAlphaRect( long nX, long nY, long nWidth,
+bool Os2SalGraphics::drawAlphaRect( long nX, long nY, long nWidth, 
                                     long nHeight, sal_uInt8 nTransparency )
 {
     // TODO(P3) implement alpha blending
@@ -567,13 +567,13 @@ void Os2SalGraphics::drawMask( const SalTwoRect* pPosAry,
                             SalColor nMaskColor )
 {
     DBG_ASSERT( !mbPrinter, "No transparency print possible!" );
-
+    
     const Os2SalBitmap& rSalBitmap = static_cast<const Os2SalBitmap&>(rSSalBitmap);
 
-    SalTwoRect  aPosAry = *pPosAry;
-    HPS         hPS = mhPS;
+    SalTwoRect	aPosAry = *pPosAry;
+    HPS 		hPS = mhPS;
     IMAGEBUNDLE aBundle, aOldBundle;
-    AREABUNDLE  aAreaBundle, aOldAreaBundle;
+    AREABUNDLE	aAreaBundle, aOldAreaBundle;
     const ULONG    nColor = RGBCOLOR( SALCOLOR_RED( nMaskColor ),
                                     SALCOLOR_GREEN( nMaskColor ),
                                     SALCOLOR_BLUE( nMaskColor ) );
@@ -604,16 +604,16 @@ void Os2SalGraphics::drawMask( const SalTwoRect* pPosAry,
 
 SalBitmap* Os2SalGraphics::getBitmap( long nX, long nY, long nDX, long nDY )
 {
-    HAB            hAB = GetSalData()->mhAB;
-    SIZEL        size = { nDX, nDY };
-    Os2SalBitmap*     pSalBitmap = NULL;
+    HAB 		   hAB = GetSalData()->mhAB;
+    SIZEL		 size = { nDX, nDY };
+    Os2SalBitmap*	  pSalBitmap = NULL;
 
     // create device context (at this time allways display compatible)
-    DEVOPENSTRUC    aDevOpenStruc = { NULL, (PSZ)"DISPLAY", NULL, NULL, NULL, NULL, NULL, NULL, NULL };
-    HDC             hMemDC = DevOpenDC( hAB, OD_MEMORY, (PSZ)"*", 5L, (PDEVOPENDATA)&aDevOpenStruc, 0 );
-    HPS             hMemPS = Ft2CreatePS( hAB, hMemDC, &size, GPIT_MICRO | GPIA_ASSOC | PU_PELS );
-    HBITMAP         hMemBmp = ImplCreateVirDevBitmap( hMemDC, hMemPS, nDX, nDY, 0 );
-    HBITMAP         hMemOld = Ft2SetBitmap( hMemPS, hMemBmp );
+    DEVOPENSTRUC	aDevOpenStruc = { NULL, (PSZ)"DISPLAY", NULL, NULL, NULL, NULL, NULL, NULL, NULL };
+    HDC 			hMemDC = DevOpenDC( hAB, OD_MEMORY, (PSZ)"*", 5L, (PDEVOPENDATA)&aDevOpenStruc, 0 );
+    HPS 			hMemPS = Ft2CreatePS( hAB, hMemDC, &size, GPIT_MICRO | GPIA_ASSOC | PU_PELS );
+    HBITMAP 		hMemBmp = ImplCreateVirDevBitmap( hMemDC, hMemPS, nDX, nDY, 0 );
+    HBITMAP 		hMemOld = Ft2SetBitmap( hMemPS, hMemBmp );
 
     // creation successfull?
     if( hMemDC && hMemPS && hMemBmp )
@@ -667,8 +667,8 @@ SalBitmap* Os2SalGraphics::getBitmap( long nX, long nY, long nDX, long nDY )
 
 SalColor Os2SalGraphics::getPixel( long nX, long nY )
 {
-    POINTL    aPt = { nX, TY( nY ) };
-    LONG    nColor = Ft2QueryPel( mhPS, &aPt );
+    POINTL	  aPt = { nX, TY( nY ) };
+    LONG	nColor = Ft2QueryPel( mhPS, &aPt );
 
     return MAKE_SALCOLOR( (BYTE) ( nColor >> 16 ), (BYTE) ( nColor >> 8 ), (BYTE) nColor );
 }
diff --git a/vcl/os2/source/gdi/salgdi3.cxx b/vcl/os2/source/gdi/salgdi3.cxx
index e25e68ee5a4c..9dd8819749b2 100644
--- a/vcl/os2/source/gdi/salgdi3.cxx
+++ b/vcl/os2/source/gdi/salgdi3.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
@@ -103,7 +103,7 @@ inline int IntTimes256FromFixed(W32FIXED f)
 // -----------
 
 // this is a special codepage code, used to identify OS/2 symbol font.
-#define SYMBOL_CHARSET                  65400
+#define SYMBOL_CHARSET					65400
 
 // =======================================================================
 
@@ -344,7 +344,7 @@ static ImplDevFontAttributes Os2Font2DevFontAttributes( const PFONTMETRICS pFont
         ||  aDFA.maName.EqualsAscii( "ZapfChancery" )
         ||  aDFA.maName.EqualsAscii( "ZapfDingbats" ) )
             aDFA.mnQuality += 500;
-    }
+    }    
 
     aDFA.meEmbeddedBitmap = EMBEDDEDBITMAP_DONTKNOW;
     aDFA.meAntiAlias = ANTIALIAS_DONTKNOW;
@@ -362,7 +362,7 @@ static ImplDevFontAttributes Os2Font2DevFontAttributes( const PFONTMETRICS pFont
 
 ImplOs2FontData::ImplOs2FontData( PFONTMETRICS _pFontMetric,
     int nHeight, BYTE nPitchAndFamily )
-:   ImplFontData( Os2Font2DevFontAttributes(_pFontMetric), 0 ),
+:	ImplFontData( Os2Font2DevFontAttributes(_pFontMetric), 0 ),
     pFontMetric( _pFontMetric ),
     meOs2CharSet( _pFontMetric->usCodePage),
     mnPitchAndFamily( nPitchAndFamily ),
@@ -408,8 +408,8 @@ void ImplOs2FontData::UpdateFromHPS( HPS hPS ) const
 
     // even if the font works some fonts have problems with the glyph API
     // => the heuristic below tries to figure out which fonts have the problem
-    DWORD   fontType = Ft2QueryFontType( 0, pFontMetric->szFacename);
-    if( fontType != FT2_FONTTYPE_TRUETYPE
+    DWORD	fontType = Ft2QueryFontType( 0, pFontMetric->szFacename);
+    if( fontType != FT2_FONTTYPE_TRUETYPE 
         && (pFontMetric->fsDefn & FM_DEFN_GENERIC) == 0)
         mbDisableGlyphApi = true;
 }
@@ -622,16 +622,16 @@ USHORT Os2SalGraphics::ImplDoSetFont( ImplFontSelectData* i_pFont, float& o_rFon
 #endif
 
     ImplOs2FontData* pFontData = (ImplOs2FontData*)i_pFont->mpFontData;
-    PFONTMETRICS    pFontMetric = NULL;
-    FATTRS          aFAttrs;
-    BOOL            bOutline = FALSE;
-    APIRET          rc;
+    PFONTMETRICS 	pFontMetric = NULL;
+    FATTRS		  	aFAttrs;
+    BOOL		  	bOutline = FALSE;
+    APIRET			rc;			
 
     memset( &aFAttrs, 0, sizeof( FATTRS ) );
     aFAttrs.usRecordLength = sizeof( FATTRS );
 
     aFAttrs.lMaxBaselineExt = i_pFont->mnHeight;
-    aFAttrs.lAveCharWidth   = i_pFont->mnWidth;
+    aFAttrs.lAveCharWidth	= i_pFont->mnWidth;
 
     // do we have a pointer to the FONTMETRICS of the selected font? -> use it!
     if ( pFontData )
@@ -641,9 +641,9 @@ USHORT Os2SalGraphics::ImplDoSetFont( ImplFontSelectData* i_pFont, float& o_rFon
         bOutline = (pFontMetric->fsDefn & FM_DEFN_OUTLINE) != 0;
 
         // use match&registry fields to get correct match
-        aFAttrs.lMatch          = pFontMetric->lMatch;
-        aFAttrs.idRegistry      = pFontMetric->idRegistry;
-        aFAttrs.usCodePage      = pFontMetric->usCodePage;
+        aFAttrs.lMatch	     	= pFontMetric->lMatch;
+        aFAttrs.idRegistry 		= pFontMetric->idRegistry;			
+        aFAttrs.usCodePage 		= pFontMetric->usCodePage;
 
         if ( bOutline )
         {
@@ -654,14 +654,14 @@ USHORT Os2SalGraphics::ImplDoSetFont( ImplFontSelectData* i_pFont, float& o_rFon
         else
         {
             aFAttrs.lMaxBaselineExt = pFontMetric->lMaxBaselineExt;
-            aFAttrs.lAveCharWidth   = pFontMetric->lAveCharWidth;
+            aFAttrs.lAveCharWidth	= pFontMetric->lAveCharWidth;
         }
 
     }
 
     // use family name for outline fonts
     if ( mbPrinter ) {
-        // use font face name for printers because otherwise ft2lib will fail
+        // use font face name for printers because otherwise ft2lib will fail 
         // to select the correct font for GPI (ticket#117)
         strncpy( (char*)(aFAttrs.szFacename), pFontMetric->szFacename, sizeof( aFAttrs.szFacename ) );
     } else if ( !pFontMetric) {
@@ -738,7 +738,7 @@ USHORT Os2SalGraphics::ImplDoSetFont( ImplFontSelectData* i_pFont, float& o_rFon
         {
             nAttrs |= CBB_ANGLE;
             double alpha = (double)(i_pFont->mnOrientation);
-            alpha *= 0.0017453292;   // *PI / 1800
+            alpha *= 0.0017453292;	 // *PI / 1800
             mnOrientationY = (long) (1000.0 * sin( alpha ));
             mnOrientationX = (long) (1000.0 * cos( alpha ));
             aBundle.ptlAngle.x = mnOrientationX;
@@ -867,8 +867,8 @@ void Os2SalGraphics::GetFontMetric( ImplFontMetricData* pMetric )
     }
 #endif
 
-    pMetric->maName             = UniString( aOS2Metric.szFamilyname, gsl_getSystemTextEncoding());
-    pMetric->maStyleName        = ImpStyleNameToSal( aOS2Metric.szFamilyname,
+    pMetric->maName 			= UniString( aOS2Metric.szFamilyname, gsl_getSystemTextEncoding());
+    pMetric->maStyleName		= ImpStyleNameToSal( aOS2Metric.szFamilyname,
                                                      aOS2Metric.szFacename,
                                                      strlen( aOS2Metric.szFamilyname ) );
 
@@ -900,17 +900,17 @@ void Os2SalGraphics::GetFontMetric( ImplFontMetricData* pMetric )
     // transformation dependend font metrics
     if ( aOS2Metric.fsDefn & FM_DEFN_OUTLINE )
     {
-        pMetric->mnWidth       = aOS2Metric.lEmInc;
+        pMetric->mnWidth	   = aOS2Metric.lEmInc;
     }
     else
     {
-        pMetric->mnWidth       = aOS2Metric.lAveCharWidth;
+        pMetric->mnWidth	   = aOS2Metric.lAveCharWidth;
         pMetric->mnOrientation = 0;
     }
-    pMetric->mnIntLeading       = aOS2Metric.lInternalLeading;
-    pMetric->mnExtLeading       = aOS2Metric.lExternalLeading;
-    pMetric->mnAscent           = aOS2Metric.lMaxAscender;
-    pMetric->mnDescent          = aOS2Metric.lMaxDescender;
+    pMetric->mnIntLeading		= aOS2Metric.lInternalLeading;
+    pMetric->mnExtLeading		= aOS2Metric.lExternalLeading;
+    pMetric->mnAscent			= aOS2Metric.lMaxAscender;
+    pMetric->mnDescent			= aOS2Metric.lMaxDescender;
 
     // #107888# improved metric compatibility for Asian fonts...
     // TODO: assess workaround below for CWS >= extleading
@@ -1024,9 +1024,9 @@ bool Os2SalGraphics::AddTempDevFont( ImplDevFontList* pFontList,
 
 void Os2SalGraphics::GetDevFontList( ImplDevFontList* pList )
 {
-    PFONTMETRICS    pFontMetrics;
-    ULONG           nFontMetricCount;
-    SalData*        pSalData;
+    PFONTMETRICS	pFontMetrics;
+    ULONG			nFontMetricCount;
+    SalData*		pSalData;
 
 #if OSL_DEBUG_LEVEL>0
     debug_printf("Os2SalGraphics::GetDevFontList\n");
@@ -1034,12 +1034,12 @@ void Os2SalGraphics::GetDevFontList( ImplDevFontList* pList )
 
     // install OpenSymbol
     HMODULE hMod;
-    ULONG   ObjNum, Offset, rc;
-    CHAR    Buff[2*_MAX_PATH];
-    char    drive[_MAX_DRIVE], dir[_MAX_DIR];
-    char    fname[_MAX_FNAME], ext[_MAX_EXT];
+    ULONG	ObjNum, Offset, rc;
+    CHAR	Buff[2*_MAX_PATH];
+    char 	drive[_MAX_DRIVE], dir[_MAX_DIR];
+    char 	fname[_MAX_FNAME], ext[_MAX_EXT];
     // get module handle (and name)
-    rc = DosQueryModFromEIP( &hMod, &ObjNum, sizeof( Buff), Buff,
+    rc = DosQueryModFromEIP( &hMod, &ObjNum, sizeof( Buff), Buff, 
                             &Offset, (ULONG)ImplSalGetUniString);
     DosQueryModuleName(hMod, sizeof(Buff), Buff);
     // replace module path with font path
@@ -1056,20 +1056,20 @@ void Os2SalGraphics::GetDevFontList( ImplDevFontList* pList )
         // dies im unabhaengigen Teil auch so gemacht wird und wir
         // ansonsten auf geloeschten Systemdaten arbeiten koennten
         pSalData = GetSalData();
-        nFontMetricCount    = pSalData->mnFontMetricCount;
-        pFontMetrics        = pSalData->mpFontMetrics;
+        nFontMetricCount	= pSalData->mnFontMetricCount;
+        pFontMetrics		= pSalData->mpFontMetrics;
         // Bei Bildschirm-Devices holen wir uns die Fontliste jedesmal neu
         if ( pFontMetrics )
         {
             delete pFontMetrics;
-            pFontMetrics        = NULL;
-            nFontMetricCount    = 0;
+            pFontMetrics		= NULL;
+            nFontMetricCount	= 0;
         }
     }
     else
     {
-        nFontMetricCount    = mnFontMetricCount;
-        pFontMetrics        = mpFontMetrics;
+        nFontMetricCount	= mnFontMetricCount;
+        pFontMetrics		= mpFontMetrics;
     }
 
     // do we have to create the cached font list first?
@@ -1099,13 +1099,13 @@ void Os2SalGraphics::GetDevFontList( ImplDevFontList* pList )
 
         if ( !mbPrinter )
         {
-            pSalData->mnFontMetricCount         = nFontMetricCount;
-            pSalData->mpFontMetrics             = pFontMetrics;
+            pSalData->mnFontMetricCount 		= nFontMetricCount;
+            pSalData->mpFontMetrics 			= pFontMetrics;
         }
         else
         {
-            mnFontMetricCount   = nFontMetricCount;
-            mpFontMetrics       = pFontMetrics;
+            mnFontMetricCount	= nFontMetricCount;
+            mpFontMetrics		= pFontMetrics;
         }
     }
 
@@ -1120,7 +1120,7 @@ void Os2SalGraphics::GetDevFontList( ImplDevFontList* pList )
             continue;
 
         // skip bitmap fonts (but keep WarpSans)
-        if ( (pFontMetric->fsDefn & FM_DEFN_OUTLINE) == 0
+        if ( (pFontMetric->fsDefn & FM_DEFN_OUTLINE) == 0 
             && strncmp( pFontMetric->szFacename, "WarpSans", 8) )
             // Font nicht aufnehmen
             continue;
@@ -1131,7 +1131,7 @@ void Os2SalGraphics::GetDevFontList( ImplDevFontList* pList )
             *dash++ = ' ';
 
         // create new font list element
-        ImplOs2FontData* pData      = new ImplOs2FontData( pFontMetric, 0, 0 );
+        ImplOs2FontData* pData 		= new ImplOs2FontData( pFontMetric, 0, 0 );
 
         // add font list element to font list
         pList->Add( pData );
@@ -1361,7 +1361,7 @@ BOOL Os2SalGraphics::GetGlyphOutline( long nIndex, ::basegfx::B2DPolyPolygon& rB
         const double fFactor((1.0/256) * mfFontScale);
         rB2DPolyPoly.transform(basegfx::tools::createScaleB2DHomMatrix(fFactor, fFactor));
     }
-
+    
     return bRet;
 }
 
@@ -1477,8 +1477,8 @@ BOOL Os2SalGraphics::CreateFontSubset( const rtl::OUString& rToFile,
 
     // open font file
     sal_uInt32 nFaceNum = 0;
-    if( !*xRawFontData.get() )  // TTC candidate
-        nFaceNum = ~0U;  // indicate "TTC font extracts only"
+    if( !*xRawFontData.get() )	// TTC candidate
+        nFaceNum = ~0U;	 // indicate "TTC font extracts only"
 
     ScopedTrueTypeFont aSftTTF;
     int nRC = aSftTTF.open( xRawFontData.get(), nFontSize1, nFaceNum );
@@ -1487,18 +1487,18 @@ BOOL Os2SalGraphics::CreateFontSubset( const rtl::OUString& rToFile,
 
     TTGlobalFontInfo aTTInfo;
     ::GetTTGlobalFontInfo( aSftTTF.get(), &aTTInfo );
-    rInfo.m_nFontType   = SAL_FONTSUBSETINFO_TYPE_TRUETYPE;
-    rInfo.m_aPSName     = ImplSalGetUniString( aTTInfo.psname );
-    rInfo.m_nAscent     = +aTTInfo.winAscent;
-    rInfo.m_nDescent    = -aTTInfo.winDescent;
-    rInfo.m_aFontBBox   = Rectangle( Point( aTTInfo.xMin, aTTInfo.yMin ),
+    rInfo.m_nFontType	= SAL_FONTSUBSETINFO_TYPE_TRUETYPE;
+    rInfo.m_aPSName		= ImplSalGetUniString( aTTInfo.psname );
+    rInfo.m_nAscent		= +aTTInfo.winAscent;
+    rInfo.m_nDescent	= -aTTInfo.winDescent;
+    rInfo.m_aFontBBox	= Rectangle( Point( aTTInfo.xMin, aTTInfo.yMin ),
                                     Point( aTTInfo.xMax, aTTInfo.yMax ) );
-    rInfo.m_nCapHeight  = aTTInfo.yMax; // Well ...
+    rInfo.m_nCapHeight	= aTTInfo.yMax; // Well ...
 
     // subset glyphs and get their properties
     // take care that subset fonts require the NotDef glyph in pos 0
     int nOrigCount = nGlyphCount;
-    USHORT    aShortIDs[ 256 ];
+    USHORT	  aShortIDs[ 256 ];
     sal_uInt8 aTempEncs[ 256 ];
 
     int nNotDef=-1, i;
@@ -1543,9 +1543,9 @@ BOOL Os2SalGraphics::CreateFontSubset( const rtl::OUString& rToFile,
         ::GetTTSimpleGlyphMetrics( aSftTTF.get(), aShortIDs, nGlyphCount, aIFSD.mbVertical );
     if( !pMetrics )
         return FALSE;
-    sal_uInt16 nNotDefAdv   = pMetrics[0].adv;
-    pMetrics[0].adv         = pMetrics[nNotDef].adv;
-    pMetrics[nNotDef].adv   = nNotDefAdv;
+    sal_uInt16 nNotDefAdv	= pMetrics[0].adv;
+    pMetrics[0].adv			= pMetrics[nNotDef].adv;
+    pMetrics[nNotDef].adv	= nNotDefAdv;
     for( i = 0; i < nOrigCount; ++i )
         pGlyphWidths[i] = pMetrics[i].adv;
     free( pMetrics );
@@ -1584,18 +1584,18 @@ const void* Os2SalGraphics::GetEmbedFontData( const ImplFontData* pFont,
     DWORD nFontSize2 = Ft2GetFontData( mhPS, 0, 0, pData, nFontSize1 );
     if( nFontSize1 != nFontSize2 )
         *pDataLen = 0;
-
+    
     // get important font properties
     FONTMETRICS aOS2Metric;
     if (Ft2QueryFontMetrics( mhPS, sizeof( aOS2Metric ), &aOS2Metric ) == GPI_ERROR)
             *pDataLen = 0;
-    rInfo.m_nFontType   = SAL_FONTSUBSETINFO_TYPE_TYPE1;
-    rInfo.m_aPSName     = ImplSalGetUniString( aOS2Metric.szFacename );
-    rInfo.m_nAscent     = +aOS2Metric.lMaxAscender;
-    rInfo.m_nDescent    = -aOS2Metric.lMaxDescender;
-    rInfo.m_aFontBBox   = Rectangle( Point( 0, -aOS2Metric.lMaxDescender ),
+    rInfo.m_nFontType	= SAL_FONTSUBSETINFO_TYPE_TYPE1;
+    rInfo.m_aPSName		= ImplSalGetUniString( aOS2Metric.szFacename );
+    rInfo.m_nAscent		= +aOS2Metric.lMaxAscender;
+    rInfo.m_nDescent	= -aOS2Metric.lMaxDescender;
+    rInfo.m_aFontBBox	= Rectangle( Point( 0, -aOS2Metric.lMaxDescender ),
               Point( aOS2Metric.lMaxCharInc, aOS2Metric.lMaxAscender+aOS2Metric.lExternalLeading ) );
-    rInfo.m_nCapHeight  = aOS2Metric.lMaxAscender; // Well ...
+    rInfo.m_nCapHeight	= aOS2Metric.lMaxAscender; // Well ...
 
     // get individual character widths
     for( int i = 0; i < 256; ++i )
@@ -1631,14 +1631,14 @@ const Ucs2SIntMap* Os2SalGraphics::GetFontEncodingVector( const ImplFontData* pF
 
     // fill the encoding vector
     Ucs2SIntMap& rMap = *new Ucs2SIntMap;
-#if 0
+#if 0	 
     // TODO: get correct encoding vector
     ImplWinFontData* pWinFontData = reinterpret_cast<ImplWinFontData*>(pFont);
-
+    
     GLYPHSET aGlyphSet;
     aGlyphSet.cbThis = sizeof(aGlyphSet);
     DWORD aW = ::GetFontUnicodeRanges( mhDC, &aGlyphSet);
-#else
+#else	 
     for( sal_Unicode i = 32; i < 256; ++i )
         rMap[i] = i;
     if( pNonEncoded )
@@ -1661,10 +1661,10 @@ void Os2SalGraphics::GetGlyphWidths( const ImplFontData* pFont,
 
     // TODO: much better solution: move SetFont and restoration of old font to caller
     ScopedFont aOldFont(*this);
-
+    
     float fScale = 0.0;
     ImplDoSetFont( &aIFSD, fScale, 0);
-
+    
     if( pFont->IsSubsettable() )
     {
         // get raw font file data
@@ -1680,12 +1680,12 @@ void Os2SalGraphics::GetGlyphWidths( const ImplFontData* pFont,
         sal_uInt32 nFaceNum = 0;
         if( !*xRawFontData.get() )  // TTC candidate
             nFaceNum = ~0U;  // indicate "TTC font extracts only"
-
+    
         ScopedTrueTypeFont aSftTTF;
         int nRC = aSftTTF.open( xRawFontData.get(), nFontSize1, nFaceNum );
         if( nRC != SF_OK )
             return;
-
+    
         int nGlyphs = GetTTGlyphCount( aSftTTF.get() );
         if( nGlyphs > 0 )
         {
@@ -1739,7 +1739,7 @@ void Os2SalGraphics::GetGlyphWidths( const ImplFontData* pFont,
                 rWidths.push_back( nCharWidth );
             }
         }
-    }
+    }    
 }
 
 //--------------------------------------------------------------------------
@@ -1755,14 +1755,14 @@ SystemFontData Os2SalGraphics::GetSysFontData( int nFallbacklevel ) const
 
     if (nFallbacklevel >= MAX_FALLBACK) nFallbacklevel = MAX_FALLBACK - 1;
     if (nFallbacklevel < 0 ) nFallbacklevel = 0;
-
+    
     aSysFontData.nSize = sizeof( SystemFontData );
-    aSysFontData.hFont = mhFonts[nFallbacklevel];
+    aSysFontData.hFont = mhFonts[nFallbacklevel]; 
     aSysFontData.bFakeBold = false;
     aSysFontData.bFakeItalic = false;
     aSysFontData.bAntialias = true;
     aSysFontData.bVerticalCharacterType = false;
-
+        
     return aSysFontData;
 }
 
diff --git a/vcl/os2/source/gdi/salprn.cxx b/vcl/os2/source/gdi/salprn.cxx
index 1aef34631f2e..69c6c9aa903d 100644
--- a/vcl/os2/source/gdi/salprn.cxx
+++ b/vcl/os2/source/gdi/salprn.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
@@ -67,10 +67,10 @@
 
 struct ImplFormInfo
 {
-    long                    mnPaperWidth;
-    long                    mnPaperHeight;
+    long					mnPaperWidth;
+    long					mnPaperHeight;
 #ifndef NO_DJP
-    DJPT_PAPERSIZE          mnId;
+    DJPT_PAPERSIZE			mnId;
 #endif
 };
 
@@ -82,12 +82,12 @@ struct ImplFormInfo
 
 struct ImplTrayInfo
 {
-    CHAR            maName[32];
-    CHAR            maDisplayName[64];
-    DJPT_TRAYTYPE   mnId;
+    CHAR			maName[32];
+    CHAR			maDisplayName[64];
+    DJPT_TRAYTYPE	mnId;
 
     ImplTrayInfo( const char* pTrayName,
-                  const char* pTrayDisplayName )
+                  const char* pTrayDisplayName ) 
     {
         strcpy( maName, pTrayName);
         strcpy( maDisplayName, pTrayDisplayName);
@@ -98,12 +98,12 @@ struct ImplTrayInfo
 
 struct ImplQueueSalSysData
 {
-    ByteString      maPrinterName;          // pszPrinters
-    ByteString      maName;                 // pszName bzw. LogAddress
-    ByteString      maOrgDriverName;        // pszDriverName (maDriverName.maDeviceName)
-    ByteString      maDriverName;           // pszDriverName bis .
-    ByteString      maDeviceName;           // pszDriverName nach .
-    PDRIVDATA       mpDrivData;
+    ByteString		maPrinterName;			// pszPrinters
+    ByteString		maName; 				// pszName bzw. LogAddress
+    ByteString		maOrgDriverName;		// pszDriverName (maDriverName.maDeviceName)
+    ByteString		maDriverName;			// pszDriverName bis .
+    ByteString		maDeviceName;			// pszDriverName nach .
+    PDRIVDATA		mpDrivData;
 
                     ImplQueueSalSysData( const ByteString& rPrinterName,
                                          const ByteString& rName,
@@ -186,11 +186,11 @@ void Os2SalInstance::GetPrinterQueueInfo( ImplPrnQueueList* pList )
 
         ByteString aOrgDriverName( pPrqInfo->pszDriverName);
         ByteString aName( pPrqInfo->pszName);
-        pInfo->maDriver      = ::rtl::OStringToOUString (aOrgDriverName, gsl_getSystemTextEncoding());
+        pInfo->maDriver 	 = ::rtl::OStringToOUString (aOrgDriverName, gsl_getSystemTextEncoding());
         pInfo->maPrinterName = ::rtl::OStringToOUString (pPrqInfo->pszComment, gsl_getSystemTextEncoding());
-        pInfo->maLocation    = ::rtl::OStringToOUString (aName, gsl_getSystemTextEncoding());
-        pInfo->mnStatus      = ImplPMQueueStatusToSal( pPrqInfo->fsStatus );
-        pInfo->mnJobs        = pPrqInfo->cJobs;
+        pInfo->maLocation	 = ::rtl::OStringToOUString (aName, gsl_getSystemTextEncoding());
+        pInfo->mnStatus 	 = ImplPMQueueStatusToSal( pPrqInfo->fsStatus );
+        pInfo->mnJobs		 = pPrqInfo->cJobs;
         // pInfo->maComment = !!!
 
         // Feststellen, ob Name doppelt
@@ -213,7 +213,7 @@ void Os2SalInstance::GetPrinterQueueInfo( ImplPrnQueueList* pList )
         if ( (pDriverName = strchr( pPrqInfo->pszDriverName, '.' )) != 0 )
         {
            *pDriverName = 0;
-           pDeviceName  = pDriverName + 1;
+           pDeviceName	= pDriverName + 1;
         }
         else
             pDeviceName = NULL;
@@ -279,7 +279,7 @@ void Os2SalInstance::GetPrinterQueueState( SalPrinterQueueInfo* pInfo )
              pSysData->maOrgDriverName.Equals( pPrqInfo->pszDriverName ) )
         {
             pInfo->mnStatus = ImplPMQueueStatusToSal( pPrqInfo->fsStatus );
-            pInfo->mnJobs   = pPrqInfo->cJobs;
+            pInfo->mnJobs	= pPrqInfo->cJobs;
             break;
         }
 
@@ -302,12 +302,12 @@ void Os2SalInstance::DeletePrinterQueueInfo( SalPrinterQueueInfo* pInfo )
 
 XubString Os2SalInstance::GetDefaultPrinter()
 {
-    APIRET      rc;
-    ULONG       nNeeded;
-    ULONG       nReturned;
-    ULONG       nTotal;
-    char        szQueueName[255];
-    XubString   aDefaultName;
+    APIRET		rc;
+    ULONG		nNeeded;
+    ULONG		nReturned;
+    ULONG		nTotal;
+    char		szQueueName[255];
+    XubString	aDefaultName;
 
     // query default queue
     if ( !PrfQueryProfileString( HINI_PROFILE, SPL_INI_SPOOLER, "QUEUE", 0, szQueueName, sizeof( szQueueName ) ) )
@@ -509,11 +509,11 @@ static void ImplFormatInputList( PDJP_ITEM pDJP, PQUERYTUPLE pTuple )
    BOOL fContinue = TRUE;
    do
    {
-      pDJP->cb            = sizeof (DJP_ITEM);
-      pDJP->ulProperty    = pTuple->ulProperty;
-      pDJP->lType         = pTuple->lType;
+      pDJP->cb			  = sizeof (DJP_ITEM);
+      pDJP->ulProperty	  = pTuple->ulProperty;
+      pDJP->lType		  = pTuple->lType;
       pDJP->ulNumReturned = 0;
-      pDJP->ulValue       = DJP_NONE;
+      pDJP->ulValue 	  = DJP_NONE;
 
       // at EOL?
       fContinue = DJP_NONE != pTuple->ulProperty;
@@ -554,19 +554,19 @@ static void ImplGetFormAndTrayList( Os2SalInfoPrinter* pOs2SalInfoPrinter, const
 
     LONG alQuery[] =
     {
-        0,                  0,              // First two members of QUERYSIZE
-        DJP_CJ_FORM,        DJP_ALL,
-        DJP_CJ_TRAYNAME,    DJP_ALL,
-        DJP_NONE,           DJP_NONE        // EOL marker
+        0,					0,				// First two members of QUERYSIZE
+        DJP_CJ_FORM,		DJP_ALL,
+        DJP_CJ_TRAYNAME,	DJP_ALL,
+        DJP_NONE,			DJP_NONE		// EOL marker
     };
 
-    APIRET      rc;
-    PQUERYSIZE  pQuerySize          = (PQUERYSIZE)alQuery;
-    PBYTE       pBuffer             = NULL;
-    LONG        nAlloc              = 0;
-    PDRIVDATA   pCopyDrivData       = ImplPrnDrivData( pSetupData );
-    LONG        nDrivDataSize       = pCopyDrivData->cb;
-    PBYTE       pDrivData           = (PBYTE)pCopyDrivData;
+    APIRET		rc;
+    PQUERYSIZE	pQuerySize			= (PQUERYSIZE)alQuery;
+    PBYTE		pBuffer 			= NULL;
+    LONG		nAlloc				= 0;
+    PDRIVDATA	pCopyDrivData		= ImplPrnDrivData( pSetupData );
+    LONG		nDrivDataSize		= pCopyDrivData->cb;
+    PBYTE		pDrivData			= (PBYTE)pCopyDrivData;
 
     // find out how many bytes to allocate
     pQuerySize->cb = sizeof( alQuery );
@@ -615,10 +615,10 @@ static void ImplGetFormAndTrayList( Os2SalInfoPrinter* pOs2SalInfoPrinter, const
                     pOs2SalInfoPrinter->mpFormArray = new PIMPLFORMINFO[pOs2SalInfoPrinter->mnFormCount];
                     for( int i = 0; i < pDJP->ulNumReturned; i++, pElm++ )
                     {
-                        ImplFormInfo* pInfo     = new ImplFormInfo;
-                        pInfo->mnPaperWidth     = pElm->hcInfo.cx;
-                        pInfo->mnPaperHeight    = pElm->hcInfo.cy;
-                        pInfo->mnId             = pElm->djppsFormID;
+                        ImplFormInfo* pInfo 	= new ImplFormInfo;
+                        pInfo->mnPaperWidth 	= pElm->hcInfo.cx;
+                        pInfo->mnPaperHeight	= pElm->hcInfo.cy;
+                        pInfo->mnId 			= pElm->djppsFormID;
                         pOs2SalInfoPrinter->mpFormArray[i] = pInfo;
                     }
                 }
@@ -633,8 +633,8 @@ static void ImplGetFormAndTrayList( Os2SalInfoPrinter* pOs2SalInfoPrinter, const
                     pOs2SalInfoPrinter->mpTrayArray = new PIMPLTRAYINFO[pOs2SalInfoPrinter->mnTrayCount];
                     for( int i = 0; i < pDJP->ulNumReturned; i++, pElm++ )
                     {
-                        ImplTrayInfo* pInfo     = new ImplTrayInfo( pElm->szTrayname, pElm->szDisplayTrayname );
-                        pInfo->mnId             = pElm->djpttTrayID;
+                        ImplTrayInfo* pInfo 	= new ImplTrayInfo( pElm->szTrayname, pElm->szDisplayTrayname );
+                        pInfo->mnId 			= pElm->djpttTrayID;
                         pOs2SalInfoPrinter->mpTrayArray[i] = pInfo;
                     }
                 }
@@ -658,20 +658,20 @@ static BOOL ImplGetCurrentSettings( Os2SalInfoPrinter* pOs2SalInfoPrinter, ImplJ
 
     LONG alQuery[] =
     {
-        0,                      0,              // First two members of QUERYSIZE
-        DJP_SJ_ORIENTATION,     DJP_CURRENT,
-        DJP_CJ_FORM,            DJP_CURRENT,
-        DJP_NONE,               DJP_NONE        // EOL marker
+        0,						0,				// First two members of QUERYSIZE
+        DJP_SJ_ORIENTATION, 	DJP_CURRENT,
+        DJP_CJ_FORM,			DJP_CURRENT,
+        DJP_NONE,				DJP_NONE		// EOL marker
     };
 
-    APIRET      rc;
-    PQUERYSIZE  pQuerySize          = (PQUERYSIZE)alQuery;
-    PBYTE       pBuffer             = NULL;
-    LONG        nAlloc              = 0;
-    PDRIVDATA   pCopyDrivData       = ImplPrnDrivData( pSetupData );
-    LONG        nDrivDataSize       = pCopyDrivData->cb;
-    PBYTE       pDrivData           = (PBYTE)pCopyDrivData;
-    BOOL        bResult;
+    APIRET		rc;
+    PQUERYSIZE	pQuerySize			= (PQUERYSIZE)alQuery;
+    PBYTE		pBuffer 			= NULL;
+    LONG		nAlloc				= 0;
+    PDRIVDATA	pCopyDrivData		= ImplPrnDrivData( pSetupData );
+    LONG		nDrivDataSize		= pCopyDrivData->cb;
+    PBYTE		pDrivData			= (PBYTE)pCopyDrivData;
+    BOOL		bResult;
 
     // find out how many bytes to allocate
     pQuerySize->cb = sizeof( alQuery );
@@ -769,8 +769,8 @@ static BOOL ImplGetCurrentSettings( Os2SalInfoPrinter* pOs2SalInfoPrinter, ImplJ
                     }
 
                     // Wir suchen zuerst ueber den Namen/Id und dann ueber die Id
-                    BOOL    bTrayFound = FALSE;
-                    USHORT  j;
+                    BOOL	bTrayFound = FALSE;
+                    USHORT	j;
                     for ( j = 0; j < pOs2SalInfoPrinter->mnTrayCount; j++ )
                     {
                         if ( (pOs2SalInfoPrinter->mpTrayArray[j]->mnId == pElm->djpttTrayID) &&
@@ -824,16 +824,16 @@ static BOOL ImplSetOrientation( HDC hPrinterDC, PDRIVDATA pDriverData,
 {
     LONG alQuery[] =
     {
-        0,                      0,              // First two members of QUERYSIZE
-        DJP_SJ_ORIENTATION,     DJP_CURRENT,
-        DJP_NONE,               DJP_NONE        // EOL marker
+        0,						0,				// First two members of QUERYSIZE
+        DJP_SJ_ORIENTATION, 	DJP_CURRENT,
+        DJP_NONE,				DJP_NONE		// EOL marker
     };
 
-    APIRET      rc;
-    PQUERYSIZE  pQuerySize      = (PQUERYSIZE)alQuery;
-    PBYTE       pBuffer         = NULL;
-    LONG        nAlloc          = 0;
-    LONG        nDrivDataSize   = pDriverData->cb;
+    APIRET		rc;
+    PQUERYSIZE	pQuerySize		= (PQUERYSIZE)alQuery;
+    PBYTE		pBuffer 		= NULL;
+    LONG		nAlloc			= 0;
+    LONG		nDrivDataSize	= pDriverData->cb;
 
     // find out how many bytes to allocate
     pQuerySize->cb = sizeof( alQuery );
@@ -854,10 +854,10 @@ static BOOL ImplSetOrientation( HDC hPrinterDC, PDRIVDATA pDriverData,
     PDJP_ITEM pDJP = (PDJP_ITEM)pBuffer;
     ImplFormatInputList( pDJP, pQuerySize->aTuples );
 
-    pDJP->cb         = sizeof( DJP_ITEM );
+    pDJP->cb		 = sizeof( DJP_ITEM );
     pDJP->ulProperty = DJP_SJ_ORIENTATION;
-    pDJP->lType      = DJP_CURRENT;
-    pDJP->ulValue    = (eOrientation == ORIENTATION_PORTRAIT)
+    pDJP->lType 	 = DJP_CURRENT;
+    pDJP->ulValue	 = (eOrientation == ORIENTATION_PORTRAIT)
                            ? DJP_ORI_PORTRAIT
                            : DJP_ORI_LANDSCAPE;
 
@@ -881,16 +881,16 @@ static BOOL ImplSetPaperSize( HDC hPrinterDC, PDRIVDATA pDriverData,
 {
     LONG alQuery[] =
     {
-        0,                      0,              // First two members of QUERYSIZE
-        DJP_SJ_PAPERSIZE,       DJP_CURRENT,
-        DJP_NONE,               DJP_NONE        // EOL marker
+        0,						0,				// First two members of QUERYSIZE
+        DJP_SJ_PAPERSIZE,		DJP_CURRENT,
+        DJP_NONE,				DJP_NONE		// EOL marker
     };
 
-    APIRET      rc;
-    PQUERYSIZE  pQuerySize      = (PQUERYSIZE)alQuery;
-    PBYTE       pBuffer         = NULL;
-    LONG        nAlloc          = 0;
-    LONG        nDrivDataSize   = pDriverData->cb;
+    APIRET		rc;
+    PQUERYSIZE	pQuerySize		= (PQUERYSIZE)alQuery;
+    PBYTE		pBuffer 		= NULL;
+    LONG		nAlloc			= 0;
+    LONG		nDrivDataSize	= pDriverData->cb;
 
     // find out how many bytes to allocate
     pQuerySize->cb = sizeof( alQuery );
@@ -913,10 +913,10 @@ static BOOL ImplSetPaperSize( HDC hPrinterDC, PDRIVDATA pDriverData,
     ImplFormatInputList( pDJP, pQuerySize->aTuples );
 
     // Neue Daten zuweisen
-    pDJP->cb         = sizeof( DJP_ITEM );
+    pDJP->cb		 = sizeof( DJP_ITEM );
     pDJP->ulProperty = DJP_SJ_PAPERSIZE;
-    pDJP->lType      = DJP_CURRENT;
-    pDJP->ulValue    = nOS2PaperFormat;
+    pDJP->lType 	 = DJP_CURRENT;
+    pDJP->ulValue	 = nOS2PaperFormat;
 
     // und setzen
     rc = DevEscape( hPrinterDC,
@@ -938,16 +938,16 @@ static BOOL ImplSetPaperBin( HDC hPrinterDC, PDRIVDATA pDriverData,
 {
     LONG alQuery[] =
     {
-        0,                      0,              // First two members of QUERYSIZE
-        DJP_SJ_TRAYTYPE,        DJP_CURRENT,
-        DJP_NONE,               DJP_NONE        // EOL marker
+        0,						0,				// First two members of QUERYSIZE
+        DJP_SJ_TRAYTYPE,		DJP_CURRENT,
+        DJP_NONE,				DJP_NONE		// EOL marker
     };
 
-    APIRET      rc;
-    PQUERYSIZE  pQuerySize      = (PQUERYSIZE)alQuery;
-    PBYTE       pBuffer         = NULL;
-    LONG        nAlloc          = 0;
-    LONG        nDrivDataSize   = pDriverData->cb;
+    APIRET		rc;
+    PQUERYSIZE	pQuerySize		= (PQUERYSIZE)alQuery;
+    PBYTE		pBuffer 		= NULL;
+    LONG		nAlloc			= 0;
+    LONG		nDrivDataSize	= pDriverData->cb;
 
     // find out how many bytes to allocate
     pQuerySize->cb = sizeof( alQuery );
@@ -969,10 +969,10 @@ static BOOL ImplSetPaperBin( HDC hPrinterDC, PDRIVDATA pDriverData,
     ImplFormatInputList( pDJP, pQuerySize->aTuples );
 
     // Neue Daten zuweisen
-    pDJP->cb         = sizeof( DJP_ITEM );
+    pDJP->cb		 = sizeof( DJP_ITEM );
     pDJP->ulProperty = DJP_SJ_TRAYTYPE;
-    pDJP->lType      = DJP_CURRENT;
-    pDJP->ulValue    = pTrayInfo->mnId;
+    pDJP->lType 	 = DJP_CURRENT;
+    pDJP->ulValue	 = pTrayInfo->mnId;
 
     // und setzen
     rc = DevEscape( hPrinterDC,
@@ -997,10 +997,10 @@ static BOOL ImplSalCreateInfoPrn( Os2SalInfoPrinter* pPrinter, PDRIVDATA pDriver
     // create info context
     DEVOPENSTRUC  devOpenStruc;
     memset( &devOpenStruc, 0, sizeof( devOpenStruc ) );
-    devOpenStruc.pszLogAddress      = (char*)pPrinter->maName.GetBuffer();
-    devOpenStruc.pszDriverName      = (char*)pPrinter->maDriverName.GetBuffer();
-    devOpenStruc.pdriv              = pDriverData;
-    devOpenStruc.pszDataType        = "PM_Q_STD";
+    devOpenStruc.pszLogAddress		= (char*)pPrinter->maName.GetBuffer();
+    devOpenStruc.pszDriverName		= (char*)pPrinter->maDriverName.GetBuffer();
+    devOpenStruc.pdriv				= pDriverData;
+    devOpenStruc.pszDataType		= "PM_Q_STD";
 
     HDC hDC = DevOpenDC( pSalData->mhAB, OD_INFO, "*",
                          4, (PDEVOPENDATA)&devOpenStruc, (HDC)NULL);
@@ -1040,15 +1040,15 @@ SalInfoPrinter* Os2SalInstance::CreateInfoPrinter( SalPrinterQueueInfo* pQueueIn
 {
     ImplQueueSalSysData* pSysQueueData = (ImplQueueSalSysData*)(pQueueInfo->mpSysData);
     Os2SalInfoPrinter* pPrinter = new Os2SalInfoPrinter;
-    pPrinter->maPrinterName = pSysQueueData->maPrinterName;
-    pPrinter->maName            = pSysQueueData->maName;
-    pPrinter->maDriverName  = pSysQueueData->maDriverName;
-    pPrinter->maDeviceName  = pSysQueueData->maDeviceName;
+    pPrinter->maPrinterName	= pSysQueueData->maPrinterName;
+    pPrinter->maName			= pSysQueueData->maName;
+    pPrinter->maDriverName	= pSysQueueData->maDriverName;
+    pPrinter->maDeviceName	= pSysQueueData->maDeviceName;
 
     // Nur Setup-Daten uebernehmen, wenn Treiber und Laenge der Treiberdaten
     // uebereinstimmt
-    PDRIVDATA   pDriverData;
-    BOOL        bUpdateDriverData;
+    PDRIVDATA	pDriverData;
+    BOOL		bUpdateDriverData;
     if ( pSetupData->mpDriverData && pSysQueueData->mpDrivData &&
          (pSetupData->mnSystem == JOBSETUP_SYSTEM_OS2) &&
          (pSetupData->mnDriverDataLen == pSysQueueData->mpDrivData->cb) &&
@@ -1076,16 +1076,16 @@ SalInfoPrinter* Os2SalInstance::CreateInfoPrinter( SalPrinterQueueInfo* pQueueIn
 
     // create graphics object for output
     Os2SalGraphics* pGraphics = new Os2SalGraphics;
-    pGraphics->mhDC             = pPrinter->mhDC;
-    pGraphics->mhPS             = pPrinter->mhPS;
-    pGraphics->mhWnd            = 0;
-    pGraphics->mbPrinter        = TRUE;
-    pGraphics->mbVirDev         = FALSE;
-    pGraphics->mbWindow         = FALSE;
-    pGraphics->mbScreen         = FALSE;
+    pGraphics->mhDC				= pPrinter->mhDC;
+    pGraphics->mhPS				= pPrinter->mhPS;
+    pGraphics->mhWnd 			= 0;
+    pGraphics->mbPrinter 		= TRUE;
+    pGraphics->mbVirDev			= FALSE;
+    pGraphics->mbWindow			= FALSE;
+    pGraphics->mbScreen			= FALSE;
 
     ImplSalInitGraphics( pGraphics );
-    pPrinter->mpGraphics            = pGraphics;
+    pPrinter->mpGraphics			= pGraphics;
 
     // check printer driver for DJP support
     pPrinter->mbDJPSupported = ImplIsDriverDJPEnabled( pPrinter->mhDC );
@@ -1118,15 +1118,15 @@ void Os2SalInstance::DestroyInfoPrinter( SalInfoPrinter* pPrinter )
 
 Os2SalInfoPrinter::Os2SalInfoPrinter()
 {
-    mhDC                    = 0;
-    mhPS                    = 0;
-    mpGraphics          = NULL;
-    mbGraphics          = FALSE;
-    mbDJPSupported      = FALSE;
-    mnFormCount         = 0;
-    mpFormArray         = NULL;
-    mnTrayCount         = 0;
-    mpTrayArray         = NULL;
+    mhDC					= 0;
+    mhPS					= 0;
+    mpGraphics			= NULL;
+    mbGraphics			= FALSE;
+    mbDJPSupported		= FALSE;
+    mnFormCount			= 0;
+    mpFormArray			= NULL;
+    mnTrayCount			= 0;
+    mpTrayArray			= NULL;
 }
 
 // -----------------------------------------------------------------------
@@ -1316,8 +1316,8 @@ BOOL Os2SalInfoPrinter::SetData( ULONG nFlags, ImplJobSetup* pSetupData )
                 {
                 nOS2PaperFormat = DJP_PSI_NONE;
                 // OS2 rechnet in Millimetern
-                long nPaperWidth     = pSetupData->mnPaperWidth  / 100;
-                long nPaperHeight    = pSetupData->mnPaperHeight / 100;
+                long nPaperWidth	 = pSetupData->mnPaperWidth  / 100;
+                long nPaperHeight	 = pSetupData->mnPaperHeight / 100;
                 // Ansonsten ueber die Papiergroesse suchen
                 for( int i = 0; i < mnFormCount; i++ )
                 {
@@ -1452,7 +1452,7 @@ void Os2SalInfoPrinter::GetPageInfo( const ImplJobSetup*,
     HDC hDC = mhDC;
 
     // search current form
-    HCINFO  aInfo;
+    HCINFO	aInfo;
     int nForms = DevQueryHardcopyCaps( hDC, 0, 0, &aInfo );
     for( int i = 0; i < nForms; i++ )
     {
@@ -1465,12 +1465,12 @@ void Os2SalInfoPrinter::GetPageInfo( const ImplJobSetup*,
                 long nYResolution;
                 DevQueryCaps( hDC, CAPS_HORIZONTAL_RESOLUTION, 1, &nXResolution );
                 DevQueryCaps( hDC, CAPS_VERTICAL_RESOLUTION, 1, &nYResolution );
-                rPageOffX   = aInfo.xLeftClip * nXResolution / 1000;
-                rPageOffY   = (aInfo.cy-aInfo.yTopClip) * nYResolution / 1000;
-                rPageWidth  = aInfo.cx * nXResolution / 1000;
+                rPageOffX	= aInfo.xLeftClip * nXResolution / 1000;
+                rPageOffY	= (aInfo.cy-aInfo.yTopClip) * nYResolution / 1000;
+                rPageWidth	= aInfo.cx * nXResolution / 1000;
                 rPageHeight = aInfo.cy * nYResolution / 1000;
-                rOutWidth   = aInfo.xPels;
-                rOutHeight  = aInfo.yPels;
+                rOutWidth	= aInfo.xPels;
+                rOutHeight	= aInfo.yPels;
                 return;
             }
         }
@@ -1481,11 +1481,11 @@ void Os2SalInfoPrinter::GetPageInfo( const ImplJobSetup*,
     long lCapsHeight = 0;
     DevQueryCaps( hDC, CAPS_WIDTH, 1L, &lCapsWidth );
     DevQueryCaps( hDC, CAPS_HEIGHT, 1L, &lCapsHeight );
-    rPageOffX    = 0;
-    rPageOffY    = 0;
-    rOutWidth    = lCapsWidth;
-    rOutHeight   = lCapsHeight;
-    rPageWidth   = rOutWidth;
+    rPageOffX	 = 0;
+    rPageOffY	 = 0;
+    rOutWidth	 = lCapsWidth;
+    rOutHeight	 = lCapsHeight;
+    rPageWidth	 = rOutWidth;
     rPageHeight  = rOutHeight;
 }
 
@@ -1538,11 +1538,11 @@ void Os2SalInstance::DestroyPrinter( SalPrinter* pPrinter )
 
 Os2SalPrinter::Os2SalPrinter()
 {
-    mhDC                    = 0;
-    mhPS                    = 0;
-    mpGraphics          = NULL;
-    mbAbort             = FALSE;
-    mbPrintDJPSupported = FALSE;
+    mhDC					= 0;
+    mhPS					= 0;
+    mpGraphics			= NULL;
+    mbAbort				= FALSE;
+    mbPrintDJPSupported	= FALSE;
 }
 
 // -----------------------------------------------------------------------
@@ -1561,9 +1561,9 @@ BOOL Os2SalPrinter::StartJob( const XubString* pFileName,
                            bool bDirect,
                            ImplJobSetup* pSetupData )
 {
-    DEVOPENSTRUC    aDevOpenStruc;
-    LONG            lType;
-    APIRET          rc;
+    DEVOPENSTRUC	aDevOpenStruc;
+    LONG			lType;
+    APIRET			rc;
 
     // prepare queue information
     memset( &aDevOpenStruc, 0, sizeof( aDevOpenStruc ) );
@@ -1588,8 +1588,8 @@ BOOL Os2SalPrinter::StartJob( const XubString* pFileName,
 
 #if 0 // YD FIXME
     // Set comment (AppName nur bis zum 1. Space-Zeichen nehmen)
-    const xub_Unicode*  pComment = rAppName;
-    USHORT          nCommentLen = 0;
+    const xub_Unicode*	pComment = rAppName;
+    USHORT			nCommentLen = 0;
     memset( maCommentBuf, 0, sizeof( maCommentBuf ) );
     while ( (nCommentLen < 32) &&
             (((*pComment >= 'a') && (*pComment <= 'z')) ||
@@ -1617,8 +1617,8 @@ BOOL Os2SalPrinter::StartJob( const XubString* pFileName,
     }
 
     // open device context
-    SalData*    pSalData = GetSalData();
-    HAB         hAB = pSalData->mhAB;
+    SalData*	pSalData = GetSalData();
+    HAB 		hAB = pSalData->mhAB;
     aDevOpenStruc.pdriv = (PDRIVDATA)pSetupData->mpDriverData;
     mhDC = DevOpenDC( hAB,
                                     lType,
@@ -1737,20 +1737,20 @@ SalGraphics* Os2SalPrinter::StartPage( ImplJobSetup* pSetupData, BOOL bNewJobSet
         mbFirstPage = FALSE;
     else
     {
-        PBYTE   pJobData;
-        LONG    nJobDataSize;
-        LONG    nEscape;
+        PBYTE	pJobData;
+        LONG	nJobDataSize;
+        LONG	nEscape;
         if ( mbPrintDJPSupported && bNewJobSetup )
         {
-            nEscape         = DEVESC_NEWFRAME_WPROP;
-            nJobDataSize    = ((PDRIVDATA)(pSetupData->mpDriverData))->cb;
-            pJobData        = (PBYTE)(pSetupData->mpDriverData);
+            nEscape 		= DEVESC_NEWFRAME_WPROP;
+            nJobDataSize	= ((PDRIVDATA)(pSetupData->mpDriverData))->cb;
+            pJobData		= (PBYTE)(pSetupData->mpDriverData);
         }
         else
         {
-            nEscape         = DEVESC_NEWFRAME;
-            nJobDataSize    = 0;
-            pJobData        = NULL;
+            nEscape 		= DEVESC_NEWFRAME;
+            nJobDataSize	= 0;
+            pJobData		= NULL;
         }
         rc = DevEscape( mhDC,
                         nEscape,
@@ -1770,23 +1770,23 @@ SalGraphics* Os2SalPrinter::StartPage( ImplJobSetup* pSetupData, BOOL bNewJobSet
 
     // create SalGraphics with copy of hPS
     Os2SalGraphics* pGraphics = new Os2SalGraphics;
-    pGraphics->mhDC             = mhDC;
-    pGraphics->mhPS             = mhPS;
-    pGraphics->mhWnd            = 0;
-    pGraphics->mbPrinter        = TRUE;
-    pGraphics->mbVirDev         = FALSE;
-    pGraphics->mbWindow         = FALSE;
-    pGraphics->mbScreen         = FALSE;
-    pGraphics->mnHeight         = 0;
+    pGraphics->mhDC				= mhDC;
+    pGraphics->mhPS				= mhPS;
+    pGraphics->mhWnd 			= 0;
+    pGraphics->mbPrinter 		= TRUE;
+    pGraphics->mbVirDev			= FALSE;
+    pGraphics->mbWindow			= FALSE;
+    pGraphics->mbScreen			= FALSE;
+    pGraphics->mnHeight			= 0;
     // search current form for actual page height
-    HCINFO  aInfo;
-    int     nForms = DevQueryHardcopyCaps( mhDC, 0, 0, &aInfo );
+    HCINFO	aInfo;
+    int 	nForms = DevQueryHardcopyCaps( mhDC, 0, 0, &aInfo );
     for( int i = 0; i < nForms; i++ )
     {
         if ( DevQueryHardcopyCaps( mhDC, i, 1, &aInfo ) >= 0 )
         {
             if ( aInfo.flAttributes & HCAPS_CURRENT )
-                pGraphics->mnHeight = aInfo.yPels;
+                pGraphics->mnHeight	= aInfo.yPels;
         }
     }
     // use device caps if no form selected/found
diff --git a/vcl/os2/source/gdi/salvd.cxx b/vcl/os2/source/gdi/salvd.cxx
index 4e53782be8ea..cb2d4db9666a 100644
--- a/vcl/os2/source/gdi/salvd.cxx
+++ b/vcl/os2/source/gdi/salvd.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
@@ -59,9 +59,9 @@ HBITMAP ImplCreateVirDevBitmap( HDC hDC, HPS hPS, long nDX, long nDY,
     HBITMAP hBitmap;
     BITMAPINFOHEADER2 aBitmapInfo;
     memset( &aBitmapInfo, 0, sizeof( BITMAPINFOHEADER2 ) );
-    aBitmapInfo.cbFix     = sizeof( BITMAPINFOHEADER2 );
-    aBitmapInfo.cx        = nDX;
-    aBitmapInfo.cy        = nDY;
+    aBitmapInfo.cbFix	  = sizeof( BITMAPINFOHEADER2 );
+    aBitmapInfo.cx		  = nDX;
+    aBitmapInfo.cy		  = nDY;
     aBitmapInfo.cPlanes   = nPlanes;
     aBitmapInfo.cBitCount = (nBitCount < 4) ? 4 : nBitCount;
     hBitmap  = GpiCreateBitmap( hPS, &aBitmapInfo, 0, NULL, NULL );
@@ -76,8 +76,8 @@ SalVirtualDevice* Os2SalInstance::CreateVirtualDevice( SalGraphics* pSGraphics,
                                                        const SystemGraphicsData* pData )
 {
     Os2SalGraphics* pGraphics = static_cast<Os2SalGraphics*>(pSGraphics);
-    HAB     hAB = GetSalData()->mhAB;
-    SIZEL   size;
+    HAB 	hAB = GetSalData()->mhAB;
+    SIZEL	size;
 
     // create device context (at this time allways display compatible)
     DEVOPENSTRUC aDevOpenStruc = { NULL, "DISPLAY", NULL, NULL, NULL, NULL, NULL, NULL, NULL };
@@ -105,26 +105,26 @@ SalVirtualDevice* Os2SalInstance::CreateVirtualDevice( SalGraphics* pSGraphics,
     }
 
     // init data
-    Os2SalVirtualDevice*    pVDev               = new Os2SalVirtualDevice;
-    Os2SalGraphics*     pVirGraphics        = new Os2SalGraphics;
-
-    pVirGraphics->mhDC      = hDC;
-    pVirGraphics->mhPS      = hPS;
-    pVirGraphics->mhWnd     = 0;
-    pVirGraphics->mnHeight  = nDY;
-    pVirGraphics->mbPrinter = FALSE;
-    pVirGraphics->mbVirDev  = TRUE;
-    pVirGraphics->mbWindow  = FALSE;
-    pVirGraphics->mbScreen  = pGraphics->mbScreen;
+    Os2SalVirtualDevice*	pVDev				= new Os2SalVirtualDevice;
+    Os2SalGraphics*		pVirGraphics		= new Os2SalGraphics;
+
+    pVirGraphics->mhDC		= hDC;
+    pVirGraphics->mhPS		= hPS;
+    pVirGraphics->mhWnd		= 0;
+    pVirGraphics->mnHeight	= nDY;
+    pVirGraphics->mbPrinter	= FALSE;
+    pVirGraphics->mbVirDev	= TRUE;
+    pVirGraphics->mbWindow	= FALSE;
+    pVirGraphics->mbScreen	= pGraphics->mbScreen;
     ImplSalInitGraphics( pVirGraphics );
 
-    pVDev->mhDC             = hDC;
-    pVDev->mhPS             = hPS;
-    pVDev->mhBmp            = hBmp;
-    pVDev->mhDefBmp         = Ft2SetBitmap( hPS, hBmp );
-    pVDev->mpGraphics       = pVirGraphics;
-    pVDev->mnBitCount       = nBitCount;
-    pVDev->mbGraphics       = FALSE;
+    pVDev->mhDC				= hDC;
+    pVDev->mhPS				= hPS;
+    pVDev->mhBmp			= hBmp;
+    pVDev->mhDefBmp			= Ft2SetBitmap( hPS, hBmp );
+    pVDev->mpGraphics		= pVirGraphics;
+    pVDev->mnBitCount		= nBitCount;
+    pVDev->mbGraphics		= FALSE;
     return pVDev;
 }
 
diff --git a/vcl/os2/source/window/salframe.cxx b/vcl/os2/source/window/salframe.cxx
index f3314c725255..621704330557 100644
--- a/vcl/os2/source/window/salframe.cxx
+++ b/vcl/os2/source/window/salframe.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
@@ -90,10 +90,10 @@ ULONG Os2SalFrame::mnInputLang = 0;
 // =======================================================================
 
 // define a new flag
-#define SWP_CENTER          (SWP_NOAUTOCLOSE<<4)
-#define SWP_SHOWMAXIMIZED   (SWP_ACTIVATE | SWP_SHOW | SWP_MAXIMIZE)
-#define SWP_SHOWMINIMIZED   (SWP_ACTIVATE | SWP_SHOW | SWP_MINIMIZE)
-#define SWP_SHOWNORMAL      (SWP_ACTIVATE | SWP_SHOW | SWP_RESTORE)
+#define SWP_CENTER			(SWP_NOAUTOCLOSE<<4)
+#define SWP_SHOWMAXIMIZED	(SWP_ACTIVATE | SWP_SHOW | SWP_MAXIMIZE)
+#define SWP_SHOWMINIMIZED	(SWP_ACTIVATE | SWP_SHOW | SWP_MINIMIZE)
+#define SWP_SHOWNORMAL		(SWP_ACTIVATE | SWP_SHOW | SWP_RESTORE)
 
 static LONG nScreenHeight  = WinQuerySysValue( HWND_DESKTOP, SV_CYSCREEN);
 static LONG nScreenWidth   = WinQuerySysValue( HWND_DESKTOP, SV_CXSCREEN );
@@ -120,7 +120,7 @@ BOOL APIENTRY _WinQueryWindowPos( Os2SalFrame* pFrame, PSWP pswp)
     BOOL rc = WinQueryWindowPos( pFrame->mhWndFrame, pswp);
 
 #if OSL_DEBUG_LEVEL>1
-    debug_printf( "> WinQueryWindowPos hwnd %x at %d,%d (%dx%d)\n",
+    debug_printf( "> WinQueryWindowPos hwnd %x at %d,%d (%dx%d)\n", 
                     pFrame->mhWndFrame, pswp->x, pswp->y, pswp->cx, pswp->cy);
 #endif
 
@@ -130,11 +130,11 @@ BOOL APIENTRY _WinQueryWindowPos( Os2SalFrame* pFrame, PSWP pswp)
     if ( pParentFrame )
     {
         POINTL ptlOwner = {0};
-
-        // coords are relative to screen, map to parent frame client area
+        
+        // coords are relative to screen, map to parent frame client area 
         ptlOwner.x = pswp->x;
         ptlOwner.y = pswp->y;
-        WinMapWindowPoints( HWND_DESKTOP, pParentFrame->mhWndClient, &ptlOwner, 1);
+        WinMapWindowPoints( HWND_DESKTOP, pParentFrame->mhWndClient, &ptlOwner, 1);			
         pswp->x = ptlOwner.x;
         pswp->y = ptlOwner.y;
         // get parent client area size
@@ -150,7 +150,7 @@ BOOL APIENTRY _WinQueryWindowPos( Os2SalFrame* pFrame, PSWP pswp)
     pswp->y = swpOwner.cy - (pswp->y + pswp->cy);
 
 #if OSL_DEBUG_LEVEL>1
-    debug_printf( "< WinQueryWindowPos hwnd %x at %d,%d (%dx%d)\n",
+    debug_printf( "< WinQueryWindowPos hwnd %x at %d,%d (%dx%d)\n", 
                     pFrame->mhWndFrame, pswp->x, pswp->y, pswp->cx, pswp->cy);
 #endif
     return rc;
@@ -159,32 +159,32 @@ BOOL APIENTRY _WinQueryWindowPos( Os2SalFrame* pFrame, PSWP pswp)
 BOOL APIENTRY _WinSetWindowPos( Os2SalFrame* pFrame, HWND hwndInsertBehind, LONG x, LONG y,
     LONG cx, LONG cy, ULONG fl)
 {
-    SWP     swpOwner = {0};
-    POINTL  ptlOwner = {0};
-    HWND    hParent = NULL;
+    SWP 	swpOwner = {0};
+    POINTL 	ptlOwner = {0};
+    HWND	hParent = NULL;
 
 #if OSL_DEBUG_LEVEL>1
-    debug_printf( ">WinSetWindowPos hwnd %x at %d,%d (%dx%d) fl 0x%08x\n",
+    debug_printf( ">WinSetWindowPos hwnd %x at %d,%d (%dx%d) fl 0x%08x\n", 
                     pFrame->mhWndFrame, x, y, cx, cy, fl);
 #endif
 
     // first resize window if requested
-    if ( (fl & SWP_SIZE) ) {
-        ULONG   flag = SWP_SIZE;
-        LONG    nX = 0, nY = 0;
-        LONG    frameFrameX, frameFrameY, frameCaptionY;
+    if ( (fl & SWP_SIZE) ) { 
+        ULONG	flag = SWP_SIZE;
+        LONG	nX = 0, nY = 0;
+        LONG	frameFrameX, frameFrameY, frameCaptionY;
 
         ImplSalCalcFrameSize( pFrame, frameFrameX, frameFrameY, frameCaptionY );
         // if we change y size, we need to move the window down
         // because os2 window origin is lower left corner
         if (pFrame->maGeometry.nHeight != cy) {
-            SWP     aSWP;
+            SWP		aSWP;
             WinQueryWindowPos( pFrame->mhWndFrame, &aSWP);
             nX = aSWP.x;
             nY = aSWP.y - (cy + 2*frameFrameY + frameCaptionY - aSWP.cy);
             flag |= SWP_MOVE;
         }
-        WinSetWindowPos( pFrame->mhWndFrame, NULL, nX, nY,
+        WinSetWindowPos( pFrame->mhWndFrame, NULL, nX, nY, 
             cx+2*frameFrameX, cy+2*frameFrameY+frameCaptionY, flag);
         fl = fl & ~SWP_SIZE;
     }
@@ -207,8 +207,8 @@ BOOL APIENTRY _WinSetWindowPos( Os2SalFrame* pFrame, HWND hwndInsertBehind, LONG
     WinQueryWindowPos( hParent, &swpOwner);
 
     //YD adjust to owner coordinates only when moving and not centering
-    //if (!(fl & SWP_CENTER) && (fl & SWP_MOVE))
-    if ((fl & SWP_MOVE))
+    //if (!(fl & SWP_CENTER) && (fl & SWP_MOVE)) 
+    if ((fl & SWP_MOVE)) 
     {
 
         // if SWP_CENTER is specified, change position to parent center
@@ -219,30 +219,30 @@ BOOL APIENTRY _WinSetWindowPos( Os2SalFrame* pFrame, HWND hwndInsertBehind, LONG
             debug_printf( "_WinSetWindowPos SWP_CENTER\n");
 #endif
             fl = fl & ~SWP_CENTER;
-        } else {
-            // coords are relative to parent frame client area, map to screen
+        } else {  
+            // coords are relative to parent frame client area, map to screen 
             // map Y to OS/2 system coordinates
             ptlOwner.x = x;
             ptlOwner.y = swpOwner.cy - (y + cy);
 
 #if OSL_DEBUG_LEVEL>0
-            debug_printf( "_WinSetWindowPos owner 0x%x at %d,%d (%dx%d) OS2\n",
+            debug_printf( "_WinSetWindowPos owner 0x%x at %d,%d (%dx%d) OS2\n", 
                 hParent, ptlOwner.x, ptlOwner.y, swpOwner.cx, swpOwner.cy);
 #endif
         }
         // map from client area to screen
-        WinMapWindowPoints( hParent, HWND_DESKTOP, &ptlOwner, 1);
+        WinMapWindowPoints( hParent, HWND_DESKTOP, &ptlOwner, 1);			
         x = ptlOwner.x;
         y = ptlOwner.y;
 
 #if OSL_DEBUG_LEVEL>0
-        debug_printf( "_WinSetWindowPos owner 0x%x at %d,%d (%dx%d) MAPPED OS2\n",
+        debug_printf( "_WinSetWindowPos owner 0x%x at %d,%d (%dx%d) MAPPED OS2\n", 
             hParent, ptlOwner.x, ptlOwner.y, swpOwner.cx, swpOwner.cy);
 #endif
     }
 
 #if OSL_DEBUG_LEVEL>0
-    debug_printf( "<WinSetWindowPos hwnd %x at %d,%d (%dx%d) fl=%x\n",
+    debug_printf( "<WinSetWindowPos hwnd %x at %d,%d (%dx%d) fl=%x\n", 
                     pFrame->mhWndFrame, x, y, cx, cy, fl);
 #endif
     return WinSetWindowPos( pFrame->mhWndFrame, hwndInsertBehind, x, y, 0, 0, fl);
@@ -254,25 +254,25 @@ BOOL APIENTRY _WinSetWindowPos( Os2SalFrame* pFrame, HWND hwndInsertBehind, LONG
 static void dumpWindowInfo( char* fnc, HWND hwnd)
 {
     SWP aSWP;
-    HWND    hwnd2;
-    char    szTitle[256];
-
+    HWND	hwnd2;
+    char	szTitle[256];
+    
 #if 0
     _WinQueryWindowPos( hwnd, &aSWP );
     strcpy(szTitle,"");
-    WinQueryWindowText(hwnd, sizeof(szTitle), szTitle);
+    WinQueryWindowText(hwnd, sizeof(szTitle), szTitle);	
     debug_printf( "%s: window %08x at %d,%d (size %dx%d) '%s'\n", fnc, hwnd,
                 aSWP.x, aSWP.y, aSWP.cx, aSWP.cy, szTitle);
     hwnd2 = WinQueryWindow(hwnd, QW_PARENT);
     _WinQueryWindowPos( hwnd2, &aSWP );
     strcpy(szTitle,"");
-    WinQueryWindowText(hwnd2, sizeof(szTitle), szTitle);
+    WinQueryWindowText(hwnd2, sizeof(szTitle), szTitle);	
     debug_printf( "%s: parent %08x at %d,%d (size %dx%d) '%s'\n", fnc, hwnd2,
                 aSWP.x, aSWP.y, aSWP.cx, aSWP.cy, szTitle);
     hwnd2 = WinQueryWindow(hwnd, QW_OWNER);
     _WinQueryWindowPos( hwnd2, &aSWP );
     strcpy(szTitle,"");
-    WinQueryWindowText(hwnd2, sizeof(szTitle), szTitle);
+    WinQueryWindowText(hwnd2, sizeof(szTitle), szTitle);	
     debug_printf( "%s: owner %08x at %d,%d (size %dx%d) '%s'\n", fnc, hwnd2,
                 aSWP.x, aSWP.y, aSWP.cx, aSWP.cy, szTitle);
 #endif
@@ -419,9 +419,9 @@ static void ImplSaveFrameState( Os2SalFrame* pFrame )
             if ( bVisible )
                 pFrame->mnShowState = SWP_SHOWNORMAL;
             pFrame->mbRestoreMaximize = FALSE;
-            //debug_printf( "ImplSaveFrameState: window %08x at %d,%d (size %dx%d)\n",
-            //  pFrame->mhWndFrame,
-            //  pFrame->maState.mnX, pFrame->maState.mnY, pFrame->maState.mnWidth, pFrame->maState.mnHeight);
+            //debug_printf( "ImplSaveFrameState: window %08x at %d,%d (size %dx%d)\n", 
+            //	pFrame->mhWndFrame,
+            //	pFrame->maState.mnX, pFrame->maState.mnY, pFrame->maState.mnWidth, pFrame->maState.mnHeight);
         }
     }
 }
@@ -471,7 +471,7 @@ static void ImplSalCalcFrameSize( const Os2SalFrame* pFrame,
         nCaptionY = WinQuerySysValue( HWND_DESKTOP, SV_CYTITLEBAR );
     else
         nCaptionY = 0;
-
+    
 #if OSL_DEBUG_LEVEL>0
     //if (_bCapture)
         debug_printf("ImplSalCalcFrameSize 0x%08x x=%d y=%d t=%d\n", pFrame->mhWndFrame, nFrameX, nFrameY, nCaptionY);
@@ -588,14 +588,14 @@ static USHORT aImplTranslateKeyTab[KEY_TAB_SIZE] =
 
 SalFrame* ImplSalCreateFrame( Os2SalInstance* pInst, HWND hWndParent, ULONG nSalFrameStyle )
 {
-    SalData*        pSalData = GetSalData();
-    Os2SalFrame*    pFrame = new Os2SalFrame;
-    HWND            hWndFrame;
-    HWND            hWndClient;
-    ULONG           nFrameFlags = FCF_NOBYTEALIGN | FCF_SCREENALIGN;
-    ULONG           nFrameStyle = 0;
-    ULONG           nClientStyle = WS_CLIPSIBLINGS;
-    BOOL            bSubFrame = FALSE;
+    SalData*    	pSalData = GetSalData();
+    Os2SalFrame*   	pFrame = new Os2SalFrame;
+    HWND        	hWndFrame;
+    HWND        	hWndClient;
+    ULONG    		nFrameFlags = FCF_NOBYTEALIGN | FCF_SCREENALIGN;
+    ULONG    		nFrameStyle = 0;
+    ULONG    		nClientStyle = WS_CLIPSIBLINGS;
+    BOOL        	bSubFrame = FALSE;
 
 #if OSL_DEBUG_LEVEL>0
     debug_printf(">ImplSalCreateFrame hWndParent 0x%x, nSalFrameStyle 0x%x\n", hWndParent, nSalFrameStyle);
@@ -634,7 +634,7 @@ SalFrame* ImplSalCreateFrame( Os2SalInstance* pInst, HWND hWndParent, ULONG nSal
             nFrameFlags |= FCF_TASKLIST;
         }
     }
-
+    
     if( nSalFrameStyle & SAL_FRAME_STYLE_TOOLWINDOW )
     {
         pFrame->mbNoIcon = TRUE;
@@ -658,12 +658,12 @@ SalFrame* ImplSalCreateFrame( Os2SalInstance* pInst, HWND hWndParent, ULONG nSal
     // create frame
     //YD FIXME this is a potential bug with multiple threads and cuncurrent
     //window creation, because this field is accessed in
-    //WM_CREATE to get window data,
+    //WM_CREATE to get window data, 
     pSalData->mpCreateFrame = pFrame;
 
     //YD FIXME if SAL_FRAME_CHILD is specified, use hWndParent as parent handle...
     hWndFrame = WinCreateStdWindow( HWND_DESKTOP, nFrameStyle, &nFrameFlags,
-                    (PSZ)(bSubFrame ? SAL_SUBFRAME_CLASSNAME : SAL_FRAME_CLASSNAME),
+                    (PSZ)(bSubFrame ? SAL_SUBFRAME_CLASSNAME : SAL_FRAME_CLASSNAME), 
                     NULL,
                     nClientStyle, 0, 0, &hWndClient );
     debug_printf("ImplSalCreateFrame hWndParent 0x%x, hWndFrame 0x%x, hWndClient 0x%x\n", hWndParent, hWndFrame, hWndClient);
@@ -674,7 +674,7 @@ SalFrame* ImplSalCreateFrame( Os2SalInstance* pInst, HWND hWndParent, ULONG nSal
     }
 
     // Parent setzen (Owner)
-    if ( hWndParent != 0 && hWndParent != HWND_DESKTOP )
+    if ( hWndParent != 0 && hWndParent != HWND_DESKTOP ) 
         WinSetOwner( hWndFrame, hWndParent );
 
     Os2SalFrame* pParentFrame = GetWindowPtr( hWndParent );
@@ -717,7 +717,7 @@ SalFrame* ImplSalCreateFrame( Os2SalInstance* pInst, HWND hWndParent, ULONG nSal
     // init OS/2 frame data
     pFrame->mhAB            = pInst->mhAB;
 
-    // YD 18/08 under OS/2, invisible frames have size 0,0 at 0,0, so
+    // YD 18/08 under OS/2, invisible frames have size 0,0 at 0,0, so 
     // we need to set an initial size/position manually
     SWP aSWP;
     memset( &aSWP, 0, sizeof( aSWP ) );
@@ -823,7 +823,7 @@ Os2SalFrame::Os2SalFrame()
     mbNoIcon            = FALSE;
     //mSelectedhMenu      = 0;
     //mLastActivatedhMenu = 0;
-    mpParentFrame       = NULL;
+    mpParentFrame		= NULL;
 
     memset( &maState, 0, sizeof( SalFrameState ) );
     maSysData.nSize     = sizeof( SystemEnvData );
@@ -1048,8 +1048,8 @@ void Os2SalFrame::SetPosSize( long nX, long nY, long nWidth, long nHeight,
                                                    USHORT nFlags )
 {
     // calculation frame size
-    USHORT  nEvent = 0;
-    ULONG   nPosFlags = 0;
+    USHORT 	nEvent = 0;
+    ULONG	nPosFlags = 0;
 
 #if OSL_DEBUG_LEVEL > 0
     //dumpWindowInfo( "-Os2SalFrame::SetPosSize", mhWndFrame);
@@ -1088,7 +1088,7 @@ void Os2SalFrame::SetPosSize( long nX, long nY, long nWidth, long nHeight,
 #endif
         nEvent = (nEvent == SALEVENT_MOVE) ? SALEVENT_MOVERESIZE : SALEVENT_RESIZE;
     }
-
+    
     // Default-Position, dann zentrieren, ansonsten Position beibehalten
     if ( mbDefPos  && !(nPosFlags & SWP_MOVE))
     {
@@ -1156,14 +1156,14 @@ void Os2SalFrame::SetParent( SalFrame* pNewParent )
 {
     APIRET rc;
 #if OSL_DEBUG_LEVEL>0
-    debug_printf("Os2SalFrame::SetParent mhWndFrame 0x%08x to 0x%08x\n",
+    debug_printf("Os2SalFrame::SetParent mhWndFrame 0x%08x to 0x%08x\n", 
             static_cast<Os2SalFrame*>(this)->mhWndFrame,
             static_cast<Os2SalFrame*>(pNewParent)->mhWndClient);
 #endif
     Os2SalFrame::mbInReparent = TRUE;
-    //rc = WinSetParent(static_cast<Os2SalFrame*>(this)->mhWndFrame,
+    //rc = WinSetParent(static_cast<Os2SalFrame*>(this)->mhWndFrame, 
     //                  static_cast<Os2SalFrame*>(pNewParent)->mhWndClient, TRUE);
-    rc = WinSetOwner(static_cast<Os2SalFrame*>(this)->mhWndFrame,
+    rc = WinSetOwner(static_cast<Os2SalFrame*>(this)->mhWndFrame, 
                       static_cast<Os2SalFrame*>(pNewParent)->mhWndClient);
     mpParentFrame = static_cast<Os2SalFrame*>(pNewParent);
     Os2SalFrame::mbInReparent = FALSE;
@@ -1178,7 +1178,7 @@ bool Os2SalFrame::SetPluginParent( SystemParentData* pNewParent )
     }
 
     Os2SalFrame::mbInReparent = TRUE;
-    rc = WinSetOwner(static_cast<Os2SalFrame*>(this)->mhWndFrame,
+    rc = WinSetOwner(static_cast<Os2SalFrame*>(this)->mhWndFrame, 
                       pNewParent->hWnd);
     Os2SalFrame::mbInReparent = FALSE;
     return true;
@@ -1218,11 +1218,11 @@ void Os2SalFrame::GetClientSize( long& rWidth, long& rHeight )
 
 void Os2SalFrame::SetWindowState( const SalFrameState* pState )
 {
-    LONG    nX;
-    LONG    nY;
-    LONG    nWidth;
-    LONG    nHeight;
-    ULONG   nPosSize = 0;
+    LONG	nX;
+    LONG 	nY;
+    LONG 	nWidth;
+    LONG 	nHeight;
+    ULONG	nPosSize = 0;
 
 #if OSL_DEBUG_LEVEL>0
     debug_printf("Os2SalFrame::SetWindowState\n");
@@ -1234,7 +1234,7 @@ void Os2SalFrame::SetWindowState( const SalFrameState* pState )
     BOOL bVisible = WinIsWindowVisible( mhWndFrame );
 
     // get screen coordinates
-    SWP aSWP;
+    SWP	aSWP;
     WinQueryWindowPos( mhWndFrame, &aSWP );
     LONG nFrameX, nFrameY, nCaptionY;
     ImplSalCalcFrameSize( this, nFrameX, nFrameY, nCaptionY );
@@ -1269,7 +1269,7 @@ void Os2SalFrame::SetWindowState( const SalFrameState* pState )
         nHeight = (int)pState->mnHeight + nTopDeco + nBottomDeco;
     else
         nHeight = aSWP.cy;
-
+    
 #if OSL_DEBUG_LEVEL>0
     debug_printf("Os2SalFrame::SetWindowState (%dx%d) at %d,%d\n", nWidth,nHeight,nX,nY);
 #endif
@@ -1337,8 +1337,8 @@ void Os2SalFrame::SetWindowState( const SalFrameState* pState )
     // Wenn Fenster nicht minimiert/maximiert ist oder nicht optisch
     // umgesetzt werden muss, dann SetWindowPos() benutzen, da
     // SetWindowPlacement() die TaskBar mit einrechnet
-    if ( !(aPlacement.fl & SWP_MINIMIZE)
-         && !( aPlacement.fl & SWP_MAXIMIZE )
+    if ( !(aPlacement.fl & SWP_MINIMIZE) 
+         && !( aPlacement.fl & SWP_MAXIMIZE ) 
           && (!bVisible || (aPlacement.fl == SWP_RESTORE)) )
     {
         if( bUpdateHiddenFramePos )
@@ -1348,7 +1348,7 @@ void Os2SalFrame::SetWindowState( const SalFrameState* pState )
             SetMaximizedFrameGeometry( mhWndFrame, this );
         }
         else
-            WinSetWindowPos( mhWndFrame, 0, nX,
+            WinSetWindowPos( mhWndFrame, 0, nX, 
                 nScreenHeight - (nY+nHeight), nWidth, nHeight, nPosSize);
     }
     else
@@ -1360,7 +1360,7 @@ void Os2SalFrame::SetWindowState( const SalFrameState* pState )
             aPlacement.cx = nWidth;
             aPlacement.cy = nHeight;
         }
-        WinSetWindowPos( mhWndFrame, 0, aPlacement.x, aPlacement.y,
+        WinSetWindowPos( mhWndFrame, 0, aPlacement.x, aPlacement.y, 
                          aPlacement.cx, aPlacement.cy, aPlacement.fl );
     }
 
@@ -1502,7 +1502,7 @@ static void ImplSalToTop( HWND hWnd, ULONG nFlags )
 
     if ( nFlags & SAL_FRAME_TOTOP_RESTOREWHENMIN )
     {
-        ULONG   nStyle;
+        ULONG	nStyle;
         if ( pFrame->mbRestoreMaximize )
             nStyle = SWP_MAXIMIZE;
         else
@@ -1517,7 +1517,7 @@ static void ImplSalToTop( HWND hWnd, ULONG nFlags )
 
 void Os2SalFrame::ToTop( USHORT nFlags )
 {
-    nFlags &= ~SAL_FRAME_TOTOP_GRABFOCUS;   // this flag is not needed on win32
+    nFlags &= ~SAL_FRAME_TOTOP_GRABFOCUS;	// this flag is not needed on win32
     // Post this Message to the window, because this only works
     // in the thread of the window, which has create this window.
     // We post this message to avoid deadlocks
@@ -1533,7 +1533,7 @@ void Os2SalFrame::SetPointer( PointerStyle ePointerStyle )
 {
     struct ImplPtrData
     {
-        HPOINTER    mhPointer;
+        HPOINTER	mhPointer;
         ULONG       mnSysId;
         ULONG       mnOwnId;
     };
@@ -1647,7 +1647,7 @@ void Os2SalFrame::SetPointer( PointerStyle ePointerStyle )
 #endif
 
     //debug_printf("Os2SalFrame::SetPointer\n");
-
+    
     // Mousepointer loaded ?
     if ( !aImplPtrTab[ePointerStyle].mhPointer )
     {
@@ -1886,7 +1886,7 @@ XubString Os2SalFrame::GetKeyName( USHORT nCode )
             case KEY_DELETE:
                 aCode = pLangTab[LSTR_KEY_DELETE];
                 break;
-
+    
             case KEY_ADD:
                 aCode += '+';
                 break;
@@ -2057,7 +2057,7 @@ static BOOL ImplOS2NameFontToVCLFont( const char* pFontName, Font& rFont )
         rFont.SetItalic( ITALIC_NONE );
         // search for a style embedded in the name, e.g. 'WarpSans Bold'
         // because we need to split the style from the family name
-        if (strstr( pFontName, " Bold")
+        if (strstr( pFontName, " Bold") 
             || strstr( pFontName, " Italic")
             || strstr( pFontName, "-Normal"))
         {
@@ -2080,13 +2080,13 @@ static BOOL ImplOS2NameFontToVCLFont( const char* pFontName, Font& rFont )
             // store family name
             rFont.SetName( ::rtl::OStringToOUString ( fontName, gsl_getSystemTextEncoding()) );
             free( fontName);
-        }
+        } 
         else
         {
             rFont.SetName( ::rtl::OStringToOUString (pFontName, gsl_getSystemTextEncoding()) );
             rFont.SetStyleName( ::rtl::OStringToOUString ("", gsl_getSystemTextEncoding()) );
         }
-
+            
         rFont.SetSize( Size( 0, nFontHeight ) );
         return TRUE;
     }
@@ -2520,7 +2520,7 @@ static long ImplHandleMouseMsg( HWND hWnd,
     // and sent a mouse leave message to the application which killed the help window, ie ourself
     if( !WinIsWindow( pFrame->mhAB, hWnd ) )
         return 0;
-
+    
 #if OSL_DEBUG_LEVEL>10
     //if (_bCapture)
         debug_printf("ImplHandleMouseMsg mouse %d,%d\n",aMouseEvt.mnX,aMouseEvt.mnY);
@@ -2534,7 +2534,7 @@ static long ImplHandleMouseMsg( HWND hWnd,
         // --- RTL --- (mirror mouse pos)
         //if( Application::GetSettings().GetLayoutRTL() )
         //    aMouseEvt.mnX = pFrame->maGeometry.nWidth-1-aMouseEvt.mnX;
-
+        
         nRet = pFrame->CallCallback( nEvent, &aMouseEvt );
         if ( nMsg == WM_MOUSEMOVE )
         {
@@ -2567,13 +2567,13 @@ static long ImplHandleWheelMsg( HWND hWnd, UINT nMsg, MPARAM nMP1, MPARAM nMP2 )
         aPt.y = pFrame->mnHeight - aPt.y - 1;
 
         SalWheelMouseEvent aWheelEvt;
-        aWheelEvt.mnTime            = WinQueryMsgTime( pFrame->mhAB );
-        aWheelEvt.mnX               = aPt.x;
-        aWheelEvt.mnY               = aPt.y;
-        aWheelEvt.mnCode            = 0;
+        aWheelEvt.mnTime    		= WinQueryMsgTime( pFrame->mhAB );
+        aWheelEvt.mnX           	= aPt.x;
+        aWheelEvt.mnY           	= aPt.y;
+        aWheelEvt.mnCode       	 	= 0;
         bool bNeg = (SHORT2FROMMP(nMP2) == SB_LINEDOWN || SHORT2FROMMP(nMP2) == SB_PAGEDOWN );
-        aWheelEvt.mnDelta           = bNeg ? -120 : 120;
-        aWheelEvt.mnNotchDelta      = bNeg ? -1 : 1;
+        aWheelEvt.mnDelta			= bNeg ? -120 : 120;
+        aWheelEvt.mnNotchDelta		= bNeg ? -1 : 1;
         if (SHORT2FROMMP(nMP2) == SB_PAGEUP || SHORT2FROMMP(nMP2) == SB_PAGEDOWN)
             aWheelEvt.mnScrollLines = SAL_WHEELMOUSE_EVENT_PAGESCROLL;
         else
@@ -2607,7 +2607,7 @@ static USHORT ImplSalGetKeyCode( Os2SalFrame* pFrame, MPARAM aMP1, MPARAM aMP2 )
     UCHAR   nCharCode   = (UCHAR)SHORT1FROMMP( aMP2 );
     USHORT  nKeyCode    = (UCHAR)SHORT2FROMMP( aMP2 );
     UCHAR   nScanCode   = (UCHAR)CHAR4FROMMP( aMP1 );
-    USHORT  rSVCode = 0;
+    USHORT	rSVCode = 0;
 
     // Ist virtueller KeyCode gesetzt und befindet sich der KeyCode in der
     // Tabelle, dann mappen
@@ -2667,7 +2667,7 @@ static USHORT ImplSalGetKeyCode( Os2SalFrame* pFrame, MPARAM aMP1, MPARAM aMP2 )
         rSVCode = KEY_COMMA;
     if ( nCharCode == '.' )
         rSVCode = KEY_POINT;
-
+    
     return rSVCode;
 }
 
@@ -2675,15 +2675,15 @@ static USHORT ImplSalGetKeyCode( Os2SalFrame* pFrame, MPARAM aMP1, MPARAM aMP2 )
 
 static void ImplUpdateInputLang( Os2SalFrame* pFrame )
 {
-    BOOL    bLanguageChange = FALSE;
-    ULONG   nLang = 0;
-    APIRET  rc;
+    BOOL 	bLanguageChange = FALSE;
+    ULONG 	nLang = 0;
+    APIRET	rc;
     UconvObject  uconv_object = NULL;
     LocaleObject locale_object = NULL;
-    UniChar     *pinfo_item;
+    UniChar		*pinfo_item;
 
-    // we do not support change of input language while working,
-    // so exit if already defined (mnInputLang is a static class field)
+    // we do not support change of input language while working, 
+    // so exit if already defined (mnInputLang is a static class field) 
     if (pFrame->mnInputLang)
         return;
 
@@ -2707,14 +2707,14 @@ static void ImplUpdateInputLang( Os2SalFrame* pFrame )
 
     // keep input lang up-to-date
 #if OSL_DEBUG_LEVEL>10
-    debug_printf("ImplUpdateInputLang pFrame %08x lang changed from %d to %d\n",
+    debug_printf("ImplUpdateInputLang pFrame %08x lang changed from %d to %d\n", 
         pFrame, pFrame->mnInputLang, nLang);
 #endif
     pFrame->mnInputLang = nLang;
 }
 
 
-static sal_Unicode ImplGetCharCode( Os2SalFrame* pFrame, USHORT nKeyFlags,
+static sal_Unicode ImplGetCharCode( Os2SalFrame* pFrame, USHORT nKeyFlags, 
                                     sal_Char nCharCode, UCHAR nScanCode )
 {
     ImplUpdateInputLang( pFrame );
@@ -2753,7 +2753,7 @@ static sal_Unicode ImplConvertKey( Os2SalFrame* pFrame, MPARAM aMP1, MPARAM aMP2
     UCHAR   nCharCode   = (UCHAR)SHORT1FROMMP( aMP2 );
     USHORT  nKeyCode    = (UCHAR)SHORT2FROMMP( aMP2 );
     UCHAR   nScanCode   = (UCHAR)CHAR4FROMMP( aMP1 );
-    sal_Unicode rSVCharCode = 0;
+    sal_Unicode	rSVCharCode = 0;
 
     // Ist Character-Code gesetzt
     // !!! Bei CTRL/ALT ist KC_CHAR nicht gesetzt, jedoch moechten wir
@@ -2778,7 +2778,7 @@ static long ImplHandleKeyMsg( HWND hWnd,
     USHORT          nModCode        = 0;
     USHORT          nSVCode         = 0;
     USHORT          nOS2KeyCode     = (UCHAR)SHORT2FROMMP( nMP2 );
-    sal_Unicode     nSVCharCode     = 0;
+    sal_Unicode		nSVCharCode     = 0;
     long            nRet            = 0;
 
     Os2SalFrame* pFrame = GetWindowPtr( hWnd );
@@ -2951,17 +2951,17 @@ static void UpdateFrameGeometry( HWND hWnd, Os2SalFrame* pFrame )
     if( !pFrame )
         return;
 
-    //SalFrame has a
-    //maGeometry member that holds absolute screen positions (and needs to be
+    //SalFrame has a 
+    //maGeometry member that holds absolute screen positions (and needs to be 
     //updated if the window is moved by the way).
-
+    
     // reset data
     memset(&pFrame->maGeometry, 0, sizeof(SalFrameGeometry) );
 
-    SWP swp;
+    SWP	swp;
     LONG nFrameX, nFrameY, nCaptionY;
-
-    // get frame size
+    
+    // get frame size 
     WinQueryWindowPos(pFrame->mhWndFrame, &swp);
     if (swp.fl & SWP_MINIMIZE)
       return;
@@ -3014,16 +3014,16 @@ static void ImplHandleMoveMsg( HWND hWnd)
                     ImplSalFrameFullScreenPos( pFrame );
                 pFrame->mbInMoveMsg = FALSE;
             }
-
+        
             // Status merken
             ImplSaveFrameState( pFrame );
-
+            
             // Call Hdl
             //#93851 if we call this handler, VCL floating windows are not updated correctly
             //ImplCallMoveHdl( hWnd );
 
         }
-
+            
         ImplSalYieldMutexRelease();
     }
     else
@@ -3465,10 +3465,10 @@ inline void ImplHandleIMECloseCandidate( Os2SalFrame* pFrame )
 MRESULT EXPENTRY SalFrameWndProc( HWND hWnd, ULONG nMsg,
                                   MPARAM nMP1, MPARAM nMP2 )
 {
-    Os2SalFrame*    pFrame      = (Os2SalFrame*)GetWindowPtr( hWnd );
-    MRESULT         nRet        = (MRESULT)0;
-    BOOL            bDef        = TRUE;
-    bool            bCheckTimers= false;
+    Os2SalFrame*   	pFrame      = (Os2SalFrame*)GetWindowPtr( hWnd );
+    MRESULT     	nRet        = (MRESULT)0;
+    BOOL        	bDef     	= TRUE;
+    bool 			bCheckTimers= false;
 
 #if OSL_DEBUG_LEVEL>10
     if (nMsg!=WM_TIMER && nMsg!=WM_MOUSEMOVE)
diff --git a/vcl/os2/source/window/salmenu.cxx b/vcl/os2/source/window/salmenu.cxx
index 339ab5dbfadb..21281cd9284e 100644
--- a/vcl/os2/source/window/salmenu.cxx
+++ b/vcl/os2/source/window/salmenu.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
@@ -74,7 +74,7 @@ Os2SalMenu::~Os2SalMenu()
 
 BOOL Os2SalMenu::VisibleMenuBar()
 {
-    return FALSE;
+    return FALSE; 
 }
 
 void Os2SalMenu::SetFrame( const SalFrame *pFrame )
diff --git a/vcl/os2/source/window/salobj.cxx b/vcl/os2/source/window/salobj.cxx
index 85ed1a606d08..ce86f0ed9747 100644
--- a/vcl/os2/source/window/salobj.cxx
+++ b/vcl/os2/source/window/salobj.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
@@ -55,8 +55,8 @@ static BOOL ImplIsSysWindowOrChild( HWND hWndParent, HWND hWndChild )
 
 static Os2SalObject* ImplFindOs2SalObject( HWND hWndChild )
 {
-    SalData*    pSalData = GetSalData();
-    Os2SalObject*   pObject = pSalData->mpFirstObject;
+    SalData*	pSalData = GetSalData();
+    Os2SalObject*	pObject = pSalData->mpFirstObject;
     while ( pObject )
     {
         if ( ImplIsSysWindowOrChild( pObject->mhWndChild, hWndChild ) )
@@ -76,8 +76,8 @@ BOOL EXPENTRY SalSysMsgProc( HAB /* hAB */, QMSG* pMsg, ULONG /* fs */ )
          (pMsg->msg == WM_BUTTON2DOWN) ||
          (pMsg->msg == WM_BUTTON3DOWN) )
     {
-        SalData*    pSalData = GetSalData();
-        Os2SalObject*   pObject = ImplFindOs2SalObject( pMsg->hwnd );
+        SalData*	pSalData = GetSalData();
+        Os2SalObject*	pObject = ImplFindOs2SalObject( pMsg->hwnd );
         if ( pObject )
             WinPostMsg( pObject->mhWnd, SALOBJ_MSG_TOTOP, 0, 0 );
     }
@@ -94,9 +94,9 @@ BOOL EXPENTRY SalSysMsgProc( HAB /* hAB */, QMSG* pMsg, ULONG /* fs */ )
 MRESULT EXPENTRY SalSysObjWndProc( HWND hWnd, ULONG nMsg,
                                    MPARAM nMP1, MPARAM nMP2 )
 {
-    Os2SalObject*   pSysObj;
-    MRESULT     nRet = 0;
-    int         bDef = TRUE;
+    Os2SalObject*	pSysObj;
+    MRESULT 	nRet = 0;
+    int 		bDef = TRUE;
 
 #if OSL_DEBUG_LEVEL>0
     debug_printf( "SalSysObjWndProc hWnd 0x%x nMsg %d\n", hWnd, nMsg);
@@ -110,8 +110,8 @@ MRESULT EXPENTRY SalSysObjWndProc( HWND hWnd, ULONG nMsg,
             break;
         case WM_PAINT:
             {
-            HPS     hPS;
-            RECTL   aRect;
+            HPS 	hPS;
+            RECTL	aRect;
             hPS = WinBeginPaint( hWnd, NULLHANDLE, &aRect );
             WinEndPaint( hPS );
             bDef = FALSE;
@@ -193,8 +193,8 @@ MRESULT EXPENTRY SalSysObjWndProc( HWND hWnd, ULONG nMsg,
 MRESULT EXPENTRY SalSysObjChildWndProc( HWND hWnd, ULONG nMsg,
                                         MPARAM nMP1, MPARAM nMP2 )
 {
-    MRESULT     nRet = 0;
-    int         bDef = TRUE;
+    MRESULT 	nRet = 0;
+    int 		bDef = TRUE;
 
     debug_printf( "SalSysObjChildWndProc hWnd 0x%x nMsg %d\n", hWnd, nMsg);
 
@@ -209,8 +209,8 @@ MRESULT EXPENTRY SalSysObjChildWndProc( HWND hWnd, ULONG nMsg,
             break;
         case WM_PAINT:
             {
-            HPS     hPS;
-            RECTL   aRect;
+            HPS 	hPS;
+            RECTL	aRect;
             hPS = WinBeginPaint( hWnd, NULLHANDLE, &aRect );
             WinEndPaint( hPS );
             bDef = FALSE;
@@ -228,8 +228,8 @@ MRESULT EXPENTRY SalSysObjChildWndProc( HWND hWnd, ULONG nMsg,
 MRESULT EXPENTRY SalSysObjClipWndProc( HWND hWnd, ULONG nMsg,
                                        MPARAM nMP1, MPARAM nMP2 )
 {
-    MRESULT     nRet = 0;
-    int         bDef = TRUE;
+    MRESULT 	nRet = 0;
+    int 		bDef = TRUE;
 
     debug_printf( "SalSysObjClipWndProc hWnd 0x%x nMsg %d\n", hWnd, nMsg);
 
@@ -282,8 +282,8 @@ MRESULT EXPENTRY SalSysObjClipWndProc( HWND hWnd, ULONG nMsg,
             break;
         case WM_PAINT:
             {
-            HPS     hPS;
-            RECTL   aRect;
+            HPS 	hPS;
+            RECTL	aRect;
             hPS = WinBeginPaint( hWnd, NULLHANDLE, &aRect );
             WinEndPaint( hPS );
             bDef = FALSE;
@@ -383,15 +383,15 @@ Os2SalObject::Os2SalObject()
 {
     SalData* pSalData = GetSalData();
 
-    mhLastClipWnd       = HWND_TOP;
+    mhLastClipWnd		= HWND_TOP;
 
-    mhWnd               = 0;
-    mhWndChild      = 0;
-    mhLastFocusWnd  = 0;
-    maSysData.nSize = sizeof( SystemEnvData );
-    mnHeight            = 0;
-    mpInst          = NULL;
-    mpProc          = ImplSalObjCallbackDummy;
+    mhWnd				= 0;
+    mhWndChild 		= 0;
+    mhLastFocusWnd 	= 0;
+    maSysData.nSize	= sizeof( SystemEnvData );
+    mnHeight			= 0;
+    mpInst 			= NULL;
+    mpProc 			= ImplSalObjCallbackDummy;
 
     // Hook installieren, wenn es das erste Os2SalObject ist
     if ( !pSalData->mpFirstObject )
diff --git a/vcl/qa/complex/memCheck/CheckMemoryUsage.java b/vcl/qa/complex/memCheck/CheckMemoryUsage.java
index 9f8272240403..0e61cf22c3e7 100644
--- a/vcl/qa/complex/memCheck/CheckMemoryUsage.java
+++ b/vcl/qa/complex/memCheck/CheckMemoryUsage.java
@@ -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
@@ -47,12 +47,12 @@ import util.WriterTools;
 import util.utils;
 
 /**
- * Documents are opened and exported with StarOffice. The memory usage of
+ * Documents are opened and exported with StarOffice. The memory usage of 
  * StarOffice is monitored and if the usage exceeds the allowed kilobytes,
- * the test is failed. Used for monitoring the StarOffice process is the
+ * the test is failed. Used for monitoring the StarOffice process is the 
  * command line tool 'pmap', available on Solaris or Linux. This test will not
- * run on Windows.<br>Test procedure: every given document type is searched in
- * the source directory
+ * run on Windows.<br>Test procedure: every given document type is searched in 
+ * the source directory 
  * Needed paramters:
  * <ul>
  *   <li>"TestDocumentPath" - the path where test documents are located.</li>
@@ -85,7 +85,7 @@ public class CheckMemoryUsage extends ComplexTestCase {
     private String[][] sDocuments;
     private int iAllowMemoryIncrease = 10;
     private int iExportDocCount = 25;
-
+    
     /**
      * Get all test methods
      * @return The test methods.
@@ -93,7 +93,7 @@ public class CheckMemoryUsage extends ComplexTestCase {
     public String[] getTestMethodNames() {
         return new String[] {"loadAndSaveDocuments"};
     }
-
+    
     /**
      * Collect all documnets to load and all filters used for export.
      */
@@ -104,12 +104,12 @@ public class CheckMemoryUsage extends ComplexTestCase {
                         + "displays the memory usage of StarOffice.");
             failed("Test does not run on Windows, only on Solaris or Linux.");
         }
-
+        
         // how many times is every document exported.
         int count = param.getInt("ExportDocCount");
         if (count != 0)
             iExportDocCount = count;
-
+        
         // get the temp dir for creating the command scripts.
         sTempDir = System.getProperty("java.io.tmpdir");
         sProcessIdCommand = sTempDir + "getPS";
@@ -130,7 +130,7 @@ public class CheckMemoryUsage extends ComplexTestCase {
             v.add(sCalcDoc);
             v.add(sImpressDoc);
         }
-        // store a file extension
+        // store a file extension 
         sDocTypeExportFilter = new String[v.size()][2];
         for (int i=0; i<v.size(); i++) {
             // 2do: error routine for wrong given params
@@ -173,14 +173,14 @@ public class CheckMemoryUsage extends ComplexTestCase {
         f = new File(sOfficeMemoryCommand);
         f.delete();
     }
-
+    
     /**
      * Thet etst function: load documents and save them using the given filters
      * for each given document type.
      */
     public void loadAndSaveDocuments() {
         int storageBefore = getOfficeMemoryUsage();
-
+        
         XMultiServiceFactory xMSF = (XMultiServiceFactory)param.getMSF();
 
         // iterate over all document types
@@ -233,14 +233,14 @@ public class CheckMemoryUsage extends ComplexTestCase {
             mem = storageAfter;
             storageAfter = getOfficeMemoryUsage();
             shortWait(1000);
-        }
+        } 
         assure("The Office consumes now " + (storageAfter - storageBefore)
             + "K more memory than at the start of the test; allowed were "
-            + iAllowMemoryIncrease * iExportDocCount + "K.",
+            + iAllowMemoryIncrease * iExportDocCount + "K.", 
             storageAfter - storageBefore < iAllowMemoryIncrease * iExportDocCount);
-
+        
     }
-
+    
     /**
      * Get the process ID from the Office
      * @return the Id as String
@@ -258,7 +258,7 @@ public class CheckMemoryUsage extends ComplexTestCase {
         String id = aToken.nextToken();
         return id;
     }
-
+    
     /**
      * Get the memory usage of the Office in KByte.
      * @return The memory used by the Office.
@@ -271,16 +271,16 @@ public class CheckMemoryUsage extends ComplexTestCase {
         String text = processID.getOutputText();
         if (text == null || text.equals("") || text.indexOf(' ') == -1) {
             failed("Could not determine Office memory usage. Check " + sOfficeMemoryCommand);
-        }
+        } 
         StringTokenizer aToken = new StringTokenizer(text);
         // this works, because the output of pmap is quite standardized.
         aToken.nextToken();
         String mem = aToken.nextToken();
-        mem = mem.substring(0, mem.indexOf('K'));
+        mem = mem.substring(0, mem.indexOf('K')); 
         Integer memory = new Integer(mem);
         return memory.intValue();
     }
-
+    
     /**
      * Write a script file and set its rights to rwxrwxrwx.
      * @param fileName The name of the created file
@@ -309,9 +309,9 @@ public class CheckMemoryUsage extends ComplexTestCase {
             Thread.sleep(milliSeconds);
         }
         catch(java.lang.InterruptedException e) { // ignore
-        }
+        }	
     }
-
+    
     /**
      * Own file filter, will just return ok for all files that end with a given
      * suffix
diff --git a/vcl/qa/complex/persistent_window_states/DocumentHandle.java b/vcl/qa/complex/persistent_window_states/DocumentHandle.java
index 0b32eaaeff51..c7c3b6a045b0 100644
--- a/vcl/qa/complex/persistent_window_states/DocumentHandle.java
+++ b/vcl/qa/complex/persistent_window_states/DocumentHandle.java
@@ -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
diff --git a/vcl/qa/complex/persistent_window_states/PersistentWindowTest.java b/vcl/qa/complex/persistent_window_states/PersistentWindowTest.java
index edceeeafd883..1e5d3a8e7a2c 100644
--- a/vcl/qa/complex/persistent_window_states/PersistentWindowTest.java
+++ b/vcl/qa/complex/persistent_window_states/PersistentWindowTest.java
@@ -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
diff --git a/vcl/source/app/dbggui.cxx b/vcl/source/app/dbggui.cxx
index dd9a5b4a15ee..6f014cebc1f7 100644
--- a/vcl/source/app/dbggui.cxx
+++ b/vcl/source/app/dbggui.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
@@ -625,9 +625,9 @@ BOOL DbgWindow::Close()
     // remember window position
     ByteString aState( GetWindowState() );
     DbgData* pData = DbgGetData();
-    strncpy( pData->aDbgWinState,
-         aState.GetBuffer(),
-         std::min( sizeof( pData->aDbgWinState ),
+    strncpy( pData->aDbgWinState, 
+         aState.GetBuffer(), 
+         std::min( sizeof( pData->aDbgWinState ), 
                size_t(aState.Len() + 1U )) );
     pData->aDbgWinState[ sizeof( pData->aDbgWinState ) - 1 ] = 0;
     // and save for next session
@@ -997,7 +997,7 @@ DbgDialog::DbgDialog() :
     maOverwrite.SetPosSizePixel( LogicToPixel( Point( 205, 130 ), aAppMap ),
                                  aButtonSize );
     }
-
+    
     {
     maHookOSLBox.Show();
     maHookOSLBox.SetText( XubString( RTL_CONSTASCII_USTRINGPARAM( "Reroute osl debug ~messages" ) ) );
@@ -1525,7 +1525,7 @@ void DbgDialogTest( Window* pWindow )
                                  "%s should have a mnemonic char (~): %s",
                                  pClass,
                                  ByteString( aErrorText, RTL_TEXTENCODING_UTF8 ).GetBuffer() );
-
+                
                     // check text width
                     int aWidth=0;
                     switch( pChild->GetType() )
@@ -1574,7 +1574,7 @@ void DbgDialogTest( Window* pWindow )
                     int aWidth=0;
                     if( nAccelPos != STRING_NOTFOUND )
                     {
-                        aWidth = pChild->GetTextWidth( aText, 0, nAccelPos ) +
+                        aWidth = pChild->GetTextWidth( aText, 0, nAccelPos ) + 
                                  pChild->GetTextWidth( aText, nAccelPos+1, aText.Len() - nAccelPos - 1);
                     }
                     else
@@ -1798,7 +1798,7 @@ class DbgMessageBox : public ErrorBox
         SetText( String( RTL_CONSTASCII_USTRINGPARAM("Debug Output") ) );
         AddButton( String( RTL_CONSTASCII_USTRINGPARAM( "Copy" ) ), COPY_BUTTON_ID, 0 );
     }
-
+    
     virtual void Click()
     {
         if( GetCurButtonId() == COPY_BUTTON_ID )
diff --git a/vcl/source/app/dndhelp.cxx b/vcl/source/app/dndhelp.cxx
index d1eb2014b4df..ff7a4833a916 100644
--- a/vcl/source/app/dndhelp.cxx
+++ b/vcl/source/app/dndhelp.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
@@ -90,7 +90,7 @@ vcl::unohelper::DragAndDropWrapper::DragAndDropWrapper( DragAndDropClient* pClie
 vcl::unohelper::DragAndDropWrapper::~DragAndDropWrapper()
 {
 }
-
+        
 // uno::XInterface
 uno::Any vcl::unohelper::DragAndDropWrapper::queryInterface( const uno::Type & rType ) throw(uno::RuntimeException)
 {
diff --git a/vcl/source/app/help.cxx b/vcl/source/app/help.cxx
index 1f9efa7b6e65..9c5ed77082c6 100644
--- a/vcl/source/app/help.cxx
+++ b/vcl/source/app/help.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
@@ -40,15 +40,15 @@
 
 // =======================================================================
 
-#define HELPWINSTYLE_QUICK      0
-#define HELPWINSTYLE_BALLOON    1
+#define HELPWINSTYLE_QUICK		0
+#define HELPWINSTYLE_BALLOON	1
 
-#define HELPTEXTMARGIN_QUICK    3
-#define HELPTEXTMARGIN_BALLOON  6
+#define HELPTEXTMARGIN_QUICK	3
+#define HELPTEXTMARGIN_BALLOON	6
 
-#define HELPDELAY_NORMAL        1
-#define HELPDELAY_SHORT         2
-#define HELPDELAY_NONE          3
+#define HELPDELAY_NORMAL		1
+#define HELPDELAY_SHORT 		2
+#define HELPDELAY_NONE			3
 
 // =======================================================================
 
@@ -124,8 +124,8 @@ BOOL Help::StartContextHelp()
         Window* pWindow = pSVData->maWinData.mpFocusWin;
         if ( pWindow )
         {
-            Point       aMousePos = pWindow->OutputToScreenPixel( pWindow->GetPointerPosPixel() );
-            HelpEvent   aHelpEvent( aMousePos, HELPMODE_CONTEXT );
+            Point		aMousePos = pWindow->OutputToScreenPixel( pWindow->GetPointerPosPixel() );
+            HelpEvent	aHelpEvent( aMousePos, HELPMODE_CONTEXT );
             pWindow->RequestHelp( aHelpEvent );
             return TRUE;
         }
@@ -321,7 +321,7 @@ HelpTextWindow::HelpTextWindow( Window* pParent, const XubString& rText, USHORT
     mnHelpWinStyle = nHelpWinStyle;
     mnStyle = nStyle;
 //  on windows this will raise the application window, because help windows are system windows now
-//  EnableAlwaysOnTop();
+//	EnableAlwaysOnTop();
     EnableSaveBackground();
 
     const StyleSettings& rStyleSettings = GetSettings().GetStyleSettings();
@@ -396,9 +396,9 @@ void HelpTextWindow::SetHelpText( const String& rHelpText )
     }
     else // HELPWINSTYLE_BALLOON
     {
-        Point       aTmpPoint;
-        USHORT      nCharsInLine = 35 + ((maHelpText.Len()/100)*5);
-        XubString   aXXX;
+        Point		aTmpPoint;
+        USHORT		nCharsInLine = 35 + ((maHelpText.Len()/100)*5);
+        XubString	aXXX;
         aXXX.Fill( nCharsInLine, 'x' );   // Durchschnittliche Breite, damit nicht jedes Fenster anders.
         long nWidth = GetTextWidth( aXXX );
         Size aTmpSize( nWidth, 0x7FFFFFFF );
@@ -634,7 +634,7 @@ void ImplShowHelpWindow( Window* pParent, USHORT nHelpWinStyle, USHORT nStyle,
         ULONG nCurTime = Time::GetSystemTicks();
         if( (nCurTime - pSVData->maHelpData.mnLastHelpHideTime) < pParent->GetSettings().GetHelpSettings().GetTipDelay() )
             nDelayMode = HELPDELAY_NONE;
-
+        
         DBG_ASSERT( !pHelpWin, "Noch ein HelpWin ?!" );
         pHelpWin = new HelpTextWindow( pParent, rHelpText, nHelpWinStyle, nStyle );
         pSVData->maHelpData.mpHelpWin = pHelpWin;
@@ -642,7 +642,7 @@ void ImplShowHelpWindow( Window* pParent, USHORT nHelpWinStyle, USHORT nStyle,
         if ( pHelpArea )
             pHelpWin->SetHelpArea( *pHelpArea );
 
-        //  positioning
+        //	positioning
         Size aSz = pHelpWin->CalcOutSize();
         pHelpWin->SetOutputSizePixel( aSz );
         ImplSetHelpWindowPos( pHelpWin, nHelpWinStyle, nStyle, rScreenPos, pHelpArea );
@@ -680,9 +680,9 @@ void ImplDestroyHelpWindow( bool bUpdateHideTime )
 void ImplSetHelpWindowPos( Window* pHelpWin, USHORT nHelpWinStyle, USHORT nStyle,
                            const Point& rPos, const Rectangle* pHelpArea )
 {
-    Point       aPos = rPos;
-    Size        aSz = pHelpWin->GetSizePixel();
-    Rectangle   aScreenRect = pHelpWin->ImplGetFrameWindow()->GetDesktopRectPixel();
+    Point		aPos = rPos;
+    Size		aSz = pHelpWin->GetSizePixel();
+    Rectangle	aScreenRect = pHelpWin->ImplGetFrameWindow()->GetDesktopRectPixel();
     aPos = pHelpWin->GetParent()->ImplGetFrameWindow()->OutputToAbsoluteScreenPixel( aPos );
     // get mouse screen coords
     Point mPos( pHelpWin->GetParent()->ImplGetFrameWindow()->GetPointerPosPixel() );
diff --git a/vcl/source/app/i18nhelp.cxx b/vcl/source/app/i18nhelp.cxx
index 17bc760ff5fc..3d7e4df204b8 100644
--- a/vcl/source/app/i18nhelp.cxx
+++ b/vcl/source/app/i18nhelp.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
@@ -86,16 +86,16 @@ LocaleDataWrapper& vcl::I18nHelper::ImplGetLocaleDataWrapper() const
     return *mpLocaleDataWrapper;
 }
 
-const ::com::sun::star::lang::Locale& vcl::I18nHelper::getLocale() const
+const ::com::sun::star::lang::Locale& vcl::I18nHelper::getLocale() const 
 {
-    return maLocale;
+    return maLocale; 
 }
 
 inline bool is_formatting_mark( sal_Unicode c )
 {
-    if( (c >= 0x200B) && (c <= 0x200F) )    // BiDi and zero-width-markers
+    if( (c >= 0x200B) && (c <= 0x200F) )	// BiDi and zero-width-markers
         return true;
-    if( (c >= 0x2028) && (c <= 0x202E) )    // BiDi and paragraph-markers
+    if( (c >= 0x2028) && (c <= 0x202E) )	// BiDi and paragraph-markers
         return true;
     return false;
 }
@@ -104,7 +104,7 @@ inline bool is_formatting_mark( sal_Unicode c )
    the transliteration. The real solution would have been an additional TransliterationModule
    to ignore these marks during transliteration; however changin the code in i18npool that actually
    implements this could produce unwanted side effects.
-
+   
    Of course this copying around is not really good, but looking at i18npool, one more time
    will not hurt.
 */
@@ -135,7 +135,7 @@ sal_Int32 vcl::I18nHelper::CompareString( const String& rStr1, const String& rSt
         ((vcl::I18nHelper*)this)->mpTransliterationWrapper = NULL;
     }
 
-
+    
     String aStr1( filterFormattingChars(rStr1) );
     String aStr2( filterFormattingChars(rStr2) );
     return ImplGetTransliterationWrapper().compareString( aStr1, aStr2 );
diff --git a/vcl/source/app/idlemgr.cxx b/vcl/source/app/idlemgr.cxx
index 0318bc5d6f2d..a92474d2fff5 100644
--- a/vcl/source/app/idlemgr.cxx
+++ b/vcl/source/app/idlemgr.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
diff --git a/vcl/source/app/salvtables.cxx b/vcl/source/app/salvtables.cxx
index 9a2404d36740..200a0241ebf9 100644
--- a/vcl/source/app/salvtables.cxx
+++ b/vcl/source/app/salvtables.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
diff --git a/vcl/source/app/session.cxx b/vcl/source/app/session.cxx
index c65eb13224e1..6eb70505fd23 100644
--- a/vcl/source/app/session.cxx
+++ b/vcl/source/app/session.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
@@ -52,10 +52,10 @@ class VCLSession : public cppu::WeakComponentImplHelper1 < XSessionManagerClient
 {
     struct Listener
     {
-        Reference< XSessionManagerListener >        m_xListener;
-        bool                                        m_bInteractionRequested;
-        bool                                        m_bInteractionDone;
-        bool                                        m_bSaveDone;
+        Reference< XSessionManagerListener >		m_xListener;
+        bool										m_bInteractionRequested;
+        bool										m_bInteractionDone;
+        bool										m_bSaveDone;
 
         Listener( const Reference< XSessionManagerListener >& xListener )
                 : m_xListener( xListener ),
@@ -65,13 +65,13 @@ class VCLSession : public cppu::WeakComponentImplHelper1 < XSessionManagerClient
         {}
     };
 
-    std::list< Listener >                           m_aListeners;
-    SalSession*                                     m_pSession;
-    osl::Mutex                                      m_aMutex;
-    bool                                            m_bInteractionRequested;
-    bool                                            m_bInteractionGranted;
-    bool                                            m_bInteractionDone;
-    bool                                            m_bSaveDone;
+    std::list< Listener >							m_aListeners;
+    SalSession*										m_pSession;
+    osl::Mutex										m_aMutex;
+    bool											m_bInteractionRequested;
+    bool											m_bInteractionGranted;
+    bool											m_bInteractionDone;
+    bool											m_bSaveDone;
 
     static void SalSessionEventProc( SalSessionEvent* pEvent );
     static VCLSession* pOneInstance;
@@ -83,7 +83,7 @@ class VCLSession : public cppu::WeakComponentImplHelper1 < XSessionManagerClient
 public:
     VCLSession();
     virtual ~VCLSession();
-
+    
     virtual void SAL_CALL addSessionManagerListener( const Reference< XSessionManagerListener >& xListener ) throw( RuntimeException );
     virtual void SAL_CALL removeSessionManagerListener( const Reference< XSessionManagerListener>& xListener ) throw( RuntimeException );
     virtual void SAL_CALL queryInteraction( const Reference< XSessionManagerListener >& xListener ) throw( RuntimeException );
@@ -135,7 +135,7 @@ void VCLSession::callSaveRequested( bool bShutdown, bool bCancelable )
         // without session we assume UI is always possible,
         // so it was reqeusted and granted
         m_bInteractionRequested = m_bInteractionGranted = m_pSession ? false : true;
-
+        
         // answer the session manager even if no listeners available anymore
         DBG_ASSERT( ! aListeners.empty(), "saveRequested but no listeners !" );
         if( aListeners.empty() )
@@ -177,7 +177,7 @@ void VCLSession::callInteractionGranted( bool bInteractionGranted )
     ULONG nAcquireCount = Application::ReleaseSolarMutex();
     for( std::list< Listener >::const_iterator it = aListeners.begin(); it != aListeners.end(); ++it )
         it->m_xListener->approveInteraction( bInteractionGranted );
-
+    
     Application::AcquireSolarMutex( nAcquireCount );
 }
 
@@ -247,7 +247,7 @@ void VCLSession::SalSessionEventProc( SalSessionEvent* pEvent )
 void SAL_CALL VCLSession::addSessionManagerListener( const Reference<XSessionManagerListener>& xListener ) throw( RuntimeException )
 {
     osl::MutexGuard aGuard( m_aMutex );
-
+    
     m_aListeners.push_back( Listener( xListener ) );
 }
 
@@ -265,7 +265,7 @@ void SAL_CALL VCLSession::removeSessionManagerListener( const Reference<XSession
         }
         else
             ++it;
-    }
+    }    
 }
 
 void SAL_CALL VCLSession::queryInteraction( const Reference<XSessionManagerListener>& xListener ) throw( RuntimeException )
@@ -289,8 +289,8 @@ void SAL_CALL VCLSession::queryInteraction( const Reference<XSessionManagerListe
     {
         if( it->m_xListener == xListener )
         {
-            it->m_bInteractionRequested = true;
-            it->m_bInteractionDone      = false;
+            it->m_bInteractionRequested	= true;
+            it->m_bInteractionDone		= false;
         }
     }
 }
@@ -364,6 +364,6 @@ Reference< XInterface > SAL_CALL vcl_session_createInstance( const Reference< XM
     ImplSVData* pSVData = ImplGetSVData();
     if( ! pSVData->xSMClient.is() )
         pSVData->xSMClient = new VCLSession();
-
+    
     return Reference< XInterface >(pSVData->xSMClient, UNO_QUERY );
 }
diff --git a/vcl/source/app/settings.cxx b/vcl/source/app/settings.cxx
index 7f97ba2d8720..a1a175f5f7e1 100755
--- a/vcl/source/app/settings.cxx
+++ b/vcl/source/app/settings.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
@@ -429,10 +429,10 @@ ImplStyleData::ImplStyleData()
     mnSelectionOptions          = 0;
     mnDisplayOptions            = 0;
     mnOptions                   = 0;
-    mnAutoMnemonic              = 1;
-    mnToolbarIconSize           = STYLE_TOOLBAR_ICONSIZE_UNKNOWN;
-    mnSymbolsStyle              = STYLE_SYMBOLS_AUTO;
-    mnPreferredSymbolsStyle         = STYLE_SYMBOLS_AUTO;
+    mnAutoMnemonic				= 1;
+    mnToolbarIconSize			= STYLE_TOOLBAR_ICONSIZE_UNKNOWN;
+    mnSymbolsStyle				= STYLE_SYMBOLS_AUTO;
+    mnPreferredSymbolsStyle			= STYLE_SYMBOLS_AUTO;
     mpFontOptions              = NULL;
 
     SetStandardStyles();
@@ -530,16 +530,16 @@ ImplStyleData::ImplStyleData( const ImplStyleData& rData ) :
     mnSelectionOptions          = rData.mnSelectionOptions;
     mnDisplayOptions            = rData.mnDisplayOptions;
     mnOptions                   = rData.mnOptions;
-    mnHighContrast              = rData.mnHighContrast;
-    mnUseSystemUIFonts          = rData.mnUseSystemUIFonts;
-    mnUseFlatBorders            = rData.mnUseFlatBorders;
-    mnUseFlatMenues             = rData.mnUseFlatMenues;
-    mnAutoMnemonic              = rData.mnAutoMnemonic;
-    mnUseImagesInMenus          = rData.mnUseImagesInMenus;
-    mnSkipDisabledInMenus       = rData.mnSkipDisabledInMenus;
-    mnToolbarIconSize           = rData.mnToolbarIconSize;
-    mnSymbolsStyle              = rData.mnSymbolsStyle;
-    mnPreferredSymbolsStyle         = rData.mnPreferredSymbolsStyle;
+    mnHighContrast				= rData.mnHighContrast;
+    mnUseSystemUIFonts			= rData.mnUseSystemUIFonts;
+    mnUseFlatBorders 			= rData.mnUseFlatBorders;
+    mnUseFlatMenues 			= rData.mnUseFlatMenues;
+    mnAutoMnemonic				= rData.mnAutoMnemonic;
+    mnUseImagesInMenus			= rData.mnUseImagesInMenus;
+    mnSkipDisabledInMenus		= rData.mnSkipDisabledInMenus;
+    mnToolbarIconSize			= rData.mnToolbarIconSize;
+    mnSymbolsStyle				= rData.mnSymbolsStyle;
+    mnPreferredSymbolsStyle			= rData.mnPreferredSymbolsStyle;
     mpFontOptions               = rData.mpFontOptions;
 }
 
@@ -562,8 +562,8 @@ void ImplStyleData::SetStandardStyles()
     maPushButtonFont            = aStdFont;
     maFieldFont                 = aStdFont;
     maIconFont                  = aStdFont;
-    maFloatTitleFont            = aStdFont;
     aStdFont.SetWeight( WEIGHT_BOLD );
+    maFloatTitleFont            = aStdFont;
     maTitleFont                 = aStdFont;
 
     maFaceColor                 = Color( COL_LIGHTGRAY );
@@ -612,7 +612,7 @@ void ImplStyleData::SetStandardStyles()
     maLinkColor                 = Color( COL_BLUE );
     maVisitedLinkColor          = Color( 0x00, 0x00, 0xCC );
     maHighlightLinkColor        = Color( COL_LIGHTBLUE );
-    maFontColor                 = Color( COL_BLACK );
+    maFontColor					= Color( COL_BLACK );
 
     mnRadioButtonStyle         &= ~STYLE_RADIOBUTTON_STYLE;
     mnCheckBoxStyle            &= ~STYLE_CHECKBOX_STYLE;
@@ -625,12 +625,12 @@ void ImplStyleData::SetStandardStyles()
     mnFloatTitleHeight          = 13;
     mnTearOffTitleHeight        = 8;
     mnMenuBarHeight             = 14;
-    mnHighContrast              = 0;
-    mnUseSystemUIFonts          = 1;
-    mnUseFlatBorders            = 0;
-    mnUseFlatMenues             = 0;
-    mnUseImagesInMenus          = (USHORT)TRUE;
-    mnSkipDisabledInMenus       = (USHORT)FALSE;
+    mnHighContrast				= 0;
+    mnUseSystemUIFonts			= 1;
+    mnUseFlatBorders 			= 0;
+    mnUseFlatMenues 			= 0;
+    mnUseImagesInMenus			= (USHORT)TRUE;
+    mnSkipDisabledInMenus		= (USHORT)FALSE;
 
     Gradient aGrad( GRADIENT_LINEAR, DEFAULT_WORKSPACE_GRADIENT_START_COLOR, DEFAULT_WORKSPACE_GRADIENT_END_COLOR );
     maWorkspaceGradient = Wallpaper( aGrad );
@@ -1012,7 +1012,7 @@ BOOL StyleSettings::operator ==( const StyleSettings& rSet ) const
         return TRUE;
 
     if ( (mpData->mnOptions                 == rSet.mpData->mnOptions)                  &&
-         (mpData->mnAutoMnemonic            == rSet.mpData->mnAutoMnemonic)             &&
+         (mpData->mnAutoMnemonic			== rSet.mpData->mnAutoMnemonic)				&&
          (mpData->mnLogoDisplayTime         == rSet.mpData->mnLogoDisplayTime)          &&
          (mpData->mnDragFullOptions         == rSet.mpData->mnDragFullOptions)          &&
          (mpData->mnAnimationOptions        == rSet.mpData->mnAnimationOptions)         &&
@@ -1038,10 +1038,10 @@ BOOL StyleSettings::operator ==( const StyleSettings& rSet ) const
          (mpData->mnCheckBoxStyle           == rSet.mpData->mnCheckBoxStyle)            &&
          (mpData->mnPushButtonStyle         == rSet.mpData->mnPushButtonStyle)          &&
          (mpData->mnTabControlStyle         == rSet.mpData->mnTabControlStyle)          &&
-         (mpData->mnHighContrast            == rSet.mpData->mnHighContrast)             &&
-         (mpData->mnUseSystemUIFonts        == rSet.mpData->mnUseSystemUIFonts)         &&
-         (mpData->mnUseFlatBorders          == rSet.mpData->mnUseFlatBorders)           &&
-         (mpData->mnUseFlatMenues           == rSet.mpData->mnUseFlatMenues)            &&
+         (mpData->mnHighContrast			== rSet.mpData->mnHighContrast)             &&
+         (mpData->mnUseSystemUIFonts		== rSet.mpData->mnUseSystemUIFonts)         &&
+         (mpData->mnUseFlatBorders   		== rSet.mpData->mnUseFlatBorders)           &&
+         (mpData->mnUseFlatMenues   		== rSet.mpData->mnUseFlatMenues)            &&
          (mpData->maFaceColor               == rSet.mpData->maFaceColor)                &&
          (mpData->maCheckedColor            == rSet.mpData->maCheckedColor)             &&
          (mpData->maLightColor              == rSet.mpData->maLightColor)               &&
@@ -1098,10 +1098,10 @@ BOOL StyleSettings::operator ==( const StyleSettings& rSet ) const
          (mpData->maRadioCheckFont          == rSet.mpData->maRadioCheckFont)           &&
          (mpData->maPushButtonFont          == rSet.mpData->maPushButtonFont)           &&
          (mpData->maFieldFont               == rSet.mpData->maFieldFont)                &&
-         (mpData->maIconFont                == rSet.mpData->maIconFont)                 &&
-         (mpData->mnUseImagesInMenus        == rSet.mpData->mnUseImagesInMenus)         &&
-         (mpData->mnSkipDisabledInMenus     == rSet.mpData->mnSkipDisabledInMenus)      &&
-         (mpData->maFontColor               == rSet.mpData->maFontColor ))
+         (mpData->maIconFont                == rSet.mpData->maIconFont)					&&
+         (mpData->mnUseImagesInMenus		== rSet.mpData->mnUseImagesInMenus)			&&
+         (mpData->mnSkipDisabledInMenus		== rSet.mpData->mnSkipDisabledInMenus)		&&
+         (mpData->maFontColor				== rSet.mpData->maFontColor ))
         return TRUE;
     else
         return FALSE;
@@ -1112,8 +1112,8 @@ BOOL StyleSettings::operator ==( const StyleSettings& rSet ) const
 ImplMiscData::ImplMiscData()
 {
     mnRefCount                  = 1;
-    mnEnableATT                 = sal::static_int_cast<USHORT>(~0U);
-    mnDisablePrinting           = sal::static_int_cast<USHORT>(~0U);
+    mnEnableATT					= sal::static_int_cast<USHORT>(~0U);
+    mnDisablePrinting			= sal::static_int_cast<USHORT>(~0U);
     static const char* pEnv = getenv("SAL_DECIMALSEP_ENABLED" ); // set default without UI
     mbEnableLocalizedDecimalSep = (pEnv != NULL) ? TRUE : FALSE;
 }
@@ -1123,8 +1123,8 @@ ImplMiscData::ImplMiscData()
 ImplMiscData::ImplMiscData( const ImplMiscData& rData )
 {
     mnRefCount                  = 1;
-    mnEnableATT                 = rData.mnEnableATT;
-    mnDisablePrinting           = rData.mnDisablePrinting;
+    mnEnableATT					= rData.mnEnableATT;
+    mnDisablePrinting			= rData.mnDisablePrinting;
     mbEnableLocalizedDecimalSep = rData.mbEnableLocalizedDecimalSep;
 }
 
@@ -1196,8 +1196,8 @@ BOOL MiscSettings::operator ==( const MiscSettings& rSet ) const
     if ( mpData == rSet.mpData )
         return TRUE;
 
-    if ( (mpData->mnEnableATT           == rSet.mpData->mnEnableATT ) &&
-         (mpData->mnDisablePrinting     == rSet.mpData->mnDisablePrinting ) &&
+    if ( (mpData->mnEnableATT			== rSet.mpData->mnEnableATT ) &&
+         (mpData->mnDisablePrinting		== rSet.mpData->mnDisablePrinting ) &&
          (mpData->mbEnableLocalizedDecimalSep == rSet.mpData->mbEnableLocalizedDecimalSep ) )
         return TRUE;
     else
@@ -1318,7 +1318,7 @@ void MiscSettings::SetEnableATToolSupport( BOOL bEnable )
             DWORD cbData = sizeof(Data);
 
             if( ERROR_SUCCESS == RegQueryValueEx(hkey, "SupportAssistiveTechnology",
-                NULL,   &dwType, Data, &cbData) )
+                NULL,	&dwType, Data, &cbData) )
             {
                 switch (dwType)
                 {
@@ -1331,7 +1331,7 @@ void MiscSettings::SetEnableATToolSupport( BOOL bEnable )
                     case REG_DWORD:
                         ((DWORD *) Data)[0] = bEnable ? 1 : 0;
                         RegSetValueEx(hkey, "SupportAssistiveTechnology",
-                            NULL, dwType, Data, sizeof(DWORD));
+                            NULL, dwType, Data,	sizeof(DWORD));
                         break;
                     default:
                         // Unsupported registry type
@@ -1839,7 +1839,7 @@ BOOL AllSettings::operator ==( const AllSettings& rSet ) const
          (mpData->maNotificationSettings    == rSet.mpData->maNotificationSettings) &&
          (mpData->maHelpSettings            == rSet.mpData->maHelpSettings)         &&
          (mpData->mnSystemUpdate            == rSet.mpData->mnSystemUpdate)         &&
-         (mpData->maLocale                  == rSet.mpData->maLocale)               &&
+         (mpData->maLocale					== rSet.mpData->maLocale)				&&
          (mpData->mnWindowUpdate            == rSet.mpData->mnWindowUpdate) )
     {
         return TRUE;
diff --git a/vcl/source/app/sound.cxx b/vcl/source/app/sound.cxx
index bac9d50dc5da..24aa6e78d8a7 100644
--- a/vcl/source/app/sound.cxx
+++ b/vcl/source/app/sound.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
diff --git a/vcl/source/app/stdtext.cxx b/vcl/source/app/stdtext.cxx
index 176ec5a1b4c6..9e2eed60e61b 100644
--- a/vcl/source/app/stdtext.cxx
+++ b/vcl/source/app/stdtext.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
diff --git a/vcl/source/app/svapp.cxx b/vcl/source/app/svapp.cxx
index e503172eb2c6..1ba14b121f09 100644
--- a/vcl/source/app/svapp.cxx
+++ b/vcl/source/app/svapp.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
@@ -184,12 +184,12 @@ struct ImplEventHook
 
 struct ImplPostEventData
 {
-    ULONG           mnEvent;
-    const Window*   mpWin;
-    ULONG           mnEventId;
-    KeyEvent        maKeyEvent;
-    MouseEvent      maMouseEvent;
-
+    ULONG			mnEvent;
+    const Window*	mpWin;
+    ULONG			mnEventId;
+    KeyEvent    	maKeyEvent;
+    MouseEvent		maMouseEvent;
+    
 
        ImplPostEventData( ULONG nEvent, const Window* pWin, const KeyEvent& rKeyEvent ) :
         mnEvent( nEvent ), mpWin( pWin ), mnEventId( 0 ), maKeyEvent( rKeyEvent ) {}
@@ -353,7 +353,7 @@ const XubString& Application::GetAppFileName()
     if( !aAppFileName.Len() )
     {
         vos::OStartupInfo   aStartInfo;
-        ::rtl::OUString     aExeFileName;
+        ::rtl::OUString		aExeFileName;
 
         aStartInfo.getExecutableFile( aExeFileName );
 
@@ -457,7 +457,7 @@ void Application::Execute()
 inline void ImplYield( bool i_bWait, bool i_bAllEvents )
 {
     ImplSVData* pSVData = ImplGetSVData();
-
+    
     // run timers that have timed out
     if ( !pSVData->mbNoCallTimer )
         while ( pSVData->mbNotAllTimerCalled )
@@ -474,7 +474,7 @@ inline void ImplYield( bool i_bWait, bool i_bAllEvents )
     // flush lazy deleted objects
     if( pSVData->maAppData.mnDispatchLevel == 0 )
         vcl::LazyDelete::flush();
-
+    
     // the system timer events will not necesseraly come in in non waiting mode
     // e.g. on aqua; need to trigger timer checks manually
     if( pSVData->maAppData.mbNoYield && !pSVData->mbNoCallTimer )
@@ -707,7 +707,7 @@ void Application::SetSettings( const AllSettings& rSettings )
     {
         GetSettings();
         *pSVData->maAppData.mpSettings = rSettings;
-        ResMgr::SetDefaultLocale( rSettings.GetUILocale() );
+        ResMgr::SetDefaultLocale( rSettings.GetUILocale() ); 
     }
     else
     {
@@ -717,7 +717,7 @@ void Application::SetSettings( const AllSettings& rSettings )
             delete pSVData->mpResMgr;
             pSVData->mpResMgr = NULL;
         }
-        ResMgr::SetDefaultLocale( rSettings.GetUILocale() );
+        ResMgr::SetDefaultLocale( rSettings.GetUILocale() ); 
         *pSVData->maAppData.mpSettings = rSettings;
         ULONG nChangeFlags = aOldSettings.GetChangeFlags( *pSVData->maAppData.mpSettings );
         if ( nChangeFlags )
@@ -918,22 +918,22 @@ BOOL Application::HandleKey( ULONG nEvent, Window *pWin, KeyEvent* pKeyEvent )
 
 ULONG Application::PostKeyEvent( ULONG nEvent, Window *pWin, KeyEvent* pKeyEvent )
 {
-    const ::vos::OGuard aGuard( GetSolarMutex() );
-    ULONG               nEventId = 0;
-
+    const ::vos::OGuard	aGuard( GetSolarMutex() );
+    ULONG 				nEventId = 0;
+    
     if( pWin && pKeyEvent )
     {
         ImplPostEventData* pPostEventData = new ImplPostEventData( nEvent, pWin, *pKeyEvent );
-
+    
         PostUserEvent( nEventId,
                        STATIC_LINK( NULL, Application, PostEventHandler ),
                        pPostEventData );
-
+    
         if( nEventId )
         {
             pPostEventData->mnEventId = nEventId;
             aPostedEventList.push_back( ImplPostEventPair( pWin, pPostEventData ) );
-        }
+        }			
         else
             delete pPostEventData;
     }
@@ -945,30 +945,30 @@ ULONG Application::PostKeyEvent( ULONG nEvent, Window *pWin, KeyEvent* pKeyEvent
 
 ULONG Application::PostMouseEvent( ULONG nEvent, Window *pWin, MouseEvent* pMouseEvent )
 {
-    const ::vos::OGuard aGuard( GetSolarMutex() );
-    ULONG               nEventId = 0;
-
+    const ::vos::OGuard	aGuard( GetSolarMutex() );
+    ULONG 				nEventId = 0;
+    
     if( pWin && pMouseEvent )
     {
         Point aTransformedPos( pMouseEvent->GetPosPixel() );
-
+        
         aTransformedPos.X() += pWin->mnOutOffX;
         aTransformedPos.Y() += pWin->mnOutOffY;
-
+        
         const MouseEvent aTransformedEvent( aTransformedPos, pMouseEvent->GetClicks(), pMouseEvent->GetMode(),
                                             pMouseEvent->GetButtons(), pMouseEvent->GetModifier() );
 
         ImplPostEventData* pPostEventData = new ImplPostEventData( nEvent, pWin, aTransformedEvent );
-
+                                            
         PostUserEvent( nEventId,
                        STATIC_LINK( NULL, Application, PostEventHandler ),
                        pPostEventData );
-
+    
         if( nEventId )
         {
             pPostEventData->mnEventId = nEventId;
             aPostedEventList.push_back( ImplPostEventPair( pWin, pPostEventData ) );
-        }
+        }	
         else
             delete pPostEventData;
     }
@@ -980,36 +980,36 @@ ULONG Application::PostMouseEvent( ULONG nEvent, Window *pWin, MouseEvent* pMous
 
 IMPL_STATIC_LINK_NOINSTANCE( Application, PostEventHandler, void*, pCallData )
 {
-    const ::vos::OGuard aGuard( GetSolarMutex() );
-    ImplPostEventData*  pData = static_cast< ImplPostEventData * >( pCallData );
-    const void*         pEventData;
+    const ::vos::OGuard	aGuard( GetSolarMutex() );
+    ImplPostEventData*	pData = static_cast< ImplPostEventData * >( pCallData );
+    const void*			pEventData;
     ULONG               nEvent;
-    const ULONG         nEventId = pData->mnEventId;
-
+    const ULONG			nEventId = pData->mnEventId;
+    
     switch( pData->mnEvent )
     {
-        case VCLEVENT_WINDOW_MOUSEMOVE:
+        case VCLEVENT_WINDOW_MOUSEMOVE: 
             nEvent = SALEVENT_EXTERNALMOUSEMOVE;
-            pEventData = &pData->maMouseEvent;
+            pEventData = &pData->maMouseEvent; 
         break;
-
-        case VCLEVENT_WINDOW_MOUSEBUTTONDOWN:
+        
+        case VCLEVENT_WINDOW_MOUSEBUTTONDOWN: 
             nEvent = SALEVENT_EXTERNALMOUSEBUTTONDOWN;
             pEventData = &pData->maMouseEvent;
         break;
-
-        case VCLEVENT_WINDOW_MOUSEBUTTONUP:
-            nEvent = SALEVENT_EXTERNALMOUSEBUTTONUP;
+        
+        case VCLEVENT_WINDOW_MOUSEBUTTONUP: 
+            nEvent = SALEVENT_EXTERNALMOUSEBUTTONUP; 
             pEventData = &pData->maMouseEvent;
         break;
 
-        case VCLEVENT_WINDOW_KEYINPUT:
-            nEvent = SALEVENT_EXTERNALKEYINPUT;
+        case VCLEVENT_WINDOW_KEYINPUT: 
+            nEvent = SALEVENT_EXTERNALKEYINPUT; 
             pEventData = &pData->maKeyEvent;
         break;
-
-        case VCLEVENT_WINDOW_KEYUP:
-            nEvent = SALEVENT_EXTERNALKEYUP;
+        
+        case VCLEVENT_WINDOW_KEYUP: 
+            nEvent = SALEVENT_EXTERNALKEYUP; 
             pEventData = &pData->maKeyEvent;
         break;
 
@@ -1021,10 +1021,10 @@ IMPL_STATIC_LINK_NOINSTANCE( Application, PostEventHandler, void*, pCallData )
 
     if( pData->mpWin && pData->mpWin->mpWindowImpl->mpFrameWindow && pEventData )
         ImplWindowFrameProc( pData->mpWin->mpWindowImpl->mpFrameWindow, NULL, (USHORT) nEvent, pEventData );
-
+        
     // remove this event from list of posted events, watch for destruction of internal data
     ::std::list< ImplPostEventPair >::iterator aIter( aPostedEventList.begin() );
-
+    
     while( aIter != aPostedEventList.end() )
     {
         if( nEventId == (*aIter).second->mnEventId )
@@ -1035,7 +1035,7 @@ IMPL_STATIC_LINK_NOINSTANCE( Application, PostEventHandler, void*, pCallData )
         else
             ++aIter;
     }
-
+    
     return 0;
 }
 
@@ -1043,18 +1043,18 @@ IMPL_STATIC_LINK_NOINSTANCE( Application, PostEventHandler, void*, pCallData )
 
 void Application::RemoveMouseAndKeyEvents( Window* pWin )
 {
-    const ::vos::OGuard aGuard( GetSolarMutex() );
-
+    const ::vos::OGuard	aGuard( GetSolarMutex() );
+    
     // remove all events for specific window, watch for destruction of internal data
     ::std::list< ImplPostEventPair >::iterator aIter( aPostedEventList.begin() );
-
+    
     while( aIter != aPostedEventList.end() )
     {
         if( pWin == (*aIter).first )
         {
             if( (*aIter).second->mnEventId )
                 RemoveUserEvent( (*aIter).second->mnEventId );
-
+            
             delete (*aIter).second;
             aIter = aPostedEventList.erase( aIter );
         }
@@ -1068,15 +1068,15 @@ void Application::RemoveMouseAndKeyEvents( Window* pWin )
 BOOL Application::IsProcessedMouseOrKeyEvent( ULONG nEventId )
 {
     const ::vos::OGuard aGuard( GetSolarMutex() );
-
+    
     // find event
     ::std::list< ImplPostEventPair >::iterator aIter( aPostedEventList.begin() );
-
+    
     while( aIter != aPostedEventList.end() )
     {
         if( (*aIter).second->mnEventId == nEventId )
             return FALSE;
-
+            
         else
             ++aIter;
     }
@@ -1409,8 +1409,8 @@ unsigned int Application::GetBestScreen( const Rectangle& i_rRect )
 {
     if( IsMultiDisplay() )
         return GetDefaultDisplayNumber();
-
-    const unsigned int nScreens = GetScreenCount();
+    
+    const unsigned int nScreens = GetScreenCount();    
     unsigned int nBestMatchScreen = 0;
     unsigned long nOverlap = 0;
     for( unsigned int i = 0; i < nScreens; i++ )
@@ -1433,7 +1433,7 @@ unsigned int Application::GetBestScreen( const Rectangle& i_rRect )
     }
     if( nOverlap > 0 )
         return nBestMatchScreen;
-
+    
     // finally the screen which center is nearest to the rect is the best
     const Point aCenter( (i_rRect.Left() + i_rRect.Right())/2,
                          (i_rRect.Top() + i_rRect.Bottom())/2 );
@@ -1598,12 +1598,12 @@ Window* Application::GetDefDialogParent()
                 {
                     DBG_ERROR( "Window hierarchy corrupted!" );
                     pSVData->maWinData.mpFocusWin = NULL;   // avoid further access
-                    return NULL;
+                    return NULL;       
                 }
-
+    
                 // MAV: before the implementation has used only decorated windows,
                 //      but it is not true in case of ActiveX or plugin scenario,
-                //      so this check is commented out
+                //      so this check is commented out 
                 // if( pWin->mpWindowImpl->mpFrameWindow->GetStyle() & (WB_MOVEABLE | WB_SIZEABLE) )
                     return pWin->mpWindowImpl->mpFrameWindow->ImplGetWindow();
                 // else
@@ -2041,7 +2041,7 @@ BOOL InitAccessBridge( BOOL bShowCancel, BOOL &rCancelled )
     (void) rCancelled; // unused
 #else
     bRet = ImplInitAccessBridge( bShowCancel, rCancelled );
-
+    
     if( !bRet && bShowCancel && !rCancelled )
     {
         // disable accessibility if the user chooses to continue
diff --git a/vcl/source/app/svdata.cxx b/vcl/source/app/svdata.cxx
index f8b0d1d3379f..a81a5ee13c07 100644
--- a/vcl/source/app/svdata.cxx
+++ b/vcl/source/app/svdata.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
@@ -78,7 +78,7 @@ using namespace rtl;
 
 namespace
 {
-    struct private_aImplSVData :
+    struct private_aImplSVData : 
         public rtl::Static<ImplSVData, private_aImplSVData> {};
 }
 
@@ -182,7 +182,7 @@ Window* ImplGetDefaultWindow()
 
     // First test if we already have a default window.
     // Don't only place a single if..else inside solar mutex lockframe
-    // because then we might have to wait for the solar mutex what is not neccessary
+    // because then we might have to wait for the solar mutex what is not neccessary 
     // if we already have a default window.
 
     if ( !pSVData->mpDefaultWin )
@@ -215,7 +215,7 @@ ResMgr* ImplGetResMgr()
     {
         ::com::sun::star::lang::Locale aLocale = Application::GetSettings().GetUILocale();
         pSVData->mpResMgr = ResMgr::SearchCreateResMgr( VCL_CREATERESMGR_NAME( vcl ), aLocale );
-
+        
         static bool bMessageOnce = false;
         if( !pSVData->mpResMgr && ! bMessageOnce )
         {
@@ -236,7 +236,7 @@ ResId VclResId( sal_Int32 nId )
     ResMgr* pMgr = ImplGetResMgr();
     if( ! pMgr )
         throw std::bad_alloc();
-
+    
     return ResId( nId, *pMgr );
 }
 
@@ -255,7 +255,7 @@ public:
     AccessBridgeCurrentContext(
         const com::sun::star::uno::Reference< com::sun::star::uno::XCurrentContext > &context ) :
         m_prevContext( context ) {}
-
+    
     // XCurrentContext
     virtual com::sun::star::uno::Any SAL_CALL getValueByName( const rtl::OUString& Name )
         throw (com::sun::star::uno::RuntimeException);
@@ -311,7 +311,7 @@ bool ImplInitAccessBridge(BOOL bAllowCancel, BOOL &rCancelled)
 
             if( xFactory.is() )
             {
-                Reference< XExtendedToolkit > xToolkit =
+                Reference< XExtendedToolkit > xToolkit = 
                     Reference< XExtendedToolkit >(Application::GetVCLToolkit(), UNO_QUERY);
 
                 Sequence< Any > arguments(1);
@@ -321,7 +321,7 @@ bool ImplInitAccessBridge(BOOL bAllowCancel, BOOL &rCancelled)
                 // for a disabled user. Use native message boxes which are accessible without java support.
                 // No need to do this when activated by Tools-Options dialog ..
                 if( bAllowCancel )
-                {
+                { 
                     // customize the java-not-available-interaction-handler entry within the
                     // current context when called at startup.
                     com::sun::star::uno::ContextLayer layer(
@@ -329,22 +329,22 @@ bool ImplInitAccessBridge(BOOL bAllowCancel, BOOL &rCancelled)
 
                     pSVData->mxAccessBridge = xFactory->createInstanceWithArguments(
                             OUString::createFromAscii( "com.sun.star.accessibility.AccessBridge" ),
-                            arguments
+                            arguments 
                         );
                 }
                 else
                 {
                     pSVData->mxAccessBridge = xFactory->createInstanceWithArguments(
                             OUString::createFromAscii( "com.sun.star.accessibility.AccessBridge" ),
-                            arguments
+                            arguments 
                         );
                 }
-
+                    
                 if( !pSVData->mxAccessBridge.is() )
                     bSuccess = false;
             }
         }
-
+        
         return bSuccess;
     }
 
@@ -369,7 +369,7 @@ bool ImplInitAccessBridge(BOOL bAllowCancel, BOOL &rCancelled)
             if( SALSYSTEM_SHOWNATIVEMSGBOX_BTN_CANCEL == ret )
                 rCancelled = TRUE;
         }
-
+        
         return false;
     }
 
@@ -394,7 +394,7 @@ bool ImplInitAccessBridge(BOOL bAllowCancel, BOOL &rCancelled)
             if( SALSYSTEM_SHOWNATIVEMSGBOX_BTN_CANCEL == ret )
                 rCancelled = TRUE;
         }
-
+        
         return false;
     }
 
@@ -419,7 +419,7 @@ bool ImplInitAccessBridge(BOOL bAllowCancel, BOOL &rCancelled)
             if( SALSYSTEM_SHOWNATIVEMSGBOX_BTN_CANCEL == ret )
                 rCancelled = TRUE;
         }
-
+        
         return false;
     }
 
@@ -444,7 +444,7 @@ bool ImplInitAccessBridge(BOOL bAllowCancel, BOOL &rCancelled)
             if( SALSYSTEM_SHOWNATIVEMSGBOX_BTN_CANCEL == ret )
                 rCancelled = TRUE;
         }
-
+        
         return false;
     }
 
@@ -477,8 +477,8 @@ bool ImplInitAccessBridge(BOOL bAllowCancel, BOOL &rCancelled)
                     aMessage += String(ResId(SV_ACCESSERROR_OK_CANCEL_MSG, *pResMgr));
 
                     int ret = ImplGetSalSystem()->ShowNativeMessageBox(
-                        aTitle,
-                        ReplaceJavaErrorMessages(aMessage),
+                        aTitle, 
+                        ReplaceJavaErrorMessages(aMessage), 
                         SALSYSTEM_SHOWNATIVEMSGBOX_BTNCOMBI_OK_CANCEL,
                         SALSYSTEM_SHOWNATIVEMSGBOX_BTN_CANCEL);
 
@@ -491,14 +491,14 @@ bool ImplInitAccessBridge(BOOL bAllowCancel, BOOL &rCancelled)
                     // The user tried to activate accessibility support using Tools-Options dialog,
                     // so we don't offer to terminate here !
                     ImplGetSalSystem()->ShowNativeMessageBox(
-                        aTitle,
-                        ReplaceJavaErrorMessages(aMessage),
+                        aTitle, 
+                        ReplaceJavaErrorMessages(aMessage), 
                         SALSYSTEM_SHOWNATIVEMSGBOX_BTNCOMBI_OK,
                         SALSYSTEM_SHOWNATIVEMSGBOX_BTN_OK);
                 }
             }
         }
-
+        
         return false;
     }
 
diff --git a/vcl/source/app/svmain.cxx b/vcl/source/app/svmain.cxx
index 4efa2b659e7c..b421b04f5e2c 100644
--- a/vcl/source/app/svmain.cxx
+++ b/vcl/source/app/svmain.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
@@ -139,9 +139,9 @@ public:
         if ( nVCLException )
         {
             bIn = TRUE;
-
+        
             ::vos::OGuard aLock(&Application::GetSolarMutex());
-
+        
             // Timer nicht mehr anhalten, da ansonsten die UAE-Box
             // auch nicht mehr gepaintet wird
             ImplSVData* pSVData = ImplGetSVData();
@@ -183,10 +183,10 @@ BOOL ImplSVMain()
         pSVData->mpApp->Main();
         pSVData->maAppData.mbInAppMain = FALSE;
     }
-
+    
     if( pSVData->mxDisplayConnection.is() )
     {
-        vcl::DisplayConnection* pConnection =
+        vcl::DisplayConnection* pConnection = 
             dynamic_cast<vcl::DisplayConnection*>(pSVData->mxDisplayConnection.get());
 
         if( pConnection )
@@ -195,7 +195,7 @@ BOOL ImplSVMain()
     }
 
     // This is a hack to work around the problem of the asynchronous nature
-    // of bridging accessibility through Java: on shutdown there might still
+    // of bridging accessibility through Java: on shutdown there might still 
     // be some events in the AWT EventQueue, which need the SolarMutex which
     // - on the other hand - is destroyed in DeInitVCL(). So empty the queue
     // here ..
@@ -271,7 +271,7 @@ BOOL InitVCL( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XM
 
     if( pExceptionHandler != NULL )
         return FALSE;
-
+    
     if( ! ImplGetSVData() )
         ImplInitSVData();
 
@@ -343,7 +343,7 @@ void DeInitVCL()
 {
     ImplSVData* pSVData = ImplGetSVData();
     pSVData->mbDeInit = TRUE;
-
+    
     vcl::DeleteOnDeinitBase::ImplDeleteOnDeInit();
 
     // give ime status a chance to destroy its own windows
@@ -489,7 +489,7 @@ void DeInitVCL()
             pSVData->maAppData.mpSettings->GetSysLocale().GetOptions().RemoveListener( pSVData->maAppData.mpCfgListener );
             delete pSVData->maAppData.mpCfgListener;
         }
-
+        
         delete pSVData->maAppData.mpSettings;
         pSVData->maAppData.mpSettings = NULL;
     }
diff --git a/vcl/source/app/svmainhook.cxx b/vcl/source/app/svmainhook.cxx
index 413b28b3affb..2b1a854dabed 100644
--- a/vcl/source/app/svmainhook.cxx
+++ b/vcl/source/app/svmainhook.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
@@ -68,7 +68,7 @@ static void RunSVMain(void *pData)
     // running
     while (!CFRunLoopIsWaiting(*tcx->pRunLoopRef))
         usleep(100);
-
+        
     *tcx->pRet = ImplSVMain();
 
     // Force exit since some JVMs won't shutdown when only exit() is invoked
diff --git a/vcl/source/app/timer.cxx b/vcl/source/app/timer.cxx
index 356608e7fbfc..277e6850fb6a 100644
--- a/vcl/source/app/timer.cxx
+++ b/vcl/source/app/timer.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
@@ -43,7 +43,7 @@
 
 // =======================================================================
 
-#define MAX_TIMER_PERIOD    ((ULONG)0xFFFFFFFF)
+#define MAX_TIMER_PERIOD	((ULONG)0xFFFFFFFF)
 
 // ---------------------
 // - TimeManager-Types -
@@ -51,20 +51,20 @@
 
 struct ImplTimerData
 {
-    ImplTimerData*  mpNext;         // Pointer to the next Instance
-    Timer*          mpSVTimer;      // Pointer to SV Timer instance
-    ULONG           mnUpdateTime;   // Last Update Time
-    ULONG           mnTimerUpdate;  // TimerCallbackProcs on stack
-    BOOL            mbDelete;       // Wurde Timer waehren Update() geloescht
-    BOOL            mbInTimeout;    // Befinden wir uns im Timeout-Handler
+    ImplTimerData*	mpNext; 		// Pointer to the next Instance
+    Timer*			mpSVTimer;		// Pointer to SV Timer instance
+    ULONG			mnUpdateTime;	// Last Update Time
+    ULONG			mnTimerUpdate;	// TimerCallbackProcs on stack
+    BOOL			mbDelete;		// Wurde Timer waehren Update() geloescht
+    BOOL			mbInTimeout;	// Befinden wir uns im Timeout-Handler
 };
 
 // =======================================================================
 
 void Timer::ImplDeInitTimer()
 {
-    ImplSVData*     pSVData = ImplGetSVData();
-    ImplTimerData*  pTimerData = pSVData->mpFirstTimerData;
+    ImplSVData* 	pSVData = ImplGetSVData();
+    ImplTimerData*	pTimerData = pSVData->mpFirstTimerData;
 
     if ( pTimerData )
     {
@@ -81,8 +81,8 @@ void Timer::ImplDeInitTimer()
         }
         while ( pTimerData );
 
-        pSVData->mpFirstTimerData   = NULL;
-        pSVData->mnTimerPeriod      = 0;
+        pSVData->mpFirstTimerData	= NULL;
+        pSVData->mnTimerPeriod		= 0;
         delete pSVData->mpSalTimer;
         pSVData->mpSalTimer = NULL;
     }
@@ -106,12 +106,12 @@ static void ImplStartTimer( ImplSVData* pSVData, ULONG nMS )
 
 void Timer::ImplTimerCallbackProc()
 {
-    ImplSVData*     pSVData = ImplGetSVData();
-    ImplTimerData*  pTimerData;
-    ImplTimerData*  pPrevTimerData;
-    ULONG           nMinPeriod = MAX_TIMER_PERIOD;
-    ULONG           nDeltaTime;
-    ULONG           nTime = Time::GetSystemTicks();
+    ImplSVData* 	pSVData = ImplGetSVData();
+    ImplTimerData*	pTimerData;
+    ImplTimerData*	pPrevTimerData;
+    ULONG			nMinPeriod = MAX_TIMER_PERIOD;
+    ULONG			nDeltaTime;
+    ULONG			nTime = Time::GetSystemTicks();
 
     if ( pSVData->mbNoCallTimer )
         return;
@@ -221,21 +221,21 @@ void Timer::ImplTimerCallbackProc()
 
 Timer::Timer()
 {
-    mpTimerData     = NULL;
-    mnTimeout       = 1;
-    mbAuto          = FALSE;
-    mbActive        = FALSE;
+    mpTimerData 	= NULL;
+    mnTimeout		= 1;
+    mbAuto			= FALSE;
+    mbActive		= FALSE;
 }
 
 // -----------------------------------------------------------------------
 
 Timer::Timer( const Timer& rTimer )
 {
-    mpTimerData     = NULL;
-    mnTimeout       = rTimer.mnTimeout;
-    mbAuto          = FALSE;
-    mbActive        = FALSE;
-    maTimeoutHdl    = rTimer.maTimeoutHdl;
+    mpTimerData 	= NULL;
+    mnTimeout		= rTimer.mnTimeout;
+    mbAuto			= FALSE;
+    mbActive		= FALSE;
+    maTimeoutHdl	= rTimer.maTimeoutHdl;
 
     if ( rTimer.IsActive() )
         Start();
@@ -294,12 +294,12 @@ void Timer::Start()
         }
 
         // insert timer and start
-        mpTimerData                 = new ImplTimerData;
-        mpTimerData->mpSVTimer      = this;
-        mpTimerData->mnUpdateTime   = Time::GetSystemTicks();
-        mpTimerData->mnTimerUpdate  = pSVData->mnTimerUpdate;
-        mpTimerData->mbDelete       = FALSE;
-        mpTimerData->mbInTimeout    = FALSE;
+        mpTimerData 				= new ImplTimerData;
+        mpTimerData->mpSVTimer		= this;
+        mpTimerData->mnUpdateTime	= Time::GetSystemTicks();
+        mpTimerData->mnTimerUpdate	= pSVData->mnTimerUpdate;
+        mpTimerData->mbDelete		= FALSE;
+        mpTimerData->mbInTimeout	= FALSE;
 
         // !!!!! Wegen SFX hinten einordnen !!!!!
         ImplTimerData* pPrev = NULL;
@@ -324,9 +324,9 @@ void Timer::Start()
     }
     else
     {
-        mpTimerData->mnUpdateTime    = Time::GetSystemTicks();
-        mpTimerData->mnTimerUpdate   = pSVData->mnTimerUpdate;
-        mpTimerData->mbDelete        = FALSE;
+        mpTimerData->mnUpdateTime	 = Time::GetSystemTicks();
+        mpTimerData->mnTimerUpdate	 = pSVData->mnTimerUpdate;
+        mpTimerData->mbDelete		 = FALSE;
     }
 }
 
@@ -347,9 +347,9 @@ Timer& Timer::operator=( const Timer& rTimer )
     if ( IsActive() )
         Stop();
 
-    mbActive        = FALSE;
-    mnTimeout       = rTimer.mnTimeout;
-    maTimeoutHdl    = rTimer.maTimeoutHdl;
+    mbActive		= FALSE;
+    mnTimeout		= rTimer.mnTimeout;
+    maTimeoutHdl	= rTimer.maTimeoutHdl;
 
     if ( rTimer.IsActive() )
         Start();
diff --git a/vcl/source/app/unohelp.cxx b/vcl/source/app/unohelp.cxx
index 237156a5f9f7..ecc69da75762 100644
--- a/vcl/source/app/unohelp.cxx
+++ b/vcl/source/app/unohelp.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
@@ -61,13 +61,13 @@
 using namespace ::com::sun::star;
 using namespace ::rtl;
 
-#define DOSTRING( x )                       #x
-#define STRING( x )                         DOSTRING( x )
+#define DOSTRING( x )			   			#x
+#define STRING( x )				   			DOSTRING( x )
 
 struct VCLRegServiceInfo
 {
-    const sal_Char*     pLibName;
-    sal_Bool            bHasSUPD;
+    const sal_Char*		pLibName;
+    sal_Bool			bHasSUPD;
 };
 
 static VCLRegServiceInfo aVCLComponentsArray[] =
@@ -110,7 +110,7 @@ uno::Reference< lang::XMultiServiceFactory > vcl::unohelper::GetMultiServiceFact
             pSVData->maAppData.mxMSF = ::cppu::createRegistryServiceFactory( aTempFileName, rtl::OUString(), sal_False );
             uno::Reference < registry::XImplementationRegistration > xReg(
                 pSVData->maAppData.mxMSF->createInstance( OUString::createFromAscii( "com.sun.star.registry.ImplementationRegistration" )), uno::UNO_QUERY );
-
+    
             if( xReg.is() )
             {
                 sal_Int32 nCompCount = 0;
@@ -237,6 +237,6 @@ void vcl::unohelper::NotifyAccessibleStateEventGlobally( const ::com::sun::star:
             if ( nType == ::com::sun::star::accessibility::AccessibleStateType::FOCUSED )
                 xExtToolkit->fireFocusLost( rEventObject.Source );
         }
-
+        
     }
 }
diff --git a/vcl/source/app/unohelp2.cxx b/vcl/source/app/unohelp2.cxx
index 5b6d7c73416a..ac71114b33eb 100644
--- a/vcl/source/app/unohelp2.cxx
+++ b/vcl/source/app/unohelp2.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
@@ -47,7 +47,7 @@ namespace vcl { namespace unohelper {
     TextDataObject::~TextDataObject()
     {
     }
-
+            
     void TextDataObject::CopyStringTo( const String& rContent,
         const uno::Reference< datatransfer::clipboard::XClipboard >& rxClipboard )
     {
@@ -109,4 +109,4 @@ namespace vcl { namespace unohelper {
         return ( nT == SOT_FORMAT_STRING );
     }
 
-}}  // namespace vcl::unohelper
+}}	// namespace vcl::unohelper
diff --git a/vcl/source/app/vclevent.cxx b/vcl/source/app/vclevent.cxx
index 0c98da48e6d0..64fca5bf5ab9 100644
--- a/vcl/source/app/vclevent.cxx
+++ b/vcl/source/app/vclevent.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
@@ -105,7 +105,7 @@ VclEventListeners2::VclEventListeners2()
 VclEventListeners2::~VclEventListeners2()
 {
 }
-
+    
 void VclEventListeners2::addListener( const Link& i_rLink )
 {
     // ensure uniqueness
@@ -134,7 +134,7 @@ void VclEventListeners2::removeListener( const Link& i_rLink )
 void VclEventListeners2::callListeners( VclSimpleEvent* i_pEvent )
 {
     vcl::DeletionListener aDel( this );
-
+    
     m_aIterators.push_back(ListenerIt(m_aListeners.begin()));
     size_t nIndex = m_aIterators.size() - 1;
     while( ! aDel.isDeleted() && m_aIterators[ nIndex ].m_aIt != m_aListeners.end() )
diff --git a/vcl/source/components/display.cxx b/vcl/source/components/display.cxx
index 6d7653968229..9b103025ac35 100644
--- a/vcl/source/components/display.cxx
+++ b/vcl/source/components/display.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
@@ -179,7 +179,7 @@ Sequence< OUString > SAL_CALL DisplayInfo::getSupportedServiceNames(  ) throw (R
 }
 
 // ====================================================================
-
+    
 class DisplayAccess : public ::cppu::WeakAggImplHelper4< XPropertySet, XPropertySetInfo, XIndexAccess, XServiceInfo >
 {
 public:
@@ -283,7 +283,7 @@ Property SAL_CALL DisplayAccess::getPropertyByName( const OUString& aName ) thro
 {
     if( aName.equalsAscii( pMultiDisplayName ) )
         return Property( aName, 0, ::getCppuType( (sal_Bool const *)0 ), PropertyAttribute::READONLY );
-
+        
     if( aName.equalsAscii( pDefaultDisplayName ) )
         return Property( aName, 0, ::getCppuType( (sal_Int32 const *)0 ), PropertyAttribute::READONLY );
     throw UnknownPropertyException();
diff --git a/vcl/source/components/dtranscomp.cxx b/vcl/source/components/dtranscomp.cxx
index 9c88deccec23..5c785efc7355 100644
--- a/vcl/source/components/dtranscomp.cxx
+++ b/vcl/source/components/dtranscomp.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
@@ -91,7 +91,7 @@ public:
      * XServiceInfo
      */
 
-    virtual rtl::OUString SAL_CALL getImplementationName() throw( RuntimeException );
+    virtual rtl::OUString SAL_CALL getImplementationName() throw( RuntimeException );        
     virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw( RuntimeException );
     virtual Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() throw( RuntimeException );
 
@@ -102,16 +102,16 @@ public:
      * XClipboard
      */
 
-    virtual Reference< ::com::sun::star::datatransfer::XTransferable > SAL_CALL getContents()
+    virtual Reference< ::com::sun::star::datatransfer::XTransferable > SAL_CALL getContents() 
         throw(RuntimeException);
 
-    virtual void SAL_CALL setContents(
-        const Reference< ::com::sun::star::datatransfer::XTransferable >& xTrans,
-        const Reference< ::com::sun::star::datatransfer::clipboard::XClipboardOwner >& xClipboardOwner )
+    virtual void SAL_CALL setContents( 
+        const Reference< ::com::sun::star::datatransfer::XTransferable >& xTrans, 
+        const Reference< ::com::sun::star::datatransfer::clipboard::XClipboardOwner >& xClipboardOwner ) 
         throw(RuntimeException);
 
-    virtual ::rtl::OUString SAL_CALL getName()
-        throw(RuntimeException);
+    virtual ::rtl::OUString SAL_CALL getName() 
+        throw(RuntimeException);	   
 
     /*
      * XClipboardEx
@@ -123,13 +123,13 @@ public:
     /*
      * XClipboardNotifier
      */
-    virtual void SAL_CALL addClipboardListener(
-        const Reference< ::com::sun::star::datatransfer::clipboard::XClipboardListener >& listener )
+    virtual void SAL_CALL addClipboardListener( 
+        const Reference< ::com::sun::star::datatransfer::clipboard::XClipboardListener >& listener ) 
         throw(RuntimeException);
 
-    virtual void SAL_CALL removeClipboardListener(
-        const Reference< ::com::sun::star::datatransfer::clipboard::XClipboardListener >& listener )
-        throw(RuntimeException);
+    virtual void SAL_CALL removeClipboardListener( 
+        const Reference< ::com::sun::star::datatransfer::clipboard::XClipboardListener >& listener ) 
+        throw(RuntimeException);	 
 };
 
 GenericClipboard::~GenericClipboard()
@@ -174,9 +174,9 @@ Reference< ::com::sun::star::datatransfer::XTransferable > GenericClipboard::get
 {
     return m_aContents;
 }
-
-void GenericClipboard::setContents(
-        const Reference< ::com::sun::star::datatransfer::XTransferable >& xTrans,
+        
+void GenericClipboard::setContents( 
+        const Reference< ::com::sun::star::datatransfer::XTransferable >& xTrans, 
         const Reference< ::com::sun::star::datatransfer::clipboard::XClipboardOwner >& xClipboardOwner )
     throw( RuntimeException )
 {
@@ -191,7 +191,7 @@ void GenericClipboard::setContents(
     aEv.Contents = m_aContents;
 
     aGuard.clear();
-
+    
     if( xOldOwner.is() && xOldOwner != xClipboardOwner )
         xOldOwner->lostOwnership( this, xOldContents );
     for( std::list< Reference< datatransfer::clipboard::XClipboardListener > >::iterator it =
@@ -223,7 +223,7 @@ void GenericClipboard::removeClipboardListener( const Reference< datatransfer::c
     throw( RuntimeException )
 {
     osl::ClearableMutexGuard aGuard( m_aMutex );
-
+    
     m_aListeners.remove( listener );
 }
 
@@ -317,11 +317,11 @@ class GenericDragSource : public cppu::WeakComponentImplHelper2<
 public:
     GenericDragSource() : cppu::WeakComponentImplHelper2< datatransfer::dnd::XDragSource, XInitialization >( m_aMutex ) {}
     virtual ~GenericDragSource();
-
+    
     // XDragSource
-    virtual sal_Bool    SAL_CALL isDragImageSupported() throw();
-    virtual sal_Int32   SAL_CALL getDefaultCursor( sal_Int8 dragAction ) throw();
-    virtual void        SAL_CALL startDrag(
+    virtual sal_Bool	SAL_CALL isDragImageSupported() throw();
+    virtual sal_Int32	SAL_CALL getDefaultCursor( sal_Int8 dragAction ) throw();
+    virtual void		SAL_CALL startDrag(
                                      const datatransfer::dnd::DragGestureEvent& trigger,
                                      sal_Int8 sourceActions, sal_Int32 cursor, sal_Int32 image,
                                      const Reference< datatransfer::XTransferable >& transferable,
@@ -329,15 +329,15 @@ public:
                                      ) throw();
 
     // XInitialization
-    virtual void        SAL_CALL initialize( const Sequence< Any >& arguments ) throw( ::com::sun::star::uno::Exception );
-
+    virtual void		SAL_CALL initialize( const Sequence< Any >& arguments ) throw( ::com::sun::star::uno::Exception );
+    
     static Sequence< OUString > getSupportedServiceNames_static()
     {
         Sequence< OUString > aRet( 1 );
         aRet[0] = OUString::createFromAscii( "com.sun.star.datatransfer.dnd.GenericDragSource" );
         return aRet;
     }
-
+    
     static OUString getImplementationName_static()
     {
         return OUString::createFromAscii( "com.sun.star.datatransfer.dnd.VclGenericDragSource" );
@@ -433,15 +433,15 @@ public:
     virtual ~GenericDropTarget();
 
     // XInitialization
-    virtual void        SAL_CALL initialize( const Sequence< Any >& args ) throw ( Exception );
+    virtual void		SAL_CALL initialize( const Sequence< Any >& args ) throw ( Exception );
 
     // XDropTarget
-    virtual void        SAL_CALL addDropTargetListener( const Reference< ::com::sun::star::datatransfer::dnd::XDropTargetListener >& ) throw();
-    virtual void        SAL_CALL removeDropTargetListener( const Reference< ::com::sun::star::datatransfer::dnd::XDropTargetListener >& ) throw();
-    virtual sal_Bool    SAL_CALL isActive() throw();
-    virtual void        SAL_CALL setActive( sal_Bool active ) throw();
-    virtual sal_Int8    SAL_CALL getDefaultActions() throw();
-    virtual void        SAL_CALL setDefaultActions( sal_Int8 actions ) throw();
+    virtual void		SAL_CALL addDropTargetListener( const Reference< ::com::sun::star::datatransfer::dnd::XDropTargetListener >& ) throw();
+    virtual void		SAL_CALL removeDropTargetListener( const Reference< ::com::sun::star::datatransfer::dnd::XDropTargetListener >& ) throw();
+    virtual sal_Bool	SAL_CALL isActive() throw();
+    virtual void		SAL_CALL setActive( sal_Bool active ) throw();
+    virtual sal_Int8 	SAL_CALL getDefaultActions() throw();
+    virtual void		SAL_CALL setDefaultActions( sal_Int8 actions ) throw();
 
     static Sequence< OUString > getSupportedServiceNames_static()
     {
@@ -533,7 +533,7 @@ Reference< XInterface > SAL_CALL DropTarget_createInstance( const Reference< XMu
 } // namespace vcl
 
 /*
-*   SalInstance generic
+*   SalInstance generic          
 */
 Reference< XInterface > SalInstance::CreateClipboard( const Sequence< Any >& )
 {
diff --git a/vcl/source/components/factory.cxx b/vcl/source/components/factory.cxx
index 6bed493cacde..ae40ad77d0d0 100644
--- a/vcl/source/components/factory.cxx
+++ b/vcl/source/components/factory.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
@@ -91,7 +91,7 @@ extern "C" {
             try
             {
                 Reference< ::com::sun::star::registry::XRegistryKey > xKey( reinterpret_cast< ::com::sun::star::registry::XRegistryKey* >( pXUnoKey ) );
-
+                
                 OUStringBuffer aImplName(64);
                 aImplName.appendAscii( "/" );
                 aImplName.append( vcl_session_getImplementationName() );
diff --git a/vcl/source/components/fontident.cxx b/vcl/source/components/fontident.cxx
index ad309e4f2560..6f9f169eacc2 100644
--- a/vcl/source/components/fontident.cxx
+++ b/vcl/source/components/fontident.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
@@ -70,10 +70,10 @@ FontIdentificator() {}
     virtual OUString SAL_CALL getImplementationName(  ) throw (RuntimeException);
     virtual ::sal_Bool SAL_CALL supportsService( const OUString& ) throw (RuntimeException);
     virtual Sequence< OUString > SAL_CALL getSupportedServiceNames(  ) throw (RuntimeException);
-
+    
     // XInitialization
     virtual void SAL_CALL initialize( const Sequence< Any >& ) throw (Exception, RuntimeException);
-
+    
     // XMaterialHolder
     virtual Any SAL_CALL getMaterial() throw(RuntimeException);
 
diff --git a/vcl/source/control/button.cxx b/vcl/source/control/button.cxx
index d4f29e224e7b..80d5fc527553 100644
--- a/vcl/source/control/button.cxx
+++ b/vcl/source/control/button.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
@@ -408,7 +408,7 @@ void Button::ImplDrawAlignedImage( OutputDevice* pDev, Point& rPos,
 
     aImageSize.Width()  = CalcZoom( aImageSize.Width() );
     aImageSize.Height() = CalcZoom( aImageSize.Height() );
-
+    
     // Drawing text or symbol only is simple, use style and output rectangle
     if ( bHasSymbol && !bDrawImage && !bDrawText )
     {
@@ -516,7 +516,7 @@ void Button::ImplDrawAlignedImage( OutputDevice* pDev, Point& rPos,
 
             if ( aTSSize.Height() < aTextSize.Height() )
                 aTSSize.Height() = aTextSize.Height();
-
+            
             if( bAddImageSep && bDrawImage )
             {
                 long nDiff = (aImageSize.Height() - aTextSize.Height()) / 3;
@@ -1337,11 +1337,11 @@ void PushButton::ImplDrawPushButton( bool bLayout )
                 ImplControlValue    aControlValue;
                 ControlState        nState = 0;
 
-                if ( mbPressed )                        nState |= CTRL_STATE_PRESSED;
-                if ( ImplGetButtonState() & BUTTON_DRAW_PRESSED )   nState |= CTRL_STATE_PRESSED;
-                if ( HasFocus() )                       nState |= CTRL_STATE_FOCUSED;
-                if ( ImplGetButtonState() & BUTTON_DRAW_DEFAULT )   nState |= CTRL_STATE_DEFAULT;
-                if ( Window::IsEnabled() )              nState |= CTRL_STATE_ENABLED;
+                if ( mbPressed ) 						nState |= CTRL_STATE_PRESSED;
+                if ( ImplGetButtonState() & BUTTON_DRAW_PRESSED )	nState |= CTRL_STATE_PRESSED;
+                if ( HasFocus() )						nState |= CTRL_STATE_FOCUSED;
+                if ( ImplGetButtonState() & BUTTON_DRAW_DEFAULT )	nState |= CTRL_STATE_DEFAULT;
+                if ( Window::IsEnabled() ) 				nState |= CTRL_STATE_ENABLED;
 
                 if ( IsMouseOver() && aInRect.IsInside( GetPointerPosPixel() ) )
                     nState |= CTRL_STATE_ROLLOVER;
@@ -1359,18 +1359,18 @@ void PushButton::ImplDrawPushButton( bool bLayout )
     if ( (bNativeOK=IsNativeControlSupported(CTRL_PUSHBUTTON, PART_ENTIRE_CONTROL)) == TRUE )
     {
         PushButtonValue aControlValue;
-        Rectangle        aCtrlRegion( aInRect );
-        ControlState     nState = 0;
+        Rectangle		 aCtrlRegion( aInRect );
+        ControlState	 nState = 0;
 
         if ( mbPressed || IsChecked() )                   nState |= CTRL_STATE_PRESSED;
         if ( ImplGetButtonState() & BUTTON_DRAW_PRESSED ) nState |= CTRL_STATE_PRESSED;
-        if ( HasFocus() )                       nState |= CTRL_STATE_FOCUSED;
-        if ( ImplGetButtonState() & BUTTON_DRAW_DEFAULT )   nState |= CTRL_STATE_DEFAULT;
-        if ( Window::IsEnabled() )              nState |= CTRL_STATE_ENABLED;
+        if ( HasFocus() )						nState |= CTRL_STATE_FOCUSED;
+        if ( ImplGetButtonState() & BUTTON_DRAW_DEFAULT )	nState |= CTRL_STATE_DEFAULT;
+        if ( Window::IsEnabled() ) 				nState |= CTRL_STATE_ENABLED;
 
         if ( bRollOver )
             nState |= CTRL_STATE_ROLLOVER;
-
+        
         if( GetStyle() & WB_BEVELBUTTON )
             aControlValue.mbBevelButton = true;
 
@@ -1385,7 +1385,7 @@ void PushButton::ImplDrawPushButton( bool bLayout )
         aInRect.Bottom()-=4;
         aInRect.Left()+=4;
         aInRect.Right()-=4;
-
+        
         // prepare single line hint (needed on mac to decide between normal push button and
         // rectangular bevel button look)
         Size aFontSize( Application::GetSettings().GetStyleSettings().GetPushButtonFont().GetSize() );
@@ -1456,8 +1456,8 @@ void PushButton::ImplSetDefButton( BOOL bSet )
         Rectangle aCtrlRect( 0, 0, 80, 20 ); // use a constant size to avoid accumulating
                                              // will not work if the theme has dynamic adornment sizes
         ImplControlValue aControlValue;
-        Rectangle        aCtrlRegion( aCtrlRect );
-        ControlState     nState = CTRL_STATE_DEFAULT|CTRL_STATE_ENABLED;
+        Rectangle		 aCtrlRegion( aCtrlRect );
+        ControlState	 nState = CTRL_STATE_DEFAULT|CTRL_STATE_ENABLED;
 
         // get native size of a 'default' button
         // and adjust the VCL button if more space for adornment is required
@@ -2041,7 +2041,7 @@ Size PushButton::CalcMinimumSize( long nMaxWidth ) const
     }
 
     return CalcWindowSize( aSize );
-}
+}    
 
 Size PushButton::GetOptimalSize(WindowSizeType eType) const
 {
@@ -2351,14 +2351,14 @@ void RadioButton::ImplDrawRadioButtonState()
     // no native drawing for image radio buttons
     if ( !maImage && (bNativeOK=IsNativeControlSupported(CTRL_RADIOBUTTON, PART_ENTIRE_CONTROL)) == TRUE )
     {
-        ImplControlValue            aControlValue( mbChecked ? BUTTONVALUE_ON : BUTTONVALUE_OFF );
-        Rectangle                   aCtrlRect( maStateRect.TopLeft(), maStateRect.GetSize() );
-        ControlState                nState = 0;
+        ImplControlValue		    aControlValue( mbChecked ? BUTTONVALUE_ON : BUTTONVALUE_OFF );
+        Rectangle					aCtrlRect( maStateRect.TopLeft(), maStateRect.GetSize() );
+        ControlState				nState = 0;
 
-        if ( ImplGetButtonState() & BUTTON_DRAW_PRESSED )   nState |= CTRL_STATE_PRESSED;
-        if ( HasFocus() )                       nState |= CTRL_STATE_FOCUSED;
-        if ( ImplGetButtonState() & BUTTON_DRAW_DEFAULT )   nState |= CTRL_STATE_DEFAULT;
-        if ( IsEnabled() )                      nState |= CTRL_STATE_ENABLED;
+        if ( ImplGetButtonState() & BUTTON_DRAW_PRESSED )	nState |= CTRL_STATE_PRESSED;
+        if ( HasFocus() ) 						nState |= CTRL_STATE_FOCUSED;
+        if ( ImplGetButtonState() & BUTTON_DRAW_DEFAULT )	nState |= CTRL_STATE_DEFAULT;
+        if ( IsEnabled() )						nState |= CTRL_STATE_ENABLED;
 
         if ( IsMouseOver() && maMouseRect.IsInside( GetPointerPosPixel() ) )
             nState |= CTRL_STATE_ROLLOVER;
@@ -2470,8 +2470,8 @@ void RadioButton::ImplDraw( OutputDevice* pDev, ULONG nDrawFlags,
     WinBits                 nWinStyle = GetStyle();
     XubString               aText( GetText() );
     Rectangle               aRect( rPos, rSize );
-    MetricVector*           pVector = bLayout ? &mpControlData->mpLayoutData->m_aUnicodeBoundRects : NULL;
-    String*                 pDisplayText = bLayout ? &mpControlData->mpLayoutData->m_aDisplayText : NULL;
+    MetricVector*			pVector = bLayout ? &mpControlData->mpLayoutData->m_aUnicodeBoundRects : NULL;
+    String*					pDisplayText = bLayout ? &mpControlData->mpLayoutData->m_aDisplayText : NULL;
 
     pDev->Push( PUSH_CLIPREGION );
     pDev->IntersectClipRegion( Rectangle( rPos, rSize ) );
@@ -2633,7 +2633,7 @@ void RadioButton::GetRadioButtonGroup( std::vector< RadioButton* >& io_rGroup, b
 {
     // empty the list
     io_rGroup.clear();
-
+    
     // go back to first in group;
     Window* pFirst = const_cast<RadioButton*>(this);
     while( ( pFirst->GetStyle() & WB_GROUP ) == 0 )
@@ -3214,8 +3214,8 @@ Size RadioButton::ImplGetRadioImageSize() const
     {
         ImplControlValue aControlValue;
         // #i45896# workaround gcc3.3 temporary problem
-        Rectangle        aCtrlRegion( Point( 0, 0 ), GetSizePixel() );
-        ControlState     nState = CTRL_STATE_DEFAULT|CTRL_STATE_ENABLED;
+        Rectangle		 aCtrlRegion( Point( 0, 0 ), GetSizePixel() );
+        ControlState	 nState = CTRL_STATE_DEFAULT|CTRL_STATE_ENABLED;
         Rectangle aBoundingRgn, aContentRgn;
 
         // get native size of a radio button
@@ -3254,7 +3254,7 @@ static void LoadThemedImageList (const StyleSettings &rStyleSettings,
     Color aMaskColor(0x00, 0x00, 0xFF );
         DBG_ASSERT( sizeof(aColorAry1) == sizeof(aColorAry2), "aColorAry1 must match aColorAry2" );
     // FIXME: do we want the mask for the checkbox ?
-    pList->InsertFromHorizontalBitmap (rResId, nImages, &aMaskColor,
+    pList->InsertFromHorizontalBitmap (rResId, nImages, &aMaskColor, 
         aColorAry1, aColorAry2, sizeof(aColorAry1) / sizeof(Color));
 }
 
@@ -3340,21 +3340,21 @@ void RadioButton::ImplSetMinimumNWFSize()
     Size aCurSize( GetSizePixel() );
     Rectangle aCtrlRegion( Point( 0, 0 ), aCurSize );
     Rectangle aBoundingRgn, aContentRgn;
-
+    
     // get native size of a radiobutton
     if( GetNativeControlRegion( CTRL_RADIOBUTTON, PART_ENTIRE_CONTROL, aCtrlRegion,
                                 CTRL_STATE_DEFAULT|CTRL_STATE_ENABLED, aControlValue, rtl::OUString(),
                                 aBoundingRgn, aContentRgn ) )
     {
         Size aSize = aContentRgn.GetSize();
-
+        
         if( aSize.Height() > aCurSize.Height() )
         {
             aCurSize.Height() = aSize.Height();
             SetSizePixel( aCurSize );
         }
     }
-
+    
     Pop();
 }
 
@@ -3519,7 +3519,7 @@ void CheckBox::ImplInvalidateOrDrawCheckBoxState()
 
 void CheckBox::ImplDrawCheckBoxState()
 {
-    bool    bNativeOK = TRUE;
+    bool	bNativeOK = TRUE;
 
     if ( (bNativeOK=IsNativeControlSupported(CTRL_CHECKBOX, PART_ENTIRE_CONTROL)) == TRUE )
     {
@@ -3527,10 +3527,10 @@ void CheckBox::ImplDrawCheckBoxState()
         Rectangle           aCtrlRegion( maStateRect );
         ControlState        nState = 0;
 
-        if ( HasFocus() )                       nState |= CTRL_STATE_FOCUSED;
-        if ( ImplGetButtonState() & BUTTON_DRAW_DEFAULT )   nState |= CTRL_STATE_DEFAULT;
-        if ( ImplGetButtonState() & BUTTON_DRAW_PRESSED )   nState |= CTRL_STATE_PRESSED;
-        if ( IsEnabled() )                      nState |= CTRL_STATE_ENABLED;
+        if ( HasFocus() ) 						nState |= CTRL_STATE_FOCUSED;
+        if ( ImplGetButtonState() & BUTTON_DRAW_DEFAULT )	nState |= CTRL_STATE_DEFAULT;
+        if ( ImplGetButtonState() & BUTTON_DRAW_PRESSED )	nState |= CTRL_STATE_PRESSED;
+        if ( IsEnabled() )						nState |= CTRL_STATE_ENABLED;
 
         if ( meState == STATE_CHECK )
             aControlValue.setTristateVal( BUTTONVALUE_ON );
@@ -3570,7 +3570,7 @@ void CheckBox::ImplDraw( OutputDevice* pDev, ULONG nDrawFlags,
 {
     WinBits                 nWinStyle = GetStyle();
     XubString               aText( GetText() );
-
+    
     pDev->Push( PUSH_CLIPREGION | PUSH_LINECOLOR );
     pDev->IntersectClipRegion( Rectangle( rPos, rSize ) );
 
@@ -3644,12 +3644,12 @@ void CheckBox::ImplDraw( OutputDevice* pDev, ULONG nDrawFlags,
 
         ImplSetFocusRect( rStateRect );
     }
-
+    
     const int nLineSpace = 4;
     if( (GetStyle() & WB_CBLINESTYLE) != 0 &&
         rMouseRect.Right()-1-nLineSpace < rPos.X()+rSize.Width() )
     {
-        const StyleSettings&    rStyleSettings = GetSettings().GetStyleSettings();
+        const StyleSettings&	rStyleSettings = GetSettings().GetStyleSettings();
         if ( rStyleSettings.GetOptions() & STYLE_OPTION_MONO )
             SetLineColor( Color( COL_BLACK ) );
         else
@@ -4087,9 +4087,9 @@ long CheckBox::PreNotify( NotifyEvent& rNEvt )
             // trigger redraw if mouse over state has changed
             if( IsNativeControlSupported(CTRL_CHECKBOX, PART_ENTIRE_CONTROL) )
             {
-                if( ( maMouseRect.IsInside( GetPointerPosPixel()) &&
+                if( ( maMouseRect.IsInside( GetPointerPosPixel()) && 
                      !maMouseRect.IsInside( GetLastPointerPosPixel()) ) ||
-                    ( maMouseRect.IsInside( GetLastPointerPosPixel()) &&
+                    ( maMouseRect.IsInside( GetLastPointerPosPixel()) && 
                      !maMouseRect.IsInside( GetPointerPosPixel()) ) ||
                     pMouseEvt->IsLeaveWindow() || pMouseEvt->IsEnterWindow() )
                 {
@@ -4158,10 +4158,10 @@ Size CheckBox::ImplGetCheckImageSize() const
     {
         ImplControlValue aControlValue;
         // #i45896# workaround gcc3.3 temporary problem
-        Rectangle        aCtrlRegion( Point( 0, 0 ), GetSizePixel() );
-        ControlState     nState = CTRL_STATE_DEFAULT|CTRL_STATE_ENABLED;
+        Rectangle		 aCtrlRegion( Point( 0, 0 ), GetSizePixel() );
+        ControlState	 nState = CTRL_STATE_DEFAULT|CTRL_STATE_ENABLED;
         Rectangle aBoundingRgn, aContentRgn;
-
+        
         // get native size of a check box
         if( pThis->GetNativeControlRegion( CTRL_CHECKBOX, PART_ENTIRE_CONTROL, aCtrlRegion,
                                            nState, aControlValue, rtl::OUString(),
@@ -4171,7 +4171,7 @@ Size CheckBox::ImplGetCheckImageSize() const
             bDefaultSize = false;
         }
     }
-    if( bDefaultSize )
+    if( bDefaultSize ) 
         aSize = GetCheckImage( GetSettings(), 0 ).GetSizePixel();
     return aSize;
 }
@@ -4249,21 +4249,21 @@ void CheckBox::ImplSetMinimumNWFSize()
     Size aCurSize( GetSizePixel() );
     Rectangle aCtrlRegion( Point( 0, 0 ), aCurSize );
     Rectangle aBoundingRgn, aContentRgn;
-
+    
     // get native size of a radiobutton
     if( GetNativeControlRegion( CTRL_CHECKBOX, PART_ENTIRE_CONTROL, aCtrlRegion,
                                 CTRL_STATE_DEFAULT|CTRL_STATE_ENABLED, aControlValue, rtl::OUString(),
                                 aBoundingRgn, aContentRgn ) )
     {
         Size aSize = aContentRgn.GetSize();
-
+        
         if( aSize.Height() > aCurSize.Height() )
         {
             aCurSize.Height() = aSize.Height();
             SetSizePixel( aCurSize );
         }
     }
-
+    
     Pop();
 }
 
@@ -4453,16 +4453,16 @@ void DisclosureButton::ImplDrawCheckBoxState()
        would have to be overloaded for DisclosureButton; also GetNativeControlRegion
        for CTRL_LISTNODE would have to be implemented and taken into account
     */
-
+    
     Rectangle aStateRect( GetStateRect() );
-
+    
     ImplControlValue    aControlValue( GetState() == STATE_CHECK ? BUTTONVALUE_ON : BUTTONVALUE_OFF );
     Rectangle           aCtrlRegion( aStateRect );
     ControlState        nState = 0;
 
-    if ( HasFocus() )                       nState |= CTRL_STATE_FOCUSED;
-    if ( ImplGetButtonState() & BUTTON_DRAW_DEFAULT )   nState |= CTRL_STATE_DEFAULT;
-    if ( Window::IsEnabled() )              nState |= CTRL_STATE_ENABLED;
+    if ( HasFocus() )						nState |= CTRL_STATE_FOCUSED;
+    if ( ImplGetButtonState() & BUTTON_DRAW_DEFAULT )	nState |= CTRL_STATE_DEFAULT;
+    if ( Window::IsEnabled() ) 				nState |= CTRL_STATE_ENABLED;
     if ( IsMouseOver() && GetMouseRect().IsInside( GetPointerPosPixel() ) )
         nState |= CTRL_STATE_ROLLOVER;
 
@@ -4478,21 +4478,21 @@ void DisclosureButton::ImplDrawCheckBoxState()
             rCtrlData.mpDisclosureMinus = new Image( BitmapEx( VclResId( SV_DISCLOSURE_MINUS ) ) );
         if( ! rCtrlData.mpDisclosureMinusHC )
             rCtrlData.mpDisclosureMinusHC = new Image( BitmapEx( VclResId( SV_DISCLOSURE_MINUS_HC ) ) );
-
+    
         Image* pImg = NULL;
         if( GetSettings().GetStyleSettings().GetHighContrastMode() )
             pImg = IsChecked() ? rCtrlData.mpDisclosureMinusHC : rCtrlData.mpDisclosurePlusHC;
         else
             pImg = IsChecked() ? rCtrlData.mpDisclosureMinus : rCtrlData.mpDisclosurePlus;
-
+        
         DBG_ASSERT( pImg, "no disclosure image" );
         if( ! pImg )
             return;
-
+    
         USHORT nStyle = 0;
         if( ! IsEnabled() )
             nStyle |= IMAGE_DRAW_DISABLE;
-
+        
         Size aSize( aStateRect.GetSize() );
         Size aImgSize( pImg->GetSizePixel() );
         Point aOff( (aSize.Width() - aImgSize.Width())/2,
diff --git a/vcl/source/control/combobox.cxx b/vcl/source/control/combobox.cxx
index 8efa3404a44a..7739ad2c1d91 100644
--- a/vcl/source/control/combobox.cxx
+++ b/vcl/source/control/combobox.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
@@ -117,16 +117,16 @@ ComboBox::~ComboBox()
 
 void ComboBox::ImplInitComboBoxData()
 {
-    mpSubEdit           = NULL;
-    mpBtn               = NULL;
-    mpImplLB            = NULL;
-    mpFloatWin          = NULL;
+    mpSubEdit			= NULL;
+    mpBtn				= NULL;
+    mpImplLB			= NULL;
+    mpFloatWin			= NULL;
 
-    mnDDHeight          = 0;
-    mbDDAutoSize        = TRUE;
-    mbSyntheticModify   = FALSE;
-    mbMatchCase         = FALSE;
-    mcMultiSep          = ';';
+    mnDDHeight			= 0;
+    mbDDAutoSize		= TRUE;
+    mbSyntheticModify	= FALSE;
+    mbMatchCase 		= FALSE;
+    mcMultiSep			= ';';
 }
 
 // -----------------------------------------------------------------------
@@ -331,8 +331,8 @@ IMPL_LINK( ComboBox, ImplPopupModeEndHdl, void*, EMPTYARG )
 
 IMPL_LINK( ComboBox, ImplAutocompleteHdl, Edit*, pEdit )
 {
-    Selection           aSel = pEdit->GetSelection();
-    AutocompleteAction  eAction = pEdit->GetAutocompleteAction();
+    Selection			aSel = pEdit->GetSelection();
+    AutocompleteAction	eAction = pEdit->GetAutocompleteAction();
 
     /* If there is no current selection do not auto complete on
        Tab/Shift-Tab since then we would not cycle to the next field.
@@ -340,9 +340,9 @@ IMPL_LINK( ComboBox, ImplAutocompleteHdl, Edit*, pEdit )
     if ( aSel.Len() ||
          ((eAction != AUTOCOMPLETE_TABFORWARD) && (eAction != AUTOCOMPLETE_TABBACKWARD)) )
     {
-        XubString   aFullText = pEdit->GetText();
-        XubString   aStartText = aFullText.Copy( 0, (xub_StrLen)aSel.Max() );
-        USHORT      nStart = mpImplLB->GetCurrentPos();
+        XubString	aFullText = pEdit->GetText();
+        XubString	aStartText = aFullText.Copy( 0, (xub_StrLen)aSel.Max() );
+        USHORT		nStart = mpImplLB->GetCurrentPos();
 
         if ( nStart == LISTBOX_ENTRY_NOTFOUND )
             nStart = 0;
@@ -355,7 +355,7 @@ IMPL_LINK( ComboBox, ImplAutocompleteHdl, Edit*, pEdit )
             bForward = FALSE;
             nStart = nStart ? nStart - 1 : mpImplLB->GetEntryList()->GetEntryCount()-1;
         }
-
+        
         USHORT nPos = LISTBOX_ENTRY_NOTFOUND;
         if( ! mbMatchCase )
         {
@@ -365,7 +365,7 @@ IMPL_LINK( ComboBox, ImplAutocompleteHdl, Edit*, pEdit )
                 // Try match case insensitive, but from start
                 nPos = mpImplLB->GetEntryList()->FindMatchingEntry( aStartText, bForward ? 0 : (mpImplLB->GetEntryList()->GetEntryCount()-1), bForward, TRUE );
         }
-
+            
         if ( nPos == LISTBOX_ENTRY_NOTFOUND )
             // Try match full from current position
             nPos = mpImplLB->GetEntryList()->FindMatchingEntry( aStartText, nStart, bForward, FALSE );
@@ -401,11 +401,11 @@ IMPL_LINK( ComboBox, ImplSelectHdl, void*, EMPTYARG )
             xub_StrLen nIndex = 0;
             while ( nIndex != STRING_NOTFOUND )
             {
-                xub_StrLen  nPrevIndex = nIndex;
-                XubString   aToken = aText.GetToken( 0, mcMultiSep, nIndex );
-                xub_StrLen  nTokenLen = aToken.Len();
+                xub_StrLen	nPrevIndex = nIndex;
+                XubString	aToken = aText.GetToken( 0, mcMultiSep, nIndex );
+                xub_StrLen	nTokenLen = aToken.Len();
                 aToken.EraseLeadingAndTrailingChars( ' ' );
-                USHORT      nP = mpImplLB->GetEntryList()->FindEntry( aToken );
+                USHORT		nP = mpImplLB->GetEntryList()->FindEntry( aToken );
                 if ( (nP != LISTBOX_ENTRY_NOTFOUND) && (!mpImplLB->GetEntryList()->IsEntryPosSelected( nP )) )
                 {
                     aText.Erase( nPrevIndex, nTokenLen );
@@ -623,8 +623,8 @@ void ComboBox::Resize()
     if( IsDropDownBox() )
     {
         long nSBWidth = GetSettings().GetStyleSettings().GetScrollBarSize();
-        long    nTop = 0;
-        long    nBottom = aOutSz.Height();
+        long	nTop = 0;
+        long	nBottom = aOutSz.Height();
 
         Window *pBorder = GetWindow( WINDOW_BORDER );
         ImplControlValue aControlValue;
@@ -789,7 +789,7 @@ void ComboBox::DataChanged( const DataChangedEvent& rDCEvt )
         }
         Resize();
         mpImplLB->Resize(); // Wird nicht durch ComboBox::Resize() gerufen, wenn sich die ImplLB nicht aendert.
-        SetBackground();    // due to a hack in Window::UpdateSettings the background must be reset
+        SetBackground();    // due to a hack in Window::UpdateSettings the background must be reset 
                             // otherwise it will overpaint NWF drawn comboboxes
     }
 }
@@ -811,7 +811,7 @@ long ComboBox::Notify( NotifyEvent& rNEvt )
             && !IsReadOnly() )
     {
         KeyEvent aKeyEvt = *rNEvt.GetKeyEvent();
-        USHORT   nKeyCode = aKeyEvt.GetKeyCode().GetCode();
+        USHORT	 nKeyCode = aKeyEvt.GetKeyCode().GetCode();
         switch( nKeyCode )
         {
             case KEY_UP:
@@ -925,9 +925,9 @@ void ComboBox::ImplUpdateFloatSelection()
     mpImplLB->SetCallSelectionChangedHdl( FALSE );
     if ( !IsMultiSelectionEnabled() )
     {
-        XubString   aSearchStr( mpSubEdit->GetText() );
-        USHORT      nSelect = LISTBOX_ENTRY_NOTFOUND;
-        BOOL        bSelect = TRUE;
+        XubString	aSearchStr( mpSubEdit->GetText() );
+        USHORT		nSelect = LISTBOX_ENTRY_NOTFOUND;
+        BOOL		bSelect = TRUE;
 
         if ( mpImplLB->GetCurrentPos() != LISTBOX_ENTRY_NOTFOUND )
         {
@@ -1010,6 +1010,14 @@ void ComboBox::Clear()
     mpImplLB->Clear();
     CallEventListeners( VCLEVENT_COMBOBOX_ITEMREMOVED, (void*) sal_IntPtr(-1) );
 }
+// -----------------------------------------------------------------------
+
+Image ComboBox::GetEntryImage( USHORT nPos ) const
+{
+    if ( mpImplLB->GetEntryList()->HasEntryImage( nPos ) )
+        return mpImplLB->GetEntryList()->GetEntryImage( nPos );
+    return Image();
+}
 
 // -----------------------------------------------------------------------
 
@@ -1278,9 +1286,9 @@ void ComboBox::Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, U
         if ( !nLines )
             nLines = 1;
         USHORT nTEntry = IsReallyVisible() ? mpImplLB->GetTopEntry() : 0;
-
+        
         Rectangle aTextRect( aPos, aSize );
-
+        
         aTextRect.Left() += 3*nOnePixel;
         aTextRect.Right() -= 3*nOnePixel;
         aTextRect.Top() += nEditHeight + nOnePixel;
@@ -1296,14 +1304,14 @@ void ComboBox::Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, U
     }
 
     pDev->Pop();
-
+    
     // Call Edit::Draw after restoring the MapMode...
     if ( IsDropDownBox() )
     {
         mpSubEdit->Draw( pDev, rPos, rSize, nFlags );
         // DD-Button ?
     }
-
+    
 }
 
 // -----------------------------------------------------------------------
@@ -1560,7 +1568,7 @@ long ComboBox::GetIndexForPoint( const Point& rPoint, USHORT& rPos ) const
         // point must be either in main list window
         // or in impl window (dropdown case)
         ImplListBoxWindow* pMain = mpImplLB->GetMainWindow();
-
+    
         // convert coordinates to ImplListBoxWindow pixel coordinate space
         Point aConvPoint = LogicToPixel( rPoint );
         aConvPoint = OutputToAbsoluteScreenPixel( aConvPoint );
diff --git a/vcl/source/control/ctrl.cxx b/vcl/source/control/ctrl.cxx
index 918675cc0783..335c12b27871 100644
--- a/vcl/source/control/ctrl.cxx
+++ b/vcl/source/control/ctrl.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
@@ -49,7 +49,7 @@ using namespace vcl;
 
 void Control::ImplInitControlData()
 {
-    mbHasFocus      = FALSE;
+    mbHasFocus	    = FALSE;
     mpControlData   = new ImplControlData;
 }
 
@@ -216,7 +216,7 @@ long Control::GetLineCount() const
 Pair ControlLayoutData::GetLineStartEnd( long nLine ) const
 {
     Pair aPair( -1, -1 );
-
+    
     int nDisplayLines = m_aLineIndices.size();
     if( nLine >= 0 && nLine < nDisplayLines )
     {
@@ -333,11 +333,11 @@ long Control::Notify( NotifyEvent& rNEvt )
 
 void Control::StateChanged( StateChangedType nStateChange )
 {
-    if( nStateChange == STATE_CHANGE_INITSHOW   ||
-        nStateChange == STATE_CHANGE_VISIBLE    ||
-        nStateChange == STATE_CHANGE_FORMAT     ||
-        nStateChange == STATE_CHANGE_ZOOM       ||
-        nStateChange == STATE_CHANGE_BORDER     ||
+    if( nStateChange == STATE_CHANGE_INITSHOW	||
+        nStateChange == STATE_CHANGE_VISIBLE	||
+        nStateChange == STATE_CHANGE_FORMAT		||
+        nStateChange == STATE_CHANGE_ZOOM		||
+        nStateChange == STATE_CHANGE_BORDER		||
         nStateChange == STATE_CHANGE_CONTROLFONT
         )
     {
@@ -443,7 +443,7 @@ void Control::DataChanged( const DataChangedEvent& rDCEvt)
 {
     // we don't want to loose some style settings for controls created with the
     // toolkit
-    if ( IsCreatedWithToolkit() &&
+    if ( IsCreatedWithToolkit() && 
          (rDCEvt.GetType() == DATACHANGED_SETTINGS) &&
          (rDCEvt.GetFlags() & SETTINGS_STYLE) )
     {
diff --git a/vcl/source/control/edit.cxx b/vcl/source/control/edit.cxx
index c0e7b352642c..69ab2fb8801d 100644
--- a/vcl/source/control/edit.cxx
+++ b/vcl/source/control/edit.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
@@ -101,27 +101,27 @@ static FncGetSpecialChars pImplFncGetSpecialChars = NULL;
 
 // =======================================================================
 
-#define EDIT_ALIGN_LEFT             1
-#define EDIT_ALIGN_CENTER           2
-#define EDIT_ALIGN_RIGHT            3
+#define EDIT_ALIGN_LEFT 			1
+#define EDIT_ALIGN_CENTER			2
+#define EDIT_ALIGN_RIGHT			3
 
-#define EDIT_DEL_LEFT               1
-#define EDIT_DEL_RIGHT              2
+#define EDIT_DEL_LEFT				1
+#define EDIT_DEL_RIGHT				2
 
-#define EDIT_DELMODE_SIMPLE         11
-#define EDIT_DELMODE_RESTOFWORD     12
-#define EDIT_DELMODE_RESTOFCONTENT  13
+#define EDIT_DELMODE_SIMPLE 		11
+#define EDIT_DELMODE_RESTOFWORD 	12
+#define EDIT_DELMODE_RESTOFCONTENT	13
 
 // =======================================================================
 
 struct DDInfo
 {
-    Cursor          aCursor;
+    Cursor			aCursor;
     Selection       aDndStartSel;
-    xub_StrLen      nDropPos;
-    BOOL            bStarterOfDD;
-    BOOL            bDroppedInMe;
-    BOOL            bVisCursor;
+    xub_StrLen		nDropPos;
+    BOOL			bStarterOfDD;
+    BOOL			bDroppedInMe;
+    BOOL			bVisCursor;
 
     DDInfo()
     {
@@ -138,17 +138,17 @@ struct DDInfo
 struct Impl_IMEInfos
 {
     String      aOldTextAfterStartPos;
-    USHORT*     pAttribs;
-    xub_StrLen  nPos;
-    xub_StrLen  nLen;
-    BOOL        bCursor;
-    BOOL        bWasCursorOverwrite;
+    USHORT* 	pAttribs;
+    xub_StrLen	nPos;
+    xub_StrLen	nLen;
+    BOOL		bCursor;
+    BOOL		bWasCursorOverwrite;
 
                 Impl_IMEInfos( xub_StrLen nPos, const String& rOldTextAfterStartPos );
                 ~Impl_IMEInfos();
 
-    void        CopyAttribs( const xub_StrLen* pA, xub_StrLen nL );
-    void        DestroyAttribs();
+    void		CopyAttribs( const xub_StrLen* pA, xub_StrLen nL );
+    void		DestroyAttribs();
 };
 
 // -----------------------------------------------------------------------
@@ -281,23 +281,23 @@ Edit::~Edit()
 
 void Edit::ImplInitEditData()
 {
-    mpSubEdit               = NULL;
-    mpUpdateDataTimer       = NULL;
-    mnXOffset               = 0;
-    mnAlign                 = EDIT_ALIGN_LEFT;
-    mnMaxTextLen            = EDIT_NOLIMIT;
-    meAutocompleteAction    = AUTOCOMPLETE_KEYINPUT;
-    mbModified              = FALSE;
-    mbInternModified        = FALSE;
-    mbReadOnly              = FALSE;
-    mbInsertMode            = TRUE;
-    mbClickedInSelection    = FALSE;
-    mbActivePopup           = FALSE;
-    mbIsSubEdit             = FALSE;
-    mbInMBDown              = FALSE;
-    mpDDInfo                = NULL;
-    mpIMEInfos              = NULL;
-    mcEchoChar              = 0;
+    mpSubEdit				= NULL;
+    mpUpdateDataTimer		= NULL;
+    mnXOffset				= 0;
+    mnAlign 				= EDIT_ALIGN_LEFT;
+    mnMaxTextLen			= EDIT_NOLIMIT;
+    meAutocompleteAction	= AUTOCOMPLETE_KEYINPUT;
+    mbModified				= FALSE;
+    mbInternModified		= FALSE;
+    mbReadOnly				= FALSE;
+    mbInsertMode			= TRUE;
+    mbClickedInSelection	= FALSE;
+    mbActivePopup			= FALSE;
+    mbIsSubEdit 			= FALSE;
+    mbInMBDown				= FALSE;
+    mpDDInfo				= NULL;
+    mpIMEInfos				= NULL;
+    mcEchoChar				= 0;
 
     // --- RTL --- no default mirroring for Edit controls
     // note: controls that use a subedit will revert this (SpinField, ComboBox)
@@ -338,7 +338,7 @@ void Edit::ImplInit( Window* pParent, WinBits nStyle )
 
     // --- RTL --- hack: right align until keyinput and cursor travelling works
     if( IsRTLEnabled() )
-        mnAlign = EDIT_ALIGN_RIGHT;
+        mnAlign	= EDIT_ALIGN_RIGHT;
 
     if ( nStyle & WB_RIGHT )
         mnAlign = EDIT_ALIGN_RIGHT;
@@ -459,7 +459,7 @@ XubString Edit::ImplGetText() const
 {
     if ( mcEchoChar || (GetStyle() & WB_PASSWORD) )
     {
-        XubString   aText;
+        XubString	aText;
         xub_Unicode cEchoChar;
         if ( mcEchoChar )
             cEchoChar = mcEchoChar;
@@ -509,9 +509,9 @@ void Edit::ImplRepaint( xub_StrLen nStart, xub_StrLen nEnd, bool bLayout )
     nStart = 0;
     nEnd = aText.Len();
 
-    sal_Int32   nDXBuffer[256];
-    sal_Int32*  pDXBuffer = NULL;
-    sal_Int32*  pDX = nDXBuffer;
+    sal_Int32	nDXBuffer[256];
+    sal_Int32*	pDXBuffer = NULL;
+    sal_Int32*	pDX = nDXBuffer;
 
     if( aText.Len() )
     {
@@ -524,8 +524,8 @@ void Edit::ImplRepaint( xub_StrLen nStart, xub_StrLen nEnd, bool bLayout )
         GetCaretPositions( aText, pDX, nStart, nEnd );
     }
 
-    long    nTH = GetTextHeight();
-    Point   aPos( mnXOffset, ImplGetTextYPosition() );
+    long	nTH = GetTextHeight();
+    Point	aPos( mnXOffset, ImplGetTextYPosition() );
 
     if( bLayout )
     {
@@ -894,8 +894,8 @@ void Edit::ImplInsertText( const XubString& rStr, const Selection* pNewSel, sal_
         sal_Bool bCTLSequenceChecking               = sal_False;
         sal_Bool bCTLSequenceCheckingRestricted     = sal_False;
         sal_Bool bCTLSequenceCheckingTypeAndReplace = sal_False;
-        sal_Bool bCTLFontEnabled                    = sal_False;
-        sal_Bool bIsInputSequenceChecking           = sal_False;
+        sal_Bool bCTLFontEnabled					= sal_False;
+        sal_Bool bIsInputSequenceChecking			= sal_False;
         //
         // get access to the configuration of this office module
         try
@@ -921,7 +921,7 @@ void Edit::ImplInsertText( const XubString& rStr, const Selection* pNewSel, sal_
         }
         catch(...)
         {
-            bIsInputSequenceChecking = sal_False;   // continue with inserting the new text
+            bIsInputSequenceChecking = sal_False;	// continue with inserting the new text
         }
         //
         uno::Reference < i18n::XBreakIterator > xBI( ImplGetBreakIterator(), UNO_QUERY );
@@ -967,7 +967,7 @@ void Edit::ImplInsertText( const XubString& rStr, const Selection* pNewSel, sal_
                 if (aChgText.Len())
                 {
                     aNewText = aChgText;
-                    aSelection.Min() = nChgPos; // position for new text to be inserted
+                    aSelection.Min() = nChgPos;	// position for new text to be inserted
                 }
                 else
                     aNewText = String::EmptyString();
@@ -1168,14 +1168,14 @@ void Edit::ImplShowCursor( BOOL bOnlyIfVisible )
     if ( !IsUpdateMode() || ( bOnlyIfVisible && !IsReallyVisible() ) )
         return;
 
-    Cursor*     pCursor = GetCursor();
-    XubString   aText = ImplGetText();
+    Cursor* 	pCursor = GetCursor();
+    XubString	aText = ImplGetText();
 
     long nTextPos = 0;
 
-    sal_Int32   nDXBuffer[256];
-    sal_Int32*  pDXBuffer = NULL;
-    sal_Int32*  pDX = nDXBuffer;
+    sal_Int32	nDXBuffer[256];
+    sal_Int32*	pDXBuffer = NULL;
+    sal_Int32*	pDX = nDXBuffer;
 
     if( aText.Len() )
     {
@@ -1226,7 +1226,7 @@ void Edit::ImplShowCursor( BOOL bOnlyIfVisible )
         }
 
         nCursorPosX = nTextPos + mnXOffset + ImplGetExtraOffset();
-        if ( nCursorPosX == aOutSize.Width() )  // dann nicht sichtbar...
+        if ( nCursorPosX == aOutSize.Width() )	// dann nicht sichtbar...
             nCursorPosX--;
 
         if ( mnXOffset != nOldXOffset )
@@ -1278,7 +1278,7 @@ void Edit::ImplAlign()
     else if( mnAlign == EDIT_ALIGN_CENTER )
     {
         // Mit Abfrage schoener, wenn gescrollt, dann aber nicht zentriert im gescrollten Zustand...
-//      if ( nTextWidth < nOutWidth )
+//		if ( nTextWidth < nOutWidth )
             mnXOffset = (nOutWidth - nTextWidth) / 2;
     }
 }
@@ -1300,9 +1300,9 @@ xub_StrLen Edit::ImplGetCharPos( const Point& rWindowPos ) const
     xub_StrLen nIndex = STRING_LEN;
     String aText = ImplGetText();
 
-    sal_Int32   nDXBuffer[256];
-    sal_Int32*  pDXBuffer = NULL;
-    sal_Int32*  pDX = nDXBuffer;
+    sal_Int32	nDXBuffer[256];
+    sal_Int32*	pDXBuffer = NULL;
+    sal_Int32*	pDX = nDXBuffer;
     if( 2*aText.Len() > xub_StrLen(sizeof(nDXBuffer)/sizeof(nDXBuffer[0])) )
     {
         pDXBuffer = new sal_Int32[2*(aText.Len()+1)];
@@ -1471,7 +1471,7 @@ void Edit::MouseButtonDown( const MouseEvent& rMEvt )
             StartTracking( STARTTRACK_SCROLLREPEAT );
     }
 
-    mbInMBDown = TRUE;  // Dann im GetFocus nicht alles selektieren
+    mbInMBDown = TRUE;	// Dann im GetFocus nicht alles selektieren
     GrabFocus();
     mbInMBDown = FALSE;
 }
@@ -1529,8 +1529,8 @@ void Edit::Tracking( const TrackingEvent& rTEvt )
 
 BOOL Edit::ImplHandleKeyEvent( const KeyEvent& rKEvt )
 {
-    BOOL        bDone = FALSE;
-    USHORT      nCode = rKEvt.GetKeyCode().GetCode();
+    BOOL		bDone = FALSE;
+    USHORT		nCode = rKEvt.GetKeyCode().GetCode();
     KeyFuncType eFunc = rKEvt.GetKeyCode().GetFunction();
 
     mbInternModified = FALSE;
@@ -1596,7 +1596,7 @@ BOOL Edit::ImplHandleKeyEvent( const KeyEvent& rKEvt )
         {
             if ( pImplFncGetSpecialChars )
             {
-                Selection aSaveSel = GetSelection();    // Falls jemand in Get/LoseFocus die Selektion verbiegt, z.B. URL-Zeile...
+                Selection aSaveSel = GetSelection();	// Falls jemand in Get/LoseFocus die Selektion verbiegt, z.B. URL-Zeile...
                 XubString aChars = pImplFncGetSpecialChars( this, GetFont() );
                 SetSelection( aSaveSel );
                 if ( aChars.Len() )
@@ -1619,7 +1619,7 @@ BOOL Edit::ImplHandleKeyEvent( const KeyEvent& rKEvt )
                 bDone = TRUE;
             }
             break;
-
+            
             case KEY_LEFT:
             case KEY_RIGHT:
             case KEY_HOME:
@@ -1653,7 +1653,7 @@ BOOL Edit::ImplHandleKeyEvent( const KeyEvent& rKEvt )
                     bool bGoRight = (nCode == KEY_RIGHT);
                     bool bGoHome = (nCode == KEY_HOME);
                     bool bGoEnd = (nCode == KEY_END);
-
+                    
                     switch( nCode )
                     {
                     case com::sun::star::awt::Key::MOVE_WORD_FORWARD:
@@ -1685,7 +1685,7 @@ BOOL Edit::ImplHandleKeyEvent( const KeyEvent& rKEvt )
                     default:
                         break;
                     };
-
+                    
                     // Range wird in ImplSetSelection geprueft...
                     if ( bGoLeft && aSel.Max() )
                     {
@@ -1825,7 +1825,7 @@ BOOL Edit::ImplHandleKeyEvent( const KeyEvent& rKEvt )
             {
                 if ( IsCharInput( rKEvt ) )
                 {
-                    bDone = TRUE;   // Auch bei ReadOnly die Zeichen schlucken.
+                    bDone = TRUE;	// Auch bei ReadOnly die Zeichen schlucken.
                     if ( !mbReadOnly )
                     {
                         ImplInsertText( rKEvt.GetCharCode(), 0, sal_True );
@@ -1942,12 +1942,12 @@ void Edit::Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, ULONG
         }
     }
 
-    XubString   aText = ImplGetText();
-    long        nTextHeight = pDev->GetTextHeight();
-    long        nTextWidth = pDev->GetTextWidth( aText );
-    long        nOnePixel = GetDrawPixel( pDev, 1 );
-    long        nOffX = 3*nOnePixel;
-    long        nOffY = (aSize.Height() - nTextHeight) / 2;
+    XubString	aText = ImplGetText();
+    long		nTextHeight = pDev->GetTextHeight();
+    long		nTextWidth = pDev->GetTextWidth( aText );
+    long		nOnePixel = GetDrawPixel( pDev, 1 );
+    long		nOffX = 3*nOnePixel;
+    long		nOffY = (aSize.Height() - nTextHeight) / 2;
 
     // Clipping?
     if ( (nOffY < 0) ||
@@ -2081,7 +2081,7 @@ void Edit::LoseFocus()
         }
 
         if ( !mbActivePopup && !( GetStyle() & WB_NOHIDESELECTION ) && maSelection.Len() )
-            ImplInvalidateOrRepaint();    // Selektion malen
+            ImplInvalidateOrRepaint();	  // Selektion malen
     }
 
     Control::LoseFocus();
@@ -2144,7 +2144,7 @@ void Edit::Command( const CommandEvent& rCEvt )
         }
 
         mbActivePopup = TRUE;
-        Selection aSaveSel = GetSelection();    // Falls jemand in Get/LoseFocus die Selektion verbiegt, z.B. URL-Zeile...
+        Selection aSaveSel = GetSelection();	// Falls jemand in Get/LoseFocus die Selektion verbiegt, z.B. URL-Zeile...
         Point aPos = rCEvt.GetMousePosPixel();
         if ( !rCEvt.IsMouseEvent() )
         {
@@ -2222,7 +2222,7 @@ void Edit::Command( const CommandEvent& rCEvt )
                 break;
                 case DICTATIONCOMMAND_DEL:
                 {
-                    ImplHandleKeyEvent( KeyEvent( 0, KeyCode( KEY_LEFT, KEY_MOD1|KEY_SHIFT  ) ) );
+                    ImplHandleKeyEvent( KeyEvent( 0, KeyCode( KEY_LEFT, KEY_MOD1|KEY_SHIFT	) ) );
                     DeleteSelected();
                 }
                 break;
@@ -2340,7 +2340,7 @@ void Edit::StateChanged( StateChangedType nType )
     {
         if ( !mpSubEdit )
         {
-            mnXOffset = 0;  // Falls vorher GrabFocus, als Groesse noch falsch.
+            mnXOffset = 0;	// Falls vorher GrabFocus, als Groesse noch falsch.
             ImplAlign();
             if ( !mpSubEdit )
                 ImplShowCursor( FALSE );
@@ -2374,7 +2374,7 @@ void Edit::StateChanged( StateChangedType nType )
         if( mbIsSubEdit && GetParent()->IsRTLEnabled() )
         {
             if( GetParent()->GetStyle() & WB_LEFT )
-                mnAlign = EDIT_ALIGN_RIGHT;
+                mnAlign	= EDIT_ALIGN_RIGHT;
             if ( nType == STATE_CHANGE_MIRRORING )
                 SetLayoutMode( TEXT_LAYOUT_BIDI_RTL | TEXT_LAYOUT_TEXTORIGIN_LEFT );
         }
@@ -2770,10 +2770,10 @@ void Edit::Undo()
 void Edit::SetText( const XubString& rStr )
 {
     if ( mpSubEdit )
-        mpSubEdit->SetText( rStr );     // Nicht direkt ImplSetText, falls SetText ueberladen
+        mpSubEdit->SetText( rStr ); 	// Nicht direkt ImplSetText, falls SetText ueberladen
     else
     {
-        Selection aNewSel( 0, 0 );  // Damit nicht gescrollt wird
+        Selection aNewSel( 0, 0 );	// Damit nicht gescrollt wird
         ImplSetText( rStr, &aNewSel );
     }
 }
@@ -2825,7 +2825,7 @@ void Edit::SetSubEdit( Edit* pEdit )
     mpSubEdit = pEdit;
     if ( mpSubEdit )
     {
-        SetPointer( POINTER_ARROW );    // Nur das SubEdit hat den BEAM...
+        SetPointer( POINTER_ARROW );	// Nur das SubEdit hat den BEAM...
         mpSubEdit->mbIsSubEdit = TRUE;
 
         mpSubEdit->SetReadOnly( mbReadOnly );
@@ -2844,7 +2844,7 @@ Size Edit::CalcMinimumSize() const
         aSize.Width() = aMinSize.Width();
     // add some space between text entry and border
     aSize.Height() += 4;
-
+    
     aSize = CalcWindowSize( aSize );
 
     // ask NWF what if it has an opinion, too
@@ -2966,7 +2966,7 @@ void Edit::dragGestureRecognized( const ::com::sun::star::datatransfer::dnd::Dra
 
 
             if ( IsTracking() )
-                EndTracking();  // Vor D&D Tracking ausschalten
+                EndTracking();	// Vor D&D Tracking ausschalten
 
             ::vcl::unohelper::TextDataObject* pDataObj = new ::vcl::unohelper::TextDataObject( GetSelected() );
             sal_Int8 nActions = datatransfer::dnd::DNDConstants::ACTION_COPY;
diff --git a/vcl/source/control/field.cxx b/vcl/source/control/field.cxx
index 090aa2a84163..dff681f709a2 100644
--- a/vcl/source/control/field.cxx
+++ b/vcl/source/control/field.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
@@ -230,7 +230,7 @@ static void ImplUpdateSeparators( const String& rOldDecSep, const String& rNewDe
 {
     bool bChangeDec = (rOldDecSep != rNewDecSep);
     bool bChangeTh = (rOldThSep != rNewThSep );
-
+    
     if( bChangeDec || bChangeTh )
     {
         BOOL bUpdateMode = pEdit->IsUpdateMode();
@@ -241,7 +241,7 @@ static void ImplUpdateSeparators( const String& rOldDecSep, const String& rNewDe
         if( bChangeTh )
             aText.SearchAndReplaceAll( rNewThSep, rOldThSep );
         pEdit->SetText( aText );
-
+        
         ComboBox* pCombo = dynamic_cast<ComboBox*>(pEdit);
         if( pCombo )
         {
@@ -478,19 +478,19 @@ void NumericFormatter::ImplLoadRes( const ResId& rResId )
     if( pMgr )
     {
         ULONG nMask = pMgr->ReadLong();
-
+    
         if ( NUMERICFORMATTER_MIN & nMask )
             mnMin = pMgr->ReadLong();
-
+    
         if ( NUMERICFORMATTER_MAX & nMask )
             mnMax = pMgr->ReadLong();
-
+    
         if ( NUMERICFORMATTER_STRICTFORMAT & nMask )
             SetStrictFormat( (BOOL)pMgr->ReadShort() );
-
+    
         if ( NUMERICFORMATTER_DECIMALDIGITS & nMask )
             SetDecimalDigits( pMgr->ReadShort() );
-
+    
         if ( NUMERICFORMATTER_VALUE & nMask )
         {
             mnFieldValue = pMgr->ReadLong();
@@ -1073,7 +1073,7 @@ static XubString ImplMetricGetUnitText( const XubString& rStr )
         }
     }
     return aStr;
-
+    
 /*
     // MT: #90545# Preparation for translated strings...
     String aMetricText;
@@ -1092,7 +1092,7 @@ static XubString ImplMetricGetUnitText( const XubString& rStr )
                 break;
         }
     }
-*/
+*/    
 }
 
 // -----------------------------------------------------------------------
@@ -1128,6 +1128,10 @@ static FieldUnit ImplStringToMetric( const String &rMetricString )
         if ( strAllUnits->GetString( i ).Equals( aStr ) )
             return (FieldUnit) strAllUnits->GetValue( i );
 
+    // Amelia : about character unit
+    if (aStr.EqualsIgnoreCaseAscii("cm"))
+        return FUNIT_CM;
+
     return FUNIT_NONE;
 }
 
@@ -1143,20 +1147,24 @@ static FieldUnit ImplMetricGetUnit( const XubString& rStr )
 #define M *1000000L
 #define X *5280L
 
-static const sal_Int64 aImplFactor[FUNIT_MILE+1][FUNIT_MILE+1] =
+// Amelia : about measurement unit, 'char' and 'line'
+//static const sal_Int64 aImplFactor[FUNIT_MILE+1][FUNIT_MILE+1] =
+static const sal_Int64 aImplFactor[FUNIT_LINE+1][FUNIT_LINE+1] =
 { /*
-mm/100    mm    cm       m     km  twip point  pica  inch    foot     mile */
-{    1,  100,  1 K,  100 K, 100 M, 2540, 2540, 2540, 2540,2540*12,2540*12 X },
-{    1,    1,   10,    1 K,   1 M, 2540, 2540, 2540, 2540,2540*12,2540*12 X },
-{    1,    1,    1,    100, 100 K,  254,  254,  254,  254, 254*12, 254*12 X },
-{    1,    1,    1,      1,   1 K,  254,  254,  254,  254, 254*12, 254*12 X },
-{    1,    1,    1,      1,     1,    0,  254,  254,  254, 254*12, 254*12 X },
-{ 1440,144 K,144 K,14400 K,     0,    1,   20,  240, 1440,1440*12,1440*12 X },
-{   72, 7200, 7200,  720 K, 720 M,    1,    1,   12,   72,  72*12,  72*12 X },
-{    6,  600,  600,   60 K,  60 M,    1,    1,    1,    6,   6*12,   6*12 X },
-{    1,  100,  100,   10 K,  10 M,    1,    1,    1,    1,     12,     12 X },
-{    1,  100,  100,   10 K,  10 M,    1,    1,    1,    1,      1,      1 X },
-{    1,  100,  100,   10 K,  10 M,    1,    1,    1,    1,      1,        1 }
+mm/100    mm    cm       m     km  twip point  pica  inch    foot     mile    char    line*/
+{    1,  100,  1 K,  100 K, 100 M, 2540, 2540, 2540, 2540,2540*12,2540*12 X ,   53340, 396240},
+{    1,    1,   10,    1 K,   1 M, 2540, 2540, 2540, 2540,2540*12,2540*12 X ,    5334, 396240},
+{    1,    1,    1,    100, 100 K,  254,  254,  254,  254, 254*12, 254*12 X ,    5334,  39624},
+{    1,    1,    1,      1,   1 K,  254,  254,  254,  254, 254*12, 254*12 X ,  533400,  39624},
+{    1,    1,    1,      1,     1,    0,  254,  254,  254, 254*12, 254*12 X ,533400 K,  39624},
+{ 1440,144 K,144 K,14400 K,     0,    1,   20,  240, 1440,1440*12,1440*12 X ,     210,   3120},
+{   72, 7200, 7200,  720 K, 720 M,    1,    1,   12,   72,  72*12,  72*12 X ,     210,    156},
+{    6,  600,  600,   60 K,  60 M,    1,    1,    1,    6,   6*12,   6*12 X ,     210,     10},
+{    1,  100,  100,   10 K,  10 M,    1,    1,    1,    1,     12,     12 X ,     210,     45},
+{    1,  100,  100,   10 K,  10 M,    1,    1,    1,    1,      1,      1 X ,     210,     45},
+{    1,  100,  100,   10 K,  10 M,    1,    1,    1,    1,      1,        1 ,     210,     45},
+{  144, 1440,14400,  14400, 14400,    1,   20,  240, 1440,1440*12, 1440*12 X,       1,   156 },
+{  720,72000,72000, 7200 K,7200 M,   20,   10,   13,   11,  11*12,   11*12 X,     105,     1 }
 };
 
 #undef X
@@ -1489,10 +1497,10 @@ void MetricFormatter::ImplLoadRes( const ResId& rResId )
     if( pMgr )
     {
         ULONG       nMask = pMgr->ReadLong();
-
+    
         if ( METRICFORMATTER_UNIT & nMask )
             meUnit = (FieldUnit)pMgr->ReadLong();
-
+    
         if ( METRICFORMATTER_CUSTOMUNITTEXT & nMask )
             maCustomUnitText = pMgr->ReadString();
     }
@@ -1739,6 +1747,21 @@ MetricField::~MetricField()
 {
 }
 
+void MetricField::SetUnit( FieldUnit nNewUnit )
+{
+    sal_Int64 nMax = Denormalize( GetMax( nNewUnit ) );
+    sal_Int64 nMin = Denormalize( GetMin( nNewUnit ) );
+    sal_Int64 nFirst = Denormalize( GetFirst( nNewUnit ) );
+    sal_Int64 nLast = Denormalize( GetLast( nNewUnit ) );
+
+    MetricFormatter::SetUnit( nNewUnit );
+
+    SetMax( Normalize( nMax ), nNewUnit );
+    SetMin( Normalize( nMin ), nNewUnit );
+    SetFirst( Normalize( nFirst ), nNewUnit );
+    SetLast( Normalize( nLast ), nNewUnit );
+}
+
 // -----------------------------------------------------------------------
 
 void MetricField::SetFirst( sal_Int64 nNewFirst, FieldUnit eInUnit )
diff --git a/vcl/source/control/field2.cxx b/vcl/source/control/field2.cxx
index 8ae2ecff41b9..78d69bd1ad3e 100644
--- a/vcl/source/control/field2.cxx
+++ b/vcl/source/control/field2.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
@@ -155,7 +155,7 @@ static USHORT ImplGetNum( const sal_Unicode*& rpBuf, BOOL& rbError )
 
 static void ImplSkipDelimiters( const sal_Unicode*& rpBuf )
 {
-    while( ( *rpBuf == ',' ) || ( *rpBuf == '.' ) || ( *rpBuf == ';' ) ||
+    while( ( *rpBuf == ',' ) || ( *rpBuf == '.' ) || ( *rpBuf == ';' ) || 
            ( *rpBuf == ':' ) || ( *rpBuf == '-' ) || ( *rpBuf == '/' ) )
     {
         rpBuf++;
@@ -839,16 +839,16 @@ void PatternFormatter::ImplLoadRes( const ResId& rResId )
     if( pMgr )
     {
         ULONG       nMask = pMgr->ReadLong();
-
+    
         if ( PATTERNFORMATTER_STRICTFORMAT & nMask )
             SetStrictFormat( (BOOL)pMgr->ReadShort() );
-
+    
         if ( PATTERNFORMATTER_EDITMASK & nMask )
             aEditMask = ByteString( pMgr->ReadString(), RTL_TEXTENCODING_ASCII_US );
-
+    
         if ( PATTERNFORMATTER_LITTERALMASK & nMask )
             aLiteralMask = pMgr->ReadString();
-
+    
         if ( (PATTERNFORMATTER_EDITMASK | PATTERNFORMATTER_LITTERALMASK) & nMask )
             ImplSetMask( aEditMask, aLiteralMask );
     }
@@ -1567,7 +1567,7 @@ void DateField::ImplDateSpinArea( BOOL bUp )
                         nPos++;
                 }
             }
-
+                
 
             switch( eFormat )
             {
@@ -1650,7 +1650,7 @@ void DateFormatter::ImplLoadRes( const ResId& rResId )
     if( pMgr )
     {
         ULONG       nMask = pMgr->ReadLong();
-
+    
         if ( DATEFORMATTER_MIN & nMask )
         {
             maMin = Date( ResId( (RSHEADER_TYPE *)pMgr->GetClass(), *pMgr ) );
@@ -1663,10 +1663,10 @@ void DateFormatter::ImplLoadRes( const ResId& rResId )
         }
         if ( DATEFORMATTER_LONGFORMAT & nMask )
             mbLongFormat = (BOOL)pMgr->ReadShort();
-
+    
         if ( DATEFORMATTER_STRICTFORMAT & nMask )
             SetStrictFormat( (BOOL)pMgr->ReadShort() );
-
+    
         if ( DATEFORMATTER_VALUE & nMask )
         {
             maFieldDate = Date( ResId( (RSHEADER_TYPE *)pMgr->GetClass(), *pMgr ) );
@@ -2086,12 +2086,12 @@ DateField::DateField( Window* pParent, const ResId& rResId ) :
 void DateField::ImplLoadRes( const ResId& rResId )
 {
     SpinField::ImplLoadRes( rResId );
-
+    
     ResMgr* pMgr = rResId.GetResMgr();
     if( pMgr )
     {
         DateFormatter::ImplLoadRes( ResId( (RSHEADER_TYPE *)GetClassRes(), *pMgr ) );
-
+    
         ULONG  nMask = ReadLongRes();
         if ( DATEFIELD_FIRST & nMask )
         {
@@ -2819,28 +2819,28 @@ void TimeFormatter::ImplLoadRes( const ResId& rResId )
     if( pMgr )
     {
         ULONG   nMask = pMgr->ReadLong();
-
+    
         if ( TIMEFORMATTER_MIN & nMask )
         {
             SetMin( Time( ResId( (RSHEADER_TYPE *)pMgr->GetClass(), *pMgr ) ) );
             pMgr->Increment( pMgr->GetObjSize( (RSHEADER_TYPE *)pMgr->GetClass() ) );
         }
-
+    
         if ( TIMEFORMATTER_MAX & nMask )
         {
             SetMax( Time( ResId( (RSHEADER_TYPE *)pMgr->GetClass(), *pMgr ) ) );
             pMgr->Increment( pMgr->GetObjSize( (RSHEADER_TYPE *)pMgr->GetClass() ) );
         }
-
+    
         if ( TIMEFORMATTER_TIMEFIELDFORMAT & nMask )
             meFormat = (TimeFieldFormat)pMgr->ReadLong();
-
+    
         if ( TIMEFORMATTER_DURATION & nMask )
             mbDuration = (BOOL)pMgr->ReadShort();
-
+    
         if ( TIMEFORMATTER_STRICTFORMAT & nMask )
             SetStrictFormat( (BOOL)pMgr->ReadShort() );
-
+    
         if ( TIMEFORMATTER_VALUE & nMask )
         {
             maFieldTime = Time( ResId( (RSHEADER_TYPE *)pMgr->GetClass(), *pMgr ) );
@@ -2849,7 +2849,7 @@ void TimeFormatter::ImplLoadRes( const ResId& rResId )
             if ( maFieldTime < GetMin() )
                 maFieldTime = GetMin();
             maLastTime = maFieldTime;
-
+    
             pMgr->Increment( pMgr->GetObjSize( (RSHEADER_TYPE *)pMgr->GetClass() ) );
         }
     }
@@ -3140,9 +3140,9 @@ void TimeField::ImplLoadRes( const ResId& rResId )
     if( pMgr )
     {
         TimeFormatter::ImplLoadRes( ResId( (RSHEADER_TYPE *)GetClassRes(), *pMgr ) );
-
+    
         ULONG      nMask = ReadLongRes();
-
+    
         if ( TIMEFIELD_FIRST & nMask )
         {
             maFirst = Time( ResId( (RSHEADER_TYPE *)GetClassRes(), *pMgr ) );
@@ -3154,7 +3154,7 @@ void TimeField::ImplLoadRes( const ResId& rResId )
             IncrementRes( GetObjSizeRes( (RSHEADER_TYPE *)GetClassRes() ) );
         }
     }
-
+    
     Reformat();
 }
 
diff --git a/vcl/source/control/fixbrd.cxx b/vcl/source/control/fixbrd.cxx
index b519174f95d1..a42097ee53ed 100644
--- a/vcl/source/control/fixbrd.cxx
+++ b/vcl/source/control/fixbrd.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
@@ -40,8 +40,8 @@
 
 void FixedBorder::ImplInit( Window* pParent, WinBits nStyle )
 {
-    mnType          = FIXEDBORDER_TYPE_DOUBLEOUT;
-    mbTransparent   = TRUE;
+    mnType			= FIXEDBORDER_TYPE_DOUBLEOUT;
+    mbTransparent	= TRUE;
 
     nStyle = ImplInitStyle( nStyle );
     Control::ImplInit( pParent, nStyle, NULL );
@@ -119,9 +119,9 @@ FixedBorder::~FixedBorder()
 void FixedBorder::ImplDraw( OutputDevice* pDev, ULONG nDrawFlags,
                             const Point& rPos, const Size& rSize )
 {
-    const StyleSettings&    rStyleSettings = GetSettings().GetStyleSettings();
-    Rectangle               aRect( rPos, rSize );
-    USHORT                  nBorderStyle = mnType;
+    const StyleSettings&	rStyleSettings = GetSettings().GetStyleSettings();
+    Rectangle				aRect( rPos, rSize );
+    USHORT					nBorderStyle = mnType;
 
     if ( (nDrawFlags & WINDOW_DRAW_MONO) ||
          (rStyleSettings.GetOptions() & STYLE_OPTION_MONO) )
@@ -144,7 +144,7 @@ void FixedBorder::ImplDraw( OutputDevice* pDev, ULONG nDrawFlags,
     else
     */
     {
-        DecorationView  aDecoView( pDev );
+        DecorationView	aDecoView( pDev );
         aDecoView.DrawFrame( aRect, nBorderStyle );
     }
 }
@@ -161,8 +161,8 @@ void FixedBorder::Paint( const Rectangle& )
 void FixedBorder::Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize,
                         ULONG nFlags )
 {
-    Point   aPos  = pDev->LogicToPixel( rPos );
-    Size    aSize = pDev->LogicToPixel( rSize );
+    Point	aPos  = pDev->LogicToPixel( rPos );
+    Size	aSize = pDev->LogicToPixel( rSize );
 
     pDev->Push();
     pDev->SetMapMode();
diff --git a/vcl/source/control/fixed.cxx b/vcl/source/control/fixed.cxx
index 37406293d7cf..ef778c1d0cbd 100644
--- a/vcl/source/control/fixed.cxx
+++ b/vcl/source/control/fixed.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
@@ -37,21 +37,21 @@
 
 // =======================================================================
 
-#define FIXEDLINE_TEXT_BORDER    4
+#define FIXEDLINE_TEXT_BORDER	 4
 
-#define FIXEDTEXT_VIEW_STYLE    (WB_3DLOOK |                        \
-                                 WB_LEFT | WB_CENTER | WB_RIGHT |   \
-                                 WB_TOP | WB_VCENTER | WB_BOTTOM |  \
-                                 WB_WORDBREAK | WB_NOLABEL |        \
+#define FIXEDTEXT_VIEW_STYLE	(WB_3DLOOK |						\
+                                 WB_LEFT | WB_CENTER | WB_RIGHT |	\
+                                 WB_TOP | WB_VCENTER | WB_BOTTOM |	\
+                                 WB_WORDBREAK | WB_NOLABEL |		\
                                  WB_INFO | WB_PATHELLIPSIS)
-#define FIXEDLINE_VIEW_STYLE    (WB_3DLOOK | WB_NOLABEL)
-#define FIXEDBITMAP_VIEW_STYLE  (WB_3DLOOK |                        \
-                                 WB_LEFT | WB_CENTER | WB_RIGHT |   \
-                                 WB_TOP | WB_VCENTER | WB_BOTTOM |  \
+#define FIXEDLINE_VIEW_STYLE	(WB_3DLOOK | WB_NOLABEL)
+#define FIXEDBITMAP_VIEW_STYLE	(WB_3DLOOK |						\
+                                 WB_LEFT | WB_CENTER | WB_RIGHT |	\
+                                 WB_TOP | WB_VCENTER | WB_BOTTOM |	\
                                  WB_SCALE)
-#define FIXEDIMAGE_VIEW_STYLE   (WB_3DLOOK |                        \
-                                 WB_LEFT | WB_CENTER | WB_RIGHT |   \
-                                 WB_TOP | WB_VCENTER | WB_BOTTOM |  \
+#define FIXEDIMAGE_VIEW_STYLE	(WB_3DLOOK |						\
+                                 WB_LEFT | WB_CENTER | WB_RIGHT |	\
+                                 WB_TOP | WB_VCENTER | WB_BOTTOM |	\
                                  WB_SCALE)
 
 // =======================================================================
@@ -59,8 +59,8 @@
 static Point ImplCalcPos( WinBits nStyle, const Point& rPos,
                           const Size& rObjSize, const Size& rWinSize )
 {
-    long    nX;
-    long    nY;
+    long	nX;
+    long	nY;
 
     if ( nStyle & WB_LEFT )
         nX = 0;
@@ -228,10 +228,10 @@ void FixedText::ImplDraw( OutputDevice* pDev, ULONG nDrawFlags,
                           bool bFillLayout
                           ) const
 {
-    const StyleSettings&    rStyleSettings = GetSettings().GetStyleSettings();
-    WinBits                 nWinStyle = GetStyle();
-    XubString               aText( GetText() );
-    USHORT                  nTextStyle = FixedText::ImplGetTextStyle( nWinStyle );
+    const StyleSettings&	rStyleSettings = GetSettings().GetStyleSettings();
+    WinBits 				nWinStyle = GetStyle();
+    XubString				aText( GetText() );
+    USHORT					nTextStyle = FixedText::ImplGetTextStyle( nWinStyle );
     Point                   aPos = rPos;
 
     if ( nWinStyle & WB_EXTRAOFFSET )
@@ -283,9 +283,9 @@ void FixedText::Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize,
 {
     ImplInitSettings( TRUE, TRUE, TRUE );
 
-    Point       aPos  = pDev->LogicToPixel( rPos );
-    Size        aSize = pDev->LogicToPixel( rSize );
-    Font        aFont = GetDrawPixelFont( pDev );
+    Point		aPos  = pDev->LogicToPixel( rPos );
+    Size		aSize = pDev->LogicToPixel( rSize );
+    Font		aFont = GetDrawPixelFont( pDev );
 
     pDev->Push();
     pDev->SetMapMode();
@@ -347,7 +347,7 @@ void FixedText::StateChanged( StateChangedType nType )
             Invalidate();
         }
     }
-    else if ( (nType == STATE_CHANGE_ZOOM)  ||
+    else if ( (nType == STATE_CHANGE_ZOOM)	||
               (nType == STATE_CHANGE_CONTROLFONT) )
     {
         ImplInitSettings( TRUE, FALSE, FALSE );
@@ -494,11 +494,11 @@ void FixedLine::ImplInitSettings( BOOL bFont,
 
 void FixedLine::ImplDraw( bool bLayout )
 {
-    Size                    aOutSize = GetOutputSizePixel();
-    String                  aText = GetText();
-    WinBits                 nWinStyle = GetStyle();
-    MetricVector*           pVector = bLayout ? &mpControlData->mpLayoutData->m_aUnicodeBoundRects : NULL;
-    String*                 pDisplayText = bLayout ? &mpControlData->mpLayoutData->m_aDisplayText : NULL;
+    Size					aOutSize = GetOutputSizePixel();
+    String					aText = GetText();
+    WinBits 				nWinStyle = GetStyle();
+    MetricVector*			pVector = bLayout ? &mpControlData->mpLayoutData->m_aUnicodeBoundRects : NULL;
+    String*					pDisplayText = bLayout ? &mpControlData->mpLayoutData->m_aDisplayText : NULL;
 
     DecorationView aDecoView( this );
     if ( !aText.Len() || (nWinStyle & WB_VERT) )
@@ -522,8 +522,8 @@ void FixedLine::ImplDraw( bool bLayout )
     }
     else
     {
-        USHORT      nStyle = TEXT_DRAW_MNEMONIC | TEXT_DRAW_LEFT | TEXT_DRAW_VCENTER | TEXT_DRAW_ENDELLIPSIS;
-        Rectangle   aRect( 0, 0, aOutSize.Width(), aOutSize.Height() );
+        USHORT		nStyle = TEXT_DRAW_MNEMONIC | TEXT_DRAW_LEFT | TEXT_DRAW_VCENTER | TEXT_DRAW_ENDELLIPSIS;
+        Rectangle	aRect( 0, 0, aOutSize.Width(), aOutSize.Height() );
         const StyleSettings& rStyleSettings = GetSettings().GetStyleSettings();
 
         if ( !IsEnabled() )
@@ -616,7 +616,7 @@ void FixedLine::StateChanged( StateChangedType nType )
              (GetStyle() & FIXEDLINE_VIEW_STYLE) )
             Invalidate();
     }
-    else if ( (nType == STATE_CHANGE_ZOOM)  ||
+    else if ( (nType == STATE_CHANGE_ZOOM)	||
               (nType == STATE_CHANGE_STYLE) ||
               (nType == STATE_CHANGE_CONTROLFONT) )
     {
@@ -806,9 +806,9 @@ void FixedBitmap::Paint( const Rectangle& )
 void FixedBitmap::Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize,
                         ULONG nFlags )
 {
-    Point       aPos  = pDev->LogicToPixel( rPos );
-    Size        aSize = pDev->LogicToPixel( rSize );
-    Rectangle   aRect( aPos, aSize );
+    Point		aPos  = pDev->LogicToPixel( rPos );
+    Size		aSize = pDev->LogicToPixel( rSize );
+    Rectangle	aRect( aPos, aSize );
 
     pDev->Push();
     pDev->SetMapMode();
@@ -1058,9 +1058,9 @@ void FixedImage::UserDraw( const UserDrawEvent& )
 void FixedImage::Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize,
                        ULONG nFlags )
 {
-    Point       aPos  = pDev->LogicToPixel( rPos );
-    Size        aSize = pDev->LogicToPixel( rSize );
-    Rectangle   aRect( aPos, aSize );
+    Point		aPos  = pDev->LogicToPixel( rPos );
+    Size		aSize = pDev->LogicToPixel( rSize );
+    Rectangle	aRect( aPos, aSize );
 
     pDev->Push();
     pDev->SetMapMode();
diff --git a/vcl/source/control/group.cxx b/vcl/source/control/group.cxx
index ecf00568e11f..9b423709595f 100644
--- a/vcl/source/control/group.cxx
+++ b/vcl/source/control/group.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
@@ -39,10 +39,10 @@
 
 // =======================================================================
 
-#define GROUP_BORDER            12
-#define GROUP_TEXT_BORDER       2
+#define GROUP_BORDER			12
+#define GROUP_TEXT_BORDER		2
 
-#define GROUP_VIEW_STYLE        (WB_3DLOOK | WB_NOLABEL)
+#define GROUP_VIEW_STYLE		(WB_3DLOOK | WB_NOLABEL)
 
 // =======================================================================
 
@@ -136,12 +136,12 @@ GroupBox::GroupBox( Window* pParent, const ResId& rResId ) :
 void GroupBox::ImplDraw( OutputDevice* pDev, ULONG nDrawFlags,
                          const Point& rPos, const Size& rSize, bool bLayout )
 {
-    long                    nTop;
-    long                    nTextOff;
-    const StyleSettings&    rStyleSettings = GetSettings().GetStyleSettings();
-    XubString               aText( GetText() );
-    Rectangle               aRect( rPos, rSize );
-    USHORT                  nTextStyle = TEXT_DRAW_LEFT | TEXT_DRAW_TOP | TEXT_DRAW_ENDELLIPSIS | TEXT_DRAW_MNEMONIC;
+    long					nTop;
+    long					nTextOff;
+    const StyleSettings&	rStyleSettings = GetSettings().GetStyleSettings();
+    XubString				aText( GetText() );
+    Rectangle				aRect( rPos, rSize );
+    USHORT					nTextStyle = TEXT_DRAW_LEFT | TEXT_DRAW_TOP | TEXT_DRAW_ENDELLIPSIS | TEXT_DRAW_MNEMONIC;
 
     if ( GetStyle() & WB_NOLABEL )
         nTextStyle &= ~TEXT_DRAW_MNEMONIC;
@@ -186,7 +186,7 @@ void GroupBox::ImplDraw( OutputDevice* pDev, ULONG nDrawFlags,
             pDev->SetLineColor( Color( COL_BLACK ) );
         else
             pDev->SetLineColor( rStyleSettings.GetShadowColor() );
-
+        
         if ( !aText.Len() )
             pDev->DrawLine( Point( rPos.X(), nTop ), Point( rPos.X()+rSize.Width()-2, nTop ) );
         else
@@ -228,7 +228,7 @@ void GroupBox::ImplDraw( OutputDevice* pDev, ULONG nDrawFlags,
 void GroupBox::FillLayoutData() const
 {
     mpControlData->mpLayoutData = new vcl::ControlLayoutData();
-    const_cast<GroupBox*>(this)->   ImplDraw( const_cast<GroupBox*>(this), 0, Point(), GetOutputSizePixel(), true );
+    const_cast<GroupBox*>(this)->	ImplDraw( const_cast<GroupBox*>(this), 0, Point(), GetOutputSizePixel(), true );
 }
 
 // -----------------------------------------------------------------------
@@ -243,9 +243,9 @@ void GroupBox::Paint( const Rectangle& )
 void GroupBox::Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize,
                      ULONG nFlags )
 {
-    Point       aPos  = pDev->LogicToPixel( rPos );
-    Size        aSize = pDev->LogicToPixel( rSize );
-    Font        aFont = GetDrawPixelFont( pDev );
+    Point		aPos  = pDev->LogicToPixel( rPos );
+    Size		aSize = pDev->LogicToPixel( rSize );
+    Font		aFont = GetDrawPixelFont( pDev );
 
     pDev->Push();
     pDev->SetMapMode();
@@ -288,7 +288,7 @@ void GroupBox::StateChanged( StateChangedType nType )
              (GetStyle() & GROUP_VIEW_STYLE) )
             Invalidate();
     }
-    else if ( (nType == STATE_CHANGE_ZOOM)  ||
+    else if ( (nType == STATE_CHANGE_ZOOM)	||
               (nType == STATE_CHANGE_CONTROLFONT) )
     {
         ImplInitSettings( TRUE, FALSE, FALSE );
diff --git a/vcl/source/control/ilstbox.cxx b/vcl/source/control/ilstbox.cxx
index 02c8d2b5fcb3..f88e9c8f7c76 100644
--- a/vcl/source/control/ilstbox.cxx
+++ b/vcl/source/control/ilstbox.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
@@ -283,10 +283,10 @@ USHORT ImplEntryList::FindEntry( const XubString& rString, BOOL bSearchMRUArea )
 
 USHORT ImplEntryList::FindMatchingEntry( const XubString& rStr, USHORT nStart, BOOL bForward, BOOL bLazy ) const
 {
-    USHORT  nPos = LISTBOX_ENTRY_NOTFOUND;
-    USHORT  nEntryCount = GetEntryCount();
+    USHORT	nPos = LISTBOX_ENTRY_NOTFOUND;
+    USHORT	nEntryCount = GetEntryCount();
     if ( !bForward )
-        nStart++;   // wird sofort dekrementiert
+        nStart++;	// wird sofort dekrementiert
 
     const vcl::I18nHelper& rI18nHelper = mpWindow->GetSettings().GetLocaleI18nHelper();
     for ( USHORT n = nStart; bForward ? ( n < nEntryCount ) : n; )
@@ -341,7 +341,7 @@ long ImplEntryList::GetAddedHeight( USHORT i_nEndIndex, USHORT i_nBeginIndex, lo
             nStop = nEntryCount-1;
         if( nStart > nEntryCount-1 )
             nStart = nEntryCount-1;
-
+        
         USHORT nIndex = nStart;
         while( nIndex != LISTBOX_ENTRY_NOTFOUND && nIndex < nStop )
         {
@@ -531,37 +531,37 @@ USHORT ImplEntryList::FindFirstSelectable( USHORT nPos, bool bForward /* = true
 ImplListBoxWindow::ImplListBoxWindow( Window* pParent, WinBits nWinStyle ) :
     Control( pParent, 0 )
 {
-    mpEntryList         = new ImplEntryList( this );
-
-    mnTop               = 0;
-    mnLeft              = 0;
-    mnBorder            = 1;
-    mnSelectModifier    = 0;
-    mnUserDrawEntry     = LISTBOX_ENTRY_NOTFOUND;
-    mbTrack             = FALSE;
-    mbImgsDiffSz        = FALSE;
-    mbTravelSelect      = FALSE;
-    mbTrackingSelect    = FALSE;
-    mbSelectionChanged  = FALSE;
-    mbMouseMoveSelect   = FALSE;
-    mbMulti             = FALSE;
-    mbStackMode         = FALSE;
-    mbGrabFocus         = FALSE;
-    mbUserDrawEnabled   = FALSE;
-    mbInUserDraw        = FALSE;
-    mbReadOnly          = FALSE;
+    mpEntryList 		= new ImplEntryList( this );
+
+    mnTop				= 0;
+    mnLeft				= 0;
+    mnBorder			= 1;
+    mnSelectModifier	= 0;
+    mnUserDrawEntry 	= LISTBOX_ENTRY_NOTFOUND;
+    mbTrack 			= FALSE;
+    mbImgsDiffSz		= FALSE;
+    mbTravelSelect		= FALSE;
+    mbTrackingSelect	= FALSE;
+    mbSelectionChanged	= FALSE;
+    mbMouseMoveSelect	= FALSE;
+    mbMulti 			= FALSE;
+    mbStackMode 		= FALSE;
+    mbGrabFocus 		= FALSE;
+    mbUserDrawEnabled	= FALSE;
+    mbInUserDraw		= FALSE;
+    mbReadOnly			= FALSE;
     mbHasFocusRect      = FALSE;
     mbRight             = ( nWinStyle & WB_RIGHT )      ? TRUE : FALSE;
     mbCenter            = ( nWinStyle & WB_CENTER )     ? TRUE : FALSE;
-    mbSimpleMode        = ( nWinStyle & WB_SIMPLEMODE ) ? TRUE : FALSE;
-    mbSort              = ( nWinStyle & WB_SORT )       ? TRUE : FALSE;
+    mbSimpleMode		= ( nWinStyle & WB_SIMPLEMODE ) ? TRUE : FALSE;
+    mbSort				= ( nWinStyle & WB_SORT )       ? TRUE : FALSE;
 
     // pb: #106948# explicit mirroring for calc
-    mbMirroring         = FALSE;
+    mbMirroring			= FALSE;
 
-    mnCurrentPos            = LISTBOX_ENTRY_NOTFOUND;
+    mnCurrentPos			= LISTBOX_ENTRY_NOTFOUND;
     mnTrackingSaveSelection = LISTBOX_ENTRY_NOTFOUND;
-    mnSeparatorPos          = LISTBOX_ENTRY_NOTFOUND;
+    mnSeparatorPos			= LISTBOX_ENTRY_NOTFOUND;
     meProminentType         = PROMINENT_TOP;
 
     SetLineColor();
@@ -594,11 +594,11 @@ void ImplListBoxWindow::ImplInitSettings( BOOL bFont, BOOL bForeground, BOOL bBa
 
 void ImplListBoxWindow::ImplCalcMetrics()
 {
-    mnMaxWidth      = 0;
-    mnMaxTxtWidth   = 0;
-    mnMaxImgWidth   = 0;
+    mnMaxWidth		= 0;
+    mnMaxTxtWidth	= 0;
+    mnMaxImgWidth	= 0;
     mnMaxImgTxtWidth= 0;
-    mnMaxImgHeight  = 0;
+    mnMaxImgHeight	= 0;
 
     mnTextHeight = (USHORT)GetTextHeight();
     mnMaxTxtHeight = mnTextHeight + mnBorder;
@@ -636,15 +636,15 @@ void ImplListBoxWindow::Clear()
 {
     mpEntryList->Clear();
 
-    mnMaxHeight     = mnMaxTxtHeight;
-    mnMaxWidth      = 0;
-    mnMaxTxtWidth   = 0;
+    mnMaxHeight 	= mnMaxTxtHeight;
+    mnMaxWidth		= 0;
+    mnMaxTxtWidth	= 0;
     mnMaxImgTxtWidth= 0;
-    mnMaxImgWidth   = 0;
-    mnMaxImgHeight  = 0;
-    mnTop           = 0;
-    mnLeft          = 0;
-    mbImgsDiffSz    = FALSE;
+    mnMaxImgWidth	= 0;
+    mnMaxImgHeight	= 0;
+    mnTop			= 0;
+    mnLeft			= 0;
+    mbImgsDiffSz	= FALSE;
     ImplClearLayoutData();
 
     mnCurrentPos = LISTBOX_ENTRY_NOTFOUND;
@@ -663,13 +663,13 @@ void ImplListBoxWindow::SetUserItemSize( const Size& rSz )
 
 struct ImplEntryMetrics
 {
-    BOOL    bText;
-    BOOL    bImage;
-    long    nEntryWidth;
-    long    nEntryHeight;
-    long    nTextWidth;
-    long    nImgWidth;
-    long    nImgHeight;
+    BOOL	bText;
+    BOOL	bImage;
+    long	nEntryWidth;
+    long	nEntryHeight;
+    long	nTextWidth;
+    long	nImgWidth;
+    long	nImgHeight;
 };
 
 // -----------------------------------------------------------------------
@@ -715,7 +715,7 @@ void ImplListBoxWindow::ImplUpdateEntryMetrics( ImplEntryType& rEntry )
     if ( aMetrics.bImage )
     {
         Size aImgSz = rEntry.maImage.GetSizePixel();
-        aMetrics.nImgWidth  = (USHORT) CalcZoom( aImgSz.Width() );
+        aMetrics.nImgWidth	= (USHORT) CalcZoom( aImgSz.Width() );
         aMetrics.nImgHeight = (USHORT) CalcZoom( aImgSz.Height() );
 
         if( mnMaxImgWidth && ( aMetrics.nImgWidth != mnMaxImgWidth ) )
@@ -730,7 +730,7 @@ void ImplListBoxWindow::ImplUpdateEntryMetrics( ImplEntryType& rEntry )
 
         mnMaxImgTxtWidth = Max( mnMaxImgTxtWidth, aMetrics.nTextWidth );
         aMetrics.nEntryHeight = Max( aMetrics.nImgHeight, aMetrics.nEntryHeight );
-
+            
     }
     if ( IsUserDrawEnabled() || aMetrics.bImage )
     {
@@ -752,7 +752,7 @@ void ImplListBoxWindow::ImplUpdateEntryMetrics( ImplEntryType& rEntry )
         mnMaxWidth = aMetrics.nEntryWidth;
     if ( aMetrics.nEntryHeight > mnMaxHeight )
         mnMaxHeight = aMetrics.nEntryHeight;
-
+    
     rEntry.mnHeight = aMetrics.nEntryHeight;
 }
 
@@ -808,7 +808,7 @@ USHORT ImplListBoxWindow::InsertEntry( USHORT nPos, ImplEntryType* pNewEntry )
 
     if( (GetStyle() & WB_WORDBREAK) )
         pNewEntry->mnFlags |= LISTBOX_ENTRY_FLAG_MULTILINE;
-
+    
     ImplUpdateEntryMetrics( *pNewEntry );
     return nNewPos;
 }
@@ -861,7 +861,7 @@ void ImplListBoxWindow::ImplHideFocusRect()
 USHORT ImplListBoxWindow::GetEntryPosForPoint( const Point& rPoint ) const
 {
     long nY = mnBorder;
-
+    
     USHORT nSelect = mnTop;
     const ImplEntryType* pEntry = mpEntryList->GetEntryPtr( nSelect );
     while( pEntry && rPoint.Y() > pEntry->mnHeight + nY )
@@ -880,7 +880,7 @@ USHORT ImplListBoxWindow::GetEntryPosForPoint( const Point& rPoint ) const
 BOOL ImplListBoxWindow::IsVisible( USHORT i_nEntry ) const
 {
     BOOL bRet = FALSE;
-
+    
     if( i_nEntry >= mnTop )
     {
         if( mpEntryList->GetAddedHeight( i_nEntry, mnTop ) <
@@ -889,7 +889,7 @@ BOOL ImplListBoxWindow::IsVisible( USHORT i_nEntry ) const
             bRet = TRUE;
         }
     }
-
+    
     return bRet;
 }
 
@@ -903,13 +903,13 @@ USHORT ImplListBoxWindow::GetLastVisibleEntry() const
     long nDiff;
     for( nDiff = 0; nDiff < nWindowHeight && nPos < nCount; nDiff = mpEntryList->GetAddedHeight( nPos, mnTop ) )
         nPos++;
-
+    
     if( nDiff > nWindowHeight && nPos > mnTop )
         nPos--;
-
+    
     if( nPos >= nCount )
         nPos = nCount-1;
-
+    
     return nPos;
 }
 
@@ -917,7 +917,7 @@ USHORT ImplListBoxWindow::GetLastVisibleEntry() const
 
 void ImplListBoxWindow::MouseButtonDown( const MouseEvent& rMEvt )
 {
-    mbMouseMoveSelect = FALSE;  // Nur bis zum ersten MouseButtonDown
+    mbMouseMoveSelect = FALSE;	// Nur bis zum ersten MouseButtonDown
     maSearchStr.Erase();
 
     if ( !IsReadOnly() )
@@ -991,7 +991,7 @@ void ImplListBoxWindow::MouseMove( const MouseEvent& rMEvt )
                 nSelect = Min( nSelect, GetLastVisibleEntry() );
                 nSelect = Min( nSelect, (USHORT) ( mpEntryList->GetEntryCount() - 1 ) );
                 // Select only visible Entries with MouseMove, otherwise Tracking...
-                if ( IsVisible( nSelect ) &&
+                if ( IsVisible( nSelect ) && 
                     mpEntryList->IsEntrySelectable( nSelect ) &&
                     ( ( nSelect != mnCurrentPos ) || !GetEntryList()->GetSelectEntryCount() || ( nSelect != GetEntryList()->GetSelectEntryPos( 0 ) ) ) )
                 {
@@ -1303,7 +1303,7 @@ void ImplListBoxWindow::Tracking( const TrackingEvent& rTEvt )
             MouseEvent aMEvt = rTEvt.GetMouseEvent();
             Point aPt( aMEvt.GetPosPixel() );
             BOOL bShift = aMEvt.IsShift();
-            BOOL bCtrl  = aMEvt.IsMod1();
+            BOOL bCtrl	= aMEvt.IsMod1();
 
             USHORT nSelect = LISTBOX_ENTRY_NOTFOUND;
             if( aPt.Y() < 0 )
@@ -1319,7 +1319,7 @@ void ImplListBoxWindow::Tracking( const TrackingEvent& rTEvt )
             {
                 if ( mnCurrentPos != LISTBOX_ENTRY_NOTFOUND )
                 {
-                    nSelect = Min(  (USHORT)(mnCurrentPos+1), (USHORT)(mpEntryList->GetEntryCount()-1) );
+                    nSelect = Min(	(USHORT)(mnCurrentPos+1), (USHORT)(mpEntryList->GetEntryCount()-1) );
                     if( nSelect >= GetLastVisibleEntry() )
                         SetTopEntry( mnTop+1 );
                 }
@@ -1422,9 +1422,9 @@ void ImplListBoxWindow::KeyInput( const KeyEvent& rKEvt )
 
 // -----------------------------------------------------------------------
 
-#define IMPL_SELECT_NODIRECTION 0
-#define IMPL_SELECT_UP          1
-#define IMPL_SELECT_DOWN        2
+#define IMPL_SELECT_NODIRECTION	0
+#define IMPL_SELECT_UP			1
+#define IMPL_SELECT_DOWN		2
 
 BOOL ImplListBoxWindow::ProcessKeyInput( const KeyEvent& rKEvt )
 {
@@ -1435,12 +1435,12 @@ BOOL ImplListBoxWindow::ProcessKeyInput( const KeyEvent& rKEvt )
     KeyCode aKeyCode = rKEvt.GetKeyCode();
 
     BOOL bShift = aKeyCode.IsShift();
-    BOOL bCtrl  = aKeyCode.IsMod1() || aKeyCode.IsMod3();
+    BOOL bCtrl	= aKeyCode.IsMod1() || aKeyCode.IsMod3();
     BOOL bMod2 = aKeyCode.IsMod2();
     BOOL bDone = FALSE;
 
     switch( aKeyCode.GetCode() )
-    {
+    {		
         case KEY_UP:
         {
             if ( IsReadOnly() )
@@ -1517,7 +1517,7 @@ BOOL ImplListBoxWindow::ProcessKeyInput( const KeyEvent& rKEvt )
                         USHORT nCurVis = GetLastVisibleEntry() - mnTop +1;
                         SetTopEntry( ( mnTop > nCurVis ) ? ( mnTop-nCurVis+1 ) : 0 );
                     }
-
+                    
                     // find first selectable starting from mnTop looking foreward
                     nSelect = mpEntryList->FindFirstSelectable( mnTop, true );
                 }
@@ -1636,7 +1636,7 @@ BOOL ImplListBoxWindow::ProcessKeyInput( const KeyEvent& rKEvt )
             {
                 mnSelectModifier = rKEvt.GetKeyCode().GetModifier();
                 ImplCallSelect();
-                bDone = FALSE;  // RETURN nicht abfangen.
+                bDone = FALSE;	// RETURN nicht abfangen.
             }
             maSearchStr.Erase();
         }
@@ -1665,16 +1665,16 @@ BOOL ImplListBoxWindow::ProcessKeyInput( const KeyEvent& rKEvt )
                 BOOL bUpdates = IsUpdateMode();
                 SetUpdateMode( FALSE );
 
-                USHORT nEntryCount = mpEntryList->GetEntryCount();
+                USHORT nEntryCount = mpEntryList->GetEntryCount();                
                 for( USHORT i = 0; i < nEntryCount; i++ )
                     SelectEntry( i, TRUE );
-
+                
                 // restore update mode
                 SetUpdateMode( bUpdates );
                 Invalidate();
-
+                
                 maSearchStr.Erase();
-
+                
                 bDone = TRUE;
                 break;
             }
@@ -1748,7 +1748,7 @@ BOOL ImplListBoxWindow::ProcessKeyInput( const KeyEvent& rKEvt )
 void ImplListBoxWindow::ImplPaint( USHORT nPos, BOOL bErase, bool bLayout )
 {
     const StyleSettings& rStyleSettings = GetSettings().GetStyleSettings();
-
+    
     const ImplEntryType* pEntry = mpEntryList->GetEntryPtr( nPos );
     if( ! pEntry )
         return;
@@ -1801,8 +1801,8 @@ void ImplListBoxWindow::DrawEntry( USHORT nPos, BOOL bDrawImage, BOOL bDrawText,
 {
     const ImplEntryType* pEntry = mpEntryList->GetEntryPtr( nPos );
     if( ! pEntry )
-        return;
-
+        return; 
+    
     // Bei Aenderungen in dieser Methode ggf. auch ImplWin::DrawEntry() anpassen.
 
     if ( mbInUserDraw )
@@ -1876,7 +1876,7 @@ void ImplListBoxWindow::DrawEntry( USHORT nPos, BOOL bDrawImage, BOOL bDrawText,
                 nDrawStyle |= MULTILINE_ENTRY_DRAW_FLAGS;
             if( (pEntry->mnFlags & LISTBOX_ENTRY_FLAG_DRAW_DISABLED) )
                 nDrawStyle |= TEXT_DRAW_DISABLE;
-
+            
             DrawText( aTextRect, aStr, nDrawStyle, pVector, pDisplayText );
         }
     }
@@ -1952,7 +1952,7 @@ void ImplListBoxWindow::Paint( const Rectangle& rRect )
 USHORT ImplListBoxWindow::GetDisplayLineCount() const
 {
     // FIXME: LISTBOX_ENTRY_FLAG_MULTILINE
-
+    
     USHORT nCount = mpEntryList->GetEntryCount();
     long nHeight = GetOutputSizePixel().Height();// - mnMaxHeight + mnBorder;
     USHORT nEntries = static_cast< USHORT >( ( nHeight + mnMaxHeight - 1 ) / mnMaxHeight );
@@ -2025,16 +2025,16 @@ void ImplListBoxWindow::SetTopEntry( USHORT nTop )
 {
     if( mpEntryList->GetEntryCount() == 0 )
         return;
-
+    
     long nWHeight = PixelToLogic( GetSizePixel() ).Height();
-
+    
     USHORT nLastEntry = mpEntryList->GetEntryCount()-1;
     if( nTop > nLastEntry )
         nTop = nLastEntry;
     const ImplEntryType* pLast = mpEntryList->GetEntryPtr( nLastEntry );
     while( nTop > 0 && mpEntryList->GetAddedHeight( nLastEntry, nTop-1 ) + pLast->mnHeight <= nWHeight )
         nTop--;
-
+    
     if ( nTop != mnTop )
     {
         ImplClearLayoutData();
@@ -2112,10 +2112,10 @@ void ImplListBoxWindow::ScrollHorz( long n )
 Size ImplListBoxWindow::CalcSize( USHORT nMaxLines ) const
 {
     // FIXME: LISTBOX_ENTRY_FLAG_MULTILINE
-
+    
     Size aSz;
-//  USHORT nL = Min( nMaxLines, mpEntryList->GetEntryCount() );
-    aSz.Height() =  nMaxLines * mnMaxHeight;
+//	USHORT nL = Min( nMaxLines, mpEntryList->GetEntryCount() );
+    aSz.Height() =	nMaxLines * mnMaxHeight;
     aSz.Width() = mnMaxWidth + 2*mnBorder;
     return aSz;
 }
@@ -2213,17 +2213,17 @@ ImplListBox::ImplListBox( Window* pParent, WinBits nWinStyle ) :
     // for native widget rendering we must be able to detect this window type
     SetType( WINDOW_LISTBOXWINDOW );
 
-    mpVScrollBar    = new ScrollBar( this, WB_VSCROLL | WB_DRAG );
-    mpHScrollBar    = new ScrollBar( this, WB_HSCROLL | WB_DRAG );
-    mpScrollBarBox  = new ScrollBarBox( this );
+    mpVScrollBar	= new ScrollBar( this, WB_VSCROLL | WB_DRAG );
+    mpHScrollBar	= new ScrollBar( this, WB_HSCROLL | WB_DRAG );
+    mpScrollBarBox	= new ScrollBarBox( this );
 
     Link aLink( LINK( this, ImplListBox, ScrollBarHdl ) );
     mpVScrollBar->SetScrollHdl( aLink );
     mpHScrollBar->SetScrollHdl( aLink );
 
-    mbVScroll       = FALSE;
-    mbHScroll       = FALSE;
-    mbAutoHScroll   = ( nWinStyle & WB_AUTOHSCROLL ) ? TRUE : FALSE;
+    mbVScroll		= FALSE;
+    mbHScroll		= FALSE;
+    mbAutoHScroll	= ( nWinStyle & WB_AUTOHSCROLL ) ? TRUE : FALSE;
 
     maLBWindow.SetScrollHdl( LINK( this, ImplListBox, LBWindowScrolled ) );
     maLBWindow.SetMRUChangedHdl( LINK( this, ImplListBox, MRUChanged ) );
@@ -2395,7 +2395,7 @@ void ImplListBox::ImplCheckScrollBars()
         mbVScroll = TRUE;
 
         // Ueberpruefung des rausgescrollten Bereichs
-        SetTopEntry( GetTopEntry() );   // MaxTop wird geprueft...
+        SetTopEntry( GetTopEntry() );	// MaxTop wird geprueft...
     }
     else
     {
@@ -2419,7 +2419,7 @@ void ImplListBox::ImplCheckScrollBars()
                 bArrange = TRUE;
             mbHScroll = TRUE;
 
-            if ( !mbVScroll )   // ggf. brauchen wir jetzt doch einen
+            if ( !mbVScroll )	// ggf. brauchen wir jetzt doch einen
             {
                 nMaxVisEntries = (USHORT) ( ( aOutSz.Height() - mpHScrollBar->GetSizePixel().Height() ) / GetEntryHeight() );
                 if( nEntries > nMaxVisEntries )
@@ -2428,7 +2428,7 @@ void ImplListBox::ImplCheckScrollBars()
                     mbVScroll = TRUE;
 
                     // Ueberpruefung des rausgescrollten Bereichs
-                    SetTopEntry( GetTopEntry() );   // MaxTop wird geprueft...
+                    SetTopEntry( GetTopEntry() );	// MaxTop wird geprueft...
                 }
             }
 
@@ -2552,8 +2552,8 @@ void ImplListBox::StateChanged( StateChangedType nType )
     {
         BOOL bUpdate = IsUpdateMode();
         maLBWindow.SetUpdateMode( bUpdate );
-//      mpHScrollBar->SetUpdateMode( bUpdate );
-//      mpVScrollBar->SetUpdateMode( bUpdate );
+//		mpHScrollBar->SetUpdateMode( bUpdate );
+//		mpVScrollBar->SetUpdateMode( bUpdate );
         if ( bUpdate && IsReallyVisible() )
             ImplCheckScrollBars();
     }
@@ -2596,13 +2596,13 @@ void ImplListBox::StateChanged( StateChangedType nType )
 
 void ImplListBox::DataChanged( const DataChangedEvent& rDCEvt )
 {
-//  if ( (rDCEvt.GetType() == DATACHANGED_SETTINGS) &&
-//       (rDCEvt.GetFlags() & SETTINGS_STYLE) )
-//  {
-//      maLBWindow.SetSettings( GetSettings() );
-//      Resize();
-//  }
-//  else
+//	if ( (rDCEvt.GetType() == DATACHANGED_SETTINGS) &&
+//		 (rDCEvt.GetFlags() & SETTINGS_STYLE) )
+//	{
+//		maLBWindow.SetSettings( GetSettings() );
+//		Resize();
+//	}
+//	else
         Control::DataChanged( rDCEvt );
 }
 
@@ -2751,7 +2751,7 @@ void ImplWin::MouseButtonDown( const MouseEvent& )
 {
     if( IsEnabled() )
     {
-//      Control::MouseButtonDown( rMEvt );
+//		Control::MouseButtonDown( rMEvt );
         MBDown();
     }
 }
@@ -2812,7 +2812,7 @@ void ImplWin::ImplDraw( bool bLayout )
             nState &= ~CTRL_STATE_ENABLED;
             if ( pWin->HasFocus() )
             nState |= CTRL_STATE_FOCUSED;
-
+            
             // The listbox is painted over the entire control including the
             // border, but ImplWin does not contain the border => correction
             // needed.
@@ -2828,10 +2828,10 @@ void ImplWin::ImplDraw( bool bLayout )
                 while( pChild && (bMouseOver = pChild->IsMouseOver()) == FALSE )
                     pChild = pChild->GetWindow( WINDOW_NEXT );
             }
-
+            
             if( bMouseOver )
                 nState |= CTRL_STATE_ROLLOVER;
-
+            
             // if parent has no border, then nobody has drawn the background
             // since no border window exists. so draw it here.
             WinBits nParentStyle = pWin->GetStyle();
@@ -2841,7 +2841,7 @@ void ImplWin::ImplDraw( bool bLayout )
                 pWin->DrawNativeControl( CTRL_LISTBOX, PART_ENTIRE_CONTROL, aParentRect,
                                          nState, aControlValue, rtl::OUString() );
             }
-
+            
             bNativeOK = DrawNativeControl( CTRL_LISTBOX, PART_ENTIRE_CONTROL, aCtrlRegion, nState,
                 aControlValue, rtl::OUString() );
         }
@@ -3012,7 +3012,7 @@ void ImplWin::LoseFocus()
 
 ImplBtn::ImplBtn( Window* pParent, WinBits nWinStyle ) :
     PushButton(  pParent, nWinStyle ),
-    mbDown  ( FALSE )
+    mbDown	( FALSE )
 {
 }
 
@@ -3048,7 +3048,7 @@ ImplListBoxFloatingWindow::ImplListBoxFloatingWindow( Window* pParent ) :
     mnPopupModeStartSaveSelection = LISTBOX_ENTRY_NOTFOUND;
 
     EnableSaveBackground();
-
+    
     Window * pBorderWindow = ImplGetBorderWindow();
     if( pBorderWindow )
     {
@@ -3098,7 +3098,7 @@ void ImplListBoxFloatingWindow::SetPosSizePixel( long nX, long nY, long nWidth,
         SetPosPixel( ImplCalcPos( this, Rectangle( aPos, GetParent()->GetSizePixel() ), FLOATWIN_POPUPMODE_DOWN, nIndex ) );
     }
 
-//  if( !IsReallyVisible() )
+//	if( !IsReallyVisible() )
     {
         // Die ImplListBox erhaelt kein Resize, weil nicht sichtbar.
         // Die Fenster muessen aber ein Resize() erhalten, damit die
diff --git a/vcl/source/control/imgctrl.cxx b/vcl/source/control/imgctrl.cxx
index 075a8b1b95e2..f643f0c479e1 100644
--- a/vcl/source/control/imgctrl.cxx
+++ b/vcl/source/control/imgctrl.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
@@ -232,7 +232,7 @@ void    ImageControl::Paint( const Rectangle& rRect )
     if( HasFocus() )
     {
         Window *pWin = GetWindow( WINDOW_BORDER );
-
+        
         BOOL bFlat = (GetBorderStyle() == 2);
         Rectangle aRect( Point(0,0), pWin->GetOutputSizePixel() );
         Color oldLineCol = pWin->GetLineColor();
diff --git a/vcl/source/control/longcurr.cxx b/vcl/source/control/longcurr.cxx
index 65fe11929d1e..1d32efdaf54f 100644
--- a/vcl/source/control/longcurr.cxx
+++ b/vcl/source/control/longcurr.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
@@ -49,14 +49,14 @@
 
 // =======================================================================
 
-#define FORMAT_LONGCURRENCY      4
+#define FORMAT_LONGCURRENCY 	 4
 
 // =======================================================================
 
 static BigInt ImplPower10( USHORT n )
 {
     USHORT i;
-    BigInt   nValue = 1;
+    BigInt	 nValue = 1;
 
     for ( i=0; i < n; i++ )
         nValue *= 10;
@@ -83,7 +83,7 @@ static XubString ImplGetCurr( const LocaleDataWrapper& rLocaleDataWrapper, const
     if ( !aInteger.IsZero() )
     {
         aFraction += aTmp;
-        aTmp       = 1000000000L;
+        aTmp	   = 1000000000L;
     }
     if ( rNumber.IsNeg() )
         aFraction *= -1;
@@ -123,7 +123,7 @@ static BOOL ImplNumericProcessKeyInput( Edit*, const KeyEvent& rKEvt,
     else
     {
         sal_Unicode cChar = rKEvt.GetCharCode();
-        USHORT      nGroup = rKEvt.GetKeyCode().GetGroup();
+        USHORT		nGroup = rKEvt.GetKeyCode().GetGroup();
 
         if ( (nGroup == KEYGROUP_FKEYS) || (nGroup == KEYGROUP_CURSOR) ||
              (nGroup == KEYGROUP_MISC) ||
@@ -143,12 +143,12 @@ static BOOL ImplNumericGetValue( const XubString& rStr, BigInt& rValue,
                                  USHORT nDecDigits, const LocaleDataWrapper& rLocaleDataWrapper,
                                  BOOL bCurrency = FALSE )
 {
-    XubString   aStr = rStr;
-    XubString   aStr1;
-    XubString   aStr2;
-    USHORT      nDecPos;
-    BOOL        bNegative = FALSE;
-    xub_StrLen  i;
+    XubString	aStr = rStr;
+    XubString	aStr1;
+    XubString	aStr2;
+    USHORT		nDecPos;
+    BOOL		bNegative = FALSE;
+    xub_StrLen	i;
 
     // Reaktion auf leeren String
     if ( !rStr.Len() )
@@ -315,7 +315,7 @@ BOOL ImplLongCurrencyReformat( const XubString& rStr, BigInt nMin, BigInt nMax,
             }
         }
 
-        rOutStr = ImplGetCurr( rLocaleDataWrapper, nTempVal, nDecDigits, rFormatter.GetCurrencySymbol(), rFormatter.IsUseThousandSep() );
+        rOutStr = ImplGetCurr( rLocaleDataWrapper, nTempVal, nDecDigits, rFormatter.GetCurrencySymbol(), rFormatter.IsUseThousandSep() ); 
         return TRUE;
     }
 }
@@ -325,14 +325,14 @@ BOOL ImplLongCurrencyReformat( const XubString& rStr, BigInt nMin, BigInt nMax,
 
 void LongCurrencyFormatter::ImpInit()
 {
-    mnFieldValue        = 0;
-    mnLastValue         = 0;
-    mnMin               = 0;
-    mnMax               = 0x7FFFFFFF;
-    mnMax              *= 0x7FFFFFFF;
-    mnCorrectedValue    = 0;
+    mnFieldValue		= 0;
+    mnLastValue 		= 0;
+    mnMin				= 0;
+    mnMax				= 0x7FFFFFFF;
+    mnMax			   *= 0x7FFFFFFF;
+    mnCorrectedValue	= 0;
     mnDecimalDigits     = 0;
-    mnType              = FORMAT_LONGCURRENCY;
+    mnType				= FORMAT_LONGCURRENCY;
     mbThousandSep       = TRUE;
     SetDecimalDigits( 0 );
 }
@@ -350,23 +350,23 @@ void LongCurrencyFormatter::ImplLoadRes( const ResId& rResId )
 {
     ImpInit();
 
-    ResMgr*     pMgr = rResId.GetResMgr();
+    ResMgr* 	pMgr = rResId.GetResMgr();
     if( pMgr )
     {
-        ULONG       nMask = pMgr->ReadLong();
-
+        ULONG		nMask = pMgr->ReadLong();
+    
         if ( NUMERICFORMATTER_MIN & nMask )
             mnMin = pMgr->ReadLong();
-
+    
         if ( NUMERICFORMATTER_MAX & nMask )
             mnMax = pMgr->ReadLong();
-
+    
         if ( NUMERICFORMATTER_STRICTFORMAT & nMask )
             SetStrictFormat(  (BOOL)pMgr->ReadShort() );
-
+    
         if ( NUMERICFORMATTER_DECIMALDIGITS & nMask )
             SetDecimalDigits( pMgr->ReadShort() );
-
+    
         if ( NUMERICFORMATTER_VALUE & nMask )
         {
             mnFieldValue = pMgr->ReadLong();
@@ -516,11 +516,11 @@ void LongCurrencyFormatter::SetUseThousandSep( BOOL b )
 
 void LongCurrencyFormatter::SetDecimalDigits( USHORT nDigits )
 {
-//  DBG_ASSERT( nDigits < 10, "LongCurrency duerfen nur maximal 9 Nachkommastellen haben" );
+//	DBG_ASSERT( nDigits < 10, "LongCurrency duerfen nur maximal 9 Nachkommastellen haben" );
 
     if ( nDigits > 9 )
         nDigits = 9;
-
+    
     mnDecimalDigits = nDigits;
     ReformatAll();
 }
@@ -601,9 +601,9 @@ LongCurrencyField::LongCurrencyField( Window* pParent, WinBits nWinStyle ) :
     SpinField( pParent, nWinStyle )
 {
     SetField( this );
-    mnSpinSize   = 1;
-    mnFirst      = mnMin;
-    mnLast       = mnMax;
+    mnSpinSize	 = 1;
+    mnFirst 	 = mnMin;
+    mnLast		 = mnMax;
 
     Reformat();
 }
@@ -618,9 +618,9 @@ LongCurrencyField::LongCurrencyField( Window* pParent, const ResId& rResId ) :
     SpinField::ImplInit( pParent, nStyle );
 
     SetField( this );
-    mnSpinSize   = 1;
-    mnFirst      = mnMin;
-    mnLast       = mnMax;
+    mnSpinSize	 = 1;
+    mnFirst 	 = mnMin;
+    mnLast		 = mnMax;
 
     Reformat();
 
diff --git a/vcl/source/control/lstbox.cxx b/vcl/source/control/lstbox.cxx
index 03527bf083a7..56faa153f1ca 100644
--- a/vcl/source/control/lstbox.cxx
+++ b/vcl/source/control/lstbox.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
@@ -99,13 +99,13 @@ ListBox::~ListBox()
 
 void ListBox::ImplInitListBoxData()
 {
-    mpFloatWin      = NULL;
-    mpImplWin       = NULL;
-    mpBtn           = NULL;
+    mpFloatWin		= NULL;
+    mpImplWin		= NULL;
+    mpBtn			= NULL;
 
-    mnDDHeight      = 0;
-    mbDDAutoSize    = TRUE;
-    mnSaveValue     = LISTBOX_ENTRY_NOTFOUND;
+    mnDDHeight		= 0;
+    mbDDAutoSize	= TRUE;
+    mnSaveValue 	= LISTBOX_ENTRY_NOTFOUND;
     mnLineCount     = 0;
 }
 
@@ -175,7 +175,7 @@ void ListBox::ImplInit( Window* pParent, WinBits nStyle )
     mpImplLB->SetUserDrawHdl( LINK( this, ListBox, ImplUserDrawHdl ) );
     mpImplLB->SetPosPixel( Point() );
     mpImplLB->Show();
-
+    
     mpImplLB->GetDropTarget()->addDropTargetListener(xDrop);
     mpImplLB->SetDropTraget(xDrop);
 
@@ -216,7 +216,7 @@ void ListBox::ImplLoadRes( const ResId& rResId )
 
         long nId = ReadLongRes();
         if( nId )
-            SetEntryData( nPos, (void *)nId );  // ID als UserData
+            SetEntryData( nPos, (void *)nId );	// ID als UserData
     }
 
     if( nSelPos < nNumber )
@@ -449,11 +449,11 @@ void ListBox::Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, UL
 
     if ( IsDropDownBox() )
     {
-        XubString   aText = GetSelectEntry();
-        long        nTextHeight = pDev->GetTextHeight();
-        long        nTextWidth = pDev->GetTextWidth( aText );
-        long        nOffX = 3*nOnePixel;
-        long        nOffY = (aSize.Height()-nTextHeight) / 2;
+        XubString	aText = GetSelectEntry();
+        long		nTextHeight = pDev->GetTextHeight();
+        long		nTextWidth = pDev->GetTextWidth( aText );
+        long		nOffX = 3*nOnePixel;
+        long		nOffY = (aSize.Height()-nTextHeight) / 2;
 
         // Clipping?
         if ( (nOffY < 0) ||
@@ -470,9 +470,9 @@ void ListBox::Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, UL
     }
     else
     {
-        long        nTextHeight = pDev->GetTextHeight();
-        USHORT      nLines = (USHORT)(aSize.Height() / nTextHeight);
-        Rectangle   aClip( aPos, aSize );
+        long		nTextHeight = pDev->GetTextHeight();
+        USHORT		nLines = (USHORT)(aSize.Height() / nTextHeight);
+        Rectangle	aClip( aPos, aSize );
 
         pDev->IntersectClipRegion( aClip );
 
@@ -486,7 +486,7 @@ void ListBox::Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, UL
             if ( bSelected )
             {
                 pDev->SetFillColor( COL_BLACK );
-                pDev->DrawRect( Rectangle(  Point( aPos.X(), aPos.Y() + n*nTextHeight ),
+                pDev->DrawRect( Rectangle(	Point( aPos.X(), aPos.Y() + n*nTextHeight ),
                                             Point( aPos.X() + aSize.Width(), aPos.Y() + (n+1)*nTextHeight + 2*nOnePixel ) ) );
                 pDev->SetFillColor();
                 pDev->SetTextColor( COL_WHITE );
@@ -565,7 +565,7 @@ void ListBox::DataChanged( const DataChangedEvent& rDCEvt )
 
         if ( mpImplWin )
         {
-            mpImplWin->SetSettings( GetSettings() );    // Falls noch nicht eingestellt...
+            mpImplWin->SetSettings( GetSettings() );	// Falls noch nicht eingestellt...
             ImplInitFieldSettings( mpImplWin, TRUE, TRUE, TRUE );
 
             mpBtn->SetSettings( GetSettings() );
@@ -654,8 +654,8 @@ void ListBox::Resize()
     {
         // initialize the dropdown button size with the standard scrollbar width
         long nSBWidth = GetSettings().GetStyleSettings().GetScrollBarSize();
-        long    nTop = 0;
-        long    nBottom = aOutSz.Height();
+        long	nTop = 0;
+        long	nBottom = aOutSz.Height();
 
         // note: in case of no border, pBorder will actually be this
         Window *pBorder = GetWindow( WINDOW_BORDER );
@@ -759,7 +759,7 @@ long ListBox::GetIndexForPoint( const Point& rPoint, USHORT& rPos ) const
         // point must be either in main list window
         // or in impl window (dropdown case)
         ImplListBoxWindow* pMain = mpImplLB->GetMainWindow();
-
+    
         // convert coordinates to ImplListBoxWindow pixel coordinate space
         Point aConvPoint = LogicToPixel( rPoint );
         aConvPoint = OutputToAbsoluteScreenPixel( aConvPoint );
@@ -1349,7 +1349,7 @@ Size ListBox::CalcMinimumSize() const
     }
 
     aSz = CalcWindowSize( aSz );
-
+    
     if ( IsDropDownBox() ) // check minimum height of dropdown box
     {
         ImplControlValue aControlValue;
@@ -1362,7 +1362,7 @@ Size ListBox::CalcMinimumSize() const
                 aSz.Height() = aBound.GetHeight();
         }
     }
-
+    
     return aSz;
 }
 
@@ -1410,7 +1410,7 @@ Size ListBox::CalcSize( USHORT nColumns, USHORT nLines ) const
 {
     // ggf. werden ScrollBars eingeblendet
     Size aMinSz = CalcMinimumSize();
-//  aMinSz = ImplCalcOutSz( aMinSz );
+//	aMinSz = ImplCalcOutSz( aMinSz );
 
     Size aSz;
 
diff --git a/vcl/source/control/menubtn.cxx b/vcl/source/control/menubtn.cxx
index 1c83779da1a9..1814c65d29a8 100644
--- a/vcl/source/control/menubtn.cxx
+++ b/vcl/source/control/menubtn.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
@@ -41,20 +41,20 @@
 
 // =======================================================================
 
-#define IMAGEBUTTON_BORDER_OFF1     11
-#define IMAGEBUTTON_BORDER_OFF2     16
+#define IMAGEBUTTON_BORDER_OFF1 	11
+#define IMAGEBUTTON_BORDER_OFF2 	16
 
 // =======================================================================
 
 void MenuButton::ImplInitMenuButtonData()
 {
-    mnDDStyle       = PUSHBUTTON_DROPDOWN_MENUBUTTON;
+    mnDDStyle		= PUSHBUTTON_DROPDOWN_MENUBUTTON;
 
-    mpMenuTimer     = NULL;
-    mpMenu          = NULL;
-    mpOwnMenu       = NULL;
-    mnCurItemId     = 0;
-    mnMenuMode      = 0;
+    mpMenuTimer 	= NULL;
+    mpMenu			= NULL;
+    mpOwnMenu		= NULL;
+    mnCurItemId 	= 0;
+    mnMenuMode		= 0;
 }
 
 // -----------------------------------------------------------------------
@@ -82,10 +82,10 @@ void MenuButton::ImplExecuteMenu()
         if ( !((GetStyle() & (WB_RECTSTYLE | WB_SMALLSTYLE)) ||
              !(rStyleSettings.GetOptions() & STYLE_OPTION_MACSTYLE)) )
         {
-            aRect.Left()    += 2;
-            aRect.Top()     += 2;
-            aRect.Right()   -= 2;
-            aRect.Bottom()  -= 2;
+            aRect.Left()	+= 2;
+            aRect.Top() 	+= 2;
+            aRect.Right()	-= 2;
+            aRect.Bottom()	-= 2;
         }
         SetPressed( TRUE );
         EndSelection();
@@ -181,10 +181,10 @@ void MenuButton::MouseButtonDown( const MouseEvent& rMEvt )
                 mpMenuTimer = new Timer;
                 mpMenuTimer->SetTimeoutHdl( LINK( this, MenuButton, ImplMenuTimeoutHdl ) );
             }
-
+    
             mpMenuTimer->SetTimeout( GetSettings().GetMouseSettings().GetActionDelay() );
             mpMenuTimer->Start();
-
+    
             PushButton::MouseButtonDown( rMEvt );
             bExecute = false;
         }
diff --git a/vcl/source/control/morebtn.cxx b/vcl/source/control/morebtn.cxx
index 921a25756d32..7a38602f215d 100644
--- a/vcl/source/control/morebtn.cxx
+++ b/vcl/source/control/morebtn.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
@@ -51,9 +51,9 @@ struct ImplMoreButtonData
 void MoreButton::ImplInit( Window* pParent, WinBits nStyle )
 {
     mpMBData     = new ImplMoreButtonData;
-    mnDelta      = 0;
-    meUnit       = MAP_PIXEL;
-    mbState      = FALSE;
+    mnDelta 	 = 0;
+    meUnit		 = MAP_PIXEL;
+    mbState 	 = FALSE;
 
     mpMBData->mpItemList = NULL;
 
@@ -148,10 +148,10 @@ MoreButton::~MoreButton()
 
 void MoreButton::Click()
 {
-    Window*     pParent = GetParent();
-    Size        aSize( pParent->GetSizePixel() );
-    Window*     pWindow = (mpMBData->mpItemList) ? mpMBData->mpItemList->First() : NULL;
-    long        nDeltaPixel = LogicToPixel( Size( 0, mnDelta ), meUnit ).Height();
+    Window* 	pParent = GetParent();
+    Size		aSize( pParent->GetSizePixel() );
+    Window* 	pWindow = (mpMBData->mpItemList) ? mpMBData->mpItemList->First() : NULL;
+    long		nDeltaPixel = LogicToPixel( Size( 0, mnDelta ), meUnit ).Height();
 
     // Status aendern
     mbState = !mbState;
diff --git a/vcl/source/control/scrbar.cxx b/vcl/source/control/scrbar.cxx
index 9c82bb096dec..fb8c5ccddc1d 100644
--- a/vcl/source/control/scrbar.cxx
+++ b/vcl/source/control/scrbar.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
@@ -49,10 +49,10 @@ using namespace rtl;
     However aqua draws a little outside. The canonical way would be to enhance the
     HitTestNativeControl passing a ScrollbarValue additionally so all necessary
     information is available in the call.
-    .
+    .    
     However since there is only this one small exception we will deviate a little and
     instead pass the respective rect as control region to allow for a small correction.
-
+    
     So all places using HitTestNativeControl on PART_THUMB_HORZ, PART_THUMB_VERT,
     PART_TRACK_HORZ_LEFT, PART_TRACK_HORZ_RIGHT, PART_TRACK_VERT_UPPER, PART_TRACK_VERT_LOWER
     do not use the control rectangle as region but the actuall part rectangle, making
@@ -92,9 +92,9 @@ static long ImplMulDiv( long nNumber, long nNumerator, long nDenominator )
 
 struct ImplScrollBarData
 {
-    AutoTimer       maTimer;            // Timer
+    AutoTimer		maTimer;			// Timer
     BOOL            mbHide;
-    Rectangle       maTrackRect; // TODO: move to ScrollBar class when binary incompatibility of ScrollBar class is no longer problematic
+    Rectangle		maTrackRect; // TODO: move to ScrollBar class when binary incompatibility of ScrollBar class is no longer problematic
 };
 
 // =======================================================================
@@ -375,8 +375,8 @@ void ScrollBar::ImplCalc( BOOL bUpdate )
             if( mnThumbPixRange > 0 )
             {
                 maPage1Rect.Left()      = maTrackRect.Left();
-                maPage1Rect.Bottom()    =
-                maPage2Rect.Bottom()    =
+                maPage1Rect.Bottom()	=
+                maPage2Rect.Bottom()	=
                 maThumbRect.Bottom()    = maTrackRect.Bottom();
             }
             else
@@ -416,8 +416,8 @@ void ScrollBar::ImplCalc( BOOL bUpdate )
             if( mnThumbPixRange > 0 )
             {
                 maPage1Rect.Top()       = maTrackRect.Top();
-                maPage1Rect.Right()     =
-                maPage2Rect.Right()     =
+                maPage1Rect.Right()		=
+                maPage2Rect.Right()		=
                 maThumbRect.Right()     = maTrackRect.Right();
             }
             else
@@ -498,7 +498,7 @@ void ScrollBar::Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize,
         pDev->SetSettings( aSettings );
     }
 
-    // for printing:
+    // for printing: 
     // -calculate the size of the rects
     // -because this is zero-based add the correct offset
     // -print
@@ -534,7 +534,7 @@ BOOL ScrollBar::ImplDrawNative( USHORT nDrawFlags )
         // Draw the entire background if the control supports it
         if( IsNativeControlSupported(CTRL_SCROLLBAR, bHorz ? PART_DRAW_BACKGROUND_HORZ : PART_DRAW_BACKGROUND_VERT) )
         {
-            ControlState        nState = ( IsEnabled() ? CTRL_STATE_ENABLED : 0 ) | ( HasFocus() ? CTRL_STATE_FOCUSED : 0 );
+            ControlState		nState = ( IsEnabled() ? CTRL_STATE_ENABLED : 0 ) | ( HasFocus() ? CTRL_STATE_FOCUSED : 0 );
 
             scrValue.mnMin = mnMinRange;
             scrValue.mnMax = mnMaxRange;
@@ -582,8 +582,8 @@ BOOL ScrollBar::ImplDrawNative( USHORT nDrawFlags )
       {
         if ( (nDrawFlags & SCRBAR_DRAW_PAGE1) || (nDrawFlags & SCRBAR_DRAW_PAGE2) )
         {
-            sal_uInt32  part1 = bHorz ? PART_TRACK_HORZ_LEFT : PART_TRACK_VERT_UPPER;
-            sal_uInt32  part2 = bHorz ? PART_TRACK_HORZ_RIGHT : PART_TRACK_VERT_LOWER;
+            sal_uInt32	part1 = bHorz ? PART_TRACK_HORZ_LEFT : PART_TRACK_VERT_UPPER;
+            sal_uInt32	part2 = bHorz ? PART_TRACK_HORZ_RIGHT : PART_TRACK_VERT_LOWER;
             Rectangle   aCtrlRegion1( maPage1Rect );
             Rectangle   aCtrlRegion2( maPage2Rect );
             ControlState nState1 = (IsEnabled() ? CTRL_STATE_ENABLED : 0) | (HasFocus() ? CTRL_STATE_FOCUSED : 0);
@@ -605,19 +605,19 @@ BOOL ScrollBar::ImplDrawNative( USHORT nDrawFlags )
             }
 
             if ( nDrawFlags & SCRBAR_DRAW_PAGE1 )
-                bNativeOK = DrawNativeControl( CTRL_SCROLLBAR, part1, aCtrlRegion1, nState1,
+                bNativeOK = DrawNativeControl( CTRL_SCROLLBAR, part1, aCtrlRegion1, nState1, 
                                 scrValue, rtl::OUString() );
 
             if ( nDrawFlags & SCRBAR_DRAW_PAGE2 )
-                bNativeOK = DrawNativeControl( CTRL_SCROLLBAR, part2, aCtrlRegion2, nState2,
+                bNativeOK = DrawNativeControl( CTRL_SCROLLBAR, part2, aCtrlRegion2, nState2, 
                                 scrValue, rtl::OUString() );
         }
         if ( (nDrawFlags & SCRBAR_DRAW_BTN1) || (nDrawFlags & SCRBAR_DRAW_BTN2) )
         {
-            sal_uInt32  part1 = bHorz ? PART_BUTTON_LEFT : PART_BUTTON_UP;
-            sal_uInt32  part2 = bHorz ? PART_BUTTON_RIGHT : PART_BUTTON_DOWN;
-            Rectangle   aCtrlRegion1( maBtn1Rect );
-            Rectangle   aCtrlRegion2( maBtn2Rect );
+            sal_uInt32	part1 = bHorz ? PART_BUTTON_LEFT : PART_BUTTON_UP;
+            sal_uInt32	part2 = bHorz ? PART_BUTTON_RIGHT : PART_BUTTON_DOWN;
+            Rectangle  	aCtrlRegion1( maBtn1Rect );
+            Rectangle  	aCtrlRegion2( maBtn2Rect );
             ControlState nState1 = HasFocus() ? CTRL_STATE_FOCUSED : 0;
             ControlState nState2 = nState1;
 
@@ -647,17 +647,17 @@ BOOL ScrollBar::ImplDrawNative( USHORT nDrawFlags )
             }
 
             if ( nDrawFlags & SCRBAR_DRAW_BTN1 )
-                bNativeOK = DrawNativeControl( CTRL_SCROLLBAR, part1, aCtrlRegion1, nState1,
+                bNativeOK = DrawNativeControl( CTRL_SCROLLBAR, part1, aCtrlRegion1, nState1, 
                                 scrValue, rtl::OUString() );
 
             if ( nDrawFlags & SCRBAR_DRAW_BTN2 )
-                bNativeOK = DrawNativeControl( CTRL_SCROLLBAR, part2, aCtrlRegion2, nState2,
+                bNativeOK = DrawNativeControl( CTRL_SCROLLBAR, part2, aCtrlRegion2, nState2, 
                                 scrValue, rtl::OUString() );
         }
         if ( (nDrawFlags & SCRBAR_DRAW_THUMB) && !maThumbRect.IsEmpty() )
         {
-            ControlState    nState = IsEnabled() ? CTRL_STATE_ENABLED : 0;
-            Rectangle       aCtrlRegion( maThumbRect );
+            ControlState	nState = IsEnabled() ? CTRL_STATE_ENABLED : 0;
+            Rectangle		aCtrlRegion( maThumbRect );
 
             if ( mnStateFlags & SCRBAR_STATE_THUMB_DOWN )
                 nState |= CTRL_STATE_PRESSED;
@@ -699,7 +699,7 @@ void ScrollBar::ImplDraw( USHORT nDrawFlags, OutputDevice* pOutDev )
     Window *pWin = NULL;
     if( pOutDev->GetOutDevType() == OUTDEV_WINDOW )
         pWin = (Window*) pOutDev;
-
+    
     // Draw the entire control if the native theme engine needs it
     if ( nDrawFlags && pWin && pWin->IsNativeControlSupported(CTRL_SCROLLBAR, PART_DRAW_BACKGROUND_HORZ) )
     {
@@ -1067,13 +1067,13 @@ void ScrollBar::MouseButtonDown( const MouseEvent& rMEvt )
                     if( HasFocus() )
                         ImplDraw( SCRBAR_DRAW_THUMB, this ); // paint without focus
                 }
-
+    
                 if ( mnVisibleSize < mnMaxRange-mnMinRange )
                 {
                     nTrackFlags     = 0;
                     meScrollType    = SCROLL_DRAG;
                     mnDragDraw      = SCRBAR_DRAW_THUMB;
-
+                    
                     // calculate mouse offset
                     if( rMEvt.IsMiddle() || (ImplGetSVData()->maNWFData.mbScrollbarJumpPage && !bThumbHit) )
                     {
@@ -1090,7 +1090,7 @@ void ScrollBar::MouseButtonDown( const MouseEvent& rMEvt )
                         else
                             mnMouseOff = rMousePos.Y()-maThumbRect.Top();
                     }
-
+    
                     mnStateFlags |= SCRBAR_STATE_THUMB_DOWN;
                     ImplDraw( mnDragDraw, this );
                 }
@@ -1102,11 +1102,11 @@ void ScrollBar::MouseButtonDown( const MouseEvent& rMEvt )
                 bIsInside : TRUE )
             {
                 nTrackFlags = STARTTRACK_BUTTONREPEAT;
-
+    
                 // HitTestNativeControl, see remark at top of file
                 if ( HitTestNativeControl( CTRL_SCROLLBAR, bHorizontal? PART_TRACK_HORZ_LEFT : PART_TRACK_VERT_UPPER,
                                            maPage1Rect, rMousePos, bIsInside )?
-                    bIsInside:
+                    bIsInside:                
                     maPage1Rect.IsInside( rMousePos ) )
                 {
                     meScrollType    = SCROLL_PAGEUP;
@@ -1125,12 +1125,12 @@ void ScrollBar::MouseButtonDown( const MouseEvent& rMEvt )
         {
             // remember original position in case of abort or EndScroll-Delta
             mnStartPos = mnThumbPos;
-            // #92906# Call StartTracking() before ImplDoMouseAction(), otherwise
-            // MouseButtonUp() / EndTracking() may be called if somebody is spending
+            // #92906# Call StartTracking() before ImplDoMouseAction(), otherwise 
+            // MouseButtonUp() / EndTracking() may be called if somebody is spending 
             // a lot of time in the scroll handler
             StartTracking( nTrackFlags );
             ImplDoMouseAction( rMousePos );
-
+            
             if( bDragToMouse )
                 ImplDragThumb( rMousePos );
         }
@@ -1279,7 +1279,7 @@ void ScrollBar::ImplInvert()
         aRect.Left() += 2;
         aRect.Right() -= 2;
     }
-    if( aRect.getHeight() > 4 )
+    if( aRect.getHeight() > 4 ) 
     {
         aRect.Top() += 2;
         aRect.Bottom() -= 2;
@@ -1437,7 +1437,7 @@ long ScrollBar::PreNotify( NotifyEvent& rNEvt )
                         aClipRegion.Union( *pRect );
                     if ( pLastRect )
                         aClipRegion.Union( *pLastRect );
-
+                    
                     // Support for 3-button scroll bars
                     BOOL bHas3Buttons = IsNativeControlSupported( CTRL_SCROLLBAR, HAS_THREE_BUTTONS );
                     if ( bHas3Buttons && ( pRect == &maBtn1Rect || pLastRect == &maBtn1Rect ) )
diff --git a/vcl/source/control/slider.cxx b/vcl/source/control/slider.cxx
index daf733a57a33..9a539cf00294 100644
--- a/vcl/source/control/slider.cxx
+++ b/vcl/source/control/slider.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
@@ -47,49 +47,49 @@ static long ImplMulDiv( long nNumber, long nNumerator, long nDenominator )
 
 // =======================================================================
 
-#define SLIDER_DRAW_THUMB           ((USHORT)0x0001)
-#define SLIDER_DRAW_CHANNEL1        ((USHORT)0x0002)
-#define SLIDER_DRAW_CHANNEL2        ((USHORT)0x0004)
-#define SLIDER_DRAW_CHANNEL         (SLIDER_DRAW_CHANNEL1 | SLIDER_DRAW_CHANNEL2)
-#define SLIDER_DRAW_ALL             (SLIDER_DRAW_THUMB | SLIDER_DRAW_CHANNEL)
+#define SLIDER_DRAW_THUMB			((USHORT)0x0001)
+#define SLIDER_DRAW_CHANNEL1		((USHORT)0x0002)
+#define SLIDER_DRAW_CHANNEL2		((USHORT)0x0004)
+#define SLIDER_DRAW_CHANNEL 		(SLIDER_DRAW_CHANNEL1 | SLIDER_DRAW_CHANNEL2)
+#define SLIDER_DRAW_ALL 			(SLIDER_DRAW_THUMB | SLIDER_DRAW_CHANNEL)
 
-#define SLIDER_STATE_CHANNEL1_DOWN  ((USHORT)0x0001)
-#define SLIDER_STATE_CHANNEL2_DOWN  ((USHORT)0x0002)
-#define SLIDER_STATE_THUMB_DOWN     ((USHORT)0x0004)
+#define SLIDER_STATE_CHANNEL1_DOWN	((USHORT)0x0001)
+#define SLIDER_STATE_CHANNEL2_DOWN	((USHORT)0x0002)
+#define SLIDER_STATE_THUMB_DOWN 	((USHORT)0x0004)
 
-#define SLIDER_THUMB_SIZE           9
-#define SLIDER_THUMB_HALFSIZE       4
-#define SLIDER_CHANNEL_OFFSET       0
-#define SLIDER_CHANNEL_SIZE         4
-#define SLIDER_CHANNEL_HALFSIZE     2
+#define SLIDER_THUMB_SIZE			9
+#define SLIDER_THUMB_HALFSIZE		4
+#define SLIDER_CHANNEL_OFFSET		0
+#define SLIDER_CHANNEL_SIZE 		4
+#define SLIDER_CHANNEL_HALFSIZE 	2
 
-#define SLIDER_HEIGHT               16
+#define SLIDER_HEIGHT				16
 
-#define SLIDER_VIEW_STYLE           (WB_3DLOOK | WB_HORZ | WB_VERT)
+#define SLIDER_VIEW_STYLE			(WB_3DLOOK | WB_HORZ | WB_VERT)
 
 // =======================================================================
 
 void Slider::ImplInit( Window* pParent, WinBits nStyle )
 {
-    mnThumbPixOffset    = 0;
-    mnThumbPixRange     = 0;
-    mnThumbPixPos       = 0;    // between mnThumbPixOffset and mnThumbPixOffset+mnThumbPixRange
-    mnChannelPixOffset  = 0;
-    mnChannelPixRange   = 0;
-    mnChannelPixTop     = 0;
-    mnChannelPixBottom  = 0;
-
-    mnMinRange          = 0;
-    mnMaxRange          = 100;
-    mnThumbPos          = 0;
-    mnLineSize          = 1;
-    mnPageSize          = 1;
-    mnDelta             = 0;
-    mnDragDraw          = 0;
-    mnStateFlags        = 0;
-    meScrollType        = SCROLL_DONTKNOW;
-    mbCalcSize          = TRUE;
-    mbFullDrag          = TRUE;
+    mnThumbPixOffset	= 0;
+    mnThumbPixRange 	= 0;
+    mnThumbPixPos		= 0;	// between mnThumbPixOffset and mnThumbPixOffset+mnThumbPixRange
+    mnChannelPixOffset	= 0;
+    mnChannelPixRange	= 0;
+    mnChannelPixTop 	= 0;
+    mnChannelPixBottom	= 0;
+
+    mnMinRange			= 0;
+    mnMaxRange			= 100;
+    mnThumbPos			= 0;
+    mnLineSize			= 1;
+    mnPageSize			= 1;
+    mnDelta 			= 0;
+    mnDragDraw			= 0;
+    mnStateFlags		= 0;
+    meScrollType		= SCROLL_DONTKNOW;
+    mbCalcSize			= TRUE;
+    mbFullDrag			= TRUE;
 
     Control::ImplInit( pParent, nStyle, NULL );
 
@@ -125,12 +125,12 @@ void Slider::ImplLoadRes( const ResId& rResId )
 {
     Control::ImplLoadRes( rResId );
 
-    INT16 nMin          = ReadShortRes();
-    INT16 nMax          = ReadShortRes();
-    INT16 nThumbPos     = ReadShortRes();
-    INT16 nPage         = ReadShortRes();
-    INT16 nStep         = ReadShortRes();
-    /* INT16 nVisibleSize   = */ ReadShortRes();
+    INT16 nMin			= ReadShortRes();
+    INT16 nMax			= ReadShortRes();
+    INT16 nThumbPos		= ReadShortRes();
+    INT16 nPage			= ReadShortRes();
+    INT16 nStep			= ReadShortRes();
+    /* INT16 nVisibleSize	= */ ReadShortRes();
 
     SetRange( Range( nMin, nMax ) );
     SetLineSize( nStep );
@@ -174,27 +174,27 @@ void Slider::ImplUpdateRects( BOOL bUpdate )
     {
         if ( GetStyle() & WB_HORZ )
         {
-            maThumbRect.Left()      = mnThumbPixPos-SLIDER_THUMB_HALFSIZE;
-            maThumbRect.Right()     = maThumbRect.Left()+SLIDER_THUMB_SIZE-1;
+            maThumbRect.Left()		= mnThumbPixPos-SLIDER_THUMB_HALFSIZE;
+            maThumbRect.Right() 	= maThumbRect.Left()+SLIDER_THUMB_SIZE-1;
             if ( mnChannelPixOffset < maThumbRect.Left() )
             {
-                maChannel1Rect.Left()   = mnChannelPixOffset;
-                maChannel1Rect.Right()  = maThumbRect.Left()-1;
-                maChannel1Rect.Top()    = mnChannelPixTop;
+                maChannel1Rect.Left()	= mnChannelPixOffset;
+                maChannel1Rect.Right()	= maThumbRect.Left()-1;
+                maChannel1Rect.Top()	= mnChannelPixTop;
                 maChannel1Rect.Bottom() = mnChannelPixBottom;
             }
             else
                 maChannel1Rect.SetEmpty();
             if ( mnChannelPixOffset+mnChannelPixRange-1 > maThumbRect.Right() )
             {
-                maChannel2Rect.Left()   = maThumbRect.Right()+1;
-                maChannel2Rect.Right()  = mnChannelPixOffset+mnChannelPixRange-1;
-                maChannel2Rect.Top()    = mnChannelPixTop;
+                maChannel2Rect.Left()	= maThumbRect.Right()+1;
+                maChannel2Rect.Right()	= mnChannelPixOffset+mnChannelPixRange-1;
+                maChannel2Rect.Top()	= mnChannelPixTop;
                 maChannel2Rect.Bottom() = mnChannelPixBottom;
             }
             else
                 maChannel2Rect.SetEmpty();
-
+            
             const Rectangle aControlRegion( Rectangle( Point(0,0), Size( SLIDER_THUMB_SIZE, 10 ) ) );
             Rectangle aThumbBounds, aThumbContent;
             if ( GetNativeControlRegion( CTRL_SLIDER, PART_THUMB_HORZ,
@@ -208,23 +208,23 @@ void Slider::ImplUpdateRects( BOOL bUpdate )
         }
         else
         {
-            maThumbRect.Top()       = mnThumbPixPos-SLIDER_THUMB_HALFSIZE;
-            maThumbRect.Bottom()    = maThumbRect.Top()+SLIDER_THUMB_SIZE-1;
+            maThumbRect.Top()		= mnThumbPixPos-SLIDER_THUMB_HALFSIZE;
+            maThumbRect.Bottom()	= maThumbRect.Top()+SLIDER_THUMB_SIZE-1;
             if ( mnChannelPixOffset < maThumbRect.Top() )
             {
-                maChannel1Rect.Top()    = mnChannelPixOffset;
+                maChannel1Rect.Top()	= mnChannelPixOffset;
                 maChannel1Rect.Bottom() = maThumbRect.Top()-1;
-                maChannel1Rect.Left()   = mnChannelPixTop;
-                maChannel1Rect.Right()  = mnChannelPixBottom;
+                maChannel1Rect.Left()	= mnChannelPixTop;
+                maChannel1Rect.Right()	= mnChannelPixBottom;
             }
             else
                 maChannel1Rect.SetEmpty();
             if ( mnChannelPixOffset+mnChannelPixRange-1 > maThumbRect.Bottom() )
             {
-                maChannel2Rect.Top()    = maThumbRect.Bottom()+1;
+                maChannel2Rect.Top()	= maThumbRect.Bottom()+1;
                 maChannel2Rect.Bottom() = mnChannelPixOffset+mnChannelPixRange-1;
-                maChannel2Rect.Left()   = mnChannelPixTop;
-                maChannel2Rect.Right()  = mnChannelPixBottom;
+                maChannel2Rect.Left()	= mnChannelPixTop;
+                maChannel2Rect.Right()	= mnChannelPixBottom;
             }
             else
                 maChannel2Rect.SetEmpty();
@@ -258,7 +258,7 @@ void Slider::ImplUpdateRects( BOOL bUpdate )
             {
                 Region aInvalidRegion( aOldThumbRect );
                 aInvalidRegion.Union( maThumbRect );
-
+                
                 if( !IsBackground() && GetParent() )
                 {
                     const Point aPos( GetPosPixel() );
@@ -309,10 +309,10 @@ void Slider::ImplCalc( BOOL bUpdate )
 
     if ( mbCalcSize )
     {
-        long nOldChannelPixOffset   = mnChannelPixOffset;
-        long nOldChannelPixRange    = mnChannelPixRange;
-        long nOldChannelPixTop      = mnChannelPixTop;
-        long nOldChannelPixBottom   = mnChannelPixBottom;
+        long nOldChannelPixOffset	= mnChannelPixOffset;
+        long nOldChannelPixRange	= mnChannelPixRange;
+        long nOldChannelPixTop		= mnChannelPixTop;
+        long nOldChannelPixBottom	= mnChannelPixBottom;
         long nCalcWidth;
         long nCalcHeight;
 
@@ -323,28 +323,28 @@ void Slider::ImplCalc( BOOL bUpdate )
         Size aSize = GetOutputSizePixel();
         if ( GetStyle() & WB_HORZ )
         {
-            nCalcWidth          = aSize.Width();
-            nCalcHeight         = aSize.Height();
-            maThumbRect.Top()   = 0;
+            nCalcWidth			= aSize.Width();
+            nCalcHeight 		= aSize.Height();
+            maThumbRect.Top()	= 0;
             maThumbRect.Bottom()= aSize.Height()-1;
         }
         else
         {
-            nCalcWidth          = aSize.Height();
-            nCalcHeight         = aSize.Width();
-            maThumbRect.Left()  = 0;
+            nCalcWidth			= aSize.Height();
+            nCalcHeight 		= aSize.Width();
+            maThumbRect.Left()	= 0;
             maThumbRect.Right() = aSize.Width()-1;
         }
 
         if ( nCalcWidth >= SLIDER_THUMB_SIZE )
         {
-            mnThumbPixOffset    = SLIDER_THUMB_HALFSIZE;
-            mnThumbPixRange     = nCalcWidth-(SLIDER_THUMB_HALFSIZE*2);
-            mnThumbPixPos       = 0;
-            mnChannelPixOffset  = SLIDER_CHANNEL_OFFSET;
-            mnChannelPixRange   = nCalcWidth-(SLIDER_CHANNEL_OFFSET*2);
-            mnChannelPixTop     = (nCalcHeight/2)-SLIDER_CHANNEL_HALFSIZE;
-            mnChannelPixBottom  = mnChannelPixTop+SLIDER_CHANNEL_SIZE-1;
+            mnThumbPixOffset	= SLIDER_THUMB_HALFSIZE;
+            mnThumbPixRange 	= nCalcWidth-(SLIDER_THUMB_HALFSIZE*2);
+            mnThumbPixPos		= 0;
+            mnChannelPixOffset	= SLIDER_CHANNEL_OFFSET;
+            mnChannelPixRange	= nCalcWidth-(SLIDER_CHANNEL_OFFSET*2);
+            mnChannelPixTop 	= (nCalcHeight/2)-SLIDER_CHANNEL_HALFSIZE;
+            mnChannelPixBottom	= mnChannelPixTop+SLIDER_CHANNEL_SIZE-1;
         }
         else
         {
@@ -376,10 +376,10 @@ void Slider::ImplCalc( BOOL bUpdate )
 
 void Slider::ImplDraw( USHORT nDrawFlags )
 {
-    DecorationView          aDecoView( this );
-    USHORT                  nStyle;
-    const StyleSettings&    rStyleSettings = GetSettings().GetStyleSettings();
-    BOOL                    bEnabled = IsEnabled();
+    DecorationView			aDecoView( this );
+    USHORT					nStyle;
+    const StyleSettings&	rStyleSettings = GetSettings().GetStyleSettings();
+    BOOL					bEnabled = IsEnabled();
 
     // Evt. noch offene Berechnungen nachholen
     if ( mbCalcSize )
@@ -388,12 +388,12 @@ void Slider::ImplDraw( USHORT nDrawFlags )
     ControlPart nPart = (GetStyle() & WB_HORZ) ? PART_TRACK_HORZ_AREA : PART_TRACK_VERT_AREA;
     ControlState   nState = ( IsEnabled() ? CTRL_STATE_ENABLED : 0 ) | ( HasFocus() ? CTRL_STATE_FOCUSED : 0 );
     SliderValue    sldValue;
-
+    
     sldValue.mnMin       = mnMinRange;
     sldValue.mnMax       = mnMaxRange;
     sldValue.mnCur       = mnThumbPos;
     sldValue.maThumbRect = maThumbRect;
-
+    
     if( IsMouseOver() )
     {
         if( maThumbRect.IsInside( GetPointerPosPixel() ) )
@@ -408,8 +408,8 @@ void Slider::ImplDraw( USHORT nDrawFlags )
 
     if ( (nDrawFlags & SLIDER_DRAW_CHANNEL1) && !maChannel1Rect.IsEmpty() )
     {
-        long        nRectSize;
-        Rectangle   aRect = maChannel1Rect;
+        long		nRectSize;
+        Rectangle	aRect = maChannel1Rect;
         SetLineColor( rStyleSettings.GetShadowColor() );
         if ( GetStyle() & WB_HORZ )
         {
@@ -452,8 +452,8 @@ void Slider::ImplDraw( USHORT nDrawFlags )
 
     if ( (nDrawFlags & SLIDER_DRAW_CHANNEL2) && !maChannel2Rect.IsEmpty() )
     {
-        long        nRectSize;
-        Rectangle   aRect = maChannel2Rect;
+        long		nRectSize;
+        Rectangle	aRect = maChannel2Rect;
         SetLineColor( rStyleSettings.GetLightColor() );
         if ( GetStyle() & WB_HORZ )
         {
@@ -520,13 +520,13 @@ BOOL Slider::ImplIsPageUp( const Point& rPos )
     Rectangle aRect = maChannel1Rect;
     if ( GetStyle() & WB_HORZ )
     {
-        aRect.Top()     = 0;
-        aRect.Bottom()  = aSize.Height()-1;
+        aRect.Top() 	= 0;
+        aRect.Bottom()	= aSize.Height()-1;
     }
     else
     {
-        aRect.Left()    = 0;
-        aRect.Right()   = aSize.Width()-1;
+        aRect.Left()	= 0;
+        aRect.Right()	= aSize.Width()-1;
     }
     return aRect.IsInside( rPos );
 }
@@ -539,13 +539,13 @@ BOOL Slider::ImplIsPageDown( const Point& rPos )
     Rectangle aRect = maChannel2Rect;
     if ( GetStyle() & WB_HORZ )
     {
-        aRect.Top()     = 0;
-        aRect.Bottom()  = aSize.Height()-1;
+        aRect.Top() 	= 0;
+        aRect.Bottom()	= aSize.Height()-1;
     }
     else
     {
-        aRect.Left()    = 0;
-        aRect.Right()   = aSize.Width()-1;
+        aRect.Left()	= 0;
+        aRect.Right()	= aSize.Width()-1;
     }
     return aRect.IsInside( rPos );
 }
@@ -606,15 +606,15 @@ long Slider::ImplDoAction( BOOL bCallEndSlide )
 
 void Slider::ImplDoMouseAction( const Point& rMousePos, BOOL bCallAction )
 {
-    USHORT  nOldStateFlags = mnStateFlags;
-    BOOL    bAction = FALSE;
+    USHORT	nOldStateFlags = mnStateFlags;
+    BOOL	bAction = FALSE;
 
     switch ( meScrollType )
-    {
+    {   
         case( SCROLL_SET ):
         {
             const bool bUp = ImplIsPageUp( rMousePos ), bDown = ImplIsPageDown( rMousePos );
-
+        
             if ( bUp || bDown )
             {
                 bAction = bCallAction;
@@ -624,7 +624,7 @@ void Slider::ImplDoMouseAction( const Point& rMousePos, BOOL bCallAction )
                 mnStateFlags &= ~( SLIDER_STATE_CHANNEL1_DOWN | SLIDER_STATE_CHANNEL2_DOWN );
             break;
         }
-
+        
         case SCROLL_PAGEUP:
             if ( ImplIsPageUp( rMousePos ) )
             {
@@ -698,14 +698,14 @@ void Slider::MouseButtonDown( const MouseEvent& rMEvt )
 {
     if ( rMEvt.IsLeft() )
     {
-        const Point&    rMousePos = rMEvt.GetPosPixel();
-        USHORT          nTrackFlags = 0;
+        const Point&	rMousePos = rMEvt.GetPosPixel();
+        USHORT			nTrackFlags = 0;
 
         if ( maThumbRect.IsInside( rMousePos ) )
         {
-            nTrackFlags     = 0;
-            meScrollType    = SCROLL_DRAG;
-            mnDragDraw      = SLIDER_DRAW_THUMB;
+            nTrackFlags 	= 0;
+            meScrollType	= SCROLL_DRAG;
+            mnDragDraw		= SLIDER_DRAW_THUMB;
 
             // Zusaetzliche Daten berechnen
             Point aCenterPos = maThumbRect.Center();
@@ -730,7 +730,7 @@ void Slider::MouseButtonDown( const MouseEvent& rMEvt )
                 nTrackFlags = STARTTRACK_BUTTONREPEAT;
                 meScrollType = SCROLL_PAGEUP;
             }
-
+            
             mnDragDraw = SLIDER_DRAW_CHANNEL;
         }
         else if ( ImplIsPageDown( rMousePos ) )
@@ -742,7 +742,7 @@ void Slider::MouseButtonDown( const MouseEvent& rMEvt )
                 nTrackFlags = STARTTRACK_BUTTONREPEAT;
                 meScrollType = SCROLL_PAGEDOWN;
             }
-
+            
             mnDragDraw = SLIDER_DRAW_CHANNEL;
         }
 
@@ -753,7 +753,7 @@ void Slider::MouseButtonDown( const MouseEvent& rMEvt )
             mnStartPos = mnThumbPos;
             ImplDoMouseAction( rMousePos, meScrollType != SCROLL_SET );
             Update();
-
+            
             if( meScrollType != SCROLL_SET )
                 StartTracking( nTrackFlags );
         }
@@ -768,12 +768,12 @@ void Slider::MouseButtonUp( const MouseEvent& )
     {
         // Button und PageRect-Status wieder herstellen
         const USHORT nOldStateFlags = mnStateFlags;
-
+        
         mnStateFlags &= ~( SLIDER_STATE_CHANNEL1_DOWN | SLIDER_STATE_CHANNEL2_DOWN | SLIDER_STATE_THUMB_DOWN );
-
+        
         if ( nOldStateFlags != mnStateFlags )
             ImplDraw( mnDragDraw );
-
+            
         mnDragDraw = 0;
         ImplDoAction( TRUE );
         meScrollType = SCROLL_DONTKNOW;
@@ -1077,13 +1077,13 @@ Size Slider::CalcWindowSizePixel()
     Size aSize;
     if ( GetStyle() & WB_HORZ )
     {
-        aSize.Width()   = nWidth;
-        aSize.Height()  = nHeight;
+        aSize.Width()	= nWidth;
+        aSize.Height()	= nHeight;
     }
     else
     {
-        aSize.Height()  = nWidth;
-        aSize.Width()   = nHeight;
+        aSize.Height()	= nWidth;
+        aSize.Width()	= nHeight;
     }
     return aSize;
 }
diff --git a/vcl/source/control/spinbtn.cxx b/vcl/source/control/spinbtn.cxx
index 921ba2a24e5a..aedfe2d8bbf1 100644
--- a/vcl/source/control/spinbtn.cxx
+++ b/vcl/source/control/spinbtn.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
@@ -167,7 +167,7 @@ void SpinButton::Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize,
 {
     Point       aPos  = pDev->LogicToPixel( rPos );
     Size        aSize = pDev->LogicToPixel( rSize );
-
+ 
     pDev->Push();
     pDev->SetMapMode();
     if ( !(nFlags & WINDOW_DRAW_MONO) )
diff --git a/vcl/source/control/spinfld.cxx b/vcl/source/control/spinfld.cxx
index 754270e9012f..1632e1e823d1 100644
--- a/vcl/source/control/spinfld.cxx
+++ b/vcl/source/control/spinfld.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
@@ -88,7 +88,7 @@ BOOL ImplDrawNativeSpinfield( Window *pWin, const SpinbuttonValue& rSpinbuttonVa
         // there is just no useful native support for spinfields with dropdown
         !(pWin->GetStyle() & WB_DROPDOWN) )
     {
-        if( pWin->IsNativeControlSupported(CTRL_SPINBOX, rSpinbuttonValue.mnUpperPart) &&
+        if( pWin->IsNativeControlSupported(CTRL_SPINBOX, rSpinbuttonValue.mnUpperPart) && 
             pWin->IsNativeControlSupported(CTRL_SPINBOX, rSpinbuttonValue.mnLowerPart) )
         {
             // only paint the embedded spin buttons, all buttons are painted at once
@@ -119,7 +119,7 @@ BOOL ImplDrawNativeSpinfield( Window *pWin, const SpinbuttonValue& rSpinbuttonVa
             {
                 aSize = aContent.GetSize();
             }
-
+            
             Rectangle aRgn( aPt, aSize );
             bNativeOK = pBorder->DrawNativeControl( CTRL_SPINBOX, PART_ENTIRE_CONTROL, aRgn, CTRL_STATE_ENABLED,
                         rSpinbuttonValue, rtl::OUString() );
@@ -295,15 +295,15 @@ void ImplDrawSpinButton( OutputDevice* pOutDev,
 
 void SpinField::ImplInitSpinFieldData()
 {
-    mpEdit          = NULL;
-    mbSpin          = FALSE;
-    mbRepeat        = FALSE;
-    mbUpperIn       = FALSE;
-    mbLowerIn       = FALSE;
-    mbInitialUp     = FALSE;
-    mbInitialDown   = FALSE;
-    mbNoSelect      = FALSE;
-    mbInDropDown    = FALSE;
+    mpEdit			= NULL;
+    mbSpin			= FALSE;
+    mbRepeat		= FALSE;
+    mbUpperIn		= FALSE;
+    mbLowerIn		= FALSE;
+    mbInitialUp 	= FALSE;
+    mbInitialDown	= FALSE;
+    mbNoSelect		= FALSE;
+    mbInDropDown	= FALSE;
 }
 
 // --------------------------------------------------------------------
@@ -315,11 +315,11 @@ void SpinField::ImplInit( Window* pParent, WinBits nWinStyle )
     if ( nWinStyle & (WB_SPIN|WB_DROPDOWN) )
     {
         mbSpin = TRUE;
-
+        
         // Some themes want external spin buttons, therefore the main
         // spinfield should not overdraw the border between its encapsulated
         // edit field and the spin buttons
-        if ( (nWinStyle & WB_SPIN) && ImplUseNativeBorder( nWinStyle ) )
+        if ( (nWinStyle & WB_SPIN) && ImplUseNativeBorder( nWinStyle ) ) 
         {
             SetBackground();
             mpEdit = new Edit( this, WB_NOBORDER );
@@ -423,13 +423,13 @@ void SpinField::MouseButtonDown( const MouseEvent& rMEvt )
     {
         if ( maUpperRect.IsInside( rMEvt.GetPosPixel() ) )
         {
-            mbUpperIn   = TRUE;
+            mbUpperIn	= TRUE;
             mbInitialUp = TRUE;
             Invalidate( maUpperRect );
         }
         else if ( maLowerRect.IsInside( rMEvt.GetPosPixel() ) )
         {
-            mbLowerIn    = TRUE;
+            mbLowerIn	 = TRUE;
             mbInitialDown = TRUE;
             Invalidate( maLowerRect );
         }
@@ -642,7 +642,7 @@ void SpinField::Paint( const Rectangle& rRect )
 {
     if ( mbSpin )
     {
-        BOOL    bEnable = IsEnabled();
+        BOOL	bEnable = IsEnabled();
         ImplDrawSpinButton( this, maUpperRect, maLowerRect,
                             mbUpperIn, mbLowerIn, bEnable, bEnable );
     }
@@ -717,12 +717,12 @@ void SpinField::ImplCalcButtonAreas( OutputDevice* pDev, const Size& rOutSz, Rec
             // use the full extent of the control
             Rectangle aArea( aPoint, pBorder->GetOutputSizePixel() );
 
-            bNativeRegionOK =
+            bNativeRegionOK = 
                 pWin->GetNativeControlRegion(CTRL_SPINBOX, PART_BUTTON_UP,
                     aArea, 0, aControlValue, rtl::OUString(), aBound, aContentUp) &&
                 pWin->GetNativeControlRegion(CTRL_SPINBOX, PART_BUTTON_DOWN,
                     aArea, 0, aControlValue, rtl::OUString(), aBound, aContentDown);
-
+                    
             if( bNativeRegionOK )
             {
                 // convert back from border space to local coordinates
@@ -769,7 +769,7 @@ void SpinField::Resize()
             ImplControlValue aControlValue;
             Point aPoint;
             Rectangle aContent, aBound;
-
+    
             // use the full extent of the control
             Window *pBorder = GetWindow( WINDOW_BORDER );
             Rectangle aArea( aPoint, pBorder->GetOutputSizePixel() );
diff --git a/vcl/source/control/tabctrl.cxx b/vcl/source/control/tabctrl.cxx
index c892b32534ec..beaff5115c3d 100644
--- a/vcl/source/control/tabctrl.cxx
+++ b/vcl/source/control/tabctrl.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
@@ -76,11 +76,11 @@ struct ImplTabItem
 
 struct ImplTabCtrlData
 {
-    PushButton*                     mpLeftBtn;
-    PushButton*                     mpRightBtn;
-    std::hash_map< int, int >       maLayoutPageIdToLine;
-    std::hash_map< int, int >       maLayoutLineToPageId;
-    std::vector< Rectangle >        maTabRectangles;
+    PushButton*						mpLeftBtn;
+    PushButton*						mpRightBtn;
+    std::hash_map< int, int >		maLayoutPageIdToLine;
+    std::hash_map< int, int >		maLayoutLineToPageId;
+    std::vector< Rectangle >		maTabRectangles;
     Point                           maItemsOffset;       // offset of the tabitems
     std::vector< ImplTabItem >      maItemList;
     ListBox*                        mpListBox;
@@ -138,22 +138,22 @@ void TabControl::ImplInit( Window* pParent, WinBits nStyle )
 
     Control::ImplInit( pParent, nStyle, NULL );
 
-    mnLastWidth                 = 0;
-    mnLastHeight                = 0;
-    mnBtnSize                   = 0;
-    mnMaxPageWidth              = 0;
-    mnActPageId                 = 0;
-    mnCurPageId                 = 0;
-    mnFirstPagePos              = 0;
-    mnLastFirstPagePos          = 0;
-    mbFormat                    = TRUE;
-    mbRestoreHelpId             = FALSE;
-    mbRestoreUnqId              = FALSE;
-    mbSingleLine                = FALSE;
-    mbScroll                    = FALSE;
+    mnLastWidth         		= 0;
+    mnLastHeight        		= 0;
+    mnBtnSize           		= 0;
+    mnMaxPageWidth      		= 0;
+    mnActPageId         		= 0;
+    mnCurPageId         		= 0;
+    mnFirstPagePos      		= 0;
+    mnLastFirstPagePos  		= 0;
+    mbFormat            		= TRUE;
+    mbRestoreHelpId     		= FALSE;
+    mbRestoreUnqId      		= FALSE;
+    mbSingleLine        		= FALSE;
+    mbScroll            		= FALSE;
     mbRestoreSmartId            = FALSE;
-    mbSmallInvalidate           = FALSE;
-    mbExtraSpace                = FALSE;
+    mbSmallInvalidate   		= FALSE;
+    mbExtraSpace        		= FALSE;
     mpTabCtrlData               = new ImplTabCtrlData;
     mpTabCtrlData->mpLeftBtn    = NULL;
     mpTabCtrlData->mpRightBtn   = NULL;
@@ -174,7 +174,7 @@ void TabControl::ImplInit( Window* pParent, WinBits nStyle )
     // otherwise they will paint with a wrong background
     if( IsNativeControlSupported(CTRL_TAB_PANE, PART_ENTIRE_CONTROL) )
         EnableChildTransparentMode( TRUE );
-
+    
     if ( pParent->IsDialog() )
         pParent->AddChildEventListener( LINK( this, TabControl, ImplWindowEventListener ) );
 }
@@ -938,7 +938,7 @@ void TabControl::ImplDrawItem( ImplTabItem* pItem, const Rectangle& rCurRect, bo
     if( !bLayout && (bNativeOK = IsNativeControlSupported(CTRL_TAB_ITEM, PART_ENTIRE_CONTROL)) == TRUE )
     {
         Rectangle           aCtrlRegion( pItem->maRect );
-        ControlState        nState = 0;
+        ControlState		nState = 0;
 
         if( pItem->mnId == mnCurPageId )
         {
@@ -1077,7 +1077,7 @@ void TabControl::ImplDrawItem( ImplTabItem* pItem, const Rectangle& rCurRect, bo
 long TabControl::ImplHandleKeyEvent( const KeyEvent& rKeyEvent )
 {
     long nRet = 0;
-
+    
     if ( GetPageCount() > 1 )
     {
         KeyCode         aKeyCode = rKeyEvent.GetKeyCode();
@@ -1102,8 +1102,8 @@ long TabControl::ImplHandleKeyEvent( const KeyEvent& rKeyEvent )
                 }
             }
         }
-    }
-
+    }    
+    
     return nRet;
 }
 
@@ -1311,9 +1311,9 @@ void TabControl::ImplPaint( const Rectangle& rRect, bool bLayout )
     {
         // Some native toolkits (GTK+) draw tabs right-to-left, with an
         // overlap between adjacent tabs
-        bool            bDrawTabsRTL = IsNativeControlSupported( CTRL_TAB_ITEM, PART_TABS_DRAW_RTL );
-        ImplTabItem *   pFirstTab = NULL;
-        ImplTabItem *   pLastTab = NULL;
+        bool			bDrawTabsRTL = IsNativeControlSupported( CTRL_TAB_ITEM, PART_TABS_DRAW_RTL );
+        ImplTabItem *	pFirstTab = NULL;
+        ImplTabItem *	pLastTab = NULL;
         size_t idx;
 
         // Event though there is a tab overlap with GTK+, the first tab is not
@@ -1376,7 +1376,7 @@ void TabControl::Resize()
 
     if ( !IsReallyShown() )
         return;
-
+    
     if( mpTabCtrlData->mpListBox )
     {
         // get the listbox' preferred size
@@ -1817,7 +1817,7 @@ void TabControl::InsertPage( USHORT nPageId, const XubString& rText,
             mpTabCtrlData->mpListBox->SelectEntryPos( 0 );
         mpTabCtrlData->mpListBox->SetDropDownLineCount( mpTabCtrlData->mpListBox->GetEntryCount() );
     }
-
+    
     // set current page id
     if ( !mnCurPageId )
         mnCurPageId = nPageId;
diff --git a/vcl/source/fontsubset/cff.cxx b/vcl/source/fontsubset/cff.cxx
index cb565122ea63..15714b675b79 100644
--- a/vcl/source/fontsubset/cff.cxx
+++ b/vcl/source/fontsubset/cff.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
@@ -51,111 +51,111 @@ typedef std::vector<ValType> ValVector;
 // ====================================================================
 
 static const char* pStringIds[] = {
-/*0*/   ".notdef",      "space",            "exclam",           "quotedbl",
-    "numbersign",       "dollar",           "percent",          "ampersand",
-    "quoteright",       "parenleft",        "parenright",       "asterisk",
-    "plus",             "comma",            "hyphen",           "period",
-/*16*/  "slash",        "zero",             "one",              "two",
-    "three",            "four",             "five",             "six",
-    "seven",            "eight",            "nine",             "colon",
-    "semicolon",        "less",             "equal",            "greater",
-/*32*/  "question",     "at",               "A",                "B",
-    "C",                "D",                "E",                "F",
-    "G",                "H",                "I",                "J",
-    "K",                "L",                "M",                "N",
-/*48*/  "O",            "P",                "Q",                "R",
-    "S",                "T",                "U",                "V",
-    "W",                "X",                "Y",                "Z",
-    "bracketleft",      "backslash",        "bracketright",     "asciicircum",
-/*64*/  "underscore",   "quoteleft",        "a",                "b",
-    "c",                "d",                "e",                "f",
-    "g",                "h",                "i",                "j",
-    "k",                "l",                "m",                "n",
-/*80*/  "o",            "p",                "q",                "r",
-    "s",                "t",                "u",                "v",
-    "w",                "x",                "y",                "z",
-    "braceleft",        "bar",              "braceright",       "asciitilde",
-/*96*/  "exclamdown",   "cent",             "sterlin",          "fraction",
-    "yen",              "florin",           "section",          "currency",
-    "quotesingle",      "quotedblleft",     "guillemotleft",    "guilsinglleft",
-    "guilsinglright",   "fi",               "fl",               "endash",
-/*112*/ "dagger",       "daggerdbl",        "periodcentered",   "paragraph",
-    "bullet",           "quotesinglbase",   "quotedblbase",     "quotedblright",
-    "guillemotright",   "ellipsis",         "perthousand",      "questiondown",
-    "grave",            "acute",            "circumflex",       "tilde",
-/*128*/ "macron",       "breve",            "dotaccent",        "dieresis",
-    "ring",             "cedilla",          "hungarumlaut",     "ogonek",
-    "caron",            "endash",           "AE",               "ordfeminine",
-    "Lslash",           "Oslash",           "OE",               "ordmasculine",
-/*144*/ "ae",           "dotlessi",         "lslash",           "oslash",
-    "oe",               "germandbls",       "onesuperior",      "logicalnot",
-    "mu",               "trademark",        "Eth",              "onehalf",
-    "plusminus",        "Thorn",            "onequarter",       "divide",
-/*160*/ "brokenbar",    "degree",           "thorn",            "threequarters",
-    "twosuperior",      "registered",       "minus",            "eth",
-    "multiply",         "threesuperior",    "copyright",        "Aacute",
-    "Acircumflex",      "Adieresis",        "Agrave",           "Aring",
-/*176*/ "Atilde",       "Ccedilla",         "Eacute",           "Ecircumflex",
-    "Edieresis",        "Egrave",           "Iacute",           "Icircumflex",
-    "Idieresis",        "Igrave",           "Ntilde",           "Oacute",
-    "Ocircumflex",      "Odieresis",        "Ograve",           "Otilde",
-/*192*/ "Scaron",       "Uacute",           "Ucircumflex",      "Udieresis",
-    "Ugrave",           "Yacute",           "Ydieresis",        "Zcaron",
-    "aacute",           "acircumflex",      "adieresis",        "agrave",
-    "aring",            "atilde",           "ccedilla",         "eacute",
-/*208*/ "ecircumflex",  "edieresis",        "egrave",           "iacute",
-    "icircumflex",      "idieresis",        "igrave",           "ntilde",
-    "oacute",           "ocircumflex",      "odieresis",        "ograve",
-    "otilde",           "scaron",           "uacute",           "ucircumflex",
-/*224*/ "udieresis",    "ugrave",           "yacute",           "ydieresis",
-    "zcaron",           "exclamsmall",      "Hungarumlautsmall","dollaroldstyle",
-    "dollarsuperior",   "ampersandsmall",   "Acutesmall",       "parenleftsuperior",
-    "parenrightsuperior","twodotenleader",  "onedotenleader",   "zerooldstyle",
-/*240*/ "oneoldstyle",  "twooldstyle",      "threeoldstyle",    "fouroldstyle",
-    "fiveoldstyle",     "sixoldstyle",      "sevenoldstyle",    "eightoldstyle",
-    "nineoldstile",     "commasuperior",    "threequartersemdash","periodsuperior",
-    "questionsmall",    "asuperior",        "bsuperior",        "centsuperior",
-/*256*/ "dsuperior",    "esuperior",        "isuperior",        "lsuperior",
-    "msuperior",        "nsuperior",        "osuperior",        "rsuperior",
-    "ssuperior",        "tsuperior",        "ff",               "ffi",
-    "ffl",              "parenleftinferior","parenrightinferior","Circumflexsmall",
-/*272*/ "hyphensuperior","Gravesmall",      "Asmall",           "Bsmall",
-    "Csmall",           "Dsmall",           "Esmall",           "Fsmall",
-    "Gsmall",           "Hsmall",           "Ismall",           "Jsmall",
-    "Ksmall",           "Lsmall",           "Msmall",           "Nsmall",
-/*288*/ "Osmall",       "Psmall",           "Qsmall",           "Rsmall",
-    "Ssmall",           "Tsmall",           "Usmall",           "Vsmall",
-    "Wsmall",           "Xsmall",           "Ysmall",           "Zsmall",
-    "colonmonetary",    "onefitted",        "rupia",            "Tildesmall",
-/*304*/ "exclamdownsmall","centoldstyle",   "Lslashsmall",      "Scaronsmall",
-    "Zcaronsmall",      "Dieresissmall",    "Brevesmall",       "Caronsmall",
-    "Dotaccentsmall",   "Macronsmall",      "figuredash",       "hypheninferior",
-    "Ogoneksmall",      "Ringsmall",        "Cedillasmall",     "questiondownsmall",
-/*320*/ "oneeight",     "threeeights",      "fiveeights",       "seveneights",
-    "onethird",         "twothirds",        "zerosuperior",     "foursuperior",
-    "fivesuperior",     "sixsuperior",      "sevensuperior",    "eightsuperior",
-    "ninesuperior",     "zeroinferior",     "oneinferior",      "twoinferior",
-/*336*/ "threeinferior","fourinferior",     "fiveinferior",     "sixinferior",
-    "seveninferior",    "eightinferior",    "nineinferior",     "centinferior",
-    "dollarinferior",   "periodinferior",   "commainferior",    "Agravesmall",
-    "Aacutesmall",      "Acircumflexsmall", "Atildesmall",      "Adieresissmall",
-/*352*/ "Aringsmall",   "AEsmall",          "Ccedillasmall",    "Egravesmall",
-    "Eacutesmall",      "Ecircumflexsmall", "Edieresissmall",   "Igravesmall",
-    "Iacutesmall",      "Icircumflexsmall", "Idieresissmall",   "Ethsmall",
-    "Ntildesmall",      "Ogravesmall",      "Oacutesmall",      "Ocircumflexsmall",
-/*368*/ "Otildesmall",  "Odieressissmall",  "OEsmall",          "Oslashsmall",
-    "Ugravesmall",      "Uacutesmall",      "Ucircumflexsmall", "Udieresissmall",
-    "Yacutesmall",      "Thornsmall",       "Ydieresissmall",   "001.000",
-    "001.001",          "001.002",          "001.003",          "Black",
-/*384*/ "Bold",         "Book",             "Light",            "Medium",
-    "Regular",          "Roman",            "Semibold"
+/*0*/	".notdef",		"space",			"exclam",			"quotedbl",
+    "numbersign",		"dollar",			"percent",			"ampersand",
+    "quoteright",		"parenleft",		"parenright",		"asterisk",
+    "plus",				"comma",			"hyphen",			"period",
+/*16*/	"slash",		"zero",				"one",				"two",
+    "three",			"four",				"five",				"six",
+    "seven",			"eight",			"nine",				"colon",
+    "semicolon",		"less",				"equal",			"greater",
+/*32*/	"question",		"at",				"A",				"B",
+    "C",				"D",				"E",				"F",
+    "G",				"H",				"I",				"J",
+    "K",				"L",				"M",				"N",
+/*48*/	"O",			"P",				"Q",				"R",
+    "S",				"T",				"U",				"V",
+    "W",				"X",				"Y",				"Z",
+    "bracketleft",		"backslash",		"bracketright",		"asciicircum",
+/*64*/	"underscore",	"quoteleft",		"a",				"b",
+    "c",				"d",				"e",				"f",
+    "g",				"h",				"i",				"j",
+    "k",				"l",				"m",				"n",
+/*80*/	"o",			"p",				"q",				"r",
+    "s",				"t",				"u",				"v",
+    "w",				"x",				"y",				"z",
+    "braceleft",		"bar",				"braceright",		"asciitilde",
+/*96*/	"exclamdown",	"cent",				"sterlin",			"fraction",
+    "yen",				"florin",			"section",			"currency",
+    "quotesingle",		"quotedblleft",		"guillemotleft",	"guilsinglleft",
+    "guilsinglright",	"fi",				"fl",				"endash",
+/*112*/	"dagger",		"daggerdbl",		"periodcentered",	"paragraph",
+    "bullet",			"quotesinglbase",	"quotedblbase",		"quotedblright",
+    "guillemotright",	"ellipsis",			"perthousand",		"questiondown",
+    "grave",			"acute",			"circumflex",		"tilde",
+/*128*/	"macron",		"breve",			"dotaccent",		"dieresis",
+    "ring",				"cedilla",			"hungarumlaut",		"ogonek",
+    "caron",			"endash",			"AE",				"ordfeminine",
+    "Lslash",			"Oslash",			"OE",				"ordmasculine",
+/*144*/	"ae",			"dotlessi",			"lslash",			"oslash",
+    "oe",				"germandbls",		"onesuperior",		"logicalnot",
+    "mu",				"trademark",		"Eth",				"onehalf",
+    "plusminus",		"Thorn",			"onequarter",		"divide",
+/*160*/	"brokenbar",	"degree",			"thorn",			"threequarters",
+    "twosuperior",		"registered",		"minus",			"eth",
+    "multiply",			"threesuperior",	"copyright",		"Aacute",
+    "Acircumflex",		"Adieresis",		"Agrave",			"Aring",
+/*176*/	"Atilde",		"Ccedilla",			"Eacute",			"Ecircumflex",
+    "Edieresis",		"Egrave",			"Iacute",			"Icircumflex",
+    "Idieresis",		"Igrave",			"Ntilde",			"Oacute",
+    "Ocircumflex",		"Odieresis",		"Ograve",			"Otilde",
+/*192*/	"Scaron",		"Uacute",			"Ucircumflex",		"Udieresis",
+    "Ugrave",			"Yacute",			"Ydieresis",		"Zcaron",
+    "aacute",			"acircumflex",		"adieresis",		"agrave",
+    "aring",			"atilde",			"ccedilla",			"eacute",
+/*208*/	"ecircumflex",	"edieresis",		"egrave",			"iacute",
+    "icircumflex",		"idieresis",		"igrave",			"ntilde",
+    "oacute",			"ocircumflex",		"odieresis",		"ograve",
+    "otilde",			"scaron",			"uacute",			"ucircumflex",
+/*224*/	"udieresis",	"ugrave",			"yacute",			"ydieresis",
+    "zcaron",			"exclamsmall",		"Hungarumlautsmall","dollaroldstyle",
+    "dollarsuperior",	"ampersandsmall",	"Acutesmall",		"parenleftsuperior",
+    "parenrightsuperior","twodotenleader",	"onedotenleader",	"zerooldstyle",
+/*240*/	"oneoldstyle",	"twooldstyle",		"threeoldstyle",	"fouroldstyle",
+    "fiveoldstyle",		"sixoldstyle",		"sevenoldstyle",	"eightoldstyle",
+    "nineoldstile",		"commasuperior",	"threequartersemdash","periodsuperior",
+    "questionsmall",	"asuperior",		"bsuperior",		"centsuperior",
+/*256*/	"dsuperior",	"esuperior",		"isuperior",		"lsuperior",
+    "msuperior",		"nsuperior",		"osuperior",		"rsuperior",
+    "ssuperior",		"tsuperior",		"ff",				"ffi",
+    "ffl",				"parenleftinferior","parenrightinferior","Circumflexsmall",
+/*272*/	"hyphensuperior","Gravesmall",		"Asmall",			"Bsmall",
+    "Csmall",			"Dsmall",			"Esmall",			"Fsmall",
+    "Gsmall",			"Hsmall",			"Ismall",			"Jsmall",
+    "Ksmall",			"Lsmall",			"Msmall",			"Nsmall",
+/*288*/	"Osmall",		"Psmall",			"Qsmall",			"Rsmall",
+    "Ssmall",			"Tsmall",			"Usmall",			"Vsmall",
+    "Wsmall",			"Xsmall",			"Ysmall",			"Zsmall",
+    "colonmonetary",	"onefitted",		"rupia",			"Tildesmall",
+/*304*/	"exclamdownsmall","centoldstyle",	"Lslashsmall",		"Scaronsmall",
+    "Zcaronsmall",		"Dieresissmall",	"Brevesmall",		"Caronsmall",
+    "Dotaccentsmall",	"Macronsmall",		"figuredash",		"hypheninferior",
+    "Ogoneksmall",		"Ringsmall",		"Cedillasmall",		"questiondownsmall",
+/*320*/	"oneeight",		"threeeights",		"fiveeights",		"seveneights",
+    "onethird",			"twothirds",		"zerosuperior",		"foursuperior",
+    "fivesuperior",		"sixsuperior",		"sevensuperior",	"eightsuperior",
+    "ninesuperior",		"zeroinferior",		"oneinferior",		"twoinferior",
+/*336*/	"threeinferior","fourinferior",		"fiveinferior",		"sixinferior",
+    "seveninferior",	"eightinferior",	"nineinferior",		"centinferior",
+    "dollarinferior",	"periodinferior",	"commainferior",	"Agravesmall",
+    "Aacutesmall",		"Acircumflexsmall",	"Atildesmall",		"Adieresissmall",
+/*352*/	"Aringsmall",	"AEsmall",			"Ccedillasmall",	"Egravesmall",
+    "Eacutesmall",		"Ecircumflexsmall",	"Edieresissmall",	"Igravesmall",
+    "Iacutesmall",		"Icircumflexsmall",	"Idieresissmall",	"Ethsmall",
+    "Ntildesmall",		"Ogravesmall",		"Oacutesmall",		"Ocircumflexsmall",
+/*368*/	"Otildesmall",	"Odieressissmall",	"OEsmall",			"Oslashsmall",
+    "Ugravesmall",		"Uacutesmall",		"Ucircumflexsmall",	"Udieresissmall",
+    "Yacutesmall",		"Thornsmall",		"Ydieresissmall",	"001.000",
+    "001.001",			"001.002",			"001.003",			"Black",
+/*384*/	"Bold",			"Book",				"Light",			"Medium",
+    "Regular",			"Roman",			"Semibold"
 };
 
 // --------------------------------------------------------------------
 
 #if 0 // TODO: use them
 static const char* pStdEncNames[] = {
-    "ISOAdobe", "Expert",   "ExpertSubSet"
+    "ISOAdobe",	"Expert",	"ExpertSubSet"
 };
 #endif
 
@@ -163,57 +163,57 @@ static const char* pStdEncNames[] = {
 
 // TOP DICT keywords (also covers PRIV DICT keywords)
 static const char* pDictOps[] = {
-    "sVersion",         "sNotice",              "sFullName",        "sFamilyName",
-    "sWeight",          "aFontBBox",            "dBlueValues",      "dOtherBlues",
-    "dFamilyBlues",     "dFamilyOtherBlues",    "nStdHW",           "nStdVW",
-    "xESC",             "nUniqueID",            "aXUID",            "nCharset",
-    "nEncoding",        "nCharStrings",         "PPrivate",         "nSubrs",
-    "nDefaultWidthX",   "nNominalWidthX",       NULL,               NULL,
-    NULL,               NULL,                   NULL,               NULL,
-    "shortint",         "longint",              "BCD",              NULL
+    "sVersion",			"sNotice",				"sFullName",		"sFamilyName",
+    "sWeight",			"aFontBBox",			"dBlueValues",		"dOtherBlues",
+    "dFamilyBlues",		"dFamilyOtherBlues",	"nStdHW",			"nStdVW",
+    "xESC",				"nUniqueID",			"aXUID",			"nCharset",
+    "nEncoding",		"nCharStrings",			"PPrivate",			"nSubrs",
+    "nDefaultWidthX",	"nNominalWidthX",		NULL,				NULL,
+    NULL,				NULL,					NULL,				NULL,
+    "shortint",			"longint",				"BCD",				NULL
 };
 
 // --------------------------------------------------------------------
 
 // TOP DICT escapes (also covers PRIV DICT escapes)
 static const char* pDictEscs[] = {
-    "sCopyright",           "bIsFixedPitch",    "nItalicAngle",     "nUnderlinePosition",
-    "nUnderlineThickness",  "nPaintType",       "tCharstringType",  "aFontMatrix",
-    "nStrokeWidth",         "nBlueScale",       "nBlueShift",       "nBlueFuzz",
-    "dStemSnapH",           "dStemSnapV",       "bForceBold",       NULL,
-    NULL,                   "nLanguageGroup",   "nExpansionFactor", "nInitialRandomSeed",
-    "nSyntheticBase",       "sPostScript",      "sBaseFontName",    "dBaseFontBlend",
-    NULL,                   NULL,               NULL,               NULL,
-    NULL,                   NULL,               "rROS",             "nCIDFontVersion",
-    "nCIDFontRevision",     "nCIDFontType",     "nCIDCount",        "nUIDBase",
-    "nFDArray",             "nFDSelect",        "sFontName"
+    "sCopyright",			"bIsFixedPitch",	"nItalicAngle",		"nUnderlinePosition",
+    "nUnderlineThickness",	"nPaintType",		"tCharstringType",	"aFontMatrix",
+    "nStrokeWidth",			"nBlueScale",		"nBlueShift",		"nBlueFuzz",
+    "dStemSnapH",			"dStemSnapV",		"bForceBold",		NULL,
+    NULL,					"nLanguageGroup",	"nExpansionFactor",	"nInitialRandomSeed",
+    "nSyntheticBase",		"sPostScript",		"sBaseFontName",	"dBaseFontBlend",
+    NULL,					NULL,				NULL,				NULL,
+    NULL,					NULL,				"rROS",				"nCIDFontVersion",
+    "nCIDFontRevision",		"nCIDFontType",		"nCIDCount",		"nUIDBase",
+    "nFDArray",				"nFDSelect",		"sFontName"
 };
 
 // --------------------------------------------------------------------
 
 static const char* pType1Ops[] = {
-    NULL,               "2hstem",           NULL,               "2vstem",
-    "1vmoveto",         "Arlineto",         "1hlineto",         "1vlineto",
-    "Crrcurveto",       "0closepath",       "Lcallsubr",        "0return",
-    "xT1ESC",           "2hsbw",            "0endchar",         NULL,
-    NULL,               NULL,               NULL,               NULL,
-    NULL,               "2rmoveto",         "1hmoveto",         NULL,
-    NULL,               NULL,               NULL,               NULL,
-    NULL,               NULL,               "4vhcurveto",       "4hvcurveto"
+    NULL,				"2hstem",			NULL,				"2vstem",
+    "1vmoveto",			"Arlineto",			"1hlineto",			"1vlineto",
+    "Crrcurveto",		"0closepath",		"Lcallsubr",		"0return",
+    "xT1ESC",			"2hsbw",			"0endchar",			NULL,
+    NULL,				NULL,				NULL,				NULL,
+    NULL,				"2rmoveto",			"1hmoveto",			NULL,
+    NULL,				NULL,				NULL,				NULL,
+    NULL,				NULL,				"4vhcurveto",		"4hvcurveto"
 };
 
 // --------------------------------------------------------------------
 
 static const char* pT1EscOps[] = {
-    "0dotsection",      "6vstem3",          "6hstem3",          NULL,
-    NULL,               NULL,               "5seac",            "4sbw",
-    NULL,               "1abs",             "2add",             "2sub",
-    "2div",             NULL,               NULL,               NULL,
-    "Gcallothersubr",   "1pop",             NULL,               NULL,
-    NULL,               NULL,               NULL,               NULL,
-    NULL,               NULL,               NULL,               NULL,
-    NULL,               NULL,               NULL,               NULL,
-    NULL,               "2setcurrentpoint"
+    "0dotsection",		"6vstem3",			"6hstem3",			NULL,
+    NULL,				NULL,				"5seac",			"4sbw",
+    NULL,				"1abs",				"2add",				"2sub",
+    "2div",				NULL,				NULL,				NULL,
+    "Gcallothersubr",	"1pop",				NULL,				NULL,
+    NULL,				NULL,				NULL,				NULL,
+    NULL,				NULL,				NULL,				NULL,
+    NULL,				NULL,				NULL,				NULL,
+    NULL,				"2setcurrentpoint"
 };
 
 // --------------------------------------------------------------------
@@ -222,47 +222,47 @@ struct TYPE1OP
 {
     enum OPS
     {
-        HSTEM=1,        VSTEM=3,        VMOVETO=4,      RLINETO=5,
-        HLINETO=6,      VLINETO=7,      RCURVETO=8,     CLOSEPATH=9,
-        CALLSUBR=10,    RETURN=11,      T1ESC=12,       HSBW=13,
-        ENDCHAR=14,     RMOVETO=21,     HMOVETO=22,     VHCURVETO=30,
+        HSTEM=1,		VSTEM=3,		VMOVETO=4,		RLINETO=5,
+        HLINETO=6,		VLINETO=7,		RCURVETO=8,		CLOSEPATH=9,
+        CALLSUBR=10,	RETURN=11,		T1ESC=12,		HSBW=13,
+        ENDCHAR=14,		RMOVETO=21,		HMOVETO=22,		VHCURVETO=30,
         HVCURVETO=31
     };
 
     enum ESCS
     {
-        DOTSECTION=0,   VSTEM3=1,           HSTEM3=2,   SEAC=6,
-        SBW=7,          ABS=9,              ADD=10,     SUB=11,
-        DIV=12,         CALLOTHERSUBR=16,   POP=17,     SETCURRENTPOINT=33
+        DOTSECTION=0,	VSTEM3=1,			HSTEM3=2,	SEAC=6,
+        SBW=7,			ABS=9,				ADD=10,		SUB=11,
+        DIV=12,			CALLOTHERSUBR=16,	POP=17,		SETCURRENTPOINT=33
     };
 };
 
 // --------------------------------------------------------------------
 
 static const char* pType2Ops[] = {
-    NULL,           "hhstem",       NULL,           "vvstem",
-    "mvmoveto",     "Arlineto",     "Ehlineto",     "Evlineto",
-    "Crrcurveto",   NULL,           "Lcallsubr",    "Xreturn",
-    "xT2ESC",       NULL,           "eendchar",     NULL,
-    NULL,           NULL,           "Hhstemhm",     "Khintmask",
-    "Kcntrmask",    "Mrmoveto",     "mhmoveto",     "Vvstemhm",
-    ".rcurveline",  ".rlinecurve",  ".vvcurveto",   ".hhcurveto",
-    ".shortint",    "Gcallgsubr",   ".vhcurveto",   ".hvcurveto"
+    NULL,			"hhstem",		NULL,			"vvstem",
+    "mvmoveto",		"Arlineto",		"Ehlineto",		"Evlineto",
+    "Crrcurveto",	NULL,			"Lcallsubr",	"Xreturn",
+    "xT2ESC",		NULL,			"eendchar",		NULL,
+    NULL,			NULL,			"Hhstemhm",		"Khintmask",
+    "Kcntrmask",	"Mrmoveto",		"mhmoveto",		"Vvstemhm",
+    ".rcurveline",	".rlinecurve",	".vvcurveto",	".hhcurveto",
+    ".shortint",	"Gcallgsubr",	".vhcurveto",	".hvcurveto"
 };
 
 // --------------------------------------------------------------------
 
 static const char* pT2EscOps[] = {
-    NULL,       NULL,       NULL,       "2and",
-    "2or",      "1not",     NULL,       NULL,
-    NULL,       "1abs",     "2add",     "2sub",
-    "2div",     NULL,       "1neg",     "2eq",
-    NULL,       NULL,       "1drop",    NULL,
-    "1put",     "1get",     "4ifelse",  "0random",
-    "2mul",     NULL,       "1sqrt",    "1dup",
-    "2exch",    "Iindex",   "Rroll",    NULL,
-    NULL,       NULL,       "7hflex",   "Fflex",
-    "9hflex1",  "fflex1"
+    NULL,		NULL,		NULL,		"2and",
+    "2or",		"1not",		NULL,		NULL,
+    NULL,		"1abs",		"2add",		"2sub",
+    "2div",		NULL,		"1neg",		"2eq",
+    NULL,		NULL,		"1drop",	NULL,
+    "1put",		"1get",		"4ifelse",	"0random",
+    "2mul",		NULL,		"1sqrt",	"1dup",
+    "2exch",	"Iindex",	"Rroll",	NULL,
+    NULL,		NULL,		"7hflex",	"Fflex",
+    "9hflex1",	"fflex1"
 };
 
 // --------------------------------------------------------------------
@@ -271,23 +271,23 @@ struct TYPE2OP
 {
     enum OPS
     {
-        HSTEM=1,        VSTEM=3,        VMOVETO=4,      RLINETO=5,
-        HLINETO=6,      VLINETO=7,      RCURVETO=8,     CALLSUBR=10,
-        RETURN=11,      T2ESC=12,       ENDCHAR=14,     HSTEMHM=18,
-        HINTMASK=19,    CNTRMASK=20,    RMOVETO=21,     HMOVETO=22,
-        VSTEMHM=23,     RCURVELINE=24,  RLINECURVE=25,  VVCURVETO=26,
-        HHCURVETO=27,   SHORTINT=28,    CALLGSUBR=29,   VHCURVETO=30,
+        HSTEM=1,		VSTEM=3,		VMOVETO=4,		RLINETO=5,
+        HLINETO=6,		VLINETO=7,		RCURVETO=8,		CALLSUBR=10,
+        RETURN=11,		T2ESC=12,		ENDCHAR=14,		HSTEMHM=18,
+        HINTMASK=19,	CNTRMASK=20,	RMOVETO=21,		HMOVETO=22,
+        VSTEMHM=23,		RCURVELINE=24,	RLINECURVE=25,	VVCURVETO=26,
+        HHCURVETO=27,	SHORTINT=28,	CALLGSUBR=29,	VHCURVETO=30,
         HVCURVETO=31
     };
 
     enum ESCS
     {
-        AND=3,      OR=4,       NOT=5,      ABS=9,
-        ADD=10,     SUB=11,     DIV=12,     NEG=14,
-        EQ=15,      DROP=18,    PUT=20,     GET=21,
-        IFELSE=22,  RANDOM=23,  MUL=24,     SQRT=26,
-        DUP=27,     EXCH=28,    INDEX=29,   ROLL=30,
-        HFLEX=34,   FLEX=35,    HFLEX1=36,  FLEX1=37
+        AND=3,		OR=4,		NOT=5,		ABS=9,
+        ADD=10,		SUB=11,		DIV=12,		NEG=14,
+        EQ=15,		DROP=18,	PUT=20,		GET=21,
+        IFELSE=22,	RANDOM=23,	MUL=24,		SQRT=26,
+        DUP=27,		EXCH=28,	INDEX=29,	ROLL=30,
+        HFLEX=34,	FLEX=35,	HFLEX1=36,	FLEX1=37
     };
 };
 
@@ -297,28 +297,28 @@ struct CffGlobal
 {
     explicit CffGlobal();
 
-    int     mnNameIdxBase;
-    int     mnNameIdxCount;
-    int     mnStringIdxBase;
-    int     mnStringIdxCount;
-    bool    mbCIDFont;
-    int     mnCharStrBase;
-    int     mnCharStrCount;
-    int     mnEncodingBase;
-    int     mnCharsetBase;
-    int     mnGlobalSubrBase;
-    int     mnGlobalSubrCount;
-    int     mnGlobalSubrBias;
-    int     mnFDSelectBase;
-    int     mnFontDictBase;
-    int     mnFDAryCount;
-
-    ValVector   maFontBBox;
-    ValVector   maFontMatrix;
-
-    int     mnFontNameSID;
-    int     mnFullNameSID;
-    int     mnFamilyNameSID;
+    int		mnNameIdxBase;
+    int		mnNameIdxCount;
+    int		mnStringIdxBase;
+    int		mnStringIdxCount;
+    bool 	mbCIDFont;
+    int		mnCharStrBase;
+    int		mnCharStrCount;
+    int		mnEncodingBase;
+    int		mnCharsetBase;
+    int		mnGlobalSubrBase;
+    int		mnGlobalSubrCount;
+    int		mnGlobalSubrBias;
+    int		mnFDSelectBase;
+    int		mnFontDictBase;
+    int		mnFDAryCount;
+
+    ValVector	maFontBBox;
+    ValVector	maFontMatrix;
+
+    int		mnFontNameSID;
+    int		mnFullNameSID;
+    int		mnFamilyNameSID;
 };
 
 // ====================================================================
@@ -327,31 +327,31 @@ struct CffLocal
 {
     explicit CffLocal();
 
-    int     mnPrivDictBase;
-    int     mnPrivDictSize;
-    int     mnLocalSubrOffs;
-    int     mnLocalSubrBase;
-    int     mnLocalSubrCount;
-    int     mnLocalSubrBias;
+    int		mnPrivDictBase;
+    int		mnPrivDictSize;
+    int		mnLocalSubrOffs;
+    int		mnLocalSubrBase;
+    int		mnLocalSubrCount;
+    int		mnLocalSubrBias;
 
-    ValType maNominalWidth;
+    ValType	maNominalWidth;
     ValType maDefaultWidth;
 
     // ATM hinting related values
-    ValType     maStemStdHW;
-    ValType     maStemStdVW;
-    ValVector   maStemSnapH;
-    ValVector   maStemSnapV;
-    ValVector   maBlueValues;
-    ValVector   maOtherBlues;
-    ValVector   maFamilyBlues;
-    ValVector   maFamilyOtherBlues;
-    RealType    mfBlueScale;
-    RealType    mfBlueShift;
-    RealType    mfBlueFuzz;
-    RealType    mfExpFactor;
-    int         mnLangGroup;
-    bool        mbForceBold;
+    ValType		maStemStdHW;
+    ValType		maStemStdVW;
+    ValVector	maStemSnapH;
+    ValVector	maStemSnapV;
+    ValVector	maBlueValues;
+    ValVector	maOtherBlues;
+    ValVector	maFamilyBlues;
+    ValVector	maFamilyOtherBlues;
+    RealType	mfBlueScale;
+    RealType	mfBlueShift;
+    RealType	mfBlueFuzz;
+    RealType	mfExpFactor;
+    int			mnLangGroup;
+    bool		mbForceBold;
 };
 
 // ====================================================================
@@ -373,32 +373,32 @@ SubsetterContext::~SubsetterContext( void)
 // ====================================================================
 
 class CffSubsetterContext
-:   public SubsetterContext
-,   private CffGlobal
+:	public SubsetterContext
+,	private CffGlobal
 {
 public:
-    static const int NMAXSTACK = 48;    // see CFF.appendixB
-    static const int NMAXHINTS = 2*96;  // see CFF.appendixB
-    static const int NMAXTRANS = 32;    // see CFF.appendixB
+    static const int NMAXSTACK = 48;	// see CFF.appendixB
+    static const int NMAXHINTS = 2*96;	// see CFF.appendixB
+    static const int NMAXTRANS = 32;	// see CFF.appendixB
 public:
     explicit CffSubsetterContext( const U8* pBasePtr, int nBaseLen);
-    virtual ~CffSubsetterContext( void);
+    virtual	~CffSubsetterContext( void);
 
-    void    initialCffRead( void);
-    bool    emitAsType1( class Type1Emitter&,
+    void	initialCffRead( void);
+    bool	emitAsType1( class Type1Emitter&,
                 const long* pGlyphIDs, const U8* pEncoding,
                 GlyphWidth* pGlyphWidths, int nGlyphCount, FontSubsetInfo& );
 
     // used by charstring converter
-    void    setCharStringType( int);
-    void    fakeLocalSubrCount( int nLocalSubrs ) { maCffLocal[0].mnLocalSubrCount=nLocalSubrs;}
+    void	setCharStringType( int);
+    void	fakeLocalSubrCount( int nLocalSubrs ) { maCffLocal[0].mnLocalSubrCount=nLocalSubrs;}
 protected:
-    int     convert2Type1Ops( CffLocal*, const U8* pType2Ops, int nType2Len, U8* pType1Ops);
+    int		convert2Type1Ops( CffLocal*, const U8* pType2Ops, int nType2Len, U8* pType1Ops);
 private:
-    void    convertOneTypeOp( void);
-    void    convertOneTypeEsc( void);
-    void    callType2Subr( bool bGlobal, int nSubrNumber);
-    long    getReadOfs( void) const { return (long)(mpReadPtr - mpBasePtr);}
+    void	convertOneTypeOp( void);
+    void	convertOneTypeEsc( void);
+    void	callType2Subr( bool bGlobal, int nSubrNumber);
+    long	getReadOfs( void) const { return (long)(mpReadPtr - mpBasePtr);}
 
     const U8* mpBasePtr;
     const U8* mpBaseEnd;
@@ -406,90 +406,90 @@ private:
     const U8* mpReadPtr;
     const U8* mpReadEnd;
 
-    U8*     mpWritePtr;
-    bool    mbSawError;
-    bool    mbNeedClose;
-    bool    mbIgnoreHints;
-    long    mnCntrMask;
+    U8*		mpWritePtr;
+    bool	mbSawError;
+    bool	mbNeedClose;
+    bool	mbIgnoreHints;
+    long	mnCntrMask;
 
 private:
-    int     seekIndexData( int nIndexBase, int nDataIndex);
-    void    seekIndexEnd( int nIndexBase);
+    int		seekIndexData( int nIndexBase, int nDataIndex);
+    void	seekIndexEnd( int nIndexBase);
 
 private:
-    const char**    mpCharStringOps;
-    const char**    mpCharStringEscs;
+    const char**	mpCharStringOps;
+    const char**	mpCharStringEscs;
 
-    CffLocal    maCffLocal[16];
-    CffLocal*   mpCffLocal;
+    CffLocal	maCffLocal[16];
+    CffLocal*	mpCffLocal;
 
-    void        readDictOp( void);
-    RealType    readRealVal( void);
-    const char* getString( int nStringID);
-    int         getFDSelect( int nGlyphIndex) const;
-    int         getGlyphSID( int nGlyphIndex) const;
+    void		readDictOp( void);
+    RealType	readRealVal( void);
+    const char*	getString( int nStringID);
+    int			getFDSelect( int nGlyphIndex) const;
+    int			getGlyphSID( int nGlyphIndex) const;
     const char* getGlyphName( int nGlyphIndex);
 
-    void    read2push( void);
-    void    pop2write( void);
-    void    writeType1Val( ValType);
-    void    writeTypeOp( int nTypeOp);
-    void    writeTypeEsc( int nTypeOp);
-    void    writeCurveTo( int nStackPos, int nIX1, int nIY1, int nIX2, int nIY2, int nIX3, int nIY3);
-    void    pop2MultiWrite( int nArgsPerTypo, int nTypeOp, int nTypeXor=0);
-    void    popAll2Write( int nTypeOp);
+    void	read2push( void);
+    void	pop2write( void);
+    void	writeType1Val( ValType);
+    void	writeTypeOp( int nTypeOp);
+    void	writeTypeEsc( int nTypeOp);
+    void	writeCurveTo( int nStackPos, int nIX1, int nIY1, int nIX2, int nIY2, int nIX3, int nIY3);
+    void	pop2MultiWrite( int nArgsPerTypo, int nTypeOp, int nTypeXor=0);
+    void	popAll2Write( int nTypeOp);
 
 public: // TODO: is public really needed?
     // accessing the value stack
     // TODO: add more checks
-    void    push( ValType nVal) { mnValStack[ mnStackIdx++] = nVal;}
-    ValType popVal( void) { return ((mnStackIdx>0) ? mnValStack[ --mnStackIdx] : 0);}
+    void	push( ValType nVal) { mnValStack[ mnStackIdx++] = nVal;}
+    ValType	popVal( void) { return ((mnStackIdx>0) ? mnValStack[ --mnStackIdx] : 0);}
     ValType peekVal( void) const { return ((mnStackIdx>0) ? mnValStack[ mnStackIdx-1] : 0);}
     ValType getVal( int nIndex) const { return mnValStack[ nIndex];}
-    int     popInt( void);
-    int     peekInt( void) const;
-    int     getInt( int nIndex) const;
-    int     size( void) const { return mnStackIdx;}
-    bool    empty( void) const { return !mnStackIdx;}
-    void    clear( void) { mnStackIdx = 0;}
+    int		popInt( void);
+    int		peekInt( void) const;
+    int		getInt( int nIndex) const;
+    int		size( void) const { return mnStackIdx;}
+    bool	empty( void) const { return !mnStackIdx;}
+    void	clear( void) { mnStackIdx = 0;}
 
     // accessing the charstring hints
-    void    addHints( bool bVerticalHints);
-    int     getHorzHintCount( void) const { return (mnHorzHintSize/2);}
-    int     getVertHintCount( void) const { return (mnHintSize-mnHorzHintSize)/2;}
-    void    getHintPair( int nIndex, ValType* nMin, ValType* nEnd) const;
+    void	addHints( bool bVerticalHints);
+    int		getHorzHintCount( void) const { return (mnHorzHintSize/2);}
+    int		getVertHintCount( void) const { return (mnHintSize-mnHorzHintSize)/2;}
+    void	getHintPair( int nIndex, ValType* nMin, ValType* nEnd) const;
 
     // accessing other charstring specifics
-    bool    hasCharWidth( void) const { return (maCharWidth > 0);}
-    ValType getCharWidth( void) const { return maCharWidth;}
-    void    setNominalWidth( ValType aWidth) { mpCffLocal->maNominalWidth = aWidth;}
-    void    setDefaultWidth( ValType aWidth) { mpCffLocal->maDefaultWidth = aWidth;}
-    void    updateWidth( bool bUseFirstVal);
+    bool	hasCharWidth( void) const { return (maCharWidth > 0);}
+    ValType	getCharWidth( void) const { return maCharWidth;}
+    void	setNominalWidth( ValType aWidth) { mpCffLocal->maNominalWidth = aWidth;}
+    void	setDefaultWidth( ValType aWidth) { mpCffLocal->maDefaultWidth = aWidth;}
+    void	updateWidth( bool bUseFirstVal);
 
 private:
     // typeop exceution context
-    int mnStackIdx;
-    ValType mnValStack[ NMAXSTACK+4];
-    ValType mnTransVals[ NMAXTRANS];
+    int	mnStackIdx;
+    ValType	mnValStack[ NMAXSTACK+4];
+    ValType	mnTransVals[ NMAXTRANS];
 
-    int mnHintSize;
-    int mnHorzHintSize;
-    ValType mnHintStack[ NMAXHINTS];
+    int	mnHintSize;
+    int	mnHorzHintSize;
+    ValType	mnHintStack[ NMAXHINTS];
 
-    ValType maCharWidth;
+    ValType	maCharWidth;
 };
 
 // --------------------------------------------------------------------
 
 CffSubsetterContext::CffSubsetterContext( const U8* pBasePtr, int nBaseLen)
-:   mpBasePtr( pBasePtr)
-,   mpBaseEnd( pBasePtr+nBaseLen)
-,   mnStackIdx(0)
-,   mnHintSize(0)
-,   mnHorzHintSize(0)
-,   maCharWidth(-1)
+:	mpBasePtr( pBasePtr)
+,	mpBaseEnd( pBasePtr+nBaseLen)
+,	mnStackIdx(0)
+,	mnHintSize(0)
+,	mnHorzHintSize(0)
+,	maCharWidth(-1)
 {
-//  setCharStringType( 1);
+//	setCharStringType( 1);
     // TODO: new CffLocal[ mnFDAryCount];
     mpCffLocal = &maCffLocal[0];
 }
@@ -628,36 +628,36 @@ void CffSubsetterContext::readDictOp( void)
         //TODO: if( nStackIdx > 0)
         switch( *pCmdName) {
         default: fprintf( stderr, "unsupported DictOp.type=\'%c\'\n", *pCmdName); break;
-        case 'b':   // bool
+        case 'b':	// bool
             nInt = popInt();
             switch( nOpId) {
             case 915: mpCffLocal->mbForceBold = nInt; break;    // "ForceBold"
             default: break; // TODO: handle more boolean dictops?
             }
             break;
-        case 'n':   // dict-op number
+        case 'n':	// dict-op number
             nVal = popVal();
             nInt = static_cast<int>(nVal);
             switch( nOpId) {
-            case  10: mpCffLocal->maStemStdHW = nVal; break;    // "StdHW"
-            case  11: mpCffLocal->maStemStdVW = nVal; break;    // "StdVW"
-            case  15: mnCharsetBase = nInt; break;              // "charset"
-            case  16: mnEncodingBase = nInt; break;             // "nEncoding"
-            case  17: mnCharStrBase = nInt; break;              // "nCharStrings"
+            case  10: mpCffLocal->maStemStdHW = nVal; break; 	// "StdHW"
+            case  11: mpCffLocal->maStemStdVW = nVal; break; 	// "StdVW"
+            case  15: mnCharsetBase = nInt; break;				// "charset"
+            case  16: mnEncodingBase = nInt; break;				// "nEncoding"
+            case  17: mnCharStrBase = nInt; break;				// "nCharStrings"
             case  19: mpCffLocal->mnLocalSubrOffs = nInt; break;// "nSubrs"
-            case  20: setDefaultWidth( nVal ); break;           // "defaultWidthX"
-            case  21: setNominalWidth( nVal ); break;           // "nominalWidthX"
-            case 909: mpCffLocal->mfBlueScale = nVal; break;    // "BlueScale"
-            case 910: mpCffLocal->mfBlueShift = nVal; break;    // "BlueShift"
-            case 911: mpCffLocal->mfBlueFuzz = nVal; break;     // "BlueFuzz"
-            case 912: mpCffLocal->mfExpFactor = nVal; break;    // "ExpansionFactor"
-            case 917: mpCffLocal->mnLangGroup = nInt; break;    // "LanguageGroup"
-            case 936: mnFontDictBase = nInt; break;             // "nFDArray"
-            case 937: mnFDSelectBase = nInt; break;             // "nFDSelect"
+            case  20: setDefaultWidth( nVal ); break;			// "defaultWidthX"
+            case  21: setNominalWidth( nVal ); break;			// "nominalWidthX"
+            case 909: mpCffLocal->mfBlueScale = nVal; break; 	// "BlueScale"
+            case 910: mpCffLocal->mfBlueShift = nVal; break; 	// "BlueShift"
+            case 911: mpCffLocal->mfBlueFuzz = nVal; break; 	// "BlueFuzz"
+            case 912: mpCffLocal->mfExpFactor = nVal; break;	// "ExpansionFactor"
+            case 917: mpCffLocal->mnLangGroup = nInt; break;	// "LanguageGroup"
+            case 936: mnFontDictBase = nInt; break;				// "nFDArray"
+            case 937: mnFDSelectBase = nInt; break;				// "nFDSelect"
             default: break; // TODO: handle more numeric dictops?
             }
             break;
-        case 'a': { // array
+        case 'a': {	// array
             switch( nOpId) {
             case   5: maFontBBox.clear(); break;     // "FontBBox"
             case 907: maFontMatrix.clear(); break; // "FontMatrix"
@@ -673,36 +673,36 @@ void CffSubsetterContext::readDictOp( void)
             }
             clear();
             } break;
-        case 'd': { // delta array
+        case 'd': {	// delta array
             nVal = 0;
             for( int i = 0; i < size(); ++i ) {
                 nVal += getVal(i);
                 switch( nOpId) {
-                case   6: mpCffLocal->maBlueValues.push_back( nVal); break;     // "BlueValues"
-                case   7: mpCffLocal->maOtherBlues.push_back( nVal); break;     // "OtherBlues"
-                case   8: mpCffLocal->maFamilyBlues.push_back( nVal); break;    // "FamilyBlues"
+                case   6: mpCffLocal->maBlueValues.push_back( nVal); break;		// "BlueValues"
+                case   7: mpCffLocal->maOtherBlues.push_back( nVal); break;		// "OtherBlues"
+                case   8: mpCffLocal->maFamilyBlues.push_back( nVal); break;	// "FamilyBlues"
                 case   9: mpCffLocal->maFamilyOtherBlues.push_back( nVal); break;// "FamilyOtherBlues"
-                case 912: mpCffLocal->maStemSnapH.push_back( nVal); break;      // "StemSnapH"
-                case 913: mpCffLocal->maStemSnapV.push_back( nVal); break;      // "StemSnapV"
+                case 912: mpCffLocal->maStemSnapH.push_back( nVal); break;		// "StemSnapH"
+                case 913: mpCffLocal->maStemSnapV.push_back( nVal); break;		// "StemSnapV"
                 default: break; // TODO: handle more delta-array dictops?
                 }
             }
             clear();
             } break;
-        case 's':   // stringid (SID)
+        case 's':	// stringid (SID)
             nInt = popInt();
             switch( nOpId ) {
-            case   2: mnFullNameSID = nInt; break;      // "FullName"
-            case   3: mnFamilyNameSID = nInt; break;    // "FamilyName"
-            case 938: mnFontNameSID = nInt; break;      // "FontName"
+            case   2: mnFullNameSID = nInt; break;		// "FullName"
+            case   3: mnFamilyNameSID = nInt; break;	// "FamilyName"
+            case 938: mnFontNameSID = nInt; break;		// "FontName"
             default: break; // TODO: handle more string dictops?
             }
             break;
-        case 'P':   // private dict
+        case 'P': 	// private dict
             mpCffLocal->mnPrivDictBase = popInt();
             mpCffLocal->mnPrivDictSize = popInt();
             break;
-        case 'r': { // ROS operands
+        case 'r': {	// ROS operands
             int nSid1 = popInt();
             int nSid2 = popInt();
             (void)nSid1; // TODO: use
@@ -710,30 +710,30 @@ void CffSubsetterContext::readDictOp( void)
             nVal = popVal();
             mbCIDFont = true;
             } break;
-        case 't':   // CharstringType
+        case 't':	// CharstringType
             nInt = popInt();
             setCharStringType( nInt );
             break;
         }
 
-        return;
+        return; 
     }
 
     if( (c >= 32) || (c == 28) ) {
-//      --mpReadPtr;
+//		--mpReadPtr;
         read2push();
-    } else if( c == 29 ) {      // longint
-        ++mpReadPtr;            // skip 29
+    } else if( c == 29 ) {		// longint
+        ++mpReadPtr;			// skip 29
         int nS32 = mpReadPtr[0] << 24;
         nS32 += mpReadPtr[1] << 16;
         nS32 += mpReadPtr[2] << 8;
         nS32 += mpReadPtr[3] << 0;
         if( (sizeof(nS32) != 4) && (nS32 & (1<<31)))
-            nS32 |= (~0U) << 31;    // assuming 2s complement
+            nS32 |= (~0U) << 31;	// assuming 2s complement
         mpReadPtr += 4;
         nVal = static_cast<ValType>(nS32);
         push( nVal );
-    } else if( c == 30) {       // real number
+    } else if( c == 30) {		// real number
         ++mpReadPtr; // skip 30
         const RealType fReal = readRealVal();
         // push value onto stack
@@ -753,22 +753,22 @@ void CffSubsetterContext::read2push()
     if( c == 28 ) {
         short nS16 = (p[1] << 8) + p[2];
         if( (sizeof(nS16) != 2) && (nS16 & (1<<15)))
-            nS16 |= (~0U) << 15;    // assuming 2s complement
+            nS16 |= (~0U) << 15;	// assuming 2s complement
         aVal = nS16;
         p += 3;
-    } else if( c <= 246 ) {     // -107..+107
+    } else if( c <= 246 ) {		// -107..+107
         aVal = static_cast<ValType>(p[0] - 139);
         p += 1;
-    } else if( c <= 250 ) {     // +108..+1131
+    } else if( c <= 250 ) {		// +108..+1131
         aVal = static_cast<ValType>(((p[0] << 8) + p[1]) - 63124);
         p += 2;
-    } else if( c <= 254 ) {     // -108..-1131
+    } else if( c <= 254 ) {		// -108..-1131
         aVal = static_cast<ValType>(64148 - ((p[0] << 8) + p[1]));
         p += 2;
-    } else /*if( c == 255)*/ {  // Fixed16.16
+    } else /*if( c == 255)*/ {	// Fixed16.16
         int nS32 = (p[1] << 24) + (p[2] << 16) + (p[3] << 8) + p[4];
         if( (sizeof(nS32) != 2) && (nS32 & (1<<31)))
-            nS32 |= (~0U) << 31;    // assuming 2s complement
+            nS32 |= (~0U) << 31;	// assuming 2s complement
         aVal = static_cast<ValType>(nS32 * (1.0 / 0x10000));
         p += 5;
     }
@@ -786,19 +786,19 @@ void CffSubsetterContext::writeType1Val( ValType aVal)
     static const int nOutCharstrType = 1;
     if( (nInt != aVal) && (nOutCharstrType == 2)) {
         // numtype==255 means int32 for Type1, but 16.16 for Type2 charstrings!!!
-        *(pOut++) = 255;                            // Fixed 16.16
+        *(pOut++) = 255;                			// Fixed 16.16
         *(pOut++) = static_cast<U8>(nInt >> 8);
         *(pOut++) = static_cast<U8>(nInt);
         nInt = static_cast<int>(aVal * 0x10000) & 0xFFFF;
         *(pOut++) = static_cast<U8>(nInt >> 8);
         *(pOut++) = static_cast<U8>(nInt);
     } else if( (nInt >= -107) && (nInt <= +107)) {
-        *(pOut++) = static_cast<U8>(nInt + 139);    // -107..+107
+        *(pOut++) = static_cast<U8>(nInt + 139);	// -107..+107
     } else if( (nInt >= -1131) && (nInt <= +1131)) {
         if( nInt >= 0)
-            nInt += 63124;                          // +108..+1131
+            nInt += 63124;							// +108..+1131
         else
-            nInt = 64148 - nInt;                    // -108..-1131
+            nInt = 64148 - nInt;					// -108..-1131
         *(pOut++) = static_cast<U8>(nInt >> 8);
         *(pOut++) = static_cast<U8>(nInt);
     } else if( nOutCharstrType == 1) {
@@ -847,7 +847,7 @@ void CffSubsetterContext::pop2MultiWrite( int nArgsPerTypo, int nTypeOp, int nTy
         }
         i += nArgsPerTypo;
         writeTypeOp( nTypeOp);
-        nTypeOp ^= nTypeXor;    // for toggling vlineto/hlineto
+        nTypeOp ^= nTypeXor;	// for toggling vlineto/hlineto
     }
     clear();
 }
@@ -1342,7 +1342,7 @@ int CffSubsetterContext::convert2Type1Ops( CffLocal* pCffLocal, const U8* const
 
     // prepare the charstring conversion
     mpWritePtr = pT1Ops;
-#if 1   // TODO: update caller
+#if 1 	// TODO: update caller
     U8 aType1Ops[ MAX_T1OPS_SIZE];
     if( !pT1Ops)
         mpWritePtr = aType1Ops;
@@ -1372,10 +1372,10 @@ mnHintSize=mnHorzHintSize=mnStackIdx=0; maCharWidth=-1;//#######
 mnCntrMask = 0;
     while( mpReadPtr < mpReadEnd)
         convertOneTypeOp();
-//  if( bActivePath)
-//      writeTypeOp( TYPE1OP::CLOSEPATH);
-//  if( bSubRoutine)
-//      writeTypeOp( TYPE1OP::RETURN);
+//	if( bActivePath)
+//		writeTypeOp( TYPE1OP::CLOSEPATH);
+//	if( bSubRoutine)
+//		writeTypeOp( TYPE1OP::RETURN);
 if( mbSawError) {
     mpWritePtr = pT1Ops+4;
      // create an "idiotproof" charstring
@@ -1408,7 +1408,7 @@ if( mbSawError) {
     // encrypt the Type1 charstring
     int nRDCryptR = 4330; // TODO: mnRDCryptSeed;
     for( U8* p = pT1Ops; p < mpWritePtr; ++p) {
-        *p ^= (nRDCryptR >> 8);
+        *p ^= (nRDCryptR >> 8); 
         nRDCryptR = (*(U8*)p + nRDCryptR) * 52845 + 22719;
     }
 
@@ -1432,44 +1432,44 @@ RealType CffSubsetterContext::readRealVal()
         if( nH <= 9) {
             nNumber = nNumber * 10 + nH;
             --nExpVal;
-        } else if( nH == 10) {  // comma
+        } else if( nH == 10) {	// comma
             nExpVal = 0;
             bComma = true;
-        } else if( nH == 11) {  // +exp
+        } else if( nH == 11) {	// +exp
             fReal *= nNumber;
             nExpSign = +1;
             nNumber = 0;
-        } else if( nH == 12) {  // -exp
+        } else if( nH == 12) {	// -exp
             fReal *= nNumber;
             nExpSign = -1;
             nNumber = 0;
-        } else if( nH == 13) {  // reserved
+        } else if( nH == 13) {	// reserved
             // TODO: ignore or error?
-        } else if( nH == 14)    // minus
+        } else if( nH == 14)	// minus
             fReal = -fReal;
-        else if( nH == 15)  // end
+        else if( nH == 15)	// end
             break;
         // parse low nibble
         const U8 nL = c & 0x0F;
         if( nL <= 9) {
             nNumber = nNumber * 10 + nL;
             --nExpVal;
-        } else if( nL == 10) {  // comma
+        } else if( nL == 10) {	// comma
             nExpVal = 0;
             bComma = true;
-        } else if( nL == 11) {  // +exp
+        } else if( nL == 11) {	// +exp
             fReal *= nNumber;
             nNumber = 0;
             nExpSign = +1;
-        } else if( nL == 12) {  // -exp
+        } else if( nL == 12) {	// -exp
             fReal *= nNumber;
             nNumber = 0;
             nExpSign = -1;
-        } else if( nL == 13) {  // reserved
+        } else if( nL == 13) {	// reserved
             // TODO: ignore or error?
-        } else if( nL == 14)    // minus
+        } else if( nL == 14)	// minus
             fReal = -fReal;
-        else if( nL == 15)  // end
+        else if( nL == 15)	// end
             break;
     }
 
@@ -1504,19 +1504,19 @@ int CffSubsetterContext::seekIndexData( int nIndexBase, int nDataIndex)
     int nOfs1 = 0;
     switch( nDataOfsSz) {
         default: fprintf( stderr, "\tINVALID nDataOfsSz=%d\n\n", nDataOfsSz); return -1;
-        case 1: nOfs1 = mpReadPtr[0]; break;
-        case 2: nOfs1 = (mpReadPtr[0]<<8) + mpReadPtr[1]; break;
-        case 3: nOfs1 = (mpReadPtr[0]<<16) + (mpReadPtr[1]<<8) + mpReadPtr[2]; break;
-        case 4: nOfs1 = (mpReadPtr[0]<<24) + (mpReadPtr[1]<<16) + (mpReadPtr[2]<<8) + mpReadPtr[3]; break;
+        case 1:	nOfs1 = mpReadPtr[0]; break;
+        case 2:	nOfs1 = (mpReadPtr[0]<<8) + mpReadPtr[1]; break;
+        case 3:	nOfs1 = (mpReadPtr[0]<<16) + (mpReadPtr[1]<<8) + mpReadPtr[2]; break;
+        case 4:	nOfs1 = (mpReadPtr[0]<<24) + (mpReadPtr[1]<<16) + (mpReadPtr[2]<<8) + mpReadPtr[3]; break;
     }
     mpReadPtr += nDataOfsSz;
 
     int nOfs2 = 0;
     switch( nDataOfsSz) {
-        case 1: nOfs2 = mpReadPtr[0]; break;
-        case 2: nOfs2 = (mpReadPtr[0]<<8) + mpReadPtr[1]; break;
-        case 3: nOfs2 = (mpReadPtr[0]<<16) + (mpReadPtr[1]<<8) + mpReadPtr[2]; break;
-        case 4: nOfs2 = (mpReadPtr[0]<<24) + (mpReadPtr[1]<<16) + (mpReadPtr[2]<<8) + mpReadPtr[3]; break;
+        case 1:	nOfs2 = mpReadPtr[0]; break;
+        case 2:	nOfs2 = (mpReadPtr[0]<<8) + mpReadPtr[1]; break;
+        case 3:	nOfs2 = (mpReadPtr[0]<<16) + (mpReadPtr[1]<<8) + mpReadPtr[2]; break;
+        case 4:	nOfs2 = (mpReadPtr[0]<<24) + (mpReadPtr[1]<<16) + (mpReadPtr[2]<<8) + mpReadPtr[3]; break;
     }
 
     mpReadPtr = mpBasePtr + (nIndexBase + 2) + nDataOfsSz * (nDataCount + 1) + nOfs1;
@@ -1542,10 +1542,10 @@ void CffSubsetterContext::seekIndexEnd( int nIndexBase)
     int nEndOfs = 0;
     switch( nDataOfsSz) {
         default: fprintf( stderr, "\tINVALID nDataOfsSz=%d\n\n", nDataOfsSz); return;
-        case 1: nEndOfs = mpReadPtr[0]; break;
-        case 2: nEndOfs = (mpReadPtr[0]<<8) + mpReadPtr[1]; break;
-        case 3: nEndOfs = (mpReadPtr[0]<<16) + (mpReadPtr[1]<<8) + mpReadPtr[2];break;
-        case 4: nEndOfs = (mpReadPtr[0]<<24) + (mpReadPtr[1]<<16) + (mpReadPtr[2]<<8) + mpReadPtr[3]; break;
+        case 1:	nEndOfs = mpReadPtr[0]; break;
+        case 2:	nEndOfs = (mpReadPtr[0]<<8) + mpReadPtr[1]; break;
+        case 3:	nEndOfs = (mpReadPtr[0]<<16) + (mpReadPtr[1]<<8) + mpReadPtr[2];break;
+        case 4:	nEndOfs = (mpReadPtr[0]<<24) + (mpReadPtr[1]<<16) + (mpReadPtr[2]<<8) + mpReadPtr[3]; break;
     }
     mpReadPtr += nDataOfsSz;
     mpReadPtr += nEndOfs - 1;
@@ -1558,22 +1558,22 @@ void CffSubsetterContext::seekIndexEnd( int nIndexBase)
 
 // initialize FONTDICT specific values
 CffLocal::CffLocal( void)
-:   mnPrivDictBase( 0)
-,   mnPrivDictSize( 0)
-,   mnLocalSubrOffs( 0)
-,   mnLocalSubrBase( 0)
-,   mnLocalSubrCount( 0)
-,   mnLocalSubrBias( 0)
-,   maNominalWidth( 0)
-,   maDefaultWidth( 0)
-,   maStemStdHW( 0)
-,   maStemStdVW( 0)
-,   mfBlueScale( 0.0)
-,   mfBlueShift( 0.0)
-,   mfBlueFuzz( 0.0)
-,   mfExpFactor( 0.0)
-,   mnLangGroup( 0)
-,   mbForceBold( false)
+:	mnPrivDictBase( 0)
+,	mnPrivDictSize( 0)
+,	mnLocalSubrOffs( 0)
+,	mnLocalSubrBase( 0)
+,	mnLocalSubrCount( 0)
+,	mnLocalSubrBias( 0)
+,	maNominalWidth( 0)
+,	maDefaultWidth( 0)
+,	maStemStdHW( 0)
+,	maStemStdVW( 0)
+,	mfBlueScale( 0.0)
+,	mfBlueShift( 0.0)
+,	mfBlueFuzz( 0.0)
+,	mfExpFactor( 0.0)
+,	mnLangGroup( 0)
+,	mbForceBold( false)
 {
     maStemSnapH.clear();
     maStemSnapV.clear();
@@ -1586,24 +1586,24 @@ CffLocal::CffLocal( void)
 // --------------------------------------------------------------------
 
 CffGlobal::CffGlobal( void)
-:   mnNameIdxBase( 0)
-,   mnNameIdxCount( 0)
-,   mnStringIdxBase( 0)
-,   mnStringIdxCount( 0)
-,   mbCIDFont( false)
-,   mnCharStrBase( 0)
-,   mnCharStrCount( 0)
-,   mnEncodingBase( 0)
-,   mnCharsetBase( 0)
-,   mnGlobalSubrBase( 0)
-,   mnGlobalSubrCount( 0)
-,   mnGlobalSubrBias( 0)
-,   mnFDSelectBase( 0)
-,   mnFontDictBase( 0)
-,   mnFDAryCount( 1)
-,   mnFontNameSID( 0)
-,   mnFullNameSID( 0)
-,   mnFamilyNameSID( 0)
+:	mnNameIdxBase( 0)
+,	mnNameIdxCount( 0)
+,	mnStringIdxBase( 0)
+,	mnStringIdxCount( 0)
+,	mbCIDFont( false)
+,	mnCharStrBase( 0)
+,	mnCharStrCount( 0)
+,	mnEncodingBase( 0)
+,	mnCharsetBase( 0)
+,	mnGlobalSubrBase( 0)
+,	mnGlobalSubrCount( 0)
+,	mnGlobalSubrBias( 0)
+,	mnFDSelectBase( 0)
+,	mnFontDictBase( 0)
+,	mnFDAryCount( 1)
+,	mnFontNameSID( 0)
+,	mnFullNameSID( 0)
+,	mnFamilyNameSID( 0)
 {
     maFontBBox.clear();
     // TODO; maFontMatrix.clear();
@@ -1651,22 +1651,22 @@ void CffSubsetterContext::initialCffRead( void)
     mnGlobalSubrCount = (mpReadPtr[0]<<8) + mpReadPtr[1];
     mnGlobalSubrBias = (mnGlobalSubrCount<1240)?107:(mnGlobalSubrCount<33900)?1131:32768;
     // skip past the last GlobalSubr entry
-//  seekIndexEnd( mnGlobalSubrBase);
+//	seekIndexEnd( mnGlobalSubrBase);
 
     // get/skip the Encodings (we got mnEncodingBase from TOPDICT)
-//  seekEncodingsEnd( mnEncodingBase);
+//	seekEncodingsEnd( mnEncodingBase);
     // get/skip the Charsets (we got mnCharsetBase from TOPDICT)
-//  seekCharsetsEnd( mnCharStrBase);
+//	seekCharsetsEnd( mnCharStrBase);
     // get/skip FDSelect (CID only) data
 
     // prepare access to the CharStrings index (we got the base from TOPDICT)
     mpReadPtr = mpBasePtr + mnCharStrBase;
     mnCharStrCount = (mpReadPtr[0]<<8) + mpReadPtr[1];
-//  seekIndexEnd( mnCharStrBase);
+//	seekIndexEnd( mnCharStrBase);
 
     // read the FDArray index (CID only)
     if( mbCIDFont) {
-//      assert( mnFontDictBase == tellRel());
+//		assert( mnFontDictBase == tellRel());
         mpReadPtr = mpBasePtr + mnFontDictBase;
         mnFDAryCount = (mpReadPtr[0]<<8) + mpReadPtr[1];
         assert( mnFDAryCount < (int)(sizeof(maCffLocal)/sizeof(*maCffLocal)));
@@ -1705,7 +1705,7 @@ void CffSubsetterContext::initialCffRead( void)
             const int nSubrCount = (mpReadPtr[0] << 8) + mpReadPtr[1];
             mpCffLocal->mnLocalSubrCount = nSubrCount;
             mpCffLocal->mnLocalSubrBias = (nSubrCount<1240)?107:(nSubrCount<33900)?1131:32768;
-//          seekIndexEnd( mpCffLocal->mnLocalSubrBase);
+//			seekIndexEnd( mpCffLocal->mnLocalSubrBase);
         }
     }
 
@@ -1782,7 +1782,7 @@ int CffSubsetterContext::getFDSelect( int nGlyphIndex) const
                     nPrev = nNext;
                 }
             } break;
-        default:    // invalid FDselect format
+        default:	// invalid FDselect format
             fprintf( stderr, "invalid CFF.FdselType=%d\n", nFDSelFormat);
             break;
     }
@@ -1883,40 +1883,40 @@ const char* CffSubsetterContext::getGlyphName( int nGlyphIndex)
 class Type1Emitter
 {
 public:
-    explicit    Type1Emitter( const char* pOutFileName, bool bPfbSubset = true);
-    explicit    Type1Emitter( FILE* pOutFile, bool bPfbSubset = true);
-    /*virtual*/ ~Type1Emitter( void);
-    void        setSubsetName( const char* );
-
-    void        emitRawData( const char* pData, int nLength) const;
-    void        emitAllRaw( void);
-    void        emitAllHex( void);
-    void        emitAllCrypted( void);
-    int         tellPos( void) const;
-    void        updateLen( int nTellPos, int nLength);
-    void        emitValVector( const char* pLineHead, const char* pLineTail, const ValVector&);
+    explicit	Type1Emitter( const char* pOutFileName, bool bPfbSubset = true);
+    explicit	Type1Emitter( FILE* pOutFile, bool bPfbSubset = true);
+    /*virtual*/	~Type1Emitter( void);
+    void		setSubsetName( const char* );
+
+    void		emitRawData( const char* pData, int nLength) const;
+    void		emitAllRaw( void);
+    void		emitAllHex( void);
+    void		emitAllCrypted( void);
+    int			tellPos( void) const;
+    void		updateLen( int nTellPos, int nLength);
+    void		emitValVector( const char* pLineHead, const char* pLineTail, const ValVector&);
 private:
-    FILE*       mpFileOut;
-    bool        mbCloseOutfile;
-    char        maBuffer[MAX_T1OPS_SIZE];   // TODO: dynamic allocation
-    int         mnEECryptR;
+    FILE*		mpFileOut;
+    bool		mbCloseOutfile;
+    char		maBuffer[MAX_T1OPS_SIZE];	// TODO: dynamic allocation
+    int			mnEECryptR;
 public:
-    char*       mpPtr;
+    char*		mpPtr;
 
-    char        maSubsetName[256];
-    bool        mbPfbSubset;
-    int         mnHexLineCol;
+    char		maSubsetName[256];
+    bool		mbPfbSubset;
+    int			mnHexLineCol;
 };
 
 // --------------------------------------------------------------------
 
 Type1Emitter::Type1Emitter( const char* pPfbFileName, bool bPfbSubset)
-:   mpFileOut( NULL)
-,   mbCloseOutfile( true)
-,   mnEECryptR( 55665)  // default eexec seed, TODO: mnEECryptSeed
-,   mpPtr( maBuffer)
-,   mbPfbSubset( bPfbSubset)
-,   mnHexLineCol( 0)
+:	mpFileOut( NULL)
+,	mbCloseOutfile( true)
+,	mnEECryptR( 55665)	// default eexec seed, TODO: mnEECryptSeed
+,	mpPtr( maBuffer)
+,	mbPfbSubset( bPfbSubset)
+,	mnHexLineCol( 0)
 {
     mpFileOut = fopen( pPfbFileName, "wb");
     maSubsetName[0] = '\0';
@@ -1925,12 +1925,12 @@ Type1Emitter::Type1Emitter( const char* pPfbFileName, bool bPfbSubset)
 // --------------------------------------------------------------------
 
 Type1Emitter::Type1Emitter( FILE* pOutFile, bool bPfbSubset)
-:   mpFileOut( pOutFile)
-,   mbCloseOutfile( false)
-,   mnEECryptR( 55665)  // default eexec seed, TODO: mnEECryptSeed
-,   mpPtr( maBuffer)
-,   mbPfbSubset( bPfbSubset)
-,   mnHexLineCol( 0)
+:	mpFileOut( pOutFile)
+,	mbCloseOutfile( false)
+,	mnEECryptR( 55665)	// default eexec seed, TODO: mnEECryptSeed
+,	mpPtr( maBuffer)
+,	mbPfbSubset( bPfbSubset)
+,	mnHexLineCol( 0)
 {
     maSubsetName[0] = '\0';
 }
@@ -2135,7 +2135,7 @@ bool CffSubsetterContext::emitAsType1( Type1Emitter& rEmitter,
             pFamilyName, pFamilyName, nUniqueId);
 #endif
     pOut += sprintf( pOut,
-        "11 dict begin\n"   // TODO: dynamic entry count for TOPDICT
+        "11 dict begin\n"	// TODO: dynamic entry count for TOPDICT
         "/FontType 1 def\n"
         "/PaintType 0 def\n");
     pOut += sprintf( pOut, "/FontName /%s def\n", rEmitter.maSubsetName);
@@ -2152,12 +2152,12 @@ bool CffSubsetterContext::emitAsType1( Type1Emitter& rEmitter,
         pOut += sprintf( pOut, "/FontBBox {0 0 999 999}readonly def\n");
     // emit FONTINFO into TOPDICT
     pOut += sprintf( pOut,
-        "/FontInfo 2 dict dup begin\n"  // TODO: check fontinfo entry count
+        "/FontInfo 2 dict dup begin\n"	// TODO: check fontinfo entry count
         " /FullName (%s) readonly def\n"
         " /FamilyName (%s) readonly def\n"
         "end readonly def\n",
             pFullName, pFamilyName);
-#if 0   // TODO: use an standard Type1 encoding if possible
+#if 0	// TODO: use an standard Type1 encoding if possible
     pOut += sprintf( pOut,
         "/Encoding StandardEncoding def\n");
 #else
@@ -2181,9 +2181,9 @@ bool CffSubsetterContext::emitAsType1( Type1Emitter& rEmitter,
         // update PFB header segment
         const int nPfbHeaderLen = rEmitter.tellPos() - 6;
         rEmitter.updateLen( 2, nPfbHeaderLen);
-
+    
         // prepare start of eexec segment
-        rEmitter.emitRawData( "\x80\x02\x00\x00\x00\x00", 6);   // segment start
+        rEmitter.emitRawData( "\x80\x02\x00\x00\x00\x00", 6);	// segment start
     }
     const int nEExecSegTell = rEmitter.tellPos();
 
@@ -2217,11 +2217,11 @@ bool CffSubsetterContext::emitAsType1( Type1Emitter& rEmitter,
         "/ND{noaccess def}executeonly def\n"
         "/NP{noaccess put}executeonly def\n"
         "/MinFeature{16 16}ND\n"
-        "/password 5839 def\n",     // TODO: mnRDCryptSeed?
+        "/password 5839 def\n",		// TODO: mnRDCryptSeed?
             nPrivEntryCount);
 
 #if defined(IGNORE_HINTS)
-    pOut += sprintf( pOut, "/BlueValues []ND\n");   // BlueValues are mandatory
+    pOut += sprintf( pOut, "/BlueValues []ND\n");	// BlueValues are mandatory
 #else
     // emit blue hint related privdict entries
     if( !mpCffLocal->maBlueValues.empty())
@@ -2237,12 +2237,12 @@ bool CffSubsetterContext::emitAsType1( Type1Emitter& rEmitter,
         pOut += dbl2str( pOut, mpCffLocal->mfBlueScale, 6);
         pOut += sprintf( pOut, " def\n");
     }
-    if( mpCffLocal->mfBlueShift) {  // default BlueShift==7
+    if( mpCffLocal->mfBlueShift) {	// default BlueShift==7
         pOut += sprintf( pOut, "/BlueShift ");
         pOut += dbl2str( pOut, mpCffLocal->mfBlueShift);
         pOut += sprintf( pOut, " def\n");
     }
-    if( mpCffLocal->mfBlueFuzz) {       // default BlueFuzz==1
+    if( mpCffLocal->mfBlueFuzz) {		// default BlueFuzz==1
         pOut += sprintf( pOut, "/BlueFuzz ");
         pOut += dbl2str( pOut, mpCffLocal->mfBlueFuzz);
         pOut += sprintf( pOut, " def\n");
@@ -2352,7 +2352,7 @@ bool CffSubsetterContext::emitAsType1( Type1Emitter& rEmitter,
         const int nEExecLen = rEmitter.tellPos() - nEExecSegTell;
         rEmitter.updateLen( nEExecSegTell-4, nEExecLen);
      }
-
+ 
     // create PFB footer
     static const char aPfxFooter[] = "\x80\x01\x14\x02\x00\x00\n" // TODO: check segment len
         "0000000000000000000000000000000000000000000000000000000000000000\n"
@@ -2385,12 +2385,12 @@ bool CffSubsetterContext::emitAsType1( Type1Emitter& rEmitter,
                                         static_cast<long>(maFontBBox[3] * fYFactor) ) );
     // PDF-Spec says the values below mean the ink bounds!
     // TODO: use better approximations for these ink bounds
-    rFSInfo.m_nAscent  = +rFSInfo.m_aFontBBox.Bottom(); // for capital letters
-    rFSInfo.m_nDescent = -rFSInfo.m_aFontBBox.Top();    // for all letters
-    rFSInfo.m_nCapHeight = rFSInfo.m_nAscent;           // for top-flat capital letters
+    rFSInfo.m_nAscent  = +rFSInfo.m_aFontBBox.Bottom();	// for capital letters
+    rFSInfo.m_nDescent = -rFSInfo.m_aFontBBox.Top();	// for all letters
+    rFSInfo.m_nCapHeight = rFSInfo.m_nAscent;			// for top-flat capital letters
 
     rFSInfo.m_nFontType = rEmitter.mbPfbSubset ? FontSubsetInfo::TYPE1_PFB : FontSubsetInfo::TYPE1_PFA;
-    rFSInfo.m_aPSName   = String( rEmitter.maSubsetName, RTL_TEXTENCODING_UTF8 );
+    rFSInfo.m_aPSName	= String( rEmitter.maSubsetName, RTL_TEXTENCODING_UTF8 );
 
     return true;
 }
diff --git a/vcl/source/fontsubset/fontsubset.cxx b/vcl/source/fontsubset/fontsubset.cxx
index 64cf243c6a9d..0fb4ffa25b20 100644
--- a/vcl/source/fontsubset/fontsubset.cxx
+++ b/vcl/source/fontsubset/fontsubset.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
@@ -35,14 +35,14 @@
 // ====================================================================
 
 FontSubsetInfo::FontSubsetInfo()
-:   m_nAscent( 0)
-,   m_nDescent( 0)
-,   m_nCapHeight( 0)
-,   m_nFontType( FontSubsetInfo::NO_FONT)
-,   mpInFontBytes( NULL)
-,   mnInByteLength( 0)
-,   meInFontType( FontSubsetInfo::NO_FONT)
-,   mpSftTTFont( NULL)
+:	m_nAscent( 0)
+,	m_nDescent( 0)
+,	m_nCapHeight( 0)
+,	m_nFontType( FontSubsetInfo::NO_FONT)
+,	mpInFontBytes( NULL)
+,	mnInByteLength( 0)
+,	meInFontType( FontSubsetInfo::NO_FONT)
+,	mpSftTTFont( NULL)
 {}
 
 // --------------------------------------------------------------------
@@ -85,15 +85,15 @@ bool FontSubsetInfo::CreateFontSubset(
 {
     // prepare request details needed by all underlying subsetters
     mnReqFontTypeMask = nReqFontTypeMask;
-    mpOutFile       = pOutFile;
-    mpReqFontName   = pReqFontName;
-    mpReqGlyphIds   = pReqGlyphIds;
-    mpReqEncodedIds = pReqEncodedIds;
-    mnReqGlyphCount = nReqGlyphCount;
+    mpOutFile		= pOutFile;
+    mpReqFontName	= pReqFontName;
+    mpReqGlyphIds	= pReqGlyphIds;
+    mpReqEncodedIds	= pReqEncodedIds;
+    mnReqGlyphCount	= nReqGlyphCount;
 
     // TODO: move the glyphid/encid/notdef reshuffling from the callers to here
 
-    // dispatch to underlying subsetters
+    // dispatch to underlying subsetters 
     bool bOK = false;
 
     // TODO: better match available input-type to possible subset-types
diff --git a/vcl/source/fontsubset/gsub.cxx b/vcl/source/fontsubset/gsub.cxx
index 37650003eefa..a718b1ea8899 100644
--- a/vcl/source/fontsubset/gsub.cxx
+++ b/vcl/source/fontsubset/gsub.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
@@ -185,10 +185,10 @@ int ReadGSUB( struct _TrueTypeFont* pTTFile,
         if( aFeatureIndexList[0] != nFeatureIndex ) // do not ignore the required feature
         {
             const int nRequested = std::count( aFeatureIndexList.begin(), aFeatureIndexList.end(), nFeatureIndex);
-            if( !nRequested )   // ignore features that are not requested
+            if( !nRequested )	// ignore features that are not requested
                 continue;
             const int nAvailable = std::count( aReqFeatureTagList.begin(), aReqFeatureTagList.end(), nTag);
-            if( !nAvailable )   // some fonts don't provide features they request!
+            if( !nAvailable )	// some fonts don't provide features they request!
                 continue;
         }
 
diff --git a/vcl/source/fontsubset/gsub.h b/vcl/source/fontsubset/gsub.h
index 9d552ce45701..fe80f6b2606f 100644
--- a/vcl/source/fontsubset/gsub.h
+++ b/vcl/source/fontsubset/gsub.h
@@ -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
@@ -30,7 +30,7 @@
 
 namespace vcl
 {
-
+    
 int HasVerticalGSUB( struct vcl::_TrueTypeFont* pTTFile );
 
 int UseGSUB( struct vcl::_TrueTypeFont* pTTFile, int nGlyph, int wmode );
diff --git a/vcl/source/fontsubset/list.c b/vcl/source/fontsubset/list.c
index 3b55b4dfee15..91101feb653a 100644
--- a/vcl/source/fontsubset/list.c
+++ b/vcl/source/fontsubset/list.c
@@ -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
diff --git a/vcl/source/fontsubset/sft.cxx b/vcl/source/fontsubset/sft.cxx
index 43f24e5026ea..a52e8afeaf11 100644
--- a/vcl/source/fontsubset/sft.cxx
+++ b/vcl/source/fontsubset/sft.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
@@ -93,7 +93,7 @@ struct PSPathElement
     int x1, y1;
     int x2, y2;
     int x3, y3;
-
+    
     PSPathElement( PathSegmentType i_eType ) : type( i_eType ),
                                    x1( 0 ), y1( 0 ),
                                    x2( 0 ), y2( 0 ),
@@ -541,11 +541,11 @@ static int GetSimpleTTOutline(TrueTypeFont *ttf, sal_uInt32 glyphID, ControlPoin
 
     /* printf("GetSimpleTTOutline(%d)\n", glyphID); */
 
-    if( glyphID >= ttf->nglyphs )           /*- glyph is not present in the font */
+    if( glyphID >= ttf->nglyphs )			/*- glyph is not present in the font */
         return 0;
     const sal_uInt8* ptr = table + ttf->goffsets[glyphID];
     const sal_Int16 numberOfContours = GetInt16(ptr, 0, 1);
-    if( numberOfContours <= 0 )             /*- glyph is not simple */
+    if( numberOfContours <= 0 )				/*- glyph is not simple */
         return 0;
 
     if (metrics) {                                                    /*- GetCompoundTTOutline() calls this function with NULL metrics -*/
@@ -809,7 +809,7 @@ static int GetCompoundTTOutline(TrueTypeFont *ttf, sal_uInt32 glyphID, ControlPo
 
     pa = (ControlPoint*)calloc(np, sizeof(ControlPoint));
     assert(pa != 0);
-
+    
     memcpy( pa, &myPoints[0], np*sizeof(ControlPoint) );
 
     *pointArray = pa;
@@ -1177,7 +1177,7 @@ static void GetNames(TrueTypeFont *t)
     {
         t->subfamily = strdup("");
     }
-
+    
     /* #i60349# sanity check psname
      * psname parctically has to be 7bit ascii and should not contains spaces
      * there is a class of broken fonts which do not fullfill that at all, so let's try
@@ -1409,7 +1409,7 @@ static void FindCmap(TrueTypeFont *ttf)
     for (i = 0; i < ncmaps; i++) {
         sal_uInt32 offset;
         sal_uInt16 pID, eID;
-
+        
         /* sanity check, cmap entry must lie within table */
         if( i*8+4 > table_size )
             break;
@@ -1417,14 +1417,14 @@ static void FindCmap(TrueTypeFont *ttf)
         pID = GetUInt16(table, 4 + i * 8, 1);
         eID = GetUInt16(table, 6 + i * 8, 1);
         offset = GetUInt32(table, 8 + i * 8, 1);
-
+        
          /* sanity check, cmap must lie within file */
         if( (table - ttf->ptr) + offset > (sal_uInt32)ttf->fsize )
             continue;
 
         /* Unicode tables in Apple fonts */
         if (pID == 0) {
-            AppleUni = offset;
+            AppleUni = offset;	
         }
 
         if (pID == 3) {
@@ -1553,10 +1553,10 @@ static void KernGlyphsPrim1(TrueTypeFont *ttf, sal_uInt16 *glyphs, int nglyphs,
 {
     (void)ttf; /* avoid warning */
     (void)glyphs; /* avoid warning */
-    (void)nglyphs; /* avoid warning */
-    (void)wmode; /* avoid warning */
-    (void)nglyphs; /* avoid warning */
-    (void)kern; /* avoid warning */
+    (void)nglyphs; /* avoid warning */    
+    (void)wmode; /* avoid warning */    
+    (void)nglyphs; /* avoid warning */    
+    (void)kern; /* avoid warning */    
     fprintf(stderr, "MacOS kerning tables have not been implemented yet!\n");
 }
 
@@ -1659,7 +1659,7 @@ int OpenTTFontFile( const char* fname, sal_uInt32 facenum, TrueTypeFont** ttf )
     struct stat st;
 
     if (!fname || !*fname) return SF_BADFILE;
-
+    
     allocTrueTypeFont( ttf );
     if( ! *ttf )
         return SF_MEMORY;
@@ -1699,7 +1699,7 @@ int OpenTTFontFile( const char* fname, sal_uInt32 facenum, TrueTypeFont** ttf )
         goto cleanup;
     }
     close(fd);
-
+    
     return doOpenTTFont( facenum, *ttf );
 
 cleanup:
@@ -1717,12 +1717,12 @@ int OpenTTFontBuffer(void* pBuffer, sal_uInt32 nLen, sal_uInt32 facenum, TrueTyp
     allocTrueTypeFont( ttf );
     if( *ttf == NULL )
         return SF_MEMORY;
-
+    
     (*ttf)->fname = NULL;
     (*ttf)->fsize = nLen;
     (*ttf)->ptr   = (sal_uInt8*)pBuffer;
-
-    return doOpenTTFont( facenum, *ttf );
+    
+    return doOpenTTFont( facenum, *ttf ); 
 }
 
 static int doOpenTTFont( sal_uInt32 facenum, TrueTypeFont* t )
@@ -1811,8 +1811,8 @@ static int doOpenTTFont( sal_uInt32 facenum, TrueTypeFont* t )
         if( !pHead )
             return SF_TTFORMAT;
         /* limit Head candidate to TTC extract's limits */
-        if( pHead > t->ptr + (t->fsize - 54) )
-            pHead = t->ptr + (t->fsize - 54);
+        if( pHead > t->ptr + (t->fsize - 54) ) 
+            pHead = t->ptr + (t->fsize - 54); 
         /* TODO: find better method than searching head table's magic */
         sal_uInt8* p = NULL;
         for( p = pHead + 12; p > t->ptr; --p ) {
@@ -1836,7 +1836,7 @@ static int doOpenTTFont( sal_uInt32 facenum, TrueTypeFont* t )
          * tables, but this would be quite time intensive.
          * Try to fix tables, so we can cope with minor problems.
          */
-
+        
         if( (sal_uInt8*)t->tables[i] < t->ptr )
         {
 #if OSL_DEBUG_LEVEL > 1
@@ -1893,7 +1893,7 @@ static int doOpenTTFont( sal_uInt32 facenum, TrueTypeFont* t )
 
         for( i = 0; i <= (int)t->nglyphs; ++i )
             t->goffsets[i] = indexfmt ? GetUInt32(table, i << 2, 1) : (sal_uInt32)GetUInt16(table, i << 1, 1) << 1;
-    } else if( getTable(t, O_CFF) ) {           /* PS-OpenType */
+    } else if( getTable(t, O_CFF) ) {			/* PS-OpenType */
         t->goffsets = (sal_uInt32 *) calloc(1+t->nglyphs, sizeof(sal_uInt32));
         /* TODO: implement to get subsetting */
         assert(t->goffsets != 0);
@@ -2233,7 +2233,7 @@ int  CreateTTFromTTGlyphs(TrueTypeFont  *ttf,
     for (i = 0; i < nGlyphs; i++) {
         gID[i] = glyfAdd(glyf, GetTTRawGlyphData(ttf, glyphArray[i]), ttf);
     }
-
+        
     /**                       cmap                          **/
     cmap = TrueTypeTableNew_cmap();
 
diff --git a/vcl/source/fontsubset/ttcr.cxx b/vcl/source/fontsubset/ttcr.cxx
index badf9fb496b0..8ec131dc3492 100644
--- a/vcl/source/fontsubset/ttcr.cxx
+++ b/vcl/source/fontsubset/ttcr.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
@@ -56,7 +56,7 @@ namespace vcl
         sal_uInt32 tag;                         /**< TrueType file tag */
         list   tables;                      /**< List of table tags and pointers */
     };
-
+    
 /* These must be #defined so that they can be used in initializers */
 #define T_maxp  0x6D617870
 #define T_glyf  0x676C7966
@@ -167,7 +167,7 @@ _inline void PutInt16(sal_Int16 val, sal_uInt8 *ptr, sal_uInt32 offset, int bige
         ptr[offset] = (sal_uInt8)(val & 0xFF);
     }
 }
-
+ 
 _inline void PutUInt16(sal_uInt16 val, sal_uInt8 *ptr, sal_uInt32 offset, int bigendian)
 {
     assert(ptr != 0);
@@ -239,7 +239,7 @@ static int NameRecordCompareF(const void *l, const void *r)
     }
     return 0;
 }
-
+    
 
 static sal_uInt32 CheckSum(sal_uInt32 *ptr, sal_uInt32 length)
 {
@@ -292,7 +292,7 @@ int AddTable(TrueTypeCreator *_this, TrueTypeTable *table)
 void RemoveTable(TrueTypeCreator *_this, sal_uInt32 tag)
 {
     int done = 0;
-
+    
     if (listCount(_this->tables)) {
         listToFirst(_this->tables);
         do {
@@ -316,16 +316,16 @@ int StreamToMemory(TrueTypeCreator *_this, sal_uInt8 **ptr, sal_uInt32 *length)
     sal_uInt32 *p;
     int i=0, n;
     sal_uInt8 *head = NULL;     /* saved pointer to the head table data for checkSumAdjustment calculation */
-
+    
     if ((n = listCount(_this->tables)) == 0) return SF_TTFORMAT;
 
     ProcessTables(_this);
 
     /* ProcessTables() adds 'loca' and 'hmtx' */
-
+    
     n = listCount(_this->tables);
     numTables = (sal_uInt16) n;
-
+    
 
     TableEntry* te = (TableEntry*)scalloc(n, sizeof(TableEntry));
 
@@ -336,7 +336,7 @@ int StreamToMemory(TrueTypeCreator *_this, sal_uInt8 **ptr, sal_uInt32 *length)
     }
 
     qsort(te, n, sizeof(TableEntry), TableEntryCompareF);
-
+    
     do {
         searchRange *= 2;
         entrySelector++;
@@ -386,7 +386,7 @@ int StreamToMemory(TrueTypeCreator *_this, sal_uInt8 **ptr, sal_uInt32 *length)
 
     *ptr = ttf;
     *length = s;
-
+    
     return SF_OK;
 }
 
@@ -476,12 +476,12 @@ typedef struct {
     sal_uInt32 isFixedPitch;
     void   *ptr;                        /* format-specific pointer */
 } tdata_post;
-
+    
 
 /* allocate memory for a TT table */
 static sal_uInt8 *ttmalloc(sal_uInt32 nbytes)
 {
-    sal_uInt32 n;
+    sal_uInt32 n; 
 
     n = (nbytes + 3) & (sal_uInt32) ~3;
     sal_uInt8* res = (sal_uInt8*)malloc(n);
@@ -490,7 +490,7 @@ static sal_uInt8 *ttmalloc(sal_uInt32 nbytes)
 
     return res;
 }
-
+    
 static void FreeGlyphData(void *ptr)
 {
     GlyphData *p = (GlyphData *) ptr;
@@ -559,7 +559,7 @@ static void TrueTypeTableDispose_cmap(TrueTypeTable *_this)
     table_cmap *t;
     CmapSubTable *s;
     sal_uInt32 i;
-
+    
     if (_this) {
         t = (table_cmap *) _this->data;
         if (t) {
@@ -617,7 +617,7 @@ static struct {
     {T_cmap, TrueTypeTableDispose_cmap},
     {T_name, TrueTypeTableDispose_name},
     {T_post, TrueTypeTableDispose_post}
-
+    
 };
 
 static int GetRawData_generic(TrueTypeTable *_this, sal_uInt8 **ptr, sal_uInt32 *len, sal_uInt32 *tag)
@@ -638,7 +638,7 @@ static int GetRawData_head(TrueTypeTable *_this, sal_uInt8 **ptr, sal_uInt32 *le
     *len = TABLESIZE_head;
     *ptr = (sal_uInt8 *) _this->data;
     *tag = T_head;
-
+    
     return TTCR_OK;
 }
 
@@ -647,7 +647,7 @@ static int GetRawData_hhea(TrueTypeTable *_this, sal_uInt8 **ptr, sal_uInt32 *le
     *len = TABLESIZE_hhea;
     *ptr = (sal_uInt8 *) _this->data;
     *tag = T_hhea;
-
+    
     return TTCR_OK;
 }
 
@@ -673,7 +673,7 @@ static int GetRawData_maxp(TrueTypeTable *_this, sal_uInt8 **ptr, sal_uInt32 *le
     *len = TABLESIZE_maxp;
     *ptr = (sal_uInt8 *) _this->data;
     *tag = T_maxp;
-
+    
     return TTCR_OK;
 }
 
@@ -765,7 +765,7 @@ static sal_uInt8 *PackCmapType6(CmapSubTable *s, sal_uInt32 *length)
     return ptr;
 }
 
-
+            
 
 /* XXX it only handles Format 0 encoding tables */
 static sal_uInt8 *PackCmap(CmapSubTable *s, sal_uInt32 *length)
@@ -862,7 +862,7 @@ static int GetRawData_name(TrueTypeTable *_this, sal_uInt8 **ptr, sal_uInt32 *le
     qsort(nr, n, sizeof(NameRecord), NameRecordCompareF);
 
     int nameLen = stringLen + 12 * n + 6;
-    sal_uInt8* name = (sal_uInt8*)ttmalloc(nameLen);
+    sal_uInt8* name = (sal_uInt8*)ttmalloc(nameLen); 
 
     PutUInt16(0, name, 0, 1);
     PutUInt16(n, name, 2, 1);
@@ -926,9 +926,9 @@ static int GetRawData_post(TrueTypeTable *_this, sal_uInt8 **ptr, sal_uInt32 *le
     return ret;
 }
 
+    
 
-
-
+    
 
 static struct {
     sal_uInt32 tag;
@@ -944,10 +944,10 @@ static struct {
     {T_cmap, GetRawData_cmap},
     {T_name, GetRawData_name},
     {T_post, GetRawData_post}
-
-
+    
+    
 };
-
+ 
 /*
  * TrueTypeTable public methods
  */
@@ -968,11 +968,11 @@ TrueTypeTable *TrueTypeTableNew(sal_uInt32 tag,
                                 const sal_uInt8* ptr)
 {
     TrueTypeTable* table = (TrueTypeTable*)smalloc(sizeof(TrueTypeTable));
-    tdata_generic* pdata = (tdata_generic*)smalloc(sizeof(tdata_generic));
+    tdata_generic* pdata = (tdata_generic*)smalloc(sizeof(tdata_generic)); 
     pdata->nbytes = nbytes;
     pdata->tag = tag;
     if (nbytes) {
-        pdata->ptr = ttmalloc(nbytes);
+        pdata->ptr = ttmalloc(nbytes); 
         memcpy(pdata->ptr, ptr, nbytes);
     } else {
         pdata->ptr = 0;
@@ -984,7 +984,7 @@ TrueTypeTable *TrueTypeTableNew(sal_uInt32 tag,
 
     return table;
 }
-
+    
 TrueTypeTable *TrueTypeTableNew_head(sal_uInt32 fontRevision,
                                      sal_uInt16 flags,
                                      sal_uInt16 unitsPerEm,
@@ -995,7 +995,7 @@ TrueTypeTable *TrueTypeTableNew_head(sal_uInt32 fontRevision,
 {
     assert(created != 0);
 
-    TrueTypeTable* table  = (TrueTypeTable*)smalloc(sizeof(TrueTypeTable));
+    TrueTypeTable* table  = (TrueTypeTable*)smalloc(sizeof(TrueTypeTable));  
     sal_uInt8* ptr = (sal_uInt8*)ttmalloc(TABLESIZE_head);
 
 
@@ -1039,7 +1039,7 @@ TrueTypeTable *TrueTypeTableNew_hhea(sal_Int16  ascender,
     PutUInt16(0, ptr, 28, 1);                     /* reserved 4 */
     PutUInt16(0, ptr, 30, 1);                     /* reserved 5 */
     PutUInt16(0, ptr, 32, 1);                     /* metricDataFormat */
-
+    
     table->data = (void *) ptr;
     table->tag = T_hhea;
     table->rawdata = 0;
@@ -1069,7 +1069,7 @@ TrueTypeTable *TrueTypeTableNew_maxp( const sal_uInt8* maxp, int size)
     if (maxp && size == TABLESIZE_maxp) {
         memcpy(table->data, maxp, TABLESIZE_maxp);
     }
-
+    
     table->tag = T_maxp;
     table->rawdata = 0;
 
@@ -1080,7 +1080,7 @@ TrueTypeTable *TrueTypeTableNew_glyf(void)
 {
     TrueTypeTable* table = (TrueTypeTable*)smalloc(sizeof(TrueTypeTable));
     list l = listNewEmpty();
-
+    
     assert(l != 0);
 
     listSetElementDtor(l, (list_destructor)FreeGlyphData);
@@ -1096,12 +1096,12 @@ TrueTypeTable *TrueTypeTableNew_cmap(void)
 {
     TrueTypeTable* table = (TrueTypeTable*)smalloc(sizeof(TrueTypeTable));
     table_cmap* cmap = (table_cmap*)smalloc(sizeof(table_cmap));
-
+    
     cmap->n = 0;
     cmap->m = CMAP_SUBTABLE_INIT;
     cmap->s = (CmapSubTable *) scalloc(CMAP_SUBTABLE_INIT, sizeof(CmapSubTable));
     memset(cmap->s, 0, sizeof(CmapSubTable) * CMAP_SUBTABLE_INIT);
-
+    
     table->data = (table_cmap *) cmap;
 
     table->rawdata = 0;
@@ -1137,7 +1137,7 @@ TrueTypeTable *TrueTypeTableNew_name(int n, NameRecord *nr)
 {
     TrueTypeTable* table = (TrueTypeTable*)smalloc(sizeof(TrueTypeTable));
     list l = listNewEmpty();
-
+    
     assert(l != 0);
 
     listSetElementDtor(l, (list_destructor)DisposeNameRecord);
@@ -1206,7 +1206,7 @@ int GetRawData(TrueTypeTable *_this, sal_uInt8 **ptr, sal_uInt32 *len, sal_uInt3
     assert(!"Unknwon TrueType table.\n");
     return TTCR_UNKNOWN;
 }
-
+    
 void cmapAdd(TrueTypeTable *table, sal_uInt32 id, sal_uInt32 c, sal_uInt32 g)
 {
     sal_uInt32 i, found;
@@ -1229,7 +1229,7 @@ void cmapAdd(TrueTypeTable *table, sal_uInt32 id, sal_uInt32 c, sal_uInt32 g)
 
     if (!found) {
         if (t->n == t->m) {
-            CmapSubTable* tmp = (CmapSubTable*)scalloc(t->m + CMAP_SUBTABLE_INCR, sizeof(CmapSubTable));
+            CmapSubTable* tmp = (CmapSubTable*)scalloc(t->m + CMAP_SUBTABLE_INCR, sizeof(CmapSubTable)); 
             memset(tmp, 0, t->m + CMAP_SUBTABLE_INCR * sizeof(CmapSubTable));
             memcpy(tmp, s, sizeof(CmapSubTable) * t->m);
             t->m += CMAP_SUBTABLE_INCR;
@@ -1335,7 +1335,7 @@ sal_uInt32 glyfCount(const TrueTypeTable *table)
     assert(table->tag == T_glyf);
     return listCount((list) table->data);
 }
-
+    
 
 void nameAdd(TrueTypeTable *table, NameRecord *nr)
 {
@@ -1425,10 +1425,10 @@ static void ProcessTables(TrueTypeCreator *tt)
 
             z = GetInt16(gd->ptr, 4, 1);
             if (z < yMin) yMin = z;
-
+        
             z = GetInt16(gd->ptr, 6, 1);
             if (z > xMax) xMax = z;
-
+        
             z = GetInt16(gd->ptr, 8, 1);
             if (z > yMax) yMax = z;
         }
@@ -1440,14 +1440,14 @@ static void ProcessTables(TrueTypeCreator *tt)
             if (gd->npoints > maxCompositePoints) maxCompositePoints = gd->npoints;
             if (gd->ncontours > maxCompositeContours) maxCompositeContours = gd->ncontours;
         }
-
+        
     } while (listNext(glyphlist));
 
     indexToLocFormat = (glyfLen / 2 > 0xFFFF) ? 1 : 0;
     locaLen = indexToLocFormat ?  (nGlyphs + 1) << 2 : (nGlyphs + 1) << 1;
 
     sal_uInt8* glyfPtr = ttmalloc(glyfLen);
-    sal_uInt8* locaPtr = ttmalloc(locaLen);
+    sal_uInt8* locaPtr = ttmalloc(locaLen); 
     TTSimpleGlyphMetrics* met = (TTSimpleGlyphMetrics*)scalloc(nGlyphs, sizeof(TTSimpleGlyphMetrics));
     i = 0;
 
@@ -1456,7 +1456,7 @@ static void ProcessTables(TrueTypeCreator *tt)
     p2 = locaPtr;
     do {
         GlyphData *gd = (GlyphData *) listCurrent(glyphlist);
-
+        
         if (gd->compflag) {                       /* re-number all components */
             sal_uInt16 flags, index;
             sal_uInt8 *ptr = gd->ptr + 10;
@@ -1525,7 +1525,7 @@ static void ProcessTables(TrueTypeCreator *tt)
     ((tdata_loca *) loca->data)->nbytes = locaLen;
 
     AddTable(tt, loca);
-
+    
     head = FindTable(tt, T_head);
     sal_uInt8* const pHeadData = (sal_uInt8*)head->data;
     PutInt16(xMin, pHeadData, 36, 1);
@@ -1589,7 +1589,7 @@ static void ProcessTables(TrueTypeCreator *tt)
 }
 
 } // namespace vcl
-
+               
 extern "C"
 {
     /**
@@ -1609,11 +1609,11 @@ extern "C"
     {
         /* XXX do a binary search */
         unsigned int i;
-
+    
         assert(_this != 0);
-
+    
         if (_this->rawdata) free(_this->rawdata);
-
+    
         for(i=0; i < sizeof(vcl::vtable1)/sizeof(*vcl::vtable1); i++) {
             if (_this->tag == vcl::vtable1[i].tag) {
                 vcl::vtable1[i].f(_this);
@@ -1623,7 +1623,7 @@ extern "C"
         assert(!"Unknown TrueType table.\n");
     }
 }
-
+ 
 
 #ifdef TEST_TTCR
 int main(void)
diff --git a/vcl/source/fontsubset/ttcr.hxx b/vcl/source/fontsubset/ttcr.hxx
index 69583ecdbdda..0f7a9573dbe1 100644
--- a/vcl/source/fontsubset/ttcr.hxx
+++ b/vcl/source/fontsubset/ttcr.hxx
@@ -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
@@ -55,7 +55,7 @@ namespace vcl
     };
 
 /** Error codes for most functions */
-    enum TTCRErrCodes {
+    enum TTCRErrCodes {                     
         TTCR_OK = 0,                        /**< no error                                               */
         TTCR_ZEROGLYPHS = 1,                /**< At least one glyph should be defined                   */
         TTCR_UNKNOWN = 2,                   /**< Unknown TrueType table                                 */
@@ -212,7 +212,7 @@ namespace vcl
  *  Table manipulation functions
  *
  *------------------------------------------------------------------------------*/
-
+ 
 
 /**
  * Add a character/glyph pair to a cmap table
@@ -242,7 +242,7 @@ namespace vcl
  */
     void nameAdd(TrueTypeTable *, NameRecord *nr);
 
-} // namespace
+} // namespace                  
 
 
 extern "C"
diff --git a/vcl/source/fontsubset/xlat.cxx b/vcl/source/fontsubset/xlat.cxx
index 108c69cee8c7..85782fddb18d 100644
--- a/vcl/source/fontsubset/xlat.cxx
+++ b/vcl/source/fontsubset/xlat.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
@@ -37,12 +37,12 @@ namespace { // anonymous namespace
 class ConverterCache
 {
 public:
-    explicit    ConverterCache( void );
+    explicit	ConverterCache( void );
                 ~ConverterCache( void );
-    sal_uInt16  convertOne( int nSelect, sal_Unicode );
-    void        convertStr( int nSelect, const sal_Unicode* pSrc, sal_uInt16* pDst, int nCount );
+    sal_uInt16	convertOne( int nSelect, sal_Unicode );
+    void		convertStr( int nSelect, const sal_Unicode* pSrc, sal_uInt16* pDst, int nCount );
 protected:
-    void        ensureConverter( int nSelect );
+    void		ensureConverter( int nSelect );
 private:
     rtl_UnicodeToTextConverter maConverterCache[ MAX_CVT_SELECT+1 ];
     rtl_UnicodeToTextContext maContexts[ MAX_CVT_SELECT+1 ];
@@ -191,22 +191,22 @@ sal_uInt16 TranslateChar16(sal_uInt16 src)
 {
     return aCC.convertOne( 6, src);
 }
-
+    
 void TranslateString12(sal_uInt16 *src, sal_uInt16 *dst, sal_uInt32 n)
 {
     aCC.convertStr( 2, src, dst, n);
 }
-
+            
 void TranslateString13(sal_uInt16 *src, sal_uInt16 *dst, sal_uInt32 n)
 {
     aCC.convertStr( 3, src, dst, n);
 }
-
+        
 void TranslateString14(sal_uInt16 *src, sal_uInt16 *dst, sal_uInt32 n)
 {
     aCC.convertStr( 4, src, dst, n);
 }
-
+        
 void TranslateString15(sal_uInt16 *src, sal_uInt16 *dst, sal_uInt32 n)
 {
     aCC.convertStr( 5, src, dst, n);
@@ -216,6 +216,6 @@ void TranslateString16(sal_uInt16 *src, sal_uInt16 *dst, sal_uInt32 n)
 {
     aCC.convertStr( 6, src, dst, n);
 }
-
+        
 } // namespace vcl
 
diff --git a/vcl/source/fontsubset/xlat.hxx b/vcl/source/fontsubset/xlat.hxx
index 5960336e13e3..36a316a1e26f 100644
--- a/vcl/source/fontsubset/xlat.hxx
+++ b/vcl/source/fontsubset/xlat.hxx
@@ -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
diff --git a/vcl/source/gdi/alpha.cxx b/vcl/source/gdi/alpha.cxx
index 9d93a540750a..31553882cf0d 100644
--- a/vcl/source/gdi/alpha.cxx
+++ b/vcl/source/gdi/alpha.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
@@ -126,15 +126,15 @@ BOOL AlphaMask::Expand( ULONG nDX, ULONG nDY, BYTE* pInitTransparency )
 
 // -----------------------------------------------------------------------------
 
-BOOL AlphaMask::CopyPixel( const Rectangle& rRectDst, const Rectangle& rRectSrc,
+BOOL AlphaMask::CopyPixel( const Rectangle& rRectDst, const Rectangle& rRectSrc, 
                            const AlphaMask* pAlphaSrc )
 {
     // Note: this code is copied from Bitmap::CopyPixel but avoids any palette lookups
     // this optimization is possible because the palettes of AlphaMasks are always identical (8bit GreyPalette, see ctor)
 
-    const Size  aSizePix( GetSizePixel() );
-    Rectangle   aRectDst( rRectDst );
-    BOOL        bRet = FALSE;
+    const Size	aSizePix( GetSizePixel() );
+    Rectangle	aRectDst( rRectDst );
+    BOOL		bRet = FALSE;
 
     aRectDst.Intersection( Rectangle( Point(), aSizePix ) );
 
@@ -142,9 +142,9 @@ BOOL AlphaMask::CopyPixel( const Rectangle& rRectDst, const Rectangle& rRectSrc,
     {
         if( pAlphaSrc && ( *pAlphaSrc != *this ) )
         {
-            Bitmap*         pSrc = (Bitmap*) pAlphaSrc;
-            const Size      aCopySizePix( pSrc->GetSizePixel() );
-            Rectangle       aRectSrc( rRectSrc );
+            Bitmap* 		pSrc = (Bitmap*) pAlphaSrc;
+            const Size		aCopySizePix( pSrc->GetSizePixel() );
+            Rectangle		aRectSrc( rRectSrc );
 
             aRectSrc.Intersection( Rectangle( Point(), aCopySizePix ) );
 
@@ -158,11 +158,11 @@ BOOL AlphaMask::CopyPixel( const Rectangle& rRectDst, const Rectangle& rRectSrc,
 
                     if( pWriteAcc )
                     {
-                        const long  nWidth = Min( aRectSrc.GetWidth(), aRectDst.GetWidth() );
-                        const long  nHeight = Min( aRectSrc.GetHeight(), aRectDst.GetHeight() );
-                        const long  nSrcEndX = aRectSrc.Left() + nWidth;
-                        const long  nSrcEndY = aRectSrc.Top() + nHeight;
-                        long        nDstY = aRectDst.Top();
+                        const long	nWidth = Min( aRectSrc.GetWidth(), aRectDst.GetWidth() );
+                        const long	nHeight = Min( aRectSrc.GetHeight(), aRectDst.GetHeight() );
+                        const long	nSrcEndX = aRectSrc.Left() + nWidth;
+                        const long	nSrcEndY = aRectSrc.Top() + nHeight;
+                        long		nDstY = aRectDst.Top();
 
                         for( long nSrcY = aRectSrc.Top(); nSrcY < nSrcEndY; nSrcY++, nDstY++ )
                             for( long nSrcX = aRectSrc.Left(), nDstX = aRectDst.Left(); nSrcX < nSrcEndX; nSrcX++, nDstX++ )
@@ -184,20 +184,20 @@ BOOL AlphaMask::CopyPixel( const Rectangle& rRectDst, const Rectangle& rRectSrc,
 
             if( !aRectSrc.IsEmpty() && ( aRectSrc != aRectDst ) )
             {
-                BitmapWriteAccess*  pWriteAcc = AcquireWriteAccess();
+                BitmapWriteAccess*	pWriteAcc = AcquireWriteAccess();
 
                 if( pWriteAcc )
                 {
-                    const long  nWidth = Min( aRectSrc.GetWidth(), aRectDst.GetWidth() );
-                    const long  nHeight = Min( aRectSrc.GetHeight(), aRectDst.GetHeight() );
-                    const long  nSrcX = aRectSrc.Left();
-                    const long  nSrcY = aRectSrc.Top();
-                    const long  nSrcEndX1 = nSrcX + nWidth - 1L;
-                    const long  nSrcEndY1 = nSrcY + nHeight - 1L;
-                    const long  nDstX = aRectDst.Left();
-                    const long  nDstY = aRectDst.Top();
-                    const long  nDstEndX1 = nDstX + nWidth - 1L;
-                    const long  nDstEndY1 = nDstY + nHeight - 1L;
+                    const long	nWidth = Min( aRectSrc.GetWidth(), aRectDst.GetWidth() );
+                    const long	nHeight = Min( aRectSrc.GetHeight(), aRectDst.GetHeight() );
+                    const long	nSrcX = aRectSrc.Left();
+                    const long	nSrcY = aRectSrc.Top();
+                    const long	nSrcEndX1 = nSrcX + nWidth - 1L;
+                    const long	nSrcEndY1 = nSrcY + nHeight - 1L;
+                    const long	nDstX = aRectDst.Left();
+                    const long	nDstY = aRectDst.Top();
+                    const long	nDstEndX1 = nDstX + nWidth - 1L;
+                    const long	nDstEndY1 = nDstY + nHeight - 1L;
 
                     if( ( nDstX <= nSrcX ) && ( nDstY <= nSrcY ) )
                     {
@@ -246,14 +246,14 @@ BOOL AlphaMask::Erase( BYTE cTransparency )
 
 BOOL AlphaMask::Invert()
 {
-    BitmapWriteAccess*  pAcc = AcquireWriteAccess();
-    BOOL                bRet = FALSE;
+    BitmapWriteAccess*	pAcc = AcquireWriteAccess();
+    BOOL				bRet = FALSE;
 
     if( pAcc && pAcc->GetBitCount() == 8 )
     {
-        BitmapColor aCol( 0 );
-        const long  nWidth = pAcc->Width(), nHeight = pAcc->Height();
-        BYTE*       pMap = new BYTE[ 256 ];
+        BitmapColor	aCol( 0 );
+        const long	nWidth = pAcc->Width(),	nHeight = pAcc->Height();
+        BYTE*		pMap = new BYTE[ 256 ];
 
         for( long i = 0; i < 256; i++ )
             pMap[ i ] = ~(BYTE) i;
@@ -319,16 +319,16 @@ BOOL AlphaMask::Rotate( long nAngle10, BYTE cFillTransparency )
 
 BOOL AlphaMask::Replace( const Bitmap& rMask, BYTE cReplaceTransparency )
 {
-    BitmapReadAccess*   pMaskAcc = ( (Bitmap&) rMask ).AcquireReadAccess();
-    BitmapWriteAccess*  pAcc = AcquireWriteAccess();
-    BOOL                bRet = FALSE;
+    BitmapReadAccess*	pMaskAcc = ( (Bitmap&) rMask ).AcquireReadAccess();
+    BitmapWriteAccess*	pAcc = AcquireWriteAccess();
+    BOOL				bRet = FALSE;
 
     if( pMaskAcc && pAcc )
     {
-        const BitmapColor   aReplace( cReplaceTransparency );
-        const long          nWidth = Min( pMaskAcc->Width(), pAcc->Width() );
-        const long          nHeight = Min( pMaskAcc->Height(), pAcc->Height() );
-        const BitmapColor   aMaskWhite( pMaskAcc->GetBestMatchingColor( Color( COL_WHITE ) ) );
+        const BitmapColor	aReplace( cReplaceTransparency );
+        const long			nWidth = Min( pMaskAcc->Width(), pAcc->Width() );
+        const long			nHeight = Min( pMaskAcc->Height(), pAcc->Height() );
+        const BitmapColor	aMaskWhite( pMaskAcc->GetBestMatchingColor( Color( COL_WHITE ) ) );
 
         for( long nY = 0L; nY < nHeight; nY++ )
             for( long nX = 0L; nX < nWidth; nX++ )
@@ -350,8 +350,8 @@ nTol
 #endif
 )
 {
-    BitmapWriteAccess*  pAcc = AcquireWriteAccess();
-    BOOL                bRet = FALSE;
+    BitmapWriteAccess*	pAcc = AcquireWriteAccess();
+    BOOL				bRet = FALSE;
 
     DBG_ASSERT( !nTol, "AlphaMask::Replace: nTol not used yet" );
 
@@ -374,7 +374,7 @@ nTol
         }
         else
         {
-            BitmapColor aReplace( cReplaceTransparency );
+            BitmapColor	aReplace( cReplaceTransparency );
 
             for( long nY = 0L; nY < nHeight; nY++ )
             {
@@ -400,9 +400,9 @@ nTol
 BOOL AlphaMask::Replace( BYTE* pSearchTransparencies, BYTE* pReplaceTransparencies,
                          ULONG nColorCount, ULONG* pTols )
 {
-    Color*  pSearchColors = new Color[ nColorCount ];
-    Color*  pReplaceColors = new Color[ nColorCount ];
-    BOOL    bRet;
+    Color*	pSearchColors = new Color[ nColorCount ];
+    Color*	pReplaceColors = new Color[ nColorCount ];
+    BOOL	bRet;
 
     for( ULONG i = 0; i < nColorCount; i++ )
     {
diff --git a/vcl/source/gdi/animate.cxx b/vcl/source/gdi/animate.cxx
index b0fb3b3de513..c011ad0c26f1 100644
--- a/vcl/source/gdi/animate.cxx
+++ b/vcl/source/gdi/animate.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
@@ -57,8 +57,8 @@ ULONG Animation::mnAnimCount = 0UL;
 
 ULONG AnimationBitmap::GetChecksum() const
 {
-    sal_uInt32  nCrc = aBmpEx.GetChecksum();
-    SVBT32      aBT32;
+    sal_uInt32	nCrc = aBmpEx.GetChecksum();
+    SVBT32		aBT32;
 
     UInt32ToSVBT32( aPosPix.X(), aBT32 );
     nCrc = rtl_crc32( nCrc, aBT32, 4 );
@@ -89,13 +89,13 @@ ULONG AnimationBitmap::GetChecksum() const
 // -------------
 
 Animation::Animation() :
-    mnLoopCount         ( 0 ),
-    mnLoops             ( 0 ),
-    mnPos               ( 0 ),
-    meCycleMode         ( CYCLE_NORMAL ),
-    mbIsInAnimation     ( FALSE ),
-    mbLoopTerminated    ( FALSE ),
-    mbIsWaiting         ( FALSE )
+    mnLoopCount 		( 0 ),
+    mnLoops 			( 0 ),
+    mnPos				( 0 ),
+    meCycleMode 		( CYCLE_NORMAL ),
+    mbIsInAnimation 	( FALSE ),
+    mbLoopTerminated	( FALSE ),
+    mbIsWaiting 		( FALSE )
 {
     DBG_CTOR( Animation, NULL );
     maTimer.SetTimeoutHdl( LINK( this, Animation, ImplTimeoutHdl ) );
@@ -105,14 +105,14 @@ Animation::Animation() :
 // -----------------------------------------------------------------------
 
 Animation::Animation( const Animation& rAnimation ) :
-    maBitmapEx          ( rAnimation.maBitmapEx ),
-    maGlobalSize        ( rAnimation.maGlobalSize ),
-    mnLoopCount         ( rAnimation.mnLoopCount ),
-    mnPos               ( rAnimation.mnPos ),
-    meCycleMode         ( rAnimation.meCycleMode ),
-    mbIsInAnimation     ( FALSE ),
-    mbLoopTerminated    ( rAnimation.mbLoopTerminated ),
-    mbIsWaiting         ( rAnimation.mbIsWaiting )
+    maBitmapEx			( rAnimation.maBitmapEx ),
+    maGlobalSize		( rAnimation.maGlobalSize ),
+    mnLoopCount 		( rAnimation.mnLoopCount ),
+    mnPos				( rAnimation.mnPos ),
+    meCycleMode 		( rAnimation.meCycleMode ),
+    mbIsInAnimation 	( FALSE ),
+    mbLoopTerminated	( rAnimation.mbLoopTerminated ),
+    mbIsWaiting 		( rAnimation.mbIsWaiting )
 {
     DBG_CTOR( Animation, NULL );
 
@@ -168,7 +168,7 @@ Animation& Animation::operator=( const Animation& rAnimation )
 BOOL Animation::operator==( const Animation& rAnimation ) const
 {
     const ULONG nCount = maList.Count();
-    BOOL        bRet = FALSE;
+    BOOL		bRet = FALSE;
 
     if( rAnimation.maList.Count() == nCount &&
         rAnimation.maBitmapEx == maBitmapEx &&
@@ -196,7 +196,7 @@ BOOL Animation::operator==( const Animation& rAnimation ) const
 BOOL Animation::IsEqual( const Animation& rAnimation ) const
 {
     const ULONG nCount = maList.Count();
-    BOOL        bRet = FALSE;
+    BOOL		bRet = FALSE;
 
     if( rAnimation.maList.Count() == nCount &&
         rAnimation.maBitmapEx.IsEqual( maBitmapEx ) &&
@@ -247,9 +247,9 @@ void Animation::Clear()
 
 BOOL Animation::IsTransparent() const
 {
-    Point       aPoint;
-    Rectangle   aRect( aPoint, maGlobalSize );
-    BOOL        bRet = FALSE;
+    Point		aPoint;
+    Rectangle	aRect( aPoint, maGlobalSize );
+    BOOL		bRet = FALSE;
 
     // Falls irgendein 'kleines' Bildchen durch den Hintergrund
     // ersetzt werden soll, muessen wir 'transparent' sein, um
@@ -291,8 +291,8 @@ ULONG Animation::GetSizeBytes() const
 
 ULONG Animation::GetChecksum() const
 {
-    SVBT32      aBT32;
-    sal_uInt32  nCrc = GetBitmapEx().GetChecksum();
+    SVBT32		aBT32;
+    sal_uInt32	nCrc = GetBitmapEx().GetChecksum();
 
     UInt32ToSVBT32( maList.Count(), aBT32 );
     nCrc = rtl_crc32( nCrc, aBT32, 4 );
@@ -335,8 +335,8 @@ BOOL Animation::Start( OutputDevice* pOut, const Point& rDestPt, const Size& rDe
         if( ( pOut->GetOutDevType() == OUTDEV_WINDOW ) && !mbLoopTerminated &&
             ( ANIMATION_TIMEOUT_ON_CLICK != ( (AnimationBitmap*) maList.GetObject( mnPos ) )->nWait ) )
         {
-            ImplAnimView*   pView;
-            ImplAnimView*   pMatch = NULL;
+            ImplAnimView*	pView;
+            ImplAnimView*	pMatch = NULL;
 
             for( pView = (ImplAnimView*) mpViewList->First(); pView; pView = (ImplAnimView*) mpViewList->Next() )
             {
@@ -454,8 +454,8 @@ IMPL_LINK( Animation, ImplTimeoutHdl, Timer*, EMPTYARG )
 
     if( nAnimCount )
     {
-        ImplAnimView*   pView;
-        BOOL            bGlobalPause = TRUE;
+        ImplAnimView*	pView;
+        BOOL			bGlobalPause = TRUE;
 
         if( maNotifyLink.IsSet() )
         {
@@ -509,7 +509,7 @@ IMPL_LINK( Animation, ImplTimeoutHdl, Timer*, EMPTYARG )
             }
         }
         else
-            bGlobalPause = FALSE;
+            bGlobalPause = FALSE; 
 
         if( !mpViewList->Count() )
             Stop();
@@ -578,8 +578,8 @@ BOOL Animation::Insert( const AnimationBitmap& rStepBmp )
 
     if( !IsInAnimation() )
     {
-        Point       aPoint;
-        Rectangle   aGlobalRect( aPoint, maGlobalSize );
+        Point		aPoint;
+        Rectangle	aGlobalRect( aPoint, maGlobalSize );
 
         maGlobalSize = aGlobalRect.Union( Rectangle( rStepBmp.aPosPix, rStepBmp.aSizePix ) ).GetSize();
         maList.Insert( new AnimationBitmap( rStepBmp ), LIST_APPEND );
@@ -712,7 +712,7 @@ BOOL Animation::Mirror( ULONG nMirrorFlags )
 {
     DBG_ASSERT( !IsInAnimation(), "Animation modified while it is animated" );
 
-    BOOL    bRet;
+    BOOL	bRet;
 
     if( !IsInAnimation() && maList.Count() )
     {
@@ -828,8 +828,8 @@ SvStream& operator<<( SvStream& rOStm, const Animation& rAnimation )
 
     if( nCount )
     {
-        const ByteString    aDummyStr;
-        const UINT32        nDummy32 = 0UL;
+        const ByteString	aDummyStr;
+        const UINT32		nDummy32 = 0UL;
 
         // Falls keine BitmapEx gesetzt wurde, schreiben wir
         // einfach die erste Bitmap der Animation
@@ -843,8 +843,8 @@ SvStream& operator<<( SvStream& rOStm, const Animation& rAnimation )
 
         for( USHORT i = 0; i < nCount; i++ )
         {
-            const AnimationBitmap&  rAnimBmp = rAnimation.Get( i );
-            const UINT16            nRest = nCount - i - 1;
+            const AnimationBitmap&	rAnimBmp = rAnimation.Get( i );
+            const UINT16			nRest = nCount - i - 1;
 
             // AnimationBitmap schreiben
             rOStm << rAnimBmp.aBmpEx;
@@ -855,11 +855,11 @@ SvStream& operator<<( SvStream& rOStm, const Animation& rAnimation )
             rOStm << (UINT16) rAnimBmp.eDisposal;
             rOStm << (BYTE) rAnimBmp.bUserInput;
             rOStm << (UINT32) rAnimation.mnLoopCount;
-            rOStm << nDummy32;  // unbenutzt
-            rOStm << nDummy32;  // unbenutzt
-            rOStm << nDummy32;  // unbenutzt
+            rOStm << nDummy32;	// unbenutzt
+            rOStm << nDummy32;	// unbenutzt
+            rOStm << nDummy32;	// unbenutzt
             rOStm << aDummyStr; // unbenutzt
-            rOStm << nRest;     // Anzahl der Strukturen, die noch _folgen_
+            rOStm << nRest; 	// Anzahl der Strukturen, die noch _folgen_
         }
     }
 
@@ -870,11 +870,11 @@ SvStream& operator<<( SvStream& rOStm, const Animation& rAnimation )
 
 SvStream& operator>>( SvStream& rIStm, Animation& rAnimation )
 {
-    Bitmap  aBmp;
-    ULONG   nStmPos = rIStm.Tell();
-    UINT32  nAnimMagic1, nAnimMagic2;
-    USHORT  nOldFormat = rIStm.GetNumberFormatInt();
-    BOOL    bReadAnimations = FALSE;
+    Bitmap	aBmp;
+    ULONG	nStmPos = rIStm.Tell();
+    UINT32	nAnimMagic1, nAnimMagic2;
+    USHORT	nOldFormat = rIStm.GetNumberFormatInt();
+    BOOL	bReadAnimations = FALSE;
 
     rIStm.SetNumberFormatInt( NUMBERFORMAT_INT_LITTLEENDIAN );
     nStmPos = rIStm.Tell();
@@ -904,11 +904,11 @@ SvStream& operator>>( SvStream& rIStm, Animation& rAnimation )
     if( bReadAnimations )
     {
         AnimationBitmap aAnimBmp;
-        BitmapEx        aBmpEx;
-        ByteString      aDummyStr;
-        UINT32          nTmp32;
-        UINT16          nTmp16;
-        BYTE            cTmp;
+        BitmapEx		aBmpEx;
+        ByteString		aDummyStr;
+        UINT32			nTmp32;
+        UINT16			nTmp16;
+        BYTE			cTmp;
 
         do
         {
@@ -920,11 +920,11 @@ SvStream& operator>>( SvStream& rIStm, Animation& rAnimation )
             rIStm >> nTmp16; aAnimBmp.eDisposal = ( Disposal) nTmp16;
             rIStm >> cTmp; aAnimBmp.bUserInput = (BOOL) cTmp;
             rIStm >> nTmp32; rAnimation.mnLoopCount = (USHORT) nTmp32;
-            rIStm >> nTmp32;    // unbenutzt
-            rIStm >> nTmp32;    // unbenutzt
-            rIStm >> nTmp32;    // unbenutzt
+            rIStm >> nTmp32;	// unbenutzt
+            rIStm >> nTmp32;	// unbenutzt
+            rIStm >> nTmp32;	// unbenutzt
             rIStm >> aDummyStr; // unbenutzt
-            rIStm >> nTmp16;    // Rest zu lesen
+            rIStm >> nTmp16;	// Rest zu lesen
 
             rAnimation.Insert( aAnimBmp );
         }
diff --git a/vcl/source/gdi/base14.cxx b/vcl/source/gdi/base14.cxx
index 83820bc654bf..cecd90c287e5 100644
--- a/vcl/source/gdi/base14.cxx
+++ b/vcl/source/gdi/base14.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
@@ -39,7 +39,7 @@ OString PDFWriterImpl::BuiltinFont::getNameObject() const
     OStringBuffer aBuf( 16 );
     aBuf.append( '/' );
     const char* pRun = m_pPSName;
-
+    
     unsigned int nCopied = 0;
     while( *pRun )
     {
diff --git a/vcl/source/gdi/bitmap.cxx b/vcl/source/gdi/bitmap.cxx
index 074935086b0b..138d162dd299 100644
--- a/vcl/source/gdi/bitmap.cxx
+++ b/vcl/source/gdi/bitmap.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
@@ -58,16 +58,16 @@ Bitmap::Bitmap( const ResId& rResId ) :
     mpImpBmp( NULL )
 {
     const BitmapEx aBmpEx( rResId );
-
+    
     if( !aBmpEx.IsEmpty() )
-        *this = aBmpEx.GetBitmap();
+        *this = aBmpEx.GetBitmap();		
 }
 
 // ------------------------------------------------------------------
 
 Bitmap::Bitmap( const Bitmap& rBitmap ) :
-    maPrefMapMode   ( rBitmap.maPrefMapMode ),
-    maPrefSize      ( rBitmap.maPrefSize )
+    maPrefMapMode	( rBitmap.maPrefMapMode ),
+    maPrefSize		( rBitmap.maPrefSize )
 {
     mpImpBmp = rBitmap.mpImpBmp;
 
@@ -91,8 +91,8 @@ Bitmap::Bitmap( const Size& rSizePixel, USHORT nBitCount, const BitmapPalette* p
 {
     if( rSizePixel.Width() && rSizePixel.Height() )
     {
-        BitmapPalette   aPal;
-        BitmapPalette*  pRealPal = NULL;
+        BitmapPalette	aPal;
+        BitmapPalette*	pRealPal = NULL;
 
         if( nBitCount <= 8 )
         {
@@ -319,8 +319,8 @@ USHORT Bitmap::GetBitCount() const
 
 BOOL Bitmap::HasGreyPalette() const
 {
-    const USHORT    nBitCount = GetBitCount();
-    BOOL            bRet = FALSE;
+    const USHORT	nBitCount = GetBitCount();
+    BOOL			bRet = FALSE;
 
     if( 1 == nBitCount )
     {
@@ -348,7 +348,7 @@ BOOL Bitmap::HasGreyPalette() const
         {
             if( pRAcc->HasPalette() && ( (BitmapPalette&) pRAcc->GetPalette() == GetGreyPalette( 1 << nBitCount ) ) )
                 bRet = TRUE;
-
+            
              ( (Bitmap*) this )->ReleaseAccess( pRAcc );
         }
     }
@@ -372,8 +372,8 @@ ULONG Bitmap::GetChecksum() const
 
             if( pRAcc && pRAcc->Width() && pRAcc->Height() )
             {
-                sal_uInt32  nCrc = 0;
-                SVBT32      aBT32;
+                sal_uInt32	nCrc = 0;
+                SVBT32		aBT32;
 
                 pRAcc->ImplZeroInitUnusedBits();
 
@@ -394,7 +394,7 @@ ULONG Bitmap::GetChecksum() const
 
                 UInt32ToSVBT32( pRAcc->GetColorMask().GetBlueMask(), aBT32 );
                 nCrc = rtl_crc32( nCrc, aBT32, 4 );
-
+                
                 if( pRAcc->HasPalette() )
                 {
                     nCrc = rtl_crc32( nCrc, pRAcc->GetPalette().ImplGetColorBuffer(),
@@ -402,7 +402,7 @@ ULONG Bitmap::GetChecksum() const
                 }
 
                 nCrc = rtl_crc32( nCrc, pRAcc->GetBuffer(), pRAcc->GetScanlineSize() * pRAcc->Height() );
-
+                
                 mpImpBmp->ImplSetChecksum( nRet = nCrc );
             }
 
@@ -448,10 +448,10 @@ void Bitmap::ImplMakeUnique()
 
 void Bitmap::ImplAssignWithSize( const Bitmap& rBitmap )
 {
-    const Size      aOldSizePix( GetSizePixel() );
-    const Size      aNewSizePix( rBitmap.GetSizePixel() );
-    const MapMode   aOldMapMode( maPrefMapMode );
-    Size            aNewPrefSize;
+    const Size		aOldSizePix( GetSizePixel() );
+    const Size		aNewSizePix( rBitmap.GetSizePixel() );
+    const MapMode	aOldMapMode( maPrefMapMode );
+    Size			aNewPrefSize;
 
     if( ( aOldSizePix != aNewSizePix ) && aOldSizePix.Width() && aOldSizePix.Height() )
     {
@@ -528,15 +528,15 @@ BOOL Bitmap::Erase( const Color& rFillColor )
 {
     if( !(*this) )
         return TRUE;
-
-    BitmapWriteAccess*  pWriteAcc = AcquireWriteAccess();
-    BOOL                bRet = FALSE;
+    
+    BitmapWriteAccess*	pWriteAcc = AcquireWriteAccess();
+    BOOL				bRet = FALSE;
 
     if( pWriteAcc )
     {
         const ULONG nFormat = pWriteAcc->GetScanlineFormat();
-        BYTE        cIndex = 0;
-        BOOL        bFast = FALSE;
+        BYTE		cIndex = 0;
+        BOOL		bFast = FALSE;
 
         switch( nFormat )
         {
@@ -608,15 +608,15 @@ BOOL Bitmap::Erase( const Color& rFillColor )
 
 BOOL Bitmap::Invert()
 {
-    BitmapWriteAccess*  pAcc = AcquireWriteAccess();
-    BOOL                bRet = FALSE;
+    BitmapWriteAccess*	pAcc = AcquireWriteAccess();
+    BOOL				bRet = FALSE;
 
     if( pAcc )
     {
         if( pAcc->HasPalette() )
         {
-            BitmapPalette   aBmpPal( pAcc->GetPalette() );
-            const USHORT    nCount = aBmpPal.GetEntryCount();
+            BitmapPalette	aBmpPal( pAcc->GetPalette() );
+            const USHORT	nCount = aBmpPal.GetEntryCount();
 
             for( USHORT i = 0; i < nCount; i++ )
                 aBmpPal[ i ].Invert();
@@ -625,8 +625,8 @@ BOOL Bitmap::Invert()
         }
         else
         {
-            const long  nWidth = pAcc->Width();
-            const long  nHeight = pAcc->Height();
+            const long	nWidth = pAcc->Width();
+            const long	nHeight = pAcc->Height();
 
             for( long nX = 0L; nX < nWidth; nX++ )
                 for( long nY = 0L; nY < nHeight; nY++ )
@@ -650,14 +650,14 @@ BOOL Bitmap::Mirror( ULONG nMirrorFlags )
 
     if( bHorz && !bVert )
     {
-        BitmapWriteAccess*  pAcc = AcquireWriteAccess();
+        BitmapWriteAccess*	pAcc = AcquireWriteAccess();
 
         if( pAcc )
         {
-            const long  nWidth = pAcc->Width();
-            const long  nHeight = pAcc->Height();
-            const long  nWidth1 = nWidth - 1L;
-            const long  nWidth_2 = nWidth >> 1L;
+            const long	nWidth = pAcc->Width();
+            const long	nHeight = pAcc->Height();
+            const long	nWidth1 = nWidth - 1L;
+            const long	nWidth_2 = nWidth >> 1L;
 
             for( long nY = 0L; nY < nHeight; nY++ )
             {
@@ -676,15 +676,15 @@ BOOL Bitmap::Mirror( ULONG nMirrorFlags )
     }
     else if( bVert && !bHorz )
     {
-        BitmapWriteAccess*  pAcc = AcquireWriteAccess();
+        BitmapWriteAccess*	pAcc = AcquireWriteAccess();
 
         if( pAcc )
         {
-            const long  nScanSize = pAcc->GetScanlineSize();
-            BYTE*       pBuffer = new BYTE[ nScanSize ];
-            const long  nHeight = pAcc->Height();
-            const long  nHeight1 = nHeight - 1L;
-            const long  nHeight_2 = nHeight >> 1L;
+            const long	nScanSize = pAcc->GetScanlineSize();
+            BYTE*		pBuffer = new BYTE[ nScanSize ];
+            const long	nHeight = pAcc->Height();
+            const long	nHeight1 = nHeight - 1L;
+            const long	nHeight_2 = nHeight >> 1L;
 
             for( long nY = 0L, nOther = nHeight1; nY < nHeight_2; nY++, nOther-- )
             {
@@ -700,14 +700,14 @@ BOOL Bitmap::Mirror( ULONG nMirrorFlags )
     }
     else if( bHorz && bVert )
     {
-        BitmapWriteAccess*  pAcc = AcquireWriteAccess();
+        BitmapWriteAccess*	pAcc = AcquireWriteAccess();
 
         if( pAcc )
         {
-            const long  nWidth = pAcc->Width();
-            const long  nWidth1 = nWidth - 1L;
-            const long  nHeight = pAcc->Height();
-            long        nHeight_2 = nHeight >> 1;
+            const long	nWidth = pAcc->Width();
+            const long	nWidth1 = nWidth - 1L;
+            const long	nHeight = pAcc->Height();
+            long		nHeight_2 = nHeight >> 1;
 
             for( long nY = 0L, nOtherY = nHeight - 1L; nY < nHeight_2; nY++, nOtherY-- )
             {
@@ -750,33 +750,33 @@ BOOL Bitmap::Rotate( long nAngle10, const Color& rFillColor )
     nAngle10 %= 3600L;
     nAngle10 = ( nAngle10 < 0L ) ? ( 3599L + nAngle10 ) : nAngle10;
 
-    if( !nAngle10    )
+    if( !nAngle10	 )
         bRet = TRUE;
     else if( 1800L == nAngle10 )
         bRet = Mirror( BMP_MIRROR_HORZ | BMP_MIRROR_VERT );
     else
     {
-        BitmapReadAccess*   pReadAcc = AcquireReadAccess();
-        Bitmap              aRotatedBmp;
+        BitmapReadAccess*	pReadAcc = AcquireReadAccess();
+        Bitmap				aRotatedBmp;
 
         if( pReadAcc )
         {
-            const Size  aSizePix( GetSizePixel() );
+            const Size	aSizePix( GetSizePixel() );
 
             if( ( 900L == nAngle10 ) || ( 2700L == nAngle10 ) )
             {
-                const Size          aNewSizePix( aSizePix.Height(), aSizePix.Width() );
-                Bitmap              aNewBmp( aNewSizePix, GetBitCount(), &pReadAcc->GetPalette() );
-                BitmapWriteAccess*  pWriteAcc = aNewBmp.AcquireWriteAccess();
+                const Size			aNewSizePix( aSizePix.Height(), aSizePix.Width() );
+                Bitmap				aNewBmp( aNewSizePix, GetBitCount(), &pReadAcc->GetPalette() );
+                BitmapWriteAccess*	pWriteAcc = aNewBmp.AcquireWriteAccess();
 
                 if( pWriteAcc )
                 {
-                    const long  nWidth = aSizePix.Width();
-                    const long  nWidth1 = nWidth - 1L;
-                    const long  nHeight = aSizePix.Height();
-                    const long  nHeight1 = nHeight - 1L;
-                    const long  nNewWidth = aNewSizePix.Width();
-                    const long  nNewHeight = aNewSizePix.Height();
+                    const long	nWidth = aSizePix.Width();
+                    const long	nWidth1 = nWidth - 1L;
+                    const long	nHeight = aSizePix.Height();
+                    const long	nHeight1 = nHeight - 1L;
+                    const long	nNewWidth = aNewSizePix.Width();
+                    const long	nNewHeight = aNewSizePix.Height();
 
                     if( 900L == nAngle10 )
                     {
@@ -798,37 +798,37 @@ BOOL Bitmap::Rotate( long nAngle10, const Color& rFillColor )
             }
             else
             {
-                Point       aTmpPoint;
-                Rectangle   aTmpRectangle( aTmpPoint, aSizePix );
-                Polygon     aPoly( aTmpRectangle );
+                Point		aTmpPoint;
+                Rectangle	aTmpRectangle( aTmpPoint, aSizePix );
+                Polygon 	aPoly( aTmpRectangle );
                 aPoly.Rotate( aTmpPoint, (USHORT) nAngle10 );
 
-                Rectangle           aNewBound( aPoly.GetBoundRect() );
-                const Size          aNewSizePix( aNewBound.GetSize() );
-                Bitmap              aNewBmp( aNewSizePix, GetBitCount(), &pReadAcc->GetPalette() );
-                BitmapWriteAccess*  pWriteAcc = aNewBmp.AcquireWriteAccess();
+                Rectangle			aNewBound( aPoly.GetBoundRect() );
+                const Size			aNewSizePix( aNewBound.GetSize() );
+                Bitmap				aNewBmp( aNewSizePix, GetBitCount(), &pReadAcc->GetPalette() );
+                BitmapWriteAccess*	pWriteAcc = aNewBmp.AcquireWriteAccess();
 
                 if( pWriteAcc )
                 {
-                    const BitmapColor   aFillColor( pWriteAcc->GetBestMatchingColor( rFillColor ) );
-                    const double        fCosAngle = cos( nAngle10 * F_PI1800 );
-                    const double        fSinAngle = sin( nAngle10 * F_PI1800 );
-                    const double        fXMin = aNewBound.Left();
-                    const double        fYMin = aNewBound.Top();
-                    const long          nWidth = aSizePix.Width();
-                    const long          nHeight = aSizePix.Height();
-                    const long          nNewWidth = aNewSizePix.Width();
-                    const long          nNewHeight = aNewSizePix.Height();
-                    long                nX;
-                    long                nY;
-                    long                nRotX;
-                    long                nRotY;
-                    long                nSinY;
-                    long                nCosY;
-                    long*               pCosX = new long[ nNewWidth ];
-                    long*               pSinX = new long[ nNewWidth ];
-                    long*               pCosY = new long[ nNewHeight ];
-                    long*               pSinY = new long[ nNewHeight ];
+                    const BitmapColor	aFillColor( pWriteAcc->GetBestMatchingColor( rFillColor ) );
+                    const double		fCosAngle = cos( nAngle10 * F_PI1800 );
+                    const double		fSinAngle = sin( nAngle10 * F_PI1800 );
+                    const double		fXMin = aNewBound.Left();
+                    const double		fYMin = aNewBound.Top();
+                    const long			nWidth = aSizePix.Width();
+                    const long			nHeight = aSizePix.Height();
+                    const long			nNewWidth = aNewSizePix.Width();
+                    const long			nNewHeight = aNewSizePix.Height();
+                    long				nX;
+                    long				nY;
+                    long				nRotX;
+                    long				nRotY;
+                    long				nSinY;
+                    long				nCosY;
+                    long*				pCosX = new long[ nNewWidth ];
+                    long*				pSinX = new long[ nNewWidth ];
+                    long*				pCosY = new long[ nNewHeight ];
+                    long*				pSinY = new long[ nNewHeight ];
 
                     for ( nX = 0; nX < nNewWidth; nX++ )
                     {
@@ -888,9 +888,9 @@ BOOL Bitmap::Rotate( long nAngle10, const Color& rFillColor )
 
 BOOL Bitmap::Crop( const Rectangle& rRectPixel )
 {
-    const Size          aSizePix( GetSizePixel() );
-    Rectangle           aRect( rRectPixel );
-    BOOL                bRet = FALSE;
+    const Size			aSizePix( GetSizePixel() );
+    Rectangle			aRect( rRectPixel );
+    BOOL				bRet = FALSE;
 
     aRect.Intersection( Rectangle( Point(), aSizePix ) );
 
@@ -900,10 +900,10 @@ BOOL Bitmap::Crop( const Rectangle& rRectPixel )
 
         if( pReadAcc )
         {
-            Point               aTmpPoint;
-            const Rectangle     aNewRect( aTmpPoint, aRect.GetSize() );
-            Bitmap              aNewBmp( aNewRect.GetSize(), GetBitCount(), &pReadAcc->GetPalette() );
-            BitmapWriteAccess*  pWriteAcc = aNewBmp.AcquireWriteAccess();
+            Point				aTmpPoint;
+            const Rectangle 	aNewRect( aTmpPoint, aRect.GetSize() );
+            Bitmap				aNewBmp( aNewRect.GetSize(), GetBitCount(), &pReadAcc->GetPalette() );
+            BitmapWriteAccess*	pWriteAcc = aNewBmp.AcquireWriteAccess();
 
             if( pWriteAcc )
             {
@@ -935,9 +935,9 @@ BOOL Bitmap::Crop( const Rectangle& rRectPixel )
 BOOL Bitmap::CopyPixel( const Rectangle& rRectDst,
                         const Rectangle& rRectSrc, const Bitmap* pBmpSrc )
 {
-    const Size  aSizePix( GetSizePixel() );
-    Rectangle   aRectDst( rRectDst );
-    BOOL        bRet = FALSE;
+    const Size	aSizePix( GetSizePixel() );
+    Rectangle	aRectDst( rRectDst );
+    BOOL		bRet = FALSE;
 
     aRectDst.Intersection( Rectangle( Point(), aSizePix ) );
 
@@ -945,11 +945,11 @@ BOOL Bitmap::CopyPixel( const Rectangle& rRectDst,
     {
         if( pBmpSrc && ( *pBmpSrc != *this ) )
         {
-            Bitmap*         pSrc = (Bitmap*) pBmpSrc;
-            const Size      aCopySizePix( pSrc->GetSizePixel() );
-            Rectangle       aRectSrc( rRectSrc );
-            const USHORT    nSrcBitCount = pBmpSrc->GetBitCount();
-            const USHORT    nDstBitCount = GetBitCount();
+            Bitmap* 		pSrc = (Bitmap*) pBmpSrc;
+            const Size		aCopySizePix( pSrc->GetSizePixel() );
+            Rectangle		aRectSrc( rRectSrc );
+            const USHORT	nSrcBitCount = pBmpSrc->GetBitCount();
+            const USHORT	nDstBitCount = GetBitCount();
 
             if( nSrcBitCount > nDstBitCount )
             {
@@ -970,14 +970,14 @@ BOOL Bitmap::CopyPixel( const Rectangle& rRectDst,
 
                 if( nNextIndex )
                 {
-                    BitmapReadAccess*   pSrcAcc = pSrc->AcquireReadAccess();
-                    BitmapWriteAccess*  pDstAcc = AcquireWriteAccess();
+                    BitmapReadAccess*	pSrcAcc = pSrc->AcquireReadAccess();
+                    BitmapWriteAccess*	pDstAcc = AcquireWriteAccess();
 
                     if( pSrcAcc && pDstAcc )
                     {
-                        const long      nSrcCount = pDstAcc->GetPaletteEntryCount();
-                        const long      nDstCount = 1 << nDstBitCount;
-                        BOOL            bFound;
+                        const long		nSrcCount = pDstAcc->GetPaletteEntryCount();
+                        const long		nDstCount = 1 << nDstBitCount;
+                        BOOL			bFound;
 
                         for( long i = 0L; ( i < nSrcCount ) && ( nNextIndex < nSrcCount ); i++ )
                         {
@@ -1019,16 +1019,16 @@ BOOL Bitmap::CopyPixel( const Rectangle& rRectDst,
 
                     if( pWriteAcc )
                     {
-                        const long  nWidth = Min( aRectSrc.GetWidth(), aRectDst.GetWidth() );
-                        const long  nHeight = Min( aRectSrc.GetHeight(), aRectDst.GetHeight() );
-                        const long  nSrcEndX = aRectSrc.Left() + nWidth;
-                        const long  nSrcEndY = aRectSrc.Top() + nHeight;
-                        long        nDstY = aRectDst.Top();
+                        const long	nWidth = Min( aRectSrc.GetWidth(), aRectDst.GetWidth() );
+                        const long	nHeight = Min( aRectSrc.GetHeight(), aRectDst.GetHeight() );
+                        const long	nSrcEndX = aRectSrc.Left() + nWidth;
+                        const long	nSrcEndY = aRectSrc.Top() + nHeight;
+                        long		nDstY = aRectDst.Top();
 
                         if( pReadAcc->HasPalette() && pWriteAcc->HasPalette() )
                         {
-                            const USHORT    nCount = pReadAcc->GetPaletteEntryCount();
-                            BYTE*           pMap = new BYTE[ nCount ];
+                            const USHORT	nCount = pReadAcc->GetPaletteEntryCount();
+                            BYTE*			pMap = new BYTE[ nCount ];
 
                             // Index-Map fuer Farbtabelle
                             // aufbauen, da das Bild ja (relativ) farbgenau
@@ -1069,20 +1069,20 @@ BOOL Bitmap::CopyPixel( const Rectangle& rRectDst,
 
             if( !aRectSrc.IsEmpty() && ( aRectSrc != aRectDst ) )
             {
-                BitmapWriteAccess*  pWriteAcc = AcquireWriteAccess();
+                BitmapWriteAccess*	pWriteAcc = AcquireWriteAccess();
 
                 if( pWriteAcc )
                 {
-                    const long  nWidth = Min( aRectSrc.GetWidth(), aRectDst.GetWidth() );
-                    const long  nHeight = Min( aRectSrc.GetHeight(), aRectDst.GetHeight() );
-                    const long  nSrcX = aRectSrc.Left();
-                    const long  nSrcY = aRectSrc.Top();
-                    const long  nSrcEndX1 = nSrcX + nWidth - 1L;
-                    const long  nSrcEndY1 = nSrcY + nHeight - 1L;
-                    const long  nDstX = aRectDst.Left();
-                    const long  nDstY = aRectDst.Top();
-                    const long  nDstEndX1 = nDstX + nWidth - 1L;
-                    const long  nDstEndY1 = nDstY + nHeight - 1L;
+                    const long	nWidth = Min( aRectSrc.GetWidth(), aRectDst.GetWidth() );
+                    const long	nHeight = Min( aRectSrc.GetHeight(), aRectDst.GetHeight() );
+                    const long	nSrcX = aRectSrc.Left();
+                    const long	nSrcY = aRectSrc.Top();
+                    const long	nSrcEndX1 = nSrcX + nWidth - 1L;
+                    const long	nSrcEndY1 = nSrcY + nHeight - 1L;
+                    const long	nDstX = aRectDst.Left();
+                    const long	nDstY = aRectDst.Top();
+                    const long	nDstEndX1 = nDstX + nWidth - 1L;
+                    const long	nDstEndY1 = nDstY + nHeight - 1L;
 
                     if( ( nDstX <= nSrcX ) && ( nDstY <= nSrcY ) )
                     {
@@ -1127,27 +1127,27 @@ BOOL Bitmap::Expand( ULONG nDX, ULONG nDY, const Color* pInitColor )
 
     if( nDX || nDY )
     {
-        const Size          aSizePixel( GetSizePixel() );
-        const long          nWidth = aSizePixel.Width();
-        const long          nHeight = aSizePixel.Height();
-        const Size          aNewSize( nWidth + nDX, nHeight + nDY );
-        BitmapReadAccess*   pReadAcc = AcquireReadAccess();
+        const Size			aSizePixel( GetSizePixel() );
+        const long			nWidth = aSizePixel.Width();
+        const long			nHeight = aSizePixel.Height();
+        const Size			aNewSize( nWidth + nDX, nHeight + nDY );
+        BitmapReadAccess*	pReadAcc = AcquireReadAccess();
 
         if( pReadAcc )
         {
-            BitmapPalette       aBmpPal( pReadAcc->GetPalette() );
-            Bitmap              aNewBmp( aNewSize, GetBitCount(), &aBmpPal );
-            BitmapWriteAccess*  pWriteAcc = aNewBmp.AcquireWriteAccess();
+            BitmapPalette		aBmpPal( pReadAcc->GetPalette() );
+            Bitmap				aNewBmp( aNewSize, GetBitCount(), &aBmpPal );
+            BitmapWriteAccess*	pWriteAcc = aNewBmp.AcquireWriteAccess();
 
             if( pWriteAcc )
             {
                 BitmapColor aColor;
-                const long  nNewX = nWidth;
-                const long  nNewY = nHeight;
-                const long  nNewWidth = pWriteAcc->Width();
-                const long  nNewHeight = pWriteAcc->Height();
-                long        nX;
-                long        nY;
+                const long	nNewX = nWidth;
+                const long	nNewY = nHeight;
+                const long	nNewWidth = pWriteAcc->Width();
+                const long	nNewHeight = pWriteAcc->Height();
+                long		nX;
+                long		nY;
 
                 if( pInitColor )
                     aColor = pWriteAcc->GetBestMatchingColor( *pInitColor );
@@ -1184,9 +1184,9 @@ BOOL Bitmap::Expand( ULONG nDX, ULONG nDY, const Color* pInitColor )
 
 Bitmap Bitmap::CreateMask( const Color& rTransColor, ULONG nTol ) const
 {
-    Bitmap              aNewBmp( GetSizePixel(), 1 );
-    BitmapWriteAccess*  pWriteAcc = aNewBmp.AcquireWriteAccess();
-    BOOL                bRet = FALSE;
+    Bitmap				aNewBmp( GetSizePixel(), 1 );
+    BitmapWriteAccess*	pWriteAcc = aNewBmp.AcquireWriteAccess();
+    BOOL				bRet = FALSE;
 
     if( pWriteAcc )
     {
@@ -1194,15 +1194,15 @@ Bitmap Bitmap::CreateMask( const Color& rTransColor, ULONG nTol ) const
 
         if( pReadAcc )
         {
-            const long          nWidth = pReadAcc->Width();
-            const long          nHeight = pReadAcc->Height();
-            const BitmapColor   aBlack( pWriteAcc->GetBestMatchingColor( Color( COL_BLACK ) ) );
-            const BitmapColor   aWhite( pWriteAcc->GetBestMatchingColor( Color( COL_WHITE ) ) );
+            const long			nWidth = pReadAcc->Width();
+            const long			nHeight = pReadAcc->Height();
+            const BitmapColor	aBlack( pWriteAcc->GetBestMatchingColor( Color( COL_BLACK ) ) );
+            const BitmapColor	aWhite( pWriteAcc->GetBestMatchingColor( Color( COL_WHITE ) ) );
 
             if( !nTol )
             {
-                const BitmapColor   aTest( pReadAcc->GetBestMatchingColor( rTransColor ) );
-                long                nX, nY, nShift;
+                const BitmapColor	aTest( pReadAcc->GetBestMatchingColor( rTransColor ) );
+                long				nX, nY, nShift;
 
                 if( pReadAcc->GetScanlineFormat() == BMP_FORMAT_4BIT_MSN_PAL ||
                     pReadAcc->GetScanlineFormat() == BMP_FORMAT_4BIT_LSN_PAL )
@@ -1211,7 +1211,7 @@ Bitmap Bitmap::CreateMask( const Color& rTransColor, ULONG nTol ) const
                     const BYTE cTest = aTest.GetIndex();
                     const long nShiftInit = ( ( pReadAcc->GetScanlineFormat() == BMP_FORMAT_4BIT_MSN_PAL ) ? 4 : 0 );
 
-                    if( pWriteAcc->GetScanlineFormat() == BMP_FORMAT_1BIT_MSB_PAL &&
+                    if(	pWriteAcc->GetScanlineFormat() == BMP_FORMAT_1BIT_MSB_PAL &&
                         aWhite.GetIndex() == 1 )
                     {
                         // optimized for 1Bit-MSB destination palette
@@ -1248,7 +1248,7 @@ Bitmap Bitmap::CreateMask( const Color& rTransColor, ULONG nTol ) const
                     // optimized for 8Bit source palette
                     const BYTE cTest = aTest.GetIndex();
 
-                    if( pWriteAcc->GetScanlineFormat() == BMP_FORMAT_1BIT_MSB_PAL &&
+                    if(	pWriteAcc->GetScanlineFormat() == BMP_FORMAT_1BIT_MSB_PAL &&
                         aWhite.GetIndex() == 1 )
                     {
                         // optimized for 1Bit-MSB destination palette
@@ -1298,13 +1298,13 @@ Bitmap Bitmap::CreateMask( const Color& rTransColor, ULONG nTol ) const
             else
             {
                 BitmapColor aCol;
-                long        nR, nG, nB;
-                const long  nMinR = MinMax( (long) rTransColor.GetRed() - nTol, 0, 255 );
-                const long  nMaxR = MinMax( (long) rTransColor.GetRed() + nTol, 0, 255 );
-                const long  nMinG = MinMax( (long) rTransColor.GetGreen() - nTol, 0, 255 );
-                const long  nMaxG = MinMax( (long) rTransColor.GetGreen() + nTol, 0, 255 );
-                const long  nMinB = MinMax( (long) rTransColor.GetBlue() - nTol, 0, 255 );
-                const long  nMaxB = MinMax( (long) rTransColor.GetBlue() + nTol, 0, 255 );
+                long		nR, nG, nB;
+                const long	nMinR = MinMax( (long) rTransColor.GetRed() - nTol, 0, 255 );
+                const long	nMaxR = MinMax( (long) rTransColor.GetRed() + nTol, 0, 255 );
+                const long	nMinG = MinMax( (long) rTransColor.GetGreen() - nTol, 0, 255 );
+                const long	nMaxG = MinMax( (long) rTransColor.GetGreen() + nTol, 0, 255 );
+                const long	nMinB = MinMax( (long) rTransColor.GetBlue() - nTol, 0, 255 );
+                const long	nMaxB = MinMax( (long) rTransColor.GetBlue() + nTol, 0, 255 );
 
                 if( pReadAcc->HasPalette() )
                 {
@@ -1374,21 +1374,21 @@ Bitmap Bitmap::CreateMask( const Color& rTransColor, ULONG nTol ) const
 
 Region Bitmap::CreateRegion( const Color& rColor, const Rectangle& rRect ) const
 {
-    Region              aRegion;
-    Rectangle           aRect( rRect );
-    BitmapReadAccess*   pReadAcc = ( (Bitmap*) this )->AcquireReadAccess();
+    Region				aRegion;
+    Rectangle			aRect( rRect );
+    BitmapReadAccess*	pReadAcc = ( (Bitmap*) this )->AcquireReadAccess();
 
     aRect.Intersection( Rectangle( Point(), GetSizePixel() ) );
     aRect.Justify();
 
     if( pReadAcc )
     {
-        Rectangle           aSubRect;
-        const long          nLeft = aRect.Left();
-        const long          nTop = aRect.Top();
-        const long          nRight = aRect.Right();
-        const long          nBottom = aRect.Bottom();
-        const BitmapColor   aMatch( pReadAcc->GetBestMatchingColor( rColor ) );
+        Rectangle			aSubRect;
+        const long			nLeft = aRect.Left();
+        const long			nTop = aRect.Top();
+        const long			nRight = aRect.Right();
+        const long			nBottom = aRect.Bottom();
+        const BitmapColor	aMatch( pReadAcc->GetBestMatchingColor( rColor ) );
 
         aRegion.ImplBeginAddRect();
 
@@ -1427,16 +1427,16 @@ Region Bitmap::CreateRegion( const Color& rColor, const Rectangle& rRect ) const
 
 BOOL Bitmap::Replace( const Bitmap& rMask, const Color& rReplaceColor )
 {
-    BitmapReadAccess*   pMaskAcc = ( (Bitmap&) rMask ).AcquireReadAccess();
-    BitmapWriteAccess*  pAcc = AcquireWriteAccess();
-    BOOL                bRet = FALSE;
+    BitmapReadAccess*	pMaskAcc = ( (Bitmap&) rMask ).AcquireReadAccess();
+    BitmapWriteAccess*	pAcc = AcquireWriteAccess();
+    BOOL				bRet = FALSE;
 
     if( pMaskAcc && pAcc )
     {
-        const long          nWidth = Min( pMaskAcc->Width(), pAcc->Width() );
-        const long          nHeight = Min( pMaskAcc->Height(), pAcc->Height() );
-        const BitmapColor   aMaskWhite( pMaskAcc->GetBestMatchingColor( Color( COL_WHITE ) ) );
-        BitmapColor         aReplace;
+        const long			nWidth = Min( pMaskAcc->Width(), pAcc->Width() );
+        const long			nHeight = Min( pMaskAcc->Height(), pAcc->Height() );
+        const BitmapColor	aMaskWhite( pMaskAcc->GetBestMatchingColor( Color( COL_WHITE ) ) );
+        BitmapColor 		aReplace;
 
         if( pAcc->HasPalette() )
         {
@@ -1505,17 +1505,17 @@ BOOL Bitmap::Replace( const Bitmap& rMask, const Color& rReplaceColor )
 
 BOOL Bitmap::Replace( const AlphaMask& rAlpha, const Color& rMergeColor )
 {
-    Bitmap              aNewBmp( GetSizePixel(), 24 );
-    BitmapReadAccess*   pAcc = AcquireReadAccess();
-    BitmapReadAccess*   pAlphaAcc = ( (AlphaMask&) rAlpha ).AcquireReadAccess();
-    BitmapWriteAccess*  pNewAcc = aNewBmp.AcquireWriteAccess();
-    BOOL                bRet = FALSE;
+    Bitmap				aNewBmp( GetSizePixel(), 24 );
+    BitmapReadAccess*	pAcc = AcquireReadAccess();
+    BitmapReadAccess*	pAlphaAcc = ( (AlphaMask&) rAlpha ).AcquireReadAccess();
+    BitmapWriteAccess*	pNewAcc = aNewBmp.AcquireWriteAccess();
+    BOOL				bRet = FALSE;
 
     if( pAcc && pAlphaAcc && pNewAcc )
     {
-        BitmapColor aCol;
-        const long  nWidth = Min( pAlphaAcc->Width(), pAcc->Width() );
-        const long  nHeight = Min( pAlphaAcc->Height(), pAcc->Height() );
+        BitmapColor	aCol;
+        const long	nWidth = Min( pAlphaAcc->Width(), pAcc->Width() );
+        const long	nHeight = Min( pAlphaAcc->Height(), pAcc->Height() );
 
         for( long nY = 0L; nY < nHeight; nY++ )
         {
@@ -1535,8 +1535,8 @@ BOOL Bitmap::Replace( const AlphaMask& rAlpha, const Color& rMergeColor )
 
     if( bRet )
     {
-        const MapMode   aMap( maPrefMapMode );
-        const Size      aSize( maPrefSize );
+        const MapMode	aMap( maPrefMapMode );
+        const Size		aSize( maPrefSize );
 
         *this = aNewBmp;
 
@@ -1556,17 +1556,17 @@ BOOL Bitmap::Replace( const Color& rSearchColor, const Color& rReplaceColor, ULO
     if( 1 == GetBitCount() )
         Convert( BMP_CONVERSION_4BIT_COLORS );
 
-    BitmapWriteAccess*  pAcc = AcquireWriteAccess();
-    BOOL                bRet = FALSE;
+    BitmapWriteAccess*	pAcc = AcquireWriteAccess();
+    BOOL				bRet = FALSE;
 
     if( pAcc )
     {
-        const long  nMinR = MinMax( (long) rSearchColor.GetRed() - nTol, 0, 255 );
-        const long  nMaxR = MinMax( (long) rSearchColor.GetRed() + nTol, 0, 255 );
-        const long  nMinG = MinMax( (long) rSearchColor.GetGreen() - nTol, 0, 255 );
-        const long  nMaxG = MinMax( (long) rSearchColor.GetGreen() + nTol, 0, 255 );
-        const long  nMinB = MinMax( (long) rSearchColor.GetBlue() - nTol, 0, 255 );
-        const long  nMaxB = MinMax( (long) rSearchColor.GetBlue() + nTol, 0, 255 );
+        const long	nMinR = MinMax( (long) rSearchColor.GetRed() - nTol, 0, 255 );
+        const long	nMaxR = MinMax( (long) rSearchColor.GetRed() + nTol, 0, 255 );
+        const long	nMinG = MinMax( (long) rSearchColor.GetGreen() - nTol, 0, 255 );
+        const long	nMaxG = MinMax( (long) rSearchColor.GetGreen() + nTol, 0, 255 );
+        const long	nMinB = MinMax( (long) rSearchColor.GetBlue() - nTol, 0, 255 );
+        const long	nMaxB = MinMax( (long) rSearchColor.GetBlue() + nTol, 0, 255 );
 
         if( pAcc->HasPalette() )
         {
@@ -1584,8 +1584,8 @@ BOOL Bitmap::Replace( const Color& rSearchColor, const Color& rReplaceColor, ULO
         }
         else
         {
-            BitmapColor         aCol;
-            const BitmapColor   aReplace( pAcc->GetBestMatchingColor( rReplaceColor ) );
+            BitmapColor 		aCol;
+            const BitmapColor	aReplace( pAcc->GetBestMatchingColor( rReplaceColor ) );
 
             for( long nY = 0L, nHeight = pAcc->Height(); nY < nHeight; nY++ )
             {
@@ -1620,19 +1620,19 @@ BOOL Bitmap::Replace( const Color* pSearchColors, const Color* pReplaceColors,
     if( 1 == GetBitCount() )
         Convert( BMP_CONVERSION_4BIT_COLORS );
 
-    BitmapWriteAccess*  pAcc = AcquireWriteAccess();
-    BOOL                bRet = FALSE;
+    BitmapWriteAccess*	pAcc = AcquireWriteAccess();
+    BOOL				bRet = FALSE;
 
     if( pAcc )
     {
-        long*   pMinR = new long[ nColorCount ];
-        long*   pMaxR = new long[ nColorCount ];
-        long*   pMinG = new long[ nColorCount ];
-        long*   pMaxG = new long[ nColorCount ];
-        long*   pMinB = new long[ nColorCount ];
-        long*   pMaxB = new long[ nColorCount ];
-        long*   pTols;
-        ULONG   i;
+        long*	pMinR = new long[ nColorCount ];
+        long*	pMaxR = new long[ nColorCount ];
+        long*	pMinG = new long[ nColorCount ];
+        long*	pMaxG = new long[ nColorCount ];
+        long*	pMinB = new long[ nColorCount ];
+        long*	pMaxB = new long[ nColorCount ];
+        long*	pTols;
+        ULONG	i;
 
         if( !_pTols )
         {
@@ -1644,8 +1644,8 @@ BOOL Bitmap::Replace( const Color* pSearchColors, const Color* pReplaceColors,
 
         for( i = 0UL; i < nColorCount; i++ )
         {
-            const Color&    rCol = pSearchColors[ i ];
-            const long      nTol = pTols[ i ];
+            const Color&	rCol = pSearchColors[ i ];
+            const long		nTol = pTols[ i ];
 
             pMinR[ i ] = MinMax( (long) rCol.GetRed() - nTol, 0, 255 );
             pMaxR[ i ] = MinMax( (long) rCol.GetRed() + nTol, 0, 255 );
@@ -1675,8 +1675,8 @@ BOOL Bitmap::Replace( const Color* pSearchColors, const Color* pReplaceColors,
         }
         else
         {
-            BitmapColor     aCol;
-            BitmapColor*    pReplaces = new BitmapColor[ nColorCount ];
+            BitmapColor 	aCol;
+            BitmapColor*	pReplaces = new BitmapColor[ nColorCount ];
 
             for( i = 0UL; i < nColorCount; i++ )
                 pReplaces[ i ] = pAcc->GetBestMatchingColor( pReplaceColors[ i ] );
@@ -1743,19 +1743,19 @@ Bitmap Bitmap::CreateDisplayBitmap( OutputDevice* pDisplay )
 Bitmap Bitmap::GetColorTransformedBitmap( BmpColorMode eColorMode ) const
 {
     Bitmap  aRet;
-
+    
     if( BMP_COLOR_HIGHCONTRAST == eColorMode )
     {
         Color*  pSrcColors = NULL;
         Color*  pDstColors = NULL;
         ULONG   nColorCount = 0;
-
+        
         aRet = *this;
 
         Image::GetColorTransformArrays( (ImageColorTransform) eColorMode, pSrcColors, pDstColors, nColorCount );
 
         if( nColorCount && pSrcColors && pDstColors )
-               aRet.Replace( pSrcColors, pDstColors, nColorCount );
+               aRet.Replace( pSrcColors, pDstColors, nColorCount ); 
 
         delete[] pSrcColors;
         delete[] pDstColors;
@@ -1766,7 +1766,7 @@ Bitmap Bitmap::GetColorTransformedBitmap( BmpColorMode eColorMode ) const
         aRet = *this;
         aRet.MakeMono( BMP_COLOR_MONOCHROME_THRESHOLD );
     }
-
+            
     return aRet;
 }
 
@@ -1774,20 +1774,20 @@ Bitmap Bitmap::GetColorTransformedBitmap( BmpColorMode eColorMode ) const
 
 BOOL Bitmap::CombineSimple( const Bitmap& rMask, BmpCombine eCombine )
 {
-    BitmapReadAccess*   pMaskAcc = ( (Bitmap&) rMask ).AcquireReadAccess();
-    BitmapWriteAccess*  pAcc = AcquireWriteAccess();
-    BOOL                bRet = FALSE;
+    BitmapReadAccess*	pMaskAcc = ( (Bitmap&) rMask ).AcquireReadAccess();
+    BitmapWriteAccess*	pAcc = AcquireWriteAccess();
+    BOOL				bRet = FALSE;
 
     if( pMaskAcc && pAcc )
     {
-        const long          nWidth = Min( pMaskAcc->Width(), pAcc->Width() );
-        const long          nHeight = Min( pMaskAcc->Height(), pAcc->Height() );
-        const Color         aColBlack( COL_BLACK );
-        BitmapColor         aPixel;
-        BitmapColor         aMaskPixel;
-        const BitmapColor   aWhite( pAcc->GetBestMatchingColor( Color( COL_WHITE ) ) );
-        const BitmapColor   aBlack( pAcc->GetBestMatchingColor( aColBlack ) );
-        const BitmapColor   aMaskBlack( pMaskAcc->GetBestMatchingColor( aColBlack ) );
+        const long			nWidth = Min( pMaskAcc->Width(), pAcc->Width() );
+        const long			nHeight = Min( pMaskAcc->Height(), pAcc->Height() );
+        const Color 		aColBlack( COL_BLACK );
+        BitmapColor 		aPixel;
+        BitmapColor 		aMaskPixel;
+        const BitmapColor	aWhite( pAcc->GetBestMatchingColor( Color( COL_WHITE ) ) );
+        const BitmapColor	aBlack( pAcc->GetBestMatchingColor( aColBlack ) );
+        const BitmapColor	aMaskBlack( pMaskAcc->GetBestMatchingColor( aColBlack ) );
 
         switch( eCombine )
         {
@@ -1921,19 +1921,19 @@ BOOL Bitmap::Blend( const AlphaMask& rAlpha, const Color& rBackgroundColor )
     if( GetBitCount() <= 8 )
         Convert( BMP_CONVERSION_24BIT );
 
-    BitmapReadAccess*   pAlphaAcc = const_cast<AlphaMask&>(rAlpha).AcquireReadAccess();
-    BitmapWriteAccess*  pAcc = AcquireWriteAccess();
-    BOOL                bRet = FALSE;
+    BitmapReadAccess*	pAlphaAcc = const_cast<AlphaMask&>(rAlpha).AcquireReadAccess();
+    BitmapWriteAccess*	pAcc = AcquireWriteAccess();
+    BOOL				bRet = FALSE;
 
     if( pAlphaAcc && pAcc )
     {
-        const long          nWidth = Min( pAlphaAcc->Width(), pAcc->Width() );
-        const long          nHeight = Min( pAlphaAcc->Height(), pAcc->Height() );
+        const long			nWidth = Min( pAlphaAcc->Width(), pAcc->Width() );
+        const long			nHeight = Min( pAlphaAcc->Height(), pAcc->Height() );
 
         for( long nY = 0L; nY < nHeight; ++nY )
             for( long nX = 0L; nX < nWidth; ++nX )
-                pAcc->SetPixel( nY, nX,
-                                pAcc->GetPixel( nY, nX ).Merge( rBackgroundColor,
+                pAcc->SetPixel( nY, nX, 
+                                pAcc->GetPixel( nY, nX ).Merge( rBackgroundColor, 
                                                                 255 - pAlphaAcc->GetPixel( nY, nX ) ) );
 
         bRet = TRUE;
@@ -1963,6 +1963,6 @@ bool Bitmap::GetSystemData( BitmapSystemData& rData ) const
         if( pSalBitmap )
             bRet = pSalBitmap->GetSystemData( rData );
     }
-
+    
     return bRet;
 }
diff --git a/vcl/source/gdi/bitmap2.cxx b/vcl/source/gdi/bitmap2.cxx
index de926a0446ca..558aebcf9adc 100644
--- a/vcl/source/gdi/bitmap2.cxx
+++ b/vcl/source/gdi/bitmap2.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
@@ -44,20 +44,20 @@
 // - Defines -
 // -----------
 
-#define DIBCOREHEADERSIZE           ( 12UL )
-#define DIBINFOHEADERSIZE           ( sizeof( DIBInfoHeader ) )
+#define DIBCOREHEADERSIZE			( 12UL )
+#define DIBINFOHEADERSIZE			( sizeof( DIBInfoHeader ) )
 #define SETPIXEL4( pBuf, nX, cChar )( (pBuf)[ (nX) >> 1 ] |= ( (nX) & 1 ) ? ( cChar ): (cChar) << 4 );
 
 // ----------------------
 // - Compression defines
 // ----------------------
 
-#define COMPRESS_OWN                ('S'|('D'<<8UL))
-#define COMPRESS_NONE               ( 0UL )
-#define RLE_8                       ( 1UL )
-#define RLE_4                       ( 2UL )
-#define BITFIELDS                   ( 3UL )
-#define ZCOMPRESS                   ( COMPRESS_OWN | 0x01000000UL ) /* == 'SD01' (binary) */
+#define COMPRESS_OWN				('S'|('D'<<8UL))
+#define COMPRESS_NONE				( 0UL )
+#define RLE_8						( 1UL )
+#define RLE_4						( 2UL )
+#define BITFIELDS					( 3UL )
+#define ZCOMPRESS					( COMPRESS_OWN | 0x01000000UL ) /* == 'SD01' (binary) */
 
 // -----------------
 // - DIBInfoHeader -
@@ -65,17 +65,17 @@
 
 struct DIBInfoHeader
 {
-    sal_uInt32      nSize;
-    sal_Int32       nWidth;
-    sal_Int32       nHeight;
-    sal_uInt16      nPlanes;
-    sal_uInt16      nBitCount;
-    sal_uInt32      nCompression;
-    sal_uInt32      nSizeImage;
-    sal_Int32       nXPelsPerMeter;
-    sal_Int32       nYPelsPerMeter;
-    sal_uInt32      nColsUsed;
-    sal_uInt32      nColsImportant;
+    sal_uInt32		nSize;
+    sal_Int32		nWidth;
+    sal_Int32		nHeight;
+    sal_uInt16		nPlanes;
+    sal_uInt16		nBitCount;
+    sal_uInt32		nCompression;
+    sal_uInt32		nSizeImage;
+    sal_Int32		nXPelsPerMeter;
+    sal_Int32		nYPelsPerMeter;
+    sal_uInt32		nColsUsed;
+    sal_uInt32		nColsImportant;
 
                     DIBInfoHeader() :
                         nSize( 0UL ),
@@ -131,10 +131,10 @@ SvStream& operator<<( SvStream& rOStm, const Bitmap& rBitmap )
 
 BOOL Bitmap::Read( SvStream& rIStm, BOOL bFileHeader )
 {
-    const USHORT    nOldFormat = rIStm.GetNumberFormatInt();
-    const ULONG     nOldPos = rIStm.Tell();
-    ULONG           nOffset = 0UL;
-    BOOL            bRet = FALSE;
+    const USHORT	nOldFormat = rIStm.GetNumberFormatInt();
+    const ULONG 	nOldPos = rIStm.Tell();
+    ULONG			nOffset = 0UL;
+    BOOL			bRet = FALSE;
 
     rIStm.SetNumberFormatInt( NUMBERFORMAT_INT_LITTLEENDIAN );
 
@@ -163,26 +163,26 @@ BOOL Bitmap::Read( SvStream& rIStm, BOOL bFileHeader )
 
 BOOL Bitmap::ImplReadDIB( SvStream& rIStm, Bitmap& rBmp, ULONG nOffset )
 {
-    DIBInfoHeader   aHeader;
-    const ULONG     nStmPos = rIStm.Tell();
-    BOOL            bRet = FALSE;
-    sal_Bool        bTopDown = sal_False;
+    DIBInfoHeader	aHeader;
+    const ULONG 	nStmPos = rIStm.Tell();
+    BOOL			bRet = FALSE;
+    sal_Bool		bTopDown = sal_False;
 
     if( ImplReadDIBInfoHeader( rIStm, aHeader, bTopDown ) && aHeader.nWidth && aHeader.nHeight && aHeader.nBitCount )
     {
         const USHORT nBitCount( discretizeBitcount(aHeader.nBitCount) );
 
-        const Size          aSizePixel( aHeader.nWidth, aHeader.nHeight );
-        BitmapPalette       aDummyPal;
-        Bitmap              aNewBmp( aSizePixel, nBitCount, &aDummyPal );
-        BitmapWriteAccess*  pAcc = aNewBmp.AcquireWriteAccess();
+        const Size			aSizePixel( aHeader.nWidth, abs(aHeader.nHeight) );
+        BitmapPalette		aDummyPal;
+        Bitmap				aNewBmp( aSizePixel, nBitCount, &aDummyPal );
+        BitmapWriteAccess*	pAcc = aNewBmp.AcquireWriteAccess();
 
         if( pAcc )
         {
-            USHORT          nColors;
-            SvStream*       pIStm;
-            SvMemoryStream* pMemStm = NULL;
-            BYTE*           pData = NULL;
+            USHORT			nColors;
+            SvStream*		pIStm;
+            SvMemoryStream*	pMemStm = NULL;
+            BYTE*			pData = NULL;
 
             if( nBitCount <= 8 )
             {
@@ -196,24 +196,24 @@ BOOL Bitmap::ImplReadDIB( SvStream& rIStm, Bitmap& rBmp, ULONG nOffset )
 
             if( ZCOMPRESS == aHeader.nCompression )
             {
-                ZCodec  aCodec;
+                ZCodec	aCodec;
                 sal_uInt32 nCodedSize, nUncodedSize;
-                ULONG   nCodedPos;
+                ULONG	nCodedPos;
 
                 // read coding information
                 rIStm >> nCodedSize >> nUncodedSize >> aHeader.nCompression;
                 pData = (BYTE*) rtl_allocateMemory( nUncodedSize );
-
+                
                 // decode buffer
                 nCodedPos = rIStm.Tell();
                 aCodec.BeginCompression();
                 aCodec.Read( rIStm, pData, nUncodedSize );
                 aCodec.EndCompression();
-
+                
                 // skip unread bytes from coded buffer
                 rIStm.SeekRel( nCodedSize - ( rIStm.Tell() - nCodedPos ) );
-
-                // set decoded bytes to memory stream,
+                
+                // set decoded bytes to memory stream, 
                 // from which we will read the bitmap data
                 pIStm = pMemStm = new SvMemoryStream;
                 pMemStm->SetBuffer( (char*) pData, nUncodedSize, FALSE, nUncodedSize );
@@ -244,13 +244,13 @@ BOOL Bitmap::ImplReadDIB( SvStream& rIStm, Bitmap& rBmp, ULONG nOffset )
                                       Fraction( 1000, aHeader.nYPelsPerMeter ) );
 
                     aNewBmp.SetPrefMapMode( aMapMode );
-                    aNewBmp.SetPrefSize( Size( aHeader.nWidth, aHeader.nHeight ) );
+                    aNewBmp.SetPrefSize( Size( aHeader.nWidth, abs(aHeader.nHeight) ) );
                 }
             }
 
             if( pData )
                 rtl_freeMemory( pData );
-
+            
             delete pMemStm;
             aNewBmp.ReleaseAccess( pAcc );
 
@@ -266,9 +266,9 @@ BOOL Bitmap::ImplReadDIB( SvStream& rIStm, Bitmap& rBmp, ULONG nOffset )
 
 BOOL Bitmap::ImplReadDIBFileHeader( SvStream& rIStm, ULONG& rOffset )
 {
-    UINT32  nTmp32;
-    UINT16  nTmp16 = 0;
-    BOOL    bRet = FALSE;
+    UINT32	nTmp32;
+    UINT16	nTmp16 = 0;
+    BOOL	bRet = FALSE;
 
     rIStm >> nTmp16;
 
@@ -365,7 +365,7 @@ BOOL Bitmap::ImplReadDIBInfoHeader( SvStream& rIStm, DIBInfoHeader& rHeader, sal
         else
         {
             rIStm >> rHeader.nWidth;
-            rIStm >> rHeader.nHeight;
+            rIStm >> rHeader.nHeight; //rHeader.nHeight=abs(rHeader.nHeight);
             rIStm >> rHeader.nPlanes;
             rIStm >> rHeader.nBitCount;
             rIStm >> rHeader.nCompression;
@@ -390,7 +390,7 @@ BOOL Bitmap::ImplReadDIBInfoHeader( SvStream& rIStm, DIBInfoHeader& rHeader, sal
 
     if ( rHeader.nWidth < 0 )
         rIStm.SetError( SVSTREAM_FILEFORMAT_ERROR );
-
+    
     // #144105# protect a little against damaged files
     if( rHeader.nSizeImage > ( 16 * static_cast< sal_uInt32 >( rHeader.nWidth * rHeader.nHeight ) ) )
         rHeader.nSizeImage = 0;
@@ -402,9 +402,9 @@ BOOL Bitmap::ImplReadDIBInfoHeader( SvStream& rIStm, DIBInfoHeader& rHeader, sal
 
 BOOL Bitmap::ImplReadDIBPalette( SvStream& rIStm, BitmapWriteAccess& rAcc, BOOL bQuad )
 {
-    const USHORT    nColors = rAcc.GetPaletteEntryCount();
-    const ULONG     nPalSize = nColors * ( bQuad ? 4UL : 3UL );
-    BitmapColor     aPalColor;
+    const USHORT	nColors = rAcc.GetPaletteEntryCount();
+    const ULONG 	nPalSize = nColors * ( bQuad ? 4UL : 3UL );
+    BitmapColor 	aPalColor;
 
     BYTE* pEntries = new BYTE[ nPalSize ];
     rIStm.Read( pEntries, nPalSize );
@@ -432,12 +432,12 @@ BOOL Bitmap::ImplReadDIBPalette( SvStream& rIStm, BitmapWriteAccess& rAcc, BOOL
 BOOL Bitmap::ImplReadDIBBits( SvStream& rIStm, DIBInfoHeader& rHeader, BitmapWriteAccess& rAcc, sal_Bool bTopDown )
 {
     const ULONG nAlignedWidth = AlignedWidth4Bytes( rHeader.nWidth * rHeader.nBitCount );
-    UINT32      nRMask = 0;
-    UINT32      nGMask = 0;
-    UINT32      nBMask = 0;
-    BOOL        bNative;
-    BOOL        bTCMask = ( rHeader.nBitCount == 16 ) || ( rHeader.nBitCount == 32 );
-    BOOL        bRLE = ( RLE_8 == rHeader.nCompression && rHeader.nBitCount == 8 ) ||
+    UINT32		nRMask = 0;
+    UINT32		nGMask = 0;
+    UINT32		nBMask = 0;
+    BOOL		bNative;
+    BOOL		bTCMask = ( rHeader.nBitCount == 16 ) || ( rHeader.nBitCount == 32 );
+    BOOL		bRLE = ( RLE_8 == rHeader.nCompression && rHeader.nBitCount == 8 ) ||
                        ( RLE_4 == rHeader.nCompression && rHeader.nBitCount == 4 );
 
     // Is native format?
@@ -461,7 +461,13 @@ BOOL Bitmap::ImplReadDIBBits( SvStream& rIStm, DIBInfoHeader& rHeader, BitmapWri
         if( rHeader.nColsUsed && rHeader.nBitCount > 8 )
             rIStm.SeekRel( rHeader.nColsUsed * ( ( rHeader.nSize != DIBCOREHEADERSIZE ) ? 4 : 3 ) );
 
-        rIStm.Read( rAcc.GetBuffer(), rHeader.nHeight * nAlignedWidth );
+        if ( rHeader.nHeight > 0 )
+            rIStm.Read( rAcc.GetBuffer(), rHeader.nHeight * nAlignedWidth );
+        else
+        {
+            for( int i = abs(rHeader.nHeight)-1; i >= 0; i-- )
+                rIStm.Read( ((char*)rAcc.GetBuffer()) + (nAlignedWidth*i), nAlignedWidth );
+        }
     }
     else
     {
@@ -503,9 +509,9 @@ BOOL Bitmap::ImplReadDIBBits( SvStream& rIStm, DIBInfoHeader& rHeader, BitmapWri
         }
         else
         {
-            const long  nWidth = rHeader.nWidth;
-            const long  nHeight = rHeader.nHeight;
-            BYTE*       pBuf = new BYTE[ nAlignedWidth ];
+            const long	nWidth = rHeader.nWidth;
+            const long	nHeight = abs(rHeader.nHeight);
+            BYTE*		pBuf = new BYTE[ nAlignedWidth ];
 
             // true color DIB's can have a (optimization) palette
             if( rHeader.nColsUsed && rHeader.nBitCount > 8 )
@@ -514,13 +520,13 @@ BOOL Bitmap::ImplReadDIBBits( SvStream& rIStm, DIBInfoHeader& rHeader, BitmapWri
             const long nI = bTopDown ? 1 : -1;
             long nY = bTopDown ? 0 : nHeight - 1;
             long nCount = nHeight;
-
+    
             switch( rHeader.nBitCount )
             {
                 case( 1 ):
                 {
-                    BYTE*   pTmp;
-                    BYTE    cTmp;
+                    BYTE*	pTmp;
+                    BYTE	cTmp;
 
                     for( ; nCount--; nY += nI )
                     {
@@ -543,8 +549,8 @@ BOOL Bitmap::ImplReadDIBBits( SvStream& rIStm, DIBInfoHeader& rHeader, BitmapWri
 
                 case( 4 ):
                 {
-                    BYTE*   pTmp;
-                    BYTE    cTmp;
+                    BYTE*	pTmp;
+                    BYTE	cTmp;
 
                     for( ; nCount--; nY += nI )
                     {
@@ -567,7 +573,7 @@ BOOL Bitmap::ImplReadDIBBits( SvStream& rIStm, DIBInfoHeader& rHeader, BitmapWri
 
                 case( 8 ):
                 {
-                    BYTE*   pTmp;
+                    BYTE*	pTmp;
 
                     for( ; nCount--; nY += nI )
                     {
@@ -581,9 +587,9 @@ BOOL Bitmap::ImplReadDIBBits( SvStream& rIStm, DIBInfoHeader& rHeader, BitmapWri
 
                 case( 16 ):
                 {
-                    ColorMask   aMask( nRMask, nGMask, nBMask );
+                    ColorMask	aMask( nRMask, nGMask, nBMask );
                     BitmapColor aColor;
-                    UINT16*     pTmp16;
+                    UINT16* 	pTmp16;
 
                     for( ; nCount--; nY += nI )
                     {
@@ -601,7 +607,7 @@ BOOL Bitmap::ImplReadDIBBits( SvStream& rIStm, DIBInfoHeader& rHeader, BitmapWri
                 case( 24 ):
                 {
                     BitmapColor aPixelColor;
-                    BYTE*       pTmp;
+                    BYTE*		pTmp;
 
                     for( ; nCount--; nY += nI )
                     {
@@ -620,9 +626,9 @@ BOOL Bitmap::ImplReadDIBBits( SvStream& rIStm, DIBInfoHeader& rHeader, BitmapWri
 
                 case( 32 ):
                 {
-                    ColorMask   aMask( nRMask, nGMask, nBMask );
+                    ColorMask	aMask( nRMask, nGMask, nBMask );
                     BitmapColor aColor;
-                    UINT32*     pTmp32;
+                    UINT32* 	pTmp32;
 
                     for( ; nCount--; nY += nI )
                     {
@@ -650,14 +656,14 @@ BOOL Bitmap::Write( SvStream& rOStm, BOOL bCompressed, BOOL bFileHeader ) const
 {
     DBG_ASSERT( mpImpBmp, "Empty Bitmaps can't be saved" );
 
-    const Size  aSizePix( GetSizePixel() );
-    BOOL        bRet = FALSE;
+    const Size	aSizePix( GetSizePixel() );
+    BOOL		bRet = FALSE;
 
     if( mpImpBmp && aSizePix.Width() && aSizePix.Height() )
     {
-        BitmapReadAccess*   pAcc = ( (Bitmap*) this)->AcquireReadAccess();
-        const USHORT        nOldFormat = rOStm.GetNumberFormatInt();
-        const ULONG         nOldPos = rOStm.Tell();
+        BitmapReadAccess*	pAcc = ( (Bitmap*) this)->AcquireReadAccess();
+        const USHORT		nOldFormat = rOStm.GetNumberFormatInt();
+        const ULONG 		nOldPos = rOStm.Tell();
 
         rOStm.SetNumberFormatInt( NUMBERFORMAT_INT_LITTLEENDIAN );
 
@@ -690,12 +696,12 @@ BOOL Bitmap::Write( SvStream& rOStm, BOOL bCompressed, BOOL bFileHeader ) const
 
 BOOL Bitmap::ImplWriteDIB( SvStream& rOStm, BitmapReadAccess& rAcc, BOOL bCompressed ) const
 {
-    const MapMode   aMapPixel( MAP_PIXEL );
-    DIBInfoHeader   aHeader;
-    ULONG           nImageSizePos;
-    ULONG           nEndPos;
-    sal_uInt32      nCompression = 0;
-    BOOL            bRet = FALSE;
+    const MapMode	aMapPixel( MAP_PIXEL );
+    DIBInfoHeader	aHeader;
+    ULONG			nImageSizePos;
+    ULONG			nEndPos;
+    sal_uInt32		nCompression = 0;
+    BOOL			bRet = FALSE;
 
     aHeader.nSize = DIBINFOHEADERSIZE;
     aHeader.nWidth = rAcc.Width();
@@ -706,7 +712,7 @@ BOOL Bitmap::ImplWriteDIB( SvStream& rOStm, BitmapReadAccess& rAcc, BOOL bCompre
     {
         aHeader.nBitCount = ( rAcc.GetScanlineFormat() == BMP_FORMAT_16BIT_TC_LSB_MASK ) ? 16 : 32;
         aHeader.nSizeImage = rAcc.Height() * rAcc.GetScanlineSize();
-
+        
         nCompression = BITFIELDS;
     }
     else
@@ -723,7 +729,7 @@ BOOL Bitmap::ImplWriteDIB( SvStream& rOStm, BitmapReadAccess& rAcc, BOOL bCompre
         const UINT16 nBitCount( sal::static_int_cast<UINT16>(rAcc.GetBitCount()) );
 
         aHeader.nBitCount = discretizeBitcount( nBitCount );
-        aHeader.nSizeImage = rAcc.Height() *
+        aHeader.nSizeImage = rAcc.Height() * 
             AlignedWidth4Bytes( rAcc.Width()*aHeader.nBitCount );
 
         if( bCompressed )
@@ -737,7 +743,7 @@ BOOL Bitmap::ImplWriteDIB( SvStream& rOStm, BitmapReadAccess& rAcc, BOOL bCompre
             nCompression = COMPRESS_NONE;
     }
 
-    if( ( rOStm.GetCompressMode() & COMPRESSMODE_ZBITMAP ) &&
+    if( ( rOStm.GetCompressMode() & COMPRESSMODE_ZBITMAP ) && 
         ( rOStm.GetVersion() >= SOFFICE_FILEFORMAT_40 ) )
     {
         aHeader.nCompression = ZCOMPRESS;
@@ -753,10 +759,10 @@ BOOL Bitmap::ImplWriteDIB( SvStream& rOStm, BitmapReadAccess& rAcc, BOOL bCompre
         // MapMode is integer-based, and suffers from roundoffs,
         // especially if maPrefSize is small. Trying to circumvent
         // that by performing part of the math in floating point.
-        const Size aScale100000(
+        const Size aScale100000( 
             OutputDevice::LogicToLogic( Size(100000L,
-                                             100000L),
-                                        MAP_100TH_MM,
+                                             100000L), 
+                                        MAP_100TH_MM, 
                                         maPrefMapMode ) );
         const double fBmpWidthM((double)maPrefSize.Width() / aScale100000.Width() );
         const double fBmpHeightM((double)maPrefSize.Height() / aScale100000.Height() );
@@ -788,15 +794,15 @@ BOOL Bitmap::ImplWriteDIB( SvStream& rOStm, BitmapReadAccess& rAcc, BOOL bCompre
 
     if( aHeader.nCompression == ZCOMPRESS )
     {
-        ZCodec          aCodec;
-        SvMemoryStream  aMemStm( aHeader.nSizeImage + 4096, 65535 );
-        ULONG           nCodedPos = rOStm.Tell(), nLastPos;
-        sal_uInt32      nCodedSize, nUncodedSize;
+        ZCodec			aCodec;
+        SvMemoryStream	aMemStm( aHeader.nSizeImage + 4096, 65535 );
+        ULONG			nCodedPos = rOStm.Tell(), nLastPos;
+        sal_uInt32		nCodedSize, nUncodedSize;
 
         // write uncoded data palette
         if( aHeader.nColsUsed )
             ImplWriteDIBPalette( aMemStm, rAcc );
-
+        
         // write uncoded bits
         bRet = ImplWriteDIBBits( aMemStm, rAcc, nCompression, aHeader.nSizeImage );
 
@@ -805,12 +811,12 @@ BOOL Bitmap::ImplWriteDIB( SvStream& rOStm, BitmapReadAccess& rAcc, BOOL bCompre
 
         // seek over compress info
         rOStm.SeekRel( 12 );
-
+        
         // write compressed data
         aCodec.BeginCompression( 3 );
         aCodec.Write( rOStm, (BYTE*) aMemStm.GetData(), nUncodedSize );
         aCodec.EndCompression();
-
+        
         // update compress info ( coded size, uncoded size, uncoded compression )
         nCodedSize = ( nLastPos = rOStm.Tell() ) - nCodedPos - 12;
         rOStm.Seek( nCodedPos );
@@ -840,9 +846,9 @@ BOOL Bitmap::ImplWriteDIB( SvStream& rOStm, BitmapReadAccess& rAcc, BOOL bCompre
 
 BOOL Bitmap::ImplWriteDIBFileHeader( SvStream& rOStm, BitmapReadAccess& rAcc )
 {
-    UINT32  nPalCount = ( rAcc.HasPalette() ? rAcc.GetPaletteEntryCount() :
+    UINT32	nPalCount = ( rAcc.HasPalette() ? rAcc.GetPaletteEntryCount() : 
                           isBitfieldCompression( rAcc.GetScanlineFormat() ) ? 3UL : 0UL );
-    UINT32  nOffset = 14 + DIBINFOHEADERSIZE + nPalCount * 4UL;
+    UINT32	nOffset = 14 + DIBINFOHEADERSIZE + nPalCount * 4UL;
 
     rOStm << (UINT16) 0x4D42;
     rOStm << (UINT32) ( nOffset + ( rAcc.Height() * rAcc.GetScanlineSize() ) );
@@ -857,11 +863,11 @@ BOOL Bitmap::ImplWriteDIBFileHeader( SvStream& rOStm, BitmapReadAccess& rAcc )
 
 BOOL Bitmap::ImplWriteDIBPalette( SvStream& rOStm, BitmapReadAccess& rAcc )
 {
-    const USHORT    nColors = rAcc.GetPaletteEntryCount();
-    const ULONG     nPalSize = nColors * 4UL;
-    BYTE*           pEntries = new BYTE[ nPalSize ];
-    BYTE*           pTmpEntry = pEntries;
-    BitmapColor     aPalColor;
+    const USHORT	nColors = rAcc.GetPaletteEntryCount();
+    const ULONG 	nPalSize = nColors * 4UL;
+    BYTE*			pEntries = new BYTE[ nPalSize ];
+    BYTE*			pTmpEntry = pEntries;
+    BitmapColor 	aPalColor;
 
     for( USHORT i = 0; i < nColors; i++ )
     {
@@ -886,8 +892,8 @@ BOOL Bitmap::ImplWriteDIBBits( SvStream& rOStm, BitmapReadAccess& rAcc,
 {
     if( BITFIELDS == nCompression )
     {
-        const ColorMask&    rMask = rAcc.GetColorMask();
-        SVBT32              aVal32;
+        const ColorMask&	rMask = rAcc.GetColorMask();
+        SVBT32				aVal32;
 
         UInt32ToSVBT32( rMask.GetRedMask(), aVal32 );
         rOStm.Write( (BYTE*) aVal32, 4UL );
@@ -924,9 +930,9 @@ BOOL Bitmap::ImplWriteDIBBits( SvStream& rOStm, BitmapReadAccess& rAcc,
         // #i59239# discretize bitcount for aligned width to 1,4,8,24
         // (other cases are not written below)
         const USHORT nBitCount( sal::static_int_cast<USHORT>(rAcc.GetBitCount()) );
-        const ULONG  nAlignedWidth = AlignedWidth4Bytes( rAcc.Width() *
+        const ULONG  nAlignedWidth = AlignedWidth4Bytes( rAcc.Width() * 
                                                          discretizeBitcount(nBitCount));
-        BOOL         bNative = FALSE;
+        BOOL		 bNative = FALSE;
 
         switch( rAcc.GetScanlineFormat() )
         {
@@ -950,11 +956,11 @@ BOOL Bitmap::ImplWriteDIBBits( SvStream& rOStm, BitmapReadAccess& rAcc,
             rOStm.Write( rAcc.GetBuffer(), nAlignedWidth * rAcc.Height() );
         else
         {
-            const long  nWidth = rAcc.Width();
-            const long  nHeight = rAcc.Height();
-            BYTE*       pBuf = new BYTE[ nAlignedWidth ];
-            BYTE*       pTmp;
-            BYTE        cTmp;
+            const long	nWidth = rAcc.Width();
+            const long	nHeight = rAcc.Height();
+            BYTE*		pBuf = new BYTE[ nAlignedWidth ];
+            BYTE*		pTmp;
+            BYTE		cTmp;
 
             switch( nBitCount )
             {
@@ -1060,14 +1066,14 @@ BOOL Bitmap::ImplWriteDIBBits( SvStream& rOStm, BitmapReadAccess& rAcc,
 void Bitmap::ImplDecodeRLE( BYTE* pBuffer, DIBInfoHeader& rHeader,
                             BitmapWriteAccess& rAcc, BOOL bRLE4 )
 {
-    Scanline    pRLE = pBuffer;
-    long        nY = rHeader.nHeight - 1L;
-    const ULONG nWidth = rAcc.Width();
-    ULONG       nCountByte;
-    ULONG       nRunByte;
-    ULONG       nX = 0UL;
-    BYTE        cTmp;
-    BOOL        bEndDecoding = FALSE;
+    Scanline	pRLE = pBuffer;
+    long		nY = abs(rHeader.nHeight) - 1L;
+    const ULONG	nWidth = rAcc.Width();
+    ULONG		nCountByte;
+    ULONG		nRunByte;
+    ULONG		nX = 0UL;
+    BYTE		cTmp;
+    BOOL		bEndDecoding = FALSE;
 
     do
     {
@@ -1084,7 +1090,7 @@ void Bitmap::ImplDecodeRLE( BYTE* pBuffer, DIBInfoHeader& rHeader,
                     for( ULONG i = 0UL; i < nCountByte; i++ )
                     {
                         cTmp = *pRLE++;
-
+                        
                         if( nX < nWidth )
                             rAcc.SetPixel( nY, nX++, cTmp >> 4 );
 
@@ -1166,15 +1172,15 @@ BOOL Bitmap::ImplWriteRLE( SvStream& rOStm, BitmapReadAccess& rAcc, BOOL bRLE4 )
 {
     const ULONG nWidth = rAcc.Width();
     const ULONG nHeight = rAcc.Height();
-    ULONG       nX;
-    ULONG       nSaveIndex;
-    ULONG       nCount;
-    ULONG       nBufCount;
-    BYTE*       pBuf = new BYTE[ ( nWidth << 1 ) + 2 ];
-    BYTE*       pTmp;
-    BYTE        cPix;
-    BYTE        cLast;
-    BOOL        bFound;
+    ULONG		nX;
+    ULONG		nSaveIndex;
+    ULONG		nCount;
+    ULONG		nBufCount;
+    BYTE*		pBuf = new BYTE[ ( nWidth << 1 ) + 2 ];
+    BYTE*		pTmp;
+    BYTE		cPix;
+    BYTE		cLast;
+    BOOL		bFound;
 
     for ( long nY = nHeight - 1L; nY >= 0L; nY-- )
     {
diff --git a/vcl/source/gdi/bitmap3.cxx b/vcl/source/gdi/bitmap3.cxx
index 9e2a21b43e37..b10ea4a2d1bf 100644
--- a/vcl/source/gdi/bitmap3.cxx
+++ b/vcl/source/gdi/bitmap3.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
@@ -40,36 +40,36 @@
 // - Defines -
 // -----------
 
-#define RGB15( _def_cR, _def_cG, _def_cB )  (((ULONG)(_def_cR)<<10UL)|((ULONG)(_def_cG)<<5UL)|(ULONG)(_def_cB))
-#define GAMMA( _def_cVal, _def_InvGamma )   ((BYTE)MinMax(FRound(pow( _def_cVal/255.0,_def_InvGamma)*255.0),0L,255L))
-
-#define CALC_ERRORS                                                             \
-                        nTemp   = p1T[nX++] >> 12;                              \
-                        nBErr = MinMax( nTemp, 0, 255 );                        \
-                        nBErr = nBErr - FloydIndexMap[ nBC = FloydMap[nBErr] ]; \
-                        nTemp   = p1T[nX++] >> 12;                              \
-                        nGErr = MinMax( nTemp, 0, 255 );                        \
-                        nGErr = nGErr - FloydIndexMap[ nGC = FloydMap[nGErr] ]; \
-                        nTemp   = p1T[nX] >> 12;                                \
-                        nRErr = MinMax( nTemp, 0, 255 );                        \
+#define RGB15( _def_cR, _def_cG, _def_cB )	(((ULONG)(_def_cR)<<10UL)|((ULONG)(_def_cG)<<5UL)|(ULONG)(_def_cB))
+#define GAMMA( _def_cVal, _def_InvGamma )	((BYTE)MinMax(FRound(pow( _def_cVal/255.0,_def_InvGamma)*255.0),0L,255L))
+
+#define CALC_ERRORS																\
+                        nTemp   = p1T[nX++] >> 12;								\
+                        nBErr = MinMax( nTemp, 0, 255 );						\
+                        nBErr = nBErr - FloydIndexMap[ nBC = FloydMap[nBErr] ];	\
+                        nTemp   = p1T[nX++] >> 12;								\
+                        nGErr = MinMax( nTemp, 0, 255 );						\
+                        nGErr = nGErr - FloydIndexMap[ nGC = FloydMap[nGErr] ];	\
+                        nTemp   = p1T[nX] >> 12;								\
+                        nRErr = MinMax( nTemp, 0, 255 );						\
                         nRErr = nRErr - FloydIndexMap[ nRC = FloydMap[nRErr] ];
 
-#define CALC_TABLES3                                        \
-                        p2T[nX++] += FloydError3[nBErr];    \
-                        p2T[nX++] += FloydError3[nGErr];    \
+#define CALC_TABLES3										\
+                        p2T[nX++] += FloydError3[nBErr];	\
+                        p2T[nX++] += FloydError3[nGErr];	\
                         p2T[nX++] += FloydError3[nRErr];
 
-#define CALC_TABLES5                                        \
-                        p2T[nX++] += FloydError5[nBErr];    \
-                        p2T[nX++] += FloydError5[nGErr];    \
+#define CALC_TABLES5										\
+                        p2T[nX++] += FloydError5[nBErr];	\
+                        p2T[nX++] += FloydError5[nGErr];	\
                         p2T[nX++] += FloydError5[nRErr];
 
-#define CALC_TABLES7                                        \
-                        p1T[++nX] += FloydError7[nBErr];    \
-                        p2T[nX++] += FloydError1[nBErr];    \
-                        p1T[nX] += FloydError7[nGErr];      \
-                        p2T[nX++] += FloydError1[nGErr];    \
-                        p1T[nX] += FloydError7[nRErr];      \
+#define CALC_TABLES7										\
+                        p1T[++nX] += FloydError7[nBErr];	\
+                        p2T[nX++] += FloydError1[nBErr];	\
+                        p1T[nX] += FloydError7[nGErr];		\
+                        p2T[nX++] += FloydError1[nGErr];	\
+                        p1T[nX] += FloydError7[nRErr];		\
                         p2T[nX] += FloydError1[nRErr];
 
 // -----------
@@ -244,12 +244,12 @@ long FloydIndexMap[6] =
 
 void ImplCreateDitherMatrix( BYTE (*pDitherMatrix)[16][16] )
 {
-    double          fVal = 3.125;
-    const double    fVal16 = fVal / 16.;
-    long            i, j, k, l;
-    USHORT          pMtx[ 16 ][ 16 ];
-    USHORT          nMax = 0;
-    static BYTE     pMagic[4][4] = { { 0, 14,  3, 13, },
+    double			fVal = 3.125;
+    const double	fVal16 = fVal / 16.;
+    long			i, j, k, l;
+    USHORT			pMtx[ 16 ][ 16 ];
+    USHORT			nMax = 0;
+    static BYTE 	pMagic[4][4] = { { 0, 14,  3, 13, },
                                      {11,  5,  8,  6, },
                                      {12,  2, 15,  1, },
                                      {7,   9,  4, 10 } };
@@ -274,8 +274,8 @@ void ImplCreateDitherMatrix( BYTE (*pDitherMatrix)[16][16] )
 
 BOOL Bitmap::Convert( BmpConversion eConversion )
 {
-    const USHORT    nBitCount = GetBitCount();
-    BOOL            bRet = FALSE;
+    const USHORT	nBitCount = GetBitCount();
+    BOOL			bRet = FALSE;
 
     switch( eConversion )
     {
@@ -364,20 +364,20 @@ BOOL Bitmap::Convert( BmpConversion eConversion )
 
 BOOL Bitmap::ImplMakeMono( BYTE cThreshold )
 {
-    BitmapReadAccess*   pReadAcc = AcquireReadAccess();
-    BOOL                bRet = FALSE;
+    BitmapReadAccess*	pReadAcc = AcquireReadAccess();
+    BOOL				bRet = FALSE;
 
     if( pReadAcc )
     {
-        Bitmap              aNewBmp( GetSizePixel(), 1 );
-        BitmapWriteAccess*  pWriteAcc = aNewBmp.AcquireWriteAccess();
+        Bitmap				aNewBmp( GetSizePixel(), 1 );
+        BitmapWriteAccess*	pWriteAcc = aNewBmp.AcquireWriteAccess();
 
         if( pWriteAcc )
         {
-            const BitmapColor   aBlack( pWriteAcc->GetBestMatchingColor( Color( COL_BLACK ) ) );
-            const BitmapColor   aWhite( pWriteAcc->GetBestMatchingColor( Color( COL_WHITE ) ) );
-            const long          nWidth = pWriteAcc->Width();
-            const long          nHeight = pWriteAcc->Height();
+            const BitmapColor	aBlack( pWriteAcc->GetBestMatchingColor( Color( COL_BLACK ) ) );
+            const BitmapColor	aWhite( pWriteAcc->GetBestMatchingColor( Color( COL_WHITE ) ) );
+            const long			nWidth = pWriteAcc->Width();
+            const long			nHeight = pWriteAcc->Height();
 
             if( pReadAcc->HasPalette() )
             {
@@ -420,8 +420,8 @@ BOOL Bitmap::ImplMakeMono( BYTE cThreshold )
 
         if( bRet )
         {
-            const MapMode   aMap( maPrefMapMode );
-            const Size      aSize( maPrefSize );
+            const MapMode	aMap( maPrefMapMode );
+            const Size		aSize( maPrefSize );
 
             *this = aNewBmp;
 
@@ -437,21 +437,21 @@ BOOL Bitmap::ImplMakeMono( BYTE cThreshold )
 
 BOOL Bitmap::ImplMakeMonoDither()
 {
-    BitmapReadAccess*   pReadAcc = AcquireReadAccess();
-    BOOL                bRet = FALSE;
+    BitmapReadAccess*	pReadAcc = AcquireReadAccess();
+    BOOL				bRet = FALSE;
 
     if( pReadAcc )
     {
-        Bitmap              aNewBmp( GetSizePixel(), 1 );
-        BitmapWriteAccess*  pWriteAcc = aNewBmp.AcquireWriteAccess();
+        Bitmap				aNewBmp( GetSizePixel(), 1 );
+        BitmapWriteAccess*	pWriteAcc = aNewBmp.AcquireWriteAccess();
 
         if( pWriteAcc )
         {
-            const BitmapColor   aBlack( pWriteAcc->GetBestMatchingColor( Color( COL_BLACK ) ) );
-            const BitmapColor   aWhite( pWriteAcc->GetBestMatchingColor( Color( COL_WHITE ) ) );
-            const long          nWidth = pWriteAcc->Width();
-            const long          nHeight = pWriteAcc->Height();
-            BYTE                pDitherMatrix[ 16 ][ 16 ];
+            const BitmapColor	aBlack( pWriteAcc->GetBestMatchingColor( Color( COL_BLACK ) ) );
+            const BitmapColor	aWhite( pWriteAcc->GetBestMatchingColor( Color( COL_WHITE ) ) );
+            const long			nWidth = pWriteAcc->Width();
+            const long			nHeight = pWriteAcc->Height();
+            BYTE				pDitherMatrix[ 16 ][ 16 ];
 
             ImplCreateDitherMatrix( &pDitherMatrix );
 
@@ -496,8 +496,8 @@ BOOL Bitmap::ImplMakeMonoDither()
 
         if( bRet )
         {
-            const MapMode   aMap( maPrefMapMode );
-            const Size      aSize( maPrefSize );
+            const MapMode	aMap( maPrefMapMode );
+            const Size		aSize( maPrefSize );
 
             *this = aNewBmp;
 
@@ -515,27 +515,27 @@ BOOL Bitmap::ImplMakeGreyscales( USHORT nGreys )
 {
     DBG_ASSERT( nGreys == 16 || nGreys == 256, "Only 16 or 256 greyscales are supported!" );
 
-    BitmapReadAccess*   pReadAcc = AcquireReadAccess();
-    BOOL                bRet = FALSE;
+    BitmapReadAccess*	pReadAcc = AcquireReadAccess();
+    BOOL				bRet = FALSE;
 
     if( pReadAcc )
     {
-        const BitmapPalette&    rPal = GetGreyPalette( nGreys );
-        ULONG                   nShift = ( ( nGreys == 16 ) ? 4UL : 0UL );
-        BOOL                    bPalDiffers = !pReadAcc->HasPalette() || ( rPal.GetEntryCount() != pReadAcc->GetPaletteEntryCount() );
+        const BitmapPalette&	rPal = GetGreyPalette( nGreys );
+        ULONG 					nShift = ( ( nGreys == 16 ) ? 4UL : 0UL );
+        BOOL					bPalDiffers = !pReadAcc->HasPalette() || ( rPal.GetEntryCount() != pReadAcc->GetPaletteEntryCount() );
 
         if( !bPalDiffers )
             bPalDiffers = ( (BitmapPalette&) rPal != pReadAcc->GetPalette() );
 
         if( bPalDiffers )
         {
-            Bitmap              aNewBmp( GetSizePixel(), ( nGreys == 16 ) ? 4 : 8, &rPal );
-            BitmapWriteAccess*  pWriteAcc = aNewBmp.AcquireWriteAccess();
+            Bitmap				aNewBmp( GetSizePixel(), ( nGreys == 16 ) ? 4 : 8, &rPal );
+            BitmapWriteAccess*	pWriteAcc = aNewBmp.AcquireWriteAccess();
 
             if( pWriteAcc )
             {
-                const long  nWidth = pWriteAcc->Width();
-                const long  nHeight = pWriteAcc->Height();
+                const long	nWidth = pWriteAcc->Width();
+                const long	nHeight = pWriteAcc->Height();
 
                 if( pReadAcc->HasPalette() )
                 {
@@ -564,7 +564,7 @@ BOOL Bitmap::ImplMakeGreyscales( USHORT nGreys )
                             const ULONG nB = *pReadScan++;
                             const ULONG nG = *pReadScan++;
                             const ULONG nR = *pReadScan++;
-
+                            
                             *pWriteScan++ = (BYTE) ( ( nB * 28UL + nG * 151UL + nR * 77UL ) >> nShift );
                         }
                     }
@@ -584,7 +584,7 @@ BOOL Bitmap::ImplMakeGreyscales( USHORT nGreys )
                             const ULONG nR = *pReadScan++;
                             const ULONG nG = *pReadScan++;
                             const ULONG nB = *pReadScan++;
-
+                            
                             *pWriteScan++ = (BYTE) ( ( nB * 28UL + nG * 151UL + nR * 77UL ) >> nShift );
                         }
                     }
@@ -604,8 +604,8 @@ BOOL Bitmap::ImplMakeGreyscales( USHORT nGreys )
 
             if( bRet )
             {
-                const MapMode   aMap( maPrefMapMode );
-                const Size      aSize( maPrefSize );
+                const MapMode	aMap( maPrefMapMode );
+                const Size		aSize( maPrefSize );
 
                 *this = aNewBmp;
 
@@ -629,24 +629,24 @@ BOOL Bitmap::ImplConvertUp( USHORT nBitCount, Color* pExtColor )
 {
     DBG_ASSERT( nBitCount > GetBitCount(), "New BitCount must be greater!" );
 
-    BitmapReadAccess*   pReadAcc = AcquireReadAccess();
-    BOOL                bRet = FALSE;
+    BitmapReadAccess*	pReadAcc = AcquireReadAccess();
+    BOOL				bRet = FALSE;
 
     if( pReadAcc )
     {
-        BitmapPalette       aPal;
-        Bitmap              aNewBmp( GetSizePixel(), nBitCount, pReadAcc->HasPalette() ? &pReadAcc->GetPalette() : &aPal );
-        BitmapWriteAccess*  pWriteAcc = aNewBmp.AcquireWriteAccess();
+        BitmapPalette		aPal;
+        Bitmap				aNewBmp( GetSizePixel(), nBitCount, pReadAcc->HasPalette() ? &pReadAcc->GetPalette() : &aPal );
+        BitmapWriteAccess*	pWriteAcc = aNewBmp.AcquireWriteAccess();
 
         if( pWriteAcc )
         {
-            const long  nWidth = pWriteAcc->Width();
-            const long  nHeight = pWriteAcc->Height();
+            const long	nWidth = pWriteAcc->Width();
+            const long	nHeight = pWriteAcc->Height();
 
             if( pWriteAcc->HasPalette() )
             {
-                const USHORT            nOldCount = 1 << GetBitCount();
-                const BitmapPalette&    rOldPal = pReadAcc->GetPalette();
+                const USHORT			nOldCount = 1 << GetBitCount();
+                const BitmapPalette&	rOldPal = pReadAcc->GetPalette();
 
                 aPal.SetEntryCount( 1 << nBitCount );
 
@@ -686,8 +686,8 @@ BOOL Bitmap::ImplConvertUp( USHORT nBitCount, Color* pExtColor )
 
         if( bRet )
         {
-            const MapMode   aMap( maPrefMapMode );
-            const Size      aSize( maPrefSize );
+            const MapMode	aMap( maPrefMapMode );
+            const Size		aSize( maPrefSize );
 
             *this = aNewBmp;
 
@@ -705,33 +705,33 @@ BOOL Bitmap::ImplConvertDown( USHORT nBitCount, Color* pExtColor )
 {
     DBG_ASSERT( nBitCount <= GetBitCount(), "New BitCount must be lower ( or equal when pExtColor is set )!" );
 
-    BitmapReadAccess*   pReadAcc = AcquireReadAccess();
-    BOOL                bRet = FALSE;
+    BitmapReadAccess*	pReadAcc = AcquireReadAccess();
+    BOOL				bRet = FALSE;
 
     if( pReadAcc )
     {
-        BitmapPalette       aPal;
-        Bitmap              aNewBmp( GetSizePixel(), nBitCount, &aPal );
-        BitmapWriteAccess*  pWriteAcc = aNewBmp.AcquireWriteAccess();
+        BitmapPalette		aPal;
+        Bitmap				aNewBmp( GetSizePixel(), nBitCount, &aPal );
+        BitmapWriteAccess*	pWriteAcc = aNewBmp.AcquireWriteAccess();
 
         if( pWriteAcc )
         {
-            const USHORT    nCount = 1 << nBitCount;
-            const long      nWidth = pWriteAcc->Width();
-            const long      nWidth1 = nWidth - 1L;
-            const long      nHeight = pWriteAcc->Height();
-            Octree          aOctree( *pReadAcc, pExtColor ? ( nCount - 1 ) : nCount );
+            const USHORT	nCount = 1 << nBitCount;
+            const long		nWidth = pWriteAcc->Width();
+            const long		nWidth1 = nWidth - 1L;
+            const long		nHeight = pWriteAcc->Height();
+            Octree			aOctree( *pReadAcc, pExtColor ? ( nCount - 1 ) : nCount );
             InverseColorMap aColorMap( aPal = aOctree.GetPalette() );
-            BitmapColor     aColor;
-            ImpErrorQuad    aErrQuad;
-            ImpErrorQuad*   pErrQuad1 = new ImpErrorQuad[ nWidth ];
-            ImpErrorQuad*   pErrQuad2 = new ImpErrorQuad[ nWidth ];
-            ImpErrorQuad*   pQLine1 = pErrQuad1;
-            ImpErrorQuad*   pQLine2 = 0;
-            long            nX, nY;
-            long            nYTmp = 0L;
-            BYTE            cIndex;
-            BOOL            bQ1 = TRUE;
+            BitmapColor 	aColor;
+            ImpErrorQuad	aErrQuad;
+            ImpErrorQuad*	pErrQuad1 = new ImpErrorQuad[ nWidth ];
+            ImpErrorQuad*	pErrQuad2 = new ImpErrorQuad[ nWidth ];
+            ImpErrorQuad*	pQLine1 = pErrQuad1;
+            ImpErrorQuad*	pQLine2 = 0;
+            long			nX, nY;
+            long			nYTmp = 0L;
+            BYTE			cIndex;
+            BOOL			bQ1 = TRUE;
 
             if( pExtColor )
             {
@@ -812,8 +812,8 @@ BOOL Bitmap::ImplConvertDown( USHORT nBitCount, Color* pExtColor )
 
         if( bRet )
         {
-            const MapMode   aMap( maPrefMapMode );
-            const Size      aSize( maPrefSize );
+            const MapMode	aMap( maPrefMapMode );
+            const Size		aSize( maPrefSize );
 
             *this = aNewBmp;
 
@@ -829,9 +829,9 @@ BOOL Bitmap::ImplConvertDown( USHORT nBitCount, Color* pExtColor )
 
 BOOL Bitmap::ImplConvertGhosted()
 {
-    Bitmap              aNewBmp;
-    BitmapReadAccess*   pR = AcquireReadAccess();
-    BOOL                bRet = FALSE;
+    Bitmap				aNewBmp;
+    BitmapReadAccess*	pR = AcquireReadAccess();
+    BOOL				bRet = FALSE;
 
     if( pR )
     {
@@ -872,7 +872,7 @@ BOOL Bitmap::ImplConvertGhosted()
                     for( long nX = 0; nX < nWidth; nX++ )
                     {
                         const BitmapColor aOld( pR->GetPixel( nY, nX ) );
-                        pW->SetPixel( nY, nX, BitmapColor( ( aOld.GetRed() >> 1 ) | 0x80,
+                        pW->SetPixel( nY, nX, BitmapColor( ( aOld.GetRed() >> 1 ) | 0x80, 
                                                            ( aOld.GetGreen() >> 1 ) | 0x80,
                                                            ( aOld.GetBlue() >> 1 ) | 0x80 ) );
 
@@ -889,8 +889,8 @@ BOOL Bitmap::ImplConvertGhosted()
 
     if( bRet )
     {
-        const MapMode   aMap( maPrefMapMode );
-        const Size      aSize( maPrefSize );
+        const MapMode	aMap( maPrefMapMode );
+        const Size		aSize( maPrefSize );
 
         *this = aNewBmp;
 
@@ -926,8 +926,8 @@ BOOL Bitmap::Scale( const double& rScaleX, const double& rScaleY, ULONG nScaleFl
 
 BOOL Bitmap::Scale( const Size& rNewSize, ULONG nScaleFlag )
 {
-    const Size  aSize( GetSizePixel() );
-    BOOL        bRet;
+    const Size	aSize( GetSizePixel() );
+    BOOL		bRet;
 
     if( aSize.Width() && aSize.Height() )
     {
@@ -945,27 +945,27 @@ BOOL Bitmap::Scale( const Size& rNewSize, ULONG nScaleFlag )
 
 BOOL Bitmap::ImplScaleFast( const double& rScaleX, const double& rScaleY )
 {
-    const Size  aSizePix( GetSizePixel() );
-    const long  nNewWidth = FRound( aSizePix.Width() * rScaleX );
-    const long  nNewHeight = FRound( aSizePix.Height() * rScaleY );
-    BOOL        bRet = FALSE;
+    const Size	aSizePix( GetSizePixel() );
+    const long	nNewWidth = FRound( aSizePix.Width() * rScaleX );
+    const long	nNewHeight = FRound( aSizePix.Height() * rScaleY );
+    BOOL		bRet = FALSE;
 
     if( nNewWidth && nNewHeight )
     {
-        BitmapReadAccess*   pReadAcc = AcquireReadAccess();
-        Bitmap              aNewBmp( Size( nNewWidth, nNewHeight ), GetBitCount(), &pReadAcc->GetPalette() );
-        BitmapWriteAccess*  pWriteAcc = aNewBmp.AcquireWriteAccess();
+        BitmapReadAccess*	pReadAcc = AcquireReadAccess();
+        Bitmap				aNewBmp( Size( nNewWidth, nNewHeight ), GetBitCount(), &pReadAcc->GetPalette() );
+        BitmapWriteAccess*	pWriteAcc = aNewBmp.AcquireWriteAccess();
 
         if( pReadAcc && pWriteAcc )
         {
-            const long  nScanlineSize = pWriteAcc->GetScanlineSize();
-            const long  nNewWidth1 = nNewWidth - 1L;
-            const long  nNewHeight1 = nNewHeight - 1L;
-            const long  nWidth1 = pReadAcc->Width() - 1L;
-            const long  nHeight1 = pReadAcc->Height() - 1L;
-            long*       pLutX = new long[ nNewWidth ];
-            long*       pLutY = new long[ nNewHeight ];
-            long        nX, nY, nMapY, nActY = 0L;
+            const long	nScanlineSize = pWriteAcc->GetScanlineSize();
+            const long	nNewWidth1 = nNewWidth - 1L;
+            const long	nNewHeight1 = nNewHeight - 1L;
+            const long	nWidth1 = pReadAcc->Width() - 1L;
+            const long	nHeight1 = pReadAcc->Height() - 1L;
+            long*		pLutX = new long[ nNewWidth ];
+            long*		pLutY = new long[ nNewHeight ];
+            long		nX, nY, nMapY, nActY = 0L;
 
             if( nNewWidth1 && nNewHeight1 )
             {
@@ -1013,32 +1013,32 @@ BOOL Bitmap::ImplScaleFast( const double& rScaleX, const double& rScaleY )
 
 BOOL Bitmap::ImplScaleInterpolate( const double& rScaleX, const double& rScaleY )
 {
-    const Size  aSizePix( GetSizePixel() );
-    const long  nNewWidth = FRound( aSizePix.Width() * rScaleX );
-    const long  nNewHeight = FRound( aSizePix.Height() * rScaleY );
-    BOOL        bRet = FALSE;
+    const Size	aSizePix( GetSizePixel() );
+    const long	nNewWidth = FRound( aSizePix.Width() * rScaleX );
+    const long	nNewHeight = FRound( aSizePix.Height() * rScaleY );
+    BOOL		bRet = FALSE;
 
     if( ( nNewWidth > 1L ) && ( nNewHeight > 1L ) )
     {
-        BitmapColor         aCol0;
-        BitmapColor         aCol1;
-        BitmapReadAccess*   pReadAcc = AcquireReadAccess();
-        long                nWidth = pReadAcc->Width();
-        long                nHeight = pReadAcc->Height();
-        Bitmap              aNewBmp( Size( nNewWidth, nHeight ), 24 );
-        BitmapWriteAccess*  pWriteAcc = aNewBmp.AcquireWriteAccess();
-        long*               pLutInt;
-        long*               pLutFrac;
-        long                nX, nY;
-        long                lXB0, lXB1, lXG0, lXG1, lXR0, lXR1;
-        double              fTemp;
-        long                nTemp;
+        BitmapColor 		aCol0;
+        BitmapColor 		aCol1;
+        BitmapReadAccess*	pReadAcc = AcquireReadAccess();
+        long				nWidth = pReadAcc->Width();
+        long				nHeight = pReadAcc->Height();
+        Bitmap				aNewBmp( Size( nNewWidth, nHeight ), 24 );
+        BitmapWriteAccess*	pWriteAcc = aNewBmp.AcquireWriteAccess();
+        long*				pLutInt;
+        long*				pLutFrac;
+        long				nX, nY;
+        long				lXB0, lXB1, lXG0, lXG1, lXR0, lXR1;
+        double				fTemp;
+        long				nTemp;
 
         if( pReadAcc && pWriteAcc )
         {
-            const long      nNewWidth1 = nNewWidth - 1L;
-            const long      nWidth1 = pReadAcc->Width() - 1L;
-            const double    fRevScaleX = (double) nWidth1 / nNewWidth1;
+            const long		nNewWidth1 = nNewWidth - 1L;
+            const long		nWidth1 = pReadAcc->Width() - 1L;
+            const double	fRevScaleX = (double) nWidth1 / nNewWidth1;
 
             pLutInt = new long[ nNewWidth ];
             pLutFrac = new long[ nNewWidth ];
@@ -1140,9 +1140,9 @@ BOOL Bitmap::ImplScaleInterpolate( const double& rScaleX, const double& rScaleY
 
             if( pReadAcc && pWriteAcc )
             {
-                const long      nNewHeight1 = nNewHeight - 1L;
-                const long      nHeight1 = pReadAcc->Height() - 1L;
-                const double    fRevScaleY = (double) nHeight1 / nNewHeight1;
+                const long		nNewHeight1 = nNewHeight - 1L;
+                const long		nHeight1 = pReadAcc->Height() - 1L;
+                const double	fRevScaleY = (double) nHeight1 / nNewHeight1;
 
                 pLutInt = new long[ nNewHeight ];
                 pLutFrac = new long[ nNewHeight ];
@@ -1269,16 +1269,16 @@ BOOL Bitmap::Dither( ULONG nDitherFlags )
 
 BOOL Bitmap::ImplDitherMatrix()
 {
-    BitmapReadAccess*   pReadAcc = AcquireReadAccess();
-    Bitmap              aNewBmp( GetSizePixel(), 8 );
-    BitmapWriteAccess*  pWriteAcc = aNewBmp.AcquireWriteAccess();
-    BOOL                bRet = FALSE;
+    BitmapReadAccess*	pReadAcc = AcquireReadAccess();
+    Bitmap				aNewBmp( GetSizePixel(), 8 );
+    BitmapWriteAccess*	pWriteAcc = aNewBmp.AcquireWriteAccess();
+    BOOL				bRet = FALSE;
 
     if( pReadAcc && pWriteAcc )
     {
-        const ULONG nWidth = pReadAcc->Width();
-        const ULONG nHeight = pReadAcc->Height();
-        BitmapColor aIndex( (BYTE) 0 );
+        const ULONG	nWidth = pReadAcc->Width();
+        const ULONG	nHeight = pReadAcc->Height();
+        BitmapColor	aIndex( (BYTE) 0 );
 
         if( pReadAcc->HasPalette() )
         {
@@ -1286,11 +1286,11 @@ BOOL Bitmap::ImplDitherMatrix()
             {
                 for( ULONG nX = 0UL, nModY = ( nY & 0x0FUL ) << 4UL; nX < nWidth; nX++ )
                 {
-                    const BitmapColor   aCol( pReadAcc->GetPaletteColor( pReadAcc->GetPixel( nY, nX ) ) );
-                    const ULONG         nD = nVCLDitherLut[ nModY + ( nX & 0x0FUL ) ];
-                    const ULONG         nR = ( nVCLLut[ aCol.GetRed() ] + nD ) >> 16UL;
-                    const ULONG         nG = ( nVCLLut[ aCol.GetGreen() ] + nD ) >> 16UL;
-                    const ULONG         nB = ( nVCLLut[ aCol.GetBlue() ] + nD ) >> 16UL;
+                    const BitmapColor	aCol( pReadAcc->GetPaletteColor( pReadAcc->GetPixel( nY, nX ) ) );
+                    const ULONG			nD = nVCLDitherLut[ nModY + ( nX & 0x0FUL ) ];
+                    const ULONG			nR = ( nVCLLut[ aCol.GetRed() ] + nD ) >> 16UL;
+                    const ULONG			nG = ( nVCLLut[ aCol.GetGreen() ] + nD ) >> 16UL;
+                    const ULONG			nB = ( nVCLLut[ aCol.GetBlue() ] + nD ) >> 16UL;
 
                     aIndex.SetIndex( (BYTE) ( nVCLRLut[ nR ] + nVCLGLut[ nG ] + nVCLBLut[ nB ] ) );
                     pWriteAcc->SetPixel( nY, nX, aIndex );
@@ -1303,11 +1303,11 @@ BOOL Bitmap::ImplDitherMatrix()
             {
                 for( ULONG nX = 0UL, nModY = ( nY & 0x0FUL ) << 4UL; nX < nWidth; nX++ )
                 {
-                    const BitmapColor   aCol( pReadAcc->GetPixel( nY, nX ) );
-                    const ULONG         nD = nVCLDitherLut[ nModY + ( nX & 0x0FUL ) ];
-                    const ULONG         nR = ( nVCLLut[ aCol.GetRed() ] + nD ) >> 16UL;
-                    const ULONG         nG = ( nVCLLut[ aCol.GetGreen() ] + nD ) >> 16UL;
-                    const ULONG         nB = ( nVCLLut[ aCol.GetBlue() ] + nD ) >> 16UL;
+                    const BitmapColor	aCol( pReadAcc->GetPixel( nY, nX ) );
+                    const ULONG			nD = nVCLDitherLut[ nModY + ( nX & 0x0FUL ) ];
+                    const ULONG			nR = ( nVCLLut[ aCol.GetRed() ] + nD ) >> 16UL;
+                    const ULONG			nG = ( nVCLLut[ aCol.GetGreen() ] + nD ) >> 16UL;
+                    const ULONG			nB = ( nVCLLut[ aCol.GetBlue() ] + nD ) >> 16UL;
 
                     aIndex.SetIndex( (BYTE) ( nVCLRLut[ nR ] + nVCLGLut[ nG ] + nVCLBLut[ nB ] ) );
                     pWriteAcc->SetPixel( nY, nX, aIndex );
@@ -1323,8 +1323,8 @@ BOOL Bitmap::ImplDitherMatrix()
 
     if( bRet )
     {
-        const MapMode   aMap( maPrefMapMode );
-        const Size      aSize( maPrefSize );
+        const MapMode	aMap( maPrefMapMode );
+        const Size		aSize( maPrefSize );
 
         *this = aNewBmp;
 
@@ -1339,34 +1339,34 @@ BOOL Bitmap::ImplDitherMatrix()
 
 BOOL Bitmap::ImplDitherFloyd()
 {
-    const Size  aSize( GetSizePixel() );
-    BOOL        bRet = FALSE;
+    const Size	aSize( GetSizePixel() );
+    BOOL		bRet = FALSE;
 
     if( ( aSize.Width() > 3 ) && ( aSize.Height() > 2 ) )
     {
-        BitmapReadAccess*   pReadAcc = AcquireReadAccess();
-        Bitmap              aNewBmp( GetSizePixel(), 8 );
-        BitmapWriteAccess*  pWriteAcc = aNewBmp.AcquireWriteAccess();
+        BitmapReadAccess*	pReadAcc = AcquireReadAccess();
+        Bitmap				aNewBmp( GetSizePixel(), 8 );
+        BitmapWriteAccess*	pWriteAcc = aNewBmp.AcquireWriteAccess();
 
         if( pReadAcc && pWriteAcc )
         {
-            BitmapColor aColor;
-            long        nWidth = pReadAcc->Width();
-            long        nWidth1 = nWidth - 1L;
-            long        nHeight = pReadAcc->Height();
-            long        nX;
-            long        nW = nWidth * 3L;
-            long        nW2 = nW - 3L;
-            long        nRErr, nGErr, nBErr;
-            long        nRC, nGC, nBC;
-            long        nTemp;
-            long        nZ;
-            long*       p1 = new long[ nW ];
-            long*       p2 = new long[ nW ];
-            long*       p1T = p1;
-            long*       p2T = p2;
-            long*       pTmp;
-            BOOL        bPal = pReadAcc->HasPalette();
+            BitmapColor	aColor;
+            long		nWidth = pReadAcc->Width();
+            long		nWidth1 = nWidth - 1L;
+            long		nHeight = pReadAcc->Height();
+            long		nX;
+            long		nW = nWidth * 3L;
+            long		nW2 = nW - 3L;
+            long		nRErr, nGErr, nBErr;
+            long		nRC, nGC, nBC;
+            long		nTemp;
+            long		nZ;
+            long*		p1 = new long[ nW ];
+            long*		p2 = new long[ nW ];
+            long*		p1T = p1;
+            long*		p2T = p2;
+            long*		pTmp;
+            BOOL		bPal = pReadAcc->HasPalette();
 
             pTmp = p2T;
 
@@ -1463,8 +1463,8 @@ BOOL Bitmap::ImplDitherFloyd()
 
         if( bRet )
         {
-            const MapMode   aMap( maPrefMapMode );
-            const Size      aPrefSize( maPrefSize );
+            const MapMode	aMap( maPrefMapMode );
+            const Size		aPrefSize( maPrefSize );
 
             *this = aNewBmp;
 
@@ -1480,26 +1480,26 @@ BOOL Bitmap::ImplDitherFloyd()
 
 BOOL Bitmap::ImplDitherFloyd16()
 {
-    BitmapReadAccess*   pReadAcc = AcquireReadAccess();
-    Bitmap              aNewBmp( GetSizePixel(), 24 );
-    BitmapWriteAccess*  pWriteAcc = aNewBmp.AcquireWriteAccess();
-    BOOL                bRet = FALSE;
+    BitmapReadAccess*	pReadAcc = AcquireReadAccess();
+    Bitmap				aNewBmp( GetSizePixel(), 24 );
+    BitmapWriteAccess*	pWriteAcc = aNewBmp.AcquireWriteAccess();
+    BOOL				bRet = FALSE;
 
     if( pReadAcc && pWriteAcc )
     {
-        const long      nWidth = pWriteAcc->Width();
-        const long      nWidth1 = nWidth - 1L;
-        const long      nHeight = pWriteAcc->Height();
-        BitmapColor     aColor;
-        BitmapColor     aBestCol;
-        ImpErrorQuad    aErrQuad;
-        ImpErrorQuad*   pErrQuad1 = new ImpErrorQuad[ nWidth ];
-        ImpErrorQuad*   pErrQuad2 = new ImpErrorQuad[ nWidth ];
-        ImpErrorQuad*   pQLine1 = pErrQuad1;
-        ImpErrorQuad*   pQLine2 = 0;
-        long            nX, nY;
-        long            nYTmp = 0L;
-        BOOL            bQ1 = TRUE;
+        const long		nWidth = pWriteAcc->Width();
+        const long		nWidth1 = nWidth - 1L;
+        const long		nHeight = pWriteAcc->Height();
+        BitmapColor 	aColor;
+        BitmapColor		aBestCol;
+        ImpErrorQuad	aErrQuad;
+        ImpErrorQuad*	pErrQuad1 = new ImpErrorQuad[ nWidth ];
+        ImpErrorQuad*	pErrQuad2 = new ImpErrorQuad[ nWidth ];
+        ImpErrorQuad*	pQLine1 = pErrQuad1;
+        ImpErrorQuad*	pQLine2 = 0;
+        long			nX, nY;
+        long			nYTmp = 0L;
+        BOOL			bQ1 = TRUE;
 
         for( nY = 0L; nY < Min( nHeight, 2L ); nY++, nYTmp++ )
             for( nX = 0L, pQLine2 = !nY ? pErrQuad1 : pErrQuad2; nX < nWidth; nX++ )
@@ -1555,8 +1555,8 @@ BOOL Bitmap::ImplDitherFloyd16()
 
     if( bRet )
     {
-        const MapMode   aMap( maPrefMapMode );
-        const Size      aSize( maPrefSize );
+        const MapMode	aMap( maPrefMapMode );
+        const Size		aSize( maPrefSize );
 
         *this = aNewBmp;
 
@@ -1594,11 +1594,11 @@ BOOL Bitmap::ReduceColors( USHORT nColorCount, BmpReduce eReduce )
 
 BOOL Bitmap::ImplReduceSimple( USHORT nColorCount )
 {
-    Bitmap              aNewBmp;
-    BitmapReadAccess*   pRAcc = AcquireReadAccess();
-    const USHORT        nColCount = Min( nColorCount, (USHORT) 256 );
-    USHORT              nBitCount;
-    BOOL                bRet = FALSE;
+    Bitmap				aNewBmp;
+    BitmapReadAccess*	pRAcc = AcquireReadAccess();
+    const USHORT		nColCount = Min( nColorCount, (USHORT) 256 );
+    USHORT				nBitCount;
+    BOOL				bRet = FALSE;
 
     if( nColCount <= 2 )
         nBitCount = 1;
@@ -1609,9 +1609,9 @@ BOOL Bitmap::ImplReduceSimple( USHORT nColorCount )
 
     if( pRAcc )
     {
-        Octree                  aOct( *pRAcc, nColCount );
-        const BitmapPalette&    rPal = aOct.GetPalette();
-        BitmapWriteAccess*      pWAcc;
+        Octree					aOct( *pRAcc, nColCount );
+        const BitmapPalette&	rPal = aOct.GetPalette();
+        BitmapWriteAccess*		pWAcc;
 
         aNewBmp = Bitmap( GetSizePixel(), nBitCount, &rPal );
         pWAcc = aNewBmp.AcquireWriteAccess();
@@ -1643,8 +1643,8 @@ BOOL Bitmap::ImplReduceSimple( USHORT nColorCount )
 
     if( bRet )
     {
-        const MapMode   aMap( maPrefMapMode );
-        const Size      aSize( maPrefSize );
+        const MapMode	aMap( maPrefMapMode );
+        const Size		aSize( maPrefSize );
 
         *this = aNewBmp;
         maPrefMapMode = aMap;
@@ -1658,8 +1658,8 @@ BOOL Bitmap::ImplReduceSimple( USHORT nColorCount )
 
 struct PopularColorCount
 {
-    sal_uInt32  mnIndex;
-    sal_uInt32  mnCount;
+    sal_uInt32	mnIndex;
+    sal_uInt32	mnCount;
 };
 
 // ------------------------------------------------------------------------
@@ -1670,11 +1670,11 @@ extern "C" int __LOADONCALLAPI ImplPopularCmpFnc( const void* p1, const void* p2
 
     if( ( (PopularColorCount*) p1 )->mnCount < ( (PopularColorCount*) p2 )->mnCount )
         nRet = 1;
-    else if( ( (PopularColorCount*) p1 )->mnCount == ( (PopularColorCount*) p2 )->mnCount )
+    else if( ( (PopularColorCount*) p1 )->mnCount == ( (PopularColorCount*) p2 )->mnCount ) 
         nRet = 0;
     else
         nRet = -1;
-
+    
     return nRet;
 }
 
@@ -1682,9 +1682,9 @@ extern "C" int __LOADONCALLAPI ImplPopularCmpFnc( const void* p1, const void* p2
 
 BOOL Bitmap::ImplReducePopular( USHORT nColCount )
 {
-    BitmapReadAccess*   pRAcc = AcquireReadAccess();
-    USHORT              nBitCount;
-    BOOL                bRet = FALSE;
+    BitmapReadAccess*	pRAcc = AcquireReadAccess();
+    USHORT				nBitCount;
+    BOOL				bRet = FALSE;
 
     if( nColCount > 256 )
         nColCount = 256;
@@ -1696,17 +1696,17 @@ BOOL Bitmap::ImplReducePopular( USHORT nColCount )
 
     if( pRAcc )
     {
-        const sal_uInt32    nValidBits = 4;
-        const sal_uInt32    nRightShiftBits = 8 - nValidBits;
-        const sal_uInt32    nLeftShiftBits1 = nValidBits;
-        const sal_uInt32    nLeftShiftBits2 = nValidBits << 1;
-        const sal_uInt32    nColorsPerComponent = 1 << nValidBits;
-        const sal_uInt32    nColorOffset = 256 / nColorsPerComponent;
-        const sal_uInt32    nTotalColors = nColorsPerComponent * nColorsPerComponent * nColorsPerComponent;
-        const long          nWidth = pRAcc->Width();
-        const long          nHeight = pRAcc->Height();
-        PopularColorCount*  pCountTable = new PopularColorCount[ nTotalColors ];
-        long                nX, nY, nR, nG, nB, nIndex;
+        const sal_uInt32	nValidBits = 4;
+        const sal_uInt32	nRightShiftBits = 8 - nValidBits;
+        const sal_uInt32	nLeftShiftBits1 = nValidBits;
+        const sal_uInt32	nLeftShiftBits2 = nValidBits << 1;
+        const sal_uInt32	nColorsPerComponent = 1 << nValidBits;
+        const sal_uInt32	nColorOffset = 256 / nColorsPerComponent;
+        const sal_uInt32	nTotalColors = nColorsPerComponent * nColorsPerComponent * nColorsPerComponent;
+        const long			nWidth = pRAcc->Width();
+        const long			nHeight = pRAcc->Height();
+        PopularColorCount*	pCountTable = new PopularColorCount[ nTotalColors ];
+        long				nX, nY, nR, nG, nB, nIndex;
 
         rtl_zeroMemory( pCountTable, nTotalColors * sizeof( PopularColorCount ) );
 
@@ -1730,7 +1730,7 @@ BOOL Bitmap::ImplReducePopular( USHORT nColCount )
                 {
                     const BitmapColor& rCol = pRAcc->GetPaletteColor( pRAcc->GetPixel( nY, nX ) );
                     pCountTable[ ( ( ( (sal_uInt32) rCol.GetRed() ) >> nRightShiftBits ) << nLeftShiftBits2 ) |
-                                 ( ( ( (sal_uInt32) rCol.GetGreen() ) >> nRightShiftBits ) << nLeftShiftBits1 ) |
+                                 ( ( ( (sal_uInt32) rCol.GetGreen() ) >> nRightShiftBits ) << nLeftShiftBits1 ) | 
                                  ( ( (sal_uInt32) rCol.GetBlue() ) >> nRightShiftBits ) ].mnCount++;
                 }
             }
@@ -1743,8 +1743,8 @@ BOOL Bitmap::ImplReducePopular( USHORT nColCount )
                 {
                     const BitmapColor aCol( pRAcc->GetPixel( nY, nX ) );
                     pCountTable[ ( ( ( (sal_uInt32) aCol.GetRed() ) >> nRightShiftBits ) << nLeftShiftBits2 ) |
-                                 ( ( ( (sal_uInt32) aCol.GetGreen() ) >> nRightShiftBits ) << nLeftShiftBits1 ) |
-                                 ( ( (sal_uInt32) aCol.GetBlue() ) >> nRightShiftBits ) ].mnCount++;
+                                 ( ( ( (sal_uInt32) aCol.GetGreen() ) >> nRightShiftBits ) << nLeftShiftBits1 ) | 
+                                 ( ( (sal_uInt32) aCol.GetBlue() ) >> nRightShiftBits ) ].mnCount++;				
                 }
             }
         }
@@ -1752,22 +1752,22 @@ BOOL Bitmap::ImplReducePopular( USHORT nColCount )
         BitmapPalette aNewPal( nColCount );
 
         qsort( pCountTable, nTotalColors, sizeof( PopularColorCount ), ImplPopularCmpFnc );
-
+        
         for( USHORT n = 0; n < nColCount; n++ )
         {
             const PopularColorCount& rPop = pCountTable[ n ];
-            aNewPal[ n ] = BitmapColor( (BYTE) ( ( rPop.mnIndex >> nLeftShiftBits2 ) << nRightShiftBits ),
+            aNewPal[ n ] = BitmapColor( (BYTE) ( ( rPop.mnIndex >> nLeftShiftBits2 ) << nRightShiftBits ), 
                                         (BYTE) ( ( ( rPop.mnIndex >> nLeftShiftBits1 ) & ( nColorsPerComponent - 1 ) ) << nRightShiftBits ),
                                         (BYTE) ( ( rPop.mnIndex & ( nColorsPerComponent - 1 ) ) << nRightShiftBits ) );
         }
 
-        Bitmap              aNewBmp( GetSizePixel(), nBitCount, &aNewPal );
-        BitmapWriteAccess*  pWAcc = aNewBmp.AcquireWriteAccess();
+        Bitmap				aNewBmp( GetSizePixel(), nBitCount, &aNewPal );
+        BitmapWriteAccess*	pWAcc = aNewBmp.AcquireWriteAccess();
 
         if( pWAcc )
         {
-            BitmapColor aDstCol( (BYTE) 0 );
-            BYTE*       pIndexMap = new BYTE[ nTotalColors ];
+            BitmapColor	aDstCol( (BYTE) 0 );
+            BYTE*		pIndexMap = new BYTE[ nTotalColors ];
 
             for( nR = 0, nIndex = 0; nR < 256; nR += nColorOffset )
                 for( nG = 0; nG < 256; nG += nColorOffset )
@@ -1782,7 +1782,7 @@ BOOL Bitmap::ImplReducePopular( USHORT nColCount )
                     {
                         const BitmapColor& rCol = pRAcc->GetPaletteColor( pRAcc->GetPixel( nY, nX ) );
                         aDstCol.SetIndex( pIndexMap[ ( ( ( (sal_uInt32) rCol.GetRed() ) >> nRightShiftBits ) << nLeftShiftBits2 ) |
-                                                     ( ( ( (sal_uInt32) rCol.GetGreen() ) >> nRightShiftBits ) << nLeftShiftBits1 ) |
+                                                     ( ( ( (sal_uInt32) rCol.GetGreen() ) >> nRightShiftBits ) << nLeftShiftBits1 ) | 
                                                      ( ( (sal_uInt32) rCol.GetBlue() ) >> nRightShiftBits ) ] );
                         pWAcc->SetPixel( nY, nX, aDstCol );
                     }
@@ -1796,7 +1796,7 @@ BOOL Bitmap::ImplReducePopular( USHORT nColCount )
                     {
                         const BitmapColor aCol( pRAcc->GetPixel( nY, nX ) );
                         aDstCol.SetIndex( pIndexMap[ ( ( ( (sal_uInt32) aCol.GetRed() ) >> nRightShiftBits ) << nLeftShiftBits2 ) |
-                                                     ( ( ( (sal_uInt32) aCol.GetGreen() ) >> nRightShiftBits ) << nLeftShiftBits1 ) |
+                                                     ( ( ( (sal_uInt32) aCol.GetGreen() ) >> nRightShiftBits ) << nLeftShiftBits1 ) | 
                                                      ( ( (sal_uInt32) aCol.GetBlue() ) >> nRightShiftBits ) ] );
                         pWAcc->SetPixel( nY, nX, aDstCol );
                     }
@@ -1813,8 +1813,8 @@ BOOL Bitmap::ImplReducePopular( USHORT nColCount )
 
         if( bRet )
         {
-            const MapMode   aMap( maPrefMapMode );
-            const Size      aSize( maPrefSize );
+            const MapMode	aMap( maPrefMapMode );
+            const Size		aSize( maPrefSize );
 
             *this = aNewBmp;
             maPrefMapMode = aMap;
@@ -1829,9 +1829,9 @@ BOOL Bitmap::ImplReducePopular( USHORT nColCount )
 
 BOOL Bitmap::ImplReduceMedian( USHORT nColCount )
 {
-    BitmapReadAccess*   pRAcc = AcquireReadAccess();
-    USHORT              nBitCount;
-    BOOL                bRet = FALSE;
+    BitmapReadAccess*	pRAcc = AcquireReadAccess();
+    USHORT				nBitCount;
+    BOOL				bRet = FALSE;
 
     if( nColCount < 17 )
         nBitCount = 4;
@@ -1846,16 +1846,16 @@ BOOL Bitmap::ImplReduceMedian( USHORT nColCount )
 
     if( pRAcc )
     {
-        Bitmap              aNewBmp( GetSizePixel(), nBitCount );
-        BitmapWriteAccess*  pWAcc = aNewBmp.AcquireWriteAccess();
+        Bitmap				aNewBmp( GetSizePixel(), nBitCount );
+        BitmapWriteAccess*	pWAcc = aNewBmp.AcquireWriteAccess();
 
         if( pWAcc )
         {
-            const ULONG nSize = 32768UL * sizeof( ULONG );
-            ULONG*      pColBuf = (ULONG*) rtl_allocateMemory( nSize );
-            const long  nWidth = pWAcc->Width();
-            const long  nHeight = pWAcc->Height();
-            long        nIndex = 0L;
+            const ULONG	nSize = 32768UL * sizeof( ULONG );
+            ULONG*		pColBuf = (ULONG*) rtl_allocateMemory( nSize );
+            const long	nWidth = pWAcc->Width();
+            const long	nHeight = pWAcc->Height();
+            long		nIndex = 0L;
 
             memset( (HPBYTE) pColBuf, 0, nSize );
 
@@ -1885,7 +1885,7 @@ BOOL Bitmap::ImplReduceMedian( USHORT nColCount )
 
             // create palette via median cut
             BitmapPalette aPal( pWAcc->GetPaletteEntryCount() );
-            ImplMedianCut( pColBuf, aPal, 0, 31, 0, 31, 0, 31,
+            ImplMedianCut( pColBuf, aPal, 0, 31, 0, 31, 0, 31, 
                            nColCount, nWidth * nHeight, nIndex );
 
             // do mapping of colors to palette
@@ -1904,8 +1904,8 @@ BOOL Bitmap::ImplReduceMedian( USHORT nColCount )
 
         if( bRet )
         {
-            const MapMode   aMap( maPrefMapMode );
-            const Size      aSize( maPrefSize );
+            const MapMode	aMap( maPrefMapMode );
+            const Size		aSize( maPrefSize );
 
             *this = aNewBmp;
             maPrefMapMode = aMap;
@@ -1918,19 +1918,19 @@ BOOL Bitmap::ImplReduceMedian( USHORT nColCount )
 
 // ------------------------------------------------------------------------
 
-void Bitmap::ImplMedianCut( ULONG* pColBuf, BitmapPalette& rPal,
+void Bitmap::ImplMedianCut( ULONG* pColBuf, BitmapPalette& rPal, 
                             long nR1, long nR2, long nG1, long nG2, long nB1, long nB2,
                             long nColors, long nPixels, long& rIndex )
 {
     if( !nPixels )
         return;
 
-    BitmapColor aCol;
-    const long  nRLen = nR2 - nR1;
-    const long  nGLen = nG2 - nG1;
-    const long  nBLen = nB2 - nB1;
-    long        nR, nG, nB;
-    ULONG*      pBuf = pColBuf;
+    BitmapColor	aCol;
+    const long	nRLen = nR2 - nR1;
+    const long	nGLen = nG2 - nG1; 
+    const long	nBLen = nB2 - nB1;
+    long 		nR, nG, nB;
+    ULONG*		pBuf = pColBuf;
 
     if( !nRLen && !nGLen && !nBLen )
     {
@@ -1973,9 +1973,9 @@ void Bitmap::ImplMedianCut( ULONG* pColBuf, BitmapPalette& rPal,
         }
         else
         {
-            const long  nTest = ( nPixels >> 1 );
-            long        nPixOld = 0;
-            long        nPixNew = 0;
+            const long	nTest = ( nPixels >> 1 );
+            long		nPixOld = 0;
+            long		nPixNew = 0;
 
             if( nBLen > nGLen && nBLen > nRLen )
             {
@@ -2073,7 +2073,7 @@ BOOL Bitmap::Adjust( short nLuminancePercent, short nContrastPercent,
     BOOL bRet = FALSE;
 
     // nothing to do => return quickly
-    if( !nLuminancePercent && !nContrastPercent &&
+    if( !nLuminancePercent && !nContrastPercent && 
         !nChannelRPercent && !nChannelGPercent && !nChannelBPercent &&
         ( fGamma == 1.0 ) && !bInvert )
     {
@@ -2085,15 +2085,15 @@ BOOL Bitmap::Adjust( short nLuminancePercent, short nContrastPercent,
 
         if( pAcc )
         {
-            BitmapColor     aCol;
-            const long      nW = pAcc->Width();
-            const long      nH = pAcc->Height();
-            BYTE*           cMapR = new BYTE[ 256 ];
-            BYTE*           cMapG = new BYTE[ 256 ];
-            BYTE*           cMapB = new BYTE[ 256 ];
-            long            nX, nY;
-            double          fM, fROff, fGOff, fBOff, fOff;
-
+            BitmapColor		aCol;
+            const long		nW = pAcc->Width();
+            const long		nH = pAcc->Height();
+            BYTE*			cMapR = new BYTE[ 256 ];
+            BYTE*			cMapG = new BYTE[ 256 ];
+            BYTE*			cMapB = new BYTE[ 256 ];
+            long			nX, nY;
+            double			fM, fROff, fGOff, fBOff, fOff;
+            
             // calculate slope
             if( nContrastPercent >= 0 )
                 fM = 128.0 / ( 128.0 - 1.27 * MinMax( nContrastPercent, 0L, 100L ) );
@@ -2141,7 +2141,7 @@ BOOL Bitmap::Adjust( short nLuminancePercent, short nContrastPercent,
 
                 for( USHORT i = 0, nCount = pAcc->GetPaletteEntryCount(); i < nCount; i++ )
                 {
-                    const BitmapColor& rCol = pAcc->GetPaletteColor( i );
+                    const BitmapColor& rCol = pAcc->GetPaletteColor( i ); 
                     aNewCol.SetRed( cMapR[ rCol.GetRed() ] );
                     aNewCol.SetGreen( cMapG[ rCol.GetGreen() ] );
                     aNewCol.SetBlue( cMapB[ rCol.GetBlue() ] );
diff --git a/vcl/source/gdi/bitmap4.cxx b/vcl/source/gdi/bitmap4.cxx
index b64bcd8fe540..00d8abd59197 100644
--- a/vcl/source/gdi/bitmap4.cxx
+++ b/vcl/source/gdi/bitmap4.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
@@ -37,13 +37,13 @@
 // - Defines -
 // -----------
 
-#define S2(a,b)             { register long t; if( ( t = b - a ) < 0 ) { a += t; b -= t; } }
-#define MN3(a,b,c)          S2(a,b); S2(a,c);
-#define MX3(a,b,c)          S2(b,c); S2(a,c);
-#define MNMX3(a,b,c)        MX3(a,b,c); S2(a,b);
-#define MNMX4(a,b,c,d)      S2(a,b); S2(c,d); S2(a,c); S2(b,d);
-#define MNMX5(a,b,c,d,e)    S2(a,b); S2(c,d); MN3(a,c,e); MX3(b,d,e);
-#define MNMX6(a,b,c,d,e,f)  S2(a,d); S2(b,e); S2(c,f); MN3(a,b,c); MX3(d,e,f);
+#define S2(a,b)				{ register long t; if( ( t = b - a ) < 0 ) { a += t; b -= t; } }
+#define MN3(a,b,c)			S2(a,b); S2(a,c);
+#define MX3(a,b,c)			S2(b,c); S2(a,c);
+#define MNMX3(a,b,c)		MX3(a,b,c); S2(a,b);
+#define MNMX4(a,b,c,d)		S2(a,b); S2(c,d); S2(a,c); S2(b,d);
+#define MNMX5(a,b,c,d,e)	S2(a,b); S2(c,d); MN3(a,c,e); MX3(b,d,e);
+#define MNMX6(a,b,c,d,e,f)	S2(a,d); S2(b,e); S2(c,f); MN3(a,b,c); MX3(d,e,f);
 
 // ----------
 // - Bitmap -
@@ -110,30 +110,30 @@ BOOL Bitmap::Filter( BmpFilter eFilter, const BmpFilterParam* pFilterParam, cons
 BOOL Bitmap::ImplConvolute3( const long* pMatrix, long nDivisor,
                              const BmpFilterParam* /*pFilterParam*/, const Link* /*pProgress*/ )
 {
-    BitmapReadAccess*   pReadAcc = AcquireReadAccess();
-    BOOL                bRet = FALSE;
+    BitmapReadAccess*	pReadAcc = AcquireReadAccess();
+    BOOL				bRet = FALSE;
 
     if( pReadAcc )
     {
-        Bitmap              aNewBmp( GetSizePixel(), 24 );
-        BitmapWriteAccess*  pWriteAcc = aNewBmp.AcquireWriteAccess();
+        Bitmap				aNewBmp( GetSizePixel(), 24 );
+        BitmapWriteAccess*	pWriteAcc = aNewBmp.AcquireWriteAccess();
 
         if( pWriteAcc )
         {
-            const long      nWidth = pWriteAcc->Width(), nWidth2 = nWidth + 2;
-            const long      nHeight = pWriteAcc->Height(), nHeight2 = nHeight + 2;
-            long*           pColm = new long[ nWidth2 ];
-            long*           pRows = new long[ nHeight2 ];
-            BitmapColor*    pColRow1 = (BitmapColor*) new BYTE[ sizeof( BitmapColor ) * nWidth2 ];
-            BitmapColor*    pColRow2 = (BitmapColor*) new BYTE[ sizeof( BitmapColor ) * nWidth2 ];
-            BitmapColor*    pColRow3 = (BitmapColor*) new BYTE[ sizeof( BitmapColor ) * nWidth2 ];
-            BitmapColor*    pRowTmp1 = pColRow1;
-            BitmapColor*    pRowTmp2 = pColRow2;
-            BitmapColor*    pRowTmp3 = pColRow3;
-            BitmapColor*    pColor;
-            long            nY, nX, i, nSumR, nSumG, nSumB, nMatrixVal, nTmp;
-            long            (*pKoeff)[ 256 ] = new long[ 9 ][ 256 ];
-            long*           pTmp;
+            const long		nWidth = pWriteAcc->Width(), nWidth2 = nWidth + 2;
+            const long		nHeight = pWriteAcc->Height(), nHeight2 = nHeight + 2;
+            long*			pColm = new long[ nWidth2 ];
+            long*			pRows = new long[ nHeight2 ];
+            BitmapColor*	pColRow1 = (BitmapColor*) new BYTE[ sizeof( BitmapColor ) * nWidth2 ];
+            BitmapColor*	pColRow2 = (BitmapColor*) new BYTE[ sizeof( BitmapColor ) * nWidth2 ];
+            BitmapColor*	pColRow3 = (BitmapColor*) new BYTE[ sizeof( BitmapColor ) * nWidth2 ];
+            BitmapColor*	pRowTmp1 = pColRow1;
+            BitmapColor*	pRowTmp2 = pColRow2;
+            BitmapColor*	pRowTmp3 = pColRow3;
+            BitmapColor*	pColor;
+            long			nY, nX, i, nSumR, nSumG, nSumB, nMatrixVal, nTmp;
+            long			(*pKoeff)[ 256 ] = new long[ 9 ][ 256 ];
+            long*			pTmp;
 
             // create LUT of products of matrix value and possible color component values
             for( nY = 0; nY < 9; nY++ )
@@ -143,13 +143,13 @@ BOOL Bitmap::ImplConvolute3( const long* pMatrix, long nDivisor,
             // create column LUT
             for( i = 0; i < nWidth2; i++ )
                 pColm[ i ] = ( i > 0 ) ? ( i - 1 ) : 0;
-
+            
             pColm[ nWidth + 1 ] = pColm[ nWidth ];
 
             // create row LUT
             for( i = 0; i < nHeight2; i++ )
                 pRows[ i ] = ( i > 0 ) ? ( i - 1 ) : 0;
-
+            
             pRows[ nHeight + 1 ] = pRows[ nHeight ];
 
             // read first three rows of bitmap color
@@ -240,8 +240,8 @@ BOOL Bitmap::ImplConvolute3( const long* pMatrix, long nDivisor,
 
         if( bRet )
         {
-            const MapMode   aMap( maPrefMapMode );
-            const Size      aSize( maPrefSize );
+            const MapMode	aMap( maPrefMapMode );
+            const Size		aSize( maPrefSize );
 
             *this = aNewBmp;
 
@@ -257,42 +257,42 @@ BOOL Bitmap::ImplConvolute3( const long* pMatrix, long nDivisor,
 
 BOOL Bitmap::ImplMedianFilter( const BmpFilterParam* /*pFilterParam*/, const Link* /*pProgress*/ )
 {
-    BitmapReadAccess*   pReadAcc = AcquireReadAccess();
-    BOOL                bRet = FALSE;
+    BitmapReadAccess*	pReadAcc = AcquireReadAccess();
+    BOOL				bRet = FALSE;
 
     if( pReadAcc )
     {
-        Bitmap              aNewBmp( GetSizePixel(), 24 );
-        BitmapWriteAccess*  pWriteAcc = aNewBmp.AcquireWriteAccess();
+        Bitmap				aNewBmp( GetSizePixel(), 24 );
+        BitmapWriteAccess*	pWriteAcc = aNewBmp.AcquireWriteAccess();
 
         if( pWriteAcc )
         {
-            const long      nWidth = pWriteAcc->Width(), nWidth2 = nWidth + 2;
-            const long      nHeight = pWriteAcc->Height(), nHeight2 = nHeight + 2;
-            long*           pColm = new long[ nWidth2 ];
-            long*           pRows = new long[ nHeight2 ];
-            BitmapColor*    pColRow1 = (BitmapColor*) new BYTE[ sizeof( BitmapColor ) * nWidth2 ];
-            BitmapColor*    pColRow2 = (BitmapColor*) new BYTE[ sizeof( BitmapColor ) * nWidth2 ];
-            BitmapColor*    pColRow3 = (BitmapColor*) new BYTE[ sizeof( BitmapColor ) * nWidth2 ];
-            BitmapColor*    pRowTmp1 = pColRow1;
-            BitmapColor*    pRowTmp2 = pColRow2;
-            BitmapColor*    pRowTmp3 = pColRow3;
-            BitmapColor*    pColor;
-            long            nY, nX, i;
-            long            nR1, nR2, nR3, nR4, nR5, nR6, nR7, nR8, nR9;
-            long            nG1, nG2, nG3, nG4, nG5, nG6, nG7, nG8, nG9;
-            long            nB1, nB2, nB3, nB4, nB5, nB6, nB7, nB8, nB9;
+            const long		nWidth = pWriteAcc->Width(), nWidth2 = nWidth + 2;
+            const long		nHeight = pWriteAcc->Height(), nHeight2 = nHeight + 2;
+            long*			pColm = new long[ nWidth2 ];
+            long*			pRows = new long[ nHeight2 ];
+            BitmapColor*	pColRow1 = (BitmapColor*) new BYTE[ sizeof( BitmapColor ) * nWidth2 ];
+            BitmapColor*	pColRow2 = (BitmapColor*) new BYTE[ sizeof( BitmapColor ) * nWidth2 ];
+            BitmapColor*	pColRow3 = (BitmapColor*) new BYTE[ sizeof( BitmapColor ) * nWidth2 ];
+            BitmapColor*	pRowTmp1 = pColRow1;
+            BitmapColor*	pRowTmp2 = pColRow2;
+            BitmapColor*	pRowTmp3 = pColRow3;
+            BitmapColor*	pColor;
+            long			nY, nX, i;
+            long			nR1, nR2, nR3, nR4, nR5, nR6, nR7, nR8, nR9;
+            long			nG1, nG2, nG3, nG4, nG5, nG6, nG7, nG8, nG9;
+            long			nB1, nB2, nB3, nB4, nB5, nB6, nB7, nB8, nB9;
 
             // create column LUT
             for( i = 0; i < nWidth2; i++ )
                 pColm[ i ] = ( i > 0 ) ? ( i - 1 ) : 0;
-
+            
             pColm[ nWidth + 1 ] = pColm[ nWidth ];
 
             // create row LUT
             for( i = 0; i < nHeight2; i++ )
                 pRows[ i ] = ( i > 0 ) ? ( i - 1 ) : 0;
-
+            
             pRows[ nHeight + 1 ] = pRows[ nHeight ];
 
             // read first three rows of bitmap color
@@ -314,7 +314,7 @@ BOOL Bitmap::ImplMedianFilter( const BmpFilterParam* /*pFilterParam*/, const Lin
                     nR1 = ( pColor = pRowTmp1 + nX )->GetRed(), nG1 = pColor->GetGreen(), nB1 = pColor->GetBlue();
                     nR2 = ( ++pColor )->GetRed(), nG2 = pColor->GetGreen(), nB2 = pColor->GetBlue();
                     nR3 = ( ++pColor )->GetRed(), nG3 = pColor->GetGreen(), nB3 = pColor->GetBlue();
-
+                    
                     nR4 = ( pColor = pRowTmp2 + nX )->GetRed(), nG4 = pColor->GetGreen(), nB4 = pColor->GetBlue();
                     nR5 = ( ++pColor )->GetRed(), nG5 = pColor->GetGreen(), nB5 = pColor->GetBlue();
                     nR6 = ( ++pColor )->GetRed(), nG6 = pColor->GetGreen(), nB6 = pColor->GetBlue();
@@ -322,7 +322,7 @@ BOOL Bitmap::ImplMedianFilter( const BmpFilterParam* /*pFilterParam*/, const Lin
                     nR7 = ( pColor = pRowTmp3 + nX )->GetRed(), nG7 = pColor->GetGreen(), nB7 = pColor->GetBlue();
                     nR8 = ( ++pColor )->GetRed(), nG8 = pColor->GetGreen(), nB8 = pColor->GetBlue();
                     nR9 = ( ++pColor )->GetRed(), nG9 = pColor->GetGreen(), nB9 = pColor->GetBlue();
-
+                    
                     MNMX6( nR1, nR2, nR3, nR4, nR5, nR6 );
                     MNMX5( nR7, nR2, nR3, nR4, nR5 );
                     MNMX4( nR8, nR2, nR3, nR4 );
@@ -337,7 +337,7 @@ BOOL Bitmap::ImplMedianFilter( const BmpFilterParam* /*pFilterParam*/, const Lin
                     MNMX5( nB7, nB2, nB3, nB4, nB5 );
                     MNMX4( nB8, nB2, nB3, nB4 );
                     MNMX3( nB9, nB2, nB3 );
-
+                    
                     // set destination color
                     pWriteAcc->SetPixel( nY, nX, BitmapColor( (BYTE) nR2, (BYTE) nG2, (BYTE) nB2 ) );
                 }
@@ -371,8 +371,8 @@ BOOL Bitmap::ImplMedianFilter( const BmpFilterParam* /*pFilterParam*/, const Lin
 
         if( bRet )
         {
-            const MapMode   aMap( maPrefMapMode );
-            const Size      aSize( maPrefSize );
+            const MapMode	aMap( maPrefMapMode );
+            const Size		aSize( maPrefSize );
 
             *this = aNewBmp;
 
@@ -395,29 +395,29 @@ BOOL Bitmap::ImplSobelGrey( const BmpFilterParam* /*pFilterParam*/, const Link*
         bRet = FALSE;
 
         BitmapReadAccess* pReadAcc = AcquireReadAccess();
-
+        
         if( pReadAcc )
         {
-            Bitmap              aNewBmp( GetSizePixel(), 8, &pReadAcc->GetPalette() );
-            BitmapWriteAccess*  pWriteAcc = aNewBmp.AcquireWriteAccess();
+            Bitmap				aNewBmp( GetSizePixel(), 8, &pReadAcc->GetPalette() );
+            BitmapWriteAccess*	pWriteAcc = aNewBmp.AcquireWriteAccess();
 
             if( pWriteAcc )
             {
-                BitmapColor aGrey( (BYTE) 0 );
-                const long  nWidth = pWriteAcc->Width();
-                const long  nHeight = pWriteAcc->Height();
-                const long  nMask111 = -1, nMask121 =  0, nMask131 =  1;
-                const long  nMask211 = -2, nMask221 =  0, nMask231 =  2;
-                const long  nMask311 = -1, nMask321 =  0, nMask331 =  1;
-                const long  nMask112 =  1, nMask122 =  2, nMask132 =  1;
-                const long  nMask212 =  0, nMask222 =  0, nMask232 =  0;
-                const long  nMask312 = -1, nMask322 = -2, nMask332 = -1;
-                long        nGrey11, nGrey12, nGrey13;
-                long        nGrey21, nGrey22, nGrey23;
-                long        nGrey31, nGrey32, nGrey33;
-                long*       pHMap = new long[ nWidth + 2 ];
-                long*       pVMap = new long[ nHeight + 2 ];
-                long        nX, nY, nSum1, nSum2;
+                BitmapColor	aGrey( (BYTE) 0 );
+                const long	nWidth = pWriteAcc->Width();
+                const long	nHeight = pWriteAcc->Height();
+                const long	nMask111 = -1, nMask121 =  0, nMask131 =  1;
+                const long	nMask211 = -2, nMask221 =  0, nMask231 =  2;
+                const long	nMask311 = -1, nMask321 =  0, nMask331 =  1;
+                const long	nMask112 =  1, nMask122 =  2, nMask132 =  1;
+                const long	nMask212 =  0, nMask222 =  0, nMask232 =  0;
+                const long	nMask312 = -1, nMask322 = -2, nMask332 = -1;
+                long		nGrey11, nGrey12, nGrey13;
+                long		nGrey21, nGrey22, nGrey23;
+                long		nGrey31, nGrey32, nGrey33;
+                long*		pHMap = new long[ nWidth + 2 ];
+                long*		pVMap = new long[ nHeight + 2 ];
+                long		nX, nY, nSum1, nSum2;
 
                 // fill mapping tables
                 pHMap[ 0 ] = 0;
@@ -498,8 +498,8 @@ BOOL Bitmap::ImplSobelGrey( const BmpFilterParam* /*pFilterParam*/, const Link*
 
             if( bRet )
             {
-                const MapMode   aMap( maPrefMapMode );
-                const Size      aSize( maPrefSize );
+                const MapMode	aMap( maPrefMapMode );
+                const Size		aSize( maPrefSize );
 
                 *this = aNewBmp;
 
@@ -523,33 +523,33 @@ BOOL Bitmap::ImplEmbossGrey( const BmpFilterParam* pFilterParam, const Link* /*p
         bRet = FALSE;
 
         BitmapReadAccess* pReadAcc = AcquireReadAccess();
-
+        
         if( pReadAcc )
         {
-            Bitmap              aNewBmp( GetSizePixel(), 8, &pReadAcc->GetPalette() );
-            BitmapWriteAccess*  pWriteAcc = aNewBmp.AcquireWriteAccess();
+            Bitmap				aNewBmp( GetSizePixel(), 8, &pReadAcc->GetPalette() );
+            BitmapWriteAccess*	pWriteAcc = aNewBmp.AcquireWriteAccess();
 
             if( pWriteAcc )
             {
-                BitmapColor aGrey( (BYTE) 0 );
-                const long  nWidth = pWriteAcc->Width();
-                const long  nHeight = pWriteAcc->Height();
-                long        nGrey11, nGrey12, nGrey13;
-                long        nGrey21, nGrey22, nGrey23;
-                long        nGrey31, nGrey32, nGrey33;
-                double      fAzim = ( ( pFilterParam && pFilterParam->meFilter == BMP_FILTER_EMBOSS_GREY ) ?
+                BitmapColor	aGrey( (BYTE) 0 );
+                const long	nWidth = pWriteAcc->Width();
+                const long	nHeight = pWriteAcc->Height();
+                long		nGrey11, nGrey12, nGrey13;
+                long		nGrey21, nGrey22, nGrey23;
+                long		nGrey31, nGrey32, nGrey33;
+                double		fAzim = ( ( pFilterParam && pFilterParam->meFilter == BMP_FILTER_EMBOSS_GREY ) ?
                                       ( pFilterParam->maEmbossAngles.mnAzimuthAngle100 * 0.01 ) : 0.0 ) * F_PI180;
-                double      fElev = ( ( pFilterParam && pFilterParam->meFilter == BMP_FILTER_EMBOSS_GREY ) ?
+                double		fElev = ( ( pFilterParam && pFilterParam->meFilter == BMP_FILTER_EMBOSS_GREY ) ?
                                       ( pFilterParam->maEmbossAngles.mnElevationAngle100 * 0.01 ) : 90.0 ) * F_PI180;
-                long*       pHMap = new long[ nWidth + 2 ];
-                long*       pVMap = new long[ nHeight + 2 ];
-                long        nX, nY, nNx, nNy, nDotL;
-                const long  nLx = FRound( cos( fAzim ) * cos( fElev ) * 255.0 );
-                const long  nLy = FRound( sin( fAzim ) * cos( fElev ) * 255.0 );
-                const long  nLz = FRound( sin( fElev ) * 255.0 );
-                const long  nZ2 = ( ( 6 * 255 ) / 4 ) * ( ( 6 * 255 ) / 4 );
-                const long  nNzLz = ( ( 6 * 255 ) / 4 ) * nLz;
-                const BYTE  cLz = (BYTE) VOS_BOUND( nLz, 0, 255 );
+                long*		pHMap = new long[ nWidth + 2 ];
+                long*		pVMap = new long[ nHeight + 2 ];
+                long	 	nX, nY, nNx, nNy, nDotL;
+                const long	nLx = FRound( cos( fAzim ) * cos( fElev ) * 255.0 );
+                const long	nLy = FRound( sin( fAzim ) * cos( fElev ) * 255.0 );
+                const long	nLz = FRound( sin( fElev ) * 255.0 );
+                const long	nZ2 = ( ( 6 * 255 ) / 4 ) * ( ( 6 * 255 ) / 4 );
+                const long	nNzLz = ( ( 6 * 255 ) / 4 ) * nLz;
+                const BYTE	cLz = (BYTE) VOS_BOUND( nLz, 0, 255 );
 
                 // fill mapping tables
                 pHMap[ 0 ] = 0;
@@ -588,7 +588,7 @@ BOOL Bitmap::ImplEmbossGrey( const BmpFilterParam* pFilterParam, const Link* /*p
                             const double fGrey = nDotL / sqrt( (double)(nNx * nNx + nNy * nNy + nZ2) );
                             aGrey.SetIndex( (BYTE) VOS_BOUND( fGrey, 0, 255 ) );
                         }
-
+                        
                         pWriteAcc->SetPixel( nY, nX, aGrey );
 
                         if( nX < ( nWidth - 1 ) )
@@ -612,8 +612,8 @@ BOOL Bitmap::ImplEmbossGrey( const BmpFilterParam* pFilterParam, const Link* /*p
 
             if( bRet )
             {
-                const MapMode   aMap( maPrefMapMode );
-                const Size      aSize( maPrefSize );
+                const MapMode	aMap( maPrefMapMode );
+                const Size		aSize( maPrefSize );
 
                 *this = aNewBmp;
 
@@ -630,12 +630,12 @@ BOOL Bitmap::ImplEmbossGrey( const BmpFilterParam* pFilterParam, const Link* /*p
 
 BOOL Bitmap::ImplSolarize( const BmpFilterParam* pFilterParam, const Link* /*pProgress*/ )
 {
-    BOOL                bRet = FALSE;
-    BitmapWriteAccess*  pWriteAcc = AcquireWriteAccess();
-
+    BOOL				bRet = FALSE;
+    BitmapWriteAccess*	pWriteAcc = AcquireWriteAccess();
+        
     if( pWriteAcc )
     {
-        const BYTE cThreshold = ( pFilterParam && pFilterParam->meFilter == BMP_FILTER_SOLARIZE ) ?
+        const BYTE cThreshold = ( pFilterParam && pFilterParam->meFilter == BMP_FILTER_SOLARIZE ) ? 
                                 pFilterParam->mcSolarGreyThreshold : 128;
 
         if( pWriteAcc->HasPalette() )
@@ -653,16 +653,16 @@ BOOL Bitmap::ImplSolarize( const BmpFilterParam* pFilterParam, const Link* /*pPr
         }
         else
         {
-            BitmapColor aCol;
-            const long  nWidth = pWriteAcc->Width();
-            const long  nHeight = pWriteAcc->Height();
+            BitmapColor	aCol;
+            const long	nWidth = pWriteAcc->Width();
+            const long	nHeight = pWriteAcc->Height();
 
             for( long nY = 0; nY < nHeight ; nY++ )
             {
                 for( long nX = 0; nX < nWidth; nX++ )
                 {
                     aCol = pWriteAcc->GetPixel( nY, nX );
-
+                    
                     if( aCol.GetLuminance() >= cThreshold )
                         pWriteAcc->SetPixel( nY, nX, aCol.Invert() );
                 }
@@ -680,43 +680,43 @@ BOOL Bitmap::ImplSolarize( const BmpFilterParam* pFilterParam, const Link* /*pPr
 
 BOOL Bitmap::ImplSepia( const BmpFilterParam* pFilterParam, const Link* /*pProgress*/ )
 {
-    BitmapReadAccess*   pReadAcc = AcquireReadAccess();
-    BOOL                bRet = FALSE;
-
+    BitmapReadAccess*	pReadAcc = AcquireReadAccess();
+    BOOL				bRet = FALSE;
+        
     if( pReadAcc )
     {
-        long            nSepiaPercent = ( pFilterParam && pFilterParam->meFilter == BMP_FILTER_SEPIA ) ?
+        long			nSepiaPercent = ( pFilterParam && pFilterParam->meFilter == BMP_FILTER_SEPIA ) ? 
                                         pFilterParam->mcSolarGreyThreshold : 10;
-        const long      nSepia = 10000 - 100 * VOS_BOUND( nSepiaPercent, 0, 100 );
-        BitmapPalette   aSepiaPal( 256 );
+        const long		nSepia = 10000 - 100 * VOS_BOUND( nSepiaPercent, 0, 100 );
+        BitmapPalette	aSepiaPal( 256 );
 
         DBG_ASSERT( nSepiaPercent <= 100, "Bitmap::ImplSepia(): sepia value out of range; defaulting to 100%" );
 
         for( USHORT i = 0; i < 256; i++ )
         {
-            BitmapColor&    rCol = aSepiaPal[ i ];
-            const BYTE      cSepiaValue = (BYTE) ( ( nSepia * i ) / 10000 );
+            BitmapColor&	rCol = aSepiaPal[ i ];
+            const BYTE		cSepiaValue = (BYTE) ( ( nSepia * i ) / 10000 );
 
             rCol.SetRed( (BYTE) i );
             rCol.SetGreen( cSepiaValue );
             rCol.SetBlue( cSepiaValue );
         }
 
-        Bitmap              aNewBmp( GetSizePixel(), 8, &aSepiaPal );
-        BitmapWriteAccess*  pWriteAcc = aNewBmp.AcquireWriteAccess();
+        Bitmap				aNewBmp( GetSizePixel(), 8, &aSepiaPal );
+        BitmapWriteAccess*	pWriteAcc = aNewBmp.AcquireWriteAccess();
 
         if( pWriteAcc )
         {
-            BitmapColor aCol( (BYTE) 0 );
-            const long  nWidth = pWriteAcc->Width();
-            const long  nHeight = pWriteAcc->Height();
+            BitmapColor	aCol( (BYTE) 0 );
+            const long	nWidth = pWriteAcc->Width();
+            const long	nHeight = pWriteAcc->Height();
 
             if( pReadAcc->HasPalette() )
             {
                 for( long nY = 0; nY < nHeight ; nY++ )
                 {
-                    const USHORT    nPalCount = pReadAcc->GetPaletteEntryCount();
-                    BYTE*           pIndexMap = new BYTE[ nPalCount ];
+                    const USHORT	nPalCount = pReadAcc->GetPaletteEntryCount();
+                    BYTE*			pIndexMap = new BYTE[ nPalCount ];
 
                     for( USHORT i = 0; i < nPalCount; i++ )
                         pIndexMap[ i ] = pReadAcc->GetPaletteColor( i ).GetLuminance();
@@ -750,8 +750,8 @@ BOOL Bitmap::ImplSepia( const BmpFilterParam* pFilterParam, const Link* /*pProgr
 
         if( bRet )
         {
-            const MapMode   aMap( maPrefMapMode );
-            const Size      aSize( maPrefSize );
+            const MapMode	aMap( maPrefMapMode );
+            const Size		aSize( maPrefSize );
 
             *this = aNewBmp;
 
@@ -767,11 +767,11 @@ BOOL Bitmap::ImplSepia( const BmpFilterParam* pFilterParam, const Link* /*pProgr
 
 BOOL Bitmap::ImplMosaic( const BmpFilterParam* pFilterParam, const Link* /*pProgress*/ )
 {
-    ULONG               nTileWidth = ( pFilterParam && pFilterParam->meFilter == BMP_FILTER_MOSAIC ) ?
+    ULONG				nTileWidth = ( pFilterParam && pFilterParam->meFilter == BMP_FILTER_MOSAIC ) ? 
                                      pFilterParam->maMosaicTileSize.mnTileWidth : 4;
-    ULONG               nTileHeight = ( pFilterParam && pFilterParam->meFilter == BMP_FILTER_MOSAIC ) ?
+    ULONG				nTileHeight = ( pFilterParam && pFilterParam->meFilter == BMP_FILTER_MOSAIC ) ? 
                                       pFilterParam->maMosaicTileSize.mnTileHeight : 4;
-    BOOL                bRet = FALSE;
+    BOOL				bRet = FALSE;
 
     if( !nTileWidth )
         nTileWidth = 1;
@@ -781,9 +781,9 @@ BOOL Bitmap::ImplMosaic( const BmpFilterParam* pFilterParam, const Link* /*pProg
 
     if( nTileWidth > 1 || nTileHeight > 1 )
     {
-        Bitmap*             pNewBmp;
-        BitmapReadAccess*   pReadAcc;
-        BitmapWriteAccess*  pWriteAcc;
+        Bitmap*				pNewBmp;
+        BitmapReadAccess*	pReadAcc;
+        BitmapWriteAccess*	pWriteAcc;
 
         if( GetBitCount() > 8 )
         {
@@ -796,14 +796,14 @@ BOOL Bitmap::ImplMosaic( const BmpFilterParam* pFilterParam, const Link* /*pProg
             pReadAcc = AcquireReadAccess();
             pWriteAcc = pNewBmp->AcquireWriteAccess();
         }
-
+            
         if( pReadAcc && pWriteAcc )
         {
-            BitmapColor aCol;
-            long        nWidth = pReadAcc->Width();
-            long        nHeight = pReadAcc->Height();
-            long        nX, nY, nX1, nX2, nY1, nY2, nSumR, nSumG, nSumB;
-            double      fArea_1;
+            BitmapColor	aCol;
+            long		nWidth = pReadAcc->Width();
+            long		nHeight = pReadAcc->Height();
+            long		nX, nY, nX1, nX2, nY1, nY2, nSumR, nSumG, nSumB;
+            double		fArea_1;
 
             nY1 = 0; nY2 = nTileHeight - 1;
 
@@ -816,7 +816,7 @@ BOOL Bitmap::ImplMosaic( const BmpFilterParam* pFilterParam, const Link* /*pProg
 
                 if( nX2 >= nWidth )
                     nX2 = nWidth - 1;
-
+                
                 fArea_1 = 1.0 / ( ( nX2 - nX1 + 1 ) * ( nY2 - nY1 + 1 ) );
 
                 if( !pNewBmp )
@@ -904,8 +904,8 @@ BOOL Bitmap::ImplMosaic( const BmpFilterParam* pFilterParam, const Link* /*pProg
 
             if( bRet )
             {
-                const MapMode   aMap( maPrefMapMode );
-                const Size      aSize( maPrefSize );
+                const MapMode	aMap( maPrefMapMode );
+                const Size		aSize( maPrefSize );
 
                 *this = *pNewBmp;
 
@@ -918,7 +918,7 @@ BOOL Bitmap::ImplMosaic( const BmpFilterParam* pFilterParam, const Link* /*pProg
     }
     else
         bRet = TRUE;
-
+        
     return bRet;
 }
 
@@ -926,8 +926,8 @@ BOOL Bitmap::ImplMosaic( const BmpFilterParam* pFilterParam, const Link* /*pProg
 
 struct PopArtEntry
 {
-    sal_uInt32  mnIndex;
-    sal_uInt32  mnCount;
+    sal_uInt32	mnIndex;
+    sal_uInt32	mnCount;
 };
 
 // ------------------------------------------------------------------------
@@ -938,11 +938,11 @@ extern "C" int __LOADONCALLAPI ImplPopArtCmpFnc( const void* p1, const void* p2
 
     if( ( (PopArtEntry*) p1 )->mnCount < ( (PopArtEntry*) p2 )->mnCount )
         nRet = 1;
-    else if( ( (PopArtEntry*) p1 )->mnCount == ( (PopArtEntry*) p2 )->mnCount )
+    else if( ( (PopArtEntry*) p1 )->mnCount == ( (PopArtEntry*) p2 )->mnCount ) 
         nRet = 0;
     else
         nRet = -1;
-
+    
     return nRet;
 }
 
@@ -960,11 +960,11 @@ BOOL Bitmap::ImplPopArt( const BmpFilterParam* /*pFilterParam*/, const Link* /*p
 
         if( pWriteAcc )
         {
-            const long      nWidth = pWriteAcc->Width();
-            const long      nHeight = pWriteAcc->Height();
-            const ULONG     nEntryCount = 1 << pWriteAcc->GetBitCount();
-            ULONG           n;
-            PopArtEntry*    pPopArtTable = new PopArtEntry[ nEntryCount ];
+            const long		nWidth = pWriteAcc->Width();
+            const long		nHeight = pWriteAcc->Height();
+            const ULONG		nEntryCount = 1 << pWriteAcc->GetBitCount();
+            ULONG			n;
+            PopArtEntry*	pPopArtTable = new PopArtEntry[ nEntryCount ];
 
             for( n = 0; n < nEntryCount; n++ )
             {
@@ -980,7 +980,7 @@ BOOL Bitmap::ImplPopArt( const BmpFilterParam* /*pFilterParam*/, const Link* /*p
 
             // sort table
             qsort( pPopArtTable, nEntryCount, sizeof( PopArtEntry ), ImplPopArtCmpFnc );
-
+            
             // get last used entry
             ULONG nFirstEntry;
             ULONG nLastEntry = 0;
@@ -993,7 +993,7 @@ BOOL Bitmap::ImplPopArt( const BmpFilterParam* /*pFilterParam*/, const Link* /*p
             const BitmapColor aFirstCol( pWriteAcc->GetPaletteColor( sal::static_int_cast<USHORT>(pPopArtTable[ 0 ].mnIndex) ) );
             for( nFirstEntry = 0; nFirstEntry < nLastEntry; nFirstEntry++ )
             {
-                pWriteAcc->SetPaletteColor( sal::static_int_cast<USHORT>(pPopArtTable[ nFirstEntry ].mnIndex),
+                pWriteAcc->SetPaletteColor( sal::static_int_cast<USHORT>(pPopArtTable[ nFirstEntry ].mnIndex), 
                                             pWriteAcc->GetPaletteColor( sal::static_int_cast<USHORT>(pPopArtTable[ nFirstEntry + 1 ].mnIndex) ) );
             }
             pWriteAcc->SetPaletteColor( sal::static_int_cast<USHORT>(pPopArtTable[ nLastEntry ].mnIndex), aFirstCol );
diff --git a/vcl/source/gdi/bitmapex.cxx b/vcl/source/gdi/bitmapex.cxx
index 38402af626c2..cfa9e4c9ad0d 100644
--- a/vcl/source/gdi/bitmapex.cxx
+++ b/vcl/source/gdi/bitmapex.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
@@ -52,25 +52,25 @@
 
 BitmapEx::BitmapEx() :
         eTransparent( TRANSPARENT_NONE ),
-        bAlpha      ( FALSE )
+        bAlpha		( FALSE )
 {
 }
 
 // ------------------------------------------------------------------
 
 BitmapEx::BitmapEx( const BitmapEx& rBitmapEx ) :
-        aBitmap             ( rBitmapEx.aBitmap ),
-        aMask               ( rBitmapEx.aMask ),
-        aBitmapSize         ( rBitmapEx.aBitmapSize ),
-        aTransparentColor   ( rBitmapEx.aTransparentColor ),
-        eTransparent        ( rBitmapEx.eTransparent ),
-        bAlpha              ( rBitmapEx.bAlpha )
+        aBitmap				( rBitmapEx.aBitmap ),
+        aMask				( rBitmapEx.aMask ),
+        aBitmapSize			( rBitmapEx.aBitmapSize ),
+        aTransparentColor	( rBitmapEx.aTransparentColor ),
+        eTransparent		( rBitmapEx.eTransparent ),
+        bAlpha				( rBitmapEx.bAlpha )
 {
 }
 
 BitmapEx::BitmapEx( const BitmapEx& rBitmapEx, Point aSrc, Size aSize ) :
         eTransparent( TRANSPARENT_NONE ),
-        bAlpha      ( FALSE )
+        bAlpha		( FALSE )
 {
     if( rBitmapEx.IsEmpty() )
         return;
@@ -84,7 +84,7 @@ BitmapEx::BitmapEx( const BitmapEx& rBitmapEx, Point aSrc, Size aSize ) :
     }
     else if( rBitmapEx.IsTransparent() )
         aMask = Bitmap( aSize, rBitmapEx.aMask.GetBitCount() );
-
+                
     Rectangle aDestRect( Point( 0, 0 ), aSize );
     Rectangle aSrcRect( aSrc, aSize );
     CopyPixel( aDestRect, aSrcRect, &rBitmapEx );
@@ -94,21 +94,21 @@ BitmapEx::BitmapEx( const BitmapEx& rBitmapEx, Point aSrc, Size aSize ) :
 
 BitmapEx::BitmapEx( const ResId& rResId ) :
         eTransparent( TRANSPARENT_NONE ),
-        bAlpha      ( FALSE )
+        bAlpha		( FALSE )
 {
-    static ImplImageTreeSingletonRef    aImageTree;
-    ResMgr*                             pResMgr = NULL;
+    static ImplImageTreeSingletonRef	aImageTree;
+    ResMgr* 							pResMgr = NULL;
 
     ResMgr::GetResourceSkipHeader( rResId.SetRT( RSC_BITMAP ), &pResMgr );
     pResMgr->ReadLong();
     pResMgr->ReadLong();
-
+    
     const String aFileName( pResMgr->ReadString() );
     ::rtl::OUString aCurrentSymbolsStyle = Application::GetSettings().GetStyleSettings().GetCurrentSymbolsStyleName();
-
+    
     if( !aImageTree->loadImage( aFileName, aCurrentSymbolsStyle, *this ) )
     {
-#ifdef DBG_UTIL
+#ifdef DBG_UTIL		
         ByteString aErrorStr( "BitmapEx::BitmapEx( const ResId& rResId ): could not load image <" );
         DBG_ERROR( ( ( aErrorStr += ByteString( aFileName, RTL_TEXTENCODING_ASCII_US ) ) += '>' ).GetBuffer() );
 #endif
@@ -118,21 +118,21 @@ BitmapEx::BitmapEx( const ResId& rResId ) :
 // ------------------------------------------------------------------
 
 BitmapEx::BitmapEx( const Bitmap& rBmp ) :
-        aBitmap     ( rBmp ),
-        aBitmapSize ( aBitmap.GetSizePixel() ),
+        aBitmap		( rBmp ),
+        aBitmapSize	( aBitmap.GetSizePixel() ),
         eTransparent( TRANSPARENT_NONE ),
-        bAlpha      ( FALSE )
+        bAlpha		( FALSE )
 {
 }
 
 // ------------------------------------------------------------------
 
 BitmapEx::BitmapEx( const Bitmap& rBmp, const Bitmap& rMask ) :
-        aBitmap         ( rBmp ),
-        aMask           ( rMask ),
-        aBitmapSize     ( aBitmap.GetSizePixel() ),
-        eTransparent    ( !rMask ? TRANSPARENT_NONE : TRANSPARENT_BITMAP ),
-        bAlpha          ( FALSE )
+        aBitmap			( rBmp ),
+        aMask			( rMask ),
+        aBitmapSize		( aBitmap.GetSizePixel() ),
+        eTransparent	( !rMask ? TRANSPARENT_NONE : TRANSPARENT_BITMAP ),
+        bAlpha			( FALSE )
 {
     DBG_ASSERT( !rMask || rBmp.GetSizePixel() == rMask.GetSizePixel(),
                 "BitmapEx::BitmapEx(): size mismatch for bitmap and mask." );
@@ -148,18 +148,18 @@ BitmapEx::BitmapEx( const Bitmap& rBmp, const Bitmap& rMask ) :
 // ------------------------------------------------------------------
 
 BitmapEx::BitmapEx( const Bitmap& rBmp, const AlphaMask& rAlphaMask ) :
-        aBitmap         ( rBmp ),
-        aMask           ( rAlphaMask.ImplGetBitmap() ),
-        aBitmapSize     ( aBitmap.GetSizePixel() ),
-        eTransparent    ( !rAlphaMask ? TRANSPARENT_NONE : TRANSPARENT_BITMAP ),
-        bAlpha          ( !rAlphaMask ? FALSE : TRUE )
+        aBitmap			( rBmp ),
+        aMask			( rAlphaMask.ImplGetBitmap() ),
+        aBitmapSize		( aBitmap.GetSizePixel() ),
+        eTransparent	( !rAlphaMask ? TRANSPARENT_NONE : TRANSPARENT_BITMAP ),
+        bAlpha			( !rAlphaMask ? FALSE : TRUE )
 {
     DBG_ASSERT( !rAlphaMask || rBmp.GetSizePixel() == rAlphaMask.GetSizePixel(),
                 "BitmapEx::BitmapEx(): size mismatch for bitmap and alpha mask." );
 
     // #i75531# the workaround below can go when
     // X11SalGraphics::drawAlphaBitmap()'s render acceleration
-    // can handle the bitmap depth mismatch directly
+    // can handle the bitmap depth mismatch directly 
     if( aBitmap.GetBitCount() < aMask.GetBitCount() )
         aBitmap.Convert( BMP_CONVERSION_24BIT );
 }
@@ -167,11 +167,11 @@ BitmapEx::BitmapEx( const Bitmap& rBmp, const AlphaMask& rAlphaMask ) :
 // ------------------------------------------------------------------
 
 BitmapEx::BitmapEx( const Bitmap& rBmp, const Color& rTransparentColor ) :
-        aBitmap             ( rBmp ),
-        aBitmapSize         ( aBitmap.GetSizePixel() ),
-        aTransparentColor   ( rTransparentColor ),
-        eTransparent        ( TRANSPARENT_BITMAP ),
-        bAlpha              ( FALSE )
+        aBitmap				( rBmp ),
+        aBitmapSize			( aBitmap.GetSizePixel() ),
+        aTransparentColor	( rTransparentColor ),
+        eTransparent		( TRANSPARENT_BITMAP ),
+        bAlpha				( FALSE )
 {
     aMask = aBitmap.CreateMask( aTransparentColor );
 
@@ -303,7 +303,7 @@ Bitmap BitmapEx::GetBitmap( const Color* pTransReplaceColor ) const
 BitmapEx BitmapEx::GetColorTransformedBitmapEx( BmpColorMode eColorMode ) const
 {
     BitmapEx aRet;
-
+    
     if( BMP_COLOR_HIGHCONTRAST == eColorMode )
     {
         aRet = *this;
@@ -314,7 +314,7 @@ BitmapEx BitmapEx::GetColorTransformedBitmapEx( BmpColorMode eColorMode ) const
     {
         aRet = *this;
         aRet.aBitmap = aRet.aBitmap.GetColorTransformedBitmap( eColorMode );
-
+        
         if( !aRet.aMask.IsEmpty() )
         {
             aRet.aMask.CombineSimple( aRet.aBitmap, BMP_COMBINE_OR );
@@ -370,8 +370,8 @@ ULONG BitmapEx::GetSizeBytes() const
 
 ULONG BitmapEx::GetChecksum() const
 {
-    sal_uInt32  nCrc = aBitmap.GetChecksum();
-    SVBT32      aBT32;
+    sal_uInt32	nCrc = aBitmap.GetChecksum();
+    SVBT32		aBT32;
 
     UInt32ToSVBT32( (long) eTransparent, aBT32 );
     nCrc = rtl_crc32( nCrc, aBT32, 4 );
@@ -617,8 +617,8 @@ BOOL BitmapEx::CopyPixel( const Rectangle& rRectDst, const Rectangle& rRectSrc,
                     }
                     else
                     {
-                        sal_uInt8   cBlack = 0;
-                        AlphaMask*  pAlpha = new AlphaMask( GetSizePixel(), &cBlack );
+                        sal_uInt8	cBlack = 0;
+                        AlphaMask*	pAlpha = new AlphaMask( GetSizePixel(), &cBlack );
 
                         aMask = pAlpha->ImplGetBitmap();
                         delete pAlpha;
@@ -646,7 +646,7 @@ BOOL BitmapEx::CopyPixel( const Rectangle& rRectDst, const Rectangle& rRectSrc,
                 }
                 else if( IsAlpha() )
                 {
-                    sal_uInt8         cBlack = 0;
+                    sal_uInt8	      cBlack = 0;
                     const AlphaMask   aAlphaSrc( pBmpExSrc->GetSizePixel(), &cBlack );
 
                     aMask.CopyPixel( rRectDst, rRectSrc, &aAlphaSrc.ImplGetBitmap() );
@@ -858,8 +858,8 @@ SvStream& operator>>( SvStream& rIStm, BitmapEx& rBitmapEx )
     if( !rIStm.GetError() )
     {
         const ULONG nStmPos = rIStm.Tell();
-        UINT32      nMagic1 = 0;
-        UINT32      nMagic2 = 0;
+        UINT32		nMagic1 = 0;
+        UINT32		nMagic2 = 0;
 
         rIStm >> nMagic1 >> nMagic2;
 
diff --git a/vcl/source/gdi/bmpacc.cxx b/vcl/source/gdi/bmpacc.cxx
index c963ea32542e..a123253f0eb6 100644
--- a/vcl/source/gdi/bmpacc.cxx
+++ b/vcl/source/gdi/bmpacc.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
@@ -38,11 +38,11 @@
 // --------------------
 
 BitmapReadAccess::BitmapReadAccess( Bitmap& rBitmap, BOOL bModify ) :
-            mpBuffer        ( NULL ),
-            mpScanBuf       ( NULL ),
-            mFncGetPixel    ( NULL ),
-            mFncSetPixel    ( NULL ),
-            mbModify        ( bModify )
+            mpBuffer		( NULL ),
+            mpScanBuf		( NULL ),
+            mFncGetPixel	( NULL ),
+            mFncSetPixel	( NULL ),
+            mbModify		( bModify )
 {
     ImplCreate( rBitmap );
 }
@@ -50,11 +50,11 @@ BitmapReadAccess::BitmapReadAccess( Bitmap& rBitmap, BOOL bModify ) :
 // ------------------------------------------------------------------
 
 BitmapReadAccess::BitmapReadAccess( Bitmap& rBitmap ) :
-            mpBuffer        ( NULL ),
-            mpScanBuf       ( NULL ),
-            mFncGetPixel    ( NULL ),
-            mFncSetPixel    ( NULL ),
-            mbModify        ( FALSE )
+            mpBuffer		( NULL ),
+            mpScanBuf		( NULL ),
+            mFncGetPixel	( NULL ),
+            mFncSetPixel	( NULL ),
+            mbModify		( FALSE )
 {
     ImplCreate( rBitmap );
 }
@@ -105,8 +105,8 @@ void BitmapReadAccess::ImplCreate( Bitmap& rBitmap )
 
         if( mpBuffer )
         {
-            const long  nHeight = mpBuffer->mnHeight;
-            Scanline    pTmpLine = mpBuffer->mpBits;
+            const long	nHeight = mpBuffer->mnHeight;
+            Scanline	pTmpLine = mpBuffer->mpBits;
 
             mpScanBuf = new Scanline[ nHeight ];
             maColorMask = mpBuffer->maColorMask;
@@ -265,13 +265,13 @@ void BitmapReadAccess::ImplZeroInitUnusedBits()
             if( nLeftOverBits != 0 ) // else there is really nothing to do
             {
                 const sal_uInt32 nBytes = (nLeftOverBits + 7U) >> 3U;
-                sal_uInt8        nMask;
-
+                sal_uInt8	     nMask;
+    
                 if( bMsb )
                     nMask = static_cast<sal_uInt8>(0xffU << (nLeftOverBits & 3UL));
                 else
                     nMask = static_cast<sal_uInt8>(0xffU >> (nLeftOverBits & 3UL));
-
+    
                 BYTE* pLastBytes = (BYTE*)GetBuffer() + ( nScanSize - nBytes );
                 for( sal_uInt32 i = 0; i < nHeight; i++, pLastBytes += nScanSize )
                 {
@@ -283,8 +283,8 @@ void BitmapReadAccess::ImplZeroInitUnusedBits()
         }
         else if( nBits & 0x1f )
         {
-            sal_uInt32  nMask = 0xffffffff << ( ( nScanSize << 3 ) - nBits );
-            BYTE*       pLast4Bytes = (BYTE*) GetBuffer() + ( nScanSize - 4 );
+            sal_uInt32	nMask = 0xffffffff << ( ( nScanSize << 3 ) - nBits );
+            BYTE*		pLast4Bytes = (BYTE*) GetBuffer() + ( nScanSize - 4 );
 
 #ifdef OSL_LITENDIAN
             nMask = SWAPLONG( nMask );
@@ -393,22 +393,22 @@ void BitmapWriteAccess::CopyScanline( long nY, ConstScanline aSrcScanline,
 
             switch( nFormat )
             {
-                case( BMP_FORMAT_1BIT_MSB_PAL ):    pFncGetPixel = GetPixelFor_1BIT_MSB_PAL; break;
-                case( BMP_FORMAT_1BIT_LSB_PAL ):    pFncGetPixel = GetPixelFor_1BIT_LSB_PAL; break;
-                case( BMP_FORMAT_4BIT_MSN_PAL ):    pFncGetPixel = GetPixelFor_4BIT_MSN_PAL; break;
-                case( BMP_FORMAT_4BIT_LSN_PAL ):    pFncGetPixel = GetPixelFor_4BIT_LSN_PAL; break;
-                case( BMP_FORMAT_8BIT_PAL ):        pFncGetPixel = GetPixelFor_8BIT_PAL; break;
-                case( BMP_FORMAT_8BIT_TC_MASK ):    pFncGetPixel = GetPixelFor_8BIT_TC_MASK; break;
-                case( BMP_FORMAT_16BIT_TC_MSB_MASK ):   pFncGetPixel = GetPixelFor_16BIT_TC_MSB_MASK; break;
-                case( BMP_FORMAT_16BIT_TC_LSB_MASK ):   pFncGetPixel = GetPixelFor_16BIT_TC_LSB_MASK; break;
-                case( BMP_FORMAT_24BIT_TC_BGR ):    pFncGetPixel = GetPixelFor_24BIT_TC_BGR; break;
-                case( BMP_FORMAT_24BIT_TC_RGB ):    pFncGetPixel = GetPixelFor_24BIT_TC_RGB; break;
-                case( BMP_FORMAT_24BIT_TC_MASK ):   pFncGetPixel = GetPixelFor_24BIT_TC_MASK; break;
-                case( BMP_FORMAT_32BIT_TC_ABGR ):   pFncGetPixel = GetPixelFor_32BIT_TC_ABGR; break;
-                case( BMP_FORMAT_32BIT_TC_ARGB ):   pFncGetPixel = GetPixelFor_32BIT_TC_ARGB; break;
-                case( BMP_FORMAT_32BIT_TC_BGRA ):   pFncGetPixel = GetPixelFor_32BIT_TC_BGRA; break;
-                case( BMP_FORMAT_32BIT_TC_RGBA ):   pFncGetPixel = GetPixelFor_32BIT_TC_RGBA; break;
-                case( BMP_FORMAT_32BIT_TC_MASK ):   pFncGetPixel = GetPixelFor_32BIT_TC_MASK; break;
+                case( BMP_FORMAT_1BIT_MSB_PAL ):	pFncGetPixel = GetPixelFor_1BIT_MSB_PAL; break;
+                case( BMP_FORMAT_1BIT_LSB_PAL ):	pFncGetPixel = GetPixelFor_1BIT_LSB_PAL; break;
+                case( BMP_FORMAT_4BIT_MSN_PAL ):	pFncGetPixel = GetPixelFor_4BIT_MSN_PAL; break;
+                case( BMP_FORMAT_4BIT_LSN_PAL ):	pFncGetPixel = GetPixelFor_4BIT_LSN_PAL; break;
+                case( BMP_FORMAT_8BIT_PAL ):		pFncGetPixel = GetPixelFor_8BIT_PAL; break;
+                case( BMP_FORMAT_8BIT_TC_MASK ):	pFncGetPixel = GetPixelFor_8BIT_TC_MASK; break;
+                case( BMP_FORMAT_16BIT_TC_MSB_MASK ):	pFncGetPixel = GetPixelFor_16BIT_TC_MSB_MASK; break;
+                case( BMP_FORMAT_16BIT_TC_LSB_MASK ):	pFncGetPixel = GetPixelFor_16BIT_TC_LSB_MASK; break;
+                case( BMP_FORMAT_24BIT_TC_BGR ):	pFncGetPixel = GetPixelFor_24BIT_TC_BGR; break;
+                case( BMP_FORMAT_24BIT_TC_RGB ):	pFncGetPixel = GetPixelFor_24BIT_TC_RGB; break;
+                case( BMP_FORMAT_24BIT_TC_MASK ):	pFncGetPixel = GetPixelFor_24BIT_TC_MASK; break;
+                case( BMP_FORMAT_32BIT_TC_ABGR ):	pFncGetPixel = GetPixelFor_32BIT_TC_ABGR; break;
+                case( BMP_FORMAT_32BIT_TC_ARGB ):	pFncGetPixel = GetPixelFor_32BIT_TC_ARGB; break;
+                case( BMP_FORMAT_32BIT_TC_BGRA ):	pFncGetPixel = GetPixelFor_32BIT_TC_BGRA; break;
+                case( BMP_FORMAT_32BIT_TC_RGBA ):	pFncGetPixel = GetPixelFor_32BIT_TC_RGBA; break;
+                case( BMP_FORMAT_32BIT_TC_MASK ):	pFncGetPixel = GetPixelFor_32BIT_TC_MASK; break;
 
                 default:
                     pFncGetPixel = NULL;
@@ -436,7 +436,7 @@ void BitmapWriteAccess::CopyBuffer( const BitmapReadAccess& rReadAcc )
     if( ( GetScanlineFormat() == rReadAcc.GetScanlineFormat() ) &&
         ( GetScanlineSize() == rReadAcc.GetScanlineSize() ) )
     {
-        const long  nHeight = Min( mpBuffer->mnHeight, rReadAcc.Height() );
+        const long	nHeight = Min( mpBuffer->mnHeight, rReadAcc.Height() );
         const ULONG nCount = nHeight * mpBuffer->mnScanlineSize;
 
         memcpy( mpBuffer->mpBits, rReadAcc.GetBuffer(), nCount );
diff --git a/vcl/source/gdi/bmpacc2.cxx b/vcl/source/gdi/bmpacc2.cxx
index 436c165d3bb5..f9f5247aff57 100644
--- a/vcl/source/gdi/bmpacc2.cxx
+++ b/vcl/source/gdi/bmpacc2.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,7 +79,7 @@ IMPL_FORMAT_SETPIXEL_NOMASK( _4BIT_MSN_PAL )
 {
     BYTE& rByte = pScanline[ nX >> 1 ];
 
-    ( nX & 1 ) ? ( rByte &= 0xf0, rByte |= ( rBitmapColor.GetIndex() & 0x0f ) ) :
+    ( nX & 1 ) ? ( rByte &= 0xf0, rByte |= ( rBitmapColor.GetIndex() & 0x0f ) ) : 
                  ( rByte &= 0x0f, rByte |= ( rBitmapColor.GetIndex() << 4 ) );
 }
 
@@ -96,7 +96,7 @@ IMPL_FORMAT_SETPIXEL_NOMASK( _4BIT_LSN_PAL )
 {
     BYTE& rByte = pScanline[ nX >> 1 ];
 
-    ( nX & 1 ) ? ( rByte &= 0x0f, rByte |= ( rBitmapColor.GetIndex() << 4 ) ) :
+    ( nX & 1 ) ? ( rByte &= 0x0f, rByte |= ( rBitmapColor.GetIndex() << 4 ) ) : 
                  ( rByte &= 0xf0, rByte |= ( rBitmapColor.GetIndex() & 0x0f ) );
 }
 
@@ -110,7 +110,7 @@ IMPL_FORMAT_GETPIXEL_NOMASK( _8BIT_PAL )
 // ------------------------------------------------------------------
 
 IMPL_FORMAT_SETPIXEL_NOMASK( _8BIT_PAL )
-{
+{	
     pScanline[ nX ] = rBitmapColor.GetIndex();
 }
 
@@ -284,7 +284,7 @@ IMPL_FORMAT_GETPIXEL_NOMASK( _32BIT_TC_BGRA )
 // ------------------------------------------------------------------
 
 IMPL_FORMAT_SETPIXEL_NOMASK( _32BIT_TC_BGRA )
-{
+{		   
     *( pScanline = pScanline + ( nX << 2 ) )++ = rBitmapColor.GetBlue();
     *pScanline++ = rBitmapColor.GetGreen();
     *pScanline++ = rBitmapColor.GetRed();
diff --git a/vcl/source/gdi/bmpacc3.cxx b/vcl/source/gdi/bmpacc3.cxx
index a89015d12351..30f86a3539d0 100644
--- a/vcl/source/gdi/bmpacc3.cxx
+++ b/vcl/source/gdi/bmpacc3.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
@@ -49,7 +49,7 @@ void BitmapWriteAccess::SetLineColor()
 void BitmapWriteAccess::SetLineColor( const Color& rColor )
 {
     delete mpLineColor;
-
+    
     if( rColor.GetTransparency() == 255 )
         mpLineColor = NULL;
     else
@@ -61,12 +61,12 @@ void BitmapWriteAccess::SetLineColor( const Color& rColor )
 Color BitmapWriteAccess::GetLineColor() const
 {
     Color aRet;
-
+    
     if( mpLineColor )
         aRet = (const Color&) *mpLineColor;
     else
         aRet.SetTransparency( 255 );
-
+    
     return aRet;
 }
 
@@ -83,7 +83,7 @@ void BitmapWriteAccess::SetFillColor()
 void BitmapWriteAccess::SetFillColor( const Color& rColor )
 {
     delete mpFillColor;
-
+    
     if( rColor.GetTransparency() == 255 )
         mpFillColor = NULL;
     else
@@ -95,7 +95,7 @@ void BitmapWriteAccess::SetFillColor( const Color& rColor )
 Color BitmapWriteAccess::GetFillColor() const
 {
     Color aRet;
-
+    
     if( mpFillColor )
         aRet = (const Color&) *mpFillColor;
     else
@@ -118,9 +118,9 @@ void BitmapWriteAccess::Erase( const Color& rColor )
         return;
 
     // use the canonical method to clear the bitmap
-    BitmapColor*    pOldFillColor = mpFillColor ? new BitmapColor( *mpFillColor ) : NULL;
-    const Point     aPoint;
-    const Rectangle aRect( aPoint, maBitmap.GetSizePixel() );
+    BitmapColor*	pOldFillColor = mpFillColor ? new BitmapColor( *mpFillColor ) : NULL;
+    const Point		aPoint;	
+    const Rectangle	aRect( aPoint, maBitmap.GetSizePixel() );
 
     SetFillColor( rColor );
     FillRect( aRect );
@@ -134,17 +134,17 @@ void BitmapWriteAccess::DrawLine( const Point& rStart, const Point& rEnd )
 {
     if( mpLineColor )
     {
-        const BitmapColor&  rLineColor = *mpLineColor;
-        long                nX, nY;
-
+        const BitmapColor&	rLineColor = *mpLineColor;
+        long 				nX, nY;
+    
         if ( rStart.X() == rEnd.X() )
         {
             // vertikale Line
             const long nEndY = rEnd.Y();
-
+    
             nX = rStart.X();
             nY = rStart.Y();
-
+            
             if ( nEndY > nY )
             {
                 for (; nY <= nEndY; nY++ )
@@ -160,10 +160,10 @@ void BitmapWriteAccess::DrawLine( const Point& rStart, const Point& rEnd )
         {
             // horizontale Line
             const long nEndX = rEnd.X();
-
+            
             nX = rStart.X();
             nY = rStart.Y();
-
+    
             if ( nEndX > nX )
             {
                 for (; nX <= nEndX; nX++ )
@@ -177,13 +177,13 @@ void BitmapWriteAccess::DrawLine( const Point& rStart, const Point& rEnd )
         }
         else
         {
-            const long  nDX = labs( rEnd.X() - rStart.X() );
-            const long  nDY = labs( rEnd.Y() - rStart.Y() );
-            long        nX1;
-            long        nY1;
-            long        nX2;
-            long        nY2;
-
+            const long	nDX = labs( rEnd.X() - rStart.X() );
+            const long	nDY = labs( rEnd.Y() - rStart.Y() );
+            long		nX1;
+            long		nY1;
+            long		nX2;
+            long		nY2;
+    
             if ( nDX >= nDY )
             {
                 if ( rStart.X() < rEnd.X() )
@@ -200,22 +200,22 @@ void BitmapWriteAccess::DrawLine( const Point& rStart, const Point& rEnd )
                     nX2 = rStart.X();
                     nY2 = rStart.Y();
                 }
-
-                const long  nDYX = ( nDY - nDX ) << 1;
-                const long  nDY2 = nDY << 1;
-                long        nD = nDY2 - nDX;
-                BOOL        bPos = nY1 < nY2;
-
+    
+                const long	nDYX = ( nDY - nDX ) << 1;
+                const long	nDY2 = nDY << 1;
+                long		nD = nDY2 - nDX;
+                BOOL		bPos = nY1 < nY2;
+    
                 for ( nX = nX1, nY = nY1; nX <= nX2; nX++ )
                 {
                     SetPixel( nY, nX, rLineColor );
-
+    
                     if ( nD < 0 )
                         nD += nDY2;
                     else
                     {
                         nD += nDYX;
-
+    
                         if ( bPos )
                             nY++;
                         else
@@ -239,22 +239,22 @@ void BitmapWriteAccess::DrawLine( const Point& rStart, const Point& rEnd )
                     nX2 = rStart.X();
                     nY2 = rStart.Y();
                 }
-
-                const long  nDYX = ( nDX - nDY ) << 1;
-                const long  nDY2 = nDX << 1;
-                long        nD = nDY2 - nDY;
-                BOOL        bPos = nX1 < nX2;
-
+    
+                const long	nDYX = ( nDX - nDY ) << 1;
+                const long	nDY2 = nDX << 1;
+                long		nD = nDY2 - nDY;
+                BOOL		bPos = nX1 < nX2;
+    
                 for ( nX = nX1, nY = nY1; nY <= nY2; nY++ )
                 {
                     SetPixel( nY, nX, rLineColor );
-
+    
                     if ( nD < 0 )
                         nD += nDY2;
                     else
                     {
                         nD += nDYX;
-
+    
                         if ( bPos )
                             nX++;
                         else
@@ -272,19 +272,19 @@ void BitmapWriteAccess::FillRect( const Rectangle& rRect )
 {
     if( mpFillColor )
     {
-        const BitmapColor&  rFillColor = *mpFillColor;
-        Point               aPoint;
-        Rectangle           aRect( aPoint, maBitmap.GetSizePixel() );
+        const BitmapColor&	rFillColor = *mpFillColor;
+        Point 				aPoint;	
+        Rectangle			aRect( aPoint, maBitmap.GetSizePixel() );
 
         aRect.Intersection( rRect );
 
         if( !aRect.IsEmpty() )
         {
-            const long  nStartX = rRect.Left();
-            const long  nStartY = rRect.Top();
-            const long  nEndX = rRect.Right();
-            const long  nEndY = rRect.Bottom();
-
+            const long	nStartX = rRect.Left();
+            const long	nStartY = rRect.Top();
+            const long	nEndX = rRect.Right();
+            const long	nEndY = rRect.Bottom();
+    
             for( long nY = nStartY; nY <= nEndY; nY++ )
                 for( long nX = nStartX; nX <= nEndX; nX++ )
                     SetPixel( nY, nX, rFillColor );
@@ -298,7 +298,7 @@ void BitmapWriteAccess::DrawRect( const Rectangle& rRect )
 {
     if( mpFillColor )
         FillRect( rRect );
-
+    
     if( mpLineColor && ( !mpFillColor || ( *mpFillColor != *mpLineColor ) ) )
     {
         DrawLine( rRect.TopLeft(), rRect.TopRight() );
@@ -316,9 +316,9 @@ void BitmapWriteAccess::FillPolygon( const Polygon& rPoly )
 
     if( nSize && mpFillColor )
     {
-        const BitmapColor&  rFillColor = *mpFillColor;
-        Region              aRegion( rPoly );
-        Rectangle           aRect;
+        const BitmapColor&	rFillColor = *mpFillColor;
+        Region				aRegion( rPoly );
+        Rectangle			aRect;
 
         aRegion.Intersect( Rectangle( Point(), Size( Width(), Height() ) ) );
 
@@ -363,16 +363,16 @@ void BitmapWriteAccess::FillPolyPolygon( const PolyPolygon& rPolyPoly )
 
     if( nCount && mpFillColor )
     {
-        const BitmapColor&  rFillColor = *mpFillColor;
-        Region              aRegion( rPolyPoly );
-        Rectangle           aRect;
+        const BitmapColor&	rFillColor = *mpFillColor;
+        Region				aRegion( rPolyPoly );
+        Rectangle			aRect;
 
         aRegion.Intersect( Rectangle( Point(), Size( Width(), Height() ) ) );
 
         if( !aRegion.IsEmpty() )
         {
             RegionHandle aRegHandle( aRegion.BeginEnumRects() );
-
+            
             while( aRegion.GetNextEnumRect( aRegHandle, aRect ) )
                 for( long nY = aRect.Top(), nEndY = aRect.Bottom(); nY <= nEndY; nY++ )
                     for( long nX = aRect.Left(), nEndX = aRect.Right(); nX <= nEndX; nX++ )
@@ -389,13 +389,13 @@ void BitmapWriteAccess::DrawPolyPolygon( const PolyPolygon& rPolyPoly )
 {
     if( mpFillColor )
         FillPolyPolygon( rPolyPoly );
-
+    
     if( mpLineColor && ( !mpFillColor || ( *mpFillColor != *mpLineColor ) ) )
     {
         for( USHORT n = 0, nCount = rPolyPoly.Count(); n < nCount; )
         {
-            const Polygon&  rPoly = rPolyPoly[ n++ ];
-            const USHORT    nSize = rPoly.GetSize();
+            const Polygon&	rPoly = rPolyPoly[ n++ ];
+            const USHORT	nSize = rPoly.GetSize();
 
             if( nSize )
             {
diff --git a/vcl/source/gdi/bmpconv.cxx b/vcl/source/gdi/bmpconv.cxx
index d949f519d197..8295a353ae23 100644
--- a/vcl/source/gdi/bmpconv.cxx
+++ b/vcl/source/gdi/bmpconv.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
@@ -50,12 +50,12 @@ namespace vcl {
 class BmpTransporter :
         public cppu::WeakImplHelper1< com::sun::star::awt::XBitmap >
 {
-    Sequence<sal_Int8>          m_aBM;
-    com::sun::star::awt::Size   m_aSize;
+    Sequence<sal_Int8>			m_aBM;
+    com::sun::star::awt::Size	m_aSize;
 public:
     BmpTransporter( const Bitmap& rBM );
     virtual  ~BmpTransporter();
-
+    
     virtual com::sun::star::awt::Size SAL_CALL getSize() throw();
     virtual Sequence< sal_Int8 > SAL_CALL getDIB() throw();
     virtual Sequence< sal_Int8 > SAL_CALL getMaskDIB() throw();
@@ -67,7 +67,7 @@ class BmpConverter :
 public:
     BmpConverter();
     virtual ~BmpConverter();
-
+    
     virtual Reference< XIntrospectionAccess > SAL_CALL getIntrospection() throw();
     virtual void SAL_CALL setValue( const OUString& rProperty, const Any& rValue )
         throw( UnknownPropertyException );
@@ -75,7 +75,7 @@ public:
         throw( UnknownPropertyException );
     virtual sal_Bool SAL_CALL hasMethod( const OUString& rName ) throw();
     virtual sal_Bool SAL_CALL hasProperty( const OUString& rProp ) throw();
-
+    
     virtual Any SAL_CALL invoke( const OUString& rFunction,
                                  const Sequence< Any >& rParams,
                                  Sequence< sal_Int16 >& rOutParamIndex,
@@ -168,10 +168,10 @@ Any SAL_CALL BmpConverter::invoke(
         {
             switch( nTargetDepth )
             {
-                case 1:     aBM.Convert( BMP_CONVERSION_1BIT_THRESHOLD );break;
-                case 4:     aBM.ReduceColors( BMP_CONVERSION_4BIT_COLORS );break;
-                case 8:     aBM.ReduceColors( BMP_CONVERSION_8BIT_COLORS );break;
-                case 24:    aBM.Convert( BMP_CONVERSION_24BIT );break;
+                case 1:		aBM.Convert( BMP_CONVERSION_1BIT_THRESHOLD );break;
+                case 4:		aBM.ReduceColors( BMP_CONVERSION_4BIT_COLORS );break;
+                case 8:		aBM.ReduceColors( BMP_CONVERSION_8BIT_COLORS );break;
+                case 24:	aBM.Convert( BMP_CONVERSION_24BIT );break;
             }
         }
         xBM = new BmpTransporter( aBM );
diff --git a/vcl/source/gdi/bmpfast.cxx b/vcl/source/gdi/bmpfast.cxx
index e6c94ba0475e..496f0c7cdb67 100644
--- a/vcl/source/gdi/bmpfast.cxx
+++ b/vcl/source/gdi/bmpfast.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
@@ -538,7 +538,7 @@ inline bool ImplConvertFromBitmap( BitmapBuffer& rDst, const BitmapBuffer& rSrc
         case BMP_FORMAT_32BIT_TC_RGBA:
             return ImplConvertToBitmap<BMP_FORMAT_32BIT_TC_RGBA>( aSrcType, rDst, rSrc );
     }
-
+    
 #ifdef DEBUG
     static int nNotAccelerated = 0;
     if( rSrc.mnWidth * rSrc.mnHeight >= 4000 )
diff --git a/vcl/source/gdi/configsettings.cxx b/vcl/source/gdi/configsettings.cxx
index b11b9ab822f4..c19b3016f4ad 100644
--- a/vcl/source/gdi/configsettings.cxx
+++ b/vcl/source/gdi/configsettings.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
@@ -45,7 +45,7 @@ using namespace com::sun::star::container;
 #define SETTINGS_CONFIGNODE "VCL/Settings"
 
 /*
- *  SettingsConfigItem::get
+ *	SettingsConfigItem::get
  */
 
 SettingsConfigItem* SettingsConfigItem::get()
@@ -103,10 +103,10 @@ void SettingsConfigItem::Commit()
             String aName( aKeyName );
             aName.Append( '/' );
             aName.Append( String( it->first ) );
-            pValues[nIndex].Name    = aName;
-            pValues[nIndex].Handle  = 0;
+            pValues[nIndex].Name	= aName;
+            pValues[nIndex].Handle	= 0;
             pValues[nIndex].Value <<= it->second;
-            pValues[nIndex].State   = PropertyState_DIRECT_VALUE;
+            pValues[nIndex].State	= PropertyState_DIRECT_VALUE;
             nIndex++;
         }
         ReplaceSetProperties( aKeyName, aValues );
diff --git a/vcl/source/gdi/cvtgrf.cxx b/vcl/source/gdi/cvtgrf.cxx
index 8ba963bc4718..9b0ffac6f154 100644
--- a/vcl/source/gdi/cvtgrf.cxx
+++ b/vcl/source/gdi/cvtgrf.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
@@ -37,7 +37,7 @@
 #include <vcl/cvtgrf.hxx>
 
 // --------------
-// - Callback   -
+// - Callback	-
 // --------------
 
 // --------------------
@@ -66,8 +66,8 @@ ULONG GraphicConverter::ImplConvert( ULONG nInFormat, void* pInBuffer, ULONG nIn
     {
         if( ( nInFormat == CVT_SVM ) || ( nInFormat == CVT_BMP ) )
         {
-            SvMemoryStream  aIStm;
-            Graphic         aGraphic;
+            SvMemoryStream	aIStm;
+            Graphic			aGraphic;
 
             aIStm.SetBuffer( (char*) pInBuffer, nInBufSize, FALSE, nInBufSize );
             aIStm >> aGraphic;
@@ -77,7 +77,7 @@ ULONG GraphicConverter::ImplConvert( ULONG nInFormat, void* pInBuffer, ULONG nIn
                 SvMemoryStream aOStm( 64535, 64535 );
 
                 mpConvertData = new ConvertData( aGraphic, aOStm, nOutFormat );
-
+                
                 if( maFilterHdl.IsSet() && maFilterHdl.Call( mpConvertData ) )
                 {
                     nRetBufSize = aOStm.Seek( STREAM_SEEK_TO_END );
@@ -91,15 +91,15 @@ ULONG GraphicConverter::ImplConvert( ULONG nInFormat, void* pInBuffer, ULONG nIn
         }
         else if( ( nOutFormat == CVT_SVM ) || ( nOutFormat == CVT_BMP ) )
         {
-            SvMemoryStream  aIStm;
+            SvMemoryStream	aIStm;
 
             aIStm.SetBuffer( (char*) pInBuffer, nInBufSize, FALSE, nInBufSize );
             mpConvertData = new ConvertData( Graphic(), aIStm, nInFormat );
-
+                
             if( maFilterHdl.IsSet() && maFilterHdl.Call( mpConvertData ) )
             {
-                SvMemoryStream  aOStm( 645535, 64535 );
-                Graphic&        rGraphic = mpConvertData->maGraphic;
+                SvMemoryStream	aOStm( 645535, 64535 );
+                Graphic&		rGraphic = mpConvertData->maGraphic;
 
                 if( ( rGraphic.GetType() == GRAPHIC_BITMAP ) && ( CVT_SVM == nOutFormat ) )
                 {
@@ -135,13 +135,13 @@ ULONG GraphicConverter::ImplConvert( ULONG nInFormat, void* pInBuffer, ULONG nIn
 
 ULONG GraphicConverter::Import( SvStream& rIStm, Graphic& rGraphic, ULONG nFormat )
 {
-    GraphicConverter*   pCvt = ImplGetSVData()->maGDIData.mpGrfConverter;
-    ULONG               nRet = ERRCODE_IO_GENERAL;
+    GraphicConverter*	pCvt = ImplGetSVData()->maGDIData.mpGrfConverter;
+    ULONG				nRet = ERRCODE_IO_GENERAL;
 
     if( pCvt && pCvt->GetFilterHdl().IsSet() )
     {
-        ConvertData aData( rGraphic, rIStm, nFormat );
-
+        ConvertData	aData( rGraphic, rIStm, nFormat );
+        
         if( pCvt->GetFilterHdl().Call( &aData ) )
         {
             rGraphic = aData.maGraphic;
@@ -150,7 +150,7 @@ ULONG GraphicConverter::Import( SvStream& rIStm, Graphic& rGraphic, ULONG nForma
         else if( rIStm.GetError() )
             nRet = rIStm.GetError();
     }
-
+    
     return nRet;
 }
 
@@ -158,18 +158,18 @@ ULONG GraphicConverter::Import( SvStream& rIStm, Graphic& rGraphic, ULONG nForma
 
 ULONG GraphicConverter::Export( SvStream& rOStm, const Graphic& rGraphic, ULONG nFormat )
 {
-    GraphicConverter*   pCvt = ImplGetSVData()->maGDIData.mpGrfConverter;
-    ULONG               nRet = ERRCODE_IO_GENERAL;
+    GraphicConverter*	pCvt = ImplGetSVData()->maGDIData.mpGrfConverter;
+    ULONG				nRet = ERRCODE_IO_GENERAL;
 
     if( pCvt && pCvt->GetFilterHdl().IsSet() )
     {
-        ConvertData aData( rGraphic, rOStm, nFormat );
-
+        ConvertData	aData( rGraphic, rOStm, nFormat );
+        
         if( pCvt->GetFilterHdl().Call( &aData ) )
             nRet = ERRCODE_NONE;
         else if( rOStm.GetError() )
             nRet = rOStm.GetError();
     }
-
+    
     return nRet;
 }
diff --git a/vcl/source/gdi/cvtsvm.cxx b/vcl/source/gdi/cvtsvm.cxx
index af98e402f158..a8fbb58de509 100644
--- a/vcl/source/gdi/cvtsvm.cxx
+++ b/vcl/source/gdi/cvtsvm.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
@@ -74,7 +74,7 @@ void ImplWriteRect( SvStream& rOStm, const Rectangle& rRect )
 
 void ImplReadPoly( SvStream& rIStm, Polygon& rPoly )
 {
-    INT32   nSize;
+    INT32	nSize;
 
     rIStm >> nSize;
     rPoly = Polygon( (USHORT) nSize );
@@ -88,7 +88,7 @@ void ImplReadPoly( SvStream& rIStm, Polygon& rPoly )
 void ImplReadPolyPoly( SvStream& rIStm, PolyPolygon& rPolyPoly )
 {
     Polygon aPoly;
-    INT32   nPolyCount;
+    INT32	nPolyCount;
 
     rIStm >> nPolyCount;
 
@@ -103,9 +103,9 @@ void ImplReadPolyPoly( SvStream& rIStm, PolyPolygon& rPolyPoly )
 
 void ImplWritePolyPolyAction( SvStream& rOStm, const PolyPolygon& rPolyPoly )
 {
-    const USHORT    nPoly = rPolyPoly.Count();
-    USHORT          nPoints = 0;
-    USHORT          n;
+    const USHORT	nPoly = rPolyPoly.Count();
+    USHORT			nPoints = 0;
+    USHORT			n;
 
     for( n = 0; n < nPoly; n++ )
         nPoints = sal::static_int_cast<USHORT>(nPoints + rPolyPoly[ n ].GetSize());
@@ -161,12 +161,12 @@ void ImplWriteColor( SvStream& rOStm, const Color& rColor )
 
 void ImplReadMapMode( SvStream& rIStm, MapMode& rMapMode )
 {
-    Point   aOrg;
-    INT32   nXNum;
-    INT32   nXDenom;
-    INT32   nYNum;
-    INT32   nYDenom;
-    INT16   nUnit;
+    Point	aOrg;
+    INT32	nXNum;
+    INT32	nXDenom;
+    INT32	nYNum;
+    INT32	nYDenom;
+    INT16	nUnit;
 
     rIStm >> nUnit >> aOrg >> nXNum >> nXDenom >> nYNum >> nYDenom;
     rMapMode = MapMode( (MapUnit) nUnit, aOrg, Fraction( nXNum, nXDenom ), Fraction( nYNum, nYDenom ) );
@@ -244,8 +244,8 @@ void ImplWriteFillColor( SvStream& rOStm, const Color& rColor, INT16 nStyle )
 void ImplWriteFont( SvStream& rOStm, const Font& rFont,
                     rtl_TextEncoding& rActualCharSet )
 {
-    char    aName[32];
-    short   nWeight;
+    char	aName[32];
+    short	nWeight;
 
     ByteString aByteName( rFont.GetName(), rOStm.GetStreamCharSet() );
     strncpy( aName, aByteName.GetBuffer(), 32 );
@@ -313,8 +313,8 @@ sal_Bool ImplWriteUnicodeComment( SvStream& rOStm, const String& rString )
     xub_StrLen i, nStringLen = rString.Len();
     if ( nStringLen )
     {
-        sal_uInt32  nSize = ( nStringLen << 1 ) + 4;
-        sal_uInt16  nType = GDI_UNICODE_COMMENT;
+        sal_uInt32	nSize = ( nStringLen << 1 ) + 4;
+        sal_uInt16	nType = GDI_UNICODE_COMMENT;
 
         rOStm << nType << nSize;
         for ( i = 0; i < nStringLen; i++ )
@@ -333,12 +333,12 @@ void ImplReadUnicodeComment( sal_uInt32 nStrmPos, SvStream& rIStm, String& rStri
     sal_uInt32 nOld = rIStm.Tell();
     if ( nStrmPos )
     {
-        sal_uInt16  nType;
-        sal_uInt32  nActionSize;
+        sal_uInt16	nType;
+        sal_uInt32	nActionSize;
         xub_StrLen  nStringLen;
-
+        
         rIStm.Seek( nStrmPos );
-        rIStm   >> nType
+        rIStm	>> nType
                 >> nActionSize;
 
         nStringLen = sal::static_int_cast<xub_StrLen>(( nActionSize - 4 ) >> 1);
@@ -400,14 +400,14 @@ bool ImplWriteExtendedPolyPolygonAction(SvStream& rOStm, const PolyPolygon& rPol
         if((bOnlyWhenCurve && nAllFlagCount) || (!bOnlyWhenCurve && nAllPointCount))
         {
             rOStm << (INT16) GDI_EXTENDEDPOLYGON_ACTION;
-
+            
             const sal_Int32 nActionSize(
-                4 +                         // Action size
-                2 +                         // PolygonCount
-                (nAllPolygonCount * 2) +    // Points per polygon
-                (nAllPointCount << 3) +     // Points themselves
-                nAllPolygonCount +          // Bool if (when poly has points) it has flags, too
-                nAllFlagCount);             // Flags themselves
+                4 +							// Action size
+                2 +							// PolygonCount
+                (nAllPolygonCount * 2) +	// Points per polygon
+                (nAllPointCount << 3) +		// Points themselves
+                nAllPolygonCount +			// Bool if (when poly has points) it has flags, too
+                nAllFlagCount);				// Flags themselves
 
             rOStm << nActionSize;
             rOStm << (sal_uInt16)nAllPolygonCount;
@@ -508,26 +508,26 @@ SVMConverter::SVMConverter( SvStream& rStm, GDIMetaFile& rMtf, ULONG nConvertMod
 
 void SVMConverter::ImplConvertFromSVM1( SvStream& rIStm, GDIMetaFile& rMtf )
 {
-    const ULONG         nPos = rIStm.Tell();
-    const USHORT        nOldFormat = rIStm.GetNumberFormatInt();
+    const ULONG			nPos = rIStm.Tell();
+    const USHORT		nOldFormat = rIStm.GetNumberFormatInt();
 
     rIStm.SetNumberFormatInt( NUMBERFORMAT_INT_LITTLEENDIAN );
 
-    char    aCode[ 5 ];
-    Size    aPrefSz;
-    INT16   nSize;
-    INT16   nVersion;
+    char	aCode[ 5 ];
+    Size	aPrefSz;
+    INT16	nSize;
+    INT16	nVersion;
 
     // read header
-    rIStm.Read( (char*) &aCode, sizeof( aCode ) );  // Kennung
-    rIStm >> nSize;                                 // Size
-    rIStm >> nVersion;                              // Version
-    rIStm >> aPrefSz.Width();                       // PrefSize.Width()
-    rIStm >> aPrefSz.Height();                      // PrefSize.Height()
+    rIStm.Read( (char*) &aCode, sizeof( aCode ) );	// Kennung
+    rIStm >> nSize; 								// Size
+    rIStm >> nVersion;								// Version
+    rIStm >> aPrefSz.Width();						// PrefSize.Width()
+    rIStm >> aPrefSz.Height();						// PrefSize.Height()
 
     // check header-magic and version
     if( rIStm.GetError()
-        || ( memcmp( aCode, "SVGDI", sizeof( aCode ) ) != 0 )
+        || ( memcmp( aCode, "SVGDI", sizeof( aCode ) ) != 0 ) 
         || ( nVersion != 200 ) )
     {
         rIStm.SetError( SVSTREAM_FILEFORMAT_ERROR );
@@ -536,28 +536,28 @@ void SVMConverter::ImplConvertFromSVM1( SvStream& rIStm, GDIMetaFile& rMtf )
         return;
     }
 
-    LineInfo            aLineInfo( LINE_NONE, 0 );
-    Stack               aLIStack;
-    VirtualDevice       aFontVDev;
-    rtl_TextEncoding    eActualCharSet = gsl_getSystemTextEncoding();
-    BOOL                bFatLine = FALSE;
+    LineInfo			aLineInfo( LINE_NONE, 0 );
+    Stack				aLIStack;
+    VirtualDevice		aFontVDev;
+    rtl_TextEncoding	eActualCharSet = gsl_getSystemTextEncoding();
+    BOOL				bFatLine = FALSE;
 
     // TODO: fix reindentation below if you can accept being blamed by the SCM
         MapMode     aMapMode;
-        Polygon     aActionPoly;
-        Rectangle   aRect;
-        Point       aPt, aPt1;
-        Size        aSz;
-        Color       aActionColor;
-        INT32       nTmp, nTmp1, nActionSize;
-        INT32       nActions;
-        INT16       nType;
+        Polygon 	aActionPoly;
+        Rectangle	aRect;
+        Point		aPt, aPt1;
+        Size		aSz;
+        Color		aActionColor;
+        INT32		nTmp, nTmp1, nActionSize;
+        INT32	    nActions;
+        INT16		nType;
 
-        sal_uInt32  nUnicodeCommentStreamPos = 0;
-        INT32       nUnicodeCommentActionNumber = 0;
+        sal_uInt32	nUnicodeCommentStreamPos = 0;
+        INT32	    nUnicodeCommentActionNumber = 0;
 
-        ImplReadMapMode( rIStm, aMapMode );             // MapMode
-        rIStm >> nActions;                              // Action count
+        ImplReadMapMode( rIStm, aMapMode ); 			// MapMode
+        rIStm >> nActions;								// Action count
 
         rMtf.SetPrefSize( aPrefSz );
         rMtf.SetPrefMapMode( aMapMode );
@@ -566,7 +566,7 @@ void SVMConverter::ImplConvertFromSVM1( SvStream& rIStm, GDIMetaFile& rMtf )
         for( INT32 i = 0L; i < nActions; i++ )
         {
             rIStm >> nType;
-            sal_Int32 nActBegin = rIStm.Tell();
+            sal_Int32 nActBegin = rIStm.Tell();	
             rIStm >> nActionSize;
 
             DBG_ASSERT( ( nType <= 33 ) || ( nType >= 1024 ), "Unknown GDIMetaAction while converting!" );
@@ -643,7 +643,7 @@ void SVMConverter::ImplConvertFromSVM1( SvStream& rIStm, GDIMetaFile& rMtf )
                             {
                                 rMtf.ReplaceAction(
                                     new MetaPolyLineAction(
-                                        aInputPolyPolygon.GetObject(0),
+                                        aInputPolyPolygon.GetObject(0), 
                                         pPolyLineAction->GetLineInfo()),
                                     nLastPolygonAction);
                                 pPolyLineAction->Delete();
@@ -833,12 +833,12 @@ void SVMConverter::ImplConvertFromSVM1( SvStream& rIStm, GDIMetaFile& rMtf )
 
                 case( GDI_FONT_ACTION ):
                 {
-                    Font    aFont;
-                    char    aName[ 32 ];
-                    INT32   nWidth, nHeight;
-                    INT16   nCharSet, nFamily, nPitch, nAlign, nWeight, nUnderline, nStrikeout;
-                    INT16   nCharOrient, nLineOrient;
-                    BOOL    bItalic, bOutline, bShadow, bTransparent;
+                    Font	aFont;
+                    char	aName[ 32 ];
+                    INT32	nWidth, nHeight;
+                    INT16	nCharSet, nFamily, nPitch, nAlign, nWeight, nUnderline, nStrikeout;
+                    INT16	nCharOrient, nLineOrient;
+                    BOOL	bItalic, bOutline, bShadow, bTransparent;
 
                     ImplReadColor( rIStm, aActionColor ); aFont.SetColor( aActionColor );
                     ImplReadColor( rIStm, aActionColor ); aFont.SetFillColor( aActionColor );
@@ -867,7 +867,7 @@ void SVMConverter::ImplConvertFromSVM1( SvStream& rIStm, GDIMetaFile& rMtf )
                     eActualCharSet = aFont.GetCharSet();
                     if ( eActualCharSet == RTL_TEXTENCODING_DONTKNOW )
                         eActualCharSet = gsl_getSystemTextEncoding();
-
+                    
                     rMtf.AddAction( new MetaFontAction( aFont ) );
                     rMtf.AddAction( new MetaTextAlignAction( aFont.GetAlign() ) );
                     rMtf.AddAction( new MetaTextColorAction( aFont.GetColor() ) );
@@ -880,9 +880,9 @@ void SVMConverter::ImplConvertFromSVM1( SvStream& rIStm, GDIMetaFile& rMtf )
 
                 case( GDI_TEXT_ACTION ):
                 {
-                    ByteString  aByteStr;
-                    INT32       nIndex, nLen;
-
+                    ByteString	aByteStr;
+                    INT32		nIndex, nLen;
+            
                     rIStm >> aPt >> nIndex >> nLen >> nTmp;
                     if ( nTmp && ( static_cast< sal_uInt32 >( nTmp ) < ( SAL_MAX_UINT16 - 1 ) ) )
                                         {
@@ -898,9 +898,9 @@ void SVMConverter::ImplConvertFromSVM1( SvStream& rIStm, GDIMetaFile& rMtf )
 
                 case( GDI_TEXTARRAY_ACTION ):
                 {
-                    ByteString  aByteStr;
-                    sal_Int32*  pDXAry = NULL;
-                    INT32       nIndex, nLen, nAryLen;
+                    ByteString	aByteStr;
+                    sal_Int32*	pDXAry = NULL;
+                    INT32		nIndex, nLen, nAryLen;
 
                     rIStm >> aPt >> nIndex >> nLen >> nTmp >> nAryLen;
                     if ( nTmp && ( static_cast< sal_uInt32 >( nTmp ) < ( SAL_MAX_UINT16 - 1 ) ) )
@@ -925,7 +925,7 @@ void SVMConverter::ImplConvertFromSVM1( SvStream& rIStm, GDIMetaFile& rMtf )
                                     sal_Int32* pTmpAry = new sal_Int32[nStrLen];
 
                                     aFontVDev.GetTextArray( aStr, pTmpAry, (USHORT) nIndex, (USHORT) nLen );
-
+                                    
                                     // now, the difference between the
                                     // last and the second last DX array
                                     // is the advancement for the last
@@ -959,8 +959,8 @@ void SVMConverter::ImplConvertFromSVM1( SvStream& rIStm, GDIMetaFile& rMtf )
 
                 case( GDI_STRETCHTEXT_ACTION ):
                 {
-                    ByteString  aByteStr;
-                    INT32       nIndex, nLen, nWidth;
+                    ByteString	aByteStr;
+                    INT32		nIndex, nLen, nWidth;
 
                     rIStm >> aPt >> nIndex >> nLen >> nTmp >> nWidth;
                     if ( nTmp && ( static_cast< sal_uInt32 >( nTmp ) < ( SAL_MAX_INT16 - 1 ) ) )
@@ -995,8 +995,8 @@ void SVMConverter::ImplConvertFromSVM1( SvStream& rIStm, GDIMetaFile& rMtf )
 
                 case( GDI_BITMAPSCALEPART_ACTION ):
                 {
-                    Bitmap  aBmp;
-                    Size    aSz2;
+                    Bitmap	aBmp;
+                    Size	aSz2;
 
                     rIStm >> aPt >> aSz >> aPt1 >> aSz2 >> aBmp;
                     rMtf.AddAction( new MetaBmpScalePartAction( aPt, aSz, aPt1, aSz2, aBmp ) );
@@ -1043,10 +1043,10 @@ void SVMConverter::ImplConvertFromSVM1( SvStream& rIStm, GDIMetaFile& rMtf )
 
                 case( GDI_CLIPREGION_ACTION ):
                 {
-                    Region  aRegion;
-                    INT16   nRegType;
-                    INT16   bIntersect;
-                    BOOL    bClip = FALSE;
+                    Region	aRegion;
+                    INT16	nRegType;
+                    INT16	bIntersect;
+                    BOOL	bClip = FALSE;
 
                     rIStm >> nRegType >> bIntersect;
                     ImplReadRect( rIStm, aRect );
@@ -1077,7 +1077,7 @@ void SVMConverter::ImplConvertFromSVM1( SvStream& rIStm, GDIMetaFile& rMtf )
                         case( 3 ):
                         {
                             PolyPolygon aPolyPoly;
-                            INT32       nPolyCount;
+                            INT32		nPolyCount;
 
                             rIStm >> nPolyCount;
 
@@ -1116,8 +1116,8 @@ void SVMConverter::ImplConvertFromSVM1( SvStream& rIStm, GDIMetaFile& rMtf )
 
                 case( GDI_RASTEROP_ACTION ):
                 {
-                    RasterOp    eRasterOp;
-                    INT16       nRasterOp;
+                    RasterOp	eRasterOp;
+                    INT16		nRasterOp;
 
                     rIStm >> nRasterOp;
 
@@ -1173,15 +1173,15 @@ void SVMConverter::ImplConvertFromSVM1( SvStream& rIStm, GDIMetaFile& rMtf )
 
                 case( GDI_GRADIENT_ACTION ):
                 {
-                    Color   aStartCol;
-                    Color   aEndCol;
-                    INT16   nStyle;
-                    INT16   nAngle;
-                    INT16   nBorder;
-                    INT16   nOfsX;
-                    INT16   nOfsY;
-                    INT16   nIntensityStart;
-                    INT16   nIntensityEnd;
+                    Color	aStartCol;
+                    Color	aEndCol;
+                    INT16	nStyle;
+                    INT16	nAngle;
+                    INT16	nBorder;
+                    INT16	nOfsX;
+                    INT16	nOfsY;
+                    INT16	nIntensityStart;
+                    INT16	nIntensityEnd;
 
                     ImplReadRect( rIStm, aRect );
                     rIStm >> nStyle;
@@ -1204,8 +1204,8 @@ void SVMConverter::ImplConvertFromSVM1( SvStream& rIStm, GDIMetaFile& rMtf )
                 case( GDI_TRANSPARENT_COMMENT ):
                 {
                     PolyPolygon aPolyPoly;
-                    INT32       nFollowingActionCount;
-                    INT16       nTrans;
+                    INT32		nFollowingActionCount;
+                    INT16		nTrans;
 
                     rIStm >> aPolyPoly >> nTrans >> nFollowingActionCount;
                     ImplSkipActions( rIStm, nFollowingActionCount );
@@ -1220,10 +1220,10 @@ void SVMConverter::ImplConvertFromSVM1( SvStream& rIStm, GDIMetaFile& rMtf )
                 case( GDI_FLOATTRANSPARENT_COMMENT ):
                 {
                     GDIMetaFile aMtf;
-                    Point       aPos;
-                    Size        aSize;
-                    Gradient    aGradient;
-                    INT32       nFollowingActionCount;
+                    Point		aPos;
+                    Size		aSize;
+                    Gradient	aGradient;
+                    INT32		nFollowingActionCount;
 
                     rIStm >> aMtf >> aPos >> aSize >> aGradient >> nFollowingActionCount;
                     ImplSkipActions( rIStm, nFollowingActionCount );
@@ -1238,8 +1238,8 @@ void SVMConverter::ImplConvertFromSVM1( SvStream& rIStm, GDIMetaFile& rMtf )
                 case( GDI_HATCH_COMMENT ):
                 {
                     PolyPolygon aPolyPoly;
-                    Hatch       aHatch;
-                    INT32       nFollowingActionCount;
+                    Hatch		aHatch;
+                    INT32		nFollowingActionCount;
 
                     rIStm >> aPolyPoly >> aHatch >> nFollowingActionCount;
                     ImplSkipActions( rIStm, nFollowingActionCount );
@@ -1253,9 +1253,9 @@ void SVMConverter::ImplConvertFromSVM1( SvStream& rIStm, GDIMetaFile& rMtf )
 
                 case( GDI_REFPOINT_COMMENT ):
                 {
-                    Point   aRefPoint;
-                    BOOL    bSet;
-                    INT32   nFollowingActionCount;
+                    Point	aRefPoint;
+                    BOOL	bSet;
+                    INT32	nFollowingActionCount;
 
                     rIStm >> aRefPoint >> bSet >> nFollowingActionCount;
                     ImplSkipActions( rIStm, nFollowingActionCount );
@@ -1275,9 +1275,9 @@ void SVMConverter::ImplConvertFromSVM1( SvStream& rIStm, GDIMetaFile& rMtf )
 
                 case( GDI_TEXTLINECOLOR_COMMENT ):
                 {
-                    Color   aColor;
-                    BOOL    bSet;
-                    INT32   nFollowingActionCount;
+                    Color	aColor;
+                    BOOL	bSet;
+                    INT32	nFollowingActionCount;
 
                     rIStm >> aColor >> bSet >> nFollowingActionCount;
                     ImplSkipActions( rIStm, nFollowingActionCount );
@@ -1291,11 +1291,11 @@ void SVMConverter::ImplConvertFromSVM1( SvStream& rIStm, GDIMetaFile& rMtf )
 
                 case( GDI_TEXTLINE_COMMENT ):
                 {
-                    Point   aStartPt;
-                    long    nWidth;
+                    Point	aStartPt;
+                    long	nWidth;
                     sal_uInt32 nStrikeout;
                     sal_uInt32 nUnderline;
-                    INT32   nFollowingActionCount;
+                    INT32	nFollowingActionCount;
 
                     rIStm >> aStartPt >> nWidth >> nStrikeout >> nUnderline >> nFollowingActionCount;
                     ImplSkipActions( rIStm, nFollowingActionCount );
@@ -1313,8 +1313,8 @@ void SVMConverter::ImplConvertFromSVM1( SvStream& rIStm, GDIMetaFile& rMtf )
                 case( GDI_GRADIENTEX_COMMENT ):
                 {
                     PolyPolygon aPolyPoly;
-                    Gradient    aGradient;
-                    INT32       nFollowingActionCount;
+                    Gradient	aGradient;
+                    INT32		nFollowingActionCount;
 
                     rIStm >> aPolyPoly >> aGradient >> nFollowingActionCount;
                     ImplSkipActions( rIStm, nFollowingActionCount );
@@ -1328,11 +1328,11 @@ void SVMConverter::ImplConvertFromSVM1( SvStream& rIStm, GDIMetaFile& rMtf )
 
                 case( GDI_COMMENT_COMMENT ):
                 {
-                    ByteString  aComment;
-                    sal_Int32   nValue;
-                    sal_uInt32  nDataSize;
-                    BYTE*       pData;
-                    INT32       nFollowingActionCount;
+                    ByteString	aComment;
+                    sal_Int32	nValue;
+                    sal_uInt32	nDataSize;
+                    BYTE*		pData;
+                    INT32		nFollowingActionCount;
 
                     rIStm >> aComment >> nValue >> nDataSize;
 
@@ -1379,24 +1379,24 @@ void SVMConverter::ImplConvertFromSVM1( SvStream& rIStm, GDIMetaFile& rMtf )
 
 void SVMConverter::ImplConvertToSVM1( SvStream& rOStm, GDIMetaFile& rMtf )
 {
-    ULONG               nPos;
-    ULONG               nCountPos;
-    Font                aSaveFont;
-    const USHORT        nOldFormat = rOStm.GetNumberFormatInt();
-    rtl_TextEncoding    eActualCharSet = gsl_getSystemTextEncoding();
-    const Size          aPrefSize( rMtf.GetPrefSize() );
-    BOOL                bRop_0_1 = FALSE;
-    VirtualDevice       aSaveVDev;
-    Color               aLineCol( COL_BLACK );
-    Stack               aLineColStack;
+    ULONG				nPos;
+    ULONG				nCountPos;
+    Font				aSaveFont;
+    const USHORT		nOldFormat = rOStm.GetNumberFormatInt();
+    rtl_TextEncoding	eActualCharSet = gsl_getSystemTextEncoding();
+    const Size			aPrefSize( rMtf.GetPrefSize() );
+    BOOL				bRop_0_1 = FALSE;
+    VirtualDevice		aSaveVDev;
+    Color				aLineCol( COL_BLACK );
+    Stack				aLineColStack;
 
     rOStm.SetNumberFormatInt( NUMBERFORMAT_INT_LITTLEENDIAN );
 
     //MagicCode schreiben
     rOStm << "SVGDI";                                   // Kennung
     nPos = rOStm.Tell();
-    rOStm << (INT16) 42;                                // HeaderSize
-    rOStm << (INT16) 200;                               // VERSION
+    rOStm << (INT16) 42;								// HeaderSize
+    rOStm << (INT16) 200;								// VERSION
     rOStm << (INT32) aPrefSize.Width();
     rOStm << (INT32) aPrefSize.Height();
     ImplWriteMapMode( rOStm, rMtf.GetPrefMapMode() );
@@ -1497,12 +1497,12 @@ ULONG SVMConverter::ImplWriteActions( SvStream& rOStm, GDIMetaFile& rMtf,
                 {
                     ImplWritePopAction( rOStm );
                     nCount += 3;
-
+                    
                     if(bLineJoin)
                     {
                         nCount += 1;
                     }
-
+                    
                     if(bLineDashDot)
                     {
                         nCount += 1;
@@ -1576,10 +1576,10 @@ ULONG SVMConverter::ImplWriteActions( SvStream& rOStm, GDIMetaFile& rMtf,
 
             case( META_CHORD_ACTION ):
             {
-                MetaChordAction*    pAct = (MetaChordAction*) pAction;
-                Polygon             aChordPoly( pAct->GetRect(), pAct->GetStartPoint(),
+                MetaChordAction*	pAct = (MetaChordAction*) pAction;
+                Polygon 			aChordPoly( pAct->GetRect(), pAct->GetStartPoint(),
                                                 pAct->GetEndPoint(), POLY_CHORD );
-                const USHORT        nPoints = aChordPoly.GetSize();
+                const USHORT		nPoints = aChordPoly.GetSize();
 
                 rOStm << (INT16) GDI_POLYGON_ACTION;
                 rOStm << (INT32) ( 8 + ( nPoints << 3 ) );
@@ -1651,13 +1651,13 @@ ULONG SVMConverter::ImplWriteActions( SvStream& rOStm, GDIMetaFile& rMtf,
                 {
                     ImplWritePopAction( rOStm );
                     nCount += 3;
-
+                    
                     if(bLineJoin)
                     {
                         nCount += 1;
                     }
                 }
-
+                    
                 if(bLineDashDot)
                 {
                     nCount += 1;
@@ -1683,7 +1683,7 @@ ULONG SVMConverter::ImplWriteActions( SvStream& rOStm, GDIMetaFile& rMtf,
                     rOStm << aSimplePoly[ n ];
 
                 nCount++;
-
+                
                 const PolyPolygon aPolyPolygon(pAct->GetPolygon());
                 if(ImplWriteExtendedPolyPolygonAction(rOStm, aPolyPolygon, true))
                 {
@@ -1697,7 +1697,7 @@ ULONG SVMConverter::ImplWriteActions( SvStream& rOStm, GDIMetaFile& rMtf,
                 MetaPolyPolygonAction* pAct = (MetaPolyPolygonAction*) pAction;
                 ImplWritePolyPolyAction( rOStm, pAct->GetPolyPolygon() );
                 nCount++;
-
+                
                 if(ImplWriteExtendedPolyPolygonAction(rOStm, pAct->GetPolyPolygon(), true))
                 {
                     nCount++;
@@ -1708,9 +1708,9 @@ ULONG SVMConverter::ImplWriteActions( SvStream& rOStm, GDIMetaFile& rMtf,
             case( META_TEXT_ACTION ):
             {
                 MetaTextAction* pAct = (MetaTextAction*) pAction;
-                String          aUniText( pAct->GetText() );
-                ByteString      aText( aUniText, rActualCharSet );
-                const ULONG     nStrLen = aText.Len();
+                String			aUniText( pAct->GetText() );
+                ByteString		aText( aUniText, rActualCharSet );
+                const ULONG 	nStrLen = aText.Len();
 
                 if ( ImplWriteUnicodeComment( rOStm, aUniText ) )
                     nCount++;
@@ -1728,13 +1728,13 @@ ULONG SVMConverter::ImplWriteActions( SvStream& rOStm, GDIMetaFile& rMtf,
 
             case( META_TEXTARRAY_ACTION ):
             {
-                MetaTextArrayAction*    pAct = (MetaTextArrayAction*)pAction;
-                ByteString              aText( pAct->GetText(), rActualCharSet );
-                String                  aUniText( pAct->GetText(), pAct->GetIndex(), pAct->GetLen() );
-                ULONG                   nAryLen;
-                ULONG                   nLen = pAct->GetLen();
-                const ULONG             nTextLen = aText.Len();
-                sal_Int32*              pDXArray = pAct->GetDXArray();
+                MetaTextArrayAction*	pAct = (MetaTextArrayAction*)pAction;
+                ByteString				aText( pAct->GetText(), rActualCharSet );
+                String					aUniText( pAct->GetText(), pAct->GetIndex(), pAct->GetLen() );
+                ULONG					nAryLen;
+                ULONG					nLen = pAct->GetLen();
+                const ULONG 			nTextLen = aText.Len();
+                sal_Int32*				pDXArray = pAct->GetDXArray();
 
                 if ( ImplWriteUnicodeComment( rOStm, aUniText ) )
                     nCount++;
@@ -1750,7 +1750,7 @@ ULONG SVMConverter::ImplWriteActions( SvStream& rOStm, GDIMetaFile& rMtf,
                 if( !pDXArray || !nLen )
                     nAryLen = 0;
                 else
-                    nAryLen = nLen; // #105987# Write out all of DX array
+                    nAryLen = nLen;	// #105987# Write out all of DX array
 
                 rOStm << (INT16) GDI_TEXTARRAY_ACTION;
                 rOStm << (INT32) ( 28 + ( nLen + 1 ) + ( nAryLen * 4 ) );
@@ -1770,10 +1770,10 @@ ULONG SVMConverter::ImplWriteActions( SvStream& rOStm, GDIMetaFile& rMtf,
 
             case( META_STRETCHTEXT_ACTION ):
             {
-                MetaStretchTextAction*  pAct = (MetaStretchTextAction*) pAction;
-                String                  aUniText( pAct->GetText() );
-                ByteString              aText( aUniText, rActualCharSet );
-                const ULONG             nStrLen = aText.Len();
+                MetaStretchTextAction*	pAct = (MetaStretchTextAction*) pAction;
+                String					aUniText( pAct->GetText() );
+                ByteString				aText( aUniText, rActualCharSet );
+                const ULONG 			nStrLen = aText.Len();
 
                 if ( ImplWriteUnicodeComment( rOStm, aUniText ) )
                     nCount++;
@@ -1832,8 +1832,8 @@ ULONG SVMConverter::ImplWriteActions( SvStream& rOStm, GDIMetaFile& rMtf,
 
             case( META_BMPEX_ACTION ):
             {
-                MetaBmpExAction*    pAct = (MetaBmpExAction*) pAction;
-                const Bitmap        aBmp( Graphic( pAct->GetBitmapEx() ).GetBitmap() );
+                MetaBmpExAction*	pAct = (MetaBmpExAction*) pAction;
+                const Bitmap		aBmp( Graphic( pAct->GetBitmapEx() ).GetBitmap() );
 
                 rOStm << (INT16) GDI_BITMAP_ACTION;
                 rOStm << (INT32) 12;
@@ -1845,8 +1845,8 @@ ULONG SVMConverter::ImplWriteActions( SvStream& rOStm, GDIMetaFile& rMtf,
 
             case( META_BMPEXSCALE_ACTION ):
             {
-                MetaBmpExScaleAction*   pAct = (MetaBmpExScaleAction*) pAction;
-                const Bitmap            aBmp( Graphic( pAct->GetBitmapEx() ).GetBitmap() );
+                MetaBmpExScaleAction*	pAct = (MetaBmpExScaleAction*) pAction;
+                const Bitmap			aBmp( Graphic( pAct->GetBitmapEx() ).GetBitmap() );
 
                 rOStm << (INT16) GDI_BITMAPSCALE_ACTION;
                 rOStm << (INT32) 20;
@@ -1860,7 +1860,7 @@ ULONG SVMConverter::ImplWriteActions( SvStream& rOStm, GDIMetaFile& rMtf,
             case( META_BMPEXSCALEPART_ACTION ):
             {
                 MetaBmpExScalePartAction* pAct = (MetaBmpExScalePartAction*) pAction;
-                const Bitmap            aBmp( Graphic( pAct->GetBitmapEx() ).GetBitmap() );
+                const Bitmap			aBmp( Graphic( pAct->GetBitmapEx() ).GetBitmap() );
 
                 rOStm << (INT16) GDI_BITMAPSCALEPART_ACTION;
                 rOStm << (INT32) 36;
@@ -1876,7 +1876,7 @@ ULONG SVMConverter::ImplWriteActions( SvStream& rOStm, GDIMetaFile& rMtf,
             case( META_GRADIENT_ACTION ):
             {
                 MetaGradientAction* pAct = (MetaGradientAction*) pAction;
-                const Gradient&     rGrad = pAct->GetGradient();
+                const Gradient& 	rGrad = pAct->GetGradient();
 
                 rOStm << (INT16) GDI_GRADIENT_ACTION;
                 rOStm << (INT32) 46;
@@ -1897,7 +1897,7 @@ ULONG SVMConverter::ImplWriteActions( SvStream& rOStm, GDIMetaFile& rMtf,
             case( META_GRADIENTEX_ACTION ):
             {
                 const MetaGradientExAction* pA = (MetaGradientExAction*) pAction;
-                ULONG                       nOldPos, nNewPos;
+                ULONG						nOldPos, nNewPos;
 
                 // write RefPoint comment
                 rOStm << (INT16) GDI_GRADIENTEX_COMMENT;
@@ -1922,8 +1922,8 @@ ULONG SVMConverter::ImplWriteActions( SvStream& rOStm, GDIMetaFile& rMtf,
 
             case( META_WALLPAPER_ACTION ):
             {
-                MetaWallpaperAction*    pAct = (MetaWallpaperAction*) pAction;
-                const Color&            rColor = pAct->GetWallpaper().GetColor();
+                MetaWallpaperAction*	pAct = (MetaWallpaperAction*) pAction;
+                const Color&			rColor = pAct->GetWallpaper().GetColor();
 
                 ImplWritePushAction( rOStm );
                 ImplWriteLineColor( rOStm, rColor, 1 );
@@ -1942,9 +1942,9 @@ ULONG SVMConverter::ImplWriteActions( SvStream& rOStm, GDIMetaFile& rMtf,
 
             case( META_CLIPREGION_ACTION ):
             {
-                MetaClipRegionAction*   pAct = (MetaClipRegionAction*) pAction;
-                const Region&           rRegion = pAct->GetRegion();
-                Rectangle               aClipRect;
+                MetaClipRegionAction*	pAct = (MetaClipRegionAction*) pAction;
+                const Region&			rRegion = pAct->GetRegion();
+                Rectangle				aClipRect;
 
                 rOStm << (INT16) GDI_CLIPREGION_ACTION;
                 rOStm << (INT32) 24;
@@ -2027,8 +2027,8 @@ ULONG SVMConverter::ImplWriteActions( SvStream& rOStm, GDIMetaFile& rMtf,
 
             case( META_TEXTFILLCOLOR_ACTION ):
             {
-                MetaTextFillColorAction*    pAct = (MetaTextFillColorAction*) pAction;
-                Font                        aSaveFont( rSaveVDev.GetFont() );
+                MetaTextFillColorAction*	pAct = (MetaTextFillColorAction*) pAction;
+                Font						aSaveFont( rSaveVDev.GetFont() );
 
                 if( pAct->IsSetting() )
                     aSaveFont.SetFillColor( pAct->GetColor() );
@@ -2109,9 +2109,9 @@ ULONG SVMConverter::ImplWriteActions( SvStream& rOStm, GDIMetaFile& rMtf,
                     switch( pAct->GetRasterOp() )
                     {
                         case( ROP_OVERPAINT ) : nRasterOp = 0; break;
-                        case( ROP_XOR ) :       nRasterOp = 4; break;
-                        case( ROP_INVERT ):     nRasterOp = 1; break;
-                        default:                nRasterOp = 0; break;
+                        case( ROP_XOR ) :		nRasterOp = 4; break;
+                        case( ROP_INVERT ): 	nRasterOp = 1; break;
+                        default:				nRasterOp = 0; break;
                     }
 
                     ImplWriteRasterOpAction( rOStm, nRasterOp );
@@ -2142,10 +2142,10 @@ ULONG SVMConverter::ImplWriteActions( SvStream& rOStm, GDIMetaFile& rMtf,
 
             case( META_TRANSPARENT_ACTION ):
             {
-                const PolyPolygon&  rPolyPoly = ( (MetaTransparentAction*) pAction )->GetPolyPolygon();
-                const INT16         nTrans = ( (MetaTransparentAction*) pAction )->GetTransparence();
-                const INT16         nBrushStyle = ( nTrans < 38 ) ? 8 : ( nTrans < 63 ) ? 9 : 10;
-                ULONG               nOldPos, nNewPos;
+                const PolyPolygon&	rPolyPoly = ( (MetaTransparentAction*) pAction )->GetPolyPolygon();
+                const INT16 		nTrans = ( (MetaTransparentAction*) pAction )->GetTransparence();
+                const INT16 		nBrushStyle = ( nTrans < 38 ) ? 8 : ( nTrans < 63 ) ? 9 : 10;
+                ULONG				nOldPos, nNewPos;
 
                 // write transparence comment
                 rOStm << (INT16) GDI_TRANSPARENT_COMMENT;
@@ -2203,12 +2203,12 @@ ULONG SVMConverter::ImplWriteActions( SvStream& rOStm, GDIMetaFile& rMtf,
 
             case( META_FLOATTRANSPARENT_ACTION ):
             {
-                const MetaFloatTransparentAction*   pA = (MetaFloatTransparentAction*) pAction;
-                const GDIMetaFile&                  rTransMtf = pA->GetGDIMetaFile();
-                const Point&                        rPos = pA->GetPoint();
-                const Size&                         rSize = pA->GetSize();
-                const Gradient&                     rGradient = pA->GetGradient();
-                ULONG                               nOldPos, nNewPos;
+                const MetaFloatTransparentAction*	pA = (MetaFloatTransparentAction*) pAction;
+                const GDIMetaFile&					rTransMtf = pA->GetGDIMetaFile();
+                const Point&						rPos = pA->GetPoint();
+                const Size& 						rSize = pA->GetSize();
+                const Gradient& 					rGradient = pA->GetGradient();
+                ULONG								nOldPos, nNewPos;
 
                 // write RefPoint comment
                 rOStm << (INT16) GDI_FLOATTRANSPARENT_COMMENT;
@@ -2228,13 +2228,13 @@ ULONG SVMConverter::ImplWriteActions( SvStream& rOStm, GDIMetaFile& rMtf,
 
                 {
                     // write actions for float transparence
-                    ULONG           nAddCount;
-                    GDIMetaFile     aMtf( rTransMtf );
-                    const Size      aSrcSize( rTransMtf.GetPrefSize() );
-                    Point           aSrcPt( rTransMtf.GetPrefMapMode().GetOrigin() );
-                    const double    fScaleX = aSrcSize.Width() ? (double) rSize.Width() / aSrcSize.Width() : 1.0;
-                    const double    fScaleY = aSrcSize.Height() ? (double) rSize.Height() / aSrcSize.Height() : 1.0;
-                    long            nMoveX, nMoveY;
+                    ULONG			nAddCount;
+                    GDIMetaFile 	aMtf( rTransMtf );
+                    const Size		aSrcSize( rTransMtf.GetPrefSize() );
+                    Point			aSrcPt( rTransMtf.GetPrefMapMode().GetOrigin() );
+                    const double	fScaleX = aSrcSize.Width() ? (double) rSize.Width() / aSrcSize.Width() : 1.0;
+                    const double	fScaleY = aSrcSize.Height() ? (double) rSize.Height() / aSrcSize.Height() : 1.0;
+                    long			nMoveX, nMoveY;
 
                     if( fScaleX != 1.0 || fScaleY != 1.0 )
                     {
@@ -2264,10 +2264,10 @@ ULONG SVMConverter::ImplWriteActions( SvStream& rOStm, GDIMetaFile& rMtf,
 
             case( META_HATCH_ACTION ):
             {
-                const MetaHatchAction*  pA = (MetaHatchAction*) pAction;
-                const PolyPolygon&      rPolyPoly = pA->GetPolyPolygon();
-                const Hatch&            rHatch = pA->GetHatch();
-                ULONG                   nOldPos, nNewPos, nAddCount;
+                const MetaHatchAction*	pA = (MetaHatchAction*) pAction;
+                const PolyPolygon&		rPolyPoly = pA->GetPolyPolygon();
+                const Hatch&			rHatch = pA->GetHatch();
+                ULONG					nOldPos, nNewPos, nAddCount;
 
                 // write hatch comment
                 rOStm << (INT16) GDI_HATCH_COMMENT;
@@ -2288,8 +2288,8 @@ ULONG SVMConverter::ImplWriteActions( SvStream& rOStm, GDIMetaFile& rMtf,
 
                 {
                     // write actions for hatch
-                    VirtualDevice   aVDev;
-                    GDIMetaFile     aTmpMtf;
+                    VirtualDevice	aVDev;
+                    GDIMetaFile 	aTmpMtf;
 
                     aVDev.AddHatchActions( rPolyPoly, rHatch, aTmpMtf );
                     nAddCount = ImplWriteActions( rOStm, aTmpMtf, rSaveVDev, rRop_0_1, rLineCol, rLineColStack, rActualCharSet );
@@ -2309,10 +2309,10 @@ ULONG SVMConverter::ImplWriteActions( SvStream& rOStm, GDIMetaFile& rMtf,
 
             case( META_REFPOINT_ACTION ):
             {
-                const MetaRefPointAction*   pA = (MetaRefPointAction*) pAction;
-                const Point&                rRefPoint = pA->GetRefPoint();
-                const BOOL                  bSet = pA->IsSetting();
-                ULONG                       nOldPos, nNewPos;
+                const MetaRefPointAction*	pA = (MetaRefPointAction*) pAction;
+                const Point&				rRefPoint = pA->GetRefPoint();
+                const BOOL					bSet = pA->IsSetting();
+                ULONG						nOldPos, nNewPos;
 
                 // write RefPoint comment
                 rOStm << (INT16) GDI_REFPOINT_COMMENT;
@@ -2337,10 +2337,10 @@ ULONG SVMConverter::ImplWriteActions( SvStream& rOStm, GDIMetaFile& rMtf,
 
             case( META_TEXTLINECOLOR_ACTION ):
             {
-                const MetaTextLineColorAction*  pA = (MetaTextLineColorAction*) pAction;
-                const Color&                    rColor = pA->GetColor();
-                const BOOL                      bSet = pA->IsSetting();
-                ULONG                           nOldPos, nNewPos;
+                const MetaTextLineColorAction*	pA = (MetaTextLineColorAction*) pAction;
+                const Color&					rColor = pA->GetColor();
+                const BOOL						bSet = pA->IsSetting();
+                ULONG							nOldPos, nNewPos;
 
                 // write RefPoint comment
                 rOStm << (INT16) GDI_TEXTLINECOLOR_COMMENT;
@@ -2370,12 +2370,12 @@ ULONG SVMConverter::ImplWriteActions( SvStream& rOStm, GDIMetaFile& rMtf,
 
             case( META_TEXTLINE_ACTION ):
             {
-                const MetaTextLineAction*   pA = (MetaTextLineAction*) pAction;
-                const Point&                rStartPt = pA->GetStartPoint();
-                const long                  nWidth = pA->GetWidth();
-                const FontStrikeout         eStrikeout = pA->GetStrikeout();
-                const FontUnderline         eUnderline = pA->GetUnderline();
-                ULONG                       nOldPos, nNewPos;
+                const MetaTextLineAction*	pA = (MetaTextLineAction*) pAction;
+                const Point&				rStartPt = pA->GetStartPoint();
+                const long					nWidth = pA->GetWidth();
+                const FontStrikeout 		eStrikeout = pA->GetStrikeout();
+                const FontUnderline 		eUnderline = pA->GetUnderline();
+                ULONG						nOldPos, nNewPos;
 
                 // write RefPoint comment
                 rOStm << (INT16) GDI_TEXTLINE_COMMENT;
@@ -2385,8 +2385,8 @@ ULONG SVMConverter::ImplWriteActions( SvStream& rOStm, GDIMetaFile& rMtf,
                 rOStm.SeekRel( 4 );
 
                 // write data
-                rOStm << rStartPt << nWidth <<
-                    static_cast<sal_uInt32>(eStrikeout) <<
+                rOStm << rStartPt << nWidth << 
+                    static_cast<sal_uInt32>(eStrikeout) << 
                     static_cast<sal_uInt32>(eUnderline);
                 rOStm << (INT32) 0; // number of actions that follow this comment
 
@@ -2405,9 +2405,9 @@ ULONG SVMConverter::ImplWriteActions( SvStream& rOStm, GDIMetaFile& rMtf,
 
             case( META_COMMENT_ACTION ):
             {
-                const MetaCommentAction*    pA = (MetaCommentAction*) pAction;
-                const sal_uInt32            nDataSize = pA->GetDataSize();
-                ULONG                       nOldPos, nNewPos;
+                const MetaCommentAction*	pA = (MetaCommentAction*) pAction;
+                const sal_uInt32 			nDataSize = pA->GetDataSize();
+                ULONG						nOldPos, nNewPos;
 
                 // write RefPoint comment
                 rOStm << (INT16) GDI_COMMENT_COMMENT;
diff --git a/vcl/source/gdi/extoutdevdata.cxx b/vcl/source/gdi/extoutdevdata.cxx
index eebd6b35765b..1bda3a598b44 100644
--- a/vcl/source/gdi/extoutdevdata.cxx
+++ b/vcl/source/gdi/extoutdevdata.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
diff --git a/vcl/source/gdi/font.cxx b/vcl/source/gdi/font.cxx
index e26c15309c54..eec28aa88a2b 100644
--- a/vcl/source/gdi/font.cxx
+++ b/vcl/source/gdi/font.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
@@ -52,29 +52,29 @@ Impl_Font::Impl_Font() :
     maColor( COL_TRANSPARENT ),
     maFillColor( COL_TRANSPARENT )
 {
-    mnRefCount          = 1;
-    meCharSet           = RTL_TEXTENCODING_DONTKNOW;
-    meLanguage          = LANGUAGE_DONTKNOW;
-    meCJKLanguage       = LANGUAGE_DONTKNOW;
-    meFamily            = FAMILY_DONTKNOW;
-    mePitch             = PITCH_DONTKNOW;
-    meAlign             = ALIGN_TOP;
-    meWeight            = WEIGHT_DONTKNOW;
-    meWidthType         = WIDTH_DONTKNOW;
-    meItalic            = ITALIC_NONE;
-    meUnderline         = UNDERLINE_NONE;
-    meOverline          = UNDERLINE_NONE;
-    meStrikeout         = STRIKEOUT_NONE;
-    meRelief            = RELIEF_NONE;
-    meEmphasisMark      = EMPHASISMARK_NONE;
-    mnOrientation       = 0;
-    mnKerning           = 0;
-    mbWordLine          = false;
-    mbOutline           = false;
-    mbShadow            = false;
-    mbVertical          = false;
-    mbTransparent       = true;
-    mbConfigLookup      = false;
+    mnRefCount			= 1;
+    meCharSet			= RTL_TEXTENCODING_DONTKNOW;
+    meLanguage			= LANGUAGE_DONTKNOW;
+    meCJKLanguage		= LANGUAGE_DONTKNOW;
+    meFamily			= FAMILY_DONTKNOW;
+    mePitch 			= PITCH_DONTKNOW;
+    meAlign 			= ALIGN_TOP;
+    meWeight			= WEIGHT_DONTKNOW;
+    meWidthType 		= WIDTH_DONTKNOW;
+    meItalic			= ITALIC_NONE;
+    meUnderline 		= UNDERLINE_NONE;
+    meOverline   		= UNDERLINE_NONE;
+    meStrikeout 		= STRIKEOUT_NONE;
+    meRelief			= RELIEF_NONE;
+    meEmphasisMark		= EMPHASISMARK_NONE;
+    mnOrientation		= 0;
+    mnKerning			= 0;
+    mbWordLine			= false;
+    mbOutline			= false;
+    mbShadow			= false;
+    mbVertical			= false;
+    mbTransparent		= true;
+    mbConfigLookup		= false;
 }
 
 // -----------------------------------------------------------------------
@@ -86,29 +86,29 @@ Impl_Font::Impl_Font( const Impl_Font& rImplFont )
     maColor( rImplFont.maColor ),
     maFillColor( rImplFont.maFillColor )
 {
-    mnRefCount          = 1;
-    meCharSet           = rImplFont.meCharSet;
-    meLanguage          = rImplFont.meLanguage;
-    meCJKLanguage       = rImplFont.meCJKLanguage;
-    meFamily            = rImplFont.meFamily;
-    mePitch             = rImplFont.mePitch;
-    meAlign             = rImplFont.meAlign;
-    meWeight            = rImplFont.meWeight;
-    meWidthType         = rImplFont.meWidthType;
-    meItalic            = rImplFont.meItalic;
-    meUnderline         = rImplFont.meUnderline;
-    meOverline          = rImplFont.meOverline;
-    meStrikeout         = rImplFont.meStrikeout;
-    meRelief            = rImplFont.meRelief;
-    meEmphasisMark      = rImplFont.meEmphasisMark;
-    mnOrientation       = rImplFont.mnOrientation;
-    mnKerning           = rImplFont.mnKerning;
-    mbWordLine          = rImplFont.mbWordLine;
-    mbOutline           = rImplFont.mbOutline;
-    mbShadow            = rImplFont.mbShadow;
-    mbVertical          = rImplFont.mbVertical;
-    mbTransparent       = rImplFont.mbTransparent;
-    mbConfigLookup      = rImplFont.mbConfigLookup;
+    mnRefCount			= 1;
+    meCharSet			= rImplFont.meCharSet;
+    meLanguage			= rImplFont.meLanguage;
+    meCJKLanguage		= rImplFont.meCJKLanguage;
+    meFamily			= rImplFont.meFamily;
+    mePitch 			= rImplFont.mePitch;
+    meAlign 			= rImplFont.meAlign;
+    meWeight			= rImplFont.meWeight;
+    meWidthType 		= rImplFont.meWidthType;
+    meItalic			= rImplFont.meItalic;
+    meUnderline 		= rImplFont.meUnderline;
+    meOverline   		= rImplFont.meOverline;
+    meStrikeout 		= rImplFont.meStrikeout;
+    meRelief			= rImplFont.meRelief;
+    meEmphasisMark		= rImplFont.meEmphasisMark;
+    mnOrientation		= rImplFont.mnOrientation;
+    mnKerning			= rImplFont.mnKerning;
+    mbWordLine			= rImplFont.mbWordLine;
+    mbOutline			= rImplFont.mbOutline;
+    mbShadow			= rImplFont.mbShadow;
+    mbVertical			= rImplFont.mbVertical;
+    mbTransparent		= rImplFont.mbTransparent;
+    mbConfigLookup		= rImplFont.mbConfigLookup;
 }
 
 // -----------------------------------------------------------------------
@@ -275,9 +275,9 @@ Font::Font( const String& rFamilyName, const Size& rSize )
 {
     DBG_CTOR( Font, NULL );
 
-    mpImplFont              = new Impl_Font;
+    mpImplFont				= new Impl_Font;
     mpImplFont->maFamilyName= rFamilyName;
-    mpImplFont->maSize      = rSize;
+    mpImplFont->maSize		= rSize;
 }
 
 // -----------------------------------------------------------------------
@@ -286,10 +286,10 @@ Font::Font( const String& rFamilyName, const String& rStyleName, const Size& rSi
 {
     DBG_CTOR( Font, NULL );
 
-    mpImplFont              = new Impl_Font;
+    mpImplFont				= new Impl_Font;
     mpImplFont->maFamilyName= rFamilyName;
     mpImplFont->maStyleName = rStyleName;
-    mpImplFont->maSize      = rSize;
+    mpImplFont->maSize		= rSize;
 }
 
 // -----------------------------------------------------------------------
@@ -298,9 +298,9 @@ Font::Font( FontFamily eFamily, const Size& rSize )
 {
     DBG_CTOR( Font, NULL );
 
-    mpImplFont              = new Impl_Font;
-    mpImplFont->meFamily    = eFamily;
-    mpImplFont->maSize      = rSize;
+    mpImplFont				= new Impl_Font;
+    mpImplFont->meFamily	= eFamily;
+    mpImplFont->maSize		= rSize;
 }
 
 // -----------------------------------------------------------------------
@@ -756,7 +756,7 @@ void Font::Merge( const Font& rFont )
 
 void Font::GetFontAttributes( ImplFontAttributes& rAttrs ) const
 {
-    // #i56788# Use members directly, don't risc config access.
+    // #i56788# Use members directly, don't risc config access.    
     rAttrs.maName = mpImplFont->maFamilyName;
     rAttrs.maStyleName = mpImplFont->maStyleName;
     rAttrs.meFamily = mpImplFont->meFamily;
@@ -772,10 +772,10 @@ void Font::GetFontAttributes( ImplFontAttributes& rAttrs ) const
 
 SvStream& operator>>( SvStream& rIStm, Impl_Font& rImpl_Font )
 {
-    VersionCompat   aCompat( rIStm, STREAM_READ );
-    UINT16          nTmp16;
-    BOOL            bTmp;
-    BYTE            nTmp8;
+    VersionCompat	aCompat( rIStm, STREAM_READ );
+    UINT16			nTmp16;
+    BOOL			bTmp;
+    BYTE			nTmp8;
 
     rIStm.ReadByteString( rImpl_Font.maFamilyName, rIStm.GetStreamCharSet() );
     rIStm.ReadByteString( rImpl_Font.maStyleName, rIStm.GetStreamCharSet() );
@@ -800,10 +800,10 @@ SvStream& operator>>( SvStream& rIStm, Impl_Font& rImpl_Font )
 
     if( aCompat.GetVersion() >= 2 )
     {
-        rIStm >> nTmp8;     rImpl_Font.meRelief = (FontRelief)nTmp8;
-        rIStm >> nTmp16;    rImpl_Font.meCJKLanguage = (LanguageType)nTmp16;
-        rIStm >> bTmp;      rImpl_Font.mbVertical = bTmp;
-        rIStm >> nTmp16;    rImpl_Font.meEmphasisMark = (FontEmphasisMark)nTmp16;
+        rIStm >> nTmp8;		rImpl_Font.meRelief = (FontRelief)nTmp8;
+        rIStm >> nTmp16;	rImpl_Font.meCJKLanguage = (LanguageType)nTmp16;
+        rIStm >> bTmp;		rImpl_Font.mbVertical = bTmp;
+        rIStm >> nTmp16;	rImpl_Font.meEmphasisMark = (FontEmphasisMark)nTmp16;
     }
     if( aCompat.GetVersion() >= 3 )
     {
@@ -842,10 +842,10 @@ SvStream& operator<<( SvStream& rOStm, const Impl_Font& rImpl_Font )
     rOStm << (BYTE) rImpl_Font.mnKerning;
 
     // new in version 2
-    rOStm << (BYTE)     rImpl_Font.meRelief;
-    rOStm << (UINT16)   rImpl_Font.meCJKLanguage;
-    rOStm << (BOOL)     rImpl_Font.mbVertical;
-    rOStm << (UINT16)   rImpl_Font.meEmphasisMark;
+    rOStm << (BYTE)		rImpl_Font.meRelief;
+    rOStm << (UINT16)	rImpl_Font.meCJKLanguage;
+    rOStm << (BOOL)		rImpl_Font.mbVertical;
+    rOStm << (UINT16)	rImpl_Font.meEmphasisMark;
 
     // new in version 3
     rOStm << (UINT16) rImpl_Font.meOverline;
@@ -935,16 +935,16 @@ namespace
             }
             // set italic
             o_rResult.SetItalic( (aInfo.italicAngle != 0) ? ITALIC_NORMAL : ITALIC_NONE );
-
+            
             // set pitch
             o_rResult.SetPitch( (aInfo.pitch == 0) ? PITCH_VARIABLE : PITCH_FIXED );
-
+            
             // set style name
             if( aInfo.usubfamily )
                 o_rResult.SetStyleName( rtl::OUString( aInfo.usubfamily ) );
             else if( aInfo.subfamily )
                 o_rResult.SetStyleName( rtl::OUString::createFromAscii( aInfo.subfamily ) );
-
+            
             // cleanup
             CloseTTFont( pTTF );
             // success
@@ -953,13 +953,13 @@ namespace
 #endif
         return bResult;
     }
-
+    
     struct WeightSearchEntry
     {
         const char* string;
         int         string_len;
         FontWeight  weight;
-
+        
         bool operator<( const WeightSearchEntry& rRight ) const
         {
             return rtl_str_compareIgnoreAsciiCase_WithLength( string, string_len, rRight.string, rRight.string_len ) < 0;
@@ -978,7 +978,7 @@ namespace
         { "super", 5, WEIGHT_ULTRABOLD },
         { "thin", 4, WEIGHT_THIN }
     };
-
+    
     bool identifyType1Font( const char* i_pBuffer, sal_uInt32 i_nSize, Font& o_rResult )
     {
         bool bResult = false;
@@ -1005,7 +1005,7 @@ namespace
                     o_rResult.SetName( rtl::OStringToOUString( rtl::OString( pOpen+1, pClose-pOpen-1 ), RTL_TEXTENCODING_ASCII_US ) );
                 }
             }
-
+            
             // parse /ItalicAngle
             static const char* pItalic = "/ItalicAngle";
             const char* pItalicPos = std::search( pStream, pExecPos, pItalic, pItalic+12 );
@@ -1014,7 +1014,7 @@ namespace
                 sal_Int32 nItalic = rtl_str_toInt32( pItalicPos+12, 10 );
                 o_rResult.SetItalic( (nItalic != 0) ? ITALIC_NORMAL : ITALIC_NONE );
             }
-
+            
             // parse /Weight
             static const char* pWeight = "/Weight";
             const char* pWeightPos = std::search( pStream, pExecPos, pWeight, pWeight+7 );
@@ -1077,7 +1077,7 @@ Font Font::identifyFont( const void* i_pBuffer, sal_uInt32 i_nSize )
             identifyType1Font( pStream, i_nSize, aResult );
         }
     }
-
+    
     return aResult;
 }
 
diff --git a/vcl/source/gdi/gdimtf.cxx b/vcl/source/gdi/gdimtf.cxx
index 01b34286a086..22f5f374b7cd 100644
--- a/vcl/source/gdi/gdimtf.cxx
+++ b/vcl/source/gdi/gdimtf.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
@@ -46,7 +46,7 @@
 // - Defines -
 // -----------
 
-#define GAMMA( _def_cVal, _def_InvGamma )   ((BYTE)MinMax(FRound(pow( _def_cVal/255.0,_def_InvGamma)*255.0),0L,255L))
+#define GAMMA( _def_cVal, _def_InvGamma )	((BYTE)MinMax(FRound(pow( _def_cVal/255.0,_def_InvGamma)*255.0),0L,255L))
 
 // --------------------------
 // - Color exchange structs -
@@ -54,32 +54,32 @@
 
 struct ImplColAdjustParam
 {
-    BYTE*   pMapR;
-    BYTE*   pMapG;
-    BYTE*   pMapB;
+    BYTE*	pMapR;
+    BYTE*	pMapG;
+    BYTE*	pMapB;
 };
 
 struct ImplBmpAdjustParam
 {
-    short   nLuminancePercent;
-    short   nContrastPercent;
-    short   nChannelRPercent;
-    short   nChannelGPercent;
-    short   nChannelBPercent;
-    double  fGamma;
-    BOOL    bInvert;
+    short	nLuminancePercent;
+    short	nContrastPercent;
+    short	nChannelRPercent;
+    short	nChannelGPercent;
+    short	nChannelBPercent;
+    double	fGamma;
+    BOOL	bInvert;
 };
 
 // -----------------------------------------------------------------------------
 
 struct ImplColConvertParam
 {
-    MtfConversion   eConversion;
+    MtfConversion	eConversion;
 };
 
 struct ImplBmpConvertParam
 {
-    BmpConversion   eConversion;
+    BmpConversion	eConversion;
 };
 
 // -----------------------------------------------------------------------------
@@ -98,22 +98,22 @@ struct ImplBmpMonoParam
 
 struct ImplColReplaceParam
 {
-    ULONG*          pMinR;
-    ULONG*          pMaxR;
-    ULONG*          pMinG;
-    ULONG*          pMaxG;
-    ULONG*          pMinB;
-    ULONG*          pMaxB;
-    const Color*    pDstCols;
-    ULONG           nCount;
+    ULONG*			pMinR;
+    ULONG*			pMaxR;
+    ULONG*			pMinG;
+    ULONG*			pMaxG;
+    ULONG*			pMinB;
+    ULONG*			pMaxB;
+    const Color*	pDstCols;
+    ULONG			nCount;
 };
 
 struct ImplBmpReplaceParam
 {
-    const Color*    pSrcCols;
-    const Color*    pDstCols;
-    ULONG           nCount;
-    const ULONG*    pTols;
+    const Color*	pSrcCols;
+    const Color*	pDstCols;
+    ULONG			nCount;
+    const ULONG*	pTols;
 };
 
 
@@ -123,8 +123,8 @@ struct ImplBmpReplaceParam
 
 struct ImpLabel
 {
-    String  aLabelName;
-    ULONG   nActionPos;
+    String	aLabelName;
+    ULONG	nActionPos;
 
             ImpLabel( const String& rLabelName, ULONG _nActionPos ) :
                 aLabelName( rLabelName ),
@@ -143,14 +143,14 @@ public:
                 ImpLabelList( const ImpLabelList& rList );
                 ~ImpLabelList();
 
-    void        ImplInsert( ImpLabel* p ) { Insert( p, LIST_APPEND ); }
-    ImpLabel*   ImplRemove( ULONG nPos ) { return (ImpLabel*) Remove( nPos ); }
-    void        ImplReplace( ImpLabel* p ) { Replace( (void*)p ); }
-    ImpLabel*   ImplFirst() { return (ImpLabel*) First(); }
-    ImpLabel*   ImplNext() { return (ImpLabel*) Next(); }
-    ImpLabel*   ImplGetLabel( ULONG nPos ) const { return (ImpLabel*) GetObject( nPos ); }
-    ULONG       ImplGetLabelPos( const String& rLabelName );
-    ULONG       ImplCount() const { return Count(); }
+    void		ImplInsert( ImpLabel* p ) { Insert( p, LIST_APPEND ); }
+    ImpLabel*	ImplRemove( ULONG nPos ) { return (ImpLabel*) Remove( nPos ); }
+    void		ImplReplace( ImpLabel* p ) { Replace( (void*)p ); }
+    ImpLabel*	ImplFirst() { return (ImpLabel*) First(); }
+    ImpLabel*	ImplNext() { return (ImpLabel*) Next(); }
+    ImpLabel*	ImplGetLabel( ULONG nPos ) const { return (ImpLabel*) GetObject( nPos ); }
+    ULONG		ImplGetLabelPos( const String& rLabelName );
+    ULONG		ImplCount() const { return Count(); }
 };
 
 // ------------------------------------------------------------------------
@@ -193,29 +193,29 @@ ULONG ImpLabelList::ImplGetLabelPos( const String& rLabelName )
 // ---------------
 
 GDIMetaFile::GDIMetaFile() :
-    List        ( 0x3EFF, 64, 64 ),
-    aPrefSize   ( 1, 1 ),
-    pPrev       ( NULL ),
-    pNext       ( NULL ),
-    pOutDev     ( NULL ),
-    pLabelList  ( NULL ),
-    bPause      ( FALSE ),
-    bRecord     ( FALSE )
+    List		( 0x3EFF, 64, 64 ),
+    aPrefSize	( 1, 1 ),
+    pPrev		( NULL ),
+    pNext		( NULL ),
+    pOutDev 	( NULL ),
+    pLabelList	( NULL ),
+    bPause		( FALSE ),
+    bRecord 	( FALSE )
 {
 }
 
 // ------------------------------------------------------------------------
 
 GDIMetaFile::GDIMetaFile( const GDIMetaFile& rMtf ) :
-    List            ( rMtf ),
-    aPrefMapMode    ( rMtf.aPrefMapMode ),
-    aPrefSize       ( rMtf.aPrefSize ),
-    aHookHdlLink    ( rMtf.aHookHdlLink ),
-    pPrev           ( rMtf.pPrev ),
-    pNext           ( rMtf.pNext ),
-    pOutDev         ( NULL ),
-    bPause          ( FALSE ),
-    bRecord         ( FALSE )
+    List			( rMtf ),
+    aPrefMapMode	( rMtf.aPrefMapMode ),
+    aPrefSize		( rMtf.aPrefSize ),
+    aHookHdlLink	( rMtf.aHookHdlLink ),
+    pPrev			( rMtf.pPrev ),
+    pNext			( rMtf.pNext ),
+    pOutDev 		( NULL ),
+    bPause			( FALSE ),
+    bRecord 		( FALSE )
 {
     // RefCount der MetaActions erhoehen
     for( void* pAct = First(); pAct; pAct = Next() )
@@ -287,7 +287,7 @@ GDIMetaFile& GDIMetaFile::operator=( const GDIMetaFile& rMtf )
 BOOL GDIMetaFile::operator==( const GDIMetaFile& rMtf ) const
 {
     const ULONG nObjCount = Count();
-    BOOL        bRet = FALSE;
+    BOOL		bRet = FALSE;
 
     if( this == &rMtf )
         bRet = TRUE;
@@ -315,7 +315,7 @@ BOOL GDIMetaFile::operator==( const GDIMetaFile& rMtf ) const
 sal_Bool GDIMetaFile::IsEqual( const GDIMetaFile& rMtf ) const
 {
     const ULONG nObjCount = Count();
-    BOOL        bRet = FALSE;
+    BOOL		bRet = FALSE;
 
     if( this == &rMtf )
         bRet = TRUE;
@@ -442,7 +442,7 @@ void GDIMetaFile::Play( OutputDevice* pOut, ULONG nPos )
     {
         MetaAction* pAction = GetCurAction();
         const ULONG nObjCount = Count();
-        ULONG       i  = 0, nSyncCount = ( pOut->GetOutDevType() == OUTDEV_WINDOW ) ? 0x000000ff : 0xffffffff;
+        ULONG		i  = 0, nSyncCount = ( pOut->GetOutDevType() == OUTDEV_WINDOW ) ? 0x000000ff : 0xffffffff;
 
         if( nPos > nObjCount )
             nPos = nObjCount;
@@ -478,14 +478,14 @@ void GDIMetaFile::Play( OutputDevice* pOut, ULONG nPos )
 void GDIMetaFile::Play( OutputDevice* pOut, const Point& rPos,
                         const Size& rSize, ULONG nPos )
 {
-    Region  aDrawClipRegion;
+    Region	aDrawClipRegion;
     MapMode aDrawMap( GetPrefMapMode() );
-    Size    aDestSize( pOut->LogicToPixel( rSize ) );
+    Size	aDestSize( pOut->LogicToPixel( rSize ) );
 
     if( aDestSize.Width() && aDestSize.Height() )
     {
-        Size            aTmpPrefSize( pOut->LogicToPixel( GetPrefSize(), aDrawMap ) );
-        GDIMetaFile*    pMtf = pOut->GetConnectMetaFile();
+        Size			aTmpPrefSize( pOut->LogicToPixel( GetPrefSize(), aDrawMap ) );
+        GDIMetaFile*	pMtf = pOut->GetConnectMetaFile();
 
         if( !aTmpPrefSize.Width() )
             aTmpPrefSize.Width() = aDestSize.Width();
@@ -498,7 +498,7 @@ void GDIMetaFile::Play( OutputDevice* pOut, const Point& rPos,
 
         aScaleX *= aDrawMap.GetScaleX(); aDrawMap.SetScaleX( aScaleX );
         aScaleY *= aDrawMap.GetScaleY(); aDrawMap.SetScaleY( aScaleY );
-
+        
         // #i47260# Convert logical output position to offset within
         // the metafile's mapmode. Therefore, disable pixel offset on
         // outdev, it's inverse mnOutOffLogicX/Y is calculated for a
@@ -777,9 +777,9 @@ BOOL GDIMetaFile::SaveStatus()
 
 BOOL GDIMetaFile::Mirror( ULONG nMirrorFlags )
 {
-    const Size  aOldPrefSize( GetPrefSize() );
-    long        nMoveX, nMoveY;
-    double      fScaleX, fScaleY;
+    const Size	aOldPrefSize( GetPrefSize() );
+    long	    nMoveX, nMoveY;
+    double	    fScaleX, fScaleY;
     BOOL        bRet;
 
     if( nMirrorFlags & MTF_MIRROR_HORZ )
@@ -815,7 +815,7 @@ void GDIMetaFile::Move( long nX, long nY )
 
     aMapVDev.EnableOutput( FALSE );
     aMapVDev.SetMapMode( GetPrefMapMode() );
-
+    
     for( MetaAction* pAct = (MetaAction*) First(); pAct; pAct = (MetaAction*) Next() )
     {
         const long  nType = pAct->GetType();
@@ -829,7 +829,7 @@ void GDIMetaFile::Move( long nX, long nY )
         else
             pModAct = pAct;
 
-        if( ( META_MAPMODE_ACTION == nType ) ||
+        if( ( META_MAPMODE_ACTION == nType ) || 
             ( META_PUSH_ACTION == nType ) ||
             ( META_POP_ACTION == nType ) )
         {
@@ -841,6 +841,49 @@ void GDIMetaFile::Move( long nX, long nY )
     }
 }
 
+void GDIMetaFile::Move( long nX, long nY, long nDPIX, long nDPIY )
+{
+    const Size      aBaseOffset( nX, nY );
+    Size            aOffset( aBaseOffset );
+    VirtualDevice   aMapVDev;
+
+    aMapVDev.EnableOutput( FALSE );
+    aMapVDev.SetReferenceDevice( nDPIX, nDPIY );
+    aMapVDev.SetMapMode( GetPrefMapMode() );
+    
+    for( MetaAction* pAct = (MetaAction*) First(); pAct; pAct = (MetaAction*) Next() )
+    {
+        const long  nType = pAct->GetType();
+        MetaAction* pModAct;
+
+        if( pAct->GetRefCount() > 1 )
+        {
+            Replace( pModAct = pAct->Clone(), GetCurPos() );
+            pAct->Delete();
+        }
+        else
+            pModAct = pAct;
+
+        if( ( META_MAPMODE_ACTION == nType ) || 
+            ( META_PUSH_ACTION == nType ) ||
+            ( META_POP_ACTION == nType ) )
+        {
+            pModAct->Execute( &aMapVDev );
+            if( aMapVDev.GetMapMode().GetMapUnit() == MAP_PIXEL )
+            {
+                aOffset = aMapVDev.LogicToPixel( aBaseOffset, GetPrefMapMode() );
+                MapMode aMap( aMapVDev.GetMapMode() );
+                aOffset.Width() = static_cast<long>(aOffset.Width() * (double)aMap.GetScaleX());
+                aOffset.Height() = static_cast<long>(aOffset.Height() * (double)aMap.GetScaleY());
+            }
+            else
+                aOffset = aMapVDev.LogicToLogic( aBaseOffset, GetPrefMapMode(), aMapVDev.GetMapMode() );
+        }
+
+        pModAct->Move( aOffset.Width(), aOffset.Height() );
+    }
+}
+
 // ------------------------------------------------------------------------
 
 void GDIMetaFile::Scale( double fScaleX, double fScaleY )
@@ -885,7 +928,7 @@ void GDIMetaFile::Clip( const Rectangle& i_rClipRect )
     {
         const long  nType = pAct->GetType();
 
-        if( ( META_MAPMODE_ACTION == nType ) ||
+        if( ( META_MAPMODE_ACTION == nType ) || 
             ( META_PUSH_ACTION == nType ) ||
             ( META_POP_ACTION == nType ) )
         {
@@ -919,7 +962,7 @@ Point GDIMetaFile::ImplGetRotatedPoint( const Point& rPt, const Point& rRotatePt
 
 // ------------------------------------------------------------------------
 
-Polygon GDIMetaFile::ImplGetRotatedPolygon( const Polygon& rPoly, const Point& rRotatePt,
+Polygon GDIMetaFile::ImplGetRotatedPolygon( const Polygon& rPoly, const Point& rRotatePt, 
                                             const Size& rOffset, double fSin, double fCos )
 {
     Polygon aRet( rPoly );
@@ -932,7 +975,7 @@ Polygon GDIMetaFile::ImplGetRotatedPolygon( const Polygon& rPoly, const Point& r
 
 // ------------------------------------------------------------------------
 
-PolyPolygon GDIMetaFile::ImplGetRotatedPolyPolygon( const PolyPolygon& rPolyPoly, const Point& rRotatePt,
+PolyPolygon GDIMetaFile::ImplGetRotatedPolyPolygon( const PolyPolygon& rPolyPoly, const Point& rRotatePt, 
                                                     const Size& rOffset, double fSin, double fCos )
 {
     PolyPolygon aRet( rPolyPoly );
@@ -945,16 +988,16 @@ PolyPolygon GDIMetaFile::ImplGetRotatedPolyPolygon( const PolyPolygon& rPolyPoly
 
 // ------------------------------------------------------------------------
 
-void GDIMetaFile::ImplAddGradientEx( GDIMetaFile&         rMtf,
+void GDIMetaFile::ImplAddGradientEx( GDIMetaFile& 		  rMtf, 
                                      const OutputDevice&  rMapDev,
                                      const PolyPolygon&   rPolyPoly,
-                                     const Gradient&      rGrad     )
+                                     const Gradient&	  rGrad 	)
 {
     // #105055# Generate comment, GradientEx and Gradient actions
     // (within DrawGradient)
     VirtualDevice aVDev( rMapDev, 0 );
     aVDev.EnableOutput( FALSE );
-    GDIMetaFile aGradMtf;
+    GDIMetaFile	aGradMtf;
 
     aGradMtf.Record( &aVDev );
     aVDev.DrawGradient( rPolyPoly, rGrad );
@@ -983,7 +1026,7 @@ void GDIMetaFile::Rotate( long nAngle10 )
         const double    fAngle = F_PI1800 * nAngle10;
         const double    fSin = sin( fAngle );
         const double    fCos = cos( fAngle );
-        Rectangle       aRect=Rectangle( Point(), GetPrefSize() );
+        Rectangle		aRect=Rectangle( Point(), GetPrefSize() );
         Polygon         aPoly( aRect );
 
         aPoly.Rotate( Point(), fSin, fCos );
@@ -992,10 +1035,10 @@ void GDIMetaFile::Rotate( long nAngle10 )
         aMapVDev.SetMapMode( GetPrefMapMode() );
 
         const Rectangle aNewBound( aPoly.GetBoundRect() );
-
+    
         const Point aOrigin( GetPrefMapMode().GetOrigin().X(), GetPrefMapMode().GetOrigin().Y() );
         const Size  aOffset( -aNewBound.Left(), -aNewBound.Top() );
-
+   
         Point     aRotAnchor( aOrigin );
         Size      aRotOffset( aOffset );
 
@@ -1008,8 +1051,8 @@ void GDIMetaFile::Rotate( long nAngle10 )
                 case( META_PIXEL_ACTION ):
                 {
                     MetaPixelAction* pAct = (MetaPixelAction*) pAction;
-                    aMtf.AddAction( new MetaPixelAction( ImplGetRotatedPoint( pAct->GetPoint(), aRotAnchor, aRotOffset, fSin, fCos ),
-                                                                              pAct->GetColor() ) );
+                    aMtf.AddAction( new MetaPixelAction( ImplGetRotatedPoint( pAct->GetPoint(), aRotAnchor, aRotOffset, fSin, fCos ), 
+                                                                              pAct->GetColor() ) ); 
                 }
                 break;
 
@@ -1023,60 +1066,60 @@ void GDIMetaFile::Rotate( long nAngle10 )
                 case( META_LINE_ACTION ):
                 {
                     MetaLineAction* pAct = (MetaLineAction*) pAction;
-                    aMtf.AddAction( new MetaLineAction( ImplGetRotatedPoint( pAct->GetStartPoint(), aRotAnchor, aRotOffset, fSin, fCos ),
+                    aMtf.AddAction( new MetaLineAction( ImplGetRotatedPoint( pAct->GetStartPoint(), aRotAnchor, aRotOffset, fSin, fCos ), 
                                                         ImplGetRotatedPoint( pAct->GetEndPoint(), aRotAnchor, aRotOffset, fSin, fCos ),
                                                         pAct->GetLineInfo() ) );
                 }
                 break;
-
+            
                 case( META_RECT_ACTION ):
                 {
                     MetaRectAction* pAct = (MetaRectAction*) pAction;
-                    aMtf.AddAction( new MetaPolygonAction( ImplGetRotatedPolygon( pAct->GetRect(), aRotAnchor, aRotOffset, fSin, fCos ) ) );
+                    aMtf.AddAction( new MetaPolygonAction( ImplGetRotatedPolygon( pAct->GetRect(), aRotAnchor, aRotOffset, fSin, fCos ) ) ); 
                 }
                 break;
-
+            
                 case( META_ROUNDRECT_ACTION ):
                 {
                     MetaRoundRectAction*    pAct = (MetaRoundRectAction*) pAction;
                     const Polygon           aRoundRectPoly( pAct->GetRect(), pAct->GetHorzRound(), pAct->GetVertRound() );
-
-                    aMtf.AddAction( new MetaPolygonAction( ImplGetRotatedPolygon( aRoundRectPoly, aRotAnchor, aRotOffset, fSin, fCos ) ) );
+                
+                    aMtf.AddAction( new MetaPolygonAction( ImplGetRotatedPolygon( aRoundRectPoly, aRotAnchor, aRotOffset, fSin, fCos ) ) ); 
                 }
                 break;
-
+            
                 case( META_ELLIPSE_ACTION ):
                 {
                     MetaEllipseAction*      pAct = (MetaEllipseAction*) pAction;
                     const Polygon           aEllipsePoly( pAct->GetRect().Center(), pAct->GetRect().GetWidth() >> 1, pAct->GetRect().GetHeight() >> 1 );
-
-                    aMtf.AddAction( new MetaPolygonAction( ImplGetRotatedPolygon( aEllipsePoly, aRotAnchor, aRotOffset, fSin, fCos ) ) );
+                
+                    aMtf.AddAction( new MetaPolygonAction( ImplGetRotatedPolygon( aEllipsePoly, aRotAnchor, aRotOffset, fSin, fCos ) ) ); 
                 }
                 break;
-
+            
                 case( META_ARC_ACTION ):
                 {
                     MetaArcAction*  pAct = (MetaArcAction*) pAction;
                     const Polygon   aArcPoly( pAct->GetRect(), pAct->GetStartPoint(), pAct->GetEndPoint(), POLY_ARC );
-
+                
                     aMtf.AddAction( new MetaPolygonAction( ImplGetRotatedPolygon( aArcPoly, aRotAnchor, aRotOffset, fSin, fCos ) ) );
                 }
                 break;
-
+            
                 case( META_PIE_ACTION ):
                 {
                     MetaPieAction*  pAct = (MetaPieAction*) pAction;
                     const Polygon   aPiePoly( pAct->GetRect(), pAct->GetStartPoint(), pAct->GetEndPoint(), POLY_PIE );
-
+                
                     aMtf.AddAction( new MetaPolygonAction( ImplGetRotatedPolygon( aPiePoly, aRotAnchor, aRotOffset, fSin, fCos ) ) );
                 }
                 break;
-
-                case( META_CHORD_ACTION ):
+            
+                case( META_CHORD_ACTION	):
                 {
                     MetaChordAction*    pAct = (MetaChordAction*) pAction;
                     const Polygon       aChordPoly( pAct->GetRect(), pAct->GetStartPoint(), pAct->GetEndPoint(), POLY_CHORD );
-
+                
                     aMtf.AddAction( new MetaPolygonAction( ImplGetRotatedPolygon( aChordPoly, aRotAnchor, aRotOffset, fSin, fCos ) ) );
                 }
                 break;
@@ -1110,14 +1153,14 @@ void GDIMetaFile::Rotate( long nAngle10 )
                 }
                 break;
 
-                case( META_TEXTARRAY_ACTION ):
+                case( META_TEXTARRAY_ACTION	):
                 {
                     MetaTextArrayAction* pAct = (MetaTextArrayAction*) pAction;
                     aMtf.AddAction( new MetaTextArrayAction( ImplGetRotatedPoint( pAct->GetPoint(), aRotAnchor, aRotOffset, fSin, fCos ),
                                                                                   pAct->GetText(), pAct->GetDXArray(), pAct->GetIndex(), pAct->GetLen() ) );
                 }
                 break;
-
+            
                 case( META_STRETCHTEXT_ACTION ):
                 {
                     MetaStretchTextAction* pAct = (MetaStretchTextAction*) pAction;
@@ -1125,7 +1168,7 @@ void GDIMetaFile::Rotate( long nAngle10 )
                                                                                     pAct->GetWidth(), pAct->GetText(), pAct->GetIndex(), pAct->GetLen() ) );
                 }
                 break;
-
+            
                 case( META_TEXTLINE_ACTION ):
                 {
                     MetaTextLineAction* pAct = (MetaTextLineAction*) pAction;
@@ -1141,8 +1184,8 @@ void GDIMetaFile::Rotate( long nAngle10 )
                     Rectangle           aBmpRect( aBmpPoly.GetBoundRect() );
                     BitmapEx            aBmpEx( pAct->GetBitmap() );
 
-                    aBmpEx.Rotate( nAngle10, Color( COL_TRANSPARENT ) );
-                    aMtf.AddAction( new MetaBmpExScaleAction( aBmpRect.TopLeft(), aBmpRect.GetSize(),
+                    aBmpEx.Rotate( nAngle10, Color( COL_TRANSPARENT ) );				
+                    aMtf.AddAction( new MetaBmpExScaleAction( aBmpRect.TopLeft(), aBmpRect.GetSize(), 
                                                               aBmpEx ) );
                 }
                 break;
@@ -1156,7 +1199,7 @@ void GDIMetaFile::Rotate( long nAngle10 )
 
                     aBmpEx.Crop( Rectangle( pAct->GetSrcPoint(), pAct->GetSrcSize() ) );
                     aBmpEx.Rotate( nAngle10, Color( COL_TRANSPARENT ) );
-
+                    
                     aMtf.AddAction( new MetaBmpExScaleAction( aBmpRect.TopLeft(), aBmpRect.GetSize(), aBmpEx ) );
                 }
                 break;
@@ -1168,8 +1211,8 @@ void GDIMetaFile::Rotate( long nAngle10 )
                     Rectangle               aBmpRect( aBmpPoly.GetBoundRect() );
                     BitmapEx                aBmpEx( pAct->GetBitmapEx() );
 
-                    aBmpEx.Rotate( nAngle10, Color( COL_TRANSPARENT ) );
-
+                    aBmpEx.Rotate( nAngle10, Color( COL_TRANSPARENT ) );				
+                    
                     aMtf.AddAction( new MetaBmpExScaleAction( aBmpRect.TopLeft(), aBmpRect.GetSize(), aBmpEx ) );
                 }
                 break;
@@ -1183,7 +1226,7 @@ void GDIMetaFile::Rotate( long nAngle10 )
 
                     aBmpEx.Crop( Rectangle( pAct->GetSrcPoint(), pAct->GetSrcSize() ) );
                     aBmpEx.Rotate( nAngle10, Color( COL_TRANSPARENT ) );
-
+                    
                     aMtf.AddAction( new MetaBmpExScaleAction( aBmpRect.TopLeft(), aBmpRect.GetSize(), aBmpEx ) );
                 }
                 break;
@@ -1192,7 +1235,7 @@ void GDIMetaFile::Rotate( long nAngle10 )
                 {
                     MetaGradientAction* pAct = (MetaGradientAction*) pAction;
 
-                    ImplAddGradientEx( aMtf, aMapVDev,
+                    ImplAddGradientEx( aMtf, aMapVDev, 
                                        ImplGetRotatedPolygon( pAct->GetRect(), aRotAnchor, aRotOffset, fSin, fCos ),
                                        pAct->GetGradient() );
                 }
@@ -1214,17 +1257,17 @@ void GDIMetaFile::Rotate( long nAngle10 )
                     {
                         int nBeginComments( 1 );
                         pAction = (MetaAction*) Next();
-
+                        
                         // skip everything, except gradientex action
                         while( pAction )
                         {
                             const USHORT nType = pAction->GetType();
-
+                            
                             if( META_GRADIENTEX_ACTION == nType )
                             {
                                 // Add rotated gradientex
                                 MetaGradientExAction* pAct = (MetaGradientExAction*) pAction;
-                                ImplAddGradientEx( aMtf, aMapVDev,
+                                ImplAddGradientEx( aMtf, aMapVDev, 
                                                    ImplGetRotatedPolyPolygon( pAct->GetPolyPolygon(), aRotAnchor, aRotOffset, fSin, fCos ),
                                                    pAct->GetGradient() );
                             }
@@ -1297,11 +1340,11 @@ void GDIMetaFile::Rotate( long nAngle10 )
 
                 case( META_HATCH_ACTION ):
                 {
-                    MetaHatchAction*    pAct = (MetaHatchAction*) pAction;
-                    Hatch               aHatch( pAct->GetHatch() );
+                    MetaHatchAction*	pAct = (MetaHatchAction*) pAction;
+                    Hatch				aHatch( pAct->GetHatch() );
 
                     aHatch.SetAngle( aHatch.GetAngle() + (USHORT) nAngle10 );
-                    aMtf.AddAction( new MetaHatchAction( ImplGetRotatedPolyPolygon( pAct->GetPolyPolygon(), aRotAnchor, aRotOffset, fSin, fCos ),
+                    aMtf.AddAction( new MetaHatchAction( ImplGetRotatedPolyPolygon( pAct->GetPolyPolygon(), aRotAnchor, aRotOffset, fSin, fCos ), 
                                                                                     aHatch ) );
                 }
                 break;
@@ -1317,20 +1360,20 @@ void GDIMetaFile::Rotate( long nAngle10 )
                 case( META_FLOATTRANSPARENT_ACTION ):
                 {
                     MetaFloatTransparentAction* pAct = (MetaFloatTransparentAction*) pAction;
-                    GDIMetaFile                 aTransMtf( pAct->GetGDIMetaFile() );
+                    GDIMetaFile					aTransMtf( pAct->GetGDIMetaFile() );
                     Polygon                     aMtfPoly( ImplGetRotatedPolygon( Rectangle( pAct->GetPoint(), pAct->GetSize() ), aRotAnchor, aRotOffset, fSin, fCos ) );
                     Rectangle                   aMtfRect( aMtfPoly.GetBoundRect() );
 
                     aTransMtf.Rotate( nAngle10 );
-                    aMtf.AddAction( new MetaFloatTransparentAction( aTransMtf, aMtfRect.TopLeft(), aMtfRect.GetSize(),
+                    aMtf.AddAction( new MetaFloatTransparentAction( aTransMtf, aMtfRect.TopLeft(), aMtfRect.GetSize(), 
                                                                     pAct->GetGradient() ) );
                 }
                 break;
 
                 case( META_EPS_ACTION ):
                 {
-                    MetaEPSAction*  pAct = (MetaEPSAction*) pAction;
-                    GDIMetaFile     aEPSMtf( pAct->GetSubstitute() );
+                    MetaEPSAction*	pAct = (MetaEPSAction*) pAction;
+                    GDIMetaFile		aEPSMtf( pAct->GetSubstitute() );
                     Polygon         aEPSPoly( ImplGetRotatedPolygon( Rectangle( pAct->GetPoint(), pAct->GetSize() ), aRotAnchor, aRotOffset, fSin, fCos ) );
                     Rectangle       aEPSRect( aEPSPoly.GetBoundRect() );
 
@@ -1356,12 +1399,12 @@ void GDIMetaFile::Rotate( long nAngle10 )
 
                 case( META_ISECTRECTCLIPREGION_ACTION ):
                 {
-                    MetaISectRectClipRegionAction*  pAct = (MetaISectRectClipRegionAction*) pAction;
-                    aMtf.AddAction( new MetaISectRegionClipRegionAction( ImplGetRotatedPolygon( pAct->GetRect(), aRotAnchor, aRotOffset, fSin, fCos ) ) );
+                    MetaISectRectClipRegionAction*	pAct = (MetaISectRectClipRegionAction*) pAction;
+                    aMtf.AddAction( new MetaISectRegionClipRegionAction( ImplGetRotatedPolygon( pAct->GetRect(), aRotAnchor, aRotOffset, fSin, fCos ) ) ); 
                 }
                 break;
 
-                case( META_ISECTREGIONCLIPREGION_ACTION ):
+                case( META_ISECTREGIONCLIPREGION_ACTION	):
                 {
                     MetaISectRegionClipRegionAction*    pAct = (MetaISectRegionClipRegionAction*) pAction;
                     const Region&                       rRegion = pAct->GetRegion();
@@ -1386,7 +1429,7 @@ void GDIMetaFile::Rotate( long nAngle10 )
                 case( META_FONT_ACTION ):
                 {
                     MetaFontAction* pAct = (MetaFontAction*) pAction;
-                    Font            aFont( pAct->GetFont() );
+                    Font			aFont( pAct->GetFont() );
 
                     aFont.SetOrientation( aFont.GetOrientation() + (USHORT) nAngle10 );
                     aMtf.AddAction( new MetaFontAction( aFont ) );
@@ -1413,7 +1456,7 @@ void GDIMetaFile::Rotate( long nAngle10 )
                     aMtf.AddAction( pAction );
 
                     // update rotation point and offset, if necessary
-                    if( ( META_MAPMODE_ACTION == nActionType ) ||
+                    if( ( META_MAPMODE_ACTION == nActionType ) || 
                         ( META_PUSH_ACTION == nActionType ) ||
                         ( META_POP_ACTION == nActionType ) )
                     {
@@ -1454,19 +1497,19 @@ Rectangle GDIMetaFile::GetBoundRect( OutputDevice& i_rReference )
 {
     GDIMetaFile     aMtf;
     VirtualDevice   aMapVDev( i_rReference );
-
+    
     aMapVDev.EnableOutput( FALSE );
     aMapVDev.SetMapMode( GetPrefMapMode() );
-
+    
     std::vector<Rectangle> aClipStack( 1, Rectangle() );
     std::vector<USHORT> aPushFlagStack;
-
+    
     Rectangle aBound;
-
+    
     for( MetaAction* pAction = (MetaAction*) First(); pAction; pAction = (MetaAction*) Next() )
     {
         const USHORT nActionType = pAction->GetType();
-
+        
         switch( nActionType )
         {
         case( META_PIXEL_ACTION ):
@@ -1478,7 +1521,7 @@ Rectangle GDIMetaFile::GetBoundRect( OutputDevice& i_rReference )
                                  aClipStack );
             }
             break;
-
+            
         case( META_POINT_ACTION ):
             {
                 MetaPointAction* pAct = (MetaPointAction*) pAction;
@@ -1488,7 +1531,7 @@ Rectangle GDIMetaFile::GetBoundRect( OutputDevice& i_rReference )
                                  aClipStack );
             }
             break;
-
+            
         case( META_LINE_ACTION ):
             {
                 MetaLineAction* pAct = (MetaLineAction*) pAction;
@@ -1498,28 +1541,28 @@ Rectangle GDIMetaFile::GetBoundRect( OutputDevice& i_rReference )
                 ImplActionBounds( aBound, aMapVDev.LogicToLogic( aRect, aMapVDev.GetMapMode(), GetPrefMapMode() ), aClipStack );
             }
             break;
-
+            
         case( META_RECT_ACTION ):
             {
                 MetaRectAction* pAct = (MetaRectAction*) pAction;
                 ImplActionBounds( aBound, aMapVDev.LogicToLogic( pAct->GetRect(), aMapVDev.GetMapMode(), GetPrefMapMode() ), aClipStack );
             }
             break;
-
+            
         case( META_ROUNDRECT_ACTION ):
             {
                 MetaRoundRectAction*    pAct = (MetaRoundRectAction*) pAction;
                 ImplActionBounds( aBound, aMapVDev.LogicToLogic( pAct->GetRect(), aMapVDev.GetMapMode(), GetPrefMapMode() ), aClipStack );
             }
             break;
-
+            
         case( META_ELLIPSE_ACTION ):
             {
                 MetaEllipseAction*      pAct = (MetaEllipseAction*) pAction;
                 ImplActionBounds( aBound, aMapVDev.LogicToLogic( pAct->GetRect(), aMapVDev.GetMapMode(), GetPrefMapMode() ), aClipStack );
             }
             break;
-
+            
         case( META_ARC_ACTION ):
             {
                 MetaArcAction*  pAct = (MetaArcAction*) pAction;
@@ -1528,7 +1571,7 @@ Rectangle GDIMetaFile::GetBoundRect( OutputDevice& i_rReference )
                 ImplActionBounds( aBound, aMapVDev.LogicToLogic( pAct->GetRect(), aMapVDev.GetMapMode(), GetPrefMapMode() ), aClipStack );
             }
             break;
-
+            
         case( META_PIE_ACTION ):
             {
                 MetaPieAction*  pAct = (MetaPieAction*) pAction;
@@ -1537,8 +1580,8 @@ Rectangle GDIMetaFile::GetBoundRect( OutputDevice& i_rReference )
                 ImplActionBounds( aBound, aMapVDev.LogicToLogic( pAct->GetRect(), aMapVDev.GetMapMode(), GetPrefMapMode() ), aClipStack );
             }
             break;
-
-        case( META_CHORD_ACTION ):
+            
+        case( META_CHORD_ACTION	):
             {
                 MetaChordAction*    pAct = (MetaChordAction*) pAction;
                 // FIXME: this is imprecise
@@ -1546,7 +1589,7 @@ Rectangle GDIMetaFile::GetBoundRect( OutputDevice& i_rReference )
                 ImplActionBounds( aBound, aMapVDev.LogicToLogic( pAct->GetRect(), aMapVDev.GetMapMode(), GetPrefMapMode() ), aClipStack );
             }
             break;
-
+            
         case( META_POLYLINE_ACTION ):
             {
                 MetaPolyLineAction* pAct = (MetaPolyLineAction*) pAction;
@@ -1554,7 +1597,7 @@ Rectangle GDIMetaFile::GetBoundRect( OutputDevice& i_rReference )
                 ImplActionBounds( aBound, aMapVDev.LogicToLogic( aRect, aMapVDev.GetMapMode(), GetPrefMapMode() ), aClipStack );
             }
             break;
-
+            
         case( META_POLYGON_ACTION ):
             {
                 MetaPolygonAction* pAct = (MetaPolygonAction*) pAction;
@@ -1562,7 +1605,7 @@ Rectangle GDIMetaFile::GetBoundRect( OutputDevice& i_rReference )
                 ImplActionBounds( aBound, aMapVDev.LogicToLogic( aRect, aMapVDev.GetMapMode(), GetPrefMapMode() ), aClipStack );
             }
             break;
-
+            
         case( META_POLYPOLYGON_ACTION ):
             {
                 MetaPolyPolygonAction* pAct = (MetaPolyPolygonAction*) pAction;
@@ -1570,7 +1613,7 @@ Rectangle GDIMetaFile::GetBoundRect( OutputDevice& i_rReference )
                 ImplActionBounds( aBound, aMapVDev.LogicToLogic( aRect, aMapVDev.GetMapMode(), GetPrefMapMode() ), aClipStack );
             }
             break;
-
+            
         case( META_TEXT_ACTION ):
             {
                 MetaTextAction* pAct = (MetaTextAction*) pAction;
@@ -1582,8 +1625,8 @@ Rectangle GDIMetaFile::GetBoundRect( OutputDevice& i_rReference )
                 ImplActionBounds( aBound, aMapVDev.LogicToLogic( aRect, aMapVDev.GetMapMode(), GetPrefMapMode() ), aClipStack );
             }
             break;
-
-        case( META_TEXTARRAY_ACTION ):
+            
+        case( META_TEXTARRAY_ACTION	):
             {
                 MetaTextArrayAction* pAct = (MetaTextArrayAction*) pAction;
                 Rectangle aRect;
@@ -1595,10 +1638,10 @@ Rectangle GDIMetaFile::GetBoundRect( OutputDevice& i_rReference )
                 ImplActionBounds( aBound, aMapVDev.LogicToLogic( aRect, aMapVDev.GetMapMode(), GetPrefMapMode() ), aClipStack );
             }
             break;
-
+            
         case( META_STRETCHTEXT_ACTION ):
             {
-                MetaStretchTextAction* pAct = (MetaStretchTextAction*) pAction;
+                MetaStretchTextAction* pAct = (MetaStretchTextAction*) pAction;                
                 Rectangle aRect;
                 // hdu said base = index
                 aMapVDev.GetTextBoundRect( aRect, pAct->GetText(), pAct->GetIndex(), pAct->GetIndex(), pAct->GetLen(),
@@ -1608,14 +1651,14 @@ Rectangle GDIMetaFile::GetBoundRect( OutputDevice& i_rReference )
                 ImplActionBounds( aBound, aMapVDev.LogicToLogic( aRect, aMapVDev.GetMapMode(), GetPrefMapMode() ), aClipStack );
             }
             break;
-
+            
         case( META_TEXTLINE_ACTION ):
             {
                 MetaTextLineAction* pAct = (MetaTextLineAction*) pAction;
                 // measure a test string to get ascend and descent right
                 static const sal_Unicode pStr[] = { 0xc4, 0x67, 0 };
                 String aStr( pStr );
-
+                
                 Rectangle aRect;
                 aMapVDev.GetTextBoundRect( aRect, aStr, 0, 0, aStr.Len(), 0, NULL );
                 Point aPt( pAct->GetStartPoint() );
@@ -1624,7 +1667,7 @@ Rectangle GDIMetaFile::GetBoundRect( OutputDevice& i_rReference )
                 ImplActionBounds( aBound, aMapVDev.LogicToLogic( aRect, aMapVDev.GetMapMode(), GetPrefMapMode() ), aClipStack );
             }
             break;
-
+            
         case( META_BMPSCALE_ACTION ):
             {
                 MetaBmpScaleAction* pAct = (MetaBmpScaleAction*) pAction;
@@ -1632,7 +1675,7 @@ Rectangle GDIMetaFile::GetBoundRect( OutputDevice& i_rReference )
                 ImplActionBounds( aBound, aMapVDev.LogicToLogic( aRect, aMapVDev.GetMapMode(), GetPrefMapMode() ), aClipStack );
             }
             break;
-
+            
         case( META_BMPSCALEPART_ACTION ):
             {
                 MetaBmpScalePartAction* pAct = (MetaBmpScalePartAction*) pAction;
@@ -1640,7 +1683,7 @@ Rectangle GDIMetaFile::GetBoundRect( OutputDevice& i_rReference )
                 ImplActionBounds( aBound, aMapVDev.LogicToLogic( aRect, aMapVDev.GetMapMode(), GetPrefMapMode() ), aClipStack );
             }
             break;
-
+            
         case( META_BMPEXSCALE_ACTION ):
             {
                 MetaBmpExScaleAction*   pAct = (MetaBmpExScaleAction*) pAction;
@@ -1648,7 +1691,7 @@ Rectangle GDIMetaFile::GetBoundRect( OutputDevice& i_rReference )
                 ImplActionBounds( aBound, aMapVDev.LogicToLogic( aRect, aMapVDev.GetMapMode(), GetPrefMapMode() ), aClipStack );
             }
             break;
-
+            
         case( META_BMPEXSCALEPART_ACTION ):
             {
                 MetaBmpExScalePartAction*   pAct = (MetaBmpExScalePartAction*) pAction;
@@ -1656,7 +1699,7 @@ Rectangle GDIMetaFile::GetBoundRect( OutputDevice& i_rReference )
                 ImplActionBounds( aBound, aMapVDev.LogicToLogic( aRect, aMapVDev.GetMapMode(), GetPrefMapMode() ), aClipStack );
             }
             break;
-
+            
         case( META_GRADIENT_ACTION ):
             {
                 MetaGradientAction* pAct = (MetaGradientAction*) pAction;
@@ -1664,7 +1707,7 @@ Rectangle GDIMetaFile::GetBoundRect( OutputDevice& i_rReference )
                 ImplActionBounds( aBound, aMapVDev.LogicToLogic( aRect, aMapVDev.GetMapMode(), GetPrefMapMode() ), aClipStack );
             }
             break;
-
+            
         case( META_GRADIENTEX_ACTION ):
             {
                 MetaGradientExAction* pAct = (MetaGradientExAction*) pAction;
@@ -1672,21 +1715,21 @@ Rectangle GDIMetaFile::GetBoundRect( OutputDevice& i_rReference )
                 ImplActionBounds( aBound, aMapVDev.LogicToLogic( aRect, aMapVDev.GetMapMode(), GetPrefMapMode() ), aClipStack );
             }
             break;
-
+            
         case( META_COMMENT_ACTION ):
             {
                 // nothing to do
             };
             break;
-
+            
         case( META_HATCH_ACTION ):
             {
-                MetaHatchAction*    pAct = (MetaHatchAction*) pAction;
+                MetaHatchAction*	pAct = (MetaHatchAction*) pAction;
                 Rectangle aRect( pAct->GetPolyPolygon().GetBoundRect() );
                 ImplActionBounds( aBound, aMapVDev.LogicToLogic( aRect, aMapVDev.GetMapMode(), GetPrefMapMode() ), aClipStack );
             }
             break;
-
+            
         case( META_TRANSPARENT_ACTION ):
             {
                 MetaTransparentAction* pAct = (MetaTransparentAction*) pAction;
@@ -1694,11 +1737,11 @@ Rectangle GDIMetaFile::GetBoundRect( OutputDevice& i_rReference )
                 ImplActionBounds( aBound, aMapVDev.LogicToLogic( aRect, aMapVDev.GetMapMode(), GetPrefMapMode() ), aClipStack );
             }
             break;
-
+            
         case( META_FLOATTRANSPARENT_ACTION ):
             {
                 MetaFloatTransparentAction* pAct = (MetaFloatTransparentAction*) pAction;
-                GDIMetaFile                 aTransMtf( pAct->GetGDIMetaFile() );
+                GDIMetaFile					aTransMtf( pAct->GetGDIMetaFile() );
                 // get the bound rect of the contained metafile
                 Rectangle aRect( aTransMtf.GetBoundRect( i_rReference ) );
                 // scale the rect now on the assumption that the correct top left of the metafile
@@ -1712,22 +1755,22 @@ Rectangle GDIMetaFile::GetBoundRect( OutputDevice& i_rReference )
                 aRect.Right()  = long(double(aRect.Right())*fX);
                 aRect.Top()    = long(double(aRect.Top())*fY);
                 aRect.Bottom() = long(double(aRect.Bottom())*fY);
-
+                
                 // transform the rect to current VDev state
                 aRect = aMapVDev.LogicToLogic( aRect, aTransMtf.GetPrefMapMode(), aMapVDev.GetMapMode() );
-
+                
                 ImplActionBounds( aBound, aRect, aClipStack );
             }
             break;
-
+            
         case( META_EPS_ACTION ):
             {
-                MetaEPSAction*  pAct = (MetaEPSAction*) pAction;
+                MetaEPSAction*	pAct = (MetaEPSAction*) pAction;
                 Rectangle aRect( pAct->GetPoint(), pAct->GetSize() );
                 ImplActionBounds( aBound, aMapVDev.LogicToLogic( aRect, aMapVDev.GetMapMode(), GetPrefMapMode() ), aClipStack );
             }
             break;
-
+            
         case( META_CLIPREGION_ACTION ):
             {
                 MetaClipRegionAction* pAct = (MetaClipRegionAction*) pAction;
@@ -1737,7 +1780,7 @@ Rectangle GDIMetaFile::GetBoundRect( OutputDevice& i_rReference )
                     aClipStack.back() = Rectangle();
             }
             break;
-
+            
         case( META_ISECTRECTCLIPREGION_ACTION ):
             {
                 MetaISectRectClipRegionAction* pAct = (MetaISectRectClipRegionAction*) pAction;
@@ -1748,8 +1791,8 @@ Rectangle GDIMetaFile::GetBoundRect( OutputDevice& i_rReference )
                     aClipStack.back().Intersection( aRect );
             }
             break;
-
-        case( META_ISECTREGIONCLIPREGION_ACTION ):
+            
+        case( META_ISECTREGIONCLIPREGION_ACTION	):
             {
                 MetaISectRegionClipRegionAction*    pAct = (MetaISectRegionClipRegionAction*) pAction;
                 Rectangle aRect( aMapVDev.LogicToLogic( pAct->GetRegion().GetBoundRect(), aMapVDev.GetMapMode(), GetPrefMapMode() ) );
@@ -1759,7 +1802,7 @@ Rectangle GDIMetaFile::GetBoundRect( OutputDevice& i_rReference )
                     aClipStack.back().Intersection( aRect );
             }
             break;
-
+            
         case( META_BMP_ACTION ):
             {
                 MetaBmpAction* pAct = (MetaBmpAction*) pAction;
@@ -1767,7 +1810,7 @@ Rectangle GDIMetaFile::GetBoundRect( OutputDevice& i_rReference )
                 ImplActionBounds( aBound, aMapVDev.LogicToLogic( aRect, aMapVDev.GetMapMode(), GetPrefMapMode() ), aClipStack );
             }
             break;
-
+            
         case( META_BMPEX_ACTION ):
             {
                 MetaBmpExAction* pAct = (MetaBmpExAction*) pAction;
@@ -1775,7 +1818,7 @@ Rectangle GDIMetaFile::GetBoundRect( OutputDevice& i_rReference )
                 ImplActionBounds( aBound, aMapVDev.LogicToLogic( aRect, aMapVDev.GetMapMode(), GetPrefMapMode() ), aClipStack );
             }
             break;
-
+            
         case( META_MASK_ACTION ):
             {
                 MetaMaskAction* pAct = (MetaMaskAction*) pAction;
@@ -1783,7 +1826,7 @@ Rectangle GDIMetaFile::GetBoundRect( OutputDevice& i_rReference )
                 ImplActionBounds( aBound, aMapVDev.LogicToLogic( aRect, aMapVDev.GetMapMode(), GetPrefMapMode() ), aClipStack );
             }
             break;
-
+            
         case( META_MASKSCALE_ACTION ):
             {
                 MetaMaskScalePartAction* pAct = (MetaMaskScalePartAction*) pAction;
@@ -1791,7 +1834,7 @@ Rectangle GDIMetaFile::GetBoundRect( OutputDevice& i_rReference )
                 ImplActionBounds( aBound, aMapVDev.LogicToLogic( aRect, aMapVDev.GetMapMode(), GetPrefMapMode() ), aClipStack );
             }
             break;
-
+            
         case( META_MASKSCALEPART_ACTION ):
             {
                 MetaMaskScalePartAction* pAct = (MetaMaskScalePartAction*) pAction;
@@ -1799,7 +1842,7 @@ Rectangle GDIMetaFile::GetBoundRect( OutputDevice& i_rReference )
                 ImplActionBounds( aBound, aMapVDev.LogicToLogic( aRect, aMapVDev.GetMapMode(), GetPrefMapMode() ), aClipStack );
             }
             break;
-
+            
         case( META_WALLPAPER_ACTION ):
             {
                 MetaWallpaperAction* pAct = (MetaWallpaperAction*) pAction;
@@ -1807,7 +1850,7 @@ Rectangle GDIMetaFile::GetBoundRect( OutputDevice& i_rReference )
                 ImplActionBounds( aBound, aMapVDev.LogicToLogic( aRect, aMapVDev.GetMapMode(), GetPrefMapMode() ), aClipStack );
             }
             break;
-
+            
         case( META_TEXTRECT_ACTION ):
             {
                 MetaTextRectAction* pAct = (MetaTextRectAction*) pAction;
@@ -1815,7 +1858,7 @@ Rectangle GDIMetaFile::GetBoundRect( OutputDevice& i_rReference )
                 ImplActionBounds( aBound, aMapVDev.LogicToLogic( aRect, aMapVDev.GetMapMode(), GetPrefMapMode() ), aClipStack );
             }
             break;
-
+            
         case( META_MOVECLIPREGION_ACTION ):
             {
                 MetaMoveClipRegionAction* pAct = (MetaMoveClipRegionAction*) pAction;
@@ -1827,11 +1870,11 @@ Rectangle GDIMetaFile::GetBoundRect( OutputDevice& i_rReference )
                 }
             }
             break;
-
+            
         default:
             {
                 pAction->Execute( &aMapVDev );
-
+                
                 if( nActionType == META_PUSH_ACTION )
                 {
                     MetaPushAction* pAct = (MetaPushAction*) pAction;
@@ -1866,9 +1909,9 @@ Rectangle GDIMetaFile::GetBoundRect( OutputDevice& i_rReference )
 
 Color GDIMetaFile::ImplColAdjustFnc( const Color& rColor, const void* pColParam )
 {
-    return Color( rColor.GetTransparency(),
-                  ( (const ImplColAdjustParam*) pColParam )->pMapR[ rColor.GetRed() ],
-                  ( (const ImplColAdjustParam*) pColParam )->pMapG[ rColor.GetGreen() ],
+    return Color( rColor.GetTransparency(), 
+                  ( (const ImplColAdjustParam*) pColParam )->pMapR[ rColor.GetRed() ], 
+                  ( (const ImplColAdjustParam*) pColParam )->pMapG[ rColor.GetGreen() ], 
                   ( (const ImplColAdjustParam*) pColParam )->pMapB[ rColor.GetBlue() ] );
 
 }
@@ -1877,11 +1920,11 @@ Color GDIMetaFile::ImplColAdjustFnc( const Color& rColor, const void* pColParam
 
 BitmapEx GDIMetaFile::ImplBmpAdjustFnc( const BitmapEx& rBmpEx, const void* pBmpParam )
 {
-    const ImplBmpAdjustParam*   p = (const ImplBmpAdjustParam*) pBmpParam;
-    BitmapEx                    aRet( rBmpEx );
+    const ImplBmpAdjustParam*	p = (const ImplBmpAdjustParam*) pBmpParam;
+    BitmapEx					aRet( rBmpEx );
 
     aRet.Adjust( p->nLuminancePercent, p->nContrastPercent,
-                 p->nChannelRPercent, p->nChannelGPercent, p->nChannelBPercent,
+                 p->nChannelRPercent, p->nChannelGPercent, p->nChannelBPercent, 
                  p->fGamma, p->bInvert );
 
     return aRet;
@@ -1945,17 +1988,17 @@ Color GDIMetaFile::ImplColReplaceFnc( const Color& rColor, const void* pColParam
     const ULONG nR = rColor.GetRed(), nG = rColor.GetGreen(), nB = rColor.GetBlue();
 
     for( ULONG i = 0; i < ( (const ImplColReplaceParam*) pColParam )->nCount; i++ )
-    {
-        if( ( ( (const ImplColReplaceParam*) pColParam )->pMinR[ i ] <= nR ) &&
+    {																
+        if( ( ( (const ImplColReplaceParam*) pColParam )->pMinR[ i ] <= nR ) && 
             ( ( (const ImplColReplaceParam*) pColParam )->pMaxR[ i ] >= nR ) &&
             ( ( (const ImplColReplaceParam*) pColParam )->pMinG[ i ] <= nG ) &&
             ( ( (const ImplColReplaceParam*) pColParam )->pMaxG[ i ] >= nG ) &&
             ( ( (const ImplColReplaceParam*) pColParam )->pMinB[ i ] <= nB ) &&
             ( ( (const ImplColReplaceParam*) pColParam )->pMaxB[ i ] >= nB ) )
-        {
+        {															
             return( ( (const ImplColReplaceParam*) pColParam )->pDstCols[ i ] );
-        }
-    }
+        }															
+    }																
 
     return rColor;
 }
@@ -1964,8 +2007,8 @@ Color GDIMetaFile::ImplColReplaceFnc( const Color& rColor, const void* pColParam
 
 BitmapEx GDIMetaFile::ImplBmpReplaceFnc( const BitmapEx& rBmpEx, const void* pBmpParam )
 {
-    const ImplBmpReplaceParam*  p = (const ImplBmpReplaceParam*) pBmpParam;
-    BitmapEx                    aRet( rBmpEx );
+    const ImplBmpReplaceParam*	p = (const ImplBmpReplaceParam*) pBmpParam;
+    BitmapEx					aRet( rBmpEx );
 
     aRet.Replace( p->pSrcCols, p->pDstCols, p->nCount, p->pTols );
 
@@ -1974,7 +2017,7 @@ BitmapEx GDIMetaFile::ImplBmpReplaceFnc( const BitmapEx& rBmpEx, const void* pBm
 
 // ------------------------------------------------------------------------
 
-void GDIMetaFile::ImplExchangeColors( ColorExchangeFnc pFncCol, const void* pColParam,
+void GDIMetaFile::ImplExchangeColors( ColorExchangeFnc pFncCol, const void* pColParam, 
                                       BmpExchangeFnc pFncBmp, const void* pBmpParam )
 {
     GDIMetaFile aMtf;
@@ -2070,7 +2113,7 @@ void GDIMetaFile::ImplExchangeColors( ColorExchangeFnc pFncCol, const void* pCol
             case( META_FONT_ACTION ):
             {
                 MetaFontAction* pAct = (MetaFontAction*) pAction;
-                Font            aFont( pAct->GetFont() );
+                Font			aFont( pAct->GetFont() );
 
                 aFont.SetColor( pFncCol( aFont.GetColor(), pColParam ) );
                 aFont.SetFillColor( pFncCol( aFont.GetFillColor(), pColParam ) );
@@ -2080,9 +2123,9 @@ void GDIMetaFile::ImplExchangeColors( ColorExchangeFnc pFncCol, const void* pCol
 
             case( META_WALLPAPER_ACTION ):
             {
-                MetaWallpaperAction*    pAct = (MetaWallpaperAction*) pAction;
-                Wallpaper               aWall( pAct->GetWallpaper() );
-                const Rectangle&        rRect = pAct->GetRect();
+                MetaWallpaperAction*	pAct = (MetaWallpaperAction*) pAction;
+                Wallpaper				aWall( pAct->GetWallpaper() );
+                const Rectangle&		rRect = pAct->GetRect();
 
                 aWall.SetColor( pFncCol( aWall.GetColor(), pColParam ) );
 
@@ -2113,8 +2156,8 @@ void GDIMetaFile::ImplExchangeColors( ColorExchangeFnc pFncCol, const void* pCol
             case( META_BMPSCALE_ACTION ):
             {
                 MetaBmpScaleAction* pAct = (MetaBmpScaleAction*) pAction;
-                aMtf.Insert( new MetaBmpScaleAction( pAct->GetPoint(), pAct->GetSize(),
-                                                     pFncBmp( pAct->GetBitmap(), pBmpParam ).GetBitmap() ),
+                aMtf.Insert( new MetaBmpScaleAction( pAct->GetPoint(), pAct->GetSize(), 
+                                                     pFncBmp( pAct->GetBitmap(), pBmpParam ).GetBitmap() ), 
                                                      LIST_APPEND );
             }
             break;
@@ -2124,7 +2167,7 @@ void GDIMetaFile::ImplExchangeColors( ColorExchangeFnc pFncCol, const void* pCol
                 MetaBmpScalePartAction* pAct = (MetaBmpScalePartAction*) pAction;
                 aMtf.Insert( new MetaBmpScalePartAction( pAct->GetDestPoint(), pAct->GetDestSize(),
                                                          pAct->GetSrcPoint(), pAct->GetSrcSize(),
-                                                         pFncBmp( pAct->GetBitmap(), pBmpParam ).GetBitmap() ),
+                                                         pFncBmp( pAct->GetBitmap(), pBmpParam ).GetBitmap() ), 
                                                          LIST_APPEND );
             }
             break;
@@ -2132,7 +2175,7 @@ void GDIMetaFile::ImplExchangeColors( ColorExchangeFnc pFncCol, const void* pCol
             case( META_BMPEXSCALE_ACTION ):
             {
                 MetaBmpExScaleAction* pAct = (MetaBmpExScaleAction*) pAction;
-                aMtf.Insert( new MetaBmpExScaleAction( pAct->GetPoint(), pAct->GetSize(),
+                aMtf.Insert( new MetaBmpExScaleAction( pAct->GetPoint(), pAct->GetSize(), 
                                                        pFncBmp( pAct->GetBitmapEx(), pBmpParam ) ),
                                                        LIST_APPEND );
             }
@@ -2172,7 +2215,7 @@ void GDIMetaFile::ImplExchangeColors( ColorExchangeFnc pFncCol, const void* pCol
             case( META_GRADIENT_ACTION ):
             {
                 MetaGradientAction* pAct = (MetaGradientAction*) pAction;
-                Gradient            aGradient( pAct->GetGradient() );
+                Gradient			aGradient( pAct->GetGradient() );
 
                 aGradient.SetStartColor( pFncCol( aGradient.GetStartColor(), pColParam ) );
                 aGradient.SetEndColor( pFncCol( aGradient.GetEndColor(), pColParam ) );
@@ -2183,7 +2226,7 @@ void GDIMetaFile::ImplExchangeColors( ColorExchangeFnc pFncCol, const void* pCol
             case( META_GRADIENTEX_ACTION ):
             {
                 MetaGradientExAction* pAct = (MetaGradientExAction*) pAction;
-                Gradient              aGradient( pAct->GetGradient() );
+                Gradient			  aGradient( pAct->GetGradient() );
 
                 aGradient.SetStartColor( pFncCol( aGradient.GetStartColor(), pColParam ) );
                 aGradient.SetEndColor( pFncCol( aGradient.GetEndColor(), pColParam ) );
@@ -2193,8 +2236,8 @@ void GDIMetaFile::ImplExchangeColors( ColorExchangeFnc pFncCol, const void* pCol
 
             case( META_HATCH_ACTION ):
             {
-                MetaHatchAction*    pAct = (MetaHatchAction*) pAction;
-                Hatch               aHatch( pAct->GetHatch() );
+                MetaHatchAction*	pAct = (MetaHatchAction*) pAction;
+                Hatch				aHatch( pAct->GetHatch() );
 
                 aHatch.SetColor( pFncCol( aHatch.GetColor(), pColParam ) );
                 aMtf.Insert( new MetaHatchAction( pAct->GetPolyPolygon(), aHatch ), LIST_APPEND );
@@ -2204,24 +2247,24 @@ void GDIMetaFile::ImplExchangeColors( ColorExchangeFnc pFncCol, const void* pCol
             case( META_FLOATTRANSPARENT_ACTION ):
             {
                 MetaFloatTransparentAction* pAct = (MetaFloatTransparentAction*) pAction;
-                GDIMetaFile                 aTransMtf( pAct->GetGDIMetaFile() );
+                GDIMetaFile					aTransMtf( pAct->GetGDIMetaFile() );
 
                 aTransMtf.ImplExchangeColors( pFncCol, pColParam, pFncBmp, pBmpParam );
-                aMtf.Insert( new MetaFloatTransparentAction( aTransMtf,
+                aMtf.Insert( new MetaFloatTransparentAction( aTransMtf, 
                                                              pAct->GetPoint(), pAct->GetSize(),
-                                                             pAct->GetGradient() ),
+                                                             pAct->GetGradient() ), 
                                                              LIST_APPEND );
             }
             break;
 
             case( META_EPS_ACTION ):
             {
-                MetaEPSAction*  pAct = (MetaEPSAction*) pAction;
-                GDIMetaFile     aSubst( pAct->GetSubstitute() );
+                MetaEPSAction*	pAct = (MetaEPSAction*) pAction;
+                GDIMetaFile		aSubst( pAct->GetSubstitute() );
 
                 aSubst.ImplExchangeColors( pFncCol, pColParam, pFncBmp, pBmpParam );
-                aMtf.Insert( new MetaEPSAction( pAct->GetPoint(), pAct->GetSize(),
-                                                pAct->GetLink(), aSubst ),
+                aMtf.Insert( new MetaEPSAction( pAct->GetPoint(), pAct->GetSize(), 
+                                                pAct->GetLink(), aSubst ), 
                                                 LIST_APPEND );
             }
             break;
@@ -2249,9 +2292,9 @@ void GDIMetaFile::Adjust( short nLuminancePercent, short nContrastPercent,
         nChannelRPercent || nChannelGPercent || nChannelBPercent ||
         ( fGamma != 1.0 ) || bInvert )
     {
-        double              fM, fROff, fGOff, fBOff, fOff;
-        ImplColAdjustParam  aColParam;
-        ImplBmpAdjustParam  aBmpParam;
+        double				fM, fROff, fGOff, fBOff, fOff;
+        ImplColAdjustParam	aColParam;
+        ImplBmpAdjustParam	aBmpParam;
 
         aColParam.pMapR = new BYTE[ 256 ];
         aColParam.pMapG = new BYTE[ 256 ];
@@ -2266,7 +2309,7 @@ void GDIMetaFile::Adjust( short nLuminancePercent, short nContrastPercent,
         // total offset = luminance offset + contrast offset
         fOff = MinMax( nLuminancePercent, -100L, 100L ) * 2.55 + 128.0 - fM * 128.0;
 
-        // channel offset = channel offset  + total offset
+        // channel offset = channel offset	+ total offset
         fROff = nChannelRPercent * 2.55 + fOff;
         fGOff = nChannelGPercent * 2.55 + fOff;
         fBOff = nChannelBPercent * 2.55 + fOff;
@@ -2321,8 +2364,8 @@ void GDIMetaFile::Convert( MtfConversion eConversion )
     // nothing to do? => return quickly
     if( eConversion != MTF_CONVERSION_NONE )
     {
-        ImplColConvertParam aColParam;
-        ImplBmpConvertParam aBmpParam;
+        ImplColConvertParam	aColParam;
+        ImplBmpConvertParam	aBmpParam;
 
         aColParam.eConversion = eConversion;
         aBmpParam.eConversion = ( MTF_CONVERSION_1BIT_THRESHOLD == eConversion ) ? BMP_CONVERSION_1BIT_THRESHOLD : BMP_CONVERSION_8BIT_GREYS;
@@ -2354,8 +2397,8 @@ void GDIMetaFile::ReplaceColors( const Color* pSearchColors, const Color* pRepla
 
     for( ULONG i = 0; i < nColorCount; i++ )
     {
-        const long  nTol = pTols ? ( pTols[ i ] * 255 ) / 100 : 0;
-        long        nVal;
+        const long	nTol = pTols ? ( pTols[ i ] * 255 ) / 100 : 0;
+        long		nVal;
 
         nVal = pSearchColors[ i ].GetRed();
         aColParam.pMinR[ i ] = (ULONG) Max( nVal - nTol, 0L );
@@ -2394,8 +2437,8 @@ GDIMetaFile GDIMetaFile::GetMonochromeMtf( const Color& rColor ) const
 {
     GDIMetaFile aRet( *this );
 
-    ImplColMonoParam    aColParam;
-    ImplBmpMonoParam    aBmpParam;
+    ImplColMonoParam	aColParam;
+    ImplBmpMonoParam	aBmpParam;
 
     aColParam.aColor = rColor;
     aBmpParam.aColor = rColor;
@@ -2409,12 +2452,12 @@ GDIMetaFile GDIMetaFile::GetMonochromeMtf( const Color& rColor ) const
 
 ULONG GDIMetaFile::GetChecksum() const
 {
-    GDIMetaFile         aMtf;
-    SvMemoryStream      aMemStm( 65535, 65535 );
-    ImplMetaWriteData   aWriteData; aWriteData.meActualCharSet = aMemStm.GetStreamCharSet();
-    SVBT16              aBT16;
-    SVBT32              aBT32;
-    ULONG               nCrc = 0;
+    GDIMetaFile			aMtf;
+    SvMemoryStream		aMemStm( 65535, 65535 );
+    ImplMetaWriteData	aWriteData; aWriteData.meActualCharSet = aMemStm.GetStreamCharSet();
+    SVBT16				aBT16;
+    SVBT32				aBT32;
+    ULONG				nCrc = 0;
 
     for( ULONG i = 0, nObjCount = GetActionCount(); i < nObjCount; i++ )
     {
@@ -2598,7 +2641,7 @@ ULONG GDIMetaFile::GetChecksum() const
                 nCrc = rtl_crc32( nCrc, aBT32, 4 );
             }
             break;
-
+            
             case( META_MASKSCALE_ACTION ):
             {
                 MetaMaskScaleAction* pAct = (MetaMaskScaleAction*) pAction;
@@ -2704,21 +2747,21 @@ ULONG GDIMetaFile::GetSizeBytes() const
             case( META_BMP_ACTION ): nSizeBytes += ( (MetaBmpAction*) pAction )->GetBitmap().GetSizeBytes(); break;
             case( META_BMPSCALE_ACTION ): nSizeBytes += ( (MetaBmpScaleAction*) pAction )->GetBitmap().GetSizeBytes(); break;
             case( META_BMPSCALEPART_ACTION ): nSizeBytes += ( (MetaBmpScalePartAction*) pAction )->GetBitmap().GetSizeBytes(); break;
-
+            
             case( META_BMPEX_ACTION ): nSizeBytes += ( (MetaBmpExAction*) pAction )->GetBitmapEx().GetSizeBytes(); break;
             case( META_BMPEXSCALE_ACTION ): nSizeBytes += ( (MetaBmpExScaleAction*) pAction )->GetBitmapEx().GetSizeBytes(); break;
             case( META_BMPEXSCALEPART_ACTION ): nSizeBytes += ( (MetaBmpExScalePartAction*) pAction )->GetBitmapEx().GetSizeBytes(); break;
-
+            
             case( META_MASK_ACTION ): nSizeBytes += ( (MetaMaskAction*) pAction )->GetBitmap().GetSizeBytes(); break;
             case( META_MASKSCALE_ACTION ): nSizeBytes += ( (MetaMaskScaleAction*) pAction )->GetBitmap().GetSizeBytes(); break;
             case( META_MASKSCALEPART_ACTION ): nSizeBytes += ( (MetaMaskScalePartAction*) pAction )->GetBitmap().GetSizeBytes(); break;
-
+            
             case( META_POLYLINE_ACTION ): nSizeBytes += ( ( (MetaPolyLineAction*) pAction )->GetPolygon().GetSize() * sizeof( Point ) ); break;
             case( META_POLYGON_ACTION ): nSizeBytes += ( ( (MetaPolygonAction*) pAction )->GetPolygon().GetSize() * sizeof( Point ) ); break;
             case( META_POLYPOLYGON_ACTION ):
             {
                 const PolyPolygon& rPolyPoly = ( (MetaPolyPolygonAction*) pAction )->GetPolyPolygon();
-
+                
                 for( USHORT n = 0; n < rPolyPoly.Count(); ++n )
                     nSizeBytes += ( rPolyPoly[ n ].GetSize() * sizeof( Point ) );
             }
@@ -2727,22 +2770,22 @@ ULONG GDIMetaFile::GetSizeBytes() const
             case( META_TEXT_ACTION ): nSizeBytes += ( ( (MetaTextAction*) pAction )->GetText().Len() * sizeof( sal_Unicode ) ); break;
             case( META_STRETCHTEXT_ACTION ): nSizeBytes += ( ( (MetaStretchTextAction*) pAction )->GetText().Len() * sizeof( sal_Unicode ) ); break;
             case( META_TEXTRECT_ACTION ): nSizeBytes += ( ( (MetaTextRectAction*) pAction )->GetText().Len() * sizeof( sal_Unicode ) ); break;
-            case( META_TEXTARRAY_ACTION ):
+            case( META_TEXTARRAY_ACTION ): 
             {
                 MetaTextArrayAction* pTextArrayAction = (MetaTextArrayAction*) pAction;
-
+                
                 nSizeBytes += ( pTextArrayAction->GetText().Len() * sizeof( sal_Unicode ) );
-
+                
                 if( pTextArrayAction->GetDXArray() )
                     nSizeBytes += ( pTextArrayAction->GetLen() << 2 );
             }
             break;
-
+            
             default:
             break;
         }
     }
-
+    
     return( nSizeBytes );
 }
 
@@ -2752,9 +2795,9 @@ SvStream& operator>>( SvStream& rIStm, GDIMetaFile& rGDIMetaFile )
 {
     if( !rIStm.GetError() )
     {
-        char    aId[ 7 ];
-        ULONG   nStmPos = rIStm.Tell();
-        USHORT  nOldFormat = rIStm.GetNumberFormatInt();
+        char	aId[ 7 ];
+        ULONG	nStmPos = rIStm.Tell();
+        USHORT	nOldFormat = rIStm.GetNumberFormatInt();
 
         rIStm.SetNumberFormatInt( NUMBERFORMAT_INT_LITTLEENDIAN );
 
@@ -2765,10 +2808,10 @@ SvStream& operator>>( SvStream& rIStm, GDIMetaFile& rGDIMetaFile )
         if ( !strcmp( aId, "VCLMTF" ) )
         {
             // new format
-            VersionCompat*  pCompat;
-            MetaAction*     pAction;
-            UINT32          nStmCompressMode = 0;
-            UINT32          nCount = 0;
+            VersionCompat*	pCompat;
+            MetaAction* 	pAction;
+            UINT32			nStmCompressMode = 0;
+            UINT32			nCount = 0;
 
             pCompat = new VersionCompat( rIStm, STREAM_READ );
 
@@ -2839,9 +2882,9 @@ SvStream& GDIMetaFile::Read( SvStream& rIStm )
 
 SvStream& GDIMetaFile::Write( SvStream& rOStm )
 {
-    VersionCompat*  pCompat;
-    const UINT32    nStmCompressMode = rOStm.GetCompressMode();
-    USHORT          nOldFormat = rOStm.GetNumberFormatInt();
+    VersionCompat*	pCompat;
+    const UINT32	nStmCompressMode = rOStm.GetCompressMode();
+    USHORT			nOldFormat = rOStm.GetNumberFormatInt();
 
     rOStm.SetNumberFormatInt( NUMBERFORMAT_INT_LITTLEENDIAN );
     rOStm.Write( "VCLMTF", 6 );
@@ -2873,21 +2916,21 @@ SvStream& GDIMetaFile::Write( SvStream& rOStm )
 // ------------------------------------------------------------------------
 
 BOOL GDIMetaFile::CreateThumbnail( sal_uInt32 nMaximumExtent,
-                                    BitmapEx& rBmpEx,
+                                    BitmapEx& rBmpEx, 
                                     const BitmapEx* pOverlay,
                                     const Rectangle* pOverlayRect ) const
 {
     // the implementation is provided by KA
 
     // initialization seems to be complicated but is used to avoid rounding errors
-    VirtualDevice   aVDev;
+    VirtualDevice	aVDev;
     const Point     aNullPt;
     const Point     aTLPix( aVDev.LogicToPixel( aNullPt, GetPrefMapMode() ) );
     const Point     aBRPix( aVDev.LogicToPixel( Point( GetPrefSize().Width() - 1, GetPrefSize().Height() - 1 ), GetPrefMapMode() ) );
     Size            aDrawSize( aVDev.LogicToPixel( GetPrefSize(), GetPrefMapMode() ) );
-    Size            aSizePix( labs( aBRPix.X() - aTLPix.X() ) + 1, labs( aBRPix.Y() - aTLPix.Y() ) + 1 );
-    Point           aPosPix;
-
+    Size			aSizePix( labs( aBRPix.X() - aTLPix.X() ) + 1, labs( aBRPix.Y() - aTLPix.Y() ) + 1 );
+    Point			aPosPix;
+    
     if ( !rBmpEx.IsEmpty() )
         rBmpEx.SetEmpty();
 
@@ -2912,23 +2955,23 @@ BOOL GDIMetaFile::CreateThumbnail( sal_uInt32 nMaximumExtent,
             aSizePix.Width() = nMaximumExtent;
             aSizePix.Height() = FRound(  nMaximumExtent / fWH );
         }
-
+        
         aDrawSize.Width() = FRound( ( static_cast< double >( aDrawSize.Width() ) * aSizePix.Width() ) / aOldSizePix.Width() );
         aDrawSize.Height() = FRound( ( static_cast< double >( aDrawSize.Height() ) * aSizePix.Height() ) / aOldSizePix.Height() );
     }
-
-    Size        aFullSize;
-    Point       aBackPosPix;
-    Rectangle   aOverlayRect;
+    
+    Size 		aFullSize;
+    Point		aBackPosPix;
+    Rectangle 	aOverlayRect;
 
     // calculate addigtional positions and sizes if an overlay image is used
     if (  pOverlay )
     {
         aFullSize = Size( nMaximumExtent, nMaximumExtent );
         aOverlayRect = Rectangle( aNullPt, aFullSize  );
-
+        
         aOverlayRect.Intersection( pOverlayRect ? *pOverlayRect : Rectangle( aNullPt, pOverlay->GetSizePixel() ) );
-
+         
         if ( !aOverlayRect.IsEmpty() )
             aBackPosPix = Point( ( nMaximumExtent - aSizePix.Width() ) >> 1, ( nMaximumExtent - aSizePix.Height() ) >> 1 );
         else
@@ -2939,36 +2982,36 @@ BOOL GDIMetaFile::CreateThumbnail( sal_uInt32 nMaximumExtent,
         aFullSize = aSizePix;
         pOverlay = NULL;
     }
-
+        
     // draw image(s) into VDev and get resulting image
     if ( aVDev.SetOutputSizePixel( aFullSize ) )
     {
         // draw metafile into VDev
         const_cast<GDIMetaFile *>(this)->WindStart();
         const_cast<GDIMetaFile *>(this)->Play( &aVDev, aBackPosPix, aDrawSize );
-
+        
         // draw overlay if neccessary
         if ( pOverlay )
             aVDev.DrawBitmapEx( aOverlayRect.TopLeft(), aOverlayRect.GetSize(), *pOverlay );
-
+        
         // get paint bitmap
         Bitmap aBmp( aVDev.GetBitmap( aNullPt, aVDev.GetOutputSizePixel() ) );
-
+        
         // assure that we have a true color image
         if ( aBmp.GetBitCount() != 24 )
             aBmp.Convert( BMP_CONVERSION_24BIT );
-
+            
         // create resulting mask bitmap with metafile output set to black
         GDIMetaFile aMonchromeMtf( GetMonochromeMtf( COL_BLACK ) );
         aVDev.DrawWallpaper( Rectangle( aNullPt, aSizePix ), Wallpaper( Color( COL_WHITE ) ) );
         aMonchromeMtf.WindStart();
         aMonchromeMtf.Play( &aVDev, aBackPosPix, aDrawSize );
-
+        
         // watch for overlay mask
         if ( pOverlay  )
         {
             Bitmap aOverlayMergeBmp( aVDev.GetBitmap( aOverlayRect.TopLeft(), aOverlayRect.GetSize() ) );
-
+            
             // create ANDed resulting mask at overlay area
             if ( pOverlay->IsTransparent() )
                 aVDev.DrawBitmap( aOverlayRect.TopLeft(), aOverlayRect.GetSize(), pOverlay->GetMask() );
@@ -2977,14 +3020,14 @@ BOOL GDIMetaFile::CreateThumbnail( sal_uInt32 nMaximumExtent,
                 aVDev.SetLineColor( COL_BLACK );
                 aVDev.SetFillColor( COL_BLACK );
                 aVDev.DrawRect( aOverlayRect);
-            }
-
+            }			
+                
             aOverlayMergeBmp.CombineSimple( aVDev.GetBitmap( aOverlayRect.TopLeft(), aOverlayRect.GetSize() ), BMP_COMBINE_AND );
             aVDev.DrawBitmap( aOverlayRect.TopLeft(), aOverlayRect.GetSize(), aOverlayMergeBmp );
         }
-
+        
         rBmpEx = BitmapEx( aBmp, aVDev.GetBitmap( aNullPt, aVDev.GetOutputSizePixel() ) );
     }
-
+    
     return !rBmpEx.IsEmpty();
 }
diff --git a/vcl/source/gdi/gfxlink.cxx b/vcl/source/gdi/gfxlink.cxx
index 60ad94a63273..5562e4424b0f 100644
--- a/vcl/source/gdi/gfxlink.cxx
+++ b/vcl/source/gdi/gfxlink.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
@@ -45,11 +45,11 @@
 // -----------
 
 GfxLink::GfxLink() :
-    meType      ( GFX_LINK_TYPE_NONE ),
-    mpBuf       ( NULL ),
-    mpSwap      ( NULL ),
-    mnBufSize   ( 0 ),
-    mnUserId    ( 0UL ),
+    meType		( GFX_LINK_TYPE_NONE ),
+    mpBuf		( NULL ),
+    mpSwap		( NULL ),
+    mnBufSize	( 0 ),
+    mnUserId	( 0UL ),
     mpImpData   ( new ImpGfxLink )
 {
 }
@@ -82,7 +82,7 @@ GfxLink::GfxLink( BYTE* pBuf, sal_uInt32 nSize, GfxLinkType nType, BOOL bOwns )
         mpBuf = new ImpBuffer( nSize );
         memcpy( mpBuf->mpBuffer, pBuf, nSize );
     }
-    else
+    else														
         mpBuf = NULL;
 }
 
@@ -131,7 +131,7 @@ sal_Bool GfxLink::IsEqual( const GfxLink& rGfxLink ) const
         sal_uInt32 nDestSize = rGfxLink.GetDataSize();
         if ( pSource && pDest && ( nSourceSize == nDestSize ) )
         {
-            bIsEqual = memcmp( pSource, pDest, nSourceSize ) == 0;
+            bIsEqual = memcmp( pSource, pDest, nSourceSize ) == 0;		
         }
         else if ( ( pSource == 0 ) && ( pDest == 0 ) )
             bIsEqual = sal_True;
@@ -190,7 +190,7 @@ const BYTE* GfxLink::GetData() const
 
 // ------------------------------------------------------------------------
 
-const Size& GfxLink::GetPrefSize() const
+const Size&	GfxLink::GetPrefSize() const
 {
     return mpImpData->maPrefSize;
 }
@@ -244,8 +244,8 @@ BOOL GfxLink::LoadNative( Graphic& rGraphic )
 
         if( pData )
         {
-            SvMemoryStream  aMemStm;
-            ULONG           nCvtType;
+            SvMemoryStream	aMemStm;
+            ULONG			nCvtType;
 
             aMemStm.SetBuffer( (char*) pData, mnBufSize, FALSE, mnBufSize );
 
@@ -258,7 +258,7 @@ BOOL GfxLink::LoadNative( Graphic& rGraphic )
                 case( GFX_LINK_TYPE_NATIVE_WMF ): nCvtType = CVT_WMF; break;
                 case( GFX_LINK_TYPE_NATIVE_MET ): nCvtType = CVT_MET; break;
                 case( GFX_LINK_TYPE_NATIVE_PCT ): nCvtType = CVT_PCT; break;
-
+                
                 default: nCvtType = CVT_UNKNOWN; break;
             }
 
@@ -300,7 +300,7 @@ void GfxLink::SwapIn()
     if( IsSwappedOut() )
     {
         mpBuf = new ImpBuffer( mpSwap->GetData() );
-
+    
         if( !( --mpSwap->mnRefCount ) )
             delete mpSwap;
 
@@ -328,15 +328,15 @@ BOOL GfxLink::ExportNative( SvStream& rOStream ) const
 SvStream& operator<<( SvStream& rOStream, const GfxLink& rGfxLink )
 {
     VersionCompat* pCompat = new VersionCompat( rOStream, STREAM_WRITE, 2 );
-
+    
     // Version 1
     rOStream << (UINT16) rGfxLink.GetType() << rGfxLink.GetDataSize() << rGfxLink.GetUserId();
-
+    
     // Version 2
-    rOStream << rGfxLink.GetPrefSize() << rGfxLink.GetPrefMapMode();
-
+    rOStream << rGfxLink.GetPrefSize() << rGfxLink.GetPrefMapMode(); 
+    
     delete pCompat;
-
+    
     if( rGfxLink.GetDataSize() )
     {
         if( rGfxLink.IsSwappedOut() )
@@ -354,12 +354,12 @@ SvStream& operator>>( SvStream& rIStream, GfxLink& rGfxLink)
 {
     Size            aSize;
     MapMode         aMapMode;
-    sal_uInt32      nSize;
-    sal_uInt32      nUserId;
-    UINT16          nType;
-    BYTE*           pBuf;
-    bool            bMapAndSizeValid( false );
-    VersionCompat*  pCompat = new VersionCompat( rIStream, STREAM_READ );
+    sal_uInt32		nSize;
+    sal_uInt32		nUserId;
+    UINT16			nType;
+    BYTE*			pBuf;	
+    bool			bMapAndSizeValid( false );
+    VersionCompat*	pCompat = new VersionCompat( rIStream, STREAM_READ );
 
     // Version 1
     rIStream >> nType >> nSize >> nUserId;
@@ -369,12 +369,12 @@ SvStream& operator>>( SvStream& rIStream, GfxLink& rGfxLink)
         rIStream >> aSize >> aMapMode;
         bMapAndSizeValid = true;
     }
-
+    
     delete pCompat;
 
     pBuf = new BYTE[ nSize ];
     rIStream.Read( pBuf, nSize );
-
+    
     rGfxLink = GfxLink( pBuf, nSize, (GfxLinkType) nType, TRUE );
     rGfxLink.SetUserId( nUserId );
 
diff --git a/vcl/source/gdi/gradient.cxx b/vcl/source/gdi/gradient.cxx
index 9856e2213d85..185625e3ceff 100644
--- a/vcl/source/gdi/gradient.cxx
+++ b/vcl/source/gdi/gradient.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
@@ -290,8 +290,8 @@ BOOL Gradient::operator==( const Gradient& rGradient ) const
 
 SvStream& operator>>( SvStream& rIStm, Impl_Gradient& rImpl_Gradient )
 {
-    VersionCompat   aCompat( rIStm, STREAM_READ );
-    UINT16          nTmp16;
+    VersionCompat	aCompat( rIStm, STREAM_READ );
+    UINT16			nTmp16;
 
     rIStm >> nTmp16; rImpl_Gradient.meStyle = (GradientStyle) nTmp16;
 
diff --git a/vcl/source/gdi/graph.cxx b/vcl/source/gdi/graph.cxx
index 790c3d43bb85..770a3d521f22 100644
--- a/vcl/source/gdi/graph.cxx
+++ b/vcl/source/gdi/graph.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
@@ -260,9 +260,9 @@ Graphic::Graphic( const GDIMetaFile& rMtf )
 
 Graphic::Graphic( const ::com::sun::star::uno::Reference< ::com::sun::star::graphic::XGraphic >& rxGraphic )
 {
-    uno::Reference< lang::XUnoTunnel >      xTunnel( rxGraphic, uno::UNO_QUERY );
-    uno::Reference< lang::XTypeProvider >   xProv( rxGraphic, uno::UNO_QUERY );
-    const ::Graphic*                        pGraphic = ( ( xTunnel.is() && xProv.is() ) ?
+    uno::Reference< lang::XUnoTunnel >		xTunnel( rxGraphic, uno::UNO_QUERY );
+    uno::Reference< lang::XTypeProvider	>	xProv( rxGraphic, uno::UNO_QUERY );
+    const ::Graphic* 						pGraphic = ( ( xTunnel.is() && xProv.is() ) ?
                                                          reinterpret_cast< ::Graphic* >( xTunnel->getSomething( xProv->getImplementationId() ) ) :
                                                           NULL );
 
@@ -471,8 +471,8 @@ uno::Reference< graphic::XGraphic > Graphic::GetXGraphic() const
 
             if( xProv.is() )
             {
-                uno::Sequence< beans::PropertyValue >   aLoadProps( 1 );
-                ::rtl::OUString                         aURL( RTL_CONSTASCII_USTRINGPARAM( "private:memorygraphic/" ) );
+                uno::Sequence< beans::PropertyValue > 	aLoadProps( 1 );
+                ::rtl::OUString							aURL( RTL_CONSTASCII_USTRINGPARAM( "private:memorygraphic/" ) );
 
                 aLoadProps[ 0 ].Name = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "URL" ) );
                 aLoadProps[ 0 ].Value <<= ( aURL += ::rtl::OUString::valueOf( reinterpret_cast< sal_Int64 >( this ) ) );
diff --git a/vcl/source/gdi/graphictools.cxx b/vcl/source/gdi/graphictools.cxx
index 83c0cd628cdb..00e29b3281f4 100644
--- a/vcl/source/gdi/graphictools.cxx
+++ b/vcl/source/gdi/graphictools.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
@@ -58,7 +58,7 @@ static ::rtl::OString polyToString( const Polygon& rPoly )
         aStr += ",";
         aStr += ::rtl::OString::valueOf( static_cast< double >( rPoly[nVertex].getY() ) );
         aStr += ") ";
-    }
+    }    
 
     return aStr;
 }
@@ -118,7 +118,7 @@ SvtGraphicFill::Transform::Transform()
 {
     matrix[0] = 1.0; matrix[1] = 0.0; matrix[2] = 0.0;
     matrix[3] = 0.0; matrix[4] = 1.0; matrix[5] = 0.0;
-}
+} 
 
 ////////////////////////////////////////////////////////////////////////////
 
@@ -132,18 +132,18 @@ SvtGraphicStroke::SvtGraphicStroke() :
     maJoinType(),
     mfMiterLimit( 3.0 ),
     maDashArray()
-{
-}
-
-SvtGraphicStroke::SvtGraphicStroke( const Polygon&      rPath,
-                                    const PolyPolygon&  rStartArrow,
-                                    const PolyPolygon&  rEndArrow,
-                                    double              fTransparency,
-                                    double              fStrokeWidth,
-                                    CapType             aCap,
-                                    JoinType            aJoin,
-                                    double              fMiterLimit,
-                                    const DashArray&    rDashArray  ) :
+{ 
+}
+
+SvtGraphicStroke::SvtGraphicStroke( const Polygon& 		rPath,
+                                    const PolyPolygon&	rStartArrow,
+                                    const PolyPolygon&	rEndArrow,
+                                    double				fTransparency,
+                                    double 				fStrokeWidth,
+                                    CapType				aCap,
+                                    JoinType			aJoin,
+                                    double				fMiterLimit,
+                                    const DashArray&	rDashArray	) :
     maPath( rPath ),
     maStartArrow( rStartArrow ),
     maEndArrow( rEndArrow ),
@@ -207,7 +207,7 @@ void SvtGraphicStroke::getDashArray( DashArray& rDashArray ) const
 
     aStr += polyToString( maPath );
     aStr += "trans: ";
-    aStr += ::rtl::OString::valueOf( static_cast< double >(getTransparency()) );
+    aStr += ::rtl::OString::valueOf( static_cast< double >(getTransparency()) ); 
     aStr += " width: ";
     aStr += ::rtl::OString::valueOf( static_cast< double >(getStrokeWidth()) );
     aStr += " cap: ";
@@ -321,7 +321,7 @@ void SvtGraphicStroke::setDashArray( const DashArray& rDashArray )
 SvStream& operator<<( SvStream& rOStm, const SvtGraphicStroke& rClass )
 {
     VersionCompat aCompat( rOStm, STREAM_WRITE, 1 );
-
+    
     rClass.maPath.Write( rOStm );
     rClass.maStartArrow.Write( rOStm );
     rClass.maEndArrow.Write( rOStm );
@@ -344,7 +344,7 @@ SvStream& operator<<( SvStream& rOStm, const SvtGraphicStroke& rClass )
 SvStream& operator>>( SvStream& rIStm, SvtGraphicStroke& rClass )
 {
     VersionCompat aCompat( rIStm, STREAM_READ );
-
+    
     rClass.maPath.Read( rIStm );
     rClass.maStartArrow.Read( rIStm );
     rClass.maEndArrow.Read( rIStm );
@@ -363,7 +363,7 @@ SvStream& operator>>( SvStream& rIStm, SvtGraphicStroke& rClass )
     size_t i;
     for(i=0; i<rClass.maDashArray.size(); ++i)
         rIStm >> rClass.maDashArray[i];
-
+    
     return rIStm;
 }
 
@@ -387,20 +387,20 @@ SvtGraphicFill::SvtGraphicFill() :
 {
 }
 
-SvtGraphicFill::SvtGraphicFill( const PolyPolygon&  rPath,
-                                Color               aFillColor,
-                                double              fTransparency,
-                                FillRule            aFillRule,
-                                FillType            aFillType,
-                                const Transform&    aFillTransform,
-                                bool                bTiling,
-                                HatchType           aHatchType,
-                                Color               aHatchColor,
-                                GradientType        aGradientType,
-                                Color               aGradient1stColor,
-                                Color               aGradient2ndColor,
-                                int                 aGradientStepCount,
-                                const Graphic&      aFillGraphic ) :
+SvtGraphicFill::SvtGraphicFill( const PolyPolygon& 	rPath,
+                                Color				aFillColor,
+                                double				fTransparency,
+                                FillRule			aFillRule,
+                                FillType			aFillType,
+                                const Transform&	aFillTransform,
+                                bool				bTiling,
+                                HatchType			aHatchType,
+                                Color				aHatchColor,
+                                GradientType		aGradientType,
+                                Color				aGradient1stColor,
+                                Color				aGradient2ndColor,
+                                int					aGradientStepCount,
+                                const Graphic&		aFillGraphic ) :
     maPath( rPath ),
     maFillColor( aFillColor ),
     mfTransparency( fTransparency ),
@@ -501,7 +501,7 @@ void SvtGraphicFill::getGraphic( Graphic& rGraphic ) const
     aStr += "fill";
     aStr += colorToString( getFillColor() );
     aStr += " trans: ";
-    aStr += ::rtl::OString::valueOf( static_cast< double >(getTransparency()) );
+    aStr += ::rtl::OString::valueOf( static_cast< double >(getTransparency()) ); 
     aStr += " rule: ";
     switch( getFillRule() )
     {
@@ -544,7 +544,7 @@ void SvtGraphicFill::getGraphic( Graphic& rGraphic ) const
     aStr += " transform: [ ";
     int i;
     for(i=0; i<Transform::MatrixSize; ++i)
-        aStr += ::rtl::OString::valueOf( maFillTransform.matrix[i] );
+        aStr += ::rtl::OString::valueOf( maFillTransform.matrix[i] ); 
     aStr += " ] ";
 
     aStr += " hatch: ";
@@ -605,15 +605,15 @@ void SvtGraphicFill::getGraphic( Graphic& rGraphic ) const
         switch( maFillGraphic.GetType() )
         {
             case GRAPHIC_BITMAP:
-                aStr += "bitmap";
+                aStr += "bitmap"; 
                 break;
 
             case GRAPHIC_GDIMETAFILE:
-                aStr += "metafile";
+                aStr += "metafile"; 
                 break;
 
             case GRAPHIC_DEFAULT:
-                aStr += "default";
+                aStr += "default"; 
                 break;
 
             default:
@@ -622,7 +622,7 @@ void SvtGraphicFill::getGraphic( Graphic& rGraphic ) const
         }
 
         aStr += " of ";
-        aStr += ::rtl::OString::valueOf( static_cast< sal_Int32 >(maFillGraphic.GetSizeBytes()) );
+        aStr += ::rtl::OString::valueOf( static_cast< sal_Int32 >(maFillGraphic.GetSizeBytes()) ); 
         aStr += " bytes";
     }
 
@@ -702,7 +702,7 @@ void SvtGraphicFill::setGraphic( const Graphic& rGraphic )
 SvStream& operator<<( SvStream& rOStm, const SvtGraphicFill& rClass )
 {
     VersionCompat aCompat( rOStm, STREAM_WRITE, 1 );
-
+    
     rClass.maPath.Write( rOStm );
     rOStm << rClass.maFillColor;
     rOStm << rClass.mfTransparency;
@@ -731,7 +731,7 @@ SvStream& operator<<( SvStream& rOStm, const SvtGraphicFill& rClass )
 SvStream& operator>>( SvStream& rIStm, SvtGraphicFill& rClass )
 {
     VersionCompat aCompat( rIStm, STREAM_READ );
-
+    
     rClass.maPath.Read( rIStm );
     rIStm >> rClass.maFillColor;
     rIStm >> rClass.mfTransparency;
diff --git a/vcl/source/gdi/hatch.cxx b/vcl/source/gdi/hatch.cxx
index 3a8b51bf3022..5da6ea57135d 100644
--- a/vcl/source/gdi/hatch.cxx
+++ b/vcl/source/gdi/hatch.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
@@ -41,22 +41,22 @@ DBG_NAME( Hatch )
 // --------------
 
 ImplHatch::ImplHatch() :
-    mnRefCount  ( 1 ),
-    maColor     ( COL_BLACK ),
-    meStyle     ( HATCH_SINGLE ),
-    mnDistance  ( 1 ),
-    mnAngle     ( 0 )
+    mnRefCount	( 1 ),
+    maColor		( COL_BLACK ),
+    meStyle		( HATCH_SINGLE ),
+    mnDistance	( 1 ),
+    mnAngle		( 0 )
 {
 }
 
 // -----------------------------------------------------------------------
 
 ImplHatch::ImplHatch( const ImplHatch& rImplHatch ) :
-    mnRefCount  ( 1 ),
-    maColor     ( rImplHatch.maColor ),
-    meStyle     ( rImplHatch.meStyle ),
-    mnDistance  ( rImplHatch.mnDistance ),
-    mnAngle     ( rImplHatch.mnAngle )
+    mnRefCount	( 1 ),
+    maColor		( rImplHatch.maColor ),
+    meStyle		( rImplHatch.meStyle ),
+    mnDistance	( rImplHatch.mnDistance ),
+    mnAngle		( rImplHatch.mnAngle )
 {
 }
 
@@ -113,7 +113,7 @@ Hatch& Hatch::operator=( const Hatch& rHatch )
 
     if( !( --mpImplHatch->mnRefCount ) )
         delete mpImplHatch;
-
+    
     mpImplHatch = rHatch.mpImplHatch;
     return *this;
 }
@@ -185,8 +185,8 @@ void Hatch::SetAngle( USHORT nAngle10 )
 
 SvStream& operator>>( SvStream& rIStm, ImplHatch& rImplHatch )
 {
-    VersionCompat   aCompat( rIStm, STREAM_READ );
-    UINT16          nTmp16;
+    VersionCompat	aCompat( rIStm, STREAM_READ );
+    UINT16			nTmp16;
 
     rIStm >> nTmp16; rImplHatch.meStyle = (HatchStyle) nTmp16;
     rIStm >> rImplHatch.maColor >> rImplHatch.mnDistance >> rImplHatch.mnAngle;
diff --git a/vcl/source/gdi/image.cxx b/vcl/source/gdi/image.cxx
index e79308b2664e..0893718669fe 100644
--- a/vcl/source/gdi/image.cxx
+++ b/vcl/source/gdi/image.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
@@ -27,9 +27,9 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_vcl.hxx"
 
-#include <boost/scoped_ptr.hpp>
-#include <boost/scoped_array.hpp>
-
+#include <boost/scoped_ptr.hpp> 
+#include <boost/scoped_array.hpp> 
+ 
 #include <rtl/logfile.hxx>
 #include <tools/debug.hxx>
 #include <tools/stream.hxx>
@@ -85,8 +85,8 @@ Image::Image( const ResId& rResId ) :
     {
         pResMgr->Increment( sizeof( RSHEADER_TYPE ) );
 
-        BitmapEx    aBmpEx;
-        ULONG       nObjMask = pResMgr->ReadLong();
+        BitmapEx	aBmpEx;
+        ULONG 		nObjMask = pResMgr->ReadLong();
 
         if( nObjMask & RSC_IMAGE_IMAGEBITMAP )
         {
@@ -159,7 +159,7 @@ Image::Image( const Bitmap& rBitmap, const Bitmap& rMaskBitmap ) :
     DBG_CTOR( Image, NULL );
 
     const BitmapEx aBmpEx( rBitmap, rMaskBitmap );
-
+    
     ImplInit( aBmpEx );
 }
 
@@ -171,7 +171,7 @@ Image::Image( const Bitmap& rBitmap, const Color& rColor ) :
     DBG_CTOR( Image, NULL );
 
     const BitmapEx aBmpEx( rBitmap, rColor );
-
+    
     ImplInit( aBmpEx );
 }
 
@@ -181,7 +181,7 @@ Image::Image( const uno::Reference< graphic::XGraphic >& rxGraphic ) :
     mpImplData( NULL )
 {
     DBG_CTOR( Image, NULL );
-
+    
     const Graphic aGraphic( rxGraphic );
     ImplInit( aGraphic.GetBitmapEx() );
 }
@@ -223,7 +223,7 @@ void Image::ImplInit( const BitmapEx& rBmpEx )
 Size Image::GetSizePixel() const
 {
     DBG_CHKTHIS( Image, NULL );
-
+    
     Size aRet;
 
     if( mpImplData )
@@ -248,7 +248,7 @@ Size Image::GetSizePixel() const
 BitmapEx Image::GetBitmapEx() const
 {
     DBG_CHKTHIS( Image, NULL );
-
+    
     BitmapEx aRet;
 
     if( mpImplData )
@@ -273,7 +273,7 @@ BitmapEx Image::GetBitmapEx() const
 uno::Reference< graphic::XGraphic > Image::GetXGraphic() const
 {
     const Graphic aGraphic( GetBitmapEx() );
-
+    
     return aGraphic.GetXGraphic();
 }
 
@@ -299,7 +299,7 @@ Image Image::GetColorTransformedImage( ImageColorTransform eColorTransform ) con
 
             if( nColorCount && pSrcColors && pDstColors )
             {
-                aBmpEx.Replace( pSrcColors, pDstColors, nColorCount );
+                aBmpEx.Replace( pSrcColors, pDstColors, nColorCount ); 
                 aRet = Image( aBmpEx );
             }
 
@@ -373,7 +373,7 @@ Image& Image::operator=( const Image& rImage )
 
     if( mpImplData && ( 0 == --mpImplData->mnRefCount ) )
         delete mpImplData;
-
+    
     mpImplData = rImage.mpImplData;
 
     return *this;
@@ -385,7 +385,7 @@ BOOL Image::operator==( const Image& rImage ) const
 {
     DBG_CHKTHIS( Image, NULL );
     DBG_CHKOBJ( &rImage, Image, NULL );
-
+    
     bool bRet = false;
 
     if( rImage.mpImplData == mpImplData )
@@ -405,7 +405,7 @@ BOOL Image::operator==( const Image& rImage ) const
             case IMAGETYPE_IMAGE:
                 bRet = static_cast< ImplImageData* >( rImage.mpImplData->mpData )->IsEqual( *static_cast< ImplImageData* >( mpImplData->mpData ) );
             break;
-
+            
             default:
                 bRet = false;
             break;
@@ -437,30 +437,30 @@ ImageList::ImageList( const ResId& rResId ) :
     RTL_LOGFILE_CONTEXT( aLog, "vcl: ImageList::ImageList( const ResId& rResId )" );
 
     DBG_CTOR( ImageList, NULL );
-
+    
     rResId.SetRT( RSC_IMAGELIST );
-
+    
     ResMgr* pResMgr = rResId.GetResMgr();
 
     if( pResMgr && pResMgr->GetResource( rResId ) )
     {
         pResMgr->Increment( sizeof( RSHEADER_TYPE ) );
 
-        ULONG                               nObjMask = pResMgr->ReadLong();
-        const String                        aPrefix( pResMgr->ReadString() );
+        ULONG 								nObjMask = pResMgr->ReadLong();
+        const String						aPrefix( pResMgr->ReadString() );
         ::boost::scoped_ptr< Color >        spMaskColor;
 
         if( nObjMask & RSC_IMAGE_MASKCOLOR )
             spMaskColor.reset( new Color( ResId( (RSHEADER_TYPE*)pResMgr->GetClass(), *pResMgr ) ) );
-
+        
         pResMgr->Increment( pResMgr->GetObjSize( (RSHEADER_TYPE*)pResMgr->GetClass() ) );
-
+        
         if( nObjMask & RSC_IMAGELIST_IDLIST )
         {
             for( sal_Int32 i = 0, nCount = pResMgr->ReadLong(); i < nCount; ++i )
                 pResMgr->ReadLong();
         }
-
+        
         sal_Int32 nCount = pResMgr->ReadLong();
         ImplInit( static_cast< USHORT >( nCount ), Size() );
 
@@ -479,8 +479,8 @@ ImageList::ImageList( const ResId& rResId ) :
 
 // -----------------------------------------------------------------------
 
-ImageList::ImageList( const ::std::vector< ::rtl::OUString >& rNameVector,
-                      const ::rtl::OUString& rPrefix,
+ImageList::ImageList( const ::std::vector< ::rtl::OUString >& rNameVector, 
+                      const ::rtl::OUString& rPrefix, 
                       const Color* ) :
     mpImplData( NULL ),
     mnInitSize( 1 ),
@@ -495,8 +495,8 @@ ImageList::ImageList( const ::std::vector< ::rtl::OUString >& rNameVector,
     mpImplData->maPrefix = rPrefix;
     for( sal_uInt32 i = 0; i < rNameVector.size(); ++i )
     {
-//      fprintf (stderr, "List %p [%d]: '%s'\n",
-//               this, i, rtl::OUStringToOString( rNameVector[i], RTL_TEXTENCODING_UTF8 ).getStr() );
+//		fprintf (stderr, "List %p [%d]: '%s'\n",
+//				 this, i, rtl::OUStringToOString( rNameVector[i], RTL_TEXTENCODING_UTF8 ).getStr() );
         mpImplData->AddImage( rNameVector[ i ], static_cast< USHORT >( i ) + 1, BitmapEx() );
     }
 }
@@ -542,8 +542,8 @@ void ImageAryData::Load(const rtl::OUString &rPrefix)
 
     BitmapEx aBmpEx;
 
-//  fprintf (stderr, "Attempt load of '%s'\n",
-//           rtl::OUStringToOString( maName, RTL_TEXTENCODING_UTF8 ).getStr() );
+//	fprintf (stderr, "Attempt load of '%s'\n",
+//			 rtl::OUStringToOString( maName, RTL_TEXTENCODING_UTF8 ).getStr() );
 
     rtl::OUString aFileName = rPrefix;
     aFileName += maName;
@@ -621,7 +621,7 @@ void ImageList::InsertFromHorizontalStrip( const BitmapEx &rBitmapEx,
 {
     USHORT nItems = sal::static_int_cast< USHORT >( rNameVector.size() );
 
-//  fprintf (stderr, "InsertFromHorizontalStrip (1) [%d items]\n", nItems);
+//	fprintf (stderr, "InsertFromHorizontalStrip (1) [%d items]\n", nItems);
 
     if (!nItems)
             return;
@@ -644,7 +644,7 @@ void ImageList::InsertFromHorizontalStrip( const BitmapEx &rBitmapEx,
 void ImageList::InsertFromHorizontalBitmap( const ResId& rResId,
                                             USHORT       nCount,
                                             const Color *pMaskColor,
-                                            const Color *pSearchColors,
+                                            const Color *pSearchColors, 
                                             const Color *pReplaceColors,
                                             ULONG        nColorCount)
 {
@@ -658,7 +658,7 @@ void ImageList::InsertFromHorizontalBitmap( const ResId& rResId,
     }
     if ( nColorCount && pSearchColors && pReplaceColors )
         aBmpEx.Replace( pSearchColors, pReplaceColors, nColorCount );
-
+    
     std::vector< rtl::OUString > aNames( nCount );
     InsertFromHorizontalStrip( aBmpEx, aNames );
 }
@@ -727,7 +727,7 @@ void ImageList::ReplaceImage( const ::rtl::OUString& rImageName, const Image& rI
     if( nId )
     {
         RemoveImage( nId );
-
+        
         if( !mpImplData )
             ImplInit( 0, rImage.GetSizePixel() );
         mpImplData->AddImage( rImageName, nId, rImage.GetBitmapEx());
@@ -794,7 +794,7 @@ Image ImageList::GetImage( USHORT nId ) const
 {
     DBG_CHKTHIS( ImageList, NULL );
 
-//  fprintf (stderr, "GetImage %d\n", nId);
+//	fprintf (stderr, "GetImage %d\n", nId);
 
     Image aRet;
 
@@ -821,13 +821,13 @@ Image ImageList::GetImage( USHORT nId ) const
 
 Image ImageList::GetImage( const ::rtl::OUString& rImageName ) const
 {
-//  fprintf (stderr, "GetImage '%s'\n",
-//           rtl::OUStringToOString( rImageName, RTL_TEXTENCODING_UTF8 ).getStr() );
+//	fprintf (stderr, "GetImage '%s'\n",
+//			 rtl::OUStringToOString( rImageName, RTL_TEXTENCODING_UTF8 ).getStr() );
 
     if( mpImplData )
     {
         ImageAryData *pImg = mpImplData->maNameHash[ rImageName ];
-
+        
         if( pImg )
         {
             if( pImg->IsLoadable() )
@@ -835,7 +835,7 @@ Image ImageList::GetImage( const ::rtl::OUString& rImageName ) const
             return Image( pImg->maBitmapEx );
         }
     }
-//  fprintf (stderr, "no such image\n");
+//	fprintf (stderr, "no such image\n");
 
     return Image();
 }
@@ -857,7 +857,7 @@ void ImageList::Clear()
 USHORT ImageList::GetImageCount() const
 {
     DBG_CHKTHIS( ImageList, NULL );
-
+    
     return mpImplData ? static_cast< USHORT >( mpImplData->maImages.size() ) : 0;
 }
 
@@ -923,7 +923,7 @@ void ImageList::GetImageIds( ::std::vector< USHORT >& rIds ) const
     DBG_CHKTHIS( ImageList, NULL );
 
     rIds = ::std::vector< USHORT >();
-
+    
     if( mpImplData )
     {
         for( sal_uInt32 i = 0; i < mpImplData->maImages.size(); i++ )
@@ -933,7 +933,7 @@ void ImageList::GetImageIds( ::std::vector< USHORT >& rIds ) const
 
 // -----------------------------------------------------------------------
 
-::rtl::OUString ImageList::GetImageName( USHORT nPos ) const
+::rtl::OUString	ImageList::GetImageName( USHORT nPos ) const
 {
     DBG_CHKTHIS( ImageList, NULL );
 
@@ -952,7 +952,7 @@ void ImageList::GetImageNames( ::std::vector< ::rtl::OUString >& rNames ) const
     DBG_CHKTHIS( ImageList, NULL );
 
     rNames = ::std::vector< ::rtl::OUString >();
-
+    
     if( mpImplData )
     {
         for( sal_uInt32 i = 0; i < mpImplData->maImages.size(); i++ )
@@ -969,7 +969,7 @@ void ImageList::GetImageNames( ::std::vector< ::rtl::OUString >& rNames ) const
 Size ImageList::GetImageSize() const
 {
     DBG_CHKTHIS( ImageList, NULL );
-
+    
     Size aRet;
 
     if( mpImplData )
@@ -984,8 +984,8 @@ Size ImageList::GetImageSize() const
             aRet = mpImplData->maImageSize = aTmp.GetSizePixel();
         }
     }
-//  fprintf (stderr, "GetImageSize returns %d, %d\n",
-//           aRet.Width(), aRet.Height());
+//	fprintf (stderr, "GetImageSize returns %d, %d\n",
+//			 aRet.Width(), aRet.Height());
 
     return aRet;
 }
@@ -1014,7 +1014,7 @@ BOOL ImageList::operator==( const ImageList& rImageList ) const
 {
     DBG_CHKTHIS( ImageList, NULL );
     DBG_CHKOBJ( &rImageList, ImageList, NULL );
-
+    
     bool bRet = false;
 
     if( rImageList.mpImplData == mpImplData )
diff --git a/vcl/source/gdi/imagerepository.cxx b/vcl/source/gdi/imagerepository.cxx
index d97999311751..28984c1943af 100644
--- a/vcl/source/gdi/imagerepository.cxx
+++ b/vcl/source/gdi/imagerepository.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
diff --git a/vcl/source/gdi/impanmvw.cxx b/vcl/source/gdi/impanmvw.cxx
index 7762087dc605..a19eb46e8761 100644
--- a/vcl/source/gdi/impanmvw.cxx
+++ b/vcl/source/gdi/impanmvw.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
@@ -41,20 +41,20 @@ ImplAnimView::ImplAnimView( Animation* pParent, OutputDevice* pOut,
                             const Point& rPt, const Size& rSz,
                             ULONG nExtraData,
                             OutputDevice* pFirstFrameOutDev ) :
-        mpParent        ( pParent ),
-        mpOut           ( pFirstFrameOutDev ? pFirstFrameOutDev : pOut ),
-        mnExtraData     ( nExtraData ),
-        maPt            ( rPt ),
-        maSz            ( rSz ),
-        maSzPix         ( mpOut->LogicToPixel( maSz ) ),
-        maClip          ( mpOut->GetClipRegion() ),
-        mpBackground    ( new VirtualDevice ),
-        mpRestore       ( new VirtualDevice ),
-        meLastDisposal  ( DISPOSE_BACK ),
-        mbPause         ( FALSE ),
-        mbMarked        ( FALSE ),
-        mbHMirr         ( maSz.Width() < 0L ),
-        mbVMirr         ( maSz.Height() < 0L )
+        mpParent		( pParent ),
+        mpOut			( pFirstFrameOutDev ? pFirstFrameOutDev : pOut ),
+        mnExtraData		( nExtraData ),
+        maPt			( rPt ),
+        maSz			( rSz ),
+        maSzPix			( mpOut->LogicToPixel( maSz ) ),
+        maClip			( mpOut->GetClipRegion() ),
+        mpBackground	( new VirtualDevice ),
+        mpRestore		( new VirtualDevice ),
+        meLastDisposal	( DISPOSE_BACK ),
+        mbPause			( FALSE ),
+        mbMarked		( FALSE ),
+        mbHMirr			( maSz.Width() < 0L ),
+        mbVMirr			( maSz.Height() < 0L )
 {
     mpParent->ImplIncAnimCount();
 
@@ -97,7 +97,7 @@ ImplAnimView::ImplAnimView( Animation* pParent, OutputDevice* pOut,
     }
     else
         mpBackground->DrawOutDev( Point(), maSzPix, maDispPt, maDispSz, *mpOut );
-
+    
     // initial drawing to actual position
     ImplDrawToPos( mpParent->ImplGetCurPos() );
 
@@ -121,7 +121,7 @@ ImplAnimView::~ImplAnimView()
 BOOL ImplAnimView::ImplMatches( OutputDevice* pOut, long nExtraData ) const
 {
     BOOL bRet = FALSE;
-
+    
     if( nExtraData )
     {
         if( ( mnExtraData == nExtraData ) && ( !pOut || ( pOut == mpOut ) ) )
@@ -138,9 +138,9 @@ BOOL ImplAnimView::ImplMatches( OutputDevice* pOut, long nExtraData ) const
 void ImplAnimView::ImplGetPosSize( const AnimationBitmap& rAnm, Point& rPosPix, Size& rSizePix )
 {
     const Size& rAnmSize = mpParent->GetDisplaySizePixel();
-    Point       aPt2( rAnm.aPosPix.X() + rAnm.aSizePix.Width() - 1L,
+    Point		aPt2( rAnm.aPosPix.X() + rAnm.aSizePix.Width() - 1L,
                       rAnm.aPosPix.Y() + rAnm.aSizePix.Height() - 1L );
-    double      fFactX, fFactY;
+    double		fFactX, fFactY;
 
     // calculate x scaling
     if( rAnmSize.Width() > 1L )
@@ -176,8 +176,8 @@ void ImplAnimView::ImplGetPosSize( const AnimationBitmap& rAnm, Point& rPosPix,
 
 void ImplAnimView::ImplDrawToPos( ULONG nPos )
 {
-    VirtualDevice   aVDev;
-    Region*         pOldClip = !maClip.IsNull() ? new Region( mpOut->GetClipRegion() ) : NULL;
+    VirtualDevice	aVDev;
+    Region*			pOldClip = !maClip.IsNull() ? new Region( mpOut->GetClipRegion() ) : NULL;
 
     aVDev.SetOutputSizePixel( maSzPix, FALSE );
     nPos = Min( nPos, (ULONG) mpParent->Count() - 1UL );
@@ -201,7 +201,7 @@ void ImplAnimView::ImplDrawToPos( ULONG nPos )
 
 void ImplAnimView::ImplDraw( ULONG nPos )
 {
-    ImplDraw( nPos, NULL );
+    ImplDraw( nPos, NULL ); 
 }
 
 // ------------------------------------------------------------------------
@@ -215,13 +215,13 @@ void ImplAnimView::ImplDraw( ULONG nPos, VirtualDevice* pVDev )
         ImplSetMarked( TRUE );
     else if( !mbPause )
     {
-        VirtualDevice*          pDev;
-        Point                   aPosPix;
-        Point                   aBmpPosPix;
-        Size                    aSizePix;
-        Size                    aBmpSizePix;
-        const ULONG             nLastPos = mpParent->Count() - 1;
-        const AnimationBitmap&  rAnm = mpParent->Get( (USHORT) ( mnActPos = Min( nPos, nLastPos ) ) );
+        VirtualDevice*			pDev;
+        Point					aPosPix;
+        Point					aBmpPosPix;
+        Size					aSizePix;
+        Size					aBmpSizePix;
+        const ULONG				nLastPos = mpParent->Count() - 1;
+        const AnimationBitmap&	rAnm = mpParent->Get( (USHORT) ( mnActPos = Min( nPos, nLastPos ) ) );
 
         ImplGetPosSize( rAnm, aPosPix, aSizePix );
 
@@ -307,7 +307,7 @@ void ImplAnimView::ImplDraw( ULONG nPos, VirtualDevice* pVDev )
                 mpOut->SetClipRegion( *pOldClip );
                 delete pOldClip;
             }
-
+            
             delete pDev;
 
             if( mpOut->GetOutDevType() == OUTDEV_WINDOW )
@@ -334,7 +334,7 @@ void ImplAnimView::ImplRepaint()
         mpBackground->DrawOutDev( Point(), maSzPix, maDispPt, maDispSz, *mpOut );
 
     mbPause = FALSE;
-    ImplDrawToPos( mnActPos );
+    ImplDrawToPos( mnActPos ); 
     mbPause = bOldPause;
 }
 
diff --git a/vcl/source/gdi/impanmvw.hxx b/vcl/source/gdi/impanmvw.hxx
index 69403c0f6928..3e472ecc50e8 100644
--- a/vcl/source/gdi/impanmvw.hxx
+++ b/vcl/source/gdi/impanmvw.hxx
@@ -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
@@ -43,30 +43,30 @@ class ImplAnimView
 {
 private:
 
-    Animation*      mpParent;
-    OutputDevice*   mpOut;
-    long            mnExtraData;
-    Point           maPt;
-    Point           maDispPt;
-    Point           maRestPt;
-    Size            maSz;
-    Size            maSzPix;
-    Size            maDispSz;
-    Size            maRestSz;
-    MapMode         maMap;
-    Region          maClip;
-    VirtualDevice*  mpBackground;
-    VirtualDevice*  mpRestore;
-    ULONG           mnActPos;
-    Disposal        meLastDisposal;
-    BOOL            mbPause;
-    BOOL            mbFirst;
-    BOOL            mbMarked;
-    BOOL            mbHMirr;
-    BOOL            mbVMirr;
+    Animation*		mpParent;
+    OutputDevice*	mpOut;
+    long			mnExtraData;
+    Point			maPt;
+    Point			maDispPt;
+    Point			maRestPt;
+    Size			maSz;
+    Size			maSzPix;
+    Size			maDispSz;
+    Size			maRestSz;
+    MapMode			maMap;
+    Region			maClip;
+    VirtualDevice*	mpBackground;
+    VirtualDevice*	mpRestore;
+    ULONG			mnActPos;
+    Disposal		meLastDisposal;
+    BOOL			mbPause;
+    BOOL			mbFirst;
+    BOOL			mbMarked;
+    BOOL			mbHMirr;
+    BOOL			mbVMirr;
 
-    void            ImplGetPosSize( const AnimationBitmap& rAnm, Point& rPosPix, Size& rSizePix );
-    void            ImplDraw( ULONG nPos, VirtualDevice* pVDev );
+    void			ImplGetPosSize( const AnimationBitmap& rAnm, Point& rPosPix, Size& rSizePix );
+    void			ImplDraw( ULONG nPos, VirtualDevice* pVDev );
 
 public:
 
@@ -75,22 +75,22 @@ public:
                                   OutputDevice* pFirstFrameOutDev = NULL );
                     ~ImplAnimView();
 
-    BOOL            ImplMatches( OutputDevice* pOut, long nExtraData ) const;
-    void            ImplDrawToPos( ULONG nPos );
-    void            ImplDraw( ULONG nPos );
-    void            ImplRepaint();
-    AInfo*          ImplCreateAInfo() const;
+    BOOL			ImplMatches( OutputDevice* pOut, long nExtraData ) const;
+    void			ImplDrawToPos( ULONG nPos );
+    void			ImplDraw( ULONG nPos );
+    void			ImplRepaint();
+    AInfo*			ImplCreateAInfo() const;
 
-    const Point&    ImplGetOutPos() const { return maPt; }
+    const Point&	ImplGetOutPos() const { return maPt; }
 
-    const Size&     ImplGetOutSize() const { return maSz; }
-    const Size&     ImplGetOutSizePix() const { return maSzPix; }
+    const Size&		ImplGetOutSize() const { return maSz; }
+    const Size&		ImplGetOutSizePix() const { return maSzPix; }
 
-    void            ImplPause( BOOL bPause ) { mbPause = bPause; }
-    BOOL            ImplIsPause() const { return mbPause; }
+    void			ImplPause( BOOL bPause ) { mbPause = bPause; }
+    BOOL			ImplIsPause() const { return mbPause; }
 
-    void            ImplSetMarked( BOOL bMarked ) { mbMarked = bMarked; }
-    BOOL            ImplIsMarked() const { return mbMarked; }
+    void			ImplSetMarked( BOOL bMarked ) { mbMarked = bMarked; }
+    BOOL			ImplIsMarked() const { return mbMarked; }
 };
 
 #endif
diff --git a/vcl/source/gdi/impbmp.cxx b/vcl/source/gdi/impbmp.cxx
index 3e328b7db7a4..94d3e8af09ed 100644
--- a/vcl/source/gdi/impbmp.cxx
+++ b/vcl/source/gdi/impbmp.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
@@ -39,12 +39,12 @@
 #include <vcl/salinst.hxx>
 
 // --------------
-// - ImpBitmap  -
+// - ImpBitmap	-
 // --------------
 
 ImpBitmap::ImpBitmap() :
-            mnRefCount  ( 1UL ),
-            mnChecksum  ( 0UL ),
+            mnRefCount	( 1UL ),
+            mnChecksum	( 0UL ),
             mpSalBitmap ( ImplGetSVData()->mpDefInst->CreateSalBitmap() ),
             maSourceSize( 0, 0 )
 {
@@ -64,7 +64,7 @@ void ImpBitmap::ImplSetSalBitmap( SalBitmap* pBitmap )
 }
 
 // -----------------------------------------------------------------------
-
+    
 BOOL ImpBitmap::ImplCreate( const Size& rSize, USHORT nBitCount, const BitmapPalette& rPal )
 {
     maSourceSize = rSize;
diff --git a/vcl/source/gdi/impgraph.cxx b/vcl/source/gdi/impgraph.cxx
index 397a5d6b704a..888266ea72f1 100644
--- a/vcl/source/gdi/impgraph.cxx
+++ b/vcl/source/gdi/impgraph.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
@@ -51,17 +51,17 @@
 // - Defines -
 // -----------
 
-#define GRAPHIC_MAXPARTLEN          256000L
-#define GRAPHIC_MTFTOBMP_MAXEXT     2048
-#define GRAPHIC_STREAMBUFSIZE       8192UL
-
-#define SYS_WINMETAFILE             0x00000003L
-#define SYS_WNTMETAFILE             0x00000004L
-#define SYS_OS2METAFILE             0x00000005L
-#define SYS_MACMETAFILE             0x00000006L
+#define GRAPHIC_MAXPARTLEN			256000L
+#define GRAPHIC_MTFTOBMP_MAXEXT		2048
+#define GRAPHIC_STREAMBUFSIZE		8192UL
 
-#define GRAPHIC_FORMAT_50           static_cast<sal_uInt32>(COMPAT_FORMAT( 'G', 'R', 'F', '5' ))
-#define NATIVE_FORMAT_50            static_cast<sal_uInt32>(COMPAT_FORMAT( 'N', 'A', 'T', '5' ))
+#define SYS_WINMETAFILE			    0x00000003L
+#define SYS_WNTMETAFILE			    0x00000004L
+#define SYS_OS2METAFILE			    0x00000005L
+#define SYS_MACMETAFILE			    0x00000006L
+                                    
+#define GRAPHIC_FORMAT_50		    static_cast<sal_uInt32>(COMPAT_FORMAT( 'G', 'R', 'F', '5' ))
+#define NATIVE_FORMAT_50		    static_cast<sal_uInt32>(COMPAT_FORMAT( 'N', 'A', 'T', '5' ))
 
 // ---------------
 // - ImpSwapFile -
@@ -69,8 +69,8 @@
 
 struct ImpSwapFile
 {
-    INetURLObject   aSwapURL;
-    ULONG           nRefCount;
+    INetURLObject	aSwapURL;
+    ULONG			nRefCount;
 };
 
 // -----------------
@@ -133,33 +133,33 @@ Size GraphicReader::GetPreviewSize() const
 // --------------
 
 ImpGraphic::ImpGraphic() :
-        mpAnimation     ( NULL ),
-        mpContext       ( NULL ),
-        mpSwapFile      ( NULL ),
-        mpGfxLink       ( NULL ),
-        meType          ( GRAPHIC_NONE ),
+        mpAnimation		( NULL ),
+        mpContext		( NULL ),
+        mpSwapFile		( NULL ),
+        mpGfxLink		( NULL ),
+        meType			( GRAPHIC_NONE ),
         mnDocFilePos    ( 0UL ),
         mnSizeBytes     ( 0UL ),
         mnRefCount      ( 1UL ),
         mbSwapOut       ( FALSE ),
-        mbSwapUnderway  ( FALSE )
+        mbSwapUnderway	( FALSE )
 {
 }
 
 // ------------------------------------------------------------------------
 
 ImpGraphic::ImpGraphic( const ImpGraphic& rImpGraphic ) :
-        maMetaFile      ( rImpGraphic.maMetaFile ),
-        maEx            ( rImpGraphic.maEx ),
-        mpContext       ( NULL ),
-        mpSwapFile      ( rImpGraphic.mpSwapFile ),
-        meType          ( rImpGraphic.meType ),
-        maDocFileURLStr ( rImpGraphic.maDocFileURLStr ),
-        mnDocFilePos    ( rImpGraphic.mnDocFilePos ),
+        maMetaFile		( rImpGraphic.maMetaFile ),
+        maEx			( rImpGraphic.maEx ),
+        mpContext		( NULL ),
+        mpSwapFile		( rImpGraphic.mpSwapFile ),
+        meType			( rImpGraphic.meType ),
+        maDocFileURLStr	( rImpGraphic.maDocFileURLStr ),
+        mnDocFilePos	( rImpGraphic.mnDocFilePos ),
         mnSizeBytes     ( rImpGraphic.mnSizeBytes ),
-        mnRefCount      ( 1UL ),
-        mbSwapOut       ( rImpGraphic.mbSwapOut ),
-        mbSwapUnderway  ( FALSE )
+        mnRefCount		( 1UL ),
+        mbSwapOut		( rImpGraphic.mbSwapOut ),
+        mbSwapUnderway	( FALSE )
 {
     if( mpSwapFile )
         mpSwapFile->nRefCount++;
@@ -181,68 +181,68 @@ ImpGraphic::ImpGraphic( const ImpGraphic& rImpGraphic ) :
 // ------------------------------------------------------------------------
 
 ImpGraphic::ImpGraphic( const Bitmap& rBitmap ) :
-        maEx            ( rBitmap ),
-        mpAnimation     ( NULL ),
-        mpContext       ( NULL ),
-        mpSwapFile      ( NULL ),
-        mpGfxLink       ( NULL ),
-        meType          ( !rBitmap ? GRAPHIC_NONE : GRAPHIC_BITMAP ),
-        mnDocFilePos    ( 0UL ),
+        maEx			( rBitmap ),
+        mpAnimation		( NULL ),
+        mpContext		( NULL ),
+        mpSwapFile		( NULL ),
+        mpGfxLink		( NULL ),
+        meType			( !rBitmap ? GRAPHIC_NONE : GRAPHIC_BITMAP ),
+        mnDocFilePos	( 0UL ),
         mnSizeBytes     ( 0UL ),
-        mnRefCount      ( 1UL ),
-        mbSwapOut       ( FALSE ),
-        mbSwapUnderway  ( FALSE )
+        mnRefCount		( 1UL ),
+        mbSwapOut		( FALSE ),
+        mbSwapUnderway	( FALSE )
 {
 }
 
 // ------------------------------------------------------------------------
 
 ImpGraphic::ImpGraphic( const BitmapEx& rBitmapEx ) :
-        maEx            ( rBitmapEx ),
-        mpAnimation     ( NULL ),
-        mpContext       ( NULL ),
-        mpSwapFile      ( NULL ),
-        mpGfxLink       ( NULL ),
-        meType          ( !rBitmapEx ? GRAPHIC_NONE : GRAPHIC_BITMAP ),
-        mnDocFilePos    ( 0UL ),
+        maEx			( rBitmapEx ),
+        mpAnimation		( NULL ),
+        mpContext		( NULL ),
+        mpSwapFile		( NULL ),
+        mpGfxLink		( NULL ),
+        meType			( !rBitmapEx ? GRAPHIC_NONE : GRAPHIC_BITMAP ),
+        mnDocFilePos	( 0UL ),
         mnSizeBytes     ( 0UL ),
-        mnRefCount      ( 1UL ),
-        mbSwapOut       ( FALSE ),
-        mbSwapUnderway  ( FALSE )
+        mnRefCount		( 1UL ),
+        mbSwapOut		( FALSE ),
+        mbSwapUnderway	( FALSE )
 {
 }
 
 // ------------------------------------------------------------------------
 
 ImpGraphic::ImpGraphic( const Animation& rAnimation ) :
-        maEx            ( rAnimation.GetBitmapEx() ),
-        mpAnimation     ( new Animation( rAnimation ) ),
-        mpContext       ( NULL ),
-        mpSwapFile      ( NULL ),
-        mpGfxLink       ( NULL ),
-        meType          ( GRAPHIC_BITMAP ),
-        mnDocFilePos    ( 0UL ),
+        maEx			( rAnimation.GetBitmapEx() ),
+        mpAnimation		( new Animation( rAnimation ) ),
+        mpContext		( NULL ),
+        mpSwapFile		( NULL ),
+        mpGfxLink		( NULL ),
+        meType			( GRAPHIC_BITMAP ),
+        mnDocFilePos	( 0UL ),
         mnSizeBytes     ( 0UL ),
-        mnRefCount      ( 1UL ),
-        mbSwapOut       ( FALSE ),
-        mbSwapUnderway  ( FALSE )
+        mnRefCount		( 1UL ),
+        mbSwapOut		( FALSE ),
+        mbSwapUnderway	( FALSE )
 {
 }
 
 // ------------------------------------------------------------------------
 
 ImpGraphic::ImpGraphic( const GDIMetaFile& rMtf ) :
-        maMetaFile      ( rMtf ),
-        mpAnimation     ( NULL ),
-        mpContext       ( NULL ),
-        mpSwapFile      ( NULL ),
-        mpGfxLink       ( NULL ),
-        meType          ( GRAPHIC_GDIMETAFILE ),
-        mnDocFilePos    ( 0UL ),
+        maMetaFile		( rMtf ),
+        mpAnimation		( NULL ),
+        mpContext		( NULL ),
+        mpSwapFile		( NULL ),
+        mpGfxLink		( NULL ),
+        meType			( GRAPHIC_GDIMETAFILE ),
+        mnDocFilePos	( 0UL ),
         mnSizeBytes     ( 0UL ),
-        mnRefCount      ( 1UL ),
-        mbSwapOut       ( FALSE ),
-        mbSwapUnderway  ( FALSE )
+        mnRefCount		( 1UL ),
+        mbSwapOut		( FALSE ),
+        mbSwapUnderway	( FALSE )
 {
 }
 
@@ -487,7 +487,7 @@ Bitmap ImpGraphic::ImplGetBitmap(const GraphicConversionParameters& rParameters)
     if( meType == GRAPHIC_BITMAP )
     {
         const BitmapEx& rRetBmpEx = ( mpAnimation ? mpAnimation->GetBitmapEx() : maEx );
-        const Color     aReplaceColor( COL_WHITE );
+        const Color		aReplaceColor( COL_WHITE );
 
         aRetBmp = rRetBmpEx.GetBitmap( &aReplaceColor );
 
@@ -496,26 +496,26 @@ Bitmap ImpGraphic::ImplGetBitmap(const GraphicConversionParameters& rParameters)
     }
     else if( ( meType != GRAPHIC_DEFAULT ) && ImplIsSupportedGraphic() )
     {
-        // use corner points of graphic to determine the pixel
+        // use corner points of graphic to determine the pixel 
         // extent of the graphic (rounding errors are possible else)
-        VirtualDevice   aVDev;
+        VirtualDevice	aVDev;
         const Point     aNullPt;
         const Point     aTLPix( aVDev.LogicToPixel( aNullPt, maMetaFile.GetPrefMapMode() ) );
         const Point     aBRPix( aVDev.LogicToPixel( Point( maMetaFile.GetPrefSize().Width() - 1, maMetaFile.GetPrefSize().Height() - 1 ), maMetaFile.GetPrefMapMode() ) );
         Size            aDrawSize( aVDev.LogicToPixel( maMetaFile.GetPrefSize(), maMetaFile.GetPrefMapMode() ) );
-        Size            aSizePix( labs( aBRPix.X() - aTLPix.X() ) + 1, labs( aBRPix.Y() - aTLPix.Y() ) + 1 );
+        Size			aSizePix( labs( aBRPix.X() - aTLPix.X() ) + 1, labs( aBRPix.Y() - aTLPix.Y() ) + 1 );
 
         if(rParameters.getSizePixel().Width() && rParameters.getSizePixel().Height())
         {
-            aDrawSize.Width() = FRound((double)rParameters.getSizePixel().Width() *
+            aDrawSize.Width() = FRound((double)rParameters.getSizePixel().Width() * 
                 (double)aDrawSize.Width() / (double)aSizePix.Width());
-            aDrawSize.Height() = FRound((double)rParameters.getSizePixel().Height() *
+            aDrawSize.Height() = FRound((double)rParameters.getSizePixel().Height() * 
                 (double)aDrawSize.Height() / (double)aSizePix.Height());
 
             aSizePix = rParameters.getSizePixel();
         }
 
-        if( aSizePix.Width() && aSizePix.Height() && !rParameters.getUnlimitedSize()
+        if( aSizePix.Width() && aSizePix.Height() && !rParameters.getUnlimitedSize() 
             && (aSizePix.Width() > GRAPHIC_MTFTOBMP_MAXEXT || aSizePix.Height() > GRAPHIC_MTFTOBMP_MAXEXT))
         {
             const Size  aOldSizePix( aSizePix );
@@ -536,7 +536,7 @@ Bitmap ImpGraphic::ImplGetBitmap(const GraphicConversionParameters& rParameters)
             {
                 aVDev.SetAntialiasing(aVDev.GetAntialiasing() | ANTIALIASING_ENABLE_B2DDRAW);
             }
-
+            
             if(rParameters.getSnapHorVerLines())
             {
                 aVDev.SetAntialiasing(aVDev.GetAntialiasing() | ANTIALIASING_PIXELSNAPHAIRLINE);
@@ -736,7 +736,7 @@ ULONG ImpGraphic::ImplGetSizeBytes() const
         if( meType == GRAPHIC_BITMAP )
         {
             mnSizeBytes = mpAnimation ? mpAnimation->GetSizeBytes() : maEx.GetSizeBytes();
-        }
+        }      
         else if( meType == GRAPHIC_GDIMETAFILE )
         {
             mnSizeBytes = maMetaFile.GetSizeBytes();
@@ -920,20 +920,20 @@ ULONG ImpGraphic::ImplGetDocFilePos() const
 
 BOOL ImpGraphic::ImplReadEmbedded( SvStream& rIStm, BOOL bSwap )
 {
-    MapMode         aMapMode;
-    Size            aSize;
-    const ULONG     nStartPos = rIStm.Tell();
-    sal_uInt32      nId;
-    ULONG           nHeaderLen;
-    long            nType;
-    long            nLen;
-    const USHORT    nOldFormat = rIStm.GetNumberFormatInt();
-    BOOL            bRet = FALSE;
+    MapMode			aMapMode;
+    Size			aSize;
+    const ULONG		nStartPos = rIStm.Tell();
+    sal_uInt32		nId;
+    ULONG			nHeaderLen;
+    long			nType;
+    long			nLen;
+    const USHORT	nOldFormat = rIStm.GetNumberFormatInt();
+    BOOL			bRet = FALSE;
 
     if( !mbSwapUnderway )
     {
-        const String        aTempURLStr( maDocFileURLStr );
-        const ULONG         nTempPos = mnDocFilePos;
+        const String		aTempURLStr( maDocFileURLStr );
+        const ULONG			nTempPos = mnDocFilePos;
 
         ImplClear();
 
@@ -1022,8 +1022,8 @@ BOOL ImpGraphic::ImplReadEmbedded( SvStream& rIStm, BOOL bSwap )
             }
             else
             {
-                ::utl::TempFile     aTempFile;
-                const INetURLObject aTmpURL( aTempFile.GetURL() );
+                ::utl::TempFile		aTempFile;
+                const INetURLObject	aTmpURL( aTempFile.GetURL() );
 
                 if( aTmpURL.GetMainURL( INetURLObject::NO_DECODE ).getLength() )
                 {
@@ -1031,9 +1031,9 @@ BOOL ImpGraphic::ImplReadEmbedded( SvStream& rIStm, BOOL bSwap )
 
                     if( pOStm )
                     {
-                        ULONG   nFullLen = nHeaderLen + nLen;
-                        ULONG   nPartLen = Min( nFullLen, (ULONG) GRAPHIC_MAXPARTLEN );
-                        BYTE*   pBuffer = (BYTE*) rtl_allocateMemory( nPartLen );
+                        ULONG	nFullLen = nHeaderLen + nLen;
+                        ULONG	nPartLen = Min( nFullLen, (ULONG) GRAPHIC_MAXPARTLEN );
+                        BYTE*	pBuffer = (BYTE*) rtl_allocateMemory( nPartLen );
 
                           pOStm->SetNumberFormatInt( NUMBERFORMAT_INT_LITTLEENDIAN );
 
@@ -1101,7 +1101,7 @@ BOOL ImpGraphic::ImplReadEmbedded( SvStream& rIStm, BOOL bSwap )
         else if( meType >= SYS_WINMETAFILE && meType <= SYS_MACMETAFILE )
         {
             Graphic aSysGraphic;
-            ULONG   nCvtType;
+            ULONG	nCvtType;
 
             switch( sal::static_int_cast<ULONG>(meType) )
             {
@@ -1146,10 +1146,10 @@ BOOL ImpGraphic::ImplWriteEmbedded( SvStream& rOStm )
 
     if( ( meType != GRAPHIC_NONE ) && ( meType != GRAPHIC_DEFAULT ) && !ImplIsSwapOut() )
     {
-        const MapMode   aMapMode( ImplGetPrefMapMode() );
-        const Size      aSize( ImplGetPrefSize() );
-        const USHORT    nOldFormat = rOStm.GetNumberFormatInt();
-        ULONG           nDataFieldPos;
+        const MapMode	aMapMode( ImplGetPrefMapMode() );
+        const Size		aSize( ImplGetPrefSize() );
+        const USHORT	nOldFormat = rOStm.GetNumberFormatInt();
+        ULONG			nDataFieldPos;
 
         rOStm.SetNumberFormatInt( NUMBERFORMAT_INT_LITTLEENDIAN );
 
@@ -1227,8 +1227,8 @@ BOOL ImpGraphic::ImplSwapOut()
     {
         if( !maDocFileURLStr.Len() )
         {
-            ::utl::TempFile     aTempFile;
-            const INetURLObject aTmpURL( aTempFile.GetURL() );
+            ::utl::TempFile		aTempFile;
+            const INetURLObject	aTmpURL( aTempFile.GetURL() );
 
             if( aTmpURL.GetMainURL( INetURLObject::NO_DECODE ).getLength() )
             {
@@ -1419,7 +1419,7 @@ BOOL ImpGraphic::ImplIsSwapOut() const
 
 // ------------------------------------------------------------------------
 
-void ImpGraphic::ImplSetLink( const GfxLink& rGfxLink )
+void ImpGraphic::ImplSetLink( const	GfxLink& rGfxLink )
 {
     delete mpGfxLink;
     mpGfxLink = new GfxLink( rGfxLink );
@@ -1504,7 +1504,7 @@ SvStream& operator>>( SvStream& rIStm, ImpGraphic& rImpGraphic )
 {
     if( !rIStm.GetError() )
     {
-        const ULONG nStmPos1 = rIStm.Tell();
+        const ULONG	nStmPos1 = rIStm.Tell();
         sal_uInt32 nTmp;
 
         if ( !rImpGraphic.mbSwapUnderway )
@@ -1514,16 +1514,16 @@ SvStream& operator>>( SvStream& rIStm, ImpGraphic& rImpGraphic )
         rIStm >> nTmp;
 
         // if there is no more data, avoid further expensive
-        // reading which will create VDevs and other stuff, just to
+        // reading which will create VDevs and other stuff, just to 
         // read nothing. CAUTION: Eof is only true AFTER reading another
         // byte, a speciality of SvMemoryStream (!)
         if(!rIStm.GetError() && !rIStm.IsEof())
         {
             if( NATIVE_FORMAT_50 == nTmp )
             {
-                Graphic         aGraphic;
-                GfxLink         aLink;
-                VersionCompat*  pCompat;
+                Graphic			aGraphic;
+                GfxLink			aLink;
+                VersionCompat*	pCompat;
 
                 // read compat info
                 pCompat = new VersionCompat( rIStm, STREAM_READ );
@@ -1560,8 +1560,8 @@ SvStream& operator>>( SvStream& rIStm, ImpGraphic& rImpGraphic )
             }
             else
             {
-                BitmapEx        aBmpEx;
-                const USHORT    nOldFormat = rIStm.GetNumberFormatInt();
+                BitmapEx		aBmpEx;
+                const USHORT	nOldFormat = rIStm.GetNumberFormatInt();
 
                 rIStm.SeekRel( -4 );
                 rIStm.SetNumberFormatInt( NUMBERFORMAT_INT_LITTLEENDIAN );
@@ -1569,8 +1569,8 @@ SvStream& operator>>( SvStream& rIStm, ImpGraphic& rImpGraphic )
 
                 if( !rIStm.GetError() )
                 {
-                    UINT32  nMagic1(0), nMagic2(0);
-                    ULONG   nActPos = rIStm.Tell();
+                    UINT32	nMagic1(0), nMagic2(0);
+                    ULONG	nActPos = rIStm.Tell();
 
                     rIStm >> nMagic1 >> nMagic2;
                     rIStm.Seek( nActPos );
diff --git a/vcl/source/gdi/impimage.cxx b/vcl/source/gdi/impimage.cxx
index 476ac3ca44a9..0e03ee7ac7ac 100644
--- a/vcl/source/gdi/impimage.cxx
+++ b/vcl/source/gdi/impimage.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
@@ -40,9 +40,9 @@
 // - Defines -
 // -----------
 
-#define IMPSYSIMAGEITEM_MASK        ( 0x01 )
-#define IMPSYSIMAGEITEM_ALPHA       ( 0x02 )
-#define DISA_ALL                    ( 0xffff )
+#define IMPSYSIMAGEITEM_MASK		( 0x01 )
+#define IMPSYSIMAGEITEM_ALPHA		( 0x02 )
+#define DISA_ALL					( 0xffff )
 
 // ----------------
 // - ImageAryData -
@@ -253,9 +253,9 @@ void ImplImageBmp::Create( const BitmapEx& rBmpEx, long nItemWidth, long nItemHe
 
 void ImplImageBmp::Expand( USHORT nGrowSize )
 {
-    const ULONG     nDX = nGrowSize * maSize.Width();
-    const USHORT    nOldSize = mnSize;
-    BYTE*           pNewAry = new BYTE[ mnSize = sal::static_int_cast<USHORT>(mnSize+nGrowSize) ];
+    const ULONG 	nDX = nGrowSize * maSize.Width();
+    const USHORT	nOldSize = mnSize;
+    BYTE*			pNewAry = new BYTE[ mnSize = sal::static_int_cast<USHORT>(mnSize+nGrowSize) ];
 
     maBmpEx.Expand( nDX, 0UL );
 
@@ -357,8 +357,8 @@ void ImplImageBmp::ColorTransform( BmpColorMode eColorMode )
 
 BitmapEx ImplImageBmp::GetBitmapEx( USHORT nPosCount, USHORT* pPosAry ) const
 {
-    const Bitmap    aNewBmp( Size( nPosCount * maSize.Width(), maSize.Height() ),  maBmpEx.GetBitmap().GetBitCount() );
-    BitmapEx        aRet;
+    const Bitmap	aNewBmp( Size( nPosCount * maSize.Width(), maSize.Height() ),  maBmpEx.GetBitmap().GetBitCount() );
+    BitmapEx 		aRet;
     if( maBmpEx.IsAlpha() )
     {
         // initialize target bitmap with an empty alpha mask
@@ -373,7 +373,7 @@ BitmapEx ImplImageBmp::GetBitmapEx( USHORT nPosCount, USHORT* pPosAry ) const
     for( USHORT i = 0; i < nPosCount; i++ )
     {
         const Point     aSrcPos( pPosAry[ i ] * maSize.Width(), 0L );
-        const Point     aPos( i * maSize.Width(), 0L );
+        const Point		aPos( i * maSize.Width(), 0L );
         const Rectangle aSrcRect( aSrcPos, maSize );
         const Rectangle aDstRect( aPos, maSize );
 
@@ -392,7 +392,7 @@ void ImplImageBmp::Draw( USHORT nPos, OutputDevice* pOutDev,
     if( pOutDev->IsDeviceOutputNecessary() )
     {
         const Point aSrcPos( nPos * maSize.Width(), 0 );
-        Size        aOutSize;
+        Size 		aOutSize;
 
         aOutSize = ( pSize ? *pSize : pOutDev->PixelToLogic( maSize ) );
 
@@ -433,15 +433,15 @@ void ImplImageBmp::Draw( USHORT nPos, OutputDevice* pOutDev,
 
                     if( pAcc )
                     {
-                        const StyleSettings&    rSettings = pOutDev->GetSettings().GetStyleSettings();
-                        Color                   aColor;
-                        BitmapColor             aCol;
-                        const long              nW = pAcc->Width();
-                        const long              nH = pAcc->Height();
-                        BYTE*                   pMapR = new BYTE[ 256 ];
-                        BYTE*                   pMapG = new BYTE[ 256 ];
-                        BYTE*                   pMapB = new BYTE[ 256 ];
-                        long                    nX, nY;
+                        const StyleSettings&	rSettings = pOutDev->GetSettings().GetStyleSettings();
+                        Color					aColor;
+                        BitmapColor				aCol;
+                        const long				nW = pAcc->Width();
+                        const long				nH = pAcc->Height();
+                        BYTE*					pMapR = new BYTE[ 256 ];
+                        BYTE*					pMapG = new BYTE[ 256 ];
+                        BYTE*					pMapB = new BYTE[ 256 ];
+                        long					nX, nY;
 
                         if( nStyle & IMAGE_DRAW_HIGHLIGHT )
                             aColor = rSettings.GetHighlightColor();
@@ -604,7 +604,7 @@ void ImplImageBmp::ImplUpdateDisabledBmpEx( int nPos )
 
     if( pBmp && pBmpAlphaMask && pGrey && pGreyAlphaMask )
     {
-        BitmapColor aGreyVal( 0 );
+        BitmapColor	aGreyVal( 0 );
         BitmapColor aGreyAlphaMaskVal( 0 );
         const Point aPos( ( nPos < 0 ) ? 0 : ( nPos * maSize.Width() ), 0 );
         const int  nLeft = aPos.X(), nRight = nLeft + ( ( nPos < 0 ) ? aTotalSize.Width() : maSize.Width() );
diff --git a/vcl/source/gdi/impimagetree.cxx b/vcl/source/gdi/impimagetree.cxx
index 03e4c1dbbb2a..1fce3af5b0cc 100644
--- a/vcl/source/gdi/impimagetree.cxx
+++ b/vcl/source/gdi/impimagetree.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
diff --git a/vcl/source/gdi/impprn.cxx b/vcl/source/gdi/impprn.cxx
index 5224286cdad1..9ce4cd2e7821 100644
--- a/vcl/source/gdi/impprn.cxx
+++ b/vcl/source/gdi/impprn.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
@@ -51,10 +51,10 @@
 
 struct QueuePage
 {
-    GDIMetaFile*    mpMtf;
-    JobSetup*       mpSetup;
-    USHORT          mnPage;
-    BOOL            mbEndJob;
+    GDIMetaFile*	mpMtf;
+    JobSetup*		mpSetup;
+    USHORT			mnPage;
+    BOOL			mbEndJob;
 
                     QueuePage() { mpMtf = NULL; mpSetup = NULL; }
                     ~QueuePage() { delete mpMtf; if ( mpSetup ) delete mpSetup; }
@@ -76,8 +76,8 @@ ImplQPrinter::ImplQPrinter( Printer* pParent ) :
     SetSelfAsQueuePrinter( TRUE );
     SetPrinterProps( pParent );
     SetPageQueueSize( 0 );
-    mnCopyCount     = pParent->mnCopyCount;
-    mbCollateCopy   = pParent->mbCollateCopy;
+    mnCopyCount 	= pParent->mnCopyCount;
+    mbCollateCopy	= pParent->mbCollateCopy;
 }
 
 // -----------------------------------------------------------------------
@@ -105,8 +105,8 @@ void ImplQPrinter::ImplPrintMtf( GDIMetaFile& rPrtMtf, long nMaxBmpDPIX, long nM
 {
     for( MetaAction* pAct = rPrtMtf.FirstAction(); pAct && !mbAborted; pAct = rPrtMtf.NextAction() )
     {
-        const ULONG     nType = pAct->GetType();
-        sal_Bool        bExecuted = sal_False;
+        const ULONG		nType = pAct->GetType();
+        sal_Bool		bExecuted = sal_False;
 
         if( nType == META_COMMENT_ACTION )
         {
@@ -114,10 +114,10 @@ void ImplQPrinter::ImplPrintMtf( GDIMetaFile& rPrtMtf, long nMaxBmpDPIX, long nM
             MetaCommentAction* pComment = (MetaCommentAction*) pAct;
 
             if( pComment->GetComment().CompareIgnoreCaseToAscii( "XGRAD_SEQ_BEGIN" ) == COMPARE_EQUAL )
-            {
+            {	
                 pAct = rPrtMtf.NextAction();
 
-                // if next action is a GradientEx action, execute this and
+                // if next action is a GradientEx action, execute this and 
                 // skip actions until a XGRAD_SEQ_END comment is found
                 if( pAct && ( pAct->GetType() == META_GRADIENTEX_ACTION ) )
                 {
@@ -129,7 +129,7 @@ void ImplQPrinter::ImplPrintMtf( GDIMetaFile& rPrtMtf, long nMaxBmpDPIX, long nM
                     {
                         pAct = rPrtMtf.NextAction();
                     }
-                    while( pAct &&
+                    while( pAct && 
                            ( ( pAct->GetType() != META_COMMENT_ACTION ) ||
                              ( ( (MetaCommentAction*) pAct )->GetComment().CompareIgnoreCaseToAscii( "XGRAD_SEQ_END" ) != COMPARE_EQUAL ) ) );
 
@@ -137,7 +137,7 @@ void ImplQPrinter::ImplPrintMtf( GDIMetaFile& rPrtMtf, long nMaxBmpDPIX, long nM
                 }
             }
             else if( pComment->GetComment().CompareIgnoreCaseToAscii( "PRNSPOOL_TRANSPARENTBITMAP_BEGIN" ) == COMPARE_EQUAL )
-            {
+            {	
                 pAct = rPrtMtf.NextAction();
 
                 if( pAct && ( pAct->GetType() == META_BMPSCALE_ACTION ) )
@@ -160,7 +160,7 @@ void ImplQPrinter::ImplPrintMtf( GDIMetaFile& rPrtMtf, long nMaxBmpDPIX, long nM
                     {
                         pAct = rPrtMtf.NextAction();
                     }
-                    while( pAct &&
+                    while( pAct && 
                            ( ( pAct->GetType() != META_COMMENT_ACTION ) ||
                              ( ( (MetaCommentAction*) pAct )->GetComment().CompareIgnoreCaseToAscii( "PRNSPOOL_TRANSPARENTBITMAP_END" ) != COMPARE_EQUAL ) ) );
 
@@ -180,8 +180,8 @@ void ImplQPrinter::ImplPrintMtf( GDIMetaFile& rPrtMtf, long nMaxBmpDPIX, long nM
             const Bitmap&       rBmp = pBmpScaleAction->GetBitmap();
 
             DrawBitmap( pBmpScaleAction->GetPoint(), pBmpScaleAction->GetSize(),
-                        GetDownsampledBitmap( pBmpScaleAction->GetSize(),
-                                              Point(), rBmp.GetSizePixel(),
+                        GetDownsampledBitmap( pBmpScaleAction->GetSize(), 
+                                              Point(), rBmp.GetSizePixel(), 
                                               rBmp, nMaxBmpDPIX, nMaxBmpDPIY ) );
 
             bExecuted = sal_True;
@@ -193,7 +193,7 @@ void ImplQPrinter::ImplPrintMtf( GDIMetaFile& rPrtMtf, long nMaxBmpDPIX, long nM
 
             DrawBitmap( pBmpScalePartAction->GetDestPoint(), pBmpScalePartAction->GetDestSize(),
                         GetDownsampledBitmap( pBmpScalePartAction->GetDestSize(),
-                                              pBmpScalePartAction->GetSrcPoint(), pBmpScalePartAction->GetSrcSize(),
+                                              pBmpScalePartAction->GetSrcPoint(), pBmpScalePartAction->GetSrcSize(), 
                                               rBmp, nMaxBmpDPIX, nMaxBmpDPIY ) );
 
             bExecuted = sal_True;
@@ -204,8 +204,8 @@ void ImplQPrinter::ImplPrintMtf( GDIMetaFile& rPrtMtf, long nMaxBmpDPIX, long nM
             const BitmapEx&         rBmpEx = pBmpExScaleAction->GetBitmapEx();
 
             DrawBitmapEx( pBmpExScaleAction->GetPoint(), pBmpExScaleAction->GetSize(),
-                          GetDownsampledBitmapEx( pBmpExScaleAction->GetSize(),
-                                                  Point(), rBmpEx.GetSizePixel(),
+                          GetDownsampledBitmapEx( pBmpExScaleAction->GetSize(), 
+                                                  Point(), rBmpEx.GetSizePixel(), 
                                                   rBmpEx, nMaxBmpDPIX, nMaxBmpDPIY ) );
 
             bExecuted = sal_True;
@@ -217,15 +217,15 @@ void ImplQPrinter::ImplPrintMtf( GDIMetaFile& rPrtMtf, long nMaxBmpDPIX, long nM
 
             DrawBitmapEx( pBmpExScalePartAction->GetDestPoint(), pBmpExScalePartAction->GetDestSize(),
                           GetDownsampledBitmapEx( pBmpExScalePartAction->GetDestSize(),
-                                                  pBmpExScalePartAction->GetSrcPoint(), pBmpExScalePartAction->GetSrcSize(),
+                                                  pBmpExScalePartAction->GetSrcPoint(), pBmpExScalePartAction->GetSrcSize(), 
                                                   rBmpEx, nMaxBmpDPIX, nMaxBmpDPIY ) );
 
             bExecuted = sal_True;
         }
         else if( nType == META_TRANSPARENT_ACTION )
         {
-            MetaTransparentAction*  pTransAct = static_cast<MetaTransparentAction*>(pAct);
-            USHORT                  nTransparency( pTransAct->GetTransparence() );
+            MetaTransparentAction* 	pTransAct = static_cast<MetaTransparentAction*>(pAct);
+            USHORT					nTransparency( pTransAct->GetTransparence() );
 
             // #i10613# Respect transparency for draw color
             if( nTransparency )
@@ -255,11 +255,11 @@ void ImplQPrinter::ImplPrintMtf( GDIMetaFile& rPrtMtf, long nMaxBmpDPIX, long nM
         }
         else if( nType == META_FLOATTRANSPARENT_ACTION )
         {
-            MetaFloatTransparentAction* pFloatAction = (MetaFloatTransparentAction*) pAct;
-            GDIMetaFile&                rMtf = (GDIMetaFile&) pFloatAction->GetGDIMetaFile();
-            MapMode                     aDrawMap( rMtf.GetPrefMapMode() );
-            Point                       aDestPoint( LogicToPixel( pFloatAction->GetPoint() ) );
-            Size                        aDestSize( LogicToPixel( pFloatAction->GetSize() ) );
+            MetaFloatTransparentAction*	pFloatAction = (MetaFloatTransparentAction*) pAct;
+            GDIMetaFile&				rMtf = (GDIMetaFile&) pFloatAction->GetGDIMetaFile();
+            MapMode						aDrawMap( rMtf.GetPrefMapMode() );
+            Point						aDestPoint( LogicToPixel( pFloatAction->GetPoint() ) ); 
+            Size						aDestSize( LogicToPixel( pFloatAction->GetSize() ) );
 
             if( aDestSize.Width() && aDestSize.Height() )
             {
@@ -273,7 +273,7 @@ void ImplQPrinter::ImplPrintMtf( GDIMetaFile& rPrtMtf, long nMaxBmpDPIX, long nM
 
                 Fraction aScaleX( aDestSize.Width(), aTmpPrefSize.Width() );
                 Fraction aScaleY( aDestSize.Height(), aTmpPrefSize.Height() );
-
+                
                 aDrawMap.SetScaleX( aScaleX *= aDrawMap.GetScaleX() );
                 aDrawMap.SetScaleY( aScaleY *= aDrawMap.GetScaleY() );
                 aDrawMap.SetOrigin( PixelToLogic( aDestPoint, aDrawMap ) );
@@ -328,7 +328,7 @@ void ImplQPrinter::PrePrintPage( QueuePage* pPage )
     // convert to greysacles
     if( rPrinterOptions.IsConvertToGreyscales() )
     {
-        SetDrawMode( GetDrawMode() | ( DRAWMODE_GRAYLINE | DRAWMODE_GRAYFILL | DRAWMODE_GRAYTEXT |
+        SetDrawMode( GetDrawMode() | ( DRAWMODE_GRAYLINE | DRAWMODE_GRAYFILL | DRAWMODE_GRAYTEXT | 
                                        DRAWMODE_GRAYBITMAP | DRAWMODE_GRAYGRADIENT ) );
     }
 
@@ -366,7 +366,7 @@ void ImplQPrinter::PrintPage( unsigned int nPage )
     StartPage();
     ImplPrintMtf( maCurPageMetaFile, mnMaxBmpDPIX, mnMaxBmpDPIY );
     EndPage();
-
+    
     mnCurCopyCount--;
     if( mnCurCopyCount == 0 )
         PostPrintPage();
@@ -398,8 +398,8 @@ IMPL_LINK( ImplQPrinter, ImplPrintHdl, Timer*, EMPTYARG )
     // Druck-Job zuende?
     QueuePage* pActPage = maQueue.front();
     maQueue.erase( maQueue.begin() );
-
-
+    
+    
     vcl::DeletionListener aDel( this );
     if ( pActPage->mbEndJob )
     {
@@ -413,7 +413,7 @@ IMPL_LINK( ImplQPrinter, ImplPrintHdl, Timer*, EMPTYARG )
     else
     {
         mbDestroyAllowed = FALSE;
-
+        
         PrePrintPage( pActPage );
 
         USHORT nCopyCount = 1;
@@ -430,7 +430,7 @@ IMPL_LINK( ImplQPrinter, ImplPrintHdl, Timer*, EMPTYARG )
             }
 
             StartPage();
-
+            
             if ( mbAborted )
                 break;
 
@@ -487,8 +487,8 @@ void ImplQPrinter::EndQueuePrint()
     }
     else
     {
-        QueuePage* pQueuePage   = new QueuePage;
-        pQueuePage->mbEndJob    = TRUE;
+        QueuePage* pQueuePage	= new QueuePage;
+        pQueuePage->mbEndJob	= TRUE;
         maQueue.push_back( pQueuePage );
     }
 }
@@ -498,21 +498,21 @@ void ImplQPrinter::EndQueuePrint()
 bool ImplQPrinter::GetPaperRanges( std::vector< ULONG >& o_rRanges, bool i_bIncludeOrientationChanges ) const
 {
     bool bRet = false;
-
+    
     if( ImplGetSVData()->maGDIData.mbPrinterPullModel )
     {
         bRet = true;
         o_rRanges.clear();
-
+        
         if( ! maQueue.empty() )
         {
             ULONG nCurPage = 0;
-
+            
             // get first job data
             const ImplJobSetup* pLastFormat = NULL;
             if( maQueue.front()->mpSetup )
                 pLastFormat = maQueue.front()->mpSetup->ImplGetConstData();
-
+            
             // begin first range
             o_rRanges.push_back( 0 );
             for( std::vector< QueuePage* >::const_iterator it = maQueue.begin();
@@ -549,11 +549,11 @@ bool ImplQPrinter::GetPaperRanges( std::vector< ULONG >& o_rRanges, bool i_bIncl
                     }
                 }
             }
-
+            
             o_rRanges.push_back( nCurPage );
         }
     }
-
+    
     return bRet;
 }
 
@@ -570,10 +570,10 @@ void ImplQPrinter::AbortQueuePrint()
 
 void ImplQPrinter::AddQueuePage( GDIMetaFile* pPage, USHORT nPage, BOOL bNewJobSetup )
 {
-    QueuePage* pQueuePage   = new QueuePage;
-    pQueuePage->mpMtf       = pPage;
-    pQueuePage->mnPage      = nPage;
-    pQueuePage->mbEndJob    = FALSE;
+    QueuePage* pQueuePage	= new QueuePage;
+    pQueuePage->mpMtf		= pPage;
+    pQueuePage->mnPage		= nPage;
+    pQueuePage->mbEndJob	= FALSE;
     // ensure that the first page has a valid setup, this is needed
     // in GetPaperRanges (used in pullmodel)
     // caution: this depends on mnCurPage in Printer being
diff --git a/vcl/source/gdi/impvect.cxx b/vcl/source/gdi/impvect.cxx
index 0846f5567200..5d4e29e0b909 100644
--- a/vcl/source/gdi/impvect.cxx
+++ b/vcl/source/gdi/impvect.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
@@ -54,16 +54,16 @@
 
 // -----------------------------------------------------------------------------
 
-#define VECT_POLY_INLINE_INNER  1UL
-#define VECT_POLY_INLINE_OUTER  2UL
-#define VECT_POLY_OUTLINE_INNER 4UL
-#define VECT_POLY_OUTLINE_OUTER 8UL
+#define VECT_POLY_INLINE_INNER	1UL
+#define VECT_POLY_INLINE_OUTER	2UL
+#define VECT_POLY_OUTLINE_INNER	4UL
+#define VECT_POLY_OUTLINE_OUTER	8UL
 
 // -----------------------------------------------------------------------------
 
-#define VECT_MAP( _def_pIn, _def_pOut, _def_nVal )  _def_pOut[_def_nVal]=(_def_pIn[_def_nVal]=((_def_nVal)*4L)+1L)+5L;
-#define BACK_MAP( _def_nVal )                       ((((_def_nVal)+2)>>2)-1)
-#define VECT_PROGRESS( _def_pProgress, _def_nVal )  if(_def_pProgress&&_def_pProgress->IsSet())(_def_pProgress->Call((void*)_def_nVal));
+#define VECT_MAP( _def_pIn, _def_pOut, _def_nVal )	_def_pOut[_def_nVal]=(_def_pIn[_def_nVal]=((_def_nVal)*4L)+1L)+5L;
+#define BACK_MAP( _def_nVal )						((((_def_nVal)+2)>>2)-1)
+#define VECT_PROGRESS( _def_pProgress, _def_nVal )	if(_def_pProgress&&_def_pProgress->IsSet())(_def_pProgress->Call((void*)_def_nVal));
 
 // -----------
 // - statics -
@@ -71,7 +71,7 @@
 
 struct ChainMove { long nDX; long nDY; };
 
-static ChainMove aImplMove[ 8 ] =   {
+static ChainMove aImplMove[ 8 ] =	{
                                         { 1L, 0L },
                                         { 0L, -1L },
                                         { -1L, 0L },
@@ -82,7 +82,7 @@ static ChainMove aImplMove[ 8 ] =   {
                                         { 1L, 1L }
                                     };
 
-static ChainMove aImplMoveInner[ 8 ] =  {
+static ChainMove aImplMoveInner[ 8 ] =	{
                                             { 0L, 1L },
                                             { 1L, 0L },
                                             { 0L, -1L },
@@ -93,7 +93,7 @@ static ChainMove aImplMoveInner[ 8 ] =  {
                                             { -1L, 0L }
                                         };
 
-static ChainMove aImplMoveOuter[ 8 ] =  {
+static ChainMove aImplMoveOuter[ 8 ] =	{
                                             { 0L, -1L },
                                             { -1L, 0L },
                                             { 0L, 1L },
@@ -111,11 +111,11 @@ static ChainMove aImplMoveOuter[ 8 ] =  {
 struct ImplColorSet
 {
     BitmapColor maColor;
-    USHORT      mnIndex;
-    BOOL        mbSet;
+    USHORT		mnIndex;
+    BOOL		mbSet;
 
-    BOOL        operator<( const ImplColorSet& rSet ) const;
-    BOOL        operator>( const ImplColorSet& rSet ) const;
+    BOOL		operator<( const ImplColorSet& rSet ) const;
+    BOOL		operator>( const ImplColorSet& rSet ) const;
 };
 
 // ----------------------------------------------------------------------------
@@ -136,9 +136,9 @@ inline BOOL ImplColorSet::operator>( const ImplColorSet& rSet ) const
 
 extern "C" int __LOADONCALLAPI ImplColorSetCmpFnc( const void* p1, const void* p2 )
 {
-    ImplColorSet*   pSet1 = (ImplColorSet*) p1;
-    ImplColorSet*   pSet2 = (ImplColorSet*) p2;
-    int             nRet;
+    ImplColorSet*	pSet1 = (ImplColorSet*) p1;
+    ImplColorSet*	pSet2 = (ImplColorSet*) p2;
+    int				nRet;
 
     if( pSet1->mbSet && pSet2->mbSet )
     {
@@ -162,32 +162,32 @@ extern "C" int __LOADONCALLAPI ImplColorSetCmpFnc( const void* p1, const void* p
 
 class ImplPointArray
 {
-    Point*              mpArray;
-    ULONG               mnSize;
-    ULONG               mnRealSize;
+    Point*				mpArray;
+    ULONG				mnSize;
+    ULONG				mnRealSize;
 
 public:
 
                         ImplPointArray();
                         ~ImplPointArray();
 
-    void                ImplSetSize( ULONG nSize );
+    void				ImplSetSize( ULONG nSize );
 
-    ULONG               ImplGetRealSize() const { return mnRealSize; }
-    void                ImplSetRealSize( ULONG nRealSize ) { mnRealSize = nRealSize; }
+    ULONG				ImplGetRealSize() const { return mnRealSize; }
+    void				ImplSetRealSize( ULONG nRealSize ) { mnRealSize = nRealSize; }
 
-    inline Point&       operator[]( ULONG nPos );
-    inline const Point& operator[]( ULONG nPos ) const;
+    inline Point&		operator[]( ULONG nPos );
+    inline const Point&	operator[]( ULONG nPos ) const;
 
-    void                ImplCreatePoly( Polygon& rPoly ) const;
+    void				ImplCreatePoly( Polygon& rPoly ) const;
 };
 
 // -----------------------------------------------------------------------------
 
 ImplPointArray::ImplPointArray() :
-    mpArray     ( NULL ),
-    mnSize      ( 0UL ),
-    mnRealSize  ( 0UL )
+    mpArray		( NULL ),
+    mnSize		( 0UL ),
+    mnRealSize	( 0UL )
 
 {
 }
@@ -247,10 +247,10 @@ class ImplVectMap
 {
 private:
 
-    Scanline        mpBuf;
-    Scanline*       mpScan;
-    long            mnWidth;
-    long            mnHeight;
+    Scanline		mpBuf;
+    Scanline*		mpScan;
+    long			mnWidth;
+    long			mnHeight;
 
                     ImplVectMap() {};
 
@@ -259,27 +259,27 @@ public:
                     ImplVectMap( long nWidth, long nHeight );
                     ~ImplVectMap();
 
-    inline long     Width() const { return mnWidth; }
-    inline long     Height() const { return mnHeight; }
+    inline long		Width() const { return mnWidth; }
+    inline long		Height() const { return mnHeight; }
 
-    inline void     Set( long nY, long nX, BYTE cVal );
-    inline BYTE     Get( long nY, long nX ) const;
+    inline void		Set( long nY, long nX, BYTE cVal );
+    inline BYTE		Get( long nY, long nX ) const;
 
-    inline BOOL     IsFree( long nY, long nX ) const;
-    inline BOOL     IsCont( long nY, long nX ) const;
-    inline BOOL     IsDone( long nY, long nX ) const;
+    inline BOOL		IsFree( long nY, long nX ) const;
+    inline BOOL		IsCont( long nY, long nX ) const;
+    inline BOOL		IsDone( long nY, long nX ) const;
 
 };
 
 // -----------------------------------------------------------------------------
 
 ImplVectMap::ImplVectMap( long nWidth, long nHeight ) :
-    mnWidth ( nWidth ),
+    mnWidth	( nWidth ),
     mnHeight( nHeight )
 {
-    const long  nWidthAl = ( nWidth >> 2L ) + 1L;
-    const long  nSize = nWidthAl * nHeight;
-    Scanline    pTmp = mpBuf = (Scanline) rtl_allocateMemory( nSize );
+    const long	nWidthAl = ( nWidth >> 2L ) + 1L;
+    const long	nSize = nWidthAl * nHeight;
+    Scanline	pTmp = mpBuf = (Scanline) rtl_allocateMemory( nSize );
 
     memset( mpBuf, 0, nSize );
     mpScan = (Scanline*) rtl_allocateMemory( nHeight * sizeof( Scanline ) );
@@ -299,7 +299,7 @@ ImplVectMap::~ImplVectMap()
 
 // -----------------------------------------------------------------------------
 
-inline void ImplVectMap::Set( long nY, long nX, BYTE cVal )
+inline void	ImplVectMap::Set( long nY, long nX, BYTE cVal )
 {
     const BYTE cShift = sal::static_int_cast<BYTE>(6 - ( ( nX & 3 ) << 1 ));
     ( ( mpScan[ nY ][ nX >> 2 ] ) &= ~( 3 << cShift ) ) |= ( cVal << cShift );
@@ -307,7 +307,7 @@ inline void ImplVectMap::Set( long nY, long nX, BYTE cVal )
 
 // -----------------------------------------------------------------------------
 
-inline BYTE ImplVectMap::Get( long nY, long nX ) const
+inline BYTE	ImplVectMap::Get( long nY, long nX ) const
 {
     return sal::static_int_cast<BYTE>( ( ( mpScan[ nY ][ nX >> 2 ] ) >> ( 6 - ( ( nX & 3 ) << 1 ) ) ) & 3 );
 }
@@ -341,38 +341,38 @@ class ImplChain
 {
 private:
 
-    Polygon         maPoly;
-    Point           maStartPt;
-    ULONG           mnArraySize;
-    ULONG           mnCount;
-    long            mnResize;
-    BYTE*           mpCodes;
+    Polygon			maPoly;
+    Point			maStartPt;
+    ULONG			mnArraySize;
+    ULONG			mnCount;
+    long			mnResize;
+    BYTE*			mpCodes;
 
-    void            ImplGetSpace();
+    void			ImplGetSpace();
 
-    void            ImplCreate();
-    void            ImplCreateInner();
-    void            ImplCreateOuter();
-    void            ImplPostProcess( const ImplPointArray& rArr );
+    void			ImplCreate();
+    void			ImplCreateInner();
+    void			ImplCreateOuter();
+    void			ImplPostProcess( const ImplPointArray& rArr );
 
 public:
 
                     ImplChain( ULONG nInitCount = 1024UL, long nResize = -1L );
                     ~ImplChain();
 
-    void            ImplBeginAdd( const Point& rStartPt );
-    inline void     ImplAdd( BYTE nCode );
-    void            ImplEndAdd( ULONG nTypeFlag );
+    void			ImplBeginAdd( const Point& rStartPt );
+    inline void		ImplAdd( BYTE nCode );
+    void			ImplEndAdd( ULONG nTypeFlag );
 
-    const Polygon&  ImplGetPoly() { return maPoly; }
+    const Polygon&	ImplGetPoly() { return maPoly; }
 };
 
 // -----------------------------------------------------------------------------
 
 ImplChain::ImplChain( ULONG nInitCount, long nResize ) :
-    mnArraySize ( nInitCount ),
-    mnCount     ( 0UL ),
-    mnResize    ( nResize )
+    mnArraySize	( nInitCount ),
+    mnCount		( 0UL ),
+    mnResize	( nResize )
 {
     DBG_ASSERT( nInitCount && nResize, "ImplChain::ImplChain(): invalid parameters!" );
     mpCodes = new BYTE[ mnArraySize ];
@@ -390,7 +390,7 @@ ImplChain::~ImplChain()
 void ImplChain::ImplGetSpace()
 {
     const ULONG nOldArraySize = mnArraySize;
-    BYTE*       pNewCodes;
+    BYTE*		pNewCodes;
 
     mnArraySize = ( mnResize < 0L ) ? ( mnArraySize << 1UL ) : ( mnArraySize + (ULONG) mnResize );
     pNewCodes = new BYTE[ mnArraySize ];
@@ -410,7 +410,7 @@ void ImplChain::ImplBeginAdd( const Point& rStartPt )
 
 // -----------------------------------------------------------------------------
 
-inline void ImplChain::ImplAdd( BYTE nCode )
+inline void	ImplChain::ImplAdd( BYTE nCode )
 {
     if( mnCount == mnArraySize )
         ImplGetSpace();
@@ -438,12 +438,12 @@ void ImplChain::ImplEndAdd( ULONG nFlag )
             USHORT i, nPolyPos;
             for( i = 0, nPolyPos = 0; i < ( mnCount - 1 ); i++ )
             {
-                const BYTE              cMove = mpCodes[ i ];
-                const BYTE              cNextMove = mpCodes[ i + 1 ];
-                const ChainMove&        rMove = aImplMove[ cMove ];
-                const ChainMove&        rMoveInner = aImplMoveInner[ cMove ];
-//              Point&                  rPt = aArr[ nPolyPos ];
-                BOOL                    bDone = TRUE;
+                const BYTE				cMove = mpCodes[ i ];
+                const BYTE				cNextMove = mpCodes[ i + 1 ];
+                const ChainMove&		rMove = aImplMove[ cMove ];
+                const ChainMove&		rMoveInner = aImplMoveInner[ cMove ];
+//				Point&					rPt = aArr[ nPolyPos ];
+                BOOL					bDone = TRUE;
 
                 nLastX += rMove.nDX;
                 nLastY += rMove.nDY;
@@ -545,12 +545,12 @@ void ImplChain::ImplEndAdd( ULONG nFlag )
             USHORT i, nPolyPos;
             for( i = 0, nPolyPos = 0; i < ( mnCount - 1 ); i++ )
             {
-                const BYTE              cMove = mpCodes[ i ];
-                const BYTE              cNextMove = mpCodes[ i + 1 ];
-                const ChainMove&        rMove = aImplMove[ cMove ];
-                const ChainMove&        rMoveOuter = aImplMoveOuter[ cMove ];
-//              Point&                  rPt = aArr[ nPolyPos ];
-                BOOL                    bDone = TRUE;
+                const BYTE				cMove = mpCodes[ i ];
+                const BYTE				cNextMove = mpCodes[ i + 1 ];
+                const ChainMove&		rMove = aImplMove[ cMove ];
+                const ChainMove&		rMoveOuter = aImplMoveOuter[ cMove ];
+//				Point&					rPt = aArr[ nPolyPos ];
+                BOOL					bDone = TRUE;
 
                 nLastX += rMove.nDX;
                 nLastY += rMove.nDY;
@@ -666,13 +666,13 @@ void ImplChain::ImplEndAdd( ULONG nFlag )
 
 void ImplChain::ImplPostProcess( const ImplPointArray& rArr )
 {
-    ImplPointArray  aNewArr1;
-    ImplPointArray  aNewArr2;
-    Point*          pLast;
-    Point*          pLeast;
-    ULONG           nNewPos;
-    ULONG           nCount = rArr.ImplGetRealSize();
-    ULONG           n;
+    ImplPointArray	aNewArr1;
+    ImplPointArray	aNewArr2;
+    Point*			pLast;
+    Point*			pLeast;
+    ULONG			nNewPos;
+    ULONG			nCount = rArr.ImplGetRealSize();
+    ULONG			n;
 
     // pass 1
     aNewArr1.ImplSetSize( nCount );
@@ -683,8 +683,8 @@ void ImplChain::ImplPostProcess( const ImplPointArray& rArr )
     for( n = nNewPos = 1; n < nCount; )
     {
         const Point& rPt = rArr[ n++ ];
-        const long   nX = BACK_MAP( rPt.X() );
-        const long   nY = BACK_MAP( rPt.Y() );
+        const long	 nX = BACK_MAP( rPt.X() );
+        const long	 nY = BACK_MAP( rPt.Y() );
 
         if( nX != pLast->X() || nY != pLast->Y() )
         {
@@ -746,19 +746,19 @@ BOOL ImplVectorizer::ImplVectorize( const Bitmap& rColorBmp, GDIMetaFile& rMtf,
 
     VECT_PROGRESS( pProgress, 0 );
 
-    Bitmap*             pBmp = new Bitmap( rColorBmp );
-    BitmapReadAccess*   pRAcc = pBmp->AcquireReadAccess();
+    Bitmap*				pBmp = new Bitmap( rColorBmp );
+    BitmapReadAccess*	pRAcc = pBmp->AcquireReadAccess();
 
     if( pRAcc )
     {
-        PolyPolygon         aPolyPoly;
-        double              fPercent = 0.0;
-        double              fPercentStep_2 = 0.0;
-        const long          nWidth = pRAcc->Width();
-        const long          nHeight = pRAcc->Height();
-        const USHORT        nColorCount = pRAcc->GetPaletteEntryCount();
-        USHORT              n;
-        ImplColorSet*       pColorSet = (ImplColorSet*) new BYTE[ 256 * sizeof( ImplColorSet ) ];
+        PolyPolygon			aPolyPoly;
+        double				fPercent = 0.0;
+        double				fPercentStep_2 = 0.0;
+        const long			nWidth = pRAcc->Width();
+        const long			nHeight = pRAcc->Height();
+        const USHORT		nColorCount = pRAcc->GetPaletteEntryCount();
+        USHORT				n;
+        ImplColorSet*		pColorSet = (ImplColorSet*) new BYTE[ 256 * sizeof( ImplColorSet ) ];
 
         memset( pColorSet, 0, 256 * sizeof( ImplColorSet ) );
         rMtf.Clear();
@@ -787,10 +787,10 @@ BOOL ImplVectorizer::ImplVectorize( const Bitmap& rColorBmp, GDIMetaFile& rMtf,
 
         for( USHORT i = 0; i < n; i++ )
         {
-            const BitmapColor   aBmpCol( pRAcc->GetPaletteColor( pColorSet[ i ].mnIndex ) );
-            const Color         aFindColor( aBmpCol.GetRed(), aBmpCol.GetGreen(), aBmpCol.GetBlue() );
-//          const BYTE          cLum = aFindColor.GetLuminance();
-            ImplVectMap*        pMap = ImplExpand( pRAcc, aFindColor );
+            const BitmapColor	aBmpCol( pRAcc->GetPaletteColor( pColorSet[ i ].mnIndex ) );
+            const Color			aFindColor( aBmpCol.GetRed(), aBmpCol.GetGreen(), aBmpCol.GetBlue() );
+//			const BYTE			cLum = aFindColor.GetLuminance();
+            ImplVectMap*		pMap = ImplExpand( pRAcc, aFindColor );
 
             VECT_PROGRESS( pProgress, FRound( fPercent += fPercentStep_2 ) );
 
@@ -823,9 +823,9 @@ BOOL ImplVectorizer::ImplVectorize( const Bitmap& rColorBmp, GDIMetaFile& rMtf,
 
         if( rMtf.GetActionCount() )
         {
-            MapMode         aMap( MAP_100TH_MM );
-            VirtualDevice   aVDev;
-            const Size      aLogSize1( aVDev.PixelToLogic( Size( 1, 1 ), aMap ) );
+            MapMode			aMap( MAP_100TH_MM );
+            VirtualDevice	aVDev;
+            const Size		aLogSize1( aVDev.PixelToLogic( Size( 1, 1 ), aMap ) );
 
             rMtf.SetPrefMapMode( aMap );
             rMtf.SetPrefSize( Size( nWidth + 2, nHeight + 2 ) );
@@ -848,10 +848,10 @@ BOOL ImplVectorizer::ImplVectorize( const Bitmap& rMonoBmp,
                                     PolyPolygon& rPolyPoly,
                                     ULONG nFlags, const Link* pProgress )
 {
-    Bitmap*             pBmp = new Bitmap( rMonoBmp );
-    BitmapReadAccess*   pRAcc;
-    ImplVectMap*        pMap;
-    BOOL                bRet = FALSE;
+    Bitmap*				pBmp = new Bitmap( rMonoBmp );
+    BitmapReadAccess*	pRAcc;
+    ImplVectMap*		pMap;
+    BOOL				bRet = FALSE;
 
     VECT_PROGRESS( pProgress, 10 );
 
@@ -887,10 +887,10 @@ BOOL ImplVectorizer::ImplVectorize( const Bitmap& rMonoBmp,
 
         for( ; nCurPoly < nCount; ++nCurPoly )
         {
-            const Polygon&      rPoly = rPolyPoly.GetObject( nCurPoly );
+            const Polygon&  	rPoly = rPolyPoly.GetObject( nCurPoly );
             const sal_uInt16    nSize( rPoly.GetSize() );
-            sal_uInt16          nDepth( 0 ), i( 0 );
-            const bool          bRight( rPoly.IsRightOrientated() );
+            sal_uInt16			nDepth( 0 ), i( 0 );
+            const bool		    bRight( rPoly.IsRightOrientated() );
 
             for( ; i < nCount; ++i )
                 if( ( i != nCurPoly ) && rPolyPoly.GetObject( i ).IsInside( rPoly[ 0 ] ) )
@@ -900,7 +900,7 @@ BOOL ImplVectorizer::ImplVectorize( const Bitmap& rMonoBmp,
 
             if( nSize && ( ( !bRight && !bHole ) || ( bRight && bHole ) ) )
             {
-                Polygon     aNewPoly( nSize );
+                Polygon	    aNewPoly( nSize );
                 sal_uInt16  nPrim( 0 ), nSec( nSize - 1 );
 
                 if( rPoly.HasFlags() )
@@ -930,7 +930,7 @@ BOOL ImplVectorizer::ImplVectorize( const Bitmap& rMonoBmp,
             rPolyPoly.Remove( static_cast< USHORT >( nFirstPoly ) );
             rPolyPoly.Insert( aFirst, 0 );
         }
-
+            
         bRet = TRUE;
     }
 
@@ -946,8 +946,8 @@ void ImplVectorizer::ImplLimitPolyPoly( PolyPolygon& rPolyPoly )
     if( rPolyPoly.Count() > VECT_POLY_MAX )
     {
         PolyPolygon aNewPolyPoly;
-        long        nReduce = 0;
-        USHORT      nNewCount;
+        long		nReduce = 0;
+        USHORT		nNewCount;
 
         do
         {
@@ -981,14 +981,14 @@ ImplVectMap* ImplVectorizer::ImplExpand( BitmapReadAccess* pRAcc, const Color& r
 
        if( pRAcc && pRAcc->Width() && pRAcc->Height() )
     {
-        const long          nOldWidth = pRAcc->Width();
-        const long          nOldHeight = pRAcc->Height();
-        const long          nNewWidth = ( nOldWidth << 2L ) + 4L;
-        const long          nNewHeight = ( nOldHeight << 2L ) + 4L;
-        const BitmapColor   aTest( pRAcc->GetBestMatchingColor( rColor ) );
-        long*               pMapIn = new long[ Max( nOldWidth, nOldHeight ) ];
-        long*               pMapOut = new long[ Max( nOldWidth, nOldHeight ) ];
-        long                nX, nY, nTmpX, nTmpY;
+        const long			nOldWidth = pRAcc->Width();
+        const long			nOldHeight = pRAcc->Height();
+        const long			nNewWidth = ( nOldWidth << 2L ) + 4L;
+        const long			nNewHeight = ( nOldHeight << 2L ) + 4L;
+        const BitmapColor	aTest( pRAcc->GetBestMatchingColor( rColor ) );
+        long*				pMapIn = new long[ Max( nOldWidth, nOldHeight ) ];
+        long*				pMapOut = new long[ Max( nOldWidth, nOldHeight ) ];
+        long				nX, nY, nTmpX, nTmpY;
 
         pMap = new ImplVectMap( nNewWidth, nNewHeight );
 
@@ -1074,8 +1074,8 @@ void ImplVectorizer::ImplCalculate( ImplVectMap* pMap, PolyPolygon& rPolyPoly, B
 
     for( long nY = 0L; nY < nHeight; nY++ )
     {
-        long    nX = 0L;
-        BOOL    bInner = TRUE;
+        long	nX = 0L;
+        BOOL	bInner = TRUE;
 
         while( nX < nWidth )
         {
@@ -1089,8 +1089,8 @@ void ImplVectorizer::ImplCalculate( ImplVectMap* pMap, PolyPolygon& rPolyPoly, B
             if( pMap->IsCont( nY, nX ) )
             {
                 // new contour
-                ImplChain   aChain;
-                const Point aStartPt( nX++, nY );
+                ImplChain	aChain;
+                const Point	aStartPt( nX++, nY );
 
                 // get chain code
                 aChain.ImplBeginAdd( aStartPt );
@@ -1107,7 +1107,7 @@ void ImplVectorizer::ImplCalculate( ImplVectMap* pMap, PolyPolygon& rPolyPoly, B
                 {
                     if( cReduce )
                     {
-                        const Rectangle aBound( rPoly.GetBoundRect() );
+                        const Rectangle	aBound( rPoly.GetBoundRect() );
 
                         if( aBound.GetWidth() > cReduce && aBound.GetHeight() > cReduce )
                             rPolyPoly.Insert( rPoly );
@@ -1137,15 +1137,15 @@ void ImplVectorizer::ImplCalculate( ImplVectMap* pMap, PolyPolygon& rPolyPoly, B
 
 // -----------------------------------------------------------------------------
 
-BOOL ImplVectorizer::ImplGetChain(  ImplVectMap* pMap, const Point& rStartPt, ImplChain& rChain )
+BOOL ImplVectorizer::ImplGetChain( 	ImplVectMap* pMap, const Point& rStartPt, ImplChain& rChain )
 {
-    long                nActX = rStartPt.X();
-    long                nActY = rStartPt.Y();
-    long                nTryX;
-    long                nTryY;
-    ULONG               nFound;
-    ULONG               nLastDir = 0UL;
-    ULONG               nDir;
+    long				nActX = rStartPt.X();
+    long				nActY = rStartPt.Y();
+    long				nTryX;
+    long				nTryY;
+    ULONG				nFound;
+    ULONG				nLastDir = 0UL;
+    ULONG				nDir;
 
     do
     {
diff --git a/vcl/source/gdi/impvect.hxx b/vcl/source/gdi/impvect.hxx
index b21a9df2eb7a..ee95f4e73775 100644
--- a/vcl/source/gdi/impvect.hxx
+++ b/vcl/source/gdi/impvect.hxx
@@ -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
@@ -42,21 +42,21 @@ class ImplVectMap;
 class ImplVectorizer
 {
 private:
-
-    ImplVectMap*    ImplExpand( BitmapReadAccess* pRAcc, const Color& rColor );
-    void            ImplCalculate( ImplVectMap* pMap, PolyPolygon& rPolyPoly, BYTE cReduce, ULONG nFlags );
-    BOOL            ImplGetChain( ImplVectMap* pMap, const Point& rStartPt, ImplChain& rChain );
-    BOOL            ImplIsUp( ImplVectMap* pMap, long nY, long nX ) const;
-    void            ImplLimitPolyPoly( PolyPolygon& rPolyPoly );
-
-public:
+    
+    ImplVectMap*	ImplExpand( BitmapReadAccess* pRAcc, const Color& rColor );
+    void			ImplCalculate( ImplVectMap* pMap, PolyPolygon& rPolyPoly, BYTE cReduce, ULONG nFlags );
+    BOOL			ImplGetChain( ImplVectMap* pMap, const Point& rStartPt, ImplChain& rChain );
+    BOOL			ImplIsUp( ImplVectMap* pMap, long nY, long nX ) const;
+    void			ImplLimitPolyPoly( PolyPolygon& rPolyPoly );
+                    
+public:				
 
                     ImplVectorizer();
                     ~ImplVectorizer();
-
-    BOOL            ImplVectorize( const Bitmap& rColorBmp, GDIMetaFile& rMtf,
+                    
+    BOOL			ImplVectorize( const Bitmap& rColorBmp, GDIMetaFile& rMtf, 
                                    BYTE cReduce, ULONG nFlags, const Link* pProgress );
-    BOOL            ImplVectorize( const Bitmap& rMonoBmp, PolyPolygon& rPolyPoly,
+    BOOL			ImplVectorize( const Bitmap& rMonoBmp, PolyPolygon& rPolyPoly,
                                    ULONG nFlags, const Link* pProgress );
 };
 
diff --git a/vcl/source/gdi/jobset.cxx b/vcl/source/gdi/jobset.cxx
index 2bc0addaa93c..15b7d2491c7a 100644
--- a/vcl/source/gdi/jobset.cxx
+++ b/vcl/source/gdi/jobset.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
@@ -39,44 +39,44 @@
 
 DBG_NAME( JobSetup )
 
-#define JOBSET_FILEFORMAT2      3780
-#define JOBSET_FILE364_SYSTEM   ((USHORT)0xFFFF)
-#define JOBSET_FILE605_SYSTEM   ((USHORT)0xFFFE)
+#define JOBSET_FILEFORMAT2		3780
+#define JOBSET_FILE364_SYSTEM	((USHORT)0xFFFF)
+#define JOBSET_FILE605_SYSTEM	((USHORT)0xFFFE)
 
 struct ImplOldJobSetupData
 {
-    char    cPrinterName[64];
-    char    cDeviceName[32];
-    char    cPortName[32];
-    char    cDriverName[32];
+    char	cPrinterName[64];
+    char	cDeviceName[32];
+    char	cPortName[32];
+    char	cDriverName[32];
 };
 
 struct Impl364JobSetupData
 {
-    SVBT16  nSize;
-    SVBT16  nSystem;
-    SVBT32  nDriverDataLen;
-    SVBT16  nOrientation;
-    SVBT16  nPaperBin;
-    SVBT16  nPaperFormat;
-    SVBT32  nPaperWidth;
-    SVBT32  nPaperHeight;
+    SVBT16	nSize;
+    SVBT16	nSystem;
+    SVBT32	nDriverDataLen;
+    SVBT16	nOrientation;
+    SVBT16	nPaperBin;
+    SVBT16	nPaperFormat;
+    SVBT32	nPaperWidth;
+    SVBT32	nPaperHeight;
 };
 
 // =======================================================================
 
 ImplJobSetup::ImplJobSetup()
 {
-    mnRefCount          = 1;
-    mnSystem            = 0;
-    meOrientation       = ORIENTATION_PORTRAIT;
+    mnRefCount			= 1;
+    mnSystem			= 0;
+    meOrientation		= ORIENTATION_PORTRAIT;
     meDuplexMode        = DUPLEX_UNKNOWN;
-    mnPaperBin          = 0;
-    mePaperFormat       = PAPER_USER;
-    mnPaperWidth        = 0;
-    mnPaperHeight       = 0;
-    mnDriverDataLen     = 0;
-    mpDriverData        = NULL;
+    mnPaperBin			= 0;
+    mePaperFormat		= PAPER_USER;
+    mnPaperWidth		= 0;
+    mnPaperHeight		= 0;
+    mnDriverDataLen 	= 0;
+    mpDriverData		= NULL;
 }
 
 // -----------------------------------------------------------------------
@@ -85,15 +85,15 @@ ImplJobSetup::ImplJobSetup( const ImplJobSetup& rJobSetup ) :
     maPrinterName( rJobSetup.maPrinterName ),
     maDriver( rJobSetup.maDriver )
 {
-    mnRefCount          = 1;
-    mnSystem            = rJobSetup.mnSystem;
-    meOrientation       = rJobSetup.meOrientation;
+    mnRefCount			= 1;
+    mnSystem			= rJobSetup.mnSystem;
+    meOrientation		= rJobSetup.meOrientation;
     meDuplexMode        = rJobSetup.meDuplexMode;
-    mnPaperBin          = rJobSetup.mnPaperBin;
-    mePaperFormat       = rJobSetup.mePaperFormat;
-    mnPaperWidth        = rJobSetup.mnPaperWidth;
-    mnPaperHeight       = rJobSetup.mnPaperHeight;
-    mnDriverDataLen     = rJobSetup.mnDriverDataLen;
+    mnPaperBin			= rJobSetup.mnPaperBin;
+    mePaperFormat		= rJobSetup.mePaperFormat;
+    mnPaperWidth		= rJobSetup.mnPaperWidth;
+    mnPaperHeight		= rJobSetup.mnPaperHeight;
+    mnDriverDataLen 	= rJobSetup.mnDriverDataLen;
     if ( rJobSetup.mpDriverData )
     {
         mpDriverData = (BYTE*)rtl_allocateMemory( mnDriverDataLen );
@@ -101,7 +101,7 @@ ImplJobSetup::ImplJobSetup( const ImplJobSetup& rJobSetup ) :
     }
     else
         mpDriverData = NULL;
-    maValueMap          = rJobSetup.maValueMap;
+    maValueMap 			= rJobSetup.maValueMap;
 }
 
 // -----------------------------------------------------------------------
@@ -272,18 +272,18 @@ BOOL JobSetup::operator==( const JobSetup& rJobSetup ) const
 
     ImplJobSetup* pData1 = mpData;
     ImplJobSetup* pData2 = rJobSetup.mpData;
-    if ( (pData1->mnSystem          == pData2->mnSystem)                &&
-         (pData1->maPrinterName     == pData2->maPrinterName)           &&
-         (pData1->maDriver          == pData2->maDriver)                &&
-         (pData1->meOrientation     == pData2->meOrientation)           &&
-         (pData1->meDuplexMode      == pData2->meDuplexMode)            &&
-         (pData1->mnPaperBin        == pData2->mnPaperBin)              &&
-         (pData1->mePaperFormat     == pData2->mePaperFormat)           &&
-         (pData1->mnPaperWidth      == pData2->mnPaperWidth)            &&
-         (pData1->mnPaperHeight     == pData2->mnPaperHeight)           &&
-         (pData1->mnDriverDataLen   == pData2->mnDriverDataLen)         &&
-         (memcmp( pData1->mpDriverData, pData2->mpDriverData, pData1->mnDriverDataLen ) == 0)                                                           &&
-         (pData1->maValueMap        == pData2->maValueMap)
+    if ( (pData1->mnSystem			== pData2->mnSystem)				&&
+         (pData1->maPrinterName 	== pData2->maPrinterName)			&&
+         (pData1->maDriver			== pData2->maDriver)				&&
+         (pData1->meOrientation 	== pData2->meOrientation)			&&
+         (pData1->meDuplexMode      == pData2->meDuplexMode)			&&
+         (pData1->mnPaperBin		== pData2->mnPaperBin)				&&
+         (pData1->mePaperFormat 	== pData2->mePaperFormat)			&&
+         (pData1->mnPaperWidth		== pData2->mnPaperWidth)			&&
+         (pData1->mnPaperHeight 	== pData2->mnPaperHeight)			&&
+         (pData1->mnDriverDataLen	== pData2->mnDriverDataLen) 		&&
+         (memcmp( pData1->mpDriverData, pData2->mpDriverData, pData1->mnDriverDataLen ) == 0)															&&
+         (pData1->maValueMap		== pData2->maValueMap)
          )
         return TRUE;
 
@@ -297,7 +297,7 @@ SvStream& operator>>( SvStream& rIStream, JobSetup& rJobSetup )
     DBG_ASSERTWARNING( rIStream.GetVersion(), "JobSetup::>> - Solar-Version not set on rOStream" );
 
     // Zur Zeit haben wir noch kein neues FileFormat
-//    if ( rIStream.GetVersion() < JOBSET_FILEFORMAT2 )
+//	  if ( rIStream.GetVersion() < JOBSET_FILEFORMAT2 )
     {
         USHORT nLen;
         USHORT nSystem;
@@ -318,30 +318,30 @@ SvStream& operator>>( SvStream& rIStream, JobSetup& rJobSetup )
                 else
                     rJobSetup.mpData->mnRefCount--;
             }
-
+            
             rtl_TextEncoding aStreamEncoding = RTL_TEXTENCODING_UTF8;
             if( nSystem == JOBSET_FILE364_SYSTEM )
                 aStreamEncoding = rIStream.GetStreamCharSet();
-
+            
             rJobSetup.mpData = new ImplJobSetup;
             ImplJobSetup* pJobData = rJobSetup.mpData;
             pJobData->maPrinterName = UniString( pData->cPrinterName, aStreamEncoding );
-            pJobData->maDriver      = UniString( pData->cDriverName, aStreamEncoding );
+            pJobData->maDriver		= UniString( pData->cDriverName, aStreamEncoding );
 
             // Sind es unsere neuen JobSetup-Daten?
             if ( nSystem == JOBSET_FILE364_SYSTEM ||
                  nSystem == JOBSET_FILE605_SYSTEM )
             {
-                Impl364JobSetupData* pOldJobData    = (Impl364JobSetupData*)(pTempBuf + sizeof( ImplOldJobSetupData ));
-                USHORT nOldJobDataSize              = SVBT16ToShort( pOldJobData->nSize );
-                pJobData->mnSystem                  = SVBT16ToShort( pOldJobData->nSystem );
-                pJobData->mnDriverDataLen           = SVBT32ToUInt32( pOldJobData->nDriverDataLen );
-                pJobData->meOrientation             = (Orientation)SVBT16ToShort( pOldJobData->nOrientation );
+                Impl364JobSetupData* pOldJobData	= (Impl364JobSetupData*)(pTempBuf + sizeof( ImplOldJobSetupData ));
+                USHORT nOldJobDataSize				= SVBT16ToShort( pOldJobData->nSize );
+                pJobData->mnSystem					= SVBT16ToShort( pOldJobData->nSystem );
+                pJobData->mnDriverDataLen			= SVBT32ToUInt32( pOldJobData->nDriverDataLen );
+                pJobData->meOrientation 			= (Orientation)SVBT16ToShort( pOldJobData->nOrientation );
                 pJobData->meDuplexMode              = DUPLEX_UNKNOWN;
-                pJobData->mnPaperBin                = SVBT16ToShort( pOldJobData->nPaperBin );
-                pJobData->mePaperFormat             = (Paper)SVBT16ToShort( pOldJobData->nPaperFormat );
-                pJobData->mnPaperWidth              = (long)SVBT32ToUInt32( pOldJobData->nPaperWidth );
-                pJobData->mnPaperHeight             = (long)SVBT32ToUInt32( pOldJobData->nPaperHeight );
+                pJobData->mnPaperBin				= SVBT16ToShort( pOldJobData->nPaperBin );
+                pJobData->mePaperFormat 			= (Paper)SVBT16ToShort( pOldJobData->nPaperFormat );
+                pJobData->mnPaperWidth				= (long)SVBT32ToUInt32( pOldJobData->nPaperWidth );
+                pJobData->mnPaperHeight 			= (long)SVBT32ToUInt32( pOldJobData->nPaperHeight );
                 if ( pJobData->mnDriverDataLen )
                 {
                     BYTE* pDriverData = ((BYTE*)pOldJobData) + nOldJobDataSize;
@@ -394,7 +394,7 @@ SvStream& operator<<( SvStream& rOStream, const JobSetup& rJobSetup )
     DBG_ASSERTWARNING( rOStream.GetVersion(), "JobSetup::<< - Solar-Version not set on rOStream" );
 
     // Zur Zeit haben wir noch kein neues FileFormat
-//    if ( rOStream.GetVersion() < JOBSET_FILEFORMAT2 )
+//	  if ( rOStream.GetVersion() < JOBSET_FILEFORMAT2 )
     {
         USHORT nLen = 0;
         if ( !rJobSetup.mpData )
@@ -405,7 +405,7 @@ SvStream& operator<<( SvStream& rOStream, const JobSetup& rJobSetup )
 
             const ImplJobSetup* pJobData = rJobSetup.ImplGetConstData();
             Impl364JobSetupData aOldJobData;
-            USHORT              nOldJobDataSize = sizeof( aOldJobData );
+            USHORT				nOldJobDataSize = sizeof( aOldJobData );
             ShortToSVBT16( nOldJobDataSize, aOldJobData.nSize );
             ShortToSVBT16( pJobData->mnSystem, aOldJobData.nSystem );
             UInt32ToSVBT32( pJobData->mnDriverDataLen, aOldJobData.nDriverDataLen );
@@ -421,7 +421,7 @@ SvStream& operator<<( SvStream& rOStream, const JobSetup& rJobSetup )
             strncpy( aOldData.cPrinterName, aPrnByteName.GetBuffer(), 63 );
             ByteString aDriverByteName( rJobSetup.GetDriverName(), RTL_TEXTENCODING_UTF8 );
             strncpy( aOldData.cDriverName, aDriverByteName.GetBuffer(), 31 );
-//          nLen = sizeof( aOldData ) + 4 + nOldJobDataSize + pJobData->mnDriverDataLen;
+//			nLen = sizeof( aOldData ) + 4 + nOldJobDataSize + pJobData->mnDriverDataLen;
             int nPos = rOStream.Tell();
             rOStream << nLen;
             rOStream << nSystem;
@@ -437,10 +437,10 @@ SvStream& operator<<( SvStream& rOStream, const JobSetup& rJobSetup )
             rOStream.WriteByteString( "COMPAT_DUPLEX_MODE" ) ;
             switch( pJobData->meDuplexMode )
             {
-            case DUPLEX_UNKNOWN: rOStream.WriteByteString( "DUPLEX_UNKNOWN" );break;
-            case DUPLEX_OFF: rOStream.WriteByteString( "DUPLEX_OFF" );break;
-            case DUPLEX_SHORTEDGE: rOStream.WriteByteString( "DUPLEX_SHORTEDGE" );break;
-            case DUPLEX_LONGEDGE: rOStream.WriteByteString( "DUPLEX_LONGEDGE" );break;
+            case DUPLEX_UNKNOWN: rOStream.WriteByteString( "DUPLEX_UNKNOWN" );break; 
+            case DUPLEX_OFF: rOStream.WriteByteString( "DUPLEX_OFF" );break; 
+            case DUPLEX_SHORTEDGE: rOStream.WriteByteString( "DUPLEX_SHORTEDGE" );break; 
+            case DUPLEX_LONGEDGE: rOStream.WriteByteString( "DUPLEX_LONGEDGE" );break; 
             }
             nLen = sal::static_int_cast<USHORT>(rOStream.Tell() - nPos);
             rOStream.Seek( nPos );
diff --git a/vcl/source/gdi/lineinfo.cxx b/vcl/source/gdi/lineinfo.cxx
index bb57a0b582e6..9056a7464066 100644
--- a/vcl/source/gdi/lineinfo.cxx
+++ b/vcl/source/gdi/lineinfo.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
@@ -43,14 +43,14 @@ DBG_NAME( LineInfo )
 // ----------------
 
 ImplLineInfo::ImplLineInfo() :
-    mnRefCount  ( 1 ),
-    meStyle     ( LINE_SOLID ),
-    mnWidth     ( 0 ),
-    mnDashCount ( 0 ),
-    mnDashLen   ( 0 ),
-    mnDotCount  ( 0 ),
-    mnDotLen    ( 0 ),
-    mnDistance  ( 0 ),
+    mnRefCount	( 1 ),
+    meStyle		( LINE_SOLID ),
+    mnWidth		( 0 ),
+    mnDashCount	( 0 ),
+    mnDashLen	( 0 ),
+    mnDotCount	( 0 ),
+    mnDotLen	( 0 ),
+    mnDistance	( 0 ),
     meLineJoin  ( basegfx::B2DLINEJOIN_ROUND )
 {
 }
@@ -58,14 +58,14 @@ ImplLineInfo::ImplLineInfo() :
 // -----------------------------------------------------------------------
 
 ImplLineInfo::ImplLineInfo( const ImplLineInfo& rImplLineInfo ) :
-    mnRefCount  ( 1 ),
-    meStyle     ( rImplLineInfo.meStyle ),
-    mnWidth     ( rImplLineInfo.mnWidth ),
-    mnDashCount ( rImplLineInfo.mnDashCount ),
-    mnDashLen   ( rImplLineInfo.mnDashLen ),
-    mnDotCount  ( rImplLineInfo.mnDotCount ),
-    mnDotLen    ( rImplLineInfo.mnDotLen ),
-    mnDistance  ( rImplLineInfo.mnDistance ),
+    mnRefCount	( 1 ),
+    meStyle		( rImplLineInfo.meStyle ),
+    mnWidth		( rImplLineInfo.mnWidth ),
+    mnDashCount	( rImplLineInfo.mnDashCount	),
+    mnDashLen	( rImplLineInfo.mnDashLen ),
+    mnDotCount	( rImplLineInfo.mnDotCount ),
+    mnDotLen	( rImplLineInfo.mnDotLen ),
+    mnDistance	( rImplLineInfo.mnDistance ),
     meLineJoin  ( rImplLineInfo.meLineJoin )
 {
 }
@@ -112,7 +112,7 @@ LineInfo& LineInfo::operator=( const LineInfo& rLineInfo )
 
     if( !( --mpImplLineInfo->mnRefCount ) )
         delete mpImplLineInfo;
-
+    
     mpImplLineInfo = rLineInfo.mpImplLineInfo;
     return *this;
 }
@@ -227,8 +227,8 @@ void LineInfo::SetLineJoin(basegfx::B2DLineJoin eLineJoin)
 
 SvStream& operator>>( SvStream& rIStm, ImplLineInfo& rImplLineInfo )
 {
-    VersionCompat   aCompat( rIStm, STREAM_READ );
-    UINT16          nTmp16;
+    VersionCompat	aCompat( rIStm, STREAM_READ );
+    UINT16			nTmp16;
 
     rIStm >> nTmp16; rImplLineInfo.meStyle = (LineStyle) nTmp16;
     rIStm >> rImplLineInfo.mnWidth;
@@ -344,15 +344,15 @@ void LineInfo::applyToB2DPolyPolygon(
         if(GetWidth() > 1 && io_rLinePolyPolygon.count())
         {
             const double fHalfLineWidth((GetWidth() * 0.5) + 0.5);
-
+            
             for(sal_uInt32 a(0); a < io_rLinePolyPolygon.count(); a++)
             {
                 o_rFillPolyPolygon.append(basegfx::tools::createAreaGeometry(
-                    io_rLinePolyPolygon.getB2DPolygon(a),
-                    fHalfLineWidth,
+                    io_rLinePolyPolygon.getB2DPolygon(a), 
+                    fHalfLineWidth, 
                     GetLineJoin()));
             }
-
+            
             io_rLinePolyPolygon.clear();
         }
     }
diff --git a/vcl/source/gdi/mapmod.cxx b/vcl/source/gdi/mapmod.cxx
index 34f0f473c7f8..c124733208f4 100644
--- a/vcl/source/gdi/mapmod.cxx
+++ b/vcl/source/gdi/mapmod.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
@@ -64,8 +64,8 @@ ImplMapMode::ImplMapMode( const ImplMapMode& rImplMapMode ) :
 
 SvStream& operator>>( SvStream& rIStm, ImplMapMode& rImplMapMode )
 {
-    VersionCompat   aCompat( rIStm, STREAM_READ );
-    UINT16          nTmp16;
+    VersionCompat	aCompat( rIStm, STREAM_READ );
+    UINT16			nTmp16;
 
     rIStm >> nTmp16; rImplMapMode.meUnit = (MapUnit) nTmp16;
     rIStm >> rImplMapMode.maOrigin >> rImplMapMode.maScaleX >>
diff --git a/vcl/source/gdi/metaact.cxx b/vcl/source/gdi/metaact.cxx
index 752a4222bcb2..99db8a8e40ec 100644
--- a/vcl/source/gdi/metaact.cxx
+++ b/vcl/source/gdi/metaact.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
@@ -88,8 +88,8 @@ inline void ImplScaleLineInfo( LineInfo& rLineInfo, double fScaleX, double fScal
 
 #define COMPAT( _def_rIStm ) VersionCompat aCompat( ( _def_rIStm ), STREAM_READ );
 #define COMPAT_VERSION() aCompat.GetVersion()
-#define WRITE_BASE_COMPAT( _def_rOStm, _def_nVer, _pWriteData )         \
-    MetaAction::Write( ( _def_rOStm ), _pWriteData );                   \
+#define WRITE_BASE_COMPAT( _def_rOStm, _def_nVer, _pWriteData ) 		\
+    MetaAction::Write( ( _def_rOStm ), _pWriteData );					\
     VersionCompat aCompat( ( _def_rOStm ), STREAM_WRITE, ( _def_nVer ) );
 
 // ========================================================================
@@ -154,7 +154,7 @@ sal_Bool MetaAction::IsEqual( const MetaAction& rMetaAction ) const
         return sal_False;
     else
         return Compare( rMetaAction );
-}
+}	
 
 // ------------------------------------------------------------------------
 
@@ -175,7 +175,7 @@ void MetaAction::Read( SvStream& rIStm, ImplMetaReadData* )
 MetaAction* MetaAction::ReadMetaAction( SvStream& rIStm, ImplMetaReadData* pData )
 {
     MetaAction* pAction = NULL;
-    UINT16      nType;
+    UINT16		nType;
 
     rIStm >> nType;
 
@@ -258,9 +258,9 @@ IMPL_META_ACTION( Pixel, META_PIXEL_ACTION )
 // ------------------------------------------------------------------------
 
 MetaPixelAction::MetaPixelAction( const Point& rPt, const Color& rColor ) :
-    MetaAction  ( META_PIXEL_ACTION ),
-    maPt        ( rPt ),
-    maColor     ( rColor )
+    MetaAction	( META_PIXEL_ACTION ),
+    maPt		( rPt ),
+    maColor 	( rColor )
 {
 }
 
@@ -327,8 +327,8 @@ IMPL_META_ACTION( Point, META_POINT_ACTION )
 // ------------------------------------------------------------------------
 
 MetaPointAction::MetaPointAction( const Point& rPt ) :
-    MetaAction  ( META_POINT_ACTION ),
-    maPt        ( rPt )
+    MetaAction	( META_POINT_ACTION ),
+    maPt		( rPt )
 {
 }
 
@@ -392,9 +392,9 @@ IMPL_META_ACTION( Line, META_LINE_ACTION )
 // ------------------------------------------------------------------------
 
 MetaLineAction::MetaLineAction( const Point& rStart, const Point& rEnd ) :
-    MetaAction  ( META_LINE_ACTION ),
-    maStartPt   ( rStart ),
-    maEndPt     ( rEnd )
+    MetaAction	( META_LINE_ACTION ),
+    maStartPt	( rStart ),
+    maEndPt 	( rEnd )
 {
 }
 
@@ -402,10 +402,10 @@ MetaLineAction::MetaLineAction( const Point& rStart, const Point& rEnd ) :
 
 MetaLineAction::MetaLineAction( const Point& rStart, const Point& rEnd,
                                 const LineInfo& rLineInfo ) :
-    MetaAction  ( META_LINE_ACTION ),
-    maLineInfo  ( rLineInfo ),
-    maStartPt   ( rStart ),
-    maEndPt     ( rEnd )
+    MetaAction	( META_LINE_ACTION ),
+    maLineInfo	( rLineInfo ),
+    maStartPt	( rStart ),
+    maEndPt 	( rEnd )
 {
 }
 
@@ -460,8 +460,8 @@ void MetaLineAction::Write( SvStream& rOStm, ImplMetaWriteData* pData )
 {
     WRITE_BASE_COMPAT( rOStm, 2, pData );
 
-    rOStm << maStartPt << maEndPt;  // Version 1
-    rOStm << maLineInfo;            // Version 2
+    rOStm << maStartPt << maEndPt;	// Version 1
+    rOStm << maLineInfo;			// Version 2
 }
 
 // ------------------------------------------------------------------------
@@ -487,8 +487,8 @@ IMPL_META_ACTION( Rect, META_RECT_ACTION )
 // ------------------------------------------------------------------------
 
 MetaRectAction::MetaRectAction( const Rectangle& rRect ) :
-    MetaAction  ( META_RECT_ACTION ),
-    maRect      ( rRect )
+    MetaAction	( META_RECT_ACTION ),
+    maRect		( rRect )
 {
 }
 
@@ -553,8 +553,8 @@ IMPL_META_ACTION( RoundRect, META_ROUNDRECT_ACTION )
 
 MetaRoundRectAction::MetaRoundRectAction( const Rectangle& rRect,
                                           sal_uInt32 nHorzRound, sal_uInt32 nVertRound ) :
-    MetaAction  ( META_ROUNDRECT_ACTION ),
-    maRect      ( rRect ),
+    MetaAction	( META_ROUNDRECT_ACTION ),
+    maRect		( rRect ),
     mnHorzRound ( nHorzRound ),
     mnVertRound ( nVertRound )
 {
@@ -624,8 +624,8 @@ IMPL_META_ACTION( Ellipse, META_ELLIPSE_ACTION )
 // ------------------------------------------------------------------------
 
 MetaEllipseAction::MetaEllipseAction( const Rectangle& rRect ) :
-    MetaAction  ( META_ELLIPSE_ACTION ),
-    maRect      ( rRect )
+    MetaAction	( META_ELLIPSE_ACTION ),
+    maRect		( rRect )
 {
 }
 
@@ -690,10 +690,10 @@ IMPL_META_ACTION( Arc, META_ARC_ACTION )
 
 MetaArcAction::MetaArcAction( const Rectangle& rRect,
                               const Point& rStart, const Point& rEnd ) :
-    MetaAction  ( META_ARC_ACTION ),
-    maRect      ( rRect ),
-    maStartPt   ( rStart ),
-    maEndPt     ( rEnd )
+    MetaAction	( META_ARC_ACTION ),
+    maRect		( rRect ),
+    maStartPt	( rStart ),
+    maEndPt 	( rEnd )
 {
 }
 
@@ -764,10 +764,10 @@ IMPL_META_ACTION( Pie, META_PIE_ACTION )
 
 MetaPieAction::MetaPieAction( const Rectangle& rRect,
                               const Point& rStart, const Point& rEnd ) :
-    MetaAction  ( META_PIE_ACTION ),
-    maRect      ( rRect ),
-    maStartPt   ( rStart ),
-    maEndPt     ( rEnd )
+    MetaAction	( META_PIE_ACTION ),
+    maRect		( rRect ),
+    maStartPt	( rStart ),
+    maEndPt 	( rEnd )
 {
 }
 
@@ -838,10 +838,10 @@ IMPL_META_ACTION( Chord, META_CHORD_ACTION )
 
 MetaChordAction::MetaChordAction( const Rectangle& rRect,
                                   const Point& rStart, const Point& rEnd ) :
-    MetaAction  ( META_CHORD_ACTION ),
-    maRect      ( rRect ),
-    maStartPt   ( rStart ),
-    maEndPt     ( rEnd )
+    MetaAction	( META_CHORD_ACTION ),
+    maRect		( rRect ),
+    maStartPt	( rStart ),
+    maEndPt 	( rEnd )
 {
 }
 
@@ -911,17 +911,17 @@ IMPL_META_ACTION( PolyLine, META_POLYLINE_ACTION )
 // ------------------------------------------------------------------------
 
 MetaPolyLineAction::MetaPolyLineAction( const Polygon& rPoly ) :
-    MetaAction  ( META_POLYLINE_ACTION ),
-    maPoly      ( rPoly )
+    MetaAction	( META_POLYLINE_ACTION ),
+    maPoly		( rPoly )
 {
 }
 
 // ------------------------------------------------------------------------
 
 MetaPolyLineAction::MetaPolyLineAction( const Polygon& rPoly, const LineInfo& rLineInfo ) :
-    MetaAction  ( META_POLYLINE_ACTION ),
-    maLineInfo  ( rLineInfo ),
-    maPoly      ( rPoly )
+    MetaAction	( META_POLYLINE_ACTION ),
+    maLineInfo	( rLineInfo ),
+    maPoly		( rPoly )
 {
 }
 
@@ -976,16 +976,16 @@ sal_Bool MetaPolyLineAction::Compare( const MetaAction& rMetaAction ) const
 
 void MetaPolyLineAction::Write( SvStream& rOStm, ImplMetaWriteData* pData )
 {
-    WRITE_BASE_COMPAT( rOStm, 3, pData );
+    WRITE_BASE_COMPAT( rOStm, 3, pData );	
 
     Polygon aSimplePoly;
     maPoly.AdaptiveSubdivide( aSimplePoly );
 
-    rOStm << aSimplePoly;                               // Version 1
-    rOStm << maLineInfo;                                // Version 2
+    rOStm << aSimplePoly;								// Version 1
+    rOStm << maLineInfo;								// Version 2
 
-    sal_uInt8 bHasPolyFlags = maPoly.HasFlags();        // Version 3
-    rOStm << bHasPolyFlags;
+    sal_uInt8 bHasPolyFlags = maPoly.HasFlags();		// Version 3
+    rOStm << bHasPolyFlags;	
     if ( bHasPolyFlags )
         maPoly.Write( rOStm );
 }
@@ -1018,8 +1018,8 @@ IMPL_META_ACTION( Polygon, META_POLYGON_ACTION )
 // ------------------------------------------------------------------------
 
 MetaPolygonAction::MetaPolygonAction( const Polygon& rPoly ) :
-    MetaAction  ( META_POLYGON_ACTION ),
-    maPoly      ( rPoly )
+    MetaAction	( META_POLYGON_ACTION ),
+    maPoly		( rPoly )
 {
 }
 
@@ -1066,11 +1066,11 @@ void MetaPolygonAction::Write( SvStream& rOStm, ImplMetaWriteData* pData )
 {
     WRITE_BASE_COMPAT( rOStm, 2, pData );
 
-    Polygon aSimplePoly;                            // Version 1
+    Polygon aSimplePoly;							// Version 1
     maPoly.AdaptiveSubdivide( aSimplePoly );
-    rOStm << aSimplePoly;
+    rOStm << aSimplePoly;							
 
-    sal_uInt8 bHasPolyFlags = maPoly.HasFlags();    // Version 2
+    sal_uInt8 bHasPolyFlags = maPoly.HasFlags();	// Version 2
     rOStm << bHasPolyFlags;
     if ( bHasPolyFlags )
         maPoly.Write( rOStm );
@@ -1082,9 +1082,9 @@ void MetaPolygonAction::Read( SvStream& rIStm, ImplMetaReadData* )
 {
     COMPAT( rIStm );
 
-    rIStm >> maPoly;                    // Version 1
+    rIStm >> maPoly;					// Version 1
 
-    if( aCompat.GetVersion() >= 2 )     // Version 2
+    if( aCompat.GetVersion() >= 2 )		// Version 2
     {
         sal_uInt8 bHasPolyFlags;
         rIStm >> bHasPolyFlags;
@@ -1100,8 +1100,8 @@ IMPL_META_ACTION( PolyPolygon, META_POLYPOLYGON_ACTION )
 // ------------------------------------------------------------------------
 
 MetaPolyPolygonAction::MetaPolyPolygonAction( const PolyPolygon& rPolyPoly ) :
-    MetaAction  ( META_POLYPOLYGON_ACTION ),
-    maPolyPoly  ( rPolyPoly )
+    MetaAction	( META_POLYPOLYGON_ACTION ),
+    maPolyPoly	( rPolyPoly )
 {
 }
 
@@ -1152,7 +1152,7 @@ void MetaPolyPolygonAction::Write( SvStream& rOStm, ImplMetaWriteData* pData )
     sal_uInt16 nNumberOfComplexPolygons = 0;
     sal_uInt16 i, nPolyCount = maPolyPoly.Count();
 
-    Polygon aSimplePoly;                                // Version 1
+    Polygon aSimplePoly;								// Version 1
     rOStm << nPolyCount;
     for ( i = 0; i < nPolyCount; i++ )
     {
@@ -1163,7 +1163,7 @@ void MetaPolyPolygonAction::Write( SvStream& rOStm, ImplMetaWriteData* pData )
         rOStm << aSimplePoly;
     }
 
-    rOStm << nNumberOfComplexPolygons;                  // Version 2
+    rOStm << nNumberOfComplexPolygons;					// Version 2
     for ( i = 0; nNumberOfComplexPolygons && ( i < nPolyCount ); i++ )
     {
         const Polygon& rPoly = maPolyPoly.GetObject( i );
@@ -1182,9 +1182,9 @@ void MetaPolyPolygonAction::Write( SvStream& rOStm, ImplMetaWriteData* pData )
 void MetaPolyPolygonAction::Read( SvStream& rIStm, ImplMetaReadData* )
 {
     COMPAT( rIStm );
-    rIStm >> maPolyPoly;                // Version 1
-
-    if ( aCompat.GetVersion() >= 2 )    // Version 2
+    rIStm >> maPolyPoly;				// Version 1
+    
+    if ( aCompat.GetVersion() >= 2 )	// Version 2
     {
         sal_uInt16 i, nIndex, nNumberOfComplexPolygons;
         rIStm >> nNumberOfComplexPolygons;
@@ -1206,11 +1206,11 @@ IMPL_META_ACTION( Text, META_TEXT_ACTION )
 
 MetaTextAction::MetaTextAction( const Point& rPt, const XubString& rStr,
                                 USHORT nIndex, USHORT nLen ) :
-    MetaAction  ( META_TEXT_ACTION ),
-    maPt        ( rPt ),
-    maStr       ( rStr ),
-    mnIndex     ( nIndex ),
-    mnLen       ( nLen )
+    MetaAction	( META_TEXT_ACTION ),
+    maPt		( rPt ),
+    maStr		( rStr ),
+    mnIndex 	( nIndex ),
+    mnLen		( nLen )
 {
 }
 
@@ -1259,12 +1259,12 @@ sal_Bool MetaTextAction::Compare( const MetaAction& rMetaAction ) const
 void MetaTextAction::Write( SvStream& rOStm, ImplMetaWriteData* pData )
 {
     WRITE_BASE_COMPAT( rOStm, 2, pData );
-    rOStm   << maPt;
+    rOStm	<< maPt;
     rOStm.WriteByteString( maStr, pData->meActualCharSet );
-    rOStm   << mnIndex;
-    rOStm   << mnLen;
+    rOStm	<< mnIndex;
+    rOStm	<< mnLen;
 
-    sal_uInt16 i, nLen = maStr.Len();                           // version 2
+    sal_uInt16 i, nLen = maStr.Len();							// version 2
     rOStm << nLen;
     for ( i = 0; i < nLen; i++ )
     {
@@ -1278,12 +1278,12 @@ void MetaTextAction::Write( SvStream& rOStm, ImplMetaWriteData* pData )
 void MetaTextAction::Read( SvStream& rIStm, ImplMetaReadData* pData )
 {
     COMPAT( rIStm );
-    rIStm   >> maPt;
+    rIStm	>> maPt;
     rIStm.ReadByteString( maStr, pData->meActualCharSet );
-    rIStm   >> mnIndex;
-    rIStm   >> mnLen;
+    rIStm	>> mnIndex;
+    rIStm	>> mnLen;
 
-    if ( aCompat.GetVersion() >= 2 )                            // Version 2
+    if ( aCompat.GetVersion() >= 2 )							// Version 2
     {
         sal_uInt16 nLen;
         rIStm >> nLen;
@@ -1296,21 +1296,21 @@ void MetaTextAction::Read( SvStream& rIStm, ImplMetaReadData* pData )
 // ========================================================================
 
 MetaTextArrayAction::MetaTextArrayAction() :
-    MetaAction  ( META_TEXTARRAY_ACTION ),
-    mpDXAry     ( NULL ),
-    mnIndex     ( 0 ),
-    mnLen       ( 0 )
+    MetaAction	( META_TEXTARRAY_ACTION ),
+    mpDXAry 	( NULL ),
+    mnIndex 	( 0 ),
+    mnLen		( 0 )
 {
 }
 
 // ------------------------------------------------------------------------
 
 MetaTextArrayAction::MetaTextArrayAction( const MetaTextArrayAction& rAction ) :
-    MetaAction  ( META_TEXTARRAY_ACTION ),
-    maStartPt   ( rAction.maStartPt ),
-    maStr       ( rAction.maStr ),
-    mnIndex     ( rAction.mnIndex ),
-    mnLen       ( rAction.mnLen )
+    MetaAction	( META_TEXTARRAY_ACTION ),
+    maStartPt	( rAction.maStartPt ),
+    maStr		( rAction.maStr ),
+    mnIndex 	( rAction.mnIndex ),
+    mnLen		( rAction.mnLen )
 {
     if( rAction.mpDXAry )
     {
@@ -1330,11 +1330,11 @@ MetaTextArrayAction::MetaTextArrayAction( const Point& rStartPt,
                                           const sal_Int32* pDXAry,
                                           USHORT nIndex,
                                           USHORT nLen ) :
-    MetaAction  ( META_TEXTARRAY_ACTION ),
-    maStartPt   ( rStartPt ),
-    maStr       ( rStr ),
-    mnIndex     ( nIndex ),
-    mnLen       ( ( nLen == STRING_LEN ) ? rStr.Len() : nLen )
+    MetaAction	( META_TEXTARRAY_ACTION ),
+    maStartPt	( rStartPt ),
+    maStr		( rStr ),
+    mnIndex 	( nIndex ),
+    mnLen		( ( nLen == STRING_LEN ) ? rStr.Len() : nLen )
 {
     const ULONG nAryLen = pDXAry ? mnLen : 0;
 
@@ -1408,16 +1408,16 @@ void MetaTextArrayAction::Write( SvStream& rOStm, ImplMetaWriteData* pData )
     const sal_uInt32 nAryLen = mpDXAry ? mnLen : 0;
 
     WRITE_BASE_COMPAT( rOStm, 2, pData );
-    rOStm   << maStartPt;
+    rOStm	<< maStartPt;
     rOStm.WriteByteString( maStr, pData->meActualCharSet );
-    rOStm   << mnIndex;
-    rOStm   << mnLen;
-    rOStm   << nAryLen;
+    rOStm	<< mnIndex;
+    rOStm	<< mnLen;
+    rOStm	<< nAryLen;
 
     for( ULONG i = 0UL; i < nAryLen; i++ )
         rOStm << mpDXAry[ i ];
 
-    sal_uInt16 j, nLen = maStr.Len();                           // version 2
+    sal_uInt16 j, nLen = maStr.Len();							// version 2
     rOStm << nLen;
     for ( j = 0; j < nLen; j++ )
     {
@@ -1435,18 +1435,18 @@ void MetaTextArrayAction::Read( SvStream& rIStm, ImplMetaReadData* pData )
     delete[] mpDXAry;
 
     COMPAT( rIStm );
-    rIStm   >> maStartPt;
+    rIStm	>> maStartPt;
     rIStm.ReadByteString( maStr, pData->meActualCharSet );
-    rIStm   >> mnIndex;
-    rIStm   >> mnLen;
-    rIStm   >> nAryLen;
+    rIStm	>> mnIndex;
+    rIStm	>> mnLen;
+    rIStm	>> nAryLen;
 
     if( nAryLen )
     {
         // #i9762#, #106172# Ensure that DX array is at least mnLen entries long
         const ULONG nIntAryLen( Max(nAryLen, static_cast<sal_uInt32>(mnLen)) );
         mpDXAry = new sal_Int32[ nIntAryLen ];
-
+        
         ULONG i;
         for( i = 0UL; i < nAryLen; i++ )
             rIStm >> mpDXAry[ i ];
@@ -1458,7 +1458,7 @@ void MetaTextArrayAction::Read( SvStream& rIStm, ImplMetaReadData* pData )
     else
         mpDXAry = NULL;
 
-    if ( aCompat.GetVersion() >= 2 )                            // Version 2
+    if ( aCompat.GetVersion() >= 2 )							// Version 2
     {
         sal_uInt16 nLen;
         rIStm >> nLen;
@@ -1477,12 +1477,12 @@ IMPL_META_ACTION( StretchText, META_STRETCHTEXT_ACTION )
 MetaStretchTextAction::MetaStretchTextAction( const Point& rPt, sal_uInt32 nWidth,
                                               const XubString& rStr,
                                               USHORT nIndex, USHORT nLen ) :
-    MetaAction  ( META_STRETCHTEXT_ACTION ),
-    maPt        ( rPt ),
-    maStr       ( rStr ),
-    mnWidth     ( nWidth ),
-    mnIndex     ( nIndex ),
-    mnLen       ( nLen )
+    MetaAction	( META_STRETCHTEXT_ACTION ),
+    maPt		( rPt ),
+    maStr		( rStr ),
+    mnWidth 	( nWidth ),
+    mnIndex 	( nIndex ),
+    mnLen		( nLen )
 {
 }
 
@@ -1533,13 +1533,13 @@ sal_Bool MetaStretchTextAction::Compare( const MetaAction& rMetaAction ) const
 void MetaStretchTextAction::Write( SvStream& rOStm, ImplMetaWriteData* pData )
 {
     WRITE_BASE_COMPAT( rOStm, 2, pData );
-    rOStm   << maPt;
+    rOStm	<< maPt;
     rOStm.WriteByteString( maStr, pData->meActualCharSet );
-    rOStm   << mnWidth;
-    rOStm   << mnIndex;
-    rOStm   << mnLen;
+    rOStm	<< mnWidth;
+    rOStm	<< mnIndex;
+    rOStm	<< mnLen;
 
-    sal_uInt16 i, nLen = maStr.Len();                           // version 2
+    sal_uInt16 i, nLen = maStr.Len();							// version 2
     rOStm << nLen;
     for ( i = 0; i < nLen; i++ )
     {
@@ -1553,13 +1553,13 @@ void MetaStretchTextAction::Write( SvStream& rOStm, ImplMetaWriteData* pData )
 void MetaStretchTextAction::Read( SvStream& rIStm, ImplMetaReadData* pData )
 {
     COMPAT( rIStm );
-    rIStm   >> maPt;
+    rIStm	>> maPt;
     rIStm.ReadByteString( maStr, pData->meActualCharSet );
-    rIStm   >> mnWidth;
-    rIStm   >> mnIndex;
-    rIStm   >> mnLen;
+    rIStm	>> mnWidth;
+    rIStm	>> mnIndex;
+    rIStm	>> mnLen;
 
-    if ( aCompat.GetVersion() >= 2 )                            // Version 2
+    if ( aCompat.GetVersion() >= 2 )							// Version 2
     {
         sal_uInt16 nLen;
         rIStm >> nLen;
@@ -1577,10 +1577,10 @@ IMPL_META_ACTION( TextRect, META_TEXTRECT_ACTION )
 
 MetaTextRectAction::MetaTextRectAction( const Rectangle& rRect,
                                         const XubString& rStr, USHORT nStyle ) :
-    MetaAction  ( META_TEXTRECT_ACTION ),
-    maRect      ( rRect ),
-    maStr       ( rStr ),
-    mnStyle     ( nStyle )
+    MetaAction	( META_TEXTRECT_ACTION ),
+    maRect		( rRect ),
+    maStr		( rStr ),
+    mnStyle 	( nStyle )
 {
 }
 
@@ -1628,11 +1628,11 @@ sal_Bool MetaTextRectAction::Compare( const MetaAction& rMetaAction ) const
 void MetaTextRectAction::Write( SvStream& rOStm, ImplMetaWriteData* pData )
 {
     WRITE_BASE_COMPAT( rOStm, 2, pData );
-    rOStm   << maRect;
+    rOStm	<< maRect;
     rOStm.WriteByteString( maStr, pData->meActualCharSet );
-    rOStm   << mnStyle;
+    rOStm	<< mnStyle;
 
-    sal_uInt16 i, nLen = maStr.Len();                           // version 2
+    sal_uInt16 i, nLen = maStr.Len();							// version 2
     rOStm << nLen;
     for ( i = 0; i < nLen; i++ )
     {
@@ -1646,11 +1646,11 @@ void MetaTextRectAction::Write( SvStream& rOStm, ImplMetaWriteData* pData )
 void MetaTextRectAction::Read( SvStream& rIStm, ImplMetaReadData* pData )
 {
     COMPAT( rIStm );
-    rIStm   >> maRect;
+    rIStm	>> maRect;
     rIStm.ReadByteString( maStr, pData->meActualCharSet );
-    rIStm   >> mnStyle;
+    rIStm	>> mnStyle;
 
-    if ( aCompat.GetVersion() >= 2 )                            // Version 2
+    if ( aCompat.GetVersion() >= 2 )							// Version 2
     {
         sal_uInt16 nLen;
         rIStm >> nLen;
@@ -1670,9 +1670,9 @@ MetaTextLineAction::MetaTextLineAction( const Point& rPos, long nWidth,
                                         FontStrikeout eStrikeout,
                                         FontUnderline eUnderline,
                                         FontUnderline eOverline ) :
-    MetaAction  ( META_TEXTLINE_ACTION ),
-    maPos       ( rPos ),
-    mnWidth     ( nWidth ),
+    MetaAction	( META_TEXTLINE_ACTION ),
+    maPos		( rPos ),
+    mnWidth 	( nWidth ),
     meStrikeout ( eStrikeout ),
     meUnderline ( eUnderline ),
     meOverline  ( eOverline )
@@ -1761,9 +1761,9 @@ IMPL_META_ACTION( Bmp, META_BMP_ACTION )
 // ------------------------------------------------------------------------
 
 MetaBmpAction::MetaBmpAction( const Point& rPt, const Bitmap& rBmp ) :
-    MetaAction  ( META_BMP_ACTION ),
-    maBmp       ( rBmp ),
-    maPt        ( rPt )
+    MetaAction	( META_BMP_ACTION ),
+    maBmp		( rBmp ),
+    maPt		( rPt )
 {
 }
 
@@ -1832,10 +1832,10 @@ IMPL_META_ACTION( BmpScale, META_BMPSCALE_ACTION )
 
 MetaBmpScaleAction::MetaBmpScaleAction( const Point& rPt, const Size& rSz,
                                         const Bitmap& rBmp ) :
-    MetaAction  ( META_BMPSCALE_ACTION ),
-    maBmp       ( rBmp ),
-    maPt        ( rPt ),
-    maSz        ( rSz )
+    MetaAction	( META_BMPSCALE_ACTION ),
+    maBmp		( rBmp ),
+    maPt		( rPt ),
+    maSz		( rSz )
 {
 }
 
@@ -1909,12 +1909,12 @@ IMPL_META_ACTION( BmpScalePart, META_BMPSCALEPART_ACTION )
 MetaBmpScalePartAction::MetaBmpScalePartAction( const Point& rDstPt, const Size& rDstSz,
                                                 const Point& rSrcPt, const Size& rSrcSz,
                                                 const Bitmap& rBmp ) :
-    MetaAction  ( META_BMPSCALEPART_ACTION ),
-    maBmp       ( rBmp ),
-    maDstPt     ( rDstPt ),
-    maDstSz     ( rDstSz ),
-    maSrcPt     ( rSrcPt ),
-    maSrcSz     ( rSrcSz )
+    MetaAction	( META_BMPSCALEPART_ACTION ),
+    maBmp		( rBmp ),
+    maDstPt 	( rDstPt ),
+    maDstSz 	( rDstSz ),
+    maSrcPt 	( rSrcPt ),
+    maSrcSz 	( rSrcSz )
 {
 }
 
@@ -1988,9 +1988,9 @@ IMPL_META_ACTION( BmpEx, META_BMPEX_ACTION )
 // ------------------------------------------------------------------------
 
 MetaBmpExAction::MetaBmpExAction( const Point& rPt, const BitmapEx& rBmpEx ) :
-    MetaAction  ( META_BMPEX_ACTION ),
-    maBmpEx     ( rBmpEx ),
-    maPt        ( rPt )
+    MetaAction	( META_BMPEX_ACTION ),
+    maBmpEx 	( rBmpEx ),
+    maPt		( rPt )
 {
 }
 
@@ -2059,10 +2059,10 @@ IMPL_META_ACTION( BmpExScale, META_BMPEXSCALE_ACTION )
 
 MetaBmpExScaleAction::MetaBmpExScaleAction( const Point& rPt, const Size& rSz,
                                             const BitmapEx& rBmpEx ) :
-    MetaAction  ( META_BMPEXSCALE_ACTION ),
-    maBmpEx     ( rBmpEx ),
-    maPt        ( rPt ),
-    maSz        ( rSz )
+    MetaAction	( META_BMPEXSCALE_ACTION ),
+    maBmpEx 	( rBmpEx ),
+    maPt		( rPt ),
+    maSz		( rSz )
 {
 }
 
@@ -2136,12 +2136,12 @@ IMPL_META_ACTION( BmpExScalePart, META_BMPEXSCALEPART_ACTION )
 MetaBmpExScalePartAction::MetaBmpExScalePartAction( const Point& rDstPt, const Size& rDstSz,
                                                     const Point& rSrcPt, const Size& rSrcSz,
                                                     const BitmapEx& rBmpEx ) :
-    MetaAction  ( META_BMPEXSCALEPART_ACTION ),
-    maBmpEx     ( rBmpEx ),
-    maDstPt     ( rDstPt ),
-    maDstSz     ( rDstSz ),
-    maSrcPt     ( rSrcPt ),
-    maSrcSz     ( rSrcSz )
+    MetaAction	( META_BMPEXSCALEPART_ACTION ),
+    maBmpEx 	( rBmpEx ),
+    maDstPt 	( rDstPt ),
+    maDstSz 	( rDstSz ),
+    maSrcPt 	( rSrcPt ),
+    maSrcSz 	( rSrcSz )
 {
 }
 
@@ -2217,10 +2217,10 @@ IMPL_META_ACTION( Mask, META_MASK_ACTION )
 MetaMaskAction::MetaMaskAction( const Point& rPt,
                                 const Bitmap& rBmp,
                                 const Color& rColor ) :
-    MetaAction  ( META_MASK_ACTION ),
-    maBmp       ( rBmp ),
-    maColor     ( rColor ),
-    maPt        ( rPt )
+    MetaAction	( META_MASK_ACTION ),
+    maBmp		( rBmp ),
+    maColor 	( rColor ),
+    maPt		( rPt )
 {
 }
 
@@ -2291,11 +2291,11 @@ IMPL_META_ACTION( MaskScale, META_MASKSCALE_ACTION )
 MetaMaskScaleAction::MetaMaskScaleAction( const Point& rPt, const Size& rSz,
                                           const Bitmap& rBmp,
                                           const Color& rColor ) :
-    MetaAction  ( META_MASKSCALE_ACTION ),
-    maBmp       ( rBmp ),
-    maColor     ( rColor ),
-    maPt        ( rPt ),
-    maSz        ( rSz )
+    MetaAction	( META_MASKSCALE_ACTION ),
+    maBmp		( rBmp ),
+    maColor 	( rColor ),
+    maPt		( rPt ),
+    maSz		( rSz )
 {
 }
 
@@ -2371,13 +2371,13 @@ MetaMaskScalePartAction::MetaMaskScalePartAction( const Point& rDstPt, const Siz
                                                   const Point& rSrcPt, const Size& rSrcSz,
                                                   const Bitmap& rBmp,
                                                   const Color& rColor ) :
-    MetaAction  ( META_MASKSCALEPART_ACTION ),
-    maBmp       ( rBmp ),
-    maColor     ( rColor ),
-    maDstPt     ( rDstPt ),
-    maDstSz     ( rDstSz ),
-    maSrcPt     ( rSrcPt ),
-    maSrcSz     ( rSrcSz )
+    MetaAction	( META_MASKSCALEPART_ACTION ),
+    maBmp		( rBmp ),
+    maColor 	( rColor ),
+    maDstPt 	( rDstPt ),
+    maDstSz 	( rDstSz ),
+    maSrcPt 	( rSrcPt ),
+    maSrcSz 	( rSrcSz )
 {
 }
 
@@ -2456,9 +2456,9 @@ IMPL_META_ACTION( Gradient, META_GRADIENT_ACTION )
 // ------------------------------------------------------------------------
 
 MetaGradientAction::MetaGradientAction( const Rectangle& rRect, const Gradient& rGradient ) :
-    MetaAction  ( META_GRADIENT_ACTION ),
-    maRect      ( rRect ),
-    maGradient  ( rGradient )
+    MetaAction	( META_GRADIENT_ACTION ),
+    maRect		( rRect ),
+    maGradient	( rGradient )
 {
 }
 
@@ -2519,16 +2519,16 @@ void MetaGradientAction::Read( SvStream& rIStm, ImplMetaReadData* )
 // ========================================================================
 
 MetaGradientExAction::MetaGradientExAction() :
-    MetaAction  ( META_GRADIENTEX_ACTION )
+    MetaAction	( META_GRADIENTEX_ACTION )
 {
 }
 
 // ------------------------------------------------------------------------
 
 MetaGradientExAction::MetaGradientExAction( const PolyPolygon& rPolyPoly, const Gradient& rGradient ) :
-    MetaAction  ( META_GRADIENTEX_ACTION ),
-    maPolyPoly  ( rPolyPoly ),
-    maGradient  ( rGradient )
+    MetaAction	( META_GRADIENTEX_ACTION ),
+    maPolyPoly	( rPolyPoly ),
+    maGradient	( rGradient )
 {
 }
 
@@ -2607,9 +2607,9 @@ IMPL_META_ACTION( Hatch, META_HATCH_ACTION )
 // ------------------------------------------------------------------------
 
 MetaHatchAction::MetaHatchAction( const PolyPolygon& rPolyPoly, const Hatch& rHatch ) :
-    MetaAction  ( META_HATCH_ACTION ),
-    maPolyPoly  ( rPolyPoly ),
-    maHatch     ( rHatch )
+    MetaAction	( META_HATCH_ACTION ),
+    maPolyPoly	( rPolyPoly ),
+    maHatch 	( rHatch )
 {
 }
 
@@ -2682,8 +2682,8 @@ IMPL_META_ACTION( Wallpaper, META_WALLPAPER_ACTION )
 
 MetaWallpaperAction::MetaWallpaperAction( const Rectangle& rRect,
                                           const Wallpaper& rPaper ) :
-    MetaAction  ( META_WALLPAPER_ACTION ),
-    maRect      ( rRect ),
+    MetaAction	( META_WALLPAPER_ACTION ),
+    maRect		( rRect ),
     maWallpaper ( rPaper )
 {
 }
@@ -2749,9 +2749,9 @@ IMPL_META_ACTION( ClipRegion, META_CLIPREGION_ACTION )
 // ------------------------------------------------------------------------
 
 MetaClipRegionAction::MetaClipRegionAction( const Region& rRegion, BOOL bClip ) :
-    MetaAction  ( META_CLIPREGION_ACTION ),
-    maRegion    ( rRegion ),
-    mbClip      ( bClip )
+    MetaAction	( META_CLIPREGION_ACTION ),
+    maRegion	( rRegion ),
+    mbClip		( bClip )
 {
 }
 
@@ -2819,8 +2819,8 @@ IMPL_META_ACTION( ISectRectClipRegion, META_ISECTRECTCLIPREGION_ACTION )
 // ------------------------------------------------------------------------
 
 MetaISectRectClipRegionAction::MetaISectRectClipRegionAction( const Rectangle& rRect ) :
-    MetaAction  ( META_ISECTRECTCLIPREGION_ACTION ),
-    maRect      ( rRect )
+    MetaAction	( META_ISECTRECTCLIPREGION_ACTION ),
+    maRect		( rRect )
 {
 }
 
@@ -2884,8 +2884,8 @@ IMPL_META_ACTION( ISectRegionClipRegion, META_ISECTREGIONCLIPREGION_ACTION )
 // ------------------------------------------------------------------------
 
 MetaISectRegionClipRegionAction::MetaISectRegionClipRegionAction( const Region& rRegion ) :
-    MetaAction  ( META_ISECTREGIONCLIPREGION_ACTION ),
-    maRegion    ( rRegion )
+    MetaAction	( META_ISECTREGIONCLIPREGION_ACTION ),
+    maRegion	( rRegion )
 {
 }
 
@@ -2949,9 +2949,9 @@ IMPL_META_ACTION( MoveClipRegion, META_MOVECLIPREGION_ACTION )
 // ------------------------------------------------------------------------
 
 MetaMoveClipRegionAction::MetaMoveClipRegionAction( long nHorzMove, long nVertMove ) :
-    MetaAction  ( META_MOVECLIPREGION_ACTION ),
-    mnHorzMove  ( nHorzMove ),
-    mnVertMove  ( nVertMove )
+    MetaAction	( META_MOVECLIPREGION_ACTION ),
+    mnHorzMove	( nHorzMove ),
+    mnVertMove	( nVertMove )
 {
 }
 
@@ -3010,9 +3010,9 @@ IMPL_META_ACTION( LineColor, META_LINECOLOR_ACTION )
 // ------------------------------------------------------------------------
 
 MetaLineColorAction::MetaLineColorAction( const Color& rColor, BOOL bSet ) :
-    MetaAction  ( META_LINECOLOR_ACTION ),
-    maColor     ( rColor ),
-    mbSet       ( bSet )
+    MetaAction	( META_LINECOLOR_ACTION ),
+    maColor 	( rColor ),
+    mbSet		( bSet )
 {
 }
 
@@ -3068,9 +3068,9 @@ IMPL_META_ACTION( FillColor, META_FILLCOLOR_ACTION )
 // ------------------------------------------------------------------------
 
 MetaFillColorAction::MetaFillColorAction( const Color& rColor, BOOL bSet ) :
-    MetaAction  ( META_FILLCOLOR_ACTION ),
-    maColor     ( rColor ),
-    mbSet       ( bSet )
+    MetaAction	( META_FILLCOLOR_ACTION ),
+    maColor 	( rColor ),
+    mbSet		( bSet )
 {
 }
 
@@ -3126,8 +3126,8 @@ IMPL_META_ACTION( TextColor, META_TEXTCOLOR_ACTION )
 // ------------------------------------------------------------------------
 
 MetaTextColorAction::MetaTextColorAction( const Color& rColor ) :
-    MetaAction  ( META_TEXTCOLOR_ACTION ),
-    maColor     ( rColor )
+    MetaAction	( META_TEXTCOLOR_ACTION ),
+    maColor 	( rColor )
 {
 }
 
@@ -3177,9 +3177,9 @@ IMPL_META_ACTION( TextFillColor, META_TEXTFILLCOLOR_ACTION )
 // ------------------------------------------------------------------------
 
 MetaTextFillColorAction::MetaTextFillColorAction( const Color& rColor, BOOL bSet ) :
-    MetaAction  ( META_TEXTFILLCOLOR_ACTION ),
-    maColor     ( rColor ),
-    mbSet       ( bSet )
+    MetaAction	( META_TEXTFILLCOLOR_ACTION ),
+    maColor 	( rColor ),
+    mbSet		( bSet )
 {
 }
 
@@ -3235,9 +3235,9 @@ IMPL_META_ACTION( TextLineColor, META_TEXTLINECOLOR_ACTION )
 // ------------------------------------------------------------------------
 
 MetaTextLineColorAction::MetaTextLineColorAction( const Color& rColor, BOOL bSet ) :
-    MetaAction  ( META_TEXTLINECOLOR_ACTION ),
-    maColor     ( rColor ),
-    mbSet       ( bSet )
+    MetaAction	( META_TEXTLINECOLOR_ACTION ),
+    maColor 	( rColor ),
+    mbSet		( bSet )
 {
 }
 
@@ -3293,9 +3293,9 @@ IMPL_META_ACTION( OverlineColor, META_OVERLINECOLOR_ACTION )
 // ------------------------------------------------------------------------
 
 MetaOverlineColorAction::MetaOverlineColorAction( const Color& rColor, BOOL bSet ) :
-    MetaAction  ( META_OVERLINECOLOR_ACTION ),
-    maColor     ( rColor ),
-    mbSet       ( bSet )
+    MetaAction	( META_OVERLINECOLOR_ACTION ),
+    maColor 	( rColor ),
+    mbSet		( bSet )
 {
 }
 
@@ -3351,8 +3351,8 @@ IMPL_META_ACTION( TextAlign, META_TEXTALIGN_ACTION )
 // ------------------------------------------------------------------------
 
 MetaTextAlignAction::MetaTextAlignAction( TextAlign aAlign ) :
-    MetaAction  ( META_TEXTALIGN_ACTION ),
-    maAlign     ( aAlign )
+    MetaAction	( META_TEXTALIGN_ACTION ),
+    maAlign 	( aAlign )
 {
 }
 
@@ -3404,8 +3404,8 @@ IMPL_META_ACTION( MapMode, META_MAPMODE_ACTION )
 // ------------------------------------------------------------------------
 
 MetaMapModeAction::MetaMapModeAction( const MapMode& rMapMode ) :
-    MetaAction  ( META_MAPMODE_ACTION ),
-    maMapMode   ( rMapMode )
+    MetaAction	( META_MAPMODE_ACTION ),
+    maMapMode	( rMapMode )
 {
 }
 
@@ -3465,15 +3465,15 @@ IMPL_META_ACTION( Font, META_FONT_ACTION )
 // ------------------------------------------------------------------------
 
 MetaFontAction::MetaFontAction( const Font& rFont ) :
-    MetaAction  ( META_FONT_ACTION ),
-    maFont      ( rFont )
+    MetaAction	( META_FONT_ACTION ),
+    maFont		( rFont )
 {
     // #96876: because RTL_TEXTENCODING_SYMBOL is often set at the StarSymbol font,
     // we change the textencoding to RTL_TEXTENCODING_UNICODE here, which seems
-    // to be the right way; changing the textencoding at other sources
+    // to be the right way; changing the textencoding at other sources 
     // is too dangerous at the moment
     if( ( ( maFont.GetName().SearchAscii( "StarSymbol" ) != STRING_NOTFOUND )
-       || ( maFont.GetName().SearchAscii( "OpenSymbol" ) != STRING_NOTFOUND ) )
+       || ( maFont.GetName().SearchAscii( "OpenSymbol" ) != STRING_NOTFOUND ) ) 
      && ( maFont.GetCharSet() != RTL_TEXTENCODING_UNICODE ) )
     {
         maFont.SetCharSet( RTL_TEXTENCODING_UNICODE );
@@ -3542,8 +3542,8 @@ IMPL_META_ACTION( Push, META_PUSH_ACTION )
 // ------------------------------------------------------------------------
 
 MetaPushAction::MetaPushAction( USHORT nFlags ) :
-    MetaAction  ( META_PUSH_ACTION ),
-    mnFlags     ( nFlags )
+    MetaAction	( META_PUSH_ACTION ),
+    mnFlags 	( nFlags )
 {
 }
 
@@ -3627,8 +3627,8 @@ IMPL_META_ACTION( RasterOp, META_RASTEROP_ACTION )
 // ------------------------------------------------------------------------
 
 MetaRasterOpAction::MetaRasterOpAction( RasterOp eRasterOp ) :
-    MetaAction  ( META_RASTEROP_ACTION ),
-    meRasterOp  ( eRasterOp )
+    MetaAction	( META_RASTEROP_ACTION ),
+    meRasterOp	( eRasterOp )
 {
 }
 
@@ -3680,9 +3680,9 @@ IMPL_META_ACTION( Transparent, META_TRANSPARENT_ACTION )
 // ------------------------------------------------------------------------
 
 MetaTransparentAction::MetaTransparentAction( const PolyPolygon& rPolyPoly, USHORT nTransPercent ) :
-    MetaAction      ( META_TRANSPARENT_ACTION ),
-    maPolyPoly      ( rPolyPoly ),
-    mnTransPercent  ( nTransPercent )
+    MetaAction		( META_TRANSPARENT_ACTION ),
+    maPolyPoly		( rPolyPoly ),
+    mnTransPercent	( nTransPercent )
 {
 }
 
@@ -3764,11 +3764,11 @@ IMPL_META_ACTION( FloatTransparent, META_FLOATTRANSPARENT_ACTION )
 
 MetaFloatTransparentAction::MetaFloatTransparentAction( const GDIMetaFile& rMtf, const Point& rPos,
                                                         const Size& rSize, const Gradient& rGradient ) :
-    MetaAction      ( META_FLOATTRANSPARENT_ACTION ),
-    maMtf           ( rMtf ),
-    maPoint         ( rPos ),
-    maSize          ( rSize ),
-    maGradient      ( rGradient )
+    MetaAction		( META_FLOATTRANSPARENT_ACTION ),
+    maMtf			( rMtf ),
+    maPoint 		( rPos ),
+    maSize			( rSize ),
+    maGradient		( rGradient )
 {
 }
 
@@ -3822,7 +3822,7 @@ sal_Bool MetaFloatTransparentAction::Compare( const MetaAction& rMetaAction ) co
 void MetaFloatTransparentAction::Write( SvStream& rOStm, ImplMetaWriteData* pData )
 {
     WRITE_BASE_COMPAT( rOStm, 1, pData );
-
+    
     maMtf.Write( rOStm );
     rOStm << maPoint << maSize << maGradient;
 }
@@ -3843,11 +3843,11 @@ IMPL_META_ACTION( EPS, META_EPS_ACTION )
 
 MetaEPSAction::MetaEPSAction( const Point& rPoint, const Size& rSize,
                               const GfxLink& rGfxLink, const GDIMetaFile& rSubst ) :
-    MetaAction  ( META_EPS_ACTION ),
-    maGfxLink   ( rGfxLink ),
-    maSubst     ( rSubst ),
-    maPoint     ( rPoint ),
-    maSize      ( rSize )
+    MetaAction	( META_EPS_ACTION ),
+    maGfxLink	( rGfxLink ),
+    maSubst 	( rSubst ),
+    maPoint 	( rPoint ),
+    maSize		( rSize )
 {
 }
 
@@ -3923,9 +3923,9 @@ IMPL_META_ACTION( RefPoint, META_REFPOINT_ACTION )
 // ------------------------------------------------------------------------
 
 MetaRefPointAction::MetaRefPointAction( const Point& rRefPoint, BOOL bSet ) :
-    MetaAction  ( META_REFPOINT_ACTION ),
-    maRefPoint  ( rRefPoint ),
-    mbSet       ( bSet )
+    MetaAction	( META_REFPOINT_ACTION ),
+    maRefPoint	( rRefPoint ),
+    mbSet		( bSet )
 {
 }
 
@@ -3975,8 +3975,8 @@ void MetaRefPointAction::Read( SvStream& rIStm, ImplMetaReadData* )
 // ========================================================================
 
 MetaCommentAction::MetaCommentAction( sal_Int32 nValue ) :
-    MetaAction  ( META_COMMENT_ACTION ),
-    mnValue     ( nValue )
+    MetaAction	( META_COMMENT_ACTION ),
+    mnValue 	( nValue )
 {
     ImplInitDynamicData( NULL, 0UL );
 }
@@ -3984,9 +3984,9 @@ MetaCommentAction::MetaCommentAction( sal_Int32 nValue ) :
 // ------------------------------------------------------------------------
 
 MetaCommentAction::MetaCommentAction( const MetaCommentAction& rAct ) :
-    MetaAction  ( META_COMMENT_ACTION ),
-    maComment   ( rAct.maComment ),
-    mnValue     ( rAct.mnValue )
+    MetaAction	( META_COMMENT_ACTION ),
+    maComment	( rAct.maComment ),
+    mnValue 	( rAct.mnValue )
 {
     ImplInitDynamicData( rAct.mpData, rAct.mnDataSize );
 }
@@ -3994,9 +3994,9 @@ MetaCommentAction::MetaCommentAction( const MetaCommentAction& rAct ) :
 // ------------------------------------------------------------------------
 
 MetaCommentAction::MetaCommentAction( const ByteString& rComment, sal_Int32 nValue, const BYTE* pData, sal_uInt32 nDataSize ) :
-    MetaAction  ( META_COMMENT_ACTION ),
-    maComment   ( rComment ),
-    mnValue     ( nValue )
+    MetaAction	( META_COMMENT_ACTION ),
+    maComment	( rComment ),
+    mnValue 	( nValue )
 {
     ImplInitDynamicData( pData, nDataSize );
 }
@@ -4004,8 +4004,8 @@ MetaCommentAction::MetaCommentAction( const ByteString& rComment, sal_Int32 nVal
 // ------------------------------------------------------------------------
 
 MetaCommentAction::MetaCommentAction( const BYTE* pData, sal_uInt32 nDataSize ) :
-    MetaAction  ( META_COMMENT_ACTION ),
-    mnValue     ( 0L )
+    MetaAction	( META_COMMENT_ACTION ),
+    mnValue 	( 0L )
 {
     ImplInitDynamicData( pData, nDataSize );
 }
@@ -4060,8 +4060,8 @@ void MetaCommentAction::Move( long nXMove, long nYMove )
             sal_Bool bPathStroke = maComment.Equals( "XPATHSTROKE_SEQ_BEGIN" );
             if ( bPathStroke || maComment.Equals( "XPATHFILL_SEQ_BEGIN" ) )
             {
-                SvMemoryStream  aMemStm( (void*)mpData, mnDataSize, STREAM_READ );
-                SvMemoryStream  aDest;
+                SvMemoryStream	aMemStm( (void*)mpData, mnDataSize, STREAM_READ );
+                SvMemoryStream	aDest;
                 if ( bPathStroke )
                 {
                     SvtGraphicStroke aStroke;
@@ -4078,7 +4078,7 @@ void MetaCommentAction::Move( long nXMove, long nYMove )
                     aMemStm >> aFill;
                     PolyPolygon aPath;
                     aFill.getPath( aPath );
-                    aPath.Scale( nXMove, nYMove );
+                    aPath.Move( nXMove, nYMove );
                     aFill.setPath( aPath );
                     aDest << aFill;
                 }
@@ -4102,8 +4102,8 @@ void MetaCommentAction::Scale( double fXScale, double fYScale )
             sal_Bool bPathStroke = maComment.Equals( "XPATHSTROKE_SEQ_BEGIN" );
             if ( bPathStroke || maComment.Equals( "XPATHFILL_SEQ_BEGIN" ) )
             {
-                SvMemoryStream  aMemStm( (void*)mpData, mnDataSize, STREAM_READ );
-                SvMemoryStream  aDest;
+                SvMemoryStream	aMemStm( (void*)mpData, mnDataSize, STREAM_READ );
+                SvMemoryStream	aDest;
                 if ( bPathStroke )
                 {
                     SvtGraphicStroke aStroke;
@@ -4178,7 +4178,7 @@ IMPL_META_ACTION( LayoutMode, META_LAYOUTMODE_ACTION )
 // ------------------------------------------------------------------------
 
 MetaLayoutModeAction::MetaLayoutModeAction( sal_uInt32 nLayoutMode ) :
-    MetaAction  ( META_LAYOUTMODE_ACTION ),
+    MetaAction	( META_LAYOUTMODE_ACTION ),
     mnLayoutMode( nLayoutMode )
 {
 }
@@ -4229,7 +4229,7 @@ IMPL_META_ACTION( TextLanguage, META_TEXTLANGUAGE_ACTION )
 // ------------------------------------------------------------------------
 
 MetaTextLanguageAction::MetaTextLanguageAction( LanguageType eTextLanguage ) :
-    MetaAction  ( META_TEXTLANGUAGE_ACTION ),
+    MetaAction	( META_TEXTLANGUAGE_ACTION ),
     meTextLanguage( eTextLanguage )
 {
 }
diff --git a/vcl/source/gdi/metric.cxx b/vcl/source/gdi/metric.cxx
index 325146b6be8a..ab9153e24836 100644
--- a/vcl/source/gdi/metric.cxx
+++ b/vcl/source/gdi/metric.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
@@ -236,12 +236,12 @@ BOOL FontMetric::operator==( const FontMetric& rMetric ) const
 CmapResult::CmapResult( bool bSymbolic,
     const sal_uInt32* pRangeCodes, int nRangeCount,
     const int* pStartGlyphs, const USHORT* pExtraGlyphIds )
-:   mpRangeCodes( pRangeCodes)
-,   mpStartGlyphs( pStartGlyphs)
-,   mpGlyphIds( pExtraGlyphIds)
-,   mnRangeCount( nRangeCount)
-,   mbSymbolic( bSymbolic)
-,   mbRecoded( false)
+:	mpRangeCodes( pRangeCodes)
+,	mpStartGlyphs( pStartGlyphs)
+,	mpGlyphIds( pExtraGlyphIds)
+,	mnRangeCount( nRangeCount)
+,	mbSymbolic( bSymbolic)
+,	mbRecoded( false)
 {}
 
 // =======================================================================
@@ -298,8 +298,8 @@ ImplFontCharMap* ImplFontCharMap::GetDefaultMap( bool bSymbols)
         int nCodesCount = sizeof(aDefaultUnicodeRanges) / sizeof(*pRangeCodes);
         if( bSymbols )
         {
-            pRangeCodes = aDefaultSymbolRanges;
-            nCodesCount = sizeof(aDefaultSymbolRanges) / sizeof(*pRangeCodes);
+            pRangeCodes	= aDefaultSymbolRanges;
+            nCodesCount	= sizeof(aDefaultSymbolRanges) / sizeof(*pRangeCodes);
         }
 
         CmapResult aDefaultCR( bSymbols, pRangeCodes, nCodesCount/2 );
@@ -377,7 +377,7 @@ int ImplFontCharMap::GetGlyphIndex( sal_uInt32 cChar ) const
     // return -1 if the object doesn't know the glyph ids
     if( !mpStartGlyphs )
         return -1;
-
+    
     // return 0 if the unicode doesn't have a matching glyph
     int nRange = ImplFindRangeIndex( cChar );
     // check that we are inside any range
@@ -393,7 +393,7 @@ int ImplFontCharMap::GetGlyphIndex( sal_uInt32 cChar ) const
     // check that we are inside a range
     if( (nRange & 1) != 0 )
         return 0;
-
+    
     // get glyph index directly or indirectly
     int nGlyphIndex = cChar - mpRangeCodes[ nRange ];
     const int nStartIndex = mpStartGlyphs[ nRange/2 ];
@@ -533,7 +533,7 @@ bool ParseCMAP( const unsigned char* pCmap, int nLength, CmapResult& rResult )
 {
     rResult.mpRangeCodes = NULL;
     rResult.mpStartGlyphs= NULL;
-    rResult.mpGlyphIds   = NULL;
+    rResult.mpGlyphIds	 = NULL;
     rResult.mnRangeCount = 0;
     rResult.mbRecoded    = false;
     rResult.mbSymbolic   = false;
@@ -803,7 +803,7 @@ bool ParseCMAP( const unsigned char* pCmap, int nLength, CmapResult& rResult )
             *(pOut++) = *(it++);
     }
 
-    // update the result struct
+    // update the result struct    
     rResult.mpRangeCodes = pCodePairs;
     rResult.mpStartGlyphs = pStartGlyphs;
     rResult.mnRangeCount = nRangeCount;
diff --git a/vcl/source/gdi/octree.cxx b/vcl/source/gdi/octree.cxx
index 0660728fc8a5..5270014e9d80 100644
--- a/vcl/source/gdi/octree.cxx
+++ b/vcl/source/gdi/octree.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
@@ -297,7 +297,7 @@ void Octree::GetPalIndex( PNODE pNode )
 InverseColorMap::InverseColorMap( const BitmapPalette& rPal ) :
             nBits( 8 - OCTREE_BITS )
 {
-    ULONG*          cdp;
+    ULONG*			cdp;
     BYTE*           crgbp;
     const ULONG     nColorMax = 1 << OCTREE_BITS;
     const ULONG     xsqr = 1 << ( nBits << 1 );
@@ -315,9 +315,9 @@ InverseColorMap::InverseColorMap( const BitmapPalette& rPal ) :
     for( ULONG nIndex = 0; nIndex < nColors; nIndex++ )
     {
         const BitmapColor&  rColor = rPal[ (USHORT) nIndex ];
-        const BYTE          cRed = rColor.GetRed();
-        const BYTE          cGreen = rColor.GetGreen();
-        const BYTE          cBlue = rColor.GetBlue();
+        const BYTE			cRed = rColor.GetRed();
+        const BYTE			cGreen = rColor.GetGreen();
+        const BYTE			cBlue = rColor.GetBlue();
 
         rdist = cRed - x2;
         gdist = cGreen - x2;
diff --git a/vcl/source/gdi/oldprintadaptor.cxx b/vcl/source/gdi/oldprintadaptor.cxx
index ce3ece7e1e5b..f4a421189305 100644
--- a/vcl/source/gdi/oldprintadaptor.cxx
+++ b/vcl/source/gdi/oldprintadaptor.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
@@ -71,7 +71,7 @@ void OldStylePrintAdaptor::StartPage()
     mpData->maPages.back().maPageSize.Width = aPaperSize.getWidth();
     mpData->maPages.back().maPageSize.Height = aPaperSize.getHeight();
     getPrinter()->SetConnectMetaFile( &mpData->maPages.back().maPage );
-
+    
     // copy state into metafile
     boost::shared_ptr<Printer> pPrinter( getPrinter() );
     pPrinter->SetMapMode( pPrinter->GetMapMode() );
diff --git a/vcl/source/gdi/outdev.cxx b/vcl/source/gdi/outdev.cxx
index a011e4ee4a92..7038b2952cd2 100644
--- a/vcl/source/gdi/outdev.cxx
+++ b/vcl/source/gdi/outdev.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
@@ -103,7 +103,7 @@ const char* ImplDbgCheckOutputDevice( const void* pObj )
 
 // =======================================================================
 
-#define OUTDEV_POLYPOLY_STACKBUF        32
+#define OUTDEV_POLYPOLY_STACKBUF		32
 
 // =======================================================================
 
@@ -224,14 +224,14 @@ bool OutputDevice::ImplSelectClipRegion( const Region& rRegion, SalGraphics* pGr
         return true;
     }
 
-    long                nX;
-    long                nY;
-    long                nWidth;
-    long                nHeight;
-    ULONG               nRectCount;
-    ImplRegionInfo      aInfo;
-    BOOL                bRegionRect;
-    BOOL                bClipRegion = TRUE;
+    long				nX;
+    long				nY;
+    long				nWidth;
+    long				nHeight;
+    ULONG				nRectCount;
+    ImplRegionInfo		aInfo;
+    BOOL				bRegionRect;
+    BOOL				bClipRegion = TRUE;
     const BOOL          bClipDeviceBounds( !pOutDev->GetPDFWriter()
                                            && pOutDev->GetOutDevType() != OUTDEV_PRINTER );
 
@@ -336,36 +336,36 @@ void OutputDevice::ImplDrawPolyPolygon( USHORT nPoly, const PolyPolygon& rPolyPo
     if(!nPoly)
         return;
 
-    sal_uInt32          aStackAry1[OUTDEV_POLYPOLY_STACKBUF];
-    PCONSTSALPOINT      aStackAry2[OUTDEV_POLYPOLY_STACKBUF];
-    BYTE*               aStackAry3[OUTDEV_POLYPOLY_STACKBUF];
-    sal_uInt32*         pPointAry;
-    PCONSTSALPOINT*     pPointAryAry;
-    const BYTE**        pFlagAryAry;
-    USHORT              i = 0, j = 0, last = 0;
-    BOOL                bHaveBezier = sal_False;
+    sal_uInt32			aStackAry1[OUTDEV_POLYPOLY_STACKBUF];
+    PCONSTSALPOINT		aStackAry2[OUTDEV_POLYPOLY_STACKBUF];
+    BYTE*				aStackAry3[OUTDEV_POLYPOLY_STACKBUF];
+    sal_uInt32*			pPointAry;
+    PCONSTSALPOINT* 	pPointAryAry;
+    const BYTE**	 	pFlagAryAry;
+    USHORT				i = 0, j = 0, last = 0;
+    BOOL				bHaveBezier = sal_False;
     if ( nPoly > OUTDEV_POLYPOLY_STACKBUF )
     {
-        pPointAry       = new sal_uInt32[nPoly];
-        pPointAryAry    = new PCONSTSALPOINT[nPoly];
-        pFlagAryAry     = new const BYTE*[nPoly];
+        pPointAry		= new sal_uInt32[nPoly];
+        pPointAryAry	= new PCONSTSALPOINT[nPoly];
+        pFlagAryAry		= new const BYTE*[nPoly];
     }
     else
     {
-        pPointAry       = aStackAry1;
-        pPointAryAry    = aStackAry2;
-        pFlagAryAry     = (const BYTE**)aStackAry3;
+        pPointAry		= aStackAry1;
+        pPointAryAry	= aStackAry2;
+        pFlagAryAry		= (const BYTE**)aStackAry3;
     }
     do
     {
-        const Polygon&  rPoly = rPolyPoly.GetObject( i );
-        USHORT          nSize = rPoly.GetSize();
+        const Polygon&	rPoly = rPolyPoly.GetObject( i );
+        USHORT			nSize = rPoly.GetSize();
         if ( nSize )
         {
-            pPointAry[j]    = nSize;
+            pPointAry[j]	= nSize;
             pPointAryAry[j] = (PCONSTSALPOINT)rPoly.GetConstPointAry();
             pFlagAryAry[j]  = rPoly.GetConstFlagAry();
-            last            = i;
+            last 			= i;
 
             if( pFlagAryAry[j] )
                 bHaveBezier = sal_True;
@@ -428,81 +428,81 @@ OutputDevice::OutputDevice() :
 {
     DBG_CTOR( OutputDevice, ImplDbgCheckOutputDevice );
 
-    mpGraphics          = NULL;
-    mpUnoGraphicsList   = NULL;
-    mpPrevGraphics      = NULL;
-    mpNextGraphics      = NULL;
-    mpMetaFile          = NULL;
-    mpFontEntry         = NULL;
-    mpFontCache         = NULL;
-    mpFontList          = NULL;
-    mpGetDevFontList    = NULL;
-    mpGetDevSizeList    = NULL;
-    mpObjStack          = NULL;
-    mpOutDevData        = NULL;
-    mpPDFWriter         = NULL;
-    mpAlphaVDev         = NULL;
-    mpExtOutDevData     = NULL;
-    mnOutOffX           = 0;
-    mnOutOffY           = 0;
-    mnOutWidth          = 0;
-    mnOutHeight         = 0;
-    mnDPIX              = 0;
-    mnDPIY              = 0;
-    mnTextOffX          = 0;
-    mnTextOffY          = 0;
-    mnOutOffOrigX       = 0;
-    mnOutOffLogicX      = 0;
-    mnOutOffOrigY       = 0;
-    mnOutOffLogicY      = 0;
-    mnEmphasisAscent    = 0;
-    mnEmphasisDescent   = 0;
-    mnDrawMode          = 0;
+    mpGraphics			= NULL;
+    mpUnoGraphicsList	= NULL;
+    mpPrevGraphics		= NULL;
+    mpNextGraphics		= NULL;
+    mpMetaFile			= NULL;
+    mpFontEntry 		= NULL;
+    mpFontCache 		= NULL;
+    mpFontList			= NULL;
+    mpGetDevFontList	= NULL;
+    mpGetDevSizeList	= NULL;
+    mpObjStack			= NULL;
+    mpOutDevData		= NULL;
+    mpPDFWriter			= NULL;
+    mpAlphaVDev			= NULL;
+    mpExtOutDevData		= NULL;
+    mnOutOffX			= 0;
+    mnOutOffY			= 0;
+    mnOutWidth			= 0;
+    mnOutHeight 		= 0;
+    mnDPIX				= 0;
+    mnDPIY				= 0;
+    mnTextOffX			= 0;
+    mnTextOffY			= 0;
+    mnOutOffOrigX		= 0;
+    mnOutOffLogicX		= 0;
+    mnOutOffOrigY		= 0;
+    mnOutOffLogicY		= 0;
+    mnEmphasisAscent	= 0;
+    mnEmphasisDescent	= 0;
+    mnDrawMode			= 0;
     mnTextLayoutMode        = TEXT_LAYOUT_DEFAULT;
     if( Application::GetSettings().GetLayoutRTL() ) //#i84553# tip BiDi preference to RTL
         mnTextLayoutMode = TEXT_LAYOUT_BIDI_RTL | TEXT_LAYOUT_TEXTORIGIN_LEFT;
-    meOutDevType        = OUTDEV_DONTKNOW;
+    meOutDevType		= OUTDEV_DONTKNOW;
     meOutDevViewType    = OUTDEV_VIEWTYPE_DONTKNOW;
-    mbMap               = FALSE;
-    mbMapIsDefault      = TRUE;
-    mbClipRegion        = FALSE;
-    mbBackground        = FALSE;
-    mbOutput            = TRUE;
-    mbDevOutput         = FALSE;
-    mbOutputClipped     = FALSE;
-    maTextColor         = Color( COL_BLACK );
-    maOverlineColor     = Color( COL_TRANSPARENT );
-    meTextAlign         = maFont.GetAlign();
-    meRasterOp          = ROP_OVERPAINT;
-    mnAntialiasing      = 0;
+    mbMap				= FALSE;
+    mbMapIsDefault		= TRUE;
+    mbClipRegion		= FALSE;
+    mbBackground		= FALSE;
+    mbOutput			= TRUE;
+    mbDevOutput 		= FALSE;
+    mbOutputClipped 	= FALSE;
+    maTextColor 		= Color( COL_BLACK );
+    maOverlineColor 	= Color( COL_TRANSPARENT );
+    meTextAlign 		= maFont.GetAlign();
+    meRasterOp			= ROP_OVERPAINT;
+    mnAntialiasing		= 0;
     meTextLanguage      = 0;  // TODO: get default from configuration?
-    mbLineColor         = TRUE;
-    mbFillColor         = TRUE;
-    mbInitLineColor     = TRUE;
-    mbInitFillColor     = TRUE;
-    mbInitFont          = TRUE;
-    mbInitTextColor     = TRUE;
-    mbInitClipRegion    = TRUE;
-    mbClipRegionSet     = FALSE;
-    mbKerning           = FALSE;
-    mbNewFont           = TRUE;
-    mbTextLines         = FALSE;
-    mbTextSpecial       = FALSE;
-    mbRefPoint          = FALSE;
+    mbLineColor 		= TRUE;
+    mbFillColor 		= TRUE;
+    mbInitLineColor 	= TRUE;
+    mbInitFillColor 	= TRUE;
+    mbInitFont			= TRUE;
+    mbInitTextColor 	= TRUE;
+    mbInitClipRegion	= TRUE;
+    mbClipRegionSet 	= FALSE;
+    mbKerning			= FALSE;
+    mbNewFont			= TRUE;
+    mbTextLines 		= FALSE;
+    mbTextSpecial		= FALSE;
+    mbRefPoint			= FALSE;
     mbEnableRTL         = FALSE;    // mirroring must be explicitly allowed (typically for windows only)
 
     // struct ImplMapRes
-    maMapRes.mnMapOfsX          = 0;
-    maMapRes.mnMapOfsY          = 0;
-    maMapRes.mnMapScNumX        = 1;
-    maMapRes.mnMapScNumY        = 1;
-    maMapRes.mnMapScDenomX      = 1;
-    maMapRes.mnMapScDenomY      = 1;
+    maMapRes.mnMapOfsX 			= 0;
+    maMapRes.mnMapOfsY 			= 0;
+    maMapRes.mnMapScNumX 		= 1;
+    maMapRes.mnMapScNumY 		= 1;
+    maMapRes.mnMapScDenomX 		= 1;
+    maMapRes.mnMapScDenomY		= 1;
     // struct ImplThresholdRes
-    maThresRes.mnThresLogToPixX = 0;
-    maThresRes.mnThresLogToPixY = 0;
-    maThresRes.mnThresPixToLogX = 0;
-    maThresRes.mnThresPixToLogY = 0;
+    maThresRes.mnThresLogToPixX	= 0;
+    maThresRes.mnThresLogToPixY	= 0;
+    maThresRes.mnThresPixToLogX	= 0;
+    maThresRes.mnThresPixToLogY	= 0;
 }
 
 // -----------------------------------------------------------------------
@@ -600,7 +600,7 @@ void OutputDevice::EnableRTL( BOOL bEnable )
     Window* pWin = dynamic_cast<Window*>(this);
     if( pWin )
         pWin->StateChanged( STATE_CHANGE_MIRRORING );
-
+    
     if( mpAlphaVDev )
         mpAlphaVDev->EnableRTL( bEnable );
 }
@@ -633,12 +633,12 @@ void    OutputDevice::ImplReMirror( Rectangle &rRect ) const
 }
 void    OutputDevice::ImplReMirror( Region &rRegion ) const
 {
-    long                nX;
-    long                nY;
-    long                nWidth;
-    long                nHeight;
-    ImplRegionInfo      aInfo;
-    BOOL                bRegionRect;
+    long				nX;
+    long				nY;
+    long				nWidth;
+    long				nHeight;
+    ImplRegionInfo		aInfo;
+    BOOL				bRegionRect;
     Region              aMirroredRegion;
 
     bRegionRect = rRegion.ImplGetFirstRect( aInfo, nX, nY, nWidth, nHeight );
@@ -662,11 +662,11 @@ int OutputDevice::ImplGetGraphics() const
     if ( mpGraphics )
         return TRUE;
 
-    mbInitLineColor     = TRUE;
-    mbInitFillColor     = TRUE;
-    mbInitFont          = TRUE;
-    mbInitTextColor     = TRUE;
-    mbInitClipRegion    = TRUE;
+    mbInitLineColor 	= TRUE;
+    mbInitFillColor 	= TRUE;
+    mbInitFont			= TRUE;
+    mbInitTextColor 	= TRUE;
+    mbInitClipRegion	= TRUE;
 
     ImplSVData* pSVData = ImplGetSVData();
     if ( meOutDevType == OUTDEV_WINDOW )
@@ -920,9 +920,9 @@ void OutputDevice::ImplReleaseGraphics( BOOL bRelease )
         }
     }
 
-    mpGraphics      = NULL;
-    mpPrevGraphics  = NULL;
-    mpNextGraphics  = NULL;
+    mpGraphics		= NULL;
+    mpPrevGraphics	= NULL;
+    mpNextGraphics	= NULL;
 }
 
 // -----------------------------------------------------------------------
@@ -1040,7 +1040,7 @@ void OutputDevice::ImplInitClipRegion()
     if ( GetOutDevType() == OUTDEV_WINDOW )
     {
         Window* pWindow = (Window*)this;
-        Region  aRegion;
+        Region	aRegion;
 
         // Hintergrund-Sicherung zuruecksetzen
         if ( pWindow->mpWindowImpl->mpFrameData->mpFirstBackWin )
@@ -1107,16 +1107,16 @@ void OutputDevice::ImplSetClipRegion( const Region* pRegion )
     {
         if ( mbClipRegion )
         {
-            maRegion            = Region( REGION_NULL );
-            mbClipRegion        = FALSE;
-            mbInitClipRegion    = TRUE;
+            maRegion			= Region( REGION_NULL );
+            mbClipRegion		= FALSE;
+            mbInitClipRegion	= TRUE;
         }
     }
     else
     {
-        maRegion            = *pRegion;
-        mbClipRegion        = TRUE;
-        mbInitClipRegion    = TRUE;
+        maRegion			= *pRegion;
+        mbClipRegion		= TRUE;
+        mbInitClipRegion	= TRUE;
     }
 }
 
@@ -1145,8 +1145,8 @@ namespace
             return 0x80000000;
         if(a >= 0)
             return a / b;
-        int q = -(-a / b);  // quotient
-        int r = -a % b;     // remainder
+        int q = -(-a / b);	// quotient
+        int r = -a % b;		// remainder
         if(r)
             q--;
         return q;
@@ -1158,7 +1158,7 @@ namespace
             return 0x80000000;
         if(a >= 0)
             return a % b;
-        int r = -a % b;     // remainder
+        int r = -a % b;		// remainder
         if(r)
             r = b - r;
         return r;
@@ -1171,8 +1171,8 @@ namespace
         a += - 1 + b;
         if(a >= 0)
             return a / b;
-        int q = -(-a / b);  // quotient
-        int r = -a % b;     // remainder
+        int q = -(-a / b);	// quotient
+        int r = -a % b;		// remainder
         if(r)
             q--;
         return q;
@@ -1947,8 +1947,8 @@ void OutputDevice::IntersectClipRegion( const Rectangle& rRect )
 
     Rectangle aRect = LogicToPixel( rRect );
     maRegion.Intersect( aRect );
-    mbClipRegion        = TRUE;
-    mbInitClipRegion    = TRUE;
+    mbClipRegion		= TRUE;
+    mbInitClipRegion	= TRUE;
 
     if( mpAlphaVDev )
         mpAlphaVDev->IntersectClipRegion( rRect );
@@ -1971,8 +1971,8 @@ void OutputDevice::IntersectClipRegion( const Region& rRegion )
 
         Region aRegion = LogicToPixel( rRegion );
         maRegion.Intersect( aRegion );
-        mbClipRegion        = TRUE;
-        mbInitClipRegion    = TRUE;
+        mbClipRegion		= TRUE;
+        mbInitClipRegion	= TRUE;
     }
 
     if( mpAlphaVDev )
@@ -2291,7 +2291,7 @@ void OutputDevice::DrawLine( const Point& rStartPt, const Point& rEndPt )
         ImplInitLineColor();
 
     // #i101598# support AA and snap for lines, too
-    if((mnAntialiasing & ANTIALIASING_ENABLE_B2DDRAW)
+    if((mnAntialiasing & ANTIALIASING_ENABLE_B2DDRAW) 
         && mpGraphics->supportsOperation(OutDevSupport_B2DDraw)
         && ROP_OVERPAINT == GetRasterOp()
         && IsLineColor())
@@ -2332,7 +2332,7 @@ void OutputDevice::impPaintLineGeometryWithEvtlExpand(
     const LineInfo& rInfo,
     basegfx::B2DPolyPolygon aLinePolyPolygon)
 {
-    const bool bTryAA((mnAntialiasing & ANTIALIASING_ENABLE_B2DDRAW)
+    const bool bTryAA((mnAntialiasing & ANTIALIASING_ENABLE_B2DDRAW) 
         && mpGraphics->supportsOperation(OutDevSupport_B2DDraw)
         && ROP_OVERPAINT == GetRasterOp()
         && IsLineColor());
@@ -2388,19 +2388,19 @@ void OutputDevice::impPaintLineGeometryWithEvtlExpand(
             // #i110768# When area geometry has to be created, do not
             // use the fallback bezier decomposition inside createAreaGeometry,
             // but one that is at least as good as ImplSubdivideBezier was.
-            // There, Polygon::AdaptiveSubdivide was used with default parameter
+            // There, Polygon::AdaptiveSubdivide was used with default parameter 
             // 1.0 as quality index.
             aLinePolyPolygon = basegfx::tools::adaptiveSubdivideByDistance(aLinePolyPolygon, 1.0);
         }
-
+        
         for(sal_uInt32 a(0); a < aLinePolyPolygon.count(); a++)
         {
             aFillPolyPolygon.append(basegfx::tools::createAreaGeometry(
-                aLinePolyPolygon.getB2DPolygon(a),
-                fHalfLineWidth,
+                aLinePolyPolygon.getB2DPolygon(a), 
+                fHalfLineWidth, 
                 rInfo.GetLineJoin()));
         }
-
+        
         aLinePolyPolygon.clear();
     }
 
@@ -2429,8 +2429,8 @@ void OutputDevice::impPaintLineGeometryWithEvtlExpand(
 
     if(aFillPolyPolygon.count())
     {
-        const Color     aOldLineColor( maLineColor );
-        const Color     aOldFillColor( maFillColor );
+        const Color 	aOldLineColor( maLineColor );
+        const Color 	aOldFillColor( maFillColor );
 
         SetLineColor();
         ImplInitLineColor();
@@ -2438,7 +2438,7 @@ void OutputDevice::impPaintLineGeometryWithEvtlExpand(
         ImplInitFillColor();
 
         bool bDone(false);
-
+        
         if(bTryAA)
         {
             bDone = mpGraphics->DrawPolyPolygon(aFillPolyPolygon, 0.0, this);
@@ -2452,7 +2452,7 @@ void OutputDevice::impPaintLineGeometryWithEvtlExpand(
                 mpGraphics->DrawPolygon(aPolygon.GetSize(), (const SalPoint*)aPolygon.GetConstPointAry(), this);
             }
         }
-
+        
         SetFillColor( aOldFillColor );
         SetLineColor( aOldLineColor );
     }
@@ -2585,7 +2585,7 @@ void OutputDevice::DrawPolyLine( const Polygon& rPoly )
     if ( mbInitLineColor )
         ImplInitLineColor();
 
-    const bool bTryAA((mnAntialiasing & ANTIALIASING_ENABLE_B2DDRAW)
+    const bool bTryAA((mnAntialiasing & ANTIALIASING_ENABLE_B2DDRAW) 
         && mpGraphics->supportsOperation(OutDevSupport_B2DDraw)
         && ROP_OVERPAINT == GetRasterOp()
         && IsLineColor());
@@ -2650,7 +2650,7 @@ void OutputDevice::DrawPolyLine( const Polygon& rPoly, const LineInfo& rLineInfo
 
     // #i101491#
     // Try direct Fallback to B2D-Version of DrawPolyLine
-    if((mnAntialiasing & ANTIALIASING_ENABLE_B2DDRAW)
+    if((mnAntialiasing & ANTIALIASING_ENABLE_B2DDRAW) 
         && LINE_SOLID == rLineInfo.GetStyle())
     {
         DrawPolyLine( rPoly.getB2DPolygon(), (double)rLineInfo.GetWidth(), rLineInfo.GetLineJoin());
@@ -2673,7 +2673,7 @@ void OutputDevice::ImpDrawPolyLineWithLineInfo(const Polygon& rPoly, const LineI
     Polygon aPoly = ImplLogicToDevicePixel( rPoly );
 
     // #100127# LineInfo is not curve-safe, subdivide always
-    //
+    // 
     // What shall this mean? It's wrong to subdivide here when the
     // polygon is a fat line. In that case, the painted geometry
     // WILL be much different.
@@ -2718,7 +2718,7 @@ void OutputDevice::ImpDrawPolyLineWithLineInfo(const Polygon& rPoly, const LineI
             aPoly = ImplSubdivideBezier( aPoly );
             nPoints = aPoly.GetSize();
         }
-
+        
         mpGraphics->DrawPolyLine(nPoints, (const SalPoint*)aPoly.GetConstPointAry(), this);
     }
 
@@ -2758,7 +2758,7 @@ void OutputDevice::DrawPolygon( const Polygon& rPoly )
         ImplInitFillColor();
 
     // use b2dpolygon drawing if possible
-    if((mnAntialiasing & ANTIALIASING_ENABLE_B2DDRAW)
+    if((mnAntialiasing & ANTIALIASING_ENABLE_B2DDRAW) 
         && mpGraphics->supportsOperation(OutDevSupport_B2DDraw)
         && ROP_OVERPAINT == GetRasterOp()
         && (IsLineColor() || IsFillColor()))
@@ -2848,7 +2848,7 @@ void OutputDevice::DrawPolyPolygon( const PolyPolygon& rPolyPoly )
         ImplInitFillColor();
 
     // use b2dpolygon drawing if possible
-    if((mnAntialiasing & ANTIALIASING_ENABLE_B2DDRAW)
+    if((mnAntialiasing & ANTIALIASING_ENABLE_B2DDRAW) 
         && mpGraphics->supportsOperation(OutDevSupport_B2DDraw)
         && ROP_OVERPAINT == GetRasterOp()
         && (IsLineColor() || IsFillColor()))
@@ -2971,7 +2971,7 @@ void OutputDevice::ImpDrawPolyPolygonWithB2DPolyPolygon(const basegfx::B2DPolyPo
     if( mbInitFillColor )
         ImplInitFillColor();
 
-    if((mnAntialiasing & ANTIALIASING_ENABLE_B2DDRAW)
+    if((mnAntialiasing & ANTIALIASING_ENABLE_B2DDRAW) 
         && mpGraphics->supportsOperation(OutDevSupport_B2DDraw)
         && ROP_OVERPAINT == GetRasterOp()
         && (IsLineColor() || IsFillColor()))
@@ -3025,7 +3025,7 @@ bool OutputDevice::ImpTryDrawPolyLineDirect(
 {
     const basegfx::B2DHomMatrix aTransform = ImplGetDeviceTransformation();
     basegfx::B2DVector aB2DLineWidth(1.0, 1.0);
-
+    
     // transform the line width if used
     if( fLineWidth != 0.0 )
     {
@@ -3035,8 +3035,8 @@ bool OutputDevice::ImpTryDrawPolyLineDirect(
     // transform the polygon
     basegfx::B2DPolygon aB2DPolygon(rB2DPolygon);
     aB2DPolygon.transform(aTransform);
-
-    if((mnAntialiasing & ANTIALIASING_PIXELSNAPHAIRLINE)
+    
+    if((mnAntialiasing & ANTIALIASING_PIXELSNAPHAIRLINE) 
         && aB2DPolygon.count() < 1000)
     {
         // #i98289#, #i101491#
@@ -3093,7 +3093,7 @@ void OutputDevice::DrawPolyLine(
     if( mbInitLineColor )
         ImplInitLineColor();
 
-    const bool bTryAA((mnAntialiasing & ANTIALIASING_ENABLE_B2DDRAW)
+    const bool bTryAA((mnAntialiasing & ANTIALIASING_ENABLE_B2DDRAW) 
         && mpGraphics->supportsOperation(OutDevSupport_B2DDraw)
         && ROP_OVERPAINT == GetRasterOp()
         && IsLineColor());
@@ -3108,7 +3108,7 @@ void OutputDevice::DrawPolyLine(
     // no output yet; fallback to geometry decomposition and use filled polygon paint
     // when line is fat and not too complex. ImpDrawPolyPolygonWithB2DPolyPolygon
     // will do internal needed AA checks etc.
-    if(fLineWidth >= 2.5
+    if(fLineWidth >= 2.5 
         && rB2DPolygon.count()
         && rB2DPolygon.count() <= 1000)
     {
@@ -3256,8 +3256,8 @@ void OutputDevice::Pop()
     if( mpMetaFile )
         mpMetaFile->AddAction( new MetaPopAction() );
 
-    GDIMetaFile*    pOldMetaFile = mpMetaFile;
-    ImplObjStack*   pData = mpObjStack;
+    GDIMetaFile*	pOldMetaFile = mpMetaFile;
+    ImplObjStack*	pData = mpObjStack;
     mpMetaFile = NULL;
 
     if ( !pData )
diff --git a/vcl/source/gdi/outdev2.cxx b/vcl/source/gdi/outdev2.cxx
index bea307a4c38d..25bf06586809 100644
--- a/vcl/source/gdi/outdev2.cxx
+++ b/vcl/source/gdi/outdev2.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
@@ -65,23 +65,23 @@ DBG_NAMEEX( OutputDevice )
 // - Defines -
 // -----------
 
-#define OUTDEV_INIT()                       \
-{                                           \
-    if ( !IsDeviceOutputNecessary() )       \
-        return;                             \
+#define OUTDEV_INIT()						\
+{											\
+    if ( !IsDeviceOutputNecessary() )		\
+        return; 							\
                                             \
-    if ( !mpGraphics )                      \
-        if ( !ImplGetGraphics() )           \
-            return;                         \
+    if ( !mpGraphics )						\
+        if ( !ImplGetGraphics() )			\
+            return; 						\
                                             \
-    if ( mbInitClipRegion )                 \
-        ImplInitClipRegion();               \
+    if ( mbInitClipRegion ) 				\
+        ImplInitClipRegion();				\
                                             \
-    if ( mbOutputClipped )                  \
-        return;                             \
+    if ( mbOutputClipped )					\
+        return; 							\
 }
 
-#define TwoRect     SalTwoRect
+#define TwoRect 	SalTwoRect
 
 // -------------
 // - externals -
@@ -116,13 +116,13 @@ ULONG ImplAdjustTwoRect( TwoRect& rTwoRect, const Size& rSizePix )
     }
 
     if( ( rTwoRect.mnSrcX < 0 ) || ( rTwoRect.mnSrcX >= rSizePix.Width() ) ||
-        ( rTwoRect.mnSrcY < 0 ) || ( rTwoRect.mnSrcY >= rSizePix.Height() ) ||
+        ( rTwoRect.mnSrcY < 0 ) || ( rTwoRect.mnSrcY >= rSizePix.Height() ) ||	
         ( ( rTwoRect.mnSrcX + rTwoRect.mnSrcWidth ) > rSizePix.Width() ) ||
         ( ( rTwoRect.mnSrcY + rTwoRect.mnSrcHeight ) > rSizePix.Height() ) )
     {
-        const Rectangle aSourceRect( Point( rTwoRect.mnSrcX, rTwoRect.mnSrcY ),
+        const Rectangle	aSourceRect( Point( rTwoRect.mnSrcX, rTwoRect.mnSrcY ), 
                                      Size( rTwoRect.mnSrcWidth, rTwoRect.mnSrcHeight ) );
-        Rectangle       aCropRect( aSourceRect );
+        Rectangle		aCropRect( aSourceRect );
 
         aCropRect.Intersection( Rectangle( Point(), rSizePix ) );
 
@@ -130,8 +130,8 @@ ULONG ImplAdjustTwoRect( TwoRect& rTwoRect, const Size& rSizePix )
             rTwoRect.mnSrcWidth = rTwoRect.mnSrcHeight = rTwoRect.mnDestWidth = rTwoRect.mnDestHeight = 0;
         else
         {
-            const double    fFactorX = ( rTwoRect.mnSrcWidth > 1 ) ? (double) ( rTwoRect.mnDestWidth - 1 ) / ( rTwoRect.mnSrcWidth - 1 ) : 0.0;
-            const double    fFactorY = ( rTwoRect.mnSrcHeight > 1 ) ? (double) ( rTwoRect.mnDestHeight - 1 ) / ( rTwoRect.mnSrcHeight - 1 ) : 0.0;
+            const double	fFactorX = ( rTwoRect.mnSrcWidth > 1 ) ? (double) ( rTwoRect.mnDestWidth - 1 ) / ( rTwoRect.mnSrcWidth - 1 ) : 0.0;
+            const double	fFactorY = ( rTwoRect.mnSrcHeight > 1 ) ? (double) ( rTwoRect.mnDestHeight - 1 ) / ( rTwoRect.mnSrcHeight - 1 ) : 0.0;
 
             const long nDstX1 = rTwoRect.mnDestX + FRound( fFactorX * ( aCropRect.Left() - rTwoRect.mnSrcX ) );
             const long nDstY1 = rTwoRect.mnDestY + FRound( fFactorY * ( aCropRect.Top() - rTwoRect.mnSrcY ) );
@@ -156,8 +156,8 @@ ULONG ImplAdjustTwoRect( TwoRect& rTwoRect, const Size& rSizePix )
 
 void OutputDevice::ImplDrawOutDevDirect( const OutputDevice* pSrcDev, void* pVoidPosAry )
 {
-    TwoRect*            pPosAry = (TwoRect*)pVoidPosAry;
-    SalGraphics*        pGraphics2;
+    TwoRect*			pPosAry = (TwoRect*)pVoidPosAry;
+    SalGraphics*		pGraphics2;
 
     if ( pPosAry->mnSrcWidth && pPosAry->mnSrcHeight && pPosAry->mnDestWidth && pPosAry->mnDestHeight )
     {
@@ -200,12 +200,12 @@ void OutputDevice::ImplDrawOutDevDirect( const OutputDevice* pSrcDev, void* pVoi
         }
 
         // #102532# Offset only has to be pseudo window offset
-        Rectangle   aSrcOutRect( Point( pSrcDev->mnOutOffX, pSrcDev->mnOutOffY ),
+        Rectangle	aSrcOutRect( Point( pSrcDev->mnOutOffX, pSrcDev->mnOutOffY ),
                                  Size( pSrcDev->mnOutWidth, pSrcDev->mnOutHeight ) );
-        Rectangle   aSrcRect( Point( pPosAry->mnSrcX, pPosAry->mnSrcY ),
+        Rectangle	aSrcRect( Point( pPosAry->mnSrcX, pPosAry->mnSrcY ),
                               Size( pPosAry->mnSrcWidth, pPosAry->mnSrcHeight ) );
-        const long  nOldRight = aSrcRect.Right();
-        const long  nOldBottom = aSrcRect.Bottom();
+        const long	nOldRight = aSrcRect.Right();
+        const long	nOldBottom = aSrcRect.Bottom();
 
         if ( !aSrcRect.Intersection( aSrcOutRect ).IsEmpty() )
         {
@@ -230,7 +230,7 @@ void OutputDevice::ImplDrawOutDevDirect( const OutputDevice* pSrcDev, void* pVoi
             if( (GetOutDevType() != OUTDEV_WINDOW) && pGraphics2 && (pGraphics2->GetLayout() & SAL_LAYOUT_BIDI_RTL) )
             {
                 SalTwoRect pPosAry2 = *pPosAry;
-                pGraphics2->mirror( pPosAry2.mnSrcX, pPosAry2.mnSrcWidth, pSrcDev );
+                pGraphics2->mirror( pPosAry2.mnSrcX, pPosAry2.mnSrcWidth, pSrcDev ); 
                 mpGraphics->CopyBits( &pPosAry2, pGraphics2, this, pSrcDev );
             }
             else
@@ -269,24 +269,24 @@ void OutputDevice::DrawOutDev( const Point& rDestPt, const Size& rDestSize,
     OUTDEV_INIT();
 
     TwoRect aPosAry;
-    aPosAry.mnSrcWidth   = ImplLogicWidthToDevicePixel( rSrcSize.Width() );
+    aPosAry.mnSrcWidth	 = ImplLogicWidthToDevicePixel( rSrcSize.Width() );
     aPosAry.mnSrcHeight  = ImplLogicHeightToDevicePixel( rSrcSize.Height() );
     aPosAry.mnDestWidth  = ImplLogicWidthToDevicePixel( rDestSize.Width() );
     aPosAry.mnDestHeight = ImplLogicHeightToDevicePixel( rDestSize.Height() );
 
     if ( aPosAry.mnSrcWidth && aPosAry.mnSrcHeight && aPosAry.mnDestWidth && aPosAry.mnDestHeight )
     {
-        aPosAry.mnSrcX       = ImplLogicXToDevicePixel( rSrcPt.X() );
-        aPosAry.mnSrcY       = ImplLogicYToDevicePixel( rSrcPt.Y() );
-        aPosAry.mnDestX      = ImplLogicXToDevicePixel( rDestPt.X() );
-        aPosAry.mnDestY      = ImplLogicYToDevicePixel( rDestPt.Y() );
+        aPosAry.mnSrcX		 = ImplLogicXToDevicePixel( rSrcPt.X() );
+        aPosAry.mnSrcY		 = ImplLogicYToDevicePixel( rSrcPt.Y() );
+        aPosAry.mnDestX 	 = ImplLogicXToDevicePixel( rDestPt.X() );
+        aPosAry.mnDestY 	 = ImplLogicYToDevicePixel( rDestPt.Y() );
 
-        Rectangle   aSrcOutRect( Point( mnOutOffX, mnOutOffY ),
+        Rectangle	aSrcOutRect( Point( mnOutOffX, mnOutOffY ),
                                  Size( mnOutWidth, mnOutHeight ) );
-        Rectangle   aSrcRect( Point( aPosAry.mnSrcX, aPosAry.mnSrcY ),
+        Rectangle	aSrcRect( Point( aPosAry.mnSrcX, aPosAry.mnSrcY ),
                               Size( aPosAry.mnSrcWidth, aPosAry.mnSrcHeight ) );
-        long        nOldRight = aSrcRect.Right();
-        long        nOldBottom = aSrcRect.Bottom();
+        long		nOldRight = aSrcRect.Right();
+        long		nOldBottom = aSrcRect.Bottom();
 
         if ( !aSrcRect.Intersection( aSrcOutRect ).IsEmpty() )
         {
@@ -342,12 +342,12 @@ void OutputDevice::DrawOutDev( const Point& rDestPt, const Size& rDestSize,
     OUTDEV_INIT();
 
     TwoRect aPosAry;
-    aPosAry.mnSrcX       = rOutDev.ImplLogicXToDevicePixel( rSrcPt.X() );
-    aPosAry.mnSrcY       = rOutDev.ImplLogicYToDevicePixel( rSrcPt.Y() );
-    aPosAry.mnSrcWidth   = rOutDev.ImplLogicWidthToDevicePixel( rSrcSize.Width() );
+    aPosAry.mnSrcX		 = rOutDev.ImplLogicXToDevicePixel( rSrcPt.X() );
+    aPosAry.mnSrcY		 = rOutDev.ImplLogicYToDevicePixel( rSrcPt.Y() );
+    aPosAry.mnSrcWidth	 = rOutDev.ImplLogicWidthToDevicePixel( rSrcSize.Width() );
     aPosAry.mnSrcHeight  = rOutDev.ImplLogicHeightToDevicePixel( rSrcSize.Height() );
-    aPosAry.mnDestX      = ImplLogicXToDevicePixel( rDestPt.X() );
-    aPosAry.mnDestY      = ImplLogicYToDevicePixel( rDestPt.Y() );
+    aPosAry.mnDestX 	 = ImplLogicXToDevicePixel( rDestPt.X() );
+    aPosAry.mnDestY 	 = ImplLogicYToDevicePixel( rDestPt.Y() );
     aPosAry.mnDestWidth  = ImplLogicWidthToDevicePixel( rDestSize.Width() );
     aPosAry.mnDestHeight = ImplLogicHeightToDevicePixel( rDestSize.Height() );
 
@@ -404,22 +404,22 @@ void OutputDevice::CopyArea( const Point& rDestPt,
     OUTDEV_INIT();
 
     TwoRect aPosAry;
-    aPosAry.mnSrcWidth   = ImplLogicWidthToDevicePixel( rSrcSize.Width() );
+    aPosAry.mnSrcWidth	 = ImplLogicWidthToDevicePixel( rSrcSize.Width() );
     aPosAry.mnSrcHeight  = ImplLogicHeightToDevicePixel( rSrcSize.Height() );
 
     if ( aPosAry.mnSrcWidth && aPosAry.mnSrcHeight )
     {
-        aPosAry.mnSrcX       = ImplLogicXToDevicePixel( rSrcPt.X() );
-        aPosAry.mnSrcY       = ImplLogicYToDevicePixel( rSrcPt.Y() );
-        aPosAry.mnDestX      = ImplLogicXToDevicePixel( rDestPt.X() );
-        aPosAry.mnDestY      = ImplLogicYToDevicePixel( rDestPt.Y() );
+        aPosAry.mnSrcX		 = ImplLogicXToDevicePixel( rSrcPt.X() );
+        aPosAry.mnSrcY		 = ImplLogicYToDevicePixel( rSrcPt.Y() );
+        aPosAry.mnDestX 	 = ImplLogicXToDevicePixel( rDestPt.X() );
+        aPosAry.mnDestY 	 = ImplLogicYToDevicePixel( rDestPt.Y() );
 
-        Rectangle   aSrcOutRect( Point( mnOutOffX, mnOutOffY ),
+        Rectangle	aSrcOutRect( Point( mnOutOffX, mnOutOffY ),
                                  Size( mnOutWidth, mnOutHeight ) );
-        Rectangle   aSrcRect( Point( aPosAry.mnSrcX, aPosAry.mnSrcY ),
+        Rectangle	aSrcRect( Point( aPosAry.mnSrcX, aPosAry.mnSrcY ),
                               Size( aPosAry.mnSrcWidth, aPosAry.mnSrcHeight ) );
-        long        nOldRight = aSrcRect.Right();
-        long        nOldBottom = aSrcRect.Bottom();
+        long		nOldRight = aSrcRect.Right();
+        long		nOldBottom = aSrcRect.Bottom();
 
         if ( !aSrcRect.Intersection( aSrcOutRect ).IsEmpty() )
         {
@@ -463,9 +463,9 @@ void OutputDevice::ImplDrawFrameDev( const Point& rPt, const Point& rDevPt, cons
 {
     DBG_CHKTHIS( OutputDevice, ImplDbgCheckOutputDevice );
 
-    GDIMetaFile*    pOldMetaFile = mpMetaFile;
-    BOOL            bOldMap = mbMap;
-    RasterOp        eOldROP = GetRasterOp();
+    GDIMetaFile*	pOldMetaFile = mpMetaFile;
+    BOOL			bOldMap = mbMap;
+    RasterOp		eOldROP = GetRasterOp();
     mpMetaFile = NULL;
     mbMap = FALSE;
     SetRasterOp( ROP_OVERPAINT );
@@ -486,12 +486,12 @@ void OutputDevice::ImplDrawFrameDev( const Point& rPt, const Point& rDevPt, cons
         ImplSelectClipRegion( rRegion );
 
     TwoRect aPosAry;
-    aPosAry.mnSrcX       = rDevPt.X();
-    aPosAry.mnSrcY       = rDevPt.Y();
-    aPosAry.mnSrcWidth   = rDevSize.Width();
+    aPosAry.mnSrcX		 = rDevPt.X();
+    aPosAry.mnSrcY		 = rDevPt.Y();
+    aPosAry.mnSrcWidth	 = rDevSize.Width();
     aPosAry.mnSrcHeight  = rDevSize.Height();
-    aPosAry.mnDestX      = rPt.X();
-    aPosAry.mnDestY      = rPt.Y();
+    aPosAry.mnDestX 	 = rPt.X();
+    aPosAry.mnDestY 	 = rPt.Y();
     aPosAry.mnDestWidth  = rDevSize.Width();
     aPosAry.mnDestHeight = rDevSize.Height();
     ImplDrawOutDevDirect( &rOutDev, &aPosAry );
@@ -591,7 +591,7 @@ void OutputDevice::ImplDrawBitmap( const Point& rDestPt, const Size& rDestSize,
         DrawRect( Rectangle( rDestPt, rDestSize ) );
         return;
     }
-    else if ( mnDrawMode & ( DRAWMODE_BLACKBITMAP | DRAWMODE_WHITEBITMAP |
+    else if ( mnDrawMode & ( DRAWMODE_BLACKBITMAP | DRAWMODE_WHITEBITMAP | 
                              DRAWMODE_GRAYBITMAP | DRAWMODE_GHOSTEDBITMAP ) )
     {
         if ( mnDrawMode & ( DRAWMODE_BLACKBITMAP | DRAWMODE_WHITEBITMAP ) )
@@ -661,7 +661,7 @@ void OutputDevice::ImplDrawBitmap( const Point& rDestPt, const Size& rDestSize,
         {
             if ( nMirrFlags )
                 aBmp.Mirror( nMirrFlags );
-
+            
             /* #i75264# (corrected with #i81576#)
             * sometimes a bitmap is scaled to a ridiculous size and drawn
             * to a quite normal VDev, so only a very small part of
@@ -691,7 +691,7 @@ void OutputDevice::ImplDrawBitmap( const Point& rDestPt, const Size& rDestSize,
                         if( aPosAry.mnDestWidth > 3*mnOutWidth && aPosAry.mnSrcWidth )
                         {
                             const double nScaleX = aPosAry.mnDestWidth/double(aPosAry.mnSrcWidth);
-
+    
                             if( aPosAry.mnDestX + aPosAry.mnDestWidth > mnOutWidth )
                             {
                                 aPosAry.mnDestWidth = Max(long(0),mnOutWidth-aPosAry.mnDestX);
@@ -702,14 +702,14 @@ void OutputDevice::ImplDrawBitmap( const Point& rDestPt, const Size& rDestSize,
                                 aPosAry.mnSrcX -= sal::static_int_cast<long>(aPosAry.mnDestX / nScaleX);
                                 aPosAry.mnDestX = 0;
                             }
-
+    
                             aPosAry.mnSrcWidth = sal::static_int_cast<long>(aPosAry.mnDestWidth / nScaleX);
                         }
-
+    
                         if( aPosAry.mnDestHeight > 3*mnOutHeight && aPosAry.mnSrcHeight != 0 )
                         {
                             const double nScaleY = aPosAry.mnDestHeight/double(aPosAry.mnSrcHeight);
-
+    
                             if( aPosAry.mnDestY + aPosAry.mnDestHeight > mnOutHeight )
                             {
                                 aPosAry.mnDestHeight = Max(long(0),mnOutHeight-aPosAry.mnDestY);
@@ -720,7 +720,7 @@ void OutputDevice::ImplDrawBitmap( const Point& rDestPt, const Size& rDestSize,
                                 aPosAry.mnSrcY -= sal::static_int_cast<long>(aPosAry.mnDestY / nScaleY);
                                 aPosAry.mnDestY = 0;
                             }
-
+    
                             aPosAry.mnSrcHeight = sal::static_int_cast<long>(aPosAry.mnDestHeight / nScaleY);
                         }
                     }
@@ -802,13 +802,13 @@ void OutputDevice::ImplDrawBitmapEx( const Point& rDestPt, const Size& rDestSize
         DrawRect( Rectangle( rDestPt, rDestSize ) );
         return;
     }
-    else if ( mnDrawMode & ( DRAWMODE_BLACKBITMAP | DRAWMODE_WHITEBITMAP |
+    else if ( mnDrawMode & ( DRAWMODE_BLACKBITMAP | DRAWMODE_WHITEBITMAP | 
                              DRAWMODE_GRAYBITMAP | DRAWMODE_GHOSTEDBITMAP ) )
     {
         if ( mnDrawMode & ( DRAWMODE_BLACKBITMAP | DRAWMODE_WHITEBITMAP ) )
         {
-            Bitmap  aColorBmp( aBmpEx.GetSizePixel(), ( mnDrawMode & DRAWMODE_GHOSTEDBITMAP ) ? 4 : 1 );
-            BYTE    cCmpVal;
+            Bitmap	aColorBmp( aBmpEx.GetSizePixel(), ( mnDrawMode & DRAWMODE_GHOSTEDBITMAP ) ? 4 : 1 );
+            BYTE	cCmpVal;
 
             if ( mnDrawMode & DRAWMODE_BLACKBITMAP )
                 cCmpVal = ( mnDrawMode & DRAWMODE_GHOSTEDBITMAP ) ? 0x80 : 0;
@@ -948,7 +948,7 @@ void OutputDevice::ImplDrawBitmapEx( const Point& rDestPt, const Size& rDestSize
                     aPosAry.mnDestHeight == aPosAry.mnSrcHeight )
                 {
                     // now intersect dest rect with clip region
-                    aClipRegionBounds.Intersection( Rectangle( aPosAry.mnDestX,
+                    aClipRegionBounds.Intersection( Rectangle( aPosAry.mnDestX, 
                                                                aPosAry.mnDestY,
                                                                aPosAry.mnDestX + aPosAry.mnDestWidth - 1,
                                                                aPosAry.mnDestY + aPosAry.mnDestHeight - 1 ) );
@@ -963,7 +963,7 @@ void OutputDevice::ImplDrawBitmapEx( const Point& rDestPt, const Size& rDestSize
                         aPosAry.mnSrcY += aClipRegionBounds.Top() - aPosAry.mnDestY;
                         aPosAry.mnSrcWidth = aClipRegionBounds.GetWidth();
                         aPosAry.mnSrcHeight = aClipRegionBounds.GetHeight();
-
+                        
                         aPosAry.mnDestX = aClipRegionBounds.Left();
                         aPosAry.mnDestY = aClipRegionBounds.Top();
                         aPosAry.mnDestWidth = aClipRegionBounds.GetWidth();
@@ -971,13 +971,13 @@ void OutputDevice::ImplDrawBitmapEx( const Point& rDestPt, const Size& rDestSize
                     }
                 }
 
-                mpGraphics->DrawBitmap( &aPosAry, *pImpBmp->ImplGetSalBitmap(),
-                                        *pMaskBmp->ImplGetSalBitmap(),
+                mpGraphics->DrawBitmap( &aPosAry, *pImpBmp->ImplGetSalBitmap(), 
+                                        *pMaskBmp->ImplGetSalBitmap(), 
                                         this );
 
                 // #110958# Paint mask to alpha channel. Luckily, the
                 // black and white representation of the mask maps to
-                // the alpha channel
+                // the alpha channel 
 
                 // #i25167# Restrict mask painting to _opaque_ areas
                 // of the mask, otherwise we spoil areas where no
@@ -985,8 +985,8 @@ void OutputDevice::ImplDrawBitmapEx( const Point& rDestPt, const Size& rDestSize
                 // enough, this can be achieved by taking the mask as
                 // the transparency mask of itself
                 if( mpAlphaVDev )
-                    mpAlphaVDev->DrawBitmapEx( rDestPt,
-                                               rDestSize,
+                    mpAlphaVDev->DrawBitmapEx( rDestPt, 
+                                               rDestSize, 
                                                BitmapEx( aBmpEx.GetMask(),
                                                          aBmpEx.GetMask() ) );
             }
@@ -1026,8 +1026,8 @@ void OutputDevice::DrawMask( const Point& rDestPt,
         // bitmap content was ever visible. Interestingly
         // enough, this can be achieved by taking the mask as
         // the transparency mask of itself
-        mpAlphaVDev->DrawBitmapEx( rDestPt,
-                                   PixelToLogic( aSizePix ),
+        mpAlphaVDev->DrawBitmapEx( rDestPt, 
+                                   PixelToLogic( aSizePix ), 
                                    BitmapEx( rMask, rMask ) );
     }
 }
@@ -1054,8 +1054,8 @@ void OutputDevice::DrawMask( const Point& rDestPt, const Size& rDestSize,
         // bitmap content was ever visible. Interestingly
         // enough, this can be achieved by taking the mask as
         // the transparency mask of itself
-        mpAlphaVDev->DrawBitmapEx( rDestPt,
-                                   rDestSize,
+        mpAlphaVDev->DrawBitmapEx( rDestPt, 
+                                   rDestSize, 
                                    BitmapEx( rMask, rMask ) );
     }
 }
@@ -1083,9 +1083,9 @@ void OutputDevice::DrawMask( const Point& rDestPt, const Size& rDestSize,
         // bitmap content was ever visible. Interestingly
         // enough, this can be achieved by taking the mask as
         // the transparency mask of itself
-        mpAlphaVDev->DrawBitmapEx( rDestPt,
-                                   rDestSize,
-                                   rSrcPtPixel,
+        mpAlphaVDev->DrawBitmapEx( rDestPt, 
+                                   rDestSize, 
+                                   rSrcPtPixel, 
                                    rSrcSizePixel,
                                    BitmapEx( rMask, rMask ) );
     }
@@ -1176,10 +1176,10 @@ void OutputDevice::ImplDrawMask( const Point& rDestPt, const Size& rDestSize,
 void OutputDevice::DrawImage( const Point& rPos, const Image& rImage, USHORT nStyle )
 {
     DBG_ASSERT( GetOutDevType() != OUTDEV_PRINTER, "DrawImage(): Images can't be drawn on any mprinter" );
-
+    
     if( !rImage.mpImplData || ImplIsRecordLayout() )
         return;
-
+    
     switch( rImage.mpImplData->meType )
     {
         case IMAGETYPE_BITMAP:
@@ -1193,7 +1193,7 @@ void OutputDevice::DrawImage( const Point& rPos, const Image& rImage, USHORT nSt
             if( !pData->mpImageBitmap )
             {
                 const Size aSize( pData->maBmpEx.GetSizePixel() );
-
+            
                 pData->mpImageBitmap = new ImplImageBmp;
                 pData->mpImageBitmap->Create( pData->maBmpEx, aSize.Width(), aSize.Height(), 1 );
             }
@@ -1221,23 +1221,23 @@ void OutputDevice::DrawImage( const Point& rPos, const Size& rSize,
             case IMAGETYPE_BITMAP:
                 DrawBitmap( rPos, rSize, *static_cast< Bitmap* >( rImage.mpImplData->mpData ) );
             break;
-
+    
             case IMAGETYPE_IMAGE:
             {
                 ImplImageData* pData = static_cast< ImplImageData* >( rImage.mpImplData->mpData );
-
+    
                 if ( !pData->mpImageBitmap )
                 {
                     const Size aSize( pData->maBmpEx.GetSizePixel() );
-
+                    
                     pData->mpImageBitmap = new ImplImageBmp;
                     pData->mpImageBitmap->Create( pData->maBmpEx, aSize.Width(), aSize.Height(), 1 );
                 }
-
+    
                 pData->mpImageBitmap->Draw( 0, this, rPos, nStyle, &rSize );
             }
             break;
-
+                
             default:
             break;
         }
@@ -1250,18 +1250,18 @@ Bitmap OutputDevice::GetBitmap( const Point& rSrcPt, const Size& rSize ) const
 {
     DBG_CHKTHIS( OutputDevice, ImplDbgCheckOutputDevice );
 
-    Bitmap  aBmp;
-    long    nX = ImplLogicXToDevicePixel( rSrcPt.X() );
-    long    nY = ImplLogicYToDevicePixel( rSrcPt.Y() );
-    long    nWidth = ImplLogicWidthToDevicePixel( rSize.Width() );
-    long    nHeight = ImplLogicHeightToDevicePixel( rSize.Height() );
+    Bitmap	aBmp;
+    long	nX = ImplLogicXToDevicePixel( rSrcPt.X() );
+    long	nY = ImplLogicYToDevicePixel( rSrcPt.Y() );
+    long	nWidth = ImplLogicWidthToDevicePixel( rSize.Width() );
+    long	nHeight = ImplLogicHeightToDevicePixel( rSize.Height() );
 
     if ( mpGraphics || ( (OutputDevice*) this )->ImplGetGraphics() )
     {
         if ( nWidth && nHeight )
         {
-            Rectangle   aRect( Point( nX, nY ), Size( nWidth, nHeight ) );
-            BOOL        bClipped = FALSE;
+            Rectangle	aRect( Point( nX, nY ), Size( nWidth, nHeight ) );
+            BOOL		bClipped = FALSE;
 
             // X-Koordinate ausserhalb des Bereichs?
             if ( nX < mnOutOffX )
@@ -1282,7 +1282,7 @@ Bitmap OutputDevice::GetBitmap( const Point& rSrcPt, const Size& rSize ) const
             // Breite ausserhalb des Bereichs?
             if ( (nWidth + nX) > (mnOutWidth + mnOutOffX) )
             {
-                nWidth  = mnOutOffX + mnOutWidth - nX;
+                nWidth	= mnOutOffX + mnOutWidth - nX;
                 bClipped = TRUE;
             }
 
@@ -1394,9 +1394,9 @@ Color OutputDevice::GetPixel( const Point& rPt ) const
 
         if ( !mbOutputClipped )
         {
-            const long      nX = ImplLogicXToDevicePixel( rPt.X() );
-            const long      nY = ImplLogicYToDevicePixel( rPt.Y() );
-            const SalColor  aSalCol = mpGraphics->GetPixel( nX, nY, this );
+            const long		nX = ImplLogicXToDevicePixel( rPt.X() );
+            const long		nY = ImplLogicYToDevicePixel( rPt.Y() );
+            const SalColor	aSalCol = mpGraphics->GetPixel( nX, nY, this );
             aColor.SetRed( SALCOLOR_RED( aSalCol ) );
             aColor.SetGreen( SALCOLOR_GREEN( aSalCol ) );
             aColor.SetBlue( SALCOLOR_BLUE( aSalCol ) );
@@ -1411,8 +1411,8 @@ Color* OutputDevice::GetPixel( const Polygon& rPts ) const
 {
     DBG_CHKTHIS( OutputDevice, ImplDbgCheckOutputDevice );
 
-    Color*          pColors = NULL;
-    const USHORT    nSize = rPts.GetSize();
+    Color*			pColors = NULL;
+    const USHORT	nSize = rPts.GetSize();
 
     if( nSize )
     {
@@ -1427,9 +1427,9 @@ Color* OutputDevice::GetPixel( const Polygon& rPts ) const
 
                 for( USHORT i = 0; i < nSize; i++ )
                 {
-                    Color&          rCol = pColors[ i ];
-                    const Point&    rPt = rPts[ i ];
-                    const SalColor  aSalCol( mpGraphics->GetPixel( ImplLogicXToDevicePixel( rPt.X() ),
+                    Color&			rCol = pColors[ i ];
+                    const Point&	rPt = rPts[ i ];
+                    const SalColor	aSalCol( mpGraphics->GetPixel( ImplLogicXToDevicePixel( rPt.X() ),
                                                                    ImplLogicYToDevicePixel( rPt.Y() ) , this) );
 
                     rCol.SetRed( SALCOLOR_RED( aSalCol ) );
@@ -1488,7 +1488,7 @@ void OutputDevice::DrawPixel( const Point& rPt, const Color& rColor )
 
     Color aColor( rColor );
 
-    if( mnDrawMode & ( DRAWMODE_BLACKLINE | DRAWMODE_WHITELINE |
+    if( mnDrawMode & ( DRAWMODE_BLACKLINE | DRAWMODE_WHITELINE | 
                        DRAWMODE_GRAYLINE | DRAWMODE_GHOSTEDLINE |
                        DRAWMODE_SETTINGSLINE ) )
     {
@@ -1598,8 +1598,8 @@ void OutputDevice::DrawPixel( const Polygon& rPts, const Color& rColor )
 {
     if( rColor != COL_TRANSPARENT && ! ImplIsRecordLayout() )
     {
-        const USHORT    nSize = rPts.GetSize();
-        Color*          pColArray = new Color[ nSize ];
+        const USHORT	nSize = rPts.GetSize();
+        Color*			pColArray = new Color[ nSize ];
 
         for( USHORT i = 0; i < nSize; i++ )
             pColArray[ i ] = rColor;
@@ -1627,12 +1627,12 @@ namespace
 // ------------------------------------------------------------------------
 
 Bitmap OutputDevice::ImplBlendWithAlpha( Bitmap              aBmp,
-                                         BitmapReadAccess*   pP,
-                                         BitmapReadAccess*   pA,
+                                         BitmapReadAccess*	 pP,
+                                         BitmapReadAccess*	 pA,
                                          const Rectangle&    aDstRect,
-                                         const sal_Int32     nOffY,
-                                         const sal_Int32     nDstHeight,
-                                         const sal_Int32     nOffX,
+                                         const sal_Int32     nOffY, 
+                                         const sal_Int32     nDstHeight, 
+                                         const sal_Int32     nOffX, 
                                          const sal_Int32     nDstWidth,
                                          const long*         pMapX,
                                          const long*         pMapY )
@@ -1648,14 +1648,14 @@ Bitmap OutputDevice::ImplBlendWithAlpha( Bitmap              aBmp,
     mpAlphaVDev->EnableMapMode(FALSE);
 
     Bitmap aAlphaBitmap( mpAlphaVDev->GetBitmap( aDstRect.TopLeft(), aDstRect.GetSize() ) );
-    BitmapWriteAccess*  pAlphaW = aAlphaBitmap.AcquireWriteAccess();
+    BitmapWriteAccess*	pAlphaW = aAlphaBitmap.AcquireWriteAccess();
 
     if( GetBitCount() <= 8 )
     {
-        Bitmap              aDither( aBmp.GetSizePixel(), 8 );
-        BitmapColor         aIndex( 0 );
-        BitmapReadAccess*   pB = aBmp.AcquireReadAccess();
-        BitmapWriteAccess*  pW = aDither.AcquireWriteAccess();
+        Bitmap				aDither( aBmp.GetSizePixel(), 8 );
+        BitmapColor 		aIndex( 0 );
+        BitmapReadAccess*	pB = aBmp.AcquireReadAccess();
+        BitmapWriteAccess*	pW = aDither.AcquireWriteAccess();
 
         if( pB && pP && pA && pW && pAlphaW )
         {
@@ -1666,7 +1666,7 @@ Bitmap OutputDevice::ImplBlendWithAlpha( Bitmap              aBmp,
 
                 for( nX = 0, nOutX = nOffX; nX < nDstWidth; nX++, nOutX++ )
                 {
-                    const long  nMapX = pMapX[ nX ];
+                    const long	nMapX = pMapX[ nX ];
                     const ULONG nD = nVCLDitherLut[ nModY | ( nOutX & 0x0FL ) ];
 
                     aSrcCol = pP->GetColor( nMapY, nMapX );
@@ -1703,12 +1703,12 @@ Bitmap OutputDevice::ImplBlendWithAlpha( Bitmap              aBmp,
     }
     else
     {
-        BitmapWriteAccess*  pB = aBmp.AcquireWriteAccess();
+        BitmapWriteAccess*	pB = aBmp.AcquireWriteAccess();
         if( pP && pA && pB )
         {
             for( nY = 0; nY < nDstHeight; nY++ )
             {
-                const long  nMapY = pMapY[ nY ];
+                const long	nMapY = pMapY[ nY ];
 
                 for( nX = 0; nX < nDstWidth; nX++ )
                 {
@@ -1750,13 +1750,13 @@ Bitmap OutputDevice::ImplBlendWithAlpha( Bitmap              aBmp,
 // ------------------------------------------------------------------------
 
 Bitmap OutputDevice::ImplBlend( Bitmap              aBmp,
-                                BitmapReadAccess*   pP,
-                                BitmapReadAccess*   pA,
-                                const sal_Int32     nOffY,
-                                const sal_Int32     nDstHeight,
-                                const sal_Int32     nOffX,
+                                BitmapReadAccess*	pP,
+                                BitmapReadAccess*	pA,
+                                const sal_Int32     nOffY, 
+                                const sal_Int32     nDstHeight, 
+                                const sal_Int32     nOffX, 
                                 const sal_Int32     nDstWidth,
-                                const Rectangle&    aBmpRect,
+                                const Rectangle&    aBmpRect, 
                                 const Size&         aOutSz,
                                 const bool          bHMirr,
                                 const bool          bVMirr,
@@ -1769,10 +1769,10 @@ Bitmap OutputDevice::ImplBlend( Bitmap              aBmp,
 
     if( GetBitCount() <= 8 )
     {
-        Bitmap              aDither( aBmp.GetSizePixel(), 8 );
-        BitmapColor         aIndex( 0 );
-        BitmapReadAccess*   pB = aBmp.AcquireReadAccess();
-        BitmapWriteAccess*  pW = aDither.AcquireWriteAccess();
+        Bitmap				aDither( aBmp.GetSizePixel(), 8 );
+        BitmapColor 		aIndex( 0 );
+        BitmapReadAccess*	pB = aBmp.AcquireReadAccess();
+        BitmapWriteAccess*	pW = aDither.AcquireWriteAccess();
 
         if( pB && pP && pA && pW )
         {
@@ -1783,7 +1783,7 @@ Bitmap OutputDevice::ImplBlend( Bitmap              aBmp,
 
                 for( nX = 0, nOutX = nOffX; nX < nDstWidth; nX++, nOutX++ )
                 {
-                    const long  nMapX = pMapX[ nX ];
+                    const long	nMapX = pMapX[ nX ];
                     const ULONG nD = nVCLDitherLut[ nModY | ( nOutX & 0x0FL ) ];
 
                     aDstCol = pB->GetColor( nY, nX );
@@ -1802,7 +1802,7 @@ Bitmap OutputDevice::ImplBlend( Bitmap              aBmp,
     }
     else
     {
-        BitmapWriteAccess*  pB = aBmp.AcquireWriteAccess();
+        BitmapWriteAccess*	pB = aBmp.AcquireWriteAccess();
 
         bool bFastBlend = false;
         if( pP && pA && pB )
@@ -1829,9 +1829,9 @@ Bitmap OutputDevice::ImplBlend( Bitmap              aBmp,
                     {
                         for( nY = 0; nY < nDstHeight; nY++ )
                         {
-                            const long  nMapY = pMapY[ nY ];
-                            Scanline    pPScan = pP->GetScanline( nMapY );
-                            Scanline    pAScan = pA->GetScanline( nMapY );
+                            const long	nMapY = pMapY[ nY ];
+                            Scanline	pPScan = pP->GetScanline( nMapY );
+                            Scanline	pAScan = pA->GetScanline( nMapY );
 
                             for( nX = 0; nX < nDstWidth; nX++ )
                             {
@@ -1848,14 +1848,14 @@ Bitmap OutputDevice::ImplBlend( Bitmap              aBmp,
                     {
                         for( nY = 0; nY < nDstHeight; nY++ )
                         {
-                            const long  nMapY = pMapY[ nY ];
-                            Scanline    pPScan = pP->GetScanline( nMapY );
-                            Scanline    pAScan = pA->GetScanline( nMapY );
+                            const long	nMapY = pMapY[ nY ];
+                            Scanline	pPScan = pP->GetScanline( nMapY );
+                            Scanline	pAScan = pA->GetScanline( nMapY );
 
                             for( nX = 0; nX < nDstWidth; nX++ )
                             {
-                                const long  nMapX = pMapX[ nX ];
-                                Scanline    pTmp = pPScan + nMapX * 3;
+                                const long	nMapX = pMapX[ nX ];
+                                Scanline	pTmp = pPScan + nMapX * 3;
 
                                 aDstCol = pB->GetPixel( nY, nX );
                                 pB->SetPixel( nY, nX, aDstCol.Merge( pTmp[ 2 ], pTmp[ 1 ], pTmp[ 0 ],
@@ -1869,13 +1869,13 @@ Bitmap OutputDevice::ImplBlend( Bitmap              aBmp,
                     {
                         for( nY = 0; nY < nDstHeight; nY++ )
                         {
-                            const long  nMapY = pMapY[ nY ];
-                            Scanline    pPScan = pP->GetScanline( nMapY );
-                            Scanline    pAScan = pA->GetScanline( nMapY );
+                            const long	nMapY = pMapY[ nY ];
+                            Scanline	pPScan = pP->GetScanline( nMapY );
+                            Scanline	pAScan = pA->GetScanline( nMapY );
 
                             for( nX = 0; nX < nDstWidth; nX++ )
                             {
-                                const long  nMapX = pMapX[ nX ];
+                                const long	nMapX = pMapX[ nX ];
                                 Scanline    pTmp = pPScan + nMapX * 3;
 
                                 aDstCol = pB->GetPixel( nY, nX );
@@ -1890,8 +1890,8 @@ Bitmap OutputDevice::ImplBlend( Bitmap              aBmp,
                 {
                     for( nY = 0; nY < nDstHeight; nY++ )
                     {
-                        const long  nMapY = pMapY[ nY ];
-                        Scanline    pAScan = pA->GetScanline( nMapY );
+                        const long	nMapY = pMapY[ nY ];
+                        Scanline	pAScan = pA->GetScanline( nMapY );
 
                         for( nX = 0; nX < nDstWidth; nX++ )
                         {
@@ -1920,10 +1920,10 @@ void OutputDevice::ImplDrawAlpha( const Bitmap& rBmp, const AlphaMask& rAlpha,
                                   const Point& rSrcPtPixel, const Size& rSrcSizePixel )
 {
     const Point aNullPt;
-    Point       aOutPt( LogicToPixel( rDestPt ) );
+    Point		aOutPt( LogicToPixel( rDestPt ) );
     Size        aOutSz( LogicToPixel( rDestSize ) );
-    Rectangle   aDstRect( aNullPt, GetOutputSizePixel() );
-    const BOOL  bHMirr = aOutSz.Width() < 0, bVMirr = aOutSz.Height() < 0;
+    Rectangle	aDstRect( aNullPt, GetOutputSizePixel() );
+    const BOOL	bHMirr = aOutSz.Width() < 0, bVMirr = aOutSz.Height() < 0;
 
     if( OUTDEV_WINDOW == meOutDevType )
     {
@@ -1951,7 +1951,7 @@ void OutputDevice::ImplDrawAlpha( const Bitmap& rBmp, const AlphaMask& rAlpha,
         static const char* pDisableNative = getenv( "SAL_DISABLE_NATIVE_ALPHA");
         // #i83087# Naturally, system alpha blending cannot work with
         // separate alpha VDev
-        if( !mpAlphaVDev && !pDisableNative && !bHMirr && !bVMirr )
+        if( !mpAlphaVDev && !pDisableNative && !bHMirr && !bVMirr ) 
         {
             Point aRelPt = aOutPt + Point( mnOutOffX, mnOutOffY );
             SalTwoRect aTR = {
@@ -1969,11 +1969,11 @@ void OutputDevice::ImplDrawAlpha( const Bitmap& rBmp, const AlphaMask& rAlpha,
 
         Rectangle aBmpRect( aNullPt, rBmp.GetSizePixel() );
         if( !bNativeAlpha
-                &&  !aBmpRect.Intersection( Rectangle( rSrcPtPixel, rSrcSizePixel ) ).IsEmpty() )
+                &&  !aBmpRect.Intersection( Rectangle( rSrcPtPixel, rSrcSizePixel ) ).IsEmpty() ) 
         {
-            GDIMetaFile*    pOldMetaFile = mpMetaFile; mpMetaFile = NULL;
-            const BOOL      bOldMap = mbMap; mbMap = FALSE;
-            Bitmap          aBmp( GetBitmap( aDstRect.TopLeft(), aDstRect.GetSize() ) );
+            GDIMetaFile*	pOldMetaFile = mpMetaFile; mpMetaFile = NULL;
+            const BOOL		bOldMap = mbMap; mbMap = FALSE;
+            Bitmap			aBmp( GetBitmap( aDstRect.TopLeft(), aDstRect.GetSize() ) );
 
             // #109044# The generated bitmap need not necessarily be
             // of aDstRect dimensions, it's internally clipped to
@@ -1984,16 +1984,16 @@ void OutputDevice::ImplDrawAlpha( const Bitmap& rBmp, const AlphaMask& rAlpha,
             if( aBmp.ImplGetImpBitmap() )
                 aDstRect.SetSize( aBmp.GetSizePixel() );
 
-            BitmapColor     aDstCol;
-            const long      nSrcWidth = aBmpRect.GetWidth(), nSrcHeight = aBmpRect.GetHeight();
-            const long      nDstWidth = aDstRect.GetWidth(), nDstHeight = aDstRect.GetHeight();
-            const long      nOutWidth = aOutSz.Width(), nOutHeight = aOutSz.Height();
-            const long      nOffX = aDstRect.Left() - aOutPt.X(), nOffY = aDstRect.Top() - aOutPt.Y();
-            long            nX, nOutX, nY, nOutY;
-            long            nMirrOffX = 0;
-            long            nMirrOffY = 0;
-            long*           pMapX = new long[ nDstWidth ];
-            long*           pMapY = new long[ nDstHeight ];
+            BitmapColor 	aDstCol;
+            const long		nSrcWidth = aBmpRect.GetWidth(), nSrcHeight = aBmpRect.GetHeight();
+            const long		nDstWidth = aDstRect.GetWidth(), nDstHeight = aDstRect.GetHeight();
+            const long		nOutWidth = aOutSz.Width(), nOutHeight = aOutSz.Height();
+            const long		nOffX = aDstRect.Left() - aOutPt.X(), nOffY = aDstRect.Top() - aOutPt.Y();
+            long			nX, nOutX, nY, nOutY;
+            long			nMirrOffX = 0;
+            long			nMirrOffY = 0;
+            long*			pMapX = new long[ nDstWidth ];
+            long*			pMapY = new long[ nDstHeight ];
 
             // create horizontal mapping table
             if( bHMirr )
@@ -2006,7 +2006,7 @@ void OutputDevice::ImplDrawAlpha( const Bitmap& rBmp, const AlphaMask& rAlpha,
                 if( bHMirr )
                     pMapX[ nX ] = nMirrOffX - pMapX[ nX ];
             }
-
+            
             // create vertical mapping table
             if( bVMirr )
                 nMirrOffY = ( aBmpRect.Top() << 1 ) + nSrcHeight - 1;
@@ -2019,11 +2019,11 @@ void OutputDevice::ImplDrawAlpha( const Bitmap& rBmp, const AlphaMask& rAlpha,
                     pMapY[ nY ] = nMirrOffY - pMapY[ nY ];
             }
 
-            BitmapReadAccess*   pP = ( (Bitmap&) rBmp ).AcquireReadAccess();
-            BitmapReadAccess*   pA = ( (AlphaMask&) rAlpha ).AcquireReadAccess();
+            BitmapReadAccess*	pP = ( (Bitmap&) rBmp ).AcquireReadAccess();
+            BitmapReadAccess*	pA = ( (AlphaMask&) rAlpha ).AcquireReadAccess();
 
             DBG_ASSERT( pA->GetScanlineFormat() == BMP_FORMAT_8BIT_PAL ||
-                        pA->GetScanlineFormat() == BMP_FORMAT_8BIT_TC_MASK,
+                        pA->GetScanlineFormat() == BMP_FORMAT_8BIT_TC_MASK, 
                         "OutputDevice::ImplDrawAlpha(): non-8bit alpha no longer supported!" );
 
             // #i38887# reading from screen may sometimes fail
@@ -2056,13 +2056,13 @@ void OutputDevice::ImplDrawAlpha( const Bitmap& rBmp, const AlphaMask& rAlpha,
                 if( mpAlphaVDev )
                     mpAlphaVDev = NULL;
 
-                DrawBitmap( aDstRect.TopLeft(),
+                DrawBitmap( aDstRect.TopLeft(), 
                             aTmp );
 
                 // #110958# Enable alpha VDev again
                 mpAlphaVDev = pOldVDev;
             }
-
+            
             ( (Bitmap&) rBmp ).ReleaseAccess( pP );
             ( (AlphaMask&) rAlpha ).ReleaseAccess( pA );
 
@@ -2080,17 +2080,17 @@ void OutputDevice::ImplPrintTransparent( const Bitmap& rBmp, const Bitmap& rMask
                                          const Point& rDestPt, const Size& rDestSize,
                                          const Point& rSrcPtPixel, const Size& rSrcSizePixel )
 {
-    Point       aPt;
-    Point       aDestPt( LogicToPixel( rDestPt ) );
-    Size        aDestSz( LogicToPixel( rDestSize ) );
-    Rectangle   aSrcRect( rSrcPtPixel, rSrcSizePixel );
+    Point		aPt;
+    Point		aDestPt( LogicToPixel( rDestPt ) );
+    Size		aDestSz( LogicToPixel( rDestSize ) );
+    Rectangle	aSrcRect( rSrcPtPixel, rSrcSizePixel );
 
     aSrcRect.Justify();
 
     if( !rBmp.IsEmpty() && aSrcRect.GetWidth() && aSrcRect.GetHeight() && aDestSz.Width() && aDestSz.Height() )
     {
-        Bitmap  aPaint( rBmp ), aMask( rMask );
-        ULONG   nMirrFlags = 0UL;
+        Bitmap	aPaint( rBmp ), aMask( rMask );
+        ULONG	nMirrFlags = 0UL;
 
         if( aMask.GetBitCount() > 1 )
             aMask.Convert( BMP_CONVERSION_1BIT_THRESHOLD );
@@ -2133,11 +2133,11 @@ void OutputDevice::ImplPrintTransparent( const Bitmap& rBmp, const Bitmap& rMask
         }
 
         // do painting
-        const long      nSrcWidth = aSrcRect.GetWidth(), nSrcHeight = aSrcRect.GetHeight();
-        long            nX, nY, nWorkX, nWorkY, nWorkWidth, nWorkHeight;
-        long*           pMapX = new long[ nSrcWidth + 1 ];
-        long*           pMapY = new long[ nSrcHeight + 1 ];
-        const BOOL      bOldMap = mbMap;
+        const long		nSrcWidth = aSrcRect.GetWidth(), nSrcHeight = aSrcRect.GetHeight();
+        long			nX, nY, nWorkX, nWorkY, nWorkWidth, nWorkHeight;
+        long*			pMapX = new long[ nSrcWidth + 1 ];
+        long*			pMapY = new long[ nSrcHeight + 1 ];
+        const BOOL		bOldMap = mbMap;
 
         mbMap = FALSE;
 
@@ -2147,10 +2147,10 @@ void OutputDevice::ImplPrintTransparent( const Bitmap& rBmp, const Bitmap& rMask
 
         for( nY = 0L; nY <= nSrcHeight; nY++ )
             pMapY[ nY ] = aDestPt.Y() + FRound( (double) aDestSz.Height() * nY / nSrcHeight );
-
+    
         // walk through all rectangles of mask
         Region          aWorkRgn( aMask.CreateRegion( COL_BLACK, Rectangle( Point(), aMask.GetSizePixel() ) ) );
-        ImplRegionInfo  aInfo;
+        ImplRegionInfo	aInfo;
         BOOL            bRgnRect = aWorkRgn.ImplGetFirstRect( aInfo, nWorkX, nWorkY, nWorkWidth, nWorkHeight );
 
         while( bRgnRect )
@@ -2159,7 +2159,7 @@ void OutputDevice::ImplPrintTransparent( const Bitmap& rBmp, const Bitmap& rMask
             const Rectangle aBandRect( Point( nWorkX, nWorkY ), Size( nWorkWidth, nWorkHeight ) );
             const Point     aMapPt( pMapX[ nWorkX ], pMapY[ nWorkY ] );
             const Size      aMapSz( pMapX[ nWorkX + nWorkWidth ] - aMapPt.X(), pMapY[ nWorkY + nWorkHeight ] - aMapPt.Y() );
-
+            
             aBandBmp.Crop( aBandRect );
             ImplDrawBitmap( aMapPt, aMapSz, Point(), aBandBmp.GetSizePixel(), aBandBmp, META_BMPSCALEPART_ACTION );
             bRgnRect = aWorkRgn.ImplGetNextRect( aInfo, nWorkX, nWorkY, nWorkWidth, nWorkHeight );
@@ -2178,17 +2178,17 @@ void OutputDevice::ImplPrintMask( const Bitmap& rMask, const Color& rMaskColor,
                                   const Point& rDestPt, const Size& rDestSize,
                                   const Point& rSrcPtPixel, const Size& rSrcSizePixel )
 {
-    Point       aPt;
-    Point       aDestPt( LogicToPixel( rDestPt ) );
-    Size        aDestSz( LogicToPixel( rDestSize ) );
-    Rectangle   aSrcRect( rSrcPtPixel, rSrcSizePixel );
+    Point		aPt;
+    Point		aDestPt( LogicToPixel( rDestPt ) );
+    Size		aDestSz( LogicToPixel( rDestSize ) );
+    Rectangle	aSrcRect( rSrcPtPixel, rSrcSizePixel );
 
     aSrcRect.Justify();
 
     if( !rMask.IsEmpty() && aSrcRect.GetWidth() && aSrcRect.GetHeight() && aDestSz.Width() && aDestSz.Height() )
     {
-        Bitmap  aMask( rMask );
-        ULONG   nMirrFlags = 0UL;
+        Bitmap	aMask( rMask );
+        ULONG	nMirrFlags = 0UL;
 
         if( aMask.GetBitCount() > 1 )
             aMask.Convert( BMP_CONVERSION_1BIT_THRESHOLD );
@@ -2218,12 +2218,12 @@ void OutputDevice::ImplPrintMask( const Bitmap& rMask, const Color& rMaskColor,
             aMask.Mirror( nMirrFlags );
 
         // do painting
-        const long      nSrcWidth = aSrcRect.GetWidth(), nSrcHeight = aSrcRect.GetHeight();
-        long            nX, nY, nWorkX, nWorkY, nWorkWidth, nWorkHeight;
-        long*           pMapX = new long[ nSrcWidth + 1 ];
-        long*           pMapY = new long[ nSrcHeight + 1 ];
+        const long		nSrcWidth = aSrcRect.GetWidth(), nSrcHeight = aSrcRect.GetHeight();
+        long			nX, nY, nWorkX, nWorkY, nWorkWidth, nWorkHeight;
+        long*			pMapX = new long[ nSrcWidth + 1 ];
+        long*			pMapY = new long[ nSrcHeight + 1 ];
         GDIMetaFile*    pOldMetaFile = mpMetaFile;
-        const BOOL      bOldMap = mbMap;
+        const BOOL		bOldMap = mbMap;
 
         mpMetaFile = NULL;
         mbMap = FALSE;
@@ -2239,10 +2239,10 @@ void OutputDevice::ImplPrintMask( const Bitmap& rMask, const Color& rMaskColor,
 
         for( nY = 0L; nY <= nSrcHeight; nY++ )
             pMapY[ nY ] = aDestPt.Y() + FRound( (double) aDestSz.Height() * nY / nSrcHeight );
-
+    
         // walk through all rectangles of mask
         Region          aWorkRgn( aMask.CreateRegion( COL_BLACK, Rectangle( Point(), aMask.GetSizePixel() ) ) );
-        ImplRegionInfo  aInfo;
+        ImplRegionInfo	aInfo;
         BOOL            bRgnRect = aWorkRgn.ImplGetFirstRect( aInfo, nWorkX, nWorkY, nWorkWidth, nWorkHeight );
 
         while( bRgnRect )
diff --git a/vcl/source/gdi/outdev3.cxx b/vcl/source/gdi/outdev3.cxx
index bf1cc2728bf1..c39be173de30 100644
--- a/vcl/source/gdi/outdev3.cxx
+++ b/vcl/source/gdi/outdev3.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
@@ -435,7 +435,7 @@ bool ImplDirectFontSubstitution::GetFontSubstitute( int nIndex,
     String& rFontName, String& rSubstFontName, USHORT& rFlags ) const
 {
     FontSubstList::const_iterator it = maFontSubstList.begin();
-    for( int nCount = 0; (it != maFontSubstList.end()) && (nCount++ != nIndex); ++it ) ;
+    for( int nCount = 0; (it != maFontSubstList.end()) && (nCount++ != nIndex); ++it ) ;    
     if( it == maFontSubstList.end() )
         return false;
 
@@ -563,7 +563,7 @@ Font OutputDevice::GetDefaultFont( USHORT nType, LanguageType eLang,
         case DEFAULTFONT_CJK_SPREADSHEET:
         case DEFAULTFONT_CJK_HEADING:
         case DEFAULTFONT_CJK_DISPLAY:
-            aFont.SetFamily( FAMILY_SYSTEM );   // don't care, but don't use font subst config later...
+            aFont.SetFamily( FAMILY_SYSTEM );	// don't care, but don't use font subst config later...
             break;
 
         case DEFAULTFONT_CTL_TEXT:
@@ -571,7 +571,7 @@ Font OutputDevice::GetDefaultFont( USHORT nType, LanguageType eLang,
         case DEFAULTFONT_CTL_SPREADSHEET:
         case DEFAULTFONT_CTL_HEADING:
         case DEFAULTFONT_CTL_DISPLAY:
-            aFont.SetFamily( FAMILY_SYSTEM );   // don't care, but don't use font subst config later...
+            aFont.SetFamily( FAMILY_SYSTEM );	// don't care, but don't use font subst config later...
             break;
     }
 
@@ -659,35 +659,35 @@ Font OutputDevice::GetDefaultFont( USHORT nType, LanguageType eLang,
     const char* s = "DEFAULTFONT_SANS_UNKNOWN";
     switch ( nType )
     {
-    case DEFAULTFONT_SANS_UNICODE:  s = "DEFAULTFONT_SANS_UNICODE"; break;
-    case DEFAULTFONT_UI_SANS:   s = "DEFAULTFONT_UI_SANS"; break;
+    case DEFAULTFONT_SANS_UNICODE:	s = "DEFAULTFONT_SANS_UNICODE"; break;
+    case DEFAULTFONT_UI_SANS:	s = "DEFAULTFONT_UI_SANS"; break;
 
-    case DEFAULTFONT_SANS:  s = "DEFAULTFONT_SANS"; break;
-    case DEFAULTFONT_LATIN_HEADING: s = "DEFAULTFONT_LATIN_HEADING"; break;
-    case DEFAULTFONT_LATIN_SPREADSHEET: s = "DEFAULTFONT_LATIN_SPREADSHEET"; break;
-    case DEFAULTFONT_LATIN_DISPLAY: s = "DEFAULTFONT_LATIN_DISPLAY"; break;
+    case DEFAULTFONT_SANS:	s = "DEFAULTFONT_SANS"; break;
+    case DEFAULTFONT_LATIN_HEADING:	s = "DEFAULTFONT_LATIN_HEADING"; break;
+    case DEFAULTFONT_LATIN_SPREADSHEET:	s = "DEFAULTFONT_LATIN_SPREADSHEET"; break;
+    case DEFAULTFONT_LATIN_DISPLAY:	s = "DEFAULTFONT_LATIN_DISPLAY"; break;
 
-    case DEFAULTFONT_SERIF: s = "DEFAULTFONT_SERIF"; break;
-    case DEFAULTFONT_LATIN_TEXT:    s = "DEFAULTFONT_LATIN_TEXT"; break;
-    case DEFAULTFONT_LATIN_PRESENTATION:    s = "DEFAULTFONT_LATIN_PRESENTATION"; break;
+    case DEFAULTFONT_SERIF:	s = "DEFAULTFONT_SERIF"; break;
+    case DEFAULTFONT_LATIN_TEXT:	s = "DEFAULTFONT_LATIN_TEXT"; break;
+    case DEFAULTFONT_LATIN_PRESENTATION:	s = "DEFAULTFONT_LATIN_PRESENTATION"; break;
 
-    case DEFAULTFONT_FIXED: s = "DEFAULTFONT_FIXED"; break;
-    case DEFAULTFONT_LATIN_FIXED:   s = "DEFAULTFONT_LATIN_FIXED"; break;
-    case DEFAULTFONT_UI_FIXED:  s = "DEFAULTFONT_UI_FIXED"; break;
+    case DEFAULTFONT_FIXED:	s = "DEFAULTFONT_FIXED"; break;
+    case DEFAULTFONT_LATIN_FIXED:	s = "DEFAULTFONT_LATIN_FIXED"; break;
+    case DEFAULTFONT_UI_FIXED:	s = "DEFAULTFONT_UI_FIXED"; break;
 
-    case DEFAULTFONT_SYMBOL:    s = "DEFAULTFONT_SYMBOL"; break;
+    case DEFAULTFONT_SYMBOL:	s = "DEFAULTFONT_SYMBOL"; break;
 
-    case DEFAULTFONT_CJK_TEXT:  s = "DEFAULTFONT_CJK_TEXT"; break;
-    case DEFAULTFONT_CJK_PRESENTATION:  s = "DEFAULTFONT_CJK_PRESENTATION"; break;
-    case DEFAULTFONT_CJK_SPREADSHEET:   s = "DEFAULTFONT_CJK_SPREADSHEET"; break;
-    case DEFAULTFONT_CJK_HEADING:   s = "DEFAULTFONT_CJK_HEADING"; break;
-    case DEFAULTFONT_CJK_DISPLAY:   s = "DEFAULTFONT_CJK_DISPLAY"; break;
+    case DEFAULTFONT_CJK_TEXT:	s = "DEFAULTFONT_CJK_TEXT"; break;
+    case DEFAULTFONT_CJK_PRESENTATION:	s = "DEFAULTFONT_CJK_PRESENTATION"; break;
+    case DEFAULTFONT_CJK_SPREADSHEET:	s = "DEFAULTFONT_CJK_SPREADSHEET"; break;
+    case DEFAULTFONT_CJK_HEADING:	s = "DEFAULTFONT_CJK_HEADING"; break;
+    case DEFAULTFONT_CJK_DISPLAY:	s = "DEFAULTFONT_CJK_DISPLAY"; break;
 
-    case DEFAULTFONT_CTL_TEXT:  s = "DEFAULTFONT_CTL_TEXT"; break;
-    case DEFAULTFONT_CTL_PRESENTATION:  s = "DEFAULTFONT_CTL_PRESENTATION"; break;
-    case DEFAULTFONT_CTL_SPREADSHEET:   s = "DEFAULTFONT_CTL_SPREADSHEET"; break;
-    case DEFAULTFONT_CTL_HEADING:   s = "DEFAULTFONT_CTL_HEADING"; break;
-    case DEFAULTFONT_CTL_DISPLAY:   s = "DEFAULTFONT_CTL_DISPLAY"; break;
+    case DEFAULTFONT_CTL_TEXT:	s = "DEFAULTFONT_CTL_TEXT"; break;
+    case DEFAULTFONT_CTL_PRESENTATION:	s = "DEFAULTFONT_CTL_PRESENTATION"; break;
+    case DEFAULTFONT_CTL_SPREADSHEET:	s = "DEFAULTFONT_CTL_SPREADSHEET"; break;
+    case DEFAULTFONT_CTL_HEADING:	s = "DEFAULTFONT_CTL_HEADING"; break;
+    case DEFAULTFONT_CTL_DISPLAY:	s = "DEFAULTFONT_CTL_DISPLAY"; break;
     }
     fprintf( stderr, "   OutputDevice::GetDefaultFont() Type=\"%s\" lang=%d flags=%ld FontName=\"%s\"\n",
          s, eLang, nFlags,
@@ -3270,7 +3270,7 @@ ImplFontMetricData::ImplFontMetricData( const ImplFontSelectData& rFontSelData )
     mnWidth        = rFontSelData.mnWidth;
     mnOrientation  = sal::static_int_cast<short>(rFontSelData.mnOrientation);
 
-    // intialize the used font name
+    // intialize the used font name 
     if( rFontSelData.mpFontData )
     {
         maName     = rFontSelData.mpFontData->maName;
@@ -3287,7 +3287,7 @@ ImplFontMetricData::ImplFontMetricData( const ImplFontSelectData& rFontSelData )
         mbKernableFont = false;
     }
 
-    // reset metrics that are usually measured for the font instance
+    // reset metrics that are usually measured for the font instance 
     mnAscent       = 0;
     mnDescent      = 0;
     mnIntLeading   = 0;
@@ -3993,7 +3993,7 @@ void OutputDevice::ImplDrawStrikeoutChar( long nBaseX, long nBaseY,
     SalLayout* pLayout = ImplLayout( aStrikeoutTest, 0, nTestStrLen );
     if( pLayout )
     {
-        nStrikeoutWidth = (pLayout->GetTextWidth() +nTestStrLen/2) / (nTestStrLen * pLayout->GetUnitsPerPixel());
+        nStrikeoutWidth = (pLayout->GetTextWidth() +nTestStrLen/2) / (nTestStrLen * pLayout->GetUnitsPerPixel());        
         pLayout->Release();
     }
     if( nStrikeoutWidth <= 0 ) // sanity check
@@ -4747,7 +4747,7 @@ long OutputDevice::ImplGetTextLines( ImplMultiTextLineInfo& rLineInfo,
         uno::Reference < i18n::XBreakIterator > xBI;
         // get service provider
         uno::Reference< lang::XMultiServiceFactory > xSMgr( unohelper::GetMultiServiceFactory() );
-
+        
         uno::Reference< linguistic2::XHyphenator > xHyph;
         if( xSMgr.is() )
         {
@@ -4757,7 +4757,7 @@ long OutputDevice::ImplGetTextLines( ImplMultiTextLineInfo& rLineInfo,
                 xHyph = xLinguMgr->getHyphenator();
             }
         }
-
+        
         i18n::LineBreakHyphenationOptions aHyphOptions( xHyph, uno::Sequence <beans::PropertyValue>(), 1 );
         i18n::LineBreakUserOptions aUserOptions;
 
@@ -4799,8 +4799,8 @@ long OutputDevice::ImplGetTextLines( ImplMultiTextLineInfo& rLineInfo,
                             sal_Unicode cAlternateReplChar = 0;
                             sal_Unicode cAlternateExtraChar = 0;
                             i18n::Boundary aBoundary = xBI->getWordBoundary( aText, nBreakPos, rDefLocale, ::com::sun::star::i18n::WordType::DICTIONARY_WORD, sal_True );
-                //          sal_uInt16 nWordStart = nBreakPos;
-                //          sal_uInt16 nBreakPos_OLD = nBreakPos;
+                //		    sal_uInt16 nWordStart = nBreakPos;
+                //		    sal_uInt16 nBreakPos_OLD = nBreakPos;
                             sal_uInt16 nWordStart = nPos;
                             sal_uInt16 nWordEnd = (USHORT) aBoundary.endPos;
                             DBG_ASSERT( nWordEnd > nWordStart, "ImpBreakLine: Start >= End?" );
@@ -4811,7 +4811,7 @@ long OutputDevice::ImplGetTextLines( ImplMultiTextLineInfo& rLineInfo,
                                 // #104415# May happen, because getLineBreak may differ from getWordBoudary with DICTIONARY_WORD
                                 // DBG_ASSERT( nWordEnd >= nMaxBreakPos, "Hyph: Break?" );
                                 String aWord( aText, nWordStart, nWordLen );
-                                sal_uInt16 nMinTrail = static_cast<sal_uInt16>(nWordEnd-nSoftBreak+1);  //+1: Vor dem angeknacksten Buchstaben
+                                sal_uInt16 nMinTrail = static_cast<sal_uInt16>(nWordEnd-nSoftBreak+1); 	//+1: Vor dem angeknacksten Buchstaben
                                 uno::Reference< linguistic2::XHyphenatedWord > xHyphWord;
                                 if (xHyph.is())
                                     xHyphWord = xHyph->hyphenate( aWord, rDefLocale, aWord.Len() - nMinTrail, uno::Sequence< beans::PropertyValue >() );
@@ -4900,7 +4900,7 @@ long OutputDevice::ImplGetTextLines( ImplMultiTextLineInfo& rLineInfo,
                             nW = _rLayout.GetTextWidth( rStr, nPos, nSpacePos-nPos );
                         }
                     } while( nW > nWidth );
-
+                    
                     if( nSpacePos != STRING_NOTFOUND )
                     {
                         nBreakPos = nSpacePos;
@@ -6069,7 +6069,7 @@ SalLayout* OutputDevice::ImplGlyphFallbackLayout( SalLayout* pSalLayout, ImplLay
     for( int nFallbackLevel = 1; nFallbackLevel < MAX_FALLBACK; ++nFallbackLevel )
     {
         // find a font family suited for glyph fallback
-#ifndef FONTFALLBACK_HOOKS_DISABLED
+#ifndef FONTFALLBACK_HOOKS_DISABLED 
         // GetGlyphFallbackFont() needs a valid aFontSelData.mpFontEntry
         // if the system-specific glyph fallback is active
         aFontSelData.mpFontEntry = mpFontEntry; // reset the fontentry to base-level
@@ -6276,11 +6276,11 @@ void OutputDevice::ImplDrawText( OutputDevice& rTargetDevice, const Rectangle& r
                 // but it may be totally wrong. the background color
                 // was typically already reset
                 aCol = rStyleSettings.GetFaceColor();
-
+    
             bHighContrastBlack = aCol.IsDark();
             bHighContrastWhite = aCol.IsBright();
         }
-
+    
         aOldTextColor = rTargetDevice.GetTextColor();
         if ( rTargetDevice.IsTextFillColor() )
         {
@@ -6962,7 +6962,7 @@ void OutputDevice::DrawCtrlText( const Point& rPos, const XubString& rStr,
                 bHighContrastWhite = aCol.IsBright();
             }
         }
-
+        
         aOldTextColor = GetTextColor();
         if ( IsTextFillColor() )
         {
@@ -7277,7 +7277,7 @@ SystemFontData OutputDevice::GetSysFontData(int nFallbacklevel) const
 
     if (!mpGraphics) ImplGetGraphics();
     if (mpGraphics) aSysFontData = mpGraphics->GetSysFontData(nFallbacklevel);
-
+    
     return aSysFontData;
 }
 
@@ -7294,7 +7294,7 @@ SystemFontData OutputDevice::GetSysFontData(int nFallbacklevel) const
  *
  * Export finalized glyph layout data as platform independent SystemTextLayoutData
  * (see vcl/inc/vcl/sysdata.hxx)
- *
+ * 
  * Only parameters rStartPt and rStr are mandatory, the rest is optional
  * (default values will be used)
  *
@@ -7309,18 +7309,18 @@ SystemTextLayoutData OutputDevice::GetSysTextLayoutData(const Point& rStartPt, c
     SystemTextLayoutData aSysLayoutData;
     aSysLayoutData.nSize = sizeof(aSysLayoutData);
     aSysLayoutData.rGlyphData.reserve( 256 );
-
+    
     if ( mpMetaFile ) {
         if (pDXAry)
             mpMetaFile->AddAction( new MetaTextArrayAction( rStartPt, rStr, pDXAry, nIndex, nLen ) );
         else
             mpMetaFile->AddAction( new MetaTextAction( rStartPt, rStr, nIndex, nLen ) );
     }
-
+    
     if ( !IsDeviceOutputNecessary() ) return aSysLayoutData;
-
+    
     SalLayout* rLayout = ImplLayout( rStr, nIndex, nLen, rStartPt, 0, pDXAry, true );
-
+    
     // setup glyphs
     Point aPos;
     sal_GlyphId aGlyphId;
@@ -7329,7 +7329,7 @@ SystemTextLayoutData OutputDevice::GetSysTextLayoutData(const Point& rStartPt, c
     {
         // NOTE: Windows backend is producing unicode chars (ucs4), so on windows,
         //       ETO_GLYPH_INDEX is unusable, unless extra glyph conversion is made.
-
+            
         SystemGlyphData aGlyph;
         aGlyph.index = static_cast<unsigned long> (aGlyphId & GF_IDXMASK);
         aGlyph.x = aPos.X();
@@ -7344,7 +7344,7 @@ SystemTextLayoutData OutputDevice::GetSysTextLayoutData(const Point& rStartPt, c
     // Get font data
     aSysLayoutData.aSysFontData = GetSysFontData(nFallbacklevel);
     aSysLayoutData.orientation = rLayout->GetOrientation();
-
+    
     rLayout->Release();
 
     return aSysLayoutData;
@@ -7377,9 +7377,9 @@ long OutputDevice::GetMinKashida( const Font& rFont ) const
 }
 
 // -----------------------------------------------------------------------
-xub_StrLen OutputDevice::ValidateKashidas ( const String& rTxt,
+xub_StrLen OutputDevice::ValidateKashidas ( const String& rTxt, 
                                             xub_StrLen nIdx, xub_StrLen nLen,
-                                            xub_StrLen nKashCount,
+                                            xub_StrLen nKashCount, 
                                             const xub_StrLen* pKashidaPos,
                                             xub_StrLen* pKashidaPosDropped ) const
 {
@@ -7863,7 +7863,7 @@ BOOL OutputDevice::GetTextOutlines( ::basegfx::B2DPolyPolygonVector& rVector,
                 // ignore "empty" glyphs:
                 if( aPolyPoly.Count() > 0 )
                 {
-                    // convert  to B2DPolyPolygon
+                    // convert	to B2DPolyPolygon
                     // TODO: get rid of intermediate tool's PolyPolygon
                     ::basegfx::B2DPolyPolygon aB2DPolyPoly = aPolyPoly.getB2DPolyPolygon();
                     ::basegfx::B2DHomMatrix aMatrix;
@@ -7960,7 +7960,7 @@ BOOL OutputDevice::GetFontCharMap( FontCharMap& rFontCharMap ) const
     for( i = nUsedItems; --i >= 0; )
         if( pFontData == aCache[i].mpFontData )
             break;
-    if( i >= 0 )    // found in cache
+    if( i >= 0 )	// found in cache
     {
         rFontCharMap.Reset( aCache[i].maCharMap.mpImpl );
     }
diff --git a/vcl/source/gdi/outdev4.cxx b/vcl/source/gdi/outdev4.cxx
index 8ad02ed2d818..6c0fef233a9e 100644
--- a/vcl/source/gdi/outdev4.cxx
+++ b/vcl/source/gdi/outdev4.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
@@ -56,8 +56,8 @@
 // - Defines -
 // -----------
 
-#define HATCH_MAXPOINTS             1024
-#define GRADIENT_DEFAULT_STEPCOUNT  0
+#define HATCH_MAXPOINTS				1024
+#define GRADIENT_DEFAULT_STEPCOUNT	0
 
 // ----------------
 // - Cmp-Function -
@@ -112,9 +112,9 @@ void OutputDevice::ImplDrawPolyPolygon( const PolyPolygon& rPolyPoly, const Poly
 
     if( pPolyPoly->Count() == 1 )
     {
-        const Polygon   rPoly = pPolyPoly->GetObject( 0 );
-        USHORT          nSize = rPoly.GetSize();
-
+        const Polygon	rPoly = pPolyPoly->GetObject( 0 );
+        USHORT			nSize = rPoly.GetSize();
+        
         if( nSize >= 2 )
         {
             const SalPoint* pPtAry = (const SalPoint*)rPoly.GetConstPointAry();
@@ -123,17 +123,17 @@ void OutputDevice::ImplDrawPolyPolygon( const PolyPolygon& rPolyPoly, const Poly
     }
     else if( pPolyPoly->Count() )
     {
-        USHORT              nCount = pPolyPoly->Count();
-        sal_uInt32*         pPointAry = new sal_uInt32[nCount];
-        PCONSTSALPOINT*     pPointAryAry = new PCONSTSALPOINT[nCount];
-        USHORT              i = 0;
+        USHORT				nCount = pPolyPoly->Count();
+        sal_uInt32*			pPointAry = new sal_uInt32[nCount];
+        PCONSTSALPOINT* 	pPointAryAry = new PCONSTSALPOINT[nCount];
+        USHORT				i = 0;
         do
         {
-            const Polygon&  rPoly = pPolyPoly->GetObject( i );
-            USHORT          nSize = rPoly.GetSize();
+            const Polygon&	rPoly = pPolyPoly->GetObject( i );
+            USHORT			nSize = rPoly.GetSize();
             if ( nSize )
             {
-                pPointAry[i]    = nSize;
+                pPointAry[i]	= nSize;
                 pPointAryAry[i] = (PCONSTSALPOINT)rPoly.GetConstPointAry();
                 i++;
             }
@@ -146,7 +146,7 @@ void OutputDevice::ImplDrawPolyPolygon( const PolyPolygon& rPolyPoly, const Poly
             mpGraphics->DrawPolygon( *pPointAry, *pPointAryAry, this );
         else
             mpGraphics->DrawPolyPolygon( nCount, pPointAry, pPointAryAry, this );
-
+        
         delete[] pPointAry;
         delete[] pPointAryAry;
     }
@@ -179,26 +179,26 @@ void OutputDevice::ImplDrawLinearGradient( const Rectangle& rRect,
     aRect.Top()--;
     aRect.Right()++;
     aRect.Bottom()++;
-    USHORT  nAngle = rGradient.GetAngle() % 3600;
-    double  fAngle  = nAngle * F_PI1800;
-    double  fWidth  = aRect.GetWidth();
-    double  fHeight = aRect.GetHeight();
-    double  fDX     = fWidth  * fabs( cos( fAngle ) ) +
+    USHORT	nAngle = rGradient.GetAngle() % 3600;
+    double	fAngle	= nAngle * F_PI1800;
+    double	fWidth	= aRect.GetWidth();
+    double	fHeight = aRect.GetHeight();
+    double	fDX 	= fWidth  * fabs( cos( fAngle ) ) +
                       fHeight * fabs( sin( fAngle ) );
-    double  fDY     = fHeight * fabs( cos( fAngle ) ) +
+    double	fDY 	= fHeight * fabs( cos( fAngle ) ) +
                       fWidth  * fabs( sin( fAngle ) );
-            fDX     = (fDX - fWidth)  * 0.5 + 0.5;
-            fDY     = (fDY - fHeight) * 0.5 + 0.5;
+            fDX 	= (fDX - fWidth)  * 0.5 + 0.5;
+            fDY 	= (fDY - fHeight) * 0.5 + 0.5;
     aRect.Left()   -= (long)fDX;
     aRect.Right()  += (long)fDX;
     aRect.Top()    -= (long)fDY;
     aRect.Bottom() += (long)fDY;
 
     // Rand berechnen und Rechteck neu setzen
-    Point       aCenter = rRect.Center();
-    Rectangle   aFullRect = aRect;
-    long        nBorder = (long)rGradient.GetBorder() * aRect.GetHeight() / 100;
-    BOOL        bLinear;
+    Point		aCenter = rRect.Center();
+    Rectangle	aFullRect = aRect;
+    long		nBorder = (long)rGradient.GetBorder() * aRect.GetHeight() / 100;
+    BOOL		bLinear;
 
     // Rand berechnen und Rechteck neu setzen fuer linearen Farbverlauf
     if ( rGradient.GetStyle() == GRADIENT_LINEAR )
@@ -223,35 +223,35 @@ void OutputDevice::ImplDrawLinearGradient( const Rectangle& rRect,
 
     // Intensitaeten von Start- und Endfarbe ggf. aendern und
     // Farbschrittweiten berechnen
-    long            nFactor;
-    Color           aStartCol   = rGradient.GetStartColor();
-    Color           aEndCol     = rGradient.GetEndColor();
-    long            nStartRed   = aStartCol.GetRed();
-    long            nStartGreen = aStartCol.GetGreen();
-    long            nStartBlue  = aStartCol.GetBlue();
-    long            nEndRed     = aEndCol.GetRed();
-    long            nEndGreen   = aEndCol.GetGreen();
-    long            nEndBlue    = aEndCol.GetBlue();
-                    nFactor     = rGradient.GetStartIntensity();
-                    nStartRed   = (nStartRed   * nFactor) / 100;
+    long			nFactor;
+    Color			aStartCol	= rGradient.GetStartColor();
+    Color			aEndCol 	= rGradient.GetEndColor();
+    long			nStartRed	= aStartCol.GetRed();
+    long			nStartGreen = aStartCol.GetGreen();
+    long			nStartBlue	= aStartCol.GetBlue();
+    long			nEndRed 	= aEndCol.GetRed();
+    long			nEndGreen	= aEndCol.GetGreen();
+    long			nEndBlue	= aEndCol.GetBlue();
+                    nFactor 	= rGradient.GetStartIntensity();
+                    nStartRed	= (nStartRed   * nFactor) / 100;
                     nStartGreen = (nStartGreen * nFactor) / 100;
-                    nStartBlue  = (nStartBlue  * nFactor) / 100;
-                    nFactor     = rGradient.GetEndIntensity();
-                    nEndRed     = (nEndRed   * nFactor) / 100;
-                    nEndGreen   = (nEndGreen * nFactor) / 100;
-                    nEndBlue    = (nEndBlue  * nFactor) / 100;
-    long            nRedSteps   = nEndRed   - nStartRed;
-    long            nGreenSteps = nEndGreen - nStartGreen;
-    long            nBlueSteps  = nEndBlue  - nStartBlue;
+                    nStartBlue	= (nStartBlue  * nFactor) / 100;
+                    nFactor 	= rGradient.GetEndIntensity();
+                    nEndRed 	= (nEndRed	 * nFactor) / 100;
+                    nEndGreen	= (nEndGreen * nFactor) / 100;
+                    nEndBlue	= (nEndBlue  * nFactor) / 100;
+    long			nRedSteps	= nEndRed	- nStartRed;
+    long			nGreenSteps = nEndGreen - nStartGreen;
+    long			nBlueSteps	= nEndBlue	- nStartBlue;
     long            nStepCount = rGradient.GetSteps();
 
     // Bei nicht linearen Farbverlaeufen haben wir nur die halben Steps
     // pro Farbe
     if ( !bLinear )
     {
-        nRedSteps   <<= 1;
+        nRedSteps	<<= 1;
         nGreenSteps <<= 1;
-        nBlueSteps  <<= 1;
+        nBlueSteps	<<= 1;
     }
 
     // Anzahl der Schritte berechnen, falls nichts uebergeben wurde
@@ -297,29 +297,29 @@ void OutputDevice::ImplDrawLinearGradient( const Rectangle& rRect,
     double fScanInc  = (double)aRect.GetHeight() / (double)nSteps;
 
     // Startfarbe berechnen und setzen
-    UINT8   nRed;
-    UINT8   nGreen;
-    UINT8   nBlue;
-    long    nSteps2;
-    long    nStepsHalf = 0;
+    UINT8	nRed;
+    UINT8	nGreen;
+    UINT8	nBlue;
+    long	nSteps2;
+    long	nStepsHalf = 0;
     if ( bLinear )
     {
         // Um 1 erhoeht, um die Border innerhalb der Schleife
         // zeichnen zu koennen
-        nSteps2     = nSteps + 1;
-        nRed        = (UINT8)nStartRed;
-        nGreen      = (UINT8)nStartGreen;
-        nBlue       = (UINT8)nStartBlue;
+        nSteps2 	= nSteps + 1;
+        nRed		= (UINT8)nStartRed;
+        nGreen		= (UINT8)nStartGreen;
+        nBlue		= (UINT8)nStartBlue;
     }
     else
     {
         // Um 2 erhoeht, um die Border innerhalb der Schleife
         // zeichnen zu koennen
-        nSteps2     = nSteps + 2;
-        nRed        = (UINT8)nEndRed;
-        nGreen      = (UINT8)nEndGreen;
-        nBlue       = (UINT8)nEndBlue;
-        nStepsHalf  = nSteps >> 1;
+        nSteps2 	= nSteps + 2;
+        nRed		= (UINT8)nEndRed;
+        nGreen		= (UINT8)nEndGreen;
+        nBlue		= (UINT8)nEndBlue;
+        nStepsHalf	= nSteps >> 1;
     }
 
     if ( bMtf )
@@ -328,8 +328,8 @@ void OutputDevice::ImplDrawLinearGradient( const Rectangle& rRect,
         mpGraphics->SetFillColor( MAKE_SALCOLOR( nRed, nGreen, nBlue ) );
 
     // Startpolygon erzeugen (== Borderpolygon)
-    Polygon     aPoly( 4 );
-    Polygon     aTempPoly( 2 );
+    Polygon 	aPoly( 4 );
+    Polygon 	aTempPoly( 2 );
     aPoly[0] = aFullRect.TopLeft();
     aPoly[1] = aFullRect.TopRight();
     aPoly[2] = aRect.TopRight();
@@ -370,9 +370,9 @@ void OutputDevice::ImplDrawLinearGradient( const Rectangle& rRect,
         // fuer lineare FV
         if ( bLinear )
         {
-            nRed    = ImplGetGradientColorValue( nStartRed+((nRedSteps*i)/nSteps2) );
-            nGreen  = ImplGetGradientColorValue( nStartGreen+((nGreenSteps*i)/nSteps2) );
-            nBlue   = ImplGetGradientColorValue( nStartBlue+((nBlueSteps*i)/nSteps2) );
+            nRed	= ImplGetGradientColorValue( nStartRed+((nRedSteps*i)/nSteps2) );
+            nGreen	= ImplGetGradientColorValue( nStartGreen+((nGreenSteps*i)/nSteps2) );
+            nBlue	= ImplGetGradientColorValue( nStartBlue+((nBlueSteps*i)/nSteps2) );
         }
         // fuer radiale FV
         else
@@ -384,25 +384,25 @@ void OutputDevice::ImplDrawLinearGradient( const Rectangle& rRect,
             // on.
             if ( i >= nSteps )
             {
-                nRed    = (UINT8)nEndRed;
-                nGreen  = (UINT8)nEndGreen;
-                nBlue   = (UINT8)nEndBlue;
+                nRed	= (UINT8)nEndRed;
+                nGreen	= (UINT8)nEndGreen;
+                nBlue	= (UINT8)nEndBlue;
             }
             else
             {
                 if ( i <= nStepsHalf )
                 {
-                    nRed    = ImplGetGradientColorValue( nEndRed-((nRedSteps*i)/nSteps2) );
-                    nGreen  = ImplGetGradientColorValue( nEndGreen-((nGreenSteps*i)/nSteps2) );
-                    nBlue   = ImplGetGradientColorValue( nEndBlue-((nBlueSteps*i)/nSteps2) );
+                    nRed	= ImplGetGradientColorValue( nEndRed-((nRedSteps*i)/nSteps2) );
+                    nGreen	= ImplGetGradientColorValue( nEndGreen-((nGreenSteps*i)/nSteps2) );
+                    nBlue	= ImplGetGradientColorValue( nEndBlue-((nBlueSteps*i)/nSteps2) );
                 }
                 // genau die Mitte und hoeher
                 else
                 {
                     long i2 = i - nStepsHalf;
-                    nRed    = ImplGetGradientColorValue( nStartRed+((nRedSteps*i2)/nSteps2) );
-                    nGreen  = ImplGetGradientColorValue( nStartGreen+((nGreenSteps*i2)/nSteps2) );
-                    nBlue   = ImplGetGradientColorValue( nStartBlue+((nBlueSteps*i2)/nSteps2) );
+                    nRed	= ImplGetGradientColorValue( nStartRed+((nRedSteps*i2)/nSteps2) );
+                    nGreen	= ImplGetGradientColorValue( nStartGreen+((nGreenSteps*i2)/nSteps2) );
+                    nBlue	= ImplGetGradientColorValue( nStartBlue+((nBlueSteps*i2)/nSteps2) );
                 }
             }
         }
@@ -429,21 +429,21 @@ void OutputDevice::ImplDrawComplexGradient( const Rectangle& rRect,
     // Virtuelle Device werden auch ausgeklammert, da einige Treiber
     // ansonsten zu langsam sind
     PolyPolygon*    pPolyPoly;
-    Rectangle       aRect( rRect );
-    Color           aStartCol( rGradient.GetStartColor() );
-    Color           aEndCol( rGradient.GetEndColor() );
-    long            nStartRed = ( (long) aStartCol.GetRed() * rGradient.GetStartIntensity() ) / 100;
-    long            nStartGreen = ( (long) aStartCol.GetGreen() * rGradient.GetStartIntensity() ) / 100;
-    long            nStartBlue = ( (long) aStartCol.GetBlue() * rGradient.GetStartIntensity() ) / 100;
-    long            nEndRed = ( (long) aEndCol.GetRed() * rGradient.GetEndIntensity() ) / 100;
-    long            nEndGreen = ( (long) aEndCol.GetGreen() * rGradient.GetEndIntensity() ) / 100;
-    long            nEndBlue = ( (long) aEndCol.GetBlue() * rGradient.GetEndIntensity() ) / 100;
-    long            nRedSteps = nEndRed - nStartRed;
-    long            nGreenSteps = nEndGreen - nStartGreen;
-    long            nBlueSteps = nEndBlue   - nStartBlue;
+    Rectangle	    aRect( rRect );
+    Color			aStartCol( rGradient.GetStartColor() );
+    Color			aEndCol( rGradient.GetEndColor() );
+    long			nStartRed = ( (long) aStartCol.GetRed() * rGradient.GetStartIntensity() ) / 100;
+    long			nStartGreen = ( (long) aStartCol.GetGreen() * rGradient.GetStartIntensity() ) / 100;
+    long			nStartBlue = ( (long) aStartCol.GetBlue() * rGradient.GetStartIntensity() ) / 100;
+    long			nEndRed = ( (long) aEndCol.GetRed() * rGradient.GetEndIntensity() ) / 100;
+    long			nEndGreen = ( (long) aEndCol.GetGreen() * rGradient.GetEndIntensity() ) / 100;
+    long			nEndBlue = ( (long) aEndCol.GetBlue() * rGradient.GetEndIntensity() ) / 100;
+    long			nRedSteps = nEndRed	- nStartRed;
+    long			nGreenSteps = nEndGreen - nStartGreen;
+    long			nBlueSteps = nEndBlue	- nStartBlue;
     long            nStepCount = rGradient.GetSteps();
-    USHORT          nAngle = rGradient.GetAngle() % 3600;
-
+    USHORT	        nAngle = rGradient.GetAngle() % 3600;
+    
     if( (meRasterOp != ROP_OVERPAINT) || (meOutDevType != OUTDEV_WINDOW) || bMtf )
         pPolyPoly = new PolyPolygon( 2 );
     else
@@ -451,23 +451,23 @@ void OutputDevice::ImplDrawComplexGradient( const Rectangle& rRect,
 
     if( rGradient.GetStyle() == GRADIENT_SQUARE || rGradient.GetStyle() == GRADIENT_RECT )
     {
-        const double    fAngle  = nAngle * F_PI1800;
-        const double    fWidth  = aRect.GetWidth();
+        const double    fAngle	= nAngle * F_PI1800;
+        const double    fWidth	= aRect.GetWidth();
         const double    fHeight = aRect.GetHeight();
-        double          fDX = fWidth  * fabs( cos( fAngle ) ) + fHeight * fabs( sin( fAngle ) );
-        double          fDY = fHeight * fabs( cos( fAngle ) ) + fWidth  * fabs( sin( fAngle ) );
+        double          fDX = fWidth  * fabs( cos( fAngle ) ) + fHeight * fabs( sin( fAngle ) ); 
+        double          fDY = fHeight * fabs( cos( fAngle ) ) + fWidth  * fabs( sin( fAngle ) ); 
 
         fDX = ( fDX - fWidth ) * 0.5 + 0.5;
         fDY = ( fDY - fHeight ) * 0.5 + 0.5;
-
+    
         aRect.Left() -= (long) fDX;
         aRect.Right() += (long) fDX;
         aRect.Top() -= (long) fDY;
         aRect.Bottom() += (long) fDY;
     }
-
+    
     Size aSize( aRect.GetSize() );
-
+    
     if( rGradient.GetStyle() == GRADIENT_RADIAL )
     {
         // Radien-Berechnung fuer Kreis
@@ -489,11 +489,11 @@ void OutputDevice::ImplDrawComplexGradient( const Rectangle& rRect,
     }
 
     // neue Mittelpunkte berechnen
-    long    nZWidth = aRect.GetWidth()  * (long) rGradient.GetOfsX() / 100;
-    long    nZHeight = aRect.GetHeight() * (long) rGradient.GetOfsY() / 100;
-    long    nBorderX = (long) rGradient.GetBorder() * aSize.Width()  / 100;
-    long    nBorderY = (long) rGradient.GetBorder() * aSize.Height() / 100;
-    Point   aCenter( aRect.Left() + nZWidth, aRect.Top() + nZHeight );
+    long	nZWidth = aRect.GetWidth()	* (long) rGradient.GetOfsX() / 100;
+    long	nZHeight = aRect.GetHeight() * (long) rGradient.GetOfsY() / 100;
+    long	nBorderX = (long) rGradient.GetBorder() * aSize.Width()  / 100;
+    long	nBorderY = (long) rGradient.GetBorder() * aSize.Height() / 100;
+    Point	aCenter( aRect.Left() + nZWidth, aRect.Top() + nZHeight );
 
     // Rand beruecksichtigen
     aSize.Width() -= nBorderX;
@@ -502,7 +502,7 @@ void OutputDevice::ImplDrawComplexGradient( const Rectangle& rRect,
     // Ausgaberechteck neu setzen
     aRect.Left() = aCenter.X() - ( aSize.Width() >> 1 );
     aRect.Top() = aCenter.Y() - ( aSize.Height() >> 1 );
-
+    
     aRect.SetSize( aSize );
     long nMinRect = Min( aRect.GetWidth(), aRect.GetHeight() );
 
@@ -526,7 +526,7 @@ void OutputDevice::ImplDrawComplexGradient( const Rectangle& rRect,
 
         nStepCount = nMinRect / nInc;
     }
-
+    
     // minimal drei Schritte und maximal die Anzahl der Farbunterschiede
     long nSteps = Max( nStepCount, 2L );
     long nCalcSteps  = Abs( nRedSteps );
@@ -549,7 +549,7 @@ void OutputDevice::ImplDrawComplexGradient( const Rectangle& rRect,
     double  fScanBottom = aRect.Bottom();
     double  fScanInc = (double) nMinRect / (double) nSteps * 0.5;
     UINT8   nRed = (UINT8) nStartRed, nGreen = (UINT8) nStartGreen, nBlue = (UINT8) nStartBlue;
-    bool    bPaintLastPolygon( false ); // #107349# Paint last polygon only if loop has generated any output
+    bool	bPaintLastPolygon( false ); // #107349# Paint last polygon only if loop has generated any output
 
     if( bMtf )
         mpMetaFile->AddAction( new MetaFillColorAction( Color( nRed, nGreen, nBlue ), TRUE ) );
@@ -557,7 +557,7 @@ void OutputDevice::ImplDrawComplexGradient( const Rectangle& rRect,
         mpGraphics->SetFillColor( MAKE_SALCOLOR( nRed, nGreen, nBlue ) );
 
     if( pPolyPoly )
-    {
+    {   
         pPolyPoly->Insert( aPoly = rRect );
         pPolyPoly->Insert( aPoly );
     }
@@ -640,7 +640,7 @@ void OutputDevice::ImplDrawComplexGradient( const Rectangle& rRect,
     if( pPolyPoly )
     {
         const Polygon& rPoly = pPolyPoly->GetObject( 1 );
-
+        
         if( !rPoly.GetBoundRect().IsEmpty() )
         {
             // #107349# Paint last polygon with end color only if loop
@@ -693,7 +693,7 @@ void OutputDevice::DrawGradient( const Rectangle& rRect,
 
         if ( mnDrawMode & DRAWMODE_GHOSTEDGRADIENT )
         {
-            aColor = Color( ( aColor.GetRed() >> 1 ) | 0x80,
+            aColor = Color( ( aColor.GetRed() >> 1 ) | 0x80, 
                             ( aColor.GetGreen() >> 1 ) | 0x80,
                             ( aColor.GetBlue() >> 1 ) | 0x80 );
         }
@@ -719,14 +719,14 @@ void OutputDevice::DrawGradient( const Rectangle& rRect,
             aStartCol = Color( cStartLum, cStartLum, cStartLum );
             aEndCol = Color( cEndLum, cEndLum, cEndLum );
         }
-
+        
         if ( mnDrawMode & DRAWMODE_GHOSTEDGRADIENT )
         {
-            aStartCol = Color( ( aStartCol.GetRed() >> 1 ) | 0x80,
+            aStartCol = Color( ( aStartCol.GetRed() >> 1 ) | 0x80, 
                                ( aStartCol.GetGreen() >> 1 ) | 0x80,
                                ( aStartCol.GetBlue() >> 1 ) | 0x80 );
 
-            aEndCol = Color( ( aEndCol.GetRed() >> 1 ) | 0x80,
+            aEndCol = Color( ( aEndCol.GetRed() >> 1 ) | 0x80, 
                              ( aEndCol.GetGreen() >> 1 ) | 0x80,
                              ( aEndCol.GetBlue() >> 1 ) | 0x80 );
         }
@@ -740,7 +740,7 @@ void OutputDevice::DrawGradient( const Rectangle& rRect,
 
     if( !IsDeviceOutputNecessary() || ImplIsRecordLayout() )
         return;
-
+    
     // Rechteck in Pixel umrechnen
     Rectangle aRect( ImplLogicToDevicePixel( rRect ) );
     aRect.Justify();
@@ -768,7 +768,7 @@ void OutputDevice::DrawGradient( const Rectangle& rRect,
 
         if ( mbInitClipRegion )
             ImplInitClipRegion();
-
+    
         if ( !mbOutputClipped )
         {
             // Gradienten werden ohne Umrandung gezeichnet
@@ -777,7 +777,7 @@ void OutputDevice::DrawGradient( const Rectangle& rRect,
                 mpGraphics->SetLineColor();
                 mbInitLineColor = TRUE;
             }
-
+            
             mbInitFillColor = TRUE;
 
             // calculate step count if neccessary
@@ -811,7 +811,7 @@ void OutputDevice::DrawGradient( const PolyPolygon& rPolyPoly,
 
     if( mbInitClipRegion )
         ImplInitClipRegion();
-
+    
     if( mbOutputClipped )
         return;
 
@@ -834,7 +834,7 @@ void OutputDevice::DrawGradient( const PolyPolygon& rPolyPoly,
 
             if ( mnDrawMode & DRAWMODE_GHOSTEDGRADIENT )
             {
-                aColor = Color( ( aColor.GetRed() >> 1 ) | 0x80,
+                aColor = Color( ( aColor.GetRed() >> 1 ) | 0x80, 
                                 ( aColor.GetGreen() >> 1 ) | 0x80,
                                 ( aColor.GetBlue() >> 1 ) | 0x80 );
             }
@@ -849,7 +849,7 @@ void OutputDevice::DrawGradient( const PolyPolygon& rPolyPoly,
 
         if( mpMetaFile )
         {
-            const Rectangle aRect( rPolyPoly.GetBoundRect() );
+            const Rectangle	aRect( rPolyPoly.GetBoundRect() );
 
             mpMetaFile->AddAction( new MetaCommentAction( "XGRAD_SEQ_BEGIN" ) );
             mpMetaFile->AddAction( new MetaGradientExAction( rPolyPoly, rGradient ) );
@@ -863,7 +863,7 @@ void OutputDevice::DrawGradient( const PolyPolygon& rPolyPoly,
             }
             else
             {
-                const BOOL  bOldOutput = IsOutputEnabled();
+                const BOOL	bOldOutput = IsOutputEnabled();
 
                 EnableOutput( FALSE );
                 Push( PUSH_RASTEROP );
@@ -897,14 +897,14 @@ void OutputDevice::DrawGradient( const PolyPolygon& rPolyPoly,
                 aStartCol = Color( cStartLum, cStartLum, cStartLum );
                 aEndCol = Color( cEndLum, cEndLum, cEndLum );
             }
-
+            
             if ( mnDrawMode & DRAWMODE_GHOSTEDGRADIENT )
             {
-                aStartCol = Color( ( aStartCol.GetRed() >> 1 ) | 0x80,
+                aStartCol = Color( ( aStartCol.GetRed() >> 1 ) | 0x80, 
                                    ( aStartCol.GetGreen() >> 1 ) | 0x80,
                                    ( aStartCol.GetBlue() >> 1 ) | 0x80 );
 
-                aEndCol = Color( ( aEndCol.GetRed() >> 1 ) | 0x80,
+                aEndCol = Color( ( aEndCol.GetRed() >> 1 ) | 0x80, 
                                  ( aEndCol.GetGreen() >> 1 ) | 0x80,
                                  ( aEndCol.GetBlue() >> 1 ) | 0x80 );
             }
@@ -915,7 +915,7 @@ void OutputDevice::DrawGradient( const PolyPolygon& rPolyPoly,
 
         if( OUTDEV_PRINTER == meOutDevType || ImplGetSVData()->maGDIData.mbNoXORClipping )
         {
-            const Rectangle aBoundRect( rPolyPoly.GetBoundRect() );
+            const Rectangle	aBoundRect( rPolyPoly.GetBoundRect() );
 
             if( !Rectangle( PixelToLogic( Point() ), GetOutputSize() ).IsEmpty() )
             {
@@ -931,7 +931,7 @@ void OutputDevice::DrawGradient( const PolyPolygon& rPolyPoly,
 
                     if( mbInitClipRegion )
                         ImplInitClipRegion();
-
+                
                     if( !mbOutputClipped )
                     {
                         PolyPolygon aClipPolyPoly( ImplLogicToDevicePixel( rPolyPoly ) );
@@ -942,7 +942,7 @@ void OutputDevice::DrawGradient( const PolyPolygon& rPolyPoly,
                             mpGraphics->SetLineColor();
                             mbInitLineColor = TRUE;
                         }
-
+                        
                         mbInitFillColor = TRUE;
 
                         // calculate step count if neccessary
@@ -959,29 +959,29 @@ void OutputDevice::DrawGradient( const PolyPolygon& rPolyPoly,
         }
         else
         {
-            const PolyPolygon   aPolyPoly( LogicToPixel( rPolyPoly ) );
-            const Rectangle     aBoundRect( aPolyPoly.GetBoundRect() );
+            const PolyPolygon	aPolyPoly( LogicToPixel( rPolyPoly ) );
+            const Rectangle		aBoundRect( aPolyPoly.GetBoundRect() );
             Point aPoint;
-            Rectangle           aDstRect( aPoint, GetOutputSizePixel() );
+            Rectangle			aDstRect( aPoint, GetOutputSizePixel() );
 
             aDstRect.Intersection( aBoundRect );
 
             if( OUTDEV_WINDOW == meOutDevType )
             {
                 const Region aPaintRgn( ( (Window*) this )->GetPaintRegion() );
-
+                
                 if( !aPaintRgn.IsNull() )
                     aDstRect.Intersection( LogicToPixel( aPaintRgn ).GetBoundRect() );
             }
 
             if( !aDstRect.IsEmpty() )
             {
-                VirtualDevice*  pVDev;
-                const Size      aDstSize( aDstRect.GetSize() );
+                VirtualDevice*	pVDev;
+                const Size		aDstSize( aDstRect.GetSize() );
 
                 if( HasAlpha() )
                 {
-                    // #110958# Pay attention to alpha VDevs here, otherwise,
+                    // #110958# Pay attention to alpha VDevs here, otherwise, 
                     // background will be wrong: Temp VDev has to have alpha, too.
                     pVDev = new VirtualDevice( *this, 0, GetAlphaBitCount() > 1 ? 0 : 1 );
                 }
@@ -993,8 +993,8 @@ void OutputDevice::DrawGradient( const PolyPolygon& rPolyPoly,
 
                 if( pVDev->SetOutputSizePixel( aDstSize) )
                 {
-                    MapMode         aVDevMap;
-                    const BOOL      bOldMap = mbMap;
+                    MapMode			aVDevMap;
+                    const BOOL		bOldMap = mbMap;
 
                     EnableMapMode( FALSE );
 
@@ -1039,8 +1039,8 @@ void OutputDevice::AddGradientActions( const Rectangle& rRect, const Gradient& r
     // Wenn Rechteck leer ist, brauchen wir nichts machen
     if ( !aRect.IsEmpty() )
     {
-        Gradient        aGradient( rGradient );
-        GDIMetaFile*    pOldMtf = mpMetaFile;
+        Gradient		aGradient( rGradient );
+        GDIMetaFile*	pOldMtf = mpMetaFile;
 
         mpMetaFile = &rMtf;
         mpMetaFile->AddAction( new MetaPushAction( PUSH_ALL ) );
@@ -1077,7 +1077,7 @@ void OutputDevice::DrawHatch( const PolyPolygon& rPolyPoly, const Hatch& rHatch
 
     Hatch aHatch( rHatch );
 
-    if ( mnDrawMode & ( DRAWMODE_BLACKLINE | DRAWMODE_WHITELINE |
+    if ( mnDrawMode & ( DRAWMODE_BLACKLINE | DRAWMODE_WHITELINE | 
                         DRAWMODE_GRAYLINE | DRAWMODE_GHOSTEDLINE |
                         DRAWMODE_SETTINGSLINE ) )
     {
@@ -1099,8 +1099,8 @@ void OutputDevice::DrawHatch( const PolyPolygon& rPolyPoly, const Hatch& rHatch
 
         if ( mnDrawMode & DRAWMODE_GHOSTEDLINE )
         {
-            aColor = Color( ( aColor.GetRed() >> 1 ) | 0x80,
-                            ( aColor.GetGreen() >> 1 ) | 0x80,
+            aColor = Color( ( aColor.GetRed() >> 1 ) | 0x80, 
+                            ( aColor.GetGreen() >> 1 ) | 0x80, 
                             ( aColor.GetBlue() >> 1 ) | 0x80);
         }
 
@@ -1123,10 +1123,10 @@ void OutputDevice::DrawHatch( const PolyPolygon& rPolyPoly, const Hatch& rHatch
         return;
 
     if( rPolyPoly.Count() )
-    {
-        PolyPolygon     aPolyPoly( LogicToPixel( rPolyPoly ) );
-        GDIMetaFile*    pOldMetaFile = mpMetaFile;
-        BOOL            bOldMap = mbMap;
+    { 
+        PolyPolygon		aPolyPoly( LogicToPixel( rPolyPoly ) );
+        GDIMetaFile*	pOldMetaFile = mpMetaFile;
+        BOOL			bOldMap = mbMap;
 
         aPolyPoly.Optimize( POLY_OPTIMIZE_NO_SAME );
         aHatch.SetDistance( ImplLogicWidthToDevicePixel( aHatch.GetDistance() ) );
@@ -1153,11 +1153,11 @@ void OutputDevice::AddHatchActions( const PolyPolygon& rPolyPoly, const Hatch& r
 {
     DBG_CHKTHIS( OutputDevice, ImplDbgCheckOutputDevice );
 
-    PolyPolygon aPolyPoly( rPolyPoly );
+    PolyPolygon	aPolyPoly( rPolyPoly );
     aPolyPoly.Optimize( POLY_OPTIMIZE_NO_SAME | POLY_OPTIMIZE_CLOSE );
 
     if( aPolyPoly.Count() )
-    {
+    { 
         GDIMetaFile* pOldMtf = mpMetaFile;
 
         mpMetaFile = &rMtf;
@@ -1173,12 +1173,12 @@ void OutputDevice::AddHatchActions( const PolyPolygon& rPolyPoly, const Hatch& r
 
 void OutputDevice::ImplDrawHatch( const PolyPolygon& rPolyPoly, const Hatch& rHatch, BOOL bMtf )
 {
-    Rectangle   aRect( rPolyPoly.GetBoundRect() );
-    const long  nLogPixelWidth = ImplDevicePixelToLogicWidth( 1 );
-    const long  nWidth = ImplDevicePixelToLogicWidth( Max( ImplLogicWidthToDevicePixel( rHatch.GetDistance() ), 3L ) );
-    Point*      pPtBuffer = new Point[ HATCH_MAXPOINTS ];
-    Point       aPt1, aPt2, aEndPt1;
-    Size        aInc;
+    Rectangle	aRect( rPolyPoly.GetBoundRect() );
+    const long	nLogPixelWidth = ImplDevicePixelToLogicWidth( 1 );
+    const long	nWidth = ImplDevicePixelToLogicWidth( Max( ImplLogicWidthToDevicePixel( rHatch.GetDistance() ), 3L ) );
+    Point*		pPtBuffer = new Point[ HATCH_MAXPOINTS ];
+    Point		aPt1, aPt2, aEndPt1;
+    Size		aInc;
 
     // Single hatch
     aRect.Left() -= nLogPixelWidth; aRect.Top() -= nLogPixelWidth; aRect.Right() += nLogPixelWidth; aRect.Bottom() += nLogPixelWidth;
@@ -1225,9 +1225,9 @@ void OutputDevice::ImplDrawHatch( const PolyPolygon& rPolyPoly, const Hatch& rHa
 void OutputDevice::ImplCalcHatchValues( const Rectangle& rRect, long nDist, USHORT nAngle10,
                                         Point& rPt1, Point& rPt2, Size& rInc, Point& rEndPt1 )
 {
-    Point   aRef;
-    long    nAngle = nAngle10 % 1800;
-    long    nOffset = 0;
+    Point	aRef;
+    long	nAngle = nAngle10 % 1800;
+    long	nOffset = 0;
 
     if( nAngle > 900 )
         nAngle -= 1800;
@@ -1266,10 +1266,10 @@ void OutputDevice::ImplCalcHatchValues( const Rectangle& rRect, long nDist, USHO
     }
     else if( nAngle >= -450 && nAngle <= 450 )
     {
-        const double    fAngle = F_PI1800 * labs( nAngle );
-        const double    fTan = tan( fAngle );
-        const long      nYOff = FRound( ( rRect.Right() - rRect.Left() ) * fTan );
-        long            nPY;
+        const double	fAngle = F_PI1800 * labs( nAngle );
+        const double	fTan = tan( fAngle );
+        const long		nYOff = FRound( ( rRect.Right() - rRect.Left() ) * fTan );
+        long			nPY;
 
         rInc = Size( 0, nDist = FRound( nDist / cos( fAngle ) ) );
 
@@ -1300,8 +1300,8 @@ void OutputDevice::ImplCalcHatchValues( const Rectangle& rRect, long nDist, USHO
     {
         const double fAngle = F_PI1800 * labs( nAngle );
         const double fTan = tan( fAngle );
-        const long   nXOff = FRound( ( rRect.Bottom() - rRect.Top() ) / fTan );
-        long         nPX;
+        const long	 nXOff = FRound( ( rRect.Bottom() - rRect.Top() ) / fTan );
+        long		 nPX;
 
         rInc = Size( nDist = FRound( nDist / sin( fAngle ) ), 0 );
 
@@ -1335,8 +1335,8 @@ void OutputDevice::ImplCalcHatchValues( const Rectangle& rRect, long nDist, USHO
 void OutputDevice::ImplDrawHatchLine( const Line& rLine, const PolyPolygon& rPolyPoly,
                                       Point* pPtBuffer, BOOL bMtf )
 {
-    double  fX, fY;
-    long    nAdd, nPCounter = 0;
+    double	fX, fY;
+    long	nAdd, nPCounter = 0;
 
     for( long nPoly = 0, nPolyCount = rPolyPoly.Count(); nPoly < nPolyCount; nPoly++ )
     {
@@ -1344,7 +1344,7 @@ void OutputDevice::ImplDrawHatchLine( const Line& rLine, const PolyPolygon& rPol
 
         if( rPoly.GetSize() > 1 )
         {
-            Line    aCurSegment( rPoly[ 0 ], Point() );
+            Line	aCurSegment( rPoly[ 0 ], Point() );
 
             for( long i = 1, nCount = rPoly.GetSize(); i <= nCount; i++ )
             {
@@ -1353,25 +1353,25 @@ void OutputDevice::ImplDrawHatchLine( const Line& rLine, const PolyPolygon& rPol
 
                 if( rLine.Intersection( aCurSegment, fX, fY ) )
                 {
-                    if( ( fabs( fX - aCurSegment.GetStart().X() ) <= 0.0000001 ) &&
+                    if( ( fabs( fX - aCurSegment.GetStart().X() ) <= 0.0000001 ) && 
                         ( fabs( fY - aCurSegment.GetStart().Y() ) <= 0.0000001 ) )
                     {
-                        const Line      aPrevSegment( rPoly[ (USHORT)( ( i > 1 ) ? ( i - 2 ) : ( nCount - 1 ) ) ], aCurSegment.GetStart() );
-                        const double    fPrevDistance = rLine.GetDistance( aPrevSegment.GetStart() );
-                        const double    fCurDistance = rLine.GetDistance( aCurSegment.GetEnd() );
+                        const Line		aPrevSegment( rPoly[ (USHORT)( ( i > 1 ) ? ( i - 2 ) : ( nCount - 1 ) ) ], aCurSegment.GetStart() );
+                        const double	fPrevDistance = rLine.GetDistance( aPrevSegment.GetStart() );
+                        const double	fCurDistance = rLine.GetDistance( aCurSegment.GetEnd() );
 
-                        if( ( fPrevDistance <= 0.0 && fCurDistance > 0.0 ) ||
+                        if( ( fPrevDistance <= 0.0 && fCurDistance > 0.0 ) || 
                             ( fPrevDistance > 0.0 && fCurDistance < 0.0 ) )
                         {
                             nAdd = 1;
                         }
                     }
-                    else if( ( fabs( fX - aCurSegment.GetEnd().X() ) <= 0.0000001 ) &&
+                    else if( ( fabs( fX - aCurSegment.GetEnd().X() ) <= 0.0000001 ) && 
                              ( fabs( fY - aCurSegment.GetEnd().Y() ) <= 0.0000001 ) )
                     {
                         const Line aNextSegment( aCurSegment.GetEnd(), rPoly[ (USHORT)( ( i + 1 ) % nCount ) ] );
 
-                        if( ( fabs( rLine.GetDistance( aNextSegment.GetEnd() ) ) <= 0.0000001 ) &&
+                        if( ( fabs( rLine.GetDistance( aNextSegment.GetEnd() ) ) <= 0.0000001 ) && 
                             ( rLine.GetDistance( aCurSegment.GetStart() ) > 0.0 ) )
                         {
                             nAdd = 1;
diff --git a/vcl/source/gdi/outdev5.cxx b/vcl/source/gdi/outdev5.cxx
index d42723215c55..ce540a3f8b0f 100644
--- a/vcl/source/gdi/outdev5.cxx
+++ b/vcl/source/gdi/outdev5.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
@@ -95,7 +95,7 @@ void OutputDevice::DrawRect( const Rectangle& rRect,
         if ( aRoundRectPoly.GetSize() >= 2 )
         {
             const SalPoint* pPtAry = (const SalPoint*) aRoundRectPoly.GetConstPointAry();
-
+            
             if ( !mbFillColor )
                 mpGraphics->DrawPolyLine( aRoundRectPoly.GetSize(), pPtAry, this );
             else
@@ -117,7 +117,7 @@ void OutputDevice::DrawEllipse( const Rectangle& rRect )
     if ( mpMetaFile )
         mpMetaFile->AddAction( new MetaEllipseAction( rRect ) );
 
-    if  ( !IsDeviceOutputNecessary() || (!mbLineColor && !mbFillColor) || ImplIsRecordLayout() )
+    if	( !IsDeviceOutputNecessary() || (!mbLineColor && !mbFillColor) || ImplIsRecordLayout() )
         return;
 
     Rectangle aRect( ImplLogicToDevicePixel( rRect ) );
@@ -190,9 +190,9 @@ void OutputDevice::DrawArc( const Rectangle& rRect,
     if ( mbInitLineColor )
         ImplInitLineColor();
 
-    const Point     aStart( ImplLogicToDevicePixel( rStartPt ) );
-    const Point     aEnd( ImplLogicToDevicePixel( rEndPt ) );
-    Polygon         aArcPoly( aRect, aStart, aEnd, POLY_ARC );
+    const Point 	aStart( ImplLogicToDevicePixel( rStartPt ) );
+    const Point 	aEnd( ImplLogicToDevicePixel( rEndPt ) );
+    Polygon 		aArcPoly( aRect, aStart, aEnd, POLY_ARC );
 
     if ( aArcPoly.GetSize() >= 2 )
     {
@@ -237,9 +237,9 @@ void OutputDevice::DrawPie( const Rectangle& rRect,
     if ( mbInitLineColor )
         ImplInitLineColor();
 
-    const Point     aStart( ImplLogicToDevicePixel( rStartPt ) );
-    const Point     aEnd( ImplLogicToDevicePixel( rEndPt ) );
-    Polygon         aPiePoly( aRect, aStart, aEnd, POLY_PIE );
+    const Point 	aStart( ImplLogicToDevicePixel( rStartPt ) );
+    const Point 	aEnd( ImplLogicToDevicePixel( rEndPt ) );
+    Polygon 		aPiePoly( aRect, aStart, aEnd, POLY_PIE );
 
     if ( aPiePoly.GetSize() >= 2 )
     {
@@ -291,9 +291,9 @@ void OutputDevice::DrawChord( const Rectangle& rRect,
     if ( mbInitLineColor )
         ImplInitLineColor();
 
-    const Point     aStart( ImplLogicToDevicePixel( rStartPt ) );
-    const Point     aEnd( ImplLogicToDevicePixel( rEndPt ) );
-    Polygon         aChordPoly( aRect, aStart, aEnd, POLY_CHORD );
+    const Point 	aStart( ImplLogicToDevicePixel( rStartPt ) );
+    const Point 	aEnd( ImplLogicToDevicePixel( rEndPt ) );
+    Polygon 		aChordPoly( aRect, aStart, aEnd, POLY_CHORD );
 
     if ( aChordPoly.GetSize() >= 2 )
     {
diff --git a/vcl/source/gdi/outdev6.cxx b/vcl/source/gdi/outdev6.cxx
index 5b8d228bb141..0b0274bfceb6 100644
--- a/vcl/source/gdi/outdev6.cxx
+++ b/vcl/source/gdi/outdev6.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,18 +79,18 @@ void OutputDevice::DrawGrid( const Rectangle& rRect, const Size& rDist, ULONG nF
     if( mbOutputClipped )
         return;
 
-    const long  nDistX = Max( rDist.Width(), 1L );
-    const long  nDistY = Max( rDist.Height(), 1L );
-    long        nX = ( rRect.Left() >= aDstRect.Left() ) ? rRect.Left() : ( rRect.Left() + ( ( aDstRect.Left() - rRect.Left() ) / nDistX ) * nDistX );
-    long        nY = ( rRect.Top() >= aDstRect.Top() ) ? rRect.Top() : ( rRect.Top() + ( ( aDstRect.Top() - rRect.Top() ) / nDistY ) * nDistY );
-    const long  nRight = aDstRect.Right();
-    const long  nBottom = aDstRect.Bottom();
-    const long  nStartX = ImplLogicXToDevicePixel( nX );
-    const long  nEndX = ImplLogicXToDevicePixel( nRight );
-    const long  nStartY = ImplLogicYToDevicePixel( nY );
-    const long  nEndY = ImplLogicYToDevicePixel( nBottom );
-    long        nHorzCount = 0L;
-    long        nVertCount = 0L;
+    const long	nDistX = Max( rDist.Width(), 1L );
+    const long	nDistY = Max( rDist.Height(), 1L );
+    long		nX = ( rRect.Left() >= aDstRect.Left() ) ? rRect.Left() : ( rRect.Left() + ( ( aDstRect.Left() - rRect.Left() ) / nDistX ) * nDistX );
+    long		nY = ( rRect.Top() >= aDstRect.Top() ) ? rRect.Top() : ( rRect.Top() + ( ( aDstRect.Top() - rRect.Top() ) / nDistY ) * nDistY );
+    const long	nRight = aDstRect.Right();
+    const long	nBottom = aDstRect.Bottom();
+    const long	nStartX = ImplLogicXToDevicePixel( nX );
+    const long	nEndX = ImplLogicXToDevicePixel( nRight );
+    const long	nStartY = ImplLogicYToDevicePixel( nY );
+    const long	nEndY = ImplLogicYToDevicePixel( nBottom );
+    long		nHorzCount = 0L;
+    long		nVertCount = 0L;
 
     ::com::sun::star::uno::Sequence< sal_Int32 > aVertBuf;
     ::com::sun::star::uno::Sequence< sal_Int32 > aHorzBuf;
@@ -182,7 +182,7 @@ void OutputDevice::DrawTransparent( const basegfx::B2DPolyPolygon& rB2DPolyPoly,
     if( mbInitFillColor )
         ImplInitFillColor();
 
-    if((mnAntialiasing & ANTIALIASING_ENABLE_B2DDRAW)
+    if((mnAntialiasing & ANTIALIASING_ENABLE_B2DDRAW) 
         && mpGraphics->supportsOperation(OutDevSupport_B2DDraw)
         && ROP_OVERPAINT == GetRasterOp() )
     {
@@ -193,7 +193,7 @@ void OutputDevice::DrawTransparent( const basegfx::B2DPolyPolygon& rB2DPolyPoly,
         // transform the polygon into device space and ensure it is closed
         aB2DPolyPolygon.transform( aTransform );
         aB2DPolyPolygon.setClosed( true );
-
+        
         bool bDrawnOk = true;
         if( IsFillColor() )
             bDrawnOk = mpGraphics->DrawPolyPolygon( aB2DPolyPolygon, fTransparency, this );
@@ -210,7 +210,7 @@ void OutputDevice::DrawTransparent( const basegfx::B2DPolyPolygon& rB2DPolyPoly,
 
         if( bDrawnOk )
         {
-#if 0
+#if 0 
             // MetaB2DPolyPolygonAction is not implemented yet:
             // according to AW adding it is very dangerous since there is a lot
             // of code that uses the metafile actions directly and unless every
@@ -278,7 +278,7 @@ void OutputDevice::DrawTransparent( const PolyPolygon& rPolyPoly,
 
     // try hard to draw it directly, because the emulation layers are slower
     if( !pDisableNative
-        && mpGraphics->supportsOperation( OutDevSupport_B2DDraw )
+        && mpGraphics->supportsOperation( OutDevSupport_B2DDraw ) 
 #if defined UNX && ! defined QUARTZ
             && GetBitCount() > 8
 #endif
@@ -351,11 +351,11 @@ void OutputDevice::DrawTransparent( const PolyPolygon& rPolyPoly,
                 return;
             }
 
-            Rectangle       aPolyRect( LogicToPixel( rPolyPoly ).GetBoundRect() );
-            const Size      aDPISize( LogicToPixel( Size( 1, 1 ), MAP_INCH ) );
-            const long      nBaseExtent = Max( FRound( aDPISize.Width() / 300. ), 1L );
-            long            nMove;
-            const USHORT    nTrans = ( nTransparencePercent < 13 ) ? 0 :
+            Rectangle		aPolyRect( LogicToPixel( rPolyPoly ).GetBoundRect() );
+            const Size		aDPISize( LogicToPixel( Size( 1, 1 ), MAP_INCH ) );
+            const long		nBaseExtent = Max( FRound( aDPISize.Width() / 300. ), 1L );
+            long			nMove;
+            const USHORT	nTrans = ( nTransparencePercent < 13 ) ? 0 :
                                      ( nTransparencePercent < 38 ) ? 25 :
                                      ( nTransparencePercent < 63 ) ? 50 :
                                      ( nTransparencePercent < 88 ) ? 75 : 100;
@@ -406,10 +406,10 @@ void OutputDevice::DrawTransparent( const PolyPolygon& rPolyPoly,
         }
         else
         {
-             PolyPolygon    aPolyPoly( LogicToPixel( rPolyPoly ) );
-            Rectangle       aPolyRect( aPolyPoly.GetBoundRect() );
-            Point           aPoint;
-            Rectangle       aDstRect( aPoint, GetOutputSizePixel() );
+             PolyPolygon 	aPolyPoly( LogicToPixel( rPolyPoly ) );
+            Rectangle		aPolyRect( aPolyPoly.GetBoundRect() );
+            Point			aPoint;
+            Rectangle		aDstRect( aPoint, GetOutputSizePixel() );
 
             aDstRect.Intersection( aPolyRect );
 
@@ -434,25 +434,25 @@ void OutputDevice::DrawTransparent( const PolyPolygon& rPolyPoly,
                     if( 1 )
                     {
                         if ( mbInitClipRegion )
-                            ImplInitClipRegion();
+                            ImplInitClipRegion();        
                         if ( mbInitLineColor )
                             ImplInitLineColor();
                         if ( mbInitFillColor )
                             ImplInitFillColor();
-
+    
                         Rectangle aLogicPolyRect( rPolyPoly.GetBoundRect() );
                         Rectangle aPixelRect( ImplLogicToDevicePixel( aLogicPolyRect ) );
 
                         if( !mbOutputClipped )
                         {
-                            bDrawn = mpGraphics->DrawAlphaRect(
-                               aPixelRect.Left(), aPixelRect.Top(),
+                            bDrawn = mpGraphics->DrawAlphaRect( 
+                               aPixelRect.Left(), aPixelRect.Top(), 
                                // #i98405# use methods with small g, else one pixel too much will be painted.
                                // This is because the source is a polygon which when painted would not paint
-                               // the rightmost and lowest pixel line(s), so use one pixel less for the
+                               // the rightmost and lowest pixel line(s), so use one pixel less for the 
                                // rectangle, too.
                                aPixelRect.getWidth(), aPixelRect.getHeight(),
-                               sal::static_int_cast<sal_uInt8>(nTransparencePercent),
+                               sal::static_int_cast<sal_uInt8>(nTransparencePercent), 
                                this );
                         }
                         else
@@ -462,9 +462,9 @@ void OutputDevice::DrawTransparent( const PolyPolygon& rPolyPoly,
 
                 if( !bDrawn )
                 {
-                    VirtualDevice   aVDev( *this, 1 );
-                    const Size      aDstSz( aDstRect.GetSize() );
-                    const BYTE      cTrans = (BYTE) MinMax( FRound( nTransparencePercent * 2.55 ), 0, 255 );
+                    VirtualDevice	aVDev( *this, 1 );
+                    const Size		aDstSz( aDstRect.GetSize() );
+                    const BYTE		cTrans = (BYTE) MinMax( FRound( nTransparencePercent * 2.55 ), 0, 255 );
 
                     if( aDstRect.Left() || aDstRect.Top() )
                         aPolyPoly.Move( -aDstRect.Left(), -aDstRect.Top() );
@@ -479,30 +479,30 @@ void OutputDevice::DrawTransparent( const PolyPolygon& rPolyPoly,
                         aVDev.SetFillColor( COL_BLACK );
                         aVDev.DrawPolyPolygon( aPolyPoly );
 
-                        Bitmap              aPaint( GetBitmap( aDstRect.TopLeft(), aDstSz ) );
-                        Bitmap              aPolyMask( aVDev.GetBitmap( Point(), aDstSz ) );
+                        Bitmap				aPaint( GetBitmap( aDstRect.TopLeft(), aDstSz ) );
+                        Bitmap				aPolyMask( aVDev.GetBitmap( Point(), aDstSz ) );
 
                         // #107766# check for non-empty bitmaps before accessing them
                         if( !!aPaint && !!aPolyMask )
                         {
-                            BitmapWriteAccess*  pW = aPaint.AcquireWriteAccess();
-                            BitmapReadAccess*   pR = aPolyMask.AcquireReadAccess();
+                            BitmapWriteAccess*	pW = aPaint.AcquireWriteAccess();
+                            BitmapReadAccess*	pR = aPolyMask.AcquireReadAccess();
 
                             if( pW && pR )
                             {
-                                BitmapColor         aPixCol;
-                                const BitmapColor   aFillCol( GetFillColor() );
-                                const BitmapColor   aWhite( pR->GetBestMatchingColor( Color( COL_WHITE ) ) );
-                                const BitmapColor   aBlack( pR->GetBestMatchingColor( Color( COL_BLACK ) ) );
-                                const long          nWidth = pW->Width(), nHeight = pW->Height();
-                                const long          nR = aFillCol.GetRed(), nG = aFillCol.GetGreen(), nB = aFillCol.GetBlue();
-                                long                nX, nY;
+                                BitmapColor 		aPixCol;
+                                const BitmapColor	aFillCol( GetFillColor() );
+                                const BitmapColor	aWhite( pR->GetBestMatchingColor( Color( COL_WHITE ) ) );
+                                const BitmapColor	aBlack( pR->GetBestMatchingColor( Color( COL_BLACK ) ) );
+                                const long			nWidth = pW->Width(), nHeight = pW->Height();
+                                const long			nR = aFillCol.GetRed(), nG = aFillCol.GetGreen(), nB = aFillCol.GetBlue();
+                                long				nX, nY;
 
                                 if( aPaint.GetBitCount() <= 8 )
                                 {
-                                    const BitmapPalette&    rPal = pW->GetPalette();
-                                    const USHORT            nCount = rPal.GetEntryCount();
-                                    BitmapColor*            pMap = (BitmapColor*) new BYTE[ nCount * sizeof( BitmapColor ) ];
+                                    const BitmapPalette&	rPal = pW->GetPalette();
+                                    const USHORT			nCount = rPal.GetEntryCount();
+                                    BitmapColor*			pMap = (BitmapColor*) new BYTE[ nCount * sizeof( BitmapColor ) ];
 
                                     for( USHORT i = 0; i < nCount; i++ )
                                     {
@@ -517,9 +517,9 @@ void OutputDevice::DrawTransparent( const PolyPolygon& rPolyPoly,
 
                                         for( nY = 0; nY < nHeight; nY++ )
                                         {
-                                            Scanline    pWScan = pW->GetScanline( nY );
-                                            Scanline    pRScan = pR->GetScanline( nY );
-                                            BYTE        cBit = 128;
+                                            Scanline	pWScan = pW->GetScanline( nY );
+                                            Scanline	pRScan = pR->GetScanline( nY );
+                                            BYTE		cBit = 128;
 
                                             for( nX = 0; nX < nWidth; nX++, cBit >>= 1, pWScan++ )
                                             {
@@ -550,9 +550,9 @@ void OutputDevice::DrawTransparent( const PolyPolygon& rPolyPoly,
 
                                         for( nY = 0; nY < nHeight; nY++ )
                                         {
-                                            Scanline    pWScan = pW->GetScanline( nY );
-                                            Scanline    pRScan = pR->GetScanline( nY );
-                                            BYTE        cBit = 128;
+                                            Scanline	pWScan = pW->GetScanline( nY );
+                                            Scanline	pRScan = pR->GetScanline( nY );
+                                            BYTE		cBit = 128;
 
                                             for( nX = 0; nX < nWidth; nX++, cBit >>= 1, pWScan += 3 )
                                             {
@@ -649,10 +649,10 @@ void OutputDevice::DrawTransparent( const GDIMetaFile& rMtf, const Point& rPos,
     }
     else
     {
-        GDIMetaFile*    pOldMetaFile = mpMetaFile;
-        Rectangle       aOutRect( LogicToPixel( rPos ), LogicToPixel( rSize ) );
-        Point           aPoint;
-        Rectangle       aDstRect( aPoint, GetOutputSizePixel() );
+        GDIMetaFile*	pOldMetaFile = mpMetaFile;
+        Rectangle		aOutRect( LogicToPixel( rPos ), LogicToPixel( rSize ) );
+        Point			aPoint;
+        Rectangle		aDstRect( aPoint, GetOutputSizePixel() );
 
         mpMetaFile = NULL;
         aDstRect.Intersection( aOutRect );
@@ -696,7 +696,7 @@ void OutputDevice::DrawTransparent( const GDIMetaFile& rMtf, const Point& rPos,
                     // copy MapMode state and disable for buffer
                     const bool bBufferMapModeEnabled(pVDev->IsMapModeEnabled());
                     pVDev->EnableMapMode(false);
-
+                    
                     // copy content from original to buffer
                     pVDev->DrawOutDev(
                         aPoint, pVDev->GetOutputSizePixel(), // dest
@@ -727,15 +727,15 @@ void OutputDevice::DrawTransparent( const GDIMetaFile& rMtf, const Point& rPos,
                 }
                 else
                 {
-                    Bitmap      aPaint, aMask;
-                    AlphaMask   aAlpha;
-                    MapMode     aMap( GetMapMode() );
-                    Point       aOutPos( PixelToLogic( aDstRect.TopLeft() ) );
-                    const BOOL  bOldMap = mbMap;
+                    Bitmap		aPaint, aMask;
+                    AlphaMask	aAlpha;
+                    MapMode 	aMap( GetMapMode() );
+                    Point		aOutPos( PixelToLogic( aDstRect.TopLeft() ) );
+                    const BOOL	bOldMap = mbMap;
 
                     aMap.SetOrigin( Point( -aOutPos.X(), -aOutPos.Y() ) );
                     pVDev->SetMapMode( aMap );
-                    const BOOL  bVDevOldMap = pVDev->IsMapModeEnabled();
+                    const BOOL	bVDevOldMap = pVDev->IsMapModeEnabled();
 
                     // create paint bitmap
                     ( (GDIMetaFile&) rMtf ).WindStart();
@@ -807,16 +807,16 @@ void OutputDevice::ImplDrawBitmapWallpaper( long nX, long nY,
                                             long nWidth, long nHeight,
                                             const Wallpaper& rWallpaper )
 {
-    BitmapEx                aBmpEx;
-    const BitmapEx*         pCached = rWallpaper.ImplGetImpWallpaper()->ImplGetCachedBitmap();
-    Point                   aPos;
-    Size                    aSize;
-    GDIMetaFile*            pOldMetaFile = mpMetaFile;
-    const WallpaperStyle    eStyle = rWallpaper.GetStyle();
-    const BOOL              bOldMap = mbMap;
-    BOOL                    bDrawn = FALSE;
-    BOOL                    bDrawGradientBackground = FALSE;
-    BOOL                    bDrawColorBackground = FALSE;
+    BitmapEx				aBmpEx;
+    const BitmapEx* 		pCached = rWallpaper.ImplGetImpWallpaper()->ImplGetCachedBitmap();
+    Point					aPos;
+    Size					aSize;
+    GDIMetaFile*			pOldMetaFile = mpMetaFile;
+    const WallpaperStyle	eStyle = rWallpaper.GetStyle();
+    const BOOL				bOldMap = mbMap;
+    BOOL					bDrawn = FALSE;
+    BOOL					bDrawGradientBackground = FALSE;
+    BOOL					bDrawColorBackground = FALSE;
 
     if( pCached )
         aBmpEx = *pCached;
@@ -946,10 +946,10 @@ void OutputDevice::ImplDrawBitmapWallpaper( long nX, long nY,
 
         default:
         {
-            const long  nRight = nX + nWidth - 1L;
-            const long  nBottom = nY + nHeight - 1L;
-            long        nFirstX;
-            long        nFirstY;
+            const long	nRight = nX + nWidth - 1L;
+            const long	nBottom = nY + nHeight - 1L;
+            long		nFirstX;
+            long		nFirstY;
 
             if( eStyle == WALLPAPER_TILE )
             {
@@ -962,10 +962,10 @@ void OutputDevice::ImplDrawBitmapWallpaper( long nX, long nY,
                 nFirstY = aPos.Y() + ( ( aSize.Height() - nBmpHeight ) >> 1 );
             }
 
-            const long  nOffX = ( nFirstX - nX ) % nBmpWidth;
-            const long  nOffY = ( nFirstY - nY ) % nBmpHeight;
-            long        nStartX = nX + nOffX;
-            long        nStartY = nY + nOffY;
+            const long	nOffX = ( nFirstX - nX ) % nBmpWidth;
+            const long	nOffY = ( nFirstY - nY ) % nBmpHeight;
+            long		nStartX = nX + nOffX;
+            long		nStartY = nY + nOffY;
 
             if( nOffX > 0L )
                 nStartX -= nBmpWidth;
@@ -987,11 +987,11 @@ void OutputDevice::ImplDrawBitmapWallpaper( long nX, long nY,
         // optimized for non-transparent bitmaps
         if( bDrawColorBackground )
         {
-            const Size      aBmpSize( aBmpEx.GetSizePixel() );
-            const Point     aTmpPoint;
+            const Size		aBmpSize( aBmpEx.GetSizePixel() );
+            const Point 	aTmpPoint;
             const Rectangle aOutRect( aTmpPoint, GetOutputSizePixel() );
             const Rectangle aColRect( Point( nX, nY ), Size( nWidth, nHeight ) );
-            Rectangle       aWorkRect;
+            Rectangle		aWorkRect;
 
             aWorkRect = Rectangle( 0, 0, aOutRect.Right(), aPos.Y() - 1L );
             aWorkRect.Justify();
@@ -1050,9 +1050,9 @@ void OutputDevice::ImplDrawGradientWallpaper( long nX, long nY,
                                               long nWidth, long nHeight,
                                               const Wallpaper& rWallpaper )
 {
-    Rectangle       aBound;
-    GDIMetaFile*    pOldMetaFile = mpMetaFile;
-    const BOOL      bOldMap = mbMap;
+    Rectangle		aBound;
+    GDIMetaFile*	pOldMetaFile = mpMetaFile;
+    const BOOL		bOldMap = mbMap;
     BOOL            bNeedGradient = TRUE;
 
 /*
@@ -1130,7 +1130,7 @@ void OutputDevice::DrawWallpaper( const Rectangle& rRect,
                                rWallpaper );
         }
     }
-
+    
     if( mpAlphaVDev )
         mpAlphaVDev->DrawWallpaper( rRect, rWallpaper );
 }
@@ -1141,20 +1141,20 @@ void OutputDevice::Erase()
 {
     if ( !IsDeviceOutputNecessary() || ImplIsRecordLayout() )
         return;
-
-    BOOL bNativeOK = FALSE;
+    
+    BOOL bNativeOK = FALSE; 
     if( meOutDevType == OUTDEV_WINDOW )
     {
         Window* pWindow = static_cast<Window*>(this);
-        ControlPart aCtrlPart = pWindow->ImplGetWindowImpl()->mnNativeBackground;
+        ControlPart aCtrlPart = pWindow->ImplGetWindowImpl()->mnNativeBackground; 
         if( aCtrlPart != 0 && ! pWindow->IsControlBackground() )
         {
             ImplControlValue    aControlValue;
             Point               aGcc3WorkaroundTemporary;
             Rectangle           aCtrlRegion( aGcc3WorkaroundTemporary, GetOutputSizePixel() );
             ControlState        nState = 0;
-
-            if( pWindow->IsEnabled() )              nState |= CTRL_STATE_ENABLED;
+            
+            if( pWindow->IsEnabled() ) 				nState |= CTRL_STATE_ENABLED;
             bNativeOK = pWindow->DrawNativeControl( CTRL_WINDOW_BACKGROUND, aCtrlPart, aCtrlRegion,
                                                     nState, aControlValue, rtl::OUString() );
         }
@@ -1211,7 +1211,7 @@ bool OutputDevice::DrawEPS( const Point& rPoint, const Size& rSize,
     if( mbOutputClipped )
         return bDrawn;
 
-    Rectangle   aRect( ImplLogicToDevicePixel( Rectangle( rPoint, rSize ) ) );
+    Rectangle	aRect( ImplLogicToDevicePixel( Rectangle( rPoint, rSize ) ) );
 
     if( !aRect.IsEmpty() )
     {
diff --git a/vcl/source/gdi/outdevnative.cxx b/vcl/source/gdi/outdevnative.cxx
index 521f4d7ea62d..986988e8a4be 100644
--- a/vcl/source/gdi/outdevnative.cxx
+++ b/vcl/source/gdi/outdevnative.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
@@ -292,7 +292,7 @@ BOOL OutputDevice::DrawNativeControl( ControlType nType,
     aTestRegion.Intersect( rControlRegion );
     if( aTestRegion == rControlRegion )
         nState |= CTRL_CACHING_ALLOWED;   // control is not clipped, caching allowed
-
+    
     BOOL bRet = mpGraphics->DrawNativeControl(nType, nPart, screenRegion, nState, *aScreenCtrlValue, aCaption, this );
 
     return bRet;
@@ -332,7 +332,7 @@ BOOL OutputDevice::DrawNativeControlText(ControlType nType,
     Rectangle screenRegion( ImplLogicToDevicePixel( rControlRegion ) );
 
     BOOL bRet = mpGraphics->DrawNativeControlText(nType, nPart, screenRegion, nState, *aScreenCtrlValue, aCaption, this );
-
+    
     return bRet;
 }
 
@@ -365,7 +365,7 @@ BOOL OutputDevice::GetNativeControlRegion(  ControlType nType,
                                 rNativeContentRegion, this );
     if( bRet )
     {
-        // transform back native regions
+        // transform back native regions    
         rNativeBoundingRegion = ImplDevicePixelToLogic( rNativeBoundingRegion );
         rNativeContentRegion = ImplDevicePixelToLogic( rNativeContentRegion );
     }
diff --git a/vcl/source/gdi/outmap.cxx b/vcl/source/gdi/outmap.cxx
index 189ba4c29e59..bc30058806a7 100644
--- a/vcl/source/gdi/outmap.cxx
+++ b/vcl/source/gdi/outmap.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
@@ -65,7 +65,7 @@ DBG_NAMEEX( Region )
 // =======================================================================
 
 static long aImplNumeratorAry[MAP_PIXEL+1] =
-    {    1,   1,   5,  50,    1,   1,  1, 1,  1,    1, 1 };
+    {	 1,   1,   5,  50,	  1,   1,  1, 1,  1,	1, 1 };
 static long aImplDenominatorAry[MAP_PIXEL+1] =
      { 2540, 254, 127, 127, 1000, 100, 10, 1, 72, 1440, 1 };
 
@@ -116,10 +116,10 @@ static Fraction ImplMakeFraction( long nN1, long nN2, long nD1, long nD2 )
 // -----------------------------------------------------------------------
 
 // Fraction.GetNumerator()
-// Fraction.GetDenominator()    > 0
-// rOutRes.nPixPerInch?         > 0
+// Fraction.GetDenominator()	> 0
+// rOutRes.nPixPerInch? 		> 0
 // rMapRes.nMapScNum?
-// rMapRes.nMapScDenom?         > 0
+// rMapRes.nMapScDenom? 		> 0
 
 static void ImplCalcBigIntThreshold( long nDPIX, long nDPIY,
                                      const ImplMapRes& rMapRes,
@@ -133,9 +133,9 @@ static void ImplCalcBigIntThreshold( long nDPIX, long nDPIY,
     else
     {
         // Schwellenwerte fuer BigInt Arithmetik berechnen
-        long    nDenomHalfX = rMapRes.mnMapScDenomX / 2;
-        ULONG   nDenomX     = rMapRes.mnMapScDenomX;
-        long    nProductX   = nDPIX * rMapRes.mnMapScNumX;
+        long	nDenomHalfX = rMapRes.mnMapScDenomX / 2;
+        ULONG	nDenomX 	= rMapRes.mnMapScDenomX;
+        long	nProductX	= nDPIX * rMapRes.mnMapScNumX;
 
         if ( !nProductX )
             rThresRes.mnThresLogToPixX = LONG_MAX;
@@ -158,9 +158,9 @@ static void ImplCalcBigIntThreshold( long nDPIX, long nDPIY,
     else
     {
         // Schwellenwerte fuer BigInt Arithmetik berechnen
-        long    nDenomHalfY = rMapRes.mnMapScDenomY / 2;
-        ULONG   nDenomY     = rMapRes.mnMapScDenomY;
-        long    nProductY   = nDPIY * rMapRes.mnMapScNumY;
+        long	nDenomHalfY = rMapRes.mnMapScDenomY / 2;
+        ULONG	nDenomY 	= rMapRes.mnMapScDenomY;
+        long	nProductY	= nDPIY * rMapRes.mnMapScNumY;
 
         if ( !nProductY )
             rThresRes.mnThresLogToPixY = LONG_MAX;
@@ -205,16 +205,16 @@ static void ImplCalcMapResolution( const MapMode& rMapMode,
             rMapRes.mnMapScDenomY = 254;
             break;
         case MAP_MM:
-            rMapRes.mnMapScNumX   = 5;      // 10
-            rMapRes.mnMapScDenomX = 127;    // 254
-            rMapRes.mnMapScNumY   = 5;      // 10
-            rMapRes.mnMapScDenomY = 127;    // 254
+            rMapRes.mnMapScNumX   = 5;		// 10
+            rMapRes.mnMapScDenomX = 127;	// 254
+            rMapRes.mnMapScNumY   = 5;		// 10
+            rMapRes.mnMapScDenomY = 127;	// 254
             break;
         case MAP_CM:
-            rMapRes.mnMapScNumX   = 50;     // 100
-            rMapRes.mnMapScDenomX = 127;    // 254
-            rMapRes.mnMapScNumY   = 50;     // 100
-            rMapRes.mnMapScDenomY = 127;    // 254
+            rMapRes.mnMapScNumX   = 50; 	// 100
+            rMapRes.mnMapScDenomX = 127;	// 254
+            rMapRes.mnMapScNumY   = 50; 	// 100
+            rMapRes.mnMapScDenomY = 127;	// 254
             break;
         case MAP_1000TH_INCH:
             rMapRes.mnMapScNumX   = 1;
@@ -688,8 +688,8 @@ Polygon OutputDevice::ImplLogicToDevicePixel( const Polygon& rLogicPoly ) const
     if ( !mbMap && !mnOutOffX && !mnOutOffY )
         return rLogicPoly;
 
-    USHORT  i;
-    USHORT  nPoints = rLogicPoly.GetSize();
+    USHORT	i;
+    USHORT	nPoints = rLogicPoly.GetSize();
     Polygon aPoly( rLogicPoly );
 
     // Pointer auf das Point-Array holen (Daten werden kopiert)
@@ -732,7 +732,7 @@ PolyPolygon OutputDevice::ImplLogicToDevicePixel( const PolyPolygon& rLogicPolyP
         return rLogicPolyPoly;
 
     PolyPolygon aPolyPoly( rLogicPolyPoly );
-    USHORT      nPoly = aPolyPoly.Count();
+    USHORT		nPoly = aPolyPoly.Count();
     for( USHORT i = 0; i < nPoly; i++ )
     {
         Polygon& rPoly = aPolyPoly[i];
@@ -813,12 +813,12 @@ Region OutputDevice::ImplPixelToDevicePixel( const Region& rRegion ) const
 
 // -----------------------------------------------------------------------
 
-void OutputDevice::EnableMapMode( BOOL bEnable )
-{
-    mbMap = (bEnable != 0);
+void OutputDevice::EnableMapMode( BOOL bEnable ) 
+{ 
+    mbMap = (bEnable != 0); 
 
     if( mpAlphaVDev )
-        mpAlphaVDev->EnableMapMode( bEnable );
+        mpAlphaVDev->EnableMapMode( bEnable );    
 }
 
 // -----------------------------------------------------------------------
@@ -832,12 +832,12 @@ void OutputDevice::SetMapMode()
 
     if ( mbMap || !maMapMode.IsDefault() )
     {
-        mbMap       = FALSE;
-        maMapMode   = MapMode();
+        mbMap		= FALSE;
+        maMapMode	= MapMode();
 
         // create new objects (clip region werden nicht neu skaliert)
-        mbNewFont   = TRUE;
-        mbInitFont  = TRUE;
+        mbNewFont	= TRUE;
+        mbInitFont	= TRUE;
         if ( GetOutDevType() == OUTDEV_WINDOW )
         {
             if ( ((Window*)this)->mpWindowImpl->mpCursor )
@@ -853,7 +853,7 @@ void OutputDevice::SetMapMode()
     }
 
     if( mpAlphaVDev )
-        mpAlphaVDev->SetMapMode();
+        mpAlphaVDev->SetMapMode();    
 }
 
 // -----------------------------------------------------------------------
@@ -889,14 +889,14 @@ void OutputDevice::SetMapMode( const MapMode& rNewMapMode )
         if ( (rNewMapMode.GetMapUnit() == maMapMode.GetMapUnit()) &&
              (rNewMapMode.GetScaleX()  == maMapMode.GetScaleX())  &&
              (rNewMapMode.GetScaleY()  == maMapMode.GetScaleY())  &&
-             (bOldMap                  == mbMap) )
+             (bOldMap				   == mbMap) )
         {
             // Offset setzen
             Point aOrigin = rNewMapMode.GetOrigin();
             maMapRes.mnMapOfsX = aOrigin.X();
             maMapRes.mnMapOfsY = aOrigin.Y();
             maMapMode = rNewMapMode;
-
+            
             // #i75163#
             ImplInvalidateViewTransform();
 
@@ -904,12 +904,12 @@ void OutputDevice::SetMapMode( const MapMode& rNewMapMode )
         }
         if ( !bOldMap && bRelMap )
         {
-            maMapRes.mnMapScNumX    = 1;
-            maMapRes.mnMapScNumY    = 1;
-            maMapRes.mnMapScDenomX  = mnDPIX;
-            maMapRes.mnMapScDenomY  = mnDPIY;
-            maMapRes.mnMapOfsX      = 0;
-            maMapRes.mnMapOfsY      = 0;
+            maMapRes.mnMapScNumX	= 1;
+            maMapRes.mnMapScNumY	= 1;
+            maMapRes.mnMapScDenomX	= mnDPIX;
+            maMapRes.mnMapScDenomY	= mnDPIY;
+            maMapRes.mnMapOfsX		= 0;
+            maMapRes.mnMapOfsY		= 0;
         }
 
         // Neue MapMode-Aufloesung berechnen
@@ -937,8 +937,8 @@ void OutputDevice::SetMapMode( const MapMode& rNewMapMode )
         maMapMode = rNewMapMode;
 
     // create new objects (clip region werden nicht neu skaliert)
-    mbNewFont   = TRUE;
-    mbInitFont  = TRUE;
+    mbNewFont	= TRUE;
+    mbInitFont	= TRUE;
     if ( GetOutDevType() == OUTDEV_WINDOW )
     {
         if ( ((Window*)this)->mpWindowImpl->mpCursor )
@@ -1102,22 +1102,22 @@ basegfx::B2DHomMatrix OutputDevice::GetInverseViewTransformation() const
 basegfx::B2DHomMatrix OutputDevice::GetViewTransformation( const MapMode& rMapMode ) const
 {
     // #i82615#
-    ImplMapRes          aMapRes;
-    ImplThresholdRes    aThresRes;
+    ImplMapRes			aMapRes;
+    ImplThresholdRes	aThresRes;
     ImplCalcMapResolution( rMapMode, mnDPIX, mnDPIY, aMapRes, aThresRes );
-
+    
     basegfx::B2DHomMatrix aTransform;
 
     const double fScaleFactorX((double)mnDPIX * (double)aMapRes.mnMapScNumX / (double)aMapRes.mnMapScDenomX);
     const double fScaleFactorY((double)mnDPIY * (double)aMapRes.mnMapScNumY / (double)aMapRes.mnMapScDenomY);
     const double fZeroPointX(((double)aMapRes.mnMapOfsX * fScaleFactorX) + (double)mnOutOffOrigX);
     const double fZeroPointY(((double)aMapRes.mnMapOfsY * fScaleFactorY) + (double)mnOutOffOrigY);
-
+    
     aTransform.set(0, 0, fScaleFactorX);
     aTransform.set(1, 1, fScaleFactorY);
     aTransform.set(0, 2, fZeroPointX);
     aTransform.set(1, 2, fZeroPointY);
-
+    
     return aTransform;
 }
 
@@ -1209,8 +1209,8 @@ Polygon OutputDevice::LogicToPixel( const Polygon& rLogicPoly ) const
     if ( !mbMap )
         return rLogicPoly;
 
-    USHORT  i;
-    USHORT  nPoints = rLogicPoly.GetSize();
+    USHORT	i;
+    USHORT	nPoints = rLogicPoly.GetSize();
     Polygon aPoly( rLogicPoly );
 
     // Pointer auf das Point-Array holen (Daten werden kopiert)
@@ -1243,7 +1243,7 @@ PolyPolygon OutputDevice::LogicToPixel( const PolyPolygon& rLogicPolyPoly ) cons
         return rLogicPolyPoly;
 
     PolyPolygon aPolyPoly( rLogicPolyPoly );
-    USHORT      nPoly = aPolyPoly.Count();
+    USHORT		nPoly = aPolyPoly.Count();
     for( USHORT i = 0; i < nPoly; i++ )
     {
         Polygon& rPoly = aPolyPoly[i];
@@ -1284,7 +1284,7 @@ Region OutputDevice::LogicToPixel( const Region& rLogicRegion ) const
     if ( !mbMap || (eType == REGION_EMPTY) || (eType == REGION_NULL) )
         return rLogicRegion;
 
-    Region          aRegion;
+    Region			aRegion;
     const ImplRegion& rImplRegion = *rLogicRegion.ImplGetImplRegion();
     const PolyPolygon* pPolyPoly = rImplRegion.mpPolyPoly;
     const basegfx::B2DPolyPolygon* pB2DPolyPoly = rImplRegion.mpB2DPolyPoly;
@@ -1300,12 +1300,12 @@ Region OutputDevice::LogicToPixel( const Region& rLogicRegion ) const
     }
     else
     {
-        long                nX;
-        long                nY;
-        long                nWidth;
-        long                nHeight;
-        ImplRegionInfo      aInfo;
-        BOOL                bRegionRect;
+        long				nX;
+        long				nY;
+        long				nWidth;
+        long				nHeight;
+        ImplRegionInfo		aInfo;
+        BOOL				bRegionRect;
 
         aRegion.ImplBeginAddRect();
         bRegionRect = rLogicRegion.ImplGetFirstRect( aInfo, nX, nY, nWidth, nHeight );
@@ -1332,8 +1332,8 @@ Point OutputDevice::LogicToPixel( const Point& rLogicPt,
         return rLogicPt;
 
     // MapMode-Aufloesung berechnen und Umrechnen
-    ImplMapRes          aMapRes;
-    ImplThresholdRes    aThresRes;
+    ImplMapRes			aMapRes;
+    ImplThresholdRes	aThresRes;
     ImplCalcMapResolution( rMapMode, mnDPIX, mnDPIY, aMapRes, aThresRes );
 
     return Point( ImplLogicToPixel( rLogicPt.X() + aMapRes.mnMapOfsX, mnDPIX,
@@ -1355,8 +1355,8 @@ Size OutputDevice::LogicToPixel( const Size& rLogicSize,
         return rLogicSize;
 
     // MapMode-Aufloesung berechnen und Umrechnen
-    ImplMapRes          aMapRes;
-    ImplThresholdRes    aThresRes;
+    ImplMapRes			aMapRes;
+    ImplThresholdRes	aThresRes;
     ImplCalcMapResolution( rMapMode, mnDPIX, mnDPIY, aMapRes, aThresRes );
 
     return Size( ImplLogicToPixel( rLogicSize.Width(), mnDPIX,
@@ -1378,8 +1378,8 @@ Rectangle OutputDevice::LogicToPixel( const Rectangle& rLogicRect,
         return rLogicRect;
 
     // MapMode-Aufloesung berechnen und Umrechnen
-    ImplMapRes          aMapRes;
-    ImplThresholdRes    aThresRes;
+    ImplMapRes			aMapRes;
+    ImplThresholdRes	aThresRes;
     ImplCalcMapResolution( rMapMode, mnDPIX, mnDPIY, aMapRes, aThresRes );
 
     return Rectangle( ImplLogicToPixel( rLogicRect.Left() + aMapRes.mnMapOfsX, mnDPIX,
@@ -1408,12 +1408,12 @@ Polygon OutputDevice::LogicToPixel( const Polygon& rLogicPoly,
         return rLogicPoly;
 
     // MapMode-Aufloesung berechnen und Umrechnen
-    ImplMapRes          aMapRes;
-    ImplThresholdRes    aThresRes;
+    ImplMapRes			aMapRes;
+    ImplThresholdRes	aThresRes;
     ImplCalcMapResolution( rMapMode, mnDPIX, mnDPIY, aMapRes, aThresRes );
 
-    USHORT  i;
-    USHORT  nPoints = rLogicPoly.GetSize();
+    USHORT	i;
+    USHORT	nPoints = rLogicPoly.GetSize();
     Polygon aPoly( rLogicPoly );
 
     // Pointer auf das Point-Array holen (Daten werden kopiert)
@@ -1431,7 +1431,7 @@ Polygon OutputDevice::LogicToPixel( const Polygon& rLogicPoly,
                                     aThresRes.mnThresLogToPixY )+mnOutOffOrigY;
         aPoly[i] = aPt;
     }
-
+    
     return aPoly;
 }
 
@@ -1447,7 +1447,7 @@ PolyPolygon OutputDevice::LogicToPixel( const PolyPolygon& rLogicPolyPoly,
         return rLogicPolyPoly;
 
     PolyPolygon aPolyPoly( rLogicPolyPoly );
-    USHORT      nPoly = aPolyPoly.Count();
+    USHORT		nPoly = aPolyPoly.Count();
     for( USHORT i = 0; i < nPoly; i++ )
     {
         Polygon& rPoly = aPolyPoly[i];
@@ -1491,19 +1491,19 @@ Region OutputDevice::LogicToPixel( const Region& rLogicRegion,
     if ( rMapMode.IsDefault() || (eType == REGION_EMPTY) || (eType == REGION_NULL) )
         return rLogicRegion;
 
-    Region          aRegion;
-    PolyPolygon*    pPolyPoly = rLogicRegion.ImplGetImplRegion()->mpPolyPoly;
+    Region			aRegion;
+    PolyPolygon*	pPolyPoly = rLogicRegion.ImplGetImplRegion()->mpPolyPoly;
 
     if( pPolyPoly )
         aRegion = Region( LogicToPixel( *pPolyPoly, rMapMode ) );
     else
     {
-        long                nX;
-        long                nY;
-        long                nWidth;
-        long                nHeight;
-        ImplRegionInfo      aInfo;
-        BOOL                bRegionRect;
+        long				nX;
+        long				nY;
+        long				nWidth;
+        long				nHeight;
+        ImplRegionInfo		aInfo;
+        BOOL				bRegionRect;
 
         aRegion.ImplBeginAddRect();
         bRegionRect = rLogicRegion.ImplGetFirstRect( aInfo, nX, nY, nWidth, nHeight );
@@ -1586,8 +1586,8 @@ Polygon OutputDevice::PixelToLogic( const Polygon& rDevicePoly ) const
     if ( !mbMap )
         return rDevicePoly;
 
-    USHORT  i;
-    USHORT  nPoints = rDevicePoly.GetSize();
+    USHORT	i;
+    USHORT	nPoints = rDevicePoly.GetSize();
     Polygon aPoly( rDevicePoly );
 
     // Pointer auf das Point-Array holen (Daten werden kopiert)
@@ -1620,7 +1620,7 @@ PolyPolygon OutputDevice::PixelToLogic( const PolyPolygon& rDevicePolyPoly ) con
         return rDevicePolyPoly;
 
     PolyPolygon aPolyPoly( rDevicePolyPoly );
-    USHORT      nPoly = aPolyPoly.Count();
+    USHORT		nPoly = aPolyPoly.Count();
     for( USHORT i = 0; i < nPoly; i++ )
     {
         Polygon& rPoly = aPolyPoly[i];
@@ -1661,19 +1661,19 @@ Region OutputDevice::PixelToLogic( const Region& rDeviceRegion ) const
     if ( !mbMap || (eType == REGION_EMPTY) || (eType == REGION_NULL) )
         return rDeviceRegion;
 
-    Region          aRegion;
-    PolyPolygon*    pPolyPoly = rDeviceRegion.ImplGetImplRegion()->mpPolyPoly;
+    Region			aRegion;
+    PolyPolygon*	pPolyPoly = rDeviceRegion.ImplGetImplRegion()->mpPolyPoly;
 
     if ( pPolyPoly )
         aRegion = Region( PixelToLogic( *pPolyPoly ) );
     else
     {
-        long                nX;
-        long                nY;
-        long                nWidth;
-        long                nHeight;
-        ImplRegionInfo      aInfo;
-        BOOL                bRegionRect;
+        long				nX;
+        long				nY;
+        long				nWidth;
+        long				nHeight;
+        ImplRegionInfo		aInfo;
+        BOOL				bRegionRect;
 
         aRegion.ImplBeginAddRect();
         bRegionRect = rDeviceRegion.ImplGetFirstRect( aInfo, nX, nY, nWidth, nHeight );
@@ -1701,8 +1701,8 @@ Point OutputDevice::PixelToLogic( const Point& rDevicePt,
         return rDevicePt;
 
     // MapMode-Aufloesung berechnen und Umrechnen
-    ImplMapRes          aMapRes;
-    ImplThresholdRes    aThresRes;
+    ImplMapRes			aMapRes;
+    ImplThresholdRes	aThresRes;
     ImplCalcMapResolution( rMapMode, mnDPIX, mnDPIY, aMapRes, aThresRes );
 
     return Point( ImplPixelToLogic( rDevicePt.X(), mnDPIX,
@@ -1725,8 +1725,8 @@ Size OutputDevice::PixelToLogic( const Size& rDeviceSize,
         return rDeviceSize;
 
     // MapMode-Aufloesung berechnen und Umrechnen
-    ImplMapRes          aMapRes;
-    ImplThresholdRes    aThresRes;
+    ImplMapRes			aMapRes;
+    ImplThresholdRes	aThresRes;
     ImplCalcMapResolution( rMapMode, mnDPIX, mnDPIY, aMapRes, aThresRes );
 
     return Size( ImplPixelToLogic( rDeviceSize.Width(), mnDPIX,
@@ -1749,8 +1749,8 @@ Rectangle OutputDevice::PixelToLogic( const Rectangle& rDeviceRect,
         return rDeviceRect;
 
     // MapMode-Aufloesung berechnen und Umrechnen
-    ImplMapRes          aMapRes;
-    ImplThresholdRes    aThresRes;
+    ImplMapRes			aMapRes;
+    ImplThresholdRes	aThresRes;
     ImplCalcMapResolution( rMapMode, mnDPIX, mnDPIY, aMapRes, aThresRes );
 
     return Rectangle( ImplPixelToLogic( rDeviceRect.Left(), mnDPIX,
@@ -1780,12 +1780,12 @@ Polygon OutputDevice::PixelToLogic( const Polygon& rDevicePoly,
         return rDevicePoly;
 
     // MapMode-Aufloesung berechnen und Umrechnen
-    ImplMapRes          aMapRes;
-    ImplThresholdRes    aThresRes;
+    ImplMapRes			aMapRes;
+    ImplThresholdRes	aThresRes;
     ImplCalcMapResolution( rMapMode, mnDPIX, mnDPIY, aMapRes, aThresRes );
 
-    USHORT  i;
-    USHORT  nPoints = rDevicePoly.GetSize();
+    USHORT	i;
+    USHORT	nPoints = rDevicePoly.GetSize();
     Polygon aPoly( rDevicePoly );
 
     // Pointer auf das Point-Array holen (Daten werden kopiert)
@@ -1819,7 +1819,7 @@ PolyPolygon OutputDevice::PixelToLogic( const PolyPolygon& rDevicePolyPoly,
         return rDevicePolyPoly;
 
     PolyPolygon aPolyPoly( rDevicePolyPoly );
-    USHORT      nPoly = aPolyPoly.Count();
+    USHORT		nPoly = aPolyPoly.Count();
     for( USHORT i = 0; i < nPoly; i++ )
     {
         Polygon& rPoly = aPolyPoly[i];
@@ -1863,19 +1863,19 @@ Region OutputDevice::PixelToLogic( const Region& rDeviceRegion,
     if ( rMapMode.IsDefault() || (eType == REGION_EMPTY) || (eType == REGION_NULL) )
         return rDeviceRegion;
 
-    Region          aRegion;
-    PolyPolygon*    pPolyPoly = rDeviceRegion.ImplGetImplRegion()->mpPolyPoly;
+    Region			aRegion;
+    PolyPolygon*	pPolyPoly = rDeviceRegion.ImplGetImplRegion()->mpPolyPoly;
 
     if ( pPolyPoly )
         aRegion = Region( PixelToLogic( *pPolyPoly, rMapMode ) );
     else
     {
-        long                nX;
-        long                nY;
-        long                nWidth;
-        long                nHeight;
-        ImplRegionInfo      aInfo;
-        BOOL                bRegionRect;
+        long				nX;
+        long				nY;
+        long				nWidth;
+        long				nHeight;
+        ImplRegionInfo		aInfo;
+        BOOL				bRegionRect;
 
         aRegion.ImplBeginAddRect();
         bRegionRect = rDeviceRegion.ImplGetFirstRect( aInfo, nX, nY, nWidth, nHeight );
@@ -1893,83 +1893,83 @@ Region OutputDevice::PixelToLogic( const Region& rDeviceRegion,
 
 // -----------------------------------------------------------------------
 
-#define ENTER0( rSource, pMapModeSource, pMapModeDest )                 \
-    if ( !pMapModeSource )                                              \
-        pMapModeSource = &maMapMode;                                    \
-    if ( !pMapModeDest )                                                \
-        pMapModeDest = &maMapMode;                                      \
-    if ( *pMapModeSource == *pMapModeDest )                             \
+#define ENTER0( rSource, pMapModeSource, pMapModeDest ) 				\
+    if ( !pMapModeSource )												\
+        pMapModeSource = &maMapMode;									\
+    if ( !pMapModeDest )												\
+        pMapModeDest = &maMapMode;										\
+    if ( *pMapModeSource == *pMapModeDest ) 							\
         return rSource
 
 // -----------------------------------------------------------------------
 
-#define ENTER1( rSource, pMapModeSource, pMapModeDest )                 \
-    ENTER0( rSource, pMapModeSource, pMapModeDest );                    \
+#define ENTER1( rSource, pMapModeSource, pMapModeDest ) 				\
+    ENTER0( rSource, pMapModeSource, pMapModeDest );					\
                                                                         \
-    ImplMapRes aMapResSource;                                           \
-    ImplMapRes aMapResDest;                                             \
+    ImplMapRes aMapResSource;											\
+    ImplMapRes aMapResDest; 											\
                                                                         \
-    if ( !mbMap || pMapModeSource != &maMapMode )                       \
-    {                                                                   \
-        if ( pMapModeSource->GetMapUnit() == MAP_RELATIVE )             \
-            aMapResSource = maMapRes;                                   \
-        ImplCalcMapResolution( *pMapModeSource,                         \
-                               mnDPIX, mnDPIY, aMapResSource );         \
-    }                                                                   \
-    else                                                                \
-        aMapResSource = maMapRes;                                       \
-    if ( !mbMap || pMapModeDest != &maMapMode )                         \
-    {                                                                   \
-        if ( pMapModeDest->GetMapUnit() == MAP_RELATIVE )               \
-            aMapResDest = maMapRes;                                     \
-        ImplCalcMapResolution( *pMapModeDest,                           \
-                               mnDPIX, mnDPIY, aMapResDest );           \
-    }                                                                   \
-    else                                                                \
+    if ( !mbMap || pMapModeSource != &maMapMode )						\
+    {																	\
+        if ( pMapModeSource->GetMapUnit() == MAP_RELATIVE ) 			\
+            aMapResSource = maMapRes;									\
+        ImplCalcMapResolution( *pMapModeSource, 						\
+                               mnDPIX, mnDPIY, aMapResSource ); 		\
+    }																	\
+    else																\
+        aMapResSource = maMapRes;										\
+    if ( !mbMap || pMapModeDest != &maMapMode ) 						\
+    {																	\
+        if ( pMapModeDest->GetMapUnit() == MAP_RELATIVE )				\
+            aMapResDest = maMapRes; 									\
+        ImplCalcMapResolution( *pMapModeDest,							\
+                               mnDPIX, mnDPIY, aMapResDest );			\
+    }																	\
+    else																\
         aMapResDest = maMapRes
 
 // -----------------------------------------------------------------------
 
-#define ENTER2( eUnitSource, eUnitDest )                                \
-    DBG_ASSERT( eUnitSource != MAP_SYSFONT                              \
-                && eUnitSource != MAP_APPFONT                           \
-                && eUnitSource != MAP_RELATIVE,                         \
+#define ENTER2( eUnitSource, eUnitDest )								\
+    DBG_ASSERT( eUnitSource != MAP_SYSFONT								\
+                && eUnitSource != MAP_APPFONT							\
+                && eUnitSource != MAP_RELATIVE, 						\
                 "Source MapUnit nicht erlaubt" );                       \
-    DBG_ASSERT( eUnitDest != MAP_SYSFONT                                \
-                && eUnitDest != MAP_APPFONT                             \
-                && eUnitDest != MAP_RELATIVE,                           \
+    DBG_ASSERT( eUnitDest != MAP_SYSFONT								\
+                && eUnitDest != MAP_APPFONT 							\
+                && eUnitDest != MAP_RELATIVE,							\
                 "Destination MapUnit nicht erlaubt" );                  \
-    DBG_ASSERTWARNING( eUnitSource != MAP_PIXEL,                        \
+    DBG_ASSERTWARNING( eUnitSource != MAP_PIXEL,						\
                        "MAP_PIXEL mit 72dpi angenaehert" );             \
-    DBG_ASSERTWARNING( eUnitDest != MAP_PIXEL,                          \
+    DBG_ASSERTWARNING( eUnitDest != MAP_PIXEL,							\
                        "MAP_PIXEL mit 72dpi angenaehert" )
 
 // -----------------------------------------------------------------------
 
-#define ENTER3( eUnitSource, eUnitDest )                                \
-    long nNumerator      = 1;       \
-    long nDenominator    = 1;       \
-    DBG_ASSERT( eUnitSource < MAP_LASTENUMDUMMY, "Invalid source map unit");    \
-    DBG_ASSERT( eUnitDest < MAP_LASTENUMDUMMY, "Invalid destination map unit"); \
-    if( (eUnitSource < MAP_LASTENUMDUMMY) && (eUnitDest < MAP_LASTENUMDUMMY) )  \
-    {   \
-        nNumerator   = aImplNumeratorAry[eUnitSource] *             \
-                           aImplDenominatorAry[eUnitDest];              \
-        nDenominator     = aImplNumeratorAry[eUnitDest] *               \
-                           aImplDenominatorAry[eUnitSource];            \
+#define ENTER3( eUnitSource, eUnitDest )								\
+    long nNumerator 	 = 1;		\
+    long nDenominator	 = 1;		\
+    DBG_ASSERT( eUnitSource < MAP_LASTENUMDUMMY, "Invalid source map unit");	\
+    DBG_ASSERT( eUnitDest < MAP_LASTENUMDUMMY, "Invalid destination map unit");	\
+    if( (eUnitSource < MAP_LASTENUMDUMMY) && (eUnitDest < MAP_LASTENUMDUMMY) )	\
+    {	\
+        nNumerator 	 = aImplNumeratorAry[eUnitSource] * 			\
+                           aImplDenominatorAry[eUnitDest];				\
+        nDenominator	 = aImplNumeratorAry[eUnitDest] *				\
+                           aImplDenominatorAry[eUnitSource];			\
     } \
-    if ( eUnitSource == MAP_PIXEL )                                     \
-        nDenominator *= 72;                                             \
-    else if( eUnitDest == MAP_PIXEL )                                   \
+    if ( eUnitSource == MAP_PIXEL ) 									\
+        nDenominator *= 72; 											\
+    else if( eUnitDest == MAP_PIXEL )									\
         nNumerator *= 72
 
 // -----------------------------------------------------------------------
 
-#define ENTER4( rMapModeSource, rMapModeDest )                          \
-    ImplMapRes aMapResSource;                                           \
-    ImplMapRes aMapResDest;                                             \
+#define ENTER4( rMapModeSource, rMapModeDest )							\
+    ImplMapRes aMapResSource;											\
+    ImplMapRes aMapResDest; 											\
                                                                         \
-    ImplCalcMapResolution( rMapModeSource, 72, 72, aMapResSource );     \
+    ImplCalcMapResolution( rMapModeSource, 72, 72, aMapResSource ); 	\
     ImplCalcMapResolution( rMapModeDest, 72, 72, aMapResDest )
 
 // -----------------------------------------------------------------------
@@ -2114,8 +2114,8 @@ static long fn3( const long n1, const long n2, const long n3 )
     } // of if
     else
     {
-        long        n4 = n1 * n2;
-        const long  n3_2 = n3 / 2;
+        long		n4 = n1 * n2;
+        const long	n3_2 = n3 / 2;
 
         if( n4 < 0 )
         {
@@ -2217,7 +2217,7 @@ Point OutputDevice::LogicToLogic( const Point& rPtSource,
         return rPtSource;
 
     MapUnit eUnitSource = rMapModeSource.GetMapUnit();
-    MapUnit eUnitDest   = rMapModeDest.GetMapUnit();
+    MapUnit eUnitDest	= rMapModeDest.GetMapUnit();
     ENTER2( eUnitSource, eUnitDest );
 
     if ( rMapModeSource.mpImplMapMode->mbSimple &&
@@ -2253,7 +2253,7 @@ Size OutputDevice::LogicToLogic( const Size& rSzSource,
         return rSzSource;
 
     MapUnit eUnitSource = rMapModeSource.GetMapUnit();
-    MapUnit eUnitDest   = rMapModeDest.GetMapUnit();
+    MapUnit eUnitDest	= rMapModeDest.GetMapUnit();
     ENTER2( eUnitSource, eUnitDest );
 
     if ( rMapModeSource.mpImplMapMode->mbSimple &&
@@ -2287,7 +2287,7 @@ basegfx::B2DPolygon OutputDevice::LogicToLogic( const basegfx::B2DPolygon& rPoly
         return rPolySource;
 
     MapUnit eUnitSource = rMapModeSource.GetMapUnit();
-    MapUnit eUnitDest   = rMapModeDest.GetMapUnit();
+    MapUnit eUnitDest	= rMapModeDest.GetMapUnit();
     ENTER2( eUnitSource, eUnitDest );
 
     basegfx::B2DHomMatrix aTransform;
@@ -2332,7 +2332,7 @@ basegfx::B2DPolyPolygon OutputDevice::LogicToLogic( const basegfx::B2DPolyPolygo
         return rPolySource;
 
     MapUnit eUnitSource = rMapModeSource.GetMapUnit();
-    MapUnit eUnitDest   = rMapModeDest.GetMapUnit();
+    MapUnit eUnitDest	= rMapModeDest.GetMapUnit();
     ENTER2( eUnitSource, eUnitDest );
 
     basegfx::B2DHomMatrix aTransform;
@@ -2377,7 +2377,7 @@ Rectangle OutputDevice::LogicToLogic( const Rectangle& rRectSource,
         return rRectSource;
 
     MapUnit eUnitSource = rMapModeSource.GetMapUnit();
-    MapUnit eUnitDest   = rMapModeDest.GetMapUnit();
+    MapUnit eUnitDest	= rMapModeDest.GetMapUnit();
     ENTER2( eUnitSource, eUnitDest );
 
     if ( rMapModeSource.mpImplMapMode->mbSimple &&
@@ -2470,7 +2470,7 @@ long Window::ImplLogicUnitToPixelX( long nX, MapUnit eUnit )
 
         // Es wird kein BigInt gebraucht, da diese Funktion nur zur Umrechnung
         // von Fensterposition benutzt wird
-        nX  = nX * mnDPIX * pFrameData->maMapUnitRes.mnMapScNumX;
+        nX	= nX * mnDPIX * pFrameData->maMapUnitRes.mnMapScNumX;
         nX += nX >= 0 ?  (pFrameData->maMapUnitRes.mnMapScDenomX/2) :
                         -((pFrameData->maMapUnitRes.mnMapScDenomX-1)/2);
         nX /= pFrameData->maMapUnitRes.mnMapScDenomX;
@@ -2497,7 +2497,7 @@ long Window::ImplLogicUnitToPixelY( long nY, MapUnit eUnit )
 
         // Es wird kein BigInt gebraucht, da diese Funktion nur zur Umrechnung
         // von Fensterposition benutzt wird
-        nY  = nY * mnDPIY * pFrameData->maMapUnitRes.mnMapScNumY;
+        nY	= nY * mnDPIY * pFrameData->maMapUnitRes.mnMapScNumY;
         nY += nY >= 0 ?  (pFrameData->maMapUnitRes.mnMapScDenomY/2) :
                         -((pFrameData->maMapUnitRes.mnMapScDenomY-1)/2);
         nY /= pFrameData->maMapUnitRes.mnMapScDenomY;
diff --git a/vcl/source/gdi/pdfextoutdevdata.cxx b/vcl/source/gdi/pdfextoutdevdata.cxx
index 046bc4a8951d..ca5d716f8540 100644
--- a/vcl/source/gdi/pdfextoutdevdata.cxx
+++ b/vcl/source/gdi/pdfextoutdevdata.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
@@ -69,31 +69,31 @@ struct PDFExtOutDevDataSync
                     EndGroupGfxLink
     };
 
-    sal_uInt32  nIdx;
-    Action      eAct;
+    sal_uInt32	nIdx;
+    Action		eAct;
 };
 
 struct GlobalSyncData
 {
-    std::deque< PDFExtOutDevDataSync::Action >  mActions;
-    std::deque< MapMode >                       mParaMapModes;
-    std::deque< Rectangle >                     mParaRects;
-    std::deque< sal_Int32 >                     mParaInts;
-    std::deque< sal_uInt32 >                    mParauInts;
-    std::deque< rtl::OUString >                 mParaOUStrings;
-    std::deque< PDFWriter::DestAreaType >       mParaDestAreaTypes;
-    std::deque< PDFNote >                       mParaPDFNotes;
-    std::deque< PDFWriter::PageTransition >     mParaPageTransitions;
+    std::deque< PDFExtOutDevDataSync::Action >	mActions;
+    std::deque< MapMode >						mParaMapModes;
+    std::deque< Rectangle >						mParaRects;
+    std::deque< sal_Int32 >						mParaInts;
+    std::deque< sal_uInt32 >					mParauInts;
+    std::deque< rtl::OUString >					mParaOUStrings;
+    std::deque< PDFWriter::DestAreaType >		mParaDestAreaTypes;
+    std::deque< PDFNote >						mParaPDFNotes;
+    std::deque< PDFWriter::PageTransition >		mParaPageTransitions;
 
     sal_Int32 GetMappedId();
     sal_Int32 GetMappedStructId( sal_Int32 );
 
-    sal_Int32                   mCurId;
-    std::vector< sal_Int32 >    mParaIds;
-    std::vector< sal_Int32 >    mStructIdMap;
+    sal_Int32					mCurId;
+    std::vector< sal_Int32 >	mParaIds;
+    std::vector< sal_Int32 >	mStructIdMap;
 
-    sal_Int32                   mCurrentStructElement;
-    std::vector< sal_Int32 >    mStructParents;
+    sal_Int32					mCurrentStructElement;
+    std::vector< sal_Int32 >	mStructParents;
     GlobalSyncData() :
             mCurId ( 0 ),
             mCurrentStructElement( 0 )
@@ -118,7 +118,7 @@ sal_Int32 GlobalSyncData::GetMappedId()
             nLinkId = mParaIds[ nLinkId ];
         else
             nLinkId = -1;
-
+    
         DBG_ASSERT( nLinkId >= 0, "unmapped id in GlobalSyncData" );
     }
 
@@ -272,19 +272,19 @@ void GlobalSyncData::PlayGlobalActions( PDFWriter& rWriter )
 
 struct PageSyncData
 {
-    std::deque< PDFExtOutDevDataSync >              mActions;
-    std::deque< Rectangle >                         mParaRects;
-    std::deque< sal_Int32 >                         mParaInts;
-    std::deque< rtl::OUString >                     mParaOUStrings;
-    std::deque< PDFWriter::StructElement >          mParaStructElements;
-    std::deque< PDFWriter::StructAttribute >        mParaStructAttributes;
-    std::deque< PDFWriter::StructAttributeValue >   mParaStructAttributeValues;
-    std::deque< Graphic >                           mGraphics;
+    std::deque< PDFExtOutDevDataSync >				mActions;
+    std::deque< Rectangle >							mParaRects;
+    std::deque< sal_Int32 >							mParaInts;
+    std::deque< rtl::OUString >						mParaOUStrings;
+    std::deque< PDFWriter::StructElement >			mParaStructElements;
+    std::deque< PDFWriter::StructAttribute >		mParaStructAttributes;
+    std::deque< PDFWriter::StructAttributeValue >	mParaStructAttributeValues;
+    std::deque< Graphic >							mGraphics;
     std::deque< ::boost::shared_ptr< PDFWriter::AnyWidget > >
                                                     mControls;
-    GlobalSyncData*                                 mpGlobalData;
+    GlobalSyncData*									mpGlobalData;
 
-    sal_Bool                                        mbGroupIgnoreGDIMtfActions;
+    sal_Bool										mbGroupIgnoreGDIMtfActions;
 
     PageSyncData( GlobalSyncData* pGlobal ) : mbGroupIgnoreGDIMtfActions ( sal_False ) { mpGlobalData = pGlobal; }
 
@@ -301,7 +301,7 @@ void PageSyncData::PushAction( const OutputDevice& rOutDev, const PDFExtOutDevDa
     if ( pMtf )
         aSync.nIdx = pMtf->GetActionCount();
     else
-        aSync.nIdx = 0x7fffffff;    // sync not possible
+        aSync.nIdx = 0x7fffffff;	// sync not possible
     mActions.push_back( aSync );
 }
 sal_Bool PageSyncData::PlaySyncPageAct( PDFWriter& rWriter, sal_uInt32& rCurGDIMtfAction, const PDFExtOutDevData& rOutDevData )
@@ -376,7 +376,7 @@ sal_Bool PageSyncData::PlaySyncPageAct( PDFWriter& rWriter, sal_uInt32& rCurGDIM
             break;
             case PDFExtOutDevDataSync::BeginGroup :
             {
-                /* first determining if this BeginGroup is starting a GfxLink,
+                /* first determining if this BeginGroup is starting a GfxLink, 
                    by searching for a EndGroup or a EndGroupGfxLink */
                 mbGroupIgnoreGDIMtfActions = sal_False;
                 std::deque< PDFExtOutDevDataSync >::iterator aBeg = mActions.begin();
@@ -426,7 +426,7 @@ sal_Bool PageSyncData::PlaySyncPageAct( PDFWriter& rWriter, sal_uInt32& rCurGDIM
                 {
                     sal_Bool bClippingNeeded = ( aOutputRect != aVisibleOutputRect ) && !aVisibleOutputRect.IsEmpty();
 
-                    GfxLink   aGfxLink( aGraphic.GetLink() );
+                    GfxLink	  aGfxLink( aGraphic.GetLink() );
                     if ( aGfxLink.GetType() == GFX_LINK_TYPE_NATIVE_JPG )
                     {
                         if ( bClippingNeeded )
@@ -479,17 +479,17 @@ sal_Bool PageSyncData::PlaySyncPageAct( PDFWriter& rWriter, sal_uInt32& rCurGDIM
 
 TYPEINIT1(PDFExtOutDevData,ExtOutDevData);
 PDFExtOutDevData::PDFExtOutDevData( const OutputDevice& rOutDev ) :
-    mrOutDev                ( rOutDev ),
-    mbTaggedPDF             ( sal_False ),
-    mbExportNotes           ( sal_True ),
-    mbTransitionEffects     ( sal_True ),
+    mrOutDev				( rOutDev ),
+    mbTaggedPDF				( sal_False ),
+    mbExportNotes			( sal_True ),
+    mbTransitionEffects		( sal_True ),
     mbUseLosslessCompression( sal_True ),
-    mbReduceImageResolution ( sal_False ),
+    mbReduceImageResolution	( sal_False ),
     mbExportNDests          ( sal_False ),
-    mnFormsFormat           ( 0 ),
-    mnPage                  ( -1 ),
-    mpPageSyncData          ( NULL ),
-    mpGlobalSyncData        ( new GlobalSyncData() )
+    mnFormsFormat			( 0 ),
+    mnPage					( -1 ),
+    mpPageSyncData			( NULL ),
+    mpGlobalSyncData		( new GlobalSyncData() )
 {
     mpPageSyncData = new PageSyncData( mpGlobalSyncData );
 }
@@ -611,7 +611,7 @@ void PDFExtOutDevData::PlayGlobalActions( PDFWriter& rWriter )
 //--->i56629
 sal_Int32 PDFExtOutDevData::CreateNamedDest(const String& sDestName,  const Rectangle& rRect, sal_Int32 nPageNr, PDFWriter::DestAreaType eType )
 {
-    mpGlobalSyncData->mActions.push_back( PDFExtOutDevDataSync::CreateNamedDest );
+    mpGlobalSyncData->mActions.push_back( PDFExtOutDevDataSync::CreateNamedDest );    
     mpGlobalSyncData->mParaOUStrings.push_back( sDestName );
     mpGlobalSyncData->mParaRects.push_back( rRect );
     mpGlobalSyncData->mParaMapModes.push_back( mrOutDev.GetMapMode() );
@@ -783,10 +783,10 @@ void PDFExtOutDevData::EndGroup()
 {
     mpPageSyncData->PushAction( mrOutDev, PDFExtOutDevDataSync::EndGroup );
 }
-void PDFExtOutDevData::EndGroup( const Graphic&     rGraphic,
-                                 BYTE               nTransparency,
-                                 const Rectangle&   rOutputRect,
-                                 const Rectangle&   rVisibleOutputRect )
+void PDFExtOutDevData::EndGroup( const Graphic& 	rGraphic,
+                                 BYTE				nTransparency,
+                                 const Rectangle& 	rOutputRect,
+                                 const Rectangle& 	rVisibleOutputRect )
 {
     mpPageSyncData->PushAction( mrOutDev, PDFExtOutDevDataSync::EndGroupGfxLink );
     mpPageSyncData->mGraphics.push_back( rGraphic );
diff --git a/vcl/source/gdi/pdffontcache.cxx b/vcl/source/gdi/pdffontcache.cxx
index 507ede81ef24..38e8583f4d5b 100644
--- a/vcl/source/gdi/pdffontcache.cxx
+++ b/vcl/source/gdi/pdffontcache.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
diff --git a/vcl/source/gdi/pdffontcache.hxx b/vcl/source/gdi/pdffontcache.hxx
index 06ffff86b070..8ded4e82d255 100644
--- a/vcl/source/gdi/pdffontcache.hxx
+++ b/vcl/source/gdi/pdffontcache.hxx
@@ -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
@@ -42,10 +42,10 @@ namespace vcl
             sal_IntPtr      m_nFontId;
             int             m_nMagic;
             bool            m_bVertical;
-
+            
             FontIdentifier( const ImplFontData*, bool bVertical );
             FontIdentifier() : m_nFontId(0), m_nMagic(0), m_bVertical( false ) {}
-
+            
             bool operator==( const FontIdentifier& rRight ) const
             {
                 return m_nFontId == rRight.m_nFontId &&
@@ -65,15 +65,15 @@ namespace vcl
             Ucs2UIntMap  m_aGlyphIdToIndex;
         };
         typedef std::map< FontIdentifier, sal_uInt32 > FontToIndexMap;
-
+        
         std::vector< FontData >     m_aFonts;
         FontToIndexMap              m_aFontToIndex;
-
+        
         FontData& getFont( const ImplFontData*, bool bVertical );
         public:
         PDFFontCache() {}
         ~PDFFontCache() {}
-
+        
         sal_Int32 getGlyphWidth( const ImplFontData*, sal_GlyphId, bool bVertical, SalGraphics* );
     };
 }
diff --git a/vcl/source/gdi/pdfwriter.cxx b/vcl/source/gdi/pdfwriter.cxx
index 5dcce25a0315..1f93a6a8105c 100644
--- a/vcl/source/gdi/pdfwriter.cxx
+++ b/vcl/source/gdi/pdfwriter.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
diff --git a/vcl/source/gdi/pdfwriter_impl.cxx b/vcl/source/gdi/pdfwriter_impl.cxx
index 7b7f3bbcb4d3..eb989cdc4c72 100644
--- a/vcl/source/gdi/pdfwriter_impl.cxx
+++ b/vcl/source/gdi/pdfwriter_impl.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
@@ -106,11 +106,11 @@ void doTestCode()
     rtl::OUString aTestFile( RTL_CONSTASCII_USTRINGPARAM( "file://" ) );
     aTestFile += rtl::OUString( pHome, strlen( pHome ), RTL_TEXTENCODING_MS_1252 );
     aTestFile += rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "/pdf_export_test.pdf" ) );
-
+    
     PDFWriter::PDFWriterContext aContext;
-    aContext.URL            = aTestFile;
-    aContext.Version        = PDFWriter::PDF_1_4;
-    aContext.Tagged         = true;
+    aContext.URL			= aTestFile;
+    aContext.Version		= PDFWriter::PDF_1_4;
+    aContext.Tagged			= true;
     aContext.InitialPage    = 2;
 
     PDFWriter aWriter( aContext );
@@ -211,7 +211,7 @@ void doTestCode()
     aWriter.BeginStructureElement( PDFWriter::Caption );
     aWriter.DrawText( Point( 4500, 9000 ), String( RTL_CONSTASCII_USTRINGPARAM( "Some drawing stuff inside the structure" ) ) );
     aWriter.EndStructureElement();
-
+    
     // test clipping
     basegfx::B2DPolyPolygon aClip;
     basegfx::B2DPolygon aClipPoly;
@@ -222,7 +222,7 @@ void doTestCode()
     aClipPoly.setClosed( true );
     //aClipPoly.flip();
     aClip.append( aClipPoly );
-
+    
     aWriter.Push( PUSH_CLIPREGION | PUSH_FILLCOLOR );
     aWriter.SetClipRegion( aClip );
     aWriter.DrawEllipse( Rectangle( Point( 4500, 9600 ), Size( 12000, 3000 ) ) );
@@ -679,7 +679,7 @@ void PDFWriterImpl::createWidgetFieldName( sal_Int32 i_nWidgetIndex, const PDFWr
             appendHex( (sal_Int8)pStr[i], aBuffer );
         }
     }
-
+    
     OString aFullName( aBuffer.makeStringAndClear() );
 
     /* #i82785# create hierarchical fields down to the for each dot in i_rName */
@@ -752,7 +752,7 @@ void PDFWriterImpl::createWidgetFieldName( sal_Int32 i_nWidgetIndex, const PDFWr
             }
         }
     } while( nTokenIndex != -1 );
-
+    
     // insert widget into its hierarchy field
     if( aDomain.getLength() )
     {
@@ -768,7 +768,7 @@ void PDFWriterImpl::createWidgetFieldName( sal_Int32 i_nWidgetIndex, const PDFWr
             }
         }
     }
-
+    
     if( aPartialName.getLength() == 0 )
     {
         // how funny, an empty field name
@@ -784,7 +784,7 @@ void PDFWriterImpl::createWidgetFieldName( sal_Int32 i_nWidgetIndex, const PDFWr
     if( ! m_aContext.AllowDuplicateFieldNames )
     {
         std::hash_map<OString, sal_Int32, OStringHash>::iterator it = m_aFieldNameMap.find( aFullName );
-
+    
         if( it != m_aFieldNameMap.end() ) // not unique
         {
             std::hash_map< OString, sal_Int32, OStringHash >::const_iterator check_it;
@@ -822,11 +822,11 @@ static void appendFixedInt( sal_Int32 nValue, OStringBuffer& rBuffer, sal_Int32
     while( nDiv-- )
         nFactor *= 10;
 
-    sal_Int32 nInt      = nValue / nFactor;
+    sal_Int32 nInt		= nValue / nFactor;
     rBuffer.append( nInt );
     if( nFactor > 1 )
     {
-        sal_Int32 nDecimal  = nValue % nFactor;
+        sal_Int32 nDecimal	= nValue % nFactor;
         if( nDecimal )
         {
             rBuffer.append( '.' );
@@ -917,7 +917,7 @@ static void appendNonStrokingColor( const Color& rColor, OStringBuffer& rBuffer
 // TODO: use basegfx matrix class instead or derive from it
 namespace vcl // TODO: use anonymous namespace to keep this class local
 {
-/*  for sparse matrices of the form (2D linear transformations)
+/*	for sparse matrices of the form (2D linear transformations)
  *  f[0] f[1] 0
  *  f[2] f[3] 0
  *  f[4] f[5] 1
@@ -1378,7 +1378,7 @@ void PDFWriterImpl::PDFPage::appendPoint( const Point& rPoint, OStringBuffer& rB
                                m_pWriter->getReferenceDevice(),
                                rPoint ) );
 
-    sal_Int32 nValue    = aPoint.X();
+    sal_Int32 nValue	= aPoint.X();
     if( bNeg )
         nValue = -nValue;
 
@@ -1386,7 +1386,7 @@ void PDFWriterImpl::PDFPage::appendPoint( const Point& rPoint, OStringBuffer& rB
 
     rBuffer.append( ' ' );
 
-    nValue      = pointToPixel(getHeight()) - aPoint.Y();
+    nValue		= pointToPixel(getHeight()) - aPoint.Y();
     if( bNeg )
         nValue = -nValue;
 
@@ -1395,13 +1395,13 @@ void PDFWriterImpl::PDFPage::appendPoint( const Point& rPoint, OStringBuffer& rB
 
 void PDFWriterImpl::PDFPage::appendPixelPoint( const basegfx::B2DPoint& rPoint, OStringBuffer& rBuffer ) const
 {
-    double fValue   = pixelToPoint(rPoint.getX());
+    double fValue	= pixelToPoint(rPoint.getX());
 
     appendDouble( fValue, rBuffer, nLog10Divisor );
 
     rBuffer.append( ' ' );
 
-    fValue      = double(getHeight()) - pixelToPoint(rPoint.getY());
+    fValue		= double(getHeight()) - pixelToPoint(rPoint.getY());
 
     appendDouble( fValue, rBuffer, nLog10Divisor );
 }
@@ -1427,10 +1427,10 @@ void PDFWriterImpl::PDFPage::convertRect( Rectangle& rRect ) const
                               m_pWriter->m_aMapMode,
                               m_pWriter->getReferenceDevice(),
                               rRect.GetSize() );
-    rRect.Left()    = aLL.X();
-    rRect.Right()   = aLL.X() + aSize.Width();
-    rRect.Top()     = pointToPixel(getHeight()) - aLL.Y();
-    rRect.Bottom()  = rRect.Top() + aSize.Height();
+    rRect.Left()	= aLL.X();
+    rRect.Right()	= aLL.X() + aSize.Width();
+    rRect.Top()		= pointToPixel(getHeight()) - aLL.Y();
+    rRect.Bottom()	= rRect.Top() + aSize.Height();
 }
 
 void PDFWriterImpl::PDFPage::appendPolygon( const Polygon& rPoly, OStringBuffer& rBuffer, bool bClose ) const
@@ -1509,7 +1509,7 @@ void PDFWriterImpl::PDFPage::appendPolygon( const basegfx::B2DPolygon& rPoly, OS
             if( i != nPoints || aPoly.isClosed() )
             {
                 sal_uInt32 nCurPoint  = i % nPoints;
-                sal_uInt32 nLastPoint = i-1;
+                sal_uInt32 nLastPoint = i-1; 
                 basegfx::B2DPoint aPoint( aPoly.getB2DPoint( nCurPoint ) );
                 if( aPoly.isNextControlPointUsed( nLastPoint ) &&
                     aPoly.isPrevControlPointUsed( nCurPoint ) )
@@ -1592,7 +1592,7 @@ void PDFWriterImpl::PDFPage::appendMappedLength( double fLength, OStringBuffer&
     Size aSize( lcl_convert( m_pWriter->m_aGraphicsStack.front().m_aMapMode,
                              m_pWriter->m_aMapMode,
                              m_pWriter->getReferenceDevice(),
-                             Size( 1000, 1000 ) ) );
+                             Size( 1000, 1000 )	) );
     if( pOutLength )
         *pOutLength = (sal_Int32)(fLength*(double)(bVertical ? aSize.Height() : aSize.Width())/1000.0);
     fLength *= pixelToPoint((double)(bVertical ? aSize.Height() : aSize.Width()) / 1000.0);
@@ -1730,16 +1730,16 @@ PDFWriterImpl::PDFWriterImpl( const PDFWriter::PDFWriterContext& rContext )
 #endif
     m_aContext = rContext;
     m_aStructure.push_back( PDFStructureElement() );
-    m_aStructure[0].m_nOwnElement       = 0;
-    m_aStructure[0].m_nParentElement    = 0;
+    m_aStructure[0].m_nOwnElement		= 0;
+    m_aStructure[0].m_nParentElement	= 0;
 
     Font aFont;
     aFont.SetName( String( RTL_CONSTASCII_USTRINGPARAM( "Times" ) ) );
     aFont.SetSize( Size( 0, 12 ) );
 
     GraphicsState aState;
-    aState.m_aMapMode       = m_aMapMode;
-    aState.m_aFont          = aFont;
+    aState.m_aMapMode		= m_aMapMode;
+    aState.m_aFont			= aFont;
     m_aGraphicsStack.push_front( aState );
 
     oslFileError  aError = osl_openFile( m_aContext.URL.pData, &m_aFile, osl_File_OpenFlag_Write | osl_File_OpenFlag_Create );
@@ -1812,12 +1812,12 @@ PDFWriterImpl::~PDFWriterImpl()
 
 void PDFWriterImpl::setDocInfo( const PDFDocInfo& rInfo )
 {
-    m_aDocInfo.Title                = rInfo.Title;
-    m_aDocInfo.Author               = rInfo.Author;
-    m_aDocInfo.Subject              = rInfo.Subject;
-    m_aDocInfo.Keywords             = rInfo.Keywords;
-    m_aDocInfo.Creator              = rInfo.Creator;
-    m_aDocInfo.Producer             = rInfo.Producer;
+    m_aDocInfo.Title				= rInfo.Title;
+    m_aDocInfo.Author				= rInfo.Author;
+    m_aDocInfo.Subject				= rInfo.Subject;
+    m_aDocInfo.Keywords				= rInfo.Keywords;
+    m_aDocInfo.Creator				= rInfo.Creator;
+    m_aDocInfo.Producer				= rInfo.Producer;
 
 //build the document id
     rtl::OString aInfoValuesOut;
@@ -2230,20 +2230,20 @@ void PDFWriterImpl::getFontMetric( ImplFontSelectData* pSelect, ImplFontMetricDa
         return;
     const BuiltinFont* pBuiltinFont = pFD->GetBuiltinFont();
 
-    pMetric->mnOrientation  = sal::static_int_cast<short>(pSelect->mnOrientation);
-    pMetric->meFamily       = pBuiltinFont->m_eFamily;
-    pMetric->mePitch        = pBuiltinFont->m_ePitch;
-    pMetric->meWeight       = pBuiltinFont->m_eWeight;
-    pMetric->meItalic       = pBuiltinFont->m_eItalic;
-    pMetric->mbSymbolFlag   = pFD->IsSymbolFont();
-    pMetric->mnWidth        = pSelect->mnHeight;
-    pMetric->mnAscent       = ( pSelect->mnHeight * +pBuiltinFont->m_nAscent + 500 ) / 1000;
-    pMetric->mnDescent      = ( pSelect->mnHeight * -pBuiltinFont->m_nDescent + 500 ) / 1000;
-    pMetric->mnIntLeading   = 0;
-    pMetric->mnExtLeading   = 0;
-    pMetric->mnSlant        = 0;
-    pMetric->mbScalableFont = true;
-    pMetric->mbDevice       = true;
+    pMetric->mnOrientation	= sal::static_int_cast<short>(pSelect->mnOrientation);
+    pMetric->meFamily		= pBuiltinFont->m_eFamily;
+    pMetric->mePitch		= pBuiltinFont->m_ePitch;
+    pMetric->meWeight		= pBuiltinFont->m_eWeight;
+    pMetric->meItalic		= pBuiltinFont->m_eItalic;
+    pMetric->mbSymbolFlag	= pFD->IsSymbolFont();
+    pMetric->mnWidth		= pSelect->mnHeight;
+    pMetric->mnAscent		= ( pSelect->mnHeight * +pBuiltinFont->m_nAscent + 500 ) / 1000;
+    pMetric->mnDescent		= ( pSelect->mnHeight * -pBuiltinFont->m_nDescent + 500 ) / 1000;
+    pMetric->mnIntLeading	= 0;
+    pMetric->mnExtLeading	= 0;
+    pMetric->mnSlant		= 0;
+    pMetric->mbScalableFont	= true;
+    pMetric->mbDevice		= true;
 }
 
 // -----------------------------------------------------------------------
@@ -2516,24 +2516,24 @@ const sal_Char* PDFWriterImpl::getAttributeTag( PDFWriter::StructAttribute eAttr
     // fill maps once
     if( aAttributeStrings.empty() )
     {
-        aAttributeStrings[ PDFWriter::Placement ]           = "Placement";
-        aAttributeStrings[ PDFWriter::WritingMode ]         = "WritingMode";
-        aAttributeStrings[ PDFWriter::SpaceBefore ]         = "SpaceBefore";
-        aAttributeStrings[ PDFWriter::SpaceAfter ]          = "SpaceAfter";
-        aAttributeStrings[ PDFWriter::StartIndent ]         = "StartIndent";
-        aAttributeStrings[ PDFWriter::EndIndent ]           = "EndIndent";
-        aAttributeStrings[ PDFWriter::TextIndent ]          = "TextIndent";
-        aAttributeStrings[ PDFWriter::TextAlign ]           = "TextAlign";
-        aAttributeStrings[ PDFWriter::Width ]               = "Width";
-        aAttributeStrings[ PDFWriter::Height ]              = "Height";
-        aAttributeStrings[ PDFWriter::BlockAlign ]          = "BlockAlign";
-        aAttributeStrings[ PDFWriter::InlineAlign ]         = "InlineAlign";
-        aAttributeStrings[ PDFWriter::LineHeight ]          = "LineHeight";
-        aAttributeStrings[ PDFWriter::BaselineShift ]       = "BaselineShift";
-        aAttributeStrings[ PDFWriter::TextDecorationType ]  = "TextDecorationType";
-        aAttributeStrings[ PDFWriter::ListNumbering ]       = "ListNumbering";
-        aAttributeStrings[ PDFWriter::RowSpan ]             = "RowSpan";
-        aAttributeStrings[ PDFWriter::ColSpan ]             = "ColSpan";
+        aAttributeStrings[ PDFWriter::Placement ]			= "Placement";
+        aAttributeStrings[ PDFWriter::WritingMode ]			= "WritingMode";
+        aAttributeStrings[ PDFWriter::SpaceBefore ]			= "SpaceBefore";
+        aAttributeStrings[ PDFWriter::SpaceAfter ]			= "SpaceAfter";
+        aAttributeStrings[ PDFWriter::StartIndent ]			= "StartIndent";
+        aAttributeStrings[ PDFWriter::EndIndent ]			= "EndIndent";
+        aAttributeStrings[ PDFWriter::TextIndent ]			= "TextIndent";
+        aAttributeStrings[ PDFWriter::TextAlign ]			= "TextAlign";
+        aAttributeStrings[ PDFWriter::Width ]				= "Width";
+        aAttributeStrings[ PDFWriter::Height ]				= "Height";
+        aAttributeStrings[ PDFWriter::BlockAlign ]			= "BlockAlign";
+        aAttributeStrings[ PDFWriter::InlineAlign ]			= "InlineAlign";
+        aAttributeStrings[ PDFWriter::LineHeight ]			= "LineHeight";
+        aAttributeStrings[ PDFWriter::BaselineShift ]		= "BaselineShift";
+        aAttributeStrings[ PDFWriter::TextDecorationType ]	= "TextDecorationType";
+        aAttributeStrings[ PDFWriter::ListNumbering ]		= "ListNumbering";
+        aAttributeStrings[ PDFWriter::RowSpan ]				= "RowSpan";
+        aAttributeStrings[ PDFWriter::ColSpan ]				= "ColSpan";
         aAttributeStrings[ PDFWriter::LinkAnnotation ]      = "LinkAnnotation";
     }
 
@@ -2554,32 +2554,32 @@ const sal_Char* PDFWriterImpl::getAttributeValueTag( PDFWriter::StructAttributeV
 
     if( aValueStrings.empty() )
     {
-        aValueStrings[ PDFWriter::NONE ]                    = "None";
-        aValueStrings[ PDFWriter::Block ]                   = "Block";
-        aValueStrings[ PDFWriter::Inline ]                  = "Inline";
-        aValueStrings[ PDFWriter::Before ]                  = "Before";
-        aValueStrings[ PDFWriter::After ]                   = "After";
-        aValueStrings[ PDFWriter::Start ]                   = "Start";
-        aValueStrings[ PDFWriter::End ]                     = "End";
-        aValueStrings[ PDFWriter::LrTb ]                    = "LrTb";
-        aValueStrings[ PDFWriter::RlTb ]                    = "RlTb";
-        aValueStrings[ PDFWriter::TbRl ]                    = "TbRl";
-        aValueStrings[ PDFWriter::Center ]                  = "Center";
-        aValueStrings[ PDFWriter::Justify ]                 = "Justify";
-        aValueStrings[ PDFWriter::Auto ]                    = "Auto";
-        aValueStrings[ PDFWriter::Middle ]                  = "Middle";
-        aValueStrings[ PDFWriter::Normal ]                  = "Normal";
-        aValueStrings[ PDFWriter::Underline ]               = "Underline";
-        aValueStrings[ PDFWriter::Overline ]                = "Overline";
-        aValueStrings[ PDFWriter::LineThrough ]             = "LineThrough";
-        aValueStrings[ PDFWriter::Disc ]                    = "Disc";
-        aValueStrings[ PDFWriter::Circle ]                  = "Circle";
-        aValueStrings[ PDFWriter::Square ]                  = "Square";
-        aValueStrings[ PDFWriter::Decimal ]                 = "Decimal";
-        aValueStrings[ PDFWriter::UpperRoman ]              = "UpperRoman";
-        aValueStrings[ PDFWriter::LowerRoman ]              = "LowerRoman";
-        aValueStrings[ PDFWriter::UpperAlpha ]              = "UpperAlpha";
-        aValueStrings[ PDFWriter::LowerAlpha ]              = "LowerAlpha";
+        aValueStrings[ PDFWriter::NONE ]					= "None";
+        aValueStrings[ PDFWriter::Block ]					= "Block";
+        aValueStrings[ PDFWriter::Inline ]					= "Inline";
+        aValueStrings[ PDFWriter::Before ]					= "Before";
+        aValueStrings[ PDFWriter::After ]					= "After";
+        aValueStrings[ PDFWriter::Start ]					= "Start";
+        aValueStrings[ PDFWriter::End ]						= "End";
+        aValueStrings[ PDFWriter::LrTb ]					= "LrTb";
+        aValueStrings[ PDFWriter::RlTb ]					= "RlTb";
+        aValueStrings[ PDFWriter::TbRl ]					= "TbRl";
+        aValueStrings[ PDFWriter::Center ]					= "Center";
+        aValueStrings[ PDFWriter::Justify ]					= "Justify";
+        aValueStrings[ PDFWriter::Auto ]					= "Auto";
+        aValueStrings[ PDFWriter::Middle ]					= "Middle";
+        aValueStrings[ PDFWriter::Normal ]					= "Normal";
+        aValueStrings[ PDFWriter::Underline ]				= "Underline";
+        aValueStrings[ PDFWriter::Overline ]				= "Overline";
+        aValueStrings[ PDFWriter::LineThrough ]				= "LineThrough";
+        aValueStrings[ PDFWriter::Disc ]					= "Disc";
+        aValueStrings[ PDFWriter::Circle ]					= "Circle";
+        aValueStrings[ PDFWriter::Square ]					= "Square";
+        aValueStrings[ PDFWriter::Decimal ]					= "Decimal";
+        aValueStrings[ PDFWriter::UpperRoman ]				= "UpperRoman";
+        aValueStrings[ PDFWriter::LowerRoman ]				= "LowerRoman";
+        aValueStrings[ PDFWriter::UpperAlpha ]				= "UpperAlpha";
+        aValueStrings[ PDFWriter::LowerAlpha ]				= "LowerAlpha";
     }
 
     std::map< PDFWriter::StructAttributeValue, const char* >::const_iterator it =
@@ -3075,19 +3075,19 @@ std::map< sal_Int32, sal_Int32 > PDFWriterImpl::emitSystemFont( const ImplFontDa
         Int32Vector aGlyphWidths;
         Ucs2UIntMap aUnicodeMap;
         m_pReferenceDevice->mpGraphics->GetGlyphWidths( pFont, false, aGlyphWidths, aUnicodeMap );
-
+        
         OUString aTmpName;
         osl_createTempFile( NULL, NULL, &aTmpName.pData );
         sal_Int32 pGlyphIDs[ 256 ];
         sal_uInt8 pEncoding[ 256 ];
         sal_Ucs   pUnicodes[ 256 ];
         sal_Int32 pDuWidths[ 256 ];
-
+        
         memset( pGlyphIDs, 0, sizeof( pGlyphIDs ) );
         memset( pEncoding, 0, sizeof( pEncoding ) );
         memset( pUnicodes, 0, sizeof( pUnicodes ) );
         memset( pDuWidths, 0, sizeof( pDuWidths ) );
-
+        
         for( sal_Ucs c = 32; c < 256; c++ )
         {
             pUnicodes[c] = c;
@@ -3096,7 +3096,7 @@ std::map< sal_Int32, sal_Int32 > PDFWriterImpl::emitSystemFont( const ImplFontDa
             if( aUnicodeMap.find( c ) != aUnicodeMap.end() )
                 pWidths[ c ] = aGlyphWidths[ aUnicodeMap[ c ] ];
         }
-
+        
         m_pReferenceDevice->mpGraphics->CreateFontSubset( aTmpName, pFont, pGlyphIDs, pEncoding, pDuWidths, 256, aInfo );
         osl_removeFile( aTmpName.pData );
     }
@@ -3136,12 +3136,12 @@ std::map< sal_Int32, sal_Int32 > PDFWriterImpl::emitSystemFont( const ImplFontDa
             aLine.append( " 0 R>>\n"
                           "endobj\n\n" );
             writeBuffer( aLine.getStr(), aLine.getLength() );
-
-            nFontObject = nObject;
+    
+            nFontObject = nObject;    
             aRet[ rEmbed.m_nNormalFontID ] = nObject;
         }
     }
-
+    
     return aRet;
 }
 
@@ -3222,7 +3222,7 @@ std::map< sal_Int32, sal_Int32 > PDFWriterImpl::emitEmbeddedFont( const ImplFont
             }
         }
     }
-
+    
     FontSubsetInfo aInfo;
     sal_Int32 pWidths[256];
     const unsigned char* pFontData = NULL;
@@ -3245,13 +3245,13 @@ std::map< sal_Int32, sal_Int32 > PDFWriterImpl::emitEmbeddedFont( const ImplFont
                 if( pFontData[nIndex+1] == 0x03 )
                     break;
                 sal_Int32 nBytes =
-                ((sal_Int32)pFontData[nIndex+2])            |
-                ((sal_Int32)pFontData[nIndex+3]) << 8       |
-                ((sal_Int32)pFontData[nIndex+4]) << 16      |
+                ((sal_Int32)pFontData[nIndex+2])			|
+                ((sal_Int32)pFontData[nIndex+3]) << 8		|
+                ((sal_Int32)pFontData[nIndex+4]) << 16		|
                 ((sal_Int32)pFontData[nIndex+5]) << 24;
                 nIndex += nBytes+6;
             }
-
+            
             // search for eexec
             // TODO: use getPfbSegmentLengths() if possible to skip the search thingies below
             nIndex = 0;
@@ -3261,7 +3261,7 @@ std::map< sal_Int32, sal_Int32 > PDFWriterImpl::emitEmbeddedFont( const ImplFont
             do
             {
                 while( nIndex < nFontLen-4 &&
-                    ( pFontData[nIndex] != 'e'  ||
+                    ( pFontData[nIndex] != 'e'	||
                         pFontData[nIndex+1] != 'e' ||
                         pFontData[nIndex+2] != 'x' ||
                         pFontData[nIndex+3] != 'e' ||
@@ -3276,7 +3276,7 @@ std::map< sal_Int32, sal_Int32 > PDFWriterImpl::emitEmbeddedFont( const ImplFont
             // this should end the ascii part
             if( nIndex > nFontLen-5 )
                 throw FontException();
-
+            
             nEndAsciiIndex = nIndex+4;
             // now count backwards until we can account for 512 '0'
             // which is the endmarker of the (hopefully) binary data
@@ -3294,19 +3294,19 @@ std::map< sal_Int32, sal_Int32 > PDFWriterImpl::emitEmbeddedFont( const ImplFont
                     // if all fonts complied
                     if( pFontData[nIndex] == '0' )
                         nFound++;
-                        else if( nFound > 0                 &&
-                            pFontData[nIndex] != '\r'       &&
-                        pFontData[nIndex] != '\t'       &&
-                        pFontData[nIndex] != '\n'       &&
+                        else if( nFound > 0					&&
+                            pFontData[nIndex] != '\r'		&&
+                        pFontData[nIndex] != '\t'		&&
+                        pFontData[nIndex] != '\n'		&&
                         pFontData[nIndex] != ' ' )
                         break;
                 }
                 nIndex--;
             }
-
+            
             if( nIndex < 1 || nIndex <= nEndAsciiIndex )
                 throw FontException();
-
+            
             // nLength3 is the rest of the file - excluding any section headers
             // nIndex now points to the first of the 512 '0' characters marking the
             // fixed content portion
@@ -3327,7 +3327,7 @@ std::map< sal_Int32, sal_Int32 > PDFWriterImpl::emitEmbeddedFont( const ImplFont
                     }
                 }
             }
-
+            
             // there may be whitespace to ignore before the 512 '0'
             while( pFontData[nIndex] == '\r' || pFontData[nIndex] == '\n' )
             {
@@ -3341,7 +3341,7 @@ std::map< sal_Int32, sal_Int32 > PDFWriterImpl::emitEmbeddedFont( const ImplFont
                 }
             }
             nEndBinaryIndex = nIndex;
-
+            
             // search for beginning of binary section
             nBeginBinaryIndex = nEndAsciiIndex;
             do
@@ -3350,10 +3350,10 @@ std::map< sal_Int32, sal_Int32 > PDFWriterImpl::emitEmbeddedFont( const ImplFont
                 for( it = aSections.begin(); it != aSections.end() && (nBeginBinaryIndex < *it || nBeginBinaryIndex > ((*it) + 5) ); ++it )
                     ;
                     } while( nBeginBinaryIndex < nEndBinaryIndex &&
-                        ( pFontData[nBeginBinaryIndex] == '\r'  ||
-                            pFontData[nBeginBinaryIndex] == '\n'    ||
+                        ( pFontData[nBeginBinaryIndex] == '\r'	||
+                            pFontData[nBeginBinaryIndex] == '\n'	||
                             it != aSections.end() ) );
-
+                    
                     // it seems to be vital to copy the exact whitespace between binary data
                     // and eexec, else a invalid font results. so make nEndAsciiIndex
                     // always immediate in front of nBeginBinaryIndex
@@ -3362,11 +3362,11 @@ std::map< sal_Int32, sal_Int32 > PDFWriterImpl::emitEmbeddedFont( const ImplFont
                         ;
                     if( it != aSections.end() )
                         nEndAsciiIndex = (*it)-1;
-
+                    
                     nLength1 = nEndAsciiIndex+1; // including the last character
                     for( it = aSections.begin(); it != aSections.end() && *it < nEndAsciiIndex; ++it )
                         nLength1 -= 6; // decrease by pfb section size
-
+                    
                     // if the first four bytes are all ascii hex characters, then binary data
                     // has to be converted to real binary data
                     for( nIndex = 0; nIndex < 4 &&
@@ -3409,7 +3409,7 @@ std::map< sal_Int32, sal_Int32 > PDFWriterImpl::emitEmbeddedFont( const ImplFont
                         DBG_ASSERT( !(nLength2 & 1), "uneven number of hex chars in binary pfa section" );
                         nLength2 /= 2;
                     }
-
+                    
                     // now we can actually write the font stream !
                     #if OSL_DEBUG_LEVEL > 1
                     {
@@ -3440,13 +3440,13 @@ std::map< sal_Int32, sal_Int32 > PDFWriterImpl::emitEmbeddedFont( const ImplFont
                         "stream\n" );
                     if( !writeBuffer( aLine.getStr(), aLine.getLength() ) )
                         throw FontException();
-
+                    
                     sal_uInt64 nBeginStreamPos = 0;
                     osl_getFilePos( m_aFile, &nBeginStreamPos );
-
+                    
                     beginCompression();
                     checkAndEnableStreamEncryption( nStreamObject );
-
+                    
                     // write ascii section
                     if( aSections.begin() == aSections.end() )
                     {
@@ -3470,7 +3470,7 @@ std::map< sal_Int32, sal_Int32 > PDFWriterImpl::emitEmbeddedFont( const ImplFont
                         if( ! writeBuffer( pFontData+nIndex, nEndAsciiIndex-nIndex+1 ) )
                             throw FontException();
                     }
-
+                    
                     // write binary section
                     if( ! bConvertHexData )
                     {
@@ -3505,7 +3505,7 @@ std::map< sal_Int32, sal_Int32 > PDFWriterImpl::emitEmbeddedFont( const ImplFont
                         boost::shared_array<unsigned char> pWriteBuffer( new unsigned char[ nLength2 ] );
                         rtl_zeroMemory( pWriteBuffer.get(), nLength2 );
                         int nWriteIndex = 0;
-
+                        
                         int nNextSectionIndex = 0;
                         for( it = aSections.begin(); it != aSections.end() && *it < nBeginBinaryIndex; ++it )
                             ;
@@ -3565,17 +3565,17 @@ std::map< sal_Int32, sal_Int32 > PDFWriterImpl::emitEmbeddedFont( const ImplFont
                     }
                     endCompression();
                     disableStreamEncryption();
-
-
+                    
+                    
                     sal_uInt64 nEndStreamPos = 0;
                     osl_getFilePos( m_aFile, &nEndStreamPos );
-
+                    
                     // and finally close the stream
                     aLine.setLength( 0 );
                     aLine.append( "\nendstream\nendobj\n\n" );
                     if( ! writeBuffer( aLine.getStr(), aLine.getLength() ) )
                         throw FontException();
-
+                    
                     // write stream length object
                     aLine.setLength( 0 );
                     if( ! updateObject( nStreamLengthObject ) )
@@ -3601,21 +3601,21 @@ std::map< sal_Int32, sal_Int32 > PDFWriterImpl::emitEmbeddedFont( const ImplFont
             aErrorComment.append( sal_Int32(pFont->GetWeight()) );
             emitComment( aErrorComment.getStr() );
         }
-
+        
         if( nStreamObject )
             // write font descriptor
         nFontDescriptor = emitFontDescriptor( pFont, aInfo, 0, nStreamObject );
-
+        
         if( nFontDescriptor )
         {
             if( pEncoding )
                 nToUnicodeStream = createToUnicodeCMap( nEncoding, &aUnicodes[0], pUnicodesPerGlyph, pEncToUnicodeIndex, sizeof(nEncoding)/sizeof(nEncoding[0]) );
-
+            
             // write font object
             sal_Int32 nObject = createObject();
             if( ! updateObject( nObject ) )
                 throw FontException();
-
+            
             OStringBuffer aLine( 1024 );
             aLine.append( nObject );
             aLine.append( " 0 obj\n"
@@ -3644,11 +3644,11 @@ std::map< sal_Int32, sal_Int32 > PDFWriterImpl::emitEmbeddedFont( const ImplFont
                 "endobj\n\n" );
             if( ! writeBuffer( aLine.getStr(), aLine.getLength() ) )
                 throw FontException();
-
+            
             nFontObject = nObject;
-
+            
             aRet[ rEmbed.m_nNormalFontID ] = nObject;
-
+            
             // write additional encodings
             for( std::list< EmbedEncoding >::iterator enc_it = rEmbed.m_aExtendedEncodings.begin(); enc_it != rEmbed.m_aExtendedEncodings.end(); ++enc_it )
             {
@@ -3657,7 +3657,7 @@ std::map< sal_Int32, sal_Int32 > PDFWriterImpl::emitEmbeddedFont( const ImplFont
                 sal_Int32 nEncObject = createObject();
                 if( ! updateObject( nEncObject ) )
                     throw FontException();
-
+                
                 OutputDevice* pRef = getReferenceDevice();
                 pRef->Push( PUSH_FONT | PUSH_MAPMODE );
                 pRef->SetMapMode( MapMode( MAP_PIXEL ) );
@@ -3667,7 +3667,7 @@ std::map< sal_Int32, sal_Int32 > PDFWriterImpl::emitEmbeddedFont( const ImplFont
                 aFont.SetPitch( pFont->GetPitch() );
                 pRef->SetFont( aFont );
                 pRef->ImplNewFont();
-
+                
                 aLine.setLength( 0 );
                 aLine.append( nEncObject );
                 aLine.append( " 0 obj\n"
@@ -3683,7 +3683,7 @@ std::map< sal_Int32, sal_Int32 > PDFWriterImpl::emitEmbeddedFont( const ImplFont
                     pEncToUnicodeIndex[nEncoded] = static_cast<sal_Int32>(aUnicodes.size());
                     aUnicodes.push_back( nEncodedCodes[nEncoded] );
                     pUnicodesPerGlyph[nEncoded] = 1;
-
+                    
                     aLine.append( " /" );
                     aLine.append( str_it->m_aName );
                     if( !((++nEncoded) & 15) )
@@ -3691,18 +3691,18 @@ std::map< sal_Int32, sal_Int32 > PDFWriterImpl::emitEmbeddedFont( const ImplFont
                 }
                 aLine.append( "]>>\n"
                     "endobj\n\n" );
-
+                
                 pRef->Pop();
-
+                
                 if( ! writeBuffer( aLine.getStr(), aLine.getLength() ) )
                     throw FontException();
-
+                
                 nToUnicodeStream = createToUnicodeCMap( nEncoding, &aUnicodes[0], pUnicodesPerGlyph, pEncToUnicodeIndex, nEncoded );
-
+                
                 nObject = createObject();
                 if( ! updateObject( nObject ) )
                     throw FontException();
-
+                
                 aLine.setLength( 0 );
                 aLine.append( nObject );
                 aLine.append( " 0 obj\n"
@@ -3735,7 +3735,7 @@ std::map< sal_Int32, sal_Int32 > PDFWriterImpl::emitEmbeddedFont( const ImplFont
                     "endobj\n\n" );
                 if( ! writeBuffer( aLine.getStr(), aLine.getLength() ) )
                     throw FontException();
-
+                
                 aRet[ enc_it->m_nFontID ] = nObject;
             }
         }
@@ -3746,7 +3746,7 @@ std::map< sal_Int32, sal_Int32 > PDFWriterImpl::emitEmbeddedFont( const ImplFont
         endCompression();
         disableStreamEncryption();
     }
-
+    
     if( pFontData )
         m_pReferenceDevice->mpGraphics->FreeEmbedFontData( pFontData, nFontLen );
 
@@ -3972,11 +3972,11 @@ bool PDFWriterImpl::emitFonts()
 {
     if( ! m_pReferenceDevice->ImplGetGraphics() )
         return false;
-
+    
     OStringBuffer aLine( 1024 );
-
+    
     std::map< sal_Int32, sal_Int32 > aFontIDToObject;
-
+    
     OUString aTmpName;
     osl_createTempFile( NULL, NULL, &aTmpName.pData );
     for( FontSubsetData::iterator it = m_aSubsets.begin(); it != m_aSubsets.end(); ++it )
@@ -3993,7 +3993,7 @@ bool PDFWriterImpl::emitFonts()
             int nGlyphs = 1;
             // fill arrays and prepare encoding index map
             sal_Int32 nToUnicodeStream = 0;
-
+            
             rtl_zeroMemory( pGlyphIDs, sizeof( pGlyphIDs ) );
             rtl_zeroMemory( pEncoding, sizeof( pEncoding ) );
             rtl_zeroMemory( pUnicodesPerGlyph, sizeof( pUnicodesPerGlyph ) );
@@ -4001,10 +4001,10 @@ bool PDFWriterImpl::emitFonts()
             for( FontEmitMapping::iterator fit = lit->m_aMapping.begin(); fit != lit->m_aMapping.end();++fit )
             {
                 sal_uInt8 nEnc = fit->second.getGlyphId();
-
+                
                 DBG_ASSERT( pGlyphIDs[nEnc] == 0 && pEncoding[nEnc] == 0, "duplicate glyph" );
                 DBG_ASSERT( nEnc <= lit->m_aMapping.size(), "invalid glyph encoding" );
-
+                
                 pGlyphIDs[ nEnc ] = fit->first;
                 pEncoding[ nEnc ] = nEnc;
                 pEncToUnicodeIndex[ nEnc ] = static_cast<sal_Int32>(aUnicodes.size());
@@ -4031,7 +4031,7 @@ bool PDFWriterImpl::emitFonts()
                 CHECK_RETURN( (osl_File_E_None == osl_setFilePos( aFontFile, osl_Pos_End, 0 ) ) );
                 CHECK_RETURN( (osl_File_E_None == osl_getFilePos( aFontFile, &nLength1 ) ) );
                 CHECK_RETURN( (osl_File_E_None == osl_setFilePos( aFontFile, osl_Pos_Absolut, 0 ) ) );
-
+                
                 #if OSL_DEBUG_LEVEL > 1
                 {
                     OStringBuffer aLine1( " PDFWriterImpl::emitFonts" );
@@ -4051,17 +4051,17 @@ bool PDFWriterImpl::emitFonts()
                              "/Filter/FlateDecode"
                              #endif
                              "/Length1 " );
-
+                
                 sal_uInt64 nStartPos = 0;
                 if( aSubsetInfo.m_nFontType == FontSubsetInfo::SFNT_TTF )
                 {
                     aLine.append( (sal_Int32)nLength1 );
-
+                    
                     aLine.append( ">>\n"
                                  "stream\n" );
                     CHECK_RETURN( writeBuffer( aLine.getStr(), aLine.getLength() ) );
                     CHECK_RETURN( (osl_File_E_None == osl_getFilePos( m_aFile, &nStartPos ) ) );
-
+                    
                     // copy font file
                     beginCompression();
                     checkAndEnableStreamEncryption( nFontStream );
@@ -4083,7 +4083,7 @@ bool PDFWriterImpl::emitFonts()
                 else if( (aSubsetInfo.m_nFontType & FontSubsetInfo::TYPE1_PFB) != 0 ) // TODO: also support PFA?
                 {
                     boost::shared_array<unsigned char> pBuffer( new unsigned char[ nLength1 ] );
-
+                    
                     sal_uInt64 nBytesRead = 0;
                     CHECK_RETURN( (osl_File_E_None == osl_readFile( aFontFile, pBuffer.get(), nLength1, &nBytesRead ) ) );
                     DBG_ASSERT( nBytesRead==nLength1, "PDF-FontSubset read incomplete!" );
@@ -4098,12 +4098,12 @@ bool PDFWriterImpl::emitFonts()
                     aLine.append( (sal_Int32)aSegmentLengths[1] );
                     aLine.append( "/Length3 " );
                     aLine.append( (sal_Int32)aSegmentLengths[2] );
-
+                    
                     aLine.append( ">>\n"
                                  "stream\n" );
                     CHECK_RETURN( writeBuffer( aLine.getStr(), aLine.getLength() ) );
                     CHECK_RETURN( (osl_File_E_None == osl_getFilePos( m_aFile, &nStartPos ) ) );
-
+                    
                     // emit PFB-sections without section headers
                     beginCompression();
                     checkAndEnableStreamEncryption( nFontStream );
@@ -4116,19 +4116,19 @@ bool PDFWriterImpl::emitFonts()
                     fprintf( stderr, "PDF: CreateFontSubset result in not yet supported format=%d\n",aSubsetInfo.m_nFontType);
                     aLine.append( "0 >>\nstream\n" );
                 }
-
+                
                 endCompression();
                 disableStreamEncryption();
                 // close the file
                 osl_closeFile( aFontFile );
-
+                
                 sal_uInt64 nEndPos = 0;
                 CHECK_RETURN( (osl_File_E_None == osl_getFilePos( m_aFile, &nEndPos ) ) );
                 // end the stream
                 aLine.setLength( 0 );
                 aLine.append( "\nendstream\nendobj\n\n" );
                 CHECK_RETURN( writeBuffer( aLine.getStr(), aLine.getLength() ) );
-
+                
                 // emit stream length object
                 CHECK_RETURN( updateObject( nStreamLengthObject ) );
                 aLine.setLength( 0 );
@@ -4137,18 +4137,18 @@ bool PDFWriterImpl::emitFonts()
                 aLine.append( (sal_Int64)(nEndPos-nStartPos) );
                 aLine.append( "\nendobj\n\n" );
                 CHECK_RETURN( writeBuffer( aLine.getStr(), aLine.getLength() ) );
-
+                
                 // write font descriptor
                 sal_Int32 nFontDescriptor = emitFontDescriptor( it->first, aSubsetInfo, lit->m_nFontID, nFontStream );
-
+                
                 if( nToUnicodeStream )
                     nToUnicodeStream = createToUnicodeCMap( pEncoding, &aUnicodes[0], pUnicodesPerGlyph, pEncToUnicodeIndex, nGlyphs );
-
+                
                 sal_Int32 nFontObject = createObject();
                 CHECK_RETURN( updateObject( nFontObject ) );
                 aLine.setLength( 0 );
                 aLine.append( nFontObject );
-
+                
                 aLine.append( " 0 obj\n" );
                 aLine.append( ((aSubsetInfo.m_nFontType & FontSubsetInfo::ANY_TYPE1) != 0) ?
                              "<</Type/Font/Subtype/Type1/BaseFont/" :
@@ -4178,7 +4178,7 @@ bool PDFWriterImpl::emitFonts()
                 aLine.append( ">>\n"
                              "endobj\n\n" );
                 CHECK_RETURN( writeBuffer( aLine.getStr(), aLine.getLength() ) );
-
+                
                 aFontIDToObject[ lit->m_nFontID ] = nFontObject;
             }
             else
@@ -4199,7 +4199,7 @@ bool PDFWriterImpl::emitFonts()
         }
     }
     osl_removeFile( aTmpName.pData );
-
+    
     // emit embedded fonts
     for( FontEmbedData::iterator eit = m_aEmbeddedFonts.begin(); eit != m_aEmbeddedFonts.end(); ++eit )
     {
@@ -4246,7 +4246,7 @@ bool PDFWriterImpl::emitFonts()
     }
     appendBuiltinFontsToDict( aFontDict );
     aFontDict.append( "\n>>\nendobj\n\n" );
-
+    
     CHECK_RETURN( updateObject( getFontDictObject() ) );
     CHECK_RETURN( writeBuffer( aFontDict.getStr(), aFontDict.getLength() ) );
     return true;
@@ -4428,8 +4428,8 @@ bool PDFWriterImpl::appendDest( sal_Int32 nDestID, OStringBuffer& rBuffer )
     }
 
 
-    const PDFDest& rDest        = m_aDests[ nDestID ];
-    const PDFPage& rDestPage    = m_aPages[ rDest.m_nPage ];
+    const PDFDest& rDest		= m_aDests[ nDestID ];
+    const PDFPage& rDestPage	= m_aPages[ rDest.m_nPage ];
 
     rBuffer.append( '[' );
     rBuffer.append( rDestPage.m_nPageObject );
@@ -4488,7 +4488,7 @@ bool PDFWriterImpl::emitLinkAnnotations()
     int nAnnots = m_aLinks.size();
     for( int i = 0; i < nAnnots; i++ )
     {
-        const PDFLink& rLink            = m_aLinks[i];
+        const PDFLink& rLink			= m_aLinks[i];
         if( ! updateObject( rLink.m_nObject ) )
             continue;
 
@@ -4699,7 +4699,7 @@ bool PDFWriterImpl::emitNoteAnnotations()
     int nAnnots = m_aNotes.size();
     for( int i = 0; i < nAnnots; i++ )
     {
-        const PDFNoteEntry& rNote       = m_aNotes[i];
+        const PDFNoteEntry& rNote		= m_aNotes[i];
         if( ! updateObject( rNote.m_nObject ) )
             return false;
 
@@ -4904,9 +4904,9 @@ Font PDFWriterImpl::drawFieldBorder( PDFWidget& rIntern,
             sal_Int32 nDelta = aFont.GetHeight()/4;
             if( nDelta < 1 )
                 nDelta = 1;
-            rIntern.m_aRect.Left()  += nDelta;
-            rIntern.m_aRect.Top()   += nDelta;
-            rIntern.m_aRect.Right() -= nDelta;
+            rIntern.m_aRect.Left()	+= nDelta;
+            rIntern.m_aRect.Top()	+= nDelta;
+            rIntern.m_aRect.Right()	-= nDelta;
             rIntern.m_aRect.Bottom()-= nDelta;
         }
     }
@@ -4944,7 +4944,7 @@ void PDFWriterImpl::createDefaultEditAppearance( PDFWidget& rEdit, const PDFWrit
     aDA.append( ' ' );
     m_aPages[ m_nCurrentPage ].appendMappedLength( sal_Int32( aFont.GetHeight() ), aDA );
     aDA.append( " Tf" );
-
+    
     /*  create an empty appearance stream, let the viewer create
         the appearance at runtime. This is because AR5 seems to
         paint the widget appearance always, and a dynamically created
@@ -5070,10 +5070,10 @@ void PDFWriterImpl::createDefaultCheckBoxAppearance( PDFWidget& rBox, const PDFW
     Rectangle aCheckRect, aTextRect;
     if( rWidget.ButtonIsLeft )
     {
-        aCheckRect.Left()   = rBox.m_aRect.Left() + nDelta;
-        aCheckRect.Top()    = rBox.m_aRect.Top() + (rBox.m_aRect.GetHeight()-aFontSize.Height())/2;
-        aCheckRect.Right()  = aCheckRect.Left() + aFontSize.Height();
-        aCheckRect.Bottom() = aCheckRect.Top() + aFontSize.Height();
+        aCheckRect.Left()	= rBox.m_aRect.Left() + nDelta;
+        aCheckRect.Top()	= rBox.m_aRect.Top() + (rBox.m_aRect.GetHeight()-aFontSize.Height())/2;
+        aCheckRect.Right()	= aCheckRect.Left() + aFontSize.Height();
+        aCheckRect.Bottom()	= aCheckRect.Top() + aFontSize.Height();
 
         // #i74206# handle small controls without text area
         while( aCheckRect.GetWidth() > rBox.m_aRect.GetWidth() && aCheckRect.GetWidth() > nDelta )
@@ -5083,17 +5083,17 @@ void PDFWriterImpl::createDefaultCheckBoxAppearance( PDFWidget& rBox, const PDFW
             aCheckRect.Bottom() -= nDelta - (nDelta/2);
         }
 
-        aTextRect.Left()    = rBox.m_aRect.Left() + aCheckRect.GetWidth()+5*nDelta;
-        aTextRect.Top()     = rBox.m_aRect.Top();
-        aTextRect.Right()   = aTextRect.Left() + rBox.m_aRect.GetWidth() - aCheckRect.GetWidth()-6*nDelta;
-        aTextRect.Bottom()  = rBox.m_aRect.Bottom();
+        aTextRect.Left()	= rBox.m_aRect.Left() + aCheckRect.GetWidth()+5*nDelta;
+        aTextRect.Top()		= rBox.m_aRect.Top();
+        aTextRect.Right()	= aTextRect.Left() + rBox.m_aRect.GetWidth() - aCheckRect.GetWidth()-6*nDelta;
+        aTextRect.Bottom()	= rBox.m_aRect.Bottom();
     }
     else
     {
-        aCheckRect.Left()   = rBox.m_aRect.Right() - nDelta - aFontSize.Height();
-        aCheckRect.Top()    = rBox.m_aRect.Top() + (rBox.m_aRect.GetHeight()-aFontSize.Height())/2;
-        aCheckRect.Right()  = aCheckRect.Left() + aFontSize.Height();
-        aCheckRect.Bottom() = aCheckRect.Top() + aFontSize.Height();
+        aCheckRect.Left()	= rBox.m_aRect.Right() - nDelta - aFontSize.Height();
+        aCheckRect.Top()	= rBox.m_aRect.Top() + (rBox.m_aRect.GetHeight()-aFontSize.Height())/2;
+        aCheckRect.Right()	= aCheckRect.Left() + aFontSize.Height();
+        aCheckRect.Bottom()	= aCheckRect.Top() + aFontSize.Height();
 
         // #i74206# handle small controls without text area
         while( aCheckRect.GetWidth() > rBox.m_aRect.GetWidth() && aCheckRect.GetWidth() > nDelta )
@@ -5103,10 +5103,10 @@ void PDFWriterImpl::createDefaultCheckBoxAppearance( PDFWidget& rBox, const PDFW
             aCheckRect.Bottom() -= nDelta - (nDelta/2);
         }
 
-        aTextRect.Left()    = rBox.m_aRect.Left();
-        aTextRect.Top()     = rBox.m_aRect.Top();
-        aTextRect.Right()   = aTextRect.Left() + rBox.m_aRect.GetWidth() - aCheckRect.GetWidth()-6*nDelta;
-        aTextRect.Bottom()  = rBox.m_aRect.Bottom();
+        aTextRect.Left()	= rBox.m_aRect.Left();
+        aTextRect.Top()		= rBox.m_aRect.Top();
+        aTextRect.Right()	= aTextRect.Left() + rBox.m_aRect.GetWidth() - aCheckRect.GetWidth()-6*nDelta;
+        aTextRect.Bottom()	= rBox.m_aRect.Bottom();
     }
     setLineColor( Color( COL_BLACK ) );
     setFillColor( Color( COL_TRANSPARENT ) );
@@ -5195,10 +5195,10 @@ void PDFWriterImpl::createDefaultRadioButtonAppearance( PDFWidget& rBox, const P
     Rectangle aCheckRect, aTextRect;
     if( rWidget.ButtonIsLeft )
     {
-        aCheckRect.Left()   = rBox.m_aRect.Left() + nDelta;
-        aCheckRect.Top()    = rBox.m_aRect.Top() + (rBox.m_aRect.GetHeight()-aFontSize.Height())/2;
-        aCheckRect.Right()  = aCheckRect.Left() + aFontSize.Height();
-        aCheckRect.Bottom() = aCheckRect.Top() + aFontSize.Height();
+        aCheckRect.Left()	= rBox.m_aRect.Left() + nDelta;
+        aCheckRect.Top()	= rBox.m_aRect.Top() + (rBox.m_aRect.GetHeight()-aFontSize.Height())/2;
+        aCheckRect.Right()	= aCheckRect.Left() + aFontSize.Height();
+        aCheckRect.Bottom()	= aCheckRect.Top() + aFontSize.Height();
 
         // #i74206# handle small controls without text area
         while( aCheckRect.GetWidth() > rBox.m_aRect.GetWidth() && aCheckRect.GetWidth() > nDelta )
@@ -5208,17 +5208,17 @@ void PDFWriterImpl::createDefaultRadioButtonAppearance( PDFWidget& rBox, const P
             aCheckRect.Bottom() -= nDelta - (nDelta/2);
         }
 
-        aTextRect.Left()    = rBox.m_aRect.Left() + aCheckRect.GetWidth()+5*nDelta;
-        aTextRect.Top()     = rBox.m_aRect.Top();
-        aTextRect.Right()   = aTextRect.Left() + rBox.m_aRect.GetWidth() - aCheckRect.GetWidth()-6*nDelta;
-        aTextRect.Bottom()  = rBox.m_aRect.Bottom();
+        aTextRect.Left()	= rBox.m_aRect.Left() + aCheckRect.GetWidth()+5*nDelta;
+        aTextRect.Top()		= rBox.m_aRect.Top();
+        aTextRect.Right()	= aTextRect.Left() + rBox.m_aRect.GetWidth() - aCheckRect.GetWidth()-6*nDelta;
+        aTextRect.Bottom()	= rBox.m_aRect.Bottom();
     }
     else
     {
-        aCheckRect.Left()   = rBox.m_aRect.Right() - nDelta - aFontSize.Height();
-        aCheckRect.Top()    = rBox.m_aRect.Top() + (rBox.m_aRect.GetHeight()-aFontSize.Height())/2;
-        aCheckRect.Right()  = aCheckRect.Left() + aFontSize.Height();
-        aCheckRect.Bottom() = aCheckRect.Top() + aFontSize.Height();
+        aCheckRect.Left()	= rBox.m_aRect.Right() - nDelta - aFontSize.Height();
+        aCheckRect.Top()	= rBox.m_aRect.Top() + (rBox.m_aRect.GetHeight()-aFontSize.Height())/2;
+        aCheckRect.Right()	= aCheckRect.Left() + aFontSize.Height();
+        aCheckRect.Bottom()	= aCheckRect.Top() + aFontSize.Height();
 
         // #i74206# handle small controls without text area
         while( aCheckRect.GetWidth() > rBox.m_aRect.GetWidth() && aCheckRect.GetWidth() > nDelta )
@@ -5228,10 +5228,10 @@ void PDFWriterImpl::createDefaultRadioButtonAppearance( PDFWidget& rBox, const P
             aCheckRect.Bottom() -= nDelta - (nDelta/2);
         }
 
-        aTextRect.Left()    = rBox.m_aRect.Left();
-        aTextRect.Top()     = rBox.m_aRect.Top();
-        aTextRect.Right()   = aTextRect.Left() + rBox.m_aRect.GetWidth() - aCheckRect.GetWidth()-6*nDelta;
-        aTextRect.Bottom()  = rBox.m_aRect.Bottom();
+        aTextRect.Left()	= rBox.m_aRect.Left();
+        aTextRect.Top()		= rBox.m_aRect.Top();
+        aTextRect.Right()	= aTextRect.Left() + rBox.m_aRect.GetWidth() - aCheckRect.GetWidth()-6*nDelta;
+        aTextRect.Bottom()	= rBox.m_aRect.Bottom();
     }
     setLineColor( Color( COL_BLACK ) );
     setFillColor( Color( COL_TRANSPARENT ) );
@@ -5276,10 +5276,10 @@ void PDFWriterImpl::createDefaultRadioButtonAppearance( PDFWidget& rBox, const P
     writeBuffer( aDA.getStr(), aDA.getLength() );
     setFillColor( replaceColor( rWidget.TextColor, rSettings.GetRadioCheckTextColor() ) );
     setLineColor( Color( COL_TRANSPARENT ) );
-    aCheckRect.Left()   += 3*nDelta;
-    aCheckRect.Top()    += 3*nDelta;
-    aCheckRect.Bottom() -= 3*nDelta;
-    aCheckRect.Right()  -= 3*nDelta;
+    aCheckRect.Left()	+= 3*nDelta;
+    aCheckRect.Top()	+= 3*nDelta;
+    aCheckRect.Bottom()	-= 3*nDelta;
+    aCheckRect.Right()	-= 3*nDelta;
     drawEllipse( aCheckRect );
     writeBuffer( "\nEMC\n", 5 );
     endRedirect();
@@ -6644,7 +6644,7 @@ void PDFWriterImpl::sortWidgets()
 
 namespace vcl {
 class PDFStreamIf :
-        public cppu::WeakImplHelper1< com::sun::star::io::XOutputStream >
+        public cppu::WeakImplHelper1< com::sun::star::io::XOutputStream	>
 {
     PDFWriterImpl*  m_pWriter;
     bool            m_bWrite;
@@ -6790,10 +6790,10 @@ sal_Int32 PDFWriterImpl::getSystemFont( const Font& i_rFont )
         m_aSystemFonts[ pDevFont ] = EmbedFont();
         m_aSystemFonts[ pDevFont ].m_nNormalFontID = nFontID;
     }
-
+    
     getReferenceDevice()->Pop();
     getReferenceDevice()->ImplNewFont();
-
+    
     return nFontID;
 }
 
@@ -7524,14 +7524,14 @@ void PDFWriterImpl::drawLayout( SalLayout& rLayout, const String& rText, bool bT
     // write eventual emphasis marks
     if( m_aCurrentPDFState.m_aFont.GetEmphasisMark() & EMPHASISMARK_STYLE )
     {
-        PolyPolygon             aEmphPoly;
-        Rectangle               aEmphRect1;
-        Rectangle               aEmphRect2;
-        long                    nEmphYOff;
-        long                    nEmphWidth;
-        long                    nEmphHeight;
-        BOOL                    bEmphPolyLine;
-        FontEmphasisMark        nEmphMark;
+        PolyPolygon 			aEmphPoly;
+        Rectangle				aEmphRect1;
+        Rectangle				aEmphRect2;
+        long					nEmphYOff;
+        long					nEmphWidth;
+        long					nEmphHeight;
+        BOOL					bEmphPolyLine;
+        FontEmphasisMark		nEmphMark;
 
         push( PUSH_ALL );
 
@@ -7720,7 +7720,7 @@ void PDFWriterImpl::drawText( const Rectangle& rRect, const String& rOrigStr, US
 
     Point       aPos            = rRect.TopLeft();
 
-    long        nTextHeight     = m_pReferenceDevice->GetTextHeight();
+    long		nTextHeight		= m_pReferenceDevice->GetTextHeight();
     xub_StrLen  nMnemonicPos    = STRING_NOTFOUND;
 
     String aStr = rOrigStr;
@@ -7930,9 +7930,9 @@ void PDFWriterImpl::drawWaveLine( const Point& rStart, const Point& rStop, sal_I
 void PDFWriterImpl::drawWaveTextLine( OStringBuffer& aLine, long nWidth, FontUnderline eTextLine, Color aColor, bool bIsAbove )
 {
     // note: units in pFontEntry are ref device pixel
-    ImplFontEntry*  pFontEntry = m_pReferenceDevice->mpFontEntry;
-    long            nLineHeight = 0;
-    long            nLinePos = 0;
+    ImplFontEntry*	pFontEntry = m_pReferenceDevice->mpFontEntry;
+    long			nLineHeight = 0;
+    long			nLinePos = 0;
 
     appendStrokingColor( aColor, aLine );
     aLine.append( "\n" );
@@ -8000,10 +8000,10 @@ void PDFWriterImpl::drawWaveTextLine( OStringBuffer& aLine, long nWidth, FontUnd
 void PDFWriterImpl::drawStraightTextLine( OStringBuffer& aLine, long nWidth, FontUnderline eTextLine, Color aColor, bool bIsAbove )
 {
     // note: units in pFontEntry are ref device pixel
-    ImplFontEntry*  pFontEntry = m_pReferenceDevice->mpFontEntry;
-    long            nLineHeight = 0;
-    long            nLinePos  = 0;
-    long            nLinePos2 = 0;
+    ImplFontEntry*	pFontEntry = m_pReferenceDevice->mpFontEntry;
+    long			nLineHeight = 0;
+    long			nLinePos  = 0;
+    long			nLinePos2 = 0;
 
     if ( eTextLine > UNDERLINE_BOLDWAVE )
         eTextLine = UNDERLINE_SINGLE;
@@ -8169,10 +8169,10 @@ void PDFWriterImpl::drawStraightTextLine( OStringBuffer& aLine, long nWidth, Fon
 void PDFWriterImpl::drawStrikeoutLine( OStringBuffer& aLine, long nWidth, FontStrikeout eStrikeout, Color aColor )
 {
     // note: units in pFontEntry are ref device pixel
-    ImplFontEntry*  pFontEntry = m_pReferenceDevice->mpFontEntry;
-    long            nLineHeight = 0;
-    long            nLinePos  = 0;
-    long            nLinePos2 = 0;
+    ImplFontEntry*	pFontEntry = m_pReferenceDevice->mpFontEntry;
+    long			nLineHeight = 0;
+    long			nLinePos  = 0;
+    long			nLinePos2 = 0;
 
     if ( eStrikeout > STRIKEOUT_X )
         eStrikeout = STRIKEOUT_SINGLE;
@@ -8277,13 +8277,13 @@ void PDFWriterImpl::drawTextLine( const Point& rPos, long nWidth, FontStrikeout
     updateGraphicsState();
 
     // note: units in pFontEntry are ref device pixel
-    ImplFontEntry*  pFontEntry = m_pReferenceDevice->mpFontEntry;
-    Color           aUnderlineColor = m_aCurrentPDFState.m_aTextLineColor;
-    Color           aOverlineColor  = m_aCurrentPDFState.m_aOverlineColor;
-    Color           aStrikeoutColor = m_aCurrentPDFState.m_aFont.GetColor();
-    bool            bStrikeoutDone = false;
-    bool            bUnderlineDone = false;
-    bool            bOverlineDone  = false;
+    ImplFontEntry*	pFontEntry = m_pReferenceDevice->mpFontEntry;
+    Color			aUnderlineColor = m_aCurrentPDFState.m_aTextLineColor;
+    Color			aOverlineColor  = m_aCurrentPDFState.m_aOverlineColor;
+    Color			aStrikeoutColor = m_aCurrentPDFState.m_aFont.GetColor();
+    bool			bStrikeoutDone = false;
+    bool			bUnderlineDone = false;
+    bool			bOverlineDone  = false;
 
     if ( (eStrikeout == STRIKEOUT_SLASH) || (eStrikeout == STRIKEOUT_X) )
     {
@@ -8425,12 +8425,12 @@ void PDFWriterImpl::drawTransparent( const PolyPolygon& rPolyPoly, sal_uInt32 nT
     // create XObject
     m_aTransparentObjects.push_back( TransparencyEmit() );
     // FIXME: polygons with beziers may yield incorrect bound rect
-    m_aTransparentObjects.back().m_aBoundRect     = rPolyPoly.GetBoundRect();
+    m_aTransparentObjects.back().m_aBoundRect	  = rPolyPoly.GetBoundRect();
     // convert rectangle to default user space
     m_aPages.back().convertRect( m_aTransparentObjects.back().m_aBoundRect );
-    m_aTransparentObjects.back().m_nObject          = createObject();
+    m_aTransparentObjects.back().m_nObject		    = createObject();
     m_aTransparentObjects.back().m_nExtGStateObject = createObject();
-    m_aTransparentObjects.back().m_fAlpha           = (double)(100-nTransparentPercent) / 100.0;
+    m_aTransparentObjects.back().m_fAlpha		    = (double)(100-nTransparentPercent) / 100.0;
     m_aTransparentObjects.back().m_pContentStream   = new SvMemoryStream( 256, 256 );
     // create XObject's content stream
     OStringBuffer aContent( 256 );
@@ -8536,8 +8536,8 @@ SvStream* PDFWriterImpl::endRedirect()
     SvStream* pStream = NULL;
     if( ! m_aOutputStreams.empty() )
     {
-        pStream     = m_aOutputStreams.front().m_pStream;
-        m_aMapMode  = m_aOutputStreams.front().m_aMapMode;
+        pStream		= m_aOutputStreams.front().m_pStream;
+        m_aMapMode	= m_aOutputStreams.front().m_aMapMode;
         m_aOutputStreams.pop_front();
     }
 
@@ -8567,11 +8567,11 @@ void PDFWriterImpl::endTransparencyGroup( const Rectangle& rBoundingBox, sal_uIn
     {
         // create XObject
         m_aTransparentObjects.push_back( TransparencyEmit() );
-        m_aTransparentObjects.back().m_aBoundRect   = rBoundingBox;
+        m_aTransparentObjects.back().m_aBoundRect	= rBoundingBox;
         // convert rectangle to default user space
         m_aPages.back().convertRect( m_aTransparentObjects.back().m_aBoundRect );
-        m_aTransparentObjects.back().m_nObject      = createObject();
-        m_aTransparentObjects.back().m_fAlpha       = (double)(100-nTransparentPercent) / 100.0;
+        m_aTransparentObjects.back().m_nObject		= createObject();
+        m_aTransparentObjects.back().m_fAlpha		= (double)(100-nTransparentPercent) / 100.0;
         // get XObject's content stream
         m_aTransparentObjects.back().m_pContentStream = static_cast<SvMemoryStream*>(endRedirect());
         m_aTransparentObjects.back().m_nExtGStateObject = createObject();
@@ -8604,11 +8604,11 @@ void PDFWriterImpl::endTransparencyGroup( const Rectangle& rBoundingBox, const B
     {
         // create XObject
         m_aTransparentObjects.push_back( TransparencyEmit() );
-        m_aTransparentObjects.back().m_aBoundRect   = rBoundingBox;
+        m_aTransparentObjects.back().m_aBoundRect	= rBoundingBox;
         // convert rectangle to default user space
         m_aPages.back().convertRect( m_aTransparentObjects.back().m_aBoundRect );
-        m_aTransparentObjects.back().m_nObject      = createObject();
-        m_aTransparentObjects.back().m_fAlpha       = 0.0;
+        m_aTransparentObjects.back().m_nObject		= createObject();
+        m_aTransparentObjects.back().m_fAlpha		= 0.0;
         // get XObject's content stream
         m_aTransparentObjects.back().m_pContentStream = static_cast<SvMemoryStream*>(endRedirect());
         m_aTransparentObjects.back().m_nExtGStateObject = createObject();
@@ -9540,9 +9540,9 @@ bool PDFWriterImpl::writeBitmapObject( BitmapEmit& rObject, bool bMask )
 {
     CHECK_RETURN( updateObject( rObject.m_nObject ) );
 
-    Bitmap  aBitmap;
-    Color   aTransparentColor( COL_TRANSPARENT );
-    bool    bWriteMask = false;
+    Bitmap	aBitmap;
+    Color	aTransparentColor( COL_TRANSPARENT );
+    bool	bWriteMask = false;
     if( ! bMask )
     {
         aBitmap = rObject.m_aBitmap.GetBitmap();
@@ -9606,8 +9606,8 @@ bool PDFWriterImpl::writeBitmapObject( BitmapEmit& rObject, bool bMask )
             break;
     }
 
-    sal_Int32 nStreamLengthObject   = createObject();
-    sal_Int32 nMaskObject           = 0;
+    sal_Int32 nStreamLengthObject	= createObject();
+    sal_Int32 nMaskObject			= 0;
 
 #if OSL_DEBUG_LEVEL > 1
     {
@@ -9658,7 +9658,7 @@ bool PDFWriterImpl::writeBitmapObject( BitmapEmit& rObject, bool bMask )
                 //check encryption buffer size
                 if( checkEncryptionBufferSize( pAccess->GetPaletteEntryCount()*3 ) )
                 {
-                    int nChar = 0;
+                    int	nChar = 0;
                     //fill the encryption buffer
                     for( USHORT i = 0; i < pAccess->GetPaletteEntryCount(); i++ )
                     {
@@ -9803,8 +9803,8 @@ bool PDFWriterImpl::writeBitmapObject( BitmapEmit& rObject, bool bMask )
     if( nMaskObject )
     {
         BitmapEmit aEmit;
-        aEmit.m_nObject             = nMaskObject;
-        aEmit.m_aBitmap             = rObject.m_aBitmap;
+        aEmit.m_nObject				= nMaskObject;
+        aEmit.m_aBitmap				= rObject.m_aBitmap;
         return writeBitmapObject( aEmit, true );
     }
 
@@ -9830,12 +9830,12 @@ void PDFWriterImpl::drawJPGBitmap( SvStream& rDCTData, bool bIsTrueColor, const
     pStream->Seek( STREAM_SEEK_TO_END );
 
     BitmapID aID;
-    aID.m_aPixelSize    = rSizePixel;
-    aID.m_nSize         = pStream->Tell();
+    aID.m_aPixelSize	= rSizePixel;
+    aID.m_nSize			= pStream->Tell();
     pStream->Seek( STREAM_SEEK_TO_BEGIN );
-    aID.m_nChecksum     = rtl_crc32( 0, pStream->GetData(), aID.m_nSize );
+    aID.m_nChecksum		= rtl_crc32( 0, pStream->GetData(), aID.m_nSize );
     if( ! rMask.IsEmpty() )
-        aID.m_nMaskChecksum = rMask.GetChecksum();
+        aID.m_nMaskChecksum	= rMask.GetChecksum();
 
     std::list< JPGEmit >::const_iterator it;
     for( it = m_aJPGs.begin(); it != m_aJPGs.end() && ! (aID == it->m_aID); ++it )
@@ -9844,12 +9844,12 @@ void PDFWriterImpl::drawJPGBitmap( SvStream& rDCTData, bool bIsTrueColor, const
     {
         m_aJPGs.push_front( JPGEmit() );
         JPGEmit& rEmit = m_aJPGs.front();
-        rEmit.m_nObject     = createObject();
-        rEmit.m_aID         = aID;
-        rEmit.m_pStream     = pStream;
+        rEmit.m_nObject		= createObject();
+        rEmit.m_aID			= aID;
+        rEmit.m_pStream		= pStream;
         rEmit.m_bTrueColor  = bIsTrueColor;
         if( !! rMask && rMask.GetSizePixel() == rSizePixel )
-            rEmit.m_aMask   = rMask;
+            rEmit.m_aMask	= rMask;
 
         it = m_aJPGs.begin();
     }
@@ -9859,7 +9859,7 @@ void PDFWriterImpl::drawJPGBitmap( SvStream& rDCTData, bool bIsTrueColor, const
     aLine.append( "q " );
     sal_Int32 nCheckWidth = 0;
     m_aPages.back().appendMappedLength( (sal_Int32)rTargetArea.GetWidth(), aLine, false, &nCheckWidth );
-    aLine.append( " 0 0 " );
+    aLine.append( " 0 0 " );    
     sal_Int32 nCheckHeight = 0;
     m_aPages.back().appendMappedLength( (sal_Int32)rTargetArea.GetHeight(), aLine, true, &nCheckHeight );
     aLine.append( ' ' );
@@ -9919,10 +9919,10 @@ void PDFWriterImpl::drawBitmap( const Point& rDestPoint, const Size& rDestSize,
 const PDFWriterImpl::BitmapEmit& PDFWriterImpl::createBitmapEmit( const BitmapEx& rBitmap, bool bDrawMask )
 {
     BitmapID aID;
-    aID.m_aPixelSize        = rBitmap.GetSizePixel();
-    aID.m_nSize             = rBitmap.GetBitCount();
-    aID.m_nChecksum         = rBitmap.GetBitmap().GetChecksum();
-    aID.m_nMaskChecksum     = 0;
+    aID.m_aPixelSize		= rBitmap.GetSizePixel();
+    aID.m_nSize				= rBitmap.GetBitCount();
+    aID.m_nChecksum			= rBitmap.GetBitmap().GetChecksum();
+    aID.m_nMaskChecksum		= 0;
     if( rBitmap.IsAlpha() )
         aID.m_nMaskChecksum = rBitmap.GetAlpha().GetChecksum();
     else
@@ -9940,10 +9940,10 @@ const PDFWriterImpl::BitmapEmit& PDFWriterImpl::createBitmapEmit( const BitmapEx
     if( it == m_aBitmaps.end() )
     {
         m_aBitmaps.push_front( BitmapEmit() );
-        m_aBitmaps.front().m_aID        = aID;
-        m_aBitmaps.front().m_aBitmap    = rBitmap;
-        m_aBitmaps.front().m_nObject    = createObject();
-        m_aBitmaps.front().m_bDrawMask  = bDrawMask;
+        m_aBitmaps.front().m_aID		= aID;
+        m_aBitmaps.front().m_aBitmap	= rBitmap;
+        m_aBitmaps.front().m_nObject	= createObject();
+        m_aBitmaps.front().m_bDrawMask	= bDrawMask;
         it = m_aBitmaps.begin();
     }
 
@@ -10018,9 +10018,9 @@ sal_Int32 PDFWriterImpl::createGradient( const Gradient& rGradient, const Size&
     if( it == m_aGradients.end() )
     {
         m_aGradients.push_front( GradientEmit() );
-        m_aGradients.front().m_aGradient    = rGradient;
-        m_aGradients.front().m_nObject      = createObject();
-        m_aGradients.front().m_aSize        = aPtSize;
+        m_aGradients.front().m_aGradient	= rGradient;
+        m_aGradients.front().m_nObject	    = createObject();
+        m_aGradients.front().m_aSize		= aPtSize;
         it = m_aGradients.begin();
     }
 
@@ -10126,7 +10126,7 @@ void PDFWriterImpl::drawHatch( const PolyPolygon& rPolyPoly, const Hatch& rHatch
         return;
     if( rPolyPoly.Count() )
     {
-        PolyPolygon     aPolyPoly( rPolyPoly );
+        PolyPolygon		aPolyPoly( rPolyPoly );
 
         aPolyPoly.Optimize( POLY_OPTIMIZE_NO_SAME );
         push( PUSH_LINECOLOR );
@@ -10140,9 +10140,9 @@ void PDFWriterImpl::drawWallpaper( const Rectangle& rRect, const Wallpaper& rWal
 {
     MARK( "drawWallpaper" );
 
-    bool bDrawColor         = false;
-    bool bDrawGradient      = false;
-    bool bDrawBitmap        = false;
+    bool bDrawColor			= false;
+    bool bDrawGradient		= false;
+    bool bDrawBitmap		= false;
 
     BitmapEx aBitmap;
     Point aBmpPos = rRect.TopLeft();
@@ -10165,7 +10165,7 @@ void PDFWriterImpl::drawWallpaper( const Rectangle& rRect, const Wallpaper& rWal
         {
             if( rWall.GetStyle() != WALLPAPER_TILE )
             {
-                bDrawBitmap     = true;
+                bDrawBitmap		= true;
                 if( rWall.IsGradient() )
                     bDrawGradient = true;
                 else
@@ -10230,8 +10230,8 @@ void PDFWriterImpl::drawWallpaper( const Rectangle& rRect, const Wallpaper& rWal
                 aTilingStream.append( " Do\n" );
 
                 m_aTilings.push_back( TilingEmit() );
-                m_aTilings.back().m_nObject         = createObject();
-                m_aTilings.back().m_aRectangle      = Rectangle( Point( 0, 0 ), aConvertRect.GetSize() );
+                m_aTilings.back().m_nObject			= createObject();
+                m_aTilings.back().m_aRectangle		= Rectangle( Point( 0, 0 ), aConvertRect.GetSize() );
                 m_aTilings.back().m_pTilingStream   = new SvMemoryStream();
                 m_aTilings.back().m_pTilingStream->Write( aTilingStream.getStr(), aTilingStream.getLength() );
                 // phase the tiling so wallpaper begins on upper left
@@ -10259,9 +10259,9 @@ void PDFWriterImpl::drawWallpaper( const Rectangle& rRect, const Wallpaper& rWal
         }
         else
         {
-            aBmpPos     = aRect.TopLeft();
-            aBmpSize    = aRect.GetSize();
-            bDrawBitmap = true;
+            aBmpPos		= aRect.TopLeft();
+            aBmpSize	= aRect.GetSize();
+            bDrawBitmap	= true;
         }
 
         if( aBitmap.IsTransparent() )
@@ -10551,7 +10551,7 @@ void PDFWriterImpl::pop()
     OSL_ENSURE( m_aGraphicsStack.size() > 1, "pop without push" );
     if( m_aGraphicsStack.size() < 2 )
         return;
-
+    
     GraphicsState aState = m_aGraphicsStack.front();
     m_aGraphicsStack.pop_front();
     GraphicsState& rOld = m_aGraphicsStack.front();
@@ -10662,9 +10662,9 @@ void PDFWriterImpl::createNote( const Rectangle& rRect, const PDFNote& rNote, sa
         return;
 
     m_aNotes.push_back( PDFNoteEntry() );
-    m_aNotes.back().m_nObject       = createObject();
-    m_aNotes.back().m_aContents     = rNote;
-    m_aNotes.back().m_aRect         = rRect;
+    m_aNotes.back().m_nObject		= createObject();
+    m_aNotes.back().m_aContents		= rNote;
+    m_aNotes.back().m_aRect			= rRect;
     // convert to default user space now, since the mapmode may change
     m_aPages[nPageNr].convertRect( m_aNotes.back().m_aRect );
 
@@ -10683,9 +10683,9 @@ sal_Int32 PDFWriterImpl::createLink( const Rectangle& rRect, sal_Int32 nPageNr )
     sal_Int32 nRet = m_aLinks.size();
 
     m_aLinks.push_back( PDFLink() );
-    m_aLinks.back().m_nObject   = createObject();
-    m_aLinks.back().m_nPage     = nPageNr;
-    m_aLinks.back().m_aRect     = rRect;
+    m_aLinks.back().m_nObject	= createObject();
+    m_aLinks.back().m_nPage		= nPageNr;
+    m_aLinks.back().m_aRect		= rRect;
     // convert to default user space now, since the mapmode may change
     m_aPages[nPageNr].convertRect( m_aLinks.back().m_aRect );
 
@@ -10730,7 +10730,7 @@ sal_Int32 PDFWriterImpl::createDest( const Rectangle& rRect, sal_Int32 nPageNr,
 
     m_aDests.push_back( PDFDest() );
     m_aDests.back().m_nPage = nPageNr;
-    m_aDests.back().m_eType = eType;
+    m_aDests.back().m_eType	= eType;
     m_aDests.back().m_aRect = rRect;
     // convert to default user space now, since the mapmode may change
     m_aPages[nPageNr].convertRect( m_aDests.back().m_aRect );
@@ -10755,7 +10755,7 @@ sal_Int32 PDFWriterImpl::setLinkURL( sal_Int32 nLinkId, const OUString& rURL )
     if( nLinkId < 0 || nLinkId >= (sal_Int32)m_aLinks.size() )
         return -1;
 
-    m_aLinks[ nLinkId ].m_nDest = -1;
+    m_aLinks[ nLinkId ].m_nDest	= -1;
 
     using namespace ::com::sun::star;
 
@@ -10775,7 +10775,7 @@ sal_Int32 PDFWriterImpl::setLinkURL( sal_Int32 nLinkId, const OUString& rURL )
     if (m_xTrans.is())
         m_xTrans->parseStrict( aURL );
 
-    m_aLinks[ nLinkId ].m_aURL  = aURL.Complete;
+    m_aLinks[ nLinkId ].m_aURL	= aURL.Complete;
 
     return 0;
 }
@@ -10859,42 +10859,42 @@ const sal_Char* PDFWriterImpl::getStructureTag( PDFWriter::StructElement eType )
     if( aTagStrings.empty() )
     {
         aTagStrings[ PDFWriter::NonStructElement] = "NonStruct";
-        aTagStrings[ PDFWriter::Document ]      = "Document";
-        aTagStrings[ PDFWriter::Part ]          = "Part";
-        aTagStrings[ PDFWriter::Article ]       = "Art";
-        aTagStrings[ PDFWriter::Section ]       = "Sect";
-        aTagStrings[ PDFWriter::Division ]      = "Div";
-        aTagStrings[ PDFWriter::BlockQuote ]    = "BlockQuote";
-        aTagStrings[ PDFWriter::Caption ]       = "Caption";
-        aTagStrings[ PDFWriter::TOC ]           = "TOC";
-        aTagStrings[ PDFWriter::TOCI ]          = "TOCI";
-        aTagStrings[ PDFWriter::Index ]         = "Index";
-        aTagStrings[ PDFWriter::Paragraph ]     = "P";
-        aTagStrings[ PDFWriter::Heading ]       = "H";
-        aTagStrings[ PDFWriter::H1 ]            = "H1";
-        aTagStrings[ PDFWriter::H2 ]            = "H2";
-        aTagStrings[ PDFWriter::H3 ]            = "H3";
-        aTagStrings[ PDFWriter::H4 ]            = "H4";
-        aTagStrings[ PDFWriter::H5 ]            = "H5";
-        aTagStrings[ PDFWriter::H6 ]            = "H6";
-        aTagStrings[ PDFWriter::List ]          = "L";
-        aTagStrings[ PDFWriter::ListItem ]      = "LI";
-        aTagStrings[ PDFWriter::LILabel ]       = "Lbl";
-        aTagStrings[ PDFWriter::LIBody ]        = "LBody";
-        aTagStrings[ PDFWriter::Table ]         = "Table";
-        aTagStrings[ PDFWriter::TableRow ]      = "TR";
-        aTagStrings[ PDFWriter::TableHeader ]   = "TH";
-        aTagStrings[ PDFWriter::TableData ]     = "TD";
-        aTagStrings[ PDFWriter::Span ]          = "Span";
-        aTagStrings[ PDFWriter::Quote ]         = "Quote";
-        aTagStrings[ PDFWriter::Note ]          = "Note";
-        aTagStrings[ PDFWriter::Reference ]     = "Reference";
-        aTagStrings[ PDFWriter::BibEntry ]      = "BibEntry";
-        aTagStrings[ PDFWriter::Code ]          = "Code";
-        aTagStrings[ PDFWriter::Link ]          = "Link";
-        aTagStrings[ PDFWriter::Figure ]        = "Figure";
-        aTagStrings[ PDFWriter::Formula ]       = "Formula";
-        aTagStrings[ PDFWriter::Form ]          = "Form";
+        aTagStrings[ PDFWriter::Document ]		= "Document";
+        aTagStrings[ PDFWriter::Part ]			= "Part";
+        aTagStrings[ PDFWriter::Article ]		= "Art";
+        aTagStrings[ PDFWriter::Section ]		= "Sect";
+        aTagStrings[ PDFWriter::Division ]		= "Div";
+        aTagStrings[ PDFWriter::BlockQuote ]	= "BlockQuote";
+        aTagStrings[ PDFWriter::Caption ]		= "Caption";
+        aTagStrings[ PDFWriter::TOC ]			= "TOC";
+        aTagStrings[ PDFWriter::TOCI ]			= "TOCI";
+        aTagStrings[ PDFWriter::Index ]			= "Index";
+        aTagStrings[ PDFWriter::Paragraph ]		= "P";
+        aTagStrings[ PDFWriter::Heading ]		= "H";
+        aTagStrings[ PDFWriter::H1 ]			= "H1";
+        aTagStrings[ PDFWriter::H2 ]			= "H2";
+        aTagStrings[ PDFWriter::H3 ]			= "H3";
+        aTagStrings[ PDFWriter::H4 ]			= "H4";
+        aTagStrings[ PDFWriter::H5 ]			= "H5";
+        aTagStrings[ PDFWriter::H6 ]			= "H6";
+        aTagStrings[ PDFWriter::List ]			= "L";
+        aTagStrings[ PDFWriter::ListItem ]		= "LI";
+        aTagStrings[ PDFWriter::LILabel ]		= "Lbl";
+        aTagStrings[ PDFWriter::LIBody ]		= "LBody";
+        aTagStrings[ PDFWriter::Table ]			= "Table";
+        aTagStrings[ PDFWriter::TableRow ]		= "TR";
+        aTagStrings[ PDFWriter::TableHeader ]	= "TH";
+        aTagStrings[ PDFWriter::TableData ]		= "TD";
+        aTagStrings[ PDFWriter::Span ]			= "Span";
+        aTagStrings[ PDFWriter::Quote ]			= "Quote";
+        aTagStrings[ PDFWriter::Note ]			= "Note";
+        aTagStrings[ PDFWriter::Reference ]		= "Reference";
+        aTagStrings[ PDFWriter::BibEntry ]		= "BibEntry";
+        aTagStrings[ PDFWriter::Code ]			= "Code";
+        aTagStrings[ PDFWriter::Link ]			= "Link";
+        aTagStrings[ PDFWriter::Figure ]		= "Figure";
+        aTagStrings[ PDFWriter::Formula ]		= "Formula";
+        aTagStrings[ PDFWriter::Form ]			= "Form";
     }
 
     std::map< PDFWriter::StructElement, const char* >::const_iterator it = aTagStrings.find( eType );
@@ -10904,7 +10904,7 @@ const sal_Char* PDFWriterImpl::getStructureTag( PDFWriter::StructElement eType )
 
 void PDFWriterImpl::beginStructureElementMCSeq()
 {
-    if( m_bEmitStructure &&
+    if(	m_bEmitStructure &&
         m_nCurrentStructElement > 0 && // StructTreeRoot
         ! m_aStructure[ m_nCurrentStructElement ].m_bOpenMCSeq // already opened sequence
         )
@@ -11027,10 +11027,10 @@ sal_Int32 PDFWriterImpl::beginStructureElement( PDFWriter::StructElement eType,
     sal_Int32 nNewId = sal_Int32(m_aStructure.size());
     m_aStructure.push_back( PDFStructureElement() );
     PDFStructureElement& rEle = m_aStructure.back();
-    rEle.m_eType            = eType;
-    rEle.m_nOwnElement      = nNewId;
-    rEle.m_nParentElement   = m_nCurrentStructElement;
-    rEle.m_nFirstPageObject = m_aPages[ m_nCurrentPage ].m_nPageObject;
+    rEle.m_eType			= eType;
+    rEle.m_nOwnElement		= nNewId;
+    rEle.m_nParentElement	= m_nCurrentStructElement;
+    rEle.m_nFirstPageObject	= m_aPages[ m_nCurrentPage ].m_nPageObject;
     m_aStructure[ m_nCurrentStructElement ].m_aChildren.push_back( nNewId );
     m_nCurrentStructElement = nNewId;
 
@@ -11063,7 +11063,7 @@ sal_Int32 PDFWriterImpl::beginStructureElement( PDFWriter::StructElement eType,
 
     if( m_bEmitStructure ) // don't create nonexistant objects
     {
-        rEle.m_nObject      = createObject();
+        rEle.m_nObject		= createObject();
         // update parent's kids list
         m_aStructure[ rEle.m_nParentElement ].m_aKids.push_back( rEle.m_nObject );
     }
@@ -11118,7 +11118,7 @@ void PDFWriterImpl::endStructureElement()
  * This function adds an internal structure list container to overcome the 8191 elements array limitation
  * in kids element emission.
  * Recursive function
- *
+ * 
  */
 void PDFWriterImpl::addInternalStructureContainer( PDFStructureElement& rEle )
 {
@@ -11176,21 +11176,21 @@ void PDFWriterImpl::addInternalStructureContainer( PDFStructureElement& rEle )
                     m_aStructure.push_back( PDFStructureElement() );
                     PDFStructureElement& rEleNew = m_aStructure.back();
                     rEleNew.m_aAlias            = aAliasName;
-                    rEleNew.m_eType             = PDFWriter::Division; // a new Div type container
-                    rEleNew.m_nOwnElement       = nNewId;
-                    rEleNew.m_nParentElement    = nCurrentStructElement;
+                    rEleNew.m_eType			    = PDFWriter::Division; // a new Div type container
+                    rEleNew.m_nOwnElement		= nNewId;
+                    rEleNew.m_nParentElement	= nCurrentStructElement;
                     //inherit the same page as the first child to be reparented
-                    rEleNew.m_nFirstPageObject  = m_aStructure[ rEle.m_aChildren.front() ].m_nFirstPageObject;
+                    rEleNew.m_nFirstPageObject	= m_aStructure[ rEle.m_aChildren.front() ].m_nFirstPageObject;
                     rEleNew.m_nObject           = createObject();//assign a PDF object number
                     //add the object to the kid list of the parent
                     aNewKids.push_back( PDFStructureElementKid( rEleNew.m_nObject ) );
                     aNewChildren.push_back( nNewId );
-
+                    
                     std::list< sal_Int32 >::iterator aChildEndIt( rEle.m_aChildren.begin() );
                     std::list< PDFStructureElementKid >::iterator aKidEndIt( rEle.m_aKids.begin() );
                     advance( aChildEndIt, ncMaxPDFArraySize );
                     advance( aKidEndIt, ncMaxPDFArraySize );
-
+                    
                     rEleNew.m_aKids.splice( rEleNew.m_aKids.begin(),
                                             rEle.m_aKids,
                                             rEle.m_aKids.begin(),
@@ -11209,7 +11209,7 @@ void PDFWriterImpl::addInternalStructureContainer( PDFStructureElement& rEle )
                 //finally add the new kids resulting from the container added
                 rEle.m_aKids.insert( rEle.m_aKids.begin(), aNewKids.begin(), aNewKids.end() );
                 rEle.m_aChildren.insert( rEle.m_aChildren.begin(), aNewChildren.begin(), aNewChildren.end() );
-            }
+            }        
         }
     }
 }
@@ -11264,42 +11264,42 @@ bool PDFWriterImpl::setStructureAttribute( enum PDFWriter::StructAttribute eAttr
         switch( eAttr )
         {
             case PDFWriter::Placement:
-                if( eVal == PDFWriter::Block        ||
-                    eVal == PDFWriter::Inline       ||
-                    eVal == PDFWriter::Before       ||
-                    eVal == PDFWriter::Start        ||
+                if( eVal == PDFWriter::Block		||
+                    eVal == PDFWriter::Inline		||
+                    eVal == PDFWriter::Before		||
+                    eVal == PDFWriter::Start		||
                     eVal == PDFWriter::End )
                     bInsert = true;
                 break;
             case PDFWriter::WritingMode:
-                if( eVal == PDFWriter::LrTb         ||
-                    eVal == PDFWriter::RlTb         ||
+                if( eVal == PDFWriter::LrTb			||
+                    eVal == PDFWriter::RlTb			||
                     eVal == PDFWriter::TbRl )
                 {
                     bInsert = true;
                 }
                 break;
             case PDFWriter::TextAlign:
-                if( eVal == PDFWriter::Start        ||
-                    eVal == PDFWriter::Center       ||
-                    eVal == PDFWriter::End          ||
+                if( eVal == PDFWriter::Start		||
+                    eVal == PDFWriter::Center		||
+                    eVal == PDFWriter::End			||
                     eVal == PDFWriter::Justify )
                 {
-                    if( eType == PDFWriter::Paragraph   ||
-                        eType == PDFWriter::Heading     ||
-                        eType == PDFWriter::H1          ||
-                        eType == PDFWriter::H2          ||
-                        eType == PDFWriter::H3          ||
-                        eType == PDFWriter::H4          ||
-                        eType == PDFWriter::H5          ||
-                        eType == PDFWriter::H6          ||
-                        eType == PDFWriter::List        ||
-                        eType == PDFWriter::ListItem    ||
-                        eType == PDFWriter::LILabel     ||
-                        eType == PDFWriter::LIBody      ||
-                        eType == PDFWriter::Table       ||
-                        eType == PDFWriter::TableRow    ||
-                        eType == PDFWriter::TableHeader ||
+                    if( eType == PDFWriter::Paragraph	||
+                        eType == PDFWriter::Heading		||
+                        eType == PDFWriter::H1			||
+                        eType == PDFWriter::H2			||
+                        eType == PDFWriter::H3			||
+                        eType == PDFWriter::H4			||
+                        eType == PDFWriter::H5			||
+                        eType == PDFWriter::H6			||
+                        eType == PDFWriter::List		||
+                        eType == PDFWriter::ListItem	||
+                        eType == PDFWriter::LILabel		||
+                        eType == PDFWriter::LIBody		||
+                        eType == PDFWriter::Table		||
+                        eType == PDFWriter::TableRow	||
+                        eType == PDFWriter::TableHeader	||
                         eType == PDFWriter::TableData )
                     {
                         bInsert = true;
@@ -11310,11 +11310,11 @@ bool PDFWriterImpl::setStructureAttribute( enum PDFWriter::StructAttribute eAttr
             case PDFWriter::Height:
                 if( eVal == PDFWriter::Auto )
                 {
-                    if( eType == PDFWriter::Figure      ||
-                        eType == PDFWriter::Formula     ||
-                        eType == PDFWriter::Form        ||
-                        eType == PDFWriter::Table       ||
-                        eType == PDFWriter::TableHeader ||
+                    if( eType == PDFWriter::Figure		||
+                        eType == PDFWriter::Formula		||
+                        eType == PDFWriter::Form		||
+                        eType == PDFWriter::Table		||
+                        eType == PDFWriter::TableHeader	||
                         eType == PDFWriter::TableData )
                     {
                         bInsert = true;
@@ -11322,12 +11322,12 @@ bool PDFWriterImpl::setStructureAttribute( enum PDFWriter::StructAttribute eAttr
                 }
                 break;
             case PDFWriter::BlockAlign:
-                if( eVal == PDFWriter::Before       ||
-                    eVal == PDFWriter::Middle       ||
-                    eVal == PDFWriter::After        ||
+                if( eVal == PDFWriter::Before		||
+                    eVal == PDFWriter::Middle		||
+                    eVal == PDFWriter::After		||
                     eVal == PDFWriter::Justify )
                 {
-                    if( eType == PDFWriter::TableHeader ||
+                    if( eType == PDFWriter::TableHeader	||
                         eType == PDFWriter::TableData )
                     {
                         bInsert = true;
@@ -11335,11 +11335,11 @@ bool PDFWriterImpl::setStructureAttribute( enum PDFWriter::StructAttribute eAttr
                 }
                 break;
             case PDFWriter::InlineAlign:
-                if( eVal == PDFWriter::Start        ||
-                    eVal == PDFWriter::Center       ||
+                if( eVal == PDFWriter::Start		||
+                    eVal == PDFWriter::Center		||
                     eVal == PDFWriter::End )
                 {
-                    if( eType == PDFWriter::TableHeader ||
+                    if( eType == PDFWriter::TableHeader	||
                         eType == PDFWriter::TableData )
                     {
                         bInsert = true;
@@ -11347,32 +11347,32 @@ bool PDFWriterImpl::setStructureAttribute( enum PDFWriter::StructAttribute eAttr
                 }
                 break;
             case PDFWriter::LineHeight:
-                if( eVal == PDFWriter::Normal       ||
+                if( eVal == PDFWriter::Normal		||
                     eVal == PDFWriter::Auto )
                 {
                     // only for ILSE and BLSE
-                    if( eType == PDFWriter::Paragraph   ||
-                        eType == PDFWriter::Heading     ||
-                        eType == PDFWriter::H1          ||
-                        eType == PDFWriter::H2          ||
-                        eType == PDFWriter::H3          ||
-                        eType == PDFWriter::H4          ||
-                        eType == PDFWriter::H5          ||
-                        eType == PDFWriter::H6          ||
-                        eType == PDFWriter::List        ||
-                        eType == PDFWriter::ListItem    ||
-                        eType == PDFWriter::LILabel     ||
-                        eType == PDFWriter::LIBody      ||
-                        eType == PDFWriter::Table       ||
-                        eType == PDFWriter::TableRow    ||
-                        eType == PDFWriter::TableHeader ||
-                        eType == PDFWriter::TableData   ||
-                        eType == PDFWriter::Span        ||
-                        eType == PDFWriter::Quote       ||
-                        eType == PDFWriter::Note        ||
-                        eType == PDFWriter::Reference   ||
-                        eType == PDFWriter::BibEntry    ||
-                        eType == PDFWriter::Code        ||
+                    if( eType == PDFWriter::Paragraph	||
+                        eType == PDFWriter::Heading		||
+                        eType == PDFWriter::H1			||
+                        eType == PDFWriter::H2			||
+                        eType == PDFWriter::H3			||
+                        eType == PDFWriter::H4			||
+                        eType == PDFWriter::H5			||
+                        eType == PDFWriter::H6			||
+                        eType == PDFWriter::List		||
+                        eType == PDFWriter::ListItem	||
+                        eType == PDFWriter::LILabel		||
+                        eType == PDFWriter::LIBody		||
+                        eType == PDFWriter::Table		||
+                        eType == PDFWriter::TableRow	||
+                        eType == PDFWriter::TableHeader	||
+                        eType == PDFWriter::TableData	||
+                        eType == PDFWriter::Span		||
+                        eType == PDFWriter::Quote		||
+                        eType == PDFWriter::Note		||
+                        eType == PDFWriter::Reference	||
+                        eType == PDFWriter::BibEntry	||
+                        eType == PDFWriter::Code		||
                         eType == PDFWriter::Link )
                     {
                         bInsert = true;
@@ -11380,34 +11380,34 @@ bool PDFWriterImpl::setStructureAttribute( enum PDFWriter::StructAttribute eAttr
                 }
                 break;
             case PDFWriter::TextDecorationType:
-                if( eVal == PDFWriter::NONE         ||
-                    eVal == PDFWriter::Underline    ||
-                    eVal == PDFWriter::Overline     ||
+                if( eVal == PDFWriter::NONE			||
+                    eVal == PDFWriter::Underline	||
+                    eVal == PDFWriter::Overline		||
                     eVal == PDFWriter::LineThrough )
                 {
                     // only for ILSE and BLSE
-                    if( eType == PDFWriter::Paragraph   ||
-                        eType == PDFWriter::Heading     ||
-                        eType == PDFWriter::H1          ||
-                        eType == PDFWriter::H2          ||
-                        eType == PDFWriter::H3          ||
-                        eType == PDFWriter::H4          ||
-                        eType == PDFWriter::H5          ||
-                        eType == PDFWriter::H6          ||
-                        eType == PDFWriter::List        ||
-                        eType == PDFWriter::ListItem    ||
-                        eType == PDFWriter::LILabel     ||
-                        eType == PDFWriter::LIBody      ||
-                        eType == PDFWriter::Table       ||
-                        eType == PDFWriter::TableRow    ||
-                        eType == PDFWriter::TableHeader ||
-                        eType == PDFWriter::TableData   ||
-                        eType == PDFWriter::Span        ||
-                        eType == PDFWriter::Quote       ||
-                        eType == PDFWriter::Note        ||
-                        eType == PDFWriter::Reference   ||
-                        eType == PDFWriter::BibEntry    ||
-                        eType == PDFWriter::Code        ||
+                    if( eType == PDFWriter::Paragraph	||
+                        eType == PDFWriter::Heading		||
+                        eType == PDFWriter::H1			||
+                        eType == PDFWriter::H2			||
+                        eType == PDFWriter::H3			||
+                        eType == PDFWriter::H4			||
+                        eType == PDFWriter::H5			||
+                        eType == PDFWriter::H6			||
+                        eType == PDFWriter::List		||
+                        eType == PDFWriter::ListItem	||
+                        eType == PDFWriter::LILabel		||
+                        eType == PDFWriter::LIBody		||
+                        eType == PDFWriter::Table		||
+                        eType == PDFWriter::TableRow	||
+                        eType == PDFWriter::TableHeader	||
+                        eType == PDFWriter::TableData	||
+                        eType == PDFWriter::Span		||
+                        eType == PDFWriter::Quote		||
+                        eType == PDFWriter::Note		||
+                        eType == PDFWriter::Reference	||
+                        eType == PDFWriter::BibEntry	||
+                        eType == PDFWriter::Code		||
                         eType == PDFWriter::Link )
                     {
                         bInsert = true;
@@ -11415,14 +11415,14 @@ bool PDFWriterImpl::setStructureAttribute( enum PDFWriter::StructAttribute eAttr
                 }
                 break;
             case PDFWriter::ListNumbering:
-                if( eVal == PDFWriter::NONE         ||
-                    eVal == PDFWriter::Disc         ||
-                    eVal == PDFWriter::Circle       ||
-                    eVal == PDFWriter::Square       ||
-                    eVal == PDFWriter::Decimal      ||
-                    eVal == PDFWriter::UpperRoman   ||
-                    eVal == PDFWriter::LowerRoman   ||
-                    eVal == PDFWriter::UpperAlpha   ||
+                if( eVal == PDFWriter::NONE			||
+                    eVal == PDFWriter::Disc			||
+                    eVal == PDFWriter::Circle		||
+                    eVal == PDFWriter::Square		||
+                    eVal == PDFWriter::Decimal		||
+                    eVal == PDFWriter::UpperRoman	||
+                    eVal == PDFWriter::LowerRoman	||
+                    eVal == PDFWriter::UpperAlpha	||
                     eVal == PDFWriter::LowerAlpha )
                 {
                     if( eType == PDFWriter::List )
@@ -11470,21 +11470,21 @@ bool PDFWriterImpl::setStructureAttributeNumerical( enum PDFWriter::StructAttrib
             case PDFWriter::StartIndent:
             case PDFWriter::EndIndent:
                 // just for BLSE
-                if( eType == PDFWriter::Paragraph   ||
-                    eType == PDFWriter::Heading     ||
-                    eType == PDFWriter::H1          ||
-                    eType == PDFWriter::H2          ||
-                    eType == PDFWriter::H3          ||
-                    eType == PDFWriter::H4          ||
-                    eType == PDFWriter::H5          ||
-                    eType == PDFWriter::H6          ||
-                    eType == PDFWriter::List        ||
-                    eType == PDFWriter::ListItem    ||
-                    eType == PDFWriter::LILabel     ||
-                    eType == PDFWriter::LIBody      ||
-                    eType == PDFWriter::Table       ||
-                    eType == PDFWriter::TableRow    ||
-                    eType == PDFWriter::TableHeader ||
+                if( eType == PDFWriter::Paragraph	||
+                    eType == PDFWriter::Heading		||
+                    eType == PDFWriter::H1			||
+                    eType == PDFWriter::H2			||
+                    eType == PDFWriter::H3			||
+                    eType == PDFWriter::H4			||
+                    eType == PDFWriter::H5			||
+                    eType == PDFWriter::H6			||
+                    eType == PDFWriter::List		||
+                    eType == PDFWriter::ListItem	||
+                    eType == PDFWriter::LILabel		||
+                    eType == PDFWriter::LIBody		||
+                    eType == PDFWriter::Table		||
+                    eType == PDFWriter::TableRow	||
+                    eType == PDFWriter::TableHeader	||
                     eType == PDFWriter::TableData )
                 {
                     bInsert = true;
@@ -11492,17 +11492,17 @@ bool PDFWriterImpl::setStructureAttributeNumerical( enum PDFWriter::StructAttrib
                 break;
             case PDFWriter::TextIndent:
                 // paragraph like BLSE and additional elements
-                if( eType == PDFWriter::Paragraph   ||
-                    eType == PDFWriter::Heading     ||
-                    eType == PDFWriter::H1          ||
-                    eType == PDFWriter::H2          ||
-                    eType == PDFWriter::H3          ||
-                    eType == PDFWriter::H4          ||
-                    eType == PDFWriter::H5          ||
-                    eType == PDFWriter::H6          ||
-                    eType == PDFWriter::LILabel     ||
-                    eType == PDFWriter::LIBody      ||
-                    eType == PDFWriter::TableHeader ||
+                if( eType == PDFWriter::Paragraph	||
+                    eType == PDFWriter::Heading		||
+                    eType == PDFWriter::H1			||
+                    eType == PDFWriter::H2			||
+                    eType == PDFWriter::H3			||
+                    eType == PDFWriter::H4			||
+                    eType == PDFWriter::H5			||
+                    eType == PDFWriter::H6			||
+                    eType == PDFWriter::LILabel		||
+                    eType == PDFWriter::LIBody		||
+                    eType == PDFWriter::TableHeader	||
                     eType == PDFWriter::TableData )
                 {
                     bInsert = true;
@@ -11510,11 +11510,11 @@ bool PDFWriterImpl::setStructureAttributeNumerical( enum PDFWriter::StructAttrib
                 break;
             case PDFWriter::Width:
             case PDFWriter::Height:
-                if( eType == PDFWriter::Figure      ||
-                    eType == PDFWriter::Formula     ||
-                    eType == PDFWriter::Form        ||
-                    eType == PDFWriter::Table       ||
-                    eType == PDFWriter::TableHeader ||
+                if( eType == PDFWriter::Figure		||
+                    eType == PDFWriter::Formula		||
+                    eType == PDFWriter::Form		||
+                    eType == PDFWriter::Table		||
+                    eType == PDFWriter::TableHeader	||
                     eType == PDFWriter::TableData )
                 {
                     bInsert = true;
@@ -11523,28 +11523,28 @@ bool PDFWriterImpl::setStructureAttributeNumerical( enum PDFWriter::StructAttrib
             case PDFWriter::LineHeight:
             case PDFWriter::BaselineShift:
                 // only for ILSE and BLSE
-                if( eType == PDFWriter::Paragraph   ||
-                    eType == PDFWriter::Heading     ||
-                    eType == PDFWriter::H1          ||
-                    eType == PDFWriter::H2          ||
-                    eType == PDFWriter::H3          ||
-                    eType == PDFWriter::H4          ||
-                    eType == PDFWriter::H5          ||
-                    eType == PDFWriter::H6          ||
-                    eType == PDFWriter::List        ||
-                    eType == PDFWriter::ListItem    ||
-                    eType == PDFWriter::LILabel     ||
-                    eType == PDFWriter::LIBody      ||
-                    eType == PDFWriter::Table       ||
-                    eType == PDFWriter::TableRow    ||
-                    eType == PDFWriter::TableHeader ||
-                    eType == PDFWriter::TableData   ||
-                    eType == PDFWriter::Span        ||
-                    eType == PDFWriter::Quote       ||
-                    eType == PDFWriter::Note        ||
-                    eType == PDFWriter::Reference   ||
-                    eType == PDFWriter::BibEntry    ||
-                    eType == PDFWriter::Code        ||
+                if( eType == PDFWriter::Paragraph	||
+                    eType == PDFWriter::Heading		||
+                    eType == PDFWriter::H1			||
+                    eType == PDFWriter::H2			||
+                    eType == PDFWriter::H3			||
+                    eType == PDFWriter::H4			||
+                    eType == PDFWriter::H5			||
+                    eType == PDFWriter::H6			||
+                    eType == PDFWriter::List		||
+                    eType == PDFWriter::ListItem	||
+                    eType == PDFWriter::LILabel		||
+                    eType == PDFWriter::LIBody		||
+                    eType == PDFWriter::Table		||
+                    eType == PDFWriter::TableRow	||
+                    eType == PDFWriter::TableHeader	||
+                    eType == PDFWriter::TableData	||
+                    eType == PDFWriter::Span		||
+                    eType == PDFWriter::Quote		||
+                    eType == PDFWriter::Note		||
+                    eType == PDFWriter::Reference	||
+                    eType == PDFWriter::BibEntry	||
+                    eType == PDFWriter::Code		||
                     eType == PDFWriter::Link )
                 {
                         bInsert = true;
@@ -11553,7 +11553,7 @@ bool PDFWriterImpl::setStructureAttributeNumerical( enum PDFWriter::StructAttrib
             case PDFWriter::RowSpan:
             case PDFWriter::ColSpan:
                 // only for table cells
-                if( eType == PDFWriter::TableHeader ||
+                if( eType == PDFWriter::TableHeader	||
                     eType == PDFWriter::TableData )
                 {
                     bInsert = true;
@@ -11591,9 +11591,9 @@ void PDFWriterImpl::setStructureBoundingBox( const Rectangle& rRect )
     if( m_nCurrentStructElement > 0 && m_bEmitStructure )
     {
         PDFWriter::StructElement eType = m_aStructure[ m_nCurrentStructElement ].m_eType;
-        if( eType == PDFWriter::Figure      ||
-            eType == PDFWriter::Formula     ||
-            eType == PDFWriter::Form        ||
+        if( eType == PDFWriter::Figure		||
+            eType == PDFWriter::Formula		||
+            eType == PDFWriter::Form		||
             eType == PDFWriter::Table )
         {
             m_aStructure[ m_nCurrentStructElement ].m_aBBox = rRect;
@@ -11638,8 +11638,8 @@ void PDFWriterImpl::setPageTransition( PDFWriter::PageTransition eType, sal_uInt
     if( nPageNr < 0 || nPageNr >= (sal_Int32)m_aPages.size() )
         return;
 
-    m_aPages[ nPageNr ].m_eTransition   = eType;
-    m_aPages[ nPageNr ].m_nTransTime    = nMilliSec;
+    m_aPages[ nPageNr ].m_eTransition	= eType;
+    m_aPages[ nPageNr ].m_nTransTime	= nMilliSec;
 }
 
 void PDFWriterImpl::ensureUniqueRadioOnValues()
@@ -11728,9 +11728,9 @@ sal_Int32 PDFWriterImpl::findRadioGroupWidget( const PDFWriter::RadioButtonWidge
 
         // new group, insert the radiobutton
         m_aWidgets.push_back( PDFWidget() );
-        m_aWidgets.back().m_nObject     = createObject();
-        m_aWidgets.back().m_nPage       = m_nCurrentPage;
-        m_aWidgets.back().m_eType       = PDFWriter::RadioButton;
+        m_aWidgets.back().m_nObject		= createObject();
+        m_aWidgets.back().m_nPage		= m_nCurrentPage;
+        m_aWidgets.back().m_eType		= PDFWriter::RadioButton;
         m_aWidgets.back().m_nRadioGroup = rBtn.RadioGroup;
         m_aWidgets.back().m_nFlags |= 0x0000C000;   // NoToggleToOff and Radio bits
 
@@ -11753,10 +11753,10 @@ sal_Int32 PDFWriterImpl::createControl( const PDFWriter::AnyWidget& rControl, sa
     sal_Int32 nNewWidget = m_aWidgets.size();
     m_aWidgets.push_back( PDFWidget() );
 
-    m_aWidgets.back().m_nObject         = createObject();
-    m_aWidgets.back().m_aRect               = rControl.Location;
-    m_aWidgets.back().m_nPage               = nPageNr;
-    m_aWidgets.back().m_eType               = rControl.getType();
+    m_aWidgets.back().m_nObject			= createObject();
+    m_aWidgets.back().m_aRect				= rControl.Location;
+    m_aWidgets.back().m_nPage				= nPageNr;
+    m_aWidgets.back().m_eType				= rControl.getType();
 
     sal_Int32 nRadioGroupWidget = -1;
     // for unknown reasons the radio buttons of a radio group must not have a
@@ -11770,10 +11770,10 @@ sal_Int32 PDFWriterImpl::createControl( const PDFWriter::AnyWidget& rControl, sa
     }
 
     // caution: m_aWidgets must not be changed after here or rNewWidget may be invalid
-    PDFWidget& rNewWidget           = m_aWidgets[nNewWidget];
-    rNewWidget.m_aDescription       = rControl.Description;
-    rNewWidget.m_aText              = rControl.Text;
-    rNewWidget.m_nTextStyle         = rControl.TextStyle &
+    PDFWidget& rNewWidget			= m_aWidgets[nNewWidget];
+    rNewWidget.m_aDescription		= rControl.Description;
+    rNewWidget.m_aText				= rControl.Text;
+    rNewWidget.m_nTextStyle			= rControl.TextStyle &
         (  TEXT_DRAW_LEFT | TEXT_DRAW_CENTER | TEXT_DRAW_RIGHT | TEXT_DRAW_TOP |
            TEXT_DRAW_VCENTER | TEXT_DRAW_BOTTOM |
            TEXT_DRAW_MULTILINE | TEXT_DRAW_WORDBREAK  );
@@ -11810,8 +11810,8 @@ sal_Int32 PDFWriterImpl::createControl( const PDFWriter::AnyWidget& rControl, sa
          *  so we need to create a radio button on demand for a new group
          *  and insert a checkbox for each RadioButtonWidget as its child
          */
-        rNewWidget.m_eType          = PDFWriter::CheckBox;
-        rNewWidget.m_nRadioGroup    = rBtn.RadioGroup;
+        rNewWidget.m_eType			= PDFWriter::CheckBox;
+        rNewWidget.m_nRadioGroup	= rBtn.RadioGroup;
 
         DBG_ASSERT( nRadioGroupWidget >= 0 && nRadioGroupWidget < (sal_Int32)m_aWidgets.size(), "no radio group parent" );
 
@@ -11824,8 +11824,8 @@ sal_Int32 PDFWriterImpl::createControl( const PDFWriter::AnyWidget& rControl, sa
         rNewWidget.m_aOnValue   = rBtn.OnValue;
         if( ! rRadioButton.m_aValue.getLength() && rBtn.Selected )
         {
-            rNewWidget.m_aValue     = rNewWidget.m_aOnValue;
-            rRadioButton.m_aValue   = rNewWidget.m_aOnValue;
+            rNewWidget.m_aValue		= rNewWidget.m_aOnValue;
+            rRadioButton.m_aValue	= rNewWidget.m_aOnValue;
         }
         createDefaultRadioButtonAppearance( rNewWidget, rBtn );
 
@@ -11851,9 +11851,9 @@ sal_Int32 PDFWriterImpl::createControl( const PDFWriter::AnyWidget& rControl, sa
             rNewWidget.m_nTextStyle = TEXT_DRAW_VCENTER;
 
         const PDFWriter::ListBoxWidget& rLstBox = static_cast<const PDFWriter::ListBoxWidget&>(rControl);
-        rNewWidget.m_aListEntries     = rLstBox.Entries;
+        rNewWidget.m_aListEntries	  = rLstBox.Entries;
         rNewWidget.m_aSelectedEntries = rLstBox.SelectedEntries;
-        rNewWidget.m_aValue           = rLstBox.Text;
+        rNewWidget.m_aValue			  = rLstBox.Text;
         if( rLstBox.DropDown )
             rNewWidget.m_nFlags |= 0x00020000;
         if( rLstBox.Sort )
@@ -11869,28 +11869,28 @@ sal_Int32 PDFWriterImpl::createControl( const PDFWriter::AnyWidget& rControl, sa
             rNewWidget.m_nTextStyle = TEXT_DRAW_VCENTER;
 
         const PDFWriter::ComboBoxWidget& rBox = static_cast<const PDFWriter::ComboBoxWidget&>(rControl);
-        rNewWidget.m_aValue         = rBox.Text;
-        rNewWidget.m_aListEntries   = rBox.Entries;
+        rNewWidget.m_aValue			= rBox.Text;
+        rNewWidget.m_aListEntries	= rBox.Entries;
         rNewWidget.m_nFlags |= 0x00060000; // combo and edit flag
         if( rBox.Sort )
             rNewWidget.m_nFlags |= 0x00080000;
 
         PDFWriter::ListBoxWidget aLBox;
-        aLBox.Name              = rBox.Name;
-        aLBox.Description       = rBox.Description;
-        aLBox.Text              = rBox.Text;
-        aLBox.TextStyle         = rBox.TextStyle;
-        aLBox.ReadOnly          = rBox.ReadOnly;
-        aLBox.Border            = rBox.Border;
-        aLBox.BorderColor       = rBox.BorderColor;
-        aLBox.Background        = rBox.Background;
-        aLBox.BackgroundColor   = rBox.BackgroundColor;
-        aLBox.TextFont          = rBox.TextFont;
-        aLBox.TextColor         = rBox.TextColor;
-        aLBox.DropDown          = true;
-        aLBox.Sort              = rBox.Sort;
-        aLBox.MultiSelect       = false;
-        aLBox.Entries           = rBox.Entries;
+        aLBox.Name				= rBox.Name;
+        aLBox.Description		= rBox.Description;
+        aLBox.Text				= rBox.Text;
+        aLBox.TextStyle			= rBox.TextStyle;
+        aLBox.ReadOnly			= rBox.ReadOnly;
+        aLBox.Border			= rBox.Border;
+        aLBox.BorderColor		= rBox.BorderColor;
+        aLBox.Background		= rBox.Background;
+        aLBox.BackgroundColor	= rBox.BackgroundColor;
+        aLBox.TextFont			= rBox.TextFont;
+        aLBox.TextColor			= rBox.TextColor;
+        aLBox.DropDown			= true;
+        aLBox.Sort				= rBox.Sort;
+        aLBox.MultiSelect		= false;
+        aLBox.Entries			= rBox.Entries;
 
         createDefaultListBoxAppearance( rNewWidget, aLBox );
     }
diff --git a/vcl/source/gdi/pdfwriter_impl.hxx b/vcl/source/gdi/pdfwriter_impl.hxx
index 2eacdc215dd8..33d2e67679a8 100644
--- a/vcl/source/gdi/pdfwriter_impl.hxx
+++ b/vcl/source/gdi/pdfwriter_impl.hxx
@@ -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
@@ -84,19 +84,19 @@ public:
     // definition of structs
     struct BuiltinFont
     {
-        const char *                m_pName;                     // Name
-        const char *                m_pStyleName;                // StyleName
-        const char *                m_pPSName;                   // PSName
-        int                         m_nAscent;
-        int                         m_nDescent;
-        FontFamily                  m_eFamily;                   // Family
-        CharSet                     m_eCharSet;                  // CharSet
-        FontPitch                   m_ePitch;                    // Pitch
-        FontWidth                   m_eWidthType;                // WidthType
-        FontWeight                  m_eWeight;                   // Weight
-        FontItalic                  m_eItalic;                   // Italic
-        int                         m_aWidths[256];              // character metrics
-
+        const char *        		m_pName;                     // Name
+        const char *        		m_pStyleName;                // StyleName
+        const char *        		m_pPSName;					 // PSName
+        int							m_nAscent;
+        int							m_nDescent;
+        FontFamily					m_eFamily;                   // Family
+        CharSet						m_eCharSet;                  // CharSet
+        FontPitch					m_ePitch;                    // Pitch
+        FontWidth					m_eWidthType;                // WidthType
+        FontWeight					m_eWeight;                   // Weight
+        FontItalic					m_eItalic;                   // Italic
+        int							m_aWidths[256];				 // character metrics
+        
         rtl::OString getNameObject() const;
     };
 
@@ -110,26 +110,26 @@ public:
         ResourceMap m_aExtGStates;
         ResourceMap m_aShadings;
         ResourceMap m_aPatterns;
-
+        
         void append( rtl::OStringBuffer&, sal_Int32 nFontDictObject );
     };
-
+    
     struct PDFPage
     {
-        PDFWriterImpl*              m_pWriter;
-        sal_Int32                   m_nPageWidth;           // in inch/72
-        sal_Int32                   m_nPageHeight;          // in inch/72
-        PDFWriter::Orientation      m_eOrientation;
-        sal_Int32                   m_nPageObject;
-        sal_Int32                   m_nPageIndex;
-        std::vector<sal_Int32>      m_aStreamObjects;
-        sal_Int32                   m_nStreamLengthObject;
-        sal_uInt64                  m_nBeginStreamPos;
-        std::vector<sal_Int32>      m_aAnnotations;
-        std::vector<sal_Int32>      m_aMCIDParents;
-        PDFWriter::PageTransition   m_eTransition;
-        sal_uInt32                  m_nTransTime;
-        sal_uInt32                  m_nDuration;
+        PDFWriterImpl*				m_pWriter;
+        sal_Int32					m_nPageWidth;			// in inch/72
+        sal_Int32					m_nPageHeight;			// in inch/72
+        PDFWriter::Orientation		m_eOrientation;
+        sal_Int32					m_nPageObject;
+        sal_Int32					m_nPageIndex;
+        std::vector<sal_Int32>		m_aStreamObjects;
+        sal_Int32					m_nStreamLengthObject;
+        sal_uInt64					m_nBeginStreamPos;
+        std::vector<sal_Int32>		m_aAnnotations;
+        std::vector<sal_Int32>		m_aMCIDParents;
+        PDFWriter::PageTransition	m_eTransition;
+        sal_uInt32					m_nTransTime;
+        sal_uInt32					m_nDuration;
         bool                        m_bHasWidgets;
 
         PDFPage( PDFWriterImpl* pWriter, sal_Int32 nPageWidth, sal_Int32 nPageHeight, PDFWriter::Orientation eOrientation );
@@ -164,7 +164,7 @@ public:
         // can be important if the source MapMode is not
         // symmetrical) to page length and appends it to the buffer
         // if pOutLength is set it will be updated to the emitted length
-        // (in PDF map mode, that is 10th of point)
+        // (in PDF map mode, that is 10th of point)        
         void appendMappedLength( sal_Int32 nLength, rtl::OStringBuffer& rBuffer, bool bVertical = true, sal_Int32* pOutLength = NULL ) const;
         // the same for double values
         void appendMappedLength( double fLength, rtl::OStringBuffer& rBuffer, bool bVertical = true, sal_Int32* pOutLength = NULL, sal_Int32 nPrecision = 5 ) const;
@@ -183,19 +183,19 @@ public:
 
     struct BitmapID
     {
-        Size        m_aPixelSize;
-        sal_Int32   m_nSize;
-        sal_Int32   m_nChecksum;
-        sal_Int32   m_nMaskChecksum;
-
+        Size		m_aPixelSize;
+        sal_Int32	m_nSize;
+        sal_Int32	m_nChecksum;
+        sal_Int32	m_nMaskChecksum;
+        
         BitmapID() : m_nSize( 0 ), m_nChecksum( 0 ), m_nMaskChecksum( 0 ) {}
 
         BitmapID& operator=( const BitmapID& rCopy )
         {
-            m_aPixelSize    = rCopy.m_aPixelSize;
-            m_nSize         = rCopy.m_nSize;
-            m_nChecksum     = rCopy.m_nChecksum;
-            m_nMaskChecksum = rCopy.m_nMaskChecksum;
+            m_aPixelSize	= rCopy.m_aPixelSize;
+            m_nSize			= rCopy.m_nSize;
+            m_nChecksum		= rCopy.m_nChecksum;
+            m_nMaskChecksum	= rCopy.m_nMaskChecksum;
             return *this;
         }
 
@@ -210,20 +210,20 @@ public:
 
     struct BitmapEmit
     {
-        BitmapID    m_aID;
-        BitmapEx    m_aBitmap;
-        sal_Int32   m_nObject;
-        bool        m_bDrawMask;
+        BitmapID	m_aID;
+        BitmapEx	m_aBitmap;
+        sal_Int32	m_nObject;
+        bool		m_bDrawMask;
 
         BitmapEmit() : m_bDrawMask( false ) {}
     };
 
     struct JPGEmit
     {
-        BitmapID            m_aID;
-        SvMemoryStream*     m_pStream;
-        Bitmap              m_aMask;
-        sal_Int32           m_nObject;
+        BitmapID			m_aID;
+        SvMemoryStream*		m_pStream;
+        Bitmap				m_aMask;
+        sal_Int32			m_nObject;
         bool                m_bTrueColor;
 
         JPGEmit() : m_pStream( NULL ) {}
@@ -232,9 +232,9 @@ public:
 
     struct GradientEmit
     {
-        Gradient    m_aGradient;
-        Size        m_aSize;
-        sal_Int32   m_nObject;
+        Gradient	m_aGradient;
+        Size		m_aSize;
+        sal_Int32	m_nObject;
     };
 
     // for tilings (drawWallpaper, begin/endPattern)
@@ -246,7 +246,7 @@ public:
         SvtGraphicFill::Transform   m_aTransform;
         ResourceDict                m_aResources;
         SvMemoryStream*             m_pTilingStream;
-
+        
         TilingEmit()
                 : m_nObject( 0 ),
                   m_pTilingStream( NULL )
@@ -256,12 +256,12 @@ public:
     // for transparency group XObjects
     struct TransparencyEmit
     {
-        sal_Int32           m_nObject;
-        sal_Int32           m_nExtGStateObject;
-        double              m_fAlpha;
-        Rectangle           m_aBoundRect;
-        SvMemoryStream*     m_pContentStream;
-        SvMemoryStream*     m_pSoftMaskStream;
+        sal_Int32			m_nObject;
+        sal_Int32			m_nExtGStateObject;
+        double				m_fAlpha;
+        Rectangle			m_aBoundRect;
+        SvMemoryStream*		m_pContentStream;
+        SvMemoryStream*		m_pSoftMaskStream;
 
         TransparencyEmit()
                 : m_nObject( 0 ),
@@ -281,12 +281,12 @@ public:
     class GlyphEmit
     {
         // performance: actually this should probably a vector;
-        sal_Ucs                         m_aBufferedUnicodes[3];
+        sal_Ucs		                    m_aBufferedUnicodes[3];
         sal_Int32                       m_nUnicodes;
         sal_Int32                       m_nMaxUnicodes;
         boost::shared_array<sal_Ucs>    m_pUnicodes;
         sal_uInt8                       m_nSubsetGlyphID;
-
+        
     public:
         GlyphEmit() : m_nUnicodes(0), m_nSubsetGlyphID(0)
         {
@@ -299,7 +299,7 @@ public:
 
         void setGlyphId( sal_uInt8 i_nId ) { m_nSubsetGlyphID = i_nId; }
         sal_uInt8 getGlyphId() const { return m_nSubsetGlyphID; }
-
+        
         void addCode( sal_Ucs i_cCode )
         {
             if( m_nUnicodes == m_nMaxUnicodes )
@@ -329,73 +329,73 @@ public:
     typedef std::map< sal_GlyphId, GlyphEmit > FontEmitMapping;
     struct FontEmit
     {
-        sal_Int32           m_nFontID;
-        FontEmitMapping     m_aMapping;
+        sal_Int32			m_nFontID;
+        FontEmitMapping		m_aMapping;
 
         FontEmit( sal_Int32 nID ) : m_nFontID( nID ) {}
     };
     typedef std::list< FontEmit > FontEmitList;
     struct Glyph
     {
-        sal_Int32   m_nFontID;
-        sal_uInt8   m_nSubsetGlyphID;
+        sal_Int32	m_nFontID;
+        sal_uInt8	m_nSubsetGlyphID;
     };
     typedef std::map< sal_GlyphId, Glyph > FontMapping;
     struct FontSubset
     {
-        FontEmitList        m_aSubsets;
-        FontMapping         m_aMapping;
+        FontEmitList		m_aSubsets;
+        FontMapping			m_aMapping;
     };
     typedef std::map< const ImplFontData*, FontSubset > FontSubsetData;
     struct EmbedCode
     {
-        sal_Ucs             m_aUnicode;
-        rtl::OString        m_aName;
+        sal_Ucs				m_aUnicode;
+        rtl::OString		m_aName;
     };
     struct EmbedEncoding
     {
-        sal_Int32                       m_nFontID;
-        std::vector< EmbedCode >        m_aEncVector;
-        std::map< sal_Ucs, sal_Int8 >   m_aCMap;
+        sal_Int32						m_nFontID;
+        std::vector< EmbedCode >		m_aEncVector;
+        std::map< sal_Ucs, sal_Int8 >	m_aCMap;
     };
     struct EmbedFont
     {
-        sal_Int32                       m_nNormalFontID;
-        std::list< EmbedEncoding >      m_aExtendedEncodings;
-
+        sal_Int32						m_nNormalFontID;
+        std::list< EmbedEncoding >		m_aExtendedEncodings;
+        
         EmbedFont() : m_nNormalFontID( 0 ) {}
     };
     typedef std::map< const ImplFontData*, EmbedFont > FontEmbedData;
 
     struct PDFDest
     {
-        sal_Int32                   m_nPage;
-        PDFWriter::DestAreaType     m_eType;
-        Rectangle                   m_aRect;
+        sal_Int32					m_nPage;
+        PDFWriter::DestAreaType		m_eType;
+        Rectangle					m_aRect;
     };
 
 //--->i56629
     struct PDFNamedDest
     {
         rtl::OUString               m_aDestName;
-        sal_Int32                   m_nPage;
-        PDFWriter::DestAreaType     m_eType;
-        Rectangle                   m_aRect;
+        sal_Int32					m_nPage;
+        PDFWriter::DestAreaType		m_eType;
+        Rectangle					m_aRect;
     };
 //<---
-
+ 
     struct PDFOutlineEntry
     {
-        sal_Int32                   m_nParentID;
-        sal_Int32                   m_nObject;
-        sal_Int32                   m_nParentObject;
-        sal_Int32                   m_nNextObject;
-        sal_Int32                   m_nPrevObject;
-        std::vector< sal_Int32 >    m_aChildren;
-        rtl::OUString               m_aTitle;
-        sal_Int32                   m_nDestID;
-
-        PDFOutlineEntry()
+        sal_Int32					m_nParentID;
+        sal_Int32					m_nObject;
+        sal_Int32					m_nParentObject;
+        sal_Int32					m_nNextObject;
+        sal_Int32					m_nPrevObject;
+        std::vector< sal_Int32 >	m_aChildren;
+        rtl::OUString				m_aTitle;
+        sal_Int32					m_nDestID;
+        
+        PDFOutlineEntry() 
                 : m_nParentID( -1 ),
                   m_nObject( 0 ),
                   m_nParentObject( 0 ),
@@ -407,9 +407,9 @@ public:
 
     struct PDFAnnotation
     {
-        sal_Int32                   m_nObject;
-        Rectangle                   m_aRect;
-        sal_Int32                   m_nPage;
+        sal_Int32					m_nObject;
+        Rectangle					m_aRect;
+        sal_Int32					m_nPage;
 
         PDFAnnotation()
                 : m_nObject( -1 ),
@@ -419,11 +419,11 @@ public:
 
     struct PDFLink : public PDFAnnotation
     {
-        sal_Int32                   m_nDest; // set to -1 for URL, to a dest else
-        rtl::OUString               m_aURL;
+        sal_Int32					m_nDest; // set to -1 for URL, to a dest else
+        rtl::OUString				m_aURL;
         sal_Int32                   m_nStructParent; // struct parent entry
-
-        PDFLink()
+        
+        PDFLink() 
                 : m_nDest( -1 ),
                   m_nStructParent( -1 )
         {}
@@ -431,7 +431,7 @@ public:
 
     struct PDFNoteEntry : public PDFAnnotation
     {
-        PDFNote                     m_aContents;
+        PDFNote						m_aContents;
 
         PDFNoteEntry()
         {}
@@ -442,34 +442,34 @@ public:
 
     struct PDFWidget : public PDFAnnotation
     {
-        PDFWriter::WidgetType       m_eType;
-        rtl::OString                m_aName;
-        rtl::OUString               m_aDescription;
-        rtl::OUString               m_aText;
-        USHORT                      m_nTextStyle;
-        rtl::OUString               m_aValue;
+        PDFWriter::WidgetType		m_eType;
+        rtl::OString				m_aName;
+        rtl::OUString				m_aDescription;
+        rtl::OUString				m_aText;
+        USHORT						m_nTextStyle;
+        rtl::OUString				m_aValue;
         rtl::OString                m_aDAString;
         rtl::OString                m_aDRDict;
-        rtl::OString                m_aMKDict;
-        rtl::OString                m_aMKDictCAString;  // i12626, added to be able to encrypt the /CA text string
+        rtl::OString				m_aMKDict;
+        rtl::OString				m_aMKDictCAString;	// i12626, added to be able to encrypt the /CA text string
                                                         // since the object number is not known at the moment
                                                         // of filling m_aMKDict, the string will be encrypted when emitted.
                                                         // the /CA string MUST BE the last added to m_aMKDict
                                                         // see code for details
-        sal_Int32                   m_nFlags;
-        sal_Int32                   m_nParent; // if not 0, parent's object number
-        std::vector<sal_Int32>      m_aKids; // widget children, contains object numbers
+        sal_Int32					m_nFlags;
+        sal_Int32					m_nParent; // if not 0, parent's object number
+        std::vector<sal_Int32>		m_aKids; // widget children, contains object numbers
         std::vector<sal_Int32>      m_aKidsIndex; // widget children, contains index to m_aWidgets
         rtl::OUString               m_aOnValue;
         sal_Int32                   m_nTabOrder; // lowest number gets first in tab order
-        sal_Int32                   m_nRadioGroup;
-        sal_Int32                   m_nMaxLen;
+        sal_Int32					m_nRadioGroup;
+        sal_Int32					m_nMaxLen;
         bool                        m_bSubmit;
         bool                        m_bSubmitGet;
         sal_Int32                   m_nDest;
-        std::vector<rtl::OUString>  m_aListEntries;
+        std::vector<rtl::OUString>	m_aListEntries;
         std::vector<sal_Int32>      m_aSelectedEntries;
-        PDFAppearanceMap            m_aAppearances;
+        PDFAppearanceMap			m_aAppearances;
         PDFWidget()
                 : m_eType( PDFWriter::PushButton ),
                   m_nTextStyle( 0 ),
@@ -482,11 +482,11 @@ public:
                   m_nDest( -1 )
         {}
     };
-
+    
     struct PDFStructureAttribute
     {
-        PDFWriter::StructAttributeValue     eValue;
-        sal_Int32                           nValue;
+        PDFWriter::StructAttributeValue		eValue;
+        sal_Int32							nValue;
 
         PDFStructureAttribute()
                 : eValue( PDFWriter::Invalid ),
@@ -511,26 +511,26 @@ public:
         sal_Int32 nObject;  // an object number if nMCID is -1,
                             // else the page object relevant to MCID
         sal_Int32 nMCID;    // an MCID if >= 0
-
+        
         PDFStructureElementKid( sal_Int32 nObj ) : nObject( nObj ), nMCID( -1 ) {}
         PDFStructureElementKid( sal_Int32 MCID, sal_Int32 nPage ) : nObject( nPage ), nMCID( MCID ) {}
     };
-
+    
     struct PDFStructureElement
     {
-        sal_Int32                                           m_nObject;
-        PDFWriter::StructElement                            m_eType;
+        sal_Int32											m_nObject;
+        PDFWriter::StructElement							m_eType;
         rtl::OString                                        m_aAlias;
-        sal_Int32                                           m_nOwnElement; // index into structure vector
-        sal_Int32                                           m_nParentElement; // index into structure vector
-        sal_Int32                                           m_nFirstPageObject;
-        bool                                                m_bOpenMCSeq;
-        std::list< sal_Int32 >                              m_aChildren; // indexes into structure vector
+        sal_Int32											m_nOwnElement; // index into structure vector
+        sal_Int32											m_nParentElement; // index into structure vector
+        sal_Int32											m_nFirstPageObject;
+        bool												m_bOpenMCSeq;
+        std::list< sal_Int32 >								m_aChildren; // indexes into structure vector
         std::list< PDFStructureElementKid >                 m_aKids;
-        PDFStructAttributes                                 m_aAttributes;
-        Rectangle                                           m_aBBox;
-        rtl::OUString                                       m_aActualText;
-        rtl::OUString                                       m_aAltText;
+        PDFStructAttributes									m_aAttributes;
+        Rectangle											m_aBBox;
+        rtl::OUString										m_aActualText;
+        rtl::OUString										m_aAltText;
         com::sun::star::lang::Locale                        m_aLocale;
 
         // m_aContents contains the element's marked content sequence
@@ -547,18 +547,18 @@ public:
         }
 
     };
-
+    
     struct PDFAddStream
     {
         rtl::OUString           m_aMimeType;
         PDFOutputStream*        m_pStream;
         sal_Int32               m_nStreamObject;
         bool                    m_bCompress;
-
+        
         PDFAddStream() : m_pStream( NULL ), m_nStreamObject( 0 ), m_bCompress( true ) {}
     };
-
-
+    
+    
     // helper structure for drawLayout and friends
     struct PDFGlyph
     {
@@ -567,7 +567,7 @@ public:
         sal_Int32   m_nGlyphId;
         sal_Int32   m_nMappedFontId;
         sal_uInt8   m_nMappedGlyphId;
-
+        
         PDFGlyph( const Point& rPos,
                   sal_Int32 nNativeWidth,
                   sal_Int32 nGlyphId,
@@ -582,7 +582,7 @@ public:
     static const sal_Char* getStructureTag( PDFWriter::StructElement );
     static const sal_Char* getAttributeTag( PDFWriter::StructAttribute eAtr );
     static const sal_Char* getAttributeValueTag( PDFWriter::StructAttributeValue eVal );
-
+    
     // returns true if compression was done
     // else false
     static bool compressStream( SvMemoryStream* );
@@ -591,99 +591,99 @@ public:
 private:
     static const BuiltinFont m_aBuiltinFonts[14];
 
-    OutputDevice*                       m_pReferenceDevice;
+    OutputDevice*						m_pReferenceDevice;
 
-    MapMode                             m_aMapMode; // PDFWriterImpl scaled units
-    std::vector< PDFPage >              m_aPages;
-    PDFDocInfo                          m_aDocInfo;
+    MapMode								m_aMapMode; // PDFWriterImpl scaled units
+    std::vector< PDFPage >				m_aPages;
+    PDFDocInfo							m_aDocInfo;
     /* maps object numbers to file offsets (needed for xref) */
-    std::vector< sal_uInt64 >           m_aObjects;
+    std::vector< sal_uInt64 >			m_aObjects;
     /* contains Bitmaps until they are written to the
      *  file stream as XObjects*/
-    std::list< BitmapEmit >             m_aBitmaps;
+    std::list< BitmapEmit >				m_aBitmaps;
     /* contains JPG streams until written to file     */
-    std::list<JPGEmit>                  m_aJPGs;
+    std::list<JPGEmit>					m_aJPGs;
     /*--->i56629 contains all named destinations ever set during the PDF creation,
        destination id is always the destination's position in this vector
      */
-    std::vector<PDFNamedDest>           m_aNamedDests;
+    std::vector<PDFNamedDest>		    m_aNamedDests;
     //<---
     /* contains all dests ever set during the PDF creation,
        dest id is always the dest's position in this vector
      */
-    std::vector<PDFDest>                m_aDests;
+    std::vector<PDFDest>				m_aDests;
     /* contains all links ever set during PDF creation,
        link id is always the link's position in this vector
     */
-    std::vector<PDFLink>                m_aLinks;
+    std::vector<PDFLink>				m_aLinks;
     /* makes correctly encoded for export to PDF URLS
     */
     com::sun::star::uno::Reference< com::sun::star::util::XURLTransformer > m_xTrans;
     /* maps arbitrary link ids for structure attributes to real link ids
        (for setLinkPropertyId)
     */
-    std::map<sal_Int32, sal_Int32>      m_aLinkPropertyMap;
+    std::map<sal_Int32, sal_Int32>		m_aLinkPropertyMap;
     /* contains all outline items,
        object 0 is the outline root
      */
-    std::vector<PDFOutlineEntry>        m_aOutline;
+    std::vector<PDFOutlineEntry>		m_aOutline;
     /* contains all notes set during PDF creation
      */
-    std::vector<PDFNoteEntry>           m_aNotes;
+    std::vector<PDFNoteEntry>			m_aNotes;
     /* the root of the structure tree
      */
-    std::vector<PDFStructureElement>    m_aStructure;
+    std::vector<PDFStructureElement>	m_aStructure;
     /* current object in the structure hierarchy
      */
-    sal_Int32                           m_nCurrentStructElement;
+    sal_Int32							m_nCurrentStructElement;
     /* structure parent tree */
     std::vector< rtl::OString >         m_aStructParentTree;
     /* emit strucure marks currently (aka. NonStructElement or not)
      */
-    bool                                m_bEmitStructure;
-    bool                                m_bNewMCID;
+    bool								m_bEmitStructure;
+    bool								m_bNewMCID;
     /* role map of struct tree root */
     std::hash_map< rtl::OString, rtl::OString, rtl::OStringHash >
                                         m_aRoleMap;
 
     /* contains all widgets used in the PDF
      */
-    std::vector<PDFWidget>              m_aWidgets;
+    std::vector<PDFWidget>				m_aWidgets;
     /* maps radio group id to index of radio group control in m_aWidgets */
-    std::map< sal_Int32, sal_Int32 >    m_aRadioGroupWidgets;
+    std::map< sal_Int32, sal_Int32 >	m_aRadioGroupWidgets;
     /* used to store control id during beginControlAppearance/endControlAppearance */
-    sal_Int32                           m_nCurrentControl;
+    sal_Int32							m_nCurrentControl;
     /* hash_map for field names, used to ensure unique field names */
     std::hash_map< rtl::OString, sal_Int32, rtl::OStringHash > m_aFieldNameMap;
 
     /* contains Bitmaps for gradient functions until they are written
      *  to the file stream */
-    std::list< GradientEmit >           m_aGradients;
+    std::list< GradientEmit >			m_aGradients;
     /* contains bitmap tiling patterns */
-    std::vector< TilingEmit >           m_aTilings;
-    std::list< TransparencyEmit >       m_aTransparentObjects;
+    std::vector< TilingEmit >		    m_aTilings;
+    std::list< TransparencyEmit >		m_aTransparentObjects;
     /*  contains all font subsets in use */
-    FontSubsetData                      m_aSubsets;
+    FontSubsetData						m_aSubsets;
     bool                                m_bEmbedStandardFonts;
-    FontEmbedData                       m_aEmbeddedFonts;
+    FontEmbedData						m_aEmbeddedFonts;
     FontEmbedData                       m_aSystemFonts;
-    sal_Int32                           m_nNextFID;
+    sal_Int32							m_nNextFID;
     PDFFontCache                        m_aFontCache;
 
-    sal_Int32                           m_nInheritedPageWidth;  // in inch/72
-    sal_Int32                           m_nInheritedPageHeight; // in inch/72
-    PDFWriter::Orientation              m_eInheritedOrientation;
-    sal_Int32                           m_nCurrentPage;
+    sal_Int32							m_nInheritedPageWidth;  // in inch/72
+    sal_Int32							m_nInheritedPageHeight; // in inch/72
+    PDFWriter::Orientation				m_eInheritedOrientation;
+    sal_Int32							m_nCurrentPage;
 
-    sal_Int32                           m_nCatalogObject;
-    sal_Int32                           m_nResourceDict;
+    sal_Int32							m_nCatalogObject;
+    sal_Int32							m_nResourceDict;
     ResourceDict                        m_aGlobalResourceDict;
     sal_Int32                           m_nFontDictObject;
     std::map< sal_Int32, sal_Int32 >    m_aBuiltinFontToObjectMap;
 
-    PDFWriter::PDFWriterContext         m_aContext;
-    oslFileHandle                       m_aFile;
-    bool                                m_bOpen;
+    PDFWriter::PDFWriterContext			m_aContext;
+    oslFileHandle						m_aFile;
+    bool								m_bOpen;
 
 
     /* output redirection; e.g. to accumulate content streams for
@@ -691,31 +691,31 @@ private:
      */
     struct StreamRedirect
     {
-        SvStream*       m_pStream;
-        MapMode         m_aMapMode;
+        SvStream*		m_pStream;
+        MapMode   		m_aMapMode;
         Rectangle       m_aTargetRect;
         ResourceDict    m_aResourceDict;
     };
-    std::list< StreamRedirect >         m_aOutputStreams;
+    std::list< StreamRedirect >			m_aOutputStreams;
 
     // graphics state
     struct GraphicsState
     {
-        Font                             m_aFont;
-        MapMode                          m_aMapMode;
-        Color                            m_aLineColor;
-        Color                            m_aFillColor;
-        Color                            m_aTextLineColor;
-        Color                            m_aOverlineColor;
-        basegfx::B2DPolyPolygon          m_aClipRegion;
+        Font			                 m_aFont;
+        MapMode			                 m_aMapMode;
+        Color			                 m_aLineColor;
+        Color			                 m_aFillColor;
+        Color			                 m_aTextLineColor;
+        Color			                 m_aOverlineColor;
+        basegfx::B2DPolyPolygon			 m_aClipRegion;
         bool                             m_bClipRegion;
-        sal_Int32                        m_nAntiAlias;
-        sal_Int32                        m_nLayoutMode;
+        sal_Int32		                 m_nAntiAlias;
+        sal_Int32		                 m_nLayoutMode;
         LanguageType                     m_aDigitLanguage;
-        sal_Int32                        m_nTransparentPercent;
-        sal_uInt16                       m_nFlags;
+        sal_Int32		                 m_nTransparentPercent;
+        sal_uInt16		                 m_nFlags;
         sal_uInt16                       m_nUpdateFlags;
-
+        
         static const sal_uInt16 updateFont                  = 0x0001;
         static const sal_uInt16 updateMapMode               = 0x0002;
         static const sal_uInt16 updateLineColor             = 0x0004;
@@ -761,80 +761,80 @@ private:
 
         GraphicsState& operator=(const GraphicsState& rState )
         {
-            m_aFont                 = rState.m_aFont;
-            m_aMapMode              = rState.m_aMapMode;
-            m_aLineColor            = rState.m_aLineColor;
-            m_aFillColor            = rState.m_aFillColor;
-            m_aTextLineColor        = rState.m_aTextLineColor;
-            m_aOverlineColor        = rState.m_aOverlineColor;
-            m_aClipRegion           = rState.m_aClipRegion;
+            m_aFont					= rState.m_aFont;
+            m_aMapMode				= rState.m_aMapMode;
+            m_aLineColor			= rState.m_aLineColor;
+            m_aFillColor			= rState.m_aFillColor;
+            m_aTextLineColor		= rState.m_aTextLineColor;
+            m_aOverlineColor		= rState.m_aOverlineColor;
+            m_aClipRegion			= rState.m_aClipRegion;
             m_bClipRegion           = rState.m_bClipRegion;
-            m_nAntiAlias            = rState.m_nAntiAlias;
-            m_nLayoutMode           = rState.m_nLayoutMode;
+            m_nAntiAlias			= rState.m_nAntiAlias;
+            m_nLayoutMode			= rState.m_nLayoutMode;
             m_aDigitLanguage        = rState.m_aDigitLanguage;
-            m_nTransparentPercent   = rState.m_nTransparentPercent;
-            m_nFlags                = rState.m_nFlags;
+            m_nTransparentPercent	= rState.m_nTransparentPercent;
+            m_nFlags				= rState.m_nFlags;
             m_nUpdateFlags          = rState.m_nUpdateFlags;
             return *this;
         }
     };
-    std::list< GraphicsState >              m_aGraphicsStack;
-    GraphicsState                           m_aCurrentPDFState;
-
-    ZCodec*                                 m_pCodec;
-    SvMemoryStream*                         m_pMemStream;
+    std::list< GraphicsState >				m_aGraphicsStack;
+    GraphicsState							m_aCurrentPDFState;
 
+    ZCodec*									m_pCodec;
+    SvMemoryStream*							m_pMemStream;
+    
     std::vector< PDFAddStream >             m_aAdditionalStreams;
     std::set< PDFWriter::ErrorCode >        m_aErrors;
-
+    
     rtlDigest                               m_aDocDigest;
 
 /*
 variables for PDF security
-i12626
+i12626 
 */
 /* used to cipher the stream data and for password management */
-    rtlCipher                               m_aCipher;
-    rtlDigest                               m_aDigest;
+    rtlCipher								m_aCipher;
+    rtlDigest								m_aDigest;
 /* pad string used for password in Standard security handler */
-    sal_uInt8                               m_nPadString[ENCRYPTED_PWD_SIZE];
+    sal_uInt8								m_nPadString[ENCRYPTED_PWD_SIZE];
 /* the owner password, in clear text */
-    rtl::OUString                           m_aOwnerPassword;
+    rtl::OUString							m_aOwnerPassword;
 /* the padded owner password */
-    sal_uInt8                               m_nPaddedOwnerPassword[ENCRYPTED_PWD_SIZE];
+    sal_uInt8								m_nPaddedOwnerPassword[ENCRYPTED_PWD_SIZE];
 /* the encryption dictionary owner password, according to algorithm 3.3 */
-    sal_uInt8                               m_nEncryptedOwnerPassword[ENCRYPTED_PWD_SIZE];
+    sal_uInt8								m_nEncryptedOwnerPassword[ENCRYPTED_PWD_SIZE]; 
 /* the user password, in clear text */
-    rtl::OUString                           m_aUserPassword;
+    rtl::OUString							m_aUserPassword;
 /* the padded user password */
-    sal_uInt8                               m_nPaddedUserPassword[ENCRYPTED_PWD_SIZE];
+    sal_uInt8								m_nPaddedUserPassword[ENCRYPTED_PWD_SIZE];
 /* the encryption dictionary user password, according to algorithm 3.4 or 3.5 depending on the
    security handler revision */
-    sal_uInt8                               m_nEncryptedUserPassword[ENCRYPTED_PWD_SIZE];
+    sal_uInt8								m_nEncryptedUserPassword[ENCRYPTED_PWD_SIZE];
 
 /* the encryption key, formed with the user password according to algorithm 3.2, maximum length is 16 bytes + 3 + 2
    for 128 bit security   */
-    sal_uInt8                               m_nEncryptionKey[MAXIMUM_RC4_KEY_LENGTH];
-    sal_Int32                               m_nKeyLength; // key length, 16 or 5
-    sal_Int32                               m_nRC4KeyLength; // key length, 16 or 10, to be input to the algorith 3.1
+    sal_uInt8								m_nEncryptionKey[MAXIMUM_RC4_KEY_LENGTH];
+    sal_Int32								m_nKeyLength; // key length, 16 or 5
+    sal_Int32								m_nRC4KeyLength; // key length, 16 or 10, to be input to the algorith 3.1
 
 /* set to true if the following stream must be encrypted, used inside writeBuffer() */
-    sal_Bool                                m_bEncryptThisStream;
+    sal_Bool								m_bEncryptThisStream;
 
 /* the numerical value of the access permissions, according to PDF spec, must be signed */
     sal_Int32                               m_nAccessPermissions;
 /* the document ID, the raw MD5 hash */
-    sal_uInt8                               m_nDocID[MD5_DIGEST_SIZE];
+    sal_uInt8								m_nDocID[MD5_DIGEST_SIZE];
 /* string buffer to hold document ID, this is the output string */
-    rtl::OStringBuffer                      m_aDocID;
+    rtl::OStringBuffer						m_aDocID;
 /* string to hold the PDF creation date */
-    rtl::OStringBuffer                      m_aCreationDateString;
+    rtl::OStringBuffer						m_aCreationDateString;
 /* string to hold the PDF creation date, for PDF/A metadata */
-    rtl::OStringBuffer                      m_aCreationMetaDateString;
+    rtl::OStringBuffer						m_aCreationMetaDateString;
 /* the buffer where the data are encrypted, dynamically allocated */
-    sal_uInt8                               *m_pEncryptionBuffer;
+    sal_uInt8								*m_pEncryptionBuffer;
 /* size of the buffer */
-    sal_Int32                               m_nEncryptionBufferSize;
+    sal_Int32								m_nEncryptionBufferSize;
 
 /* check and reallocate the buffer for encryption */
     sal_Bool checkEncryptionBufferSize( register sal_Int32 newSize )
@@ -881,7 +881,7 @@ i12626
 // do the MD5 hash
                 sal_uInt8 nMD5Sum[ RTL_DIGEST_LENGTH_MD5 ];
                 // the i+2 to take into account the generation number, always zero
-                rtl_digest_MD5( &m_nEncryptionKey, i+2, nMD5Sum, sizeof(nMD5Sum) );
+                rtl_digest_MD5( &m_nEncryptionKey, i+2, nMD5Sum, sizeof(nMD5Sum) ); 
 // initialize the RC4 with the key
 // key legth: see algoritm 3.1, step 4: (N+5) max 16
                 rtl_cipher_initARCFOUR( m_aCipher, rtl_Cipher_DirectionEncode, nMD5Sum, m_nRC4KeyLength, NULL, 0 );
@@ -901,7 +901,7 @@ i12626
 // do the MD5 hash
             sal_uInt8 nMD5Sum[ RTL_DIGEST_LENGTH_MD5 ];
             // the i+2 to take into account the generation number, always zero
-            rtl_digest_MD5( &m_nEncryptionKey, i+2, nMD5Sum, sizeof(nMD5Sum) );
+            rtl_digest_MD5( &m_nEncryptionKey, i+2, nMD5Sum, sizeof(nMD5Sum) ); 
 // initialize the RC4 with the key
 // key legth: see algoritm 3.1, step 4: (N+5) max 16
             rtl_cipher_initARCFOUR( m_aCipher, rtl_Cipher_DirectionEncode, nMD5Sum, m_nRC4KeyLength, NULL, 0 );
@@ -1033,7 +1033,7 @@ i12626
     bool emitAdditionalStreams();
     // emits info dict (if applicable)
     sal_Int32 emitInfoDict( );
-
+    
     // acrobat reader 5 and 6 use the order of the annotations
     // as their tab order; since PDF1.5 one can make the
     // tab order explicit by using the structure tree
@@ -1048,10 +1048,10 @@ i12626
     Font replaceFont( const Font& rControlFont, const Font& rAppSetFont );
     sal_Int32 getBestBuiltinFont( const Font& rFont );
     sal_Int32 getSystemFont( const Font& i_rFont );
-
+    
     // used for edit and listbox
     Font drawFieldBorder( PDFWidget&, const PDFWriter::AnyWidget&, const StyleSettings& );
-
+    
     void createDefaultPushButtonAppearance( PDFWidget&, const PDFWriter::PushButtonWidget& rWidget );
     void createDefaultCheckBoxAppearance( PDFWidget&, const PDFWriter::CheckBoxWidget& rWidget );
     void createDefaultRadioButtonAppearance( PDFWidget&, const PDFWriter::RadioButtonWidget& rWidget );
@@ -1067,7 +1067,7 @@ i12626
     /* sets the offset of object n to the current position of output file+1
      */
     bool updateObject( sal_Int32 n );
-
+    
     bool writeBuffer( const void* pBuffer, sal_uInt64 nBytes );
     void beginCompression();
     void endCompression();
@@ -1113,9 +1113,9 @@ public:
     PDFWriterImpl( const PDFWriter::PDFWriterContext& rContext );
     ~PDFWriterImpl();
 
-    /*  for OutputDevice so the reference device can have a list
-     *  that contains only suitable fonts (subsettable or builtin)
-     *  produces a new font list
+    /*	for OutputDevice so the reference device can have a list
+     *	that contains only suitable fonts (subsettable or builtin)
+     *	produces a new font list
      */
     ImplDevFontList* filterDevFontList( ImplDevFontList* pFontList );
     /*  for OutputDevice: get layout for builtin fonts
@@ -1134,7 +1134,7 @@ public:
     bool emit();
     std::set< PDFWriter::ErrorCode > getErrors();
     void insertError( PDFWriter::ErrorCode eErr ) { m_aErrors.insert( eErr ); }
-
+    
     Size getCurPageSize() const
     {
         Size aSize;
@@ -1146,7 +1146,7 @@ public:
     PDFWriter::PDFVersion getVersion() const { return m_aContext.Version; }
     void setDocInfo( const PDFDocInfo& rInfo );
     const PDFDocInfo& getDocInfo() const { return m_aDocInfo; }
-
+    
     void setDocumentLocale( const com::sun::star::lang::Locale& rLoc )
     { m_aContext.DocumentLocale = rLoc; }
 
@@ -1172,19 +1172,19 @@ public:
     void setFillColor( const Color& rColor )
     {
         m_aGraphicsStack.front().m_aFillColor = ImplIsColorTransparent(rColor) ? Color( COL_TRANSPARENT ) : rColor;
-        m_aGraphicsStack.front().m_nUpdateFlags |= GraphicsState::updateFillColor;
+        m_aGraphicsStack.front().m_nUpdateFlags |= GraphicsState::updateFillColor;        
     }
 
     void setTextLineColor()
     {
         m_aGraphicsStack.front().m_aTextLineColor = Color( COL_TRANSPARENT );
-        m_aGraphicsStack.front().m_nUpdateFlags |= GraphicsState::updateTextLineColor;
+        m_aGraphicsStack.front().m_nUpdateFlags |= GraphicsState::updateTextLineColor;        
     }
 
     void setTextLineColor( const Color& rColor )
     {
         m_aGraphicsStack.front().m_aTextLineColor = rColor;
-        m_aGraphicsStack.front().m_nUpdateFlags |= GraphicsState::updateTextLineColor;
+        m_aGraphicsStack.front().m_nUpdateFlags |= GraphicsState::updateTextLineColor;        
     }
 
     void setOverlineColor()
@@ -1237,7 +1237,7 @@ public:
         m_aGraphicsStack.front().m_nLayoutMode = nLayoutMode;
         m_aGraphicsStack.front().m_nUpdateFlags |= GraphicsState::updateLayoutMode;
     }
-
+    
     void setDigitLanguage( LanguageType eLang )
     {
         m_aGraphicsStack.front().m_aDigitLanguage = eLang;
@@ -1349,7 +1349,7 @@ public:
     sal_Int32 createControl( const PDFWriter::AnyWidget& rControl, sal_Int32 nPageNr = -1 );
     void beginControlAppearance( sal_Int32 nControl );
     bool endControlAppearance( PDFWriter::WidgetState eState );
-
+    
     // additional streams
     void addStream( const String& rMimeType, PDFOutputStream* pStream, bool bCompress );
 
diff --git a/vcl/source/gdi/pngread.cxx b/vcl/source/gdi/pngread.cxx
index 11971db34378..c7c50acabc29 100644
--- a/vcl/source/gdi/pngread.cxx
+++ b/vcl/source/gdi/pngread.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
@@ -45,24 +45,24 @@
 // - Defines -
 // -----------
 
-#define PNGCHUNK_IHDR       0x49484452
-#define PNGCHUNK_PLTE       0x504c5445
-#define PNGCHUNK_IDAT       0x49444154
-#define PNGCHUNK_IEND       0x49454e44
-#define PNGCHUNK_bKGD       0x624b4744
-#define PNGCHUNK_cHRM       0x6348524d
-#define PNGCHUNK_gAMA       0x67414d41
-#define PNGCHUNK_hIST       0x68495354
-#define PNGCHUNK_pHYs       0x70485973
-#define PNGCHUNK_sBIT       0x73425420
-#define PNGCHUNK_tIME       0x74494d45
-#define PNGCHUNK_tEXt       0x74455874
-#define PNGCHUNK_tRNS       0x74524e53
-#define PNGCHUNK_zTXt       0x7a545874
-#define PMGCHUNG_msOG       0x6d734f47      // Microsoft Office Animated GIF
-
-#define VIEWING_GAMMA       2.35
-#define DISPLAY_GAMMA       1.0
+#define PNGCHUNK_IHDR 		0x49484452
+#define PNGCHUNK_PLTE 		0x504c5445
+#define PNGCHUNK_IDAT 		0x49444154
+#define PNGCHUNK_IEND 		0x49454e44
+#define PNGCHUNK_bKGD 		0x624b4744
+#define PNGCHUNK_cHRM		0x6348524d
+#define PNGCHUNK_gAMA 		0x67414d41
+#define PNGCHUNK_hIST 		0x68495354
+#define PNGCHUNK_pHYs 		0x70485973
+#define PNGCHUNK_sBIT 		0x73425420
+#define PNGCHUNK_tIME		0x74494d45
+#define PNGCHUNK_tEXt		0x74455874
+#define PNGCHUNK_tRNS 		0x74524e53
+#define PNGCHUNK_zTXt 		0x7a545874
+#define PMGCHUNG_msOG		0x6d734f47		// Microsoft Office Animated GIF
+
+#define VIEWING_GAMMA		2.35
+#define DISPLAY_GAMMA		1.0
 
 namespace vcl
 {
@@ -73,7 +73,7 @@ namespace vcl
 // ------------------------------------------------------------------------------
 
 static const BYTE mpDefaultColorTable[ 256 ] =
-{   0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f,
+{	0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f,
     0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17, 0x18, 0x19, 0x1a, 0x1b, 0x1c, 0x1d, 0x1e, 0x1f,
     0x20, 0x21, 0x22, 0x23, 0x24, 0x25, 0x26, 0x27, 0x28, 0x29, 0x2a, 0x2b, 0x2c, 0x2d, 0x2e, 0x2f,
     0x30, 0x31, 0x32, 0x33, 0x34, 0x35, 0x36, 0x37, 0x38, 0x39, 0x3a, 0x3b, 0x3c, 0x3d, 0x3e, 0x3f,
@@ -105,17 +105,17 @@ private:
     std::vector< vcl::PNGReader::ChunkData >::iterator maChunkIter;
     std::vector< sal_uInt8 >::iterator          maDataIter;
 
-    Bitmap*             mpBmp;
-    BitmapWriteAccess*  mpAcc;
-    Bitmap*             mpMaskBmp;
-    AlphaMask*          mpAlphaMask;
-    BitmapWriteAccess*  mpMaskAcc;
-    ZCodec*             mpZCodec;
-    BYTE*               mpInflateInBuf; // as big as the size of a scanline + alphachannel + 1
-    BYTE*               mpScanPrior;    // pointer to the latest scanline
-    BYTE*               mpTransTab;     // for transparency in images with palette colortype
-    BYTE*               mpScanCurrent;  // pointer into the current scanline
-    BYTE*               mpColorTable;   //
+    Bitmap*				mpBmp;
+    BitmapWriteAccess*	mpAcc;
+    Bitmap*				mpMaskBmp;
+    AlphaMask*			mpAlphaMask;
+    BitmapWriteAccess*	mpMaskAcc;
+    ZCodec* 			mpZCodec;
+    BYTE*				mpInflateInBuf; // as big as the size of a scanline + alphachannel + 1
+    BYTE*				mpScanPrior;    // pointer to the latest scanline
+    BYTE*				mpTransTab;		// for transparency in images with palette colortype
+    BYTE*				mpScanCurrent;  // pointer into the current scanline
+    BYTE*				mpColorTable;	//
     sal_Size            mnStreamSize;   // estimate of PNG file size
     sal_uInt32          mnChunkType;    // Type of current PNG chunk
     sal_Int32           mnChunkLen;     // Length of current PNG chunk
@@ -131,29 +131,29 @@ private:
     sal_uInt32          mnYAdd;         // the increment for input images Y coords for the current pass
     int                 mnPreviewShift; // shift to convert orig image coords into preview image coords
     int                 mnPreviewMask;  // == ((1 << mnPreviewShift) - 1)
-    USHORT              mnIStmOldMode;
-    USHORT              mnTargetDepth;      // pixel depth of target bitmap
-    BYTE                mnTransRed;
-    BYTE                mnTransGreen;
-    BYTE                mnTransBlue;
-    BYTE                mnPngDepth;     // pixel depth of PNG data
-    BYTE                mnColorType;
-    BYTE                mnCompressionType;
-    BYTE                mnFilterType;
-    BYTE                mnInterlaceType;
-    BitmapColor         mcTranspColor;  // transparency mask's transparency "color"
-    BitmapColor         mcOpaqueColor;  // transparency mask's opaque "color"
-    BOOL                mbTransparent;  // graphic includes an tRNS Chunk or an alpha Channel
-    BOOL                mbAlphaChannel; // is true for ColorType 4 and 6
-    BOOL                mbRGBTriple;
-    BOOL                mbPalette;      // FALSE if we need a Palette
-    BOOL                mbGrayScale;
-    BOOL                mbzCodecInUse;
-    BOOL                mbStatus;
-    BOOL                mbIDAT;         // TRUE if finished with enough IDAT chunks
-    BOOL                mbGamma;        // TRUE if Gamma Correction available
-    BOOL                mbpHYs;         // TRUE if pysical size of pixel available
-    sal_Bool            mbIgnoreGammaChunk;
+    USHORT				mnIStmOldMode;
+    USHORT				mnTargetDepth;		// pixel depth of target bitmap
+    BYTE				mnTransRed;
+    BYTE				mnTransGreen;
+    BYTE				mnTransBlue;
+    BYTE				mnPngDepth;		// pixel depth of PNG data
+    BYTE				mnColorType;
+    BYTE				mnCompressionType;
+    BYTE				mnFilterType;
+    BYTE				mnInterlaceType;
+    BitmapColor			mcTranspColor;  // transparency mask's transparency "color"
+    BitmapColor			mcOpaqueColor;  // transparency mask's opaque "color"
+    BOOL				mbTransparent;	// graphic includes an tRNS Chunk or an alpha Channel
+    BOOL				mbAlphaChannel;	// is true for ColorType 4 and 6
+    BOOL				mbRGBTriple;
+    BOOL				mbPalette;		// FALSE if we need a Palette
+    BOOL				mbGrayScale;
+    BOOL				mbzCodecInUse;
+    BOOL				mbStatus;
+    BOOL				mbIDAT;			// TRUE if finished with enough IDAT chunks
+    BOOL				mbGamma;		// TRUE if Gamma Correction available
+    BOOL				mbpHYs;			// TRUE if pysical size of pixel available
+    sal_Bool			mbIgnoreGammaChunk;
 
     bool                ReadNextChunk();
     void                ReadRemainingChunks();
@@ -163,19 +163,19 @@ private:
     void                ImplSetPixel( sal_uInt32 y, sal_uInt32 x, BYTE nPalIndex );
     void                ImplSetTranspPixel( sal_uInt32 y, sal_uInt32 x, const BitmapColor &, BOOL bTrans );
     void                ImplSetAlphaPixel( sal_uInt32 y, sal_uInt32 x, BYTE nPalIndex, BYTE nAlpha );
-    void                ImplSetAlphaPixel( sal_uInt32 y, sal_uInt32 x, const BitmapColor&, BYTE nAlpha );
-    void                ImplReadIDAT();
+    void				ImplSetAlphaPixel( sal_uInt32 y, sal_uInt32 x, const BitmapColor&, BYTE nAlpha );
+    void				ImplReadIDAT();
     bool                ImplPreparePass();
     void                ImplApplyFilter();
     void                ImplDrawScanline( sal_uInt32 nXStart, sal_uInt32 nXAdd );
-    BOOL                ImplReadTransparent();
-    void                ImplGetGamma();
-    void                ImplGetBackground();
-    BYTE                ImplScaleColor();
-    BOOL                ImplReadHeader( const Size& rPreviewSizeHint );
-    BOOL                ImplReadPalette();
-    void                ImplGetGrayPalette( sal_uInt16 );
-    sal_uInt32          ImplReadsal_uInt32();
+    BOOL				ImplReadTransparent();
+    void				ImplGetGamma();
+    void				ImplGetBackground();
+    BYTE				ImplScaleColor();
+    BOOL				ImplReadHeader( const Size& rPreviewSizeHint );
+    BOOL				ImplReadPalette();
+    void				ImplGetGrayPalette( sal_uInt16 );
+    sal_uInt32			ImplReadsal_uInt32();
 
 public:
 
@@ -184,29 +184,29 @@ public:
 
     BitmapEx            GetBitmapEx( const Size& rPreviewSizeHint );
     const std::vector< PNGReader::ChunkData >& GetAllChunks();
-    void                SetIgnoreGammaChunk( sal_Bool bIgnore ){ mbIgnoreGammaChunk = bIgnore; };
+    void				SetIgnoreGammaChunk( sal_Bool bIgnore ){ mbIgnoreGammaChunk = bIgnore; };
 };
 
 // ------------------------------------------------------------------------------
 
 PNGReaderImpl::PNGReaderImpl( SvStream& rPNGStream )
 :   mrPNGStream( rPNGStream ),
-    mpBmp           ( NULL ),
-    mpAcc           ( NULL ),
-    mpMaskBmp       ( NULL ),
-    mpAlphaMask     ( NULL ),
-    mpMaskAcc       ( NULL ),
-    mpZCodec        ( new ZCodec( DEFAULT_IN_BUFSIZE, DEFAULT_OUT_BUFSIZE, MAX_MEM_USAGE ) ),
-    mpInflateInBuf  ( NULL ),
-    mpScanPrior     ( NULL ),
-    mpTransTab      ( NULL ),
-    mpColorTable    ( (sal_uInt8*) mpDefaultColorTable ),
-    mbzCodecInUse   ( sal_False ),
+    mpBmp			( NULL ),
+    mpAcc			( NULL ),
+    mpMaskBmp		( NULL ),
+    mpAlphaMask		( NULL ),
+    mpMaskAcc		( NULL ),
+    mpZCodec		( new ZCodec( DEFAULT_IN_BUFSIZE, DEFAULT_OUT_BUFSIZE, MAX_MEM_USAGE ) ),
+    mpInflateInBuf	( NULL ),
+    mpScanPrior 	( NULL ),
+    mpTransTab		( NULL ),
+    mpColorTable	( (sal_uInt8*) mpDefaultColorTable ),
+    mbzCodecInUse	( sal_False ),
     mbStatus( TRUE),
     mbIDAT( FALSE ),
-    mbGamma             ( sal_False ),
-    mbpHYs              ( sal_False ),
-    mbIgnoreGammaChunk  ( sal_False )
+    mbGamma				( sal_False ),
+    mbpHYs				( sal_False ),
+    mbIgnoreGammaChunk	( sal_False )
 {
     // prepare the PNG data stream
     mnOrigStreamMode = mrPNGStream.GetNumberFormatInt();
@@ -216,7 +216,7 @@ PNGReaderImpl::PNGReaderImpl( SvStream& rPNGStream )
     maChunkSeq.reserve( 16 );
     maChunkIter = maChunkSeq.begin();
 
-    // estimate PNG file size (to allow sanity checks)
+    // estimate PNG file size (to allow sanity checks) 
     const sal_Size nStreamPos = mrPNGStream.Tell();
     mrPNGStream.Seek( STREAM_SEEK_TO_END );
     mnStreamSize = mrPNGStream.Tell();
@@ -381,8 +381,8 @@ BitmapEx PNGReaderImpl::GetBitmapEx( const Size& rPreviewSizeHint )
             }
             break;
 
-            case PNGCHUNK_gAMA :                                // the gamma chunk must precede
-            {                                                   // the 'IDAT' and also the 'PLTE'(if available )
+            case PNGCHUNK_gAMA :								// the gamma chunk must precede
+            {													// the 'IDAT' and also the 'PLTE'(if available )
                 if ( !mbIgnoreGammaChunk && ( mbIDAT == FALSE ) )
                     ImplGetGamma();
             }
@@ -397,21 +397,21 @@ BitmapEx PNGReaderImpl::GetBitmapEx( const Size& rPreviewSizeHint )
 
             case PNGCHUNK_tRNS :
             {
-                if ( !mbIDAT )                                  // the tRNS chunk must precede the IDAT
+                if ( !mbIDAT )									// the tRNS chunk must precede the IDAT
                     mbStatus = ImplReadTransparent();
             }
             break;
 
-            case PNGCHUNK_bKGD :                                // the background chunk must appear
+            case PNGCHUNK_bKGD :								// the background chunk must appear
             {
-                if ( ( mbIDAT == FALSE ) && mbPalette )         // before the 'IDAT' and after the
-                    ImplGetBackground();                        // PLTE(if available ) chunk.
+                if ( ( mbIDAT == FALSE ) && mbPalette ) 		// before the 'IDAT' and after the
+                    ImplGetBackground();						// PLTE(if available ) chunk.
             }
             break;
 
             case PNGCHUNK_IDAT :
             {
-                if ( !mbIDAT )      // the gfx is finished, but there may be left a zlibCRC of about 4Bytes
+                if ( !mbIDAT )		// the gfx is finished, but there may be left a zlibCRC of about 4Bytes
                     ImplReadIDAT();
             }
             break;
@@ -532,16 +532,16 @@ BOOL PNGReaderImpl::ImplReadHeader( const Size& rPreviewSizeHint )
     // valid color types are 0,2,3,4 & 6
     switch ( mnColorType )
     {
-        case 0 :    // each pixel is a grayscale
+        case 0 :	// each pixel is a grayscale
         {
             switch ( mnPngDepth )
             {
                 case 2 : // 2bit target not available -> use four bits
-                    mnTargetDepth = 4;  // we have to expand the bitmap
+                    mnTargetDepth = 4;	// we have to expand the bitmap
                     mbGrayScale = TRUE;
                     break;
                 case 16 :
-                    mnTargetDepth = 8;  // we have to reduce the bitmap
+                    mnTargetDepth = 8;	// we have to reduce the bitmap
                     // fall through
                 case 1 :
                 case 4 :
@@ -554,13 +554,13 @@ BOOL PNGReaderImpl::ImplReadHeader( const Size& rPreviewSizeHint )
         }
         break;
 
-        case 2 :    // each pixel is an RGB triple
+        case 2 :	// each pixel is an RGB triple
         {
             mbRGBTriple = TRUE;
             mnScansize *= 3;
             switch ( mnPngDepth )
             {
-                case 16 :           // we have to reduce the bitmap
+                case 16 :			// we have to reduce the bitmap
                 case 8 :
                     mnTargetDepth = 24;
                     break;
@@ -570,12 +570,12 @@ BOOL PNGReaderImpl::ImplReadHeader( const Size& rPreviewSizeHint )
         }
         break;
 
-        case 3 :    // each pixel is a palette index
+        case 3 :	// each pixel is a palette index
         {
             switch ( mnPngDepth )
             {
                 case 2 :
-                    mnTargetDepth = 4;  // we have to expand the bitmap
+                    mnTargetDepth = 4;	// we have to expand the bitmap
                     // fall through
                 case 1 :
                 case 4 :
@@ -588,14 +588,14 @@ BOOL PNGReaderImpl::ImplReadHeader( const Size& rPreviewSizeHint )
         }
         break;
 
-        case 4 :    // each pixel is a grayscale sample followed by an alpha sample
+        case 4 :	// each pixel is a grayscale sample followed by an alpha sample
         {
             mnScansize *= 2;
             mbAlphaChannel = TRUE;
             switch ( mnPngDepth )
             {
                 case 16 :
-                    mnTargetDepth = 8;  // we have to reduce the bitmap
+                    mnTargetDepth = 8;	// we have to reduce the bitmap
                 case 8 :
                     mbGrayScale = TRUE;
                     break;
@@ -605,14 +605,14 @@ BOOL PNGReaderImpl::ImplReadHeader( const Size& rPreviewSizeHint )
         }
         break;
 
-        case 6 :    // each pixel is an RGB triple followed by an alpha sample
+        case 6 :	// each pixel is an RGB triple followed by an alpha sample
         {
             mbRGBTriple = TRUE;
             mnScansize *= 4;
             mbAlphaChannel = TRUE;
             switch (mnPngDepth )
             {
-                case 16 :           // we have to reduce the bitmap
+                case 16 :			// we have to reduce the bitmap
                 case 8 :
                     mnTargetDepth = 24;
                     break;
@@ -826,17 +826,17 @@ void PNGReaderImpl::ImplGetGamma()
     if( mnChunkLen < 4 )
         return;
 
-    sal_uInt32  nGammaValue = ImplReadsal_uInt32();
-    double      fGamma = ( ( VIEWING_GAMMA / DISPLAY_GAMMA ) * ( (double)nGammaValue / 100000 ) );
-    double      fInvGamma = ( fGamma <= 0.0 || fGamma > 10.0 ) ? 1.0 : ( 1.0 / fGamma );
+    sal_uInt32	nGammaValue = ImplReadsal_uInt32();
+    double		fGamma = ( ( VIEWING_GAMMA / DISPLAY_GAMMA ) * ( (double)nGammaValue / 100000 ) );
+    double 		fInvGamma = ( fGamma <= 0.0 || fGamma > 10.0 ) ? 1.0 : ( 1.0 / fGamma );
 
     if ( fInvGamma != 1.0 )
     {
         mbGamma = TRUE;
-
+        
         if ( mpColorTable == mpDefaultColorTable )
             mpColorTable = new sal_uInt8[ 256 ];
-
+        
         for ( sal_Int32 i = 0; i < 256; i++ )
             mpColorTable[ i ] = (sal_uInt8)(pow((double)i/255.0, fInvGamma) * 255.0 + 0.5);
 
@@ -877,7 +877,7 @@ void PNGReaderImpl::ImplGetBackground()
             }
         }
         break;
-
+    
         case 2 :
         case 6 :
         {
@@ -901,12 +901,12 @@ sal_uInt8 PNGReaderImpl::ImplScaleColor()
 {
     sal_uInt32 nMask = ( ( 1 << mnPngDepth ) - 1 );
     sal_uInt16 nCol = ( *maDataIter++ << 8 );
-
+    
     nCol += *maDataIter++ & (sal_uInt16)nMask;
-
-    if ( mnPngDepth > 8 )   // convert 16bit graphics to 8
+    
+    if ( mnPngDepth > 8 )	// convert 16bit graphics to 8
         nCol >>= 8;
-
+    
     return (sal_uInt8) nCol;
 }
 
@@ -1199,7 +1199,7 @@ void PNGReaderImpl::ImplDrawScanline( sal_uInt32 nXStart, sal_uInt32 nXAdd )
             {
                 if ( mbTransparent )
                 {
-                    if ( mnPngDepth == 4 )  // check if source has a two bit pixel format
+                    if ( mnPngDepth == 4 )	// check if source has a two bit pixel format
                     {
                         for ( sal_Int32 nX = nXStart, nXIndex = 0; nX < maOrigSize.Width(); nX += nXAdd, ++nXIndex )
                         {
@@ -1248,7 +1248,7 @@ void PNGReaderImpl::ImplDrawScanline( sal_uInt32 nXStart, sal_uInt32 nXAdd )
                 }
                 else
                 {
-                    if ( mnPngDepth == 4 )  // maybe the source is a two bitmap graphic
+                    if ( mnPngDepth == 4 )	// maybe the source is a two bitmap graphic
                     {   // BMP_FORMAT_4BIT_LSN_PAL
                         for ( sal_Int32 nX = nXStart, nXIndex = 0; nX < maOrigSize.Width(); nX += nXAdd, nXIndex++ )
                         {
@@ -1290,7 +1290,7 @@ void PNGReaderImpl::ImplDrawScanline( sal_uInt32 nXStart, sal_uInt32 nXAdd )
             {
                 if ( mbAlphaChannel )
                 {
-                    if ( mnPngDepth == 8 )  // maybe the source is a 16 bit grayscale
+                    if ( mnPngDepth == 8 )	// maybe the source is a 16 bit grayscale
                     {
                         for ( sal_Int32 nX = nXStart; nX < maOrigSize.Width(); nX += nXAdd, pTmp += 2 )
                             ImplSetAlphaPixel( nY, nX, pTmp[ 0 ], pTmp[ 1 ] );
@@ -1303,7 +1303,7 @@ void PNGReaderImpl::ImplDrawScanline( sal_uInt32 nXStart, sal_uInt32 nXAdd )
                 }
                 else if ( mbTransparent )
                 {
-                    if ( mnPngDepth == 8 )  // maybe the source is a 16 bit grayscale
+                    if ( mnPngDepth == 8 )	// maybe the source is a 16 bit grayscale
                     {
                         for ( sal_Int32 nX = nXStart; nX < maOrigSize.Width(); nX += nXAdd, pTmp++ )
                             ImplSetAlphaPixel( nY, nX, *pTmp, mpTransTab[ *pTmp ] );
@@ -1316,7 +1316,7 @@ void PNGReaderImpl::ImplDrawScanline( sal_uInt32 nXStart, sal_uInt32 nXAdd )
                 }
                 else // neither alpha nor transparency
                 {
-                    if ( mnPngDepth == 8 )  // maybe the source is a 16 bit grayscale
+                    if ( mnPngDepth == 8 )	// maybe the source is a 16 bit grayscale
                     {
                         if( nXAdd == 1 && mnPreviewShift == 0 )  // copy raw line data if possible
                         {
diff --git a/vcl/source/gdi/pngwrite.cxx b/vcl/source/gdi/pngwrite.cxx
index 47152ea6ac11..8023e6423c87 100644
--- a/vcl/source/gdi/pngwrite.cxx
+++ b/vcl/source/gdi/pngwrite.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
@@ -77,68 +77,68 @@ public:
                     const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >* pFilterData = NULL );
                 ~PNGWriterImpl();
 
-    sal_Bool    Write( SvStream& rOStm );
+    sal_Bool	Write( SvStream& rOStm );
 
-    std::vector< vcl::PNGWriter::ChunkData >&   GetChunks();
+    std::vector< vcl::PNGWriter::ChunkData >&	GetChunks();
 
 private:
 
-    std::vector< vcl::PNGWriter::ChunkData >    maChunkSeq;
-
-    sal_Int32           mnCompLevel;
-    sal_Int32           mnInterlaced;
-    sal_uInt32          mnMaxChunkSize;
-    BOOL                mbStatus;
-
-    BitmapReadAccess*   mpAccess;
-    BitmapReadAccess*   mpMaskAccess;
-    ZCodec*             mpZCodec;
-
-    BYTE*               mpDeflateInBuf;         // as big as the size of a scanline + alphachannel + 1
-    BYTE*               mpPreviousScan;         // as big as mpDeflateInBuf
-    BYTE*               mpCurrentScan;
-    ULONG               mnDeflateInSize;
-
-    ULONG               mnWidth, mnHeight;
-    BYTE                mnBitsPerPixel;
-    BYTE                mnFilterType;           // 0 oder 4;
-    ULONG               mnBBP;                  // bytes per pixel ( needed for filtering )
-    BOOL                mbTrueAlpha;
-    ULONG               mnCRC;
-    long                mnChunkDatSize;
-    ULONG               mnLastPercent;
-
-    void                ImplWritepHYs( const BitmapEx& rBitmapEx );
-    void                ImplWriteIDAT();
-    ULONG               ImplGetFilter( ULONG nY, ULONG nXStart=0, ULONG nXAdd=1 );
-    void                ImplClearFirstScanline();
-    void                ImplWriteTransparent();
-    BOOL                ImplWriteHeader();
-    void                ImplWritePalette();
-    void                ImplOpenChunk( ULONG nChunkType );
-    void                ImplWriteChunk( BYTE nNumb );
-    void                ImplWriteChunk( sal_uInt32 nNumb );
-    void                ImplWriteChunk( unsigned char* pSource, sal_uInt32 nDatSize );
-    void                ImplCloseChunk( void );
+    std::vector< vcl::PNGWriter::ChunkData >	maChunkSeq;
+
+    sal_Int32			mnCompLevel;
+    sal_Int32			mnInterlaced;
+    sal_uInt32			mnMaxChunkSize;
+    BOOL				mbStatus;
+
+    BitmapReadAccess*	mpAccess;
+    BitmapReadAccess*	mpMaskAccess;
+    ZCodec*				mpZCodec;
+
+    BYTE*				mpDeflateInBuf;			// as big as the size of a scanline + alphachannel + 1
+    BYTE*				mpPreviousScan;			// as big as mpDeflateInBuf
+    BYTE*				mpCurrentScan;
+    ULONG				mnDeflateInSize;
+
+    ULONG				mnWidth, mnHeight;
+    BYTE				mnBitsPerPixel;
+    BYTE				mnFilterType;			// 0 oder 4;
+    ULONG				mnBBP;					// bytes per pixel ( needed for filtering )
+    BOOL				mbTrueAlpha;
+    ULONG				mnCRC;
+    long				mnChunkDatSize;
+    ULONG				mnLastPercent;
+
+    void				ImplWritepHYs( const BitmapEx& rBitmapEx );
+    void				ImplWriteIDAT();
+    ULONG				ImplGetFilter( ULONG nY, ULONG nXStart=0, ULONG nXAdd=1 );
+    void				ImplClearFirstScanline();
+    void				ImplWriteTransparent();
+    BOOL				ImplWriteHeader();
+    void				ImplWritePalette();
+    void				ImplOpenChunk( ULONG nChunkType );
+    void				ImplWriteChunk( BYTE nNumb );
+    void				ImplWriteChunk( sal_uInt32 nNumb );
+    void				ImplWriteChunk( unsigned char* pSource, sal_uInt32 nDatSize );
+    void				ImplCloseChunk( void );
 };
 
 // ------------------------------------------------------------------------
 
 PNGWriterImpl::PNGWriterImpl( const BitmapEx& rBmpEx,
     const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >* pFilterData ) :
-        mnCompLevel     ( PNG_DEF_COMPRESSION ),
-        mbStatus        ( TRUE ),
-        mpAccess        ( NULL ),
-        mpMaskAccess    ( NULL ),
-        mpZCodec        ( new ZCodec( DEFAULT_IN_BUFSIZE, DEFAULT_OUT_BUFSIZE, MAX_MEM_USAGE ) ),
+        mnCompLevel		( PNG_DEF_COMPRESSION ),
+        mbStatus		( TRUE ),
+        mpAccess		( NULL ),
+        mpMaskAccess	( NULL ),
+        mpZCodec		( new ZCodec( DEFAULT_IN_BUFSIZE, DEFAULT_OUT_BUFSIZE, MAX_MEM_USAGE ) ),
         mnCRC(0UL),
-        mnLastPercent   ( 0UL )
+        mnLastPercent	( 0UL )
 {
     if ( !rBmpEx.IsEmpty() )
     {
         Bitmap aBmp( rBmpEx.GetBitmap() );
-
-        mnInterlaced = 0;   // ( aBmp.GetSizePixel().Width() > 128 ) || ( aBmp.GetSizePixel().Height() > 128 ) ? 1 : 0; #i67236#
+        
+        mnInterlaced = 0;	// ( aBmp.GetSizePixel().Width() > 128 ) || ( aBmp.GetSizePixel().Height() > 128 ) ? 1 : 0; #i67236#
 
         // #i67234# defaulting max chunk size to 256kb when using interlace mode
         mnMaxChunkSize = mnInterlaced == 0 ? std::numeric_limits< sal_uInt32 >::max() : 0x40000;
@@ -161,7 +161,7 @@ PNGWriterImpl::PNGWriterImpl( const BitmapEx& rBmpEx,
             }
         }
         mnBitsPerPixel = (BYTE)aBmp.GetBitCount();
-
+        
         if( rBmpEx.IsTransparent() )
         {
             if ( mnBitsPerPixel <= 8 && rBmpEx.IsAlpha() )
@@ -169,8 +169,8 @@ PNGWriterImpl::PNGWriterImpl( const BitmapEx& rBmpEx,
                 aBmp.Convert( BMP_CONVERSION_24BIT );
                 mnBitsPerPixel = 24;
             }
-
-            if ( mnBitsPerPixel <= 8 )                  // transparent palette
+            
+            if ( mnBitsPerPixel <= 8 )					// transparent palette
             {
                 aBmp.Convert( BMP_CONVERSION_8BIT_TRANS );
                 aBmp.Replace( rBmpEx.GetMask(), BMP_COL_TRANS );
@@ -192,7 +192,7 @@ PNGWriterImpl::PNGWriterImpl( const BitmapEx& rBmpEx,
             }
             else
             {
-                mpAccess = aBmp.AcquireReadAccess();    // TRUE RGB with alphachannel
+                mpAccess = aBmp.AcquireReadAccess();	// TRUE RGB with alphachannel
                 if( mpAccess )
                 {
                     if ( ( mbTrueAlpha = rBmpEx.IsAlpha() ) != FALSE )
@@ -235,7 +235,7 @@ PNGWriterImpl::PNGWriterImpl( const BitmapEx& rBmpEx,
         }
         else
         {
-            mpAccess = aBmp.AcquireReadAccess();        // palette + RGB without alphachannel
+            mpAccess = aBmp.AcquireReadAccess();		// palette + RGB without alphachannel
             if( mpAccess )
             {
                 if ( ImplWriteHeader() )
@@ -253,7 +253,7 @@ PNGWriterImpl::PNGWriterImpl( const BitmapEx& rBmpEx,
         }
         if ( mbStatus )
         {
-            ImplOpenChunk( PNGCHUNK_IEND );     // create an IEND chunk
+            ImplOpenChunk( PNGCHUNK_IEND );		// create an IEND chunk
             ImplCloseChunk();
         }
     }
@@ -322,10 +322,10 @@ BOOL PNGWriterImpl::ImplWriteHeader()
         else
             mnFilterType = 4;
 
-        BYTE nColorType = 2;                    // colortype:
+        BYTE nColorType = 2;					// colortype:
                                                 // bit 0 -> palette is used
-        if ( mpAccess->HasPalette() )           // bit 1 -> color is used
-            nColorType |= 1;                    // bit 2 -> alpha channel is used
+        if ( mpAccess->HasPalette() )			// bit 1 -> color is used
+            nColorType |= 1;					// bit 2 -> alpha channel is used
         else
             nBitDepth /= 3;
 
@@ -333,10 +333,10 @@ BOOL PNGWriterImpl::ImplWriteHeader()
             nColorType |= 4;
 
         ImplWriteChunk( nBitDepth );
-        ImplWriteChunk( nColorType );           // colortype
-        ImplWriteChunk((BYTE) 0 );              // compression type
-        ImplWriteChunk((BYTE) 0 );              // filter type - is not supported in this version
-        ImplWriteChunk((BYTE) mnInterlaced );   // interlace type
+        ImplWriteChunk( nColorType );			// colortype
+        ImplWriteChunk((BYTE) 0 );				// compression type
+        ImplWriteChunk((BYTE) 0 );				// filter type - is not supported in this version
+        ImplWriteChunk((BYTE) mnInterlaced );	// interlace type
         ImplCloseChunk();
     }
     else
@@ -348,9 +348,9 @@ BOOL PNGWriterImpl::ImplWriteHeader()
 
 void PNGWriterImpl::ImplWritePalette()
 {
-    const ULONG nCount = mpAccess->GetPaletteEntryCount();
-    BYTE*       pTempBuf = new BYTE[ nCount*3 ];
-    BYTE*       pTmp = pTempBuf;
+    const ULONG	nCount = mpAccess->GetPaletteEntryCount();
+    BYTE*		pTempBuf = new BYTE[ nCount*3 ];
+    BYTE*		pTmp = pTempBuf;
 
     ImplOpenChunk( PNGCHUNK_PLTE );
 
@@ -416,7 +416,7 @@ void PNGWriterImpl::ImplWriteIDAT ()
 
     mpDeflateInBuf = new BYTE[ mnDeflateInSize ];
 
-    if ( mnFilterType )         // using filter type 4 we need memory for the scanline 3 times
+    if ( mnFilterType )			// using filter type 4 we need memory for the scanline 3 times
     {
         mpPreviousScan = new BYTE[ mnDeflateInSize ];
         mpCurrentScan = new BYTE[ mnDeflateInSize ];
@@ -434,37 +434,37 @@ void PNGWriterImpl::ImplWriteIDAT ()
     {
         // interlace mode
         ULONG nY;
-        for ( nY = 0; nY < mnHeight; nY+=8 )                                                // pass 1
+        for ( nY = 0; nY < mnHeight; nY+=8 )												// pass 1
             mpZCodec->Write( aOStm, mpDeflateInBuf, ImplGetFilter ( nY, 0, 8 ) );
         ImplClearFirstScanline();
 
-        for ( nY = 0; nY < mnHeight; nY+=8 )                                                // pass 2
+        for ( nY = 0; nY < mnHeight; nY+=8 )												// pass 2
             mpZCodec->Write( aOStm, mpDeflateInBuf, ImplGetFilter ( nY, 4, 8 ) );
         ImplClearFirstScanline();
 
-        if ( mnHeight >= 5 )                                                                // pass 3
+        if ( mnHeight >= 5 )																// pass 3
         {
             for ( nY = 4; nY < mnHeight; nY+=8 )
                 mpZCodec->Write( aOStm, mpDeflateInBuf, ImplGetFilter ( nY, 0, 4 ) );
             ImplClearFirstScanline();
         }
 
-        for ( nY = 0; nY < mnHeight; nY+=4 )                                                // pass 4
+        for ( nY = 0; nY < mnHeight; nY+=4 )												// pass 4
             mpZCodec->Write( aOStm, mpDeflateInBuf, ImplGetFilter ( nY, 2, 4 ) );
         ImplClearFirstScanline();
 
-        if ( mnHeight >= 3 )                                                                // pass 5
+        if ( mnHeight >= 3 )																// pass 5
         {
             for ( nY = 2; nY < mnHeight; nY+=4 )
                 mpZCodec->Write( aOStm, mpDeflateInBuf, ImplGetFilter ( nY, 0, 2 ) );
             ImplClearFirstScanline();
         }
 
-        for ( nY = 0; nY < mnHeight; nY+=2 )                                                // pass 6
+        for ( nY = 0; nY < mnHeight; nY+=2 )												// pass 6
             mpZCodec->Write( aOStm, mpDeflateInBuf, ImplGetFilter ( nY, 1, 2 ) );
         ImplClearFirstScanline();
 
-        if ( mnHeight >= 2 )                                                                // pass 7
+        if ( mnHeight >= 2 )																// pass 7
         {
             for ( nY = 1; nY < mnHeight; nY+=2 )
                 mpZCodec->Write( aOStm, mpDeflateInBuf, ImplGetFilter ( nY, 0, 1 ) );
@@ -473,7 +473,7 @@ void PNGWriterImpl::ImplWriteIDAT ()
     mpZCodec->EndCompression();
     mnCRC = mpZCodec->GetCRC();
 
-    if ( mnFilterType )         // using filter type 4 we need memory for the scanline 3 times
+    if ( mnFilterType )			// using filter type 4 we need memory for the scanline 3 times
     {
         delete[] mpCurrentScan;
         delete[] mpPreviousScan;
@@ -508,9 +508,9 @@ ULONG PNGWriterImpl::ImplGetFilter ( ULONG nY, ULONG nXStart, ULONG nXAdd )
 
     if ( nXStart < mnWidth )
     {
-        *pDest++ = mnFilterType;        // in this version the filter type is either 0 or 4
+        *pDest++ = mnFilterType;		// in this version the filter type is either 0 or 4
 
-        if ( mpAccess->HasPalette() )   // alphachannel is not allowed by pictures including palette entries
+        if ( mpAccess->HasPalette() )	// alphachannel is not allowed by pictures including palette entries
         {
             switch ( mnBitsPerPixel )
             {
@@ -527,8 +527,8 @@ ULONG PNGWriterImpl::ImplGetFilter ( ULONG nY, ULONG nXStart, ULONG nXAdd )
                         else
                             *pDest |= (BYTE) mpAccess->GetPixel( nY, nX ) << nShift;
                     }
-                    if ( ( nXIndex & 7 ) != 0 ) pDest++;    // byte is not completely used, so the
-                }                                           // bufferpointer is to correct
+                    if ( ( nXIndex & 7 ) != 0 ) pDest++;	// byte is not completely used, so the
+                }											// bufferpointer is to correct
                 break;
 
                 case( 4 ):
@@ -559,7 +559,7 @@ ULONG PNGWriterImpl::ImplGetFilter ( ULONG nY, ULONG nXStart, ULONG nXAdd )
         }
         else
         {
-            if ( mpMaskAccess )             // mpMaskAccess != NULL -> alphachannel is to create
+            if ( mpMaskAccess )				// mpMaskAccess != NULL -> alphachannel is to create
             {
                 if ( mbTrueAlpha )
                 {
@@ -607,15 +607,15 @@ ULONG PNGWriterImpl::ImplGetFilter ( ULONG nY, ULONG nXStart, ULONG nXAdd )
     {
         mnDeflateInSize = pDest - mpCurrentScan;
         pDest = mpDeflateInBuf;
-        *pDest++ = 4;                                   // filter type
+        *pDest++ = 4;									// filter type
 
         ULONG na, nb, nc;
         long  np, npa, npb, npc;
 
-        BYTE* p1 = mpCurrentScan + 1;                   // Current Pixel
-        BYTE* p2 = p1 - mnBBP;                          // left pixel
-        BYTE* p3 = mpPreviousScan;                      // upper pixel
-        BYTE* p4 = p3 - mnBBP;                          // upperleft Pixel;
+        BYTE* p1 = mpCurrentScan + 1;					// Current Pixel
+        BYTE* p2 = p1 - mnBBP;							// left pixel
+        BYTE* p3 = mpPreviousScan;						// upper pixel
+        BYTE* p4 = p3 - mnBBP;							// upperleft Pixel;
 
         while ( pDest < mpDeflateInBuf + mnDeflateInSize )
         {
diff --git a/vcl/source/gdi/polyscan.cxx b/vcl/source/gdi/polyscan.cxx
index eb329f8c6869..8734ba9ab715 100644
--- a/vcl/source/gdi/polyscan.cxx
+++ b/vcl/source/gdi/polyscan.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
@@ -39,11 +39,11 @@
 // ----------------
 
 PolyScanline::PolyScanline() :
-        mpFirst ( NULL ),
-        mpLast  ( NULL ),
-        mpAct   ( NULL ),
-        mnLeft  ( 0L ),
-        mnRight ( 0L )
+        mpFirst	( NULL ),
+        mpLast	( NULL ),
+        mpAct	( NULL ),
+        mnLeft	( 0L ),
+        mnRight	( 0L )
 {
 }
 
@@ -89,7 +89,7 @@ void PolyScanline::Insert( long nX )
         {
             ScanlinePoint* pLast = mpFirst;
             ScanlinePoint* pAct = mpFirst->mpNext;
-
+            
             while( pAct )
             {
                 // insert in the midlle of the scanline?
@@ -98,10 +98,10 @@ void PolyScanline::Insert( long nX )
                     pLast->mpNext = new ScanlinePoint( nX, pAct );
                     break;
                 }
-
+                 
                 pLast = pAct;
                 pAct = pAct->mpNext;
-            }
+            }	
         }
     }
 }
@@ -151,8 +151,8 @@ PolyScanner::PolyScanner( const Rectangle& rRect )
 {
     if( !rRect.IsEmpty() )
     {
-        Rectangle   aRect( rRect );
-        ULONG       nHeight;
+        Rectangle	aRect( rRect );
+        ULONG		nHeight;
 
         aRect.Justify();
         mnLeft = aRect.Left();
@@ -179,9 +179,9 @@ PolyScanner::PolyScanner( const Polygon& rPoly )
 
     if( nCount )
     {
-        long    nLast = nCount - 1;
-        Point   aFirst( rPoly[ 0 ] );
-        Point   aLast( rPoly[ (USHORT) nLast ] );
+        long	nLast = nCount - 1;
+        Point	aFirst( rPoly[ 0 ] );
+        Point	aLast( rPoly[ (USHORT) nLast ] );
 
         while( nLast && ( aLast == aFirst ) )
             aLast = rPoly[ (USHORT) --nLast ];
@@ -197,10 +197,10 @@ PolyScanner::PolyScanner( const Polygon& rPoly )
         else
         {
             const Rectangle aRect( rPoly.GetBoundRect() );
-            ULONG           nHeight;
+            ULONG			nHeight;
 
             mnLeft = aRect.Left();
-            mnTop = aRect.Top();
+            mnTop = aRect.Top(); 
             mnRight = aRect.Right();
             mnBottom = aRect.Bottom();
             aLast = aFirst;
@@ -267,21 +267,21 @@ void PolyScanner::InsertLine( const Point& rStart, const Point& rEnd )
                 mpArray[ nY++ - mnTop ].Insert( nX );
         else
             while( nY > nEndY )
-                mpArray[ nY-- - mnTop ].Insert( nX );
+                mpArray[ nY-- - mnTop ].Insert( nX ); 
     }
     else
     {
         const long  nDX = labs( rEnd.X() - rStart.X() );
         const long  nDY = labs( rEnd.Y() - rStart.Y() );
-        const long  nStartX = rStart.X();
-        const long  nStartY = rStart.Y();
-        const long  nEndX = rEnd.X();
-        const long  nEndY = rEnd.Y();
-        const long  nXInc = ( nStartX < nEndX ) ? 1L : -1L;
-        const long  nYInc = ( nStartY < nEndY ) ? 1L : -1L;
-        long        nLastX = nStartX;
-        long        nLastY = nStartY;
-        BOOL        bLast = FALSE;
+        const long	nStartX = rStart.X();
+        const long	nStartY = rStart.Y();
+        const long	nEndX = rEnd.X();
+        const long	nEndY = rEnd.Y();	
+        const long	nXInc = ( nStartX < nEndX ) ? 1L : -1L;
+        const long	nYInc = ( nStartY < nEndY ) ? 1L : -1L;
+        long		nLastX = nStartX;
+        long		nLastY = nStartY;
+        BOOL		bLast = FALSE;
 
         mpArray[ nStartY - mnTop ].Insert( nStartX );
 
@@ -306,7 +306,7 @@ void PolyScanner::InsertLine( const Point& rStart, const Point& rEnd )
 
                 nLastX = nX;
                 nLastY = nY;
-
+                
                 if( nD < 0L )
                     nD += nDY2;
                 else
diff --git a/vcl/source/gdi/print.cxx b/vcl/source/gdi/print.cxx
index 2ea9bfcc4c11..65c17a5b452d 100644
--- a/vcl/source/gdi/print.cxx
+++ b/vcl/source/gdi/print.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
@@ -136,8 +136,8 @@ PrinterOptions::~PrinterOptions()
 
 QueueInfo::QueueInfo()
 {
-    mnStatus    = 0;
-    mnJobs      = 0;
+    mnStatus	= 0;
+    mnJobs		= 0;
 }
 
 // -----------------------------------------------------------------------
@@ -163,12 +163,12 @@ QueueInfo::~QueueInfo()
 bool QueueInfo::operator==( const QueueInfo& rInfo ) const
 {
     return
-        maPrinterName   == rInfo.maPrinterName  &&
-        maDriver        == rInfo.maDriver       &&
-        maLocation      == rInfo.maLocation     &&
-        maComment       == rInfo.maComment      &&
-        mnStatus        == rInfo.mnStatus       &&
-        mnJobs          == rInfo.mnJobs;
+        maPrinterName	== rInfo.maPrinterName	&&
+        maDriver		== rInfo.maDriver		&&
+        maLocation		== rInfo.maLocation		&&
+        maComment		== rInfo.maComment		&&
+        mnStatus		== rInfo.mnStatus		&&
+        mnJobs			== rInfo.mnJobs;
 }
 
 // -----------------------------------------------------------------------
@@ -207,9 +207,9 @@ SvStream& operator>>( SvStream& rIStream, QueueInfo& rInfo )
 
 SalPrinterQueueInfo::SalPrinterQueueInfo()
 {
-    mnStatus    = 0;
-    mnJobs      = QUEUE_JOBS_DONTKNOW;
-    mpSysData   = NULL;
+    mnStatus	= 0;
+    mnJobs		= QUEUE_JOBS_DONTKNOW;
+    mpSysData	= NULL;
 }
 
 // -----------------------------------------------------------------------
@@ -222,7 +222,7 @@ SalPrinterQueueInfo::~SalPrinterQueueInfo()
 
 ImplPrnQueueList::~ImplPrnQueueList()
 {
-    ImplSVData*         pSVData = ImplGetSVData();
+    ImplSVData* 		pSVData = ImplGetSVData();
     for( unsigned int i = 0; i < m_aQueueInfos.size(); i++ )
     {
         delete m_aQueueInfos[i].mpQueueInfo;
@@ -283,8 +283,8 @@ static void ImplInitPrnQueueList()
 
 void ImplDeletePrnQueueList()
 {
-    ImplSVData*         pSVData = ImplGetSVData();
-    ImplPrnQueueList*   pPrnList = pSVData->maGDIData.mpPrinterQueueList;
+    ImplSVData* 		pSVData = ImplGetSVData();
+    ImplPrnQueueList*	pPrnList = pSVData->maGDIData.mpPrinterQueueList;
 
     if ( pPrnList )
     {
@@ -297,9 +297,9 @@ void ImplDeletePrnQueueList()
 
 const std::vector<rtl::OUString>& Printer::GetPrinterQueues()
 {
-    ImplSVData*         pSVData = ImplGetSVData();
+    ImplSVData* 		pSVData = ImplGetSVData();
     if ( !pSVData->maGDIData.mpPrinterQueueList )
-        ImplInitPrnQueueList();
+        ImplInitPrnQueueList();    
     return pSVData->maGDIData.mpPrinterQueueList->m_aPrinterList;
 }
 
@@ -316,16 +316,16 @@ const QueueInfo* Printer::GetQueueInfo( const String& rPrinterName, bool bStatus
     {
         if( !pInfo->mpQueueInfo || bStatusUpdate )
             pSVData->mpDefInst->GetPrinterQueueState( pInfo->mpSalQueueInfo );
-
+        
         if ( !pInfo->mpQueueInfo )
             pInfo->mpQueueInfo = new QueueInfo;
-
-        pInfo->mpQueueInfo->maPrinterName   = pInfo->mpSalQueueInfo->maPrinterName;
-        pInfo->mpQueueInfo->maDriver        = pInfo->mpSalQueueInfo->maDriver;
-        pInfo->mpQueueInfo->maLocation      = pInfo->mpSalQueueInfo->maLocation;
-        pInfo->mpQueueInfo->maComment       = pInfo->mpSalQueueInfo->maComment;
-        pInfo->mpQueueInfo->mnStatus        = pInfo->mpSalQueueInfo->mnStatus;
-        pInfo->mpQueueInfo->mnJobs          = pInfo->mpSalQueueInfo->mnJobs;
+        
+        pInfo->mpQueueInfo->maPrinterName	= pInfo->mpSalQueueInfo->maPrinterName;
+        pInfo->mpQueueInfo->maDriver		= pInfo->mpSalQueueInfo->maDriver;
+        pInfo->mpQueueInfo->maLocation		= pInfo->mpSalQueueInfo->maLocation;
+        pInfo->mpQueueInfo->maComment		= pInfo->mpSalQueueInfo->maComment;
+        pInfo->mpQueueInfo->mnStatus		= pInfo->mpSalQueueInfo->mnStatus;
+        pInfo->mpQueueInfo->mnJobs			= pInfo->mpSalQueueInfo->mnJobs;
         return pInfo->mpQueueInfo;
     }
     return NULL;
@@ -339,34 +339,34 @@ XubString Printer::GetDefaultPrinterName()
     if( !pEnv || !*pEnv )
     {
         ImplSVData* pSVData = ImplGetSVData();
-
+    
         return pSVData->mpDefInst->GetDefaultPrinter();
     }
-    return XubString();
+    return XubString();        
 }
 
 // =======================================================================
 
 void Printer::ImplInitData()
 {
-    mbDevOutput         = FALSE;
-    meOutDevType        = OUTDEV_PRINTER;
-    mbDefPrinter        = FALSE;
-    mnError             = 0;
-    mnCurPage           = 0;
-    mnCurPrintPage      = 0;
-    mnPageQueueSize     = 0;
-    mnCopyCount         = 1;
-    mbCollateCopy       = FALSE;
-    mbPrinting          = FALSE;
-    mbJobActive         = FALSE;
-    mbPrintFile         = FALSE;
-    mbInPrintPage       = FALSE;
-    mbNewJobSetup       = FALSE;
-    mpInfoPrinter       = NULL;
-    mpPrinter           = NULL;
-    mpDisplayDev        = NULL;
-    mbIsQueuePrinter    = FALSE;
+    mbDevOutput 		= FALSE;
+    meOutDevType		= OUTDEV_PRINTER;
+    mbDefPrinter		= FALSE;
+    mnError 			= 0;
+    mnCurPage			= 0;
+    mnCurPrintPage		= 0;
+    mnPageQueueSize 	= 0;
+    mnCopyCount 		= 1;
+    mbCollateCopy		= FALSE;
+    mbPrinting			= FALSE;
+    mbJobActive 		= FALSE;
+    mbPrintFile 		= FALSE;
+    mbInPrintPage		= FALSE;
+    mbNewJobSetup		= FALSE;
+    mpInfoPrinter		= NULL;
+    mpPrinter			= NULL;
+    mpDisplayDev		= NULL;
+    mbIsQueuePrinter	= FALSE;
     mpPrinterOptions    = new PrinterOptions;
 
     // Printer in die Liste eintragen
@@ -410,9 +410,9 @@ void Printer::ImplInit( SalPrinterQueueInfo* pInfo )
     pJobSetup->maPrinterName = maPrinterName;
     pJobSetup->maDriver = maDriver;
 
-    mpInfoPrinter   = pSVData->mpDefInst->CreateInfoPrinter( pInfo, pJobSetup );
-    mpPrinter       = NULL;
-    mpJobGraphics   = NULL;
+    mpInfoPrinter	= pSVData->mpDefInst->CreateInfoPrinter( pInfo, pJobSetup );
+    mpPrinter		= NULL;
+    mpJobGraphics	= NULL;
     ImplUpdateJobSetupPaper( maJobSetup );
 
     if ( !mpInfoPrinter )
@@ -441,18 +441,18 @@ void Printer::ImplInitDisplay( const Window* pWindow )
 {
     ImplSVData* pSVData = ImplGetSVData();
 
-    mpInfoPrinter       = NULL;
-    mpPrinter           = NULL;
-    mpJobGraphics       = NULL;
+    mpInfoPrinter		= NULL;
+    mpPrinter			= NULL;
+    mpJobGraphics		= NULL;
 
     if ( pWindow )
         mpDisplayDev = new VirtualDevice( *pWindow );
     else
         mpDisplayDev = new VirtualDevice();
-    mpFontList          = pSVData->maGDIData.mpScreenFontList;
-    mpFontCache         = pSVData->maGDIData.mpScreenFontCache;
-    mnDPIX              = mpDisplayDev->mnDPIX;
-    mnDPIY              = mpDisplayDev->mnDPIY;
+    mpFontList			= pSVData->maGDIData.mpScreenFontList;
+    mpFontCache 		= pSVData->maGDIData.mpScreenFontCache;
+    mnDPIX				= mpDisplayDev->mnDPIX;
+    mnDPIY				= mpDisplayDev->mnDPIY;
 }
 
 // -----------------------------------------------------------------------
@@ -786,11 +786,11 @@ BOOL Printer::SetPrinterProps( const Printer* pPrinter )
 
     ImplSVData* pSVData = ImplGetSVData();
 
-    mbDefPrinter        = pPrinter->mbDefPrinter;
-    maPrintFile         = pPrinter->maPrintFile;
-    mbPrintFile         = pPrinter->mbPrintFile;
-    mnCopyCount         = pPrinter->mnCopyCount;
-    mbCollateCopy       = pPrinter->mbCollateCopy;
+    mbDefPrinter	    = pPrinter->mbDefPrinter;
+    maPrintFile 	    = pPrinter->maPrintFile;
+    mbPrintFile 	    = pPrinter->mbPrintFile;
+    mnCopyCount 	    = pPrinter->mnCopyCount;
+    mbCollateCopy	    = pPrinter->mbCollateCopy;
     mnPageQueueSize     = pPrinter->mnPageQueueSize;
     *mpPrinterOptions   = *pPrinter->mpPrinterOptions;
 
@@ -895,8 +895,8 @@ BOOL Printer::SetOrientation( Orientation eOrientation )
 
     if ( maJobSetup.ImplGetConstData()->meOrientation != eOrientation )
     {
-        JobSetup        aJobSetup = maJobSetup;
-        ImplJobSetup*   pSetupData = aJobSetup.ImplGetData();
+        JobSetup		aJobSetup = maJobSetup;
+        ImplJobSetup*	pSetupData = aJobSetup.ImplGetData();
         pSetupData->meOrientation = eOrientation;
 
         if ( IsDisplayPrinter() )
@@ -940,8 +940,8 @@ BOOL Printer::SetPaperBin( USHORT nPaperBin )
     if ( (maJobSetup.ImplGetConstData()->mnPaperBin != nPaperBin) &&
          (nPaperBin < GetPaperBinCount()) )
     {
-        JobSetup        aJobSetup = maJobSetup;
-        ImplJobSetup*   pSetupData = aJobSetup.ImplGetData();
+        JobSetup		aJobSetup = maJobSetup;
+        ImplJobSetup*	pSetupData = aJobSetup.ImplGetData();
         pSetupData->mnPaperBin = nPaperBin;
 
         if ( IsDisplayPrinter() )
@@ -980,10 +980,10 @@ USHORT Printer::GetPaperBin() const
 // Map user paper format to a available printer paper formats
 void Printer::ImplFindPaperFormatForUserSize( JobSetup& aJobSetup, bool bMatchNearest )
 {
-    ImplJobSetup*   pSetupData = aJobSetup.ImplGetData();
+    ImplJobSetup*	pSetupData = aJobSetup.ImplGetData();
 
-    int     nLandscapeAngle = GetLandscapeAngle();
-    int     nPaperCount     = GetPaperInfoCount();
+    int		nLandscapeAngle	= GetLandscapeAngle();
+    int		nPaperCount		= GetPaperInfoCount();
     bool    bFound = false;
 
     PaperInfo aInfo(pSetupData->mnPaperWidth, pSetupData->mnPaperHeight);
@@ -1027,7 +1027,7 @@ void Printer::ImplFindPaperFormatForUserSize( JobSetup& aJobSetup, bool bMatchNe
             }
         }
     }
-
+    
     if( ! bFound && bMatchNearest )
     {
          sal_Int64 nBestMatch = SAL_MAX_INT64;
@@ -1036,11 +1036,11 @@ void Printer::ImplFindPaperFormatForUserSize( JobSetup& aJobSetup, bool bMatchNe
          for( int i = 0; i < nPaperCount; i++ )
          {
              const PaperInfo& rPaperInfo = GetPaperInfo( i );
-
+             
              // check protrait match
              sal_Int64 nDX = pSetupData->mnPaperWidth - rPaperInfo.getWidth();
              sal_Int64 nDY = pSetupData->mnPaperHeight - rPaperInfo.getHeight();
-             sal_Int64 nMatch = nDX*nDX + nDY*nDY;
+             sal_Int64 nMatch = nDX*nDX + nDY*nDY;             
              if( nMatch < nBestMatch )
              {
                  nBestMatch = nMatch;
@@ -1075,8 +1075,8 @@ BOOL Printer::SetPaper( Paper ePaper )
 
     if ( maJobSetup.ImplGetConstData()->mePaperFormat != ePaper )
     {
-        JobSetup        aJobSetup = maJobSetup;
-        ImplJobSetup*   pSetupData = aJobSetup.ImplGetData();
+        JobSetup		aJobSetup = maJobSetup;
+        ImplJobSetup*	pSetupData = aJobSetup.ImplGetData();
         pSetupData->mePaperFormat = ePaper;
         if ( ePaper != PAPER_USER )
         {
@@ -1123,17 +1123,17 @@ BOOL Printer::SetPaperSizeUser( const Size& rSize, bool bMatchNearest )
     if ( mbInPrintPage )
         return FALSE;
 
-    Size    aPixSize = LogicToPixel( rSize );
-    Size    aPageSize = PixelToLogic( aPixSize, MAP_100TH_MM );
-    if ( (maJobSetup.ImplGetConstData()->mePaperFormat != PAPER_USER)       ||
+    Size	aPixSize = LogicToPixel( rSize );
+    Size	aPageSize = PixelToLogic( aPixSize, MAP_100TH_MM );
+    if ( (maJobSetup.ImplGetConstData()->mePaperFormat != PAPER_USER)		||
          (maJobSetup.ImplGetConstData()->mnPaperWidth  != aPageSize.Width()) ||
          (maJobSetup.ImplGetConstData()->mnPaperHeight != aPageSize.Height()) )
     {
-        JobSetup        aJobSetup = maJobSetup;
-        ImplJobSetup*   pSetupData = aJobSetup.ImplGetData();
-        pSetupData->mePaperFormat   = PAPER_USER;
-        pSetupData->mnPaperWidth    = aPageSize.Width();
-        pSetupData->mnPaperHeight   = aPageSize.Height();
+        JobSetup		aJobSetup = maJobSetup;
+        ImplJobSetup*	pSetupData = aJobSetup.ImplGetData();
+        pSetupData->mePaperFormat	= PAPER_USER;
+        pSetupData->mnPaperWidth	= aPageSize.Width();
+        pSetupData->mnPaperHeight	= aPageSize.Height();
 
         if ( IsDisplayPrinter() )
         {
@@ -1202,8 +1202,8 @@ BOOL Printer::SetDuplexMode( DuplexMode eDuplex )
 
     if ( maJobSetup.ImplGetConstData()->meDuplexMode != eDuplex )
     {
-        JobSetup        aJobSetup = maJobSetup;
-        ImplJobSetup*   pSetupData = aJobSetup.ImplGetData();
+        JobSetup		aJobSetup = maJobSetup;
+        ImplJobSetup*	pSetupData = aJobSetup.ImplGetData();
         pSetupData->meDuplexMode = eDuplex;
 
         if ( IsDisplayPrinter() )
@@ -1309,8 +1309,8 @@ ULONG Printer::ImplSalPrinterErrorCodeToVCL( ULONG nError )
 
 void Printer::ImplEndPrint()
 {
-    mbPrinting      = FALSE;
-    mnCurPrintPage  = 0;
+    mbPrinting		= FALSE;
+    mnCurPrintPage	= 0;
     maJobName.Erase();
 }
 
@@ -1344,8 +1344,8 @@ BOOL Printer::EndJob()
 
         bRet = TRUE;
 
-        mbPrinting      = FALSE;
-        mnCurPrintPage  = 0;
+        mbPrinting		= FALSE;
+        mnCurPrintPage	= 0;
         maJobName.Erase();
 
         mbDevOutput = FALSE;
@@ -1369,15 +1369,15 @@ BOOL Printer::AbortJob()
     if ( !IsJobActive() && !IsPrinting() )
         return FALSE;
 
-    mbJobActive     = FALSE;
-    mbInPrintPage   = FALSE;
-    mpJobGraphics   = NULL;
+    mbJobActive 	= FALSE;
+    mbInPrintPage	= FALSE;
+    mpJobGraphics	= NULL;
 
     if ( mpPrinter )
     {
-        mbPrinting      = FALSE;
-        mnCurPage       = 0;
-        mnCurPrintPage  = 0;
+        mbPrinting		= FALSE;
+        mnCurPage		= 0;
+        mnCurPrintPage	= 0;
         maJobName.Erase();
 
         ImplReleaseGraphics();
@@ -1443,14 +1443,14 @@ void Printer::ImplEndPage()
 
 void Printer::updatePrinters()
 {
-    ImplSVData*         pSVData = ImplGetSVData();
-    ImplPrnQueueList*   pPrnList = pSVData->maGDIData.mpPrinterQueueList;
+    ImplSVData* 		pSVData = ImplGetSVData();
+    ImplPrnQueueList*	pPrnList = pSVData->maGDIData.mpPrinterQueueList;
 
     if ( pPrnList )
     {
         ImplPrnQueueList* pNewList = new ImplPrnQueueList;
         pSVData->mpDefInst->GetPrinterQueueInfo( pNewList );
-
+        
         bool bChanged = pPrnList->m_aQueueInfos.size() != pNewList->m_aQueueInfos.size();
         for( unsigned int i = 0; ! bChanged && i < pPrnList->m_aQueueInfos.size(); i++ )
         {
diff --git a/vcl/source/gdi/print2.cxx b/vcl/source/gdi/print2.cxx
index d560b0b6e7cc..c761ec8c98c3 100644
--- a/vcl/source/gdi/print2.cxx
+++ b/vcl/source/gdi/print2.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
@@ -66,7 +66,7 @@ typedef ::std::list< Component > ComponentList;
 // List of (intersecting) actions, plus overall bounds
 struct ConnectedComponents
 {
-    ConnectedComponents() :
+    ConnectedComponents() : 
         aComponentList(),
         aBounds(),
         aBgColor(COL_WHITE),
@@ -74,14 +74,14 @@ struct ConnectedComponents
         bIsFullyTransparent(false)
     {}
 
-    ComponentList   aComponentList;
-    Rectangle       aBounds;
+    ComponentList	aComponentList;
+    Rectangle		aBounds;
     Color           aBgColor;
-    bool            bIsSpecial;
-    bool            bIsFullyTransparent;
+    bool			bIsSpecial;
+    bool			bIsFullyTransparent;
 };
 
-typedef ::std::list< ConnectedComponents > ConnectedComponentsList;
+typedef ::std::list< ConnectedComponents > ConnectedComponentsList;	
 
 
 // -----------
@@ -126,7 +126,7 @@ static bool checkRect( Rectangle&       io_rPrevRect,
 {
     // shape needs to fully cover previous content, and have uniform
     // color
-    const bool bRet(
+    const bool bRet( 
         rMapModeVDev.LogicToPixel(rCurrRect).IsInside(io_rPrevRect) &&
         rMapModeVDev.IsFillColor() );
 
@@ -135,7 +135,7 @@ static bool checkRect( Rectangle&       io_rPrevRect,
         io_rPrevRect = rCurrRect;
         o_rBgColor = rMapModeVDev.GetFillColor();
     }
-
+    
     return bRet;
 }
 
@@ -154,7 +154,7 @@ static void ImplConvertTransparentAction( GDIMetaFile&        o_rMtf,
     if( rAct.GetType() == META_TRANSPARENT_ACTION )
     {
         const MetaTransparentAction* pTransAct = static_cast<const MetaTransparentAction*>(&rAct);
-        USHORT                       nTransparency( pTransAct->GetTransparence() );
+        USHORT				         nTransparency( pTransAct->GetTransparence() );
 
         // #i10613# Respect transparency for draw color
         if( nTransparency )
@@ -189,7 +189,7 @@ static void ImplConvertTransparentAction( GDIMetaFile&        o_rMtf,
             case META_BMPEX_ACTION:
                 aBmpEx = static_cast<const MetaBmpExAction&>(rAct).GetBitmapEx();
                 break;
-
+            
             case META_BMPEXSCALE_ACTION:
                 aBmpEx = static_cast<const MetaBmpExScaleAction&>(rAct).GetBitmapEx();
                 break;
@@ -218,7 +218,7 @@ static void ImplConvertTransparentAction( GDIMetaFile&        o_rMtf,
 
             if( pRA->HasPalette() )
                 aActualColor = pRA->GetBestPaletteColor( aBgColor ).operator Color();
-
+    
             aBmp.ReleaseAccess(pRA);
 
             // did we get true white?
@@ -247,22 +247,22 @@ static void ImplConvertTransparentAction( GDIMetaFile&        o_rMtf,
         switch( rAct.GetType() )
         {
             case META_BMPEX_ACTION:
-                o_rMtf.AddAction( new MetaBmpAction(
-                                       static_cast<const MetaBmpExAction&>(rAct).GetPoint(),
+                o_rMtf.AddAction( new MetaBmpAction( 
+                                       static_cast<const MetaBmpExAction&>(rAct).GetPoint(), 
                                        aBmp ));
                 break;
             case META_BMPEXSCALE_ACTION:
-                o_rMtf.AddAction( new MetaBmpScaleAction(
-                                       static_cast<const MetaBmpExScaleAction&>(rAct).GetPoint(),
-                                       static_cast<const MetaBmpExScaleAction&>(rAct).GetSize(),
+                o_rMtf.AddAction( new MetaBmpScaleAction( 
+                                       static_cast<const MetaBmpExScaleAction&>(rAct).GetPoint(), 
+                                       static_cast<const MetaBmpExScaleAction&>(rAct).GetSize(), 
                                        aBmp ));
                 break;
             case META_BMPEXSCALEPART_ACTION:
-                o_rMtf.AddAction( new MetaBmpScalePartAction(
-                                       static_cast<const MetaBmpExScalePartAction&>(rAct).GetDestPoint(),
-                                       static_cast<const MetaBmpExScalePartAction&>(rAct).GetDestSize(),
-                                       static_cast<const MetaBmpExScalePartAction&>(rAct).GetSrcPoint(),
-                                       static_cast<const MetaBmpExScalePartAction&>(rAct).GetSrcSize(),
+                o_rMtf.AddAction( new MetaBmpScalePartAction( 
+                                       static_cast<const MetaBmpExScalePartAction&>(rAct).GetDestPoint(), 
+                                       static_cast<const MetaBmpExScalePartAction&>(rAct).GetDestSize(), 
+                                       static_cast<const MetaBmpExScalePartAction&>(rAct).GetSrcPoint(), 
+                                       static_cast<const MetaBmpExScalePartAction&>(rAct).GetSrcSize(), 
                                        aBmp ));
                 break;
             default:
@@ -276,9 +276,9 @@ static void ImplConvertTransparentAction( GDIMetaFile&        o_rMtf,
 // Returns true, if given action creates visible (i.e. non-transparent) output
 static bool ImplIsNotTransparent( const MetaAction& rAct, const OutputDevice& rOut )
 {
-    const bool  bLineTransparency( rOut.IsLineColor() ? rOut.GetLineColor().GetTransparency() == 255 : true );
-    const bool  bFillTransparency( rOut.IsFillColor() ? rOut.GetFillColor().GetTransparency() == 255 : true );
-    bool        bRet( false );
+    const bool	bLineTransparency( rOut.IsLineColor() ? rOut.GetLineColor().GetTransparency() == 255 : true );
+    const bool 	bFillTransparency( rOut.IsFillColor() ? rOut.GetFillColor().GetTransparency() == 255 : true );
+    bool		bRet( false );
 
     switch( rAct.GetType() )
     {
@@ -404,7 +404,7 @@ static Rectangle ImplCalcActionBounds( const MetaAction& rAct, const OutputDevic
             break;
 
         case META_LINE_ACTION:
-            aActionBounds = Rectangle( static_cast<const MetaLineAction&>(rAct).GetStartPoint(),
+            aActionBounds = Rectangle( static_cast<const MetaLineAction&>(rAct).GetStartPoint(), 
                                        static_cast<const MetaLineAction&>(rAct).GetEndPoint() );
             break;
 
@@ -458,47 +458,47 @@ static Rectangle ImplCalcActionBounds( const MetaAction& rAct, const OutputDevic
             break;
 
         case META_BMP_ACTION:
-            aActionBounds = Rectangle( static_cast<const MetaBmpAction&>(rAct).GetPoint(),
+            aActionBounds = Rectangle( static_cast<const MetaBmpAction&>(rAct).GetPoint(), 
                                        rOut.PixelToLogic( static_cast<const MetaBmpAction&>(rAct).GetBitmap().GetSizePixel() ) );
             break;
 
         case META_BMPSCALE_ACTION:
-            aActionBounds = Rectangle( static_cast<const MetaBmpScaleAction&>(rAct).GetPoint(),
+            aActionBounds = Rectangle( static_cast<const MetaBmpScaleAction&>(rAct).GetPoint(), 
                                        static_cast<const MetaBmpScaleAction&>(rAct).GetSize() );
             break;
 
         case META_BMPSCALEPART_ACTION:
-            aActionBounds = Rectangle( static_cast<const MetaBmpScalePartAction&>(rAct).GetDestPoint(),
+            aActionBounds = Rectangle( static_cast<const MetaBmpScalePartAction&>(rAct).GetDestPoint(), 
                                        static_cast<const MetaBmpScalePartAction&>(rAct).GetDestSize() );
             break;
 
         case META_BMPEX_ACTION:
-            aActionBounds = Rectangle( static_cast<const MetaBmpExAction&>(rAct).GetPoint(),
+            aActionBounds = Rectangle( static_cast<const MetaBmpExAction&>(rAct).GetPoint(), 
                                        rOut.PixelToLogic( static_cast<const MetaBmpExAction&>(rAct).GetBitmapEx().GetSizePixel() ) );
             break;
 
         case META_BMPEXSCALE_ACTION:
-            aActionBounds = Rectangle( static_cast<const MetaBmpExScaleAction&>(rAct).GetPoint(),
+            aActionBounds = Rectangle( static_cast<const MetaBmpExScaleAction&>(rAct).GetPoint(), 
                                        static_cast<const MetaBmpExScaleAction&>(rAct).GetSize() );
             break;
 
         case META_BMPEXSCALEPART_ACTION:
-            aActionBounds = Rectangle( static_cast<const MetaBmpExScalePartAction&>(rAct).GetDestPoint(),
+            aActionBounds = Rectangle( static_cast<const MetaBmpExScalePartAction&>(rAct).GetDestPoint(), 
                                        static_cast<const MetaBmpExScalePartAction&>(rAct).GetDestSize() );
             break;
 
         case META_MASK_ACTION:
-            aActionBounds = Rectangle( static_cast<const MetaMaskAction&>(rAct).GetPoint(),
+            aActionBounds = Rectangle( static_cast<const MetaMaskAction&>(rAct).GetPoint(), 
                                        rOut.PixelToLogic( static_cast<const MetaMaskAction&>(rAct).GetBitmap().GetSizePixel() ) );
             break;
 
         case META_MASKSCALE_ACTION:
-            aActionBounds = Rectangle( static_cast<const MetaMaskScaleAction&>(rAct).GetPoint(),
+            aActionBounds = Rectangle( static_cast<const MetaMaskScaleAction&>(rAct).GetPoint(), 
                                        static_cast<const MetaMaskScaleAction&>(rAct).GetSize() );
             break;
 
         case META_MASKSCALEPART_ACTION:
-            aActionBounds = Rectangle( static_cast<const MetaMaskScalePartAction&>(rAct).GetDestPoint(),
+            aActionBounds = Rectangle( static_cast<const MetaMaskScalePartAction&>(rAct).GetDestPoint(), 
                                        static_cast<const MetaMaskScalePartAction&>(rAct).GetDestSize() );
             break;
 
@@ -523,12 +523,12 @@ static Rectangle ImplCalcActionBounds( const MetaAction& rAct, const OutputDevic
             break;
 
         case META_FLOATTRANSPARENT_ACTION:
-            aActionBounds = Rectangle( static_cast<const MetaFloatTransparentAction&>(rAct).GetPoint(),
+            aActionBounds = Rectangle( static_cast<const MetaFloatTransparentAction&>(rAct).GetPoint(), 
                                        static_cast<const MetaFloatTransparentAction&>(rAct).GetSize() );
             break;
 
         case META_EPS_ACTION:
-            aActionBounds = Rectangle( static_cast<const MetaEPSAction&>(rAct).GetPoint(),
+            aActionBounds = Rectangle( static_cast<const MetaEPSAction&>(rAct).GetPoint(), 
                                        static_cast<const MetaEPSAction&>(rAct).GetSize() );
             break;
 
@@ -543,7 +543,7 @@ static Rectangle ImplCalcActionBounds( const MetaAction& rAct, const OutputDevic
 
                 // #105987# Use API method instead of Impl* methods
                 // #107490# Set base parameter equal to index parameter
-                rOut.GetTextBoundRect( aActionBounds, rTextAct.GetText(), rTextAct.GetIndex(),
+                rOut.GetTextBoundRect( aActionBounds, rTextAct.GetText(), rTextAct.GetIndex(), 
                                        rTextAct.GetIndex(), rTextAct.GetLen() );
                 aActionBounds.Move( aPtLog.X(), aPtLog.Y() );
             }
@@ -552,15 +552,15 @@ static Rectangle ImplCalcActionBounds( const MetaAction& rAct, const OutputDevic
 
         case META_TEXTARRAY_ACTION:
         {
-            const MetaTextArrayAction&  rTextAct = static_cast<const MetaTextArrayAction&>(rAct);
-            const XubString             aString( rTextAct.GetText(), rTextAct.GetIndex(), rTextAct.GetLen() );
-            const long                  nLen = aString.Len();
+            const MetaTextArrayAction&	rTextAct = static_cast<const MetaTextArrayAction&>(rAct);
+            const XubString 			aString( rTextAct.GetText(), rTextAct.GetIndex(), rTextAct.GetLen() );
+            const long              	nLen = aString.Len();
 
             if( nLen )
             {
                 // #105987# ImplLayout takes everything in logical coordinates
-                SalLayout* pSalLayout = rOut.ImplLayout( rTextAct.GetText(), rTextAct.GetIndex(),
-                                                         rTextAct.GetLen(), rTextAct.GetPoint(),
+                SalLayout* pSalLayout = rOut.ImplLayout( rTextAct.GetText(), rTextAct.GetIndex(), 
+                                                         rTextAct.GetLen(), rTextAct.GetPoint(), 
                                                          0, rTextAct.GetDXArray() );
                 if( pSalLayout )
                 {
@@ -579,8 +579,8 @@ static Rectangle ImplCalcActionBounds( const MetaAction& rAct, const OutputDevic
         case META_STRETCHTEXT_ACTION:
         {
             const MetaStretchTextAction& rTextAct = static_cast<const MetaStretchTextAction&>(rAct);
-            const XubString              aString( rTextAct.GetText(), rTextAct.GetIndex(), rTextAct.GetLen() );
-            const long                   nLen = aString.Len();
+            const XubString 			 aString( rTextAct.GetText(), rTextAct.GetIndex(), rTextAct.GetLen() );
+            const long              	 nLen = aString.Len();
 
             // #i16195# Literate copy from TextArray action, the
             // semantics for the ImplLayout call are copied from the
@@ -590,8 +590,8 @@ static Rectangle ImplCalcActionBounds( const MetaAction& rAct, const OutputDevic
             if( nLen )
             {
                 // #105987# ImplLayout takes everything in logical coordinates
-                SalLayout* pSalLayout = rOut.ImplLayout( rTextAct.GetText(), rTextAct.GetIndex(),
-                                                         rTextAct.GetLen(), rTextAct.GetPoint(),
+                SalLayout* pSalLayout = rOut.ImplLayout( rTextAct.GetText(), rTextAct.GetIndex(), 
+                                                         rTextAct.GetLen(), rTextAct.GetPoint(), 
                                                          rTextAct.GetWidth() );
                 if( pSalLayout )
                 {
@@ -640,7 +640,7 @@ static bool ImplIsActionHandlingTransparency( const MetaAction& rAct )
 }
 
 // remove comment to enable highlighting of generated output
-bool OutputDevice::RemoveTransparenciesFromMetaFile( const GDIMetaFile& rInMtf, GDIMetaFile& rOutMtf,
+bool OutputDevice::RemoveTransparenciesFromMetaFile( const GDIMetaFile& rInMtf, GDIMetaFile& rOutMtf, 
                                                      long nMaxBmpDPIX, long nMaxBmpDPIY,
                                                      bool bReduceTransparency, bool bTransparencyAutoMode,
                                                      bool bDownsampleBitmaps,
@@ -648,15 +648,15 @@ bool OutputDevice::RemoveTransparenciesFromMetaFile( const GDIMetaFile& rInMtf,
                                                      )
 {
     MetaAction*             pCurrAct;
-    bool                    bTransparent( false );
+    bool		            bTransparent( false );
 
     rOutMtf.Clear();
 
     if( ! bReduceTransparency || bTransparencyAutoMode )
     {
         // watch for transparent drawing actions
-        for( pCurrAct = ( (GDIMetaFile&) rInMtf ).FirstAction();
-             pCurrAct && !bTransparent;
+        for( pCurrAct = ( (GDIMetaFile&) rInMtf ).FirstAction(); 
+             pCurrAct && !bTransparent; 
              pCurrAct = ( (GDIMetaFile&) rInMtf ).NextAction() )
         {
             // #i10613# Extracted "specialness" predicate into extra method
@@ -675,7 +675,7 @@ bool OutputDevice::RemoveTransparenciesFromMetaFile( const GDIMetaFile& rInMtf,
         }
     }
 
-    // #i10613# Determine set of connected components containing transparent objects. These are
+    // #i10613# Determine set of connected components containing transparent objects. These are 
     // then processed as bitmaps, the original actions are removed from the metafile.
     if( !bTransparent )
     {
@@ -684,7 +684,7 @@ bool OutputDevice::RemoveTransparenciesFromMetaFile( const GDIMetaFile& rInMtf,
     }
     else
     {
-        // #i10613#
+        // #i10613# 
         // This works as follows: we want a number of distinct sets of
         // connected components, where each set contains metafile
         // actions that are intersecting (note: there are possibly
@@ -826,12 +826,12 @@ bool OutputDevice::RemoveTransparenciesFromMetaFile( const GDIMetaFile& rInMtf,
 
             // execute action to get correct MapModes etc.
             pCurrAct->Execute( &aMapModeVDev );
-
+            
             pCurrAct=const_cast<GDIMetaFile&>(rInMtf).NextAction();
             ++nActionNum;
         }
 
-        ConnectedComponentsList aCCList; // list containing distinct sets of connected components as elements.
+        ConnectedComponentsList	aCCList; // list containing distinct sets of connected components as elements. 
 
         // create an OutputDevice to record mapmode changes and the like
         VirtualDevice aMapModeVDev2;
@@ -847,7 +847,7 @@ bool OutputDevice::RemoveTransparenciesFromMetaFile( const GDIMetaFile& rInMtf,
         {
             // up to and including last ink-generating background
             // action go to background component
-            aBackgroundComponent.aComponentList.push_back(
+            aBackgroundComponent.aComponentList.push_back( 
                 ::std::make_pair(
                     pCurrAct, nActionNum) );
 
@@ -864,26 +864,26 @@ bool OutputDevice::RemoveTransparenciesFromMetaFile( const GDIMetaFile& rInMtf,
 
         // iterate over all actions (start where background action
         // search left off)
-        for( ;
-             pCurrAct;
+        for( ; 
+             pCurrAct; 
              pCurrAct=const_cast<GDIMetaFile&>(rInMtf).NextAction(), ++nActionNum )
         {
             // execute action to get correct MapModes etc.
             pCurrAct->Execute( &aMapModeVDev2 );
 
-            // cache bounds of current action
+            // cache bounds of current action 
             const Rectangle aBBCurrAct( ImplCalcActionBounds(*pCurrAct, aMapModeVDev2) );
 
             // accumulate collected bounds here, initialize with current action
-            Rectangle                               aTotalBounds( aBBCurrAct ); // thus,
+            Rectangle								aTotalBounds( aBBCurrAct ); // thus,
                                                                                 // aTotalComponents.aBounds
                                                                                 // is
                                                                                 // empty
                                                                                 // for
                                                                                 // non-output-generating
                                                                                 // actions
-            bool                                    bTreatSpecial( false );
-            ConnectedComponents                     aTotalComponents;
+            bool									bTreatSpecial( false );
+            ConnectedComponents						aTotalComponents;
 
             //
             //  STAGE 2.1: Search for intersecting cc entries
@@ -903,7 +903,7 @@ bool OutputDevice::RemoveTransparenciesFromMetaFile( const GDIMetaFile& rInMtf,
             // component.
             aTotalComponents.bIsFullyTransparent = !ImplIsNotTransparent(*pCurrAct, aMapModeVDev2);
 
-            if( !aBBCurrAct.IsEmpty() &&
+            if( !aBBCurrAct.IsEmpty() &&        
                 !aTotalComponents.bIsFullyTransparent )
             {
                 if( !aBackgroundComponent.aComponentList.empty() &&
@@ -912,18 +912,18 @@ bool OutputDevice::RemoveTransparenciesFromMetaFile( const GDIMetaFile& rInMtf,
                     // it seems the background is not large enough. to
                     // be on the safe side, combine with this component.
                     aTotalBounds.Union( aBackgroundComponent.aBounds );
-
+                        
                     // extract all aCurr actions to aTotalComponents
-                    aTotalComponents.aComponentList.splice( aTotalComponents.aComponentList.end(),
+                    aTotalComponents.aComponentList.splice( aTotalComponents.aComponentList.end(), 
                                                             aBackgroundComponent.aComponentList );
-
+                        
                     if( aBackgroundComponent.bIsSpecial )
                         bTreatSpecial = true;
                 }
 
-                ConnectedComponentsList::iterator       aCurrCC;
+                ConnectedComponentsList::iterator 		aCurrCC;
                 const ConnectedComponentsList::iterator aLastCC( aCCList.end() );
-                bool                                    bSomeComponentsChanged;
+                bool									bSomeComponentsChanged;
 
                 // now, this is unfortunate: since changing anyone of
                 // the aCCList elements (e.g. by merging or addition
@@ -957,11 +957,11 @@ bool OutputDevice::RemoveTransparenciesFromMetaFile( const GDIMetaFile& rInMtf,
 
                             // calc union bounding box
                             aTotalBounds.Union( aCurrCC->aBounds );
-
+                        
                             // extract all aCurr actions to aTotalComponents
-                            aTotalComponents.aComponentList.splice( aTotalComponents.aComponentList.end(),
+                            aTotalComponents.aComponentList.splice( aTotalComponents.aComponentList.end(), 
                                                                     aCurrCC->aComponentList );
-
+                        
                             if( aCurrCC->bIsSpecial )
                                 bTreatSpecial = true;
 
@@ -1014,7 +1014,7 @@ bool OutputDevice::RemoveTransparenciesFromMetaFile( const GDIMetaFile& rInMtf,
             {
                 // added action is special and none of prev components
                 // special -> do the detailed tests
-
+                
                 // can the action handle transparency correctly
                 // (i.e. when painted on white background, does the
                 // action still look correct)?
@@ -1058,19 +1058,19 @@ bool OutputDevice::RemoveTransparenciesFromMetaFile( const GDIMetaFile& rInMtf,
 
             // set new bounds and add action to list
             aTotalComponents.aBounds = aTotalBounds;
-            aTotalComponents.aComponentList.push_back(
+            aTotalComponents.aComponentList.push_back( 
                 ::std::make_pair(
                     pCurrAct, nActionNum) );
 
             // add aTotalComponents as a new entry to aCCList
             aCCList.push_back( aTotalComponents );
 
-            DBG_ASSERT( !aTotalComponents.aComponentList.empty(),
+            DBG_ASSERT( !aTotalComponents.aComponentList.empty(), 
                         "Printer::GetPreparedMetaFile empty component" );
-            DBG_ASSERT( !aTotalComponents.aBounds.IsEmpty() ||
+            DBG_ASSERT( !aTotalComponents.aBounds.IsEmpty() || 
                         (aTotalComponents.aBounds.IsEmpty() && aTotalComponents.aComponentList.size() == 1),
                         "Printer::GetPreparedMetaFile non-output generating actions must be solitary");
-            DBG_ASSERT( !aTotalComponents.bIsFullyTransparent ||
+            DBG_ASSERT( !aTotalComponents.bIsFullyTransparent || 
                         (aTotalComponents.bIsFullyTransparent && aTotalComponents.aComponentList.size() == 1),
                         "Printer::GetPreparedMetaFile fully transparent actions must be solitary");
         }
@@ -1088,11 +1088,11 @@ bool OutputDevice::RemoveTransparenciesFromMetaFile( const GDIMetaFile& rInMtf,
         ::std::vector< const ConnectedComponents* > aCCList_MemberMap( rInMtf.GetActionCount() );
 
         // iterate over all aCCList members and their contained metaactions
-        ConnectedComponentsList::iterator       aCurr( aCCList.begin() );
+        ConnectedComponentsList::iterator 		aCurr( aCCList.begin() );
         const ConnectedComponentsList::iterator aLast( aCCList.end() );
         for( ; aCurr != aLast; ++aCurr )
         {
-            ComponentList::iterator       aCurrentAction( aCurr->aComponentList.begin() );
+            ComponentList::iterator		  aCurrentAction( aCurr->aComponentList.begin() );
             const ComponentList::iterator aLastAction( aCurr->aComponentList.end() );
             for( ; aCurrentAction != aLastAction; ++aCurrentAction )
             {
@@ -1106,7 +1106,7 @@ bool OutputDevice::RemoveTransparenciesFromMetaFile( const GDIMetaFile& rInMtf,
         //  ===========================================================
         //
 
-        ComponentList::iterator       aCurrAct( aBackgroundComponent.aComponentList.begin() );
+        ComponentList::iterator		  aCurrAct( aBackgroundComponent.aComponentList.begin() );
         const ComponentList::iterator aLastAct( aBackgroundComponent.aComponentList.end() );
         for( ; aCurrAct != aLastAct; ++aCurrAct )
         {
@@ -1127,7 +1127,7 @@ bool OutputDevice::RemoveTransparenciesFromMetaFile( const GDIMetaFile& rInMtf,
         {
             aTmpSize = mpPDFWriter->getCurPageSize();
             aTmpSize = LogicToPixel( aTmpSize, MapMode( MAP_POINT ) );
-
+            
             // also add error code to PDFWriter
             mpPDFWriter->insertError( vcl::PDFWriter::Warning_Transparency_Converted );
         }
@@ -1146,7 +1146,7 @@ bool OutputDevice::RemoveTransparenciesFromMetaFile( const GDIMetaFile& rInMtf,
         {
             if( aCurr->bIsSpecial )
             {
-                Rectangle aBoundRect( aCurr->aBounds );
+                Rectangle aBoundRect( aCurr->aBounds );            
                 aBoundRect.Intersection( aOutputRect );
 
                 const double fBmpArea( (double) aBoundRect.GetWidth() * aBoundRect.GetHeight() );
@@ -1166,18 +1166,18 @@ bool OutputDevice::RemoveTransparenciesFromMetaFile( const GDIMetaFile& rInMtf,
                     if( aBoundRect.GetWidth() && aBoundRect.GetHeight() )
                     {
                         Point           aDstPtPix( aBoundRect.TopLeft() );
-                        Size            aDstSzPix;
+                        Size			aDstSzPix;
 
-                        VirtualDevice   aMapVDev;   // here, we record only mapmode information
+                        VirtualDevice	aMapVDev;	// here, we record only mapmode information
                         aMapVDev.EnableOutput(FALSE);
 
-                        VirtualDevice   aPaintVDev; // into this one, we render.
+                        VirtualDevice 	aPaintVDev; // into this one, we render.
 
                         rOutMtf.AddAction( new MetaPushAction( PUSH_MAPMODE ) );
                         rOutMtf.AddAction( new MetaMapModeAction() );
 
                         aPaintVDev.SetDrawMode( GetDrawMode() );
-
+                
                         while( aDstPtPix.Y() <= aBoundRect.Bottom() )
                         {
                             aDstPtPix.X() = aBoundRect.Left();
@@ -1203,8 +1203,8 @@ bool OutputDevice::RemoveTransparenciesFromMetaFile( const GDIMetaFile& rInMtf,
                                     aPaintVDev.EnableOutput(FALSE);
 
                                     // iterate over all actions
-                                    for( pCurrAct=const_cast<GDIMetaFile&>(rInMtf).FirstAction(), nActionNum=0;
-                                         pCurrAct;
+                                    for( pCurrAct=const_cast<GDIMetaFile&>(rInMtf).FirstAction(), nActionNum=0; 
+                                         pCurrAct; 
                                          pCurrAct=const_cast<GDIMetaFile&>(rInMtf).NextAction(), ++nActionNum )
                                     {
                                         // enable output only for
@@ -1221,7 +1221,7 @@ bool OutputDevice::RemoveTransparenciesFromMetaFile( const GDIMetaFile& rInMtf,
                                         {
                                             pCurrAct->Execute( &aMapVDev );
 
-                                            MapMode     aMtfMap( aMapVDev.GetMapMode() );
+                                            MapMode 	aMtfMap( aMapVDev.GetMapMode() );
                                             const Point aNewOrg( aMapVDev.PixelToLogic( aDstPtPix ) );
 
                                             aMtfMap.SetOrigin( Point( -aNewOrg.X(), -aNewOrg.Y() ) );
@@ -1258,7 +1258,7 @@ bool OutputDevice::RemoveTransparenciesFromMetaFile( const GDIMetaFile& rInMtf,
                                     // scale down bitmap, if requested
                                     if( bDownsampleBitmaps )
                                     {
-                                        aBandBmp = GetDownsampledBitmap( aDstSzPix,
+                                        aBandBmp = GetDownsampledBitmap( aDstSzPix, 
                                                                          Point(), aBandBmp.GetSizePixel(),
                                                                          aBandBmp, nMaxBmpDPIX, nMaxBmpDPIY );
                                     }
@@ -1301,8 +1301,8 @@ bool OutputDevice::RemoveTransparenciesFromMetaFile( const GDIMetaFile& rInMtf,
 
         // iterate over all actions and duplicate the ones not in a
         // special aCCList member into rOutMtf
-        for( pCurrAct=const_cast<GDIMetaFile&>(rInMtf).FirstAction(), nActionNum=0;
-             pCurrAct;
+        for( pCurrAct=const_cast<GDIMetaFile&>(rInMtf).FirstAction(), nActionNum=0; 
+             pCurrAct; 
              pCurrAct=const_cast<GDIMetaFile&>(rInMtf).NextAction(), ++nActionNum )
         {
             const ConnectedComponents* pCurrAssociatedComponent = aCCList_MemberMap[nActionNum];
@@ -1347,7 +1347,7 @@ bool OutputDevice::RemoveTransparenciesFromMetaFile( const GDIMetaFile& rInMtf,
 
 // -----------------------------------------------------------------------------
 
-Bitmap OutputDevice::GetDownsampledBitmap( const Size& rDstSz,
+Bitmap OutputDevice::GetDownsampledBitmap( const Size& rDstSz, 
                                            const Point& rSrcPt, const Size& rSrcSz,
                                            const Bitmap& rBmp, long nMaxBmpDPIX, long nMaxBmpDPIY )
 {
@@ -1383,8 +1383,8 @@ Bitmap OutputDevice::GetDownsampledBitmap( const Size& rDstSz,
             const double    fMaxPixelY = aDstSizeTwip.Height() * nMaxBmpDPIY / 1440.0;
 
             // check, if the bitmap DPI exceeds the maximum DPI (allow 4 pixel rounding tolerance)
-            if( ( ( fBmpPixelX > ( fMaxPixelX + 4 ) ) ||
-                  ( fBmpPixelY > ( fMaxPixelY + 4 ) ) ) &&
+            if( ( ( fBmpPixelX > ( fMaxPixelX + 4 ) ) || 
+                  ( fBmpPixelY > ( fMaxPixelY + 4 ) ) ) && 
                 ( fBmpPixelY > 0.0 ) && ( fMaxPixelY > 0.0 ) )
             {
                 // do scaling
@@ -1441,7 +1441,7 @@ BitmapEx OutputDevice::GetDownsampledBitmapEx( const Size& rDstSz,
         {
             // do downsampling if neccessary
             Size aDstSizeTwip( PixelToLogic( LogicToPixel( rDstSz ), MAP_TWIP ) );
-
+                  
             // #103209# Normalize size (mirroring has to happen outside of this method)
             aDstSizeTwip = Size( labs(aDstSizeTwip.Width()), labs(aDstSizeTwip.Height()) );
 
@@ -1452,8 +1452,8 @@ BitmapEx OutputDevice::GetDownsampledBitmapEx( const Size& rDstSz,
             const double    fMaxPixelY = aDstSizeTwip.Height() * nMaxBmpDPIY / 1440.0;
 
             // check, if the bitmap DPI exceeds the maximum DPI (allow 4 pixel rounding tolerance)
-            if( ( ( fBmpPixelX > ( fMaxPixelX + 4 ) ) ||
-                  ( fBmpPixelY > ( fMaxPixelY + 4 ) ) ) &&
+            if( ( ( fBmpPixelX > ( fMaxPixelX + 4 ) ) || 
+                  ( fBmpPixelY > ( fMaxPixelY + 4 ) ) ) && 
                 ( fBmpPixelY > 0.0 ) && ( fMaxPixelY > 0.0 ) )
             {
                 // do scaling
diff --git a/vcl/source/gdi/print3.cxx b/vcl/source/gdi/print3.cxx
index 0aeb928856fc..4a20bb69ee9c 100755
--- a/vcl/source/gdi/print3.cxx
+++ b/vcl/source/gdi/print3.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
@@ -64,13 +64,13 @@ class ImplPageCache
         GDIMetaFile                 aPage;
         PrinterController::PageSize aSize;
     };
-
+    
     std::vector< CacheEntry >  maPages;
     std::vector< sal_Int32 >    maPageNumbers;
     std::vector< sal_Int32 >    maCacheRanking;
-
+    
     static const sal_Int32 nCacheSize = 6;
-
+    
     void updateRanking( sal_Int32 nLastHit )
     {
         if( maCacheRanking[0] != nLastHit )
@@ -85,7 +85,7 @@ class ImplPageCache
             maCacheRanking[0] = nLastHit;
         }
     }
-
+    
 public:
     ImplPageCache()
     : maPages( nCacheSize )
@@ -95,7 +95,7 @@ public:
         for( sal_Int32 i = 0; i < nCacheSize; i++ )
             maCacheRanking[i] = nCacheSize - i - 1;
     }
-
+    
     // caution: does not ensure uniqueness
     void insert( sal_Int32 i_nPageNo, const GDIMetaFile& i_rPage, const PrinterController::PageSize& i_rSize )
     {
@@ -107,7 +107,7 @@ public:
         // so update the ranking
         updateRanking( nReplacePage );
     }
-
+    
     // caution: bad algorithm; should there ever be reason to increase the cache size beyond 6
     // this needs to be urgently rewritten. However do NOT increase the cache size lightly,
     // whole pages can be rather memory intensive
@@ -125,7 +125,7 @@ public:
         }
         return false;
     }
-
+    
     void invalidate()
     {
         for( sal_Int32 i = 0; i < nCacheSize; ++i )
@@ -139,18 +139,18 @@ public:
 
 class vcl::ImplPrinterControllerData
 {
-public:
+public:    
     struct ControlDependency
     {
         rtl::OUString       maDependsOnName;
         sal_Int32           mnDependsOnEntry;
-
+        
         ControlDependency() : mnDependsOnEntry( -1 ) {}
     };
-
+    
     typedef std::hash_map< rtl::OUString, size_t, rtl::OUStringHash > PropertyToIndexMap;
     typedef std::hash_map< rtl::OUString, ControlDependency, rtl::OUStringHash > ControlDependencyMap;
-
+    
     boost::shared_ptr<Printer>                                  mpPrinter;
     Sequence< PropertyValue >                                   maUIOptions;
     std::vector< PropertyValue >                                maUIProperties;
@@ -164,26 +164,28 @@ public:
     view::PrintableState                                        meJobState;
 
     vcl::PrinterController::MultiPageSetup                      maMultiPage;
-
+    
     vcl::PrintProgressDialog*                                   mpProgress;
-
+    
     ImplPageCache                                               maPageCache;
-
+    
     // set by user through printer config dialog
     // if set, pages are centered and trimmed onto the fixed page
     Size                                                        maFixedPageSize;
     sal_Int32                                                   mnDefaultPaperBin;
-
+    sal_Int32                                                   mnFixedPaperBin;
+    
     ImplPrinterControllerData() :
         mbFirstPage( sal_True ),
         mbLastPage( sal_False ),
         mbReversePageOrder( sal_False ),
         meJobState( view::PrintableState_JOB_STARTED ),
         mpProgress( NULL ),
-        mnDefaultPaperBin( -1 )
+        mnDefaultPaperBin( -1 ),
+        mnFixedPaperBin( -1 )
     {}
     ~ImplPrinterControllerData() { delete mpProgress; }
-
+    
     Size getRealPaperSize( const Size& i_rPageSize ) const
     {
         if( maFixedPageSize.Width() > 0 && maFixedPageSize.Height() > 0 )
@@ -269,23 +271,23 @@ struct PrintJobAsync
 {
     boost::shared_ptr<PrinterController>  mpController;
     JobSetup                            maInitSetup;
-
+    
     PrintJobAsync( const boost::shared_ptr<PrinterController>& i_pController,
                    const JobSetup& i_rInitSetup
                    )
     : mpController( i_pController ), maInitSetup( i_rInitSetup )
     {}
-
+    
     DECL_LINK( ExecJob, void* );
 };
 
 IMPL_LINK( PrintJobAsync, ExecJob, void*, EMPTYARG )
 {
     Printer::ImplPrintJob( mpController, maInitSetup );
-
+    
     // clean up, do not access members after this
     delete this;
-
+    
     return 0;
 }
 
@@ -325,12 +327,12 @@ void Printer::ImplPrintJob( const boost::shared_ptr<PrinterController>& i_pContr
         }
         pController->setValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "IsDirect" ) ),
                                makeAny( sal_False ) );
-    }
-
+    }    
+    
     // setup printer
 
     // if no specific printer is already set, create one
-
+    
     // #i108686#
     // in case of a UI (platform independent or system dialog) print job, make the printer persistent over jobs
     // however if no printer was already set by the print job's originator,
@@ -351,7 +353,7 @@ void Printer::ImplPrintJob( const boost::shared_ptr<PrinterController>& i_pContr
         boost::shared_ptr<Printer> pPrinter( new Printer( aPrinterName ) );
         pController->setPrinter( pPrinter );
     }
-
+    
     // reset last page property
     i_pController->setLastPage( sal_False );
 
@@ -361,7 +363,7 @@ void Printer::ImplPrintJob( const boost::shared_ptr<PrinterController>& i_pContr
     // case 2: "All pages" is selected
     //         update "Page range" attribute to have a sensible default,
     //         but leave "All" as selected
-
+    
     // "Pages" attribute from API is now equivalent to "PageRange"
     // AND "PrintContent" = 1 except calc where it is "PrintRange" = 1
     // Argh ! That sure needs cleaning up
@@ -430,7 +432,7 @@ void Printer::ImplPrintJob( const boost::shared_ptr<PrinterController>& i_pContr
             return;
         }
     }
-
+       
     // check if the printer brings up its own dialog
     // in that case leave the work to that dialog
     if( ! pController->getPrinter()->GetCapabilities( PRINTER_CAPABILITIES_EXTERNALDIALOG ) &&
@@ -444,8 +446,7 @@ void Printer::ImplPrintJob( const boost::shared_ptr<PrinterController>& i_pContr
             if( ! aDlg.Execute() )
             {
                 GDIMetaFile aPageFile;
-                i_pController->setLastPage( sal_True );
-                i_pController->getFilteredPageFile( 0, aPageFile );
+                i_pController->abortJob();
                 return;
             }
             if( aDlg.isPrintToFile() )
@@ -453,9 +454,7 @@ void Printer::ImplPrintJob( const boost::shared_ptr<PrinterController>& i_pContr
                 rtl::OUString aFile = queryFile( pController->getPrinter().get() );
                 if( ! aFile.getLength() )
                 {
-                    GDIMetaFile aPageFile;
-                    i_pController->setLastPage( sal_True );
-                    i_pController->getFilteredPageFile( 0, aPageFile );
+                    i_pController->abortJob();
                     return;
                 }
                 pController->setValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "LocalFileName" ) ),
@@ -471,16 +470,16 @@ void Printer::ImplPrintJob( const boost::shared_ptr<PrinterController>& i_pContr
         {
         }
     }
-
+    
     pController->pushPropertiesToPrinter();
-
+    
     rtl::OUString aJobName;
     beans::PropertyValue* pJobNameVal = pController->getValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "JobName" ) ) );
     if( pJobNameVal )
         pJobNameVal->Value >>= aJobName;
-
+    
     pController->getPrinter()->StartJob( String( aJobName ), pController );
-
+    
     pController->jobFinished( pController->getJobState() );
 }
 
@@ -493,7 +492,7 @@ bool Printer::StartJob( const rtl::OUString& i_rJobName, boost::shared_ptr<vcl::
 
     if ( IsJobActive() || IsPrinting() )
         return FALSE;
-
+    
     ULONG   nCopies = mnCopyCount;
     bool    bCollateCopy = mbCollateCopy;
     bool    bUserCopy = FALSE;
@@ -531,7 +530,7 @@ bool Printer::StartJob( const rtl::OUString& i_rJobName, boost::shared_ptr<vcl::
     {
         pSingleValue->Value >>= bSinglePrintJobs;
     }
-
+    
     // remark: currently it is still possible to use EnablePrintFile and
     // SetPrintFileName to redirect printout into file
     // it can be argued that those methods should be removed in favor
@@ -553,10 +552,10 @@ bool Printer::StartJob( const rtl::OUString& i_rJobName, boost::shared_ptr<vcl::
     if ( mbPrintFile )
         pPrintFile = &maPrintFile;
 
-    maJobName               = i_rJobName;
-    mnCurPage               = 1;
-    mnCurPrintPage          = 1;
-    mbPrinting              = TRUE;
+    maJobName		        = i_rJobName;
+    mnCurPage		        = 1;
+    mnCurPrintPage	        = 1;
+    mbPrinting		        = TRUE;
     if( ImplGetSVData()->maGDIData.mbPrinterPullModel )
     {
         mbJobActive             = TRUE;
@@ -578,11 +577,11 @@ bool Printer::StartJob( const rtl::OUString& i_rJobName, boost::shared_ptr<vcl::
             if ( !mnError )
                 mnError = PRINTER_GENERALERROR;
             pSVData->mpDefInst->DestroyPrinter( mpPrinter );
-            mnCurPage           = 0;
-            mnCurPrintPage      = 0;
-            mbPrinting          = FALSE;
+            mnCurPage		    = 0;
+            mnCurPrintPage	    = 0;
+            mbPrinting		    = FALSE;
             mpPrinter = NULL;
-
+            
             return false;
         }
     }
@@ -592,7 +591,7 @@ bool Printer::StartJob( const rtl::OUString& i_rJobName, boost::shared_ptr<vcl::
         // now the real job starts
         i_pController->setJobState( view::PrintableState_JOB_STARTED );
         i_pController->jobStarted();
-
+        
         int nJobs = 1;
         int nOuterRepeatCount = 1;
         int nInnerRepeatCount = 1;
@@ -609,10 +608,10 @@ bool Printer::StartJob( const rtl::OUString& i_rJobName, boost::shared_ptr<vcl::
             nCopies = 1;
             nOuterRepeatCount = nInnerRepeatCount = 1;
         }
-
+        
         for( int nJobIteration = 0; nJobIteration < nJobs; nJobIteration++ )
         {
-            bool bError = false;
+            bool bError = false, bAborted = false;
             if( mpPrinter->StartJob( pPrintFile,
                                      i_rJobName,
                                      Application::GetDisplayName(),
@@ -624,11 +623,11 @@ bool Printer::StartJob( const rtl::OUString& i_rJobName, boost::shared_ptr<vcl::
                 mbJobActive             = TRUE;
                 i_pController->createProgressDialog();
                 int nPages = i_pController->getFilteredPageCount();
-                for( int nOuterIteration = 0; nOuterIteration < nOuterRepeatCount; nOuterIteration++ )
+                for( int nOuterIteration = 0; nOuterIteration < nOuterRepeatCount && ! bAborted; nOuterIteration++ )
                 {
-                    for( int nPage = 0; nPage < nPages; nPage++ )
+                    for( int nPage = 0; nPage < nPages && ! bAborted; nPage++ )
                     {
-                        for( int nInnerIteration = 0; nInnerIteration < nInnerRepeatCount; nInnerIteration++ )
+                        for( int nInnerIteration = 0; nInnerIteration < nInnerRepeatCount && ! bAborted; nInnerIteration++ )
                         {
                             if( nPage == nPages-1 &&
                                 nOuterIteration == nOuterRepeatCount-1 &&
@@ -638,22 +637,27 @@ bool Printer::StartJob( const rtl::OUString& i_rJobName, boost::shared_ptr<vcl::
                                 i_pController->setLastPage( sal_True );
                             }
                             i_pController->printFilteredPage( nPage );
+                            if( i_pController->isProgressCanceled() )
+                            {
+                                i_pController->abortJob();
+                                bAborted = true;
+                            }
                         }
                     }
                     // FIXME: duplex ?
                 }
                 EndJob();
-
+                
                 if( nJobIteration < nJobs-1 )
                 {
                     mpPrinter = pSVData->mpDefInst->CreatePrinter( mpInfoPrinter );
-
+                    
                     if ( mpPrinter )
                     {
-                        maJobName               = i_rJobName;
-                        mnCurPage               = 1;
-                        mnCurPrintPage          = 1;
-                        mbPrinting              = TRUE;
+                        maJobName		        = i_rJobName;
+                        mnCurPage		        = 1;
+                        mnCurPrintPage	        = 1;
+                        mbPrinting		        = TRUE;
                     }
                     else
                         bError = true;
@@ -661,7 +665,7 @@ bool Printer::StartJob( const rtl::OUString& i_rJobName, boost::shared_ptr<vcl::
             }
             else
                 bError = true;
-
+            
             if( bError )
             {
                 mnError = ImplSalPrinterErrorCodeToVCL( mpPrinter->GetErrorCode() );
@@ -672,11 +676,11 @@ bool Printer::StartJob( const rtl::OUString& i_rJobName, boost::shared_ptr<vcl::
                                             : view::PrintableState_JOB_FAILED );
                 if( mpPrinter )
                     pSVData->mpDefInst->DestroyPrinter( mpPrinter );
-                mnCurPage           = 0;
-                mnCurPrintPage      = 0;
-                mbPrinting          = FALSE;
+                mnCurPage		    = 0;
+                mnCurPrintPage	    = 0;
+                mbPrinting		    = FALSE;
                 mpPrinter = NULL;
-
+                
                 return false;
             }
         }
@@ -684,7 +688,7 @@ bool Printer::StartJob( const rtl::OUString& i_rJobName, boost::shared_ptr<vcl::
         if( i_pController->getJobState() == view::PrintableState_JOB_STARTED )
             i_pController->setJobState( view::PrintableState_JOB_SPOOLED );
     }
-
+    
     // make last used printer persistent for UI jobs
     if( i_pController->isShowDialogs() && ! i_pController->isDirectPrint() )
     {
@@ -694,7 +698,7 @@ bool Printer::StartJob( const rtl::OUString& i_rJobName, boost::shared_ptr<vcl::
                          GetName()
                          );
     }
-
+    
     return true;
 }
 
@@ -724,6 +728,7 @@ void PrinterController::setPrinter( const boost::shared_ptr<Printer>& i_rPrinter
     setValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Name" ) ),
               makeAny( rtl::OUString( i_rPrinter->GetName() ) ) );
     mpImplData->mnDefaultPaperBin = mpImplData->mpPrinter->GetPaperBin();
+    mpImplData->mnFixedPaperBin = -1;
 }
 
 bool PrinterController::setupPrinter( Window* i_pParent )
@@ -731,15 +736,20 @@ bool PrinterController::setupPrinter( Window* i_pParent )
     bool bRet = false;
     if( mpImplData->mpPrinter.get() )
     {
+        // get old data
         Size aPaperSize( mpImplData->mpPrinter->PixelToLogic(
             mpImplData->mpPrinter->GetPaperSizePixel(), MapMode( MAP_100TH_MM ) ) );
+        USHORT nPaperBin = mpImplData->mpPrinter->GetPaperBin();
+
+        // call driver setup
         bRet = mpImplData->mpPrinter->Setup( i_pParent );
         if( bRet )
         {
-            // was the papersize overridden ? if so we need to take action
+            // was papersize or bin  overridden ? if so we need to take action
             Size aNewPaperSize( mpImplData->mpPrinter->PixelToLogic(
                 mpImplData->mpPrinter->GetPaperSizePixel(), MapMode( MAP_100TH_MM ) ) );
-            if( aNewPaperSize != aPaperSize )
+            USHORT nNewPaperBin = mpImplData->mpPrinter->GetPaperBin();
+            if( aNewPaperSize != aPaperSize || nNewPaperBin != nPaperBin )
             {
                 mpImplData->maFixedPageSize = aNewPaperSize;
                 mpImplData->maPageCache.invalidate();
@@ -748,6 +758,7 @@ bool PrinterController::setupPrinter( Window* i_pParent )
                 aOverrideSize.Height = aNewPaperSize.Height();
                 setValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "OverridePageSize" ) ),
                           makeAny( aOverrideSize ) );
+                mpImplData->mnFixedPaperBin = nNewPaperBin;
             }
         }
     }
@@ -798,15 +809,15 @@ PrinterController::PageSize vcl::ImplPrinterControllerData::modifyJobSetup( cons
     {
         aPageSize.aSize.Width() = aIsSize.Width;
         aPageSize.aSize.Height() = aIsSize.Height;
-
+        
         Size aRealPaperSize( getRealPaperSize( aPageSize.aSize ) );
         if( aRealPaperSize != aCurSize )
             mpPrinter->SetPaperSizeUser( aRealPaperSize, ! isFixedPageSize() );
     }
-
+    
     if( nPaperBin != -1 && nPaperBin != mpPrinter->GetPaperBin() )
         mpPrinter->SetPaperBin( nPaperBin );
-
+    
     return aPageSize;
 }
 
@@ -843,7 +854,7 @@ PrinterController::PageSize PrinterController::getPageFile( int i_nUnfilteredPag
         mpImplData->mpProgress->tick();
         Application::Reschedule( true );
     }
-
+    
     if( i_bMayUseCache )
     {
         PrinterController::PageSize aPageSize;
@@ -856,14 +867,14 @@ PrinterController::PageSize PrinterController::getPageFile( int i_nUnfilteredPag
         mpImplData->maPageCache.invalidate();
 
     o_rMtf.Clear();
-
+    
     // get page parameters
     Sequence< PropertyValue > aPageParm( getPageParametersProtected( i_nUnfilteredPage ) );
     const MapMode aMapMode( MAP_100TH_MM );
 
     mpImplData->mpPrinter->Push();
     mpImplData->mpPrinter->SetMapMode( aMapMode );
-
+    
     // modify job setup if necessary
     PrinterController::PageSize aPageSize = mpImplData->modifyJobSetup( aPageParm );
 
@@ -879,13 +890,13 @@ PrinterController::PageSize PrinterController::getPageFile( int i_nUnfilteredPag
     o_rMtf.Stop();
     o_rMtf.WindStart();
     mpImplData->mpPrinter->Pop();
-
+    
     if( i_bMayUseCache )
         mpImplData->maPageCache.insert( i_nUnfilteredPage, o_rMtf, aPageSize );
 
     // reset "FirstPage" property to false now we've gotten at least our first one
     mpImplData->mbFirstPage = sal_False;
-
+    
     return aPageSize;
 }
 
@@ -931,14 +942,14 @@ PrinterController::PageSize PrinterController::getFilteredPageFile( int i_nFilte
     int nSubPages = rMPS.nRows * rMPS.nColumns;
     if( nSubPages < 1 )
         nSubPages = 1;
-
+    
     // reverse sheet order
     if( mpImplData->mbReversePageOrder )
     {
         int nDocPages = getFilteredPageCount();
         i_nFilteredPage = nDocPages - 1 - i_nFilteredPage;
     }
-
+    
     // there is no filtering to be done (and possibly the page size of the
     // original page is to be set), when N-Up is "neutral" that is there is
     // only one subpage and the margins are 0
@@ -956,19 +967,19 @@ PrinterController::PageSize PrinterController::getFilteredPageFile( int i_nFilte
             o_rMtf.WindStart();
             long nDX = (aPaperSize.Width() - aPageSize.aSize.Width()) / 2;
             long nDY = (aPaperSize.Height() - aPageSize.aSize.Height()) / 2;
-            o_rMtf.Move( nDX, nDY );
+            o_rMtf.Move( nDX, nDY, mpImplData->mpPrinter->ImplGetDPIX(), mpImplData->mpPrinter->ImplGetDPIY() );
             o_rMtf.WindStart();
             o_rMtf.SetPrefSize( aPaperSize );
             aPageSize.aSize = aPaperSize;
         }
         return aPageSize;
     }
-
+    
     // set last page property really only on the very last page to be rendered
     // that is on the last subpage of a NUp run
     sal_Bool bIsLastPage = mpImplData->mbLastPage;
     mpImplData->mbLastPage = sal_False;
-
+    
     Size aPaperSize( mpImplData->getRealPaperSize( mpImplData->maMultiPage.aPaperSize ) );
 
     // multi page area: page size minus margins + one time spacing right and down
@@ -990,7 +1001,7 @@ PrinterController::PageSize PrinterController::getFilteredPageFile( int i_nFilte
     o_rMtf.SetPrefSize( aPaperSize );
     o_rMtf.SetPrefMapMode( MapMode( MAP_100TH_MM ) );
     o_rMtf.AddAction( new MetaMapModeAction( MapMode( MAP_100TH_MM ) ) );
-
+    
     int nDocPages = getPageCountProtected();
     for( int nSubPage = 0; nSubPage < nSubPages; nSubPage++ )
     {
@@ -1022,22 +1033,22 @@ PrinterController::PageSize PrinterController::getFilteredPageFile( int i_nFilte
                 // scale the metafile down to a sub page size
                 double fScaleX = double(aSubPageSize.Width())/double(aPageSize.aSize.Width());
                 double fScaleY = double(aSubPageSize.Height())/double(aPageSize.aSize.Height());
-                double fScale  = std::min( fScaleX, fScaleY );
+                double fScale  = std::min( fScaleX, fScaleY ); 
                 aPageFile.Scale( fScale, fScale );
                 aPageFile.WindStart();
-
+        
                 // move the subpage so it is centered in its "cell"
                 long nOffX = (aSubPageSize.Width() - long(double(aPageSize.aSize.Width()) * fScale)) / 2;
                 long nOffY = (aSubPageSize.Height() - long(double(aPageSize.aSize.Height()) * fScale)) / 2;
                 long nX = rMPS.nLeftMargin + nOffX + nAdvX * nCellX;
                 long nY = rMPS.nTopMargin + nOffY + nAdvY * nCellY;
-                aPageFile.Move( nX, nY );
+                aPageFile.Move( nX, nY, mpImplData->mpPrinter->ImplGetDPIX(), mpImplData->mpPrinter->ImplGetDPIY() );
                 aPageFile.WindStart();
                 // calculate border rectangle
                 Rectangle aSubPageRect( Point( nX, nY ),
                                         Size( long(double(aPageSize.aSize.Width())*fScale),
                                               long(double(aPageSize.aSize.Height())*fScale) ) );
-
+        
                 // append subpage to page
                 appendSubPage( o_rMtf, aSubPageRect, aPageFile, rMPS.bDrawBorder );
             }
@@ -1048,7 +1059,7 @@ PrinterController::PageSize PrinterController::getFilteredPageFile( int i_nFilte
     // subsequent getPageFile calls have changed the paper, reset it to current value
     mpImplData->mpPrinter->SetMapMode( MapMode( MAP_100TH_MM ) );
     mpImplData->mpPrinter->SetPaperSizeUser( aPaperSize, ! mpImplData->isFixedPageSize() );
-
+    
     return PrinterController::PageSize( aPaperSize, true );
 }
 
@@ -1096,7 +1107,7 @@ ULONG PrinterController::removeTransparencies( GDIMetaFile& i_rIn, GDIMetaFile&
     if( rPrinterOptions.IsConvertToGreyscales() )
     {
         mpImplData->mpPrinter->SetDrawMode( mpImplData->mpPrinter->GetDrawMode() |
-                                            ( DRAWMODE_GRAYLINE | DRAWMODE_GRAYFILL | DRAWMODE_GRAYTEXT |
+                                            ( DRAWMODE_GRAYLINE | DRAWMODE_GRAYFILL | DRAWMODE_GRAYTEXT | 
                                               DRAWMODE_GRAYBITMAP | DRAWMODE_GRAYGRADIENT ) );
     }
 
@@ -1127,7 +1138,7 @@ void PrinterController::printFilteredPage( int i_nPage )
 {
     if( mpImplData->meJobState != view::PrintableState_JOB_STARTED )
         return;
-
+    
     GDIMetaFile aPageFile;
     PrinterController::PageSize aPageSize = getFilteredPageFile( i_nPage, aPageFile );
 
@@ -1145,30 +1156,35 @@ void PrinterController::printFilteredPage( int i_nPage )
     mpImplData->mpPrinter->SetMapMode( MAP_100TH_MM );
     // aPageSize was filtered through mpImplData->getRealPaperSize already by getFilteredPageFile()
     mpImplData->mpPrinter->SetPaperSizeUser( aPageSize.aSize, ! mpImplData->isFixedPageSize() );
+    if( mpImplData->mnFixedPaperBin != -1 &&
+        mpImplData->mpPrinter->GetPaperBin() != mpImplData->mnFixedPaperBin )
+    {
+        mpImplData->mpPrinter->SetPaperBin( mpImplData->mnFixedPaperBin );
+    }
 
-    // if full paper are is meant, move the output to accomodate for pageoffset
+    // if full paper is meant to be used, move the output to accomodate for pageoffset
     if( aPageSize.bFullPaper )
     {
         Point aPageOffset( mpImplData->mpPrinter->GetPageOffset() );
         aPageFile.WindStart();
-        aPageFile.Move( -aPageOffset.X(), -aPageOffset.Y() );
+        aPageFile.Move( -aPageOffset.X(), -aPageOffset.Y(), mpImplData->mpPrinter->ImplGetDPIX(), mpImplData->mpPrinter->ImplGetDPIY() );
     }
-
+    
     GDIMetaFile aCleanedFile;
     ULONG nRestoreDrawMode = removeTransparencies( aPageFile, aCleanedFile );
-
+    
     mpImplData->mpPrinter->EnableOutput( TRUE );
 
     // actually print the page
     mpImplData->mpPrinter->ImplStartPage();
-
+    
     mpImplData->mpPrinter->Push();
     aCleanedFile.WindStart();
     aCleanedFile.Play( mpImplData->mpPrinter.get() );
     mpImplData->mpPrinter->Pop();
-
+    
     mpImplData->mpPrinter->ImplEndPage();
-
+    
     mpImplData->mpPrinter->SetDrawMode( nRestoreDrawMode );
 }
 
@@ -1183,6 +1199,13 @@ void PrinterController::jobFinished( view::PrintableState )
 void PrinterController::abortJob()
 {
     setJobState( view::PrintableState_JOB_ABORTED );
+    // applications (well, sw) depend on a page request with "IsLastPage" = true
+    // to free resources, else they (well, sw) will crash eventually
+    setLastPage( sal_True );
+    delete mpImplData->mpProgress;
+    mpImplData->mpProgress = NULL;
+    GDIMetaFile aMtf;
+    getPageFile( 0, aMtf, false );
 }
 
 void PrinterController::setLastPage( sal_Bool i_bLastPage )
@@ -1203,7 +1226,7 @@ bool PrinterController::getReversePrint() const
 Sequence< PropertyValue > PrinterController::getJobProperties( const Sequence< PropertyValue >& i_rMergeList ) const
 {
     std::hash_set< rtl::OUString, rtl::OUStringHash > aMergeSet;
-    size_t nResultLen = size_t(i_rMergeList.getLength()) + mpImplData->maUIProperties.size() + 3;
+    size_t nResultLen = size_t(i_rMergeList.getLength()) + mpImplData->maUIProperties.size() + 3; 
     for( int i = 0; i < i_rMergeList.getLength(); i++ )
         aMergeSet.insert( i_rMergeList[i].Name );
 
@@ -1282,7 +1305,7 @@ void PrinterController::setValue( const rtl::OUString& i_rName, const Any& i_rVa
     beans::PropertyValue aVal;
     aVal.Name = i_rName;
     aVal.Value = i_rValue;
-
+    
     setValue( aVal );
 }
 
@@ -1383,7 +1406,7 @@ bool PrinterController::isUIOptionEnabled( const rtl::OUString& i_rProperty ) co
     if( prop_it != mpImplData->maPropertyToIndex.end() )
     {
         bEnabled = mpImplData->maUIPropertyEnabled[prop_it->second];
-
+        
         if( bEnabled )
         {
             // check control dependencies
@@ -1394,7 +1417,7 @@ bool PrinterController::isUIOptionEnabled( const rtl::OUString& i_rProperty ) co
                 // check if the dependency is enabled
                 // if the dependency is disabled, we are too
                 bEnabled = isUIOptionEnabled( it->second.maDependsOnName );
-
+                
                 if( bEnabled )
                 {
                     // does the dependency have the correct value ?
@@ -1413,7 +1436,7 @@ bool PrinterController::isUIOptionEnabled( const rtl::OUString& i_rProperty ) co
                             // could be a dependency on a checked boolean
                             // in this case the dependency is on a non zero for checked value
                             bEnabled = (   bDepVal && it->second.mnDependsOnEntry != 0) ||
-                                       ( ! bDepVal && it->second.mnDependsOnEntry == 0);
+                                       ( ! bDepVal && it->second.mnDependsOnEntry == 0); 
                         }
                         else
                         {
@@ -1437,7 +1460,7 @@ rtl::OUString PrinterController::getDependency( const rtl::OUString& i_rProperty
         mpImplData->maControlDependencies.find( i_rProperty );
     if( it != mpImplData->maControlDependencies.end() )
         aDependency = it->second.maDependsOnName;
-
+    
     return aDependency;
 }
 
@@ -1477,7 +1500,7 @@ rtl::OUString PrinterController::makeEnabled( const rtl::OUString& i_rProperty )
            }
         }
     }
-
+    
     return aDependency;
 }
 
@@ -1504,7 +1527,7 @@ void PrinterController::createProgressDialog()
                 bShow = ! bApi;
             }
         }
-
+        
         if( bShow && ! Application::IsHeadlessModeEnabled() )
         {
             mpImplData->mpProgress = new PrintProgressDialog( NULL, getPageCountProtected() );
@@ -1515,6 +1538,11 @@ void PrinterController::createProgressDialog()
         mpImplData->mpProgress->reset();
 }
 
+bool PrinterController::isProgressCanceled() const
+{
+    return mpImplData->mpProgress && mpImplData->mpProgress->isCanceled();
+}
+
 void PrinterController::setMultipage( const MultiPageSetup& i_rMPS )
 {
     mpImplData->maMultiPage = i_rMPS;
@@ -1548,7 +1576,7 @@ void PrinterController::pushPropertiesToPrinter()
         {
         case view::DuplexMode::OFF: mpImplData->mpPrinter->SetDuplexMode( DUPLEX_OFF ); break;
         case view::DuplexMode::LONGEDGE: mpImplData->mpPrinter->SetDuplexMode( DUPLEX_LONGEDGE ); break;
-        case view::DuplexMode::SHORTEDGE: mpImplData->mpPrinter->SetDuplexMode( DUPLEX_SHORTEDGE ); break;
+        case view::DuplexMode::SHORTEDGE: mpImplData->mpPrinter->SetDuplexMode( DUPLEX_SHORTEDGE ); break;            
         }
     }
 }
@@ -1675,7 +1703,7 @@ Any PrinterOptionsHelper::getUIControlOpt( const rtl::OUString& i_rTitle,
                                            const PropertyValue* i_pVal,
                                            const PrinterOptionsHelper::UIControlOptions& i_rControlOptions
                                            )
-{
+{    
     sal_Int32 nElements =
         1                                                               // ControlType
         + (i_rTitle.getLength() ? 1 : 0)                                // Text
@@ -1744,7 +1772,7 @@ Any PrinterOptionsHelper::getUIControlOpt( const rtl::OUString& i_rTitle,
         aCtrl[nUsed  ].Name    = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Enabled" ) );
         aCtrl[nUsed++].Value <<= sal_False;
     }
-
+    
     sal_Int32 nAddProps = i_rControlOptions.maAddProps.getLength();
     for( sal_Int32 i = 0; i < nAddProps; i++ )
         aCtrl[ nUsed++ ] = i_rControlOptions.maAddProps[i];
diff --git a/vcl/source/gdi/regband.cxx b/vcl/source/gdi/regband.cxx
index 14f45b4beafd..34ea68386c2e 100644
--- a/vcl/source/gdi/regband.cxx
+++ b/vcl/source/gdi/regband.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
@@ -55,15 +55,15 @@
 ImplRegionBand::ImplRegionBand( long nTop, long nBottom )
 {
     // save boundaries
-    mnYTop              = nTop;
-    mnYBottom           = nBottom;
+    mnYTop				= nTop;
+    mnYBottom			= nBottom;
 
     // initialize lists
-    mpNextBand          = NULL;
-    mpPrevBand          = NULL;
-    mpFirstSep          = NULL;
-    mpFirstBandPoint    = NULL;
-    mbTouched           = FALSE;
+    mpNextBand			= NULL;
+    mpPrevBand			= NULL;
+    mpFirstSep			= NULL;
+    mpFirstBandPoint	= NULL;
+    mbTouched			= FALSE;
 }
 
 // -----------------------------------------------------------------------
@@ -73,15 +73,15 @@ ImplRegionBand::ImplRegionBand(
     const bool bIgnorePoints)
 {
     // copy boundaries
-    mnYTop              = rRegionBand.mnYTop;
-    mnYBottom           = rRegionBand.mnYBottom;
-    mbTouched           = rRegionBand.mbTouched;
+    mnYTop				= rRegionBand.mnYTop;
+    mnYBottom			= rRegionBand.mnYBottom;
+    mbTouched			= rRegionBand.mbTouched;
 
     // initialisation
-    mpNextBand          = NULL;
-    mpPrevBand          = NULL;
-    mpFirstSep          = NULL;
-    mpFirstBandPoint    = NULL;
+    mpNextBand			= NULL;
+    mpPrevBand			= NULL;
+    mpFirstSep			= NULL;
+    mpFirstBandPoint	= NULL;
 
     // copy all elements of the list with separations
     ImplRegionBandSep* pNewSep;
@@ -90,11 +90,11 @@ ImplRegionBand::ImplRegionBand(
     while ( pSep )
     {
         // create new and copy data
-        pNewSep             = new ImplRegionBandSep;
-        pNewSep->mnXLeft    = pSep->mnXLeft;
-        pNewSep->mnXRight   = pSep->mnXRight;
-        pNewSep->mbRemoved  = pSep->mbRemoved;
-        pNewSep->mpNextSep  = NULL;
+        pNewSep 			= new ImplRegionBandSep;
+        pNewSep->mnXLeft	= pSep->mnXLeft;
+        pNewSep->mnXRight	= pSep->mnXRight;
+        pNewSep->mbRemoved	= pSep->mbRemoved;
+        pNewSep->mpNextSep	= NULL;
         if ( pSep == rRegionBand.mpFirstSep )
             mpFirstSep = pNewSep;
         else
@@ -116,7 +116,7 @@ ImplRegionBand::ImplRegionBand(
             pPointCopy->mnLineId = pPoint->mnLineId;
             pPointCopy->mbEndPoint = pPoint->mbEndPoint;
             pPointCopy->meLineType = pPoint->meLineType;
-
+            
             if (pPrevPointCopy != NULL)
                 pPrevPointCopy->mpNextBandPoint = pPointCopy;
             else
@@ -217,11 +217,11 @@ BOOL ImplRegionBand::InsertPoint( long nX, long nLineId,
 {
     if ( !mpFirstBandPoint )
     {
-        mpFirstBandPoint                  = new ImplRegionBandPoint;
-        mpFirstBandPoint->mnX             = nX;
-        mpFirstBandPoint->mnLineId        = nLineId;
-        mpFirstBandPoint->mbEndPoint      = bEndPoint;
-        mpFirstBandPoint->meLineType      = eLineType;
+        mpFirstBandPoint				  = new ImplRegionBandPoint;
+        mpFirstBandPoint->mnX			  = nX;
+        mpFirstBandPoint->mnLineId		  = nLineId;
+        mpFirstBandPoint->mbEndPoint	  = bEndPoint;
+        mpFirstBandPoint->meLineType	  = eLineType;
         mpFirstBandPoint->mpNextBandPoint = NULL;
         return TRUE;
     }
@@ -277,7 +277,7 @@ BOOL ImplRegionBand::InsertPoint( long nX, long nLineId,
 
     // search appropriate position and insert point into the list
     ImplRegionBandPoint* pNewRegionBandPoint;
-
+    
     pRegionBandPoint = mpFirstBandPoint;
     pLastTestedRegionBandPoint = NULL;
     while ( pRegionBandPoint )
@@ -285,12 +285,12 @@ BOOL ImplRegionBand::InsertPoint( long nX, long nLineId,
         // new point completly left? -> insert as first point
         if ( nX <= pRegionBandPoint->mnX )
         {
-            pNewRegionBandPoint                     = new ImplRegionBandPoint;
-            pNewRegionBandPoint->mnX                = nX;
-            pNewRegionBandPoint->mnLineId           = nLineId;
-            pNewRegionBandPoint->mbEndPoint         = bEndPoint;
-            pNewRegionBandPoint->meLineType         = eLineType;
-            pNewRegionBandPoint->mpNextBandPoint    = pRegionBandPoint;
+            pNewRegionBandPoint 					= new ImplRegionBandPoint;
+            pNewRegionBandPoint->mnX				= nX;
+            pNewRegionBandPoint->mnLineId			= nLineId;
+            pNewRegionBandPoint->mbEndPoint 		= bEndPoint;
+            pNewRegionBandPoint->meLineType 		= eLineType;
+            pNewRegionBandPoint->mpNextBandPoint	= pRegionBandPoint;
 
             // connections to the new point
             if ( !pLastTestedRegionBandPoint )
@@ -307,12 +307,12 @@ BOOL ImplRegionBand::InsertPoint( long nX, long nLineId,
     }
 
     // not inserted -> add to the end of the list
-    pNewRegionBandPoint                     = new ImplRegionBandPoint;
-    pNewRegionBandPoint->mnX                = nX;
-    pNewRegionBandPoint->mnLineId           = nLineId;
-    pNewRegionBandPoint->mbEndPoint         = bEndPoint;
-    pNewRegionBandPoint->meLineType         = eLineType;
-    pNewRegionBandPoint->mpNextBandPoint    = NULL;
+    pNewRegionBandPoint 					= new ImplRegionBandPoint;
+    pNewRegionBandPoint->mnX				= nX;
+    pNewRegionBandPoint->mnLineId			= nLineId;
+    pNewRegionBandPoint->mbEndPoint 		= bEndPoint;
+    pNewRegionBandPoint->meLineType 		= eLineType;
+    pNewRegionBandPoint->mpNextBandPoint	= NULL;
 
     // connections to the new point
     pLastTestedRegionBandPoint->mpNextBandPoint = pNewRegionBandPoint;
@@ -341,8 +341,8 @@ void ImplRegionBand::ScaleX( double fHorzScale )
     ImplRegionBandSep* pSep = mpFirstSep;
     while ( pSep )
     {
-        pSep->mnXLeft   = FRound( pSep->mnXLeft * fHorzScale );
-        pSep->mnXRight  = FRound( pSep->mnXRight * fHorzScale );
+        pSep->mnXLeft	= FRound( pSep->mnXLeft * fHorzScale );
+        pSep->mnXRight	= FRound( pSep->mnXRight * fHorzScale );
         pSep = pSep->mpNextSep;
     }
 }
@@ -401,11 +401,11 @@ void ImplRegionBand::Union( long nXLeft, long nXRight )
     // band empty? -> add element
     if ( !mpFirstSep )
     {
-        mpFirstSep              = new ImplRegionBandSep;
-        mpFirstSep->mnXLeft     = nXLeft;
-        mpFirstSep->mnXRight    = nXRight;
-        mpFirstSep->mbRemoved   = FALSE;
-        mpFirstSep->mpNextSep   = NULL;
+        mpFirstSep				= new ImplRegionBandSep;
+        mpFirstSep->mnXLeft 	= nXLeft;
+        mpFirstSep->mnXRight	= nXRight;
+        mpFirstSep->mbRemoved	= FALSE;
+        mpFirstSep->mpNextSep	= NULL;
         return;
     }
 
@@ -422,10 +422,10 @@ void ImplRegionBand::Union( long nXLeft, long nXRight )
         // new separation completly left? -> new separation!
         if ( nXRight < pSep->mnXLeft )
         {
-            pNewSep             = new ImplRegionBandSep;
-            pNewSep->mnXLeft    = nXLeft;
-            pNewSep->mnXRight   = nXRight;
-            pNewSep->mbRemoved  = FALSE;
+            pNewSep 			= new ImplRegionBandSep;
+            pNewSep->mnXLeft	= nXLeft;
+            pNewSep->mnXRight	= nXRight;
+            pNewSep->mbRemoved	= FALSE;
 
             pNewSep->mpNextSep = pSep;
             if ( pSep == mpFirstSep )
@@ -449,13 +449,13 @@ void ImplRegionBand::Union( long nXLeft, long nXRight )
         // not inserted, but last element? -> add to the end of the list
         if ( !pSep->mpNextSep && (nXLeft > pSep->mnXRight) )
         {
-            pNewSep             = new ImplRegionBandSep;
-            pNewSep->mnXLeft    = nXLeft;
-            pNewSep->mnXRight   = nXRight;
-            pNewSep->mbRemoved  = FALSE;
+            pNewSep 			= new ImplRegionBandSep;
+            pNewSep->mnXLeft	= nXLeft;
+            pNewSep->mnXRight	= nXRight;
+            pNewSep->mbRemoved	= FALSE;
 
-            pSep->mpNextSep     = pNewSep;
-            pNewSep->mpNextSep  = NULL;
+            pSep->mpNextSep 	= pNewSep;
+            pNewSep->mpNextSep	= NULL;
             break;
         }
 
@@ -568,10 +568,10 @@ void ImplRegionBand::Exclude( long nXLeft, long nXRight )
         {
             if ( (nXLeft >= pSep->mnXLeft) && (nXRight <= pSep->mnXRight) )
             {
-                pNewSep             = new ImplRegionBandSep;
-                pNewSep->mnXLeft    = pSep->mnXLeft;
-                pNewSep->mnXRight   = nXLeft-1;
-                pNewSep->mbRemoved  = FALSE;
+                pNewSep 			= new ImplRegionBandSep;
+                pNewSep->mnXLeft	= pSep->mnXLeft;
+                pNewSep->mnXRight	= nXLeft-1;
+                pNewSep->mbRemoved	= FALSE;
 
                 pSep->mnXLeft = nXRight+1;
 
@@ -608,29 +608,29 @@ void ImplRegionBand::XOr( long nXLeft, long nXRight )
     // order, and added four more cases. The code below references
     // those numbers via #1, #2, etc.
     //
-    // Num Mnem        newX:oldX newY:oldY  Description                                             Result          Can quit?
+    // Num Mnem        newX:oldX newY:oldY  Description                                             Result			Can quit?
     //
-    // #1  Empty band      -         -      The band is empty, thus, simply add new bandSep         just add        Yes
+    // #1  Empty band      -         -      The band is empty, thus, simply add new bandSep         just add		Yes
     //
-    // #2  apart           -         -      The rectangles are disjunct, add new one as is          just add        Yes
+    // #2  apart           -         -      The rectangles are disjunct, add new one as is          just add		Yes
     //
-    // #3  atop            ==        ==     The rectangles are _exactly_ the same, remove existing  just remove     Yes
+    // #3  atop            ==        ==     The rectangles are _exactly_ the same, remove existing  just remove		Yes
     //
-    // #4  around          <         >      The new rectangle extends the old to both sides         intersect       No
+    // #4  around          <         >      The new rectangle extends the old to both sides         intersect		No
     //
-    // #5  left            <         <      The new rectangle is left of the old (but intersects)   intersect       Yes
+    // #5  left            <         <      The new rectangle is left of the old (but intersects)   intersect		Yes
     //
-    // #5b left-atop       <         ==     The new is left of the old, and coincides on the right  intersect       Yes
+    // #5b left-atop       <         ==     The new is left of the old, and coincides on the right  intersect		Yes
     //
-    // #6  right           >         >      The new is right of the old (but intersects)            intersect       No
+    // #6  right           >         >      The new is right of the old (but intersects)			intersect		No
     //
-    // #6b right-atop      ==        >      The new is right of the old, and coincides on the left  intersect       No
+    // #6b right-atop      ==        >      The new is right of the old, and coincides on the left	intersect		No
     //
-    // #7 inside           >         <      The new is fully inside the old                         intersect       Yes
+    // #7 inside           >         <      The new is fully inside the old							intersect		Yes
     //
-    // #8 inside-right     >         ==     The new is fully inside the old, coincides on the right intersect       Yes
+    // #8 inside-right     >         ==     The new is fully inside the old, coincides on the right	intersect		Yes
     //
-    // #9 inside-left      ==        <      The new is fully inside the old, coincides on the left  intersect       Yes
+    // #9 inside-left      ==        <      The new is fully inside the old, coincides on the left	intersect		Yes
     //
     //
     // Then, to correctly perform XOr, the segment that's switched off
@@ -644,15 +644,15 @@ void ImplRegionBand::XOr( long nXLeft, long nXRight )
     // trailing band sep from 11 to 14. This mimicks the xor look of a
     // bitmap operation.
     //
-
+    
     // band empty? -> add element
     if ( !mpFirstSep )
     {
-        mpFirstSep              = new ImplRegionBandSep;
-        mpFirstSep->mnXLeft     = nXLeft;
-        mpFirstSep->mnXRight    = nXRight;
-        mpFirstSep->mbRemoved   = FALSE;
-        mpFirstSep->mpNextSep   = NULL;
+        mpFirstSep				= new ImplRegionBandSep;
+        mpFirstSep->mnXLeft 	= nXLeft;
+        mpFirstSep->mnXRight	= nXRight;
+        mpFirstSep->mbRemoved	= FALSE;
+        mpFirstSep->mpNextSep	= NULL;
         return;
     }
 
@@ -681,10 +681,10 @@ void ImplRegionBand::XOr( long nXLeft, long nXRight )
                 pNewSep->mnXRight   = nXRight;
                 pNewSep->mpNextSep  = pSep;
                 pNewSep->mbRemoved  = FALSE;
-
+            
                 // connections from the new separation
                 pNewSep->mpNextSep = pSep;
-
+            
                 // connections to the new separation
                 if ( pSep == mpFirstSep )
                     mpFirstSep = pNewSep;
@@ -734,7 +734,7 @@ void ImplRegionBand::XOr( long nXLeft, long nXRight )
                 else
                 {
                     pSep->mnXLeft = nXRight+1; // 9
-
+                
                     pPrevSep = NULL; // do not run accidentally into the "right" case when breaking the loop
                     break;
                 }
@@ -746,7 +746,7 @@ void ImplRegionBand::XOr( long nXLeft, long nXRight )
                             "ImplRegionBand::XOr(): Case 4,5,6,7 expected all coordinates to be not equal!" );
 
                 // The plain-jane check would look like this:
-                //
+                // 
                 // if( nXLeft < nOldLeft )
                 // {
                 //     // #4,5
@@ -771,7 +771,7 @@ void ImplRegionBand::XOr( long nXLeft, long nXRight )
                 //         // #7 done!
                 //     }
                 // }
-                //
+                // 
                 // but since we generally don't have to care whether
                 // it's 4 or 6 (only that we must not stop processing
                 // here), condensed that in such a way that only the
@@ -810,16 +810,16 @@ void ImplRegionBand::XOr( long nXLeft, long nXRight )
                     pNewSep->mnXRight   = nXRight;
                     pNewSep->mpNextSep  = pSep->mpNextSep;
                     pNewSep->mbRemoved  = FALSE;
-
+                
                     // connections from the new separation
                     pSep->mpNextSep = pNewSep;
-
+                
                     pPrevSep = NULL; // do not run accidentally into the "right" case when breaking the loop
                     break;
                 }
             }
         }
-
+        
         pPrevSep = pSep;
         pSep = pSep->mpNextSep;
     }
@@ -832,11 +832,11 @@ void ImplRegionBand::XOr( long nXLeft, long nXRight )
         pNewSep->mnXRight   = nXRight;
         pNewSep->mpNextSep  = NULL;
         pNewSep->mbRemoved  = FALSE;
-
+        
         // connections from the new separation
         pPrevSep->mpNextSep = pNewSep;
     }
-
+    
     OptimizeBand();
 }
 
@@ -914,8 +914,8 @@ long ImplRegionBand::GetXRightBoundary() const
 
 BOOL ImplRegionBand::operator==( const ImplRegionBand& rRegionBand ) const
 {
-    ImplRegionBandSep*   pOwnRectBandSep = mpFirstSep;
-    ImplRegionBandSep*   pSecondRectBandSep = rRegionBand.mpFirstSep;
+    ImplRegionBandSep*	 pOwnRectBandSep = mpFirstSep;
+    ImplRegionBandSep*	 pSecondRectBandSep = rRegionBand.mpFirstSep;
     while ( pOwnRectBandSep && pSecondRectBandSep )
     {
         // get boundaries of current rectangle
diff --git a/vcl/source/gdi/region.cxx b/vcl/source/gdi/region.cxx
index 4931ee66e93f..372c771624de 100644
--- a/vcl/source/gdi/region.cxx
+++ b/vcl/source/gdi/region.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
@@ -87,7 +87,7 @@ bool ImplIsPolygonRectilinear (const PolyPolygon& rPolyPoly)
     const USHORT nPolyCount = rPolyPoly.Count();
     for (USHORT nPoly = 0; nPoly < nPolyCount; ++nPoly)
     {
-        const Polygon&  aPoly = rPolyPoly.GetObject(nPoly);
+        const Polygon&	aPoly = rPolyPoly.GetObject(nPoly);
 
         // Iterate over all edges of the current polygon.
         const USHORT nSize = aPoly.GetSize();
@@ -191,7 +191,7 @@ ImplRegion* ImplRectilinearPolygonToBands (const PolyPolygon& rPolyPoly)
     const USHORT nPolyCount = rPolyPoly.Count();
     for (USHORT nPoly = 0; nPoly < nPolyCount; ++nPoly)
     {
-        const Polygon&  aPoly = rPolyPoly.GetObject(nPoly);
+        const Polygon&	aPoly = rPolyPoly.GetObject(nPoly);
 
         // Iterate over all edges of the current polygon.
         const USHORT nSize = aPoly.GetSize();
@@ -221,7 +221,7 @@ ImplRegion* ImplRectilinearPolygonToBands (const PolyPolygon& rPolyPoly)
             const long nTop (::std::min(aStart.Y(), aEnd.Y()));
             const long nBottom (::std::max(aStart.Y(), aEnd.Y()));
             const LineType eLineType (aStart.Y() > aEnd.Y() ? LINE_DESCENDING : LINE_ASCENDING);
-
+        
             // Make sure that the current line is covered by bands.
             ImplAddMissingBands(pImplRegion, nTop,nBottom);
 
@@ -289,14 +289,14 @@ ImplRegion* ImplGeneralPolygonToBands (
     // initialisation and creation of Bands
     ImplRegion* pImplRegion = new ImplRegion();
     pImplRegion->CreateBandRange( rPolygonBoundingBox.Top(), rPolygonBoundingBox.Bottom() );
-
+            
     // insert polygons
     const USHORT nPolyCount = rPolyPoly.Count();
     for ( USHORT nPoly = 0; nPoly < nPolyCount; nPoly++ )
     {
         // get reference to current polygon
-        const Polygon&  aPoly = rPolyPoly.GetObject( nPoly );
-        const USHORT    nSize = aPoly.GetSize();
+        const Polygon&	aPoly = rPolyPoly.GetObject( nPoly );
+        const USHORT	nSize = aPoly.GetSize();
 
         // not enough points ( <= 2 )? -> nothing to do!
         if ( nSize <= 2 )
@@ -325,7 +325,7 @@ ImplRegion* ImplGeneralPolygonToBands (
 #ifdef DBG_UTIL
 const char* ImplDbgTestRegion( const void* pObj )
 {
-    Region*       pRegion = (Region*)pObj;
+    Region* 	  pRegion = (Region*)pObj;
     ImplRegion*   pImplRegion = pRegion->ImplGetImplRegion();
 
     if ( aImplNullRegion.mnRefCount )
@@ -343,8 +343,8 @@ const char* ImplDbgTestRegion( const void* pObj )
 
     if ( (pImplRegion != &aImplEmptyRegion) && (pImplRegion != &aImplNullRegion) )
     {
-        ULONG                   nCount = 0;
-        const ImplRegionBand*   pBand = pImplRegion->ImplGetFirstRegionBand();
+        ULONG					nCount = 0;
+        const ImplRegionBand*	pBand = pImplRegion->ImplGetFirstRegionBand();
         while ( pBand )
         {
             if ( pBand->mnYBottom < pBand->mnYTop )
@@ -425,27 +425,27 @@ inline void Region::ImplPolyPolyRegionToBandRegion()
 // =======================================================================
 
 ImplRegionBase::ImplRegionBase( int nRefCount )
-:   mnRefCount( nRefCount )
-,   mnRectCount( 0 )
-,   mpPolyPoly( NULL )
-,   mpB2DPolyPoly( NULL )
+:	mnRefCount( nRefCount )
+,	mnRectCount( 0 )
+,	mpPolyPoly( NULL )
+,	mpB2DPolyPoly( NULL )
 {}
 
 // ------------------------------------------------------------------------
 
 ImplRegion::ImplRegion()
 {
-    mpFirstBand         = NULL;
-    mpLastCheckedBand   = NULL;
+    mpFirstBand 		= NULL;
+    mpLastCheckedBand	= NULL;
 }
 
 // ------------------------------------------------------------------------
 
 ImplRegion::ImplRegion( const PolyPolygon& rPolyPoly )
 {
-    mpFirstBand         = NULL;
-    mpLastCheckedBand   = NULL;
-    mpPolyPoly          = new PolyPolygon( rPolyPoly );
+    mpFirstBand 		= NULL;
+    mpLastCheckedBand	= NULL;
+    mpPolyPoly			= new PolyPolygon( rPolyPoly );
 }
 
 // ------------------------------------------------------------------------
@@ -460,7 +460,7 @@ ImplRegion::ImplRegion( const basegfx::B2DPolyPolygon& rPolyPoly )
 // -----------------------------------------------------------------------
 
 ImplRegion::ImplRegion( const ImplRegion& rImplRegion )
-:   ImplRegionBase()
+:	ImplRegionBase()
 {
     mpFirstBand = NULL;
     mpLastCheckedBand = NULL;
@@ -582,20 +582,20 @@ BOOL ImplRegion::InsertLine( const Point& rStartPt, const Point& rEndPt,
     }
     else if ( rStartPt.Y() != rEndPt.Y() )
     {
-        const long  nDX = labs( rEndPt.X() - rStartPt.X() );
-        const long  nDY = labs( rEndPt.Y() - rStartPt.Y() );
-        const long  nStartX = rStartPt.X();
-        const long  nStartY = rStartPt.Y();
-        const long  nEndX = rEndPt.X();
-        const long  nEndY = rEndPt.Y();
-        const long  nXInc = ( nStartX < nEndX ) ? 1L : -1L;
-        const long  nYInc = ( nStartY < nEndY ) ? 1L : -1L;
+        const long	nDX = labs( rEndPt.X() - rStartPt.X() );
+        const long	nDY = labs( rEndPt.Y() - rStartPt.Y() );
+        const long	nStartX = rStartPt.X();
+        const long	nStartY = rStartPt.Y();
+        const long	nEndX = rEndPt.X();
+        const long	nEndY = rEndPt.Y();
+        const long	nXInc = ( nStartX < nEndX ) ? 1L : -1L;
+        const long	nYInc = ( nStartY < nEndY ) ? 1L : -1L;
 
         if ( nDX >= nDY )
         {
-            const long  nDYX = ( nDY - nDX ) << 1;
-            const long  nDY2 = nDY << 1;
-            long        nD = nDY2 - nDX;
+            const long	nDYX = ( nDY - nDX ) << 1;
+            const long	nDY2 = nDY << 1;
+            long		nD = nDY2 - nDX;
 
             for ( nX = nStartX, nY = nStartY; nX != nEndX; nX += nXInc )
             {
@@ -609,9 +609,9 @@ BOOL ImplRegion::InsertLine( const Point& rStartPt, const Point& rEndPt,
         }
         else
         {
-            const long  nDYX = ( nDX - nDY ) << 1;
-            const long  nDY2 = nDX << 1;
-            long        nD = nDY2 - nDY;
+            const long	nDYX = ( nDX - nDY ) << 1;
+            const long	nDY2 = nDX << 1;
+            long		nD = nDY2 - nDY;
 
             for ( nX = nStartX, nY = nStartY; nY != nEndY; nY += nYInc )
             {
@@ -1183,10 +1183,10 @@ void Region::ImplCreateRectRegion( const Rectangle& rRect )
     else
     {
         // get justified rectangle
-        long nTop       = Min( rRect.Top(), rRect.Bottom() );
-        long nBottom    = Max( rRect.Top(), rRect.Bottom() );
-        long nLeft      = Min( rRect.Left(), rRect.Right() );
-        long nRight     = Max( rRect.Left(), rRect.Right() );
+        long nTop		= Min( rRect.Top(), rRect.Bottom() );
+        long nBottom	= Max( rRect.Top(), rRect.Bottom() );
+        long nLeft		= Min( rRect.Left(), rRect.Right() );
+        long nRight 	= Max( rRect.Left(), rRect.Right() );
 
         // create instance of implementation class
         mpImplRegion = new ImplRegion();
@@ -1387,10 +1387,10 @@ BOOL Region::Union( const Rectangle& rRect )
         ImplCopyData();
 
     // get justified rectangle
-    long nLeft      = Min( rRect.Left(), rRect.Right() );
-    long nTop       = Min( rRect.Top(), rRect.Bottom() );
-    long nRight     = Max( rRect.Left(), rRect.Right() );
-    long nBottom    = Max( rRect.Top(), rRect.Bottom() );
+    long nLeft		= Min( rRect.Left(), rRect.Right() );
+    long nTop		= Min( rRect.Top(), rRect.Bottom() );
+    long nRight 	= Max( rRect.Left(), rRect.Right() );
+    long nBottom	= Max( rRect.Top(), rRect.Bottom() );
 
     // insert bands if the boundaries are not allready in the list
     mpImplRegion->InsertBands( nTop, nBottom );
@@ -1454,10 +1454,10 @@ BOOL Region::Intersect( const Rectangle& rRect )
         return TRUE;
 
     // get justified rectangle
-    long nLeft      = Min( rRect.Left(), rRect.Right() );
-    long nTop       = Min( rRect.Top(), rRect.Bottom() );
-    long nRight     = Max( rRect.Left(), rRect.Right() );
-    long nBottom    = Max( rRect.Top(), rRect.Bottom() );
+    long nLeft		= Min( rRect.Left(), rRect.Right() );
+    long nTop		= Min( rRect.Top(), rRect.Bottom() );
+    long nRight 	= Max( rRect.Left(), rRect.Right() );
+    long nBottom	= Max( rRect.Top(), rRect.Bottom() );
 
     // is own region NULL-region? -> copy data!
     if ( mpImplRegion == &aImplNullRegion )
@@ -1540,10 +1540,10 @@ BOOL Region::Exclude( const Rectangle& rRect )
         ImplCopyData();
 
     // get justified rectangle
-    long nLeft      = Min( rRect.Left(), rRect.Right() );
-    long nTop       = Min( rRect.Top(), rRect.Bottom() );
-    long nRight     = Max( rRect.Left(), rRect.Right() );
-    long nBottom    = Max( rRect.Top(), rRect.Bottom() );
+    long nLeft		= Min( rRect.Left(), rRect.Right() );
+    long nTop		= Min( rRect.Top(), rRect.Bottom() );
+    long nRight 	= Max( rRect.Left(), rRect.Right() );
+    long nBottom	= Max( rRect.Top(), rRect.Bottom() );
 
     // insert bands if the boundaries are not allready in the list
     mpImplRegion->InsertBands( nTop, nBottom );
@@ -1582,10 +1582,10 @@ BOOL Region::XOr( const Rectangle& rRect )
         ImplCopyData();
 
     // get justified rectangle
-    long nLeft      = Min( rRect.Left(), rRect.Right() );
-    long nTop       = Min( rRect.Top(), rRect.Bottom() );
-    long nRight     = Max( rRect.Left(), rRect.Right() );
-    long nBottom    = Max( rRect.Top(), rRect.Bottom() );
+    long nLeft		= Min( rRect.Left(), rRect.Right() );
+    long nTop		= Min( rRect.Top(), rRect.Bottom() );
+    long nRight 	= Max( rRect.Left(), rRect.Right() );
+    long nBottom	= Max( rRect.Top(), rRect.Bottom() );
 
     // insert bands if the boundaries are not allready in the list
     mpImplRegion->InsertBands( nTop, nBottom );
@@ -1662,7 +1662,7 @@ BOOL Region::Intersect( const Region& rRegion )
     // same instance data? -> nothing to do!
     if ( mpImplRegion == rRegion.mpImplRegion )
         return TRUE;
-
+    
     ImplPolyPolyRegionToBandRegion();
     ((Region*)&rRegion)->ImplPolyPolyRegionToBandRegion();
 
@@ -1926,7 +1926,7 @@ Rectangle Region::GetBoundRect() const
         return aRect;
 
     // get the boundaries of the first band
-    long nYTop    = mpImplRegion->mpFirstBand->mnYTop;
+    long nYTop	  = mpImplRegion->mpFirstBand->mnYTop;
     long nYBottom = mpImplRegion->mpFirstBand->mnYBottom;
     long nXLeft   = mpImplRegion->mpFirstBand->GetXLeftBoundary();
     long nXRight  = mpImplRegion->mpFirstBand->GetXRightBoundary();
@@ -1935,9 +1935,9 @@ Rectangle Region::GetBoundRect() const
     ImplRegionBand* pBand = mpImplRegion->mpFirstBand->mpNextBand;
     while ( pBand )
     {
-        nYBottom    = pBand->mnYBottom;
-        nXLeft      = Min( nXLeft, pBand->GetXLeftBoundary() );
-        nXRight     = Max( nXRight, pBand->GetXRightBoundary() );
+        nYBottom	= pBand->mnYBottom;
+        nXLeft		= Min( nXLeft, pBand->GetXLeftBoundary() );
+        nXRight 	= Max( nXRight, pBand->GetXRightBoundary() );
 
         pBand = pBand->mpNextBand;
     }
@@ -1999,7 +1999,7 @@ const basegfx::B2DPolyPolygon Region::GetB2DPolyPolygon() const
         // TODO: cache the converted polygon?
         // mpImplRegion->mpB2DPolyPoly = aRet;
     }
-
+  
     return aRet;
 }
 
@@ -2025,7 +2025,7 @@ basegfx::B2DPolyPolygon Region::ConvertToB2DPolyPolygon()
         }
         EndEnumRects( aHdl );
     }
-
+  
     return aRet;
 }
 
@@ -2048,17 +2048,17 @@ BOOL Region::ImplGetFirstRect( ImplRegionInfo& rImplRegionInfo,
         return FALSE;
 
     // initialise pointer for first access
-    ImplRegionBand*     pCurrRectBand = mpImplRegion->mpFirstBand;
-    ImplRegionBandSep*  pCurrRectBandSep = pCurrRectBand->mpFirstSep;
+    ImplRegionBand* 	pCurrRectBand = mpImplRegion->mpFirstBand;
+    ImplRegionBandSep*	pCurrRectBandSep = pCurrRectBand->mpFirstSep;
 
     DBG_ASSERT( pCurrRectBandSep != NULL, "Erstes Band wurde nicht optimiert." );
     if ( !pCurrRectBandSep )
         return FALSE;
 
     // get boundaries of current rectangle
-    rX      = pCurrRectBandSep->mnXLeft;
-    rY      = pCurrRectBand->mnYTop;
-    rWidth  = pCurrRectBandSep->mnXRight - pCurrRectBandSep->mnXLeft + 1;
+    rX		= pCurrRectBandSep->mnXLeft;
+    rY		= pCurrRectBand->mnYTop;
+    rWidth	= pCurrRectBandSep->mnXRight - pCurrRectBandSep->mnXLeft + 1;
     rHeight = pCurrRectBand->mnYBottom - pCurrRectBand->mnYTop + 1;
 
     // save pointers
@@ -2081,8 +2081,8 @@ BOOL Region::ImplGetNextRect( ImplRegionInfo& rImplRegionInfo,
         return FALSE;
 
     // get last pointers
-    ImplRegionBand*     pCurrRectBand = (ImplRegionBand*)rImplRegionInfo.mpVoidCurrRectBand;
-    ImplRegionBandSep*  pCurrRectBandSep = (ImplRegionBandSep*)rImplRegionInfo.mpVoidCurrRectBandSep;
+    ImplRegionBand* 	pCurrRectBand = (ImplRegionBand*)rImplRegionInfo.mpVoidCurrRectBand;
+    ImplRegionBandSep*	pCurrRectBandSep = (ImplRegionBandSep*)rImplRegionInfo.mpVoidCurrRectBandSep;
 
     // get next separation from current band
     pCurrRectBandSep = pCurrRectBandSep->mpNextSep;
@@ -2102,9 +2102,9 @@ BOOL Region::ImplGetNextRect( ImplRegionInfo& rImplRegionInfo,
     }
 
     // get boundaries of current rectangle
-    rX      = pCurrRectBandSep->mnXLeft;
-    rY      = pCurrRectBand->mnYTop;
-    rWidth  = pCurrRectBandSep->mnXRight - pCurrRectBandSep->mnXLeft + 1;
+    rX		= pCurrRectBandSep->mnXLeft;
+    rY		= pCurrRectBand->mnYTop;
+    rWidth	= pCurrRectBandSep->mnXRight - pCurrRectBandSep->mnXLeft + 1;
     rHeight = pCurrRectBand->mnYBottom - pCurrRectBand->mnYTop + 1;
 
     // save new pointers
@@ -2326,10 +2326,10 @@ BOOL Region::operator==( const Region& rRegion ) const
     }
 
     // initialise pointers
-    ImplRegionBand*      pOwnRectBand = mpImplRegion->mpFirstBand;
-    ImplRegionBandSep*   pOwnRectBandSep = pOwnRectBand->mpFirstSep;
-    ImplRegionBand*      pSecondRectBand = rRegion.mpImplRegion->mpFirstBand;
-    ImplRegionBandSep*   pSecondRectBandSep = pSecondRectBand->mpFirstSep;
+    ImplRegionBand* 	 pOwnRectBand = mpImplRegion->mpFirstBand;
+    ImplRegionBandSep*	 pOwnRectBandSep = pOwnRectBand->mpFirstSep;
+    ImplRegionBand* 	 pSecondRectBand = rRegion.mpImplRegion->mpFirstBand;
+    ImplRegionBandSep*	 pSecondRectBandSep = pSecondRectBand->mpFirstSep;
     while ( pOwnRectBandSep && pSecondRectBandSep )
     {
         // get boundaries of current rectangle
@@ -2399,9 +2399,9 @@ SvStream& operator>>( SvStream& rIStrm, Region& rRegion )
 {
     DBG_CHKOBJ( &rRegion, Region, ImplDbgTestRegion );
 
-    VersionCompat   aCompat( rIStrm, STREAM_READ );
-    UINT16          nVersion;
-    UINT16          nTmp16;
+    VersionCompat	aCompat( rIStrm, STREAM_READ );
+    UINT16			nVersion;
+    UINT16			nTmp16;
 
     // statische Object haben RefCount von 0
     if ( rRegion.mpImplRegion->mnRefCount )
@@ -2479,7 +2479,7 @@ SvStream& operator>>( SvStream& rIStrm, Region& rRegion )
                         rRegion.mpImplRegion->mnRectCount++;
                     }
                 }
-
+                
                 if( rIStrm.IsEof() )
                 {
                     DBG_ERROR( "premature end of region stream" );
@@ -2560,7 +2560,7 @@ SvStream& operator<<( SvStream& rOStrm, const Region& rRegion )
 
         // put endmarker
         rOStrm << (UINT16) STREAMENTRY_END;
-
+        
         // write polypolygon if available
         const BOOL bHasPolyPolygon = rRegion.HasPolyPolygon();
         rOStrm << bHasPolyPolygon;
@@ -2570,7 +2570,7 @@ SvStream& operator<<( SvStream& rOStrm, const Region& rRegion )
             // #i105373#
             PolyPolygon aNoCurvePolyPolygon;
             rRegion.GetPolyPolygon().AdaptiveSubdivide(aNoCurvePolyPolygon);
-
+            
             rOStrm << aNoCurvePolyPolygon;
         }
     }
@@ -2786,7 +2786,7 @@ RegionHandle Region::BeginEnumRects()
 
     ImplRegionHandle* pData = new ImplRegionHandle;
     pData->mpRegion = new Region( *this );
-    pData->mbFirst  = TRUE;
+    pData->mbFirst	= TRUE;
 
     // save pointers
     pData->mpCurrRectBand = pData->mpRegion->mpImplRegion->mpFirstBand;
@@ -2828,10 +2828,10 @@ BOOL Region::GetEnumRects( RegionHandle pVoidData, Rectangle& rRect )
     }
 
     // get boundaries of current rectangle
-    rRect.Top()     = pData->mpCurrRectBand->mnYTop;
-    rRect.Bottom()  = pData->mpCurrRectBand->mnYBottom;
-    rRect.Left()    = pData->mpCurrRectBandSep->mnXLeft;
-    rRect.Right()   = pData->mpCurrRectBandSep->mnXRight;
+    rRect.Top() 	= pData->mpCurrRectBand->mnYTop;
+    rRect.Bottom()	= pData->mpCurrRectBand->mnYBottom;
+    rRect.Left()	= pData->mpCurrRectBandSep->mnXLeft;
+    rRect.Right()	= pData->mpCurrRectBandSep->mnXRight;
     return TRUE;
 }
 
@@ -2900,13 +2900,13 @@ static inline bool ImplPolygonRectTest( const Polygon& rPoly, Rectangle* pRectOu
 Region Region::GetRegionFromPolyPolygon( const PolyPolygon& rPolyPoly )
 {
     //return Region( rPolyPoly );
-
+    
     // check if it's worth extracting the XOr'ing the Rectangles
     // empiricism shows that break even between XOr'ing rectangles separately
     // and ImplPolyPolyRegionToBandRegion is at half rectangles/half polygons
     int nPolygonRects = 0, nPolygonPolygons = 0;
     int nPolygons = rPolyPoly.Count();
-
+    
     for( USHORT i = 0; i < nPolygons; i++ )
     {
         const Polygon& rPoly = rPolyPoly[i];
@@ -2917,7 +2917,7 @@ Region Region::GetRegionFromPolyPolygon( const PolyPolygon& rPolyPoly )
     }
     if( nPolygonPolygons > nPolygonRects )
         return Region( rPolyPoly );
-
+    
     Region aResult;
     Rectangle aRect;
     for( USHORT i = 0; i < nPolygons; i++ )
diff --git a/vcl/source/gdi/salgdilayout.cxx b/vcl/source/gdi/salgdilayout.cxx
index 97e11c5a6aa4..e0fff311459f 100755
--- a/vcl/source/gdi/salgdilayout.cxx
+++ b/vcl/source/gdi/salgdilayout.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
@@ -76,7 +76,7 @@ SalFrameGeometry SalFrame::GetGeometry()
 
 // ----------------------------------------------------------------------------
 
-SalGraphics::SalGraphics()
+SalGraphics::SalGraphics() 
 :   m_nLayout( 0 ),
     m_bAntiAliasB2DDraw(false)
 {
@@ -280,7 +280,7 @@ basegfx::B2DPoint SalGraphics::mirror( const basegfx::B2DPoint& i_rPoint, const
         w = i_pOutDev->GetOutputWidthPixel();
     else
         w = GetGraphicsWidth();
-
+    
     DBG_ASSERT( w, "missing graphics width" );
 
     basegfx::B2DPoint aRet( i_rPoint );
@@ -309,9 +309,9 @@ basegfx::B2DPolygon SalGraphics::mirror( const basegfx::B2DPolygon& i_rPoly, con
         w = i_pOutDev->GetOutputWidthPixel();
     else
         w = GetGraphicsWidth();
-
+    
     DBG_ASSERT( w, "missing graphics width" );
-
+    
     basegfx::B2DPolygon aRet;
     if( w )
     {
@@ -320,9 +320,9 @@ basegfx::B2DPolygon SalGraphics::mirror( const basegfx::B2DPolygon& i_rPoly, con
         {
             aRet.append( mirror( i_rPoly.getB2DPoint( i ), i_pOutDev, i_bBack ) );
             if( i_rPoly.isPrevControlPointUsed( i ) )
-                aRet.setPrevControlPoint( i, mirror( i_rPoly.getPrevControlPoint( i ), i_pOutDev, i_bBack ) );
+                aRet.setPrevControlPoint( i, mirror( i_rPoly.getPrevControlPoint( i ), i_pOutDev, i_bBack ) ); 
             if( i_rPoly.isNextControlPointUsed( i ) )
-                aRet.setNextControlPoint( i, mirror( i_rPoly.getNextControlPoint( i ), i_pOutDev, i_bBack ) );
+                aRet.setNextControlPoint( i, mirror( i_rPoly.getNextControlPoint( i ), i_pOutDev, i_bBack ) ); 
         }
         aRet.setClosed( i_rPoly.isClosed() );
         aRet.flip();
@@ -339,9 +339,9 @@ basegfx::B2DPolyPolygon SalGraphics::mirror( const basegfx::B2DPolyPolygon& i_rP
         w = i_pOutDev->GetOutputWidthPixel();
     else
         w = GetGraphicsWidth();
-
+    
     DBG_ASSERT( w, "missing graphics width" );
-
+    
     basegfx::B2DPolyPolygon aRet;
     if( w )
     {
@@ -358,9 +358,9 @@ basegfx::B2DPolyPolygon SalGraphics::mirror( const basegfx::B2DPolyPolygon& i_rP
 
 // ----------------------------------------------------------------------------
 
-BOOL    SalGraphics::UnionClipRegion( long nX, long nY, long nWidth, long nHeight, const OutputDevice *pOutDev )
+BOOL	SalGraphics::UnionClipRegion( long nX, long nY, long nWidth, long nHeight, const OutputDevice *pOutDev )
 {
-    if( (m_nLayout & SAL_LAYOUT_BIDI_RTL) || (pOutDev && pOutDev->IsRTLEnabled()) )
+    if( (m_nLayout & SAL_LAYOUT_BIDI_RTL) || (pOutDev && pOutDev->IsRTLEnabled()) ) 
         mirror( nX, nWidth, pOutDev );
     return unionClipRegion( nX, nY, nWidth, nHeight );
 }
@@ -376,19 +376,19 @@ BOOL SalGraphics::UnionClipRegion( const ::basegfx::B2DPolyPolygon& rPoly, const
     return unionClipRegion( rPoly );
 }
 
-void    SalGraphics::DrawPixel( long nX, long nY, const OutputDevice *pOutDev )
+void	SalGraphics::DrawPixel( long nX, long nY, const OutputDevice *pOutDev )
 {
     if( (m_nLayout & SAL_LAYOUT_BIDI_RTL) || (pOutDev && pOutDev->IsRTLEnabled()) )
         mirror( nX, pOutDev );
     drawPixel( nX, nY );
 }
-void    SalGraphics::DrawPixel( long nX, long nY, SalColor nSalColor, const OutputDevice *pOutDev )
+void	SalGraphics::DrawPixel( long nX, long nY, SalColor nSalColor, const OutputDevice *pOutDev )
 {
     if( (m_nLayout & SAL_LAYOUT_BIDI_RTL) || (pOutDev && pOutDev->IsRTLEnabled()) )
         mirror( nX, pOutDev );
     drawPixel( nX, nY, nSalColor );
 }
-void    SalGraphics::DrawLine( long nX1, long nY1, long nX2, long nY2, const OutputDevice *pOutDev )
+void	SalGraphics::DrawLine( long nX1, long nY1, long nX2, long nY2, const OutputDevice *pOutDev )
 {
     if( (m_nLayout & SAL_LAYOUT_BIDI_RTL) || (pOutDev && pOutDev->IsRTLEnabled()) )
     {
@@ -397,16 +397,16 @@ void    SalGraphics::DrawLine( long nX1, long nY1, long nX2, long nY2, const Out
     }
     drawLine( nX1, nY1, nX2, nY2 );
 }
-void    SalGraphics::DrawRect( long nX, long nY, long nWidth, long nHeight, const OutputDevice *pOutDev )
+void	SalGraphics::DrawRect( long nX, long nY, long nWidth, long nHeight, const OutputDevice *pOutDev )
 {
     if( (m_nLayout & SAL_LAYOUT_BIDI_RTL) || (pOutDev && pOutDev->IsRTLEnabled()) )
         mirror( nX, nWidth, pOutDev );
     drawRect( nX, nY, nWidth, nHeight );
 }
-bool SalGraphics::drawPolyLine(
+bool SalGraphics::drawPolyLine( 
     const basegfx::B2DPolygon& /*rPolyPolygon*/,
     double /*fTransparency*/,
-    const basegfx::B2DVector& /*rLineWidths*/,
+    const basegfx::B2DVector& /*rLineWidths*/, 
     basegfx::B2DLineJoin /*eLineJoin*/)
 {
     return false;
@@ -417,7 +417,7 @@ void SalGraphics::DrawPolyLine( ULONG nPoints, const SalPoint* pPtAry, const Out
     if( (m_nLayout & SAL_LAYOUT_BIDI_RTL) || (pOutDev && pOutDev->IsRTLEnabled()) )
     {
         SalPoint* pPtAry2 = new SalPoint[nPoints];
-        BOOL bCopied = mirror( nPoints, pPtAry, pPtAry2, pOutDev );
+        BOOL bCopied = mirror( nPoints, pPtAry, pPtAry2, pOutDev ); 
         drawPolyLine( nPoints, bCopied ? pPtAry2 : pPtAry );
         delete [] pPtAry2;
     }
@@ -430,7 +430,7 @@ void SalGraphics::DrawPolygon( ULONG nPoints, const SalPoint* pPtAry, const Outp
     if( (m_nLayout & SAL_LAYOUT_BIDI_RTL) || (pOutDev && pOutDev->IsRTLEnabled()) )
     {
         SalPoint* pPtAry2 = new SalPoint[nPoints];
-        BOOL bCopied = mirror( nPoints, pPtAry, pPtAry2, pOutDev );
+        BOOL bCopied = mirror( nPoints, pPtAry, pPtAry2, pOutDev ); 
         drawPolygon( nPoints, bCopied ? pPtAry2 : pPtAry );
         delete [] pPtAry2;
     }
@@ -449,7 +449,7 @@ void SalGraphics::DrawPolyPolygon( sal_uInt32 nPoly, const sal_uInt32* pPoints,
         {
             ULONG nPoints = pPoints[i];
             pPtAry2[i] = new SalPoint[ nPoints ];
-            mirror( nPoints, pPtAry[i], pPtAry2[i], pOutDev );
+            mirror( nPoints, pPtAry[i], pPtAry2[i], pOutDev ); 
         }
 
         drawPolyPolygon( nPoly, pPoints, (PCONSTSALPOINT*)pPtAry2 );
@@ -465,7 +465,7 @@ void SalGraphics::DrawPolyPolygon( sal_uInt32 nPoly, const sal_uInt32* pPoints,
 bool SalGraphics::DrawPolyPolygon( const ::basegfx::B2DPolyPolygon& i_rPolyPolygon, double i_fTransparency, const OutputDevice* i_pOutDev )
 {
     bool bRet = false;
-    if( (m_nLayout & SAL_LAYOUT_BIDI_RTL) )
+    if( (m_nLayout & SAL_LAYOUT_BIDI_RTL) ) 
     {
         basegfx::B2DPolyPolygon aMirror( mirror( i_rPolyPolygon, i_pOutDev ) );
         bRet = drawPolyPolygon( aMirror, i_fTransparency );
@@ -483,10 +483,10 @@ bool SalGraphics::drawPolyPolygon( const ::basegfx::B2DPolyPolygon&, double /*fT
 sal_Bool SalGraphics::DrawPolyLineBezier( ULONG nPoints, const SalPoint* pPtAry, const BYTE* pFlgAry, const OutputDevice* pOutDev )
 {
     sal_Bool bResult = sal_False;
-    if( (m_nLayout & SAL_LAYOUT_BIDI_RTL) )
+    if( (m_nLayout & SAL_LAYOUT_BIDI_RTL) ) 
     {
         SalPoint* pPtAry2 = new SalPoint[nPoints];
-        BOOL bCopied = mirror( nPoints, pPtAry, pPtAry2, pOutDev );
+        BOOL bCopied = mirror( nPoints, pPtAry, pPtAry2, pOutDev ); 
         bResult = drawPolyLineBezier( nPoints, bCopied ? pPtAry2 : pPtAry, pFlgAry );
         delete [] pPtAry2;
     }
@@ -498,10 +498,10 @@ sal_Bool SalGraphics::DrawPolyLineBezier( ULONG nPoints, const SalPoint* pPtAry,
 sal_Bool SalGraphics::DrawPolygonBezier( ULONG nPoints, const SalPoint* pPtAry, const BYTE* pFlgAry, const OutputDevice* pOutDev )
 {
     sal_Bool bResult = sal_False;
-    if( (m_nLayout & SAL_LAYOUT_BIDI_RTL) )
+    if( (m_nLayout & SAL_LAYOUT_BIDI_RTL) ) 
     {
         SalPoint* pPtAry2 = new SalPoint[nPoints];
-        BOOL bCopied = mirror( nPoints, pPtAry, pPtAry2, pOutDev );
+        BOOL bCopied = mirror( nPoints, pPtAry, pPtAry2, pOutDev ); 
         bResult = drawPolygonBezier( nPoints, bCopied ? pPtAry2 : pPtAry, pFlgAry );
         delete [] pPtAry2;
     }
@@ -514,7 +514,7 @@ sal_Bool SalGraphics::DrawPolyPolygonBezier( sal_uInt32 i_nPoly, const sal_uInt3
                                                    const SalPoint* const* i_pPtAry, const BYTE* const* i_pFlgAry, const OutputDevice* i_pOutDev )
 {
     sal_Bool bRet = sal_False;
-    if( (m_nLayout & SAL_LAYOUT_BIDI_RTL) )
+    if( (m_nLayout & SAL_LAYOUT_BIDI_RTL) ) 
     {
         // TODO: optimize, reduce new/delete calls
         SalPoint **pPtAry2 = new SalPoint*[i_nPoly];
@@ -523,7 +523,7 @@ sal_Bool SalGraphics::DrawPolyPolygonBezier( sal_uInt32 i_nPoly, const sal_uInt3
         {
             ULONG nPoints = i_pPoints[i];
             pPtAry2[i] = new SalPoint[ nPoints ];
-            mirror( nPoints, i_pPtAry[i], pPtAry2[i], i_pOutDev );
+            mirror( nPoints, i_pPtAry[i], pPtAry2[i], i_pOutDev ); 
         }
 
         bRet = drawPolyPolygonBezier( i_nPoly, i_pPoints, (PCONSTSALPOINT*)pPtAry2, i_pFlgAry );
@@ -542,7 +542,7 @@ bool SalGraphics::DrawPolyLine( const ::basegfx::B2DPolygon& i_rPolygon, double
     const OutputDevice* i_pOutDev )
 {
     bool bRet = false;
-    if( (m_nLayout & SAL_LAYOUT_BIDI_RTL) )
+    if( (m_nLayout & SAL_LAYOUT_BIDI_RTL) ) 
     {
         basegfx::B2DPolygon aMirror( mirror( i_rPolygon, i_pOutDev ) );
         bRet = drawPolyLine( aMirror, fTransparency, i_rLineWidth, i_eLineJoin );
@@ -552,54 +552,54 @@ bool SalGraphics::DrawPolyLine( const ::basegfx::B2DPolygon& i_rPolygon, double
     return bRet;
 }
 
-void    SalGraphics::CopyArea( long nDestX, long nDestY,
+void	SalGraphics::CopyArea( long nDestX, long nDestY,
                                long nSrcX, long nSrcY,
                                long nSrcWidth, long nSrcHeight,
                                USHORT nFlags, const OutputDevice *pOutDev )
 {
-    if( (m_nLayout & SAL_LAYOUT_BIDI_RTL) || (pOutDev && pOutDev->IsRTLEnabled()) )
+    if( (m_nLayout & SAL_LAYOUT_BIDI_RTL) || (pOutDev && pOutDev->IsRTLEnabled()) ) 
     {
         mirror( nDestX, nSrcWidth, pOutDev );
         mirror( nSrcX, nSrcWidth, pOutDev );
     }
     copyArea( nDestX, nDestY, nSrcX, nSrcY, nSrcWidth, nSrcHeight, nFlags );
 }
-void    SalGraphics::CopyBits( const SalTwoRect* pPosAry,
+void	SalGraphics::CopyBits( const SalTwoRect* pPosAry,
                                SalGraphics* pSrcGraphics, const OutputDevice *pOutDev, const OutputDevice *pSrcOutDev )
 {
-    if( ( (m_nLayout & SAL_LAYOUT_BIDI_RTL) || (pOutDev && pOutDev->IsRTLEnabled()) ) ||
+    if( ( (m_nLayout & SAL_LAYOUT_BIDI_RTL) || (pOutDev && pOutDev->IsRTLEnabled()) ) || 
         (pSrcGraphics && ( (pSrcGraphics->GetLayout() & SAL_LAYOUT_BIDI_RTL)  || (pSrcOutDev && pSrcOutDev->IsRTLEnabled()) ) ) )
     {
         SalTwoRect pPosAry2 = *pPosAry;
         if( (pSrcGraphics && (pSrcGraphics->GetLayout() & SAL_LAYOUT_BIDI_RTL)) || (pSrcOutDev && pSrcOutDev->IsRTLEnabled()) )
-            mirror( pPosAry2.mnSrcX, pPosAry2.mnSrcWidth, pSrcOutDev );
-        if( (m_nLayout & SAL_LAYOUT_BIDI_RTL) || (pOutDev && pOutDev->IsRTLEnabled()) )
-            mirror( pPosAry2.mnDestX, pPosAry2.mnDestWidth, pOutDev );
+            mirror( pPosAry2.mnSrcX, pPosAry2.mnSrcWidth, pSrcOutDev ); 
+        if( (m_nLayout & SAL_LAYOUT_BIDI_RTL) || (pOutDev && pOutDev->IsRTLEnabled()) ) 
+            mirror( pPosAry2.mnDestX, pPosAry2.mnDestWidth, pOutDev ); 
         copyBits( &pPosAry2, pSrcGraphics );
     }
     else
         copyBits( pPosAry, pSrcGraphics );
 }
-void    SalGraphics::DrawBitmap( const SalTwoRect* pPosAry,
+void	SalGraphics::DrawBitmap( const SalTwoRect* pPosAry,
                                     const SalBitmap& rSalBitmap, const OutputDevice *pOutDev )
 {
     if( (m_nLayout & SAL_LAYOUT_BIDI_RTL) || (pOutDev && pOutDev->IsRTLEnabled()) )
     {
         SalTwoRect pPosAry2 = *pPosAry;
-        mirror( pPosAry2.mnDestX, pPosAry2.mnDestWidth, pOutDev );
+        mirror( pPosAry2.mnDestX, pPosAry2.mnDestWidth, pOutDev ); 
         drawBitmap( &pPosAry2, rSalBitmap );
     }
     else
         drawBitmap( pPosAry, rSalBitmap );
 }
-void    SalGraphics::DrawBitmap( const SalTwoRect* pPosAry,
+void	SalGraphics::DrawBitmap( const SalTwoRect* pPosAry,
                                     const SalBitmap& rSalBitmap,
                                     SalColor nTransparentColor, const OutputDevice *pOutDev )
 {
     if( (m_nLayout & SAL_LAYOUT_BIDI_RTL) || (pOutDev && pOutDev->IsRTLEnabled()) )
     {
         SalTwoRect pPosAry2 = *pPosAry;
-        mirror( pPosAry2.mnDestX, pPosAry2.mnDestWidth, pOutDev );
+        mirror( pPosAry2.mnDestX, pPosAry2.mnDestWidth, pOutDev ); 
         drawBitmap( &pPosAry2, rSalBitmap, nTransparentColor );
     }
     else
@@ -612,49 +612,49 @@ void SalGraphics::DrawBitmap( const SalTwoRect* pPosAry,
     if( (m_nLayout & SAL_LAYOUT_BIDI_RTL) || (pOutDev && pOutDev->IsRTLEnabled()) )
     {
         SalTwoRect pPosAry2 = *pPosAry;
-        mirror( pPosAry2.mnDestX, pPosAry2.mnDestWidth, pOutDev );
+        mirror( pPosAry2.mnDestX, pPosAry2.mnDestWidth, pOutDev ); 
         drawBitmap( &pPosAry2, rSalBitmap, rTransparentBitmap );
     }
     else
         drawBitmap( pPosAry, rSalBitmap, rTransparentBitmap );
 }
-void    SalGraphics::DrawMask( const SalTwoRect* pPosAry,
+void	SalGraphics::DrawMask( const SalTwoRect* pPosAry,
                                   const SalBitmap& rSalBitmap,
                                   SalColor nMaskColor, const OutputDevice *pOutDev )
 {
     if( (m_nLayout & SAL_LAYOUT_BIDI_RTL) || (pOutDev && pOutDev->IsRTLEnabled()) )
     {
         SalTwoRect pPosAry2 = *pPosAry;
-        mirror( pPosAry2.mnDestX, pPosAry2.mnDestWidth, pOutDev );
+        mirror( pPosAry2.mnDestX, pPosAry2.mnDestWidth, pOutDev ); 
         drawMask( &pPosAry2, rSalBitmap, nMaskColor );
     }
     else
         drawMask( pPosAry, rSalBitmap, nMaskColor );
 }
-SalBitmap*  SalGraphics::GetBitmap( long nX, long nY, long nWidth, long nHeight, const OutputDevice *pOutDev )
+SalBitmap*	SalGraphics::GetBitmap( long nX, long nY, long nWidth, long nHeight, const OutputDevice *pOutDev )
 {
     if( (m_nLayout & SAL_LAYOUT_BIDI_RTL) || (pOutDev && pOutDev->IsRTLEnabled()) )
         mirror( nX, nWidth, pOutDev );
     return getBitmap( nX, nY, nWidth, nHeight );
 }
-SalColor    SalGraphics::GetPixel( long nX, long nY, const OutputDevice *pOutDev )
+SalColor	SalGraphics::GetPixel( long nX, long nY, const OutputDevice *pOutDev )
 {
     if( (m_nLayout & SAL_LAYOUT_BIDI_RTL) || (pOutDev && pOutDev->IsRTLEnabled()) )
         mirror( nX, pOutDev );
     return getPixel( nX, nY );
 }
-void    SalGraphics::Invert( long nX, long nY, long nWidth, long nHeight, SalInvert nFlags, const OutputDevice *pOutDev )
+void	SalGraphics::Invert( long nX, long nY, long nWidth, long nHeight, SalInvert nFlags, const OutputDevice *pOutDev )
 {
     if( (m_nLayout & SAL_LAYOUT_BIDI_RTL) || (pOutDev && pOutDev->IsRTLEnabled()) )
         mirror( nX, nWidth, pOutDev );
     invert( nX, nY, nWidth, nHeight, nFlags );
 }
-void    SalGraphics::Invert( ULONG nPoints, const SalPoint* pPtAry, SalInvert nFlags, const OutputDevice *pOutDev )
+void	SalGraphics::Invert( ULONG nPoints, const SalPoint* pPtAry, SalInvert nFlags, const OutputDevice *pOutDev )
 {
     if( (m_nLayout & SAL_LAYOUT_BIDI_RTL) || (pOutDev && pOutDev->IsRTLEnabled()) )
     {
         SalPoint* pPtAry2 = new SalPoint[nPoints];
-        BOOL bCopied = mirror( nPoints, pPtAry, pPtAry2, pOutDev );
+        BOOL bCopied = mirror( nPoints, pPtAry, pPtAry2, pOutDev ); 
         invert( nPoints, bCopied ? pPtAry2 : pPtAry, nFlags );
         delete [] pPtAry2;
     }
@@ -662,7 +662,7 @@ void    SalGraphics::Invert( ULONG nPoints, const SalPoint* pPtAry, SalInvert nF
         invert( nPoints, pPtAry, nFlags );
 }
 
-BOOL    SalGraphics::DrawEPS( long nX, long nY, long nWidth, long nHeight, void* pPtr, ULONG nSize, const OutputDevice *pOutDev )
+BOOL	SalGraphics::DrawEPS( long nX, long nY, long nWidth, long nHeight, void* pPtr, ULONG nSize, const OutputDevice *pOutDev )
 {
     if( (m_nLayout & SAL_LAYOUT_BIDI_RTL) || (pOutDev && pOutDev->IsRTLEnabled()) )
         mirror( nX, nWidth, pOutDev );
@@ -762,7 +762,7 @@ BOOL SalGraphics::GetNativeControlRegion( ControlType nType, ControlPart nPart,
         Rectangle rgn( rControlRegion );
         mirror( rgn, pOutDev );
         mirror( nType, aValue, pOutDev );
-        if( getNativeControlRegion( nType, nPart, rgn, nState, aValue, aCaption,
+        if( getNativeControlRegion( nType, nPart, rgn, nState, aValue, aCaption, 
                                                 rNativeBoundingRegion, rNativeContentRegion ) )
         {
             mirror( rNativeBoundingRegion, pOutDev, true );
@@ -777,26 +777,26 @@ BOOL SalGraphics::GetNativeControlRegion( ControlType nType, ControlPart nPart,
         }
     }
     else
-        return getNativeControlRegion( nType, nPart, rControlRegion, nState, aValue, aCaption,
+        return getNativeControlRegion( nType, nPart, rControlRegion, nState, aValue, aCaption, 
                                                 rNativeBoundingRegion, rNativeContentRegion );
 }
 
 bool SalGraphics::DrawAlphaBitmap( const SalTwoRect& rPosAry,
                                    const SalBitmap& rSourceBitmap,
-                                   const SalBitmap& rAlphaBitmap,
+                                   const SalBitmap& rAlphaBitmap, 
                                    const OutputDevice *pOutDev )
 {
     if( (m_nLayout & SAL_LAYOUT_BIDI_RTL) || (pOutDev && pOutDev->IsRTLEnabled()) )
     {
         SalTwoRect pPosAry2 = rPosAry;
-        mirror( pPosAry2.mnDestX, pPosAry2.mnDestWidth, pOutDev );
+        mirror( pPosAry2.mnDestX, pPosAry2.mnDestWidth, pOutDev ); 
         return drawAlphaBitmap( pPosAry2, rSourceBitmap, rAlphaBitmap );
     }
     else
         return drawAlphaBitmap( rPosAry, rSourceBitmap, rAlphaBitmap );
 }
 
-bool SalGraphics::DrawAlphaRect( long nX, long nY, long nWidth, long nHeight,
+bool SalGraphics::DrawAlphaRect( long nX, long nY, long nWidth, long nHeight, 
                                  sal_uInt8 nTransparency, const OutputDevice *pOutDev )
 {
     if( (m_nLayout & SAL_LAYOUT_BIDI_RTL) || (pOutDev && pOutDev->IsRTLEnabled()) )
diff --git a/vcl/source/gdi/sallayout.cxx b/vcl/source/gdi/sallayout.cxx
index 5e187944c706..742b69e5309c 100755
--- a/vcl/source/gdi/sallayout.cxx
+++ b/vcl/source/gdi/sallayout.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
@@ -57,7 +57,7 @@
 #include <unicode/uchar.h>
 #if defined _MSC_VER
 #pragma warning(pop)
-#endif
+#endif 
 
 #include <algorithm>
 
@@ -117,7 +117,7 @@ bool IsDiacritic( sal_UCS4 nChar )
         if( (pRange->mnMin <= nChar) && (nChar < pRange->mnEnd) )
             return true;
 
-    return false;
+    return false;	
 }
 
 // =======================================================================
@@ -315,7 +315,7 @@ sal_UCS4 GetLocalizedChar( sal_UCS4 nChar, LanguageType eLang )
         case LANGUAGE_FARSI         & LANGUAGE_MASK_PRIMARY:
         case LANGUAGE_URDU          & LANGUAGE_MASK_PRIMARY:
         case LANGUAGE_PUNJABI       & LANGUAGE_MASK_PRIMARY: //???
-        case LANGUAGE_SINDHI        & LANGUAGE_MASK_PRIMARY:
+        case LANGUAGE_SINDHI        & LANGUAGE_MASK_PRIMARY:	
             nOffset = 0x06F0 - '0';  // eastern arabic-indic digits
             break;
         case LANGUAGE_BENGALI       & LANGUAGE_MASK_PRIMARY:
@@ -615,7 +615,7 @@ ImplLayoutArgs::ImplLayoutArgs( const xub_Unicode* pStr, int nLen,
         UBiDi* pParaBidi = ubidi_openSized( mnLength, 0, &rcI18n );
         if( !pParaBidi )
             return;
-        ubidi_setPara( pParaBidi, reinterpret_cast<const UChar *>(mpStr), mnLength, nLevel, NULL, &rcI18n );    // UChar != sal_Unicode in MinGW
+        ubidi_setPara( pParaBidi, reinterpret_cast<const UChar *>(mpStr), mnLength, nLevel, NULL, &rcI18n );	// UChar != sal_Unicode in MinGW
 
         UBiDi* pLineBidi = pParaBidi;
         int nSubLength = mnEndCharPos - mnMinCharPos;
@@ -1054,7 +1054,7 @@ bool GenericSalLayout::GetCharWidths( sal_Int32* pCharWidths ) const
             if( pN->IsClusterStart() )
                 break;
             if( pN->IsDiacritic() )
-                continue;   // ignore diacritics
+                continue;	// ignore diacritics
             if( nXPosMax > pN->maLinearPos.X() )
                 nXPosMax = pN->maLinearPos.X();
         }
@@ -1317,10 +1317,10 @@ void GenericSalLayout::ApplyAsianKerning( const sal_Unicode* pStr, int nLength )
         {
             // ignore code ranges that are not affected by asian punctuation compression
             const sal_Unicode cHere = pStr[n];
-            if( ((0x3000 != (cHere & 0xFF00)) && (0x2010 != (cHere & 0xFFF0))) || (0xFF00 != (cHere & 0xFF00)) )
+            if( ((0x3000 != (cHere & 0xFF00)) && (0x2010 != (cHere & 0xFFF0))) || (0xFF00 != (cHere & 0xFF00)) ) 
                 continue;
             const sal_Unicode cNext = pStr[n+1];
-            if( ((0x3000 != (cNext & 0xFF00)) && (0x2010 != (cNext & 0xFFF0))) || (0xFF00 != (cNext & 0xFF00)) )
+            if( ((0x3000 != (cNext & 0xFF00)) && (0x2010 != (cNext & 0xFFF0))) || (0xFF00 != (cNext & 0xFF00)) ) 
                 continue;
 
             // calculate compression values
@@ -1580,7 +1580,7 @@ void GenericSalLayout::MoveGlyph( int nStart, long nNewXPos )
         return;
 
     GlyphItem* pG = mpGlyphItems + nStart;
-    // the nNewXPos argument determines the new cell position
+    // the nNewXPos argument determines the new cell position 
     // as RTL-glyphs are right justified in their cell
     // the cell position needs to be adjusted to the glyph position
     if( pG->IsRTLGlyph() )
@@ -1900,7 +1900,7 @@ void MultiSalLayout::AdjustLayout( ImplLayoutArgs& rArgs )
         if( n > 0 )
         {
             // drop the NotDef glyphs in the base layout run if a fallback run exists
-            while (
+            while ( 
                     (maFallbackRuns[ n-1 ].PosIsInRun( nCharPos[0] ) ) &&
                     (!maFallbackRuns[ n ].PosIsInAnyRun( nCharPos[0] ) )
                   )
diff --git a/vcl/source/gdi/salmisc.cxx b/vcl/source/gdi/salmisc.cxx
index 31df581f50a2..42c8884ad650 100644
--- a/vcl/source/gdi/salmisc.cxx
+++ b/vcl/source/gdi/salmisc.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
@@ -36,35 +36,35 @@
 // - Defines -
 // -----------
 
-#define IMPL_CASE_GET_FORMAT( Format )                          \
-case( BMP_FORMAT##Format ):                                 \
-    pFncGetPixel = BitmapReadAccess::GetPixelFor##Format;       \
+#define IMPL_CASE_GET_FORMAT( Format )							\
+case( BMP_FORMAT##Format ):									\
+    pFncGetPixel = BitmapReadAccess::GetPixelFor##Format;		\
 break
 
 // -----------------------------------------------------------------------------
 
-#define IMPL_CASE_SET_FORMAT( Format, BitCount )                \
-case( BMP_FORMAT##Format ):                                 \
-{                                                               \
-    pFncSetPixel = BitmapReadAccess::SetPixelFor##Format;       \
-    pDstBuffer->mnBitCount = BitCount;                          \
-}                                                               \
+#define IMPL_CASE_SET_FORMAT( Format, BitCount )				\
+case( BMP_FORMAT##Format ):									\
+{																\
+    pFncSetPixel = BitmapReadAccess::SetPixelFor##Format;		\
+    pDstBuffer->mnBitCount = BitCount;							\
+}																\
 break
 
 // -----------------------------------------------------------------------------
 
-#define DOUBLE_SCANLINES()                                                      \
-while( ( nActY < nHeight1 ) && ( pMapY[ nActY + 1 ] == nMapY ) )                \
-{                                                                               \
-    memcpy( pDstScanMap[ nActY + 1L ], pDstScan, rDstBuffer.mnScanlineSize );   \
-    nActY++;                                                                    \
+#define DOUBLE_SCANLINES()														\
+while( ( nActY < nHeight1 ) && ( pMapY[ nActY + 1 ] == nMapY ) )				\
+{																				\
+    memcpy( pDstScanMap[ nActY + 1L ], pDstScan, rDstBuffer.mnScanlineSize );	\
+    nActY++;																	\
 }
 
 // -----------
 // - Inlines -
 // -----------
 
-#define TC_TO_PAL_COLORS    4096
+#define TC_TO_PAL_COLORS	4096
 
 static long ImplIndexFromColor( const BitmapColor& rCol )
 {
@@ -84,22 +84,22 @@ static long ImplIndexFromColor( const BitmapColor& rCol )
 }
 
 
-#define COLOR_TO_INDEX( _def_rCol )
+#define COLOR_TO_INDEX( _def_rCol ) 
 
 // ------------------------
 // - conversion functions -
 // ------------------------
 
-static void ImplPALToPAL( const BitmapBuffer& rSrcBuffer, BitmapBuffer& rDstBuffer,
+static void	ImplPALToPAL( const BitmapBuffer& rSrcBuffer, BitmapBuffer& rDstBuffer,
                           FncGetPixel pFncGetPixel, FncSetPixel pFncSetPixel,
                           Scanline* pSrcScanMap, Scanline* pDstScanMap, long* pMapX, long* pMapY )
 {
-    const long          nWidth = rDstBuffer.mnWidth, nHeight = rDstBuffer.mnHeight, nHeight1 = nHeight - 1;
-    const ColorMask&    rSrcMask = rSrcBuffer.maColorMask;
-    const ColorMask&    rDstMask = rDstBuffer.maColorMask;
-    BitmapPalette       aColMap( rSrcBuffer.maPalette.GetEntryCount() );
-    BitmapColor*        pColMapBuf = aColMap.ImplGetColorBuffer();
-    BitmapColor         aIndex( 0 );
+    const long			nWidth = rDstBuffer.mnWidth, nHeight = rDstBuffer.mnHeight, nHeight1 = nHeight - 1;
+    const ColorMask&	rSrcMask = rSrcBuffer.maColorMask;
+    const ColorMask&	rDstMask = rDstBuffer.maColorMask;
+    BitmapPalette		aColMap( rSrcBuffer.maPalette.GetEntryCount() );
+    BitmapColor*		pColMapBuf = aColMap.ImplGetColorBuffer();
+    BitmapColor			aIndex( 0 );
 
     for( USHORT i = 0, nSrcCount = aColMap.GetEntryCount(), nDstCount = rDstBuffer.maPalette.GetEntryCount(); i < nSrcCount; i++ )
     {
@@ -124,20 +124,20 @@ static void ImplPALToPAL( const BitmapBuffer& rSrcBuffer, BitmapBuffer& rDstBuff
 
 // -----------------------------------------------------------------------------
 
-static void ImplPALToTC( const BitmapBuffer& rSrcBuffer, BitmapBuffer& rDstBuffer,
+static void	ImplPALToTC( const BitmapBuffer& rSrcBuffer, BitmapBuffer& rDstBuffer,
                          FncGetPixel pFncGetPixel, FncSetPixel pFncSetPixel,
                          Scanline* pSrcScanMap, Scanline* pDstScanMap, long* pMapX, long* pMapY )
 {
-    const long          nWidth = rDstBuffer.mnWidth, nHeight = rDstBuffer.mnHeight, nHeight1 = nHeight - 1;
-    const ColorMask&    rSrcMask = rSrcBuffer.maColorMask;
-    const ColorMask&    rDstMask = rDstBuffer.maColorMask;
-    const BitmapColor*  pColBuf = rSrcBuffer.maPalette.ImplGetColorBuffer();
+    const long			nWidth = rDstBuffer.mnWidth, nHeight = rDstBuffer.mnHeight, nHeight1 = nHeight - 1;
+    const ColorMask&	rSrcMask = rSrcBuffer.maColorMask;
+    const ColorMask&	rDstMask = rDstBuffer.maColorMask;
+    const BitmapColor*	pColBuf = rSrcBuffer.maPalette.ImplGetColorBuffer();
 
     if( BMP_SCANLINE_FORMAT( rSrcBuffer.mnFormat ) == BMP_FORMAT_1BIT_MSB_PAL )
     {
-        const BitmapColor   aCol0( pColBuf[ 0 ] );
-        const BitmapColor   aCol1( pColBuf[ 1 ] );
-        long                nMapX;
+        const BitmapColor	aCol0( pColBuf[ 0 ] );
+        const BitmapColor	aCol1( pColBuf[ 1 ] );
+        long				nMapX;
 
         for( long nActY = 0, nMapY; nActY < nHeight; nActY++ )
         {
@@ -146,7 +146,7 @@ static void ImplPALToTC( const BitmapBuffer& rSrcBuffer, BitmapBuffer& rDstBuffe
             for( long nX = 0L; nX < nWidth; )
             {
                 nMapX = pMapX[ nX ];
-                pFncSetPixel( pDstScan, nX++,
+                pFncSetPixel( pDstScan, nX++, 
                               pSrcScan[ nMapX >> 3 ] & ( 1 << ( 7 - ( nMapX & 7 ) ) ) ? aCol1 : aCol0,
                               rDstMask );
             }
@@ -165,7 +165,7 @@ static void ImplPALToTC( const BitmapBuffer& rSrcBuffer, BitmapBuffer& rDstBuffe
             for( long nX = 0L; nX < nWidth; )
             {
                 nMapX = pMapX[ nX ];
-                pFncSetPixel( pDstScan, nX++,
+                pFncSetPixel( pDstScan, nX++, 
                               pColBuf[ ( pSrcScan[ nMapX >> 1 ] >> ( nMapX & 1 ? 0 : 4 ) ) & 0x0f ],
                               rDstMask );
             }
@@ -201,18 +201,18 @@ static void ImplPALToTC( const BitmapBuffer& rSrcBuffer, BitmapBuffer& rDstBuffe
 
 // -----------------------------------------------------------------------------
 
-static void ImplTCToTC( const BitmapBuffer& rSrcBuffer, BitmapBuffer& rDstBuffer,
+static void	ImplTCToTC( const BitmapBuffer& rSrcBuffer, BitmapBuffer& rDstBuffer,
                         FncGetPixel pFncGetPixel, FncSetPixel pFncSetPixel,
                         Scanline* pSrcScanMap, Scanline* pDstScanMap, long* pMapX, long* pMapY )
 {
-    const long          nWidth = rDstBuffer.mnWidth, nHeight = rDstBuffer.mnHeight, nHeight1 = nHeight - 1;
-    const ColorMask&    rSrcMask = rSrcBuffer.maColorMask;
-    const ColorMask&    rDstMask = rDstBuffer.maColorMask;
+    const long			nWidth = rDstBuffer.mnWidth, nHeight = rDstBuffer.mnHeight, nHeight1 = nHeight - 1;
+    const ColorMask&	rSrcMask = rSrcBuffer.maColorMask;
+    const ColorMask&	rDstMask = rDstBuffer.maColorMask;
 
     if( BMP_SCANLINE_FORMAT( rSrcBuffer.mnFormat ) == BMP_FORMAT_24BIT_TC_BGR )
     {
         BitmapColor aCol;
-        BYTE*       pPixel;
+        BYTE*		pPixel;
 
         for( long nActY = 0, nMapY; nActY < nHeight; nActY++ )
         {
@@ -245,16 +245,16 @@ static void ImplTCToTC( const BitmapBuffer& rSrcBuffer, BitmapBuffer& rDstBuffer
 
 // -----------------------------------------------------------------------------
 
-static void ImplTCToPAL( const BitmapBuffer& rSrcBuffer, BitmapBuffer& rDstBuffer,
+static void	ImplTCToPAL( const BitmapBuffer& rSrcBuffer, BitmapBuffer& rDstBuffer,
                          FncGetPixel pFncGetPixel, FncSetPixel pFncSetPixel,
                          Scanline* pSrcScanMap, Scanline* pDstScanMap, long* pMapX, long* pMapY )
 {
-    const long          nWidth = rDstBuffer.mnWidth, nHeight = rDstBuffer.mnHeight, nHeight1 = nHeight - 1;
-    const ColorMask&    rSrcMask = rSrcBuffer.maColorMask;
-    const ColorMask&    rDstMask = rDstBuffer.maColorMask;
-    BitmapPalette       aColMap( rSrcBuffer.maPalette.GetEntryCount() );
-    BYTE*               pColToPalMap = new BYTE[ TC_TO_PAL_COLORS ];
-    BitmapColor         aIndex( 0 );
+    const long			nWidth = rDstBuffer.mnWidth, nHeight = rDstBuffer.mnHeight, nHeight1 = nHeight - 1;
+    const ColorMask&	rSrcMask = rSrcBuffer.maColorMask;
+    const ColorMask&	rDstMask = rDstBuffer.maColorMask;
+    BitmapPalette		aColMap( rSrcBuffer.maPalette.GetEntryCount() );
+    BYTE*				pColToPalMap = new BYTE[ TC_TO_PAL_COLORS ];
+    BitmapColor			aIndex( 0 );
 
     for( long nR = 0; nR < 16; nR++ )
     {
@@ -292,12 +292,12 @@ static void ImplTCToPAL( const BitmapBuffer& rSrcBuffer, BitmapBuffer& rDstBuffe
 // - StretchAndConvert -
 // ---------------------
 
-BitmapBuffer* StretchAndConvert( const BitmapBuffer& rSrcBuffer, const SalTwoRect& rTwoRect,
+BitmapBuffer* StretchAndConvert( const BitmapBuffer& rSrcBuffer, const SalTwoRect& rTwoRect, 
                                  ULONG nDstBitmapFormat, BitmapPalette* pDstPal, ColorMask* pDstMask )
 {
-    FncGetPixel     pFncGetPixel;
-    FncSetPixel     pFncSetPixel;
-    BitmapBuffer*   pDstBuffer = new BitmapBuffer;
+    FncGetPixel		pFncGetPixel;
+    FncSetPixel		pFncSetPixel;
+    BitmapBuffer*	pDstBuffer = new BitmapBuffer;
     long            i;
 
     // set function for getting pixels
@@ -401,7 +401,7 @@ BitmapBuffer* StretchAndConvert( const BitmapBuffer& rSrcBuffer, const SalTwoRec
     bool bFastConvert = ImplFastBitmapConversion( *pDstBuffer, rSrcBuffer, rTwoRect );
     if( bFastConvert )
         return pDstBuffer;
-
+    
     const long      nSrcX = rTwoRect.mnSrcX, nSrcY = rTwoRect.mnSrcY;
     const long      nSrcDX = rTwoRect.mnSrcWidth, nSrcDY = rTwoRect.mnSrcHeight;
     const long      nDstDX = rTwoRect.mnDestWidth, nDstDY = rTwoRect.mnDestHeight;
@@ -430,7 +430,7 @@ BitmapBuffer* StretchAndConvert( const BitmapBuffer& rSrcBuffer, const SalTwoRec
         delete pDstBuffer;
         return NULL;
     }
-
+    
     // horizontal mapping table
     if( nDstDX != nSrcDX )
     {
@@ -487,7 +487,7 @@ BitmapBuffer* StretchAndConvert( const BitmapBuffer& rSrcBuffer, const SalTwoRec
     // do buffer scaling and conversion
     if( rSrcBuffer.mnBitCount <= 8 && pDstBuffer->mnBitCount <= 8 )
     {
-        ImplPALToPAL( rSrcBuffer, *pDstBuffer, pFncGetPixel, pFncSetPixel,
+        ImplPALToPAL( rSrcBuffer, *pDstBuffer, pFncGetPixel, pFncSetPixel, 
                       pSrcScan, pDstScan, pMapX, pMapY );
     }
     else if( rSrcBuffer.mnBitCount <= 8 && pDstBuffer->mnBitCount > 8 )
diff --git a/vcl/source/gdi/salnativewidgets-none.cxx b/vcl/source/gdi/salnativewidgets-none.cxx
index 8aa0e47f1a35..561c05e7021b 100644
--- a/vcl/source/gdi/salnativewidgets-none.cxx
+++ b/vcl/source/gdi/salnativewidgets-none.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
@@ -71,11 +71,11 @@ BOOL SalGraphics::hitTestNativeControl( ControlType,
  *
  *  Draws the requested control described by nPart/nState.
  *
- *  rControlRegion: The bounding region of the complete control in VCL frame coordinates.
- *  aValue:         An optional value (tristate/numerical/string)
- *  aCaption:   A caption or title string (like button text etc)
+ *  rControlRegion:	The bounding region of the complete control in VCL frame coordinates.
+ *  aValue:  		An optional value (tristate/numerical/string)
+ *  aCaption:  	A caption or title string (like button text etc)
  */
-BOOL SalGraphics::drawNativeControl(    ControlType,
+BOOL SalGraphics::drawNativeControl(	ControlType,
                             ControlPart,
                             const Rectangle&,
                             ControlState,
@@ -92,11 +92,11 @@ BOOL SalGraphics::drawNativeControl(    ControlType,
  *  OPTIONAL.  Draws the requested text for the control described by nPart/nState.
  *     Used if text not drawn by DrawNativeControl().
  *
- *  rControlRegion: The bounding region of the complete control in VCL frame coordinates.
- *  aValue:         An optional value (tristate/numerical/string)
- *  aCaption:   A caption or title string (like button text etc)
+ *  rControlRegion:	The bounding region of the complete control in VCL frame coordinates.
+ *  aValue:  		An optional value (tristate/numerical/string)
+ *  aCaption:  	A caption or title string (like button text etc)
  */
-BOOL SalGraphics::drawNativeControlText(    ControlType,
+BOOL SalGraphics::drawNativeControlText(	ControlType,
                                 ControlPart,
                                 const Rectangle&,
                                 ControlState,
@@ -116,9 +116,9 @@ BOOL SalGraphics::drawNativeControlText(    ControlType,
  *  within the control that can be safely drawn into without drawing over
  *  the borders of the control.
  *
- *  rControlRegion: The bounding region of the control in VCL frame coordinates.
- *  aValue:     An optional value (tristate/numerical/string)
- *  aCaption:       A caption or title string (like button text etc)
+ *  rControlRegion:	The bounding region of the control in VCL frame coordinates.
+ *  aValue:		An optional value (tristate/numerical/string)
+ *  aCaption:		A caption or title string (like button text etc)
  */
 BOOL SalGraphics::getNativeControlRegion(  ControlType,
                                 ControlPart,
diff --git a/vcl/source/gdi/svcompat.cxx b/vcl/source/gdi/svcompat.cxx
index 415cad128a49..a2d7bd38e735 100644
--- a/vcl/source/gdi/svcompat.cxx
+++ b/vcl/source/gdi/svcompat.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
diff --git a/vcl/source/gdi/textlayout.cxx b/vcl/source/gdi/textlayout.cxx
index 78ce197525ec..c7543fcd7111 100644
--- a/vcl/source/gdi/textlayout.cxx
+++ b/vcl/source/gdi/textlayout.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
diff --git a/vcl/source/gdi/virdev.cxx b/vcl/source/gdi/virdev.cxx
index 4c1439ffe6f4..74aac917a9f1 100644
--- a/vcl/source/gdi/virdev.cxx
+++ b/vcl/source/gdi/virdev.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
@@ -77,17 +77,17 @@ void VirtualDevice::ImplInitVirDev( const OutputDevice* pOutDev,
     if ( !mpVirDev )
     {
         // do not abort but throw an exception, may be the current thread terminates anyway (plugin-scenario)
-        throw ::com::sun::star::uno::RuntimeException(
+        throw ::com::sun::star::uno::RuntimeException( 
             OUString( RTL_CONSTASCII_USTRINGPARAM( "Could not create system bitmap!" ) ),
             ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >() );
         //GetpApp()->Exception( EXC_SYSOBJNOTCREATED );
     }
 
-    mnBitCount      = ( nBitCount ? nBitCount : pOutDev->GetBitCount() );
-    mnOutWidth      = nDX;
-    mnOutHeight     = nDY;
-    mbScreenComp    = TRUE;
-    mnAlphaDepth    = -1;
+    mnBitCount		= ( nBitCount ? nBitCount : pOutDev->GetBitCount() );
+    mnOutWidth		= nDX;
+    mnOutHeight 	= nDY;
+    mbScreenComp	= TRUE;
+    mnAlphaDepth	= -1;
 
     // #i59315# init vdev size from system object, when passed a
     // SystemGraphicsData. Otherwise, output size will always
@@ -103,17 +103,17 @@ void VirtualDevice::ImplInitVirDev( const OutputDevice* pOutDev,
     else if ( pOutDev->GetOutDevType() == OUTDEV_VIRDEV )
         mbScreenComp = ((VirtualDevice*)pOutDev)->mbScreenComp;
 
-    meOutDevType    = OUTDEV_VIRDEV;
-    mbDevOutput     = TRUE;
-    mpFontList      = pSVData->maGDIData.mpScreenFontList;
-    mpFontCache     = pSVData->maGDIData.mpScreenFontCache;
-    mnDPIX          = pOutDev->mnDPIX;
-    mnDPIY          = pOutDev->mnDPIY;
-    maFont          = pOutDev->maFont;
+    meOutDevType	= OUTDEV_VIRDEV;
+    mbDevOutput 	= TRUE;
+    mpFontList		= pSVData->maGDIData.mpScreenFontList;
+    mpFontCache 	= pSVData->maGDIData.mpScreenFontCache;
+    mnDPIX			= pOutDev->mnDPIX;
+    mnDPIY			= pOutDev->mnDPIY;
+    maFont			= pOutDev->maFont;
 
     if( maTextColor != pOutDev->maTextColor )
     {
-        maTextColor = pOutDev->maTextColor;
+        maTextColor	= pOutDev->maTextColor;
         mbInitTextColor = true;
     }
 
@@ -236,15 +236,15 @@ BOOL VirtualDevice::ImplSetOutputSizePixel( const Size& rNewSize, BOOL bErase )
 
         if ( bRet )
         {
-            mnOutWidth  = rNewSize.Width();
+            mnOutWidth	= rNewSize.Width();
             mnOutHeight = rNewSize.Height();
             Erase();
         }
     }
     else
     {
-        SalVirtualDevice*   pNewVirDev;
-        ImplSVData*         pSVData = ImplGetSVData();
+        SalVirtualDevice*	pNewVirDev;
+        ImplSVData* 		pSVData = ImplGetSVData();
 
         // we need a graphics
         if ( !mpGraphics )
@@ -270,12 +270,12 @@ BOOL VirtualDevice::ImplSetOutputSizePixel( const Size& rNewSize, BOOL bErase )
                     nHeight = mnOutHeight;
                 else
                     nHeight = nNewHeight;
-                aPosAry.mnSrcX       = 0;
-                aPosAry.mnSrcY       = 0;
-                aPosAry.mnSrcWidth   = nWidth;
+                aPosAry.mnSrcX		 = 0;
+                aPosAry.mnSrcY		 = 0;
+                aPosAry.mnSrcWidth	 = nWidth;
                 aPosAry.mnSrcHeight  = nHeight;
-                aPosAry.mnDestX      = 0;
-                aPosAry.mnDestY      = 0;
+                aPosAry.mnDestX 	 = 0;
+                aPosAry.mnDestY 	 = 0;
                 aPosAry.mnDestWidth  = nWidth;
                 aPosAry.mnDestHeight = nHeight;
 
@@ -284,7 +284,7 @@ BOOL VirtualDevice::ImplSetOutputSizePixel( const Size& rNewSize, BOOL bErase )
                 ImplReleaseGraphics();
                 pSVData->mpDefInst->DestroyVirtualDevice( mpVirDev );
                 mpVirDev = pNewVirDev;
-                mnOutWidth  = rNewSize.Width();
+                mnOutWidth	= rNewSize.Width();
                 mnOutHeight = rNewSize.Height();
                 bRet = TRUE;
             }
@@ -303,11 +303,11 @@ BOOL VirtualDevice::ImplSetOutputSizePixel( const Size& rNewSize, BOOL bErase )
 
 // -----------------------------------------------------------------------
 
-// #i32109#: Fill opaque areas correctly (without relying on
+// #i32109#: Fill opaque areas correctly (without relying on 
 // fill/linecolor state)
 void VirtualDevice::ImplFillOpaqueRectangle( const Rectangle& rRect )
 {
-    // Set line and fill color to black (->opaque),
+    // Set line and fill color to black (->opaque), 
     // fill rect with that (linecolor, too, because of
     // those pesky missing pixel problems)
     Push( PUSH_LINECOLOR | PUSH_FILLCOLOR );
@@ -442,7 +442,7 @@ void VirtualDevice::ImplSetReferenceDevice( RefDevMode i_eRefDevMode, sal_Int32
 
 void VirtualDevice::Compat_ZeroExtleadBug()
 {
-    meRefDevMode = (BYTE)meRefDevMode | REFDEV_FORCE_ZERO_EXTLEAD;
+    meRefDevMode = (BYTE)meRefDevMode | REFDEV_FORCE_ZERO_EXTLEAD; 
 }
 
 // -----------------------------------------------------------------------
diff --git a/vcl/source/gdi/wall.cxx b/vcl/source/gdi/wall.cxx
index 10aa4431f69d..5c080688fab4 100644
--- a/vcl/source/gdi/wall.cxx
+++ b/vcl/source/gdi/wall.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
@@ -44,12 +44,12 @@ DBG_NAME( Wallpaper );
 ImplWallpaper::ImplWallpaper() :
     maColor( COL_TRANSPARENT )
 {
-    mnRefCount      = 1;
-    mpBitmap        = NULL;
-    mpCache         = NULL;
-    mpGradient      = NULL;
-    mpRect          = NULL;
-    meStyle         = WALLPAPER_NULL;
+    mnRefCount		= 1;
+    mpBitmap		= NULL;
+    mpCache			= NULL;
+    mpGradient		= NULL;
+    mpRect			= NULL;
+    meStyle 		= WALLPAPER_NULL;
 }
 
 // -----------------------------------------------------------------------
@@ -110,8 +110,8 @@ void ImplWallpaper::ImplReleaseCachedBitmap()
 
 SvStream& operator>>( SvStream& rIStm, ImplWallpaper& rImplWallpaper )
 {
-    VersionCompat   aCompat( rIStm, STREAM_READ );
-    UINT16          nTmp16;
+    VersionCompat	aCompat( rIStm, STREAM_READ );
+    UINT16			nTmp16;
 
     delete rImplWallpaper.mpRect;
     rImplWallpaper.mpRect = NULL;
@@ -165,11 +165,11 @@ SvStream& operator>>( SvStream& rIStm, ImplWallpaper& rImplWallpaper )
 
 SvStream& operator<<( SvStream& rOStm, const ImplWallpaper& rImplWallpaper )
 {
-    VersionCompat   aCompat( rOStm, STREAM_WRITE, 3 );
-    BOOL            bRect = ( rImplWallpaper.mpRect != NULL );
-    BOOL            bGrad = ( rImplWallpaper.mpGradient != NULL );
-    BOOL            bBmp = ( rImplWallpaper.mpBitmap != NULL );
-    BOOL            bDummy = FALSE;
+    VersionCompat	aCompat( rOStm, STREAM_WRITE, 3 );
+    BOOL			bRect = ( rImplWallpaper.mpRect != NULL );
+    BOOL			bGrad = ( rImplWallpaper.mpGradient != NULL );
+    BOOL			bBmp = ( rImplWallpaper.mpBitmap != NULL );
+    BOOL			bDummy = FALSE;
 
     // version 1
     rOStm << rImplWallpaper.maColor << (UINT16) rImplWallpaper.meStyle;
@@ -241,9 +241,9 @@ Wallpaper::Wallpaper( const Color& rColor )
 {
     DBG_CTOR( Wallpaper, NULL );
 
-    mpImplWallpaper             = new ImplWallpaper;
-    mpImplWallpaper->maColor    = rColor;
-    mpImplWallpaper->meStyle    = WALLPAPER_TILE;
+    mpImplWallpaper 			= new ImplWallpaper;
+    mpImplWallpaper->maColor	= rColor;
+    mpImplWallpaper->meStyle	= WALLPAPER_TILE;
 }
 
 // -----------------------------------------------------------------------
@@ -252,9 +252,9 @@ Wallpaper::Wallpaper( const BitmapEx& rBmpEx )
 {
     DBG_CTOR( Wallpaper, NULL );
 
-    mpImplWallpaper             = new ImplWallpaper;
-    mpImplWallpaper->mpBitmap   = new BitmapEx( rBmpEx );
-    mpImplWallpaper->meStyle    = WALLPAPER_TILE;
+    mpImplWallpaper 			= new ImplWallpaper;
+    mpImplWallpaper->mpBitmap	= new BitmapEx( rBmpEx );
+    mpImplWallpaper->meStyle	= WALLPAPER_TILE;
 }
 
 // -----------------------------------------------------------------------
@@ -263,9 +263,9 @@ Wallpaper::Wallpaper( const Gradient& rGradient )
 {
     DBG_CTOR( Wallpaper, NULL );
 
-    mpImplWallpaper             = new ImplWallpaper;
+    mpImplWallpaper 			= new ImplWallpaper;
     mpImplWallpaper->mpGradient = new Gradient( rGradient );
-    mpImplWallpaper->meStyle    = WALLPAPER_TILE;
+    mpImplWallpaper->meStyle	= WALLPAPER_TILE;
 }
 
 // -----------------------------------------------------------------------
@@ -300,11 +300,11 @@ void Wallpaper::SetColor( const Color& rColor )
 
 // -----------------------------------------------------------------------
 
-const Color& Wallpaper::GetColor() const
-{
+const Color& Wallpaper::GetColor() const 
+{ 
     DBG_CHKTHIS( Wallpaper, NULL );
 
-    return mpImplWallpaper->maColor;
+    return mpImplWallpaper->maColor; 
 }
 
 // -----------------------------------------------------------------------
@@ -325,11 +325,11 @@ void Wallpaper::SetStyle( WallpaperStyle eStyle )
 
 // -----------------------------------------------------------------------
 
-WallpaperStyle Wallpaper::GetStyle() const
-{
+WallpaperStyle Wallpaper::GetStyle() const 
+{ 
     DBG_CHKTHIS( Wallpaper, NULL );
 
-    return mpImplWallpaper->meStyle;
+    return mpImplWallpaper->meStyle; 
 }
 
 // -----------------------------------------------------------------------
@@ -391,11 +391,11 @@ BitmapEx Wallpaper::GetBitmap() const
 
 // -----------------------------------------------------------------------
 
-BOOL Wallpaper::IsBitmap() const
-{
+BOOL Wallpaper::IsBitmap() const 
+{ 
     DBG_CHKTHIS( Wallpaper, NULL );
 
-    return (mpImplWallpaper->mpBitmap != 0);
+    return (mpImplWallpaper->mpBitmap != 0); 
 }
 
 
@@ -449,11 +449,11 @@ Gradient Wallpaper::GetGradient() const
 
 // -----------------------------------------------------------------------
 
-BOOL Wallpaper::IsGradient() const
-{
+BOOL Wallpaper::IsGradient() const 
+{ 
     DBG_CHKTHIS( Wallpaper, NULL );
 
-    return (mpImplWallpaper->mpGradient != 0);
+    return (mpImplWallpaper->mpGradient != 0); 
 }
 
 
@@ -529,11 +529,11 @@ Rectangle Wallpaper::GetRect() const
 
 // -----------------------------------------------------------------------
 
-BOOL Wallpaper::IsRect() const
-{
+BOOL Wallpaper::IsRect() const 
+{ 
     DBG_CHKTHIS( Wallpaper, NULL );
 
-    return (mpImplWallpaper->mpRect != 0);
+    return (mpImplWallpaper->mpRect != 0); 
 }
 
 
@@ -599,7 +599,7 @@ BOOL Wallpaper::operator==( const Wallpaper& rWallpaper ) const
         return TRUE;
 
     if ( ( mpImplWallpaper->meStyle != rWallpaper.mpImplWallpaper->meStyle ) ||
-         ( mpImplWallpaper->maColor != rWallpaper.mpImplWallpaper->maColor ) )
+         ( mpImplWallpaper->maColor	!= rWallpaper.mpImplWallpaper->maColor ) )
         return FALSE;
 
     if ( mpImplWallpaper->mpRect != rWallpaper.mpImplWallpaper->mpRect
diff --git a/vcl/source/glyphs/gcach_ftyp.cxx b/vcl/source/glyphs/gcach_ftyp.cxx
index ebdd59f517af..2b808f0c896e 100644
--- a/vcl/source/glyphs/gcach_ftyp.cxx
+++ b/vcl/source/glyphs/gcach_ftyp.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
@@ -237,7 +237,7 @@ bool FtFontFile::Map()
         mpFileMap = (const unsigned char*)
             mmap( NULL, mnFileSize, PROT_READ, MAP_SHARED, nFile, 0 );
         if( mpFileMap == MAP_FAILED )
-            mpFileMap = NULL;
+            mpFileMap = NULL;		
         close( nFile );
 #elif defined(WNT)
         void* pFileDesc = ::CreateFile( pFileName, GENERIC_READ, FILE_SHARE_READ,
@@ -520,7 +520,7 @@ void* FreetypeServerFont::GetFtFace() const
 
 FreetypeManager::~FreetypeManager()
 {
-// This crashes on Solaris 10
+// This crashes on Solaris 10 
 // TODO: check which versions have this problem
 //
 // FT_Error rcFT = FT_Done_FreeType( aLibFT );
@@ -1307,7 +1307,7 @@ void FreetypeServerFont::InitGlyphData( int nGlyphIndex, GlyphData& rGD ) const
     int nLoadFlags = mnLoadFlags;
 
 //  if( mbArtItalic )
-//      nLoadFlags |= FT_LOAD_NO_BITMAP;
+//      nLoadFlags |= FT_LOAD_NO_BITMAP;    
 
     FT_Error rc = -1;
 #if (FTVERSION <= 2008)
@@ -1449,7 +1449,7 @@ bool FreetypeServerFont::GetGlyphBitmap1( int nGlyphIndex, RawBitmap& rRawBitmap
     //  becomes an expensive nop when a glyph covers no pixels.
     FT_BBox cbox;
     FT_Glyph_Get_CBox(pGlyphFT, ft_glyph_bbox_unscaled, &cbox);
-
+  
     if( (cbox.xMax - cbox.xMin) == 0 || (cbox.yMax - cbox.yMin == 0) )
     {
         nAngle = 0;
@@ -1457,7 +1457,7 @@ bool FreetypeServerFont::GetGlyphBitmap1( int nGlyphIndex, RawBitmap& rRawBitmap
         FT_Done_Glyph( pGlyphFT );
         return true;
     }
-
+    
     if( pGlyphFT->format != FT_GLYPH_FORMAT_BITMAP )
     {
         if( pGlyphFT->format == FT_GLYPH_FORMAT_OUTLINE )
@@ -1561,7 +1561,7 @@ bool FreetypeServerFont::GetGlyphBitmap8( int nGlyphIndex, RawBitmap& rRawBitmap
     FT_Int nLoadFlags = mnLoadFlags;
 
     if( mbArtItalic )
-        nLoadFlags |= FT_LOAD_NO_BITMAP;
+        nLoadFlags |= FT_LOAD_NO_BITMAP;    
 
 #if (FTVERSION <= 2004) && !defined(TT_CONFIG_OPTION_BYTECODE_INTERPRETER)
     // autohinting in FT<=2.0.4 makes antialiased glyphs look worse
@@ -1735,7 +1735,7 @@ bool FreetypeServerFont::GetFontCodeRanges( CmapResult& rResult ) const
 {
     rResult.mbSymbolic = mpFontInfo->IsSymbolFont();
 
-    // TODO: is the full CmapResult needed on platforms calling this?
+    // TODO: is the full CmapResult needed on platforms calling this? 
     if( FT_IS_SFNT( maFaceFT ) )
     {
         ULONG nLength = 0;
@@ -1754,11 +1754,11 @@ bool FreetypeServerFont::GetFontCodeRanges( CmapResult& rResult ) const
     for( sal_uInt32 cCode = FT_Get_First_Char( maFaceFT, &nGlyphIndex );; )
     {
         if( !nGlyphIndex )
-            break;
-        aCodes.push_back( cCode );  // first code inside range
+            break;	
+        aCodes.push_back( cCode );	// first code inside range
         sal_uInt32 cNext = cCode;
         do cNext = FT_Get_Next_Char( maFaceFT, cCode, &nGlyphIndex ); while( cNext == ++cCode );
-        aCodes.push_back( cCode );  // first code outside range
+        aCodes.push_back( cCode );	// first code outside range
         cCode = cNext;
     }
 
@@ -1964,10 +1964,10 @@ ULONG FreetypeServerFont::GetKernPairs( ImplKernPairData** ppKernPairs ) const
                 }
                 break;
 
-                case 2: // version 0, kerning format 2
+                case 2:	// version 0, kerning format 2
                 {
                     const FT_Byte* pSubTable = pBuffer;
-                    /*USHORT nRowWidth  =*/ NEXT_U16( pBuffer );
+                    /*USHORT nRowWidth	=*/ NEXT_U16( pBuffer );
                     USHORT nOfsLeft     = NEXT_U16( pBuffer );
                     USHORT nOfsRight    = NEXT_U16( pBuffer );
                     USHORT nOfsArray    = NEXT_U16( pBuffer );
@@ -2160,7 +2160,7 @@ void PolyArgs::ClosePolygon()
     const sal_uInt16 nPolySize(aPoly.GetSize());
     if(nPolySize)
     {
-        if((aPoly.HasFlags() && POLY_CONTROL == aPoly.GetFlags(nPolySize - 1))
+        if((aPoly.HasFlags() && POLY_CONTROL == aPoly.GetFlags(nPolySize - 1)) 
             || (aPoly.GetPoint(nPolySize - 1) != aPoly.GetPoint(0)))
         {
             aPoly.SetSize(nPolySize + 1);
diff --git a/vcl/source/glyphs/gcach_ftyp.hxx b/vcl/source/glyphs/gcach_ftyp.hxx
index 5ebe70bcbdf9..7c936e4721ae 100644
--- a/vcl/source/glyphs/gcach_ftyp.hxx
+++ b/vcl/source/glyphs/gcach_ftyp.hxx
@@ -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
@@ -219,9 +219,9 @@ private:
     FT_SizeRec_*                maSizeFT;
 
     bool                        mbFaceOk;
-    bool            mbArtItalic;
-    bool            mbArtBold;
-    bool            mbUseGamma;
+    bool			mbArtItalic;
+    bool			mbArtBold;
+    bool			mbUseGamma;
 
     typedef ::std::hash_map<int,int> GlyphSubstitution;
     GlyphSubstitution           maGlyphSubstitution;
diff --git a/vcl/source/glyphs/gcach_layout.cxx b/vcl/source/glyphs/gcach_layout.cxx
index a9f9167062ba..b1a03bee2bf9 100644
--- a/vcl/source/glyphs/gcach_layout.cxx
+++ b/vcl/source/glyphs/gcach_layout.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
@@ -335,7 +335,7 @@ void IcuFontFromServerFont::getGlyphAdvance( LEGlyphID nGlyphIndex,
 // -----------------------------------------------------------------------
 
 le_bool IcuFontFromServerFont::getGlyphPoint( LEGlyphID,
-    le_int32
+    le_int32 
 #if OSL_DEBUG_LEVEL > 1
 pointNumber
 #endif
@@ -562,13 +562,13 @@ bool IcuLayoutEngine::operator()( ServerFontLayout& rLayout, ImplLayoutArgs& rAr
             {
                 // left-to-right case
                 if( nClusterMinPos > nCharPos )
-                    nClusterMinPos = nCharPos;      // extend cluster
+                    nClusterMinPos = nCharPos;		// extend cluster
                 else if( nCharPos <= nClusterMaxPos )
-                    /*NOTHING*/;                    // inside cluster
+                    /*NOTHING*/;					// inside cluster
                 else if( bDiacritic )
-                    nClusterMaxPos = nCharPos;      // add diacritic to cluster
+                    nClusterMaxPos = nCharPos;		// add diacritic to cluster
                 else {
-                    nClusterMinPos = nClusterMaxPos = nCharPos; // new cluster
+                    nClusterMinPos = nClusterMaxPos = nCharPos;	// new cluster
                     bInCluster = false;
                 }
             }
@@ -576,12 +576,12 @@ bool IcuLayoutEngine::operator()( ServerFontLayout& rLayout, ImplLayoutArgs& rAr
             {
                 // right-to-left case
                 if( nClusterMaxPos < nCharPos )
-                    nClusterMaxPos = nCharPos;      // extend cluster
+                    nClusterMaxPos = nCharPos;		// extend cluster
                 else if( nCharPos >= nClusterMinPos )
-                    /*NOTHING*/;                    // inside cluster
+                    /*NOTHING*/;					// inside cluster
                 else if( bDiacritic )
                 {
-                    nClusterMinPos = nCharPos;      // ICU often has [diacritic* baseglyph*]
+                    nClusterMinPos = nCharPos;		// ICU often has [diacritic* baseglyph*]
                     if( bClusterStart ) {
                         nClusterMaxPos = nCharPos;
                         bInCluster = false;
@@ -589,7 +589,7 @@ bool IcuLayoutEngine::operator()( ServerFontLayout& rLayout, ImplLayoutArgs& rAr
                 }
                 else
                 {
-                    nClusterMinPos = nClusterMaxPos = nCharPos; // new cluster
+                    nClusterMinPos = nClusterMaxPos = nCharPos;	// new cluster
                     bInCluster = !bClusterStart;
                 }
             }
diff --git a/vcl/source/glyphs/gcach_rbmp.cxx b/vcl/source/glyphs/gcach_rbmp.cxx
index 5ea80da77794..b7ab25cd026d 100644
--- a/vcl/source/glyphs/gcach_rbmp.cxx
+++ b/vcl/source/glyphs/gcach_rbmp.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
@@ -211,7 +211,7 @@ bool RawBitmap::Rotate( int nAngle )
     unsigned char* pBuf = new unsigned char[ nBufSize ];
     if( !pBuf )
         return false;
-
+    
     memset( pBuf, 0, nBufSize );
     int i;
 
diff --git a/vcl/source/glyphs/gcach_vdev.cxx b/vcl/source/glyphs/gcach_vdev.cxx
index 8cd45cf58224..4db84d4137ca 100644
--- a/vcl/source/glyphs/gcach_vdev.cxx
+++ b/vcl/source/glyphs/gcach_vdev.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
@@ -56,22 +56,22 @@ void VirtDevServerFont::AnnounceFonts( ImplDevFontList* pToAdd )
         ImplFontData& rData = *new ImplFontData;
         rData.SetSysData( new FontSysData( (void*)SERVERFONT_MAGIC ) );
 
-        rData.maName        = aFontInfo.GetName();
-        rData.maStyleName   = aFontInfo.GetStyleName();
-        rData.mnWidth       = aFontInfo.GetWidth();
-        rData.mnHeight      = aFontInfo.GetHeight();
-        rData.meFamily      = aFontInfo.GetFamily();
-        rData.meCharSet     = aFontInfo.GetCharSet();
-        rData.mePitch       = aFontInfo.GetPitch();
-        rData.meWidthType   = aFontInfo.GetWidthType();
-        rData.meWeight      = aFontInfo.GetWeight();
-        rData.meItalic      = aFontInfo.GetItalic();
-        rData.meType        = aFontInfo.GetType();
-        rData.meFamily      = aFontInfo.GetFamily();
-
-        rData.mbOrientation = true;         // TODO: where to get this info?
-        rData.mbDevice      = false;
-        rData.mnQuality     = 0;            // prefer client-side fonts if available
+        rData.maName		= aFontInfo.GetName();
+        rData.maStyleName	= aFontInfo.GetStyleName();
+        rData.mnWidth		= aFontInfo.GetWidth();
+        rData.mnHeight		= aFontInfo.GetHeight();
+        rData.meFamily		= aFontInfo.GetFamily();
+        rData.meCharSet		= aFontInfo.GetCharSet();
+        rData.mePitch		= aFontInfo.GetPitch();
+        rData.meWidthType	= aFontInfo.GetWidthType();
+        rData.meWeight		= aFontInfo.GetWeight();
+        rData.meItalic		= aFontInfo.GetItalic();
+        rData.meType		= aFontInfo.GetType();
+        rData.meFamily		= aFontInfo.GetFamily();
+
+        rData.mbOrientation	= true;			// TODO: where to get this info?
+        rData.mbDevice		= false;
+        rData.mnQuality		= 0;			// prefer client-side fonts if available
 
         pToAdd->Add( &rData );
     }
@@ -97,7 +97,7 @@ VirtDevServerFont* VirtDevServerFont::CreateFont( const ImplFontSelectData& rFSD
 // -----------------------------------------------------------------------
 
 VirtDevServerFont::VirtDevServerFont( const ImplFontSelectData& rFSD )
-:   ServerFont( rFSD)
+:	ServerFont( rFSD)
 {}
 
 // -----------------------------------------------------------------------
@@ -107,37 +107,37 @@ void VirtDevServerFont::FetchFontMetric( ImplFontMetricData& rTo, long& rFactor
     const ImplFontSelectData& aFSD = GetFontSelData();
 
     Font aFont;
-    aFont.SetName       ( aFSD.maName );
-    aFont.SetStyleName  ( aFSD.maStyleName );
-    aFont.SetHeight     ( aFSD.mnHeight );
-    aFont.SetWidth      ( aFSD.mnWidth );
+    aFont.SetName		( aFSD.maName );
+    aFont.SetStyleName	( aFSD.maStyleName );
+    aFont.SetHeight		( aFSD.mnHeight );
+    aFont.SetWidth		( aFSD.mnWidth );
     aFont.SetOrientation( aFSD.mnOrientation );
-    aFont.SetVertical   ( GetFontSelData().mbVertical );
+    aFont.SetVertical	( GetFontSelData().mbVertical );
 
     VirtualDevice vdev( 1 );
     FontMetric aMetric( vdev.GetFontMetric( aFont ) );
 
     rFactor = 0x100;
 
-    rTo.mnAscent        = aMetric.GetAscent();
-    rTo.mnDescent       = aMetric.GetDescent();
-    rTo.mnIntLeading    = aMetric.GetIntLeading();
-    rTo.mnExtLeading    = aMetric.GetExtLeading();
-    rTo.mnSlant     = aMetric.GetSlant();
-    rTo.meType      = aMetric.GetType();
-    rTo.mnFirstChar     = 0x0020;   // TODO: where to get this info?
-    rTo.mnLastChar      = 0xFFFE;   // TODO: where to get this info?
-
-    rTo.mnWidth         = aFSD.mnWidth;
-    rTo.maName          = aFSD.maName;
-    rTo.maStyleName     = aFSD.maStyleName;
-    rTo.mnOrientation   = aFSD.mnOrientation;
-    rTo.meFamily        = aFSD.meFamily;
-    rTo.meCharSet       = aFSD.meCharSet;
-    rTo.meWeight        = aFSD.meWeight;
-    rTo.meItalic        = aFSD.meItalic;
-    rTo.mePitch         = aFSD.mePitch;
-    rTo.mbDevice        = FALSE;
+    rTo.mnAscent		= aMetric.GetAscent();
+    rTo.mnDescent		= aMetric.GetDescent();
+    rTo.mnIntLeading	= aMetric.GetIntLeading();
+    rTo.mnExtLeading	= aMetric.GetExtLeading();
+    rTo.mnSlant		= aMetric.GetSlant();
+    rTo.meType		= aMetric.GetType();
+    rTo.mnFirstChar		= 0x0020;	// TODO: where to get this info?
+    rTo.mnLastChar		= 0xFFFE;	// TODO: where to get this info?
+
+    rTo.mnWidth			= aFSD.mnWidth;
+    rTo.maName			= aFSD.maName;
+    rTo.maStyleName		= aFSD.maStyleName;
+    rTo.mnOrientation	= aFSD.mnOrientation;
+    rTo.meFamily		= aFSD.meFamily;
+    rTo.meCharSet		= aFSD.meCharSet;
+    rTo.meWeight		= aFSD.meWeight;
+    rTo.meItalic		= aFSD.meItalic;
+    rTo.mePitch			= aFSD.mePitch;
+    rTo.mbDevice		= FALSE;
 }
 
 // -----------------------------------------------------------------------
@@ -152,19 +152,19 @@ int VirtDevServerFont::GetGlyphIndex( sal_Unicode aChar ) const
 void VirtDevServerFont::InitGlyphData( int nGlyphIndex, GlyphData& rGD ) const
 {
     Font aFont;
-    aFont.SetName       ( GetFontSelData().maName );
-    aFont.SetStyleName  ( GetFontSelData().maStyleName );
-    aFont.SetHeight     ( GetFontSelData().mnHeight );
-    aFont.SetWidth      ( GetFontSelData().mnWidth );
+    aFont.SetName		( GetFontSelData().maName );
+    aFont.SetStyleName	( GetFontSelData().maStyleName );
+    aFont.SetHeight		( GetFontSelData().mnHeight );
+    aFont.SetWidth		( GetFontSelData().mnWidth );
     aFont.SetOrientation( GetFontSelData().mnOrientation );
-    aFont.SetVertical   ( GetFontSelData().mbVertical );
+    aFont.SetVertical	( GetFontSelData().mbVertical );
 
     VirtualDevice vdev( 1 );
     vdev.SetFont( aFont );
 
     // get glyph metrics
     sal_Int32 nCharWidth = 10;
-// TODO:    vdev.GetCharWidth( nGlyphIndex, nGlyphIndex, &nCharWidth );
+// TODO:	vdev.GetCharWidth( nGlyphIndex, nGlyphIndex, &nCharWidth );
     rGD.SetCharWidth( nCharWidth );
 
     sal_Unicode aChar = nGlyphIndex;
@@ -208,7 +208,7 @@ bool VirtDevServerFont::GetGlyphBitmap1( int nGlyphIndex, RawBitmap& ) const
 
 // -----------------------------------------------------------------------
 
-bool     VirtDevServerFont::GetGlyphBitmap8( int nGlyphIndex, RawBitmap& ) const
+bool	 VirtDevServerFont::GetGlyphBitmap8( int nGlyphIndex, RawBitmap& ) const
 {
     return false;
 }
@@ -225,12 +225,12 @@ int VirtDevServerFont::GetGlyphKernValue( int, int ) const
 ULONG VirtDevServerFont::GetKernPairs( ImplKernPairData** ppImplKernPairs ) const
 {
     Font aFont;
-    aFont.SetName       ( GetFontSelData().maName );
-    aFont.SetStyleName  ( GetFontSelData().maStyleName );
-    aFont.SetHeight     ( GetFontSelData().mnHeight );
-    aFont.SetWidth      ( GetFontSelData().mnWidth );
+    aFont.SetName		( GetFontSelData().maName );
+    aFont.SetStyleName	( GetFontSelData().maStyleName );
+    aFont.SetHeight		( GetFontSelData().mnHeight );
+    aFont.SetWidth		( GetFontSelData().mnWidth );
     aFont.SetOrientation( GetFontSelData().mnOrientation );
-    aFont.SetVertical   ( GetFontSelData().mbVertical );
+    aFont.SetVertical	( GetFontSelData().mbVertical );
 
     VirtualDevice vdev( 1 );
     vdev.SetFont( aFont );
@@ -246,9 +246,9 @@ ULONG VirtDevServerFont::GetKernPairs( ImplKernPairData** ppImplKernPairs ) cons
         KerningPair* pFrom = pKernPairs;
         for ( ULONG n = 0; n < nPairs; n++ )
         {
-            pTo->mnChar1    = pFrom->nChar1;
-            pTo->mnChar2    = pFrom->nChar2;
-            pTo->mnKern     = pFrom->nKern;
+            pTo->mnChar1	= pFrom->nChar1;
+            pTo->mnChar2	= pFrom->nChar2;
+            pTo->mnKern		= pFrom->nKern;
             ++pFrom;
             ++pTo;
         }
@@ -266,12 +266,12 @@ bool VirtDevServerFont::GetGlyphOutline( int nGlyphIndex, PolyPolygon& rPolyPoly
     return false;
     /*
     Font aFont;
-    aFont.SetName       ( GetFontSelData().maName );
-    aFont.SetStyleName  ( GetFontSelData().maStyleName );
-    aFont.SetHeight     ( GetFontSelData().mnHeight );
-    aFont.SetWidth      ( GetFontSelData().mnWidth );
+    aFont.SetName		( GetFontSelData().maName );
+    aFont.SetStyleName	( GetFontSelData().maStyleName );
+    aFont.SetHeight		( GetFontSelData().mnHeight );
+    aFont.SetWidth		( GetFontSelData().mnWidth );
     aFont.SetOrientation( GetFontSelData().mnOrientation );
-    aFont.SetVertical   ( GetFontSelData().mbVertical );
+    aFont.SetVertical	( GetFontSelData().mbVertical );
 
     VirtualDevice vdev( 1 );
     vdev.SetFont( aFont );
diff --git a/vcl/source/glyphs/gcach_vdev.hxx b/vcl/source/glyphs/gcach_vdev.hxx
index e2349169ee13..f8512ed57850 100644
--- a/vcl/source/glyphs/gcach_vdev.hxx
+++ b/vcl/source/glyphs/gcach_vdev.hxx
@@ -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
@@ -32,23 +32,23 @@
 class VirtDevServerFont : public ServerFont
 {
 public:
-    virtual bool                GetAntialiasAdvice( void ) const;
-    virtual bool                GetGlyphBitmap1( int nGlyphIndex, RawBitmap& ) const;
-    virtual bool                GetGlyphBitmap8( int nGlyphIndex, RawBitmap& ) const;
-    virtual bool                GetGlyphOutline( int nGlyphIndex, PolyPolygon& ) const;
+    virtual bool				GetAntialiasAdvice( void ) const;
+    virtual bool				GetGlyphBitmap1( int nGlyphIndex, RawBitmap& ) const;
+    virtual bool				GetGlyphBitmap8( int nGlyphIndex, RawBitmap& ) const;
+    virtual bool				GetGlyphOutline( int nGlyphIndex, PolyPolygon& ) const;
 
 protected:
     friend class GlyphCache;
-    static void                 AnnounceFonts( ImplDevFontList* );
-    static void                 ClearFontList();
+    static void					AnnounceFonts( ImplDevFontList* );
+    static void					ClearFontList();
 
-    static VirtDevServerFont*   CreateFont( const ImplFontSelectData& );
-    virtual void                FetchFontMetric( ImplFontMetricData&, long& rFactor ) const;
-    virtual ULONG               GetKernPairs( ImplKernPairData** ) const;
+    static VirtDevServerFont*	CreateFont( const ImplFontSelectData& );
+    virtual void				FetchFontMetric( ImplFontMetricData&, long& rFactor ) const;
+    virtual ULONG				GetKernPairs( ImplKernPairData** ) const;
     virtual int                 GetGlyphKernValue( int, int ) const;
 
-    virtual int                 GetGlyphIndex( sal_Unicode ) const;
-    virtual void                InitGlyphData( int nGlyphIndex, GlyphData& ) const;
+    virtual int					GetGlyphIndex( sal_Unicode ) const;
+    virtual void				InitGlyphData( int nGlyphIndex, GlyphData& ) const;
 
 private:
                                 VirtDevServerFont( const ImplFontSelectData& );
diff --git a/vcl/source/glyphs/glyphcache.cxx b/vcl/source/glyphs/glyphcache.cxx
index 1953ecf553c4..abb4b96448af 100644
--- a/vcl/source/glyphs/glyphcache.cxx
+++ b/vcl/source/glyphs/glyphcache.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
@@ -42,7 +42,7 @@
 #include <vcl/graphite_features.hxx>
 #endif
 
-#include <rtl/ustring.hxx>      // used only for string=>hashvalue
+#include <rtl/ustring.hxx>		// used only for string=>hashvalue
 #include <osl/file.hxx>
 #include <tools/debug.hxx>
 
@@ -228,9 +228,9 @@ ServerFont* GlyphCache::CacheFont( const ImplFontSelectData& rFontSelData )
     if( nFontId <= 0 )
         return NULL;
 
-    // the FontList's key mpFontData member is reinterpreted as font id
+    // the FontList's key mpFontData member is reinterpreted as font id 
     ImplFontSelectData aFontSelData = rFontSelData;
-    aFontSelData.mpFontData = reinterpret_cast<ImplFontData*>( nFontId );
+    aFontSelData.mpFontData = reinterpret_cast<ImplFontData*>( nFontId ); 
     FontList::iterator it = maFontList.find( aFontSelData );
     if( it != maFontList.end() )
     {
diff --git a/vcl/source/glyphs/graphite_adaptors.cxx b/vcl/source/glyphs/graphite_adaptors.cxx
index f82e3afe39c8..cf7066a9ba2f 100644
--- a/vcl/source/glyphs/graphite_adaptors.cxx
+++ b/vcl/source/glyphs/graphite_adaptors.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
diff --git a/vcl/source/glyphs/graphite_cache.cxx b/vcl/source/glyphs/graphite_cache.cxx
index 389accd631f0..da1be3bffac0 100644
--- a/vcl/source/glyphs/graphite_cache.cxx
+++ b/vcl/source/glyphs/graphite_cache.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
diff --git a/vcl/source/glyphs/graphite_features.cxx b/vcl/source/glyphs/graphite_features.cxx
index 1cb25306c4ee..343fec2ef1bb 100644
--- a/vcl/source/glyphs/graphite_features.cxx
+++ b/vcl/source/glyphs/graphite_features.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
@@ -24,7 +24,7 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-
+ 
 // Description:
 // Parse a string of features specified as & separated pairs.
 // e.g.
diff --git a/vcl/source/glyphs/graphite_layout.cxx b/vcl/source/glyphs/graphite_layout.cxx
index ae7ec8246e33..300f23aad8b4 100644
--- a/vcl/source/glyphs/graphite_layout.cxx
+++ b/vcl/source/glyphs/graphite_layout.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
@@ -24,7 +24,7 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-
+ 
 // Description: An implementation of the SalLayout interface that uses the
 //              Graphite engine.
 
@@ -594,21 +594,39 @@ bool GraphiteLayout::LayoutText(ImplLayoutArgs & rArgs)
 {
 #ifdef GRCACHE
     GrSegRecord * pSegRecord = NULL;
-    gr::Segment * pSegment = CreateSegment(rArgs, &pSegRecord);
-    if (!pSegment)
-       return false;
-
+    gr::Segment * pSegment = NULL;
+    // Graphite can in rare cases crash with a zero length
+    if (rArgs.mnMinCharPos < rArgs.mnEndCharPos)
+    {
+        pSegment = CreateSegment(rArgs, &pSegRecord);
+        if (!pSegment)
+            return false;
+    }
+    else
+    {
+        clear();
+        return true;
+    }
     // layout the glyphs as required by OpenOffice
     bool success = LayoutGlyphs(rArgs, pSegment, pSegRecord);
 
     if (pSegRecord) pSegRecord->unlock();
     else delete pSegment;
 #else
-    gr::Segment * pSegment = CreateSegment(rArgs);
-    if (!pSegment)
-        return false;
-    bool success = LayoutGlyphs(rArgs, pSegment);
-    delete pSegment;
+    gr::Segment * pSegment = NULL;
+    bool success = true;
+    if (rArgs.mnMinCharPos < rArgs.mnEndCharPos)
+    {
+        pSegment = CreateSegment(rArgs);
+        if (!pSegment)
+            return false;
+        success = LayoutGlyphs(rArgs, pSegment);
+        if (pSegment) delete pSegment;
+    }
+    else
+    {
+        clear();
+    }
 #endif
     return success;
 }
@@ -659,7 +677,7 @@ public:
         return hash;
     };
 protected:
-    virtual void UniqueCacheInfo(std::wstring & stuFace, bool & fBold, bool & fItalic)
+    virtual void UniqueCacheInfo( ext_std::wstring& stuFace, bool& fBold, bool& fItalic )
     {
 #ifdef WIN32
         dynamic_cast<GraphiteWinFont&>(mrRealFont).UniqueCacheInfo(stuFace, fBold, fItalic);
@@ -722,7 +740,7 @@ gr::Segment * GraphiteLayout::CreateSegment(ImplLayoutArgs& rArgs)
             (GraphiteCacheHandler::instance).getCache(aFontHash);
         if (pCache)
         {
-            *pSegRecord = pCache->getSegment(rArgs, bRtl, nSegCharLimit);
+            *pSegRecord = pCache->getSegment(rArgs, bRtl, limit);
             if (*pSegRecord)
             {
                 pSegment = (*pSegRecord)->getSegment();
@@ -736,7 +754,34 @@ gr::Segment * GraphiteLayout::CreateSegment(ImplLayoutArgs& rArgs)
                     (*pSegRecord)->clearVectors();
                 }
                 mpTextSrc->switchLayoutArgs(rArgs);
-                return pSegment;
+                if (limit > rArgs.mnMinCharPos && limit == rArgs.mnEndCharPos
+                    && pSegment->stopCharacter() != limit)
+                {
+                    // check that the last character is not part of a ligature
+                    glyph_set_range_t aGlyphSet = pSegment->charToGlyphs(limit - 1);
+                    if (aGlyphSet.first == aGlyphSet.second)
+                    {
+                        // no glyphs associated with this glyph - occurs mid ligature
+                        pSegment = NULL;
+                        *pSegRecord = NULL;
+                    }
+                    else
+                    {
+                        while (aGlyphSet.first != aGlyphSet.second)
+                        {
+                            int lastChar = static_cast<int>((*aGlyphSet.first).lastChar());
+                            if (lastChar >= limit)
+                            {
+                                pSegment = NULL;
+                                *pSegRecord = NULL;
+                                break;
+                            }
+                            aGlyphSet.first++;
+                        }
+                    }
+                }
+                if (pSegment)
+                    return pSegment;
             }
         }
 #endif
@@ -1058,7 +1103,7 @@ void GraphiteLayout::ApplyDXArray(ImplLayoutArgs &args, std::vector<int> & rDelt
     {
         nXOffset = args.mpDXArray[nChars - 1] - mvCharDxs[nChars - 1];
     }
-    int nPrevClusterGlyph = (bRtl)? mvGlyphs.size() : -1;
+    int nPrevClusterGlyph = (bRtl)? (signed)mvGlyphs.size() : -1;
     int nPrevClusterLastChar = -1;
     for (size_t i = 0; i < nChars; i++)
     {
diff --git a/vcl/source/glyphs/graphite_serverfont.cxx b/vcl/source/glyphs/graphite_serverfont.cxx
index eda97f509f03..137322da0c70 100644
--- a/vcl/source/glyphs/graphite_serverfont.cxx
+++ b/vcl/source/glyphs/graphite_serverfont.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
diff --git a/vcl/source/glyphs/graphite_textsrc.cxx b/vcl/source/glyphs/graphite_textsrc.cxx
index 5764ba9454c9..d3bf1c57ec08 100644
--- a/vcl/source/glyphs/graphite_textsrc.cxx
+++ b/vcl/source/glyphs/graphite_textsrc.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
diff --git a/vcl/source/glyphs/graphite_textsrc.hxx b/vcl/source/glyphs/graphite_textsrc.hxx
index 3912977cc9be..b8f6ff3991a2 100644
--- a/vcl/source/glyphs/graphite_textsrc.hxx
+++ b/vcl/source/glyphs/graphite_textsrc.hxx
@@ -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
@@ -24,7 +24,7 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-
+ 
 #ifndef _SV_GRAPHITETEXTSRC_HXX
 #define _SV_GRAPHITETEXTSRC_HXX
 // Description: Implements the Graphite interfaces IGrTextSource and
diff --git a/vcl/source/helper/canvasbitmap.cxx b/vcl/source/helper/canvasbitmap.cxx
index 2bc0ab94d272..7ce0b8354a62 100644
--- a/vcl/source/helper/canvasbitmap.cxx
+++ b/vcl/source/helper/canvasbitmap.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
@@ -51,7 +51,7 @@ using namespace ::com::sun::star;
 namespace
 {
     // TODO(Q3): move to o3tl bithacks or somesuch. A similar method is in canvas/canvastools.hxx
-
+    
     // Good ole HAKMEM tradition. Calc number of 1 bits in 32bit word,
     // unrolled loop. See e.g. Hackers Delight, p. 66
     inline sal_Int32 bitcount( sal_uInt32 val )
@@ -183,7 +183,7 @@ VclCanvasBitmap::VclCanvasBitmap( const BitmapEx& rBitmap ) :
                 m_nEndianness        = util::Endianness::LITTLE; // doesn't matter
                 m_aLayout.IsMsbFirst = sal_False; // doesn't matter
                 break;
-
+                
             case BMP_FORMAT_8BIT_TC_MASK:
                 m_bPalette           = false;
                 m_nBitsPerInputPixel = 8;
@@ -264,7 +264,7 @@ VclCanvasBitmap::VclCanvasBitmap( const BitmapEx& rBitmap ) :
                 pCounts[1]         = 8;
                 pCounts[2]         = 8;
                 pCounts[3]         = 8;
-
+                
                 m_nRedIndex   = 3;
                 m_nGreenIndex = 2;
                 m_nBlueIndex  = 1;
@@ -409,11 +409,11 @@ VclCanvasBitmap::VclCanvasBitmap( const BitmapEx& rBitmap ) :
                 // put alpha in front of all the color channels
                 sal_Int8*  pTags  =m_aComponentTags.getArray();
                 sal_Int32* pCounts=m_aComponentBitCounts.getArray();
-                std::rotate(pTags,
-                            pTags+m_aComponentTags.getLength()-1,
+                std::rotate(pTags, 
+                            pTags+m_aComponentTags.getLength()-1, 
                             pTags+m_aComponentTags.getLength());
-                std::rotate(pCounts,
-                            pCounts+m_aComponentBitCounts.getLength()-1,
+                std::rotate(pCounts, 
+                            pCounts+m_aComponentBitCounts.getLength()-1, 
                             pCounts+m_aComponentBitCounts.getLength());
                 ++m_nRedIndex;
                 ++m_nGreenIndex;
@@ -428,7 +428,7 @@ VclCanvasBitmap::VclCanvasBitmap( const BitmapEx& rBitmap ) :
 
             // adapt scanline parameters
             const Size aSize = m_aBitmap.GetSizePixel();
-            m_aLayout.ScanLineBytes  =
+            m_aLayout.ScanLineBytes  = 
             m_aLayout.ScanLineStride = (aSize.Width()*m_nBitsPerOutputPixel + 7)/8;
         }
     }
@@ -455,20 +455,20 @@ geometry::IntegerSize2D SAL_CALL VclCanvasBitmap::getSize() throw (uno::RuntimeE
     return m_aBmpEx.IsTransparent();
 }
 
-uno::Reference< rendering::XBitmap > SAL_CALL VclCanvasBitmap::getScaledBitmap( const geometry::RealSize2D& newSize,
+uno::Reference< rendering::XBitmap > SAL_CALL VclCanvasBitmap::getScaledBitmap( const geometry::RealSize2D& newSize, 
                                                                                 sal_Bool beFast ) throw (uno::RuntimeException)
 {
     vos::OGuard aGuard( Application::GetSolarMutex() );
-
+    
     BitmapEx aNewBmp( m_aBitmap );
     aNewBmp.Scale( sizeFromRealSize2D( newSize ), beFast ? BMP_SCALE_FAST : BMP_SCALE_INTERPOLATE );
     return uno::Reference<rendering::XBitmap>( new VclCanvasBitmap( aNewBmp ) );
 }
 
 // XIntegerReadOnlyBitmap
-uno::Sequence< sal_Int8 > SAL_CALL VclCanvasBitmap::getData( rendering::IntegerBitmapLayout&     bitmapLayout,
-                                                             const geometry::IntegerRectangle2D& rect ) throw( lang::IndexOutOfBoundsException,
-                                                                                                               rendering::VolatileContentDestroyedException,
+uno::Sequence< sal_Int8 > SAL_CALL VclCanvasBitmap::getData( rendering::IntegerBitmapLayout& 	 bitmapLayout,
+                                                             const geometry::IntegerRectangle2D& rect ) throw( lang::IndexOutOfBoundsException, 
+                                                                                                               rendering::VolatileContentDestroyedException, 
                                                                                                                uno::RuntimeException)
 {
     vos::OGuard aGuard( Application::GetSolarMutex() );
@@ -478,7 +478,7 @@ uno::Sequence< sal_Int8 > SAL_CALL VclCanvasBitmap::getData( rendering::IntegerB
     const ::Rectangle aRequestedArea( vcl::unotools::rectangleFromIntegerRectangle2D(rect) );
     if( aRequestedArea.IsEmpty() )
         return uno::Sequence< sal_Int8 >();
-
+        
     // Invalid/empty bitmap: no data available
     if( !m_pBmpAcc )
         throw lang::IndexOutOfBoundsException();
@@ -492,19 +492,19 @@ uno::Sequence< sal_Int8 > SAL_CALL VclCanvasBitmap::getData( rendering::IntegerB
         throw lang::IndexOutOfBoundsException();
     }
 
-    uno::Sequence< sal_Int8 > aRet;
+    uno::Sequence< sal_Int8 > aRet; 
     Rectangle aRequestedBytes( aRequestedArea );
 
     // adapt to byte boundaries
     aRequestedBytes.Left()  = aRequestedArea.Left()*m_nBitsPerOutputPixel/8;
     aRequestedBytes.Right() = (aRequestedArea.Right()*m_nBitsPerOutputPixel + 7)/8;
-
+        
     // copy stuff to output sequence
     aRet.realloc(aRequestedBytes.getWidth()*aRequestedBytes.getHeight());
     sal_Int8* pOutBuf = aRet.getArray();
 
     bitmapLayout.ScanLines     = aRequestedBytes.getHeight();
-    bitmapLayout.ScanLineBytes =
+    bitmapLayout.ScanLineBytes = 
     bitmapLayout.ScanLineStride= aRequestedBytes.getWidth();
 
     sal_Int32 nScanlineStride=bitmapLayout.ScanLineStride;
@@ -571,9 +571,9 @@ uno::Sequence< sal_Int8 > SAL_CALL VclCanvasBitmap::getData( rendering::IntegerB
     return aRet;
 }
 
-uno::Sequence< sal_Int8 > SAL_CALL VclCanvasBitmap::getPixel( rendering::IntegerBitmapLayout&   bitmapLayout,
-                                                              const geometry::IntegerPoint2D&   pos ) throw (lang::IndexOutOfBoundsException,
-                                                                                                             rendering::VolatileContentDestroyedException,
+uno::Sequence< sal_Int8 > SAL_CALL VclCanvasBitmap::getPixel( rendering::IntegerBitmapLayout&	bitmapLayout,
+                                                              const geometry::IntegerPoint2D&	pos ) throw (lang::IndexOutOfBoundsException, 
+                                                                                                             rendering::VolatileContentDestroyedException, 
                                                                                                              uno::RuntimeException)
 {
     vos::OGuard aGuard( Application::GetSolarMutex() );
@@ -597,7 +597,7 @@ uno::Sequence< sal_Int8 > SAL_CALL VclCanvasBitmap::getPixel( rendering::Integer
 
     // copy stuff to output sequence
     bitmapLayout.ScanLines     = 1;
-    bitmapLayout.ScanLineBytes =
+    bitmapLayout.ScanLineBytes = 
     bitmapLayout.ScanLineStride= aRet.getLength();
 
     const long nScanlineLeftOffset( pos.X*m_nBitsPerInputPixel/8 );
@@ -682,7 +682,7 @@ sal_Bool SAL_CALL VclCanvasBitmap::getIndex( uno::Sequence< double >& o_entry, s
 {
     vos::OGuard aGuard( Application::GetSolarMutex() );
 
-    const USHORT nCount( m_pBmpAcc ?
+    const USHORT nCount( m_pBmpAcc ? 
                          (m_pBmpAcc->HasPalette() ? m_pBmpAcc->GetPaletteEntryCount() : 0 ) : 0 );
     OSL_ENSURE(nIndex >= 0 && nIndex < nCount,"Palette index out of range");
     if( nIndex < 0 || nIndex >= nCount )
@@ -703,7 +703,7 @@ sal_Bool SAL_CALL VclCanvasBitmap::setIndex( const uno::Sequence< double >&, sal
 {
     vos::OGuard aGuard( Application::GetSolarMutex() );
 
-    const USHORT nCount( m_pBmpAcc ?
+    const USHORT nCount( m_pBmpAcc ? 
                          (m_pBmpAcc->HasPalette() ? m_pBmpAcc->GetPaletteEntryCount() : 0 ) : 0 );
 
     OSL_ENSURE(nIndex >= 0 && nIndex < nCount,"Palette index out of range");
@@ -714,16 +714,16 @@ sal_Bool SAL_CALL VclCanvasBitmap::setIndex( const uno::Sequence< double >&, sal
     return sal_False; // read-only implementation
 }
 
-namespace
-{
+namespace 
+{ 
     struct PaletteColorSpaceHolder: public rtl::StaticWithInit<uno::Reference<rendering::XColorSpace>,
-                                                               PaletteColorSpaceHolder>
+                                                               PaletteColorSpaceHolder> 
     {
         uno::Reference<rendering::XColorSpace> operator()()
         {
             return vcl::unotools::createStandardColorSpace();
         }
-    };
+    }; 
 }
 
 uno::Reference< rendering::XColorSpace > SAL_CALL VclCanvasBitmap::getColorSpace(  ) throw (uno::RuntimeException)
@@ -754,7 +754,7 @@ uno::Sequence< ::beans::PropertyValue > SAL_CALL VclCanvasBitmap::getProperties(
     return uno::Sequence< ::beans::PropertyValue >();
 }
 
-uno::Sequence< double > SAL_CALL VclCanvasBitmap::convertColorSpace( const uno::Sequence< double >& deviceColor,
+uno::Sequence< double > SAL_CALL VclCanvasBitmap::convertColorSpace( const uno::Sequence< double >& deviceColor, 
                                                                      const uno::Reference< ::rendering::XColorSpace >& targetColorSpace ) throw (uno::RuntimeException)
 {
     // TODO(P3): if we know anything about target
@@ -770,7 +770,7 @@ uno::Sequence<rendering::RGBColor> SAL_CALL VclCanvasBitmap::convertToRGB( const
 
     const sal_Size  nLen( deviceColor.getLength() );
     const sal_Int32 nComponentsPerPixel(m_aComponentTags.getLength());
-    ENSURE_ARG_OR_THROW2(nLen%nComponentsPerPixel==0,
+    ENSURE_ARG_OR_THROW2(nLen%nComponentsPerPixel==0, 
                          "number of channels no multiple of pixel element count",
                          static_cast<rendering::XBitmapPalette*>(this), 01);
 
@@ -819,7 +819,7 @@ uno::Sequence<rendering::ARGBColor> SAL_CALL VclCanvasBitmap::convertToARGB( con
 
     const sal_Size  nLen( deviceColor.getLength() );
     const sal_Int32 nComponentsPerPixel(m_aComponentTags.getLength());
-    ENSURE_ARG_OR_THROW2(nLen%nComponentsPerPixel==0,
+    ENSURE_ARG_OR_THROW2(nLen%nComponentsPerPixel==0, 
                          "number of channels no multiple of pixel element count",
                          static_cast<rendering::XBitmapPalette*>(this), 01);
 
@@ -872,7 +872,7 @@ uno::Sequence<rendering::ARGBColor> SAL_CALL VclCanvasBitmap::convertToPARGB( co
 
     const sal_Size  nLen( deviceColor.getLength() );
     const sal_Int32 nComponentsPerPixel(m_aComponentTags.getLength());
-    ENSURE_ARG_OR_THROW2(nLen%nComponentsPerPixel==0,
+    ENSURE_ARG_OR_THROW2(nLen%nComponentsPerPixel==0, 
                          "number of channels no multiple of pixel element count",
                          static_cast<rendering::XBitmapPalette*>(this), 01);
 
@@ -928,18 +928,18 @@ uno::Sequence< double > SAL_CALL VclCanvasBitmap::convertFromRGB( const uno::Seq
 
     uno::Sequence< double > aRes(nLen*nComponentsPerPixel);
     double* pColors=aRes.getArray();
-
+    
     if( m_bPalette )
     {
         for( sal_Size i=0; i<nLen; ++i )
         {
-            pColors[m_nIndexIndex] = m_pBmpAcc->GetBestPaletteIndex(
+            pColors[m_nIndexIndex] = m_pBmpAcc->GetBestPaletteIndex( 
                     BitmapColor(toByteColor(rgbColor[i].Red),
                                 toByteColor(rgbColor[i].Green),
                                 toByteColor(rgbColor[i].Blue)));
             if( m_nAlphaIndex != -1 )
                 pColors[m_nAlphaIndex] = 1.0;
-
+                
             pColors += nComponentsPerPixel;
         }
     }
@@ -952,7 +952,7 @@ uno::Sequence< double > SAL_CALL VclCanvasBitmap::convertFromRGB( const uno::Seq
             pColors[m_nBlueIndex]  = rgbColor[i].Blue;
             if( m_nAlphaIndex != -1 )
                 pColors[m_nAlphaIndex] = 1.0;
-
+                
             pColors += nComponentsPerPixel;
         }
     }
@@ -968,18 +968,18 @@ uno::Sequence< double > SAL_CALL VclCanvasBitmap::convertFromARGB( const uno::Se
 
     uno::Sequence< double > aRes(nLen*nComponentsPerPixel);
     double* pColors=aRes.getArray();
-
+    
     if( m_bPalette )
     {
         for( sal_Size i=0; i<nLen; ++i )
         {
-            pColors[m_nIndexIndex] = m_pBmpAcc->GetBestPaletteIndex(
+            pColors[m_nIndexIndex] = m_pBmpAcc->GetBestPaletteIndex( 
                     BitmapColor(toByteColor(rgbColor[i].Red),
                                 toByteColor(rgbColor[i].Green),
                                 toByteColor(rgbColor[i].Blue)));
             if( m_nAlphaIndex != -1 )
                 pColors[m_nAlphaIndex] = rgbColor[i].Alpha;
-
+                
             pColors += nComponentsPerPixel;
         }
     }
@@ -992,7 +992,7 @@ uno::Sequence< double > SAL_CALL VclCanvasBitmap::convertFromARGB( const uno::Se
             pColors[m_nBlueIndex]  = rgbColor[i].Blue;
             if( m_nAlphaIndex != -1 )
                 pColors[m_nAlphaIndex] = rgbColor[i].Alpha;
-
+                
             pColors += nComponentsPerPixel;
         }
     }
@@ -1008,19 +1008,19 @@ uno::Sequence< double > SAL_CALL VclCanvasBitmap::convertFromPARGB( const uno::S
 
     uno::Sequence< double > aRes(nLen*nComponentsPerPixel);
     double* pColors=aRes.getArray();
-
+    
     if( m_bPalette )
     {
         for( sal_Size i=0; i<nLen; ++i )
         {
             const double nAlpha( rgbColor[i].Alpha );
-            pColors[m_nIndexIndex] = m_pBmpAcc->GetBestPaletteIndex(
+            pColors[m_nIndexIndex] = m_pBmpAcc->GetBestPaletteIndex( 
                     BitmapColor(toByteColor(rgbColor[i].Red / nAlpha),
                                 toByteColor(rgbColor[i].Green / nAlpha),
                                 toByteColor(rgbColor[i].Blue / nAlpha)));
             if( m_nAlphaIndex != -1 )
                 pColors[m_nAlphaIndex] = nAlpha;
-
+                
             pColors += nComponentsPerPixel;
         }
     }
@@ -1034,7 +1034,7 @@ uno::Sequence< double > SAL_CALL VclCanvasBitmap::convertFromPARGB( const uno::S
             pColors[m_nBlueIndex]  = rgbColor[i].Blue / nAlpha;
             if( m_nAlphaIndex != -1 )
                 pColors[m_nAlphaIndex] = nAlpha;
-
+                
             pColors += nComponentsPerPixel;
         }
     }
@@ -1043,23 +1043,23 @@ uno::Sequence< double > SAL_CALL VclCanvasBitmap::convertFromPARGB( const uno::S
 
 sal_Int32 SAL_CALL VclCanvasBitmap::getBitsPerPixel(  ) throw (uno::RuntimeException)
 {
-    vos::OGuard aGuard( Application::GetSolarMutex() );
+    vos::OGuard aGuard( Application::GetSolarMutex() );    
     return m_nBitsPerOutputPixel;
 }
 
 uno::Sequence< ::sal_Int32 > SAL_CALL VclCanvasBitmap::getComponentBitCounts(  ) throw (uno::RuntimeException)
 {
-    vos::OGuard aGuard( Application::GetSolarMutex() );
+    vos::OGuard aGuard( Application::GetSolarMutex() );    
     return m_aComponentBitCounts;
 }
 
 sal_Int8 SAL_CALL VclCanvasBitmap::getEndianness(  ) throw (uno::RuntimeException)
 {
-    vos::OGuard aGuard( Application::GetSolarMutex() );
+    vos::OGuard aGuard( Application::GetSolarMutex() );    
     return m_nEndianness;
 }
 
-uno::Sequence<double> SAL_CALL VclCanvasBitmap::convertFromIntegerColorSpace( const uno::Sequence< ::sal_Int8 >& deviceColor,
+uno::Sequence<double> SAL_CALL VclCanvasBitmap::convertFromIntegerColorSpace( const uno::Sequence< ::sal_Int8 >& deviceColor, 
                                                                               const uno::Reference< ::rendering::XColorSpace >& targetColorSpace ) throw (lang::IllegalArgumentException,uno::RuntimeException)
 {
     if( dynamic_cast<VclCanvasBitmap*>(targetColorSpace.get()) )
@@ -1068,7 +1068,7 @@ uno::Sequence<double> SAL_CALL VclCanvasBitmap::convertFromIntegerColorSpace( co
 
         const sal_Size  nLen( deviceColor.getLength() );
         const sal_Int32 nComponentsPerPixel(m_aComponentTags.getLength());
-        ENSURE_ARG_OR_THROW2(nLen%nComponentsPerPixel==0,
+        ENSURE_ARG_OR_THROW2(nLen%nComponentsPerPixel==0, 
                              "number of channels no multiple of pixel element count",
                              static_cast<rendering::XBitmapPalette*>(this), 01);
 
@@ -1123,7 +1123,7 @@ uno::Sequence<double> SAL_CALL VclCanvasBitmap::convertFromIntegerColorSpace( co
     }
 }
 
-uno::Sequence< ::sal_Int8 > SAL_CALL VclCanvasBitmap::convertToIntegerColorSpace( const uno::Sequence< ::sal_Int8 >& deviceColor,
+uno::Sequence< ::sal_Int8 > SAL_CALL VclCanvasBitmap::convertToIntegerColorSpace( const uno::Sequence< ::sal_Int8 >& deviceColor, 
                                                                                   const uno::Reference< ::rendering::XIntegerBitmapColorSpace >& targetColorSpace ) throw (lang::IllegalArgumentException,uno::RuntimeException)
 {
     if( dynamic_cast<VclCanvasBitmap*>(targetColorSpace.get()) )
@@ -1161,16 +1161,16 @@ uno::Sequence<rendering::RGBColor> SAL_CALL VclCanvasBitmap::convertIntegerToRGB
         for( sal_Size i=0; i<nLen; i+=nBytesPerPixel )
         {
             // if palette, index is guaranteed to be 8 bit
-            const BitmapColor aCol =
+            const BitmapColor aCol = 
                 m_bPalette ?
-                m_pBmpAcc->GetPaletteColor(*pIn) :
+                m_pBmpAcc->GetPaletteColor(*pIn) : 
                 m_pBmpAcc->GetPixelFromData(pIn,0);
-
-            // TODO(F3): Convert result to sRGB color space
+            
+            // TODO(F3): Convert result to sRGB color space 
             *pOut++ = rendering::RGBColor(toDoubleColor(aCol.GetRed()),
                                           toDoubleColor(aCol.GetGreen()),
                                           toDoubleColor(aCol.GetBlue()));
-            // skips alpha
+            // skips alpha  
             pIn += nBytesPerPixel;
         }
     }
@@ -1178,7 +1178,7 @@ uno::Sequence<rendering::RGBColor> SAL_CALL VclCanvasBitmap::convertIntegerToRGB
     {
         for( sal_Int32 i=0; i<nNumColors; ++i )
         {
-            const BitmapColor aCol =
+            const BitmapColor aCol = 
                 m_bPalette ?
                 m_pBmpAcc->GetPaletteColor(
                     sal::static_int_cast<USHORT>(
@@ -1218,12 +1218,12 @@ uno::Sequence<rendering::ARGBColor> SAL_CALL VclCanvasBitmap::convertIntegerToAR
         for( sal_Size i=0; i<nLen; i+=nBytesPerPixel )
         {
             // if palette, index is guaranteed to be 8 bit
-            const BitmapColor aCol =
+            const BitmapColor aCol = 
                 m_bPalette ?
-                m_pBmpAcc->GetPaletteColor(*pIn) :
+                m_pBmpAcc->GetPaletteColor(*pIn) : 
                 m_pBmpAcc->GetPixelFromData(pIn,0);
-
-            // TODO(F3): Convert result to sRGB color space
+            
+            // TODO(F3): Convert result to sRGB color space 
             *pOut++ = rendering::ARGBColor(1.0 - toDoubleColor(nAlphaFactor*pIn[nNonAlphaBytes]),
                                            toDoubleColor(aCol.GetRed()),
                                            toDoubleColor(aCol.GetGreen()),
@@ -1235,7 +1235,7 @@ uno::Sequence<rendering::ARGBColor> SAL_CALL VclCanvasBitmap::convertIntegerToAR
     {
         for( sal_Int32 i=0; i<nNumColors; ++i )
         {
-            const BitmapColor aCol =
+            const BitmapColor aCol = 
                 m_bPalette ?
                 m_pBmpAcc->GetPaletteColor(
                     sal::static_int_cast<USHORT>(
@@ -1276,12 +1276,12 @@ uno::Sequence<rendering::ARGBColor> SAL_CALL VclCanvasBitmap::convertIntegerToPA
         for( sal_Size i=0; i<nLen; i+=nBytesPerPixel )
         {
             // if palette, index is guaranteed to be 8 bit
-            const BitmapColor aCol =
+            const BitmapColor aCol = 
                 m_bPalette ?
-                m_pBmpAcc->GetPaletteColor(*pIn) :
+                m_pBmpAcc->GetPaletteColor(*pIn) : 
                 m_pBmpAcc->GetPixelFromData(pIn,0);
-
-            // TODO(F3): Convert result to sRGB color space
+            
+            // TODO(F3): Convert result to sRGB color space 
             const double nAlpha( 1.0 - toDoubleColor(nAlphaFactor*pIn[nNonAlphaBytes]) );
             *pOut++ = rendering::ARGBColor(nAlpha,
                                            nAlpha*toDoubleColor(aCol.GetRed()),
@@ -1294,7 +1294,7 @@ uno::Sequence<rendering::ARGBColor> SAL_CALL VclCanvasBitmap::convertIntegerToPA
     {
         for( sal_Int32 i=0; i<nNumColors; ++i )
         {
-            const BitmapColor aCol =
+            const BitmapColor aCol = 
                 m_bPalette ?
                 m_pBmpAcc->GetPaletteColor(
                     sal::static_int_cast<USHORT>(
@@ -1331,10 +1331,10 @@ uno::Sequence< ::sal_Int8 > SAL_CALL VclCanvasBitmap::convertIntegerFromRGB( con
             const BitmapColor aCol(toByteColor(rgbColor[i].Red),
                                    toByteColor(rgbColor[i].Green),
                                    toByteColor(rgbColor[i].Blue));
-            const BitmapColor aCol2 =
+            const BitmapColor aCol2 = 
                 m_bPalette ?
                 BitmapColor(
-                    sal::static_int_cast<BYTE>(m_pBmpAcc->GetBestPaletteIndex( aCol ))) :
+                    sal::static_int_cast<BYTE>(m_pBmpAcc->GetBestPaletteIndex( aCol ))) : 
                 aCol;
 
             m_pBmpAcc->SetPixelOnData(pColors,0,aCol2);
@@ -1349,10 +1349,10 @@ uno::Sequence< ::sal_Int8 > SAL_CALL VclCanvasBitmap::convertIntegerFromRGB( con
             const BitmapColor aCol(toByteColor(rgbColor[i].Red),
                                    toByteColor(rgbColor[i].Green),
                                    toByteColor(rgbColor[i].Blue));
-            const BitmapColor aCol2 =
+            const BitmapColor aCol2 = 
                 m_bPalette ?
                 BitmapColor(
-                    sal::static_int_cast<BYTE>(m_pBmpAcc->GetBestPaletteIndex( aCol ))) :
+                    sal::static_int_cast<BYTE>(m_pBmpAcc->GetBestPaletteIndex( aCol ))) : 
                 aCol;
 
             m_pBmpAcc->SetPixelOnData(pColors,i,aCol2);
@@ -1380,10 +1380,10 @@ uno::Sequence< ::sal_Int8 > SAL_CALL VclCanvasBitmap::convertIntegerFromARGB( co
             const BitmapColor aCol(toByteColor(rgbColor[i].Red),
                                    toByteColor(rgbColor[i].Green),
                                    toByteColor(rgbColor[i].Blue));
-            const BitmapColor aCol2 =
+            const BitmapColor aCol2 = 
                 m_bPalette ?
                 BitmapColor(
-                    sal::static_int_cast<BYTE>(m_pBmpAcc->GetBestPaletteIndex( aCol ))) :
+                    sal::static_int_cast<BYTE>(m_pBmpAcc->GetBestPaletteIndex( aCol ))) : 
                 aCol;
 
             m_pBmpAcc->SetPixelOnData(pColors,0,aCol2);
@@ -1398,10 +1398,10 @@ uno::Sequence< ::sal_Int8 > SAL_CALL VclCanvasBitmap::convertIntegerFromARGB( co
             const BitmapColor aCol(toByteColor(rgbColor[i].Red),
                                    toByteColor(rgbColor[i].Green),
                                    toByteColor(rgbColor[i].Blue));
-            const BitmapColor aCol2 =
+            const BitmapColor aCol2 = 
                 m_bPalette ?
                 BitmapColor(
-                    sal::static_int_cast<BYTE>(m_pBmpAcc->GetBestPaletteIndex( aCol ))) :
+                    sal::static_int_cast<BYTE>(m_pBmpAcc->GetBestPaletteIndex( aCol ))) : 
                 aCol;
 
             m_pBmpAcc->SetPixelOnData(pColors,i,aCol2);
@@ -1430,10 +1430,10 @@ uno::Sequence< ::sal_Int8 > SAL_CALL VclCanvasBitmap::convertIntegerFromPARGB( c
             const BitmapColor aCol(toByteColor(rgbColor[i].Red / nAlpha),
                                    toByteColor(rgbColor[i].Green / nAlpha),
                                    toByteColor(rgbColor[i].Blue / nAlpha));
-            const BitmapColor aCol2 =
+            const BitmapColor aCol2 = 
                 m_bPalette ?
                 BitmapColor(
-                    sal::static_int_cast<BYTE>(m_pBmpAcc->GetBestPaletteIndex( aCol ))) :
+                    sal::static_int_cast<BYTE>(m_pBmpAcc->GetBestPaletteIndex( aCol ))) : 
                 aCol;
 
             m_pBmpAcc->SetPixelOnData(pColors,0,aCol2);
@@ -1448,10 +1448,10 @@ uno::Sequence< ::sal_Int8 > SAL_CALL VclCanvasBitmap::convertIntegerFromPARGB( c
             const BitmapColor aCol(toByteColor(rgbColor[i].Red),
                                    toByteColor(rgbColor[i].Green),
                                    toByteColor(rgbColor[i].Blue));
-            const BitmapColor aCol2 =
+            const BitmapColor aCol2 = 
                 m_bPalette ?
                 BitmapColor(
-                    sal::static_int_cast<BYTE>(m_pBmpAcc->GetBestPaletteIndex( aCol ))) :
+                    sal::static_int_cast<BYTE>(m_pBmpAcc->GetBestPaletteIndex( aCol ))) : 
                 aCol;
 
             m_pBmpAcc->SetPixelOnData(pColors,i,aCol2);
diff --git a/vcl/source/helper/canvastools.cxx b/vcl/source/helper/canvastools.cxx
index 71c306ff9bbb..30c0b900b188 100644
--- a/vcl/source/helper/canvastools.cxx
+++ b/vcl/source/helper/canvastools.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
@@ -80,7 +80,7 @@ namespace vcl
 {
     namespace unotools
     {
-        // #i79917# removed helpers bezierSequenceFromPolygon and
+        // #i79917# removed helpers bezierSequenceFromPolygon and 
         // pointSequenceFromPolygon here
         // Also all helpers using tools Polygon and PolyPolygon will get mapped to the
         // B2DPolygon helpers for these cases, see comments with the same TaskID below.
@@ -88,8 +88,8 @@ namespace vcl
 
         //---------------------------------------------------------------------------------------
 
-        uno::Reference< rendering::XPolyPolygon2D > xPolyPolygonFromPolygon( const uno::Reference< rendering::XGraphicDevice >&     xGraphicDevice,
-                                                                             const ::Polygon&                                       inputPolygon )
+        uno::Reference< rendering::XPolyPolygon2D > xPolyPolygonFromPolygon( const uno::Reference< rendering::XGraphicDevice >& 	xGraphicDevice,
+                                                                             const ::Polygon&										inputPolygon )
         {
             RTL_LOGFILE_CONTEXT( aLog, "::vcl::unotools::xPolyPolygonFromPolygon()" );
 
@@ -101,7 +101,7 @@ namespace vcl
         //---------------------------------------------------------------------------------------
 
         uno::Reference< rendering::XPolyPolygon2D > xPolyPolygonFromPolyPolygon( const uno::Reference< rendering::XGraphicDevice >& xGraphicDevice,
-                                                                                 const ::PolyPolygon&                               inputPolyPolygon )
+                                                                                 const ::PolyPolygon&								inputPolyPolygon )
         {
             RTL_LOGFILE_CONTEXT( aLog, "::vcl::unotools::xPolyPolygonFromPolyPolygon()" );
 
@@ -164,8 +164,8 @@ namespace vcl
 
         //---------------------------------------------------------------------------------------
 
-        uno::Reference< rendering::XBitmap > xBitmapFromBitmap( const uno::Reference< rendering::XGraphicDevice >&  /*xGraphicDevice*/,
-                                                                const ::Bitmap&                                     inputBitmap )
+        uno::Reference< rendering::XBitmap > xBitmapFromBitmap( const uno::Reference< rendering::XGraphicDevice >& 	/*xGraphicDevice*/,
+                                                                const ::Bitmap&										inputBitmap )
         {
             RTL_LOGFILE_CONTEXT( aLog, "::vcl::unotools::xBitmapFromBitmap()" );
 
@@ -174,8 +174,8 @@ namespace vcl
 
         //---------------------------------------------------------------------------------------
 
-        uno::Reference< rendering::XBitmap > xBitmapFromBitmapEx( const uno::Reference< rendering::XGraphicDevice >&    /*xGraphicDevice*/,
-                                                                  const ::BitmapEx&                                     inputBitmap )
+        uno::Reference< rendering::XBitmap > xBitmapFromBitmapEx( const uno::Reference< rendering::XGraphicDevice >& 	/*xGraphicDevice*/,
+                                                                  const ::BitmapEx&										inputBitmap )
         {
             RTL_LOGFILE_CONTEXT( aLog, "::vcl::unotools::xBitmapFromBitmapEx()" );
 
@@ -203,10 +203,10 @@ namespace vcl
 
         namespace
         {
-            inline bool operator==( const rendering::IntegerBitmapLayout& rLHS,
+            inline bool operator==( const rendering::IntegerBitmapLayout& rLHS, 
                                     const rendering::IntegerBitmapLayout& rRHS )
             {
-                return
+                return 
                     rLHS.ScanLineBytes       == rRHS.ScanLineBytes &&
                     rLHS.ScanLineStride      == rRHS.ScanLineStride &&
                     rLHS.PlaneStride         == rRHS.PlaneStride &&
@@ -342,16 +342,16 @@ namespace vcl
                 OSL_ENSURE(aLayout.ColorSpace.is(),
                            "Cannot convert image without color space!");
                 if( !aLayout.ColorSpace.is() )
-                    return ::BitmapEx();
+                    return ::BitmapEx();                
 
                 nDepth = aLayout.ColorSpace->getBitsPerPixel();
 
                 if( xInputBitmap->hasAlpha() )
                 {
                     // determine alpha channel depth
-                    const uno::Sequence<sal_Int8> aTags(
+                    const uno::Sequence<sal_Int8> aTags( 
                         aLayout.ColorSpace->getComponentTags() );
-                    const uno::Sequence<sal_Int32> aDepths(
+                    const uno::Sequence<sal_Int32> aDepths( 
                         aLayout.ColorSpace->getComponentBitCounts() );
                     const sal_Int8* pStart(aTags.getConstArray());
                     const sal_Size  nLen(aTags.getLength());
@@ -384,7 +384,7 @@ namespace vcl
                         else
                             nDepth = 8;
 
-                        const USHORT nPaletteEntries(
+                        const USHORT nPaletteEntries( 
                             sal::static_int_cast<USHORT>(
                                 std::min(sal_Int32(255), nEntryCount)));
 
@@ -396,7 +396,7 @@ namespace vcl
                         uno::Sequence<double> aPaletteEntry;
                         for( USHORT j=0; j<nPaletteEntries; ++j )
                         {
-                            if( !xPalette->getIndex(aPaletteEntry,j) &&
+                            if( !xPalette->getIndex(aPaletteEntry,j) && 
                                 nAlphaDepth == 0 )
                             {
                                 nAlphaDepth = 1;
@@ -412,26 +412,26 @@ namespace vcl
                     }
                 }
 
-                const ::Size aPixelSize(
+                const ::Size aPixelSize( 
                     sizeFromIntegerSize2D(xInputBitmap->getSize()));
 
                 // normalize bitcount
-                nDepth =
+                nDepth = 
                     ( nDepth <= 1 ) ? 1 :
                     ( nDepth <= 4 ) ? 4 :
-                    ( nDepth <= 8 ) ? 8 : 24;
+                    ( nDepth <= 8 ) ? 8 : 24; 
 
                 ::Bitmap aBitmap( aPixelSize,
                                   sal::static_int_cast<USHORT>(nDepth),
                                   aLayout.Palette.is() ? &aPalette : NULL );
                 ::Bitmap aAlpha;
                 if( nAlphaDepth )
-                    aAlpha = ::Bitmap( aPixelSize,
+                    aAlpha = ::Bitmap( aPixelSize, 
                                        sal::static_int_cast<USHORT>(nAlphaDepth),
                                        &::Bitmap::GetGreyPalette(
                                            sal::static_int_cast<USHORT>(1L << nAlphaDepth)) );
 
-                { // limit scoped access
+                { // limit scoped access 
                     ScopedBitmapWriteAccess pWriteAccess( aBitmap.AcquireWriteAccess(),
                                                           aBitmap );
                     ScopedBitmapWriteAccess pAlphaWriteAccess( nAlphaDepth ? aAlpha.AcquireWriteAccess() : NULL,
@@ -446,7 +446,7 @@ namespace vcl
                     if( !readBmp(nWidth,nHeight,aLayout,xInputBitmap,
                                  pWriteAccess,pAlphaWriteAccess) )
                         continue;
-                } // limit scoped access
+                } // limit scoped access 
 
                 if( nAlphaDepth )
                     return ::BitmapEx( aBitmap,
@@ -638,8 +638,8 @@ namespace vcl
                 {
                     return uno::Sequence< beans::PropertyValue >();
                 }
-                virtual uno::Sequence< double > SAL_CALL convertColorSpace( const uno::Sequence< double >& deviceColor,
-                                                                            const uno::Reference< rendering::XColorSpace >& targetColorSpace ) throw (lang::IllegalArgumentException,
+                virtual uno::Sequence< double > SAL_CALL convertColorSpace( const uno::Sequence< double >& deviceColor, 
+                                                                            const uno::Reference< rendering::XColorSpace >& targetColorSpace ) throw (lang::IllegalArgumentException, 
                                                                                                                                                       uno::RuntimeException)
                 {
                     // TODO(P3): if we know anything about target
@@ -652,7 +652,7 @@ namespace vcl
                 {
                     const double*  pIn( deviceColor.getConstArray() );
                     const sal_Size nLen( deviceColor.getLength() );
-                    ENSURE_ARG_OR_THROW2(nLen%4==0,
+                    ENSURE_ARG_OR_THROW2(nLen%4==0, 
                                          "number of channels no multiple of 4",
                                          static_cast<rendering::XColorSpace*>(this), 0);
 
@@ -669,7 +669,7 @@ namespace vcl
                 {
                     const double*  pIn( deviceColor.getConstArray() );
                     const sal_Size nLen( deviceColor.getLength() );
-                    ENSURE_ARG_OR_THROW2(nLen%4==0,
+                    ENSURE_ARG_OR_THROW2(nLen%4==0, 
                                          "number of channels no multiple of 4",
                                          static_cast<rendering::XColorSpace*>(this), 0);
 
@@ -686,7 +686,7 @@ namespace vcl
                 {
                     const double*  pIn( deviceColor.getConstArray() );
                     const sal_Size nLen( deviceColor.getLength() );
-                    ENSURE_ARG_OR_THROW2(nLen%4==0,
+                    ENSURE_ARG_OR_THROW2(nLen%4==0, 
                                          "number of channels no multiple of 4",
                                          static_cast<rendering::XColorSpace*>(this), 0);
 
@@ -785,7 +785,7 @@ namespace vcl
             return aRet;
         }
 
-        Color stdColorSpaceSequenceToColor( const uno::Sequence< double >& rColor        )
+        Color stdColorSpaceSequenceToColor( const uno::Sequence< double >& rColor		 )
         {
             ENSURE_ARG_OR_THROW( rColor.getLength() == 4,
                                  "color must have 4 channels" );
@@ -801,7 +801,7 @@ namespace vcl
             return aColor;
         }
 
-        uno::Sequence< double > VCL_DLLPUBLIC colorToDoubleSequence(
+        uno::Sequence< double > VCL_DLLPUBLIC colorToDoubleSequence( 
             const Color&                                    rColor,
             const uno::Reference< rendering::XColorSpace >& xColorSpace )
         {
@@ -815,7 +815,7 @@ namespace vcl
             return xColorSpace->convertFromARGB(aSeq);
         }
 
-        Color VCL_DLLPUBLIC doubleSequenceToColor(
+        Color VCL_DLLPUBLIC doubleSequenceToColor( 
             const uno::Sequence< double >                   rColor,
             const uno::Reference< rendering::XColorSpace >& xColorSpace )
         {
diff --git a/vcl/source/helper/evntpost.cxx b/vcl/source/helper/evntpost.cxx
index 9e200a3136c3..ee86cbfe46c2 100644
--- a/vcl/source/helper/evntpost.cxx
+++ b/vcl/source/helper/evntpost.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
diff --git a/vcl/source/helper/lazydelete.cxx b/vcl/source/helper/lazydelete.cxx
index 7b244781c3c7..03f84d0072c9 100644
--- a/vcl/source/helper/lazydelete.cxx
+++ b/vcl/source/helper/lazydelete.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
@@ -98,7 +98,7 @@ void DeleteOnDeinitBase::addDeinitContainer( DeleteOnDeinitBase* i_pContainer )
     DBG_ASSERT( ! pSVData->mbDeInit, "DeleteOnDeinit added after DeiInitVCL !" );
     if( pSVData->mbDeInit )
         return;
-
+    
     if( pSVData->mpDeinitDeleteList == NULL )
         pSVData->mpDeinitDeleteList = new std::list< DeleteOnDeinitBase* >();
     pSVData->mpDeinitDeleteList->push_back( i_pContainer );
@@ -106,7 +106,7 @@ void DeleteOnDeinitBase::addDeinitContainer( DeleteOnDeinitBase* i_pContainer )
 
 void DeleteOnDeinitBase::ImplDeleteOnDeInit()
 {
-    ImplSVData* pSVData = ImplGetSVData();
+    ImplSVData* pSVData = ImplGetSVData();    
     if( pSVData->mpDeinitDeleteList )
     {
         for( std::list< vcl::DeleteOnDeinitBase* >::iterator it = pSVData->mpDeinitDeleteList->begin();
diff --git a/vcl/source/helper/smartid.cxx b/vcl/source/helper/smartid.cxx
index c367aeb2bce5..dfa3f0eaf888 100755
--- a/vcl/source/helper/smartid.cxx
+++ b/vcl/source/helper/smartid.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
@@ -226,7 +226,7 @@ BOOL SmartId::Matches( const SmartId &rId ) const
         return FALSE;
     else if ( HasString() && rId.HasString() )
         return Matches( rId.GetStr() );
-    else
+    else 
         return rId.HasNumeric() && Matches( rId.GetNum() );
 }
 
@@ -239,7 +239,7 @@ BOOL SmartId::Equals( const SmartId &rId ) const
             && mpData->bHasNumericId == rId.mpData->bHasNumericId;
     else if ( !mpData && !rId.mpData )
         return TRUE;
-    else
+    else 
         return FALSE;
 }
 
diff --git a/vcl/source/helper/strhelper.cxx b/vcl/source/helper/strhelper.cxx
index db622073cea9..9dfe9e768ef4 100644
--- a/vcl/source/helper/strhelper.cxx
+++ b/vcl/source/helper/strhelper.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
@@ -126,12 +126,12 @@ String GetCommandLineToken( int nToken, const String& rLine )
     int nLen = rLine.Len();
     if( ! nLen )
         return String();
-
+    
     int nActualToken = 0;
     sal_Unicode* pBuffer = (sal_Unicode*)alloca( sizeof(sal_Unicode)*( nLen + 1 ) );
     const sal_Unicode* pRun = rLine.GetBuffer();
     sal_Unicode* pLeap = NULL;
-
+    
     while( *pRun && nActualToken <= nToken )
     {
         while( *pRun && isSpace( *pRun ) )
@@ -167,7 +167,7 @@ String GetCommandLineToken( int nToken, const String& rLine )
     }
 
     *pLeap = 0;
-
+    
     String aRet( pBuffer );
     return aRet;
 }
@@ -177,12 +177,12 @@ ByteString GetCommandLineToken( int nToken, const ByteString& rLine )
     int nLen = rLine.Len();
     if( ! nLen )
         return ByteString();
-
+    
     int nActualToken = 0;
     char* pBuffer = (char*)alloca( nLen + 1 );
     const char* pRun = rLine.GetBuffer();
     char* pLeap = NULL;
-
+    
     while( *pRun && nActualToken <= nToken )
     {
         while( *pRun && isSpace( *pRun ) )
@@ -218,7 +218,7 @@ ByteString GetCommandLineToken( int nToken, const ByteString& rLine )
     }
 
     *pLeap = 0;
-
+    
     ByteString aRet( pBuffer );
     return aRet;
 }
@@ -227,10 +227,10 @@ int GetCommandLineTokenCount( const String& rLine )
 {
     if( ! rLine.Len() )
         return 0;
-
+    
     int nTokenCount = 0;
     const sal_Unicode *pRun = rLine.GetBuffer();
-
+    
 
     while( *pRun )
     {
@@ -270,7 +270,7 @@ int GetCommandLineTokenCount( const String& rLine )
         }
         nTokenCount++;
     }
-
+    
     return nTokenCount;
 }
 
@@ -278,10 +278,10 @@ int GetCommandLineTokenCount( const ByteString& rLine )
 {
     if( ! rLine.Len() )
         return 0;
-
+    
     int nTokenCount = 0;
     const char *pRun = rLine.GetBuffer();
-
+    
 
     while( *pRun )
     {
@@ -321,7 +321,7 @@ int GetCommandLineTokenCount( const ByteString& rLine )
         }
         nTokenCount++;
     }
-
+    
     return nTokenCount;
 }
 
@@ -330,7 +330,7 @@ String WhitespaceToSpace( const String& rLine, BOOL bProtect )
     int nLen = rLine.Len();
     if( ! nLen )
         return String();
-
+    
     sal_Unicode *pBuffer = (sal_Unicode*)alloca( sizeof(sal_Unicode)*(nLen + 1) );
     const sal_Unicode *pRun = rLine.GetBuffer();
     sal_Unicode *pLeap = pBuffer;
@@ -379,7 +379,7 @@ String WhitespaceToSpace( const String& rLine, BOOL bProtect )
         *pLeap = 0;
 
     String aRet( *pBuffer == ' ' ? pBuffer+1 : pBuffer );
-    return aRet;
+    return aRet;    
 }
 
 ByteString WhitespaceToSpace( const ByteString& rLine, BOOL bProtect )
@@ -387,7 +387,7 @@ ByteString WhitespaceToSpace( const ByteString& rLine, BOOL bProtect )
     int nLen = rLine.Len();
     if( ! nLen )
         return ByteString();
-
+    
     char *pBuffer = (char*)alloca( nLen + 1 );
     const char *pRun = rLine.GetBuffer();
     char *pLeap = pBuffer;
@@ -436,7 +436,7 @@ ByteString WhitespaceToSpace( const ByteString& rLine, BOOL bProtect )
         *pLeap = 0;
 
     ByteString aRet( *pBuffer == ' ' ? pBuffer+1 : pBuffer );
-    return aRet;
+    return aRet;    
 }
 
 } // namespace
diff --git a/vcl/source/helper/threadex.cxx b/vcl/source/helper/threadex.cxx
index 133b19aa0538..710f1b77f3f9 100644
--- a/vcl/source/helper/threadex.cxx
+++ b/vcl/source/helper/threadex.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
diff --git a/vcl/source/helper/xconnection.cxx b/vcl/source/helper/xconnection.cxx
index caf7ee237d67..9a3f9c5690b6 100644
--- a/vcl/source/helper/xconnection.cxx
+++ b/vcl/source/helper/xconnection.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
@@ -44,7 +44,7 @@ namespace vcl
         {
             mnReleased = Application::ReleaseSolarMutex();
         }
-
+        
         ~SolarMutexReleaser()
         {
             if( mnReleased )
@@ -128,7 +128,7 @@ Any SAL_CALL DisplayConnection::getIdentifier() throw()
 void DisplayConnection::dispatchDowningEvent()
 {
     SolarMutexReleaser aRel;
-
+    
     MutexGuard aGuard( m_aMutex );
     Any aEvent;
     std::list< Reference< XEventHandler > > aLocalList( m_aHandlers );
diff --git a/vcl/source/salmain/salmain.cxx b/vcl/source/salmain/salmain.cxx
index c2e3af01635a..39a59f241807 100644
--- a/vcl/source/salmain/salmain.cxx
+++ b/vcl/source/salmain/salmain.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
diff --git a/vcl/source/src/btntext.src b/vcl/source/src/btntext.src
index 6d2360dae6cb..99579f00b107 100644
--- a/vcl/source/src/btntext.src
+++ b/vcl/source/src/btntext.src
@@ -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
@@ -103,13 +103,13 @@ SV_BUTTONHELPTEXT_MORE
 };
 
 Finnische-Texte:
-OK          OK
-CANCEL      Peruuta
-HELP        ~Ohje
-MORE        ~Enemm�n
-YES         ~Kyll�
-NO          ~Ei
-RETRY       ~Yrit�uudelleen
+OK			OK
+CANCEL		Peruuta
+HELP		~Ohje
+MORE		~Enemm�n
+YES 		~Kyll�
+NO			~Ei
+RETRY		~Yrit�uudelleen
 */
 
 
diff --git a/vcl/source/src/helptext.src b/vcl/source/src/helptext.src
index a42a9531d9ee..327266c13b50 100644
--- a/vcl/source/src/helptext.src
+++ b/vcl/source/src/helptext.src
@@ -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
diff --git a/vcl/source/src/images.src b/vcl/source/src/images.src
index fdb1e755c86a..20ba1cbd3dd0 100644
--- a/vcl/source/src/images.src
+++ b/vcl/source/src/images.src
@@ -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
diff --git a/vcl/source/src/menu.src b/vcl/source/src/menu.src
index 1833093adfac..f4e59c1c8030 100644
--- a/vcl/source/src/menu.src
+++ b/vcl/source/src/menu.src
@@ -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
@@ -36,46 +36,46 @@ String SV_RESID_STRING_NOSELECTIONPOSSIBLE
 
 Menu SV_RESID_MENU_EDIT
 {
-    ItemList =
+    ItemList = 
     {
         MenuItem
         {
-            Identifier = SV_MENU_EDIT_UNDO ;
+            Identifier = SV_MENU_EDIT_UNDO ; 
             Text [ en-US ] = "~Undo" ;
         };
-        MenuItem { Separator = TRUE ; };
+        MenuItem { Separator = TRUE ; }; 
         MenuItem
         {
-            Identifier = SV_MENU_EDIT_CUT ;
+            Identifier = SV_MENU_EDIT_CUT ; 
             Text [ en-US ] = "Cu~t" ;
         };
         MenuItem
         {
-            Identifier = SV_MENU_EDIT_COPY ;
+            Identifier = SV_MENU_EDIT_COPY ; 
             Text [ en-US ] = "~Copy" ;
         };
         MenuItem
         {
-            Identifier = SV_MENU_EDIT_PASTE ;
+            Identifier = SV_MENU_EDIT_PASTE ; 
             Text [ en-US ] = "~Paste" ;
         };
         MenuItem
         {
-            Identifier = SV_MENU_EDIT_DELETE ;
+            Identifier = SV_MENU_EDIT_DELETE ; 
             Text [ en-US ] = "~Delete" ;
         };
-        MenuItem { Separator = TRUE ; };
+        MenuItem { Separator = TRUE ; }; 
         MenuItem
         {
-            Identifier = SV_MENU_EDIT_SELECTALL ;
+            Identifier = SV_MENU_EDIT_SELECTALL ; 
             Text [ en-US ] = "Select ~All" ;
         };
-        MenuItem { Separator = TRUE ; };
+        MenuItem { Separator = TRUE ; }; 
         MenuItem
         {
             Identifier = SV_MENU_EDIT_INSERTSYMBOL;
             Text [ en-US ] = "~Special Character...";
-
+        
         };
     };
 };
diff --git a/vcl/source/src/print.src b/vcl/source/src/print.src
index 58f0a477c848..34519022560b 100644
--- a/vcl/source/src/print.src
+++ b/vcl/source/src/print.src
@@ -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
@@ -35,9 +35,9 @@ ModalDialog SV_DLG_PRINT
     Moveable = TRUE;
     Maxable = TRUE;
     SVLook = TRUE;
-
+    
     Size = MAP_APPFONT( 350, 215 );
-
+    
     OKButton SV_PRINT_OK
     {
         DefButton = TRUE;
@@ -55,7 +55,7 @@ ModalDialog SV_DLG_PRINT
         Pos = MAP_APPFONT( 5, 5 );
         Size = MAP_APPFONT( 50, 15 );
     };
-
+    
     Window SV_PRINT_PAGE_PREVIEW
     {
         Pos = MAP_APPFONT( 5, 5 );
@@ -114,7 +114,7 @@ ModalDialog SV_DLG_PRINT
     {
         Text [en-US] = "Default printer";
     };
-
+    
 
     String SV_PRINT_PRINTPREVIEW_TXT
     {
@@ -125,7 +125,7 @@ ModalDialog SV_DLG_PRINT
     {
         Text [en-US] = "Page Layout";
         Hide = TRUE;
-
+        
         FixedLine SV_PRINT_PRT_NUP_LAYOUT_FL
         {
             Pos = MAP_APPFONT( 5, 5 );
@@ -300,12 +300,12 @@ ModalDialog SV_DLG_PRINT
             HelpText [en-US] = "Check to draw a border around each page.";
         };
     };
-
+    
     TabPage SV_PRINT_TAB_JOB
     {
         Text [en-US] = "General";
         Hide = TRUE;
-
+        
         FixedLine SV_PRINT_PRINTERS_FL
         {
             Pos = MAP_APPFONT( 5, 5 );
@@ -387,22 +387,22 @@ ModalDialog SV_DLG_PRINT
             Text [en-US] = "Collate";
             HelpText [en-US] = "Select whether copies should be collated or not.";
         };
-
+            
         Image SV_PRINT_COLLATE_IMG
         {
             ImageBitmap = Bitmap { File = "collate.png" ; };
         };
-
+        
         Image SV_PRINT_NOCOLLATE_IMG
         {
             ImageBitmap = Bitmap { File = "ncollate.png" ; };
         };
-
+        
         Image SV_PRINT_COLLATE_HC_IMG
         {
             ImageBitmap = Bitmap { File = "collate_h.png" ; };
         };
-
+        
         Image SV_PRINT_NOCOLLATE_HC_IMG
         {
             ImageBitmap = Bitmap { File = "ncollate_h.png" ; };
@@ -440,7 +440,7 @@ ModalDialog SV_DLG_PRINT
             Size = MAP_APPFONT( 200, 12 );
             Text [en-US] = "Print in ~reverse page order";
             HelpText [en-US] = "Check to print pages in reverse order.";
-        };
+        };        
     };
 };
 
@@ -451,9 +451,9 @@ ModelessDialog SV_DLG_PRINT_PROGRESS
     Sizeable = FALSE;
     Moveable = TRUE;
     SVLook = TRUE;
-
+    
     Size = MAP_APPFONT( 120, 70 );
-
+    
     CancelButton SV_PRINT_PROGRESS_CANCEL
     {
         Pos = MAP_APPFONT( 35, 50 );
diff --git a/vcl/source/src/stdtext.src b/vcl/source/src/stdtext.src
index 2c6574220a5f..90787a620e14 100644
--- a/vcl/source/src/stdtext.src
+++ b/vcl/source/src/stdtext.src
@@ -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
diff --git a/vcl/source/src/units.src b/vcl/source/src/units.src
index 16b40b3f41a3..aff92ad105b5 100644
--- a/vcl/source/src/units.src
+++ b/vcl/source/src/units.src
@@ -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
@@ -30,6 +30,7 @@
 #include <vcl/svids.hrc>
 #endif
 
+// Amelia : adds two units , 'ch' and 'line'
 StringArray SV_FUNIT_STRINGS
 {
     ItemList [ en-US ] =
@@ -51,6 +52,8 @@ StringArray SV_FUNIT_STRINGS
         < "feet" ; FUNIT_FOOT ; > ;
         < "miles" ; FUNIT_MILE ; > ;
         < "mile" ; FUNIT_MILE ; > ;
+        < "ch" ; FUNIT_CHAR ; > ;
+        < "line" ; FUNIT_LINE ; > ;
         < "%" ; FUNIT_PERCENT ; > ;
     };
 };
diff --git a/vcl/source/window/abstdlg.cxx b/vcl/source/window/abstdlg.cxx
index 7f00b73b0808..d0323939b35a 100644
--- a/vcl/source/window/abstdlg.cxx
+++ b/vcl/source/window/abstdlg.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
diff --git a/vcl/source/window/accel.cxx b/vcl/source/window/accel.cxx
index 3018236fff1a..49ca3aca9716 100644
--- a/vcl/source/window/accel.cxx
+++ b/vcl/source/window/accel.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
@@ -46,15 +46,15 @@
 DECLARE_TABLE( ImplAccelTable, ImplAccelEntry* )
 DECLARE_LIST( ImplAccelList, ImplAccelEntry* )
 
-#define ACCELENTRY_NOTFOUND     ((USHORT)0xFFFF)
+#define ACCELENTRY_NOTFOUND 	((USHORT)0xFFFF)
 
 // =======================================================================
 
 class ImplAccelData
 {
 public:
-    ImplAccelTable  maKeyTable;     // Fuer KeyCodes, die mit einem Code erzeugt wurden
-    ImplAccelList   maIdList;       // Id-List
+    ImplAccelTable	maKeyTable; 	// Fuer KeyCodes, die mit einem Code erzeugt wurden
+    ImplAccelList	maIdList;		// Id-List
 };
 
 // =======================================================================
@@ -66,11 +66,11 @@ DBG_NAME( Accelerator )
 USHORT ImplAccelEntryGetIndex( ImplAccelList* pList, USHORT nId,
                                USHORT* pIndex = NULL )
 {
-    ULONG   nLow;
-    ULONG   nHigh;
-    ULONG   nMid;
-    ULONG   nCount = pList->Count();
-    USHORT  nCompareId;
+    ULONG	nLow;
+    ULONG	nHigh;
+    ULONG	nMid;
+    ULONG	nCount = pList->Count();
+    USHORT	nCompareId;
 
     // Abpruefen, ob der erste Key groesser als der Vergleichskey ist
     if ( !nCount || (nId < pList->GetObject( 0 )->mnId) )
@@ -114,8 +114,8 @@ USHORT ImplAccelEntryGetIndex( ImplAccelList* pList, USHORT nId,
 
 static void ImplAccelEntryInsert( ImplAccelList* pList, ImplAccelEntry* pEntry )
 {
-    USHORT  nInsIndex;
-    USHORT  nIndex = ImplAccelEntryGetIndex( pList, pEntry->mnId, &nInsIndex );
+    USHORT	nInsIndex;
+    USHORT	nIndex = ImplAccelEntryGetIndex( pList, pEntry->mnId, &nInsIndex );
 
     if ( nIndex != ACCELENTRY_NOTFOUND )
     {
@@ -159,10 +159,10 @@ static USHORT ImplAccelEntryGetFirstPos( ImplAccelList* pList, USHORT nId )
 
 void Accelerator::ImplInit()
 {
-    mnCurId             = 0;
-    mnCurRepeat         = 0;
-    mbIsCancel          = FALSE;
-    mpDel               = NULL;
+    mnCurId 			= 0;
+    mnCurRepeat 		= 0;
+    mbIsCancel			= FALSE;
+    mpDel				= NULL;
 }
 
 // -----------------------------------------------------------------------
@@ -248,12 +248,12 @@ void Accelerator::ImplInsertAccel( USHORT nItemId, const KeyCode& rKeyCode,
     }
 
     // Neuen Eintrag holen und fuellen
-    ImplAccelEntry* pEntry  = new ImplAccelEntry;
-    pEntry->mnId            = nItemId;
-    pEntry->maKeyCode       = rKeyCode;
-    pEntry->mpAccel         = pAutoAccel;
-    pEntry->mpAutoAccel     = pAutoAccel;
-    pEntry->mbEnabled       = bEnable;
+    ImplAccelEntry* pEntry	= new ImplAccelEntry;
+    pEntry->mnId			= nItemId;
+    pEntry->maKeyCode		= rKeyCode;
+    pEntry->mpAccel 		= pAutoAccel;
+    pEntry->mpAutoAccel 	= pAutoAccel;
+    pEntry->mbEnabled		= bEnable;
 
     // Ab in die Tabellen
     ULONG nCode = rKeyCode.GetFullKeyCode();
@@ -372,16 +372,16 @@ void Accelerator::InsertItem( const ResId& rResId )
 {
     DBG_CHKTHIS( Accelerator, NULL );
 
-    ULONG               nObjMask;
-    USHORT              nAccelKeyId;
-    USHORT              bDisable;
-    KeyCode             aKeyCode;
-    Accelerator*        pAutoAccel  = NULL;
+    ULONG				nObjMask;
+    USHORT				nAccelKeyId;
+    USHORT				bDisable;
+    KeyCode 			aKeyCode;
+    Accelerator*		pAutoAccel	= NULL;
 
     GetRes( rResId.SetRT( RSC_ACCELITEM ) );
-    nObjMask        = ReadLongRes();
-    nAccelKeyId     = sal::static_int_cast<USHORT>(ReadLongRes());
-    bDisable        = ReadShortRes();
+    nObjMask		= ReadLongRes();
+    nAccelKeyId		= sal::static_int_cast<USHORT>(ReadLongRes());
+    bDisable		= ReadShortRes();
 
     if ( nObjMask & ACCELITEM_KEY )
     {
@@ -568,16 +568,16 @@ BOOL Accelerator::Call( const KeyCode& rKeyCode, USHORT nRepeat )
         if ( pEntry->mbEnabled )
         {
             BOOL bDel = FALSE;
-            mnCurId         = pEntry->mnId;
-            maCurKeyCode    = rKeyCode;
-            mnCurRepeat     = nRepeat;
-            mpDel           = &bDel;
+            mnCurId 		= pEntry->mnId;
+            maCurKeyCode	= rKeyCode;
+            mnCurRepeat 	= nRepeat;
+            mpDel			= &bDel;
             Select();
             if ( !bDel )
             {
-                mnCurId         = 0;
-                maCurKeyCode    = KeyCode();
-                mnCurRepeat     = 0;
+                mnCurId 		= 0;
+                maCurKeyCode	= KeyCode();
+                mnCurRepeat 	= 0;
             }
 
             return TRUE;
@@ -715,11 +715,11 @@ Accelerator& Accelerator::operator=( const Accelerator& rAccel )
     DBG_CHKOBJ( &rAccel, Accelerator, NULL );
 
     // Neue Daten zuweisen
-    maHelpStr       = rAccel.maHelpStr;
-    maCurKeyCode    = KeyCode();
-    mnCurId         = 0;
-    mnCurRepeat     = 0;
-    mbIsCancel      = FALSE;
+    maHelpStr		= rAccel.maHelpStr;
+    maCurKeyCode	= KeyCode();
+    mnCurId 		= 0;
+    mnCurRepeat 	= 0;
+    mbIsCancel		= FALSE;
 
     // Tabellen loeschen und kopieren
     ImplDeleteData();
diff --git a/vcl/source/window/accmgr.cxx b/vcl/source/window/accmgr.cxx
index 81699bcaabb0..cb302296bdce 100644
--- a/vcl/source/window/accmgr.cxx
+++ b/vcl/source/window/accmgr.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
@@ -83,7 +83,7 @@ void ImplAccelManager::RemoveAccel( Accelerator* pAccel )
     //e.g. #i90599#. Someone starts typing a sequence in a dialog, but doesn't
     //end it, and then closes the dialog, deleting the accelerators. So if
     //we're removing an accelerator that a sub-accelerator which is in the
-    //sequence list, throw away the entire sequence
+    //sequence list, throw away the entire sequence 
     if ( mpSequenceList )
     {
         for (USHORT i = 0; i < pAccel->GetItemCount(); ++i)
diff --git a/vcl/source/window/arrange.cxx b/vcl/source/window/arrange.cxx
index dad48235f8fb..b110177d10e5 100644
--- a/vcl/source/window/arrange.cxx
+++ b/vcl/source/window/arrange.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
@@ -53,7 +53,7 @@ void WindowArranger::setParent( WindowArranger* i_pParent )
 void WindowArranger::setParentWindow( Window* i_pNewParent )
 {
     m_pParentWindow = i_pNewParent;
-
+    
     size_t nEle = countElements();
     for( size_t i = 0; i < nEle; i++ )
     {
@@ -167,7 +167,7 @@ Size WindowArranger::Element::getOptimalSize( WindowSizeType i_eType ) const
         aResult.Width() += m_nLeftBorder + m_nRightBorder;
         aResult.Height() += m_nTopBorder + m_nBottomBorder;
     }
-
+    
     return aResult;
 }
 
@@ -236,7 +236,7 @@ Size RowOrColumn::getOptimalSize( WindowSizeType i_eType ) const
             aRet.Height() -= m_nBorderWidth;
         else
             aRet.Width() -= m_nBorderWidth;
-
+    
         // add the outer border
         aRet.Width() += 2*m_nOuterBorder;
         aRet.Height() += 2*m_nOuterBorder;
@@ -267,7 +267,7 @@ void RowOrColumn::distributeRowWidth( std::vector<Size>& io_rSizes, long /*i_nUs
                     aIndices.push_back( i );
             }
         }
-
+        
         // distribute extra space evenly among collected elements
         nElements = aIndices.size();
         if( nElements > 0 )
@@ -307,7 +307,7 @@ void RowOrColumn::distributeColumnHeight( std::vector<Size>& io_rSizes, long /*i
                     aIndices.push_back( i );
             }
         }
-
+        
         // distribute extra space evenly among collected elements
         nElements = aIndices.size();
         if( nElements > 0 )
@@ -497,7 +497,7 @@ void LabeledElement::resize()
     Size aElementSize( m_aElement.getOptimalSize( WINDOWSIZE_PREFERRED ) );
     if( m_nDistance + aLabelSize.Width() + aElementSize.Width() > m_aManagedArea.GetWidth() )
         aElementSize = m_aElement.getOptimalSize( WINDOWSIZE_MINIMUM );
-
+    
     // align label and element vertically in LabeledElement
     long nYOff = (m_aManagedArea.GetHeight() - 2*m_nOuterBorder - aLabelSize.Height()) / 2;
     Point aPos( m_aManagedArea.Left(),
@@ -506,13 +506,13 @@ void LabeledElement::resize()
     if( m_nLabelColumnWidth != 0 )
         aSize.Width() = m_nLabelColumnWidth;
     m_aLabel.setPosSize( aPos, aSize );
-
+    
     aPos.X() += aSize.Width() + m_nDistance;
     nYOff = (m_aManagedArea.GetHeight() - 2*m_nOuterBorder - aElementSize.Height()) / 2;
     aPos.Y() = m_aManagedArea.Top() + m_nOuterBorder + nYOff;
     aSize.Width() = aElementSize.Width();
     aSize.Height() = m_aManagedArea.GetHeight() - 2*m_nOuterBorder;
-
+    
     // label style
     // 0: position left and right
     // 1: keep the element close to label and grow it
@@ -591,7 +591,7 @@ Size LabelColumn::getOptimalSize( WindowSizeType i_eType ) const
 {
     long nWidth = getLabelWidth();
     Size aColumnSize;
-
+    
     // every child is a LabeledElement
     size_t nEle = countElements();
     for( size_t i = 0; i < nEle; i++ )
@@ -628,7 +628,7 @@ Size LabelColumn::getOptimalSize( WindowSizeType i_eType ) const
         }
         if( aElementSize.Height() )
         {
-            aColumnSize.Height() += getBorderWidth() + aElementSize.Height();
+            aColumnSize.Height() += getBorderWidth() + aElementSize.Height(); 
         }
     }
     if( nEle > 0 && aColumnSize.Height() )
@@ -731,7 +731,7 @@ MatrixArranger::~MatrixArranger()
 Size MatrixArranger::getOptimalSize( WindowSizeType i_eType, std::vector<long>& o_rColumnWidths, std::vector<long>& o_rRowHeights ) const
 {
     Size aMatrixSize( 2*m_nOuterBorder, 2*m_nOuterBorder );
-
+    
     // first find out the current number of rows and columns
     sal_uInt32 nRows = 0, nColumns = 0;
     for( std::vector< MatrixElement >::const_iterator it = m_aElements.begin();
@@ -742,11 +742,11 @@ Size MatrixArranger::getOptimalSize( WindowSizeType i_eType, std::vector<long>&
         if( it->m_nY >= nRows )
             nRows = it->m_nY+1;
     }
-
+    
     // now allocate row and column depth vectors
     o_rColumnWidths = std::vector< long >( nColumns, 0 );
     o_rRowHeights   = std::vector< long >( nRows, 0 );
-
+    
     // get sizes an allocate them into rows/columns
     for( std::vector< MatrixElement >::const_iterator it = m_aElements.begin();
             it != m_aElements.end(); ++it )
@@ -757,18 +757,18 @@ Size MatrixArranger::getOptimalSize( WindowSizeType i_eType, std::vector<long>&
         if( aSize.Height() > o_rRowHeights[ it->m_nY ] )
             o_rRowHeights[ it->m_nY ] = aSize.Height();
     }
-
+    
     // add up sizes
     for( sal_uInt32 i = 0; i < nColumns; i++ )
         aMatrixSize.Width() += o_rColumnWidths[i] + m_nBorderX;
     if( nColumns > 0 )
         aMatrixSize.Width() -= m_nBorderX;
-
+    
     for( sal_uInt32 i = 0; i < nRows; i++ )
         aMatrixSize.Height() += o_rRowHeights[i] + m_nBorderY;
     if( nRows > 0 )
         aMatrixSize.Height() -= m_nBorderY;
-
+    
     return aMatrixSize;
 }
 
@@ -783,7 +783,7 @@ void MatrixArranger::resize()
     // assure that we have at least one row and column
     if( m_aElements.empty() )
         return;
-
+    
     // check if we can get optimal size, else fallback to minimal size
     std::vector<long> aColumnWidths, aRowHeights;
     Size aOptSize( getOptimalSize( WINDOWSIZE_PREFERRED, aColumnWidths, aRowHeights ) );
@@ -797,20 +797,20 @@ void MatrixArranger::resize()
         if( aOptSize.Width() > m_aManagedArea.GetWidth() )
             aColumnWidths = aMinColumnWidths;
     }
-
+    
     // FIXME: distribute extra space available
-
+    
     // prepare offsets
     std::vector<long> aColumnX( aColumnWidths.size() );
     aColumnX[0] = m_aManagedArea.Left() + m_nOuterBorder;
     for( size_t i = 1; i < aColumnX.size(); i++ )
         aColumnX[i] = aColumnX[i-1] + aColumnWidths[i-1] + m_nBorderX;
-
+    
     std::vector<long> aRowY( aRowHeights.size() );
     aRowY[0] = m_aManagedArea.Top() + m_nOuterBorder;
     for( size_t i = 1; i < aRowY.size(); i++ )
         aRowY[i] = aRowY[i-1] + aRowHeights[i-1] + m_nBorderY;
-
+    
     // now iterate over the elements and assign their positions
     for( std::vector< MatrixElement >::iterator it = m_aElements.begin();
          it != m_aElements.end(); ++it )
diff --git a/vcl/source/window/brdwin.cxx b/vcl/source/window/brdwin.cxx
index b221d1f7d928..cb43ab822268 100644
--- a/vcl/source/window/brdwin.cxx
+++ b/vcl/source/window/brdwin.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
@@ -104,10 +104,10 @@ void Window::ImplCalcSymbolRect( Rectangle& rRect )
     // Zwischen dem Symbol und dem Button-Rand lassen wir 5% Platz
     long nExtraWidth = ((rRect.GetWidth()*50)+500)/1000;
     long nExtraHeight = ((rRect.GetHeight()*50)+500)/1000;
-    rRect.Left()    += nExtraWidth;
-    rRect.Right()   -= nExtraWidth;
-    rRect.Top()     += nExtraHeight;
-    rRect.Bottom()  -= nExtraHeight;
+    rRect.Left()	+= nExtraWidth;
+    rRect.Right()	-= nExtraWidth;
+    rRect.Top() 	+= nExtraHeight;
+    rRect.Bottom()	-= nExtraHeight;
 }
 
 // -----------------------------------------------------------------------
@@ -116,8 +116,8 @@ static void ImplDrawBrdWinSymbol( OutputDevice* pDev,
                                   const Rectangle& rRect, SymbolType eSymbol )
 {
     // Zwischen dem Symbol und dem Button lassen wir 5% Platz
-    DecorationView  aDecoView( pDev );
-    Rectangle       aTempRect = rRect;
+    DecorationView	aDecoView( pDev );
+    Rectangle		aTempRect = rRect;
     Window::ImplCalcSymbolRect( aTempRect );
     aDecoView.DrawSymbol( aTempRect, eSymbol,
                           pDev->GetSettings().GetStyleSettings().GetButtonTextColor(), 0 );
@@ -211,10 +211,10 @@ void ImplBorderWindowView::ImplInitTitle( ImplBorderFrameData* pData )
 {
     ImplBorderWindow* pBorderWindow = pData->mpBorderWindow;
 
-    if ( !(pBorderWindow->GetStyle() & WB_MOVEABLE) ||
+    if ( !(pBorderWindow->GetStyle() & (WB_MOVEABLE | WB_POPUP)) ||
           (pData->mnTitleType == BORDERWINDOW_TITLE_NONE) )
     {
-        pData->mnTitleType   = BORDERWINDOW_TITLE_NONE;
+        pData->mnTitleType	 = BORDERWINDOW_TITLE_NONE;
         pData->mnTitleHeight = 0;
     }
     else
@@ -276,7 +276,7 @@ USHORT ImplBorderWindowView::ImplHitTest( ImplBorderFrameData* pData, const Poin
 
         // no corner resize for floating toolbars, which would lead to jumps while formatting
         // setting nSizeWidth = 0 will only return pure left,top,right,bottom
-        if( pBorderWindow->GetStyle() & WB_OWNERDRAWDECORATION )
+        if( pBorderWindow->GetStyle() & (WB_OWNERDRAWDECORATION | WB_POPUP) )
             nSizeWidth = 0;
 
         if ( rPos.X() < pData->mnLeftBorder )
@@ -426,10 +426,10 @@ BOOL ImplBorderWindowView::ImplMouseButtonDown( ImplBorderFrameData* pData, cons
                 {
                     if ( bTracking )
                     {
-                        Point   aPos         = pBorderWindow->GetPosPixel();
-                        Size    aSize        = pBorderWindow->GetOutputSizePixel();
-                        pData->mnTrackX      = aPos.X();
-                        pData->mnTrackY      = aPos.Y();
+                        Point	aPos		 = pBorderWindow->GetPosPixel();
+                        Size	aSize		 = pBorderWindow->GetOutputSizePixel();
+                        pData->mnTrackX 	 = aPos.X();
+                        pData->mnTrackY 	 = aPos.Y();
                         pData->mnTrackWidth  = aSize.Width();
                         pData->mnTrackHeight = aSize.Height();
 
@@ -782,8 +782,8 @@ BOOL ImplBorderWindowView::ImplTracking( ImplBorderFrameData* pData, const Track
         {
             /*
             // adjusting mousepos not required, we allow the whole screen (no desktop anymore...)
-            Point   aFrameMousePos = pBorderWindow->ImplOutputToFrame( aMousePos );
-            Size    aFrameSize = pBorderWindow->ImplGetFrameWindow()->GetOutputSizePixel();
+            Point	aFrameMousePos = pBorderWindow->ImplOutputToFrame( aMousePos );
+            Size	aFrameSize = pBorderWindow->ImplGetFrameWindow()->GetOutputSizePixel();
             if ( aFrameMousePos.X() < 0 )
                 aFrameMousePos.X() = 0;
             if ( aFrameMousePos.Y() < 0 )
@@ -795,8 +795,8 @@ BOOL ImplBorderWindowView::ImplTracking( ImplBorderFrameData* pData, const Track
             aMousePos = pBorderWindow->ImplFrameToOutput( aFrameMousePos );
             */
 
-            aMousePos.X()    -= pData->maMouseOff.X();
-            aMousePos.Y()    -= pData->maMouseOff.Y();
+            aMousePos.X()	 -= pData->maMouseOff.X();
+            aMousePos.Y()	 -= pData->maMouseOff.Y();
 
             if ( pData->mnHitTest & BORDERWINDOW_HITTEST_TITLE )
             {
@@ -820,18 +820,18 @@ BOOL ImplBorderWindowView::ImplTracking( ImplBorderFrameData* pData, const Track
             }
             else
             {
-                Point       aOldPos         = pBorderWindow->GetPosPixel();
-                Size        aSize           = pBorderWindow->GetSizePixel();
-                Rectangle   aNewRect( aOldPos, aSize );
-                long        nOldWidth       = aSize.Width();
-                long        nOldHeight      = aSize.Height();
-                long        nBorderWidth    = pData->mnLeftBorder+pData->mnRightBorder;
-                long        nBorderHeight   = pData->mnTopBorder+pData->mnBottomBorder;
-                long        nMinWidth       = pBorderWindow->mnMinWidth+nBorderWidth;
-                long        nMinHeight      = pBorderWindow->mnMinHeight+nBorderHeight;
-                long        nMinWidth2      = nBorderWidth;
-                long        nMaxWidth       = pBorderWindow->mnMaxWidth+nBorderWidth;
-                long        nMaxHeight      = pBorderWindow->mnMaxHeight+nBorderHeight;
+                Point		aOldPos			= pBorderWindow->GetPosPixel();
+                Size		aSize			= pBorderWindow->GetSizePixel();
+                Rectangle	aNewRect( aOldPos, aSize );
+                long		nOldWidth		= aSize.Width();
+                long		nOldHeight		= aSize.Height();
+                long		nBorderWidth	= pData->mnLeftBorder+pData->mnRightBorder;
+                long		nBorderHeight	= pData->mnTopBorder+pData->mnBottomBorder;
+                long		nMinWidth		= pBorderWindow->mnMinWidth+nBorderWidth;
+                long		nMinHeight		= pBorderWindow->mnMinHeight+nBorderHeight;
+                long		nMinWidth2		= nBorderWidth;
+                long		nMaxWidth		= pBorderWindow->mnMaxWidth+nBorderWidth;
+                long		nMaxHeight		= pBorderWindow->mnMaxHeight+nBorderHeight;
 
                 if ( pData->mnTitleHeight )
                 {
@@ -880,11 +880,11 @@ BOOL ImplBorderWindowView::ImplTracking( ImplBorderFrameData* pData, const Track
                 {
                     // adjust size for Resizing-call
                     aSize = aNewRect.GetSize();
-                    aSize.Width()   -= nBorderWidth;
-                    aSize.Height()  -= nBorderHeight;
+                    aSize.Width()	-= nBorderWidth;
+                    aSize.Height()	-= nBorderHeight;
                     ((SystemWindow*)pBorderWindow->ImplGetClientWindow())->Resizing( aSize );
-                    aSize.Width()   += nBorderWidth;
-                    aSize.Height()  += nBorderHeight;
+                    aSize.Width()	+= nBorderWidth;
+                    aSize.Height()	+= nBorderHeight;
                     if ( aSize.Width() < nMinWidth )
                         aSize.Width() = nMinWidth;
                     if ( aSize.Height() < nMinHeight )
@@ -922,8 +922,8 @@ BOOL ImplBorderWindowView::ImplTracking( ImplBorderFrameData* pData, const Track
                 }
                 else
                 {
-                    pData->mnTrackX        = aNewRect.Left();
-                    pData->mnTrackY        = aNewRect.Top();
+                    pData->mnTrackX 	   = aNewRect.Left();
+                    pData->mnTrackY 	   = aNewRect.Top();
                     pData->mnTrackWidth    = aNewRect.GetWidth();
                     pData->mnTrackHeight   = aNewRect.GetHeight();
                     pBorderWindow->ShowTracking( Rectangle( pBorderWindow->ScreenToOutputPixel( aNewRect.TopLeft() ), aNewRect.GetSize() ), SHOWTRACK_BIG );
@@ -948,8 +948,8 @@ String ImplBorderWindowView::ImplRequestHelp( ImplBorderFrameData* pData,
     {
         if ( nHitTest & BORDERWINDOW_HITTEST_CLOSE )
         {
-            nHelpId     = SV_HELPTEXT_CLOSE;
-            rHelpRect   = pData->maCloseRect;
+            nHelpId 	= SV_HELPTEXT_CLOSE;
+            rHelpRect	= pData->maCloseRect;
         }
         else if ( nHitTest & BORDERWINDOW_HITTEST_ROLL )
         {
@@ -957,33 +957,33 @@ String ImplBorderWindowView::ImplRequestHelp( ImplBorderFrameData* pData,
                 nHelpId = SV_HELPTEXT_ROLLDOWN;
             else
                 nHelpId = SV_HELPTEXT_ROLLUP;
-            rHelpRect   = pData->maRollRect;
+            rHelpRect	= pData->maRollRect;
         }
         else if ( nHitTest & BORDERWINDOW_HITTEST_DOCK )
         {
-            nHelpId     = SV_HELPTEXT_MAXIMIZE;
-            rHelpRect   = pData->maDockRect;
+            nHelpId 	= SV_HELPTEXT_MAXIMIZE;
+            rHelpRect	= pData->maDockRect;
         }
         /* no help string available
         else if ( nHitTest & BORDERWINDOW_HITTEST_MENU )
         {
-            nHelpId     = SV_HELPTEXT_MENU;
-            rHelpRect   = pData->maMenuRect;
+            nHelpId 	= SV_HELPTEXT_MENU;
+            rHelpRect	= pData->maMenuRect;
         }*/
         else if ( nHitTest & BORDERWINDOW_HITTEST_HIDE )
         {
-            nHelpId     = SV_HELPTEXT_MINIMIZE;
-            rHelpRect   = pData->maHideRect;
+            nHelpId 	= SV_HELPTEXT_MINIMIZE;
+            rHelpRect	= pData->maHideRect;
         }
         else if ( nHitTest & BORDERWINDOW_HITTEST_HELP )
         {
-            nHelpId     = SV_HELPTEXT_HELP;
-            rHelpRect   = pData->maHelpRect;
+            nHelpId 	= SV_HELPTEXT_HELP;
+            rHelpRect	= pData->maHelpRect;
         }
         else if ( nHitTest & BORDERWINDOW_HITTEST_PIN )
         {
-            nHelpId     = SV_HELPTEXT_ALWAYSVISIBLE;
-            rHelpRect   = pData->maPinRect;
+            nHelpId 	= SV_HELPTEXT_ALWAYSVISIBLE;
+            rHelpRect	= pData->maPinRect;
         }
         else if ( nHitTest & BORDERWINDOW_HITTEST_TITLE )
         {
@@ -992,7 +992,7 @@ String ImplBorderWindowView::ImplRequestHelp( ImplBorderFrameData* pData,
                 // tooltip only if title truncated
                 if( pData->mbTitleClipped )
                 {
-                    rHelpRect   = pData->maTitleRect;
+                    rHelpRect	= pData->maTitleRect;
                     // no help id, use window title as help string
                     aHelpStr    = pData->mpBorderWindow->GetText();
                 }
@@ -1048,10 +1048,10 @@ void ImplNoBorderWindowView::Init( OutputDevice*, long, long )
 void ImplNoBorderWindowView::GetBorder( sal_Int32& rLeftBorder, sal_Int32& rTopBorder,
                                         sal_Int32& rRightBorder, sal_Int32& rBottomBorder ) const
 {
-    rLeftBorder     = 0;
-    rTopBorder      = 0;
-    rRightBorder    = 0;
-    rBottomBorder   = 0;
+    rLeftBorder 	= 0;
+    rTopBorder		= 0;
+    rRightBorder	= 0;
+    rBottomBorder	= 0;
 }
 
 // -----------------------------------------------------------------------
@@ -1084,18 +1084,18 @@ ImplSmallBorderWindowView::ImplSmallBorderWindowView( ImplBorderWindow* pBorderW
 
 void ImplSmallBorderWindowView::Init( OutputDevice* pDev, long nWidth, long nHeight )
 {
-    mpOutDev    = pDev;
-    mnWidth     = nWidth;
-    mnHeight    = nHeight;
+    mpOutDev	= pDev;
+    mnWidth 	= nWidth;
+    mnHeight	= nHeight;
     mbNWFBorder = false;
 
     USHORT nBorderStyle = mpBorderWindow->GetBorderStyle();
     if ( nBorderStyle & WINDOW_BORDER_NOBORDER )
     {
-        mnLeftBorder    = 0;
-        mnTopBorder     = 0;
-        mnRightBorder   = 0;
-        mnBottomBorder  = 0;
+        mnLeftBorder	= 0;
+        mnTopBorder 	= 0;
+        mnRightBorder	= 0;
+        mnBottomBorder	= 0;
     }
     else
     {
@@ -1108,7 +1108,7 @@ void ImplSmallBorderWindowView::Init( OutputDevice* pDev, long nWidth, long nHei
             Window *pWin = NULL, *pCtrl = NULL;
             if( mpOutDev->GetOutDevType() == OUTDEV_WINDOW )
                 pWin = (Window*) mpOutDev;
-
+        
             ControlType aCtrlType = 0;
             if( pWin && (pCtrl = mpBorderWindow->GetWindow( WINDOW_CLIENT )) != NULL )
             {
@@ -1164,18 +1164,18 @@ void ImplSmallBorderWindowView::Init( OutputDevice* pDev, long nWidth, long nHei
                     mnBottomBorder  = aBounds.Bottom() - aContent.Bottom();
                     if( mnWidth && mnHeight )
                     {
-
+    
                         mpBorderWindow->SetPaintTransparent( TRUE );
                         mpBorderWindow->SetBackground();
                         pCtrl->SetPaintTransparent( TRUE );
-
+                        
                         Window* pCompoundParent = NULL;
                         if( pWin->GetParent() && pWin->GetParent()->IsCompoundControl() )
                             pCompoundParent = pWin->GetParent();
-
+                        
                         if( pCompoundParent )
                             pCompoundParent->SetPaintTransparent( TRUE );
-
+    
                         if( mnWidth < aBounds.GetWidth() || mnHeight < aBounds.GetHeight() )
                         {
                             if( ! pCompoundParent ) // compound controls have to fix themselves
@@ -1194,7 +1194,7 @@ void ImplSmallBorderWindowView::Init( OutputDevice* pDev, long nWidth, long nHei
                     mbNWFBorder = false;
             }
         }
-
+        
         if( ! mbNWFBorder )
         {
             USHORT nStyle = FRAME_DRAW_NODRAW;
@@ -1206,14 +1206,14 @@ void ImplSmallBorderWindowView::Init( OutputDevice* pDev, long nWidth, long nHei
                 nStyle |= FRAME_DRAW_DOUBLEIN;
             if ( nBorderStyle & WINDOW_BORDER_MONO )
                 nStyle |= FRAME_DRAW_MONO;
-
-            DecorationView  aDecoView( mpOutDev );
-            Rectangle       aRect( 0, 0, 10, 10 );
-            Rectangle       aCalcRect = aDecoView.DrawFrame( aRect, nStyle );
-            mnLeftBorder    = aCalcRect.Left();
-            mnTopBorder     = aCalcRect.Top();
-            mnRightBorder   = aRect.Right()-aCalcRect.Right();
-            mnBottomBorder  = aRect.Bottom()-aCalcRect.Bottom();
+    
+            DecorationView	aDecoView( mpOutDev );
+            Rectangle		aRect( 0, 0, 10, 10 );
+            Rectangle		aCalcRect = aDecoView.DrawFrame( aRect, nStyle );
+            mnLeftBorder	= aCalcRect.Left();
+            mnTopBorder 	= aCalcRect.Top();
+            mnRightBorder	= aRect.Right()-aCalcRect.Right();
+            mnBottomBorder	= aRect.Bottom()-aCalcRect.Bottom();
         }
     }
 }
@@ -1223,10 +1223,10 @@ void ImplSmallBorderWindowView::Init( OutputDevice* pDev, long nWidth, long nHei
 void ImplSmallBorderWindowView::GetBorder( sal_Int32& rLeftBorder, sal_Int32& rTopBorder,
                                            sal_Int32& rRightBorder, sal_Int32& rBottomBorder ) const
 {
-    rLeftBorder     = mnLeftBorder;
-    rTopBorder      = mnTopBorder;
-    rRightBorder    = mnRightBorder;
-    rBottomBorder   = mnBottomBorder;
+    rLeftBorder 	= mnLeftBorder;
+    rTopBorder		= mnTopBorder;
+    rRightBorder	= mnRightBorder;
+    rBottomBorder	= mnBottomBorder;
 }
 
 // -----------------------------------------------------------------------
@@ -1292,12 +1292,12 @@ void ImplSmallBorderWindowView::DrawWindow( USHORT nDrawFlags, OutputDevice*, co
                 break;
 
             case WINDOW_COMBOBOX:
-            case WINDOW_PATTERNBOX:
-            case WINDOW_NUMERICBOX:
-            case WINDOW_METRICBOX:
+            case WINDOW_PATTERNBOX:			
+            case WINDOW_NUMERICBOX:			
+            case WINDOW_METRICBOX:			
             case WINDOW_CURRENCYBOX:
-            case WINDOW_DATEBOX:
-            case WINDOW_TIMEBOX:
+            case WINDOW_DATEBOX:		
+            case WINDOW_TIMEBOX:			
             case WINDOW_LONGCURRENCYBOX:
                 if( pCtrl->GetStyle() & WB_DROPDOWN )
                 {
@@ -1315,7 +1315,7 @@ void ImplSmallBorderWindowView::DrawWindow( USHORT nDrawFlags, OutputDevice*, co
                 break;
         }
     }
-
+    
     if ( aCtrlType && pCtrl->IsNativeControlSupported(aCtrlType, aCtrlPart) )
     {
         ImplControlValue aControlValue;
@@ -1334,18 +1334,18 @@ void ImplSmallBorderWindowView::DrawWindow( USHORT nDrawFlags, OutputDevice*, co
             if( pCtrl->HasFocus() || pCtrl->HasChildPathFocus() )
                 nState |= CTRL_STATE_FOCUSED;
         }
-
+        
         BOOL bMouseOver = FALSE;
         Window *pCtrlChild = pCtrl->GetWindow( WINDOW_FIRSTCHILD );
         while( pCtrlChild && (bMouseOver = pCtrlChild->IsMouseOver()) == FALSE )
             pCtrlChild = pCtrlChild->GetWindow( WINDOW_NEXT );
-
+        
         if( bMouseOver )
             nState |= CTRL_STATE_ROLLOVER;
 
         Point aPoint;
         Rectangle aCtrlRegion( aPoint, Size( mnWidth, mnHeight ) );
-
+        
         Rectangle aBoundingRgn( aPoint, Size( mnWidth, mnHeight ) );
         Rectangle aContentRgn( aCtrlRegion );
         if(pWin->GetNativeControlRegion( aCtrlType, aCtrlPart, aCtrlRegion,
@@ -1353,7 +1353,7 @@ void ImplSmallBorderWindowView::DrawWindow( USHORT nDrawFlags, OutputDevice*, co
         {
             aCtrlRegion=aContentRgn;
         }
-
+        
         bNativeOK = pWin->DrawNativeControl( aCtrlType, aCtrlPart, aCtrlRegion, nState,
                 aControlValue, rtl::OUString() );
 
@@ -1397,11 +1397,11 @@ void ImplSmallBorderWindowView::DrawWindow( USHORT nDrawFlags, OutputDevice*, co
                 nStyle |= FRAME_DRAW_MENU;
             // tell DrawFrame that we're drawing a window border of a frame window to avoid round corners
             if( pWin && pWin == pWin->ImplGetFrameWindow() )
-                nStyle |= FRAME_DRAW_WINDOWBORDER;
+                nStyle |= FRAME_DRAW_WINDOWBORDER;  
 
-            DecorationView  aDecoView( mpOutDev );
-            Point           aTmpPoint;
-            Rectangle       aInRect( aTmpPoint, Size( mnWidth, mnHeight ) );
+            DecorationView	aDecoView( mpOutDev );
+            Point			aTmpPoint;
+            Rectangle		aInRect( aTmpPoint, Size( mnWidth, mnHeight ) );
             aDecoView.DrawFrame( aInRect, nStyle );
         }
     }
@@ -1415,20 +1415,20 @@ void ImplSmallBorderWindowView::DrawWindow( USHORT nDrawFlags, OutputDevice*, co
 
 ImplStdBorderWindowView::ImplStdBorderWindowView( ImplBorderWindow* pBorderWindow )
 {
-    maFrameData.mpBorderWindow  = pBorderWindow;
-    maFrameData.mbDragFull      = FALSE;
-    maFrameData.mnHitTest       = 0;
-    maFrameData.mnPinState      = 0;
-    maFrameData.mnCloseState    = 0;
-    maFrameData.mnRollState     = 0;
-    maFrameData.mnDockState     = 0;
-    maFrameData.mnMenuState     = 0;
-    maFrameData.mnHideState     = 0;
-    maFrameData.mnHelpState     = 0;
-    maFrameData.mbTitleClipped  = 0;
+    maFrameData.mpBorderWindow	= pBorderWindow;
+    maFrameData.mbDragFull		= FALSE;
+    maFrameData.mnHitTest		= 0;
+    maFrameData.mnPinState		= 0;
+    maFrameData.mnCloseState	= 0;
+    maFrameData.mnRollState 	= 0;
+    maFrameData.mnDockState 	= 0;
+    maFrameData.mnMenuState 	= 0;
+    maFrameData.mnHideState 	= 0;
+    maFrameData.mnHelpState 	= 0;
+    maFrameData.mbTitleClipped 	= 0;
 
-    mpATitleVirDev              = NULL;
-    mpDTitleVirDev              = NULL;
+    mpATitleVirDev				= NULL;
+    mpDTitleVirDev				= NULL;
 }
 
 // -----------------------------------------------------------------------
@@ -1480,35 +1480,35 @@ Rectangle ImplStdBorderWindowView::GetMenuRect() const
 
 void ImplStdBorderWindowView::Init( OutputDevice* pDev, long nWidth, long nHeight )
 {
-    ImplBorderFrameData*    pData = &maFrameData;
-    ImplBorderWindow*       pBorderWindow = maFrameData.mpBorderWindow;
-    const StyleSettings&    rStyleSettings = pDev->GetSettings().GetStyleSettings();
-    DecorationView          aDecoView( pDev );
-    Rectangle               aRect( 0, 0, 10, 10 );
-    Rectangle               aCalcRect = aDecoView.DrawFrame( aRect, FRAME_DRAW_DOUBLEOUT | FRAME_DRAW_NODRAW );
+    ImplBorderFrameData*	pData = &maFrameData;
+    ImplBorderWindow*		pBorderWindow = maFrameData.mpBorderWindow;
+    const StyleSettings&	rStyleSettings = pDev->GetSettings().GetStyleSettings();
+    DecorationView			aDecoView( pDev );
+    Rectangle				aRect( 0, 0, 10, 10 );
+    Rectangle				aCalcRect = aDecoView.DrawFrame( aRect, FRAME_DRAW_DOUBLEOUT | FRAME_DRAW_NODRAW );
 
-    pData->mpOutDev         = pDev;
-    pData->mnWidth          = nWidth;
-    pData->mnHeight         = nHeight;
+    pData->mpOutDev 		= pDev;
+    pData->mnWidth			= nWidth;
+    pData->mnHeight 		= nHeight;
 
-    pData->mnTitleType      = pBorderWindow->mnTitleType;
-    pData->mbFloatWindow    = pBorderWindow->mbFloatWindow;
+    pData->mnTitleType		= pBorderWindow->mnTitleType;
+    pData->mbFloatWindow	= pBorderWindow->mbFloatWindow;
 
-    if ( !(pBorderWindow->GetStyle() & WB_MOVEABLE) || (pData->mnTitleType == BORDERWINDOW_TITLE_NONE) )
+    if ( !(pBorderWindow->GetStyle() & (WB_MOVEABLE | WB_POPUP)) || (pData->mnTitleType == BORDERWINDOW_TITLE_NONE) )
         pData->mnBorderSize = 0;
     else if ( pData->mnTitleType == BORDERWINDOW_TITLE_TEAROFF )
         pData->mnBorderSize = 0;
     else
         pData->mnBorderSize = rStyleSettings.GetBorderSize();
-    pData->mnLeftBorder     = aCalcRect.Left();
-    pData->mnTopBorder      = aCalcRect.Top();
-    pData->mnRightBorder    = aRect.Right()-aCalcRect.Right();
-    pData->mnBottomBorder   = aRect.Bottom()-aCalcRect.Bottom();
+    pData->mnLeftBorder 	= aCalcRect.Left();
+    pData->mnTopBorder		= aCalcRect.Top();
+    pData->mnRightBorder	= aRect.Right()-aCalcRect.Right();
+    pData->mnBottomBorder	= aRect.Bottom()-aCalcRect.Bottom();
     pData->mnLeftBorder    += pData->mnBorderSize;
-    pData->mnTopBorder     += pData->mnBorderSize;
+    pData->mnTopBorder	   += pData->mnBorderSize;
     pData->mnRightBorder   += pData->mnBorderSize;
     pData->mnBottomBorder  += pData->mnBorderSize;
-    pData->mnNoTitleTop     = pData->mnTopBorder;
+    pData->mnNoTitleTop 	= pData->mnTopBorder;
 
     ImplInitTitle( &maFrameData );
     if ( pData->mnTitleHeight )
@@ -1519,29 +1519,29 @@ void ImplStdBorderWindowView::Init( OutputDevice* pDev, long nWidth, long nHeigh
 
         // set a proper background for drawing
         // highlighted buttons in the title
-        pBorderWindow->SetBackground( rStyleSettings.GetWindowColor() );
+        pBorderWindow->SetBackground( rStyleSettings.GetFaceColor() );
 
-        pData->maTitleRect.Left()    = pData->mnLeftBorder;
-        pData->maTitleRect.Right()   = nWidth-pData->mnRightBorder-1;
-        pData->maTitleRect.Top()     = pData->mnTopBorder;
+        pData->maTitleRect.Left()	 = pData->mnLeftBorder;
+        pData->maTitleRect.Right()	 = nWidth-pData->mnRightBorder-1;
+        pData->maTitleRect.Top()	 = pData->mnTopBorder;
         pData->maTitleRect.Bottom()  = pData->maTitleRect.Top()+pData->mnTitleHeight-1;
 
         if ( pData->mnTitleType & (BORDERWINDOW_TITLE_NORMAL | BORDERWINDOW_TITLE_SMALL) )
         {
-            long nLeft          = pData->maTitleRect.Left();
-            long nRight         = pData->maTitleRect.Right();
-            long nItemTop       = pData->maTitleRect.Top();
-            long nItemBottom    = pData->maTitleRect.Bottom();
-            nLeft              += 1;
-            nRight             -= 3;
-            nItemTop           += 2;
-            nItemBottom        -= 2;
+            long nLeft			= pData->maTitleRect.Left();
+            long nRight 		= pData->maTitleRect.Right();
+            long nItemTop		= pData->maTitleRect.Top();
+            long nItemBottom	= pData->maTitleRect.Bottom();
+            nLeft			   += 1;
+            nRight			   -= 3;
+            nItemTop		   += 2;
+            nItemBottom 	   -= 2;
 
             if ( pBorderWindow->GetStyle() & WB_PINABLE )
             {
                 Image aImage;
                 ImplGetPinImage( 0, 0, aImage );
-                pData->maPinRect.Top()    = nItemTop;
+                pData->maPinRect.Top()	  = nItemTop;
                 pData->maPinRect.Bottom() = nItemBottom;
                 pData->maPinRect.Left()   = nLeft;
                 pData->maPinRect.Right()  = pData->maPinRect.Left()+aImage.GetSizePixel().Width();
@@ -1550,10 +1550,10 @@ void ImplStdBorderWindowView::Init( OutputDevice* pDev, long nWidth, long nHeigh
 
             if ( pBorderWindow->GetStyle() & WB_CLOSEABLE )
             {
-                pData->maCloseRect.Top()    = nItemTop;
+                pData->maCloseRect.Top()	= nItemTop;
                 pData->maCloseRect.Bottom() = nItemBottom;
-                pData->maCloseRect.Right()  = nRight;
-                pData->maCloseRect.Left()   = pData->maCloseRect.Right()-pData->maCloseRect.GetHeight()+1;
+                pData->maCloseRect.Right()	= nRight;
+                pData->maCloseRect.Left()	= pData->maCloseRect.Right()-pData->maCloseRect.GetHeight()+1;
                 nRight -= pData->maCloseRect.GetWidth()+3;
             }
 
@@ -1618,7 +1618,7 @@ void ImplStdBorderWindowView::Init( OutputDevice* pDev, long nWidth, long nHeigh
             pData->maHelpRect.SetEmpty();
         }
 
-        pData->mnTopBorder  += pData->mnTitleHeight;
+        pData->mnTopBorder	+= pData->mnTitleHeight;
     }
     else
     {
@@ -1638,10 +1638,10 @@ void ImplStdBorderWindowView::Init( OutputDevice* pDev, long nWidth, long nHeigh
 void ImplStdBorderWindowView::GetBorder( sal_Int32& rLeftBorder, sal_Int32& rTopBorder,
                                          sal_Int32& rRightBorder, sal_Int32& rBottomBorder ) const
 {
-    rLeftBorder     = maFrameData.mnLeftBorder;
-    rTopBorder      = maFrameData.mnTopBorder;
-    rRightBorder    = maFrameData.mnRightBorder;
-    rBottomBorder   = maFrameData.mnBottomBorder;
+    rLeftBorder 	= maFrameData.mnLeftBorder;
+    rTopBorder		= maFrameData.mnTopBorder;
+    rRightBorder	= maFrameData.mnRightBorder;
+    rBottomBorder	= maFrameData.mnBottomBorder;
 }
 
 // -----------------------------------------------------------------------
@@ -1655,26 +1655,50 @@ long ImplStdBorderWindowView::CalcTitleWidth() const
 
 void ImplStdBorderWindowView::DrawWindow( USHORT nDrawFlags, OutputDevice* pOutDev, const Point* pOffset )
 {
-    ImplBorderFrameData*    pData = &maFrameData;
-    OutputDevice*           pDev = pOutDev ? pOutDev : pData->mpOutDev;
-    ImplBorderWindow*       pBorderWindow = pData->mpBorderWindow;
-    Point                   aTmpPoint = pOffset ? Point(*pOffset) : Point();
-    Rectangle               aInRect( aTmpPoint, Size( pData->mnWidth, pData->mnHeight ) );
-    const StyleSettings&    rStyleSettings = pData->mpOutDev->GetSettings().GetStyleSettings();
-    DecorationView          aDecoView( pDev );
-    Color                   aFrameColor( rStyleSettings.GetFaceColor() );
+    ImplBorderFrameData*	pData = &maFrameData;
+    OutputDevice*			pDev = pOutDev ? pOutDev : pData->mpOutDev;
+    ImplBorderWindow*		pBorderWindow = pData->mpBorderWindow;
+    Point					aTmpPoint = pOffset ? Point(*pOffset) : Point();
+    Rectangle				aInRect( aTmpPoint, Size( pData->mnWidth, pData->mnHeight ) );
+    const StyleSettings&	rStyleSettings = pData->mpOutDev->GetSettings().GetStyleSettings();
+    DecorationView			aDecoView( pDev );
+    Color                   aFaceColor( rStyleSettings.GetFaceColor() );
+    Color                   aFrameColor( aFaceColor );
 
     aFrameColor.DecreaseContrast( (UINT8) (0.50 * 255));
 
     // Draw Frame
     if ( nDrawFlags & BORDERWINDOW_DRAW_FRAME )
     {
+        Region oldClipRgn( pDev->GetClipRegion( ) );
+
+        // for popups, don't draw part of the frame
+        if ( pData->mnTitleType == BORDERWINDOW_TITLE_POPUP )
+        {
+            FloatingWindow *pWin = dynamic_cast< FloatingWindow* >( pData->mpBorderWindow->GetWindow( WINDOW_CLIENT ) );
+            if ( pWin )
+            {
+                Region aClipRgn( aInRect );
+                Rectangle aItemClipRect( pWin->ImplGetItemEdgeClipRect() );
+                if( !aItemClipRect.IsEmpty() )
+                {
+                    aItemClipRect.SetPos( pData->mpBorderWindow->AbsoluteScreenToOutputPixel( aItemClipRect.TopLeft() ) );
+                    aClipRgn.Exclude( aItemClipRect );
+                    pDev->SetClipRegion( aClipRgn );
+                }
+            }
+        }
+
         // single line frame
         pDev->SetLineColor( aFrameColor );
         pDev->SetFillColor();
         pDev->DrawRect( aInRect );
         aInRect.nLeft++; aInRect.nRight--;
         aInRect.nTop++; aInRect.nBottom--;
+
+        // restore
+        if ( pData->mnTitleType == BORDERWINDOW_TITLE_POPUP )
+            pDev->SetClipRegion( oldClipRgn );
     }
     else
         aInRect = aDecoView.DrawFrame( aInRect, FRAME_DRAW_DOUBLEOUT | FRAME_DRAW_NODRAW);
@@ -1701,7 +1725,11 @@ void ImplStdBorderWindowView::DrawWindow( USHORT nDrawFlags, OutputDevice* pOutD
         aInRect = pData->maTitleRect;
 
         // use no gradient anymore, just a static titlecolor
-        pDev->SetFillColor( aFrameColor );
+        if ( pData->mnTitleType != BORDERWINDOW_TITLE_POPUP )
+            pDev->SetFillColor( aFrameColor );
+        else
+            pDev->SetFillColor( aFaceColor );
+
         pDev->SetTextColor( rStyleSettings.GetButtonTextColor() );
         Rectangle aTitleRect( pData->maTitleRect );
         if( pOffset )
@@ -1711,7 +1739,7 @@ void ImplStdBorderWindowView::DrawWindow( USHORT nDrawFlags, OutputDevice* pOutD
 
         if ( pData->mnTitleType != BORDERWINDOW_TITLE_TEAROFF )
         {
-            aInRect.Left()  += 2;
+            aInRect.Left()	+= 2;
             aInRect.Right() -= 2;
 
             if ( !pData->maPinRect.IsEmpty() )
@@ -1836,13 +1864,13 @@ void ImplBorderWindow::ImplInit( Window* pParent,
 {
     // Alle WindowBits entfernen, die wir nicht haben wollen
     WinBits nOrgStyle = nStyle;
-    WinBits nTestStyle = (WB_MOVEABLE | WB_SIZEABLE | WB_ROLLABLE | WB_PINABLE | WB_CLOSEABLE | WB_STANDALONE | WB_DIALOGCONTROL | WB_NODIALOGCONTROL | WB_SYSTEMFLOATWIN | WB_INTROWIN | WB_DEFAULTWIN | WB_TOOLTIPWIN | WB_NOSHADOW | WB_OWNERDRAWDECORATION | WB_SYSTEMCHILDWINDOW  | WB_NEEDSFOCUS);
+    WinBits nTestStyle = (WB_MOVEABLE | WB_SIZEABLE | WB_ROLLABLE | WB_PINABLE | WB_CLOSEABLE | WB_STANDALONE | WB_DIALOGCONTROL | WB_NODIALOGCONTROL | WB_SYSTEMFLOATWIN | WB_INTROWIN | WB_DEFAULTWIN | WB_TOOLTIPWIN | WB_NOSHADOW | WB_OWNERDRAWDECORATION | WB_SYSTEMCHILDWINDOW  | WB_NEEDSFOCUS | WB_POPUP);
     if ( nTypeStyle & BORDERWINDOW_STYLE_APP )
         nTestStyle |= WB_APP;
     nStyle &= nTestStyle;
 
-    mpWindowImpl->mbBorderWin       = TRUE;
-    mbSmallOutBorder    = FALSE;
+    mpWindowImpl->mbBorderWin 		= TRUE;
+    mbSmallOutBorder	= FALSE;
     if ( nTypeStyle & BORDERWINDOW_STYLE_FRAME )
     {
         if( (nStyle & WB_SYSTEMCHILDWINDOW) )
@@ -1851,17 +1879,17 @@ void ImplBorderWindow::ImplInit( Window* pParent,
             mpWindowImpl->mbFrame       = TRUE;
             mbFrameBorder               = FALSE;
         }
-        else if( (nStyle & WB_OWNERDRAWDECORATION) )
+        else if( (nStyle & (WB_OWNERDRAWDECORATION | WB_POPUP)) )
         {
-            mpWindowImpl->mbOverlapWin  = TRUE;
-            mpWindowImpl->mbFrame       = TRUE;
-            mbFrameBorder   = (nOrgStyle & WB_NOBORDER) ? FALSE : TRUE;
+            mpWindowImpl->mbOverlapWin	= TRUE;
+            mpWindowImpl->mbFrame 		= TRUE;
+            mbFrameBorder	= (nOrgStyle & WB_NOBORDER) ? FALSE : TRUE;
         }
         else
         {
-            mpWindowImpl->mbOverlapWin  = TRUE;
-            mpWindowImpl->mbFrame       = TRUE;
-            mbFrameBorder   = FALSE;
+            mpWindowImpl->mbOverlapWin	= TRUE;
+            mpWindowImpl->mbFrame 		= TRUE;
+            mbFrameBorder	= FALSE;
             // closeable windows may have a border as well, eg. system floating windows without caption
             if ( (nOrgStyle & (WB_BORDER | WB_NOBORDER | WB_MOVEABLE | WB_SIZEABLE/* | WB_CLOSEABLE*/)) == WB_BORDER )
                 mbSmallOutBorder = TRUE;
@@ -1869,11 +1897,11 @@ void ImplBorderWindow::ImplInit( Window* pParent,
     }
     else if ( nTypeStyle & BORDERWINDOW_STYLE_OVERLAP )
     {
-        mpWindowImpl->mbOverlapWin  = TRUE;
-        mbFrameBorder   = TRUE;
+        mpWindowImpl->mbOverlapWin	= TRUE;
+        mbFrameBorder	= TRUE;
     }
     else
-        mbFrameBorder   = FALSE;
+        mbFrameBorder	= FALSE;
 
     if ( nTypeStyle & BORDERWINDOW_STYLE_FLOAT )
         mbFloatWindow = TRUE;
@@ -1885,26 +1913,26 @@ void ImplBorderWindow::ImplInit( Window* pParent,
     SetTextFillColor();
 
     mpMenuBarWindow = NULL;
-    mnMinWidth      = 0;
-    mnMinHeight     = 0;
-    mnMaxWidth      = SHRT_MAX;
-    mnMaxHeight     = SHRT_MAX;
-    mnRollHeight    = 0;
+    mnMinWidth		= 0;
+    mnMinHeight 	= 0;
+    mnMaxWidth		= SHRT_MAX;
+    mnMaxHeight 	= SHRT_MAX;
+    mnRollHeight	= 0;
     mnOrgMenuHeight = 0;
-    mbPined         = FALSE;
-    mbRollUp        = FALSE;
-    mbMenuHide      = FALSE;
-    mbDockBtn       = FALSE;
-    mbMenuBtn       = FALSE;
-    mbHideBtn       = FALSE;
-    mbHelpBtn       = FALSE;
+    mbPined 		= FALSE;
+    mbRollUp		= FALSE;
+    mbMenuHide		= FALSE;
+    mbDockBtn		= FALSE;
+    mbMenuBtn		= FALSE;
+    mbHideBtn		= FALSE;
+    mbHelpBtn		= FALSE;
     mbDisplayActive = IsActive();
 
     if ( nTypeStyle & BORDERWINDOW_STYLE_FLOAT )
         mnTitleType = BORDERWINDOW_TITLE_SMALL;
     else
         mnTitleType = BORDERWINDOW_TITLE_NORMAL;
-    mnBorderStyle   = WINDOW_BORDER_NORMAL;
+    mnBorderStyle	= WINDOW_BORDER_NORMAL;
     InitView();
 }
 
@@ -1913,7 +1941,7 @@ void ImplBorderWindow::ImplInit( Window* pParent,
 ImplBorderWindow::ImplBorderWindow( Window* pParent,
                                     SystemParentData* pSystemParentData,
                                     WinBits nStyle, USHORT nTypeStyle
-                                    ) : Window( WINDOW_BORDERWINDOW )
+                                    ) :	Window( WINDOW_BORDERWINDOW )
 {
     ImplInit( pParent, nStyle, nTypeStyle, pSystemParentData );
 }
@@ -2001,8 +2029,8 @@ void ImplBorderWindow::RequestHelp( const HelpEvent& rHEvt )
     // no keyboard help for border win
     if ( rHEvt.GetMode() & (HELPMODE_BALLOON | HELPMODE_QUICK) && !rHEvt.KeyboardActivated() )
     {
-        Point       aMousePosPixel = ScreenToOutputPixel( rHEvt.GetMousePosPixel() );
-        Rectangle   aHelpRect;
+        Point		aMousePosPixel = ScreenToOutputPixel( rHEvt.GetMousePosPixel() );
+        Rectangle	aHelpRect;
         String      aHelpStr( mpBorderView->RequestHelp( aMousePosPixel, aHelpRect ) );
 
         // Rechteck ermitteln
@@ -2103,7 +2131,7 @@ void ImplBorderWindow::DataChanged( const DataChangedEvent& rDCEvt )
          ((rDCEvt.GetType() == DATACHANGED_SETTINGS) &&
           (rDCEvt.GetFlags() & SETTINGS_STYLE)) )
     {
-        if ( !mpWindowImpl->mbFrame || (GetStyle() & WB_OWNERDRAWDECORATION) )
+        if ( !mpWindowImpl->mbFrame || (GetStyle() & (WB_OWNERDRAWDECORATION | WB_POPUP)) )
             UpdateView( TRUE, ImplGetWindow()->GetOutputSizePixel() );
     }
 
@@ -2165,8 +2193,8 @@ void ImplBorderWindow::UpdateView( BOOL bNewView, const Size& rNewOutSize )
     GetBorder( nLeftBorder, nTopBorder, nRightBorder, nBottomBorder );
     if ( aOldSize.Width() || aOldSize.Height() )
     {
-        aOutputSize.Width()     += nLeftBorder+nRightBorder;
-        aOutputSize.Height()    += nTopBorder+nBottomBorder;
+        aOutputSize.Width() 	+= nLeftBorder+nRightBorder;
+        aOutputSize.Height()	+= nTopBorder+nBottomBorder;
         if ( aOutputSize == GetSizePixel() )
             InvalidateBorder();
         else
@@ -2188,10 +2216,10 @@ void ImplBorderWindow::InvalidateBorder()
         mpBorderView->GetBorder( nLeftBorder, nTopBorder, nRightBorder, nBottomBorder );
         if ( nLeftBorder || nTopBorder || nRightBorder || nBottomBorder )
         {
-            Rectangle   aWinRect( Point( 0, 0 ), GetOutputSizePixel() );
-            Region      aRegion( aWinRect );
+            Rectangle	aWinRect( Point( 0, 0 ), GetOutputSizePixel() );
+            Region		aRegion( aWinRect );
             aWinRect.Left()   += nLeftBorder;
-            aWinRect.Top()    += nTopBorder;
+            aWinRect.Top()	  += nTopBorder;
             aWinRect.Right()  -= nRightBorder;
             aWinRect.Bottom() -= nBottomBorder;
             // kein Output-Bereich mehr, dann alles invalidieren
diff --git a/vcl/source/window/btndlg.cxx b/vcl/source/window/btndlg.cxx
index e835fe749ed1..891580a0a2e4 100644
--- a/vcl/source/window/btndlg.cxx
+++ b/vcl/source/window/btndlg.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
@@ -44,11 +44,11 @@
 
 struct ImplBtnDlgItem
 {
-    USHORT              mnId;
-    BOOL                mbOwnButton;
-    BOOL                mbDummyAlign;
-    long                mnSepSize;
-    PushButton*         mpPushButton;
+    USHORT				mnId;
+    BOOL				mbOwnButton;
+    BOOL				mbDummyAlign;
+    long				mnSepSize;
+    PushButton* 		mpPushButton;
 };
 
 DECLARE_LIST( ImplBtnDlgItemList, ImplBtnDlgItem* )
@@ -57,11 +57,11 @@ DECLARE_LIST( ImplBtnDlgItemList, ImplBtnDlgItem* )
 
 void ButtonDialog::ImplInitButtonDialogData()
 {
-    mpItemList              = new ImplBtnDlgItemList( 8, 8 );
-    mnButtonSize            = 0;
-    mnCurButtonId           = 0;
-    mnFocusButtonId         = BUTTONDIALOG_BUTTON_NOTFOUND;
-    mbFormat                = TRUE;
+    mpItemList				= new ImplBtnDlgItemList( 8, 8 );
+    mnButtonSize			= 0;
+    mnCurButtonId			= 0;
+    mnFocusButtonId 		= BUTTONDIALOG_BUTTON_NOTFOUND;
+    mbFormat				= TRUE;
 }
 
 // -----------------------------------------------------------------------
@@ -87,7 +87,7 @@ ButtonDialog::ButtonDialog( Window* pParent, const ResId& rResId ) :
     Dialog( WINDOW_BUTTONDIALOG )
 {
     ImplInitButtonDialogData();
-    rResId.SetRT( RSC_DIALOG );     // !!!!!!!!!! RSC_BUTTONDIALOG !!!!!!!!
+    rResId.SetRT( RSC_DIALOG ); 	// !!!!!!!!!! RSC_BUTTONDIALOG !!!!!!!!
     ImplInit( pParent, ImplInitRes( rResId ) );
     ImplLoadRes( rResId );
 }
@@ -113,7 +113,7 @@ ButtonDialog::~ButtonDialog()
 PushButton* ButtonDialog::ImplCreatePushButton( USHORT nBtnFlags )
 {
     PushButton* pBtn;
-    WinBits     nStyle = 0;
+    WinBits 	nStyle = 0;
 
     if ( nBtnFlags & BUTTONDIALOG_DEFBUTTON )
         nStyle |= WB_DEFBUTTON;
@@ -156,9 +156,9 @@ long ButtonDialog::ImplGetButtonSize()
         return mnButtonSize;
 
     // Calculate ButtonSize
-    long    nLastSepSize = 0;
-    long    nSepSize = 0;
-    long    nButtonCount = 0;
+    long	nLastSepSize = 0;
+    long	nSepSize = 0;
+    long	nButtonCount = 0;
     maCtrlSize = Size( IMPL_MINSIZE_BUTTON_WIDTH, IMPL_MINSIZE_BUTTON_HEIGHT );
     ImplBtnDlgItem* pItem = mpItemList->First();
     while ( pItem )
@@ -206,9 +206,9 @@ void ButtonDialog::ImplPosControls()
 
     // determine dialog size
     ImplBtnDlgItem* pItem;
-    Size            aDlgSize = maPageSize;
-    long            nX;
-    long            nY;
+    Size			aDlgSize = maPageSize;
+    long			nX;
+    long			nY;
     if ( GetStyle() & WB_HORZ )
     {
         if ( mnButtonSize+(IMPL_DIALOG_OFFSET*2) > aDlgSize.Width() )
@@ -335,11 +335,11 @@ void ButtonDialog::AddButton( const XubString& rText, USHORT nId,
                               USHORT nBtnFlags, long nSepPixel )
 {
     // PageItem anlegen
-    ImplBtnDlgItem* pItem   = new ImplBtnDlgItem;
-    pItem->mnId             = nId;
-    pItem->mbOwnButton      = TRUE;
-    pItem->mnSepSize        = nSepPixel;
-    pItem->mpPushButton     = ImplCreatePushButton( nBtnFlags );
+    ImplBtnDlgItem* pItem	= new ImplBtnDlgItem;
+    pItem->mnId 			= nId;
+    pItem->mbOwnButton		= TRUE;
+    pItem->mnSepSize		= nSepPixel;
+    pItem->mpPushButton 	= ImplCreatePushButton( nBtnFlags );
     if ( rText.Len() )
         pItem->mpPushButton->SetText( rText );
 
@@ -358,10 +358,10 @@ void ButtonDialog::AddButton( StandardButtonType eType, USHORT nId,
                               USHORT nBtnFlags, long nSepPixel )
 {
     // PageItem anlegen
-    ImplBtnDlgItem* pItem   = new ImplBtnDlgItem;
-    pItem->mnId             = nId;
-    pItem->mbOwnButton      = TRUE;
-    pItem->mnSepSize        = nSepPixel;
+    ImplBtnDlgItem* pItem	= new ImplBtnDlgItem;
+    pItem->mnId 			= nId;
+    pItem->mbOwnButton		= TRUE;
+    pItem->mnSepSize		= nSepPixel;
 
     if ( eType == BUTTON_OK )
         nBtnFlags |= BUTTONDIALOG_OKBUTTON;
@@ -372,9 +372,9 @@ void ButtonDialog::AddButton( StandardButtonType eType, USHORT nId,
     pItem->mpPushButton = ImplCreatePushButton( nBtnFlags );
 
     // Standard-Buttons have the right text already
-    if ( !((eType == BUTTON_OK)     && (pItem->mpPushButton->GetType() == WINDOW_OKBUTTON)) ||
+    if ( !((eType == BUTTON_OK) 	&& (pItem->mpPushButton->GetType() == WINDOW_OKBUTTON)) ||
          !((eType == BUTTON_CANCEL) && (pItem->mpPushButton->GetType() == WINDOW_CANCELBUTTON)) ||
-         !((eType == BUTTON_HELP)   && (pItem->mpPushButton->GetType() == WINDOW_HELPBUTTON)) )
+         !((eType == BUTTON_HELP)	&& (pItem->mpPushButton->GetType() == WINDOW_HELPBUTTON)) )
     {
         pItem->mpPushButton->SetText( Button::GetStandardText( eType ) );
         pItem->mpPushButton->SetHelpText( Button::GetStandardHelpText( eType ) );
@@ -395,11 +395,11 @@ void ButtonDialog::AddButton( PushButton* pBtn, USHORT nId,
                               USHORT nBtnFlags, long nSepPixel )
 {
     // PageItem anlegen
-    ImplBtnDlgItem* pItem   = new ImplBtnDlgItem;
-    pItem->mnId             = nId;
-    pItem->mbOwnButton      = FALSE;
-    pItem->mnSepSize        = nSepPixel;
-    pItem->mpPushButton     = pBtn;
+    ImplBtnDlgItem* pItem	= new ImplBtnDlgItem;
+    pItem->mnId 			= nId;
+    pItem->mbOwnButton		= FALSE;
+    pItem->mnSepSize		= nSepPixel;
+    pItem->mpPushButton 	= pBtn;
 
     if ( nBtnFlags & BUTTONDIALOG_FOCUSBUTTON )
         mnFocusButtonId = nId;
diff --git a/vcl/source/window/cmdevt.cxx b/vcl/source/window/cmdevt.cxx
index 03e01c96742b..56d1df9518e8 100644
--- a/vcl/source/window/cmdevt.cxx
+++ b/vcl/source/window/cmdevt.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
@@ -40,12 +40,12 @@
 
 CommandExtTextInputData::CommandExtTextInputData()
 {
-    mpTextAttr      = NULL;
-    mnCursorPos     = 0;
-    mnDeltaStart    = 0;
-    mnOldTextLen    = 0;
-    mnCursorFlags   = 0;
-    mbOnlyCursor    = FALSE;
+    mpTextAttr		= NULL;
+    mnCursorPos 	= 0;
+    mnDeltaStart	= 0;
+    mnOldTextLen	= 0;
+    mnCursorFlags	= 0;
+    mbOnlyCursor	= FALSE;
 }
 
 // -----------------------------------------------------------------------
@@ -66,11 +66,11 @@ CommandExtTextInputData::CommandExtTextInputData( const XubString& rText,
     }
     else
         mpTextAttr = NULL;
-    mnCursorPos     = nCursorPos;
-    mnDeltaStart    = nDeltaStart;
-    mnOldTextLen    = nOldTextLen;
-    mnCursorFlags   = nCursorFlags;
-    mbOnlyCursor    = bOnlyCursor;
+    mnCursorPos 	= nCursorPos;
+    mnDeltaStart	= nDeltaStart;
+    mnOldTextLen	= nOldTextLen;
+    mnCursorFlags	= nCursorFlags;
+    mbOnlyCursor	= bOnlyCursor;
 }
 
 // -----------------------------------------------------------------------
@@ -85,11 +85,11 @@ CommandExtTextInputData::CommandExtTextInputData( const CommandExtTextInputData&
     }
     else
         mpTextAttr = NULL;
-    mnCursorPos     = rData.mnCursorPos;
-    mnDeltaStart    = rData.mnDeltaStart;
-    mnOldTextLen    = rData.mnOldTextLen;
-    mnCursorFlags   = rData.mnCursorFlags;
-    mbOnlyCursor    = rData.mbOnlyCursor;
+    mnCursorPos 	= rData.mnCursorPos;
+    mnDeltaStart	= rData.mnDeltaStart;
+    mnOldTextLen	= rData.mnOldTextLen;
+    mnCursorFlags	= rData.mnCursorFlags;
+    mbOnlyCursor	= rData.mbOnlyCursor;
 }
 
 // -----------------------------------------------------------------------
diff --git a/vcl/source/window/cursor.cxx b/vcl/source/window/cursor.cxx
index 5725189e10c3..44d15ab0673b 100644
--- a/vcl/source/window/cursor.cxx
+++ b/vcl/source/window/cursor.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
@@ -40,16 +40,16 @@
 
 struct ImplCursorData
 {
-    AutoTimer       maTimer;            // Timer
-    Point           maPixPos;           // Pixel-Position
-    Point           maPixRotOff;        // Pixel-Offset-Position
-    Size            maPixSize;          // Pixel-Size
-    long            mnPixSlant;         // Pixel-Slant
-    short           mnOrientation;      // Pixel-Orientation
-    unsigned char   mnDirection;        // indicates writing direction
-    USHORT          mnStyle;            // Cursor-Style
-    BOOL            mbCurVisible;       // Ist Cursor aktuell sichtbar
-    Window*         mpWindow;           // Zugeordnetes Windows
+    AutoTimer		maTimer;			// Timer
+    Point			maPixPos;			// Pixel-Position
+    Point			maPixRotOff;		// Pixel-Offset-Position
+    Size			maPixSize;			// Pixel-Size
+    long			mnPixSlant; 		// Pixel-Slant
+    short			mnOrientation;		// Pixel-Orientation
+    unsigned char	mnDirection;		// indicates writing direction
+    USHORT			mnStyle;			// Cursor-Style
+    BOOL			mbCurVisible;		// Ist Cursor aktuell sichtbar
+    Window* 		mpWindow;			// Zugeordnetes Windows
 };
 
 // =======================================================================
@@ -57,7 +57,7 @@ struct ImplCursorData
 static void ImplCursorInvert( ImplCursorData* pData )
 {
     Window* pWindow  = pData->mpWindow;
-    BOOL    bMapMode = pWindow->IsMapModeEnabled();
+    BOOL	bMapMode = pWindow->IsMapModeEnabled();
     pWindow->EnableMapMode( FALSE );
     USHORT nInvertStyle;
     if ( pData->mnStyle & CURSOR_SHADOW )
@@ -94,10 +94,10 @@ static void ImplCursorInvert( ImplCursorData* pData )
                     // left-to-right
                     pAry[0] = aPoly.GetPoint( 0 );
                     pAry[1] = aPoly.GetPoint( 1 );
-                    pAry[2] = pAry[1];
+                    pAry[2] = pAry[1]; 
                     pAry[2].X() += delta;
                     pAry[3] =  pAry[1];
-                    pAry[3].Y() += delta;
+                    pAry[3].Y() += delta; 
                     pAry[4] = aPoly.GetPoint( 2 );
                     pAry[5] = aPoly.GetPoint( 3 );
                     pAry[6] = aPoly.GetPoint( 4 );
@@ -109,8 +109,8 @@ static void ImplCursorInvert( ImplCursorData* pData )
                     pAry[1] = aPoly.GetPoint( 1 );
                     pAry[2] = aPoly.GetPoint( 2 );
                     pAry[3] = aPoly.GetPoint( 3 );
-                    pAry[4] = pAry[0];
-                    pAry[4].Y() += delta;
+                    pAry[4] = pAry[0]; 
+                    pAry[4].Y() += delta; 
                     pAry[5] =  pAry[0];
                     pAry[5].X() -= delta;
                     pAry[6] = aPoly.GetPoint( 4 );
@@ -134,13 +134,13 @@ void Cursor::ImplDraw()
 {
     if ( mpData && mpData->mpWindow && !mpData->mbCurVisible )
     {
-        Window* pWindow         = mpData->mpWindow;
-        mpData->maPixPos        = pWindow->LogicToPixel( maPos );
-        mpData->maPixSize       = pWindow->LogicToPixel( maSize );
-        mpData->mnPixSlant      = pWindow->LogicToPixel( Size( mnSlant, 0 ) ).Width();
-        mpData->mnOrientation   = mnOrientation;
-        mpData->mnDirection     = mnDirection;
-        long nOffsetY           = pWindow->LogicToPixel( Size( 0, mnOffsetY ) ).Height();
+        Window* pWindow 		= mpData->mpWindow;
+        mpData->maPixPos		= pWindow->LogicToPixel( maPos );
+        mpData->maPixSize		= pWindow->LogicToPixel( maSize );
+        mpData->mnPixSlant		= pWindow->LogicToPixel( Size( mnSlant, 0 ) ).Width();
+        mpData->mnOrientation	= mnOrientation;
+        mpData->mnDirection	    = mnDirection;
+        long nOffsetY			= pWindow->LogicToPixel( Size( 0, mnOffsetY ) ).Height();
 
         // Position um den Offset korrigieren
         mpData->maPixPos.Y() -= nOffsetY;
@@ -197,8 +197,8 @@ void Cursor::ImplShow( BOOL bDrawDirect )
                 mpData->maTimer.SetTimeoutHdl( LINK( this, Cursor, ImplTimerHdl ) );
             }
 
-            mpData->mpWindow    = pWindow;
-            mpData->mnStyle     = mnStyle;
+            mpData->mpWindow	= pWindow;
+            mpData->mnStyle 	= mnStyle;
             if ( bDrawDirect )
                 ImplDraw();
 
@@ -261,14 +261,14 @@ IMPL_LINK( Cursor, ImplTimerHdl, AutoTimer*, EMPTYARG )
 
 Cursor::Cursor()
 {
-    mpData          = NULL;
-    mpWindow        = NULL;
-    mnSlant         = 0;
-    mnOffsetY       = 0;
-    mnOrientation   = 0;
-    mnDirection     = 0;
-    mnStyle         = 0;
-    mbVisible       = FALSE;
+    mpData			= NULL;
+    mpWindow		= NULL;
+    mnSlant 		= 0;
+    mnOffsetY		= 0;
+    mnOrientation	= 0;
+    mnDirection 	= 0;
+    mnStyle 		= 0;
+    mbVisible		= FALSE;
 }
 
 // -----------------------------------------------------------------------
@@ -277,13 +277,13 @@ Cursor::Cursor( const Cursor& rCursor ) :
     maSize( rCursor.maSize ),
     maPos( rCursor.maPos )
 {
-    mpData          = NULL;
-    mpWindow        = NULL;
-    mnSlant         = rCursor.mnSlant;
-    mnOrientation   = rCursor.mnOrientation;
-    mnDirection     = rCursor.mnDirection;
-    mnStyle         = 0;
-    mbVisible       = rCursor.mbVisible;
+    mpData			= NULL;
+    mpWindow		= NULL;
+    mnSlant 		= rCursor.mnSlant;
+    mnOrientation	= rCursor.mnOrientation;
+    mnDirection 	= rCursor.mnDirection;
+    mnStyle 		= 0;
+    mbVisible		= rCursor.mbVisible;
 }
 
 // -----------------------------------------------------------------------
@@ -435,12 +435,12 @@ void Cursor::SetDirection( unsigned char nNewDirection )
 
 Cursor& Cursor::operator=( const Cursor& rCursor )
 {
-    maPos           = rCursor.maPos;
-    maSize          = rCursor.maSize;
-    mnSlant         = rCursor.mnSlant;
-    mnOrientation   = rCursor.mnOrientation;
-    mnDirection     = rCursor.mnDirection;
-    mbVisible       = rCursor.mbVisible;
+    maPos			= rCursor.maPos;
+    maSize			= rCursor.maSize;
+    mnSlant 		= rCursor.mnSlant;
+    mnOrientation	= rCursor.mnOrientation;
+    mnDirection 	= rCursor.mnDirection;
+    mbVisible		= rCursor.mbVisible;
     ImplNew();
 
     return *this;
@@ -450,12 +450,12 @@ Cursor& Cursor::operator=( const Cursor& rCursor )
 
 BOOL Cursor::operator==( const Cursor& rCursor ) const
 {
-    if ( (maPos         == rCursor.maPos)           &&
-         (maSize        == rCursor.maSize)          &&
-         (mnSlant       == rCursor.mnSlant)         &&
-         (mnOrientation == rCursor.mnOrientation)   &&
-         (mnDirection   == rCursor.mnDirection)     &&
-         (mbVisible     == rCursor.mbVisible) )
+    if ( (maPos 		== rCursor.maPos)			&&
+         (maSize		== rCursor.maSize)			&&
+         (mnSlant		== rCursor.mnSlant) 		&&
+         (mnOrientation == rCursor.mnOrientation)	&&
+         (mnDirection   == rCursor.mnDirection)	    &&
+         (mbVisible 	== rCursor.mbVisible) )
         return TRUE;
     else
         return FALSE;
diff --git a/vcl/source/window/decoview.cxx b/vcl/source/window/decoview.cxx
index e5c3dc525cec..14a8cfc39079 100644
--- a/vcl/source/window/decoview.cxx
+++ b/vcl/source/window/decoview.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
@@ -37,9 +37,9 @@
 
 // =======================================================================
 
-#define BUTTON_DRAW_FLATTEST    (BUTTON_DRAW_FLAT |             \
-                                 BUTTON_DRAW_PRESSED |          \
-                                 BUTTON_DRAW_CHECKED |          \
+#define BUTTON_DRAW_FLATTEST	(BUTTON_DRAW_FLAT | 			\
+                                 BUTTON_DRAW_PRESSED |			\
+                                 BUTTON_DRAW_CHECKED |			\
                                  BUTTON_DRAW_HIGHLIGHT)
 
 // =======================================================================
@@ -47,11 +47,11 @@
 void ImplDrawOS2Symbol( OutputDevice* pDev, const Rectangle& rRect,
                         USHORT nStyle, BOOL bClose )
 {
-    DecorationView          aView( pDev );
-    const StyleSettings&    rStyleSettings = pDev->GetSettings().GetStyleSettings();
-    Rectangle               aRect = rRect;
-    Color                   aColor1;
-    Color                   aColor2;
+    DecorationView			aView( pDev );
+    const StyleSettings&	rStyleSettings = pDev->GetSettings().GetStyleSettings();
+    Rectangle				aRect = rRect;
+    Color					aColor1;
+    Color					aColor2;
 
     pDev->SetFillColor();
 
@@ -67,10 +67,10 @@ void ImplDrawOS2Symbol( OutputDevice* pDev, const Rectangle& rRect,
     }
     aView.DrawFrame( aRect, aColor1, aColor2 );
 
-    aRect.Left()    += 2;
-    aRect.Top()     += 2;
-    aRect.Right()   -= 2;
-    aRect.Bottom()  -= 2;
+    aRect.Left()	+= 2;
+    aRect.Top() 	+= 2;
+    aRect.Right()	-= 2;
+    aRect.Bottom()	-= 2;
 
     if ( nStyle & (BUTTON_DRAW_PRESSED | BUTTON_DRAW_CHECKED) )
         pDev->SetLineColor( rStyleSettings.GetLightColor() );
@@ -113,22 +113,22 @@ static void ImplDrawSymbol( OutputDevice* pDev, const Rectangle& rRect,
                             SymbolType eType  )
 {
     // Groessen vorberechnen
-    long    nMin    = Min( rRect.GetWidth(), rRect.GetHeight() );
-    long    nSize   = nMin;
+    long	nMin	= Min( rRect.GetWidth(), rRect.GetHeight() );
+    long	nSize	= nMin;
 
     if ( nMin & 0x01 )
         nMin--;
-    Point   aCenter = rRect.Center();
-    long    nCenterX = aCenter.X();
-    long    nCenterY = aCenter.Y();
-    long    n2 = nMin / 2;
-    long    n4 = nMin / 4;
-    long    nLeft;
-    long    nTop;
-    long    nRight;
-    long    nBottom;
-    long    nTemp;
-    long    i;
+    Point	aCenter = rRect.Center();
+    long	nCenterX = aCenter.X();
+    long	nCenterY = aCenter.Y();
+    long	n2 = nMin / 2;
+    long	n4 = nMin / 4;
+    long	nLeft;
+    long	nTop;
+    long	nRight;
+    long	nBottom;
+    long	nTemp;
+    long	i;
 
     switch ( eType )
     {
@@ -338,8 +338,8 @@ static void ImplDrawSymbol( OutputDevice* pDev, const Rectangle& rRect,
         {
             if ( !( nSize & 0x01 ))
             {
-                // An even rectangle size means we have to use a smaller size for
-                // our arrows as we want to use one pixel for the spearhead! Otherwise
+                // An even rectangle size means we have to use a smaller size for 
+                // our arrows as we want to use one pixel for the spearhead! Otherwise 
                 // it will be clipped!
                 nCenterX++;
                 n2 = ( nMin-1 ) / 2;
@@ -368,9 +368,9 @@ static void ImplDrawSymbol( OutputDevice* pDev, const Rectangle& rRect,
         case SYMBOL_RADIOCHECKMARK:
         case SYMBOL_RECORD:
         {
-            const long          nExt = ( n2 << 1 ) + 1;
-            Bitmap              aBmp( Size( nExt, nExt ), 1 );
-            BitmapWriteAccess*  pWAcc = aBmp.AcquireWriteAccess();
+            const long			nExt = ( n2 << 1 ) + 1;
+            Bitmap				aBmp( Size( nExt, nExt ), 1 );
+            BitmapWriteAccess*	pWAcc = aBmp.AcquireWriteAccess();
 
             if( pWAcc )
             {
@@ -471,8 +471,8 @@ static void ImplDrawSymbol( OutputDevice* pDev, const Rectangle& rRect,
                 aRectSize.Width() = 1;
             else if ( nMin > 20 )
                 aRectSize.Width() = nMin/10;
-            nLeft   = nCenterX-n2+1;
-            nTop    = nCenterY-n2+1;
+            nLeft	= nCenterX-n2+1;
+            nTop	= nCenterY-n2+1;
             nBottom = nCenterY-n2+nMin-aRectSize.Width()+1;
             i = 0;
             while ( i < nMin-aRectSize.Width()+1 )
@@ -673,11 +673,11 @@ static void ImplDrawSymbol( OutputDevice* pDev, const Rectangle& rRect,
 void DecorationView::DrawSymbol( const Rectangle& rRect, SymbolType eType,
                                  const Color& rColor, USHORT nStyle )
 {
-    const StyleSettings&    rStyleSettings  = mpOutDev->GetSettings().GetStyleSettings();
-    Rectangle               aRect           = mpOutDev->LogicToPixel( rRect );
-    Color                   aOldLineColor   = mpOutDev->GetLineColor();
-    Color                   aOldFillColor   = mpOutDev->GetFillColor();
-    BOOL                    bOldMapMode     = mpOutDev->IsMapModeEnabled();
+    const StyleSettings&	rStyleSettings	= mpOutDev->GetSettings().GetStyleSettings();
+    Rectangle				aRect			= mpOutDev->LogicToPixel( rRect );
+    Color					aOldLineColor	= mpOutDev->GetLineColor();
+    Color					aOldFillColor	= mpOutDev->GetFillColor();
+    BOOL					bOldMapMode 	= mpOutDev->IsMapModeEnabled();
     mpOutDev->SetLineColor();
     mpOutDev->SetFillColor( rColor );
     mpOutDev->EnableMapMode( FALSE );
@@ -721,10 +721,10 @@ void DecorationView::DrawFrame( const Rectangle& rRect,
                                 const Color& rLeftTopColor,
                                 const Color& rRightBottomColor )
 {
-    Rectangle   aRect           = mpOutDev->LogicToPixel( rRect );
-    Color       aOldLineColor   = mpOutDev->GetLineColor();
-    Color       aOldFillColor   = mpOutDev->GetFillColor();
-    BOOL        bOldMapMode     = mpOutDev->IsMapModeEnabled();
+    Rectangle	aRect			= mpOutDev->LogicToPixel( rRect );
+    Color		aOldLineColor	= mpOutDev->GetLineColor();
+    Color		aOldFillColor	= mpOutDev->GetFillColor();
+    BOOL		bOldMapMode 	= mpOutDev->IsMapModeEnabled();
     mpOutDev->EnableMapMode( FALSE );
     mpOutDev->SetLineColor();
     mpOutDev->ImplDraw2ColorFrame( aRect, rLeftTopColor, rRightBottomColor );
@@ -826,10 +826,10 @@ static void ImplDrawDPILineRect( OutputDevice* pDev, Rectangle& rRect,
         }
     }
 
-    rRect.Left()    += nLineWidth;
-    rRect.Top()     += nLineHeight;
-    rRect.Right()   -= nLineWidth;
-    rRect.Bottom()  -= nLineHeight;
+    rRect.Left()	+= nLineWidth;
+    rRect.Top() 	+= nLineHeight;
+    rRect.Right()	-= nLineWidth;
+    rRect.Bottom()	-= nLineHeight;
 }
 
 // =======================================================================
@@ -847,7 +847,7 @@ static void ImplDrawFrame( OutputDevice* pDev, Rectangle& rRect,
 
     // UseFlatBorders disables 3D style for all frames except menus
     // menus may use different border colors (eg on XP)
-    // normal frames will be drawn using the shadow color
+    // normal frames will be drawn using the shadow color 
     // whereas window frame borders will use black
     BOOL bFlatBorders = ( !bMenuStyle && rStyleSettings.GetUseFlatBorders() );
 
@@ -892,10 +892,10 @@ static void ImplDrawFrame( OutputDevice* pDev, Rectangle& rRect,
 
             if ( nFrameStyle == FRAME_DRAW_GROUP )
             {
-                rRect.Left()    += 2;
-                rRect.Top()     += 2;
-                rRect.Right()   -= 2;
-                rRect.Bottom()  -= 2;
+                rRect.Left()	+= 2;
+                rRect.Top() 	+= 2;
+                rRect.Right()	-= 2;
+                rRect.Bottom()	-= 2;
             }
             else if ( (nFrameStyle == FRAME_DRAW_IN) ||
                       (nFrameStyle == FRAME_DRAW_OUT) )
@@ -907,10 +907,10 @@ static void ImplDrawFrame( OutputDevice* pDev, Rectangle& rRect,
             }
             else // FRAME_DRAW_DOUBLEIN || FRAME_DRAW_DOUBLEOUT
             {
-                rRect.Left()    += 2;
-                rRect.Top()     += 2;
-                rRect.Right()   -= 2;
-                rRect.Bottom()  -= 2;
+                rRect.Left()	+= 2;
+                rRect.Top() 	+= 2;
+                rRect.Right()	-= 2;
+                rRect.Bottom()	-= 2;
             }
         }
     }
@@ -924,8 +924,8 @@ static void ImplDrawFrame( OutputDevice* pDev, Rectangle& rRect,
             ImplControlValue aControlValue( nValueStyle );
             Rectangle aBound, aContent;
             Rectangle aNatRgn( rRect );
-            if( pWin->GetNativeControlRegion(CTRL_FRAME, PART_BORDER,
-                aNatRgn, 0, aControlValue, rtl::OUString(), aBound, aContent) )
+            if(	pWin->GetNativeControlRegion(CTRL_FRAME, PART_BORDER,
+                aNatRgn, 0, aControlValue, rtl::OUString(), aBound, aContent) ) 
             {
                 if( pWin->DrawNativeControl( CTRL_FRAME, PART_BORDER, aContent, CTRL_STATE_ENABLED,
                              aControlValue, rtl::OUString()) )
@@ -1022,7 +1022,7 @@ static void ImplDrawFrame( OutputDevice* pDev, Rectangle& rRect,
                                                    rStyleSettings.GetDarkShadowColor() :
                                                    rStyleSettings.GetLightBorderColor(),
                                                    rStyleSettings.GetDarkShadowColor() );
-
+                                                   
                     }
 
                     rRect.Left()++;
@@ -1069,8 +1069,8 @@ static void ImplDrawFrame( OutputDevice* pDev, Rectangle& rRect,
 
 Rectangle DecorationView::DrawFrame( const Rectangle& rRect, USHORT nStyle )
 {
-    Rectangle   aRect = rRect;
-    BOOL        bOldMap = mpOutDev->IsMapModeEnabled();
+    Rectangle	aRect = rRect;
+    BOOL		bOldMap = mpOutDev->IsMapModeEnabled();
     if ( bOldMap )
     {
         aRect = mpOutDev->LogicToPixel( aRect );
@@ -1132,25 +1132,25 @@ static void ImplDrawButton( OutputDevice* pDev, Rectangle& rRect,
             pDev->SetFillColor( aBlackColor );
             Rectangle aRect1;
             Rectangle aRect2;
-            aRect1.Left()   = aFillRect.Left();
-            aRect1.Right()  = aFillRect.Right(),
-            aRect2.Top()    = aFillRect.Top();
+            aRect1.Left()	= aFillRect.Left();
+            aRect1.Right()	= aFillRect.Right(),
+            aRect2.Top()	= aFillRect.Top();
             aRect2.Bottom() = aFillRect.Bottom();
             if ( nStyle & (BUTTON_DRAW_PRESSED | BUTTON_DRAW_CHECKED) )
             {
-                aRect1.Top()    = aFillRect.Top();
+                aRect1.Top()	= aFillRect.Top();
                 aRect1.Bottom() = aBrdSize.Height()-1;
-                aRect2.Left()   = aFillRect.Left();
-                aRect2.Right()  = aFillRect.Left()+aBrdSize.Width()-1;
+                aRect2.Left()	= aFillRect.Left();
+                aRect2.Right()	= aFillRect.Left()+aBrdSize.Width()-1;
                 aFillRect.Left() += aBrdSize.Width();
                 aFillRect.Top()  += aBrdSize.Height();
             }
             else
             {
-                aRect1.Top()    = aFillRect.Bottom()-aBrdSize.Height()+1;
+                aRect1.Top()	= aFillRect.Bottom()-aBrdSize.Height()+1;
                 aRect1.Bottom() = aFillRect.Bottom();
-                aRect2.Left()   = aFillRect.Right()-aBrdSize.Width()+1;
-                aRect2.Right()  = aFillRect.Right(),
+                aRect2.Left()	= aFillRect.Right()-aBrdSize.Width()+1;
+                aRect2.Right()	= aFillRect.Right(),
                 aFillRect.Right()  -= aBrdSize.Width();
                 aFillRect.Bottom() -= aBrdSize.Height();
             }
@@ -1285,32 +1285,32 @@ static void ImplDrawButton( OutputDevice* pDev, Rectangle& rRect,
     {
         if ( (rRect.GetHeight() > 10) && (rRect.GetWidth() > 10) )
         {
-            rRect.Left()    += 4;
-            rRect.Top()     += 4;
-            rRect.Right()   -= 1;
-            rRect.Bottom()  -= 1;
+            rRect.Left()	+= 4;
+            rRect.Top() 	+= 4;
+            rRect.Right()	-= 1;
+            rRect.Bottom()	-= 1;
         }
         else
         {
-            rRect.Left()    += 3;
-            rRect.Top()     += 3;
-            rRect.Right()   -= 2;
-            rRect.Bottom()  -= 2;
+            rRect.Left()	+= 3;
+            rRect.Top() 	+= 3;
+            rRect.Right()	-= 2;
+            rRect.Bottom()	-= 2;
         }
     }
     else if ( nStyle & BUTTON_DRAW_CHECKED )
     {
-        rRect.Left()    += 3;
-        rRect.Top()     += 3;
-        rRect.Right()   -= 2;
-        rRect.Bottom()  -= 2;
+        rRect.Left()	+= 3;
+        rRect.Top() 	+= 3;
+        rRect.Right()	-= 2;
+        rRect.Bottom()	-= 2;
     }
     else
     {
-        rRect.Left()    += 2;
-        rRect.Top()     += 2;
-        rRect.Right()   -= 3;
-        rRect.Bottom()  -= 3;
+        rRect.Left()	+= 2;
+        rRect.Top() 	+= 2;
+        rRect.Right()	-= 3;
+        rRect.Bottom()	-= 3;
     }
 }
 
@@ -1318,8 +1318,8 @@ static void ImplDrawButton( OutputDevice* pDev, Rectangle& rRect,
 
 Rectangle DecorationView::DrawButton( const Rectangle& rRect, USHORT nStyle )
 {
-    Rectangle   aRect = rRect;
-    BOOL        bOldMap = mpOutDev->IsMapModeEnabled();
+    Rectangle	aRect = rRect;
+    BOOL		bOldMap = mpOutDev->IsMapModeEnabled();
     if ( bOldMap )
     {
         aRect = mpOutDev->LogicToPixel( aRect );
@@ -1366,7 +1366,7 @@ void DecorationView::DrawSeparator( const Point& rStart, const Point& rStop, boo
         mpOutDev->SetLineColor( Color( COL_BLACK ) );
     else
         mpOutDev->SetLineColor( rStyleSettings.GetShadowColor() );
-
+    
     mpOutDev->DrawLine( aStart, aStop );
     if ( !(rStyleSettings.GetOptions() & STYLE_OPTION_MONO) )
     {
diff --git a/vcl/source/window/dialog.cxx b/vcl/source/window/dialog.cxx
index 3b5585d3bc63..86b7e853b07f 100644
--- a/vcl/source/window/dialog.cxx
+++ b/vcl/source/window/dialog.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
@@ -638,7 +638,7 @@ BOOL Dialog::ImplStartExecuteModal()
                     "Dialog::StartExecuteModal() - Parent input disabled, use another parent to ensure modality!" );
         DBG_ASSERT( ! pParent->IsInModalMode(),
                     "Dialog::StartExecuteModal() - Parent already modally disabled, use another parent to ensure modality!" );
-
+            
     }
 #endif
 
@@ -664,10 +664,10 @@ BOOL Dialog::ImplStartExecuteModal()
     SetModalInputMode( TRUE );
     mbOldSaveBack = IsSaveBackgroundEnabled();
     EnableSaveBackground();
-
+    
     // FIXME: no layouting, workaround some clipping issues
     ImplAdjustNWFSizes();
-
+    
     Show();
 
     pSVData->maAppData.mnModalMode++;
@@ -691,7 +691,7 @@ short Dialog::Execute()
 
     ImplDelData aDelData;
     ImplAddDel( &aDelData );
-
+    
 #ifdef DBG_UTIL
     ImplDelData aParentDelData;
     Window* pDialogParent = mpDialogParent;
@@ -955,15 +955,15 @@ void Dialog::Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, ULO
 {
     Point aPos = pDev->LogicToPixel( rPos );
     Size aSize = pDev->LogicToPixel( rSize );
-
+    
     Wallpaper aWallpaper = GetBackground();
     if ( !aWallpaper.IsBitmap() )
         ImplInitSettings();
-
+    
     pDev->Push();
     pDev->SetMapMode();
     pDev->SetLineColor();
-
+    
     if ( aWallpaper.IsBitmap() )
         pDev->DrawBitmapEx( aPos, aSize, aWallpaper.GetBitmap() );
     else
diff --git a/vcl/source/window/dlgctrl.cxx b/vcl/source/window/dlgctrl.cxx
index 64f2b7e0d2a1..306a5ea02ab9 100644
--- a/vcl/source/window/dlgctrl.cxx
+++ b/vcl/source/window/dlgctrl.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
@@ -320,7 +320,7 @@ static Window* ImplFindDlgCtrlWindow( Window* pParent, Window* pWindow, USHORT&
 
     if( pWindow == NULL )
         pWindow = pSWindow;
-
+    
     while ( pSWindow )
     {
         // the DialogControlStart mark is only accepted for the direct children
@@ -372,7 +372,7 @@ static Window* ImplFindDlgCtrlWindow( Window* pParent, Window* pWindow, USHORT&
         pTempWindow = ImplGetNextWindow( pParent, i, i, FALSE );
 
         // the DialogControlStart mark is only accepted for the direct children
-        if ( !i
+        if ( !i 
           || ( pTempWindow && !ImplHasIndirectTabParent( pTempWindow )
                && pTempWindow->ImplGetWindow()->IsDialogControlStart() ) )
             break;
@@ -465,10 +465,10 @@ static Window* ImplFindAccelWindow( Window* pParent, USHORT& rIndex, xub_Unicode
             if( pAccelWin )
                 return pAccelWin;
         }
-
+        
         if ( i == nStart )
             break;
-
+        
         if ( i < nFormEnd )
         {
             pWindow = ImplGetNextWindow( pParent, i, i, bCheckEnable );
@@ -885,7 +885,7 @@ BOOL Window::ImplDlgCtrl( const KeyEvent& rKEvt, BOOL bKeyInput )
 
         return TRUE;
     }
-
+    
     return FALSE;
 }
 
@@ -1079,10 +1079,10 @@ Window* Window::GetLabelFor() const
         return pWindow;
 
     sal_Unicode nAccel = getAccel( GetText() );
-
+    
     WindowType nMyType = GetType();
-    if( nMyType == WINDOW_FIXEDTEXT     ||
-        nMyType == WINDOW_FIXEDLINE     ||
+    if( nMyType == WINDOW_FIXEDTEXT		||
+        nMyType == WINDOW_FIXEDLINE		||
         nMyType == WINDOW_GROUPBOX )
     {
         // #i100833# MT 2010/02: Group box and fixed lines can also lable a fixed text.
@@ -1120,8 +1120,8 @@ Window* Window::GetLabelFor() const
                 if( pSWindow && pSWindow->IsVisible() && ! (pSWindow->GetStyle() & WB_NOLABEL) )
                 {
                     WindowType nType = pSWindow->GetType();
-                    if( nType != WINDOW_FIXEDTEXT   &&
-                        nType != WINDOW_FIXEDLINE   &&
+                    if( nType != WINDOW_FIXEDTEXT	&&
+                        nType != WINDOW_FIXEDLINE	&&
                         nType != WINDOW_GROUPBOX )
                     {
                         pWindow = pSWindow;
@@ -1159,8 +1159,8 @@ Window* Window::GetLabeledBy() const
     if( GetType() == WINDOW_CHECKBOX || GetType() == WINDOW_RADIOBUTTON )
         return NULL;
 
-//    if( ! ( GetType() == WINDOW_FIXEDTEXT     ||
-//            GetType() == WINDOW_FIXEDLINE     ||
+//    if( ! ( GetType() == WINDOW_FIXEDTEXT		||
+//            GetType() == WINDOW_FIXEDLINE		||
 //            GetType() == WINDOW_GROUPBOX ) )
     // #i100833# MT 2010/02: Group box and fixed lines can also lable a fixed text.
     // See tools/options/print for example.
@@ -1172,7 +1172,7 @@ Window* Window::GetLabeledBy() const
         // that comes before this control; with the exception of push buttons
         // which are labeled only if the fixed text, fixed line or group box
         // is directly before the control
-
+        
         // get form start and form end and index of this control
         USHORT nIndex, nFormStart, nFormEnd;
         Window* pSWindow = ::ImplFindDlgCtrlWindow( pFrameWindow,
@@ -1182,9 +1182,9 @@ Window* Window::GetLabeledBy() const
                                                     nFormEnd );
         if( pSWindow && nIndex != nFormStart )
         {
-            if( GetType() == WINDOW_PUSHBUTTON      ||
-                GetType() == WINDOW_HELPBUTTON      ||
-                GetType() == WINDOW_OKBUTTON        ||
+            if( GetType() == WINDOW_PUSHBUTTON		||
+                GetType() == WINDOW_HELPBUTTON		||
+                GetType() == WINDOW_OKBUTTON		||
                 GetType() == WINDOW_CANCELBUTTON )
             {
                 nFormStart = nIndex-1;
@@ -1199,8 +1199,8 @@ Window* Window::GetLabeledBy() const
                 if( pSWindow && pSWindow->IsVisible() && !(pSWindow->GetStyle() & WB_NOLABEL) )
                 {
                     WindowType nType = pSWindow->GetType();
-                    if ( ( nType == WINDOW_FIXEDTEXT    ||
-                          nType == WINDOW_FIXEDLINE ||
+                    if ( ( nType == WINDOW_FIXEDTEXT	||
+                          nType == WINDOW_FIXEDLINE	||
                           nType == WINDOW_GROUPBOX ) )
                     {
                         // a fixed text can't be labeld by a fixed text.
diff --git a/vcl/source/window/dndevdis.cxx b/vcl/source/window/dndevdis.cxx
index e4d5a8c4c0eb..ef9a5ce31a04 100644
--- a/vcl/source/window/dndevdis.cxx
+++ b/vcl/source/window/dndevdis.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
@@ -225,7 +225,7 @@ void SAL_CALL DNDEventDispatcher::dragOver( const DropTargetDragEvent& dtde )
     else
     {
         // fire dragOver on listeners of current window
-        nListeners = fireDragOverEvent( pChildWindow, dtde.Context, dtde.DropAction, location,
+        nListeners = fireDragOverEvent( pChildWindow, dtde.Context,	dtde.DropAction, location,
             dtde.SourceActions );
     }
 
@@ -302,7 +302,7 @@ void SAL_CALL DNDEventDispatcher::dropActionChanged( const DropTargetDragEvent&
 
 void SAL_CALL DNDEventDispatcher::dragGestureRecognized( const DragGestureEvent& dge )
     throw(RuntimeException)
-{   MutexGuard aImplGuard( m_aMutex );
+{	MutexGuard aImplGuard( m_aMutex );
 
     Point origin( dge.DragOriginX, dge.DragOriginY );
 
@@ -324,7 +324,7 @@ void SAL_CALL DNDEventDispatcher::dragGestureRecognized( const DragGestureEvent&
         pChildWindow->ImplReMirror( origin );
 
     aSolarGuard.clear();
-
+    
     fireDragGestureEvent( pChildWindow, dge.DragSource, dge.Event, origin, dge.DragAction );
 }
 
@@ -368,7 +368,7 @@ sal_Int32 DNDEventDispatcher::fireDragEnterEvent( Window *pWindow,
     if( pWindow && pWindow->IsInputEnabled() && ! pWindow->IsInModalMode() )
     {
         OClearableGuard aGuard( Application::GetSolarMutex() );
-
+        
         // set an UI lock
         pWindow->IncrementLockCount();
 
@@ -531,9 +531,9 @@ sal_Int32 DNDEventDispatcher::fireDropEvent( Window *pWindow,
 // DNDEventDispatcher::fireDragGestureRecognized
 //==================================================================================================
 
-sal_Int32 DNDEventDispatcher::fireDragGestureEvent( Window *pWindow,
-    const Reference< XDragSource >& xSource, const Any event,
-    const Point& rOrigin, const sal_Int8 nDragAction
+sal_Int32 DNDEventDispatcher::fireDragGestureEvent( Window *pWindow, 
+    const Reference< XDragSource >& xSource, const Any event, 
+    const Point& rOrigin, const sal_Int8 nDragAction 
 )
     throw(::com::sun::star::uno::RuntimeException)
 {
@@ -559,6 +559,6 @@ sal_Int32 DNDEventDispatcher::fireDragGestureEvent( Window *pWindow,
         // release UI lock
         pWindow->DecrementLockCount();
     }
-
+    
     return n;
 }
diff --git a/vcl/source/window/dndlcon.cxx b/vcl/source/window/dndlcon.cxx
index 07819e76f957..a8c926494926 100644
--- a/vcl/source/window/dndlcon.cxx
+++ b/vcl/source/window/dndlcon.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
@@ -36,18 +36,18 @@ using namespace ::com::sun::star::datatransfer;
 using namespace ::com::sun::star::datatransfer::dnd;
 
 //==================================================================================================
-//
+// 
 //==================================================================================================
 
 DNDListenerContainer::DNDListenerContainer( sal_Int8 nDefaultActions )
     : WeakComponentImplHelper4< XDragGestureRecognizer, XDropTargetDragContext, XDropTargetDropContext, XDropTarget >(GetMutex())
 {
     m_bActive = sal_True;
-    m_nDefaultActions = nDefaultActions;
+    m_nDefaultActions = nDefaultActions;	
 }
 
 //==================================================================================================
-//
+// 
 //==================================================================================================
 
 DNDListenerContainer::~DNDListenerContainer()
@@ -57,8 +57,8 @@ DNDListenerContainer::~DNDListenerContainer()
 //==================================================================================================
 // DNDListenerContainer::addDragGestureListener
 //==================================================================================================
-
-void SAL_CALL DNDListenerContainer::addDragGestureListener( const Reference< XDragGestureListener >& dgl )
+     
+void SAL_CALL DNDListenerContainer::addDragGestureListener( const Reference< XDragGestureListener >& dgl ) 
     throw(RuntimeException)
 {
     rBHelper.addListener( getCppuType( ( const Reference< XDragGestureListener > * ) 0 ), dgl );
@@ -68,7 +68,7 @@ void SAL_CALL DNDListenerContainer::addDragGestureListener( const Reference< XDr
 // DNDListenerContainer::removeDragGestureListener
 //==================================================================================================
 
-void SAL_CALL DNDListenerContainer::removeDragGestureListener( const Reference< XDragGestureListener >& dgl )
+void SAL_CALL DNDListenerContainer::removeDragGestureListener( const Reference< XDragGestureListener >& dgl ) 
     throw(RuntimeException)
 {
     rBHelper.removeListener( getCppuType( ( const Reference< XDragGestureListener > * ) 0 ), dgl );
@@ -78,16 +78,16 @@ void SAL_CALL DNDListenerContainer::removeDragGestureListener( const Reference<
 // DNDListenerContainer::resetRecognizer
 //==================================================================================================
 
-void SAL_CALL DNDListenerContainer::resetRecognizer(  )
+void SAL_CALL DNDListenerContainer::resetRecognizer(  ) 
     throw(RuntimeException)
 {
 }
-
+     
 //==================================================================================================
 // DNDListenerContainer::addDropTargetListener
 //==================================================================================================
 
-void SAL_CALL DNDListenerContainer::addDropTargetListener( const Reference< XDropTargetListener >& dtl )
+void SAL_CALL DNDListenerContainer::addDropTargetListener( const Reference< XDropTargetListener >& dtl ) 
     throw(RuntimeException)
 {
     rBHelper.addListener( getCppuType( ( const Reference< XDropTargetListener > * ) 0 ), dtl );
@@ -97,7 +97,7 @@ void SAL_CALL DNDListenerContainer::addDropTargetListener( const Reference< XDro
 // DNDListenerContainer::removeDropTargetListener
 //==================================================================================================
 
-void SAL_CALL DNDListenerContainer::removeDropTargetListener( const Reference< XDropTargetListener >& dtl )
+void SAL_CALL DNDListenerContainer::removeDropTargetListener( const Reference< XDropTargetListener >& dtl ) 
     throw(RuntimeException)
 {
     rBHelper.removeListener( getCppuType( ( const Reference< XDropTargetListener > * ) 0 ), dtl );
@@ -107,7 +107,7 @@ void SAL_CALL DNDListenerContainer::removeDropTargetListener( const Reference< X
 // DNDListenerContainer::isActive
 //==================================================================================================
 
-sal_Bool SAL_CALL DNDListenerContainer::isActive(  )
+sal_Bool SAL_CALL DNDListenerContainer::isActive(  ) 
     throw(RuntimeException)
 {
     return m_bActive;
@@ -117,7 +117,7 @@ sal_Bool SAL_CALL DNDListenerContainer::isActive(  )
 // DNDListenerContainer::setActive
 //==================================================================================================
 
-void SAL_CALL DNDListenerContainer::setActive( sal_Bool active )
+void SAL_CALL DNDListenerContainer::setActive( sal_Bool active ) 
     throw(RuntimeException)
 {
     m_bActive = active;
@@ -127,7 +127,7 @@ void SAL_CALL DNDListenerContainer::setActive( sal_Bool active )
 // DNDListenerContainer::getDefaultActions
 //==================================================================================================
 
-sal_Int8 SAL_CALL DNDListenerContainer::getDefaultActions(  )
+sal_Int8 SAL_CALL DNDListenerContainer::getDefaultActions(  ) 
     throw(RuntimeException)
 {
     return m_nDefaultActions;
@@ -137,7 +137,7 @@ sal_Int8 SAL_CALL DNDListenerContainer::getDefaultActions(  )
 // DNDListenerContainer::setDefaultActions
 //==================================================================================================
 
-void SAL_CALL DNDListenerContainer::setDefaultActions( sal_Int8 actions )
+void SAL_CALL DNDListenerContainer::setDefaultActions( sal_Int8 actions ) 
     throw(RuntimeException)
 {
     m_nDefaultActions = actions;
@@ -147,7 +147,7 @@ void SAL_CALL DNDListenerContainer::setDefaultActions( sal_Int8 actions )
 // DNDListenerContainer::fireDropEvent
 //==================================================================================================
 
-sal_uInt32 DNDListenerContainer::fireDropEvent( const Reference< XDropTargetDropContext >& context,
+sal_uInt32 DNDListenerContainer::fireDropEvent( const Reference< XDropTargetDropContext >& context,	
     sal_Int8 dropAction, sal_Int32 locationX, sal_Int32 locationY, sal_Int8 sourceActions,
     const Reference< XTransferable >& transferable )
 {
@@ -155,17 +155,17 @@ sal_uInt32 DNDListenerContainer::fireDropEvent( const Reference< XDropTargetDrop
 
     // fire DropTargetDropEvent on all XDropTargetListeners
     OInterfaceContainerHelper *pContainer = rBHelper.getContainer( getCppuType( ( Reference < XDropTargetListener > * ) 0) );
-
+        
     if( pContainer && m_bActive )
     {
         OInterfaceIteratorHelper aIterator( *pContainer );
-
+    
         // remember context to use in own context methods
         m_xDropTargetDropContext = context;
 
         // do not construct the event before you are sure at least one listener is registered
-        DropTargetDropEvent aEvent( static_cast < XDropTarget * > (this), 0,
-            static_cast < XDropTargetDropContext * > (this), dropAction,
+        DropTargetDropEvent aEvent( static_cast < XDropTarget * > (this), 0, 
+            static_cast < XDropTargetDropContext * > (this), dropAction, 
             locationX, locationY, sourceActions, transferable );
 
         while (aIterator.hasMoreElements())
@@ -225,10 +225,10 @@ sal_uInt32 DNDListenerContainer::fireDropEvent( const Reference< XDropTargetDrop
 sal_uInt32 DNDListenerContainer::fireDragExitEvent()
 {
     sal_uInt32 nRet = 0;
-
+    
     // fire DropTargetDropEvent on all XDropTargetListeners
     OInterfaceContainerHelper *pContainer = rBHelper.getContainer( getCppuType( ( Reference < XDropTargetListener > * ) 0) );
-
+        
     if( pContainer && m_bActive )
     {
         OInterfaceIteratorHelper aIterator( *pContainer );
@@ -267,14 +267,14 @@ sal_uInt32 DNDListenerContainer::fireDragExitEvent()
 // DNDListenerContainer::fireDragOverEvent
 //==================================================================================================
 
-sal_uInt32 DNDListenerContainer::fireDragOverEvent( const Reference< XDropTargetDragContext >& context,
+sal_uInt32 DNDListenerContainer::fireDragOverEvent( const Reference< XDropTargetDragContext >& context, 
     sal_Int8 dropAction, sal_Int32 locationX, sal_Int32 locationY, sal_Int8 sourceActions )
 {
     sal_uInt32 nRet = 0;
-
+    
     // fire DropTargetDropEvent on all XDropTargetListeners
     OInterfaceContainerHelper *pContainer = rBHelper.getContainer( getCppuType( ( Reference < XDropTargetListener > * ) 0) );
-
+        
     if( pContainer && m_bActive )
     {
         OInterfaceIteratorHelper aIterator( *pContainer );
@@ -283,8 +283,8 @@ sal_uInt32 DNDListenerContainer::fireDragOverEvent( const Reference< XDropTarget
         m_xDropTargetDragContext = context;
 
         // do not construct the event before you are sure at least one listener is registered
-        DropTargetDragEvent aEvent( static_cast < XDropTarget * > (this), 0,
-            static_cast < XDropTargetDragContext * > (this),
+        DropTargetDragEvent aEvent( static_cast < XDropTarget * > (this), 0, 
+            static_cast < XDropTargetDragContext * > (this), 
             dropAction, locationX, locationY, sourceActions );
 
         while (aIterator.hasMoreElements())
@@ -335,14 +335,14 @@ sal_uInt32 DNDListenerContainer::fireDragOverEvent( const Reference< XDropTarget
 //==================================================================================================
 
 sal_uInt32 DNDListenerContainer::fireDragEnterEvent( const Reference< XDropTargetDragContext >& context,
-    sal_Int8 dropAction, sal_Int32 locationX, sal_Int32 locationY, sal_Int8 sourceActions,
+    sal_Int8 dropAction, sal_Int32 locationX, sal_Int32 locationY, sal_Int8 sourceActions, 
     const Sequence< DataFlavor >& dataFlavors )
 {
     sal_uInt32 nRet = 0;
-
+    
     // fire DropTargetDropEvent on all XDropTargetListeners
     OInterfaceContainerHelper *pContainer = rBHelper.getContainer( getCppuType( ( Reference < XDropTargetListener > * ) 0) );
-
+        
     if( pContainer && m_bActive )
     {
         OInterfaceIteratorHelper aIterator( *pContainer );
@@ -351,7 +351,7 @@ sal_uInt32 DNDListenerContainer::fireDragEnterEvent( const Reference< XDropTarge
         m_xDropTargetDragContext = context;
 
         // do not construct the event before you are sure at least one listener is registered
-        DropTargetDragEnterEvent aEvent( static_cast < XDropTarget * > (this), 0,
+        DropTargetDragEnterEvent aEvent( static_cast < XDropTarget * > (this), 0, 
             static_cast < XDropTargetDragContext * > (this),
             dropAction, locationX, locationY, sourceActions, dataFlavors );
 
@@ -406,10 +406,10 @@ sal_uInt32 DNDListenerContainer::fireDropActionChangedEvent( const Reference< XD
     sal_Int8 dropAction, sal_Int32 locationX, sal_Int32 locationY, sal_Int8 sourceActions )
 {
     sal_uInt32 nRet = 0;
-
+    
     // fire DropTargetDropEvent on all XDropTargetListeners
     OInterfaceContainerHelper *pContainer = rBHelper.getContainer( getCppuType( ( Reference < XDropTargetListener > * ) 0) );
-
+        
     if( pContainer && m_bActive )
     {
         OInterfaceIteratorHelper aIterator( *pContainer );
@@ -418,7 +418,7 @@ sal_uInt32 DNDListenerContainer::fireDropActionChangedEvent( const Reference< XD
         m_xDropTargetDragContext = context;
 
         // do not construct the event before you are sure at least one listener is registered
-        DropTargetDragEvent aEvent( static_cast < XDropTarget * > (this), 0,
+        DropTargetDragEvent aEvent( static_cast < XDropTarget * > (this), 0, 
             static_cast < XDropTargetDragContext * > (this),
             dropAction, locationX, locationY, sourceActions );
 
@@ -473,16 +473,16 @@ sal_uInt32 DNDListenerContainer::fireDragGestureEvent( sal_Int8 dragAction, sal_
     sal_Int32 dragOriginY, const Reference< XDragSource >& dragSource, const Any& triggerEvent )
 {
     sal_uInt32 nRet = 0;
-
+    
     // fire DropTargetDropEvent on all XDropTargetListeners
     OInterfaceContainerHelper *pContainer = rBHelper.getContainer( getCppuType( ( Reference < XDragGestureListener > * ) 0) );
-
+        
     if( pContainer )
     {
         OInterfaceIteratorHelper aIterator( *pContainer );
 
         // do not construct the event before you are sure at least one listener is registered
-        DragGestureEvent aEvent( static_cast < XDragGestureRecognizer * > (this), dragAction,
+        DragGestureEvent aEvent( static_cast < XDragGestureRecognizer * > (this), dragAction, 
             dragOriginX, dragOriginY, dragSource, triggerEvent );
 
         while( aIterator.hasMoreElements() )
diff --git a/vcl/source/window/dockingarea.cxx b/vcl/source/window/dockingarea.cxx
index 9ea407e52ee3..fa3779870685 100644
--- a/vcl/source/window/dockingarea.cxx
+++ b/vcl/source/window/dockingarea.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
@@ -72,7 +72,7 @@ static void ImplInitBackground( DockingAreaWindow* pThis )
 DockingAreaWindow::DockingAreaWindow( Window* pParent ) :
     Window( WINDOW_DOCKINGAREA )
 {
-    ImplInit( pParent, WB_CLIPCHILDREN|WB_3DLOOK, NULL );
+    ImplInit( pParent, WB_CLIPCHILDREN|WB_3DLOOK, NULL ); 
 
     mpImplData = new ImplData;
     ImplInitBackground( this );
@@ -102,7 +102,7 @@ static void ImplInvalidateMenubar( DockingAreaWindow* pThis )
     // due to a possible comon gradient covering menubar and top dockingarea
     // the menubar must be repainted if the top dockingarea changes size or visibility
     if( ImplGetSVData()->maNWFData.mbMenuBarDockingAreaCommonBG &&
-        (pThis->GetAlign() == WINDOWALIGN_TOP)
+        (pThis->GetAlign() == WINDOWALIGN_TOP)  
         && pThis->IsNativeControlSupported( CTRL_TOOLBAR, PART_ENTIRE_CONTROL )
         && pThis->IsNativeControlSupported( CTRL_MENUBAR, PART_ENTIRE_CONTROL ) )
     {
@@ -167,8 +167,8 @@ void DockingAreaWindow::Paint( const Rectangle& )
             // draw a single toolbar background covering the whole docking area
             Point tmp;
             Rectangle aCtrlRegion( tmp, GetOutputSizePixel() );
-
-            DrawNativeControl( CTRL_TOOLBAR, IsHorizontal() ? PART_DRAW_BACKGROUND_HORZ : PART_DRAW_BACKGROUND_VERT,
+            
+            DrawNativeControl( CTRL_TOOLBAR, IsHorizontal() ? PART_DRAW_BACKGROUND_HORZ : PART_DRAW_BACKGROUND_VERT, 
                                aCtrlRegion, nState, aControlValue, rtl::OUString() );
 
             // each toolbar gets a thin border to better recognize its borders on the homogeneous docking area
@@ -194,7 +194,7 @@ void DockingAreaWindow::Paint( const Rectangle& )
         }
         else
         {
-            // create map to find toolbar lines
+            // create map to find toolbar lines 
             Size aOutSz = GetOutputSizePixel();
             std::map< int, int > ranges;
             USHORT nChildren = GetChildCount();
@@ -228,7 +228,7 @@ void DockingAreaWindow::Paint( const Rectangle& )
                     aTBRect.Top()       = 0;
                     aTBRect.Bottom()    = aOutSz.Height() - 1;
                 }
-                DrawNativeControl( CTRL_TOOLBAR, IsHorizontal() ? PART_DRAW_BACKGROUND_HORZ : PART_DRAW_BACKGROUND_VERT,
+                DrawNativeControl( CTRL_TOOLBAR, IsHorizontal() ? PART_DRAW_BACKGROUND_HORZ : PART_DRAW_BACKGROUND_VERT, 
                                    aTBRect, nState, aControlValue, rtl::OUString() );
             }
         }
diff --git a/vcl/source/window/dockmgr.cxx b/vcl/source/window/dockmgr.cxx
index e67c2d9ecfd5..ffbae266584a 100644
--- a/vcl/source/window/dockmgr.cxx
+++ b/vcl/source/window/dockmgr.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
@@ -62,13 +62,13 @@ class ImplDockFloatWin2 : public FloatingWindow
 {
 private:
     ImplDockingWindowWrapper*  mpDockWin;
-    ULONG           mnLastTicks;
-    Timer           maDockTimer;
-    Timer           maEndDockTimer;
-    Point           maDockPos;
-    Rectangle       maDockRect;
+    ULONG			mnLastTicks;
+    Timer			maDockTimer;
+    Timer			maEndDockTimer;
+    Point			maDockPos;
+    Rectangle		maDockRect;
     BOOL            mbInMove;
-    ULONG           mnLastUserEvent;
+    ULONG			mnLastUserEvent;
 
     DECL_LINK( DockingHdl, ImplDockFloatWin2* );
     DECL_LINK( DockTimerHdl, ImplDockFloatWin2* );
@@ -78,14 +78,14 @@ public:
                       ImplDockingWindowWrapper* pDockingWin );
     ~ImplDockFloatWin2();
 
-    virtual void    Move();
-    virtual void    Resize();
-    virtual void    TitleButtonClick( USHORT nButton );
-    virtual void    Pin();
-    virtual void    Roll();
-    virtual void    PopupModeEnd();
-    virtual void    Resizing( Size& rSize );
-    virtual BOOL    Close();
+    virtual void	Move();
+    virtual void	Resize();
+    virtual void	TitleButtonClick( USHORT nButton );
+    virtual void	Pin();
+    virtual void	Roll();
+    virtual void	PopupModeEnd();
+    virtual void	Resizing( Size& rSize );
+    virtual BOOL	Close();
     using Window::SetPosSizePixel;
     virtual void    SetPosSizePixel( long nX, long nY,
                                      long nWidth, long nHeight,
@@ -216,8 +216,8 @@ IMPL_LINK( ImplDockFloatWin2, DockingHdl, ImplDockFloatWin2*, EMPTYARG )
         }
     }
 
-    if( mpDockWin->IsDockable() &&
-        mpDockWin->GetWindow()->IsVisible() &&
+    if( mpDockWin->IsDockable()	&& 
+        mpDockWin->GetWindow()->IsVisible() && 
         (Time::GetSystemTicks() - mnLastTicks > 500) &&
         ( aState.mnState & ( MOUSE_LEFT | MOUSE_MIDDLE | MOUSE_RIGHT ) ) &&
         !(aState.mnState & KEY_MOD1) && // i43499 CTRL disables docking now
@@ -436,7 +436,7 @@ void DockingManager::StartPopupMode( ToolBox *pParentToolBox, const Window *pWin
 void DockingManager::StartPopupMode( ToolBox *pParentToolBox, const Window *pWindow )
 {
     StartPopupMode( pParentToolBox, pWindow, FLOATWIN_POPUPMODE_ALLOWTEAROFF         |
-                    FLOATWIN_POPUPMODE_NOFOCUSCLOSE         |
+                    FLOATWIN_POPUPMODE_NOFOCUSCLOSE 	    |
                     FLOATWIN_POPUPMODE_ALLMOUSEBUTTONCLOSE  |
                     FLOATWIN_POPUPMODE_NOMOUSEUPCLOSE );
 }
@@ -515,14 +515,14 @@ Rectangle DockingManager::GetPosSizePixel( const Window *pWindow )
 
 // if TEAROFF_DASHED defined a single dashed line is used
 // otherwise multiple smaller lines will be painted
-//#define TEAROFF_DASHED
+//#define TEAROFF_DASHED  
 
 // size of the drag area
 #ifdef TEAROFF_DASHED
-#define POPUP_DRAGBORDER    2
-#define POPUP_DRAGGRIP      5
+#define POPUP_DRAGBORDER    2 
+#define POPUP_DRAGGRIP      5 
 #else
-#define POPUP_DRAGBORDER    3
+#define POPUP_DRAGBORDER    3  
 #define POPUP_DRAGGRIP      5
 #endif
 #define POPUP_DRAGHEIGHT    (POPUP_DRAGGRIP+POPUP_DRAGBORDER+POPUP_DRAGBORDER)
@@ -534,11 +534,11 @@ private:
     ImplDockingWindowWrapper*   mpDockingWin;
     BOOL                        mbHighlight;
     BOOL                        mbMoving;
-    bool                        mbTrackingEnabled;
+    bool						mbTrackingEnabled;
     Point                       maDelta;
     Point                       maTearOffPosition;
-    bool                        mbGripAtBottom;
-    bool                        mbHasGrip;
+    bool						mbGripAtBottom;
+    bool						mbHasGrip;
     void                        ImplSetBorder();
 
 public:
@@ -560,13 +560,13 @@ public:
     void                DrawGrip();
     void                DrawBorder();
 
-    bool                hasGrip() const { return mbHasGrip; }
+    bool				hasGrip() const { return mbHasGrip; }
 };
 
-ImplPopupFloatWin::ImplPopupFloatWin( Window* pParent, ImplDockingWindowWrapper* pDockingWin, bool bHasGrip ) :
+ImplPopupFloatWin::ImplPopupFloatWin( Window* pParent, ImplDockingWindowWrapper* pDockingWin, bool bHasGrip ) : 
     FloatingWindow( pParent, WB_NOBORDER | WB_SYSTEMWINDOW | WB_NOSHADOW)
 {
-    mpWindowImpl->mbToolbarFloatingWindow = TRUE;   // indicate window type, required for accessibility
+    mpWindowImpl->mbToolbarFloatingWindow = TRUE;   // indicate window type, required for accessibility 
                                                     // which should not see this window as a toplevel window
     mpDockingWin = pDockingWin;
     mbHighlight = FALSE;
@@ -589,7 +589,7 @@ ImplPopupFloatWin::~ImplPopupFloatWin()
 
     // this is to avoid appearance of this window as standalone window in the accessibility hierarchy
     // as this window is only used as a helper for subtoolbars that are not teared-off, the parent toolbar
-    // has to provide accessibility support (as implemented in the toolkit)
+    // has to provide accessibility support (as implemented in the toolkit) 
     // so the contained toolbar should appear as child of the correponsing toolbar item of the parent toolbar
     return ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >();
 }
@@ -620,7 +620,7 @@ void ImplPopupFloatWin::ImplSetBorder()
 void ImplPopupFloatWin::Resize()
 {
     // the borderview overwrites the border during resize so restore it
-    ImplSetBorder();
+    ImplSetBorder();    
 }
 
 Rectangle ImplPopupFloatWin::GetDragRect() const
@@ -743,8 +743,8 @@ void ImplPopupFloatWin::DrawGrip()
         //aRect.nLeft = aRect.nLeft + (aRect.getWidth() - width) / 2;
         aRect.nLeft = (aRect.nLeft + aRect.nRight - width) / 2;
         aRect.nRight = aRect.nLeft + width;
-
-        int i=0;
+        
+        int i=0; 
         while( i< POPUP_DRAGGRIP )
         {
             DrawRect( aRect );
@@ -839,7 +839,7 @@ void ImplPopupFloatWin::Tracking( const TrackingEvent& rTEvt )
         {
             // move the window according to mouse pos
             PointerState aState = GetParent()->GetPointerState();
-            if (ImplHasMirroredGraphics() && IsRTLEnabled())
+            if (ImplHasMirroredGraphics() && IsRTLEnabled()) 
                 ImplMirrorFramePos(aState.maPos);
             maTearOffPosition = aState.maPos - maDelta;
             GetWindow( WINDOW_BORDER )->SetPosPixel( maTearOffPosition );
@@ -856,8 +856,8 @@ ImplDockingWindowWrapper::ImplDockingWindowWrapper( const Window *pWindow )
 
     mpDockingWindow = (Window*) pWindow;
     mpParent        = pWindow->GetParent();
-    mbDockable      = TRUE;
-    mbLocked        = FALSE;
+    mbDockable      = TRUE; 
+    mbLocked        = FALSE; 
     mnFloatBits     = WB_BORDER | WB_CLOSEABLE | WB_SIZEABLE | (pWindow->GetStyle() & DOCKWIN_FLOATSTYLES);
     DockingWindow *pDockWin = dynamic_cast< DockingWindow* > ( mpDockingWindow );
     if( pDockWin )
@@ -1148,7 +1148,7 @@ BOOL ImplDockingWindowWrapper::Close()
 void ImplDockingWindowWrapper::ToggleFloatingMode()
 {
     // notify dockingwindow/toolbox
-    // note: this must be done *before* notifying the
+    // note: this must be done *before* notifying the 
     //       listeners to have the toolbox in the proper state
     if( GetWindow()->ImplIsDockingWindow() )
         ((DockingWindow*) GetWindow())->ToggleFloatingMode();
@@ -1234,7 +1234,7 @@ BOOL ImplDockingWindowWrapper::IsTitleButtonVisible( USHORT nButton ) const
     {
         if ( nButton == TITLE_BUTTON_DOCKING )
             return mbDockBtn;
-        else // if ( nButton == TITLE_BUTTON_HIDE )
+        else // if ( nButton == TITLE_BUTTON_HIDE ) 
             return mbHideBtn;
     }
 }
@@ -1316,7 +1316,7 @@ IMPL_LINK( ImplDockingWindowWrapper, PopupModeEnd, void*, EMPTYARG )
     if ( mpOldBorderWin )
     {
         GetWindow()->SetParent( mpOldBorderWin );
-        ((ImplBorderWindow*)mpOldBorderWin)->GetBorder(
+        ((ImplBorderWindow*)mpOldBorderWin)->GetBorder( 
             GetWindow()->mpWindowImpl->mnLeftBorder, GetWindow()->mpWindowImpl->mnTopBorder,
             GetWindow()->mpWindowImpl->mnRightBorder, GetWindow()->mpWindowImpl->mnBottomBorder );
         mpOldBorderWin->Resize();
@@ -1374,7 +1374,7 @@ void ImplDockingWindowWrapper::SetFloatingMode( BOOL bFloatMode )
                                          mnFloatBits & ( WB_MOVEABLE | WB_SIZEABLE | WB_CLOSEABLE ) ?
                                           mnFloatBits | WB_SYSTEMWINDOW
 //#ifdef __USE_OWNERDRAWDECORATION__
-                                          | WB_OWNERDRAWDECORATION
+                                          | WB_OWNERDRAWDECORATION 
 //#endif
                                           : mnFloatBits,
                                          this );
@@ -1448,7 +1448,7 @@ void ImplDockingWindowWrapper::SetFloatingMode( BOOL bFloatMode )
                 if ( mpOldBorderWin )
                 {
                     GetWindow()->SetParent( mpOldBorderWin );
-                    ((ImplBorderWindow*)mpOldBorderWin)->GetBorder(
+                    ((ImplBorderWindow*)mpOldBorderWin)->GetBorder( 
                         GetWindow()->mpWindowImpl->mnLeftBorder, GetWindow()->mpWindowImpl->mnTopBorder,
                         GetWindow()->mpWindowImpl->mnRightBorder, GetWindow()->mpWindowImpl->mnBottomBorder );
                     mpOldBorderWin->Resize();
diff --git a/vcl/source/window/dockwin.cxx b/vcl/source/window/dockwin.cxx
index c8e382bad982..d60eccb46dff 100644
--- a/vcl/source/window/dockwin.cxx
+++ b/vcl/source/window/dockwin.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
@@ -62,8 +62,8 @@ public:
     ImplData();
     ~ImplData();
 
-    Window*         mpParent;
-    Size            maMaxOutSize;
+    Window* 		mpParent;
+    Size			maMaxOutSize;
 };
 
 DockingWindow::ImplData::ImplData()
@@ -82,12 +82,12 @@ class ImplDockFloatWin : public FloatingWindow
 {
 private:
     DockingWindow*  mpDockWin;
-    ULONG           mnLastTicks;
-    Timer           maDockTimer;
-    Point           maDockPos;
-    Rectangle       maDockRect;
+    ULONG			mnLastTicks;
+    Timer			maDockTimer;
+    Point			maDockPos;
+    Rectangle		maDockRect;
     BOOL            mbInMove;
-    ULONG           mnLastUserEvent;
+    ULONG			mnLastUserEvent;
 
     DECL_LINK( DockingHdl, ImplDockFloatWin* );
     DECL_LINK( DockTimerHdl, ImplDockFloatWin* );
@@ -96,14 +96,14 @@ public:
                       DockingWindow* pDockingWin );
     ~ImplDockFloatWin();
 
-    virtual void    Move();
-    virtual void    Resize();
-    virtual void    TitleButtonClick( USHORT nButton );
-    virtual void    Pin();
-    virtual void    Roll();
-    virtual void    PopupModeEnd();
-    virtual void    Resizing( Size& rSize );
-    virtual BOOL    Close();
+    virtual void	Move();
+    virtual void	Resize();
+    virtual void	TitleButtonClick( USHORT nButton );
+    virtual void	Pin();
+    virtual void	Roll();
+    virtual void	PopupModeEnd();
+    virtual void	Resizing( Size& rSize );
+    virtual BOOL	Close();
 
     ULONG GetLastTicks() const { return mnLastTicks; }
 };
@@ -178,8 +178,8 @@ IMPL_LINK( ImplDockFloatWin, DockingHdl, ImplDockFloatWin*, EMPTYARG )
     PointerState aState = mpDockWin->GetParent()->GetPointerState();
 
     mnLastUserEvent = 0;
-    if( mpDockWin->IsDockable()                             &&
-        (Time::GetSystemTicks() - mnLastTicks > 500)        &&
+    if( mpDockWin->IsDockable()								&&
+        (Time::GetSystemTicks() - mnLastTicks > 500)		&&
         ( aState.mnState & ( MOUSE_LEFT | MOUSE_MIDDLE | MOUSE_RIGHT ) ) &&
         !(aState.mnState & KEY_MOD1) )  // i43499 CTRL disables docking now
     {
diff --git a/vcl/source/window/floatwin.cxx b/vcl/source/window/floatwin.cxx
index 323bbe3b0d74..394deb5b2f66 100644
--- a/vcl/source/window/floatwin.cxx
+++ b/vcl/source/window/floatwin.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
@@ -54,8 +54,8 @@ public:
     ImplData();
     ~ImplData();
 
-    ToolBox*        mpBox;
-    Rectangle       maItemEdgeClipRect; // used to clip the common edge between a toolbar item and the border of this window
+    ToolBox* 		mpBox;
+    Rectangle		maItemEdgeClipRect; // used to clip the common edge between a toolbar item and the border of this window
 };
 
 FloatingWindow::ImplData::ImplData()
@@ -138,7 +138,7 @@ void FloatingWindow::ImplInit( Window* pParent, WinBits nStyle )
     mpNextFloat             = NULL;
     mpFirstPopupModeWin     = NULL;
     mnPostId                = 0;
-    mnTitle                 = (nStyle & WB_MOVEABLE) ? FLOATWIN_TITLE_NORMAL : FLOATWIN_TITLE_NONE;
+    mnTitle                 = (nStyle & (WB_MOVEABLE | WB_POPUP)) ? FLOATWIN_TITLE_NORMAL : FLOATWIN_TITLE_NONE;
     mnOldTitle              = mnTitle;
     mnPopupModeFlags        = 0;
     mbInPopupMode           = FALSE;
@@ -267,7 +267,7 @@ Point FloatingWindow::ImplCalcPos( Window* pWindow,
 
     BOOL bRTL = Application::GetSettings().GetLayoutRTL();
 
-    Rectangle devRect(  pW->OutputToAbsoluteScreenPixel( normRect.TopLeft() ),
+    Rectangle devRect(  pW->OutputToAbsoluteScreenPixel( normRect.TopLeft() ), 
                         pW->OutputToAbsoluteScreenPixel( normRect.BottomRight() ) );
 
     Rectangle devRectRTL( devRect );
@@ -342,13 +342,13 @@ Point FloatingWindow::ImplCalcPos( Window* pWindow,
                         bBreak = FALSE;
                 }
                 if( bBreak )
-                {
+                {   
                     e1 = devRect.TopLeft();
                     e2 = devRect.BottomLeft();
                     // set non-zero width
                     e2.X()++;
                     // don't clip corners
-                    e1.Y()++;
+                    e1.Y()++;   
                     e2.Y()--;
                 }
                 break;
@@ -366,13 +366,13 @@ Point FloatingWindow::ImplCalcPos( Window* pWindow,
                         bBreak = FALSE;
                 }
                 if( bBreak )
-                {
+                {   
                     e1 = devRect.TopRight();
                     e2 = devRect.BottomRight();
                     // set non-zero width
                     e2.X()++;
                     // don't clip corners
-                    e1.Y()++;
+                    e1.Y()++;   
                     e2.Y()--;
                 }
                 break;
@@ -382,13 +382,13 @@ Point FloatingWindow::ImplCalcPos( Window* pWindow,
                 if ( aPos.Y() < aScreenRect.Top() )
                     bBreak = FALSE;
                 if( bBreak )
-                {
+                {   
                     e1 = devRect.TopLeft();
                     e2 = devRect.TopRight();
                     // set non-zero height
                     e2.Y()++;
                     // don't clip corners
-                    e1.X()++;
+                    e1.X()++;   
                     e2.X()--;
                 }
                 break;
@@ -397,13 +397,13 @@ Point FloatingWindow::ImplCalcPos( Window* pWindow,
                 if ( aPos.Y()+aSize.Height() > aScreenRect.Bottom() )
                     bBreak = FALSE;
                 if( bBreak )
-                {
+                {   
                     e1 = devRect.BottomLeft();
                     e2 = devRect.BottomRight();
                     // set non-zero height
                     e2.Y()++;
                     // don't clip corners
-                    e1.X()++;
+                    e1.X()++;   
                     e2.X()--;
                 }
                 break;
@@ -486,7 +486,7 @@ FloatingWindow* FloatingWindow::ImplFloatHitTest( Window* pReference, const Poin
     else
         aAbsolute = Point( pReference->OutputToAbsoluteScreenPixel(
             pReference->ScreenToOutputPixel(rPos) ) );
-
+    
     do
     {
         // compute the floating window's size in absolute screen coordinates
@@ -502,8 +502,8 @@ FloatingWindow* FloatingWindow::ImplFloatHitTest( Window* pReference, const Poin
             return pWin;
         }
 
-        // test, if mouse is in rectangle, (this is typically the rect of the active
-        // toolbox item or similar)
+        // test, if mouse is in rectangle, (this is typically the rect of the active 
+        // toolbox item or similar) 
         // note: maFloatRect is set in FloatingWindow::StartPopupMode() and
         //       is already in absolute device coordinates
         if ( pWin->maFloatRect.IsInside( aAbsolute ) )
@@ -652,6 +652,8 @@ void FloatingWindow::SetTitleType( USHORT nTitle )
             nTitleStyle = BORDERWINDOW_TITLE_SMALL;
         else if ( nTitle == FLOATWIN_TITLE_TEAROFF )
             nTitleStyle = BORDERWINDOW_TITLE_TEAROFF;
+        else if ( nTitle == FLOATWIN_TITLE_POPUP )
+            nTitleStyle = BORDERWINDOW_TITLE_POPUP;
         else // nTitle == FLOATWIN_TITLE_NONE
             nTitleStyle = BORDERWINDOW_TITLE_NONE;
         ((ImplBorderWindow*)mpWindowImpl->mpBorderWindow)->SetTitleType( nTitleStyle, aOutSize );
@@ -670,9 +672,11 @@ void FloatingWindow::StartPopupMode( const Rectangle& rRect, ULONG nFlags )
     if ( IsRollUp() )
         RollDown();
 
-    // remove title
+    // remove title 
     mnOldTitle = mnTitle;
-    if ( nFlags & FLOATWIN_POPUPMODE_ALLOWTEAROFF )
+    if ( ( mpWindowImpl->mnStyle & WB_POPUP ) && GetText().Len() )
+        SetTitleType( FLOATWIN_TITLE_POPUP );
+    else if ( nFlags & FLOATWIN_POPUPMODE_ALLOWTEAROFF )
         SetTitleType( FLOATWIN_TITLE_TEAROFF );
     else
         SetTitleType( FLOATWIN_TITLE_NONE );
@@ -749,15 +753,15 @@ void FloatingWindow::StartPopupMode( ToolBox* pBox, ULONG nFlags )
     aRect.SetPos( aPos );
 
     nFlags |=
-        FLOATWIN_POPUPMODE_NOFOCUSCLOSE     |
-//        FLOATWIN_POPUPMODE_NOMOUSECLOSE       |
+        FLOATWIN_POPUPMODE_NOFOCUSCLOSE 	|
+//        FLOATWIN_POPUPMODE_NOMOUSECLOSE		|
         FLOATWIN_POPUPMODE_ALLMOUSEBUTTONCLOSE |
-//        FLOATWIN_POPUPMODE_NOMOUSERECTCLOSE   |   // #105968# floating toolboxes should close when clicked in (parent's) float rect
+//        FLOATWIN_POPUPMODE_NOMOUSERECTCLOSE	|   // #105968# floating toolboxes should close when clicked in (parent's) float rect
         FLOATWIN_POPUPMODE_NOMOUSEUPCLOSE;
-//          |      FLOATWIN_POPUPMODE_NOAPPFOCUSCLOSE;
+//        	|      FLOATWIN_POPUPMODE_NOAPPFOCUSCLOSE;
 
 /*
- *  FLOATWIN_POPUPMODE_NOKEYCLOSE       |
+ *  FLOATWIN_POPUPMODE_NOKEYCLOSE		|
  *  don't set since it disables closing floaters with escape
  */
 
@@ -791,7 +795,7 @@ void FloatingWindow::ImplEndPopupMode( USHORT nFlags, ULONG nFocusId )
     while ( pSVData->maWinData.mpFirstFloat && pSVData->maWinData.mpFirstFloat != this )
         pSVData->maWinData.mpFirstFloat->EndPopupMode( FLOATWIN_POPUPMODEEND_CANCEL );
 
-
+    
     // Fenster aus der Liste austragen
     pSVData->maWinData.mpFirstFloat = mpNextFloat;
     mpNextFloat = NULL;
diff --git a/vcl/source/window/introwin.cxx b/vcl/source/window/introwin.cxx
index 03f88adc3566..6e6bac881516 100644
--- a/vcl/source/window/introwin.cxx
+++ b/vcl/source/window/introwin.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
diff --git a/vcl/source/window/javachild.cxx b/vcl/source/window/javachild.cxx
index 2cd18b897ff5..271e74fcf106 100644
--- a/vcl/source/window/javachild.cxx
+++ b/vcl/source/window/javachild.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
@@ -28,7 +28,7 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_vcl.hxx"
 
-
+  
 #ifdef SOLAR_JAVA
 #include <jni.h>
 #endif
@@ -84,20 +84,20 @@ void JavaChildWindow::implTestJavaException( void* pEnv )
 #ifdef SOLAR_JAVA
     JNIEnv*     pJavaEnv = reinterpret_cast< JNIEnv* >( pEnv );
     jthrowable  jtThrowable = pJavaEnv->ExceptionOccurred();
-
-    if( jtThrowable )
+    
+    if( jtThrowable ) 
     { // is it a java exception ?
 #if OSL_DEBUG_LEVEL > 1
         pJavaEnv->ExceptionDescribe();
-#endif // OSL_DEBUG_LEVEL > 1
+#endif // OSL_DEBUG_LEVEL > 1       
         pJavaEnv->ExceptionClear();
 
         jclass          jcThrowable = pJavaEnv->FindClass("java/lang/Throwable");
         jmethodID       jmThrowable_getMessage = pJavaEnv->GetMethodID(jcThrowable, "getMessage", "()Ljava/lang/String;");
         jstring         jsMessage = (jstring) pJavaEnv->CallObjectMethod(jtThrowable, jmThrowable_getMessage);
         ::rtl::OUString ouMessage;
-
-        if(jsMessage)
+        
+        if(jsMessage) 
         {
             const jchar * jcMessage = pJavaEnv->GetStringChars(jsMessage, NULL);
             ouMessage = ::rtl::OUString(jcMessage);
@@ -113,7 +113,7 @@ void JavaChildWindow::implTestJavaException( void* pEnv )
 
 sal_IntPtr JavaChildWindow::getParentWindowHandleForJava()
 {
-    sal_IntPtr nRet = 0;
+    sal_IntPtr nRet = 0; 
 
 #if defined WNT
     nRet = reinterpret_cast< sal_IntPtr >( GetSystemData()->hWnd );
@@ -123,7 +123,7 @@ sal_IntPtr JavaChildWindow::getParentWindowHandleForJava()
 #elif defined UNX
 #ifdef SOLAR_JAVA
     uno::Reference< lang::XMultiServiceFactory > xFactory( vcl::unohelper::GetMultiServiceFactory() );
-
+        
     if( xFactory.is() && ( GetSystemData()->aWindow > 0 ) )
     {
         try
@@ -131,65 +131,65 @@ sal_IntPtr JavaChildWindow::getParentWindowHandleForJava()
             ::rtl::Reference< ::jvmaccess::VirtualMachine > xVM;
             uno::Reference< java::XJavaVM >                 xJavaVM( xFactory->createInstance( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.java.JavaVirtualMachine") ) ), uno::UNO_QUERY );
             uno::Sequence< sal_Int8 >                       aProcessID( 17 );
-
+            
             rtl_getGlobalProcessId( (sal_uInt8*) aProcessID.getArray() );
             aProcessID[ 16 ] = 0;
             OSL_ENSURE(sizeof (sal_Int64) >= sizeof (jvmaccess::VirtualMachine *), "Pointer cannot be represented as sal_Int64");
             sal_Int64 nPointer = reinterpret_cast< sal_Int64 >( static_cast< jvmaccess::VirtualMachine * >(0));
             xJavaVM->getJavaVM(aProcessID) >>= nPointer;
             xVM = reinterpret_cast< jvmaccess::VirtualMachine * >(nPointer);
-
+            
             if( xVM.is() )
             {
                 try
                 {
                     ::jvmaccess::VirtualMachine::AttachGuard    aVMAttachGuard( xVM );
                     JNIEnv*                                     pEnv = aVMAttachGuard.getEnvironment();
-
-                    jclass jcToolkit = pEnv->FindClass("java/awt/Toolkit");
+                    
+                    jclass jcToolkit = pEnv->FindClass("java/awt/Toolkit");                         
                     implTestJavaException(pEnv);
-
+                    
                     jmethodID jmToolkit_getDefaultToolkit = pEnv->GetStaticMethodID( jcToolkit, "getDefaultToolkit", "()Ljava/awt/Toolkit;" );
                     implTestJavaException(pEnv);
-
+                    
                     pEnv->CallStaticObjectMethod(jcToolkit, jmToolkit_getDefaultToolkit);
                     implTestJavaException(pEnv);
-
+                
                     jclass jcMotifAppletViewer = pEnv->FindClass("sun/plugin/navig/motif/MotifAppletViewer");
                     if( pEnv->ExceptionOccurred() )
                     {
                         pEnv->ExceptionClear();
-
-                        jcMotifAppletViewer = pEnv->FindClass( "sun/plugin/viewer/MNetscapePluginContext");
+                        
+                        jcMotifAppletViewer = pEnv->FindClass( "sun/plugin/viewer/MNetscapePluginContext");               
                         implTestJavaException(pEnv);
                     }
-
-                    jclass jcClassLoader = pEnv->FindClass("java/lang/ClassLoader");
+                
+                    jclass jcClassLoader = pEnv->FindClass("java/lang/ClassLoader");                
                     implTestJavaException(pEnv);
-
+                    
                     jmethodID jmClassLoader_loadLibrary = pEnv->GetStaticMethodID( jcClassLoader, "loadLibrary", "(Ljava/lang/Class;Ljava/lang/String;Z)V");
                     implTestJavaException(pEnv);
-
+                    
                     jstring jsplugin = pEnv->NewStringUTF("javaplugin_jni");
                     implTestJavaException(pEnv);
-
-                    pEnv->CallStaticVoidMethod(jcClassLoader, jmClassLoader_loadLibrary, jcMotifAppletViewer, jsplugin, JNI_FALSE);
+                    
+                    pEnv->CallStaticVoidMethod(jcClassLoader, jmClassLoader_loadLibrary, jcMotifAppletViewer, jsplugin, JNI_FALSE); 
                     implTestJavaException(pEnv);
-
+                
                     jmethodID jmMotifAppletViewer_getWidget = pEnv->GetStaticMethodID( jcMotifAppletViewer, "getWidget", "(IIIII)I" );
                     implTestJavaException(pEnv);
-
+                    
                     const Size aSize( GetOutputSizePixel() );
-                    jint ji_widget = pEnv->CallStaticIntMethod( jcMotifAppletViewer, jmMotifAppletViewer_getWidget,
+                    jint ji_widget = pEnv->CallStaticIntMethod( jcMotifAppletViewer, jmMotifAppletViewer_getWidget, 
                                                                 GetSystemData()->aWindow, 0, 0, aSize.Width(), aSize.Height() );
                     implTestJavaException(pEnv);
-
+                
                     nRet = static_cast< sal_IntPtr >( ji_widget );
                 }
                 catch( uno::RuntimeException& )
                 {
                 }
-
+                
                 if( !nRet )
                     nRet = static_cast< sal_IntPtr >( GetSystemData()->aWindow );
             }
diff --git a/vcl/source/window/keycod.cxx b/vcl/source/window/keycod.cxx
index bcc5536fd028..8e3ec3fca35c 100644
--- a/vcl/source/window/keycod.cxx
+++ b/vcl/source/window/keycod.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
@@ -101,9 +101,9 @@ KeyCode::KeyCode( const ResId& rResId )
     {
         pResMgr->Increment( sizeof( RSHEADER_TYPE ) );
 
-        ULONG nKeyCode  = pResMgr->ReadLong();
-        ULONG nModifier = pResMgr->ReadLong();
-        ULONG nKeyFunc  = pResMgr->ReadLong();
+        ULONG nKeyCode 	= pResMgr->ReadLong();
+        ULONG nModifier	= pResMgr->ReadLong();
+        ULONG nKeyFunc 	= pResMgr->ReadLong();
 
         eFunc = (KeyFuncType)nKeyFunc;
         if ( eFunc != KEYFUNC_DONTKNOW )
diff --git a/vcl/source/window/keyevent.cxx b/vcl/source/window/keyevent.cxx
index f4011b9be16e..35844f31867e 100644
--- a/vcl/source/window/keyevent.cxx
+++ b/vcl/source/window/keyevent.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
@@ -71,7 +71,7 @@ void KeyEvent::InitKeyEvent( ::com::sun::star::awt::KeyEvent& rEvent ) const
 }
 
 KeyEvent KeyEvent::LogicalTextDirectionality (TextDirectionality eMode) const
-{
+{ 
     KeyEvent aClone(*this);
 
     USHORT nCode = maKeyCode.GetCode();
@@ -91,11 +91,11 @@ KeyEvent KeyEvent::LogicalTextDirectionality (TextDirectionality eMode) const
             switch (nCode)
             {
                 case KEY_DOWN:  aClone.maKeyCode = KeyCode(KEY_RIGHT, nMod); break;
-                case KEY_UP:    aClone.maKeyCode = KeyCode(KEY_LEFT,  nMod); break;
-                case KEY_LEFT:  aClone.maKeyCode = KeyCode(KEY_DOWN,  nMod); break;
+                case KEY_UP:    aClone.maKeyCode = KeyCode(KEY_LEFT,  nMod); break; 
+                case KEY_LEFT:  aClone.maKeyCode = KeyCode(KEY_DOWN,  nMod); break; 
                 case KEY_RIGHT: aClone.maKeyCode = KeyCode(KEY_UP,    nMod); break;
             }
-            break;
+            break; 
 
         case TextDirectionality_LeftToRight_TopToBottom:
             /* do nothing */
diff --git a/vcl/source/window/menu.cxx b/vcl/source/window/menu.cxx
index fa6d9972d32a..9d88fe426cb1 100644
--- a/vcl/source/window/menu.cxx
+++ b/vcl/source/window/menu.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
@@ -80,9 +80,9 @@ namespace vcl
 
 struct MenuLayoutData : public ControlLayoutData
 {
-    std::vector< USHORT >               m_aLineItemIds;
-    std::vector< USHORT >               m_aLineItemPositions;
-    std::map< USHORT, Rectangle >       m_aVisibleItemBoundRects;
+    std::vector< USHORT >				m_aLineItemIds;
+    std::vector< USHORT >				m_aLineItemPositions;
+    std::map< USHORT, Rectangle >		m_aVisibleItemBoundRects;
 };
 
 }
@@ -113,8 +113,8 @@ static BOOL ImplHilite( const MouseEvent& rMEvt )
 
     // read XWP settings at program startup
     if (init == FALSE) {
-        BOOL    rc;
-        ULONG   cb = sizeof(HOOKCONFIG);
+        BOOL	rc;
+        ULONG 	cb = sizeof(HOOKCONFIG);
         memset(&hc, 0, sizeof(HOOKCONFIG));
         rc = PrfQueryProfileData( HINI_USER, INIAPP_XWPHOOK, INIKEY_HOOK_CONFIG,
             &hc, &cb);
@@ -147,29 +147,29 @@ static BOOL ImplAccelDisabled()
 
 struct MenuItemData
 {
-    USHORT          nId;                    // SV Id
-    MenuItemType    eType;                  // MenuItem-Type
-    MenuItemBits    nBits;                  // MenuItem-Bits
-    Menu*           pSubMenu;               // Pointer auf das SubMenu
-    Menu*           pAutoSubMenu;           // Pointer auf SubMenu aus Resource
-    XubString       aText;                  // Menu-Text
-    XubString       aHelpText;              // Help-String
-    XubString       aTipHelpText;           // TipHelp-String (eg, expanded filenames)
-    XubString       aCommandStr;            // CommandString
+    USHORT          nId;					// SV Id
+    MenuItemType    eType;					// MenuItem-Type
+    MenuItemBits    nBits;					// MenuItem-Bits
+    Menu*           pSubMenu;				// Pointer auf das SubMenu
+    Menu*           pAutoSubMenu;			// Pointer auf SubMenu aus Resource
+    XubString       aText;					// Menu-Text
+    XubString       aHelpText;				// Help-String
+    XubString       aTipHelpText;			// TipHelp-String (eg, expanded filenames)
+    XubString       aCommandStr;			// CommandString
     XubString       aHelpCommandStr;        // Help command string (to reference external help)
-    ULONG           nHelpId;                // Help-Id
-    ULONG           nUserValue;             // User value
-    Image           aImage;                 // Image
-    KeyCode         aAccelKey;              // Accelerator-Key
-    BOOL            bChecked;               // Checked
-    BOOL            bEnabled;               // Enabled
-    BOOL            bVisible;               // Visible (note: this flag will not override MENU_FLAG_HIDEDISABLEDENTRIES when true)
-    BOOL            bIsTemporary;           // Temporary inserted ('No selection possible')
-    BOOL            bMirrorMode;
-    long            nItemImageAngle;
-    Size            aSz;                    // nur temporaer gueltig
-    XubString       aAccessibleName;        // accessible name
-    XubString       aAccessibleDescription; // accessible description
+    ULONG           nHelpId;				// Help-Id
+    ULONG           nUserValue;				// User value
+    Image           aImage;					// Image
+    KeyCode         aAccelKey;				// Accelerator-Key
+    BOOL            bChecked;				// Checked
+    BOOL            bEnabled;				// Enabled
+    BOOL            bVisible;				// Visible (note: this flag will not override MENU_FLAG_HIDEDISABLEDENTRIES when true)
+    BOOL            bIsTemporary;			// Temporary inserted ('No selection possible')
+    BOOL			bMirrorMode;
+    long			nItemImageAngle;
+    Size            aSz;					// nur temporaer gueltig
+    XubString		aAccessibleName;		// accessible name
+    XubString		aAccessibleDescription;	// accessible description
 
     SalMenuItem*    pSalMenuItem;           // access to native menu
 
@@ -187,7 +187,7 @@ struct MenuItemData
             return bChecked || ( nBits & ( MIB_RADIOCHECK | MIB_CHECKABLE | MIB_AUTOCHECK ) );
         }
 };
-
+                    
 MenuItemData::~MenuItemData()
 {
     if( pAutoSubMenu )
@@ -224,7 +224,7 @@ public:
                         { return (MenuItemData*)List::GetObject( nPos ); }
 
     MenuItemData*   SearchItem( xub_Unicode cSelectChar, KeyCode aKeyCode, USHORT& rPos, USHORT& nDuplicates, USHORT nCurrentPos ) const;
-    USHORT          GetItemCount( xub_Unicode cSelectChar ) const;
+    USHORT			GetItemCount( xub_Unicode cSelectChar ) const;
     USHORT          GetItemCount( KeyCode aKeyCode ) const;
 
     uno::Reference< i18n::XCharacterClassification > GetCharClass() const;
@@ -246,20 +246,20 @@ MenuItemData* MenuItemList::Insert( USHORT nId, MenuItemType eType,
                                     const XubString& rStr, const Image& rImage,
                                     Menu* pMenu, USHORT nPos )
 {
-    MenuItemData* pData     = new MenuItemData( rStr, rImage );
-    pData->nId              = nId;
-    pData->eType            = eType;
-    pData->nBits            = nBits;
-    pData->pSubMenu         = NULL;
-    pData->pAutoSubMenu     = NULL;
-    pData->nHelpId          = 0;
-    pData->nUserValue       = 0;
-    pData->bChecked         = FALSE;
-    pData->bEnabled         = TRUE;
-    pData->bVisible         = TRUE;
-    pData->bIsTemporary     = FALSE;
-    pData->bMirrorMode      = FALSE;
-    pData->nItemImageAngle  = 0;
+    MenuItemData* pData		= new MenuItemData( rStr, rImage );
+    pData->nId          	= nId;
+    pData->eType        	= eType;
+    pData->nBits        	= nBits;
+    pData->pSubMenu     	= NULL;
+    pData->pAutoSubMenu 	= NULL;
+    pData->nHelpId      	= 0;
+    pData->nUserValue   	= 0;
+    pData->bChecked     	= FALSE;
+    pData->bEnabled     	= TRUE;
+    pData->bVisible     	= TRUE;
+    pData->bIsTemporary 	= FALSE;
+    pData->bMirrorMode		= FALSE;
+    pData->nItemImageAngle	= 0;
 
     SalItemParams aSalMIData;
     aSalMIData.nId = nId;
@@ -278,20 +278,20 @@ MenuItemData* MenuItemList::Insert( USHORT nId, MenuItemType eType,
 
 void MenuItemList::InsertSeparator( USHORT nPos )
 {
-    MenuItemData* pData     = new MenuItemData;
-    pData->nId              = 0;
-    pData->eType            = MENUITEM_SEPARATOR;
-    pData->nBits            = 0;
-    pData->pSubMenu         = NULL;
-    pData->pAutoSubMenu     = NULL;
-    pData->nHelpId          = 0;
-    pData->nUserValue       = 0;
-    pData->bChecked         = FALSE;
-    pData->bEnabled         = TRUE;
-    pData->bVisible         = TRUE;
-    pData->bIsTemporary     = FALSE;
-    pData->bMirrorMode      = FALSE;
-    pData->nItemImageAngle  = 0;
+    MenuItemData* pData		= new MenuItemData;
+    pData->nId          	= 0;
+    pData->eType        	= MENUITEM_SEPARATOR;
+    pData->nBits        	= 0;
+    pData->pSubMenu     	= NULL;
+    pData->pAutoSubMenu 	= NULL;
+    pData->nHelpId      	= 0;
+    pData->nUserValue   	= 0;
+    pData->bChecked     	= FALSE;
+    pData->bEnabled     	= TRUE;
+    pData->bVisible     	= TRUE;
+    pData->bIsTemporary 	= FALSE;
+    pData->bMirrorMode		= FALSE;
+    pData->nItemImageAngle	= 0;
 
     SalItemParams aSalMIData;
     aSalMIData.nId = 0;
@@ -337,7 +337,7 @@ MenuItemData* MenuItemList::SearchItem( xub_Unicode cSelectChar, KeyCode aKeyCod
     USHORT nListCount = (USHORT)Count();
 
     // try character code first
-    nDuplicates = GetItemCount( cSelectChar );  // return number of duplicates
+    nDuplicates = GetItemCount( cSelectChar );	// return number of duplicates
     if( nDuplicates )
     {
         for ( rPos = 0; rPos < nListCount; rPos++)
@@ -346,7 +346,7 @@ MenuItemData* MenuItemList::SearchItem( xub_Unicode cSelectChar, KeyCode aKeyCod
             if ( pData->bEnabled && rI18nHelper.MatchMnemonic( pData->aText, cSelectChar ) )
             {
                 if( nDuplicates > 1 && rPos == nCurrentPos )
-                    continue;   // select next entry with the same mnemonic
+                    continue;	// select next entry with the same mnemonic
                 else
                     return pData;
             }
@@ -354,7 +354,7 @@ MenuItemData* MenuItemList::SearchItem( xub_Unicode cSelectChar, KeyCode aKeyCod
     }
 
     // nothing found, try keycode instead
-    nDuplicates = GetItemCount( aKeyCode ); // return number of duplicates
+    nDuplicates = GetItemCount( aKeyCode );	// return number of duplicates
 
     if( nDuplicates )
     {
@@ -373,13 +373,13 @@ MenuItemData* MenuItemList::SearchItem( xub_Unicode cSelectChar, KeyCode aKeyCod
                     KeyCode mnKeyCode;
                     xub_Unicode mnUnicode = pData->aText.GetChar(n+1);
                     Window* pDefWindow = ImplGetDefaultWindow();
-                    if( (pDefWindow && pDefWindow->ImplGetFrame()->MapUnicodeToKeyCode( mnUnicode, Application::GetSettings().GetUILanguage(), mnKeyCode )
+                    if( (pDefWindow && pDefWindow->ImplGetFrame()->MapUnicodeToKeyCode( mnUnicode, Application::GetSettings().GetUILanguage(), mnKeyCode ) 
                         && aKeyCode.GetCode() == mnKeyCode.GetCode())
                         || (ascii && rI18nHelper.MatchMnemonic( pData->aText, ascii ) ) )
 
                     {
                         if( nDuplicates > 1 && rPos == nCurrentPos )
-                            continue;   // select next entry with the same mnemonic
+                            continue;	// select next entry with the same mnemonic
                         else
                             return pData;
                     }
@@ -429,7 +429,7 @@ USHORT MenuItemList::GetItemCount( KeyCode aKeyCode ) const
                 // if MapUnicodeToKeyCode fails or is unsupported we try the pure ascii mapping of the keycodes
                 // so we have working shortcuts when ascii mnemonics are used
                 Window* pDefWindow = ImplGetDefaultWindow();
-                if( (pDefWindow && pDefWindow->ImplGetFrame()->MapUnicodeToKeyCode( pData->aText.GetChar(n+1), Application::GetSettings().GetUILanguage(), mnKeyCode )
+                if( (pDefWindow && pDefWindow->ImplGetFrame()->MapUnicodeToKeyCode( pData->aText.GetChar(n+1), Application::GetSettings().GetUILanguage(), mnKeyCode ) 
                     && aKeyCode.GetCode() == mnKeyCode.GetCode())
                     || ( ascii && rI18nHelper.MatchMnemonic( pData->aText, ascii ) ) )
                     nItems++;
@@ -487,7 +487,7 @@ private:
                     DECL_LINK( ShowHideListener, VclWindowEvent* );
 
     void            StateChanged( StateChangedType nType );
-    void            DataChanged( const DataChangedEvent& rDCEvt );
+    void            DataChanged( const DataChangedEvent& rDCEvt );    
 protected:
     Region          ImplCalcClipRegion( BOOL bIncludeLogo = TRUE ) const;
     void            ImplInitClipRegion();
@@ -498,7 +498,7 @@ protected:
     void            ImplCursorUpDown( BOOL bUp, BOOL bHomeEnd = FALSE );
     void            ImplHighlightItem( const MouseEvent& rMEvt, BOOL bMBDown );
     long            ImplGetStartY() const;
-    Rectangle       ImplGetItemRect( USHORT nPos );
+    Rectangle		ImplGetItemRect( USHORT nPos );
 
 public:
                     MenuFloatingWindow( Menu* pMenu, Window* pParent, WinBits nStyle );
@@ -599,7 +599,7 @@ void DecoToolBox::calcMinSize()
     if( GetItemCount() == 0 )
     {
         ResMgr* pResMgr = ImplGetResMgr();
-
+    
         Bitmap aBitmap;
         if( pResMgr )
             aBitmap = Bitmap( ResId( SV_RESID_BITMAP_CLOSEDOC, *pResMgr ) );
@@ -615,7 +615,7 @@ void DecoToolBox::calcMinSize()
         }
     }
     aTbx.SetOutStyle( TOOLBOX_STYLE_FLAT );
-    maMinSize = aTbx.CalcWindowSizePixel();
+    maMinSize = aTbx.CalcWindowSizePixel(); 
 }
 
 Size DecoToolBox::getMinSize()
@@ -637,21 +637,21 @@ void DecoToolBox::SetImages( long nMaxHeight, bool bForce )
     {
         lastSize = nMaxHeight - border;
 
-        Color       aEraseColor( 255, 255, 255, 255 );
-        BitmapEx    aBmpExDst( maImage.GetBitmapEx() );
-        BitmapEx    aBmpExSrc( GetSettings().GetStyleSettings().GetHighContrastMode() ?
+        Color		aEraseColor( 255, 255, 255, 255 );
+        BitmapEx 	aBmpExDst( maImage.GetBitmapEx() );
+        BitmapEx 	aBmpExSrc( GetSettings().GetStyleSettings().GetHighContrastMode() ?
                               maImageHC.GetBitmapEx() : aBmpExDst );
-
+        
         aEraseColor.SetTransparency( 255 );
         aBmpExDst.Erase( aEraseColor );
         aBmpExDst.SetSizePixel( Size( lastSize, lastSize ) );
-
+        
         Rectangle aSrcRect( Point(0,0), maImage.GetSizePixel() );
-        Rectangle aDestRect( Point((lastSize - maImage.GetSizePixel().Width())/2,
-                                (lastSize - maImage.GetSizePixel().Height())/2 ),
+        Rectangle aDestRect( Point((lastSize - maImage.GetSizePixel().Width())/2, 
+                                (lastSize - maImage.GetSizePixel().Height())/2 ), 
                             maImage.GetSizePixel() );
 
-
+        
         aBmpExDst.CopyPixel( aDestRect, aSrcRect, &aBmpExSrc );
         SetItemImage( IID_DOCUMENTCLOSE, Image( aBmpExDst ) );
     }
@@ -675,7 +675,7 @@ private:
         USHORT      m_nId;
         Link        m_aSelectLink;
         Link        m_aHighlightLink;
-
+        
         AddButtonEntry() : m_nId( 0 ) {}
     };
 
@@ -685,12 +685,12 @@ private:
     ULONG           nSaveFocusId;
     BOOL            mbAutoPopup;
     BOOL            bIgnoreFirstMove;
-    BOOL            bStayActive;
+    BOOL			bStayActive;
 
     DecoToolBox     aCloser;
     PushButton      aFloatBtn;
     PushButton      aHideBtn;
-
+    
     std::map< USHORT, AddButtonEntry > m_aAddButtons;
 
     void            HighlightItem( USHORT nPos, BOOL bHighlight );
@@ -699,8 +699,8 @@ private:
     USHORT          ImplFindEntry( const Point& rMousePos ) const;
     void            ImplCreatePopup( BOOL bPreSelectFirst );
     BOOL            ImplHandleKeyEvent( const KeyEvent& rKEvent, BOOL bFromMenu = TRUE );
-    Rectangle       ImplGetItemRect( USHORT nPos );
-
+    Rectangle		ImplGetItemRect( USHORT nPos );
+    
     void            ImplInitStyleSettings();
 
                     DECL_LINK( CloserHdl, PushButton* );
@@ -741,7 +741,7 @@ public:
     void SetAutoPopup( BOOL bAuto ) { mbAutoPopup = bAuto; }
     void            ImplLayoutChanged();
     Size            MinCloseButtonSize();
-
+    
     // add an arbitrary button to the menubar (will appear next to closer)
     USHORT              AddMenuBarButton( const Image&, const Link&, const String&, USHORT nPos );
     void                SetMenuBarButtonHighlightHdl( USHORT nId, const Link& );
@@ -792,7 +792,7 @@ static BOOL ImplHandleHelpEvent( Window* pMenuWindow, Menu* pMenu, USHORT nHighl
 {
     if( ! pMenu )
         return FALSE;
-
+    
     BOOL bDone = FALSE;
     USHORT nId = 0;
 
@@ -845,7 +845,7 @@ static BOOL ImplHandleHelpEvent( Window* pMenuWindow, Menu* pMenu, USHORT nHighl
             // den Hilfe-Index
             String aCommand = pMenu->GetItemCommand( nId );
             ULONG  nHelpId  = pMenu->GetHelpId( nId );
-
+            
             if ( aCommand.Len() )
                 pHelp->Start( aCommand, NULL );
             else if ( nHelpId )
@@ -912,7 +912,7 @@ Menu::Menu( BOOL bMenubar )
 Menu::~Menu()
 {
     DBG_DTOR( Menu, NULL );
-
+    
     vcl::LazyDeletor<Menu>::Undelete( this );
 
     ImplCallEventListeners( VCLEVENT_OBJECT_DYING, ITEMPOS_INVALID );
@@ -977,7 +977,7 @@ void Menu::ImplInit()
     bCanceled       = FALSE;
     bInCallback     = FALSE;
     bKilled         = FALSE;
-    mpLayoutData    = NULL;
+    mpLayoutData	= NULL;
     mpFirstDel      = NULL;         // Dtor notification list
     // Native-support: returns NULL if not supported
     mpSalMenu = ImplGetSVData()->mpDefInst->CreateMenu( bIsMenuBar );
@@ -993,7 +993,7 @@ void Menu::ImplLoadRes( const ResId& rResId )
     ResMgr* pMgr = rResId.GetResMgr();
     if( ! pMgr )
         return;
-
+    
     rResId.SetRT( RSC_MENU );
     GetRes( rResId );
 
@@ -1102,7 +1102,7 @@ void Menu::Deactivate()
     if( !aDelData.isDeleted() )
     {
         bInCallback = FALSE;
-
+    
         if ( this == pStartMenu )
             GetpApp()->HideHelpStatusText();
     }
@@ -1282,7 +1282,7 @@ void Menu::InsertItem( const ResId& rResId, USHORT nPos )
     ResMgr* pMgr = rResId.GetResMgr();
     if( ! pMgr )
         return;
-
+    
     ULONG              nObjMask;
 
     GetRes( rResId.SetRT( RSC_MENUITEM ) );
@@ -1622,7 +1622,7 @@ void Menu::SetPopupMenu( USHORT nItemId, PopupMenu* pMenu )
 
     // data exchange
     pData->pSubMenu = pMenu;
-
+    
     // #112023# Make sure pStartedFrom does not point to invalid (old) data
     if ( pData->pSubMenu )
         pData->pSubMenu->pStartedFrom = 0;
@@ -1905,9 +1905,9 @@ void Menu::SetItemImage( USHORT nItemId, const Image& rImage )
 
 static inline Image ImplRotImage( const Image& rImage, long nAngle10 )
 {
-    Image       aRet;
-    BitmapEx    aBmpEx( rImage.GetBitmapEx() );
-
+    Image 		aRet;
+    BitmapEx	aBmpEx( rImage.GetBitmapEx() );
+    
     aBmpEx.Rotate( nAngle10, COL_WHITE );
 
     return Image( aBmpEx );
@@ -1932,9 +1932,9 @@ void Menu::SetItemImageAngle( USHORT nItemId, long nAngle10 )
 
 static inline Image ImplMirrorImage( const Image& rImage )
 {
-    Image       aRet;
-    BitmapEx    aBmpEx( rImage.GetBitmapEx() );
-
+    Image 		aRet;
+    BitmapEx	aBmpEx( rImage.GetBitmapEx() );
+    
     aBmpEx.Mirror( BMP_MIRROR_HORZ );
 
     return Image( aBmpEx );
@@ -2023,7 +2023,7 @@ const XubString& Menu::GetHelpCommand( USHORT nItemId ) const
     else
         return ImplGetSVEmptyStr();
 }
-
+    
 void Menu::SetHelpText( USHORT nItemId, const XubString& rStr )
 {
     MenuItemData* pData = pItemList->GetData( nItemId );
@@ -2038,7 +2038,7 @@ const XubString& Menu::ImplGetHelpText( USHORT nItemId ) const
 
     if ( pData )
     {
-        if ( !pData->aHelpText.Len() &&
+        if ( !pData->aHelpText.Len() && 
              (( pData->nHelpId  ) || ( pData->aCommandStr.Len() )))
         {
             Help* pHelp = Application::GetHelp();
@@ -2154,7 +2154,7 @@ BOOL Menu::ImplIsVisible( USHORT nPos ) const
             // check for separator
             if( pNextData && pNextData->bVisible && pNextData->eType == MENUITEM_SEPARATOR )
                 bVisible = FALSE;
-
+            
             if( bVisible )
             {
                 for( n = nPos; n > 0; n-- )
@@ -2174,7 +2174,7 @@ BOOL Menu::ImplIsVisible( USHORT nPos ) const
 
     // Fuer den Menubar nicht erlaubt, weil ich nicht mitbekomme
     // ob dadurch ein Eintrag verschwindet oder wieder da ist.
-    if ( bVisible && !bIsMenuBar && ( nMenuFlags & MENU_FLAG_HIDEDISABLEDENTRIES ) &&
+    if ( bVisible && !bIsMenuBar && ( nMenuFlags & MENU_FLAG_HIDEDISABLEDENTRIES ) && 
         !( nMenuFlags & MENU_FLAG_ALWAYSSHOWDISABLEDENTRIES ) )
     {
         if( !pData ) // e.g. nPos == ITEMPOS_INVALID
@@ -2212,7 +2212,7 @@ BOOL Menu::ImplIsSelectable( USHORT nPos ) const
     // check general visibility first
     if ( pData && ( pData->nBits & MIB_NOSELECT ) )
         bSelectable = FALSE;
-
+    
     return bSelectable;
 }
 
@@ -2257,14 +2257,14 @@ void Menu::SelectItem( USHORT nItemId )
 }
 
 void Menu::SetAccessible( const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >& rxAccessible )
-{
+{ 
     mxAccessible = rxAccessible;
 }
 
 long Menu::ImplGetNativeCheckAndRadioSize( Window* pWin, long& rCheckHeight, long& rRadioHeight, long &rMaxWidth ) const
 {
     rMaxWidth = rCheckHeight = rRadioHeight = 0;
-
+    
     if( ! bIsMenuBar )
     {
         ImplControlValue aVal;
@@ -2518,7 +2518,7 @@ Size Menu::ImplCalcSize( Window* pWin )
     {
         nTextPos = (USHORT)(2*nExtra);
         aSz.Height() = nFontHeight+6;
-
+        
         // get menubar height from native methods if supported
         if( pWindow->IsNativeControlSupported( CTRL_MENUBAR, PART_ENTIRE_CONTROL ) )
         {
@@ -2564,10 +2564,10 @@ static void ImplPaintCheckBackground( Window* i_pWindow, const Rectangle& i_rRec
         ImplControlValue    aControlValue;
         Rectangle           aCtrlRegion( i_rRect );
         ControlState        nState = CTRL_STATE_PRESSED | CTRL_STATE_ENABLED;
-
+        
         aControlValue.setTristateVal( BUTTONVALUE_ON );
-
-        bNativeOk = i_pWindow->DrawNativeControl( CTRL_TOOLBAR, PART_BUTTON,
+        
+        bNativeOk = i_pWindow->DrawNativeControl( CTRL_TOOLBAR, PART_BUTTON, 
                                                   aCtrlRegion, nState, aControlValue,
                                                   rtl::OUString() );
     }
@@ -2596,7 +2596,7 @@ void Menu::ImplPaint( Window* pWin, USHORT nBorder, long nStartY, MenuItemData*
 
     if ( pLogo )
         aTopLeft.X() = pLogo->aBitmap.GetSizePixel().Width();
-
+    
     int nOuterSpace = 0;
     if( !bIsMenuBar )
     {
@@ -2678,23 +2678,23 @@ void Menu::ImplPaint( Window* pWin, USHORT nBorder, long nStartY, MenuItemData*
                             ControlPart nPart = ((pData->nBits & MIB_RADIOCHECK)
                                                  ? PART_MENU_ITEM_RADIO_MARK
                                                  : PART_MENU_ITEM_CHECK_MARK);
-
+    
                             ControlState nState = 0;
-
+    
                             if ( pData->bChecked )
                                 nState |= CTRL_STATE_PRESSED;
-
+    
                             if ( pData->bEnabled )
                                 nState |= CTRL_STATE_ENABLED;
-
+    
                             if ( bHighlighted )
                                 nState |= CTRL_STATE_SELECTED;
-
+    
                             long nCtrlHeight = (pData->nBits & MIB_RADIOCHECK) ? nCheckHeight : nRadioHeight;
                             aTmpPos.X() = aOuterCheckRect.Left() + (aOuterCheckRect.GetWidth() - nCtrlHeight)/2;
                             aTmpPos.Y() = aOuterCheckRect.Top() + (aOuterCheckRect.GetHeight() - nCtrlHeight)/2;
-
-                            Rectangle aCheckRect( aTmpPos, Size( nCtrlHeight, nCtrlHeight ) );
+                            
+                            Rectangle aCheckRect( aTmpPos, Size( nCtrlHeight, nCtrlHeight ) );                            
                             pWin->DrawNativeControl( CTRL_MENU_POPUP, nPart,
                                                      aCheckRect,
                                                      nState,
@@ -2704,7 +2704,7 @@ void Menu::ImplPaint( Window* pWin, USHORT nBorder, long nStartY, MenuItemData*
                         else if ( pData->bChecked ) // by default do nothing for unchecked items
                         {
                             ImplPaintCheckBackground( pWin, aOuterCheckRect, pThisItemOnly && bHighlighted );
-
+                            
                             SymbolType eSymbol;
                             Size aSymbolSize;
                             if ( pData->nBits & MIB_RADIOCHECK )
@@ -3205,7 +3205,7 @@ BOOL Menu::GetSystemMenuData( SystemMenuData* pData ) const
 bool Menu::IsHighlighted( USHORT nItemPos ) const
 {
     bool bRet = false;
-
+    
     if( pWindow )
     {
         if( bIsMenuBar )
@@ -3213,7 +3213,7 @@ bool Menu::IsHighlighted( USHORT nItemPos ) const
         else
             bRet = ( nItemPos == static_cast< MenuFloatingWindow * > (pWindow)->GetHighlightedItem() );
     }
-
+    
     return bRet;
 }
 
@@ -3322,7 +3322,7 @@ Window* MenuBar::ImplCreate( Window* pParent, Window* pWindow, MenuBar* pMenu )
 
     // depending on the native implementation or the displayable flag
     // the menubar windows is supressed (ie, height=0)
-    if( !((MenuBar*) pMenu)->IsDisplayable() ||
+    if( !((MenuBar*) pMenu)->IsDisplayable() || 
         ( pMenu->ImplGetSalMenu() && pMenu->ImplGetSalMenu()->VisibleMenuBar() ) )
         nHeight = 0;
 
@@ -3346,7 +3346,7 @@ BOOL MenuBar::ImplHandleKeyEvent( const KeyEvent& rKEvent, BOOL bFromMenu )
     BOOL bDone = FALSE;
 
     // No keyboard processing when system handles the menu or our menubar is invisible
-    if( !IsDisplayable() ||
+    if( !IsDisplayable() || 
         ( ImplGetSalMenu() && ImplGetSalMenu()->VisibleMenuBar() ) )
         return bDone;
 
@@ -3391,11 +3391,11 @@ BOOL MenuBar::HandleMenuActivateEvent( Menu *pMenu ) const
         ImplMenuDelData aDelData( this );
 
         pMenu->pStartedFrom = (Menu*)this;
-        pMenu->bInCallback = TRUE;
+        pMenu->bInCallback = TRUE; 
         pMenu->Activate();
-
+    
         if( !aDelData.isDeleted() )
-            pMenu->bInCallback = FALSE;
+            pMenu->bInCallback = FALSE; 
     }
     return TRUE;
 }
@@ -3407,10 +3407,10 @@ BOOL MenuBar::HandleMenuDeActivateEvent( Menu *pMenu ) const
         ImplMenuDelData aDelData( this );
 
         pMenu->pStartedFrom = (Menu*)this;
-        pMenu->bInCallback = TRUE;
+        pMenu->bInCallback = TRUE; 
         pMenu->Deactivate();
         if( !aDelData.isDeleted() )
-            pMenu->bInCallback = FALSE;
+            pMenu->bInCallback = FALSE; 
     }
     return TRUE;
 }
@@ -3483,7 +3483,7 @@ void MenuBar::RemoveMenuBarButton( USHORT nId )
 
 BOOL MenuBar::HandleMenuButtonEvent( Menu *, USHORT i_nButtonId ) const
 {
-    return static_cast<MenuBarWindow*>(pWindow)->HandleMenuButtonEvent( i_nButtonId );
+    return static_cast<MenuBarWindow*>(pWindow)->HandleMenuButtonEvent( i_nButtonId ); 
 }
 
 // -----------------------------------------------------------------------
@@ -3770,7 +3770,7 @@ USHORT PopupMenu::ImplExecute( Window* pW, const Rectangle& rRect, ULONG nPopupM
     if ( bRealExecute )
     {
         pWin->ImplAddDel( &aDelData );
-
+        
         ImplDelData aModalWinDel;
         pW->ImplAddDel( &aModalWinDel );
         pW->ImplIncModalCount();
@@ -3942,7 +3942,7 @@ MenuFloatingWindow::MenuFloatingWindow( Menu* pMen, Window* pParent, WinBits nSt
     aSubmenuCloseTimer.SetTimeout( GetSettings().GetMouseSettings().GetMenuDelay() );
     aSubmenuCloseTimer.SetTimeoutHdl( LINK( this, MenuFloatingWindow, SubmenuClose ) );
     aScrollTimer.SetTimeoutHdl( LINK( this, MenuFloatingWindow, AutoScroll ) );
-
+    
     AddEventListener( LINK( this, MenuFloatingWindow, ShowHideListener ) );
 }
 
@@ -3954,7 +3954,7 @@ void MenuFloatingWindow::doShutdown()
         // otherwise the entry will not be read when the menu is opened again
         if( nHighlightedItem != ITEMPOS_INVALID )
             pMenu->ImplCallEventListeners( VCLEVENT_MENU_DEHIGHLIGHT, nHighlightedItem );
-
+    
         if( !bKeyInput && pMenu && pMenu->pStartedFrom && !pMenu->pStartedFrom->bIsMenuBar )
         {
             // #102461# remove highlight in parent
@@ -3973,12 +3973,12 @@ void MenuFloatingWindow::doShutdown()
                     pPWin->HighlightItem( i, FALSE );
             }
         }
-
+    
         // free the reference to the accessible component
         SetAccessible( ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >() );
-
+    
         aHighlightChangedTimer.Stop();
-
+    
         // #95056# invalidate screen area covered by system window
         // so this can be taken into account if the commandhandler performs a scroll operation
         if( GetParent() )
@@ -4046,7 +4046,7 @@ void MenuFloatingWindow::ImplHighlightItem( const MouseEvent& rMEvt, BOOL bMBDow
 {
     if( ! pMenu )
         return;
-
+    
     long nY = nScrollerHeight;
     long nMouseY = rMEvt.GetPosPixel().Y();
     Size aOutSz = GetOutputSizePixel();
@@ -4179,7 +4179,7 @@ IMPL_LINK( MenuFloatingWindow, HighlightChanged, Timer*, pTimer )
 {
     if( ! pMenu )
         return 0;
-
+    
     MenuItemData* pItemData = pMenu->pItemList->GetDataFromPos( nHighlightedItem );
     if ( pItemData )
     {
@@ -4255,7 +4255,7 @@ IMPL_LINK( MenuFloatingWindow, ShowHideListener, VclWindowEvent*, pEvent )
 {
     if( ! pMenu )
         return 0;
-
+    
     if( pEvent->GetId() == VCLEVENT_WINDOW_SHOW )
         pMenu->ImplCallEventListeners( VCLEVENT_MENU_SHOW, ITEMPOS_INVALID );
     else if( pEvent->GetId() == VCLEVENT_WINDOW_HIDE )
@@ -4358,7 +4358,7 @@ void MenuFloatingWindow::EndExecute()
             ImplGetSVData()->maWinData.mbNoDeactivate = FALSE;
         }
     }
-
+    
     // Wenn von woanders gestartet, dann ab dort aufraumen:
     MenuFloatingWindow* pCleanUpFrom = this;
     MenuFloatingWindow* pWin = this;
@@ -4482,7 +4482,7 @@ void MenuFloatingWindow::ImplScroll( BOOL bUp )
 {
     KillActivePopup();
     Update();
-
+    
     if( ! pMenu )
         return;
 
@@ -4647,7 +4647,7 @@ void MenuFloatingWindow::HighlightItem( USHORT nPos, BOOL bHighlight )
 {
     if( ! pMenu )
         return;
-
+    
     Size    aSz = GetOutputSizePixel();
     long    nStartY = ImplGetStartY();
     long    nY = nScrollerHeight+nStartY;
@@ -4658,7 +4658,7 @@ void MenuFloatingWindow::HighlightItem( USHORT nPos, BOOL bHighlight )
 
     int nOuterSpace = ImplGetSVData()->maNWFData.mnMenuFormatExtraBorder;
     nY += nOuterSpace;
-
+    
     USHORT nCount = (USHORT)pMenu->pItemList->Count();
     for ( USHORT n = 0; n < nCount; n++ )
     {
@@ -4678,7 +4678,7 @@ void MenuFloatingWindow::HighlightItem( USHORT nPos, BOOL bHighlight )
                     long nFontHeight = GetTextHeight();
                     aItemRect.Right() -= nFontHeight + nFontHeight/4;
                 }
-
+                
                 if( IsNativeControlSupported( CTRL_MENU_POPUP, PART_ENTIRE_CONTROL ) )
                 {
                     Size aPxSize( GetOutputSizePixel() );
@@ -4723,7 +4723,7 @@ void MenuFloatingWindow::HighlightItem( USHORT nPos, BOOL bHighlight )
                     }
                     else
                         SetFillColor( GetSettings().GetStyleSettings().GetMenuColor() );
-
+    
                     DrawRect( aItemRect );
                 }
                 pMenu->ImplPaint( this, nScrollerHeight, nStartY, pData, bHighlight );
@@ -4741,7 +4741,7 @@ Rectangle MenuFloatingWindow::ImplGetItemRect( USHORT nPos )
 {
     if( ! pMenu )
         return Rectangle();
-
+    
     Rectangle aRect;
     Size    aSz = GetOutputSizePixel();
     long    nStartY = ImplGetStartY();
@@ -4779,7 +4779,7 @@ void MenuFloatingWindow::ImplCursorUpDown( BOOL bUp, BOOL bHomeEnd )
 {
     if( ! pMenu )
         return;
-
+    
     const StyleSettings& rSettings = GetSettings().GetStyleSettings();
 
     USHORT n = nHighlightedItem;
@@ -5025,7 +5025,7 @@ void MenuFloatingWindow::Paint( const Rectangle& )
 {
     if( ! pMenu )
         return;
-
+    
     if( IsNativeControlSupported( CTRL_MENU_POPUP, PART_ENTIRE_CONTROL ) )
     {
         SetClipRegion();
@@ -5054,7 +5054,7 @@ void MenuFloatingWindow::ImplDrawScroller( BOOL bUp )
 {
     if( ! pMenu )
         return;
-
+    
     SetClipRegion();
 
     Size aOutSz = GetOutputSizePixel();
@@ -5165,30 +5165,30 @@ MenuBarWindow::MenuBarWindow( Window* pParent ) :
     {
         BitmapEx aBitmap( ResId( SV_RESID_BITMAP_CLOSEDOC, *pResMgr ) );
         BitmapEx aBitmapHC( ResId( SV_RESID_BITMAP_CLOSEDOCHC, *pResMgr ) );
-
+        
         aCloser.maImage = Image( aBitmap );
         aCloser.maImageHC = Image( aBitmapHC );
-
+        
         aCloser.SetOutStyle( TOOLBOX_STYLE_FLAT );
         aCloser.SetBackground();
         aCloser.SetPaintTransparent( TRUE );
         aCloser.SetParentClipMode( PARENTCLIPMODE_NOCLIP );
-
+        
         aCloser.InsertItem( IID_DOCUMENTCLOSE,
         GetSettings().GetStyleSettings().GetHighContrastMode() ? aCloser.maImageHC : aCloser.maImage, 0 );
         aCloser.SetSelectHdl( LINK( this, MenuBarWindow, CloserHdl ) );
         aCloser.AddEventListener( LINK( this, MenuBarWindow, ToolboxEventHdl ) );
         aCloser.SetQuickHelpText( IID_DOCUMENTCLOSE, XubString( ResId( SV_HELPTEXT_CLOSEDOCUMENT, *pResMgr ) ) );
-
+        
         aFloatBtn.SetClickHdl( LINK( this, MenuBarWindow, FloatHdl ) );
         aFloatBtn.SetSymbol( SYMBOL_FLOAT );
         aFloatBtn.SetQuickHelpText( XubString( ResId( SV_HELPTEXT_RESTORE, *pResMgr ) ) );
-
+        
         aHideBtn.SetClickHdl( LINK( this, MenuBarWindow, HideHdl ) );
         aHideBtn.SetSymbol( SYMBOL_HIDE );
         aHideBtn.SetQuickHelpText( XubString( ResId( SV_HELPTEXT_MINIMIZE, *pResMgr ) ) );
     }
-
+    
     ImplInitStyleSettings();
 
     AddEventListener( LINK( this, MenuBarWindow, ShowHideListener ) );
@@ -5243,7 +5243,7 @@ IMPL_LINK( MenuBarWindow, CloserHdl, PushButton*, EMPTYARG )
 {
     if( ! pMenu )
         return 0;
-
+    
     if( aCloser.GetCurItemId() == IID_DOCUMENTCLOSE )
     {
         // #i106052# call close hdl asynchronously to ease handler implementation
@@ -5270,7 +5270,7 @@ IMPL_LINK( MenuBarWindow, ToolboxEventHdl, VclWindowEvent*, pEvent )
 {
     if( ! pMenu )
         return 0;
-
+    
     MenuBar::MenuBarButtonCallbackArg aArg;
     aArg.nId = 0xffff;
     aArg.bHighlight = (pEvent->GetId() == VCLEVENT_TOOLBOX_HIGHLIGHT);
@@ -5294,7 +5294,7 @@ IMPL_LINK( MenuBarWindow, ShowHideListener, VclWindowEvent*, pEvent )
 {
     if( ! pMenu )
         return 0;
-
+    
     if( pEvent->GetId() == VCLEVENT_WINDOW_SHOW )
         pMenu->ImplCallEventListeners( VCLEVENT_MENU_SHOW, ITEMPOS_INVALID );
     else if( pEvent->GetId() == VCLEVENT_WINDOW_HIDE )
@@ -5432,7 +5432,7 @@ void MenuBarWindow::MouseMove( const MouseEvent& rMEvt )
     }
 
     USHORT nEntry = ImplFindEntry( rMEvt.GetPosPixel() );
-    if ( ( nEntry != ITEMPOS_INVALID )
+    if ( ( nEntry != ITEMPOS_INVALID ) 
 #ifdef OS2
        && ( ImplHilite(rMEvt) )
 #endif
@@ -5444,7 +5444,7 @@ void MenuBarWindow::ChangeHighlightItem( USHORT n, BOOL bSelectEntry, BOOL bAllo
 {
     if( ! pMenu )
         return;
-
+    
     // #57934# ggf. das aktive Popup sofort schliessen, damit TH's Hintergrundsicherung funktioniert.
     MenuItemData* pNextData = pMenu->pItemList->GetDataFromPos( n );
     if ( pActivePopup && pActivePopup->ImplGetWindow() && ( !pNextData || ( pActivePopup != pNextData->pSubMenu ) ) )
@@ -5465,10 +5465,10 @@ void MenuBarWindow::ChangeHighlightItem( USHORT n, BOOL bSelectEntry, BOOL bAllo
                 if( !ImplGetSVData()->maWinData.mbNoSaveFocus )
                 {
                     // we didn't clean up last time
-                    Window::EndSaveFocus( nSaveFocusId, FALSE );    // clean up
+                    Window::EndSaveFocus( nSaveFocusId, FALSE );	// clean up
                     nSaveFocusId = 0;
                     if( !bNoSaveFocus )
-                        nSaveFocusId = Window::SaveFocus(); // only save focus when initially activated
+                        nSaveFocusId = Window::SaveFocus();	// only save focus when initially activated
                 }
                 else {
                     ; // do nothing: we 're activated again from taskpanelist, focus was already saved
@@ -5477,7 +5477,7 @@ void MenuBarWindow::ChangeHighlightItem( USHORT n, BOOL bSelectEntry, BOOL bAllo
             else
             {
                 if( !bNoSaveFocus )
-                    nSaveFocusId = Window::SaveFocus(); // only save focus when initially activated
+                    nSaveFocusId = Window::SaveFocus();	// only save focus when initially activated
             }
         }
         else
@@ -5527,7 +5527,7 @@ void MenuBarWindow::HighlightItem( USHORT nPos, BOOL bHighlight )
 {
     if( ! pMenu )
         return;
-
+    
     long nX = 0;
     ULONG nCount = pMenu->pItemList->Count();
     for ( ULONG n = 0; n < nCount; n++ )
@@ -5558,7 +5558,7 @@ void MenuBarWindow::HighlightItem( USHORT nPos, BOOL bHighlight )
                                            aControlValue,
                                            OUString() );
                         ImplAddNWFSeparator( this, aControlValue );
-
+                        
                         // draw selected item
                         DrawNativeControl( CTRL_MENUBAR, PART_MENU_ITEM,
                                            aRect,
@@ -5618,7 +5618,7 @@ Rectangle MenuBarWindow::ImplGetItemRect( USHORT nPos )
                     aRect = Rectangle( Point( nX, 1 ), Size( pData->aSz.Width(), GetOutputSizePixel().Height()-2 ) );
                 break;
             }
-
+    
             nX += pData->aSz.Width();
         }
     }
@@ -5635,7 +5635,7 @@ BOOL MenuBarWindow::ImplHandleKeyEvent( const KeyEvent& rKEvent, BOOL bFromMenu
 {
     if( ! pMenu )
         return FALSE;
-
+    
     if ( pMenu->bInCallback )
         return TRUE;    // schlucken
 
@@ -5681,7 +5681,7 @@ BOOL MenuBarWindow::ImplHandleKeyEvent( const KeyEvent& rKEvent, BOOL bFromMenu
                 else
                     n = pMenu->GetItemCount()-1;
             }
-
+            
             // handling gtk like (aka mbOpenMenuOnF10)
             // do not highlight an item when opening a sub menu
             // unless there already was a higlighted sub menu item
@@ -5805,7 +5805,7 @@ void MenuBarWindow::Paint( const Rectangle& )
 {
     if( ! pMenu )
         return;
-
+    
     // no VCL paint if native menus
     if( pMenu->ImplGetSalMenu() && pMenu->ImplGetSalMenu()->VisibleMenuBar() )
     {
@@ -5935,7 +5935,7 @@ void MenuBarWindow::ImplLayoutChanged()
 
         // depending on the native implementation or the displayable flag
         // the menubar windows is supressed (ie, height=0)
-        if( !((MenuBar*) pMenu)->IsDisplayable() ||
+        if( !((MenuBar*) pMenu)->IsDisplayable() || 
             ( pMenu->ImplGetSalMenu() && pMenu->ImplGetSalMenu()->VisibleMenuBar() ) )
             nHeight = 0;
 
@@ -6011,7 +6011,7 @@ USHORT MenuBarWindow::AddMenuBarButton( const Image& i_rImage, const Link& i_rLi
     std::map< USHORT, AddButtonEntry >::const_iterator it;
     if( i_nPos > m_aAddButtons.size() )
         i_nPos = static_cast<USHORT>(m_aAddButtons.size());
-    do
+    do 
     {
         nId++;
         it = m_aAddButtons.find( nId );
@@ -6026,10 +6026,10 @@ USHORT MenuBarWindow::AddMenuBarButton( const Image& i_rImage, const Link& i_rLi
                  aFloatBtn.IsVisible(),
                  aHideBtn.IsVisible() );
     ImplLayoutChanged();
-
+    
     if( pMenu->mpSalMenu )
         pMenu->mpSalMenu->AddMenuBarButton( SalMenuButtonItem( nId, i_rImage, i_rToolTip ) );
-
+    
     return nId;
 }
 
@@ -6054,7 +6054,7 @@ Rectangle MenuBarWindow::GetMenuBarButtonRectPixel( USHORT nId )
                 return Rectangle();
             }
         }
-
+        
         if( aRect.IsEmpty() )
         {
             aRect = aCloser.GetItemRect( nId );
diff --git a/vcl/source/window/mnemonic.cxx b/vcl/source/window/mnemonic.cxx
index c2c6c18135f2..fecb265aba9e 100644
--- a/vcl/source/window/mnemonic.cxx
+++ b/vcl/source/window/mnemonic.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
@@ -344,7 +344,7 @@ BOOL MnemonicGenerator::CreateMnemonic( XubString& rKey )
 //        do
 //        {
 //            c = aKey.GetChar( nIndex );
-//
+//            
 //            nMnemonicIndex = ImplGetMnemonicIndex( c );
 //            if ( nMnemonicIndex != MNEMONIC_INDEX_NOTFOUND )
 //            {
@@ -353,7 +353,7 @@ BOOL MnemonicGenerator::CreateMnemonic( XubString& rKey )
 //                bChanged = TRUE;
 //                break;
 //            }
-//
+//            
 //            // Search for next word
 //            do
 //            {
@@ -387,7 +387,7 @@ String MnemonicGenerator::EraseAllMnemonicChars( const String& rStr )
     String      aStr = rStr;
     xub_StrLen  nLen = aStr.Len();
     xub_StrLen  i    = 0;
-
+    
     while ( i < nLen )
     {
         if ( aStr.GetChar( i ) == '~' )
@@ -396,8 +396,8 @@ String MnemonicGenerator::EraseAllMnemonicChars( const String& rStr )
             if( i > 0 && (i+2) < nLen )
             {
                 sal_Unicode c = aStr.GetChar(i+1);
-                if( aStr.GetChar( i-1 ) == '(' &&
-                    aStr.GetChar( i+2 ) == ')' &&
+                if( aStr.GetChar( i-1 ) == '(' && 
+                    aStr.GetChar( i+2 ) == ')' && 
                     c >= MNEMONIC_RANGE_2_START && c <= MNEMONIC_RANGE_2_END )
                 {
                     aStr.Erase( i-1, 4 );
diff --git a/vcl/source/window/mnemonicengine.cxx b/vcl/source/window/mnemonicengine.cxx
index 241aea1cf336..673537b26a37 100644
--- a/vcl/source/window/mnemonicengine.cxx
+++ b/vcl/source/window/mnemonicengine.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
diff --git a/vcl/source/window/mouseevent.cxx b/vcl/source/window/mouseevent.cxx
index 4bfe08b3f3d8..e5e6f6a8ec00 100644
--- a/vcl/source/window/mouseevent.cxx
+++ b/vcl/source/window/mouseevent.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
diff --git a/vcl/source/window/msgbox.cxx b/vcl/source/window/msgbox.cxx
index 7f7a65cd7fb9..b122aa170965 100644
--- a/vcl/source/window/msgbox.cxx
+++ b/vcl/source/window/msgbox.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
@@ -73,11 +73,11 @@ static void ImplInitMsgBoxImageList()
 
 void MessBox::ImplInitMessBoxData()
 {
-    mpFixedText         = NULL;
-    mpFixedImage        = NULL;
-    mnSoundType         = 0;
-    mbHelpBtn           = FALSE;
-    mbSound             = TRUE;
+    mpFixedText 		= NULL;
+    mpFixedImage		= NULL;
+    mnSoundType 		= 0;
+    mbHelpBtn			= FALSE;
+    mbSound 			= TRUE;
     mpCheckBox          = NULL;
     mbCheck             = FALSE;
 }
@@ -87,11 +87,11 @@ void MessBox::ImplInitMessBoxData()
 void MessBox::ImplInitButtons()
 {
     WinBits nStyle = GetStyle();
-    USHORT  nOKFlags = BUTTONDIALOG_OKBUTTON;
-    USHORT  nCancelFlags = BUTTONDIALOG_CANCELBUTTON;
-    USHORT  nRetryFlags = 0;
-    USHORT  nYesFlags = 0;
-    USHORT  nNoFlags = 0;
+    USHORT	nOKFlags = BUTTONDIALOG_OKBUTTON;
+    USHORT	nCancelFlags = BUTTONDIALOG_CANCELBUTTON;
+    USHORT	nRetryFlags = 0;
+    USHORT	nYesFlags = 0;
+    USHORT	nNoFlags = 0;
 
     if ( nStyle & WB_OK_CANCEL )
     {
@@ -192,13 +192,13 @@ MessBox::MessBox( Window* pParent, const ResId& rResId ) :
     ImplInitMessBoxData();
 
     GetRes( rResId.SetRT( RSC_MESSBOX ) );
-    USHORT nHiButtons   = ReadShortRes();
-    USHORT nLoButtons   = ReadShortRes();
+    USHORT nHiButtons	= ReadShortRes();
+    USHORT nLoButtons	= ReadShortRes();
     USHORT nHiDefButton = ReadShortRes();
     USHORT nLoDefButton = ReadShortRes();
-    USHORT nHiHelpId    = ReadShortRes();
-    USHORT nLoHelpId    = ReadShortRes();
-    /* USHORT bSysModal = */ ReadShortRes();
+    USHORT nHiHelpId	= ReadShortRes();
+    USHORT nLoHelpId	= ReadShortRes();
+    /* USHORT bSysModal	= */ ReadShortRes();
     SetHelpId( ((ULONG)nHiHelpId << 16) + nLoHelpId );
     WinBits nBits = (((ULONG)nHiButtons << 16) + nLoButtons) |
                     (((ULONG)nHiDefButton << 16) + nLoDefButton);
@@ -250,21 +250,21 @@ void MessBox::ImplPosControls()
         }
     }
 
-    XubString       aMessText( maMessText );
-    TextRectInfo    aTextInfo;
-    Rectangle       aRect( 0, 0, 30000, 30000 );
-    Rectangle       aFormatRect;
-    Point           aTextPos( IMPL_DIALOG_OFFSET, IMPL_DIALOG_OFFSET+IMPL_MSGBOX_OFFSET_EXTRA_Y );
-    Size            aImageSize;
-    Size            aPageSize;
-    Size            aFixedSize;
-    long            nTitleWidth;
-    long            nButtonSize = ImplGetButtonSize();
-    long            nMaxWidth = GetDesktopRectPixel().GetWidth()-8;
-    long            nMaxLineWidth;
-    long            nWidth;
-    WinBits         nWinStyle = WB_LEFT | WB_WORDBREAK | WB_NOLABEL | WB_INFO;
-    USHORT          nTextStyle = TEXT_DRAW_MULTILINE | TEXT_DRAW_TOP | TEXT_DRAW_LEFT;
+    XubString		aMessText( maMessText );
+    TextRectInfo	aTextInfo;
+    Rectangle		aRect( 0, 0, 30000, 30000 );
+    Rectangle		aFormatRect;
+    Point			aTextPos( IMPL_DIALOG_OFFSET, IMPL_DIALOG_OFFSET+IMPL_MSGBOX_OFFSET_EXTRA_Y );
+    Size			aImageSize;
+    Size			aPageSize;
+    Size			aFixedSize;
+    long			nTitleWidth;
+    long			nButtonSize = ImplGetButtonSize();
+    long			nMaxWidth = GetDesktopRectPixel().GetWidth()-8;
+    long			nMaxLineWidth;
+    long			nWidth;
+    WinBits 		nWinStyle = WB_LEFT | WB_WORDBREAK | WB_NOLABEL | WB_INFO;
+    USHORT			nTextStyle = TEXT_DRAW_MULTILINE | TEXT_DRAW_TOP | TEXT_DRAW_LEFT;
 
     if ( mpFixedText )
         delete mpFixedText;
@@ -282,8 +282,8 @@ void MessBox::ImplPosControls()
 
 
     // Message-Text um Tabs bereinigen
-    XubString   aTabStr( RTL_CONSTASCII_USTRINGPARAM( "    " ) );
-    USHORT      nIndex = 0;
+    XubString	aTabStr( RTL_CONSTASCII_USTRINGPARAM( "    " ) );
+    USHORT		nIndex = 0;
     while ( nIndex != STRING_NOTFOUND )
         nIndex = aMessText.SearchAndReplace( '\t', aTabStr, nIndex );
 
@@ -307,7 +307,7 @@ void MessBox::ImplPosControls()
     aImageSize = maImage.GetSizePixel();
     if ( aImageSize.Width() )
     {
-        aImageSize.Width()  += 4;
+        aImageSize.Width()	+= 4;
         aImageSize.Height() += 4;
         aTextPos.X() += aImageSize.Width()+IMPL_SEP_MSGBOX_IMAGE;
         mpFixedImage = new FixedImage( this );
@@ -351,19 +351,19 @@ void MessBox::ImplPosControls()
     }
 
     // Style fuer FixedText ermitteln
-    aPageSize.Width()   = aImageSize.Width();
-    aFixedSize.Width()  = aTextInfo.GetMaxLineWidth()+1;
+    aPageSize.Width()	= aImageSize.Width();
+    aFixedSize.Width()	= aTextInfo.GetMaxLineWidth()+1;
     aFixedSize.Height() = aFormatRect.GetHeight();
     if ( aFixedSize.Height() < aImageSize.Height() )
     {
         nWinStyle |= WB_VCENTER;
-        aPageSize.Height()  = aImageSize.Height();
+        aPageSize.Height()	= aImageSize.Height();
         aFixedSize.Height() = aImageSize.Height();
     }
     else
     {
         nWinStyle |= WB_TOP;
-        aPageSize.Height()  = aFixedSize.Height();
+        aPageSize.Height()	= aFixedSize.Height();
     }
     if ( aImageSize.Width() )
         aPageSize.Width() += IMPL_SEP_MSGBOX_IMAGE;
@@ -588,7 +588,7 @@ void ErrorBox::ImplInitErrorBoxData()
     if ( !GetText().Len() )
         SetText( Application::GetDisplayName() );
 
-    SetImage( GetSettings().GetStyleSettings().GetHighContrastMode() ?
+    SetImage( GetSettings().GetStyleSettings().GetHighContrastMode() ? 
         ErrorBox::GetStandardImageHC() : ErrorBox::GetStandardImage() );
     mnSoundType = ((USHORT)SOUND_ERROR)+1;
 }
diff --git a/vcl/source/window/popupmenuwindow.cxx b/vcl/source/window/popupmenuwindow.cxx
index 78ef0bcf1068..3a5e750181f0 100644
--- a/vcl/source/window/popupmenuwindow.cxx
+++ b/vcl/source/window/popupmenuwindow.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
diff --git a/vcl/source/window/printdlg.cxx b/vcl/source/window/printdlg.cxx
index d0fae33acf3b..38d6e219955d 100644
--- a/vcl/source/window/printdlg.cxx
+++ b/vcl/source/window/printdlg.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
@@ -167,7 +167,7 @@ void PrintDialog::PrintPreviewWindow::Resize()
     aNewSize.Height() -= 2;
     Size aScaledSize;
     double fScale = 1.0;
-
+    
     // #i106435# catch corner case of Size(0,0)
     Size aOrigSize( maOrigSize );
     if( aOrigSize.Width() < 1 )
@@ -188,9 +188,9 @@ void PrintDialog::PrintPreviewWindow::Resize()
     }
     aScaledSize.Width() = long(aScaledSize.Width()*fScale);
     aScaledSize.Height() = long(aScaledSize.Height()*fScale);
-
+    
     maPreviewSize = aScaledSize;
-
+    
     // #i104784# if we render the page too small then rounding issues result in
     // layout artifacts looking really bad. So scale the page unto a device that is not
     // full page size but not too small either. This also results in much better visual
@@ -204,7 +204,7 @@ void PrintDialog::PrintPreviewWindow::Resize()
         aScaledSize.Height() *= 2;
         fZoom /= 2.0;
     }
-
+    
     maPageVDev.SetOutputSizePixel( aScaledSize, FALSE );
 }
 
@@ -232,10 +232,10 @@ void PrintDialog::PrintPreviewWindow::Paint( const Rectangle& )
     else
     {
         GDIMetaFile aMtf( maMtf );
-
+    
         Point aOffset( (aSize.Width() - maPreviewSize.Width()) / 2,
                        (aSize.Height() - maPreviewSize.Height()) / 2 );
-
+    
         Size aVDevSize( maPageVDev.GetOutputSizePixel() );
         const Size aLogicSize( maPageVDev.PixelToLogic( aVDevSize, MapMode( MAP_100TH_MM ) ) );
         Size aOrigSize( maOrigSize );
@@ -244,8 +244,8 @@ void PrintDialog::PrintPreviewWindow::Paint( const Rectangle& )
         if( aOrigSize.Height() < 1 )
             aOrigSize.Height() = aLogicSize.Height();
         double fScale = double(aLogicSize.Width())/double(aOrigSize.Width());
-
-
+    
+    
         maPageVDev.Erase();
         maPageVDev.Push();
         maPageVDev.SetMapMode( MAP_100TH_MM );
@@ -254,11 +254,11 @@ void PrintDialog::PrintPreviewWindow::Paint( const Rectangle& )
         aMtf.WindStart();
         aMtf.Play( &maPageVDev, Point( 0, 0 ), aLogicSize );
         maPageVDev.Pop();
-
+        
         SetMapMode( MAP_PIXEL );
         maPageVDev.SetMapMode( MAP_PIXEL );
         DrawOutDev( aOffset, maPreviewSize, Point( 0, 0 ), aVDevSize, maPageVDev );
-
+        
         DecorationView aVw( this );
         Rectangle aFrame( aOffset + Point( -1, -1 ), Size( maPreviewSize.Width() + 2, maPreviewSize.Height() + 2 ) );
         aVw.DrawFrame( aFrame, FRAME_DRAW_GROUP );
@@ -339,7 +339,7 @@ void PrintDialog::ShowNupOrderWindow::Paint( const Rectangle& i_rRect )
     Window::Paint( i_rRect );
     SetMapMode( MAP_PIXEL );
     SetTextColor( GetSettings().GetStyleSettings().GetFieldTextColor() );
-
+    
     int nPages = mnRows * mnColumns;
     Font aFont( GetSettings().GetStyleSettings().GetFieldFont() );
     aFont.SetSize( Size( 0, 24 ) );
@@ -355,7 +355,7 @@ void PrintDialog::ShowNupOrderWindow::Paint( const Rectangle& i_rRect )
     long nFontHeight = long(24.0*fScale) - 3;
     if( nFontHeight < 5 )
         nFontHeight = 5;
-    aFont.SetSize( Size( 0, nFontHeight ) );
+    aFont.SetSize( Size( 0, nFontHeight ) );   
     SetFont( aFont );
     long nTextHeight = GetTextHeight();
     for( int i = 0; i < nPages; i++ )
@@ -407,11 +407,11 @@ PrintDialog::NUpTabPage::NUpTabPage( Window* i_pParent, const ResId& rResId )
     , maBorderCB( this, VclResId( SV_PRINT_PRT_NUP_BORDER_CB ) )
 {
     FreeResource();
-
+    
     maNupOrderWin.Show();
     maPagesBtn.Check( TRUE );
     maBrochureBtn.Show( FALSE );
-
+    
     // setup field units for metric fields
     const LocaleDataWrapper& rLocWrap( maPageMarginEdt.GetLocaleDataWrapper() );
     FieldUnit eUnit = FUNIT_MM;
@@ -428,7 +428,7 @@ PrintDialog::NUpTabPage::NUpTabPage( Window* i_pParent, const ResId& rResId )
     // set precision
     maPageMarginEdt.SetDecimalDigits( nDigits );
     maSheetMarginEdt.SetDecimalDigits( nDigits );
-
+    
     SMHID1( "NUpPage" );
     maNupLine.SMHID2("NUpPage", "Layout");
     maBrochureBtn.SMHID2("NUpPage", "Brochure" );
@@ -436,7 +436,7 @@ PrintDialog::NUpTabPage::NUpTabPage( Window* i_pParent, const ResId& rResId )
     maPagesBoxTitleTxt.SMHID2( "NUpPage", "PagesPerSheetLabel" );
     maNupPagesBox.SMHID2( "NUpPage", "PagesPerSheetBox" );
     maNupNumPagesTxt.SMHID2( "NUpPage", "Columns" );
-    maNupColEdt.SMHID2( "NUpPage", "ColumnsBox" );
+    maNupColEdt.SMHID2( "NUpPage", "ColumnsBox" );            
     maNupTimesTxt.SMHID2( "NUpPage", "Rows" );
     maNupRowsEdt.SMHID2( "NUpPage", "RowsBox" );
     maPageMarginTxt1.SMHID2( "NUpPage", "PageMargin" );
@@ -505,7 +505,7 @@ void PrintDialog::NUpTabPage::setupLayout()
 
     maLayout.setParentWindow( this );
     maLayout.setOuterBorder( aBorder.Width() );
-
+    
     maLayout.addWindow( &maNupLine );
     boost::shared_ptr< vcl::RowOrColumn > xRow( new vcl::RowOrColumn( &maLayout, false ) );
     maLayout.addChild( xRow );
@@ -518,12 +518,12 @@ void PrintDialog::NUpTabPage::setupLayout()
     boost::shared_ptr< vcl::Spacer > xSpacer( new vcl::Spacer( xShowNupCol.get() ) );
     xShowNupCol->addChild( xSpacer );
 
-    boost::shared_ptr< vcl::LabelColumn > xMainCol( new vcl::LabelColumn( xIndent.get() ) );
+    boost::shared_ptr< vcl::LabelColumn > xMainCol( new vcl::LabelColumn( xIndent.get() ) );    
     xIndent->setChild( xMainCol );
-
+    
     size_t nPagesIndex = xMainCol->addRow( &maPagesBtn, &maNupPagesBox );
     mxPagesBtnLabel = boost::dynamic_pointer_cast<vcl::LabeledElement>( xMainCol->getChild( nPagesIndex ) );
-
+    
     xRow.reset( new vcl::RowOrColumn( xMainCol.get(), false ) );
     xMainCol->addRow( &maNupNumPagesTxt, xRow, nIndent );
     xRow->addWindow( &maNupColEdt );
@@ -534,16 +534,16 @@ void PrintDialog::NUpTabPage::setupLayout()
     xLab->setLabel( &maPageMarginEdt );
     xLab->setElement( &maPageMarginTxt2 );
     xMainCol->addRow( &maPageMarginTxt1, xLab, nIndent );
-
+    
     xLab.reset( new vcl::LabeledElement( xMainCol.get(), 2 ) );
     xLab->setLabel( &maSheetMarginEdt );
     xLab->setElement( &maSheetMarginTxt2 );
     xMainCol->addRow( &maSheetMarginTxt1, xLab, nIndent );
 
     xMainCol->addRow( &maNupOrientationTxt, &maNupOrientationBox, nIndent );
-    xMainCol->addRow( &maNupOrderTxt, &maNupOrderBox, nIndent );
+    xMainCol->addRow( &maNupOrderTxt, &maNupOrderBox, nIndent );    
     xMainCol->setBorders( xMainCol->addWindow( &maBorderCB ), nIndent, 0, 0, 0 );
-
+    
     xSpacer.reset( new vcl::Spacer( xMainCol.get(), 0, Size( 10, aBorder.Width() ) ) );
     xMainCol->addChild( xSpacer );
 
@@ -551,7 +551,7 @@ void PrintDialog::NUpTabPage::setupLayout()
     xMainCol->addRow( &maBrochureBtn, xRow );
     // remember brochure row for dependencies
     mxBrochureDep = xRow;
-
+    
     // initially advanced controls are not shown, rows=columns=1
     showAdvancedControls( false );
 }
@@ -622,12 +622,12 @@ PrintDialog::JobTabPage::JobTabPage( Window* i_pParent, const ResId& rResId )
     maCopyCountField.SMHID2( "JobPage", "Copies" );
     maCollateBox.SMHID2( "JobPage", "Collate" );
     maCollateImage.SMHID2( "JobPage", "CollateImage" );
-
+    
     maCopySpacer.Show();
     maStatusTxt.Show();
     maCommentTxt.Show();
     maLocationTxt.Show();
-
+    
     setupLayout();
 }
 
@@ -640,7 +640,7 @@ void PrintDialog::JobTabPage::setupLayout()
     // HACK: this is not a dropdown box, but the dropdown line count
     // sets the results of GetOptimalSize in a normal ListBox
     maPrinters.SetDropDownLineCount( 4 );
-
+    
     Size aBorder( LogicToPixel( Size( 5, 5 ), MapMode( MAP_APPFONT ) ) );
 
     maLayout.setParentWindow( this );
@@ -655,9 +655,9 @@ void PrintDialog::JobTabPage::setupLayout()
     boost::shared_ptr< vcl::RowOrColumn > xDetRow( new vcl::RowOrColumn( &maLayout, false ) );
     maLayout.addChild( xDetRow );
     xDetRow->addWindow( &maDetailsBtn );
-    xDetRow->addChild( new vcl::Spacer( xDetRow.get(), 2 ) );
+    xDetRow->addChild( new vcl::Spacer( xDetRow.get(), 2 ) );    
     xDetRow->addWindow( &maSetupButton );
-
+    
     // create an indent for details
     boost::shared_ptr< vcl::Indenter > xIndent( new vcl::Indenter( &maLayout ) );
     maLayout.addChild( xIndent );
@@ -674,7 +674,7 @@ void PrintDialog::JobTabPage::setupLayout()
     maLayout.addWindow( &maCopies );
     boost::shared_ptr< vcl::RowOrColumn > xRangeRow( new vcl::RowOrColumn( &maLayout, false, aBorder.Width() ) );
     maLayout.addChild( xRangeRow );
-
+    
     // create print range and add to range row
     mxPrintRange.reset( new vcl::RowOrColumn( xRangeRow.get() ) );
     xRangeRow->addChild( mxPrintRange );
@@ -682,7 +682,7 @@ void PrintDialog::JobTabPage::setupLayout()
 
     boost::shared_ptr< vcl::RowOrColumn > xCopyCollateCol( new vcl::RowOrColumn( xRangeRow.get() ) );
     xRangeRow->addChild( xCopyCollateCol );
-
+    
     // add copies row to copy/collate column
     boost::shared_ptr< vcl::LabeledElement > xCopiesRow( new vcl::LabeledElement( xCopyCollateCol.get(), 2 ) );
     xCopyCollateCol->addChild( xCopiesRow );
@@ -701,7 +701,7 @@ void PrintDialog::JobTabPage::readFromSettings()
 {
     SettingsConfigItem* pItem = SettingsConfigItem::get();
     rtl::OUString aValue;
-
+    
     #if 0
     // do not actually make copy count persistent
     // the assumption is that this would lead to a lot of unwanted copies
@@ -710,7 +710,7 @@ void PrintDialog::JobTabPage::readFromSettings()
     sal_Int32 nVal = aValue.toInt32();
     maCopyCountField.SetValue( sal_Int64(nVal > 1 ? nVal : 1) );
     #endif
-
+    
     aValue = pItem->getValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "PrintDialog" ) ),
                               rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "CollateBox" ) ) );
     if( aValue.equalsIgnoreAsciiCaseAscii( "alwaysoff" ) )
@@ -758,7 +758,7 @@ PrintDialog::OutputOptPage::OutputOptPage( Window* i_pParent, const ResId& i_rRe
     maToFileBox.SMHID2( "OptPage", "ToFile" );
     maCollateSingleJobsBox.SMHID2( "OptPage", "SingleJobs" );
     maReverseOrderBox.SMHID2( "OptPage", "Reverse" );
-
+    
     setupLayout();
 }
 
@@ -772,7 +772,7 @@ void PrintDialog::OutputOptPage::setupLayout()
 
     maLayout.setParentWindow( this );
     maLayout.setOuterBorder( aBorder.Width() );
-
+    
     maLayout.addWindow( &maOptionsLine );
     boost::shared_ptr<vcl::Indenter> xIndent( new vcl::Indenter( &maLayout, aBorder.Width() ) );
     maLayout.addChild( xIndent );
@@ -789,7 +789,7 @@ void PrintDialog::OutputOptPage::readFromSettings()
     #if 0
     SettingsConfigItem* pItem = SettingsConfigItem::get();
     rtl::OUString aValue;
-
+    
     aValue = pItem->getValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "PrintDialog" ) ),
                               rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ToFile" ) ) );
     maToFileBox.Check( aValue.equalsIgnoreAsciiCaseAscii( "true" ) );
@@ -803,7 +803,7 @@ void PrintDialog::OutputOptPage::storeToSettings()
                      rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ToFile" ) ),
                      rtl::OUString::createFromAscii( maToFileBox.IsChecked() ? "true" : "false" ) );
 }
-
+    
 void PrintDialog::OutputOptPage::Resize()
 {
     maLayout.setManagedArea( Rectangle( Point( 0, 0 ), GetSizePixel() ) );
@@ -834,32 +834,32 @@ PrintDialog::PrintDialog( Window* i_pParent, const boost::shared_ptr<PrinterCont
     , mbShowLayoutPage( sal_True )
 {
     FreeResource();
-
+    
     // save printbutton text, gets exchanged occasionally with print to file
     maPrintText = maOKButton.GetText();
-
+    
     // setup preview controls
     maForwardBtn.SetStyle( maForwardBtn.GetStyle() | WB_BEVELBUTTON );
     maBackwardBtn.SetStyle( maBackwardBtn.GetStyle() | WB_BEVELBUTTON );
-
+    
     // insert the job (general) tab page first
     maTabCtrl.InsertPage( SV_PRINT_TAB_JOB, maJobPage.GetText() );
     maTabCtrl.SetTabPage( SV_PRINT_TAB_JOB, &maJobPage );
-
+    
     // set symbols on forward and backward button
     maBackwardBtn.SetSymbol( SYMBOL_PREV );
     maForwardBtn.SetSymbol( SYMBOL_NEXT );
     maBackwardBtn.ImplSetSmallSymbol( TRUE );
     maForwardBtn.ImplSetSmallSymbol( TRUE );
-
+    
     maPageStr = maNumPagesText.GetText();
-
+    
     // init reverse print
     maOptionsPage.maReverseOrderBox.Check( maPController->getReversePrint() );
 
     // get the first page
     preparePreview( true, true );
-
+    
     // fill printer listbox
     const std::vector< rtl::OUString >& rQueues( Printer::GetPrinterQueues() );
     for( std::vector< rtl::OUString >::const_iterator it = rQueues.begin();
@@ -892,10 +892,10 @@ PrintDialog::PrintDialog( Window* i_pParent, const boost::shared_ptr<PrinterCont
     }
     // update the text fields for the printer
     updatePrinterText();
-
+    
     // set a select handler
     maJobPage.maPrinters.SetSelectHdl( LINK( this, PrintDialog, SelectHdl ) );
-
+    
     // setup sizes for N-Up
     Size aNupSize( maPController->getPrinter()->PixelToLogic(
                          maPController->getPrinter()->GetPaperSizePixel(), MapMode( MAP_100TH_MM ) ) );
@@ -911,7 +911,7 @@ PrintDialog::PrintDialog( Window* i_pParent, const boost::shared_ptr<PrinterCont
     }
     maNUpPage.initFromMultiPageSetup( maPController->getMultipage() );
 
-
+    
     // setup click handler on the various buttons
     maOKButton.SetClickHdl( LINK( this, PrintDialog, ClickHdl ) );
     #if OSL_DEBUG_LEVEL > 1
@@ -928,7 +928,7 @@ PrintDialog::PrintDialog( Window* i_pParent, const boost::shared_ptr<PrinterCont
     maOptionsPage.maReverseOrderBox.SetToggleHdl( LINK( this, PrintDialog, ClickHdl ) );
     maOptionsPage.maCollateSingleJobsBox.SetToggleHdl( LINK( this, PrintDialog, ClickHdl ) );
     maNUpPage.maPagesBtn.SetToggleHdl( LINK( this, PrintDialog, ClickHdl ) );
-
+    
     // setup modify hdl
     maPageEdit.SetModifyHdl( LINK( this, PrintDialog, ModifyHdl ) );
     maJobPage.maCopyCountField.SetModifyHdl( LINK( this, PrintDialog, ModifyHdl ) );
@@ -937,20 +937,20 @@ PrintDialog::PrintDialog( Window* i_pParent, const boost::shared_ptr<PrinterCont
     maNUpPage.maPageMarginEdt.SetModifyHdl( LINK( this, PrintDialog, ModifyHdl ) );
     maNUpPage.maSheetMarginEdt.SetModifyHdl( LINK( this, PrintDialog, ModifyHdl ) );
 
-    // setup select hdl
+    // setup select hdl    
     maNUpPage.maNupPagesBox.SetSelectHdl( LINK( this, PrintDialog, SelectHdl ) );
     maNUpPage.maNupOrientationBox.SetSelectHdl( LINK( this, PrintDialog, SelectHdl ) );
     maNUpPage.maNupOrderBox.SetSelectHdl( LINK( this, PrintDialog, SelectHdl ) );
 
     // setup the layout
     setupLayout();
-
+    
     // setup optional UI options set by application
     setupOptionalUI();
-
+    
     // set change handler for UI options
     maPController->setOptionChangeHdl( LINK( this, PrintDialog, UIOptionsChanged ) );
-
+    
     // set min size pixel to current size
     Size aOutSize( GetOutputSizePixel() );
     SetMinOutputSizePixel( aOutSize );
@@ -976,7 +976,7 @@ PrintDialog::PrintDialog( Window* i_pParent, const boost::shared_ptr<PrinterCont
             SetOutputSizePixel( aOutSize );
         }
     }
-
+    
     // set HelpIDs
     SMHID1( "Dialog" );
     maOKButton.SMHID1( "OK" );
@@ -1000,10 +1000,10 @@ PrintDialog::PrintDialog( Window* i_pParent, const boost::shared_ptr<PrinterCont
 
     // restore settings from last run
     readFromSettings();
-
+    
     // setup dependencies
     checkControlDependencies();
-
+    
 }
 
 PrintDialog::~PrintDialog()
@@ -1020,11 +1020,11 @@ void PrintDialog::setupLayout()
     Size aBorder( LogicToPixel( Size( 5, 5 ), MapMode( MAP_APPFONT ) ) );
 
     maLayout.setParentWindow( this );
-
+    
     boost::shared_ptr< vcl::RowOrColumn > xPreviewAndTab( new vcl::RowOrColumn( &maLayout, false ) );
     size_t nIndex = maLayout.addChild( xPreviewAndTab, 5 );
     maLayout.setBorders( nIndex, aBorder.Width(), aBorder.Width(), aBorder.Width(), 0 );
-
+    
     // setup column for preview and sub controls
     boost::shared_ptr< vcl::RowOrColumn > xPreview( new vcl::RowOrColumn( xPreviewAndTab.get() ) );
     xPreviewAndTab->addChild( xPreview, 5 );
@@ -1042,18 +1042,18 @@ void PrintDialog::setupLayout()
     mxPreviewCtrls->addWindow( &maForwardBtn );
     xSpacer.reset( new vcl::Spacer( mxPreviewCtrls.get(), 2 ) );
     mxPreviewCtrls->addChild( xSpacer );
-
+    
     // continue with the tab ctrl
     xPreviewAndTab->addWindow( &maTabCtrl );
-
+    
     // add the button line
     maLayout.addWindow( &maButtonLine );
-
+    
     // add the row for the buttons
     boost::shared_ptr< vcl::RowOrColumn > xButtons( new vcl::RowOrColumn( &maLayout, false ) );
     nIndex = maLayout.addChild( xButtons );
     maLayout.setBorders( nIndex, aBorder.Width(), 0, aBorder.Width(), aBorder.Width() );
-
+    
     Size aMinSize( maCancelButton.GetSizePixel() );
     // insert help button
     xButtons->setMinimumSize( xButtons->addWindow( &maHelpButton ), aMinSize );
@@ -1069,7 +1069,7 @@ void PrintDialog::readFromSettings()
     maJobPage.readFromSettings();
     maNUpPage.readFromSettings();
     maOptionsPage.readFromSettings();
-
+    
     // read last selected tab page; if it exists, actiavte it
     SettingsConfigItem* pItem = SettingsConfigItem::get();
     rtl::OUString aValue = pItem->getValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "PrintDialog" ) ),
@@ -1092,7 +1092,7 @@ void PrintDialog::storeToSettings()
     maJobPage.storeToSettings();
     maNUpPage.storeToSettings();
     maOptionsPage.storeToSettings();
-
+    
     // store last selected printer
     SettingsConfigItem* pItem = SettingsConfigItem::get();
     pItem->setValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "PrintDialog" ) ),
@@ -1151,7 +1151,7 @@ static void setHelpText( Window* /*i_pWindow*/, const Sequence< rtl::OUString >&
 {
     // without a help text set and the correct smartID,
     // help texts will be retrieved from the online help system
-
+    
     // passed help texts for optional UI is used only for native dialogs which currently
     // cannot access the same (rather implicit) mechanism
     #if 0
@@ -1179,9 +1179,9 @@ void PrintDialog::setupOptionalUI()
     USHORT nOptPageId = 9, nCurSubGroup = 0;
     bool bOnStaticPage = false;
     bool bSubgroupOnStaticPage = false;
-
+    
     std::multimap< rtl::OUString, vcl::RowOrColumn* > aPropertyToDependencyRowMap;
-
+    
     const Sequence< PropertyValue >& rOptions( maPController->getUIOptions() );
     for( int i = 0; i < rOptions.getLength(); i++ )
     {
@@ -1272,10 +1272,10 @@ void PrintDialog::setupOptionalUI()
                 mbShowLayoutPage = ! bNoLayoutPage;
             }
         }
-
+        
         // bUseDependencyRow should only be true if a dependency exists
         bUseDependencyRow = bUseDependencyRow && (aDependsOnName.getLength() != 0);
-
+        
         // is it necessary to switch between static and dynamic pages ?
         bool bSwitchPage = false;
         if( aGroupingHint.getLength() )
@@ -1332,12 +1332,12 @@ void PrintDialog::setupOptionalUI()
             pNewGroup->SetText( aText );
             maTabCtrl.InsertPage( ++nOptPageId, aText );
             maTabCtrl.SetTabPage( nOptPageId, pNewGroup );
-
+            
             // set help id
             setSmartId( pNewGroup, "TabPage", nOptPageId );
             // set help text
             setHelpText( pNewGroup, aHelpTexts, 0 );
-
+            
             // reset subgroup counter
             nCurSubGroup = 0;
 
@@ -1364,7 +1364,7 @@ void PrintDialog::setupOptionalUI()
                 maControls.push_front( pNewSub );
                 pNewSub->SetText( aText );
                 pNewSub->Show();
-
+                
                 // set help id
                 setSmartId( pNewSub, "FixedLine", sal_Int32( nCurSubGroup++ ) );
                 // set help text
@@ -1397,16 +1397,16 @@ void PrintDialog::setupOptionalUI()
             maNUpPage.maBrochureBtn.Check( bVal );
             maNUpPage.maBrochureBtn.Enable( maPController->isUIOptionEnabled( aPropertyName ) && pVal != NULL );
             maNUpPage.maBrochureBtn.SetToggleHdl( LINK( this, PrintDialog, ClickHdl ) );
-
+            
             maPropertyToWindowMap[ aPropertyName ].push_back( &maNUpPage.maBrochureBtn );
             maControlToPropertyMap[&maNUpPage.maBrochureBtn] = aPropertyName;
 
             aPropertyToDependencyRowMap.insert( std::pair< rtl::OUString, vcl::RowOrColumn* >( aPropertyName, maNUpPage.mxBrochureDep.get() ) );
-        }
+        }            
         else
         {
             vcl::RowOrColumn* pSaveCurColumn = pCurColumn;
-
+            
             if( bUseDependencyRow )
             {
                 // find the correct dependency row (if any)
@@ -1434,26 +1434,26 @@ void PrintDialog::setupOptionalUI()
                 maControls.push_front( pNewBox );
                 pNewBox->SetText( aText );
                 pNewBox->Show();
-
+    
                 sal_Bool bVal = sal_False;
                 PropertyValue* pVal = maPController->getValue( aPropertyName );
                 if( pVal )
                     pVal->Value >>= bVal;
                 pNewBox->Check( bVal );
                 pNewBox->SetToggleHdl( LINK( this, PrintDialog, UIOption_CheckHdl ) );
-
+                
                 maPropertyToWindowMap[ aPropertyName ].push_back( pNewBox );
                 maControlToPropertyMap[pNewBox] = aPropertyName;
-
+                
                 // set help id
                 setSmartId( pNewBox, "CheckBox", -1, aPropertyName );
                 // set help text
                 setHelpText( pNewBox, aHelpTexts, 0 );
-
+    
                 vcl::RowOrColumn* pDependencyRow = new vcl::RowOrColumn( pCurColumn, false );
                 pCurColumn->addChild( pDependencyRow );
                 aPropertyToDependencyRowMap.insert( std::pair< rtl::OUString, vcl::RowOrColumn* >( aPropertyName, pDependencyRow ) );
-
+                    
                 // add checkbox to current column
                 pDependencyRow->addWindow( pNewBox );
             }
@@ -1467,7 +1467,7 @@ void PrintDialog::setupOptionalUI()
                     maControls.push_front( pHeading );
                     pHeading->SetText( aText );
                     pHeading->Show();
-
+    
                     // set help id
                     setSmartId( pHeading, "FixedText", -1, aPropertyName );
                     // set help text
@@ -1493,7 +1493,7 @@ void PrintDialog::setupOptionalUI()
                     boost::shared_ptr<vcl::RowOrColumn> pDependencyRow( new vcl::RowOrColumn( pLabel.get(), false ) );
                     pLabel->setElement( pDependencyRow );
                     aPropertyToDependencyRowMap.insert( std::pair< rtl::OUString, vcl::RowOrColumn* >( aPropertyName, pDependencyRow.get() ) );
-
+                    
                     RadioButton* pBtn = new RadioButton( pCurParent, m == 0 ? WB_GROUP : 0 );
                     maControls.push_front( pBtn );
                     pBtn->SetText( aChoices[m] );
@@ -1503,7 +1503,7 @@ void PrintDialog::setupOptionalUI()
                     maPropertyToWindowMap[ aPropertyName ].push_back( pBtn );
                     maControlToPropertyMap[pBtn] = aPropertyName;
                     maControlToNumValMap[pBtn] = m;
-
+    
                     // set help id
                     setSmartId( pBtn, "RadioButton", m, aPropertyName );
                     // set help text
@@ -1521,7 +1521,7 @@ void PrintDialog::setupOptionalUI()
                 vcl::RowOrColumn* pFieldColumn = new vcl::RowOrColumn( pCurColumn, false );
                 pCurColumn->addChild( pFieldColumn );
                 aPropertyToDependencyRowMap.insert( std::pair< rtl::OUString, vcl::RowOrColumn* >( aPropertyName, pFieldColumn ) );
-
+    
                 vcl::LabeledElement* pLabel = NULL;
                 if( aText.getLength() )
                 {
@@ -1530,21 +1530,21 @@ void PrintDialog::setupOptionalUI()
                     maControls.push_front( pHeading );
                     pHeading->SetText( aText );
                     pHeading->Show();
-
+    
                     // set help id
                     setSmartId( pHeading, "FixedText", -1, aPropertyName );
-
+    
                     // add to row
                     pLabel = new vcl::LabeledElement( pFieldColumn, 2 );
                     pFieldColumn->addChild( pLabel );
                     pLabel->setLabel( pHeading );
                 }
-
+                
                 if( aCtrlType.equalsAscii( "List" ) )
                 {
                     ListBox* pList = new ListBox( pCurParent, WB_DROPDOWN | WB_BORDER );
                     maControls.push_front( pList );
-
+    
                     // iterate options
                     for( sal_Int32 m = 0; m < aChoices.getLength(); m++ )
                     {
@@ -1558,15 +1558,15 @@ void PrintDialog::setupOptionalUI()
                     pList->SetSelectHdl( LINK( this, PrintDialog, UIOption_SelectHdl ) );
                     pList->SetDropDownLineCount( static_cast<USHORT>(aChoices.getLength()) );
                     pList->Show();
-
+                    
                     // set help id
                     setSmartId( pList, "ListBox", -1, aPropertyName );
                     // set help text
                     setHelpText( pList, aHelpTexts, 0 );
-
+    
                     maPropertyToWindowMap[ aPropertyName ].push_back( pList );
                     maControlToPropertyMap[pList] = aPropertyName;
-
+    
                     // finish the pair
                     if( pLabel )
                         pLabel->setElement( pList );
@@ -1577,7 +1577,7 @@ void PrintDialog::setupOptionalUI()
                 {
                     NumericField* pField = new NumericField( pCurParent, WB_BORDER | WB_SPIN );
                     maControls.push_front( pField );
-
+                    
                     // set min/max and current value
                     if( nMinValue != nMaxValue )
                     {
@@ -1591,15 +1591,15 @@ void PrintDialog::setupOptionalUI()
                     pField->SetValue( nCurVal );
                     pField->SetModifyHdl( LINK( this, PrintDialog, UIOption_ModifyHdl ) );
                     pField->Show();
-
+                    
                     // set help id
                     setSmartId( pField, "NumericField", -1, aPropertyName );
                     // set help text
                     setHelpText( pField, aHelpTexts, 0 );
-
+    
                     maPropertyToWindowMap[ aPropertyName ].push_back( pField );
                     maControlToPropertyMap[pField] = aPropertyName;
-
+    
                     // add to row
                     if( pLabel )
                         pLabel->setElement( pField );
@@ -1610,7 +1610,7 @@ void PrintDialog::setupOptionalUI()
                 {
                     Edit* pField = new Edit( pCurParent, WB_BORDER );
                     maControls.push_front( pField );
-
+                    
                     rtl::OUString aCurVal;
                     PropertyValue* pVal = maPController->getValue( aPropertyName );
                     if( pVal && pVal->Value.hasValue() )
@@ -1618,15 +1618,15 @@ void PrintDialog::setupOptionalUI()
                     pField->SetText( aCurVal );
                     pField->SetModifyHdl( LINK( this, PrintDialog, UIOption_ModifyHdl ) );
                     pField->Show();
-
+                    
                     // set help id
                     setSmartId( pField, "Edit", -1, aPropertyName );
                     // set help text
                     setHelpText( pField, aHelpTexts, 0 );
-
+    
                     maPropertyToWindowMap[ aPropertyName ].push_back( pField );
                     maControlToPropertyMap[pField] = aPropertyName;
-
+    
                     // add to row
                     if( pLabel )
                         pLabel->setElement( pField );
@@ -1638,11 +1638,11 @@ void PrintDialog::setupOptionalUI()
             {
                 DBG_ERROR( "Unsupported UI option" );
             }
-
+            
             pCurColumn = pSaveCurColumn;
         }
     }
-
+    
     // #i106506# if no brochure button, then the singular Pages radio button
     // makes no sense, so replace it by a FixedText label
     if( ! maNUpPage.maBrochureBtn.IsVisible() )
@@ -1655,17 +1655,17 @@ void PrintDialog::setupOptionalUI()
             maNUpPage.maPagesBtn.Show( FALSE );
         }
     }
-
+    
     // update enable states
     checkOptionalControlDependencies();
-
+    
     // print range empty (currently math only) -> hide print range and spacer line
     if( maJobPage.mxPrintRange->countElements() == 0 )
     {
         maJobPage.mxPrintRange->show( false, false );
         maJobPage.maCopySpacer.Show( FALSE );
     }
-
+    
 #ifdef WNT
     // FIXME: the GetNativeControlRegion call on Windows has some issues
     // (which skew the results of GetOptimalSize())
@@ -1729,7 +1729,7 @@ void PrintDialog::setupOptionalUI()
     maJobPage.Resize();
     maNUpPage.Resize();
     maOptionsPage.Resize();
-
+    
     Size aSz = maLayout.getOptimalSize( WINDOWSIZE_PREFERRED );
     SetOutputSizePixel( aSz );
 }
@@ -1748,14 +1748,14 @@ void PrintDialog::checkControlDependencies()
         maJobPage.maCollateBox.Enable( maJobPage.mnCollateUIMode == 0 );
     else
         maJobPage.maCollateBox.Enable( FALSE );
-
+    
     Image aImg( maJobPage.maCollateBox.IsChecked() ? maJobPage.maCollateImg : maJobPage.maNoCollateImg );
     Image aHCImg( maJobPage.maCollateBox.IsChecked() ? maJobPage.maCollateHCImg : maJobPage.maNoCollateHCImg );
     bool bHC = GetSettings().GetStyleSettings().GetHighContrastMode();
-
+    
     Size aImgSize( aImg.GetSizePixel() );
     Size aHCImgSize( aHCImg.GetSizePixel() );
-
+    
     if( aHCImgSize.Width() > aImgSize.Width() )
         aImgSize.Width() = aHCImgSize.Width();
     if( aHCImgSize.Height() > aImgSize.Height() )
@@ -1822,7 +1822,7 @@ void PrintDialog::checkOptionalControlDependencies()
                     bShouldbeEnabled = true;
             }
         }
-
+        
         bool bIsEnabled = it->first->IsEnabled();
         // Enable does not do a change check first, so can be less cheap than expected
         if( bShouldbeEnabled != bIsEnabled )
@@ -1871,7 +1871,7 @@ void PrintDialog::setPreviewText( sal_Int32 )
 {
     rtl::OUString aNewText( searchAndReplace( maPageStr, "%n", 2, rtl::OUString::valueOf( mnCachedPages )  ) );
     maNumPagesText.SetText( aNewText );
-
+    
     // if layout is already established the refresh layout of
     // preview controls since text length may have changes
     if( mxPreviewCtrls.get() )
@@ -1883,17 +1883,17 @@ void PrintDialog::preparePreview( bool i_bNewPage, bool i_bMayUseCache )
     // page range may have changed depending on options
     sal_Int32 nPages = maPController->getFilteredPageCount();
     mnCachedPages = nPages;
-
+    
     if( mnCurPage >= nPages )
         mnCurPage = nPages-1;
     if( mnCurPage < 0 )
         mnCurPage = 0;
-
+    
     setPreviewText( mnCurPage );
 
     maPageEdit.SetMin( 1 );
     maPageEdit.SetMax( nPages );
-
+    
     if( i_bNewPage )
     {
         const MapMode aMapMode( MAP_100TH_MM );
@@ -1909,12 +1909,12 @@ void PrintDialog::preparePreview( bool i_bNewPage, bool i_bMayUseCache )
                 aMtf.Move( aOff.X(), aOff.Y() );
             }
         }
-
+        
         Size aCurPageSize = aPrt->PixelToLogic( aPrt->GetPaperSizePixel(), MapMode( MAP_100TH_MM ) );
         maPreviewWindow.setPreview( aMtf, aCurPageSize, nPages > 0 ? rtl::OUString() : maNoPageStr,
                                     aPrt->ImplGetDPIX(), aPrt->ImplGetDPIY()
                                    );
-
+        
         maForwardBtn.Enable( mnCurPage < nPages-1 );
         maBackwardBtn.Enable( mnCurPage != 0 );
         maPageEdit.Enable( nPages > 1 );
@@ -1944,7 +1944,7 @@ void PrintDialog::updateNupFromPages()
     long nPageMargin  = long(maNUpPage.maPageMarginEdt.Denormalize(maNUpPage.maPageMarginEdt.GetValue( FUNIT_100TH_MM )));
     long nSheetMargin = long(maNUpPage.maSheetMarginEdt.Denormalize(maNUpPage.maSheetMarginEdt.GetValue( FUNIT_100TH_MM )));
     bool bCustom = false;
-
+    
     if( nPages == 1 )
     {
         nRows = nCols = 1;
@@ -1980,12 +1980,12 @@ void PrintDialog::updateNupFromPages()
     }
     else
         bCustom = true;
-
+    
     if( nPages > 1 )
     {
         // set upper limits for margins based on job page size and rows/columns
         Size aSize( getJobPageSize() );
-
+        
         // maximum sheet distance: 1/2 sheet
         long nHorzMax = aSize.Width()/2;
         long nVertMax = aSize.Height()/2;
@@ -1993,11 +1993,11 @@ void PrintDialog::updateNupFromPages()
             nSheetMargin = nHorzMax;
         if( nSheetMargin > nVertMax )
             nSheetMargin = nVertMax;
-
-        maNUpPage.maSheetMarginEdt.SetMax(
-                  maNUpPage.maSheetMarginEdt.Normalize(
+        
+        maNUpPage.maSheetMarginEdt.SetMax( 
+                  maNUpPage.maSheetMarginEdt.Normalize( 
                            nHorzMax > nVertMax ? nVertMax : nHorzMax ), FUNIT_100TH_MM );
-
+        
         // maximum page distance
         nHorzMax = (aSize.Width() - 2*nSheetMargin);
         if( nCols > 1 )
@@ -2005,12 +2005,12 @@ void PrintDialog::updateNupFromPages()
         nVertMax = (aSize.Height() - 2*nSheetMargin);
         if( nRows > 1 )
             nHorzMax /= (nRows-1);
-
+        
         if( nPageMargin > nHorzMax )
             nPageMargin = nHorzMax;
         if( nPageMargin > nVertMax )
             nPageMargin = nVertMax;
-
+        
         maNUpPage.maPageMarginEdt.SetMax(
                  maNUpPage.maSheetMarginEdt.Normalize(
                            nHorzMax > nVertMax ? nVertMax : nHorzMax ), FUNIT_100TH_MM );
@@ -2020,7 +2020,7 @@ void PrintDialog::updateNupFromPages()
     maNUpPage.maNupColEdt.SetValue( nCols );
     maNUpPage.maPageMarginEdt.SetValue( maNUpPage.maPageMarginEdt.Normalize( nPageMargin ), FUNIT_100TH_MM );
     maNUpPage.maSheetMarginEdt.SetValue( maNUpPage.maSheetMarginEdt.Normalize( nSheetMargin ), FUNIT_100TH_MM );
-
+    
     maNUpPage.showAdvancedControls( bCustom );
     if( bCustom )
     {
@@ -2044,29 +2044,29 @@ void PrintDialog::updateNup()
     int nCols         = int(maNUpPage.maNupColEdt.GetValue());
     long nPageMargin  = long(maNUpPage.maPageMarginEdt.Denormalize(maNUpPage.maPageMarginEdt.GetValue( FUNIT_100TH_MM )));
     long nSheetMargin = long(maNUpPage.maSheetMarginEdt.Denormalize(maNUpPage.maSheetMarginEdt.GetValue( FUNIT_100TH_MM )));
-
+    
     PrinterController::MultiPageSetup aMPS;
     aMPS.nRows         = nRows;
     aMPS.nColumns      = nCols;
     aMPS.nRepeat       = 1;
-    aMPS.nLeftMargin   =
-    aMPS.nTopMargin    =
-    aMPS.nRightMargin  =
+    aMPS.nLeftMargin   = 
+    aMPS.nTopMargin    = 
+    aMPS.nRightMargin  = 
     aMPS.nBottomMargin = nSheetMargin;
-
+    
     aMPS.nHorizontalSpacing =
     aMPS.nVerticalSpacing   = nPageMargin;
 
     aMPS.bDrawBorder        = maNUpPage.maBorderCB.IsChecked();
-
-    int nOrderMode = int(sal_IntPtr(maNUpPage.maNupOrderBox.GetEntryData(
+    
+    int nOrderMode = int(sal_IntPtr(maNUpPage.maNupOrderBox.GetEntryData( 
                            maNUpPage.maNupOrderBox.GetSelectEntryPos() )));
     if( nOrderMode == SV_PRINT_PRT_NUP_ORDER_LRTD )
         aMPS.nOrder = PrinterController::LRTB;
     else if( nOrderMode == SV_PRINT_PRT_NUP_ORDER_TDLR )
         aMPS.nOrder = PrinterController::TBLR;
-
-    int nOrientationMode = int(sal_IntPtr(maNUpPage.maNupOrientationBox.GetEntryData(
+    
+    int nOrientationMode = int(sal_IntPtr(maNUpPage.maNupOrientationBox.GetEntryData( 
                                  maNUpPage.maNupOrientationBox.GetSelectEntryPos() )));
     if( nOrientationMode == SV_PRINT_PRT_NUP_ORIENTATION_LANDSCAPE )
         aMPS.aPaperSize = maNupLandscapeSize;
@@ -2077,18 +2077,18 @@ void PrintDialog::updateNup()
         // get size of first real page to see if it is portrait or landscape
         // we assume same page sizes for all the pages for this
         Size aPageSize = getJobPageSize();
-
+        
         Size aMultiSize( aPageSize.Width() * nCols, aPageSize.Height() * nRows );
         if( aMultiSize.Width() > aMultiSize.Height() ) // fits better on landscape
             aMPS.aPaperSize = maNupLandscapeSize;
         else
-            aMPS.aPaperSize = maNupPortraitSize;
+            aMPS.aPaperSize = maNupPortraitSize;                
     }
-
+    
     maPController->setMultipage( aMPS );
-
+    
     maNUpPage.maNupOrderWin.setValues( nOrderMode, nCols, nRows );
-
+    
     preparePreview( true, true );
 }
 
@@ -2112,7 +2112,7 @@ IMPL_LINK( PrintDialog, SelectHdl, ListBox*, pBox )
             maNUpPage.maPagesBtn.Check();
         updateNupFromPages();
     }
-
+    
     return 0;
 }
 
@@ -2153,9 +2153,9 @@ IMPL_LINK( PrintDialog, ClickHdl, Button*, pButton )
         {
             sal_Bool bVal = maNUpPage.maBrochureBtn.IsChecked();
             pVal->Value <<= bVal;
-
+            
             checkOptionalControlDependencies();
-
+            
             // update preview and page settings
             preparePreview();
         }
@@ -2348,12 +2348,12 @@ IMPL_LINK( PrintDialog, UIOption_CheckHdl, CheckBox*, i_pBox )
     if( pVal )
     {
         makeEnabled( i_pBox );
-
+        
         sal_Bool bVal = i_pBox->IsChecked();
         pVal->Value <<= bVal;
-
+        
         checkOptionalControlDependencies();
-
+        
         // update preview and page settings
         preparePreview();
     }
@@ -2372,12 +2372,12 @@ IMPL_LINK( PrintDialog, UIOption_RadioHdl, RadioButton*, i_pBtn )
         if( pVal && it != maControlToNumValMap.end() )
         {
             makeEnabled( i_pBtn );
-
+            
             sal_Int32 nVal = it->second;
             pVal->Value <<= nVal;
-
+            
             checkOptionalControlDependencies();
-
+    
             // update preview and page settings
             preparePreview();
         }
@@ -2391,12 +2391,12 @@ IMPL_LINK( PrintDialog, UIOption_SelectHdl, ListBox*, i_pBox )
     if( pVal )
     {
         makeEnabled( i_pBox );
-
+        
         sal_Int32 nVal( i_pBox->GetSelectEntryPos() );
         pVal->Value <<= nVal;
-
+        
         checkOptionalControlDependencies();
-
+        
         // update preview and page settings
         preparePreview();
     }
@@ -2427,9 +2427,9 @@ IMPL_LINK( PrintDialog, UIOption_ModifyHdl, Edit*, i_pBox )
             rtl::OUString aVal( i_pBox->GetText() );
             pVal->Value <<= aVal;
         }
-
+        
         checkOptionalControlDependencies();
-
+        
         // update preview and page settings
         preparePreview();
     }
@@ -2492,9 +2492,9 @@ PrintProgressDialog::PrintProgressDialog( Window* i_pParent, int i_nMax ) :
 
     if( mnMax < 1 )
         mnMax = 1;
-
+    
     maStr = maText.GetText();
-
+    
     maButton.SetClickHdl( LINK( this, PrintProgressDialog, ClickHdl ) );
 
 }
@@ -2507,7 +2507,7 @@ IMPL_LINK( PrintProgressDialog, ClickHdl, Button*, pButton )
 {
     if( pButton == &maButton )
         mbCanceled = true;
-
+    
     return 0;
 }
 
@@ -2534,7 +2534,7 @@ void PrintProgressDialog::setProgress( int i_nCurrent, int i_nMax )
 {
     if( maProgressRect.IsEmpty() )
         implCalcProgressRect();
-
+    
     mnCur = i_nCurrent;
     if( i_nMax != -1 )
         mnMax = i_nMax;
@@ -2545,7 +2545,7 @@ void PrintProgressDialog::setProgress( int i_nCurrent, int i_nMax )
     rtl::OUString aNewText( searchAndReplace( maStr, "%p", 2, rtl::OUString::valueOf( mnCur ) ) );
     aNewText = searchAndReplace( aNewText, "%n", 2, rtl::OUString::valueOf( mnMax ) );
     maText.SetText( aNewText );
-
+    
     // update progress
     Invalidate( maProgressRect, INVALIDATE_UPDATE );
 }
@@ -2565,7 +2565,7 @@ void PrintProgressDialog::Paint( const Rectangle& )
 {
     if( maProgressRect.IsEmpty() )
         implCalcProgressRect();
-
+    
     Push( PUSH_LINECOLOR | PUSH_FILLCOLOR );
     const StyleSettings& rStyleSettings = GetSettings().GetStyleSettings();
     Color aPrgsColor = rStyleSettings.GetHighlightColor();
diff --git a/vcl/source/window/scrwnd.cxx b/vcl/source/window/scrwnd.cxx
index 735add842518..e7a4d7939a68 100644
--- a/vcl/source/window/scrwnd.cxx
+++ b/vcl/source/window/scrwnd.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
diff --git a/vcl/source/window/scrwnd.hxx b/vcl/source/window/scrwnd.hxx
index d808fa73e321..e0eb77e7b2e1 100644
--- a/vcl/source/window/scrwnd.hxx
+++ b/vcl/source/window/scrwnd.hxx
@@ -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
@@ -33,13 +33,13 @@
 // - Defines -
 // -----------
 
-#define WHEELMODE_NONE      0x00000000UL
-#define WHEELMODE_VH        0x00000001UL
-#define WHEELMODE_V         0x00000002UL
-#define WHEELMODE_H         0x00000004UL
-#define WHEELMODE_SCROLL_VH 0x00000008UL
-#define WHEELMODE_SCROLL_V  0x00000010UL
-#define WHEELMODE_SCROLL_H  0x00000020UL
+#define WHEELMODE_NONE		0x00000000UL
+#define WHEELMODE_VH		0x00000001UL
+#define WHEELMODE_V			0x00000002UL
+#define WHEELMODE_H			0x00000004UL
+#define WHEELMODE_SCROLL_VH	0x00000008UL
+#define WHEELMODE_SCROLL_V	0x00000010UL
+#define WHEELMODE_SCROLL_H	0x00000020UL
 
 // -------------------
 // - ImplWheelWindow -
@@ -51,42 +51,42 @@ class ImplWheelWindow : public FloatingWindow
 {
 private:
 
-    ImageList           maImgList;
-    Bitmap              maWheelBmp;
-    CommandScrollData   maCommandScrollData;
-    Point               maLastMousePos;
-    Point               maCenter;
-    Timer*              mpTimer;
-    ULONG               mnRepaintTime;
-    ULONG               mnTimeout;
-    ULONG               mnWheelMode;
-    ULONG               mnMaxWidth;
-    ULONG               mnActWidth;
-    ULONG               mnActDist;
-    long                mnActDeltaX;
-    long                mnActDeltaY;
-
-    void                ImplCreateImageList();
-    void                ImplSetRegion( const Bitmap& rRegionBmp );
+    ImageList			maImgList;
+    Bitmap				maWheelBmp;
+    CommandScrollData	maCommandScrollData;
+    Point				maLastMousePos;
+    Point				maCenter;
+    Timer*				mpTimer;
+    ULONG				mnRepaintTime;
+    ULONG				mnTimeout;
+    ULONG				mnWheelMode;
+    ULONG				mnMaxWidth;
+    ULONG				mnActWidth;
+    ULONG				mnActDist;
+    long				mnActDeltaX;
+    long				mnActDeltaY;
+                    
+    void				ImplCreateImageList();
+    void				ImplSetRegion( const Bitmap& rRegionBmp );
     using Window::ImplGetMousePointer;
-    PointerStyle        ImplGetMousePointer( long nDistX, long nDistY );
-    void                ImplDrawWheel();
-    void                ImplRecalcScrollValues();
-
+    PointerStyle		ImplGetMousePointer( long nDistX, long nDistY );
+    void				ImplDrawWheel();
+    void				ImplRecalcScrollValues();
+                        
                         DECL_LINK( ImplScrollHdl, Timer* pTimer );
-
-protected:
-
-    virtual void        Paint( const Rectangle& rRect );
-    virtual void        MouseMove( const MouseEvent& rMEvt );
-    virtual void        MouseButtonUp( const MouseEvent& rMEvt );
-
-public:
-
+                        
+protected:				
+                        
+    virtual void		Paint( const Rectangle& rRect );
+    virtual void		MouseMove( const MouseEvent& rMEvt );
+    virtual void		MouseButtonUp( const MouseEvent& rMEvt );
+                        
+public:					
+                        
                         ImplWheelWindow( Window* pParent );
                         ~ImplWheelWindow();
 
     void                ImplStop();
-    void                ImplSetWheelMode( ULONG nWheelMode );
-    ULONG               ImplGetWheelMode() const { return mnWheelMode; }
+    void				ImplSetWheelMode( ULONG nWheelMode );
+    ULONG				ImplGetWheelMode() const { return mnWheelMode; }
 };
diff --git a/vcl/source/window/seleng.cxx b/vcl/source/window/seleng.cxx
index d4ee01c26d61..6368acd163d6 100644
--- a/vcl/source/window/seleng.cxx
+++ b/vcl/source/window/seleng.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
@@ -38,7 +38,7 @@
 
 inline BOOL SelectionEngine::ShouldDeselect( BOOL bModifierKey1 ) const
 {
-//  return !( eSelMode == MULTIPLE_SELECTION && bModifierKey1 );
+//	return !( eSelMode == MULTIPLE_SELECTION && bModifierKey1 );
     return eSelMode != MULTIPLE_SELECTION || !bModifierKey1;
 }
 
@@ -202,7 +202,7 @@ BOOL SelectionEngine::SelMouseButtonDown( const MouseEvent& rMEvt )
     nFlags &= (~SELENG_CMDEVT);
     if ( !pFunctionSet || !pWin )
         return FALSE;
-    const bool bRightClickCursorPositioning =
+    const bool bRightClickCursorPositioning = 
             rMEvt.IsRight() && rMEvt.GetClicks() == 1 && !IsInSelection();
     if ( (rMEvt.GetClicks() > 1 || rMEvt.IsRight()) && !bRightClickCursorPositioning )
         return FALSE;
@@ -218,8 +218,15 @@ BOOL SelectionEngine::SelMouseButtonDown( const MouseEvent& rMEvt )
     Point aPos = rMEvt.GetPosPixel();
     aLastMove = rMEvt;
 
-    pWin->CaptureMouse();
-    nFlags |= SELENG_IN_SEL;
+    if( !rMEvt.IsRight() )
+    {
+        pWin->CaptureMouse();
+        nFlags |= SELENG_IN_SEL;
+    }
+    else
+    {
+        nModifier = 0;
+    }
 
     switch ( nModifier )
     {
@@ -327,7 +334,7 @@ BOOL SelectionEngine::SelMouseButtonDown( const MouseEvent& rMEvt )
 |*
 *************************************************************************/
 
-BOOL SelectionEngine::SelMouseButtonUp( const MouseEvent& /* rMEvt */ )
+BOOL SelectionEngine::SelMouseButtonUp( const MouseEvent& rMEvt )
 {
     aWTimer.Stop();
     //DbgOut("Up");
@@ -336,7 +343,11 @@ BOOL SelectionEngine::SelMouseButtonUp( const MouseEvent& /* rMEvt */ )
         nFlags &= ~(SELENG_CMDEVT | SELENG_WAIT_UPEVT | SELENG_IN_SEL);
         return FALSE;
     }
-    pWin->ReleaseMouse();
+
+    if( !rMEvt.IsRight() )
+    {
+       pWin->ReleaseMouse();
+    }
 
     if( (nFlags & SELENG_WAIT_UPEVT) && !(nFlags & SELENG_CMDEVT) &&
         eSelMode != SINGLE_SELECTION)
diff --git a/vcl/source/window/split.cxx b/vcl/source/window/split.cxx
index b4553a4cf8a7..b9647ea6ceb7 100644
--- a/vcl/source/window/split.cxx
+++ b/vcl/source/window/split.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
@@ -42,8 +42,8 @@
 #include <rtl/instance.hxx>
 #include <vcl/window.h>
 
-namespace
-{
+namespace 
+{ 
     struct ImplBlackWall
         : public rtl::StaticWithInit<Wallpaper, ImplBlackWall> {
         Wallpaper operator () () {
@@ -55,7 +55,7 @@ namespace
         Wallpaper operator () () {
             return Wallpaper(COL_LIGHTGRAY);
         }
-    };
+    }; 
 }
 
 // =======================================================================
@@ -63,11 +63,11 @@ namespace
 void Splitter::ImplInitSplitterData()
 {
     ImplGetWindowImpl()->mbSplitter        = TRUE;
-    mpRefWin          = NULL;
-    mnSplitPos        = 0;
-    mnLastSplitPos    = 0;
+    mpRefWin		  = NULL;
+    mnSplitPos		  = 0;
+    mnLastSplitPos	  = 0;
     mnStartSplitPos   = 0;
-    mbDragFull        = FALSE;
+    mbDragFull		  = FALSE;
     mbKbdSplitting    = FALSE;
     mbInKeyEvent      = 0;
     mnKeyboardStepSize = SPLITTER_DEFAULTSTEPSIZE;
@@ -104,11 +104,11 @@ void Splitter::ImplInit( Window* pParent, WinBits nWinStyle )
 
     if( GetSettings().GetStyleSettings().GetFaceColor().IsDark() )
         SetBackground( ImplWhiteWall::get() );
-    else
+    else 
         SetBackground( ImplBlackWall::get() );
 
     TaskPaneList *pTList = GetSystemWindow()->GetTaskPaneList();
-    pTList->AddWindow( this );
+    pTList->AddWindow( this ); 
 }
 
 // -----------------------------------------------------------------------
@@ -139,13 +139,13 @@ void Splitter::ImplDrawSplitter()
 
     if ( mbHorzSplit )
     {
-        aInvRect.Left()     = maDragPos.X() - 1;
-        aInvRect.Right()    = maDragPos.X() + 1;
+        aInvRect.Left() 	= maDragPos.X() - 1;
+        aInvRect.Right()	= maDragPos.X() + 1;
     }
     else
     {
-        aInvRect.Top()      = maDragPos.Y() - 1;
-        aInvRect.Bottom()   = maDragPos.Y() + 1;
+        aInvRect.Top()		= maDragPos.Y() - 1;
+        aInvRect.Bottom()	= maDragPos.Y() + 1;
     }
 
     mpRefWin->InvertTracking( mpRefWin->PixelToLogic(aInvRect), SHOWTRACK_SPLIT );
@@ -180,7 +180,7 @@ Splitter::Splitter( Window* pParent, const ResId& rResId ) :
 Splitter::~Splitter()
 {
     TaskPaneList *pTList = GetSystemWindow()->GetTaskPaneList();
-    pTList->RemoveWindow( this );
+    pTList->RemoveWindow( this ); 
 }
 
 // -----------------------------------------------------------------------
@@ -196,7 +196,7 @@ long Splitter::GetKeyboardStepSize() const
 {
     return mnKeyboardStepSize;
 }
-
+ 
 // -----------------------------------------------------------------------
 
 Splitter* Splitter::ImplFindSibling()
@@ -218,7 +218,7 @@ Splitter* Splitter::ImplFindSibling()
 }
 
 // -----------------------------------------------------------------------
-
+    
 BOOL Splitter::ImplSplitterActive()
 {
     // is splitter in document or at scrollbar handle ?
@@ -402,7 +402,7 @@ void Splitter::ImplKbdTracking( KeyCode aKeyCode )
         int maxiter = 500;  // avoid endless loop
         int delta=0;
         int delta_step = mbHorzSplit  ? aSize.Width()/10 : aSize.Height()/10;
-
+        
         // use the specified step size if it was set
         if( mnKeyboardStepSize != SPLITTER_DEFAULTSTEPSIZE )
             delta_step = mnKeyboardStepSize;
@@ -418,16 +418,16 @@ void Splitter::ImplKbdTracking( KeyCode aKeyCode )
 
             switch( nCode )
             {
-            case KEY_LEFT:
+            case KEY_LEFT:  
                 aNewPos.X()-=delta;
                 break;
-            case KEY_RIGHT:
+            case KEY_RIGHT:  
                 aNewPos.X()+=delta;
                 break;
-            case KEY_UP:
+            case KEY_UP:  
                 aNewPos.Y()-=delta;
                 break;
-            case KEY_DOWN:
+            case KEY_DOWN:  
                 aNewPos.Y()+=delta;
                 break;
             default:
@@ -448,7 +448,7 @@ void Splitter::ImplKbdTracking( KeyCode aKeyCode )
                 if ( aNewPos.Y() == maDragPos.Y() )
                     continue;
             }
-
+        
             maDragPos = aNewPos;
             long nNewPos;
             if ( mbHorzSplit )
@@ -558,7 +558,7 @@ void Splitter::ImplStartKbdSplitting()
 
     StartSplit();
 
-    // determine start position
+    // determine start position 
     // because we have no mouse position we take either the position
     // of the splitter window or the last split position
     // the other coordinate is just the center of the reference window
@@ -729,7 +729,7 @@ void Splitter::KeyInput( const KeyEvent& rKEvt )
             GrabFocusToDocument();
             break;
     }
-    mbInKeyEvent = 0;
+    mbInKeyEvent = 0;    
 }
 
 // -----------------------------------------------------------------------
@@ -752,7 +752,7 @@ void Splitter::DataChanged( const DataChangedEvent& rDCEvt )
         {
             if( newFaceColor.IsDark() )
                 SetBackground( ImplWhiteWall::get() );
-            else
+            else 
                 SetBackground( ImplBlackWall::get() );
         }
     }
@@ -763,7 +763,7 @@ void Splitter::DataChanged( const DataChangedEvent& rDCEvt )
 void Splitter::Paint( const Rectangle& rPaintRect )
 {
     if( HasFocus() || mbKbdSplitting )
-    {
+    {   
         Color oldFillCol = GetFillColor();
         Color oldLineCol = GetLineColor();
 
diff --git a/vcl/source/window/splitwin.cxx b/vcl/source/window/splitwin.cxx
index 689c56cbe619..d896cc631d41 100644
--- a/vcl/source/window/splitwin.cxx
+++ b/vcl/source/window/splitwin.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
@@ -52,49 +52,49 @@
 // Achtung: Darf keine Objekte enthalten, da mit memmove/memcpy gearbeitet wird
 struct ImplSplitItem
 {
-    long                mnSize;
-    long                mnPixSize;
-    long                mnLeft;
-    long                mnTop;
-    long                mnWidth;
-    long                mnHeight;
-    long                mnSplitPos;
-    long                mnSplitSize;
-    long                mnOldSplitPos;
-    long                mnOldSplitSize;
-    long                mnOldWidth;
-    long                mnOldHeight;
-    ImplSplitSet*       mpSet;
-    Window*             mpWindow;
-    Window*             mpOrgParent;
-    USHORT              mnId;
+    long				mnSize;
+    long				mnPixSize;
+    long				mnLeft;
+    long				mnTop;
+    long				mnWidth;
+    long				mnHeight;
+    long				mnSplitPos;
+    long				mnSplitSize;
+    long				mnOldSplitPos;
+    long				mnOldSplitSize;
+    long				mnOldWidth;
+    long				mnOldHeight;
+    ImplSplitSet*		mpSet;
+    Window* 			mpWindow;
+    Window* 			mpOrgParent;
+    USHORT				mnId;
     SplitWindowItemBits mnBits;
-    BOOL                mbFixed;
-    BOOL                mbSubSize;
+    BOOL				mbFixed;
+    BOOL				mbSubSize;
 };
 
 struct ImplSplitSet
 {
-    ImplSplitItem*      mpItems;
-    Wallpaper*          mpWallpaper;
-    Bitmap*             mpBitmap;
-    long                mnLastSize;
-    long                mnSplitSize;
-    USHORT              mnItems;
-    USHORT              mnId;
-    BOOL                mbCalcPix;
+    ImplSplitItem*		mpItems;
+    Wallpaper*			mpWallpaper;
+    Bitmap* 			mpBitmap;
+    long				mnLastSize;
+    long				mnSplitSize;
+    USHORT				mnItems;
+    USHORT				mnId;
+    BOOL				mbCalcPix;
 };
 
-#define SPLITWIN_SPLITSIZE              3
-#define SPLITWIN_SPLITSIZEEX            4
-#define SPLITWIN_SPLITSIZEEXLN          6
-#define SPLITWIN_SPLITSIZEAUTOHIDE      36
-#define SPLITWIN_SPLITSIZEFADE          36
+#define SPLITWIN_SPLITSIZE				3
+#define SPLITWIN_SPLITSIZEEX			4
+#define SPLITWIN_SPLITSIZEEXLN			6
+#define SPLITWIN_SPLITSIZEAUTOHIDE		36
+#define SPLITWIN_SPLITSIZEFADE			36
 
-#define SPLIT_HORZ              ((USHORT)0x0001)
-#define SPLIT_VERT              ((USHORT)0x0002)
-#define SPLIT_WINDOW            ((USHORT)0x0004)
-#define SPLIT_NOSPLIT           ((USHORT)0x8000)
+#define SPLIT_HORZ				((USHORT)0x0001)
+#define SPLIT_VERT				((USHORT)0x0002)
+#define SPLIT_WINDOW			((USHORT)0x0004)
+#define SPLIT_NOSPLIT			((USHORT)0x8000)
 
 // -----------------------------------------------------------------------
 
@@ -108,39 +108,39 @@ static void ImplCalcBorder( WindowAlign eAlign, BOOL bNoAlign,
 {
     if ( bNoAlign )
     {
-        rLeft   = 2;
-        rTop    = 2;
-        rRight  = 2;
+        rLeft	= 2;
+        rTop	= 2;
+        rRight	= 2;
         rBottom = 2;
     }
     else
     {
         if ( eAlign == WINDOWALIGN_TOP )
         {
-            rLeft   = 2;
-            rTop    = 2;
-            rRight  = 2;
+            rLeft	= 2;
+            rTop	= 2;
+            rRight	= 2;
             rBottom = 0;
         }
         else if ( eAlign == WINDOWALIGN_LEFT )
         {
-            rLeft   = 2;
-            rTop    = 2;
-            rRight  = 0;
+            rLeft	= 2;
+            rTop	= 2;
+            rRight	= 0;
             rBottom = 2;
         }
         else if ( eAlign == WINDOWALIGN_BOTTOM )
         {
-            rLeft   = 2;
-            rTop    = 0;
-            rRight  = 2;
+            rLeft	= 2;
+            rTop	= 0;
+            rRight	= 2;
             rBottom = 2;
         }
         else
         {
-            rLeft   = 0;
-            rTop    = 2;
-            rRight  = 2;
+            rLeft	= 0;
+            rTop	= 2;
+            rRight	= 2;
             rBottom = 2;
         }
     }
@@ -150,15 +150,15 @@ static void ImplCalcBorder( WindowAlign eAlign, BOOL bNoAlign,
 
 void SplitWindow::ImplDrawBorder( SplitWindow* pWin )
 {
-    const StyleSettings&    rStyleSettings = pWin->GetSettings().GetStyleSettings();
-    long                    nDX = pWin->mnDX;
-    long                    nDY = pWin->mnDY;
+    const StyleSettings&	rStyleSettings = pWin->GetSettings().GetStyleSettings();
+    long					nDX = pWin->mnDX;
+    long					nDY = pWin->mnDY;
 
     if ( pWin->mbNoAlign )
     {
-        DecorationView  aDecoView( pWin );
-        Point           aTmpPoint;
-        Rectangle       aRect( aTmpPoint, Size( nDX, nDY ) );
+        DecorationView	aDecoView( pWin );
+        Point			aTmpPoint;
+        Rectangle		aRect( aTmpPoint, Size( nDX, nDY ) );
         aDecoView.DrawFrame( aRect, FRAME_DRAW_DOUBLEIN );
     }
     else
@@ -255,9 +255,9 @@ void SplitWindow::ImplDrawBorderLine( SplitWindow* pWin )
 {
     if ( pWin->mbFadeOut || pWin->mbAutoHide )
     {
-        const StyleSettings&    rStyleSettings = pWin->GetSettings().GetStyleSettings();
-        long                    nDX = pWin->mnDX;
-        long                    nDY = pWin->mnDY;
+        const StyleSettings&	rStyleSettings = pWin->GetSettings().GetStyleSettings();
+        long					nDX = pWin->mnDX;
+        long					nDY = pWin->mnDY;
 
         if ( pWin->meAlign == WINDOWALIGN_LEFT )
         {
@@ -297,9 +297,9 @@ static ImplSplitSet* ImplFindSet( ImplSplitSet* pSet, USHORT nId )
     if ( pSet->mnId == nId )
         return pSet;
 
-    USHORT          i;
-    USHORT          nItems = pSet->mnItems;
-    ImplSplitItem*  pItems = pSet->mpItems;
+    USHORT			i;
+    USHORT			nItems = pSet->mnItems;
+    ImplSplitItem*	pItems = pSet->mpItems;
 
     for ( i = 0; i < nItems; i++ )
     {
@@ -324,9 +324,9 @@ static ImplSplitSet* ImplFindSet( ImplSplitSet* pSet, USHORT nId )
 
 static ImplSplitSet* ImplFindItem( ImplSplitSet* pSet, USHORT nId, USHORT& rPos )
 {
-    USHORT          i;
-    USHORT          nItems = pSet->mnItems;
-    ImplSplitItem*  pItems = pSet->mpItems;
+    USHORT			i;
+    USHORT			nItems = pSet->mnItems;
+    ImplSplitItem*	pItems = pSet->mpItems;
 
     for ( i = 0; i < nItems; i++ )
     {
@@ -354,9 +354,9 @@ static ImplSplitSet* ImplFindItem( ImplSplitSet* pSet, USHORT nId, USHORT& rPos
 
 static USHORT ImplFindItem( ImplSplitSet* pSet, Window* pWindow )
 {
-    USHORT          i;
-    USHORT          nItems = pSet->mnItems;
-    ImplSplitItem*  pItems = pSet->mpItems;
+    USHORT			i;
+    USHORT			nItems = pSet->mnItems;
+    ImplSplitItem*	pItems = pSet->mpItems;
 
     for ( i = 0; i < nItems; i++ )
     {
@@ -381,18 +381,18 @@ static USHORT ImplFindItem( ImplSplitSet* pSet, Window* pWindow )
 static USHORT ImplFindItem( ImplSplitSet* pSet, const Point& rPos,
                             BOOL bRows, BOOL bDown = TRUE )
 {
-    USHORT          i;
-    USHORT          nItems = pSet->mnItems;
-    ImplSplitItem*  pItems = pSet->mpItems;
+    USHORT			i;
+    USHORT			nItems = pSet->mnItems;
+    ImplSplitItem*	pItems = pSet->mpItems;
 
     for ( i = 0; i < nItems; i++ )
     {
         if ( pItems[i].mnWidth && pItems[i].mnHeight )
         {
             // Wegen ICC auftrennen
-            Point       aPoint( pItems[i].mnLeft, pItems[i].mnTop );
-            Size        aSize( pItems[i].mnWidth, pItems[i].mnHeight );
-            Rectangle   aRect( aPoint, aSize );
+            Point		aPoint( pItems[i].mnLeft, pItems[i].mnTop );
+            Size		aSize( pItems[i].mnWidth, pItems[i].mnHeight );
+            Rectangle	aRect( aPoint, aSize );
             if ( bRows )
             {
                 if ( bDown )
@@ -428,9 +428,9 @@ static USHORT ImplFindItem( ImplSplitSet* pSet, const Point& rPos,
 
 static void ImplDeleteSet( ImplSplitSet* pSet )
 {
-    USHORT          i;
-    USHORT          nItems = pSet->mnItems;
-    ImplSplitItem*  pItems = pSet->mpItems;
+    USHORT			i;
+    USHORT			nItems = pSet->mnItems;
+    ImplSplitItem*	pItems = pSet->mpItems;
 
     for ( i = 0; i < nItems; i++ )
     {
@@ -470,27 +470,27 @@ static void ImplCalcSet( ImplSplitSet* pSet,
     if ( !pSet->mpItems )
         return;
 
-    USHORT              i;
-    USHORT              j;
-    USHORT              nMins;
-    USHORT              nCalcItems;
-    USHORT              nItems = pSet->mnItems;
-    USHORT              nVisItems;
-    USHORT              nAbsItems;
-    long                nCalcSize;
-    long                nSizeDelta;
-    long                nCurSize;
-    long                nSizeWinSize;
-    long                nNewSizeWinSize;
-    long                nTemp;
-    long                nTempErr;
-    long                nErrorSum;
-    long                nCurSizeDelta;
-    long                nPos;
-    long                nMaxPos;
-    long*               pSize;
-    ImplSplitItem*      pItems = pSet->mpItems;
-    BOOL                bEmpty;
+    USHORT				i;
+    USHORT				j;
+    USHORT				nMins;
+    USHORT				nCalcItems;
+    USHORT				nItems = pSet->mnItems;
+    USHORT				nVisItems;
+    USHORT				nAbsItems;
+    long				nCalcSize;
+    long				nSizeDelta;
+    long				nCurSize;
+    long				nSizeWinSize;
+    long				nNewSizeWinSize;
+    long				nTemp;
+    long				nTempErr;
+    long				nErrorSum;
+    long				nCurSizeDelta;
+    long				nPos;
+    long				nMaxPos;
+    long*				pSize;
+    ImplSplitItem*		pItems = pSet->mpItems;
+    BOOL				bEmpty;
 
     // Anzahl sichtbarer Items ermitteln
     nVisItems = 0;
@@ -510,10 +510,10 @@ static void ImplCalcSet( ImplSplitSet* pSet,
     if ( pSet->mbCalcPix || (pSet->mnLastSize != nCalcSize) )
     {
         long nPercentFactor = 10;
-        long nRelCount      = 0;
-        long nPercent       = 0;
-        long nRelPercent    = 0;
-        long nAbsSize       = 0;
+        long nRelCount		= 0;
+        long nPercent		= 0;
+        long nRelPercent	= 0;
+        long nAbsSize		= 0;
         for ( i = 0; i < nItems; i++ )
         {
             if ( !(pItems[i].mnBits & SWIB_INVISIBLE) )
@@ -574,11 +574,11 @@ static void ImplCalcSet( ImplSplitSet* pSet,
         pSet->mnLastSize = nCalcSize;
 
         // Fenster einpassen
-        nSizeDelta  = nCalcSize-nCurSize;
+        nSizeDelta	= nCalcSize-nCurSize;
         if ( nSizeDelta )
         {
-            nAbsItems       = 0;
-            nSizeWinSize    = 0;
+            nAbsItems		= 0;
+            nSizeWinSize	= 0;
             nNewSizeWinSize = 0;
 
             // Zuerst die absoluten Items relativ resizen
@@ -611,8 +611,8 @@ static void ImplCalcSet( ImplSplitSet* pSet,
             }
 
             // Jetzt die Rundunsfehler ausgleichen
-            j           = 0;
-            nMins       = 0;
+            j			= 0;
+            nMins		= 0;
             while ( nSizeDelta && (nItems != nMins) )
             {
                 // Feststellen, welche Items berechnet werden duerfen
@@ -650,9 +650,9 @@ static void ImplCalcSet( ImplSplitSet* pSet,
                 }
 
                 // Groessen von den einzelnen Items abziehen
-                nErrorSum       = nSizeDelta % nCalcItems;
-                nCurSizeDelta   = nSizeDelta / nCalcItems;
-                nMins           = 0;
+                nErrorSum		= nSizeDelta % nCalcItems;
+                nCurSizeDelta	= nSizeDelta / nCalcItems;
+                nMins			= 0;
                 for ( i = 0; i < nItems; i++ )
                 {
                     if ( pItems[i].mnBits & SWIB_INVISIBLE )
@@ -729,8 +729,8 @@ static void ImplCalcSet( ImplSplitSet* pSet,
     {
         pItems[i].mnOldSplitPos    = pItems[i].mnSplitPos;
         pItems[i].mnOldSplitSize   = pItems[i].mnSplitSize;
-        pItems[i].mnOldWidth       = pItems[i].mnWidth;
-        pItems[i].mnOldHeight      = pItems[i].mnHeight;
+        pItems[i].mnOldWidth	   = pItems[i].mnWidth;
+        pItems[i].mnOldHeight	   = pItems[i].mnHeight;
 
         if ( pItems[i].mnBits & SWIB_INVISIBLE )
             bEmpty = TRUE;
@@ -752,8 +752,8 @@ static void ImplCalcSet( ImplSplitSet* pSet,
 
         if ( bEmpty )
         {
-            pItems[i].mnWidth     = 0;
-            pItems[i].mnHeight    = 0;
+            pItems[i].mnWidth	  = 0;
+            pItems[i].mnHeight	  = 0;
             pItems[i].mnSplitSize = 0;
         }
         else
@@ -844,9 +844,9 @@ static void ImplCalcSet( ImplSplitSet* pSet,
 void SplitWindow::ImplCalcSet2( SplitWindow* pWindow, ImplSplitSet* pSet, BOOL bHide,
                                 BOOL bRows, BOOL /*bDown*/ )
 {
-    USHORT          i;
-    USHORT          nItems = pSet->mnItems;
-    ImplSplitItem*  pItems = pSet->mpItems;
+    USHORT			i;
+    USHORT			nItems = pSet->mnItems;
+    ImplSplitItem*	pItems = pSet->mpItems;
 
     if ( pWindow->IsReallyVisible() && pWindow->IsUpdateMode() && pWindow->mbInvalidate )
     {
@@ -857,7 +857,7 @@ void SplitWindow::ImplCalcSet2( SplitWindow* pWindow, ImplSplitSet* pSet, BOOL b
                 // Evt. alles invalidieren oder nur einen kleinen Teil
                 if ( (pItems[i].mnOldSplitPos  != pItems[i].mnSplitPos)  ||
                      (pItems[i].mnOldSplitSize != pItems[i].mnSplitSize) ||
-                     (pItems[i].mnOldWidth     != pItems[i].mnWidth)     ||
+                     (pItems[i].mnOldWidth	   != pItems[i].mnWidth)	 ||
                      (pItems[i].mnOldHeight    != pItems[i].mnHeight) )
                 {
                     Rectangle aRect;
@@ -865,33 +865,33 @@ void SplitWindow::ImplCalcSet2( SplitWindow* pWindow, ImplSplitSet* pSet, BOOL b
                     // Old Rect invalidieren
                     if ( bRows )
                     {
-                        aRect.Left()    = pItems[i].mnLeft;
-                        aRect.Right()   = pItems[i].mnLeft+pItems[i].mnOldWidth-1;
-                        aRect.Top()     = pItems[i].mnOldSplitPos;
-                        aRect.Bottom()  = aRect.Top() + pItems[i].mnOldSplitSize;
+                        aRect.Left()	= pItems[i].mnLeft;
+                        aRect.Right()	= pItems[i].mnLeft+pItems[i].mnOldWidth-1;
+                        aRect.Top() 	= pItems[i].mnOldSplitPos;
+                        aRect.Bottom()	= aRect.Top() + pItems[i].mnOldSplitSize;
                     }
                     else
                     {
-                        aRect.Top()     = pItems[i].mnTop;
-                        aRect.Bottom()  = pItems[i].mnTop+pItems[i].mnOldHeight-1;
-                        aRect.Left()    = pItems[i].mnOldSplitPos;
-                        aRect.Right()   = aRect.Left() + pItems[i].mnOldSplitSize;
+                        aRect.Top() 	= pItems[i].mnTop;
+                        aRect.Bottom()	= pItems[i].mnTop+pItems[i].mnOldHeight-1;
+                        aRect.Left()	= pItems[i].mnOldSplitPos;
+                        aRect.Right()	= aRect.Left() + pItems[i].mnOldSplitSize;
                     }
                     pWindow->Invalidate( aRect );
                     // New Rect invalidieren
                     if ( bRows )
                     {
-                        aRect.Left()    = pItems[i].mnLeft;
-                        aRect.Right()   = pItems[i].mnLeft+pItems[i].mnWidth-1;
-                        aRect.Top()     = pItems[i].mnSplitPos;
-                        aRect.Bottom()  = aRect.Top() + pItems[i].mnSplitSize;
+                        aRect.Left()	= pItems[i].mnLeft;
+                        aRect.Right()	= pItems[i].mnLeft+pItems[i].mnWidth-1;
+                        aRect.Top() 	= pItems[i].mnSplitPos;
+                        aRect.Bottom()	= aRect.Top() + pItems[i].mnSplitSize;
                     }
                     else
                     {
-                        aRect.Top()     = pItems[i].mnTop;
-                        aRect.Bottom()  = pItems[i].mnTop+pItems[i].mnHeight-1;
-                        aRect.Left()    = pItems[i].mnSplitPos;
-                        aRect.Right()   = aRect.Left() + pItems[i].mnSplitSize;
+                        aRect.Top() 	= pItems[i].mnTop;
+                        aRect.Bottom()	= pItems[i].mnTop+pItems[i].mnHeight-1;
+                        aRect.Left()	= pItems[i].mnSplitPos;
+                        aRect.Right()	= aRect.Left() + pItems[i].mnSplitSize;
                     }
                     pWindow->Invalidate( aRect );
 
@@ -899,10 +899,10 @@ void SplitWindow::ImplCalcSet2( SplitWindow* pWindow, ImplSplitSet* pSet, BOOL b
                     // nicht von Fenstern ueberladen werden
                     if ( pItems[i].mpSet && !pItems[i].mpSet->mpItems )
                     {
-                        aRect.Left()    = pItems[i].mnLeft;
-                        aRect.Top()     = pItems[i].mnTop;
-                        aRect.Right()   = pItems[i].mnLeft+pItems[i].mnWidth-1;
-                        aRect.Bottom()  = pItems[i].mnTop+pItems[i].mnHeight-1;
+                        aRect.Left()	= pItems[i].mnLeft;
+                        aRect.Top() 	= pItems[i].mnTop;
+                        aRect.Right()	= pItems[i].mnLeft+pItems[i].mnWidth-1;
+                        aRect.Bottom()	= pItems[i].mnTop+pItems[i].mnHeight-1;
                         pWindow->Invalidate( aRect );
                     }
                 }
@@ -947,9 +947,9 @@ void SplitWindow::ImplCalcSet2( SplitWindow* pWindow, ImplSplitSet* pSet, BOOL b
 static void ImplCalcLogSize( ImplSplitItem* pItems, USHORT nItems )
 {
     // Original-Groessen updaten
-    USHORT  i;
-    long    nRelSize = 0;
-    long    nPerSize = 0;
+    USHORT	i;
+    long	nRelSize = 0;
+    long	nPerSize = 0;
     for ( i = 0; i < nItems; i++ )
     {
         if ( pItems[i].mnBits & SWIB_RELATIVESIZE )
@@ -986,8 +986,8 @@ void SplitWindow::ImplDrawBack( SplitWindow* pWindow, const Rectangle& rRect,
 {
     if ( pBitmap )
     {
-        Point   aPos = rRect.TopLeft();
-        Size    aBmpSize = pBitmap->GetSizePixel();
+        Point	aPos = rRect.TopLeft();
+        Size	aBmpSize = pBitmap->GetSizePixel();
         pWindow->Push( PUSH_CLIPREGION );
         pWindow->IntersectClipRegion( rRect );
         do
@@ -1012,9 +1012,9 @@ void SplitWindow::ImplDrawBack( SplitWindow* pWindow, const Rectangle& rRect,
 
 void SplitWindow::ImplDrawBack( SplitWindow* pWindow, ImplSplitSet* pSet )
 {
-    USHORT          i;
-    USHORT          nItems = pSet->mnItems;
-    ImplSplitItem*  pItems = pSet->mpItems;
+    USHORT			i;
+    USHORT			nItems = pSet->mnItems;
+    ImplSplitItem*	pItems = pSet->mpItems;
 
     // Beim Mainset auch den Hintergrund zeichnen
     if ( pSet->mnId == 0 )
@@ -1037,9 +1037,9 @@ void SplitWindow::ImplDrawBack( SplitWindow* pWindow, ImplSplitSet* pSet )
             if ( pSet->mpBitmap || pSet->mpWallpaper )
             {
                 // Wegen ICC auftrennen
-                Point       aPoint( pItems[i].mnLeft, pItems[i].mnTop );
-                Size        aSize( pItems[i].mnWidth, pItems[i].mnHeight );
-                Rectangle   aRect( aPoint, aSize );
+                Point		aPoint( pItems[i].mnLeft, pItems[i].mnTop );
+                Size		aSize( pItems[i].mnWidth, pItems[i].mnHeight );
+                Rectangle	aRect( aPoint, aSize );
                 ImplDrawBack( pWindow, aRect, pSet->mpWallpaper, pSet->mpBitmap );
             }
         }
@@ -1060,13 +1060,13 @@ static void ImplDrawSplit( SplitWindow* pWindow, ImplSplitSet* pSet,
     if ( !pSet->mpItems )
         return;
 
-    USHORT                  i;
-    USHORT                  nItems = pSet->mnItems;
-    long                    nPos;
-    long                    nTop;
-    long                    nBottom;
-    ImplSplitItem*          pItems = pSet->mpItems;
-    const StyleSettings&    rStyleSettings = pWindow->GetSettings().GetStyleSettings();
+    USHORT					i;
+    USHORT					nItems = pSet->mnItems;
+    long					nPos;
+    long					nTop;
+    long					nBottom;
+    ImplSplitItem*			pItems = pSet->mpItems;
+    const StyleSettings&	rStyleSettings = pWindow->GetSettings().GetStyleSettings();
 
     BOOL bFlat = (pWindow->GetStyle() & WB_FLATSPLITDRAW) == WB_FLATSPLITDRAW;
 
@@ -1080,7 +1080,7 @@ static void ImplDrawSplit( SplitWindow* pWindow, ImplSplitSet* pSet,
             long nSplitSize = pSet->mnSplitSize;
             if ( bRows )
             {
-                nTop    = pItems[i].mnLeft;
+                nTop	= pItems[i].mnLeft;
                 nBottom = pItems[i].mnLeft+pItems[i].mnWidth-1;
 
                 if ( bFlat ) nPos--;
@@ -1110,7 +1110,7 @@ static void ImplDrawSplit( SplitWindow* pWindow, ImplSplitSet* pSet,
             }
             else
             {
-                nTop    = pItems[i].mnTop;
+                nTop	= pItems[i].mnTop;
                 nBottom = pItems[i].mnTop+pSet->mpItems[i].mnHeight-1;
 
                 if ( bFlat ) nPos--;
@@ -1156,15 +1156,15 @@ USHORT SplitWindow::ImplTestSplit( ImplSplitSet* pSet, const Point& rPos,
     if ( !pSet->mpItems )
         return 0;
 
-    USHORT          i;
-    USHORT          nSplitTest;
-    USHORT          nItems = pSet->mnItems;
-    long            nMPos1;
-    long            nMPos2;
-    long            nPos;
-    long            nTop;
-    long            nBottom;
-    ImplSplitItem*   pItems = pSet->mpItems;
+    USHORT			i;
+    USHORT			nSplitTest;
+    USHORT			nItems = pSet->mnItems;
+    long			nMPos1;
+    long			nMPos2;
+    long			nPos;
+    long			nTop;
+    long			nBottom;
+    ImplSplitItem*	 pItems = pSet->mpItems;
 
     if ( bRows )
     {
@@ -1183,12 +1183,12 @@ USHORT SplitWindow::ImplTestSplit( ImplSplitSet* pSet, const Point& rPos,
         {
             if ( bRows )
             {
-                nTop    = pItems[i].mnLeft;
+                nTop	= pItems[i].mnLeft;
                 nBottom = pItems[i].mnLeft+pItems[i].mnWidth-1;
             }
             else
             {
-                nTop    = pItems[i].mnTop;
+                nTop	= pItems[i].mnTop;
                 nBottom = pItems[i].mnTop+pItems[i].mnHeight-1;
             }
             nPos = pItems[i].mnSplitPos;
@@ -1235,9 +1235,9 @@ USHORT SplitWindow::ImplTestSplit( SplitWindow* pWindow, const Point& rPos,
     // Resizeable SplitWindow muss anders behandelt werden
     if ( pWindow->mnWinStyle & WB_SIZEABLE )
     {
-        long    nTPos;
-        long    nPos;
-        long    nBorder;
+        long	nTPos;
+        long	nPos;
+        long	nBorder;
 
         if ( pWindow->mbHorz )
         {
@@ -1314,10 +1314,10 @@ void SplitWindow::ImplDrawSplitTracking( SplitWindow* pThis, const Point& rPos )
     }
     else
     {
-        aRect.Left()    = pThis->maDragRect.Left();
-        aRect.Right()   = pThis->maDragRect.Right();
-        aRect.Top()     = rPos.Y();
-        aRect.Bottom()  = aRect.Top()+pThis->mpSplitSet->mnSplitSize-1;
+        aRect.Left()	= pThis->maDragRect.Left();
+        aRect.Right()	= pThis->maDragRect.Right();
+        aRect.Top() 	= rPos.Y();
+        aRect.Bottom()	= aRect.Top()+pThis->mpSplitSet->mnSplitSize-1;
         if ( !(pThis->mnWinStyle & WB_NOSPLITDRAW) )
             aRect.Bottom()--;
         if ( (pThis->mnSplitTest & SPLIT_WINDOW) &&
@@ -1334,53 +1334,53 @@ void SplitWindow::ImplDrawSplitTracking( SplitWindow* pThis, const Point& rPos )
 
 void SplitWindow::ImplInit( Window* pParent, WinBits nStyle )
 {
-    ImplSplitSet* pNewSet   = new ImplSplitSet;
-    pNewSet->mpItems        = NULL;
-    pNewSet->mpWallpaper    = NULL;
-    pNewSet->mpBitmap       = NULL;
-    pNewSet->mnLastSize     = 0;
-    pNewSet->mnItems        = 0;
-    pNewSet->mnId           = 0;
-    pNewSet->mnSplitSize    = SPLITWIN_SPLITSIZE;
-    pNewSet->mbCalcPix      = TRUE;
-
-    mpMainSet               = pNewSet;
-    mpBaseSet               = pNewSet;
-    mpSplitSet              = NULL;
-    mpLastSizes             = NULL;
-    mnDX                    = 0;
-    mnDY                    = 0;
-    mnLeftBorder            = 0;
-    mnTopBorder             = 0;
-    mnRightBorder           = 0;
-    mnBottomBorder          = 0;
-    mnMaxSize               = 0;
-    mnMouseOff              = 0;
-    meAlign                 = WINDOWALIGN_TOP;
-    mnWinStyle              = nStyle;
-    mnSplitTest             = 0;
-    mnSplitPos              = 0;
-    mnMouseModifier         = 0;
-    mnMStartPos             = 0;
-    mnMSplitPos             = 0;
-    mbDragFull              = FALSE;
-    mbHorz                  = TRUE;
-    mbBottomRight           = FALSE;
-    mbCalc                  = FALSE;
-    mbRecalc                = TRUE;
-    mbInvalidate            = TRUE;
-    mbAutoHide              = FALSE;
-    mbFadeIn                = FALSE;
-    mbFadeOut               = FALSE;
-    mbAutoHideIn            = FALSE;
-    mbAutoHideDown          = FALSE;
-    mbFadeInDown            = FALSE;
-    mbFadeOutDown           = FALSE;
-    mbAutoHidePressed       = FALSE;
-    mbFadeInPressed         = FALSE;
-    mbFadeOutPressed        = FALSE;
-    mbFadeNoButtonMode      = FALSE;
-    mbNoAlign               = FALSE;
+    ImplSplitSet* pNewSet	= new ImplSplitSet;
+    pNewSet->mpItems		= NULL;
+    pNewSet->mpWallpaper	= NULL;
+    pNewSet->mpBitmap		= NULL;
+    pNewSet->mnLastSize 	= 0;
+    pNewSet->mnItems		= 0;
+    pNewSet->mnId			= 0;
+    pNewSet->mnSplitSize	= SPLITWIN_SPLITSIZE;
+    pNewSet->mbCalcPix		= TRUE;
+
+    mpMainSet				= pNewSet;
+    mpBaseSet				= pNewSet;
+    mpSplitSet				= NULL;
+    mpLastSizes 			= NULL;
+    mnDX					= 0;
+    mnDY					= 0;
+    mnLeftBorder			= 0;
+    mnTopBorder 			= 0;
+    mnRightBorder			= 0;
+    mnBottomBorder			= 0;
+    mnMaxSize				= 0;
+    mnMouseOff				= 0;
+    meAlign 				= WINDOWALIGN_TOP;
+    mnWinStyle				= nStyle;
+    mnSplitTest 			= 0;
+    mnSplitPos				= 0;
+    mnMouseModifier 		= 0;
+    mnMStartPos 			= 0;
+    mnMSplitPos 			= 0;
+    mbDragFull				= FALSE;
+    mbHorz					= TRUE;
+    mbBottomRight			= FALSE;
+    mbCalc					= FALSE;
+    mbRecalc				= TRUE;
+    mbInvalidate			= TRUE;
+    mbAutoHide				= FALSE;
+    mbFadeIn				= FALSE;
+    mbFadeOut				= FALSE;
+    mbAutoHideIn			= FALSE;
+    mbAutoHideDown			= FALSE;
+    mbFadeInDown			= FALSE;
+    mbFadeOutDown			= FALSE;
+    mbAutoHidePressed		= FALSE;
+    mbFadeInPressed 		= FALSE;
+    mbFadeOutPressed		= FALSE;
+    mbFadeNoButtonMode		= FALSE;
+    mbNoAlign				= FALSE;
 
     if ( nStyle & WB_NOSPLITDRAW )
     {
@@ -1507,7 +1507,7 @@ Size SplitWindow::CalcLayoutSizePixel( const Size& aNewSize )
 {
     Size aSize( aNewSize );
     long nSplitSize = mpMainSet->mnSplitSize-2;
-
+    
     if ( mbAutoHide || mbFadeOut )
         nSplitSize += SPLITWIN_SPLITSIZEEXLN;
 
@@ -1516,9 +1516,9 @@ Size SplitWindow::CalcLayoutSizePixel( const Size& aNewSize )
     // ist
     if ( mnWinStyle & WB_SIZEABLE )
     {
-        long    nCurSize;
-        long    nCalcSize = 0;
-        USHORT  i;
+        long	nCurSize;
+        long	nCalcSize = 0;
+        USHORT	i;
 
         for ( i = 0; i < mpMainSet->mnItems; i++ )
         {
@@ -1530,9 +1530,9 @@ Size SplitWindow::CalcLayoutSizePixel( const Size& aNewSize )
 
         if ( i == mpMainSet->mnItems )
         {
-            long    nDelta = 0;
-            Point   aPos = GetPosPixel();
-
+            long	nDelta = 0;
+            Point	aPos = GetPosPixel();
+            
             if ( mbHorz )
                 nCurSize = aNewSize.Height()-mnTopBorder-mnBottomBorder;
             else
@@ -1584,9 +1584,9 @@ void SplitWindow::ImplCalcLayout()
     // ist
     if ( mnWinStyle & WB_SIZEABLE )
     {
-        long    nCurSize;
-        long    nCalcSize = 0;
-        USHORT  i;
+        long	nCurSize;
+        long	nCalcSize = 0;
+        USHORT	i;
 
         for ( i = 0; i < mpMainSet->mnItems; i++ )
         {
@@ -1615,10 +1615,10 @@ void SplitWindow::ImplCalcLayout()
         return;
 
     // Groessen/Position vorberechnen
-    long    nL;
-    long    nT;
-    long    nW;
-    long    nH;
+    long	nL;
+    long	nT;
+    long	nW;
+    long	nH;
 
     if ( mbHorz )
     {
@@ -1688,22 +1688,22 @@ void SplitWindow::ImplUpdateSet( ImplSplitSet* pSet )
         Rectangle aRect;
         if ( pSet == mpMainSet )
         {
-            aRect.Left()    = mnLeftBorder;
-            aRect.Top()     = mnTopBorder;
-            aRect.Right()   = mnDX-mnRightBorder-1;
-            aRect.Bottom()  = mnDY-mnBottomBorder-1;
+            aRect.Left()	= mnLeftBorder;
+            aRect.Top() 	= mnTopBorder;
+            aRect.Right()	= mnDX-mnRightBorder-1;
+            aRect.Bottom()	= mnDY-mnBottomBorder-1;
         }
         else
         {
-            ImplSplitItem*  pItem;
-            USHORT          nPos;
+            ImplSplitItem*	pItem;
+            USHORT			nPos;
 
             pSet = ImplFindItem( mpMainSet, pSet->mnId, nPos );
             pItem = &(pSet->mpItems[nPos]);
-            aRect.Left()    = pItem->mnLeft;
-            aRect.Top()     = pItem->mnTop;
-            aRect.Right()   = aRect.Left()+pItem->mnWidth;
-            aRect.Bottom()  = aRect.Top()+pItem->mnHeight;
+            aRect.Left()	= pItem->mnLeft;
+            aRect.Top() 	= pItem->mnTop;
+            aRect.Right()	= aRect.Left()+pItem->mnWidth;
+            aRect.Bottom()	= aRect.Top()+pItem->mnHeight;
         }
         Invalidate( aRect );
     }
@@ -1759,50 +1759,50 @@ void SplitWindow::ImplGetButtonRect( Rectangle& rRect, long nEx, BOOL bTest ) co
 
     if ( meAlign == WINDOWALIGN_TOP )
     {
-        rRect.Left()    = mnLeftBorder+nEx;
-        rRect.Top()     = mnDY-mnBottomBorder-nSplitSize;
-        rRect.Right()   = rRect.Left()+SPLITWIN_SPLITSIZEAUTOHIDE;
-        rRect.Bottom()  = mnDY-mnBottomBorder-1;
+        rRect.Left()	= mnLeftBorder+nEx;
+        rRect.Top() 	= mnDY-mnBottomBorder-nSplitSize;
+        rRect.Right()	= rRect.Left()+SPLITWIN_SPLITSIZEAUTOHIDE;
+        rRect.Bottom()	= mnDY-mnBottomBorder-1;
         if ( bTest )
         {
-            rRect.Top()     -= mnTopBorder;
-            rRect.Bottom()  += mnBottomBorder;
+            rRect.Top() 	-= mnTopBorder;
+            rRect.Bottom()	+= mnBottomBorder;
         }
     }
     else if ( meAlign == WINDOWALIGN_BOTTOM )
     {
-        rRect.Left()    = mnLeftBorder+nEx;
-        rRect.Top()     = mnTopBorder;
-        rRect.Right()   = rRect.Left()+SPLITWIN_SPLITSIZEAUTOHIDE;
-        rRect.Bottom()  = mnTopBorder+nSplitSize-1;
+        rRect.Left()	= mnLeftBorder+nEx;
+        rRect.Top() 	= mnTopBorder;
+        rRect.Right()	= rRect.Left()+SPLITWIN_SPLITSIZEAUTOHIDE;
+        rRect.Bottom()	= mnTopBorder+nSplitSize-1;
         if ( bTest )
         {
-            rRect.Top()     -= mnTopBorder;
-            rRect.Bottom()  += mnBottomBorder;
+            rRect.Top() 	-= mnTopBorder;
+            rRect.Bottom()	+= mnBottomBorder;
         }
     }
     else if ( meAlign == WINDOWALIGN_LEFT )
     {
-        rRect.Left()    = mnDX-mnRightBorder-nSplitSize;
-        rRect.Top()     = mnTopBorder+nEx;
-        rRect.Right()   = mnDX-mnRightBorder-1;
-        rRect.Bottom()  = rRect.Top()+SPLITWIN_SPLITSIZEAUTOHIDE;
+        rRect.Left()	= mnDX-mnRightBorder-nSplitSize;
+        rRect.Top() 	= mnTopBorder+nEx;
+        rRect.Right()	= mnDX-mnRightBorder-1;
+        rRect.Bottom()	= rRect.Top()+SPLITWIN_SPLITSIZEAUTOHIDE;
         if ( bTest )
         {
-            rRect.Left()    -= mnLeftBorder;
-            rRect.Right()   += mnRightBorder;
+            rRect.Left()	-= mnLeftBorder;
+            rRect.Right()	+= mnRightBorder;
         }
     }
     else if ( meAlign == WINDOWALIGN_RIGHT )
     {
-        rRect.Left()    = mnLeftBorder;
-        rRect.Top()     = mnTopBorder+nEx;
-        rRect.Right()   = mnLeftBorder+nSplitSize-1;
-        rRect.Bottom()  = rRect.Top()+SPLITWIN_SPLITSIZEAUTOHIDE;
+        rRect.Left()	= mnLeftBorder;
+        rRect.Top() 	= mnTopBorder+nEx;
+        rRect.Right()	= mnLeftBorder+nSplitSize-1;
+        rRect.Bottom()	= rRect.Top()+SPLITWIN_SPLITSIZEAUTOHIDE;
         if ( bTest )
         {
-            rRect.Left()    -= mnLeftBorder;
-            rRect.Right()   += mnRightBorder;
+            rRect.Left()	-= mnLeftBorder;
+            rRect.Right()	+= mnRightBorder;
         }
     }
 }
@@ -1930,7 +1930,7 @@ void SplitWindow::ImplDrawAutoHide( BOOL bInPaint )
 
         // ImageListe laden, wenn noch nicht vorhanden
         ImplSVData* pSVData = ImplGetSVData();
-        ImageList*  pImageList;
+        ImageList*	pImageList;
         if ( mbHorz )
         {
             if ( !pSVData->maCtrlData.mpSplitHPinImgList )
@@ -1943,7 +1943,7 @@ void SplitWindow::ImplDrawAutoHide( BOOL bInPaint )
                     pSVData->maCtrlData.mpSplitHPinImgList->InsertFromHorizontalBitmap
                         ( ResId( SV_RESID_BITMAP_SPLITHPIN, *pResMgr ), 4, &aNonAlphaMask );
                 }
-                }
+                }	
             pImageList = pSVData->maCtrlData.mpSplitHPinImgList;
         }
         else
@@ -1960,7 +1960,7 @@ void SplitWindow::ImplDrawAutoHide( BOOL bInPaint )
                 }
             }
             pImageList = pSVData->maCtrlData.mpSplitVPinImgList;
-                }
+                }		
 
         // Image ermitteln und zurueckgeben
         USHORT nId;
@@ -1979,11 +1979,11 @@ void SplitWindow::ImplDrawAutoHide( BOOL bInPaint )
                 nId = 2;
         }
 
-        Image   aImage = pImageList->GetImage( nId );
-        Size    aImageSize = aImage.GetSizePixel();
-        Point   aPos( aTempRect.Left()+((aTempRect.GetWidth()-aImageSize.Width())/2),
+        Image	aImage = pImageList->GetImage( nId );
+        Size	aImageSize = aImage.GetSizePixel();
+        Point	aPos( aTempRect.Left()+((aTempRect.GetWidth()-aImageSize.Width())/2),
                       aTempRect.Top()+((aTempRect.GetHeight()-aImageSize.Height())/2) );
-        long    nSize;
+        long	nSize;
         if ( mbHorz )
             nSize = aImageSize.Width();
         else
@@ -2113,19 +2113,19 @@ void SplitWindow::ImplDrawFadeIn( BOOL bInPaint )
 {
     if ( mbFadeIn )
     {
-        Rectangle       aTempRect;
-        Image           aImage;
+        Rectangle		aTempRect;
+        Image			aImage;
         ImplGetFadeInRect( aTempRect );
 
         BOOL bLeft;
         if ( meAlign == WINDOWALIGN_TOP )
-            bLeft   = FALSE;
+            bLeft	= FALSE;
         else if ( meAlign == WINDOWALIGN_BOTTOM )
-            bLeft   = TRUE;
+            bLeft	= TRUE;
         else if ( meAlign == WINDOWALIGN_LEFT )
-            bLeft   = FALSE;
+            bLeft	= FALSE;
         else if ( meAlign == WINDOWALIGN_RIGHT )
-            bLeft   = TRUE;
+            bLeft	= TRUE;
         else
             bLeft   = TRUE;
 
@@ -2142,19 +2142,19 @@ void SplitWindow::ImplDrawFadeOut( BOOL bInPaint )
 {
     if ( mbFadeOut )
     {
-        Rectangle       aTempRect;
-        Image           aImage;
+        Rectangle		aTempRect;
+        Image			aImage;
         ImplGetFadeOutRect( aTempRect );
 
         BOOL bLeft;
         if ( meAlign == WINDOWALIGN_TOP )
-            bLeft   = TRUE;
+            bLeft	= TRUE;
         else if ( meAlign == WINDOWALIGN_BOTTOM )
-            bLeft   = FALSE;
+            bLeft	= FALSE;
         else if ( meAlign == WINDOWALIGN_LEFT )
-            bLeft   = TRUE;
+            bLeft	= TRUE;
         else if ( meAlign == WINDOWALIGN_RIGHT )
-            bLeft   = FALSE;
+            bLeft	= FALSE;
         else
             bLeft   = TRUE;
 
@@ -2173,11 +2173,11 @@ void SplitWindow::ImplStartSplit( const MouseEvent& rMEvt )
 
     if ( mnSplitTest && !(mnSplitTest & SPLIT_NOSPLIT) )
     {
-        ImplSplitItem*  pSplitItem;
-        long            nCurMaxSize;
-        USHORT          nTemp;
-        BOOL            bDown;
-        BOOL            bPropSmaller;
+        ImplSplitItem*	pSplitItem;
+        long			nCurMaxSize;
+        USHORT			nTemp;
+        BOOL			bDown;
+        BOOL			bPropSmaller;
 
         mnMouseModifier = rMEvt.GetModifier();
         if ( !(mnMouseModifier & KEY_SHIFT) || (mnSplitPos+1 >= mpSplitSet->mnItems) )
@@ -2205,10 +2205,10 @@ void SplitWindow::ImplStartSplit( const MouseEvent& rMEvt )
             if ( (mpSplitSet == mpMainSet) && mbBottomRight )
                 bDown = FALSE;
 
-            pSplitItem          = &(mpSplitSet->mpItems[mnSplitPos]);
-            maDragRect.Left()   = pSplitItem->mnLeft;
-            maDragRect.Top()    = pSplitItem->mnTop;
-            maDragRect.Right()  = pSplitItem->mnLeft+pSplitItem->mnWidth-1;
+            pSplitItem			= &(mpSplitSet->mpItems[mnSplitPos]);
+            maDragRect.Left()	= pSplitItem->mnLeft;
+            maDragRect.Top()	= pSplitItem->mnTop;
+            maDragRect.Right()	= pSplitItem->mnLeft+pSplitItem->mnWidth-1;
             maDragRect.Bottom() = pSplitItem->mnTop+pSplitItem->mnHeight-1;
 
             if ( mnSplitTest & SPLIT_HORZ )
@@ -2303,9 +2303,9 @@ void SplitWindow::ImplStartSplit( const MouseEvent& rMEvt )
         }
         else
         {
-            maDragRect.Left()   = mnLeftBorder;
-            maDragRect.Top()    = mnTopBorder;
-            maDragRect.Right()  = mnDX-mnRightBorder-1;
+            maDragRect.Left()	= mnLeftBorder;
+            maDragRect.Top()	= mnTopBorder;
+            maDragRect.Right()	= mnDX-mnRightBorder-1;
             maDragRect.Bottom() = mnDY-mnBottomBorder-1;
             if ( mbHorz )
             {
@@ -2333,8 +2333,8 @@ void SplitWindow::ImplStartSplit( const MouseEvent& rMEvt )
             ImplDrawSplitTracking( this, aMousePosPixel );
         else
         {
-            ImplSplitItem*  pItems = mpSplitSet->mpItems;
-            USHORT          nItems = mpSplitSet->mnItems;
+            ImplSplitItem*	pItems = mpSplitSet->mpItems;
+            USHORT			nItems = mpSplitSet->mnItems;
             mpLastSizes = new long[nItems*2];
             for ( USHORT i = 0; i < nItems; i++ )
             {
@@ -2408,8 +2408,8 @@ void SplitWindow::MouseButtonDown( const MouseEvent& rMEvt )
         return;
     }
 
-    Point           aMousePosPixel = rMEvt.GetPosPixel();
-    Rectangle       aTestRect;
+    Point			aMousePosPixel = rMEvt.GetPosPixel();
+    Rectangle		aTestRect;
 
     mbFadeNoButtonMode = FALSE;
     ImplGetAutoHideRect( aTestRect, TRUE );
@@ -2458,15 +2458,15 @@ void SplitWindow::MouseMove( const MouseEvent& rMEvt )
 {
     if ( !IsTracking() )
     {
-        Point           aPos = rMEvt.GetPosPixel();
-        long            nTemp;
-        ImplSplitSet*   pTempSplitSet;
-        USHORT          nTempSplitPos;
-        USHORT          nSplitTest = ImplTestSplit( this, aPos, nTemp, &pTempSplitSet, nTempSplitPos );
-        PointerStyle    eStyle = POINTER_ARROW;
-        Rectangle       aAutoHideRect;
-        Rectangle       aFadeInRect;
-        Rectangle       aFadeOutRect;
+        Point			aPos = rMEvt.GetPosPixel();
+        long			nTemp;
+        ImplSplitSet*	pTempSplitSet;
+        USHORT			nTempSplitPos;
+        USHORT			nSplitTest = ImplTestSplit( this, aPos, nTemp, &pTempSplitSet, nTempSplitPos );
+        PointerStyle	eStyle = POINTER_ARROW;
+        Rectangle		aAutoHideRect;
+        Rectangle		aFadeInRect;
+        Rectangle		aFadeOutRect;
 
         ImplGetAutoHideRect( aAutoHideRect );
         ImplGetFadeInRect( aFadeInRect );
@@ -2598,11 +2598,11 @@ void SplitWindow::Tracking( const TrackingEvent& rTEvt )
             {
                 if ( rTEvt.IsTrackingCanceled() )
                 {
-                    ImplSplitItem*  pItems = mpSplitSet->mpItems;
-                    USHORT          nItems = mpSplitSet->mnItems;
+                    ImplSplitItem*	pItems = mpSplitSet->mpItems;
+                    USHORT			nItems = mpSplitSet->mnItems;
                     for ( USHORT i = 0; i < nItems; i++ )
                     {
-                        pItems[i].mnSize     = mpLastSizes[i*2];
+                        pItems[i].mnSize	 = mpLastSizes[i*2];
                         pItems[i].mnPixSize  = mpLastSizes[i*2+1];
                     }
                     ImplUpdate();
@@ -2627,9 +2627,9 @@ void SplitWindow::Tracking( const TrackingEvent& rTEvt )
 
         if ( bSplit )
         {
-            BOOL    bPropSmaller = (mnMouseModifier & KEY_SHIFT) ? TRUE : FALSE;
-            BOOL    bPropGreater = (mnMouseModifier & KEY_MOD1) ? TRUE : FALSE;
-            long    nDelta = mnMSplitPos-mnMStartPos;
+            BOOL	bPropSmaller = (mnMouseModifier & KEY_SHIFT) ? TRUE : FALSE;
+            BOOL	bPropGreater = (mnMouseModifier & KEY_MOD1) ? TRUE : FALSE;
+            long	nDelta = mnMSplitPos-mnMStartPos;
 
             if ( (mnSplitTest & SPLIT_WINDOW) && !mpMainSet->mpItems )
             {
@@ -2661,14 +2661,14 @@ void SplitWindow::Tracking( const TrackingEvent& rTEvt )
         {
             if ( mpLastSizes )
                 delete mpLastSizes;
-            mpLastSizes     = NULL;
-            mpSplitSet      = NULL;
-            mnMouseOff      = 0;
-            mnMStartPos     = 0;
-            mnMSplitPos     = 0;
+            mpLastSizes 	= NULL;
+            mpSplitSet		= NULL;
+            mnMouseOff		= 0;
+            mnMStartPos 	= 0;
+            mnMSplitPos 	= 0;
             mnMouseModifier = 0;
-            mnSplitTest     = 0;
-            mnSplitPos      = 0;
+            mnSplitTest 	= 0;
+            mnSplitPos		= 0;
         }
     }
 }
@@ -2688,7 +2688,7 @@ long SplitWindow::PreNotify( NotifyEvent& rNEvt )
             Rectangle aFadeOutRect;
             ImplGetFadeInRect( aFadeInRect );
             ImplGetFadeOutRect( aFadeOutRect );
-
+            
             if ( aFadeInRect.IsInside( GetPointerPosPixel() ) != aFadeInRect.IsInside( GetLastPointerPosPixel() ) )
                 Invalidate( aFadeInRect );
             if ( aFadeOutRect.IsInside( GetPointerPosPixel() ) != aFadeOutRect.IsInside( GetLastPointerPosPixel() ) )
@@ -2750,9 +2750,9 @@ void SplitWindow::RequestHelp( const HelpEvent& rHEvt )
     // no keyboard help for splitwin
     if ( rHEvt.GetMode() & (HELPMODE_BALLOON | HELPMODE_QUICK) && !rHEvt.KeyboardActivated() )
     {
-        Point       aMousePosPixel = ScreenToOutputPixel( rHEvt.GetMousePosPixel() );
-        Rectangle   aHelpRect;
-        USHORT      nHelpResId = 0;
+        Point		aMousePosPixel = ScreenToOutputPixel( rHEvt.GetMousePosPixel() );
+        Rectangle	aHelpRect;
+        USHORT		nHelpResId = 0;
 
         ImplGetAutoHideRect( aHelpRect, TRUE );
         if ( aHelpRect.IsInside( aMousePosPixel ) )
@@ -2854,7 +2854,7 @@ void SplitWindow::InsertItem( USHORT nId, Window* pWindow, long nSize,
     if ( nSize < 1 )
         nSize = 1;
 
-    ImplSplitSet* pSet       = ImplFindSet( mpMainSet, nSetId );
+    ImplSplitSet* pSet		 = ImplFindSet( mpMainSet, nSetId );
     ImplSplitSet* pNewSet;
     ImplSplitItem* pItem;
 
@@ -2872,16 +2872,16 @@ void SplitWindow::InsertItem( USHORT nId, Window* pWindow, long nSize,
     pSet->mbCalcPix = TRUE;
 
     // Item anlegen und erweitern
-    pItem           = &(pSet->mpItems[nPos]);
+    pItem			= &(pSet->mpItems[nPos]);
     memset( pItem, 0, sizeof( ImplSplitItem ) );
-    pItem->mnSize   = nSize;
-    pItem->mnId     = nId;
-    pItem->mnBits   = nBits;
+    pItem->mnSize	= nSize;
+    pItem->mnId 	= nId;
+    pItem->mnBits	= nBits;
 
     if ( pWindow )
     {
-        pItem->mpWindow         = pWindow;
-        pItem->mpOrgParent      = pWindow->GetParent();
+        pItem->mpWindow 		= pWindow;
+        pItem->mpOrgParent		= pWindow->GetParent();
 
         // Window mit SplitWindow verbinden
         pWindow->Hide();
@@ -2889,17 +2889,17 @@ void SplitWindow::InsertItem( USHORT nId, Window* pWindow, long nSize,
     }
     else
     {
-        pNewSet                 = new ImplSplitSet;
-        pNewSet->mpItems        = NULL;
-        pNewSet->mpWallpaper    = NULL;
-        pNewSet->mpBitmap       = NULL;
-        pNewSet->mnLastSize     = 0;
-        pNewSet->mnItems        = 0;
-        pNewSet->mnId           = nId;
-        pNewSet->mnSplitSize    = pSet->mnSplitSize;
-        pNewSet->mbCalcPix      = TRUE;
+        pNewSet 				= new ImplSplitSet;
+        pNewSet->mpItems		= NULL;
+        pNewSet->mpWallpaper	= NULL;
+        pNewSet->mpBitmap		= NULL;
+        pNewSet->mnLastSize 	= 0;
+        pNewSet->mnItems		= 0;
+        pNewSet->mnId			= nId;
+        pNewSet->mnSplitSize	= pSet->mnSplitSize;
+        pNewSet->mbCalcPix		= TRUE;
 
-        pItem->mpSet            = pNewSet;
+        pItem->mpSet			= pNewSet;
     }
 
     ImplUpdate();
@@ -2924,10 +2924,10 @@ void SplitWindow::MoveItem( USHORT nId, USHORT nNewPos, USHORT nNewSetId )
     DBG_ASSERT( ImplFindSet( mpMainSet, nNewSetId ), "SplitWindow::MoveItem() - Set not exists" );
 #endif
 
-    USHORT          nPos;
-    ImplSplitSet*    pNewSet = ImplFindSet( mpMainSet, nNewSetId );
-    ImplSplitSet*    pSet    = ImplFindItem( mpMainSet, nId, nPos );
-    ImplSplitItem    aTempItem;
+    USHORT			nPos;
+    ImplSplitSet*	 pNewSet = ImplFindSet( mpMainSet, nNewSetId );
+    ImplSplitSet*	 pSet	 = ImplFindItem( mpMainSet, nId, nPos );
+    ImplSplitItem	 aTempItem;
 
     if ( pNewSet == pSet )
     {
@@ -2995,11 +2995,11 @@ void SplitWindow::RemoveItem( USHORT nId, BOOL bHide )
 #endif
 
     // Set suchen
-    USHORT          nPos;
-    ImplSplitSet*    pSet    = ImplFindItem( mpMainSet, nId, nPos );
-    ImplSplitItem*   pItem   = &(pSet->mpItems[nPos]);
-    Window*         pWindow = pItem->mpWindow;
-    Window*         pOrgParent = pItem->mpOrgParent;
+    USHORT			nPos;
+    ImplSplitSet*	 pSet	 = ImplFindItem( mpMainSet, nId, nPos );
+    ImplSplitItem*	 pItem	 = &(pSet->mpItems[nPos]);
+    Window* 		pWindow = pItem->mpWindow;
+    Window* 		pOrgParent = pItem->mpOrgParent;
 
     // Evt. Set loeschen
     if ( !pWindow )
@@ -3041,18 +3041,18 @@ void SplitWindow::Clear()
     ImplDeleteSet( mpMainSet );
 
     // Main-Set wieder anlegen
-    mpMainSet                   = new ImplSplitSet;
-    mpMainSet->mpItems          = NULL;
-    mpMainSet->mpWallpaper      = NULL;
-    mpMainSet->mpBitmap         = NULL;
-    mpMainSet->mnLastSize       = 0;
-    mpMainSet->mnItems          = 0;
-    mpMainSet->mnId             = 0;
-    mpMainSet->mnSplitSize      = SPLITWIN_SPLITSIZE;
-    mpMainSet->mbCalcPix        = TRUE;
+    mpMainSet					= new ImplSplitSet;
+    mpMainSet->mpItems			= NULL;
+    mpMainSet->mpWallpaper		= NULL;
+    mpMainSet->mpBitmap 		= NULL;
+    mpMainSet->mnLastSize		= 0;
+    mpMainSet->mnItems			= 0;
+    mpMainSet->mnId 			= 0;
+    mpMainSet->mnSplitSize		= SPLITWIN_SPLITSIZE;
+    mpMainSet->mbCalcPix		= TRUE;
     if ( mnWinStyle & WB_NOSPLITDRAW )
         mpMainSet->mnSplitSize -= 2;
-    mpBaseSet                   = mpMainSet;
+    mpBaseSet					= mpMainSet;
 
     // Und neu invalidieren
     ImplUpdate();
@@ -3234,16 +3234,16 @@ Bitmap SplitWindow::GetItemBitmap( USHORT nSetId ) const
 void SplitWindow::SplitItem( USHORT nId, long nNewSize,
                              BOOL bPropSmall, BOOL bPropGreat )
 {
-    USHORT          nItems;
-    USHORT          nPos;
-    USHORT          nMin;
-    USHORT          nMax;
-    USHORT          i;
-    USHORT          n;
-    long            nDelta;
-    long            nTempDelta;
-    ImplSplitSet*   pSet = ImplFindItem( mpBaseSet, nId, nPos );
-    ImplSplitItem*  pItems;
+    USHORT			nItems;
+    USHORT			nPos;
+    USHORT			nMin;
+    USHORT			nMax;
+    USHORT			i;
+    USHORT			n;
+    long			nDelta;
+    long			nTempDelta;
+    ImplSplitSet*	pSet = ImplFindItem( mpBaseSet, nId, nPos );
+    ImplSplitItem*	pItems;
 
     if ( !pSet )
         return;
@@ -3464,9 +3464,9 @@ void SplitWindow::SplitItem( USHORT nId, long nNewSize,
 
 void SplitWindow::SetItemSize( USHORT nId, long nNewSize )
 {
-    USHORT          nPos;
-    ImplSplitSet*   pSet = ImplFindItem( mpBaseSet, nId, nPos );
-    ImplSplitItem*  pItem;
+    USHORT			nPos;
+    ImplSplitSet*	pSet = ImplFindItem( mpBaseSet, nId, nPos );
+    ImplSplitItem*	pItem;
 
     if ( !pSet )
         return;
@@ -3486,8 +3486,8 @@ void SplitWindow::SetItemSize( USHORT nId, long nNewSize )
 
 long SplitWindow::GetItemSize( USHORT nId ) const
 {
-    USHORT          nPos;
-    ImplSplitSet*   pSet = ImplFindItem( mpBaseSet, nId, nPos );
+    USHORT			nPos;
+    ImplSplitSet*	pSet = ImplFindItem( mpBaseSet, nId, nPos );
 
     if ( pSet )
         return pSet->mpItems[nPos].mnSize;
@@ -3499,8 +3499,8 @@ long SplitWindow::GetItemSize( USHORT nId ) const
 
 long SplitWindow::GetItemSize( USHORT nId, SplitWindowItemBits nBits ) const
 {
-    USHORT          nPos;
-    ImplSplitSet*   pSet = ImplFindItem( mpBaseSet, nId, nPos );
+    USHORT			nPos;
+    ImplSplitSet*	pSet = ImplFindItem( mpBaseSet, nId, nPos );
 
     if ( pSet )
     {
@@ -3510,12 +3510,12 @@ long SplitWindow::GetItemSize( USHORT nId, SplitWindowItemBits nBits ) const
         {
             ((SplitWindow*)this)->ImplCalcLayout();
 
-            long                nRelSize = 0;
-            long                nPerSize = 0;
-            ImplSplitItem*      pItems;
-            USHORT              nItems;
+            long				nRelSize = 0;
+            long				nPerSize = 0;
+            ImplSplitItem*		pItems;
+            USHORT				nItems;
             SplitWindowItemBits nTempBits;
-            USHORT              i;
+            USHORT				i;
             nItems = pSet->mnItems;
             pItems = pSet->mpItems;
             for ( i = 0; i < nItems; i++ )
@@ -3556,9 +3556,9 @@ long SplitWindow::GetItemSize( USHORT nId, SplitWindowItemBits nBits ) const
 
 void SplitWindow::SetItemBits( USHORT nId, SplitWindowItemBits nNewBits )
 {
-    USHORT          nPos;
-    ImplSplitSet*   pSet = ImplFindItem( mpBaseSet, nId, nPos );
-    ImplSplitItem*  pItem;
+    USHORT			nPos;
+    ImplSplitSet*	pSet = ImplFindItem( mpBaseSet, nId, nPos );
+    ImplSplitItem*	pItem;
 
     if ( !pSet )
         return;
@@ -3580,8 +3580,8 @@ void SplitWindow::SetItemBits( USHORT nId, SplitWindowItemBits nNewBits )
 
 SplitWindowItemBits SplitWindow::GetItemBits( USHORT nId ) const
 {
-    USHORT          nPos;
-    ImplSplitSet*   pSet = ImplFindItem( mpBaseSet, nId, nPos );
+    USHORT			nPos;
+    ImplSplitSet*	pSet = ImplFindItem( mpBaseSet, nId, nPos );
 
     if ( pSet )
         return pSet->mpItems[nPos].mnBits;
@@ -3593,8 +3593,8 @@ SplitWindowItemBits SplitWindow::GetItemBits( USHORT nId ) const
 
 Window* SplitWindow::GetItemWindow( USHORT nId ) const
 {
-    USHORT          nPos;
-    ImplSplitSet*   pSet = ImplFindItem( mpBaseSet, nId, nPos );
+    USHORT			nPos;
+    ImplSplitSet*	pSet = ImplFindItem( mpBaseSet, nId, nPos );
 
     if ( pSet )
         return pSet->mpItems[nPos].mpWindow;
@@ -3606,8 +3606,8 @@ Window* SplitWindow::GetItemWindow( USHORT nId ) const
 
 USHORT SplitWindow::GetSet( USHORT nId ) const
 {
-    USHORT          nPos;
-    ImplSplitSet*   pSet = ImplFindItem( mpBaseSet, nId, nPos );
+    USHORT			nPos;
+    ImplSplitSet*	pSet = ImplFindItem( mpBaseSet, nId, nPos );
 
     if ( pSet )
         return pSet->mnId;
@@ -3633,8 +3633,8 @@ BOOL SplitWindow::GetSet( USHORT nId, USHORT& rSetId, USHORT& rPos ) const
 
 BOOL SplitWindow::IsItemValid( USHORT nId ) const
 {
-    USHORT          nPos;
-    ImplSplitSet*   pSet = ImplFindItem( mpBaseSet, nId, nPos );
+    USHORT			nPos;
+    ImplSplitSet*	pSet = ImplFindItem( mpBaseSet, nId, nPos );
 
     if ( pSet )
         return TRUE;
@@ -3660,8 +3660,8 @@ USHORT SplitWindow::GetItemId( const Point& rPos ) const
 
 USHORT SplitWindow::GetItemPos( USHORT nId, USHORT nSetId ) const
 {
-    ImplSplitSet*   pSet = ImplFindSet( mpBaseSet, nSetId );
-    USHORT          nPos = SPLITWINDOW_ITEM_NOTFOUND;
+    ImplSplitSet*	pSet = ImplFindSet( mpBaseSet, nSetId );
+    USHORT			nPos = SPLITWINDOW_ITEM_NOTFOUND;
 
     if ( pSet )
     {
@@ -3706,27 +3706,27 @@ void SplitWindow::ImplNewAlign()
 {
     if ( mbNoAlign )
     {
-        mbHorz        = FALSE;
+        mbHorz		  = FALSE;
         mbBottomRight = FALSE;
     }
     else if ( meAlign == WINDOWALIGN_TOP )
     {
-        mbHorz        = TRUE;
+        mbHorz		  = TRUE;
         mbBottomRight = FALSE;
     }
     else if ( meAlign == WINDOWALIGN_BOTTOM )
     {
-        mbHorz        = TRUE;
+        mbHorz		  = TRUE;
         mbBottomRight = TRUE;
     }
     else if ( meAlign == WINDOWALIGN_LEFT )
     {
-        mbHorz        = FALSE;
+        mbHorz		  = FALSE;
         mbBottomRight = FALSE;
     }
     else if ( meAlign == WINDOWALIGN_RIGHT )
     {
-        mbHorz        = FALSE;
+        mbHorz		  = FALSE;
         mbBottomRight = TRUE;
     }
 
@@ -3769,15 +3769,15 @@ void SplitWindow::SetAlign( WindowAlign eNewAlign )
 Size SplitWindow::CalcWindowSizePixel( const Size& rSize, WindowAlign eAlign,
                                        WinBits nWinStyle, BOOL bExtra )
 {
-    long    nLeft;
-    long    nTop;
-    long    nRight;
-    long    nBottom;
-    Size    aSize = rSize;
+    long	nLeft;
+    long	nTop;
+    long	nRight;
+    long	nBottom;
+    Size	aSize = rSize;
 
     ImplCalcBorder( eAlign, FALSE, nLeft, nTop, nRight, nBottom );
-    aSize.Width()   += nLeft+nRight;
-    aSize.Height()  += nTop+nBottom;
+    aSize.Width()	+= nLeft+nRight;
+    aSize.Height()	+= nTop+nBottom;
 
     if ( nWinStyle & WB_SIZEABLE )
     {
diff --git a/vcl/source/window/status.cxx b/vcl/source/window/status.cxx
index 385dd241c770..0c570fb597f9 100644
--- a/vcl/source/window/status.cxx
+++ b/vcl/source/window/status.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
@@ -44,13 +44,13 @@
 
 // =======================================================================
 
-#define STATUSBAR_OFFSET_X      STATUSBAR_OFFSET
-#define STATUSBAR_OFFSET_Y      2
-#define STATUSBAR_OFFSET_TEXTY  3
+#define STATUSBAR_OFFSET_X		STATUSBAR_OFFSET
+#define STATUSBAR_OFFSET_Y		2
+#define STATUSBAR_OFFSET_TEXTY	3
 
-#define STATUSBAR_PRGS_OFFSET   3
-#define STATUSBAR_PRGS_COUNT    100
-#define STATUSBAR_PRGS_MIN      5
+#define STATUSBAR_PRGS_OFFSET	3
+#define STATUSBAR_PRGS_COUNT	100
+#define STATUSBAR_PRGS_MIN		5
 
 // -----------------------------------------------------------------------
 
@@ -60,7 +60,7 @@ public:
     ImplData();
     ~ImplData();
 
-    VirtualDevice*      mpVirDev;
+    VirtualDevice*		mpVirDev;
     long                mnItemBorderWidth;
     bool                mbTopBorder:1;
     bool                mbDrawItemFrames:1;
@@ -80,19 +80,19 @@ StatusBar::ImplData::~ImplData()
 
 struct ImplStatusItem
 {
-    USHORT              mnId;
-    StatusBarItemBits   mnBits;
-    long                mnWidth;
-    long                mnOffset;
-    long                mnExtraWidth;
-    long                mnX;
-    XubString           maText;
-    XubString           maHelpText;
-    XubString           maQuickHelpText;
-    ULONG               mnHelpId;
-    void*               mpUserData;
-    BOOL                mbVisible;
-    XubString           maAccessibleName;
+    USHORT				mnId;
+    StatusBarItemBits	mnBits;
+    long				mnWidth;
+    long				mnOffset;
+    long				mnExtraWidth;
+    long				mnX;
+    XubString			maText;
+    XubString			maHelpText;
+    XubString			maQuickHelpText;
+    ULONG				mnHelpId;
+    void*				mpUserData;
+    BOOL				mbVisible;
+    XubString			maAccessibleName;
     XubString           maCommand;
 };
 
@@ -149,20 +149,20 @@ void StatusBar::ImplInit( Window* pParent, WinBits nStyle )
     Window::ImplInit( pParent, nStyle & ~WB_BORDER, NULL );
 
     // WinBits merken
-    mpItemList      = new ImplStatusItemList;
-    mpImplData->mpVirDev        = new VirtualDevice( *this );
-    mnCurItemId     = 0;
-    mbFormat        = TRUE;
-    mbVisibleItems  = TRUE;
-    mbProgressMode  = FALSE;
-    mbInUserDraw    = FALSE;
-    mbBottomBorder  = FALSE;
+    mpItemList		= new ImplStatusItemList;
+    mpImplData->mpVirDev		= new VirtualDevice( *this );
+    mnCurItemId 	= 0;
+    mbFormat		= TRUE;
+    mbVisibleItems	= TRUE;
+    mbProgressMode	= FALSE;
+    mbInUserDraw	= FALSE;
+    mbBottomBorder	= FALSE;
     mnItemsWidth    = STATUSBAR_OFFSET_X;
-    mnDX            = 0;
-    mnDY            = 0;
-    mnCalcHeight    = 0;
-    mnItemY         = STATUSBAR_OFFSET_Y;
-    mnTextY         = STATUSBAR_OFFSET_TEXTY;
+    mnDX			= 0;
+    mnDY			= 0;
+    mnCalcHeight	= 0;
+    mnItemY 		= STATUSBAR_OFFSET_Y;
+    mnTextY 		= STATUSBAR_OFFSET_TEXTY;
 
     ImplInitSettings( TRUE, TRUE, TRUE );
     SetLineColor();
@@ -256,7 +256,7 @@ void StatusBar::ImplInitSettings( BOOL bFont,
             aColor = rStyleSettings.GetWindowColor();
         SetBackground( aColor );
         mpImplData->mpVirDev->SetBackground( GetBackground() );
-
+        
         // NWF background
         if( ! IsControlBackground() &&
               IsNativeControlSupported( CTRL_WINDOW_BACKGROUND, PART_BACKGROUND_WINDOW ) )
@@ -272,10 +272,10 @@ void StatusBar::ImplInitSettings( BOOL bFont,
 void StatusBar::ImplFormat()
 {
     ImplStatusItem* pItem;
-    long            nExtraWidth;
-    long            nExtraWidth2;
-    long            nX;
-    USHORT          nAutoSizeItems = 0;
+    long			nExtraWidth;
+    long			nExtraWidth2;
+    long			nX;
+    USHORT			nAutoSizeItems = 0;
 
     // Breiten zusammenrechnen
     mnItemsWidth = STATUSBAR_OFFSET_X;
@@ -299,9 +299,9 @@ void StatusBar::ImplFormat()
     {
         // Bei rechtsbuendiger Ausrichtung wird kein AutoSize ausgewertet,
         // da wir links den Text anzeigen, der mit SetText gesetzt wird
-        nX              = mnDX - mnItemsWidth;
-        nExtraWidth     = 0;
-        nExtraWidth2    = 0;
+        nX				= mnDX - mnItemsWidth;
+        nExtraWidth 	= 0;
+        nExtraWidth2	= 0;
     }
     else
     {
@@ -353,7 +353,7 @@ void StatusBar::ImplFormat()
 
 Rectangle StatusBar::ImplGetItemRectPos( USHORT nPos ) const
 {
-    Rectangle       aRect;
+    Rectangle		aRect;
     ImplStatusItem* pItem;
     pItem = mpItemList->GetObject( nPos );
     if ( pItem )
@@ -377,7 +377,7 @@ Rectangle StatusBar::ImplGetItemRectPos( USHORT nPos ) const
 USHORT StatusBar::ImplGetFirstVisiblePos() const
 {
     ImplStatusItem* pItem;
-
+    
     for( USHORT nPos = 0; nPos < mpItemList->Count(); nPos++ )
     {
         pItem = mpItemList->GetObject( nPos );
@@ -387,7 +387,7 @@ USHORT StatusBar::ImplGetFirstVisiblePos() const
                 return nPos;
         }
     }
-
+    
     return ~0;
 }
 
@@ -438,11 +438,11 @@ void StatusBar::ImplDrawItem( BOOL bOffScreen, USHORT nPos, BOOL bDrawText, BOOL
         return;
 
     // Ausgabebereich berechnen
-    ImplStatusItem*     pItem = mpItemList->GetObject( nPos );
+    ImplStatusItem* 	pItem = mpItemList->GetObject( nPos );
     long nW = mpImplData->mnItemBorderWidth + 1;
-    Rectangle           aTextRect( aRect.Left()+nW, aRect.Top()+nW,
+    Rectangle			aTextRect( aRect.Left()+nW, aRect.Top()+nW,
                                    aRect.Right()-nW, aRect.Bottom()-nW );
-    Size                aTextRectSize( aTextRect.GetSize() );
+    Size				aTextRectSize( aTextRect.GetSize() );
 
     if ( bOffScreen )
         mpImplData->mpVirDev->SetOutputSizePixel( aTextRectSize );
@@ -455,8 +455,8 @@ void StatusBar::ImplDrawItem( BOOL bOffScreen, USHORT nPos, BOOL bDrawText, BOOL
     // Text ausgeben
     if ( bDrawText )
     {
-        Size    aTextSize( GetTextWidth( pItem->maText ), GetTextHeight() );
-        Point   aTextPos = ImplGetItemTextPos( aTextRectSize, aTextSize, pItem->mnBits );
+        Size	aTextSize( GetTextWidth( pItem->maText ), GetTextHeight() );
+        Point	aTextPos = ImplGetItemTextPos( aTextRectSize, aTextSize, pItem->mnBits );
         if ( bOffScreen )
             mpImplData->mpVirDev->DrawText( aTextPos, pItem->maText );
         else
@@ -499,12 +499,12 @@ void StatusBar::ImplDrawItem( BOOL bOffScreen, USHORT nPos, BOOL bDrawText, BOOL
             if( !(pItem->mnBits & SIB_FLAT) )
             {
                 USHORT nStyle;
-
+                
                 if ( pItem->mnBits & SIB_IN )
                     nStyle = FRAME_DRAW_IN;
                 else
                     nStyle = FRAME_DRAW_OUT;
-
+                
                 DecorationView aDecoView( this );
                 aDecoView.DrawFrame( aRect, nStyle );
             }
@@ -539,7 +539,7 @@ void DrawProgress( Window* pWindow, const Point& rPos,
     if( pWindow->IsNativeControlSupported( CTRL_PROGRESS, PART_ENTIRE_CONTROL ) )
     {
         bool bNeedErase = ImplGetSVData()->maNWFData.mbProgressNeedsErase;
-
+        
         long nFullWidth = (nPrgsWidth + nOffset) * (10000 / nPercentCount);
         long nPerc = (nPercent2 > 10000) ? 10000 : nPercent2;
         ImplControlValue aValue( nFullWidth * (long)nPerc / 10000 );
@@ -580,7 +580,7 @@ void DrawProgress( Window* pWindow, const Point& rPos,
             return;
         }
     }
-
+    
     // Werte vorberechnen
     USHORT nPerc1 = nPercent1 / nPercentCount;
     USHORT nPerc2 = nPercent2 / nPercentCount;
@@ -588,11 +588,11 @@ void DrawProgress( Window* pWindow, const Point& rPos,
     if ( nPerc1 > nPerc2 )
     {
         // Support progress that can also decrease
-
+        
         // Rechteck berechnen
-        long        nDX = nPrgsWidth + nOffset;
-        long        nLeft = rPos.X()+((nPerc1-1)*nDX);
-        Rectangle   aRect( nLeft, rPos.Y(), nLeft+nPrgsWidth, rPos.Y()+nPrgsHeight );
+        long		nDX = nPrgsWidth + nOffset;
+        long		nLeft = rPos.X()+((nPerc1-1)*nDX);
+        Rectangle	aRect( nLeft, rPos.Y(), nLeft+nPrgsWidth, rPos.Y()+nPrgsHeight );
 
         do
         {
@@ -604,7 +604,7 @@ void DrawProgress( Window* pWindow, const Point& rPos,
         while ( nPerc1 > nPerc2 );
 
         pWindow->Flush();
-    }
+    }	
     else if ( nPerc1 < nPerc2 )
     {
         // Percent-Rechtecke malen
@@ -617,9 +617,9 @@ void DrawProgress( Window* pWindow, const Point& rPos,
         }
 
         // Rechteck berechnen
-        long        nDX = nPrgsWidth + nOffset;
-        long        nLeft = rPos.X()+(nPerc1*nDX);
-        Rectangle   aRect( nLeft, rPos.Y(), nLeft+nPrgsWidth, rPos.Y()+nPrgsHeight );
+        long		nDX = nPrgsWidth + nOffset;
+        long		nLeft = rPos.X()+(nPerc1*nDX);
+        Rectangle	aRect( nLeft, rPos.Y(), nLeft+nPrgsWidth, rPos.Y()+nPrgsHeight );
 
         do
         {
@@ -681,12 +681,12 @@ void StatusBar::ImplCalcProgressRect()
 {
     // calculate text size
     Size aPrgsTxtSize( GetTextWidth( maPrgsTxt ), GetTextHeight() );
-    maPrgsTxtPos.X()    = STATUSBAR_OFFSET_X+1;
-
+    maPrgsTxtPos.X()	= STATUSBAR_OFFSET_X+1;
+    
     // calculate progress frame
-    maPrgsFrameRect.Left()      = maPrgsTxtPos.X()+aPrgsTxtSize.Width()+STATUSBAR_OFFSET;
-    maPrgsFrameRect.Top()       = mnItemY;
-    maPrgsFrameRect.Bottom()    = mnCalcHeight - STATUSBAR_OFFSET_Y;
+    maPrgsFrameRect.Left()		= maPrgsTxtPos.X()+aPrgsTxtSize.Width()+STATUSBAR_OFFSET;
+    maPrgsFrameRect.Top()		= mnItemY;
+    maPrgsFrameRect.Bottom()	= mnCalcHeight - STATUSBAR_OFFSET_Y;
     if( IsTopBorder() )
         maPrgsFrameRect.Bottom()+=2;
 
@@ -728,7 +728,7 @@ void StatusBar::ImplCalcProgressRect()
         }
     }
     if( ! bNativeOK )
-        maPrgsTxtPos.Y()    = mnTextY;
+        maPrgsTxtPos.Y()	= mnTextY;
 }
 
 // -----------------------------------------------------------------------
@@ -886,7 +886,7 @@ void StatusBar::RequestHelp( const HelpEvent& rHEvt )
         }
         else if ( rHEvt.GetMode() & HELPMODE_QUICK )
         {
-            XubString   aStr = GetQuickHelpText( nItemId );
+            XubString	aStr = GetQuickHelpText( nItemId );
             // Show quickhelp if available
             if( aStr.Len() )
             {
@@ -1026,14 +1026,14 @@ void StatusBar::InsertItem( USHORT nItemId, ULONG nWidth,
 
     // Item anlegen
     long nFudge = GetTextHeight()/4;
-    ImplStatusItem* pItem   = new ImplStatusItem;
-    pItem->mnId             = nItemId;
-    pItem->mnBits           = nBits;
-    pItem->mnWidth          = (long)nWidth+nFudge+STATUSBAR_OFFSET;
-    pItem->mnOffset         = nOffset;
-    pItem->mnHelpId         = 0;
-    pItem->mpUserData       = 0;
-    pItem->mbVisible        = TRUE;
+    ImplStatusItem* pItem	= new ImplStatusItem;
+    pItem->mnId 			= nItemId;
+    pItem->mnBits			= nBits;
+    pItem->mnWidth			= (long)nWidth+nFudge+STATUSBAR_OFFSET;
+    pItem->mnOffset 		= nOffset;
+    pItem->mnHelpId 		= 0;
+    pItem->mpUserData		= 0;
+    pItem->mbVisible		= TRUE;
 
     // Item in die Liste einfuegen
     mpItemList->Insert( pItem, nPos );
@@ -1291,7 +1291,7 @@ Point StatusBar::GetItemTextPos( USHORT nItemId ) const
             ImplStatusItem* pItem = mpItemList->GetObject( nPos );
             Rectangle aRect = ImplGetItemRectPos( nPos );
             long nW = mpImplData->mnItemBorderWidth + 1;
-            Rectangle           aTextRect( aRect.Left()+nW, aRect.Top()+nW,
+            Rectangle			aTextRect( aRect.Left()+nW, aRect.Top()+nW,
                                            aRect.Right()-nW, aRect.Bottom()-nW );
             Point aPos = ImplGetItemTextPos( aTextRect.GetSize(),
                                              Size( GetTextWidth( pItem->maText ), GetTextHeight() ),
@@ -1361,7 +1361,7 @@ void StatusBar::SetItemText( USHORT nItemId, const XubString& rText )
             // adjust item width - see also DataChanged()
             long nFudge = GetTextHeight()/4;
             long nWidth = GetTextWidth( pItem->maText ) + nFudge;
-            if( (nWidth > pItem->mnWidth + STATUSBAR_OFFSET) ||
+            if( (nWidth > pItem->mnWidth + STATUSBAR_OFFSET) || 
                 ((nWidth < pItem->mnWidth) && (mnDX - STATUSBAR_OFFSET) < mnItemsWidth  ))
             {
                 pItem->mnWidth = nWidth + STATUSBAR_OFFSET;
@@ -1585,9 +1585,9 @@ void StatusBar::StartProgressMode( const XubString& rText )
 {
     DBG_ASSERT( !mbProgressMode, "StatusBar::StartProgressMode(): progress mode is active" );
 
-    mbProgressMode  = TRUE;
-    mnPercent       = 0;
-    maPrgsTxt       = rText;
+    mbProgressMode	= TRUE;
+    mnPercent		= 0;
+    maPrgsTxt		= rText;
 
     // Groessen berechnen
     ImplCalcProgressRect();
@@ -1651,7 +1651,7 @@ void StatusBar::ResetProgressMode()
 {
     if ( mbProgressMode )
     {
-        mnPercent = 0;
+        mnPercent = 0;		
         maPrgsTxt.Erase();
         if ( IsReallyVisible() )
         {
@@ -1701,11 +1701,11 @@ void StatusBar::SetText( const XubString& rText )
 
 Size StatusBar::CalcWindowSizePixel() const
 {
-    ULONG   i = 0;
-    ULONG   nCount = mpItemList->Count();
-    long    nOffset = 0;
-    long    nCalcWidth = (STATUSBAR_OFFSET_X*2);
-    long    nCalcHeight;
+    ULONG	i = 0;
+    ULONG	nCount = mpItemList->Count();
+    long	nOffset = 0;
+    long	nCalcWidth = (STATUSBAR_OFFSET_X*2);
+    long	nCalcHeight;
 
     while ( i < nCount )
     {
@@ -1714,7 +1714,7 @@ Size StatusBar::CalcWindowSizePixel() const
         nOffset = pItem->mnOffset;
         i++;
     }
-
+    
     long nMinHeight = GetTextHeight();
     const long nBarTextOffset = STATUSBAR_OFFSET_TEXTY*2;
     long nProgressHeight = nMinHeight + nBarTextOffset;
@@ -1732,14 +1732,14 @@ Size StatusBar::CalcWindowSizePixel() const
             nProgressHeight = aNativeControlRegion.GetHeight();
         }
     }
-
+    
     if( mpImplData->mbDrawItemFrames &&
         pThis->IsNativeControlSupported( CTRL_FRAME, PART_BORDER ) )
     {
         ImplControlValue aControlValue( FRAME_DRAW_NODRAW );
         Rectangle aBound, aContent;
         Rectangle aNatRgn( Point( 0, 0 ), Size( 150, 50 ) );
-        if( pThis->GetNativeControlRegion(CTRL_FRAME, PART_BORDER,
+        if(	pThis->GetNativeControlRegion(CTRL_FRAME, PART_BORDER,
             aNatRgn, 0, aControlValue, rtl::OUString(), aBound, aContent) )
         {
             mpImplData->mnItemBorderWidth =
@@ -1750,7 +1750,7 @@ Size StatusBar::CalcWindowSizePixel() const
     nCalcHeight = nMinHeight+nBarTextOffset + 2*mpImplData->mnItemBorderWidth;
     if( nCalcHeight < nProgressHeight+2 )
         nCalcHeight = nProgressHeight+2;
-
+    
     // add border
     if( IsTopBorder() )
         nCalcHeight += 2;
diff --git a/vcl/source/window/syschild.cxx b/vcl/source/window/syschild.cxx
index ef71f83df1ee..49669520595a 100644
--- a/vcl/source/window/syschild.cxx
+++ b/vcl/source/window/syschild.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
diff --git a/vcl/source/window/syswin.cxx b/vcl/source/window/syswin.cxx
index f3624ef56f59..0edbabe1e4e2 100644
--- a/vcl/source/window/syswin.cxx
+++ b/vcl/source/window/syswin.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
@@ -335,7 +335,7 @@ void SystemWindow::EnableSaveBackground( BOOL bSave )
 {
     if( ImplGetSVData()->maWinData.mbNoSaveBackground )
         bSave = false;
-
+    
     Window* pWindow = this;
     while ( pWindow->mpWindowImpl->mpBorderWindow )
         pWindow = pWindow->mpWindowImpl->mpBorderWindow;
@@ -563,7 +563,7 @@ static void ImplWindowStateFromStr( WindowStateData& rData, const ByteString& rS
     }
     else
         rData.SetState( 0 );
-
+    
     // read maximized pos/size
     aTokenStr = rStr.GetToken( 0, ',', nIndex );
     if ( aTokenStr.Len() )
@@ -677,7 +677,7 @@ void SystemWindow::ImplMoveToScreen( long& io_rX, long& io_rY, long i_nWidth, lo
         i_nWidth = 50;
     if( i_nHeight < 1 )
         i_nHeight = 50;
-
+    
     // check left border
     bool bMove = false;
     if( io_rX + i_nWidth < aScreenRect.Left() )
@@ -757,7 +757,7 @@ void SystemWindow::SetWindowStateData( const WindowStateData& rData )
         // 91625 - ignore Minimize
         //nState &= ~(WINDOWSTATE_STATE_MINIMIZED);
         aState.mnState  = nState & SAL_FRAMESTATE_SYSTEMMASK;
-
+        
         // normalize window positions onto screen
         ImplMoveToScreen( aState.mnX, aState.mnY, aState.mnWidth, aState.mnHeight, pWindow );
         ImplMoveToScreen( aState.mnMaximizedX, aState.mnMaximizedY, aState.mnMaximizedWidth, aState.mnMaximizedHeight, pWindow );
@@ -773,7 +773,7 @@ void SystemWindow::SetWindowStateData( const WindowStateData& rData )
                 BOOL bWrapped = FALSE;
                 while( pWin )
                 {
-                    if( !pWin->ImplIsRealParentPath( this ) &&
+                    if( !pWin->ImplIsRealParentPath( this ) && 
                         pWin->ImplGetWindow()->IsTopWindow() && pWin->mpWindowImpl->mbReallyVisible )
                     {
                         SalFrameGeometry g = pWin->mpWindowImpl->mpFrame->GetGeometry();
@@ -783,7 +783,7 @@ void SystemWindow::SetWindowStateData( const WindowStateData& rData )
                             if( (unsigned long) (aState.mnX + displacement + aState.mnWidth + g.nRightDecoration) > (unsigned long) aDesktop.nRight ||
                                 (unsigned long) (aState.mnY + displacement + aState.mnHeight + g.nBottomDecoration) > (unsigned long) aDesktop.nBottom )
                             {
-                                // displacing would leave screen
+                                // displacing would leave screen 
                                 aState.mnX = g.nLeftDecoration ? g.nLeftDecoration : 10; // should result in (0,0)
                                 aState.mnY = displacement;
                                 if( bWrapped ||
@@ -841,10 +841,10 @@ void SystemWindow::SetWindowStateData( const WindowStateData& rData )
         if( IsRollUp() )
             RollDown();
 
-        long nX         = rData.GetX();
-        long nY         = rData.GetY();
-        long nWidth     = rData.GetWidth();
-        long nHeight    = rData.GetHeight();
+        long nX			= rData.GetX();
+        long nY			= rData.GetY();
+        long nWidth		= rData.GetWidth();
+        long nHeight	= rData.GetHeight();
         const SalFrameGeometry& rGeom = pWindow->mpWindowImpl->mpFrame->GetGeometry();
         if( nX < 0 )
             nX = 0;
@@ -1022,7 +1022,7 @@ void SystemWindow::SetMenuBar( MenuBar* pMenuBar )
                 }
                 MenuBar::ImplDestroy( pOldMenuBar, bDelete );
                 if( bDelete )
-                    pOldWindow = NULL;  // will be deleted in MenuBar::ImplDestroy,
+                    pOldWindow = NULL;  // will be deleted in MenuBar::ImplDestroy, 
             }
 
         }
diff --git a/vcl/source/window/tabdlg.cxx b/vcl/source/window/tabdlg.cxx
index 874881c0c5ef..a0b3073f10c6 100644
--- a/vcl/source/window/tabdlg.cxx
+++ b/vcl/source/window/tabdlg.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
@@ -40,19 +40,19 @@
 
 void TabDialog::ImplInitTabDialogData()
 {
-    mpFixedLine     = NULL;
-    mpViewWindow    = NULL;
-    meViewAlign     = WINDOWALIGN_LEFT;
-    mbPosControls   = TRUE;
+    mpFixedLine 	= NULL;
+    mpViewWindow	= NULL;
+    meViewAlign 	= WINDOWALIGN_LEFT;
+    mbPosControls	= TRUE;
 }
 
 // -----------------------------------------------------------------------
 
 void TabDialog::ImplPosControls()
 {
-    Size        aCtrlSize( IMPL_MINSIZE_BUTTON_WIDTH, IMPL_MINSIZE_BUTTON_HEIGHT );
-    long        nDownCtrl = 0;
-    long        nOffY = 0;
+    Size		aCtrlSize( IMPL_MINSIZE_BUTTON_WIDTH, IMPL_MINSIZE_BUTTON_HEIGHT );
+    long		nDownCtrl = 0;
+    long		nOffY = 0;
     TabControl* pTabControl = NULL;
 
     Window* pChild = GetWindow( WINDOW_FIRSTCHILD );
@@ -92,56 +92,56 @@ void TabDialog::ImplPosControls()
         if ( nOffY )
             nOffY += IMPL_DIALOG_BAR_OFFSET*2 + 2;
 
-        Point   aTabOffset( IMPL_DIALOG_OFFSET, IMPL_DIALOG_OFFSET+nOffY );
-        Size    aTabSize = pTabControl->GetSizePixel();
-        Size    aDlgSize( aTabSize.Width() + IMPL_DIALOG_OFFSET*2,
+        Point	aTabOffset( IMPL_DIALOG_OFFSET, IMPL_DIALOG_OFFSET+nOffY );
+        Size	aTabSize = pTabControl->GetSizePixel();
+        Size	aDlgSize( aTabSize.Width() + IMPL_DIALOG_OFFSET*2,
                           aTabSize.Height() + IMPL_DIALOG_OFFSET*2 + nOffY );
-        long    nBtnEx = 0;
+        long	nBtnEx = 0;
 
         // Preview-Fenster beruecksichtigen und die Groessen/Offsets anpassen
         if ( mpViewWindow && mpViewWindow->IsVisible() )
         {
-            long    nViewOffX = 0;
-            long    nViewOffY = 0;
-            long    nViewWidth = 0;
-            long    nViewHeight = 0;
-            USHORT  nViewPosFlags = WINDOW_POSSIZE_POS;
-            Size    aViewSize = mpViewWindow->GetSizePixel();
+            long	nViewOffX = 0;
+            long	nViewOffY = 0;
+            long	nViewWidth = 0;
+            long	nViewHeight = 0;
+            USHORT	nViewPosFlags = WINDOW_POSSIZE_POS;
+            Size	aViewSize = mpViewWindow->GetSizePixel();
             if (  meViewAlign == WINDOWALIGN_TOP )
             {
-                nViewOffX       = aTabOffset.X();
-                nViewOffY       = nOffY+IMPL_DIALOG_OFFSET;
-                nViewWidth      = aTabSize.Width();
+                nViewOffX		= aTabOffset.X();
+                nViewOffY		= nOffY+IMPL_DIALOG_OFFSET;
+                nViewWidth		= aTabSize.Width();
                 nViewPosFlags  |= WINDOW_POSSIZE_WIDTH;
                 aTabOffset.Y() += aViewSize.Height()+IMPL_DIALOG_OFFSET;
                 aDlgSize.Height() += aViewSize.Height()+IMPL_DIALOG_OFFSET;
             }
             else if (  meViewAlign == WINDOWALIGN_BOTTOM )
             {
-                nViewOffX       = aTabOffset.X();
-                nViewOffY       = aTabOffset.Y()+aTabSize.Height()+IMPL_DIALOG_OFFSET;
-                nViewWidth      = aTabSize.Width();
+                nViewOffX		= aTabOffset.X();
+                nViewOffY		= aTabOffset.Y()+aTabSize.Height()+IMPL_DIALOG_OFFSET;
+                nViewWidth		= aTabSize.Width();
                 nViewPosFlags  |= WINDOW_POSSIZE_WIDTH;
                 aDlgSize.Height() += aViewSize.Height()+IMPL_DIALOG_OFFSET;
             }
             else if (  meViewAlign == WINDOWALIGN_RIGHT )
             {
-                nViewOffX       = aTabOffset.X()+aTabSize.Width()+IMPL_DIALOG_OFFSET;
-                nViewOffY       = aTabOffset.Y();
-                nViewHeight     = aTabSize.Height();
+                nViewOffX		= aTabOffset.X()+aTabSize.Width()+IMPL_DIALOG_OFFSET;
+                nViewOffY		= aTabOffset.Y();
+                nViewHeight 	= aTabSize.Height();
                 nViewPosFlags  |= WINDOW_POSSIZE_HEIGHT;
                 aDlgSize.Width() += aViewSize.Width()+IMPL_DIALOG_OFFSET;
-                nBtnEx          = aViewSize.Width()+IMPL_DIALOG_OFFSET;
+                nBtnEx			= aViewSize.Width()+IMPL_DIALOG_OFFSET;
             }
             else // meViewAlign == WINDOWALIGN_LEFT
             {
-                nViewOffX       = IMPL_DIALOG_OFFSET;
-                nViewOffY       = aTabOffset.Y();
-                nViewHeight     = aTabSize.Height();
+                nViewOffX		= IMPL_DIALOG_OFFSET;
+                nViewOffY		= aTabOffset.Y();
+                nViewHeight 	= aTabSize.Height();
                 nViewPosFlags  |= WINDOW_POSSIZE_HEIGHT;
                 aTabOffset.X() += aViewSize.Width()+IMPL_DIALOG_OFFSET;
                 aDlgSize.Width() += aViewSize.Width()+IMPL_DIALOG_OFFSET;
-                nBtnEx          = aViewSize.Width()+IMPL_DIALOG_OFFSET;
+                nBtnEx			= aViewSize.Width()+IMPL_DIALOG_OFFSET;
             }
 
             mpViewWindow->SetPosSizePixel( nViewOffX, nViewOffY,
@@ -153,11 +153,11 @@ void TabDialog::ImplPosControls()
         pTabControl->SetPosPixel( aTabOffset );
 
         // Alle anderen Childs positionieren
-        BOOL bTabCtrl   = FALSE;
-        int  nLines     = 0;
+        BOOL bTabCtrl	= FALSE;
+        int  nLines 	= 0;
         long nX;
-        long nY         = aDlgSize.Height();
-        long nTopX      = IMPL_DIALOG_OFFSET;
+        long nY 		= aDlgSize.Height();
+        long nTopX		= IMPL_DIALOG_OFFSET;
 
         // Unter Windows 95 werden die Buttons rechtsbuendig angeordnet
         nX = IMPL_DIALOG_OFFSET;
@@ -180,7 +180,7 @@ void TabDialog::ImplPosControls()
                     if ( nX+aCtrlSize.Width()-IMPL_DIALOG_OFFSET > (aTabSize.Width()+nBtnEx) )
                     {
                         nY += aCtrlSize.Height()+IMPL_DIALOG_OFFSET;
-                        nX  = IMPL_DIALOG_OFFSET;
+                        nX	= IMPL_DIALOG_OFFSET;
                         nLines++;
                     }
 
@@ -251,7 +251,7 @@ void TabDialog::Resize()
 // !!! In the future the controls should be automaticly rearrange
 // !!! if the window is resized
 // !!! if ( !IsRollUp() )
-// !!!      ImplPosControls();
+// !!!		ImplPosControls();
 }
 
 // -----------------------------------------------------------------------
diff --git a/vcl/source/window/tabpage.cxx b/vcl/source/window/tabpage.cxx
index 0589d57009f4..a7b6e6557d8e 100644
--- a/vcl/source/window/tabpage.cxx
+++ b/vcl/source/window/tabpage.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
@@ -175,7 +175,7 @@ void TabPage::Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, UL
     Wallpaper aWallpaper = GetBackground();
     if ( !aWallpaper.IsBitmap() )
         ImplInitSettings();
-
+    
     pDev->Push();
     pDev->SetMapMode();
     pDev->SetLineColor();
diff --git a/vcl/source/window/taskpanelist.cxx b/vcl/source/window/taskpanelist.cxx
index c09dc464b809..380d74cfb8d8 100644
--- a/vcl/source/window/taskpanelist.cxx
+++ b/vcl/source/window/taskpanelist.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
@@ -48,7 +48,7 @@ Point ImplTaskPaneListGetPos( const Window *w )
         else
             pos = w->OutputToAbsoluteScreenPixel( pos );
     }
-    else
+    else 
         pos = w->OutputToAbsoluteScreenPixel( w->GetPosPixel() );
 
     return pos;
@@ -391,7 +391,7 @@ Window* TaskPaneList::FindNextFloat( Window *pWindow, BOOL bForward )
             ++p;
     }
 
-    return pWindow;
+    return pWindow; 
 }
 
 // --------------------------------------------------
diff --git a/vcl/source/window/toolbox.cxx b/vcl/source/window/toolbox.cxx
index cde91a8dcd97..46a7384180b8 100644
--- a/vcl/source/window/toolbox.cxx
+++ b/vcl/source/window/toolbox.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
@@ -233,11 +233,11 @@ ButtonType determineButtonType( ImplToolItem* pItem, ButtonType defaultType )
     ToolBoxItemBits nBits( pItem->mnBits & 0x300 );
     if ( nBits & TIB_TEXTICON ) // item has custom setting
     {
-        tmpButtonType = BUTTON_SYMBOLTEXT;
+        tmpButtonType = BUTTON_SYMBOLTEXT; 
         if ( nBits == TIB_TEXT_ONLY )
-            tmpButtonType = BUTTON_TEXT;
+            tmpButtonType = BUTTON_TEXT; 
         else if ( nBits == TIB_ICON_ONLY )
-            tmpButtonType = BUTTON_SYMBOL;
+            tmpButtonType = BUTTON_SYMBOL; 
     }
     return tmpButtonType;
 }
@@ -320,7 +320,7 @@ static void ImplCheckUpdate( ToolBox *pThis )
     // which would result in erasing the background only and not painting any items
     // this must not be done when we're already in Paint()
 
-    // this is only required for transparent toolbars (see ImplDrawTransparentBackground() )
+    // this is only required for transparent toolbars (see ImplDrawTransparentBackground() ) 
     if( !pThis->IsBackground() && pThis->HasPaintEvent() && !pThis->IsInPaint() )
         pThis->Update();
 }
@@ -344,7 +344,7 @@ void ToolBox::ImplDrawGrip( ToolBox* pThis )
             Rectangle           aCtrlRegion( aPt, pThis->GetOutputSizePixel() );
             ControlState        nState = CTRL_STATE_ENABLED;
 
-            bNativeOk = pThis->DrawNativeControl( CTRL_TOOLBAR, pThis->mbHorz ? PART_THUMB_VERT : PART_THUMB_HORZ,
+            bNativeOk = pThis->DrawNativeControl( CTRL_TOOLBAR, pThis->mbHorz ? PART_THUMB_VERT : PART_THUMB_HORZ, 
                                             aCtrlRegion, nState, aToolbarValue, rtl::OUString() );
         }
 
@@ -558,7 +558,7 @@ BOOL ToolBox::ImplDrawNativeBackground( ToolBox* pThis, const Region & )
     Rectangle aCtrlRegion( aPt, pThis->GetOutputSizePixel() );
     ControlState  nState = CTRL_STATE_ENABLED;
 
-    return pThis->DrawNativeControl( CTRL_TOOLBAR, pThis->mbHorz ? PART_DRAW_BACKGROUND_HORZ : PART_DRAW_BACKGROUND_VERT,
+    return pThis->DrawNativeControl( CTRL_TOOLBAR, pThis->mbHorz ? PART_DRAW_BACKGROUND_HORZ : PART_DRAW_BACKGROUND_VERT, 
                                     aCtrlRegion, nState, ImplControlValue(), rtl::OUString() );
 }
 
@@ -566,11 +566,11 @@ void ToolBox::ImplDrawTransparentBackground( ToolBox* pThis, const Region &rRegi
 {
     // just invalidate to trigger paint of the parent
 
-    const bool      bOldPaintLock = pThis->mpData->mbIsPaintLocked;
+    const bool		bOldPaintLock = pThis->mpData->mbIsPaintLocked;
     pThis->mpData->mbIsPaintLocked = true;
 
     // send an invalidate to the first opaque parent and invalidate the whole hierarchy from there (noclipchildren)
-    pThis->Invalidate( rRegion, INVALIDATE_UPDATE|INVALIDATE_NOCLIPCHILDREN );
+    pThis->Invalidate( rRegion, INVALIDATE_UPDATE|INVALIDATE_NOCLIPCHILDREN );  
 
     pThis->mpData->mbIsPaintLocked = bOldPaintLock;
 }
@@ -584,7 +584,7 @@ void ToolBox::ImplDrawConstantBackground( ToolBox* pThis, const Region &rRegion,
     else
     {
         // use different color in popupmode
-        pThis->DrawWallpaper( rRegion.GetBoundRect(),
+        pThis->DrawWallpaper( rRegion.GetBoundRect(), 
             Wallpaper( pThis->GetSettings().GetStyleSettings().GetFaceGradientColor() ) );
     }
 }
@@ -646,7 +646,7 @@ void ToolBox::ImplErase( ToolBox* pThis, const Rectangle &rRect, BOOL bHighlight
     // the background of non NWF buttons is painted in a constant color
     // to have the same highlight color (transparency in DrawSelectionBackground())
     // items with open popups will also painted using a constant color
-    if( !pThis->mpData->mbNativeButtons &&
+    if( !pThis->mpData->mbNativeButtons && 
         (bHighlight || ! (((Window*) pThis)->GetStyle() & WB_3DLOOK ) ) )
     {
         if( (((Window*) pThis)->GetStyle() & WB_3DLOOK ) )
@@ -1046,12 +1046,12 @@ USHORT ToolBox::ImplCalcLines( ToolBox* pThis, long nToolSize )
         nLineHeight += TB_LINESPACING;
         nToolSize += TB_LINESPACING;
     }
-
+    
     // #i91917# always report at least one line
     long nLines = nToolSize/nLineHeight;
     if( nLines < 1 )
         nLines = 1;
-
+    
     return static_cast<USHORT>(nLines);
 }
 
@@ -1578,7 +1578,7 @@ void ToolBox::ImplInit( Window* pParent, WinBits nStyle )
     ImplGetWindowImpl()->mbToolBox         = TRUE;
     mpBtnDev          = NULL;
     mpFloatSizeAry    = NULL;
-    mpData              = new ImplToolBoxPrivateData;
+    mpData				= new ImplToolBoxPrivateData;
     mpFloatWin        = NULL;
     mnDX              = 0;
     mnDY              = 0;
@@ -1597,7 +1597,7 @@ void ToolBox::ImplInit( Window* pParent, WinBits nStyle )
     mnCurItemId       = 0;
     mnDownItemId      = 0;
     mnCurPos          = TOOLBOX_ITEM_NOTFOUND;
-    mnFocusPos        = TOOLBOX_ITEM_NOTFOUND;  // current position during keyboard access
+    mnFocusPos        = TOOLBOX_ITEM_NOTFOUND;	// current position during keyboard access
     mnLines           = 1;
     mnCurLine         = 1;
     mnCurLines        = 1;
@@ -1623,7 +1623,7 @@ void ToolBox::ImplInit( Window* pParent, WinBits nStyle )
     mbDragging        = FALSE;
     mbHideStatusText  = FALSE;
     mbMenuStrings     = FALSE;
-    mbIsShift         = FALSE;
+    mbIsShift		  = FALSE;
     mbIsKeyEvent = FALSE;
     mbChangingHighlight = FALSE;
     meButtonType      = BUTTON_SYMBOL;
@@ -1631,7 +1631,7 @@ void ToolBox::ImplInit( Window* pParent, WinBits nStyle )
     meLastStyle       = POINTER_ARROW;
     mnWinStyle        = nStyle;
     mnLastFocusItemId          = 0;
-    mnKeyModifier     = 0;
+    mnKeyModifier	  = 0;
     mnActivateCount   = 0;
 
     maTimer.SetTimeout( 50 );
@@ -1728,7 +1728,7 @@ void ToolBox::ImplLoadRes( const ResId& rResId )
     ResMgr* pMgr = rResId.GetResMgr();
     if( ! pMgr )
         return;
-
+    
     DockingWindow::ImplLoadRes( rResId );
 
     ULONG              nObjMask;
@@ -1940,7 +1940,7 @@ BOOL ToolBox::ImplCalcItem()
                     mpData->mnMenuButtonWidth = TB_MENUBUTTON_SIZE;
             }
         }
-
+        
         // also calculate the area for comboboxes, drop down list boxes and spinfields
         // as these are often inserted into toolboxes; set mnWinHeight to the
         // greater of those values to prevent toolbar flickering (#i103385#)
@@ -1980,10 +1980,10 @@ BOOL ToolBox::ImplCalcItem()
             if( aRect.GetHeight() > mnWinHeight )
                 mnWinHeight = aRect.GetHeight();
         }
-    }
-
+    }    
+    
     if ( ! mpData->m_aItems.empty() )
-    {
+    {        
         std::vector< ImplToolItem >::iterator it = mpData->m_aItems.begin();
         while ( it != mpData->m_aItems.end() )
         {
@@ -2003,7 +2003,7 @@ BOOL ToolBox::ImplCalcItem()
                     bText = FALSE;
                 else
                     bText = TRUE;
-                ButtonType tmpButtonType = determineButtonType( &(*it), meButtonType ); // default to toolbox setting
+                ButtonType tmpButtonType = determineButtonType( &(*it), meButtonType ); // default to toolbox setting 
                 if ( bImage || bText )
                 {
 
@@ -2094,7 +2094,7 @@ BOOL ToolBox::ImplCalcItem()
             {
                 // add borders
                 ImplAddButtonBorder( it->maItemSize.Width(), it->maItemSize.Height(), mnOutStyle, mpData->mbNativeButtons );
-
+                
                 if( it->meType == TOOLBOXITEM_BUTTON )
                 {
                     if( it->maItemSize.Width() < nMinWidth )
@@ -3419,13 +3419,13 @@ static void ImplDrawButton( ToolBox* pThis, const Rectangle &rRect, USHORT highl
         ControlState        nState = 0;
 
         if ( highlight == 1 )   nState |= CTRL_STATE_PRESSED;
-        if ( highlight == 2 )   nState |= CTRL_STATE_ROLLOVER;
+        if ( highlight == 2 ) 	nState |= CTRL_STATE_ROLLOVER;
         if ( bEnabled )         nState |= CTRL_STATE_ENABLED;
 
         aControlValue.setTristateVal( bChecked ? BUTTONVALUE_ON : BUTTONVALUE_OFF );
 
 
-        bNativeOk = pThis->DrawNativeControl( CTRL_TOOLBAR, PART_BUTTON,
+        bNativeOk = pThis->DrawNativeControl( CTRL_TOOLBAR, PART_BUTTON, 
                                               rRect, nState, aControlValue, rtl::OUString() );
     }
 
@@ -3636,7 +3636,7 @@ void ToolBox::ImplDrawItem( USHORT nPos, BOOL bHighlight, BOOL bPaint, BOOL bLay
     // determine what has to be drawn on the button: image, text or both
     BOOL bImage;
     BOOL bText;
-    ButtonType tmpButtonType = determineButtonType( pItem, meButtonType ); // default to toolbox setting
+    ButtonType tmpButtonType = determineButtonType( pItem, meButtonType ); // default to toolbox setting 
     pItem->DetermineButtonDrawStyle( tmpButtonType, bImage, bText );
 
     // compute output values
@@ -3688,7 +3688,7 @@ void ToolBox::ImplDrawItem( USHORT nPos, BOOL bHighlight, BOOL bPaint, BOOL bLay
             nImageOffX += (nBtnWidth-aImageSize.Width())/2;
             nImageOffY += (nBtnHeight-aImageSize.Height())/2;
         }
-        if ( bHighlight || (pItem->meState == STATE_CHECK) )
+        if ( bHighlight || (pItem->meState == STATE_CHECK) ) 
         {
             if( bHasOpenPopup )
                 ImplDrawFloatwinBorder( pItem );
@@ -3926,7 +3926,7 @@ void ToolBox::ImplFloatControl( BOOL bStart, FloatingWindow* pFloatWindow )
         // draw current item with highlight and keep old state
         BOOL bWasKeyboardActivate = mpData->mbDropDownByKeyboard;
 
-
+        
         if ( mnCurPos != TOOLBOX_ITEM_NOTFOUND )
             ImplDrawItem( mnCurPos, bWasKeyboardActivate ? 2 : 0 );
         Deactivate();
@@ -3965,7 +3965,7 @@ void ToolBox::ShowLine( BOOL bNext )
                 mnCurLine = mnCurLine - delta;
             else
                 mnCurLine = 1;
-        }
+        } 
     }
     else
     {
@@ -4063,7 +4063,7 @@ BOOL ToolBox::ImplHandleMouseButtonUp( const MouseEvent& rMEvt, BOOL bCancel )
     {
         mpData->maDropdownTimer.Stop();
     }
-
+    
     if ( mbDrag || mbSelection )
     {
         // Hier die MouseDaten setzen, wenn Selection-Modus, da dann kein
@@ -4756,7 +4756,7 @@ void ToolBox::Move()
 // -----------------------------------------------------------------------
 
 void ToolBox::Resize()
-{
+{ 
     Size aSize = GetOutputSizePixel();
     // #i31422# some WindowManagers send (0,0) sizes when
     // switching virtual desktops - ignore this and avoid reformatting
@@ -4893,7 +4893,7 @@ void ToolBox::RequestHelp( const HelpEvent& rHEvt )
         {
             String aCommand = GetItemCommand( nItemId );
             ULONG  nHelpId  = GetHelpId( nItemId );
-
+            
             if ( aCommand.Len() || nHelpId )
             {
                 // Wenn eine Hilfe existiert, dann ausloesen
@@ -5391,7 +5391,7 @@ Size ToolBox::CalcWindowSizePixel( USHORT nCalcLines, WindowAlign eAlign ) const
 USHORT ToolBox::ImplCountLineBreaks( const ToolBox *pThis )
 {
     USHORT nLines = 0;
-
+    
     std::vector< ImplToolItem >::const_iterator it = ((ToolBox*)pThis)->mpData->m_aItems.begin();
     while ( it != ((ToolBox*)pThis)->mpData->m_aItems.end() )
     {
@@ -5406,7 +5406,7 @@ Size ToolBox::CalcPopupWindowSizePixel() const
 {
     // count number of breaks and calc corresponding floating window size
     USHORT nLines = ImplCountLineBreaks( this );
-
+    
     if( nLines )
         nLines++;   // add the first line
     else
@@ -5735,7 +5735,7 @@ void ToolBox::KeyInput( const KeyEvent& rKEvt )
         case KEY_UP:
         {
             // Ctrl-Cursor activates next toolbox, indicated by a blue arrow pointing to the left/up
-            if( aKeyCode.GetModifier() )    // allow only pure cursor keys
+            if( aKeyCode.GetModifier() )	// allow only pure cursor keys
                 break;
             if( !IsHorizontal() )
                 ImplChangeHighlightUpDn( TRUE );
@@ -5745,7 +5745,7 @@ void ToolBox::KeyInput( const KeyEvent& rKEvt )
         break;
         case KEY_LEFT:
         {
-            if( aKeyCode.GetModifier() )    // allow only pure cursor keys
+            if( aKeyCode.GetModifier() )	// allow only pure cursor keys
                 break;
             if( IsHorizontal() )
                 ImplChangeHighlightUpDn( TRUE );
@@ -5755,7 +5755,7 @@ void ToolBox::KeyInput( const KeyEvent& rKEvt )
         break;
         case KEY_DOWN:
         {
-            if( aKeyCode.GetModifier() )    // allow only pure cursor keys
+            if( aKeyCode.GetModifier() )	// allow only pure cursor keys
                 break;
             if( !IsHorizontal() )
                 ImplChangeHighlightUpDn( FALSE );
@@ -5765,7 +5765,7 @@ void ToolBox::KeyInput( const KeyEvent& rKEvt )
         break;
         case KEY_RIGHT:
         {
-            if( aKeyCode.GetModifier() )    // allow only pure cursor keys
+            if( aKeyCode.GetModifier() )	// allow only pure cursor keys
                 break;
             if( IsHorizontal() )
                 ImplChangeHighlightUpDn( FALSE );
diff --git a/vcl/source/window/toolbox2.cxx b/vcl/source/window/toolbox2.cxx
index 334cdd2d0a64..9f15df63be68 100644
--- a/vcl/source/window/toolbox2.cxx
+++ b/vcl/source/window/toolbox2.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
@@ -54,7 +54,7 @@ using namespace rtl;
 
 // =======================================================================
 
-#define TB_SEP_SIZE             8
+#define TB_SEP_SIZE 			8
 
 // -----------------------------------------------------------------------
 
@@ -96,22 +96,22 @@ ImplToolBoxPrivateData::~ImplToolBoxPrivateData()
 // -----------------------------------------------------------------------
 ImplToolItem::ImplToolItem()
 {
-    mnId            = 0;
-    mpWindow        = NULL;
-    mpUserData      = NULL;
-    mnHelpId        = 0;
-    meType          = TOOLBOXITEM_BUTTON;
-    mnBits          = 0;
-    meState         = STATE_NOCHECK;
-    mbEnabled       = TRUE;
-    mbVisible       = TRUE;
-    mbEmptyBtn      = TRUE;
-    mbShowWindow    = FALSE;
-    mbBreak         = FALSE;
-    mnSepSize       = TB_SEP_SIZE;
+    mnId			= 0;
+    mpWindow		= NULL;
+    mpUserData		= NULL;
+    mnHelpId		= 0;
+    meType			= TOOLBOXITEM_BUTTON;
+    mnBits			= 0;
+    meState 		= STATE_NOCHECK;
+    mbEnabled		= TRUE;
+    mbVisible		= TRUE;
+    mbEmptyBtn		= TRUE;
+    mbShowWindow	= FALSE;
+    mbBreak 		= FALSE;
+    mnSepSize		= TB_SEP_SIZE;
     mnDropDownArrowWidth = TB_DROPDOWNARROWWIDTH;
-    mnImageAngle    = 0;
-    mbMirrorMode    = FALSE;
+    mnImageAngle	= 0;
+    mbMirrorMode	= FALSE;
     mbVisibleText   = FALSE;
 }
 
@@ -121,22 +121,22 @@ ImplToolItem::ImplToolItem( USHORT nItemId, const Image& rImage,
                             ToolBoxItemBits nItemBits ) :
     maImage( rImage )
 {
-    mnId            = nItemId;
-    mpWindow        = NULL;
-    mpUserData      = NULL;
-    mnHelpId        = 0;
-    meType          = TOOLBOXITEM_BUTTON;
-    mnBits          = nItemBits;
-    meState         = STATE_NOCHECK;
-    mbEnabled       = TRUE;
-    mbVisible       = TRUE;
-    mbEmptyBtn      = FALSE;
-    mbShowWindow    = FALSE;
-    mbBreak         = FALSE;
-    mnSepSize       = TB_SEP_SIZE;
+    mnId			= nItemId;
+    mpWindow		= NULL;
+    mpUserData		= NULL;
+    mnHelpId		= 0;
+    meType			= TOOLBOXITEM_BUTTON;
+    mnBits			= nItemBits;
+    meState 		= STATE_NOCHECK;
+    mbEnabled		= TRUE;
+    mbVisible		= TRUE;
+    mbEmptyBtn		= FALSE;
+    mbShowWindow	= FALSE;
+    mbBreak 		= FALSE;
+    mnSepSize		= TB_SEP_SIZE;
     mnDropDownArrowWidth = TB_DROPDOWNARROWWIDTH;
-    mnImageAngle    = 0;
-    mbMirrorMode    = false;
+    mnImageAngle	= 0;
+    mbMirrorMode	= false;
     mbVisibleText   = false;
 }
 
@@ -146,22 +146,22 @@ ImplToolItem::ImplToolItem( USHORT nItemId, const XubString& rText,
                             ToolBoxItemBits nItemBits ) :
     maText( rText )
 {
-    mnId            = nItemId;
-    mpWindow        = NULL;
-    mpUserData      = NULL;
-    mnHelpId        = 0;
-    meType          = TOOLBOXITEM_BUTTON;
-    mnBits          = nItemBits;
-    meState         = STATE_NOCHECK;
-    mbEnabled       = TRUE;
-    mbVisible       = TRUE;
-    mbEmptyBtn      = FALSE;
-    mbShowWindow    = FALSE;
-    mbBreak         = FALSE;
-    mnSepSize       = TB_SEP_SIZE;
+    mnId			= nItemId;
+    mpWindow		= NULL;
+    mpUserData		= NULL;
+    mnHelpId		= 0;
+    meType			= TOOLBOXITEM_BUTTON;
+    mnBits			= nItemBits;
+    meState 		= STATE_NOCHECK;
+    mbEnabled		= TRUE;
+    mbVisible		= TRUE;
+    mbEmptyBtn		= FALSE;
+    mbShowWindow	= FALSE;
+    mbBreak 		= FALSE;
+    mnSepSize		= TB_SEP_SIZE;
     mnDropDownArrowWidth = TB_DROPDOWNARROWWIDTH;
-    mnImageAngle    = 0;
-    mbMirrorMode    = false;
+    mnImageAngle	= 0;
+    mbMirrorMode	= false;
     mbVisibleText   = false;
 }
 
@@ -172,54 +172,54 @@ ImplToolItem::ImplToolItem( USHORT nItemId, const Image& rImage,
     maImage( rImage ),
     maText( rText )
 {
-    mnId            = nItemId;
-    mpWindow        = NULL;
-    mpUserData      = NULL;
-    mnHelpId        = 0;
-    meType          = TOOLBOXITEM_BUTTON;
-    mnBits          = nItemBits;
-    meState         = STATE_NOCHECK;
-    mbEnabled       = TRUE;
-    mbVisible       = TRUE;
-    mbEmptyBtn      = FALSE;
-    mbShowWindow    = FALSE;
-    mbBreak         = FALSE;
-    mnSepSize       = TB_SEP_SIZE;
+    mnId			= nItemId;
+    mpWindow		= NULL;
+    mpUserData		= NULL;
+    mnHelpId		= 0;
+    meType			= TOOLBOXITEM_BUTTON;
+    mnBits			= nItemBits;
+    meState 		= STATE_NOCHECK;
+    mbEnabled		= TRUE;
+    mbVisible		= TRUE;
+    mbEmptyBtn		= FALSE;
+    mbShowWindow	= FALSE;
+    mbBreak 		= FALSE;
+    mnSepSize		= TB_SEP_SIZE;
     mnDropDownArrowWidth = TB_DROPDOWNARROWWIDTH;
-    mnImageAngle    = 0;
-    mbMirrorMode    = false;
+    mnImageAngle	= 0;
+    mbMirrorMode	= false;
     mbVisibleText   = false;
 }
 
 // -----------------------------------------------------------------------
 
 ImplToolItem::ImplToolItem( const ImplToolItem& rItem ) :
-        mpWindow                ( rItem.mpWindow ),
-        mpUserData              ( rItem.mpUserData ),
-        maImage                 ( rItem.maImage ),
-        maHighImage             ( rItem.maHighImage ),
-        mnImageAngle            ( rItem.mnImageAngle ),
-        mbMirrorMode            ( rItem.mbMirrorMode ),
-        maText                  ( rItem.maText ),
-        maQuickHelpText         ( rItem.maQuickHelpText ),
-        maHelpText              ( rItem.maHelpText ),
-        maCommandStr            ( rItem.maCommandStr ),
-        mnHelpId                ( rItem.mnHelpId ),
-        maRect                  ( rItem.maRect ),
-        maCalcRect              ( rItem.maCalcRect ),
-        maItemSize              ( rItem.maItemSize ),
-        mnSepSize               ( rItem.mnSepSize ),
+        mpWindow				( rItem.mpWindow ),
+        mpUserData				( rItem.mpUserData ),
+        maImage					( rItem.maImage ),
+        maHighImage				( rItem.maHighImage ),
+        mnImageAngle			( rItem.mnImageAngle ),
+        mbMirrorMode			( rItem.mbMirrorMode ),
+        maText					( rItem.maText ),
+        maQuickHelpText			( rItem.maQuickHelpText ),
+        maHelpText				( rItem.maHelpText ),
+        maCommandStr			( rItem.maCommandStr ),
+        mnHelpId				( rItem.mnHelpId ),
+        maRect					( rItem.maRect ),
+        maCalcRect				( rItem.maCalcRect ),
+        maItemSize				( rItem.maItemSize ),
+        mnSepSize				( rItem.mnSepSize ),
         mnDropDownArrowWidth    ( rItem.mnDropDownArrowWidth ),
-        meType                  ( rItem.meType ),
-        mnBits                  ( rItem.mnBits ),
-        meState                 ( rItem.meState ),
-        mnId                    ( rItem.mnId ),
-        mbEnabled               ( rItem.mbEnabled ),
-        mbVisible               ( rItem.mbVisible ),
-        mbEmptyBtn              ( rItem.mbEmptyBtn ),
-        mbShowWindow            ( rItem.mbShowWindow ),
-        mbBreak                 ( rItem.mbBreak ),
-        mbVisibleText           ( rItem.mbVisibleText )
+        meType					( rItem.meType ),
+        mnBits					( rItem.mnBits ),
+        meState					( rItem.meState ),
+        mnId					( rItem.mnId ),
+        mbEnabled				( rItem.mbEnabled ),
+        mbVisible				( rItem.mbVisible ),
+        mbEmptyBtn				( rItem.mbEmptyBtn ),
+        mbShowWindow			( rItem.mbShowWindow ),
+        mbBreak					( rItem.mbBreak ),
+        mbVisibleText			( rItem.mbVisibleText )
 {
 }
 
@@ -233,32 +233,32 @@ ImplToolItem::~ImplToolItem()
 
 ImplToolItem& ImplToolItem::operator=( const ImplToolItem& rItem )
 {
-    mpWindow                = rItem.mpWindow;
-    mpUserData              = rItem.mpUserData;
-    maImage                 = rItem.maImage;
-    maHighImage             = rItem.maHighImage;
-    mnImageAngle            = rItem.mnImageAngle;
-    mbMirrorMode            = rItem.mbMirrorMode;
-    maText                  = rItem.maText;
-    maQuickHelpText         = rItem.maQuickHelpText;
-    maHelpText              = rItem.maHelpText;
-    maCommandStr            = rItem.maCommandStr;
-    mnHelpId                = rItem.mnHelpId;
-    maRect                  = rItem.maRect;
-    maCalcRect              = rItem.maCalcRect;
-    mnSepSize               = rItem.mnSepSize;
+    mpWindow				= rItem.mpWindow;
+    mpUserData				= rItem.mpUserData;
+    maImage					= rItem.maImage;
+    maHighImage				= rItem.maHighImage;
+    mnImageAngle			= rItem.mnImageAngle;
+    mbMirrorMode			= rItem.mbMirrorMode;
+    maText					= rItem.maText;
+    maQuickHelpText			= rItem.maQuickHelpText;
+    maHelpText				= rItem.maHelpText;
+    maCommandStr			= rItem.maCommandStr;
+    mnHelpId				= rItem.mnHelpId;
+    maRect					= rItem.maRect;
+    maCalcRect				= rItem.maCalcRect;
+    mnSepSize				= rItem.mnSepSize;
     mnDropDownArrowWidth    = rItem.mnDropDownArrowWidth;
-    maItemSize              = rItem.maItemSize;
-    mbVisibleText           = rItem.mbVisibleText;
-    meType                  = rItem.meType;
-    mnBits                  = rItem.mnBits;
-    meState                 = rItem.meState;
-    mnId                    = rItem.mnId;
-    mbEnabled               = rItem.mbEnabled;
-    mbVisible               = rItem.mbVisible;
-    mbEmptyBtn              = rItem.mbEmptyBtn;
-    mbShowWindow            = rItem.mbShowWindow;
-    mbBreak                 = rItem.mbBreak;
+    maItemSize				= rItem.maItemSize;
+    mbVisibleText			= rItem.mbVisibleText;
+    meType					= rItem.meType;
+    mnBits					= rItem.mnBits;
+    meState					= rItem.meState;
+    mnId					= rItem.mnId;
+    mbEnabled				= rItem.mbEnabled;
+    mbVisible				= rItem.mbVisible;
+    mbEmptyBtn				= rItem.mbEmptyBtn;
+    mbShowWindow			= rItem.mbShowWindow;
+    mbBreak					= rItem.mbBreak;
     return *this;
 }
 
@@ -574,14 +574,14 @@ void ToolBox::UserDraw( const UserDrawEvent& )
 
 void ToolBox::InsertItem( const ResId& rResId, USHORT nPos )
 {
-    ULONG                   nObjMask;
-    BOOL                    bImage = FALSE;     // Wurde Image gesetzt
+    ULONG					nObjMask;
+    BOOL					bImage = FALSE; 	// Wurde Image gesetzt
 
     // Item anlegen
     ImplToolItem aItem;
 
     GetRes( rResId.SetRT( RSC_TOOLBOXITEM ) );
-    nObjMask            = ReadLongRes();
+    nObjMask			= ReadLongRes();
 
     if ( nObjMask & RSC_TOOLBOXITEM_ID )
         aItem.mnId = sal::static_int_cast<USHORT>(ReadLongRes());
@@ -622,7 +622,7 @@ void ToolBox::InsertItem( const ResId& rResId, USHORT nPos )
         aItem.mbEnabled = !(BOOL)ReadShortRes();
 
     if ( nObjMask & RSC_TOOLBOXITEM_STATE )
-        aItem.meState   = (TriState)ReadLongRes();
+        aItem.meState	= (TriState)ReadLongRes();
 
     if ( nObjMask & RSC_TOOLBOXITEM_HIDE )
         aItem.mbVisible = !((BOOL)ReadShortRes());
@@ -735,10 +735,10 @@ void ToolBox::InsertWindow( USHORT nItemId, Window* pWindow,
 
     // Item anlegen und in die Liste einfuegen
     ImplToolItem aItem;
-    aItem.mnId       = nItemId;
-    aItem.meType     = TOOLBOXITEM_BUTTON;
-    aItem.mnBits     = nBits;
-    aItem.mpWindow   = pWindow;
+    aItem.mnId 		 = nItemId;
+    aItem.meType	 = TOOLBOXITEM_BUTTON;
+    aItem.mnBits	 = nBits;
+    aItem.mpWindow 	 = pWindow;
     mpData->m_aItems.insert( (nPos < mpData->m_aItems.size()) ? mpData->m_aItems.begin()+nPos : mpData->m_aItems.end(), aItem );
     mpData->ImplClearLayoutData();
 
@@ -758,8 +758,8 @@ void ToolBox::InsertSpace( USHORT nPos )
 {
     // Item anlegen und in die Liste einfuegen
     ImplToolItem aItem;
-    aItem.meType     = TOOLBOXITEM_SPACE;
-    aItem.mbEnabled  = FALSE;
+    aItem.meType	 = TOOLBOXITEM_SPACE;
+    aItem.mbEnabled	 = FALSE;
     mpData->m_aItems.insert( (nPos < mpData->m_aItems.size()) ? mpData->m_aItems.begin()+nPos : mpData->m_aItems.end(), aItem );
     mpData->ImplClearLayoutData();
 
@@ -776,8 +776,8 @@ void ToolBox::InsertSeparator( USHORT nPos, USHORT nPixSize )
 {
     // Item anlegen und in die Liste einfuegen
     ImplToolItem aItem;
-    aItem.meType     = TOOLBOXITEM_SEPARATOR;
-    aItem.mbEnabled  = FALSE;
+    aItem.meType	 = TOOLBOXITEM_SEPARATOR;
+    aItem.mbEnabled	 = FALSE;
     if ( nPixSize )
         aItem.mnSepSize = nPixSize;
     mpData->m_aItems.insert( (nPos < mpData->m_aItems.size()) ? mpData->m_aItems.begin()+nPos : mpData->m_aItems.end(), aItem );
@@ -796,8 +796,8 @@ void ToolBox::InsertBreak( USHORT nPos )
 {
     // Item anlegen und in die Liste einfuegen
     ImplToolItem aItem;
-    aItem.meType     = TOOLBOXITEM_BREAK;
-    aItem.mbEnabled  = FALSE;
+    aItem.meType	 = TOOLBOXITEM_BREAK;
+    aItem.mbEnabled	 = FALSE;
     mpData->m_aItems.insert( (nPos < mpData->m_aItems.size()) ? mpData->m_aItems.begin()+nPos : mpData->m_aItems.end(), aItem );
     mpData->ImplClearLayoutData();
 
@@ -893,7 +893,7 @@ void ToolBox::CopyItem( const ToolBox& rToolBox, USHORT nItemId,
         // ToolBox-Item in der Liste verschieben
         ImplToolItem aNewItem = rToolBox.mpData->m_aItems[nPos];
         // Bestimme Daten zuruecksetzen
-        aNewItem.mpWindow      = NULL;
+        aNewItem.mpWindow	   = NULL;
         aNewItem.mbShowWindow = FALSE;
 
         mpData->m_aItems.insert( (nNewPos < mpData->m_aItems.size()) ? mpData->m_aItems.begin()+nNewPos : mpData->m_aItems.end(), aNewItem );
@@ -920,8 +920,8 @@ void ToolBox::CopyItems( const ToolBox& rToolBox )
     for( std::vector< ImplToolItem >::iterator it = mpData->m_aItems.begin();
          it != mpData->m_aItems.end(); ++it )
     {
-        it->mpWindow        = NULL;
-        it->mbShowWindow    = FALSE;
+        it->mpWindow		= NULL;
+        it->mbShowWindow	= FALSE;
     }
 
     ImplInvalidate( TRUE, TRUE );
@@ -1384,8 +1384,8 @@ void ToolBox::SetImageList( const ImageList& rImageList )
 
 static Image ImplRotImage( const Image& rImage, long nAngle10 )
 {
-    Image       aRet;
-    BitmapEx    aRotBitmapEx( rImage.GetBitmapEx() );
+    Image 		aRet;
+    BitmapEx	aRotBitmapEx( rImage.GetBitmapEx() );
 
     aRotBitmapEx.Rotate( nAngle10, Color( COL_WHITE ) );
 
@@ -1427,8 +1427,8 @@ void ToolBox::SetItemImageAngle( USHORT nItemId, long nAngle10 )
 
 static Image ImplMirrorImage( const Image& rImage )
 {
-    Image       aRet;
-    BitmapEx    aMirrBitmapEx( rImage.GetBitmapEx() );
+    Image 		aRet;
+    BitmapEx	aMirrBitmapEx( rImage.GetBitmapEx() );
 
     aMirrBitmapEx.Mirror( BMP_MIRROR_HORZ );
 
@@ -1605,7 +1605,7 @@ void ToolBox::StartSelection()
     if ( !mbSelection )
     {
         mbSelection  = TRUE;
-        mnCurPos     = TOOLBOX_ITEM_NOTFOUND;
+        mnCurPos	 = TOOLBOX_ITEM_NOTFOUND;
         mnCurItemId  = 0;
         Activate();
     }
@@ -1629,10 +1629,10 @@ void ToolBox::EndSelection()
         Deactivate();
     }
 
-    mnCurPos        = TOOLBOX_ITEM_NOTFOUND;
-    mnCurItemId     = 0;
-    mnDownItemId    = 0;
-    mnMouseClicks   = 0;
+    mnCurPos		= TOOLBOX_ITEM_NOTFOUND;
+    mnCurItemId 	= 0;
+    mnDownItemId	= 0;
+    mnMouseClicks	= 0;
     mnMouseModifier = 0;
 }
 
@@ -1674,9 +1674,9 @@ void ToolBox::SetItemDown( USHORT nItemId, BOOL bDown, BOOL bRelease )
                 Deactivate();
             }
 
-            mnCurItemId     = 0;
-            mnDownItemId    = 0;
-            mnMouseClicks   = 0;
+            mnCurItemId 	= 0;
+            mnDownItemId	= 0;
+            mnMouseClicks	= 0;
             mnMouseModifier = 0;
         }
     }
@@ -1711,9 +1711,9 @@ void ToolBox::SetItemState( USHORT nItemId, TriState eState )
             if ( (eState == STATE_CHECK) && (pItem->mnBits & TIB_AUTOCHECK) &&
                  (pItem->mnBits & TIB_RADIOCHECK) )
             {
-                ImplToolItem*    pGroupItem;
-                USHORT          nGroupPos;
-                USHORT          nItemCount = GetItemCount();
+                ImplToolItem*	 pGroupItem;
+                USHORT			nGroupPos;
+                USHORT			nItemCount = GetItemCount();
 
                 nGroupPos = nPos;
                 while ( nGroupPos )
@@ -2423,7 +2423,7 @@ void ToolBox::ImplUpdateImageList()
                 vcl::IImageListProvider* pImageListProvider = mpData->mpImageListProvider;
                 SetImageList( pImageListProvider->getImageList(eType) );
                 mpData->meImageListType = eType;
-            }
+            }            
         }
         catch (com::sun::star::lang::IllegalArgumentException &) {}
     }
diff --git a/vcl/source/window/window.cxx b/vcl/source/window/window.cxx
index adedbde4c0f2..72e0e2063014 100644
--- a/vcl/source/window/window.cxx
+++ b/vcl/source/window/window.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
@@ -396,7 +396,7 @@ void Window::ImplUpdateGlobalSettings( AllSettings& rSettings, BOOL bCallHdl )
     };
     static std::set< LanguageType > aBrokenSystemFontSizeLanguagesSet(
         eBrokenSystemFontSizeLanguages,
-        eBrokenSystemFontSizeLanguages +
+        eBrokenSystemFontSizeLanguages + 
         (sizeof(eBrokenSystemFontSizeLanguages)/sizeof(eBrokenSystemFontSizeLanguages[0]))
         );
     LanguageType aLang = Application::GetSettings().GetUILanguage();
@@ -501,7 +501,7 @@ void Window::ImplUpdateGlobalSettings( AllSettings& rSettings, BOOL bCallHdl )
             }
         }
     }
-
+    
     static const char* pEnvHC = getenv( "SAL_FORCE_HC" );
     if( pEnvHC && *pEnvHC )
     {
@@ -637,10 +637,10 @@ void Window::ImplInitWindowData( WindowType nType )
     mpWindowImpl->mbDockWin           = FALSE;        // TRUE: DockingWindow is the base class
     mpWindowImpl->mbFloatWin          = FALSE;        // TRUE: FloatingWindow is the base class
     mpWindowImpl->mbPushButton        = FALSE;        // TRUE: PushButton is the base class
-    mpWindowImpl->mbToolBox         = FALSE;        // TRUE: ToolBox is the base class
-    mpWindowImpl->mbMenuFloatingWindow= FALSE;      // TRUE: MenuFloatingWindow is the base class
-    mpWindowImpl->mbToolbarFloatingWindow= FALSE;       // TRUE: ImplPopupFloatWin is the base class, used for subtoolbars
-    mpWindowImpl->mbSplitter            = FALSE;        // TRUE: Splitter is the base class
+    mpWindowImpl->mbToolBox			= FALSE;		// TRUE: ToolBox is the base class
+    mpWindowImpl->mbMenuFloatingWindow= FALSE;		// TRUE: MenuFloatingWindow is the base class
+    mpWindowImpl->mbToolbarFloatingWindow= FALSE;		// TRUE: ImplPopupFloatWin is the base class, used for subtoolbars
+    mpWindowImpl->mbSplitter			= FALSE;		// TRUE: Splitter is the base class
     mpWindowImpl->mbVisible           = FALSE;        // TRUE: Show( TRUE ) called
     mpWindowImpl->mbOverlapVisible    = FALSE;        // TRUE: Hide called for visible window from ImplHideAllOverlapWindow()
     mpWindowImpl->mbDisabled          = FALSE;        // TRUE: Enable( FALSE ) called
@@ -723,7 +723,7 @@ void Window::ImplInit( Window* pParent, WinBits nStyle, SystemParentData* pSyste
 
     ImplSVData* pSVData = ImplGetSVData();
     Window*     pRealParent = pParent;
-
+    
     // 3D-Look vererben
     if ( !mpWindowImpl->mbOverlapWin && pParent && (pParent->GetStyle() & WB_3DLOOK) )
         nStyle |= WB_3DLOOK;
@@ -1319,7 +1319,7 @@ ImplWinData* Window::ImplGetWinData() const
         mpWindowImpl->mpWinData->mpFocusRect      = NULL;
         mpWindowImpl->mpWinData->mpTrackRect      = NULL;
         mpWindowImpl->mpWinData->mnTrackFlags     = 0;
-        mpWindowImpl->mpWinData->mnIsTopWindow  = (USHORT) ~0;  // not initialized yet, 0/1 will indicate TopWindow (see IsTopWindow())
+        mpWindowImpl->mpWinData->mnIsTopWindow	= (USHORT) ~0;  // not initialized yet, 0/1 will indicate TopWindow (see IsTopWindow())
         mpWindowImpl->mpWinData->mbMouseOver      = FALSE;
         mpWindowImpl->mpWinData->mbEnableNativeWidget = (pNoNWF && *pNoNWF) ? FALSE : TRUE; // TRUE: try to draw this control with native theme API
         mpWindowImpl->mpWinData->mpSmartHelpId    = NULL;
@@ -2341,7 +2341,7 @@ void Window::ImplCallPaint( const Region* pRegion, USHORT nPaintFlags )
     // call PrePaint. PrePaint may add to the invalidate region as well as
     // other parameters used below.
     PrePaint();
-
+    
     mpWindowImpl->mbPaintFrame = FALSE;
 
     if ( nPaintFlags & IMPL_PAINT_PAINTALLCHILDS )
@@ -3282,7 +3282,7 @@ void Window::ImplPosSizeWindow( long nX, long nY,
                 nX = mpWindowImpl->mpParent->mnOutWidth - mnOutWidth - nX;
             }
         }
-
+        
         // check maPos as well, as it could have been changed for client windows (ImplCallMove())
         if ( mpWindowImpl->mnAbsScreenX != aPtDev.X() || nX != mpWindowImpl->mnX || nOrgX != mpWindowImpl->maPos.X() )
         {
@@ -3295,7 +3295,7 @@ void Window::ImplPosSizeWindow( long nX, long nY,
             }
             mpWindowImpl->mnX = nX;
             mpWindowImpl->maPos.X() = nOrgX;
-            mpWindowImpl->mnAbsScreenX = aPtDev.X();    // --- RTL --- (store real screen pos)
+            mpWindowImpl->mnAbsScreenX = aPtDev.X();	// --- RTL --- (store real screen pos)
             bNewPos = TRUE;
         }
     }
@@ -8711,8 +8711,8 @@ Reference< XClipboard > Window::GetPrimarySelection()
 
                     mpWindowImpl->mpFrameData->mxSelection = Reference< XClipboard >( xFactory->createInstanceWithArguments(
                     OUString::createFromAscii( "com.sun.star.datatransfer.clipboard.SystemClipboard" ), aArgumentList ), UNO_QUERY );
-#   else
-                    static Reference< XClipboard >  s_xSelection;
+#	else
+                    static Reference< XClipboard >	s_xSelection;
 
                     if ( !s_xSelection.is() )
                          s_xSelection = Reference< XClipboard >( xFactory->createInstance( OUString::createFromAscii( "com.sun.star.datatransfer.clipboard.GenericClipboardExt" ) ), UNO_QUERY );
@@ -8721,7 +8721,7 @@ Reference< XClipboard > Window::GetPrimarySelection()
                          s_xSelection = Reference< XClipboard >( xFactory->createInstance( OUString::createFromAscii( "com.sun.star.datatransfer.clipboard.GenericClipboard" ) ), UNO_QUERY );
 
                     mpWindowImpl->mpFrameData->mxSelection = s_xSelection;
-#   endif
+#	endif
                 }
             }
 
@@ -9344,7 +9344,7 @@ void Window::DrawSelectionBackground( const Rectangle& rRect,
 {
     if( rRect.IsEmpty() )
         return;
-
+    
     bool bRoundEdges = nCornerRadius > 0;
 
     const StyleSettings& rStyles = GetSettings().GetStyleSettings();
@@ -9823,7 +9823,7 @@ void Window::ImplPaintToDevice( OutputDevice* i_pTargetOutDev, const Point& i_rP
     // preserve graphicsstate
     Push();
     Region aClipRegion( GetClipRegion() );
-    SetClipRegion();
+    SetClipRegion();    
 
     GDIMetaFile* pOldMtf = GetConnectMetaFile();
     GDIMetaFile aMtf;
@@ -9885,7 +9885,7 @@ void Window::ImplPaintToDevice( OutputDevice* i_pTargetOutDev, const Point& i_rP
     SetConnectMetaFile( pOldMtf );
     EnableOutput( bOutput );
     mpWindowImpl->mbReallyVisible = bRVisible;
-
+    
     // paint metafile to VDev
     VirtualDevice* pMaskedDevice = new VirtualDevice( *i_pTargetOutDev, 0, 0 );
     pMaskedDevice->SetOutputSizePixel( GetOutputSizePixel() );
@@ -9907,7 +9907,7 @@ void Window::ImplPaintToDevice( OutputDevice* i_pTargetOutDev, const Point& i_rP
                 nDeltaX = mnOutWidth - nDeltaX - pChild->mnOutWidth;
             long nDeltaY = pChild->GetOutOffYPixel() - GetOutOffYPixel();
             Point aPos( i_rPos );
-            Point aDelta( nDeltaX, nDeltaY );
+            Point aDelta( nDeltaX, nDeltaY );                
             aPos += aDelta;
             pChild->ImplPaintToDevice( i_pTargetOutDev, aPos );
         }
@@ -9926,11 +9926,11 @@ void Window::ImplPaintToDevice( OutputDevice* i_pTargetOutDev, const Point& i_rP
 void Window::PaintToDevice( OutputDevice* pDev, const Point& rPos, const Size& /*rSize*/ )
 {
     // FIXME: scaling: currently this is for pixel copying only
-
+    
     DBG_ASSERT( ! pDev->ImplHasMirroredGraphics(), "PaintToDevice to mirroring graphics" );
     DBG_ASSERT( ! pDev->IsRTLEnabled(), "PaintToDevice to mirroring device" );
-
-
+    
+    
     Point       aPos  = pDev->LogicToPixel( rPos );
 
     Window* pRealParent = NULL;
@@ -9948,7 +9948,7 @@ void Window::PaintToDevice( OutputDevice* pDev, const Point& rPos, const Size& /
 
     BOOL bVisible = mpWindowImpl->mbVisible;
     mpWindowImpl->mbVisible = TRUE;
-
+    
     if( mpWindowImpl->mpBorderWindow )
         mpWindowImpl->mpBorderWindow->ImplPaintToDevice( pDev, rPos );
     else
diff --git a/vcl/source/window/window2.cxx b/vcl/source/window/window2.cxx
index 02b2713b01cc..349e5f477734 100644
--- a/vcl/source/window/window2.cxx
+++ b/vcl/source/window/window2.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
@@ -356,13 +356,13 @@ Bitmap Window::SnapShot() const
 void Window::ShowFocus( const Rectangle& rRect )
 {
     DBG_CHKTHIS( Window, ImplDbgCheckWindow );
-
+    
     if( mpWindowImpl->mbInShowFocus )
         return;
     mpWindowImpl->mbInShowFocus = TRUE;
 
     ImplWinData* pWinData = ImplGetWinData();
-
+    
     // native themeing suggest not to use focus rects
     if( ! ( mpWindowImpl->mbUseNativeFocus &&
             IsNativeWidgetEnabled() ) )
@@ -376,10 +376,10 @@ void Window::ShowFocus( const Rectangle& rRect )
                     mpWindowImpl->mbInShowFocus = FALSE;
                     return;
                 }
-
+    
                 ImplInvertFocus( *(pWinData->mpFocusRect) );
             }
-
+    
             ImplInvertFocus( rRect );
         }
         if ( !pWinData->mpFocusRect )
@@ -405,7 +405,7 @@ void Window::ShowFocus( const Rectangle& rRect )
 void Window::HideFocus()
 {
     DBG_CHKTHIS( Window, ImplDbgCheckWindow );
-
+    
     if( mpWindowImpl->mbInHideFocus )
         return;
     mpWindowImpl->mbInHideFocus = TRUE;
@@ -1227,9 +1227,9 @@ BOOL Window::HandleScrollCommand( const CommandEvent& rCmd,
                         nLines = pData->GetNotchDelta() * (long)nScrollLines;
                     if ( nLines )
                     {
-                        ImplHandleScroll( NULL,
-                                          0L,
-                                          pData->IsHorz() ? pHScrl : pVScrl,
+                        ImplHandleScroll( NULL, 
+                                          0L, 
+                                          pData->IsHorz() ? pHScrl : pVScrl, 
                                           nLines );
                         bRet = TRUE;
                     }
@@ -1309,7 +1309,7 @@ void Window::ImplHandleScroll( ScrollBar* pHScrl, long nX,
     }
 }
 
-// support for docking
+// support for docking 
 // this is currently handled in ImplDockingWindowWrapper
 /*
 void Window::ImplSetFloatingMode( BOOL bFloatMode )
@@ -1444,14 +1444,14 @@ Window* Window::ImplGetTopmostFrameWindow()
 
 // making these Methods out of line to be able to change them lateron without complete rebuild
 // TODO: Set the SmartId in here and remove mpWindowImpl->mnHelpId
-void Window::SetHelpId( ULONG nHelpId )
-{
-    SetSmartHelpId(SmartId(nHelpId));
+void Window::SetHelpId( ULONG nHelpId ) 
+{ 
+    SetSmartHelpId(SmartId(nHelpId)); 
 }
 
-ULONG Window::GetHelpId() const
-{
-    return mpWindowImpl->mnHelpId;
+ULONG Window::GetHelpId() const 
+{ 
+    return mpWindowImpl->mnHelpId; 
 }
 
 void Window::SetSmartHelpId( const SmartId& aId, SmartIdUpdateMode aMode )
@@ -1466,7 +1466,7 @@ void Window::SetSmartHelpId( const SmartId& aId, SmartIdUpdateMode aMode )
     // if we have a SmartId (eather from earlier call or just created) fill with new values
     if ( mpWindowImpl->mpWinData && mpWindowImpl->mpWinData->mpSmartHelpId )
         ImplGetWinData()->mpSmartHelpId->UpdateId( aId, aMode );
-
+    
     if ( (aMode == SMART_SET_NUM) || (aMode == SMART_SET_ALL) || ( (aMode == SMART_SET_SMART) && aId.HasNumeric() ) )
     {
         mpWindowImpl->mnHelpId = aId.GetNum();
@@ -1509,7 +1509,7 @@ void Window::SetSmartUniqueId( const SmartId& aId, SmartIdUpdateMode aMode )
     // if we have a SmartId (eather from earlier call or just created) fill with new values
     if ( mpWindowImpl->mpWinData && mpWindowImpl->mpWinData->mpSmartUniqueId )
         ImplGetWinData()->mpSmartUniqueId->UpdateId( aId, aMode );
-
+    
     if ( (aMode == SMART_SET_NUM) || (aMode == SMART_SET_ALL) || ( (aMode == SMART_SET_SMART) && aId.HasNumeric() ) )
         mpWindowImpl->mnUniqId = aId.GetNum();
 }
@@ -1823,210 +1823,210 @@ BOOL Window::IsControlFont() const
 }
 
 Color Window::GetControlForeground() const
-{
-    return mpWindowImpl->maControlForeground;
+{ 
+    return mpWindowImpl->maControlForeground; 
 }
 
-BOOL Window::IsControlForeground() const
-{
-    return mpWindowImpl->mbControlForeground;
+BOOL Window::IsControlForeground() const 
+{ 
+    return mpWindowImpl->mbControlForeground; 
 }
 
-Color Window::GetControlBackground() const
-{
-    return mpWindowImpl->maControlBackground;
+Color Window::GetControlBackground() const 
+{ 
+    return mpWindowImpl->maControlBackground; 
 }
 
-BOOL Window::IsControlBackground() const
-{
-    return mpWindowImpl->mbControlBackground;
+BOOL Window::IsControlBackground() const 
+{ 
+    return mpWindowImpl->mbControlBackground; 
 }
 
-BOOL Window::IsInPaint() const
-{
-    return mpWindowImpl->mbInPaint;
+BOOL Window::IsInPaint() const 
+{ 
+    return mpWindowImpl->mbInPaint; 
 }
 
-Window* Window::GetParent() const
-{
-    return mpWindowImpl->mpRealParent;
+Window* Window::GetParent() const 
+{ 
+    return mpWindowImpl->mpRealParent; 
 }
 
-BOOL Window::IsVisible() const
-{
-    return mpWindowImpl->mbVisible;
+BOOL Window::IsVisible() const 
+{ 
+    return mpWindowImpl->mbVisible; 
 }
 
-BOOL Window::IsReallyVisible() const
-{
-    return mpWindowImpl->mbReallyVisible;
+BOOL Window::IsReallyVisible() const 
+{ 
+    return mpWindowImpl->mbReallyVisible; 
 }
 
-BOOL Window::IsParentPathVisible() const
-{
-    return mpWindowImpl->mbReallyVisible;
+BOOL Window::IsParentPathVisible() const 
+{ 
+    return mpWindowImpl->mbReallyVisible; 
 }
 
-BOOL Window::IsReallyShown() const
-{
-    return mpWindowImpl->mbReallyShown;
+BOOL Window::IsReallyShown() const 
+{ 
+    return mpWindowImpl->mbReallyShown; 
 }
 
-BOOL Window::IsInInitShow() const
-{
-    return mpWindowImpl->mbInInitShow;
+BOOL Window::IsInInitShow() const 
+{ 
+    return mpWindowImpl->mbInInitShow; 
 }
 
-BOOL Window::IsEnabled() const
-{
-    return !mpWindowImpl->mbDisabled;
+BOOL Window::IsEnabled() const 
+{ 
+    return !mpWindowImpl->mbDisabled; 
 }
 
-BOOL Window::IsInputEnabled() const
-{
-    return !mpWindowImpl->mbInputDisabled;
+BOOL Window::IsInputEnabled() const 
+{ 
+    return !mpWindowImpl->mbInputDisabled; 
 }
 
-BOOL Window::IsAlwaysEnableInput() const
-{
-    return mpWindowImpl->meAlwaysInputMode == AlwaysInputEnabled;
+BOOL Window::IsAlwaysEnableInput() const 
+{ 
+    return mpWindowImpl->meAlwaysInputMode == AlwaysInputEnabled; 
 }
 
-BOOL Window::IsAlwaysDisableInput() const
-{
-    return mpWindowImpl->meAlwaysInputMode == AlwaysInputDisabled;
+BOOL Window::IsAlwaysDisableInput() const 
+{ 
+    return mpWindowImpl->meAlwaysInputMode == AlwaysInputDisabled; 
 }
 
-USHORT Window::GetActivateMode() const
-{
-    return mpWindowImpl->mnActivateMode;
+USHORT Window::GetActivateMode() const 
+{ 
+    return mpWindowImpl->mnActivateMode; 
 
 }
 
-BOOL Window::IsAlwaysOnTopEnabled() const
-{
-    return mpWindowImpl->mbAlwaysOnTop;
+BOOL Window::IsAlwaysOnTopEnabled() const 
+{ 
+    return mpWindowImpl->mbAlwaysOnTop; 
 }
 
-BOOL Window::IsDefaultPos() const
-{
-    return mpWindowImpl->mbDefPos;
+BOOL Window::IsDefaultPos() const 
+{ 
+    return mpWindowImpl->mbDefPos; 
 }
 
-BOOL Window::IsDefaultSize() const
-{
-    return mpWindowImpl->mbDefSize;
+BOOL Window::IsDefaultSize() const 
+{ 
+    return mpWindowImpl->mbDefSize; 
 }
 
-void Window::EnablePaint( BOOL bEnable )
-{
-    mpWindowImpl->mbPaintDisabled = !bEnable;
+void Window::EnablePaint( BOOL bEnable ) 
+{ 
+    mpWindowImpl->mbPaintDisabled = !bEnable; 
 }
 
-BOOL Window::IsPaintEnabled() const
-{
-    return !mpWindowImpl->mbPaintDisabled;
+BOOL Window::IsPaintEnabled() const 
+{ 
+    return !mpWindowImpl->mbPaintDisabled; 
 }
 
-BOOL Window::IsUpdateMode() const
-{
-    return !mpWindowImpl->mbNoUpdate;
+BOOL Window::IsUpdateMode() const 
+{ 
+    return !mpWindowImpl->mbNoUpdate; 
 }
 
-void Window::SetParentUpdateMode( BOOL bUpdate )
-{
-    mpWindowImpl->mbNoParentUpdate = !bUpdate;
+void Window::SetParentUpdateMode( BOOL bUpdate ) 
+{ 
+    mpWindowImpl->mbNoParentUpdate = !bUpdate; 
 }
 
-BOOL Window::IsParentUpdateMode() const
-{
-    return !mpWindowImpl->mbNoParentUpdate;
+BOOL Window::IsParentUpdateMode() const 
+{ 
+    return !mpWindowImpl->mbNoParentUpdate; 
 }
 
-BOOL Window::IsActive() const
-{
-    return mpWindowImpl->mbActive;
+BOOL Window::IsActive() const 
+{ 
+    return mpWindowImpl->mbActive; 
 }
 
-USHORT Window::GetGetFocusFlags() const
-{
-    return mpWindowImpl->mnGetFocusFlags;
+USHORT Window::GetGetFocusFlags() const 
+{ 
+    return mpWindowImpl->mnGetFocusFlags; 
 }
 
-BOOL Window::IsCompoundControl() const
-{
-    return mpWindowImpl->mbCompoundControl;
+BOOL Window::IsCompoundControl() const 
+{ 
+    return mpWindowImpl->mbCompoundControl; 
 }
 
-BOOL Window::HasCompoundControlFocus() const
-{
-    return mpWindowImpl->mbCompoundControlHasFocus;
+BOOL Window::HasCompoundControlFocus() const 
+{ 
+    return mpWindowImpl->mbCompoundControlHasFocus; 
 }
 
-BOOL Window::IsChildPointerOverwrite() const
+BOOL Window::IsChildPointerOverwrite() const 
 {
-    return mpWindowImpl->mbChildPtrOverwrite;
+    return mpWindowImpl->mbChildPtrOverwrite; 
 }
 
-BOOL Window::IsPointerVisible() const
-{
-    return !mpWindowImpl->mbNoPtrVisible;
+BOOL Window::IsPointerVisible() const 
+{ 
+    return !mpWindowImpl->mbNoPtrVisible; 
 }
 
-BOOL Window::IsWait() const
-{
-    return (mpWindowImpl->mnWaitCount != 0);
+BOOL Window::IsWait() const 
+{ 
+    return (mpWindowImpl->mnWaitCount != 0); 
 }
 
-Cursor* Window::GetCursor() const
-{
-    return mpWindowImpl->mpCursor;
+Cursor* Window::GetCursor() const 
+{ 
+    return mpWindowImpl->mpCursor; 
 }
 
-const Fraction& Window::GetZoom() const
-{
-    return mpWindowImpl->maZoom;
+const Fraction& Window::GetZoom() const 
+{ 
+    return mpWindowImpl->maZoom; 
 }
 
-BOOL Window::IsZoom() const
-{
-    return mpWindowImpl->maZoom.GetNumerator() != mpWindowImpl->maZoom.GetDenominator();
+BOOL Window::IsZoom() const 
+{ 
+    return mpWindowImpl->maZoom.GetNumerator() != mpWindowImpl->maZoom.GetDenominator(); 
 }
 
-void Window::SetHelpText( const XubString& rHelpText )
-{
+void Window::SetHelpText( const XubString& rHelpText ) 
+{ 
     mpWindowImpl->maHelpText = rHelpText;
     mpWindowImpl->mbHelpTextDynamic = TRUE;
 }
 
-void Window::SetQuickHelpText( const XubString& rHelpText )
-{
-    mpWindowImpl->maQuickHelpText = rHelpText;
+void Window::SetQuickHelpText( const XubString& rHelpText ) 
+{ 
+    mpWindowImpl->maQuickHelpText = rHelpText; 
 }
 
-const XubString& Window::GetQuickHelpText() const
-{
-    return mpWindowImpl->maQuickHelpText;
+const XubString& Window::GetQuickHelpText() const 
+{ 
+    return mpWindowImpl->maQuickHelpText; 
 }
 
-void Window::SetData( void* pNewData )
-{
-    mpWindowImpl->mpUserData = pNewData;
+void Window::SetData( void* pNewData ) 
+{ 
+    mpWindowImpl->mpUserData = pNewData; 
 }
 
-void* Window::GetData() const
-{
-    return mpWindowImpl->mpUserData;
+void* Window::GetData() const 
+{ 
+    return mpWindowImpl->mpUserData; 
 }
 
-BOOL Window::IsCreatedWithToolkit() const
-{
-    return mpWindowImpl->mbCreatedWithToolkit;
+BOOL Window::IsCreatedWithToolkit() const 
+{ 
+    return mpWindowImpl->mbCreatedWithToolkit; 
 }
 
-void Window::SetCreatedWithToolkit( BOOL b )
-{
-    mpWindowImpl->mbCreatedWithToolkit = b;
+void Window::SetCreatedWithToolkit( BOOL b ) 
+{ 
+    mpWindowImpl->mbCreatedWithToolkit = b; 
 
 }
 const Pointer& Window::GetPointer() const
diff --git a/vcl/source/window/window3.cxx b/vcl/source/window/window3.cxx
index 65019ba2a4af..15d8d1738cf2 100644
--- a/vcl/source/window/window3.cxx
+++ b/vcl/source/window/window3.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
diff --git a/vcl/source/window/winproc.cxx b/vcl/source/window/winproc.cxx
index c964ad0d739b..7db22b195023 100644
--- a/vcl/source/window/winproc.cxx
+++ b/vcl/source/window/winproc.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
@@ -479,9 +479,9 @@ long ImplHandleMouseEvent( Window* pWindow, USHORT nSVEvent, BOOL bMouseLeave,
             MouseEvent aMEvt( aChildPos, pWinFrameData->mnClickCount, nMode, nCode, nCode );
             NotifyEvent aNEvt( nSVEvent, pChild, &aMEvt );
             Application::CallEventHooks( aNEvt );
-
+            
             if( pChild->IsCallHandlersOnInputDisabled() )
-            {
+            {                
                 pWinFrameData->mpMouseMoveWin = pChild;
                 pChild->ImplNotifyKeyMouseCommandEventListeners( aNEvt );
             }
@@ -1258,7 +1258,7 @@ static long ImplHandleExtTextInput( Window* pWindow,
 {
     ImplSVData* pSVData = ImplGetSVData();
     Window*     pChild = NULL;
-
+    
     int nTries = 200;
     while( nTries-- )
     {
@@ -1544,7 +1544,7 @@ static long ImplHandleWheelEvent( Window* pWindow, const SalWheelMouseEvent& rEv
             }
         }
     }
-
+    
     // close floaters
     if( ! bIsFloat && pSVData->maWinData.mpFirstFloat )
     {
@@ -1695,7 +1695,7 @@ static void ImplHandleMove( Window* pWindow )
         pWindow->ImplGetWindowImpl()->mbCallMove = TRUE; // make sure the framepos will be updated on the next Show()
 
     if ( pWindow->ImplGetWindowImpl()->mbFrame && pWindow->ImplGetWindowImpl()->mpClientWindow )
-        pWindow->ImplGetWindowImpl()->mpClientWindow->ImplCallMove();   // notify client to update geometry
+        pWindow->ImplGetWindowImpl()->mpClientWindow->ImplCallMove();	// notify client to update geometry
 
 }
 
@@ -2276,7 +2276,7 @@ static long ImplHandleShowDialog( Window* pWindow, int nDialogId )
 {
     if( ! pWindow )
         return FALSE;
-
+    
     if( pWindow->GetType() == WINDOW_BORDERWINDOW )
     {
         Window* pWrkWin = pWindow->GetWindow( WINDOW_CLIENT );
diff --git a/vcl/source/window/wrkwin.cxx b/vcl/source/window/wrkwin.cxx
index 8fb2f2f8346a..916dc8e56d9a 100644
--- a/vcl/source/window/wrkwin.cxx
+++ b/vcl/source/window/wrkwin.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
@@ -298,7 +298,7 @@ BOOL WorkWindow::Close()
     // Ist es das Applikationsfenster, dann beende die Applikation
     if ( bCanClose && ( ImplGetSVData()->maWinData.mpAppWin == this ) )
         GetpApp()->Quit();
-
+    
     return bCanClose;
 }
 
@@ -314,8 +314,8 @@ BOOL WorkWindow::IsMaximized() const
     SalFrameState aState;
     if( mpWindowImpl->mpFrame->GetWindowState( &aState ) )
     {
-        if( aState.mnState & (SAL_FRAMESTATE_MAXIMIZED          |
-                              SAL_FRAMESTATE_MAXIMIZED_HORZ     |
+        if( aState.mnState & (SAL_FRAMESTATE_MAXIMIZED			|
+                              SAL_FRAMESTATE_MAXIMIZED_HORZ		|
                               SAL_FRAMESTATE_MAXIMIZED_VERT ) )
             bRet = TRUE;
     }
diff --git a/vcl/test/canvasbitmaptest.cxx b/vcl/test/canvasbitmaptest.cxx
index 1b70161d6cb0..976de783d1a4 100644
--- a/vcl/test/canvasbitmaptest.cxx
+++ b/vcl/test/canvasbitmaptest.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
@@ -78,8 +78,8 @@ SAL_IMPLEMENT_MAIN()
     tools::extendApplicationEnvironment();
 
     uno::Reference< lang::XMultiServiceFactory > xMS;
-    xMS = cppu::createRegistryServiceFactory(
-        rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "applicat.rdb" ) ),
+    xMS = cppu::createRegistryServiceFactory( 
+        rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "applicat.rdb" ) ), 
         sal_True );
 
     InitVCL( xMS );
@@ -160,7 +160,7 @@ bool rangeCheck( const rendering::RGBColor& rColor )
 
 //----------------------------------------------------------------------------------
 
-void checkCanvasBitmap( const rtl::Reference<VclCanvasBitmap>& xBmp,
+void checkCanvasBitmap( const rtl::Reference<VclCanvasBitmap>& xBmp, 
                         const char*                            msg,
                         int                                    nOriginalDepth )
 {
@@ -191,7 +191,7 @@ void checkCanvasBitmap( const rtl::Reference<VclCanvasBitmap>& xBmp,
 
     rendering::IntegerBitmapLayout aLayout;
     uno::Sequence<sal_Int8> aPixelData = xBmp->getData(aLayout, geometry::IntegerRectangle2D(0,0,1,1));
-
+    
     const sal_Int32 nExpectedBitsPerPixel(
         aContainedBmpEx.IsTransparent() ? std::max(8,nDepth)+8 : nDepth);
     test( aLayout.ScanLines == 1,
@@ -211,7 +211,7 @@ void checkCanvasBitmap( const rtl::Reference<VclCanvasBitmap>& xBmp,
           "Palette existance conforms to bitmap" );
 
     uno::Sequence<sal_Int8> aPixelData2 = xBmp->getPixel( aLayout, geometry::IntegerPoint2D(0,0) );
-
+    
     test( aPixelData2.getLength() == aPixelData.getLength(),
           "getData and getPixel return same amount of data" );
 
@@ -247,15 +247,15 @@ void checkCanvasBitmap( const rtl::Reference<VclCanvasBitmap>& xBmp,
         test( pARGBStart[0].Alpha == 0.0,
               "First pixel is fully transparent" );
     }
-
+ 
     test( pRGBStart[1].Red == 0.0 && pRGBStart[1].Green == 0.0 && pRGBStart[1].Blue == 0.0,
           "Second pixel is black" );
 
     if( nOriginalDepth > 8 )
     {
         const Color aCol(COL_GREEN);
-        test( pRGBStart[5].Red == vcl::unotools::toDoubleColor(aCol.GetRed()) &&
-              pRGBStart[5].Green == vcl::unotools::toDoubleColor(aCol.GetGreen()) &&
+        test( pRGBStart[5].Red == vcl::unotools::toDoubleColor(aCol.GetRed()) && 
+              pRGBStart[5].Green == vcl::unotools::toDoubleColor(aCol.GetGreen()) && 
               pRGBStart[5].Blue == vcl::unotools::toDoubleColor(aCol.GetBlue()),
               "Sixth pixel is green" );
     }
@@ -311,7 +311,7 @@ void checkCanvasBitmap( const rtl::Reference<VclCanvasBitmap>& xBmp,
 
 //----------------------------------------------------------------------------------
 
-void checkBitmapImport( const rtl::Reference<VclCanvasBitmap>& xBmp,
+void checkBitmapImport( const rtl::Reference<VclCanvasBitmap>& xBmp, 
                         const char*                            msg,
                         int                                    nOriginalDepth )
 {
@@ -342,7 +342,7 @@ void checkBitmapImport( const rtl::Reference<VclCanvasBitmap>& xBmp,
 
     rendering::IntegerBitmapLayout aLayout;
     uno::Sequence<sal_Int8> aPixelData = xBmp->getData(aLayout, geometry::IntegerRectangle2D(0,0,1,1));
-
+    
     const sal_Int32 nExpectedBitsPerPixel(
         aContainedBmpEx.IsTransparent() ? std::max(8,nDepth)+8 : nDepth);
     test( aLayout.ScanLines == 1,
@@ -362,7 +362,7 @@ void checkBitmapImport( const rtl::Reference<VclCanvasBitmap>& xBmp,
           "Palette existance conforms to bitmap" );
 
     uno::Sequence<sal_Int8> aPixelData2 = xBmp->getPixel( aLayout, geometry::IntegerPoint2D(0,0) );
-
+    
     test( aPixelData2.getLength() == aPixelData.getLength(),
           "getData and getPixel return same amount of data" );
 
@@ -398,15 +398,15 @@ void checkBitmapImport( const rtl::Reference<VclCanvasBitmap>& xBmp,
         test( pARGBStart[0].Alpha == 0.0,
               "First pixel is fully transparent" );
     }
-
+ 
     test( pRGBStart[1].Red == 0.0 && pRGBStart[1].Green == 0.0 && pRGBStart[1].Blue == 0.0,
           "Second pixel is black" );
 
     if( nOriginalDepth > 8 )
     {
         const Color aCol(COL_GREEN);
-        test( pRGBStart[5].Red == vcl::unotools::toDoubleColor(aCol.GetRed()) &&
-              pRGBStart[5].Green == vcl::unotools::toDoubleColor(aCol.GetGreen()) &&
+        test( pRGBStart[5].Red == vcl::unotools::toDoubleColor(aCol.GetRed()) && 
+              pRGBStart[5].Green == vcl::unotools::toDoubleColor(aCol.GetGreen()) && 
               pRGBStart[5].Blue == vcl::unotools::toDoubleColor(aCol.GetBlue()),
               "Sixth pixel is green" );
     }
@@ -476,12 +476,12 @@ private:
     // XBitmap
     virtual geometry::IntegerSize2D SAL_CALL getSize() throw (uno::RuntimeException) { return maSize; }
     virtual ::sal_Bool SAL_CALL hasAlpha(  ) throw (uno::RuntimeException) { return mnBitsPerPixel != 8; }
-    virtual uno::Reference< rendering::XBitmap > SAL_CALL getScaledBitmap( const geometry::RealSize2D&,
+    virtual uno::Reference< rendering::XBitmap > SAL_CALL getScaledBitmap( const geometry::RealSize2D&, 
                                                                            sal_Bool ) throw (uno::RuntimeException) { return this; }
 
     // XIntegerReadOnlyBitmap
-    virtual uno::Sequence< ::sal_Int8 > SAL_CALL getData( rendering::IntegerBitmapLayout&     bitmapLayout,
-                                                          const geometry::IntegerRectangle2D& rect ) throw (lang::IndexOutOfBoundsException,
+    virtual uno::Sequence< ::sal_Int8 > SAL_CALL getData( rendering::IntegerBitmapLayout&     bitmapLayout, 
+                                                          const geometry::IntegerRectangle2D& rect ) throw (lang::IndexOutOfBoundsException, 
                                                                                                             rendering::VolatileContentDestroyedException, uno::RuntimeException)
     {
         test( rect.X1 >= 0, "X1 within bounds" );
@@ -498,9 +498,9 @@ private:
         sal_Int8* pOut = aRes.getArray();
 
         bitmapLayout.ScanLines     = nHeight;
-        bitmapLayout.ScanLineBytes =
+        bitmapLayout.ScanLineBytes = 
         bitmapLayout.ScanLineStride= nScanlineLen;
-
+        
         if( mnBitsPerPixel == 8 )
         {
             for( sal_Int32 y=0; y<nHeight; ++y )
@@ -526,8 +526,8 @@ private:
         return aRes;
     }
 
-    virtual uno::Sequence< ::sal_Int8 > SAL_CALL getPixel( rendering::IntegerBitmapLayout&,
-                                                           const geometry::IntegerPoint2D&  ) throw (lang::IndexOutOfBoundsException,
+    virtual uno::Sequence< ::sal_Int8 > SAL_CALL getPixel( rendering::IntegerBitmapLayout&, 
+                                                           const geometry::IntegerPoint2D&  ) throw (lang::IndexOutOfBoundsException, 
                                                                                                      rendering::VolatileContentDestroyedException, uno::RuntimeException)
     {
         test(false, "Method not implemented");
@@ -549,7 +549,7 @@ private:
         const sal_Int32 nScanlineLen = (maSize.Width * mnBitsPerPixel + 7)/8;
 
         aLayout.ScanLines     = maSize.Height;
-        aLayout.ScanLineBytes =
+        aLayout.ScanLineBytes = 
         aLayout.ScanLineStride= nScanlineLen;
         aLayout.Palette = getPalette();
         aLayout.ColorSpace.set( this );
@@ -566,26 +566,26 @@ private:
         return 255;
     }
 
-    virtual ::sal_Bool SAL_CALL getIndex( uno::Sequence< double >& entry,
-                                          ::sal_Int32 nIndex ) throw (lang::IndexOutOfBoundsException,
+    virtual ::sal_Bool SAL_CALL getIndex( uno::Sequence< double >& entry, 
+                                          ::sal_Int32 nIndex ) throw (lang::IndexOutOfBoundsException, 
                                                                       uno::RuntimeException)
     {
         test( getPalette().is(),
               "Got palette interface call without handing out palette?!" );
         test( nIndex >= 0 && nIndex < 256,
               "Index out of range" );
-        entry = colorToStdColorSpaceSequence(
-            Color(UINT8(nIndex),
-                  UINT8(nIndex),
+        entry = colorToStdColorSpaceSequence( 
+            Color(UINT8(nIndex), 
+                  UINT8(nIndex), 
                   UINT8(nIndex)) );
 
         return sal_True; // no palette transparency here.
     }
 
-    virtual ::sal_Bool SAL_CALL setIndex( const uno::Sequence< double >&,
-                                          ::sal_Bool,
-                                          ::sal_Int32 nIndex ) throw (lang::IndexOutOfBoundsException,
-                                                                      lang::IllegalArgumentException,
+    virtual ::sal_Bool SAL_CALL setIndex( const uno::Sequence< double >&, 
+                                          ::sal_Bool, 
+                                          ::sal_Int32 nIndex ) throw (lang::IndexOutOfBoundsException, 
+                                                                      lang::IllegalArgumentException, 
                                                                       uno::RuntimeException)
     {
         test( getPalette().is(),
@@ -596,13 +596,13 @@ private:
     }
 
     struct PaletteColorSpaceHolder: public rtl::StaticWithInit<uno::Reference<rendering::XColorSpace>,
-                                                               PaletteColorSpaceHolder>
+                                                               PaletteColorSpaceHolder> 
     {
         uno::Reference<rendering::XColorSpace> operator()()
         {
             return vcl::unotools::createStandardColorSpace();
         }
-    };
+    }; 
 
     virtual uno::Reference< rendering::XColorSpace > SAL_CALL getColorSpace(  ) throw (uno::RuntimeException)
     {
@@ -633,49 +633,49 @@ private:
         return uno::Sequence< ::beans::PropertyValue >();
     }
 
-    virtual uno::Sequence< double > SAL_CALL convertColorSpace( const uno::Sequence< double >&,
+    virtual uno::Sequence< double > SAL_CALL convertColorSpace( const uno::Sequence< double >&, 
                                                                 const uno::Reference< rendering::XColorSpace >& ) throw (uno::RuntimeException)
     {
         test(false, "Method not implemented");
         return uno::Sequence< double >();
     }
 
-    virtual uno::Sequence< rendering::RGBColor > SAL_CALL convertToRGB( const uno::Sequence< double >& ) throw (lang::IllegalArgumentException,
+    virtual uno::Sequence< rendering::RGBColor > SAL_CALL convertToRGB( const uno::Sequence< double >& ) throw (lang::IllegalArgumentException, 
                                                                                                                 uno::RuntimeException)
     {
         test(false, "Method not implemented");
         return uno::Sequence< rendering::RGBColor >();
     }
 
-    virtual uno::Sequence< rendering::ARGBColor > SAL_CALL convertToARGB( const uno::Sequence< double >& ) throw (lang::IllegalArgumentException,
+    virtual uno::Sequence< rendering::ARGBColor > SAL_CALL convertToARGB( const uno::Sequence< double >& ) throw (lang::IllegalArgumentException, 
                                                                                                                   uno::RuntimeException)
     {
         test(false, "Method not implemented");
         return uno::Sequence< rendering::ARGBColor >();
     }
 
-    virtual uno::Sequence< rendering::ARGBColor > SAL_CALL convertToPARGB( const uno::Sequence< double >& ) throw (lang::IllegalArgumentException,
+    virtual uno::Sequence< rendering::ARGBColor > SAL_CALL convertToPARGB( const uno::Sequence< double >& ) throw (lang::IllegalArgumentException, 
                                                                                                                    uno::RuntimeException)
     {
         test(false, "Method not implemented");
         return uno::Sequence< rendering::ARGBColor >();
     }
 
-    virtual uno::Sequence< double > SAL_CALL convertFromRGB( const uno::Sequence< rendering::RGBColor >& ) throw (lang::IllegalArgumentException,
+    virtual uno::Sequence< double > SAL_CALL convertFromRGB( const uno::Sequence< rendering::RGBColor >& ) throw (lang::IllegalArgumentException, 
                                                                                                                   uno::RuntimeException)
     {
         test(false, "Method not implemented");
         return uno::Sequence< double >();
     }
 
-    virtual uno::Sequence< double > SAL_CALL convertFromARGB( const uno::Sequence< rendering::ARGBColor >& ) throw (lang::IllegalArgumentException,
+    virtual uno::Sequence< double > SAL_CALL convertFromARGB( const uno::Sequence< rendering::ARGBColor >& ) throw (lang::IllegalArgumentException, 
                                                                                                                     uno::RuntimeException)
     {
         test(false, "This method is not expected to be called!");
         return uno::Sequence< double >();
     }
 
-    virtual uno::Sequence< double > SAL_CALL convertFromPARGB( const uno::Sequence< rendering::ARGBColor >& ) throw (lang::IllegalArgumentException,
+    virtual uno::Sequence< double > SAL_CALL convertFromPARGB( const uno::Sequence< rendering::ARGBColor >& ) throw (lang::IllegalArgumentException, 
                                                                                                                     uno::RuntimeException)
     {
         test(false, "This method is not expected to be called!");
@@ -697,23 +697,23 @@ private:
         return util::Endianness::LITTLE;
     }
 
-    virtual uno::Sequence< double > SAL_CALL convertFromIntegerColorSpace( const uno::Sequence< ::sal_Int8 >& ,
-                                                                           const uno::Reference< rendering::XColorSpace >& ) throw (lang::IllegalArgumentException,
+    virtual uno::Sequence< double > SAL_CALL convertFromIntegerColorSpace( const uno::Sequence< ::sal_Int8 >& , 
+                                                                           const uno::Reference< rendering::XColorSpace >& ) throw (lang::IllegalArgumentException, 
                                                                                                                                     uno::RuntimeException)
     {
         test(false, "Method not implemented");
         return uno::Sequence< double >();
     }
 
-    virtual uno::Sequence< ::sal_Int8 > SAL_CALL convertToIntegerColorSpace( const uno::Sequence< ::sal_Int8 >& ,
-                                                                             const uno::Reference< rendering::XIntegerBitmapColorSpace >& ) throw (lang::IllegalArgumentException,
+    virtual uno::Sequence< ::sal_Int8 > SAL_CALL convertToIntegerColorSpace( const uno::Sequence< ::sal_Int8 >& , 
+                                                                             const uno::Reference< rendering::XIntegerBitmapColorSpace >& ) throw (lang::IllegalArgumentException, 
                                                                                                                                                    uno::RuntimeException)
     {
         test(false, "Method not implemented");
         return uno::Sequence< sal_Int8 >();
     }
 
-    virtual uno::Sequence< rendering::RGBColor > SAL_CALL convertIntegerToRGB( const uno::Sequence< ::sal_Int8 >& deviceColor ) throw (lang::IllegalArgumentException,
+    virtual uno::Sequence< rendering::RGBColor > SAL_CALL convertIntegerToRGB( const uno::Sequence< ::sal_Int8 >& deviceColor ) throw (lang::IllegalArgumentException, 
                                                                                                                                        uno::RuntimeException)
     {
         const uno::Sequence< rendering::ARGBColor > aTemp( convertIntegerToARGB(deviceColor) );
@@ -730,12 +730,12 @@ private:
         return aRes;
     }
 
-    virtual uno::Sequence< rendering::ARGBColor > SAL_CALL convertIntegerToARGB( const uno::Sequence< ::sal_Int8 >& deviceColor ) throw (lang::IllegalArgumentException,
+    virtual uno::Sequence< rendering::ARGBColor > SAL_CALL convertIntegerToARGB( const uno::Sequence< ::sal_Int8 >& deviceColor ) throw (lang::IllegalArgumentException, 
                                                                                                                                          uno::RuntimeException)
     {
         const sal_Size  nLen( deviceColor.getLength() );
         const sal_Int32 nBytesPerPixel(mnBitsPerPixel == 8 ? 1 : 4);
-        test(nLen%nBytesPerPixel==0,
+        test(nLen%nBytesPerPixel==0, 
              "number of channels no multiple of pixel element count");
 
         uno::Sequence< rendering::ARGBColor > aRes( nLen / nBytesPerPixel );
@@ -767,12 +767,12 @@ private:
         return aRes;
     }
 
-    virtual uno::Sequence< rendering::ARGBColor > SAL_CALL convertIntegerToPARGB( const uno::Sequence< ::sal_Int8 >& deviceColor ) throw (lang::IllegalArgumentException,
+    virtual uno::Sequence< rendering::ARGBColor > SAL_CALL convertIntegerToPARGB( const uno::Sequence< ::sal_Int8 >& deviceColor ) throw (lang::IllegalArgumentException, 
                                                                                                                                          uno::RuntimeException)
     {
         const sal_Size  nLen( deviceColor.getLength() );
         const sal_Int32 nBytesPerPixel(mnBitsPerPixel == 8 ? 1 : 4);
-        test(nLen%nBytesPerPixel==0,
+        test(nLen%nBytesPerPixel==0, 
              "number of channels no multiple of pixel element count");
 
         uno::Sequence< rendering::ARGBColor > aRes( nLen / nBytesPerPixel );
@@ -805,21 +805,21 @@ private:
         return aRes;
     }
 
-    virtual uno::Sequence< ::sal_Int8 > SAL_CALL convertIntegerFromRGB( const uno::Sequence< rendering::RGBColor >& ) throw (lang::IllegalArgumentException,
+    virtual uno::Sequence< ::sal_Int8 > SAL_CALL convertIntegerFromRGB( const uno::Sequence< rendering::RGBColor >& ) throw (lang::IllegalArgumentException, 
                                                                                                                              uno::RuntimeException)
     {
         test(false, "Method not implemented");
         return uno::Sequence< sal_Int8 >();
     }
 
-    virtual uno::Sequence< ::sal_Int8 > SAL_CALL convertIntegerFromARGB( const uno::Sequence< rendering::ARGBColor >& ) throw (lang::IllegalArgumentException,
+    virtual uno::Sequence< ::sal_Int8 > SAL_CALL convertIntegerFromARGB( const uno::Sequence< rendering::ARGBColor >& ) throw (lang::IllegalArgumentException, 
                                                                                                                                uno::RuntimeException)
     {
         test(false, "Method not implemented");
         return uno::Sequence< sal_Int8 >();
     }
 
-    virtual uno::Sequence< ::sal_Int8 > SAL_CALL convertIntegerFromPARGB( const uno::Sequence< rendering::ARGBColor >& ) throw (lang::IllegalArgumentException,
+    virtual uno::Sequence< ::sal_Int8 > SAL_CALL convertIntegerFromPARGB( const uno::Sequence< rendering::ARGBColor >& ) throw (lang::IllegalArgumentException, 
                                                                                                                                 uno::RuntimeException)
     {
         test(false, "Method not implemented");
@@ -910,7 +910,7 @@ void TestWindow::Paint( const Rectangle& )
                     pAcc->SetPixel(0,2,aWhite);
                 }
             }
-
+    
             rtl::Reference<VclCanvasBitmap> xBmp( new VclCanvasBitmap(aBitmap) );
 
             checkCanvasBitmap( xBmp, "single bitmap", nDepth );
@@ -929,7 +929,7 @@ void TestWindow::Paint( const Rectangle& )
                     pAcc->SetPixel(0,2,BitmapColor(1));
                 }
             }
-
+    
             xBmp.set( new VclCanvasBitmap(BitmapEx(aBitmap,aMask)) );
 
             checkCanvasBitmap( xBmp, "masked bitmap", nDepth );
@@ -948,7 +948,7 @@ void TestWindow::Paint( const Rectangle& )
                     aAlpha.ReleaseAccess(pAcc);
                 }
             }
-
+    
             xBmp.set( new VclCanvasBitmap(BitmapEx(aBitmap,aAlpha)) );
 
             checkCanvasBitmap( xBmp, "alpha bitmap", nDepth );
diff --git a/vcl/test/dndtest.cxx b/vcl/test/dndtest.cxx
index c52d6d3e9589..a60400b3bee4 100755
--- a/vcl/test/dndtest.cxx
+++ b/vcl/test/dndtest.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
@@ -62,7 +62,7 @@ using namespace ::com::sun::star::datatransfer::dnd;
 class MyApp : public Application
 {
 public:
-    void        Main();
+    void		Main();
 };
 
 MyApp aMyApp;
@@ -74,13 +74,13 @@ class MyWin : public WorkWindow
 public:
                 MyWin( Window* pParent, WinBits nWinStyle );
 
-    void        MouseMove( const MouseEvent& rMEvt );
-    void        MouseButtonDown( const MouseEvent& rMEvt );
-    void        MouseButtonUp( const MouseEvent& rMEvt );
-    void        KeyInput( const KeyEvent& rKEvt );
-    void        KeyUp( const KeyEvent& rKEvt );
-    void        Paint( const Rectangle& rRect );
-    void        Resize();
+    void		MouseMove( const MouseEvent& rMEvt );
+    void		MouseButtonDown( const MouseEvent& rMEvt );
+    void		MouseButtonUp( const MouseEvent& rMEvt );
+    void		KeyInput( const KeyEvent& rKEvt );
+    void		KeyUp( const KeyEvent& rKEvt );
+    void		Paint( const Rectangle& rRect );
+    void		Resize();
 };
 
 // -----------------------------------------------------------------------
@@ -103,8 +103,8 @@ public:
     virtual void SAL_CALL dragEnter( const DragSourceDragEvent& dsdee ) throw(RuntimeException);
     virtual void SAL_CALL dragExit( const DragSourceEvent& dse ) throw(RuntimeException);
     virtual void SAL_CALL dragOver( const DragSourceDragEvent& dsde ) throw(RuntimeException);
-    virtual void SAL_CALL dropActionChanged( const DragSourceDragEvent& dsde ) throw(RuntimeException);
-    virtual void SAL_CALL disposing( const EventObject& eo ) throw(RuntimeException);
+    virtual void SAL_CALL dropActionChanged( const DragSourceDragEvent& dsde ) throw(RuntimeException);	
+    virtual void SAL_CALL disposing( const EventObject& eo ) throw(RuntimeException); 
 };
 
 // -----------------------------------------------------------------------
@@ -134,17 +134,17 @@ class StringTransferable : public ::cppu::WeakImplHelper1< XTransferable >
     const OUString         m_aData;
     Sequence< DataFlavor > m_aFlavorList;
 
-public:
+public:	
     StringTransferable( const OUString& rString ) : m_aData( rString ), m_aFlavorList( 1 )
     {
         DataFlavor df;
 
         df.MimeType = OUString::createFromAscii( "text/plain;charset=utf-16" );
         df.DataType = getCppuType( static_cast < OUString * > ( 0 ) );
-
+        
          m_aFlavorList[0] = df;
     };
-
+        
     virtual Any SAL_CALL getTransferData( const DataFlavor& aFlavor ) throw(UnsupportedFlavorException, IOException, RuntimeException);
     virtual Sequence< DataFlavor > SAL_CALL getTransferDataFlavors(  ) throw(RuntimeException);
     virtual sal_Bool SAL_CALL isDataFlavorSupported( const DataFlavor& aFlavor ) throw(RuntimeException);
@@ -163,7 +163,7 @@ void MyApp::Main()
         OUString aArg;
 
         aInfo.getCommandArg( n, aArg );
-
+        
         if( aArg.compareTo( OUString::createFromAscii( "-r" ), 2 ) == 0 )
         {
             if ( n + 1 < nmax )
@@ -190,7 +190,7 @@ void MyApp::Main()
     }
     else
         fprintf( stderr, "Usage: %s -r full-path-to-applicat.rdb\n", "dnddemo" );
-
+        
 
     MyWin aMainWin( NULL, WB_APP | WB_STDWORK );
     aMainWin.SetText( XubString( RTL_CONSTASCII_USTRINGPARAM( "Drag And Drop - Workbench" ) ) );
@@ -219,7 +219,7 @@ void MyApp::Main()
     Reference< XComponent > xComponent( xServiceManager, UNO_QUERY );
     if( xComponent.is() )
         xComponent->dispose();
-
+    
 }
 
 // -----------------------------------------------------------------------
@@ -228,9 +228,9 @@ MyWin::MyWin( Window* pParent, WinBits nWinStyle ) :
     WorkWindow( pParent, nWinStyle )
 {
     Reference< XDropTargetListener > xListener = new MyDragAndDropListener( this );
-
+    
     Reference< XDropTarget > xDropTarget = GetDropTarget();
-    if( xDropTarget.is() )
+    if( xDropTarget.is() ) 
     {
         xDropTarget->addDropTargetListener( xListener );
         xDropTarget->setActive( sal_True );
@@ -385,13 +385,13 @@ void SAL_CALL MyDragAndDropListener::disposing( const EventObject& ) throw(Runti
 
 // -----------------------------------------------------------------------
 
-MyInfoBox::MyInfoBox( Window* pParent ) : InfoBox( pParent,
+MyInfoBox::MyInfoBox( Window* pParent ) : InfoBox( pParent, 
     OUString::createFromAscii( "dragging over this box should result in another window id in the drag log." ) )
 {
     Reference< XDropTargetListener > xListener = new MyDragAndDropListener( this );
-
+    
     Reference< XDropTarget > xDropTarget = GetDropTarget();
-    if( xDropTarget.is() )
+    if( xDropTarget.is() ) 
     {
         xDropTarget->addDropTargetListener( xListener );
         xDropTarget->setActive( sal_True );
@@ -407,9 +407,9 @@ MyInfoBox::MyInfoBox( Window* pParent ) : InfoBox( pParent,
 MyListBox::MyListBox( Window* pParent ) : ListBox( pParent )
 {
     Reference< XDropTargetListener > xListener = new MyDragAndDropListener( this );
-
+    
     Reference< XDropTarget > xDropTarget = GetDropTarget();
-    if( xDropTarget.is() )
+    if( xDropTarget.is() ) 
     {
         xDropTarget->addDropTargetListener( xListener );
         xDropTarget->setActive( sal_True );
@@ -422,15 +422,15 @@ MyListBox::MyListBox( Window* pParent ) : ListBox( pParent )
 
 // -----------------------------------------------------------------------
 
-Any SAL_CALL StringTransferable::getTransferData( const DataFlavor& )
+Any SAL_CALL StringTransferable::getTransferData( const DataFlavor& ) 
     throw(UnsupportedFlavorException, IOException, RuntimeException)
-{
+{	
     return makeAny( m_aData );
 }
 
 // -----------------------------------------------------------------------
 
-Sequence< DataFlavor > SAL_CALL StringTransferable::getTransferDataFlavors(  )
+Sequence< DataFlavor > SAL_CALL StringTransferable::getTransferDataFlavors(  ) 
     throw(RuntimeException)
 {
     return m_aFlavorList;
@@ -438,7 +438,7 @@ Sequence< DataFlavor > SAL_CALL StringTransferable::getTransferDataFlavors(  )
 
 // -----------------------------------------------------------------------
 
-sal_Bool SAL_CALL StringTransferable::isDataFlavorSupported( const DataFlavor& )
+sal_Bool SAL_CALL StringTransferable::isDataFlavorSupported( const DataFlavor& ) 
     throw(RuntimeException)
 {
     return sal_True;
diff --git a/vcl/unx/gtk/a11y/atkaction.cxx b/vcl/unx/gtk/a11y/atkaction.cxx
index 4329dd345d14..c2be009f0b7d 100644
--- a/vcl/unx/gtk/a11y/atkaction.cxx
+++ b/vcl/unx/gtk/a11y/atkaction.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
@@ -60,7 +60,7 @@ static accessibility::XAccessibleAction*
         getAction( AtkAction *action ) throw (uno::RuntimeException)
 {
     AtkObjectWrapper *pWrap = ATK_OBJECT_WRAPPER( action );
-
+    
     if( pWrap )
     {
         if( !pWrap->mpAction && pWrap->mpContext )
@@ -133,7 +133,7 @@ action_wrapper_get_name (AtkAction *action,
                          gint       i)
 {
     static std::map< rtl::OUString, const gchar * > aNameMap;
-
+    
     if( aNameMap.empty() )
     {
         aNameMap.insert( ACTION_NAME_PAIR( "click", "click" ) );
@@ -146,16 +146,16 @@ action_wrapper_get_name (AtkAction *action,
         if( pAction )
         {
             std::map< rtl::OUString, const gchar * >::iterator iter;
-
+            
             rtl::OUString aDesc( pAction->getAccessibleActionDescription( i ) );
-
+            
             iter = aNameMap.find( aDesc );
             if( iter != aNameMap.end() )
                 return iter->second;
-
-            std::pair< const rtl::OUString, const gchar * > aNewVal( aDesc,
+            
+            std::pair< const rtl::OUString, const gchar * > aNewVal( aDesc, 
                 g_strdup( OUStringToConstGChar(aDesc) ) );
-
+            
             if( aNameMap.insert( aNewVal ).second )
                 return aNewVal.second;
         }
@@ -167,11 +167,11 @@ action_wrapper_get_name (AtkAction *action,
     return "";
 }
 
-/*
+/* 
 *  GNOME Expects a string in the format:
-*
+*  
 *  <nmemonic>;<full-path>;<accelerator>
-*
+*  
 *  The keybindings in <full-path> should be separated by ":"
 */
 
@@ -186,13 +186,13 @@ appendKeyStrokes(rtl::OStringBuffer& rBuffer, const uno::Sequence< awt::KeyStrok
             rBuffer.append("<Control>");
         if( rKeyStrokes[i].Modifiers &  awt::KeyModifier::MOD2 )
             rBuffer.append("<Alt>");
-
+        
         if( ( rKeyStrokes[i].KeyCode >= awt::Key::A ) && ( rKeyStrokes[i].KeyCode <= awt::Key::Z ) )
             rBuffer.append( (sal_Char) ( 'a' + ( rKeyStrokes[i].KeyCode - awt::Key::A ) ) );
         else
         {
             sal_Char c = '\0';
-
+            
             switch( rKeyStrokes[i].KeyCode )
             {
                 case awt::Key::TAB:      c = '\t'; break;
@@ -212,7 +212,7 @@ appendKeyStrokes(rtl::OStringBuffer& rBuffer, const uno::Sequence< awt::KeyStrok
                     g_warning( "Unmapped KeyCode: %d", rKeyStrokes[i].KeyCode );
                     break;
             }
-
+            
             if( c != '\0' )
                 rBuffer.append( c );
         }
@@ -229,20 +229,20 @@ action_wrapper_get_keybinding (AtkAction *action,
         if( pAction )
         {
             uno::Reference< accessibility::XAccessibleKeyBinding > xBinding( pAction->getAccessibleActionKeyBinding( i ));
-
+            
             if( xBinding.is() )
             {
                 rtl::OStringBuffer aRet;
-
+                
                 sal_Int32 nmax = std::min( xBinding->getAccessibleKeyBindingCount(), (sal_Int32) 3 );
                 for( sal_Int32 n = 0; n < nmax; n++ )
                 {
                     appendKeyStrokes( aRet,  xBinding->getAccessibleKeyBinding( n ) );
-
+                    
                     if( n < 2 )
                         aRet.append( (sal_Char) ';' );
                 }
-
+                
                 // !! FIXME !! remember keystroke in wrapper object ?
                 return getAsConst( aRet.makeStringAndClear() );
             }
diff --git a/vcl/unx/gtk/a11y/atkbridge.cxx b/vcl/unx/gtk/a11y/atkbridge.cxx
index 25add8e0dd18..3f5d00fe050a 100644
--- a/vcl/unx/gtk/a11y/atkbridge.cxx
+++ b/vcl/unx/gtk/a11y/atkbridge.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
@@ -41,16 +41,16 @@ bool InitAtkBridge(void)
     const char* pVersion = atk_get_toolkit_version();
     if( ! pVersion )
         return false;
-
+    
     unsigned int major, minor, micro;
-
+    
     /* check gail minimum version requirements */
     if( sscanf( pVersion, "%u.%u.%u", &major, &minor, &micro) < 3 )
     {
         // g_warning( "unable to parse gail version number" );
         return false;
     }
-
+    
     if( ( (major << 16) | (minor << 8) | micro ) < ( (1 << 16) | 8 << 8 | 6 ) )
     {
         g_warning( "libgail >= 1.8.6 required for accessibility support" );
@@ -59,15 +59,15 @@ bool InitAtkBridge(void)
 
     /* Initialize the AtkUtilityWrapper class */
     g_type_class_unref( g_type_class_ref( OOO_TYPE_ATK_UTIL ) );
-
+    
     /* Initialize the GailWindow wrapper class */
     g_type_class_unref( g_type_class_ref( OOO_TYPE_WINDOW_WRAPPER ) );
-
+    
     /* Register AtkObject wrapper factory */
     AtkRegistry * registry = atk_get_default_registry();
     if( registry )
         atk_registry_set_factory_type( registry, OOO_TYPE_FIXED, OOO_TYPE_WRAPPER_FACTORY );
-
+    
     return true;
 }
 
diff --git a/vcl/unx/gtk/a11y/atkcomponent.cxx b/vcl/unx/gtk/a11y/atkcomponent.cxx
index 24cf335ebeb0..b859c2230f70 100644
--- a/vcl/unx/gtk/a11y/atkcomponent.cxx
+++ b/vcl/unx/gtk/a11y/atkcomponent.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
@@ -50,17 +50,17 @@ static accessibility::XAccessibleComponent*
             pWrap->mpComponent = reinterpret_cast< accessibility::XAccessibleComponent * > (any.pReserved);
             pWrap->mpComponent->acquire();
         }
-
+        
         return pWrap->mpComponent;
     }
-
+    
     return NULL;
 }
 
 /*****************************************************************************/
 
 static awt::Point
-translatePoint( accessibility::XAccessibleComponent *pComponent,
+translatePoint( accessibility::XAccessibleComponent *pComponent, 
                 gint x, gint y, AtkCoordType t)
 {
     awt::Point aOrigin( 0, 0 );
@@ -68,7 +68,7 @@ translatePoint( accessibility::XAccessibleComponent *pComponent,
         aOrigin = pComponent->getLocationOnScreen();
 
 #ifdef ENABLE_TRACING
-    fprintf(stderr, "coordinates ( %u, %u ) translated to: ( %u, %u )\n",
+    fprintf(stderr, "coordinates ( %u, %u ) translated to: ( %u, %u )\n", 
         x, y, x - aOrigin.X, y - aOrigin.Y);
 #endif
 
@@ -95,7 +95,7 @@ component_wrapper_grab_focus (AtkComponent *component)
     {
         g_warning( "Exception in grabFocus()" );
     }
-
+    
     return FALSE;
 }
 
@@ -117,7 +117,7 @@ component_wrapper_contains (AtkComponent *component,
     {
         g_warning( "Exception in containsPoint()" );
     }
-
+    
     return FALSE;
 }
 
@@ -132,20 +132,20 @@ component_wrapper_ref_accessible_at_point (AtkComponent *component,
     try
     {
         accessibility::XAccessibleComponent* pComponent = getComponent( component );
-
+        
         if( pComponent )
         {
             uno::Reference< accessibility::XAccessible > xAccessible;
             xAccessible = pComponent->getAccessibleAtPoint(
                 translatePoint( pComponent, x, y, coord_type ) );
-
+            
 #ifdef ENABLE_TRACING
             fprintf(stderr, "getAccessibleAtPoint( %u, %u ) returned %p\n",
               x, y, xAccessible.get());
-
+            
             uno::Reference< accessibility::XAccessibleComponent > xComponent(
                 xAccessible->getAccessibleContext(), uno::UNO_QUERY );
-
+            
             if( xComponent.is() )
             {
                 awt::Rectangle rect = xComponent->getBounds();
@@ -157,11 +157,11 @@ component_wrapper_ref_accessible_at_point (AtkComponent *component,
             return atk_object_wrapper_ref( xAccessible );
         }
     }
-    catch( const uno::Exception &e )
+    catch( const uno::Exception &e ) 
     {
         g_warning( "Exception in getAccessibleAtPoint()" );
     }
-
+    
     return NULL;
 }
 
@@ -179,21 +179,21 @@ component_wrapper_get_position (AtkComponent   *component,
         if( pComponent )
         {
             awt::Point aPos;
-
+            
             if( coord_type == ATK_XY_SCREEN )
                 aPos = pComponent->getLocationOnScreen();
             else
                 aPos = pComponent->getLocation();
-
+            
             *x = aPos.X;
             *y = aPos.Y;
-
+            
 #ifdef ENABLE_TRACING
             fprintf(stderr, "getLocation[OnScreen]() returned: ( %u, %u )\n", *x, *y );
 #endif
         }
     }
-    catch( const uno::Exception &e )
+    catch( const uno::Exception &e ) 
     {
         g_warning( "Exception in getLocation[OnScreen]()" );
     }
@@ -214,13 +214,13 @@ component_wrapper_get_size (AtkComponent   *component,
             awt::Size aSize = pComponent->getSize();
             *width = aSize.Width;
             *height = aSize.Height;
-
+            
 #ifdef ENABLE_TRACING
             fprintf(stderr, "getSize() returned: ( %u, %u )\n", *width, *height );
 #endif
         }
     }
-    catch( const uno::Exception &e )
+    catch( const uno::Exception &e ) 
     {
         g_warning( "Exception in getSize()" );
     }
@@ -274,7 +274,7 @@ component_wrapper_get_layer (AtkComponent   *component)
 {
     AtkRole role = atk_object_get_role( ATK_OBJECT( component ) );
     AtkLayer layer = ATK_LAYER_WIDGET;
-
+    
     switch (role)
     {
         case ATK_ROLE_POPUP_MENU:
@@ -291,7 +291,7 @@ component_wrapper_get_layer (AtkComponent   *component)
                     layer = ATK_LAYER_POPUP;
             }
             break;
-
+        
         case ATK_ROLE_LIST:
             {
                 AtkObject * parent = atk_object_get_parent( ATK_OBJECT( component ) );
@@ -299,11 +299,11 @@ component_wrapper_get_layer (AtkComponent   *component)
                     layer = ATK_LAYER_POPUP;
             }
             break;
-
+        
         default:
             ;
     }
-
+    
     return layer;
 }
 
diff --git a/vcl/unx/gtk/a11y/atkeditabletext.cxx b/vcl/unx/gtk/a11y/atkeditabletext.cxx
index c0399145b07c..7673b21c6783 100644
--- a/vcl/unx/gtk/a11y/atkeditabletext.cxx
+++ b/vcl/unx/gtk/a11y/atkeditabletext.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
@@ -54,17 +54,17 @@ static accessibility::XAccessibleEditableText*
             pWrap->mpEditableText = reinterpret_cast< accessibility::XAccessibleEditableText * > (any.pReserved);
             pWrap->mpEditableText->acquire();
         }
-
+        
         return pWrap->mpEditableText;
     }
-
+    
     return NULL;
 }
 
 
 /*****************************************************************************/
 
-extern "C" {
+extern "C" { 
 
 static gboolean
 editable_text_wrapper_set_run_attributes( AtkEditableText  *text,
diff --git a/vcl/unx/gtk/a11y/atkfactory.cxx b/vcl/unx/gtk/a11y/atkfactory.cxx
index d2574f616539..f2760383a44e 100644
--- a/vcl/unx/gtk/a11y/atkfactory.cxx
+++ b/vcl/unx/gtk/a11y/atkfactory.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
@@ -39,11 +39,11 @@ using namespace ::com::sun::star;
 extern "C" {
 
 /*
- *  Instances of this dummy object class are returned whenever we have to
+ *  Instances of this dummy object class are returned whenever we have to 
  *  create an AtkObject, but can't touch the OOo object anymore since it
  *  is already disposed.
  */
-
+ 
 static AtkStateSet *
 noop_wrapper_ref_state_set( AtkObject * )
 {
@@ -79,12 +79,12 @@ atk_noop_object_wrapper_get_type(void)
             (GInstanceInitFunc) NULL,
             NULL
         } ;
-
+        
         type = g_type_register_static (ATK_TYPE_OBJECT, "OOoAtkNoOpObj", &typeInfo, (GTypeFlags)0) ;
   }
   return type;
 }
-
+    
 AtkObject*
 atk_noop_object_wrapper_new()
 {
@@ -113,22 +113,22 @@ static AtkObject*
 wrapper_factory_create_accessible( GObject *obj )
 {
     GtkWidget* parent_widget = gtk_widget_get_parent( GTK_WIDGET( obj ) );
-
+    
     // gail_container_real_remove_gtk tries to re-instanciate an accessible
     // for a widget that is about to vanish ..
     if( ! parent_widget )
         return atk_noop_object_wrapper_new();
-
+    
     GtkSalFrame* pFrame = GtkSalFrame::getFromWindow( GTK_WINDOW( parent_widget ) );
     g_return_val_if_fail( pFrame != NULL, NULL );
-
+       
     Window* pFrameWindow = pFrame->GetWindow();
     if( pFrameWindow )
     {
         Window* pWindow = pFrameWindow;
 
         // skip accessible objects already exposed by the frame objects
-        if( WINDOW_BORDERWINDOW == pWindow->GetType() )
+        if( WINDOW_BORDERWINDOW == pWindow->GetType() ) 
             pWindow = pFrameWindow->GetAccessibleChildWindow(0);
 
         if( pWindow )
@@ -147,7 +147,7 @@ wrapper_factory_create_accessible( GObject *obj )
             }
         }
     }
-
+    
     return NULL;
 }
 
@@ -174,9 +174,9 @@ wrapper_factory_get_type (void)
     t = g_type_register_static (
         ATK_TYPE_OBJECT_FACTORY, "OOoAtkObjectWrapperFactory",
         &tinfo, (GTypeFlags) 0);
-  }
-
-  return t;
+  }                                     
+                                        
+  return t;                                 
 }
 
 } // extern C
diff --git a/vcl/unx/gtk/a11y/atkfactory.hxx b/vcl/unx/gtk/a11y/atkfactory.hxx
index 82be08cfad1b..9a3d3014b4d4 100644
--- a/vcl/unx/gtk/a11y/atkfactory.hxx
+++ b/vcl/unx/gtk/a11y/atkfactory.hxx
@@ -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
@@ -33,7 +33,7 @@
 #define OOO_TYPE_WRAPPER_FACTORY wrapper_factory_get_type()
 
 extern "C" {
-
+    
 GType wrapper_factory_get_type (void);
 
 } // extern "C"
diff --git a/vcl/unx/gtk/a11y/atkhypertext.cxx b/vcl/unx/gtk/a11y/atkhypertext.cxx
index 90d735890655..b2eeb80a8c21 100644
--- a/vcl/unx/gtk/a11y/atkhypertext.cxx
+++ b/vcl/unx/gtk/a11y/atkhypertext.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
@@ -36,7 +36,7 @@
 
 using namespace ::com::sun::star;
 
-
+ 
 // ---------------------- AtkHyperlink ----------------------
 
 typedef struct {
@@ -98,7 +98,7 @@ hyper_link_get_end_index( AtkHyperlink *pLink )
 {
     try {
         return getHyperlink( pLink )->getEndIndex();
-    }
+    } 
     catch(const uno::Exception& e) {
     }
     return -1;
@@ -108,7 +108,7 @@ hyper_link_get_start_index( AtkHyperlink *pLink )
 {
     try {
         return getHyperlink( pLink )->getStartIndex();
-    }
+    } 
     catch(const uno::Exception& e) {
     }
     return -1;
@@ -215,10 +215,10 @@ static accessibility::XAccessibleHypertext*
             pWrap->mpHypertext = reinterpret_cast< accessibility::XAccessibleHypertext * > (any.pReserved);
             pWrap->mpHypertext->acquire();
         }
-
+        
         return pWrap->mpHypertext;
     }
-
+    
     return NULL;
 }
 
@@ -243,7 +243,7 @@ hypertext_get_link( AtkHypertext *hypertext,
     catch(const uno::Exception& e) {
         g_warning( "Exception in getHyperLink()" );
     }
-
+    
     return NULL;
 }
 
@@ -258,7 +258,7 @@ hypertext_get_n_links( AtkHypertext *hypertext )
     catch(const uno::Exception& e) {
         g_warning( "Exception in getHyperLinkCount()" );
     }
-
+    
     return 0;
 }
 
@@ -274,7 +274,7 @@ hypertext_get_link_index( AtkHypertext *hypertext,
     catch(const uno::Exception& e) {
         g_warning( "Exception in getHyperLinkIndex()" );
     }
-
+    
     return 0;
 }
 
diff --git a/vcl/unx/gtk/a11y/atkimage.cxx b/vcl/unx/gtk/a11y/atkimage.cxx
index b48c59555a29..44147bead26d 100644
--- a/vcl/unx/gtk/a11y/atkimage.cxx
+++ b/vcl/unx/gtk/a11y/atkimage.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
@@ -60,10 +60,10 @@ static accessibility::XAccessibleImage*
             pWrap->mpImage = reinterpret_cast< accessibility::XAccessibleImage * > (any.pReserved);
             pWrap->mpImage->acquire();
         }
-
+        
         return pWrap->mpImage;
     }
-
+    
     return NULL;
 }
 
@@ -74,13 +74,13 @@ image_get_image_description( AtkImage *image )
 {
     try {
         accessibility::XAccessibleImage* pImage = getImage( image );
-        if( pImage )
+        if( pImage )    
             return getAsConst( pImage->getAccessibleImageDescription() );
     }
     catch(const uno::Exception& e) {
         g_warning( "Exception in getAccessibleImageDescription()" );
     }
-
+    
     return NULL;
 }
 
diff --git a/vcl/unx/gtk/a11y/atklistener.cxx b/vcl/unx/gtk/a11y/atklistener.cxx
index e02478ac8ad8..7b63d25e5474 100644
--- a/vcl/unx/gtk/a11y/atklistener.cxx
+++ b/vcl/unx/gtk/a11y/atklistener.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
diff --git a/vcl/unx/gtk/a11y/atklistener.hxx b/vcl/unx/gtk/a11y/atklistener.hxx
index d2889caa3e24..5f4c47a38dcb 100644
--- a/vcl/unx/gtk/a11y/atklistener.hxx
+++ b/vcl/unx/gtk/a11y/atklistener.hxx
@@ -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
@@ -41,15 +41,15 @@ class AtkListener : public ::cppu::WeakImplHelper1< ::com::sun::star::accessibil
 {
 public:
     AtkListener(AtkObjectWrapper * pWrapper);
-
+    
     // XEventListener
-    virtual void disposing( const ::com::sun::star::lang::EventObject& Source )
+    virtual void disposing( const ::com::sun::star::lang::EventObject& Source ) 
         throw (::com::sun::star::uno::RuntimeException);
 
     // XAccessibleEventListener
-    virtual void notifyEvent( const ::com::sun::star::accessibility::AccessibleEventObject& aEvent )
+    virtual void notifyEvent( const ::com::sun::star::accessibility::AccessibleEventObject& aEvent ) 
         throw( ::com::sun::star::uno::RuntimeException );
-
+    
     AtkObjectWrapper *mpWrapper;
     AccessibleVector m_aChildList;
 
@@ -59,20 +59,20 @@ private:
 
     // Updates the child list held to provide the old IndexInParent on children_changed::remove
     void updateChildList(::com::sun::star::accessibility::XAccessibleContext* pContext);
-
+    
     // Process CHILD_EVENT notifications with a new child added
     void handleChildAdded(
         const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleContext >& rxParent,
         const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible>& rxChild);
-
+    
     // Process CHILD_EVENT notifications with a child removed
     void handleChildRemoved(
         const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleContext >& rxParent,
         const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible>& rxChild);
-
+    
     // Process INVALIDATE_ALL_CHILDREN notification
     void handleInvalidateChildren(
-        const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleContext >& rxParent);
+        const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleContext >& rxParent);    
 };
 
 #endif /* _ATK_LISTENER_HXX_ */
diff --git a/vcl/unx/gtk/a11y/atkregistry.cxx b/vcl/unx/gtk/a11y/atkregistry.cxx
index 81ec22dc4ce1..d8ecf4917cc4 100644
--- a/vcl/unx/gtk/a11y/atkregistry.cxx
+++ b/vcl/unx/gtk/a11y/atkregistry.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
@@ -34,7 +34,7 @@ static GHashTable *uno_to_gobject = NULL;
 
 /*****************************************************************************/
 
-AtkObject *
+AtkObject * 
 ooo_wrapper_registry_get(const Reference< XAccessible >& rxAccessible)
 {
     if( uno_to_gobject )
@@ -51,7 +51,7 @@ ooo_wrapper_registry_get(const Reference< XAccessible >& rxAccessible)
 
 /*****************************************************************************/
 
-void
+void 
 ooo_wrapper_registry_add(const Reference< XAccessible >& rxAccessible, AtkObject *obj)
 {
    if( !uno_to_gobject )
diff --git a/vcl/unx/gtk/a11y/atkregistry.hxx b/vcl/unx/gtk/a11y/atkregistry.hxx
index f4de3b2e4c1e..ef7a1b1f3cc2 100644
--- a/vcl/unx/gtk/a11y/atkregistry.hxx
+++ b/vcl/unx/gtk/a11y/atkregistry.hxx
@@ -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
diff --git a/vcl/unx/gtk/a11y/atkselection.cxx b/vcl/unx/gtk/a11y/atkselection.cxx
index 172faac4c704..bed81a8db734 100644
--- a/vcl/unx/gtk/a11y/atkselection.cxx
+++ b/vcl/unx/gtk/a11y/atkselection.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
@@ -48,10 +48,10 @@ static accessibility::XAccessibleSelection*
             pWrap->mpSelection = reinterpret_cast< accessibility::XAccessibleSelection * > (any.pReserved);
             pWrap->mpSelection->acquire();
         }
-
+        
         return pWrap->mpSelection;
     }
-
+    
     return NULL;
 }
 
@@ -72,7 +72,7 @@ selection_add_selection( AtkSelection *selection,
     catch(const uno::Exception& e) {
         g_warning( "Exception in selectAccessibleChild()" );
     }
-
+    
     return FALSE;
 }
 
@@ -90,7 +90,7 @@ selection_clear_selection( AtkSelection *selection )
     catch(const uno::Exception& e) {
         g_warning( "Exception in selectAccessibleChild()" );
     }
-
+    
     return FALSE;
 }
 
@@ -106,7 +106,7 @@ selection_ref_selection( AtkSelection *selection,
     catch(const uno::Exception& e) {
         g_warning( "Exception in getSelectedAccessibleChild()" );
     }
-
+    
     return NULL;
 }
 
@@ -121,7 +121,7 @@ selection_get_selection_count( AtkSelection   *selection)
     catch(const uno::Exception& e) {
         g_warning( "Exception in getSelectedAccessibleChildCount()" );
     }
-
+    
     return -1;
 }
 
@@ -156,7 +156,7 @@ selection_remove_selection( AtkSelection *selection,
     catch(const uno::Exception& e) {
         g_warning( "Exception in getSelectedAccessibleChildCount()" );
     }
-
+    
     return FALSE;
 }
 
@@ -174,7 +174,7 @@ selection_select_all_selection( AtkSelection   *selection)
     catch(const uno::Exception& e) {
         g_warning( "Exception in getSelectedAccessibleChildCount()" );
     }
-
+    
     return FALSE;
 }
 
diff --git a/vcl/unx/gtk/a11y/atktable.cxx b/vcl/unx/gtk/a11y/atktable.cxx
index 78571ff11c34..189abe4a3387 100644
--- a/vcl/unx/gtk/a11y/atktable.cxx
+++ b/vcl/unx/gtk/a11y/atktable.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
@@ -44,10 +44,10 @@ atk_object_wrapper_conditional_ref( const uno::Reference< accessibility::XAccess
 #ifdef ENABLE_TRACING
     fprintf( stderr, ": %p\n", rxAccessible.get() );
 #endif
-
+    
     if( rxAccessible.is() )
         return atk_object_wrapper_ref( rxAccessible );
-
+    
     return NULL;
 }
 
@@ -79,10 +79,10 @@ static accessibility::XAccessibleTable*
             pWrap->mpTable = reinterpret_cast< accessibility::XAccessibleTable * > (any.pReserved);
             pWrap->mpTable->acquire();
         }
-
+        
         return pWrap->mpTable;
     }
-
+    
     return NULL;
 }
 
@@ -97,20 +97,20 @@ table_wrapper_ref_at (AtkTable *table,
 {
     try {
         accessibility::XAccessibleTable* pTable = getTable( table );
-
+        
 #ifdef ENABLE_TRACING
         if( pTable )
             fprintf(stderr, "getAccessibleCellAt( %u, %u ) returns", row, column );
-
+        
         if( column >= 255 )
             fprintf(stderr, "getAccessibleCellAt( %u, %u ) returns", row, column );
-
+            
 #endif
 
         if( pTable )
             return atk_object_wrapper_conditional_ref( pTable->getAccessibleCellAt( row, column ) );
     }
-
+        
     catch(const uno::Exception& e) {
         g_warning( "Exception in getAccessibleCellAt()" );
     }
@@ -127,13 +127,13 @@ table_wrapper_get_index_at (AtkTable      *table,
 {
     try {
         accessibility::XAccessibleTable* pTable = getTable( table );
-
+        
 #ifdef ENABLE_TRACING
         if( pTable )
-            fprintf(stderr, "getAccessibleIndex( %u, %u ) returns %u\n",
+            fprintf(stderr, "getAccessibleIndex( %u, %u ) returns %u\n", 
                 row, column, pTable->getAccessibleIndex( row, column ) );
 #endif
-
+        
         if( pTable )
             return pTable->getAccessibleIndex( row, column );
     }
@@ -152,13 +152,13 @@ table_wrapper_get_column_at_index (AtkTable      *table,
 {
     try {
         accessibility::XAccessibleTable* pTable = getTable( table );
-
+        
 #ifdef ENABLE_TRACING
         if( pTable )
-            fprintf(stderr, "getAccessibleColumn( %u ) returns %u\n",
+            fprintf(stderr, "getAccessibleColumn( %u ) returns %u\n", 
                 nIndex, pTable->getAccessibleColumn( nIndex ) );
 #endif
-
+        
         if( pTable )
             return pTable->getAccessibleColumn( nIndex );
     }
@@ -177,10 +177,10 @@ table_wrapper_get_row_at_index( AtkTable *table,
 {
     try {
         accessibility::XAccessibleTable* pTable = getTable( table );
-
+        
 #ifdef ENABLE_TRACING
         if( pTable )
-            fprintf(stderr, "getAccessibleRow( %u ) returns %u\n",
+            fprintf(stderr, "getAccessibleRow( %u ) returns %u\n", 
                 nIndex, pTable->getAccessibleRow( nIndex ) );
 #endif
 
@@ -204,7 +204,7 @@ table_wrapper_get_n_columns( AtkTable *table )
 
 #ifdef ENABLE_TRACING
         if( pTable )
-            fprintf(stderr, "XAccessibleTable::getAccessibleColumnCount returns %u\n",
+            fprintf(stderr, "XAccessibleTable::getAccessibleColumnCount returns %u\n", 
                 pTable->getAccessibleColumnCount() );
 #endif
 
@@ -225,10 +225,10 @@ table_wrapper_get_n_rows( AtkTable *table )
 {
     try {
         accessibility::XAccessibleTable* pTable = getTable( table );
-
+        
 #ifdef ENABLE_TRACING
         if( pTable )
-            fprintf(stderr, "getAccessibleRowCount() returns %u\n",
+            fprintf(stderr, "getAccessibleRowCount() returns %u\n", 
                 pTable->getAccessibleRowCount() );
 #endif
 
@@ -251,10 +251,10 @@ table_wrapper_get_column_extent_at( AtkTable *table,
 {
     try {
         accessibility::XAccessibleTable* pTable = getTable( table );
-
+        
 #ifdef ENABLE_TRACING
         if( pTable )
-            fprintf(stderr, "getAccessibleColumnExtentAt( %u, %u ) returns %u\n",
+            fprintf(stderr, "getAccessibleColumnExtentAt( %u, %u ) returns %u\n", 
                 row, column, pTable->getAccessibleColumnExtentAt( row, column ) );
 #endif
 
@@ -277,10 +277,10 @@ table_wrapper_get_row_extent_at( AtkTable *table,
 {
     try {
         accessibility::XAccessibleTable* pTable = getTable( table );
-
+        
 #ifdef ENABLE_TRACING
         if( pTable )
-            fprintf(stderr, "getAccessibleRowExtentAt( %u, %u ) returns %u\n",
+            fprintf(stderr, "getAccessibleRowExtentAt( %u, %u ) returns %u\n", 
                 row, column, pTable->getAccessibleRowExtentAt( row, column ) );
 #endif
 
@@ -301,7 +301,7 @@ table_wrapper_get_caption( AtkTable *table )
 {
     try {
         accessibility::XAccessibleTable* pTable = getTable( table );
-
+        
 #ifdef ENABLE_TRACING
         if( pTable )
             fprintf(stderr, "getAccessibleCaption() returns" );
@@ -310,7 +310,7 @@ table_wrapper_get_caption( AtkTable *table )
         if( pTable )
             return atk_object_wrapper_conditional_ref( pTable->getAccessibleCaption() );
     }
-
+        
     catch(const uno::Exception& e) {
         g_warning( "Exception in getAccessibleCaption()" );
     }
@@ -329,7 +329,7 @@ table_wrapper_get_row_description( AtkTable *table,
 
 #ifdef ENABLE_TRACING
         if( pTable )
-            fprintf(stderr, "getAccessibleRowDescription( %u ) returns %s\n",
+            fprintf(stderr, "getAccessibleRowDescription( %u ) returns %s\n", 
                 row, getAsConst( pTable->getAccessibleRowDescription( row ) ) );
 #endif
 
@@ -351,10 +351,10 @@ table_wrapper_get_column_description( AtkTable *table,
 {
     try {
         accessibility::XAccessibleTable* pTable = getTable( table );
-
+        
 #ifdef ENABLE_TRACING
         if( pTable )
-            fprintf(stderr, "getAccessibleColumnDescription( %u ) returns %s\n",
+            fprintf(stderr, "getAccessibleColumnDescription( %u ) returns %s\n", 
                 column, getAsConst( pTable->getAccessibleColumnDescription( column ) ) );
 #endif
 
@@ -407,7 +407,7 @@ table_wrapper_get_column_header( AtkTable *table,
 {
     try {
         accessibility::XAccessibleTable* pTable = getTable( table );
-
+        
         if( pTable )
         {
             uno::Reference< accessibility::XAccessibleTable > xColumnHeaders( pTable->getAccessibleColumnHeaders() );
@@ -438,7 +438,7 @@ table_wrapper_get_summary( AtkTable *table )
 {
     try {
         accessibility::XAccessibleTable* pTable = getTable( table );
-
+        
 #ifdef ENABLE_TRACING
         if( pTable )
             fprintf(stderr, "getAccessibleSummary() returns" );
@@ -483,12 +483,12 @@ table_wrapper_get_selected_columns( AtkTable      *table,
     *pSelected = NULL;
     try {
         accessibility::XAccessibleTable* pTable = getTable( table );
-
+        
 #ifdef ENABLE_TRACING
         if( pTable )
             fprintf(stderr, "getSelectedAccessibleColumns() \n" );
 #endif
-
+        
         if( pTable )
             return convertToGIntArray( pTable->getSelectedAccessibleColumns(), pSelected );
     }
@@ -508,12 +508,12 @@ table_wrapper_get_selected_rows( AtkTable      *table,
     *pSelected = NULL;
     try {
         accessibility::XAccessibleTable* pTable = getTable( table );
-
+        
 #ifdef ENABLE_TRACING
         if( pTable )
             fprintf(stderr, "getSelectedAccessibleRows() \n" );
 #endif
-
+        
         if( pTable )
             return convertToGIntArray( pTable->getSelectedAccessibleRows(), pSelected );
     }
@@ -532,13 +532,13 @@ table_wrapper_is_column_selected( AtkTable      *table,
 {
     try {
         accessibility::XAccessibleTable* pTable = getTable( table );
-
+        
 #ifdef ENABLE_TRACING
         if( pTable )
-            fprintf(stderr, "isAccessibleColumnSelected( %u ) returns %s\n",
+            fprintf(stderr, "isAccessibleColumnSelected( %u ) returns %s\n", 
                 column, pTable->isAccessibleColumnSelected( column ) ? "true" : "false" );
 #endif
-
+        
         if( pTable )
             return pTable->isAccessibleColumnSelected( column );
     }
@@ -557,13 +557,13 @@ table_wrapper_is_row_selected( AtkTable      *table,
 {
     try {
         accessibility::XAccessibleTable* pTable = getTable( table );
-
+        
 #ifdef ENABLE_TRACING
         if( pTable )
-            fprintf(stderr, "isAccessibleRowSelected( %u ) returns %s\n",
+            fprintf(stderr, "isAccessibleRowSelected( %u ) returns %s\n", 
                 row, pTable->isAccessibleRowSelected( row ) ? "true" : "false" );
 #endif
-
+        
         if( pTable )
             return pTable->isAccessibleRowSelected( row );
     }
@@ -583,13 +583,13 @@ table_wrapper_is_selected( AtkTable      *table,
 {
     try {
         accessibility::XAccessibleTable* pTable = getTable( table );
-
+        
 #ifdef ENABLE_TRACING
         if( pTable )
-            fprintf(stderr, "isAccessibleSelected( %u, %u ) returns %s\n",
+            fprintf(stderr, "isAccessibleSelected( %u, %u ) returns %s\n", 
                 row, column, pTable->isAccessibleSelected( row , column ) ? "true" : "false" );
 #endif
-
+        
         if( pTable )
             return pTable->isAccessibleSelected( row, column );
     }
@@ -690,11 +690,11 @@ tableIfaceInit (AtkTableIface *iface)
   g_return_if_fail (iface != NULL);
 
   iface->ref_at = table_wrapper_ref_at;
-  iface->get_n_rows = table_wrapper_get_n_rows;
-  iface->get_n_columns = table_wrapper_get_n_columns;
-  iface->get_index_at = table_wrapper_get_index_at;
-  iface->get_column_at_index = table_wrapper_get_column_at_index;
-  iface->get_row_at_index = table_wrapper_get_row_at_index;
+  iface->get_n_rows = table_wrapper_get_n_rows; 
+  iface->get_n_columns = table_wrapper_get_n_columns;   
+  iface->get_index_at = table_wrapper_get_index_at; 
+  iface->get_column_at_index = table_wrapper_get_column_at_index;   
+  iface->get_row_at_index = table_wrapper_get_row_at_index; 
   iface->is_row_selected = table_wrapper_is_row_selected;
   iface->is_selected = table_wrapper_is_selected;
   iface->get_selected_rows = table_wrapper_get_selected_rows;
diff --git a/vcl/unx/gtk/a11y/atkutil.cxx b/vcl/unx/gtk/a11y/atkutil.cxx
index 13492f3d4a5c..0aa063318741 100644
--- a/vcl/unx/gtk/a11y/atkutil.cxx
+++ b/vcl/unx/gtk/a11y/atkutil.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
@@ -92,7 +92,7 @@ atk_wrapper_focus_idle_handler (gpointer data)
             // also emit state-changed:focused event under the same condition.
             {
                 AtkObjectWrapper* wrapper_obj = ATK_OBJECT_WRAPPER (atk_obj);
-                if( !wrapper_obj->mpText && wrapper_obj->mpContext )
+                if( wrapper_obj && !wrapper_obj->mpText && wrapper_obj->mpContext )
                 {
                     uno::Any any = wrapper_obj->mpContext->queryInterface( accessibility::XAccessibleText::static_type(NULL) );
                     if ( typelib_TypeClass_INTERFACE == any.pType->eTypeClass &&
diff --git a/vcl/unx/gtk/a11y/atkutil.hxx b/vcl/unx/gtk/a11y/atkutil.hxx
index 8c8ddf59c65f..1f2519feea0c 100644
--- a/vcl/unx/gtk/a11y/atkutil.hxx
+++ b/vcl/unx/gtk/a11y/atkutil.hxx
@@ -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
@@ -26,7 +26,7 @@
  ************************************************************************/
 
 #ifndef __ATK_UTIL_HXX__
-#define __ATK_UTIL_HXX__
+#define __ATK_UTIL_HXX__ 
 
 #include <atk/atk.h>
 
diff --git a/vcl/unx/gtk/a11y/atkvalue.cxx b/vcl/unx/gtk/a11y/atkvalue.cxx
index 9b8e9743eb18..d8ec910b3591 100644
--- a/vcl/unx/gtk/a11y/atkvalue.cxx
+++ b/vcl/unx/gtk/a11y/atkvalue.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
@@ -49,10 +49,10 @@ static accessibility::XAccessibleValue*
             pWrap->mpValue = reinterpret_cast< accessibility::XAccessibleValue * > (any.pReserved);
             pWrap->mpValue->acquire();
         }
-
+        
         return pWrap->mpValue;
     }
-
+    
     return NULL;
 }
 
diff --git a/vcl/unx/gtk/a11y/atkwindow.cxx b/vcl/unx/gtk/a11y/atkwindow.cxx
index 5448235998e8..bcc00bc344c5 100644
--- a/vcl/unx/gtk/a11y/atkwindow.cxx
+++ b/vcl/unx/gtk/a11y/atkwindow.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
@@ -27,7 +27,7 @@
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_vcl.hxx"
-
+ 
 #include <plugins/gtk/gtkframe.hxx>
 #include <vcl/window.hxx>
 #include "vcl/popupmenuwindow.hxx"
@@ -45,19 +45,19 @@ extern "C" {
 
 static void (* window_real_initialize) (AtkObject *obj, gpointer data) = NULL;
 static void (* window_real_finalize) (GObject *obj) = NULL;
-
+    
 static void
 init_from_window( AtkObject *accessible, Window *pWindow )
 {
     static AtkRole aDefaultRole = ATK_ROLE_INVALID;
-
+    
     // Special role for sub-menu and combo-box popups that are exposed directly
     // by their parents already.
     if( aDefaultRole == ATK_ROLE_INVALID )
         aDefaultRole = atk_role_register( "redundant object" );
-
+    
     AtkRole role = aDefaultRole;
-
+    
     // Determine the appropriate role for the GtkWindow
     switch( pWindow->GetAccessibleRole() )
     {
@@ -72,7 +72,7 @@ init_from_window( AtkObject *accessible, Window *pWindow )
         case AccessibleRole::FRAME:
             role = ATK_ROLE_FRAME;
             break;
-
+            
         /* Ignore window objects for sub-menus, combo- and list boxes,
          *  which are exposed as children of their parents.
          */
@@ -80,13 +80,13 @@ init_from_window( AtkObject *accessible, Window *pWindow )
         {
             USHORT type = WINDOW_WINDOW;
             bool parentIsMenuFloatingWindow = false;
-
+                    
             Window *pParent = pWindow->GetParent();
             if( pParent ) {
                 type = pParent->GetType();
                 parentIsMenuFloatingWindow = ( TRUE == pParent->IsMenuFloatingWindow() );
             }
-
+                    
             if( (WINDOW_LISTBOX != type) && (WINDOW_COMBOBOX != type) &&
                 (WINDOW_MENUBARWINDOW != type) && ! parentIsMenuFloatingWindow )
             {
@@ -94,7 +94,7 @@ init_from_window( AtkObject *accessible, Window *pWindow )
             }
         }
         break;
-
+                
         default:
         {
             Window *pChild = pWindow->GetChild( 0 );
@@ -124,10 +124,10 @@ init_from_window( AtkObject *accessible, Window *pWindow )
 
     accessible->role = role;
 }
-
-/*****************************************************************************/
-
-static gint
+    
+/*****************************************************************************/    
+    
+static gint 
 ooo_window_wrapper_clear_focus(gpointer)
 {
     atk_focus_tracker_notify( NULL );
@@ -136,7 +136,7 @@ ooo_window_wrapper_clear_focus(gpointer)
 
 /*****************************************************************************/
 
-static gboolean
+static gboolean 
 ooo_window_wrapper_real_focus_gtk (GtkWidget *, GdkEventFocus *)
 {
     g_idle_add( ooo_window_wrapper_clear_focus, NULL );
@@ -190,7 +190,7 @@ ooo_window_wrapper_real_initialize(AtkObject *obj, gpointer data)
         if( pWindow )
         {
             init_from_window( obj, pWindow );
-
+            
             Reference< XAccessible > xAccessible( pWindow->GetAccessible(true) );
 
             /* We need the wrapper object for the top-level XAccessible to be
@@ -220,11 +220,11 @@ ooo_window_wrapper_real_initialize(AtkObject *obj, gpointer data)
             }
         }
     }
-
+        
     g_signal_connect_after( GTK_WIDGET( data ), "focus-out-event",
                             G_CALLBACK (ooo_window_wrapper_real_focus_gtk),
                             NULL);
-
+    
     if( obj->role == ATK_ROLE_TOOL_TIP )
     {
         g_signal_connect_after( GTK_WIDGET( data ), "map-event",
@@ -253,18 +253,18 @@ ooo_window_wrapper_class_init (AtkObjectClass *klass, gpointer)
     AtkObjectClass *atk_class;
     GObjectClass *gobject_class;
     gpointer data;
-
-    /*
+    
+    /* 
      * Patch the gobject vtable of GailWindow to refer to our instance of
      * "initialize".
      */
-
+    
     data = g_type_class_peek_parent( klass );
     atk_class = ATK_OBJECT_CLASS (data);
-
+    
     window_real_initialize = atk_class->initialize;
     atk_class->initialize = ooo_window_wrapper_real_initialize;
-
+    
     gobject_class = G_OBJECT_CLASS (data);
 
     window_real_finalize = gobject_class->finalize;
@@ -275,7 +275,7 @@ ooo_window_wrapper_class_init (AtkObjectClass *klass, gpointer)
 
 /*****************************************************************************/
 
-GType
+GType 
 ooo_window_wrapper_get_type (void)
 {
     static GType type = 0;
@@ -283,16 +283,16 @@ ooo_window_wrapper_get_type (void)
     if (!type)
     {
         GType parent_type = g_type_from_name( "GailWindow" );
-
+        
         if( ! parent_type )
         {
             g_warning( "Unknown type: GailWindow" );
             parent_type = ATK_TYPE_OBJECT;
         }
-
+        
         GTypeQuery type_query;
         g_type_query( parent_type, &type_query );
-
+        
         static const GTypeInfo typeInfo =
         {
             type_query.class_size,
@@ -306,10 +306,10 @@ ooo_window_wrapper_get_type (void)
             (GInstanceInitFunc) NULL,
             NULL
         } ;
-
+        
         type = g_type_register_static (parent_type, "OOoWindowAtkObject", &typeInfo, (GTypeFlags)0) ;
     }
-
+    
     return type;
 }
 
@@ -319,13 +319,13 @@ void restore_gail_window_vtable (void)
     gpointer data;
 
     GType type = g_type_from_name( "GailWindow" );
-
+    
     if( type == G_TYPE_INVALID )
         return;
-
+    
     data = g_type_class_peek( type );
     atk_class = ATK_OBJECT_CLASS (data);
-
+    
     atk_class->initialize = window_real_initialize;
 }
 
diff --git a/vcl/unx/gtk/a11y/atkwindow.hxx b/vcl/unx/gtk/a11y/atkwindow.hxx
index 6a9862256999..4981cf09adec 100644
--- a/vcl/unx/gtk/a11y/atkwindow.hxx
+++ b/vcl/unx/gtk/a11y/atkwindow.hxx
@@ -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
@@ -26,7 +26,7 @@
  ************************************************************************/
 
 #ifndef __ATK_WINDOW_HXX__
-#define __ATK_WINDOW_HXX__
+#define __ATK_WINDOW_HXX__ 
 
 #include <atk/atk.h>
 
diff --git a/vcl/unx/gtk/a11y/atkwrapper.hxx b/vcl/unx/gtk/a11y/atkwrapper.hxx
index 4252c0404833..2ce5afd73a27 100644
--- a/vcl/unx/gtk/a11y/atkwrapper.hxx
+++ b/vcl/unx/gtk/a11y/atkwrapper.hxx
@@ -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
@@ -70,7 +70,7 @@ struct _AtkObjectWrapper
     ::com::sun::star::accessibility::XAccessibleTextMarkup     *mpTextMarkup;
     ::com::sun::star::accessibility::XAccessibleTextAttributes *mpTextAttributes;
     ::com::sun::star::accessibility::XAccessibleValue          *mpValue;
-
+    
     AtkObject *child_about_to_be_removed;
     gint       index_of_child_about_to_be_removed;
 //    ::rtl::OString * m_pKeyBindings
@@ -85,7 +85,7 @@ GType                  atk_object_wrapper_get_type (void) G_GNUC_CONST;
 AtkObject *            atk_object_wrapper_ref(
     const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >& rxAccessible,
     bool create = true );
-
+    
 AtkObject *            atk_object_wrapper_new(
     const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >& rxAccessible,
     AtkObject* parent = NULL );
@@ -120,6 +120,6 @@ OUStringToGChar(const rtl::OUString& rString )
     return g_strdup( aUtf8 );
 }
 
-#define OUStringToConstGChar( string ) rtl::OUStringToOString( string, RTL_TEXTENCODING_UTF8 ).getStr()
+#define OUStringToConstGChar( string ) rtl::OUStringToOString( string, RTL_TEXTENCODING_UTF8 ).getStr() 
 
 #endif /* __ATK_WRAPPER_HXX__ */
diff --git a/vcl/unx/gtk/app/gtkdata.cxx b/vcl/unx/gtk/app/gtkdata.cxx
index 2679f4a29c02..4743aa972dc9 100644
--- a/vcl/unx/gtk/app/gtkdata.cxx
+++ b/vcl/unx/gtk/app/gtkdata.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
@@ -242,7 +242,7 @@ void GtkSalDisplay::initScreen( int nScreen ) const
     ScreenData& rSD = const_cast<ScreenData&>(m_aScreens[nScreen]);
     if( rSD.m_bInit )
         return;
-
+    
     // choose visual for screen
     SalDisplay::initScreen( nScreen );
     // now set a gdk default colormap matching the chosen visual to the screen
@@ -486,7 +486,7 @@ class GtkXLib : public SalXLib
     GtkSalDisplay       *m_pGtkSalDisplay;
     std::list<GSource *> m_aSources;
     GSource             *m_pTimeout;
-    GSource             *m_pUserEvent;
+    GSource				*m_pUserEvent;
     oslMutex             m_aDispatchMutex;
     oslCondition         m_aDispatchCondition;
 
@@ -500,9 +500,9 @@ public:
     virtual void    Init();
     virtual void    Yield( bool bWait, bool bHandleAllCurrentEvents );
     virtual void    Insert( int fd, void* data,
-                            YieldFunc   pending,
-                            YieldFunc   queued,
-                            YieldFunc   handle );
+                            YieldFunc	pending,
+                            YieldFunc	queued,
+                            YieldFunc	handle );
     virtual void    Remove( int fd );
 
     virtual void    StartTimer( ULONG nMS );
@@ -592,7 +592,7 @@ void GtkXLib::Init()
         rtl::OString aPrgName = rtl::OUStringToOString(aAppName, aEnc);
         g_set_prgname(aPrgName);
     }
-
+    
     // init gtk/gdk
     gtk_init_check( &nParams, &pCmdLineAry );
 
@@ -650,7 +650,7 @@ void GtkXLib::Init()
     m_pGtkSalDisplay->SetKbdExtension( pKbdExtension );
 
     g_signal_connect( G_OBJECT(gdk_keymap_get_default()), "keys_changed", G_CALLBACK(signalKeysChanged), m_pGtkSalDisplay );
-
+    
     // add signal handler to notify screen size changes
     int nScreens = gdk_display_get_n_screens( pGdkDisp );
     for( int n = 0; n < nScreens; n++ )
@@ -714,7 +714,7 @@ void GtkXLib::StartTimer( ULONG nMS )
     g_source_set_callback (m_pTimeout, call_timeoutFn,
                            (gpointer) this, NULL);
     g_source_attach (m_pTimeout, g_main_context_default ());
-
+    
     SalXLib::StartTimer( nMS );
 }
 
@@ -795,7 +795,7 @@ void GtkXLib::Yield( bool bWait, bool bHandleAllCurrentEvents )
      * another thread in in there. Having only one yieldin thread actually dispatch
      * fits the vcl event model (see e.g. the generic plugin).
      */
-
+    
     bool bDispatchThread = false;
     gboolean wasEvent = FALSE;
     {
@@ -806,7 +806,7 @@ void GtkXLib::Yield( bool bWait, bool bHandleAllCurrentEvents )
         else if( ! bWait )
             return; // someone else is waiting already, return
 
-
+        
         if( bDispatchThread )
         {
             int nMaxEvents = bHandleAllCurrentEvents ? 100 : 1;
diff --git a/vcl/unx/gtk/app/gtkinst.cxx b/vcl/unx/gtk/app/gtkinst.cxx
index 68617c8c16be..970c63916b13 100644
--- a/vcl/unx/gtk/app/gtkinst.cxx
+++ b/vcl/unx/gtk/app/gtkinst.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
@@ -95,7 +95,7 @@ void GtkHookedYieldMutex::release()
     SalYieldMutex::release();
 }
 
-extern "C"
+extern "C" 
 {
     #define GET_YIELD_MUTEX() static_cast<GtkHookedYieldMutex*>(GetSalData()->m_pInstance->GetYieldMutex())
     static void GdkThreadsEnter( void )
@@ -160,7 +160,7 @@ extern "C"
             pYieldMutex = new GtkHookedYieldMutex();
         else
             pYieldMutex = new GtkYieldMutex();
-
+                
         gdk_threads_init();
 
         GtkInstance* pInstance = new GtkInstance( pYieldMutex );
@@ -204,7 +204,7 @@ SalObject* GtkInstance::CreateObject( SalFrame* pParent, SystemWindowData* pWind
     // so we need the X11SalObject in that case
     if( pWindowData )
         return X11SalObject::CreateObject( pParent, pWindowData, bShow );
-
+    
     return new GtkSalObject( static_cast<GtkSalFrame*>(pParent), bShow );
 }
 
@@ -223,8 +223,8 @@ void GtkInstance::AddToRecentDocumentList(const rtl::OUString& rFileUrl, const r
 #else
     static getDefaultFnc sym_gtk_recent_manager_get_default =
         (getDefaultFnc)osl_getAsciiFunctionSymbol( GetSalData()->m_pPlugin, "gtk_recent_manager_get_default" );
-
-    static addItemFnc sym_gtk_recent_manager_add_item =
+    
+    static addItemFnc sym_gtk_recent_manager_add_item = 
         (addItemFnc)osl_getAsciiFunctionSymbol( GetSalData()->m_pPlugin, "gtk_recent_manager_add_item");
     if (sym_gtk_recent_manager_get_default && sym_gtk_recent_manager_add_item)
     {
@@ -252,7 +252,7 @@ void GtkYieldMutex::acquire()
         return;
     }
     OMutex::release();
-
+    
     // obtain gdk mutex
     gdk_threads_enter();
 
@@ -306,13 +306,13 @@ sal_Bool GtkYieldMutex::tryToAcquire()
     // how to we do a try_lock without having a gdk_threads_try_enter ?
     if( ! g_mutex_trylock( gdk_threads_mutex ) )
         return sal_False;
-
+    
     // obtained gdk mutex, now lock count is one by definition
     OMutex::acquire();
     mnCount = 1;
     mnThreadId = aCurrentThread;
     OMutex::release();
-
+    
     return sal_True;
 }
 
diff --git a/vcl/unx/gtk/app/gtksys.cxx b/vcl/unx/gtk/app/gtksys.cxx
index 272af20d0886..c928b6f6d025 100644
--- a/vcl/unx/gtk/app/gtksys.cxx
+++ b/vcl/unx/gtk/app/gtksys.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
diff --git a/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx b/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx
index 9d3ce6b137cd..5ca3223f67ff 100644
--- a/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx
+++ b/vcl/unx/gtk/gdi/salnativewidgets-gtk.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
@@ -68,23 +68,23 @@ class NWPixmapCacheList;
 class NWPixmapCache;
 struct NWFWidgetData
 {
-    GtkWidget * gCacheWindow;
-    GtkWidget * gDumbContainer;
-
-    GtkWidget * gBtnWidget;
-    GtkWidget * gRadioWidget;
-    GtkWidget * gRadioWidgetSibling;
-    GtkWidget * gCheckWidget;
-    GtkWidget * gScrollHorizWidget;
-    GtkWidget * gScrollVertWidget;
-    GtkWidget * gArrowWidget;
-    GtkWidget * gDropdownWidget;
-    GtkWidget * gEditBoxWidget;
-    GtkWidget * gSpinButtonWidget;
-    GtkWidget * gNotebookWidget;
-    GtkWidget * gOptionMenuWidget;
-    GtkWidget * gComboWidget;
-    GtkWidget * gScrolledWindowWidget;
+    GtkWidget *	gCacheWindow;
+    GtkWidget *	gDumbContainer;
+
+    GtkWidget *	gBtnWidget;
+    GtkWidget *	gRadioWidget;
+    GtkWidget *	gRadioWidgetSibling;
+    GtkWidget *	gCheckWidget;
+    GtkWidget *	gScrollHorizWidget;
+    GtkWidget *	gScrollVertWidget;
+    GtkWidget *	gArrowWidget;
+    GtkWidget *	gDropdownWidget;
+    GtkWidget *	gEditBoxWidget;
+    GtkWidget *	gSpinButtonWidget;
+    GtkWidget *	gNotebookWidget;
+    GtkWidget *	gOptionMenuWidget;
+    GtkWidget *	gComboWidget;
+    GtkWidget *	gScrolledWindowWidget;
     GtkWidget *  gToolbarWidget;
     GtkWidget *  gToolbarButtonWidget;
     GtkWidget *  gToolbarToggleWidget;
@@ -105,7 +105,7 @@ struct NWFWidgetData
     NWPixmapCacheList* gNWPixmapCacheList;
     NWPixmapCache* gCacheTabItems;
     NWPixmapCache* gCacheTabPages;
-
+    
     NWFWidgetData() :
         gCacheWindow( NULL ),
         gDumbContainer( NULL ),
@@ -148,29 +148,29 @@ struct NWFWidgetData
 // Keep a hash table of Widgets->default flags so that we can
 // easily and quickly reset each to a default state before using
 // them
-static std::hash_map<long, guint>   gWidgetDefaultFlags;
+static std::hash_map<long, guint>	gWidgetDefaultFlags;
 static std::vector<NWFWidgetData>   gWidgetData;
 
-static const GtkBorder aDefDefBorder        = { 1, 1, 1, 1 };
+static const GtkBorder aDefDefBorder		= { 1, 1, 1, 1 };
 
 // Some GTK defaults
-#define MIN_ARROW_SIZE                  11
-#define BTN_CHILD_SPACING               1
-#define MIN_SPIN_ARROW_WIDTH                6
-
-
-static void NWEnsureGTKRadio            ( int nScreen );
-static void NWEnsureGTKButton           ( int nScreen );
-static void NWEnsureGTKCheck            ( int nScreen );
-static void NWEnsureGTKScrollbars       ( int nScreen );
-static void NWEnsureGTKArrow            ( int nScreen );
-static void NWEnsureGTKEditBox          ( int nScreen );
-static void NWEnsureGTKSpinButton       ( int nScreen );
-static void NWEnsureGTKNotebook         ( int nScreen );
-static void NWEnsureGTKOptionMenu       ( int nScreen );
-static void NWEnsureGTKCombo            ( int nScreen );
-static void NWEnsureGTKScrolledWindow   ( int nScreen );
-static void NWEnsureGTKToolbar          ( int nScreen );
+#define MIN_ARROW_SIZE					11
+#define BTN_CHILD_SPACING				1
+#define MIN_SPIN_ARROW_WIDTH				6
+
+
+static void NWEnsureGTKRadio			( int nScreen );
+static void NWEnsureGTKButton			( int nScreen );
+static void NWEnsureGTKCheck			( int nScreen );
+static void NWEnsureGTKScrollbars		( int nScreen );
+static void NWEnsureGTKArrow			( int nScreen );
+static void NWEnsureGTKEditBox			( int nScreen );
+static void NWEnsureGTKSpinButton		( int nScreen );
+static void NWEnsureGTKNotebook			( int nScreen );
+static void NWEnsureGTKOptionMenu		( int nScreen );
+static void NWEnsureGTKCombo			( int nScreen );
+static void NWEnsureGTKScrolledWindow	( int nScreen );
+static void NWEnsureGTKToolbar			( int nScreen );
 static void NWEnsureGTKMenubar          ( int nScreen );
 static void NWEnsureGTKMenu             ( int nScreen );
 static void NWEnsureGTKTooltip          ( int nScreen );
@@ -197,7 +197,7 @@ static Rectangle NWGetButtonArea( int nScreen, ControlType nType, ControlPart nP
 static Rectangle NWGetEditBoxPixmapRect( int nScreen, ControlType nType, ControlPart nPart, Rectangle aAreaRect, ControlState nState,
                             const ImplControlValue& aValue, const OUString& rCaption );
 
-static void NWPaintOneEditBox( int nScreen, GdkDrawable * gdkDrawable, GdkRectangle *gdkRect,
+static void NWPaintOneEditBox( int nScreen, GdkDrawable * gdkDrawable, GdkRectangle *gdkRect, 
                                ControlType nType, ControlPart nPart, Rectangle aEditBoxRect,
                                ControlState nState, const ImplControlValue& aValue,
                                const OUString& rCaption );
@@ -229,9 +229,9 @@ static Rectangle NWGetToolbarRect( int nScreen,
                                    const OUString& rCaption );
 //---
 
-static Rectangle NWGetScrollButtonRect( int nScreen, ControlPart nPart, Rectangle aAreaRect );
+static Rectangle NWGetScrollButtonRect(	int nScreen, ControlPart nPart, Rectangle aAreaRect );
 //---
-
+                                
 /*********************************************************
  * PixmapCache
  *********************************************************/
@@ -248,7 +248,7 @@ public:
     ControlState m_nState;
     Rectangle   m_pixmapRect;
     GdkPixmap*  m_pixmap;
-
+    
     NWPixmapCacheData() : m_nType(0), m_nState(0), m_pixmap(0) {}
     ~NWPixmapCacheData()
         { SetPixmap( NULL ); };
@@ -264,15 +264,15 @@ class NWPixmapCache
 public:
     NWPixmapCache( int nScreen );
     ~NWPixmapCache();
-
+    
     void SetSize( int n)
         { delete [] pData; m_idx = 0; m_size = n; pData = new NWPixmapCacheData[m_size]; }
     int GetSize() { return m_size; }
-
+    
     BOOL Find( ControlType aType, ControlState aState, const Rectangle& r_pixmapRect, GdkPixmap** pPixmap );
     void Fill( ControlType aType, ControlState aState, const Rectangle& r_pixmapRect, GdkPixmap* pPixmap );
-
-    void ThemeChanged();
+    
+    void ThemeChanged();    
 };
 
 class NWPixmapCacheList
@@ -291,9 +291,9 @@ void NWPixmapCacheData::SetPixmap( GdkPixmap* pPixmap )
 {
     if( m_pixmap )
         g_object_unref( m_pixmap );
-
+    
     m_pixmap = pPixmap;
-
+    
     if( m_pixmap )
         g_object_ref( m_pixmap );
 }
@@ -307,7 +307,7 @@ NWPixmapCache::NWPixmapCache( int nScreen )
     pData = NULL;
     if( gWidgetData[m_screen].gNWPixmapCacheList )
         gWidgetData[m_screen].gNWPixmapCacheList->AddCache(this);
-}
+} 
 NWPixmapCache::~NWPixmapCache()
 {
     if( gWidgetData[m_screen].gNWPixmapCacheList )
@@ -329,9 +329,9 @@ BOOL  NWPixmapCache::Find( ControlType aType, ControlState aState, const Rectang
     for(i=0; i<m_size; i++)
     {
         if( pData[i].m_nType == aType &&
-            pData[i].m_nState == aState &&
-            pData[i].m_pixmapRect.GetWidth() == r_pixmapRect.GetWidth() &&
-            pData[i].m_pixmapRect.GetHeight() == r_pixmapRect.GetHeight() &&
+            pData[i].m_nState == aState &&    
+            pData[i].m_pixmapRect.GetWidth() == r_pixmapRect.GetWidth() &&    
+            pData[i].m_pixmapRect.GetHeight() == r_pixmapRect.GetHeight() &&    
             pData[i].m_pixmap != NULL )
         {
             *pPixmap = pData[i].m_pixmap;
@@ -344,7 +344,7 @@ BOOL  NWPixmapCache::Find( ControlType aType, ControlState aState, const Rectang
 void NWPixmapCache::Fill( ControlType aType, ControlState aState, const Rectangle& r_pixmapRect, GdkPixmap* pPixmap )
 {
     if( !(aState & CTRL_CACHING_ALLOWED) )
-        return;
+        return; 
 
     aState &= ~CTRL_CACHING_ALLOWED; // mask clipping flag
     m_idx = (m_idx+1) % m_size; // just wrap
@@ -382,15 +382,15 @@ void NWPixmapCacheList::ThemeChanged( )
  *********************************************************/
 inline void NW_gtk_border_set_from_border( GtkBorder& aDst, const GtkBorder * pSrc )
 {
-    aDst.left       = pSrc->left;
-    aDst.top        = pSrc->top;
-    aDst.right  = pSrc->right;
-    aDst.bottom = pSrc->bottom;
+    aDst.left		= pSrc->left;
+    aDst.top		= pSrc->top;
+    aDst.right	= pSrc->right;
+    aDst.bottom	= pSrc->bottom;
 }
 
 
 /*********************************************************
- * Initialize GTK and local stuff
+ * Initialize GTK and local stuff                         
  *********************************************************/
 void GtkData::initNWF( void )
 {
@@ -401,22 +401,22 @@ void GtkData::initNWF( void )
 
     // draw separate buttons for toolbox dropdown items
     pSVData->maNWFData.mbToolboxDropDownSeparate = true;
-
+    
     // small extra border around menu items
     pSVData->maNWFData.mnMenuFormatExtraBorder = 1;
-
+    
     // draw toolbars in separate lines
     pSVData->maNWFData.mbDockingAreaSeparateTB = true;
-
+    
     // open first menu on F10
     pSVData->maNWFData.mbOpenMenuOnF10 = true;
-
+    
     int nScreens = GetX11SalData()->GetDisplay()->GetScreenCount();
     gWidgetData = std::vector<NWFWidgetData>( nScreens );
     for( int i = 0; i < nScreens; i++ )
         gWidgetData[i].gNWPixmapCacheList = new NWPixmapCacheList;
 
-
+    
     if( SalGetDesktopEnvironment().equalsAscii( "KDE" ) )
     {
         // #i97196# ensure a widget exists and the style engine was loaded
@@ -441,7 +441,7 @@ void GtkData::initNWF( void )
 
 
 /*********************************************************
- * Release GTK and local stuff
+ * Release GTK and local stuff                         
  *********************************************************/
 void GtkData::deInitNWF( void )
 {
@@ -536,40 +536,40 @@ void GtkSalGraphics::copyBits( const SalTwoRect* pPosAry,
 BOOL GtkSalGraphics::IsNativeControlSupported( ControlType nType, ControlPart nPart )
 {
     if (
-        ((nType==CTRL_PUSHBUTTON)  && (nPart==PART_ENTIRE_CONTROL))     ||
-         ((nType==CTRL_RADIOBUTTON) && (nPart==PART_ENTIRE_CONTROL))        ||
-        ((nType==CTRL_CHECKBOX)    && (nPart==PART_ENTIRE_CONTROL))     ||
+        ((nType==CTRL_PUSHBUTTON)  && (nPart==PART_ENTIRE_CONTROL)) 	||
+         ((nType==CTRL_RADIOBUTTON) && (nPart==PART_ENTIRE_CONTROL))		||
+        ((nType==CTRL_CHECKBOX)    && (nPart==PART_ENTIRE_CONTROL))		||
         ((nType==CTRL_SCROLLBAR) &&
                 (  (nPart==PART_DRAW_BACKGROUND_HORZ)
                 || (nPart==PART_DRAW_BACKGROUND_VERT)
                 || (nPart==PART_ENTIRE_CONTROL)
-                || (nPart==HAS_THREE_BUTTONS) )                 )   ||
+                || (nPart==HAS_THREE_BUTTONS) )  				)	||
         ((nType==CTRL_EDITBOX) &&
                 (  (nPart==PART_ENTIRE_CONTROL)
-                || (nPart==HAS_BACKGROUND_TEXTURE) )            )   ||
+                || (nPart==HAS_BACKGROUND_TEXTURE) ) 			)	||
         ((nType==CTRL_MULTILINE_EDITBOX) &&
                 (  (nPart==PART_ENTIRE_CONTROL)
-                || (nPart==HAS_BACKGROUND_TEXTURE) )            )   ||
+                || (nPart==HAS_BACKGROUND_TEXTURE) ) 			)	||
         ((nType==CTRL_SPINBOX) &&
                 (  (nPart==PART_ENTIRE_CONTROL)
                 || (nPart==PART_ALL_BUTTONS)
-                || (nPart==HAS_BACKGROUND_TEXTURE) )            )   ||
+                || (nPart==HAS_BACKGROUND_TEXTURE) )			)	||
         ((nType==CTRL_SPINBUTTONS) &&
                 (  (nPart==PART_ENTIRE_CONTROL)
-                || (nPart==PART_ALL_BUTTONS)    )               )   ||
+                || (nPart==PART_ALL_BUTTONS)	)				)	||
         ((nType==CTRL_COMBOBOX) &&
                 (  (nPart==PART_ENTIRE_CONTROL)
-                || (nPart==HAS_BACKGROUND_TEXTURE)  )           )   ||
+                || (nPart==HAS_BACKGROUND_TEXTURE)	)			)	||
         (((nType==CTRL_TAB_ITEM) || (nType==CTRL_TAB_PANE) ||
           (nType==CTRL_TAB_BODY) || (nType==CTRL_FIXEDBORDER)) &&
                 (  (nPart==PART_ENTIRE_CONTROL)
-                || (nPart==PART_TABS_DRAW_RTL) )                )   ||
+                || (nPart==PART_TABS_DRAW_RTL) )				)	||
         ((nType==CTRL_LISTBOX) &&
                 (  (nPart==PART_ENTIRE_CONTROL)
                 || (nPart==PART_WINDOW)
-                || (nPart==HAS_BACKGROUND_TEXTURE) )            )   ||
+                || (nPart==HAS_BACKGROUND_TEXTURE) )			)   ||
         ((nType == CTRL_TOOLBAR) &&
-                 (  (nPart==PART_ENTIRE_CONTROL)
+                 (	(nPart==PART_ENTIRE_CONTROL)
                 ||  (nPart==PART_DRAW_BACKGROUND_HORZ)
                 ||  (nPart==PART_DRAW_BACKGROUND_VERT)
                 ||  (nPart==PART_THUMB_HORZ)
@@ -615,11 +615,11 @@ BOOL GtkSalGraphics::IsNativeControlSupported( ControlType nType, ControlPart nP
  *
  *  returns whether bIsInside was really set.
  */
-BOOL GtkSalGraphics::hitTestNativeControl( ControlType      nType,
-                                ControlPart     nPart,
-                                const Rectangle&        rControlRegion,
-                                const Point&        aPos,
-                                BOOL&           rIsInside )
+BOOL GtkSalGraphics::hitTestNativeControl( ControlType		nType,
+                                ControlPart		nPart,
+                                const Rectangle&		rControlRegion,
+                                const Point&		aPos,
+                                BOOL&			rIsInside )
 {
     if ( ( nType == CTRL_SCROLLBAR ) &&
          ( ( nPart == PART_BUTTON_UP ) ||
@@ -634,7 +634,7 @@ BOOL GtkSalGraphics::hitTestNativeControl( ControlType      nType,
         gboolean has_forward2;
         gboolean has_backward;
         gboolean has_backward2;
-
+        
         gtk_widget_style_get( gWidgetData[m_nScreen].gScrollHorizWidget, "has-forward-stepper", &has_forward,
                                         "has-secondary-forward-stepper", &has_forward2,
                                         "has-backward-stepper", &has_backward,
@@ -721,11 +721,11 @@ BOOL GtkSalGraphics::hitTestNativeControl( ControlType      nType,
  *
  *  Draws the requested control described by nPart/nState.
  *
- *  rControlRegion: The bounding region of the complete control in VCL frame coordinates.
- *  aValue:         An optional value (tristate/numerical/string)
- *  rCaption:   A caption or title string (like button text etc)
+ *  rControlRegion:	The bounding region of the complete control in VCL frame coordinates.
+ *  aValue:  		An optional value (tristate/numerical/string)
+ *  rCaption:  	A caption or title string (like button text etc)
  */
-BOOL GtkSalGraphics::drawNativeControl( ControlType nType,
+BOOL GtkSalGraphics::drawNativeControl(	ControlType nType,
                             ControlPart nPart,
                             const Rectangle& rControlRegion,
                             ControlState nState,
@@ -738,11 +738,11 @@ BOOL GtkSalGraphics::drawNativeControl( ControlType nType,
         return drawNativeMixedStateCheck( nType, nPart, rControlRegion, nState, aValue, rCaption );
     }
 
-    BOOL            returnVal = FALSE;
+    BOOL			returnVal = FALSE;
     // get a GC with current clipping region set
     SelectFont();
-
-
+    
+    
     // theme changed ?
     if( GtkSalGraphics::bThemeChanged )
     {
@@ -750,15 +750,15 @@ BOOL GtkSalGraphics::drawNativeControl( ControlType nType,
         for( unsigned int i = 0; i < gWidgetData.size(); i++ )
             if( gWidgetData[i].gNWPixmapCacheList )
                 gWidgetData[i].gNWPixmapCacheList->ThemeChanged();
-        GtkSalGraphics::bThemeChanged = FALSE;
+        GtkSalGraphics::bThemeChanged = FALSE;    
     }
-
+    
     Rectangle aCtrlRect( rControlRegion );
     Region aClipRegion( m_aClipRegion );
     if( aClipRegion.IsNull() )
         aClipRegion = aCtrlRect;
-
-    clipList aClip;
+            
+    clipList aClip;        
     GdkDrawable* gdkDrawable = GDK_DRAWABLE( GetGdkWindow() );
     GdkPixmap* pixmap = NULL;
     Rectangle aPixmapRect;
@@ -769,7 +769,7 @@ BOOL GtkSalGraphics::drawNativeControl( ControlType nType,
         && nType != CTRL_TAB_PANE
         && nType != CTRL_PROGRESS
         && ! (bToolbarGripWorkaround && nType == CTRL_TOOLBAR && (nPart == PART_THUMB_HORZ || nPart == PART_THUMB_VERT) )
-        )
+        ) 
     {
         // make pixmap a little larger since some themes draw decoration
         // outside the rectangle, see e.g. checkbox
@@ -795,7 +795,7 @@ BOOL GtkSalGraphics::drawNativeControl( ControlType nType,
         }
         aClipRegion.EndEnumRects( aHdl );
     }
-
+    
     if ( (nType==CTRL_PUSHBUTTON) && (nPart==PART_ENTIRE_CONTROL) )
     {
         returnVal = NWPaintGTKButton( gdkDrawable, nType, nPart, aCtrlRect, aClip, nState, aValue, rCaption );
@@ -885,7 +885,7 @@ BOOL GtkSalGraphics::drawNativeControl( ControlType nType,
     {
         returnVal = NWPaintGTKSlider( gdkDrawable, nType, nPart, aCtrlRect, aClip, nState, aValue, rCaption );
     }
-
+    
     if( pixmap )
     {
         returnVal = NWRenderPixmapToScreen( pixmap, aPixmapRect ) && returnVal;
@@ -895,7 +895,7 @@ BOOL GtkSalGraphics::drawNativeControl( ControlType nType,
     return( returnVal );
 }
 
-BOOL GtkSalGraphics::drawNativeMixedStateCheck( ControlType nType,
+BOOL GtkSalGraphics::drawNativeMixedStateCheck(	ControlType nType,
                                                 ControlPart nPart,
                                                 const Rectangle& rControlRegion,
                                                 ControlState nState,
@@ -907,7 +907,7 @@ BOOL GtkSalGraphics::drawNativeMixedStateCheck( ControlType nType,
     // do this via pixmap since some themes don't care for regions
     bool bOldNeedPixmapPaint = bNeedPixmapPaint;
     bNeedPixmapPaint = true;
-
+    
     Rectangle aCtrlRect = rControlRegion;
     BOOL      returnVal = FALSE;
     SelectFont();
@@ -921,9 +921,9 @@ BOOL GtkSalGraphics::drawNativeMixedStateCheck( ControlType nType,
     XUnionRectWithRegion( &aXRect, aRegion, aRegion );
     SetClipRegion( pFontGC_, aRegion );
     XDestroyRegion( aRegion );
-
+    
     returnVal = drawNativeControl( nType, nPart, rControlRegion, nState, aValue, rCaption );
-
+    
     if( returnVal )
     {
         // draw lower half in on state
@@ -935,7 +935,7 @@ BOOL GtkSalGraphics::drawNativeMixedStateCheck( ControlType nType,
         XDestroyRegion( aRegion );
         returnVal = drawNativeControl( nType, nPart, rControlRegion, nState, aValue, rCaption );
     }
-
+    
     // clean up
     bNeedPixmapPaint = bOldNeedPixmapPaint;
     const_cast<ImplControlValue&>(aValue).setTristateVal( BUTTONVALUE_MIXED );
@@ -950,11 +950,11 @@ BOOL GtkSalGraphics::drawNativeMixedStateCheck( ControlType nType,
  *  OPTIONAL.  Draws the requested text for the control described by nPart/nState.
  *     Used if text not drawn by DrawNativeControl().
  *
- *  rControlRegion: The bounding region of the complete control in VCL frame coordinates.
- *  aValue:         An optional value (tristate/numerical/string)
- *  rCaption:   A caption or title string (like button text etc)
+ *  rControlRegion:	The bounding region of the complete control in VCL frame coordinates.
+ *  aValue:  		An optional value (tristate/numerical/string)
+ *  rCaption:  	A caption or title string (like button text etc)
  */
-BOOL GtkSalGraphics::drawNativeControlText( ControlType,
+BOOL GtkSalGraphics::drawNativeControlText(	ControlType,
                                 ControlPart,
                                 const Rectangle&,
                                 ControlState,
@@ -974,9 +974,9 @@ BOOL GtkSalGraphics::drawNativeControlText( ControlType,
  *  within the control that can be safely drawn into without drawing over
  *  the borders of the control.
  *
- *  rControlRegion: The bounding region of the control in VCL frame coordinates.
- *  aValue:     An optional value (tristate/numerical/string)
- *  rCaption:       A caption or title string (like button text etc)
+ *  rControlRegion:	The bounding region of the control in VCL frame coordinates.
+ *  aValue:		An optional value (tristate/numerical/string)
+ *  rCaption:		A caption or title string (like button text etc)
  */
 BOOL GtkSalGraphics::getNativeControlRegion(  ControlType nType,
                                 ControlPart nPart,
@@ -996,7 +996,7 @@ BOOL GtkSalGraphics::getNativeControlRegion(  ControlType nType,
         rNativeBoundingRegion = NWGetButtonArea( m_nScreen, nType, nPart, rControlRegion,
         nState, aValue, rCaption );
         rNativeContentRegion = rControlRegion;
-
+        
         returnVal = TRUE;
     }
     if ( (nType==CTRL_COMBOBOX) && ((nPart==PART_BUTTON_DOWN) || (nPart==PART_SUB_EDIT)) )
@@ -1004,16 +1004,16 @@ BOOL GtkSalGraphics::getNativeControlRegion(  ControlType nType,
         rNativeBoundingRegion = NWGetComboBoxButtonRect( m_nScreen, nType, nPart, rControlRegion, nState,
         aValue, rCaption );
         rNativeContentRegion = rNativeBoundingRegion;
-
+        
         returnVal = TRUE;
     }
     if ( (nType==CTRL_SPINBOX) && ((nPart==PART_BUTTON_UP) || (nPart==PART_BUTTON_DOWN) || (nPart==PART_SUB_EDIT)) )
     {
-
+        
         rNativeBoundingRegion = NWGetSpinButtonRect( m_nScreen, nType, nPart, rControlRegion, nState,
         aValue, rCaption );
         rNativeContentRegion = rNativeBoundingRegion;
-
+        
         returnVal = TRUE;
     }
     if ( (nType==CTRL_LISTBOX) && ((nPart==PART_BUTTON_DOWN) || (nPart==PART_SUB_EDIT)) )
@@ -1021,13 +1021,13 @@ BOOL GtkSalGraphics::getNativeControlRegion(  ControlType nType,
         rNativeBoundingRegion = NWGetListBoxButtonRect( m_nScreen, nType, nPart, rControlRegion, nState,
         aValue, rCaption );
         rNativeContentRegion = rNativeBoundingRegion;
-
+        
         returnVal = TRUE;
     }
     if ( (nType==CTRL_TOOLBAR) &&
-        ((nPart==PART_DRAW_BACKGROUND_HORZ) ||
-        (nPart==PART_DRAW_BACKGROUND_VERT)  ||
-        (nPart==PART_THUMB_HORZ)            ||
+        ((nPart==PART_DRAW_BACKGROUND_HORZ)	||
+        (nPart==PART_DRAW_BACKGROUND_VERT)	||
+        (nPart==PART_THUMB_HORZ)			||
         (nPart==PART_THUMB_VERT)            ||
         (nPart==PART_BUTTON)
         ))
@@ -1041,7 +1041,7 @@ BOOL GtkSalGraphics::getNativeControlRegion(  ControlType nType,
     {
         rNativeBoundingRegion = NWGetScrollButtonRect( m_nScreen, nPart, rControlRegion );
         rNativeContentRegion = rNativeBoundingRegion;
-
+        
         returnVal = TRUE;
     }
     if( (nType == CTRL_MENUBAR) && (nPart == PART_ENTIRE_CONTROL) )
@@ -1132,7 +1132,7 @@ BOOL GtkSalGraphics::getNativeControlRegion(  ControlType nType,
         rNativeBoundingRegion = rNativeContentRegion = aRect;
         returnVal = TRUE;
     }
-
+        
     return( returnVal );
 }
 
@@ -1143,22 +1143,22 @@ BOOL GtkSalGraphics::getNativeControlRegion(  ControlType nType,
 BOOL GtkSalGraphics::NWPaintGTKButton(
             GdkDrawable* gdkDrawable,
             ControlType, ControlPart,
-            const Rectangle& rControlRectangle,
+            const Rectangle& rControlRectangle,            
             const clipList& rClipList,
             ControlState nState, const ImplControlValue&,
             const OUString& )
 {
-    GtkStateType    stateType;
-    GtkShadowType   shadowType;
-    gboolean        interiorFocus;
-    gint            focusWidth;
-    gint            focusPad;
-    BOOL            bDrawFocus = TRUE;
-    gint            x, y, w, h;
-    GtkBorder       aDefBorder;
-    GtkBorder*      pBorder;
-    GdkRectangle    clipRect;
-
+    GtkStateType	stateType;
+    GtkShadowType	shadowType;
+    gboolean		interiorFocus;
+    gint			focusWidth;
+    gint			focusPad;
+    BOOL			bDrawFocus = TRUE;
+    gint			x, y, w, h;
+    GtkBorder		aDefBorder;
+    GtkBorder*		pBorder;
+    GdkRectangle	clipRect;
+    
     NWEnsureGTKButton( m_nScreen );
     NWConvertVCLStateToGTKState( nState, &stateType, &shadowType );
 
@@ -1168,10 +1168,10 @@ BOOL GtkSalGraphics::NWPaintGTKButton(
     h = rControlRectangle.GetHeight();
 
     // Grab some button style attributes
-    gtk_widget_style_get( gWidgetData[m_nScreen].gBtnWidget,    "focus-line-width", &focusWidth,
-                                "focus-padding",    &focusPad,
-                                 "interior_focus",  &interiorFocus,
-                                "default_border",   &pBorder,
+    gtk_widget_style_get( gWidgetData[m_nScreen].gBtnWidget,	"focus-line-width",	&focusWidth,
+                                "focus-padding", 	&focusPad,
+                                 "interior_focus",	&interiorFocus,
+                                "default_border",	&pBorder,
                                 (char *)NULL );
 
     // Make sure the border values exist, otherwise use some defaults
@@ -1211,17 +1211,17 @@ BOOL GtkSalGraphics::NWPaintGTKButton(
         clipRect.y = it->Top();
         clipRect.width = it->GetWidth();
         clipRect.height = it->GetHeight();
-
+        
         // Buttons must paint opaque since some themes have alpha-channel enabled buttons
-        gtk_paint_flat_box( gWidgetData[m_nScreen].gBtnWidget->style, gdkDrawable, GTK_STATE_NORMAL, GTK_SHADOW_NONE,
+        gtk_paint_flat_box( gWidgetData[m_nScreen].gBtnWidget->style, gdkDrawable, GTK_STATE_NORMAL, GTK_SHADOW_NONE, 
                             &clipRect, m_pWindow, "base", x, y, w, h );
-
+        
         if ( (nState & CTRL_STATE_DEFAULT) && (GTK_BUTTON(gWidgetData[m_nScreen].gBtnWidget)->relief == GTK_RELIEF_NORMAL) )
         {
-            gtk_paint_box( gWidgetData[m_nScreen].gBtnWidget->style, gdkDrawable, GTK_STATE_NORMAL, GTK_SHADOW_IN,
+            gtk_paint_box( gWidgetData[m_nScreen].gBtnWidget->style, gdkDrawable, GTK_STATE_NORMAL, GTK_SHADOW_IN, 
                            &clipRect, gWidgetData[m_nScreen].gBtnWidget, "buttondefault", x, y, w, h );
         }
-
+        
         if ( (GTK_BUTTON(gWidgetData[m_nScreen].gBtnWidget)->relief != GTK_RELIEF_NONE)
             || (nState & CTRL_STATE_PRESSED)
             || (nState & CTRL_STATE_ROLLOVER) )
@@ -1261,21 +1261,21 @@ static Rectangle NWGetButtonArea( int nScreen,
                                   ControlType, ControlPart, Rectangle aAreaRect, ControlState nState,
                                   const ImplControlValue&, const OUString& )
 {
-    gboolean        interiorFocus;
-    gint            focusWidth;
-    gint            focusPad;
-    GtkBorder       aDefBorder;
-    GtkBorder * pBorder;
-    BOOL            bDrawFocus = TRUE;
-    Rectangle       aRect;
-    gint            x, y, w, h;
+    gboolean		interiorFocus;
+    gint			focusWidth;
+    gint			focusPad;
+    GtkBorder		aDefBorder;
+    GtkBorder *	pBorder;
+    BOOL			bDrawFocus = TRUE;
+    Rectangle		aRect;
+    gint			x, y, w, h;
 
     NWEnsureGTKButton( nScreen );
     gtk_widget_style_get( gWidgetData[nScreen].gBtnWidget,
-                                "focus-line-width", &focusWidth,
-                                "focus-padding",    &focusPad,
-                                 "interior_focus",  &interiorFocus,
-                                "default_border",   &pBorder,
+                                "focus-line-width",	&focusWidth,
+                                "focus-padding", 	&focusPad,
+                                 "interior_focus",	&interiorFocus,
+                                "default_border",	&pBorder,
                                 (char *)NULL );
 
     // Make sure the border values exist, otherwise use some defaults
@@ -1314,16 +1314,16 @@ BOOL GtkSalGraphics::NWPaintGTKRadio( GdkDrawable* gdkDrawable,
                                       ControlType, ControlPart,
                                       const Rectangle& rControlRectangle,
                                       const clipList& rClipList,
-                                      ControlState nState,
+                                      ControlState nState, 
                                       const ImplControlValue& aValue,
                                       const OUString& )
 {
-    GtkStateType    stateType;
-    GtkShadowType   shadowType;
-    BOOL            isChecked = (aValue.getTristateVal()==BUTTONVALUE_ON);
+    GtkStateType	stateType;
+    GtkShadowType	shadowType;
+    BOOL			isChecked = (aValue.getTristateVal()==BUTTONVALUE_ON);
     gint            x, y;
-    GdkRectangle    clipRect;
-
+    GdkRectangle	clipRect;
+   
     NWEnsureGTKButton( m_nScreen );
     NWEnsureGTKRadio( m_nScreen );
     NWConvertVCLStateToGTKState( nState, &stateType, &shadowType );
@@ -1333,7 +1333,7 @@ BOOL GtkSalGraphics::NWPaintGTKRadio( GdkDrawable* gdkDrawable,
 
     x = rControlRectangle.Left() + (rControlRectangle.GetWidth()-indicator_size)/2;
     y = rControlRectangle.Top() + (rControlRectangle.GetHeight()-indicator_size)/2;
-
+    
     // Set the shadow based on if checked or not so we get a freakin checkmark.
     shadowType = isChecked ? GTK_SHADOW_IN : GTK_SHADOW_OUT;
     NWSetWidgetState( gWidgetData[m_nScreen].gRadioWidget, nState, stateType );
@@ -1341,7 +1341,7 @@ BOOL GtkSalGraphics::NWPaintGTKRadio( GdkDrawable* gdkDrawable,
 
     // GTK enforces radio groups, so that if we don't have 2 buttons in the group,
     // the single button will always be active.  So we have to have 2 buttons.
-
+    
     // #i59666# set the members directly where we should use
     // gtk_toggle_button_set_active. reason: there are animated themes
     // which are in active state only after a while leading to painting
@@ -1357,12 +1357,12 @@ BOOL GtkSalGraphics::NWPaintGTKRadio( GdkDrawable* gdkDrawable,
         clipRect.y = it->Top();
         clipRect.width = it->GetWidth();
         clipRect.height = it->GetHeight();
-
-        gtk_paint_option( gWidgetData[m_nScreen].gRadioWidget->style, gdkDrawable, stateType, shadowType,
+        
+        gtk_paint_option( gWidgetData[m_nScreen].gRadioWidget->style, gdkDrawable, stateType, shadowType, 
                           &clipRect, gWidgetData[m_nScreen].gRadioWidget, "radiobutton",
                           x, y, indicator_size, indicator_size );
     }
-
+    
     return( TRUE );
 }
 
@@ -1372,15 +1372,15 @@ BOOL GtkSalGraphics::NWPaintGTKCheck( GdkDrawable* gdkDrawable,
                                       ControlType, ControlPart,
                                       const Rectangle& rControlRectangle,
                                       const clipList& rClipList,
-                                      ControlState nState,
+                                      ControlState nState, 
                                       const ImplControlValue& aValue,
                                       const OUString& )
 {
-    GtkStateType    stateType;
-    GtkShadowType   shadowType;
-    BOOL            isChecked = (aValue.getTristateVal()==BUTTONVALUE_ON) ? TRUE : FALSE;
-    GdkRectangle    clipRect;
-    gint            x,y;
+    GtkStateType	stateType;
+    GtkShadowType	shadowType;
+    BOOL			isChecked = (aValue.getTristateVal()==BUTTONVALUE_ON) ? TRUE : FALSE;
+    GdkRectangle	clipRect;
+    gint			x,y;
 
     NWEnsureGTKButton( m_nScreen );
     NWEnsureGTKCheck( m_nScreen );
@@ -1391,7 +1391,7 @@ BOOL GtkSalGraphics::NWPaintGTKCheck( GdkDrawable* gdkDrawable,
 
     x = rControlRectangle.Left() + (rControlRectangle.GetWidth()-indicator_size)/2;
     y = rControlRectangle.Top() + (rControlRectangle.GetHeight()-indicator_size)/2;
-
+    
     // Set the shadow based on if checked or not so we get a checkmark.
     shadowType = isChecked ? GTK_SHADOW_IN : GTK_SHADOW_OUT;
     NWSetWidgetState( gWidgetData[m_nScreen].gCheckWidget, nState, stateType );
@@ -1403,8 +1403,8 @@ BOOL GtkSalGraphics::NWPaintGTKCheck( GdkDrawable* gdkDrawable,
         clipRect.y = it->Top();
         clipRect.width = it->GetWidth();
         clipRect.height = it->GetHeight();
-
-        gtk_paint_check( gWidgetData[m_nScreen].gCheckWidget->style, gdkDrawable, stateType, shadowType,
+        
+        gtk_paint_check( gWidgetData[m_nScreen].gCheckWidget->style, gdkDrawable, stateType, shadowType, 
                          &clipRect, gWidgetData[m_nScreen].gCheckWidget, "checkbutton",
                          x, y, indicator_size, indicator_size );
     }
@@ -1428,40 +1428,40 @@ static void NWCalcArrowRect( const Rectangle& rButton, Rectangle& rArrow )
 BOOL GtkSalGraphics::NWPaintGTKScrollbar( ControlType, ControlPart nPart,
                                           const Rectangle& rControlRectangle,
                                           const clipList&,
-                                          ControlState nState,
+                                          ControlState nState, 
                                           const ImplControlValue& aValue,
                                           const OUString& )
 {
     OSL_ASSERT( aValue.getType() == CTRL_SCROLLBAR );
     const ScrollbarValue* pScrollbarVal = static_cast<const ScrollbarValue *>(&aValue);
     GdkPixmap*      pixmap = NULL;
-    Rectangle       pixmapRect, scrollbarRect;
-    GtkStateType    stateType;
-    GtkShadowType   shadowType;
-    GtkScrollbar *  scrollbarWidget;
-    GtkStyle *  style;
+    Rectangle		pixmapRect, scrollbarRect;
+    GtkStateType	stateType;
+    GtkShadowType	shadowType;
+    GtkScrollbar *	scrollbarWidget;
+    GtkStyle *	style;
     GtkAdjustment* scrollbarValues = NULL;
-    GtkOrientation  scrollbarOrientation;
-    Rectangle       thumbRect = pScrollbarVal->maThumbRect;
-    Rectangle       button11BoundRect = pScrollbarVal->maButton1Rect;   // backward
-    Rectangle       button22BoundRect = pScrollbarVal->maButton2Rect;   // forward
-    Rectangle       button12BoundRect = pScrollbarVal->maButton1Rect;   // secondary forward
-    Rectangle       button21BoundRect = pScrollbarVal->maButton2Rect;   // secondary backward
-    GtkArrowType    button1Type;                                        // backward
-    GtkArrowType    button2Type;                                        // forward
-    gchar *     scrollbarTagH = (gchar *) "hscrollbar";
-    gchar *     scrollbarTagV = (gchar *) "vscrollbar";
-    gchar *     scrollbarTag = NULL;
-    Rectangle       arrowRect;
-    gint            slider_width = 0;
-    gint            stepper_size = 0;
-    gint            stepper_spacing = 0;
-    gint            trough_border = 0;
-    gint            min_slider_length = 0;
-    gint            vShim = 0;
-    gint            hShim = 0;
-    gint            x,y,w,h;
-
+    GtkOrientation	scrollbarOrientation;
+    Rectangle		thumbRect = pScrollbarVal->maThumbRect;
+    Rectangle		button11BoundRect = pScrollbarVal->maButton1Rect;   // backward
+    Rectangle		button22BoundRect = pScrollbarVal->maButton2Rect;   // forward
+    Rectangle		button12BoundRect = pScrollbarVal->maButton1Rect;   // secondary forward
+    Rectangle		button21BoundRect = pScrollbarVal->maButton2Rect;   // secondary backward
+    GtkArrowType	button1Type;                                        // backward
+    GtkArrowType	button2Type;                                        // forward
+    gchar *		scrollbarTagH = (gchar *) "hscrollbar";
+    gchar *		scrollbarTagV = (gchar *) "vscrollbar";
+    gchar *		scrollbarTag = NULL;
+    Rectangle		arrowRect;
+    gint			slider_width = 0;
+    gint			stepper_size = 0;
+    gint			stepper_spacing = 0;
+    gint			trough_border = 0;
+    gint			min_slider_length = 0;
+    gint			vShim = 0;
+    gint			hShim = 0;
+    gint			x,y,w,h;
+    
     // make controlvalue rectangles relative to area
     thumbRect.Move( -rControlRectangle.Left(), -rControlRectangle.Top() );
     button11BoundRect.Move( -rControlRectangle.Left(), -rControlRectangle.Top() );
@@ -1472,7 +1472,7 @@ BOOL GtkSalGraphics::NWPaintGTKScrollbar( ControlType, ControlPart nPart,
     NWEnsureGTKButton( m_nScreen );
     NWEnsureGTKScrollbars( m_nScreen );
     NWEnsureGTKArrow( m_nScreen );
-
+ 
     // Find the overall bounding rect of the control
     pixmapRect = rControlRectangle;
     pixmapRect.SetSize( Size( pixmapRect.GetWidth() + 1,
@@ -1493,7 +1493,7 @@ BOOL GtkSalGraphics::NWPaintGTKScrollbar( ControlType, ControlPart nPart,
     gboolean has_forward2;
     gboolean has_backward;
     gboolean has_backward2;
-
+    
     gtk_widget_style_get( gWidgetData[m_nScreen].gScrollHorizWidget, "has-forward-stepper", &has_forward,
                                       "has-secondary-forward-stepper", &has_forward2,
                                       "has-backward-stepper", &has_backward,
@@ -1626,19 +1626,19 @@ BOOL GtkSalGraphics::NWPaintGTKScrollbar( ControlType, ControlPart nPart,
         scrollbarValues->page_size = scrollbarRect.GetHeight() / 2;
     }
     gtk_adjustment_changed( scrollbarValues );
-
+    
     // as multiple paints are required for the scrollbar
     // painting them directly to the window flickers
     pixmap = NWGetPixmapFromScreen( pixmapRect );
     if( ! pixmap )
         return FALSE;
     x = y = 0;
-
+    
     w = pixmapRect.GetWidth();
-    h = pixmapRect.GetHeight();
+    h = pixmapRect.GetHeight();    
 
     GdkDrawable* const &gdkDrawable = GDK_DRAWABLE( pixmap );
-    GdkRectangle* gdkRect = NULL;
+    GdkRectangle* gdkRect = NULL; 
 
     NWConvertVCLStateToGTKState( nState, &stateType, &shadowType );
     NWSetWidgetState( GTK_WIDGET(scrollbarWidget), nState, stateType );
@@ -1646,18 +1646,18 @@ BOOL GtkSalGraphics::NWPaintGTKScrollbar( ControlType, ControlPart nPart,
     style = GTK_WIDGET( scrollbarWidget )->style;
 
     // ----------------- TROUGH
-    gtk_paint_flat_box( gWidgetData[m_nScreen].gBtnWidget->style, gdkDrawable,
+    gtk_paint_flat_box( gWidgetData[m_nScreen].gBtnWidget->style, gdkDrawable, 
                         GTK_STATE_NORMAL, GTK_SHADOW_NONE, gdkRect,
-                        m_pWindow, "base", x, y,
+                        m_pWindow, "base", x, y, 
                         w, h );
-    gtk_paint_box( style, gdkDrawable, GTK_STATE_ACTIVE, GTK_SHADOW_IN,
+    gtk_paint_box( style, gdkDrawable, GTK_STATE_ACTIVE, GTK_SHADOW_IN, 
                    gdkRect, GTK_WIDGET(scrollbarWidget), "trough",
                    x, y,
                    scrollbarRect.GetWidth(), scrollbarRect.GetHeight() );
 
     if ( nState & CTRL_STATE_FOCUSED )
     {
-        gtk_paint_focus( style, gdkDrawable, GTK_STATE_ACTIVE,
+        gtk_paint_focus( style, gdkDrawable, GTK_STATE_ACTIVE, 
                          gdkRect, GTK_WIDGET(scrollbarWidget), "trough",
                          x, y,
                          scrollbarRect.GetWidth(), scrollbarRect.GetHeight() );
@@ -1668,71 +1668,71 @@ BOOL GtkSalGraphics::NWPaintGTKScrollbar( ControlType, ControlPart nPart,
     {
         NWConvertVCLStateToGTKState( pScrollbarVal->mnThumbState, &stateType, &shadowType );
         if ( pScrollbarVal->mnThumbState & CTRL_STATE_PRESSED )  stateType = GTK_STATE_PRELIGHT;
-        gtk_paint_slider( style, gdkDrawable, stateType, GTK_SHADOW_OUT,
+        gtk_paint_slider( style, gdkDrawable, stateType, GTK_SHADOW_OUT, 
                         gdkRect, GTK_WIDGET(scrollbarWidget), "slider",
-                        x+hShim+thumbRect.Left(), y+vShim+thumbRect.Top(),
+                        x+hShim+thumbRect.Left(), y+vShim+thumbRect.Top(), 
                         thumbRect.GetWidth(), thumbRect.GetHeight(), scrollbarOrientation );
     }
     // ----------------- BUTTON 1 //
     if ( has_backward )
     {
         NWConvertVCLStateToGTKState( pScrollbarVal->mnButton1State, &stateType, &shadowType );
-        if ( stateType == GTK_STATE_INSENSITIVE )   stateType = GTK_STATE_NORMAL;
-        gtk_paint_box( style, gdkDrawable, stateType, shadowType,
+        if ( stateType == GTK_STATE_INSENSITIVE )	stateType = GTK_STATE_NORMAL;
+        gtk_paint_box( style, gdkDrawable, stateType, shadowType, 
                        gdkRect, GTK_WIDGET(scrollbarWidget), "stepper",
-                       x+hShim+button11BoundRect.Left(), y+vShim+button11BoundRect.Top(),
+                       x+hShim+button11BoundRect.Left(), y+vShim+button11BoundRect.Top(), 
                        button11BoundRect.GetWidth(), button11BoundRect.GetHeight() );
         // ----------------- ARROW 1
         NWCalcArrowRect( button11BoundRect, arrowRect );
-        gtk_paint_arrow( style, gdkDrawable, stateType, shadowType,
+        gtk_paint_arrow( style, gdkDrawable, stateType, shadowType, 
                          gdkRect, GTK_WIDGET(scrollbarWidget), scrollbarTag, button1Type, TRUE,
-                         x+hShim+arrowRect.Left(), y+vShim+arrowRect.Top(),
+                         x+hShim+arrowRect.Left(), y+vShim+arrowRect.Top(), 
                          arrowRect.GetWidth(), arrowRect.GetHeight() );
     }
     if ( has_forward2 )
     {
         NWConvertVCLStateToGTKState( pScrollbarVal->mnButton2State, &stateType, &shadowType );
-        if ( stateType == GTK_STATE_INSENSITIVE )   stateType = GTK_STATE_NORMAL;
-        gtk_paint_box( style, gdkDrawable, stateType, shadowType,
+        if ( stateType == GTK_STATE_INSENSITIVE )	stateType = GTK_STATE_NORMAL;
+        gtk_paint_box( style, gdkDrawable, stateType, shadowType, 
                        gdkRect, GTK_WIDGET(scrollbarWidget), "stepper",
-                       x+hShim+button12BoundRect.Left(), y+vShim+button12BoundRect.Top(),
+                       x+hShim+button12BoundRect.Left(), y+vShim+button12BoundRect.Top(), 
                        button12BoundRect.GetWidth(), button12BoundRect.GetHeight() );
         // ----------------- ARROW 1
         NWCalcArrowRect( button12BoundRect, arrowRect );
-        gtk_paint_arrow( style, gdkDrawable, stateType, shadowType,
+        gtk_paint_arrow( style, gdkDrawable, stateType, shadowType, 
                          gdkRect, GTK_WIDGET(scrollbarWidget), scrollbarTag, button2Type, TRUE,
-                         x+hShim+arrowRect.Left(), y+vShim+arrowRect.Top(),
+                         x+hShim+arrowRect.Left(), y+vShim+arrowRect.Top(), 
                          arrowRect.GetWidth(), arrowRect.GetHeight() );
     }
     // ----------------- BUTTON 2
     if ( has_backward2 )
     {
         NWConvertVCLStateToGTKState( pScrollbarVal->mnButton1State, &stateType, &shadowType );
-        if ( stateType == GTK_STATE_INSENSITIVE )   stateType = GTK_STATE_NORMAL;
-        gtk_paint_box( style, gdkDrawable, stateType, shadowType, gdkRect,
+        if ( stateType == GTK_STATE_INSENSITIVE )	stateType = GTK_STATE_NORMAL;
+        gtk_paint_box( style, gdkDrawable, stateType, shadowType, gdkRect, 
                        GTK_WIDGET(scrollbarWidget), "stepper",
-                       x+hShim+button21BoundRect.Left(), y+vShim+button21BoundRect.Top(),
+                       x+hShim+button21BoundRect.Left(), y+vShim+button21BoundRect.Top(), 
                        button21BoundRect.GetWidth(), button21BoundRect.GetHeight() );
         // ----------------- ARROW 2
         NWCalcArrowRect( button21BoundRect, arrowRect );
-        gtk_paint_arrow( style, gdkDrawable, stateType, shadowType,
+        gtk_paint_arrow( style, gdkDrawable, stateType, shadowType, 
                          gdkRect, GTK_WIDGET(scrollbarWidget), scrollbarTag, button1Type, TRUE,
-                         x+hShim+arrowRect.Left(), y+vShim+arrowRect.Top(),
+                         x+hShim+arrowRect.Left(), y+vShim+arrowRect.Top(), 
                          arrowRect.GetWidth(), arrowRect.GetHeight() );
     }
     if ( has_forward )
     {
         NWConvertVCLStateToGTKState( pScrollbarVal->mnButton2State, &stateType, &shadowType );
-        if ( stateType == GTK_STATE_INSENSITIVE )   stateType = GTK_STATE_NORMAL;
-        gtk_paint_box( style, gdkDrawable, stateType, shadowType, gdkRect,
+        if ( stateType == GTK_STATE_INSENSITIVE )	stateType = GTK_STATE_NORMAL;
+        gtk_paint_box( style, gdkDrawable, stateType, shadowType, gdkRect, 
                        GTK_WIDGET(scrollbarWidget), "stepper",
-                       x+hShim+button22BoundRect.Left(), y+vShim+button22BoundRect.Top(),
+                       x+hShim+button22BoundRect.Left(), y+vShim+button22BoundRect.Top(), 
                        button22BoundRect.GetWidth(), button22BoundRect.GetHeight() );
         // ----------------- ARROW 2
         NWCalcArrowRect( button22BoundRect, arrowRect );
-        gtk_paint_arrow( style, gdkDrawable, stateType, shadowType,
+        gtk_paint_arrow( style, gdkDrawable, stateType, shadowType, 
                          gdkRect, GTK_WIDGET(scrollbarWidget), scrollbarTag, button2Type, TRUE,
-                         x+hShim+arrowRect.Left(), y+vShim+arrowRect.Top(),
+                         x+hShim+arrowRect.Left(), y+vShim+arrowRect.Top(), 
                          arrowRect.GetWidth(), arrowRect.GetHeight() );
     }
 
@@ -1742,13 +1742,13 @@ BOOL GtkSalGraphics::NWPaintGTKScrollbar( ControlType, ControlPart nPart,
         return( FALSE );
     }
     g_object_unref( pixmap );
-
+ 
     return( TRUE );
 }
 
 //---
 
-static Rectangle NWGetScrollButtonRect( int nScreen, ControlPart nPart, Rectangle aAreaRect )
+static Rectangle NWGetScrollButtonRect(	int nScreen, ControlPart nPart, Rectangle aAreaRect )
 {
     gint slider_width;
     gint stepper_size;
@@ -1780,7 +1780,7 @@ static Rectangle NWGetScrollButtonRect( int nScreen, ControlPart nPart, Rectangl
 
     gint nFirst = 0;
     gint nSecond = 0;
-
+    
     if ( has_forward )   nSecond += 1;
     if ( has_forward2 )  nFirst  += 1;
     if ( has_backward )  nFirst  += 1;
@@ -1796,7 +1796,7 @@ static Rectangle NWGetScrollButtonRect( int nScreen, ControlPart nPart, Rectangl
         buttonWidth = stepper_size + trough_border + stepper_spacing;
         buttonHeight = slider_width + 2 * trough_border;
     }
-
+ 
     if ( nPart == PART_BUTTON_UP )
     {
         buttonHeight *= nFirst;
@@ -1835,13 +1835,13 @@ BOOL GtkSalGraphics::NWPaintGTKEditBox( GdkDrawable* gdkDrawable,
                                         ControlType nType, ControlPart nPart,
                                         const Rectangle& rControlRectangle,
                                         const clipList& rClipList,
-                                        ControlState nState,
+                                        ControlState nState, 
                                         const ImplControlValue& aValue,
                                         const OUString& rCaption )
 {
-    Rectangle       pixmapRect;
+    Rectangle		pixmapRect;
     GdkRectangle    clipRect;
-
+    
     // Find the overall bounding rect of the buttons's drawing area,
     // plus its actual draw rect excluding adornment
     pixmapRect = NWGetEditBoxPixmapRect( m_nScreen, nType, nPart, rControlRectangle,
@@ -1852,7 +1852,7 @@ BOOL GtkSalGraphics::NWPaintGTKEditBox( GdkDrawable* gdkDrawable,
         clipRect.y = it->Top();
         clipRect.width = it->GetWidth();
         clipRect.height = it->GetHeight();
-
+        
         NWPaintOneEditBox( m_nScreen, gdkDrawable, &clipRect, nType, nPart, pixmapRect, nState, aValue, rCaption );
     }
 
@@ -1872,16 +1872,16 @@ static Rectangle NWGetEditBoxPixmapRect(int nScreen,
                                         const ImplControlValue&,
                                         const OUString& )
 {
-    Rectangle       pixmapRect = aAreaRect;
-    gboolean        interiorFocus;
-    gint            focusWidth;
+    Rectangle		pixmapRect = aAreaRect;
+    gboolean		interiorFocus;
+    gint			focusWidth;
 
     NWEnsureGTKEditBox( nScreen );
 
     // Grab some entry style attributes
     gtk_widget_style_get( gWidgetData[nScreen].gEditBoxWidget,
-                                    "focus-line-width", &focusWidth,
-                                     "interior-focus",  &interiorFocus, (char *)NULL );
+                                    "focus-line-width",	&focusWidth,
+                                     "interior-focus",	&interiorFocus, (char *)NULL );
 
     if ( !interiorFocus )
     {
@@ -1898,18 +1898,18 @@ static Rectangle NWGetEditBoxPixmapRect(int nScreen,
  * All coordinates should be local to the Pixmap, NOT
  * screen/window coordinates.
  */
-static void NWPaintOneEditBox(  int nScreen,
+static void NWPaintOneEditBox(	int nScreen,
                                 GdkDrawable * gdkDrawable,
-                                GdkRectangle *  gdkRect,
-                                ControlType         nType,
+                                GdkRectangle *	gdkRect,
+                                ControlType			nType,
                                 ControlPart,
-                                Rectangle               aEditBoxRect,
-                                ControlState            nState,
+                                Rectangle				aEditBoxRect,
+                                ControlState			nState,
                                 const ImplControlValue&,
                                 const OUString& )
 {
-    GtkStateType    stateType;
-    GtkShadowType   shadowType;
+    GtkStateType	stateType;
+    GtkShadowType	shadowType;
     GtkWidget      *widget;
 
     NWEnsureGTKButton( nScreen );
@@ -1922,7 +1922,7 @@ static void NWPaintOneEditBox(  int nScreen,
     /* border's shadowType for gtk entries is always GTK_SHADOW_IN (see gtkentry.c)
     shadowType = GTK_SHADOW_IN;
     */
-
+    
     switch ( nType )
     {
         case CTRL_SPINBOX:
@@ -1954,13 +1954,13 @@ static void NWPaintOneEditBox(  int nScreen,
     }
     NWSetWidgetState( widget, nState, stateType );
 
-    gtk_paint_flat_box( pBGWidget->style, gdkDrawable, stateType, GTK_SHADOW_NONE,
+    gtk_paint_flat_box( pBGWidget->style, gdkDrawable, stateType, GTK_SHADOW_NONE, 
                         gdkRect, pBGWidget, "entry_bg",
-                        aEditBoxRect.Left(), aEditBoxRect.Top(),
+                        aEditBoxRect.Left(), aEditBoxRect.Top(), 
                         aEditBoxRect.GetWidth(), aEditBoxRect.GetHeight() );
-    gtk_paint_shadow( widget->style, gdkDrawable, GTK_STATE_NORMAL, GTK_SHADOW_IN,
+    gtk_paint_shadow( widget->style, gdkDrawable, GTK_STATE_NORMAL, GTK_SHADOW_IN, 
                       gdkRect, widget, "entry",
-                      aEditBoxRect.Left(), aEditBoxRect.Top(),
+                      aEditBoxRect.Left(), aEditBoxRect.Top(), 
                       aEditBoxRect.GetWidth(), aEditBoxRect.GetHeight() );
 
 }
@@ -1972,21 +1972,21 @@ static void NWPaintOneEditBox(  int nScreen,
 BOOL GtkSalGraphics::NWPaintGTKSpinBox( ControlType nType, ControlPart nPart,
                                         const Rectangle& rControlRectangle,
                                         const clipList&,
-                                        ControlState nState,
+                                        ControlState nState, 
                                         const ImplControlValue& aValue,
                                         const OUString& rCaption )
 {
-    GdkPixmap   *       pixmap;
-    Rectangle           pixmapRect;
-    GtkStateType        stateType;
-    GtkShadowType       shadowType;
-    const SpinbuttonValue * pSpinVal = (aValue.getType() == CTRL_SPINBUTTONS) ? static_cast<const SpinbuttonValue *>(&aValue) : NULL;
-    Rectangle           upBtnRect;
-    ControlPart     upBtnPart = PART_BUTTON_UP;
-    ControlState        upBtnState = CTRL_STATE_ENABLED;
-    Rectangle           downBtnRect;
-    ControlPart     downBtnPart = PART_BUTTON_DOWN;
-    ControlState        downBtnState = CTRL_STATE_ENABLED;
+    GdkPixmap	*		pixmap;
+    Rectangle			pixmapRect;
+    GtkStateType		stateType;
+    GtkShadowType		shadowType;
+    const SpinbuttonValue *	pSpinVal = (aValue.getType() == CTRL_SPINBUTTONS) ? static_cast<const SpinbuttonValue *>(&aValue) : NULL;
+    Rectangle			upBtnRect;
+    ControlPart		upBtnPart = PART_BUTTON_UP;
+    ControlState		upBtnState = CTRL_STATE_ENABLED;
+    Rectangle			downBtnRect;
+    ControlPart		downBtnPart = PART_BUTTON_DOWN;
+    ControlState		downBtnState = CTRL_STATE_ENABLED;
 
     NWEnsureGTKButton( m_nScreen );
     NWEnsureGTKSpinButton( m_nScreen );
@@ -2041,7 +2041,7 @@ BOOL GtkSalGraphics::NWPaintGTKSpinBox( ControlType nType, ControlPart nPart,
 
     if ( shadowType != GTK_SHADOW_NONE )
     {
-        Rectangle       shadowRect( upBtnRect );
+        Rectangle		shadowRect( upBtnRect );
 
         shadowRect.Union( downBtnRect );
         gtk_paint_box( gWidgetData[m_nScreen].gSpinButtonWidget->style, pixmap, GTK_STATE_NORMAL, shadowType, NULL,
@@ -2067,14 +2067,14 @@ BOOL GtkSalGraphics::NWPaintGTKSpinBox( ControlType nType, ControlPart nPart,
 
 static Rectangle NWGetSpinButtonRect( int nScreen,
                                       ControlType,
-                                      ControlPart           nPart,
-                                      Rectangle             aAreaRect,
+                                      ControlPart			nPart,
+                                      Rectangle 			aAreaRect,
                                       ControlState,
                                       const ImplControlValue&,
                                       const OUString& )
 {
-    gint            buttonSize;
-    Rectangle       buttonRect;
+    gint			buttonSize;
+    Rectangle		buttonRect;
 
     NWEnsureGTKSpinButton( nScreen );
 
@@ -2108,19 +2108,19 @@ static Rectangle NWGetSpinButtonRect( int nScreen,
 //---
 
 static void NWPaintOneSpinButton( int nScreen,
-                                  GdkPixmap*            pixmap,
-                                  ControlType           nType,
-                                  ControlPart           nPart,
-                                  Rectangle             aAreaRect,
-                                  ControlState          nState,
-                                  const ImplControlValue&   aValue,
-                                  const OUString&               rCaption )
+                                  GdkPixmap*			pixmap,
+                                  ControlType			nType,
+                                  ControlPart			nPart,
+                                  Rectangle				aAreaRect,
+                                  ControlState			nState,
+                                  const ImplControlValue&	aValue,
+                                  const OUString&				rCaption )
 {
-    Rectangle           buttonRect;
-    GtkStateType        stateType;
-    GtkShadowType       shadowType;
-    Rectangle           arrowRect;
-    gint                arrowSize;
+    Rectangle			buttonRect;
+    GtkStateType		stateType;
+    GtkShadowType		shadowType;
+    Rectangle			arrowRect;
+    gint				arrowSize;
 
     NWEnsureGTKSpinButton( nScreen );
     NWConvertVCLStateToGTKState( nState, &stateType, &shadowType );
@@ -2155,17 +2155,17 @@ BOOL GtkSalGraphics::NWPaintGTKComboBox( GdkDrawable* gdkDrawable,
                                          ControlType nType, ControlPart nPart,
                                          const Rectangle& rControlRectangle,
                                          const clipList& rClipList,
-                                         ControlState nState,
+                                         ControlState nState, 
                                          const ImplControlValue& aValue,
                                          const OUString& rCaption )
 {
-    Rectangle       pixmapRect;
-    Rectangle       buttonRect;
-    GtkStateType    stateType;
-    GtkShadowType   shadowType;
-    Rectangle       arrowRect;
-    gint            x,y;
-    GdkRectangle    clipRect;
+    Rectangle		pixmapRect;
+    Rectangle		buttonRect;
+    GtkStateType	stateType;
+    GtkShadowType	shadowType;
+    Rectangle		arrowRect;
+    gint			x,y;
+    GdkRectangle	clipRect;
 
     NWEnsureGTKButton( m_nScreen );
     NWEnsureGTKArrow( m_nScreen );
@@ -2186,10 +2186,10 @@ BOOL GtkSalGraphics::NWPaintGTKComboBox( GdkDrawable* gdkDrawable,
     if( nPart == PART_BUTTON_DOWN )
         buttonRect.Left() += 1;
 
-    Rectangle       aEditBoxRect( pixmapRect );
+    Rectangle		aEditBoxRect( pixmapRect );
     aEditBoxRect.SetSize( Size( pixmapRect.GetWidth() - buttonRect.GetWidth(), aEditBoxRect.GetHeight() ) );
 
-    #define ARROW_EXTENT        0.7
+    #define ARROW_EXTENT		0.7
     arrowRect.SetSize( Size( (gint)(MIN_ARROW_SIZE * ARROW_EXTENT),
                              (gint)(MIN_ARROW_SIZE * ARROW_EXTENT) ) );
     arrowRect.SetPos( Point( buttonRect.Left() + (gint)((buttonRect.GetWidth() - arrowRect.GetWidth()) / 2),
@@ -2201,20 +2201,20 @@ BOOL GtkSalGraphics::NWPaintGTKComboBox( GdkDrawable* gdkDrawable,
         clipRect.y = it->Top();
         clipRect.width = it->GetWidth();
         clipRect.height = it->GetHeight();
-
+        
         if( nPart == PART_ENTIRE_CONTROL )
-            NWPaintOneEditBox( m_nScreen, gdkDrawable, &clipRect, nType, nPart, aEditBoxRect,
+            NWPaintOneEditBox( m_nScreen, gdkDrawable, &clipRect, nType, nPart, aEditBoxRect, 
                                nState, aValue, rCaption );
-
+        
         // Buttons must paint opaque since some themes have alpha-channel enabled buttons
-        gtk_paint_flat_box( gWidgetData[m_nScreen].gBtnWidget->style, gdkDrawable, GTK_STATE_NORMAL, GTK_SHADOW_NONE,
-                            &clipRect, m_pWindow, "base",
-                            x+(buttonRect.Left() - pixmapRect.Left()),
+        gtk_paint_flat_box( gWidgetData[m_nScreen].gBtnWidget->style, gdkDrawable, GTK_STATE_NORMAL, GTK_SHADOW_NONE, 
+                            &clipRect, m_pWindow, "base", 
+                            x+(buttonRect.Left() - pixmapRect.Left()), 
                             y+(buttonRect.Top() - pixmapRect.Top()),
                             buttonRect.GetWidth(), buttonRect.GetHeight() );
         gtk_paint_box( GTK_COMBO(gWidgetData[m_nScreen].gComboWidget)->button->style, gdkDrawable, stateType, shadowType,
                        &clipRect, GTK_COMBO(gWidgetData[m_nScreen].gComboWidget)->button, "button",
-                       x+(buttonRect.Left() - pixmapRect.Left()),
+                       x+(buttonRect.Left() - pixmapRect.Left()), 
                        y+(buttonRect.Top() - pixmapRect.Top()),
                        buttonRect.GetWidth(), buttonRect.GetHeight() );
 
@@ -2223,7 +2223,7 @@ BOOL GtkSalGraphics::NWPaintGTKComboBox( GdkDrawable* gdkDrawable,
                          x+(arrowRect.Left() - pixmapRect.Left()), y+(arrowRect.Top() - pixmapRect.Top()),
                          arrowRect.GetWidth(), arrowRect.GetHeight() );
     }
-
+    
     return( TRUE );
 }
 
@@ -2232,23 +2232,23 @@ BOOL GtkSalGraphics::NWPaintGTKComboBox( GdkDrawable* gdkDrawable,
 static Rectangle NWGetComboBoxButtonRect( int nScreen,
                                           ControlType,
                                           ControlPart nPart,
-                                          Rectangle             aAreaRect,
+                                          Rectangle				aAreaRect,
                                           ControlState,
                                           const ImplControlValue&,
                                           const OUString& )
 {
-    Rectangle   aButtonRect;
-    gint        nArrowWidth;
+    Rectangle	aButtonRect;
+    gint		nArrowWidth;
     gint        nButtonWidth;
-    gint        nFocusWidth;
-    gint        nFocusPad;
+    gint		nFocusWidth;
+    gint		nFocusPad;
 
     NWEnsureGTKArrow( nScreen );
 
     // Grab some button style attributes
     gtk_widget_style_get( gWidgetData[nScreen].gDropdownWidget,
-                                      "focus-line-width",   &nFocusWidth,
-                                    "focus-padding",    &nFocusPad, (char *)NULL );
+                                      "focus-line-width",	&nFocusWidth,
+                                    "focus-padding", 	&nFocusPad, (char *)NULL );
 
     nArrowWidth = MIN_ARROW_SIZE + (GTK_MISC(gWidgetData[nScreen].gArrowWidget)->xpad * 2);
     nButtonWidth = nArrowWidth +
@@ -2263,7 +2263,7 @@ static Rectangle NWGetComboBoxButtonRect( int nScreen,
     else if( nPart == PART_SUB_EDIT )
     {
         NWEnsureGTKCombo( nScreen );
-
+        
         gint adjust_x = GTK_CONTAINER(gWidgetData[nScreen].gComboWidget)->border_width +
                         nFocusWidth +
                         nFocusPad;
@@ -2283,21 +2283,21 @@ static Rectangle NWGetComboBoxButtonRect( int nScreen,
 //-------------------------------------
 
 
-
+    
 BOOL GtkSalGraphics::NWPaintGTKTabItem( ControlType nType, ControlPart,
                                         const Rectangle& rControlRectangle,
                                         const clipList&,
-                                        ControlState nState,
+                                        ControlState nState, 
                                         const ImplControlValue& aValue,
                                         const OUString& )
 {
     OSL_ASSERT( aValue.getType() == CTRL_TAB_ITEM );
-    GdkPixmap * pixmap;
-    Rectangle       pixmapRect;
-    Rectangle       tabRect;
-    const TabitemValue *    pTabitemValue = static_cast<const TabitemValue *>(&aValue);
-    GtkStateType    stateType;
-    GtkShadowType   shadowType;
+    GdkPixmap *	pixmap;
+    Rectangle		pixmapRect;
+    Rectangle		tabRect;
+    const TabitemValue *	pTabitemValue = static_cast<const TabitemValue *>(&aValue);
+    GtkStateType	stateType;
+    GtkShadowType	shadowType;
     if( ! gWidgetData[ m_nScreen ].gCacheTabItems )
     {
         gWidgetData[ m_nScreen ].gCacheTabItems = new NWPixmapCache( m_nScreen );
@@ -2310,7 +2310,7 @@ BOOL GtkSalGraphics::NWPaintGTKTabItem( ControlType nType, ControlPart,
         aCacheItems.SetSize( 20 );
     if( !aCachePage.GetSize() )
         aCachePage.SetSize( 1 );
-
+    
     if ( !pTabitemValue && (nType==CTRL_TAB_ITEM) )
     {
         std::fprintf( stderr, "NWPaintGTKTabItem() received a NULL TabitemValue.  Cannot draw native tab\n" );
@@ -2348,7 +2348,7 @@ BOOL GtkSalGraphics::NWPaintGTKTabItem( ControlType nType, ControlPart,
 
         // Allow the tab to draw a right border if needed
         tabRect.Right() -= 1;
-
+    
         // #129732# avoid degenerate cases which might lead to crashes
         if( tabRect.GetWidth() <= 1 || tabRect.GetHeight() <= 1 )
             return false;
@@ -2365,21 +2365,21 @@ BOOL GtkSalGraphics::NWPaintGTKTabItem( ControlType nType, ControlPart,
             return NWRenderPixmapToScreen( pixmap, pixmapRect );
     }
 
+        
+//	gtk_widget_set_state( gWidgetData[m_nScreen].gNotebookWidget, stateType );
 
-//  gtk_widget_set_state( gWidgetData[m_nScreen].gNotebookWidget, stateType );
-
-    pixmap = gdk_pixmap_new( NULL, pixmapRect.GetWidth(), pixmapRect.GetHeight(),
+    pixmap = gdk_pixmap_new( NULL, pixmapRect.GetWidth(), pixmapRect.GetHeight(), 
                              GetX11SalData()->GetDisplay()->GetVisual( m_nScreen ).GetDepth() );
     GdkRectangle paintRect;
     paintRect.x = paintRect.y = 0;
     paintRect.width = pixmapRect.GetWidth();
     paintRect.height = pixmapRect.GetHeight();
-
-    gtk_paint_flat_box( m_pWindow->style, pixmap, GTK_STATE_NORMAL,
+                             
+    gtk_paint_flat_box( m_pWindow->style, pixmap, GTK_STATE_NORMAL, 
                         GTK_SHADOW_NONE, &paintRect, m_pWindow, "base", 0, 0, -1, -1);
 
     NWSetWidgetState( gWidgetData[m_nScreen].gNotebookWidget, nState, stateType );
-
+    
     switch( nType )
     {
         case CTRL_TAB_BODY:
@@ -2418,7 +2418,7 @@ BOOL GtkSalGraphics::NWPaintGTKTabItem( ControlType nType, ControlPart,
         aCacheItems.Fill( nType, nState, pixmapRect, pixmap );
     else
         aCachePage.Fill( nType, nState, pixmapRect, pixmap );
-
+        
     BOOL bSuccess = NWRenderPixmapToScreen(pixmap, pixmapRect);
     g_object_unref( pixmap );
     return bSuccess;
@@ -2430,19 +2430,19 @@ BOOL GtkSalGraphics::NWPaintGTKListBox( GdkDrawable* gdkDrawable,
                                         ControlType nType, ControlPart nPart,
                                         const Rectangle& rControlRectangle,
                                         const clipList& rClipList,
-                                        ControlState nState,
+                                        ControlState nState, 
                                         const ImplControlValue& aValue,
                                         const OUString& rCaption )
 {
-    Rectangle       pixmapRect;
-    Rectangle       widgetRect;
-    Rectangle       aIndicatorRect;
-    GtkStateType    stateType;
-    GtkShadowType   shadowType;
-    gint            bInteriorFocus;
-    gint            nFocusLineWidth;
-    gint            nFocusPadding;
-    gint            x,y;
+    Rectangle		pixmapRect;
+    Rectangle		widgetRect;
+    Rectangle		aIndicatorRect;
+    GtkStateType	stateType;
+    GtkShadowType	shadowType;
+    gint			bInteriorFocus;
+    gint			nFocusLineWidth;
+    gint			nFocusPadding;
+    gint			x,y;
     GdkRectangle    clipRect;
 
     NWEnsureGTKButton( m_nScreen );
@@ -2474,49 +2474,49 @@ BOOL GtkSalGraphics::NWPaintGTKListBox( GdkDrawable* gdkDrawable,
     if ( nPart != PART_WINDOW )
     {
         gtk_widget_style_get( gWidgetData[m_nScreen].gOptionMenuWidget,
-            "interior_focus",   &bInteriorFocus,
-            "focus_line_width", &nFocusLineWidth,
-            "focus_padding",    &nFocusPadding,
+            "interior_focus",	&bInteriorFocus,
+            "focus_line_width",	&nFocusLineWidth,
+            "focus_padding",	&nFocusPadding,
             (char *)NULL);
     }
-
+    
     for( clipList::const_iterator it = rClipList.begin(); it != rClipList.end(); ++it )
     {
         clipRect.x = it->Left();
         clipRect.y = it->Top();
         clipRect.width = it->GetWidth();
         clipRect.height = it->GetHeight();
-
+    
         if ( nPart != PART_WINDOW )
         {
             // Listboxes must paint opaque since some themes have alpha-channel enabled bodies
-            gtk_paint_flat_box( gWidgetData[m_nScreen].gBtnWidget->style, gdkDrawable, GTK_STATE_NORMAL, GTK_SHADOW_NONE,
-                                &clipRect, m_pWindow, "base", x, y,
+            gtk_paint_flat_box( gWidgetData[m_nScreen].gBtnWidget->style, gdkDrawable, GTK_STATE_NORMAL, GTK_SHADOW_NONE, 
+                                &clipRect, m_pWindow, "base", x, y, 
                                 pixmapRect.GetWidth(), pixmapRect.GetHeight() );
             gtk_paint_box( gWidgetData[m_nScreen].gOptionMenuWidget->style, gdkDrawable, stateType, shadowType, &clipRect,
                            gWidgetData[m_nScreen].gOptionMenuWidget, "optionmenu",
-                           x+(widgetRect.Left() - pixmapRect.Left()),
+                           x+(widgetRect.Left() - pixmapRect.Left()), 
                            y+(widgetRect.Top() - pixmapRect.Top()),
                            widgetRect.GetWidth(), widgetRect.GetHeight() );
-            aIndicatorRect = NWGetListBoxIndicatorRect( m_nScreen, nType, nPart, widgetRect, nState,
+            aIndicatorRect = NWGetListBoxIndicatorRect( m_nScreen, nType, nPart, widgetRect, nState, 
                                                         aValue, rCaption );
             gtk_paint_tab( gWidgetData[m_nScreen].gOptionMenuWidget->style, gdkDrawable, stateType, shadowType, &clipRect,
                            gWidgetData[m_nScreen].gOptionMenuWidget, "optionmenutab",
-                           x+(aIndicatorRect.Left() - pixmapRect.Left()),
+                           x+(aIndicatorRect.Left() - pixmapRect.Left()), 
                            y+(aIndicatorRect.Top() - pixmapRect.Top()),
                            aIndicatorRect.GetWidth(), aIndicatorRect.GetHeight() );
         }
         else
         {
             shadowType = GTK_SHADOW_IN;
-
+        
             gtk_paint_shadow( gWidgetData[m_nScreen].gScrolledWindowWidget->style, gdkDrawable, GTK_STATE_NORMAL, shadowType,
                 &clipRect, gWidgetData[m_nScreen].gScrolledWindowWidget, "scrolled_window",
                 x+(widgetRect.Left() - pixmapRect.Left()), y+(widgetRect.Top() - pixmapRect.Top()),
                 widgetRect.GetWidth(), widgetRect.GetHeight() );
         }
     }
-
+    
     return( TRUE );
 }
 
@@ -2528,20 +2528,20 @@ BOOL GtkSalGraphics::NWPaintGTKToolbar(
             ControlState nState, const ImplControlValue& aValue,
             const OUString& )
 {
-    GtkStateType    stateType;
-    GtkShadowType   shadowType;
-    gint            x, y, w, h;
+    GtkStateType	stateType;
+    GtkShadowType	shadowType;
+    gint			x, y, w, h;
     gint            g_x=0, g_y=0, g_w=10, g_h=10;
     bool            bPaintButton = true;
     GtkWidget*      pButtonWidget = gWidgetData[m_nScreen].gToolbarButtonWidget;
     const gchar*    pButtonDetail = "button";
-    GdkRectangle    clipRect;
-
+    GdkRectangle	clipRect;
+    
     NWEnsureGTKToolbar( m_nScreen );
     if( nPart == PART_BUTTON ) // toolbar buttons cannot focus in gtk
         nState &= ~CTRL_STATE_FOCUSED;
     NWConvertVCLStateToGTKState( nState, &stateType, &shadowType );
-
+    
     x = rControlRectangle.Left();
     y = rControlRectangle.Top();
     w = rControlRectangle.GetWidth();
@@ -2560,7 +2560,7 @@ BOOL GtkSalGraphics::NWPaintGTKToolbar(
             gtk_toolbar_set_orientation( GTK_TOOLBAR(gWidgetData[m_nScreen].gToolbarWidget), GTK_ORIENTATION_HORIZONTAL );
         else
             gtk_toolbar_set_orientation( GTK_TOOLBAR(gWidgetData[m_nScreen].gToolbarWidget), GTK_ORIENTATION_VERTICAL );
-    }
+    }        
     // handle grip
     else if( nPart == PART_THUMB_HORZ || nPart == PART_THUMB_VERT )
     {
@@ -2588,7 +2588,7 @@ BOOL GtkSalGraphics::NWPaintGTKToolbar(
         bPaintButton =
             (GTK_BUTTON(pButtonWidget)->relief != GTK_RELIEF_NONE)
             || (nState & CTRL_STATE_PRESSED)
-            || (nState & CTRL_STATE_ROLLOVER);
+            || (nState & CTRL_STATE_ROLLOVER); 
         if( aValue.getTristateVal() == BUTTONVALUE_ON )
         {
             pButtonWidget = gWidgetData[m_nScreen].gToolbarToggleWidget;
@@ -2600,25 +2600,25 @@ BOOL GtkSalGraphics::NWPaintGTKToolbar(
             pButtonDetail = "togglebutton";
             bPaintButton = true;
         }
-
+        
         NWSetWidgetState( pButtonWidget, nState, stateType );
-        gtk_widget_ensure_style( pButtonWidget );
-    }
-
+        gtk_widget_ensure_style( pButtonWidget );            
+    }        
+    
     for( clipList::const_iterator it = rClipList.begin(); it != rClipList.end(); ++it )
     {
         clipRect.x = it->Left();
         clipRect.y = it->Top();
         clipRect.width = it->GetWidth();
         clipRect.height = it->GetHeight();
-
+        
         // draw toolbar
         if( nPart == PART_DRAW_BACKGROUND_HORZ || nPart == PART_DRAW_BACKGROUND_VERT )
         {
             gtk_paint_flat_box( gWidgetData[m_nScreen].gToolbarWidget->style,
                                 gdkDrawable,
                                 (GtkStateType)GTK_STATE_NORMAL,
-                                GTK_SHADOW_NONE,
+                                GTK_SHADOW_NONE, 
                                 &clipRect,
                                 gWidgetData[m_nScreen].gToolbarWidget,
                                 "base",
@@ -2658,10 +2658,10 @@ BOOL GtkSalGraphics::NWPaintGTKToolbar(
                                shadowType,
                                &clipRect,
                                pButtonWidget, pButtonDetail, x, y, w, h );
-            }
+            }        
         }
     }
-
+    
     return( TRUE );
 }
 
@@ -2675,15 +2675,15 @@ BOOL GtkSalGraphics::NWPaintGTKMenubar(
             ControlState nState, const ImplControlValue&,
             const OUString& )
 {
-    GtkStateType    stateType;
-    GtkShadowType   shadowType;
+    GtkStateType	stateType;
+    GtkShadowType	shadowType;
     GtkShadowType   selected_shadow_type = GTK_SHADOW_OUT;
-    gint            x, y, w, h;
-    GdkRectangle    clipRect;
-
+    gint			x, y, w, h;
+    GdkRectangle	clipRect;
+    
     NWEnsureGTKMenubar( m_nScreen );
     NWConvertVCLStateToGTKState( nState, &stateType, &shadowType );
-
+    
     x = rControlRectangle.Left();
     y = rControlRectangle.Top();
     w = rControlRectangle.GetWidth();
@@ -2698,19 +2698,19 @@ BOOL GtkSalGraphics::NWPaintGTKMenubar(
                                   (char *)NULL);
         }
     }
-
+    
     for( clipList::const_iterator it = rClipList.begin(); it != rClipList.end(); ++it )
     {
         clipRect.x = it->Left();
         clipRect.y = it->Top();
         clipRect.width = it->GetWidth();
         clipRect.height = it->GetHeight();
-
+        
         // handle Menubar
         if( nPart == PART_ENTIRE_CONTROL )
         {
             NWSetWidgetState( gWidgetData[m_nScreen].gMenubarWidget, nState, stateType );
-
+            
             GTK_WIDGET_UNSET_FLAGS( gWidgetData[m_nScreen].gMenubarWidget, GTK_SENSITIVE );
             if ( nState & CTRL_STATE_ENABLED )
                 GTK_WIDGET_SET_FLAGS( gWidgetData[m_nScreen].gMenubarWidget, GTK_SENSITIVE );
@@ -2719,10 +2719,10 @@ BOOL GtkSalGraphics::NWPaintGTKMenubar(
             gtk_paint_flat_box( gWidgetData[m_nScreen].gMenubarWidget->style,
                                 gdkDrawable,
                                 GTK_STATE_NORMAL,
-                                GTK_SHADOW_NONE,
+                                GTK_SHADOW_NONE, 
                                 &clipRect,
                                 GTK_WIDGET(m_pWindow),
-                                "base",
+                                "base", 
                                 x, y, w, h );
             gtk_paint_box( gWidgetData[m_nScreen].gMenubarWidget->style,
                            gdkDrawable,
@@ -2748,7 +2748,7 @@ BOOL GtkSalGraphics::NWPaintGTKMenubar(
             }
         }
     }
-
+    
     return( TRUE );
 }
 
@@ -2764,16 +2764,16 @@ BOOL GtkSalGraphics::NWPaintGTKPopupMenu(
     // even crashes), draw them using vcl functionality.
     if( nPart == PART_MENU_ITEM && ! (nState & CTRL_STATE_ENABLED) )
         return FALSE;
-
-    GtkStateType    stateType;
-    GtkShadowType   shadowType;
+    
+    GtkStateType	stateType;
+    GtkShadowType	shadowType;
     GtkShadowType   selected_shadow_type = GTK_SHADOW_OUT;
-    gint            x, y, w, h;
-    GdkRectangle    clipRect;
-
+    gint			x, y, w, h;
+    GdkRectangle	clipRect;
+    
     NWEnsureGTKMenu( m_nScreen );
     NWConvertVCLStateToGTKState( nState, &stateType, &shadowType );
-
+    
     x = rControlRectangle.Left();
     y = rControlRectangle.Top();
     w = rControlRectangle.GetWidth();
@@ -2799,17 +2799,17 @@ BOOL GtkSalGraphics::NWPaintGTKPopupMenu(
         clipRect.y = it->Top();
         clipRect.width = it->GetWidth();
         clipRect.height = it->GetHeight();
-
+        
         if( nPart == PART_ENTIRE_CONTROL )
         {
             // #118704# for translucent menubar styles paint background first
             gtk_paint_flat_box( gWidgetData[m_nScreen].gMenuWidget->style,
                                 gdkDrawable,
                                 GTK_STATE_NORMAL,
-                                GTK_SHADOW_NONE,
+                                GTK_SHADOW_NONE, 
                                 &clipRect,
                                 GTK_WIDGET(m_pWindow),
-                                "base",
+                                "base", 
                                 x, y, w, h );
             gtk_paint_box( gWidgetData[m_nScreen].gMenuWidget->style,
                            gdkDrawable,
@@ -2878,7 +2878,7 @@ BOOL GtkSalGraphics::NWPaintGTKPopupMenu(
             }
         }
     }
-
+    
     return( TRUE );
 }
 
@@ -2891,10 +2891,10 @@ BOOL GtkSalGraphics::NWPaintGTKTooltip(
             const OUString& )
 {
     NWEnsureGTKTooltip( m_nScreen );
-
-    gint            x, y, w, h;
-    GdkRectangle    clipRect;
-
+    
+    gint			x, y, w, h;
+    GdkRectangle	clipRect;
+    
     x = rControlRectangle.Left();
     y = rControlRectangle.Top();
     w = rControlRectangle.GetWidth();
@@ -2906,17 +2906,17 @@ BOOL GtkSalGraphics::NWPaintGTKTooltip(
         clipRect.y = it->Top();
         clipRect.width = it->GetWidth();
         clipRect.height = it->GetHeight();
-
+        
         gtk_paint_flat_box( gWidgetData[m_nScreen].gTooltipPopup->style,
                             gdkDrawable,
                             GTK_STATE_NORMAL,
                             GTK_SHADOW_OUT,
                             &clipRect,
                             gWidgetData[m_nScreen].gTooltipPopup,
-                            "tooltip",
+                            "tooltip", 
                             x, y, w, h );
     }
-
+    
     return( TRUE );
 }
 
@@ -2935,12 +2935,12 @@ BOOL GtkSalGraphics::NWPaintGTKListNode(
     aRect.Right() += 2;
     aRect.Top() -= 2;
     aRect.Bottom() += 2;
-    gint            w, h;
+    gint			w, h;
     w = aRect.GetWidth();
     h = aRect.GetHeight();
 
-    GtkStateType    stateType;
-    GtkShadowType   shadowType;
+    GtkStateType	stateType;
+    GtkShadowType	shadowType;
     NWConvertVCLStateToGTKState( nState, &stateType, &shadowType );
 
     ButtonValue aButtonValue = rValue.getTristateVal();
@@ -2953,11 +2953,11 @@ BOOL GtkSalGraphics::NWPaintGTKListNode(
         default:
             break;
     }
-
+    
     GdkPixmap* pixmap = NWGetPixmapFromScreen( aRect );
     if( ! pixmap )
         return FALSE;
-
+    
     GdkDrawable* const &pixDrawable = GDK_DRAWABLE( pixmap );
     gtk_paint_expander( gWidgetData[m_nScreen].gTreeView->style,
                         pixDrawable,
@@ -2983,17 +2983,17 @@ BOOL GtkSalGraphics::NWPaintGTKProgress(
             const OUString& )
 {
     NWEnsureGTKProgressBar( m_nScreen );
-
-    gint            w, h;
+    
+    gint			w, h;
     w = rControlRectangle.GetWidth();
     h = rControlRectangle.GetHeight();
 
     long nProgressWidth = rValue.getNumericVal();
-
+    
     GdkPixmap* pixmap = NWGetPixmapFromScreen( Rectangle( Point( 0, 0 ), Size( w, h ) ) );
     if( ! pixmap )
         return FALSE;
-
+    
     GdkDrawable* const &pixDrawable = GDK_DRAWABLE( pixmap );
 
     // paint background
@@ -3003,7 +3003,7 @@ BOOL GtkSalGraphics::NWPaintGTKProgress(
                         GTK_SHADOW_NONE,
                         NULL,
                         gWidgetData[m_nScreen].gProgressBar,
-                        "trough",
+                        "trough", 
                         0, 0, w, h );
     if( nProgressWidth > 0 )
     {
@@ -3048,17 +3048,17 @@ BOOL GtkSalGraphics::NWPaintGTKSlider(
 {
     OSL_ASSERT( rValue.getType() == CTRL_SLIDER );
     NWEnsureGTKSlider( m_nScreen );
-
-    gint            w, h;
+    
+    gint			w, h;
     w = rControlRectangle.GetWidth();
     h = rControlRectangle.GetHeight();
 
     const SliderValue* pVal = static_cast<const SliderValue*>(&rValue);
-
+    
     GdkPixmap* pixmap = NWGetPixmapFromScreen( rControlRectangle );
     if( ! pixmap )
         return FALSE;
-
+    
     GdkDrawable* const &pixDrawable = GDK_DRAWABLE( pixmap );
     GtkWidget* pWidget = (nPart == PART_TRACK_HORZ_AREA)
                          ? GTK_WIDGET(gWidgetData[m_nScreen].gHScale)
@@ -3128,7 +3128,7 @@ BOOL GtkSalGraphics::NWPaintGTKSlider(
                         GTK_SHADOW_NONE,
                         NULL,
                         gWidgetData[m_nScreen].gProgressBar,
-                        "trough",
+                        "trough", 
                         0, 0, w, h );
     if( nProgressWidth > 0 )
     {
@@ -3177,17 +3177,17 @@ static Rectangle NWGetListBoxButtonRect( int nScreen,
     Rectangle       aPartRect;
     GtkRequisition *pIndicatorSize = NULL;
     GtkBorder      *pIndicatorSpacing = NULL;
-    gint            width = 13; // GTK+ default
-    gint            right = 5;  // GTK+ default
+    gint            width = 13;	// GTK+ default
+    gint            right = 5;	// GTK+ default
     gint            nButtonAreaWidth = 0;
     gint            xthickness = 0;
 
     NWEnsureGTKOptionMenu( nScreen );
 
     gtk_widget_style_get( gWidgetData[nScreen].gOptionMenuWidget,
-            "indicator_size",   &pIndicatorSize,
+            "indicator_size",	&pIndicatorSize,
             "indicator_spacing",&pIndicatorSpacing, (char *)NULL);
-
+    
     if ( pIndicatorSize )
         width = pIndicatorSize->width;
 
@@ -3212,7 +3212,7 @@ static Rectangle NWGetListBoxButtonRect( int nScreen,
             break;
 
         default:
-            aPartSize.Width() = aAreaRect.GetWidth();
+            aPartSize.Width() = aAreaRect.GetWidth();	
             aPartPos.X() = aAreaRect.Left();
             break;
     }
@@ -3231,7 +3231,7 @@ static Rectangle NWGetListBoxButtonRect( int nScreen,
 static Rectangle NWGetListBoxIndicatorRect( int nScreen,
                                             ControlType,
                                             ControlPart,
-                                            Rectangle               aAreaRect,
+                                            Rectangle				aAreaRect,
                                             ControlState,
                                             const ImplControlValue&,
                                             const OUString& )
@@ -3239,16 +3239,16 @@ static Rectangle NWGetListBoxIndicatorRect( int nScreen,
     Rectangle       aIndicatorRect;
     GtkRequisition *pIndicatorSize = NULL;
     GtkBorder      *pIndicatorSpacing = NULL;
-    gint            width = 13; // GTK+ default
-    gint            height = 13;    // GTK+ default
-    gint            right = 5;  // GTK+ default
+    gint            width = 13;	// GTK+ default
+    gint            height = 13;	// GTK+ default
+    gint            right = 5;	// GTK+ default
 
     NWEnsureGTKOptionMenu( nScreen );
 
     gtk_widget_style_get( gWidgetData[nScreen].gOptionMenuWidget,
-            "indicator_size",   &pIndicatorSize,
+            "indicator_size",	&pIndicatorSize,
             "indicator_spacing",&pIndicatorSpacing, (char *)NULL);
-
+    
     if ( pIndicatorSize )
     {
         width = pIndicatorSize->width;
@@ -3276,8 +3276,8 @@ static Rectangle NWGetListBoxIndicatorRect( int nScreen,
 
 static Rectangle NWGetToolbarRect(  int nScreen,
                                     ControlType,
-                                    ControlPart             nPart,
-                                    Rectangle               aAreaRect,
+                                    ControlPart				nPart,
+                                    Rectangle				aAreaRect,
                                     ControlState,
                                     const ImplControlValue&,
                                     const OUString& )
@@ -3294,9 +3294,9 @@ static Rectangle NWGetToolbarRect(  int nScreen,
     else if( nPart == PART_BUTTON )
     {
         aRet = aAreaRect;
-
+        
         NWEnsureGTKToolbar( nScreen );
-
+        
         gint nMinWidth =
             2*gWidgetData[nScreen].gToolbarButtonWidget->style->xthickness
             + 1 // CHILD_SPACING constant, found in gtk_button.c
@@ -3304,8 +3304,8 @@ static Rectangle NWGetToolbarRect(  int nScreen,
         gint nMinHeight =
             2*gWidgetData[nScreen].gToolbarButtonWidget->style->ythickness
             + 1 // CHILD_SPACING constant, found in gtk_button.c
-            + 3*gWidgetData[nScreen].gToolbarButtonWidget->style->ythickness; // Murphy factor
-
+            + 3*gWidgetData[nScreen].gToolbarButtonWidget->style->ythickness; // Murphy factor                          
+        
         gtk_widget_ensure_style( gWidgetData[nScreen].gToolbarButtonWidget );
         if( aAreaRect.GetWidth() < nMinWidth )
             aRet.Right() = aRet.Left() + nMinWidth;
@@ -3340,14 +3340,14 @@ void printStyleColors( GtkStyle* pStyle )
     for( int i = 0; i < 5; i++ )
     {
         std::fprintf( stderr, "state %s colors:\n", pStates[i] );
-        printColor( "bg     ", pStyle->bg[i] );
-        printColor( "fg     ", pStyle->fg[i] );
-        printColor( "light  ", pStyle->light[i] );
-        printColor( "dark   ", pStyle->dark[i] );
-        printColor( "mid    ", pStyle->mid[i] );
-        printColor( "text   ", pStyle->text[i] );
-        printColor( "base   ", pStyle->base[i] );
-        printColor( "text_aa", pStyle->text_aa[i] );
+        printColor( "bg     ", pStyle->bg[i] ); 
+        printColor( "fg     ", pStyle->fg[i] ); 
+        printColor( "light  ", pStyle->light[i] ); 
+        printColor( "dark   ", pStyle->dark[i] ); 
+        printColor( "mid    ", pStyle->mid[i] ); 
+        printColor( "text   ", pStyle->text[i] ); 
+        printColor( "base   ", pStyle->base[i] ); 
+        printColor( "text_aa", pStyle->text_aa[i] ); 
     }
 }
 #endif
@@ -3360,16 +3360,16 @@ void GtkSalGraphics::updateSettings( AllSettings& rSettings )
     NWEnsureGTKScrollbars( m_nScreen );
     NWEnsureGTKEditBox( m_nScreen );
     NWEnsureGTKTooltip( m_nScreen );
-
+    
     gtk_widget_ensure_style( m_pWindow );
     GtkStyle* pStyle = gtk_widget_get_style( m_pWindow );
-
+    
     StyleSettings aStyleSet = rSettings.GetStyleSettings();
 
 #if OSL_DEBUG_LEVEL > 2
     printStyleColors( pStyle );
 #endif
-
+    
     // text colors
     Color aTextColor = getColor( pStyle->text[GTK_STATE_NORMAL] );
     aStyleSet.SetDialogTextColor( aTextColor );
@@ -3385,12 +3385,12 @@ void GtkSalGraphics::updateSettings( AllSettings& rSettings )
     GtkStyle* pTooltipStyle = gtk_widget_get_style( gWidgetData[m_nScreen].gTooltipPopup );
     aTextColor = getColor( pTooltipStyle->fg[ GTK_STATE_NORMAL ] );
     aStyleSet.SetHelpTextColor( aTextColor );
-
+    
     // mouse over text colors
     aTextColor = getColor( pStyle->fg[ GTK_STATE_PRELIGHT ] );
     aStyleSet.SetButtonRolloverTextColor( aTextColor );
     aStyleSet.SetFieldRolloverTextColor( aTextColor );
-
+    
     // background colors
     Color aBackColor = getColor( pStyle->bg[GTK_STATE_NORMAL] );
     Color aBackFieldColor = getColor( pStyle->base[ GTK_STATE_NORMAL ] );
@@ -3451,7 +3451,7 @@ void GtkSalGraphics::updateSettings( AllSettings& rSettings )
     GtkStyle* pMenuItemStyle = gtk_rc_get_style( gWidgetData[m_nScreen].gMenuItemMenuWidget );
     GtkStyle* pMenubarStyle = gtk_rc_get_style( gWidgetData[m_nScreen].gMenubarWidget );
     GtkStyle* pMenuTextStyle = gtk_rc_get_style( gtk_bin_get_child( GTK_BIN(gWidgetData[m_nScreen].gMenuItemMenuWidget) ) );
-
+    
     aBackColor = getColor( pMenubarStyle->bg[GTK_STATE_NORMAL] );
     aStyleSet.SetMenuBarColor( aBackColor );
     aBackColor = getColor( pMenuStyle->bg[GTK_STATE_NORMAL] );
@@ -3461,7 +3461,7 @@ void GtkSalGraphics::updateSettings( AllSettings& rSettings )
 
     aTextColor = getColor( pMenubarStyle->fg[GTK_STATE_NORMAL] );
     aStyleSet.SetMenuBarTextColor( aTextColor );
-
+    
 #if OSL_DEBUG_LEVEL > 1
     std::fprintf( stderr, "==\n" );
     std::fprintf( stderr, "MenuColor = %x (%d)\n", (int)aStyleSet.GetMenuColor().GetColor(), aStyleSet.GetMenuColor().GetLuminance() );
@@ -3486,30 +3486,30 @@ void GtkSalGraphics::updateSettings( AllSettings& rSettings )
       temp.DecreaseLuminance( 16 );
       aStyleSet.SetShadowColor( temp );
     }
-
+    
     aHighlightColor = getColor( pMenuItemStyle->bg[ GTK_STATE_SELECTED ] );
     aHighlightTextColor = getColor( pMenuTextStyle->fg[ GTK_STATE_PRELIGHT ] );
     if( aHighlightColor == aHighlightTextColor )
         aHighlightTextColor = (aHighlightColor.GetLuminance() < 128) ? Color( COL_WHITE ) : Color( COL_BLACK );
     aStyleSet.SetMenuHighlightColor( aHighlightColor );
     aStyleSet.SetMenuHighlightTextColor( aHighlightTextColor );
-
+    
     // UI font
-    OString aFamily     = pango_font_description_get_family( pStyle->font_desc );
-    int nPangoHeight    = pango_font_description_get_size( pStyle->font_desc );
-    PangoStyle  eStyle  = pango_font_description_get_style( pStyle->font_desc );
-    PangoWeight eWeight = pango_font_description_get_weight( pStyle->font_desc );
+    OString	aFamily		= pango_font_description_get_family( pStyle->font_desc );
+    int nPangoHeight	= pango_font_description_get_size( pStyle->font_desc );
+    PangoStyle	eStyle	= pango_font_description_get_style( pStyle->font_desc );
+    PangoWeight	eWeight	= pango_font_description_get_weight( pStyle->font_desc );
     PangoStretch eStretch = pango_font_description_get_stretch( pStyle->font_desc );
-
+    
     psp::FastPrintFontInfo aInfo;
     // set family name
     aInfo.m_aFamilyName = OStringToOUString( aFamily, RTL_TEXTENCODING_UTF8 );
     // set italic
     switch( eStyle )
     {
-        case PANGO_STYLE_NORMAL:    aInfo.m_eItalic = psp::italic::Upright;break;
-        case PANGO_STYLE_ITALIC:    aInfo.m_eItalic = psp::italic::Italic;break;
-        case PANGO_STYLE_OBLIQUE:   aInfo.m_eItalic = psp::italic::Oblique;break;
+        case PANGO_STYLE_NORMAL:	aInfo.m_eItalic = psp::italic::Upright;break;
+        case PANGO_STYLE_ITALIC:	aInfo.m_eItalic = psp::italic::Italic;break;
+        case PANGO_STYLE_OBLIQUE:	aInfo.m_eItalic = psp::italic::Oblique;break;
     }
     // set weight
     if( eWeight <= PANGO_WEIGHT_ULTRALIGHT )
@@ -3525,15 +3525,15 @@ void GtkSalGraphics::updateSettings( AllSettings& rSettings )
     // set width
     switch( eStretch )
     {
-        case PANGO_STRETCH_ULTRA_CONDENSED: aInfo.m_eWidth = psp::width::UltraCondensed;break;
-        case PANGO_STRETCH_EXTRA_CONDENSED: aInfo.m_eWidth = psp::width::ExtraCondensed;break;
-        case PANGO_STRETCH_CONDENSED:       aInfo.m_eWidth = psp::width::Condensed;break;
-        case PANGO_STRETCH_SEMI_CONDENSED:  aInfo.m_eWidth = psp::width::SemiCondensed;break;
-        case PANGO_STRETCH_NORMAL:          aInfo.m_eWidth = psp::width::Normal;break;
-        case PANGO_STRETCH_SEMI_EXPANDED:   aInfo.m_eWidth = psp::width::SemiExpanded;break;
-        case PANGO_STRETCH_EXPANDED:        aInfo.m_eWidth = psp::width::Expanded;break;
-        case PANGO_STRETCH_EXTRA_EXPANDED:  aInfo.m_eWidth = psp::width::ExtraExpanded;break;
-        case PANGO_STRETCH_ULTRA_EXPANDED:  aInfo.m_eWidth = psp::width::UltraExpanded;break;
+        case PANGO_STRETCH_ULTRA_CONDENSED:	aInfo.m_eWidth = psp::width::UltraCondensed;break;
+        case PANGO_STRETCH_EXTRA_CONDENSED:	aInfo.m_eWidth = psp::width::ExtraCondensed;break;
+        case PANGO_STRETCH_CONDENSED:		aInfo.m_eWidth = psp::width::Condensed;break;
+        case PANGO_STRETCH_SEMI_CONDENSED:	aInfo.m_eWidth = psp::width::SemiCondensed;break;
+        case PANGO_STRETCH_NORMAL:			aInfo.m_eWidth = psp::width::Normal;break;
+        case PANGO_STRETCH_SEMI_EXPANDED:	aInfo.m_eWidth = psp::width::SemiExpanded;break;
+        case PANGO_STRETCH_EXPANDED:		aInfo.m_eWidth = psp::width::Expanded;break;
+        case PANGO_STRETCH_EXTRA_EXPANDED:	aInfo.m_eWidth = psp::width::ExtraExpanded;break;
+        case PANGO_STRETCH_ULTRA_EXPANDED:	aInfo.m_eWidth = psp::width::UltraExpanded;break;
     }
 
 #if OSL_DEBUG_LEVEL > 1
@@ -3548,7 +3548,7 @@ void GtkSalGraphics::updateSettings( AllSettings& rSettings )
              aInfo.m_nID != 0 ? "succeeded" : "failed",
              OUStringToOString( aInfo.m_aFamilyName, RTL_TEXTENCODING_ISO_8859_1 ).getStr() );
 #endif
-
+    
     sal_Int32 nDispDPIY = GetDisplay()->GetResolution().B();
     int nPointHeight = 0;
     static gboolean(*pAbso)(const PangoFontDescription*) =
@@ -3558,7 +3558,7 @@ void GtkSalGraphics::updateSettings( AllSettings& rSettings )
         nPointHeight = (nPangoHeight * 72 + nDispDPIY*PANGO_SCALE/2) / (nDispDPIY * PANGO_SCALE);
     else
         nPointHeight = nPangoHeight/PANGO_SCALE;
-
+    
     Font aFont( aInfo.m_aFamilyName, Size( 0, nPointHeight ) );
     if( aInfo.m_eWeight != psp::weight::Unknown )
         aFont.SetWeight( PspGraphics::ToFontWeight( aInfo.m_eWeight ) );
@@ -3571,8 +3571,6 @@ void GtkSalGraphics::updateSettings( AllSettings& rSettings )
 
     aStyleSet.SetAppFont( aFont );
     aStyleSet.SetHelpFont( aFont );
-    aStyleSet.SetTitleFont( aFont );
-    aStyleSet.SetFloatTitleFont( aFont );
     aStyleSet.SetMenuFont( aFont );
     aStyleSet.SetToolFont( aFont );
     aStyleSet.SetLabelFont( aFont );
@@ -3583,6 +3581,10 @@ void GtkSalGraphics::updateSettings( AllSettings& rSettings )
     aStyleSet.SetIconFont( aFont );
     aStyleSet.SetGroupFont( aFont );
 
+    aFont.SetWeight( WEIGHT_BOLD );
+    aStyleSet.SetTitleFont( aFont );
+    aStyleSet.SetFloatTitleFont( aFont );
+
     // get cursor blink time
     GtkSettings *pSettings = gtk_widget_get_settings( gWidgetData[m_nScreen].gEditBoxWidget );
     gboolean blink = false;
@@ -3609,7 +3611,7 @@ void GtkSalGraphics::updateSettings( AllSettings& rSettings )
     gint slider_width = 14;
     gint trough_border = 1;
     gint min_slider_length = 21;
-
+    
     // Grab some button style attributes
     gtk_widget_style_get( gWidgetData[m_nScreen].gScrollHorizWidget,
                           "slider-width", &slider_width,
@@ -3627,14 +3629,14 @@ void GtkSalGraphics::updateSettings( AllSettings& rSettings )
     g_free( pIconThemeName );
 
     //  FIXME: need some way of fetching toolbar icon size.
-//  aStyleSet.SetToolbarIconSize( STYLE_TOOLBAR_ICONSIZE_SMALL );
+//	aStyleSet.SetToolbarIconSize( STYLE_TOOLBAR_ICONSIZE_SMALL );
 
     const cairo_font_options_t* pNewOptions = NULL;
     if( GdkScreen* pScreen = gdk_display_get_screen( gdk_display_get_default(), m_nScreen ) )
     {
 //#if !GTK_CHECK_VERSION(2,8,1)
 #if !GTK_CHECK_VERSION(2,9,0)
-    static cairo_font_options_t* (*gdk_screen_get_font_options)(GdkScreen*) =
+    static cairo_font_options_t* (*gdk_screen_get_font_options)(GdkScreen*) = 
         (cairo_font_options_t*(*)(GdkScreen*))osl_getAsciiFunctionSymbol( GetSalData()->m_pPlugin, "gdk_screen_get_font_options" );
     if( gdk_screen_get_font_options != NULL )
 #endif
@@ -3646,7 +3648,7 @@ void GtkSalGraphics::updateSettings( AllSettings& rSettings )
     rSettings.SetStyleSettings( aStyleSet );
 
     #if OSL_DEBUG_LEVEL > 1
-    {
+    {    
         GtkSettings* pGtkSettings = gtk_settings_get_default();
         GValue aValue;
         memset( &aValue, 0, sizeof(GValue) );
@@ -3698,8 +3700,8 @@ void GtkSalGraphics::updateSettings( AllSettings& rSettings )
 GdkPixmap* GtkSalGraphics::NWGetPixmapFromScreen( Rectangle srcRect )
 {
     // Create a new pixmap to hold the composite of the window background and the control
-    GdkPixmap * pPixmap     = gdk_pixmap_new( GDK_DRAWABLE(GetGdkWindow()), srcRect.GetWidth(), srcRect.GetHeight(), -1 );
-    GdkGC *  pPixmapGC  = gdk_gc_new( pPixmap );
+    GdkPixmap * pPixmap		= gdk_pixmap_new( GDK_DRAWABLE(GetGdkWindow()), srcRect.GetWidth(), srcRect.GetHeight(), -1 ); 
+    GdkGC *	 pPixmapGC	= gdk_gc_new( pPixmap );
 
     if( !pPixmap || !pPixmapGC )
     {
@@ -3999,13 +4001,13 @@ static void NWEnsureGTKToolbar( int nScreen )
         NWAddWidgetToCacheWindow( gWidgetData[nScreen].gToolbarWidget, nScreen );
         gWidgetData[nScreen].gToolbarButtonWidget = gtk_button_new();
         gWidgetData[nScreen].gToolbarToggleWidget = gtk_toggle_button_new();
-
+        
         GtkReliefStyle aRelief = GTK_RELIEF_NORMAL;
         gtk_widget_ensure_style( gWidgetData[nScreen].gToolbarWidget );
         gtk_widget_style_get( gWidgetData[nScreen].gToolbarWidget,
                               "button_relief", &aRelief,
                               (char *)NULL);
-
+                              
         gtk_button_set_relief( GTK_BUTTON(gWidgetData[nScreen].gToolbarButtonWidget), aRelief );
         GTK_WIDGET_UNSET_FLAGS( gWidgetData[nScreen].gToolbarButtonWidget, GTK_CAN_FOCUS );
         GTK_WIDGET_UNSET_FLAGS( gWidgetData[nScreen].gToolbarButtonWidget, GTK_CAN_DEFAULT );
@@ -4014,7 +4016,7 @@ static void NWEnsureGTKToolbar( int nScreen )
         gtk_button_set_relief( GTK_BUTTON(gWidgetData[nScreen].gToolbarToggleWidget), aRelief );
         GTK_WIDGET_UNSET_FLAGS( gWidgetData[nScreen].gToolbarToggleWidget, GTK_CAN_FOCUS );
         GTK_WIDGET_UNSET_FLAGS( gWidgetData[nScreen].gToolbarToggleWidget, GTK_CAN_DEFAULT );
-        NWAddWidgetToCacheWindow( gWidgetData[nScreen].gToolbarToggleWidget, nScreen );
+        NWAddWidgetToCacheWindow( gWidgetData[nScreen].gToolbarToggleWidget, nScreen );        
     }
     if( ! gWidgetData[nScreen].gHandleBoxWidget )
     {
@@ -4035,7 +4037,7 @@ static void NWEnsureGTKMenubar( int nScreen )
         gtk_widget_show( gWidgetData[nScreen].gMenuItemMenubarWidget );
         NWAddWidgetToCacheWindow( gWidgetData[nScreen].gMenubarWidget, nScreen );
         gtk_widget_show( gWidgetData[nScreen].gMenubarWidget );
-
+        
         // do what NWAddWidgetToCacheWindow does except adding to def container
         gtk_widget_realize( gWidgetData[nScreen].gMenuItemMenubarWidget );
         gtk_widget_ensure_style( gWidgetData[nScreen].gMenuItemMenubarWidget );
@@ -4053,12 +4055,12 @@ static void NWEnsureGTKMenu( int nScreen )
         gWidgetData[nScreen].gMenuItemCheckMenuWidget = gtk_check_menu_item_new_with_label( "b" );
         gWidgetData[nScreen].gMenuItemRadioMenuWidget = gtk_radio_menu_item_new_with_label( NULL, "b" );
         gWidgetData[nScreen].gImageMenuItem           = gtk_image_menu_item_new();
-
+        
         gtk_menu_shell_append( GTK_MENU_SHELL( gWidgetData[nScreen].gMenuWidget ), gWidgetData[nScreen].gMenuItemMenuWidget );
         gtk_menu_shell_append( GTK_MENU_SHELL( gWidgetData[nScreen].gMenuWidget ), gWidgetData[nScreen].gMenuItemCheckMenuWidget );
         gtk_menu_shell_append( GTK_MENU_SHELL( gWidgetData[nScreen].gMenuWidget ), gWidgetData[nScreen].gMenuItemRadioMenuWidget );
         gtk_menu_shell_append( GTK_MENU_SHELL( gWidgetData[nScreen].gMenuWidget ), gWidgetData[nScreen].gImageMenuItem );
-
+        
         // do what NWAddWidgetToCacheWindow does except adding to def container
         gtk_widget_realize( gWidgetData[nScreen].gMenuWidget );
         gtk_widget_ensure_style( gWidgetData[nScreen].gMenuWidget );
diff --git a/vcl/unx/gtk/window/gtkframe.cxx b/vcl/unx/gtk/window/gtkframe.cxx
index c6ff16f8395b..24e68e99e3f7 100644
--- a/vcl/unx/gtk/window/gtkframe.cxx
+++ b/vcl/unx/gtk/window/gtkframe.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
@@ -156,61 +156,61 @@ static USHORT GetKeyCode( guint keyval )
         switch( keyval )
         {
             case GDK_KP_Down:
-            case GDK_Down:          nCode = KEY_DOWN;       break;
+            case GDK_Down:			nCode = KEY_DOWN;		break;
             case GDK_KP_Up:
-            case GDK_Up:            nCode = KEY_UP;         break;
+            case GDK_Up:			nCode = KEY_UP;			break;
             case GDK_KP_Left:
-            case GDK_Left:          nCode = KEY_LEFT;       break;
+            case GDK_Left:			nCode = KEY_LEFT;		break;
             case GDK_KP_Right:
-            case GDK_Right:         nCode = KEY_RIGHT;      break;
+            case GDK_Right:			nCode =	KEY_RIGHT;		break;
             case GDK_KP_Begin:
             case GDK_KP_Home:
             case GDK_Begin:
-            case GDK_Home:          nCode = KEY_HOME;       break;
+            case GDK_Home:			nCode = KEY_HOME;		break;
             case GDK_KP_End:
-            case GDK_End:           nCode = KEY_END;        break;
+            case GDK_End:			nCode = KEY_END;		break;
             case GDK_KP_Page_Up:
-            case GDK_Page_Up:       nCode = KEY_PAGEUP;     break;
+            case GDK_Page_Up:       nCode = KEY_PAGEUP;		break;
             case GDK_KP_Page_Down:
-            case GDK_Page_Down:     nCode = KEY_PAGEDOWN;   break;
+            case GDK_Page_Down:		nCode = KEY_PAGEDOWN;	break;
             case GDK_KP_Enter:
-            case GDK_Return:        nCode = KEY_RETURN;     break;
-            case GDK_Escape:        nCode = KEY_ESCAPE;     break;
+            case GDK_Return:		nCode = KEY_RETURN;		break;
+            case GDK_Escape:		nCode = KEY_ESCAPE;		break;
             case GDK_ISO_Left_Tab:
             case GDK_KP_Tab:
-            case GDK_Tab:           nCode = KEY_TAB;        break;
-            case GDK_BackSpace:     nCode = KEY_BACKSPACE;  break;
+            case GDK_Tab:			nCode = KEY_TAB;		break;
+            case GDK_BackSpace:		nCode = KEY_BACKSPACE;	break;
             case GDK_KP_Space:
-            case GDK_space:         nCode = KEY_SPACE;      break;
+            case GDK_space:			nCode = KEY_SPACE;		break;
             case GDK_KP_Insert:
-            case GDK_Insert:        nCode = KEY_INSERT;     break;
+            case GDK_Insert:		nCode = KEY_INSERT;		break;
             case GDK_KP_Delete:
-            case GDK_Delete:        nCode = KEY_DELETE;     break;
+            case GDK_Delete:		nCode = KEY_DELETE;		break;
             case GDK_plus:
-            case GDK_KP_Add:        nCode = KEY_ADD;        break;
+            case GDK_KP_Add:		nCode = KEY_ADD;		break;
             case GDK_minus:
-            case GDK_KP_Subtract:   nCode = KEY_SUBTRACT;   break;
+            case GDK_KP_Subtract:	nCode = KEY_SUBTRACT;	break;
             case GDK_asterisk:
-            case GDK_KP_Multiply:   nCode = KEY_MULTIPLY;   break;
+            case GDK_KP_Multiply:	nCode = KEY_MULTIPLY;	break;
             case GDK_slash:
-            case GDK_KP_Divide:     nCode = KEY_DIVIDE;     break;
+            case GDK_KP_Divide:		nCode = KEY_DIVIDE;		break;
             case GDK_period:
-            case GDK_decimalpoint:  nCode = KEY_POINT;      break;
-            case GDK_comma:         nCode = KEY_COMMA;      break;
-            case GDK_less:          nCode = KEY_LESS;       break;
-            case GDK_greater:       nCode = KEY_GREATER;    break;
+            case GDK_decimalpoint:	nCode = KEY_POINT;		break;
+            case GDK_comma:			nCode = KEY_COMMA;		break;
+            case GDK_less:			nCode = KEY_LESS;		break;
+            case GDK_greater:		nCode = KEY_GREATER;	break;
             case GDK_KP_Equal:
-            case GDK_equal:         nCode = KEY_EQUAL;      break;
-            case GDK_Find:          nCode = KEY_FIND;       break;
-            case GDK_Menu:          nCode = KEY_CONTEXTMENU;break;
-            case GDK_Help:          nCode = KEY_HELP;       break;
-            case GDK_Undo:          nCode = KEY_UNDO;       break;
+            case GDK_equal:			nCode = KEY_EQUAL;		break;
+            case GDK_Find:			nCode = KEY_FIND;		break;
+            case GDK_Menu:			nCode = KEY_CONTEXTMENU;break;
+            case GDK_Help:			nCode = KEY_HELP;		break;
+            case GDK_Undo:			nCode = KEY_UNDO;		break;
             case GDK_Redo:          nCode = KEY_REPEAT;     break;
             case GDK_KP_Decimal:
-            case GDK_KP_Separator:  nCode = KEY_DECIMAL;    break;
-            case GDK_asciitilde:    nCode = KEY_TILDE;      break;
+            case GDK_KP_Separator:	nCode = KEY_DECIMAL;	break;
+            case GDK_asciitilde:	nCode = KEY_TILDE;		break;
             case GDK_leftsinglequotemark:
-            case GDK_quoteleft: nCode = KEY_QUOTELEFT;      break;
+            case GDK_quoteleft:	nCode = KEY_QUOTELEFT;		break;           
             // some special cases, also see saldisp.cxx
             // - - - - - - - - - - - - -  Apollo - - - - - - - - - - - - - 0x1000
             case 0x1000FF02: // apXK_Copy
@@ -297,8 +297,8 @@ static USHORT GetKeyCode( guint keyval )
 // in the independent part.
 struct KeyAlternate
 {
-    USHORT          nKeyCode;
-    sal_Unicode     nCharCode;
+    USHORT			nKeyCode;
+    sal_Unicode		nCharCode;
     KeyAlternate() : nKeyCode( 0 ), nCharCode( 0 ) {}
     KeyAlternate( USHORT nKey, sal_Unicode nChar = 0 ) : nKeyCode( nKey ), nCharCode( nChar ) {}
 };
@@ -329,10 +329,10 @@ void GtkSalFrame::doKeyCallback( guint state,
 {
     SalKeyEvent aEvent;
 
-    aEvent.mnTime           = time;
-    aEvent.mnCharCode       = aOrigCode;
-    aEvent.mnRepeat         = 0;
-
+    aEvent.mnTime			= time;    
+    aEvent.mnCharCode		= aOrigCode;
+    aEvent.mnRepeat			= 0;
+    
     vcl::DeletionListener aDel( this );
     /* #i42122# translate all keys with Ctrl and/or Alt to group 0
     *  else shortcuts (e.g. Ctrl-o) will not work but be inserted by
@@ -358,11 +358,11 @@ void GtkSalFrame::doKeyCallback( guint state,
                                                  &level,
                                                  &consumed ) )
         {
-            aEvent.mnCode   = GetKeyCode( updated_keyval );
+            aEvent.mnCode	= GetKeyCode( updated_keyval );
         }
     }
-    aEvent.mnCode   |= GetKeyModCode( state );
-
+    aEvent.mnCode	|= GetKeyModCode( state );
+    
     if( bDown )
     {
         bool bHandled = CallCallback( SALEVENT_KEYINPUT, &aEvent );
@@ -396,8 +396,8 @@ GtkSalFrame::GtkSalFrame( SalFrame* pParent, ULONG nStyle )
 {
     m_nScreen = getDisplay()->GetDefaultScreenNumber();
     getDisplay()->registerFrame( this );
-    m_bDefaultPos       = true;
-    m_bDefaultSize      = ( (nStyle & SAL_FRAME_STYLE_SIZEABLE) && ! pParent );
+    m_bDefaultPos		= true;
+    m_bDefaultSize		= ( (nStyle & SAL_FRAME_STYLE_SIZEABLE) && ! pParent );
     m_bWindowIsGtkPlug  = false;
     Init( pParent, nStyle );
 }
@@ -407,8 +407,8 @@ GtkSalFrame::GtkSalFrame( SystemParentData* pSysData )
     m_nScreen = getDisplay()->GetDefaultScreenNumber();
     getDisplay()->registerFrame( this );
     getDisplay()->setHaveSystemChildFrame();
-    m_bDefaultPos       = true;
-    m_bDefaultSize      = true;
+    m_bDefaultPos		= true;
+    m_bDefaultSize		= true;
     Init( pSysData );
 }
 
@@ -424,9 +424,9 @@ GtkSalFrame::~GtkSalFrame()
 
     if( m_pParent )
         m_pParent->m_aChildren.remove( this );
-
+    
     getDisplay()->deregisterFrame( this );
-
+    
     if( m_pRegion )
         gdk_region_destroy( m_pRegion );
 
@@ -474,13 +474,13 @@ void GtkSalFrame::resizeWindow( long nWidth, long nHeight )
     else if( ! isChild( true, false ) )
         gtk_window_resize( GTK_WINDOW(m_pWindow), nWidth, nHeight );
 }
-
+    
 /*
  * Always use a sub-class of GtkFixed we can tag for a11y. This allows us to
- * utilize GAIL for the toplevel window and toolkit implementation incl.
+ * utilize GAIL for the toplevel window and toolkit implementation incl. 
  * key event listener support ..
  */
-
+  
 GType
 ooo_fixed_get_type()
 {
@@ -501,11 +501,11 @@ ooo_fixed_get_type()
             NULL                       /* value table */
         };
 
-        type = g_type_register_static( GTK_TYPE_FIXED, "OOoFixed",
+        type = g_type_register_static( GTK_TYPE_FIXED, "OOoFixed", 
                                        &tinfo, (GTypeFlags) 0);
     }
 
-    return type;
+    return type;									
 }
 
 void GtkSalFrame::updateScreenNumber()
@@ -556,10 +556,10 @@ void GtkSalFrame::InitCommon()
     m_nKeyModifiers     = 0;
     m_bSingleAltPress   = false;
     m_bFullscreen       = false;
-    m_nState            = GDK_WINDOW_STATE_WITHDRAWN;
-    m_nVisibility       = GDK_VISIBILITY_FULLY_OBSCURED;
+    m_nState			= GDK_WINDOW_STATE_WITHDRAWN;
+    m_nVisibility		= GDK_VISIBILITY_FULLY_OBSCURED;
     m_bSendModChangeOnRelease = false;
-    m_pIMHandler        = NULL;
+    m_pIMHandler		= NULL;
     m_hBackgroundPixmap = None;
     m_nSavedScreenSaverTimeout = 0;
     m_nGSMCookie = 0;
@@ -567,7 +567,7 @@ void GtkSalFrame::InitCommon()
     m_pRegion           = NULL;
     m_ePointerStyle     = 0xffff;
     m_bSetFocusOnMap    = false;
-
+    
     gtk_widget_set_app_paintable( m_pWindow, TRUE );
     gtk_widget_set_double_buffered( m_pWindow, FALSE );
     gtk_widget_set_redraw_on_allocate( m_pWindow, FALSE );
@@ -581,7 +581,7 @@ void GtkSalFrame::InitCommon()
     // fixed is needed since we have to position plugin windows
     m_pFixedContainer = GTK_FIXED(g_object_new( ooo_fixed_get_type(), NULL ));
     gtk_container_add( GTK_CONTAINER(m_pWindow), GTK_WIDGET(m_pFixedContainer) );
-
+    
     // show the widgets
     gtk_widget_show( GTK_WIDGET(m_pFixedContainer) );
 
@@ -590,42 +590,42 @@ void GtkSalFrame::InitCommon()
 
     //system data
     SalDisplay* pDisp = GetX11SalData()->GetDisplay();
-    m_aSystemData.nSize         = sizeof( SystemChildData );
-    m_aSystemData.pDisplay      = pDisp->GetDisplay();
-    m_aSystemData.aWindow       = GDK_WINDOW_XWINDOW(m_pWindow->window);
-    m_aSystemData.pSalFrame     = this;
-    m_aSystemData.pWidget       = m_pWindow;
-    m_aSystemData.pVisual       = pDisp->GetVisual( m_nScreen ).GetVisual();
-    m_aSystemData.nScreen       = m_nScreen;
-    m_aSystemData.nDepth        = pDisp->GetVisual( m_nScreen ).GetDepth();
-    m_aSystemData.aColormap     = pDisp->GetColormap( m_nScreen ).GetXColormap();
-    m_aSystemData.pAppContext   = NULL;
-    m_aSystemData.aShellWindow  = m_aSystemData.aWindow;
-    m_aSystemData.pShellWidget  = m_aSystemData.pWidget;
+    m_aSystemData.nSize 		= sizeof( SystemChildData );
+    m_aSystemData.pDisplay		= pDisp->GetDisplay();
+    m_aSystemData.aWindow		= GDK_WINDOW_XWINDOW(m_pWindow->window);
+    m_aSystemData.pSalFrame		= this;
+    m_aSystemData.pWidget		= m_pWindow;
+    m_aSystemData.pVisual		= pDisp->GetVisual( m_nScreen ).GetVisual();
+    m_aSystemData.nScreen		= m_nScreen;
+    m_aSystemData.nDepth		= pDisp->GetVisual( m_nScreen ).GetDepth();
+    m_aSystemData.aColormap		= pDisp->GetColormap( m_nScreen ).GetXColormap();
+    m_aSystemData.pAppContext	= NULL;
+    m_aSystemData.aShellWindow	= m_aSystemData.aWindow;
+    m_aSystemData.pShellWidget	= m_aSystemData.pWidget;
 
 
     // fake an initial geometry, gets updated via configure event or SetPosSize
     if( m_bDefaultPos || m_bDefaultSize )
     {
         Size aDefSize = calcDefaultSize();
-        maGeometry.nX                   = -1;
-        maGeometry.nY                   = -1;
-        maGeometry.nWidth               = aDefSize.Width();
-        maGeometry.nHeight              = aDefSize.Height();
+        maGeometry.nX					= -1;
+        maGeometry.nY					= -1;
+        maGeometry.nWidth				= aDefSize.Width();
+        maGeometry.nHeight				= aDefSize.Height();
         if( m_pParent )
         {
             // approximation
-            maGeometry.nTopDecoration       = m_pParent->maGeometry.nTopDecoration;
-            maGeometry.nBottomDecoration    = m_pParent->maGeometry.nBottomDecoration;
-            maGeometry.nLeftDecoration      = m_pParent->maGeometry.nLeftDecoration;
-            maGeometry.nRightDecoration     = m_pParent->maGeometry.nRightDecoration;
+            maGeometry.nTopDecoration		= m_pParent->maGeometry.nTopDecoration;
+            maGeometry.nBottomDecoration	= m_pParent->maGeometry.nBottomDecoration;
+            maGeometry.nLeftDecoration		= m_pParent->maGeometry.nLeftDecoration;
+            maGeometry.nRightDecoration		= m_pParent->maGeometry.nRightDecoration;
         }
         else
         {
-            maGeometry.nTopDecoration       = 0;
-            maGeometry.nBottomDecoration    = 0;
-            maGeometry.nLeftDecoration      = 0;
-            maGeometry.nRightDecoration     = 0;
+            maGeometry.nTopDecoration		= 0;
+            maGeometry.nBottomDecoration	= 0;
+            maGeometry.nLeftDecoration		= 0;
+            maGeometry.nRightDecoration		= 0;
         }
     }
     else
@@ -660,7 +660,7 @@ extern "C" {
     typedef void(*setAcceptFn)( GtkWindow*, gboolean );
     static setAcceptFn p_gtk_window_set_accept_focus = NULL;
     static bool bGetAcceptFocusFn = true;
-
+    
     typedef void(*setUserTimeFn)( GdkWindow*, guint32 );
     static setUserTimeFn p_gdk_x11_window_set_user_time = NULL;
     static bool bGetSetUserTimeFn = true;
@@ -745,7 +745,7 @@ static void lcl_set_user_time( GdkWindow* i_pWindow, guint32 i_nTime )
         {
             XChangeProperty( pDisplay, aWindow,
                              nUserTime, XA_CARDINAL, 32,
-                             PropModeReplace, (unsigned char*)&i_nTime, 1 );
+                             PropModeReplace, (unsigned char*)&i_nTime, 1 ); 
         }
     }
 };
@@ -809,7 +809,7 @@ void GtkSalFrame::Init( SalFrame* pParent, ULONG nStyle )
         bool bNoDecor = ! (nStyle & (SAL_FRAME_STYLE_MOVEABLE | SAL_FRAME_STYLE_SIZEABLE | SAL_FRAME_STYLE_CLOSEABLE ) );
         GdkWindowTypeHint eType = GDK_WINDOW_TYPE_HINT_NORMAL;
         if( (nStyle & SAL_FRAME_STYLE_DIALOG) && m_pParent != 0 )
-            eType = GDK_WINDOW_TYPE_HINT_DIALOG;
+            eType = GDK_WINDOW_TYPE_HINT_DIALOG; 
         if( (nStyle & SAL_FRAME_STYLE_INTRO) )
         {
             gtk_window_set_role( GTK_WINDOW(m_pWindow), "splashscreen" );
@@ -830,14 +830,14 @@ void GtkSalFrame::Init( SalFrame* pParent, ULONG nStyle )
         {
             eType = GDK_WINDOW_TYPE_HINT_UTILITY;
         }
-
+        
         if( (nStyle & SAL_FRAME_STYLE_PARTIAL_FULLSCREEN )
             && getDisplay()->getWMAdaptor()->isLegacyPartialFullscreen() )
         {
             eType = GDK_WINDOW_TYPE_HINT_TOOLBAR;
             gtk_window_set_keep_above( GTK_WINDOW(m_pWindow), true );
         }
-
+        
         gtk_window_set_type_hint( GTK_WINDOW(m_pWindow), eType );
         if( bNoDecor )
             gtk_window_set_decorated( GTK_WINDOW(m_pWindow), FALSE );
@@ -872,7 +872,7 @@ void GtkSalFrame::Init( SalFrame* pParent, ULONG nStyle )
         if( ( (nStyle & (SAL_FRAME_STYLE_OWNERDRAWDECORATION)) ) )
             lcl_set_accept_focus( GTK_WINDOW(m_pWindow), FALSE, false );
     }
-
+    
 }
 
 GdkNativeWindow GtkSalFrame::findTopLevelSystemWindow( GdkNativeWindow aWindow )
@@ -912,7 +912,7 @@ void GtkSalFrame::Init( SystemParentData* pSysData )
     m_aForeignTopLevelWindow = findTopLevelSystemWindow( (GdkNativeWindow)pSysData->aWindow );
     m_pForeignTopLevel = gdk_window_foreign_new_for_display( getGdkDisplay(), m_aForeignTopLevelWindow );
     gdk_window_set_events( m_pForeignTopLevel, GDK_STRUCTURE_MASK );
-
+        
     if( pSysData->nSize > sizeof(pSysData->nSize)+sizeof(pSysData->aWindow) && pSysData->bXEmbedSupport )
     {
         m_pWindow = gtk_plug_new( pSysData->aWindow );
@@ -951,7 +951,7 @@ void GtkSalFrame::Init( SystemParentData* pSysData )
 void GtkSalFrame::askForXEmbedFocus( sal_Int32 i_nTimeCode )
 {
     XEvent aEvent;
-
+    
     rtl_zeroMemory( &aEvent, sizeof(aEvent) );
     aEvent.xclient.window = m_aForeignParentWindow;
     aEvent.xclient.type = ClientMessage;
@@ -962,7 +962,7 @@ void GtkSalFrame::askForXEmbedFocus( sal_Int32 i_nTimeCode )
     aEvent.xclient.data.l[2] = 0;
     aEvent.xclient.data.l[3] = 0;
     aEvent.xclient.data.l[4] = 0;
-
+    
     getDisplay()->GetXLib()->PushXErrorLevel( true );
     XSendEvent( getDisplay()->GetDisplay(),
                 m_aForeignParentWindow,
@@ -1128,7 +1128,7 @@ void GtkSalFrame::SetIcon( USHORT nIcon )
         nOffsets[0] = SV_ICON_LARGE_HC_START;
         nOffsets[1] = SV_ICON_SMALL_HC_START;
     }
-
+    
     for( nIndex = 0; nIndex < sizeof(nOffsets)/ sizeof(USHORT); nIndex++ )
     {
         // #i44723# workaround gcc temporary problem
@@ -1167,16 +1167,16 @@ void GtkSalFrame::SetIcon( USHORT nIcon )
                 aMask = aIcon.GetAlpha();
             aIcon = BitmapEx( aBmp, aMask );
         }
-
+        
         ImpBitmap *pIconImpBitmap = aIcon.ImplGetBitmapImpBitmap();
         ImpBitmap *pIconImpMask   = aIcon.ImplGetMaskImpBitmap();
-
+        
 
         if( pIconImpBitmap && pIconImpMask )
         {
-            SalBitmap *pIconBitmap =
+            SalBitmap *pIconBitmap = 
                 pIconImpBitmap->ImplGetSalBitmap();
-            SalBitmap *pIconMask =
+            SalBitmap *pIconMask = 
                 pIconImpMask->ImplGetSalBitmap();
 
             if( ( pBuf = bitmapToPixbuf( pIconBitmap, pIconMask ) ) )
@@ -1210,12 +1210,12 @@ void GtkSalFrame::Center()
     }
     else
     {
-        long    nScreenWidth, nScreenHeight;
-        long    nScreenX = 0, nScreenY = 0;
+        long	nScreenWidth, nScreenHeight;
+        long	nScreenX = 0, nScreenY = 0;
 
-        Size aScreenSize = GetX11SalData()->GetDisplay()->GetScreenSize( m_nScreen );
-        nScreenWidth        = aScreenSize.Width();
-        nScreenHeight       = aScreenSize.Height();
+        Size aScreenSize = GetX11SalData()->GetDisplay()->GetScreenSize( m_nScreen ); 
+        nScreenWidth		= aScreenSize.Width();
+        nScreenHeight		= aScreenSize.Height();
         if( GetX11SalData()->GetDisplay()->IsXinerama() )
         {
             // get xinerama screen we are on
@@ -1230,10 +1230,10 @@ void GtkSalFrame::Center()
             for( unsigned int i = 0; i < rScreens.size(); i++ )
                 if( rScreens[i].IsInside( Point( x, y ) ) )
                 {
-                    nScreenX            = rScreens[i].Left();
-                    nScreenY            = rScreens[i].Top();
-                    nScreenWidth        = rScreens[i].GetWidth();
-                    nScreenHeight       = rScreens[i].GetHeight();
+                    nScreenX			= rScreens[i].Left();
+                    nScreenY			= rScreens[i].Top();
+                    nScreenWidth		= rScreens[i].GetWidth();
+                    nScreenHeight		= rScreens[i].GetHeight();
                     break;
                 }
         }
@@ -1245,7 +1245,7 @@ void GtkSalFrame::Center()
 
 Size GtkSalFrame::calcDefaultSize()
 {
-    Size aScreenSize = GetX11SalData()->GetDisplay()->GetScreenSize( m_nScreen );
+    Size aScreenSize = GetX11SalData()->GetDisplay()->GetScreenSize( m_nScreen ); 
     long w = aScreenSize.Width();
     long h = aScreenSize.Height();
 
@@ -1292,7 +1292,7 @@ void GtkSalFrame::Show( BOOL bVisible, BOOL bNoActivate )
 {
     if( m_pWindow )
     {
-        if( m_pParent && (m_pParent->m_nStyle & SAL_FRAME_STYLE_PARTIAL_FULLSCREEN)
+        if( m_pParent && (m_pParent->m_nStyle & SAL_FRAME_STYLE_PARTIAL_FULLSCREEN) 
             && getDisplay()->getWMAdaptor()->isLegacyPartialFullscreen() )
             gtk_window_set_keep_above( GTK_WINDOW(m_pWindow), bVisible );
         if( bVisible )
@@ -1300,17 +1300,17 @@ void GtkSalFrame::Show( BOOL bVisible, BOOL bNoActivate )
             SessionManagerClient::open(); // will simply return after the first time
             initClientId();
             getDisplay()->startupNotificationCompleted();
-
+            
             if( m_bDefaultPos )
                 Center();
             if( m_bDefaultSize )
                 SetDefaultSize();
             setMinMaxSize();
-
+            
             // #i45160# switch to desktop where a dialog with parent will appear
             if( m_pParent && m_pParent->m_nWorkArea != m_nWorkArea && GTK_WIDGET_MAPPED(m_pParent->m_pWindow) )
                 getDisplay()->getWMAdaptor()->switchToWorkArea( m_pParent->m_nWorkArea );
-
+            
             if( isFloatGrabWindow() &&
                 m_pParent &&
                 m_nFloats == 0 &&
@@ -1336,7 +1336,7 @@ void GtkSalFrame::Show( BOOL bVisible, BOOL bNoActivate )
             // metacity-2.24.0/src/core/window.c
             //
             //  if ((focus_window != NULL) && XSERVER_TIME_IS_BEFORE (compare, focus_window->net_wm_user_time))
-            //      "compare" window focus prevented by other activity
+            //  	"compare" window focus prevented by other activity
             //
             //  where "compare" is this window
 
@@ -1364,7 +1364,7 @@ void GtkSalFrame::Show( BOOL bVisible, BOOL bNoActivate )
                 //nUserTime = gdk_x11_get_server_time(GTK_WIDGET (m_pWindow)->window);
             }
             lcl_set_user_time( GTK_WIDGET(m_pWindow)->window, nUserTime );
-
+            
             if( bHack && ! bNoActivate && (m_nStyle & SAL_FRAME_STYLE_TOOLWINDOW) )
                 m_bSetFocusOnMap = true;
 
@@ -1429,14 +1429,14 @@ void GtkSalFrame::setMinMaxSize()
         {
             if( m_aMinSize.Width() && m_aMinSize.Height() )
             {
-                aGeo.min_width  = m_aMinSize.Width()+CONTAINER_ADJUSTMENT;
-                aGeo.min_height = m_aMinSize.Height()+CONTAINER_ADJUSTMENT;
+                aGeo.min_width	= m_aMinSize.Width()+CONTAINER_ADJUSTMENT;
+                aGeo.min_height	= m_aMinSize.Height()+CONTAINER_ADJUSTMENT;
                 aHints |= GDK_HINT_MIN_SIZE;
             }
             if( m_aMaxSize.Width() && m_aMaxSize.Height() && ! m_bFullscreen )
             {
-                aGeo.max_width  = m_aMaxSize.Width()+CONTAINER_ADJUSTMENT;
-                aGeo.max_height = m_aMaxSize.Height()+CONTAINER_ADJUSTMENT;
+                aGeo.max_width	= m_aMaxSize.Width()+CONTAINER_ADJUSTMENT;
+                aGeo.max_height	= m_aMaxSize.Height()+CONTAINER_ADJUSTMENT;
                 aHints |= GDK_HINT_MAX_SIZE;
             }
         }
@@ -1452,12 +1452,6 @@ void GtkSalFrame::setMinMaxSize()
                 aHints |= GDK_HINT_MAX_SIZE;
             }
         }
-        if( m_bFullscreen )
-        {
-            aGeo.max_width = m_aMaxSize.Width();
-            aGeo.max_height = m_aMaxSize.Height();
-            aHints |= GDK_HINT_MAX_SIZE;
-        }
         if( aHints )
             gtk_window_set_geometry_hints( GTK_WINDOW(m_pWindow),
                                            NULL,
@@ -1506,8 +1500,8 @@ void GtkSalFrame::SetPosSize( long nX, long nY, long nWidth, long nHeight, USHOR
 
         if( (unsigned long)nWidth != maGeometry.nWidth || (unsigned long)nHeight != maGeometry.nHeight )
             bSized = true;
-        maGeometry.nWidth   = nWidth;
-        maGeometry.nHeight  = nHeight;
+        maGeometry.nWidth	= nWidth;
+        maGeometry.nHeight	= nHeight;
 
         if( isChild( false, true ) )
             gtk_widget_set_size_request( m_pWindow, nWidth, nHeight );
@@ -1529,10 +1523,10 @@ void GtkSalFrame::SetPosSize( long nX, long nY, long nWidth, long nHeight, USHOR
             nX += m_pParent->maGeometry.nX;
             nY += m_pParent->maGeometry.nY;
         }
-
+        
         // adjust position to avoid off screen windows
         // but allow toolbars to be positioned partly off screen by the user
-        Size aScreenSize = GetX11SalData()->GetDisplay()->GetScreenSize( m_nScreen );
+        Size aScreenSize = GetX11SalData()->GetDisplay()->GetScreenSize( m_nScreen ); 
         if( ! (m_nStyle & SAL_FRAME_STYLE_OWNERDRAWDECORATION) )
         {
             if( nX < (long)maGeometry.nLeftDecoration )
@@ -1555,14 +1549,14 @@ void GtkSalFrame::SetPosSize( long nX, long nY, long nWidth, long nHeight, USHOR
             if( nY > (long)aScreenSize.Height() - 10 )
                 nY = (long)aScreenSize.Height() - 10;
         }
-
+        
         if( nX != maGeometry.nX || nY != maGeometry.nY )
             bMoved = true;
         maGeometry.nX = nX;
         maGeometry.nY = nY;
-
+        
         m_bDefaultPos = false;
-
+        
         moveWindow( maGeometry.nX, maGeometry.nY );
 
         updateScreenNumber();
@@ -1605,13 +1599,13 @@ void GtkSalFrame::SetWindowState( const SalFrameState* pState )
 {
     if( ! m_pWindow || ! pState || isChild( true, false ) )
         return;
-
+    
     const ULONG nMaxGeometryMask =
         SAL_FRAMESTATE_MASK_X | SAL_FRAMESTATE_MASK_Y |
         SAL_FRAMESTATE_MASK_WIDTH | SAL_FRAMESTATE_MASK_HEIGHT |
         SAL_FRAMESTATE_MASK_MAXIMIZED_X | SAL_FRAMESTATE_MASK_MAXIMIZED_Y |
         SAL_FRAMESTATE_MASK_MAXIMIZED_WIDTH | SAL_FRAMESTATE_MASK_MAXIMIZED_HEIGHT;
-
+    
     if( (pState->mnMask & SAL_FRAMESTATE_MASK_STATE) &&
         ! ( m_nState & GDK_WINDOW_STATE_MAXIMIZED ) &&
         (pState->mnState & SAL_FRAMESTATE_MAXIMIZED) &&
@@ -1620,7 +1614,7 @@ void GtkSalFrame::SetWindowState( const SalFrameState* pState )
         resizeWindow( pState->mnWidth, pState->mnHeight );
         moveWindow( pState->mnX, pState->mnY );
         m_bDefaultPos = m_bDefaultSize = false;
-
+                               
         maGeometry.nX       = pState->mnMaximizedX;
         maGeometry.nY       = pState->mnMaximizedY;
         maGeometry.nWidth   = pState->mnMaximizedWidth;
@@ -1635,10 +1629,10 @@ void GtkSalFrame::SetWindowState( const SalFrameState* pState )
                                SAL_FRAMESTATE_MASK_WIDTH | SAL_FRAMESTATE_MASK_HEIGHT ) )
     {
         USHORT nPosSizeFlags = 0;
-        long nX         = pState->mnX - (m_pParent ? m_pParent->maGeometry.nX : 0);
-        long nY         = pState->mnY - (m_pParent ? m_pParent->maGeometry.nY : 0);
-        long nWidth     = pState->mnWidth;
-        long nHeight    = pState->mnHeight;
+        long nX			= pState->mnX - (m_pParent ? m_pParent->maGeometry.nX : 0);
+        long nY			= pState->mnY - (m_pParent ? m_pParent->maGeometry.nY : 0);
+        long nWidth		= pState->mnWidth;
+        long nHeight	= pState->mnHeight;
         if( pState->mnMask & SAL_FRAMESTATE_MASK_X )
             nPosSizeFlags |= SAL_FRAME_POSSIZE_X;
         else
@@ -1697,22 +1691,22 @@ BOOL GtkSalFrame::GetWindowState( SalFrameState* pState )
         pState->mnMaximizedY        = maGeometry.nY;
         pState->mnMaximizedWidth    = maGeometry.nWidth;
         pState->mnMaximizedHeight   = maGeometry.nHeight;
-        pState->mnMask  |= SAL_FRAMESTATE_MASK_MAXIMIZED_X          |
-                           SAL_FRAMESTATE_MASK_MAXIMIZED_Y          |
-                           SAL_FRAMESTATE_MASK_MAXIMIZED_WIDTH      |
+        pState->mnMask	|= SAL_FRAMESTATE_MASK_MAXIMIZED_X			|
+                           SAL_FRAMESTATE_MASK_MAXIMIZED_Y			|
+                           SAL_FRAMESTATE_MASK_MAXIMIZED_WIDTH		|
                            SAL_FRAMESTATE_MASK_MAXIMIZED_HEIGHT;
     }
     else
     {
-
-        pState->mnX         = maGeometry.nX;
-        pState->mnY         = maGeometry.nY;
-        pState->mnWidth     = maGeometry.nWidth;
-        pState->mnHeight    = maGeometry.nHeight;
+        
+        pState->mnX			= maGeometry.nX;
+        pState->mnY			= maGeometry.nY;
+        pState->mnWidth		= maGeometry.nWidth;
+        pState->mnHeight	= maGeometry.nHeight;
     }
-    pState->mnMask  |= SAL_FRAMESTATE_MASK_X            |
-                       SAL_FRAMESTATE_MASK_Y            |
-                       SAL_FRAMESTATE_MASK_WIDTH        |
+    pState->mnMask	|= SAL_FRAMESTATE_MASK_X			|
+                       SAL_FRAMESTATE_MASK_Y			|
+                       SAL_FRAMESTATE_MASK_WIDTH		|
                        SAL_FRAMESTATE_MASK_HEIGHT;
 
     return TRUE;
@@ -1722,12 +1716,12 @@ void GtkSalFrame::moveToScreen( int nScreen )
 {
     if( isChild() )
         return;
-
+    
     if( nScreen < 0 || nScreen >= gdk_display_get_n_screens( getGdkDisplay() ) )
         nScreen = m_nScreen;
     if( nScreen == m_nScreen )
         return;
-
+    
     GdkScreen* pScreen = gdk_display_get_screen( getGdkDisplay(), nScreen );
     if( pScreen )
     {
@@ -1737,13 +1731,13 @@ void GtkSalFrame::moveToScreen( int nScreen )
         gtk_widget_realize( m_pWindow );
         // update system data
         GtkSalDisplay* pDisp = getDisplay();
-        m_aSystemData.aWindow       = GDK_WINDOW_XWINDOW(m_pWindow->window);
-        m_aSystemData.pVisual       = pDisp->GetVisual( m_nScreen ).GetVisual();
-        m_aSystemData.nScreen       = nScreen;
-        m_aSystemData.nDepth        = pDisp->GetVisual( m_nScreen ).GetDepth();
-        m_aSystemData.aColormap     = pDisp->GetColormap( m_nScreen ).GetXColormap();
-        m_aSystemData.pAppContext   = NULL;
-        m_aSystemData.aShellWindow  = m_aSystemData.aWindow;
+        m_aSystemData.aWindow		= GDK_WINDOW_XWINDOW(m_pWindow->window);
+        m_aSystemData.pVisual		= pDisp->GetVisual( m_nScreen ).GetVisual();
+        m_aSystemData.nScreen		= nScreen;
+        m_aSystemData.nDepth		= pDisp->GetVisual( m_nScreen ).GetDepth();
+        m_aSystemData.aColormap		= pDisp->GetColormap( m_nScreen ).GetXColormap();
+        m_aSystemData.pAppContext	= NULL;
+        m_aSystemData.aShellWindow	= m_aSystemData.aWindow;
         // update graphics if necessary
         for( unsigned int i = 0; i < sizeof(m_aGraphics)/sizeof(m_aGraphics[0]); i++ )
         {
@@ -1758,7 +1752,7 @@ void GtkSalFrame::moveToScreen( int nScreen )
     std::list< GtkSalFrame* > aChildren = m_aChildren;
     for( std::list< GtkSalFrame* >::iterator it = aChildren.begin(); it != aChildren.end(); ++it )
         (*it)->moveToScreen( m_nScreen );
-
+    
     // FIXME: SalObjects
 }
 
@@ -1766,7 +1760,7 @@ void GtkSalFrame::SetScreenNumber( unsigned int nNewScreen )
 {
     if( nNewScreen == maGeometry.nScreenNumber )
         return;
-
+    
     if( m_pWindow && ! isChild() )
     {
         GtkSalDisplay* pDisp = getDisplay();
@@ -1774,7 +1768,7 @@ void GtkSalFrame::SetScreenNumber( unsigned int nNewScreen )
         {
             if( nNewScreen >= pDisp->GetXineramaScreens().size() )
                 return;
-
+            
             Rectangle aOldScreenRect( pDisp->GetXineramaScreens()[maGeometry.nScreenNumber] );
             Rectangle aNewScreenRect( pDisp->GetXineramaScreens()[nNewScreen] );
             bool bVisible = GTK_WIDGET_MAPPED(m_pWindow);
@@ -1832,7 +1826,11 @@ void GtkSalFrame::ShowFullScreen( BOOL bFullScreen, sal_Int32 nScreen )
                 // workaround different legacy version window managers have different opinions about
                 // _NET_WM_STATE_FULLSCREEN (Metacity <-> KWin)
                 if( ! getDisplay()->getWMAdaptor()->isLegacyPartialFullscreen() )
+                {
+                    if( !(m_nStyle & SAL_FRAME_STYLE_SIZEABLE) )
+                        gtk_window_set_resizable( GTK_WINDOW(m_pWindow), TRUE );
                     gtk_window_fullscreen( GTK_WINDOW( m_pWindow ) );
+                }
                 if( bVisible )
                     Show( TRUE );
             }
@@ -1863,14 +1861,11 @@ void GtkSalFrame::ShowFullScreen( BOOL bFullScreen, sal_Int32 nScreen )
         {
             if( bFullScreen )
             {
-                if( getDisplay()->getWMAdaptor()->isLegacyPartialFullscreen() )
-                {
-                    if( !(m_nStyle & SAL_FRAME_STYLE_SIZEABLE) )
-                        gtk_window_set_resizable( GTK_WINDOW(m_pWindow), TRUE );
-                }
+                if( !(m_nStyle & SAL_FRAME_STYLE_SIZEABLE) )
+                    gtk_window_set_resizable( GTK_WINDOW(m_pWindow), TRUE );
                 gtk_window_fullscreen( GTK_WINDOW(m_pWindow) );
                 moveToScreen( nScreen );
-                Size aScreenSize = pDisp->GetScreenSize( m_nScreen );
+                Size aScreenSize = pDisp->GetScreenSize( m_nScreen ); 
                 maGeometry.nX       = 0;
                 maGeometry.nY       = 0;
                 maGeometry.nWidth   = aScreenSize.Width();
@@ -1879,11 +1874,8 @@ void GtkSalFrame::ShowFullScreen( BOOL bFullScreen, sal_Int32 nScreen )
             else
             {
                 gtk_window_unfullscreen( GTK_WINDOW(m_pWindow) );
-                if( getDisplay()->getWMAdaptor()->isLegacyPartialFullscreen() )
-                {
-                    if( !(m_nStyle & SAL_FRAME_STYLE_SIZEABLE) )
-                        gtk_window_set_resizable( GTK_WINDOW(m_pWindow), FALSE );
-                }
+                if( !(m_nStyle & SAL_FRAME_STYLE_SIZEABLE) )
+                    gtk_window_set_resizable( GTK_WINDOW(m_pWindow), FALSE );
                 moveToScreen( nScreen );
             }
         }
@@ -1902,7 +1894,7 @@ void GtkSalFrame::setAutoLock( bool bLock )
 {
     if( isChild() )
         return;
-
+    
     GdkScreen  *pScreen = gtk_window_get_screen( GTK_WINDOW(m_pWindow) );
     GdkDisplay *pDisplay = gdk_screen_get_display( pScreen );
     GdkWindow  *pRootWin = gdk_screen_get_root_window( pScreen );
@@ -2051,7 +2043,7 @@ void GtkSalFrame::StartPresentation( BOOL bStart )
                              bPreferBlanking, bAllowExposures );
         }
 #ifdef ENABLE_DBUS
-        m_nGSMCookie = dbus_inhibit_gsm(g_get_application_name(), "presentation",
+        m_nGSMCookie = dbus_inhibit_gsm(g_get_application_name(), "presentation", 
                     GDK_WINDOW_XID(m_pWindow->window));
 #endif
     }
@@ -2120,7 +2112,7 @@ void GtkSalFrame::SetPointer( PointerStyle ePointerStyle )
         GdkCursor *pCursor = getDisplay()->getCursor( ePointerStyle );
         gdk_window_set_cursor( m_pWindow->window, pCursor );
         m_pCurrentCursor = pCursor;
-
+        
         // #i80791# use grabPointer the same way as CaptureMouse, respective float grab
         if( getDisplay()->MouseCaptured( this ) )
             grabPointer( TRUE, FALSE );
@@ -2152,7 +2144,7 @@ void GtkSalFrame::grabPointer( BOOL bGrab, BOOL bOwnerEvents )
             if( bUseGdkGrab )
             {
                 const int nMask = ( GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK | GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK );
-
+    
                 gdk_pointer_grab( m_pWindow->window, bOwnerEvents,
                                   (GdkEventMask) nMask, NULL, m_pCurrentCursor,
                                   GDK_CURRENT_TIME );
@@ -2198,7 +2190,7 @@ void GtkSalFrame::SetPointerPos( long nX, long nY )
         pFrame = pFrame->m_pParent;
     if( ! pFrame )
         return;
-
+    
     GdkScreen *pScreen = gtk_window_get_screen( GTK_WINDOW(pFrame->m_pWindow) );
     GdkDisplay *pDisplay = gdk_screen_get_display( pScreen );
 
@@ -2323,8 +2315,8 @@ void GtkSalFrame::UpdateSettings( AllSettings& rSettings )
         bFreeGraphics = true;
     }
 
-    pGraphics->updateSettings( rSettings );
-
+    pGraphics->updateSettings( rSettings );    
+    
     if( bFreeGraphics )
         ReleaseGraphics( pGraphics );
 }
@@ -2365,7 +2357,7 @@ void GtkSalFrame::createNewWindow( XLIB_Window aNewParent, bool bXEmbed, int nSc
     bool bWasVisible = GTK_WIDGET_MAPPED(m_pWindow);
     if( bWasVisible )
         Show( FALSE );
-
+    
     if( nScreen < 0 || nScreen >= getDisplay()->GetScreenCount() )
         nScreen = m_nScreen;
 
@@ -2439,18 +2431,18 @@ void GtkSalFrame::createNewWindow( XLIB_Window aNewParent, bool bXEmbed, int nSc
             m_aGraphics[i].pGraphics->SetWindow( m_pWindow );
         }
     }
-
+    
     if( m_aTitle.Len() )
         SetTitle( m_aTitle );
-
+    
     if( bWasVisible )
         Show( TRUE );
-
+    
     std::list< GtkSalFrame* > aChildren = m_aChildren;
     m_aChildren.clear();
     for( std::list< GtkSalFrame* >::iterator it = aChildren.begin(); it != aChildren.end(); ++it )
         (*it)->createNewWindow( None, false, m_nScreen );
-
+    
     // FIXME: SalObjects
 }
 
@@ -2480,11 +2472,11 @@ void GtkSalFrame::UnionClipRegion( long nX, long nY, long nWidth, long nHeight )
     if( m_pRegion )
     {
         GdkRectangle aRect;
-        aRect.x         = nX;
-        aRect.y         = nY;
-        aRect.width     = nWidth;
-        aRect.height    = nHeight;
-
+        aRect.x			= nX;
+        aRect.y			= nY;
+        aRect.width		= nWidth;
+        aRect.height	= nHeight;
+        
         gdk_region_union_with_rect( m_pRegion, &aRect );
     }
 }
@@ -2498,7 +2490,7 @@ void GtkSalFrame::EndSetClipRegion()
 bool GtkSalFrame::Dispatch( const XEvent* pEvent )
 {
     bool bContinueDispatch = true;
-
+    
     if( pEvent->type == PropertyNotify )
     {
         vcl_sal::WMAdaptor* pAdaptor = getDisplay()->getWMAdaptor();
@@ -2629,15 +2621,15 @@ gboolean GtkSalFrame::signalButton( GtkWidget*, GdkEventButton* pEvent, gpointer
     }
     switch( pEvent->button )
     {
-        case 1: aEvent.mnButton = MOUSE_LEFT;   break;
-        case 2: aEvent.mnButton = MOUSE_MIDDLE; break;
-        case 3: aEvent.mnButton = MOUSE_RIGHT;  break;
+        case 1: aEvent.mnButton = MOUSE_LEFT;	break;
+        case 2: aEvent.mnButton = MOUSE_MIDDLE;	break;
+        case 3: aEvent.mnButton = MOUSE_RIGHT;	break;
         default: return FALSE;
     }
-    aEvent.mnTime   = pEvent->time;
-    aEvent.mnX      = (long)pEvent->x_root - pThis->maGeometry.nX;
-    aEvent.mnY      = (long)pEvent->y_root - pThis->maGeometry.nY;
-    aEvent.mnCode   = GetMouseModCode( pEvent->state );
+    aEvent.mnTime	= pEvent->time;
+    aEvent.mnX		= (long)pEvent->x_root - pThis->maGeometry.nX;
+    aEvent.mnY		= (long)pEvent->y_root - pThis->maGeometry.nY;
+    aEvent.mnCode	= GetMouseModCode( pEvent->state );
 
     bool bClosePopups = false;
     if( pEvent->type == GDK_BUTTON_PRESS &&
@@ -2669,7 +2661,7 @@ gboolean GtkSalFrame::signalButton( GtkWidget*, GdkEventButton* pEvent, gpointer
     // --- RTL --- (mirror mouse pos)
     if( Application::GetSettings().GetLayoutRTL() )
         aEvent.mnX = pThis->maGeometry.nWidth-1-aEvent.mnX;
-
+    
     vcl::DeletionListener aDel( pThis );
 
     pThis->CallCallback( nEventType, &aEvent );
@@ -2708,7 +2700,7 @@ gboolean GtkSalFrame::signalScroll( GtkWidget*, GdkEvent* pEvent, gpointer frame
     GtkSalFrame* pThis = (GtkSalFrame*)frame;
     GdkEventScroll* pSEvent = (GdkEventScroll*)pEvent;
 
-    static ULONG        nLines = 0;
+    static ULONG		nLines = 0;
     if( ! nLines )
     {
         char* pEnv = getenv( "SAL_WHEELLINES" );
@@ -2719,14 +2711,14 @@ gboolean GtkSalFrame::signalScroll( GtkWidget*, GdkEvent* pEvent, gpointer frame
 
     bool bNeg = (pSEvent->direction == GDK_SCROLL_DOWN || pSEvent->direction == GDK_SCROLL_RIGHT );
     SalWheelMouseEvent aEvent;
-    aEvent.mnTime           = pSEvent->time;
-    aEvent.mnX              = (ULONG)pSEvent->x;
-    aEvent.mnY              = (ULONG)pSEvent->y;
-    aEvent.mnDelta          = bNeg ? -120 : 120;
-    aEvent.mnNotchDelta     = bNeg ? -1 : 1;
-    aEvent.mnScrollLines    = nLines;
-    aEvent.mnCode           = GetMouseModCode( pSEvent->state );
-    aEvent.mbHorz           = (pSEvent->direction == GDK_SCROLL_LEFT || pSEvent->direction == GDK_SCROLL_RIGHT);
+    aEvent.mnTime			= pSEvent->time;
+    aEvent.mnX				= (ULONG)pSEvent->x;
+    aEvent.mnY				= (ULONG)pSEvent->y;
+    aEvent.mnDelta			= bNeg ? -120 : 120;
+    aEvent.mnNotchDelta		= bNeg ? -1 : 1;
+    aEvent.mnScrollLines	= nLines;
+    aEvent.mnCode			= GetMouseModCode( pSEvent->state );
+    aEvent.mbHorz			= (pSEvent->direction == GDK_SCROLL_LEFT || pSEvent->direction == GDK_SCROLL_RIGHT);
 
     GTK_YIELD_GRAB();
 
@@ -2744,15 +2736,15 @@ gboolean GtkSalFrame::signalMotion( GtkWidget*, GdkEventMotion* pEvent, gpointer
     GtkSalFrame* pThis = (GtkSalFrame*)frame;
 
     SalMouseEvent aEvent;
-    aEvent.mnTime   = pEvent->time;
-    aEvent.mnX      = (long)pEvent->x_root - pThis->maGeometry.nX;
-    aEvent.mnY      = (long)pEvent->y_root - pThis->maGeometry.nY;
-    aEvent.mnCode   = GetMouseModCode( pEvent->state );
-    aEvent.mnButton = 0;
+    aEvent.mnTime	= pEvent->time;
+    aEvent.mnX		= (long)pEvent->x_root - pThis->maGeometry.nX;
+    aEvent.mnY		= (long)pEvent->y_root - pThis->maGeometry.nY;
+    aEvent.mnCode	= GetMouseModCode( pEvent->state );
+    aEvent.mnButton	= 0;
 
 
     GTK_YIELD_GRAB();
-
+    
     // --- RTL --- (mirror mouse pos)
     if( Application::GetSettings().GetLayoutRTL() )
         aEvent.mnX = pThis->maGeometry.nWidth-1-aEvent.mnX;
@@ -2788,11 +2780,11 @@ gboolean GtkSalFrame::signalCrossing( GtkWidget*, GdkEventCrossing* pEvent, gpoi
 {
     GtkSalFrame* pThis = (GtkSalFrame*)frame;
     SalMouseEvent aEvent;
-    aEvent.mnTime   = pEvent->time;
-    aEvent.mnX      = (long)pEvent->x_root - pThis->maGeometry.nX;
-    aEvent.mnY      = (long)pEvent->y_root - pThis->maGeometry.nY;
-    aEvent.mnCode   = GetMouseModCode( pEvent->state );
-    aEvent.mnButton = 0;
+    aEvent.mnTime	= pEvent->time;
+    aEvent.mnX		= (long)pEvent->x_root - pThis->maGeometry.nX;
+    aEvent.mnY		= (long)pEvent->y_root - pThis->maGeometry.nY;
+    aEvent.mnCode	= GetMouseModCode( pEvent->state );
+    aEvent.mnButton	= 0;
 
     GTK_YIELD_GRAB();
     pThis->CallCallback( (pEvent->type == GDK_ENTER_NOTIFY) ? SALEVENT_MOUSEMOVE : SALEVENT_MOUSELEAVE, &aEvent );
@@ -2849,12 +2841,52 @@ gboolean GtkSalFrame::signalFocus( GtkWidget*, GdkEventFocus* pEvent, gpointer f
     return FALSE;
 }
 
+IMPL_LINK( GtkSalFrame, ImplDelayedFullScreenHdl, void*, EMPTYARG )
+{
+    Atom nStateAtom = getDisplay()->getWMAdaptor()->getAtom(vcl_sal::WMAdaptor::NET_WM_STATE);
+    Atom nFSAtom = getDisplay()->getWMAdaptor()->getAtom(vcl_sal::WMAdaptor::NET_WM_STATE_FULLSCREEN );
+    if( nStateAtom && nFSAtom )
+    {
+        /* #i110881# workaround a gtk issue (see https://bugzilla.redhat.com/show_bug.cgi?id=623191#c8)
+           gtk_window_fullscreen can fail due to a race condition, request an additional status change
+           to fullscreen to be safe
+        */
+        XEvent aEvent;
+        aEvent.type					= ClientMessage;
+        aEvent.xclient.display		= getDisplay()->GetDisplay();
+        aEvent.xclient.window		= GDK_WINDOW_XWINDOW(m_pWindow->window);
+        aEvent.xclient.message_type	= nStateAtom;
+        aEvent.xclient.format		= 32;
+        aEvent.xclient.data.l[0]	= 1;
+        aEvent.xclient.data.l[1]	= nFSAtom;
+        aEvent.xclient.data.l[2]	= 0;
+        aEvent.xclient.data.l[3]	= 0;
+        aEvent.xclient.data.l[4]	= 0;
+        XSendEvent( getDisplay()->GetDisplay(),
+                    getDisplay()->GetRootWindow( m_nScreen ),
+                    False,
+                    SubstructureNotifyMask | SubstructureRedirectMask,
+                    &aEvent
+                    );
+    }
+
+    return 0;
+}
+
 gboolean GtkSalFrame::signalMap( GtkWidget*, GdkEvent*, gpointer frame )
 {
     GtkSalFrame* pThis = (GtkSalFrame*)frame;
 
     GTK_YIELD_GRAB();
-
+    
+    if( pThis->m_bFullscreen )
+    {
+        /* #i110881# workaorund a gtk issue (see https://bugzilla.redhat.com/show_bug.cgi?id=623191#c8)
+           gtk_window_fullscreen can run into a race condition with the window's showstate
+        */
+        Application::PostUserEvent( LINK( pThis, GtkSalFrame, ImplDelayedFullScreenHdl ) );
+    }
+    
     bool bSetFocus = pThis->m_bSetFocusOnMap;
     pThis->m_bSetFocusOnMap = false;
     if( ImplGetSVData()->mbIsTestTool )
@@ -2875,7 +2907,7 @@ gboolean GtkSalFrame::signalMap( GtkWidget*, GdkEvent*, gpointer frame )
                         GDK_WINDOW_XWINDOW( GTK_WIDGET(pThis->m_pWindow)->window),
                         RevertToParent, CurrentTime );
     }
-
+    
     pThis->CallCallback( SALEVENT_RESIZE, NULL );
 
     return FALSE;
@@ -2929,8 +2961,8 @@ gboolean GtkSalFrame::signalConfigure( GtkWidget*, GdkEventConfigure* pEvent, gp
     if( x != pThis->maGeometry.nX || y != pThis->maGeometry.nY )
     {
         bMoved = true;
-        pThis->maGeometry.nX        = x;
-        pThis->maGeometry.nY        = y;
+        pThis->maGeometry.nX		= x;
+        pThis->maGeometry.nY		= y;
     }
     /* #i86302#
      * for non sizeable windows we set the min and max hint for the window manager to
@@ -2945,20 +2977,20 @@ gboolean GtkSalFrame::signalConfigure( GtkWidget*, GdkEventConfigure* pEvent, gp
         if( pEvent->width != (int)pThis->maGeometry.nWidth || pEvent->height != (int)pThis->maGeometry.nHeight )
         {
             bSized = true;
-            pThis->maGeometry.nWidth    = pEvent->width;
-            pThis->maGeometry.nHeight   = pEvent->height;
+            pThis->maGeometry.nWidth	= pEvent->width;
+            pThis->maGeometry.nHeight	= pEvent->height;
         }
     }
-
+    
     // update decoration hints
     if( ! (pThis->m_nStyle & SAL_FRAME_STYLE_PLUG) )
     {
         GdkRectangle aRect;
         gdk_window_get_frame_extents( GTK_WIDGET(pThis->m_pWindow)->window, &aRect );
-        pThis->maGeometry.nTopDecoration    = y - aRect.y;
-        pThis->maGeometry.nBottomDecoration = aRect.y + aRect.height - y - pEvent->height;
-        pThis->maGeometry.nLeftDecoration   = x - aRect.x;
-        pThis->maGeometry.nRightDecoration  = aRect.x + aRect.width - x - pEvent->width;
+        pThis->maGeometry.nTopDecoration	= y - aRect.y;
+        pThis->maGeometry.nBottomDecoration	= aRect.y + aRect.height - y - pEvent->height;
+        pThis->maGeometry.nLeftDecoration	= x - aRect.x;
+        pThis->maGeometry.nRightDecoration	= aRect.x + aRect.width - x - pEvent->width;
     }
     else
     {
@@ -3054,7 +3086,7 @@ gboolean GtkSalFrame::signalKey( GtkWidget*, GdkEventKey* pEvent, gpointer frame
             // except Mac OS X
             case GDK_Meta_L:
             case GDK_Super_L:
-                nExtModMask = MODKEY_LMOD3;
+                nExtModMask = MODKEY_LMOD3; 
                 nModMask = KEY_MOD3;
                 break;
             case GDK_Meta_R:
@@ -3092,9 +3124,9 @@ gboolean GtkSalFrame::signalKey( GtkWidget*, GdkEventKey* pEvent, gpointer frame
                 {
                     SalKeyEvent aKeyEvt;
 
-                    aKeyEvt.mnCode     = KEY_MENU | nModCode;
+                    aKeyEvt.mnCode	   = KEY_MENU | nModCode;
                     aKeyEvt.mnRepeat   = 0;
-                    aKeyEvt.mnTime     = pEvent->time;
+                    aKeyEvt.mnTime	   = pEvent->time;
                     aKeyEvt.mnCharCode = 0;
 
                     // simulate KEY_MENU
@@ -3174,7 +3206,7 @@ void GtkSalFrame::signalStyleSet( GtkWidget*, GtkStyle* pPrevious, gpointer fram
                                         aWin,
                                         pThis->m_hBackgroundPixmap );
     }
-
+    
     if( ! pThis->m_pParent )
     {
         // signalize theme changed for NWF caches
@@ -3188,7 +3220,7 @@ gboolean GtkSalFrame::signalState( GtkWidget*, GdkEvent* pEvent, gpointer frame
     GtkSalFrame* pThis = (GtkSalFrame*)frame;
     if( (pThis->m_nState & GDK_WINDOW_STATE_ICONIFIED) != (pEvent->window_state.new_window_state & GDK_WINDOW_STATE_ICONIFIED ) )
         pThis->getDisplay()->SendInternalEvent( pThis, NULL, SALEVENT_RESIZE );
-
+        
     if(   (pEvent->window_state.new_window_state & GDK_WINDOW_STATE_MAXIMIZED) &&
         ! (pThis->m_nState & GDK_WINDOW_STATE_MAXIMIZED) )
     {
@@ -3315,15 +3347,15 @@ void GtkSalFrame::IMHandler::setInputContext( SalInputContext* )
 void GtkSalFrame::IMHandler::sendEmptyCommit()
 {
     vcl::DeletionListener aDel( m_pFrame );
-
+    
     SalExtTextInputEvent aEmptyEv;
-    aEmptyEv.mnTime             = 0;
-    aEmptyEv.mpTextAttr         = 0;
-    aEmptyEv.maText             = String();
-    aEmptyEv.mnCursorPos        = 0;
-    aEmptyEv.mnCursorFlags      = 0;
-    aEmptyEv.mnDeltaStart       = 0;
-    aEmptyEv.mbOnlyCursor       = False;
+    aEmptyEv.mnTime 			= 0;
+    aEmptyEv.mpTextAttr 		= 0;
+    aEmptyEv.maText 		    = String();
+    aEmptyEv.mnCursorPos 		= 0;
+    aEmptyEv.mnCursorFlags 	    = 0;
+    aEmptyEv.mnDeltaStart 	    = 0;
+    aEmptyEv.mbOnlyCursor 	    = False;
     m_pFrame->CallCallback( SALEVENT_EXTTEXTINPUT, (void*)&aEmptyEv );
     if( ! aDel.isDeleted() )
         m_pFrame->CallCallback( SALEVENT_ENDEXTTEXTINPUT, NULL );
@@ -3389,7 +3421,7 @@ bool GtkSalFrame::IMHandler::handleKeyEvent( GdkEventKey* pEvent )
         // for us.
         m_aPrevKeyPresses.push_back( PreviousKeyPress(pEvent) );
         m_nPrevKeyPresses++;
-
+        
         // Also pop off the earliest key press event if there are more than 10
         // already.
         while (m_nPrevKeyPresses > 10)
@@ -3397,7 +3429,7 @@ bool GtkSalFrame::IMHandler::handleKeyEvent( GdkEventKey* pEvent )
             m_aPrevKeyPresses.pop_front();
             m_nPrevKeyPresses--;
         }
-
+    
         GObject* pRef = G_OBJECT( g_object_ref( G_OBJECT( m_pIMContext ) ) );
 
         // #i51353# update spot location on every key input since we cannot
@@ -3405,7 +3437,7 @@ bool GtkSalFrame::IMHandler::handleKeyEvent( GdkEventKey* pEvent )
         updateIMSpotLocation();
         if( aDel.isDeleted() )
             return true;
-
+        
         gboolean bResult = gtk_im_context_filter_keypress( m_pIMContext, pEvent );
         g_object_unref( pRef );
 
@@ -3432,7 +3464,7 @@ bool GtkSalFrame::IMHandler::handleKeyEvent( GdkEventKey* pEvent )
             }
         }
     }
-
+    
     // Determine if we got an earlier key press event corresponding to this key release
     if (pEvent->type == GDK_KEY_RELEASE)
     {
@@ -3442,7 +3474,7 @@ bool GtkSalFrame::IMHandler::handleKeyEvent( GdkEventKey* pEvent )
 
         if( aDel.isDeleted() )
             return true;
-
+        
         m_bPreeditJustChanged = false;
 
         std::list<PreviousKeyPress>::iterator    iter     = m_aPrevKeyPresses.begin();
@@ -3463,7 +3495,7 @@ bool GtkSalFrame::IMHandler::handleKeyEvent( GdkEventKey* pEvent )
         if( bResult )
             return true;
     }
-
+    
     return false;
 }
 
@@ -3507,17 +3539,17 @@ void GtkSalFrame::IMHandler::signalIMCommit( GtkIMContext* CONTEXT_ARG, gchar* p
     // open a block that will end the GTK_YIELD_GRAB before calling preedit changed again
     {
         GTK_YIELD_GRAB();
-
-        pThis->m_aInputEvent.mnTime             = 0;
-        pThis->m_aInputEvent.mpTextAttr         = 0;
-        pThis->m_aInputEvent.maText             = String( pText, RTL_TEXTENCODING_UTF8 );
-        pThis->m_aInputEvent.mnCursorPos        = pThis->m_aInputEvent.maText.Len();
-        pThis->m_aInputEvent.mnCursorFlags      = 0;
-        pThis->m_aInputEvent.mnDeltaStart       = 0;
-        pThis->m_aInputEvent.mbOnlyCursor       = False;
-
+        
+        pThis->m_aInputEvent.mnTime 			= 0;
+        pThis->m_aInputEvent.mpTextAttr 		= 0;
+        pThis->m_aInputEvent.maText 		    = String( pText, RTL_TEXTENCODING_UTF8 );
+        pThis->m_aInputEvent.mnCursorPos 		= pThis->m_aInputEvent.maText.Len();
+        pThis->m_aInputEvent.mnCursorFlags 	    = 0;
+        pThis->m_aInputEvent.mnDeltaStart 	    = 0;
+        pThis->m_aInputEvent.mbOnlyCursor 	    = False;
+        
         pThis->m_aInputFlags.clear();
-
+    
         /* necessary HACK: all keyboard input comes in here as soon as a IMContext is set
          *  which is logical and consequent. But since even simple input like
          *  <space> comes through the commit signal instead of signalKey
@@ -3541,7 +3573,7 @@ void GtkSalFrame::IMHandler::signalIMCommit( GtkIMContext* CONTEXT_ARG, gchar* p
         {
             const PreviousKeyPress& rKP = pThis->m_aPrevKeyPresses.back();
             sal_Unicode aOrigCode = pThis->m_aInputEvent.maText.GetChar(0);
-
+    
             if( checkSingleKeyCommitHack( rKP.keyval, aOrigCode ) )
             {
                 pThis->m_pFrame->doKeyCallback( rKP.state, rKP.keyval, rKP.hardware_keycode, rKP.group, rKP.time, aOrigCode, true, true );
@@ -3575,9 +3607,9 @@ void GtkSalFrame::IMHandler::signalIMPreeditChanged( GtkIMContext*, gpointer im_
 {
     GtkSalFrame::IMHandler* pThis = (GtkSalFrame::IMHandler*)im_handler;
 
-    char*           pText           = NULL;
-    PangoAttrList*  pAttrs          = NULL;
-    gint            nCursorPos      = 0;
+    char*			pText			= NULL;
+    PangoAttrList*	pAttrs		    = NULL;
+    gint			nCursorPos		= 0;
 
     gtk_im_context_get_preedit_string( pThis->m_pIMContext,
                                        &pText,
@@ -3591,16 +3623,16 @@ void GtkSalFrame::IMHandler::signalIMPreeditChanged( GtkIMContext*, gpointer im_
         if( pThis->m_aInputEvent.maText.Len() == 0 )
         {
             g_free( pText );
-            return;
+            return; 
         }
     }
 
     pThis->m_bPreeditJustChanged = true;
 
     bool bEndPreedit = (!pText || !*pText) && pThis->m_aInputEvent.mpTextAttr != NULL;
-    pThis->m_aInputEvent.mnTime             = 0;
-    pThis->m_aInputEvent.maText             = String( pText, RTL_TEXTENCODING_UTF8 );
-    pThis->m_aInputEvent.mnCursorPos        = nCursorPos;
+    pThis->m_aInputEvent.mnTime 			= 0;
+    pThis->m_aInputEvent.maText 			= String( pText, RTL_TEXTENCODING_UTF8 );
+    pThis->m_aInputEvent.mnCursorPos 		= nCursorPos;
     pThis->m_aInputEvent.mnCursorFlags      = 0;
     pThis->m_aInputEvent.mnDeltaStart       = 0;
     pThis->m_aInputEvent.mbOnlyCursor       = False;
@@ -3614,21 +3646,21 @@ void GtkSalFrame::IMHandler::signalIMPreeditChanged( GtkIMContext*, gpointer im_
         GSList *tmp_list = NULL;
         gint start, end;
         guint sal_attr = 0;
-
+        
         pango_attr_iterator_range (iter, &start, &end);
         if (end == G_MAXINT)
             end = pText ? strlen (pText) : 0;
         if (end == start)
             continue;
-
+        
         start = g_utf8_pointer_to_offset (pText, pText + start);
         end = g_utf8_pointer_to_offset (pText, pText + end);
-
+        
         tmp_list = attr_list = pango_attr_iterator_get_attrs (iter);
         while (tmp_list)
         {
             PangoAttribute *pango_attr = (PangoAttribute *)(tmp_list->data);
-
+            
             switch (pango_attr->klass->type)
             {
                 case PANGO_ATTR_BACKGROUND:
@@ -3649,21 +3681,21 @@ void GtkSalFrame::IMHandler::signalIMPreeditChanged( GtkIMContext*, gpointer im_
         if (sal_attr == 0)
             sal_attr |= SAL_EXTTEXTINPUT_ATTR_UNDERLINE;
         g_slist_free (attr_list);
-
+        
         // Set the sal attributes on our text
         for (int i = start; i < end; i++)
             pThis->m_aInputFlags[i] |= sal_attr;
     } while (pango_attr_iterator_next (iter));
 
-    pThis->m_aInputEvent.mpTextAttr         = &pThis->m_aInputFlags[0];
+    pThis->m_aInputEvent.mpTextAttr 		= &pThis->m_aInputFlags[0];
 
     g_free( pText );
     pango_attr_list_unref( pAttrs );
 
     GTK_YIELD_GRAB();
-
+    
     vcl::DeletionListener aDel( pThis->m_pFrame );
-
+    
     pThis->m_pFrame->CallCallback( SALEVENT_EXTTEXTINPUT, (void*)&pThis->m_aInputEvent);
     if( bEndPreedit && ! aDel.isDeleted() )
         pThis->doCallEndExtTextInput();
@@ -3681,14 +3713,14 @@ void GtkSalFrame::IMHandler::signalIMPreeditEnd( GtkIMContext*, gpointer im_hand
     GTK_YIELD_GRAB();
 
     pThis->m_bPreeditJustChanged = true;
-
+    
     vcl::DeletionListener aDel( pThis->m_pFrame );
     pThis->doCallEndExtTextInput();
     if( ! aDel.isDeleted() )
         pThis->updateIMSpotLocation();
 }
 
-uno::Reference<accessibility::XAccessibleEditableText>
+uno::Reference<accessibility::XAccessibleEditableText> 
     FindFocus(uno::Reference< accessibility::XAccessibleContext > xContext)
 {
     if (!xContext.is())
@@ -3741,7 +3773,7 @@ gboolean GtkSalFrame::IMHandler::signalIMRetrieveSurrounding( GtkIMContext* pCon
             return FALSE;
     rtl::OString sUTF = rtl::OUStringToOString(sAllText, RTL_TEXTENCODING_UTF8);
     rtl::OUString sCursorText(sAllText, nPosition);
-    gtk_im_context_set_surrounding(pContext, sUTF.getStr(), sUTF.getLength(),
+    gtk_im_context_set_surrounding(pContext, sUTF.getStr(), sUTF.getLength(), 
         rtl::OUStringToOString(sCursorText, RTL_TEXTENCODING_UTF8).getLength());
     return TRUE;
     }
@@ -3749,7 +3781,7 @@ gboolean GtkSalFrame::IMHandler::signalIMRetrieveSurrounding( GtkIMContext* pCon
     return FALSE;
 }
 
-gboolean GtkSalFrame::IMHandler::signalIMDeleteSurrounding( GtkIMContext*, gint offset, gint nchars,
+gboolean GtkSalFrame::IMHandler::signalIMDeleteSurrounding( GtkIMContext*, gint offset, gint nchars, 
     gpointer /*im_handler*/ )
 {
     uno::Reference<accessibility::XAccessibleEditableText> xText = lcl_GetxText();
diff --git a/vcl/unx/gtk/window/gtkobject.cxx b/vcl/unx/gtk/window/gtkobject.cxx
index 2a2bbe78078a..59a4a8f2336a 100644
--- a/vcl/unx/gtk/window/gtkobject.cxx
+++ b/vcl/unx/gtk/window/gtkobject.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
@@ -33,7 +33,7 @@
 #include <plugins/gtk/gtkdata.hxx>
 #include <plugins/gtk/gtkinst.hxx>
 
-GtkSalObject::GtkSalObject( GtkSalFrame* pParent, BOOL bShow )
+GtkSalObject::GtkSalObject( GtkSalFrame* pParent, BOOL bShow ) 
         : m_pSocket( NULL ),
           m_pRegion( NULL )
 {
@@ -56,25 +56,25 @@ GtkSalObject::GtkSalObject( GtkSalFrame* pParent, BOOL bShow )
 
         //system data
         SalDisplay* pDisp = GetX11SalData()->GetDisplay();
-        m_aSystemData.nSize         = sizeof( SystemChildData );
-        m_aSystemData.pDisplay      = pDisp->GetDisplay();
-        m_aSystemData.aWindow       = GDK_WINDOW_XWINDOW(m_pSocket->window);
-        m_aSystemData.pSalFrame     = NULL;
-        m_aSystemData.pWidget       = m_pSocket;
-        m_aSystemData.pVisual       = pDisp->GetVisual(pParent->getScreenNumber()).GetVisual();
-        m_aSystemData.nScreen       = pParent->getScreenNumber();
-        m_aSystemData.nDepth        = pDisp->GetVisual(pParent->getScreenNumber()).GetDepth();
-        m_aSystemData.aColormap     = pDisp->GetColormap(pParent->getScreenNumber()).GetXColormap();
-        m_aSystemData.pAppContext   = NULL;
-        m_aSystemData.aShellWindow  = GDK_WINDOW_XWINDOW(GTK_WIDGET(pParent->getWindow())->window);
-        m_aSystemData.pShellWidget  = GTK_WIDGET(pParent->getWindow());
+        m_aSystemData.nSize 		= sizeof( SystemChildData );
+        m_aSystemData.pDisplay		= pDisp->GetDisplay();
+        m_aSystemData.aWindow		= GDK_WINDOW_XWINDOW(m_pSocket->window);
+        m_aSystemData.pSalFrame		= NULL;
+        m_aSystemData.pWidget		= m_pSocket;
+        m_aSystemData.pVisual		= pDisp->GetVisual(pParent->getScreenNumber()).GetVisual();
+        m_aSystemData.nScreen		= pParent->getScreenNumber();
+        m_aSystemData.nDepth		= pDisp->GetVisual(pParent->getScreenNumber()).GetDepth();
+        m_aSystemData.aColormap		= pDisp->GetColormap(pParent->getScreenNumber()).GetXColormap();
+        m_aSystemData.pAppContext	= NULL;
+        m_aSystemData.aShellWindow	= GDK_WINDOW_XWINDOW(GTK_WIDGET(pParent->getWindow())->window);
+        m_aSystemData.pShellWidget	= GTK_WIDGET(pParent->getWindow());
 
         g_signal_connect( G_OBJECT(m_pSocket), "button-press-event", G_CALLBACK(signalButton), this );
         g_signal_connect( G_OBJECT(m_pSocket), "button-release-event", G_CALLBACK(signalButton), this );
         g_signal_connect( G_OBJECT(m_pSocket), "focus-in-event", G_CALLBACK(signalFocus), this );
         g_signal_connect( G_OBJECT(m_pSocket), "focus-out-event", G_CALLBACK(signalFocus), this );
         g_signal_connect( G_OBJECT(m_pSocket), "destroy", G_CALLBACK(signalDestroy), this );
-
+        
         // #i59255# necessary due to sync effects with java child windows
         pParent->Sync();
     }
@@ -119,11 +119,11 @@ void GtkSalObject::BeginSetClipRegion( ULONG )
 void GtkSalObject::UnionClipRegion( long nX, long nY, long nWidth, long nHeight )
 {
     GdkRectangle aRect;
-    aRect.x         = nX;
-    aRect.y         = nY;
-    aRect.width     = nWidth;
-    aRect.height    = nHeight;
-
+    aRect.x			= nX;
+    aRect.y			= nY;
+    aRect.width		= nWidth;
+    aRect.height	= nHeight;
+    
     gdk_region_union_with_rect( m_pRegion, &aRect );
 }
 
@@ -176,7 +176,7 @@ const SystemEnvData* GtkSalObject::GetSystemData() const
     return &m_aSystemData;
 }
 
-
+   
 gboolean GtkSalObject::signalButton( GtkWidget*, GdkEventButton* pEvent, gpointer object )
 {
     GtkSalObject* pThis = (GtkSalObject*)object;
diff --git a/vcl/unx/headless/svpbmp.cxx b/vcl/unx/headless/svpbmp.cxx
index 7c84c4a7a579..193700cf8081 100644
--- a/vcl/unx/headless/svpbmp.cxx
+++ b/vcl/unx/headless/svpbmp.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
@@ -42,8 +42,8 @@ SvpSalBitmap::~SvpSalBitmap()
 {
 }
 
-bool SvpSalBitmap::Create( const Size& rSize,
-                           USHORT nBitCount,
+bool SvpSalBitmap::Create( const Size& rSize, 
+                           USHORT nBitCount, 
                            const BitmapPalette& rPalette )
 {
     sal_uInt32 nFormat = SVP_DEFAULT_BITMAP_FORMAT;
@@ -129,7 +129,7 @@ Size SvpSalBitmap::GetSize() const
         B2IVector aVec( m_aBitmap->getSize() );
         aSize = Size( aVec.getX(), aVec.getY() );
     }
-
+    
     return aSize;
 }
 
@@ -140,7 +140,7 @@ USHORT SvpSalBitmap::GetBitCount() const
         nDepth = getBitCountFromScanlineFormat( m_aBitmap->getScanlineFormat() );
     return nDepth;
 }
-
+                        
 BitmapBuffer* SvpSalBitmap::AcquireBuffer( bool )
 {
     BitmapBuffer* pBuf = NULL;
@@ -293,7 +293,7 @@ void SvpSalBitmap::ReleaseBuffer( BitmapBuffer* pBuffer, bool bReadOnly )
             sal_uInt32 nEntries = 1U << nBitCount;
 
             boost::shared_ptr< std::vector<basebmp::Color> > pPal(
-                new std::vector<basebmp::Color>( nEntries,
+                new std::vector<basebmp::Color>( nEntries, 
                                                  basebmp::Color(COL_WHITE)));
             const sal_uInt32 nColors = std::min(
                 (sal_uInt32)pBuffer->maPalette.GetEntryCount(),
@@ -303,9 +303,9 @@ void SvpSalBitmap::ReleaseBuffer( BitmapBuffer* pBuffer, bool bReadOnly )
                 const BitmapColor& rCol = pBuffer->maPalette[i];
                 (*pPal)[i] = basebmp::Color( rCol.GetRed(), rCol.GetGreen(), rCol.GetBlue() );
             }
-
-            m_aBitmap = basebmp::createBitmapDevice( m_aBitmap->getSize(),
-                                                     m_aBitmap->isTopDown(),
+            
+            m_aBitmap = basebmp::createBitmapDevice( m_aBitmap->getSize(), 
+                                                     m_aBitmap->isTopDown(), 
                                                      m_aBitmap->getScanlineFormat(),
                                                      m_aBitmap->getBuffer(),
                                                      pPal );
diff --git a/vcl/unx/headless/svpbmp.hxx b/vcl/unx/headless/svpbmp.hxx
index dc775e66aaf1..1b568c5dc789 100644
--- a/vcl/unx/headless/svpbmp.hxx
+++ b/vcl/unx/headless/svpbmp.hxx
@@ -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
@@ -37,28 +37,28 @@ class SvpSalBitmap : public SalBitmap, public SvpElement
 public:
     SvpSalBitmap() {}
     virtual ~SvpSalBitmap();
-
+    
     const basebmp::BitmapDeviceSharedPtr& getBitmap() const { return m_aBitmap; }
     void setBitmap( const basebmp::BitmapDeviceSharedPtr& rSrc ) { m_aBitmap = rSrc; }
-
+    
     // SvpElement
     virtual const basebmp::BitmapDeviceSharedPtr& getDevice() const { return m_aBitmap; }
-
+    
     // SalBitmap
-    virtual bool            Create( const Size& rSize,
-                                    USHORT nBitCount,
+    virtual bool			Create( const Size& rSize, 
+                                    USHORT nBitCount, 
                                     const BitmapPalette& rPal );
-    virtual bool            Create( const SalBitmap& rSalBmp );
-    virtual bool            Create( const SalBitmap& rSalBmp,
+    virtual bool			Create( const SalBitmap& rSalBmp );
+    virtual bool			Create( const SalBitmap& rSalBmp, 
                                     SalGraphics* pGraphics );
-    virtual bool            Create( const SalBitmap& rSalBmp,
+    virtual bool			Create( const SalBitmap& rSalBmp,
                                     USHORT nNewBitCount );
-    virtual void            Destroy();
-    virtual Size            GetSize() const;
-    virtual USHORT          GetBitCount() const;
-
-    virtual BitmapBuffer*   AcquireBuffer( bool bReadOnly );
-    virtual void            ReleaseBuffer( BitmapBuffer* pBuffer, bool bReadOnly );
+    virtual void			Destroy();
+    virtual Size			GetSize() const;
+    virtual USHORT			GetBitCount() const;
+                        
+    virtual BitmapBuffer*	AcquireBuffer( bool bReadOnly );
+    virtual void			ReleaseBuffer( BitmapBuffer* pBuffer, bool bReadOnly );
     virtual bool            GetSystemData( BitmapSystemData& rData );
 
 };
diff --git a/vcl/unx/headless/svpdummies.cxx b/vcl/unx/headless/svpdummies.cxx
index 5983ff18c34f..1d26086ed05e 100644
--- a/vcl/unx/headless/svpdummies.cxx
+++ b/vcl/unx/headless/svpdummies.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
@@ -32,17 +32,17 @@
 // SalObject
 SvpSalObject::SvpSalObject()
 {
-    m_aSystemChildData.nSize        = sizeof( SystemChildData );
-    m_aSystemChildData.pDisplay     = NULL;
-    m_aSystemChildData.aWindow      = 0;
+    m_aSystemChildData.nSize		= sizeof( SystemChildData );
+    m_aSystemChildData.pDisplay 	= NULL;
+    m_aSystemChildData.aWindow		= 0;
     m_aSystemChildData.pSalFrame    = 0;
-    m_aSystemChildData.pWidget      = 0;
-    m_aSystemChildData.pVisual      = 0;
-    m_aSystemChildData.nDepth       = 0;
-    m_aSystemChildData.aColormap    = 0;
-    m_aSystemChildData.pAppContext  = NULL;
-    m_aSystemChildData.aShellWindow = 0;
-    m_aSystemChildData.pShellWidget = NULL;
+    m_aSystemChildData.pWidget		= 0;
+    m_aSystemChildData.pVisual		= 0;
+    m_aSystemChildData.nDepth		= 0;
+    m_aSystemChildData.aColormap	= 0;
+    m_aSystemChildData.pAppContext	= NULL;
+    m_aSystemChildData.aShellWindow	= 0;
+    m_aSystemChildData.pShellWidget	= NULL;
 }
 
 SvpSalObject::~SvpSalObject()
diff --git a/vcl/unx/headless/svpdummies.hxx b/vcl/unx/headless/svpdummies.hxx
index febf7eef6bbe..3717d99d3cab 100644
--- a/vcl/unx/headless/svpdummies.hxx
+++ b/vcl/unx/headless/svpdummies.hxx
@@ -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
@@ -43,21 +43,21 @@ public:
     virtual ~SvpSalObject();
 
     // overload all pure virtual methods
-     virtual void                   ResetClipRegion();
-    virtual USHORT                  GetClipRegionType();
-    virtual void                    BeginSetClipRegion( ULONG nRects );
-    virtual void                    UnionClipRegion( long nX, long nY, long nWidth, long nHeight );
-    virtual void                    EndSetClipRegion();
+     virtual void					ResetClipRegion();
+    virtual USHORT					GetClipRegionType();
+    virtual void					BeginSetClipRegion( ULONG nRects );
+    virtual void					UnionClipRegion( long nX, long nY, long nWidth, long nHeight );
+    virtual void					EndSetClipRegion();
 
-    virtual void                    SetPosSize( long nX, long nY, long nWidth, long nHeight );
-    virtual void                    Show( BOOL bVisible );
-    virtual void                    Enable( BOOL nEnable );
-    virtual void                    GrabFocus();
+    virtual void					SetPosSize( long nX, long nY, long nWidth, long nHeight );
+    virtual void					Show( BOOL bVisible );
+    virtual void					Enable( BOOL nEnable );
+    virtual void					GrabFocus();
 
-    virtual void                    SetBackground();
-    virtual void                    SetBackground( SalColor nSalColor );
+    virtual void					SetBackground();
+    virtual void					SetBackground( SalColor nSalColor );
 
-    virtual const SystemEnvData*    GetSystemData() const;
+    virtual const SystemEnvData*	GetSystemData() const;
 };
 
 class SvpImeStatus : public SalI18NImeStatus
@@ -83,7 +83,7 @@ class SvpSalSystem : public SalSystem
     virtual Rectangle GetDisplayWorkAreaPosSizePixel( unsigned int nScreen );
     virtual rtl::OUString GetScreenName( unsigned int nScreen );
 
-
+    
     virtual int ShowNativeMessageBox( const String& rTitle,
                                       const String& rMessage,
                                       int nButtonCombination,
diff --git a/vcl/unx/headless/svpelement.cxx b/vcl/unx/headless/svpelement.cxx
index 4041e2f7739a..e16c8c9eb97a 100644
--- a/vcl/unx/headless/svpelement.cxx
+++ b/vcl/unx/headless/svpelement.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
@@ -57,16 +57,16 @@ class SvpElementContainer
     std::list< SvpElement* >        m_aElements;
     int                             m_nSocket;
     oslThread                       m_aThread;
-
+    
     SvpElementContainer();
     ~SvpElementContainer();
     public:
     void registerElement( SvpElement* pElement ) { m_aElements.push_back(pElement); }
     void deregisterElement( SvpElement* pElement ) { m_aElements.remove(pElement); }
-
+    
     void run();
     DECL_LINK(processRequest,void*);
-
+    
     static SvpElementContainer& get();
 };
 
@@ -86,7 +86,7 @@ SvpElementContainer::SvpElementContainer()
     if( m_nSocket >= 0)
     {
         int nOn = 1;
-        if( setsockopt(m_nSocket, SOL_SOCKET, SO_REUSEADDR,
+        if( setsockopt(m_nSocket, SOL_SOCKET, SO_REUSEADDR, 
                        (char*)&nOn, sizeof(nOn)) )
         {
             perror( "SvpElementContainer: changing socket options failed" );
@@ -165,7 +165,7 @@ static const char* matchType( SvpElement* pEle )
 IMPL_LINK( SvpElementContainer, processRequest, void*, pSocket )
 {
     int nFile = (int)pSocket;
-
+    
     rtl::OStringBuffer aBuf( 256 ), aAnswer( 256 );
     char c;
     while( read( nFile, &c, 1 ) && c != '\n' )
@@ -228,7 +228,7 @@ IMPL_LINK( SvpElementContainer, processRequest, void*, pSocket )
     }
     write( nFile, aAnswer.getStr(), aAnswer.getLength() );
     close( nFile );
-
+    
     return 0;
 }
 
diff --git a/vcl/unx/headless/svpelement.hxx b/vcl/unx/headless/svpelement.hxx
index 0706e75af9fe..cbc37b3f620d 100644
--- a/vcl/unx/headless/svpelement.hxx
+++ b/vcl/unx/headless/svpelement.hxx
@@ -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
@@ -37,7 +37,7 @@ class SvpElement
     protected:
     SvpElement();
     virtual ~SvpElement();
-    public:
+    public:    
     virtual const basebmp::BitmapDeviceSharedPtr& getDevice() const = 0;
 
     static sal_uInt32 getBitCountFromScanlineFormat( sal_Int32 nFormat );
diff --git a/vcl/unx/headless/svpframe.cxx b/vcl/unx/headless/svpframe.cxx
index 1adf9a51cce4..7f304178cee4 100644
--- a/vcl/unx/headless/svpframe.cxx
+++ b/vcl/unx/headless/svpframe.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
@@ -37,7 +37,7 @@ using namespace basegfx;
 
 SvpSalFrame* SvpSalFrame::s_pFocusFrame = NULL;
 
-SvpSalFrame::SvpSalFrame( SvpSalInstance* pInstance,
+SvpSalFrame::SvpSalFrame( SvpSalInstance* pInstance, 
                           SalFrame* pParent,
                           ULONG nSalFrameStyle,
                           SystemParentData* ) :
@@ -50,24 +50,24 @@ SvpSalFrame::SvpSalFrame( SvpSalInstance* pInstance,
     m_nMaxWidth( 0 ),
     m_nMaxHeight( 0 )
 {
-    m_aSystemChildData.nSize        = sizeof( SystemChildData );
-    m_aSystemChildData.pDisplay     = NULL;
-    m_aSystemChildData.aWindow      = 0;
-    m_aSystemChildData.pSalFrame    = this;
-    m_aSystemChildData.pWidget      = NULL;
-    m_aSystemChildData.pVisual      = NULL;
-    m_aSystemChildData.nDepth       = 24;
-    m_aSystemChildData.aColormap    = 0;
-    m_aSystemChildData.pAppContext  = NULL;
-    m_aSystemChildData.aShellWindow = 0;
-    m_aSystemChildData.pShellWidget = NULL;
-
+    m_aSystemChildData.nSize 		= sizeof( SystemChildData );
+    m_aSystemChildData.pDisplay		= NULL;
+    m_aSystemChildData.aWindow		= 0;
+    m_aSystemChildData.pSalFrame 	= this;
+    m_aSystemChildData.pWidget		= NULL;
+    m_aSystemChildData.pVisual		= NULL;
+    m_aSystemChildData.nDepth		= 24;
+    m_aSystemChildData.aColormap	= 0;
+    m_aSystemChildData.pAppContext	= NULL;
+    m_aSystemChildData.aShellWindow	= 0;
+    m_aSystemChildData.pShellWidget	= NULL;
+    
     if( m_pParent )
         m_pParent->m_aChildren.push_back( this );
-
+    
     if( m_pInstance )
         m_pInstance->registerFrame( this );
-
+    
     SetPosSize( 0, 0, 800, 600, SAL_FRAME_POSSIZE_WIDTH | SAL_FRAME_POSSIZE_HEIGHT );
 }
 
@@ -75,14 +75,14 @@ SvpSalFrame::~SvpSalFrame()
 {
     if( m_pInstance )
         m_pInstance->deregisterFrame( this );
-
+    
     std::list<SvpSalFrame*> Children = m_aChildren;
     for( std::list<SvpSalFrame*>::iterator it = Children.begin();
          it != Children.end(); ++it )
          (*it)->SetParent( m_pParent );
     if( m_pParent )
         m_pParent->m_aChildren.remove( this );
-
+    
     if( s_pFocusFrame == this )
     {
         s_pFocusFrame = NULL;
@@ -304,7 +304,7 @@ void SvpSalFrame::SetWindowState( const SalFrameState *pState )
             nWidth = pState->mnWidth;
         if (pState->mnMask & SAL_FRAMESTATE_MASK_HEIGHT)
             nHeight = pState->mnHeight;
-
+            
         SetPosSize( nX, nY, nWidth, nHeight,
                     SAL_FRAME_POSSIZE_X | SAL_FRAME_POSSIZE_Y |
                     SAL_FRAME_POSSIZE_WIDTH | SAL_FRAME_POSSIZE_HEIGHT );
@@ -314,8 +314,8 @@ void SvpSalFrame::SetWindowState( const SalFrameState *pState )
 BOOL SvpSalFrame::GetWindowState( SalFrameState* pState )
 {
     pState->mnState = SAL_FRAMESTATE_NORMAL;
-    pState->mnX      = maGeometry.nX;
-    pState->mnY      = maGeometry.nY;
+    pState->mnX 	 = maGeometry.nX;
+    pState->mnY 	 = maGeometry.nY;
     pState->mnWidth  = maGeometry.nWidth;
     pState->mnHeight = maGeometry.nHeight;
     pState->mnMask   = _FRAMESTATE_MASK_GEOMETRY | SAL_FRAMESTATE_MASK_STATE;
diff --git a/vcl/unx/headless/svpframe.hxx b/vcl/unx/headless/svpframe.hxx
index de968bbf7a4a..9e5fb6066be3 100644
--- a/vcl/unx/headless/svpframe.hxx
+++ b/vcl/unx/headless/svpframe.hxx
@@ -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
@@ -24,7 +24,7 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-
+ 
 #ifndef _SVP_SVPFRAME_HXX
 
 #include <vcl/salframe.hxx>
@@ -40,7 +40,7 @@ class SvpSalGraphics;
 class SvpSalFrame : public SalFrame, public SvpElement
 {
     SvpSalInstance*                     m_pInstance;
-    SvpSalFrame*                        m_pParent;       // pointer to parent frame
+    SvpSalFrame*	                    m_pParent;       // pointer to parent frame
     std::list< SvpSalFrame* >           m_aChildren;     // List of child frames
     ULONG                               m_nStyle;
     bool                                m_bVisible;
@@ -50,10 +50,10 @@ class SvpSalFrame : public SalFrame, public SvpElement
     long                                m_nMaxHeight;
 
     SystemEnvData                       m_aSystemChildData;
-
+    
     basebmp::BitmapDeviceSharedPtr      m_aFrame;
     std::list< SvpSalGraphics* >        m_aGraphics;
-
+    
     static SvpSalFrame*       s_pFocusFrame;
 public:
     SvpSalFrame( SvpSalInstance* pInstance,
@@ -61,64 +61,64 @@ public:
                  ULONG nSalFrameStyle,
                  SystemParentData* pSystemParent = NULL );
     virtual ~SvpSalFrame();
-
+    
     void GetFocus();
     void LoseFocus();
     void PostPaint() const;
-
+    
     // SvpElement
     virtual const basebmp::BitmapDeviceSharedPtr& getDevice() const { return m_aFrame; }
 
     // SalFrame
-    virtual SalGraphics*        GetGraphics();
-    virtual void                ReleaseGraphics( SalGraphics* pGraphics );
+    virtual SalGraphics*		GetGraphics();
+    virtual void				ReleaseGraphics( SalGraphics* pGraphics );
 
-    virtual BOOL                PostEvent( void* pData );
+    virtual BOOL				PostEvent( void* pData );
 
-    virtual void                SetTitle( const XubString& rTitle );
-    virtual void                SetIcon( USHORT nIcon );
-    virtual void                SetMenu( SalMenu* pMenu );
+    virtual void				SetTitle( const XubString& rTitle );
+    virtual void				SetIcon( USHORT nIcon );
+    virtual void				SetMenu( SalMenu* pMenu );
     virtual void                                DrawMenuBar();
 
     virtual void                SetExtendedFrameStyle( SalExtStyle nExtStyle );
-    virtual void                Show( BOOL bVisible, BOOL bNoActivate = FALSE );
-    virtual void                Enable( BOOL bEnable );
+    virtual void				Show( BOOL bVisible, BOOL bNoActivate = FALSE );
+    virtual void				Enable( BOOL bEnable );
     virtual void                SetMinClientSize( long nWidth, long nHeight );
     virtual void                SetMaxClientSize( long nWidth, long nHeight );
-    virtual void                SetPosSize( long nX, long nY, long nWidth, long nHeight, USHORT nFlags );
-    virtual void                GetClientSize( long& rWidth, long& rHeight );
-    virtual void                GetWorkArea( Rectangle& rRect );
-    virtual SalFrame*           GetParent() const;
-    virtual void                SetWindowState( const SalFrameState* pState );
-    virtual BOOL                GetWindowState( SalFrameState* pState );
-    virtual void                ShowFullScreen( BOOL bFullScreen, sal_Int32 nDisplay );
-    virtual void                StartPresentation( BOOL bStart );
-    virtual void                SetAlwaysOnTop( BOOL bOnTop );
-    virtual void                ToTop( USHORT nFlags );
-    virtual void                SetPointer( PointerStyle ePointerStyle );
-    virtual void                CaptureMouse( BOOL bMouse );
-    virtual void                SetPointerPos( long nX, long nY );
+    virtual void				SetPosSize( long nX, long nY, long nWidth, long nHeight, USHORT nFlags );
+    virtual void				GetClientSize( long& rWidth, long& rHeight );
+    virtual void				GetWorkArea( Rectangle& rRect );
+    virtual SalFrame*			GetParent() const;
+    virtual void				SetWindowState( const SalFrameState* pState );
+    virtual BOOL				GetWindowState( SalFrameState* pState );
+    virtual void				ShowFullScreen( BOOL bFullScreen, sal_Int32 nDisplay );
+    virtual void				StartPresentation( BOOL bStart );
+    virtual void				SetAlwaysOnTop( BOOL bOnTop );
+    virtual void				ToTop( USHORT nFlags );
+    virtual void				SetPointer( PointerStyle ePointerStyle );
+    virtual void				CaptureMouse( BOOL bMouse );
+    virtual void				SetPointerPos( long nX, long nY );
     using SalFrame::Flush;
-    virtual void                Flush();
-    virtual void                Sync();
-    virtual void                SetInputContext( SalInputContext* pContext );
-    virtual void                EndExtTextInput( USHORT nFlags );
-    virtual String              GetKeyName( USHORT nKeyCode );
-    virtual String              GetSymbolKeyName( const XubString& rFontName, USHORT nKeyCode );
+    virtual void				Flush();
+    virtual void				Sync();
+    virtual void				SetInputContext( SalInputContext* pContext );
+    virtual void				EndExtTextInput( USHORT nFlags );
+    virtual String				GetKeyName( USHORT nKeyCode );
+    virtual String				GetSymbolKeyName( const XubString& rFontName, USHORT nKeyCode );
     virtual BOOL                MapUnicodeToKeyCode( sal_Unicode aUnicode, LanguageType aLangType, KeyCode& rKeyCode );
-    virtual LanguageType        GetInputLanguage();
-    virtual SalBitmap*          SnapShot();
-    virtual void                UpdateSettings( AllSettings& rSettings );
-    virtual void                Beep( SoundType eSoundType );
-    virtual const SystemEnvData*    GetSystemData() const;
+    virtual LanguageType		GetInputLanguage();
+    virtual SalBitmap*			SnapShot();
+    virtual void				UpdateSettings( AllSettings& rSettings );
+    virtual void				Beep( SoundType eSoundType );
+    virtual const SystemEnvData*	GetSystemData() const;
     virtual SalPointerState     GetPointerState();
-    virtual void                SetParent( SalFrame* pNewParent );
-    virtual bool                SetPluginParent( SystemParentData* pNewParent );
+    virtual void				SetParent( SalFrame* pNewParent );
+    virtual bool				SetPluginParent( SystemParentData* pNewParent );
     virtual void                SetBackgroundBitmap( SalBitmap* pBitmap );
-    virtual void                ResetClipRegion();
-    virtual void                BeginSetClipRegion( ULONG nRects );
-    virtual void                UnionClipRegion( long nX, long nY, long nWidth, long nHeight );
-    virtual void                EndSetClipRegion();
+    virtual void				ResetClipRegion();
+    virtual void				BeginSetClipRegion( ULONG nRects );
+    virtual void				UnionClipRegion( long nX, long nY, long nWidth, long nHeight );
+    virtual void				EndSetClipRegion();
 
     /*TODO: functional implementation */
     virtual void                SetScreenNumber( unsigned int nScreen ) { (void)nScreen; }
diff --git a/vcl/unx/headless/svpgdi.cxx b/vcl/unx/headless/svpgdi.cxx
index 68d8be7cb4eb..b757164ad1fa 100644
--- a/vcl/unx/headless/svpgdi.cxx
+++ b/vcl/unx/headless/svpgdi.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
@@ -110,7 +110,7 @@ void SvpSalGraphics::setDevice( BitmapDeviceSharedPtr& rDevice )
 
     // determine matching bitmap format for masks
     sal_uInt32 nDeviceFmt = m_aDevice->getScanlineFormat();
-    DBG_ASSERT( (nDeviceFmt <= (sal_uInt32)Format::MAX), "SVP::setDevice() with invalid bitmap format" );
+    DBG_ASSERT( (nDeviceFmt <= (sal_uInt32)Format::MAX), "SVP::setDevice() with invalid bitmap format" ); 
     switch( nDeviceFmt )
     {
         case Format::EIGHT_BIT_GREY:
@@ -172,7 +172,7 @@ BOOL SvpSalGraphics::unionClipRegion( long nX, long nY, long nWidth, long nHeigh
     if( m_aClipMap )
     {
         B2DPolyPolygon aFull;
-        aFull.append( tools::createPolygonFromRect( B2DRectangle( nX, nY, nX+nWidth, nY+nHeight ) ) );
+        aFull.append( tools::createPolygonFromRect( B2DRectangle( nX, nY, nX+nWidth, nY+nHeight ) ) ); 
         m_aClipMap->fillPolyPolygon( aFull, basebmp::Color(0), DrawMode_PAINT );
     }
     else
@@ -278,7 +278,7 @@ void SvpSalGraphics::drawPixel( long nX, long nY, SalColor nSalColor )
                          aColor,
                          m_aDrawMode,
                          m_aClipMap
-                         );
+                         ); 
     dbgOut( m_aDevice );
 }
 
@@ -433,7 +433,7 @@ void SvpSalGraphics::copyArea( long nDestX,
 void SvpSalGraphics::copyBits( const SalTwoRect* pPosAry,
                                SalGraphics*      pSrcGraphics )
 {
-    SvpSalGraphics* pSrc = pSrcGraphics ?
+    SvpSalGraphics* pSrc = pSrcGraphics ? 
         static_cast<SvpSalGraphics*>(pSrcGraphics) : this;
     B2IRange aSrcRect( pPosAry->mnSrcX, pPosAry->mnSrcY,
                        pPosAry->mnSrcX+pPosAry->mnSrcWidth,
@@ -441,7 +441,7 @@ void SvpSalGraphics::copyBits( const SalTwoRect* pPosAry,
     B2IRange aDestRect( pPosAry->mnDestX, pPosAry->mnDestY,
                         pPosAry->mnDestX+pPosAry->mnDestWidth,
                         pPosAry->mnDestY+pPosAry->mnDestHeight );
-    m_aDevice->drawBitmap( pSrc->m_aOrigDevice, aSrcRect, aDestRect, DrawMode_PAINT, m_aClipMap );
+    m_aDevice->drawBitmap( pSrc->m_aOrigDevice, aSrcRect, aDestRect, DrawMode_PAINT, m_aClipMap );    
     dbgOut( m_aDevice );
 }
 
@@ -455,7 +455,7 @@ void SvpSalGraphics::drawBitmap( const SalTwoRect* pPosAry,
     B2IRange aDestRect( pPosAry->mnDestX, pPosAry->mnDestY,
                         pPosAry->mnDestX+pPosAry->mnDestWidth,
                         pPosAry->mnDestY+pPosAry->mnDestHeight );
-    m_aDevice->drawBitmap( rSrc.getBitmap(), aSrcRect, aDestRect, DrawMode_PAINT, m_aClipMap );
+    m_aDevice->drawBitmap( rSrc.getBitmap(), aSrcRect, aDestRect, DrawMode_PAINT, m_aClipMap );    
     dbgOut( m_aDevice );
 }
 
@@ -561,7 +561,7 @@ SystemFontData SvpSalGraphics::GetSysFontData( int nFallbacklevel ) const
 
     if (nFallbacklevel >= MAX_FALLBACK) nFallbacklevel = MAX_FALLBACK - 1;
     if (nFallbacklevel < 0 ) nFallbacklevel = 0;
-
+    
     aSysFontData.nSize = sizeof( SystemFontData );
     aSysFontData.nFontId = 0;
     aSysFontData.nFontFlags = 0;
diff --git a/vcl/unx/headless/svpgdi.hxx b/vcl/unx/headless/svpgdi.hxx
index ca1af87f8862..41f5c13b4401 100644
--- a/vcl/unx/headless/svpgdi.hxx
+++ b/vcl/unx/headless/svpgdi.hxx
@@ -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
@@ -43,7 +43,7 @@ class SvpSalGraphics : public SalGraphics
     bool                                 m_bUseLineColor;
     basebmp::Color                       m_aLineColor;
     bool                                 m_bUseFillColor;
-    basebmp::Color                       m_aFillColor;
+    basebmp::Color                       m_aFillColor;    
     basebmp::Color                       m_aTextColor;
 
     basebmp::DrawMode                    m_aDrawMode;
@@ -57,42 +57,42 @@ protected:
 
 public:
     SvpSalGraphics();
-    virtual ~SvpSalGraphics();
+    virtual	~SvpSalGraphics();
 
     const basebmp::BitmapDeviceSharedPtr& getDevice() const { return m_aDevice; }
     void setDevice( basebmp::BitmapDeviceSharedPtr& rDevice );
 
     // overload all pure virtual methods
-    virtual void            GetResolution( sal_Int32& rDPIX, sal_Int32& rDPIY );
-    virtual USHORT          GetBitCount();
-    virtual long            GetGraphicsWidth() const;
+    virtual void			GetResolution( sal_Int32& rDPIX, sal_Int32& rDPIY );
+    virtual USHORT			GetBitCount();
+    virtual long			GetGraphicsWidth() const;
 
-    virtual void            ResetClipRegion();
-    virtual void            BeginSetClipRegion( ULONG nCount );
-    virtual BOOL            unionClipRegion( long nX, long nY, long nWidth, long nHeight );
-    virtual bool            unionClipRegion(  const ::basegfx::B2DPolyPolygon& );
-    virtual void            EndSetClipRegion();
+    virtual void			ResetClipRegion();
+    virtual void			BeginSetClipRegion( ULONG nCount );
+    virtual BOOL			unionClipRegion( long nX, long nY, long nWidth, long nHeight );
+    virtual bool			unionClipRegion(  const ::basegfx::B2DPolyPolygon& );
+    virtual void			EndSetClipRegion();
 
-    virtual void            SetLineColor();
-    virtual void            SetLineColor( SalColor nSalColor );
-    virtual void            SetFillColor();
+    virtual void			SetLineColor();
+    virtual void			SetLineColor( SalColor nSalColor );
+    virtual void			SetFillColor();
 
-    virtual void            SetFillColor( SalColor nSalColor );
+    virtual void          	SetFillColor( SalColor nSalColor );
 
-    virtual void            SetXORMode( bool bSet, bool );
+    virtual void			SetXORMode( bool bSet, bool );
 
-    virtual void            SetROPLineColor( SalROPColor nROPColor );
-    virtual void            SetROPFillColor( SalROPColor nROPColor );
+    virtual void			SetROPLineColor( SalROPColor nROPColor );
+    virtual void			SetROPFillColor( SalROPColor nROPColor );
 
-    virtual void            SetTextColor( SalColor nSalColor );
+    virtual void			SetTextColor( SalColor nSalColor );
     virtual USHORT         SetFont( ImplFontSelectData*, int nFallbackLevel );
-    virtual void            GetFontMetric( ImplFontMetricData* );
-    virtual ULONG           GetKernPairs( ULONG nPairs, ImplKernPairData* pKernPairs );
+    virtual void			GetFontMetric( ImplFontMetricData* );
+    virtual ULONG			GetKernPairs( ULONG nPairs, ImplKernPairData* pKernPairs );
     virtual ImplFontCharMap* GetImplFontCharMap() const;
-    virtual void            GetDevFontList( ImplDevFontList* );
-    virtual void            GetDevFontSubstList( OutputDevice* );
-    virtual bool            AddTempDevFont( ImplDevFontList*, const String& rFileURL, const String& rFontName );
-    virtual BOOL            CreateFontSubset( const rtl::OUString& rToFile,
+    virtual void			GetDevFontList( ImplDevFontList* );
+    virtual void			GetDevFontSubstList( OutputDevice* );
+    virtual bool			AddTempDevFont( ImplDevFontList*, const String& rFileURL, const String& rFontName );
+    virtual BOOL			CreateFontSubset( const rtl::OUString& rToFile,
                                               const ImplFontData*,
                                               sal_Int32* pGlyphIDs,
                                               sal_uInt8* pEncoding,
@@ -101,69 +101,69 @@ public:
                                               FontSubsetInfo& rInfo
                                               );
     virtual const Ucs2SIntMap* GetFontEncodingVector( const ImplFontData*, const Ucs2OStrMap** ppNonEncoded );
-    virtual const void* GetEmbedFontData( const ImplFontData*,
+    virtual const void*	GetEmbedFontData( const ImplFontData*,
                                           const sal_Ucs* pUnicodes,
                                           sal_Int32* pWidths,
                                           FontSubsetInfo& rInfo,
                                           long* pDataLen );
-    virtual void            FreeEmbedFontData( const void* pData, long nDataLen );
+    virtual void			FreeEmbedFontData( const void* pData, long nDataLen );
     virtual void            GetGlyphWidths( const ImplFontData*,
                                             bool bVertical,
                                             Int32Vector& rWidths,
                                             Ucs2UIntMap& rUnicodeEnc );
-    virtual BOOL            GetGlyphBoundRect( long nIndex, Rectangle& );
-    virtual BOOL            GetGlyphOutline( long nIndex, ::basegfx::B2DPolyPolygon& );
-    virtual SalLayout*      GetTextLayout( ImplLayoutArgs&, int nFallbackLevel );
-    virtual void            DrawServerFontLayout( const ServerFontLayout& );
+    virtual BOOL			GetGlyphBoundRect( long nIndex, Rectangle& );
+    virtual BOOL			GetGlyphOutline( long nIndex, ::basegfx::B2DPolyPolygon& );
+    virtual SalLayout*		GetTextLayout( ImplLayoutArgs&, int nFallbackLevel );
+    virtual void			DrawServerFontLayout( const ServerFontLayout& );
     virtual bool            supportsOperation( OutDevSupportType ) const;
-    virtual void            drawPixel( long nX, long nY );
-    virtual void            drawPixel( long nX, long nY, SalColor nSalColor );
-    virtual void            drawLine( long nX1, long nY1, long nX2, long nY2 );
-    virtual void            drawRect( long nX, long nY, long nWidth, long nHeight );
+    virtual void			drawPixel( long nX, long nY );
+    virtual void			drawPixel( long nX, long nY, SalColor nSalColor );
+    virtual void			drawLine( long nX1, long nY1, long nX2, long nY2 );
+    virtual void			drawRect( long nX, long nY, long nWidth, long nHeight );
     virtual bool            drawPolyPolygon( const ::basegfx::B2DPolyPolygon&, double fTransparency );
     virtual bool            drawPolyLine( const ::basegfx::B2DPolygon&, double fTransparency, const ::basegfx::B2DVector& rLineWidths, basegfx::B2DLineJoin );
-    virtual void            drawPolyLine( ULONG nPoints, const SalPoint* pPtAry );
-    virtual void            drawPolygon( ULONG nPoints, const SalPoint* pPtAry );
-    virtual void            drawPolyPolygon( sal_uInt32 nPoly,
+    virtual void			drawPolyLine( ULONG nPoints, const SalPoint* pPtAry );
+    virtual void			drawPolygon( ULONG nPoints, const SalPoint* pPtAry );
+    virtual void			drawPolyPolygon( sal_uInt32 nPoly,
                                              const sal_uInt32* pPoints,
                                              PCONSTSALPOINT* pPtAry );
-    virtual sal_Bool        drawPolyLineBezier( ULONG nPoints,
+    virtual sal_Bool		drawPolyLineBezier( ULONG nPoints,
                                                 const SalPoint* pPtAry,
                                                 const BYTE* pFlgAry );
-    virtual sal_Bool        drawPolygonBezier( ULONG nPoints,
+    virtual sal_Bool		drawPolygonBezier( ULONG nPoints,
                                                const SalPoint* pPtAry,
                                                const BYTE* pFlgAry );
-    virtual sal_Bool        drawPolyPolygonBezier( sal_uInt32 nPoly,
+    virtual sal_Bool		drawPolyPolygonBezier( sal_uInt32 nPoly,
                                                    const sal_uInt32* pPoints,
                                                    const SalPoint* const* pPtAry,
                                                    const BYTE* const* pFlgAry );
 
-    virtual void            copyArea( long nDestX,
+    virtual void			copyArea( long nDestX,
                                       long nDestY,
                                       long nSrcX,
                                       long nSrcY,
                                       long nSrcWidth,
                                       long nSrcHeight,
                                       USHORT nFlags );
-    virtual void            copyBits( const SalTwoRect* pPosAry,
+    virtual void			copyBits( const SalTwoRect* pPosAry,
                                       SalGraphics* pSrcGraphics );
-    virtual void            drawBitmap( const SalTwoRect* pPosAry,
+    virtual void			drawBitmap( const SalTwoRect* pPosAry,
                                         const SalBitmap& rSalBitmap );
-    virtual void            drawBitmap( const SalTwoRect* pPosAry,
+    virtual void			drawBitmap( const SalTwoRect* pPosAry,
                                         const SalBitmap& rSalBitmap,
                                         SalColor nTransparentColor );
-    virtual void            drawBitmap( const SalTwoRect* pPosAry,
+    virtual void			drawBitmap( const SalTwoRect* pPosAry,
                                         const SalBitmap& rSalBitmap,
                                         const SalBitmap& rTransparentBitmap );
-    virtual void            drawMask( const SalTwoRect* pPosAry,
+    virtual void			drawMask( const SalTwoRect* pPosAry,
                                       const SalBitmap& rSalBitmap,
                                       SalColor nMaskColor );
-    virtual SalBitmap*      getBitmap( long nX, long nY, long nWidth, long nHeight );
-    virtual SalColor        getPixel( long nX, long nY );
-    virtual void            invert( long nX, long nY, long nWidth, long nHeight, SalInvert nFlags );
-    virtual void            invert( ULONG nPoints, const SalPoint* pPtAry, SalInvert nFlags );
+    virtual SalBitmap*		getBitmap( long nX, long nY, long nWidth, long nHeight );
+    virtual SalColor		getPixel( long nX, long nY );
+    virtual void			invert( long nX, long nY, long nWidth, long nHeight, SalInvert nFlags );
+    virtual void			invert( ULONG nPoints, const SalPoint* pPtAry, SalInvert nFlags );
 
-    virtual BOOL            drawEPS( long nX, long nY, long nWidth, long nHeight, void* pPtr, ULONG nSize );
+    virtual BOOL			drawEPS( long nX, long nY, long nWidth, long nHeight, void* pPtr, ULONG nSize );
 
     virtual SystemGraphicsData GetGraphicsData() const;
     virtual SystemFontData     GetSysFontData( int nFallbacklevel ) const;
diff --git a/vcl/unx/headless/svpinst.cxx b/vcl/unx/headless/svpinst.cxx
index 466b56868900..01e9a39bb178 100644
--- a/vcl/unx/headless/svpinst.cxx
+++ b/vcl/unx/headless/svpinst.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
@@ -72,9 +72,9 @@ SvpSalInstance* SvpSalInstance::s_pDefaultInstance = NULL;
 
 SvpSalInstance::SvpSalInstance()
 {
-    m_aTimeout.tv_sec       = 0;
-    m_aTimeout.tv_usec      = 0;
-    m_nTimeoutMS            = 0;
+    m_aTimeout.tv_sec 		= 0;
+    m_aTimeout.tv_usec		= 0;
+    m_nTimeoutMS 			= 0;
 
     m_pTimeoutFDS[0] = m_pTimeoutFDS[1] = -1;
     if (pipe (m_pTimeoutFDS) != -1)
@@ -115,7 +115,7 @@ SvpSalInstance::~SvpSalInstance()
 {
     if( s_pDefaultInstance == this )
         s_pDefaultInstance = NULL;
-
+    
     // close 'wakeup' pipe.
     close (m_pTimeoutFDS[0]);
     close (m_pTimeoutFDS[1]);
@@ -158,7 +158,7 @@ void SvpSalInstance::CancelEvent( const SalFrame* pFrame, void* pData, USHORT nE
 void SvpSalInstance::deregisterFrame( SalFrame* pFrame )
 {
     m_aFrames.remove( pFrame );
-
+    
     if( osl_acquireMutex( m_aEventGuard ) )
     {
         // cancel outstanding events for this frame
@@ -389,7 +389,7 @@ void SvpSalInstance::Yield( bool bWait, bool bHandleAllCurrentEvents )
         }
         else
             nTimeoutMS = -1; // wait until something happens
-
+        
         // release yield mutex
         nAcquireCount = ReleaseYieldMutex();
         // poll
@@ -398,10 +398,10 @@ void SvpSalInstance::Yield( bool bWait, bool bHandleAllCurrentEvents )
         aPoll.events = POLLIN;
         aPoll.revents = 0;
         poll( &aPoll, 1, nTimeoutMS );
-
+        
         // acquire yield mutex again
         AcquireYieldMutex( nAcquireCount );
-
+        
         // clean up pipe
         if( (aPoll.revents & POLLIN) != 0 )
         {
@@ -457,8 +457,8 @@ void* SvpSalInstance::GetConnectionIdentifier( ConnectionIdentifierType& rReturn
 
 SvpSalYieldMutex::SvpSalYieldMutex()
 {
-    mnCount     = 0;
-    mnThreadId  = 0;
+    mnCount 	= 0;
+    mnThreadId	= 0;
 }
 
 void SvpSalYieldMutex::acquire()
@@ -497,9 +497,9 @@ sal_Bool SvpSalYieldMutex::tryToAcquire()
 
 void SvpSalInstance::StopTimer()
 {
-    m_aTimeout.tv_sec   = 0;
-    m_aTimeout.tv_usec  = 0;
-    m_nTimeoutMS        = 0;
+    m_aTimeout.tv_sec	= 0;
+    m_aTimeout.tv_usec	= 0;
+    m_nTimeoutMS		= 0;
 }
 
 void SvpSalInstance::StartTimer( ULONG nMS )
diff --git a/vcl/unx/headless/svpinst.hxx b/vcl/unx/headless/svpinst.hxx
index 284a2d11cd82..c92ccb910c3b 100644
--- a/vcl/unx/headless/svpinst.hxx
+++ b/vcl/unx/headless/svpinst.hxx
@@ -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
@@ -49,18 +49,18 @@
 class SvpSalYieldMutex : public NAMESPACE_VOS(OMutex)
 {
 protected:
-    ULONG                                       mnCount;
-    NAMESPACE_VOS(OThread)::TThreadIdentifier   mnThreadId;
+    ULONG										mnCount;
+    NAMESPACE_VOS(OThread)::TThreadIdentifier	mnThreadId;
 
 public:
                                                 SvpSalYieldMutex();
 
-    virtual void                                acquire();
-    virtual void                                release();
-    virtual sal_Bool                            tryToAcquire();
+    virtual void								acquire();
+    virtual void								release();
+    virtual sal_Bool 							tryToAcquire();
 
-    ULONG                                       GetAcquireCount() const { return mnCount; }
-    NAMESPACE_VOS(OThread)::TThreadIdentifier   GetThreadId() const { return mnThreadId; }
+    ULONG										GetAcquireCount() const { return mnCount; }
+    NAMESPACE_VOS(OThread)::TThreadIdentifier	GetThreadId() const { return mnThreadId; }
 };
 
 // ---------------
@@ -85,7 +85,7 @@ public:
 class SvpSalFrame;
 class SvpSalInstance : public SalInstance
 {
-    timeval             m_aTimeout;
+    timeval			    m_aTimeout;
     ULONG               m_nTimeoutMS;
     int                 m_pTimeoutFDS[2];
     SvpSalYieldMutex    m_aYieldMutex;
@@ -93,11 +93,11 @@ class SvpSalInstance : public SalInstance
     // internal event queue
     struct SalUserEvent
     {
-        const SalFrame*     m_pFrame;
-        void*               m_pData;
-        USHORT             m_nEvent;
-
-        SalUserEvent( const SalFrame* pFrame, void* pData, USHORT nEvent = SALEVENT_USEREVENT )
+        const SalFrame*		m_pFrame;
+        void*			    m_pData;
+        USHORT			   m_nEvent;
+        
+        SalUserEvent( const SalFrame* pFrame, void* pData, USHORT nEvent = SALEVENT_USEREVENT ) 
                 : m_pFrame( pFrame ),
                   m_pData( pData ),
                   m_nEvent( nEvent )
@@ -106,7 +106,7 @@ class SvpSalInstance : public SalInstance
 
     oslMutex        m_aEventGuard;
     std::list< SalUserEvent > m_aUserEvents;
-
+    
     std::list< SalFrame* > m_aFrames;
 
     bool isFrameAlive( const SalFrame* pFrame ) const;
@@ -116,72 +116,72 @@ public:
 
     SvpSalInstance();
     virtual ~SvpSalInstance();
-
+    
     void PostEvent( const SalFrame* pFrame, void* pData, USHORT nEvent );
     void CancelEvent( const SalFrame* pFrame, void* pData, USHORT nEvent );
-
+    
     void StartTimer( ULONG nMS );
     void StopTimer();
     void Wakeup();
-
+    
     void registerFrame( SalFrame* pFrame ) { m_aFrames.push_back( pFrame ); }
     void deregisterFrame( SalFrame* pFrame );
     const std::list< SalFrame* >& getFrames() const { return m_aFrames; }
-
+    
     bool            CheckTimeout( bool bExecuteTimers = true );
 
     // Frame
-    virtual SalFrame*       CreateChildFrame( SystemParentData* pParent, ULONG nStyle );
-    virtual SalFrame*       CreateFrame( SalFrame* pParent, ULONG nStyle );
-    virtual void            DestroyFrame( SalFrame* pFrame );
+    virtual SalFrame*      	CreateChildFrame( SystemParentData* pParent, ULONG nStyle );
+    virtual SalFrame*      	CreateFrame( SalFrame* pParent, ULONG nStyle );
+    virtual void			DestroyFrame( SalFrame* pFrame );
 
     // Object (System Child Window)
-    virtual SalObject*      CreateObject( SalFrame* pParent, SystemWindowData* pWindowData, BOOL bShow = TRUE );
-    virtual void            DestroyObject( SalObject* pObject );
+    virtual SalObject*		CreateObject( SalFrame* pParent, SystemWindowData* pWindowData, BOOL bShow = TRUE );
+    virtual void			DestroyObject( SalObject* pObject );
 
     // VirtualDevice
     // nDX and nDY in Pixel
     // nBitCount: 0 == Default(=as window) / 1 == Mono
     // pData allows for using a system dependent graphics or device context
-    virtual SalVirtualDevice*   CreateVirtualDevice( SalGraphics* pGraphics,
+    virtual SalVirtualDevice*	CreateVirtualDevice( SalGraphics* pGraphics,
                                                      long nDX, long nDY,
                                                      USHORT nBitCount, const SystemGraphicsData *pData = NULL );
-    virtual void                DestroyVirtualDevice( SalVirtualDevice* pDevice );
+    virtual void				DestroyVirtualDevice( SalVirtualDevice* pDevice );
 
     // Printer
     // pSetupData->mpDriverData can be 0
     // pSetupData must be updatet with the current
     // JobSetup
-    virtual SalInfoPrinter* CreateInfoPrinter( SalPrinterQueueInfo* pQueueInfo,
+    virtual SalInfoPrinter*	CreateInfoPrinter( SalPrinterQueueInfo* pQueueInfo,
                                                ImplJobSetup* pSetupData );
-    virtual void            DestroyInfoPrinter( SalInfoPrinter* pPrinter );
-    virtual SalPrinter*     CreatePrinter( SalInfoPrinter* pInfoPrinter );
-    virtual void            DestroyPrinter( SalPrinter* pPrinter );
+    virtual void			DestroyInfoPrinter( SalInfoPrinter* pPrinter );
+    virtual SalPrinter*		CreatePrinter( SalInfoPrinter* pInfoPrinter );
+    virtual void			DestroyPrinter( SalPrinter* pPrinter );
 
-    virtual void            GetPrinterQueueInfo( ImplPrnQueueList* pList );
-    virtual void            GetPrinterQueueState( SalPrinterQueueInfo* pInfo );
-    virtual void            DeletePrinterQueueInfo( SalPrinterQueueInfo* pInfo );
+    virtual void			GetPrinterQueueInfo( ImplPrnQueueList* pList );
+    virtual void			GetPrinterQueueState( SalPrinterQueueInfo* pInfo );
+    virtual void			DeletePrinterQueueInfo( SalPrinterQueueInfo* pInfo );
     virtual String          GetDefaultPrinter();
 
     // SalTimer
-    virtual SalTimer*       CreateSalTimer();
+    virtual SalTimer*		CreateSalTimer();
     // SalI18NImeStatus
     virtual SalI18NImeStatus*   CreateI18NImeStatus();
     // SalSystem
-    virtual SalSystem*      CreateSalSystem();
+    virtual SalSystem*		CreateSalSystem();
     // SalBitmap
-    virtual SalBitmap*      CreateSalBitmap();
+    virtual SalBitmap*		CreateSalBitmap();
 
     // YieldMutex
-    virtual vos::IMutex*    GetYieldMutex();
-    virtual ULONG           ReleaseYieldMutex();
-    virtual void            AcquireYieldMutex( ULONG nCount );
+    virtual vos::IMutex*	GetYieldMutex();
+    virtual ULONG			ReleaseYieldMutex();
+    virtual void			AcquireYieldMutex( ULONG nCount );
 
     // wait next event and dispatch
     // must returned by UserEvent (SalFrame::PostEvent)
     // and timer
-    virtual void            Yield( bool bWait, bool bHandleAllCurrentEvents );
-    virtual bool            AnyInput( USHORT nType );
+    virtual void			Yield( bool bWait, bool bHandleAllCurrentEvents );
+    virtual bool			AnyInput( USHORT nType );
 
                             // Menues
     virtual SalMenu*        CreateMenu( BOOL bMenuBar );
@@ -190,9 +190,9 @@ public:
     virtual void            DestroyMenuItem( SalMenuItem* pItem );
 
     // may return NULL to disable session management
-    virtual SalSession*     CreateSalSession();
+    virtual SalSession*		CreateSalSession();
 
-    virtual void*           GetConnectionIdentifier( ConnectionIdentifierType& rReturnedType, int& rReturnedBytes );
+    virtual void*			GetConnectionIdentifier( ConnectionIdentifierType& rReturnedType, int& rReturnedBytes );
 
     virtual void            AddToRecentDocumentList(const rtl::OUString& rFileUrl, const rtl::OUString& rMimeType);
 };
diff --git a/vcl/unx/headless/svpprn.cxx b/vcl/unx/headless/svpprn.cxx
index 5b461bb996ef..fcc669c8801e 100644
--- a/vcl/unx/headless/svpprn.cxx
+++ b/vcl/unx/headless/svpprn.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
@@ -47,7 +47,7 @@ using namespace psp;
 using namespace rtl;
 
 /*
- *  static helpers
+ *	static helpers
  */
 
 static String getPdfDir( const PrinterInfo& rInfo )
@@ -75,30 +75,30 @@ inline int TenMuToPt( int nUnits ) { return (int)((((double)nUnits)/35.27777778)
 
 static void copyJobDataToJobSetup( ImplJobSetup* pJobSetup, JobData& rData )
 {
-    pJobSetup->meOrientation    = (Orientation)(rData.m_eOrientation == orientation::Landscape ? ORIENTATION_LANDSCAPE : ORIENTATION_PORTRAIT);
+    pJobSetup->meOrientation	= (Orientation)(rData.m_eOrientation == orientation::Landscape ? ORIENTATION_LANDSCAPE : ORIENTATION_PORTRAIT);
 
     // copy page size
     String aPaper;
     int width, height;
 
     rData.m_aContext.getPageSize( aPaper, width, height );
-    pJobSetup->mePaperFormat    = PaperInfo::fromPSName(OUStringToOString( aPaper, RTL_TEXTENCODING_ISO_8859_1 ));
-    pJobSetup->mnPaperWidth     = 0;
-    pJobSetup->mnPaperHeight    = 0;
+    pJobSetup->mePaperFormat	= PaperInfo::fromPSName(OUStringToOString( aPaper, RTL_TEXTENCODING_ISO_8859_1 ));
+    pJobSetup->mnPaperWidth		= 0;
+    pJobSetup->mnPaperHeight	= 0;
     if( pJobSetup->mePaperFormat == PAPER_USER )
     {
         // transform to 100dth mm
-        width               = PtTo10Mu( width );
-        height              = PtTo10Mu( height );
+        width				= PtTo10Mu( width );
+        height				= PtTo10Mu( height );
 
         if( rData.m_eOrientation == psp::orientation::Portrait )
         {
-            pJobSetup->mnPaperWidth = width;
+            pJobSetup->mnPaperWidth	= width;
             pJobSetup->mnPaperHeight= height;
         }
         else
         {
-            pJobSetup->mnPaperWidth = height;
+            pJobSetup->mnPaperWidth	= height;
             pJobSetup->mnPaperHeight= width;
         }
     }
@@ -109,9 +109,9 @@ static void copyJobDataToJobSetup( ImplJobSetup* pJobSetup, JobData& rData )
 
     pJobSetup->mnPaperBin = 0xffff;
     if( rData.m_pParser )
-        pKey                    = rData.m_pParser->getKey( String( RTL_CONSTASCII_USTRINGPARAM( "InputSlot" ) ) );
+        pKey					= rData.m_pParser->getKey( String( RTL_CONSTASCII_USTRINGPARAM( "InputSlot" ) ) );
     if( pKey )
-        pValue                  = rData.m_aContext.getValue( pKey );
+        pValue					= rData.m_aContext.getValue( pKey );
     if( pKey && pValue )
     {
         for( pJobSetup->mnPaperBin = 0;
@@ -126,7 +126,7 @@ static void copyJobDataToJobSetup( ImplJobSetup* pJobSetup, JobData& rData )
     // copy duplex
     pKey = NULL;
     pValue = NULL;
-
+    
     pJobSetup->meDuplexMode = DUPLEX_UNKNOWN;
     if( rData.m_pParser )
         pKey = rData.m_pParser->getKey( String( RTL_CONSTASCII_USTRINGPARAM( "Duplex" ) ) );
@@ -307,13 +307,13 @@ static bool createPdf( const String& rToFile, const String& rFromFile, const Str
 }
 
 /*
- *  SalInstance
+ *	SalInstance
  */
 
 // -----------------------------------------------------------------------
 
-SalInfoPrinter* SvpSalInstance::CreateInfoPrinter( SalPrinterQueueInfo* pQueueInfo,
-                                                   ImplJobSetup*            pJobSetup )
+SalInfoPrinter* SvpSalInstance::CreateInfoPrinter( SalPrinterQueueInfo*	pQueueInfo,
+                                                   ImplJobSetup*			pJobSetup )
 {
     // create and initialize SalInfoPrinter
     PspSalInfoPrinter* pPrinter = new PspSalInfoPrinter;
@@ -328,9 +328,9 @@ SalInfoPrinter* SvpSalInstance::CreateInfoPrinter( SalPrinterQueueInfo* pQueueIn
         if( pJobSetup->mpDriverData )
             JobData::constructFromStreamBuffer( pJobSetup->mpDriverData, pJobSetup->mnDriverDataLen, aInfo );
 
-        pJobSetup->mnSystem         = JOBSETUP_SYSTEM_UNIX;
-        pJobSetup->maPrinterName    = pQueueInfo->maPrinterName;
-        pJobSetup->maDriver         = aInfo.m_aDriverName;
+        pJobSetup->mnSystem			= JOBSETUP_SYSTEM_UNIX;
+        pJobSetup->maPrinterName	= pQueueInfo->maPrinterName;
+        pJobSetup->maDriver			= aInfo.m_aDriverName;
         copyJobDataToJobSetup( pJobSetup, aInfo );
 
         // set/clear backwards compatibility flag
@@ -393,11 +393,11 @@ void SvpSalInstance::GetPrinterQueueInfo( ImplPrnQueueList* pList )
         const PrinterInfo& rInfo( rManager.getPrinterInfo( *it ) );
         // Neuen Eintrag anlegen
         SalPrinterQueueInfo* pInfo = new SalPrinterQueueInfo;
-        pInfo->maPrinterName    = *it;
-        pInfo->maDriver         = rInfo.m_aDriverName;
-        pInfo->maLocation       = rInfo.m_aLocation;
-        pInfo->maComment        = rInfo.m_aComment;
-        pInfo->mpSysData        = NULL;
+        pInfo->maPrinterName	= *it;
+        pInfo->maDriver			= rInfo.m_aDriverName;
+        pInfo->maLocation		= rInfo.m_aLocation;
+        pInfo->maComment      	= rInfo.m_aComment;
+        pInfo->mpSysData		= NULL;
 
         sal_Int32 nIndex = 0;
         while( nIndex != -1 )
@@ -575,13 +575,13 @@ BOOL PspSalInfoPrinter::SetData(
             int nWidth, nHeight;
             if( pJobSetup->meOrientation == ORIENTATION_PORTRAIT )
             {
-                nWidth  = pJobSetup->mnPaperWidth;
-                nHeight = pJobSetup->mnPaperHeight;
+                nWidth	= pJobSetup->mnPaperWidth;
+                nHeight	= pJobSetup->mnPaperHeight;
             }
             else
             {
-                nWidth  = pJobSetup->mnPaperHeight;
-                nHeight = pJobSetup->mnPaperWidth;
+                nWidth	= pJobSetup->mnPaperHeight;
+                nHeight	= pJobSetup->mnPaperWidth;
             }
             String aPaper;
 
@@ -621,7 +621,7 @@ BOOL PspSalInfoPrinter::SetData(
         // merge orientation if necessary
         if( nSetDataFlags & SAL_JOBSET_ORIENTATION )
             aData.m_eOrientation = pJobSetup->meOrientation == ORIENTATION_LANDSCAPE ? orientation::Landscape : orientation::Portrait;
-
+        
         // merge duplex if necessary
         if( nSetDataFlags & SAL_JOBSET_DUPLEXMODE )
         {
@@ -696,12 +696,12 @@ void PspSalInfoPrinter::GetPageInfo(
             aData.m_pParser->getMargins( aPaper, top, bottom, right, left );
         }
 
-        rPageWidth  = width * nDPI / 72;
-        rPageHeight = height * nDPI / 72;
-        rPageOffX   = left * nDPI / 72;
-        rPageOffY   = top * nDPI / 72;
-        rOutWidth   = ( width  - left - right ) * nDPI / 72;
-        rOutHeight  = ( height - top  - bottom ) * nDPI / 72;
+        rPageWidth	= width * nDPI / 72;
+        rPageHeight	= height * nDPI / 72;
+        rPageOffX	= left * nDPI / 72;
+        rPageOffY	= top * nDPI / 72;
+        rOutWidth	= ( width  - left - right ) * nDPI / 72;
+        rOutHeight	= ( height - top  - bottom ) * nDPI / 72;
     }
 }
 
@@ -810,7 +810,7 @@ ULONG PspSalInfoPrinter::GetCapabilities( const ImplJobSetup* pJobSetup, USHORT
 // =======================================================================
 
 /*
- *  SalPrinter
+ *	SalPrinter
  */
 
 PspSalPrinter::PspSalPrinter( SalInfoPrinter* pInfoPrinter )
@@ -852,10 +852,10 @@ BOOL PspSalPrinter::StartJob(
 {
     vcl_sal::PrinterUpdate::jobStarted();
 
-    m_bFax      = false;
-    m_bPdf      = false;
-    m_aFileName = pFileName ? *pFileName : String();
-    m_aTmpFile  = String();
+    m_bFax		= false;
+    m_bPdf		= false;
+    m_aFileName	= pFileName ? *pFileName : String();
+    m_aTmpFile	= String();
     m_nCopies   = nCopies;
     m_bCollate  = bCollate;
 
@@ -1037,7 +1037,7 @@ void vcl_sal::PrinterUpdate::update()
     if( Application::GetSettings().GetMiscSettings().GetDisablePrinting() )
         return;
 
-    static bool bOnce = false;
+    static bool bOnce = false;    
     if( ! bOnce )
     {
         bOnce = true;
@@ -1045,7 +1045,7 @@ void vcl_sal::PrinterUpdate::update()
         psp::PrinterInfoManager::get();
         return;
     }
-
+    
     if( nActiveJobs < 1 )
         doUpdate();
     else if( ! pPrinterUpdateTimer )
diff --git a/vcl/unx/headless/svpprn.hxx b/vcl/unx/headless/svpprn.hxx
index 0da506076908..5077a39de293 100644
--- a/vcl/unx/headless/svpprn.hxx
+++ b/vcl/unx/headless/svpprn.hxx
@@ -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
@@ -38,44 +38,44 @@ class PspGraphics;
 class PspSalInfoPrinter : public SalInfoPrinter
 {
 public:
-    PspGraphics*            m_pGraphics;
-    psp::JobData            m_aJobData;
-    psp::PrinterGfx         m_aPrinterGfx;
+    PspGraphics*			m_pGraphics;
+    psp::JobData			m_aJobData;
+    psp::PrinterGfx			m_aPrinterGfx;
 
     PspSalInfoPrinter();
     virtual ~PspSalInfoPrinter();
 
     // overload all pure virtual methods
-    virtual SalGraphics*            GetGraphics();
-    virtual void                    ReleaseGraphics( SalGraphics* pGraphics );
-    virtual BOOL                    Setup( SalFrame* pFrame, ImplJobSetup* pSetupData );
-    virtual BOOL                    SetPrinterData( ImplJobSetup* pSetupData );
-    virtual BOOL                    SetData( ULONG nFlags, ImplJobSetup* pSetupData );
-    virtual void                    GetPageInfo( const ImplJobSetup* pSetupData,
+    virtual SalGraphics*			GetGraphics();
+    virtual void					ReleaseGraphics( SalGraphics* pGraphics );
+    virtual BOOL					Setup( SalFrame* pFrame, ImplJobSetup* pSetupData );
+    virtual BOOL					SetPrinterData( ImplJobSetup* pSetupData );
+    virtual BOOL					SetData( ULONG nFlags, ImplJobSetup* pSetupData );
+    virtual void					GetPageInfo( const ImplJobSetup* pSetupData,
                                                  long& rOutWidth, long& rOutHeight,
                                                  long& rPageOffX, long& rPageOffY,
                                                  long& rPageWidth, long& rPageHeight );
-    virtual ULONG                   GetCapabilities( const ImplJobSetup* pSetupData, USHORT nType );
-    virtual ULONG                   GetPaperBinCount( const ImplJobSetup* pSetupData );
-    virtual String                  GetPaperBinName( const ImplJobSetup* pSetupData, ULONG nPaperBin );
-    virtual void                    InitPaperFormats( const ImplJobSetup* pSetupData );
-    virtual int                 GetLandscapeAngle( const ImplJobSetup* pSetupData );
+    virtual ULONG					GetCapabilities( const ImplJobSetup* pSetupData, USHORT nType );
+    virtual ULONG					GetPaperBinCount( const ImplJobSetup* pSetupData );
+    virtual String					GetPaperBinName( const ImplJobSetup* pSetupData, ULONG nPaperBin );
+    virtual void					InitPaperFormats( const ImplJobSetup* pSetupData );
+    virtual int					GetLandscapeAngle( const ImplJobSetup* pSetupData );
 };
 
 class PspSalPrinter : public SalPrinter
 {
 public:
-    String                  m_aFileName;
-    String                  m_aTmpFile;
-    String                  m_aFaxNr;
-    bool                    m_bFax:1;
-    bool                    m_bPdf:1;
-    bool                    m_bSwallowFaxNo:1;
-    PspGraphics*            m_pGraphics;
-    psp::PrinterJob         m_aPrintJob;
-    psp::JobData            m_aJobData;
-    psp::PrinterGfx         m_aPrinterGfx;
-    ULONG                   m_nCopies;
+    String					m_aFileName;
+    String					m_aTmpFile;
+    String					m_aFaxNr;
+    bool					m_bFax:1;
+    bool					m_bPdf:1;
+    bool					m_bSwallowFaxNo:1;
+    PspGraphics*			m_pGraphics;
+    psp::PrinterJob			m_aPrintJob;
+    psp::JobData			m_aJobData;
+    psp::PrinterGfx			m_aPrinterGfx;
+    ULONG					m_nCopies;
     bool                    m_bCollate;
     SalInfoPrinter*         m_pInfoPrinter;
 
@@ -84,18 +84,18 @@ public:
 
     // overload all pure virtual methods
     using SalPrinter::StartJob;
-    virtual BOOL                    StartJob( const XubString* pFileName,
+    virtual BOOL					StartJob( const XubString* pFileName,
                                               const XubString& rJobName,
                                               const XubString& rAppName,
                                               ULONG nCopies,
                                               bool bCollate,
                                               bool bDirect,
                                               ImplJobSetup* pSetupData );
-    virtual BOOL                    EndJob();
-    virtual BOOL                    AbortJob();
-    virtual SalGraphics*            StartPage( ImplJobSetup* pSetupData, BOOL bNewJobData );
-    virtual BOOL                    EndPage();
-    virtual ULONG                   GetErrorCode();
+    virtual BOOL					EndJob();
+    virtual BOOL					AbortJob();
+    virtual SalGraphics*			StartPage( ImplJobSetup* pSetupData, BOOL bNewJobData );
+    virtual BOOL					EndPage();
+    virtual ULONG					GetErrorCode();
 };
 
 class Timer;
@@ -103,8 +103,8 @@ class Timer;
 namespace vcl_sal {
 class VCL_DLLPUBLIC PrinterUpdate
 {
-    static Timer*           pPrinterUpdateTimer;
-    static int              nActiveJobs;
+    static Timer*			pPrinterUpdateTimer;
+    static int				nActiveJobs;
 
     static void doUpdate();
     DECL_STATIC_LINK( PrinterUpdate, UpdateTimerHdl, void* );
diff --git a/vcl/unx/headless/svppspgraphics.cxx b/vcl/unx/headless/svppspgraphics.cxx
index 6da09b38023c..73227d63b2d1 100644
--- a/vcl/unx/headless/svppspgraphics.cxx
+++ b/vcl/unx/headless/svppspgraphics.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
@@ -71,19 +71,19 @@ class SalPrinterBmp : public psp::PrinterBmp
     public:
 
                             SalPrinterBmp (const BitmapDeviceSharedPtr& rDevice);
-        virtual             ~SalPrinterBmp ();
-        virtual sal_uInt32  GetPaletteColor (sal_uInt32 nIdx) const;
-        virtual sal_uInt32  GetPaletteEntryCount () const;
-        virtual sal_uInt32  GetPixelRGB  (sal_uInt32 nRow, sal_uInt32 nColumn) const;
-        virtual sal_uInt8   GetPixelGray (sal_uInt32 nRow, sal_uInt32 nColumn) const;
-        virtual sal_uInt8   GetPixelIdx  (sal_uInt32 nRow, sal_uInt32 nColumn) const;
-        virtual sal_uInt32  GetWidth () const;
-        virtual sal_uInt32  GetHeight() const;
-        virtual sal_uInt32  GetDepth () const;
-
+        virtual				~SalPrinterBmp ();
+        virtual sal_uInt32	GetPaletteColor (sal_uInt32 nIdx) const;
+        virtual sal_uInt32	GetPaletteEntryCount () const;
+        virtual sal_uInt32	GetPixelRGB  (sal_uInt32 nRow, sal_uInt32 nColumn) const;
+        virtual sal_uInt8	GetPixelGray (sal_uInt32 nRow, sal_uInt32 nColumn) const;
+        virtual sal_uInt8	GetPixelIdx  (sal_uInt32 nRow, sal_uInt32 nColumn) const;
+        virtual sal_uInt32	GetWidth () const;
+        virtual sal_uInt32	GetHeight() const;
+        virtual sal_uInt32	GetDepth ()	const;
+        
         static sal_uInt32 getRGBFromColor( const basebmp::Color& rCol )
         {
-            return    ((rCol.getBlue())          & 0x000000ff)
+            return 	  ((rCol.getBlue()) 		 & 0x000000ff)
                     | ((rCol.getGreen() <<  8) & 0x0000ff00)
                     | ((rCol.getRed()   << 16) & 0x00ff0000);
         }
@@ -316,7 +316,7 @@ void PspGraphics::drawPolygon( ULONG nPoints, const SalPoint* pPtAry )
     m_pPrinterGfx->DrawPolygon (nPoints, (Point*)pPtAry);
 }
 
-void PspGraphics::drawPolyPolygon( sal_uInt32           nPoly,
+void PspGraphics::drawPolyPolygon( sal_uInt32			nPoly,
                                    const sal_uInt32   *pPoints,
                                    PCONSTSALPOINT  *pPtAry )
 {
@@ -431,11 +431,11 @@ SalColor PspGraphics::getPixel( long /*nX*/, long /*nY*/ )
 }
 
 void PspGraphics::invert(
-                         long       /*nX*/,
-                         long       /*nY*/,
-                         long       /*nDX*/,
-                         long       /*nDY*/,
-                         SalInvert  /*nFlags*/ )
+                         long		/*nX*/,
+                         long		/*nY*/,
+                         long		/*nDX*/,
+                         long		/*nDY*/,
+                         SalInvert	/*nFlags*/ )
 {
     DBG_ERROR ("Warning: PrinterGfx::Invert() not implemented");
 }
@@ -499,8 +499,8 @@ PspFontLayout::PspFontLayout( ::psp::PrinterGfx& rGfx )
     mnFontHeight = mrPrinterGfx.GetFontHeight();
     mnFontWidth  = mrPrinterGfx.GetFontWidth();
     mbVertical   = mrPrinterGfx.GetFontVertical();
-    mbArtItalic  = mrPrinterGfx.GetArtificialItalic();
-    mbArtBold    = mrPrinterGfx.GetArtificialBold();
+    mbArtItalic	 = mrPrinterGfx.GetArtificialItalic();
+    mbArtBold	 = mrPrinterGfx.GetArtificialBold();
 }
 
 //--------------------------------------------------------------------------
@@ -588,19 +588,19 @@ public:
     PspServerFontLayout( psp::PrinterGfx&, ServerFont& rFont, const ImplLayoutArgs& rArgs );
 
     virtual void        InitFont() const;
-    const sal_Unicode*  getTextPtr() const { return maText.getStr() - mnMinCharPos; }
-    int                 getMinCharPos() const { return mnMinCharPos; }
-    int                 getMaxCharPos() const { return mnMinCharPos+maText.getLength()-1; }
+    const sal_Unicode*	getTextPtr() const { return maText.getStr() - mnMinCharPos; }
+    int					getMinCharPos() const { return mnMinCharPos; }
+    int					getMaxCharPos() const { return mnMinCharPos+maText.getLength()-1; }
 private:
     ::psp::PrinterGfx&  mrPrinterGfx;
     sal_IntPtr          mnFontID;
     int                 mnFontHeight;
     int                 mnFontWidth;
     bool                mbVertical;
-    bool                mbArtItalic;
-    bool                mbArtBold;
-    rtl::OUString       maText;
-    int                 mnMinCharPos;
+    bool				mbArtItalic;
+    bool				mbArtBold;
+    rtl::OUString		maText;
+    int					mnMinCharPos;
 };
 
 PspServerFontLayout::PspServerFontLayout( ::psp::PrinterGfx& rGfx, ServerFont& rFont, const ImplLayoutArgs& rArgs )
@@ -611,9 +611,9 @@ PspServerFontLayout::PspServerFontLayout( ::psp::PrinterGfx& rGfx, ServerFont& r
     mnFontHeight = mrPrinterGfx.GetFontHeight();
     mnFontWidth  = mrPrinterGfx.GetFontWidth();
     mbVertical   = mrPrinterGfx.GetFontVertical();
-    mbArtItalic  = mrPrinterGfx.GetArtificialItalic();
-    mbArtBold    = mrPrinterGfx.GetArtificialBold();
-    maText       = OUString( rArgs.mpStr + rArgs.mnMinCharPos, rArgs.mnEndCharPos - rArgs.mnMinCharPos+1 );
+    mbArtItalic	 = mrPrinterGfx.GetArtificialItalic();
+    mbArtBold	 = mrPrinterGfx.GetArtificialBold();
+    maText		 = OUString( rArgs.mpStr + rArgs.mnMinCharPos, rArgs.mnEndCharPos - rArgs.mnMinCharPos+1 );
     mnMinCharPos = rArgs.mnMinCharPos;
 }
 
@@ -632,7 +632,7 @@ static void DrawPrinterLayout( const SalLayout& rLayout, ::psp::PrinterGfx& rGfx
     sal_Int32   aWidthAry[ nMaxGlyphs ];
     sal_Int32   aIdxAry  [ nMaxGlyphs ];
     sal_Ucs     aUnicodes[ nMaxGlyphs ];
-    int         aCharPosAry [ nMaxGlyphs ];
+    int			aCharPosAry	[ nMaxGlyphs ];
 
     Point aPos;
     long nUnitsPerPixel = rLayout.GetUnitsPerPixel();
@@ -804,19 +804,19 @@ void PspGraphics::GetFontMetric( ImplFontMetricData *pMetric )
         pMetric->mbDevice       = aDFA.mbDevice;
         pMetric->mbScalableFont = true;
 
-        pMetric->mnOrientation  = m_pPrinterGfx->GetFontAngle();
-        pMetric->mnSlant        = 0;
+        pMetric->mnOrientation 	= m_pPrinterGfx->GetFontAngle();
+        pMetric->mnSlant		= 0;
 
-        sal_Int32 nTextHeight   = m_pPrinterGfx->GetFontHeight();
-        sal_Int32 nTextWidth    = m_pPrinterGfx->GetFontWidth();
+        sal_Int32 nTextHeight	= m_pPrinterGfx->GetFontHeight();
+        sal_Int32 nTextWidth	= m_pPrinterGfx->GetFontWidth();
         if( ! nTextWidth )
             nTextWidth = nTextHeight;
 
-        pMetric->mnWidth        = nTextWidth;
-        pMetric->mnAscent       = ( aInfo.m_nAscend * nTextHeight + 500 ) / 1000;
-        pMetric->mnDescent      = ( aInfo.m_nDescend * nTextHeight + 500 ) / 1000;
-        pMetric->mnIntLeading   = ( aInfo.m_nLeading * nTextHeight + 500 ) / 1000;
-        pMetric->mnExtLeading   = 0;
+        pMetric->mnWidth		= nTextWidth;
+        pMetric->mnAscent		= ( aInfo.m_nAscend * nTextHeight + 500 ) / 1000;
+        pMetric->mnDescent		= ( aInfo.m_nDescend * nTextHeight + 500 ) / 1000;
+        pMetric->mnIntLeading	= ( aInfo.m_nLeading * nTextHeight + 500 ) / 1000;
+        pMetric->mnExtLeading	= 0;
     }
 }
 
@@ -833,9 +833,9 @@ ULONG PspGraphics::GetKernPairs( ULONG nPairs, ImplKernPairData *pKernPairs )
             nTextScale = m_pPrinterGfx->GetFontHeight();
         for( i = 0, it = rPairs.begin(); i < nPairs && i < nHavePairs; i++, ++it )
         {
-            pKernPairs[i].mnChar1   = it->first;
-            pKernPairs[i].mnChar2   = it->second;
-            pKernPairs[i].mnKern    = it->kern_x * nTextScale / 1000;
+            pKernPairs[i].mnChar1	= it->first;
+            pKernPairs[i].mnChar2	= it->second;
+            pKernPairs[i].mnKern	= it->kern_x * nTextScale / 1000;
         }
 
     }
@@ -986,9 +986,9 @@ const void* PspGraphics::DoGetEmbedFontData( fontID aFont, const sal_Ucs* pUnico
         return NULL;
 
     // fill in font info
-    rInfo.m_nAscent     = aFontInfo.m_nAscend;
-    rInfo.m_nDescent    = aFontInfo.m_nDescend;
-    rInfo.m_aPSName     = rMgr.getPSName( aFont );
+    rInfo.m_nAscent		= aFontInfo.m_nAscend;
+    rInfo.m_nDescent	= aFontInfo.m_nDescend;
+    rInfo.m_aPSName		= rMgr.getPSName( aFont );
 
     int xMin, yMin, xMax, yMax;
     rMgr.getFontBoundingBox( aFont, xMin, yMin, xMax, yMax );
@@ -1018,8 +1018,8 @@ const void* PspGraphics::DoGetEmbedFontData( fontID aFont, const sal_Ucs* pUnico
 
     *pDataLen = aStat.st_size;
 
-    rInfo.m_aFontBBox   = Rectangle( Point( xMin, yMin ), Size( xMax-xMin, yMax-yMin ) );
-    rInfo.m_nCapHeight  = yMax; // Well ...
+    rInfo.m_aFontBBox	= Rectangle( Point( xMin, yMin ), Size( xMax-xMin, yMax-yMin ) );
+    rInfo.m_nCapHeight	= yMax; // Well ...
 
     for( int i = 0; i < 256; i++ )
         pWidths[i] = (aMetrics[i].width > 0 ? aMetrics[i].width : 0);
@@ -1079,13 +1079,13 @@ FontWidth PspGraphics::ToFontWidth (psp::width::type eWidth)
     {
         case psp::width::UltraCondensed: return WIDTH_ULTRA_CONDENSED;
         case psp::width::ExtraCondensed: return WIDTH_EXTRA_CONDENSED;
-        case psp::width::Condensed:      return WIDTH_CONDENSED;
-        case psp::width::SemiCondensed:  return WIDTH_SEMI_CONDENSED;
-        case psp::width::Normal:         return WIDTH_NORMAL;
-        case psp::width::SemiExpanded:   return WIDTH_SEMI_EXPANDED;
-        case psp::width::Expanded:       return WIDTH_EXPANDED;
-        case psp::width::ExtraExpanded:  return WIDTH_EXTRA_EXPANDED;
-        case psp::width::UltraExpanded:  return WIDTH_ULTRA_EXPANDED;
+        case psp::width::Condensed:		 return WIDTH_CONDENSED;
+        case psp::width::SemiCondensed:	 return WIDTH_SEMI_CONDENSED;
+        case psp::width::Normal:		 return WIDTH_NORMAL;
+        case psp::width::SemiExpanded:	 return WIDTH_SEMI_EXPANDED;
+        case psp::width::Expanded:		 return WIDTH_EXPANDED;
+        case psp::width::ExtraExpanded:	 return WIDTH_EXTRA_EXPANDED;
+        case psp::width::UltraExpanded:	 return WIDTH_ULTRA_EXPANDED;
         default: break;
     }
     return WIDTH_DONTKNOW;
@@ -1095,16 +1095,16 @@ FontWeight PspGraphics::ToFontWeight (psp::weight::type eWeight)
 {
     switch (eWeight)
     {
-        case psp::weight::Thin:       return WEIGHT_THIN;
+        case psp::weight::Thin:		  return WEIGHT_THIN;
         case psp::weight::UltraLight: return WEIGHT_ULTRALIGHT;
-        case psp::weight::Light:      return WEIGHT_LIGHT;
+        case psp::weight::Light:	  return WEIGHT_LIGHT;
         case psp::weight::SemiLight:  return WEIGHT_SEMILIGHT;
-        case psp::weight::Normal:     return WEIGHT_NORMAL;
-        case psp::weight::Medium:     return WEIGHT_MEDIUM;
-        case psp::weight::SemiBold:   return WEIGHT_SEMIBOLD;
-        case psp::weight::Bold:       return WEIGHT_BOLD;
+        case psp::weight::Normal:	  return WEIGHT_NORMAL;
+        case psp::weight::Medium:	  return WEIGHT_MEDIUM;
+        case psp::weight::SemiBold:	  return WEIGHT_SEMIBOLD;
+        case psp::weight::Bold:		  return WEIGHT_BOLD;
         case psp::weight::UltraBold:  return WEIGHT_ULTRABOLD;
-        case psp::weight::Black:      return WEIGHT_BLACK;
+        case psp::weight::Black:	  return WEIGHT_BLACK;
         default: break;
     }
     return WEIGHT_DONTKNOW;
@@ -1114,8 +1114,8 @@ FontPitch PspGraphics::ToFontPitch (psp::pitch::type ePitch)
 {
     switch (ePitch)
     {
-        case psp::pitch::Fixed:     return PITCH_FIXED;
-        case psp::pitch::Variable:  return PITCH_VARIABLE;
+        case psp::pitch::Fixed:		return PITCH_FIXED;
+        case psp::pitch::Variable:	return PITCH_VARIABLE;
         default: break;
     }
     return PITCH_DONTKNOW;
@@ -1125,9 +1125,9 @@ FontItalic PspGraphics::ToFontItalic (psp::italic::type eItalic)
 {
     switch (eItalic)
     {
-        case psp::italic::Upright:  return ITALIC_NONE;
-        case psp::italic::Oblique:  return ITALIC_OBLIQUE;
-        case psp::italic::Italic:   return ITALIC_NORMAL;
+        case psp::italic::Upright:	return ITALIC_NONE;
+        case psp::italic::Oblique:	return ITALIC_OBLIQUE;
+        case psp::italic::Italic:	return ITALIC_NORMAL;
         default: break;
     }
     return ITALIC_DONTKNOW;
@@ -1138,11 +1138,11 @@ FontFamily PspGraphics::ToFontFamily (psp::family::type eFamily)
     switch (eFamily)
     {
         case psp::family::Decorative: return FAMILY_DECORATIVE;
-        case psp::family::Modern:     return FAMILY_MODERN;
-        case psp::family::Roman:      return FAMILY_ROMAN;
-        case psp::family::Script:     return FAMILY_SCRIPT;
-        case psp::family::Swiss:      return FAMILY_SWISS;
-        case psp::family::System:     return FAMILY_SYSTEM;
+        case psp::family::Modern:	  return FAMILY_MODERN;
+        case psp::family::Roman:	  return FAMILY_ROMAN;
+        case psp::family::Script:	  return FAMILY_SCRIPT;
+        case psp::family::Swiss:	  return FAMILY_SWISS;
+        case psp::family::System:	  return FAMILY_SYSTEM;
         default: break;
     }
     return FAMILY_DONTKNOW;
diff --git a/vcl/unx/headless/svppspgraphics.hxx b/vcl/unx/headless/svppspgraphics.hxx
index 063dff34c3c2..87cbb4948137 100644
--- a/vcl/unx/headless/svppspgraphics.hxx
+++ b/vcl/unx/headless/svppspgraphics.hxx
@@ -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
@@ -41,15 +41,15 @@ class SalInfoPrinter;
 
 class PspGraphics : public SalGraphics
 {
-    psp::JobData*               m_pJobData;
-    psp::PrinterGfx*            m_pPrinterGfx;
-    String*                     m_pPhoneNr;
-    bool                        m_bSwallowFaxNo;
-    String                      m_aPhoneCollection;
-    bool                        m_bPhoneCollectionActive;
-
-    ServerFont*                 m_pServerFont[ MAX_FALLBACK ];
-    bool                        m_bFontVertical;
+    psp::JobData*				m_pJobData;
+    psp::PrinterGfx*			m_pPrinterGfx;
+    String*						m_pPhoneNr;
+    bool						m_bSwallowFaxNo;
+    String						m_aPhoneCollection;
+    bool						m_bPhoneCollectionActive;
+
+    ServerFont*					m_pServerFont[ MAX_FALLBACK ];
+    bool						m_bFontVertical;
     SalInfoPrinter*             m_pInfoPrinter;
 
 protected:
@@ -78,40 +78,40 @@ public:
                                   Ucs2UIntMap& rUnicodeEnc );
     static ImplDevFontAttributes Info2DevFontAttributes( const psp::FastPrintFontInfo& );
     static void AnnounceFonts( ImplDevFontList*, const psp::FastPrintFontInfo& );
-    static FontWidth    ToFontWidth (psp::width::type eWidth);
-    static FontWeight   ToFontWeight (psp::weight::type eWeight);
-    static FontPitch    ToFontPitch (psp::pitch::type ePitch);
-    static FontItalic   ToFontItalic (psp::italic::type eItalic);
-    static FontFamily   ToFontFamily (psp::family::type eFamily);
+    static FontWidth	ToFontWidth (psp::width::type eWidth);
+    static FontWeight	ToFontWeight (psp::weight::type eWeight);
+    static FontPitch	ToFontPitch (psp::pitch::type ePitch);
+    static FontItalic	ToFontItalic (psp::italic::type eItalic);
+    static FontFamily	ToFontFamily (psp::family::type eFamily);
 
     // overload all pure virtual methods
-    virtual void            GetResolution( sal_Int32& rDPIX, sal_Int32& rDPIY );
-    virtual USHORT          GetBitCount();
-    virtual long            GetGraphicsWidth() const;
+    virtual void			GetResolution( sal_Int32& rDPIX, sal_Int32& rDPIY );
+    virtual USHORT			GetBitCount();
+    virtual long			GetGraphicsWidth() const;
 
-    virtual void            ResetClipRegion();
-    virtual void            BeginSetClipRegion( ULONG nCount );
-    virtual BOOL            unionClipRegion( long nX, long nY, long nWidth, long nHeight );
+    virtual void			ResetClipRegion();
+    virtual void			BeginSetClipRegion( ULONG nCount );
+    virtual BOOL			unionClipRegion( long nX, long nY, long nWidth, long nHeight );
     virtual bool                        unionClipRegion(  const ::basegfx::B2DPolyPolygon& );
-    virtual void            EndSetClipRegion();
+    virtual void			EndSetClipRegion();
 
-    virtual void            SetLineColor();
-    virtual void            SetLineColor( SalColor nSalColor );
-    virtual void            SetFillColor();
-    virtual void            SetFillColor( SalColor nSalColor );
-    virtual void            SetXORMode( bool bSet, bool );
-    virtual void            SetROPLineColor( SalROPColor nROPColor );
-    virtual void            SetROPFillColor( SalROPColor nROPColor );
+    virtual void			SetLineColor();
+    virtual void			SetLineColor( SalColor nSalColor );
+    virtual void			SetFillColor();
+    virtual void          	SetFillColor( SalColor nSalColor );
+    virtual void			SetXORMode( bool bSet, bool );
+    virtual void			SetROPLineColor( SalROPColor nROPColor );
+    virtual void			SetROPFillColor( SalROPColor nROPColor );
 
-    virtual void            SetTextColor( SalColor nSalColor );
+    virtual void			SetTextColor( SalColor nSalColor );
     virtual USHORT          SetFont( ImplFontSelectData*, int nFallbackLevel );
-    virtual void            GetFontMetric( ImplFontMetricData* );
-    virtual ULONG           GetKernPairs( ULONG nPairs, ImplKernPairData* pKernPairs );
+    virtual void			GetFontMetric( ImplFontMetricData* );
+    virtual ULONG			GetKernPairs( ULONG nPairs, ImplKernPairData* pKernPairs );
     virtual ImplFontCharMap* GetImplFontCharMap() const;
-    virtual void            GetDevFontList( ImplDevFontList* );
-    virtual void            GetDevFontSubstList( OutputDevice* );
-    virtual bool            AddTempDevFont( ImplDevFontList*, const String& rFileURL, const String& rFontName );
-    virtual BOOL            CreateFontSubset( const rtl::OUString& rToFile,
+    virtual void			GetDevFontList( ImplDevFontList* );
+    virtual void			GetDevFontSubstList( OutputDevice* );
+    virtual bool			AddTempDevFont( ImplDevFontList*, const String& rFileURL, const String& rFontName );
+    virtual BOOL			CreateFontSubset( const rtl::OUString& rToFile,
                                               const ImplFontData*,
                                               sal_Int32* pGlyphIDs,
                                               sal_uInt8* pEncoding,
@@ -120,72 +120,72 @@ public:
                                               FontSubsetInfo& rInfo
                                               );
     virtual const Ucs2SIntMap* GetFontEncodingVector( const ImplFontData*, const Ucs2OStrMap** ppNonEncoded );
-    virtual const void* GetEmbedFontData( const ImplFontData*,
+    virtual const void*	GetEmbedFontData( const ImplFontData*,
                                           const sal_Ucs* pUnicodes,
                                           sal_Int32* pWidths,
                                           FontSubsetInfo& rInfo,
                                           long* pDataLen );
-    virtual void            FreeEmbedFontData( const void* pData, long nDataLen );
+    virtual void			FreeEmbedFontData( const void* pData, long nDataLen );
     virtual void            GetGlyphWidths( const ImplFontData*,
                                             bool bVertical,
                                             Int32Vector& rWidths,
                                             Ucs2UIntMap& rUnicodeEnc );
-    virtual BOOL            GetGlyphBoundRect( long nIndex, Rectangle& );
-    virtual BOOL            GetGlyphOutline( long nIndex, ::basegfx::B2DPolyPolygon& );
-    virtual SalLayout*      GetTextLayout( ImplLayoutArgs&, int nFallbackLevel );
-    virtual void            DrawServerFontLayout( const ServerFontLayout& );
+    virtual BOOL			GetGlyphBoundRect( long nIndex, Rectangle& );
+    virtual BOOL			GetGlyphOutline( long nIndex, ::basegfx::B2DPolyPolygon& );
+    virtual SalLayout*		GetTextLayout( ImplLayoutArgs&, int nFallbackLevel );
+    virtual void			DrawServerFontLayout( const ServerFontLayout& );
     virtual bool            supportsOperation( OutDevSupportType ) const;
-    virtual void            drawPixel( long nX, long nY );
-    virtual void            drawPixel( long nX, long nY, SalColor nSalColor );
-    virtual void            drawLine( long nX1, long nY1, long nX2, long nY2 );
-    virtual void            drawRect( long nX, long nY, long nWidth, long nHeight );
-    virtual void            drawPolyLine( ULONG nPoints, const SalPoint* pPtAry );
-    virtual void            drawPolygon( ULONG nPoints, const SalPoint* pPtAry );
+    virtual void			drawPixel( long nX, long nY );
+    virtual void			drawPixel( long nX, long nY, SalColor nSalColor );
+    virtual void			drawLine( long nX1, long nY1, long nX2, long nY2 );
+    virtual void			drawRect( long nX, long nY, long nWidth, long nHeight );
+    virtual void			drawPolyLine( ULONG nPoints, const SalPoint* pPtAry );
+    virtual void			drawPolygon( ULONG nPoints, const SalPoint* pPtAry );
     virtual bool            drawPolyPolygon( const ::basegfx::B2DPolyPolygon&, double fTransparency );
     virtual bool            drawPolyLine( const ::basegfx::B2DPolygon&, double fTransparency, const ::basegfx::B2DVector& rLineWidths, basegfx::B2DLineJoin );
-    virtual void            drawPolyPolygon( sal_uInt32 nPoly,
+    virtual void			drawPolyPolygon( sal_uInt32 nPoly,
                                              const sal_uInt32* pPoints,
                                              PCONSTSALPOINT* pPtAry );
-    virtual sal_Bool        drawPolyLineBezier( ULONG nPoints,
+    virtual sal_Bool		drawPolyLineBezier( ULONG nPoints,
                                                 const SalPoint* pPtAry,
                                                 const BYTE* pFlgAry );
-    virtual sal_Bool        drawPolygonBezier( ULONG nPoints,
+    virtual sal_Bool		drawPolygonBezier( ULONG nPoints,
                                                const SalPoint* pPtAry,
                                                const BYTE* pFlgAry );
-    virtual sal_Bool        drawPolyPolygonBezier( sal_uInt32 nPoly,
+    virtual sal_Bool		drawPolyPolygonBezier( sal_uInt32 nPoly,
                                                    const sal_uInt32* pPoints,
                                                    const SalPoint* const* pPtAry,
                                                    const BYTE* const* pFlgAry );
 
-    virtual void            copyArea( long nDestX,
+    virtual void			copyArea( long nDestX,
                                       long nDestY,
                                       long nSrcX,
                                       long nSrcY,
                                       long nSrcWidth,
                                       long nSrcHeight,
                                       USHORT nFlags );
-    virtual void            copyBits( const SalTwoRect* pPosAry,
+    virtual void			copyBits( const SalTwoRect* pPosAry,
                                       SalGraphics* pSrcGraphics );
-    virtual void            drawBitmap( const SalTwoRect* pPosAry,
+    virtual void			drawBitmap( const SalTwoRect* pPosAry,
                                         const SalBitmap& rSalBitmap );
-    virtual void            drawBitmap( const SalTwoRect* pPosAry,
+    virtual void			drawBitmap( const SalTwoRect* pPosAry,
                                         const SalBitmap& rSalBitmap,
                                         SalColor nTransparentColor );
-    virtual void            drawBitmap( const SalTwoRect* pPosAry,
+    virtual void			drawBitmap( const SalTwoRect* pPosAry,
                                         const SalBitmap& rSalBitmap,
                                         const SalBitmap& rTransparentBitmap );
-    virtual void            drawMask( const SalTwoRect* pPosAry,
+    virtual void			drawMask( const SalTwoRect* pPosAry,
                                       const SalBitmap& rSalBitmap,
                                       SalColor nMaskColor );
-    virtual SalBitmap*      getBitmap( long nX, long nY, long nWidth, long nHeight );
-    virtual SalColor        getPixel( long nX, long nY );
-    virtual void            invert( long nX, long nY, long nWidth, long nHeight, SalInvert nFlags );
-    virtual void            invert( ULONG nPoints, const SalPoint* pPtAry, SalInvert nFlags );
+    virtual SalBitmap*		getBitmap( long nX, long nY, long nWidth, long nHeight );
+    virtual SalColor		getPixel( long nX, long nY );
+    virtual void			invert( long nX, long nY, long nWidth, long nHeight, SalInvert nFlags );
+    virtual void			invert( ULONG nPoints, const SalPoint* pPtAry, SalInvert nFlags );
 
-    virtual BOOL            drawEPS( long nX, long nY, long nWidth, long nHeight, void* pPtr, ULONG nSize );
+    virtual BOOL			drawEPS( long nX, long nY, long nWidth, long nHeight, void* pPtr, ULONG nSize );
     virtual bool            filterText( const String& rOrigText, String& rNewText, xub_StrLen nIndex, xub_StrLen& rLen, xub_StrLen& rCutStart, xub_StrLen& rCutStop );
-
-    virtual SystemGraphicsData      GetGraphicsData() const;
+    
+    virtual SystemGraphicsData 		GetGraphicsData() const;
     virtual SystemFontData          GetSysFontData( int nFallbacklevel ) const;
 };
 
diff --git a/vcl/unx/headless/svptext.cxx b/vcl/unx/headless/svptext.cxx
index ecb8b11b7e04..5d2f48b88664 100644
--- a/vcl/unx/headless/svptext.cxx
+++ b/vcl/unx/headless/svptext.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
@@ -88,7 +88,7 @@ SvpGlyphCache& SvpGlyphCache::GetInstance()
 {
     static SvpGlyphPeer aSvpGlyphPeer;
     static SvpGlyphCache aGC( aSvpGlyphPeer );
-    return aGC;
+    return aGC; 
 }
 
 // ===========================================================================
@@ -161,7 +161,7 @@ void SvpGlyphPeer::RemovingGlyph( ServerFont&, GlyphData& rGlyphData, int /*nGly
     if( rGlyphData.ExtDataRef().mpData != Format::NONE )
     {
         // release the glyph related resources
-        DBG_ASSERT( (rGlyphData.ExtDataRef().meInfo <= Format::MAX), "SVP::RG() invalid alpha format" );
+        DBG_ASSERT( (rGlyphData.ExtDataRef().meInfo <= Format::MAX), "SVP::RG() invalid alpha format" ); 
         SvpGcpHelper* pGcpHelper = (SvpGcpHelper*)rGlyphData.ExtDataRef().mpData;
         delete[] pGcpHelper->maRawBitmap.mpBits;
         delete pGcpHelper;
diff --git a/vcl/unx/headless/svpvd.cxx b/vcl/unx/headless/svpvd.cxx
index 1c2ab01ccca2..44d192b14b3e 100644
--- a/vcl/unx/headless/svpvd.cxx
+++ b/vcl/unx/headless/svpvd.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
@@ -86,12 +86,12 @@ BOOL SvpSalVirtualDevice::SetSize( long nNewDX, long nNewDY )
         m_aDevice = aDevPal.empty()
                     ? createBitmapDevice( aDevSize, false, nFormat )
                     : createBitmapDevice( aDevSize, false, nFormat, PaletteMemorySharedVector( new std::vector< basebmp::Color >(aDevPal) ) );
-
+        
         // update device in existing graphics
         for( std::list< SvpSalGraphics* >::iterator it = m_aGraphics.begin();
              it != m_aGraphics.end(); ++it )
              (*it)->setDevice( m_aDevice );
-
+             
     }
     return true;
 }
diff --git a/vcl/unx/headless/svpvd.hxx b/vcl/unx/headless/svpvd.hxx
index 083547cf19a9..072982b253a6 100644
--- a/vcl/unx/headless/svpvd.hxx
+++ b/vcl/unx/headless/svpvd.hxx
@@ -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
@@ -44,16 +44,16 @@ class SvpSalVirtualDevice : public SalVirtualDevice, public SvpElement
 public:
     SvpSalVirtualDevice( USHORT nBitCount ) : SvpElement(), m_nBitCount(nBitCount) {}
     virtual ~SvpSalVirtualDevice();
-
+    
     // SvpElement
     virtual const basebmp::BitmapDeviceSharedPtr& getDevice() const { return m_aDevice; }
 
     // SalVirtualDevice
-    virtual SalGraphics*    GetGraphics();
-    virtual void            ReleaseGraphics( SalGraphics* pGraphics );
+    virtual SalGraphics*	GetGraphics();
+    virtual void			ReleaseGraphics( SalGraphics* pGraphics );
 
-    virtual BOOL            SetSize( long nNewDX, long nNewDY );
-    virtual void            GetSize( long& rWidth, long& rHeight );
+    virtual BOOL			SetSize( long nNewDX, long nNewDY );
+    virtual void			GetSize( long& rWidth, long& rHeight );
 };
 
 #endif // _SVP_SVPVD_HXX
diff --git a/vcl/unx/inc/XIM.h b/vcl/unx/inc/XIM.h
index b00634090b5d..79260cb22a9e 100644
--- a/vcl/unx/inc/XIM.h
+++ b/vcl/unx/inc/XIM.h
@@ -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
@@ -62,9 +62,9 @@ typedef struct _XIMUnicodeText {
     char *multi_byte;
     wchar_t *wide_char;
     unsigned short *utf16_char;
-  } string;
+  } string; 
   unsigned int   count_annotations;
-  XIMAnnotation  *annotations;
+  XIMAnnotation	 *annotations;
 } XIMUnicodeText;
 
 /* lookup choice */
@@ -74,11 +74,11 @@ typedef enum {
 } XIMDrawUpDirection ;
 
 typedef struct _XIMLookupStartCallbackStruct {
-  int       choice_per_window;  /* Number of choices can be display
+  int		choice_per_window;  /* Number of choices can be display
                      * in the region
                      */
-  int       nrows;
-  int       ncolumns;
+  int		nrows;
+  int		ncolumns;
   XIMDrawUpDirection draw_up_direction;
 } XIMLookupStartCallbackStruct;
 
@@ -101,19 +101,19 @@ typedef enum {
   XIMKatakana, XIMHanzi
 } XIMUnicodeCharacterSubsetID;
 
-typedef struct  _XIMUncodeSubset {
-  XIMUnicodeCharacterSubsetID   index;
-  XIMUnicodeCharacterSubsetID   subset_id;
-  char          *name;
-  Bool          is_active;
+typedef	struct	_XIMUncodeSubset {
+  XIMUnicodeCharacterSubsetID	index;
+  XIMUnicodeCharacterSubsetID	subset_id;
+  char			*name;
+  Bool			is_active;
 } XIMUnicodeCharacterSubset;
 
-typedef struct  _XIMUncodeSubsets {
+typedef	struct	_XIMUncodeSubsets {
   unsigned short count_subsets;
   XIMUnicodeCharacterSubset *supported_subsets;
 } XIMUnicodeCharacterSubsets;
 
-typedef struct  _XIMSwitchIMNotifyCallbackStruct {
+typedef	struct	_XIMSwitchIMNotifyCallbackStruct {
   XIMUnicodeCharacterSubset *from;
   XIMUnicodeCharacterSubset *to;
 } XIMSwitchIMNotifyCallbackStruct;
diff --git a/vcl/unx/inc/Xproto.h b/vcl/unx/inc/Xproto.h
index 804b3ffa98cc..3702bdbce1c4 100644
--- a/vcl/unx/inc/Xproto.h
+++ b/vcl/unx/inc/Xproto.h
@@ -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
diff --git a/vcl/unx/inc/cdeint.hxx b/vcl/unx/inc/cdeint.hxx
index 91cbf33caf47..f6c0f3822aa1 100644
--- a/vcl/unx/inc/cdeint.hxx
+++ b/vcl/unx/inc/cdeint.hxx
@@ -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
diff --git a/vcl/unx/inc/dtint.hxx b/vcl/unx/inc/dtint.hxx
index 75f197c81e13..5a39b60e076b 100644
--- a/vcl/unx/inc/dtint.hxx
+++ b/vcl/unx/inc/dtint.hxx
@@ -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
@@ -52,27 +52,27 @@ enum DtType {
 class DtIntegrator
 {
 protected:
-    DtType              meType;
-    Display*            mpDisplay;
-    SalDisplay*         mpSalDisplay;
-    int                 mnSystemLookCommandProcess;
+    DtType				meType;
+    Display*			mpDisplay;
+    SalDisplay*			mpSalDisplay;
+    int					mnSystemLookCommandProcess;
 
 
     DtIntegrator();
 
-    static String           aHomeDir;
+    static String			aHomeDir;
 
 public:
     static DtIntegrator* CreateDtIntegrator();
-
+    
     virtual ~DtIntegrator();
 
     // SystemLook
     virtual void GetSystemLook( AllSettings& rSettings );
-
-    DtType          GetDtType() { return meType; }
-    SalDisplay*     GetSalDisplay() { return mpSalDisplay; }
-    Display*        GetDisplay() { return mpDisplay; }
+    
+    DtType			GetDtType() { return meType; }
+    SalDisplay*		GetSalDisplay() { return mpSalDisplay; }
+    Display*		GetDisplay() { return mpDisplay; }
 };
 
 #endif
diff --git a/vcl/unx/inc/i18n_cb.hxx b/vcl/unx/inc/i18n_cb.hxx
index d2301c26a3b0..943e0ef3d9c9 100644
--- a/vcl/unx/inc/i18n_cb.hxx
+++ b/vcl/unx/inc/i18n_cb.hxx
@@ -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
@@ -41,18 +41,18 @@ int  CommitStringCallback( XIC ic, XPointer client_data, XPointer call_data);
 void PreeditDoneCallback ( XIC ic, XPointer client_data, XPointer call_data);
 int  PreeditStartCallback( XIC ic, XPointer client_data, XPointer call_data);
 void PreeditDoneCallback ( XIC ic, XPointer client_data, XPointer call_data);
-void PreeditDrawCallback ( XIC ic, XPointer client_data,
+void PreeditDrawCallback ( XIC ic, XPointer client_data, 
                            XIMPreeditDrawCallbackStruct *call_data );
-void PreeditCaretCallback( XIC ic, XPointer client_data,
+void PreeditCaretCallback( XIC ic, XPointer client_data, 
                            XIMPreeditCaretCallbackStruct *call_data );
 void GetPreeditSpotLocation(XIC ic, XPointer client_data);
 
-// private hook to prevent from sending further edit events
+// private hook to prevent from sending further edit events 
 void PreeditCancelCallback( XPointer client_data );
 
 void StatusStartCallback (XIC ic, XPointer client_data, XPointer call_data);
 void StatusDoneCallback  (XIC ic, XPointer client_data, XPointer call_data);
-void StatusDrawCallback  (XIC ic, XPointer client_data,
+void StatusDrawCallback  (XIC ic, XPointer client_data, 
             XIMStatusDrawCallbackStruct *call_data);
 void SwitchIMCallback (XIC ix, XPointer client_data, XPointer call_data );
 
@@ -84,10 +84,10 @@ typedef enum {
 } preedit_status_t;
 
 typedef struct {
-    SalFrame*               pFrame;
-    Bool                    bIsMultilingual;
-    preedit_status_t        eState;
-    preedit_text_t          aText;
+    SalFrame*			    pFrame;
+    Bool		   	    	bIsMultilingual;
+    preedit_status_t 	    eState;
+    preedit_text_t 		    aText;
     SalExtTextInputEvent    aInputEv;
     std::vector< USHORT >   aInputFlags;
 } preedit_data_t;
diff --git a/vcl/unx/inc/i18n_ic.hxx b/vcl/unx/inc/i18n_ic.hxx
index 2fb97a00b6f2..eabdac94d194 100644
--- a/vcl/unx/inc/i18n_ic.hxx
+++ b/vcl/unx/inc/i18n_ic.hxx
@@ -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
@@ -36,9 +36,9 @@ class SalI18N_InputContext
 
 private:
 
-    Bool    mbUseable; // system supports current locale ?
-    Bool    mbMultiLingual; // system supports iiimp ?
-    XIC     maContext;
+    Bool    mbUseable; // system supports current locale ?  
+    Bool    mbMultiLingual; // system supports iiimp ?  
+    XIC		maContext;
 
     XIMStyle mnSupportedStatusStyle;
     XIMStyle mnSupportedPreeditStyle;
@@ -57,17 +57,17 @@ private:
     XVaNestedList mpAttributes;
     XVaNestedList mpStatusAttributes;
     XVaNestedList mpPreeditAttributes;
-
-    Bool         SupportInputMethodStyle( XIMStyles *pIMStyles );
+        
+    Bool 		 SupportInputMethodStyle( XIMStyles *pIMStyles );
     unsigned int GetWeightingOfIMStyle(   XIMStyle n_style ) const ;
-    Bool         IsSupportedIMStyle(      XIMStyle n_style ) const ;
+    Bool 		 IsSupportedIMStyle(      XIMStyle n_style ) const ;
 
 public:
 
-    Bool UseContext()       { return mbUseable; }
-    Bool IsMultiLingual()   { return mbMultiLingual; }
-    Bool IsPreeditMode()    { return maClientData.eState == ePreeditStatusActive; }
-    XIC  GetContext()       { return maContext; }
+    Bool UseContext() 		{ return mbUseable; }
+    Bool IsMultiLingual() 	{ return mbMultiLingual; }
+    Bool IsPreeditMode()	{ return maClientData.eState == ePreeditStatusActive; }
+    XIC  GetContext() 		{ return maContext; }
 
     void ExtendEventMask(  XLIB_Window aFocusWindow );
     void SetICFocus( SalFrame* pFocusFrame );
@@ -75,7 +75,7 @@ public:
     void HandleDestroyIM();
 
     int  HandleKeyEvent( XKeyEvent *pEvent, SalFrame *pFrame ); // unused
-    void EndExtTextInput( USHORT nFlags );                      // unused
+    void EndExtTextInput( USHORT nFlags );						// unused
     int  CommitStringCallback( sal_Unicode* pText, sal_Size nLength );
     int  CommitKeyEvent( sal_Unicode* pText, sal_Size nLength );
     int  UpdateSpotLocation();
diff --git a/vcl/unx/inc/i18n_im.hxx b/vcl/unx/inc/i18n_im.hxx
index 297bc8edec17..212b734e8ae6 100644
--- a/vcl/unx/inc/i18n_im.hxx
+++ b/vcl/unx/inc/i18n_im.hxx
@@ -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
@@ -36,26 +36,26 @@ extern "C" char* GetMethodName( XIMStyle nStyle, char *pBuf, int nBufSize);
 
 class VCL_DLLPUBLIC SalI18N_InputMethod
 {
-    Bool        mbUseable;  // system supports locale as well as status
-                            // and preedit style ?
-    Bool        mbMultiLingual; // system supports iiimp
-    XIM         maMethod;
+    Bool    	mbUseable; 	// system supports locale as well as status 
+                            // and preedit style ?  
+    Bool    	mbMultiLingual;	// system supports iiimp
+    XIM			maMethod;
     XIMCallback maDestroyCallback;
     XIMStyles  *mpStyles;
 
 public:
 
-    Bool        IsMultiLingual()        { return mbMultiLingual;    }
+    Bool		IsMultiLingual()		{ return mbMultiLingual;	}
     Bool        PosixLocale();
-    Bool        UseMethod()             { return mbUseable; }
-    XIM         GetMethod()             { return maMethod;  }
+    Bool		UseMethod()				{ return mbUseable;	}
+    XIM 		GetMethod() 			{ return maMethod;	}
     void        HandleDestroyIM();
-    Bool        CreateMethod( Display *pDisplay );
-    XIMStyles  *GetSupportedStyles()    { return mpStyles;  }
-    Bool        SetLocale( const char* pLocale = "" );
-    Bool        FilterEvent( XEvent *pEvent, XLIB_Window window );
-    Bool        AddConnectionWatch (Display *pDisplay, void *pConnectionHandler);
-
+    Bool 		CreateMethod( Display *pDisplay );
+    XIMStyles  *GetSupportedStyles() 	{ return mpStyles; 	}
+    Bool		SetLocale( const char* pLocale = "" );
+    Bool		FilterEvent( XEvent *pEvent, XLIB_Window window );
+    Bool		AddConnectionWatch (Display *pDisplay, void *pConnectionHandler);  
+ 
     #ifdef _USE_PRINT_EXTENSION_
     void            Invalidate()                    { mbUseable = False; }
     #endif
diff --git a/vcl/unx/inc/i18n_keysym.hxx b/vcl/unx/inc/i18n_keysym.hxx
index 641d00dc02c0..16b0b4861dba 100644
--- a/vcl/unx/inc/i18n_keysym.hxx
+++ b/vcl/unx/inc/i18n_keysym.hxx
@@ -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
@@ -30,36 +30,36 @@
 
 /*
  convert a keysym as defined in /usr/{X11R6|openwin}/include/X11/keysymdef.h
- to unicode
+ to unicode 
 
  supported charsets: (byte1 and byte2 are always 0x0)
-
-     Latin-1    Byte 3 = 0x00
-     Latin-2        Byte 3 = 0x01
-     Latin-3        Byte 3 = 0x02
-     Latin-4        Byte 3 = 0x03
-     Kana       Byte 3 = 0x04
-     Arabic     Byte 3 = 0x05
-    Cyrillic    Byte 3 = 0x06
-     Greek      Byte 3 = 0x07
-     Technical  Byte 3 = 0x08
-     Special        Byte 3 = 0x09
-     Publishing Byte 3 = 0x0a = 10
-     APL            Byte 3 = 0x0b = 11
-     Hebrew     Byte 3 = 0x0c = 12
-     Thai       Byte 3 = 0x0d = 13
-     Korean     Byte 3 = 0x0e = 14
-     Latin-9    Byte 3 = 0x13 = 19
-     Currency   Byte 3 = 0x20 = 32
-     Keyboard   Byte 3 = 0xff = 255
+ 
+     Latin-1 	Byte 3 = 0x00
+     Latin-2		Byte 3 = 0x01
+     Latin-3		Byte 3 = 0x02
+     Latin-4		Byte 3 = 0x03
+     Kana		Byte 3 = 0x04
+     Arabic		Byte 3 = 0x05
+    Cyrillic	Byte 3 = 0x06
+     Greek		Byte 3 = 0x07
+     Technical	Byte 3 = 0x08
+     Special		Byte 3 = 0x09
+     Publishing	Byte 3 = 0x0a = 10
+     APL			Byte 3 = 0x0b = 11
+     Hebrew		Byte 3 = 0x0c = 12
+     Thai		Byte 3 = 0x0d = 13
+     Korean		Byte 3 = 0x0e = 14
+     Latin-9 	Byte 3 = 0x13 = 19
+     Currency	Byte 3 = 0x20 = 32
+     Keyboard 	Byte 3 = 0xff = 255
 
  missing charsets:
 
-     Latin-8    Byte 3 = 0x12 = 18
-     Armenian   Byte 3 = 0x14 = 20
-     Georgian   Byte 3 = 0x15 = 21
-     Azeri      Byte 3 = 0x16 = 22
-     Vietnamese     Byte 3 = 0x1e = 30
+     Latin-8  	Byte 3 = 0x12 = 18
+     Armenian 	Byte 3 = 0x14 = 20
+     Georgian 	Byte 3 = 0x15 = 21
+     Azeri 		Byte 3 = 0x16 = 22
+     Vietnamese 	Byte 3 = 0x1e = 30
 
  of course not all keysyms can be mapped to a unicode code point
 */
diff --git a/vcl/unx/inc/i18n_status.hxx b/vcl/unx/inc/i18n_status.hxx
index 7202cf6e0eef..40f08acf747a 100644
--- a/vcl/unx/inc/i18n_status.hxx
+++ b/vcl/unx/inc/i18n_status.hxx
@@ -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,7 +56,7 @@ class X11ImeStatus : public SalI18NImeStatus
 public:
     X11ImeStatus() {}
     virtual ~X11ImeStatus();
-
+    
     virtual bool canToggle();
     virtual void toggle();
 };
@@ -66,13 +66,13 @@ class I18NStatus
 public:
     struct ChoiceData
     {
-        String  aString;
-        void*   pData;
+        String	aString;
+        void*	pData;
     };
 private:
-    SalFrame*                       m_pParent;
-    StatusWindow*                   m_pStatusWindow;
-    String                          m_aCurrentIM;
+    SalFrame*				        m_pParent;
+    StatusWindow*			        m_pStatusWindow;
+    String					        m_aCurrentIM;
     ::std::vector< ChoiceData >     m_aChoices;
 
     I18NStatus();
diff --git a/vcl/unx/inc/i18n_xkb.hxx b/vcl/unx/inc/i18n_xkb.hxx
index db6517cbea0b..748e99cd28b7 100644
--- a/vcl/unx/inc/i18n_xkb.hxx
+++ b/vcl/unx/inc/i18n_xkb.hxx
@@ -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
@@ -26,83 +26,83 @@
  ************************************************************************/
 
 #ifndef _SAL_I18N_XKBDEXTENSION_HXX
-#define _SAL_I18N_XKBDEXTENSION_HXX
+#define _SAL_I18N_XKBDEXTENSION_HXX 
 
 #include <sal/types.h>
 #include <vcl/dllapi.h>
 
-class VCL_DLLPUBLIC SalI18N_KeyboardExtension
+class VCL_DLLPUBLIC SalI18N_KeyboardExtension 
 {
 private:
 
-    sal_Bool            mbUseExtension;
-    sal_uInt32          mnDefaultGroup;
-    sal_uInt32          mnGroup;
-    int                 mnEventBase;
+    sal_Bool 			mbUseExtension;
+    sal_uInt32			mnDefaultGroup;
+    sal_uInt32			mnGroup;
+    int  		        mnEventBase;
     int                 mnErrorBase;
-    Display*            mpDisplay;
+    Display*   			mpDisplay;
 
 public:
 
                         SalI18N_KeyboardExtension( Display *pDisplay );
-    inline              ~SalI18N_KeyboardExtension();
+    inline 				~SalI18N_KeyboardExtension();
 
-    inline sal_Bool     UseExtension() const ;      // server and client support the
-                                                    // extension
-    inline void         UseExtension( sal_Bool bState );// used to disable the Extension
+    inline sal_Bool		UseExtension() const ;		// server and client support the
+                                                    // extension 
+    inline void			UseExtension( sal_Bool bState );// used to disable the Extension
 
-    void                Dispatch( XEvent *pEvent ); // keep track of group changes
+    void				Dispatch( XEvent *pEvent ); // keep track of group changes 
 
-    sal_uInt32          LookupKeysymInGroup(    sal_uInt32 nKeyCode,
-                                                  sal_uInt32 nShiftState,
+    sal_uInt32			LookupKeysymInGroup( 	sal_uInt32 nKeyCode, 
+                                                  sal_uInt32 nShiftState, 
                                                   sal_uInt32 nGroup ) const ;
 
-    inline sal_uInt32   LookupKeysymInDefaultGroup(
-                                                sal_uInt32 nKeyCode,
+    inline sal_uInt32 	LookupKeysymInDefaultGroup( 
+                                                sal_uInt32 nKeyCode, 
                                                 sal_uInt32 nShiftState ) const ;
-    inline sal_uInt32   GetGroup() const ;          // the current keyboard group
-    inline sal_uInt32   GetDefaultGroup() const ;   // base group, usually group 1
-    inline int          GetEventBase() const ;
+    inline sal_uInt32 	GetGroup() const ;			// the current keyboard group
+    inline sal_uInt32 	GetDefaultGroup() const ;	// base group, usually group 1
+    inline int       	GetEventBase() const ;
 
 protected:
-
-                        SalI18N_KeyboardExtension(); // disabled
+                        
+                        SalI18N_KeyboardExtension(); // disabled 
 };
 
-inline
+inline 
 SalI18N_KeyboardExtension::~SalI18N_KeyboardExtension()
 {
 }
 
-inline sal_Bool
+inline sal_Bool	
 SalI18N_KeyboardExtension::UseExtension() const
-{
-    return mbUseExtension;
+{ 
+    return mbUseExtension; 	
 }
 
 inline void
-SalI18N_KeyboardExtension::UseExtension( sal_Bool bState )
-{
+SalI18N_KeyboardExtension::UseExtension( sal_Bool bState ) 
+{ 
     mbUseExtension = mbUseExtension && bState;
 }
 
-inline sal_uInt32
-SalI18N_KeyboardExtension::LookupKeysymInDefaultGroup( sal_uInt32 nKeyCode,
+inline sal_uInt32  
+SalI18N_KeyboardExtension::LookupKeysymInDefaultGroup( sal_uInt32 nKeyCode, 
                                                        sal_uInt32 nShiftState ) const
-{
-    return LookupKeysymInGroup( nKeyCode, nShiftState, mnDefaultGroup );
+{ 
+    return LookupKeysymInGroup( nKeyCode, nShiftState, mnDefaultGroup ); 	
 }
 
-inline sal_uInt32
-SalI18N_KeyboardExtension::GetGroup() const
-{
+inline sal_uInt32	
+SalI18N_KeyboardExtension::GetGroup() const	
+{ 
     return mnGroup;
-}
-
-inline sal_uInt32
+} 
+    
+inline sal_uInt32	
 SalI18N_KeyboardExtension::GetDefaultGroup() const
-{
-    return mnDefaultGroup;
+{ 
+    return mnDefaultGroup; 	
 }
 
 inline int
diff --git a/vcl/unx/inc/plugins/gtk/atkbridge.hxx b/vcl/unx/inc/plugins/gtk/atkbridge.hxx
index 959b3aec1fb1..7763629d15f4 100644
--- a/vcl/unx/inc/plugins/gtk/atkbridge.hxx
+++ b/vcl/unx/inc/plugins/gtk/atkbridge.hxx
@@ -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
diff --git a/vcl/unx/inc/plugins/gtk/gtkdata.hxx b/vcl/unx/inc/plugins/gtk/gtkdata.hxx
index d4dec957a6b3..3ce837c1417f 100644
--- a/vcl/unx/inc/plugins/gtk/gtkdata.hxx
+++ b/vcl/unx/inc/plugins/gtk/gtkdata.hxx
@@ -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
@@ -45,9 +45,9 @@ class GtkData : public X11SalData
 public:
     GtkData() {}
     virtual ~GtkData();
-
+    
     virtual void Init();
-
+    
     virtual void initNWF();
     virtual void deInitNWF();
 };
@@ -56,7 +56,7 @@ class GtkSalFrame;
 
 class GtkSalDisplay : public SalDisplay
 {
-    GdkDisplay*                     m_pGdkDisplay;
+    GdkDisplay*						m_pGdkDisplay;
     GdkCursor                      *m_aCursors[ POINTER_COUNT ];
     bool                            m_bStartupCompleted;
     GdkCursor* getFromXPM( const char *pBitmap, const char *pMask,
@@ -80,7 +80,7 @@ public:
     inline void EventGuardAcquire() { osl_acquireMutex( hEventGuard_ ); }
     inline void EventGuardRelease() { osl_releaseMutex( hEventGuard_ ); }
     void startupNotificationCompleted() { m_bStartupCompleted = true; }
-
+    
     void screenSizeChanged( GdkScreen* );
     void monitorsChanged( GdkScreen* );
 };
diff --git a/vcl/unx/inc/plugins/gtk/gtkframe.hxx b/vcl/unx/inc/plugins/gtk/gtkframe.hxx
index 18dd476fc2c4..508eb861b694 100644
--- a/vcl/unx/inc/plugins/gtk/gtkframe.hxx
+++ b/vcl/unx/inc/plugins/gtk/gtkframe.hxx
@@ -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
@@ -38,6 +38,8 @@
 #include <vcl/salframe.hxx>
 #include <vcl/sysdata.hxx>
 
+#include "tools/link.hxx"
+
 #include <list>
 #include <vector>
 
@@ -58,7 +60,7 @@ class GtkSalFrame : public SalFrame
         {}
         ~GraphicsHolder();
     };
-
+    
     struct IMHandler
     {
         //--------------------------------------------------------
@@ -78,7 +80,7 @@ class GtkSalFrame : public SalFrame
             guint   keyval;
             guint16 hardware_keycode;
             guint8  group;
-
+    
             PreviousKeyPress (GdkEventKey *event)
             :   window (NULL),
                 send_event (0),
@@ -99,7 +101,7 @@ class GtkSalFrame : public SalFrame
                     group               = event->group;
                 }
             }
-
+    
             PreviousKeyPress( const PreviousKeyPress& rPrev )
             :   window( rPrev.window ),
                 send_event( rPrev.send_event ),
@@ -109,7 +111,7 @@ class GtkSalFrame : public SalFrame
                 hardware_keycode( rPrev.hardware_keycode ),
                 group( rPrev.group )
             {}
-
+    
             bool operator== (GdkEventKey *event) const
             {
                 return (event != NULL)
@@ -123,8 +125,8 @@ class GtkSalFrame : public SalFrame
                     ;
             }
         };
-
-
+        
+        
         GtkSalFrame*                    m_pFrame;
         std::list< PreviousKeyPress >   m_aPrevKeyPresses;
         int                             m_nPrevKeyPresses; // avoid using size()
@@ -133,7 +135,7 @@ class GtkSalFrame : public SalFrame
         bool                            m_bPreeditJustChanged;
         SalExtTextInputEvent            m_aInputEvent;
         std::vector< USHORT >           m_aInputFlags;
-
+        
         IMHandler( GtkSalFrame* );
         ~IMHandler();
 
@@ -144,17 +146,17 @@ class GtkSalFrame : public SalFrame
         void            endExtTextInput( USHORT nFlags );
         bool            handleKeyEvent( GdkEventKey* pEvent );
         void            focusChanged( bool bFocusIn );
-
+        
         void            doCallEndExtTextInput();
         void            sendEmptyCommit();
-
-
-        static void         signalIMCommit( GtkIMContext*, gchar*, gpointer );
-        static gboolean     signalIMDeleteSurrounding( GtkIMContext*, gint, gint, gpointer );
-        static void         signalIMPreeditChanged( GtkIMContext*, gpointer );
-        static void         signalIMPreeditEnd( GtkIMContext*, gpointer );
-        static void         signalIMPreeditStart( GtkIMContext*, gpointer );
-        static gboolean     signalIMRetrieveSurrounding( GtkIMContext*, gpointer );
+        
+        
+        static void			signalIMCommit( GtkIMContext*, gchar*, gpointer );
+        static gboolean		signalIMDeleteSurrounding( GtkIMContext*, gint, gint, gpointer );
+        static void			signalIMPreeditChanged( GtkIMContext*, gpointer );
+        static void			signalIMPreeditEnd( GtkIMContext*, gpointer );
+        static void			signalIMPreeditStart( GtkIMContext*, gpointer );
+        static gboolean		signalIMRetrieveSurrounding( GtkIMContext*, gpointer );
     };
     friend struct IMHandler;
 
@@ -188,40 +190,40 @@ class GtkSalFrame : public SalFrame
     bool                            m_bWindowIsGtkPlug;
     bool                            m_bSetFocusOnMap;
     String                          m_aTitle;
-
+    
     IMHandler*                      m_pIMHandler;
-
+    
     Size                            m_aMaxSize;
     Size                            m_aMinSize;
-    Rectangle                       m_aRestorePosSize;
-
-    GdkRegion*                      m_pRegion;
+    Rectangle                       m_aRestorePosSize;    
+    
+    GdkRegion*			            m_pRegion;
 
     void Init( SalFrame* pParent, ULONG nStyle );
     void Init( SystemParentData* pSysData );
     void InitCommon();
 
     // signals
-    static gboolean     signalButton( GtkWidget*, GdkEventButton*, gpointer );
-    static void         signalStyleSet( GtkWidget*, GtkStyle* pPrevious, gpointer );
-    static gboolean     signalExpose( GtkWidget*, GdkEventExpose*, gpointer );
-    static gboolean     signalFocus( GtkWidget*, GdkEventFocus*, gpointer );
-    static gboolean     signalMap( GtkWidget*, GdkEvent*, gpointer );
-    static gboolean     signalUnmap( GtkWidget*, GdkEvent*, gpointer );
-    static gboolean     signalConfigure( GtkWidget*, GdkEventConfigure*, gpointer );
-    static gboolean     signalMotion( GtkWidget*, GdkEventMotion*, gpointer );
-    static gboolean     signalKey( GtkWidget*, GdkEventKey*, gpointer );
-    static gboolean     signalDelete( GtkWidget*, GdkEvent*, gpointer );
-    static gboolean     signalState( GtkWidget*, GdkEvent*, gpointer );
-    static gboolean     signalScroll( GtkWidget*, GdkEvent*, gpointer );
-    static gboolean     signalCrossing( GtkWidget*, GdkEventCrossing*, gpointer );
-    static gboolean     signalVisibility( GtkWidget*, GdkEventVisibility*, gpointer );
-    static void         signalDestroy( GtkObject*, gpointer );
-
-    void            Center();
-    void            SetDefaultSize();
-    void            setAutoLock( bool bLock );
-    void            setScreenSaverTimeout( int nTimeout );
+    static gboolean		signalButton( GtkWidget*, GdkEventButton*, gpointer );
+    static void			signalStyleSet( GtkWidget*, GtkStyle* pPrevious, gpointer );
+    static gboolean		signalExpose( GtkWidget*, GdkEventExpose*, gpointer );
+    static gboolean		signalFocus( GtkWidget*, GdkEventFocus*, gpointer );
+    static gboolean		signalMap( GtkWidget*, GdkEvent*, gpointer );
+    static gboolean		signalUnmap( GtkWidget*, GdkEvent*, gpointer );
+    static gboolean		signalConfigure( GtkWidget*, GdkEventConfigure*, gpointer );
+    static gboolean		signalMotion( GtkWidget*, GdkEventMotion*, gpointer );
+    static gboolean		signalKey( GtkWidget*, GdkEventKey*, gpointer );
+    static gboolean		signalDelete( GtkWidget*, GdkEvent*, gpointer );
+    static gboolean		signalState( GtkWidget*, GdkEvent*, gpointer );
+    static gboolean		signalScroll( GtkWidget*, GdkEvent*, gpointer );
+    static gboolean		signalCrossing( GtkWidget*, GdkEventCrossing*, gpointer );
+    static gboolean		signalVisibility( GtkWidget*, GdkEventVisibility*, gpointer );
+    static void			signalDestroy( GtkObject*, gpointer );
+
+    void			Center();
+    void			SetDefaultSize();
+    void			setAutoLock( bool bLock );
+    void			setScreenSaverTimeout( int nTimeout );
 
     void            doKeyCallback( guint state,
                                    guint keyval,
@@ -246,7 +248,7 @@ class GtkSalFrame : public SalFrame
             !(m_nStyle & SAL_FRAME_STYLE_OWNERDRAWDECORATION) && // toolbars are also not
             !(m_nStyle & SAL_FRAME_STYLE_FLOAT_FOCUSABLE);       // focusable floats are not
     }
-
+    
     bool isChild( bool bPlug = true, bool bSysChild = true )
     {
         ULONG nMask = 0;
@@ -256,7 +258,7 @@ class GtkSalFrame : public SalFrame
             nMask |= SAL_FRAME_STYLE_SYSTEMCHILD;
         return (m_nStyle & nMask) != 0;
     }
-
+    
     void resizeWindow( long nWidth, long nHeight );
     void moveWindow( long nX, long nY );
 
@@ -265,6 +267,8 @@ class GtkSalFrame : public SalFrame
     void setMinMaxSize();
     void createNewWindow( XLIB_Window aParent, bool bXEmbed, int nScreen );
     void askForXEmbedFocus( sal_Int32 nTimecode );
+    
+    DECL_LINK( ImplDelayedFullScreenHdl, void* );
 public:
     GtkSalFrame( SalFrame* pParent, ULONG nStyle );
     GtkSalFrame( SystemParentData* pSysData );
@@ -275,20 +279,20 @@ public:
     bool Dispatch( const XEvent* pEvent );
     void grabPointer( BOOL bGrab, BOOL bOwnerEvents = FALSE );
 
-    GtkSalDisplay*  getDisplay();
-    GdkDisplay*     getGdkDisplay();
-    GtkWidget*  getWindow() const { return m_pWindow; }
-    GtkFixed*   getFixedContainer() const { return m_pFixedContainer; }
-    GdkWindow*  getForeignParent() const { return m_pForeignParent; }
-    GdkNativeWindow getForeignParentWindow() const { return m_aForeignParentWindow; }
-    GdkWindow*  getForeignTopLevel() const { return m_pForeignTopLevel; }
-    GdkNativeWindow getForeignTopLevelWindow() const { return m_aForeignTopLevelWindow; }
+    GtkSalDisplay*	getDisplay();
+    GdkDisplay*		getGdkDisplay();
+    GtkWidget*	getWindow() const { return m_pWindow; }
+    GtkFixed*	getFixedContainer() const { return m_pFixedContainer; }
+    GdkWindow*	getForeignParent() const { return m_pForeignParent; }
+    GdkNativeWindow	getForeignParentWindow() const { return m_aForeignParentWindow; }
+    GdkWindow*	getForeignTopLevel() const { return m_pForeignTopLevel; }
+    GdkNativeWindow	getForeignTopLevelWindow() const { return m_aForeignTopLevelWindow; }
     GdkVisibilityState getVisibilityState() const
     { return m_nVisibility; }
     Pixmap getBackgroundPixmap() const { return m_hBackgroundPixmap; }
     int getScreenNumber() const { return m_nScreen; }
     void updateScreenNumber();
-
+    
     void moveToScreen( int nScreen );
 
     virtual ~GtkSalFrame();
@@ -380,13 +384,13 @@ public:
 
     // shaped system windows
     // set clip region to none (-> rectangular windows, normal state)
-    virtual void                    ResetClipRegion();
+    virtual void					ResetClipRegion();
     // start setting the clipregion consisting of nRects rectangles
-    virtual void                    BeginSetClipRegion( ULONG nRects );
+    virtual void					BeginSetClipRegion( ULONG nRects );
     // add a rectangle to the clip region
-    virtual void                    UnionClipRegion( long nX, long nY, long nWidth, long nHeight );
+    virtual void					UnionClipRegion( long nX, long nY, long nWidth, long nHeight );
     // done setting up the clipregion
-    virtual void                    EndSetClipRegion();
+    virtual void					EndSetClipRegion();
 
     static GtkSalFrame         *getFromWindow( GtkWindow *pWindow );
 };
diff --git a/vcl/unx/inc/plugins/gtk/gtkgdi.hxx b/vcl/unx/inc/plugins/gtk/gtkgdi.hxx
index 7544a566d8ae..0dc2b8ba61e4 100644
--- a/vcl/unx/inc/plugins/gtk/gtkgdi.hxx
+++ b/vcl/unx/inc/plugins/gtk/gtkgdi.hxx
@@ -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
@@ -33,34 +33,34 @@
 #include <gdk/gdkx.h>
 #include <gdk/gdkkeysyms.h>
 #include <tools/postx.h>
-
+ 
 #include <salgdi.h>
 
 class GtkSalGraphics : public X11SalGraphics
 {
     GtkWidget           *m_pWindow;
     Region               m_aClipRegion;
-
+    
 public:
                         GtkSalGraphics( GtkWidget *window )
                             : m_pWindow( window ),
                               m_aClipRegion( REGION_NULL )
                               {}
     virtual             ~GtkSalGraphics();
-
+    
     inline GtkWidget*  GetGtkWidget() const { return m_pWindow; }
     inline GdkWindow*  GetGdkWindow() const { return m_pWindow->window; }
     inline GtkSalFrame* GetGtkFrame() const { return static_cast<GtkSalFrame*>(m_pFrame); }
-    void SetWindow( GtkWidget* window ) { m_pWindow = window; }
-
-
+    void SetWindow( GtkWidget* window ) { m_pWindow = window; } 
+    
+    
     // will be set when UI theme was changed
     static  BOOL        bThemeChanged;
     static  BOOL        bNeedPixmapPaint;
     static  BOOL        bGlobalNeedPixmapPaint;
     static  BOOL        bToolbarGripWorkaround;
     static  BOOL        bNeedButtonStyleAsEditBackgroundWorkaround;
-
+    
     // native widget methods
     virtual BOOL        IsNativeControlSupported( ControlType nType, ControlPart nPart );
     virtual BOOL        hitTestNativeControl( ControlType nType, ControlPart nPart, const Rectangle& rControlRegion,
@@ -74,28 +74,28 @@ public:
     virtual BOOL        getNativeControlRegion( ControlType nType, ControlPart nPart, const Rectangle& rControlRegion, ControlState nState,
                                                 const ImplControlValue& aValue, const rtl::OUString& rCaption,
                                                 Rectangle &rNativeBoundingRegion, Rectangle &rNativeContentRegion );
-
+                                                
     //helper methods for frame's UpdateSettings
     void updateSettings( AllSettings& rSettings );
-
-    virtual void            ResetClipRegion();
-    virtual void            BeginSetClipRegion( ULONG nCount );
-    virtual BOOL            unionClipRegion( long nX, long nY, long nWidth, long nHeight );
-    virtual bool            unionClipRegion(  const ::basegfx::B2DPolyPolygon& );
-    virtual void            EndSetClipRegion();
+    
+    virtual void			ResetClipRegion();
+    virtual void			BeginSetClipRegion( ULONG nCount );
+    virtual BOOL			unionClipRegion( long nX, long nY, long nWidth, long nHeight );
+    virtual bool			unionClipRegion(  const ::basegfx::B2DPolyPolygon& );
+    virtual void			EndSetClipRegion();
 
     // some themes set the background pixmap of our window EVERY time
     // a control is painted; but presentation effects need
     // the background set to None; workaround: set the background
     // before copyBits
-    virtual void            copyBits( const SalTwoRect* pPosAry,
+    virtual void			copyBits( const SalTwoRect* pPosAry,
                                       SalGraphics* pSrcGraphics );
 
 protected:
     typedef std::list< Rectangle > clipList;
 
     GdkPixmap* NWGetPixmapFromScreen( Rectangle srcRect );
-    BOOL NWRenderPixmapToScreen( GdkPixmap* pPixmap, Rectangle dstRect );
+    BOOL NWRenderPixmapToScreen( GdkPixmap*	pPixmap, Rectangle dstRect );
 
     BOOL NWPaintGTKButton( GdkDrawable* gdkDrawable, ControlType nType, ControlPart nPart,
                            const Rectangle& rControlRectangle,
@@ -142,7 +142,7 @@ protected:
                             const clipList& rClipList,
                             ControlState nState, const ImplControlValue& aValue,
                             const OUString& rCaption );
-
+    
     BOOL NWPaintGTKToolbar( GdkDrawable* gdkDrawable, ControlType nType, ControlPart nPart,
                             const Rectangle& rControlRectangle,
                             const clipList& rClipList,
diff --git a/vcl/unx/inc/plugins/gtk/gtkinst.hxx b/vcl/unx/inc/plugins/gtk/gtkinst.hxx
index ee07199cb266..bf9b49843e23 100644
--- a/vcl/unx/inc/plugins/gtk/gtkinst.hxx
+++ b/vcl/unx/inc/plugins/gtk/gtkinst.hxx
@@ -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
@@ -35,19 +35,19 @@ class GtkYieldMutex : public SalYieldMutex
 {
 public:
                                                 GtkYieldMutex();
-    virtual void                                acquire();
-    virtual void                                release();
-    virtual sal_Bool                            tryToAcquire();
+    virtual void								acquire();
+    virtual void								release();
+    virtual sal_Bool 							tryToAcquire();
 
     virtual int Grab();
     virtual void Ungrab( int );
 
     class GtkYieldGuard
     {
-        GtkYieldMutex*  m_pMutex;
-        int             m_nGrab;
+        GtkYieldMutex*	m_pMutex;
+        int				m_nGrab;
     public:
-        GtkYieldGuard( GtkYieldMutex* pMutex )
+        GtkYieldGuard( GtkYieldMutex* pMutex ) 
                 : m_pMutex( pMutex )
         {
             m_nGrab = m_pMutex->Grab();
@@ -61,8 +61,8 @@ public:
 
 class GtkHookedYieldMutex : public GtkYieldMutex
 {
-    virtual int      Grab()             { return 0; };
-    virtual void     Ungrab(int )       {};
+    virtual int		 Grab()				{ return 0; };
+    virtual void	 Ungrab(int )		{};
     std::list<ULONG> aYieldStack;
 public:
     GtkHookedYieldMutex();
@@ -79,15 +79,15 @@ public:
 class GtkInstance : public X11SalInstance
 {
 public:
-    GtkInstance( SalYieldMutex* pMutex )
+    GtkInstance( SalYieldMutex* pMutex ) 
             : X11SalInstance( pMutex )
     {}
     virtual ~GtkInstance();
 
-    virtual SalFrame*           CreateFrame( SalFrame* pParent, ULONG nStyle );
+    virtual SalFrame*			CreateFrame( SalFrame* pParent, ULONG nStyle );
     virtual SalFrame*           CreateChildFrame( SystemParentData* pParent, ULONG nStyle );
-    virtual SalObject*          CreateObject( SalFrame* pParent, SystemWindowData* pWindowData, BOOL bShow = TRUE );
-    virtual SalSystem*          CreateSalSystem();
+    virtual SalObject*			CreateObject( SalFrame* pParent, SystemWindowData* pWindowData, BOOL bShow = TRUE );
+    virtual SalSystem*			CreateSalSystem();
     virtual void                AddToRecentDocumentList(const rtl::OUString& rFileUrl, const rtl::OUString& rMimeType);
 };
 
diff --git a/vcl/unx/inc/plugins/gtk/gtkobject.hxx b/vcl/unx/inc/plugins/gtk/gtkobject.hxx
index ea740249f1c6..f801ffd641f8 100644
--- a/vcl/unx/inc/plugins/gtk/gtkobject.hxx
+++ b/vcl/unx/inc/plugins/gtk/gtkobject.hxx
@@ -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
@@ -35,35 +35,35 @@
 
 class GtkSalObject : public SalObject
 {
-    SystemChildData     m_aSystemData;
-    GtkWidget*          m_pSocket;
-    GdkRegion*          m_pRegion;
+    SystemChildData		m_aSystemData;
+    GtkWidget*			m_pSocket;
+    GdkRegion*			m_pRegion;
 
     // signals
-    static gboolean     signalButton( GtkWidget*, GdkEventButton*, gpointer );
-    static gboolean     signalFocus( GtkWidget*, GdkEventFocus*, gpointer );
-    static void         signalDestroy( GtkObject*, gpointer );
+    static gboolean		signalButton( GtkWidget*, GdkEventButton*, gpointer );
+    static gboolean		signalFocus( GtkWidget*, GdkEventFocus*, gpointer );
+    static void			signalDestroy( GtkObject*, gpointer );
 public:
     GtkSalObject( GtkSalFrame* pParent, BOOL bShow = TRUE );
     virtual ~GtkSalObject();
 
     // overload all pure virtual methods
-     virtual void                   ResetClipRegion();
-    virtual USHORT                  GetClipRegionType();
-    virtual void                    BeginSetClipRegion( ULONG nRects );
-    virtual void                    UnionClipRegion( long nX, long nY, long nWidth, long nHeight );
-    virtual void                    EndSetClipRegion();
-
-    virtual void                    SetPosSize( long nX, long nY, long nWidth, long nHeight );
-    virtual void                    Show( BOOL bVisible );
-    virtual void                    Enable( BOOL nEnable );
-    virtual void                    GrabFocus();
+     virtual void					ResetClipRegion();
+    virtual USHORT					GetClipRegionType();
+    virtual void					BeginSetClipRegion( ULONG nRects );
+    virtual void					UnionClipRegion( long nX, long nY, long nWidth, long nHeight );
+    virtual void					EndSetClipRegion();
 
-    virtual void                    SetBackground();
-    virtual void                    SetBackground( SalColor nSalColor );
+    virtual void					SetPosSize( long nX, long nY, long nWidth, long nHeight );
+    virtual void					Show( BOOL bVisible );
+    virtual void					Enable( BOOL nEnable );
+    virtual void					GrabFocus();
 
-    virtual const SystemEnvData*    GetSystemData() const;
+    virtual void					SetBackground();
+    virtual void					SetBackground( SalColor nSalColor );
 
+    virtual const SystemEnvData*	GetSystemData() const;
+   
 };
 
 #endif // _SV_SALOBJ_H
diff --git a/vcl/unx/inc/plugins/kde/kdedata.hxx b/vcl/unx/inc/plugins/kde/kdedata.hxx
index a55471901283..2a2733a6f65c 100644
--- a/vcl/unx/inc/plugins/kde/kdedata.hxx
+++ b/vcl/unx/inc/plugins/kde/kdedata.hxx
@@ -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
@@ -37,7 +37,7 @@ class KDEData : public X11SalData
 public:
     KDEData() {}
     virtual ~KDEData();
-
+    
     virtual void Init();
     virtual void initNWF();
     virtual void deInitNWF();
@@ -56,9 +56,9 @@ class KDESalFrame : public X11SalFrame
 
     struct GraphicsHolder
     {
-        X11SalGraphics*     pGraphics;
-        bool                bInUse;
-        GraphicsHolder()
+        X11SalGraphics*		pGraphics;
+        bool				bInUse;
+        GraphicsHolder() 
                 : pGraphics( NULL ),
                   bInUse( false )
         {}
@@ -80,7 +80,7 @@ public:
 class KDESalInstance : public X11SalInstance
 {
 public:
-    KDESalInstance( SalYieldMutex* pMutex )
+    KDESalInstance( SalYieldMutex* pMutex ) 
             : X11SalInstance( pMutex ) {}
     virtual ~KDESalInstance() {}
     virtual SalFrame* CreateFrame( SalFrame* pParent, ULONG nStyle );
@@ -103,7 +103,7 @@ public:
         {}
     virtual ~KDEXLib();
     virtual void Init();
-
+    
     void doStartup();
 };
 
diff --git a/vcl/unx/inc/pspgraphics.h b/vcl/unx/inc/pspgraphics.h
index 4b1ac12116a3..179e9a4349f2 100644
--- a/vcl/unx/inc/pspgraphics.h
+++ b/vcl/unx/inc/pspgraphics.h
@@ -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
@@ -42,15 +42,15 @@ class SalInfoPrinter;
 
 class VCL_DLLPUBLIC PspGraphics : public SalGraphics
 {
-    psp::JobData*               m_pJobData;
-    psp::PrinterGfx*            m_pPrinterGfx;
-    String*                     m_pPhoneNr;
-    bool                        m_bSwallowFaxNo;
-    String                      m_aPhoneCollection;
-    bool                        m_bPhoneCollectionActive;
-
-    ServerFont*                 m_pServerFont[ MAX_FALLBACK ];
-    bool                        m_bFontVertical;
+    psp::JobData*				m_pJobData;
+    psp::PrinterGfx*			m_pPrinterGfx;
+    String*						m_pPhoneNr;
+    bool						m_bSwallowFaxNo;
+    String						m_aPhoneCollection;
+    bool						m_bPhoneCollectionActive;
+
+    ServerFont*					m_pServerFont[ MAX_FALLBACK ];
+    bool						m_bFontVertical;
     SalInfoPrinter*             m_pInfoPrinter;
 public:
     PspGraphics( psp::JobData* pJob, psp::PrinterGfx* pGfx, String* pPhone, bool bSwallow, SalInfoPrinter* pInfoPrinter )
@@ -75,40 +75,40 @@ public:
 
     static ImplDevFontAttributes Info2DevFontAttributes( const psp::FastPrintFontInfo& );
     static void AnnounceFonts( ImplDevFontList*, const psp::FastPrintFontInfo& );
-    static FontWidth    ToFontWidth (psp::width::type eWidth);
-    static FontWeight   ToFontWeight (psp::weight::type eWeight);
-    static FontPitch    ToFontPitch (psp::pitch::type ePitch);
-    static FontItalic   ToFontItalic (psp::italic::type eItalic);
-    static FontFamily   ToFontFamily (psp::family::type eFamily);
+    static FontWidth	ToFontWidth (psp::width::type eWidth);
+    static FontWeight	ToFontWeight (psp::weight::type eWeight);
+    static FontPitch	ToFontPitch (psp::pitch::type ePitch);
+    static FontItalic	ToFontItalic (psp::italic::type eItalic);
+    static FontFamily	ToFontFamily (psp::family::type eFamily);
 
     // overload all pure virtual methods
-    virtual void            GetResolution( sal_Int32& rDPIX, sal_Int32& rDPIY );
-    virtual USHORT          GetBitCount();
-    virtual long            GetGraphicsWidth() const;
-
-    virtual void            ResetClipRegion();
-    virtual void            BeginSetClipRegion( ULONG nCount );
-    virtual BOOL            unionClipRegion( long nX, long nY, long nWidth, long nHeight );
-    virtual bool            unionClipRegion( const ::basegfx::B2DPolyPolygon& );
-    virtual void            EndSetClipRegion();
-
-    virtual void            SetLineColor();
-    virtual void            SetLineColor( SalColor nSalColor );
-    virtual void            SetFillColor();
-    virtual void            SetFillColor( SalColor nSalColor );
-    virtual void            SetXORMode( bool bSet, bool );
-    virtual void            SetROPLineColor( SalROPColor nROPColor );
-    virtual void            SetROPFillColor( SalROPColor nROPColor );
-
-    virtual void            SetTextColor( SalColor nSalColor );
+    virtual void			GetResolution( sal_Int32& rDPIX, sal_Int32& rDPIY );
+    virtual USHORT			GetBitCount();
+    virtual long			GetGraphicsWidth() const;
+
+    virtual void			ResetClipRegion();
+    virtual void			BeginSetClipRegion( ULONG nCount );
+    virtual BOOL			unionClipRegion( long nX, long nY, long nWidth, long nHeight );
+    virtual bool			unionClipRegion( const ::basegfx::B2DPolyPolygon& );
+    virtual void			EndSetClipRegion();
+
+    virtual void			SetLineColor();
+    virtual void			SetLineColor( SalColor nSalColor );
+    virtual void			SetFillColor();
+    virtual void          	SetFillColor( SalColor nSalColor );
+    virtual void			SetXORMode( bool bSet, bool );
+    virtual void			SetROPLineColor( SalROPColor nROPColor );
+    virtual void			SetROPFillColor( SalROPColor nROPColor );
+
+    virtual void			SetTextColor( SalColor nSalColor );
     virtual USHORT          SetFont( ImplFontSelectData*, int nFallbackLevel );
-    virtual void            GetFontMetric( ImplFontMetricData* );
-    virtual ULONG           GetKernPairs( ULONG nMaxPairs, ImplKernPairData* );
+    virtual void			GetFontMetric( ImplFontMetricData* );
+    virtual ULONG			GetKernPairs( ULONG nMaxPairs, ImplKernPairData* );
     virtual ImplFontCharMap* GetImplFontCharMap() const;
-    virtual void            GetDevFontList( ImplDevFontList* );
-    virtual void            GetDevFontSubstList( OutputDevice* );
-    virtual bool            AddTempDevFont( ImplDevFontList*, const String& rFileURL, const String& rFontName );
-    virtual BOOL            CreateFontSubset( const rtl::OUString& rToFile,
+    virtual void			GetDevFontList( ImplDevFontList* );
+    virtual void			GetDevFontSubstList( OutputDevice* );
+    virtual bool			AddTempDevFont( ImplDevFontList*, const String& rFileURL, const String& rFontName );
+    virtual BOOL			CreateFontSubset( const rtl::OUString& rToFile,
                                               const ImplFontData*,
                                               sal_Int32* pGlyphIDs,
                                               sal_uInt8* pEncoding,
@@ -117,76 +117,76 @@ public:
                                               FontSubsetInfo& rInfo
                                               );
     virtual const Ucs2SIntMap* GetFontEncodingVector( const ImplFontData*, const Ucs2OStrMap** ppNonEncoded );
-    virtual const void* GetEmbedFontData( const ImplFontData*,
+    virtual const void*	GetEmbedFontData( const ImplFontData*,
                                           const sal_Ucs* pUnicodes,
                                           sal_Int32* pWidths,
                                           FontSubsetInfo& rInfo,
                                           long* pDataLen );
-    virtual void            FreeEmbedFontData( const void* pData, long nDataLen );
+    virtual void			FreeEmbedFontData( const void* pData, long nDataLen );
     virtual void            GetGlyphWidths( const ImplFontData*,
                                             bool bVertical,
                                             Int32Vector& rWidths,
                                             Ucs2UIntMap& rUnicodeEnc );
-    virtual BOOL            GetGlyphBoundRect( long nIndex, Rectangle& );
-    virtual BOOL            GetGlyphOutline( long nIndex, ::basegfx::B2DPolyPolygon& );
-    virtual SalLayout*      GetTextLayout( ImplLayoutArgs&, int nFallbackLevel );
-    virtual void            DrawServerFontLayout( const ServerFontLayout& );
+    virtual BOOL			GetGlyphBoundRect( long nIndex, Rectangle& );
+    virtual BOOL			GetGlyphOutline( long nIndex, ::basegfx::B2DPolyPolygon& );
+    virtual SalLayout*		GetTextLayout( ImplLayoutArgs&, int nFallbackLevel );
+    virtual void			DrawServerFontLayout( const ServerFontLayout& );
     virtual bool            supportsOperation( OutDevSupportType ) const;
-    virtual void            drawPixel( long nX, long nY );
-    virtual void            drawPixel( long nX, long nY, SalColor nSalColor );
-    virtual void            drawLine( long nX1, long nY1, long nX2, long nY2 );
-    virtual void            drawRect( long nX, long nY, long nWidth, long nHeight );
-    virtual void            drawPolyLine( ULONG nPoints, const SalPoint* pPtAry );
-    virtual void            drawPolygon( ULONG nPoints, const SalPoint* pPtAry );
-    virtual void            drawPolyPolygon( sal_uInt32 nPoly,
+    virtual void			drawPixel( long nX, long nY );
+    virtual void			drawPixel( long nX, long nY, SalColor nSalColor );
+    virtual void			drawLine( long nX1, long nY1, long nX2, long nY2 );
+    virtual void			drawRect( long nX, long nY, long nWidth, long nHeight );
+    virtual void			drawPolyLine( ULONG nPoints, const SalPoint* pPtAry );
+    virtual void			drawPolygon( ULONG nPoints, const SalPoint* pPtAry );
+    virtual void			drawPolyPolygon( sal_uInt32 nPoly,
                                              const sal_uInt32* pPoints,
                                              PCONSTSALPOINT* pPtAry );
-    virtual bool            drawPolyPolygon( const ::basegfx::B2DPolyPolygon&, double fTransparency );
+    virtual bool			drawPolyPolygon( const ::basegfx::B2DPolyPolygon&, double fTransparency );
     virtual bool            drawPolyLine( const basegfx::B2DPolygon&, double fTransparency, const basegfx::B2DVector& rLineWidths, basegfx::B2DLineJoin);
-    virtual sal_Bool        drawPolyLineBezier( ULONG nPoints,
+    virtual sal_Bool		drawPolyLineBezier( ULONG nPoints,
                                                 const SalPoint* pPtAry,
                                                 const BYTE* pFlgAry );
-    virtual sal_Bool        drawPolygonBezier( ULONG nPoints,
+    virtual sal_Bool		drawPolygonBezier( ULONG nPoints,
                                                const SalPoint* pPtAry,
                                                const BYTE* pFlgAry );
-    virtual sal_Bool        drawPolyPolygonBezier( sal_uInt32 nPoly,
+    virtual sal_Bool		drawPolyPolygonBezier( sal_uInt32 nPoly,
                                                    const sal_uInt32* pPoints,
                                                    const SalPoint* const* pPtAry,
                                                    const BYTE* const* pFlgAry );
-    virtual void            copyArea( long nDestX,
+    virtual void			copyArea( long nDestX,
                                       long nDestY,
                                       long nSrcX,
                                       long nSrcY,
                                       long nSrcWidth,
                                       long nSrcHeight,
                                       USHORT nFlags );
-    virtual void            copyBits( const SalTwoRect* pPosAry,
+    virtual void			copyBits( const SalTwoRect* pPosAry,
                                       SalGraphics* pSrcGraphics );
-    virtual void            drawBitmap( const SalTwoRect* pPosAry,
+    virtual void			drawBitmap( const SalTwoRect* pPosAry,
                                         const SalBitmap& rSalBitmap );
-    virtual void            drawBitmap( const SalTwoRect* pPosAry,
+    virtual void			drawBitmap( const SalTwoRect* pPosAry,
                                         const SalBitmap& rSalBitmap,
                                         SalColor nTransparentColor );
-    virtual void            drawBitmap( const SalTwoRect* pPosAry,
+    virtual void			drawBitmap( const SalTwoRect* pPosAry,
                                         const SalBitmap& rSalBitmap,
                                         const SalBitmap& rTransparentBitmap );
-    virtual void            drawMask( const SalTwoRect* pPosAry,
+    virtual void			drawMask( const SalTwoRect* pPosAry,
                                       const SalBitmap& rSalBitmap,
                                       SalColor nMaskColor );
-    virtual SalBitmap*      getBitmap( long nX, long nY, long nWidth, long nHeight );
-    virtual SalColor        getPixel( long nX, long nY );
-    virtual void            invert( long nX, long nY, long nWidth, long nHeight, SalInvert nFlags );
-    virtual void            invert( ULONG nPoints, const SalPoint* pPtAry, SalInvert nFlags );
+    virtual SalBitmap*		getBitmap( long nX, long nY, long nWidth, long nHeight );
+    virtual SalColor		getPixel( long nX, long nY );
+    virtual void			invert( long nX, long nY, long nWidth, long nHeight, SalInvert nFlags );
+    virtual void			invert( ULONG nPoints, const SalPoint* pPtAry, SalInvert nFlags );
 
-    virtual BOOL            drawEPS( long nX, long nY, long nWidth, long nHeight, void* pPtr, ULONG nSize );
+    virtual BOOL			drawEPS( long nX, long nY, long nWidth, long nHeight, void* pPtr, ULONG nSize );
     virtual bool            filterText( const String& rOrigText, String& rNewText, xub_StrLen nIndex, xub_StrLen& rLen, xub_StrLen& rCutStart, xub_StrLen& rCutStop );
-
+    
     virtual bool            drawAlphaBitmap( const SalTwoRect&,
                                              const SalBitmap& rSourceBitmap,
                                              const SalBitmap& rAlphaBitmap );
     virtual bool            drawAlphaRect( long nX, long nY, long nWidth, long nHeight, sal_uInt8 nTransparency );
 
-    virtual SystemGraphicsData GetGraphicsData() const;
+    virtual SystemGraphicsData GetGraphicsData() const;    
     virtual SystemFontData     GetSysFontData( int nFallbacklevel ) const;
 };
 
diff --git a/vcl/unx/inc/salbmp.h b/vcl/unx/inc/salbmp.h
index 23e038f30ab1..74c5c390d4c8 100644
--- a/vcl/unx/inc/salbmp.h
+++ b/vcl/unx/inc/salbmp.h
@@ -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
@@ -36,11 +36,11 @@
 #include <vcl/salbmp.hxx>
 #include <vcl/dllapi.h>
 
-struct  BitmapBuffer;
-class   BitmapPalette;
-class   SalGraphics;
-class   ImplSalDDB;
-class   ImplSalBitmapCache;
+struct	BitmapBuffer;
+class	BitmapPalette;
+class	SalGraphics;
+class	ImplSalDDB;
+class	ImplSalBitmapCache;
 
 // -------------
 // - SalBitmap -
@@ -50,10 +50,10 @@ class VCL_DLLPUBLIC X11SalBitmap : public SalBitmap
 {
 private:
 
-    static BitmapBuffer*        ImplCreateDIB( const Size& rSize,
-                                               USHORT nBitCount,
+    static BitmapBuffer*		ImplCreateDIB( const Size& rSize,
+                                               USHORT nBitCount, 
                                                const BitmapPalette& rPal );
-    static BitmapBuffer*        ImplCreateDIB( Drawable aDrawable,
+    static BitmapBuffer*		ImplCreateDIB( Drawable aDrawable,
                                                int nScreen,
                                                long nDrawableDepth,
                                                long nX, long nY,
@@ -61,12 +61,12 @@ private:
 
 public:
 
-    static ImplSalBitmapCache*  mpCache;
-    static ULONG                mnCacheInstCount;
+    static ImplSalBitmapCache*	mpCache;
+    static ULONG				mnCacheInstCount;
 
-    static void                 ImplCreateCache();
-    static void                 ImplDestroyCache();
-    void                        ImplRemovedFromCache();
+    static void					ImplCreateCache();
+    static void					ImplDestroyCache();
+    void				        ImplRemovedFromCache();
 
     bool                        SnapShot (Display* pDisplay, XLIB_Window hWindow);
     bool                        ImplCreateFromXImage( Display* pDisplay,
@@ -76,48 +76,48 @@ public:
 private:
 
 
-    BitmapBuffer*   mpDIB;
-    ImplSalDDB*     mpDDB;
-
+    BitmapBuffer*	mpDIB;
+    ImplSalDDB*		mpDDB;
+                                
 public:
 
     SAL_DLLPRIVATE bool    ImplCreateFromDrawable( Drawable aDrawable,
                                                   int nScreen,
                                                   long nDrawableDepth,
-                                                  long nX, long nY,
+                                                  long nX, long nY, 
                                                   long nWidth, long nHeight );
 
     SAL_DLLPRIVATE XImage* ImplCreateXImage( SalDisplay* pSalDisp,
-                                            int nScreen, long nDepth,
+                                            int nScreen, long nDepth, 
                                               const SalTwoRect& rTwoRect ) const;
 
     SAL_DLLPRIVATE ImplSalDDB* ImplGetDDB( Drawable, int nScreen, long nDrawableDepth,
                                            const SalTwoRect& ) const;
-    void    ImplDraw( Drawable aDrawable, int nScreen, long nDrawableDepth,
+    void    ImplDraw( Drawable aDrawable, int nScreen, long nDrawableDepth, 
                       const SalTwoRect& rTwoRect, const GC& rGC ) const;
-
-public:
-
+                        
+public:					
+                                
     X11SalBitmap();
     virtual ~X11SalBitmap();
 
     // overload pure virtual methods
-    virtual bool            Create( const Size& rSize,
-                            USHORT nBitCount,
+    virtual bool			Create( const Size& rSize, 
+                            USHORT nBitCount, 
                             const BitmapPalette& rPal );
-    virtual bool            Create( const SalBitmap& rSalBmp );
-    virtual bool            Create( const SalBitmap& rSalBmp,
+    virtual bool			Create( const SalBitmap& rSalBmp );
+    virtual bool			Create( const SalBitmap& rSalBmp, 
                                     SalGraphics* pGraphics );
-    virtual bool            Create( const SalBitmap& rSalBmp,
+    virtual bool			Create( const SalBitmap& rSalBmp,
                                     USHORT nNewBitCount );
-
-    virtual void            Destroy();
-
-    virtual Size            GetSize() const;
-    virtual USHORT          GetBitCount() const;
-
-    virtual BitmapBuffer*   AcquireBuffer( bool bReadOnly );
-    virtual void            ReleaseBuffer( BitmapBuffer* pBuffer, bool bReadOnly );
+                        
+    virtual void			Destroy();
+                        
+    virtual Size			GetSize() const;
+    virtual USHORT			GetBitCount() const;
+                        
+    virtual BitmapBuffer*	AcquireBuffer( bool bReadOnly );
+    virtual void			ReleaseBuffer( BitmapBuffer* pBuffer, bool bReadOnly );
     virtual bool            GetSystemData( BitmapSystemData& rData );
 };
 
@@ -129,23 +129,23 @@ class ImplSalDDB
 {
 private:
 
-    Pixmap          maPixmap;
-    SalTwoRect      maTwoRect;
-    long            mnDepth;
+    Pixmap			maPixmap;
+    SalTwoRect		maTwoRect;
+    long			mnDepth;
     int             mnScreen;
 
                     ImplSalDDB() {}
 
-    static void ImplDraw( Drawable aSrcDrawable, long nSrcDrawableDepth,
+    static void	ImplDraw( Drawable aSrcDrawable, long nSrcDrawableDepth,
                           Drawable aDstDrawable, long nDstDrawableDepth,
-                          long nSrcX, long nSrcY,
-                          long nDestWidth, long nDestHeight,
+                          long nSrcX, long nSrcY, 
+                          long nDestWidth, long nDestHeight, 
                           long nDestX, long nDestY, const GC& rGC );
-
-public:
-
+                    
+public:				
+                    
                     ImplSalDDB( XImage* pImage,
-                                Drawable aDrawable, int nScreen,
+                                Drawable aDrawable, int nScreen, 
                                 const SalTwoRect& rTwoRect );
                     ImplSalDDB( Drawable aDrawable,
                                 int nScreen,
@@ -154,18 +154,18 @@ public:
                     ImplSalDDB( Display* pDisplay,
                                 XLIB_Window hWindow,
                                 int nScreen,
-                                XImage* pImage);
+                                XImage* pImage); 
                     ~ImplSalDDB();
-
-    Pixmap          ImplGetPixmap() const { return maPixmap; }
-    long            ImplGetWidth() const { return maTwoRect.mnDestWidth; }
-    long            ImplGetHeight() const { return maTwoRect.mnDestHeight; }
-    long            ImplGetDepth() const { return mnDepth; }
-    ULONG           ImplGetMemSize() const { return( ( maTwoRect.mnDestWidth * maTwoRect.mnDestHeight * mnDepth ) >> 3 ); }
+                    
+    Pixmap			ImplGetPixmap() const { return maPixmap; }
+    long			ImplGetWidth() const { return maTwoRect.mnDestWidth; }
+    long			ImplGetHeight() const { return maTwoRect.mnDestHeight; }
+    long			ImplGetDepth() const { return mnDepth; }
+    ULONG			ImplGetMemSize() const { return( ( maTwoRect.mnDestWidth * maTwoRect.mnDestHeight * mnDepth ) >> 3 ); }
     int             ImplGetScreen() const { return mnScreen; }
-
-    bool            ImplMatches( int nScreen, long nDepth, const SalTwoRect& rTwoRect ) const;
-    void            ImplDraw( Drawable aDrawable, long nDrawableDepth,
+                    
+    bool			ImplMatches( int nScreen, long nDepth, const SalTwoRect& rTwoRect ) const;
+    void			ImplDraw( Drawable aDrawable, long nDrawableDepth, 
                               const SalTwoRect& rTwoRect, const GC& rGC ) const;
 };
 
@@ -177,17 +177,17 @@ class ImplSalBitmapCache
 {
 private:
 
-    List            maBmpList;
-    ULONG           mnTotalSize;
-
-public:
+    List			maBmpList;
+    ULONG			mnTotalSize;
 
+public:				
+                    
                     ImplSalBitmapCache();
                     ~ImplSalBitmapCache();
 
-    void            ImplAdd( X11SalBitmap* pBmp, ULONG nMemSize = 0UL, ULONG nFlags = 0UL );
-    void            ImplRemove( X11SalBitmap* pBmp );
-    void            ImplClear();
+    void			ImplAdd( X11SalBitmap* pBmp, ULONG nMemSize = 0UL, ULONG nFlags = 0UL );
+    void			ImplRemove( X11SalBitmap* pBmp );
+    void			ImplClear();
 };
 
 #endif // _SV_SALBMP_HXX
diff --git a/vcl/unx/inc/saldata.hxx b/vcl/unx/inc/saldata.hxx
index 7e38e0a89bf2..c31cd4838bd4 100644
--- a/vcl/unx/inc/saldata.hxx
+++ b/vcl/unx/inc/saldata.hxx
@@ -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
@@ -51,43 +51,43 @@ DECLARE_LIST( SalDisplays, SalDisplay* )
 #if defined SCO || defined LINUX || defined NETBSD || defined AIX || defined HPUX || defined FREEBSD
 #include <pthread.h>
 #else
-typedef unsigned int pthread_t;
+typedef	unsigned int pthread_t;
 #endif
 
 // -=-= SalData =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
 class VCL_DLLPUBLIC X11SalData : public SalData
 {
 protected:
-            BOOL                bNoExceptions_;
-            SalXLib            *pXLib_;
-            SalDisplay         *m_pSalDisplay;
-            pthread_t           hMainThread_;
+            BOOL				bNoExceptions_;
+            SalXLib			   *pXLib_;
+            SalDisplay		   *m_pSalDisplay;
+            pthread_t			hMainThread_;
             rtl::OUString       maLocalHostName;
 
 public:
     X11SalData();
     virtual ~X11SalData();
-
-    virtual void            Init();
-    virtual void            initNWF();
-    virtual void            deInitNWF();
-
-    inline  void            XError( Display     *pDisplay, XErrorEvent *pEvent ) const;
-
-    SalDisplay*             GetDisplay() const
+    
+    virtual void			Init();
+    virtual void			initNWF();
+    virtual void			deInitNWF();
+    
+    inline	void			XError( Display     *pDisplay, XErrorEvent *pEvent ) const;
+
+    SalDisplay*				GetDisplay() const 
     { return m_pSalDisplay; }
-    void                    SetSalDisplay( SalDisplay* pDisplay )
+    void					SetSalDisplay( SalDisplay* pDisplay )
     { m_pSalDisplay = pDisplay; }
 
-    void                    DeleteDisplay(); // for shutdown
-
-    inline  SalXLib*        GetLib() const { return pXLib_; }
-    inline  pthread_t       GetMainThread() const { return hMainThread_; }
-
-    void                    StartTimer( ULONG nMS );
-    inline  void            StopTimer();
-    void                    Timeout() const;
+    void					DeleteDisplay(); // for shutdown
+    
+    inline	SalXLib*		GetLib() const { return pXLib_; }
+    inline	pthread_t		GetMainThread() const { return hMainThread_; }
 
+    void					StartTimer( ULONG nMS );
+    inline	void			StopTimer();
+    void					Timeout() const;
+    
     const rtl::OUString&    GetLocalHostName() const
     { return maLocalHostName; }
 
@@ -106,13 +106,13 @@ inline X11SalData* GetX11SalData()
 
 
 #ifdef _SV_SALDISP_HXX
-inline void X11SalData::XError( Display *pDisplay,  XErrorEvent *pEvent ) const
+inline void X11SalData::XError( Display *pDisplay,	XErrorEvent *pEvent ) const
 { pXLib_->XError( pDisplay, pEvent ); }
 #endif
 
 class YieldMutexReleaser
 {
-    ULONG               m_nYieldCount;
+    ULONG				m_nYieldCount;
 public:
     inline YieldMutexReleaser();
     inline ~YieldMutexReleaser();
diff --git a/vcl/unx/inc/saldisp.hxx b/vcl/unx/inc/saldisp.hxx
index 3734cbec6ef7..58f33023588d 100644
--- a/vcl/unx/inc/saldisp.hxx
+++ b/vcl/unx/inc/saldisp.hxx
@@ -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
@@ -29,10 +29,10 @@
 #define _SV_SALDISP_HXX
 
 // -=-= exports =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
-class   SalDisplay;
-class   SalColormap;
-class   SalVisual;
-class   SalXLib;
+class	SalDisplay;
+class	SalColormap;
+class	SalVisual;
+class	SalXLib;
 
 // -=-= #includes =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
 #include <salunx.h>
@@ -52,37 +52,37 @@ class   SalXLib;
 #include <vcl/dllapi.h>
 
 // -=-= forwards -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
-class   BitmapPalette;
-class   SalFrame;
-class   ColorMask;
+class	BitmapPalette;
+class	SalFrame;
+class	ColorMask;
 
 namespace vcl_sal { class WMAdaptor; }
 class DtIntegrator;
 
 // -=-= #defines -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
-#define PROPERTY_SUPPORT_WM_SetPos              0x00000001
-#define PROPERTY_SUPPORT_WM_Screen              0x00000002
-#define PROPERTY_SUPPORT_WM_Parent_Pixmap_None  0x00000004
-#define PROPERTY_SUPPORT_WM_ClientPos           0x00000008
-#define PROPERTY_SUPPORT_XSetClipMask           0x00000010  // for bitmap ops.
-#define PROPERTY_SUPPORT_3ButtonMouse           0x00000020
-
-#define PROPERTY_BUG_XA_FAMILY_NAME_nil         0x00001000
-#define PROPERTY_BUG_XCopyArea_GXxor            0x00002000  // from window
-#define PROPERTY_BUG_Stipple                    0x00004000  // 0/1 inverted
+#define PROPERTY_SUPPORT_WM_SetPos				0x00000001
+#define PROPERTY_SUPPORT_WM_Screen				0x00000002
+#define PROPERTY_SUPPORT_WM_Parent_Pixmap_None	0x00000004
+#define PROPERTY_SUPPORT_WM_ClientPos			0x00000008
+#define	PROPERTY_SUPPORT_XSetClipMask			0x00000010	// for bitmap ops.
+#define	PROPERTY_SUPPORT_3ButtonMouse			0x00000020
+
+#define PROPERTY_BUG_XA_FAMILY_NAME_nil			0x00001000
+#define PROPERTY_BUG_XCopyArea_GXxor			0x00002000	// from window
+#define PROPERTY_BUG_Stipple					0x00004000	// 0/1 inverted
 #define PROPERTY_BUG_Tile                       0x00008000  // Recreate the
                                             // dither brush each time
 #define PROPERTY_BUG_FillPolygon_Tile           0x00010000  // always Toggle Fillstyle
-#define PROPERTY_BUG_DrawLine                   0x00020000  // a DrawLine is one point to short
-#define PROPERTY_BUG_CopyPlane_RevertBWPixel    0x00040000  // revert fg and bg for xcopyplane
-#define PROPERTY_BUG_CopyArea_OnlySmallSlices   0x00080000
-#define PROPERTY_BUG_Bitmap_Bit_Order           0x00100000
+#define PROPERTY_BUG_DrawLine			        0x00020000  // a DrawLine is one point to short
+#define PROPERTY_BUG_CopyPlane_RevertBWPixel	0x00040000  // revert fg and bg for xcopyplane
+#define PROPERTY_BUG_CopyArea_OnlySmallSlices	0x00080000
+#define PROPERTY_BUG_Bitmap_Bit_Order			0x00100000
 
-#define PROPERTY_FEATURE_Maximize               0x01000000
+#define	PROPERTY_FEATURE_Maximize				0x01000000
 #define PROPERTY_FEATURE_SharedMemory           0x02000000
 #define PROPERTY_FEATURE_TrustedSolaris         0x04000000
 
-#define PROPERTY_DEFAULT                        0x00000FCB
+#define	PROPERTY_DEFAULT						0x00000FCB
 
 // ------------------------------------------------------------------------
 // server vendor
@@ -106,16 +106,16 @@ typedef enum  {
 extern "C" srv_vendor_t sal_GetServerVendor( Display *p_display );
 
 // -=-= SalWM =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
-enum SalWM { olwm,      // Open Look
-             mwm,       // Motif
-             kwm,       // KDE Desktop Environment
-             FourDwm,   // SGI
-             vuewm,     // HP
-             dtwm,      // CDE
-             winmgr,    // Oracle NC
+enum SalWM { olwm,		// Open Look
+             mwm, 		// Motif
+             kwm,		// KDE Desktop Environment
+             FourDwm,	// SGI
+             vuewm,		// HP
+             dtwm,		// CDE
+             winmgr,	// Oracle NC
              twm,
-             fvwm,      // ...
-             pmwm,      // SCO
+             fvwm,		// ...
+             pmwm,		// SCO
              otherwm };
 
 // -=-= SalRGB -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
@@ -124,7 +124,7 @@ enum SalWM { olwm,      // Open Look
 enum SalRGB { RGB,  RBG,
               GBR,  GRB,
               BGR,  BRG,
-              RGBA, RBGA,
+              RGBA,	RBGA,
               GBRA, GRBA,
               BGRA, BRGA,
               other };
@@ -132,28 +132,28 @@ enum SalRGB { RGB,  RBG,
 // -=-= SalVisual =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
 class SalVisual : public XVisualInfo
 {
-    SalRGB          eRGBMode_;
-    int             nRedShift_;
-    int             nGreenShift_;
-    int             nBlueShift_;
-    int             nRedBits_;
-    int             nGreenBits_;
-    int             nBlueBits_;
+    SalRGB			eRGBMode_;
+    int				nRedShift_;
+    int				nGreenShift_;
+    int				nBlueShift_;
+    int				nRedBits_;
+    int				nGreenBits_;
+    int				nBlueBits_;
 public:
                             SalVisual();
                             ~SalVisual();
                             SalVisual( const XVisualInfo* pXVI );
 
-    inline  VisualID        GetVisualId() const { return visualid; }
-    inline  Visual         *GetVisual() const { return visual; }
-    inline  int             GetClass() const { return c_class; }
-    inline  int             GetDepth() const { return depth; }
-    inline  SalRGB          GetMode() const { return eRGBMode_; }
-
-            Pixel           GetTCPixel( SalColor nColor ) const;
-            SalColor        GetTCColor( Pixel nPixel ) const;
-            BOOL            Convert( int &n0, int &n1, int &n2, int &n3 ); // 32bit
-             BOOL           Convert( int &n0, int &n1, int &n2 ); // 24bit
+    inline	VisualID		GetVisualId() const { return visualid; }
+    inline	Visual		   *GetVisual() const { return visual; }
+    inline	int				GetClass() const { return c_class; }
+    inline	int				GetDepth() const { return depth; }
+    inline  SalRGB			GetMode() const { return eRGBMode_; }
+    
+            Pixel			GetTCPixel( SalColor nColor ) const;
+            SalColor		GetTCColor( Pixel nPixel ) const;
+            BOOL			Convert( int &n0, int &n1, int &n2, int &n3 ); // 32bit
+             BOOL			Convert( int &n0, int &n1, int &n2 ); // 24bit
 };
 
 // -=-= SalColormap =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
@@ -161,16 +161,16 @@ class SalColormap
 {
     const SalDisplay*       m_pDisplay;
     Colormap                m_hColormap;
-    std::vector<SalColor>   m_aPalette;         // Pseudocolor
+    std::vector<SalColor>   m_aPalette;			// Pseudocolor
     SalVisual               m_aVisual;
-    std::vector<USHORT>     m_aLookupTable;     // Pseudocolor: 12bit reduction
+    std::vector<USHORT>     m_aLookupTable;		// Pseudocolor: 12bit reduction
     Pixel                   m_nWhitePixel;
     Pixel                   m_nBlackPixel;
-    Pixel                   m_nUsed;            // Pseudocolor
+    Pixel                   m_nUsed;			// Pseudocolor
     int                     m_nScreen;
 
-    void            GetPalette();
-    void            GetLookupTable();
+    void			GetPalette();
+    void			GetLookupTable();
 public:
     SalColormap( const SalDisplay*  pSalDisplay,
                  Colormap           hColormap,
@@ -180,28 +180,28 @@ public:
     SalColormap();
     ~SalColormap();
 
-    inline  Colormap            GetXColormap() const { return m_hColormap; }
-    inline  const SalDisplay*   GetDisplay() const { return m_pDisplay; }
-    inline  Display*            GetXDisplay() const;
-    inline  const SalVisual&    GetVisual() const { return m_aVisual; }
-    inline  Visual*             GetXVisual() const { return m_aVisual.GetVisual(); }
-    inline  Pixel               GetWhitePixel() const { return m_nWhitePixel; }
-    inline  Pixel               GetBlackPixel() const { return m_nBlackPixel; }
-    inline  Pixel               GetUsed() const { return m_nUsed; }
-    inline  int                 GetClass() const { return m_aVisual.GetClass(); }
+    inline	Colormap		    GetXColormap() const { return m_hColormap; }
+    inline	const SalDisplay*   GetDisplay() const { return m_pDisplay; }
+    inline	Display*            GetXDisplay() const;
+    inline	const SalVisual&    GetVisual() const { return m_aVisual; }
+    inline	Visual*             GetXVisual() const { return m_aVisual.GetVisual(); }
+    inline	Pixel			    GetWhitePixel() const { return m_nWhitePixel; }
+    inline	Pixel			    GetBlackPixel() const { return m_nBlackPixel; }
+    inline	Pixel			    GetUsed() const { return m_nUsed; }
+    inline	int				    GetClass() const { return m_aVisual.GetClass(); }
     inline  int                 GetScreenNumber() const { return m_nScreen; }
 
-    BOOL            GetXPixels( XColor  &rColor,
+    BOOL			GetXPixels( XColor  &rColor,
                                 int      r,
                                 int      g,
                                 int      b ) const;
-    inline  BOOL            GetXPixel( XColor  &rColor,
+    inline	BOOL			GetXPixel( XColor  &rColor,
                                        int      r,
                                        int      g,
                                        int      b ) const;
-    Pixel           GetPixel( SalColor nColor ) const;
-    SalColor        GetColor( Pixel nPixel ) const;
-    void            SetPalette( const BitmapPalette &rPalette );
+    Pixel			GetPixel( SalColor nColor ) const;
+    SalColor		GetColor( Pixel nPixel ) const;
+    void			SetPalette( const BitmapPalette &rPalette );
 };
 
 // -=-= SalXLib =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
@@ -211,18 +211,18 @@ struct YieldEntry;
 class VCL_DLLPUBLIC SalXLib
 {
 protected:
-    timeval         m_aTimeout;
+    timeval			m_aTimeout;
     ULONG           m_nTimeoutMS;
     int             m_pTimeoutFDS[2];
 
-    bool            m_bHaveSystemChildFrames;
-
-    int             nFDs_;
-    fd_set          aReadFDS_;
-    fd_set          aExceptionFDS_;
-    YieldEntry      *pYieldEntries_;
+    bool			m_bHaveSystemChildFrames;
 
+    int				nFDs_;
+    fd_set	        aReadFDS_;
+    fd_set	        aExceptionFDS_;
+    YieldEntry		*pYieldEntries_;
 
+    
     struct XErrorStackEntry
     {
         bool            m_bIgnore;
@@ -234,32 +234,32 @@ protected:
     XIOErrorHandler m_aOrigXIOErrorHandler;
 public:
     SalXLib();
-    virtual         ~SalXLib();
-    virtual void        Init();
+    virtual			~SalXLib();
+    virtual void		Init();
 
-    virtual void        Yield( bool bWait, bool bHandleAllCurrentEvents );
+    virtual void		Yield( bool bWait, bool bHandleAllCurrentEvents );
     virtual void        Wakeup();
-    virtual void        PostUserEvent();
+    virtual void		PostUserEvent();
 
     virtual void    Insert( int fd, void* data,
-                            YieldFunc   pending,
-                            YieldFunc   queued,
-                            YieldFunc   handle );
+                            YieldFunc	pending,
+                            YieldFunc	queued,
+                            YieldFunc	handle );
     virtual void    Remove( int fd );
 
-    void            XError( Display *pDisp, XErrorEvent *pEvent );
+    void			XError( Display *pDisp, XErrorEvent *pEvent );
     bool            HasXErrorOccured() const { return m_aXErrorHandlerStack.back().m_bWas; }
     unsigned int    GetLastXErrorRequestCode() const { return m_aXErrorHandlerStack.back().m_nLastErrorRequest; }
     void            ResetXErrorOccured() { m_aXErrorHandlerStack.back().m_bWas = false; }
     void PushXErrorLevel( bool bIgnore );
     void PopXErrorLevel();
 
-    virtual void            StartTimer( ULONG nMS );
-    virtual void            StopTimer();
+    virtual void			StartTimer( ULONG nMS );
+    virtual void			StopTimer();    
 
     bool            CheckTimeout( bool bExecuteTimers = true );
 
-    void            setHaveSystemChildFrame()
+    void			setHaveSystemChildFrame() 
     { m_bHaveSystemChildFrames = true; }
     bool            getHaveSystemChildFrame() const
     { return m_bHaveSystemChildFrames; }
@@ -306,13 +306,13 @@ public:
         Size                m_aSize;
         SalVisual           m_aVisual;
         SalColormap         m_aColormap;
-        GC                  m_aMonoGC;
-        GC                  m_aCopyGC;
-        GC                  m_aAndInvertedGC;
-        GC                  m_aAndGC;
-        GC                  m_aOrGC;
-        GC                  m_aStippleGC;
-        Pixmap              m_hInvert50;
+        GC				    m_aMonoGC;
+        GC				    m_aCopyGC;
+        GC				    m_aAndInvertedGC;
+        GC				    m_aAndGC;
+        GC				    m_aOrGC;
+        GC			        m_aStippleGC;
+        Pixmap			    m_hInvert50;
         mutable RenderEntryMap m_aRenderData;
 
         ScreenData() :
@@ -332,83 +332,83 @@ public:
 // -=-= UserEvent =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
     struct SalUserEvent
     {
-        SalFrame*       m_pFrame;
-        void*           m_pData;
-        USHORT          m_nEvent;
+        SalFrame*		m_pFrame;
+        void*			m_pData;
+        USHORT			m_nEvent;
 
-        SalUserEvent( SalFrame* pFrame, void* pData, USHORT nEvent = SALEVENT_USEREVENT )
+        SalUserEvent( SalFrame* pFrame, void* pData, USHORT nEvent = SALEVENT_USEREVENT ) 
                 : m_pFrame( pFrame ),
                   m_pData( pData ),
                   m_nEvent( nEvent )
         {}
     };
 
-protected:
-    SalXLib        *pXLib_;
-    SalI18N_InputMethod         *mpInputMethod;
-    SalI18N_KeyboardExtension   *mpKbdExtension;
+protected:	
+    SalXLib		   *pXLib_;
+    SalI18N_InputMethod			*mpInputMethod;
+    SalI18N_KeyboardExtension	*mpKbdExtension;
 
-    AttributeProvider           *mpFactory;
-    XlfdStorage                 *mpFontList;
-    const ExtendedXlfd          *mpFallbackFactory;
+    AttributeProvider 			*mpFactory;
+    XlfdStorage	   				*mpFontList;
+    const ExtendedXlfd			*mpFallbackFactory;
 
-    Display        *pDisp_;             // X Display
-    int             m_nDefaultScreen;           // XDefaultScreen
+    Display		   *pDisp_;				// X Display
+    int				m_nDefaultScreen;			// XDefaultScreen
     std::vector< ScreenData >    m_aScreens;
     ScreenData      m_aInvalidScreenData;
-    Pair            aResolution_;       // [dpi]
-    bool            mbExactResolution;
-    ULONG           nMaxRequestSize_;   // [byte]
-
-    srv_vendor_t    meServerVendor;
-    SalWM           eWindowManager_;
-    ULONG           nProperties_;       // PROPERTY_SUPPORT, BUG, FEATURE
-    BOOL            bLocal_;            // Server==Client? Init
+    Pair			aResolution_;		// [dpi]
+    bool			mbExactResolution;
+    ULONG			nMaxRequestSize_;	// [byte]
+
+    srv_vendor_t	meServerVendor;
+    SalWM			eWindowManager_;
+    ULONG			nProperties_;		// PROPERTY_SUPPORT, BUG, FEATURE
+    BOOL			bLocal_;			// Server==Client? Init 
     // in SalDisplay::IsLocal()
-    BOOL            mbLocalIsValid;     // bLocal_ is valid ?
+    BOOL			mbLocalIsValid;		// bLocal_ is valid ?
     // until x bytes
 
     oslMutex        hEventGuard_;
     std::list< SalUserEvent > m_aUserEvents;
 
-    XLIB_Cursor     aPointerCache_[POINTER_COUNT];
-    SalFrame*       m_pCapture;
+    XLIB_Cursor		aPointerCache_[POINTER_COUNT];
+    SalFrame*		m_pCapture;
 
     mutable SalFontCache* m_pFontCache;
 
     // Keyboard
-    BOOL            bNumLockFromXS_;    // Num Lock handled by X Server
-    int             nNumLockIndex_;     // modifier index in modmap
-    int             nNumLockMask_;      // keyevent state mask for
-    KeySym          nShiftKeySym_;      // first shift modifier
-    KeySym          nCtrlKeySym_;       // first control modifier
-    KeySym          nMod1KeySym_;       // first mod1 modifier
-    ByteString      m_aKeyboardName;
-
-    vcl_sal::WMAdaptor* m_pWMAdaptor;
+    BOOL			bNumLockFromXS_;	// Num Lock handled by X Server
+    int				nNumLockIndex_;		// modifier index in modmap
+    int				nNumLockMask_;		// keyevent state mask for
+    KeySym			nShiftKeySym_;		// first shift modifier
+    KeySym			nCtrlKeySym_;		// first control modifier
+    KeySym			nMod1KeySym_;		// first mod1 modifier
+    ByteString		m_aKeyboardName;
+
+    vcl_sal::WMAdaptor*	m_pWMAdaptor;
     DtIntegrator*       m_pDtIntegrator;
 
-    bool            m_bXinerama;
+    bool			m_bXinerama;
     std::vector< Rectangle > m_aXineramaScreens;
     std::list<SalFrame*> m_aFrames;
     std::list<SalObject*> m_aSalObjects;
-
+    
     bool            m_bUseRandRWrapper; // don't use randr on gtk, use gdk signals there
-
+    
     mutable XLIB_Time  m_nLastUserEventTime; // mutable because changed on first access
 
-    void            DestroyFontCache();
-    virtual long    Dispatch( XEvent *pEvent ) = 0;
-    void            InitXinerama();
+    void			DestroyFontCache();
+    virtual long	Dispatch( XEvent *pEvent ) = 0;
+    void			InitXinerama();
     void            InitRandR( XLIB_Window aRoot ) const;
     void            DeInitRandR();
     int             processRandREvent( XEvent* );
 
-    void            doDestruct();
+    void			doDestruct();
     void            addXineramaScreenUnique( long i_nX, long i_nY, long i_nWidth, long i_nHeight );
 public:
-    static  SalDisplay     *GetSalDisplay( Display* display );
-    static  BOOL            BestVisual( Display     *pDisp,
+    static	SalDisplay	   *GetSalDisplay( Display* display );
+    static	BOOL			BestVisual( Display     *pDisp,
                                         int          nScreen,
                                         XVisualInfo &rVI );
 
@@ -417,50 +417,50 @@ public:
     virtual ~SalDisplay();
 
 
-    virtual void            registerFrame( SalFrame* pFrame );
-    virtual void            deregisterFrame( SalFrame* pFrame );
-    void                    setHaveSystemChildFrame() const
+    virtual void			registerFrame( SalFrame* pFrame );
+    virtual void			deregisterFrame( SalFrame* pFrame );
+    void					setHaveSystemChildFrame() const 
     { pXLib_->setHaveSystemChildFrame(); }
     bool                    getHaveSystemChildFrame() const
     { return pXLib_->getHaveSystemChildFrame(); }
 
-    void            Init();
+    void			Init();
 
-    void            SendInternalEvent( SalFrame* pFrame, void* pData, USHORT nEvent = SALEVENT_USEREVENT );
+    void			SendInternalEvent( SalFrame* pFrame, void* pData, USHORT nEvent = SALEVENT_USEREVENT );
     void            CancelInternalEvent( SalFrame* pFrame, void* pData, USHORT nEvent );
-    bool            DispatchInternalEvent();
-    void            PrintInfo() const;
+    bool			DispatchInternalEvent();
+    void			PrintInfo() const;
 
-    void            PrintEvent( const ByteString &rComment,
+    void			PrintEvent( const ByteString &rComment,
                                 XEvent       *pEvent ) const;
 
-    XlfdStorage*    GetXlfdList() const;
+    XlfdStorage* 	GetXlfdList() const;
     ExtendedFontStruct*
-    GetFont( const ExtendedXlfd *pFont,
+    GetFont( const ExtendedXlfd *pFont, 
              const Size& rPixelSize, sal_Bool bVertical ) const;
     const ExtendedXlfd*
     GetFallbackFactory()
     { return mpFallbackFactory; }
 
-    void            Beep() const;
+    void			Beep() const;
 
-    void            ModifierMapping();
-    String          GetKeyNameFromKeySym( KeySym keysym ) const;
-    XubString       GetKeyName( USHORT nKeyCode ) const;
-    USHORT          GetKeyCode( KeySym keysym, char*pcPrintable ) const;
-    KeySym          GetKeySym( XKeyEvent      *pEvent,
+    void			ModifierMapping();
+    String			GetKeyNameFromKeySym( KeySym keysym ) const;
+    XubString		GetKeyName( USHORT nKeyCode ) const;
+    USHORT			GetKeyCode( KeySym keysym, char*pcPrintable ) const;
+    KeySym			GetKeySym( XKeyEvent      *pEvent,
                                unsigned char  *pPrintable,
-                               int            *pLen,
+                               int			  *pLen,
                                KeySym         *pUnmodifiedKeySym,
                                Status         *pStatus,
                                XIC = NULL ) const;
 
-    XLIB_Cursor     GetPointer( int ePointerStyle );
-    virtual int CaptureMouse( SalFrame *pCapture );
+    XLIB_Cursor		GetPointer( int ePointerStyle );
+    virtual int	CaptureMouse( SalFrame *pCapture );
 
-    BOOL            IsLocal();
+    BOOL			IsLocal();
 
-    void            Remove( XEvent   *pEvent );
+    void			Remove( XEvent   *pEvent );
 
     virtual void          initScreen( int nScreen ) const;
     const ScreenData&     getDataForScreen( int nScreen ) const
@@ -472,48 +472,48 @@ public:
         return m_aScreens[nScreen];
     }
 
-    XLIB_Window     GetDrawable( int nScreen ) const { return getDataForScreen( nScreen ).m_aRefWindow; }
-    Display        *GetDisplay() const { return pDisp_; }
-    int             GetDefaultScreenNumber() const { return m_nDefaultScreen; }
+    XLIB_Window		GetDrawable( int nScreen ) const { return getDataForScreen( nScreen ).m_aRefWindow; }
+    Display		   *GetDisplay() const { return pDisp_; }
+    int				GetDefaultScreenNumber() const { return m_nDefaultScreen; }
     const Size&     GetScreenSize( int nScreen ) const { return getDataForScreen( nScreen ).m_aSize; }
-    srv_vendor_t    GetServerVendor() const { return meServerVendor; }
-    void            SetServerVendor() { meServerVendor = sal_GetServerVendor(pDisp_); }
-    BOOL            IsDisplay() const { return !!pXLib_; }
-    GC              GetMonoGC( int nScreen ) const { return getDataForScreen(nScreen).m_aMonoGC; }
-    GC              GetCopyGC( int nScreen ) const { return getDataForScreen(nScreen).m_aCopyGC; }
-    GC              GetAndInvertedGC( int nScreen ) const { return getDataForScreen(nScreen).m_aAndInvertedGC; }
-    GC              GetAndGC( int nScreen ) const { return getDataForScreen(nScreen).m_aAndGC; }
-    GC              GetOrGC( int nScreen ) const { return getDataForScreen(nScreen).m_aOrGC; }
-    GC              GetStippleGC( int nScreen ) const { return getDataForScreen(nScreen).m_aStippleGC; }
-    GC              GetGC( USHORT nDepth, int nScreen ) const;
-    Pixmap          GetInvert50( int nScreen ) const { return getDataForScreen(nScreen).m_hInvert50; }
+    srv_vendor_t	GetServerVendor() const { return meServerVendor; }
+    void			SetServerVendor() { meServerVendor = sal_GetServerVendor(pDisp_); }
+    BOOL			IsDisplay() const { return !!pXLib_; }
+    GC				GetMonoGC( int nScreen ) const { return getDataForScreen(nScreen).m_aMonoGC; }
+    GC				GetCopyGC( int nScreen ) const { return getDataForScreen(nScreen).m_aCopyGC; }
+    GC				GetAndInvertedGC( int nScreen ) const { return getDataForScreen(nScreen).m_aAndInvertedGC; }
+    GC				GetAndGC( int nScreen ) const { return getDataForScreen(nScreen).m_aAndGC; }
+    GC				GetOrGC( int nScreen ) const { return getDataForScreen(nScreen).m_aOrGC; }
+    GC				GetStippleGC( int nScreen ) const { return getDataForScreen(nScreen).m_aStippleGC; }
+    GC				GetGC( USHORT nDepth, int nScreen ) const;
+    Pixmap			GetInvert50( int nScreen ) const { return getDataForScreen(nScreen).m_hInvert50; }
     const SalColormap&    GetColormap( int nScreen ) const { return getDataForScreen(nScreen).m_aColormap; }
     const SalVisual&      GetVisual( int nScreen ) const { return getDataForScreen(nScreen).m_aVisual; }
     RenderEntryMap&       GetRenderEntries( int nScreen ) const { return getDataForScreen(nScreen).m_aRenderData; }
-    const Pair     &GetResolution() const { return aResolution_; }
-    bool            GetExactResolution() const { return mbExactResolution; }
-    ULONG           GetProperties() const { return nProperties_; }
-    ULONG           GetMaxRequestSize() const { return nMaxRequestSize_; }
+    const Pair	   &GetResolution() const { return aResolution_; }
+    bool			GetExactResolution() const { return mbExactResolution; }
+    ULONG			GetProperties() const { return nProperties_; }
+    ULONG			GetMaxRequestSize() const { return nMaxRequestSize_; }
     XLIB_Time       GetLastUserEventTime( bool bAlwaysReget = false ) const;
-
+    
     bool            XIfEventWithTimeout( XEvent*, XPointer, X_if_predicate, long i_nTimeout = 1000 ) const;
 
-    BOOL            MouseCaptured( const SalFrame *pFrameData ) const
+    BOOL			MouseCaptured( const SalFrame *pFrameData ) const
     { return m_pCapture == pFrameData; }
-    SalFrame*   GetCaptureFrame() const
+    SalFrame*	GetCaptureFrame() const
     { return m_pCapture; }
     SalXLib*         GetXLib() const { return pXLib_; }
 
-    SalI18N_InputMethod*            GetInputMethod()  const { return mpInputMethod;  }
-    SalI18N_KeyboardExtension*  GetKbdExtension() const { return mpKbdExtension; }
-    void            SetInputMethod( SalI18N_InputMethod *pInputMethod )
+    SalI18N_InputMethod*			GetInputMethod()  const { return mpInputMethod;  }
+    SalI18N_KeyboardExtension* 	GetKbdExtension() const { return mpKbdExtension; }
+    void 			SetInputMethod( SalI18N_InputMethod *pInputMethod ) 
     { mpInputMethod = pInputMethod; }
-    void            SetKbdExtension(SalI18N_KeyboardExtension *pKbdExtension)
-    { mpKbdExtension = pKbdExtension; }
-    const char* GetKeyboardName( BOOL bRefresh = FALSE );
+    void			SetKbdExtension(SalI18N_KeyboardExtension *pKbdExtension)
+    { mpKbdExtension = pKbdExtension; } 
+    const char*	GetKeyboardName( BOOL bRefresh = FALSE );
     ::vcl_sal::WMAdaptor* getWMAdaptor() const { return m_pWMAdaptor; }
     DtIntegrator* getDtIntegrator() const { return m_pDtIntegrator; }
-    bool            IsXinerama() const { return m_bXinerama; }
+    bool			IsXinerama() const { return m_bXinerama; }
     const std::vector< Rectangle >& GetXineramaScreens() const { return m_aXineramaScreens; }
     XLIB_Window     GetRootWindow( int nScreen ) const
     { return getDataForScreen( nScreen ).m_aRoot; }
@@ -538,7 +538,7 @@ inline GC SalDisplay::GetGC( USHORT nDepth, int nScreen ) const
            ? GetCopyGC( nScreen )
            : None; }
 
-inline  Display *SalColormap::GetXDisplay() const
+inline	Display	*SalColormap::GetXDisplay() const
 { return m_pDisplay->GetDisplay(); }
 
 class VCL_DLLPUBLIC SalX11Display : public SalDisplay
@@ -547,10 +547,10 @@ public:
              SalX11Display( Display* pDisp );
     virtual ~SalX11Display();
 
-    virtual long        Dispatch( XEvent *pEvent );
-    virtual void        Yield();
+    virtual long		Dispatch( XEvent *pEvent );
+    virtual void		Yield();
 
-    BOOL     IsEvent();
+    BOOL	 IsEvent();
 };
 
 /*----------------------------------------------------------
diff --git a/vcl/unx/inc/salfont.h b/vcl/unx/inc/salfont.h
index b3fbe93137f3..ff158623ffd1 100644
--- a/vcl/unx/inc/salfont.h
+++ b/vcl/unx/inc/salfont.h
@@ -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
@@ -29,13 +29,13 @@
 #define _SV_SALFONT_H
 
 // -=-= exports =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
-class   SalFontCache;
-struct  SalFontDimension;
-class   SalFontFamily;
-class   SalFontFamilyList;
-class   SalFontStruct;
-class   SalFontStructList;
-class   SalFonts;
+class	SalFontCache;
+struct	SalFontDimension;
+class	SalFontFamily;
+class	SalFontFamilyList;
+class	SalFontStruct;
+class	SalFontStructList;
+class	SalFonts;
 
 // -=-= includes -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
 #include <salstd.hxx>
@@ -44,8 +44,8 @@ class   SalFonts;
 // -=-= forwards =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
 typedef ULONG XFP_FLAGS;
 
-class   SalDisplay;
-class   SalFontCacheItem;
+class	SalDisplay;
+class	SalFontCacheItem;
 
 // -=-= SalFontCache -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
 DECLARE_LIST( SalFontCache, SalFontCacheItem* )
@@ -53,49 +53,49 @@ DECLARE_LIST( SalFontCache, SalFontCacheItem* )
 // -=-= SalFontDimension -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
 struct SalFontDimension
 {
-            USHORT      nHeight_;               // [pixel]
-            USHORT      nPtHeight_;             // [point/10]
-            USHORT      nAverage_;              // [pixel/10]
-            USHORT      nXRes_;                 // [dpi]
-            USHORT      nYRes_;                 // [dpi]
-            USHORT      nSlant_;                // [pixel]
-//          size_t      nUnderlineThickness_;   // [pixel]
-//          size_t      nUnderlinePosition_;    // [pixel]
-//          size_t      nStrikeoutAscent_;      // [pixel]
-//          size_t      nStrikeoutDescent_;     // [pixel]
-//          Subscript, Superscript, Capital, Space ...
-
-    inline              SalFontDimension( USHORT nA = 0, USHORT nH = 0 );
-
-    inline  BOOL        IsScalable() const;
-    inline  USHORT      GetWidth() const { return (nAverage_ + 5) / 10; }
-    inline  Size        GetSize() const;
-    inline  void        SetSize( const Size & rSize );
-    inline  BOOL        operator == ( const SalFontDimension &r ) const;
-    inline  BOOL        operator != ( const SalFontDimension &r ) const;
-    inline  BOOL        operator >= ( const SalFontDimension &r ) const;
+            USHORT		nHeight_;				// [pixel]
+            USHORT		nPtHeight_;				// [point/10]
+            USHORT		nAverage_;				// [pixel/10]
+            USHORT		nXRes_;					// [dpi]
+            USHORT		nYRes_;					// [dpi]
+            USHORT      nSlant_;				// [pixel]
+//			size_t		nUnderlineThickness_;	// [pixel]
+//			size_t      nUnderlinePosition_;    // [pixel]
+//			size_t      nStrikeoutAscent_;      // [pixel]
+//			size_t      nStrikeoutDescent_;     // [pixel]
+//			Subscript, Superscript, Capital, Space ...
+
+    inline				SalFontDimension( USHORT nA = 0, USHORT nH = 0 );
+
+    inline	BOOL		IsScalable() const;
+    inline	USHORT		GetWidth() const { return (nAverage_ + 5) / 10; }
+    inline	Size		GetSize() const;
+    inline	void		SetSize( const Size & rSize );
+    inline	BOOL		operator == ( const SalFontDimension &r ) const;
+    inline	BOOL		operator != ( const SalFontDimension &r ) const;
+    inline	BOOL		operator >= ( const SalFontDimension &r ) const;
 };
 
 inline SalFontDimension::SalFontDimension( USHORT nA, USHORT nH )
     : nHeight_( nH ), nAverage_( nA )
 { nPtHeight_ = nXRes_ = nYRes_ = nSlant_ = 0; }
 
-inline BOOL SalFontDimension::IsScalable() const
+inline BOOL	SalFontDimension::IsScalable() const
 { return !nHeight_ && !nPtHeight_ && !nAverage_; }
 
-inline Size SalFontDimension::GetSize() const
+inline Size	SalFontDimension::GetSize() const
 { return Size( (nAverage_ + 5) / 10, nHeight_ ); }
 
-inline void SalFontDimension::SetSize( const Size & rSize )
+inline void	SalFontDimension::SetSize( const Size & rSize )
 { nAverage_ = (USHORT)rSize.Width() * 10; nHeight_ = (USHORT)rSize.Height(); }
 
-inline BOOL SalFontDimension::operator == ( const SalFontDimension &r ) const
+inline BOOL	SalFontDimension::operator == ( const SalFontDimension &r ) const
 { return nHeight_ == r.nHeight_ && (!r.nAverage_ || nAverage_ == r.nAverage_); }
 
-inline BOOL SalFontDimension::operator != ( const SalFontDimension &r ) const
+inline BOOL	SalFontDimension::operator != ( const SalFontDimension &r ) const
 { return !(*this == r); }
 
-inline BOOL SalFontDimension::operator >= ( const SalFontDimension &r ) const
+inline BOOL	SalFontDimension::operator >= ( const SalFontDimension &r ) const
 { return nHeight_ > r.nHeight_
          || (nHeight_ == r.nHeight_ && nAverage_ >= r.nAverage_); }
 
@@ -108,63 +108,63 @@ class SalFontStruct : public ImplFontMetricData
             SalFontCacheItem*pCache_;
 
 #if (OSL_DEBUG_LEVEL > 1) || defined  DBG_UTIL
-            ByteString      aFontName_;
+            ByteString		aFontName_;
 #endif
-            USHORT          nHeightCount_;      // Anzahl der Hoehen-Eintraege
-            SalFontDimension*pDimensions_;      // Hoehen-Array
-            USHORT          nWeight_;
-
-            USHORT          nFoundry_;          // properties indexies
-            USHORT          nFamily_;
-            USHORT          nWeightName_;
-            USHORT          nSlant_;
-            USHORT          nSetWidthName_;
-            ByteString      aAddStyleName_;
-            USHORT          nSpacing_;
-            USHORT          nCharSet_;
-            USHORT          nFaceName_;
-            BOOL            mbValidFontDescription; // valid xlfd entries
-
-            void            Init();
-            BOOL            Init( SalDisplay*       pDisp,
-                                  const char*       pFontName,
-                                  SalFontDimension& rDim );
-
-            ByteString      GetXFontName( const SalFontDimension& );
-
-    inline  void            SetFoundry( USHORT n )
+            USHORT			nHeightCount_;		// Anzahl der Hoehen-Eintraege
+            SalFontDimension*pDimensions_;		// Hoehen-Array
+            USHORT			nWeight_;
+
+            USHORT			nFoundry_;			// properties indexies
+            USHORT			nFamily_;
+            USHORT			nWeightName_;
+            USHORT			nSlant_;
+            USHORT			nSetWidthName_;
+            ByteString		aAddStyleName_;
+            USHORT			nSpacing_;
+            USHORT			nCharSet_;
+            USHORT			nFaceName_;
+            BOOL            mbValidFontDescription;	// valid xlfd entries
+
+            void			Init();
+            BOOL			Init( SalDisplay*		pDisp,
+                                  const char*		pFontName,
+                                  SalFontDimension&	rDim );
+
+            ByteString		GetXFontName( const SalFontDimension& );
+
+    inline	void			SetFoundry( USHORT n )
         { nFoundry_ = n; }
-    inline  void            SetFamily( USHORT n )
+    inline	void			SetFamily( USHORT n )
         { meFamily = sal_FamilyToSal( nFamily_ = n ); }
-    inline  void            SetWeightName( USHORT n )
+    inline	void			SetWeightName( USHORT n )
         { meWeight = sal_WeightToSal( nWeightName_ = n ); }
-    inline  void            SetSlant( USHORT n )
+    inline	void			SetSlant( USHORT n )
         { meItalic = sal_ItalicToSal( nSlant_ = n ); }
-    inline  void            SetSetWidthName( USHORT n )
+    inline	void			SetSetWidthName( USHORT n )
         { nSetWidthName_ = n; }
-    inline  void            SetAddStyleName( const ByteString& rAddStyle )
+    inline	void			SetAddStyleName( const ByteString& rAddStyle )
         { aAddStyleName_ = rAddStyle; aAddStyleName_.ToLowerAscii(); }
-    inline  void            SetSpacing( USHORT n )
+    inline	void			SetSpacing( USHORT n )
         { mePitch = sal_PitchToSal( nSpacing_ = n ); }
-    inline  void            SetAverage( long n )
+    inline	void			SetAverage( long n )
         { mnWidth = (n + 5) / 10; }
-    void                    SetCharSet( USHORT n );
+    void					SetCharSet( USHORT n );
 
                             SalFontStruct( const SalFontStruct& rFont );
 public:
-                            SalFontStruct( SalDisplay*          pDisp,
-                                           const char*          pFontName,
-                                           SalFontDimension&    rDim );
+                            SalFontStruct( SalDisplay*			pDisp,
+                                           const char*			pFontName,
+                                           SalFontDimension&	rDim );
 
                             ~SalFontStruct();
 
-    inline  void            Cache( SalFontCacheItem *p ) { pCache_ = p; }
-    inline  SalFontCacheItem*IsCache() const { return pCache_; }
-    inline  BOOL            IsScalable() const { return TYPE_SCALABLE==meType; }
-    inline  SalFontDimension*GetDim() const { return pDimensions_; }
-    inline  BOOL            IsValid() const { return mbValidFontDescription; }
+    inline	void			Cache( SalFontCacheItem *p ) { pCache_ = p; }
+    inline	SalFontCacheItem*IsCache() const { return pCache_; }
+    inline	BOOL			IsScalable() const { return TYPE_SCALABLE==meType; }
+    inline	SalFontDimension*GetDim() const { return pDimensions_; }
+    inline  BOOL			IsValid() const { return mbValidFontDescription; }
 #ifdef DBG_UTIL
-            const ByteString&   GetName() const { return aFontName_; }
+            const ByteString&	GetName() const { return aFontName_; }
 #endif
 
             ImplFontData   *GetDevFontData();
diff --git a/vcl/unx/inc/salframe.h b/vcl/unx/inc/salframe.h
index ed173e61fe61..5902dea76f78 100644
--- a/vcl/unx/inc/salframe.h
+++ b/vcl/unx/inc/salframe.h
@@ -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
@@ -43,232 +43,232 @@
 #include <list>
 
 // -=-= forwards -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
-class   SalDisplay;
-class   X11SalGraphics;
+class	SalDisplay;
+class	X11SalGraphics;
 class SalGraphicsLayout;
 class   SalI18N_InputContext;
 
 namespace vcl_sal { class WMAdaptor; class NetWMAdaptor; class GnomeWMAdaptor; }
 
 // -=-= X11SalFrame =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
-#define SHOWSTATE_UNKNOWN       -1
-#define SHOWSTATE_MINIMIZED     0
-#define SHOWSTATE_NORMAL        1
-#define SHOWSTATE_HIDDEN        2
+#define SHOWSTATE_UNKNOWN		-1
+#define SHOWSTATE_MINIMIZED 	0
+#define SHOWSTATE_NORMAL		1
+#define SHOWSTATE_HIDDEN		2
 
 class VCL_DLLPUBLIC X11SalFrame : public SalFrame
 {
     friend class vcl_sal::WMAdaptor;
     friend class vcl_sal::NetWMAdaptor;
     friend class vcl_sal::GnomeWMAdaptor;
-
+    
     static X11SalFrame* s_pSaveYourselfFrame;
-
-    X11SalFrame*    mpParent;            // pointer to parent frame
+                                
+    X11SalFrame*	mpParent;            // pointer to parent frame
                                     // which should never obscur this frame
-    bool            mbTransientForRoot;
+    bool			mbTransientForRoot;
     std::list< X11SalFrame* > maChildren;         // List of child frames
-
-    SalDisplay     *pDisplay_;
+    
+    SalDisplay	   *pDisplay_;
     int             m_nScreen;
-    XLIB_Window     mhWindow;
-    XLIB_Window     mhShellWindow;
-    XLIB_Window     mhForeignParent;
+    XLIB_Window		mhWindow;
+    XLIB_Window		mhShellWindow;
+    XLIB_Window		mhForeignParent;
     // window to fall back to when no longer in fullscreen mode
-    XLIB_Window     mhStackingWindow;
+    XLIB_Window		mhStackingWindow;
     // window to listen for CirculateNotify events
-
+    
     Pixmap          mhBackgroundPixmap;
-
-    XLIB_Cursor     hCursor_;
-    int             nCaptured_;         // is captured
-
-    X11SalGraphics  *pGraphics_;            // current frame graphics
-    X11SalGraphics  *pFreeGraphics_;        // first free frame graphics
-
-    XLIB_Time       nReleaseTime_;      // timestamp of last key release
-    USHORT          nKeyCode_;          // last key code
-    USHORT          nKeyState_;         // last key state
-    int             nCompose_;          // compose state
-    bool            mbKeyMenu;
-    bool            mbSendExtKeyModChange;
-    USHORT          mnExtKeyMod;
-
-    int             nShowState_;        // show state
-    int             nWidth_;            // client width
-    int             nHeight_;           // client height
-    Rectangle       maRestorePosSize;
-    ULONG           nStyle_;
+    
+    XLIB_Cursor		hCursor_;
+    int				nCaptured_;			// is captured
+    
+    X11SalGraphics	*pGraphics_;			// current frame graphics
+    X11SalGraphics	*pFreeGraphics_;		// first free frame graphics
+    
+    XLIB_Time		nReleaseTime_;		// timestamp of last key release
+    USHORT			nKeyCode_;			// last key code
+    USHORT			nKeyState_;			// last key state
+    int				nCompose_;			// compose state
+    bool			mbKeyMenu;
+    bool			mbSendExtKeyModChange;
+    USHORT			mnExtKeyMod;
+    
+    int				nShowState_;		// show state
+    int				nWidth_;			// client width
+    int				nHeight_;			// client height
+    Rectangle		maRestorePosSize;
+    ULONG			nStyle_;
     SalExtStyle     mnExtStyle;
-    BOOL            bAlwaysOnTop_;
-    BOOL            bViewable_;
-    BOOL            bMapped_;
-    BOOL            mbInShow;
-    BOOL            bDefaultPosition_;  // client is centered initially
+    BOOL			bAlwaysOnTop_;
+    BOOL			bViewable_;
+    BOOL			bMapped_;
+    BOOL			mbInShow;
+    BOOL			bDefaultPosition_;	// client is centered initially
     bool            m_bXEmbed;
-    int             nVisibility_;
+    int				nVisibility_;
     int             m_nWorkArea;
     bool            m_bSetFocusOnMap;
 
+    
+    int				nScreenSaversTimeout_;
+    Rectangle		maPaintRegion;
 
-    int             nScreenSaversTimeout_;
-    Rectangle       maPaintRegion;
-
-    Timer           maAlwaysOnTopRaiseTimer;
-
+    Timer			maAlwaysOnTopRaiseTimer;
+    
     // data for WMAdaptor
-    int             meWindowType;
-    int             mnDecorationFlags;
-    bool            mbMaximizedVert;
-    bool            mbMaximizedHorz;
-    bool            mbShaded;
-    bool            mbFullScreen;
-
+    int				meWindowType;
+    int				mnDecorationFlags;
+    bool			mbMaximizedVert;
+    bool			mbMaximizedHorz;
+    bool			mbShaded;
+    bool			mbFullScreen;
+    
     // icon id
-    int             mnIconID;
-
+    int			    mnIconID;
+    
     String          m_aTitle;
-
+    
     SystemChildData maSystemChildData;
-
+    
     SalI18N_InputContext *mpInputContext;
-    Bool            mbInputFocus;
-
+    Bool			mbInputFocus;
+    
     XRectangle*     m_pClipRectangles;
     int             m_nCurClipRect;
     int             m_nMaxClipRect;
-
-
-    void            GetPosSize( Rectangle &rPosSize );
-    void            SetSize   ( const Size      &rSize );
+    
+    
+    void			GetPosSize( Rectangle &rPosSize );
+    void			SetSize   ( const Size      &rSize );
     void            Center();
-    void            SetPosSize( const Rectangle &rPosSize );
-    void            Minimize();
-    void            Maximize();
-    void            Restore();
+    void			SetPosSize( const Rectangle &rPosSize );
+    void			Minimize();
+    void			Maximize();
+    void			Restore();
     void            SetWindowGravity (int nGravity ) const;
-
-    void            RestackChildren( XLIB_Window* pTopLevelWindows, int nTopLevelWindows );
-    void            RestackChildren();
-
-    long            HandleKeyEvent      ( XKeyEvent         *pEvent );
-    long            HandleMouseEvent    ( XEvent            *pEvent );
-    long            HandleFocusEvent    ( XFocusChangeEvent *pEvent );
-    long            HandleExposeEvent   ( XEvent            *pEvent );
-    long            HandleSizeEvent     ( XConfigureEvent   *pEvent );
-    long            HandleColormapEvent ( XColormapEvent    *pEvent );
-    long            HandleMapUnmapEvent ( XEvent            *pEvent );
-    long            HandleStateEvent    ( XPropertyEvent    *pEvent );
-    long            HandleReparentEvent ( XReparentEvent    *pEvent );
-    long            HandleClientMessage ( XClientMessageEvent*pEvent );
-
+    
+    void			RestackChildren( XLIB_Window* pTopLevelWindows, int nTopLevelWindows );
+    void			RestackChildren();
+    
+    long			HandleKeyEvent		( XKeyEvent			*pEvent );
+    long			HandleMouseEvent	( XEvent			*pEvent );
+    long			HandleFocusEvent	( XFocusChangeEvent *pEvent );
+    long			HandleExposeEvent	( XEvent			*pEvent );
+    long			HandleSizeEvent		( XConfigureEvent	*pEvent );
+    long			HandleColormapEvent	( XColormapEvent	*pEvent );
+    long			HandleMapUnmapEvent	( XEvent			*pEvent );
+    long			HandleStateEvent	( XPropertyEvent	*pEvent );
+    long			HandleReparentEvent	( XReparentEvent	*pEvent );
+    long			HandleClientMessage	( XClientMessageEvent*pEvent );
+    
     DECL_LINK( HandleAlwaysOnTopRaise, void* );
 
-    void            passOnSaveYourSelf();
-
+    void			passOnSaveYourSelf();
+    
     void            createNewWindow( XLIB_Window aParent, int nScreen = -1 );
     void            updateScreenNumber();
-
+    
     void            setXEmbedInfo();
     void            askForXEmbedFocus( sal_Int32 i_nTimeCode );
 public:
     X11SalFrame( SalFrame* pParent, ULONG nSalFrameStyle, SystemParentData* pSystemParent = NULL );
     virtual ~X11SalFrame();
 
-    long            Dispatch( XEvent *pEvent );
-    void            Init( ULONG nSalFrameStyle, int nScreen = -1,
+    long			Dispatch( XEvent *pEvent );
+    void			Init( ULONG nSalFrameStyle, int nScreen = -1,
                           SystemParentData* pParentData = NULL, bool bUseGeometry = false );
 
-    SalDisplay*             GetDisplay() const { return pDisplay_; }
-    Display*                GetXDisplay() const;
-    XLIB_Window             GetDrawable() const;
+    SalDisplay*				GetDisplay() const { return pDisplay_; }
+    Display*				GetXDisplay() const;
+    XLIB_Window				GetDrawable() const;
     int                     GetScreenNumber() const { return m_nScreen; }
-    XLIB_Window             GetWindow() const { return mhWindow; }
-    XLIB_Window             GetShellWindow() const { return mhShellWindow; }
-    XLIB_Window             GetForeignParent() const { return mhForeignParent; }
-    XLIB_Window             GetStackingWindow() const { return mhStackingWindow; }
-    long                    ShutDown() const { return CallCallback( SALEVENT_SHUTDOWN, 0 ); }
-    long                    Close() const { return CallCallback( SALEVENT_CLOSE, 0 ); }
+    XLIB_Window				GetWindow() const { return mhWindow; }
+    XLIB_Window				GetShellWindow() const { return mhShellWindow; }
+    XLIB_Window				GetForeignParent() const { return mhForeignParent; }
+    XLIB_Window				GetStackingWindow() const { return mhStackingWindow; }
+    long					ShutDown() const { return CallCallback( SALEVENT_SHUTDOWN, 0 ); }
+    long					Close() const { return CallCallback( SALEVENT_CLOSE, 0 ); }
               ULONG           GetStyle() const { return nStyle_; }
-
-    inline  XLIB_Cursor     GetCursor() const { return hCursor_; }
-    inline  BOOL            IsCaptured() const { return nCaptured_ == 1; }
+    
+    inline	XLIB_Cursor		GetCursor() const { return hCursor_; }
+    inline	BOOL			IsCaptured() const { return nCaptured_ == 1; }
 #if !defined(__synchronous_extinput__)
-    void            HandleExtTextEvent (XClientMessageEvent *pEvent);
-    void            PostExtTextEvent (sal_uInt16 nExtTextEventType,
+    void 			HandleExtTextEvent (XClientMessageEvent *pEvent);
+    void			PostExtTextEvent (sal_uInt16 nExtTextEventType, 
                                       void *pExtTextEvent);
 #endif
-    bool                    IsOverrideRedirect() const;
+    bool					IsOverrideRedirect() const;
     bool                    IsChildWindow() const { return (nStyle_ & (SAL_FRAME_STYLE_PLUG|SAL_FRAME_STYLE_SYSTEMCHILD)) != 0; }
     bool                    IsSysChildWindow() const { return (nStyle_ & (SAL_FRAME_STYLE_SYSTEMCHILD)) != 0; }
-    bool                    IsFloatGrabWindow() const;
+    bool					IsFloatGrabWindow() const;
     SalI18N_InputContext* getInputContext() const { return mpInputContext; }
-    void                    getPosSize( Rectangle& rRect ) { GetPosSize( rRect ); }
-    void                    setPosSize( const Rectangle& rRect ) { SetPosSize( rRect ); }
-    bool                    isMapped() const { return bMapped_; }
+    void			        getPosSize( Rectangle& rRect ) { GetPosSize( rRect ); }
+    void					setPosSize( const Rectangle& rRect ) { SetPosSize( rRect ); }
+    bool					isMapped() const { return bMapped_; }
     bool                    hasFocus() const { return mbInputFocus; }
-
-    virtual SalGraphics*        GetGraphics();
-    virtual void                ReleaseGraphics( SalGraphics* pGraphics );
-
+    
+    virtual SalGraphics*		GetGraphics();
+    virtual void				ReleaseGraphics( SalGraphics* pGraphics );
+    
     // call with true to clear graphics (setting None as drawable)
     // call with false to setup graphics with window (GetWindow())
     virtual void                updateGraphics( bool bClear );
 
-    virtual BOOL                PostEvent( void* pData );
+    virtual BOOL				PostEvent( void* pData );
 
-    virtual void                SetTitle( const XubString& rTitle );
-    virtual void                SetIcon( USHORT nIcon );
-    virtual void                SetMenu( SalMenu* pMenu );
+    virtual void				SetTitle( const XubString& rTitle );
+    virtual void				SetIcon( USHORT nIcon );
+    virtual void				SetMenu( SalMenu* pMenu );
     virtual void                                DrawMenuBar();
 
     virtual void                SetExtendedFrameStyle( SalExtStyle nExtStyle );
-    virtual void                Show( BOOL bVisible, BOOL bNoActivate = FALSE );
-    virtual void                Enable( BOOL bEnable );
+    virtual void				Show( BOOL bVisible, BOOL bNoActivate = FALSE );
+    virtual void				Enable( BOOL bEnable );
     virtual void              SetMinClientSize( long nWidth, long nHeight );
     virtual void              SetMaxClientSize( long nWidth, long nHeight );
-    virtual void                SetPosSize( long nX, long nY, long nWidth, long nHeight, USHORT nFlags );
-    virtual void                GetClientSize( long& rWidth, long& rHeight );
-    virtual void                GetWorkArea( Rectangle& rRect );
-    virtual SalFrame*           GetParent() const;
-    virtual void                SetWindowState( const SalFrameState* pState );
-    virtual BOOL                GetWindowState( SalFrameState* pState );
-    virtual void                ShowFullScreen( BOOL bFullScreen, sal_Int32 nMonitor );
-    virtual void                StartPresentation( BOOL bStart );
-    virtual void                SetAlwaysOnTop( BOOL bOnTop );
-    virtual void                ToTop( USHORT nFlags );
-    virtual void                SetPointer( PointerStyle ePointerStyle );
-    virtual void                CaptureMouse( BOOL bMouse );
-    virtual void                SetPointerPos( long nX, long nY );
+    virtual void				SetPosSize( long nX, long nY, long nWidth, long nHeight, USHORT nFlags );
+    virtual void				GetClientSize( long& rWidth, long& rHeight );
+    virtual void				GetWorkArea( Rectangle& rRect );
+    virtual SalFrame*			GetParent() const;
+    virtual void				SetWindowState( const SalFrameState* pState );
+    virtual BOOL				GetWindowState( SalFrameState* pState );
+    virtual void				ShowFullScreen( BOOL bFullScreen, sal_Int32 nMonitor );
+    virtual void				StartPresentation( BOOL bStart );
+    virtual void				SetAlwaysOnTop( BOOL bOnTop );
+    virtual void				ToTop( USHORT nFlags );
+    virtual void				SetPointer( PointerStyle ePointerStyle );
+    virtual void				CaptureMouse( BOOL bMouse );
+    virtual void				SetPointerPos( long nX, long nY );
     using SalFrame::Flush;
-    virtual void                Flush();
-    virtual void                Sync();
-    virtual void                SetInputContext( SalInputContext* pContext );
-    virtual void                EndExtTextInput( USHORT nFlags );
-    virtual String              GetKeyName( USHORT nKeyCode );
-    virtual String              GetSymbolKeyName( const XubString& rFontName, USHORT nKeyCode );
+    virtual void				Flush();
+    virtual void				Sync();
+    virtual void				SetInputContext( SalInputContext* pContext );
+    virtual void				EndExtTextInput( USHORT nFlags );
+    virtual String				GetKeyName( USHORT nKeyCode );
+    virtual String				GetSymbolKeyName( const XubString& rFontName, USHORT nKeyCode );
     virtual BOOL                MapUnicodeToKeyCode( sal_Unicode aUnicode, LanguageType aLangType, KeyCode& rKeyCode );
-    virtual LanguageType        GetInputLanguage();
-    virtual SalBitmap*          SnapShot();
-    virtual void                UpdateSettings( AllSettings& rSettings );
-    virtual void                Beep( SoundType eSoundType );
-    virtual const SystemEnvData*    GetSystemData() const;
+    virtual LanguageType		GetInputLanguage();
+    virtual SalBitmap*			SnapShot();
+    virtual void				UpdateSettings( AllSettings& rSettings );
+    virtual void				Beep( SoundType eSoundType );
+    virtual const SystemEnvData*	GetSystemData() const;
     virtual SalPointerState     GetPointerState();
-    virtual void                SetParent( SalFrame* pNewParent );
-    virtual bool                SetPluginParent( SystemParentData* pNewParent );
+    virtual void				SetParent( SalFrame* pNewParent );
+    virtual bool				SetPluginParent( SystemParentData* pNewParent );
     virtual void                SetBackgroundBitmap( SalBitmap* pBitmap );
 
     virtual void                SetScreenNumber( unsigned int );
-
+    
     // shaped system windows
     // set clip region to none (-> rectangular windows, normal state)
-    virtual void                    ResetClipRegion();
+    virtual void					ResetClipRegion();
     // start setting the clipregion consisting of nRects rectangles
-    virtual void                    BeginSetClipRegion( ULONG nRects );
+    virtual void					BeginSetClipRegion( ULONG nRects );
     // add a rectangle to the clip region
-    virtual void                    UnionClipRegion( long nX, long nY, long nWidth, long nHeight );
+    virtual void					UnionClipRegion( long nX, long nY, long nWidth, long nHeight );
     // done setting up the clipregion
-    virtual void                    EndSetClipRegion();
+    virtual void					EndSetClipRegion();
 
     static void SaveYourselfDone( SalFrame* );
     static Bool checkKeyReleaseForRepeat( Display*, XEvent*, XPointer pX11SalFrame );
diff --git a/vcl/unx/inc/salgdi.h b/vcl/unx/inc/salgdi.h
index 42d9c5592317..2d2911f069ae 100644
--- a/vcl/unx/inc/salgdi.h
+++ b/vcl/unx/inc/salgdi.h
@@ -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
@@ -81,8 +81,8 @@ class VCL_DLLPUBLIC X11SalGraphics : public SalGraphics
     friend class            X11FontLayout;
     friend class            ServerFontLayout;
 protected:
-    SalFrame*               m_pFrame; // the SalFrame which created this Graphics or NULL
-    X11SalVirtualDevice*    m_pVDev;  // the SalVirtualDevice which created this Graphics or NULL
+    SalFrame*				m_pFrame; // the SalFrame which created this Graphics or NULL
+    X11SalVirtualDevice*	m_pVDev;  // the SalVirtualDevice which created this Graphics or NULL
 
     const SalColormap*      m_pColormap;
     SalColormap    *m_pDeleteColormap;
@@ -114,64 +114,64 @@ protected:
     Pixel           nBrushPixel_;
     Pixmap          hBrush_;        // Dither
 
-    GC              pMonoGC_;
-    GC              pCopyGC_;
-    GC              pMaskGC_;
-    GC              pInvertGC_;
-    GC              pInvert50GC_;
-    GC              pStippleGC_;
-    GC              pTrackingGC_;
-
-    BOOL            bWindow_ : 1;       // is Window
-    BOOL            bPrinter_ : 1;      // is Printer
-    BOOL            bVirDev_ : 1;       // is VirDev
-    BOOL            bPenGC_ : 1;        // is Pen GC valid
-    BOOL            bFontGC_ : 1;       // is Font GC valid
-    BOOL            bBrushGC_ : 1;      // is Brush GC valid
-    BOOL            bMonoGC_ : 1;       // is Mono GC valid
-    BOOL            bCopyGC_ : 1;       // is Copy GC valid
-    BOOL            bInvertGC_ : 1;     // is Invert GC valid
-    BOOL            bInvert50GC_ : 1;   // is Invert50 GC valid
-    BOOL            bStippleGC_ : 1;    // is Stipple GC valid
+    GC				pMonoGC_;
+    GC				pCopyGC_;
+    GC				pMaskGC_;
+    GC				pInvertGC_;
+    GC				pInvert50GC_;
+    GC				pStippleGC_;
+    GC				pTrackingGC_;
+
+    BOOL			bWindow_ : 1;		// is Window
+    BOOL			bPrinter_ : 1;		// is Printer
+    BOOL			bVirDev_ : 1;		// is VirDev
+    BOOL			bPenGC_ : 1;		// is Pen GC valid
+    BOOL			bFontGC_ : 1;		// is Font GC valid
+    BOOL			bBrushGC_ : 1;		// is Brush GC valid
+    BOOL			bMonoGC_ : 1;		// is Mono GC valid
+    BOOL			bCopyGC_ : 1;		// is Copy GC valid
+    BOOL			bInvertGC_ : 1;		// is Invert GC valid
+    BOOL			bInvert50GC_ : 1;	// is Invert50 GC valid
+    BOOL			bStippleGC_ : 1;	// is Stipple GC valid
     BOOL            bTrackingGC_ : 1;   // is Tracking GC valid
-    bool            bXORMode_ : 1;      // is ROP XOR Mode set
-    BOOL            bDitherBrush_ : 1;  // is solid or tile
+    bool			bXORMode_ : 1;		// is ROP XOR Mode set
+    BOOL			bDitherBrush_ : 1;	// is solid or tile
 
-    void            SetClipRegion( GC          pGC,
+    void			SetClipRegion( GC          pGC,
                                    XLIB_Region pXReg = NULL ) const;
 
-    GC              GetTrackingGC();
-    GC              GetInvertGC();
-    GC              GetInvert50GC();
-    GC              CreateGC( Drawable      hDrawable,
+    GC				GetTrackingGC();
+    GC				GetInvertGC();
+    GC				GetInvert50GC();
+    GC				CreateGC( Drawable      hDrawable,
                               unsigned long nMask = GCGraphicsExposures );
-    GC              SelectPen();
-    GC              SelectBrush();
-    void            DrawLines( ULONG              nPoints,
+    GC				SelectPen();
+    GC				SelectBrush();
+    void			DrawLines( ULONG              nPoints,
                                const SalPolyLine &rPoints,
-                               GC                 pGC,
+                               GC				  pGC,
                                bool bClose
                                );
-    BOOL            GetDitherPixmap ( SalColor nSalColor );
+    BOOL			GetDitherPixmap ( SalColor nSalColor );
 
-    inline  GC              GetMonoGC( Pixmap hPixmap );
-    inline  GC              GetCopyGC();
-    inline  GC              GetStippleGC();
+    inline	GC				GetMonoGC( Pixmap hPixmap );
+    inline	GC				GetCopyGC();
+    inline	GC				GetStippleGC();
 
-    int             Clip      ( XLIB_Region   pRegion,
+    int 			Clip      ( XLIB_Region   pRegion,
                                 int          &nX,
                                 int          &nY,
                                 unsigned int &nDX,
                                 unsigned int &nDY,
                                 int          &nSrcX,
                                 int          &nSrcY ) const;
-    int             Clip      ( int          &nX,
+    int				Clip      ( int          &nX,
                                 int          &nY,
                                 unsigned int &nDX,
                                 unsigned int &nDY,
                                 int          &nSrcX,
                                 int          &nSrcY ) const;
-    GC              SetMask   ( int          &nX,
+    GC				SetMask   ( int          &nX,
                                 int          &nY,
                                 unsigned int &nDX,
                                 unsigned int &nDY,
@@ -203,11 +203,11 @@ protected:
     void                    DrawServerAAFontString( const ServerFontLayout& );
     bool                    DrawServerAAForcedString( const ServerFontLayout& );
     void                    DrawCairoAAFontString( const ServerFontLayout& );
-
+    
     void freeResources();
 public:
                             X11SalGraphics();
-    virtual             ~X11SalGraphics();
+    virtual				~X11SalGraphics();
 
             void            Init( SalFrame *pFrame, Drawable aDrawable, int nScreen );
             void            Init( X11SalVirtualDevice *pVirtualDevice, SalColormap* pColormap = NULL, bool bDeleteColormap = false );
@@ -229,37 +229,37 @@ public:
     int                     GetScreenNumber() const { return m_nScreen; }
 
     // overload all pure virtual methods
-    virtual void            GetResolution( sal_Int32& rDPIX, sal_Int32& rDPIY );
-    virtual USHORT          GetBitCount();
-    virtual long            GetGraphicsWidth() const;
-    virtual long            GetGraphicsHeight() const;
+    virtual void			GetResolution( sal_Int32& rDPIX, sal_Int32& rDPIY );
+    virtual USHORT			GetBitCount();
+    virtual long			GetGraphicsWidth() const;
+    virtual long			GetGraphicsHeight() const;
 
-    virtual void            ResetClipRegion();
-    virtual void            BeginSetClipRegion( ULONG nCount );
-    virtual BOOL            unionClipRegion( long nX, long nY, long nWidth, long nHeight );
-    virtual bool            unionClipRegion( const ::basegfx::B2DPolyPolygon& );
-    virtual void            EndSetClipRegion();
+    virtual void			ResetClipRegion();
+    virtual void			BeginSetClipRegion( ULONG nCount );
+    virtual BOOL			unionClipRegion( long nX, long nY, long nWidth, long nHeight );
+    virtual bool			unionClipRegion( const ::basegfx::B2DPolyPolygon& );
+    virtual void			EndSetClipRegion();
 
-    virtual void            SetLineColor();
-    virtual void            SetLineColor( SalColor nSalColor );
-    virtual void            SetFillColor();
+    virtual void			SetLineColor();
+    virtual void			SetLineColor( SalColor nSalColor );
+    virtual void			SetFillColor();
 
-    virtual void            SetFillColor( SalColor nSalColor );
+    virtual void          	SetFillColor( SalColor nSalColor );
 
-    virtual void            SetXORMode( bool bSet, bool );
+    virtual void			SetXORMode( bool bSet, bool );
 
-    virtual void            SetROPLineColor( SalROPColor nROPColor );
-    virtual void            SetROPFillColor( SalROPColor nROPColor );
+    virtual void			SetROPLineColor( SalROPColor nROPColor );
+    virtual void			SetROPFillColor( SalROPColor nROPColor );
 
-    virtual void            SetTextColor( SalColor nSalColor );
-    virtual USHORT          SetFont( ImplFontSelectData*, int nFallbackLevel );
-    virtual void            GetFontMetric( ImplFontMetricData* );
-    virtual ULONG           GetKernPairs( ULONG nMaxPairs, ImplKernPairData* );
+    virtual void			SetTextColor( SalColor nSalColor );
+    virtual USHORT			SetFont( ImplFontSelectData*, int nFallbackLevel );
+    virtual void			GetFontMetric( ImplFontMetricData* );
+    virtual ULONG			GetKernPairs( ULONG nMaxPairs, ImplKernPairData* );
     virtual ImplFontCharMap* GetImplFontCharMap() const;
-    virtual void            GetDevFontList( ImplDevFontList* );
-    virtual void            GetDevFontSubstList( OutputDevice* );
-    virtual bool            AddTempDevFont( ImplDevFontList*, const String& rFileURL, const String& rFontName );
-    virtual BOOL            CreateFontSubset( const rtl::OUString& rToFile,
+    virtual void			GetDevFontList( ImplDevFontList* );
+    virtual void			GetDevFontSubstList( OutputDevice* );
+    virtual bool			AddTempDevFont( ImplDevFontList*, const String& rFileURL, const String& rFontName );
+    virtual BOOL			CreateFontSubset( const rtl::OUString& rToFile,
                                               const ImplFontData*,
                                               sal_Int32* pGlyphIDs,
                                               sal_uInt8* pEncoding,
@@ -268,80 +268,80 @@ public:
                                               FontSubsetInfo& rInfo
                                               );
     virtual const Ucs2SIntMap* GetFontEncodingVector( const ImplFontData*, const Ucs2OStrMap** ppNonEncoded );
-    virtual const void* GetEmbedFontData( const ImplFontData*,
+    virtual const void*	GetEmbedFontData( const ImplFontData*,
                                           const sal_Ucs* pUnicodes,
                                           sal_Int32* pWidths,
                                           FontSubsetInfo& rInfo,
                                           long* pDataLen );
-    virtual void            FreeEmbedFontData( const void* pData, long nDataLen );
+    virtual void			FreeEmbedFontData( const void* pData, long nDataLen );
     virtual void            GetGlyphWidths( const ImplFontData*,
                                             bool bVertical,
                                             Int32Vector& rWidths,
                                             Ucs2UIntMap& rUnicodeEnc );
-    virtual BOOL            GetGlyphBoundRect( long nIndex, Rectangle& );
-    virtual BOOL            GetGlyphOutline( long nIndex, ::basegfx::B2DPolyPolygon& );
-    virtual SalLayout*      GetTextLayout( ImplLayoutArgs&, int nFallbackLevel );
-    virtual void            DrawServerFontLayout( const ServerFontLayout& );
+    virtual BOOL			GetGlyphBoundRect( long nIndex, Rectangle& );
+    virtual BOOL			GetGlyphOutline( long nIndex, ::basegfx::B2DPolyPolygon& );
+    virtual SalLayout*		GetTextLayout( ImplLayoutArgs&, int nFallbackLevel );
+    virtual void			DrawServerFontLayout( const ServerFontLayout& );
     virtual bool            supportsOperation( OutDevSupportType ) const;
-    virtual void            drawPixel( long nX, long nY );
-    virtual void            drawPixel( long nX, long nY, SalColor nSalColor );
-    virtual void            drawLine( long nX1, long nY1, long nX2, long nY2 );
-    virtual void            drawRect( long nX, long nY, long nWidth, long nHeight );
+    virtual void			drawPixel( long nX, long nY );
+    virtual void			drawPixel( long nX, long nY, SalColor nSalColor );
+    virtual void			drawLine( long nX1, long nY1, long nX2, long nY2 );
+    virtual void			drawRect( long nX, long nY, long nWidth, long nHeight );
     void                    drawPolyLine( ULONG nPoints, const SalPoint* pPtAry, bool bClose );
-    virtual void            drawPolyLine( ULONG nPoints, const SalPoint* pPtAry );
-    virtual void            drawPolygon( ULONG nPoints, const SalPoint* pPtAry );
-    virtual void            drawPolyPolygon( sal_uInt32 nPoly,
+    virtual void			drawPolyLine( ULONG nPoints, const SalPoint* pPtAry );
+    virtual void			drawPolygon( ULONG nPoints, const SalPoint* pPtAry );
+    virtual void			drawPolyPolygon( sal_uInt32 nPoly,
                                              const sal_uInt32* pPoints,
                                              PCONSTSALPOINT* pPtAry );
-    virtual bool            drawPolyPolygon( const ::basegfx::B2DPolyPolygon&, double fTransparency );
-    virtual bool            drawPolyLine( const ::basegfx::B2DPolygon&, double fTransparency, const ::basegfx::B2DVector& rLineWidth, basegfx::B2DLineJoin );
-    virtual bool            drawFilledTrapezoids( const ::basegfx::B2DTrapezoid*, int nTrapCount, double fTransparency );
+    virtual bool			drawPolyPolygon( const ::basegfx::B2DPolyPolygon&, double fTransparency );
+    virtual bool			drawPolyLine( const ::basegfx::B2DPolygon&, double fTransparency, const ::basegfx::B2DVector& rLineWidth, basegfx::B2DLineJoin );
+    virtual bool			drawFilledTrapezoids( const ::basegfx::B2DTrapezoid*, int nTrapCount, double fTransparency );
 
 #if 1 // TODO: remove these obselete methods
-    virtual sal_Bool        drawPolyLineBezier( ULONG nPoints,
+    virtual sal_Bool		drawPolyLineBezier( ULONG nPoints,
                                                 const SalPoint* pPtAry,
                                                 const BYTE* pFlgAry );
-    virtual sal_Bool        drawPolygonBezier( ULONG nPoints,
+    virtual sal_Bool		drawPolygonBezier( ULONG nPoints,
                                                const SalPoint* pPtAry,
                                                const BYTE* pFlgAry );
-    virtual sal_Bool        drawPolyPolygonBezier( sal_uInt32 nPoly,
+    virtual sal_Bool		drawPolyPolygonBezier( sal_uInt32 nPoly,
                                                    const sal_uInt32* pPoints,
                                                    const SalPoint* const* pPtAry,
                                                    const BYTE* const* pFlgAry );
 #endif
 
-    virtual void            copyArea( long nDestX,
+    virtual void			copyArea( long nDestX,
                                       long nDestY,
                                       long nSrcX,
                                       long nSrcY,
                                       long nSrcWidth,
                                       long nSrcHeight,
                                       USHORT nFlags );
-    virtual void            copyBits( const SalTwoRect* pPosAry,
+    virtual void			copyBits( const SalTwoRect* pPosAry,
                                       SalGraphics* pSrcGraphics );
-    virtual void            drawBitmap( const SalTwoRect* pPosAry,
+    virtual void			drawBitmap( const SalTwoRect* pPosAry,
                                         const SalBitmap& rSalBitmap );
-    virtual void            drawBitmap( const SalTwoRect* pPosAry,
+    virtual void			drawBitmap( const SalTwoRect* pPosAry,
                                         const SalBitmap& rSalBitmap,
                                         SalColor nTransparentColor );
-    virtual void            drawBitmap( const SalTwoRect* pPosAry,
+    virtual void			drawBitmap( const SalTwoRect* pPosAry,
                                         const SalBitmap& rSalBitmap,
                                         const SalBitmap& rMaskBitmap );
-    virtual void            drawMask( const SalTwoRect* pPosAry,
+    virtual void			drawMask( const SalTwoRect* pPosAry,
                                       const SalBitmap& rSalBitmap,
                                       SalColor nMaskColor );
-    virtual SalBitmap*      getBitmap( long nX, long nY, long nWidth, long nHeight );
-    virtual SalColor        getPixel( long nX, long nY );
-    virtual void            invert( long nX, long nY, long nWidth, long nHeight, SalInvert nFlags );
-    virtual void            invert( ULONG nPoints, const SalPoint* pPtAry, SalInvert nFlags );
+    virtual SalBitmap*		getBitmap( long nX, long nY, long nWidth, long nHeight );
+    virtual SalColor		getPixel( long nX, long nY );
+    virtual void			invert( long nX, long nY, long nWidth, long nHeight, SalInvert nFlags );
+    virtual void			invert( ULONG nPoints, const SalPoint* pPtAry, SalInvert nFlags );
 
-    virtual BOOL            drawEPS( long nX, long nY, long nWidth, long nHeight, void* pPtr, ULONG nSize );
+    virtual BOOL			drawEPS( long nX, long nY, long nWidth, long nHeight, void* pPtr, ULONG nSize );
 
-    virtual bool            drawAlphaBitmap( const SalTwoRect&,
+    virtual bool 			drawAlphaBitmap( const SalTwoRect&,
                                              const SalBitmap& rSourceBitmap,
                                              const SalBitmap& rAlphaBitmap );
 
-    virtual bool            drawAlphaRect( long nX, long nY, long nWidth,
+    virtual bool		    drawAlphaRect( long nX, long nY, long nWidth, 
                                            long nHeight, sal_uInt8 nTransparency );
 
     virtual SystemGraphicsData GetGraphicsData() const;
@@ -385,20 +385,20 @@ inline Pixel X11SalGraphics::GetPixel( SalColor nSalColor ) const
 // -=-= Shortcuts =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
 
 #ifdef DBG_UTIL
-#define stderr0( s )            fprintf( stderr, s )
-#define stderr1( s, a )         fprintf( stderr, s, a )
-#define stderr2( s, a, b )      fprintf( stderr, s, a, b )
-#define stderr3( s, a, b, c )   fprintf( stderr, s, a, b, c )
-#define stdass0( b )            (void)( !(b) \
+#define stderr0( s )			fprintf( stderr, s )
+#define stderr1( s, a )			fprintf( stderr, s, a )
+#define stderr2( s, a, b )		fprintf( stderr, s, a, b )
+#define stderr3( s, a, b, c )	fprintf( stderr, s, a, b, c )
+#define stdass0( b )			(void)( !(b) \
                                         ? fprintf( stderr, "\"%s\" (%s line %d)\n", \
                                                     #b, __FILE__, __LINE__ ) \
                                         : 0 )
 #else
-#define stderr0( s )            ;
-#define stderr1( s, a )     ;
-#define stderr2( s, a, b )  ;
-#define stderr3( s, a, b, c )   ;
-#define stdass0( b )            ;
+#define stderr0( s )			;
+#define stderr1( s, a )		;
+#define stderr2( s, a, b )	;
+#define stderr3( s, a, b, c )	;
+#define stdass0( b )			;
 #endif
 
 #endif // _SV_SALGDI_H
diff --git a/vcl/unx/inc/salinst.h b/vcl/unx/inc/salinst.h
index d73d67f81425..45846b165016 100644
--- a/vcl/unx/inc/salinst.h
+++ b/vcl/unx/inc/salinst.h
@@ -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
@@ -42,75 +42,75 @@
 class VCL_DLLPUBLIC SalYieldMutex : public NAMESPACE_VOS(OMutex)
 {
 protected:
-    ULONG                                       mnCount;
-    NAMESPACE_VOS(OThread)::TThreadIdentifier   mnThreadId;
+    ULONG										mnCount;
+    NAMESPACE_VOS(OThread)::TThreadIdentifier	mnThreadId;
 
 public:
                                                 SalYieldMutex();
 
-    virtual void                                acquire();
-    virtual void                                release();
-    virtual sal_Bool                            tryToAcquire();
+    virtual void								acquire();
+    virtual void								release();
+    virtual sal_Bool 							tryToAcquire();
 
-    ULONG                                       GetAcquireCount() const { return mnCount; }
-    NAMESPACE_VOS(OThread)::TThreadIdentifier   GetThreadId() const { return mnThreadId; }
+    ULONG										GetAcquireCount() const { return mnCount; }
+    NAMESPACE_VOS(OThread)::TThreadIdentifier	GetThreadId() const { return mnThreadId; }
 };
 
 // -=-= SalInstanceData =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
 class VCL_DLLPUBLIC X11SalInstance : public SalInstance
 {
 protected:
-    SalYieldMutex*                  mpSalYieldMutex;
-    bool                            mbPrinterInit;
+    SalYieldMutex*					mpSalYieldMutex;
+    bool							mbPrinterInit;
 
 public:
-    X11SalInstance( SalYieldMutex* pMutex )
+    X11SalInstance( SalYieldMutex* pMutex ) 
             : mpSalYieldMutex( pMutex ),
               mbPrinterInit( false )
     {}
     virtual ~X11SalInstance();
 
-    virtual SalFrame*       CreateChildFrame( SystemParentData* pParent, ULONG nStyle );
-    virtual SalFrame*       CreateFrame( SalFrame* pParent, ULONG nStyle );
-    virtual void                DestroyFrame( SalFrame* pFrame );
+    virtual SalFrame*      	CreateChildFrame( SystemParentData* pParent, ULONG nStyle );
+    virtual SalFrame*      	CreateFrame( SalFrame* pParent, ULONG nStyle );
+    virtual void				DestroyFrame( SalFrame* pFrame );
 
-    virtual SalObject*          CreateObject( SalFrame* pParent, SystemWindowData* pWindowData, BOOL bShow = TRUE );
-    virtual void                DestroyObject( SalObject* pObject );
+    virtual SalObject*			CreateObject( SalFrame* pParent, SystemWindowData* pWindowData, BOOL bShow = TRUE );
+    virtual void				DestroyObject( SalObject* pObject );
 
-    virtual SalVirtualDevice*   CreateVirtualDevice( SalGraphics* pGraphics,
+    virtual SalVirtualDevice*	CreateVirtualDevice( SalGraphics* pGraphics,
                                                      long nDX, long nDY,
                                                      USHORT nBitCount, const SystemGraphicsData *pData = NULL );
-    virtual void                DestroyVirtualDevice( SalVirtualDevice* pDevice );
+    virtual void				DestroyVirtualDevice( SalVirtualDevice* pDevice );
 
-    virtual SalInfoPrinter* CreateInfoPrinter( SalPrinterQueueInfo* pQueueInfo,
+    virtual SalInfoPrinter*	CreateInfoPrinter( SalPrinterQueueInfo* pQueueInfo,
                                                ImplJobSetup* pSetupData );
-    virtual void                DestroyInfoPrinter( SalInfoPrinter* pPrinter );
-    virtual SalPrinter*     CreatePrinter( SalInfoPrinter* pInfoPrinter );
-    virtual void                DestroyPrinter( SalPrinter* pPrinter );
+    virtual void				DestroyInfoPrinter( SalInfoPrinter* pPrinter );
+    virtual SalPrinter*		CreatePrinter( SalInfoPrinter* pInfoPrinter );
+    virtual void				DestroyPrinter( SalPrinter* pPrinter );
 
-    virtual void                GetPrinterQueueInfo( ImplPrnQueueList* pList );
-    virtual void                GetPrinterQueueState( SalPrinterQueueInfo* pInfo );
-    virtual void                DeletePrinterQueueInfo( SalPrinterQueueInfo* pInfo );
+    virtual void				GetPrinterQueueInfo( ImplPrnQueueList* pList );
+    virtual void				GetPrinterQueueState( SalPrinterQueueInfo* pInfo );
+    virtual void				DeletePrinterQueueInfo( SalPrinterQueueInfo* pInfo );
     virtual String             GetDefaultPrinter();
 
-    virtual SalTimer*           CreateSalTimer();
-    virtual SalI18NImeStatus*   CreateI18NImeStatus();
-    virtual SalSystem*          CreateSalSystem();
-    virtual SalBitmap*          CreateSalBitmap();
-    virtual SalSession*         CreateSalSession();
+    virtual SalTimer*			CreateSalTimer();
+    virtual SalI18NImeStatus*	CreateI18NImeStatus();
+    virtual SalSystem*			CreateSalSystem();
+    virtual SalBitmap*			CreateSalBitmap();
+    virtual SalSession*			CreateSalSession();
 
-    virtual vos::IMutex*        GetYieldMutex();
-    virtual ULONG               ReleaseYieldMutex();
-    virtual void                AcquireYieldMutex( ULONG nCount );
+    virtual vos::IMutex*		GetYieldMutex();
+    virtual ULONG				ReleaseYieldMutex();
+    virtual void				AcquireYieldMutex( ULONG nCount );
 
-    virtual void                Yield( bool bWait, bool bHandleAllCurrentEvents );
-    virtual bool                AnyInput( USHORT nType );
+    virtual void				Yield( bool bWait, bool bHandleAllCurrentEvents );
+    virtual bool				AnyInput( USHORT nType );
     virtual SalMenu*        CreateMenu( BOOL bMenuBar );
     virtual void            DestroyMenu( SalMenu* pMenu);
     virtual SalMenuItem*    CreateMenuItem( const SalItemParams* pItemData );
     virtual void            DestroyMenuItem( SalMenuItem* pItem );
 
-    virtual void*           GetConnectionIdentifier( ConnectionIdentifierType& rReturnedType, int& rReturnedBytes );
+    virtual void*			GetConnectionIdentifier( ConnectionIdentifierType& rReturnedType, int& rReturnedBytes );
     void                    FillFontPathList( std::list< rtl::OString >& o_rFontPaths );
 
     // dtrans implementation
@@ -121,7 +121,7 @@ public:
     virtual void            AddToRecentDocumentList(const rtl::OUString& rFileUrl, const rtl::OUString& rMimeType);
 
 
-    bool isPrinterInit() const
+    bool isPrinterInit() const 
     {
         return mbPrinterInit;
     }
diff --git a/vcl/unx/inc/salmenu.h b/vcl/unx/inc/salmenu.h
index 09a753ff1d98..086e395624ec 100644
--- a/vcl/unx/inc/salmenu.h
+++ b/vcl/unx/inc/salmenu.h
@@ -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
diff --git a/vcl/unx/inc/salobj.h b/vcl/unx/inc/salobj.h
index fa9f1309c8ca..760dead29ce8 100644
--- a/vcl/unx/inc/salobj.h
+++ b/vcl/unx/inc/salobj.h
@@ -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
@@ -41,26 +41,26 @@ public:
                 SalClipRegion();
                ~SalClipRegion();
 
-    void        BeginSetClipRegion( ULONG nRects );
-    void        UnionClipRegion( long nX, long nY, long nWidth, long nHeight );
+    void      	BeginSetClipRegion( ULONG nRects );
+    void      	UnionClipRegion( long nX, long nY, long nWidth, long nHeight );
 
-    XRectangle *EndSetClipRegion()  {
-        return ClipRectangleList;   }
-    void        ResetClipRegion()   {
-        numClipRectangles = 0;      }
-    USHORT      GetClipRegionType() {
-        return nClipRegionType;     }
-    void        SetClipRegionType( USHORT nType ) {
-        nClipRegionType = nType;    }
-    int         GetRectangleCount() {
-        return numClipRectangles;   }
+    XRectangle *EndSetClipRegion()	{
+        return ClipRectangleList; 	}
+    void      	ResetClipRegion() 	{
+        numClipRectangles = 0; 		}
+    USHORT    	GetClipRegionType()	{
+        return nClipRegionType;		}
+    void 		SetClipRegionType( USHORT nType ) { 
+        nClipRegionType = nType;	}
+    int			GetRectangleCount() {
+        return numClipRectangles;	}
 
 private:
 
     XRectangle* ClipRectangleList;
     int         numClipRectangles;
     int         maxClipRectangles;
-    USHORT      nClipRegionType;
+    USHORT		nClipRegionType;
 };
 
 
@@ -69,11 +69,11 @@ class X11SalObject : public SalObject
 public:
     SystemChildData maSystemChildData;
     SalFrame*       mpParent;
-    XLIB_Window     maPrimary;
-    XLIB_Window     maSecondary;
+    XLIB_Window		maPrimary;
+    XLIB_Window		maSecondary;
     Colormap        maColormap;
-    SalClipRegion   maClipRegion;
-    BOOL            mbVisible;
+    SalClipRegion	maClipRegion;
+    BOOL			mbVisible;
 
     static VCL_DLLPUBLIC long Dispatch( XEvent* pEvent );
     static VCL_DLLPUBLIC X11SalObject* CreateObject( SalFrame* pParent, SystemWindowData* pWindowData, BOOL bShow = TRUE );
@@ -82,22 +82,22 @@ public:
     virtual ~X11SalObject();
 
     // overload all pure virtual methods
-     virtual void                   ResetClipRegion();
-    virtual USHORT                  GetClipRegionType();
-    virtual void                    BeginSetClipRegion( ULONG nRects );
-    virtual void                    UnionClipRegion( long nX, long nY, long nWidth, long nHeight );
-    virtual void                    EndSetClipRegion();
-
-    virtual void                    SetPosSize( long nX, long nY, long nWidth, long nHeight );
-    virtual void                    Show( BOOL bVisible );
-    virtual void                    Enable( BOOL nEnable );
-    virtual void                    GrabFocus();
-
-    virtual void                    SetBackground();
-    virtual void                    SetBackground( SalColor nSalColor );
-
-    virtual const SystemEnvData*    GetSystemData() const;
-
+     virtual void					ResetClipRegion();
+    virtual USHORT					GetClipRegionType();
+    virtual void					BeginSetClipRegion( ULONG nRects );
+    virtual void					UnionClipRegion( long nX, long nY, long nWidth, long nHeight );
+    virtual void					EndSetClipRegion();
+
+    virtual void					SetPosSize( long nX, long nY, long nWidth, long nHeight );
+    virtual void					Show( BOOL bVisible );
+    virtual void					Enable( BOOL nEnable );
+    virtual void					GrabFocus();
+
+    virtual void					SetBackground();
+    virtual void					SetBackground( SalColor nSalColor );
+
+    virtual const SystemEnvData*	GetSystemData() const;
+   
 };
 
 #endif // _SV_SALOBJ_H
diff --git a/vcl/unx/inc/salprn.h b/vcl/unx/inc/salprn.h
index fa68f1b38e73..efb280a35106 100644
--- a/vcl/unx/inc/salprn.h
+++ b/vcl/unx/inc/salprn.h
@@ -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
@@ -38,44 +38,44 @@ class PspGraphics;
 class PspSalInfoPrinter : public SalInfoPrinter
 {
 public:
-    PspGraphics*            m_pGraphics;
-    psp::JobData            m_aJobData;
-    psp::PrinterGfx         m_aPrinterGfx;
+    PspGraphics*			m_pGraphics;
+    psp::JobData			m_aJobData;
+    psp::PrinterGfx			m_aPrinterGfx;
 
     PspSalInfoPrinter();
     virtual ~PspSalInfoPrinter();
 
     // overload all pure virtual methods
-    virtual SalGraphics*            GetGraphics();
-    virtual void                    ReleaseGraphics( SalGraphics* pGraphics );
-    virtual BOOL                    Setup( SalFrame* pFrame, ImplJobSetup* pSetupData );
-    virtual BOOL                    SetPrinterData( ImplJobSetup* pSetupData );
-    virtual BOOL                    SetData( ULONG nFlags, ImplJobSetup* pSetupData );
-    virtual void                    GetPageInfo( const ImplJobSetup* pSetupData,
+    virtual SalGraphics*			GetGraphics();
+    virtual void					ReleaseGraphics( SalGraphics* pGraphics );
+    virtual BOOL					Setup( SalFrame* pFrame, ImplJobSetup* pSetupData );
+    virtual BOOL					SetPrinterData( ImplJobSetup* pSetupData );
+    virtual BOOL					SetData( ULONG nFlags, ImplJobSetup* pSetupData );
+    virtual void					GetPageInfo( const ImplJobSetup* pSetupData,
                                                  long& rOutWidth, long& rOutHeight,
                                                  long& rPageOffX, long& rPageOffY,
                                                  long& rPageWidth, long& rPageHeight );
-    virtual ULONG                   GetCapabilities( const ImplJobSetup* pSetupData, USHORT nType );
-    virtual ULONG                   GetPaperBinCount( const ImplJobSetup* pSetupData );
-    virtual String                  GetPaperBinName( const ImplJobSetup* pSetupData, ULONG nPaperBin );
-    virtual void                    InitPaperFormats( const ImplJobSetup* pSetupData );
-    virtual int                 GetLandscapeAngle( const ImplJobSetup* pSetupData );
+    virtual ULONG					GetCapabilities( const ImplJobSetup* pSetupData, USHORT nType );
+    virtual ULONG					GetPaperBinCount( const ImplJobSetup* pSetupData );
+    virtual String					GetPaperBinName( const ImplJobSetup* pSetupData, ULONG nPaperBin );
+    virtual void					InitPaperFormats( const ImplJobSetup* pSetupData );
+    virtual int					GetLandscapeAngle( const ImplJobSetup* pSetupData );
 };
 
 class PspSalPrinter : public SalPrinter
 {
 public:
-    String                  m_aFileName;
-    String                  m_aTmpFile;
-    String                  m_aFaxNr;
-    bool                    m_bFax:1;
-    bool                    m_bPdf:1;
-    bool                    m_bSwallowFaxNo:1;
-    PspGraphics*            m_pGraphics;
-    psp::PrinterJob         m_aPrintJob;
-    psp::JobData            m_aJobData;
-    psp::PrinterGfx         m_aPrinterGfx;
-    ULONG                   m_nCopies;
+    String					m_aFileName;
+    String					m_aTmpFile;
+    String					m_aFaxNr;
+    bool					m_bFax:1;
+    bool					m_bPdf:1;
+    bool					m_bSwallowFaxNo:1;
+    PspGraphics*			m_pGraphics;
+    psp::PrinterJob			m_aPrintJob;
+    psp::JobData			m_aJobData;
+    psp::PrinterGfx			m_aPrinterGfx;
+    ULONG					m_nCopies;
     bool                    m_bCollate;
     SalInfoPrinter*         m_pInfoPrinter;
 
@@ -84,18 +84,18 @@ public:
 
     // overload all pure virtual methods
     using SalPrinter::StartJob;
-    virtual BOOL                    StartJob( const XubString* pFileName,
+    virtual BOOL					StartJob( const XubString* pFileName,
                                               const XubString& rJobName,
                                               const XubString& rAppName,
                                               ULONG nCopies,
                                               bool bCollate,
                                               bool bDirect,
                                               ImplJobSetup* pSetupData );
-    virtual BOOL                    EndJob();
-    virtual BOOL                    AbortJob();
-    virtual SalGraphics*            StartPage( ImplJobSetup* pSetupData, BOOL bNewJobData );
-    virtual BOOL                    EndPage();
-    virtual ULONG                   GetErrorCode();
+    virtual BOOL					EndJob();
+    virtual BOOL					AbortJob();
+    virtual SalGraphics*			StartPage( ImplJobSetup* pSetupData, BOOL bNewJobData );
+    virtual BOOL					EndPage();
+    virtual ULONG					GetErrorCode();
 };
 
 class Timer;
@@ -103,8 +103,8 @@ class Timer;
 namespace vcl_sal {
 class VCL_DLLPUBLIC PrinterUpdate
 {
-    static Timer*           pPrinterUpdateTimer;
-    static int              nActiveJobs;
+    static Timer*			pPrinterUpdateTimer;
+    static int				nActiveJobs;
 
     static void doUpdate();
     DECL_STATIC_LINK( PrinterUpdate, UpdateTimerHdl, void* );
diff --git a/vcl/unx/inc/salstd.hxx b/vcl/unx/inc/salstd.hxx
index cc03b3fb35a4..8db4c9d9ae0e 100644
--- a/vcl/unx/inc/salstd.hxx
+++ b/vcl/unx/inc/salstd.hxx
@@ -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
@@ -36,41 +36,41 @@
 
 // -=-= X-Lib forwards -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
 #ifndef _SVUNX_H
-typedef unsigned long       Pixel;
-typedef unsigned long       XID;
-typedef unsigned long       XLIB_Time;
-typedef unsigned long       XtIntervalId;
+typedef unsigned long		Pixel;
+typedef unsigned long		XID;
+typedef unsigned long		XLIB_Time;
+typedef unsigned long		XtIntervalId;
 
-typedef XID                 Colormap;
-typedef XID                 Drawable;
-typedef XID                 Pixmap;
-typedef XID                 XLIB_Cursor;
-typedef XID                 XLIB_Font;
-typedef XID                 XLIB_Window;
+typedef	XID					Colormap;
+typedef XID					Drawable;
+typedef XID					Pixmap;
+typedef XID					XLIB_Cursor;
+typedef XID					XLIB_Font;
+typedef XID					XLIB_Window;
 
-typedef struct  _XDisplay   Display;
-typedef struct  _XGC       *GC;
-typedef struct  _XImage     XImage;
-typedef struct  _XRegion   *XLIB_Region;
+typedef struct	_XDisplay	Display;
+typedef struct	_XGC	   *GC;
+typedef struct	_XImage		XImage;
+typedef struct	_XRegion   *XLIB_Region;
 
-typedef union   _XEvent     XEvent;
+typedef union	_XEvent		XEvent;
 
-typedef struct  _XConfigureEvent    XConfigureEvent;
-typedef struct  _XReparentEvent     XReparentEvent;
-typedef struct  _XClientMessageEvent        XClientMessageEvent;
-typedef struct  _XErrorEvent        XErrorEvent;
+typedef struct 	_XConfigureEvent	XConfigureEvent;
+typedef struct 	_XReparentEvent		XReparentEvent;
+typedef struct 	_XClientMessageEvent		XClientMessageEvent;
+typedef struct 	_XErrorEvent		XErrorEvent;
 
-struct  Screen;
-struct  Visual;
-struct  XColormapEvent;
-struct  XFocusChangeEvent;
-struct  XFontStruct;
-struct  XKeyEvent;
-struct  XPropertyEvent;
-struct  XTextItem;
-struct  XWindowChanges;
+struct	Screen;
+struct	Visual;
+struct	XColormapEvent;
+struct	XFocusChangeEvent;
+struct	XFontStruct;
+struct	XKeyEvent;
+struct	XPropertyEvent;
+struct	XTextItem;
+struct	XWindowChanges;
 
-#define None    0L
+#define None	0L
 #endif
 
 #endif
diff --git a/vcl/unx/inc/salsys.h b/vcl/unx/inc/salsys.h
index 1da7cae8564a..22c1275a6aad 100644
--- a/vcl/unx/inc/salsys.h
+++ b/vcl/unx/inc/salsys.h
@@ -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
@@ -46,7 +46,7 @@ class VCL_DLLPUBLIC X11SalSystem : public SalSystem
 public:
     X11SalSystem() {}
     virtual ~X11SalSystem();
-
+    
     // overload pure virtual methods
     virtual unsigned int GetDisplayScreenCount();
     virtual bool IsMultiDisplay();
diff --git a/vcl/unx/inc/saltimer.h b/vcl/unx/inc/saltimer.h
index 132107d705f8..6a8a0e6cc74d 100644
--- a/vcl/unx/inc/saltimer.h
+++ b/vcl/unx/inc/saltimer.h
@@ -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
@@ -37,8 +37,8 @@ public:
     virtual ~X11SalTimer();
 
     // overload all pure virtual methods
-    void            Start( ULONG nMS );
-    void            Stop();
+    void 			Start( ULONG nMS );
+    void 			Stop();
 };
 
 #endif
diff --git a/vcl/unx/inc/salunx.h b/vcl/unx/inc/salunx.h
index ef53273b60b4..beb08f653031 100644
--- a/vcl/unx/inc/salunx.h
+++ b/vcl/unx/inc/salunx.h
@@ -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
@@ -40,7 +40,7 @@
 #include <salstd.hxx>
 
 // -=-= #defines -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
-#define capacityof(a)   (sizeof(a)/sizeof(*a))
+#define capacityof(a)	(sizeof(a)/sizeof(*a))
 
 // -=-= inlines =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
 inline long Divide( long nDividend, long nDivisor )
diff --git a/vcl/unx/inc/salvd.h b/vcl/unx/inc/salvd.h
index 3d8c681c4e22..aef096c3ab25 100644
--- a/vcl/unx/inc/salvd.h
+++ b/vcl/unx/inc/salvd.h
@@ -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
@@ -39,46 +39,46 @@ class X11SalGraphics;
 // -=-= SalVirDevData -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
 class X11SalVirtualDevice : public SalVirtualDevice
 {
-    SalDisplay      *pDisplay_;
-    X11SalGraphics  *pGraphics_;
-
-
-    Pixmap          hDrawable_;
+    SalDisplay		*pDisplay_;
+    X11SalGraphics	*pGraphics_;
+    
+    
+    Pixmap			hDrawable_;
     int             m_nScreen;
-
-    int             nDX_;
-    int             nDY_;
-    USHORT          nDepth_;
-    BOOL            bGraphics_;         // is Graphics used
+    
+    int				nDX_;
+    int				nDY_;
+    USHORT			nDepth_;
+    BOOL			bGraphics_;			// is Graphics used
     BOOL            bExternPixmap_;
-
+    
 public:
     X11SalVirtualDevice();
     virtual ~X11SalVirtualDevice();
 
-    BOOL            Init( SalDisplay *pDisplay,
+    BOOL			Init( SalDisplay *pDisplay,
                           long nDX, long nDY,
                           USHORT nBitCount,
                           int nScreen,
                           Pixmap hDrawable = None,
                           void* pRenderFormat = NULL );
-    inline  void            InitGraphics( X11SalVirtualDevice *pVD );
-
-    inline  Display        *GetXDisplay() const;
-    inline  SalDisplay     *GetDisplay() const;
-    inline  BOOL            IsDisplay() const;
-    inline  Pixmap          GetDrawable() const { return hDrawable_; }
-    inline  USHORT          GetDepth() const { return nDepth_; }
-    int                     GetWidth() const { return nDX_; }
-    int                     GetHeight() const { return nDY_; }
+    inline	void			InitGraphics( X11SalVirtualDevice *pVD );
+
+    inline	Display		   *GetXDisplay() const;
+    inline	SalDisplay	   *GetDisplay() const;
+    inline	BOOL			IsDisplay() const;
+    inline	Pixmap			GetDrawable() const { return hDrawable_; }
+    inline	USHORT			GetDepth() const { return nDepth_; }
+    int						GetWidth() const { return nDX_; }
+    int						GetHeight() const { return nDY_; }
     int                     GetScreenNumber() const { return m_nScreen; }
 
-    virtual SalGraphics*    GetGraphics();
-    virtual void            ReleaseGraphics( SalGraphics* pGraphics );
+    virtual SalGraphics*	GetGraphics();
+    virtual void			ReleaseGraphics( SalGraphics* pGraphics );
 
                             // Set new size, without saving the old contents
-    virtual BOOL            SetSize( long nNewDX, long nNewDY );
-    virtual void            GetSize( long& rWidth, long& rHeight );
+    virtual BOOL			SetSize( long nNewDX, long nNewDY );
+    virtual void			GetSize( long& rWidth, long& rHeight );
 };
 
 #ifdef _SV_SALDISP_HXX
diff --git a/vcl/unx/inc/sm.hxx b/vcl/unx/inc/sm.hxx
index b4339bb8567e..8e4bc3f710e8 100644
--- a/vcl/unx/inc/sm.hxx
+++ b/vcl/unx/inc/sm.hxx
@@ -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
@@ -34,23 +34,23 @@
 
 class SessionManagerClient
 {
-    static SmcConn          aSmcConnection;
-    static ByteString       aClientID;
-    static bool         bDocSaveDone;
+    static SmcConn			aSmcConnection;
+    static ByteString		aClientID;
+    static bool			bDocSaveDone;
 
-    static void SaveYourselfProc(       SmcConn connection,
+    static void SaveYourselfProc(		SmcConn connection,
                                         SmPointer client_data,
                                         int save_type,
                                         Bool shutdown,
                                         int interact_style,
                                         Bool fast );
-    static void DieProc(                SmcConn connection,
+    static void DieProc(				SmcConn connection,
                                         SmPointer client_data );
-    static void SaveCompleteProc(       SmcConn connection,
+    static void SaveCompleteProc(		SmcConn connection,
                                         SmPointer client_data );
-    static void ShutdownCanceledProc(   SmcConn connection,
+    static void ShutdownCanceledProc(	SmcConn connection,
                                         SmPointer client_data );
-    static void InteractProc(           SmcConn connection,
+    static void InteractProc(			SmcConn connection,
                                         SmPointer clientData );
 
     static const ByteString& getPreviousSessionID();
@@ -79,7 +79,7 @@ class IceSalSession : public SalSession
 public:
     IceSalSession();
     virtual ~IceSalSession();
-
+    
     virtual void queryInteraction();
     virtual void interactionDone();
     virtual void saveDone();
diff --git a/vcl/unx/inc/soicon.hxx b/vcl/unx/inc/soicon.hxx
index 419f9b2cc54a..21d884a37f4d 100644
--- a/vcl/unx/inc/soicon.hxx
+++ b/vcl/unx/inc/soicon.hxx
@@ -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
@@ -32,6 +32,6 @@ class SalBitmap;
 class Bitmap;
 
 BOOL SelectAppIconPixmap( SalDisplay *pDisplay, int nScreen,
-                          USHORT nIcon, USHORT iconSize,
+                          USHORT nIcon, USHORT iconSize, 
                           Pixmap& icon_pixmap, Pixmap& icon_mask );
 #endif
diff --git a/vcl/unx/inc/strhelper.hxx b/vcl/unx/inc/strhelper.hxx
index cd0220b77e05..712c30520c55 100644
--- a/vcl/unx/inc/strhelper.hxx
+++ b/vcl/unx/inc/strhelper.hxx
@@ -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
diff --git a/vcl/unx/inc/svsys.h b/vcl/unx/inc/svsys.h
index d4077d0998e9..50feade8ad9d 100644
--- a/vcl/unx/inc/svsys.h
+++ b/vcl/unx/inc/svsys.h
@@ -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
diff --git a/vcl/unx/inc/svunx.h b/vcl/unx/inc/svunx.h
index e7d6150b79f4..87498ec408a4 100644
--- a/vcl/unx/inc/svunx.h
+++ b/vcl/unx/inc/svunx.h
@@ -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
diff --git a/vcl/unx/inc/wmadaptor.hxx b/vcl/unx/inc/wmadaptor.hxx
index cbedede2cc99..18c96ae55012 100644
--- a/vcl/unx/inc/wmadaptor.hxx
+++ b/vcl/unx/inc/wmadaptor.hxx
@@ -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
@@ -100,7 +100,7 @@ public:
         WIN_ICONS,
         WIN_WORKSPACE_NAMES,
         WIN_CLIENT_LIST,
-
+        
         // atoms for general WM hints
         WM_STATE,
         MOTIF_WM_HINTS,
@@ -129,13 +129,13 @@ public:
     /*
      *  flags for frame decoration
      */
-    static const int decoration_Title           = 0x00000001;
-    static const int decoration_Border      = 0x00000002;
-    static const int decoration_Resize      = 0x00000004;
-    static const int decoration_MinimizeBtn = 0x00000008;
-    static const int decoration_MaximizeBtn = 0x00000010;
-    static const int decoration_CloseBtn        = 0x00000020;
-    static const int decoration_All         = 0x10000000;
+    static const int decoration_Title			= 0x00000001;
+    static const int decoration_Border		= 0x00000002;
+    static const int decoration_Resize		= 0x00000004;
+    static const int decoration_MinimizeBtn	= 0x00000008;
+    static const int decoration_MaximizeBtn	= 0x00000010;
+    static const int decoration_CloseBtn		= 0x00000020;
+    static const int decoration_All			= 0x10000000;
 
     /*
      *  window type
@@ -152,19 +152,19 @@ public:
     };
 
 protected:
-    SalDisplay*             m_pSalDisplay;      // Display to use
-    Display*                m_pDisplay;         // X Display of SalDisplay
-    String                  m_aWMName;
-    Atom                    m_aWMAtoms[ NetAtomMax];
-    int                     m_nDesktops;
-    bool                    m_bEqualWorkAreas;
+    SalDisplay*				m_pSalDisplay;		// Display to use
+    Display*				m_pDisplay;			// X Display of SalDisplay
+    String					m_aWMName;
+    Atom					m_aWMAtoms[ NetAtomMax];
+    int						m_nDesktops;
+    bool					m_bEqualWorkAreas;
     ::std::vector< Rectangle >
                             m_aWMWorkAreas;
-    bool                    m_bTransientBehaviour;
-    bool                    m_bEnableAlwaysOnTopWorks;
+    bool					m_bTransientBehaviour;
+    bool					m_bEnableAlwaysOnTopWorks;
     bool                    m_bLegacyPartialFullscreen;
-    int                     m_nWinGravity;
-    int                     m_nInitWinGravity;
+    int						m_nWinGravity;
+    int						m_nInitWinGravity;
 
     WMAdaptor( SalDisplay * )
 ;
@@ -211,17 +211,17 @@ public:
      */
     const Rectangle& getWorkArea( int n ) const
     { return m_aWMWorkAreas[n]; }
-
+    
     /*
      * attemp to switch the desktop to a certain workarea
      */
     void switchToWorkArea( int nWorkArea ) const;
-
+    
     /*
      *  sets window title
      */
     virtual void setWMName( X11SalFrame* pFrame, const String& rWMName ) const;
-
+    
     /*
      * set NET_WM_PID
      */
@@ -231,7 +231,7 @@ public:
      * set WM_CLIENT_MACHINE
      */
     virtual void setClientMachine( X11SalFrame* pFrame ) const;
-
+    
     virtual void answerPing( X11SalFrame*, XClientMessageEvent* ) const;
 
     /*
@@ -267,7 +267,7 @@ public:
      * set _NET_WM_USER_TIME property, if NetWM
      */
     virtual void setUserTime( X11SalFrame* i_pFrame, long i_nUserTime ) const;
-
+    
     /*
      *  tells whether fullscreen mode is supported by WM
      */
@@ -303,12 +303,12 @@ public:
      *  tells whether enableAlwaysOnTop actually works with this WM
      */
     bool isAlwaysOnTopOK() const { return m_bEnableAlwaysOnTopWorks; }
-
+    
     /*
      *  handle WM messages (especially WM state changes)
      */
     virtual int handlePropertyNotify( X11SalFrame* pFrame, XPropertyEvent* pEvent ) const;
-
+    
     /*
      * called by SalFrame::Show: time to update state properties
      */
@@ -342,7 +342,7 @@ public:
      *  changes the transient hint of a window to reference frame
      *  if reference frame is NULL the root window is used instead
      */
-    void changeReferenceFrame( X11SalFrame* pFrame, X11SalFrame* pReferenceFrame ) const;
+    void changeReferenceFrame( X11SalFrame* pFrame, X11SalFrame* pReferenceFrame ) const;    
 };
 
 } // namespace
diff --git a/vcl/unx/inc/xfont.hxx b/vcl/unx/inc/xfont.hxx
index 4041ed7ce67d..0b60b90e1355 100644
--- a/vcl/unx/inc/xfont.hxx
+++ b/vcl/unx/inc/xfont.hxx
@@ -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
@@ -44,14 +44,14 @@ class ExtendedXlfd;
 
 struct VerticalTextItem
 {
-    BOOL                mbFixed;
-    XFontStruct*        mpXFontStruct;
-    const sal_Unicode*  mpString;
-    int                 mnLength;
-    int                 mnTransX;
-    int                 mnTransY;
-    int                 mnFixedAdvance;
-    int*                mpAdvanceAry;
+    BOOL				mbFixed;
+    XFontStruct*		mpXFontStruct;
+    const sal_Unicode* 	mpString;
+    int					mnLength;
+    int					mnTransX;
+    int					mnTransY;
+    int					mnFixedAdvance;
+    int*				mpAdvanceAry;
 
     VerticalTextItem( XFontStruct* pXFontStruct,
                         const sal_Unicode* pString,
@@ -111,38 +111,38 @@ class ExtendedFontStruct : public SvRefBase
         mutable sal_uInt32* mpRangeCodes;
         mutable int         mnRangeCount;
 
-        int                 LoadEncoding( rtl_TextEncoding nEncoding );
-        FontPitch           GetSpacing( rtl_TextEncoding nEncoding );
-        bool                GetFontBoundingBox( XCharStruct *pCharStruct,
+        int					LoadEncoding( rtl_TextEncoding nEncoding );
+        FontPitch			GetSpacing( rtl_TextEncoding nEncoding );
+        bool				GetFontBoundingBox( XCharStruct *pCharStruct, 
                                     int *pAscent, int *pDescent ) ;
 
-        sal_Size            GetDefaultWidth();
-        sal_Size            GetCharWidth8( sal_Unicode nFrom, sal_Unicode nTo,
-                                    sal_Int32 *pWidthArray,
+        sal_Size			GetDefaultWidth();
+        sal_Size 			GetCharWidth8( sal_Unicode nFrom, sal_Unicode nTo, 
+                                    sal_Int32 *pWidthArray, 
                                     rtl_TextEncoding nEncoding );
-        sal_Size            GetCharWidthUTF16( sal_Unicode nFrom, sal_Unicode nTo,
+        sal_Size 			GetCharWidthUTF16( sal_Unicode nFrom, sal_Unicode nTo, 
                                     sal_Int32 *pWidthArray );
-        sal_Size            GetCharWidth16( sal_Unicode nFrom, sal_Unicode nTo,
+        sal_Size 			GetCharWidth16( sal_Unicode nFrom, sal_Unicode nTo, 
                                     sal_Int32 *pWidthArray, ExtendedFontStruct *pFallback );
     public:
-                            ExtendedFontStruct( Display* pDisplay,
+                            ExtendedFontStruct( Display* pDisplay, 
                                     const Size& rPixelSize, sal_Bool bVertical,
                                     ExtendedXlfd* pXlfd );
                             ~ExtendedFontStruct();
-        bool                Match( const ExtendedXlfd *pXlfd,
+        bool 				Match( const ExtendedXlfd *pXlfd, 
                                     const Size& rPixelSize, sal_Bool bVertical ) const;
-        XFontStruct*        GetFontStruct( rtl_TextEncoding nEncoding );
-        XFontStruct*        GetFontStruct( sal_Unicode nChar,
+        XFontStruct* 		GetFontStruct( rtl_TextEncoding nEncoding );
+        XFontStruct* 		GetFontStruct( sal_Unicode nChar, 
                                     rtl_TextEncoding *pEncoding );
-        bool                ToImplFontMetricData( ImplFontMetricData *pMetric );
-        rtl_TextEncoding    GetAsciiEncoding( int *pAsciiRange = NULL ) const;
-        sal_Size            GetCharWidth( sal_Unicode,
+        bool				ToImplFontMetricData( ImplFontMetricData *pMetric );
+        rtl_TextEncoding	GetAsciiEncoding( int *pAsciiRange = NULL ) const;
+        sal_Size			GetCharWidth( sal_Unicode, 
                                     sal_Int32* pPhysWidth, sal_Int32* pLogWidth );
         int                 GetFontCodeRanges( sal_uInt32* pCodePairs ) const;
         bool                HasUnicodeChar( sal_Unicode ) const;
 };
 
-// Declaration and Implementation for ExtendedFontStructRef: Add RefCounting
+// Declaration and Implementation for ExtendedFontStructRef: Add RefCounting 
 // to ExtendedFontStruct (it's not possible to separate decl and impl into
 // a separate source file: all ref member functions are inline
 SV_DECL_IMPL_REF( ExtendedFontStruct );
diff --git a/vcl/unx/kde/kdedata.cxx b/vcl/unx/kde/kdedata.cxx
index 34b0ff652cde..56b1975e322e 100644
--- a/vcl/unx/kde/kdedata.cxx
+++ b/vcl/unx/kde/kdedata.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
@@ -65,7 +65,7 @@ class VCLKDEApplication : public KApplication
 {
     public:
     VCLKDEApplication() : KApplication() {}
-
+    
     virtual void commitData(QSessionManager &sm);
 };
 
@@ -143,7 +143,7 @@ void KDEXLib::Init()
     rtl::OString aDisplay;
     rtl::OUString aParam, aBin;
 
-    for ( nIdx = 0; nIdx < nParams; ++nIdx )
+    for ( nIdx = 0; nIdx < nParams; ++nIdx ) 
     {
         aCommandLine.getCommandArg( nIdx, aParam );
         if ( !m_pFreeCmdLineArgs && aParam.equalsAscii( "-display" ) && nIdx + 1 < nParams )
@@ -177,7 +177,7 @@ void KDEXLib::Init()
     KApplication::disableAutoDcopRegistration();
     m_pApplication = new VCLKDEApplication();
     kapp->disableSessionManagement();
-
+    
     Display* pDisp = QPaintDevice::x11AppDisplay();
 
     SalDisplay *pSalDisplay = new SalKDEDisplay( pDisp );
@@ -256,7 +256,7 @@ extern "C" {
 #endif
             return NULL;
         }
-
+        
         KDESalInstance* pInstance = new KDESalInstance( new SalYieldMutex() );
 #if OSL_DEBUG_LEVEL > 1
         fprintf( stderr, "created KDESalInstance 0x%p\n", pInstance );
diff --git a/vcl/unx/kde/salnativewidgets-kde.cxx b/vcl/unx/kde/salnativewidgets-kde.cxx
index 29d79f88ffb3..a9c3f6905b94 100644
--- a/vcl/unx/kde/salnativewidgets-kde.cxx
+++ b/vcl/unx/kde/salnativewidgets-kde.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
@@ -52,7 +52,7 @@
 using namespace ::rtl;
 
 /** Cached native widgets.
-
+ 
     A class which caches and paints the native widgets.
 */
 class WidgetPainter
@@ -194,7 +194,7 @@ class WidgetPainter
     /** Identifiers of popup menu items.
      */
     int           m_nPopupMenuEnabledItem, m_nPopupMenuDisabledItem;
-
+    
     /** cached progress bar
       */
     QProgressBar *m_pProgressBar;
@@ -338,9 +338,9 @@ class WidgetPainter
       @see pushButton()
     */
     QPopupMenu   *popupMenu( const Rectangle& rControlRegion );
-
+    
     /** 'Get' method for progress bar
-
+    
       @see pushButton()
     */
     QProgressBar *progressBar( const Rectangle& rControlRegion );
@@ -452,13 +452,13 @@ BOOL WidgetPainter::drawStyledWidget( QWidget *pWidget,
 
     // Use the background of the widget
     qPixmap.fill( pWidget, QPoint(0, 0) );
-
+    
     // Convert the flags
     QStyle::SFlags nStyle = vclStateValue2SFlags( nState, aValue );
-
+    
     // Store the widget class
     const char *pClassName = pWidget->className();
-
+    
     // Draw the widget to the pixmap
     if ( strcmp( "QPushButton", pClassName ) == 0 )
     {
@@ -471,7 +471,7 @@ BOOL WidgetPainter::drawStyledWidget( QWidget *pWidget,
         pPushButton->setOn     ( nStyle & QStyle::Style_On );
         pPushButton->setEnabled( nStyle & QStyle::Style_Enabled );
     }
-
+    
     kapp->style().drawControl( QStyle::CE_PushButton,
         &qPainter, pWidget, qRect,
         pWidget->colorGroup(), nStyle );
@@ -504,15 +504,15 @@ BOOL WidgetPainter::drawStyledWidget( QWidget *pWidget,
     kapp->style().drawComplexControl( QStyle::CC_ComboBox,
         &qPainter, pWidget, qRect,
         pWidget->colorGroup(), nStyle );
-
+    
     // Editable combo box uses the background of the associated edit box
     QComboBox *pComboBox = static_cast<QComboBox *>( pWidget->qt_cast( "QComboBox" ) );
     if ( pComboBox && pComboBox->editable() && pComboBox->lineEdit() )
     {
         QColorGroup::ColorRole eColorRole = ( pComboBox->isEnabled() )?
         QColorGroup::Base: QColorGroup::Background;
-        qPainter.fillRect(
-            kapp->style().querySubControlMetrics( QStyle::CC_ComboBox,
+        qPainter.fillRect( 
+            kapp->style().querySubControlMetrics( QStyle::CC_ComboBox, 
             pComboBox, QStyle::SC_ComboBoxEditField ),
             pComboBox->lineEdit()->colorGroup().brush( eColorRole ) );
     }
@@ -526,7 +526,7 @@ BOOL WidgetPainter::drawStyledWidget( QWidget *pWidget,
     else if ( strcmp( "QSpinWidget", pClassName ) == 0 )
     {
     const SpinbuttonValue *pValue = static_cast<const SpinbuttonValue *> ( &aValue );
-
+    
     // Is any of the buttons pressed?
     QStyle::SCFlags eActive = QStyle::SC_None;
     if ( pValue )
@@ -559,8 +559,8 @@ BOOL WidgetPainter::drawStyledWidget( QWidget *pWidget,
     {
         QColorGroup::ColorRole eColorRole = ( pSpinWidget->isEnabled() )?
         QColorGroup::Base: QColorGroup::Background;
-        qPainter.fillRect(
-            kapp->style().querySubControlMetrics( QStyle::CC_SpinWidget,
+        qPainter.fillRect( 
+            kapp->style().querySubControlMetrics( QStyle::CC_SpinWidget, 
             pSpinWidget, QStyle::SC_SpinWidgetEditField ),
             pSpinWidget->editWidget()->colorGroup().brush( eColorRole ) );
     }
@@ -568,7 +568,7 @@ BOOL WidgetPainter::drawStyledWidget( QWidget *pWidget,
     // Adjust the frame (needed for Motif Plus style)
     QRect qFrameRect = kapp->style().querySubControlMetrics( QStyle::CC_SpinWidget,
         pWidget, QStyle::SC_SpinWidgetFrame );
-
+    
     kapp->style().drawComplexControl( QStyle::CC_SpinWidget,
         &qPainter, pWidget, qFrameRect,
         pWidget->colorGroup(), nStyle,
@@ -577,7 +577,7 @@ BOOL WidgetPainter::drawStyledWidget( QWidget *pWidget,
     else if ( strcmp( "QTabBar", pClassName ) == 0 )
     {
     const TabitemValue *pValue = static_cast<const TabitemValue *> ( &aValue );
-
+    
     QTab *pTab = NULL;
     if ( pValue )
     {
@@ -592,9 +592,9 @@ BOOL WidgetPainter::drawStyledWidget( QWidget *pWidget,
     }
     if ( !pTab )
         return FALSE;
-
+    
     pTab->setRect( qRect );
-
+    
     kapp->style().drawControl( QStyle::CE_TabBarTab,
         &qPainter, pWidget, qRect,
         pWidget->colorGroup(), nStyle,
@@ -664,7 +664,7 @@ BOOL WidgetPainter::drawStyledWidget( QWidget *pWidget,
         else
         pWidget->setEnabled( false );
     }
-
+    
     // Is it a horizontal scroll bar?
     QScrollBar *pScrollBar = static_cast<QScrollBar *> ( pWidget->qt_cast( "QScrollBar" ) );
     QStyle::StyleFlags eHoriz = QStyle::Style_Default;
@@ -692,11 +692,11 @@ BOOL WidgetPainter::drawStyledWidget( QWidget *pWidget,
 
         kapp->style().drawPrimitive( QStyle::PE_PanelDockWindow,
                 &qPainter, qRect, pWidget->colorGroup(), nStyle );
-
+        
         if ( nPart == PART_THUMB_HORZ || nPart == PART_THUMB_VERT )
         {
             const ToolbarValue *pValue = static_cast< const ToolbarValue * >( &aValue );
-
+            
             QRect qThumbRect = region2QRect( pValue->maGripRect );
             qThumbRect.moveBy( -qWidgetPos.x(), -qWidgetPos.y() );
             if ( bIsHorizontal )
@@ -816,7 +816,7 @@ QPushButton *WidgetPainter::pushButton( const Rectangle& rControlRegion,
     m_pPushButton->setDefault( true );
     QSize qDefSize = kapp->style().sizeFromContents( QStyle::CT_PushButton,
         m_pPushButton, qContentsSize );
-
+    
     int nIndicatorSize = kapp->style().pixelMetric(
         QStyle::PM_ButtonDefaultIndicator, m_pPushButton );
     if ( qNormalSize.width() == qDefSize.width() )
@@ -824,7 +824,7 @@ QPushButton *WidgetPainter::pushButton( const Rectangle& rControlRegion,
     if ( qNormalSize.height() == qDefSize.height() )
         qRect.addCoords( 0, nIndicatorSize, 0, -nIndicatorSize );
     }
-
+    
     m_pPushButton->move( qRect.topLeft() );
     m_pPushButton->resize( qRect.size() );
     m_pPushButton->setDefault( bDefault );
@@ -845,19 +845,19 @@ QRadioButton *WidgetPainter::radioButton( const Rectangle& rControlRegion )
     if ( strcmp( "KThemeStyle", pStyleName ) == 0 )
     {
     QRect qOldRect( qRect );
-
+    
     qRect.setWidth( kapp->style().pixelMetric(
         QStyle::PM_ExclusiveIndicatorWidth, m_pRadioButton ) );
     qRect.setHeight( kapp->style().pixelMetric(
         QStyle::PM_ExclusiveIndicatorHeight, m_pRadioButton ) );
-
+    
     qRect.moveBy( ( qOldRect.width() - qRect.width() ) / 2,
         ( qOldRect.height() - qRect.height() ) / 2 );
     }
 
     m_pRadioButton->move( qRect.topLeft() );
     m_pRadioButton->resize( qRect.size() );
-
+    
     return m_pRadioButton;
 }
 
@@ -874,12 +874,12 @@ QCheckBox *WidgetPainter::checkBox( const Rectangle& rControlRegion )
     if ( strcmp( "KThemeStyle", pStyleName ) == 0 )
     {
     QRect qOldRect( qRect );
-
+    
     qRect.setWidth( kapp->style().pixelMetric(
         QStyle::PM_IndicatorWidth, m_pCheckBox ) );
     qRect.setHeight( kapp->style().pixelMetric(
         QStyle::PM_IndicatorHeight, m_pCheckBox ) );
-
+    
     qRect.moveBy( ( qOldRect.width() - qRect.width() ) / 2,
         ( qOldRect.height() - qRect.height() ) / 2 );
     }
@@ -908,7 +908,7 @@ QComboBox *WidgetPainter::comboBox( const Rectangle& rControlRegion,
     }
 
     QRect qRect = region2QRect( rControlRegion );
-
+    
     pComboBox->move( qRect.topLeft() );
     pComboBox->resize( qRect.size() );
 
@@ -921,7 +921,7 @@ QLineEdit *WidgetPainter::lineEdit( const Rectangle& rControlRegion )
     m_pLineEdit = new QLineEdit( NULL, "line_edit" );
 
     QRect qRect = region2QRect( rControlRegion );
-
+    
     m_pLineEdit->move( qRect.topLeft() );
     m_pLineEdit->resize( qRect.size() );
 
@@ -933,13 +933,13 @@ QSpinWidget *WidgetPainter::spinWidget( const Rectangle& rControlRegion )
     if ( !m_pSpinWidget )
     {
     m_pSpinWidget = new QSpinWidget( NULL, "spin_widget" );
-
+    
     m_pSpinEdit = new QLineEdit( NULL, "line_edit_spin" );
     m_pSpinWidget->setEditWidget( m_pSpinEdit );
     }
 
     QRect qRect = region2QRect( rControlRegion );
-
+    
     m_pSpinWidget->move( qRect.topLeft() );
     m_pSpinWidget->resize( qRect.size() );
     m_pSpinWidget->arrange();
@@ -955,7 +955,7 @@ QTabBar *WidgetPainter::tabBar( const Rectangle& rControlRegion )
         m_pTabBarParent = new QWidget( NULL, "tab_bar_parent" );
 
     m_pTabBar = new QTabBar( m_pTabBarParent, "tab_bar" );
-
+    
     m_pTabLeft = new QTab();
     m_pTabMiddle = new QTab();
     m_pTabRight = new QTab();
@@ -970,7 +970,7 @@ QTabBar *WidgetPainter::tabBar( const Rectangle& rControlRegion )
 
     m_pTabBar->move( qRect.topLeft() );
     m_pTabBar->resize( qRect.size() );
-
+    
     m_pTabBar->setShape( QTabBar::RoundedAbove );
 
     return m_pTabBar;
@@ -983,10 +983,10 @@ QTabWidget *WidgetPainter::tabWidget( const Rectangle& rControlRegion )
 
     QRect qRect = region2QRect( rControlRegion );
     --qRect.rTop();
-
+    
     m_pTabWidget->move( qRect.topLeft() );
     m_pTabWidget->resize( qRect.size() );
-
+    
     return m_pTabWidget;
 }
 
@@ -996,7 +996,7 @@ QListView *WidgetPainter::listView( const Rectangle& rControlRegion )
     m_pListView = new QListView( NULL, "list_view" );
 
     QRect qRect = region2QRect( rControlRegion );
-
+    
     m_pListView->move( qRect.topLeft() );
     m_pListView->resize( qRect.size() );
 
@@ -1014,7 +1014,7 @@ QScrollBar *WidgetPainter::scrollBar( const Rectangle& rControlRegion,
     }
 
     QRect qRect = region2QRect( rControlRegion );
-
+    
     m_pScrollBar->move( qRect.topLeft() );
     m_pScrollBar->resize( qRect.size() );
     m_pScrollBar->setOrientation( bHorizontal? Qt::Horizontal: Qt::Vertical );
@@ -1123,9 +1123,9 @@ QProgressBar *WidgetPainter::progressBar( const Rectangle& rControlRegion )
 {
     if ( !m_pProgressBar )
     m_pProgressBar = new QProgressBar( NULL, "progress_bar" );
-
+    
     QRect qRect = region2QRect( rControlRegion );
-
+    
     m_pProgressBar->move( qRect.topLeft() );
     m_pProgressBar->resize( qRect.size() );
 
@@ -1195,10 +1195,10 @@ class KDESalGraphics : public X11SalGraphics
 
     @param nType
     Type of the widget.
-
+    
     @param nPart
     Specification of the widget's part if it consists of more than one.
-
+  
     @return TRUE if the platform supports native drawing of the widget nType
     defined by nPart.
 */
@@ -1249,7 +1249,7 @@ BOOL KDESalGraphics::hitTestNativeControl( ControlType nType, ControlPart nPart,
     rIsInside = FALSE;
 
     BOOL bHorizontal = ( nPart == PART_BUTTON_LEFT || nPart == PART_BUTTON_RIGHT );
-
+    
     QScrollBar *pScrollBar = pWidgetPainter->scrollBar( rControlRegion,
         bHorizontal, ImplControlValue() );
     QRect qRectSubLine = kapp->style().querySubControlMetrics(
@@ -1297,7 +1297,7 @@ BOOL KDESalGraphics::hitTestNativeControl( ControlType nType, ControlPart nPart,
             rIsInside = qRectAddLine.contains( aPos.getX(), aPos.getY() );
         }
         break;
-
+        
         case PART_BUTTON_UP:
         if ( !bPlatinumStyle && qRectSubLine.contains( aPos.getX(), aPos.getY() ) )
             rIsInside = TRUE;
@@ -1307,21 +1307,21 @@ BOOL KDESalGraphics::hitTestNativeControl( ControlType nType, ControlPart nPart,
             rIsInside = qRectAddLine.contains( aPos.getX(), aPos.getY() );
         }
         break;
-
+        
         case PART_BUTTON_RIGHT:
         if ( bTwoSubButtons )
             qRectAddLine.setLeft( qRectAddLine.left() + qRectAddLine.width() / 2 );
 
         rIsInside = qRectAddLine.contains( aPos.getX(), aPos.getY() );
         break;
-
+        
         case PART_BUTTON_DOWN:
         if ( bTwoSubButtons )
             qRectAddLine.setTop( qRectAddLine.top() + qRectAddLine.height() / 2 );
 
         rIsInside = qRectAddLine.contains( aPos.getX(), aPos.getY() );
         break;
-
+        
         // cases PART_TRACK_HORZ_AREA and PART_TRACK_VERT_AREA
         default:
         return FALSE;
@@ -1335,13 +1335,13 @@ BOOL KDESalGraphics::hitTestNativeControl( ControlType nType, ControlPart nPart,
 
 
 /** Draw the requested control described by nPart/nState.
-
+ 
     @param rControlRegion
     The bounding region of the complete control in VCL frame coordinates.
-
+    
     @param aValue
     An optional value (tristate/numerical/string).
-
+    
     @param aCaption
     A caption or title string (like button text etc.)
 */
@@ -1355,7 +1355,7 @@ BOOL KDESalGraphics::drawNativeControl( ControlType nType, ControlPart nPart,
     Display *dpy = GetXDisplay();
     XLIB_Window drawable = GetDrawable();
     GC gc = SelectPen(); //SelectFont(); // GC with current clipping region set
-
+    
     if ( (nType == CTRL_PUSHBUTTON) && (nPart == PART_ENTIRE_CONTROL) )
     {
     bReturn = pWidgetPainter->drawStyledWidget(
@@ -1474,16 +1474,16 @@ BOOL KDESalGraphics::drawNativeControl( ControlType nType, ControlPart nPart,
 
 
 /** Draw text on the widget.
-
+ 
     OPTIONAL. Draws the requested text for the control described by nPart/nState.
     Used if text is not drawn by DrawNativeControl().
-
+ 
     @param rControlRegion
     The bounding region of the complete control in VCL frame coordinates.
-
+    
     @param aValue
     An optional value (tristate/numerical/string)
-
+    
     @param aCaption
     A caption or title string (like button text etc.)
 */
@@ -1505,10 +1505,10 @@ BOOL KDESalGraphics::drawNativeControlText( ControlType, ControlPart,
 
     @param rControlRegion
     The bounding region of the control in VCL frame coordinates.
-
+    
     @param aValue
     An optional value (tristate/numerical/string)
-
+    
     @param aCaption
     A caption or title string (like button text etc.)
 */
@@ -1521,7 +1521,7 @@ BOOL KDESalGraphics::getNativeControlRegion( ControlType nType, ControlPart nPar
     BOOL bReturn = FALSE;
     QRect qBoundingRect = WidgetPainter::region2QRect( rControlRegion );
     QRect qRect;
-
+    
     QWidget *pWidget = NULL;
     switch ( nType )
     {
@@ -1659,7 +1659,7 @@ BOOL KDESalGraphics::getNativeControlRegion( ControlType nType, ControlPart nPar
                 qRect.setBottom( 0 );
             }
             }
-
+            
             qRect.moveBy( qBoundingRect.left(), qBoundingRect.top() );
 
             bReturn = TRUE;
@@ -1702,7 +1702,7 @@ BOOL KDESalGraphics::getNativeControlRegion( ControlType nType, ControlPart nPar
     Size  aSize( qRect.width(), qRect.height() );
     rNativeContentRegion = Rectangle( aPoint, aSize );
     }
-
+    
     return bReturn;
 }
 
@@ -1754,13 +1754,13 @@ static Font toFont( const QFont &rQFont, const ::com::sun::star::lang::Locale& r
 {
     psp::FastPrintFontInfo aInfo;
     QFontInfo qFontInfo( rQFont );
-
+    
     // set family name
     aInfo.m_aFamilyName = String( rQFont.family().utf8(), RTL_TEXTENCODING_UTF8 );
 
     // set italic
     aInfo.m_eItalic = ( qFontInfo.italic()? psp::italic::Italic: psp::italic::Upright );
-
+    
     // set weight
     int nWeight = qFontInfo.weight();
     if ( nWeight <= QFont::Light )
@@ -1773,7 +1773,7 @@ static Font toFont( const QFont &rQFont, const ::com::sun::star::lang::Locale& r
         aInfo.m_eWeight = psp::weight::Bold;
     else
         aInfo.m_eWeight = psp::weight::UltraBold;
-
+    
     // set width
     int nStretch = rQFont.stretch();
     if ( nStretch <= QFont::UltraCondensed )
@@ -1794,7 +1794,7 @@ static Font toFont( const QFont &rQFont, const ::com::sun::star::lang::Locale& r
         aInfo.m_eWidth = psp::width::ExtraExpanded;
     else
         aInfo.m_eWidth = psp::width::UltraExpanded;
-
+    
 #if OSL_DEBUG_LEVEL > 1
     fprintf( stderr, "font name BEFORE system match: \"%s\"\n", OUStringToOString( aInfo.m_aFamilyName, RTL_TEXTENCODING_ISO_8859_1 ).getStr() );
 #endif
@@ -1812,7 +1812,7 @@ static Font toFont( const QFont &rQFont, const ::com::sun::star::lang::Locale& r
     int nPointHeight = qFontInfo.pointSize();
     if ( nPointHeight <= 0 )
         nPointHeight = rQFont.pointSize();
-
+    
     // Create the font
     Font aFont( aInfo.m_aFamilyName, Size( 0, nPointHeight ) );
     if( aInfo.m_eWeight != psp::weight::Unknown )
@@ -1887,7 +1887,7 @@ void KDESalFrame::UpdateSettings( AllSettings& rSettings )
     Color aBack = toColor( qColorGroup.background() );
     Color aText = toColor( qColorGroup.text() );
     Color aBase = toColor( qColorGroup.base() );
-
+    
     // Foreground
     aStyleSettings.SetRadioCheckTextColor( aFore );
     aStyleSettings.SetLabelTextColor( aFore );
@@ -1906,7 +1906,7 @@ void KDESalFrame::UpdateSettings( AllSettings& rSettings )
     aStyleSettings.SetHelpColor( aBase );
     aStyleSettings.SetWindowColor( aBase );
     aStyleSettings.SetActiveTabColor( aBase );
-
+    
     // Buttons
     aStyleSettings.SetButtonTextColor( toColor( qColorGroup.buttonText() ) );
     aStyleSettings.SetButtonRolloverTextColor( toColor( qColorGroup.buttonText() ) );
@@ -1943,9 +1943,6 @@ void KDESalFrame::UpdateSettings( AllSettings& rSettings )
 
     aStyleSettings.SetAppFont( aFont );
     aStyleSettings.SetHelpFont( aFont );
-    if( !bSetTitleFont )
-        aStyleSettings.SetTitleFont( aFont );
-    aStyleSettings.SetFloatTitleFont( aFont );
     aStyleSettings.SetMenuFont( aFont ); // will be changed according to pMenuBar
     aStyleSettings.SetToolFont( aFont ); // will be changed according to pToolBar
     aStyleSettings.SetLabelFont( aFont );
@@ -1955,6 +1952,12 @@ void KDESalFrame::UpdateSettings( AllSettings& rSettings )
     aStyleSettings.SetFieldFont( aFont );
     aStyleSettings.SetIconFont( aFont );
     aStyleSettings.SetGroupFont( aFont );
+
+    aFont.SetWeight( WEIGHT_BOLD );
+    if( !bSetTitleFont )
+        aStyleSettings.SetTitleFont( aFont );
+    aStyleSettings.SetFloatTitleFont( aFont );
+
     int flash_time = QApplication::cursorFlashTime();
     aStyleSettings.SetCursorBlinkTime( flash_time != 0 ? flash_time/2 : STYLE_CURSOR_NOBLINKTIME );
 
@@ -1968,7 +1971,7 @@ void KDESalFrame::UpdateSettings( AllSettings& rSettings )
     {
         // Color
         QColorGroup qMenuCG = pMenuBar->colorGroup();
-
+        
         // Menu text and background color, theme specific
         Color aMenuFore = toColor( qMenuCG.foreground() );
         Color aMenuBack = toColor( qMenuCG.background() );
@@ -1980,7 +1983,7 @@ void KDESalFrame::UpdateSettings( AllSettings& rSettings )
             aMenuFore = toColor( qMenuCG.buttonText() );
             aMenuBack = toColor( qMenuCG.button() );
         }
-
+        
         aStyleSettings.SetMenuTextColor( aMenuFore );
         aStyleSettings.SetMenuBarTextColor( aMenuFore );
         aStyleSettings.SetMenuColor( aMenuBack );
@@ -1999,7 +2002,7 @@ void KDESalFrame::UpdateSettings( AllSettings& rSettings )
         }
         else
             aStyleSettings.SetMenuHighlightTextColor( aMenuFore );
-
+        
         // set special menubar higlight text color
         if ( kapp->style().inherits( "HighContrastStyle" ) )
             ImplGetSVData()->maNWFData.maMenuBarHighlightTextColor = toColor( qMenuCG.highlightedText() );
@@ -2021,7 +2024,7 @@ void KDESalFrame::UpdateSettings( AllSettings& rSettings )
 
     // Scroll bar size
     aStyleSettings.SetScrollBarSize( kapp->style().pixelMetric( QStyle::PM_ScrollBarExtent ) );
-
+    
     rSettings.SetStyleSettings( aStyleSettings );
 }
 
@@ -2043,7 +2046,7 @@ SalGraphics* KDESalFrame::GetGraphics()
             }
         }
     }
-
+    
     return NULL;
 }
 
diff --git a/vcl/unx/kde4/KDEData.cxx b/vcl/unx/kde4/KDEData.cxx
index 99871edadae3..e8482d4060b7 100644
--- a/vcl/unx/kde4/KDEData.cxx
+++ b/vcl/unx/kde4/KDEData.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
@@ -42,7 +42,7 @@ void KDEData::Init()
 void KDEData::initNWF()
 {
     ImplSVData *pSVData = ImplGetSVData();
-
+    
     // draw toolbars on separate lines
     pSVData->maNWFData.mbDockingAreaSeparateTB = true;
     // no borders for menu, theming does that
diff --git a/vcl/unx/kde4/KDEData.hxx b/vcl/unx/kde4/KDEData.hxx
index 7cf5836c9688..0ff2039f21bc 100644
--- a/vcl/unx/kde4/KDEData.hxx
+++ b/vcl/unx/kde4/KDEData.hxx
@@ -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
@@ -35,7 +35,7 @@ class KDEData : public X11SalData
     public:
         KDEData() {}
         virtual ~KDEData();
-
+        
         virtual void Init();
         virtual void initNWF();
         virtual void deInitNWF();
diff --git a/vcl/unx/kde4/KDESalDisplay.cxx b/vcl/unx/kde4/KDESalDisplay.cxx
index d67399528a7c..061b4c3e519a 100644
--- a/vcl/unx/kde4/KDESalDisplay.cxx
+++ b/vcl/unx/kde4/KDESalDisplay.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
diff --git a/vcl/unx/kde4/KDESalDisplay.hxx b/vcl/unx/kde4/KDESalDisplay.hxx
index 1ab966b1847b..025abaeb2609 100644
--- a/vcl/unx/kde4/KDESalDisplay.hxx
+++ b/vcl/unx/kde4/KDESalDisplay.hxx
@@ -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
diff --git a/vcl/unx/kde4/KDESalFrame.cxx b/vcl/unx/kde4/KDESalFrame.cxx
index 0c8f04f9fe41..b348ac2f7162 100644
--- a/vcl/unx/kde4/KDESalFrame.cxx
+++ b/vcl/unx/kde4/KDESalFrame.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
@@ -68,7 +68,7 @@ void KDESalFrame::Show( BOOL bVisible, BOOL bNoActivate )
         KDEXLib* pXLib = static_cast<KDEXLib*>(GetDisplay()->GetXLib());
         pXLib->doStartup();
     }
-
+    
     X11SalFrame::Show( bVisible, bNoActivate );
 }
 
@@ -101,13 +101,13 @@ static Font toFont( const QFont &rQFont, const ::com::sun::star::lang::Locale& r
 {
     psp::FastPrintFontInfo aInfo;
     QFontInfo qFontInfo( rQFont );
-
+    
     // set family name
     aInfo.m_aFamilyName = String( (const char *) rQFont.family().toUtf8(), RTL_TEXTENCODING_UTF8 );
 
     // set italic
     aInfo.m_eItalic = ( qFontInfo.italic()? psp::italic::Italic: psp::italic::Upright );
-
+    
     // set weight
     int nWeight = qFontInfo.weight();
     if ( nWeight <= QFont::Light )
@@ -120,7 +120,7 @@ static Font toFont( const QFont &rQFont, const ::com::sun::star::lang::Locale& r
         aInfo.m_eWeight = psp::weight::Bold;
     else
         aInfo.m_eWeight = psp::weight::UltraBold;
-
+    
     // set width
     int nStretch = rQFont.stretch();
     if ( nStretch <= QFont::UltraCondensed )
@@ -141,7 +141,7 @@ static Font toFont( const QFont &rQFont, const ::com::sun::star::lang::Locale& r
         aInfo.m_eWidth = psp::width::ExtraExpanded;
     else
         aInfo.m_eWidth = psp::width::UltraExpanded;
-
+    
 #if OSL_DEBUG_LEVEL > 1
     fprintf( stderr, "font name BEFORE system match: \"%s\"\n", OUStringToOString( aInfo.m_aFamilyName, RTL_TEXTENCODING_ISO_8859_1 ).getStr() );
 #endif
@@ -159,7 +159,7 @@ static Font toFont( const QFont &rQFont, const ::com::sun::star::lang::Locale& r
     int nPointHeight = qFontInfo.pointSize();
     if ( nPointHeight <= 0 )
         nPointHeight = rQFont.pointSize();
-
+    
     // Create the font
     Font aFont( aInfo.m_aFamilyName, Size( 0, nPointHeight ) );
     if( aInfo.m_eWeight != psp::weight::Unknown )
@@ -180,26 +180,26 @@ void KDESalFrame::UpdateSettings( AllSettings& rSettings )
 {
     StyleSettings style( rSettings.GetStyleSettings() );
     BOOL bSetTitleFont = false;
-
+    
     // General settings
     QPalette pal = kapp->palette();
-
+    
     style.SetActiveColor(toColor(pal.color(QPalette::Active, QPalette::Window)));
     style.SetDeactiveColor(toColor(pal.color(QPalette::Inactive, QPalette::Window)));
-
+    
     style.SetActiveColor2(toColor(pal.color(QPalette::Active, QPalette::Window)));
     style.SetDeactiveColor2(toColor(pal.color(QPalette::Inactive, QPalette::Window)));
-
+    
     style.SetActiveTextColor(toColor(pal.color(QPalette::Active, QPalette::WindowText)));
     style.SetDeactiveTextColor(toColor(pal.color(QPalette::Inactive, QPalette::WindowText)));
-
+    
     // WM settings
     KConfig *pConfig = KGlobal::config().data();
     if ( pConfig )
     {
         KConfigGroup aGroup = pConfig->group( "WM" );
         const char *pKey;
-
+        
         pKey = "titleFont";
         if ( aGroup.hasKey( pKey ) )
         {
@@ -207,13 +207,13 @@ void KDESalFrame::UpdateSettings( AllSettings& rSettings )
             style.SetTitleFont( aFont );
             bSetTitleFont = true;
         }
-
+        
         aGroup = pConfig->group( "Icons" );
 
         pKey = "Theme";
         if ( aGroup.hasKey( pKey ) )
             style.SetPreferredSymbolsStyleName( readEntryUntranslated( &aGroup, pKey ) );
-
+        
         //toolbar
         pKey = "toolbarFont";
         if ( aGroup.hasKey( pKey ) )
@@ -222,7 +222,7 @@ void KDESalFrame::UpdateSettings( AllSettings& rSettings )
             style.SetToolFont( aFont );
         }
     }
-
+    
     Color aFore = toColor( pal.color( QPalette::Active, QPalette::WindowText ) );
     Color aBack = toColor( pal.color( QPalette::Active, QPalette::Window ) );
     Color aText = toColor( pal.color( QPalette::Active, QPalette::Text ) );
@@ -249,7 +249,7 @@ void KDESalFrame::UpdateSettings( AllSettings& rSettings )
     style.SetHelpColor( aBase );
     style.SetWindowColor( aBase );
     style.SetActiveTabColor( aBase );
-
+    
     // Buttons
     style.SetButtonTextColor( aButn );
     style.SetButtonRolloverTextColor( aButn );
@@ -265,7 +265,7 @@ void KDESalFrame::UpdateSettings( AllSettings& rSettings )
     style.SetFaceColor( aBack );
     style.SetInactiveTabColor( aBack );
     style.SetDialogColor( aBack );
-
+    
     if( aBack == COL_LIGHTGRAY )
         style.SetCheckedColor( Color( 0xCC, 0xCC, 0xCC ) );
     else
@@ -284,16 +284,10 @@ void KDESalFrame::UpdateSettings( AllSettings& rSettings )
 
     // Font
     Font aFont = toFont( kapp->font(), rSettings.GetUILocale() );
-
+    
     style.SetAppFont( aFont );
     style.SetHelpFont( aFont );
-
-    if( !bSetTitleFont )
-    {
-        style.SetTitleFont( aFont );
-    }
-
-    style.SetFloatTitleFont( aFont );
+    
     style.SetMenuFont( aFont ); // will be changed according to pMenuBar
     //style.SetToolFont( aFont ); //already set above
     style.SetLabelFont( aFont );
@@ -304,6 +298,13 @@ void KDESalFrame::UpdateSettings( AllSettings& rSettings )
     style.SetIconFont( aFont );
     style.SetGroupFont( aFont );
 
+    aFont.SetWeight( WEIGHT_BOLD );
+    if( !bSetTitleFont )
+    {
+        style.SetTitleFont( aFont );
+    }
+    style.SetFloatTitleFont( aFont );
+    
     int flash_time = QApplication::cursorFlashTime();
     style.SetCursorBlinkTime( flash_time != 0 ? flash_time/2 : STYLE_CURSOR_NOBLINKTIME );
 
@@ -314,14 +315,14 @@ void KDESalFrame::UpdateSettings( AllSettings& rSettings )
     {
         // Color
         QPalette qMenuCG = pMenuBar->palette();
-
+        
         // Menu text and background color, theme specific
         Color aMenuFore = toColor( qMenuCG.color( QPalette::WindowText ) );
         Color aMenuBack = toColor( qMenuCG.color( QPalette::Window ) );
-
+        
         aMenuFore = toColor( qMenuCG.color( QPalette::ButtonText ) );
         aMenuBack = toColor( qMenuCG.color( QPalette::Button ) );
-
+        
         style.SetMenuTextColor( aMenuFore );
         style.SetMenuBarTextColor( aMenuFore );
         style.SetMenuColor( aMenuBack );
@@ -330,7 +331,7 @@ void KDESalFrame::UpdateSettings( AllSettings& rSettings )
         style.SetMenuHighlightColor( toColor ( qMenuCG.color( QPalette::Highlight ) ) );
 
         style.SetMenuHighlightTextColor( aMenuFore );
-
+        
         // set special menubar higlight text color
         if ( kapp->style()->inherits( "HighContrastStyle" ) )
             ImplGetSVData()->maNWFData.maMenuBarHighlightTextColor = toColor( qMenuCG.color( QPalette::HighlightedText ) );
@@ -341,12 +342,12 @@ void KDESalFrame::UpdateSettings( AllSettings& rSettings )
         aFont = toFont( pMenuBar->font(), rSettings.GetUILocale() );
         style.SetMenuFont( aFont );
     }
-
+    
     delete pMenuBar;
-
+    
     // Scroll bar size
     style.SetScrollBarSize( kapp->style()->pixelMetric( QStyle::PM_ScrollBarExtent ) );
-
+    
     rSettings.SetStyleSettings( style );
 }
 
@@ -400,6 +401,6 @@ SalGraphics* KDESalFrame::GetGraphics()
             }
         }
     }
-
+    
     return NULL;
-}
-\ No newline at end of file
+}
diff --git a/vcl/unx/kde4/KDESalFrame.hxx b/vcl/unx/kde4/KDESalFrame.hxx
index 643be72c27f3..e25d0d4ae950 100644
--- a/vcl/unx/kde4/KDESalFrame.hxx
+++ b/vcl/unx/kde4/KDESalFrame.hxx
@@ -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
@@ -39,11 +39,11 @@ class KDESalFrame : public X11SalFrame
         {
             X11SalGraphics* pGraphics;
             bool bInUse;
-
+            
             GraphicsHolder() : pGraphics(0),bInUse( false ) {}
             ~GraphicsHolder();
         };
-
+        
         GraphicsHolder m_aGraphics[ nMaxGraphics ];
 
     public:
diff --git a/vcl/unx/kde4/KDESalGraphics.cxx b/vcl/unx/kde4/KDESalGraphics.cxx
index 2c04af384c51..3a680014dbc3 100644
--- a/vcl/unx/kde4/KDESalGraphics.cxx
+++ b/vcl/unx/kde4/KDESalGraphics.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
@@ -50,7 +50,7 @@
 
 using namespace ::rtl;
 
-/**
+/** 
   Conversion function between VCL ControlState together with
   ImplControlValue and Qt state flags.
   @param nControlState State of the widget (default, focused, ...) in Native Widget Framework.
@@ -79,7 +79,7 @@ QStyle::State vclStateValue2StateFlag( ControlState nControlState,
     return nState;
 }
 
-/**
+/** 
  Convert VCL Rectangle to QRect.
  @param rControlRegion The Rectangle to convert.
  @return The matching QRect
@@ -89,7 +89,7 @@ QRect region2QRect( const Rectangle& rControlRegion )
     return QRect(rControlRegion.Left(), rControlRegion.Top(), rControlRegion.GetWidth(), rControlRegion.GetHeight());
 }
 
-KDESalGraphics::KDESalGraphics() :
+KDESalGraphics::KDESalGraphics() : 
     m_image(0)
 {
 }
@@ -103,54 +103,54 @@ KDESalGraphics::~KDESalGraphics()
 BOOL KDESalGraphics::IsNativeControlSupported( ControlType type, ControlPart part )
 {
     if (type == CTRL_PUSHBUTTON) return true;
-
+    
     if (type == CTRL_MENUBAR) return true;
-
+    
     if (type == CTRL_MENU_POPUP) return true;
-
+    
     if (type == CTRL_EDITBOX) return true;
-
+    
     if (type == CTRL_COMBOBOX) return true;
-
+    
     if (type == CTRL_TOOLBAR) return true;
-
+    
     if (type == CTRL_CHECKBOX) return true;
-
+    
     if (type == CTRL_LISTBOX) return true;
-
+    
     if (type == CTRL_LISTNODE) return true;
-
+    
     if (type == CTRL_FRAME) return true;
-
+    
     if (type == CTRL_SCROLLBAR) return true;
-
+    
     if (type == CTRL_WINDOW_BACKGROUND) return true;
-
+    
     if (type == CTRL_SPINBOX && (part == PART_ENTIRE_CONTROL || part == HAS_BACKGROUND_TEXTURE) ) return true;
 
     // no spinbuttons for KDE, paint spinbox complete
     //if (type == CTRL_SPINBUTTONS) return true;
-
+    
     if (type == CTRL_GROUPBOX) return true;
-
+    
     if (type == CTRL_FIXEDLINE) return true;
-
+    
     if (type == CTRL_FIXEDBORDER) return true;
-
+    
     if (type == CTRL_TOOLTIP) return true;
-
+    
     if (type == CTRL_RADIOBUTTON) return true;
-
+    
     if (type == CTRL_SLIDER && (part == PART_TRACK_HORZ_AREA || part == PART_TRACK_VERT_AREA) )
         return true;
-
+    
     return false;
-
+    
     if ( (type == CTRL_TAB_ITEM) && (part == PART_ENTIRE_CONTROL) ) return true;
     if ( (type == CTRL_TAB_PANE) && (part == PART_ENTIRE_CONTROL) ) return true;
     // no CTRL_TAB_BODY for KDE
     if ( (type == CTRL_PROGRESS)    && (part == PART_ENTIRE_CONTROL) ) return true;
-
+        
     return false;
 }
 
@@ -162,13 +162,13 @@ BOOL KDESalGraphics::hitTestNativeControl( ControlType, ControlPart,
 }
 
 /// helper drawing methods
-namespace
+namespace 
 {
     void draw( QStyle::ControlElement element, QStyleOption* option, QImage* image, QStyle::State state )
     {
         option->state |= state;
         option->rect = image->rect();
-
+        
         QPainter painter(image);
         kapp->style()->drawControl(element, option, &painter);
     }
@@ -179,7 +179,7 @@ namespace
         option->rect = image->rect();
         if( nAdjust )
             option->rect.adjust( nAdjust, nAdjust, -nAdjust, -nAdjust );
-
+        
         QPainter painter(image);
         kapp->style()->drawPrimitive(element, option, &painter);
     }
@@ -188,11 +188,11 @@ namespace
     {
         option->state |= state;
         option->rect = image->rect();
-
+        
         QPainter painter(image);
         kapp->style()->drawComplexControl(element, option, &painter);
     }
-
+    
     int getFrameWidth()
     {
         static int s_nFrameWidth = -1;
@@ -217,12 +217,12 @@ namespace
         option.state = QStyle::State_Sunken;
     #else
         QStyleOptionFrame option;
-
+        
         QFrame aFrame( NULL );
         aFrame.setFrameRect( QRect(0, 0, image->width(), image->height()) );
         aFrame.setFrameStyle( QFrame::StyledPanel | QFrame::Sunken );
         aFrame.ensurePolished();
-
+        
         option.initFrom( &aFrame );
         option.lineWidth = aFrame.lineWidth();
         option.midLineWidth = aFrame.midLineWidth();
@@ -242,7 +242,7 @@ BOOL KDESalGraphics::drawNativeControl( ControlType type, ControlPart part,
     {
         return false;
     }
-
+    
     BOOL returnVal = true;
 
     QRect widgetRect = region2QRect(rControlRegion);
@@ -257,34 +257,34 @@ BOOL KDESalGraphics::drawNativeControl( ControlType type, ControlPart part,
         widgetRect = QRect( aButtonRect.Left(), aButtonRect.Top(),
                             aButtonRect.Right(), aButtonRect.Bottom() );
     }
-
+    
     //if no image, or resized, make a new image
     if (!m_image || m_image->size() != widgetRect.size())
     {
         if (m_image)
             delete m_image;
-
+        
         m_image = new QImage( widgetRect.width(),
-                              widgetRect.height(),
+                              widgetRect.height(), 
                               QImage::Format_ARGB32 );
     }
     m_image->fill(KApplication::palette().color(QPalette::Window).rgb());
-
-
+    
+    
     XLIB_Region pTempClipRegion = 0;
 
     if (type == CTRL_PUSHBUTTON)
     {
         QStyleOptionButton option;
-        draw( QStyle::CE_PushButton, &option, m_image,
+        draw( QStyle::CE_PushButton, &option, m_image, 
               vclStateValue2StateFlag(nControlState, value) );
     }
     else if ( (type == CTRL_MENUBAR))
     {
-        if (part == PART_MENU_ITEM)
+        if (part == PART_MENU_ITEM) 
         {
             QStyleOptionMenuItem option;
-            draw( QStyle::CE_MenuBarItem, &option, m_image,
+            draw( QStyle::CE_MenuBarItem, &option, m_image, 
                   vclStateValue2StateFlag(nControlState, value) );
         }
         else if (part == PART_ENTIRE_CONTROL)
@@ -296,17 +296,17 @@ BOOL KDESalGraphics::drawNativeControl( ControlType type, ControlPart part,
         }
     }
     else if (type == CTRL_MENU_POPUP)
-    {
+    {		
         if (part == PART_MENU_ITEM)
         {
             QStyleOptionMenuItem option;
-            draw( QStyle::CE_MenuItem, &option, m_image,
+            draw( QStyle::CE_MenuItem, &option, m_image, 
                   vclStateValue2StateFlag(nControlState, value) );
         }
         else if (part == PART_MENU_ITEM_CHECK_MARK && (nControlState & CTRL_STATE_PRESSED) )
         {
             QStyleOptionButton option;
-            draw( QStyle::PE_IndicatorMenuCheckMark, &option, m_image,
+            draw( QStyle::PE_IndicatorMenuCheckMark, &option, m_image, 
                   vclStateValue2StateFlag(nControlState, value) );
         }
         else if (part == PART_MENU_ITEM_RADIO_MARK && (nControlState & CTRL_STATE_PRESSED) )
@@ -323,44 +323,44 @@ BOOL KDESalGraphics::drawNativeControl( ControlType type, ControlPart part,
             #else
             QStyleOptionFrameV2 option;
             #endif
-            draw( QStyle::PE_FrameMenu, &option, m_image,
+            draw( QStyle::PE_FrameMenu, &option, m_image, 
                   vclStateValue2StateFlag(nControlState, value) );
         }
     }
     else if ( (type == CTRL_TOOLBAR) && (part == PART_BUTTON) )
     {
         QStyleOptionToolButton option;
-
+        
         option.arrowType = Qt::NoArrow;
         option.subControls = QStyle::SC_ToolButton;
-
+        
         option.state = vclStateValue2StateFlag( nControlState, value );
         option.state |= QStyle::State_Raised | QStyle::State_Enabled | QStyle::State_AutoRaise;
-
-        draw( QStyle::CC_ToolButton, &option, m_image,
+        
+        draw( QStyle::CC_ToolButton, &option, m_image, 
               vclStateValue2StateFlag(nControlState, value) );
     }
     else if ( (type == CTRL_TOOLBAR) && (part == PART_ENTIRE_CONTROL) )
     {
         QStyleOptionToolBar option;
-
+        
         option.rect = QRect(0, 0, widgetRect.width(), widgetRect.height());
         option.state = vclStateValue2StateFlag( nControlState, value );
-
-        draw( QStyle::CE_ToolBar, &option, m_image,
+        
+        draw( QStyle::CE_ToolBar, &option, m_image, 
               vclStateValue2StateFlag(nControlState, value) );
     }
     else if ( (type == CTRL_TOOLBAR) && (part == PART_THUMB_VERT) )
     {
         const int tw = widgetRect.width();
         widgetRect.setWidth(kapp->style()->pixelMetric(QStyle::PM_ToolBarHandleExtent));
-
+        
         QStyleOption option;
         option.state = QStyle::State_Horizontal;
-
-        draw( QStyle::PE_IndicatorToolBarHandle, &option, m_image,
+        
+        draw( QStyle::PE_IndicatorToolBarHandle, &option, m_image, 
               vclStateValue2StateFlag(nControlState, value) );
-
+        
         widgetRect.setWidth(tw);
     }
     else if (type == CTRL_EDITBOX)
@@ -368,7 +368,7 @@ BOOL KDESalGraphics::drawNativeControl( ControlType type, ControlPart part,
         QStyleOptionFrameV2 option;
         draw( QStyle::PE_PanelLineEdit, &option, m_image,
               vclStateValue2StateFlag(nControlState, value), 2 );
-
+        
         draw( QStyle::PE_FrameLineEdit, &option, m_image,
               vclStateValue2StateFlag(nControlState, value), 0 );
     }
@@ -376,15 +376,15 @@ BOOL KDESalGraphics::drawNativeControl( ControlType type, ControlPart part,
     {
         QStyleOptionComboBox option;
         option.editable = true;
-
-        draw( QStyle::CC_ComboBox, &option, m_image,
+        
+        draw( QStyle::CC_ComboBox, &option, m_image, 
               vclStateValue2StateFlag(nControlState, value) );
     }
     else if (type == CTRL_LISTBOX)
     {
         if( part == PART_WINDOW )
         {
-            lcl_drawFrame( QStyle::PE_Frame, m_image,
+            lcl_drawFrame( QStyle::PE_Frame, m_image, 
                            vclStateValue2StateFlag(nControlState, value) );
         }
         else
@@ -392,12 +392,12 @@ BOOL KDESalGraphics::drawNativeControl( ControlType type, ControlPart part,
             QStyleOptionComboBox option;
             if (part == PART_SUB_EDIT)
             {
-                draw( QStyle::CE_ComboBoxLabel, &option, m_image,
+                draw( QStyle::CE_ComboBoxLabel, &option, m_image, 
                       vclStateValue2StateFlag(nControlState, value) );
             }
             else
             {
-                draw( QStyle::CC_ComboBox, &option, m_image,
+                draw( QStyle::CC_ComboBox, &option, m_image, 
                       vclStateValue2StateFlag(nControlState, value) );
             }
         }
@@ -406,15 +406,15 @@ BOOL KDESalGraphics::drawNativeControl( ControlType type, ControlPart part,
     {
         QStyleOption option;
         option.state = QStyle::State_Item | QStyle::State_Children;
-
+        
         if (nControlState & CTRL_STATE_PRESSED)
             option.state |= QStyle::State_Open;
-
+        
         draw( QStyle::PE_IndicatorBranch, &option, m_image,
               vclStateValue2StateFlag(nControlState, value) );
     }
     else if (type == CTRL_CHECKBOX)
-    {
+    {	
         QStyleOptionButton option;
         draw( QStyle::CE_CheckBox, &option, m_image,
                vclStateValue2StateFlag(nControlState, value) );
@@ -426,29 +426,29 @@ BOOL KDESalGraphics::drawNativeControl( ControlType type, ControlPart part,
             QStyleOptionSlider option;
             OSL_ASSERT( value.getType() == CTRL_SCROLLBAR );
             const ScrollbarValue* sbVal = static_cast<const ScrollbarValue *>(&value);
-
+            
             //if the scroll bar is active (aka not degenrate...allow for hover events
             if (sbVal->mnVisibleSize < sbVal->mnMax)
                 option.state = QStyle::State_MouseOver;
-
+            
             //horizontal or vertical
             if (part == PART_DRAW_BACKGROUND_VERT)
                 option.orientation = Qt::Vertical;
             else
                 option.state |= QStyle::State_Horizontal;
-
+            
             //setup parameters from the OO values
             option.minimum = sbVal->mnMin;
             option.maximum = sbVal->mnMax - sbVal->mnVisibleSize;
             option.sliderValue = sbVal->mnCur;
             option.sliderPosition = sbVal->mnCur;
             option.pageStep = sbVal->mnVisibleSize;
-
+            
             //setup the active control...always the slider
             if (sbVal->mnThumbState & CTRL_STATE_ROLLOVER)
                 option.activeSubControls = QStyle::SC_ScrollBarSlider;
-
-            draw( QStyle::CC_ScrollBar, &option, m_image,
+            
+            draw( QStyle::CC_ScrollBar, &option, m_image, 
                   vclStateValue2StateFlag(nControlState, value) );
         }
         else
@@ -459,7 +459,7 @@ BOOL KDESalGraphics::drawNativeControl( ControlType type, ControlPart part,
     else if (type == CTRL_SPINBOX)
     {
         QStyleOptionSpinBox option;
-
+        
         // determine active control
         if( value.getType() == CTRL_SPINBUTTONS )
         {
@@ -469,33 +469,33 @@ BOOL KDESalGraphics::drawNativeControl( ControlType type, ControlPart part,
             if( (pSpinVal->mnLowerState & CTRL_STATE_PRESSED) )
                 option.activeSubControls |= QStyle::SC_SpinBoxDown;
         }
-
-        draw( QStyle::CC_SpinBox, &option, m_image,
+        
+        draw( QStyle::CC_SpinBox, &option, m_image, 
               vclStateValue2StateFlag(nControlState, value) );
     }
     else if (type == CTRL_GROUPBOX)
     {
         QStyleOptionGroupBox option;
-        draw( QStyle::CC_GroupBox, &option, m_image,
+        draw( QStyle::CC_GroupBox, &option, m_image, 
               vclStateValue2StateFlag(nControlState, value) );
     }
     else if (type == CTRL_RADIOBUTTON)
     {
         QStyleOptionButton option;
-        draw( QStyle::CE_RadioButton, &option, m_image,
+        draw( QStyle::CE_RadioButton, &option, m_image, 
               vclStateValue2StateFlag(nControlState, value) );
     }
     else if (type == CTRL_TOOLTIP)
     {
         QStyleOption option;
-        draw( QStyle::PE_PanelTipLabel, &option, m_image,
+        draw( QStyle::PE_PanelTipLabel, &option, m_image, 
               vclStateValue2StateFlag(nControlState, value) );
     }
     else if (type == CTRL_FRAME)
     {
-        lcl_drawFrame( QStyle::PE_Frame, m_image,
+        lcl_drawFrame( QStyle::PE_Frame, m_image, 
                        vclStateValue2StateFlag(nControlState, value) );
-
+        
         // draw just the border, see http://qa.openoffice.org/issues/show_bug.cgi?id=107945
         int nFrameWidth = getFrameWidth();
         pTempClipRegion = XCreateRegion();
@@ -509,7 +509,7 @@ BOOL KDESalGraphics::drawNativeControl( ControlType type, ControlPart part,
         {
             xRect.width -= 2*nFrameWidth;
             xRect.height -= 2*nFrameWidth;
-
+            
             XLIB_Region pSubtract = XCreateRegion();
             XUnionRectWithRegion( &xRect, pSubtract, pSubtract );
             XSubtractRegion( pTempClipRegion, pSubtract, pTempClipRegion );
@@ -518,7 +518,7 @@ BOOL KDESalGraphics::drawNativeControl( ControlType type, ControlPart part,
     }
     else if (type == CTRL_FIXEDBORDER)
     {
-        lcl_drawFrame( QStyle::PE_FrameWindow, m_image,
+        lcl_drawFrame( QStyle::PE_FrameWindow, m_image, 
                        vclStateValue2StateFlag(nControlState, value) );
     }
     else if (type == CTRL_WINDOW_BACKGROUND)
@@ -530,8 +530,8 @@ BOOL KDESalGraphics::drawNativeControl( ControlType type, ControlPart part,
         QStyleOptionMenuItem option;
         option.menuItemType = QStyleOptionMenuItem::Separator;
         option.state |= QStyle::State_Item;
-
-        draw( QStyle::CE_MenuItem, &option, m_image,
+        
+        draw( QStyle::CE_MenuItem, &option, m_image, 
               vclStateValue2StateFlag(nControlState, value) );
     }
     else if (type == CTRL_SLIDER && (part == PART_TRACK_HORZ_AREA || part == PART_TRACK_VERT_AREA))
@@ -539,25 +539,25 @@ BOOL KDESalGraphics::drawNativeControl( ControlType type, ControlPart part,
         OSL_ASSERT( value.getType() == CTRL_SLIDER );
         const SliderValue* slVal = static_cast<const SliderValue *>(&value);
         QStyleOptionSlider option;
-
+        
         option.rect = QRect(0, 0, widgetRect.width(), widgetRect.height());
         option.state = vclStateValue2StateFlag( nControlState, value );
         option.maximum     = slVal->mnMax;
         option.minimum     = slVal->mnMin;
         option.sliderPosition = option.sliderValue = slVal->mnCur;
         option.orientation = (part == PART_TRACK_HORZ_AREA) ? Qt::Horizontal : Qt::Vertical;
-
+        
         draw( QStyle::CC_Slider, &option, m_image, vclStateValue2StateFlag(nControlState, value) );
     }
     else
     {
         returnVal = false;
     }
-
+    
     if (returnVal)
     {
         GC gc = SelectFont();
-
+        
         if( gc )
         {
             if( pTempClipRegion )
@@ -571,7 +571,7 @@ BOOL KDESalGraphics::drawNativeControl( ControlType type, ControlPart part,
                 pixmap.handle(), pixmap.x11Info().screen(), pixmap.x11Info().depth(),
                 GetDrawable(), GetScreenNumber(), GetVisual().GetDepth(),
                 gc, 0, 0, widgetRect.width(), widgetRect.height(), widgetRect.left(), widgetRect.top());
-
+            
             if( pTempClipRegion )
             {
                 if( pClipRegion_ )
@@ -596,11 +596,11 @@ BOOL KDESalGraphics::getNativeControlRegion( ControlType type, ControlPart part,
                                              Rectangle &nativeBoundingRegion, Rectangle &nativeContentRegion )
 {
     bool retVal = false;
-
+    
     QRect boundingRect = region2QRect( controlRegion );
     QRect contentRect = boundingRect;
     QStyleOptionComplex styleOption;
-
+    
     switch ( type )
     {
         // Metrics of the push button
@@ -613,9 +613,9 @@ BOOL KDESalGraphics::getNativeControlRegion( ControlType type, ControlPart part,
                 {
                     int size = kapp->style()->pixelMetric(
                         QStyle::PM_ButtonDefaultIndicator, &styleOption );
-
+                    
                     boundingRect.adjust( -size, -size, size, size );
-
+                    
                     retVal = true;
                 }
             }
@@ -638,46 +638,46 @@ BOOL KDESalGraphics::getNativeControlRegion( ControlType type, ControlPart part,
             contentRect = boundingRect;
             contentRect.adjust( -nLayoutLeft+1, -nLayoutTop+1, nLayoutRight-1, nLayoutBottom-1 );
             retVal = true;
-
+            
             break;
         }
         case CTRL_CHECKBOX:
             if (part == PART_ENTIRE_CONTROL)
             {
                 styleOption.state = vclStateValue2StateFlag(controlState, val);
-
+                        
                 contentRect.setWidth(kapp->style()->pixelMetric(
                     QStyle::PM_IndicatorWidth, &styleOption));
                 contentRect.setHeight(kapp->style()->pixelMetric(
                     QStyle::PM_IndicatorHeight, &styleOption));
-
+                
                 contentRect.adjust(0, 0,
                     2 * kapp->style()->pixelMetric(
                         QStyle::PM_FocusFrameHMargin, &styleOption),
                     2 * kapp->style()->pixelMetric(
                         QStyle::PM_FocusFrameVMargin, &styleOption)
                     );
-
+                
                 boundingRect = contentRect;
-
+                    
                 retVal = true;
-
+                
                 break;
             }
         case CTRL_COMBOBOX:
         case CTRL_LISTBOX:
         {
             QStyleOptionComboBox cbo;
-
+            
             cbo.rect = QRect(0, 0, contentRect.width(), contentRect.height());
             cbo.state = vclStateValue2StateFlag(controlState, val);
-
+            
             switch ( part )
             {
                 case PART_ENTIRE_CONTROL:
                 {
                     int size = kapp->style()->pixelMetric(QStyle::PM_ComboBoxFrameWidth) - 2;
-
+                    
                     // find out the minimum size that should be used
                     // assume contents is a text ling
                     int nHeight = kapp->fontMetrics().height();
@@ -702,9 +702,9 @@ BOOL KDESalGraphics::getNativeControlRegion( ControlType type, ControlPart part,
                 case PART_SUB_EDIT:
                     contentRect = kapp->style()->subControlRect(
                         QStyle::CC_ComboBox, &cbo, QStyle::SC_ComboBoxEditField );
-
+                        
                     contentRect.translate( boundingRect.left(), boundingRect.top() );
-
+                    
                     retVal = true;
                     break;
                 case PART_WINDOW:
@@ -719,7 +719,7 @@ BOOL KDESalGraphics::getNativeControlRegion( ControlType type, ControlPart part,
 
             sbo.rect = QRect(0, 0, contentRect.width(), contentRect.height());
             sbo.state = vclStateValue2StateFlag(controlState, val);
-
+            
             switch ( part )
             {
                 case PART_BUTTON_UP:
@@ -729,7 +729,7 @@ BOOL KDESalGraphics::getNativeControlRegion( ControlType type, ControlPart part,
                     retVal = true;
                     boundingRect = QRect();
                     break;
-
+                
                 case PART_BUTTON_DOWN:
                     contentRect = kapp->style()->subControlRect(
                         QStyle::CC_SpinBox, &sbo, QStyle::SC_SpinBoxDown );
@@ -785,7 +785,7 @@ BOOL KDESalGraphics::getNativeControlRegion( ControlType type, ControlPart part,
         {
             const int h = kapp->style()->pixelMetric(QStyle::PM_ExclusiveIndicatorHeight);
             const int w = kapp->style()->pixelMetric(QStyle::PM_ExclusiveIndicatorWidth);
-
+            
             contentRect = QRect(boundingRect.left(), boundingRect.top(), w, h);
             contentRect.adjust(0, 0,
                 2 * kapp->style()->pixelMetric(
@@ -794,7 +794,7 @@ BOOL KDESalGraphics::getNativeControlRegion( ControlType type, ControlPart part,
                     QStyle::PM_FocusFrameVMargin, &styleOption)
                 );
             boundingRect = contentRect;
-
+            
             retVal = true;
             break;
         }
@@ -819,7 +819,7 @@ BOOL KDESalGraphics::getNativeControlRegion( ControlType type, ControlPart part,
             break;
     }
 #if 0
-
+    
 
         // Metrics of the scroll bar
         case CTRL_SCROLLBAR:
@@ -857,7 +857,7 @@ BOOL KDESalGraphics::getNativeControlRegion( ControlType type, ControlPart part,
                         qRect.setBottom( 0 );
                     }
                 }
-
+    
                 qRect.translate( qBoundingRect.left(), qBoundingRect.top() );
 
                 bReturn = TRUE;
@@ -887,7 +887,7 @@ BOOL KDESalGraphics::getNativeControlRegion( ControlType type, ControlPart part,
             break;
     }
 #endif
-
+    
     if (retVal)
     {
         // Bounding region
@@ -900,6 +900,6 @@ BOOL KDESalGraphics::getNativeControlRegion( ControlType type, ControlPart part,
         Size  aSize( contentRect.width(), contentRect.height() );
         nativeContentRegion = Rectangle( aPoint, aSize );
     }
-
+    
     return retVal;
 }
diff --git a/vcl/unx/kde4/KDESalGraphics.hxx b/vcl/unx/kde4/KDESalGraphics.hxx
index 0bce1700f1fc..35547bd76b98 100644
--- a/vcl/unx/kde4/KDESalGraphics.hxx
+++ b/vcl/unx/kde4/KDESalGraphics.hxx
@@ -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
@@ -43,7 +43,7 @@ class KDESalGraphics : public X11SalGraphics
     public:
         KDESalGraphics();
         virtual ~KDESalGraphics();
-
+        
         /**
             What widgets can be drawn the native way.
             @param type Type of the widget.
@@ -51,7 +51,7 @@ class KDESalGraphics : public X11SalGraphics
             @return true if the platform supports native drawing of the widget type defined by part.
         */
         virtual BOOL IsNativeControlSupported( ControlType type, ControlPart part );
-
+        
         /** Test whether the position is in the native widget.
             If the return value is TRUE, bIsInside contains information whether
             aPos was or was not inside the native widget specified by the
@@ -61,13 +61,13 @@ class KDESalGraphics : public X11SalGraphics
                                         const Rectangle& rControlRegion, const Point& aPos,
                                         BOOL& rIsInside );
         /** Draw the requested control described by part/nControlState.
-
+        
             @param rControlRegion
             The bounding Rectangle of the complete control in VCL frame coordinates.
-
+            
             @param aValue
             An optional value (tristate/numerical/string).
-
+            
             @param aCaption
             A caption or title string (like button text etc.)
         */
@@ -75,21 +75,21 @@ class KDESalGraphics : public X11SalGraphics
                                         const Rectangle& rControlRegion, ControlState nControlState,
                                         const ImplControlValue& aValue,
                                         const rtl::OUString& aCaption );
-
+                                        
         /** Draw text on the widget.
             OPTIONAL. Draws the requested text for the control described by part/nControlState.
             Used if text is not drawn by DrawNativeControl().
-
+        
             @param rControlRegion The bounding region of the complete control in VCL frame coordinates.
             @param aValue An optional value (tristate/numerical/string)
-            @param aCaption A caption or title string (like button text etc.)
+            @param aCaption	A caption or title string (like button text etc.)
         */
         virtual BOOL drawNativeControlText( ControlType, ControlPart,
                                             const Rectangle&, ControlState,
                                             const ImplControlValue&,
                                             const rtl::OUString& ) { return false; }
         /** Check if the bounding regions match.
-
+            
             If the return value is TRUE, rNativeBoundingRegion
             contains the true bounding region covered by the control
             including any adornment, while rNativeContentRegion contains the area
@@ -98,10 +98,10 @@ class KDESalGraphics : public X11SalGraphics
 
             @param rControlRegion
             The bounding region of the control in VCL frame coordinates.
-
+            
             @param aValue
             An optional value (tristate/numerical/string)
-
+            
             @param aCaption
             A caption or title string (like button text etc.)
         */
diff --git a/vcl/unx/kde4/KDESalInstance.cxx b/vcl/unx/kde4/KDESalInstance.cxx
index 01c4723bd530..aafcb94bdc81 100644
--- a/vcl/unx/kde4/KDESalInstance.cxx
+++ b/vcl/unx/kde4/KDESalInstance.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
diff --git a/vcl/unx/kde4/KDESalInstance.hxx b/vcl/unx/kde4/KDESalInstance.hxx
index 7d050fe6819e..4a4c97fa927e 100644
--- a/vcl/unx/kde4/KDESalInstance.hxx
+++ b/vcl/unx/kde4/KDESalInstance.hxx
@@ -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
diff --git a/vcl/unx/kde4/KDEXLib.cxx b/vcl/unx/kde4/KDEXLib.cxx
index 6a2793b8abe3..6f64cb8aca5a 100644
--- a/vcl/unx/kde4/KDEXLib.cxx
+++ b/vcl/unx/kde4/KDEXLib.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
@@ -51,8 +51,8 @@
 #include <stdio.h>
 #endif
 
-KDEXLib::KDEXLib() :
-    SalXLib(),  m_bStartupDone(false), m_pApplication(0),
+KDEXLib::KDEXLib() : 
+    SalXLib(),	m_bStartupDone(false), m_pApplication(0),
     m_pFreeCmdLineArgs(0), m_pAppCmdLineArgs(0), m_nFakeCmdLineArgs( 0 )
 {
 }
@@ -60,13 +60,13 @@ KDEXLib::KDEXLib() :
 KDEXLib::~KDEXLib()
 {
     delete (VCLKDEApplication*)m_pApplication;
-
+    
     // free the faked cmdline arguments no longer needed by KApplication
     for( int i = 0; i < m_nFakeCmdLineArgs; i++ )
     {
         free( m_pFreeCmdLineArgs[i] );
     }
-
+    
     delete [] m_pFreeCmdLineArgs;
     delete [] m_pAppCmdLineArgs;
 }
@@ -87,7 +87,7 @@ void KDEXLib::Init()
             ki18n( "OpenOffice.org is an office suite.\n" ),
             "http://kde.openoffice.org/index.html",
             "dev@kde.openoffice.org" );
-
+            
     kAboutData->addAuthor( ki18n( "Jan Holesovsky" ),
             ki18n( "Original author and maintainer of the KDE NWF." ),
             "kendy@artax.karlin.mff.cuni.cz",
@@ -98,7 +98,7 @@ void KDEXLib::Init()
     kAboutData->addAuthor( ki18n("Eric Bischoff"),
             ki18n( "Accessibility fixes, porting to KDE 4." ),
             "bischoff@kde.org" );
-
+            
     //kAboutData->setProgramIconName("OpenOffice");
 
     m_nFakeCmdLineArgs = 1;
@@ -108,7 +108,7 @@ void KDEXLib::Init()
     rtl::OString aDisplay;
     rtl::OUString aParam, aBin;
 
-    for ( nIdx = 0; nIdx < nParams; ++nIdx )
+    for ( nIdx = 0; nIdx < nParams; ++nIdx ) 
     {
         aCommandLine.getCommandArg( nIdx, aParam );
         if ( !m_pFreeCmdLineArgs && aParam.equalsAscii( "-display" ) && nIdx + 1 < nParams )
@@ -138,14 +138,14 @@ void KDEXLib::Init()
         m_pAppCmdLineArgs[i] = m_pFreeCmdLineArgs[i];
 
     KCmdLineArgs::init( m_nFakeCmdLineArgs, m_pAppCmdLineArgs, kAboutData );
-
+    
     m_pApplication = new VCLKDEApplication();
     kapp->disableSessionManagement();
     KApplication::setQuitOnLastWindowClosed(false);
-
+    
     Display* pDisp = QX11Info::display();
     SalKDEDisplay *pSalDisplay = new SalKDEDisplay(pDisp);
-
+    
     ((VCLKDEApplication*)m_pApplication)->disp = pSalDisplay;
 
     pInputMethod->CreateMethod( pDisp );
diff --git a/vcl/unx/kde4/KDEXLib.hxx b/vcl/unx/kde4/KDEXLib.hxx
index 985e0c3c6717..4672dee3fbb4 100644
--- a/vcl/unx/kde4/KDEXLib.hxx
+++ b/vcl/unx/kde4/KDEXLib.hxx
@@ -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
@@ -37,12 +37,12 @@ class KDEXLib : public SalXLib
         char** m_pFreeCmdLineArgs;
         char** m_pAppCmdLineArgs;
         int m_nFakeCmdLineArgs;
-
+        
     public:
         KDEXLib();
-
+                
         virtual ~KDEXLib();
         virtual void Init();
-
+            
         void doStartup();
 };
diff --git a/vcl/unx/kde4/VCLKDEApplication.cxx b/vcl/unx/kde4/VCLKDEApplication.cxx
index 2cfb071e96ae..bcebe4e52eb7 100644
--- a/vcl/unx/kde4/VCLKDEApplication.cxx
+++ b/vcl/unx/kde4/VCLKDEApplication.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
@@ -33,7 +33,7 @@
 
 #include "KDESalDisplay.hxx"
 
-VCLKDEApplication::VCLKDEApplication() :
+VCLKDEApplication::VCLKDEApplication() : 
     KApplication()
 {
     disp = 0;
@@ -47,6 +47,6 @@ bool VCLKDEApplication::x11EventFilter(XEvent* event)
     {
         return true;
     }
-
+    
     return false;
 }
 \ No newline at end of file
diff --git a/vcl/unx/kde4/VCLKDEApplication.hxx b/vcl/unx/kde4/VCLKDEApplication.hxx
index 2edfddd69a9c..f3d5afdf5312 100644
--- a/vcl/unx/kde4/VCLKDEApplication.hxx
+++ b/vcl/unx/kde4/VCLKDEApplication.hxx
@@ -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
@@ -44,10 +44,10 @@ class VCLKDEApplication : public KApplication
 {
     public:
         VCLKDEApplication();
-
+        
         virtual void commitData(QSessionManager&) {};
-
+        
         virtual bool x11EventFilter(XEvent* event);
-
+        
         SalKDEDisplay* disp;
 };
 \ No newline at end of file
diff --git a/vcl/unx/kde4/main.cxx b/vcl/unx/kde4/main.cxx
index 962a882af26b..fecbb4719d90 100644
--- a/vcl/unx/kde4/main.cxx
+++ b/vcl/unx/kde4/main.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
@@ -54,7 +54,7 @@ extern "C" {
         */
         if( ! ( pNoXInitThreads && *pNoXInitThreads ) )
             XInitThreads();
-
+        
 #if QT_VERSION < 0x050000
         // Qt 4.x support needs >= 4.1.0
         rtl::OString aVersion( qVersion() );
@@ -75,12 +75,12 @@ extern "C" {
             return NULL;
         }
 #endif
-
+        
         KDESalInstance* pInstance = new KDESalInstance( new SalYieldMutex() );
 #if OSL_DEBUG_LEVEL > 1
         fprintf( stderr, "created KDESalInstance 0x%p\n", pInstance );
 #endif
-
+        
         // initialize SalData
         KDEData *salData = new KDEData();
         SetSalData(salData);
diff --git a/vcl/unx/source/app/i18n_cb.cxx b/vcl/unx/source/app/i18n_cb.cxx
index d3a4f2b819ae..ecd6432a1947 100644
--- a/vcl/unx/source/app/i18n_cb.cxx
+++ b/vcl/unx/source/app/i18n_cb.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
@@ -412,7 +412,7 @@ PreeditDrawCallback(XIC ic, XPointer client_data,
       pPreeditData->aInputEv.mnCursorPos = call_data->caret;
       pPreeditData->aInputEv.maText = String (pPreeditData->aText.pUnicodeBuffer,
                                 pPreeditData->aText.nLength);
-    pPreeditData->aInputEv.mnCursorFlags    = 0; // default: make cursor visible
+    pPreeditData->aInputEv.mnCursorFlags 	= 0; // default: make cursor visible
       pPreeditData->aInputEv.mnDeltaStart = 0; // call_data->chg_first;
       pPreeditData->aInputEv.mbOnlyCursor = False;
 
@@ -537,13 +537,13 @@ CommitStringCallback( XIC ic, XPointer client_data, XPointer call_data )
     {
         if( pPreeditData->pFrame )
         {
-            pPreeditData->aInputEv.mnTime           = 0;
-            pPreeditData->aInputEv.mpTextAttr       = 0;
-            pPreeditData->aInputEv.mnCursorPos      = cbtext->length;
-            pPreeditData->aInputEv.maText           = UniString(p_unicode_data, cbtext->length);
-            pPreeditData->aInputEv.mnCursorFlags    = 0; // default: make cursor visible
-            pPreeditData->aInputEv.mnDeltaStart     = 0;
-            pPreeditData->aInputEv.mbOnlyCursor     = False;
+            pPreeditData->aInputEv.mnTime 			= 0;
+            pPreeditData->aInputEv.mpTextAttr 		= 0;
+            pPreeditData->aInputEv.mnCursorPos 		= cbtext->length;
+            pPreeditData->aInputEv.maText 			= UniString(p_unicode_data, cbtext->length);
+            pPreeditData->aInputEv.mnCursorFlags 	= 0; // default: make cursor visible
+            pPreeditData->aInputEv.mnDeltaStart 	= 0;
+            pPreeditData->aInputEv.mbOnlyCursor 	= False;
 
             pPreeditData->pFrame->CallCallback( SALEVENT_EXTTEXTINPUT, (void*)&pPreeditData->aInputEv);
             pPreeditData->pFrame->CallCallback( SALEVENT_ENDEXTTEXTINPUT, (void*)NULL );
diff --git a/vcl/unx/source/app/i18n_ic.cxx b/vcl/unx/source/app/i18n_ic.cxx
index 3064be9367e1..d2a7943c46c6 100644
--- a/vcl/unx/source/app/i18n_ic.cxx
+++ b/vcl/unx/source/app/i18n_ic.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
@@ -58,15 +58,15 @@ using namespace vcl;
 static void sendEmptyCommit( SalFrame* pFrame )
 {
     vcl::DeletionListener aDel( pFrame );
-
+    
     SalExtTextInputEvent aEmptyEv;
-    aEmptyEv.mnTime             = 0;
-    aEmptyEv.mpTextAttr         = 0;
-    aEmptyEv.maText             = String();
-    aEmptyEv.mnCursorPos        = 0;
-    aEmptyEv.mnCursorFlags      = 0;
-    aEmptyEv.mnDeltaStart       = 0;
-    aEmptyEv.mbOnlyCursor       = False;
+    aEmptyEv.mnTime 			= 0;
+    aEmptyEv.mpTextAttr 		= 0;
+    aEmptyEv.maText 		    = String();
+    aEmptyEv.mnCursorPos 		= 0;
+    aEmptyEv.mnCursorFlags 	    = 0;
+    aEmptyEv.mnDeltaStart 	    = 0;
+    aEmptyEv.mbOnlyCursor 	    = False;
     pFrame->CallCallback( SALEVENT_EXTTEXTINPUT, (void*)&aEmptyEv );
     if( ! aDel.isDeleted() )
         pFrame->CallCallback( SALEVENT_ENDEXTTEXTINPUT, NULL );
@@ -685,10 +685,10 @@ SalI18N_InputContext::SetICFocus( SalFrame* pFocusFrame )
     if ( mbUseable && (maContext != NULL)  )
     {
         maClientData.pFrame = pFocusFrame;
-
-        const SystemEnvData* pEnv   = pFocusFrame->GetSystemData();
-        XLIB_Window  aClientWindow  = pEnv->aShellWindow;
-        XLIB_Window  aFocusWindow   = pEnv->aWindow;
+        
+        const SystemEnvData* pEnv	= pFocusFrame->GetSystemData();
+        XLIB_Window  aClientWindow	= pEnv->aShellWindow;
+        XLIB_Window  aFocusWindow	= pEnv->aWindow;
 
         XSetICValues( maContext,
                       XNFocusWindow,       aFocusWindow,
@@ -701,7 +701,7 @@ SalI18N_InputContext::SetICFocus( SalFrame* pFocusFrame )
             // begin preedit again
             GetX11SalData()->GetDisplay()->SendInternalEvent( pFocusFrame, &maClientData.aInputEv, SALEVENT_EXTTEXTINPUT );
         }
-
+        
         XSetICFocus( maContext );
     }
 }
diff --git a/vcl/unx/source/app/i18n_im.cxx b/vcl/unx/source/app/i18n_im.cxx
index 9f1ffee3d1c4..54a5e0e87d1c 100644
--- a/vcl/unx/source/app/i18n_im.cxx
+++ b/vcl/unx/source/app/i18n_im.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
@@ -186,14 +186,14 @@ SetSystemEnvironment( const char* p_locale )
 
     char *p_buffer;
 
-    if (p_locale != NULL)
+    if (p_locale != NULL) 
     {
         p_buffer = (char*)alloca(10 + strlen(p_locale));
         sprintf(p_buffer, lc_all, p_locale);
         putenv(strdup(p_buffer));
         sprintf(p_buffer, lang, p_locale);
         putenv(strdup(p_buffer));
-    }
+    }     
 }
 #endif
 
@@ -227,10 +227,10 @@ IsXWindowCompatibleLocale( const char* p_locale )
     return True;
 }
 
-// Set the operating system locale prior to trying to open an
+// Set the operating system locale prior to trying to open an 
 // XIM InputMethod.
 // Handle the cases where the current locale is either not supported by the
-// operating system (LANG=gaga) or by the XWindow system (LANG=aa_ER@saaho)
+// operating system (LANG=gaga) or by the XWindow system (LANG=aa_ER@saaho) 
 // by providing a fallback.
 // Upgrade "C" or "POSIX" to "en_US" locale to allow umlauts and accents
 // see i8988, i9188, i8930, i16318
@@ -261,7 +261,7 @@ SalI18N_InputMethod::SetLocale( const char* pLocale )
                     mbUseable = False;
             }
         }
-
+        
         // must not fail if mbUseable since XSupportsLocale() asserts success
         if ( mbUseable && XSetLocaleModifiers("") == NULL )
         {
@@ -327,15 +327,15 @@ GetMethodName( XIMStyle nStyle, char *pBuf, int nBufSize)
 
     StyleName *pDescPtr;
     static const StyleName pDescription[] = {
-        { XIMPreeditArea,      "PreeditArea ",     sizeof("PreeditArea ")   },
+        { XIMPreeditArea, 	   "PreeditArea ", 	   sizeof("PreeditArea ")	},
         { XIMPreeditCallbacks, "PreeditCallbacks ",sizeof("PreeditCallbacks ")},
         { XIMPreeditPosition,  "PreeditPosition ", sizeof("PreeditPosition ") },
         { XIMPreeditNothing,   "PreeditNothing ",  sizeof("PreeditNothing ")  },
-        { XIMPreeditNone,      "PreeditNone ",     sizeof("PreeditNone ")   },
-        { XIMStatusArea,       "StatusArea ",      sizeof("StatusArea ")    },
+        { XIMPreeditNone, 	   "PreeditNone ",	   sizeof("PreeditNone ")	},
+        { XIMStatusArea, 	   "StatusArea ",      sizeof("StatusArea ")	},
         { XIMStatusCallbacks,  "StatusCallbacks ", sizeof("StatusCallbacks ") },
-        { XIMStatusNothing,    "StatusNothing ",   sizeof("StatusNothing ") },
-        { XIMStatusNone,       "StatusNone ",      sizeof("StatusNone ")    },
+        { XIMStatusNothing,    "StatusNothing ",   sizeof("StatusNothing ")	},
+        { XIMStatusNone, 	   "StatusNone ",      sizeof("StatusNone ")	},
         { 0, "NULL", 0 }
     };
 
@@ -468,7 +468,7 @@ SalI18N_InputMethod::CreateMethod ( Display *pDisplay )
         fprintf(stderr, "input method creation failed\n");
     #endif
 
-    maDestroyCallback.callback    = (XIMProc)IM_IMDestroyCallback;
+    maDestroyCallback.callback	  = (XIMProc)IM_IMDestroyCallback;
     maDestroyCallback.client_data = (XPointer)this;
     if (mbUseable && maMethod != NULL)
         XSetIMValues(maMethod, XNDestroyCallback, &maDestroyCallback, NULL);
@@ -481,7 +481,7 @@ SalI18N_InputMethod::CreateMethod ( Display *pDisplay )
 //
 
 Bool
-SalI18N_InputMethod::FilterEvent( XEvent *pEvent, XLIB_Window window    )
+SalI18N_InputMethod::FilterEvent( XEvent *pEvent, XLIB_Window window	)
 {
     if (!mbUseable)
         return False;
@@ -541,9 +541,9 @@ InputMethod_HasPendingEvent(int nFileDescriptor, void *pData)
 
     struct pollfd aFileDescriptor;
     #ifdef SOLARIS
-    nfds_t        nNumDescriptor = 1;
+    nfds_t 		  nNumDescriptor = 1;
     #else
-    unsigned int      nNumDescriptor = 1;
+    unsigned int	  nNumDescriptor = 1;
     #endif
     aFileDescriptor.fd      = nFileDescriptor;
     aFileDescriptor.events  = POLLRDNORM;
diff --git a/vcl/unx/source/app/i18n_keysym.cxx b/vcl/unx/source/app/i18n_keysym.cxx
index 812e54aae937..1571dd872536 100644
--- a/vcl/unx/source/app/i18n_keysym.cxx
+++ b/vcl/unx/source/app/i18n_keysym.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
@@ -33,18 +33,18 @@
 
 #include <i18n_keysym.hxx>
 
-// convert keysyms to unicode
+// convert keysyms to unicode 
 // for all keysyms with byte1 and byte2 equal zero, and of course only for
 // keysyms that have a unicode counterpart
 
 typedef const sal_Unicode unicode_t;
-typedef struct {
+typedef struct { 
     const int first; const int last;
-    unicode_t *map;
+    unicode_t *map; 
 } keymap_t;
 
-// Latin-1      Byte 3 = 0x00
-unicode_t keymap00_map[] = {
+// Latin-1 		Byte 3 = 0x00
+unicode_t keymap00_map[] = { 
     0x0020, 0x0021, 0x0022, 0x0023, 0x0024, 0x0025, 0x0026, 0x0027,
     0x0028, 0x0029, 0x002a, 0x002b, 0x002c, 0x002d, 0x002e, 0x002f,
     0x0030, 0x0031, 0x0032, 0x0033, 0x0034, 0x0035, 0x0036, 0x0037,
@@ -72,11 +72,11 @@ unicode_t keymap00_map[] = {
     0x00e0, 0x00e1, 0x00e2, 0x00e3, 0x00e4, 0x00e5, 0x00e6, 0x00e7,
     0x00e8, 0x00e9, 0x00ea, 0x00eb, 0x00ec, 0x00ed, 0x00ee, 0x00ef,
     0x00f0, 0x00f1, 0x00f2, 0x00f3, 0x00f4, 0x00f5, 0x00f6, 0x00f7,
-    0x00f8, 0x00f9, 0x00fa, 0x00fb, 0x00fc, 0x00fd, 0x00fe, 0x00ff };
+    0x00f8, 0x00f9, 0x00fa, 0x00fb, 0x00fc, 0x00fd, 0x00fe, 0x00ff }; 
 const keymap_t keymap00 = { 32, 255, keymap00_map };
 
-// Latin-2      Byte 3 = 0x01
-unicode_t keymap01_map[] = {
+// Latin-2		Byte 3 = 0x01
+unicode_t keymap01_map[] = { 
     0x0104, 0x02d8, 0x0141, 0x0000, 0x013d, 0x015a, 0x0000, 0x0000,
     0x0160, 0x015e, 0x0164, 0x0179, 0x0000, 0x017d, 0x017b, 0x0000,
     0x0105, 0x02db, 0x0142, 0x0000, 0x013e, 0x015b, 0x02c7, 0x0000,
@@ -88,11 +88,11 @@ unicode_t keymap01_map[] = {
     0x0000, 0x0000, 0x0103, 0x0000, 0x013a, 0x0107, 0x0000, 0x010d,
     0x0000, 0x0119, 0x0000, 0x011b, 0x0000, 0x0000, 0x010f, 0x0111,
     0x0144, 0x0148, 0x0000, 0x0000, 0x0151, 0x0000, 0x0000, 0x0159,
-    0x016f, 0x0000, 0x0171, 0x0000, 0x0000, 0x0163, 0x02d9 };
+    0x016f, 0x0000, 0x0171, 0x0000, 0x0000, 0x0163, 0x02d9 }; 
 const keymap_t keymap01 = { 161, 255, keymap01_map };
 
-// Latin-3      Byte 3 = 0x02
-unicode_t keymap02_map[] = {
+// Latin-3		Byte 3 = 0x02
+unicode_t keymap02_map[] = { 
     0x0126, 0x0000, 0x0000, 0x0000, 0x0000, 0x0124, 0x0000, 0x0000,
     0x0130, 0x0000, 0x011e, 0x0134, 0x0000, 0x0000, 0x0000, 0x0000,
     0x0127, 0x0000, 0x0000, 0x0000, 0x0000, 0x0125, 0x0000, 0x0000,
@@ -104,11 +104,11 @@ unicode_t keymap02_map[] = {
     0x0000, 0x0000, 0x0000, 0x0000, 0x010b, 0x0109, 0x0000, 0x0000,
     0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
     0x0000, 0x0000, 0x0000, 0x0000, 0x0121, 0x0000, 0x0000, 0x011d,
-    0x0000, 0x0000, 0x0000, 0x0000, 0x016d, 0x015d };
+    0x0000, 0x0000, 0x0000, 0x0000, 0x016d, 0x015d }; 
 const keymap_t keymap02 = { 161, 254, keymap02_map };
 
-// Latin-4      Byte 3 = 0x03
-unicode_t keymap03_map[] = {
+// Latin-4		Byte 3 = 0x03
+unicode_t keymap03_map[] = { 
     0x0138, 0x0156, 0x0000, 0x0128, 0x013b, 0x0000, 0x0000, 0x0000,
     0x0112, 0x0122, 0x0166, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
     0x0000, 0x0157, 0x0000, 0x0129, 0x013c, 0x0000, 0x0000, 0x0000,
@@ -120,11 +120,11 @@ unicode_t keymap03_map[] = {
     0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x012f, 0x0000, 0x0000,
     0x0000, 0x0000, 0x0117, 0x0000, 0x0000, 0x012b, 0x0000, 0x0146,
     0x014d, 0x0137, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0173,
-    0x0000, 0x0000, 0x0000, 0x0169, 0x016b };
+    0x0000, 0x0000, 0x0000, 0x0169, 0x016b }; 
 const keymap_t keymap03 = { 162, 254, keymap03_map };
 
-// Kana         Byte 3 = 0x04
-unicode_t keymap04_map[] = {
+// Kana			Byte 3 = 0x04
+unicode_t keymap04_map[] = { 
     0x203e, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
     0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
     0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
@@ -137,11 +137,11 @@ unicode_t keymap04_map[] = {
     0x30cb, 0x30cc, 0x30cd, 0x30ce, 0x30cf, 0x30d2, 0x30d5, 0x30d8,
     0x30db, 0x30de, 0x30df, 0x30e0, 0x30e1, 0x30e2, 0x30e4, 0x30e6,
     0x30e8, 0x30e9, 0x30ea, 0x30eb, 0x30ec, 0x30ed, 0x30ef, 0x30f3,
-    0x309b, 0x309c };
+    0x309b, 0x309c }; 
 const keymap_t keymap04 = { 126, 223, keymap04_map };
 
-// Arabic       Byte 3 = 0x05
-unicode_t keymap05_map[] = {
+// Arabic		Byte 3 = 0x05
+unicode_t keymap05_map[] = { 
     0x060c, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
     0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x061b,
     0x0000, 0x0000, 0x0000, 0x061f, 0x0000, 0x0621, 0x0622, 0x0623,
@@ -150,11 +150,11 @@ unicode_t keymap05_map[] = {
     0x0634, 0x0635, 0x0636, 0x0637, 0x0638, 0x0639, 0x063a, 0x0000,
     0x0000, 0x0000, 0x0000, 0x0000, 0x0640, 0x0641, 0x0642, 0x0643,
     0x0644, 0x0645, 0x0646, 0x0647, 0x0648, 0x0649, 0x064a, 0x064b,
-    0x064c, 0x064d, 0x064e, 0x064f, 0x0650, 0x0651, 0x0652 };
+    0x064c, 0x064d, 0x064e, 0x064f, 0x0650, 0x0651, 0x0652 }; 
 const keymap_t keymap05 = { 172, 242, keymap05_map };
 
-// Cyrillic     Byte 3 = 0x06
-unicode_t keymap06_map[] = {
+// Cyrillic		Byte 3 = 0x06	
+unicode_t keymap06_map[] = { 
     0x0452, 0x0453, 0x0451, 0x0454, 0x0455, 0x0456, 0x0457, 0x0458,
     0x0459, 0x045a, 0x045b, 0x045c, 0x0000, 0x045e, 0x045f, 0x2116,
     0x0402, 0x0403, 0x0401, 0x0404, 0x0405, 0x0406, 0x0407, 0x0408,
@@ -166,11 +166,11 @@ unicode_t keymap06_map[] = {
     0x0410, 0x0411, 0x0426, 0x0414, 0x0415, 0x0424, 0x0413, 0x0425,
     0x0418, 0x0419, 0x041a, 0x041b, 0x041c, 0x041d, 0x041e, 0x041f,
     0x042f, 0x0420, 0x0421, 0x0422, 0x0423, 0x0416, 0x0412, 0x042c,
-    0x042b, 0x0417, 0x0428, 0x042d, 0x0429, 0x0427, 0x042a };
+    0x042b, 0x0417, 0x0428, 0x042d, 0x0429, 0x0427, 0x042a }; 
 const keymap_t keymap06 = { 161, 255, keymap06_map };
 
-// Greek        Byte 3 = 0x07
-unicode_t keymap07_map[] = {
+// Greek		Byte 3 = 0x07
+unicode_t keymap07_map[] = { 
     0x0386, 0x0388, 0x0389, 0x038a, 0x03aa, 0x0000, 0x038c, 0x038e,
     0x03ab, 0x0000, 0x038f, 0x0000, 0x0000, 0x0385, 0x2015, 0x0000,
     0x03ac, 0x03ad, 0x03ae, 0x03af, 0x03ca, 0x0390, 0x03cc, 0x03cd,
@@ -182,11 +182,11 @@ unicode_t keymap07_map[] = {
     0x03b1, 0x03b2, 0x03b3, 0x03b4, 0x03b5, 0x03b6, 0x03b7, 0x03b8,
     0x03b9, 0x03ba, 0x03bb, 0x03bc, 0x03bd, 0x03be, 0x03bf, 0x03c0,
     0x03c1, 0x03c3, 0x03c2, 0x03c4, 0x03c5, 0x03c6, 0x03c7, 0x03c8,
-    0x03c9 };
+    0x03c9 }; 
 const keymap_t keymap07 = { 161, 249, keymap07_map };
 
-// Technical    Byte 3 = 0x08
-unicode_t keymap08_map[] = {
+// Technical	Byte 3 = 0x08
+unicode_t keymap08_map[] = { 
     0x23b7, 0x250c, 0x2500, 0x2320, 0x2321, 0x2502, 0x23a1, 0x23a3,
     0x23a4, 0x23a6, 0x239b, 0x239d, 0x239e, 0x23a0, 0x23a8, 0x23ac,
     0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
@@ -198,19 +198,19 @@ unicode_t keymap08_map[] = {
     0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
     0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x2202, 0x0000,
     0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0192, 0x0000, 0x0000,
-    0x0000, 0x0000, 0x2190, 0x2191, 0x2192, 0x2193 };
+    0x0000, 0x0000, 0x2190, 0x2191, 0x2192, 0x2193 }; 
 const keymap_t keymap08 = { 161, 254, keymap08_map };
 
-// Special      Byte 3 = 0x09
-unicode_t keymap09_map[] = {
+// Special		Byte 3 = 0x09
+unicode_t keymap09_map[] = { 
     0x25c6, 0x2592, 0x2409, 0x240c, 0x240d, 0x240a, 0x0000, 0x0000,
     0x2424, 0x240b, 0x2518, 0x2510, 0x250c, 0x2514, 0x253c, 0x23ba,
     0x23bb, 0x2500, 0x23bc, 0x23bd, 0x251c, 0x2524, 0x2534, 0x252c,
-    0x2502 };
+    0x2502 }; 
 const keymap_t keymap09 = { 224, 248, keymap09_map };
 
-// Publishing   Byte 3 = 0x0a = 10
-unicode_t keymap10_map[] = {
+// Publishing	Byte 3 = 0x0a = 10
+unicode_t keymap10_map[] = { 
     0x2003, 0x2002, 0x2004, 0x2005, 0x2007, 0x2008, 0x2009, 0x200a,
     0x2014, 0x2013, 0x0000, 0x0000, 0x0000, 0x2026, 0x2025, 0x2153,
     0x2154, 0x2155, 0x2156, 0x2157, 0x2158, 0x2159, 0x215a, 0x2105,
@@ -222,11 +222,11 @@ unicode_t keymap10_map[] = {
     0x25ab, 0x25ad, 0x25b3, 0x25bd, 0x2606, 0x2022, 0x25aa, 0x25b2,
     0x25bc, 0x261c, 0x261e, 0x2663, 0x2666, 0x2665, 0x0000, 0x2720,
     0x2020, 0x2021, 0x2713, 0x2717, 0x266f, 0x266d, 0x2642, 0x2640,
-    0x260e, 0x2315, 0x2117, 0x2038, 0x201a, 0x201e };
+    0x260e, 0x2315, 0x2117, 0x2038, 0x201a, 0x201e }; 
 const keymap_t keymap10 = { 161, 254, keymap10_map };
 
-// APL      Byte 3 = 0x0b = 11
-unicode_t keymap11_map[] = {
+// APL		Byte 3 = 0x0b = 11
+unicode_t keymap11_map[] = { 
     0x003c, 0x0000, 0x0000, 0x003e, 0x0000, 0x2228, 0x2227, 0x0000,
     0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
     0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
@@ -238,19 +238,19 @@ unicode_t keymap11_map[] = {
     0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
     0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
     0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
-    0x0000, 0x22a3 };
+    0x0000, 0x22a3 }; 
 const keymap_t keymap11 = { 163, 252, keymap11_map };
 
-// Hebrew   Byte 3 = 0x0c = 12
-unicode_t keymap12_map[] = {
+// Hebrew	Byte 3 = 0x0c = 12
+unicode_t keymap12_map[] = { 
     0x2017, 0x05d0, 0x05d1, 0x05d2, 0x05d3, 0x05d4, 0x05d5, 0x05d6,
     0x05d7, 0x05d8, 0x05d9, 0x05da, 0x05db, 0x05dc, 0x05dd, 0x05de,
     0x05df, 0x05e0, 0x05e1, 0x05e2, 0x05e3, 0x05e4, 0x05e5, 0x05e6,
-    0x05e7, 0x05e8, 0x05e9, 0x05ea };
+    0x05e7, 0x05e8, 0x05e9, 0x05ea }; 
 const keymap_t keymap12 = { 223, 250, keymap12_map };
 
-// Thai     Byte 3 = 0x0d = 13
-unicode_t keymap13_map[] = {
+// Thai		Byte 3 = 0x0d = 13
+unicode_t keymap13_map[] = { 
     0x0e01, 0x0e02, 0x0e03, 0x0e04, 0x0e05, 0x0e06, 0x0e07, 0x0e08,
     0x0e09, 0x0e0a, 0x0e0b, 0x0e0c, 0x0e0d, 0x0e0e, 0x0e0f, 0x0e10,
     0x0e11, 0x0e12, 0x0e13, 0x0e14, 0x0e15, 0x0e16, 0x0e17, 0x0e18,
@@ -262,11 +262,11 @@ unicode_t keymap13_map[] = {
     0x0e41, 0x0e42, 0x0e43, 0x0e44, 0x0e45, 0x0e46, 0x0e47, 0x0e48,
     0x0e49, 0x0e4a, 0x0e4b, 0x0e4c, 0x0e4d, 0x0000, 0x0000, 0x0e50,
     0x0e51, 0x0e52, 0x0e53, 0x0e54, 0x0e55, 0x0e56, 0x0e57, 0x0e58,
-    0x0e59 };
+    0x0e59 }; 
 const keymap_t keymap13 = { 161, 249, keymap13_map };
 
-// Korean       Byte 3 = 0x0e = 14
-unicode_t keymap14_map[] = {
+// Korean		Byte 3 = 0x0e = 14
+unicode_t keymap14_map[] = { 
     0x3131, 0x3132, 0x3133, 0x3134, 0x3135, 0x3136, 0x3137, 0x3138,
     0x3139, 0x313a, 0x313b, 0x313c, 0x313d, 0x313e, 0x313f, 0x3140,
     0x3141, 0x3142, 0x3143, 0x3144, 0x3145, 0x3146, 0x3147, 0x3148,
@@ -278,31 +278,31 @@ unicode_t keymap14_map[] = {
     0x11b5, 0x11b6, 0x11b7, 0x11b8, 0x11b9, 0x11ba, 0x11bb, 0x11bc,
     0x11bd, 0x11be, 0x11bf, 0x11c0, 0x11c1, 0x11c2, 0x316d, 0x3171,
     0x3178, 0x317f, 0x3181, 0x3184, 0x3186, 0x318d, 0x318e, 0x11eb,
-    0x11f0, 0x11f9, 0x0000, 0x0000, 0x0000, 0x0000, 0x20a9 };
+    0x11f0, 0x11f9, 0x0000, 0x0000, 0x0000, 0x0000, 0x20a9 }; 
 const keymap_t keymap14 = { 161, 255, keymap14_map };
 
 // missing:
-// Latin-8      Byte 3 = 0x12 = 18
+// Latin-8  	Byte 3 = 0x12 = 18
 
-// Latin-9      Byte 3 = 0x13 = 19
-unicode_t keymap19_map[] = {
-    0x0152, 0x0153, 0x0178 };
+// Latin-9 		Byte 3 = 0x13 = 19
+unicode_t keymap19_map[] = { 
+    0x0152, 0x0153, 0x0178 }; 
 const keymap_t keymap19 = { 188, 190, keymap19_map };
 
 // missing:
-// Armenian     Byte 3 = 0x14 = 20
-// Georgian     Byte 3 = 0x15 = 21
-// Azeri        Byte 3 = 0x16 = 22
-// Vietnamese   Byte 3 = 0x1e = 30
+// Armenian 	Byte 3 = 0x14 = 20
+// Georgian 	Byte 3 = 0x15 = 21
+// Azeri 		Byte 3 = 0x16 = 22
+// Vietnamese 	Byte 3 = 0x1e = 30
 
-// Currency     Byte 3 = 0x20 = 32
-unicode_t keymap32_map[] = {
+// Currency		Byte 3 = 0x20 = 32
+unicode_t keymap32_map[] = { 
     0x20a0, 0x20a1, 0x20a2, 0x20a3, 0x20a4, 0x20a5, 0x20a6, 0x20a7,
-    0x20a8, 0x0000, 0x20aa, 0x20ab, 0x20ac };
+    0x20a8, 0x0000, 0x20aa, 0x20ab, 0x20ac }; 
 const keymap_t keymap32 = { 160, 172, keymap32_map };
 
 // Keyboard (Keypad mappings) Byte 3 = 0xff = 255
-unicode_t keymap255_map[] = {
+unicode_t keymap255_map[] = { 
     0x0020, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
     0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
     0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
@@ -310,20 +310,20 @@ unicode_t keymap255_map[] = {
     0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
     0x0000, 0x0000, 0x002a, 0x002b, 0x002c, 0x002d, 0x002e, 0x002f,
     0x0030, 0x0031, 0x0032, 0x0033, 0x0034, 0x0035, 0x0036, 0x0037,
-    0x0038, 0x0039, 0x0000, 0x0000, 0x0000, 0x003d };
+    0x0038, 0x0039, 0x0000, 0x0000, 0x0000, 0x003d }; 
 const keymap_t keymap255 = { 128, 189, keymap255_map };
 
 #define INITIAL_KEYMAPS 33
 const keymap_t* p_keymap[INITIAL_KEYMAPS] = {
-    &keymap00, &keymap01, &keymap02, &keymap03,                         /* 00 -- 03 */
-    &keymap04, &keymap05, &keymap06, &keymap07,                         /* 04 -- 07 */
-    &keymap08, &keymap09, &keymap10, &keymap11,                         /* 08 -- 11 */
-    &keymap12, &keymap13, &keymap14, (keymap_t*)NULL,                   /* 12 -- 15 */
-    (keymap_t*)NULL, (keymap_t*)NULL, (keymap_t*)NULL, &keymap19,       /* 16 -- 19 */
+    &keymap00, &keymap01, &keymap02, &keymap03, 						/* 00 -- 03 */
+    &keymap04, &keymap05, &keymap06, &keymap07, 						/* 04 -- 07 */
+    &keymap08, &keymap09, &keymap10, &keymap11, 						/* 08 -- 11 */
+    &keymap12, &keymap13, &keymap14, (keymap_t*)NULL,					/* 12 -- 15 */
+    (keymap_t*)NULL, (keymap_t*)NULL, (keymap_t*)NULL, &keymap19,		/* 16 -- 19 */
     (keymap_t*)NULL, (keymap_t*)NULL, (keymap_t*)NULL, (keymap_t*)NULL, /* 20 -- 23 */
     (keymap_t*)NULL, (keymap_t*)NULL, (keymap_t*)NULL, (keymap_t*)NULL, /* 24 -- 27 */
     (keymap_t*)NULL, (keymap_t*)NULL, (keymap_t*)NULL, (keymap_t*)NULL, /* 28 -- 31 */
-    &keymap32                                                           /* 32 */
+    &keymap32															/* 32 */
 };
 
 sal_Unicode
diff --git a/vcl/unx/source/app/i18n_status.cxx b/vcl/unx/source/app/i18n_status.cxx
index 3a6ae26a2b0e..9891376d6d27 100644
--- a/vcl/unx/source/app/i18n_status.cxx
+++ b/vcl/unx/source/app/i18n_status.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
@@ -92,17 +92,17 @@ namespace vcl {
 
 class XIMStatusWindow : public StatusWindow
 {
-    FixedText               m_aStatusText;
-    SalFrame*               m_pLastParent;
-    Size                    m_aWindowSize;
+    FixedText				m_aStatusText;
+    SalFrame*				m_pLastParent;
+    Size					m_aWindowSize;
     bool                    m_bAnchoredAtRight;
         // true if the right edge (instead of the left edge) should stay at a
         // fixed position when re-sizing the window
 
     // for delayed showing
-    bool                    m_bDelayedShow;
-    I18NStatus::ShowReason  m_eDelayedReason;
-    ULONG                   m_nDelayedEvent;
+    bool					m_bDelayedShow;
+    I18NStatus::ShowReason	m_eDelayedReason;
+    ULONG					m_nDelayedEvent;
     // for toggling
     bool                    m_bOn;
 
@@ -207,7 +207,7 @@ Point XIMStatusWindow::updatePosition()
     if( checkLastParent() )
     {
         const SystemEnvData* pParentEnvData = m_pLastParent->GetSystemData();
-
+        
         SalExtTextInputPosEvent aPosEvent;
         m_pLastParent->CallCallback( SALEVENT_EXTTEXTINPUTPOS, (void*)&aPosEvent );
         int x, y;
@@ -318,9 +318,9 @@ namespace vcl {
 
 class IIIMPStatusWindow : public StatusWindow
 {
-    MenuButton              m_aStatusBtn;
-    PopupMenu               m_aMenu;
-    SalFrame*               m_pResetFocus;
+    MenuButton				m_aStatusBtn;
+    PopupMenu				m_aMenu;
+    SalFrame*				m_pResetFocus;
     bool                    m_bShow;
     bool                    m_bOn;
 
@@ -613,7 +613,7 @@ void I18NStatus::setStatusText( const String& rText )
         String aText( pBuffer );
         m_pStatusWindow->setText( aText );
         m_pStatusWindow->setPosition( m_pParent );
-
+        
         bool bVisible = true;
         if( m_pParent )
         {
@@ -624,7 +624,7 @@ void I18NStatus::setStatusText( const String& rText )
                 bVisible = false;
             }
         }
-
+        
         m_pStatusWindow->show( bVisible, contextmap );
     }
 }
@@ -655,8 +655,8 @@ void I18NStatus::clearChoices()
 void I18NStatus::addChoice( const String& rChoice, void* pData )
 {
     ChoiceData aData;
-    aData.pData     = pData;
-    aData.aString   = rChoice;
+    aData.pData		= pData;
+    aData.aString	= rChoice;
     m_aChoices.push_back( aData );
 }
 
diff --git a/vcl/unx/source/app/i18n_wrp.cxx b/vcl/unx/source/app/i18n_wrp.cxx
index eb48962a24d0..2eb1fbba1941 100644
--- a/vcl/unx/source/app/i18n_wrp.cxx
+++ b/vcl/unx/source/app/i18n_wrp.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
@@ -28,7 +28,7 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_vcl.hxx"
 
-struct XIMArg
+struct XIMArg 
 {
     char *name;
     char *value;
@@ -47,7 +47,7 @@ struct XIMArg
 #include <X11/Xlibint.h>
 #include "XIM.h"
 
-#define XIIIMP_LIB       "xiiimp.so.2"
+#define XIIIMP_LIB		 "xiiimp.so.2"
 
 #ifdef SOLARIS
 #define XIIIMP_PATH     "/usr/openwin/lib/locale/common/" XIIIMP_LIB
@@ -168,8 +168,8 @@ XvaGetArgs( va_list pInArgs, XIMArg *pOutArgs )
 #ifdef __cplusplus
 extern "C"
 #endif
-XIM
-XvaOpenIM(Display *display, XrmDatabase rdb,
+XIM 
+XvaOpenIM(Display *display, XrmDatabase rdb, 
         char *res_name, char *res_class, ...)
 {
       XIM xim = (XIM)0;
@@ -179,7 +179,7 @@ XvaOpenIM(Display *display, XrmDatabase rdb,
       /*
         * so count the stuff dangling here
      */
-
+  
 #if defined(SOLARIS) && !defined(__GNUC__)
       va_start(variable);
 #else
@@ -188,8 +188,8 @@ XvaOpenIM(Display *display, XrmDatabase rdb,
       total_count = XvaCountArgs(variable);
       va_end(variable);
 
-      if (total_count > 0)
-    {
+      if (total_count > 0) 
+    { 
         /* call a new open IM method */
 
         XIMArg* args = (XIMArg*)alloca( (total_count + 1) * sizeof(XIMArg) );
@@ -205,23 +205,23 @@ XvaOpenIM(Display *display, XrmDatabase rdb,
         XvaGetArgs( variable, args );
         va_end(variable);
 
-        if (!g_dlmodule)
+        if (!g_dlmodule) 
         {
             g_dlmodule = dlopen(XIIIMP_LIB, RTLD_LAZY);
             if(!g_dlmodule)
             {
                 g_dlmodule = dlopen(XIIIMP_PATH, RTLD_LAZY);
-                if (!g_dlmodule)
+                if (!g_dlmodule) 
                     goto legacy_XIM;
             }
               g_open_im = (OpenFunction)(long)dlsym(g_dlmodule, "__XOpenIM");
-              if (!g_open_im)
+              if (!g_open_im) 
                 goto legacy_XIM;
 
               xim = (*g_open_im)(display, (XrmDatabase)rdb,
                   (char*)res_name, (char *)res_class, (XIMArg*)args);
-        }
-        else
+        } 
+        else 
         {
               goto legacy_XIM;
         }
@@ -229,10 +229,10 @@ XvaOpenIM(Display *display, XrmDatabase rdb,
 
 // in #if to prevent warning "warning: label 'legacy_XIM' defined but not used"
      legacy_XIM:
-
+    
     if (!xim)
         xim = XOpenIM(display, rdb, res_name, res_class);
-
+  
     return xim;
 }
 
@@ -244,8 +244,8 @@ Status XvaCloseIM(XIM)
 {
       Status s = False;
 
-    if (!g_dlmodule)
-    {
+    if (!g_dlmodule) 
+    {		
         /* assuming one XvaOpenIM call */
         dlclose(g_dlmodule);
             g_dlmodule = (void*)0;
diff --git a/vcl/unx/source/app/i18n_xkb.cxx b/vcl/unx/source/app/i18n_xkb.cxx
index e9a787eda667..fc6bdb6c4bc9 100644
--- a/vcl/unx/source/app/i18n_xkb.cxx
+++ b/vcl/unx/source/app/i18n_xkb.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
@@ -49,8 +49,8 @@ pDisplay
 
     // allow user to set the default keyboard group idx or to disable the usage
     // of x keyboard extension at all:
-    //      setenv SAL_XKEYBOARDGROUP       disables keyboard extension
-    //      setenv SAL_XKEYBOARDGROUP 2     sets the keyboard group index to 2
+    // 		setenv SAL_XKEYBOARDGROUP		disables keyboard extension
+    // 		setenv SAL_XKEYBOARDGROUP 2		sets the keyboard group index to 2
     // keyboard group index must be in [1,4], may be specified in hex or decimal
     static char *pUseKeyboardExtension = getenv( "SAL_XKEYBOARDGROUP" );
     if ( pUseKeyboardExtension != NULL )
@@ -149,7 +149,7 @@ SalI18N_KeyboardExtension::LookupKeysymInGroup( sal_uInt32,sal_uInt32,sal_uInt32
 
     nShiftState &= ShiftMask;
 
-    KeySym      nKeySymbol;
+    KeySym		nKeySymbol;
     nKeySymbol = XkbKeycodeToKeysym( mpDisplay, nKeyCode, nGroup, nShiftState );
     return nKeySymbol;
 
diff --git a/vcl/unx/source/app/keysymnames.cxx b/vcl/unx/source/app/keysymnames.cxx
index c9515f016433..2f483787fbcd 100644
--- a/vcl/unx/source/app/keysymnames.cxx
+++ b/vcl/unx/source/app/keysymnames.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
@@ -38,16 +38,16 @@
 #include <X11/keysym.h>
 
 #if !defined (SunXK_Undo)
-#define SunXK_Undo      0x0000FF65  // XK_Undo
-#define SunXK_Again     0x0000FF66  // XK_Redo
-#define SunXK_Find      0x0000FF68  // XK_Find
-#define SunXK_Stop      0x0000FF69  // XK_Cancel
-#define SunXK_Props     0x1005FF70
-#define SunXK_Front     0x1005FF71
-#define SunXK_Copy      0x1005FF72
-#define SunXK_Open      0x1005FF73
-#define SunXK_Paste     0x1005FF74
-#define SunXK_Cut       0x1005FF75
+#define SunXK_Undo		0x0000FF65	// XK_Undo
+#define SunXK_Again		0x0000FF66	// XK_Redo
+#define SunXK_Find		0x0000FF68	// XK_Find
+#define SunXK_Stop		0x0000FF69	// XK_Cancel
+#define SunXK_Props		0x1005FF70
+#define SunXK_Front		0x1005FF71
+#define SunXK_Copy		0x1005FF72
+#define SunXK_Open		0x1005FF73
+#define SunXK_Paste		0x1005FF74
+#define SunXK_Cut		0x1005FF75
 #endif
 
 #ifdef SOLARIS
@@ -68,17 +68,17 @@ namespace vcl_sal {
 
     struct KeysymNameReplacement
     {
-        KeySym          aSymbol;
-        const char*     pName;
+        KeySym			aSymbol;
+        const char*		pName;
     };
 
     struct KeyboardReplacements
     {
-        const char*                     pKeyboardName;
-        const KeysymNameReplacement*    pReplacements;
-        int                             nReplacements;
+        const char*						pKeyboardName;
+        const KeysymNameReplacement*	pReplacements;
+        int								nReplacements;
     };
-
+    
     // ====================================================================
     //
     // CAUTION CAUTION CAUTION
@@ -91,7 +91,7 @@ namespace vcl_sal {
     {
         { XK_Control_L, "Ctrl" },
         { XK_Control_R, "Ctrl" },
-        { XK_Escape, "Esc" },
+        { XK_Escape, "Esc" }, 
         { XK_space, "Space" },
         { XK_minus, "-" },
         { XK_plus, "+" }
@@ -105,7 +105,7 @@ namespace vcl_sal {
         { XK_Left, "Sol" },
         { XK_Up, "Yukarı" },
         { XK_Down, "Aşağı" },
-        { XK_space, "Boşluk" }
+        { XK_space, "Boşluk" } 
     };
 
     static const struct KeysymNameReplacement aImplReplacements_Russian[] =
@@ -114,7 +114,7 @@ namespace vcl_sal {
         { XK_Left, "Влево" },
         { XK_Up, "Вверх" },
         { XK_Down, "Вниз" },
-        { XK_space, "Пробел" }
+        { XK_space, "Пробел" } 
     };
 
     static const struct KeysymNameReplacement aImplReplacements_German[] =
@@ -448,7 +448,7 @@ namespace vcl_sal {
 
 #ifdef SOLARIS
 typedef struct {
-    int         n_layout;
+    int 		n_layout;
     const char* p_description;
 } keyboard_layout;
 
diff --git a/vcl/unx/source/app/randrwrapper.cxx b/vcl/unx/source/app/randrwrapper.cxx
index 27f9b1d1b77c..7662e470da10 100644
--- a/vcl/unx/source/app/randrwrapper.cxx
+++ b/vcl/unx/source/app/randrwrapper.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
@@ -42,7 +42,7 @@ namespace
 class RandRWrapper
 {
     oslModule m_pRandRLib;
-
+    
     // function pointers
     Bool(*m_pXRRQueryExtension)(Display*,int*,int*);
     Status(*m_pXRRQueryVersion)(Display*,int*,int*);
@@ -54,17 +54,17 @@ class RandRWrapper
     XRRScreenSize*(*m_pXRRConfigSizes)(XRRScreenConfiguration*,int*);
     SizeID(*m_pXRRConfigCurrentConfiguration)(XRRScreenConfiguration*,Rotation*);
     int(*m_pXRRRootToScreen)(Display*, XLIB_Window);
-
+    
     bool m_bValid;
-
+    
     void initFromModule();
-
+    
     RandRWrapper(Display*);
     ~RandRWrapper();
 public:
     static RandRWrapper& get(Display*);
     static void releaseWrapper();
-
+    
     Bool XRRQueryExtension(Display* i_pDisp, int* o_event_base, int* o_error_base )
     {
         Bool bRet = False;
@@ -124,7 +124,7 @@ void RandRWrapper::initFromModule()
     m_pXRRConfigSizes = (XRRScreenSize*(*)(XRRScreenConfiguration*,int*))osl_getAsciiFunctionSymbol( m_pRandRLib, "XRRConfigSizes" );
     m_pXRRConfigCurrentConfiguration = (SizeID(*)(XRRScreenConfiguration*,Rotation*))osl_getAsciiFunctionSymbol( m_pRandRLib, "XRRConfigCurrentConfiguration" );
     m_pXRRRootToScreen = (int(*)(Display*,XLIB_Window))osl_getAsciiFunctionSymbol( m_pRandRLib, "XRRRootToScreen" );
-
+    
     m_bValid = m_pXRRQueryExtension             &&
                m_pXRRQueryVersion               &&
                m_pXRRGetScreenInfo              &&
@@ -200,12 +200,12 @@ void RandRWrapper::releaseWrapper()
 class RandRWrapper
 {
     bool m_bValid;
-
+    
     RandRWrapper(Display*);
 public:
     static RandRWrapper& get(Display*);
     static void releaseWrapper();
-
+    
     Bool XRRQueryExtension(Display* i_pDisp, int* o_event_base, int* o_error_base )
     {
         Bool bRet = False;
@@ -281,7 +281,7 @@ void RandRWrapper::releaseWrapper()
 } // namespace
 
 #endif
-
+ 
 #include "saldisp.hxx"
 #include "salframe.h"
 #if OSL_DEBUG_LEVEL > 1
@@ -305,7 +305,7 @@ void SalDisplay::DeInitRandR()
         RandRWrapper::releaseWrapper();
 #if OSL_DEBUG_LEVEL > 1
     fprintf( stderr, "SalDisplay::DeInitRandR()\n" );
-#endif
+#endif    
     #endif
 }
 
@@ -330,18 +330,18 @@ int SalDisplay::processRandREvent( XEvent* pEvent )
                     int nSizes = 0;
                     Rotation nRot = 0;
                     SizeID nId = 0;
-
+                
                     pConfig = pWrapper->XRRGetScreenInfo( GetDisplay(), m_aScreens[i].m_aRoot );
                     nId = pWrapper->XRRConfigCurrentConfiguration( pConfig, &nRot );
                     pSizes = pWrapper->XRRConfigSizes( pConfig, &nSizes );
                     XRRScreenSize *pTargetSize = pSizes + nId;
-
+                    
                     bNotify = bNotify ||
                               m_aScreens[i].m_aSize.Width() != pTargetSize->width ||
                               m_aScreens[i].m_aSize.Height() != pTargetSize->height;
-
+                
                     m_aScreens[i].m_aSize = Size( pTargetSize->width, pTargetSize->height );
-
+    
                     pWrapper->XRRFreeScreenConfigInfo( pConfig );
 
                     #if OSL_DEBUG_LEVEL > 1
diff --git a/vcl/unx/source/app/saldata.cxx b/vcl/unx/source/app/saldata.cxx
index 50ef71df8619..979a82d22bc1 100644
--- a/vcl/unx/source/app/saldata.cxx
+++ b/vcl/unx/source/app/saldata.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
@@ -95,7 +95,7 @@
 
 // -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
 static const struct timeval noyield__ = { 0, 0 };
-static const struct timeval yield__   = { 0, 10000 };
+static const struct timeval yield__	  = { 0, 10000 };
 
 static const char* XRequest[] = {
     // see /usr/lib/X11/XErrorDB, /usr/openwin/lib/XErrorDB ...
@@ -239,7 +239,7 @@ int X11SalData::XErrorHdl( Display *pDisplay, XErrorEvent *pEvent )
 }
 
 int X11SalData::XIOErrorHdl( Display * )
-{
+{                                
     /*  #106197# hack: until a real shutdown procedure exists
      *  _exit ASAP
      */
@@ -268,14 +268,14 @@ int X11SalData::XIOErrorHdl( Display * )
 
 X11SalData::X11SalData()
 {
-    bNoExceptions_  = !!getenv( "SAL_NOSEGV" );
+    bNoExceptions_	= !!getenv( "SAL_NOSEGV" );
 
-    pXLib_          = NULL;
-    m_pSalDisplay   = NULL;
-    m_pInstance     = NULL;
-    m_pPlugin       = NULL;
+    pXLib_			= NULL;
+    m_pSalDisplay	= NULL;
+    m_pInstance		= NULL;
+    m_pPlugin		= NULL;
 
-    hMainThread_    = pthread_self();
+    hMainThread_	= pthread_self();
     osl_getLocalHostname( &maLocalHostName.pData );
 }
 
@@ -287,9 +287,9 @@ X11SalData::~X11SalData()
 void X11SalData::DeleteDisplay()
 {
     delete m_pSalDisplay;
-    m_pSalDisplay   = NULL;
+    m_pSalDisplay	= NULL;
     delete pXLib_;
-    pXLib_      = NULL;
+    pXLib_		= NULL;
 }
 
 void X11SalData::Init()
@@ -310,11 +310,11 @@ void X11SalData::deInitNWF( void )
 // -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
 SalXLib::SalXLib()
 {
-    m_aTimeout.tv_sec       = 0;
-    m_aTimeout.tv_usec      = 0;
-    m_nTimeoutMS            = 0;
+    m_aTimeout.tv_sec 		= 0;
+    m_aTimeout.tv_usec		= 0;
+    m_nTimeoutMS 			= 0;
 
-    nFDs_                   = 0;
+    nFDs_					= 0;
     FD_ZERO( &aReadFDS_ );
     FD_ZERO( &aExceptionFDS_ );
 
@@ -353,8 +353,8 @@ SalXLib::SalXLib()
         nFDs_ = m_pTimeoutFDS[0] + 1;
     }
 
-    m_bHaveSystemChildFrames        = false;
-    m_aOrigXIOErrorHandler = XSetIOErrorHandler ( (XIOErrorHandler)X11SalData::XIOErrorHdl );
+    m_bHaveSystemChildFrames		= false;
+    m_aOrigXIOErrorHandler = XSetIOErrorHandler	( (XIOErrorHandler)X11SalData::XIOErrorHdl );
     PushXErrorLevel( !!getenv( "SAL_IGNOREXERRORS" ) );
 }
 
@@ -363,7 +363,7 @@ SalXLib::~SalXLib()
     // close 'wakeup' pipe.
     close (m_pTimeoutFDS[0]);
     close (m_pTimeoutFDS[1]);
-
+    
     PopXErrorLevel();
     XSetIOErrorHandler (m_aOrigXIOErrorHandler);
 }
@@ -400,7 +400,7 @@ void SalXLib::Init()
      *  o  $DISPLAY environment variable
      *  o  default display
      */
-
+    
     Display *pDisp = NULL;
 
     // is there a -display command line parameter?
@@ -408,7 +408,7 @@ void SalXLib::Init()
     sal_uInt32 nParams = aCommandLine.getCommandArgCount();
     rtl::OUString aParam;
     rtl::OString aDisplay;
-    for (USHORT i=0; i<nParams; i++)
+    for (USHORT i=0; i<nParams; i++) 
     {
         aCommandLine.getCommandArg(i, aParam);
         if (aParam.equalsAscii("-display"))
@@ -421,8 +421,8 @@ void SalXLib::Init()
             {
                 /*
                  * if a -display switch was used, we need
-                 * to set the environment accoringly since
-                 * the clipboard build another connection
+                 * to set the environment accoringly since 
+                 * the clipboard build another connection 
                  * to the xserver using $DISPLAY
                  */
                 const char envpre[] = "DISPLAY=";
@@ -434,7 +434,7 @@ void SalXLib::Init()
         }
     }
 
-    if (!pDisp && !aDisplay.getLength())
+    if (!pDisp && !aDisplay.getLength()) 
     {
         // Open $DISPLAY or default...
         char *pDisplay = getenv("DISPLAY");
@@ -453,9 +453,9 @@ void SalXLib::Init()
                                             aProgramSystemPath,
                                             osl_getThreadTextEncoding() );
         std::fprintf( stderr, "%s X11 error: Can't open display: %s\n",
-                aProgramName.getStr(), aDisplay.getStr());
-        std::fprintf( stderr, "   Set DISPLAY environment variable, use -display option\n");
-        std::fprintf( stderr, "   or check permissions of your X-Server\n");
+                aProgramName.getStr(), aDisplay.getStr()); 
+        std::fprintf( stderr, "   Set DISPLAY environment variable, use -display option\n"); 
+        std::fprintf( stderr, "   or check permissions of your X-Server\n"); 
         std::fprintf( stderr, "   (See \"man X\" resp. \"man xhost\" for details)\n");
         std::fflush( stderr );
         exit(0);
@@ -523,7 +523,7 @@ static void PrintXError( Display *pDisplay, XErrorEvent *pEvent )
         std::fprintf( stderr, "These errors are reported asynchronously,\n");
         std::fprintf( stderr, "set environment variable SAL_SYNCHRONIZE to 1 to help debugging\n");
     }
-
+    
     std::fflush( stdout );
     std::fflush( stderr );
 }
@@ -567,13 +567,13 @@ void SalXLib::XError( Display *pDisplay, XErrorEvent *pEvent )
         oslSignalAction eToDo = osl_raiseSignal (OSL_SIGNAL_USER_X11SUBSYSTEMERROR, NULL);
         switch (eToDo)
         {
-            case osl_Signal_ActIgnore       :
+            case osl_Signal_ActIgnore		:
                 return;
-            case osl_Signal_ActAbortApp     :
+            case osl_Signal_ActAbortApp 	:
                 abort();
-            case osl_Signal_ActKillApp      :
+            case osl_Signal_ActKillApp		:
                 exit(0);
-            case osl_Signal_ActCallNextHdl  :
+            case osl_Signal_ActCallNextHdl	:
                 break;
             default :
                 break;
@@ -586,16 +586,16 @@ void SalXLib::XError( Display *pDisplay, XErrorEvent *pEvent )
 
 struct YieldEntry
 {
-    YieldEntry* next;       // pointer to next entry
-    int         fd;         // file descriptor for reading
-    void*           data;       // data for predicate and callback
-    YieldFunc       pending;    // predicate (determins pending events)
-    YieldFunc       queued;     // read and queue up events
-    YieldFunc       handle;     // handle pending events
-
-    inline int  HasPendingEvent()   const { return pending( fd, data ); }
-    inline int  IsEventQueued()     const { return queued( fd, data ); }
-    inline void HandleNextEvent()   const { handle( fd, data ); }
+    YieldEntry* next;		// pointer to next entry
+    int 		fd; 		// file descriptor for reading
+    void*			data;		// data for predicate and callback
+    YieldFunc		pending;	// predicate (determins pending events)
+    YieldFunc		queued; 	// read and queue up events
+    YieldFunc		handle; 	// handle pending events
+
+    inline int	HasPendingEvent()	const { return pending( fd, data ); }
+    inline int	IsEventQueued() 	const { return queued( fd, data ); }
+    inline void HandleNextEvent()	const { handle( fd, data ); }
 };
 
 #define MAX_NUM_DESCRIPTORS 128
@@ -603,18 +603,18 @@ struct YieldEntry
 static YieldEntry yieldTable[ MAX_NUM_DESCRIPTORS ];
 
 void SalXLib::Insert( int nFD, void* data,
-                      YieldFunc     pending,
-                      YieldFunc     queued,
-                      YieldFunc     handle )
+                      YieldFunc 	pending,
+                      YieldFunc 	queued,
+                      YieldFunc 	handle )
 {
     DBG_ASSERT( nFD, "can not insert stdin descriptor" );
     DBG_ASSERT( !yieldTable[nFD].fd, "SalXLib::Insert fd twice" );
 
-    yieldTable[nFD].fd      = nFD;
-    yieldTable[nFD].data    = data;
+    yieldTable[nFD].fd		= nFD;
+    yieldTable[nFD].data	= data;
     yieldTable[nFD].pending = pending;
-    yieldTable[nFD].queued  = queued;
-    yieldTable[nFD].handle  = handle;
+    yieldTable[nFD].queued	= queued;
+    yieldTable[nFD].handle	= handle;
 
     FD_SET( nFD, &aReadFDS_ );
     FD_SET( nFD, &aExceptionFDS_ );
@@ -689,7 +689,7 @@ void SalXLib::Yield( bool bWait, bool bHandleAllCurrentEvents )
                 // #63862# da jetzt alle user-events ueber die interne
                 // queue kommen, wird die Kontrolle analog zum select
                 // gesteuerten Zweig einmal bei bWait abgegeben
-
+                
                 /* #i9277# do not reschedule since performance gets down the
                    the drain under heavy load
                 YieldMutexReleaser aReleaser;
@@ -866,6 +866,6 @@ rtl::OString X11SalData::getFrameResName( SalExtStyle nStyle )
     aBuf.append( getFrameResName() );
     if( (nStyle & SAL_FRAME_EXT_STYLE_DOCUMENT) )
         aBuf.append( ".DocumentWindow" );
-
+    
     return aBuf.makeStringAndClear();
 }
diff --git a/vcl/unx/source/app/saldisp.cxx b/vcl/unx/source/app/saldisp.cxx
index 13a0d1093c8e..8e4263d9ffa8 100644
--- a/vcl/unx/source/app/saldisp.cxx
+++ b/vcl/unx/source/app/saldisp.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
@@ -297,26 +297,26 @@ sal_IsLocalDisplay( Display *pDisplay )
         return sal_IsDisplayNumber( pDisplayString + 1 );
 
     // check for fixed token which all mean localhost:x.y
-    const char  pLocal[]    = "localhost:";
-    const int   nLocalLen   = sizeof(pLocal) - 1;
+    const char  pLocal[]	= "localhost:";
+    const int   nLocalLen 	= sizeof(pLocal) - 1;
     if ( strncmp(pDisplayString, pLocal, nLocalLen) == 0 )
         return sal_IsDisplayNumber( pDisplayString + nLocalLen );
 
-    const char  pUnix[]     = "unix:";
-    const int   nUnixLen    = sizeof(pUnix) - 1;
-    if ( strncmp(pDisplayString, pUnix,      nUnixLen)      == 0 )
+    const char  pUnix[]		= "unix:";
+    const int   nUnixLen 	= sizeof(pUnix) - 1;
+    if ( strncmp(pDisplayString, pUnix, 	 nUnixLen)      == 0 )
         return sal_IsDisplayNumber( pDisplayString + nUnixLen );
 
     const char  pLoopback[] = "127.0.0.1:";
     const int   nLoopbackLen= sizeof(pLoopback) - 1;
-    if ( strncmp(pDisplayString, pLoopback,  nLoopbackLen)  == 0 )
+    if ( strncmp(pDisplayString, pLoopback,	 nLoopbackLen)  == 0 )
         return sal_IsDisplayNumber( pDisplayString + nLoopbackLen );
 
     // compare local hostname to displaystring, both may be ip address or
     // hostname
     BOOL  bEqual = FALSE;
-    char *pDisplayHost  = strdup(  pDisplayString );
-    char *pPtr          = strrchr( pDisplayHost, ':' );
+    char *pDisplayHost 	= strdup(  pDisplayString );
+    char *pPtr 			= strrchr( pDisplayHost, ':' );
 
     if( pPtr != NULL )
     {
@@ -354,25 +354,25 @@ extern "C" srv_vendor_t
 sal_GetServerVendor( Display *p_display )
 {
     typedef struct {
-        srv_vendor_t    e_vendor;   // vendor as enum
-        const char      *p_name;    // vendor name as returned by VendorString()
-        unsigned int    n_len;  // number of chars to compare
+        srv_vendor_t	e_vendor;	// vendor as enum
+        const char		*p_name;	// vendor name as returned by VendorString()
+        unsigned int	n_len;	// number of chars to compare
     } vendor_t;
 
     const vendor_t p_vendorlist[] = {
-        { vendor_xfree,       "The XFree86 Project, Inc",        13 },
-        { vendor_sun,         "Sun Microsystems, Inc.",          10 },
-        { vendor_attachmate,  "Attachmate Corporation",          10 },
+        { vendor_xfree,       "The XFree86 Project, Inc", 		 13	},
+        { vendor_sun,         "Sun Microsystems, Inc.", 		 10	},
+        { vendor_attachmate,  "Attachmate Corporation", 		 10	},
         { vendor_excursion,
             "DECWINDOWS DigitalEquipmentCorporation, eXcursion", 42 },
-        { vendor_hp,          "Hewlett-Packard Company",         17 },
+        { vendor_hp,          "Hewlett-Packard Company", 		 17 },
         { vendor_hummingbird, "Hummingbird Communications Ltd.", 11 },
         { vendor_ibm,         "International Business Machines", 24 },
         { vendor_sgi,         "Silicon Graphics",                 9 },
-        { vendor_sco,         "The Santa Cruz Operation",        16 },
-        { vendor_xinside,     "X Inside Inc.",                   10 },
+        { vendor_sco,         "The Santa Cruz Operation", 		 16 },
+        { vendor_xinside,     "X Inside Inc.", 					 10	},
         // allways the last entry: vendor_none to indicate eol
-        { vendor_none,        NULL,                               0 },
+        { vendor_none, 	  	  NULL,								  0 },
     };
 
 #ifdef _USE_PRINT_EXTENSION_
@@ -614,7 +614,7 @@ fd
   if( ! pDisplay->IsDisplay() )
       return 0;
 
-  vos::IMutex* pSalInstYieldMutex   =
+  vos::IMutex* pSalInstYieldMutex	=
       GetSalData()->m_pInstance->GetYieldMutex();
   ::vos::OGuard aGuard( *pSalInstYieldMutex );
   return pDisplay->IsEvent();
@@ -627,7 +627,7 @@ fd
 {
   DBG_ASSERT( ConnectionNumber( pDisplay->GetDisplay() ) == fd,
               "wrong fd in DisplayHasEvent" );
-  vos::IMutex* pSalInstYieldMutex   =
+  vos::IMutex* pSalInstYieldMutex	=
       GetSalData()->m_pInstance->GetYieldMutex();
   ::vos::OGuard aGuard( *pSalInstYieldMutex );
   return XEventsQueued( pDisplay->GetDisplay(),
@@ -641,7 +641,7 @@ fd
 {
   DBG_ASSERT( ConnectionNumber( pDisplay->GetDisplay() ) == fd,
               "wrong fd in DisplayHasEvent" );
-  vos::IMutex* pSalInstYieldMutex   =
+  vos::IMutex* pSalInstYieldMutex	=
       GetSalData()->m_pInstance->GetYieldMutex();
   ::vos::OGuard aGuard( *pSalInstYieldMutex );
   pDisplay->Yield();
@@ -683,8 +683,8 @@ void SalDisplay::initScreen( int nScreen ) const
     rSD.m_bInit = true;
 
     XVisualInfo aVI;
-    Colormap    aColMap;
-
+    Colormap	aColMap;
+    
     if( SalDisplay::BestVisual( pDisp_, nScreen, aVI ) ) // DefaultVisual
         aColMap = DefaultColormap( pDisp_, nScreen );
     else
@@ -699,7 +699,7 @@ void SalDisplay::initScreen( int nScreen ) const
     rSD.m_aRoot = RootWindow( pDisp_, nScreen );
     rSD.m_aVisual = SalVisual( &aVI );
     rSD.m_aColormap = SalColormap( this, aColMap, nScreen );
-
+    
     // we're interested in configure notification of root windows
     InitRandR( rSD.m_aRoot );
 
@@ -742,9 +742,9 @@ void SalDisplay::initScreen( int nScreen ) const
         XGCValues values;
         values.graphics_exposures   = False;
         values.fill_style           = FillOpaqueStippled;
-        values.background           = (1<<rSD.m_aVisual.GetDepth())-1;
-        values.foreground           = 0;
-
+        values.background       	= (1<<rSD.m_aVisual.GetDepth())-1;
+        values.foreground       	= 0;
+    
         rSD.m_aCopyGC       = XCreateGC( pDisp_,
                                          rSD.m_aRefWindow,
                                          GCGraphicsExposures
@@ -776,13 +776,13 @@ void SalDisplay::initScreen( int nScreen ) const
                                          | GCForeground
                                          | GCBackground,
                                          &values );
-
+    
         XSetFunction( pDisp_, rSD.m_aAndInvertedGC,  GXandInverted );
         XSetFunction( pDisp_, rSD.m_aAndGC,          GXand );
         // #44556# PowerPC Solaris 2.5 (XSun 3500) Bug: GXor = GXnop
         //XSetFunction( pDisp_, pOrGC_,         GXor );
         XSetFunction( pDisp_, rSD.m_aOrGC,           GXxor );
-
+    
         if( 1 == rSD.m_aVisual.GetDepth() )
         {
             XSetFunction( pDisp_, rSD.m_aCopyGC, GXcopyInverted );
@@ -815,11 +815,11 @@ void SalDisplay::Init()
     nProperties_        = PROPERTY_DEFAULT;
     hEventGuard_        = NULL;
     m_pFontCache        = NULL;
-    mpFontList          = (XlfdStorage*)NULL;
-    mpFactory           = (AttributeProvider*)NULL;
-    m_pCapture          = NULL;
-    m_bXinerama         = false;
-
+    mpFontList			= (XlfdStorage*)NULL;
+    mpFactory  			= (AttributeProvider*)NULL;
+    m_pCapture			= NULL;
+    m_bXinerama			= false;
+    
     int nDisplayScreens = ScreenCount( pDisp_ );
     m_aScreens = std::vector<ScreenData>(nDisplayScreens);
 
@@ -855,9 +855,9 @@ void SalDisplay::Init()
     X11SalBitmap::ImplCreateCache();
 
     hEventGuard_    = osl_createMutex();
-    bLocal_         = FALSE; /* dont care, initialize later by
+    bLocal_ 		= FALSE; /* dont care, initialize later by
                                 calling SalDisplay::IsLocal() */
-    mbLocalIsValid  = FALSE; /* bLocal_ is not yet initialized */
+    mbLocalIsValid 	= FALSE; /* bLocal_ is not yet initialized */
 
     // - - - - - - - - - - Synchronize - - - - - - - - - - - - -
     if( getenv( "SAL_SYNCHRONIZE" ) )
@@ -1040,7 +1040,7 @@ void SalDisplay::Beep() const
 String SalDisplay::GetKeyNameFromKeySym( KeySym nKeySym ) const
 {
     String aRet;
-
+    
     // return an empty string for keysyms that are not bound to
     // any key code
     XLIB_KeyCode aKeyCode = XKeysymToKeycode( GetDisplay(), nKeySym );
@@ -1084,7 +1084,7 @@ void SalDisplay::ModifierMapping()
     nMod1KeySym_    = sal_XModifier2Keysym( pDisp_, pXModMap, Mod1MapIndex );
     // Auf Sun-Servern und SCO-Severn beruecksichtigt XLookupString
     // nicht den NumLock Modifier.
-    if(     (GetServerVendor() == vendor_sun)
+    if( 	(GetServerVendor() == vendor_sun)
         ||  (GetServerVendor() == vendor_sco) )
     {
         XLIB_KeyCode aNumLock = XKeysymToKeycode( pDisp_, XK_Num_Lock );
@@ -1184,13 +1184,13 @@ XubString SalDisplay::GetKeyName( USHORT nKeyCode ) const
             break;
 
         #if !defined (SunXK_Undo)
-            #define SunXK_Stop      0x0000FF69  // XK_Cancel
-            #define SunXK_Props     0x1005FF70
-            #define SunXK_Front     0x1005FF71
-            #define SunXK_Copy      0x1005FF72
-            #define SunXK_Open      0x1005FF73
-            #define SunXK_Paste     0x1005FF74
-            #define SunXK_Cut       0x1005FF75
+            #define SunXK_Stop		0x0000FF69	// XK_Cancel
+            #define SunXK_Props		0x1005FF70
+            #define SunXK_Front		0x1005FF71
+            #define SunXK_Copy		0x1005FF72
+            #define SunXK_Open		0x1005FF73
+            #define SunXK_Paste		0x1005FF74
+            #define SunXK_Cut		0x1005FF75
         #endif
 
         case KEY_REPEAT:
@@ -1676,8 +1676,8 @@ KeySym SalDisplay::GetKeySym( XKeyEvent        *pEvent,
                                     unsigned char    *pPrintable,
                                     int              *pLen,
                                     KeySym           *pUnmodifiedKeySym,
-                                    Status           *pStatusReturn,
-                                    XIC              aInputContext ) const
+                                    Status			 *pStatusReturn,
+                                    XIC 			 aInputContext ) const
 {
     KeySym nKeySym = 0;
     memset( pPrintable, 0, *pLen );
@@ -2228,9 +2228,9 @@ bool SalDisplay::DispatchInternalEvent()
     {
         if( m_aUserEvents.begin() != m_aUserEvents.end() )
         {
-            pFrame  = m_aUserEvents.front().m_pFrame;
-            pData   = m_aUserEvents.front().m_pData;
-            nEvent  = m_aUserEvents.front().m_nEvent;
+            pFrame	= m_aUserEvents.front().m_pFrame;
+            pData	= m_aUserEvents.front().m_pData;
+            nEvent	= m_aUserEvents.front().m_nEvent;
 
             m_aUserEvents.pop_front();
         }
@@ -2373,7 +2373,7 @@ long SalX11Display::Dispatch( XEvent *pEvent )
             return pFrame->Dispatch( pEvent );
         }
     }
-
+    
     // dispatch to salobjects
     X11SalObject::Dispatch( pEvent );
 
@@ -2787,9 +2787,9 @@ SalVisual::SalVisual( const XVisualInfo* pXVI )
         nGreenShift_    = sal_Shift( green_mask );
         nBlueShift_     = sal_Shift( blue_mask );
 
-        nRedBits_       = sal_significantBits( red_mask );
-        nGreenBits_     = sal_significantBits( green_mask );
-        nBlueBits_      = sal_significantBits( blue_mask );
+        nRedBits_		= sal_significantBits( red_mask );
+        nGreenBits_		= sal_significantBits( green_mask );
+        nBlueBits_		= sal_significantBits( blue_mask );
 
         if( GetDepth() == 24 )
             if( red_mask == 0xFF0000 )
diff --git a/vcl/unx/source/app/salinst.cxx b/vcl/unx/source/app/salinst.cxx
index 8a8db44cefcd..dc32dd28fd88 100644
--- a/vcl/unx/source/app/salinst.cxx
+++ b/vcl/unx/source/app/salinst.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
@@ -58,8 +58,8 @@
 
 SalYieldMutex::SalYieldMutex()
 {
-    mnCount     = 0;
-    mnThreadId  = 0;
+    mnCount 	= 0;
+    mnThreadId	= 0;
     ::tools::SolarMutex::SetSolarMutex( this );
 }
 
@@ -112,7 +112,7 @@ extern "C"
         */
         if( ! ( pNoXInitThreads && *pNoXInitThreads ) )
             XInitThreads();
-
+        
         X11SalInstance* pInstance = new X11SalInstance( new SalYieldMutex() );
 
         // initialize SalData
@@ -149,8 +149,8 @@ X11SalInstance::~X11SalInstance()
 
 struct PredicateReturn
 {
-    USHORT  nType;
-    BOOL    bRet;
+    USHORT	nType;
+    BOOL	bRet;
 };
 
 extern "C" {
@@ -207,10 +207,10 @@ bool X11SalInstance::AnyInput(USHORT nType)
     else if (XPending(pDisplay) )
     {
         PredicateReturn aInput;
-        XEvent          aEvent;
+        XEvent			aEvent;
 
-        aInput.bRet     = FALSE;
-        aInput.nType    = nType;
+        aInput.bRet 	= FALSE;
+        aInput.nType	= nType;
 
         XCheckIfEvent(pDisplay, &aEvent, ImplPredicateEvent,
                       (char *)&aInput );
@@ -265,8 +265,8 @@ void X11SalInstance::Yield( bool bWait, bool bHandleAllCurrentEvents )
 void* X11SalInstance::GetConnectionIdentifier( ConnectionIdentifierType& rReturnedType, int& rReturnedBytes )
 {
     static const char* pDisplay = getenv( "DISPLAY" );
-    rReturnedType   = AsciiCString;
-    rReturnedBytes  = pDisplay ? strlen( pDisplay )+1 : 1;
+    rReturnedType	= AsciiCString;
+    rReturnedBytes	= pDisplay ? strlen( pDisplay )+1 : 1;
     return pDisplay ? (void*)pDisplay : (void*)"";
 }
 
@@ -342,14 +342,14 @@ static void getServerDirectories( std::list< rtl::OString >& o_rFontPaths )
 void X11SalInstance::FillFontPathList( std::list< rtl::OString >& o_rFontPaths )
 {
     Display *pDisplay = GetX11SalData()->GetDisplay()->GetDisplay();
-
+    
     DBG_ASSERT( pDisplay, "No Display !" );
     if( pDisplay )
     {
         // get font paths to look for fonts
         int nPaths = 0, i;
         char** pPaths = XGetFontPath( pDisplay, &nPaths );
-
+        
         bool bServerDirs = false;
         for( i = 0; i < nPaths; i++ )
         {
@@ -368,33 +368,33 @@ void X11SalInstance::FillFontPathList( std::list< rtl::OString >& o_rFontPaths )
                 o_rFontPaths.push_back( aPath );
             }
         }
-
+        
         if( nPaths )
             XFreeFontPath( pPaths );
     }
-
+    
     // insert some standard directories
     o_rFontPaths.push_back( "/usr/openwin/lib/X11/fonts/TrueType" );
     o_rFontPaths.push_back( "/usr/openwin/lib/X11/fonts/Type1" );
     o_rFontPaths.push_back( "/usr/openwin/lib/X11/fonts/Type1/sun" );
     o_rFontPaths.push_back( "/usr/X11R6/lib/X11/fonts/truetype" );
     o_rFontPaths.push_back( "/usr/X11R6/lib/X11/fonts/Type1" );
-
+    
     #ifdef SOLARIS
     /* cde specials, from /usr/dt/bin/Xsession: here are the good fonts,
     the OWfontpath file may contain as well multiple lines as a comma
     separated list of fonts in each line. to make it even more weird
     environment variables are allowed as well */
-
+    
     const char* lang = getenv("LANG");
     if ( lang != NULL )
     {
         String aOpenWinDir( String::CreateFromAscii( "/usr/openwin/lib/locale/" ) );
         aOpenWinDir.AppendAscii( lang );
         aOpenWinDir.AppendAscii( "/OWfontpath" );
-
+        
         SvFileStream aStream( aOpenWinDir, STREAM_READ );
-
+        
         // TODO: replace environment variables
         while( aStream.IsOpen() && ! aStream.IsEof() )
         {
diff --git a/vcl/unx/source/app/salsys.cxx b/vcl/unx/source/app/salsys.cxx
index 1ccb214df4ed..82bf2ecc4a78 100644
--- a/vcl/unx/source/app/salsys.cxx
+++ b/vcl/unx/source/app/salsys.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
@@ -89,7 +89,7 @@ Rectangle X11SalSystem::GetDisplayScreenPosSizePixel( unsigned int nScreen )
         const SalDisplay::ScreenData& rScreen = pSalDisp->getDataForScreen( nScreen );
         aRet = Rectangle( Point( 0, 0 ), rScreen.m_aSize );
     }
-
+    
     return aRet;
 }
 
@@ -159,7 +159,7 @@ int X11SalSystem::ShowNativeDialog( const String& rTitle, const String& rMessage
             nButton++;
     }
     aWarn.SetFocusButton( (USHORT)nDefButton+1 );
-
+    
     nRet = ((int)aWarn.Execute()) - 1;
 
     // normalize behaviour, actually this should never happen
diff --git a/vcl/unx/source/app/saltimer.cxx b/vcl/unx/source/app/saltimer.cxx
index 431470935d9e..72cda70b4bc1 100644
--- a/vcl/unx/source/app/saltimer.cxx
+++ b/vcl/unx/source/app/saltimer.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
@@ -53,9 +53,9 @@ void X11SalData::Timeout() const
 // -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
 void SalXLib::StopTimer()
 {
-    m_aTimeout.tv_sec   = 0;
-    m_aTimeout.tv_usec  = 0;
-    m_nTimeoutMS        = 0;
+    m_aTimeout.tv_sec	= 0;
+    m_aTimeout.tv_usec	= 0;
+    m_nTimeoutMS		= 0;
 }
 
 void SalXLib::StartTimer( ULONG nMS )
diff --git a/vcl/unx/source/app/sm.cxx b/vcl/unx/source/app/sm.cxx
index 959d6af5912d..898452d52134 100644
--- a/vcl/unx/source/app/sm.cxx
+++ b/vcl/unx/source/app/sm.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
@@ -139,7 +139,7 @@ void IceSalSession::handleOldX11SaveYourself( SalFrame* pFrame )
         if( pOneInstance )
         {
             SalSessionSaveRequestEvent aEvent( true, false );
-            pOneInstance->CallCallback( &aEvent );
+            pOneInstance->CallCallback( &aEvent );        
         }
     }
 }
@@ -173,15 +173,15 @@ public:
 };
 
 
-SmcConn             SessionManagerClient::aSmcConnection            = NULL;
-ByteString          SessionManagerClient::aClientID;
-BOOL                ICEConnectionObserver::bIsWatching              = FALSE;
-struct pollfd*  ICEConnectionObserver::pFilehandles             = NULL;
-IceConn*            ICEConnectionObserver::pConnections             = NULL;
-int                 ICEConnectionObserver::nConnections             = 0;
-oslMutex            ICEConnectionObserver::ICEMutex                 = NULL;
-oslThread           ICEConnectionObserver::ICEThread                = NULL;
-int                 ICEConnectionObserver::nWakeupFiles[2]          = { 0, 0 };
+SmcConn				SessionManagerClient::aSmcConnection			= NULL;
+ByteString			SessionManagerClient::aClientID;
+BOOL				ICEConnectionObserver::bIsWatching				= FALSE;
+struct pollfd* 	ICEConnectionObserver::pFilehandles				= NULL;
+IceConn*			ICEConnectionObserver::pConnections				= NULL;
+int					ICEConnectionObserver::nConnections				= 0;
+oslMutex			ICEConnectionObserver::ICEMutex					= NULL;
+oslThread			ICEConnectionObserver::ICEThread				= NULL;
+int					ICEConnectionObserver::nWakeupFiles[2]			= { 0, 0 };
 
 #ifdef USE_SM_EXTENSION
 IceIOErrorHandler ICEConnectionObserver::origIOErrorHandler = NULL;
@@ -200,9 +200,9 @@ static void IgnoreIceIOErrors(IceConn)
 bool SessionManagerClient::bDocSaveDone = false;
 
 
-static SmProp*  pSmProps = NULL;
-static SmProp** ppSmProps = NULL;
-static int      nSmProps = 0;
+static SmProp*	pSmProps = NULL;
+static SmProp**	ppSmProps = NULL;
+static int		nSmProps = 0;
 static unsigned char   *pSmRestartHint = NULL;
 
 
@@ -215,33 +215,33 @@ static void BuildSmPropertyList()
         nSmProps = 5;
         pSmProps = new SmProp[ nSmProps ];
 
-        pSmProps[ 0 ].name      = const_cast<char*>(SmCloneCommand);
-        pSmProps[ 0 ].type      = const_cast<char*>(SmLISTofARRAY8);
-        pSmProps[ 0 ].num_vals  = 1;
-        pSmProps[ 0 ].vals      = new SmPropValue;
-        pSmProps[ 0 ].vals->length  = aExec.Len()+1;
-        pSmProps[ 0 ].vals->value   = strdup( aExec.GetBuffer() );
-
-        pSmProps[ 1 ].name      = const_cast<char*>(SmProgram);
-        pSmProps[ 1 ].type      = const_cast<char*>(SmARRAY8);
-        pSmProps[ 1 ].num_vals  = 1;
-        pSmProps[ 1 ].vals      = new SmPropValue;
-        pSmProps[ 1 ].vals->length  = aExec.Len()+1;
-        pSmProps[ 1 ].vals->value   = strdup( aExec.GetBuffer() );
-
-        pSmProps[ 2 ].name      = const_cast<char*>(SmRestartCommand);
-        pSmProps[ 2 ].type      = const_cast<char*>(SmLISTofARRAY8);
-        pSmProps[ 2 ].num_vals  = 3;
-        pSmProps[ 2 ].vals      = new SmPropValue[3];
-        pSmProps[ 2 ].vals[0].length    = aExec.Len()+1;
-        pSmProps[ 2 ].vals[0].value = strdup( aExec.GetBuffer() );
+        pSmProps[ 0 ].name		= const_cast<char*>(SmCloneCommand);
+        pSmProps[ 0 ].type		= const_cast<char*>(SmLISTofARRAY8);
+        pSmProps[ 0 ].num_vals	= 1;
+        pSmProps[ 0 ].vals		= new SmPropValue;
+        pSmProps[ 0 ].vals->length	= aExec.Len()+1;
+        pSmProps[ 0 ].vals->value	= strdup( aExec.GetBuffer() );
+
+        pSmProps[ 1 ].name		= const_cast<char*>(SmProgram);
+        pSmProps[ 1 ].type		= const_cast<char*>(SmARRAY8);
+        pSmProps[ 1 ].num_vals	= 1;
+        pSmProps[ 1 ].vals		= new SmPropValue;
+        pSmProps[ 1 ].vals->length	= aExec.Len()+1;
+        pSmProps[ 1 ].vals->value	= strdup( aExec.GetBuffer() );
+
+        pSmProps[ 2 ].name		= const_cast<char*>(SmRestartCommand);
+        pSmProps[ 2 ].type		= const_cast<char*>(SmLISTofARRAY8);
+        pSmProps[ 2 ].num_vals	= 3;
+        pSmProps[ 2 ].vals		= new SmPropValue[3];
+        pSmProps[ 2 ].vals[0].length	= aExec.Len()+1;
+        pSmProps[ 2 ].vals[0].value	= strdup( aExec.GetBuffer() );
             ByteString aRestartOption( "-session=" );
         aRestartOption.Append( SessionManagerClient::getSessionID() );
-        pSmProps[ 2 ].vals[1].length    = aRestartOption.Len()+1;
-        pSmProps[ 2 ].vals[1].value = strdup( aRestartOption.GetBuffer() );
+        pSmProps[ 2 ].vals[1].length	= aRestartOption.Len()+1;
+        pSmProps[ 2 ].vals[1].value	= strdup( aRestartOption.GetBuffer() );
             ByteString aRestartOptionNoLogo( "-nologo" );
-        pSmProps[ 2 ].vals[2].length    = aRestartOptionNoLogo.Len()+1;
-        pSmProps[ 2 ].vals[2].value = strdup( aRestartOptionNoLogo.GetBuffer() );
+        pSmProps[ 2 ].vals[2].length	= aRestartOptionNoLogo.Len()+1;
+        pSmProps[ 2 ].vals[2].value	= strdup( aRestartOptionNoLogo.GetBuffer() );
 
         rtl::OUString aUserName;
         rtl::OString aUser;
@@ -253,21 +253,21 @@ static void BuildSmPropertyList()
             osl_freeSecurityHandle( aSec );
         }
 
-        pSmProps[ 3 ].name      = const_cast<char*>(SmUserID);
-        pSmProps[ 3 ].type      = const_cast<char*>(SmARRAY8);
-        pSmProps[ 3 ].num_vals  = 1;
-        pSmProps[ 3 ].vals      = new SmPropValue;
-        pSmProps[ 3 ].vals->value   = strdup( aUser.getStr() );
-        pSmProps[ 3 ].vals->length  = strlen( (char *)pSmProps[ 3 ].vals->value )+1;
-
-        pSmProps[ 4 ].name      = const_cast<char*>(SmRestartStyleHint);
-        pSmProps[ 4 ].type      = const_cast<char*>(SmCARD8);
-        pSmProps[ 4 ].num_vals  = 1;
-        pSmProps[ 4 ].vals      = new SmPropValue;
-        pSmProps[ 4 ].vals->value   = malloc(1);
+        pSmProps[ 3 ].name		= const_cast<char*>(SmUserID);
+        pSmProps[ 3 ].type		= const_cast<char*>(SmARRAY8);
+        pSmProps[ 3 ].num_vals	= 1;
+        pSmProps[ 3 ].vals		= new SmPropValue;
+        pSmProps[ 3 ].vals->value	= strdup( aUser.getStr() );
+        pSmProps[ 3 ].vals->length	= strlen( (char *)pSmProps[ 3 ].vals->value )+1;
+
+        pSmProps[ 4 ].name		= const_cast<char*>(SmRestartStyleHint);
+        pSmProps[ 4 ].type		= const_cast<char*>(SmCARD8);
+        pSmProps[ 4 ].num_vals	= 1;
+        pSmProps[ 4 ].vals		= new SmPropValue;
+        pSmProps[ 4 ].vals->value	= malloc(1);
         pSmRestartHint = (unsigned char *)pSmProps[ 4 ].vals->value;
         *pSmRestartHint = SmRestartIfRunning;
-        pSmProps[ 4 ].vals->length  = 1;
+        pSmProps[ 4 ].vals->length	= 1;
 
         ppSmProps = new SmProp*[ nSmProps ];
         for( int i = 0; i < nSmProps; i++ )
@@ -291,8 +291,8 @@ IMPL_STATIC_LINK( SessionManagerClient, SaveYourselfHdl, void*, EMPTYARG )
         /*
           If we have no actual frames open, e.g. we launched a quickstarter,
           and then shutdown all our frames leaving just a quickstarter running,
-          then we don't want to launch an empty toplevel frame on the next
-          start. (The job of scheduling the restart of the quick-starter is a
+          then we don't want to launch an empty toplevel frame on the next 
+          start. (The job of scheduling the restart of the quick-starter is a 
           task of the quick-starter)
         */
         *pSmRestartHint = SmRestartNever;
@@ -311,7 +311,7 @@ IMPL_STATIC_LINK( SessionManagerClient, SaveYourselfHdl, void*, EMPTYARG )
     if( pOneInstance )
     {
         SalSessionSaveRequestEvent aEvent( pThis != 0, false );
-        pOneInstance->CallCallback( &aEvent );
+        pOneInstance->CallCallback( &aEvent );        
     }
     else
         saveDone();
@@ -327,7 +327,7 @@ IMPL_STATIC_LINK_NOINSTANCE( SessionManagerClient, InteractionHdl, void*, EMPTYA
         SalSessionInteractionEvent aEvent( true );
         pOneInstance->CallCallback( &aEvent );
     }
-
+    
     return 0;
 }
 
@@ -339,7 +339,7 @@ IMPL_STATIC_LINK_NOINSTANCE( SessionManagerClient, ShutDownCancelHdl, void*, EMP
         SalSessionShutdownCancelEvent aEvent;
         pOneInstance->CallCallback( &aEvent );
     }
-
+    
     return 0;
 }
 
@@ -464,22 +464,22 @@ void SessionManagerClient::open()
         char* pClientID = NULL;
         const ByteString& rPrevId( getPreviousSessionID() );
 
-        aCallbacks.save_yourself.callback           = SaveYourselfProc;
-        aCallbacks.save_yourself.client_data        = NULL;
-        aCallbacks.die.callback                     = DieProc;
-        aCallbacks.die.client_data                  = NULL;
-        aCallbacks.save_complete.callback           = SaveCompleteProc;
-        aCallbacks.save_complete.client_data        = NULL;
-        aCallbacks.shutdown_cancelled.callback      = ShutdownCanceledProc;
-        aCallbacks.shutdown_cancelled.client_data   = NULL;
+        aCallbacks.save_yourself.callback			= SaveYourselfProc;
+        aCallbacks.save_yourself.client_data		= NULL;
+        aCallbacks.die.callback						= DieProc;
+        aCallbacks.die.client_data					= NULL;
+        aCallbacks.save_complete.callback			= SaveCompleteProc;
+        aCallbacks.save_complete.client_data		= NULL;
+        aCallbacks.shutdown_cancelled.callback		= ShutdownCanceledProc;
+        aCallbacks.shutdown_cancelled.client_data	= NULL;
         aSmcConnection = SmcOpenConnection( NULL,
                                             NULL,
                                             SmProtoMajor,
                                             SmProtoMinor,
-                                            SmcSaveYourselfProcMask         |
-                                            SmcDieProcMask                  |
-                                            SmcSaveCompleteProcMask         |
-                                            SmcShutdownCancelledProcMask    ,
+                                            SmcSaveYourselfProcMask			|
+                                            SmcDieProcMask					|
+                                            SmcSaveCompleteProcMask			|
+                                            SmcShutdownCancelledProcMask	,
                                             &aCallbacks,
                                             rPrevId.Len() ? const_cast<char*>(rPrevId.GetBuffer()) : NULL,
                                             &pClientID,
@@ -563,7 +563,7 @@ String SessionManagerClient::getExecName()
     rtl::OUString aExec, aSysExec;
     osl_getExecutableFile( &aExec.pData );
     osl_getSystemPathFromFileURL( aExec.pData, &aSysExec.pData );
-
+    
     int nPos = aSysExec.indexOf( rtl::OUString::createFromAscii( ".bin" ) );
     if( nPos != -1 )
         aSysExec = aSysExec.copy( 0, nPos );
@@ -724,16 +724,16 @@ void ICEConnectionObserver::ICEWatchProc(
         nConnections++;
         pConnections = (IceConn*)rtl_reallocateMemory( pConnections, sizeof( IceConn )*nConnections );
         pFilehandles = (struct pollfd*)rtl_reallocateMemory( pFilehandles, sizeof( struct pollfd )*(nConnections+1) );
-        pConnections[ nConnections-1 ]      = connection;
-        pFilehandles[ nConnections ].fd     = fd;
-        pFilehandles[ nConnections ].events = POLLIN;
+        pConnections[ nConnections-1 ]		= connection;
+        pFilehandles[ nConnections ].fd		= fd;
+        pFilehandles[ nConnections ].events	= POLLIN;
         if( nConnections == 1 )
         {
             if( ! pipe( nWakeupFiles ) )
             {
                 int flags;
-                pFilehandles[0].fd      = nWakeupFiles[0];
-                pFilehandles[0].events  = POLLIN;
+                pFilehandles[0].fd		= nWakeupFiles[0];
+                pFilehandles[0].events	= POLLIN;
                 // set close-on-exec and nonblock descriptor flag.
                 if ((flags = fcntl (nWakeupFiles[0], F_GETFD)) != -1)
                 {
diff --git a/vcl/unx/source/app/soicon.cxx b/vcl/unx/source/app/soicon.cxx
index 2bf9e55731d1..cadab6554d49 100644
--- a/vcl/unx/source/app/soicon.cxx
+++ b/vcl/unx/source/app/soicon.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
@@ -48,7 +48,7 @@ BOOL SelectAppIconPixmap( SalDisplay *pDisplay, int nScreen,USHORT nIcon, USHORT
 {
     if( ! ImplGetResMgr() )
         return FALSE;
-
+    
     USHORT nIconSizeOffset;
 
     if( iconSize >= 48 )
@@ -70,7 +70,7 @@ BOOL SelectAppIconPixmap( SalDisplay *pDisplay, int nScreen,USHORT nIcon, USHORT
     aRect.mnDestX = 0; aRect.mnDestY = 0;
     aRect.mnDestWidth = iconSize; aRect.mnDestHeight = iconSize;
 
-    X11SalBitmap *pBitmap = static_cast < X11SalBitmap * >
+    X11SalBitmap *pBitmap = static_cast < X11SalBitmap * > 
         (aIcon.ImplGetBitmapImpBitmap()->ImplGetSalBitmap());
 
     icon_pixmap = XCreatePixmap( pDisplay->GetDisplay(),
@@ -89,7 +89,7 @@ BOOL SelectAppIconPixmap( SalDisplay *pDisplay, int nScreen,USHORT nIcon, USHORT
 
     if( TRANSPARENT_BITMAP == aIcon.GetTransparentType() )
     {
-        icon_mask = XCreatePixmap( pDisplay->GetDisplay(),
+        icon_mask = XCreatePixmap( pDisplay->GetDisplay(), 
                                    pDisplay->GetRootWindow( pDisplay->GetDefaultScreenNumber() ),
                                    iconSize, iconSize, 1);
 
@@ -103,13 +103,13 @@ BOOL SelectAppIconPixmap( SalDisplay *pDisplay, int nScreen,USHORT nIcon, USHORT
         Bitmap aMask = aIcon.GetMask();
         aMask.Invert();
 
-        X11SalBitmap *pMask = static_cast < X11SalBitmap * >
+        X11SalBitmap *pMask = static_cast < X11SalBitmap * > 
             (aMask.ImplGetImpBitmap()->ImplGetSalBitmap());
 
         pMask->ImplDraw(icon_mask, nScreen, 1, aRect, aMonoGC);
         XFreeGC( pDisplay->GetDisplay(), aMonoGC );
     }
-
+    
     return TRUE;
 }
 
diff --git a/vcl/unx/source/app/wmadaptor.cxx b/vcl/unx/source/app/wmadaptor.cxx
index 1a116fcbe8d6..70802cc1cf56 100644
--- a/vcl/unx/source/app/wmadaptor.cxx
+++ b/vcl/unx/source/app/wmadaptor.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
@@ -103,8 +103,8 @@ using namespace vcl_sal;
 
 struct WMAdaptorProtocol
 {
-    const char* pProtocol;
-    int             nProtocol;
+    const char*	pProtocol;
+    int				nProtocol;
 };
 
 
@@ -194,7 +194,7 @@ static int compareProtocol( const void* pLeft, const void* pRight )
 
 WMAdaptor* WMAdaptor::createWMAdaptor( SalDisplay* pSalDisplay )
 {
-    WMAdaptor*          pAdaptor    = NULL;
+    WMAdaptor*			pAdaptor	= NULL;
 
     // try a NetWM
     pAdaptor = new NetWMAdaptor( pSalDisplay );
@@ -240,11 +240,11 @@ WMAdaptor::WMAdaptor( SalDisplay* pDisplay ) :
         m_nWinGravity( StaticGravity ),
         m_nInitWinGravity( StaticGravity )
 {
-    Atom                aRealType   = None;
-    int                 nFormat     = 8;
-    unsigned long       nItems      = 0;
-    unsigned long       nBytesLeft  = 0;
-    unsigned char*  pProperty   = NULL;
+    Atom				aRealType	= None;
+    int					nFormat		= 8;
+    unsigned long		nItems		= 0;
+    unsigned long		nBytesLeft	= 0;
+    unsigned char*	pProperty	= NULL;
 
     // default desktops
     m_nDesktops = 1;
@@ -426,12 +426,12 @@ NetWMAdaptor::NetWMAdaptor( SalDisplay* pSalDisplay ) :
     // currently all _NET WMs do transient like expected
     m_bTransientBehaviour = true;
 
-    Atom                aRealType   = None;
-    int                 nFormat     = 8;
-    unsigned long       nItems      = 0;
-    unsigned long       nBytesLeft  = 0;
-    unsigned char*  pProperty   = NULL;
-    bool                bNetWM      = false;
+    Atom				aRealType	= None;
+    int					nFormat		= 8;
+    unsigned long		nItems		= 0;
+    unsigned long		nBytesLeft	= 0;
+    unsigned char*	pProperty	= NULL;
+    bool				bNetWM		= false;
 
     initAtoms();
 
@@ -485,7 +485,7 @@ NetWMAdaptor::NetWMAdaptor( SalDisplay* pSalDisplay ) :
                     // #i80971# protect against invalid atoms
                     if( pAtomNames[i] == NULL )
                         continue;
-
+                    
                     int nProtocol = -1;
                     WMAdaptorProtocol aSearch;
                     aSearch.pProtocol = pAtomNames[i];
@@ -620,18 +620,18 @@ GnomeWMAdaptor::GnomeWMAdaptor( SalDisplay* pSalDisplay ) :
     // currently all Gnome WMs do transient like expected
     m_bTransientBehaviour = true;
 
-    Atom                aRealType   = None;
-    int                 nFormat     = 8;
-    unsigned long       nItems      = 0;
-    unsigned long       nBytesLeft  = 0;
-    unsigned char*  pProperty   = NULL;
+    Atom				aRealType	= None;
+    int					nFormat		= 8;
+    unsigned long		nItems		= 0;
+    unsigned long		nBytesLeft	= 0;
+    unsigned char*	pProperty	= NULL;
 
     initAtoms();
 
     // check for GnomeWM
     if( m_aWMAtoms[ WIN_SUPPORTING_WM_CHECK ] && m_aWMAtoms[ WIN_PROTOCOLS ] )
     {
-        XLIB_Window         aWMChild    = None;
+        XLIB_Window			aWMChild	= None;
         if( XGetWindowProperty( m_pDisplay,
                                 m_pSalDisplay->GetRootWindow( m_pSalDisplay->GetDefaultScreenNumber() ),
                                 m_aWMAtoms[ WIN_SUPPORTING_WM_CHECK ],
@@ -741,7 +741,7 @@ GnomeWMAdaptor::GnomeWMAdaptor( SalDisplay* pSalDisplay ) :
                     // #i80971# protect against invalid atoms
                     if( pAtomNames[i] == NULL )
                         continue;
-
+                    
                     int nProtocol = -1;
                     WMAdaptorProtocol aSearch;
                     aSearch.pProtocol = pAtomNames[i];
@@ -825,16 +825,16 @@ GnomeWMAdaptor::~GnomeWMAdaptor()
  */
 bool WMAdaptor::getNetWmName()
 {
-    Atom                aRealType   = None;
-    int                 nFormat     = 8;
-    unsigned long       nItems      = 0;
-    unsigned long       nBytesLeft  = 0;
-    unsigned char*  pProperty   = NULL;
-    bool                bNetWM      = false;
+    Atom				aRealType	= None;
+    int					nFormat		= 8;
+    unsigned long		nItems		= 0;
+    unsigned long		nBytesLeft	= 0;
+    unsigned char*	pProperty	= NULL;
+    bool				bNetWM		= false;
 
     if( m_aWMAtoms[ NET_SUPPORTING_WM_CHECK ] && m_aWMAtoms[ NET_WM_NAME ] )
     {
-        XLIB_Window         aWMChild = None;
+        XLIB_Window			aWMChild = None;
         if( XGetWindowProperty( m_pDisplay,
                                 m_pSalDisplay->GetRootWindow( m_pSalDisplay->GetDefaultScreenNumber() ),
                                 m_aWMAtoms[ NET_SUPPORTING_WM_CHECK ],
@@ -1007,8 +1007,8 @@ void WMAdaptor::initAtoms()
     // get basic atoms
     for( unsigned int i = 0; i < sizeof( aAtomTab )/sizeof( aAtomTab[0] ); i++ )
         m_aWMAtoms[ aAtomTab[i].nProtocol ] = XInternAtom( m_pDisplay, aAtomTab[i].pProtocol, False );
-    m_aWMAtoms[ NET_SUPPORTING_WM_CHECK ]   = XInternAtom( m_pDisplay, "_NET_SUPPORTING_WM_CHECK", True );
-    m_aWMAtoms[ NET_WM_NAME ]               = XInternAtom( m_pDisplay, "_NET_WM_NAME", True );
+    m_aWMAtoms[ NET_SUPPORTING_WM_CHECK ]	= XInternAtom( m_pDisplay, "_NET_SUPPORTING_WM_CHECK", True );
+    m_aWMAtoms[ NET_WM_NAME ]				= XInternAtom( m_pDisplay, "_NET_WM_NAME", True );
 }
 
 /*
@@ -1019,7 +1019,7 @@ void NetWMAdaptor::initAtoms()
 {
     WMAdaptor::initAtoms();
 
-    m_aWMAtoms[ NET_SUPPORTED ]             = XInternAtom( m_pDisplay, "_NET_SUPPORTED", True );
+    m_aWMAtoms[ NET_SUPPORTED ]				= XInternAtom( m_pDisplay, "_NET_SUPPORTED", True );
 }
 
 /*
@@ -1030,8 +1030,8 @@ void GnomeWMAdaptor::initAtoms()
 {
     WMAdaptor::initAtoms();
 
-    m_aWMAtoms[ WIN_PROTOCOLS ]             = XInternAtom( m_pDisplay, "_WIN_PROTOCOLS", True );
-    m_aWMAtoms[ WIN_SUPPORTING_WM_CHECK ]   = XInternAtom( m_pDisplay, "_WIN_SUPPORTING_WM_CHECK", True );
+    m_aWMAtoms[ WIN_PROTOCOLS ]				= XInternAtom( m_pDisplay, "_WIN_PROTOCOLS", True );
+    m_aWMAtoms[ WIN_SUPPORTING_WM_CHECK ]	= XInternAtom( m_pDisplay, "_WIN_SUPPORTING_WM_CHECK", True );
 }
 
 /*
@@ -1043,7 +1043,7 @@ void GnomeWMAdaptor::initAtoms()
 void WMAdaptor::setWMName( X11SalFrame* pFrame, const String& rWMName ) const
 {
     ByteString aTitle( rWMName, osl_getThreadTextEncoding() );
-
+    
     if( ! rWMName.Len() && m_aWMName.EqualsAscii( "Dtwm" ) )
         aTitle = " ";
 
@@ -1070,7 +1070,7 @@ void WMAdaptor::setWMName( X11SalFrame* pFrame, const String& rWMName ) const
         static const char* pLang = getenv( "LANG" );
         aWMLocale = pLang ? pLang : "C";
     }
-
+    
     static bool bTrustXmb = true;
     #ifdef SOLARIS
     /* #i64273# there are some weird cases when using IIIMP on Solaris
@@ -1118,10 +1118,10 @@ void WMAdaptor::setWMName( X11SalFrame* pFrame, const String& rWMName ) const
                                    &aProp );
     }
 
-    unsigned char* pData    = aProp.nitems ? aProp.value : (unsigned char*)aTitle.GetBuffer();
-    Atom nType              = aProp.nitems ? aProp.encoding : XA_STRING;
-    int nFormat             = aProp.nitems ? aProp.format : 8;
-    int nBytes              = aProp.nitems ? aProp.nitems : aTitle.Len();
+    unsigned char* pData	= aProp.nitems ? aProp.value : (unsigned char*)aTitle.GetBuffer();
+    Atom nType				= aProp.nitems ? aProp.encoding : XA_STRING;
+    int nFormat				= aProp.nitems ? aProp.format : 8;
+    int nBytes				= aProp.nitems ? aProp.nitems : aTitle.Len();
     const SystemEnvData* pEnv = pFrame->GetSystemData();
     XChangeProperty( m_pDisplay,
                      (XLIB_Window)pEnv->aShellWindow,
@@ -1249,8 +1249,8 @@ void NetWMAdaptor::setNetWMState( X11SalFrame* pFrame ) const
             /*
              *  for maximizing use NorthWestGravity (including decoration)
              */
-            XSizeHints  hints;
-            long        supplied;
+            XSizeHints	hints;
+            long		supplied;
             bool bHint = false;
             if( XGetWMNormalHints( m_pDisplay,
                                    pFrame->GetShellWindow(),
@@ -1339,8 +1339,8 @@ void GnomeWMAdaptor::setGnomeWMState( X11SalFrame* pFrame ) const
             /*
              *  for maximizing use NorthWestGravity (including decoration)
              */
-            XSizeHints  hints;
-            long        supplied;
+            XSizeHints	hints;
+            long		supplied;
             bool bHint = false;
             if( XGetWMNormalHints( m_pDisplay,
                                    pFrame->GetShellWindow(),
@@ -1399,13 +1399,13 @@ void GnomeWMAdaptor::setGnomeWMState( X11SalFrame* pFrame ) const
 /*
  *  WMAdaptor::setFrameDecoration
  *  sets _MOTIF_WM_HINTS
- *       WM_TRANSIENT_FOR
+ *		 WM_TRANSIENT_FOR
  */
 
 void WMAdaptor::setFrameTypeAndDecoration( X11SalFrame* pFrame, WMWindowType eType, int nDecorationFlags, X11SalFrame* pReferenceFrame ) const
 {
-    pFrame->meWindowType        = eType;
-    pFrame->mnDecorationFlags   = nDecorationFlags;
+    pFrame->meWindowType		= eType;
+    pFrame->mnDecorationFlags	= nDecorationFlags;
 
     if( ! pFrame->mbFullScreen )
     {
@@ -1415,13 +1415,13 @@ void WMAdaptor::setFrameTypeAndDecoration( X11SalFrame* pFrame, WMWindowType eTy
             long input_mode;
             unsigned long status;
         } aHint;
-
+    
         aHint.flags = 15; /* flags for functions, decoration, input mode and status */
         aHint.deco = 0;
         aHint.func = 1L << 2;
         aHint.status = 0;
         aHint.input_mode = 0;
-
+    
         // evaluate decoration flags
         if( nDecorationFlags & decoration_All )
             aHint.deco = 1, aHint.func = 1;
@@ -1449,7 +1449,7 @@ void WMAdaptor::setFrameTypeAndDecoration( X11SalFrame* pFrame, WMWindowType eTy
             default:
                 break;
         }
-
+    
         // set the hint
         XChangeProperty( m_pDisplay,
                          pFrame->GetShellWindow(),
@@ -1460,7 +1460,7 @@ void WMAdaptor::setFrameTypeAndDecoration( X11SalFrame* pFrame, WMWindowType eTy
                          (unsigned char*)&aHint,
                          5 );
     }
-
+     
     // set transientFor hint
     /*  #91030# dtwm will not map a dialogue if the transient
      *  window is iconified. This is deemed undesireable because
@@ -1489,7 +1489,7 @@ void WMAdaptor::setFrameTypeAndDecoration( X11SalFrame* pFrame, WMWindowType eTy
  *  sets _MOTIF_WM_HINTS
  *       _NET_WM_WINDOW_TYPE
  *       _NET_WM_STATE
- *       WM_TRANSIENT_FOR
+ *		 WM_TRANSIENT_FOR
  */
 
 void NetWMAdaptor::setFrameTypeAndDecoration( X11SalFrame* pFrame, WMWindowType eType, int nDecorationFlags, X11SalFrame* pReferenceFrame ) const
@@ -1656,8 +1656,8 @@ void WMAdaptor::maximizeFrame( X11SalFrame* pFrame, bool bHorizontal, bool bVert
             pFrame->maRestorePosSize = aRestore;
 
         pFrame->SetPosSize( aTarget );
-        pFrame->nWidth_     = aTarget.GetWidth();
-        pFrame->nHeight_    = aTarget.GetHeight();
+        pFrame->nWidth_		= aTarget.GetWidth();
+        pFrame->nHeight_	= aTarget.GetHeight();
         XRaiseWindow( m_pDisplay,
                       pFrame->GetShellWindow()
                       );
@@ -1671,8 +1671,8 @@ void WMAdaptor::maximizeFrame( X11SalFrame* pFrame, bool bHorizontal, bool bVert
     {
         pFrame->SetPosSize( pFrame->maRestorePosSize );
         pFrame->maRestorePosSize = Rectangle();
-        pFrame->nWidth_             = rGeom.nWidth;
-        pFrame->nHeight_            = rGeom.nHeight;
+        pFrame->nWidth_ 			= rGeom.nWidth;
+        pFrame->nHeight_			= rGeom.nHeight;
         if( m_aWMName.EqualsAscii( "Dtwm" ) && pFrame->bMapped_ )
         {
             pFrame->maGeometry.nX += rGeom.nLeftDecoration;
@@ -1701,16 +1701,16 @@ void NetWMAdaptor::maximizeFrame( X11SalFrame* pFrame, bool bHorizontal, bool bV
         {
             // window already mapped, send WM a message
             XEvent aEvent;
-            aEvent.type                 = ClientMessage;
-            aEvent.xclient.display      = m_pDisplay;
-            aEvent.xclient.window       = pFrame->GetShellWindow();
-            aEvent.xclient.message_type = m_aWMAtoms[ NET_WM_STATE ];
-            aEvent.xclient.format       = 32;
-            aEvent.xclient.data.l[0]    = bHorizontal ? 1 : 0;
-            aEvent.xclient.data.l[1]    = m_aWMAtoms[ NET_WM_STATE_MAXIMIZED_HORZ ];
-            aEvent.xclient.data.l[2]    = bHorizontal == bVertical ? m_aWMAtoms[ NET_WM_STATE_MAXIMIZED_VERT ] : 0;
-            aEvent.xclient.data.l[3]    = 0;
-            aEvent.xclient.data.l[4]    = 0;
+            aEvent.type					= ClientMessage;
+            aEvent.xclient.display		= m_pDisplay;
+            aEvent.xclient.window		= pFrame->GetShellWindow();
+            aEvent.xclient.message_type	= m_aWMAtoms[ NET_WM_STATE ];
+            aEvent.xclient.format		= 32;
+            aEvent.xclient.data.l[0]	= bHorizontal ? 1 : 0;
+            aEvent.xclient.data.l[1]	= m_aWMAtoms[ NET_WM_STATE_MAXIMIZED_HORZ ];
+            aEvent.xclient.data.l[2]	= bHorizontal == bVertical ? m_aWMAtoms[ NET_WM_STATE_MAXIMIZED_VERT ] : 0;
+            aEvent.xclient.data.l[3]	= 0;
+            aEvent.xclient.data.l[4]	= 0;
             XSendEvent( m_pDisplay,
                         m_pSalDisplay->GetRootWindow( pFrame->GetScreenNumber() ),
                         False,
@@ -1766,18 +1766,18 @@ void GnomeWMAdaptor::maximizeFrame( X11SalFrame* pFrame, bool bHorizontal, bool
         {
              // window already mapped, send WM a message
             XEvent aEvent;
-            aEvent.type                 = ClientMessage;
-            aEvent.xclient.display      = m_pDisplay;
-            aEvent.xclient.window       = pFrame->GetShellWindow();
-            aEvent.xclient.message_type = m_aWMAtoms[ WIN_STATE ];
-            aEvent.xclient.format       = 32;
-            aEvent.xclient.data.l[0]    = (1<<2)|(1<<3);
-            aEvent.xclient.data.l[1]    =
+            aEvent.type					= ClientMessage;
+            aEvent.xclient.display		= m_pDisplay;
+            aEvent.xclient.window		= pFrame->GetShellWindow();
+            aEvent.xclient.message_type	= m_aWMAtoms[ WIN_STATE ];
+            aEvent.xclient.format		= 32;
+            aEvent.xclient.data.l[0]	= (1<<2)|(1<<3);
+            aEvent.xclient.data.l[1]	=
                 (bVertical ? (1<<2) : 0)
                 | (bHorizontal ? (1<<3) : 0);
-            aEvent.xclient.data.l[2]    = 0;
-            aEvent.xclient.data.l[3]    = 0;
-            aEvent.xclient.data.l[4]    = 0;
+            aEvent.xclient.data.l[2]	= 0;
+            aEvent.xclient.data.l[3]	= 0;
+            aEvent.xclient.data.l[4]	= 0;
             XSendEvent( m_pDisplay,
                         m_pSalDisplay->GetRootWindow( pFrame->GetScreenNumber() ),
                         False,
@@ -1842,16 +1842,16 @@ void NetWMAdaptor::enableAlwaysOnTop( X11SalFrame* pFrame, bool bEnable ) const
         {
             // window already mapped, send WM a message
             XEvent aEvent;
-            aEvent.type                 = ClientMessage;
-            aEvent.xclient.display      = m_pDisplay;
-            aEvent.xclient.window       = pFrame->GetShellWindow();
-            aEvent.xclient.message_type = m_aWMAtoms[ NET_WM_STATE ];
-            aEvent.xclient.format       = 32;
-            aEvent.xclient.data.l[0]    = bEnable ? 1 : 0;
-            aEvent.xclient.data.l[1]    = m_aWMAtoms[ NET_WM_STATE_STAYS_ON_TOP ];
-            aEvent.xclient.data.l[2]    = 0;
-            aEvent.xclient.data.l[3]    = 0;
-            aEvent.xclient.data.l[4]    = 0;
+            aEvent.type					= ClientMessage;
+            aEvent.xclient.display		= m_pDisplay;
+            aEvent.xclient.window		= pFrame->GetShellWindow();
+            aEvent.xclient.message_type	= m_aWMAtoms[ NET_WM_STATE ];
+            aEvent.xclient.format		= 32;
+            aEvent.xclient.data.l[0]	= bEnable ? 1 : 0;
+            aEvent.xclient.data.l[1]	= m_aWMAtoms[ NET_WM_STATE_STAYS_ON_TOP ];
+            aEvent.xclient.data.l[2]	= 0;
+            aEvent.xclient.data.l[3]	= 0;
+            aEvent.xclient.data.l[4]	= 0;
             XSendEvent( m_pDisplay,
                         m_pSalDisplay->GetRootWindow( pFrame->GetScreenNumber() ),
                         False,
@@ -1876,16 +1876,16 @@ void GnomeWMAdaptor::enableAlwaysOnTop( X11SalFrame* pFrame, bool bEnable ) cons
         {
             // window already mapped, send WM a message
             XEvent aEvent;
-            aEvent.type                 = ClientMessage;
-            aEvent.xclient.display      = m_pDisplay;
-            aEvent.xclient.window       = pFrame->GetShellWindow();
-            aEvent.xclient.message_type = m_aWMAtoms[ WIN_LAYER ];
-            aEvent.xclient.format       = 32;
-            aEvent.xclient.data.l[0]    = bEnable ? 6 : 4;
-            aEvent.xclient.data.l[1]    = 0;
-            aEvent.xclient.data.l[2]    = 0;
-            aEvent.xclient.data.l[3]    = 0;
-            aEvent.xclient.data.l[4]    = 0;
+            aEvent.type					= ClientMessage;
+            aEvent.xclient.display		= m_pDisplay;
+            aEvent.xclient.window		= pFrame->GetShellWindow();
+            aEvent.xclient.message_type	= m_aWMAtoms[ WIN_LAYER ];
+            aEvent.xclient.format		= 32;
+            aEvent.xclient.data.l[0]	= bEnable ? 6 : 4;
+            aEvent.xclient.data.l[1]	= 0;
+            aEvent.xclient.data.l[2]	= 0;
+            aEvent.xclient.data.l[3]	= 0;
+            aEvent.xclient.data.l[4]	= 0;
             XSendEvent( m_pDisplay,
                         m_pSalDisplay->GetRootWindow( pFrame->GetScreenNumber() ),
                         False,
@@ -2104,16 +2104,16 @@ void NetWMAdaptor::shade( X11SalFrame* pFrame, bool bToShaded ) const
         {
             // window already mapped, send WM a message
             XEvent aEvent;
-            aEvent.type                 = ClientMessage;
-            aEvent.xclient.display      = m_pDisplay;
-            aEvent.xclient.window       = pFrame->GetShellWindow();
-            aEvent.xclient.message_type = m_aWMAtoms[ NET_WM_STATE ];
-            aEvent.xclient.format       = 32;
-            aEvent.xclient.data.l[0]    = bToShaded ? 1 : 0;
-            aEvent.xclient.data.l[1]    = m_aWMAtoms[ NET_WM_STATE_SHADED ];
-            aEvent.xclient.data.l[2]    = 0;
-            aEvent.xclient.data.l[3]    = 0;
-            aEvent.xclient.data.l[4]    = 0;
+            aEvent.type					= ClientMessage;
+            aEvent.xclient.display		= m_pDisplay;
+            aEvent.xclient.window		= pFrame->GetShellWindow();
+            aEvent.xclient.message_type	= m_aWMAtoms[ NET_WM_STATE ];
+            aEvent.xclient.format		= 32;
+            aEvent.xclient.data.l[0]	= bToShaded ? 1 : 0;
+            aEvent.xclient.data.l[1]	= m_aWMAtoms[ NET_WM_STATE_SHADED ];
+            aEvent.xclient.data.l[2]	= 0;
+            aEvent.xclient.data.l[3]	= 0;
+            aEvent.xclient.data.l[4]	= 0;
             XSendEvent( m_pDisplay,
                         m_pSalDisplay->GetRootWindow( pFrame->GetScreenNumber() ),
                         False,
@@ -2141,16 +2141,16 @@ void GnomeWMAdaptor::shade( X11SalFrame* pFrame, bool bToShaded ) const
         {
             // window already mapped, send WM a message
             XEvent aEvent;
-            aEvent.type                 = ClientMessage;
-            aEvent.xclient.display      = m_pDisplay;
-            aEvent.xclient.window       = pFrame->GetShellWindow();
-            aEvent.xclient.message_type = m_aWMAtoms[ WIN_STATE ];
-            aEvent.xclient.format       = 32;
-            aEvent.xclient.data.l[0]    = (1<<5);
-            aEvent.xclient.data.l[1]    = bToShaded ? (1<<5) : 0;
-            aEvent.xclient.data.l[2]    = 0;
-            aEvent.xclient.data.l[3]    = 0;
-            aEvent.xclient.data.l[4]    = 0;
+            aEvent.type					= ClientMessage;
+            aEvent.xclient.display		= m_pDisplay;
+            aEvent.xclient.window		= pFrame->GetShellWindow();
+            aEvent.xclient.message_type	= m_aWMAtoms[ WIN_STATE ];
+            aEvent.xclient.format		= 32;
+            aEvent.xclient.data.l[0]	= (1<<5);
+            aEvent.xclient.data.l[1]	= bToShaded ? (1<<5) : 0;
+            aEvent.xclient.data.l[2]	= 0;
+            aEvent.xclient.data.l[3]	= 0;
+            aEvent.xclient.data.l[4]	= 0;
             XSendEvent( m_pDisplay,
                         m_pSalDisplay->GetRootWindow( pFrame->GetScreenNumber() ),
                         False,
@@ -2180,20 +2180,29 @@ void NetWMAdaptor::showFullScreen( X11SalFrame* pFrame, bool bFullScreen ) const
     if( m_aWMAtoms[ NET_WM_STATE_FULLSCREEN ] )
     {
         pFrame->mbFullScreen = bFullScreen;
+        if( bFullScreen )
+        {
+            if( m_aWMAtoms[ MOTIF_WM_HINTS ] )
+            {
+                XDeleteProperty( m_pDisplay,
+                                 pFrame->GetShellWindow(),
+                                m_aWMAtoms[ MOTIF_WM_HINTS ] );
+            }
+        }
         if( pFrame->bMapped_ )
         {
             // window already mapped, send WM a message
             XEvent aEvent;
-            aEvent.type                 = ClientMessage;
-            aEvent.xclient.display      = m_pDisplay;
-            aEvent.xclient.window       = pFrame->GetShellWindow();
-            aEvent.xclient.message_type = m_aWMAtoms[ NET_WM_STATE ];
-            aEvent.xclient.format       = 32;
-            aEvent.xclient.data.l[0]    = bFullScreen ? 1 : 0;
-            aEvent.xclient.data.l[1]    = m_aWMAtoms[ NET_WM_STATE_FULLSCREEN ];
-            aEvent.xclient.data.l[2]    = 0;
-            aEvent.xclient.data.l[3]    = 0;
-            aEvent.xclient.data.l[4]    = 0;
+            aEvent.type					= ClientMessage;
+            aEvent.xclient.display		= m_pDisplay;
+            aEvent.xclient.window		= pFrame->GetShellWindow();
+            aEvent.xclient.message_type	= m_aWMAtoms[ NET_WM_STATE ];
+            aEvent.xclient.format		= 32;
+            aEvent.xclient.data.l[0]	= bFullScreen ? 1 : 0;
+            aEvent.xclient.data.l[1]	= m_aWMAtoms[ NET_WM_STATE_FULLSCREEN ];
+            aEvent.xclient.data.l[2]	= 0;
+            aEvent.xclient.data.l[3]	= 0;
+            aEvent.xclient.data.l[4]	= 0;
             XSendEvent( m_pDisplay,
                         m_pSalDisplay->GetRootWindow( pFrame->GetScreenNumber() ),
                         False,
@@ -2255,11 +2264,11 @@ int WMAdaptor::getCurrentWorkArea() const
     int nCurrent = -1;
     if( m_aWMAtoms[ NET_CURRENT_DESKTOP ] )
     {
-        Atom                aRealType   = None;
-        int                 nFormat     = 8;
-        unsigned long       nItems      = 0;
-        unsigned long       nBytesLeft  = 0;
-        unsigned char*  pProperty   = NULL;
+        Atom				aRealType	= None;
+        int					nFormat		= 8;
+        unsigned long		nItems		= 0;
+        unsigned long		nBytesLeft	= 0;
+        unsigned char*	pProperty	= NULL;
         if( XGetWindowProperty( m_pDisplay,
                                 m_pSalDisplay->GetRootWindow( m_pSalDisplay->GetDefaultScreenNumber() ),
                                 m_aWMAtoms[ NET_CURRENT_DESKTOP ],
@@ -2294,11 +2303,11 @@ int WMAdaptor::getWindowWorkArea( XLIB_Window aWindow ) const
     int nCurrent = -1;
     if( m_aWMAtoms[ NET_WM_DESKTOP ] )
     {
-        Atom                aRealType   = None;
-        int                 nFormat     = 8;
-        unsigned long       nItems      = 0;
-        unsigned long       nBytesLeft  = 0;
-        unsigned char*  pProperty   = NULL;
+        Atom				aRealType	= None;
+        int					nFormat		= 8;
+        unsigned long		nItems		= 0;
+        unsigned long		nBytesLeft	= 0;
+        unsigned char*	pProperty	= NULL;
         if( XGetWindowProperty( m_pDisplay,
                                 aWindow,
                                 m_aWMAtoms[ NET_WM_DESKTOP ],
@@ -2334,16 +2343,16 @@ void WMAdaptor::switchToWorkArea( int nWorkArea ) const
     if( m_aWMAtoms[ NET_CURRENT_DESKTOP ] )
     {
         XEvent aEvent;
-        aEvent.type                 = ClientMessage;
-        aEvent.xclient.display      = m_pDisplay;
-        aEvent.xclient.window       = m_pSalDisplay->GetRootWindow( m_pSalDisplay->GetDefaultScreenNumber() );
-        aEvent.xclient.message_type = m_aWMAtoms[ NET_CURRENT_DESKTOP ];
-        aEvent.xclient.format       = 32;
-        aEvent.xclient.data.l[0]    = nWorkArea;
-        aEvent.xclient.data.l[1]    = 0;
-        aEvent.xclient.data.l[2]    = 0;
-        aEvent.xclient.data.l[3]    = 0;
-        aEvent.xclient.data.l[4]    = 0;
+        aEvent.type					= ClientMessage;
+        aEvent.xclient.display		= m_pDisplay;
+        aEvent.xclient.window		= m_pSalDisplay->GetRootWindow( m_pSalDisplay->GetDefaultScreenNumber() );
+        aEvent.xclient.message_type	= m_aWMAtoms[ NET_CURRENT_DESKTOP ];
+        aEvent.xclient.format		= 32;
+        aEvent.xclient.data.l[0]	= nWorkArea;
+        aEvent.xclient.data.l[1]	= 0;
+        aEvent.xclient.data.l[2]	= 0;
+        aEvent.xclient.data.l[3]	= 0;
+        aEvent.xclient.data.l[4]	= 0;
         XSendEvent( m_pDisplay,
                     m_pSalDisplay->GetRootWindow( m_pSalDisplay->GetDefaultScreenNumber() ),
                     False,
@@ -2403,7 +2412,7 @@ void NetWMAdaptor::setFrameStruts( X11SalFrame* pFrame,
     nData[11]= bottom_end_x;
     Atom aProperty = None;
     int nSetData = 0;
-
+    
     if( m_aWMAtoms[NET_WM_STRUT_PARTIAL] )
     {
         aProperty = m_aWMAtoms[NET_WM_STRUT_PARTIAL];
diff --git a/vcl/unx/source/desktopdetect/desktopdetector.cxx b/vcl/unx/source/desktopdetect/desktopdetector.cxx
index 74ab2e2c3ea2..1ec34cb1c21c 100644
--- a/vcl/unx/source/desktopdetect/desktopdetector.cxx
+++ b/vcl/unx/source/desktopdetect/desktopdetector.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
@@ -58,13 +58,13 @@ static const char * desktop_strings[] = { "none", "unknown", "GNOME", "KDE", "KD
 static bool is_gnome_desktop( Display* pDisplay )
 {
     bool ret = false;
-
+    
     // warning: these checks are coincidental, GNOME does not
     // explicitly advertise itself
-
+    
     if ( NULL != getenv( "GNOME_DESKTOP_SESSION_ID" ) )
         ret = true;
-
+    
     if( ! ret )
     {
         Atom nAtom1 = XInternAtom( pDisplay, "GNOME_SM_PROXY", True );
@@ -85,11 +85,11 @@ static bool is_gnome_desktop( Display* pDisplay )
             }
         }
     }
-
+    
     if( ! ret )
     {
-        Atom nUTFAtom       = XInternAtom( pDisplay, "UTF8_STRING", True );
-        Atom nNetWMNameAtom = XInternAtom( pDisplay, "_NET_WM_NAME", True );
+        Atom nUTFAtom		= XInternAtom( pDisplay, "UTF8_STRING", True );
+        Atom nNetWMNameAtom	= XInternAtom( pDisplay, "_NET_WM_NAME", True );
         if( nUTFAtom && nNetWMNameAtom )
         {
             // another, more expensive check: search for a gnome-panel
@@ -149,7 +149,7 @@ extern "C"
         bWasXError = true;
         return 0;
     }
-
+    
     typedef int(* XErrorHandler)(Display*,XErrorEvent*);
 }
 
@@ -165,11 +165,11 @@ static int KDEVersion( Display* pDisplay )
         if( !nKDEVersion )
             return 3;
 
-        Atom                aRealType   = None;
-        int                 nFormat     = 8;
-        unsigned long       nItems      = 0;
-        unsigned long       nBytesLeft  = 0;
-        unsigned char*  pProperty   = NULL;
+        Atom				aRealType	= None;
+        int					nFormat		= 8;
+        unsigned long		nItems		= 0;
+        unsigned long		nBytesLeft	= 0;
+        unsigned char*	pProperty	= NULL;
         XGetWindowProperty( pDisplay,
                             DefaultRootWindow( pDisplay ),
                             nKDEVersion,
@@ -183,7 +183,7 @@ static int KDEVersion( Display* pDisplay )
                             &pProperty );
         if( !WasXError() && nItems != 0 && pProperty )
         {
-            nRet = *reinterpret_cast< sal_Int32* >( pProperty );
+            nRet = *reinterpret_cast< sal_Int32* >( pProperty );                        
         }
         if( pProperty )
         {
@@ -245,23 +245,23 @@ static bool is_cde_desktop( Display* pDisplay )
         osl_unloadModule( (oslModule)pLibrary );
         return true;
     }
-
+    
     return false;
 }
 
 
 extern "C"
 {
-
+    
 VCL_DLLPUBLIC rtl::OUString get_desktop_environment()
 {
     rtl::OUStringBuffer aRet( 8 );
     static const char *pOverride = getenv( "OOO_FORCE_DESKTOP" );
-
+     
     if ( pOverride && *pOverride )
     {
         OString aOver( pOverride );
-
+        
         if ( aOver.equalsIgnoreAsciiCase( "cde" ) )
             aRet.appendAscii( desktop_strings[DESKTOP_CDE] );
         if ( aOver.equalsIgnoreAsciiCase( "kde4" ) )
@@ -297,7 +297,7 @@ VCL_DLLPUBLIC rtl::OUString get_desktop_environment()
                 break;
             }
         }
-
+    
         // no server at all
         if( ! pDisplayStr || !*pDisplayStr )
             aRet.appendAscii( desktop_strings[DESKTOP_NONE] );
@@ -312,12 +312,12 @@ VCL_DLLPUBLIC rtl::OUString get_desktop_environment()
             */
             if( ! ( pNoXInitThreads && *pNoXInitThreads ) )
                 XInitThreads();
-
+            
             Display* pDisplay = XOpenDisplay( pDisplayStr );
             if( pDisplay )
             {
                 XErrorHandler pOldHdl = XSetErrorHandler( autodect_error_handler );
-
+            
                 if ( is_kde4_desktop( pDisplay ) )
                     aRet.appendAscii( desktop_strings[DESKTOP_KDE4] );
                 else if ( is_gnome_desktop( pDisplay ) )
@@ -328,10 +328,10 @@ VCL_DLLPUBLIC rtl::OUString get_desktop_environment()
                     aRet.appendAscii( desktop_strings[DESKTOP_KDE] );
                 else
                     aRet.appendAscii( desktop_strings[DESKTOP_UNKNOWN] );
-
+                    
                 // set the default handler again
                 XSetErrorHandler( pOldHdl );
-
+                
                 XCloseDisplay( pDisplay );
             }
         }
diff --git a/vcl/unx/source/dtrans/X11_clipboard.cxx b/vcl/unx/source/dtrans/X11_clipboard.cxx
index a08a9481b8e8..63e237afc353 100644
--- a/vcl/unx/source/dtrans/X11_clipboard.cxx
+++ b/vcl/unx/source/dtrans/X11_clipboard.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
@@ -136,7 +136,7 @@ void X11Clipboard::clearContents()
     // clear members
     m_aOwner.clear();
     m_aContents.clear();
-
+    
     // release the mutex
     aGuard.clear();
 
@@ -285,7 +285,7 @@ void SAL_CALL X11Clipboard::initialize( const Sequence< Any >& ) throw( ::com::s
 
 // ------------------------------------------------------------------------
 
-Sequence< OUString > SAL_CALL X11Clipboard::getSupportedServiceNames(    )
+Sequence< OUString > SAL_CALL X11Clipboard::getSupportedServiceNames(	 )
     throw(RuntimeException)
 {
     return X11Clipboard_getSupportedServiceNames();
diff --git a/vcl/unx/source/dtrans/X11_clipboard.hxx b/vcl/unx/source/dtrans/X11_clipboard.hxx
index 21bf547a9cb7..77e5692a8fb8 100644
--- a/vcl/unx/source/dtrans/X11_clipboard.hxx
+++ b/vcl/unx/source/dtrans/X11_clipboard.hxx
@@ -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
@@ -57,10 +57,10 @@ namespace x11 {
         Reference< ::com::sun::star::datatransfer::XTransferable > m_aContents;
         Reference< ::com::sun::star::datatransfer::clipboard::XClipboardOwner > m_aOwner;
 
-        SelectionManager&                                       m_rSelectionManager;
-        Reference< ::com::sun::star::lang::XInitialization >    m_xSelectionManager;
+        SelectionManager&										m_rSelectionManager;
+        Reference< ::com::sun::star::lang::XInitialization >	m_xSelectionManager;
         ::std::list< Reference< ::com::sun::star::datatransfer::clipboard::XClipboardListener > > m_aListeners;
-        Atom                                                    m_aSelection;
+        Atom													m_aSelection;
 
     protected:
 
@@ -79,7 +79,7 @@ namespace x11 {
         static X11Clipboard* get( const ::rtl::OUString& rDisplayName, Atom aSelection );
 
         /*
-         *  XInitialization
+         *	XInitialization
          */
         virtual void SAL_CALL initialize( const Sequence< Any >& arguments ) throw(  ::com::sun::star::uno::Exception );
 
@@ -87,29 +87,29 @@ namespace x11 {
          * XServiceInfo
          */
 
-        virtual ::rtl::OUString SAL_CALL getImplementationName(  )
+        virtual ::rtl::OUString SAL_CALL getImplementationName(	 )
             throw(RuntimeException);
 
-        virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName )
+        virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) 
             throw(RuntimeException);
 
-        virtual Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames(  )
+        virtual Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames(  ) 
             throw(RuntimeException);
 
         /*
          * XClipboard
          */
 
-        virtual Reference< ::com::sun::star::datatransfer::XTransferable > SAL_CALL getContents()
+        virtual Reference< ::com::sun::star::datatransfer::XTransferable > SAL_CALL getContents() 
             throw(RuntimeException);
 
-        virtual void SAL_CALL setContents(
-            const Reference< ::com::sun::star::datatransfer::XTransferable >& xTrans,
-            const Reference< ::com::sun::star::datatransfer::clipboard::XClipboardOwner >& xClipboardOwner )
+        virtual void SAL_CALL setContents( 
+            const Reference< ::com::sun::star::datatransfer::XTransferable >& xTrans, 
+            const Reference< ::com::sun::star::datatransfer::clipboard::XClipboardOwner >& xClipboardOwner ) 
             throw(RuntimeException);
 
-        virtual ::rtl::OUString SAL_CALL getName()
-            throw(RuntimeException);
+        virtual ::rtl::OUString SAL_CALL getName() 
+            throw(RuntimeException);	   
 
         /*
          * XClipboardEx
@@ -121,16 +121,16 @@ namespace x11 {
         /*
          * XClipboardNotifier
          */
-        virtual void SAL_CALL addClipboardListener(
-            const Reference< ::com::sun::star::datatransfer::clipboard::XClipboardListener >& listener )
+        virtual void SAL_CALL addClipboardListener( 
+            const Reference< ::com::sun::star::datatransfer::clipboard::XClipboardListener >& listener ) 
             throw(RuntimeException);
 
-        virtual void SAL_CALL removeClipboardListener(
-            const Reference< ::com::sun::star::datatransfer::clipboard::XClipboardListener >& listener )
-            throw(RuntimeException);
+        virtual void SAL_CALL removeClipboardListener( 
+            const Reference< ::com::sun::star::datatransfer::clipboard::XClipboardListener >& listener ) 
+            throw(RuntimeException);	 
 
         /*
-         *  SelectionAdaptor
+         *	SelectionAdaptor
          */
         virtual Reference< ::com::sun::star::datatransfer::XTransferable > getTransferable();
         virtual void clearTransferable();
@@ -141,7 +141,7 @@ namespace x11 {
 // ------------------------------------------------------------------------
 
     Sequence< ::rtl::OUString > SAL_CALL X11Clipboard_getSupportedServiceNames();
-    Reference< XInterface > SAL_CALL X11Clipboard_createInstance(
+    Reference< XInterface > SAL_CALL X11Clipboard_createInstance( 
         const Reference< ::com::sun::star::lang::XMultiServiceFactory > & xMultiServiceFactory);
 
 // ------------------------------------------------------------------------
diff --git a/vcl/unx/source/dtrans/X11_dndcontext.cxx b/vcl/unx/source/dtrans/X11_dndcontext.cxx
index e6fc3dd8a532..23c976cd7713 100644
--- a/vcl/unx/source/dtrans/X11_dndcontext.cxx
+++ b/vcl/unx/source/dtrans/X11_dndcontext.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
@@ -35,7 +35,7 @@ using namespace cppu;
 using namespace x11;
 
 /*
- *  DropTargetDropContext
+ *	DropTargetDropContext
  */
 
 DropTargetDropContext::DropTargetDropContext(
@@ -70,7 +70,7 @@ void DropTargetDropContext::dropComplete( sal_Bool success ) throw()
 
 
 /*
- *  DropTargetDragContext
+ *	DropTargetDragContext
  */
 
 DropTargetDragContext::DropTargetDragContext(
@@ -99,7 +99,7 @@ void DropTargetDragContext::rejectDrag() throw()
 }
 
 /*
- *  DragSourceContext
+ *	DragSourceContext
  */
 
 DragSourceContext::DragSourceContext(
diff --git a/vcl/unx/source/dtrans/X11_dndcontext.hxx b/vcl/unx/source/dtrans/X11_dndcontext.hxx
index 9b48d346f03b..16c12a9cc4c1 100644
--- a/vcl/unx/source/dtrans/X11_dndcontext.hxx
+++ b/vcl/unx/source/dtrans/X11_dndcontext.hxx
@@ -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
@@ -94,10 +94,10 @@ namespace x11 {
         virtual ~DragSourceContext();
 
         // XDragSourceContext
-        virtual sal_Int32   SAL_CALL getCurrentCursor() throw();
-        virtual void        SAL_CALL setCursor( sal_Int32 cursorId ) throw();
-        virtual void        SAL_CALL setImage( sal_Int32 imageId ) throw();
-        virtual void        SAL_CALL transferablesFlavorsChanged() throw();
+        virtual sal_Int32	SAL_CALL getCurrentCursor() throw();
+        virtual void		SAL_CALL setCursor( sal_Int32 cursorId ) throw();
+        virtual void		SAL_CALL setImage( sal_Int32 imageId ) throw();
+        virtual void		SAL_CALL transferablesFlavorsChanged() throw();
     };
 } // namespace
 
diff --git a/vcl/unx/source/dtrans/X11_droptarget.cxx b/vcl/unx/source/dtrans/X11_droptarget.cxx
index 5db23329abd8..b20a2781be26 100644
--- a/vcl/unx/source/dtrans/X11_droptarget.cxx
+++ b/vcl/unx/source/dtrans/X11_droptarget.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
@@ -195,7 +195,7 @@ void DropTarget::dragOver( const DropTargetDragEvent& dtde ) throw()
 // --------------------------------------------------------------------------
 
 /*
- *  XServiceInfo
+ *	XServiceInfo
  */
 
 // ------------------------------------------------------------------------
diff --git a/vcl/unx/source/dtrans/X11_selection.cxx b/vcl/unx/source/dtrans/X11_selection.cxx
index 403ee9707a94..c751ca847418 100644
--- a/vcl/unx/source/dtrans/X11_selection.cxx
+++ b/vcl/unx/source/dtrans/X11_selection.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
@@ -74,10 +74,10 @@
 #include <comphelper/processfactory.hxx>
 #include <vos/mutex.hxx>
 
-#define DRAG_EVENT_MASK ButtonPressMask         |\
-                              ButtonReleaseMask     |\
-                              PointerMotionMask     |\
-                              EnterWindowMask           |\
+#define DRAG_EVENT_MASK	ButtonPressMask			|\
+                              ButtonReleaseMask		|\
+                              PointerMotionMask		|\
+                              EnterWindowMask			|\
                               LeaveWindowMask
 
 using namespace com::sun::star::datatransfer;
@@ -99,7 +99,7 @@ extern "C"
     {
         SelectionManager::run( pMgr );
     }
-
+    
     static void call_SelectionManager_runDragExecute( void * pMgr )
     {
         SelectionManager::runDragExecute( pMgr );
@@ -113,10 +113,10 @@ static const long nXdndProtocolRevision = 5;
 // and X convention types
 struct NativeTypeEntry
 {
-    Atom            nAtom;
-    const char*     pType;              // Mime encoding on our side
-    const char*     pNativeType;        // string corresponding to nAtom for the case of nAtom being uninitialized
-    int             nFormat;            // the corresponding format
+    Atom			nAtom;
+    const char*		pType;				// Mime encoding on our side
+    const char*		pNativeType;		// string corresponding to nAtom for the case of nAtom being uninitialized
+    int				nFormat;			// the corresponding format
 };
 
 // the convention for Xdnd is mime types as specified by the corresponding
@@ -281,7 +281,7 @@ SelectionManager::SelectionManager() :
         m_nXdndActionAsk( None ),
         m_nXdndActionPrivate( None )
 {
-    m_aDropEnterEvent.data.l[0] = None;
+    m_aDropEnterEvent.data.l[0]	= None;
     m_aDragRunning.reset();
 }
 
@@ -329,11 +329,11 @@ void SelectionManager::initialize( const Sequence< Any >& arguments ) throw (::c
     if( ! m_xDisplayConnection.is() )
     {
         /*
-         *  first argument must be a ::com::sun::star::awt::XDisplayConnection
-         *  from this we will get the XEvents of the vcl event loop by
-         *  registering us as XEventHandler on it.
+         *	first argument must be a ::com::sun::star::awt::XDisplayConnection
+         *	from this we will get the XEvents of the vcl event loop by
+         *	registering us as XEventHandler on it.
          *
-         *  implementor's note:
+         *	implementor's note:
          *  FIXME:
          *  finally the clipboard and XDND service is back in the module it belongs
          *  now cleanup and sharing of resources with the normal vcl event loop
@@ -386,34 +386,34 @@ void SelectionManager::initialize( const Sequence< Any >& arguments ) throw (::c
             XSynchronize( m_pDisplay, True );
 #endif
             // clipboard selection
-            m_nCLIPBOARDAtom    = getAtom( OUString::createFromAscii( "CLIPBOARD" ) );
+            m_nCLIPBOARDAtom	= getAtom( OUString::createFromAscii( "CLIPBOARD" ) );
 
             // special targets
-            m_nTARGETSAtom      = getAtom( OUString::createFromAscii( "TARGETS" ) );
+            m_nTARGETSAtom		= getAtom( OUString::createFromAscii( "TARGETS" ) );
             m_nTIMESTAMPAtom    = getAtom( OUString::createFromAscii( "TIMESTAMP" ) );
-            m_nTEXTAtom         = getAtom( OUString::createFromAscii( "TEXT" ) );
-            m_nINCRAtom         = getAtom( OUString::createFromAscii( "INCR" ) );
-            m_nCOMPOUNDAtom     = getAtom( OUString::createFromAscii( "COMPOUND_TEXT" ) );
-            m_nMULTIPLEAtom     = getAtom( OUString::createFromAscii( "MULTIPLE" ) );
-            m_nUTF16Atom        = getAtom( OUString::createFromAscii( "ISO10646-1" ) );
-//            m_nUTF16Atom      = getAtom( OUString::createFromAscii( "text/plain;charset=ISO-10646-UCS-2" ) );
+            m_nTEXTAtom			= getAtom( OUString::createFromAscii( "TEXT" ) );
+            m_nINCRAtom			= getAtom( OUString::createFromAscii( "INCR" ) );
+            m_nCOMPOUNDAtom		= getAtom( OUString::createFromAscii( "COMPOUND_TEXT" ) );
+            m_nMULTIPLEAtom		= getAtom( OUString::createFromAscii( "MULTIPLE" ) );
+            m_nUTF16Atom		= getAtom( OUString::createFromAscii( "ISO10646-1" ) );
+//            m_nUTF16Atom		= getAtom( OUString::createFromAscii( "text/plain;charset=ISO-10646-UCS-2" ) );
             m_nImageBmpAtom     = getAtom( OUString::createFromAscii( "image/bmp" ) );
 
             // Atoms for Xdnd protocol
-            m_nXdndAware        = getAtom( OUString::createFromAscii( "XdndAware" ) );
-            m_nXdndEnter        = getAtom( OUString::createFromAscii( "XdndEnter" ) );
-            m_nXdndLeave        = getAtom( OUString::createFromAscii( "XdndLeave" ) );
-            m_nXdndPosition     = getAtom( OUString::createFromAscii( "XdndPosition" ) );
-            m_nXdndStatus       = getAtom( OUString::createFromAscii( "XdndStatus" ) );
-            m_nXdndDrop         = getAtom( OUString::createFromAscii( "XdndDrop" ) );
-            m_nXdndFinished     = getAtom( OUString::createFromAscii( "XdndFinished" ) );
-            m_nXdndSelection    = getAtom( OUString::createFromAscii( "XdndSelection" ) );
-            m_nXdndTypeList     = getAtom( OUString::createFromAscii( "XdndTypeList" ) );
-            m_nXdndProxy        = getAtom( OUString::createFromAscii( "XdndProxy" ) );
-            m_nXdndActionCopy   = getAtom( OUString::createFromAscii( "XdndActionCopy" ) );
-            m_nXdndActionMove   = getAtom( OUString::createFromAscii( "XdndActionMove" ) );
-            m_nXdndActionLink   = getAtom( OUString::createFromAscii( "XdndActionLink" ) );
-            m_nXdndActionAsk    = getAtom( OUString::createFromAscii( "XdndActionAsk" ) );
+            m_nXdndAware		= getAtom( OUString::createFromAscii( "XdndAware" ) );
+            m_nXdndEnter		= getAtom( OUString::createFromAscii( "XdndEnter" ) );
+            m_nXdndLeave		= getAtom( OUString::createFromAscii( "XdndLeave" ) );
+            m_nXdndPosition		= getAtom( OUString::createFromAscii( "XdndPosition" ) );
+            m_nXdndStatus		= getAtom( OUString::createFromAscii( "XdndStatus" ) );
+            m_nXdndDrop			= getAtom( OUString::createFromAscii( "XdndDrop" ) );
+            m_nXdndFinished		= getAtom( OUString::createFromAscii( "XdndFinished" ) );
+            m_nXdndSelection	= getAtom( OUString::createFromAscii( "XdndSelection" ) );
+            m_nXdndTypeList		= getAtom( OUString::createFromAscii( "XdndTypeList" ) );
+            m_nXdndProxy		= getAtom( OUString::createFromAscii( "XdndProxy" ) );
+            m_nXdndActionCopy	= getAtom( OUString::createFromAscii( "XdndActionCopy" ) );
+            m_nXdndActionMove	= getAtom( OUString::createFromAscii( "XdndActionMove" ) );
+            m_nXdndActionLink	= getAtom( OUString::createFromAscii( "XdndActionLink" ) );
+            m_nXdndActionAsk	= getAtom( OUString::createFromAscii( "XdndActionAsk" ) );
             m_nXdndActionPrivate= getAtom( OUString::createFromAscii( "XdndActionPrivate" ) );
 
             // initialize map with member none
@@ -496,7 +496,7 @@ SelectionManager::~SelectionManager()
                 break;
             }
     }
-
+    
     if( m_aThread )
     {
         osl_terminateThread( m_aThread );
@@ -571,10 +571,10 @@ OUString SelectionManager::convertFromCompound( const char* pText, int nLen )
     int nTexts = 0;
 
     XTextProperty aProp;
-    aProp.value     = (unsigned char*)pText;
-    aProp.encoding  = m_nCOMPOUNDAtom;
-    aProp.format    = 8;
-    aProp.nitems    = nLen;
+    aProp.value		= (unsigned char*)pText;
+    aProp.encoding	= m_nCOMPOUNDAtom;
+    aProp.format	= 8;
+    aProp.nitems	= nLen;
     XmbTextPropertyToTextList( m_pDisplay,
                                &aProp,
                                &pTextList,
@@ -952,20 +952,20 @@ bool SelectionManager::getPasteData( Atom selection, Atom type, Sequence< sal_In
         XDeleteProperty( m_pDisplay, m_aWindow, selection );
 
     XConvertSelection( m_pDisplay, selection, type, selection, m_aWindow, selection == m_nXdndSelection ? m_nDropTime : CurrentTime );
-    it->second->m_eState            = Selection::WaitingForResponse;
-    it->second->m_aRequestedType    = type;
-    it->second->m_aData             = Sequence< sal_Int8 >();
+    it->second->m_eState			= Selection::WaitingForResponse;
+    it->second->m_aRequestedType	= type;
+    it->second->m_aData				= Sequence< sal_Int8 >();
     it->second->m_aDataArrived.reset();
     // really start the request; if we don't flush the
     // queue the request won't leave it because there are no more
     // X calls after this until the data arrived or timeout
     XFlush( m_pDisplay );
-
+    
     // do a reschedule
     struct timeval tv_last, tv_current;
     gettimeofday( &tv_last, NULL );
     tv_current = tv_last;
-
+    
     XEvent aEvent;
     do
     {
@@ -1111,8 +1111,8 @@ bool SelectionManager::getPasteData( Atom selection, const ::rtl::OUString& rTyp
                 for( int i = 0; i < rTypes.getLength(); i++ )
                 {
                     rtl_TextEncoding aEncoding = getTextPlainEncoding( rTypes.getConstArray()[i].MimeType );
-                    if( aEncoding != RTL_TEXTENCODING_DONTKNOW  &&
-                        aEncoding != RTL_TEXTENCODING_UNICODE   &&
+                    if( aEncoding != RTL_TEXTENCODING_DONTKNOW	&&
+                        aEncoding != RTL_TEXTENCODING_UNICODE	&&
                         getPasteData( selection,
                                       rNativeTypes[i],
                                       aData )
@@ -1147,14 +1147,14 @@ bool SelectionManager::getPasteData( Atom selection, const ::rtl::OUString& rTyp
         {
             Pixmap aPixmap = None;
             Colormap aColormap = None;
-
+            
             // prepare property for MULTIPLE request
             Sequence< sal_Int8 > aData;
             Atom pTypes[4] = { XA_PIXMAP, XA_PIXMAP,
             XA_COLORMAP, XA_COLORMAP };
             {
                 MutexGuard aGuard(m_aMutex);
-
+                
                 XChangeProperty( m_pDisplay,
                     m_aWindow,
                     selection,
@@ -1164,7 +1164,7 @@ bool SelectionManager::getPasteData( Atom selection, const ::rtl::OUString& rTyp
                     (unsigned char*)pTypes,
                     4 );
             }
-
+            
             // try MULTIPLE request
             if( getPasteData( selection, m_nMULTIPLEAtom, aData ) )
             {
@@ -1172,7 +1172,7 @@ bool SelectionManager::getPasteData( Atom selection, const ::rtl::OUString& rTyp
                 if( pReturnedTypes[0] == XA_PIXMAP && pReturnedTypes[1] == XA_PIXMAP )
                 {
                     MutexGuard aGuard(m_aMutex);
-
+                    
                     Atom type = None;
                     int format = 0;
                     unsigned long nItems = 0;
@@ -1204,7 +1204,7 @@ bool SelectionManager::getPasteData( Atom selection, const ::rtl::OUString& rTyp
                     #endif
                 }
             }
-
+            
             if( aPixmap == None )
             {
                 // perhaps two normal requests will work
@@ -1215,12 +1215,12 @@ bool SelectionManager::getPasteData( Atom selection, const ::rtl::OUString& rTyp
                         aColormap = *(Colormap*)aData.getArray();
                 }
             }
-
+            
             // convert data if possible
             if( aPixmap != None )
             {
                 MutexGuard aGuard(m_aMutex);
-
+                
                 sal_Int32 nOutSize = 0;
                 sal_uInt8* pBytes = X11_getBmpFromPixmap( m_pDisplay, aPixmap, aColormap, nOutSize );
                 if( pBytes && nOutSize )
@@ -1269,8 +1269,8 @@ bool SelectionManager::getPasteDataTypes( Atom selection, Sequence< DataFlavor >
         MutexGuard aGuard(m_aMutex);
 
         it = m_aSelections.find( selection );
-        if( it != m_aSelections.end()                           &&
-            it->second->m_aTypes.getLength()                    &&
+        if( it != m_aSelections.end()							&&
+            it->second->m_aTypes.getLength()					&&
             abs( it->second->m_nLastTimestamp - time( NULL ) ) < 2
             )
         {
@@ -1435,21 +1435,21 @@ bool SelectionManager::getPasteDataTypes( Atom selection, Sequence< DataFlavor >
         {
             if( bSuccess )
             {
-                it->second->m_aTypes            = rTypes;
-                it->second->m_aNativeTypes      = aNativeTypes;
-                it->second->m_nLastTimestamp    = time( NULL );
-                it->second->m_bHaveUTF16        = bHaveUTF16;
+                it->second->m_aTypes			= rTypes;
+                it->second->m_aNativeTypes		= aNativeTypes;
+                it->second->m_nLastTimestamp	= time( NULL );
+                it->second->m_bHaveUTF16		= bHaveUTF16;
                 it->second->m_aUTF8Type         = aUTF8Type;
-                it->second->m_bHaveCompound     = bHaveCompound;
+                it->second->m_bHaveCompound		= bHaveCompound;
             }
             else
             {
-                it->second->m_aTypes            = Sequence< DataFlavor >();
-                it->second->m_aNativeTypes      = std::vector< Atom >();
-                it->second->m_nLastTimestamp    = 0;
-                it->second->m_bHaveUTF16        = false;
+                it->second->m_aTypes			= Sequence< DataFlavor >();
+                it->second->m_aNativeTypes		= std::vector< Atom >();
+                it->second->m_nLastTimestamp	= 0;
+                it->second->m_bHaveUTF16		= false;
                 it->second->m_aUTF8Type         = None;
-                it->second->m_bHaveCompound     = false;
+                it->second->m_bHaveCompound		= false;
             }
         }
     }
@@ -1481,7 +1481,7 @@ PixmapHolder* SelectionManager::getPixmapHolder( Atom selection )
 static sal_Size GetTrueFormatSize(int nFormat)
 {
     // http://mail.gnome.org/archives/wm-spec-list/2003-March/msg00067.html
-    return nFormat == 32 ? sizeof(long) : nFormat/8;
+    return nFormat == 32 ? sizeof(long) : nFormat/8;	
 }
 
 bool SelectionManager::sendData( SelectionAdaptor* pAdaptor,
@@ -1609,14 +1609,14 @@ bool SelectionManager::sendData( SelectionAdaptor* pAdaptor,
 #endif
 
             // insert IncrementalTransfer
-            IncrementalTransfer& rInc   = m_aIncrementals[ requestor ][ property ];
-            rInc.m_aData                = aData;
-            rInc.m_nBufferPos           = 0;
-            rInc.m_aRequestor           = requestor;
-            rInc.m_aProperty            = property;
-            rInc.m_aTarget              = target;
-            rInc.m_nFormat              = nFormat;
-            rInc.m_nTransferStartTime   = time( NULL );
+            IncrementalTransfer& rInc	= m_aIncrementals[ requestor ][ property ];
+            rInc.m_aData				= aData;
+            rInc.m_nBufferPos			= 0;
+            rInc.m_aRequestor			= requestor;
+            rInc.m_aProperty			= property;
+            rInc.m_aTarget				= target;
+            rInc.m_nFormat				= nFormat;
+            rInc.m_nTransferStartTime	= time( NULL );
 
             // use incr protocol, signal start to requestor
             long nMinSize = m_nIncrementalThreshold;
@@ -1825,23 +1825,23 @@ bool SelectionManager::handleSelectionRequest( XSelectionRequestEvent& rRequest
     }
     XSendEvent( m_pDisplay, rRequest.requestor, False, 0, &aNotify );
 
-    if( rRequest.selection == XA_PRIMARY    &&
-        m_bWaitingForPrimaryConversion      &&
+    if( rRequest.selection == XA_PRIMARY	&&
+        m_bWaitingForPrimaryConversion		&&
         m_xDragSourceListener.is() )
     {
         DragSourceDropEvent dsde;
-        dsde.Source                 = static_cast< OWeakObject* >(this);
-        dsde.DragSourceContext      = new DragSourceContext( m_aDropWindow, rRequest.time, *this );
-        dsde.DragSource             = static_cast< XDragSource* >(this);
+        dsde.Source					= static_cast< OWeakObject* >(this);
+        dsde.DragSourceContext		= new DragSourceContext( m_aDropWindow, rRequest.time, *this );
+        dsde.DragSource				= static_cast< XDragSource* >(this);
         if( aNotify.xselection.property != None )
         {
-            dsde.DropAction         = DNDConstants::ACTION_COPY;
-            dsde.DropSuccess        = sal_True;
+            dsde.DropAction			= DNDConstants::ACTION_COPY;
+            dsde.DropSuccess		= sal_True;
         }
         else
         {
-            dsde.DropAction         = DNDConstants::ACTION_NONE;
-            dsde.DropSuccess        = sal_False;
+            dsde.DropAction			= DNDConstants::ACTION_NONE;
+            dsde.DropSuccess		= sal_False;
         }
         Reference< XDragSourceListener > xListener( m_xDragSourceListener );
         m_xDragSourceListener.clear();
@@ -1870,8 +1870,8 @@ bool SelectionManager::handleReceivePropertyNotify( XPropertyEvent& rNotify )
           m_aSelections.find( rNotify.atom );
     if( it != m_aSelections.end() &&
         rNotify.state == PropertyNewValue &&
-        ( it->second->m_eState == Selection::WaitingForResponse     ||
-          it->second->m_eState == Selection::WaitingForData         ||
+        ( it->second->m_eState == Selection::WaitingForResponse		||
+          it->second->m_eState == Selection::WaitingForData 		||
           it->second->m_eState == Selection::IncrementalTransfer
           )
         )
@@ -1934,7 +1934,7 @@ bool SelectionManager::handleReceivePropertyNotify( XPropertyEvent& rNotify )
                      OUStringToOString( getString( nType ), RTL_TEXTENCODING_ISO_8859_1 ).getStr(),
                      nFormat, nBytes );
 #endif
-
+    
             sal_Size nUnitSize = GetTrueFormatSize(nFormat);
 
             if( it->second->m_eState == Selection::WaitingForData ||
@@ -2040,7 +2040,7 @@ bool SelectionManager::handleSendPropertyNotify( XPropertyEvent& rNotify )
 #endif
 
                 sal_Size nUnitSize = GetTrueFormatSize(rInc.m_nFormat);
-
+                
                 XChangeProperty( m_pDisplay,
                                  rInc.m_aRequestor,
                                  rInc.m_aProperty,
@@ -2138,9 +2138,9 @@ bool SelectionManager::handleSelectionNotify( XSelectionEvent& rNotify )
                                     &nItems, &nBytes,
                                     &pData );
             }
-            it->second->m_eState        = Selection::Inactive;
+            it->second->m_eState		= Selection::Inactive;
             sal_Size nUnitSize = GetTrueFormatSize(nFormat);
-            it->second->m_aData         = Sequence< sal_Int8 >((sal_Int8*)pData, nItems * nUnitSize);
+            it->second->m_aData			= Sequence< sal_Int8 >((sal_Int8*)pData, nItems * nUnitSize);
             it->second->m_aDataArrived.set();
             if( pData )
                 XFree( pData );
@@ -2151,8 +2151,8 @@ bool SelectionManager::handleSelectionNotify( XSelectionEvent& rNotify )
         else if( rNotify.property == None )
         {
             // conversion failed, stop transfer
-            it->second->m_eState        = Selection::Inactive;
-            it->second->m_aData         = Sequence< sal_Int8 >();
+            it->second->m_eState		= Selection::Inactive;
+            it->second->m_aData			= Sequence< sal_Int8 >();
             it->second->m_aDataArrived.set();
         }
         // get the bytes, by INCR if necessary
@@ -2219,10 +2219,10 @@ bool SelectionManager::handleDropEvent( XClientMessageEvent& rMessage )
         if( rMessage.message_type == m_nXdndEnter )
         {
             bHandled = true;
-            m_aDropEnterEvent           = rMessage;
-            m_bDropEnterSent            = false;
-            m_aCurrentDropWindow        = aTarget;
-            m_nCurrentProtocolVersion   = m_aDropEnterEvent.data.l[1] >> 24;
+            m_aDropEnterEvent			= rMessage;
+            m_bDropEnterSent			= false;
+            m_aCurrentDropWindow		= aTarget;
+            m_nCurrentProtocolVersion	= m_aDropEnterEvent.data.l[1] >> 24;
 #if OSL_DEBUG_LEVEL > 1
             fprintf( stderr, "received XdndEnter on 0x%lx\n", aTarget );
 #endif
@@ -2250,10 +2250,10 @@ bool SelectionManager::handleDropEvent( XClientMessageEvent& rMessage )
             fprintf( stderr, "received XdndPosition on 0x%lx (%d, %d)\n", aTarget, m_nLastX, m_nLastY );
 #endif
             DropTargetDragEnterEvent aEvent;
-            aEvent.Source       = static_cast< XDropTarget* >(it->second.m_pTarget);
-            aEvent.Context      = new DropTargetDragContext( m_aCurrentDropWindow, m_nDropTimestamp, *this );
-            aEvent.LocationX    = m_nLastX;
-            aEvent.LocationY    = m_nLastY;
+            aEvent.Source		= static_cast< XDropTarget* >(it->second.m_pTarget);
+            aEvent.Context		= new DropTargetDragContext( m_aCurrentDropWindow, m_nDropTimestamp, *this );
+            aEvent.LocationX	= m_nLastX;
+            aEvent.LocationY	= m_nLastY;
             aEvent.SourceActions = m_nSourceActions;
             if( m_nCurrentProtocolVersion < 2 )
                 aEvent.DropAction = DNDConstants::ACTION_COPY;
@@ -2269,7 +2269,7 @@ bool SelectionManager::handleDropEvent( XClientMessageEvent& rMessage )
             else
                 aEvent.DropAction = DNDConstants::ACTION_NONE;
 
-            m_nLastDropAction   = aEvent.DropAction;
+            m_nLastDropAction	= aEvent.DropAction;
             if( ! m_bDropEnterSent )
             {
                 m_bDropEnterSent = true;
@@ -2315,15 +2315,15 @@ bool SelectionManager::handleDropEvent( XClientMessageEvent& rMessage )
             if( m_bLastDropAccepted )
             {
                 DropTargetDropEvent aEvent;
-                aEvent.Source       = static_cast< XDropTarget* >(it->second.m_pTarget);
-                aEvent.Context      = new DropTargetDropContext( m_aCurrentDropWindow, m_nDropTimestamp, *this );
-                aEvent.LocationX    = m_nLastX;
-                aEvent.LocationY    = m_nLastY;
-                aEvent.DropAction   = m_nLastDropAction;
+                aEvent.Source		= static_cast< XDropTarget* >(it->second.m_pTarget);
+                aEvent.Context		= new DropTargetDropContext( m_aCurrentDropWindow, m_nDropTimestamp, *this );
+                aEvent.LocationX	= m_nLastX;
+                aEvent.LocationY	= m_nLastY;
+                aEvent.DropAction	= m_nLastDropAction;
                 // there is nothing corresponding to source supported actions
                 // every source can do link, copy and move
                 aEvent.SourceActions= m_nLastDropAction;
-                aEvent.Transferable = m_xDropTransferable;
+                aEvent.Transferable	= m_xDropTransferable;
 
                 m_bDropWaitingForCompletion = true;
                 aGuard.clear();
@@ -2347,7 +2347,7 @@ bool SelectionManager::handleDropEvent( XClientMessageEvent& rMessage )
 }
 
 /*
- *  methods for XDropTargetDropContext
+ *	methods for XDropTargetDropContext
  */
 
 void SelectionManager::dropComplete( sal_Bool bSuccess, XLIB_Window aDropWindow, XLIB_Time )
@@ -2359,11 +2359,11 @@ void SelectionManager::dropComplete( sal_Bool bSuccess, XLIB_Window aDropWindow,
         if( m_xDragSourceListener.is() )
         {
             DragSourceDropEvent dsde;
-            dsde.Source             = static_cast< OWeakObject* >(this);
-            dsde.DragSourceContext  = new DragSourceContext( m_aDropWindow, m_nDragTimestamp, *this );
-            dsde.DragSource         = static_cast< XDragSource* >(this);
-            dsde.DropAction         = getUserDragAction();
-            dsde.DropSuccess        = bSuccess;
+            dsde.Source				= static_cast< OWeakObject* >(this);
+            dsde.DragSourceContext	= new DragSourceContext( m_aDropWindow, m_nDragTimestamp, *this );
+            dsde.DragSource			= static_cast< XDragSource* >(this);
+            dsde.DropAction			= getUserDragAction();
+            dsde.DropSuccess		= bSuccess;
             Reference< XDragSourceListener > xListener = m_xDragSourceListener;
             m_xDragSourceListener.clear();
 
@@ -2373,16 +2373,16 @@ void SelectionManager::dropComplete( sal_Bool bSuccess, XLIB_Window aDropWindow,
         else if( m_aDropEnterEvent.data.l[0] && m_aCurrentDropWindow )
         {
             XEvent aEvent;
-            aEvent.xclient.type         = ClientMessage;
-            aEvent.xclient.display      = m_pDisplay;
-            aEvent.xclient.window       = m_aDropEnterEvent.data.l[0];
-            aEvent.xclient.message_type = m_nXdndFinished;
-            aEvent.xclient.format       = 32;
-            aEvent.xclient.data.l[0]    = m_aCurrentDropWindow;
-            aEvent.xclient.data.l[1]    = bSuccess ? 1 : 0;
-            aEvent.xclient.data.l[2]    = 0;
-            aEvent.xclient.data.l[3]    = 0;
-            aEvent.xclient.data.l[4]    = 0;
+            aEvent.xclient.type			= ClientMessage;
+            aEvent.xclient.display		= m_pDisplay;
+            aEvent.xclient.window		= m_aDropEnterEvent.data.l[0];
+            aEvent.xclient.message_type	= m_nXdndFinished;
+            aEvent.xclient.format		= 32;
+            aEvent.xclient.data.l[0]	= m_aCurrentDropWindow;
+            aEvent.xclient.data.l[1]	= bSuccess ? 1 : 0;
+            aEvent.xclient.data.l[2]	= 0;
+            aEvent.xclient.data.l[3]	= 0;
+            aEvent.xclient.data.l[4]	= 0;
             if( bSuccess )
             {
                 if( m_nLastDropAction & DNDConstants::ACTION_MOVE )
@@ -2402,9 +2402,9 @@ void SelectionManager::dropComplete( sal_Bool bSuccess, XLIB_Window aDropWindow,
             XSendEvent( m_pDisplay, m_aDropEnterEvent.data.l[0],
                         False, NoEventMask, & aEvent );
 
-            m_aDropEnterEvent.data.l[0] = None;
-            m_aCurrentDropWindow        = None;
-            m_nCurrentProtocolVersion   = nXdndProtocolRevision;
+            m_aDropEnterEvent.data.l[0]	= None;
+            m_aCurrentDropWindow		= None;
+            m_nCurrentProtocolVersion	= nXdndProtocolRevision;
         }
         m_bDropWaitingForCompletion = false;
     }
@@ -2413,7 +2413,7 @@ void SelectionManager::dropComplete( sal_Bool bSuccess, XLIB_Window aDropWindow,
 }
 
 /*
- *  methods for XDropTargetDragContext
+ *	methods for XDropTargetDragContext
  */
 
 // ------------------------------------------------------------------------
@@ -2442,11 +2442,11 @@ void SelectionManager::sendDragStatus( Atom nDropAction )
         }
 
         DragSourceDragEvent dsde;
-        dsde.Source             = static_cast< OWeakObject* >(this);
-        dsde.DragSourceContext  = new DragSourceContext( m_aDropWindow, m_nDragTimestamp, *this );
-        dsde.DragSource         = static_cast< XDragSource* >(this);
-        dsde.DropAction         = m_nSourceActions;
-        dsde.UserAction         = getUserDragAction();
+        dsde.Source				= static_cast< OWeakObject* >(this);
+        dsde.DragSourceContext	= new DragSourceContext( m_aDropWindow, m_nDragTimestamp, *this );
+        dsde.DragSource			= static_cast< XDragSource* >(this);
+        dsde.DropAction			= m_nSourceActions;
+        dsde.UserAction			= getUserDragAction();
 
         Reference< XDragSourceListener > xListener( m_xDragSourceListener );
         // caution: do not change anything after this
@@ -2457,15 +2457,15 @@ void SelectionManager::sendDragStatus( Atom nDropAction )
     else if( m_aDropEnterEvent.data.l[0] && m_aCurrentDropWindow )
     {
         XEvent aEvent;
-        aEvent.xclient.type         = ClientMessage;
-        aEvent.xclient.display      = m_pDisplay;
-        aEvent.xclient.window       = m_aDropEnterEvent.data.l[0];
-        aEvent.xclient.message_type = m_nXdndStatus;
-        aEvent.xclient.format       = 32;
-        aEvent.xclient.data.l[0]    = m_aCurrentDropWindow;
-        aEvent.xclient.data.l[1]    = 2;
-        if( nDropAction == m_nXdndActionMove    ||
-            nDropAction == m_nXdndActionLink    ||
+        aEvent.xclient.type			= ClientMessage;
+        aEvent.xclient.display		= m_pDisplay;
+        aEvent.xclient.window		= m_aDropEnterEvent.data.l[0];
+        aEvent.xclient.message_type	= m_nXdndStatus;
+        aEvent.xclient.format		= 32;
+        aEvent.xclient.data.l[0]	= m_aCurrentDropWindow;
+        aEvent.xclient.data.l[1]	= 2;
+        if( nDropAction == m_nXdndActionMove	||
+            nDropAction == m_nXdndActionLink	||
             nDropAction == m_nXdndActionCopy )
             aEvent.xclient.data.l[1] |= 1;
         aEvent.xclient.data.l[2] = 0;
@@ -2534,12 +2534,12 @@ bool SelectionManager::updateDragAction( int modifierState )
         m_nUserDragAction = nNewDropAction;
 
         DragSourceDragEvent dsde;
-        dsde.Source             = static_cast< OWeakObject* >(this);
-        dsde.DragSourceContext  = new DragSourceContext( m_aDropWindow, m_nDragTimestamp, *this );
-        dsde.DragSource         = static_cast< XDragSource* >(this);
-        dsde.DropAction         = m_nUserDragAction;
-        dsde.UserAction         = m_nUserDragAction;
-        m_nTargetAcceptAction   = DNDConstants::ACTION_DEFAULT; // invalidate last accept
+        dsde.Source				= static_cast< OWeakObject* >(this);
+        dsde.DragSourceContext	= new DragSourceContext( m_aDropWindow, m_nDragTimestamp, *this );
+        dsde.DragSource			= static_cast< XDragSource* >(this);
+        dsde.DropAction			= m_nUserDragAction;
+        dsde.UserAction			= m_nUserDragAction;
+        m_nTargetAcceptAction	= DNDConstants::ACTION_DEFAULT; // invalidate last accept
         m_xDragSourceListener->dropActionChanged( dsde );
     }
     return bRet;
@@ -2564,12 +2564,12 @@ void SelectionManager::sendDropPosition( bool bForce, XLIB_Time eventTime )
             XLIB_Window aChild;
             XTranslateCoordinates( m_pDisplay, it->second.m_aRootWindow, m_aDropWindow, m_nLastDragX, m_nLastDragY, &x, &y, &aChild );
             DropTargetDragEvent dtde;
-            dtde.Source         = static_cast< OWeakObject* >(it->second.m_pTarget );
-            dtde.Context        = new DropTargetDragContext( m_aCurrentDropWindow, m_nDropTimestamp, *this );
-            dtde.LocationX      = x;
-            dtde.LocationY      = y;
-            dtde.DropAction     = getUserDragAction();
-            dtde.SourceActions  = m_nSourceActions;
+            dtde.Source			= static_cast< OWeakObject* >(it->second.m_pTarget );
+            dtde.Context		= new DropTargetDragContext( m_aCurrentDropWindow, m_nDropTimestamp, *this );
+            dtde.LocationX		= x;
+            dtde.LocationY		= y;
+            dtde.DropAction		= getUserDragAction();
+            dtde.SourceActions	= m_nSourceActions;
             aGuard.clear();
             it->second->dragOver( dtde );
         }
@@ -2583,14 +2583,14 @@ void SelectionManager::sendDropPosition( bool bForce, XLIB_Time eventTime )
         // send XdndPosition
         XEvent aEvent;
         aEvent.type = ClientMessage;
-        aEvent.xclient.display      = m_pDisplay;
-        aEvent.xclient.format       = 32;
-        aEvent.xclient.message_type = m_nXdndPosition;
-        aEvent.xclient.window       = m_aDropWindow;
-        aEvent.xclient.data.l[0]    = m_aWindow;
-        aEvent.xclient.data.l[1]    = 0;
-        aEvent.xclient.data.l[2]    = m_nLastDragX << 16 | (m_nLastDragY&0xffff);
-        aEvent.xclient.data.l[3]    = eventTime;
+        aEvent.xclient.display		= m_pDisplay;
+        aEvent.xclient.format		= 32;
+        aEvent.xclient.message_type	= m_nXdndPosition;
+        aEvent.xclient.window		= m_aDropWindow;
+        aEvent.xclient.data.l[0]	= m_aWindow;
+        aEvent.xclient.data.l[1]	= 0;
+        aEvent.xclient.data.l[2]	= m_nLastDragX << 16 | (m_nLastDragY&0xffff);
+        aEvent.xclient.data.l[3]	= eventTime;
 
         if( m_nUserDragAction & DNDConstants::ACTION_COPY )
             aEvent.xclient.data.l[4]=m_nXdndActionCopy;
@@ -2626,7 +2626,7 @@ bool SelectionManager::handleDragEvent( XEvent& rMessage )
             fprintf( stderr, "handleDragEvent: %s\n", OUStringToOString( getString( rMessage.xclient.message_type ), RTL_TEXTENCODING_ISO_8859_1 ).getStr() );
             break;
         case MotionNotify:
-//          fprintf( stderr, "handleDragEvent: MotionNotify\n" );
+//			fprintf( stderr, "handleDragEvent: MotionNotify\n" );
             break;
         case EnterNotify:
             fprintf( stderr, "handleDragEvent: EnterNotify\n" );
@@ -2659,9 +2659,9 @@ bool SelectionManager::handleDragEvent( XEvent& rMessage )
         {
             bHandled = true;
             DragSourceDragEvent dsde;
-            dsde.Source                 = static_cast< OWeakObject* >(this);
-            dsde.DragSourceContext      = new DragSourceContext( m_aDropWindow, m_nDragTimestamp, *this );
-            dsde.DragSource             = static_cast< XDragSource* >( this );
+            dsde.Source					= static_cast< OWeakObject* >(this);
+            dsde.DragSourceContext		= new DragSourceContext( m_aDropWindow, m_nDragTimestamp, *this );
+            dsde.DragSource				= static_cast< XDragSource* >( this );
             dsde.UserAction = getUserDragAction();
             dsde.DropAction = DNDConstants::ACTION_NONE;
             m_bDropSuccess = rMessage.xclient.data.l[1] & 1 ? true : false;
@@ -2688,10 +2688,10 @@ bool SelectionManager::handleDragEvent( XEvent& rMessage )
 
             if( ! ( rMessage.xclient.data.l[1] & 2 ) )
             {
-                m_nNoPosX       = rMessage.xclient.data.l[2] >> 16;
-                m_nNoPosY       = rMessage.xclient.data.l[2] & 0xffff;
-                m_nNoPosWidth   = rMessage.xclient.data.l[3] >> 16;
-                m_nNoPosHeight  = rMessage.xclient.data.l[3] & 0xffff;
+                m_nNoPosX		= rMessage.xclient.data.l[2] >> 16;
+                m_nNoPosY		= rMessage.xclient.data.l[2] & 0xffff;
+                m_nNoPosWidth	= rMessage.xclient.data.l[3] >> 16;
+                m_nNoPosHeight	= rMessage.xclient.data.l[3] & 0xffff;
             }
             else
                 m_nNoPosX = m_nNoPosY = m_nNoPosWidth = m_nNoPosHeight = 0;
@@ -2705,11 +2705,11 @@ bool SelectionManager::handleDragEvent( XEvent& rMessage )
             bHandled = true;
             // notify the listener
             DragSourceDropEvent dsde;
-            dsde.Source             = static_cast< OWeakObject* >(this);
-            dsde.DragSourceContext  = new DragSourceContext( m_aDropWindow, m_nDragTimestamp, *this );
-            dsde.DragSource         = static_cast< XDragSource* >(this);
-            dsde.DropAction         = m_nTargetAcceptAction;
-            dsde.DropSuccess        = m_bDropSuccess;
+            dsde.Source				= static_cast< OWeakObject* >(this);
+            dsde.DragSourceContext	= new DragSourceContext( m_aDropWindow, m_nDragTimestamp, *this );
+            dsde.DragSource			= static_cast< XDragSource* >(this);
+            dsde.DropAction			= m_nTargetAcceptAction;
+            dsde.DropSuccess		= m_bDropSuccess;
             Reference< XDragSourceListener > xListener( m_xDragSourceListener );
             m_xDragSourceListener.clear();
             aGuard.clear();
@@ -2722,8 +2722,8 @@ bool SelectionManager::handleDragEvent( XEvent& rMessage )
     {
         bHandled = true;
         bool bForce = false;
-        int root_x  = rMessage.type == MotionNotify ? rMessage.xmotion.x_root : rMessage.xcrossing.x_root;
-        int root_y  = rMessage.type == MotionNotify ? rMessage.xmotion.y_root : rMessage.xcrossing.y_root;
+        int root_x	= rMessage.type == MotionNotify ? rMessage.xmotion.x_root : rMessage.xcrossing.x_root;
+        int root_y	= rMessage.type == MotionNotify ? rMessage.xmotion.y_root : rMessage.xcrossing.y_root;
         XLIB_Window root = rMessage.type == MotionNotify ? rMessage.xmotion.root : rMessage.xcrossing.root;
         m_nDragTimestamp = rMessage.type == MotionNotify ? rMessage.xmotion.time : rMessage.xcrossing.time;
 
@@ -2760,22 +2760,22 @@ bool SelectionManager::handleDragEvent( XEvent& rMessage )
                 // send XdndLeave
                 XEvent aEvent;
                 aEvent.type = ClientMessage;
-                aEvent.xclient.display      = m_pDisplay;
-                aEvent.xclient.format       = 32;
-                aEvent.xclient.message_type = m_nXdndLeave;
-                aEvent.xclient.window       = m_aDropWindow;
-                aEvent.xclient.data.l[0]    = m_aWindow;
+                aEvent.xclient.display		= m_pDisplay;
+                aEvent.xclient.format		= 32;
+                aEvent.xclient.message_type	= m_nXdndLeave;
+                aEvent.xclient.window		= m_aDropWindow;
+                aEvent.xclient.data.l[0]	= m_aWindow;
                 memset( aEvent.xclient.data.l+1, 0, sizeof(long)*4);
                 m_aDropWindow = m_aDropProxy = None;
                 XSendEvent( m_pDisplay, m_aDropProxy, False, NoEventMask, &aEvent );
             }
             // notify the listener
             DragSourceDropEvent dsde;
-            dsde.Source             = static_cast< OWeakObject* >(this);
-            dsde.DragSourceContext  = new DragSourceContext( m_aDropWindow, m_nDragTimestamp, *this );
-            dsde.DragSource         = static_cast< XDragSource* >(this);
-            dsde.DropAction         = DNDConstants::ACTION_NONE;
-            dsde.DropSuccess        = sal_False;
+            dsde.Source				= static_cast< OWeakObject* >(this);
+            dsde.DragSourceContext	= new DragSourceContext( m_aDropWindow, m_nDragTimestamp, *this );
+            dsde.DragSource			= static_cast< XDragSource* >(this);
+            dsde.DropAction			= DNDConstants::ACTION_NONE;
+            dsde.DropSuccess		= sal_False;
             Reference< XDragSourceListener > xListener( m_xDragSourceListener );
             m_xDragSourceListener.clear();
             aGuard.clear();
@@ -2784,9 +2784,9 @@ bool SelectionManager::handleDragEvent( XEvent& rMessage )
         else
         {
             /*
-             *  man page says: state is state immediate PRIOR to the
-             *  event. It would seem that this is a somewhat arguable
-             *  design decision.
+             *	man page says: state is state immediate PRIOR to the
+             *	event. It would seem that this is a somewhat arguable
+             *	design decision.
              */
             int nState = rMessage.xkey.state;
             int nNewState = 0;
@@ -2823,15 +2823,15 @@ bool SelectionManager::handleDragEvent( XEvent& rMessage )
                     XLIB_Window aChild;
                     XTranslateCoordinates( m_pDisplay, rMessage.xbutton.root, m_aDropWindow, rMessage.xbutton.x_root, rMessage.xbutton.y_root, &x, &y, &aChild );
                     DropTargetDropEvent dtde;
-                    dtde.Source         = static_cast< OWeakObject* >(it->second.m_pTarget );
-                    dtde.Context        = new DropTargetDropContext( m_aCurrentDropWindow, m_nDropTimestamp, *this );
-                    dtde.LocationX      = x;
-                    dtde.LocationY      = y;
-                    dtde.DropAction     = m_nUserDragAction;
-                    dtde.SourceActions  = m_nSourceActions;
-                    dtde.Transferable   = m_xDragSourceTransferable;
-                    m_bDropSent                 = true;
-                    m_nDropTimeout              = time( NULL );
+                    dtde.Source			= static_cast< OWeakObject* >(it->second.m_pTarget );
+                    dtde.Context		= new DropTargetDropContext( m_aCurrentDropWindow, m_nDropTimestamp, *this );
+                    dtde.LocationX		= x;
+                    dtde.LocationY		= y;
+                    dtde.DropAction		= m_nUserDragAction;
+                    dtde.SourceActions	= m_nSourceActions;
+                    dtde.Transferable	= m_xDragSourceTransferable;
+                    m_bDropSent					= true;
+                    m_nDropTimeout				= time( NULL );
                     m_bDropWaitingForCompletion = true;
                     aGuard.clear();
                     it->second->drop( dtde );
@@ -2845,18 +2845,18 @@ bool SelectionManager::handleDragEvent( XEvent& rMessage )
 
                 XEvent aEvent;
                 aEvent.type = ClientMessage;
-                aEvent.xclient.display      = m_pDisplay;
-                aEvent.xclient.format       = 32;
-                aEvent.xclient.message_type = m_nXdndDrop;
-                aEvent.xclient.window       = m_aDropWindow;
-                aEvent.xclient.data.l[0]    = m_aWindow;
-                aEvent.xclient.data.l[1]    = 0;
-                aEvent.xclient.data.l[2]    = rMessage.xbutton.time;
-                aEvent.xclient.data.l[3]    = 0;
-                aEvent.xclient.data.l[4]    = 0;
-
-                m_bDropSent                 = true;
-                m_nDropTimeout              = time( NULL );
+                aEvent.xclient.display		= m_pDisplay;
+                aEvent.xclient.format		= 32;
+                aEvent.xclient.message_type	= m_nXdndDrop;
+                aEvent.xclient.window		= m_aDropWindow;
+                aEvent.xclient.data.l[0]	= m_aWindow;
+                aEvent.xclient.data.l[1]	= 0;
+                aEvent.xclient.data.l[2]	= rMessage.xbutton.time;
+                aEvent.xclient.data.l[3]	= 0;
+                aEvent.xclient.data.l[4]	= 0;
+
+                m_bDropSent					= true;
+                m_nDropTimeout				= time( NULL );
                 XSendEvent( m_pDisplay, m_aDropProxy, False, NoEventMask, &aEvent );
                 bCancel = false;
             }
@@ -2873,16 +2873,16 @@ bool SelectionManager::handleDragEvent( XEvent& rMessage )
                     XLIB_Window aDummy;
                     XEvent aEvent;
                     aEvent.type = ButtonPress;
-                    aEvent.xbutton.display      = m_pDisplay;
-                    aEvent.xbutton.window       = m_aDropWindow;
-                    aEvent.xbutton.root         = rMessage.xbutton.root;
-                    aEvent.xbutton.subwindow    = m_aDropWindow;
-                    aEvent.xbutton.time         = rMessage.xbutton.time+1;
-                    aEvent.xbutton.x_root       = rMessage.xbutton.x_root;
-                    aEvent.xbutton.y_root       = rMessage.xbutton.y_root;
-                    aEvent.xbutton.state        = rMessage.xbutton.state;
-                    aEvent.xbutton.button       = Button2;
-                    aEvent.xbutton.same_screen  = True;
+                    aEvent.xbutton.display		= m_pDisplay;
+                    aEvent.xbutton.window		= m_aDropWindow;
+                    aEvent.xbutton.root			= rMessage.xbutton.root;
+                    aEvent.xbutton.subwindow	= m_aDropWindow;
+                    aEvent.xbutton.time			= rMessage.xbutton.time+1;
+                    aEvent.xbutton.x_root		= rMessage.xbutton.x_root;
+                    aEvent.xbutton.y_root		= rMessage.xbutton.y_root;
+                    aEvent.xbutton.state		= rMessage.xbutton.state;
+                    aEvent.xbutton.button		= Button2;
+                    aEvent.xbutton.same_screen	= True;
                     XTranslateCoordinates( m_pDisplay,
                                            rMessage.xbutton.root, m_aDropWindow,
                                            rMessage.xbutton.x_root, rMessage.xbutton.y_root,
@@ -2894,12 +2894,12 @@ bool SelectionManager::handleDragEvent( XEvent& rMessage )
                     aEvent.xbutton.state |= Button2Mask;
                     XSendEvent( m_pDisplay, m_aDropWindow, False, ButtonReleaseMask, &aEvent );
 
-                    m_bDropSent                 = true;
-                    m_nDropTimeout              = time( NULL );
+                    m_bDropSent					= true;
+                    m_nDropTimeout				= time( NULL );
                     XSendEvent( m_pDisplay, m_aDropProxy, False, NoEventMask, &aEvent );
-                    m_bWaitingForPrimaryConversion  = true;
-                    m_bDropSent                     = true;
-                    m_nDropTimeout                  = time( NULL );
+                    m_bWaitingForPrimaryConversion	= true;
+                    m_bDropSent						= true;
+                    m_nDropTimeout					= time( NULL );
                     // HACK :-)
                     aGuard.clear();
                     static_cast< X11Clipboard* >( pAdaptor )->setContents( m_xDragSourceTransferable, Reference< ::com::sun::star::datatransfer::clipboard::XClipboardOwner >() );
@@ -2912,11 +2912,11 @@ bool SelectionManager::handleDragEvent( XEvent& rMessage )
         {
             // cancel drag
             DragSourceDropEvent dsde;
-            dsde.Source             = static_cast< OWeakObject* >(this);
-            dsde.DragSourceContext  = new DragSourceContext( m_aDropWindow, m_nDragTimestamp, *this );
-            dsde.DragSource         = static_cast< XDragSource* >(this);
-            dsde.DropAction         = DNDConstants::ACTION_NONE;
-            dsde.DropSuccess        = sal_False;
+            dsde.Source				= static_cast< OWeakObject* >(this);
+            dsde.DragSourceContext	= new DragSourceContext( m_aDropWindow, m_nDragTimestamp, *this );
+            dsde.DragSource			= static_cast< XDragSource* >(this);
+            dsde.DropAction			= DNDConstants::ACTION_NONE;
+            dsde.DropSuccess		= sal_False;
             Reference< XDragSourceListener > xListener( m_xDragSourceListener );
             m_xDragSourceListener.clear();
             aGuard.clear();
@@ -2963,11 +2963,11 @@ void SelectionManager::reject( XLIB_Window aDropWindow, XLIB_Time )
         if( m_bDropSent && m_xDragSourceListener.is() )
         {
             DragSourceDropEvent dsde;
-            dsde.Source             = static_cast< OWeakObject* >(this);
-            dsde.DragSourceContext  = new DragSourceContext( m_aDropWindow, m_nDragTimestamp, *this );
-            dsde.DragSource         = static_cast< XDragSource* >(this);
-            dsde.DropAction         = DNDConstants::ACTION_NONE;
-            dsde.DropSuccess        = sal_False;
+            dsde.Source				= static_cast< OWeakObject* >(this);
+            dsde.DragSourceContext	= new DragSourceContext( m_aDropWindow, m_nDragTimestamp, *this );
+            dsde.DragSource			= static_cast< XDragSource* >(this);
+            dsde.DropAction			= DNDConstants::ACTION_NONE;
+            dsde.DropSuccess		= sal_False;
             m_xDragSourceListener->dragDropEnd( dsde );
             m_xDragSourceListener.clear();
         }
@@ -2975,7 +2975,7 @@ void SelectionManager::reject( XLIB_Window aDropWindow, XLIB_Time )
 }
 
 /*
- *  XDragSource
+ *	XDragSource
  */
 
 sal_Bool SelectionManager::isDragImageSupported() throw()
@@ -3012,8 +3012,8 @@ int SelectionManager::getXdndVersion( XLIB_Window aWindow, XLIB_Window& rProxy )
     rProxy = None;
 
     /*
-     *  XListProperties is used here to avoid unnecessary XGetWindowProperty calls
-     *  and therefore reducing latency penalty
+     *	XListProperties is used here to avoid unnecessary XGetWindowProperty calls
+     *	and therefore reducing latency penalty
      */
     pProperties = XListProperties( m_pDisplay, aWindow, &nProperties );
     // first look for proxy
@@ -3113,11 +3113,11 @@ void SelectionManager::updateDragWindow( int nX, int nY, XLIB_Window aRoot )
 
 
     DragSourceDragEvent dsde;
-    dsde.Source             = static_cast< OWeakObject* >(this);
-    dsde.DragSourceContext  = new DragSourceContext( m_aDropWindow, m_nDragTimestamp, *this );
-    dsde.DragSource         = static_cast< XDragSource* >(this);
-    dsde.DropAction         = nNewProtocolVersion >= 0 ? m_nUserDragAction : DNDConstants::ACTION_COPY;
-    dsde.UserAction         = nNewProtocolVersion >= 0 ? m_nUserDragAction : DNDConstants::ACTION_COPY;
+    dsde.Source				= static_cast< OWeakObject* >(this);
+    dsde.DragSourceContext	= new DragSourceContext( m_aDropWindow, m_nDragTimestamp, *this );
+    dsde.DragSource			= static_cast< XDragSource* >(this);
+    dsde.DropAction			= nNewProtocolVersion >= 0 ? m_nUserDragAction : DNDConstants::ACTION_COPY;
+    dsde.UserAction			= nNewProtocolVersion >= 0 ? m_nUserDragAction : DNDConstants::ACTION_COPY;
 
     ::std::hash_map< XLIB_Window, DropTargetEntry >::const_iterator it;
     if( aNewCurrentWindow != m_aDropWindow )
@@ -3133,7 +3133,7 @@ void SelectionManager::updateDragWindow( int nX, int nY, XLIB_Window aRoot )
                 // shortcut for own drop targets
             {
                 DropTargetEvent dte;
-                dte.Source  = static_cast< OWeakObject* >( it->second.m_pTarget );
+                dte.Source	= static_cast< OWeakObject* >( it->second.m_pTarget );
                 aGuard.clear();
                 it->second.m_pTarget->dragExit( dte );
                 aGuard.reset();
@@ -3143,12 +3143,12 @@ void SelectionManager::updateDragWindow( int nX, int nY, XLIB_Window aRoot )
                 // send old drop target a XdndLeave
                 XEvent aEvent;
                 aEvent.type = ClientMessage;
-                aEvent.xclient.display          = m_pDisplay;
-                aEvent.xclient.format           = 32;
-                aEvent.xclient.message_type     = m_nXdndLeave;
-                aEvent.xclient.window           = m_aDropWindow;
-                aEvent.xclient.data.l[0]        = m_aWindow;
-                aEvent.xclient.data.l[1]        = 0;
+                aEvent.xclient.display			= m_pDisplay;
+                aEvent.xclient.format			= 32;
+                aEvent.xclient.message_type		= m_nXdndLeave;
+                aEvent.xclient.window			= m_aDropWindow;
+                aEvent.xclient.data.l[0]		= m_aWindow;
+                aEvent.xclient.data.l[1]		= 0;
                 XSendEvent( m_pDisplay, m_aDropProxy, False, NoEventMask, &aEvent );
             }
             if( xListener.is() )
@@ -3159,9 +3159,9 @@ void SelectionManager::updateDragWindow( int nX, int nY, XLIB_Window aRoot )
             }
         }
 
-        m_nCurrentProtocolVersion   = nNewProtocolVersion;
-        m_aDropWindow               = aNewCurrentWindow;
-        m_aDropProxy                = aNewProxy != None ? aNewProxy : m_aDropWindow;
+        m_nCurrentProtocolVersion	= nNewProtocolVersion;
+        m_aDropWindow				= aNewCurrentWindow;
+        m_aDropProxy				= aNewProxy != None ? aNewProxy : m_aDropWindow;
 
         it = m_aDropTargets.find( m_aDropWindow );
         if( it != m_aDropTargets.end() && ! it->second.m_pTarget->m_bActive )
@@ -3181,13 +3181,13 @@ void SelectionManager::updateDragWindow( int nX, int nY, XLIB_Window aRoot )
             {
                 XTranslateCoordinates( m_pDisplay, aRoot, m_aDropWindow, nX, nY, &nWinX, &nWinY, &aChild );
                 DropTargetDragEnterEvent dtde;
-                dtde.Source                 = static_cast< OWeakObject* >( it->second.m_pTarget );
-                dtde.Context                = new DropTargetDragContext( m_aCurrentDropWindow, m_nDropTimestamp, *this );
-                dtde.LocationX              = nWinX;
-                dtde.LocationY              = nWinY;
-                dtde.DropAction             = m_nUserDragAction;
-                dtde.SourceActions          = m_nSourceActions;
-                dtde.SupportedDataFlavors   = m_xDragSourceTransferable->getTransferDataFlavors();
+                dtde.Source					= static_cast< OWeakObject* >( it->second.m_pTarget );
+                dtde.Context				= new DropTargetDragContext( m_aCurrentDropWindow, m_nDropTimestamp, *this );
+                dtde.LocationX				= nWinX;
+                dtde.LocationY				= nWinY;
+                dtde.DropAction				= m_nUserDragAction;
+                dtde.SourceActions			= m_nSourceActions;
+                dtde.SupportedDataFlavors	= m_xDragSourceTransferable->getTransferDataFlavors();
                 aGuard.clear();
                 it->second.m_pTarget->dragEnter( dtde );
                 aGuard.reset();
@@ -3196,12 +3196,12 @@ void SelectionManager::updateDragWindow( int nX, int nY, XLIB_Window aRoot )
             {
                 XEvent aEvent;
                 aEvent.type = ClientMessage;
-                aEvent.xclient.display          = m_pDisplay;
-                aEvent.xclient.format           = 32;
-                aEvent.xclient.message_type = m_nXdndEnter;
-                aEvent.xclient.window       = m_aDropWindow;
-                aEvent.xclient.data.l[0]    = m_aWindow;
-                aEvent.xclient.data.l[1]    = m_nCurrentProtocolVersion << 24;
+                aEvent.xclient.display			= m_pDisplay;
+                aEvent.xclient.format			= 32;
+                aEvent.xclient.message_type	= m_nXdndEnter;
+                aEvent.xclient.window		= m_aDropWindow;
+                aEvent.xclient.data.l[0]	= m_aWindow;
+                aEvent.xclient.data.l[1]	= m_nCurrentProtocolVersion << 24;
                 memset( aEvent.xclient.data.l + 2, 0, sizeof( long )*3 );
                 // fill in data types
                 ::std::list< Atom > aConversions;
@@ -3240,11 +3240,11 @@ void SelectionManager::startDrag(
 #endif
 
     DragSourceDropEvent aDragFailedEvent;
-    aDragFailedEvent.Source             = static_cast< OWeakObject* >(this);
-    aDragFailedEvent.DragSource         = static_cast< XDragSource* >(this);
-    aDragFailedEvent.DragSourceContext  = new DragSourceContext( None, CurrentTime, *this );
-    aDragFailedEvent.DropAction         = DNDConstants::ACTION_NONE;
-    aDragFailedEvent.DropSuccess        = sal_False;
+    aDragFailedEvent.Source				= static_cast< OWeakObject* >(this);
+    aDragFailedEvent.DragSource			= static_cast< XDragSource* >(this);
+    aDragFailedEvent.DragSourceContext	= new DragSourceContext( None, CurrentTime, *this );
+    aDragFailedEvent.DropAction			= DNDConstants::ACTION_NONE;
+    aDragFailedEvent.DropSuccess		= sal_False;
 
     if( m_aDragRunning.check() )
     {
@@ -3334,7 +3334,7 @@ void SelectionManager::startDrag(
         /* if we could not grab the pointer here, there is a chance
            that the pointer is grabbed by the other vcl display (the main loop)
            so let's break that grab an reset it later
-
+           
            remark: this whole code should really be molten into normal vcl so only
            one display is used ....
         */
@@ -3392,10 +3392,10 @@ void SelectionManager::startDrag(
             return;
         }
 
-        m_xDragSourceTransferable   = transferable;
-        m_xDragSourceListener       = listener;
-        m_aDragFlavors              = transferable->getTransferDataFlavors();
-        m_aCurrentCursor            = None;
+        m_xDragSourceTransferable	= transferable;
+        m_xDragSourceListener		= listener;
+        m_aDragFlavors				= transferable->getTransferDataFlavors();
+        m_aCurrentCursor			= None;
 
         requestOwnership( m_nXdndSelection );
 
@@ -3411,17 +3411,17 @@ void SelectionManager::startDrag(
 
         XChangeProperty( m_pDisplay, m_aWindow, m_nXdndTypeList, XA_ATOM, 32, PropModeReplace, (unsigned char*)pTypes, nTypes );
 
-        m_nSourceActions                = sourceActions | DNDConstants::ACTION_DEFAULT;
-        m_nUserDragAction               = DNDConstants::ACTION_MOVE & m_nSourceActions;
+        m_nSourceActions				= sourceActions | DNDConstants::ACTION_DEFAULT;
+        m_nUserDragAction				= DNDConstants::ACTION_MOVE & m_nSourceActions;
         if( ! m_nUserDragAction )
-            m_nUserDragAction           = DNDConstants::ACTION_COPY & m_nSourceActions;
+            m_nUserDragAction			= DNDConstants::ACTION_COPY & m_nSourceActions;
         if( ! m_nUserDragAction )
-            m_nUserDragAction           = DNDConstants::ACTION_LINK & m_nSourceActions;
-        m_nTargetAcceptAction           = DNDConstants::ACTION_DEFAULT;
-        m_bDropSent                     = false;
-        m_bDropSuccess                  = false;
-        m_bWaitingForPrimaryConversion  = false;
-        m_nDragButton                   = Button1; // default to left button
+            m_nUserDragAction			= DNDConstants::ACTION_LINK & m_nSourceActions;
+        m_nTargetAcceptAction			= DNDConstants::ACTION_DEFAULT;
+        m_bDropSent						= false;
+        m_bDropSuccess					= false;
+        m_bWaitingForPrimaryConversion	= false;
+        m_nDragButton					= Button1; // default to left button
         com::sun::star::awt::MouseEvent aEvent;
         if( trigger.Event >>= aEvent )
         {
@@ -3452,17 +3452,17 @@ void SelectionManager::startDrag(
         m_xDragSourceListener.clear();
         m_xDragSourceTransferable.clear();
 
-        m_bDropSent                         = false;
-        m_bDropSuccess                      = false;
-        m_bWaitingForPrimaryConversion      = false;
-        m_aDropWindow                       = None;
-        m_aDropProxy                        = None;
-        m_nCurrentProtocolVersion           = nXdndProtocolRevision;
-        m_nNoPosX                           = 0;
-        m_nNoPosY                           = 0;
-        m_nNoPosWidth                       = 0;
-        m_nNoPosHeight                      = 0;
-        m_aCurrentCursor                    = None;
+        m_bDropSent							= false;
+        m_bDropSuccess						= false;
+        m_bWaitingForPrimaryConversion		= false;
+        m_aDropWindow						= None;
+        m_aDropProxy						= None;
+        m_nCurrentProtocolVersion			= nXdndProtocolRevision;
+        m_nNoPosX							= 0;
+        m_nNoPosY							= 0;
+        m_nNoPosWidth						= 0;
+        m_nNoPosHeight						= 0;
+        m_aCurrentCursor					= None;
 
         XUngrabPointer( m_pDisplay, CurrentTime );
         XUngrabKeyboard( m_pDisplay, CurrentTime );
@@ -3522,27 +3522,27 @@ void SelectionManager::dragDoDispatch()
         m_xDragSourceTransferable.clear();
 
         DragSourceDropEvent dsde;
-        dsde.Source             = static_cast< OWeakObject* >(this);
-        dsde.DragSourceContext  = new DragSourceContext( m_aDropWindow, m_nDragTimestamp, *this );
-        dsde.DragSource         = static_cast< XDragSource* >(this);
-        dsde.DropAction         = DNDConstants::ACTION_NONE;
-        dsde.DropSuccess        = sal_False;
+        dsde.Source				= static_cast< OWeakObject* >(this);
+        dsde.DragSourceContext	= new DragSourceContext( m_aDropWindow, m_nDragTimestamp, *this );
+        dsde.DragSource			= static_cast< XDragSource* >(this);
+        dsde.DropAction			= DNDConstants::ACTION_NONE;
+        dsde.DropSuccess		= sal_False;
 
         // cleanup after drag
         if( m_bWaitingForPrimaryConversion )
             getAdaptor( XA_PRIMARY )->clearTransferable();
 
-        m_bDropSent                         = false;
-        m_bDropSuccess                      = false;
-        m_bWaitingForPrimaryConversion      = false;
-        m_aDropWindow                       = None;
-        m_aDropProxy                        = None;
-        m_nCurrentProtocolVersion           = nXdndProtocolRevision;
-        m_nNoPosX                           = 0;
-        m_nNoPosY                           = 0;
-        m_nNoPosWidth                       = 0;
-        m_nNoPosHeight                      = 0;
-        m_aCurrentCursor                    = None;
+        m_bDropSent							= false;
+        m_bDropSuccess						= false;
+        m_bWaitingForPrimaryConversion		= false;
+        m_aDropWindow						= None;
+        m_aDropProxy						= None;
+        m_nCurrentProtocolVersion			= nXdndProtocolRevision;
+        m_nNoPosX							= 0;
+        m_nNoPosY							= 0;
+        m_nNoPosWidth						= 0;
+        m_nNoPosHeight						= 0;
+        m_aCurrentCursor					= None;
 
         XUngrabPointer( m_pDisplay, CurrentTime );
         XUngrabKeyboard( m_pDisplay, CurrentTime );
@@ -3562,7 +3562,7 @@ void SelectionManager::dragDoDispatch()
 }
 
 /*
- *  XDragSourceContext
+ *	XDragSourceContext
  */
 
 sal_Int32 SelectionManager::getCurrentCursor()
@@ -3619,17 +3619,17 @@ void SelectionManager::transferablesFlavorsChanged()
         XEvent aEvent;
 
         aEvent.type = ClientMessage;
-        aEvent.xclient.display          = m_pDisplay;
-        aEvent.xclient.format           = 32;
-        aEvent.xclient.window           = m_aDropWindow;
-        aEvent.xclient.data.l[0]        = m_aWindow;
+        aEvent.xclient.display			= m_pDisplay;
+        aEvent.xclient.format			= 32;
+        aEvent.xclient.window			= m_aDropWindow;
+        aEvent.xclient.data.l[0]		= m_aWindow;
 
-        aEvent.xclient.message_type     = m_nXdndLeave;
-        aEvent.xclient.data.l[1]        = 0;
+        aEvent.xclient.message_type		= m_nXdndLeave;
+        aEvent.xclient.data.l[1]		= 0;
         XSendEvent( m_pDisplay, m_aDropProxy, False, NoEventMask, &aEvent );
 
-        aEvent.xclient.message_type = m_nXdndEnter;
-        aEvent.xclient.data.l[1]    = m_nCurrentProtocolVersion << 24;
+        aEvent.xclient.message_type	= m_nXdndEnter;
+        aEvent.xclient.data.l[1]	= m_nCurrentProtocolVersion << 24;
         memset( aEvent.xclient.data.l + 2, 0, sizeof( long )*3 );
         // fill in data types
         if( nTypes > 3 )
@@ -3642,7 +3642,7 @@ void SelectionManager::transferablesFlavorsChanged()
 }
 
 /*
- *  dispatch loop
+ *	dispatch loop
  */
 
 // ------------------------------------------------------------------------
@@ -3650,9 +3650,9 @@ void SelectionManager::transferablesFlavorsChanged()
 bool SelectionManager::handleXEvent( XEvent& rEvent )
 {
     /*
-     *  since we are XConnectionListener to a second X display
-     *  to get client messages it is essential not to dispatch
-     *  events twice that we get on both connections
+     *	since we are XConnectionListener to a second X display
+     *	to get client messages it is essential not to dispatch
+     *	events twice that we get on both connections
      *
      *  #95201# between dispatching ButtonPress and startDrag
      *  the user can already have released the mouse. The ButtonRelease
@@ -3709,9 +3709,9 @@ bool SelectionManager::handleXEvent( XEvent& rEvent )
                 bHandled = handleDragEvent( rEvent );
             // messages from drag source
             else if(
-                    rEvent.xclient.message_type == m_nXdndEnter     ||
-                    rEvent.xclient.message_type == m_nXdndLeave     ||
-                    rEvent.xclient.message_type == m_nXdndPosition  ||
+                    rEvent.xclient.message_type == m_nXdndEnter		||
+                    rEvent.xclient.message_type == m_nXdndLeave		||
+                    rEvent.xclient.message_type == m_nXdndPosition	||
                     rEvent.xclient.message_type == m_nXdndDrop
                     )
                 bHandled = handleDropEvent( rEvent.xclient );
@@ -3846,12 +3846,12 @@ void SelectionManager::shutdown() throw()
          * Allow thread to finish before app exits to avoid pulling the carpet
          * out from under it if pasting is occuring during shutdown
          *
-         * a) allow it to have the Mutex and
+         * a) allow it to have the Mutex and 
          * b) reschedule to allow it to complete callbacks to any
          * Application::GetSolarMutex protected regions, etc. e.g.
          * TransferableHelper::getTransferDataFlavors (via
          * SelectionManager::handleSelectionRequest) which it might
-         * currently be trying to enter.
+         * currently be trying to enter. 
          *
          * Otherwise the thread may be left still waiting on a GlobalMutex
          * when that gets destroyed, letting the thread blow up and die
@@ -3889,14 +3889,14 @@ sal_Bool SelectionManager::handleEvent( const Any& event ) throw()
             nTimestamp = pEvent->xmotion.time;
         else if( pEvent->type == PropertyNotify )
             nTimestamp = pEvent->xproperty.time;
-
+        
         if( nTimestamp != CurrentTime )
         {
             MutexGuard aGuard(m_aMutex);
-
+            
             m_nSelectionTimestamp = nTimestamp;
         }
-
+        
         return sal_Bool( handleXEvent( *pEvent ) );
     }
     else
@@ -3942,10 +3942,10 @@ void SelectionManager::registerHandler( Atom selection, SelectionAdaptor& rAdapt
 {
     MutexGuard aGuard(m_aMutex);
 
-    Selection* pNewSelection    = new Selection();
-    pNewSelection->m_pAdaptor   = &rAdaptor;
-    pNewSelection->m_aAtom      = selection;
-    m_aSelections[ selection ]  = pNewSelection;
+    Selection* pNewSelection	= new Selection();
+    pNewSelection->m_pAdaptor	= &rAdaptor;
+    pNewSelection->m_aAtom		= selection;
+    m_aSelections[ selection ]	= pNewSelection;
 }
 
 // ------------------------------------------------------------------------
@@ -4044,22 +4044,22 @@ void SelectionManager::deregisterDropTarget( XLIB_Window aWindow )
             // send XdndLeave
             XEvent aEvent;
             aEvent.type = ClientMessage;
-            aEvent.xclient.display      = m_pDisplay;
-            aEvent.xclient.format       = 32;
-            aEvent.xclient.message_type = m_nXdndLeave;
-            aEvent.xclient.window       = m_aDropWindow;
-            aEvent.xclient.data.l[0]    = m_aWindow;
+            aEvent.xclient.display		= m_pDisplay;
+            aEvent.xclient.format		= 32;
+            aEvent.xclient.message_type	= m_nXdndLeave;
+            aEvent.xclient.window		= m_aDropWindow;
+            aEvent.xclient.data.l[0]	= m_aWindow;
             memset( aEvent.xclient.data.l+1, 0, sizeof(long)*4);
             m_aDropWindow = m_aDropProxy = None;
             XSendEvent( m_pDisplay, m_aDropProxy, False, NoEventMask, &aEvent );
         }
         // notify the listener
         DragSourceDropEvent dsde;
-        dsde.Source             = static_cast< OWeakObject* >(this);
-        dsde.DragSourceContext  = new DragSourceContext( m_aDropWindow, m_nDragTimestamp, *this );
-        dsde.DragSource         = static_cast< XDragSource* >(this);
-        dsde.DropAction         = DNDConstants::ACTION_NONE;
-        dsde.DropSuccess        = sal_False;
+        dsde.Source				= static_cast< OWeakObject* >(this);
+        dsde.DragSourceContext	= new DragSourceContext( m_aDropWindow, m_nDragTimestamp, *this );
+        dsde.DragSource			= static_cast< XDragSource* >(this);
+        dsde.DropAction			= DNDConstants::ACTION_NONE;
+        dsde.DropSuccess		= sal_False;
         Reference< XDragSourceListener > xListener( m_xDragSourceListener );
         m_xDragSourceListener.clear();
         aGuard.clear();
@@ -4068,7 +4068,7 @@ void SelectionManager::deregisterDropTarget( XLIB_Window aWindow )
 }
 
 /*
- *  SelectionAdaptor
+ *	SelectionAdaptor
  */
 
 Reference< XTransferable > SelectionManager::getTransferable() throw()
@@ -4099,7 +4099,7 @@ Reference< XInterface > SelectionManager::getReference() throw()
 // ------------------------------------------------------------------------
 
 /*
- *  SelectionManagerHolder
+ *	SelectionManagerHolder
  */
 
 SelectionManagerHolder::SelectionManagerHolder() :
@@ -4139,7 +4139,7 @@ void SelectionManagerHolder::initialize( const Sequence< Any >& arguments ) thro
 }
 
 /*
- *  XDragSource
+ * 	XDragSource
  */
 
 sal_Bool SelectionManagerHolder::isDragImageSupported() throw()
@@ -4170,7 +4170,7 @@ void SelectionManagerHolder::startDrag(
 // ------------------------------------------------------------------------
 
 /*
- *  XServiceInfo
+ *	XServiceInfo
  */
 
 // ------------------------------------------------------------------------
diff --git a/vcl/unx/source/dtrans/X11_selection.hxx b/vcl/unx/source/dtrans/X11_selection.hxx
index 47baa1776d1a..ba037e143c72 100644
--- a/vcl/unx/source/dtrans/X11_selection.hxx
+++ b/vcl/unx/source/dtrans/X11_selection.hxx
@@ -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
@@ -82,11 +82,11 @@ namespace x11 {
         >
     {
     public:
-        ::osl::Mutex                m_aMutex;
-        bool                        m_bActive;
-        sal_Int8                    m_nDefaultActions;
-        XLIB_Window                 m_aTargetWindow;
-        class SelectionManager*     m_pSelectionManager;
+        ::osl::Mutex				m_aMutex;
+        bool						m_bActive;
+        sal_Int8					m_nDefaultActions;
+        XLIB_Window					m_aTargetWindow;
+        class SelectionManager*		m_pSelectionManager;
         Reference< ::com::sun::star::datatransfer::dnd::XDragSource >
                                     m_xSelectionManager;
         ::std::list< Reference< ::com::sun::star::datatransfer::dnd::XDropTargetListener > >
@@ -102,19 +102,19 @@ namespace x11 {
         void drop( const ::com::sun::star::datatransfer::dnd::DropTargetDropEvent& dtde ) throw();
 
         // XInitialization
-        virtual void        SAL_CALL initialize( const Sequence< Any >& args ) throw ( ::com::sun::star::uno::Exception );
+        virtual void		SAL_CALL initialize( const Sequence< Any >& args ) throw ( ::com::sun::star::uno::Exception );
 
         // XDropTarget
-        virtual void        SAL_CALL addDropTargetListener( const Reference< ::com::sun::star::datatransfer::dnd::XDropTargetListener >& ) throw();
-        virtual void        SAL_CALL removeDropTargetListener( const Reference< ::com::sun::star::datatransfer::dnd::XDropTargetListener >& ) throw();
-        virtual sal_Bool    SAL_CALL isActive() throw();
-        virtual void        SAL_CALL setActive( sal_Bool active ) throw();
-        virtual sal_Int8    SAL_CALL getDefaultActions() throw();
-        virtual void        SAL_CALL setDefaultActions( sal_Int8 actions ) throw();
+        virtual void		SAL_CALL addDropTargetListener( const Reference< ::com::sun::star::datatransfer::dnd::XDropTargetListener >& ) throw();
+        virtual void		SAL_CALL removeDropTargetListener( const Reference< ::com::sun::star::datatransfer::dnd::XDropTargetListener >& ) throw();
+        virtual sal_Bool	SAL_CALL isActive() throw();
+        virtual void		SAL_CALL setActive( sal_Bool active ) throw();
+        virtual sal_Int8 	SAL_CALL getDefaultActions() throw();
+        virtual void		SAL_CALL setDefaultActions( sal_Int8 actions ) throw();
 
         // XServiceInfo
         virtual ::rtl::OUString SAL_CALL getImplementationName() throw();
-        virtual sal_Bool    SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw();
+        virtual sal_Bool	SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw();
         virtual ::com::sun::star::uno::Sequence< ::rtl::OUString >
                             SAL_CALL getSupportedServiceNames() throw();
     };
@@ -135,17 +135,17 @@ namespace x11 {
 
         // XServiceInfo
         virtual ::rtl::OUString SAL_CALL getImplementationName() throw();
-        virtual sal_Bool    SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw();
+        virtual sal_Bool	SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw();
         virtual ::com::sun::star::uno::Sequence< ::rtl::OUString >
                             SAL_CALL getSupportedServiceNames() throw();
 
         // XInitialization
-        virtual void        SAL_CALL initialize( const Sequence< Any >& arguments ) throw( ::com::sun::star::uno::Exception );
+        virtual void		SAL_CALL initialize( const Sequence< Any >& arguments ) throw( ::com::sun::star::uno::Exception );
 
         // XDragSource
-        virtual sal_Bool    SAL_CALL isDragImageSupported() throw();
-        virtual sal_Int32   SAL_CALL getDefaultCursor( sal_Int8 dragAction ) throw();
-        virtual void        SAL_CALL startDrag(
+        virtual sal_Bool	SAL_CALL isDragImageSupported() throw();
+        virtual sal_Int32	SAL_CALL getDefaultCursor( sal_Int8 dragAction ) throw();
+        virtual void		SAL_CALL startDrag(
             const ::com::sun::star::datatransfer::dnd::DragGestureEvent& trigger,
             sal_Int8 sourceActions, sal_Int32 cursor, sal_Int32 image,
             const Reference< ::com::sun::star::datatransfer::XTransferable >& transferable,
@@ -153,8 +153,8 @@ namespace x11 {
             ) throw();
 
     };
-
-
+        
+    
     class SelectionManager :
         public ::cppu::WeakImplHelper4<
             ::com::sun::star::datatransfer::dnd::XDragSource,
@@ -175,13 +175,13 @@ namespace x11 {
         // property used to transfer the data
         struct IncrementalTransfer
         {
-            Sequence< sal_Int8 >            m_aData;
-            int                             m_nBufferPos;
-            XLIB_Window                         m_aRequestor;
-            Atom                            m_aProperty;
-            Atom                            m_aTarget;
-            int                             m_nFormat;
-            int                             m_nTransferStartTime;
+            Sequence< sal_Int8 >			m_aData;
+            int								m_nBufferPos;
+            XLIB_Window							m_aRequestor;
+            Atom							m_aProperty;
+            Atom							m_aTarget;
+            int								m_nFormat;
+            int								m_nTransferStartTime;
         };
         int m_nIncrementalThreshold;
 
@@ -193,26 +193,26 @@ namespace x11 {
                 Inactive, WaitingForResponse, WaitingForData, IncrementalTransfer
             };
 
-            State                       m_eState;
-            SelectionAdaptor*           m_pAdaptor;
-            Atom                        m_aAtom;
-            ::osl::Condition            m_aDataArrived;
-            Sequence< sal_Int8 >        m_aData;
+            State						m_eState;
+            SelectionAdaptor*			m_pAdaptor;
+            Atom						m_aAtom;
+            ::osl::Condition			m_aDataArrived;
+            Sequence< sal_Int8 >		m_aData;
             Sequence< ::com::sun::star::datatransfer::DataFlavor >
                                         m_aTypes;
-            std::vector< Atom >         m_aNativeTypes;
+            std::vector< Atom >			m_aNativeTypes;
             // this is used for caching
             // m_aTypes is invalid after 2 seconds
             // m_aNativeTypes contains the corresponding original atom
-            Atom                        m_aRequestedType;
+            Atom						m_aRequestedType;
             // m_aRequestedType is only valid while WaitingForResponse and WaitingFotData
-            int                         m_nLastTimestamp;
-            bool                        m_bHaveUTF16;
+            int							m_nLastTimestamp;
+            bool						m_bHaveUTF16;
             Atom                        m_aUTF8Type;
-            bool                        m_bHaveCompound;
-            bool                        m_bOwner;
-            XLIB_Window                 m_aLastOwner;
-            PixmapHolder*               m_pPixmap;
+            bool						m_bHaveCompound;
+            bool						m_bOwner;
+            XLIB_Window					m_aLastOwner;
+            PixmapHolder*				m_pPixmap;
             // m_nOrigXLIB_Timestamp contains the XLIB_Timestamp at which the seclection
             // was acquired; needed for XLIB_TimeSTAMP target
             XLIB_Time                        m_nOrigTimestamp;
@@ -235,8 +235,8 @@ namespace x11 {
         // a struct to hold data associated with a XDropTarget
         struct DropTargetEntry
         {
-            DropTarget*     m_pTarget;
-            XLIB_Window     m_aRootWindow;
+            DropTarget*		m_pTarget;
+            XLIB_Window		m_aRootWindow;
 
             DropTargetEntry() : m_pTarget( NULL ), m_aRootWindow( None ) {}
             DropTargetEntry( DropTarget* pTarget ) :
@@ -255,11 +255,11 @@ namespace x11 {
         };
 
         // internal data
-        Display*                    m_pDisplay;
-        oslThread                   m_aThread;
-        oslThread                   m_aDragExecuteThread;
-        ::osl::Condition            m_aDragRunning;
-        XLIB_Window                 m_aWindow;
+        Display*					m_pDisplay;
+        oslThread					m_aThread;
+        oslThread					m_aDragExecuteThread;
+        ::osl::Condition			m_aDragRunning;
+        XLIB_Window					m_aWindow;
         Reference< ::com::sun::star::awt::XDisplayConnection >
                                     m_xDisplayConnection;
         Reference< com::sun::star::script::XInvocation >
@@ -276,19 +276,19 @@ namespace x11 {
         // with one of our targets. The data.l[0] member
         // (conatining the drag source XLIB_Window) is set
         // to None while that is not the case
-        XClientMessageEvent         m_aDropEnterEvent;
+        XClientMessageEvent			m_aDropEnterEvent;
         // set to false on XdndEnter
         // set to true on first XdndPosition or XdndLeave
-        bool                        m_bDropEnterSent;
-        XLIB_Window                 m_aCurrentDropWindow;
+        bool						m_bDropEnterSent;
+        XLIB_Window					m_aCurrentDropWindow;
         // XLIB_Time code of XdndDrop
-        XLIB_Time                   m_nDropTime;
-        sal_Int8                    m_nLastDropAction;
+        XLIB_Time					m_nDropTime;
+        sal_Int8					m_nLastDropAction;
         // XTransferable for Xdnd with foreign drag source
         Reference< ::com::sun::star::datatransfer::XTransferable >
                                     m_xDropTransferable;
-        int                         m_nLastX, m_nLastY;
-        XLIB_Time                   m_nDropTimestamp;
+        int							m_nLastX, m_nLastY;
+        XLIB_Time					m_nDropTimestamp;
         // set to true when calling drop()
         // if another XdndEnter is received this shows that
         // someone forgot to call dropComplete - we should reset
@@ -298,32 +298,32 @@ namespace x11 {
         // drag only
 
         // None if no Dnd action is running with us as source
-        XLIB_Window                 m_aDropWindow;
+        XLIB_Window					m_aDropWindow;
         // either m_aDropXLIB_Window or its XdndProxy
-        XLIB_Window                 m_aDropProxy;
-        XLIB_Window                 m_aDragSourceWindow;
+        XLIB_Window					m_aDropProxy;
+        XLIB_Window					m_aDragSourceWindow;
         // XTransferable for Xdnd when we are drag source
         Reference< ::com::sun::star::datatransfer::XTransferable >
                                     m_xDragSourceTransferable;
         Reference< ::com::sun::star::datatransfer::dnd::XDragSourceListener >
                                     m_xDragSourceListener;
         // root coordinates
-        int                         m_nLastDragX, m_nLastDragY;
+        int							m_nLastDragX, m_nLastDragY;
         Sequence< ::com::sun::star::datatransfer::DataFlavor >
                                     m_aDragFlavors;
         // the rectangle the pointer must leave until a new XdndPosition should
         // be sent. empty unless the drop target told to fill
-        int                         m_nNoPosX, m_nNoPosY, m_nNoPosWidth, m_nNoPosHeight;
-        unsigned int                m_nDragButton;
-        sal_Int8                    m_nUserDragAction;
-        sal_Int8                    m_nTargetAcceptAction;
-        sal_Int8                    m_nSourceActions;
-        bool                        m_bLastDropAccepted;
-        bool                        m_bDropSuccess;
-        bool                        m_bDropSent;
-        time_t                      m_nDropTimeout;
-        bool                        m_bWaitingForPrimaryConversion;
-        XLIB_Time                   m_nDragTimestamp;
+        int							m_nNoPosX, m_nNoPosY, m_nNoPosWidth, m_nNoPosHeight;
+        unsigned int				m_nDragButton;
+        sal_Int8					m_nUserDragAction;
+        sal_Int8					m_nTargetAcceptAction;
+        sal_Int8					m_nSourceActions;
+        bool						m_bLastDropAccepted;
+        bool						m_bDropSuccess;
+        bool						m_bDropSent;
+        time_t						m_nDropTimeout;
+        bool						m_bWaitingForPrimaryConversion;
+        XLIB_Time					m_nDragTimestamp;
 
         // drag cursors
         XLIB_Cursor                 m_aMoveCursor;
@@ -335,36 +335,36 @@ namespace x11 {
 
         // drag and drop
 
-        int                         m_nCurrentProtocolVersion;
+        int							m_nCurrentProtocolVersion;
         ::std::hash_map< XLIB_Window, DropTargetEntry >
                                     m_aDropTargets;
 
 
         // some special atoms that are needed often
-        Atom                        m_nCLIPBOARDAtom;
-        Atom                        m_nTARGETSAtom;
+        Atom						m_nCLIPBOARDAtom;
+        Atom						m_nTARGETSAtom;
         Atom                        m_nTIMESTAMPAtom;
-        Atom                        m_nTEXTAtom;
-        Atom                        m_nINCRAtom;
-        Atom                        m_nCOMPOUNDAtom;
-        Atom                        m_nMULTIPLEAtom;
-        Atom                        m_nUTF16Atom;
+        Atom						m_nTEXTAtom;
+        Atom						m_nINCRAtom;
+        Atom						m_nCOMPOUNDAtom;
+        Atom						m_nMULTIPLEAtom;
+        Atom						m_nUTF16Atom;
         Atom                        m_nImageBmpAtom;
-        Atom                        m_nXdndAware;
-        Atom                        m_nXdndEnter;
-        Atom                        m_nXdndLeave;
-        Atom                        m_nXdndPosition;
-        Atom                        m_nXdndStatus;
-        Atom                        m_nXdndDrop;
-        Atom                        m_nXdndFinished;
-        Atom                        m_nXdndSelection;
-        Atom                        m_nXdndTypeList;
-        Atom                        m_nXdndProxy;
-        Atom                        m_nXdndActionCopy;
-        Atom                        m_nXdndActionMove;
-        Atom                        m_nXdndActionLink;
-        Atom                        m_nXdndActionAsk;
-        Atom                        m_nXdndActionPrivate;
+        Atom						m_nXdndAware;
+        Atom						m_nXdndEnter;
+        Atom						m_nXdndLeave;
+        Atom						m_nXdndPosition;
+        Atom						m_nXdndStatus;
+        Atom						m_nXdndDrop;
+        Atom						m_nXdndFinished;
+        Atom						m_nXdndSelection;
+        Atom						m_nXdndTypeList;
+        Atom						m_nXdndProxy;
+        Atom						m_nXdndActionCopy;
+        Atom						m_nXdndActionMove;
+        Atom						m_nXdndActionLink;
+        Atom						m_nXdndActionAsk;
+        Atom						m_nXdndActionPrivate;
 
         // caching for atoms
         ::std::hash_map< Atom, ::rtl::OUString >
@@ -378,12 +378,12 @@ namespace x11 {
         // IncrementalTransfers in progress
         std::hash_map< XLIB_Window, std::hash_map< Atom, IncrementalTransfer > >
                                     m_aIncrementals;
-
+        
         // do not use X11 multithreading capabilities
         // since this leads to deadlocks in different Xlib implentations
         // (XFree as well as Xsun) use an own mutex instead
-        ::osl::Mutex                m_aMutex;
-
+        ::osl::Mutex				m_aMutex;
+    
         SelectionManager();
         ~SelectionManager();
 
@@ -406,7 +406,7 @@ namespace x11 {
         XLIB_Cursor createCursor( const char* pPointerData, const char* pMaskData, int width, int height, int hotX, int hotY );
         // coordinates on root XLIB_Window
         void updateDragWindow( int nX, int nY, XLIB_Window aRoot );
-
+    
         bool getPasteData( Atom selection, Atom type, Sequence< sal_Int8 >& rData );
         // returns true if conversion was successful
         bool convertData( const Reference< ::com::sun::star::datatransfer::XTransferable >& xTransferable,
@@ -442,14 +442,14 @@ namespace x11 {
         Display * getDisplay() { return m_pDisplay; };
         XLIB_Window getWindow() { return m_aWindow; };
 
-
+    
         void registerHandler( Atom selection, SelectionAdaptor& rAdaptor );
         void deregisterHandler( Atom selection );
         bool requestOwnership( Atom selection );
-
+        
         // allow for synchronization over one mutex for XClipboard
         osl::Mutex& getMutex() { return m_aMutex; }
-
+    
 
         Atom getAtom( const ::rtl::OUString& rString );
         const ::rtl::OUString& getString( Atom nAtom );
@@ -483,15 +483,15 @@ namespace x11 {
         void shutdown() throw();
 
         // XInitialization
-        virtual void        SAL_CALL initialize( const Sequence< Any >& arguments ) throw( ::com::sun::star::uno::Exception );
+        virtual void		SAL_CALL initialize( const Sequence< Any >& arguments ) throw( ::com::sun::star::uno::Exception );
 
         // XEventHandler
-        virtual sal_Bool    SAL_CALL handleEvent( const Any& event ) throw();
+        virtual sal_Bool	SAL_CALL handleEvent( const Any& event ) throw();
 
         // XDragSource
-        virtual sal_Bool    SAL_CALL isDragImageSupported() throw();
-        virtual sal_Int32   SAL_CALL getDefaultCursor( sal_Int8 dragAction ) throw();
-        virtual void        SAL_CALL startDrag(
+        virtual sal_Bool	SAL_CALL isDragImageSupported() throw();
+        virtual sal_Int32	SAL_CALL getDefaultCursor( sal_Int8 dragAction ) throw();
+        virtual void		SAL_CALL startDrag(
             const ::com::sun::star::datatransfer::dnd::DragGestureEvent& trigger,
             sal_Int8 sourceActions, sal_Int32 cursor, sal_Int32 image,
             const Reference< ::com::sun::star::datatransfer::XTransferable >& transferable,
@@ -517,11 +517,11 @@ namespace x11 {
 // ------------------------------------------------------------------------
 
     ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL Xdnd_getSupportedServiceNames();
-    ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL Xdnd_createInstance(
+    ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL Xdnd_createInstance( 
         const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > & xMultiServiceFactory);
 
     ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL Xdnd_dropTarget_getSupportedServiceNames();
-    ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL Xdnd_dropTarget_createInstance(
+    ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL Xdnd_dropTarget_createInstance( 
         const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > & xMultiServiceFactory);
 
 // ------------------------------------------------------------------------
diff --git a/vcl/unx/source/dtrans/X11_service.cxx b/vcl/unx/source/dtrans/X11_service.cxx
index e14d81643553..2f7b704bedad 100644
--- a/vcl/unx/source/dtrans/X11_service.cxx
+++ b/vcl/unx/source/dtrans/X11_service.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
@@ -75,29 +75,29 @@ Reference< XInterface > X11SalInstance::CreateClipboard( const Sequence< Any >&
 
     OUString aDisplayName;
     Atom nSelection;
-
+    
     // extract display name from connection argument. An exception is thrown
-    // by SelectionManager.initialize() if no display connection is given.
+    // by SelectionManager.initialize() if no display connection is given. 
     if( arguments.getLength() > 0 )
     {
         Reference< XDisplayConnection > xConn;
         arguments.getConstArray()[0] >>= xConn;
-
+        
         if( xConn.is() )
         {
             Any aIdentifier = xConn->getIdentifier();
             aIdentifier >>= aDisplayName;
         }
     }
-
+    
     SelectionManager& rManager = SelectionManager::get( aDisplayName );
     rManager.initialize( arguments );
-
+    
     // check if any other selection than clipboard selection is specified
     if( arguments.getLength() > 1 )
     {
         OUString aSelectionName;
-
+        
         arguments.getConstArray()[1] >>= aSelectionName;
         nSelection = rManager.getAtom( aSelectionName );
     }
@@ -106,7 +106,7 @@ Reference< XInterface > X11SalInstance::CreateClipboard( const Sequence< Any >&
         // default atom is clipboard selection
         nSelection = rManager.getAtom( OUString::createFromAscii( "CLIPBOARD" ) );
     }
-
+    
     ::std::hash_map< Atom, Reference< XClipboard > >& rMap( m_aInstances[ aDisplayName ] );
     ::std::hash_map< Atom, Reference< XClipboard > >::iterator it = rMap.find( nSelection );
     if( it != rMap.end() )
diff --git a/vcl/unx/source/dtrans/X11_transferable.cxx b/vcl/unx/source/dtrans/X11_transferable.cxx
index 16518f0b2864..6a09a891a7f9 100644
--- a/vcl/unx/source/dtrans/X11_transferable.cxx
+++ b/vcl/unx/source/dtrans/X11_transferable.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
diff --git a/vcl/unx/source/dtrans/X11_transferable.hxx b/vcl/unx/source/dtrans/X11_transferable.hxx
index 57f0d6682cab..ffa6a5ccdacd 100644
--- a/vcl/unx/source/dtrans/X11_transferable.hxx
+++ b/vcl/unx/source/dtrans/X11_transferable.hxx
@@ -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
@@ -42,10 +42,10 @@ namespace x11 {
         ::com::sun::star::datatransfer::XTransferable >
     {
         ::osl::Mutex m_aMutex;
-
-        SelectionManager&               m_rManager;
-        Reference< XInterface >         m_xCreator;
-        Atom                m_aSelection;
+    
+        SelectionManager&				m_rManager;
+        Reference< XInterface >			m_xCreator;
+        Atom				m_aSelection;	
     public:
         X11Transferable( SelectionManager& rManager, const Reference< XInterface >& xCreator, Atom selection = None );
         virtual ~X11Transferable();
@@ -54,16 +54,16 @@ namespace x11 {
          * XTransferable
          */
 
-        virtual ::com::sun::star::uno::Any SAL_CALL getTransferData( const ::com::sun::star::datatransfer::DataFlavor& aFlavor )
-            throw(::com::sun::star::datatransfer::UnsupportedFlavorException,
-                  ::com::sun::star::io::IOException,
+        virtual ::com::sun::star::uno::Any SAL_CALL getTransferData( const ::com::sun::star::datatransfer::DataFlavor& aFlavor ) 
+            throw(::com::sun::star::datatransfer::UnsupportedFlavorException, 
+                  ::com::sun::star::io::IOException, 
                   ::com::sun::star::uno::RuntimeException
                   );
 
-        virtual ::com::sun::star::uno::Sequence< ::com::sun::star::datatransfer::DataFlavor > SAL_CALL getTransferDataFlavors(  )
+        virtual ::com::sun::star::uno::Sequence< ::com::sun::star::datatransfer::DataFlavor > SAL_CALL getTransferDataFlavors(  ) 
             throw(::com::sun::star::uno::RuntimeException);
 
-        virtual sal_Bool SAL_CALL isDataFlavorSupported( const ::com::sun::star::datatransfer::DataFlavor& aFlavor )
+        virtual sal_Bool SAL_CALL isDataFlavorSupported( const ::com::sun::star::datatransfer::DataFlavor& aFlavor ) 
             throw(::com::sun::star::uno::RuntimeException);
     };
 
diff --git a/vcl/unx/source/dtrans/bmp.cxx b/vcl/unx/source/dtrans/bmp.cxx
index 1ccd04eba725..83647e9b02d1 100644
--- a/vcl/unx/source/dtrans/bmp.cxx
+++ b/vcl/unx/source/dtrans/bmp.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
@@ -87,8 +87,8 @@ BmpTransporter::BmpTransporter( const Sequence<sal_Int8>& rBmp ) :
     if( pData[0] == 'B' || pData[1] == 'M' )
     {
         pData = pData+14;
-        m_aSize.Width   = readLE32( pData+4 );
-        m_aSize.Height  = readLE32( pData+8 );
+        m_aSize.Width	= readLE32( pData+4 );
+        m_aSize.Height	= readLE32( pData+8 );
     }
     else
         m_aSize.Width = m_aSize.Height = 0;
@@ -407,17 +407,17 @@ PixmapHolder::PixmapHolder( Display* pDisplay ) :
 #if OSL_DEBUG_LEVEL > 1
         fprintf( stderr, "PixmapHolder reverting to default visual\n" );
 #endif
-        Visual* pVisual     = DefaultVisual( m_pDisplay, DefaultScreen( m_pDisplay ) );
-        m_aInfo.screen      = DefaultScreen( m_pDisplay );
-        m_aInfo.visual      = pVisual;
-        m_aInfo.visualid    = pVisual->visualid;
-        m_aInfo.c_class     = pVisual->c_class;
-        m_aInfo.red_mask    = pVisual->red_mask;
-        m_aInfo.green_mask  = pVisual->green_mask;
-        m_aInfo.blue_mask   = pVisual->blue_mask;
-        m_aInfo.depth       = DefaultDepth( m_pDisplay, m_aInfo.screen );
+        Visual* pVisual		= DefaultVisual( m_pDisplay, DefaultScreen( m_pDisplay ) );
+        m_aInfo.screen		= DefaultScreen( m_pDisplay );
+        m_aInfo.visual		= pVisual;
+        m_aInfo.visualid	= pVisual->visualid;
+        m_aInfo.c_class		= pVisual->c_class;
+        m_aInfo.red_mask	= pVisual->red_mask;
+        m_aInfo.green_mask	= pVisual->green_mask;
+        m_aInfo.blue_mask	= pVisual->blue_mask;
+        m_aInfo.depth		= DefaultDepth( m_pDisplay, m_aInfo.screen );
     }
-    m_aColormap         = DefaultColormap( m_pDisplay, m_aInfo.screen );
+    m_aColormap			= DefaultColormap( m_pDisplay, m_aInfo.screen );
 #if OSL_DEBUG_LEVEL > 1
     static const char* pClasses[] =
         { "StaticGray", "GrayScale", "StaticColor", "PseudoColor", "TrueColor", "DirectColor" };
@@ -476,17 +476,17 @@ void PixmapHolder::setBitmapDataPalette( const sal_uInt8* pData, XImage* pImage
     XColor aPalette[256];
 
     sal_uInt32 nColors = readLE32( pData+32 );
-    sal_uInt32 nWidth   = readLE32( pData+4 );
-    sal_uInt32 nHeight  = readLE32( pData+8 );
+    sal_uInt32 nWidth	= readLE32( pData+4 );
+    sal_uInt32 nHeight	= readLE32( pData+8 );
     sal_uInt16 nDepth = readLE16( pData+14 );
 
     for( sal_uInt16 i = 0 ; i < nColors; i++ )
     {
         if( m_aInfo.c_class != TrueColor )
         {
-            aPalette[i].red     = ((unsigned short)pData[42 + i*4]) << 8 | ((unsigned short)pData[42 + i*4]);
-            aPalette[i].green   = ((unsigned short)pData[41 + i*4]) << 8 | ((unsigned short)pData[41 + i*4]);
-            aPalette[i].blue    = ((unsigned short)pData[40 + i*4]) << 8 | ((unsigned short)pData[40 + i*4]);
+            aPalette[i].red		= ((unsigned short)pData[42 + i*4]) << 8 | ((unsigned short)pData[42 + i*4]);
+            aPalette[i].green	= ((unsigned short)pData[41 + i*4]) << 8 | ((unsigned short)pData[41 + i*4]);
+            aPalette[i].blue	= ((unsigned short)pData[40 + i*4]) << 8 | ((unsigned short)pData[40 + i*4]);
             XAllocColor( m_pDisplay, m_aColormap, aPalette+i );
         }
         else
@@ -550,10 +550,10 @@ void PixmapHolder::setBitmapDataTCDither( const sal_uInt8* pData, XImage* pImage
             for( int b = 0; b < 6; b++ )
             {
                 int i = r*36+g*6+b;
-                aPalette[i].red     = r == 5 ? 0xffff : r*10922;
-                aPalette[i].green   = g == 5 ? 0xffff : g*10922;
-                aPalette[i].blue    = b == 5 ? 0xffff : b*10922;
-                aPalette[i].pixel   = 0;
+                aPalette[i].red		= r == 5 ? 0xffff : r*10922;
+                aPalette[i].green	= g == 5 ? 0xffff : g*10922;
+                aPalette[i].blue	= b == 5 ? 0xffff : b*10922;
+                aPalette[i].pixel	= 0;
                 if( ! XAllocColor( m_pDisplay, m_aColormap, aPalette+i ) )
                     nNonAllocs++;
             }
@@ -579,8 +579,8 @@ void PixmapHolder::setBitmapDataTCDither( const sal_uInt8* pData, XImage* pImage
         }
     }
 
-    sal_uInt32 nWidth   = readLE32( pData+4 );
-    sal_uInt32 nHeight  = readLE32( pData+8 );
+    sal_uInt32 nWidth	= readLE32( pData+4 );
+    sal_uInt32 nHeight	= readLE32( pData+8 );
 
     const sal_uInt8* pBMData = pData + readLE32( pData );
     sal_uInt32 nScanlineSize = nWidth*3;
@@ -608,8 +608,8 @@ void PixmapHolder::setBitmapDataTCDither( const sal_uInt8* pData, XImage* pImage
 
 void PixmapHolder::setBitmapDataTC( const sal_uInt8* pData, XImage* pImage )
 {
-    sal_uInt32 nWidth   = readLE32( pData+4 );
-    sal_uInt32 nHeight  = readLE32( pData+8 );
+    sal_uInt32 nWidth	= readLE32( pData+4 );
+    sal_uInt32 nHeight	= readLE32( pData+8 );
 
     const sal_uInt8* pBMData = pData + readLE32( pData );
     sal_uInt32 nScanlineSize = nWidth*3;
@@ -663,9 +663,9 @@ Pixmap PixmapHolder::setBitmapData( const sal_uInt8* pData )
     if( readLE32( pData + 16 ) != 0 )
         return None;
 
-    sal_uInt32 nWidth   = readLE32( pData+4 );
-    sal_uInt32 nHeight  = readLE32( pData+8 );
-
+    sal_uInt32 nWidth	= readLE32( pData+4 );
+    sal_uInt32 nHeight	= readLE32( pData+8 );
+    
     if( m_aPixmap != None )
         XFreePixmap( m_pDisplay, m_aPixmap ), m_aPixmap = None;
     if( m_aBitmap != None )
@@ -678,25 +678,25 @@ Pixmap PixmapHolder::setBitmapData( const sal_uInt8* pData )
     if( m_aPixmap != None )
     {
         XImage aImage;
-        aImage.width            = (int)nWidth;
-        aImage.height           = (int)nHeight;
-        aImage.xoffset          = 0;
-        aImage.format           = ZPixmap;
-        aImage.data             = NULL;
-        aImage.byte_order       = ImageByteOrder( m_pDisplay );
-        aImage.bitmap_unit      = BitmapUnit( m_pDisplay );
-        aImage.bitmap_bit_order = BitmapBitOrder( m_pDisplay );
-        aImage.bitmap_pad       = BitmapPad( m_pDisplay );
-        aImage.depth            = m_aInfo.depth;
-        aImage.red_mask         = m_aInfo.red_mask;
-        aImage.green_mask       = m_aInfo.green_mask;
-        aImage.blue_mask        = m_aInfo.blue_mask;
-        aImage.bytes_per_line   = 0; // filled in by XInitImage
+        aImage.width			= (int)nWidth;
+        aImage.height			= (int)nHeight;
+        aImage.xoffset			= 0;
+        aImage.format			= ZPixmap;
+        aImage.data				= NULL;
+        aImage.byte_order		= ImageByteOrder( m_pDisplay );
+        aImage.bitmap_unit		= BitmapUnit( m_pDisplay );
+        aImage.bitmap_bit_order	= BitmapBitOrder( m_pDisplay );
+        aImage.bitmap_pad		= BitmapPad( m_pDisplay );
+        aImage.depth			= m_aInfo.depth;
+        aImage.red_mask			= m_aInfo.red_mask;
+        aImage.green_mask		= m_aInfo.green_mask;
+        aImage.blue_mask		= m_aInfo.blue_mask;
+        aImage.bytes_per_line	= 0; // filled in by XInitImage
         if( m_aInfo.depth <= 8 )
             aImage.bits_per_pixel = m_aInfo.depth;
         else
             aImage.bits_per_pixel = 8*((m_aInfo.depth+7)/8);
-        aImage.obdata           = NULL;
+        aImage.obdata			= NULL;
 
         XInitImage( &aImage );
         aImage.data = (char*)rtl_allocateMemory( nHeight*aImage.bytes_per_line );
diff --git a/vcl/unx/source/dtrans/bmp.hxx b/vcl/unx/source/dtrans/bmp.hxx
index b59b4417ca69..f8bc3a79bdc6 100644
--- a/vcl/unx/source/dtrans/bmp.hxx
+++ b/vcl/unx/source/dtrans/bmp.hxx
@@ -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
@@ -53,16 +53,16 @@ void X11_freeBmp( sal_uInt8* pBmp );
 
 class PixmapHolder
 {
-    Display*        m_pDisplay;
-    Colormap        m_aColormap;
-    Pixmap          m_aPixmap;
-    Pixmap          m_aBitmap;
-    XVisualInfo     m_aInfo;
+    Display*		m_pDisplay;
+    Colormap		m_aColormap;
+    Pixmap			m_aPixmap;
+    Pixmap			m_aBitmap;
+    XVisualInfo		m_aInfo;
 
-    int             m_nRedShift, m_nRedShift2;
-    int             m_nGreenShift, m_nGreenShift2;
-    int             m_nBlueShift, m_nBlueShift2;
-    unsigned long   m_nBlueShift2Mask, m_nRedShift2Mask, m_nGreenShift2Mask;
+    int				m_nRedShift, m_nRedShift2;
+    int				m_nGreenShift, m_nGreenShift2;
+    int				m_nBlueShift, m_nBlueShift2;
+    unsigned long	m_nBlueShift2Mask, m_nRedShift2Mask, m_nGreenShift2Mask;
 
     // these expect data pointers to bitmapinfo header
     void setBitmapDataTC( const sal_uInt8* pData, XImage* pImage );
@@ -89,12 +89,12 @@ public:
 class BmpTransporter :
         public cppu::WeakImplHelper1< com::sun::star::awt::XBitmap >
 {
-    com::sun::star::uno::Sequence<sal_Int8>         m_aBM;
-    com::sun::star::awt::Size                       m_aSize;
+    com::sun::star::uno::Sequence<sal_Int8>			m_aBM;
+    com::sun::star::awt::Size						m_aSize;
 public:
     BmpTransporter( const com::sun::star::uno::Sequence<sal_Int8>& rBmp );
     virtual  ~BmpTransporter();
-
+    
     virtual com::sun::star::awt::Size SAL_CALL getSize() throw();
     virtual com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getDIB() throw();
     virtual com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getMaskDIB() throw();
diff --git a/vcl/unx/source/dtrans/config.cxx b/vcl/unx/source/dtrans/config.cxx
index 001da3900bb7..525ce9d651fb 100644
--- a/vcl/unx/source/dtrans/config.cxx
+++ b/vcl/unx/source/dtrans/config.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
@@ -44,7 +44,7 @@ class DtransX11ConfigItem : public ::utl::ConfigItem
     sal_Int32           m_nSelectionTimeout;
 
     virtual void Notify( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& rPropertyNames );
-    virtual void Commit();
+    virtual void Commit();    
 public:
     DtransX11ConfigItem();
     virtual ~DtransX11ConfigItem();
diff --git a/vcl/unx/source/dtrans/copydata_curs.h b/vcl/unx/source/dtrans/copydata_curs.h
index e3d0e3e76530..a5e78e1ce2c4 100644
--- a/vcl/unx/source/dtrans/copydata_curs.h
+++ b/vcl/unx/source/dtrans/copydata_curs.h
@@ -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
diff --git a/vcl/unx/source/dtrans/copydata_mask.h b/vcl/unx/source/dtrans/copydata_mask.h
index f25b0863d807..99f09cb64d6d 100644
--- a/vcl/unx/source/dtrans/copydata_mask.h
+++ b/vcl/unx/source/dtrans/copydata_mask.h
@@ -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
diff --git a/vcl/unx/source/dtrans/linkdata_curs.h b/vcl/unx/source/dtrans/linkdata_curs.h
index c60edc3b99d0..2c855fc009de 100644
--- a/vcl/unx/source/dtrans/linkdata_curs.h
+++ b/vcl/unx/source/dtrans/linkdata_curs.h
@@ -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
diff --git a/vcl/unx/source/dtrans/linkdata_mask.h b/vcl/unx/source/dtrans/linkdata_mask.h
index cf0f89f63b1b..98f16e4bd01a 100644
--- a/vcl/unx/source/dtrans/linkdata_mask.h
+++ b/vcl/unx/source/dtrans/linkdata_mask.h
@@ -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
diff --git a/vcl/unx/source/dtrans/movedata_curs.h b/vcl/unx/source/dtrans/movedata_curs.h
index b79412bc3f41..062196de77ef 100644
--- a/vcl/unx/source/dtrans/movedata_curs.h
+++ b/vcl/unx/source/dtrans/movedata_curs.h
@@ -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
diff --git a/vcl/unx/source/dtrans/movedata_mask.h b/vcl/unx/source/dtrans/movedata_mask.h
index e25d0837d8dc..5d0f8b837851 100644
--- a/vcl/unx/source/dtrans/movedata_mask.h
+++ b/vcl/unx/source/dtrans/movedata_mask.h
@@ -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
diff --git a/vcl/unx/source/dtrans/nodrop_curs.h b/vcl/unx/source/dtrans/nodrop_curs.h
index 8e208e32f293..ccce5f28ad22 100644
--- a/vcl/unx/source/dtrans/nodrop_curs.h
+++ b/vcl/unx/source/dtrans/nodrop_curs.h
@@ -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
diff --git a/vcl/unx/source/dtrans/nodrop_mask.h b/vcl/unx/source/dtrans/nodrop_mask.h
index 7cbecef2c60f..d467650902ca 100644
--- a/vcl/unx/source/dtrans/nodrop_mask.h
+++ b/vcl/unx/source/dtrans/nodrop_mask.h
@@ -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
diff --git a/vcl/unx/source/fontmanager/adobeenc.tab b/vcl/unx/source/fontmanager/adobeenc.tab
index 492e92f3fcf2..26a03bf99059 100644
--- a/vcl/unx/source/fontmanager/adobeenc.tab
+++ b/vcl/unx/source/fontmanager/adobeenc.tab
@@ -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
@@ -26,9 +26,9 @@
  ************************************************************************/
 
 struct AdobeEncEntry {
-    sal_Unicode         aUnicode;
-    sal_uInt8           aAdobeStandardCode;
-    const char* const   pAdobename;
+    sal_Unicode			aUnicode;
+    sal_uInt8   		aAdobeStandardCode;
+    const char* const	pAdobename;
 };
 
 static const AdobeEncEntry aAdobeCodes[]=
diff --git a/vcl/unx/source/fontmanager/fontcache.cxx b/vcl/unx/source/fontmanager/fontcache.cxx
index db4a7d05e5fc..cbce73101814 100644
--- a/vcl/unx/source/fontmanager/fontcache.cxx
+++ b/vcl/unx/source/fontmanager/fontcache.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
@@ -258,7 +258,7 @@ void FontCache::read()
 #endif
         return;
     }
-
+    
 
     ByteString aLine;
     aStream.ReadLine( aLine );
@@ -269,7 +269,7 @@ void FontCache::read()
         #endif
         return;
     }
-
+    
     int nDir = 0;
     FontDirMap* pDir = NULL;
     xub_StrLen nIndex;
@@ -302,7 +302,7 @@ void FontCache::read()
 
             // is the directory modified ?
             struct stat aStat;
-            if( stat( aDir.getStr(), &aStat )               ||
+            if( stat( aDir.getStr(), &aStat )				||
                 ! S_ISDIR(aStat.st_mode) )
             {
                 // remove outdated cache data
@@ -325,12 +325,12 @@ void FontCache::read()
         {
             OString aFile( aLine.Copy( 5 ) );
             aStream.ReadLine( aLine );
-
+            
             const char* pLine = aLine.GetBuffer();
 
             fonttype::type eType = (fonttype::type)atoi( pLine );
-            if( eType != fonttype::TrueType     &&
-                eType != fonttype::Type1        &&
+            if( eType != fonttype::TrueType		&&
+                eType != fonttype::Type1		&&
                 eType != fonttype::Builtin
                 )
                 continue;
@@ -338,15 +338,15 @@ void FontCache::read()
                 pLine++;
             if( *pLine != ';' )
                 continue;
-
+                
             pLine++;
-            sal_Int32 nFonts = atoi( pLine );
+            sal_Int32 nFonts = atoi( pLine );            
             for( int n = 0; n < nFonts; n++ )
             {
                 aStream.ReadLine( aLine );
                 pLine = aLine.GetBuffer();
                 int nLen = aLine.Len();
-
+                
                 PrintFontManager::PrintFont* pFont = NULL;
                 switch( eType )
                 {
@@ -361,10 +361,10 @@ void FontCache::read()
                         break;
                     default: break;
                 }
-
+                
                 for( nIndex = 0; nIndex < nLen && pLine[nIndex] != ';'; nIndex++ )
                     ;
-
+                
                 pFont->m_nFamilyName = pAtoms->getAtom( ATOM_FAMILYNAME,
                                                         OUString( pLine, nIndex, RTL_TEXTENCODING_UTF8 ),
                                                         sal_True );
@@ -382,7 +382,7 @@ void FontCache::read()
                 aStream.ReadLine( aLine );
                 pLine = aLine.GetBuffer();
                 nLen = aLine.Len();
-
+                
                 // get up to 20 token positions
                 const int nMaxTokens = 20;
                 int nTokenPos[nMaxTokens];
@@ -487,8 +487,8 @@ void FontCache::read()
                     delete pFont;
                     continue;
                 }
-
-                FontCacheEntry& rEntry = (*pDir)[aFile].m_aEntry;
+                
+                FontCacheEntry& rEntry = (*pDir)[aFile].m_aEntry;                
                 rEntry.push_back( pFont );
             }
         }
@@ -504,7 +504,7 @@ void FontCache::updateDirTimestamp( int nDirID )
     const OString& rDir = rManager.getDirectory( nDirID );
 
     struct stat aStat;
-    if( ! stat( rDir.getStr(), &aStat ) )
+    if( ! stat( rDir.getStr(), &aStat )	)
         m_aCache[ nDirID ].m_nTimestamp = (sal_Int64)aStat.st_mtime;
 }
 
@@ -535,24 +535,24 @@ void FontCache::copyPrintFont( const PrintFontManager::PrintFont* pFrom, PrintFo
             break;
         default: break;
     }
-    pTo->m_nFamilyName      = pFrom->m_nFamilyName;
+    pTo->m_nFamilyName		= pFrom->m_nFamilyName;
     pTo->m_aStyleName       = pFrom->m_aStyleName;
-    pTo->m_aAliases         = pFrom->m_aAliases;
-    pTo->m_nPSName          = pFrom->m_nPSName;
-    pTo->m_eItalic          = pFrom->m_eItalic;
-    pTo->m_eWeight          = pFrom->m_eWeight;
-    pTo->m_eWidth           = pFrom->m_eWidth;
-    pTo->m_ePitch           = pFrom->m_ePitch;
-    pTo->m_aEncoding        = pFrom->m_aEncoding;
-    pTo->m_aGlobalMetricX   = pFrom->m_aGlobalMetricX;
-    pTo->m_aGlobalMetricY   = pFrom->m_aGlobalMetricY;
-    pTo->m_nAscend          = pFrom->m_nAscend;
-    pTo->m_nDescend         = pFrom->m_nDescend;
-    pTo->m_nLeading         = pFrom->m_nLeading;
-    pTo->m_nXMin            = pFrom->m_nXMin;
-    pTo->m_nYMin            = pFrom->m_nYMin;
-    pTo->m_nXMax            = pFrom->m_nXMax;
-    pTo->m_nYMax            = pFrom->m_nYMax;
+    pTo->m_aAliases			= pFrom->m_aAliases;
+    pTo->m_nPSName			= pFrom->m_nPSName;
+    pTo->m_eItalic			= pFrom->m_eItalic;
+    pTo->m_eWeight			= pFrom->m_eWeight;
+    pTo->m_eWidth			= pFrom->m_eWidth;
+    pTo->m_ePitch			= pFrom->m_ePitch;
+    pTo->m_aEncoding		= pFrom->m_aEncoding;
+    pTo->m_aGlobalMetricX	= pFrom->m_aGlobalMetricX;
+    pTo->m_aGlobalMetricY	= pFrom->m_aGlobalMetricY;
+    pTo->m_nAscend			= pFrom->m_nAscend;
+    pTo->m_nDescend			= pFrom->m_nDescend;
+    pTo->m_nLeading			= pFrom->m_nLeading;
+    pTo->m_nXMin			= pFrom->m_nXMin;
+    pTo->m_nYMin			= pFrom->m_nYMin;
+    pTo->m_nXMax			= pFrom->m_nXMax;
+    pTo->m_nYMax			= pFrom->m_nYMax;
     pTo->m_bHaveVerticalSubstitutedGlyphs = pFrom->m_bHaveVerticalSubstitutedGlyphs;
     pTo->m_bUserOverride    = pFrom->m_bUserOverride;
 }
@@ -570,10 +570,10 @@ bool FontCache::equalsPrintFont( const PrintFontManager::PrintFont* pLeft, Print
         {
             const PrintFontManager::TrueTypeFontFile* pLT = static_cast<const PrintFontManager::TrueTypeFontFile*>(pLeft);
             const PrintFontManager::TrueTypeFontFile* pRT = static_cast<const PrintFontManager::TrueTypeFontFile*>(pRight);
-            if( pRT->m_nDirectory       != pLT->m_nDirectory        ||
-                pRT->m_aFontFile        != pLT->m_aFontFile         ||
-                pRT->m_nCollectionEntry != pLT->m_nCollectionEntry  ||
-                pRT->m_nTypeFlags       != pLT->m_nTypeFlags )
+            if( pRT->m_nDirectory		!= pLT->m_nDirectory		||
+                pRT->m_aFontFile		!= pLT->m_aFontFile			||
+                pRT->m_nCollectionEntry	!= pLT->m_nCollectionEntry	||
+                pRT->m_nTypeFlags		!= pLT->m_nTypeFlags )
                 return false;
         }
         break;
@@ -581,9 +581,9 @@ bool FontCache::equalsPrintFont( const PrintFontManager::PrintFont* pLeft, Print
         {
             const PrintFontManager::Type1FontFile* pLT = static_cast<const PrintFontManager::Type1FontFile*>(pLeft);
             const PrintFontManager::Type1FontFile* pRT = static_cast<const PrintFontManager::Type1FontFile*>(pRight);
-            if( pRT->m_nDirectory       != pLT->m_nDirectory        ||
-                pRT->m_aFontFile        != pLT->m_aFontFile         ||
-                pRT->m_aMetricFile      != pLT->m_aMetricFile )
+            if( pRT->m_nDirectory		!= pLT->m_nDirectory		||
+                pRT->m_aFontFile		!= pLT->m_aFontFile			||
+                pRT->m_aMetricFile		!= pLT->m_aMetricFile )
                 return false;
         }
         break;
@@ -591,30 +591,30 @@ bool FontCache::equalsPrintFont( const PrintFontManager::PrintFont* pLeft, Print
         {
             const PrintFontManager::BuiltinFont* pLT = static_cast<const PrintFontManager::BuiltinFont*>(pLeft);
             const PrintFontManager::BuiltinFont* pRT = static_cast<const PrintFontManager::BuiltinFont*>(pRight);
-            if( pRT->m_nDirectory       != pLT->m_nDirectory        ||
-                pRT->m_aMetricFile      != pLT->m_aMetricFile )
+            if( pRT->m_nDirectory		!= pLT->m_nDirectory		||
+                pRT->m_aMetricFile		!= pLT->m_aMetricFile )
                 return false;
         }
         break;
         default: break;
     }
-    if( pRight->m_nFamilyName       != pLeft->m_nFamilyName     ||
+    if( pRight->m_nFamilyName		!= pLeft->m_nFamilyName		||
         pRight->m_aStyleName        != pLeft->m_aStyleName      ||
-        pRight->m_nPSName           != pLeft->m_nPSName         ||
-        pRight->m_eItalic           != pLeft->m_eItalic         ||
-        pRight->m_eWeight           != pLeft->m_eWeight         ||
-        pRight->m_eWidth            != pLeft->m_eWidth          ||
-        pRight->m_ePitch            != pLeft->m_ePitch          ||
-        pRight->m_aEncoding         != pLeft->m_aEncoding       ||
-        pRight->m_aGlobalMetricX    != pLeft->m_aGlobalMetricX  ||
-        pRight->m_aGlobalMetricY    != pLeft->m_aGlobalMetricY  ||
-        pRight->m_nAscend           != pLeft->m_nAscend         ||
-        pRight->m_nDescend          != pLeft->m_nDescend        ||
-        pRight->m_nLeading          != pLeft->m_nLeading        ||
-        pRight->m_nXMin             != pLeft->m_nXMin           ||
-        pRight->m_nYMin             != pLeft->m_nYMin           ||
-        pRight->m_nXMax             != pLeft->m_nXMax           ||
-        pRight->m_nYMax             != pLeft->m_nYMax           ||
+        pRight->m_nPSName			!= pLeft->m_nPSName			||
+        pRight->m_eItalic			!= pLeft->m_eItalic			||
+        pRight->m_eWeight			!= pLeft->m_eWeight			||
+        pRight->m_eWidth			!= pLeft->m_eWidth			||
+        pRight->m_ePitch			!= pLeft->m_ePitch			||
+        pRight->m_aEncoding			!= pLeft->m_aEncoding		||
+        pRight->m_aGlobalMetricX	!= pLeft->m_aGlobalMetricX	||
+        pRight->m_aGlobalMetricY	!= pLeft->m_aGlobalMetricY	||
+        pRight->m_nAscend			!= pLeft->m_nAscend			||
+        pRight->m_nDescend			!= pLeft->m_nDescend		||
+        pRight->m_nLeading			!= pLeft->m_nLeading		||
+        pRight->m_nXMin				!= pLeft->m_nXMin			||
+        pRight->m_nYMin				!= pLeft->m_nYMin			||
+        pRight->m_nXMax				!= pLeft->m_nXMax			||
+        pRight->m_nYMax				!= pLeft->m_nYMax			||
         pRight->m_bHaveVerticalSubstitutedGlyphs != pLeft->m_bHaveVerticalSubstitutedGlyphs ||
         pRight->m_bUserOverride     != pLeft->m_bUserOverride
         )
@@ -783,7 +783,7 @@ bool FontCache::scanAdditionalFiles( const OString& rDir )
     int nDirID = rManager.getDirectoryAtom( rDir );
     FontCacheData::const_iterator dir = m_aCache.find( nDirID );
     bool bFound = (dir != m_aCache.end());
-
+    
     return (bFound && dir->second.m_bUserOverrideOnly);
 }
 
diff --git a/vcl/unx/source/fontmanager/fontconfig.cxx b/vcl/unx/source/fontmanager/fontconfig.cxx
index 03816857f27c..1208dcb7c07c 100644
--- a/vcl/unx/source/fontmanager/fontconfig.cxx
+++ b/vcl/unx/source/fontmanager/fontconfig.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
@@ -39,16 +39,16 @@ using namespace psp;
     #include <ft2build.h>
     #include <fontconfig/fcfreetype.h>
     // allow compile on baseline (currently with fontconfig 2.2.0)
-    #ifndef FC_WEIGHT_BOOK      // TODO: remove when baseline moves to fc>=2.2.1
+    #ifndef FC_WEIGHT_BOOK		// TODO: remove when baseline moves to fc>=2.2.1
         #define FC_WEIGHT_BOOK 75
     #endif
-    #ifndef FC_EMBEDDED_BITMAP  // TODO: remove when baseline moves to fc>=2.3.92
+    #ifndef FC_EMBEDDED_BITMAP	// TODO: remove when baseline moves to fc>=2.3.92
         #define FC_EMBEDDED_BITMAP "embeddedbitmap"
     #endif
-    #ifndef FC_FAMILYLANG       // TODO: remove when baseline moves to fc>=2.2.97
+    #ifndef FC_FAMILYLANG		// TODO: remove when baseline moves to fc>=2.2.97
         #define FC_FAMILYLANG "familylang"
     #endif
-    #ifndef FC_HINT_STYLE       // TODO: remove when baseline moves to fc>=2.2.91
+    #ifndef FC_HINT_STYLE		// TODO: remove when baseline moves to fc>=2.2.91
         #define FC_HINT_STYLE  "hintstyle"
         #define FC_HINT_NONE   0
         #define FC_HINT_SLIGHT 1
@@ -93,44 +93,44 @@ using namespace rtl;
 
 class FontCfgWrapper
 {
-    oslModule       m_pLib;
+    oslModule		m_pLib;
     FcFontSet*      m_pOutlineSet;
 
     int             m_nFcVersion;
     FcBool          (*m_pFcInit)();
     int             (*m_pFcGetVersion)();
-    FcConfig*       (*m_pFcConfigGetCurrent)();
-    FcObjectSet*    (*m_pFcObjectSetVaBuild)(const char*,va_list);
-    void            (*m_pFcObjectSetDestroy)(FcObjectSet* pSet);
-    FcPattern*      (*m_pFcPatternCreate)();
-    void            (*m_pFcPatternDestroy)(FcPattern*);
-    FcFontSet*      (*m_pFcFontList)(FcConfig*,FcPattern*,FcObjectSet*);
+    FcConfig*		(*m_pFcConfigGetCurrent)();
+    FcObjectSet*	(*m_pFcObjectSetVaBuild)(const char*,va_list);
+    void			(*m_pFcObjectSetDestroy)(FcObjectSet* pSet);
+    FcPattern*		(*m_pFcPatternCreate)();
+    void			(*m_pFcPatternDestroy)(FcPattern*);
+    FcFontSet*		(*m_pFcFontList)(FcConfig*,FcPattern*,FcObjectSet*);
     FcFontSet*      (*m_pFcConfigGetFonts)(FcConfig*,FcSetName);
-    FcFontSet*      (*m_pFcFontSetCreate)();
+    FcFontSet*		(*m_pFcFontSetCreate)();
     FcCharSet*                (*m_pFcCharSetCreate)();
     FcBool                    (*m_pFcCharSetAddChar)(FcCharSet *, FcChar32);
     FcBool          (*m_pFcCharSetHasChar)(FcCharSet *, FcChar32);
     void            (*m_pFcCharSetDestroy)(FcCharSet*);
-    void            (*m_pFcFontSetDestroy)(FcFontSet*);
-    FcBool          (*m_pFcFontSetAdd)(FcFontSet*,FcPattern*);
+    void			(*m_pFcFontSetDestroy)(FcFontSet*);
+    FcBool			(*m_pFcFontSetAdd)(FcFontSet*,FcPattern*);
     void            (*m_pFcPatternReference)(FcPattern*);
     FcResult        (*m_pFcPatternGetCharSet)(const FcPattern*,const char*,int,FcCharSet**);
-    FcResult        (*m_pFcPatternGetString)(const FcPattern*,const char*,int,FcChar8**);
-    FcResult        (*m_pFcPatternGetInteger)(const FcPattern*,const char*,int,int*);
-    FcResult        (*m_pFcPatternGetDouble)(const FcPattern*,const char*,int,double*);
-    FcResult        (*m_pFcPatternGetBool)(const FcPattern*,const char*,int,FcBool*);
-    void            (*m_pFcDefaultSubstitute)(FcPattern *);
-    FcPattern*      (*m_pFcFontSetMatch)(FcConfig*,FcFontSet**, int, FcPattern*,FcResult*);
-    FcBool          (*m_pFcConfigAppFontAddFile)(FcConfig*, const FcChar8*);
-    FcBool          (*m_pFcConfigAppFontAddDir)(FcConfig*, const FcChar8*);
-    FcBool          (*m_pFcConfigParseAndLoad)(FcConfig*,const FcChar8*,FcBool);
-
-    FcBool          (*m_pFcConfigSubstitute)(FcConfig*,FcPattern*,FcMatchKind);
-    FcBool          (*m_pFcPatternAddInteger)(FcPattern*,const char*,int);
+    FcResult		(*m_pFcPatternGetString)(const FcPattern*,const char*,int,FcChar8**);
+    FcResult		(*m_pFcPatternGetInteger)(const FcPattern*,const char*,int,int*);
+    FcResult		(*m_pFcPatternGetDouble)(const FcPattern*,const char*,int,double*);
+    FcResult		(*m_pFcPatternGetBool)(const FcPattern*,const char*,int,FcBool*);
+    void			(*m_pFcDefaultSubstitute)(FcPattern *);
+    FcPattern*		(*m_pFcFontSetMatch)(FcConfig*,FcFontSet**, int, FcPattern*,FcResult*);    
+    FcBool			(*m_pFcConfigAppFontAddFile)(FcConfig*, const FcChar8*);
+    FcBool			(*m_pFcConfigAppFontAddDir)(FcConfig*, const FcChar8*);
+    FcBool			(*m_pFcConfigParseAndLoad)(FcConfig*,const FcChar8*,FcBool);
+
+    FcBool			(*m_pFcConfigSubstitute)(FcConfig*,FcPattern*,FcMatchKind);
+    FcBool			(*m_pFcPatternAddInteger)(FcPattern*,const char*,int);
     FcBool                    (*m_pFcPatternAddDouble)(FcPattern*,const char*,double);
     FcBool                    (*m_pFcPatternAddBool)(FcPattern*,const char*,FcBool);
     FcBool                    (*m_pFcPatternAddCharSet)(FcPattern*,const char*,const FcCharSet*);
-    FcBool          (*m_pFcPatternAddString)(FcPattern*,const char*,const FcChar8*);
+    FcBool			(*m_pFcPatternAddString)(FcPattern*,const char*,const FcChar8*);
     FT_UInt         (*m_pFcFreeTypeCharIndex)(FT_Face,FcChar32);
 
     oslGenericFunction loadSymbol( const char* );
@@ -143,14 +143,14 @@ public:
     static FontCfgWrapper& get();
     static void release();
 
-    bool isValid() const
+    bool isValid() const 
     { return m_pLib != NULL;}
 
     FcFontSet* getFontSet();
-
+    
     FcBool FcInit()
     { return m_pFcInit(); }
-
+    
     int FcGetVersion()
     { return m_pFcGetVersion(); }
 
@@ -168,13 +168,13 @@ public:
 
     void FcObjectSetDestroy( FcObjectSet* pSet )
     { m_pFcObjectSetDestroy( pSet ); }
-
+    
     FcPattern* FcPatternCreate()
     { return m_pFcPatternCreate(); }
 
     void FcPatternDestroy( FcPattern* pPattern )
     { m_pFcPatternDestroy( pPattern ); }
-
+    
     FcFontSet* FcFontList( FcConfig* pConfig, FcPattern* pPattern, FcObjectSet* pSet )
     { return m_pFcFontList( pConfig, pPattern, pSet ); }
 
@@ -366,37 +366,37 @@ FontCfgWrapper::FontCfgWrapper()
     }
 
     if( ! (
-            m_pFcInit                       &&
-            m_pFcGetVersion                 &&
-            m_pFcConfigGetCurrent           &&
-            m_pFcObjectSetVaBuild           &&
-            m_pFcObjectSetDestroy           &&
-            m_pFcPatternCreate              &&
-            m_pFcPatternDestroy             &&
-            m_pFcFontList                   &&
+            m_pFcInit						&&
+            m_pFcGetVersion					&&
+            m_pFcConfigGetCurrent			&&
+            m_pFcObjectSetVaBuild			&&
+            m_pFcObjectSetDestroy			&&
+            m_pFcPatternCreate				&&
+            m_pFcPatternDestroy				&&
+            m_pFcFontList					&&
             m_pFcConfigGetFonts             &&
-            m_pFcFontSetCreate              &&
-            m_pFcCharSetCreate              &&
-            m_pFcCharSetAddChar             &&
+            m_pFcFontSetCreate				&&
+            m_pFcCharSetCreate				&&
+            m_pFcCharSetAddChar 			&&
             m_pFcCharSetHasChar             &&
             m_pFcCharSetDestroy             &&
-            m_pFcFontSetDestroy             &&
-            m_pFcFontSetAdd                 &&
+            m_pFcFontSetDestroy				&&
+            m_pFcFontSetAdd					&&
             m_pFcPatternReference           &&
-            m_pFcPatternGetCharSet          &&
-            m_pFcPatternGetString           &&
-            m_pFcPatternGetInteger          &&
-            m_pFcPatternGetDouble           &&
-            m_pFcPatternGetBool             &&
-            m_pFcConfigAppFontAddFile               &&
-            m_pFcConfigAppFontAddDir                &&
-            m_pFcConfigParseAndLoad             &&
-            m_pFcDefaultSubstitute          &&
-            m_pFcConfigSubstitute           &&
-            m_pFcPatternAddInteger          &&
+            m_pFcPatternGetCharSet			&&
+            m_pFcPatternGetString			&&
+            m_pFcPatternGetInteger			&&
+            m_pFcPatternGetDouble			&&
+            m_pFcPatternGetBool				&&
+            m_pFcConfigAppFontAddFile				&&
+            m_pFcConfigAppFontAddDir				&&
+            m_pFcConfigParseAndLoad				&&
+            m_pFcDefaultSubstitute			&&
+            m_pFcConfigSubstitute			&&
+            m_pFcPatternAddInteger			&&
             m_pFcPatternAddDouble                     &&
-            m_pFcPatternAddCharSet          &&
-            m_pFcPatternAddBool             &&
+            m_pFcPatternAddCharSet			&&
+            m_pFcPatternAddBool 			&&
             m_pFcPatternAddString
             ) )
     {
@@ -421,7 +421,7 @@ void FontCfgWrapper::addFontSet( FcSetName eSetName )
 {
     #ifdef ENABLE_FONTCONFIG
     /*
-      add only acceptable outlined fonts to our config,
+      add only acceptable outlined fonts to our config, 
       for future fontconfig use
     */
     FcFontSet* pOrig = FcConfigGetFonts( FcConfigGetCurrent(), eSetName );
@@ -432,7 +432,7 @@ void FontCfgWrapper::addFontSet( FcSetName eSetName )
     {
         FcBool outline = false;
         FcPattern *pOutlinePattern = pOrig->fonts[i];
-        FcResult eOutRes =
+        FcResult eOutRes = 
                  FcPatternGetBool( pOutlinePattern, FC_OUTLINE, 0, &outline );
         if( (eOutRes != FcResultMatch) || (outline != FcTrue) )
             continue;
@@ -444,7 +444,7 @@ void FontCfgWrapper::addFontSet( FcSetName eSetName )
     (void)eSetName; // prevent compiler warning about unused parameter
     #endif
 }
-
+    
 FcFontSet* FontCfgWrapper::getFontSet()
 {
     #ifdef ENABLE_FONTCONFIG
@@ -532,9 +532,9 @@ namespace
 FcResult FontCfgWrapper::FamilyFromPattern(FcPattern* pPattern, FcChar8 **family)
 {
     FcChar8 *origfamily;
-    FcResult eFamilyRes = FcPatternGetString( pPattern, FC_FAMILY, 0, &origfamily );
+    FcResult eFamilyRes	= FcPatternGetString( pPattern, FC_FAMILY, 0, &origfamily );
     *family = origfamily;
-
+    
     if( eFamilyRes == FcResultMatch)
     {
         FcChar8* familylang = NULL;
@@ -552,13 +552,13 @@ FcResult FontCfgWrapper::FamilyFromPattern(FcPattern* pPattern, FcChar8 **family
                 lang_and_families.push_back(lang_and_family(familylang, *family));
                 ++k;
             }
-
+            
             //possible to-do, sort by UILocale instead of process locale
             rtl_Locale* pLoc;
             osl_getProcessLocale(&pLoc);
             localizedsorter aSorter(pLoc);
             *family = aSorter.bestname(lang_and_families);
-
+            
             std::vector<lang_and_family>::const_iterator aEnd = lang_and_families.end();
             for (std::vector<lang_and_family>::const_iterator aIter = lang_and_families.begin(); aIter != aEnd; ++aIter)
             {
@@ -570,7 +570,7 @@ FcResult FontCfgWrapper::FamilyFromPattern(FcPattern* pPattern, FcChar8 **family
                 m_aLocalizedToCanonical[OString((const char*)(*family))] = OString((const char*)origfamily);
         }
     }
-
+    
     return eFamilyRes;
 }
 
@@ -675,16 +675,16 @@ int PrintFontManager::countFontconfigFonts( std::hash_map<rtl::OString, int, rtl
             int spacing = 0;
             int nCollectionEntry = -1;
             FcBool outline = false;
-
-            FcResult eFileRes         = rWrapper.FcPatternGetString( pFSet->fonts[i], FC_FILE, 0, &file );
+            
+            FcResult eFileRes	      = rWrapper.FcPatternGetString( pFSet->fonts[i], FC_FILE, 0, &file );
             FcResult eFamilyRes       = rWrapper.FamilyFromPattern( pFSet->fonts[i], &family );
-            FcResult eStyleRes        = rWrapper.FcPatternGetString( pFSet->fonts[i], FC_STYLE, 0, &style );
-            FcResult eSlantRes        = rWrapper.FcPatternGetInteger( pFSet->fonts[i], FC_SLANT, 0, &slant );
-            FcResult eWeightRes       = rWrapper.FcPatternGetInteger( pFSet->fonts[i], FC_WEIGHT, 0, &weight );
-            FcResult eSpacRes         = rWrapper.FcPatternGetInteger( pFSet->fonts[i], FC_SPACING, 0, &spacing );
-            FcResult eOutRes          = rWrapper.FcPatternGetBool( pFSet->fonts[i], FC_OUTLINE, 0, &outline );
+            FcResult eStyleRes	      = rWrapper.FcPatternGetString( pFSet->fonts[i], FC_STYLE, 0, &style );
+            FcResult eSlantRes	      = rWrapper.FcPatternGetInteger( pFSet->fonts[i], FC_SLANT, 0, &slant );
+            FcResult eWeightRes	      = rWrapper.FcPatternGetInteger( pFSet->fonts[i], FC_WEIGHT, 0, &weight );
+            FcResult eSpacRes	      = rWrapper.FcPatternGetInteger( pFSet->fonts[i], FC_SPACING, 0, &spacing );
+            FcResult eOutRes	      = rWrapper.FcPatternGetBool( pFSet->fonts[i], FC_OUTLINE, 0, &outline );
             FcResult eIndexRes        = rWrapper.FcPatternGetInteger( pFSet->fonts[i], FC_INDEX, 0, &nCollectionEntry );
-
+            
             if( eFileRes != FcResultMatch || eFamilyRes != FcResultMatch || eOutRes != FcResultMatch )
                 continue;
 
@@ -712,9 +712,9 @@ int PrintFontManager::countFontconfigFonts( std::hash_map<rtl::OString, int, rtl
             std::list< PrintFont* > aFonts;
             OString aDir, aBase, aOrgPath( (sal_Char*)file );
             splitPath( aOrgPath, aDir, aBase );
-
+            
             o_rVisitedPaths[aDir] = 1;
-
+            
             int nDirID = getDirectoryAtom( aDir, true );
             if( ! m_pFontCache->getFontCacheFile( nDirID, aBase, aFonts ) )
             {
@@ -769,7 +769,7 @@ int PrintFontManager::countFontconfigFonts( std::hash_map<rtl::OString, int, rtl
                     pUpdate = NULL;
                 }
             }
-
+            
             if( pUpdate )
             {
                 // set family name
@@ -794,7 +794,7 @@ int PrintFontManager::countFontconfigFonts( std::hash_map<rtl::OString, int, rtl
                 {
                     pUpdate->m_aStyleName = OStringToOUString( OString( (sal_Char*)style ), RTL_TEXTENCODING_UTF8 );
                 }
-
+                
                 // update font cache
                 m_pFontCache->updateFontCacheEntry( pUpdate, false );
                 // sort into known fonts
@@ -817,7 +817,7 @@ int PrintFontManager::countFontconfigFonts( std::hash_map<rtl::OString, int, rtl
             }
         }
     }
-
+    
     // how does one get rid of the config ?
 #if OSL_DEBUG_LEVEL > 1
     fprintf( stderr, "inserted %d fonts from fontconfig\n", nFonts );
@@ -872,7 +872,7 @@ bool PrintFontManager::addFontconfigDir( const rtl::OString& rDirName )
     return true;
 }
 
-static void addtopattern(FontCfgWrapper& rWrapper, FcPattern *pPattern,
+static void addtopattern(FontCfgWrapper& rWrapper, FcPattern *pPattern, 
     italic::type eItalic, weight::type eWeight, width::type eWidth, pitch::type ePitch)
 {
     if( eItalic != italic::Unknown )
@@ -880,8 +880,8 @@ static void addtopattern(FontCfgWrapper& rWrapper, FcPattern *pPattern,
         int nSlant = FC_SLANT_ROMAN;
         switch( eItalic )
         {
-            case italic::Italic:        nSlant = FC_SLANT_ITALIC;break;
-            case italic::Oblique:       nSlant = FC_SLANT_OBLIQUE;break;
+            case italic::Italic:	 	nSlant = FC_SLANT_ITALIC;break;
+            case italic::Oblique:	 	nSlant = FC_SLANT_OBLIQUE;break;
             default:
                 break;
         }
@@ -892,16 +892,16 @@ static void addtopattern(FontCfgWrapper& rWrapper, FcPattern *pPattern,
         int nWeight = FC_WEIGHT_NORMAL;
         switch( eWeight )
         {
-            case weight::Thin:          nWeight = FC_WEIGHT_THIN;break;
-            case weight::UltraLight:    nWeight = FC_WEIGHT_ULTRALIGHT;break;
-            case weight::Light:         nWeight = FC_WEIGHT_LIGHT;break;
-            case weight::SemiLight:     nWeight = FC_WEIGHT_BOOK;break;
-            case weight::Normal:        nWeight = FC_WEIGHT_NORMAL;break;
-            case weight::Medium:        nWeight = FC_WEIGHT_MEDIUM;break;
-            case weight::SemiBold:      nWeight = FC_WEIGHT_SEMIBOLD;break;
-            case weight::Bold:          nWeight = FC_WEIGHT_BOLD;break;
-            case weight::UltraBold:     nWeight = FC_WEIGHT_ULTRABOLD;break;
-            case weight::Black:         nWeight = FC_WEIGHT_BLACK;break;
+            case weight::Thin:			nWeight = FC_WEIGHT_THIN;break;
+            case weight::UltraLight:	nWeight = FC_WEIGHT_ULTRALIGHT;break;
+            case weight::Light:			nWeight = FC_WEIGHT_LIGHT;break;
+            case weight::SemiLight:		nWeight = FC_WEIGHT_BOOK;break;
+            case weight::Normal:		nWeight = FC_WEIGHT_NORMAL;break;
+            case weight::Medium:		nWeight = FC_WEIGHT_MEDIUM;break;
+            case weight::SemiBold:		nWeight = FC_WEIGHT_SEMIBOLD;break;
+            case weight::Bold:			nWeight = FC_WEIGHT_BOLD;break;
+            case weight::UltraBold:		nWeight	= FC_WEIGHT_ULTRABOLD;break;
+            case weight::Black:			nWeight	= FC_WEIGHT_BLACK;break;
             default:
                 break;
         }
@@ -912,15 +912,15 @@ static void addtopattern(FontCfgWrapper& rWrapper, FcPattern *pPattern,
         int nWidth = FC_WIDTH_NORMAL;
         switch( eWidth )
         {
-            case width::UltraCondensed: nWidth = FC_WIDTH_ULTRACONDENSED;break;
+            case width::UltraCondensed:	nWidth = FC_WIDTH_ULTRACONDENSED;break;
             case width::ExtraCondensed: nWidth = FC_WIDTH_EXTRACONDENSED;break;
-            case width::Condensed:      nWidth = FC_WIDTH_CONDENSED;break;
-            case width::SemiCondensed:  nWidth = FC_WIDTH_SEMICONDENSED;break;
-            case width::Normal:         nWidth = FC_WIDTH_NORMAL;break;
-            case width::SemiExpanded:   nWidth = FC_WIDTH_SEMIEXPANDED;break;
-            case width::Expanded:       nWidth = FC_WIDTH_EXPANDED;break;
-            case width::ExtraExpanded:  nWidth = FC_WIDTH_EXTRAEXPANDED;break;
-            case width::UltraExpanded:  nWidth = FC_WIDTH_ULTRACONDENSED;break;
+            case width::Condensed:		nWidth = FC_WIDTH_CONDENSED;break;
+            case width::SemiCondensed:	nWidth = FC_WIDTH_SEMICONDENSED;break;
+            case width::Normal:			nWidth = FC_WIDTH_NORMAL;break;
+            case width::SemiExpanded:	nWidth = FC_WIDTH_SEMIEXPANDED;break;
+            case width::Expanded:		nWidth = FC_WIDTH_EXPANDED;break;
+            case width::ExtraExpanded:	nWidth = FC_WIDTH_EXTRAEXPANDED;break;
+            case width::UltraExpanded:	nWidth = FC_WIDTH_ULTRACONDENSED;break;
             default:
                 break;
         }
@@ -931,8 +931,8 @@ static void addtopattern(FontCfgWrapper& rWrapper, FcPattern *pPattern,
         int nSpacing = FC_PROPORTIONAL;
         switch( ePitch )
         {
-            case pitch::Fixed:          nSpacing = FC_MONO;break;
-            case pitch::Variable:       nSpacing = FC_PROPORTIONAL;break;
+            case pitch::Fixed:			nSpacing = FC_MONO;break;
+            case pitch::Variable:		nSpacing = FC_PROPORTIONAL;break;
             default:
                 break;
         }
@@ -1056,7 +1056,7 @@ rtl::OUString PrintFontManager::Substitute(const rtl::OUString& rFontName,
     return aName;
 }
 
-bool PrintFontManager::getFontOptions(
+bool PrintFontManager::getFontOptions( 
     const FastPrintFontInfo& rInfo, int nSize, void (*subcallback)(void*),
     ImplFontOptions& rOptions) const
 {
@@ -1101,13 +1101,13 @@ bool PrintFontManager::getFontOptions(
                 FC_EMBEDDED_BITMAP, 0, &embitmap);
             FcResult eAntialias = rWrapper.FcPatternGetBool(pSet->fonts[0],
                 FC_ANTIALIAS, 0, &antialias);
-            FcResult eAutoHint = rWrapper.FcPatternGetBool(pSet->fonts[0],
+            FcResult eAutoHint = rWrapper.FcPatternGetBool(pSet->fonts[0], 
                 FC_AUTOHINT, 0, &autohint);
-            FcResult eHinting = rWrapper.FcPatternGetBool(pSet->fonts[0],
+            FcResult eHinting = rWrapper.FcPatternGetBool(pSet->fonts[0], 
                 FC_HINTING, 0, &hinting);
             /*FcResult eHintStyle =*/ rWrapper.FcPatternGetInteger( pSet->fonts[0],
                 FC_HINT_STYLE, 0, &hintstyle);
-
+         
             if( eEmbeddedBitmap == FcResultMatch )
                 rOptions.meEmbeddedBitmap = embitmap ? EMBEDDEDBITMAP_TRUE : EMBEDDEDBITMAP_FALSE;
             if( eAntialias == FcResultMatch )
diff --git a/vcl/unx/source/fontmanager/fontmanager.cxx b/vcl/unx/source/fontmanager/fontmanager.cxx
index 21183dc567ec..a9d45ea6ca77 100644
--- a/vcl/unx/source/fontmanager/fontmanager.cxx
+++ b/vcl/unx/source/fontmanager/fontmanager.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
@@ -375,10 +375,10 @@ PrintFontManager::Type1FontFile::~Type1FontFile()
 // -------------------------------------------------------------------------
 
 PrintFontManager::TrueTypeFontFile::TrueTypeFontFile()
-:   PrintFont( fonttype::TrueType )
-,   m_nDirectory( 0 )
-,   m_nCollectionEntry(-1)
-,   m_nTypeFlags( TYPEFLAG_INVALID )
+:	PrintFont( fonttype::TrueType )
+,	m_nDirectory( 0 )
+,	m_nCollectionEntry(-1)
+,	m_nTypeFlags( TYPEFLAG_INVALID )
 {}
 
 // -------------------------------------------------------------------------
@@ -592,13 +592,13 @@ bool PrintFontManager::TrueTypeFontFile::queryMetricPage( int nPage, MultiAtomPr
                     if( nGlyph != 0 )
                         aGlyphMap[ nGlyph ] = (sal_Unicode)i;
                 }
-
+                
                 // Loop through each of the 'kern' subtables
                 KernPair aPair;
                 for( i = 0; (unsigned int)i < pImplTTFont->nkern; i++ )
                 {
                     const sal_uInt8* pTable = pImplTTFont->kerntables[i];
-
+                    
                     /*sal_uInt32 nLength      =*/ getUInt32BE( pTable );
                     sal_uInt16 nCoverage    = getUInt16BE( pTable );
                     /*sal_uInt16 nTupleIndex  =*/ getUInt16BE( pTable );
@@ -610,7 +610,7 @@ bool PrintFontManager::TrueTypeFontFile::queryMetricPage( int nPage, MultiAtomPr
 
                     // Kerning sub-table format, 0 through 3
                     sal_uInt8 nSubTableFormat  = nCoverage & 0x00FF;
-
+ 
                     aPair.kern_x    = 0;
                     aPair.kern_y    = 0;
                     switch( nSubTableFormat )
@@ -651,7 +651,7 @@ bool PrintFontManager::TrueTypeFontFile::queryMetricPage( int nPage, MultiAtomPr
                                         case 0:
                                             aPair.kern_y = (int)nKern * 1000 / pImplTTFont->unitsPerEm;
                                             m_pMetrics->m_aYKernPairs.push_back( aPair );
-                                            break;
+                                            break;                                          
                                     }
 */
                                 }
@@ -687,7 +687,7 @@ bool PrintFontManager::TrueTypeFontFile::queryMetricPage( int nPage, MultiAtomPr
                                         case 0:
                                             aPair.kern_y = (int)nKern * 1000 / pImplTTFont->unitsPerEm;
                                             m_pMetrics->m_aYKernPairs.push_back( aPair );
-                                            break;
+                                            break;                                          
                                     }
                                 }
                             }
@@ -785,7 +785,7 @@ bool PrintFontManager::PrintFont::readAfmMetrics( const OString& rFileName, Mult
     }
     else
         aFamily = pProvider->getString( ATOM_FAMILYNAME, m_nFamilyName );
-
+    
     // style name: if fullname begins with family name
     // interpret the rest of fullname as style
     if( ! m_aStyleName.getLength() && pInfo->gfi->fullName && *pInfo->gfi->fullName )
@@ -829,7 +829,7 @@ bool PrintFontManager::PrintFont::readAfmMetrics( const OString& rFileName, Mult
 
         if( m_aEncoding == RTL_TEXTENCODING_DONTKNOW )
             m_aEncoding = nAdobeEncoding == 1 ?
-                RTL_TEXTENCODING_ADOBE_STANDARD : RTL_TEXTENCODING_SYMBOL;
+                RTL_TEXTENCODING_ADOBE_STANDARD : RTL_TEXTENCODING_SYMBOL;        
     }
     else if( m_aEncoding == RTL_TEXTENCODING_DONTKNOW )
         m_aEncoding = RTL_TEXTENCODING_ADOBE_STANDARD;
@@ -924,7 +924,7 @@ bool PrintFontManager::PrintFont::readAfmMetrics( const OString& rFileName, Mult
             bFillEncodingvector = false; // will be filled anyway, don't do the work twice
         }
     }
-
+    
     // ascend
     m_nAscend = pInfo->gfi->fontBBox.ury;
 
@@ -961,12 +961,12 @@ bool PrintFontManager::PrintFont::readAfmMetrics( const OString& rFileName, Mult
     if( bFillEncodingvector || !bOnlyGlobalAttributes )
     {
         // fill in character metrics
-
+    
         // first transform the character codes to unicode
         // note: this only works with single byte encodings
         sal_Unicode* pUnicodes = (sal_Unicode*)alloca( pInfo->numOfChars * sizeof(sal_Unicode));
         CharMetricInfo* pChar = pInfo->cmi;
-
+    
         for( i = 0; i < pInfo->numOfChars; i++, pChar++ )
         {
             if( nAdobeEncoding == 4 )
@@ -997,13 +997,13 @@ bool PrintFontManager::PrintFont::readAfmMetrics( const OString& rFileName, Mult
                         m_aEncodingVector[ pUnicodes[i] ] = pChar->code;
                     continue;
                 }
-
+    
                 if( m_aEncoding == RTL_TEXTENCODING_UNICODE )
                 {
                     pUnicodes[i] = (sal_Unicode)pChar->code;
                     continue;
                 }
-
+    
                 ByteString aTranslate;
                 if( pChar->code & 0xff000000 )
                     aTranslate += (char)(pChar->code >> 24 );
@@ -1018,7 +1018,7 @@ bool PrintFontManager::PrintFont::readAfmMetrics( const OString& rFileName, Mult
             else
                 pUnicodes[i] = 0;
         }
-
+    
         // now fill in the character metrics
         // parseAFM.cxx effectively only supports direction 0 (horizontal)
         pChar = pInfo->cmi;
@@ -1027,7 +1027,7 @@ bool PrintFontManager::PrintFont::readAfmMetrics( const OString& rFileName, Mult
         {
             if( pChar->code == -1 && ! pChar->name )
                 continue;
-
+    
             if( bFillEncodingvector && pChar->name )
             {
                 std::list< sal_Unicode > aCodes = rManager.getUnicodeFromAdobeName( pChar->name );
@@ -1041,13 +1041,13 @@ bool PrintFontManager::PrintFont::readAfmMetrics( const OString& rFileName, Mult
                     }
                 }
             }
-
+            
             aMetric.width   = pChar->wx ? pChar->wx : pChar->charBBox.urx;
             aMetric.height  = pChar->wy ? pChar->wy : pChar->charBBox.ury - pChar->charBBox.lly;
             if( aMetric.width == 0 && aMetric.height == 0 )
                 // guess something for e.g. space
                 aMetric.width = m_aGlobalMetricX.width/4;
-
+    
             if( ( nAdobeEncoding == 0 ) ||
                 ( ( nAdobeEncoding == 3 ) && ( m_aEncoding != RTL_TEXTENCODING_SYMBOL ) ) )
             {
@@ -1107,10 +1107,10 @@ bool PrintFontManager::PrintFont::readAfmMetrics( const OString& rFileName, Mult
                 }
             }
         }
-
+    
         m_pMetrics->m_aXKernPairs.clear();
         m_pMetrics->m_aYKernPairs.clear();
-
+    
         // now fill in the kern pairs
         // parseAFM.cxx effectively only supports direction 0 (horizontal)
         PairKernData* pKern = pInfo->pkd;
@@ -1120,7 +1120,7 @@ bool PrintFontManager::PrintFont::readAfmMetrics( const OString& rFileName, Mult
             // #i37703# broken kern table
             if( ! pKern->name1 || ! pKern->name2 )
                 continue;
-
+            
             aPair.first = 0;
             aPair.second = 0;
             // currently we have to find the adobe character names
@@ -1295,13 +1295,13 @@ bool PrintFontManager::analyzeFontFile( int nDirID, const OString& rFontFile, co
         // check for corresponding afm metric
         // first look for an adjacent file
         static const char* pSuffix[] = { ".afm", ".AFM" };
-
+        
         for( unsigned int i = 0; i < sizeof(pSuffix)/sizeof(pSuffix[0]); i++ )
         {
             ByteString aName( rFontFile );
             aName.Erase( aName.Len()-4 );
             aName.Append( pSuffix[i] );
-
+            
             ByteString aFilePath( aDir );
             aFilePath.Append( '/' );
             aFilePath.Append( aName );
@@ -1313,7 +1313,7 @@ bool PrintFontManager::analyzeFontFile( int nDirID, const OString& rFontFile, co
                 aFilePath = aDir;
                 aFilePath.Append( "/afm/" );
                 aFilePath.Append( aName );
-
+            
                 if( ! access( aFilePath.GetBuffer(), R_OK ) )
                 {
                     aAfmFile = "afm/";
@@ -1327,10 +1327,10 @@ bool PrintFontManager::analyzeFontFile( int nDirID, const OString& rFontFile, co
             {
                 Type1FontFile* pFont = new Type1FontFile();
                 pFont->m_nDirectory     = nDirID;
-
+                
                 pFont->m_aFontFile      = rFontFile;
                 pFont->m_aMetricFile    = aAfmFile;
-
+                
                 if( ! pFont->readAfmMetrics( getAfmFile( pFont ), m_pAtoms, false, true ) )
                 {
                     delete pFont;
@@ -1350,8 +1350,8 @@ bool PrintFontManager::analyzeFontFile( int nDirID, const OString& rFontFile, co
         aFilePath.Append( '/' );
         aFilePath.Append( ByteString( rFontFile ) );
         BuiltinFont* pFont = new BuiltinFont();
-        pFont->m_nDirectory     = nDirID;
-        pFont->m_aMetricFile    = rFontFile;
+        pFont->m_nDirectory		= nDirID;
+        pFont->m_aMetricFile	= rFontFile;
         if( pFont->readAfmMetrics( aFilePath, m_pAtoms, false, true ) )
             rNewFonts.push_back( pFont );
         else
@@ -1477,23 +1477,23 @@ fontID PrintFontManager::findFontFileID( int nDirID, const OString& rFontFile )
 bool PrintFontManager::parseXLFD( const OString& rXLFD, XLFDEntry& rEntry )
 {
     sal_Int32 nIndex = 0;
-    OString aFoundry        = WhitespaceToSpace( rXLFD.getToken( 1, '-', nIndex ) );
+    OString aFoundry		= WhitespaceToSpace( rXLFD.getToken( 1, '-', nIndex ) );
     if( nIndex < 0 ) return false;
-    OString aFamilyXLFD     = WhitespaceToSpace( rXLFD.getToken( 0, '-', nIndex ) );
+    OString aFamilyXLFD		= WhitespaceToSpace( rXLFD.getToken( 0, '-', nIndex ) );
     if( nIndex < 0 ) return false;
-    OString aWeight         = rXLFD.getToken( 0, '-', nIndex ).toAsciiLowerCase();
+    OString aWeight			= rXLFD.getToken( 0, '-', nIndex ).toAsciiLowerCase();
     if( nIndex < 0 ) return false;
-    OString aSlant          = rXLFD.getToken( 0, '-', nIndex ).toAsciiLowerCase();
+    OString aSlant			= rXLFD.getToken( 0, '-', nIndex ).toAsciiLowerCase();
     if( nIndex < 0 ) return false;
-    OString aWidth          = rXLFD.getToken( 0, '-', nIndex ).toAsciiLowerCase();
+    OString aWidth			= rXLFD.getToken( 0, '-', nIndex ).toAsciiLowerCase();
     if( nIndex < 0 ) return false;
-    OString aAddStyle       = rXLFD.getToken( 0, '-', nIndex ).toAsciiLowerCase();
+    OString aAddStyle		= rXLFD.getToken( 0, '-', nIndex ).toAsciiLowerCase();
     if( nIndex < 0 ) return false;
-    OString aPitch          = rXLFD.getToken( 4, '-', nIndex ).toAsciiLowerCase();
+    OString aPitch			= rXLFD.getToken( 4, '-', nIndex ).toAsciiLowerCase();
     if( nIndex < 0 ) return false;
-    OString aRegEnc         = WhitespaceToSpace( rXLFD.getToken( 1, '-', nIndex ).toAsciiLowerCase() );
+    OString aRegEnc			= WhitespaceToSpace( rXLFD.getToken( 1, '-', nIndex ).toAsciiLowerCase() );
     if( nIndex < 0 ) return false;
-    OString aEnc            = WhitespaceToSpace( rXLFD.getToken( 0, '-', nIndex ).toAsciiLowerCase() );
+    OString aEnc			= WhitespaceToSpace( rXLFD.getToken( 0, '-', nIndex ).toAsciiLowerCase() );
 
     // capitalize words
     sal_Int32 nFamIndex = 0;
@@ -1512,22 +1512,22 @@ bool PrintFontManager::parseXLFD( const OString& rXLFD, XLFDEntry& rEntry )
         aFamilyName.append( aNewToken.makeStringAndClear() );
     }
 
-    rEntry.aFoundry     = aFoundry;
-    rEntry.aFamily      = aFamilyName.makeStringAndClear();
-    rEntry.aAddStyle    = aAddStyle;
+    rEntry.aFoundry		= aFoundry;
+    rEntry.aFamily		= aFamilyName.makeStringAndClear();
+    rEntry.aAddStyle	= aAddStyle;
     // evaluate weight
     rEntry.eWeight = parseWeight( aWeight );
     // evaluate slant
     rEntry.eItalic = parseItalic( aSlant );
     // evaluate width
     rEntry.eWidth = parseWidth( aWidth );
-
+    
     // evaluate pitch
     if( aPitch.toChar() == 'c' || aPitch.toChar() == 'm' )
         rEntry.ePitch = pitch::Fixed;
     else
         rEntry.ePitch = pitch::Variable;
-
+    
     OString aToken = aEnc.toAsciiLowerCase();
     // get encoding
     if( aAddStyle.indexOf( "symbol" ) != -1 )
@@ -1545,17 +1545,17 @@ bool PrintFontManager::parseXLFD( const OString& rXLFD, XLFDEntry& rEntry )
             rEntry.aEncoding = rtl_getTextEncodingFromUnixCharset( aCharset.getStr() );
         }
     }
-
+    
     // set correct mask flags
     rEntry.nMask = 0;
-    if( rEntry.aFoundry != "*" )        rEntry.nMask |= XLFDEntry::MaskFoundry;
-    if( rEntry.aFamily != "*" )         rEntry.nMask |= XLFDEntry::MaskFamily;
-    if( rEntry.aAddStyle != "*" )       rEntry.nMask |= XLFDEntry::MaskAddStyle;
-    if( aWeight != "*" )                rEntry.nMask |= XLFDEntry::MaskWeight;
-    if( aSlant != "*" )                 rEntry.nMask |= XLFDEntry::MaskItalic;
-    if( aWidth != "*" )                 rEntry.nMask |= XLFDEntry::MaskWidth;
-    if( aPitch != "*" )                 rEntry.nMask |= XLFDEntry::MaskPitch;
-    if( aRegEnc != "*" && aEnc != "*" ) rEntry.nMask |= XLFDEntry::MaskEncoding;
+    if( rEntry.aFoundry != "*" )		rEntry.nMask |= XLFDEntry::MaskFoundry;
+    if( rEntry.aFamily != "*" )			rEntry.nMask |= XLFDEntry::MaskFamily;
+    if( rEntry.aAddStyle != "*" )		rEntry.nMask |= XLFDEntry::MaskAddStyle;
+    if( aWeight != "*" )				rEntry.nMask |= XLFDEntry::MaskWeight;
+    if( aSlant != "*" )					rEntry.nMask |= XLFDEntry::MaskItalic;
+    if( aWidth != "*" )					rEntry.nMask |= XLFDEntry::MaskWidth;
+    if( aPitch != "*" )					rEntry.nMask |= XLFDEntry::MaskPitch;
+    if( aRegEnc != "*" && aEnc != "*" )	rEntry.nMask |= XLFDEntry::MaskEncoding;
 
     return true;
 }
@@ -1588,12 +1588,12 @@ void PrintFontManager::getFontAttributesFromXLFD( PrintFont* pFont, const std::l
     std::list< XLFDEntry > aXLFDs;
 
     parseXLFD_appendAliases( rXLFDs, aXLFDs );
-
+    
     for( std::list< XLFDEntry >::const_iterator it = aXLFDs.begin();
          it != aXLFDs.end(); ++it )
     {
         // set family name or alias
-        int nFam =
+        int nFam = 
             m_pAtoms->getAtom( ATOM_FAMILYNAME,
                                OStringToOUString( it->aFamily, it->aAddStyle.indexOf( "utf8" ) != -1 ? RTL_TEXTENCODING_UTF8 : RTL_TEXTENCODING_ISO_8859_1 ),
                                sal_True );
@@ -1623,7 +1623,7 @@ void PrintFontManager::getFontAttributesFromXLFD( PrintFont* pFont, const std::l
                     ;
                 if( al_it == pFont->m_aAliases.end() )
                     pFont->m_aAliases.push_back( nFam );
-
+                
             }
             // for the rest of the attributes there can only be one value;
             // we'll trust the first one
@@ -1631,15 +1631,15 @@ void PrintFontManager::getFontAttributesFromXLFD( PrintFont* pFont, const std::l
         }
 
         // fill in weight
-        pFont->m_eWeight    = it->eWeight;
+        pFont->m_eWeight	= it->eWeight;
         // fill in slant
-        pFont->m_eItalic    = it->eItalic;
+        pFont->m_eItalic	= it->eItalic;
         // fill in width
-        pFont->m_eWidth     = it->eWidth;
+        pFont->m_eWidth		= it->eWidth;
         // fill in pitch
-        pFont->m_ePitch     = it->ePitch;
+        pFont->m_ePitch		= it->ePitch;
         // fill in encoding
-        pFont->m_aEncoding  = it->aEncoding;
+        pFont->m_aEncoding	= it->aEncoding;
     }
 
     // handle iso8859-1 as ms1252 to fill the "gap" starting at 0x80
@@ -2030,18 +2030,18 @@ void PrintFontManager::initFontsAlias()
             aStream.ReadLine( aLine );
 
             // get the alias and the pattern it gets translated to
-            ByteString aAlias   = GetCommandLineToken( 0, aLine );
-            ByteString aMap     = GetCommandLineToken( 1, aLine );
-
+            ByteString aAlias	= GetCommandLineToken( 0, aLine );
+            ByteString aMap		= GetCommandLineToken( 1, aLine );
+            
             // remove eventual quotes
             aAlias.EraseLeadingChars( '"' );
             aAlias.EraseTrailingChars( '"' );
             aMap.EraseLeadingChars( '"' );
             aMap.EraseTrailingChars( '"' );
-
+            
             XLFDEntry aAliasEntry, aMapEntry;
             parseXLFD( aAlias, aAliasEntry );
-            parseXLFD( aMap, aMapEntry );
+            parseXLFD( aMap, aMapEntry );           
 
             if( aAliasEntry.nMask && aMapEntry.nMask )
                 m_aXLFD_Aliases[ aMapEntry ].push_back( aAliasEntry );
@@ -2065,7 +2065,7 @@ static bool AreFCSubstitutionsEnabled()
     {
         //
         if( (*pEnvStr >= '0') && (*pEnvStr <= '9') )
-            nDisableBits = (*pEnvStr - '0');
+            nDisableBits = (*pEnvStr - '0'); 
         else
             nDisableBits = ~0U; // no specific bits set: disable all
     }
@@ -2079,7 +2079,7 @@ void PrintFontManager::initialize()
     CALLGRIND_TOGGLE_COLLECT();
     CALLGRIND_ZERO_STATS();
     #endif
-
+    
     long aDirEntBuffer[ (sizeof(struct dirent)+_PC_NAME_MAX)+1 ];
 
     if( ! m_pFontCache )
@@ -2115,7 +2115,7 @@ void PrintFontManager::initialize()
     clock_t aStep3;
     int nBuiltinFonts = 0;
     int nCached = 0;
-
+    
     struct tms tms;
 
     aStart = times( &tms );
@@ -2141,7 +2141,7 @@ void PrintFontManager::initialize()
             normPath( aToken );
             // if registering an app-specific fontdir with fontconfig fails
             // and fontconfig-based substitutions are enabled
-            // then trying to use these app-specific fonts doesn't make sense
+            // then trying to use these app-specific fonts doesn't make sense 
             if( m_bFontconfigSuccess && !addFontconfigDir( aToken ) )
                 if( bAreFCSubstitutionsEnabled )
                     continue;
@@ -2225,7 +2225,7 @@ void PrintFontManager::initialize()
                  priv_dir != m_aPrivateFontDirectories.end() && *priv_dir != nDirID;
                  ++priv_dir )
                  ;
-
+                 
             if( priv_dir == m_aPrivateFontDirectories.end() )
             {
                 ByteString aGccDummy( aPath );
@@ -2245,7 +2245,7 @@ void PrintFontManager::initialize()
                     }
                 }
             }
-
+        
             int nDirFonts = 0;
             while( ! readdir_r( pDIR, (struct dirent*)aDirEntBuffer, &pEntry ) && pEntry )
             {
@@ -2314,7 +2314,7 @@ void PrintFontManager::initialize()
 
         // ask the font cache whether it handles this directory
         std::list< PrintFont* > aCacheFonts;
-
+        
         if( m_pFontCache->listDirectory( aDir, aCacheFonts ) )
         {
 #if OSL_DEBUG_LEVEL > 1
@@ -2419,7 +2419,7 @@ void PrintFontManager::initialize()
 #endif
 
     m_pFontCache->flush();
-
+    
     #ifdef CALLGRIND_COMPILE
     CALLGRIND_DUMP_STATS();
     CALLGRIND_TOGGLE_COLLECT();
@@ -2462,7 +2462,7 @@ namespace {
         weight::type        eWeight;
         pitch::type         ePitch;
         rtl_TextEncoding    aEncoding;
-
+        
         BuiltinFontIdentifier( const OUString& rFam,
                                italic::type eIt,
                                weight::type eWg,
@@ -2474,7 +2474,7 @@ namespace {
             ePitch( ePt ),
             aEncoding( enc )
         {}
-
+        
         bool operator==( const BuiltinFontIdentifier& rRight ) const
         {
             return equalItalic( eItalic, rRight.eItalic ) &&
@@ -2484,7 +2484,7 @@ namespace {
                    aFamily.equalsIgnoreAsciiCase( rRight.aFamily );
         }
     };
-
+    
     struct BuiltinFontIdentifierHash
     {
         size_t operator()( const BuiltinFontIdentifier& rFont ) const
@@ -2498,7 +2498,7 @@ void PrintFontManager::getFontList( ::std::list< fontID >& rFontIDs, const PPDPa
 {
     rFontIDs.clear();
     std::hash_map< fontID, PrintFont* >::const_iterator it;
-
+    
     /*
     * Note: there are two easy steps making this faster:
     * first: insert the printer builtins first, then the not builtins,
@@ -2514,7 +2514,7 @@ void PrintFontManager::getFontList( ::std::list< fontID >& rFontIDs, const PPDPa
     * Until getFontList for a printer becomes a performance issue (which is
     * currently not the case), best stay with the current algorithm.
     */
-
+    
     // fill sets of printer supported fonts
     if( pParser )
     {
@@ -2536,7 +2536,7 @@ void PrintFontManager::getFontList( ::std::list< fontID >& rFontIDs, const PPDPa
                     aOverridePSNames[ font_it->second->m_nPSName ] = *over;
             }
         }
-
+        
         int nFonts = pParser->getFonts();
         for( int i = 0; i < nFonts; i++ )
             aBuiltinPSNames.insert( m_pAtoms->getAtom( ATOM_PSNAME, pParser->getFont( i ) ) );
@@ -3173,7 +3173,7 @@ bool PrintFontManager::getMetrics( fontID nFontID, sal_Unicode minCharacter, sal
                 pArray[ code - minCharacter ] = it->second;
         }
     } while( code++ != maxCharacter );
-
+    
     return true;
 }
 
@@ -3280,9 +3280,9 @@ int PrintFontManager::importFonts( const ::std::list< OString >& rFiles, bool bL
                 OUString aFromPath, aToPath;
                 if( bLinkOnly )
                 {
-                    ByteString aLinkFromPath( String(aFromAfm.PathToFileName()),
+                    ByteString aLinkFromPath( String(aFromAfm.PathToFileName()), 
                         aEncoding );
-                    ByteString aLinkToPath( String(aToAfm.PathToFileName()),
+                    ByteString aLinkToPath( String(aToAfm.PathToFileName()), 
                         aEncoding );
                     nError = (FileBase::RC)symlink( aLinkFromPath.GetBuffer(), aLinkToPath.GetBuffer() );
                 }
@@ -3298,10 +3298,10 @@ int PrintFontManager::importFonts( const ::std::list< OString >& rFiles, bool bL
             }
             if( bLinkOnly )
             {
-                ByteString aFromPath( String(aFrom.PathToFileName()),
+                ByteString aFromPath( String(aFrom.PathToFileName()), 
                     aEncoding );
                 ByteString aToPath( String(aTo.PathToFileName()), aEncoding );
-                nError = (FileBase::RC)symlink( aFromPath.GetBuffer(),
+                nError = (FileBase::RC)symlink( aFromPath.GetBuffer(), 
                     aToPath.GetBuffer() );
             }
             else
@@ -3427,7 +3427,7 @@ bool PrintFontManager::changeFontProperties( fontID nFontID, const ::rtl::OUStri
     getFontAttributesFromXLFD( pFont, aDummyList );
     pFont->m_bUserOverride = true;
     m_pFontCache->updateFontCacheEntry( pFont, true );
-
+    
     return true;
 }
 
@@ -3729,8 +3729,8 @@ bool PrintFontManager::createFontSubset(
 
     int xMin, yMin, xMax, yMax;
     getFontBoundingBox( nFont, xMin, yMin, xMax, yMax );
-    rInfo.m_aFontBBox   = Rectangle( Point( xMin, yMin ), Size( xMax-xMin, yMax-yMin ) );
-    rInfo.m_nCapHeight  = yMax; // Well ...
+    rInfo.m_aFontBBox	= Rectangle( Point( xMin, yMin ), Size( xMax-xMin, yMax-yMin ) );
+    rInfo.m_nCapHeight	= yMax; // Well ...
 
     // fill in glyph advance widths
     TTSimpleGlyphMetrics* pMetrics = GetTTSimpleGlyphMetrics( pTTFont,
@@ -3837,7 +3837,7 @@ void PrintFontManager::getGlyphWidths( fontID nFont,
             rUnicodeEnc.clear();
             rWidths.clear();
             rWidths.reserve( pFont->m_pMetrics->m_aMetrics.size() );
-            for( std::hash_map< int, CharacterMetric >::const_iterator it =
+            for( std::hash_map< int, CharacterMetric >::const_iterator it = 
                  pFont->m_pMetrics->m_aMetrics.begin();
                  it != pFont->m_pMetrics->m_aMetrics.end(); ++it )
             {
@@ -3950,7 +3950,7 @@ bool PrintFontManager::readOverrideMetrics()
                 UNO_QUERY );
     if( !xMat.is() )
         return false;
-
+    
     Any aAny( xMat->getMaterial() );
     Sequence< Any > aOverrideFonts;
     if( ! (aAny >>= aOverrideFonts ) )
@@ -4086,7 +4086,7 @@ bool PrintFontManager::readOverrideMetrics()
             ! pFont->m_pMetrics->m_aMetrics.empty() )
         {
             m_aOverrideFonts.push_back( m_nNextFontID );
-            m_aFonts[ m_nNextFontID++ ] = pFont;
+            m_aFonts[ m_nNextFontID++ ] = pFont;            
         }
         else
         {
@@ -4094,6 +4094,6 @@ bool PrintFontManager::readOverrideMetrics()
             delete pFont;
         }
     }
-
+    
     return true;
 }
diff --git a/vcl/unx/source/fontmanager/helper.cxx b/vcl/unx/source/fontmanager/helper.cxx
index 05213a52597c..3ae8501e0320 100644
--- a/vcl/unx/source/fontmanager/helper.cxx
+++ b/vcl/unx/source/fontmanager/helper.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
@@ -106,7 +106,7 @@ OUString getOfficePath( enum whichOfficePath ePath )
 static OString getEnvironmentPath( const char* pKey )
 {
     OString aPath;
-
+    
     const char* pValue = getenv( pKey );
     if( pValue && *pValue )
     {
@@ -121,9 +121,9 @@ void psp::getPrinterPathList( std::list< OUString >& rPathList, const char* pSub
 {
     rPathList.clear();
     rtl_TextEncoding aEncoding = osl_getThreadTextEncoding();
-
+    
     OUStringBuffer aPathBuffer( 256 );
-
+    
     // append net path
     aPathBuffer.append( getOfficePath( psp::NetPath ) );
     if( aPathBuffer.getLength() )
@@ -168,7 +168,7 @@ void psp::getPrinterPathList( std::list< OUString >& rPathList, const char* pSub
 
         rPathList.push_back( OStringToOUString( aDir, aEncoding ) );
     } while( nIndex != -1 );
-
+    
     #ifdef SYSTEM_PPD_DIR
     if( pSubDir && rtl_str_compare( pSubDir, PRINTER_PPDDIR ) == 0 )
     {
@@ -201,7 +201,7 @@ OUString psp::getFontPath()
     if( ! aPath.getLength() )
     {
         OUStringBuffer aPathBuffer( 512 );
-
+        
         OUString aConfigPath( getOfficePath( psp::ConfigPath ) );
         OUString aNetPath( getOfficePath( psp::NetPath ) );
         OUString aUserPath( getOfficePath( psp::UserPath ) );
@@ -368,7 +368,7 @@ void psp::normPath( OString& rPath )
     char buf[PATH_MAX];
 
     ByteString aPath( rPath );
-
+    
     // double slashes and slash at end are probably
     // removed by realpath anyway, but since this runs
     // on many different platforms let's play it safe
diff --git a/vcl/unx/source/fontmanager/parseAFM.cxx b/vcl/unx/source/fontmanager/parseAFM.cxx
index e1a33b4d1b5d..687253209a02 100644
--- a/vcl/unx/source/fontmanager/parseAFM.cxx
+++ b/vcl/unx/source/fontmanager/parseAFM.cxx
@@ -2,20 +2,20 @@
  * (C) 1988, 1989, 1990 by Adobe Systems Incorporated. All rights reserved.
  *
  * This file may be freely copied and redistributed as long as:
- *   1) This entire notice continues to be included in the file,
+ *   1) This entire notice continues to be included in the file, 
  *   2) If the file has been modified in any way, a notice of such
  *      modification is conspicuously indicated.
  *
  * PostScript, Display PostScript, and Adobe are registered trademarks of
  * Adobe Systems Incorporated.
- *
+ * 
  * ************************************************************************
  * THE INFORMATION BELOW IS FURNISHED AS IS, IS SUBJECT TO CHANGE WITHOUT
  * NOTICE, AND SHOULD NOT BE CONSTRUED AS A COMMITMENT BY ADOBE SYSTEMS
- * INCORPORATED. ADOBE SYSTEMS INCORPORATED ASSUMES NO RESPONSIBILITY OR
- * LIABILITY FOR ANY ERRORS OR INACCURACIES, MAKES NO WARRANTY OF ANY
- * KIND (EXPRESS, IMPLIED OR STATUTORY) WITH RESPECT TO THIS INFORMATION,
- * AND EXPRESSLY DISCLAIMS ANY AND ALL WARRANTIES OF MERCHANTABILITY,
+ * INCORPORATED. ADOBE SYSTEMS INCORPORATED ASSUMES NO RESPONSIBILITY OR 
+ * LIABILITY FOR ANY ERRORS OR INACCURACIES, MAKES NO WARRANTY OF ANY 
+ * KIND (EXPRESS, IMPLIED OR STATUTORY) WITH RESPECT TO THIS INFORMATION, 
+ * AND EXPRESSLY DISCLAIMS ANY AND ALL WARRANTIES OF MERCHANTABILITY, 
  * FITNESS FOR PARTICULAR PURPOSES AND NONINFRINGEMENT OF THIRD PARTY RIGHTS.
  * ************************************************************************
  */
@@ -46,13 +46,13 @@
 #include "precompiled_vcl.hxx"
 
 /* parseAFM.c
- *
+ * 
  * This file is used in conjuction with the parseAFM.h header file.
  * This file contains several procedures that are used to parse AFM
  * files. It is intended to work with an application program that needs
  * font metric information. The program can be used as is by making a
  * procedure call to "parseFile" (passing in the expected parameters)
- * and having it fill in a data structure with the data from the
+ * and having it fill in a data structure with the data from the 
  * AFM file, or an application developer may wish to customize this
  * code.
  *
@@ -107,7 +107,7 @@ class FileInputStream
     public:
     FileInputStream( const char* pFilename );
     ~FileInputStream();
-
+    
     int getChar() { return (m_nPos < m_nLen) ? int(m_pMemory[m_nPos++]) : -1; }
     void ungetChar()
     {
@@ -148,18 +148,18 @@ FileInputStream::~FileInputStream()
 }
 
 /*************************** GLOBALS ***********************/
-/* "shorts" for fast case statement
+/* "shorts" for fast case statement 
  * The values of each of these enumerated items correspond to an entry in the
- * table of strings defined below. Therefore, if you add a new string as
+ * table of strings defined below. Therefore, if you add a new string as 
  * new keyword into the keyStrings table, you must also add a corresponding
  * parseKey AND it MUST be in the same position!
  *
  * IMPORTANT: since the sorting algorithm is a binary search, the strings of
- * keywords must be placed in lexicographical order, below. [Therefore, the
- * enumerated items are not necessarily in lexicographical order, depending
- * on the name chosen. BUT, they must be placed in the same position as the
- * corresponding key string.] The NOPE shall remain in the last position,
- * since it does not correspond to any key string, and it is used in the
+ * keywords must be placed in lexicographical order, below. [Therefore, the 
+ * enumerated items are not necessarily in lexicographical order, depending 
+ * on the name chosen. BUT, they must be placed in the same position as the 
+ * corresponding key string.] The NOPE shall remain in the last position, 
+ * since it does not correspond to any key string, and it is used in the 
  * "recognize" procedure to calculate how many possible keys there are.
  */
 
@@ -179,16 +179,16 @@ enum parseKey {
     NOPE
 };
 
-/*************************** PARSING ROUTINES **************/
-
+/*************************** PARSING ROUTINES **************/ 
+  
 /*************************** token *************************/
 
 /*  A "AFM file Conventions" tokenizer. That means that it will
  *  return the next token delimited by white space.  See also
- *  the `linetoken' routine, which does a similar thing but
+ *  the `linetoken' routine, which does a similar thing but 
  *  reads all tokens until the next end-of-line.
  */
-
+ 
 // token white space is ' ', '\n', '\r', ',', '\t', ';'
 static const bool is_white_Array[ 256 ] =
 {   false, false, false, false, false, false, false, false, // 0-7
@@ -199,7 +199,7 @@ static const bool is_white_Array[ 256 ] =
     false, false, false, false,  true, false, false, false, // 40-47
     false, false, false, false, false, false, false, false, // 48-55
     false, false, false,  true, false, false, false, false, // 56-63
-
+    
     false, false, false, false, false, false, false, false, // 64 -
     false, false, false, false, false, false, false, false,
     false, false, false, false, false, false, false, false,
@@ -208,7 +208,7 @@ static const bool is_white_Array[ 256 ] =
     false, false, false, false, false, false, false, false,
     false, false, false, false, false, false, false, false,
     false, false, false, false, false, false, false, false, // 127
-
+    
     false, false, false, false, false, false, false, false, // 128 -
     false, false, false, false, false, false, false, false,
     false, false, false, false, false, false, false, false,
@@ -237,7 +237,7 @@ static const bool is_delimiter_Array[ 256 ] =
     false, false, false, false, false, false, false, false, // 40-47
     false, false, false, false, false, false, false, false, // 48-55
     false, false,  true,  true, false, false, false, false, // 56-63
-
+    
     false, false, false, false, false, false, false, false, // 64 -
     false, false, false, false, false, false, false, false,
     false, false, false, false, false, false, false, false,
@@ -246,7 +246,7 @@ static const bool is_delimiter_Array[ 256 ] =
     false, false, false, false, false, false, false, false,
     false, false, false, false, false, false, false, false,
     false, false, false, false, false, false, false, false, // 127
-
+    
     false, false, false, false, false, false, false, false, // 128 -
     false, false, false, false, false, false, false, false,
     false, false, false, false, false, false, false, false,
@@ -275,7 +275,7 @@ static char *token( FileInputStream* stream, int& rLen )
     // relies on EOF = -1
     while( is_white_Array[ (ch = stream->getChar()) & 255 ] )
         ;
-
+    
     idx = 0;
     while( ch != -1 && ! is_delimiter_Array[ ch & 255 ] && idx < MAX_NAME-1 )
     {
@@ -288,7 +288,7 @@ static char *token( FileInputStream* stream, int& rLen )
     if (idx < 1 ) ident[idx++] = ch;    /* single-character token */
     ident[idx] = 0;
     rLen = idx;
-
+    
     return(ident);  /* returns pointer to the token */
 
 } /* token */
@@ -306,15 +306,15 @@ static char *linetoken( FileInputStream* stream )
     static char ident[MAX_NAME]; /* storage buffer for keywords */
     int ch, idx;
 
-    while ((ch = stream->getChar()) == ' ' || ch == '\t' ) ;
-
+    while ((ch = stream->getChar()) == ' ' || ch == '\t' ) ; 
+    
     idx = 0;
-    while (ch != -1 && ch != lineterm && ch != '\r' && idx < MAX_NAME-1 )
+    while (ch != -1 && ch != lineterm && ch != '\r' && idx < MAX_NAME-1 ) 
     {
         ident[idx++] = ch;
         ch = stream->getChar();
     } /* while */
-
+    
     stream->ungetChar();
     ident[idx] = 0;
 
@@ -326,7 +326,7 @@ static char *linetoken( FileInputStream* stream )
 /*************************** recognize *************************/
 
 /*  This function tries to match a string to a known list of
- *  valid AFM entries (check the keyStrings array above).
+ *  valid AFM entries (check the keyStrings array above). 
  *  "ident" contains everything from white space through the
  *  next space, tab, or ":" character.
  *
@@ -338,7 +338,7 @@ static inline enum parseKey recognize( register char* ident, int len)
 {
     const hash_entry* pEntry = AfmKeywordHash::in_word_set( ident, len );
     return pEntry ? pEntry->eKey : NOPE;
-
+    
 } /* recognize */
 
 
@@ -347,34 +347,34 @@ static inline enum parseKey recognize( register char* ident, int len)
 /*  This function is called by "parseFile". It will parse the AFM file
  *  up to the "StartCharMetrics" keyword, which essentially marks the
  *  end of the Global Font Information and the beginning of the character
- *  metrics information.
+ *  metrics information. 
  *
  *  If the caller of "parseFile" specified that it wanted the Global
  *  Font Information (as defined by the "AFM file Specification"
- *  document), then that information will be stored in the returned
+ *  document), then that information will be stored in the returned 
  *  data structure.
  *
- *  Any Global Font Information entries that are not found in a
+ *  Any Global Font Information entries that are not found in a 
  *  given file, will have the usual default initialization value
  *  for its type (i.e. entries of type int will be 0, etc).
  *
- *  This function returns an error code specifying whether there was
- *  a premature EOF or a parsing error. This return value is used by
+ *  This function returns an error code specifying whether there was 
+ *  a premature EOF or a parsing error. This return value is used by 
  *  parseFile to determine if there is more file to parse.
  */
-
+ 
 static int parseGlobals( FileInputStream* fp, register GlobalFontInfo* gfi )
-{
+{  
     bool cont = true, save = (gfi != NULL);
     int error = ok;
     register char *keyword;
     int direction = -1;
     int tokenlen;
-
+   
     while (cont)
     {
         keyword = token(fp, tokenlen);
-
+        
         if (keyword == NULL)
             /* Have reached an early and unexpected EOF. */
             /* Set flag and stop parsing */
@@ -382,15 +382,15 @@ static int parseGlobals( FileInputStream* fp, register GlobalFontInfo* gfi )
             error = earlyEOF;
             break;   /* get out of loop */
         }
-        if (!save)
+        if (!save)  
             /* get tokens until the end of the Global Font info section */
             /* without saving any of the data */
-            switch (recognize(keyword, tokenlen))
-            {
+            switch (recognize(keyword, tokenlen))  
+            {               
                 case STARTCHARMETRICS:
                     cont = false;
                     break;
-                case ENDFONTMETRICS:
+                case ENDFONTMETRICS:    
                     cont = false;
                     error = normalEOF;
                     break;
@@ -416,15 +416,15 @@ static int parseGlobals( FileInputStream* fp, register GlobalFontInfo* gfi )
                 case ENCODINGSCHEME:
                     if ((keyword = token(fp,tokenlen)) != NULL)
                         gfi->encodingScheme = strdup( keyword );
-                    break;
+                    break; 
                 case FULLNAME:
                     if ((keyword = linetoken(fp)) != NULL)
                         gfi->fullName = strdup( keyword );
-                    break;
-                case FAMILYNAME:
+                    break; 
+                case FAMILYNAME:           
                     if ((keyword = linetoken(fp)) != NULL)
                         gfi->familyName = strdup( keyword );
-                    break;
+                    break; 
                 case WEIGHT:
                     if ((keyword = token(fp,tokenlen)) != NULL)
                         gfi->weight = strdup( keyword );
@@ -438,14 +438,14 @@ static int parseGlobals( FileInputStream* fp, register GlobalFontInfo* gfi )
                     {
                         if (MATCH(keyword, False))
                             gfi->isFixedPitch = 0;
-                        else
+                        else 
                             gfi->isFixedPitch = 1;
                     }
-                    break;
+                    break; 
                 case UNDERLINEPOSITION:
                     if ((keyword = token(fp,tokenlen)) != NULL)
                         gfi->underlinePosition = atoi(keyword);
-                    break;
+                    break; 
                 case UNDERLINETHICKNESS:
                     if ((keyword = token(fp,tokenlen)) != NULL)
                         gfi->underlineThickness = atoi(keyword);
@@ -453,11 +453,11 @@ static int parseGlobals( FileInputStream* fp, register GlobalFontInfo* gfi )
                 case VERSION:
                     if ((keyword = token(fp,tokenlen)) != NULL)
                         gfi->version = strdup( keyword );
-                    break;
+                    break; 
                 case NOTICE:
                     if ((keyword = linetoken(fp)) != NULL)
                         gfi->notice = strdup( keyword );
-                    break;
+                    break; 
                 case FONTBBOX:
                     if ((keyword = token(fp,tokenlen)) != NULL)
                         gfi->fontBBox.llx = atoi(keyword);
@@ -532,7 +532,7 @@ static int parseGlobals( FileInputStream* fp, register GlobalFontInfo* gfi )
                     }
                     keyword = token(fp,tokenlen);
                     /* ignore y-width for now */
-                    break;
+                    break; 
                 case METRICSSETS:
                     keyword = token(fp,tokenlen);
                     break; /* ignore this for now */
@@ -542,10 +542,10 @@ static int parseGlobals( FileInputStream* fp, register GlobalFontInfo* gfi )
                     break;
             } /* switch */
     } /* while */
-
+    
     return(error);
-
-} /* parseGlobals */
+    
+} /* parseGlobals */    
 
 
 #if 0
@@ -554,26 +554,26 @@ static int parseGlobals( FileInputStream* fp, register GlobalFontInfo* gfi )
 /*  Unmapped character codes are (at Adobe Systems) assigned the
  *  width of the space character (if one exists) else they get the
  *  value of 250 ems. This function initializes all entries in the
- *  char widths array to have this value. Then any mapped character
- *  codes will be replaced with the width of the appropriate character
+ *  char widths array to have this value. Then any mapped character 
+ *  codes will be replaced with the width of the appropriate character 
  *  when parsing the character metric section.
-
+ 
  *  This function parses the Character Metrics Section looking
  *  for a space character (by comparing character names). If found,
  *  the width of the space character will be used to initialize the
- *  values in the array of character widths.
+ *  values in the array of character widths. 
  *
  *  Before returning, the position of the read/write pointer of the
  *  FileInputStream is reset to be where it was upon entering this function.
  */
-
+ 
 static int initializeArray( FileInputStream* fp, register int* cwi)
-{
+{  
     bool cont = true, found = false;
     unsigned int opos = fp->tell();
     int code = 0, width = 0, i = 0, error = 0, tokenlen;
     register char *keyword;
-
+  
     while (cont)
     {
         keyword = token(fp,tokenlen);
@@ -602,67 +602,67 @@ static int initializeArray( FileInputStream* fp, register int* cwi)
             case X0WIDTH:
                 (void) token(fp,tokenlen);
                 break;
-            case CHARNAME:
+            case CHARNAME: 
                 if ((keyword = token(fp,tokenlen)) != NULL)
                     if (MATCH(keyword, Space))
-                    {
+                    {    
                         cont = false;
                         found = true;
-                    }
-                break;
+                    } 
+                break;            
             case ENDCHARMETRICS:
                 cont = false;
-                break;
+                break; 
             case ENDFONTMETRICS:
                 cont = false;
                 error = normalEOF;
                 break;
             case NOPE:
-            default:
+            default: 
                 error = parseError;
                 break;
         } /* switch */
     } /* while */
-
+    
     if (!found)
         width = 250;
-
+    
     for (i = 0; i < 256; ++i)
         cwi[i] = width;
-
+    
     fp->seek(opos);
-
+    
     return(error);
-
-} /* initializeArray */
+        
+} /* initializeArray */    
 #endif
 
 /************************* parseCharWidths **************************/
 
 /*  This function is called by "parseFile". It will parse the AFM file
- *  up to the "EndCharMetrics" keyword. It will save the character
+ *  up to the "EndCharMetrics" keyword. It will save the character 
  *  width info (as opposed to all of the character metric information)
  *  if requested by the caller of parseFile. Otherwise, it will just
  *  parse through the section without saving any information.
  *
- *  If data is to be saved, parseCharWidths is passed in a pointer
+ *  If data is to be saved, parseCharWidths is passed in a pointer 
  *  to an array of widths that has already been initialized by the
  *  standard value for unmapped character codes. This function parses
  *  the Character Metrics section only storing the width information
  *  for the encoded characters into the array using the character code
  *  as the index into that array.
  *
- *  This function returns an error code specifying whether there was
- *  a premature EOF or a parsing error. This return value is used by
+ *  This function returns an error code specifying whether there was 
+ *  a premature EOF or a parsing error. This return value is used by 
  *  parseFile to determine if there is more file to parse.
  */
-
+ 
 static int parseCharWidths( FileInputStream* fp, register int* cwi)
-{
+{  
     bool cont = true, save = (cwi != NULL);
     int pos = 0, error = ok, tokenlen;
     register char *keyword;
-
+    
     while (cont)
     {
         keyword = token(fp,tokenlen);
@@ -673,19 +673,19 @@ static int parseCharWidths( FileInputStream* fp, register int* cwi)
             error = earlyEOF;
             break; /* get out of loop */
         }
-        if (!save)
+        if (!save)  
             /* get tokens until the end of the Char Metrics section without */
             /* saving any of the data*/
-            switch (recognize(keyword,tokenlen))
-            {
+            switch (recognize(keyword,tokenlen))  
+            {               
                 case ENDCHARMETRICS:
                     cont = false;
-                    break;
+                    break; 
                 case ENDFONTMETRICS:
                     cont = false;
                     error = normalEOF;
                     break;
-                default:
+                default: 
                     break;
             } /* switch */
         else
@@ -719,15 +719,15 @@ static int parseCharWidths( FileInputStream* fp, register int* cwi)
                     break;
                 case ENDCHARMETRICS:
                     cont = false;
-                    break;
+                    break; 
                 case ENDFONTMETRICS:
                     cont = false;
                     error = normalEOF;
                     break;
                 case CHARNAME:  /* eat values (so doesn't cause parseError) */
-                    keyword = token(fp,tokenlen);
+                    keyword = token(fp,tokenlen); 
                     break;
-                case CHARBBOX:
+                case CHARBBOX: 
                     keyword = token(fp,tokenlen); keyword = token(fp,tokenlen);
                     keyword = token(fp,tokenlen); keyword = token(fp,tokenlen);
                     break;
@@ -739,21 +739,21 @@ static int parseCharWidths( FileInputStream* fp, register int* cwi)
                     keyword = token(fp,tokenlen);
                     break;
                 case NOPE:
-                default:
+                default: 
                     error = parseError;
                     break;
             } /* switch */
     } /* while */
-
+    
     return(error);
-
-} /* parseCharWidths */
+    
+} /* parseCharWidths */    
 
 
 /*
  * number of char metrics is almost allways inaccurate, so be gentle and try to
  * adapt our internal storage by adjusting the allocated list
- */
+ */ 
 
 static int
 reallocFontMetrics( void **pp_fontmetrics, int *p_oldcount, int n_newcount, unsigned int n_size )
@@ -772,7 +772,7 @@ reallocFontMetrics( void **pp_fontmetrics, int *p_oldcount, int n_newcount, unsi
 
     if ( n_newcount > *p_oldcount )
     {
-        char *p_inimetrics = p_tmpmetrics + n_size * *p_oldcount;
+        char *p_inimetrics = p_tmpmetrics + n_size * *p_oldcount;  
         int   n_inimetrics = n_size * (n_newcount - *p_oldcount);
         memset( p_inimetrics, 0, n_inimetrics );
     }
@@ -790,7 +790,7 @@ enlargeCount( unsigned int n_oldcount )
     if (n_oldcount == n_newcount )
         n_newcount = n_oldcount + 5;
 
-    return n_newcount;
+    return n_newcount; 
 }
 
 /************************* parseCharMetrics ************************/
@@ -802,21 +802,21 @@ enlargeCount( unsigned int n_oldcount )
  *  parseCharMetrics is passed in a pointer to an array of records
  *  to hold information on a per character basis. This function
  *  parses the Character Metrics section storing all character
- *  metric information for the ALL characters (mapped and unmapped)
+ *  metric information for the ALL characters (mapped and unmapped) 
  *  into the array.
  *
- *  This function returns an error code specifying whether there was
- *  a premature EOF or a parsing error. This return value is used by
+ *  This function returns an error code specifying whether there was 
+ *  a premature EOF or a parsing error. This return value is used by 
  *  parseFile to determine if there is more file to parse.
  */
-
+ 
 static int parseCharMetrics( FileInputStream* fp, register FontInfo* fi)
-{
+{  
     bool cont = true, firstTime = true;
     int error = ok, count = 0, tokenlen;
     register CharMetricInfo *temp = fi->cmi;
     register char *keyword;
-
+  
     while (cont)
     {
         keyword = token(fp,tokenlen);
@@ -829,17 +829,17 @@ static int parseCharMetrics( FileInputStream* fp, register FontInfo* fi)
         {
             case COMMENT:
                 keyword = linetoken(fp);
-                break;
+                break; 
             case CODE:
                 if (!(count < fi->numOfChars))
                 {
-                    reallocFontMetrics( (void**)&(fi->cmi),
-                                        &(fi->numOfChars), enlargeCount(fi->numOfChars),
+                    reallocFontMetrics( (void**)&(fi->cmi), 
+                                        &(fi->numOfChars), enlargeCount(fi->numOfChars), 
                                         sizeof(CharMetricInfo) );
                     temp = &(fi->cmi[ count - 1 ]);
                 }
                 if (count < fi->numOfChars)
-                {
+                { 
                     if (firstTime) firstTime = false;
                     else temp++;
                     if ((keyword = token(fp,tokenlen)) != NULL)
@@ -857,8 +857,8 @@ static int parseCharMetrics( FileInputStream* fp, register FontInfo* fi)
             case CODEHEX:
                 if (!(count < fi->numOfChars ))
                 {
-                    reallocFontMetrics( (void**)&(fi->cmi),
-                                        &(fi->numOfChars), enlargeCount(fi->numOfChars),
+                    reallocFontMetrics( (void**)&(fi->cmi), 
+                                        &(fi->numOfChars), enlargeCount(fi->numOfChars), 
                                         sizeof(CharMetricInfo) );
                     temp = &(fi->cmi[ count - 1 ]);
                 }
@@ -883,20 +883,20 @@ static int parseCharMetrics( FileInputStream* fp, register FontInfo* fi)
                     temp->wx = atoi(keyword);
                 if ((keyword = token(fp,tokenlen)) != NULL)
                     temp->wy = atoi(keyword);
-                break;
+                break;                 
             case X0WIDTH:
                 if ((keyword = token(fp,tokenlen)) != NULL)
                     temp->wx = atoi(keyword);
                 break;
-            case XWIDTH:
+            case XWIDTH: 
                 if ((keyword = token(fp,tokenlen)) != NULL)
                     temp->wx = atoi(keyword);
                 break;
-            case CHARNAME:
+            case CHARNAME: 
                 if ((keyword = token(fp,tokenlen)) != NULL)
                     temp->name = (char *)strdup(keyword);
-                break;
-            case CHARBBOX:
+                break;            
+            case CHARBBOX: 
                 if ((keyword = token(fp,tokenlen)) != NULL)
                     temp->charBBox.llx = atoi(keyword);
                 if ((keyword = token(fp,tokenlen)) != NULL)
@@ -909,14 +909,14 @@ static int parseCharMetrics( FileInputStream* fp, register FontInfo* fi)
             case LIGATURE: {
                 Ligature **tail = &(temp->ligs);
                 Ligature *node = *tail;
-
+                
                 if (*tail != NULL)
                 {
                     while (node->next != NULL)
                         node = node->next;
-                    tail = &(node->next);
+                    tail = &(node->next); 
                 }
-
+                
                 *tail = (Ligature *) calloc(1, sizeof(Ligature));
                 if ((keyword = token(fp,tokenlen)) != NULL)
                     (*tail)->succ = (char *)strdup(keyword);
@@ -925,60 +925,60 @@ static int parseCharMetrics( FileInputStream* fp, register FontInfo* fi)
                 break; }
             case ENDCHARMETRICS:
                 cont = false;;
-                break;
-            case ENDFONTMETRICS:
+                break; 
+            case ENDFONTMETRICS: 
                 cont = false;
                 error = normalEOF;
-                break;
+                break; 
             case VVECTOR:
                 keyword = token(fp,tokenlen);
                 keyword = token(fp,tokenlen);
                 break;
             case NOPE:
             default:
-                error = parseError;
-                break;
+                error = parseError; 
+                break; 
         } /* switch */
     } /* while */
-
-    if ((error == ok) && (count != fi->numOfChars))
-        error = reallocFontMetrics( (void**)&(fi->cmi), &(fi->numOfChars),
+    
+    if ((error == ok) && (count != fi->numOfChars)) 
+        error = reallocFontMetrics( (void**)&(fi->cmi), &(fi->numOfChars), 
                                     count, sizeof(CharMetricInfo) );
 
     if ((error == ok) && (count != fi->numOfChars))
         error = parseError;
-
+    
     return(error);
-
-} /* parseCharMetrics */
+    
+} /* parseCharMetrics */    
 
 
 
 /************************* parseTrackKernData ***********************/
 
-/*  This function is called by "parseFile". It will parse the AFM file
+/*  This function is called by "parseFile". It will parse the AFM file 
  *  up to the "EndTrackKern" or "EndKernData" keywords. It will save the
  *  track kerning data if requested by the caller of parseFile.
  *
  *  parseTrackKernData is passed in a pointer to the FontInfo record.
- *  If data is to be saved, the FontInfo record will already contain
+ *  If data is to be saved, the FontInfo record will already contain 
  *  a valid pointer to storage for the track kerning data.
  *
- *  This function returns an error code specifying whether there was
- *  a premature EOF or a parsing error. This return value is used by
+ *  This function returns an error code specifying whether there was 
+ *  a premature EOF or a parsing error. This return value is used by 
  *  parseFile to determine if there is more file to parse.
  */
-
+ 
 static int parseTrackKernData( FileInputStream* fp, register FontInfo* fi)
-{
+{  
     bool cont = true, save = (fi->tkd != NULL);
     int pos = 0, error = ok, tcount = 0, tokenlen;
     register char *keyword;
-
+ 
     while (cont)
     {
         keyword = token(fp,tokenlen);
-
+        
         if (keyword == NULL)
         {
             error = earlyEOF;
@@ -1011,7 +1011,7 @@ static int parseTrackKernData( FileInputStream* fp, register FontInfo* fi)
                 case TRACKKERN:
                     if (!(tcount < fi->numOfTracks))
                     {
-                        reallocFontMetrics( (void**)&(fi->tkd), &(fi->numOfTracks),
+                        reallocFontMetrics( (void**)&(fi->tkd), &(fi->numOfTracks), 
                                             enlargeCount(fi->numOfTracks), sizeof(TrackKernData) );
                     }
 
@@ -1049,44 +1049,44 @@ static int parseTrackKernData( FileInputStream* fp, register FontInfo* fi)
                     break;
             } /* switch */
     } /* while */
-
+    
     if (error == ok && tcount != fi->numOfTracks)
-        error = reallocFontMetrics( (void**)&(fi->tkd), &(fi->numOfTracks),
+        error = reallocFontMetrics( (void**)&(fi->tkd), &(fi->numOfTracks), 
                                     tcount, sizeof(TrackKernData) );
 
     if (error == ok && tcount != fi->numOfTracks)
         error = parseError;
-
+        
     return(error);
-
-} /* parseTrackKernData */
+    
+} /* parseTrackKernData */    
 
 
 /************************* parsePairKernData ************************/
 
-/*  This function is called by "parseFile". It will parse the AFM file
+/*  This function is called by "parseFile". It will parse the AFM file 
  *  up to the "EndKernPairs" or "EndKernData" keywords. It will save
  *  the pair kerning data if requested by the caller of parseFile.
  *
  *  parsePairKernData is passed in a pointer to the FontInfo record.
- *  If data is to be saved, the FontInfo record will already contain
+ *  If data is to be saved, the FontInfo record will already contain 
  *  a valid pointer to storage for the pair kerning data.
  *
- *  This function returns an error code specifying whether there was
- *  a premature EOF or a parsing error. This return value is used by
+ *  This function returns an error code specifying whether there was 
+ *  a premature EOF or a parsing error. This return value is used by 
  *  parseFile to determine if there is more file to parse.
  */
-
+ 
 static int parsePairKernData( FileInputStream* fp, register FontInfo* fi)
-{
+{  
     bool cont = true, save = (fi->pkd != NULL);
     int pos = 0, error = ok, pcount = 0, tokenlen;
     register char *keyword;
-
+  
     while (cont)
     {
         keyword = token(fp,tokenlen);
-
+        
         if (keyword == NULL)
         {
             error = earlyEOF;
@@ -1119,7 +1119,7 @@ static int parsePairKernData( FileInputStream* fp, register FontInfo* fi)
                 case KERNPAIR:
                     if (!(pcount < fi->numOfPairs))
                     {
-                        reallocFontMetrics( (void**)&(fi->pkd), &(fi->numOfPairs),
+                        reallocFontMetrics( (void**)&(fi->pkd), &(fi->numOfPairs), 
                                             enlargeCount(fi->numOfPairs), sizeof(PairKernData) );
                     }
                     if (pcount < fi->numOfPairs)
@@ -1143,7 +1143,7 @@ static int parsePairKernData( FileInputStream* fp, register FontInfo* fi)
                 case KERNPAIRXAMT:
                     if (!(pcount < fi->numOfPairs))
                     {
-                        reallocFontMetrics( (void**)&(fi->pkd), &(fi->numOfPairs),
+                        reallocFontMetrics( (void**)&(fi->pkd), &(fi->numOfPairs), 
                                             enlargeCount(fi->numOfPairs), sizeof(PairKernData) );
                     }
                     if (pcount < fi->numOfPairs)
@@ -1176,43 +1176,43 @@ static int parsePairKernData( FileInputStream* fp, register FontInfo* fi)
                     break;
             } /* switch */
     } /* while */
-
-    if ((error == ok) && (pcount != fi->numOfPairs))
-        error = reallocFontMetrics( (void**)&(fi->pkd), &(fi->numOfPairs),
+    
+    if ((error == ok) && (pcount != fi->numOfPairs)) 
+        error = reallocFontMetrics( (void**)&(fi->pkd), &(fi->numOfPairs), 
                                     pcount, sizeof(PairKernData) );
 
     if (error == ok && pcount != fi->numOfPairs)
         error = parseError;
-
+        
     return(error);
-
-} /* parsePairKernData */
+    
+} /* parsePairKernData */    
 
 
 /************************* parseCompCharData **************************/
 
-/*  This function is called by "parseFile". It will parse the AFM file
- *  up to the "EndComposites" keyword. It will save the composite
+/*  This function is called by "parseFile". It will parse the AFM file 
+ *  up to the "EndComposites" keyword. It will save the composite 
  *  character data if requested by the caller of parseFile.
  *
- *  parseCompCharData is passed in a pointer to the FontInfo record, and
+ *  parseCompCharData is passed in a pointer to the FontInfo record, and 
  *  a boolean representing if the data should be saved.
  *
  *  This function will create the appropriate amount of storage for
  *  the composite character data and store a pointer to the storage
  *  in the FontInfo record.
  *
- *  This function returns an error code specifying whether there was
- *  a premature EOF or a parsing error. This return value is used by
+ *  This function returns an error code specifying whether there was 
+ *  a premature EOF or a parsing error. This return value is used by 
  *  parseFile to determine if there is more file to parse.
  */
-
+ 
 static int parseCompCharData( FileInputStream* fp, register FontInfo* fi)
-{
+{  
     bool cont = true, firstTime = true, save = (fi->ccd != NULL);
     int pos = 0, j = 0, error = ok, ccount = 0, pcount = 0, tokenlen;
     register char *keyword;
-
+  
     while (cont)
     {
         keyword = token(fp,tokenlen);
@@ -1225,7 +1225,7 @@ static int parseCompCharData( FileInputStream* fp, register FontInfo* fi)
         }
         if (ccount > fi->numOfComps)
         {
-            reallocFontMetrics( (void**)&(fi->ccd), &(fi->numOfComps),
+            reallocFontMetrics( (void**)&(fi->ccd), &(fi->numOfComps), 
                                 enlargeCount(fi->numOfComps), sizeof(CompCharData) );
         }
         if (ccount > fi->numOfComps)
@@ -1263,7 +1263,7 @@ static int parseCompCharData( FileInputStream* fp, register FontInfo* fi)
                 case COMPCHAR:
                     if (!(ccount < fi->numOfComps))
                     {
-                        reallocFontMetrics( (void**)&(fi->ccd), &(fi->numOfComps),
+                        reallocFontMetrics( (void**)&(fi->ccd), &(fi->numOfComps), 
                                             enlargeCount(fi->numOfComps), sizeof(CompCharData) );
                     }
                     if (ccount < fi->numOfComps)
@@ -1315,27 +1315,27 @@ static int parseCompCharData( FileInputStream* fp, register FontInfo* fi)
                     break;
             } /* switch */
     } /* while */
-
+    
     if (error == ok && ccount != fi->numOfComps)
-        reallocFontMetrics( (void**)&(fi->ccd), &(fi->numOfComps),
+        reallocFontMetrics( (void**)&(fi->ccd), &(fi->numOfComps), 
                             ccount, sizeof(CompCharData) );
 
     if (error == ok && ccount != fi->numOfComps)
         error = parseError;
-
+    
     return(error);
-
-} /* parseCompCharData */
+    
+} /* parseCompCharData */    
 
 
 
 
-/*************************** 'PUBLIC' FUNCTION ********************/
+/*************************** 'PUBLIC' FUNCTION ********************/ 
 
 
 /*************************** parseFile *****************************/
 
-/*  parseFile is the only 'public' procedure available. It is called
+/*  parseFile is the only 'public' procedure available. It is called 
  *  from an application wishing to get information from an AFM file.
  *  The caller of this function is responsible for locating and opening
  *  an AFM file and handling all errors associated with that task.
@@ -1345,41 +1345,41 @@ static int parseCompCharData( FileInputStream* fp, register FontInfo* fi)
  *  the data requested filled in), and a mask specifying which
  *  data from the AFM file should be saved in the FontInfo structure.
  *
- *  The file will be parsed and the requested data will be stored in
+ *  The file will be parsed and the requested data will be stored in 
  *  a record of type FontInfo (refer to ParseAFM.h).
  *
- *  parseFile returns an error code as defined in parseAFM.h.
+ *  parseFile returns an error code as defined in parseAFM.h. 
  *
- *  The position of the read/write pointer associated with the file
+ *  The position of the read/write pointer associated with the file 
  *  pointer upon return of this function is undefined.
  */
 
 int parseFile( const char* pFilename, FontInfo** fi, FLAGS flags)
 {
     FileInputStream aFile( pFilename );
-
+    
     int code = ok;  /* return code from each of the parsing routines */
     int error = ok; /* used as the return code from this function */
     int tokenlen;
-
-    register char *keyword; /* used to store a token */
-
+    
+    register char *keyword; /* used to store a token */  
+    
 
     (*fi) = (FontInfo *) calloc(1, sizeof(FontInfo));
-    if ((*fi) == NULL) {error = storageProblem; return(error);}
-
-    if (flags & P_G)
+    if ((*fi) == NULL) {error = storageProblem; return(error);}      
+  
+    if (flags & P_G) 
     {
         (*fi)->gfi = (GlobalFontInfo *) calloc(1, sizeof(GlobalFontInfo));
-        if ((*fi)->gfi == NULL) {error = storageProblem; return(error);}
+        if ((*fi)->gfi == NULL) {error = storageProblem; return(error);}      
     }
-
+    
     /* The AFM file begins with Global Font Information. This section */
-    /* will be parsed whether or not information should be saved. */
-    code = parseGlobals(&aFile, (*fi)->gfi);
-
+    /* will be parsed whether or not information should be saved. */     
+    code = parseGlobals(&aFile, (*fi)->gfi); 
+    
     if (code < 0) error = code;
-
+    
     /* The Global Font Information is followed by the Character Metrics */
     /* section. Which procedure is used to parse this section depends on */
     /* how much information should be saved. If all of the metrics info */
@@ -1387,26 +1387,26 @@ int parseFile( const char* pFilename, FontInfo** fi, FLAGS flags)
     /* is wanted, parseCharWidths is called. parseCharWidths will also */
     /* be called in the case that no character data is to be saved, just */
     /* to parse through the section. */
-
+  
     if ((code != normalEOF) && (code != earlyEOF))
     {
         if ((keyword = token(&aFile,tokenlen)) != NULL)
             (*fi)->numOfChars = atoi(keyword);
         if (flags & (P_M ^ P_W))
         {
-            (*fi)->cmi = (CharMetricInfo *)
+            (*fi)->cmi = (CharMetricInfo *) 
                 calloc((*fi)->numOfChars, sizeof(CharMetricInfo));
             if ((*fi)->cmi == NULL) {error = storageProblem; return(error);}
-            code = parseCharMetrics(&aFile, *fi);
+            code = parseCharMetrics(&aFile, *fi);             
         }
         else
         {
             if (flags & P_W)
-            {
-                (*fi)->cwi = (int *) calloc(256, sizeof(int));
-                if ((*fi)->cwi == NULL)
+            { 
+                (*fi)->cwi = (int *) calloc(256, sizeof(int)); 
+                if ((*fi)->cwi == NULL) 
                 {
-                    error = storageProblem;
+                    error = storageProblem; 
                     return(error);
                 }
             }
@@ -1414,15 +1414,15 @@ int parseFile( const char* pFilename, FontInfo** fi, FLAGS flags)
             code = parseCharWidths(&aFile, (*fi)->cwi);
         } /* else */
     } /* if */
-
+    
     if ((error != earlyEOF) && (code < 0)) error = code;
-
+    
     /* The remaining sections of the AFM are optional. This code will */
     /* look at the next keyword in the file to determine what section */
     /* is next, and then allocate the appropriate amount of storage */
     /* for the data (if the data is to be saved) and call the */
     /* appropriate parsing routine to parse the section. */
-
+    
     while ((code != normalEOF) && (code != earlyEOF))
     {
         keyword = token(&aFile,tokenlen);
@@ -1444,11 +1444,11 @@ int parseFile( const char* pFilename, FontInfo** fi, FLAGS flags)
                 if ((flags & P_T) && keyword)
                 {
                     (*fi)->numOfTracks = atoi(keyword);
-                    (*fi)->tkd = (TrackKernData *)
+                    (*fi)->tkd = (TrackKernData *) 
                         calloc((*fi)->numOfTracks, sizeof(TrackKernData));
-                    if ((*fi)->tkd == NULL)
+                    if ((*fi)->tkd == NULL) 
                     {
-                        error = storageProblem;
+                        error = storageProblem; 
                         return(error);
                     }
                 } /* if */
@@ -1459,11 +1459,11 @@ int parseFile( const char* pFilename, FontInfo** fi, FLAGS flags)
                 if ((flags & P_P) && keyword)
                 {
                     (*fi)->numOfPairs = atoi(keyword);
-                    (*fi)->pkd = (PairKernData *)
+                    (*fi)->pkd = (PairKernData *) 
                         calloc((*fi)->numOfPairs, sizeof(PairKernData));
-                    if ((*fi)->pkd == NULL)
+                    if ((*fi)->pkd == NULL) 
                     {
-                        error = storageProblem;
+                        error = storageProblem; 
                         return(error);
                     }
                 } /* if */
@@ -1472,18 +1472,18 @@ int parseFile( const char* pFilename, FontInfo** fi, FLAGS flags)
             case STARTCOMPOSITES:
                 keyword = token(&aFile,tokenlen);
                 if ((flags & P_C) && keyword)
-                {
+                { 
                     (*fi)->numOfComps = atoi(keyword);
-                    (*fi)->ccd = (CompCharData *)
+                    (*fi)->ccd = (CompCharData *) 
                         calloc((*fi)->numOfComps, sizeof(CompCharData));
-                    if ((*fi)->ccd == NULL)
+                    if ((*fi)->ccd == NULL) 
                     {
-                        error = storageProblem;
+                        error = storageProblem; 
                         return(error);
                     }
                 } /* if */
-                code = parseCompCharData(&aFile, *fi);
-                break;
+                code = parseCompCharData(&aFile, *fi); 
+                break;    
             case ENDFONTMETRICS:
                 code = normalEOF;
                 break;
@@ -1495,15 +1495,15 @@ int parseFile( const char* pFilename, FontInfo** fi, FLAGS flags)
                 code = parseError;
                 break;
         } /* switch */
-
+        
         if ((error != earlyEOF) && (code < 0)) error = code;
-
+        
     } /* while */
-
+  
     if ((error != earlyEOF) && (code < 0)) error = code;
-
+    
     return(error);
-
+  
 } /* parseFile */
 
 void
diff --git a/vcl/unx/source/fontmanager/parseAFM.hxx b/vcl/unx/source/fontmanager/parseAFM.hxx
index cfebde696c14..60cf5db929a3 100644
--- a/vcl/unx/source/fontmanager/parseAFM.hxx
+++ b/vcl/unx/source/fontmanager/parseAFM.hxx
@@ -2,20 +2,20 @@
  * (C) 1988, 1989 by Adobe Systems Incorporated. All rights reserved.
  *
  * This file may be freely copied and redistributed as long as:
- *   1) This entire notice continues to be included in the file,
+ *   1) This entire notice continues to be included in the file, 
  *   2) If the file has been modified in any way, a notice of such
  *      modification is conspicuously indicated.
  *
  * PostScript, Display PostScript, and Adobe are registered trademarks of
  * Adobe Systems Incorporated.
- *
+ * 
  * ************************************************************************
  * THE INFORMATION BELOW IS FURNISHED AS IS, IS SUBJECT TO CHANGE WITHOUT
  * NOTICE, AND SHOULD NOT BE CONSTRUED AS A COMMITMENT BY ADOBE SYSTEMS
- * INCORPORATED. ADOBE SYSTEMS INCORPORATED ASSUMES NO RESPONSIBILITY OR
- * LIABILITY FOR ANY ERRORS OR INACCURACIES, MAKES NO WARRANTY OF ANY
- * KIND (EXPRESS, IMPLIED OR STATUTORY) WITH RESPECT TO THIS INFORMATION,
- * AND EXPRESSLY DISCLAIMS ANY AND ALL WARRANTIES OF MERCHANTABILITY,
+ * INCORPORATED. ADOBE SYSTEMS INCORPORATED ASSUMES NO RESPONSIBILITY OR 
+ * LIABILITY FOR ANY ERRORS OR INACCURACIES, MAKES NO WARRANTY OF ANY 
+ * KIND (EXPRESS, IMPLIED OR STATUTORY) WITH RESPECT TO THIS INFORMATION, 
+ * AND EXPRESSLY DISCLAIMS ANY AND ALL WARRANTIES OF MERCHANTABILITY, 
  * FITNESS FOR PARTICULAR PURPOSES AND NONINFRINGEMENT OF THIRD PARTY RIGHTS.
  * ************************************************************************
  */
@@ -40,23 +40,23 @@
  * Together these files provide the functionality to parse Adobe Font
  * Metrics files and store the information in predefined data structures.
  * It is intended to work with an application program that needs font metric
- * information. The program can be used as is by making a procedure call to
+ * information. The program can be used as is by making a procedure call to 
  * parse an AFM file and have the data stored, or an application developer
- * may wish to customize the code.
+ * may wish to customize the code. 
  *
- * This header file defines the data structures used as well as the key
+ * This header file defines the data structures used as well as the key 
  * strings that are currently recognized by this version of the AFM parser.
- * This program is based on the document "Adobe Font Metrics Files,
+ * This program is based on the document "Adobe Font Metrics Files, 
  * Specification Version 2.0".
  *
  * AFM files are separated into distinct sections of different data. Because
  * of this, the parseAFM program can parse a specified file to only save
- * certain sections of information based on the application's needs. A record
+ * certain sections of information based on the application's needs. A record 
  * containing the requested information will be returned to the application.
- *
+ * 
  * AFM files are divided into five sections of data:
  *  1) The Global Font Information
- *  2) The Character Metrics Information
+ *  2) The Character Metrics Information 
  *  3) The Track Kerning Data
  *  4) The Pair-Wise Kerning Data
  *  5) The Composite Character Data
@@ -65,22 +65,22 @@
  * of what other sections are requested. In addition, in recognizing that
  * many applications will want ONLY the x-width of characters and not all
  * of the other character metrics information, there is a way to receive
- * only the width information so as not to pay the storage cost for the
- * unwanted data. An application should never request both the
- * "quick and dirty" char metrics (widths only) and the Character Metrics
- * Information since the Character Metrics Information will contain all
+ * only the width information so as not to pay the storage cost for the 
+ * unwanted data. An application should never request both the 
+ * "quick and dirty" char metrics (widths only) and the Character Metrics 
+ * Information since the Character Metrics Information will contain all 
  * of the character widths as well.
- *
- * There is a procedure in parseAFM.c, called parseFile, that can be
+ * 
+ * There is a procedure in parseAFM.c, called parseFile, that can be 
  * called from any application wishing to get information from the AFM File.
  * This procedure expects 3 parameters: a vaild file descriptor, a pointer
- * to a (FontInfo *) variable (for which space will be allocated and then
+ * to a (FontInfo *) variable (for which space will be allocated and then 
  * will be filled in with the data requested), and a mask specifying
  * which data from the AFM File should be saved in the FontInfo structure.
- *
+ * 
  * The flags that can be used to set the appropriate mask are defined below.
- * In addition, several commonly used masks have already been defined.
- *
+ * In addition, several commonly used masks have already been defined. 
+ * 
  * History:
  *  original: DSM  Thu Oct 20 17:39:59 PDT 1988
  *  modified: DSM  Mon Jul  3 14:17:50 PDT 1989
@@ -112,27 +112,27 @@ namespace psp {
 
 /* Commonly used flags
  */
-#define P_GW    (P_G | P_W)
+#define P_GW    (P_G | P_W) 
 #define P_GM    (P_G | P_M)
 #define P_GMP   (P_G | P_M | P_P)
-#define P_GMK   (P_G | P_M | P_P | P_T)
+#define P_GMK   (P_G | P_M | P_P | P_T) 
 #define P_ALL   (P_G | P_M | P_P | P_T | P_C)
 
 
 
 /* Possible return codes from the parseFile procedure.
- *
+ * 
  * ok means there were no problems parsing the file.
  *
  * parseError means that there was some kind of parsing error, but the
  * parser went on. This could include problems like the count for any given
  * section does not add up to how many entries there actually were, or
  * there was a key that was not recognized. The return record may contain
- * vaild data or it may not.
+ * vaild data or it may not. 
  *
  * earlyEOF means that an End of File was encountered before expected. This
  * may mean that the AFM file had been truncated, or improperly formed.
- *
+ * 
  * storageProblem means that there were problems allocating storage for
  * the data structures that would have contained the AFM data.
  */
@@ -142,16 +142,16 @@ enum afmError { ok = 0, parseError = -1, earlyEOF = -2, storageProblem = -3 };
 
 /************************* TYPES *********************************/
 /* Below are all of the data structure definitions. These structures
- * try to map as closely as possible to grouping and naming of data
+ * try to map as closely as possible to grouping and naming of data 
  * in the AFM Files.
  */
 
 
-/* Bounding box definition. Used for the Font BBox as well as the
+/* Bounding box definition. Used for the Font BBox as well as the 
  * Character BBox.
  */
 typedef struct
-{
+{ 
     int llx;    /* lower left x-position  */
     int lly;    /* lower left y-position  */
     int urx;    /* upper right x-position */
@@ -160,12 +160,12 @@ typedef struct
 
 
 /* Global Font information.
- * The key that each field is associated with is in comments. For an
+ * The key that each field is associated with is in comments. For an 
  * explanation about each key and its value please refer to the AFM
- * documentation (full title & version given above).
+ * documentation (full title & version given above). 
  */
 typedef struct
-{
+{  
     char *afmVersion;       /* key: StartFontMetrics */
     char *fontName;     /* key: FontName */
     char *fullName;     /* key: FullName */
@@ -197,15 +197,15 @@ typedef struct _t_ligature
 } Ligature;
 
 
-/* Character Metric Information. This structure is used only if ALL
+/* Character Metric Information. This structure is used only if ALL 
  * character metric information is requested. If only the character
  * widths is requested, then only an array of the character x-widths
  * is returned.
  *
- * The key that each field is associated with is in comments. For an
- * explanation about each key and its value please refer to the
+ * The key that each field is associated with is in comments. For an 
+ * explanation about each key and its value please refer to the 
  * Character Metrics section of the AFM documentation (full title
- * & version given above).
+ * & version given above). 
  */
 typedef struct
 {
@@ -220,19 +220,19 @@ typedef struct
 
 
 /* Track kerning data structure.
- * The fields of this record are the five values associated with every
+ * The fields of this record are the five values associated with every 
  * TrackKern entry.
- *
- * For an explanation about each value please refer to the
+ *  
+ * For an explanation about each value please refer to the 
  * Track Kerning section of the AFM documentation (full title
- * & version given above).
+ * & version given above). 
  */
-typedef struct
+typedef struct 
 {
-    int degree;
-    float minPtSize,
-        minKernAmt,
-        maxPtSize,
+    int degree;  
+    float minPtSize, 
+        minKernAmt, 
+        maxPtSize, 
         maxKernAmt;
 } TrackKernData;
 
@@ -241,11 +241,11 @@ typedef struct
  * The fields of this record are the four values associated with every
  * KP entry. For KPX entries, the yamt will be zero.
  *
- * For an explanation about each value please refer to the
+ * For an explanation about each value please refer to the 
  * Pair Kerning section of the AFM documentation (full title
- * & version given above).
+ * & version given above). 
  */
-typedef struct
+typedef struct 
 {
     char *name1;
     char *name2;
@@ -257,10 +257,10 @@ typedef struct
 /* PCC is a piece of a composite character. This is a sub structure of a
  * compCharData described below.
  * These fields will be filled in with the values from the key PCC.
- *
- * For an explanation about each key and its value please refer to the
+ * 
+ * For an explanation about each key and its value please refer to the 
  * Composite Character section of the AFM documentation (full title
- * & version given above).
+ * & version given above).  
  */
 typedef struct
 {
@@ -270,15 +270,15 @@ typedef struct
 } Pcc;
 
 
-/* Composite Character Information data structure.
+/* Composite Character Information data structure. 
  * The fields ccName and numOfPieces are filled with the values associated
  * with the key CC. The field pieces points to an array (size = numOfPieces)
  * of information about each of the parts of the composite character. That
  * array is filled in with the values from the key PCC.
- *
- * For an explanation about each key and its value please refer to the
+ * 
+ * For an explanation about each key and its value please refer to the 
  * Composite Character section of the AFM documentation (full title
- * & version given above).
+ * & version given above).  
  */
 typedef struct
 {
@@ -295,9 +295,9 @@ typedef struct
  *  parseFile function.
  */
 typedef struct
-{
+{ 
     GlobalFontInfo *gfi;    /* ptr to a GlobalFontInfo record */
-    int *cwi;           /* ptr to 256 element array of just char widths */
+    int *cwi;           /* ptr to 256 element array of just char widths */ 
     int numOfChars;     /* number of entries in char metrics array */
     CharMetricInfo *cmi;    /* ptr to char metrics array */
     int numOfTracks;        /* number to entries in track kerning array */
@@ -316,7 +316,7 @@ typedef struct
  *
  *  "fp" should be a valid file pointer to an AFM file.
  *
- *  "fi" is a pointer to a pointer to a FontInfo record sturcture
+ *  "fi" is a pointer to a pointer to a FontInfo record sturcture 
  *  (defined above). Storage for the FontInfo structure will be
  *  allocated in parseFile and the structure will be filled in
  *  with the requested data from the AFM File.
@@ -328,7 +328,7 @@ typedef struct
  *  The possible return codes from parseFile are defined above.
  */
 
-int parseFile( const char* pFilename, FontInfo **fi, FLAGS flags );
+int parseFile( const char* pFilename, FontInfo **fi, FLAGS flags ); 
 void freeFontInfo(FontInfo *fi);
 
 } // namespace
diff --git a/vcl/unx/source/gdi/cdeint.cxx b/vcl/unx/source/gdi/cdeint.cxx
index caa4867af874..3d4fea382f24 100644
--- a/vcl/unx/source/gdi/cdeint.cxx
+++ b/vcl/unx/source/gdi/cdeint.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
@@ -73,9 +73,9 @@ void CDEIntegrator::GetSystemLook( AllSettings& rSettings )
         XTextProperty aTextProperty;
         aTextProperty.value = 0;
         int i;
-
+        
         static Atom nResMgrAtom = XInternAtom( mpDisplay, "RESOURCE_MANAGER", False );
-
+        
         if( XGetTextProperty( mpDisplay,
                               RootWindow( mpDisplay, 0 ),
                               &aTextProperty,
@@ -123,7 +123,7 @@ void CDEIntegrator::GetSystemLook( AllSettings& rSettings )
                     for( ; nPos >= 0 && aLine.GetChar( nPos ) != '*'; nPos-- )
                         ;
                     int nNumber = aLine.Copy( ++nPos ).ToInt32();
-
+                    
                     DBG_TRACE2( "found palette %d in resource \"%s\"", nNumber, aLine.GetBuffer() );
 
                     // found no documentation what this number actually means;
@@ -133,7 +133,7 @@ void CDEIntegrator::GetSystemLook( AllSettings& rSettings )
                         continue;
 
                     DBG_TRACE1( "Palette file is \"%s\".\n", aPaletteFile.GetBuffer() );
-
+                    
                     String aPath( aHomeDir );
                     aPath.AppendAscii( "/.dt/palettes/" );
                     aPath += String( aPaletteFile, gsl_getSystemTextEncoding() );
@@ -162,12 +162,12 @@ void CDEIntegrator::GetSystemLook( AllSettings& rSettings )
                             aColors[nIndex] = Color(
                                 getHexDigit( pArr[1] )
                                 | ( getHexDigit( pArr[0] ) << 4 ),
-                                getHexDigit( pArr[5] )
+                                getHexDigit( pArr[5] ) 
                                 | ( getHexDigit( pArr[4] ) << 4 ),
                                 getHexDigit( pArr[9] )
                                 | ( getHexDigit( pArr[8] ) << 4 )
                                 );
-
+                            
                             DBG_TRACE1( "\t\t%lx\n", aColors[nIndex].GetColor() );
                         }
                     }
@@ -177,14 +177,14 @@ void CDEIntegrator::GetSystemLook( AllSettings& rSettings )
                 }
             }
         }
-
+        
         if( ppStringList )
             XFreeStringList( ppStringList );
         if( aTextProperty.value )
             XFree( aTextProperty.value );
     }
 
-
+    
     StyleSettings aStyleSettings = rSettings.GetStyleSettings();
     // #i48001# set a default blink rate
     aStyleSettings.SetCursorBlinkTime( 500 );
@@ -199,13 +199,13 @@ void CDEIntegrator::GetSystemLook( AllSettings& rSettings )
         aStyleSettings.SetDeactiveBorderColor( aColors[0] );
 
         Color aActive =
-            aColors[ 0 ].GetBlue() < 128        ||
-            aColors[ 0 ].GetGreen() < 128       ||
+            aColors[ 0 ].GetBlue() < 128		||
+            aColors[ 0 ].GetGreen() < 128		||
             aColors[ 0 ].GetRed() < 128
             ? Color( COL_WHITE ) : Color( COL_BLACK );
         Color aDeactive =
-            aColors[ 1 ].GetBlue() < 128        ||
-            aColors[ 1 ].GetGreen() < 128       ||
+            aColors[ 1 ].GetBlue() < 128		||
+            aColors[ 1 ].GetGreen() < 128		||
             aColors[ 1 ].GetRed() < 128
             ? Color( COL_WHITE ) : Color( COL_BLACK );
         aStyleSettings.SetActiveTextColor( aActive );
diff --git a/vcl/unx/source/gdi/dtint.cxx b/vcl/unx/source/gdi/dtint.cxx
index 5f0dbd50ea17..2eb3c83f0a5b 100644
--- a/vcl/unx/source/gdi/dtint.cxx
+++ b/vcl/unx/source/gdi/dtint.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
diff --git a/vcl/unx/source/gdi/dtsetenum.hxx b/vcl/unx/source/gdi/dtsetenum.hxx
index 5406ac870a43..87990d08a80c 100644
--- a/vcl/unx/source/gdi/dtsetenum.hxx
+++ b/vcl/unx/source/gdi/dtsetenum.hxx
@@ -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
diff --git a/vcl/unx/source/gdi/gcach_xpeer.cxx b/vcl/unx/source/gdi/gcach_xpeer.cxx
index a69a2426b519..8b2048609999 100644
--- a/vcl/unx/source/gdi/gcach_xpeer.cxx
+++ b/vcl/unx/source/gdi/gcach_xpeer.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
@@ -152,7 +152,7 @@ void X11GlyphPeer::InitAntialiasing()
 
 enum { INFO_EMPTY=0, INFO_PIXMAP, INFO_XRENDER, INFO_RAWBMP, INFO_MULTISCREEN };
 static const Glyph NO_GLYPHID = 0;
-static RawBitmap* const NO_RAWBMP = NULL;
+static RawBitmap* const NO_RAWBMP = NULL; 
 static const Pixmap NO_PIXMAP = ~0;
 
 // ---------------------------------------------------------------------------
@@ -516,7 +516,7 @@ Pixmap X11GlyphPeer::GetPixmap( ServerFont& rServerFont, int nGlyphIndex, int nR
                     *pTemp = lsb2msb[ *pTemp ];
 
                 // often a glyph pixmap is only needed on the default screen
-                // => optimize for this common case
+                // => optimize for this common case 
                 int nMinScreen = 0;
                 int nEndScreen = mnMaxScreens;
                 if( nReqScreen == mnDefaultScreen ) {
@@ -642,7 +642,7 @@ Glyph X11GlyphPeer::GetGlyphId( ServerFont& rServerFont, int nGlyphIndex )
 // ===========================================================================
 
 X11GlyphCache::X11GlyphCache( X11GlyphPeer& rPeer )
-:   GlyphCache( rPeer )
+:	GlyphCache( rPeer )
 {
 }
 
diff --git a/vcl/unx/source/gdi/gcach_xpeer.hxx b/vcl/unx/source/gdi/gcach_xpeer.hxx
index 13277fa975de..b02e33c7656d 100644
--- a/vcl/unx/source/gdi/gcach_xpeer.hxx
+++ b/vcl/unx/source/gdi/gcach_xpeer.hxx
@@ -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
diff --git a/vcl/unx/source/gdi/pspgraphics.cxx b/vcl/unx/source/gdi/pspgraphics.cxx
index d3eb103b9dd6..e62d72c172dc 100644
--- a/vcl/unx/source/gdi/pspgraphics.cxx
+++ b/vcl/unx/source/gdi/pspgraphics.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
@@ -62,29 +62,29 @@ using namespace rtl;
 class SalPrinterBmp : public psp::PrinterBmp
 {
     private:
-    BitmapBuffer*       mpBmpBuffer;
+    BitmapBuffer*		mpBmpBuffer;
 
-    FncGetPixel         mpFncGetPixel;
-    Scanline            mpScanAccess;
-    sal_PtrDiff         mnScanOffset;
+    FncGetPixel			mpFncGetPixel;
+    Scanline			mpScanAccess;
+    sal_PtrDiff			mnScanOffset;
 
-    sal_uInt32          ColorOf (BitmapColor& rColor) const;
-    sal_uInt8           GrayOf  (BitmapColor& rColor) const;
+    sal_uInt32			ColorOf (BitmapColor& rColor) const;
+    sal_uInt8			GrayOf  (BitmapColor& rColor) const;
 
     SalPrinterBmp ();
 
     public:
 
                             SalPrinterBmp (BitmapBuffer* pBitmap);
-        virtual             ~SalPrinterBmp ();
-        virtual sal_uInt32  GetPaletteColor (sal_uInt32 nIdx) const;
-        virtual sal_uInt32  GetPaletteEntryCount () const;
-        virtual sal_uInt32  GetPixelRGB  (sal_uInt32 nRow, sal_uInt32 nColumn) const;
-        virtual sal_uInt8   GetPixelGray (sal_uInt32 nRow, sal_uInt32 nColumn) const;
-        virtual sal_uInt8   GetPixelIdx  (sal_uInt32 nRow, sal_uInt32 nColumn) const;
-        virtual sal_uInt32  GetWidth () const;
-        virtual sal_uInt32  GetHeight() const;
-        virtual sal_uInt32  GetDepth () const;
+        virtual				~SalPrinterBmp ();
+        virtual sal_uInt32	GetPaletteColor (sal_uInt32 nIdx) const;
+        virtual sal_uInt32	GetPaletteEntryCount () const;
+        virtual sal_uInt32	GetPixelRGB  (sal_uInt32 nRow, sal_uInt32 nColumn) const;
+        virtual sal_uInt8	GetPixelGray (sal_uInt32 nRow, sal_uInt32 nColumn) const;
+        virtual sal_uInt8	GetPixelIdx  (sal_uInt32 nRow, sal_uInt32 nColumn) const;
+        virtual sal_uInt32	GetWidth () const;
+        virtual sal_uInt32	GetHeight() const;
+        virtual sal_uInt32	GetDepth ()	const;
 };
 
 SalPrinterBmp::SalPrinterBmp (BitmapBuffer* pBuffer) :
@@ -109,17 +109,17 @@ SalPrinterBmp::SalPrinterBmp (BitmapBuffer* pBuffer) :
     switch( BMP_SCANLINE_FORMAT( mpBmpBuffer->mnFormat ) )
     {
         case BMP_FORMAT_1BIT_MSB_PAL:
-            mpFncGetPixel = BitmapReadAccess::GetPixelFor_1BIT_MSB_PAL;  break;
+            mpFncGetPixel = BitmapReadAccess::GetPixelFor_1BIT_MSB_PAL;	 break;
         case BMP_FORMAT_1BIT_LSB_PAL:
-            mpFncGetPixel = BitmapReadAccess::GetPixelFor_1BIT_LSB_PAL;  break;
+            mpFncGetPixel = BitmapReadAccess::GetPixelFor_1BIT_LSB_PAL;	 break;
         case BMP_FORMAT_4BIT_MSN_PAL:
-            mpFncGetPixel = BitmapReadAccess::GetPixelFor_4BIT_MSN_PAL;  break;
+            mpFncGetPixel = BitmapReadAccess::GetPixelFor_4BIT_MSN_PAL;	 break;
         case BMP_FORMAT_4BIT_LSN_PAL:
-            mpFncGetPixel = BitmapReadAccess::GetPixelFor_4BIT_LSN_PAL;  break;
+            mpFncGetPixel = BitmapReadAccess::GetPixelFor_4BIT_LSN_PAL;	 break;
         case BMP_FORMAT_8BIT_PAL:
-            mpFncGetPixel = BitmapReadAccess::GetPixelFor_8BIT_PAL;      break;
+            mpFncGetPixel = BitmapReadAccess::GetPixelFor_8BIT_PAL; 	 break;
         case BMP_FORMAT_8BIT_TC_MASK:
-            mpFncGetPixel = BitmapReadAccess::GetPixelFor_8BIT_TC_MASK;  break;
+            mpFncGetPixel = BitmapReadAccess::GetPixelFor_8BIT_TC_MASK;	 break;
         case BMP_FORMAT_16BIT_TC_MSB_MASK:
             mpFncGetPixel = BitmapReadAccess::GetPixelFor_16BIT_TC_MSB_MASK; break;
         case BMP_FORMAT_16BIT_TC_LSB_MASK:
@@ -200,7 +200,7 @@ SalPrinterBmp::ColorOf (BitmapColor& rColor) const
     if (rColor.IsIndex())
         return ColorOf (mpBmpBuffer->maPalette[rColor.GetIndex()]);
     else
-        return    ((rColor.GetBlue())        & 0x000000ff)
+        return 	  ((rColor.GetBlue()) 		 & 0x000000ff)
                 | ((rColor.GetGreen() <<  8) & 0x0000ff00)
                 | ((rColor.GetRed()   << 16) & 0x00ff0000);
 }
@@ -390,7 +390,7 @@ void PspGraphics::drawPolygon( ULONG nPoints, const SalPoint* pPtAry )
     m_pPrinterGfx->DrawPolygon (nPoints, (Point*)pPtAry);
 }
 
-void PspGraphics::drawPolyPolygon( sal_uInt32           nPoly,
+void PspGraphics::drawPolyPolygon( sal_uInt32			nPoly,
                                    const sal_uInt32   *pPoints,
                                    PCONSTSALPOINT  *pPtAry )
 {
@@ -565,8 +565,8 @@ PspFontLayout::PspFontLayout( ::psp::PrinterGfx& rGfx )
     mnFontHeight = mrPrinterGfx.GetFontHeight();
     mnFontWidth  = mrPrinterGfx.GetFontWidth();
     mbVertical   = mrPrinterGfx.GetFontVertical();
-    mbArtItalic  = mrPrinterGfx.GetArtificialItalic();
-    mbArtBold    = mrPrinterGfx.GetArtificialBold();
+    mbArtItalic	 = mrPrinterGfx.GetArtificialItalic();
+    mbArtBold	 = mrPrinterGfx.GetArtificialBold();
 }
 
 //--------------------------------------------------------------------------
@@ -654,19 +654,19 @@ public:
     PspServerFontLayout( psp::PrinterGfx&, ServerFont& rFont, const ImplLayoutArgs& rArgs );
 
     virtual void        InitFont() const;
-    const sal_Unicode*  getTextPtr() const { return maText.getStr() - mnMinCharPos; }
-    int                 getMinCharPos() const { return mnMinCharPos; }
-    int                 getMaxCharPos() const { return mnMinCharPos+maText.getLength()-1; }
+    const sal_Unicode*	getTextPtr() const { return maText.getStr() - mnMinCharPos; }
+    int					getMinCharPos() const { return mnMinCharPos; }
+    int					getMaxCharPos() const { return mnMinCharPos+maText.getLength()-1; }
 private:
     ::psp::PrinterGfx&  mrPrinterGfx;
     sal_IntPtr          mnFontID;
     int                 mnFontHeight;
     int                 mnFontWidth;
     bool                mbVertical;
-    bool                mbArtItalic;
-    bool                mbArtBold;
-    rtl::OUString       maText;
-    int                 mnMinCharPos;
+    bool				mbArtItalic;
+    bool				mbArtBold;
+    rtl::OUString		maText;
+    int					mnMinCharPos;
 };
 
 PspServerFontLayout::PspServerFontLayout( ::psp::PrinterGfx& rGfx, ServerFont& rFont, const ImplLayoutArgs& rArgs )
@@ -677,9 +677,9 @@ PspServerFontLayout::PspServerFontLayout( ::psp::PrinterGfx& rGfx, ServerFont& r
     mnFontHeight = mrPrinterGfx.GetFontHeight();
     mnFontWidth  = mrPrinterGfx.GetFontWidth();
     mbVertical   = mrPrinterGfx.GetFontVertical();
-    mbArtItalic  = mrPrinterGfx.GetArtificialItalic();
-    mbArtBold    = mrPrinterGfx.GetArtificialBold();
-    maText       = OUString( rArgs.mpStr + rArgs.mnMinCharPos, rArgs.mnEndCharPos - rArgs.mnMinCharPos+1 );
+    mbArtItalic	 = mrPrinterGfx.GetArtificialItalic();
+    mbArtBold	 = mrPrinterGfx.GetArtificialBold();
+    maText		 = OUString( rArgs.mpStr + rArgs.mnMinCharPos, rArgs.mnEndCharPos - rArgs.mnMinCharPos+1 );
     mnMinCharPos = rArgs.mnMinCharPos;
 }
 
@@ -698,7 +698,7 @@ static void DrawPrinterLayout( const SalLayout& rLayout, ::psp::PrinterGfx& rGfx
     sal_Int32   aWidthAry[ nMaxGlyphs ];
     sal_Int32   aIdxAry  [ nMaxGlyphs ];
     sal_Unicode aUnicodes[ nMaxGlyphs ];
-    int         aCharPosAry [ nMaxGlyphs ];
+    int			aCharPosAry	[ nMaxGlyphs ];
 
     Point aPos;
     long nUnitsPerPixel = rLayout.GetUnitsPerPixel();
@@ -798,7 +798,7 @@ USHORT PspGraphics::SetFont( ImplFontSelectData *pEntry, int nFallbackLevel )
     // return early if there is no new font
     if( !pEntry )
         return 0;
-
+    
     sal_IntPtr nID = pEntry->mpFontData ? pEntry->mpFontData->GetFontId() : 0;
 
     // determine which font attributes need to be emulated
@@ -897,19 +897,19 @@ void PspGraphics::GetFontMetric( ImplFontMetricData *pMetric )
         pMetric->mbDevice       = aDFA.mbDevice;
         pMetric->mbScalableFont = true;
 
-        pMetric->mnOrientation  = m_pPrinterGfx->GetFontAngle();
-        pMetric->mnSlant        = 0;
+        pMetric->mnOrientation 	= m_pPrinterGfx->GetFontAngle();
+        pMetric->mnSlant		= 0;
 
-        sal_Int32 nTextHeight   = m_pPrinterGfx->GetFontHeight();
-        sal_Int32 nTextWidth    = m_pPrinterGfx->GetFontWidth();
+        sal_Int32 nTextHeight	= m_pPrinterGfx->GetFontHeight();
+        sal_Int32 nTextWidth	= m_pPrinterGfx->GetFontWidth();
         if( ! nTextWidth )
             nTextWidth = nTextHeight;
 
-        pMetric->mnWidth        = nTextWidth;
-        pMetric->mnAscent       = ( aInfo.m_nAscend * nTextHeight + 500 ) / 1000;
-        pMetric->mnDescent      = ( aInfo.m_nDescend * nTextHeight + 500 ) / 1000;
-        pMetric->mnIntLeading   = ( aInfo.m_nLeading * nTextHeight + 500 ) / 1000;
-        pMetric->mnExtLeading   = 0;
+        pMetric->mnWidth		= nTextWidth;
+        pMetric->mnAscent		= ( aInfo.m_nAscend * nTextHeight + 500 ) / 1000;
+        pMetric->mnDescent		= ( aInfo.m_nDescend * nTextHeight + 500 ) / 1000;
+        pMetric->mnIntLeading	= ( aInfo.m_nLeading * nTextHeight + 500 ) / 1000;
+        pMetric->mnExtLeading	= 0;
     }
 }
 
@@ -926,9 +926,9 @@ ULONG PspGraphics::GetKernPairs( ULONG nPairs, ImplKernPairData *pKernPairs )
             nTextScale = m_pPrinterGfx->GetFontHeight();
         for( i = 0, it = rPairs.begin(); i < nPairs && i < nHavePairs; i++, ++it )
         {
-            pKernPairs[i].mnChar1   = it->first;
-            pKernPairs[i].mnChar2   = it->second;
-            pKernPairs[i].mnKern    = it->kern_x * nTextScale / 1000;
+            pKernPairs[i].mnChar1	= it->first;
+            pKernPairs[i].mnChar2	= it->second;
+            pKernPairs[i].mnKern	= it->kern_x * nTextScale / 1000;
         }
 
     }
@@ -1094,9 +1094,9 @@ const void* PspGraphics::DoGetEmbedFontData( fontID aFont, const sal_Ucs* pUnico
         return NULL;
 
     // fill in font info
-    rInfo.m_nAscent     = aFontInfo.m_nAscend;
-    rInfo.m_nDescent    = aFontInfo.m_nDescend;
-    rInfo.m_aPSName     = rMgr.getPSName( aFont );
+    rInfo.m_nAscent		= aFontInfo.m_nAscend;
+    rInfo.m_nDescent	= aFontInfo.m_nDescend;
+    rInfo.m_aPSName		= rMgr.getPSName( aFont );
 
     int xMin, yMin, xMax, yMax;
     rMgr.getFontBoundingBox( aFont, xMin, yMin, xMax, yMax );
@@ -1126,8 +1126,8 @@ const void* PspGraphics::DoGetEmbedFontData( fontID aFont, const sal_Ucs* pUnico
 
     *pDataLen = aStat.st_size;
 
-    rInfo.m_aFontBBox   = Rectangle( Point( xMin, yMin ), Size( xMax-xMin, yMax-yMin ) );
-    rInfo.m_nCapHeight  = yMax; // Well ...
+    rInfo.m_aFontBBox	= Rectangle( Point( xMin, yMin ), Size( xMax-xMin, yMax-yMin ) );
+    rInfo.m_nCapHeight	= yMax; // Well ...
 
     for( int i = 0; i < 256; i++ )
         pWidths[i] = (aMetrics[i].width > 0 ? aMetrics[i].width : 0);
@@ -1186,13 +1186,13 @@ FontWidth PspGraphics::ToFontWidth (psp::width::type eWidth)
     {
         case psp::width::UltraCondensed: return WIDTH_ULTRA_CONDENSED;
         case psp::width::ExtraCondensed: return WIDTH_EXTRA_CONDENSED;
-        case psp::width::Condensed:      return WIDTH_CONDENSED;
-        case psp::width::SemiCondensed:  return WIDTH_SEMI_CONDENSED;
-        case psp::width::Normal:         return WIDTH_NORMAL;
-        case psp::width::SemiExpanded:   return WIDTH_SEMI_EXPANDED;
-        case psp::width::Expanded:       return WIDTH_EXPANDED;
-        case psp::width::ExtraExpanded:  return WIDTH_EXTRA_EXPANDED;
-        case psp::width::UltraExpanded:  return WIDTH_ULTRA_EXPANDED;
+        case psp::width::Condensed:		 return WIDTH_CONDENSED;
+        case psp::width::SemiCondensed:	 return WIDTH_SEMI_CONDENSED;
+        case psp::width::Normal:		 return WIDTH_NORMAL;
+        case psp::width::SemiExpanded:	 return WIDTH_SEMI_EXPANDED;
+        case psp::width::Expanded:		 return WIDTH_EXPANDED;
+        case psp::width::ExtraExpanded:	 return WIDTH_EXTRA_EXPANDED;
+        case psp::width::UltraExpanded:	 return WIDTH_ULTRA_EXPANDED;
         case psp::width::Unknown:        return WIDTH_DONTKNOW;
         default:
             DBG_ERROR( "unknown width mapping" );
@@ -1205,17 +1205,17 @@ FontWeight PspGraphics::ToFontWeight (psp::weight::type eWeight)
 {
     switch (eWeight)
     {
-        case psp::weight::Thin:       return WEIGHT_THIN;
+        case psp::weight::Thin:		  return WEIGHT_THIN;
         case psp::weight::UltraLight: return WEIGHT_ULTRALIGHT;
-        case psp::weight::Light:      return WEIGHT_LIGHT;
+        case psp::weight::Light:	  return WEIGHT_LIGHT;
         case psp::weight::SemiLight:  return WEIGHT_SEMILIGHT;
-        case psp::weight::Normal:     return WEIGHT_NORMAL;
-        case psp::weight::Medium:     return WEIGHT_MEDIUM;
-        case psp::weight::SemiBold:   return WEIGHT_SEMIBOLD;
-        case psp::weight::Bold:       return WEIGHT_BOLD;
+        case psp::weight::Normal:	  return WEIGHT_NORMAL;
+        case psp::weight::Medium:	  return WEIGHT_MEDIUM;
+        case psp::weight::SemiBold:	  return WEIGHT_SEMIBOLD;
+        case psp::weight::Bold:		  return WEIGHT_BOLD;
         case psp::weight::UltraBold:  return WEIGHT_ULTRABOLD;
-        case psp::weight::Black:      return WEIGHT_BLACK;
-        case psp::weight::Unknown:    return WEIGHT_DONTKNOW;
+        case psp::weight::Black:	  return WEIGHT_BLACK;
+        case psp::weight::Unknown:	  return WEIGHT_DONTKNOW;
         default:
             DBG_ERROR( "unknown weight mapping" );
             break;
@@ -1227,9 +1227,9 @@ FontPitch PspGraphics::ToFontPitch (psp::pitch::type ePitch)
 {
     switch (ePitch)
     {
-        case psp::pitch::Fixed:     return PITCH_FIXED;
-        case psp::pitch::Variable:  return PITCH_VARIABLE;
-        case psp::pitch::Unknown:   return PITCH_DONTKNOW;
+        case psp::pitch::Fixed:		return PITCH_FIXED;
+        case psp::pitch::Variable:	return PITCH_VARIABLE;
+        case psp::pitch::Unknown:	return PITCH_DONTKNOW;
         default:
             DBG_ERROR( "unknown pitch mapping" );
             break;
@@ -1241,10 +1241,10 @@ FontItalic PspGraphics::ToFontItalic (psp::italic::type eItalic)
 {
     switch (eItalic)
     {
-        case psp::italic::Upright:  return ITALIC_NONE;
-        case psp::italic::Oblique:  return ITALIC_OBLIQUE;
-        case psp::italic::Italic:   return ITALIC_NORMAL;
-        case psp::italic::Unknown:  return ITALIC_DONTKNOW;
+        case psp::italic::Upright:	return ITALIC_NONE;
+        case psp::italic::Oblique:	return ITALIC_OBLIQUE;
+        case psp::italic::Italic:	return ITALIC_NORMAL;
+        case psp::italic::Unknown:	return ITALIC_DONTKNOW;
         default:
             DBG_ERROR( "unknown italic mapping" );
             break;
@@ -1257,12 +1257,12 @@ FontFamily PspGraphics::ToFontFamily (psp::family::type eFamily)
     switch (eFamily)
     {
         case psp::family::Decorative: return FAMILY_DECORATIVE;
-        case psp::family::Modern:     return FAMILY_MODERN;
-        case psp::family::Roman:      return FAMILY_ROMAN;
-        case psp::family::Script:     return FAMILY_SCRIPT;
-        case psp::family::Swiss:      return FAMILY_SWISS;
-        case psp::family::System:     return FAMILY_SYSTEM;
-        case psp::family::Unknown:    return FAMILY_DONTKNOW;
+        case psp::family::Modern:	  return FAMILY_MODERN;
+        case psp::family::Roman:	  return FAMILY_ROMAN;
+        case psp::family::Script:	  return FAMILY_SCRIPT;
+        case psp::family::Swiss:	  return FAMILY_SWISS;
+        case psp::family::System:	  return FAMILY_SYSTEM;
+        case psp::family::Unknown:	  return FAMILY_DONTKNOW;
         default:
             DBG_ERROR( "unknown family mapping" );
             break;
@@ -1484,7 +1484,7 @@ SystemFontData PspGraphics::GetSysFontData( int nFallbacklevel ) const
 
     if (nFallbacklevel >= MAX_FALLBACK) nFallbacklevel = MAX_FALLBACK - 1;
     if (nFallbacklevel < 0 ) nFallbacklevel = 0;
-
+    
     aSysFontData.nSize = sizeof( SystemFontData );
     aSysFontData.nFontId = 0;
     aSysFontData.nFontFlags = 0;
diff --git a/vcl/unx/source/gdi/salbmp.cxx b/vcl/unx/source/gdi/salbmp.cxx
index cc7934b0a798..480a358ed7ed 100644
--- a/vcl/unx/source/gdi/salbmp.cxx
+++ b/vcl/unx/source/gdi/salbmp.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
@@ -63,8 +63,8 @@ SalBitmap* X11SalInstance::CreateSalBitmap()
     return new X11SalBitmap();
 }
 
-ImplSalBitmapCache* X11SalBitmap::mpCache = NULL;
-ULONG               X11SalBitmap::mnCacheInstCount = 0;
+ImplSalBitmapCache*	X11SalBitmap::mpCache = NULL;
+ULONG				X11SalBitmap::mnCacheInstCount = 0;
 
 // -----------------------------------------------------------------------------
 
@@ -138,13 +138,13 @@ BitmapBuffer* X11SalBitmap::ImplCreateDIB( const Size& rSize, USHORT nBitCount,
                 case( 4 ): pDIB->mnFormat |= BMP_FORMAT_4BIT_MSN_PAL; break;
                 case( 8 ): pDIB->mnFormat |= BMP_FORMAT_8BIT_PAL; break;
 #ifdef OSL_BIGENDIAN
-                case(16 ):
-                    pDIB->mnFormat|= BMP_FORMAT_16BIT_TC_MSB_MASK;
+                case(16 ): 
+                    pDIB->mnFormat|= BMP_FORMAT_16BIT_TC_MSB_MASK; 
                     pDIB->maColorMask = ColorMask( 0xf800, 0x07e0, 0x001f );
                     break;
 #else
-                case(16 ):
-                    pDIB->mnFormat|= BMP_FORMAT_16BIT_TC_LSB_MASK;
+                case(16 ): 
+                    pDIB->mnFormat|= BMP_FORMAT_16BIT_TC_LSB_MASK; 
                     pDIB->maColorMask = ColorMask( 0xf800, 0x07e0, 0x001f );
                     break;
 #endif
@@ -196,9 +196,9 @@ BitmapBuffer* X11SalBitmap::ImplCreateDIB( Drawable aDrawable,
 
     if( aDrawable && nWidth && nHeight && nDrawableDepth )
     {
-        SalDisplay* pSalDisp = GetX11SalData()->GetDisplay();
-        SalXLib*    pXLib = pSalDisp->GetXLib();
-        Display*    pXDisp = pSalDisp->GetDisplay();
+        SalDisplay*	pSalDisp = GetX11SalData()->GetDisplay();
+        SalXLib*	pXLib = pSalDisp->GetXLib();
+        Display*	pXDisp = pSalDisp->GetDisplay();
 
         // do not die on XError here
         // alternatively one could check the coordinates for being offscreen
@@ -206,16 +206,16 @@ BitmapBuffer* X11SalBitmap::ImplCreateDIB( Drawable aDrawable,
         // defaults even if the rectangle is offscreen
         // so better catch the XError
         pXLib->PushXErrorLevel( true );
-        XImage* pImage = XGetImage( pXDisp, aDrawable, nX, nY, nWidth, nHeight, AllPlanes, ZPixmap );
+        XImage*	pImage = XGetImage( pXDisp, aDrawable, nX, nY, nWidth, nHeight, AllPlanes, ZPixmap );
         bool bWasError = pXLib->HasXErrorOccured() && pXLib->GetLastXErrorRequestCode() == X_GetImage;
         pXLib->PopXErrorLevel();
 
         if( ! bWasError && pImage && pImage->data )
         {
-            const SalTwoRect        aTwoRect = { 0, 0, nWidth, nHeight, 0, 0, nWidth, nHeight };
-            BitmapBuffer            aSrcBuf;
-            ULONG                   nDstFormat = BMP_FORMAT_BOTTOM_UP;
-            const BitmapPalette*    pDstPal = NULL;
+            const SalTwoRect		aTwoRect = { 0, 0, nWidth, nHeight, 0, 0, nWidth, nHeight };
+            BitmapBuffer			aSrcBuf;
+            ULONG					nDstFormat = BMP_FORMAT_BOTTOM_UP;
+            const BitmapPalette*	pDstPal = NULL;
 
             aSrcBuf.mnFormat = BMP_FORMAT_TOP_DOWN;
             aSrcBuf.mnWidth = nWidth;
@@ -311,8 +311,8 @@ BitmapBuffer* X11SalBitmap::ImplCreateDIB( Drawable aDrawable,
 
                 for( USHORT i = 0; i < nCols; i++ )
                 {
-                    const SalColor  nColor( rColMap.GetColor( i ) );
-                    BitmapColor&    rBmpCol = rPal[ i ];
+                    const SalColor	nColor( rColMap.GetColor( i ) );
+                    BitmapColor&	rBmpCol = rPal[ i ];
 
                     rBmpCol.SetRed( SALCOLOR_RED( nColor ) );
                     rBmpCol.SetGreen( SALCOLOR_GREEN( nColor ) );
@@ -332,7 +332,7 @@ BitmapBuffer* X11SalBitmap::ImplCreateDIB( Drawable aDrawable,
 
 // -----------------------------------------------------------------------------
 
-XImage* X11SalBitmap::ImplCreateXImage( SalDisplay *pSalDisp, int nScreen, long nDepth, const SalTwoRect& rTwoRect ) const
+XImage*	X11SalBitmap::ImplCreateXImage( SalDisplay *pSalDisp, int nScreen, long nDepth, const SalTwoRect& rTwoRect ) const
 {
     XImage* pImage = NULL;
 
@@ -342,16 +342,16 @@ XImage* X11SalBitmap::ImplCreateXImage( SalDisplay *pSalDisp, int nScreen, long
             ImplCreateDIB( mpDDB->ImplGetPixmap(),
                            mpDDB->ImplGetScreen(),
                            mpDDB->ImplGetDepth(),
-                           0, 0,
-                           mpDDB->ImplGetWidth(),
+                           0, 0, 
+                           mpDDB->ImplGetWidth(), 
                            mpDDB->ImplGetHeight() );
     }
 
     if( mpDIB && mpDIB->mnWidth && mpDIB->mnHeight )
     {
-        Display*    pXDisp = pSalDisp->GetDisplay();
-        long        nWidth = rTwoRect.mnDestWidth;
-        long        nHeight = rTwoRect.mnDestHeight;
+        Display*	pXDisp = pSalDisp->GetDisplay();
+        long		nWidth = rTwoRect.mnDestWidth;
+        long		nHeight = rTwoRect.mnDestHeight;
 
         if( 1 == GetBitCount() )
             nDepth = 1;
@@ -362,10 +362,10 @@ XImage* X11SalBitmap::ImplCreateXImage( SalDisplay *pSalDisp, int nScreen, long
 
         if( pImage )
         {
-            BitmapBuffer*   pDstBuf;
-            ULONG           nDstFormat = BMP_FORMAT_TOP_DOWN;
-            BitmapPalette*  pPal = NULL;
-            ColorMask*      pMask = NULL;
+            BitmapBuffer*	pDstBuf;
+            ULONG			nDstFormat = BMP_FORMAT_TOP_DOWN;
+            BitmapPalette*	pPal = NULL;
+            ColorMask*		pMask = NULL;
 
             switch( pImage->bits_per_pixel )
             {
@@ -436,8 +436,8 @@ XImage* X11SalBitmap::ImplCreateXImage( SalDisplay *pSalDisp, int nScreen, long
 
                 for( USHORT i = 0; i < nCols; i++ )
                 {
-                    const SalColor  nColor( rColMap.GetColor( i ) );
-                    BitmapColor&    rBmpCol = (*pPal)[ i ];
+                    const SalColor	nColor( rColMap.GetColor( i ) );
+                    BitmapColor&	rBmpCol = (*pPal)[ i ];
 
                     rBmpCol.SetRed( SALCOLOR_RED( nColor ) );
                     rBmpCol.SetGreen( SALCOLOR_GREEN( nColor ) );
@@ -470,7 +470,7 @@ XImage* X11SalBitmap::ImplCreateXImage( SalDisplay *pSalDisp, int nScreen, long
 
 // -----------------------------------------------------------------------------
 bool X11SalBitmap::ImplCreateFromDrawable( Drawable aDrawable,
-                                           int nScreen, long nDrawableDepth,
+                                           int nScreen, long nDrawableDepth, 
                                            long nX, long nY, long nWidth, long nHeight )
 {
     Destroy();
@@ -544,7 +544,7 @@ X11SalBitmap::SnapShot (Display* pDisplay, XLIB_Window hWindow)
 
                 if ((width > 0) && (height > 0))
                 {
-                    XImage* pImage = XGetImage( pDisplay, aAttribute.root,
+                    XImage* pImage = XGetImage( pDisplay, aAttribute.root, 
                                                 x, y, width, height, AllPlanes, ZPixmap );
                     bool bSnapShot = ImplCreateFromXImage( pDisplay,
                                                            aAttribute.root,
@@ -561,22 +561,22 @@ X11SalBitmap::SnapShot (Display* pDisplay, XLIB_Window hWindow)
     return False;
 }
 
-bool
+bool 
 X11SalBitmap::ImplCreateFromXImage (Display* pDisplay, XLIB_Window hWindow, int nScreen, XImage* pImage)
 {
     Destroy();
 
     if (pImage != NULL && pImage->width != 0 && pImage->height != 0 && pImage->depth != 0)
     {
-        mpDDB = new ImplSalDDB (pDisplay, hWindow, nScreen, pImage);
+        mpDDB = new ImplSalDDB (pDisplay, hWindow, nScreen, pImage); 
         return True;
     }
     return False;
 }
 
 ImplSalDDB* X11SalBitmap::ImplGetDDB( Drawable          aDrawable,
-                                      int               nScreen,
-                                      long              nDrawableDepth,
+                                      int               nScreen, 
+                                      long              nDrawableDepth, 
                                       const SalTwoRect& rTwoRect ) const
 {
     if( !mpDDB || !mpDDB->ImplMatches( nScreen, nDrawableDepth, rTwoRect ) )
@@ -589,8 +589,8 @@ ImplSalDDB* X11SalBitmap::ImplGetDDB( Drawable          aDrawable,
                 const_cast<X11SalBitmap*>(this)->mpDIB = ImplCreateDIB( mpDDB->ImplGetPixmap(),
                                                                         mpDDB->ImplGetScreen(),
                                                                         mpDDB->ImplGetDepth(),
-                                                                        0, 0,
-                                                                        mpDDB->ImplGetWidth(),
+                                                                        0, 0, 
+                                                                        mpDDB->ImplGetWidth(), 
                                                                         mpDDB->ImplGetHeight() );
             }
 
@@ -651,7 +651,7 @@ ImplSalDDB* X11SalBitmap::ImplGetDDB( Drawable          aDrawable,
             }
         }
 
-        XImage* pImage = ImplCreateXImage( GetX11SalData()->GetDisplay(), nScreen,
+        XImage*	pImage = ImplCreateXImage( GetX11SalData()->GetDisplay(), nScreen,
                                            nDrawableDepth, aTwoRect );
 
         if( pImage )
@@ -671,9 +671,9 @@ ImplSalDDB* X11SalBitmap::ImplGetDDB( Drawable          aDrawable,
 // -----------------------------------------------------------------------------
 
 void X11SalBitmap::ImplDraw( Drawable           aDrawable,
-                             int                nScreen,
-                             long               nDrawableDepth,
-                             const SalTwoRect&  rTwoRect,
+                             int                nScreen, 
+                             long               nDrawableDepth, 
+                             const SalTwoRect&  rTwoRect, 
                              const GC&          rGC ) const
 {
     ImplGetDDB( aDrawable, nScreen, nDrawableDepth, rTwoRect );
@@ -720,7 +720,7 @@ bool X11SalBitmap::Create( const SalBitmap& rSSalBmp )
     else if(  rSalBmp.mpDDB )
         ImplCreateFromDrawable( rSalBmp.mpDDB->ImplGetPixmap(),
                                 rSalBmp.mpDDB->ImplGetScreen(),
-                                rSalBmp.mpDDB->ImplGetDepth(),
+                                rSalBmp.mpDDB->ImplGetDepth(), 
                                 0, 0, rSalBmp.mpDDB->ImplGetWidth(), rSalBmp.mpDDB->ImplGetHeight() );
 
     return( ( !rSalBmp.mpDIB && !rSalBmp.mpDDB ) ||
@@ -841,19 +841,19 @@ bool X11SalBitmap::GetSystemData( BitmapSystemData& rData )
 // --------------
 
 ImplSalDDB::ImplSalDDB( XImage* pImage, Drawable aDrawable, int nScreen, const SalTwoRect& rTwoRect ) :
-    maPixmap    ( 0 ),
-    maTwoRect   ( rTwoRect ),
-    mnDepth     ( pImage->depth ),
+    maPixmap	( 0 ),
+    maTwoRect	( rTwoRect ),
+    mnDepth		( pImage->depth ),
     mnScreen    ( nScreen )
 {
-    SalDisplay* pSalDisp = GetX11SalData()->GetDisplay();
-    Display*    pXDisp = pSalDisp->GetDisplay();
+    SalDisplay*	pSalDisp = GetX11SalData()->GetDisplay();
+    Display*	pXDisp = pSalDisp->GetDisplay();
 
     if( (maPixmap = XCreatePixmap( pXDisp, aDrawable, ImplGetWidth(), ImplGetHeight(), ImplGetDepth() )) )
     {
-        XGCValues   aValues;
-        GC          aGC;
-        int         nValues = GCFunction;
+        XGCValues	aValues;
+        GC			aGC;
+        int			nValues = GCFunction;
 
         aValues.function = GXcopy;
 
@@ -878,9 +878,9 @@ ImplSalDDB::ImplSalDDB (Display* pDisplay, XLIB_Window hWindow, int nScreen, XIm
     maPixmap = XCreatePixmap (pDisplay, hWindow, pImage->width, pImage->height, pImage->depth);
     if (maPixmap != 0)
     {
-        XGCValues   aValues;
-        GC          aGC;
-        int         nValues = GCFunction;
+        XGCValues	aValues;
+        GC			aGC;
+        int			nValues = GCFunction;
 
         aValues.function = GXcopy;
 
@@ -914,14 +914,14 @@ ImplSalDDB::ImplSalDDB( Drawable aDrawable, int nScreen, long nDrawableDepth, lo
     mnDepth( nDrawableDepth ),
     mnScreen( nScreen )
 {
-    SalDisplay* pSalDisp = GetX11SalData()->GetDisplay();
-    Display*    pXDisp = pSalDisp->GetDisplay();
+    SalDisplay*	pSalDisp = GetX11SalData()->GetDisplay();
+    Display*	pXDisp = pSalDisp->GetDisplay();
 
     if( (maPixmap = XCreatePixmap( pXDisp, aDrawable, nWidth, nHeight, nDrawableDepth )) )
     {
-        XGCValues   aValues;
-        GC          aGC;
-        int         nValues = GCFunction;
+        XGCValues	aValues;
+        GC			aGC;
+        int			nValues = GCFunction;
 
         aValues.function = GXcopy;
 
@@ -982,7 +982,7 @@ bool ImplSalDDB::ImplMatches( int nScreen, long nDepth, const SalTwoRect& rTwoRe
 
 void ImplSalDDB::ImplDraw( Drawable aDrawable, long nDrawableDepth, const SalTwoRect& rTwoRect, const GC& rGC ) const
 {
-    ImplDraw( maPixmap, mnDepth, aDrawable, nDrawableDepth,
+    ImplDraw( maPixmap, mnDepth, aDrawable, nDrawableDepth, 
               rTwoRect.mnSrcX - maTwoRect.mnSrcX, rTwoRect.mnSrcY - maTwoRect.mnSrcY,
               rTwoRect.mnDestWidth, rTwoRect.mnDestHeight,
               rTwoRect.mnDestX, rTwoRect.mnDestY, rGC );
@@ -992,12 +992,12 @@ void ImplSalDDB::ImplDraw( Drawable aDrawable, long nDrawableDepth, const SalTwo
 
 void ImplSalDDB::ImplDraw( Drawable aSrcDrawable, long nSrcDrawableDepth,
                            Drawable aDstDrawable, long,
-                           long nSrcX, long nSrcY,
-                           long nDestWidth, long nDestHeight,
+                           long nSrcX, long nSrcY, 
+                           long nDestWidth, long nDestHeight, 
                            long nDestX, long nDestY, const GC& rGC )
 {
-    SalDisplay* pSalDisp = GetX11SalData()->GetDisplay();
-    Display*    pXDisp = pSalDisp->GetDisplay();
+    SalDisplay*	pSalDisp = GetX11SalData()->GetDisplay();
+    Display*	pXDisp = pSalDisp->GetDisplay();
 
     if( 1 == nSrcDrawableDepth )
     {
@@ -1017,9 +1017,9 @@ void ImplSalDDB::ImplDraw( Drawable aSrcDrawable, long nSrcDrawableDepth,
 
 struct ImplBmpObj
 {
-    X11SalBitmap*   mpBmp;
-    ULONG       mnMemSize;
-    ULONG       mnFlags;
+    X11SalBitmap*	mpBmp;
+    ULONG		mnMemSize;
+    ULONG		mnFlags;
 
                 ImplBmpObj( X11SalBitmap* pBmp, ULONG nMemSize, ULONG nFlags ) :
                     mpBmp( pBmp ), mnMemSize( nMemSize ), mnFlags( nFlags ) {}
@@ -1044,7 +1044,7 @@ ImplSalBitmapCache::~ImplSalBitmapCache()
 void ImplSalBitmapCache::ImplAdd( X11SalBitmap* pBmp, ULONG nMemSize, ULONG nFlags )
 {
     ImplBmpObj* pObj;
-    bool        bFound = FALSE;
+    bool		bFound = FALSE;
 
     for( pObj = (ImplBmpObj*) maBmpList.Last(); pObj && !bFound; pObj = (ImplBmpObj*) maBmpList.Prev() )
         if( pObj->mpBmp == pBmp )
diff --git a/vcl/unx/source/gdi/salcvt.cxx b/vcl/unx/source/gdi/salcvt.cxx
index c699cdb12335..49d7befd09e0 100644
--- a/vcl/unx/source/gdi/salcvt.cxx
+++ b/vcl/unx/source/gdi/salcvt.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
@@ -52,7 +52,7 @@ SalConverterCache::~SalConverterCache()
 #include <stdio.h>
 // <---
 
-rtl_UnicodeToTextConverter
+rtl_UnicodeToTextConverter 
 SalConverterCache::GetU2TConverter( rtl_TextEncoding nEncoding )
 {
     if( rtl_isOctetTextEncoding( nEncoding ) )
@@ -60,7 +60,7 @@ SalConverterCache::GetU2TConverter( rtl_TextEncoding nEncoding )
         ConverterT& rConverter( m_aConverters[ nEncoding ] );
         if ( rConverter.mpU2T == NULL )
         {
-            rConverter.mpU2T =
+            rConverter.mpU2T = 
                 rtl_createUnicodeToTextConverter( nEncoding );
 // ---> FIXME
 if ( rConverter.mpU2T == NULL )
@@ -72,7 +72,7 @@ if ( rConverter.mpU2T == NULL )
     return NULL;
 }
 
-rtl_TextToUnicodeConverter
+rtl_TextToUnicodeConverter 
 SalConverterCache::GetT2UConverter( rtl_TextEncoding nEncoding )
 {
     if( rtl_isOctetTextEncoding( nEncoding ) )
@@ -80,7 +80,7 @@ SalConverterCache::GetT2UConverter( rtl_TextEncoding nEncoding )
         ConverterT& rConverter( m_aConverters[ nEncoding ] );
         if ( rConverter.mpT2U == NULL )
         {
-            rConverter.mpT2U =
+            rConverter.mpT2U = 
                 rtl_createTextToUnicodeConverter( nEncoding );
 // ---> FIXME
 if ( rConverter.mpT2U == NULL )
@@ -106,15 +106,15 @@ SalConverterCache::IsSingleByteEncoding( rtl_TextEncoding nEncoding )
             aTextEncInfo.StructSize = sizeof( aTextEncInfo );
             rtl_getTextEncodingInfo( nEncoding, &aTextEncInfo );
 
-            if (   aTextEncInfo.MinimumCharSize == aTextEncInfo.MaximumCharSize
+            if (   aTextEncInfo.MinimumCharSize == aTextEncInfo.MaximumCharSize 
                 && aTextEncInfo.MinimumCharSize == 1)
                 rConverter.mbSingleByteEncoding = True;
             else
                 rConverter.mbSingleByteEncoding = False;
         }
-
+        
         return rConverter.mbSingleByteEncoding;
-    }
+    } 
     return False;
 }
 
@@ -122,7 +122,7 @@ SalConverterCache::IsSingleByteEncoding( rtl_TextEncoding nEncoding )
 // code point nChar. This list has been compiled from the according
 // ttmap files in /usr/openwin/lib/X11/fonts/TrueType/ttmap/
 Bool
-SalConverterCache::EncodingHasChar( rtl_TextEncoding nEncoding,
+SalConverterCache::EncodingHasChar( rtl_TextEncoding nEncoding, 
         sal_Unicode nChar )
 {
     Bool bMatch = False;
@@ -140,120 +140,120 @@ SalConverterCache::EncodingHasChar( rtl_TextEncoding nEncoding,
         // handle them also like ms1252
         // this is due to the fact that so many X fonts say they are iso8859-1
         // but have the other glyphs anyway because they are really ms1252
-            bMatch =    ( /*nChar >= 0x0000 &&*/ nChar <= 0x00ff )
-                ||  ( nChar == 0x20ac )
-                ||  ( nChar == 0x201a )
-                ||  ( nChar == 0x0192 )
-                ||  ( nChar == 0x201e )
-                ||  ( nChar == 0x2026 )
-                ||  ( nChar == 0x2020 )
-                ||  ( nChar == 0x2021 )
-                ||  ( nChar == 0x02c6 )
-                ||  ( nChar == 0x2030 )
-                ||  ( nChar == 0x0160 )
-                ||  ( nChar == 0x2039 )
-                ||  ( nChar == 0x0152 )
-                ||  ( nChar == 0x017d )
-                ||  ( nChar == 0x2018 )
-                ||  ( nChar == 0x2019 )
-                ||  ( nChar == 0x201c )
-                ||  ( nChar == 0x201d )
-                ||  ( nChar == 0x2022 )
-                ||  ( nChar == 0x2013 )
-                ||  ( nChar == 0x2014 )
-                ||  ( nChar == 0x02dc )
-                ||  ( nChar == 0x2122 )
-                ||  ( nChar == 0x0161 )
-                ||  ( nChar == 0x203a )
-                ||  ( nChar == 0x0153 )
-                ||  ( nChar == 0x017e )
-                ||  ( nChar == 0x0178 )
+            bMatch = 	( /*nChar >= 0x0000 &&*/ nChar <= 0x00ff )
+                ||	( nChar == 0x20ac )
+                ||	( nChar == 0x201a )
+                ||	( nChar == 0x0192 )
+                ||	( nChar == 0x201e )
+                ||	( nChar == 0x2026 )
+                ||	( nChar == 0x2020 )
+                ||	( nChar == 0x2021 )
+                ||	( nChar == 0x02c6 )
+                ||	( nChar == 0x2030 )
+                ||	( nChar == 0x0160 )
+                ||	( nChar == 0x2039 )
+                ||	( nChar == 0x0152 )
+                ||	( nChar == 0x017d )
+                ||	( nChar == 0x2018 )
+                ||	( nChar == 0x2019 )
+                ||	( nChar == 0x201c )
+                ||	( nChar == 0x201d )
+                ||	( nChar == 0x2022 )
+                ||	( nChar == 0x2013 )
+                ||	( nChar == 0x2014 )
+                ||	( nChar == 0x02dc )
+                ||	( nChar == 0x2122 )
+                ||	( nChar == 0x0161 )
+                ||	( nChar == 0x203a )
+                ||	( nChar == 0x0153 )
+                ||	( nChar == 0x017e )
+                ||	( nChar == 0x0178 )
                 ;
             break;
 
         case RTL_TEXTENCODING_ISO_8859_2:
-            bMatch =    ( nChar >= 0x0020 && nChar <= 0x007e )
-                    ||  ( nChar >= 0x00a0 && nChar <= 0x017e )
-                    ||  ( nChar >= 0x02c7 && nChar <= 0x02dd );
+            bMatch = 	( nChar >= 0x0020 && nChar <= 0x007e )
+                    ||	( nChar >= 0x00a0 && nChar <= 0x017e )
+                    ||	( nChar >= 0x02c7 && nChar <= 0x02dd );
             break;
-
+        
         case RTL_TEXTENCODING_ISO_8859_4:
-            bMatch =    ( nChar >= 0x0020 && nChar <= 0x007e )
-                    ||  ( nChar >= 0x00a0 && nChar <= 0x017e )
-                    ||  ( nChar >= 0x02c7 && nChar <= 0x02db );
+            bMatch = 	( nChar >= 0x0020 && nChar <= 0x007e )
+                    ||	( nChar >= 0x00a0 && nChar <= 0x017e )
+                    ||	( nChar >= 0x02c7 && nChar <= 0x02db );
             break;
 
         case RTL_TEXTENCODING_ISO_8859_5:
-            bMatch =    ( nChar >= 0x0020 && nChar <= 0x007e )
-                    ||  ( nChar >= 0x00a0 && nChar <= 0x00ad )
-                    ||  ( nChar >= 0x0401 && nChar <= 0x045f )
-                    ||  ( nChar == 0x2116 );
+            bMatch = 	( nChar >= 0x0020 && nChar <= 0x007e )
+                    ||	( nChar >= 0x00a0 && nChar <= 0x00ad )
+                    ||	( nChar >= 0x0401 && nChar <= 0x045f )
+                    ||	( nChar == 0x2116 );
             break;
 
         case RTL_TEXTENCODING_ISO_8859_6:
-            bMatch =    ( nChar >= 0x0020 && nChar <= 0x007e )
-                    ||  ( nChar >= 0x0600 && nChar <= 0x06ff )
-                    ||  ( nChar >= 0xfb50 && nChar <= 0xfffe );
+            bMatch = 	( nChar >= 0x0020 && nChar <= 0x007e )
+                    ||	( nChar >= 0x0600 && nChar <= 0x06ff )
+                    || 	( nChar >= 0xfb50 && nChar <= 0xfffe );
             break;
 
         case RTL_TEXTENCODING_ISO_8859_7:
-            bMatch =    ( nChar >= 0x0020 && nChar <= 0x007e )
-                    ||  ( nChar >= 0x00a0 && nChar <= 0x00bd )
-                    ||  ( nChar == 0x02bd )
-                    ||  ( nChar >= 0x0384 && nChar <= 0x03ce )
-                    ||  ( nChar >= 0x2014 && nChar <= 0x2019 );
+            bMatch = 	( nChar >= 0x0020 && nChar <= 0x007e )
+                    ||	( nChar >= 0x00a0 && nChar <= 0x00bd )
+                    ||	( nChar == 0x02bd )
+                    ||	( nChar >= 0x0384 && nChar <= 0x03ce )
+                    ||	( nChar >= 0x2014 && nChar <= 0x2019 );
             break;
 
         case RTL_TEXTENCODING_ISO_8859_8:
-            bMatch =    ( nChar >= 0x0020 && nChar <= 0x007e )
-                    ||  ( nChar >= 0x00a0 && nChar <= 0x00f7 )
-                    ||  ( nChar >= 0x05d0 && nChar <= 0x05ea )
-                    ||  ( nChar == 0x2017 );
+            bMatch = 	( nChar >= 0x0020 && nChar <= 0x007e )
+                    ||	( nChar >= 0x00a0 && nChar <= 0x00f7 )
+                    ||	( nChar >= 0x05d0 && nChar <= 0x05ea )
+                    ||	( nChar == 0x2017 );
             break;
 
         case RTL_TEXTENCODING_ISO_8859_9:
-            bMatch =    ( nChar >= 0x0020 && nChar <= 0x007e )
-                    ||  ( nChar >= 0x00a0 && nChar <= 0x015f );
+            bMatch = 	( nChar >= 0x0020 && nChar <= 0x007e )
+                    ||	( nChar >= 0x00a0 && nChar <= 0x015f );
              break;
 
         case RTL_TEXTENCODING_ISO_8859_13:
-            bMatch =    ( nChar >= 0x0020 && nChar <= 0x007e )
-                    ||  ( nChar >= 0x00a0 && nChar <= 0x017e )
+            bMatch =   	( nChar >= 0x0020 && nChar <= 0x007e )
+                    ||	( nChar >= 0x00a0 && nChar <= 0x017e )
                     ||  ( nChar >= 0x2019 && nChar <= 0x201e );
             break;
 
         /* real case for RTL_TEXTENCODING_ISO_8859_15
         case RTL_TEXTENCODING_ISO_8859_15:
-            bMatch =    ( nChar >= 0x0020 && nChar <= 0x007e )
-                    ||  ( nChar >= 0x00a0 && nChar <= 0x00ff )
-                    ||  ( nChar >= 0x0152 && nChar <= 0x017e )
+            bMatch =  	( nChar >= 0x0020 && nChar <= 0x007e )
+                    ||	( nChar >= 0x00a0 && nChar <= 0x00ff )
+                    ||	( nChar >= 0x0152 && nChar <= 0x017e )
                     ||  ( nChar == 0x20ac );
             break;
         */
 
         case RTL_TEXTENCODING_JIS_X_0201:
-            bMatch =    ( nChar >= 0x0020 && nChar <= 0x007e )
-                    ||  ( nChar >= 0xff61 && nChar <= 0xff9f );
+            bMatch = 	( nChar >= 0x0020 && nChar <= 0x007e )
+                    ||	( nChar >= 0xff61 && nChar <= 0xff9f );
             break;
 
         case RTL_TEXTENCODING_MS_1251:
-            bMatch =    ( nChar >= 0x0020 && nChar <= 0x007e )
-                    ||  ( nChar >= 0x00a0 && nChar <= 0x00bb )
-                    ||  ( nChar >= 0x0401 && nChar <= 0x045f )
-                    ||  ( nChar >= 0x0490 && nChar <= 0x0491 )
-                    ||  ( nChar >= 0x2013 && nChar <= 0x203a )
-                    ||  ( nChar >= 0x2116 && nChar <= 0x2122 );
+            bMatch = 	( nChar >= 0x0020 && nChar <= 0x007e )
+                    ||	( nChar >= 0x00a0 && nChar <= 0x00bb )
+                    ||	( nChar >= 0x0401 && nChar <= 0x045f )
+                    ||	( nChar >= 0x0490 && nChar <= 0x0491 )
+                    ||	( nChar >= 0x2013 && nChar <= 0x203a )
+                    ||	( nChar >= 0x2116 && nChar <= 0x2122 );
             break;
 
         case RTL_TEXTENCODING_KOI8_R:
-            bMatch =    ( nChar >= 0x0020 && nChar <= 0x007e )
-                    ||  ( nChar >= 0x00a0 && nChar <= 0x00b7 )
-                    ||  ( nChar == 0x00f7 )
-                    ||  ( nChar >= 0x0401 && nChar <= 0x0451 )
-                    ||  ( nChar >= 0x2219 && nChar <= 0x221a )
-                    ||  ( nChar >= 0x2248 && nChar <= 0x2265 )
-                    ||  ( nChar >= 0x2320 && nChar <= 0x2321 )
-                    ||  ( nChar >= 0x2500 && nChar <= 0x25a0 );
+            bMatch = 	( nChar >= 0x0020 && nChar <= 0x007e )
+                    ||	( nChar >= 0x00a0 && nChar <= 0x00b7 )
+                    ||	( nChar == 0x00f7 )
+                    ||	( nChar >= 0x0401 && nChar <= 0x0451 )
+                    ||	( nChar >= 0x2219 && nChar <= 0x221a )
+                    ||	( nChar >= 0x2248 && nChar <= 0x2265 )
+                    ||	( nChar >= 0x2320 && nChar <= 0x2321 )
+                    ||	( nChar >= 0x2500 && nChar <= 0x25a0 );
             break;
 
         case RTL_TEXTENCODING_UNICODE:
@@ -267,7 +267,7 @@ SalConverterCache::EncodingHasChar( rtl_TextEncoding nEncoding,
         case RTL_TEXTENCODING_MS_1361:
         case RTL_TEXTENCODING_JIS_X_0208:
 
-            // XXX Big5 and Korean EUC contain Ascii chars, but Solaris
+            // XXX Big5 and Korean EUC contain Ascii chars, but Solaris 
             // *-big5-1 and *-ksc5601.1992-3 fonts dont, in general CJK fonts
             // are monospaced, so dont trust them for latin chars
             if (nChar <= 0xFF)
@@ -277,7 +277,7 @@ SalConverterCache::EncodingHasChar( rtl_TextEncoding nEncoding,
             }
 
         default:
-            // XXX really convert the unicode char into the encoding
+            // XXX really convert the unicode char into the encoding 
             // and check for conversion errors, this is expensive !
             rtl_UnicodeToTextConverter aConverter;
             rtl_UnicodeToTextContext   aContext;
@@ -295,27 +295,27 @@ SalConverterCache::EncodingHasChar( rtl_TextEncoding nEncoding,
             sal_Size   nConvertedChars;
             sal_Size   nSize;
 
-            nSize = rtl_convertUnicodeToText( aConverter, aContext,
-                    &nChar, 1, pConversionBuffer, sizeof(pConversionBuffer),
-                      RTL_UNICODETOTEXT_FLAGS_UNDEFINED_ERROR
+            nSize = rtl_convertUnicodeToText( aConverter, aContext, 
+                    &nChar, 1, pConversionBuffer, sizeof(pConversionBuffer), 
+                      RTL_UNICODETOTEXT_FLAGS_UNDEFINED_ERROR	
                     | RTL_UNICODETOTEXT_FLAGS_INVALID_ERROR,
                     &nConversionInfo, &nConvertedChars );
 
             rtl_destroyUnicodeToTextContext( aConverter, aContext );
 
             bMatch =    (nConvertedChars == 1)
-                     && (nSize == 1 || nSize == 2) // XXX Fix me this is a hack
+                     && (nSize == 1 || nSize == 2) // XXX Fix me this is a hack 
                      && ((nConversionInfo & RTL_UNICODETOTEXT_INFO_ERROR) == 0);
             break;
     }
 
-    return bMatch;
+    return bMatch;	
 }
 
 // wrapper for rtl_convertUnicodeToText that handles the usual cases for
 // textconversion in drawtext and gettextwidth routines
 sal_Size
-SalConverterCache::ConvertStringUTF16( const sal_Unicode *pText, int nTextLen,
+SalConverterCache::ConvertStringUTF16( const sal_Unicode *pText, int nTextLen, 
         sal_Char *pBuffer, sal_Size nBufferSize, rtl_TextEncoding nEncoding )
 {
     rtl_UnicodeToTextConverter aConverter = GetU2TConverter(nEncoding);
@@ -327,10 +327,10 @@ SalConverterCache::ConvertStringUTF16( const sal_Unicode *pText, int nTextLen,
     sal_uInt32  nCvtInfo;
     sal_Size    nCvtChars;
 
-    rtl_UnicodeToTextContext aContext =
+    rtl_UnicodeToTextContext aContext = 
              rtl_createUnicodeToTextContext( aConverter );
 
-    sal_Size nSize = rtl_convertUnicodeToText( aConverter, aContext,
+    sal_Size nSize = rtl_convertUnicodeToText( aConverter, aContext, 
                 pText, nTextLen, pBuffer, nBufferSize,
                 nCvtFlags, &nCvtInfo, &nCvtChars );
 
diff --git a/vcl/unx/source/gdi/salcvt.hxx b/vcl/unx/source/gdi/salcvt.hxx
index c142c76fe5d0..bb9495abbaa7 100644
--- a/vcl/unx/source/gdi/salcvt.hxx
+++ b/vcl/unx/source/gdi/salcvt.hxx
@@ -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
@@ -33,40 +33,40 @@
 
 #include <map>
 
-extern "C" const char*
+extern "C" const char* 
 pGetEncodingName( rtl_TextEncoding nEncoding );
 
 //
 // Cache TextToUnicode and UnicodeToText converter and conversion info which is
 // used in DrawXYZ routines and in the Event loop
-//
+//	
 
 class SalConverterCache {
 
     public:
                         SalConverterCache();
                         ~SalConverterCache();
-        Bool            EncodingHasChar(
+        Bool			EncodingHasChar( 
                                 rtl_TextEncoding nEncoding, sal_Unicode nChar );
-        rtl_UnicodeToTextConverter
+        rtl_UnicodeToTextConverter 
                         GetU2TConverter( rtl_TextEncoding nEncoding );
-        rtl_TextToUnicodeConverter
+        rtl_TextToUnicodeConverter 
                         GetT2UConverter( rtl_TextEncoding nEncoding );
-        Bool            IsSingleByteEncoding( rtl_TextEncoding nEncoding );
-        sal_Size        ConvertStringUTF16( const sal_Unicode *pText, int nTextLen,
-                                sal_Char *pBuffer, sal_Size nBufferSize,
+        Bool			IsSingleByteEncoding( rtl_TextEncoding nEncoding );
+        sal_Size 		ConvertStringUTF16( const sal_Unicode *pText, int nTextLen, 
+                                sal_Char *pBuffer, sal_Size nBufferSize, 
                                 rtl_TextEncoding nEncoding);
 
-        static SalConverterCache*
-                        GetInstance ();
+        static SalConverterCache* 
+                        GetInstance (); 
 
     private:
 
         struct ConverterT {
-            rtl_UnicodeToTextConverter  mpU2T;
-            rtl_TextToUnicodeConverter  mpT2U;
-            Bool                        mbSingleByteEncoding;
-            Bool                        mbValid;
+            rtl_UnicodeToTextConverter 	mpU2T;
+            rtl_TextToUnicodeConverter 	mpT2U;
+            Bool						mbSingleByteEncoding;
+            Bool						mbValid;
             ConverterT() :
                     mpU2T( NULL ),
                     mpT2U( NULL ),
@@ -83,7 +83,7 @@ class SalConverterCache {
             }
         };
 
-    std::map< rtl_TextEncoding, ConverterT >        m_aConverters;
+    std::map< rtl_TextEncoding, ConverterT >		m_aConverters;
 };
 
 
diff --git a/vcl/unx/source/gdi/salgdi.cxx b/vcl/unx/source/gdi/salgdi.cxx
index c0658c162489..b176e41aa178 100644
--- a/vcl/unx/source/gdi/salgdi.cxx
+++ b/vcl/unx/source/gdi/salgdi.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
@@ -64,13 +64,13 @@
 
 class SalPolyLine
 {
-            XPoint              Points_[STATIC_POINTS];
-            XPoint             *pFirst_;
+            XPoint				Points_[STATIC_POINTS];
+            XPoint			   *pFirst_;
 public:
-    inline                      SalPolyLine( ULONG nPoints );
-    inline                      SalPolyLine( ULONG nPoints, const SalPoint *p );
-    inline                      ~SalPolyLine();
-    inline  XPoint             &operator [] ( ULONG n ) const
+    inline						SalPolyLine( ULONG nPoints );
+    inline						SalPolyLine( ULONG nPoints, const SalPoint *p );
+    inline						~SalPolyLine();
+    inline	XPoint			   &operator [] ( ULONG n ) const
                                 { return pFirst_[n]; }
 };
 
@@ -97,19 +97,19 @@ inline SalPolyLine::~SalPolyLine()
 // -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
 X11SalGraphics::X11SalGraphics()
 {
-    m_pFrame            = NULL;
-    m_pVDev             = NULL;
-    m_pDeleteColormap   = NULL;
-    hDrawable_          = None;
+    m_pFrame			= NULL;
+    m_pVDev				= NULL;
+    m_pDeleteColormap	= NULL;
+    hDrawable_			= None;
     m_aRenderPicture    = 0;
     m_pRenderFormat     = NULL;
 
-    pClipRegion_            = NULL;
-    pPaintRegion_       = NULL;
+    pClipRegion_			= NULL;
+    pPaintRegion_		= NULL;
 
-    pPenGC_         = NULL;
-    nPenPixel_          = 0;
-    nPenColor_          = MAKE_SALCOLOR( 0x00, 0x00, 0x00 ); // Black
+    pPenGC_			= NULL;
+    nPenPixel_			= 0;
+    nPenColor_			= MAKE_SALCOLOR( 0x00, 0x00, 0x00 ); // Black
 
     pFontGC_            = NULL;
     for( int i = 0; i < MAX_FALLBACK; ++i )
@@ -118,42 +118,42 @@ X11SalGraphics::X11SalGraphics()
         mpServerFont[i] = NULL;
     }
 
-    nTextPixel_         = 0;
-    nTextColor_         = MAKE_SALCOLOR( 0x00, 0x00, 0x00 ); // Black
+    nTextPixel_			= 0;
+    nTextColor_			= MAKE_SALCOLOR( 0x00, 0x00, 0x00 ); // Black
 
 #ifdef ENABLE_GRAPHITE
     // check if graphite fonts have been disabled
     static const char* pDisableGraphiteStr = getenv( "SAL_DISABLE_GRAPHITE" );
-    bDisableGraphite_       = pDisableGraphiteStr ? (pDisableGraphiteStr[0]!='0') : FALSE;
+    bDisableGraphite_		= pDisableGraphiteStr ? (pDisableGraphiteStr[0]!='0') : FALSE;
 #endif
 
-    pBrushGC_           = NULL;
-    nBrushPixel_            = 0;
-    nBrushColor_        = MAKE_SALCOLOR( 0xFF, 0xFF, 0xFF ); // White
-    hBrush_             = None;
-
-    pMonoGC_            = NULL;
-    pCopyGC_            = NULL;
-    pMaskGC_            = NULL;
-    pInvertGC_          = NULL;
-    pInvert50GC_        = NULL;
-    pStippleGC_         = NULL;
-    pTrackingGC_        = NULL;
-
-    bWindow_            = FALSE;
-    bPrinter_           = FALSE;
-    bVirDev_            = FALSE;
-    bPenGC_         = FALSE;
-    bFontGC_            = FALSE;
-    bBrushGC_           = FALSE;
-    bMonoGC_            = FALSE;
-    bCopyGC_            = FALSE;
-    bInvertGC_          = FALSE;
-    bInvert50GC_        = FALSE;
-    bStippleGC_         = FALSE;
-    bTrackingGC_        = FALSE;
-    bXORMode_           = FALSE;
-    bDitherBrush_       = FALSE;
+    pBrushGC_			= NULL;
+    nBrushPixel_			= 0;
+    nBrushColor_		= MAKE_SALCOLOR( 0xFF, 0xFF, 0xFF ); // White
+    hBrush_				= None;
+
+    pMonoGC_			= NULL;
+    pCopyGC_			= NULL;
+    pMaskGC_			= NULL;
+    pInvertGC_			= NULL;
+    pInvert50GC_		= NULL;
+    pStippleGC_			= NULL;
+    pTrackingGC_		= NULL;
+
+    bWindow_			= FALSE;
+    bPrinter_			= FALSE;
+    bVirDev_			= FALSE;
+    bPenGC_			= FALSE;
+    bFontGC_			= FALSE;
+    bBrushGC_			= FALSE;
+    bMonoGC_			= FALSE;
+    bCopyGC_			= FALSE;
+    bInvertGC_			= FALSE;
+    bInvert50GC_		= FALSE;
+    bStippleGC_			= FALSE;
+    bTrackingGC_		= FALSE;
+    bXORMode_			= FALSE;
+    bDitherBrush_		= FALSE;
 }
 
 // -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
@@ -168,21 +168,21 @@ X11SalGraphics::~X11SalGraphics()
 void X11SalGraphics::freeResources()
 {
     Display *pDisplay = GetXDisplay();
-
+    
     DBG_ASSERT( !pPaintRegion_, "pPaintRegion_" );
     if( pClipRegion_ ) XDestroyRegion( pClipRegion_ ), pClipRegion_ = None;
-
-    if( hBrush_ )       XFreePixmap( pDisplay, hBrush_ ), hBrush_ = None;
-    if( pPenGC_ )       XFreeGC( pDisplay, pPenGC_ ), pPenGC_ = None;
-    if( pFontGC_ )      XFreeGC( pDisplay, pFontGC_ ), pFontGC_ = None;
-    if( pBrushGC_ )     XFreeGC( pDisplay, pBrushGC_ ), pBrushGC_ = None;
-    if( pMonoGC_ )      XFreeGC( pDisplay, pMonoGC_ ), pMonoGC_ = None;
-    if( pCopyGC_ )      XFreeGC( pDisplay, pCopyGC_ ), pCopyGC_ = None;
-    if( pMaskGC_ )      XFreeGC( pDisplay, pMaskGC_ ), pMaskGC_ = None;
-    if( pInvertGC_ )    XFreeGC( pDisplay, pInvertGC_ ), pInvertGC_ = None;
-    if( pInvert50GC_ )  XFreeGC( pDisplay, pInvert50GC_ ), pInvert50GC_ = None;
-    if( pStippleGC_ )   XFreeGC( pDisplay, pStippleGC_ ), pStippleGC_ = None;
-    if( pTrackingGC_ )  XFreeGC( pDisplay, pTrackingGC_ ), pTrackingGC_ = None;
+    
+    if( hBrush_ )		XFreePixmap( pDisplay, hBrush_ ), hBrush_ = None;
+    if( pPenGC_ )		XFreeGC( pDisplay, pPenGC_ ), pPenGC_ = None;
+    if( pFontGC_ )		XFreeGC( pDisplay, pFontGC_ ), pFontGC_ = None;
+    if( pBrushGC_ )		XFreeGC( pDisplay, pBrushGC_ ), pBrushGC_ = None;
+    if( pMonoGC_ )		XFreeGC( pDisplay, pMonoGC_ ), pMonoGC_ = None;
+    if( pCopyGC_ )		XFreeGC( pDisplay, pCopyGC_ ), pCopyGC_ = None;
+    if( pMaskGC_ )		XFreeGC( pDisplay, pMaskGC_ ), pMaskGC_ = None;
+    if( pInvertGC_ )	XFreeGC( pDisplay, pInvertGC_ ), pInvertGC_ = None;
+    if( pInvert50GC_ )	XFreeGC( pDisplay, pInvert50GC_ ), pInvert50GC_ = None;
+    if( pStippleGC_ )	XFreeGC( pDisplay, pStippleGC_ ), pStippleGC_ = None;
+    if( pTrackingGC_ )	XFreeGC( pDisplay, pTrackingGC_ ), pTrackingGC_ = None;
     if( m_pDeleteColormap )
         delete m_pDeleteColormap, m_pColormap = m_pDeleteColormap = NULL;
 
@@ -216,34 +216,34 @@ void X11SalGraphics::SetDrawable( Drawable aDrawable, int nScreen )
 
     if( hDrawable_ )
     {
-        nPenPixel_      = GetPixel( nPenColor_ );
-        nTextPixel_     = GetPixel( nTextColor_ );
-        nBrushPixel_    = GetPixel( nBrushColor_ );
+        nPenPixel_		= GetPixel( nPenColor_ );
+        nTextPixel_ 	= GetPixel( nTextColor_ );
+        nBrushPixel_	= GetPixel( nBrushColor_ );
     }
 }
 
 void X11SalGraphics::Init( SalFrame *pFrame, Drawable aTarget, int nScreen )
 {
 #if 0 // TODO: use SetDrawable() instead
-    m_pColormap     = &GetX11SalData()->GetDisplay()->GetColormap(nScreen);
-    hDrawable_      = aTarget;
+    m_pColormap		= &GetX11SalData()->GetDisplay()->GetColormap(nScreen);
+    hDrawable_		= aTarget;
     m_nScreen       = nScreen;
     SetXRenderFormat( NULL );
     if( m_aRenderPicture )
         XRenderPeer::GetInstance().FreePicture( m_aRenderPicture ), m_aRenderPicture = 0;
 
-    nPenPixel_      = GetPixel( nPenColor_ );
-    nTextPixel_     = GetPixel( nTextColor_ );
-    nBrushPixel_    = GetPixel( nBrushColor_ );
+    nPenPixel_		= GetPixel( nPenColor_ );
+    nTextPixel_ 	= GetPixel( nTextColor_ );
+    nBrushPixel_	= GetPixel( nBrushColor_ );
 #else
-    m_pColormap     = &GetX11SalData()->GetDisplay()->GetColormap(nScreen);
+    m_pColormap		= &GetX11SalData()->GetDisplay()->GetColormap(nScreen);
     m_nScreen = nScreen;
     SetDrawable( aTarget, nScreen );
 #endif
 
-    bWindow_        = TRUE;
-    m_pFrame        = pFrame;
-    m_pVDev         = NULL;
+    bWindow_		= TRUE;
+    m_pFrame		= pFrame;
+    m_pVDev			= NULL;
 }
 
 // -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
@@ -262,8 +262,8 @@ void X11SalGraphics::SetClipRegion( GC pGC, XLIB_Region pXReg ) const
 
     if( pClipRegion_ /* && !XEmptyRegion( pClipRegion_ ) */ )
         Regions[n++] = pClipRegion_;
-//  if( pPaintRegion_ /* && !XEmptyRegion( pPaintRegion_ ) */ )
-//      Regions[n++] = pPaintRegion_;
+//	if( pPaintRegion_ /* && !XEmptyRegion( pPaintRegion_ ) */ )
+//		Regions[n++] = pPaintRegion_;
 
     if( pXReg && !XEmptyRegion( pXReg ) )
         Regions[n++] = pXReg;
@@ -276,8 +276,8 @@ void X11SalGraphics::SetClipRegion( GC pGC, XLIB_Region pXReg ) const
     {
         XLIB_Region pTmpRegion = XCreateRegion();
         XIntersectRegion( Regions[0], Regions[1], pTmpRegion );
-//      if( 3 == n )
-//          XIntersectRegion( Regions[2], pTmpRegion, pTmpRegion );
+//		if( 3 == n )
+//			XIntersectRegion( Regions[2], pTmpRegion, pTmpRegion );
         XSetRegion( pDisplay, pGC, pTmpRegion );
         XDestroyRegion( pTmpRegion );
     }
@@ -291,9 +291,9 @@ GC X11SalGraphics::SelectPen()
     if( !pPenGC_ )
     {
         XGCValues values;
-        values.subwindow_mode       = ClipByChildren;
-        values.fill_rule            = EvenOddRule;      // Pict import/ Gradient
-        values.graphics_exposures   = False;
+        values.subwindow_mode		= ClipByChildren;
+        values.fill_rule			= EvenOddRule;		// Pict import/ Gradient
+        values.graphics_exposures	= False;
 
         pPenGC_ = XCreateGC( pDisplay, hDrawable_,
                              GCSubwindowMode | GCFillRule | GCGraphicsExposures,
@@ -322,10 +322,10 @@ GC X11SalGraphics::SelectBrush()
     if( !pBrushGC_ )
     {
         XGCValues values;
-        // values.subwindow_mode        = IncludeInferiors;
-        values.subwindow_mode       = ClipByChildren;
-        values.fill_rule            = EvenOddRule;      // Pict import/ Gradient
-        values.graphics_exposures   = False;
+        // values.subwindow_mode		= IncludeInferiors;
+        values.subwindow_mode		= ClipByChildren;
+        values.fill_rule			= EvenOddRule;		// Pict import/ Gradient
+        values.graphics_exposures	= False;
 
         pBrushGC_ = XCreateGC( pDisplay, hDrawable_,
                                GCSubwindowMode | GCFillRule | GCGraphicsExposures,
@@ -379,7 +379,7 @@ GC X11SalGraphics::GetTrackingGC()
                                       ^ m_pColormap->GetWhitePixel();
         values.function             = GXxor;
         values.line_width           = 1;
-        values.line_style           = LineOnOffDash;
+        values.line_style			= LineOnOffDash;
 
         pTrackingGC_ = XCreateGC( GetXDisplay(), GetDrawable(),
                                   GCGraphicsExposures | GCForeground | GCFunction
@@ -435,8 +435,8 @@ void X11SalGraphics::DrawLines( ULONG              nPoints,
 
 // -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
 // Dithern: Calculate a dither-pixmap and make a brush of it
-#define P_DELTA         51
-#define DMAP( v, m )    ((v % P_DELTA) > m ? (v / P_DELTA) + 1 : (v / P_DELTA))
+#define P_DELTA			51
+#define DMAP( v, m )	((v % P_DELTA) > m ? (v / P_DELTA) + 1 : (v / P_DELTA))
 
 BOOL X11SalGraphics::GetDitherPixmap( SalColor nSalColor )
 {
@@ -482,11 +482,11 @@ BOOL X11SalGraphics::GetDitherPixmap( SalColor nSalColor )
                                    GetColormap().GetXVisual(),
                                    8,
                                    ZPixmap,
-                                   0,               // offset
-                                   pBits,           // data
-                                   8, 8,            // width & height
-                                   8,               // bitmap_pad
-                                   0 );             // (default) bytes_per_line
+                                   0,				// offset
+                                   pBits,			// data
+                                   8, 8,			// width & height
+                                   8,				// bitmap_pad
+                                   0 );				// (default) bytes_per_line
 
     if ( GetDisplay()->GetProperties() & PROPERTY_BUG_Tile )
     {
@@ -503,9 +503,9 @@ BOOL X11SalGraphics::GetDitherPixmap( SalColor nSalColor )
                hBrush_,
                GetDisplay()->GetCopyGC( m_nScreen ),
                pImage,
-               0, 0,                        // Source
-               0, 0,                        // Destination
-               8, 8 );                      // width & height
+               0, 0,						// Source
+               0, 0,						// Destination
+               8, 8 );						// width & height
 
     // destroy image-frame but not palette-data
     pImage->data = NULL;
@@ -518,7 +518,7 @@ BOOL X11SalGraphics::GetDitherPixmap( SalColor nSalColor )
 void X11SalGraphics::GetResolution( sal_Int32 &rDPIX, sal_Int32 &rDPIY ) // const
 {
     const SalDisplay *pDisplay = GetDisplay();
-
+    
     rDPIX = pDisplay->GetResolution().A();
     rDPIY = pDisplay->GetResolution().B();
     if( !pDisplay->GetExactResolution() && rDPIY < 96 )
@@ -531,12 +531,12 @@ void X11SalGraphics::GetResolution( sal_Int32 &rDPIX, sal_Int32 &rDPIY ) // cons
         rDPIX = Divide( rDPIX * 200, rDPIY );
         rDPIY = 200;
     }
-
+    
     // #i12705# equalize x- and y-resolution if they are close enough
     if( rDPIX != rDPIY )
     {
         // different x- and y- resolutions are usually artifacts of
-        // a wrongly calculated screen size.
+        // a wrongly calculated screen size. 
         //if( (13*rDPIX >= 10*rDPIY) && (13*rDPIY >= 10*rDPIX) )  //+-30%
         {
 #ifdef DEBUG
@@ -581,18 +581,18 @@ void X11SalGraphics::ResetClipRegion()
 {
     if( pClipRegion_ )
     {
-        bPenGC_         = FALSE;
-        bFontGC_        = FALSE;
-        bBrushGC_       = FALSE;
-        bMonoGC_        = FALSE;
-        bCopyGC_        = FALSE;
-        bInvertGC_      = FALSE;
-        bInvert50GC_    = FALSE;
-        bStippleGC_     = FALSE;
-        bTrackingGC_    = FALSE;
-
+        bPenGC_			= FALSE;
+        bFontGC_		= FALSE;
+        bBrushGC_		= FALSE;
+        bMonoGC_		= FALSE;
+        bCopyGC_		= FALSE;
+        bInvertGC_		= FALSE;
+        bInvert50GC_	= FALSE;
+        bStippleGC_		= FALSE;
+        bTrackingGC_	= FALSE;
+        
         XDestroyRegion( pClipRegion_ );
-        pClipRegion_    = NULL;
+        pClipRegion_	= NULL;
     }
 }
 
@@ -611,13 +611,13 @@ BOOL X11SalGraphics::unionClipRegion( long nX, long nY, long nDX, long nDY )
         return TRUE;
 
     XRectangle aRect;
-    aRect.x         = (short)nX;
-    aRect.y         = (short)nY;
-    aRect.width     = (unsigned short)nDX;
-    aRect.height    = (unsigned short)nDY;
-
+    aRect.x			= (short)nX;
+    aRect.y			= (short)nY;
+    aRect.width		= (unsigned short)nDX;
+    aRect.height	= (unsigned short)nDY;
+    
     XUnionRectWithRegion( &aRect, pClipRegion_, pClipRegion_ );
-
+    
     return TRUE;
 }
 
@@ -631,16 +631,16 @@ bool X11SalGraphics::unionClipRegion( const ::basegfx::B2DPolyPolygon& )
 // -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
 void X11SalGraphics::EndSetClipRegion()
 {
-    bPenGC_         = FALSE;
-    bFontGC_        = FALSE;
-    bBrushGC_       = FALSE;
-    bMonoGC_        = FALSE;
-    bCopyGC_        = FALSE;
-    bInvertGC_      = FALSE;
-    bInvert50GC_    = FALSE;
-    bStippleGC_     = FALSE;
-    bTrackingGC_    = FALSE;
-
+    bPenGC_			= FALSE;
+    bFontGC_		= FALSE;
+    bBrushGC_		= FALSE;
+    bMonoGC_		= FALSE;
+    bCopyGC_		= FALSE;
+    bInvertGC_		= FALSE;
+    bInvert50GC_	= FALSE;
+    bStippleGC_		= FALSE;
+    bTrackingGC_	= FALSE;
+    
     if( XEmptyRegion( pClipRegion_ ) )
     {
         XDestroyRegion( pClipRegion_ );
@@ -653,8 +653,8 @@ void X11SalGraphics::SetLineColor()
 {
     if( nPenColor_ != SALCOLOR_NONE )
     {
-        nPenColor_      = SALCOLOR_NONE;
-        bPenGC_         = FALSE;
+        nPenColor_		= SALCOLOR_NONE;
+        bPenGC_			= FALSE;
     }
 }
 
@@ -663,9 +663,9 @@ void X11SalGraphics::SetLineColor( SalColor nSalColor )
 {
     if( nPenColor_ != nSalColor )
     {
-        nPenColor_      = nSalColor;
-        nPenPixel_      = GetPixel( nSalColor );
-        bPenGC_         = FALSE;
+        nPenColor_		= nSalColor;
+        nPenPixel_		= GetPixel( nSalColor );
+        bPenGC_			= FALSE;
     }
 }
 
@@ -674,9 +674,9 @@ void X11SalGraphics::SetFillColor()
 {
     if( nBrushColor_ != SALCOLOR_NONE )
     {
-        bDitherBrush_   = FALSE;
-        nBrushColor_    = SALCOLOR_NONE;
-        bBrushGC_       = FALSE;
+        bDitherBrush_	= FALSE;
+        nBrushColor_	= SALCOLOR_NONE;
+        bBrushGC_		= FALSE;
     }
 }
 
@@ -685,9 +685,9 @@ void X11SalGraphics::SetFillColor( SalColor nSalColor )
 {
     if( nBrushColor_ != nSalColor )
     {
-        bDitherBrush_   = FALSE;
-        nBrushColor_    = nSalColor;
-        nBrushPixel_    = GetPixel( nSalColor );
+        bDitherBrush_	= FALSE;
+        nBrushColor_	= nSalColor;
+        nBrushPixel_	= GetPixel( nSalColor );
         if( TrueColor != GetColormap().GetVisual().GetClass()
             && GetColormap().GetColor( nBrushPixel_ ) != nBrushColor_
             && nSalColor != MAKE_SALCOLOR( 0x00, 0x00, 0x00 ) // black
@@ -707,7 +707,7 @@ void X11SalGraphics::SetFillColor( SalColor nSalColor )
             && nSalColor != MAKE_SALCOLOR( 0xFF, 0xFF, 0x00 ) // light brown
             && nSalColor != MAKE_SALCOLOR( 0xFF, 0xFF, 0xFF ) )
             bDitherBrush_ = GetDitherPixmap(nSalColor);
-        bBrushGC_       = FALSE;
+        bBrushGC_		= FALSE;
     }
 }
 
@@ -726,8 +726,8 @@ void X11SalGraphics::SetROPLineColor( SalROPColor nROPColor )
             nPenPixel_ = (Pixel)(1 << GetVisual().GetDepth()) - 1;
             break;
     }
-    nPenColor_  = GetColormap().GetColor( nPenPixel_ );
-    bPenGC_     = FALSE;
+    nPenColor_	= GetColormap().GetColor( nPenPixel_ );
+    bPenGC_		= FALSE;
 }
 
 // -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
@@ -745,9 +745,9 @@ void X11SalGraphics::SetROPFillColor( SalROPColor nROPColor )
             nBrushPixel_ = (Pixel)(1 << GetVisual().GetDepth()) - 1;
             break;
     }
-    bDitherBrush_   = FALSE;
-    nBrushColor_    = GetColormap().GetColor( nBrushPixel_ );
-    bBrushGC_       = FALSE;
+    bDitherBrush_	= FALSE;
+    nBrushColor_	= GetColormap().GetColor( nBrushPixel_ );
+    bBrushGC_		= FALSE;
 }
 
 // -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
@@ -755,15 +755,15 @@ void X11SalGraphics::SetXORMode( bool bSet, bool )
 {
     if( !bXORMode_ == bSet )
     {
-        bXORMode_   = bSet;
-        bPenGC_     = FALSE;
-        bBrushGC_   = FALSE;
-        bMonoGC_        = FALSE;
-        bCopyGC_        = FALSE;
-        bInvertGC_  = FALSE;
-        bInvert50GC_    = FALSE;
-        bStippleGC_ = FALSE;
-        bTrackingGC_    = FALSE;
+        bXORMode_ 	= bSet;
+        bPenGC_		= FALSE;
+        bBrushGC_	= FALSE;
+        bMonoGC_		= FALSE;
+        bCopyGC_		= FALSE;
+        bInvertGC_	= FALSE;
+        bInvert50GC_	= FALSE;
+        bStippleGC_	= FALSE;
+        bTrackingGC_	= FALSE;
     }
 }
 
@@ -779,7 +779,7 @@ void X11SalGraphics::drawPixel( long nX, long nY, SalColor nSalColor )
     if( nSalColor != SALCOLOR_NONE )
     {
         Display *pDisplay = GetXDisplay();
-
+        
         if( (nPenColor_ == SALCOLOR_NONE) && !bPenGC_ )
         {
             SetLineColor( nSalColor );
@@ -790,12 +790,12 @@ void X11SalGraphics::drawPixel( long nX, long nY, SalColor nSalColor )
         else
         {
             GC pGC = SelectPen();
-
+            
             if( nSalColor != nPenColor_ )
                 XSetForeground( pDisplay, pGC, GetPixel( nSalColor ) );
-
+            
             XDrawPoint( pDisplay, GetDrawable(), pGC, nX, nY );
-
+            
             if( nSalColor != nPenColor_ )
                 XSetForeground( pDisplay, pGC, nPenPixel_ );
         }
@@ -850,7 +850,7 @@ void X11SalGraphics::drawPolyLine( ULONG nPoints, const SalPoint *pPtAry, bool b
     if( nPenColor_ != 0xFFFFFFFF )
     {
         SalPolyLine Points( nPoints, pPtAry );
-
+        
         DrawLines( nPoints, Points, SelectPen(), bClose );
     }
 }
@@ -860,7 +860,7 @@ void X11SalGraphics::drawPolygon( ULONG nPoints, const SalPoint* pPtAry )
 {
     if( nPoints == 0 )
         return;
-
+    
     if( nPoints < 3 )
     {
         if( !bXORMode_ )
@@ -873,9 +873,9 @@ void X11SalGraphics::drawPolygon( ULONG nPoints, const SalPoint* pPtAry )
         }
         return;
     }
-
+    
     SalPolyLine Points( nPoints, pPtAry );
-
+    
     nPoints++;
 
     /* WORKAROUND: some Xservers (Xorg, VIA chipset in this case)
@@ -909,29 +909,29 @@ void X11SalGraphics::drawPolygon( ULONG nPoints, const SalPoint* pPtAry )
                 if( Points[i].x < 0 )
                     Points[i].x = 0;
         }
-    }
-
+    }		
+    
     if( nBrushColor_ != SALCOLOR_NONE )
         XFillPolygon( GetXDisplay(),
                       GetDrawable(),
                       SelectBrush(),
                       &Points[0], nPoints,
                       Complex, CoordModeOrigin );
-
+    
     if( nPenColor_ != 0xFFFFFFFF )
         DrawLines( nPoints, Points, SelectPen(), true );
 }
 
 // -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
-void X11SalGraphics::drawPolyPolygon( sal_uInt32        nPoly,
-                                   const sal_uInt32    *pPoints,
+void X11SalGraphics::drawPolyPolygon( sal_uInt32		nPoly,
+                                   const sal_uInt32	   *pPoints,
                                    PCONSTSALPOINT  *pPtAry )
 {
     if( nBrushColor_ != SALCOLOR_NONE )
     {
-        ULONG       i, n;
-        XLIB_Region pXRegA  = NULL;
-
+        ULONG		i, n;
+        XLIB_Region	pXRegA	= NULL;
+        
         for( i = 0; i < nPoly; i++ ) {
             n = pPoints[i];
             SalPolyLine Points( n, pPtAry[i] );
@@ -947,24 +947,24 @@ void X11SalGraphics::drawPolyPolygon( sal_uInt32        nPoly,
                 }
             }
         }
-
+        
         if( pXRegA )
         {
             XRectangle aXRect;
             XClipBox( pXRegA, &aXRect );
-
+            
             GC pGC = SelectBrush();
             SetClipRegion( pGC, pXRegA ); // ??? doppelt
             XDestroyRegion( pXRegA );
             bBrushGC_ = FALSE;
-
+            
             XFillRectangle( GetXDisplay(),
                             GetDrawable(),
                             pGC,
                             aXRect.x, aXRect.y, aXRect.width, aXRect.height );
         }
    }
-
+        
    if( nPenColor_ != SALCOLOR_NONE )
        for( ULONG i = 0; i < nPoly; i++ )
            drawPolyLine( pPoints[i], pPtAry[i], true );
@@ -999,7 +999,7 @@ void X11SalGraphics::invert( ULONG nPoints,
                              SalInvert nFlags )
 {
     SalPolyLine Points ( nPoints, pPtAry );
-
+    
     GC pGC;
     if( SAL_INVERT_50 & nFlags )
         pGC = GetInvert50GC();
@@ -1008,7 +1008,7 @@ void X11SalGraphics::invert( ULONG nPoints,
             pGC = GetTrackingGC();
         else
             pGC = GetInvertGC();
-
+    
     if( SAL_INVERT_TRACKFRAME & nFlags )
         DrawLines ( nPoints, Points, pGC, true );
     else
diff --git a/vcl/unx/source/gdi/salgdi2.cxx b/vcl/unx/source/gdi/salgdi2.cxx
index 1cb2abbedf43..37c89a262b2a 100644
--- a/vcl/unx/source/gdi/salgdi2.cxx
+++ b/vcl/unx/source/gdi/salgdi2.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
@@ -67,12 +67,12 @@ static void sal_PrintImage( char *s, XImage*p )
 // -----------------------------------------------------------------------------
 
 #if (OSL_DEBUG_LEVEL > 1) && defined SALGDI2_TESTTRANS
-#define DBG_TESTTRANS( _def_drawable )                              \
-{                                                                   \
-    XCopyArea( pXDisp, _def_drawable, aDrawable, GetCopyGC(),       \
-               0, 0,                                                \
-               pPosAry->mnDestWidth, pPosAry->mnDestHeight,         \
-               0, 0 );                                              \
+#define DBG_TESTTRANS( _def_drawable )								\
+{																	\
+    XCopyArea( pXDisp, _def_drawable, aDrawable, GetCopyGC(),		\
+               0, 0,												\
+               pPosAry->mnDestWidth, pPosAry->mnDestHeight,			\
+               0, 0 );												\
 }
 #else // (OSL_DEBUG_LEVEL > 1) && defined SALGDI2_TESTTRANS
 #define DBG_TESTTRANS( _def_drawable )
@@ -129,14 +129,14 @@ GC X11SalGraphics::CreateGC( Drawable hDrawable, unsigned long nMask )
 {
     XGCValues values;
 
-    values.graphics_exposures   = False;
-    values.foreground           = m_pColormap->GetBlackPixel()
+    values.graphics_exposures	= False;
+    values.foreground			= m_pColormap->GetBlackPixel()
                                   ^ m_pColormap->GetWhitePixel();
-    values.function             = GXxor;
-    values.line_width           = 1;
-    values.fill_style           = FillStippled;
-    values.stipple              = GetDisplay()->GetInvert50( m_nScreen );
-    values.subwindow_mode       = ClipByChildren;
+    values.function				= GXxor;
+    values.line_width			= 1;
+    values.fill_style			= FillStippled;
+    values.stipple				= GetDisplay()->GetInvert50( m_nScreen );
+    values.subwindow_mode		= ClipByChildren;
 
     return XCreateGC( GetXDisplay(), hDrawable, nMask | GCSubwindowMode, &values );
 }
@@ -197,12 +197,12 @@ GC X11SalGraphics::GetInvert50GC()
     {
         XGCValues values;
 
-        values.graphics_exposures   = False;
-        values.foreground           = m_pColormap->GetWhitePixel();
-        values.background           = m_pColormap->GetBlackPixel();
-        values.function             = GXinvert;
-        values.line_width           = 1;
-        values.line_style           = LineSolid;
+        values.graphics_exposures	= False;
+        values.foreground			= m_pColormap->GetWhitePixel();
+        values.background			= m_pColormap->GetBlackPixel();
+        values.function				= GXinvert;
+        values.line_width			= 1;
+        values.line_style			= LineSolid;
         unsigned long nValueMask =
                                   GCGraphicsExposures
                                   | GCForeground
@@ -221,8 +221,8 @@ GC X11SalGraphics::GetInvert50GC()
         }
         else
         {
-            values.fill_style           = FillStippled;
-            values.stipple              = GetDisplay()->GetInvert50( m_nScreen );
+            values.fill_style			= FillStippled;
+            values.stipple				= GetDisplay()->GetInvert50( m_nScreen );
         }
 
         pInvert50GC_ = XCreateGC( GetXDisplay(), GetDrawable(),
@@ -363,7 +363,7 @@ GC X11SalGraphics::SetMask( int           &nX,
     }
 
     // - - - - create alternate clip pixmap for region clipping - - - -
-    Pixmap hPixmap  = XCreatePixmap( pDisplay, hClipMask, nDX, nDY, 1 );
+    Pixmap hPixmap	= XCreatePixmap( pDisplay, hClipMask, nDX, nDY, 1 );
 
     if( !hPixmap )
     {
@@ -384,12 +384,12 @@ GC X11SalGraphics::SetMask( int           &nX,
     GC pMonoGC = GetMonoGC( hPixmap );
     XSetClipOrigin( pDisplay, pMonoGC, -nX, -nY );
     XCopyArea( pDisplay,
-               hClipMask,           // Source
-               hPixmap,             // Destination
+               hClipMask,			// Source
+               hPixmap,				// Destination
                pMonoGC,
-               nSrcX, nSrcY,        // Source
-               nDX,   nDY,          // Width & Height
-               0,     0 );          // Destination
+               nSrcX, nSrcY,		// Source
+               nDX,   nDY,			// Width & Height
+               0,     0 );			// Destination
 
     XSetClipMask( pDisplay, pMaskGC_, hPixmap );
     XSetClipOrigin( pDisplay, pMaskGC_, nX, nY );
@@ -401,7 +401,7 @@ GC X11SalGraphics::SetMask( int           &nX,
 // -=-= SalGraphics =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
 // -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
 
-extern "C"
+extern "C" 
 {
     static Bool GraphicsExposePredicate( Display*, XEvent* pEvent, XPointer pFrameWindow )
     {
@@ -460,12 +460,12 @@ void X11SalGraphics::YieldGraphicsExpose()
 }
 
 void X11SalGraphics::copyBits( const SalTwoRect *pPosAry,
-                                  SalGraphics      *pSSrcGraphics )
+                                  SalGraphics	   *pSSrcGraphics )
 {
     X11SalGraphics* pSrcGraphics = pSSrcGraphics
         ? static_cast<X11SalGraphics*>(pSSrcGraphics)
         : this;
-
+    
     if( pPosAry->mnSrcWidth <= 0
         || pPosAry->mnSrcHeight <= 0
         || pPosAry->mnDestWidth <= 0
@@ -473,7 +473,7 @@ void X11SalGraphics::copyBits( const SalTwoRect *pPosAry,
     {
         return;
     }
-
+    
     int n;
     if( pSrcGraphics == this )
     {
@@ -500,9 +500,9 @@ void X11SalGraphics::copyBits( const SalTwoRect *pPosAry,
     }
     else
         n = 0;
-
+    
     if( n == 2
-        && pPosAry->mnSrcWidth  == pPosAry->mnDestWidth
+        && pPosAry->mnSrcWidth	== pPosAry->mnDestWidth
         && pPosAry->mnSrcHeight == pPosAry->mnDestHeight
         )
     {
@@ -510,7 +510,7 @@ void X11SalGraphics::copyBits( const SalTwoRect *pPosAry,
         // obscured areas beneath overlapping windows), src and dest
         // are the same window.
         const bool bNeedGraphicsExposures( pSrcGraphics == this &&
-                                           !bVirDev_ &&
+                                           !bVirDev_ && 
                                            pSrcGraphics->bWindow_ );
 
         GC pCopyGC;
@@ -520,7 +520,7 @@ void X11SalGraphics::copyBits( const SalTwoRect *pPosAry,
             && (GetDisplay()->GetProperties() & PROPERTY_BUG_XCopyArea_GXxor) )
         {
             Pixmap hPixmap = XCreatePixmap( GetXDisplay(),
-                                            pSrcGraphics->GetDrawable(),        // source
+                                            pSrcGraphics->GetDrawable(),		// source
                                             pPosAry->mnSrcWidth, pPosAry->mnSrcHeight,
                                             pSrcGraphics->GetBitCount() );
 
@@ -532,17 +532,17 @@ void X11SalGraphics::copyBits( const SalTwoRect *pPosAry,
                                        True );
 
             XCopyArea( GetXDisplay(),
-                       pSrcGraphics->GetDrawable(),     // source
-                       hPixmap,                         // destination
-                       pCopyGC,                         // no clipping
+                       pSrcGraphics->GetDrawable(),		// source
+                       hPixmap,							// destination
+                       pCopyGC,							// no clipping
                        pPosAry->mnSrcX,     pPosAry->mnSrcY,
                        pPosAry->mnSrcWidth, pPosAry->mnSrcHeight,
-                       0,                   0 );            // destination
+                       0,    				0 );			// destination
             XCopyArea( GetXDisplay(),
-                       hPixmap,                             // source
-                       GetDrawable(),                       // destination
-                       GetInvertGC(),       // destination clipping
-                       0,                   0,              // source
+                       hPixmap,								// source
+                       GetDrawable(),						// destination
+                       GetInvertGC(),		// destination clipping
+                       0,				    0,				// source
                        pPosAry->mnSrcWidth, pPosAry->mnSrcHeight,
                        pPosAry->mnDestX,    pPosAry->mnDestY );
             XFreePixmap( GetXDisplay(), hPixmap );
@@ -550,16 +550,16 @@ void X11SalGraphics::copyBits( const SalTwoRect *pPosAry,
         else
         {
             pCopyGC = GetCopyGC();
-
+            
             if( bNeedGraphicsExposures )
                 XSetGraphicsExposures( GetXDisplay(),
                                        pCopyGC,
                                        True );
 
             XCopyArea( GetXDisplay(),
-                       pSrcGraphics->GetDrawable(),     // source
-                       GetDrawable(),                   // destination
-                       pCopyGC,                         // destination clipping
+                       pSrcGraphics->GetDrawable(),		// source
+                       GetDrawable(),					// destination
+                       pCopyGC,							// destination clipping
                        pPosAry->mnSrcX,     pPosAry->mnSrcY,
                        pPosAry->mnSrcWidth, pPosAry->mnSrcHeight,
                        pPosAry->mnDestX,    pPosAry->mnDestY );
@@ -584,18 +584,18 @@ void X11SalGraphics::copyBits( const SalTwoRect *pPosAry,
                                                    pPosAry->mnSrcY,
                                                    pPosAry->mnSrcWidth,
                                                    pPosAry->mnSrcHeight );
-
+        
         if( !pDDB )
         {
             stderr0( "SalGraphics::CopyBits !pSrcGraphics->GetBitmap()\n" );
             return;
         }
-
+        
         SalTwoRect aPosAry( *pPosAry );
-
-        aPosAry.mnSrcX = 0, aPosAry.mnSrcY = 0;
+        
+        aPosAry.mnSrcX = 0,	aPosAry.mnSrcY = 0;
         drawBitmap( &aPosAry, *pDDB );
-
+        
         delete pDDB;
     }
     else {
@@ -611,17 +611,17 @@ void X11SalGraphics::copyArea ( long nDestX,    long nDestY,
                                 USHORT )
 {
     SalTwoRect aPosAry;
-
+    
     aPosAry.mnDestX = nDestX;
     aPosAry.mnDestY = nDestY;
     aPosAry.mnDestWidth  = nSrcWidth;
     aPosAry.mnDestHeight = nSrcHeight;
-
+    
     aPosAry.mnSrcX = nSrcX;
     aPosAry.mnSrcY = nSrcY;
     aPosAry.mnSrcWidth  = nSrcWidth;
     aPosAry.mnSrcHeight = nSrcHeight;
-
+    
     copyBits ( &aPosAry, 0 );
 }
 
@@ -629,14 +629,14 @@ void X11SalGraphics::copyArea ( long nDestX,    long nDestY,
 void X11SalGraphics::drawBitmap( const SalTwoRect* pPosAry, const SalBitmap& rSalBitmap )
 {
     const SalDisplay*   pSalDisp = GetDisplay();
-    Display*            pXDisp = pSalDisp->GetDisplay();
-    const Drawable      aDrawable( GetDrawable() );
-    const SalColormap&  rColMap = pSalDisp->GetColormap( m_nScreen );
-    const long          nDepth = GetDisplay()->GetVisual( m_nScreen ).GetDepth();
-    GC                  aGC( GetCopyGC() );
-    XGCValues           aOldVal, aNewVal;
-    int                 nValues = GCForeground | GCBackground;
-
+    Display*			pXDisp = pSalDisp->GetDisplay();
+    const Drawable		aDrawable( GetDrawable() );
+    const SalColormap&	rColMap = pSalDisp->GetColormap( m_nScreen );
+    const long			nDepth = GetDisplay()->GetVisual( m_nScreen ).GetDepth();
+    GC					aGC( GetCopyGC() );
+    XGCValues			aOldVal, aNewVal;
+    int					nValues = GCForeground | GCBackground;
+    
     if( rSalBitmap.GetBitCount() == 1 )
     {
         // set foreground/background values for 1Bit bitmaps
@@ -644,9 +644,9 @@ void X11SalGraphics::drawBitmap( const SalTwoRect* pPosAry, const SalBitmap& rSa
         aNewVal.foreground = rColMap.GetWhitePixel(), aNewVal.background = rColMap.GetBlackPixel();
         XChangeGC( pXDisp, aGC, nValues, &aNewVal );
     }
-
+    
     static_cast<const X11SalBitmap&>(rSalBitmap).ImplDraw( aDrawable, m_nScreen, nDepth, *pPosAry, aGC );
-
+    
     if( rSalBitmap.GetBitCount() == 1 )
         XChangeGC( pXDisp, aGC, nValues, &aOldVal );
     XFlush( pXDisp );
@@ -686,23 +686,23 @@ void X11SalGraphics::drawMaskedBitmap( const SalTwoRect* pPosAry,
     // figure work mode depth. If this is a VDev Drawable, use its
     // bitdepth to create pixmaps for, otherwise, XCopyArea will
     // refuse to work.
-    const USHORT    nDepth( m_pVDev ?
+    const USHORT	nDepth( m_pVDev ? 
                             m_pVDev->GetDepth() :
                             pSalDisp->GetVisual( m_nScreen ).GetDepth() );
-    Pixmap          aFG( XCreatePixmap( pXDisp, aDrawable, pPosAry->mnDestWidth,
+    Pixmap			aFG( XCreatePixmap( pXDisp, aDrawable, pPosAry->mnDestWidth,
                                         pPosAry->mnDestHeight, nDepth ) );
-    Pixmap          aBG( XCreatePixmap( pXDisp, aDrawable, pPosAry->mnDestWidth,
+    Pixmap			aBG( XCreatePixmap( pXDisp, aDrawable, pPosAry->mnDestWidth,
                                         pPosAry->mnDestHeight, nDepth ) );
-
+    
     if( aFG && aBG )
     {
-        GC                  aTmpGC;
-        XGCValues           aValues;
-        const SalColormap&  rColMap = pSalDisp->GetColormap( m_nScreen );
-        const int           nBlack = rColMap.GetBlackPixel(), nWhite = rColMap.GetWhitePixel();
-        const int           nValues = GCFunction | GCForeground | GCBackground;
-        SalTwoRect          aTmpRect( *pPosAry ); aTmpRect.mnDestX = aTmpRect.mnDestY = 0;
-
+        GC					aTmpGC;
+        XGCValues			aValues;
+        const SalColormap&	rColMap = pSalDisp->GetColormap( m_nScreen );
+        const int			nBlack = rColMap.GetBlackPixel(), nWhite = rColMap.GetWhitePixel();
+        const int			nValues = GCFunction | GCForeground | GCBackground;
+        SalTwoRect			aTmpRect( *pPosAry ); aTmpRect.mnDestX = aTmpRect.mnDestY = 0;
+        
         // draw paint bitmap in pixmap #1
         aValues.function = GXcopy, aValues.foreground = nWhite, aValues.background = nBlack;
         aTmpGC = XCreateGC( pXDisp, aFG, nValues, &aValues );
@@ -716,14 +716,14 @@ void X11SalGraphics::drawMaskedBitmap( const SalTwoRect* pPosAry,
                    0, 0 );
 
         DBG_TESTTRANS( aBG );
-
+        
         // mask out paint bitmap in pixmap #1 (transparent areas 0)
         aValues.function = GXand, aValues.foreground = 0x00000000, aValues.background = 0xffffffff;
         XChangeGC( pXDisp, aTmpGC, nValues, &aValues );
         static_cast<const X11SalBitmap&>(rTransBitmap).ImplDraw( aFG, m_nScreen, 1, aTmpRect, aTmpGC );
-
+        
         DBG_TESTTRANS( aFG );
-
+        
         // #105055# For XOR mode, keep background behind bitmap intact
         if( !bXORMode_ )
         {
@@ -731,10 +731,10 @@ void X11SalGraphics::drawMaskedBitmap( const SalTwoRect* pPosAry,
             aValues.function = GXand, aValues.foreground = 0xffffffff, aValues.background = 0x00000000;
             XChangeGC( pXDisp, aTmpGC, nValues, &aValues );
             static_cast<const X11SalBitmap&>(rTransBitmap).ImplDraw( aBG, m_nScreen, 1, aTmpRect, aTmpGC );
-
+            
             DBG_TESTTRANS( aBG );
         }
-
+        
         // merge pixmap #1 and pixmap #2 in pixmap #2
         aValues.function = GXxor, aValues.foreground = 0xffffffff, aValues.background = 0x00000000;
         XChangeGC( pXDisp, aTmpGC, nValues, &aValues );
@@ -743,30 +743,30 @@ void X11SalGraphics::drawMaskedBitmap( const SalTwoRect* pPosAry,
                    pPosAry->mnDestWidth, pPosAry->mnDestHeight,
                    0, 0 );
         DBG_TESTTRANS( aBG );
-
+        
         // #105055# Disable XOR temporarily
         BOOL bOldXORMode( bXORMode_ );
         bXORMode_ = FALSE;
-
+        
         // copy pixmap #2 (result) to background
         XCopyArea( pXDisp, aBG, aDrawable, GetCopyGC(),
                    0, 0,
                    pPosAry->mnDestWidth, pPosAry->mnDestHeight,
                    pPosAry->mnDestX, pPosAry->mnDestY );
-
+        
         DBG_TESTTRANS( aBG );
-
+        
         bXORMode_ = bOldXORMode;
-
+        
         XFreeGC( pXDisp, aTmpGC );
         XFlush( pXDisp );
     }
     else
         drawBitmap( pPosAry, rSalBitmap );
-
+    
     if( aFG )
         XFreePixmap( pXDisp, aFG );
-
+    
     if( aBG )
         XFreePixmap( pXDisp, aBG );
 }
@@ -782,7 +782,7 @@ bool X11SalGraphics::drawAlphaBitmap( const SalTwoRect& rTR,
     // horizontal mirroring not implemented yet
     if( rTR.mnDestWidth < 0 )
         return false;
-
+    
     // stretched conversion is not implemented yet
     if( rTR.mnDestWidth != rTR.mnSrcWidth )
         return false;
@@ -890,7 +890,7 @@ bool X11SalGraphics::drawAlphaBitmap( const SalTwoRect& rTR,
     // set clipping
     if( pClipRegion_ && !XEmptyRegion( pClipRegion_ ) )
         rPeer.SetPictureClipRegion( aDstPic, pClipRegion_ );
-
+    
     // paint source * mask over destination picture
     rPeer.CompositePicture( PictOpOver, aSrcPic, aAlphaPic, aDstPic,
         rTR.mnSrcX, rTR.mnSrcY, 0, 0,
@@ -904,29 +904,29 @@ bool X11SalGraphics::drawAlphaBitmap( const SalTwoRect& rTR,
 }
 
 // -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
-bool X11SalGraphics::drawAlphaRect( long nX, long nY, long nWidth,
+bool X11SalGraphics::drawAlphaRect( long nX, long nY, long nWidth, 
                                     long nHeight, sal_uInt8 nTransparency )
 {
     if( ! m_pFrame && ! m_pVDev )
         return false;
-
+    
     if( bPenGC_ || !bBrushGC_ || bXORMode_ )
         return false; // can only perform solid fills without XOR.
-
+    
     if( m_pVDev && m_pVDev->GetDepth() < 8 )
         return false;
 
     XRenderPeer& rPeer = XRenderPeer::GetInstance();
     if( rPeer.GetVersion() < 0x02 ) // TODO: replace with better test
         return false;
-
+    
     Picture aDstPic = GetXRenderPicture();
     if( !aDstPic )
         return false;
 
     const double fTransparency = (100 - nTransparency) * (1.0/100);
     const XRenderColor aRenderColor = GetXRenderColor( nBrushColor_ , fTransparency);
-
+    
     rPeer.FillRectangle( PictOpOver,
                          aDstPic,
                          &aRenderColor,
@@ -950,30 +950,30 @@ void X11SalGraphics::drawMask( const SalTwoRect* pPosAry,
                                SalColor nMaskColor )
 {
     const SalDisplay*   pSalDisp = GetDisplay();
-    Display*            pXDisp = pSalDisp->GetDisplay();
+    Display*	        pXDisp = pSalDisp->GetDisplay();
     Drawable            aDrawable( GetDrawable() );
     Pixmap              aStipple( XCreatePixmap( pXDisp, aDrawable,
                                                  pPosAry->mnDestWidth,
                                                  pPosAry->mnDestHeight, 1 ) );
-
+    
     if( aStipple )
     {
-        SalTwoRect  aTwoRect( *pPosAry ); aTwoRect.mnDestX = aTwoRect.mnDestY = 0;
-        GC          aTmpGC;
-        XGCValues   aValues;
-
+        SalTwoRect	aTwoRect( *pPosAry ); aTwoRect.mnDestX = aTwoRect.mnDestY = 0;
+        GC			aTmpGC;
+        XGCValues	aValues;
+        
         // create a stipple bitmap first (set bits are changed to unset bits and vice versa)
         aValues.function = GXcopyInverted;
         aValues.foreground = 1, aValues.background = 0;
         aTmpGC = XCreateGC( pXDisp, aStipple, GCFunction | GCForeground | GCBackground, &aValues );
         static_cast<const X11SalBitmap&>(rSalBitmap).ImplDraw( aStipple, m_nScreen, 1, aTwoRect, aTmpGC );
-
+        
         XFreeGC( pXDisp, aTmpGC );
-
+        
         // Set stipple and draw rectangle
-        GC  aStippleGC( GetStippleGC() );
-        int nX = pPosAry->mnDestX, nY = pPosAry->mnDestY;
-
+        GC	aStippleGC( GetStippleGC() );
+        int	nX = pPosAry->mnDestX, nY = pPosAry->mnDestY;
+        
         XSetStipple( pXDisp, aStippleGC, aStipple );
         XSetTSOrigin( pXDisp, aStippleGC, nX, nY );
         XSetForeground( pXDisp, aStippleGC, GetPixel( nMaskColor ) );
@@ -992,7 +992,7 @@ SalBitmap *X11SalGraphics::getBitmap( long nX, long nY, long nDX, long nDY )
 {
     if( bPrinter_ && !bVirDev_ )
         return NULL;
-
+    
     bool bFakeWindowBG = false;
 
     // normalize
@@ -1008,9 +1008,9 @@ SalBitmap *X11SalGraphics::getBitmap( long nX, long nY, long nDX, long nDY )
     }
 
     if( bWindow_ && !bVirDev_ )
-    {
+    {        
         XWindowAttributes aAttrib;
-
+        
         XGetWindowAttributes( GetXDisplay(), GetDrawable(), &aAttrib );
         if( aAttrib.map_state != IsViewable )
             bFakeWindowBG = true;
@@ -1033,7 +1033,7 @@ SalBitmap *X11SalGraphics::getBitmap( long nX, long nY, long nDX, long nDY )
                 nDX = aAttrib.width  - nX;
             if( nY + nDY > aAttrib.height )
                 nDY = aAttrib.height - nY;
-
+        
             // inside ?
             if( nDX <= 0 || nDY <= 0 )
             {
@@ -1043,13 +1043,13 @@ SalBitmap *X11SalGraphics::getBitmap( long nX, long nY, long nDX, long nDY )
             }
         }
     }
-
-    X11SalBitmap*   pSalBitmap = new X11SalBitmap;
-    USHORT          nBitCount = GetBitCount();
-
+    
+    X11SalBitmap*	pSalBitmap = new X11SalBitmap;
+    USHORT			nBitCount = GetBitCount();
+    
     if( &GetDisplay()->GetColormap( m_nScreen ) != &GetColormap() )
         nBitCount = 1;
-
+    
     if( ! bFakeWindowBG )
         pSalBitmap->ImplCreateFromDrawable( GetDrawable(), m_nScreen, nBitCount, nX, nY, nDX, nDY );
     else
@@ -1064,7 +1064,7 @@ SalColor X11SalGraphics::getPixel( long nX, long nY )
     if( bWindow_ && !bVirDev_ )
     {
         XWindowAttributes aAttrib;
-
+        
         XGetWindowAttributes( GetXDisplay(), GetDrawable(), &aAttrib );
         if( aAttrib.map_state != IsViewable )
         {
@@ -1072,7 +1072,7 @@ SalColor X11SalGraphics::getPixel( long nX, long nY )
             return 0;
         }
     }
-
+    
     XImage *pXImage = XGetImage( GetXDisplay(),
                                      GetDrawable(),
                                  nX, nY,
@@ -1084,21 +1084,21 @@ SalColor X11SalGraphics::getPixel( long nX, long nY )
         stderr0( "X11SalGraphics::GetPixel !XGetImage()\n" );
         return 0;
     }
-
+    
     XColor aXColor;
-
+    
     aXColor.pixel = XGetPixel( pXImage, 0, 0 );
     XDestroyImage( pXImage );
-
+    
     return GetColormap().GetColor( aXColor.pixel );
 }
 
 // -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
-void X11SalGraphics::invert( long       nX,
-                                long        nY,
-                                long        nDX,
-                                long        nDY,
-                                SalInvert   nFlags )
+void X11SalGraphics::invert( long		nX,
+                                long		nY,
+                                long		nDX,
+                                long		nDY,
+                                SalInvert	nFlags )
 {
     GC pGC;
     if( SAL_INVERT_50 & nFlags )
@@ -1131,10 +1131,10 @@ bool X11SalGraphics::supportsOperation( OutDevSupportType eType ) const
         {
             XRenderPeer& rPeer = XRenderPeer::GetInstance();
             if( rPeer.GetVersion() >= 0x02 )
-            {
+            {        
                 const SalDisplay* pSalDisp = GetDisplay();
                 const SalVisual& rSalVis = pSalDisp->GetVisual( m_nScreen );
-
+            
                 Visual* pDstXVisual = rSalVis.GetVisual();
                 XRenderPictFormat* pDstVisFmt = rPeer.FindVisualFormat( pDstXVisual );
                 if( pDstVisFmt )
diff --git a/vcl/unx/source/gdi/salgdi3.cxx b/vcl/unx/source/gdi/salgdi3.cxx
index 6024b66f6010..b9ac7b629c48 100644
--- a/vcl/unx/source/gdi/salgdi3.cxx
+++ b/vcl/unx/source/gdi/salgdi3.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
@@ -134,10 +134,10 @@ class FontLookup
 
     private:
 
-        rtl::OString        maName;
-        FontWeight          mnWeight;
-        FontItalic          mnItalic;
-        sal_Bool            mbDisplay;
+        rtl::OString		maName;
+        FontWeight 			mnWeight;
+        FontItalic 			mnItalic;
+        sal_Bool			mbDisplay;
 
     public:
 
@@ -153,18 +153,18 @@ class FontLookup
                             ~FontLookup ()
                             {}
 
-        static void         BuildSet (fl_hashset& rSet);
-        static bool         InSet (const fl_hashset& rSet, const Xlfd& rXfld);
-        bool                InSet (const fl_hashset& rSet) const;
+        static void 		BuildSet (fl_hashset& rSet);
+        static bool 		InSet (const fl_hashset& rSet, const Xlfd& rXfld);
+        bool				InSet (const fl_hashset& rSet) const;
 
-        bool                operator== (const FontLookup &rRef) const
+        bool 				operator== (const FontLookup &rRef) const
                             {
                                 return     (abs(mnWeight - rRef.mnWeight) < 2)
                                         && (mnItalic == rRef.mnItalic)
                                         && (maName   == rRef.maName)
                                         && (mbDisplay== rRef.mbDisplay);
                             }
-        FontLookup&         operator= (const FontLookup &rRef)
+        FontLookup&			operator= (const FontLookup &rRef)
                             {
                                 mnWeight = rRef.mnWeight;
                                 mnItalic = rRef.mnItalic;
@@ -173,7 +173,7 @@ class FontLookup
 
                                 return *this;
                             }
-        size_t              Hash() const
+        size_t				Hash() const
                             {
                                 return maName.hashCode ();
                             }
@@ -233,14 +233,14 @@ FontLookup::FontLookup ( ::std::list< psp::fontID >::iterator& it,
 FontLookup::FontLookup (const Xlfd& rFont)
 {
     AttributeProvider* pFactory = rFont.mpFactory;
-    Attribute*         pAttr;
+    Attribute*		   pAttr;
 
     pAttr    = pFactory->RetrieveSlant  (rFont.mnSlant);
     mnItalic = (FontItalic)pAttr->GetValue();
     pAttr    = pFactory->RetrieveWeight (rFont.mnWeight);
     mnWeight = (FontWeight)pAttr->GetValue();
     pAttr    = pFactory->RetrieveFamily (rFont.mnFamily);
-    maName   = pAttr->GetKey();
+    maName	 = pAttr->GetKey();
 
     if (mnItalic == ITALIC_OBLIQUE)
         mnItalic = ITALIC_NORMAL;
@@ -339,7 +339,7 @@ SalDisplay::GetXlfdList() const
         //
 
         BitmapXlfdStorage   aBitmapList;
-        ScalableXlfd       *pScalableFont = NULL;
+        ScalableXlfd  	   *pScalableFont = NULL;
 
         int nFrom = 0;
         for ( i = 0; i < nXlfdCount; i++ )
@@ -350,7 +350,7 @@ SalDisplay::GetXlfdList() const
                                     | XLFD_FEATURE_OL_CURSOR) )
                 continue;
             // exclude fonts with unknown encoding
-            if ( pXlfdList[i].GetEncoding() == RTL_TEXTENCODING_DONTKNOW )
+            if ( pXlfdList[i].GetEncoding()	== RTL_TEXTENCODING_DONTKNOW )
                 continue;
             // exclude "interface system" and "interface user"
             if (pAttr->HasFeature( XLFD_FEATURE_APPLICATION_FONT ) )
@@ -545,10 +545,10 @@ X11SalGraphics::SelectFont()
     if( !pFontGC_ )
     {
         XGCValues values;
-        values.subwindow_mode       = ClipByChildren;
-        values.fill_rule            = EvenOddRule;      // Pict import/ Gradient
-        values.graphics_exposures   = False;
-        values.foreground           = nTextPixel_;
+        values.subwindow_mode		= ClipByChildren;
+        values.fill_rule			= EvenOddRule;		// Pict import/ Gradient
+        values.graphics_exposures	= False;
+        values.foreground			= nTextPixel_;
 #ifdef _USE_PRINT_EXTENSION_
         values.background = xColormap_->GetWhitePixel();
         pFontGC_ = XCreateGC( pDisplay, hDrawable_,
@@ -619,7 +619,7 @@ bool X11SalGraphics::setFont( const ImplFontSelectData *pEntry, int nFallbackLev
     {
         const ImplX11FontData* pRequestedFont = static_cast<const ImplX11FontData*>( pEntry->mpFontData );
         const ExtendedXlfd& rX11Font = pRequestedFont->GetExtendedXlfd();
-
+    
         Size aReqSize( pEntry->mnWidth, pEntry->mnHeight );
         mXFont[ nFallbackLevel ] = GetDisplay()->GetFont( &rX11Font, aReqSize, bFontVertical_ );
         bFontGC_ = FALSE;
@@ -640,7 +640,7 @@ bool X11SalGraphics::setFont( const ImplFontSelectData *pEntry, int nFallbackLev
         // register to use the font
         mpServerFont[ nFallbackLevel ] = pServerFont;
 
-        // apply font specific-hint settings if needed
+        // apply font specific-hint settings if needed 
         // TODO: also disable it for reference devices
     if( !bPrinter_ )
     {
@@ -757,7 +757,7 @@ class CairoWrapper
 {
 private:
     oslModule mpCairoLib;
-
+    
     cairo_surface_t* (*mp_xlib_surface_create_with_xrender_format)(Display *, Drawable , Screen *, XRenderPictFormat *, int , int );
     void (*mp_surface_destroy)(cairo_surface_t *);
     cairo_t* (*mp_create)(cairo_surface_t *);
@@ -790,7 +790,7 @@ public:
     cairo_t* create(cairo_surface_t *surface) { return (*mp_create)(surface); }
     void destroy(cairo_t *cr) { (*mp_destroy)(cr); }
     void clip(cairo_t *cr) { (*mp_clip)(cr); }
-    void rectangle(cairo_t *cr, double x, double y, double width, double height)
+    void rectangle(cairo_t *cr, double x, double y, double width, double height) 
         { (*mp_rectangle)(cr, x, y, width, height); }
     cairo_font_face_t* ft_font_face_create_for_ft_face(FT_Face face, int load_flags)
         { return (*mp_ft_font_face_create_for_ft_face)(face, load_flags); }
@@ -831,7 +831,7 @@ CairoWrapper::CairoWrapper()
     static const char* pDisableCairoText = getenv( "SAL_DISABLE_CAIROTEXT" );
     if( pDisableCairoText && (pDisableCairoText[0] != '0') )
         return;
-
+    
     int nDummy;
     if( !XQueryExtension( GetX11SalData()->GetDisplay()->GetDisplay(), "RENDER", &nDummy, &nDummy, &nDummy ) )
         return;
@@ -840,7 +840,7 @@ CairoWrapper::CairoWrapper()
     OUString aLibName( RTL_CONSTASCII_USTRINGPARAM( "libcairo.2.dylib" ));
 #else
     OUString aLibName( RTL_CONSTASCII_USTRINGPARAM( "libcairo.so.2" ));
-#endif
+#endif    
     mpCairoLib = osl_loadModule( aLibName.pData, SAL_LOADMODULE_DEFAULT );
     if( !mpCairoLib )
         return;
@@ -853,11 +853,11 @@ CairoWrapper::CairoWrapper()
     fprintf( stderr, "CAIRO version=%d\n", nVersion );
 #endif
 
-    mp_xlib_surface_create_with_xrender_format = (cairo_surface_t* (*)(Display *, Drawable , Screen *, XRenderPictFormat *, int , int ))
+    mp_xlib_surface_create_with_xrender_format = (cairo_surface_t* (*)(Display *, Drawable , Screen *, XRenderPictFormat *, int , int )) 
         osl_getAsciiFunctionSymbol( mpCairoLib, "cairo_xlib_surface_create_with_xrender_format" );
-    mp_surface_destroy = (void(*)(cairo_surface_t*))
+    mp_surface_destroy = (void(*)(cairo_surface_t*)) 
         osl_getAsciiFunctionSymbol( mpCairoLib, "cairo_surface_destroy" );
-    mp_create = (cairo_t*(*)(cairo_surface_t*))
+    mp_create = (cairo_t*(*)(cairo_surface_t*)) 
         osl_getAsciiFunctionSymbol( mpCairoLib, "cairo_create" );
     mp_destroy = (void(*)(cairo_t*))
         osl_getAsciiFunctionSymbol( mpCairoLib, "cairo_destroy" );
@@ -888,7 +888,7 @@ CairoWrapper::CairoWrapper()
     mp_ft_font_options_substitute = (void (*)(const void *, void *))
         osl_getAsciiFunctionSymbol( mpCairoLib, "cairo_ft_font_options_substitute" );
 
-    if( !(
+    if( !( 
             mp_xlib_surface_create_with_xrender_format &&
             mp_surface_destroy &&
             mp_create &&
@@ -968,7 +968,7 @@ void X11SalGraphics::DrawCairoAAFontString( const ServerFontLayout& rLayout )
 {
     std::vector<cairo_glyph_t> cairo_glyphs;
     cairo_glyphs.reserve( 256 );
-
+    
     Point aPos;
     sal_GlyphId aGlyphId;
     for( int nStart = 0; rLayout.GetNextGlyphs( 1, &aGlyphId, aPos, nStart ); )
@@ -1020,8 +1020,8 @@ void X11SalGraphics::DrawCairoAAFontString( const ServerFontLayout& rLayout )
     {
     for (long i = 0; i < pClipRegion_->numRects; ++i)
     {
-            rCairo.rectangle(cr,
-                pClipRegion_->rects[i].x1,
+            rCairo.rectangle(cr, 
+                pClipRegion_->rects[i].x1, 
                 pClipRegion_->rects[i].y1,
                 pClipRegion_->rects[i].x2 - pClipRegion_->rects[i].x1,
                 pClipRegion_->rects[i].y2 - pClipRegion_->rects[i].y1);
@@ -1029,8 +1029,8 @@ void X11SalGraphics::DrawCairoAAFontString( const ServerFontLayout& rLayout )
         rCairo.clip(cr);
     }
 
-    rCairo.set_source_rgb(cr,
-        SALCOLOR_RED(nTextColor_)/255.0,
+    rCairo.set_source_rgb(cr, 
+        SALCOLOR_RED(nTextColor_)/255.0, 
         SALCOLOR_GREEN(nTextColor_)/255.0,
         SALCOLOR_BLUE(nTextColor_)/255.0);
 
@@ -1106,7 +1106,7 @@ void X11SalGraphics::DrawServerAAFontString( const ServerFontLayout& rLayout )
     // set font foreground color and opacity
     XRenderColor aRenderColor = GetXRenderColor( nTextColor_ );
     rRenderPeer.FillRectangle( PictOpSrc, rEntry.m_aPicture, &aRenderColor, 0, 0, 1, 1 );
-
+    
     // set clipping
     // TODO: move into GetXRenderPicture()?
     if( pClipRegion_ && !XEmptyRegion( pClipRegion_ ) )
@@ -1471,7 +1471,7 @@ void X11SalGraphics::DrawStringUCS2MB( ExtendedFontStruct& rFont,
         int nItem = 0;
 
         DBG_ASSERT( nLength<=1, "#i49902# DrawStringUCS2MB with nLength>1 => problems with XOrg6.8.[0123]");
-
+    
         for( int nChar = 0; nChar < nLength; ++nChar )
         {
             rtl_TextEncoding  nEnc;
@@ -1531,7 +1531,7 @@ USHORT X11SalGraphics::SetFont( ImplFontSelectData *pEntry, int nFallbackLevel )
 void
 X11SalGraphics::SetTextColor( SalColor nSalColor )
 {
-    if( nTextColor_ != nSalColor )
+    if( nTextColor_	!= nSalColor )
     {
         nTextColor_     = nSalColor;
         nTextPixel_     = GetPixel( nSalColor );
@@ -1633,7 +1633,7 @@ void X11SalGraphics::GetDevFontList( ImplDevFontList *pList )
     // register platform specific font substitutions if available
     if( rMgr.hasFontconfig() )
         RegisterFontSubstitutors( pList );
-
+    
     ImplGetSVData()->maGDIData.mbNativeFontConfig = rMgr.hasFontconfig();
 }
 
@@ -1881,7 +1881,7 @@ SystemFontData X11SalGraphics::GetSysFontData( int nFallbacklevel ) const
 
     if (nFallbacklevel >= MAX_FALLBACK) nFallbacklevel = MAX_FALLBACK - 1;
     if (nFallbacklevel < 0 ) nFallbacklevel = 0;
-
+    
     if (mpServerFont[nFallbacklevel] != NULL)
     {
         ServerFont* rFont = mpServerFont[nFallbacklevel];
@@ -1892,7 +1892,7 @@ SystemFontData X11SalGraphics::GetSysFontData( int nFallbacklevel ) const
         aSysFontData.bAntialias = rFont->GetAntialiasAdvice();
         aSysFontData.bVerticalCharacterType = rFont->GetFontSelData().mbVertical;
     }
-
+            
     return aSysFontData;
 }
 
@@ -2015,7 +2015,7 @@ void RegisterFontSubstitutors( ImplDevFontList* pList )
     if( pEnvStr )
     {
         if( (*pEnvStr >= '0') && (*pEnvStr <= '9') )
-            nDisableBits = (*pEnvStr - '0');
+            nDisableBits = (*pEnvStr - '0'); 
         else
             nDisableBits = ~0U; // no specific bits set: disable all
     }
@@ -2061,16 +2061,16 @@ static ImplFontSelectData GetFcSubstitute(const ImplFontSelectData &rFontSelData
     {
         switch( rFontSelData.GetWeight() )
         {
-            case WEIGHT_THIN:       eWeight = psp::weight::Thin; break;
-            case WEIGHT_ULTRALIGHT: eWeight = psp::weight::UltraLight; break;
-            case WEIGHT_LIGHT:      eWeight = psp::weight::Light; break;
-            case WEIGHT_SEMILIGHT:  eWeight = psp::weight::SemiLight; break;
-            case WEIGHT_NORMAL:     eWeight = psp::weight::Normal; break;
-            case WEIGHT_MEDIUM:     eWeight = psp::weight::Medium; break;
-            case WEIGHT_SEMIBOLD:   eWeight = psp::weight::SemiBold; break;
-            case WEIGHT_BOLD:       eWeight = psp::weight::Bold; break;
-            case WEIGHT_ULTRABOLD:  eWeight = psp::weight::UltraBold; break;
-            case WEIGHT_BLACK:      eWeight = psp::weight::Black; break;
+            case WEIGHT_THIN:		eWeight = psp::weight::Thin; break;
+            case WEIGHT_ULTRALIGHT:	eWeight = psp::weight::UltraLight; break;
+            case WEIGHT_LIGHT:		eWeight = psp::weight::Light; break;
+            case WEIGHT_SEMILIGHT:	eWeight = psp::weight::SemiLight; break;
+            case WEIGHT_NORMAL:		eWeight = psp::weight::Normal; break;
+            case WEIGHT_MEDIUM:		eWeight = psp::weight::Medium; break;
+            case WEIGHT_SEMIBOLD:	eWeight = psp::weight::SemiBold; break;
+            case WEIGHT_BOLD:		eWeight = psp::weight::Bold; break;
+            case WEIGHT_ULTRABOLD:	eWeight = psp::weight::UltraBold; break;
+            case WEIGHT_BLACK:		eWeight = psp::weight::Black; break;
             default:
                 break;
         }
@@ -2081,15 +2081,15 @@ static ImplFontSelectData GetFcSubstitute(const ImplFontSelectData &rFontSelData
     {
         switch( rFontSelData.GetWidthType() )
         {
-            case WIDTH_ULTRA_CONDENSED: eWidth = psp::width::UltraCondensed; break;
+            case WIDTH_ULTRA_CONDENSED:	eWidth = psp::width::UltraCondensed; break;
             case WIDTH_EXTRA_CONDENSED: eWidth = psp::width::ExtraCondensed; break;
-            case WIDTH_CONDENSED:   eWidth = psp::width::Condensed; break;
-            case WIDTH_SEMI_CONDENSED:  eWidth = psp::width::SemiCondensed; break;
-            case WIDTH_NORMAL:      eWidth = psp::width::Normal; break;
-            case WIDTH_SEMI_EXPANDED:   eWidth = psp::width::SemiExpanded; break;
-            case WIDTH_EXPANDED:    eWidth = psp::width::Expanded; break;
-            case WIDTH_EXTRA_EXPANDED:  eWidth = psp::width::ExtraExpanded; break;
-            case WIDTH_ULTRA_EXPANDED:  eWidth = psp::width::UltraExpanded; break;
+            case WIDTH_CONDENSED:	eWidth = psp::width::Condensed; break;
+            case WIDTH_SEMI_CONDENSED:	eWidth = psp::width::SemiCondensed; break;
+            case WIDTH_NORMAL:		eWidth = psp::width::Normal; break;
+            case WIDTH_SEMI_EXPANDED:	eWidth = psp::width::SemiExpanded; break;
+            case WIDTH_EXPANDED:	eWidth = psp::width::Expanded; break;
+            case WIDTH_EXTRA_EXPANDED:	eWidth = psp::width::ExtraExpanded; break;
+            case WIDTH_ULTRA_EXPANDED:	eWidth = psp::width::UltraExpanded; break;
             default:
                 break;
         }
diff --git a/vcl/unx/source/gdi/salprnpsp.cxx b/vcl/unx/source/gdi/salprnpsp.cxx
index 8617bc4e5bfa..cef551ac3c63 100644
--- a/vcl/unx/source/gdi/salprnpsp.cxx
+++ b/vcl/unx/source/gdi/salprnpsp.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
@@ -65,12 +65,12 @@ using namespace psp;
 using namespace rtl;
 
 /*
- *  static helpers
+ *	static helpers
  */
 
 #include "rtsname.hxx"
 
-static oslModule driverLib                  = NULL;
+static oslModule driverLib					= NULL;
 extern "C"
 {
 typedef int(*setupFunction)(PrinterInfo&);
@@ -103,16 +103,16 @@ static void getPaLib()
     if( ! driverLib )
     {
         OUString aLibName( RTL_CONSTASCII_USTRINGPARAM( _XSALSET_LIBNAME ) );
-        driverLib   = osl_loadModuleRelative( (oslGenericFunction)getPaLib, aLibName.pData, SAL_LOADMODULE_DEFAULT );
+        driverLib	= osl_loadModuleRelative( (oslGenericFunction)getPaLib, aLibName.pData, SAL_LOADMODULE_DEFAULT );
         if ( !driverLib )
         {
             return;
         }
-
-        pSetupFunction  = (setupFunction)osl_getAsciiFunctionSymbol( driverLib, "Sal_SetupPrinterDriver" );
+        
+        pSetupFunction	= (setupFunction)osl_getAsciiFunctionSymbol( driverLib, "Sal_SetupPrinterDriver" );
         if ( !pSetupFunction )
             fprintf( stderr, "could not resolve Sal_SetupPrinterDriver\n" );
-
+        
         pFaxNrFunction = (faxFunction)osl_getAsciiFunctionSymbol( driverLib, "Sal_queryFaxNumber" );
         if ( !pFaxNrFunction )
             fprintf( stderr, "could not resolve Sal_queryFaxNumber\n" );
@@ -125,31 +125,31 @@ inline int TenMuToPt( int nUnits ) { return (int)((((double)nUnits)/35.27777778)
 
 static void copyJobDataToJobSetup( ImplJobSetup* pJobSetup, JobData& rData )
 {
-    pJobSetup->meOrientation    = (Orientation)(rData.m_eOrientation == orientation::Landscape ? ORIENTATION_LANDSCAPE : ORIENTATION_PORTRAIT);
+    pJobSetup->meOrientation	= (Orientation)(rData.m_eOrientation == orientation::Landscape ? ORIENTATION_LANDSCAPE : ORIENTATION_PORTRAIT);
 
     // copy page size
     String aPaper;
     int width, height;
 
     rData.m_aContext.getPageSize( aPaper, width, height );
-    pJobSetup->mePaperFormat    = PaperInfo::fromPSName(OUStringToOString( aPaper, RTL_TEXTENCODING_ISO_8859_1 ));
+    pJobSetup->mePaperFormat	= PaperInfo::fromPSName(OUStringToOString( aPaper, RTL_TEXTENCODING_ISO_8859_1 ));
 
-    pJobSetup->mnPaperWidth     = 0;
-    pJobSetup->mnPaperHeight    = 0;
+    pJobSetup->mnPaperWidth		= 0;
+    pJobSetup->mnPaperHeight	= 0;
     if( pJobSetup->mePaperFormat == PAPER_USER )
     {
         // transform to 100dth mm
-        width               = PtTo10Mu( width );
-        height              = PtTo10Mu( height );
+        width				= PtTo10Mu( width );
+        height				= PtTo10Mu( height );
 
         if( rData.m_eOrientation == psp::orientation::Portrait )
         {
-            pJobSetup->mnPaperWidth = width;
+            pJobSetup->mnPaperWidth	= width;
             pJobSetup->mnPaperHeight= height;
         }
         else
         {
-            pJobSetup->mnPaperWidth = height;
+            pJobSetup->mnPaperWidth	= height;
             pJobSetup->mnPaperHeight= width;
         }
     }
@@ -160,9 +160,9 @@ static void copyJobDataToJobSetup( ImplJobSetup* pJobSetup, JobData& rData )
 
     pJobSetup->mnPaperBin = 0;
     if( rData.m_pParser )
-        pKey                    = rData.m_pParser->getKey( String( RTL_CONSTASCII_USTRINGPARAM( "InputSlot" ) ) );
+        pKey					= rData.m_pParser->getKey( String( RTL_CONSTASCII_USTRINGPARAM( "InputSlot" ) ) );
     if( pKey )
-        pValue                  = rData.m_aContext.getValue( pKey );
+        pValue					= rData.m_aContext.getValue( pKey );
     if( pKey && pValue )
     {
         for( pJobSetup->mnPaperBin = 0;
@@ -173,11 +173,11 @@ static void copyJobDataToJobSetup( ImplJobSetup* pJobSetup, JobData& rData )
         if( pJobSetup->mnPaperBin >= pKey->countValues() )
             pJobSetup->mnPaperBin = 0;
     }
-
+    
     // copy duplex
     pKey = NULL;
     pValue = NULL;
-
+    
     pJobSetup->meDuplexMode = DUPLEX_UNKNOWN;
     if( rData.m_pParser )
         pKey = rData.m_pParser->getKey( String( RTL_CONSTASCII_USTRINGPARAM( "Duplex" ) ) );
@@ -368,13 +368,13 @@ static bool createPdf( const String& rToFile, const String& rFromFile, const Str
 }
 
 /*
- *  SalInstance
+ *	SalInstance
  */
 
 // -----------------------------------------------------------------------
 
-SalInfoPrinter* X11SalInstance::CreateInfoPrinter( SalPrinterQueueInfo* pQueueInfo,
-                                                   ImplJobSetup*            pJobSetup )
+SalInfoPrinter* X11SalInstance::CreateInfoPrinter( SalPrinterQueueInfo*	pQueueInfo,
+                                                   ImplJobSetup*			pJobSetup )
 {
     mbPrinterInit = true;
     // create and initialize SalInfoPrinter
@@ -390,16 +390,16 @@ SalInfoPrinter* X11SalInstance::CreateInfoPrinter( SalPrinterQueueInfo* pQueueIn
         if( pJobSetup->mpDriverData )
             JobData::constructFromStreamBuffer( pJobSetup->mpDriverData, pJobSetup->mnDriverDataLen, aInfo );
 
-        pJobSetup->mnSystem         = JOBSETUP_SYSTEM_UNIX;
-        pJobSetup->maPrinterName    = pQueueInfo->maPrinterName;
-        pJobSetup->maDriver         = aInfo.m_aDriverName;
+        pJobSetup->mnSystem			= JOBSETUP_SYSTEM_UNIX;
+        pJobSetup->maPrinterName	= pQueueInfo->maPrinterName;
+        pJobSetup->maDriver			= aInfo.m_aDriverName;
         copyJobDataToJobSetup( pJobSetup, aInfo );
-
+        
         // set/clear backwards compatibility flag
         bool bStrictSO52Compatibility = false;
         std::hash_map<rtl::OUString, rtl::OUString, rtl::OUStringHash >::const_iterator compat_it =
             pJobSetup->maValueMap.find( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "StrictSO52Compatibility" ) ) );
-
+           
         if( compat_it != pJobSetup->maValueMap.end() )
         {
             if( compat_it->second.equalsIgnoreAsciiCaseAscii( "true" ) )
@@ -458,11 +458,11 @@ void X11SalInstance::GetPrinterQueueInfo( ImplPrnQueueList* pList )
         const PrinterInfo& rInfo( rManager.getPrinterInfo( *it ) );
         // Neuen Eintrag anlegen
         SalPrinterQueueInfo* pInfo = new SalPrinterQueueInfo;
-        pInfo->maPrinterName    = *it;
-        pInfo->maDriver         = rInfo.m_aDriverName;
-        pInfo->maLocation       = rInfo.m_aLocation;
-        pInfo->maComment        = rInfo.m_aComment;
-        pInfo->mpSysData        = NULL;
+        pInfo->maPrinterName	= *it;
+        pInfo->maDriver			= rInfo.m_aDriverName;
+        pInfo->maLocation		= rInfo.m_aLocation;
+        pInfo->maComment      	= rInfo.m_aComment;
+        pInfo->mpSysData		= NULL;
 
         sal_Int32 nIndex = 0;
         while( nIndex != -1 )
@@ -603,7 +603,7 @@ BOOL PspSalInfoPrinter::Setup( SalFrame* pFrame, ImplJobSetup* pJobSetup )
         SetData( ~0, pJobSetup );
         JobData::constructFromStreamBuffer( pJobSetup->mpDriverData, pJobSetup->mnDriverDataLen, aInfo );
     }
-
+    
     if( pSetupFunction( aInfo ) )
     {
         rtl_freeMemory( pJobSetup->mpDriverData );
@@ -612,8 +612,8 @@ BOOL PspSalInfoPrinter::Setup( SalFrame* pFrame, ImplJobSetup* pJobSetup )
         int nBytes;
         void* pBuffer = NULL;
         aInfo.getStreamBuffer( pBuffer, nBytes );
-        pJobSetup->mnDriverDataLen  = nBytes;
-        pJobSetup->mpDriverData     = (BYTE*)pBuffer;
+        pJobSetup->mnDriverDataLen	= nBytes;
+        pJobSetup->mpDriverData		= (BYTE*)pBuffer;
 
         // copy everything to job setup
         copyJobDataToJobSetup( pJobSetup, aInfo );
@@ -648,7 +648,7 @@ BOOL PspSalInfoPrinter::SetPrinterData( ImplJobSetup* pJobSetup )
         return SetData( ~0, pJobSetup );
 
     copyJobDataToJobSetup( pJobSetup, m_aJobData );
-
+    
     return TRUE;
 }
 
@@ -676,13 +676,13 @@ BOOL PspSalInfoPrinter::SetData(
             int nWidth, nHeight;
             if( pJobSetup->meOrientation == ORIENTATION_PORTRAIT )
             {
-                nWidth  = pJobSetup->mnPaperWidth;
-                nHeight = pJobSetup->mnPaperHeight;
+                nWidth	= pJobSetup->mnPaperWidth;
+                nHeight	= pJobSetup->mnPaperHeight;
             }
             else
             {
-                nWidth  = pJobSetup->mnPaperHeight;
-                nHeight = pJobSetup->mnPaperWidth;
+                nWidth	= pJobSetup->mnPaperHeight;
+                nHeight	= pJobSetup->mnPaperWidth;
             }
             String aPaper;
 
@@ -695,7 +695,7 @@ BOOL PspSalInfoPrinter::SetData(
 
             pKey = aData.m_pParser->getKey( String( RTL_CONSTASCII_USTRINGPARAM( "PageSize" ) ) );
             pValue = pKey ? pKey->getValueCaseInsensitive( aPaper ) : NULL;
-
+            
             // some PPD files do not specify the standard paper names (e.g. C5 instead of EnvC5)
             // try to find the correct paper anyway using the size
             if( pKey && ! pValue && pJobSetup->mePaperFormat != PAPER_USER )
@@ -706,7 +706,7 @@ BOOL PspSalInfoPrinter::SetData(
                     TenMuToPt( aInfo.getHeight() ) );
                 pValue = pKey->getValueCaseInsensitive( aPaper );
             }
-
+            
             if( ! ( pKey && pValue && aData.m_aContext.setValue( pKey, pValue, false ) == pValue ) )
                 return FALSE;
         }
@@ -809,12 +809,12 @@ void PspSalInfoPrinter::GetPageInfo(
             aData.m_pParser->getMargins( aPaper, top, bottom, right, left );
         }
 
-        rPageWidth  = width * nDPI / 72;
-        rPageHeight = height * nDPI / 72;
-        rPageOffX   = left * nDPI / 72;
-        rPageOffY   = top * nDPI / 72;
-        rOutWidth   = ( width  - left - right ) * nDPI / 72;
-        rOutHeight  = ( height - top  - bottom ) * nDPI / 72;
+        rPageWidth	= width * nDPI / 72;
+        rPageHeight	= height * nDPI / 72;
+        rPageOffX	= left * nDPI / 72;
+        rPageOffY	= top * nDPI / 72;
+        rOutWidth	= ( width  - left - right ) * nDPI / 72;
+        rOutHeight	= ( height - top  - bottom ) * nDPI / 72;
     }
 }
 
@@ -903,7 +903,7 @@ ULONG PspSalInfoPrinter::GetCapabilities( const ImplJobSetup* pJobSetup, USHORT
 // =======================================================================
 
 /*
- *  SalPrinter
+ *	SalPrinter
  */
 
  PspSalPrinter::PspSalPrinter( SalInfoPrinter* pInfoPrinter )
@@ -945,11 +945,11 @@ BOOL PspSalPrinter::StartJob(
 {
     vcl_sal::PrinterUpdate::jobStarted();
 
-    m_bFax      = false;
-    m_bPdf      = false;
-    m_aFileName = pFileName ? *pFileName : String();
-    m_aTmpFile  = String();
-    m_nCopies   = nCopies;
+    m_bFax		= false;
+    m_bPdf		= false;
+    m_aFileName	= pFileName ? *pFileName : String();
+    m_aTmpFile	= String();
+    m_nCopies	= nCopies;
     m_bCollate  = bCollate;
 
     JobData::constructFromStreamBuffer( pJobSetup->mpDriverData, pJobSetup->mnDriverDataLen, m_aJobData );
@@ -1001,7 +1001,7 @@ BOOL PspSalPrinter::StartJob(
         }
     }
     m_aPrinterGfx.Init( m_aJobData );
-
+    
     // set/clear backwards compatibility flag
     bool bStrictSO52Compatibility = false;
     std::hash_map<rtl::OUString, rtl::OUString, rtl::OUStringHash >::const_iterator compat_it =
@@ -1131,14 +1131,14 @@ void vcl_sal::PrinterUpdate::update()
 {
     if( Application::GetSettings().GetMiscSettings().GetDisablePrinting() )
         return;
-
+    
     if( ! static_cast< X11SalInstance* >(GetSalData()->m_pInstance)->isPrinterInit() )
     {
         // #i45389# start background printer detection
         psp::PrinterInfoManager::get();
         return;
     }
-
+    
     if( nActiveJobs < 1 )
         doUpdate();
     else if( ! pPrinterUpdateTimer )
diff --git a/vcl/unx/source/gdi/salvd.cxx b/vcl/unx/source/gdi/salvd.cxx
index f242fffae715..f80faa005209 100644
--- a/vcl/unx/source/gdi/salvd.cxx
+++ b/vcl/unx/source/gdi/salvd.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
@@ -98,7 +98,7 @@ void X11SalGraphics::Init( X11SalVirtualDevice *pDevice, SalColormap* pColormap,
 
     SalDisplay *pDisplay  = pDevice->GetDisplay();
     m_nScreen = pDevice->GetScreenNumber();
-
+    
     int nVisualDepth = pDisplay->GetColormap( m_nScreen ).GetVisual().GetDepth();
     int nDeviceDepth = pDevice->GetDepth();
 
@@ -111,18 +111,18 @@ void X11SalGraphics::Init( X11SalVirtualDevice *pDevice, SalColormap* pColormap,
     else
     if( nDeviceDepth == nVisualDepth )
         m_pColormap = &pDisplay->GetColormap( m_nScreen );
-    else
+    else 
     if( nDeviceDepth == 1 )
         m_pColormap = m_pDeleteColormap = new SalColormap();
-
+             
     if (m_pDeleteColormap != pOrigDeleteColormap)
         delete pOrigDeleteColormap;
 
     const Drawable aVdevDrawable = pDevice->GetDrawable();
     SetDrawable( aVdevDrawable, m_nScreen );
 
-    m_pVDev      = pDevice;
-    m_pFrame     = NULL;
+    m_pVDev		 = pDevice;
+    m_pFrame	 = NULL;
 
     bWindow_     = pDisplay->IsDisplay();
     bVirDev_     = TRUE;
@@ -141,7 +141,7 @@ BOOL X11SalVirtualDevice::Init( SalDisplay *pDisplay,
     bool bDeleteColormap = false;
 
     pDisplay_               = pDisplay;
-    pGraphics_              = new X11SalGraphics();
+    pGraphics_				= new X11SalGraphics();
     m_nScreen               = nScreen;
     if( pRenderFormatVoid ) {
         XRenderPictFormat *pRenderFormat = ( XRenderPictFormat* )pRenderFormatVoid;
@@ -220,7 +220,7 @@ BOOL X11SalVirtualDevice::SetSize( long nDX, long nDY )
 {
     if( bExternPixmap_ )
         return FALSE;
-
+    
     // #144688#
     // the X protocol request CreatePixmap puts an upper bound
     // of 16 bit to the size. Beyond that there may be implementation
@@ -260,7 +260,7 @@ BOOL X11SalVirtualDevice::SetSize( long nDX, long nDY )
 
     if( pGraphics_ )
         InitGraphics( this );
-
+    
     return TRUE;
 }
 
diff --git a/vcl/unx/source/gdi/xfont.cxx b/vcl/unx/source/gdi/xfont.cxx
index f6d19909cd4a..b31eab24fcef 100644
--- a/vcl/unx/source/gdi/xfont.cxx
+++ b/vcl/unx/source/gdi/xfont.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
@@ -46,13 +46,13 @@
 
 #include <algorithm>
 
-#define VCLASS_ROTATE           0
-#define VCLASS_ROTATE_REVERSE   1
-#define VCLASS_TRANSFORM1       2
-#define VCLASS_TRANSFORM2       3
-#define VCLASS_CJK              4
-#define VCLASS_DONTKNOW         5
-#define VCLASS_FONT_NUM         2 // Other than rotate and rotate_reverse,
+#define VCLASS_ROTATE 			0
+#define VCLASS_ROTATE_REVERSE 	1
+#define VCLASS_TRANSFORM1 		2
+#define VCLASS_TRANSFORM2		3
+#define VCLASS_CJK 				4
+#define VCLASS_DONTKNOW	        5
+#define VCLASS_FONT_NUM			2 // Other than rotate and rotate_reverse,
                                   // don't have spacial font
 
 // Select the max size of a font, which is token for real
@@ -238,24 +238,24 @@ ExtendedFontStruct::GetFontBoundingBox( XCharStruct *pCharStruct,
 bool
 ExtendedFontStruct::ToImplFontMetricData(ImplFontMetricData *pFontMetric)
 {
-    pFontMetric->mnOrientation  = 0;
-    pFontMetric->mnSlant        = 0;
-    pFontMetric->mbDevice       = true;
-    pFontMetric->mbScalableFont = mpXlfd->IsScalable();
-    pFontMetric->mbKernableFont = false;
+    pFontMetric->mnOrientation	= 0;
+    pFontMetric->mnSlant		= 0;
+    pFontMetric->mbDevice		= true;
+    pFontMetric->mbScalableFont	= mpXlfd->IsScalable();
+    pFontMetric->mbKernableFont	= false;
     pFontMetric->mbSymbolFlag= mpXlfd->IsSymbolFont();
-    pFontMetric->meFamily   = mpXlfd->GetFamilyType();
+    pFontMetric->meFamily  	= mpXlfd->GetFamilyType();
     pFontMetric->meWeight   = mpXlfd->GetWeight();
-    pFontMetric->mePitch    = mpXlfd->GetPitch();
-    pFontMetric->meItalic   = mpXlfd->GetSlant();
+    pFontMetric->mePitch	= mpXlfd->GetPitch();
+    pFontMetric->meItalic  	= mpXlfd->GetSlant();
 
     int nAscent, nDescent;
     XCharStruct aBoundingBox;
     if ( GetFontBoundingBox(&aBoundingBox, &nAscent, &nDescent) )
     {
-        pFontMetric->mnWidth     = aBoundingBox.width;
-        pFontMetric->mnAscent    = aBoundingBox.ascent;
-        pFontMetric->mnDescent   = aBoundingBox.descent;
+        pFontMetric->mnWidth	 = aBoundingBox.width;
+        pFontMetric->mnAscent	 = aBoundingBox.ascent;
+        pFontMetric->mnDescent	 = aBoundingBox.descent;
         pFontMetric->mnIntLeading = std::max(0, aBoundingBox.ascent  - nAscent
                                           + aBoundingBox.descent - nDescent );
         pFontMetric->mnExtLeading = 0; // TODO!!!
@@ -565,7 +565,7 @@ ExtendedFontStruct::GetCharWidth16( sal_Unicode nFrom, sal_Unicode nTo,
                             nChar, mnDefaultWidth );
             }
             else
-            if (   (pFont->max_bounds.width ==  pFont->min_bounds.width)
+            if (   (pFont->max_bounds.width == 	pFont->min_bounds.width)
                 || (pFont->per_char == NULL) )
             {
                 // fixed width font
diff --git a/vcl/unx/source/gdi/xlfd_attr.cxx b/vcl/unx/source/gdi/xlfd_attr.cxx
index ca49a8548afb..9e8d63c4d5db 100644
--- a/vcl/unx/source/gdi/xlfd_attr.cxx
+++ b/vcl/unx/source/gdi/xlfd_attr.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
@@ -173,10 +173,10 @@ Attribute::TagFeature( unsigned short nFeature )
             mnFeature |= (XLFD_FEATURE_INTERFACE_FONT | XLFD_FEATURE_MQ);
         else
         // japanese
-        if (   (strcmp(mpName, "hg mincho l")  == 0)    /* Solaris: jisx0208 jisx0201 */
-            || (strcmp(mpName, "heiseimin")    == 0)    /* Solaris: jisx0212 */
-            || (strcmp(mpName, "minchol")      == 0)    /* TurboLinux */
-            || (strcmp(mpName, "mincho")       == 0))   /* Redhat 6.2 JP */
+        if (   (strcmp(mpName, "hg mincho l")  == 0)  	/* Solaris: jisx0208 jisx0201 */
+            || (strcmp(mpName, "heiseimin")    == 0) 	/* Solaris: jisx0212 */
+            || (strcmp(mpName, "minchol")      == 0)	/* TurboLinux */
+            || (strcmp(mpName, "mincho")       == 0))	/* Redhat 6.2 JP */
         {
             mnFeature |= XLFD_FEATURE_INTERFACE_FONT;
         }
@@ -189,7 +189,7 @@ Attribute::TagFeature( unsigned short nFeature )
         }
         else
         // korean
-        if (   (strcmp(mpName, "myeongjo")    == 0))    /* Solaris */
+        if (   (strcmp(mpName, "myeongjo")    == 0)) 	/* Solaris */
         {
             mnFeature |= XLFD_FEATURE_INTERFACE_FONT;
         }
@@ -204,14 +204,14 @@ Attribute::TagFeature( unsigned short nFeature )
                 break;
 
             case 'b':
-                if (   (strcmp(mpName, "bold")        == 0)
+                if (   (strcmp(mpName, "bold") 	      == 0)
                     || (strcmp(mpName, "bold italic") == 0)
                     || (strcmp(mpName, "bold sans")   == 0) )
                     mnFeature |= XLFD_FEATURE_REDUNDANTSTYLE;
                 break;
 
             case 'd':
-                if (   (strcmp(mpName, "demi")        == 0)
+                if (   (strcmp(mpName, "demi") 		  == 0)
                     || (strcmp(mpName, "demi italic") == 0) )
                     mnFeature |= XLFD_FEATURE_REDUNDANTSTYLE;
                 break;
@@ -237,76 +237,76 @@ Attribute::TagFeature( unsigned short nFeature )
 #define MembersOf( p ) (sizeof(p) / sizeof(p[0]) )
 
 const Attribute pFamilyAttribute[] = {
-    { InitializeAttributeWith( "arial",                 FAMILY_SWISS )  },
-    { InitializeAttributeWith( "arioso",                FAMILY_SCRIPT ) },
-    { InitializeAttributeWith( "avant garde",           FAMILY_SWISS )  },
-    { InitializeAttributeWith( "avantgarde",            FAMILY_SWISS )  },
-    { InitializeAttributeWith( "bembo",                 FAMILY_ROMAN )  },
-    { InitializeAttributeWith( "bookman",               FAMILY_ROMAN )  },
-    { InitializeAttributeWith( "conga",                 FAMILY_ROMAN )  },
-    { InitializeAttributeWith( "courier",               FAMILY_MODERN ) },
-    { InitializeAttributeWith( "curl",                  FAMILY_SCRIPT ) },
-    { InitializeAttributeWith( "fixed",                 FAMILY_MODERN ) },
-    { InitializeAttributeWith( "gill",                  FAMILY_SWISS )  },
-    { InitializeAttributeWith( "helmet",                FAMILY_MODERN ) },
-    { InitializeAttributeWith( "helvetica",             FAMILY_SWISS )  },
-    { InitializeAttributeWith( "international",         FAMILY_MODERN ) },
-    { InitializeAttributeWith( "lucida",                FAMILY_SWISS )  },
+    { InitializeAttributeWith( "arial", 				FAMILY_SWISS )  },
+    { InitializeAttributeWith( "arioso", 				FAMILY_SCRIPT ) },
+    { InitializeAttributeWith( "avant garde",			FAMILY_SWISS )  },
+    { InitializeAttributeWith( "avantgarde", 			FAMILY_SWISS )  },
+    { InitializeAttributeWith( "bembo", 				FAMILY_ROMAN )  },
+    { InitializeAttributeWith( "bookman", 				FAMILY_ROMAN )  },
+    { InitializeAttributeWith( "conga", 				FAMILY_ROMAN )  },
+    { InitializeAttributeWith( "courier", 				FAMILY_MODERN ) },
+    { InitializeAttributeWith( "curl", 					FAMILY_SCRIPT ) },
+    { InitializeAttributeWith( "fixed", 				FAMILY_MODERN ) },
+    { InitializeAttributeWith( "gill", 					FAMILY_SWISS )  },
+    { InitializeAttributeWith( "helmet", 				FAMILY_MODERN ) },
+    { InitializeAttributeWith( "helvetica", 			FAMILY_SWISS )  },
+    { InitializeAttributeWith( "international", 		FAMILY_MODERN ) },
+    { InitializeAttributeWith( "lucida", 				FAMILY_SWISS )  },
     { InitializeAttributeWith( "new century schoolbook", FAMILY_ROMAN ) },
-    { InitializeAttributeWith( "palatino",              FAMILY_ROMAN )  },
-    { InitializeAttributeWith( "roman",                 FAMILY_ROMAN )  },
-    { InitializeAttributeWith( "sans serif",            FAMILY_SWISS )  },
-    { InitializeAttributeWith( "sansserif",             FAMILY_SWISS )  },
-    { InitializeAttributeWith( "serf",                  FAMILY_ROMAN )  },
-    { InitializeAttributeWith( "serif",                 FAMILY_ROMAN )  },
-    { InitializeAttributeWith( "times",                 FAMILY_ROMAN )  },
-    { InitializeAttributeWith( "utopia",                FAMILY_ROMAN )  },
-    { InitializeAttributeWith( "zapf chancery",         FAMILY_SCRIPT ) },
-    { InitializeAttributeWith( "zapfchancery",          FAMILY_SCRIPT ) }
+    { InitializeAttributeWith( "palatino", 				FAMILY_ROMAN )  },
+    { InitializeAttributeWith( "roman", 				FAMILY_ROMAN )  },
+    { InitializeAttributeWith( "sans serif", 			FAMILY_SWISS )  },
+    { InitializeAttributeWith( "sansserif", 			FAMILY_SWISS )  },
+    { InitializeAttributeWith( "serf", 					FAMILY_ROMAN )  },
+    { InitializeAttributeWith( "serif", 				FAMILY_ROMAN )  },
+    { InitializeAttributeWith( "times", 				FAMILY_ROMAN )  },
+    { InitializeAttributeWith( "utopia", 				FAMILY_ROMAN )  },
+    { InitializeAttributeWith( "zapf chancery", 		FAMILY_SCRIPT ) },
+    { InitializeAttributeWith( "zapfchancery", 			FAMILY_SCRIPT ) }
 };
 
 const Attribute pWeightAttribute[] = {
-    { InitializeAttributeWith( "black",                 WEIGHT_BLACK )      },
-    { InitializeAttributeWith( "bold",                  WEIGHT_BOLD )       },
-    { InitializeAttributeWith( "book",                  WEIGHT_LIGHT )      },
-    { InitializeAttributeWith( "demi",                  WEIGHT_SEMIBOLD )   },
-    { InitializeAttributeWith( "demi bold",             WEIGHT_SEMIBOLD )   },
-    { InitializeAttributeWith( "demibold",              WEIGHT_SEMIBOLD )   },
-    { InitializeAttributeWith( "light",                 WEIGHT_LIGHT )      },
-    { InitializeAttributeWith( "medium",                WEIGHT_MEDIUM )     },
-    { InitializeAttributeWith( "normal",                WEIGHT_NORMAL )     },
-    { InitializeAttributeWith( "regular",               WEIGHT_NORMAL )     },
-    { InitializeAttributeWith( "roman",                 WEIGHT_NORMAL )     },
-    { InitializeAttributeWith( "semicondensed",         WEIGHT_LIGHT )      },
-    { InitializeAttributeWith( "ultrabold",             WEIGHT_ULTRABOLD )  }
+    { InitializeAttributeWith( "black", 				WEIGHT_BLACK ) 		},
+    { InitializeAttributeWith( "bold", 					WEIGHT_BOLD )  		},
+    { InitializeAttributeWith( "book", 					WEIGHT_LIGHT )  	},
+    { InitializeAttributeWith( "demi", 					WEIGHT_SEMIBOLD ) 	},
+    { InitializeAttributeWith( "demi bold",	 			WEIGHT_SEMIBOLD ) 	},
+    { InitializeAttributeWith( "demibold", 				WEIGHT_SEMIBOLD ) 	},
+    { InitializeAttributeWith( "light",				 	WEIGHT_LIGHT )  	},
+    { InitializeAttributeWith( "medium", 				WEIGHT_MEDIUM ) 	},
+    { InitializeAttributeWith( "normal", 				WEIGHT_NORMAL ) 	},
+    { InitializeAttributeWith( "regular", 				WEIGHT_NORMAL ) 	},
+    { InitializeAttributeWith( "roman", 				WEIGHT_NORMAL )	 	},
+    { InitializeAttributeWith( "semicondensed",			WEIGHT_LIGHT )  	},
+    { InitializeAttributeWith( "ultrabold", 			WEIGHT_ULTRABOLD ) 	}
 };
 
 const Attribute pSlantAttribute[] = {
-    { InitializeAttributeWith( "i",                     ITALIC_NORMAL )     },
-    { InitializeAttributeWith( "o",                     ITALIC_OBLIQUE )    },
-    { InitializeAttributeWith( "r",                     ITALIC_NONE )       }
+    { InitializeAttributeWith( "i", 					ITALIC_NORMAL )  	},
+    { InitializeAttributeWith( "o", 					ITALIC_OBLIQUE ) 	},
+    { InitializeAttributeWith( "r", 					ITALIC_NONE )    	}
 };
 
 const Attribute pSetwidthAttribute[] = {
-    { InitializeAttributeWith( "bold",              WIDTH_SEMI_EXPANDED )   },
-    { InitializeAttributeWith( "condensed",         WIDTH_CONDENSED )       },
-    { InitializeAttributeWith( "double wide",       WIDTH_ULTRA_EXPANDED )  },
-    { InitializeAttributeWith( "expanded",          WIDTH_EXPANDED )        },
-    { InitializeAttributeWith( "extracondensed",    WIDTH_EXTRA_CONDENSED ) },
-    { InitializeAttributeWith( "extraexpanded",     WIDTH_EXTRA_EXPANDED )  },
-    { InitializeAttributeWith( "medium",            WIDTH_NORMAL )          },
-    { InitializeAttributeWith( "narrow",            WIDTH_CONDENSED )       },
-    { InitializeAttributeWith( "normal",            WIDTH_NORMAL )          },
-    { InitializeAttributeWith( "semicondensed",     WIDTH_SEMI_CONDENSED )  },
-    { InitializeAttributeWith( "semiexpanded",      WIDTH_SEMI_EXPANDED )   },
-    { InitializeAttributeWith( "ultracondensed",    WIDTH_ULTRA_CONDENSED ) },
-    { InitializeAttributeWith( "ultraexpanded",     WIDTH_ULTRA_EXPANDED )  },
-    { InitializeAttributeWith( "wide",              WIDTH_EXPANDED )        }
+    { InitializeAttributeWith( "bold", 				WIDTH_SEMI_EXPANDED )   },
+    { InitializeAttributeWith( "condensed", 		WIDTH_CONDENSED ) 	    },
+    { InitializeAttributeWith( "double wide", 		WIDTH_ULTRA_EXPANDED )  },
+    { InitializeAttributeWith( "expanded", 			WIDTH_EXPANDED ) 		},
+    { InitializeAttributeWith( "extracondensed", 	WIDTH_EXTRA_CONDENSED )	},
+    { InitializeAttributeWith( "extraexpanded", 	WIDTH_EXTRA_EXPANDED ) 	},
+    { InitializeAttributeWith( "medium", 			WIDTH_NORMAL ) 			},
+    { InitializeAttributeWith( "narrow", 			WIDTH_CONDENSED ) 		},
+    { InitializeAttributeWith( "normal", 			WIDTH_NORMAL ) 			},
+    { InitializeAttributeWith( "semicondensed", 	WIDTH_SEMI_CONDENSED ) 	},
+    { InitializeAttributeWith( "semiexpanded", 		WIDTH_SEMI_EXPANDED ) 	},
+    { InitializeAttributeWith( "ultracondensed", 	WIDTH_ULTRA_CONDENSED )	},
+    { InitializeAttributeWith( "ultraexpanded", 	WIDTH_ULTRA_EXPANDED ) 	},
+    { InitializeAttributeWith( "wide", 				WIDTH_EXPANDED ) 		}
 };
 
 const Attribute pEnhancedCharsetAttribute[] = {
-    { InitializeAttributeWith( "iso8859-1",     RTL_TEXTENCODING_MS_1252 ) },
-    { InitializeAttributeWith( "iso8859_1",     RTL_TEXTENCODING_MS_1252 ) }
+    { InitializeAttributeWith( "iso8859-1",		RTL_TEXTENCODING_MS_1252 ) },
+    { InitializeAttributeWith( "iso8859_1",		RTL_TEXTENCODING_MS_1252 ) }
 };
 
 // -------------------------------------------------------------------------
@@ -333,7 +333,7 @@ AppendAttribute( Attribute *pAttribute, ByteString &rString )
 //
 // Prettify the font name: make each leading character of a fontname
 // uppercase. For example
-//      times new roman -> Times New Roman
+// 		times new roman -> Times New Roman
 //
 
 static void
diff --git a/vcl/unx/source/gdi/xlfd_attr.hxx b/vcl/unx/source/gdi/xlfd_attr.hxx
index b721310da506..46a1f6e9ec51 100644
--- a/vcl/unx/source/gdi/xlfd_attr.hxx
+++ b/vcl/unx/source/gdi/xlfd_attr.hxx
@@ -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
@@ -33,39 +33,39 @@
 
 struct Attribute {
 
-    const char*     mpName;
+    const char*	 	mpName;
     unsigned short  mnLength;
-    unsigned short  mnValue;
-    unsigned short  mnFeature;
-    String*         mpAnnotation;
-    rtl::OString*   mpKeyName;
+    unsigned short 	mnValue;
+    unsigned short 	mnFeature;
+    String*			mpAnnotation;
+    rtl::OString*	mpKeyName;
 
-    const char*     GetName() const
+    const char*		GetName() const
                             { return mpName;   }
-    unsigned short  GetValue() const
+    unsigned short	GetValue() const
                             { return mnValue;  }
     unsigned short  GetLength() const
                             { return mnLength; }
-    Bool            HasFeature( unsigned short nFeature ) const
+    Bool  			HasFeature( unsigned short nFeature ) const
                              { return ((mnFeature & nFeature) != 0); }
     const String   &GetAnnotation() const
                             { return *mpAnnotation; }
     const rtl::OString&
                     GetKey();
-    void            InitKey();
+    void			InitKey();
 
-    void            SetName( const char *p, int nLen );
-    void            SetValue( unsigned short nIn )
+    void			SetName( const char *p, int nLen );
+    void			SetValue( unsigned short nIn )
                             { mnValue = nIn; }
-    void            SetAnnotation( String *pString )
+    void   			SetAnnotation( String *pString )
                             { mpAnnotation = pString; }
-    void            SetFeature( unsigned short nFeature )
+    void			SetFeature( unsigned short nFeature )
                             { mnFeature = nFeature; }
-    void            TagFeature( unsigned short nFeature );
+    void			TagFeature( unsigned short nFeature );
 
-    int             Compare( const char *p, int nLen );
-    Bool            ExactMatch( const char *p, int nLen );
-    void            Release();
+    int				Compare( const char *p, int nLen );
+    Bool			ExactMatch( const char *p, int nLen );
+    void			Release();
 };
 
 
@@ -78,14 +78,14 @@ extern "C" {
 typedef rtl_TextEncoding(*AttributeClassifierT)(const char* pStr);
 }
 
-#define XLFD_FEATURE_NONE                0x0000
-#define XLFD_FEATURE_NARROW              0x0001
-#define XLFD_FEATURE_OL_GLYPH            0x0002
-#define XLFD_FEATURE_OL_CURSOR           0x0004
-#define XLFD_FEATURE_REDUNDANTSTYLE      0x0008
-#define XLFD_FEATURE_APPLICATION_FONT    0x0010
+#define XLFD_FEATURE_NONE			  	 0x0000
+#define XLFD_FEATURE_NARROW			  	 0x0001
+#define XLFD_FEATURE_OL_GLYPH		  	 0x0002
+#define XLFD_FEATURE_OL_CURSOR		  	 0x0004
+#define XLFD_FEATURE_REDUNDANTSTYLE	  	 0x0008
+#define XLFD_FEATURE_APPLICATION_FONT 	 0x0010
 
-#define XLFD_FEATURE_INTERFACE_FONT      0x0020
+#define XLFD_FEATURE_INTERFACE_FONT	 	 0x0020
 #define XLFD_FEATURE_LQ 0x0040
 #define XLFD_FEATURE_MQ 0x0080
 #define XLFD_FEATURE_HQ 0x0100
@@ -105,28 +105,28 @@ class AttributeStorage {
 
     private:
 
-        Attribute*      mpList;
-        unsigned short  mnSize;
-        unsigned short  mnCount;
+        Attribute*		mpList;
+        unsigned short	mnSize;
+        unsigned short	mnCount;
         unsigned short  mnLastmatch;
         unsigned short  mnDefaultValue;
 
-        void            Enlarge();
+        void			Enlarge();
                         AttributeStorage();
 
     public:
 
                         AttributeStorage( unsigned short nDefaultValue );
                         ~AttributeStorage();
-        unsigned short  Insert( const char *pString, int nLength );
-        Attribute*      Retrieve( unsigned short nIndex ) const ;
-        void            AddClassification( Attribute *pClassification,
+        unsigned short	Insert( const char *pString, int nLength );
+        Attribute*		Retrieve( unsigned short nIndex ) const ;
+        void			AddClassification( Attribute *pClassification,
                                 unsigned short nNum );
-        void            AddClassification( AttributeClassifierT Classify );
-        void            TagFeature( unsigned short nFeature );
-        void            AddAnnotation( AttributeAnnotatorT Annotate );
+        void 			AddClassification( AttributeClassifierT Classify );
+        void			TagFeature( unsigned short nFeature );
+        void			AddAnnotation( AttributeAnnotatorT Annotate );
         #if OSL_DEBUG_LEVEL > 1
-        void            Dump();
+        void			Dump();
         #endif
 };
 
@@ -160,20 +160,20 @@ class AttributeProvider {
 
     private:
 
-        AttributeStorage*   mpField[ eXLFDMaxEntry ];
+        AttributeStorage*	mpField[ eXLFDMaxEntry ];
 
-        AttributeStorage*   GetField( eXLFDAttributeT eXLFDField )
+        AttributeStorage* 	GetField( eXLFDAttributeT eXLFDField )
                                     { return mpField[ eXLFDField]; }
     public:
 
                             AttributeProvider ();
                             ~AttributeProvider ();
 
-        void                AddClassification();
-        void                AddAnnotation();
-        void                TagFeature();
+        void 				AddClassification();
+        void 				AddAnnotation();
+        void 				TagFeature();
         #if OSL_DEBUG_LEVEL > 1
-        void                Dump();
+        void				Dump();
         #endif
 
         // these are just shortcuts or proxies for the most common used
@@ -193,34 +193,34 @@ class AttributeProvider {
         AttributeStorage*   GetCharset()
                                     { return GetField(eXLFDCharset); }
 
-        Attribute*      RetrieveFoundry( unsigned short nIndex )
+        Attribute*   	RetrieveFoundry( unsigned short nIndex )
                             { return GetFoundry()->Retrieve(nIndex); }
-        Attribute*      RetrieveFamily( unsigned short nIndex )
+        Attribute*   	RetrieveFamily( unsigned short nIndex )
                             { return GetFamily()->Retrieve(nIndex); }
-        Attribute*      RetrieveWeight( unsigned short nIndex )
+        Attribute*   	RetrieveWeight( unsigned short nIndex )
                             { return GetWeight()->Retrieve(nIndex); }
-        Attribute*      RetrieveSlant( unsigned short nIndex )
+        Attribute*   	RetrieveSlant( unsigned short nIndex )
                             { return GetSlant()->Retrieve(nIndex); }
-        Attribute*      RetrieveSetwidth( unsigned short nIndex )
+        Attribute*   	RetrieveSetwidth( unsigned short nIndex )
                             { return GetSetwidth()->Retrieve(nIndex); }
-        Attribute*      RetrieveAddstyle( unsigned short nIndex )
+        Attribute*   	RetrieveAddstyle( unsigned short nIndex )
                             { return GetAddstyle()->Retrieve(nIndex); }
-        Attribute*      RetrieveCharset( unsigned short nIndex )
+        Attribute*   	RetrieveCharset( unsigned short nIndex )
                             { return GetCharset()->Retrieve(nIndex); }
 
-        unsigned short  InsertFoundry( const char *pString, int nLength )
+        unsigned short	InsertFoundry( const char *pString, int nLength )
                             { return GetFoundry()->Insert(pString, nLength); }
-        unsigned short  InsertFamily( const char *pString, int nLength )
+        unsigned short 	InsertFamily( const char *pString, int nLength )
                             { return GetFamily()->Insert(pString, nLength); }
-        unsigned short  InsertWeight( const char *pString, int nLength )
+        unsigned short 	InsertWeight( const char *pString, int nLength )
                             { return GetWeight()->Insert(pString, nLength); }
-        unsigned short  InsertSlant( const char *pString, int nLength )
+        unsigned short 	InsertSlant( const char *pString, int nLength )
                             { return GetSlant()->Insert(pString, nLength); }
-        unsigned short  InsertSetwidth( const char *pString, int nLength )
+        unsigned short 	InsertSetwidth( const char *pString, int nLength )
                             { return GetSetwidth()->Insert(pString, nLength);}
-        unsigned short  InsertAddstyle( const char *pString, int nLength )
+        unsigned short 	InsertAddstyle( const char *pString, int nLength )
                             { return GetAddstyle()->Insert(pString, nLength);}
-        unsigned short  InsertCharset( const char *pString, int nLength )
+        unsigned short 	InsertCharset( const char *pString, int nLength )
                             { return GetCharset()->Insert(pString, nLength); }
 };
 
diff --git a/vcl/unx/source/gdi/xlfd_extd.cxx b/vcl/unx/source/gdi/xlfd_extd.cxx
index 73731eddf115..a299be82359a 100644
--- a/vcl/unx/source/gdi/xlfd_extd.cxx
+++ b/vcl/unx/source/gdi/xlfd_extd.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,12 +79,12 @@ sal_IntPtr ImplX11FontData::GetFontId() const
 ExtendedXlfd::EncodingInfo&
 ExtendedXlfd::EncodingInfo::operator= ( const Xlfd *pXlfd )
 {
-    mcSpacing     = pXlfd->mcSpacing;
+    mcSpacing	  = pXlfd->mcSpacing;
     mnResolutionX = pXlfd->mnResolutionX;
     mnResolutionY = pXlfd->mnResolutionY;
     mnAddstyle    = pXlfd->mnAddstyle;
     mnCharset     = pXlfd->mnCharset;
-    mnEncoding    = pXlfd->GetEncoding();
+    mnEncoding	  = pXlfd->GetEncoding();
 
     return *this;
 }
@@ -273,9 +273,9 @@ ExtendedXlfd::ToString( ByteString &rString,
         unsigned short /*nPixelSize*/, rtl_TextEncoding /*nEncoding*/ ) const
 {
     AppendAttribute( mpFactory->RetrieveFoundry(mnFoundry),   rString );
-    AppendAttribute( mpFactory->RetrieveFamily(mnFamily),     rString );
-    AppendAttribute( mpFactory->RetrieveWeight(mnWeight),     rString );
-    AppendAttribute( mpFactory->RetrieveSlant(mnSlant),       rString );
+    AppendAttribute( mpFactory->RetrieveFamily(mnFamily), 	  rString );
+    AppendAttribute( mpFactory->RetrieveWeight(mnWeight), 	  rString );
+    AppendAttribute( mpFactory->RetrieveSlant(mnSlant), 	  rString );
     AppendAttribute( mpFactory->RetrieveSetwidth(mnSetwidth), rString );
 }
 
@@ -284,9 +284,9 @@ ExtendedXlfd::ToString( ByteString &rString,
         unsigned short /*nPixelSize*/, char* /*pMatricsString*/, rtl_TextEncoding /*nEncoding*/ ) const
 {
     AppendAttribute( mpFactory->RetrieveFoundry(mnFoundry),   rString );
-    AppendAttribute( mpFactory->RetrieveFamily(mnFamily),     rString );
-    AppendAttribute( mpFactory->RetrieveWeight(mnWeight),     rString );
-    AppendAttribute( mpFactory->RetrieveSlant(mnSlant),       rString );
+    AppendAttribute( mpFactory->RetrieveFamily(mnFamily), 	  rString );
+    AppendAttribute( mpFactory->RetrieveWeight(mnWeight), 	  rString );
+    AppendAttribute( mpFactory->RetrieveSlant(mnSlant), 	  rString );
     AppendAttribute( mpFactory->RetrieveSetwidth(mnSetwidth), rString );
 }
 
@@ -854,7 +854,7 @@ VirtualXlfd::ToString( ByteString &rString, unsigned short nPixelSize,
     AppendAttribute( mpFactory->RetrieveFoundry(rExtInfo.mnFoundry),   rString );
     AppendAttribute( mpFactory->RetrieveFamily(rExtInfo.mnFamily),     rString );
     AppendAttribute( mpFactory->RetrieveWeight(rExtInfo.mnWeight),     rString );
-    AppendAttribute( mpFactory->RetrieveSlant(rExtInfo.mnSlant),       rString );
+    AppendAttribute( mpFactory->RetrieveSlant(rExtInfo.mnSlant), 	   rString );
     AppendAttribute( mpFactory->RetrieveSetwidth(rExtInfo.mnSetwidth), rString );
 
     EncodingInfo& rInfo = mpEncodingInfo[ nIdx ];
@@ -882,7 +882,7 @@ VirtualXlfd::ToString( ByteString &rString, unsigned short nPixelSize,
     AppendAttribute( mpFactory->RetrieveFoundry(rExtInfo.mnFoundry),   rString );
     AppendAttribute( mpFactory->RetrieveFamily(rExtInfo.mnFamily),     rString );
     AppendAttribute( mpFactory->RetrieveWeight(rExtInfo.mnWeight),     rString );
-    AppendAttribute( mpFactory->RetrieveSlant(rExtInfo.mnSlant),       rString );
+    AppendAttribute( mpFactory->RetrieveSlant(rExtInfo.mnSlant), 	   rString );
     AppendAttribute( mpFactory->RetrieveSetwidth(rExtInfo.mnSetwidth), rString );
 
     EncodingInfo& rInfo = mpEncodingInfo[ nIdx ];
@@ -913,7 +913,7 @@ ImplFontData* VirtualXlfd::GetImplFontData() const
     pFontData->meWidthType  = WIDTH_NORMAL;
     pFontData->mePitch      = PITCH_VARIABLE;
 
-    pFontData->mbSymbolFlag = false;
+    pFontData->mbSymbolFlag	= false;
     pFontData->mbOrientation= false;
     pFontData->mbDevice     = true;
     pFontData->mnQuality    = 100;
diff --git a/vcl/unx/source/gdi/xlfd_extd.hxx b/vcl/unx/source/gdi/xlfd_extd.hxx
index 523f87fac477..a18a29b09289 100644
--- a/vcl/unx/source/gdi/xlfd_extd.hxx
+++ b/vcl/unx/source/gdi/xlfd_extd.hxx
@@ -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
@@ -61,18 +61,18 @@ class ExtendedXlfd : public ImplDevFontAttributes
 {
     public:
                              ExtendedXlfd( bool bScalable );
-        virtual             ~ExtendedXlfd();
-        virtual bool        AddEncoding( const Xlfd* );
-        bool                HasEncoding( rtl_TextEncoding ) const;
-        int                 GetEncodingIdx( rtl_TextEncoding nEncoding ) const;
-        unsigned short      NumEncodings() const
+        virtual				~ExtendedXlfd();
+        virtual bool 		AddEncoding( const Xlfd* );
+        bool				HasEncoding( rtl_TextEncoding ) const;
+        int 				GetEncodingIdx( rtl_TextEncoding nEncoding ) const;
+        unsigned short  	NumEncodings() const
                                     { return mnEncodings; }
         virtual int             GetPixelSize() const
                                     { return 0; }
-        virtual void        ToString( ByteString &rString,
+        virtual void		ToString( ByteString &rString,
                                     unsigned short nPixelSize,
                                        rtl_TextEncoding nEncoding ) const ;
-        virtual void        ToString( ByteString &rString,
+        virtual void 		ToString( ByteString &rString,
                                       unsigned short nPixelSize,
                                      char* pMatricsString,
                                        rtl_TextEncoding nEncoding  ) const;
@@ -92,28 +92,28 @@ class ExtendedXlfd : public ImplDevFontAttributes
         int                 GetFontCodeRanges( sal_uInt32* pCodePairs ) const;
 
     protected:
-        AttributeProvider*  mpFactory;
+        AttributeProvider*	mpFactory;
 
     public:
-        unsigned short      mnFoundry;
-        unsigned short      mnFamily;
-        unsigned short      mnWeight;
-        unsigned short      mnSlant;
-        unsigned short      mnSetwidth;
+        unsigned short		mnFoundry;
+        unsigned short		mnFamily;
+        unsigned short		mnWeight;
+        unsigned short		mnSlant;
+        unsigned short		mnSetwidth;
         bool                mbScalable;
 
     protected:
-        unsigned short      mnEncodings;
-        unsigned short      mnEncCapacity;
+        unsigned short  	mnEncodings;
+        unsigned short  	mnEncCapacity;
         struct EncodingInfo {
-            unsigned char       mcSpacing;
-            unsigned short      mnResolutionX;
-            unsigned short      mnResolutionY;
-            unsigned short      mnAddstyle;
-            unsigned short      mnCharset;
-            rtl_TextEncoding    mnEncoding;
-
-            EncodingInfo&       operator= ( const Xlfd *pXlfd );
+            unsigned char		mcSpacing;
+            unsigned short		mnResolutionX;
+            unsigned short		mnResolutionY;
+            unsigned short		mnAddstyle;
+            unsigned short		mnCharset;
+            rtl_TextEncoding	mnEncoding;
+
+            EncodingInfo& 		operator= ( const Xlfd *pXlfd );
         } *mpEncodingInfo;
 };
 
@@ -123,11 +123,11 @@ class ScalableBitmapXlfd : public ExtendedXlfd {
 
     public:
                             ScalableBitmapXlfd();
-        virtual             ~ScalableBitmapXlfd();
-        virtual void        ToString( ByteString &rString,
+        virtual				~ScalableBitmapXlfd();
+        virtual void 		ToString( ByteString &rString,
                                     unsigned short nPixelSize,
                                     rtl_TextEncoding nEncoding ) const;
-        virtual void        ToString( ByteString &rString,
+        virtual void 		ToString( ByteString &rString,
                                     unsigned short nPixelSize,
                                     char* pMatricsString,
                                     rtl_TextEncoding nEncoding ) const;
@@ -144,22 +144,22 @@ class BitmapXlfd : public ExtendedXlfd {
     public:
                             BitmapXlfd();
                             ~BitmapXlfd();
-        bool                AddEncoding( const Xlfd* );
-        virtual int     GetPixelSize() const
+        bool 				AddEncoding( const Xlfd* );
+        virtual int		GetPixelSize() const
                                     { return mnPixelSize; }
-        virtual void        ToString( ByteString &rString,
+        virtual void	 	ToString( ByteString &rString,
                                     unsigned short nPixelSize,
                                     rtl_TextEncoding nEncoding ) const;
-        virtual void        ToString( ByteString &rString,
+        virtual void 		ToString( ByteString &rString,
                                     unsigned short nPixelSize,
                                     char* pMatricsString,
                                     rtl_TextEncoding nEncoding ) const;
         virtual ImplFontData* GetImplFontData() const ;
     protected:
 
-        unsigned short      mnPixelSize;
-        unsigned short      mnPointSize;
-        unsigned short      mnAverageWidth;
+        unsigned short		mnPixelSize;
+        unsigned short		mnPointSize;
+        unsigned short		mnAverageWidth;
 };
 
 // class to handle true scalable fonts
@@ -170,12 +170,12 @@ class ScalableXlfd : public ExtendedXlfd {
 
     public:
                             ScalableXlfd();
-        virtual             ~ScalableXlfd();
-        virtual void        ToString( ByteString &rString,
+        virtual				~ScalableXlfd();
+        virtual void 		ToString( ByteString &rString,
                                     unsigned short nPixelSize,
                                     rtl_TextEncoding nEncoding ) const;
 
-        virtual void        ToString( ByteString &rString,
+        virtual void 		ToString( ByteString &rString,
                                     unsigned short nPixelSize,
                                     char* pMatricsString,
                                     rtl_TextEncoding  nEncoding ) const;
@@ -189,11 +189,11 @@ class XlfdStorage {
     public:
                             XlfdStorage();
 
-        void                Dispose();
-        void                Reset();
+        void				Dispose();
+        void				Reset();
 
-        void                Add( const ExtendedXlfd *pXlfd );
-        void                Add( const XlfdStorage *pXlfd );
+        void				Add( const ExtendedXlfd *pXlfd );
+        void				Add( const XlfdStorage *pXlfd );
         void                AnnounceFonts( ImplDevFontList* ) const;
 
     protected:
@@ -208,7 +208,7 @@ class BitmapXlfdStorage : public XlfdStorage {
 
     public:
 
-        void                AddBitmapFont( const Xlfd *pXlfd );
+        void				AddBitmapFont( const Xlfd *pXlfd );
 };
 
 
@@ -218,17 +218,17 @@ class VirtualXlfd : public ExtendedXlfd
 {
     private:
 
-        int                 GetFontQuality (unsigned short nFamily);
+        int					GetFontQuality (unsigned short nFamily);
 
     public:
                              VirtualXlfd();
-        virtual             ~VirtualXlfd();
-        virtual bool        AddEncoding( const Xlfd* );
-        void                FilterInterfaceFont (const Xlfd *pXlfd);
-        virtual void        ToString( ByteString &rString,
+        virtual				~VirtualXlfd();
+        virtual bool 		AddEncoding( const Xlfd* );
+        void 				FilterInterfaceFont (const Xlfd *pXlfd);
+        virtual void		ToString( ByteString &rString,
                                     unsigned short nPixelSize,
                                        rtl_TextEncoding nEncoding ) const ;
-        virtual void        ToString( ByteString &rString,
+        virtual void 		ToString( ByteString &rString,
                                       unsigned short nPixelSize,
                                      char* pMatricsString,
                                        rtl_TextEncoding nEncoding  ) const;
@@ -236,15 +236,15 @@ class VirtualXlfd : public ExtendedXlfd
         virtual ImplFontData* GetImplFontData() const ;
     protected:
 
-        unsigned short      mnExtCapacity;
+        unsigned short  	mnExtCapacity;
         struct ExtEncodingInfo {
-            unsigned short      mnFoundry;
-            unsigned short      mnFamily;
-            unsigned short      mnWeight;
-            unsigned short      mnSlant;
-            unsigned short      mnSetwidth;
+            unsigned short		mnFoundry;
+            unsigned short		mnFamily;
+            unsigned short		mnWeight;
+            unsigned short		mnSlant;
+            unsigned short		mnSetwidth;
 
-            ExtEncodingInfo&    operator= ( const Xlfd *pXlfd );
+            ExtEncodingInfo&	operator= ( const Xlfd *pXlfd );
         } *mpExtEncodingInfo;
 
     friend class ExtEncodingInfo;
diff --git a/vcl/unx/source/gdi/xlfd_smpl.cxx b/vcl/unx/source/gdi/xlfd_smpl.cxx
index 6cf18d98de1e..39939d64fa11 100644
--- a/vcl/unx/source/gdi/xlfd_smpl.cxx
+++ b/vcl/unx/source/gdi/xlfd_smpl.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
@@ -90,7 +90,7 @@ XlfdCompare( const void *vFrom, const void *vTo )
     int nFromCompare =     (pFromAddStyle->GetValue() != RTL_TEXTENCODING_DONTKNOW)
                         || (pFromAddStyle->HasFeature(XLFD_FEATURE_REDUNDANTSTYLE)) ?
                          -1 : pFrom->mnAddstyle;
-    int nToCompare   =     (pToAddStyle->GetValue()   != RTL_TEXTENCODING_DONTKNOW)
+    int nToCompare   = 	   (pToAddStyle->GetValue()   != RTL_TEXTENCODING_DONTKNOW)
                         || (pToAddStyle->HasFeature(XLFD_FEATURE_REDUNDANTSTYLE))   ?
                         -1 : pTo->mnAddstyle;
 
@@ -173,7 +173,7 @@ Xlfd::FromString( const char* pXlfdstring, AttributeProvider *pFactory )
         return False;
 
     const char* pFrom = pXlfdstring + 1;
-    const char* pTo   = pFrom;
+    const char*	pTo   = pFrom;
     mpFactory         = pFactory;
 
     Advance( &pFrom, &pTo ); //-foundry-*
@@ -240,9 +240,9 @@ const char*
 Xlfd::ToString( ByteString &rString ) const
 {
     AppendAttribute( mpFactory->RetrieveFoundry(mnFoundry),   rString );
-    AppendAttribute( mpFactory->RetrieveFamily(mnFamily),     rString );
-    AppendAttribute( mpFactory->RetrieveWeight(mnWeight),     rString );
-    AppendAttribute( mpFactory->RetrieveSlant(mnSlant),       rString );
+    AppendAttribute( mpFactory->RetrieveFamily(mnFamily), 	  rString );
+    AppendAttribute( mpFactory->RetrieveWeight(mnWeight), 	  rString );
+    AppendAttribute( mpFactory->RetrieveSlant(mnSlant), 	  rString );
     AppendAttribute( mpFactory->RetrieveSetwidth(mnSetwidth), rString );
     AppendAttribute( mpFactory->RetrieveAddstyle(mnAddstyle), rString );
 
diff --git a/vcl/unx/source/gdi/xlfd_smpl.hxx b/vcl/unx/source/gdi/xlfd_smpl.hxx
index f62ac381e6b9..5e3a106fc0a4 100644
--- a/vcl/unx/source/gdi/xlfd_smpl.hxx
+++ b/vcl/unx/source/gdi/xlfd_smpl.hxx
@@ -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
@@ -42,28 +42,28 @@ class AttributeProvider;
 // --------------------------------------------------------------------------
 
 enum XlfdFonttype {
-    eTypeUnknown        = TYPE_DONTKNOW,
-    eTypeBitmap         = TYPE_RASTER,
+    eTypeUnknown		= TYPE_DONTKNOW,
+    eTypeBitmap 		= TYPE_RASTER,
     eTypeScalableBitmap = TYPE_VECTOR,
-    eTypeScalable       = TYPE_SCALABLE
+    eTypeScalable 		= TYPE_SCALABLE
 };
 
 class Xlfd {
 
     public:
 
-        unsigned short  mnFoundry;
-        unsigned short  mnFamily;
-        unsigned short  mnWeight;
-        unsigned short  mnSlant;
-        unsigned short  mnSetwidth;
-        unsigned short  mnAddstyle;
-        unsigned short  mnPixelSize;
-        unsigned short  mnPointSize;
-        unsigned short  mnResolutionX;
-        unsigned short  mnResolutionY;
-        unsigned char   mcSpacing;
-        unsigned short  mnAverageWidth;
+        unsigned short	mnFoundry;
+        unsigned short	mnFamily;
+        unsigned short	mnWeight;
+        unsigned short	mnSlant;
+        unsigned short	mnSetwidth;
+        unsigned short	mnAddstyle;
+        unsigned short	mnPixelSize;
+        unsigned short 	mnPointSize;
+        unsigned short 	mnResolutionX;
+        unsigned short 	mnResolutionY;
+        unsigned char  	mcSpacing;
+        unsigned short 	mnAverageWidth;
         unsigned short  mnCharset;
 
                         // all foundry, family, weight ... information referres
@@ -74,14 +74,14 @@ class Xlfd {
 
     public:
                         Xlfd();
-        Bool            FromString( const char* pXlfdstring,
+        Bool			FromString( const char* pXlfdstring,
                                     AttributeProvider *pFactory );
-        Bool            SameFontoutline( const Xlfd *pComparedTo ) const ;
-        XlfdFonttype    Fonttype() const ;
+        Bool 			SameFontoutline( const Xlfd *pComparedTo ) const ;
+        XlfdFonttype 	Fonttype() const ;
         unsigned short  GetEncoding() const ;
         #if OSL_DEBUG_LEVEL > 1
-        const char*     ToString( ByteString &rString ) const ;
-        void            Dump() const;
+        const char*		ToString( ByteString &rString ) const ;
+        void			Dump() const;
         #endif
 };
 
diff --git a/vcl/unx/source/gdi/xrender_peer.cxx b/vcl/unx/source/gdi/xrender_peer.cxx
index 8d24e4098df4..27756e600f26 100644
--- a/vcl/unx/source/gdi/xrender_peer.cxx
+++ b/vcl/unx/source/gdi/xrender_peer.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
@@ -87,7 +87,7 @@ void XRenderPeer::InitRenderLib()
     if( !mpRenderLib ) {
 #ifdef DEBUG
         fprintf( stderr, "Display can do XRender, but no %s installed.\n"
-            "Please install for improved display performance\n", OUStringToOString( aLibName.getStr(),
+            "Please install for improved display performance\n", OUStringToOString( aLibName.getStr(), 
                                                                                     osl_getThreadTextEncoding() ).getStr() );
 #endif
         return;
diff --git a/vcl/unx/source/gdi/xrender_peer.hxx b/vcl/unx/source/gdi/xrender_peer.hxx
index 89dccfcef40b..448d75489a4a 100644
--- a/vcl/unx/source/gdi/xrender_peer.hxx
+++ b/vcl/unx/source/gdi/xrender_peer.hxx
@@ -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
@@ -43,7 +43,7 @@ public:
     int                 GetVersion() const;
 
     sal_uInt32          InitRenderText();
-
+    
 protected:
                         XRenderPeer();
                         ~XRenderPeer();
@@ -291,7 +291,7 @@ inline void XRenderPeer::FreeGlyph( GlyphSet aGS, Glyph nGlyphId ) const
 
 inline void XRenderPeer::CompositeString32( Picture aSrc, Picture aDst,
     GlyphSet aGlyphSet, int nDstX, int nDstY,
-    const unsigned* pText, int nTextLen ) const
+    const unsigned* pText, int nTextLen ) const 
 {
 #ifdef XRENDER_LINK
     XRenderCompositeString32( mpDisplay, PictOpOver, aSrc, aDst, NULL,
diff --git a/vcl/unx/source/inc/airbrush_curs.h b/vcl/unx/source/inc/airbrush_curs.h
index 293c9757e77b..87b990fd8104 100644
--- a/vcl/unx/source/inc/airbrush_curs.h
+++ b/vcl/unx/source/inc/airbrush_curs.h
@@ -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
diff --git a/vcl/unx/source/inc/airbrush_mask.h b/vcl/unx/source/inc/airbrush_mask.h
index 811ea2819669..ec751ea3d6d1 100644
--- a/vcl/unx/source/inc/airbrush_mask.h
+++ b/vcl/unx/source/inc/airbrush_mask.h
@@ -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
diff --git a/vcl/unx/source/inc/ase_curs.h b/vcl/unx/source/inc/ase_curs.h
index 52b67f56d2ae..e4d5f9c127b4 100644
--- a/vcl/unx/source/inc/ase_curs.h
+++ b/vcl/unx/source/inc/ase_curs.h
@@ -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
diff --git a/vcl/unx/source/inc/ase_mask.h b/vcl/unx/source/inc/ase_mask.h
index 5dbd5c134dbf..9bfb37c8628b 100644
--- a/vcl/unx/source/inc/ase_mask.h
+++ b/vcl/unx/source/inc/ase_mask.h
@@ -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
@@ -26,7 +26,7 @@
  ************************************************************************/
 #define ase_mask_width 32
 #define ase_mask_height 32
-#define ase_mask_x_hot 19
+#define ase_mask_x_hot 19 
 #define ase_mask_y_hot 16
 static char ase_mask_bits[] = {
  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
diff --git a/vcl/unx/source/inc/asn_curs.h b/vcl/unx/source/inc/asn_curs.h
index 3b5f4364b5e2..d3f6a12c7d6b 100644
--- a/vcl/unx/source/inc/asn_curs.h
+++ b/vcl/unx/source/inc/asn_curs.h
@@ -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
diff --git a/vcl/unx/source/inc/asn_mask.h b/vcl/unx/source/inc/asn_mask.h
index 902fe80df8a1..c3678bd1ecd4 100644
--- a/vcl/unx/source/inc/asn_mask.h
+++ b/vcl/unx/source/inc/asn_mask.h
@@ -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
diff --git a/vcl/unx/source/inc/asne_curs.h b/vcl/unx/source/inc/asne_curs.h
index 0939b1d07e4b..506ed5cb0587 100644
--- a/vcl/unx/source/inc/asne_curs.h
+++ b/vcl/unx/source/inc/asne_curs.h
@@ -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
diff --git a/vcl/unx/source/inc/asne_mask.h b/vcl/unx/source/inc/asne_mask.h
index 9ab55c293218..6ea83dbf4b32 100644
--- a/vcl/unx/source/inc/asne_mask.h
+++ b/vcl/unx/source/inc/asne_mask.h
@@ -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
diff --git a/vcl/unx/source/inc/asns_curs.h b/vcl/unx/source/inc/asns_curs.h
index fef8fe2f4ab5..3cac3f831a4a 100644
--- a/vcl/unx/source/inc/asns_curs.h
+++ b/vcl/unx/source/inc/asns_curs.h
@@ -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
diff --git a/vcl/unx/source/inc/asns_mask.h b/vcl/unx/source/inc/asns_mask.h
index f90cb95ee721..c11cc00914ba 100644
--- a/vcl/unx/source/inc/asns_mask.h
+++ b/vcl/unx/source/inc/asns_mask.h
@@ -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
diff --git a/vcl/unx/source/inc/asnswe_curs.h b/vcl/unx/source/inc/asnswe_curs.h
index fd6ddaca65cb..af1005484daa 100644
--- a/vcl/unx/source/inc/asnswe_curs.h
+++ b/vcl/unx/source/inc/asnswe_curs.h
@@ -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
diff --git a/vcl/unx/source/inc/asnswe_mask.h b/vcl/unx/source/inc/asnswe_mask.h
index e48da90e3de5..42eab182cc03 100644
--- a/vcl/unx/source/inc/asnswe_mask.h
+++ b/vcl/unx/source/inc/asnswe_mask.h
@@ -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
diff --git a/vcl/unx/source/inc/asnw_curs.h b/vcl/unx/source/inc/asnw_curs.h
index cb3a35d793c7..4b4dd35ee235 100644
--- a/vcl/unx/source/inc/asnw_curs.h
+++ b/vcl/unx/source/inc/asnw_curs.h
@@ -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
diff --git a/vcl/unx/source/inc/asnw_mask.h b/vcl/unx/source/inc/asnw_mask.h
index e583957c4bae..b62f102de41d 100644
--- a/vcl/unx/source/inc/asnw_mask.h
+++ b/vcl/unx/source/inc/asnw_mask.h
@@ -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
diff --git a/vcl/unx/source/inc/ass_curs.h b/vcl/unx/source/inc/ass_curs.h
index ea942cefe942..5c77458a1710 100644
--- a/vcl/unx/source/inc/ass_curs.h
+++ b/vcl/unx/source/inc/ass_curs.h
@@ -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
diff --git a/vcl/unx/source/inc/ass_mask.h b/vcl/unx/source/inc/ass_mask.h
index b35298183cb1..985002dedf38 100644
--- a/vcl/unx/source/inc/ass_mask.h
+++ b/vcl/unx/source/inc/ass_mask.h
@@ -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
diff --git a/vcl/unx/source/inc/asse_curs.h b/vcl/unx/source/inc/asse_curs.h
index 4b30e81882ff..181a83c48fdf 100644
--- a/vcl/unx/source/inc/asse_curs.h
+++ b/vcl/unx/source/inc/asse_curs.h
@@ -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
diff --git a/vcl/unx/source/inc/asse_mask.h b/vcl/unx/source/inc/asse_mask.h
index ad74b0cf724a..ee5f496cccc3 100644
--- a/vcl/unx/source/inc/asse_mask.h
+++ b/vcl/unx/source/inc/asse_mask.h
@@ -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
diff --git a/vcl/unx/source/inc/assw_curs.h b/vcl/unx/source/inc/assw_curs.h
index d26c36e79ed4..c568b16d7380 100644
--- a/vcl/unx/source/inc/assw_curs.h
+++ b/vcl/unx/source/inc/assw_curs.h
@@ -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
diff --git a/vcl/unx/source/inc/assw_mask.h b/vcl/unx/source/inc/assw_mask.h
index ea47a3ee27e9..61a84acae08d 100644
--- a/vcl/unx/source/inc/assw_mask.h
+++ b/vcl/unx/source/inc/assw_mask.h
@@ -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
diff --git a/vcl/unx/source/inc/asw_curs.h b/vcl/unx/source/inc/asw_curs.h
index 7b9b2199955a..48230903e741 100644
--- a/vcl/unx/source/inc/asw_curs.h
+++ b/vcl/unx/source/inc/asw_curs.h
@@ -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
diff --git a/vcl/unx/source/inc/asw_mask.h b/vcl/unx/source/inc/asw_mask.h
index df934399fe91..4602852ae7ac 100644
--- a/vcl/unx/source/inc/asw_mask.h
+++ b/vcl/unx/source/inc/asw_mask.h
@@ -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
diff --git a/vcl/unx/source/inc/aswe_curs.h b/vcl/unx/source/inc/aswe_curs.h
index f06d2140559e..bb8b5d64611d 100644
--- a/vcl/unx/source/inc/aswe_curs.h
+++ b/vcl/unx/source/inc/aswe_curs.h
@@ -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
diff --git a/vcl/unx/source/inc/aswe_mask.h b/vcl/unx/source/inc/aswe_mask.h
index c04dbf5deafb..f583c35c995a 100644
--- a/vcl/unx/source/inc/aswe_mask.h
+++ b/vcl/unx/source/inc/aswe_mask.h
@@ -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
diff --git a/vcl/unx/source/inc/chain_curs.h b/vcl/unx/source/inc/chain_curs.h
index 95b4fbe66c2e..129e16df3259 100644
--- a/vcl/unx/source/inc/chain_curs.h
+++ b/vcl/unx/source/inc/chain_curs.h
@@ -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
diff --git a/vcl/unx/source/inc/chain_mask.h b/vcl/unx/source/inc/chain_mask.h
index 91d89bbed3c6..1c42341646b2 100644
--- a/vcl/unx/source/inc/chain_mask.h
+++ b/vcl/unx/source/inc/chain_mask.h
@@ -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
diff --git a/vcl/unx/source/inc/chainnot_curs.h b/vcl/unx/source/inc/chainnot_curs.h
index 841e2efdec63..1833b3bc4e1c 100644
--- a/vcl/unx/source/inc/chainnot_curs.h
+++ b/vcl/unx/source/inc/chainnot_curs.h
@@ -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
diff --git a/vcl/unx/source/inc/chainnot_mask.h b/vcl/unx/source/inc/chainnot_mask.h
index 9fbed6408c54..b5fc4593227b 100644
--- a/vcl/unx/source/inc/chainnot_mask.h
+++ b/vcl/unx/source/inc/chainnot_mask.h
@@ -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
diff --git a/vcl/unx/source/inc/chart_curs.h b/vcl/unx/source/inc/chart_curs.h
index 9346fbd8f2c0..25a57f4fa5c3 100644
--- a/vcl/unx/source/inc/chart_curs.h
+++ b/vcl/unx/source/inc/chart_curs.h
@@ -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
diff --git a/vcl/unx/source/inc/chart_mask.h b/vcl/unx/source/inc/chart_mask.h
index d4804fb6c85b..d013474a4d1b 100644
--- a/vcl/unx/source/inc/chart_mask.h
+++ b/vcl/unx/source/inc/chart_mask.h
@@ -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
diff --git a/vcl/unx/source/inc/copydata_curs.h b/vcl/unx/source/inc/copydata_curs.h
index e3d0e3e76530..a5e78e1ce2c4 100644
--- a/vcl/unx/source/inc/copydata_curs.h
+++ b/vcl/unx/source/inc/copydata_curs.h
@@ -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
diff --git a/vcl/unx/source/inc/copydata_mask.h b/vcl/unx/source/inc/copydata_mask.h
index f25b0863d807..99f09cb64d6d 100644
--- a/vcl/unx/source/inc/copydata_mask.h
+++ b/vcl/unx/source/inc/copydata_mask.h
@@ -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
diff --git a/vcl/unx/source/inc/copydlnk_curs.h b/vcl/unx/source/inc/copydlnk_curs.h
index 8e22a5bee37b..d5220027e659 100644
--- a/vcl/unx/source/inc/copydlnk_curs.h
+++ b/vcl/unx/source/inc/copydlnk_curs.h
@@ -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
diff --git a/vcl/unx/source/inc/copydlnk_mask.h b/vcl/unx/source/inc/copydlnk_mask.h
index 02ee5db5fbc1..504765107059 100644
--- a/vcl/unx/source/inc/copydlnk_mask.h
+++ b/vcl/unx/source/inc/copydlnk_mask.h
@@ -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
diff --git a/vcl/unx/source/inc/copyfile_curs.h b/vcl/unx/source/inc/copyfile_curs.h
index c74a1da26b66..2eea25d58e44 100644
--- a/vcl/unx/source/inc/copyfile_curs.h
+++ b/vcl/unx/source/inc/copyfile_curs.h
@@ -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
diff --git a/vcl/unx/source/inc/copyfile_mask.h b/vcl/unx/source/inc/copyfile_mask.h
index c13089abaea5..9bdc76fc5f8d 100644
--- a/vcl/unx/source/inc/copyfile_mask.h
+++ b/vcl/unx/source/inc/copyfile_mask.h
@@ -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
diff --git a/vcl/unx/source/inc/copyfiles_curs.h b/vcl/unx/source/inc/copyfiles_curs.h
index e6a9b7a668af..463f612b9c02 100644
--- a/vcl/unx/source/inc/copyfiles_curs.h
+++ b/vcl/unx/source/inc/copyfiles_curs.h
@@ -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
diff --git a/vcl/unx/source/inc/copyfiles_mask.h b/vcl/unx/source/inc/copyfiles_mask.h
index f904b7848f64..2990d86f5f43 100644
--- a/vcl/unx/source/inc/copyfiles_mask.h
+++ b/vcl/unx/source/inc/copyfiles_mask.h
@@ -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
diff --git a/vcl/unx/source/inc/copyflnk_curs.h b/vcl/unx/source/inc/copyflnk_curs.h
index b76368923f31..f45a0b80748f 100644
--- a/vcl/unx/source/inc/copyflnk_curs.h
+++ b/vcl/unx/source/inc/copyflnk_curs.h
@@ -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
diff --git a/vcl/unx/source/inc/copyflnk_mask.h b/vcl/unx/source/inc/copyflnk_mask.h
index b8fac92fdd75..8c7912bcd5ca 100644
--- a/vcl/unx/source/inc/copyflnk_mask.h
+++ b/vcl/unx/source/inc/copyflnk_mask.h
@@ -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
diff --git a/vcl/unx/source/inc/crook_curs.h b/vcl/unx/source/inc/crook_curs.h
index 6e4d5f613959..4ec93c6ceec3 100644
--- a/vcl/unx/source/inc/crook_curs.h
+++ b/vcl/unx/source/inc/crook_curs.h
@@ -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
diff --git a/vcl/unx/source/inc/crook_mask.h b/vcl/unx/source/inc/crook_mask.h
index 7493f3a501dc..21f37e4be928 100644
--- a/vcl/unx/source/inc/crook_mask.h
+++ b/vcl/unx/source/inc/crook_mask.h
@@ -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
diff --git a/vcl/unx/source/inc/crop_curs.h b/vcl/unx/source/inc/crop_curs.h
index a546ce6c1ba8..2323eb1bfd69 100644
--- a/vcl/unx/source/inc/crop_curs.h
+++ b/vcl/unx/source/inc/crop_curs.h
@@ -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
diff --git a/vcl/unx/source/inc/crop_mask.h b/vcl/unx/source/inc/crop_mask.h
index 5a10726cf36c..43e2ce7bdb24 100644
--- a/vcl/unx/source/inc/crop_mask.h
+++ b/vcl/unx/source/inc/crop_mask.h
@@ -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
diff --git a/vcl/unx/source/inc/detective_curs.h b/vcl/unx/source/inc/detective_curs.h
index 9d8a0d6a1c47..14862e9f7ab7 100644
--- a/vcl/unx/source/inc/detective_curs.h
+++ b/vcl/unx/source/inc/detective_curs.h
@@ -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
diff --git a/vcl/unx/source/inc/detective_mask.h b/vcl/unx/source/inc/detective_mask.h
index 14402a37b641..ad877b6ffa7e 100644
--- a/vcl/unx/source/inc/detective_mask.h
+++ b/vcl/unx/source/inc/detective_mask.h
@@ -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
diff --git a/vcl/unx/source/inc/drawarc_curs.h b/vcl/unx/source/inc/drawarc_curs.h
index daea116e186e..6494fbe242d2 100644
--- a/vcl/unx/source/inc/drawarc_curs.h
+++ b/vcl/unx/source/inc/drawarc_curs.h
@@ -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
diff --git a/vcl/unx/source/inc/drawarc_mask.h b/vcl/unx/source/inc/drawarc_mask.h
index c9e2b6dd8737..5626ba8042c8 100644
--- a/vcl/unx/source/inc/drawarc_mask.h
+++ b/vcl/unx/source/inc/drawarc_mask.h
@@ -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
diff --git a/vcl/unx/source/inc/drawbezier_curs.h b/vcl/unx/source/inc/drawbezier_curs.h
index ea677d4734aa..04ecd4a2f6d0 100644
--- a/vcl/unx/source/inc/drawbezier_curs.h
+++ b/vcl/unx/source/inc/drawbezier_curs.h
@@ -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
diff --git a/vcl/unx/source/inc/drawbezier_mask.h b/vcl/unx/source/inc/drawbezier_mask.h
index 17c1075d07a7..73427355121d 100644
--- a/vcl/unx/source/inc/drawbezier_mask.h
+++ b/vcl/unx/source/inc/drawbezier_mask.h
@@ -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
diff --git a/vcl/unx/source/inc/drawcaption_curs.h b/vcl/unx/source/inc/drawcaption_curs.h
index 3fe104f3673e..a19127824354 100644
--- a/vcl/unx/source/inc/drawcaption_curs.h
+++ b/vcl/unx/source/inc/drawcaption_curs.h
@@ -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
diff --git a/vcl/unx/source/inc/drawcaption_mask.h b/vcl/unx/source/inc/drawcaption_mask.h
index 70b39e37b65e..e1366d5b264e 100644
--- a/vcl/unx/source/inc/drawcaption_mask.h
+++ b/vcl/unx/source/inc/drawcaption_mask.h
@@ -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
diff --git a/vcl/unx/source/inc/drawcirclecut_curs.h b/vcl/unx/source/inc/drawcirclecut_curs.h
index dc632873dd3b..90b4cafbfdfe 100644
--- a/vcl/unx/source/inc/drawcirclecut_curs.h
+++ b/vcl/unx/source/inc/drawcirclecut_curs.h
@@ -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
diff --git a/vcl/unx/source/inc/drawcirclecut_mask.h b/vcl/unx/source/inc/drawcirclecut_mask.h
index 1f96be33b86a..7c7e9f8b4a10 100644
--- a/vcl/unx/source/inc/drawcirclecut_mask.h
+++ b/vcl/unx/source/inc/drawcirclecut_mask.h
@@ -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
diff --git a/vcl/unx/source/inc/drawconnect_curs.h b/vcl/unx/source/inc/drawconnect_curs.h
index 994f34b96e0e..98e58f6ad25a 100644
--- a/vcl/unx/source/inc/drawconnect_curs.h
+++ b/vcl/unx/source/inc/drawconnect_curs.h
@@ -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
diff --git a/vcl/unx/source/inc/drawconnect_mask.h b/vcl/unx/source/inc/drawconnect_mask.h
index 187cf31cfd1a..a0ec74d59e46 100644
--- a/vcl/unx/source/inc/drawconnect_mask.h
+++ b/vcl/unx/source/inc/drawconnect_mask.h
@@ -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
diff --git a/vcl/unx/source/inc/drawcrook_curs.h b/vcl/unx/source/inc/drawcrook_curs.h
index 4fdba0e8442a..a350246e8878 100644
--- a/vcl/unx/source/inc/drawcrook_curs.h
+++ b/vcl/unx/source/inc/drawcrook_curs.h
@@ -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
diff --git a/vcl/unx/source/inc/drawcrook_mask.h b/vcl/unx/source/inc/drawcrook_mask.h
index 657fcff2b4fd..2632a88d2e09 100644
--- a/vcl/unx/source/inc/drawcrook_mask.h
+++ b/vcl/unx/source/inc/drawcrook_mask.h
@@ -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
diff --git a/vcl/unx/source/inc/drawcrop_curs.h b/vcl/unx/source/inc/drawcrop_curs.h
index 7f574e1ab351..5b5c744a38e2 100644
--- a/vcl/unx/source/inc/drawcrop_curs.h
+++ b/vcl/unx/source/inc/drawcrop_curs.h
@@ -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
diff --git a/vcl/unx/source/inc/drawcrop_mask.h b/vcl/unx/source/inc/drawcrop_mask.h
index ac2e8885bdbb..657cb2129924 100644
--- a/vcl/unx/source/inc/drawcrop_mask.h
+++ b/vcl/unx/source/inc/drawcrop_mask.h
@@ -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
diff --git a/vcl/unx/source/inc/drawellipse_curs.h b/vcl/unx/source/inc/drawellipse_curs.h
index bddc330d71d2..1f23183e563b 100644
--- a/vcl/unx/source/inc/drawellipse_curs.h
+++ b/vcl/unx/source/inc/drawellipse_curs.h
@@ -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
diff --git a/vcl/unx/source/inc/drawellipse_mask.h b/vcl/unx/source/inc/drawellipse_mask.h
index 0ac5f200eab1..d00fde8419a4 100644
--- a/vcl/unx/source/inc/drawellipse_mask.h
+++ b/vcl/unx/source/inc/drawellipse_mask.h
@@ -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
diff --git a/vcl/unx/source/inc/drawfreehand_curs.h b/vcl/unx/source/inc/drawfreehand_curs.h
index 75795c088c8e..b90d6182ca5a 100644
--- a/vcl/unx/source/inc/drawfreehand_curs.h
+++ b/vcl/unx/source/inc/drawfreehand_curs.h
@@ -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
diff --git a/vcl/unx/source/inc/drawfreehand_mask.h b/vcl/unx/source/inc/drawfreehand_mask.h
index 29edf44a9999..28a9302d329a 100644
--- a/vcl/unx/source/inc/drawfreehand_mask.h
+++ b/vcl/unx/source/inc/drawfreehand_mask.h
@@ -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
diff --git a/vcl/unx/source/inc/drawline_curs.h b/vcl/unx/source/inc/drawline_curs.h
index 2d2aa162fac6..6f82124635be 100644
--- a/vcl/unx/source/inc/drawline_curs.h
+++ b/vcl/unx/source/inc/drawline_curs.h
@@ -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
diff --git a/vcl/unx/source/inc/drawline_mask.h b/vcl/unx/source/inc/drawline_mask.h
index d66b0fd09aaa..79d0e85e1e1f 100644
--- a/vcl/unx/source/inc/drawline_mask.h
+++ b/vcl/unx/source/inc/drawline_mask.h
@@ -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
diff --git a/vcl/unx/source/inc/drawmirror_curs.h b/vcl/unx/source/inc/drawmirror_curs.h
index 3f61e751befb..8e934ef29cbd 100644
--- a/vcl/unx/source/inc/drawmirror_curs.h
+++ b/vcl/unx/source/inc/drawmirror_curs.h
@@ -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
diff --git a/vcl/unx/source/inc/drawmirror_mask.h b/vcl/unx/source/inc/drawmirror_mask.h
index 5394dd74576a..3a5e7523628a 100644
--- a/vcl/unx/source/inc/drawmirror_mask.h
+++ b/vcl/unx/source/inc/drawmirror_mask.h
@@ -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
diff --git a/vcl/unx/source/inc/drawpie_curs.h b/vcl/unx/source/inc/drawpie_curs.h
index 327b15258d3d..c087ada23a35 100644
--- a/vcl/unx/source/inc/drawpie_curs.h
+++ b/vcl/unx/source/inc/drawpie_curs.h
@@ -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
diff --git a/vcl/unx/source/inc/drawpie_mask.h b/vcl/unx/source/inc/drawpie_mask.h
index 6b5e5ac4ff0d..c43d3be498c4 100644
--- a/vcl/unx/source/inc/drawpie_mask.h
+++ b/vcl/unx/source/inc/drawpie_mask.h
@@ -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
diff --git a/vcl/unx/source/inc/drawpolygon_curs.h b/vcl/unx/source/inc/drawpolygon_curs.h
index ee68c707444c..80378a2c1fe1 100644
--- a/vcl/unx/source/inc/drawpolygon_curs.h
+++ b/vcl/unx/source/inc/drawpolygon_curs.h
@@ -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
diff --git a/vcl/unx/source/inc/drawpolygon_mask.h b/vcl/unx/source/inc/drawpolygon_mask.h
index 8b82e237233c..8398e374da39 100644
--- a/vcl/unx/source/inc/drawpolygon_mask.h
+++ b/vcl/unx/source/inc/drawpolygon_mask.h
@@ -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
diff --git a/vcl/unx/source/inc/drawrect_curs.h b/vcl/unx/source/inc/drawrect_curs.h
index c2508d37fad5..8c8db54f3011 100644
--- a/vcl/unx/source/inc/drawrect_curs.h
+++ b/vcl/unx/source/inc/drawrect_curs.h
@@ -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
diff --git a/vcl/unx/source/inc/drawrect_mask.h b/vcl/unx/source/inc/drawrect_mask.h
index 955152f312c9..ebc344d21c1a 100644
--- a/vcl/unx/source/inc/drawrect_mask.h
+++ b/vcl/unx/source/inc/drawrect_mask.h
@@ -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
diff --git a/vcl/unx/source/inc/drawtext_curs.h b/vcl/unx/source/inc/drawtext_curs.h
index c5049670b9ec..48d3f6293ffb 100644
--- a/vcl/unx/source/inc/drawtext_curs.h
+++ b/vcl/unx/source/inc/drawtext_curs.h
@@ -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
diff --git a/vcl/unx/source/inc/drawtext_mask.h b/vcl/unx/source/inc/drawtext_mask.h
index e27ce2514306..c40aff2f6328 100644
--- a/vcl/unx/source/inc/drawtext_mask.h
+++ b/vcl/unx/source/inc/drawtext_mask.h
@@ -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
diff --git a/vcl/unx/source/inc/fill_curs.h b/vcl/unx/source/inc/fill_curs.h
index 792ea50e4f00..70446744062f 100644
--- a/vcl/unx/source/inc/fill_curs.h
+++ b/vcl/unx/source/inc/fill_curs.h
@@ -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
diff --git a/vcl/unx/source/inc/fill_mask.h b/vcl/unx/source/inc/fill_mask.h
index 67681f243f7b..ac72dc108b41 100644
--- a/vcl/unx/source/inc/fill_mask.h
+++ b/vcl/unx/source/inc/fill_mask.h
@@ -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
diff --git a/vcl/unx/source/inc/hshear_curs.h b/vcl/unx/source/inc/hshear_curs.h
index 7f6092b648de..4c1c5e77d5b1 100644
--- a/vcl/unx/source/inc/hshear_curs.h
+++ b/vcl/unx/source/inc/hshear_curs.h
@@ -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
diff --git a/vcl/unx/source/inc/hshear_mask.h b/vcl/unx/source/inc/hshear_mask.h
index 6d09b3b0af01..786ab1a9de7e 100644
--- a/vcl/unx/source/inc/hshear_mask.h
+++ b/vcl/unx/source/inc/hshear_mask.h
@@ -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
diff --git a/vcl/unx/source/inc/invert50.h b/vcl/unx/source/inc/invert50.h
index 7c0d00ce8fa4..9b0f9b71db21 100644
--- a/vcl/unx/source/inc/invert50.h
+++ b/vcl/unx/source/inc/invert50.h
@@ -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
diff --git a/vcl/unx/source/inc/linkdata_curs.h b/vcl/unx/source/inc/linkdata_curs.h
index c60edc3b99d0..2c855fc009de 100644
--- a/vcl/unx/source/inc/linkdata_curs.h
+++ b/vcl/unx/source/inc/linkdata_curs.h
@@ -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
diff --git a/vcl/unx/source/inc/linkdata_mask.h b/vcl/unx/source/inc/linkdata_mask.h
index cf0f89f63b1b..98f16e4bd01a 100644
--- a/vcl/unx/source/inc/linkdata_mask.h
+++ b/vcl/unx/source/inc/linkdata_mask.h
@@ -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
diff --git a/vcl/unx/source/inc/linkfile_curs.h b/vcl/unx/source/inc/linkfile_curs.h
index fb676ae2a04b..2e19fd9e4cb2 100644
--- a/vcl/unx/source/inc/linkfile_curs.h
+++ b/vcl/unx/source/inc/linkfile_curs.h
@@ -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
diff --git a/vcl/unx/source/inc/linkfile_mask.h b/vcl/unx/source/inc/linkfile_mask.h
index 28ff46c4fae4..b012579207ee 100644
--- a/vcl/unx/source/inc/linkfile_mask.h
+++ b/vcl/unx/source/inc/linkfile_mask.h
@@ -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
diff --git a/vcl/unx/source/inc/magnify_curs.h b/vcl/unx/source/inc/magnify_curs.h
index 76114ca410d5..346989a3a453 100644
--- a/vcl/unx/source/inc/magnify_curs.h
+++ b/vcl/unx/source/inc/magnify_curs.h
@@ -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
diff --git a/vcl/unx/source/inc/magnify_mask.h b/vcl/unx/source/inc/magnify_mask.h
index db4213943b6e..ed0146a64410 100644
--- a/vcl/unx/source/inc/magnify_mask.h
+++ b/vcl/unx/source/inc/magnify_mask.h
@@ -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
diff --git a/vcl/unx/source/inc/mirror_curs.h b/vcl/unx/source/inc/mirror_curs.h
index 0f0f1b360224..ebff6f60f8eb 100644
--- a/vcl/unx/source/inc/mirror_curs.h
+++ b/vcl/unx/source/inc/mirror_curs.h
@@ -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
diff --git a/vcl/unx/source/inc/mirror_mask.h b/vcl/unx/source/inc/mirror_mask.h
index da9c00435162..13af1a8d142d 100644
--- a/vcl/unx/source/inc/mirror_mask.h
+++ b/vcl/unx/source/inc/mirror_mask.h
@@ -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
diff --git a/vcl/unx/source/inc/movebezierweight_curs.h b/vcl/unx/source/inc/movebezierweight_curs.h
index a1ece2d925e9..88f20880c4b5 100644
--- a/vcl/unx/source/inc/movebezierweight_curs.h
+++ b/vcl/unx/source/inc/movebezierweight_curs.h
@@ -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
diff --git a/vcl/unx/source/inc/movebezierweight_mask.h b/vcl/unx/source/inc/movebezierweight_mask.h
index 27e0d8c703db..3a53892f36c3 100644
--- a/vcl/unx/source/inc/movebezierweight_mask.h
+++ b/vcl/unx/source/inc/movebezierweight_mask.h
@@ -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
diff --git a/vcl/unx/source/inc/movedata_curs.h b/vcl/unx/source/inc/movedata_curs.h
index b79412bc3f41..062196de77ef 100644
--- a/vcl/unx/source/inc/movedata_curs.h
+++ b/vcl/unx/source/inc/movedata_curs.h
@@ -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
diff --git a/vcl/unx/source/inc/movedata_mask.h b/vcl/unx/source/inc/movedata_mask.h
index e25d0837d8dc..5d0f8b837851 100644
--- a/vcl/unx/source/inc/movedata_mask.h
+++ b/vcl/unx/source/inc/movedata_mask.h
@@ -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
diff --git a/vcl/unx/source/inc/movedlnk_curs.h b/vcl/unx/source/inc/movedlnk_curs.h
index 56608b8153a6..10950e5b3f65 100644
--- a/vcl/unx/source/inc/movedlnk_curs.h
+++ b/vcl/unx/source/inc/movedlnk_curs.h
@@ -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
diff --git a/vcl/unx/source/inc/movedlnk_mask.h b/vcl/unx/source/inc/movedlnk_mask.h
index 2aa3eb4b277d..360b103f138b 100644
--- a/vcl/unx/source/inc/movedlnk_mask.h
+++ b/vcl/unx/source/inc/movedlnk_mask.h
@@ -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
diff --git a/vcl/unx/source/inc/movefile_curs.h b/vcl/unx/source/inc/movefile_curs.h
index ed3a11e7f49d..4ecec3762992 100644
--- a/vcl/unx/source/inc/movefile_curs.h
+++ b/vcl/unx/source/inc/movefile_curs.h
@@ -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
diff --git a/vcl/unx/source/inc/movefile_mask.h b/vcl/unx/source/inc/movefile_mask.h
index 668d8d7e8015..550f4255afc3 100644
--- a/vcl/unx/source/inc/movefile_mask.h
+++ b/vcl/unx/source/inc/movefile_mask.h
@@ -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
diff --git a/vcl/unx/source/inc/movefiles_curs.h b/vcl/unx/source/inc/movefiles_curs.h
index 148fe2e72a5e..e3023dbca121 100644
--- a/vcl/unx/source/inc/movefiles_curs.h
+++ b/vcl/unx/source/inc/movefiles_curs.h
@@ -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
diff --git a/vcl/unx/source/inc/movefiles_mask.h b/vcl/unx/source/inc/movefiles_mask.h
index dc990dc5cb61..f0d3f21f8678 100644
--- a/vcl/unx/source/inc/movefiles_mask.h
+++ b/vcl/unx/source/inc/movefiles_mask.h
@@ -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
diff --git a/vcl/unx/source/inc/moveflnk_curs.h b/vcl/unx/source/inc/moveflnk_curs.h
index 7f48bc4506fc..adcead58aaf5 100644
--- a/vcl/unx/source/inc/moveflnk_curs.h
+++ b/vcl/unx/source/inc/moveflnk_curs.h
@@ -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
diff --git a/vcl/unx/source/inc/moveflnk_mask.h b/vcl/unx/source/inc/moveflnk_mask.h
index a25b7ee18960..a344e67bff9e 100644
--- a/vcl/unx/source/inc/moveflnk_mask.h
+++ b/vcl/unx/source/inc/moveflnk_mask.h
@@ -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
diff --git a/vcl/unx/source/inc/movepoint_curs.h b/vcl/unx/source/inc/movepoint_curs.h
index e3b20bd8edf9..3bb4e8c3a2a6 100644
--- a/vcl/unx/source/inc/movepoint_curs.h
+++ b/vcl/unx/source/inc/movepoint_curs.h
@@ -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
diff --git a/vcl/unx/source/inc/movepoint_mask.h b/vcl/unx/source/inc/movepoint_mask.h
index e4fae36c023c..1f9d687c41a8 100644
--- a/vcl/unx/source/inc/movepoint_mask.h
+++ b/vcl/unx/source/inc/movepoint_mask.h
@@ -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
diff --git a/vcl/unx/source/inc/nodrop_curs.h b/vcl/unx/source/inc/nodrop_curs.h
index 8e208e32f293..ccce5f28ad22 100644
--- a/vcl/unx/source/inc/nodrop_curs.h
+++ b/vcl/unx/source/inc/nodrop_curs.h
@@ -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
diff --git a/vcl/unx/source/inc/nodrop_mask.h b/vcl/unx/source/inc/nodrop_mask.h
index 7cbecef2c60f..d467650902ca 100644
--- a/vcl/unx/source/inc/nodrop_mask.h
+++ b/vcl/unx/source/inc/nodrop_mask.h
@@ -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
diff --git a/vcl/unx/source/inc/null_curs.h b/vcl/unx/source/inc/null_curs.h
index 19d4130d4b5d..f87ca9227741 100644
--- a/vcl/unx/source/inc/null_curs.h
+++ b/vcl/unx/source/inc/null_curs.h
@@ -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
@@ -26,6 +26,6 @@
  ************************************************************************/
 #define nullcurs_width 4
 #define nullcurs_height 4
-#define nullcurs_x_hot 2
+#define nullcurs_x_hot 2 
 #define nullcurs_y_hot 2
 static char nullcurs_bits[] = { 0x00, 0x00 };
diff --git a/vcl/unx/source/inc/null_mask.h b/vcl/unx/source/inc/null_mask.h
index a657cfa54af4..6a47663d0967 100644
--- a/vcl/unx/source/inc/null_mask.h
+++ b/vcl/unx/source/inc/null_mask.h
@@ -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
diff --git a/vcl/unx/source/inc/pivotcol_curs.h b/vcl/unx/source/inc/pivotcol_curs.h
index 22873985daf0..872c13ae64e5 100644
--- a/vcl/unx/source/inc/pivotcol_curs.h
+++ b/vcl/unx/source/inc/pivotcol_curs.h
@@ -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
diff --git a/vcl/unx/source/inc/pivotcol_mask.h b/vcl/unx/source/inc/pivotcol_mask.h
index 911eede87ed4..d54cc89c5fe3 100644
--- a/vcl/unx/source/inc/pivotcol_mask.h
+++ b/vcl/unx/source/inc/pivotcol_mask.h
@@ -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
diff --git a/vcl/unx/source/inc/pivotdel_curs.h b/vcl/unx/source/inc/pivotdel_curs.h
index e0dcbc14a6d6..f4d93719789d 100644
--- a/vcl/unx/source/inc/pivotdel_curs.h
+++ b/vcl/unx/source/inc/pivotdel_curs.h
@@ -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
diff --git a/vcl/unx/source/inc/pivotdel_mask.h b/vcl/unx/source/inc/pivotdel_mask.h
index 147bc2da410d..04d973ba1503 100644
--- a/vcl/unx/source/inc/pivotdel_mask.h
+++ b/vcl/unx/source/inc/pivotdel_mask.h
@@ -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
diff --git a/vcl/unx/source/inc/pivotfld_curs.h b/vcl/unx/source/inc/pivotfld_curs.h
index 1daf4f553275..a91ba85cbb2e 100644
--- a/vcl/unx/source/inc/pivotfld_curs.h
+++ b/vcl/unx/source/inc/pivotfld_curs.h
@@ -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
diff --git a/vcl/unx/source/inc/pivotfld_mask.h b/vcl/unx/source/inc/pivotfld_mask.h
index 6d62d8bbda46..812ddfd902fb 100644
--- a/vcl/unx/source/inc/pivotfld_mask.h
+++ b/vcl/unx/source/inc/pivotfld_mask.h
@@ -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
diff --git a/vcl/unx/source/inc/pivotrow_curs.h b/vcl/unx/source/inc/pivotrow_curs.h
index 75f4965f2582..ae205c7cc67c 100644
--- a/vcl/unx/source/inc/pivotrow_curs.h
+++ b/vcl/unx/source/inc/pivotrow_curs.h
@@ -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
diff --git a/vcl/unx/source/inc/pivotrow_mask.h b/vcl/unx/source/inc/pivotrow_mask.h
index a8896d0975f9..85c4d12644e4 100644
--- a/vcl/unx/source/inc/pivotrow_mask.h
+++ b/vcl/unx/source/inc/pivotrow_mask.h
@@ -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
diff --git a/vcl/unx/source/inc/rotate_curs.h b/vcl/unx/source/inc/rotate_curs.h
index f9c57674dfb2..7a0019b025cb 100644
--- a/vcl/unx/source/inc/rotate_curs.h
+++ b/vcl/unx/source/inc/rotate_curs.h
@@ -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
diff --git a/vcl/unx/source/inc/rotate_mask.h b/vcl/unx/source/inc/rotate_mask.h
index 9fcff18925f0..a37964ee799a 100644
--- a/vcl/unx/source/inc/rotate_mask.h
+++ b/vcl/unx/source/inc/rotate_mask.h
@@ -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
diff --git a/vcl/unx/source/inc/salcursors.h b/vcl/unx/source/inc/salcursors.h
index e8a63d6195aa..4c2b88555c58 100644
--- a/vcl/unx/source/inc/salcursors.h
+++ b/vcl/unx/source/inc/salcursors.h
@@ -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
diff --git a/vcl/unx/source/inc/timemove_curs.h b/vcl/unx/source/inc/timemove_curs.h
index 252a702caf77..90533d874e63 100644
--- a/vcl/unx/source/inc/timemove_curs.h
+++ b/vcl/unx/source/inc/timemove_curs.h
@@ -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
diff --git a/vcl/unx/source/inc/timemove_mask.h b/vcl/unx/source/inc/timemove_mask.h
index b7a9542a64c6..140e4596cc9b 100644
--- a/vcl/unx/source/inc/timemove_mask.h
+++ b/vcl/unx/source/inc/timemove_mask.h
@@ -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
diff --git a/vcl/unx/source/inc/timesize_curs.h b/vcl/unx/source/inc/timesize_curs.h
index 61e53971290e..adbbd8fa7668 100644
--- a/vcl/unx/source/inc/timesize_curs.h
+++ b/vcl/unx/source/inc/timesize_curs.h
@@ -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
diff --git a/vcl/unx/source/inc/timesize_mask.h b/vcl/unx/source/inc/timesize_mask.h
index 3c4333c5e7b8..8d5280f58561 100644
--- a/vcl/unx/source/inc/timesize_mask.h
+++ b/vcl/unx/source/inc/timesize_mask.h
@@ -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
diff --git a/vcl/unx/source/inc/vertcurs_curs.h b/vcl/unx/source/inc/vertcurs_curs.h
index d67251a1743d..5beb063a3fbd 100644
--- a/vcl/unx/source/inc/vertcurs_curs.h
+++ b/vcl/unx/source/inc/vertcurs_curs.h
@@ -1,6 +1,6 @@
 #define vertcurs_curs_width 16
 #define vertcurs_curs_height 16
-#define vertcurs_curs_x_hot 8
+#define vertcurs_curs_x_hot 8 
 #define vertcurs_curs_y_hot 8
 static char vertcurs_curs_bits[] = {
    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x40, 0x02, 0x40,
diff --git a/vcl/unx/source/inc/vertcurs_mask.h b/vcl/unx/source/inc/vertcurs_mask.h
index 769d6966571f..fe4839ca53cb 100644
--- a/vcl/unx/source/inc/vertcurs_mask.h
+++ b/vcl/unx/source/inc/vertcurs_mask.h
@@ -1,6 +1,6 @@
 #define vertcurs_mask_width 16
 #define vertcurs_mask_height 16
-#define vertcurs_mask_x_hot 8
+#define vertcurs_mask_x_hot 8 
 #define vertcurs_mask_y_hot 8
 static char vertcurs_mask_bits[] = {
    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0xe0, 0x07, 0xe0, 0x0f, 0xf0,
diff --git a/vcl/unx/source/inc/vshear_curs.h b/vcl/unx/source/inc/vshear_curs.h
index 87357c0a5027..8b730d87152d 100644
--- a/vcl/unx/source/inc/vshear_curs.h
+++ b/vcl/unx/source/inc/vshear_curs.h
@@ -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
diff --git a/vcl/unx/source/inc/vshear_mask.h b/vcl/unx/source/inc/vshear_mask.h
index be77728c13f9..53f0988b939e 100644
--- a/vcl/unx/source/inc/vshear_mask.h
+++ b/vcl/unx/source/inc/vshear_mask.h
@@ -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
diff --git a/vcl/unx/source/plugadapt/salplug.cxx b/vcl/unx/source/plugadapt/salplug.cxx
index a438760cffba..a93b2fa530a4 100644
--- a/vcl/unx/source/plugadapt/salplug.cxx
+++ b/vcl/unx/source/plugadapt/salplug.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
@@ -62,7 +62,7 @@ static const char * desktop_strings[] = { "none", "unknown", "GNOME", "KDE", "KD
 static SalInstance* tryInstance( const OUString& rModuleBase )
 {
     SalInstance* pInst = NULL;
-
+    
     OUStringBuffer aModName( 128 );
     aModName.appendAscii( SAL_DLLPREFIX"vclplug_" );
     aModName.append( rModuleBase );
@@ -80,7 +80,7 @@ static SalInstance* tryInstance( const OUString& rModuleBase )
         {
             pInst = aProc( aMod );
 #if OSL_DEBUG_LEVEL > 1
-            std::fprintf( stderr, "sal plugin %s produced instance %p\n",
+            std::fprintf( stderr, "sal plugin %s produced instance %p\n", 
                      OUStringToOString( aModule, RTL_TEXTENCODING_ASCII_US ).getStr(),
                      pInst );
 #endif
@@ -89,9 +89,9 @@ static SalInstance* tryInstance( const OUString& rModuleBase )
                 pCloseModule = aMod;
 
                 /*
-                 * Recent GTK+ versions load their modules with RTLD_LOCAL, so we can
-                 * not access the 'gnome_accessibility_module_shutdown' anymore.
-                 * So make sure libgtk+ & co are still mapped into memory when
+                 * Recent GTK+ versions load their modules with RTLD_LOCAL, so we can 
+                 * not access the 'gnome_accessibility_module_shutdown' anymore. 
+                 * So make sure libgtk+ & co are still mapped into memory when 
                  * atk-bridge's atexit handler gets called.
                  */
                 if( rModuleBase.equalsAscii("gtk") )
@@ -106,7 +106,7 @@ static SalInstance* tryInstance( const OUString& rModuleBase )
                 {
                     pCloseModule = NULL;
                 }
-
+                
                 GetSalData()->m_pPlugin = aMod;
             }
             else
@@ -126,7 +126,7 @@ static SalInstance* tryInstance( const OUString& rModuleBase )
     else
         std::fprintf( stderr, "could not load shared object %s\n",
                  OUStringToOString( aModule, RTL_TEXTENCODING_ASCII_US ).getStr() );
-#endif
+#endif  
 
     return pInst;
 }
@@ -141,7 +141,7 @@ static const rtl::OUString& get_desktop_environment()
         aModName.appendAscii( SAL_DLLPOSTFIX );
         aModName.appendAscii( SAL_DLLEXTENSION );
         OUString aModule = aModName.makeStringAndClear();
-
+    
         oslModule aMod = osl_loadModuleRelative(
             reinterpret_cast< oslGenericFunction >( &tryInstance ), aModule.pData,
             SAL_LOADMODULE_DEFAULT );
@@ -163,12 +163,12 @@ static SalInstance* autodetect_plugin()
     {
         "kde4", "kde", "gtk", "gen", 0
     };
-
+    
     static const char* pStandardFallbackList[] =
     {
         "gtk", "gen", 0
     };
-
+    
     static const char* pHeadlessFallbackList[] =
     {
         "svp", 0
@@ -177,7 +177,7 @@ static SalInstance* autodetect_plugin()
     const rtl::OUString& desktop( get_desktop_environment() );
     const char ** pList = pStandardFallbackList;
     int nListEntry = 0;
-
+    
     // no server at all: dummy plugin
     if ( desktop.equalsAscii( desktop_strings[DESKTOP_NONE] ) )
         pList = pHeadlessFallbackList;
@@ -190,12 +190,12 @@ static SalInstance* autodetect_plugin()
     }
     else if( desktop.equalsAscii( desktop_strings[DESKTOP_KDE4] ) )
         pList = pKDEFallbackList;
-
+    
     SalInstance* pInst = NULL;
     while( pList[nListEntry] && pInst == NULL )
     {
-        rtl::OUString aTry( rtl::OUString::createFromAscii( pList[nListEntry] ) );
-        pInst = tryInstance( aTry );
+        rtl::OUString aTry( rtl::OUString::createFromAscii( pList[nListEntry] ) ); 
+        pInst = tryInstance( aTry );        
         #if OSL_DEBUG_LEVEL > 1
         if( pInst )
             std::fprintf( stderr, "plugin autodetection: %s\n", pList[nListEntry] );
@@ -221,7 +221,7 @@ static SalInstance* check_headless_plugin()
 
 SalInstance *CreateSalInstance()
 {
-    SalInstance*    pInst = NULL;
+    SalInstance*	pInst = NULL;
 
     static const char* pUsePlugin = getenv( "SAL_USE_VCLPLUGIN" );
 
@@ -229,13 +229,15 @@ SalInstance *CreateSalInstance()
         pInst = check_headless_plugin();
     else
         pInst = tryInstance( OUString::createFromAscii( pUsePlugin ) );
-
+    
     if( ! pInst )
         pInst = autodetect_plugin();
+    
+    // fallback, try everything
+    const char* pPlugin[] = { "gtk", "kde", "gen", 0 };
 
-    // fallback to gen
-    if( ! pInst )
-        pInst = tryInstance( OUString( RTL_CONSTASCII_USTRINGPARAM( "gen" ) ) );
+    for ( int i = 0; !pInst && pPlugin[ i ]; ++i )
+        pInst = tryInstance( OUString::createFromAscii( pPlugin[ i ] ) );
 
     if( ! pInst )
     {
@@ -245,7 +247,7 @@ SalInstance *CreateSalInstance()
 
     // acquire SolarMutex
     pInst->AcquireYieldMutex( 1 );
-
+    
     return pInst;
 }
 
diff --git a/vcl/unx/source/printer/cupsmgr.cxx b/vcl/unx/source/printer/cupsmgr.cxx
index e245b2548c79..d8e725484edd 100644
--- a/vcl/unx/source/printer/cupsmgr.cxx
+++ b/vcl/unx/source/printer/cupsmgr.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
@@ -58,24 +58,24 @@ namespace psp
 {
 class CUPSWrapper
 {
-    oslModule       m_pLib;
-    osl::Mutex      m_aGetPPDMutex;
+    oslModule		m_pLib;
+    osl::Mutex		m_aGetPPDMutex;
     bool            m_bPPDThreadRunning;
 
-    int             (*m_pcupsPrintFile)(const char*, const char*, const char*, int, cups_option_t*);
-    int             (*m_pcupsGetDests)(cups_dest_t**);
-    void            (*m_pcupsSetDests)(int,cups_dest_t*);
-    void            (*m_pcupsFreeDests)(int,cups_dest_t*);
-    const char*     (*m_pcupsGetPPD)(const char*);
-    int             (*m_pcupsMarkOptions)(ppd_file_t*,int,cups_option_t*);
-    int             (*m_pcupsAddOption)(const char*,const char*,int,cups_option_t**);
-    void            (*m_pcupsFreeOptions)(int,cups_option_t*);
-    ppd_file_t*     (*m_pppdOpenFile)(const char* pFile);
-    void            (*m_pppdClose)(ppd_file_t*);
-    const char*     (*m_pcupsServer)();
-    void            (*m_pcupsSetPasswordCB)(const char*(cb)(const char*));
-    const char*     (*m_pcupsUser)();
-    void            (*m_pcupsSetUser)(const char*);
+    int				(*m_pcupsPrintFile)(const char*, const char*, const char*, int, cups_option_t*);
+    int				(*m_pcupsGetDests)(cups_dest_t**);
+    void			(*m_pcupsSetDests)(int,cups_dest_t*);
+    void			(*m_pcupsFreeDests)(int,cups_dest_t*);
+    const char*		(*m_pcupsGetPPD)(const char*);
+    int				(*m_pcupsMarkOptions)(ppd_file_t*,int,cups_option_t*);
+    int				(*m_pcupsAddOption)(const char*,const char*,int,cups_option_t**);
+    void			(*m_pcupsFreeOptions)(int,cups_option_t*);
+    ppd_file_t*		(*m_pppdOpenFile)(const char* pFile);
+    void			(*m_pppdClose)(ppd_file_t*);
+    const char*		(*m_pcupsServer)();
+    void			(*m_pcupsSetPasswordCB)(const char*(cb)(const char*));
+    const char*		(*m_pcupsUser)();
+    void			(*m_pcupsSetUser)(const char*);
     const char*     (*m_pcupsGetOption)(const char*,int,cups_option_t*);
 
     oslGenericFunction loadSymbol( const char* );
@@ -118,21 +118,21 @@ public:
     void ppdClose( ppd_file_t* pPPD )
     { m_pppdClose( pPPD ); }
 
-    const char  *cupsServer(void)
+    const char	*cupsServer(void)
     { return m_pcupsServer(); }
 
-    const char  *cupsUser(void)
+    const char	*cupsUser(void)
     { return m_pcupsUser(); }
-
+    
     void cupsSetPasswordCB(const char *(*cb)(const char *))
     { m_pcupsSetPasswordCB( cb ); }
 
     void cupsSetUser(const char *user)
     { m_pcupsSetUser( user ); }
-
+    
     const char* cupsGetOption(const char* name, int num_options, cups_option_t* options)
     { return m_pcupsGetOption( name, num_options, options ); }
-
+    
 };
 }
 
@@ -154,7 +154,7 @@ oslGenericFunction CUPSWrapper::loadSymbol( const char* pSymbol )
     return pSym;
 }
 
-CUPSWrapper::CUPSWrapper()
+CUPSWrapper::CUPSWrapper() 
         : m_pLib( NULL ),
           m_bPPDThreadRunning( false )
 {
@@ -176,51 +176,51 @@ CUPSWrapper::CUPSWrapper()
         return;
     }
 
-    m_pcupsPrintFile        = (int(*)(const char*,const char*,const char*,int,cups_option_t*))
+    m_pcupsPrintFile	 	= (int(*)(const char*,const char*,const char*,int,cups_option_t*))
         loadSymbol( "cupsPrintFile" );
-    m_pcupsGetDests         = (int(*)(cups_dest_t**))
+    m_pcupsGetDests			= (int(*)(cups_dest_t**))
         loadSymbol( "cupsGetDests" );
-    m_pcupsSetDests         = (void(*)(int,cups_dest_t*))
+    m_pcupsSetDests			= (void(*)(int,cups_dest_t*))
         loadSymbol( "cupsSetDests" );
-    m_pcupsFreeDests        = (void(*)(int,cups_dest_t*))
+    m_pcupsFreeDests		= (void(*)(int,cups_dest_t*))
         loadSymbol( "cupsFreeDests" );
-    m_pcupsGetPPD           = (const char*(*)(const char*))
+    m_pcupsGetPPD			= (const char*(*)(const char*))
         loadSymbol( "cupsGetPPD" );
-    m_pcupsMarkOptions      = (int(*)(ppd_file_t*,int,cups_option_t*))
+    m_pcupsMarkOptions		= (int(*)(ppd_file_t*,int,cups_option_t*))
         loadSymbol( "cupsMarkOptions" );
-    m_pcupsAddOption        = (int(*)(const char*,const char*,int,cups_option_t**))
+    m_pcupsAddOption		= (int(*)(const char*,const char*,int,cups_option_t**))
         loadSymbol( "cupsAddOption" );
-    m_pcupsFreeOptions      = (void(*)(int,cups_option_t*))
+    m_pcupsFreeOptions		= (void(*)(int,cups_option_t*))
         loadSymbol( "cupsFreeOptions" );
-    m_pppdOpenFile          = (ppd_file_t*(*)(const char*))
+    m_pppdOpenFile			= (ppd_file_t*(*)(const char*))
         loadSymbol( "ppdOpenFile" );
-    m_pppdClose             = (void(*)(ppd_file_t*))
+    m_pppdClose				= (void(*)(ppd_file_t*))
         loadSymbol( "ppdClose" );
-    m_pcupsServer           = (const char*(*)())
+    m_pcupsServer			= (const char*(*)())
         loadSymbol( "cupsServer" );
-    m_pcupsUser             = (const char*(*)())
+    m_pcupsUser				= (const char*(*)())
         loadSymbol( "cupsUser" );
-    m_pcupsSetPasswordCB    = (void(*)(const char*(*)(const char*)))
+    m_pcupsSetPasswordCB	= (void(*)(const char*(*)(const char*)))
         loadSymbol( "cupsSetPasswordCB" );
-    m_pcupsSetUser          = (void(*)(const char*))
+    m_pcupsSetUser			= (void(*)(const char*))
         loadSymbol( "cupsSetUser" );
     m_pcupsGetOption        = (const char*(*)(const char*,int,cups_option_t*))
         loadSymbol( "cupsGetOption" );
 
     if( ! (
-           m_pcupsPrintFile                 &&
-           m_pcupsGetDests                  &&
-           m_pcupsSetDests                  &&
-           m_pcupsFreeDests                 &&
-           m_pcupsGetPPD                    &&
-           m_pcupsMarkOptions               &&
-           m_pcupsAddOption                 &&
-           m_pcupsServer                    &&
-           m_pcupsUser                      &&
-           m_pcupsSetPasswordCB             &&
-           m_pcupsSetUser                   &&
-           m_pcupsFreeOptions               &&
-           m_pppdOpenFile                   &&
+           m_pcupsPrintFile					&&
+           m_pcupsGetDests					&&
+           m_pcupsSetDests					&&
+           m_pcupsFreeDests					&&
+           m_pcupsGetPPD					&&
+           m_pcupsMarkOptions				&&
+           m_pcupsAddOption					&&
+           m_pcupsServer					&&
+           m_pcupsUser						&&
+           m_pcupsSetPasswordCB				&&
+           m_pcupsSetUser					&&
+           m_pcupsFreeOptions				&&
+           m_pppdOpenFile					&&
            m_pppdClose                      &&
            m_pcupsGetOption
            ) )
@@ -245,14 +245,14 @@ typedef const char*(*PPDFunction)(const char*);
 struct GetPPDAttribs
 {
     PPDFunction         m_pFunction;
-    osl::Condition      m_aCondition;
-    OString             m_aParameter;
-    OString             m_aResult;
-    oslThread           m_aThread;
+    osl::Condition		m_aCondition;
+    OString			    m_aParameter;
+    OString			    m_aResult;
+    oslThread			m_aThread;
     int                 m_nRefs;
     bool*               m_pResetRunning;
     osl::Mutex*         m_pSyncMutex;
-
+    
     GetPPDAttribs( PPDFunction pFn, const char * m_pParameter,
                    bool* pResetRunning, osl::Mutex* pSyncMutex )
             : m_pFunction( pFn ),
@@ -263,13 +263,13 @@ struct GetPPDAttribs
         m_nRefs = 2;
         m_aCondition.reset();
     }
-
+    
     ~GetPPDAttribs()
     {
         if( m_aResult.getLength() )
             unlink( m_aResult.getStr() );
     }
-
+    
     void unref()
     {
         if( --m_nRefs == 0 )
@@ -278,7 +278,7 @@ struct GetPPDAttribs
             delete this;
         }
     }
-
+    
     void executeCall()
     {
         // This CUPS method is not at all thread-safe we need
@@ -289,11 +289,11 @@ struct GetPPDAttribs
         m_aCondition.set();
         unref();
     }
-
+    
     OString waitResult( TimeValue *pDelay )
     {
         m_pSyncMutex->release();
-
+        
         if (m_aCondition.wait( pDelay ) != Condition::result_ok
             )
         {
@@ -304,11 +304,11 @@ struct GetPPDAttribs
             #endif
         }
         m_pSyncMutex->acquire();
-
+        
         OString aRetval = m_aResult;
         m_aResult = OString();
         unref();
-
+        
         return aRetval;
     }
 };
@@ -334,7 +334,7 @@ OString CUPSWrapper::cupsGetPPD( const char* pPrinter )
                                                      pPrinter,
                                                      &m_bPPDThreadRunning,
                                                      &m_aGetPPDMutex );
-
+        
         oslThread aThread = osl_createThread( getPPDWorker, pAttribs );
 
         TimeValue aValue;
@@ -354,7 +354,7 @@ OString CUPSWrapper::cupsGetPPD( const char* pPrinter )
 static const char* setPasswordCallback( const char* pIn )
 {
     const char* pRet = NULL;
-
+    
     PrinterInfoManager& rMgr = PrinterInfoManager::get();
     if( rMgr.getType() == PrinterInfoManager::CUPS ) // sanity check
         pRet = static_cast<CUPSManager&>(rMgr).authenticateUser( pIn );
@@ -371,7 +371,7 @@ CUPSManager* CUPSManager::tryLoadCUPS()
     CUPSManager* pManager = NULL;
 #ifdef ENABLE_CUPS
     static const char* pEnv = getenv( "SAL_DISABLE_CUPS" );
-
+    
     if( ! pEnv || ! *pEnv )
     {
         // try to load CUPS
@@ -443,7 +443,7 @@ void CUPSManager::runDests()
     cups_dest_t* pDests = NULL;
 
     // #i86306# prepare against really broken CUPS installations / missing servers
-
+    
     // install signal handler for SEGV, BUS and ABRT
     struct sigaction act;
     struct sigaction oact[3];
@@ -451,7 +451,7 @@ void CUPSManager::runDests()
     act.sa_handler = lcl_signal_action;
     act.sa_flags   = 0;
     sigemptyset(&(act.sa_mask));
-
+    
     int nSegvSignalInstalled = sigaction(SIGSEGV, &act, &oact[0]);
     int nBusSignalInstalled = sigaction(SIGBUS, &act, &oact[1]);
     int nAbortSignalInstalled = sigaction(SIGABRT, &act, &oact[2]);
@@ -463,7 +463,7 @@ void CUPSManager::runDests()
         #if OSL_DEBUG_LEVEL > 1
         fprintf( stderr, "came out of cupsGetDests\n" );
         #endif
-
+        
         osl::MutexGuard aGuard( m_aCUPSMutex );
         m_nDests = nDests;
         m_pDests = pDests;
@@ -478,7 +478,7 @@ void CUPSManager::runDests()
         fprintf( stderr, "cupsGetDests crashed, not using CUPS\n" );
         #endif
     }
-
+    
     // restore old signal handlers
     if( nSegvSignalInstalled == 0 )
         sigaction( SIGSEGV, &oact[0], NULL );
@@ -492,12 +492,12 @@ void CUPSManager::initialize()
 {
     // get normal printers, clear printer list
     PrinterInfoManager::initialize();
-
+    
 #ifdef ENABLE_CUPS
     // check whether thread has completed
     // if not behave like old printing system
     osl::MutexGuard aGuard( m_aCUPSMutex );
-
+    
     if( ! m_bNewDests )
         return;
 
@@ -515,7 +515,7 @@ void CUPSManager::initialize()
 
     if( ! (m_nDests && m_pDests ) )
         return;
-
+    
     if( isCUPSDisabled() )
         return;
 
@@ -537,7 +537,7 @@ void CUPSManager::initialize()
 
     rtl_TextEncoding aEncoding = osl_getThreadTextEncoding();
     int nPrinter = m_nDests;
-
+    
     // reset global default PPD options; these are queried on demand from CUPS
     m_aGlobalDefaults.m_pParser = NULL;
     m_aGlobalDefaults.m_aContext = PPDContext();
@@ -647,8 +647,8 @@ static void updatePrinterContextInfo( ppd_group_t* pPPDGroup, PPDContext& rConte
 #if OSL_DEBUG_LEVEL > 1
                             fprintf( stderr, "key %s is set to %s\n", pOption->keyword, pChoice->choice );
 #endif
-
-                        }
+                            
+                        }                       
 #if OSL_DEBUG_LEVEL > 1
                         else
                             fprintf( stderr, "key %s is defaulted to %s\n", pOption->keyword, pChoice->choice );
@@ -711,7 +711,7 @@ const PPDParser* CUPSManager::createCUPSParser( const OUString& rPrinter )
                         PPDParser* pCUPSParser = new PPDParser( aFileName );
                         pCUPSParser->m_aFile = rPrinter;
                         pNewParser = pCUPSParser;
-
+                        
                         /*int nConflicts =*/ m_pCUPSWrapper->cupsMarkOptions( pPPD, pDest->num_options, pDest->options );
                         #if OSL_DEBUG_LEVEL > 1
                         fprintf( stderr, "processing the following options for printer %s (instance %s):\n",
@@ -722,7 +722,7 @@ const PPDParser* CUPSManager::createCUPSParser( const OUString& rPrinter )
                         pDest->options[k].value );
                         #endif
                         PrinterInfo& rInfo = m_aPrinters[ aPrinter ].m_aInfo;
-
+                        
                         // remember the default context for later use
                         PPDContext& rContext = m_aDefaultContexts[ aPrinter ];
                         rContext.setParser( pNewParser );
@@ -731,18 +731,18 @@ const PPDParser* CUPSManager::createCUPSParser( const OUString& rPrinter )
                         setDefaultPaper( rContext );
                         for( int i = 0; i < pPPD->num_groups; i++ )
                             updatePrinterContextInfo( pPPD->groups + i, rContext );
-
+                        
                         rInfo.m_pParser = pNewParser;
                         rInfo.m_aContext = rContext;
-
+                        
                         // clean up the mess
-                        m_pCUPSWrapper->ppdClose( pPPD );
+                        m_pCUPSWrapper->ppdClose( pPPD );                        
                     }
                     #if OSL_DEBUG_LEVEL > 1
                     else
                         fprintf( stderr, "ppdOpenFile failed, falling back to generic driver\n" );
                     #endif
-
+                    
                     // remove temporary PPD file
                     unlink( aPPDFile.getStr() );
                 }
@@ -768,9 +768,9 @@ const PPDParser* CUPSManager::createCUPSParser( const OUString& rPrinter )
     {
         // get the default PPD
         pNewParser = PPDParser::getParser( String( RTL_CONSTASCII_USTRINGPARAM( "SGENPRT" ) ) );
-
+        
         PrinterInfo& rInfo = m_aPrinters[ aPrinter ].m_aInfo;
-
+        
         rInfo.m_pParser = pNewParser;
         rInfo.m_aContext.setParser( pNewParser );
     }
@@ -819,8 +819,8 @@ void CUPSManager::setupJobContextData(
         p_it->second.m_aInfo.m_aContext = m_aDefaultContexts[ aPrinter ];
     }
 
-    rData.m_pParser     = p_it->second.m_aInfo.m_pParser;
-    rData.m_aContext    = p_it->second.m_aInfo.m_aContext;
+    rData.m_pParser		= p_it->second.m_aInfo.m_pParser;
+    rData.m_aContext	= p_it->second.m_aInfo.m_aContext;
 #endif
 }
 
@@ -828,7 +828,7 @@ FILE* CUPSManager::startSpool( const OUString& rPrintername, bool bQuickCommand
 {
     if( m_aCUPSDestMap.find( rPrintername ) == m_aCUPSDestMap.end() )
         return PrinterInfoManager::startSpool( rPrintername, bQuickCommand );
-
+    
 #ifdef ENABLE_CUPS
     OUString aTmpURL, aTmpFile;
     osl_createTempFile( NULL, NULL, &aTmpURL.pData );
@@ -837,7 +837,7 @@ FILE* CUPSManager::startSpool( const OUString& rPrintername, bool bQuickCommand
     FILE* fp = fopen( aSysFile.getStr(), "w" );
     if( fp )
         m_aSpoolFiles[fp] = aSysFile;
-
+    
     return fp;
 #else
     return NULL;
@@ -846,7 +846,7 @@ FILE* CUPSManager::startSpool( const OUString& rPrintername, bool bQuickCommand
 
 struct less_ppd_key : public ::std::binary_function<double, double, bool>
 {
-    bool operator()(const PPDKey* left, const PPDKey* right)
+    bool operator()(const PPDKey* left, const PPDKey* right) 
     { return left->getOrderDependency() < right->getOrderDependency(); }
 };
 
@@ -887,7 +887,7 @@ int CUPSManager::endSpool( const OUString& rPrintername, const OUString& rJobTit
     int nJobID = 0;
 
     osl::MutexGuard aGuard( m_aCUPSMutex );
-
+    
     std::hash_map< OUString, int, OUStringHash >::iterator dest_it =
         m_aCUPSDestMap.find( rPrintername );
     if( dest_it == m_aCUPSDestMap.end() )
@@ -899,7 +899,7 @@ int CUPSManager::endSpool( const OUString& rPrintername, const OUString& rJobTit
     {
         fclose( pFile );
         rtl_TextEncoding aEnc = osl_getThreadTextEncoding();
-
+        
         // setup cups options
         int nNumOptions = 0;
         cups_option_t* pOptions = NULL;
@@ -926,7 +926,7 @@ int CUPSManager::endSpool( const OUString& rPrintername, const OUString& rJobTit
         aCmd = aCmd + OString( " $HOME/cupsprint.ps" );
         system( aCmd.getStr() );
 #endif
-
+        
         unlink( it->second.getStr() );
         m_aSpoolFiles.erase( pFile );
         if( pOptions )
@@ -969,7 +969,7 @@ bool CUPSManager::checkPrintersChanged( bool bWait )
             // where the user can set SAL_DISABLE_SYNCHRONOUS_PRINTER_DETECTION
             // (see vcl/unx/source/gdi/salprnpsp.cxx)
             // so that checkPrintersChanged( true ) will never be called
-
+            
             // there is no way to query CUPS whether the printer list has changed
             // so get the dest list anew
             if( m_nDests && m_pDests )
@@ -992,7 +992,7 @@ bool CUPSManager::checkPrintersChanged( bool bWait )
         if( bChanged )
             m_bNewDests = true;
     }
-
+    
     if( bChanged )
         initialize();
 
@@ -1037,7 +1037,7 @@ bool CUPSManager::setDefaultPrinter( const OUString& rName )
     else
 #endif
         bSuccess = PrinterInfoManager::setDefaultPrinter( rName );
-
+        
     return bSuccess;
 }
 
@@ -1054,7 +1054,7 @@ bool CUPSManager::writePrinterConfig()
             m_aCUPSDestMap.find( prt->first );
         if( nit == m_aCUPSDestMap.end() )
             continue;
-
+        
         if( ! prt->second.m_bModified )
             continue;
 
@@ -1066,7 +1066,7 @@ bool CUPSManager::writePrinterConfig()
 
             // create new option list
             int nNewOptions = 0;
-            cups_option_t* pNewOptions = NULL;
+            cups_option_t* pNewOptions = NULL; 
             int nValues = rInfo.m_aContext.countValuesModified();
             for( int i = 0; i < nValues; i++ )
             {
@@ -1123,12 +1123,12 @@ const char* CUPSManager::authenticateUser( const char* /*pIn*/ )
             OString aServer = m_pCUPSWrapper->cupsServer();
             OString aPassword;
             if( getpw( aServer, aUser, aPassword ) )
-            {
+            {       
                 m_aPassword = aPassword;
                 m_aUser = aUser;
                 m_pCUPSWrapper->cupsSetUser( m_aUser.getStr() );
                 pRet = m_aPassword.getStr();
-            }
+            }   	
         }
         osl_unloadModule( pLib );
     }
diff --git a/vcl/unx/source/printer/jobdata.cxx b/vcl/unx/source/printer/jobdata.cxx
index a1bca9441f77..b0b553ab1e9d 100644
--- a/vcl/unx/source/printer/jobdata.cxx
+++ b/vcl/unx/source/printer/jobdata.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
@@ -40,18 +40,18 @@ using namespace rtl;
 
 JobData& JobData::operator=(const JobData& rRight)
 {
-    m_nCopies               = rRight.m_nCopies;
-    m_nLeftMarginAdjust     = rRight.m_nLeftMarginAdjust;
-    m_nRightMarginAdjust    = rRight.m_nRightMarginAdjust;
-    m_nTopMarginAdjust      = rRight.m_nTopMarginAdjust;
-    m_nBottomMarginAdjust   = rRight.m_nBottomMarginAdjust;
-    m_nColorDepth           = rRight.m_nColorDepth;
-    m_eOrientation          = rRight.m_eOrientation;
-    m_aPrinterName          = rRight.m_aPrinterName;
-    m_pParser               = rRight.m_pParser;
-    m_aContext              = rRight.m_aContext;
-    m_nPSLevel              = rRight.m_nPSLevel;
-    m_nColorDevice          = rRight.m_nColorDevice;
+    m_nCopies				= rRight.m_nCopies;
+    m_nLeftMarginAdjust		= rRight.m_nLeftMarginAdjust;
+    m_nRightMarginAdjust	= rRight.m_nRightMarginAdjust;
+    m_nTopMarginAdjust		= rRight.m_nTopMarginAdjust;
+    m_nBottomMarginAdjust	= rRight.m_nBottomMarginAdjust;
+    m_nColorDepth			= rRight.m_nColorDepth;
+    m_eOrientation			= rRight.m_eOrientation;
+    m_aPrinterName			= rRight.m_aPrinterName;
+    m_pParser				= rRight.m_pParser;
+    m_aContext				= rRight.m_aContext;
+    m_nPSLevel				= rRight.m_nPSLevel;
+    m_nColorDevice			= rRight.m_nColorDevice;
 
     if( ! m_pParser && m_aPrinterName.getLength() )
     {
diff --git a/vcl/unx/source/printer/ppdparser.cxx b/vcl/unx/source/printer/ppdparser.cxx
index b2549573d099..e7b232618e62 100644
--- a/vcl/unx/source/printer/ppdparser.cxx
+++ b/vcl/unx/source/printer/ppdparser.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
@@ -69,23 +69,23 @@ namespace psp
         struct LocaleHash
         {
             size_t operator()(const com::sun::star::lang::Locale& rLocale) const
-            { return
+            { return   
                   (size_t)rLocale.Language.hashCode()
                 ^ (size_t)rLocale.Country.hashCode()
                 ^ (size_t)rLocale.Variant.hashCode()
                 ;
             }
         };
-
+        
         typedef std::hash_map< com::sun::star::lang::Locale, rtl::OUString, LocaleHash, LocaleEqual > translation_map;
         typedef std::hash_map< rtl::OUString, translation_map, rtl::OUStringHash > key_translation_map;
-
+        
         key_translation_map     m_aTranslations;
         public:
         PPDTranslator() {}
         ~PPDTranslator() {}
-
-
+        
+        
         void insertValue(
             const rtl::OUString& i_rKey,
             const rtl::OUString& i_rOption,
@@ -93,7 +93,7 @@ namespace psp
             const rtl::OUString& i_rTranslation,
             const com::sun::star::lang::Locale& i_rLocale = com::sun::star::lang::Locale()
             );
-
+        
         void insertOption( const rtl::OUString& i_rKey,
                            const rtl::OUString& i_rOption,
                            const rtl::OUString& i_rTranslation,
@@ -101,14 +101,14 @@ namespace psp
         {
             insertValue( i_rKey, i_rOption, rtl::OUString(), i_rTranslation, i_rLocale );
         }
-
+        
         void insertKey( const rtl::OUString& i_rKey,
                         const rtl::OUString& i_rTranslation,
                         const com::sun::star::lang::Locale& i_rLocale = com::sun::star::lang::Locale() )
         {
             insertValue( i_rKey, rtl::OUString(), rtl::OUString(), i_rTranslation, i_rLocale );
         }
-
+        
         rtl::OUString translateValue(
             const rtl::OUString& i_rKey,
             const rtl::OUString& i_rOption,
@@ -129,7 +129,7 @@ namespace psp
             return translateValue( i_rKey, rtl::OUString(), rtl::OUString(), i_rLocale );
         }
     };
-
+    
     static com::sun::star::lang::Locale normalizeInputLocale(
         const com::sun::star::lang::Locale& i_rLocale,
         bool bInsertDefault = false
@@ -159,7 +159,7 @@ namespace psp
         aLoc.Language = aLoc.Language.toAsciiLowerCase();
         aLoc.Country  = aLoc.Country.toAsciiUpperCase();
         aLoc.Variant  = aLoc.Variant.toAsciiUpperCase();
-
+        
         return aLoc;
     }
 
@@ -193,7 +193,7 @@ namespace psp
             m_aTranslations[ aK ][ aLoc ] = i_rTranslation;
         }
     }
-
+    
     rtl::OUString PPDTranslator::translateValue(
         const rtl::OUString& i_rKey,
         const rtl::OUString& i_rOption,
@@ -202,7 +202,7 @@ namespace psp
         ) const
     {
         rtl::OUString aResult;
-
+        
         rtl::OUStringBuffer aKey( i_rKey.getLength() + i_rOption.getLength() + i_rValue.getLength() + 2 );
         aKey.append( i_rKey );
         if( i_rOption.getLength() || i_rValue.getLength() )
@@ -222,7 +222,7 @@ namespace psp
             if( it != m_aTranslations.end() )
             {
                 const translation_map& rMap( it->second );
-
+                
                 com::sun::star::lang::Locale aLoc( normalizeInputLocale( i_rLocale, true ) );
                 for( int nTry = 0; nTry < 4; nTry++ )
                 {
@@ -264,15 +264,15 @@ class PPDDecompressStream
     SvFileStream*       mpFileStream;
     SvMemoryStream*     mpMemStream;
     rtl::OUString       maFileName;
-
+    
     // forbid copying
     PPDDecompressStream( const PPDDecompressStream& );
     PPDDecompressStream& operator=(const PPDDecompressStream& );
-
+    
     public:
     PPDDecompressStream( const rtl::OUString& rFile );
     ~PPDDecompressStream();
-
+    
     bool IsOpen() const;
     bool IsEof() const;
     void ReadLine( ByteString& o_rLine);
@@ -299,7 +299,7 @@ void PPDDecompressStream::Open( const rtl::OUString& i_rFile )
 
     mpFileStream = new SvFileStream( i_rFile, STREAM_READ );
     maFileName = mpFileStream->GetFileName();
-
+    
     if( ! mpFileStream->IsOpen() )
     {
         Close();
@@ -309,7 +309,7 @@ void PPDDecompressStream::Open( const rtl::OUString& i_rFile )
     ByteString aLine;
     mpFileStream->ReadLine( aLine );
     mpFileStream->Seek( 0 );
-
+    
     // check for compress'ed or gzip'ed file
     ULONG nCompressMethod = 0;
     if( aLine.Len() > 1 && static_cast<unsigned char>(aLine.GetChar( 0 )) == 0x1f )
@@ -369,7 +369,7 @@ static osl::FileBase::RC resolveLink( const rtl::OUString& i_rURL, rtl::OUString
 {
     osl::DirectoryItem aLinkItem;
     osl::FileBase::RC aRet = osl::FileBase::E_None;
-
+    
     if( ( aRet = osl::DirectoryItem::get( i_rURL, aLinkItem ) ) == osl::FileBase::E_None )
     {
         osl::FileStatus aStatus( FileStatusMask_FileName | FileStatusMask_Type | FileStatusMask_LinkTargetURL );
@@ -418,17 +418,17 @@ void PPDParser::scanPPDDir( const String& rDir )
             aURLBuf.append( rDir );
             aURLBuf.append( sal_Unicode( '/' ) );
             aURLBuf.append( aStatus.getFileName() );
-
+            
             rtl::OUString aFileURL, aFileName;
             osl::FileStatus::Type eType = osl::FileStatus::Unknown;
-
+            
             if( resolveLink( aURLBuf.makeStringAndClear(), aFileURL, aFileName, eType ) == osl::FileBase::E_None )
             {
                 if( eType == osl::FileStatus::Regular )
                 {
                     INetURLObject aPPDFile = aPPDDir;
                     aPPDFile.Append( aFileName );
-
+        
                     // match extension
                     for( int nSuffix = 0; nSuffix < nSuffixes; nSuffix++ )
                     {
@@ -496,7 +496,7 @@ void PPDParser::getKnownPPDDrivers( std::list< rtl::OUString >& o_rDrivers, bool
 
     initPPDFiles();
     o_rDrivers.clear();
-
+    
     std::hash_map< OUString, OUString, OUStringHash >::const_iterator it;
     for( it = pAllPPDFiles->begin(); it != pAllPPDFiles->end(); ++it )
         o_rDrivers.push_back( it->first );
@@ -510,7 +510,7 @@ String PPDParser::getPPDFile( const String& rFile )
     if( ! aStream.IsOpen() )
     {
         std::hash_map< OUString, OUString, OUStringHash >::const_iterator it;
-
+        
         bool bRetry = true;
         do
         {
@@ -528,7 +528,7 @@ String PPDParser::getPPDFile( const String& rFile )
                 if( nLastIndex > 0 )
                     aBase = aBase.copy( 0, nLastIndex );
             } while( it == pAllPPDFiles->end() && nLastIndex > 0 );
-
+            
             if( it == pAllPPDFiles->end() && bRetry )
             {
                 // a new file ? rehash
@@ -538,7 +538,7 @@ String PPDParser::getPPDFile( const String& rFile )
                 // no new files occur and initPPDFiles is called only once
             }
         } while( ! pAllPPDFiles );
-
+        
         if( it != pAllPPDFiles->end() )
             aStream.Open( it->second );
     }
@@ -948,7 +948,7 @@ void PPDParser::parse( ::std::list< ByteString >& rLines )
         // default values are parsed in pass 2
         if( aKey.CompareTo( "Default", 7 ) == COMPARE_EQUAL )
             continue;
-
+        
         bool bQuery     = false;
         if( aKey.GetChar( 0 ) == '?' )
         {
@@ -976,7 +976,7 @@ void PPDParser::parse( ::std::list< ByteString >& rLines )
             }
             bIsGlobalizedLine = true;
         }
-
+        
         String aOption;
         nPos = aCurrentLine.Search( ':' );
         if( nPos != STRING_NOTFOUND )
@@ -1000,7 +1000,7 @@ void PPDParser::parse( ::std::list< ByteString >& rLines )
             int nTransPos = aLine.Search( '/' );
             if( nTransPos != STRING_NOTFOUND )
                 aOptionTranslation = handleTranslation( aLine.Copy( nTransPos+1 ), bIsGlobalizedLine );
-
+    
             // read in more lines if necessary for multiline values
             aLine = aCurrentLine.Copy( nPos+1 );
             if( aLine.Len() )
@@ -1017,7 +1017,7 @@ void PPDParser::parse( ::std::list< ByteString >& rLines )
                 }
             }
             aLine = WhitespaceToSpace( aLine );
-
+    
             // #i100644# handle a missing value (actually a broken PPD)
             if( ! aLine.Len() )
             {
@@ -1064,7 +1064,7 @@ void PPDParser::parse( ::std::list< ByteString >& rLines )
                 eType = eString;
             }
         }
-
+        
         // handle globalized PPD entries
         if( bIsGlobalizedLine )
         {
@@ -1101,7 +1101,7 @@ void PPDParser::parse( ::std::list< ByteString >& rLines )
             continue;
         pValue->m_eType = eType;
         pValue->m_aValue = aValue;
-
+        
         if( aOptionTranslation.getLength() )
             m_pTranslator->insertOption( aUniKey, aOption, aOptionTranslation, aTransLocale );
         if( aValueTranslation.getLength() )
@@ -1722,7 +1722,7 @@ const PPDValue* PPDKey::getValueCaseInsensitive( const String& rOption ) const
             if( m_aOrderedValues[n]->m_aOption.EqualsIgnoreCaseAscii( rOption ) )
                 pValue = m_aOrderedValues[n];
     }
-
+    
     return pValue;
 }
 
diff --git a/vcl/unx/source/printer/printerinfomanager.cxx b/vcl/unx/source/printer/printerinfomanager.cxx
index e1d499c40ca5..ded308b920e6 100644
--- a/vcl/unx/source/printer/printerinfomanager.cxx
+++ b/vcl/unx/source/printer/printerinfomanager.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
@@ -69,16 +69,16 @@ namespace psp
         std::list< PrinterInfoManager::SystemPrintQueue >
                                     m_aQueues;
         OUString                    m_aCommand;
-
+        
         virtual void run();
-
+        
         public:
         SystemQueueInfo();
         ~SystemQueueInfo();
-
+        
         bool hasChanged() const;
         OUString getCommand() const;
-
+        
         // sets changed status to false; therefore not const
         void getSystemQueues( std::list< PrinterInfoManager::SystemPrintQueue >& rQueues );
     };
@@ -93,20 +93,20 @@ namespace psp
 PrinterInfoManager& PrinterInfoManager::get()
 {
     static PrinterInfoManager* pManager = NULL;
-
+    
     if( ! pManager )
     {
         pManager = CUPSManager::tryLoadCUPS();
         if( ! pManager )
             pManager = new PrinterInfoManager();
-
+        
         if( pManager )
             pManager->initialize();
         #if OSL_DEBUG_LEVEL > 1
         fprintf( stderr, "PrinterInfoManager::get create Manager of type %d\n", pManager->getType() );
         #endif
     }
-
+    
     return *pManager;
 }
 
@@ -187,7 +187,7 @@ bool PrinterInfoManager::checkPrintersChanged( bool bWait )
             }
         }
     }
-
+    
     if( bWait && m_pQueueInfo )
     {
         #if OSL_DEBUG_LEVEL > 1
@@ -198,14 +198,14 @@ bool PrinterInfoManager::checkPrintersChanged( bool bWait )
         fprintf( stderr, "done: syncing printer discovery thread\n" );
         #endif
     }
-
+    
     if( ! bChanged && m_pQueueInfo )
         bChanged = m_pQueueInfo->hasChanged();
     if( bChanged )
     {
         initialize();
     }
-
+    
     return bChanged;
 }
 
@@ -218,19 +218,19 @@ void PrinterInfoManager::initialize()
     m_aPrinters.clear();
     m_aWatchFiles.clear();
     OUString aDefaultPrinter;
-
+    
     // first initialize the global defaults
     // have to iterate over all possible files
     // there should be only one global setup section in all
     // available config files
     m_aGlobalDefaults = PrinterInfo();
-
+    
     // need a parser for the PPDContext. generic printer should do.
     m_aGlobalDefaults.m_pParser = PPDParser::getParser( String( RTL_CONSTASCII_USTRINGPARAM( "SGENPRT" ) ) );
     m_aGlobalDefaults.m_aContext.setParser( m_aGlobalDefaults.m_pParser );
     m_aGlobalDefaults.m_bPerformFontSubstitution = true;
     m_bDisableCUPS = false;
-
+    
     if( ! m_aGlobalDefaults.m_pParser )
     {
         #if OSL_DEBUG_LEVEL > 1
@@ -238,7 +238,7 @@ void PrinterInfoManager::initialize()
         #endif
         return;
     }
-
+    
     std::list< OUString > aDirList;
     psp::getPrinterPathList( aDirList, NULL );
     std::list< OUString >::const_iterator print_dir_it;
@@ -253,15 +253,15 @@ void PrinterInfoManager::initialize()
             fprintf( stderr, "found global defaults in %s\n", OUStringToOString( aFile.PathToFileName(), RTL_TEXTENCODING_ISO_8859_1 ).getStr() );
             #endif
             aConfig.SetGroup( GLOBAL_DEFAULTS_GROUP );
-
+            
             ByteString aValue( aConfig.ReadKey( "Copies" ) );
             if( aValue.Len() )
                 m_aGlobalDefaults.m_nCopies = aValue.ToInt32();
-
+            
             aValue = aConfig.ReadKey( "Orientation" );
             if( aValue.Len() )
                 m_aGlobalDefaults.m_eOrientation = aValue.EqualsIgnoreCaseAscii( "Landscape" ) ? orientation::Landscape : orientation::Portrait;
-
+            
             aValue = aConfig.ReadKey( "MarginAdjust" );
             if( aValue.Len() )
             {
@@ -270,19 +270,19 @@ void PrinterInfoManager::initialize()
                 m_aGlobalDefaults.m_nTopMarginAdjust    = aValue.GetToken( 2, ',' ).ToInt32();
                 m_aGlobalDefaults.m_nBottomMarginAdjust = aValue.GetToken( 3, ',' ).ToInt32();
             }
-
+            
             aValue = aConfig.ReadKey( "ColorDepth", "24" );
             if( aValue.Len() )
                 m_aGlobalDefaults.m_nColorDepth = aValue.ToInt32();
-
+            
             aValue = aConfig.ReadKey( "ColorDevice" );
             if( aValue.Len() )
                 m_aGlobalDefaults.m_nColorDevice = aValue.ToInt32();
-
+            
             aValue = aConfig.ReadKey( "PSLevel" );
             if( aValue.Len() )
                 m_aGlobalDefaults.m_nPSLevel = aValue.ToInt32();
-
+            
             aValue = aConfig.ReadKey( "PerformFontSubstitution" );
             if( aValue.Len() )
             {
@@ -291,7 +291,7 @@ void PrinterInfoManager::initialize()
                 else
                     m_aGlobalDefaults.m_bPerformFontSubstitution = false;
             }
-
+            
             aValue = aConfig.ReadKey( "DisableCUPS" );
             if( aValue.Len() )
             {
@@ -300,7 +300,7 @@ void PrinterInfoManager::initialize()
                 else
                     m_bDisableCUPS = false;
             }
-
+            
             // get the PPDContext of global JobData
             for( int nKey = 0; nKey < aConfig.GetKeyCount(); nKey++ )
             {
@@ -330,14 +330,14 @@ void PrinterInfoManager::initialize()
     }
     setDefaultPaper( m_aGlobalDefaults.m_aContext );
     fillFontSubstitutions( m_aGlobalDefaults );
-
+    
     // now collect all available printers
     for( print_dir_it = aDirList.begin(); print_dir_it != aDirList.end(); ++print_dir_it )
     {
         INetURLObject aDir( *print_dir_it, INET_PROT_FILE, INetURLObject::ENCODE_ALL );
         INetURLObject aFile( aDir );
         aFile.Append( String( RTL_CONSTASCII_USTRINGPARAM( PRINT_FILENAME ) ) );
-
+        
         // check directory validity
         OUString aUniPath;
         FileBase::getFileURLFromSystemPath( aDir.PathToFileName(), aUniPath );
@@ -345,12 +345,12 @@ void PrinterInfoManager::initialize()
         if( aDirectory.open() )
             continue;
         aDirectory.close();
-
-
+        
+        
         FileBase::getFileURLFromSystemPath( aFile.PathToFileName(), aUniPath );
         FileStatus aStatus( FileStatusMask_ModifyTime );
         DirectoryItem aItem;
-
+        
         // setup WatchFile list
         WatchFile aWatchFile;
         aWatchFile.m_aFilePath = aUniPath;
@@ -365,7 +365,7 @@ void PrinterInfoManager::initialize()
             aWatchFile.m_aModified.Nanosec = 0;
         }
         m_aWatchFiles.push_back( aWatchFile );
-
+        
         Config aConfig( aFile.PathToFileName() );
         for( int nGroup = 0; nGroup < aConfig.GetGroupCount(); nGroup++ )
         {
@@ -374,12 +374,12 @@ void PrinterInfoManager::initialize()
             if( aValue.Len() )
             {
                 OUString aPrinterName;
-
+                
                 int nNamePos = aValue.Search( '/' );
                 // check for valid value of "Printer"
                 if( nNamePos == STRING_NOTFOUND )
                     continue;
-
+                
                 Printer aPrinter;
                 // initialize to global defaults
                 aPrinter.m_aInfo = m_aGlobalDefaults;
@@ -388,11 +388,11 @@ void PrinterInfoManager::initialize()
                 // newly created printers
                 aPrinter.m_aInfo.m_aFontSubstitutes.clear();
                 aPrinter.m_aInfo.m_aFontSubstitutions.clear();
-
+                
                 aPrinterName = String( aValue.Copy( nNamePos+1 ), RTL_TEXTENCODING_UTF8 );
                 aPrinter.m_aInfo.m_aPrinterName     = aPrinterName;
                 aPrinter.m_aInfo.m_aDriverName      = String( aValue.Copy( 0, nNamePos ), RTL_TEXTENCODING_UTF8 );
-
+                
                 // set parser, merge settings
                 // don't do this for CUPS printers as this is done
                 // by the CUPS system itself
@@ -401,11 +401,11 @@ void PrinterInfoManager::initialize()
                     aPrinter.m_aInfo.m_pParser          = PPDParser::getParser( aPrinter.m_aInfo.m_aDriverName );
                     aPrinter.m_aInfo.m_aContext.setParser( aPrinter.m_aInfo.m_pParser );
                     // note: setParser also purges the context
-
+                    
                     // ignore this printer if its driver is not found
                     if( ! aPrinter.m_aInfo.m_pParser )
                         continue;
-
+                    
                     // merge the ppd context keys if the printer has the same keys and values
                     // this is a bit tricky, since it involves mixing two PPDs
                     // without constraints which might end up badly
@@ -430,7 +430,7 @@ void PrinterInfoManager::initialize()
                                 aPrinter.m_aInfo.m_aContext.setValue( pPrinterKey, NULL );
                         }
                     }
-
+                    
                     aValue = aConfig.ReadKey( "Command" );
                     // no printer without a command
                     if( ! aValue.Len() )
@@ -447,32 +447,32 @@ void PrinterInfoManager::initialize()
                     }
                     aPrinter.m_aInfo.m_aCommand = String( aValue, RTL_TEXTENCODING_UTF8 );
                 }
-
+                
                 aValue = aConfig.ReadKey( "QuickCommand" );
                 aPrinter.m_aInfo.m_aQuickCommand = String( aValue, RTL_TEXTENCODING_UTF8 );
-
+                
                 aValue = aConfig.ReadKey( "Features" );
                 aPrinter.m_aInfo.m_aFeatures = String( aValue, RTL_TEXTENCODING_UTF8 );
-
+                
                 // override the settings in m_aGlobalDefaults if keys exist
                 aValue = aConfig.ReadKey( "DefaultPrinter" );
                 if( ! aValue.Equals( "0" ) && ! aValue.EqualsIgnoreCaseAscii( "false" ) )
                     aDefaultPrinter = aPrinterName;
-
+                
                 aValue = aConfig.ReadKey( "Location" );
                 aPrinter.m_aInfo.m_aLocation = String( aValue, RTL_TEXTENCODING_UTF8 );
-
+                
                 aValue = aConfig.ReadKey( "Comment" );
                 aPrinter.m_aInfo.m_aComment = String( aValue, RTL_TEXTENCODING_UTF8 );
-
+                
                 aValue = aConfig.ReadKey( "Copies" );
                 if( aValue.Len() )
                     aPrinter.m_aInfo.m_nCopies = aValue.ToInt32();
-
+                
                 aValue = aConfig.ReadKey( "Orientation" );
                 if( aValue.Len() )
                     aPrinter.m_aInfo.m_eOrientation = aValue.EqualsIgnoreCaseAscii( "Landscape" ) ? orientation::Landscape : orientation::Portrait;
-
+                
                 aValue = aConfig.ReadKey( "MarginAdjust" );
                 if( aValue.Len() )
                 {
@@ -481,25 +481,25 @@ void PrinterInfoManager::initialize()
                     aPrinter.m_aInfo.m_nTopMarginAdjust     = aValue.GetToken( 2, ',' ).ToInt32();
                     aPrinter.m_aInfo.m_nBottomMarginAdjust  = aValue.GetToken( 3, ',' ).ToInt32();
                 }
-
+                
                 aValue = aConfig.ReadKey( "ColorDepth" );
                 if( aValue.Len() )
                     aPrinter.m_aInfo.m_nColorDepth = aValue.ToInt32();
-
+                
                 aValue = aConfig.ReadKey( "ColorDevice" );
                 if( aValue.Len() )
                     aPrinter.m_aInfo.m_nColorDevice = aValue.ToInt32();
-
+                
                 aValue = aConfig.ReadKey( "PSLevel" );
                 if( aValue.Len() )
                     aPrinter.m_aInfo.m_nPSLevel = aValue.ToInt32();
-
+                
                 aValue = aConfig.ReadKey( "PerformFontSubstitution" );
                 if( ! aValue.Equals( "0" ) && ! aValue.EqualsIgnoreCaseAscii( "false" ) )
                     aPrinter.m_aInfo.m_bPerformFontSubstitution = true;
                 else
                     aPrinter.m_aInfo.m_bPerformFontSubstitution = false;
-
+                
                 // now iterate over all keys to extract multi key information:
                 // 1. PPDContext information
                 // 2. Font substitution table
@@ -524,10 +524,10 @@ void PrinterInfoManager::initialize()
                         aPrinter.m_aInfo.m_aFontSubstitutes[ OStringToOUString( aKey.Copy( 10 ), RTL_TEXTENCODING_ISO_8859_1 ) ] = OStringToOUString( aValue, RTL_TEXTENCODING_ISO_8859_1 );
                     }
                 }
-
+                
                 setDefaultPaper( aPrinter.m_aInfo.m_aContext );
                 fillFontSubstitutions( aPrinter.m_aInfo );
-
+                
                 // finally insert printer
                 FileBase::getFileURLFromSystemPath( aFile.PathToFileName(), aPrinter.m_aFile );
                 aPrinter.m_bModified    = false;
@@ -543,7 +543,7 @@ void PrinterInfoManager::initialize()
             }
         }
     }
-
+    
     // set default printer
     if( m_aPrinters.size() )
     {
@@ -553,23 +553,23 @@ void PrinterInfoManager::initialize()
     else
         aDefaultPrinter = OUString();
     m_aDefaultPrinter = aDefaultPrinter;
-
+    
     if( m_eType != Default )
         return;
-
+    
     // add a default printer for every available print queue
     // merge paper and font substitution from default printer,
     // all else from global defaults
     PrinterInfo aMergeInfo( m_aGlobalDefaults );
     aMergeInfo.m_aDriverName    = String( RTL_CONSTASCII_USTRINGPARAM( "SGENPRT" ) );
     aMergeInfo.m_aFeatures      = String( RTL_CONSTASCII_USTRINGPARAM( "autoqueue" ) );
-
+    
     if( m_aDefaultPrinter.getLength() )
     {
         PrinterInfo aDefaultInfo( getPrinterInfo( m_aDefaultPrinter ) );
         aMergeInfo.m_bPerformFontSubstitution = aDefaultInfo.m_bPerformFontSubstitution;
         fillFontSubstitutions( aMergeInfo );
-
+        
         const PPDKey* pDefKey           = aDefaultInfo.m_pParser->getKey( String( RTL_CONSTASCII_USTRINGPARAM( "PageSize" ) ) );
         const PPDKey* pMergeKey         = aMergeInfo.m_pParser->getKey( String( RTL_CONSTASCII_USTRINGPARAM( "PageSize" ) ) );
         const PPDValue* pDefValue       = aDefaultInfo.m_aContext.getValue( pDefKey );
@@ -577,23 +577,23 @@ void PrinterInfoManager::initialize()
         if( pMergeKey && pMergeValue )
             aMergeInfo.m_aContext.setValue( pMergeKey, pMergeValue );
     }
-
+    
     getSystemPrintQueues();
     for( ::std::list< SystemPrintQueue >::iterator it = m_aSystemPrintQueues.begin(); it != m_aSystemPrintQueues.end(); ++it )
     {
         String aPrinterName( RTL_CONSTASCII_USTRINGPARAM( "<" ) );
         aPrinterName += String( it->m_aQueue );
         aPrinterName.Append( '>' );
-
+        
         if( m_aPrinters.find( aPrinterName ) != m_aPrinters.end() )
             // probably user made this one permanent in padmin
         continue;
-
+        
         String aCmd( m_aSystemPrintCommand );
         aCmd.SearchAndReplace( String( RTL_CONSTASCII_USTRINGPARAM( "(PRINTER)" ) ), it->m_aQueue );
-
+        
         Printer aPrinter;
-
+        
         // initialize to merged defaults
         aPrinter.m_aInfo = aMergeInfo;
         aPrinter.m_aInfo.m_aPrinterName     = aPrinterName;
@@ -602,7 +602,7 @@ void PrinterInfoManager::initialize()
         aPrinter.m_aInfo.m_aLocation        = it->m_aLocation;
         aPrinter.m_bModified                = false;
         aPrinter.m_aGroup                   = ByteString( aPrinterName, aEncoding ); //provide group name in case user makes this one permanent in padmin
-
+        
         m_aPrinters[ aPrinterName ] = aPrinter;
     }
 }
@@ -623,9 +623,9 @@ const PrinterInfo& PrinterInfoManager::getPrinterInfo( const OUString& rPrinter
 {
     static PrinterInfo aEmptyInfo;
     ::std::hash_map< OUString, Printer, OUStringHash >::const_iterator it = m_aPrinters.find( rPrinter );
-
+    
     DBG_ASSERT( it != m_aPrinters.end(), "Do not ask for info about nonexistant printers" );
-
+    
     return it != m_aPrinters.end() ? it->second.m_aInfo : aEmptyInfo;
 }
 
@@ -634,9 +634,9 @@ const PrinterInfo& PrinterInfoManager::getPrinterInfo( const OUString& rPrinter
 void PrinterInfoManager::changePrinterInfo( const OUString& rPrinter, const PrinterInfo& rNewInfo )
 {
     ::std::hash_map< OUString, Printer, OUStringHash >::iterator it = m_aPrinters.find( rPrinter );
-
+    
     DBG_ASSERT( it != m_aPrinters.end(), "Do not change nonexistant printers" );
-
+    
     if( it != m_aPrinters.end() )
     {
         it->second.m_aInfo      = rNewInfo;
@@ -667,7 +667,7 @@ bool PrinterInfoManager::writePrinterConfig()
     ::std::hash_map< OUString, Config*, OUStringHash > files;
     ::std::hash_map< OUString, int, OUStringHash > rofiles;
     ::std::hash_map< OUString, Config*, OUStringHash >::iterator file_it;
-
+    
     for( ::std::list< WatchFile >::const_iterator wit = m_aWatchFiles.begin(); wit != m_aWatchFiles.end(); ++wit )
     {
         if( checkWriteability( wit->m_aFilePath ) )
@@ -676,21 +676,21 @@ bool PrinterInfoManager::writePrinterConfig()
             break;
         }
     }
-
+    
     if( files.empty() )
         return false;
-
+    
     Config* pGlobal = files.begin()->second;
     pGlobal->SetGroup( GLOBAL_DEFAULTS_GROUP );
     pGlobal->WriteKey( "DisableCUPS", m_bDisableCUPS ? "true" : "false" );
-
+    
     ::std::hash_map< OUString, Printer, OUStringHash >::iterator it;
     for( it = m_aPrinters.begin(); it != m_aPrinters.end(); ++it )
     {
         if( ! it->second.m_bModified )
             // printer was not changed, do nothing
         continue;
-
+        
         // don't save autoqueue printers
         sal_Int32 nIndex = 0;
         bool bAutoQueue = false;
@@ -702,7 +702,7 @@ bool PrinterInfoManager::writePrinterConfig()
         }
         if( bAutoQueue )
             continue;
-
+        
         if( it->second.m_aFile.getLength() )
         {
             // check if file is writable
@@ -735,16 +735,16 @@ bool PrinterInfoManager::writePrinterConfig()
         }
         else // a new printer, write it to the first file available
             it->second.m_aFile = files.begin()->first;
-
+        
         if( ! it->second.m_aGroup.getLength() ) // probably a new printer
             it->second.m_aGroup = OString( it->first.getStr(), it->first.getLength(), RTL_TEXTENCODING_UTF8 );
-
+        
         if( files.find( it->second.m_aFile ) != files.end() )
         {
             Config* pConfig = files[ it->second.m_aFile ];
             pConfig->DeleteGroup( it->second.m_aGroup ); // else some old keys may remain
             pConfig->SetGroup( it->second.m_aGroup );
-
+            
             ByteString aValue( String( it->second.m_aInfo.m_aDriverName ), RTL_TEXTENCODING_UTF8 );
             aValue += '/';
             aValue += ByteString( String( it->first ), RTL_TEXTENCODING_UTF8 );
@@ -768,7 +768,7 @@ bool PrinterInfoManager::writePrinterConfig()
             aValue += ',';
             aValue += ByteString::CreateFromInt32( it->second.m_aInfo.m_nBottomMarginAdjust );
             pConfig->WriteKey( "MarginAdjust", aValue );
-
+            
             if( it->second.m_aInfo.m_aDriverName.compareToAscii( "CUPS:", 5 ) != 0 )
             {
                 // write PPDContext (not for CUPS)
@@ -777,13 +777,13 @@ bool PrinterInfoManager::writePrinterConfig()
                     const PPDKey* pKey = it->second.m_aInfo.m_aContext.getModifiedKey( i );
                     ByteString aKey( "PPD_" );
                     aKey += ByteString( pKey->getKey(), RTL_TEXTENCODING_ISO_8859_1 );
-
+                    
                     const PPDValue* pValue = it->second.m_aInfo.m_aContext.getValue( pKey );
                     aValue = pValue ? ByteString( pValue->m_aOption, RTL_TEXTENCODING_ISO_8859_1 ) : ByteString( "*nil" );
                     pConfig->WriteKey( aKey, aValue );
                 }
             }
-
+            
             // write font substitution table
             pConfig->WriteKey( "PerformFontSubstitution", it->second.m_aInfo.m_bPerformFontSubstitution ? "true" : "false" );
             for( ::std::hash_map< OUString, OUString, OUStringHash >::const_iterator subst = it->second.m_aInfo.m_aFontSubstitutes.begin();
@@ -795,11 +795,11 @@ bool PrinterInfoManager::writePrinterConfig()
             }
         }
     }
-
+    
     // get rid of Config objects. this also writes any changes
     for( file_it = files.begin(); file_it != files.end(); ++file_it )
         delete file_it->second;
-
+    
     return true;
 }
 
@@ -808,7 +808,7 @@ bool PrinterInfoManager::writePrinterConfig()
 bool PrinterInfoManager::addPrinter( const OUString& rPrinterName, const OUString& rDriverName )
 {
     bool bSuccess = false;
-
+    
     const PPDParser* pParser = NULL;
     if( m_aPrinters.find( rPrinterName ) == m_aPrinters.end() && ( pParser = PPDParser::getParser( rDriverName ) ) )
     {
@@ -819,7 +819,7 @@ bool PrinterInfoManager::addPrinter( const OUString& rPrinterName, const OUStrin
         aPrinter.m_aInfo.m_pParser                  = pParser;
         aPrinter.m_aInfo.m_aContext.setParser( pParser );
         aPrinter.m_aInfo.m_aPrinterName             = rPrinterName;
-
+        
         fillFontSubstitutions( aPrinter.m_aInfo );
         // merge PPD values with global defaults
         for( int nPPDValueModified = 0; nPPDValueModified < m_aGlobalDefaults.m_aContext.countValuesModified(); nPPDValueModified++ )
@@ -841,7 +841,7 @@ bool PrinterInfoManager::addPrinter( const OUString& rPrinterName, const OUStrin
                     aPrinter.m_aInfo.m_aContext.setValue( pPrinterKey, NULL );
             }
         }
-
+        
         m_aPrinters[ rPrinterName ] = aPrinter;
         bSuccess = true;
         #if OSL_DEBUG_LEVEL > 1
@@ -864,15 +864,15 @@ bool PrinterInfoManager::addPrinter( const OUString& rPrinterName, const OUStrin
 bool PrinterInfoManager::removePrinter( const OUString& rPrinterName, bool bCheckOnly )
 {
     bool bSuccess = true;
-
+    
     ::std::hash_map< OUString, Printer, OUStringHash >::iterator it = m_aPrinters.find( rPrinterName );
     if( it != m_aPrinters.end() )
     {
         if( it->second.m_aFile.getLength() )
         {
             // this printer already exists in a config file
-
-
+            
+            
             // check writeability of config file(s)
             if( ! checkWriteability( it->second.m_aFile ) )
                 bSuccess = false;
@@ -887,7 +887,7 @@ bool PrinterInfoManager::removePrinter( const OUString& rPrinterName, bool bChec
             }
             if( bSuccess && ! bCheckOnly )
             {
-
+                
                 Config aConfig( it->second.m_aFile );
                 aConfig.DeleteGroup( it->second.m_aGroup );
                 aConfig.Flush();
@@ -918,7 +918,7 @@ bool PrinterInfoManager::removePrinter( const OUString& rPrinterName, bool bChec
 bool PrinterInfoManager::setDefaultPrinter( const OUString& rPrinterName )
 {
     bool bSuccess = false;
-
+    
     ::std::hash_map< OUString, Printer, OUStringHash >::iterator it = m_aPrinters.find( rPrinterName );
     if( it != m_aPrinters.end() )
     {
@@ -944,21 +944,21 @@ void PrinterInfoManager::fillFontSubstitutions( PrinterInfo& rInfo ) const
 {
     PrintFontManager& rFontManager( PrintFontManager::get() );
     rInfo.m_aFontSubstitutions.clear();
-
+    
     if( ! rInfo.m_bPerformFontSubstitution ||
         ! rInfo.m_aFontSubstitutes.size() )
     return;
-
+    
     ::std::list< FastPrintFontInfo > aFonts;
     ::std::hash_map< OUString, ::std::list< FastPrintFontInfo >, OUStringHash > aPrinterFonts;
     rFontManager.getFontListWithFastInfo( aFonts, rInfo.m_pParser );
-
+    
     // get builtin fonts
     ::std::list< FastPrintFontInfo >::const_iterator it;
     for( it = aFonts.begin(); it != aFonts.end(); ++it )
         if( it->m_eType == fonttype::Builtin )
             aPrinterFonts[ it->m_aFamilyName.toAsciiLowerCase() ].push_back( *it );
-
+    
     // map lower case, so build a local copy of the font substitutions
     ::std::hash_map< OUString, OUString, OUStringHash > aSubstitutions;
     ::std::hash_map< OUString, OUString, OUStringHash >::const_iterator subst;
@@ -972,8 +972,8 @@ void PrinterInfoManager::fillFontSubstitutions( PrinterInfo& rInfo ) const
         else
             aSubstitutions[ aFamily ] = subst->second.toAsciiLowerCase();
     }
-
-
+    
+    
     // now find substitutions
     for( it = aFonts.begin(); it != aFonts.end(); ++it )
     {
@@ -994,15 +994,15 @@ void PrinterInfoManager::fillFontSubstitutions( PrinterInfo& rInfo ) const
                     int nDiff;
                     if( builtin->m_eItalic == it->m_eItalic )
                         nMatch += 8000;
-
+                    
                     nDiff = builtin->m_eWeight - it->m_eWeight;
                     nDiff = nDiff < 0 ? -nDiff : nDiff;
                     nMatch += 4000 - 1000*nDiff;
-
+                    
                     nDiff = builtin->m_eWidth - it->m_eWidth;
                     nDiff = nDiff < 0 ? -nDiff : nDiff;
                     nMatch += 2000 - 500*nDiff;
-
+                    
                     if( nMatch > nLastMatch )
                     {
                         nLastMatch = nMatch;
@@ -1022,7 +1022,7 @@ void PrinterInfoManager::fillFontSubstitutions( PrinterInfo& rInfo ) const
                     it->m_eItalic == italic::Upright ? "r" : it->m_eItalic == italic::Oblique ? "o" : it->m_eItalic == italic::Italic ? "i" : "u",
                     it->m_eWeight,
                     it->m_eWidth,
-
+                    
                     OUStringToOString( aInfo.m_aFamilyName, RTL_TEXTENCODING_ISO_8859_1 ).getStr(),
                     aInfo.m_eItalic == italic::Upright ? "r" : aInfo.m_eItalic == italic::Oblique ? "o" : aInfo.m_eItalic == italic::Italic ? "i" : "u",
                     aInfo.m_eWeight,
@@ -1045,7 +1045,7 @@ void PrinterInfoManager::getSystemPrintCommands( std::list< OUString >& rCommand
         m_pQueueInfo->getSystemQueues( m_aSystemPrintQueues );
         delete m_pQueueInfo, m_pQueueInfo = NULL;
     }
-
+    
     std::list< SystemPrintQueue >::const_iterator it;
     rCommands.clear();
     String aPrinterConst( RTL_CONSTASCII_USTRINGPARAM( "(PRINTER)" ) );
@@ -1065,7 +1065,7 @@ const std::list< PrinterInfoManager::SystemPrintQueue >& PrinterInfoManager::get
         m_pQueueInfo->getSystemQueues( m_aSystemPrintQueues );
         delete m_pQueueInfo, m_pQueueInfo = NULL;
     }
-
+    
     return m_aSystemPrintQueues;
 }
 
@@ -1091,7 +1091,7 @@ FILE* PrinterInfoManager::startSpool( const OUString& rPrintername, bool bQuickC
                                           rPrinterInfo.m_aQuickCommand : rPrinterInfo.m_aCommand;
     rtl::OString aShellCommand  = OUStringToOString (rCommand, RTL_TEXTENCODING_ISO_8859_1);
     aShellCommand += rtl::OString( " 2>/dev/null" );
-
+    
     return popen (aShellCommand.getStr(), "w");
 }
 
@@ -1115,16 +1115,16 @@ void PrinterInfoManager::setDefaultPaper( PPDContext& rContext ) const
 {
     if(  ! rContext.getParser() )
         return;
-
+    
     const PPDKey* pPageSizeKey = rContext.getParser()->getKey( String( RTL_CONSTASCII_USTRINGPARAM( "PageSize" ) ) );
     if( ! pPageSizeKey )
         return;
-
+    
     int nModified = rContext.countValuesModified();
     while( nModified-- &&
         rContext.getModifiedKey( nModified ) != pPageSizeKey )
     ;
-
+    
     if( nModified >= 0 ) // paper was set already, do not modify
     {
         #if OSL_DEBUG_LEVEL > 1
@@ -1133,7 +1133,7 @@ void PrinterInfoManager::setDefaultPaper( PPDContext& rContext ) const
         #endif
         return;
     }
-
+    
     // paper not set, fill in default value
     const PPDValue* pPaperVal = NULL;
     int nValues = pPageSizeKey->countValues();
@@ -1205,7 +1205,7 @@ struct SystemCommandParameters
     tokenHandler    pHandler;
 };
 
-#if ! (defined(LINUX) || defined(NETBSD) || defined(FREEBSD))
+#if ! (defined(LINUX) || defined(NETBSD) || defined(FREEBSD)) 
 static void lpgetSysQueueTokenHandler(
     const std::list< rtl::OString >& i_rLines,
     std::list< PrinterInfoManager::SystemPrintQueue >& o_rQueues,
@@ -1216,10 +1216,10 @@ static void lpgetSysQueueTokenHandler(
     std::hash_set< OUString, OUStringHash > aOnlySet;
     aUniqueSet.insert( OUString( RTL_CONSTASCII_USTRINGPARAM( "_all" ) ) );
     aUniqueSet.insert( OUString( RTL_CONSTASCII_USTRINGPARAM( "_default" ) ) );
-
+    
     // the eventual "all" attribute of the "_all" queue tells us, which
     // printers are to be used for this user at all
-
+    
     // find _all: line
     rtl::OString aAllLine( "_all:" );
     rtl::OString aAllAttr( "all=" );
@@ -1249,7 +1249,7 @@ static void lpgetSysQueueTokenHandler(
             break;
         }
     }
-
+    
     bool bInsertAttribute = false;
     rtl::OString aDescrStr( "description=" );
     rtl::OString aLocStr( "location=" );
@@ -1318,7 +1318,7 @@ static void standardSysQueueTokenHandler(
          it != i_rLines.end(); ++it )
     {
         sal_Int32 nPos = 0;
-
+        
         // search for a line describing a printer:
         // find if there are enough tokens before the name
         for( unsigned int i = 0; i < i_pParms->nForeTokenCount && nPos != -1; i++ )
@@ -1350,7 +1350,7 @@ static void standardSysQueueTokenHandler(
 
 static const struct SystemCommandParameters aParms[] =
 {
-    #if defined(LINUX) || defined(NETBSD) || defined(FREEBSD)
+    #if defined(LINUX) || defined(NETBSD) || defined(FREEBSD) 
     { "/usr/sbin/lpc status", "lpr -P \"(PRINTER)\"", "", ":", 0, standardSysQueueTokenHandler },
     { "lpc status", "lpr -P \"(PRINTER)\"", "", ":", 0, standardSysQueueTokenHandler },
     { "LANG=C;LC_ALL=C;export LANG LC_ALL;lpstat -s", "lp -d \"(PRINTER)\"", "system for ", ": ", 1, standardSysQueueTokenHandler }
@@ -1367,7 +1367,7 @@ void SystemQueueInfo::run()
     char pBuffer[1024];
     FILE *pPipe;
     std::list< rtl::OString > aLines;
-
+    
     /* Discover which command we can use to get a list of all printer queues */
     for( unsigned int i = 0; i < sizeof(aParms)/sizeof(aParms[0]); i++ )
     {
@@ -1377,7 +1377,7 @@ void SystemQueueInfo::run()
         #if OSL_DEBUG_LEVEL > 1
         fprintf( stderr, "trying print queue command \"%s\" ... ", aParms[i].pQueueCommand );
         #endif
-        aCmdLine.append( " 2>/dev/null" );
+        aCmdLine.append( " 2>/dev/null" );   
         if( (pPipe = popen( aCmdLine.getStr(), "r" )) )
         {
             while( fgets( pBuffer, 1024, pPipe ) )
@@ -1399,6 +1399,6 @@ void SystemQueueInfo::run()
         #if OSL_DEBUG_LEVEL > 1
         fprintf( stderr, "failed\n" );
         #endif
-    }
+    }    
 }
 
diff --git a/vcl/unx/source/printergfx/bitmap_gfx.cxx b/vcl/unx/source/printergfx/bitmap_gfx.cxx
index 1421fb7433f7..3e3ffd748bee 100644
--- a/vcl/unx/source/printergfx/bitmap_gfx.cxx
+++ b/vcl/unx/source/printergfx/bitmap_gfx.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
@@ -39,7 +39,7 @@ const sal_uInt32 nLineLength = 80;
 const sal_uInt32 nBufferSize = 16384;
 
 /*
- *
+ * 
  * Bitmap compression / Hex encoding / Ascii85 Encoding
  *
  */
@@ -49,7 +49,7 @@ PrinterBmp::~PrinterBmp ()
 
 /* virtual base class */
 
-class ByteEncoder
+class ByteEncoder 
 {
 private:
 
@@ -97,7 +97,7 @@ HexEncoder::~HexEncoder ()
         WritePS (mpFile, "\n");
 }
 
-void
+void 
 HexEncoder::WriteAscii (sal_uInt8 nByte)
 {
     sal_uInt32 nOff = psp::getHexValueOf (nByte, mpFileBuffer + mnOffset);
@@ -113,10 +113,10 @@ HexEncoder::WriteAscii (sal_uInt8 nByte)
         FlushLine ();
 }
 
-void
+void 
 HexEncoder::EncodeByte (sal_uInt8 nByte)
 {
-    WriteAscii (nByte);
+    WriteAscii (nByte); 
 }
 
 void
@@ -129,7 +129,7 @@ HexEncoder::FlushLine ()
     }
 }
 
-/* Ascii85 encoder, is abi compatible with HexEncoder but writes a ~> to
+/* Ascii85 encoder, is abi compatible with HexEncoder but writes a ~> to 
    indicate end of data EOD */
 
 class Ascii85Encoder : public ByteEncoder
@@ -218,7 +218,7 @@ Ascii85Encoder::ConvertToAscii85 ()
         {
             sal_uInt32 nEolOff = mnColumn - nLineLength;
             sal_uInt32 nBufOff = mnOffset - nEolOff;
-
+            
             std::memmove (mpFileBuffer + nBufOff + 1, mpFileBuffer + nBufOff, nEolOff);
             mpFileBuffer[ nBufOff ] = '\n';
 
@@ -302,7 +302,7 @@ public:
 
     LZWEncoder (osl::File* pOutputFile);
     ~LZWEncoder ();
-
+        
     virtual void    EncodeByte (sal_uInt8 nByte);
 };
 
@@ -344,7 +344,7 @@ LZWEncoder::~LZWEncoder()
     delete[] mpTable;
 }
 
-void
+void 
 LZWEncoder::WriteBits (sal_uInt16 nCode, sal_uInt16 nCodeLen)
 {
     mdwShift |= (nCode << (mnOffset - nCodeLen));
@@ -359,7 +359,7 @@ LZWEncoder::WriteBits (sal_uInt16 nCode, sal_uInt16 nCodeLen)
         WriteAscii ((sal_uInt8)(mdwShift >> 24));
 }
 
-void
+void 
 LZWEncoder::EncodeByte (sal_uInt8 nByte )
 {
     LZWCTreeNode*   p;
@@ -421,7 +421,7 @@ LZWEncoder::EncodeByte (sal_uInt8 nByte )
  */
 
 void
-PrinterGfx::DrawBitmap (const Rectangle& rDest, const Rectangle& rSrc,
+PrinterGfx::DrawBitmap (const Rectangle& rDest, const Rectangle& rSrc, 
                         const PrinterBmp& rBitmap)
 {
     double fScaleX = (double)rDest.GetWidth() / (double)rSrc.GetWidth();
@@ -444,7 +444,7 @@ PrinterGfx::DrawBitmap (const Rectangle& rDest, const Rectangle& rSrc,
             // image to save diskspace. This is important for printing transparent
             // bitmaps that are disassembled into small pieces
             sal_Int32 nImageSz   = rSrc.GetWidth() * rSrc.GetHeight();
-            sal_Int32 nPaletteSz = rBitmap.GetPaletteEntryCount();
+            sal_Int32 nPaletteSz = rBitmap.GetPaletteEntryCount(); 
             if ((nImageSz < nPaletteSz) || (nImageSz < 24) )
                 DrawPS2TrueColorImage (rBitmap, rSrc);
             else
@@ -455,7 +455,7 @@ PrinterGfx::DrawBitmap (const Rectangle& rDest, const Rectangle& rSrc,
         {
             DrawPS2TrueColorImage (rBitmap, rSrc);
         }
-        else
+        else    
         {
             DrawPS2GrayImage (rBitmap, rSrc);
         }
@@ -470,7 +470,7 @@ PrinterGfx::DrawBitmap (const Rectangle& rDest, const Rectangle& rSrc,
 
 /* XXX does not work XXX */
 void
-PrinterGfx::DrawBitmap (const Rectangle& rDest, const Rectangle& rSrc,
+PrinterGfx::DrawBitmap (const Rectangle& rDest, const Rectangle& rSrc, 
                         const PrinterBmp& /*rBitmap*/, const PrinterBmp& /*rTransBitmap*/)
 {
     double fScaleX = (double)rDest.GetWidth() / (double)rSrc.GetWidth();
@@ -478,13 +478,13 @@ PrinterGfx::DrawBitmap (const Rectangle& rDest, const Rectangle& rSrc,
 
     PSGSave ();
     PSTranslate (rDest.BottomLeft());
-    PSScale (fScaleX, fScaleY);
+    PSScale (fScaleX, fScaleY); 
     PSGRestore ();
 }
 
 /* XXX does not work XXX */
 void
-PrinterGfx::DrawMask   (const Rectangle& rDest, const Rectangle& rSrc,
+PrinterGfx::DrawMask   (const Rectangle& rDest, const Rectangle& rSrc, 
                         const PrinterBmp &/*rBitmap*/, PrinterColor& /*rMaskColor*/)
 {
     double fScaleX = (double)rDest.GetWidth() / (double)rSrc.GetWidth();
@@ -492,7 +492,7 @@ PrinterGfx::DrawMask   (const Rectangle& rDest, const Rectangle& rSrc,
 
     PSGSave ();
     PSTranslate (rDest.BottomLeft());
-    PSScale (fScaleX, fScaleY);
+    PSScale (fScaleX, fScaleY); 
     PSGRestore ();
 }
 
@@ -538,7 +538,7 @@ PrinterGfx::DrawPS1GrayImage (const PrinterBmp& rBitmap, const Rectangle& rArea)
         }
     }
 
-    delete pEncoder;
+    delete pEncoder;    
 
     WritePS (mpPageBody, "\n");
 }
@@ -549,7 +549,7 @@ PrinterGfx::DrawPS1GrayImage (const PrinterBmp& rBitmap, const Rectangle& rArea)
  *
  */
 
-void
+void 
 PrinterGfx::writePS2ImageHeader (const Rectangle& rArea, psp::ImageType nType)
 {
     sal_Int32 nChar = 0;
@@ -593,7 +593,7 @@ PrinterGfx::writePS2Colorspace(const PrinterBmp& rBitmap, psp::ImageType nType)
             WritePS (mpPageBody, "/DeviceRGB setcolorspace\n");
             break;
 
-        case psp::MonochromeImage:
+        case psp::MonochromeImage: 
         case psp::PaletteImage:
         {
 
@@ -610,7 +610,7 @@ PrinterGfx::writePS2Colorspace(const PrinterBmp& rBitmap, psp::ImageType nType)
                 nChar += psp::appendStr ("\npsp_ascii85string\n", pImage + nChar);
             WritePS (mpPageBody, pImage);
 
-            ByteEncoder* pEncoder = mbCompressBmp ? new LZWEncoder(mpPageBody)
+            ByteEncoder* pEncoder = mbCompressBmp ? new LZWEncoder(mpPageBody) 
                                                   : new Ascii85Encoder(mpPageBody);
             for (sal_uInt32 i = 0; i < nSize; i++)
             {
@@ -621,7 +621,7 @@ PrinterGfx::writePS2Colorspace(const PrinterBmp& rBitmap, psp::ImageType nType)
                 pEncoder->EncodeByte (aColor.GetBlue());
             }
             delete pEncoder;
-
+          
             WritePS (mpPageBody, "pop ] setcolorspace\n");
         }
         break;
@@ -633,9 +633,9 @@ void
 PrinterGfx::DrawPS2GrayImage (const PrinterBmp& rBitmap, const Rectangle& rArea)
 {
     writePS2Colorspace(rBitmap, psp::GrayScaleImage);
-    writePS2ImageHeader(rArea, psp::GrayScaleImage);
+    writePS2ImageHeader(rArea, psp::GrayScaleImage); 
 
-    ByteEncoder* pEncoder = mbCompressBmp ? new LZWEncoder(mpPageBody)
+    ByteEncoder* pEncoder = mbCompressBmp ? new LZWEncoder(mpPageBody) 
                                           : new Ascii85Encoder(mpPageBody);
 
     for (long nRow = rArea.Top(); nRow <= rArea.Bottom(); nRow++)
@@ -656,20 +656,20 @@ PrinterGfx::DrawPS2MonoImage (const PrinterBmp& rBitmap, const Rectangle& rArea)
     writePS2Colorspace(rBitmap, psp::MonochromeImage);
     writePS2ImageHeader(rArea, psp::MonochromeImage);
 
-    ByteEncoder* pEncoder = mbCompressBmp ? new LZWEncoder(mpPageBody)
+    ByteEncoder* pEncoder = mbCompressBmp ? new LZWEncoder(mpPageBody) 
                                           : new Ascii85Encoder(mpPageBody);
 
     for (long nRow = rArea.Top(); nRow <= rArea.Bottom(); nRow++)
     {
         long      nBitPos = 0;
-        sal_uChar nBit    = 0;
+        sal_uChar nBit    = 0; 
         sal_uChar nByte   = 0;
 
         for (long nColumn = rArea.Left(); nColumn <= rArea.Right(); nColumn++)
         {
             nBit   = rBitmap.GetPixelIdx (nRow, nColumn);
             nByte |= nBit << (7 - nBitPos);
-
+            
             if (++nBitPos == 8)
             {
                 pEncoder->EncodeByte (nByte);
@@ -691,7 +691,7 @@ PrinterGfx::DrawPS2PaletteImage (const PrinterBmp& rBitmap, const Rectangle& rAr
     writePS2Colorspace(rBitmap, psp::PaletteImage);
     writePS2ImageHeader(rArea, psp::PaletteImage);
 
-    ByteEncoder* pEncoder = mbCompressBmp ? new LZWEncoder(mpPageBody)
+    ByteEncoder* pEncoder = mbCompressBmp ? new LZWEncoder(mpPageBody) 
                                           : new Ascii85Encoder(mpPageBody);
 
     for (long nRow = rArea.Top(); nRow <= rArea.Bottom(); nRow++)
@@ -712,7 +712,7 @@ PrinterGfx::DrawPS2TrueColorImage (const PrinterBmp& rBitmap, const Rectangle& r
     writePS2Colorspace(rBitmap, psp::TrueColorImage);
     writePS2ImageHeader(rArea, psp::TrueColorImage);
 
-    ByteEncoder* pEncoder = mbCompressBmp ? new LZWEncoder(mpPageBody)
+    ByteEncoder* pEncoder = mbCompressBmp ? new LZWEncoder(mpPageBody) 
                                           : new Ascii85Encoder(mpPageBody);
 
     for (long nRow = rArea.Top(); nRow <= rArea.Bottom(); nRow++)
diff --git a/vcl/unx/source/printergfx/common_gfx.cxx b/vcl/unx/source/printergfx/common_gfx.cxx
index 6bb31acfcbbe..f6c38d66ba11 100644
--- a/vcl/unx/source/printergfx/common_gfx.cxx
+++ b/vcl/unx/source/printergfx/common_gfx.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
@@ -43,7 +43,7 @@
 
 using namespace psp ;
 
-static const sal_Int32 nMaxTextColumn = 80;
+static const sal_Int32 nMaxTextColumn = 80; 
 
 GraphicsStatus::GraphicsStatus() :
         mbArtItalic( false ),
@@ -66,7 +66,7 @@ PrinterGfx::Init (PrinterJob &rPrinterJob)
     mnDepth      = rPrinterJob.GetDepth ();
     mnPSLevel    = rPrinterJob.GetPostscriptLevel ();
     mbColor      = rPrinterJob.IsColorPrinter ();
-
+    
     mnDpi = rPrinterJob.GetResolution();
     rPrinterJob.GetScale (mfScaleX, mfScaleY);
     const PrinterInfo& rInfo( PrinterInfoManager::get().getPrinterInfo( rPrinterJob.GetPrinterName() ) );
@@ -101,7 +101,7 @@ PrinterGfx::Init (const JobData& rData)
     else
         mpFontSubstitutes = NULL;
     mbUploadPS42Fonts = rInfo.m_pParser ? ( rInfo.m_pParser->isType42Capable() ? sal_True : sal_False ) : sal_False;
-
+    
     return sal_True;
 }
 
@@ -118,7 +118,7 @@ PrinterGfx::GetBitCount ()
     return mnDepth;
 }
 
-PrinterGfx::PrinterGfx() :
+PrinterGfx::PrinterGfx() : 
         mpPageHeader (NULL),
         mpPageBody (NULL),
         mnFontID (0),
@@ -216,7 +216,7 @@ PrinterGfx::JoinVerticalClipRectangles( std::list< Rectangle >::iterator& it,
     nextit = it;
     ++nextit;
     std::list< Point > leftside, rightside;
-
+    
     Rectangle aLastRect( *it );
     leftside.push_back( Point( it->Left(), it->Top() ) );
     rightside.push_back( Point( it->Right()+1, it->Top() ) );
@@ -226,7 +226,7 @@ PrinterGfx::JoinVerticalClipRectangles( std::list< Rectangle >::iterator& it,
         ++tempit;
         if( nextit->Top() == aLastRect.Bottom()+1 )
         {
-            if(
+            if( 
                ( nextit->Left() >= aLastRect.Left() && nextit->Left() <= aLastRect.Right() ) // left endpoint touches last rectangle
                ||
                ( nextit->Right() >= aLastRect.Left() && nextit->Right() <= aLastRect.Right() ) // right endpoint touches last rectangle
@@ -389,7 +389,7 @@ PrinterGfx::DrawLine (const Point& rFrom, const Point& rTo)
         PSSetColor (maLineColor);
         PSSetColor ();
         PSSetLineWidth ();
-
+        
         PSMoveTo (rFrom);
         PSLineTo (rTo);
         WritePS (mpPageBody, "stroke\n" );
@@ -422,9 +422,9 @@ PrinterGfx::DrawPolyLine (sal_uInt32 nPoints, const Point* pPath)
         PSSetLineWidth ();
 
         PSBinCurrentPath (nPoints, pPath);
-
+        
         WritePS (mpPageBody, "stroke\n" );
-    }
+    }       
 }
 
 void
@@ -437,7 +437,7 @@ PrinterGfx::DrawPolygon (sal_uInt32 nPoints, const Point* pPath)
     // setup closed path
     Point aPoint( 0, 0 );
     sal_Int32 nColumn( 0 );
-
+        
     PSBinStartPath();
     PSBinMoveTo( pPath[0], aPoint, nColumn );
     for( unsigned int n = 1; n < nPoints; n++ )
@@ -486,7 +486,7 @@ PrinterGfx::DrawPolyPolygon (sal_uInt32 nPoly, const sal_uInt32* pSizes, const P
     {
         Point aPoint( 0, 0 );
         sal_Int32 nColumn( 0 );
-
+        
         PSBinStartPath();
         PSBinMoveTo( pPaths[i][0], aPoint, nColumn );
         for( unsigned int n = 1; n < pSizes[i]; n++ )
@@ -531,7 +531,7 @@ PrinterGfx::DrawPolyLineBezier (sal_uInt32 nPoints, const Point* pPath, const BY
 {
     const sal_uInt32 nBezString = 1024;
     sal_Char pString[nBezString];
-
+    
     if ( nPoints > 1 && maLineColor.Is() && pPath )
     {
         PSSetColor (maLineColor);
@@ -540,8 +540,8 @@ PrinterGfx::DrawPolyLineBezier (sal_uInt32 nPoints, const Point* pPath, const BY
 
         snprintf(pString, nBezString, "%li %li moveto\n", pPath[0].X(), pPath[0].Y());
         WritePS(mpPageBody, pString);
-
-        // Handle the drawing of mixed lines mixed with curves
+        
+        // Handle the drawing of mixed lines mixed with curves 
         // - a normal point followed by a normal point is a line
         // - a normal point followed by 2 control points and a normal point is a curve
         for (unsigned int i=1; i<nPoints;)
@@ -553,14 +553,14 @@ PrinterGfx::DrawPolyLineBezier (sal_uInt32 nPoints, const Point* pPath, const BY
             }
             else //Otherwise we're drawing a spline
             {
-                if (i+2 >= nPoints)
+                if (i+2 >= nPoints)               
                     return; //Error: wrong sequence of contol/normal points somehow
                 if ((pFlgAry[i] == POLY_CONTROL) && (pFlgAry[i+1] == POLY_CONTROL) &&
                     (pFlgAry[i+2] != POLY_CONTROL))
                 {
                     snprintf(pString, nBezString, "%li %li %li %li %li %li curveto\n",
-                             pPath[i].X(), pPath[i].Y(),
-                             pPath[i+1].X(), pPath[i+1].Y(),
+                             pPath[i].X(), pPath[i].Y(), 
+                             pPath[i+1].X(), pPath[i+1].Y(), 
                              pPath[i+2].X(), pPath[i+2].Y());
                 }
                 else
@@ -585,10 +585,10 @@ PrinterGfx::DrawPolygonBezier (sal_uInt32 nPoints, const Point* pPath, const BYT
     // premature end of operation
     if (!(nPoints > 1) || (pPath == NULL) || !(maFillColor.Is() || maLineColor.Is()))
         return;
-
+    
     snprintf(pString, nBezString, "%li %li moveto\n", pPath[0].X(), pPath[0].Y());
     WritePS(mpPageBody, pString); //Move to the starting point for the PolyPoygon
-    for (unsigned int i=1; i < nPoints;)
+    for (unsigned int i=1; i < nPoints;) 
     {
         if (pFlgAry[i] != POLY_CONTROL)
         {
@@ -598,14 +598,14 @@ PrinterGfx::DrawPolygonBezier (sal_uInt32 nPoints, const Point* pPath, const BYT
         }
         else
         {
-            if (i+2 >= nPoints)
+            if (i+2 >= nPoints)               
                 return; //Error: wrong sequence of contol/normal points somehow
             if ((pFlgAry[i] == POLY_CONTROL) && (pFlgAry[i+1] == POLY_CONTROL) &&
                     (pFlgAry[i+2] != POLY_CONTROL))
             {
                 snprintf(pString, nBezString, "%li %li %li %li %li %li curveto\n",
-                        pPath[i].X(), pPath[i].Y(),
-                        pPath[i+1].X(), pPath[i+1].Y(),
+                        pPath[i].X(), pPath[i].Y(), 
+                        pPath[i+1].X(), pPath[i+1].Y(), 
                         pPath[i+2].X(), pPath[i+2].Y());
                 WritePS(mpPageBody, pString);
             }
@@ -630,7 +630,7 @@ PrinterGfx::DrawPolygonBezier (sal_uInt32 nPoints, const Point* pPath, const BYT
 
     // restore the current path
     if( maFillColor.Is() && maLineColor.Is())
-        PSGRestore();
+        PSGRestore();    
 }
 
 void
@@ -640,15 +640,15 @@ PrinterGfx::DrawPolyPolygonBezier (sal_uInt32 nPoly, const sal_uInt32 * pPoints,
     sal_Char pString[nBezString];
     if ( !nPoly || !pPtAry || !pPoints || !(maFillColor.Is() || maLineColor.Is()))
         return;
-
-
+    
+    
     for (unsigned int i=0; i<nPoly;i++)
     {
         sal_uInt32 nPoints = pPoints[i];
         // #112689# sanity check
         if( nPoints == 0 || pPtAry[i] == NULL )
             continue;
-
+        
         snprintf(pString, nBezString, "%li %li moveto\n", pPtAry[i][0].X(), pPtAry[i][0].Y()); //Move to the starting point
         WritePS(mpPageBody, pString);
         for (unsigned int j=1; j < nPoints;)
@@ -668,8 +668,8 @@ PrinterGfx::DrawPolyPolygonBezier (sal_uInt32 nPoly, const sal_uInt32 * pPoints,
                 if ((pFlgAry[i][j] == POLY_CONTROL) && (pFlgAry[i][j+1] == POLY_CONTROL) && (pFlgAry[i][j+2] != POLY_CONTROL))
                 {
                     snprintf(pString, nBezString, "%li %li %li %li %li %li curveto\n",
-                            pPtAry[i][j].X(), pPtAry[i][j].Y(),
-                            pPtAry[i][j+1].X(), pPtAry[i][j+1].Y(),
+                            pPtAry[i][j].X(), pPtAry[i][j].Y(), 
+                            pPtAry[i][j+1].X(), pPtAry[i][j+1].Y(), 
                             pPtAry[i][j+2].X(), pPtAry[i][j+2].Y());
                     WritePS(mpPageBody, pString);
                 }
@@ -681,7 +681,7 @@ PrinterGfx::DrawPolyPolygonBezier (sal_uInt32 nPoly, const sal_uInt32 * pPoints,
             }
         }
     }
-
+    
     // if fill and stroke, save the current path
     if( maFillColor.Is() && maLineColor.Is())
         PSGSave();
@@ -695,7 +695,7 @@ PrinterGfx::DrawPolyPolygonBezier (sal_uInt32 nPoly, const sal_uInt32 * pPoints,
 
     // restore the current path
     if( maFillColor.Is() && maLineColor.Is())
-        PSGRestore();
+        PSGRestore();    
 }
 
 
@@ -750,14 +750,14 @@ PrinterGfx::PSSetColor ()
         sal_Int32 nChar = 0;
 
         if( mbColor )
-        {
-            nChar  = psp::getValueOfDouble (pBuffer,
+        {   
+            nChar  = psp::getValueOfDouble (pBuffer, 
                                             (double)rColor.GetRed() / 255.0, 5);
             nChar += psp::appendStr (" ", pBuffer + nChar);
-            nChar += psp::getValueOfDouble (pBuffer + nChar,
-                                            (double)rColor.GetGreen() / 255.0, 5);
+            nChar += psp::getValueOfDouble (pBuffer + nChar, 
+                                            (double)rColor.GetGreen() / 255.0, 5);  
             nChar += psp::appendStr (" ", pBuffer + nChar);
-            nChar += psp::getValueOfDouble (pBuffer + nChar,
+            nChar += psp::getValueOfDouble (pBuffer + nChar, 
                                             (double)rColor.GetBlue() / 255.0, 5);
             nChar += psp::appendStr (" setrgbcolor\n", pBuffer + nChar );
         }
@@ -777,53 +777,53 @@ void
 PrinterGfx::PSSetFont ()
 {
     GraphicsStatus& rCurrent( currentState() );
-    if( maVirtualStatus.maFont          != rCurrent.maFont          ||
-        maVirtualStatus.mnTextHeight    != rCurrent.mnTextHeight    ||
-        maVirtualStatus.maEncoding      != rCurrent.maEncoding      ||
-        maVirtualStatus.mnTextWidth     != rCurrent.mnTextWidth     ||
-        maVirtualStatus.mbArtBold       != rCurrent.mbArtBold       ||
-        maVirtualStatus.mbArtItalic     != rCurrent.mbArtItalic
+    if( maVirtualStatus.maFont			!= rCurrent.maFont			||
+        maVirtualStatus.mnTextHeight	!= rCurrent.mnTextHeight	||
+        maVirtualStatus.maEncoding      != rCurrent.maEncoding		||
+        maVirtualStatus.mnTextWidth     != rCurrent.mnTextWidth		||
+        maVirtualStatus.mbArtBold		!= rCurrent.mbArtBold		||
+        maVirtualStatus.mbArtItalic		!= rCurrent.mbArtItalic
         )
     {
         rCurrent.maFont              = maVirtualStatus.maFont;
         rCurrent.maEncoding          = maVirtualStatus.maEncoding;
         rCurrent.mnTextWidth         = maVirtualStatus.mnTextWidth;
         rCurrent.mnTextHeight        = maVirtualStatus.mnTextHeight;
-        rCurrent.mbArtItalic         = maVirtualStatus.mbArtItalic;
-        rCurrent.mbArtBold           = maVirtualStatus.mbArtBold;
+        rCurrent.mbArtItalic		 = maVirtualStatus.mbArtItalic;
+        rCurrent.mbArtBold			 = maVirtualStatus.mbArtBold;
 
         sal_Int32 nTextHeight = rCurrent.mnTextHeight;
-        sal_Int32 nTextWidth  = rCurrent.mnTextWidth ? rCurrent.mnTextWidth
+        sal_Int32 nTextWidth  = rCurrent.mnTextWidth ? rCurrent.mnTextWidth 
                                                      : rCurrent.mnTextHeight;
-
+        
         sal_Char  pSetFont [256];
         sal_Int32 nChar = 0;
 
-        // postscript based fonts need reencoding
-        if (   (   rCurrent.maEncoding == RTL_TEXTENCODING_MS_1252)
+        // postscript based fonts need reencoding 
+        if (   (   rCurrent.maEncoding == RTL_TEXTENCODING_MS_1252) 
             || (   rCurrent.maEncoding == RTL_TEXTENCODING_ISO_8859_1)
-            || (   rCurrent.maEncoding >= RTL_TEXTENCODING_USER_START
+            || (   rCurrent.maEncoding >= RTL_TEXTENCODING_USER_START 
                 && rCurrent.maEncoding <= RTL_TEXTENCODING_USER_END)
            )
         {
-            rtl::OString aReencodedFont =
-                        psp::GlyphSet::GetReencodedFontName (rCurrent.maEncoding,
+            rtl::OString aReencodedFont = 
+                        psp::GlyphSet::GetReencodedFontName (rCurrent.maEncoding, 
                                                                 rCurrent.maFont);
 
-            nChar += psp::appendStr  ("(",          pSetFont + nChar);
-            nChar += psp::appendStr  (aReencodedFont.getStr(),
+            nChar += psp::appendStr  ("(",          pSetFont + nChar); 
+            nChar += psp::appendStr  (aReencodedFont.getStr(), 
                                                     pSetFont + nChar);
             nChar += psp::appendStr  (") cvn findfont ",
-                                                    pSetFont + nChar);
+                                                    pSetFont + nChar); 
         }
         else
         // tt based fonts mustn't reencode, the encoding is implied by the fontname
         // same for symbol type1 fonts, dont try to touch them
         {
-            nChar += psp::appendStr  ("(",          pSetFont + nChar);
-            nChar += psp::appendStr  (rCurrent.maFont.getStr(),
+            nChar += psp::appendStr  ("(",          pSetFont + nChar); 
+            nChar += psp::appendStr  (rCurrent.maFont.getStr(), 
                                                     pSetFont + nChar);
-            nChar += psp::appendStr  (") cvn findfont ",
+            nChar += psp::appendStr  (") cvn findfont ", 
                                                     pSetFont + nChar);
         }
 
@@ -836,13 +836,13 @@ PrinterGfx::PSSetFont ()
         }
         else // skew 15 degrees to right
         {
-            nChar += psp::appendStr  ( " [",        pSetFont + nChar);
-            nChar += psp::getValueOf (nTextWidth,   pSetFont + nChar);
+            nChar += psp::appendStr  ( " [",		pSetFont + nChar);
+            nChar += psp::getValueOf (nTextWidth,	pSetFont + nChar);
             nChar += psp::appendStr  (" 0 ",        pSetFont + nChar);
             nChar += psp::getValueOfDouble (pSetFont + nChar, 0.27*(double)nTextWidth, 3 );
-            nChar += psp::appendStr  ( " ",         pSetFont + nChar);
+            nChar += psp::appendStr  ( " ",			pSetFont + nChar);
             nChar += psp::getValueOf (-nTextHeight, pSetFont + nChar);
-
+            
             nChar += psp::appendStr  (" 0 0] makefont setfont\n", pSetFont + nChar);
         }
 
@@ -939,7 +939,7 @@ PrinterGfx::PSBinMoveTo (const Point& rCurrent, Point& rOld, sal_Int32& nColumn)
 #else
     PSBinPath (rCurrent, rOld, moveto, nColumn);
 #endif
-}
+}   
 
 void
 PrinterGfx::PSBinStartPath ()
@@ -976,7 +976,7 @@ PrinterGfx::PSBinCurrentPath (sal_uInt32 nPoints, const Point* pPath)
 }
 
 void
-PrinterGfx::PSBinPath (const Point& rCurrent, Point& rOld,
+PrinterGfx::PSBinPath (const Point& rCurrent, Point& rOld, 
                        pspath_t eType, sal_Int32& nColumn)
 {
     sal_Char  pPath[48];
@@ -988,7 +988,7 @@ PrinterGfx::PSBinPath (const Point& rCurrent, Point& rOld,
     sal_Int32 nYPrec = getAlignedHexValueOf (rCurrent.Y() - rOld.Y(), pPath + 1 + nXPrec);
     pPath [ 1 + nXPrec + nYPrec ] = 0;
 
-    // build the command, it is a char with bit represention 000cxxyy
+    // build the command, it is a char with bit represention 000cxxyy 
     // c represents the char, xx and yy repr. the field width of the dx and dy shift,
     // dx and dy represent the number of bytes to read after the opcode
     sal_Char cCmd = (eType == lineto ? (sal_Char)0x00 : (sal_Char)0x10);
@@ -1011,8 +1011,8 @@ PrinterGfx::PSBinPath (const Point& rCurrent, Point& rOld,
     cCmd += 'A';
     pPath[0] = cCmd;
 
-    // write the command to file,
-    // line breaking at column nMaxTextColumn (80)
+    // write the command to file, 
+    // line breaking at column nMaxTextColumn (80) 
     nChar = 1 + nXPrec + nYPrec;
     if ((nColumn + nChar) > nMaxTextColumn)
     {
@@ -1077,9 +1077,9 @@ PrinterGfx::PSDeltaArray (const sal_Int32 *pArray, sal_Int16 nEntries)
 {
     sal_Char pPSArray [128];
     sal_Int32 nChar = 0;
-
+    
     nChar  = psp::appendStr  ("[", pPSArray + nChar);
-    nChar += psp::getValueOf (pArray[0], pPSArray + nChar);
+    nChar += psp::getValueOf (pArray[0], pPSArray + nChar); 
 
     for (int i = 1; i < nEntries; i++)
     {
@@ -1091,7 +1091,7 @@ PrinterGfx::PSDeltaArray (const sal_Int32 *pArray, sal_Int16 nEntries)
         }
 
         nChar += psp::appendStr  (" ", pPSArray + nChar);
-        nChar += psp::getValueOf (pArray[i] - pArray[i-1], pPSArray + nChar);
+        nChar += psp::getValueOf (pArray[i] - pArray[i-1], pPSArray + nChar); 
     }
 
     nChar  += psp::appendStr (" 0]\n", pPSArray + nChar);
@@ -1129,7 +1129,7 @@ PrinterGfx::PSShowText (const sal_uChar* pStr, sal_Int16 nGlyphs, sal_Int16 nByt
     if (pDeltaArray == NULL)
     {
         PSHexString (pStr, nBytes);
-
+            
         if( maVirtualStatus.mbArtBold )
         {
             WritePS( mpPageBody, pBuffer );
@@ -1151,7 +1151,7 @@ PrinterGfx::PSShowText (const sal_uChar* pStr, sal_Int16 nGlyphs, sal_Int16 nByt
             WritePS (mpPageBody, "xshow\n");
     }
 
-    // restore the user coordinate system
+    // restore the user coordinate system   
     if (mnTextAngle != 0)
         PSGRestore ();
 }
diff --git a/vcl/unx/source/printergfx/glyphset.cxx b/vcl/unx/source/printergfx/glyphset.cxx
index 8885a6b42c1e..4423bf36eef2 100644
--- a/vcl/unx/source/printergfx/glyphset.cxx
+++ b/vcl/unx/source/printergfx/glyphset.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
@@ -52,27 +52,27 @@ using namespace vcl;
 using namespace psp;
 using namespace rtl;
 
-GlyphSet::GlyphSet ()
+GlyphSet::GlyphSet () 
         : mnFontID   (-1),
           mbVertical (0),
           mbUseFontEncoding (false)
 {}
 
-GlyphSet::GlyphSet (sal_Int32 nFontID, sal_Bool bVertical)
+GlyphSet::GlyphSet (sal_Int32 nFontID, sal_Bool bVertical) 
         : mnFontID (nFontID),
           mbVertical (bVertical)
 {
     PrintFontManager &rMgr = PrintFontManager::get();
-    meBaseType          = rMgr.getFontType (mnFontID);
-    maBaseName          = OUStringToOString (rMgr.getPSName(mnFontID),
+    meBaseType      	= rMgr.getFontType (mnFontID);
+    maBaseName      	= OUStringToOString (rMgr.getPSName(mnFontID), 
                                            RTL_TEXTENCODING_ASCII_US);
-    mnBaseEncoding      = rMgr.getFontEncoding(mnFontID);
-    mbUseFontEncoding   = rMgr.getUseOnlyFontEncoding(mnFontID);
+    mnBaseEncoding  	= rMgr.getFontEncoding(mnFontID);
+    mbUseFontEncoding	= rMgr.getUseOnlyFontEncoding(mnFontID);
 }
 
 GlyphSet::~GlyphSet ()
 {
-    /* FIXME delete the glyphlist ??? */
+    /* FIXME delete the glyphlist ??? */    
 }
 
 sal_Int32
@@ -98,29 +98,29 @@ GlyphSet::SetFont (sal_Int32 nFontID, sal_Bool bVertical)
 {
     if (mnFontID != -1)
         return sal_False;
-
+            
     mnFontID   = nFontID;
     mbVertical = bVertical;
 
     PrintFontManager &rMgr = PrintFontManager::get();
     meBaseType      = rMgr.getFontType (mnFontID);
-    maBaseName      = OUStringToOString (rMgr.getPSName(mnFontID),
+    maBaseName      = OUStringToOString (rMgr.getPSName(mnFontID), 
                                            RTL_TEXTENCODING_ASCII_US);
     mnBaseEncoding  = rMgr.getFontEncoding(mnFontID);
-    mbUseFontEncoding   = rMgr.getUseOnlyFontEncoding(mnFontID);
+    mbUseFontEncoding	= rMgr.getUseOnlyFontEncoding(mnFontID);
 
     return sal_True;
 }
 
 sal_Bool
 GlyphSet::GetCharID (
-                     sal_Unicode nChar,
+                     sal_Unicode nChar, 
                      sal_uChar* nOutGlyphID,
                      sal_Int32* nOutGlyphSetID
                      )
 {
     return    LookupCharID (nChar, nOutGlyphID, nOutGlyphSetID)
-           || AddCharID    (nChar, nOutGlyphID, nOutGlyphSetID);
+           || AddCharID    (nChar, nOutGlyphID, nOutGlyphSetID); 
 }
 
 sal_Bool
@@ -132,22 +132,22 @@ GlyphSet::GetGlyphID (
                      )
 {
     return    LookupGlyphID (nGlyph, nOutGlyphID, nOutGlyphSetID)
-           || AddGlyphID    (nGlyph, nUnicode, nOutGlyphID, nOutGlyphSetID);
+           || AddGlyphID    (nGlyph, nUnicode, nOutGlyphID, nOutGlyphSetID); 
 }
 
 sal_Bool
 GlyphSet::LookupCharID (
-                        sal_Unicode nChar,
+                        sal_Unicode nChar, 
                         sal_uChar* nOutGlyphID,
                         sal_Int32* nOutGlyphSetID
                         )
 {
     char_list_t::iterator aGlyphSet;
-    sal_Int32             nGlyphSetID;
+    sal_Int32             nGlyphSetID; 
 
     // loop thru all the font subsets
-    for (aGlyphSet  = maCharList.begin(), nGlyphSetID = 1;
-         aGlyphSet != maCharList.end();
+    for (aGlyphSet  = maCharList.begin(), nGlyphSetID = 1; 
+         aGlyphSet != maCharList.end(); 
          ++aGlyphSet, nGlyphSetID++)
     {
         // check every subset if it contains the queried unicode char
@@ -168,17 +168,17 @@ GlyphSet::LookupCharID (
 
 sal_Bool
 GlyphSet::LookupGlyphID (
-                        sal_uInt32 nGlyph,
+                        sal_uInt32 nGlyph, 
                         sal_uChar* nOutGlyphID,
                         sal_Int32* nOutGlyphSetID
                         )
 {
     glyph_list_t::iterator aGlyphSet;
-    sal_Int32             nGlyphSetID;
+    sal_Int32             nGlyphSetID; 
 
     // loop thru all the font subsets
-    for (aGlyphSet  = maGlyphList.begin(), nGlyphSetID = 1;
-         aGlyphSet != maGlyphList.end();
+    for (aGlyphSet  = maGlyphList.begin(), nGlyphSetID = 1; 
+         aGlyphSet != maGlyphList.end(); 
          ++aGlyphSet, nGlyphSetID++)
     {
         // check every subset if it contains the queried unicode char
@@ -200,9 +200,9 @@ GlyphSet::LookupGlyphID (
 sal_uChar
 GlyphSet::GetAnsiMapping (sal_Unicode nUnicodeChar)
 {
-    static rtl_UnicodeToTextConverter aConverter =
+    static rtl_UnicodeToTextConverter aConverter = 
                 rtl_createUnicodeToTextConverter(RTL_TEXTENCODING_MS_1252);
-    static rtl_UnicodeToTextContext aContext =
+    static rtl_UnicodeToTextContext aContext = 
              rtl_createUnicodeToTextContext( aConverter );
 
     sal_Char            nAnsiChar;
@@ -211,8 +211,8 @@ GlyphSet::GetAnsiMapping (sal_Unicode nUnicodeChar)
        const sal_uInt32    nCvtFlags =  RTL_UNICODETOTEXT_FLAGS_UNDEFINED_ERROR
                                    | RTL_UNICODETOTEXT_FLAGS_INVALID_ERROR;
 
-    sal_Size nSize = rtl_convertUnicodeToText( aConverter, aContext,
-                &nUnicodeChar, 1, &nAnsiChar, 1,
+    sal_Size nSize = rtl_convertUnicodeToText( aConverter, aContext, 
+                &nUnicodeChar, 1, &nAnsiChar, 1, 
                 nCvtFlags, &nCvtInfo, &nCvtChars );
 
     return nSize == 1 ? (sal_uChar)nAnsiChar : (sal_uChar)0;
@@ -244,12 +244,12 @@ GlyphSet::AddNotdef (glyph_map_t &rGlyphMap)
 }
 sal_Bool
 GlyphSet::AddCharID (
-                     sal_Unicode nChar,
+                     sal_Unicode nChar, 
                      sal_uChar* nOutGlyphID,
                      sal_Int32* nOutGlyphSetID
                      )
 {
-    sal_uChar nMappedChar;
+    sal_uChar nMappedChar; 
 
     // XXX important: avoid to reencode type1 symbol fonts
     if (mnBaseEncoding == RTL_TEXTENCODING_SYMBOL)
@@ -272,15 +272,15 @@ GlyphSet::AddCharID (
         char_map_t aMap;
         maCharList.push_back (aMap);
     }
-
+    
     // insert a new glyph in the font subset
     if (nMappedChar)
     {
         // always put iso1252 chars into the first map, map them on itself
         char_map_t& aGlyphSet = maCharList.front();
         AddNotdef (aGlyphSet);
-
-        aGlyphSet [nChar] = nMappedChar;
+            
+        aGlyphSet [nChar] = nMappedChar; 
         *nOutGlyphSetID   = 1;
         *nOutGlyphID      = nMappedChar;
     }
@@ -296,7 +296,7 @@ GlyphSet::AddCharID (
         *nOutGlyphSetID   = maCharList.size();
         *nOutGlyphID      = aGlyphSet [nChar];
     }
-
+    
     return sal_True;
 }
 
@@ -308,7 +308,7 @@ GlyphSet::AddGlyphID (
                      sal_Int32* nOutGlyphSetID
                      )
 {
-    sal_uChar nMappedChar;
+    sal_uChar nMappedChar; 
 
     // XXX important: avoid to reencode type1 symbol fonts
     if (mnBaseEncoding == RTL_TEXTENCODING_SYMBOL)
@@ -331,15 +331,15 @@ GlyphSet::AddGlyphID (
         glyph_map_t aMap;
         maGlyphList.push_back (aMap);
     }
-
+    
     // insert a new glyph in the font subset
     if (nMappedChar)
     {
         // always put iso1252 chars into the first map, map them on itself
         glyph_map_t& aGlyphSet = maGlyphList.front();
         AddNotdef (aGlyphSet);
-
-        aGlyphSet [nGlyph] = nMappedChar;
+            
+        aGlyphSet [nGlyph] = nMappedChar; 
         *nOutGlyphSetID    = 1;
         *nOutGlyphID       = nMappedChar;
     }
@@ -355,7 +355,7 @@ GlyphSet::AddGlyphID (
         *nOutGlyphSetID   = maGlyphList.size();
         *nOutGlyphID      = aGlyphSet [nGlyph];
     }
-
+    
     return sal_True;
 }
 
@@ -410,7 +410,7 @@ GlyphSet::GetGlyphSetEncoding (sal_Int32 nGlyphSetID)
         if (mnBaseEncoding == RTL_TEXTENCODING_SYMBOL)
             return RTL_TEXTENCODING_SYMBOL;
         else
-            return nGlyphSetID == 1 ? RTL_TEXTENCODING_MS_1252
+            return nGlyphSetID == 1 ? RTL_TEXTENCODING_MS_1252 
                                     : RTL_TEXTENCODING_USER_START + nGlyphSetID;
     }
 }
@@ -426,8 +426,8 @@ GlyphSet::GetGlyphSetEncodingName (rtl_TextEncoding nEnc, const OString &rFontNa
     else
     if (nEnc >= RTL_TEXTENCODING_USER_START && nEnc <= RTL_TEXTENCODING_USER_END)
     {
-        return  rFontName
-                + OString("Enc")
+        return  rFontName 
+                + OString("Enc") 
                 + OString::valueOf ((sal_Int32)(nEnc - RTL_TEXTENCODING_USER_START));
     }
     else
@@ -451,17 +451,17 @@ GlyphSet::PSDefineReencodedFont (osl::File* pOutFile, sal_Int32 nGlyphSetID)
 
     sal_Char  pEncodingVector [256];
     sal_Int32 nSize = 0;
-
+                              
     nSize += psp::appendStr ("(", pEncodingVector + nSize);
-    nSize += psp::appendStr (GetReencodedFontName(nGlyphSetID),
+    nSize += psp::appendStr (GetReencodedFontName(nGlyphSetID), 
                                   pEncodingVector + nSize);
     nSize += psp::appendStr (") cvn (", pEncodingVector + nSize);
-    nSize += psp::appendStr (maBaseName.getStr(),
+    nSize += psp::appendStr (maBaseName.getStr(),    
                                   pEncodingVector + nSize);
     nSize += psp::appendStr (") cvn ", pEncodingVector + nSize);
-    nSize += psp::appendStr (GetGlyphSetEncodingName(nGlyphSetID),
+    nSize += psp::appendStr (GetGlyphSetEncodingName(nGlyphSetID), 
                                   pEncodingVector + nSize);
-    nSize += psp::appendStr (" psp_definefont\n",
+    nSize += psp::appendStr (" psp_definefont\n", 
                                   pEncodingVector + nSize);
 
     psp::WritePS (pOutFile, pEncodingVector);
@@ -473,14 +473,14 @@ GlyphSet::GetReencodedFontName (rtl_TextEncoding nEnc, const OString &rFontName)
     if (   nEnc == RTL_TEXTENCODING_MS_1252
         || nEnc == RTL_TEXTENCODING_ISO_8859_1)
     {
-        return rFontName
+        return rFontName 
                + OString("-iso1252");
     }
     else
     if (nEnc >= RTL_TEXTENCODING_USER_START && nEnc <= RTL_TEXTENCODING_USER_END)
     {
-        return rFontName
-               + OString("-enc")
+        return rFontName 
+               + OString("-enc") 
                + OString::valueOf ((sal_Int32)(nEnc - RTL_TEXTENCODING_USER_START));
     }
     else
@@ -511,14 +511,14 @@ void GlyphSet::DrawGlyphs(
     for (int nChar = 0; nChar < nLen; nChar++)
     {
         GetGlyphID (pGlyphIds[nChar], pUnicodes[nChar], pGlyphID + nChar, pGlyphSetID + nChar);
-        aGlyphSet.insert (pGlyphSetID[nChar]);
+        aGlyphSet.insert (pGlyphSetID[nChar]); 
     }
 
     // loop over all glyph sets to detect substrings that can be xshown together
     // without changing the postscript font
     sal_Int32 *pDeltaSubset = (sal_Int32*)alloca (nLen * sizeof(sal_Int32));
     sal_uChar *pGlyphSubset = (sal_uChar*)alloca (nLen * sizeof(sal_uChar));
-
+   
     std::set< sal_Int32 >::iterator aSet;
     for (aSet = aGlyphSet.begin(); aSet != aGlyphSet.end(); ++aSet)
     {
@@ -527,13 +527,13 @@ void GlyphSet::DrawGlyphs(
         sal_Int32 nGlyphs = 0;
         sal_Int32 nChar;
 
-        // get offset to first glyph
+        // get offset to first glyph 
         for (nChar = 0; (nChar < nLen) && (pGlyphSetID[nChar] != *aSet); nChar++)
         {
             nOffset = pDeltaArray [nChar];
         }
-
-        // loop over all chars to extract those that share the current glyph set
+        
+        // loop over all chars to extract those that share the current glyph set    
         for (nChar = 0; nChar < nLen; nChar++)
         {
             if (pGlyphSetID[nChar] == *aSet)
@@ -562,14 +562,14 @@ void GlyphSet::DrawGlyphs(
         rGfx.PSSetFont  (aGlyphSetName, GetGlyphSetEncoding(*aSet));
         rGfx.PSMoveTo   (aPoint);
         rGfx.PSShowText (pGlyphSubset, nGlyphs, nGlyphs, nGlyphs > 1 ? pDeltaSubset : NULL);
-    }
+    } 
 }
 
 void
-GlyphSet::DrawText (PrinterGfx &rGfx, const Point& rPoint,
+GlyphSet::DrawText (PrinterGfx &rGfx, const Point& rPoint, 
                     const sal_Unicode* pStr, sal_Int16 nLen, const sal_Int32* pDeltaArray)
 {
-    // dispatch to the impl method
+    // dispatch to the impl method 
     if (pDeltaArray == NULL)
         ImplDrawText (rGfx, rPoint, pStr, nLen);
     else
@@ -577,7 +577,7 @@ GlyphSet::DrawText (PrinterGfx &rGfx, const Point& rPoint,
 }
 
 void
-GlyphSet::ImplDrawText (PrinterGfx &rGfx, const Point& rPoint,
+GlyphSet::ImplDrawText (PrinterGfx &rGfx, const Point& rPoint, 
                         const sal_Unicode* pStr, sal_Int16 nLen)
 {
     rGfx.PSMoveTo (rPoint);
@@ -594,11 +594,11 @@ GlyphSet::ImplDrawText (PrinterGfx &rGfx, const Point& rPoint,
     int nChar;
     sal_uChar *pGlyphID    = (sal_uChar*)alloca (nLen * sizeof(sal_uChar));
     sal_Int32 *pGlyphSetID = (sal_Int32*)alloca (nLen * sizeof(sal_Int32));
-
+        
     // convert unicode to glyph id and char set (font subset)
     for (nChar = 0; nChar < nLen; nChar++)
         GetCharID (pStr[nChar], pGlyphID + nChar, pGlyphSetID + nChar);
-
+    
     // loop over the string to draw subsequent pieces of chars
     // with the same postscript font
     for (nChar = 0; nChar < nLen; /* atend */)
@@ -612,18 +612,18 @@ GlyphSet::ImplDrawText (PrinterGfx &rGfx, const Point& rPoint,
             else
                 break;
         }
-
+        
         // show the text using the PrinterGfx text api
         OString aGlyphSetName(GetCharSetName(nGlyphSetID));
         rGfx.PSSetFont (aGlyphSetName, GetGlyphSetEncoding(nGlyphSetID));
         rGfx.PSShowText (pGlyphID + nChar, nGlyphs, nGlyphs);
-
-        nChar += nGlyphs;
+        
+        nChar += nGlyphs; 
     }
 }
 
 void
-GlyphSet::ImplDrawText (PrinterGfx &rGfx, const Point& rPoint,
+GlyphSet::ImplDrawText (PrinterGfx &rGfx, const Point& rPoint, 
                         const sal_Unicode* pStr, sal_Int16 nLen, const sal_Int32* pDeltaArray)
 {
     if( mbUseFontEncoding )
@@ -644,14 +644,14 @@ GlyphSet::ImplDrawText (PrinterGfx &rGfx, const Point& rPoint,
     for (int nChar = 0; nChar < nLen; nChar++)
     {
         GetCharID (pStr[nChar], pGlyphID + nChar, pGlyphSetID + nChar);
-        aGlyphSet.insert (pGlyphSetID[nChar]);
+        aGlyphSet.insert (pGlyphSetID[nChar]); 
     }
 
     // loop over all glyph sets to detect substrings that can be xshown together
     // without changing the postscript font
     sal_Int32 *pDeltaSubset = (sal_Int32*)alloca (nLen * sizeof(sal_Int32));
     sal_uChar *pGlyphSubset = (sal_uChar*)alloca (nLen * sizeof(sal_uChar));
-
+   
     std::set< sal_Int32 >::iterator aSet;
     for (aSet = aGlyphSet.begin(); aSet != aGlyphSet.end(); ++aSet)
     {
@@ -660,13 +660,13 @@ GlyphSet::ImplDrawText (PrinterGfx &rGfx, const Point& rPoint,
         sal_Int32 nGlyphs = 0;
         sal_Int32 nChar;
 
-        // get offset to first glyph
+        // get offset to first glyph 
         for (nChar = 0; (nChar < nLen) && (pGlyphSetID[nChar] != *aSet); nChar++)
         {
             nOffset = pDeltaArray [nChar];
         }
-
-        // loop over all chars to extract those that share the current glyph set
+        
+        // loop over all chars to extract those that share the current glyph set    
         for (nChar = 0; nChar < nLen; nChar++)
         {
             if (pGlyphSetID[nChar] == *aSet)
@@ -695,7 +695,7 @@ GlyphSet::ImplDrawText (PrinterGfx &rGfx, const Point& rPoint,
         rGfx.PSSetFont  (aGlyphSetName, GetGlyphSetEncoding(*aSet));
         rGfx.PSMoveTo   (aPoint);
         rGfx.PSShowText (pGlyphSubset, nGlyphs, nGlyphs, nGlyphs > 1 ? pDeltaSubset : NULL);
-    }
+    } 
 }
 
 sal_Bool
@@ -717,7 +717,7 @@ GlyphSet::PSUploadEncoding(osl::File* pOutFile, PrinterGfx &rGfx)
         ++nGlyphSetID;
 
         if (nGlyphSetID == 1) // latin1 page uses global reencoding table
-        {
+        { 
             PSDefineReencodedFont (pOutFile, nGlyphSetID);
             continue;
         }
@@ -730,13 +730,13 @@ GlyphSet::PSUploadEncoding(osl::File* pOutFile, PrinterGfx &rGfx)
 
         sal_Char  pEncodingVector [256];
         sal_Int32 nSize = 0;
-
-        nSize += psp::appendStr ("/",
-                                 pEncodingVector + nSize);
-        nSize += psp::appendStr (GetGlyphSetEncodingName(nGlyphSetID),
-                                 pEncodingVector + nSize);
-        nSize += psp::appendStr (" [ ",
+                                 
+        nSize += psp::appendStr ("/", 
+                                 pEncodingVector + nSize);        
+        nSize += psp::appendStr (GetGlyphSetEncodingName(nGlyphSetID), 
                                  pEncodingVector + nSize);
+        nSize += psp::appendStr (" [ ", 
+                                 pEncodingVector + nSize);        
 
         // need a list of glyphs, sorted by glyphid
         typedef std::map< sal_uInt8, sal_Unicode > ps_mapping_t;
@@ -744,21 +744,21 @@ GlyphSet::PSUploadEncoding(osl::File* pOutFile, PrinterGfx &rGfx)
         ps_mapping_t aSortedGlyphSet;
 
         char_map_t::const_iterator aUnsortedGlyph;
-        for (aUnsortedGlyph  = (*aGlyphSet).begin();
-             aUnsortedGlyph != (*aGlyphSet).end();
+        for (aUnsortedGlyph  = (*aGlyphSet).begin(); 
+             aUnsortedGlyph != (*aGlyphSet).end(); 
              ++aUnsortedGlyph)
         {
-            aSortedGlyphSet.insert(ps_value_t((*aUnsortedGlyph).second,
+            aSortedGlyphSet.insert(ps_value_t((*aUnsortedGlyph).second, 
                                              (*aUnsortedGlyph).first));
         }
-
+    
         ps_mapping_t::const_iterator aSortedGlyph;
         // loop thru all the glyphs in the subset
-        for (aSortedGlyph  = (aSortedGlyphSet).begin();
-             aSortedGlyph != (aSortedGlyphSet).end();
+        for (aSortedGlyph  = (aSortedGlyphSet).begin(); 
+             aSortedGlyph != (aSortedGlyphSet).end(); 
              ++aSortedGlyph)
         {
-            nSize += psp::appendStr ("/",
+            nSize += psp::appendStr ("/", 
                                      pEncodingVector + nSize);
 
             std::list< OString > aName( rMgr.getAdobeNameFromUnicode((*aSortedGlyph).second) );
@@ -776,7 +776,7 @@ GlyphSet::PSUploadEncoding(osl::File* pOutFile, PrinterGfx &rGfx)
                 nSize = 0;
             }
         }
-
+        
         nSize += psp::appendStr ("] def\n", pEncodingVector + nSize);
         psp::WritePS (pOutFile, pEncodingVector);
 
@@ -790,13 +790,13 @@ struct EncEntry
 {
     sal_uChar  aEnc;
     long       aGID;
-
+    
     EncEntry() : aEnc( 0 ), aGID( 0 ) {}
-
+    
     bool operator<( const EncEntry& rRight ) const
     { return aEnc < rRight.aEnc; }
 };
-
+    
 static void CreatePSUploadableFont( TrueTypeFont* pSrcFont, FILE* pTmpFile,
     const char* pGlyphSetName, int nGlyphCount,
     /*const*/ sal_uInt16* pRequestedGlyphs, /*const*/ sal_uChar* pEncoding,
@@ -807,16 +807,16 @@ static void CreatePSUploadableFont( TrueTypeFont* pSrcFont, FILE* pTmpFile,
     int nTargetMask = FontSubsetInfo::TYPE1_PFA | FontSubsetInfo::TYPE3_FONT;
     if( bAllowType42 )
         nTargetMask |= FontSubsetInfo::TYPE42_FONT;
-
+    
     std::vector< EncEntry > aSorted( nGlyphCount, EncEntry() );
     for( int i = 0; i < nGlyphCount; i++ )
     {
         aSorted[i].aEnc = pEncoding[i];
         aSorted[i].aGID = pRequestedGlyphs[i];
     }
-
+    
     std::stable_sort( aSorted.begin(), aSorted.end() );
-
+    
     std::vector< sal_uChar > aEncoding( nGlyphCount );
     std::vector< long > aRequestedGlyphs( nGlyphCount );
 
@@ -825,7 +825,7 @@ static void CreatePSUploadableFont( TrueTypeFont* pSrcFont, FILE* pTmpFile,
         aEncoding[i]        = aSorted[i].aEnc;
         aRequestedGlyphs[i] = aSorted[i].aGID;
     }
-
+    
     FontSubsetInfo aInfo;
     aInfo.LoadFont( pSrcFont );
 
@@ -840,7 +840,7 @@ GlyphSet::PSUploadFont (osl::File& rOutFile, PrinterGfx &rGfx, bool bAllowType42
     if (meBaseType != fonttype::TrueType)
         return sal_False;
 
-    TrueTypeFont *pTTFont;
+    TrueTypeFont *pTTFont;  
     OString aTTFileName (rGfx.GetFontMgr().getFontFileSysPath(mnFontID));
     int nFace = rGfx.GetFontMgr().getFontFaceNumber(mnFontID);
     sal_Int32 nSuccess = OpenTTFontFile(aTTFileName.getStr(), nFace < 0 ? 0 : nFace, &pTTFont);
@@ -862,8 +862,8 @@ GlyphSet::PSUploadFont (osl::File& rOutFile, PrinterGfx &rGfx, bool bAllowType42
     // loop thru all the font subsets
     sal_Int32 nCharSetID;
     char_list_t::iterator aCharSet;
-    for (aCharSet = maCharList.begin(), nCharSetID = 1;
-         aCharSet != maCharList.end();
+    for (aCharSet = maCharList.begin(), nCharSetID = 1; 
+         aCharSet != maCharList.end(); 
          ++aCharSet, nCharSetID++)
     {
         if ((*aCharSet).size() == 0)
@@ -876,9 +876,9 @@ GlyphSet::PSUploadFont (osl::File& rOutFile, PrinterGfx &rGfx, bool bAllowType42
         {
             pUChars [n]   = (*aChar).first;
             pEncoding [n] = (*aChar).second;
-            n++;
+            n++; 
         }
-        // create a mapping from the unicode chars to the char encoding in
+        // create a mapping from the unicode chars to the char encoding in 
         // source TrueType font
         MapString (pTTFont, pUChars, (*aCharSet).size(), pTTGlyphMapping, mbVertical);
 
@@ -894,7 +894,7 @@ GlyphSet::PSUploadFont (osl::File& rOutFile, PrinterGfx &rGfx, bool bAllowType42
     // loop thru all the font glyph subsets
     sal_Int32 nGlyphSetID;
     glyph_list_t::iterator aGlyphSet;
-    for (aGlyphSet = maGlyphList.begin(), nGlyphSetID = 1;
+    for (aGlyphSet = maGlyphList.begin(), nGlyphSetID = 1; 
          aGlyphSet != maGlyphList.end();
          ++aGlyphSet, nGlyphSetID++)
     {
@@ -907,8 +907,8 @@ GlyphSet::PSUploadFont (osl::File& rOutFile, PrinterGfx &rGfx, bool bAllowType42
         for (aGlyph = (*aGlyphSet).begin(); aGlyph != (*aGlyphSet).end(); aGlyph++)
         {
             pTTGlyphMapping [n] = (*aGlyph).first;
-            pEncoding       [n] = (*aGlyph).second;
-            n++;
+            pEncoding 		[n] = (*aGlyph).second;
+            n++; 
         }
 
         // create the current subset
@@ -920,7 +920,7 @@ GlyphSet::PSUploadFont (osl::File& rOutFile, PrinterGfx &rGfx, bool bAllowType42
         rSuppliedFonts.push_back( aGlyphSetName );
     }
 
-    // copy the file into the page header
+    // copy the file into the page header   
     rewind(pTmpFile);
     fflush(pTmpFile);
 
diff --git a/vcl/unx/source/printergfx/glyphset.hxx b/vcl/unx/source/printergfx/glyphset.hxx
index 320e8e071955..c43151e44aeb 100644
--- a/vcl/unx/source/printergfx/glyphset.hxx
+++ b/vcl/unx/source/printergfx/glyphset.hxx
@@ -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
@@ -48,42 +48,42 @@ class GlyphSet
 {
 private:
 
-    sal_Int32           mnFontID;
-    sal_Bool            mbVertical;
-    rtl::OString        maBaseName;
+    sal_Int32 	 	    mnFontID;
+    sal_Bool		    mbVertical;
+    rtl::OString 	    maBaseName;
     fonttype::type      meBaseType;
     rtl_TextEncoding    mnBaseEncoding;
-    bool                mbUseFontEncoding;
+    bool				mbUseFontEncoding;
 
     typedef std::hash_map< sal_Unicode, sal_uInt8 > char_map_t;
     typedef std::list< char_map_t > char_list_t;
     typedef std::hash_map< sal_uInt32, sal_uInt8 > glyph_map_t;
     typedef std::list< glyph_map_t > glyph_list_t;
 
-    char_list_t     maCharList;
-    glyph_list_t    maGlyphList;
+    char_list_t		maCharList;
+    glyph_list_t  	maGlyphList;
 
-    rtl::OString    GetGlyphSetName (sal_Int32 nGlyphSetID);
-    rtl::OString    GetCharSetName (sal_Int32 nGlyphSetID);
+    rtl::OString 	GetGlyphSetName (sal_Int32 nGlyphSetID);
+    rtl::OString 	GetCharSetName (sal_Int32 nGlyphSetID);
     sal_Int32       GetGlyphSetEncoding (sal_Int32 nGlyphSetID);
     rtl::OString    GetGlyphSetEncodingName (sal_Int32 nGlyphSetID);
 
     rtl::OString    GetReencodedFontName (sal_Int32 nGlyphSetID);
-    void            PSDefineReencodedFont (osl::File* pOutFile,
+    void            PSDefineReencodedFont (osl::File* pOutFile, 
                                            sal_Int32 nGlyphSetID);
 
-    sal_Bool        GetCharID (sal_Unicode nChar,
+    sal_Bool		GetCharID (sal_Unicode nChar, 
                                 sal_uChar* nOutGlyphID, sal_Int32* nOutGlyphSetID);
-    sal_Bool        LookupCharID (sal_Unicode nChar,
+    sal_Bool		LookupCharID (sal_Unicode nChar, 
                                    sal_uChar* nOutGlyphID, sal_Int32* nOutGlyphSetID);
-    sal_Bool        AddCharID (sal_Unicode nChar,
+    sal_Bool		AddCharID (sal_Unicode nChar, 
                                 sal_uChar* nOutGlyphID,
                                 sal_Int32* nOutGlyphSetID);
-    sal_Bool        GetGlyphID (sal_uInt32 nGlyph, sal_Unicode nUnicode,
+    sal_Bool		GetGlyphID (sal_uInt32 nGlyph, sal_Unicode nUnicode,
                                 sal_uChar* nOutGlyphID, sal_Int32* nOutGlyphSetID);
-    sal_Bool        LookupGlyphID (sal_uInt32 nGlyph,
+    sal_Bool		LookupGlyphID (sal_uInt32 nGlyph, 
                                    sal_uChar* nOutGlyphID, sal_Int32* nOutGlyphSetID);
-    sal_Bool        AddGlyphID (sal_uInt32 nGlyph, sal_Unicode nUnicode,
+    sal_Bool		AddGlyphID (sal_uInt32 nGlyph, sal_Unicode nUnicode,
                                 sal_uChar* nOutGlyphID,
                                 sal_Int32* nOutGlyphSetID);
     void            AddNotdef (char_map_t &rCharMap);
@@ -91,9 +91,9 @@ private:
     sal_uChar       GetAnsiMapping (sal_Unicode nUnicodeChar);
     sal_uChar       GetSymbolMapping (sal_Unicode nUnicodeChar);
 
-    void            ImplDrawText (PrinterGfx &rGfx, const Point& rPoint,
+    void			ImplDrawText (PrinterGfx &rGfx, const Point& rPoint, 
                                   const sal_Unicode* pStr, sal_Int16 nLen);
-    void            ImplDrawText (PrinterGfx &rGfx, const Point& rPoint,
+    void			ImplDrawText (PrinterGfx &rGfx, const Point& rPoint, 
                                   const sal_Unicode* pStr, sal_Int16 nLen,
                                   const sal_Int32* pDeltaArray);
 
@@ -103,29 +103,29 @@ public:
     GlyphSet (sal_Int32 nFontID, sal_Bool bVertical);
     ~GlyphSet ();
 
-    sal_Int32       GetFontID ();
+    sal_Int32		GetFontID ();
     fonttype::type  GetFontType ();
-    static rtl::OString
-    GetReencodedFontName (rtl_TextEncoding nEnc,
+    static rtl::OString    
+    GetReencodedFontName (rtl_TextEncoding nEnc, 
                           const rtl::OString &rFontName);
     static rtl::OString
-    GetGlyphSetEncodingName (rtl_TextEncoding nEnc,
+    GetGlyphSetEncodingName (rtl_TextEncoding nEnc, 
                              const rtl::OString &rFontName);
-    sal_Bool        IsVertical ();
-
-    sal_Bool        SetFont (sal_Int32 nFontID, sal_Bool bVertical);
+    sal_Bool		IsVertical ();
 
-    void            DrawText (PrinterGfx &rGfx, const Point& rPoint,
+    sal_Bool		SetFont (sal_Int32 nFontID, sal_Bool bVertical);
+    
+    void			DrawText (PrinterGfx &rGfx, const Point& rPoint, 
                               const sal_Unicode* pStr, sal_Int16 nLen,
                               const sal_Int32* pDeltaArray = NULL);
-    void            DrawGlyphs (PrinterGfx& rGfx,
+    void			DrawGlyphs (PrinterGfx& rGfx,
                                 const Point& rPoint,
                                 const sal_uInt32* pGlyphIds,
                                 const sal_Unicode* pUnicodes,
                                 sal_Int16 nLen,
                                 const sal_Int32* pDeltaArray );
     sal_Bool        PSUploadEncoding(osl::File* pOutFile, PrinterGfx &rGfx);
-    sal_Bool        PSUploadFont (osl::File& rOutFile, PrinterGfx &rGfx, bool bAsType42, std::list< rtl::OString >& rSuppliedFonts );
+    sal_Bool		PSUploadFont (osl::File& rOutFile, PrinterGfx &rGfx, bool bAsType42, std::list< rtl::OString >& rSuppliedFonts );
 };
 
 
diff --git a/vcl/unx/source/printergfx/printerjob.cxx b/vcl/unx/source/printergfx/printerjob.cxx
index 5e18849b8dfe..06caf7654a96 100644
--- a/vcl/unx/source/printergfx/printerjob.cxx
+++ b/vcl/unx/source/printergfx/printerjob.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
@@ -61,11 +61,11 @@ using namespace rtl;
 
 #define nBLOCKSIZE 0x2000
 
-namespace psp
+namespace psp 
 {
 
 sal_Bool
-AppendPS (FILE* pDst, osl::File* pSrc, sal_uChar* pBuffer,
+AppendPS (FILE* pDst, osl::File* pSrc, sal_uChar* pBuffer, 
           sal_uInt32 nBlockSize = nBLOCKSIZE)
 {
     if ((pDst == NULL) || (pSrc == NULL))
@@ -90,7 +90,7 @@ AppendPS (FILE* pDst, osl::File* pSrc, sal_uChar* pBuffer,
 
     return sal_True;
 }
-
+ 
 } // namespace psp
 
 /*
@@ -118,7 +118,7 @@ PrinterJob::CreateSpoolFile (const rtl::OUString& rName, const rtl::OUString& rE
         return NULL;
     }
 
-    pFile->setAttributes (aFileURL,
+    pFile->setAttributes (aFileURL, 
                           osl_File_Attribute_OwnWrite | osl_File_Attribute_OwnRead);
     return pFile;
 }
@@ -144,7 +144,7 @@ PrinterJob::GetDepth () const
 }
 
 sal_uInt16
-PrinterJob::GetPostscriptLevel (const JobData *pJobData) const
+PrinterJob::GetPostscriptLevel (const JobData *pJobData) const 
 {
     sal_uInt16 nPSLevel = 2;
 
@@ -153,7 +153,7 @@ PrinterJob::GetPostscriptLevel (const JobData *pJobData) const
 
     if( pJobData->m_nPSLevel )
         nPSLevel = pJobData->m_nPSLevel;
-    else
+    else 
         if( pJobData->m_pParser )
             nPSLevel = pJobData->m_pParser->getLanguageLevel();
 
@@ -199,7 +199,7 @@ PrinterJob::GetCurrentPageBody ()
 
 /*
  * public methods of PrinterJob: the actual job / spool handling
- */
+ */ 
 
 PrinterJob::PrinterJob () :
         mpJobHeader( NULL ),
@@ -211,7 +211,7 @@ PrinterJob::PrinterJob () :
 namespace psp
 {
 
-/* check whether the given name points to a directory which is
+/* check whether the given name points to a directory which is 
    usable for the user */
 sal_Bool
 existsTmpDir (const char* pName)
@@ -225,14 +225,14 @@ existsTmpDir (const char* pName)
     if (! S_ISDIR(aFileStatus.st_mode))
         return sal_False;
 
-    return access(pName, W_OK | R_OK) == 0 ? sal_True : sal_False;
+    return access(pName, W_OK | R_OK) == 0 ? sal_True : sal_False; 
 }
 
 /* return the username in the given buffer */
 sal_Bool
 getUserName (char* pName, int nSize)
 {
-    struct passwd *pPWEntry;
+    struct passwd *pPWEntry; 
     struct passwd  aPWEntry;
     sal_Char       pPWBuffer[256];
 
@@ -252,7 +252,7 @@ getUserName (char* pName, int nSize)
         {
             memcpy (pName, pPWEntry->pw_name, nLen);
             pName[nLen] = '\0';
-
+    
             bSuccess = sal_True;
         }
     }
@@ -276,12 +276,12 @@ removeSpoolDir (const rtl::OUString& rSpoolDir)
         OSL_ENSURE( 0, "psprint: couldn't remove spool directory" );
         return;
     }
-    rtl::OString aSysPathByte =
+    rtl::OString aSysPathByte = 
         rtl::OUStringToOString (aSysPath, osl_getThreadTextEncoding());
     sal_Char  pSystem [128];
     sal_Int32 nChar = 0;
 
-    nChar  = psp::appendStr ("rm -rf ",     pSystem);
+    nChar  = psp::appendStr ("rm -rf ",     pSystem); 
     nChar += psp::appendStr (aSysPathByte.getStr(), pSystem + nChar);
 
     if (system (pSystem) == -1)
@@ -296,10 +296,10 @@ createSpoolDir ()
     TimeValue aCur;
     osl_getSystemTime( &aCur );
     sal_Int32 nRand = aCur.Seconds ^ (aCur.Nanosec/1000);
-
+    
     rtl::OUString aTmpDir;
     osl_getTempDirURL( &aTmpDir.pData );
-
+    
     do
     {
         rtl::OUStringBuffer aDir( aTmpDir.getLength() + 16 );
@@ -377,7 +377,7 @@ PrinterJob::StartJob (
                       const rtl::OUString& rFileName,
                       int nMode,
                       const rtl::OUString& rJobName,
-                      const rtl::OUString& rAppName,
+                      const rtl::OUString& rAppName, 
                       const JobData& rSetupData,
                       PrinterGfx* pGraphics,
                       bool bIsQuickJob
@@ -407,11 +407,11 @@ PrinterJob::StartJob (
              "%%BoundingBox: (atend)\n" );
 
     rtl::OUString aFilterWS;
-
+        
     // Creator (this application)
     aFilterWS = WhitespaceToSpace( rAppName, FALSE );
-    WritePS (mpJobHeader, "%%Creator: (");
-    WritePS (mpJobHeader, aFilterWS);
+    WritePS (mpJobHeader, "%%Creator: ("); 
+    WritePS (mpJobHeader, aFilterWS); 
     WritePS (mpJobHeader, ")\n");
 
     // For (user name)
@@ -458,11 +458,11 @@ PrinterJob::StartJob (
         if( ! isAscii( aTitle ) )
             aTitle = rtl::OUString();
     }
-
+    
     maJobTitle = aFilterWS;
     if( aTitle.getLength() )
     {
-        WritePS (mpJobHeader, "%%Title: (");
+        WritePS (mpJobHeader, "%%Title: ("); 
         WritePS (mpJobHeader, aTitle);
         WritePS (mpJobHeader, ")\n");
     }
@@ -520,7 +520,7 @@ PrinterJob::EndJob ()
     WritePS (mpJobTrailer, aTrailer.getStr());
 
     /*
-     * spool the set of files to their final destination, this is U**X dependent
+     * spool the set of files to their final destination, this is U**X dependent 
      */
 
     FILE* pDestFILE = NULL;
@@ -529,7 +529,7 @@ PrinterJob::EndJob ()
     sal_Bool bSpoolToFile = maFileName.getLength() > 0 ? sal_True : sal_False;
     if (bSpoolToFile)
     {
-        const rtl::OString aFileName = rtl::OUStringToOString (maFileName,
+        const rtl::OString aFileName = rtl::OUStringToOString (maFileName, 
                                                                osl_getThreadTextEncoding());
         if( mnFileMode )
         {
@@ -545,7 +545,7 @@ PrinterJob::EndJob ()
                 }
             }
             else
-                chmod( aFileName.getStr(), mnFileMode );
+                chmod( aFileName.getStr(), mnFileMode );                
         }
         if (pDestFILE == NULL)
             pDestFILE = fopen (aFileName.getStr(), "w");
@@ -572,7 +572,7 @@ PrinterJob::EndJob ()
     std::list< osl::File* >::iterator pPageBody;
     std::list< osl::File* >::iterator pPageHead;
     for (pPageBody  = maPageList.begin(), pPageHead  = maHeaderList.begin();
-         pPageBody != maPageList.end() && pPageHead != maHeaderList.end();
+         pPageBody != maPageList.end() && pPageHead != maHeaderList.end(); 
          pPageBody++, pPageHead++)
     {
         if( *pPageHead )
@@ -598,7 +598,7 @@ PrinterJob::EndJob ()
         else
             bSuccess = sal_False;
     }
-
+    
     AppendPS (pDestFILE, mpJobTrailer, pBuffer);
     mpJobTrailer->close();
 
@@ -609,7 +609,7 @@ PrinterJob::EndJob ()
     else
     {
         PrinterInfoManager& rPrinterInfoManager = PrinterInfoManager::get();
-        if (0 == rPrinterInfoManager.endSpool( m_aLastJobData.m_aPrinterName,
+        if (0 == rPrinterInfoManager.endSpool( m_aLastJobData.m_aPrinterName, 
             maJobTitle, pDestFILE, m_aDocumentJobData ))
         {
             bSuccess = sal_False;
@@ -640,7 +640,7 @@ PrinterJob::InitPaperSize (const JobData& rJobSetup)
     if (pParser != NULL)
         pParser->getMargins (aPaper, nLeft, nRight, nUpper, nLower);
 
-    mnResolution    = nRes;
+    mnResolution	= nRes;
 
     mnWidthPt       = nWidth;
     mnHeightPt      = nHeight;
@@ -667,7 +667,7 @@ PrinterJob::StartPage (const JobData& rJobSetup)
 
     rtl::OUString aPageNo = rtl::OUString::valueOf ((sal_Int32)maPageList.size()+1); // sequential page number must start with 1
     rtl::OUString aExt    = aPageNo + rtl::OUString::createFromAscii (".ps");
-
+    
     osl::File* pPageHeader = CreateSpoolFile (
                                               rtl::OUString::createFromAscii("psp_pghead"), aExt);
     osl::File* pPageBody   = CreateSpoolFile (
@@ -681,7 +681,7 @@ PrinterJob::StartPage (const JobData& rJobSetup)
 
     // write page header according to Document Structuring Conventions (DSC)
     WritePS (pPageHeader, "%%Page: ");
-    WritePS (pPageHeader, aPageNo);
+    WritePS (pPageHeader, aPageNo); 
     WritePS (pPageHeader, " ");
     WritePS (pPageHeader, aPageNo);
     WritePS (pPageHeader, "\n");
@@ -700,7 +700,7 @@ PrinterJob::StartPage (const JobData& rJobSetup)
     sal_Char  pBBox [256];
     sal_Int32 nChar = 0;
 
-    nChar  = psp::appendStr  ("%%PageBoundingBox: ",    pBBox);
+    nChar  = psp::appendStr  ("%%PageBoundingBox: ",    pBBox); 
     nChar += psp::getValueOf (mnLMarginPt,              pBBox + nChar);
     nChar += psp::appendStr  (" ",                      pBBox + nChar);
     nChar += psp::getValueOf (mnBMarginPt,              pBBox + nChar);
@@ -716,7 +716,7 @@ PrinterJob::StartPage (const JobData& rJobSetup)
      *  (to %%Begin(End)Setup, instead of %%Begin(End)PageSetup)
      *  don't do this in StartJob since the jobsetup there may be
      *  different.
-     */
+     */ 
     bool bWriteFeatures = true;
     if( 1 == maPageList.size() )
     {
@@ -729,7 +729,7 @@ PrinterJob::StartPage (const JobData& rJobSetup)
         m_aLastJobData = rJobSetup;
         return true;
     }
-
+        
     return false;
 }
 
@@ -753,7 +753,7 @@ PrinterJob::EndPage ()
     nChar += psp::appendStr ("%%PageTrailer\n\n",   pTrailer + nChar);
     WritePS (pPageBody, pTrailer);
 
-    // this page is done for now, close it to avoid having too many open fd's
+    // this page is done for now, close it to avoid having too many open fd's 
 
     pPageHeader->close();
     pPageBody->close();
@@ -770,7 +770,7 @@ PrinterJob::GetErrorCode ()
 
 struct less_ppd_key : public ::std::binary_function<double, double, bool>
 {
-    bool operator()(const PPDKey* left, const PPDKey* right)
+    bool operator()(const PPDKey* left, const PPDKey* right) 
     { return left->getOrderDependency() < right->getOrderDependency(); }
 };
 
@@ -797,7 +797,7 @@ static bool writeFeature( osl::File* pFile, const PPDKey* pKey, const PPDValue*
     }
     aFeature.append( "\n} stopped cleartomark\n" );
     sal_uInt64 nWritten = 0;
-    return pFile->write( aFeature.getStr(), aFeature.getLength(), nWritten )
+    return pFile->write( aFeature.getStr(), aFeature.getLength(), nWritten ) 
         || nWritten != (sal_uInt64)aFeature.getLength() ? false : true;
 }
 
@@ -836,9 +836,9 @@ bool PrinterJob::writeFeatureList( osl::File* pFile, const JobData& rJob, bool b
             if( bEmit )
             {
                 const PPDValue* pValue = rJob.m_aContext.getValue( pKey );
-                if( pValue
+                if( pValue 
                     && pValue->m_eType == eInvocation
-                    && ( m_aLastJobData.m_pParser == NULL
+                    && ( m_aLastJobData.m_pParser == NULL 
                          || m_aLastJobData.m_aContext.getValue( pKey ) != pValue
                          || bDocumentSetup
                          )
@@ -879,13 +879,13 @@ bool PrinterJob::writePageSetup( osl::File* pFile, const JobData& rJob, bool bWr
 
     if( rJob.m_eOrientation == orientation::Portrait )
     {
-        nChar  = psp::appendStr  ("gsave\n[",   pTranslate);
+        nChar  = psp::appendStr  ("gsave\n[",   pTranslate); 
         nChar += psp::getValueOfDouble (        pTranslate + nChar, mfXScale, 5);
         nChar += psp::appendStr  (" 0 0 ",      pTranslate + nChar);
         nChar += psp::getValueOfDouble (        pTranslate + nChar, mfYScale, 5);
         nChar += psp::appendStr  (" ",          pTranslate + nChar);
         nChar += psp::getValueOf (mnRMarginPt,  pTranslate + nChar);
-        nChar += psp::appendStr  (" ",          pTranslate + nChar);
+        nChar += psp::appendStr  (" ",          pTranslate + nChar);        
         nChar += psp::getValueOf (mnHeightPt-mnTMarginPt,
                                   pTranslate + nChar);
         nChar += psp::appendStr  ("] concat\ngsave\n",
@@ -893,8 +893,8 @@ bool PrinterJob::writePageSetup( osl::File* pFile, const JobData& rJob, bool bWr
     }
     else
     {
-        nChar  = psp::appendStr  ("gsave\n",    pTranslate);
-        nChar += psp::appendStr  ("[ 0 ",       pTranslate + nChar);
+        nChar  = psp::appendStr  ("gsave\n",    pTranslate); 
+        nChar += psp::appendStr  ("[ 0 ",       pTranslate + nChar); 
         nChar += psp::getValueOfDouble (        pTranslate + nChar, -mfYScale, 5);
         nChar += psp::appendStr  (" ",          pTranslate + nChar);
         nChar += psp::getValueOfDouble (        pTranslate + nChar, mfXScale, 5);
@@ -917,12 +917,12 @@ void PrinterJob::writeJobPatch( osl::File* pFile, const JobData& rJobData )
         return;
 
     const PPDKey* pKey = NULL;
-
+    
     if( rJobData.m_pParser )
         pKey = rJobData.m_pParser->getKey( OUString( RTL_CONSTASCII_USTRINGPARAM( "JobPatchFile" ) ) );
     if( ! pKey )
         return;
-
+    
     // order the patch files
     // according to PPD spec the JobPatchFile options must be int
     // and should be emitted in order
@@ -999,7 +999,7 @@ bool PrinterJob::writeProlog (osl::File* pFile, const JobData& rJobData )
         "/oslash /ugrave /uacute /ucircumflex /udieresis /yacute /thorn /ydieresis] def\n"
         "\n"
         "/psp_definefont { exch dup findfont dup length dict begin { 1 index /FID ne\n"
-        "{ def } { pop pop } ifelse } forall /Encoding 3 -1 roll def\n"
+        "{ def } { pop pop } ifelse } forall /Encoding 3 -1 roll def\n" 
         "currentdict end exch pop definefont pop } def\n"
         "\n"
         "/pathdict dup 8 dict def load begin\n"
@@ -1086,7 +1086,7 @@ bool PrinterJob::writeProlog (osl::File* pFile, const JobData& rJobData )
         "/oslash /ugrave /uacute /ucircumflex /udieresis /yacute /thorn /ydieresis] def\n"
         "\n"
         "/psp_definefont { exch dup findfont dup length dict begin { 1 index /FID ne\n"
-        "{ def } { pop pop } ifelse } forall /Encoding 3 -1 roll def\n"
+        "{ def } { pop pop } ifelse } forall /Encoding 3 -1 roll def\n" 
         "currentdict end exch pop definefont pop } def\n"
         "\n"
         "/pathdict dup 8 dict def load begin\n"
@@ -1184,9 +1184,9 @@ bool PrinterJob::writeSetup( osl::File* pFile, const JobData& rJob )
         aLine += ByteString::CreateFromInt32( rJob.m_nCopies );
         aLine +=  " def\n";
         sal_uInt64 nWritten = 0;
-        bSuccess = pFile->write( aLine.GetBuffer(), aLine.Len(), nWritten )
+        bSuccess = pFile->write( aLine.GetBuffer(), aLine.Len(), nWritten ) 
             || nWritten != aLine.Len() ? false : true;
-
+    
         if( bSuccess && GetPostscriptLevel( &rJob ) >= 2 )
             WritePS (pFile, "<< /NumCopies null /Policies << /NumCopies 1 >> >> setpagedevice\n" );
     }
diff --git a/vcl/unx/source/printergfx/psputil.cxx b/vcl/unx/source/printergfx/psputil.cxx
index 370114be47cb..d1cd413b9633 100644
--- a/vcl/unx/source/printergfx/psputil.cxx
+++ b/vcl/unx/source/printergfx/psputil.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
@@ -34,8 +34,8 @@
 
 #include "tools/debug.hxx"
 
-namespace psp {
-
+namespace psp { 
+ 
 /*
  * string convenience routines
  */
@@ -43,8 +43,8 @@ namespace psp {
 sal_Int32
 getHexValueOf (sal_Int32 nValue, sal_Char* pBuffer)
 {
-    const static sal_Char pHex [0x10] = {
-        '0', '1', '2', '3', '4', '5', '6', '7',
+    const static sal_Char pHex [0x10] = { 
+        '0', '1', '2', '3', '4', '5', '6', '7', 
         '8', '9', 'A', 'B', 'C', 'D', 'E', 'F' };
 
     pBuffer[0] = pHex [(nValue & 0xF0) >> 4];
@@ -59,14 +59,14 @@ getAlignedHexValueOf (sal_Int32 nValue, sal_Char* pBuffer)
     // get sign
     sal_Bool bNegative = nValue < 0;
     nValue = bNegative ? -nValue : nValue;
-
+    
     // get required buffer size, must be a multiple of two
     sal_Int32 nPrecision;
     if (nValue < 0x80)
         nPrecision = 2;
     else
         if (nValue < 0x8000)
-            nPrecision = 4;
+            nPrecision = 4; 
         else
             if (nValue < 0x800000)
                 nPrecision = 6;
@@ -95,7 +95,7 @@ getAlignedHexValueOf (sal_Int32 nValue, sal_Char* pBuffer)
             case '6' : pBuffer[0] = 'E'; break;
             case '7' : pBuffer[0] = 'F'; break;
             default: DBG_ERROR("Already a signed value");
-        }
+        } 
     }
 
     // report precision
@@ -120,7 +120,7 @@ getValueOf (sal_Int32 nValue, sal_Char* pBuffer)
         }
 
     sal_Char  pInvBuffer [32];
-    sal_Int32 nInvChar = 0;
+    sal_Int32 nInvChar = 0; 
     while (nValue > 0)
     {
         pInvBuffer [nInvChar++] = '0' + nValue % 10;
@@ -130,14 +130,14 @@ getValueOf (sal_Int32 nValue, sal_Char* pBuffer)
     {
         pBuffer [nChar++] = pInvBuffer [--nInvChar];
     }
-
+    
     return nChar;
 }
 
 sal_Int32
 appendStr (const sal_Char* pSrc, sal_Char* pDst)
 {
-    sal_Int32 nBytes = strlen (pSrc);
+    sal_Int32 nBytes = strlen (pSrc); 
     strncpy (pDst, pSrc, nBytes + 1);
 
     return nBytes;
@@ -147,7 +147,7 @@ sal_Int32
 appendStr (const sal_Char* pSrc, sal_Char* pDst, sal_Int32 nBytes)
 {
     strncpy (pDst, pSrc, nBytes);
-    pDst [nBytes] = '\0';
+    pDst [nBytes] = '\0'; 
     return nBytes;
 }
 
@@ -160,7 +160,7 @@ WritePS (osl::File* pFile, const sal_Char* pString)
 {
     sal_uInt64 nInLength = rtl_str_getLength (pString);
     sal_uInt64 nOutLength = 0;
-
+    
     if (nInLength > 0 && pFile)
         pFile->write (pString, nInLength, nOutLength);
 
@@ -171,7 +171,7 @@ sal_Bool
 WritePS (osl::File* pFile, const sal_Char* pString, sal_uInt64 nInLength)
 {
     sal_uInt64 nOutLength = 0;
-
+    
     if (nInLength > 0 && pFile)
         pFile->write (pString, nInLength, nOutLength);
 
@@ -183,7 +183,7 @@ WritePS (osl::File* pFile, const rtl::OString &rString)
 {
     sal_uInt64 nInLength = rString.getLength();
     sal_uInt64 nOutLength = 0;
-
+    
     if (nInLength > 0 && pFile)
         pFile->write (rString, nInLength, nOutLength);
 
@@ -210,7 +210,7 @@ ConverterFactory::~ConverterFactory ()
             rtl_destroyUnicodeToTextConverter (it->second);
 }
 
-rtl_UnicodeToTextConverter
+rtl_UnicodeToTextConverter 
 ConverterFactory::Get (rtl_TextEncoding nEncoding)
 {
     if (rtl_isOctetTextEncoding( nEncoding ))
@@ -233,7 +233,7 @@ ConverterFactory::Get (rtl_TextEncoding nEncoding)
 // wrapper for rtl_convertUnicodeToText that handles the usual cases for
 // textconversion in drawtext
 sal_Size
-ConverterFactory::Convert (const sal_Unicode *pText, int nTextLen,
+ConverterFactory::Convert (const sal_Unicode *pText, int nTextLen, 
                            sal_uChar *pBuffer, sal_Size nBufferSize, rtl_TextEncoding nEncoding)
 {
     const sal_uInt32 nCvtFlags =  RTL_UNICODETOTEXT_FLAGS_UNDEFINED_QUESTIONMARK
@@ -244,7 +244,7 @@ ConverterFactory::Convert (const sal_Unicode *pText, int nTextLen,
     rtl_UnicodeToTextConverter aConverter = Get (nEncoding);
     rtl_UnicodeToTextContext   aContext   = rtl_createUnicodeToTextContext (aConverter);
 
-    sal_Size nSize = rtl_convertUnicodeToText (aConverter, aContext,
+    sal_Size nSize = rtl_convertUnicodeToText (aConverter, aContext, 
                                                pText, nTextLen, (sal_Char*)pBuffer, nBufferSize,
                                                nCvtFlags, &nCvtInfo, &nCvtChars);
 
diff --git a/vcl/unx/source/printergfx/psputil.hxx b/vcl/unx/source/printergfx/psputil.hxx
index d4af41bb95ed..721283139b53 100644
--- a/vcl/unx/source/printergfx/psputil.hxx
+++ b/vcl/unx/source/printergfx/psputil.hxx
@@ -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
@@ -39,10 +39,10 @@
 
 namespace psp {
 
-/*
+/* 
  *  string convenience routines
- *  sizeof(pBuffer) must be at least 2 Bytes, 0x00 <= nValue <= 0xFF,
- *  effective buffer of get*ValueOf() is NOT NULL-terminated
+ *  sizeof(pBuffer) must be at least 2 Bytes, 0x00 <= nValue <= 0xFF, 
+ *  effective buffer of get*ValueOf() is NOT NULL-terminated 
  */
 sal_Int32   getHexValueOf (sal_Int32 nValue, sal_Char* pBuffer);
 sal_Int32   getAlignedHexValueOf (sal_Int32 nValue, sal_Char* pBuffer);
@@ -55,7 +55,7 @@ sal_Bool    WritePS (osl::File* pFile, const sal_Char* pString, sal_uInt64 nInLe
 sal_Bool    WritePS (osl::File* pFile, const rtl::OString &rString);
 sal_Bool    WritePS (osl::File* pFile, const rtl::OUString &rString);
 
-class ConverterFactory
+class ConverterFactory 
 {
 
 public:
@@ -63,11 +63,11 @@ public:
     ~ConverterFactory();
     rtl_UnicodeToTextConverter  Get (rtl_TextEncoding nEncoding);
     sal_Size                    Convert (const sal_Unicode *pText, int nTextLen,
-                                         sal_uChar *pBuffer, sal_Size nBufferSize,
+                                         sal_uChar *pBuffer, sal_Size nBufferSize, 
                                          rtl_TextEncoding nEncoding);
 private:
 
-    std::map< rtl_TextEncoding, rtl_UnicodeToTextConverter >        m_aConverters;
+    std::map< rtl_TextEncoding, rtl_UnicodeToTextConverter >		m_aConverters;
 };
 
 ConverterFactory* GetConverterFactory ();
diff --git a/vcl/unx/source/printergfx/text_gfx.cxx b/vcl/unx/source/printergfx/text_gfx.cxx
index 1901aa0d004a..69fe48078419 100644
--- a/vcl/unx/source/printergfx/text_gfx.cxx
+++ b/vcl/unx/source/printergfx/text_gfx.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
@@ -49,7 +49,7 @@ namespace psp {
  1st font is the font substitute e.g. helvetica substitutes arial on the printer
  2nd is the font itself
  3rd is a fallback font, usually a font with unicode glyph repertoir (e.g. andale)
- symbol fonts (adobe-fontspecific) may need special glyphmapping
+ symbol fonts (adobe-fontspecific) may need special glyphmapping 
  (symbol page vc. latin page)
 */
 class Font3
@@ -59,13 +59,13 @@ class Font3
         #define Font3Size 3
 
         fontID  mpFont [Font3Size];
-        bool    mbSymbol;
+        bool	mbSymbol;	
 
     public:
 
-        fontID  GetFont (int nIdx) const
+        fontID	GetFont (int nIdx) const
                     { return nIdx < Font3Size ? mpFont[nIdx] : -1 ; }
-        bool    IsSymbolFont () const
+        bool	IsSymbolFont () const
                     { return mbSymbol; }
 
         Font3 (const PrinterGfx &rGfx);
@@ -75,13 +75,13 @@ class Font3
 Font3::Font3(const PrinterGfx &rGfx)
 {
     mpFont[0] = rGfx.getFontSubstitute();
-    mpFont[1] = rGfx.GetFontID();
+    mpFont[1] = rGfx.GetFontID(); 
     mpFont[2] = rGfx.getFallbackID();
     // mpFont[2] = rGfx.GetFontID();
 
-       PrintFontManager &rMgr = PrintFontManager::get();
-    mbSymbol = mpFont[1] != -1 ?
-                rMgr.getFontEncoding(mpFont[1]) == RTL_TEXTENCODING_SYMBOL : false;
+       PrintFontManager &rMgr = PrintFontManager::get(); 
+    mbSymbol = mpFont[1] != -1 ? 
+                rMgr.getFontEncoding(mpFont[1]) == RTL_TEXTENCODING_SYMBOL : false; 
 }
 
 } // namespace psp
@@ -98,7 +98,7 @@ static int getVerticalDeltaAngle( sal_Unicode nChar )
         /* #i52932# remember:
          nChar == 0x2010 || nChar == 0x2015
          nChar == 0x2016 || nChar == 0x2026
-
+         
          are nAngle = 0 also, but already handled in the first if
         */
         if( ( nChar >= 0x3008 && nChar < 0x3019 && nChar != 0x3012 ) ||
@@ -133,7 +133,7 @@ PrinterGfx::PSUploadPS1Font (sal_Int32 nFontID)
  * implement text handling printer routines,
  */
 
-sal_uInt16
+sal_uInt16  
 PrinterGfx::SetFont(
                     sal_Int32 nFontID,
                     sal_Int32 nHeight,
@@ -151,15 +151,15 @@ PrinterGfx::SetFont(
     maVirtualStatus.maEncoding        = RTL_TEXTENCODING_DONTKNOW;
     maVirtualStatus.mnTextHeight      = nHeight;
     maVirtualStatus.mnTextWidth       = nWidth;
-    maVirtualStatus.mbArtItalic       = bArtItalic;
-    maVirtualStatus.mbArtBold         = bArtBold;
+    maVirtualStatus.mbArtItalic		  = bArtItalic;
+    maVirtualStatus.mbArtBold		  = bArtBold;
     mnTextAngle                       = nAngle;
     mbTextVertical                    = bVertical;
 
     return 0;
 }
 
-sal_uInt16
+sal_uInt16      
 PrinterGfx::SetFallbackFont ( sal_Int32 nFontID )
 {
     mnFallbackID = nFontID;
@@ -175,18 +175,18 @@ void PrinterGfx::drawGlyphs(
                             )
 {
 
-    // draw the string
+    // draw the string  
     // search for a glyph set matching the set font
     std::list< GlyphSet >::iterator aIter;
     for (aIter = maPS3Font.begin(); aIter != maPS3Font.end(); aIter++)
-        if ( ((*aIter).GetFontID()  == mnFontID)
+        if ( ((*aIter).GetFontID()  == mnFontID) 
              && ((*aIter).IsVertical() == mbTextVertical))
         {
             (*aIter).DrawGlyphs (*this, rPoint, pGlyphIds, pUnicodes, nLen, pDeltaArray);
             break;
         }
-
-    // not found ? create a new one
+    
+    // not found ? create a new one 
     if (aIter == maPS3Font.end())
     {
         maPS3Font.push_back (GlyphSet(mnFontID, mbTextVertical));
@@ -256,10 +256,10 @@ void PrinterGfx::DrawGlyphs(
             const sal_GlyphId nRot = pGlyphIds[i] & GF_ROTMASK;
             if( nRot == GF_NONE )
             {
-                pTempUnicodes[nTempLen] = pUnicodes[i];
+                pTempUnicodes[nTempLen]	= pUnicodes[i];
                 pTempGlyphIds[nTempLen] = pGlyphIds[i];
                 if( nTempLen > 0 )
-                    pTempDelta[nTempLen-1]  = pDeltaArray[i-1]-nTempFirstDelta;
+                    pTempDelta[nTempLen-1]	= pDeltaArray[i-1]-nTempFirstDelta;
                 else
                 {
                     // the first element in pDeltaArray shows
@@ -292,9 +292,9 @@ void PrinterGfx::DrawGlyphs(
                         aRotPoint = Point( -nDescend*nTextWidth/nTextHeight, nOffset + nAscend*nTextWidth/nTextHeight );
                         break;
                 }
-                sal_GlyphId nRotGlyphId     = pGlyphIds[i];
-                sal_Unicode nRotUnicode     = pUnicodes[i];
-                sal_Int32 nRotDelta         = 0;
+                sal_GlyphId nRotGlyphId		= pGlyphIds[i];
+                sal_Unicode nRotUnicode		= pUnicodes[i];
+                sal_Int32 nRotDelta			= 0;
 
                 // transform matrix to new individual direction
                 PSGSave ();
@@ -339,13 +339,13 @@ void
 PrinterGfx::DrawText (
                       const Point& rPoint,
                       const sal_Unicode* pStr,
-                      sal_Int16 nLen,
+                      sal_Int16 nLen, 
                       const sal_Int32* pDeltaArray
                       )
 {
     fontID nRestoreFont = mnFontID;
 
-    // setup font[substitutes] and map the string into the symbol area in case of
+    // setup font[substitutes] and map the string into the symbol area in case of 
     // symbol font
     Font3 aFont(*this);
     sal_Unicode *pEffectiveStr;
@@ -357,7 +357,7 @@ PrinterGfx::DrawText (
     }
     else
     {
-        pEffectiveStr = const_cast<sal_Unicode*>(pStr);
+        pEffectiveStr = const_cast<sal_Unicode*>(pStr); 
     }
 
     fontID    *pFontMap   = (fontID*)    alloca(nLen * sizeof(fontID));
@@ -398,7 +398,7 @@ PrinterGfx::DrawText (
         PSTranslate (rPoint);
         PSRotate (nCurrentTextAngle);
         mnTextAngle = 0;
-
+        
         nCurrentPointX = 0;
         nCurrentPointY = 0;
     }
@@ -408,7 +408,7 @@ PrinterGfx::DrawText (
         nCurrentPointY = rPoint.Y();
     }
 
-    // draw the string
+    // draw the string  
     sal_Int32 nDelta = 0;
     for (int nTo = 0; nTo < nLen; )
     {
@@ -422,25 +422,25 @@ PrinterGfx::DrawText (
         }
 
         SetFont( nFont,
-                 maVirtualStatus.mnTextHeight, maVirtualStatus.mnTextWidth,
+                 maVirtualStatus.mnTextHeight, maVirtualStatus.mnTextWidth, 
                  mnTextAngle,
                  mbTextVertical,
                  maVirtualStatus.mbArtItalic,
                  maVirtualStatus.mbArtBold
                  );
-
+        
         if (mbTextVertical)
         {
-            drawVerticalizedText(
-                    Point(nCurrentPointX + nDelta, nCurrentPointY),
-                    pEffectiveStr + nFrom, nTo - nFrom,
+            drawVerticalizedText( 
+                    Point(nCurrentPointX + nDelta, nCurrentPointY), 
+                    pEffectiveStr + nFrom, nTo - nFrom, 
                     pNewDeltaArray + nFrom );
         }
         else
         {
-            drawText(
-                    Point(nCurrentPointX + nDelta, nCurrentPointY),
-                    pEffectiveStr + nFrom, nTo - nFrom,
+            drawText( 
+                    Point(nCurrentPointX + nDelta, nCurrentPointY), 
+                    pEffectiveStr + nFrom, nTo - nFrom, 
                     pDeltaArray == NULL ? NULL : pNewDeltaArray + nFrom );
         }
         nDelta += pNewDeltaArray[ nTo - 1 ];
@@ -455,7 +455,7 @@ PrinterGfx::DrawText (
 
     // restore the original font settings
     SetFont( nRestoreFont,
-             maVirtualStatus.mnTextHeight, maVirtualStatus.mnTextWidth,
+             maVirtualStatus.mnTextHeight, maVirtualStatus.mnTextWidth, 
              mnTextAngle, mbTextVertical,
              maVirtualStatus.mbArtItalic,
              maVirtualStatus.mbArtBold
@@ -465,7 +465,7 @@ PrinterGfx::DrawText (
 void PrinterGfx::drawVerticalizedText(
                                       const Point& rPoint,
                                       const sal_Unicode* pStr,
-                                      sal_Int16 nLen,
+                                      sal_Int16 nLen, 
                                       const sal_Int32* pDeltaArray
                                       )
 {
@@ -494,32 +494,32 @@ void PrinterGfx::drawVerticalizedText(
         {
             for( int n = nLastPos; n < i; n++ )
                 pDelta[n] = pDeltaArray[n] - (aPoint.X() - rPoint.X() );
-
+            
             SetFont( mnFontID,
                      maVirtualStatus.mnTextHeight, maVirtualStatus.mnTextWidth,
                      nNormalAngle, mbTextVertical,
                      maVirtualStatus.mbArtItalic,
                      maVirtualStatus.mbArtBold );
             drawText( aPoint, pStr + nLastPos, i - nLastPos, pDelta + nLastPos );
-
+            
             aPoint.X() = (sal_Int32)(rPoint.X() + ((double)pDeltaArray[i-1] * fCos));
             aPoint.Y() = (sal_Int32)(rPoint.Y() + ((double)pDeltaArray[i-1] * fSin));
         }
         if( i < nLen )
         {
-            int nOldWidth   = maVirtualStatus.mnTextWidth;
-            int nOldHeight  = maVirtualStatus.mnTextHeight;
+            int nOldWidth	= maVirtualStatus.mnTextWidth;
+            int nOldHeight	= maVirtualStatus.mnTextHeight;
             SetFont( mnFontID,
                      nTextScale,
                      maVirtualStatus.mnTextHeight,
-                     nNormalAngle + nDeltaAngle,
+                     nNormalAngle + nDeltaAngle, 
                      mbTextVertical,
                      maVirtualStatus.mbArtItalic,
                      maVirtualStatus.mbArtBold );
 
             double nA = nTextScale * aInfo.m_nAscend / 1000.0;
             double nD = nTextScale * aInfo.m_nDescend / 1000.0;
-            double fStretch = (double)maVirtualStatus.mnTextWidth / maVirtualStatus.mnTextHeight;
+            double fStretch = (double)maVirtualStatus.mnTextWidth / maVirtualStatus.mnTextHeight; 
             if( !pGsubFlags[i] )
                 nD *= fStretch;
 
@@ -546,7 +546,7 @@ void PrinterGfx::drawVerticalizedText(
             SetFont( mnFontID,
                      nOldHeight,
                      nOldWidth,
-                     nNormalAngle,
+                     nNormalAngle, 
                      mbTextVertical,
                      maVirtualStatus.mbArtItalic,
                      maVirtualStatus.mbArtBold );
@@ -557,25 +557,25 @@ void PrinterGfx::drawVerticalizedText(
     mnTextAngle = nNormalAngle;
 }
 
-void
+void        
 PrinterGfx::LicenseWarning(const Point& rPoint, const sal_Unicode* pStr,
                            sal_Int16 nLen, const sal_Int32* pDeltaArray)
 {
-    // treat it like a builtin font in case a user has that font also in the
-    // printer. This is not so unlikely as it may seem; no print embedding
+    // treat it like a builtin font in case a user has that font also in the 
+    // printer. This is not so unlikely as it may seem; no print embedding 
     // licensed fonts are often used (or so they say) in companies:
-    // they are installed on displays and printers, but get not embedded in
-    // they are installed on displays and printers, but get not embedded in
-    // print files or documents because they are not licensed for use outside
+    // they are installed on displays and printers, but get not embedded in 
+    // they are installed on displays and printers, but get not embedded in 
+    // print files or documents because they are not licensed for use outside 
     // the company.
     rtl::OString aMessage( "The font " );
-    aMessage += rtl::OUStringToOString( mrFontMgr.getPSName(mnFontID),
+    aMessage += rtl::OUStringToOString( mrFontMgr.getPSName(mnFontID), 
             RTL_TEXTENCODING_ASCII_US );
     aMessage += " could not be downloaded\nbecause its license does not allow for that";
     PSComment( aMessage.getStr() );
 
-    rtl::OString aFontName = rtl::OUStringToOString(
-            mrFontMgr.getPSName(mnFontID),
+    rtl::OString aFontName = rtl::OUStringToOString( 
+            mrFontMgr.getPSName(mnFontID), 
             RTL_TEXTENCODING_ASCII_US);
     PSSetFont (aFontName, RTL_TEXTENCODING_ISO_8859_1);
 
@@ -589,11 +589,11 @@ PrinterGfx::LicenseWarning(const Point& rPoint, const sal_Unicode* pStr,
     PSShowText (pBuffer, nLen, nSize, pDeltaArray);
 }
 
-void
+void        
 PrinterGfx::drawText(
                      const Point& rPoint,
                      const sal_Unicode* pStr,
-                     sal_Int16 nLen,
+                     sal_Int16 nLen, 
                      const sal_Int32* pDeltaArray
                      )
 {
@@ -605,7 +605,7 @@ PrinterGfx::drawText(
     if (eType == fonttype::Type1)
         PSUploadPS1Font (mnFontID);
 
-    if (   eType == fonttype::TrueType
+    if (   eType == fonttype::TrueType 
         && !mrFontMgr.isFontDownloadingAllowed(mnFontID))
     {
         LicenseWarning(rPoint, pStr, nLen, pDeltaArray);
@@ -622,14 +622,14 @@ PrinterGfx::drawText(
     // search for a glyph set matching the set font
     std::list< GlyphSet >::iterator aIter;
     for (aIter = maPS3Font.begin(); aIter != maPS3Font.end(); aIter++)
-        if (   ((*aIter).GetFontID()  == mnFontID)
+        if (   ((*aIter).GetFontID()  == mnFontID) 
             && ((*aIter).IsVertical() == mbTextVertical))
         {
             (*aIter).DrawText (*this, rPoint, pStr, nLen, pDeltaArray);
             break;
         }
 
-    // not found ? create a new one
+    // not found ? create a new one 
     if (aIter == maPS3Font.end())
     {
         maPS3Font.push_back (GlyphSet(mnFontID, mbTextVertical));
@@ -642,11 +642,11 @@ PrinterGfx::getCharWidth (sal_Bool b_vert, sal_Unicode n_char, CharacterMetric *
 {
     b_vert = b_vert && (getVerticalDeltaAngle(n_char) != 0);
     int w = b_vert ? p_bbox->height : p_bbox->width;
-    w *= maVirtualStatus.mnTextWidth ? maVirtualStatus.mnTextWidth : maVirtualStatus.mnTextHeight;
+    w *= maVirtualStatus.mnTextWidth ? maVirtualStatus.mnTextWidth : maVirtualStatus.mnTextHeight; 
     return w;
 }
 
-fontID
+fontID 
 PrinterGfx::getCharMetric (const Font3 &rFont, sal_Unicode n_char, CharacterMetric *p_bbox)
 {
     p_bbox->width  = -1;
@@ -702,7 +702,7 @@ PrinterGfx::getFontSubstitute () const
 {
     if( mpFontSubstitutes )
     {
-        ::std::hash_map< fontID, fontID >::const_iterator it =
+        ::std::hash_map< fontID, fontID >::const_iterator it = 
               mpFontSubstitutes->find( mnFontID );
         if( it != mpFontSubstitutes->end() )
             return it->second;
@@ -714,12 +714,12 @@ PrinterGfx::getFontSubstitute () const
 sal_Int32
 PrinterGfx::GetCharWidth (sal_Unicode nFrom, sal_Unicode nTo, long *pWidthArray)
 {
-    Font3 aFont(*this);
+    Font3 aFont(*this); 
     if (aFont.IsSymbolFont() && (nFrom < 256) && (nTo < 256))
     {
         nFrom += 0xF000;
         nTo   += 0xF000;
-    }
+    }	
 
     for( int n = 0; n < (nTo - nFrom + 1); n++ )
     {
@@ -758,21 +758,21 @@ const ::std::list< KernPair >& PrinterGfx::getKernPairs( bool bVertical ) const
  * advanced glyph handling
  */
 
-sal_Bool
+sal_Bool    
 PrinterGfx::GetGlyphBoundRect (sal_Unicode /*c*/, Rectangle& /*rOutRect*/)
 {
     return 0;
 }
 
-sal_uInt32
-PrinterGfx::GetGlyphOutline (sal_Unicode /*c*/,
+sal_uInt32  
+PrinterGfx::GetGlyphOutline (sal_Unicode /*c*/, 
                              sal_uInt16 **/*ppPolySizes*/, Point **/*ppPoints*/, sal_uInt8 **/*ppFlags*/)
 {
     return 0;
 }
 
 /*
- * spool the converted truetype fonts to the page header after the page body is
+ * spool the converted truetype fonts to the page header after the page body is 
  * complete
  * for Type1 fonts spool additional reencoding vectors that are necessary to access the
  * whole font
@@ -809,7 +809,7 @@ PrinterGfx::writeResources( osl::File* pFile, std::list< rtl::OString >& rSuppli
                                      RTL_TEXTENCODING_ASCII_US );
 
         WritePS (pFile, "%%BeginResource: font ");
-        WritePS (pFile, aPostScriptName.getStr());
+        WritePS (pFile, aPostScriptName.getStr()); 
         WritePS (pFile, "\n");
 
         osl::File::RC nError = aFontFile.open (OpenFlag_Read);
@@ -838,7 +838,7 @@ PrinterGfx::writeResources( osl::File* pFile, std::list< rtl::OString >& rSuppli
             aIter->PSUploadFont (*pFile, *this, mbUploadPS42Fonts ? true : false, rSuppliedFonts );
         }
         else
-        // (   aIter->GetFontType() == fonttype::Type1
+        // (   aIter->GetFontType() == fonttype::Type1 
         //  || aIter->GetFontType() == fonttype::Builtin )
         {
             aIter->PSUploadEncoding (pFile, *this);
diff --git a/vcl/unx/source/window/FWS.cxx b/vcl/unx/source/window/FWS.cxx
index 4683864fd116..981ac1bd54b9 100644
--- a/vcl/unx/source/window/FWS.cxx
+++ b/vcl/unx/source/window/FWS.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
diff --git a/vcl/unx/source/window/FWS.hxx b/vcl/unx/source/window/FWS.hxx
index a687870ede4a..853a182e2b6d 100644
--- a/vcl/unx/source/window/FWS.hxx
+++ b/vcl/unx/source/window/FWS.hxx
@@ -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
@@ -38,7 +38,7 @@ extern "C" {
  * providing FWS extension support.
  */
 
-Bool
+Bool 
 WMSupportsFWS (Display *display, int screen);
 
 /* Send a client message to the FWS_COMM_WINDOW indicating the existance
@@ -47,13 +47,13 @@ WMSupportsFWS (Display *display, int screen);
  * old/obsolete junk in it.
  */
 
-Bool
+Bool 
 RegisterFwsWindow (Display *display, Window window);
 
 /* Add the FWS protocol atoms to the WMProtocols property for the window.
  */
 
-void
+void 
 AddFwsProtocols (Display *display, Window window);
 
 #if defined(__cplusplus)
diff --git a/vcl/unx/source/window/salframe.cxx b/vcl/unx/source/window/salframe.cxx
index b0248662a2a2..cbfb98928dc0 100644
--- a/vcl/unx/source/window/salframe.cxx
+++ b/vcl/unx/source/window/salframe.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
@@ -84,7 +84,7 @@ using namespace vcl_sal;
 using namespace vcl;
 
 // -=-= #defines -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
-#define CLIENT_EVENTS           StructureNotifyMask \
+#define CLIENT_EVENTS			StructureNotifyMask \
                                 | SubstructureNotifyMask \
                                 | KeyPressMask \
                                 | KeyReleaseMask \
@@ -101,9 +101,9 @@ using namespace vcl;
 
 // -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
 
-static XLIB_Window  hPresentationWindow = None, hPresFocusWindow = None;
+static XLIB_Window	hPresentationWindow = None, hPresFocusWindow = None;
 static ::std::list< XLIB_Window > aPresentationReparentList;
-static int          nVisibleFloats      = 0;
+static int			nVisibleFloats		= 0;
 
 X11SalFrame* X11SalFrame::s_pSaveYourselfFrame = NULL;
 
@@ -158,8 +158,8 @@ bool X11SalFrame::IsFloatGrabWindow() const
     return
         ( ( !pDisableGrab || !*pDisableGrab ) &&
           (
-           (nStyle_ & SAL_FRAME_STYLE_FLOAT)    &&
-           ! (nStyle_ & SAL_FRAME_STYLE_TOOLTIP)    &&
+           (nStyle_ & SAL_FRAME_STYLE_FLOAT)	&&
+           ! (nStyle_ & SAL_FRAME_STYLE_TOOLTIP)	&&
            ! (nStyle_ & SAL_FRAME_STYLE_OWNERDRAWDECORATION)
            )
           );
@@ -186,7 +186,7 @@ void X11SalFrame::setXEmbedInfo()
 void X11SalFrame::askForXEmbedFocus( sal_Int32 i_nTimeCode )
 {
     XEvent aEvent;
-
+    
     rtl_zeroMemory( &aEvent, sizeof(aEvent) );
     aEvent.xclient.window = mhForeignParent;
     aEvent.xclient.type = ClientMessage;
@@ -197,7 +197,7 @@ void X11SalFrame::askForXEmbedFocus( sal_Int32 i_nTimeCode )
     aEvent.xclient.data.l[2] = 0;
     aEvent.xclient.data.l[3] = 0;
     aEvent.xclient.data.l[4] = 0;
-
+    
     GetDisplay()->GetXLib()->PushXErrorLevel( true );
     XSendEvent( pDisplay_->GetDisplay(),
                 mhForeignParent,
@@ -215,9 +215,9 @@ void X11SalFrame::Init( ULONG nSalFrameStyle, int nScreen, SystemParentData* pPa
         nScreen = GetDisplay()->GetDefaultScreenNumber();
     if( mpParent )
         nScreen = mpParent->m_nScreen;
-
+    
     m_nScreen   = nScreen;
-    nStyle_     = nSalFrameStyle;
+    nStyle_ 	= nSalFrameStyle;
     XWMHints Hints;
     Hints.flags = InputHint;
     Hints.input = (nSalFrameStyle & SAL_FRAME_STYLE_OWNERDRAWDECORATION) ? False : True;
@@ -233,15 +233,15 @@ void X11SalFrame::Init( ULONG nSalFrameStyle, int nScreen, SystemParentData* pPa
                     | CWEventMask
                     ;
     Attributes.border_pixel             = 0;
-    Attributes.background_pixmap        = None;
-    Attributes.colormap                 = GetDisplay()->GetColormap( m_nScreen ).GetXColormap();
-    Attributes.override_redirect        = False;
-    Attributes.event_mask               = CLIENT_EVENTS;
-
+    Attributes.background_pixmap		= None;
+    Attributes.colormap					= GetDisplay()->GetColormap( m_nScreen ).GetXColormap();
+    Attributes.override_redirect		= False;
+    Attributes.event_mask				= CLIENT_EVENTS;
+    
     const SalVisual& rVis = GetDisplay()->GetVisual( m_nScreen );
     XLIB_Window aFrameParent = pParentData ? pParentData->aWindow : GetDisplay()->GetRootWindow( m_nScreen );
     XLIB_Window aClientLeader = None;
-
+    
     if( bUseGeometry )
     {
         x = maGeometry.nX;
@@ -249,7 +249,7 @@ void X11SalFrame::Init( ULONG nSalFrameStyle, int nScreen, SystemParentData* pPa
         w = maGeometry.nWidth;
         h = maGeometry.nHeight;
     }
-
+    
     if( (nSalFrameStyle & SAL_FRAME_STYLE_FLOAT) &&
         ! (nSalFrameStyle & SAL_FRAME_STYLE_OWNERDRAWDECORATION)
         )
@@ -344,7 +344,7 @@ void X11SalFrame::Init( ULONG nSalFrameStyle, int nScreen, SystemParentData* pPa
                     w = 785;
                 if( aScreenSize.Width() >= 1024 )
                     w = 920;
-
+    
                 if( aScreenSize.Height() >= 600 )
                     h = 550;
                 if( aScreenSize.Height() >= 768 )
@@ -371,7 +371,7 @@ void X11SalFrame::Init( ULONG nSalFrameStyle, int nScreen, SystemParentData* pPa
                         break;
                     ++it;
                 }
-
+                
                 if( it != rFrames.end() )
                 {
                     // set a document position and size
@@ -429,7 +429,7 @@ void X11SalFrame::Init( ULONG nSalFrameStyle, int nScreen, SystemParentData* pPa
             try
             {
                 bOk=SelectAppIconPixmap( pDisplay_, m_nScreen,
-                                         mnIconID != 1 ? mnIconID :
+                                         mnIconID != 1 ? mnIconID : 
                                          (mpParent ? mpParent->mnIconID : 1), 32,
                                          Hints.icon_pixmap, Hints.icon_mask );
             }
@@ -439,9 +439,9 @@ void X11SalFrame::Init( ULONG nSalFrameStyle, int nScreen, SystemParentData* pPa
             }
             if( bOk )
             {
-                Hints.flags     |= IconPixmapHint;
+                Hints.flags		|= IconPixmapHint;
                 if( Hints.icon_mask )
-                    Hints.flags |= IconMaskHint;
+                    Hints.flags	|= IconMaskHint;
             }
         }
 
@@ -472,8 +472,8 @@ void X11SalFrame::Init( ULONG nSalFrameStyle, int nScreen, SystemParentData* pPa
         }
         else
         {
-            Hints.flags         |= WindowGroupHint;
-            Hints.window_group  = pFrame->GetShellWindow();
+            Hints.flags			|= WindowGroupHint;
+            Hints.window_group	= pFrame->GetShellWindow();
             // note: for a normal document window this will produce None
             // as the window is not yet created and the shell window is
             // initialized to None. This must be corrected after window creation.
@@ -481,10 +481,10 @@ void X11SalFrame::Init( ULONG nSalFrameStyle, int nScreen, SystemParentData* pPa
         }
     }
 
-    nShowState_                 = SHOWSTATE_UNKNOWN;
-    bViewable_                  = TRUE;
-    bMapped_                    = FALSE;
-    nVisibility_                = VisibilityFullyObscured;
+    nShowState_ 				= SHOWSTATE_UNKNOWN;
+    bViewable_					= TRUE;
+    bMapped_					= FALSE;
+    nVisibility_				= VisibilityFullyObscured;
     mhWindow = XCreateWindow( GetXDisplay(),
                               aFrameParent,
                               x, y,
@@ -499,8 +499,8 @@ void X11SalFrame::Init( ULONG nSalFrameStyle, int nScreen, SystemParentData* pPa
     if( /*! IsSysChildWindow() &&*/ pParentData == NULL )
     {
         mhShellWindow = mhWindow;
-    }
-
+    }    
+    
     // correct window group if necessary
     if( (Hints.flags & WindowGroupHint) == WindowGroupHint )
     {
@@ -508,10 +508,10 @@ void X11SalFrame::Init( ULONG nSalFrameStyle, int nScreen, SystemParentData* pPa
             Hints.window_group = GetShellWindow();
     }
 
-    maGeometry.nX       = x;
-    maGeometry.nY       = y;
-    maGeometry.nWidth   = w;
-    maGeometry.nHeight  = h;
+    maGeometry.nX		= x;
+    maGeometry.nY		= y;
+    maGeometry.nWidth	= w;
+    maGeometry.nHeight	= h;
     updateScreenNumber();
 
     XSync( GetXDisplay(), False );
@@ -563,7 +563,7 @@ void X11SalFrame::Init( ULONG nSalFrameStyle, int nScreen, SystemParentData* pPa
                            GetShellWindow(),
                            pHints );
         XFree (pHints);
-
+        
         // set PID and WM_CLIENT_MACHINE
         pDisplay_->getWMAdaptor()->setClientMachine( this );
         pDisplay_->getWMAdaptor()->setPID( this );
@@ -637,9 +637,9 @@ void X11SalFrame::Init( ULONG nSalFrameStyle, int nScreen, SystemParentData* pPa
              == SAL_FRAME_STYLE_DEFAULT )
             pDisplay_->getWMAdaptor()->maximizeFrame( this, true, true );
     }
-
+        
     m_nWorkArea = GetDisplay()->getWMAdaptor()->getCurrentWorkArea();
-
+    
     // Pointer
     SetPointer( POINTER_ARROW );
 }
@@ -652,69 +652,69 @@ X11SalFrame::X11SalFrame( SalFrame *pParent, ULONG nSalFrameStyle, SystemParentD
     // initialize frame geometry
     memset( &maGeometry, 0, sizeof(maGeometry) );
 
-    mpParent                    = static_cast< X11SalFrame* >( pParent );
+    mpParent					= static_cast< X11SalFrame* >( pParent );
 
-    mbTransientForRoot          = false;
+    mbTransientForRoot			= false;
 
-    pDisplay_                   = pSalData->GetDisplay();
+    pDisplay_					= pSalData->GetDisplay();
     // insert frame in framelist
     pDisplay_->registerFrame( this );
 
-    mhWindow                    = None;
-    mhShellWindow               = None;
-    mhStackingWindow            = None;
-    mhForeignParent             = None;
+    mhWindow					= None;
+    mhShellWindow				= None;
+    mhStackingWindow			= None;
+    mhForeignParent				= None;
     mhBackgroundPixmap          = None;
     m_bSetFocusOnMap            = false;
 
-    pGraphics_                  = NULL;
-    pFreeGraphics_              = NULL;
+    pGraphics_					= NULL;
+    pFreeGraphics_				= NULL;
 
-    hCursor_                    = None;
-    nCaptured_                  = 0;
+    hCursor_					= None;
+    nCaptured_					= 0;
 
-     nReleaseTime_              = 0;
-    nKeyCode_                   = 0;
-    nKeyState_                  = 0;
-    nCompose_                   = -1;
-    mbKeyMenu                   = false;
-    mbSendExtKeyModChange       = false;
-    mnExtKeyMod                 = 0;
+     nReleaseTime_				= 0;
+    nKeyCode_					= 0;
+    nKeyState_					= 0;
+    nCompose_					= -1;
+    mbKeyMenu					= false;
+    mbSendExtKeyModChange		= false;
+    mnExtKeyMod					= 0;
 
-    nShowState_                 = SHOWSTATE_UNKNOWN;
-    nWidth_                     = 0;
-    nHeight_                    = 0;
-    nStyle_                     = 0;
+    nShowState_ 				= SHOWSTATE_UNKNOWN;
+    nWidth_ 					= 0;
+    nHeight_					= 0;
+    nStyle_ 					= 0;
     mnExtStyle                  = 0;
-    bAlwaysOnTop_               = FALSE;
+    bAlwaysOnTop_				= FALSE;
 
     // set bViewable_ to TRUE: hack GetClientSize to report something
     // different to 0/0 before first map
-    bViewable_                  = TRUE;
-    bMapped_                    = FALSE;
-    bDefaultPosition_           = TRUE;
-    nVisibility_                = VisibilityFullyObscured;
+    bViewable_					= TRUE;
+    bMapped_					= FALSE;
+    bDefaultPosition_			= TRUE;
+    nVisibility_				= VisibilityFullyObscured;
     m_nWorkArea                 = 0;
-    mbInShow                    = FALSE;
+    mbInShow					= FALSE;
     m_bXEmbed                   = false;
 
-    nScreenSaversTimeout_       = 0;
+    nScreenSaversTimeout_		= 0;
 
-    mpInputContext              = NULL;
-    mbInputFocus                = False;
+    mpInputContext 				= NULL;
+    mbInputFocus				= False;
 
     maAlwaysOnTopRaiseTimer.SetTimeoutHdl( LINK( this, X11SalFrame, HandleAlwaysOnTopRaise ) );
     maAlwaysOnTopRaiseTimer.SetTimeout( 100 );
 
-    meWindowType                = WMAdaptor::windowType_Normal;
-    mnDecorationFlags           = WMAdaptor::decoration_All;
-    mbMaximizedVert             = false;
-    mbMaximizedHorz             = false;
-    mbShaded                    = false;
-    mbFullScreen                = false;
-
-    mnIconID                    = 1; // ICON_DEFAULT
+    meWindowType				= WMAdaptor::windowType_Normal;
+    mnDecorationFlags			= WMAdaptor::decoration_All;
+    mbMaximizedVert				= false;
+    mbMaximizedHorz				= false;
+    mbShaded					= false;
+    mbFullScreen				= false;
 
+    mnIconID					= 1; // ICON_DEFAULT
+    
     m_pClipRectangles           = NULL;
     m_nCurClipRect              = 0;
     m_nMaxClipRect              = 0;
@@ -741,9 +741,9 @@ void X11SalFrame::passOnSaveYourSelf()
             if( ! ( IsChildWindow() || pFrame->mpParent )
                 && pFrame != s_pSaveYourselfFrame )
                     break;
-            ++it;
+            ++it;    
         }
-
+        
         s_pSaveYourselfFrame = (it != rFrames.end() ) ? const_cast<X11SalFrame*>(pFrame) : NULL;
         if( s_pSaveYourselfFrame )
         {
@@ -761,20 +761,20 @@ void X11SalFrame::passOnSaveYourSelf()
 X11SalFrame::~X11SalFrame()
 {
     notifyDelete();
-
+    
     if( m_pClipRectangles )
     {
         delete [] m_pClipRectangles;
         m_pClipRectangles = NULL;
         m_nCurClipRect = m_nMaxClipRect = 0;
     }
-
+    
     if( mhBackgroundPixmap )
     {
         XSetWindowBackgroundPixmap( GetXDisplay(), GetWindow(), None );
-        XFreePixmap( GetXDisplay(), mhBackgroundPixmap );
+        XFreePixmap( GetXDisplay(), mhBackgroundPixmap ); 
     }
-
+    
     if( mhStackingWindow )
         aPresentationReparentList.remove( mhStackingWindow );
 
@@ -847,7 +847,7 @@ void X11SalFrame::SetExtendedFrameStyle( SalExtStyle nStyle )
     if( nStyle != mnExtStyle && ! IsChildWindow() )
     {
         mnExtStyle = nStyle;
-
+    
         XClassHint* pClass = XAllocClassHint();
         rtl::OString aResHint = X11SalData::getFrameResName( mnExtStyle );
         pClass->res_name  = const_cast<char*>(aResHint.getStr());
@@ -900,18 +900,18 @@ void X11SalFrame::SetBackgroundBitmap( SalBitmap* pBitmap )
 const SystemChildData* X11SalFrame::GetSystemData() const
 {
     X11SalFrame *pFrame = const_cast<X11SalFrame*>(this);
-    pFrame->maSystemChildData.nSize         = sizeof( SystemChildData );
-    pFrame->maSystemChildData.pDisplay      = GetXDisplay();
-    pFrame->maSystemChildData.aWindow       = pFrame->GetWindow();
-    pFrame->maSystemChildData.pSalFrame     = pFrame;
-    pFrame->maSystemChildData.pWidget       = NULL;
-    pFrame->maSystemChildData.pVisual       = GetDisplay()->GetVisual( m_nScreen ).GetVisual();
-    pFrame->maSystemChildData.nScreen       = m_nScreen;
-    pFrame->maSystemChildData.nDepth        = GetDisplay()->GetVisual( m_nScreen ).GetDepth();
-    pFrame->maSystemChildData.aColormap     = GetDisplay()->GetColormap( m_nScreen ).GetXColormap();
-    pFrame->maSystemChildData.pAppContext   = NULL;
-    pFrame->maSystemChildData.aShellWindow  = pFrame->GetShellWindow();
-    pFrame->maSystemChildData.pShellWidget  = NULL;
+    pFrame->maSystemChildData.nSize 		= sizeof( SystemChildData );
+    pFrame->maSystemChildData.pDisplay		= GetXDisplay();
+    pFrame->maSystemChildData.aWindow		= pFrame->GetWindow();
+    pFrame->maSystemChildData.pSalFrame 	= pFrame;
+    pFrame->maSystemChildData.pWidget		= NULL;
+    pFrame->maSystemChildData.pVisual		= GetDisplay()->GetVisual( m_nScreen ).GetVisual();
+    pFrame->maSystemChildData.nScreen		= m_nScreen;
+    pFrame->maSystemChildData.nDepth		= GetDisplay()->GetVisual( m_nScreen ).GetDepth();
+    pFrame->maSystemChildData.aColormap		= GetDisplay()->GetColormap( m_nScreen ).GetXColormap();
+    pFrame->maSystemChildData.pAppContext	= NULL;
+    pFrame->maSystemChildData.aShellWindow	= pFrame->GetShellWindow();
+    pFrame->maSystemChildData.pShellWidget	= NULL;
     return &maSystemChildData;
 }
 
@@ -922,8 +922,8 @@ SalGraphics *X11SalFrame::GetGraphics()
 
     if( pFreeGraphics_ )
     {
-        pGraphics_      = pFreeGraphics_;
-        pFreeGraphics_  = NULL;
+        pGraphics_		= pFreeGraphics_;
+        pFreeGraphics_	= NULL;
     }
     else
     {
@@ -941,8 +941,8 @@ void X11SalFrame::ReleaseGraphics( SalGraphics *pGraphics )
     if( pGraphics != pGraphics_ )
         return;
 
-    pFreeGraphics_  = pGraphics_;
-    pGraphics_      = NULL;
+    pFreeGraphics_	= pGraphics_;
+    pGraphics_		= NULL;
 }
 
 void X11SalFrame::updateGraphics( bool bClear )
@@ -1029,7 +1029,7 @@ void X11SalFrame::SetIcon( USHORT nIcon )
         else
         {
             const String& rWM( pDisplay_->getWMAdaptor()->getWindowManagerName() );
-            if( rWM.EqualsAscii( "KWin" ) )         // assume KDE is running
+            if( rWM.EqualsAscii( "KWin" ) )			// assume KDE is running
                 iconSize = 48;
             static bool bGnomeIconSize = false;
             static bool bGnomeChecked = false;
@@ -1077,7 +1077,7 @@ void X11SalFrame::SetIcon( USHORT nIcon )
         }
         if( bOk )
         {
-            pHints->flags    |= IconPixmapHint;
+            pHints->flags 	 |= IconPixmapHint;
             if( pHints->icon_mask )
                 pHints->flags |= IconMaskHint;
 
@@ -1101,8 +1101,8 @@ void X11SalFrame::SetMaxClientSize( long nWidth, long nHeight )
                                pHints,
                                &nSupplied
                                );
-            pHints->max_width   = nWidth;
-            pHints->max_height  = nHeight;
+            pHints->max_width	= nWidth;
+            pHints->max_height	= nHeight;
             pHints->flags |= PMaxSize;
             XSetWMNormalHints( GetXDisplay(),
                                GetShellWindow(),
@@ -1125,8 +1125,8 @@ void X11SalFrame::SetMinClientSize( long nWidth, long nHeight )
                                pHints,
                                &nSupplied
                                );
-            pHints->min_width   = nWidth;
-            pHints->min_height  = nHeight;
+            pHints->min_width	= nWidth;
+            pHints->min_height	= nHeight;
             pHints->flags |= PMinSize;
             XSetWMNormalHints( GetXDisplay(),
                                GetShellWindow(),
@@ -1150,7 +1150,7 @@ void X11SalFrame::Show( BOOL bVisible, BOOL bNoActivate )
     // so artificially set ABOVE and remove it again on hide
     if( mpParent && (mpParent->nStyle_ & SAL_FRAME_STYLE_PARTIAL_FULLSCREEN ) && pDisplay_->getWMAdaptor()->isLegacyPartialFullscreen())
         pDisplay_->getWMAdaptor()->enableAlwaysOnTop( this, bVisible );
-
+    
     bMapped_   = bVisible;
     bViewable_ = bVisible;
     setXEmbedInfo();
@@ -1174,7 +1174,7 @@ void X11SalFrame::Show( BOOL bVisible, BOOL bNoActivate )
                 }
             }
         }
-
+        
         // update NET_WM_STATE which may have been deleted due to earlier Show(FALSE)
         if( nShowState_ == SHOWSTATE_HIDDEN )
             GetDisplay()->getWMAdaptor()->frameIsMapping( this );
@@ -1197,7 +1197,7 @@ void X11SalFrame::Show( BOOL bVisible, BOOL bNoActivate )
         {
             GetDisplay()->getWMAdaptor()->changeReferenceFrame( this, mpParent );
         }
-
+        
         // #i45160# switch to desktop where a dialog with parent will appear
         if( mpParent && mpParent->m_nWorkArea != m_nWorkArea )
             GetDisplay()->getWMAdaptor()->switchToWorkArea( mpParent->m_nWorkArea );
@@ -1261,7 +1261,7 @@ void X11SalFrame::Show( BOOL bVisible, BOOL bNoActivate )
         }
 
         XSync( GetXDisplay(), False );
-
+        
         if( IsFloatGrabWindow() )
         {
             /*
@@ -1351,7 +1351,7 @@ void X11SalFrame::Show( BOOL bVisible, BOOL bNoActivate )
         }
         else if( ! m_bXEmbed )
             XUnmapWindow( GetXDisplay(), GetWindow() );
-
+        
         nShowState_ = SHOWSTATE_HIDDEN;
         if( IsFloatGrabWindow() && nVisibleFloats )
         {
@@ -1414,7 +1414,7 @@ void X11SalFrame::GetClientSize( long &rWidth, long &rHeight )
         return;
     }
 
-    rWidth  = maGeometry.nWidth;
+    rWidth	= maGeometry.nWidth;
     rHeight = maGeometry.nHeight;
 
     if( !rWidth || !rHeight )
@@ -1436,29 +1436,29 @@ void X11SalFrame::SetWindowGravity (int nGravity) const
     {
         XSizeHints* pHint = XAllocSizeHints();
         long        nFlag;
-
+    
         XGetWMNormalHints (GetXDisplay(), GetShellWindow(), pHint, &nFlag);
         pHint->flags       |= PWinGravity;
         pHint->win_gravity  = nGravity;
-
+    
         XSetWMNormalHints (GetXDisplay(), GetShellWindow(), pHint);
         XSync (GetXDisplay(), False);
-
+    
         XFree (pHint);
     }
 }
 
 void X11SalFrame::Center( )
 {
-    int             nX, nY, nScreenWidth, nScreenHeight;
-    int             nRealScreenWidth, nRealScreenHeight;
-    int             nScreenX = 0, nScreenY = 0;
+    int 			nX, nY, nScreenWidth, nScreenHeight;
+    int				nRealScreenWidth, nRealScreenHeight;
+    int				nScreenX = 0, nScreenY = 0;
 
     const Size& aScreenSize = GetDisplay()->getDataForScreen( m_nScreen ).m_aSize;
-    nScreenWidth        = aScreenSize.Width();
-    nScreenHeight       = aScreenSize.Height();
-    nRealScreenWidth    = nScreenWidth;
-    nRealScreenHeight   = nScreenHeight;
+    nScreenWidth		= aScreenSize.Width();
+    nScreenHeight		= aScreenSize.Height();
+    nRealScreenWidth	= nScreenWidth;
+    nRealScreenHeight	= nScreenHeight;
 
     if( GetDisplay()->IsXinerama() )
     {
@@ -1484,10 +1484,10 @@ void X11SalFrame::Center( )
         for( unsigned int i = 0; i < rScreens.size(); i++ )
             if( rScreens[i].IsInside( Point( root_x, root_y ) ) )
             {
-                nScreenX            = rScreens[i].Left();
-                nScreenY            = rScreens[i].Top();
-                nRealScreenWidth    = rScreens[i].GetWidth();
-                nRealScreenHeight   = rScreens[i].GetHeight();
+                nScreenX			= rScreens[i].Left();
+                nScreenY			= rScreens[i].Top();
+                nRealScreenWidth	= rScreens[i].GetWidth();
+                nRealScreenHeight	= rScreens[i].GetHeight();
                 break;
             }
     }
@@ -1501,10 +1501,10 @@ void X11SalFrame::Center( )
         {
             Rectangle aRect;
             pFrame->GetPosSize( aRect );
-            pFrame->maGeometry.nX       = aRect.Left();
-            pFrame->maGeometry.nY       = aRect.Top();
-            pFrame->maGeometry.nWidth   = aRect.GetWidth();
-            pFrame->maGeometry.nHeight  = aRect.GetHeight();
+            pFrame->maGeometry.nX		= aRect.Left();
+            pFrame->maGeometry.nY		= aRect.Top();
+            pFrame->maGeometry.nWidth	= aRect.GetWidth();
+            pFrame->maGeometry.nHeight	= aRect.GetHeight();
         }
 
         if( pFrame->nStyle_ & SAL_FRAME_STYLE_PLUG )
@@ -1521,10 +1521,10 @@ void X11SalFrame::Center( )
         }
         else
         {
-            nScreenX        = pFrame->maGeometry.nX;
-            nScreenY        = pFrame->maGeometry.nY;
-            nScreenWidth    = pFrame->maGeometry.nWidth;
-            nScreenHeight   = pFrame->maGeometry.nHeight;
+            nScreenX		= pFrame->maGeometry.nX;
+            nScreenY		= pFrame->maGeometry.nY;
+            nScreenWidth	= pFrame->maGeometry.nWidth;
+            nScreenHeight	= pFrame->maGeometry.nHeight;
         }
     }
 
@@ -1539,14 +1539,14 @@ void X11SalFrame::Center( )
         else
         {
             // center the window relative to the top level frame
-            nX = (nScreenWidth  - (int)maGeometry.nWidth ) / 2 + nScreenX;
+            nX = (nScreenWidth	- (int)maGeometry.nWidth ) / 2 + nScreenX;
             nY = (nScreenHeight - (int)maGeometry.nHeight) / 2 + nScreenY;
         }
     }
     else
     {
         // center the window relative to screen
-        nX = (nRealScreenWidth  - (int)maGeometry.nWidth ) / 2 + nScreenX;
+        nX = (nRealScreenWidth	- (int)maGeometry.nWidth ) / 2 + nScreenX;
         nY = (nRealScreenHeight - (int)maGeometry.nHeight) / 2 + nScreenY;
     }
     nX = nX < 0 ? 0 : nX;
@@ -1589,7 +1589,7 @@ void X11SalFrame::SetPosSize( long nX, long nY, long nWidth, long nHeight, USHOR
 {
     if( nStyle_ & SAL_FRAME_STYLE_PLUG )
         return;
-
+    
     // relative positioning in X11SalFrame::SetPosSize
     Rectangle aPosSize( Point( maGeometry.nX, maGeometry.nY ), Size( maGeometry.nWidth, maGeometry.nHeight ) );
     aPosSize.Justify();
@@ -1659,7 +1659,7 @@ void X11SalFrame::SetWindowState( const SalFrameState *pState )
     {
         Rectangle aPosSize;
         bool bDoAdjust = false;
-
+        
         /* #i44325#
          * if maximized, set restore size and guess maximized size from last time
          * in state change below maximize window
@@ -1678,14 +1678,14 @@ void X11SalFrame::SetWindowState( const SalFrameState *pState )
                                pHints,
                                &nSupplied );
             pHints->flags |= PPosition | PWinGravity;
-            pHints->x           = pState->mnX;
-            pHints->y           = pState->mnY;
-            pHints->win_gravity = pDisplay_->getWMAdaptor()->getPositionWinGravity();
+            pHints->x			= pState->mnX;
+            pHints->y			= pState->mnY;
+            pHints->win_gravity	= pDisplay_->getWMAdaptor()->getPositionWinGravity();
             XSetWMNormalHints( GetXDisplay(),
                                GetShellWindow(),
                                pHints );
             XFree( pHints );
-
+            
             XMoveResizeWindow( GetXDisplay(), GetShellWindow(),
                                pState->mnX, pState->mnY,
                                pState->mnWidth, pState->mnHeight );
@@ -1701,7 +1701,7 @@ void X11SalFrame::SetWindowState( const SalFrameState *pState )
             // initialize with current geometry
             if ((pState->mnMask & _FRAMESTATE_MASK_GEOMETRY) != _FRAMESTATE_MASK_GEOMETRY)
                 GetPosSize (aPosSize);
-
+            
             // change requested properties
             if (pState->mnMask & SAL_FRAMESTATE_MASK_X)
             {
@@ -1723,15 +1723,15 @@ void X11SalFrame::SetWindowState( const SalFrameState *pState )
                 aPosSize.setHeight (nHeight);
                 bDoAdjust = true;
             }
-
+            
             const Size& aScreenSize = pDisplay_->getDataForScreen( m_nScreen ).m_aSize;
             const WMAdaptor *pWM = GetDisplay()->getWMAdaptor();
-
+            
             if( bDoAdjust && aPosSize.GetWidth() <= aScreenSize.Width()
                 && aPosSize.GetHeight() <= aScreenSize.Height() )
             {
                 SalFrameGeometry aGeom = maGeometry;
-
+                
                 if( ! (nStyle_ & ( SAL_FRAME_STYLE_FLOAT | SAL_FRAME_STYLE_PLUG ) ) &&
                     mpParent &&
                 aGeom.nLeftDecoration == 0 &&
@@ -1747,7 +1747,7 @@ void X11SalFrame::SetWindowState( const SalFrameState *pState )
                         aGeom.nBottomDecoration = 5;
                     }
                 }
-
+                
                 // adjust position so that frame fits onto screen
                 if( aPosSize.Right()+(long)aGeom.nRightDecoration > aScreenSize.Width()-1 )
                     aPosSize.Move( (long)aScreenSize.Width() - (long)aPosSize.Right() - (long)aGeom.nRightDecoration, 0 );
@@ -1758,7 +1758,7 @@ void X11SalFrame::SetWindowState( const SalFrameState *pState )
                 if( aPosSize.Top() < (long)aGeom.nTopDecoration )
                     aPosSize.Move( 0, (long)aGeom.nTopDecoration - (long)aPosSize.Top() );
             }
-
+            
             // resize with new args
             if (pWM->supportsICCCMPos())
             {
@@ -1824,7 +1824,7 @@ BOOL X11SalFrame::GetWindowState( SalFrameState* pState )
         GetPosSize( aPosSize );
     else
         aPosSize = maRestorePosSize;
-
+    
     if( mbMaximizedHorz )
         pState->mnState |= SAL_FRAMESTATE_MAXIMIZED_HORZ;
     if( mbMaximizedVert )
@@ -1832,8 +1832,8 @@ BOOL X11SalFrame::GetWindowState( SalFrameState* pState )
     if( mbShaded )
         pState->mnState |= SAL_FRAMESTATE_ROLLUP;
 
-    pState->mnX      = aPosSize.Left();
-    pState->mnY      = aPosSize.Top();
+    pState->mnX 	 = aPosSize.Left();
+    pState->mnY 	 = aPosSize.Top();
     pState->mnWidth  = aPosSize.GetWidth();
     pState->mnHeight = aPosSize.GetHeight();
 
@@ -1945,10 +1945,10 @@ void X11SalFrame::SetSize( const Size &rSize )
                                pHints,
                                &nSupplied
                                );
-            pHints->min_width   = rSize.Width();
-            pHints->min_height  = rSize.Height();
-            pHints->max_width   = rSize.Width();
-            pHints->max_height  = rSize.Height();
+            pHints->min_width	= rSize.Width();
+            pHints->min_height	= rSize.Height();
+            pHints->max_width	= rSize.Width();
+            pHints->max_height	= rSize.Height();
             pHints->flags |= PMinSize | PMaxSize;
             XSetWMNormalHints( GetXDisplay(),
                                GetShellWindow(),
@@ -1980,10 +1980,10 @@ void X11SalFrame::SetSize( const Size &rSize )
 void X11SalFrame::SetPosSize( const Rectangle &rPosSize )
 {
     XWindowChanges values;
-    values.x        = rPosSize.Left();
-    values.y        = rPosSize.Top();
-    values.width    = rPosSize.GetWidth();
-    values.height   = rPosSize.GetHeight();
+    values.x		= rPosSize.Left();
+    values.y		= rPosSize.Top();
+    values.width	= rPosSize.GetWidth();
+    values.height	= rPosSize.GetHeight();
 
     if( !values.width || !values.height )
         return;
@@ -2014,8 +2014,8 @@ void X11SalFrame::SetPosSize( const Rectangle &rPosSize )
     if( ! ( nStyle_ & ( SAL_FRAME_STYLE_PLUG | SAL_FRAME_STYLE_FLOAT ) )
         && !(pDisplay_->GetProperties() & PROPERTY_SUPPORT_WM_ClientPos) )
     {
-        values.x    -= maGeometry.nLeftDecoration;
-        values.y    -= maGeometry.nTopDecoration;
+        values.x	-= maGeometry.nLeftDecoration;
+        values.y	-= maGeometry.nTopDecoration;
     }
 
     // do net set WMNormalHints for ..
@@ -2023,7 +2023,7 @@ void X11SalFrame::SetPosSize( const Rectangle &rPosSize )
         // child windows
         ! IsChildWindow()
         // popups (menu, help window, etc.)
-        &&  (nStyle_ & (SAL_FRAME_STYLE_FLOAT|SAL_FRAME_STYLE_OWNERDRAWDECORATION) ) != SAL_FRAME_STYLE_FLOAT
+        && 	(nStyle_ & (SAL_FRAME_STYLE_FLOAT|SAL_FRAME_STYLE_OWNERDRAWDECORATION) ) != SAL_FRAME_STYLE_FLOAT
         // shown, sizeable windows
         && ( nShowState_ == SHOWSTATE_UNKNOWN ||
              nShowState_ == SHOWSTATE_HIDDEN ||
@@ -2040,23 +2040,23 @@ void X11SalFrame::SetPosSize( const Rectangle &rPosSize )
                            );
         if( ! ( nStyle_ & SAL_FRAME_STYLE_SIZEABLE ) )
         {
-            pHints->min_width   = rPosSize.GetWidth();
-            pHints->min_height  = rPosSize.GetHeight();
-            pHints->max_width   = rPosSize.GetWidth();
-            pHints->max_height  = rPosSize.GetHeight();
+            pHints->min_width	= rPosSize.GetWidth();
+            pHints->min_height	= rPosSize.GetHeight();
+            pHints->max_width	= rPosSize.GetWidth();
+            pHints->max_height	= rPosSize.GetHeight();
             pHints->flags |= PMinSize | PMaxSize;
         }
         if( nShowState_ == SHOWSTATE_UNKNOWN || nShowState_ == SHOWSTATE_HIDDEN )
         {
             pHints->flags |= PPosition | PWinGravity;
-            pHints->x           = values.x;
-            pHints->y           = values.y;
-            pHints->win_gravity = pDisplay_->getWMAdaptor()->getPositionWinGravity();
+            pHints->x			= values.x;
+            pHints->y			= values.y;
+            pHints->win_gravity	= pDisplay_->getWMAdaptor()->getPositionWinGravity();
         }
         if( mbFullScreen )
         {
-            pHints->max_width   = 10000;
-            pHints->max_height  = 10000;
+            pHints->max_width	= 10000;
+            pHints->max_height	= 10000;
             pHints->flags |= PMaxSize;
         }
         XSetWMNormalHints( GetXDisplay(),
@@ -2072,19 +2072,19 @@ void X11SalFrame::SetPosSize( const Rectangle &rPosSize )
             XMoveResizeWindow( GetXDisplay(), GetWindow(), 0, 0, values.width, values.height );
         else
             XMoveResizeWindow( GetXDisplay(), GetWindow(), values.x, values.y, values.width, values.height );
-    }
+    }            
 
-    maGeometry.nX       = values.x;
-    maGeometry.nY       = values.y;
-    maGeometry.nWidth   = values.width;
-    maGeometry.nHeight  = values.height;
+    maGeometry.nX		= values.x;
+    maGeometry.nY		= values.y;
+    maGeometry.nWidth	= values.width;
+    maGeometry.nHeight	= values.height;
     if( IsSysChildWindow() && mpParent )
     {
         // translate back to root coordinates
         maGeometry.nX += mpParent->maGeometry.nX;
         maGeometry.nY += mpParent->maGeometry.nY;
     }
-
+    
     updateScreenNumber();
     if( bSized && ! bMoved )
         CallCallback( SALEVENT_RESIZE, NULL );
@@ -2103,7 +2103,7 @@ void X11SalFrame::Minimize()
 {
     if( IsSysChildWindow() )
         return;
-
+    
     if( SHOWSTATE_UNKNOWN == nShowState_ || SHOWSTATE_HIDDEN == nShowState_ )
     {
         stderr0( "X11SalFrame::Minimize on withdrawn window\n" );
@@ -2121,7 +2121,7 @@ void X11SalFrame::Maximize()
 {
     if( IsSysChildWindow() )
         return;
-
+    
     if( SHOWSTATE_MINIMIZED == nShowState_ )
     {
         GetDisplay()->getWMAdaptor()->frameIsMapping( this );
@@ -2137,7 +2137,7 @@ void X11SalFrame::Restore()
 {
     if( IsSysChildWindow() )
         return;
-
+    
     if( SHOWSTATE_UNKNOWN == nShowState_ || SHOWSTATE_HIDDEN == nShowState_ )
     {
         stderr0( "X11SalFrame::Restore on withdrawn window\n" );
@@ -2160,12 +2160,12 @@ void X11SalFrame::SetScreenNumber( unsigned int nNewScreen )
 {
     if( nNewScreen == maGeometry.nScreenNumber )
         return;
-
+    
     if( GetDisplay()->IsXinerama() && GetDisplay()->GetXineramaScreens().size() > 1 )
     {
         if( nNewScreen >= GetDisplay()->GetXineramaScreens().size() )
             return;
-
+        
         Rectangle aOldScreenRect( GetDisplay()->GetXineramaScreens()[maGeometry.nScreenNumber] );
         Rectangle aNewScreenRect( GetDisplay()->GetXineramaScreens()[nNewScreen] );
         bool bVisible = bMapped_;
@@ -2220,7 +2220,7 @@ void X11SalFrame::ShowFullScreen( BOOL bFullScreen, sal_Int32 nScreen )
             createNewWindow( None, m_nScreen );
             if( GetDisplay()->getWMAdaptor()->isLegacyPartialFullscreen() )
                 GetDisplay()->getWMAdaptor()->enableAlwaysOnTop( this, true );
-            else
+            else                                
                 GetDisplay()->getWMAdaptor()->showFullScreen( this, true );
             if( bVisible )
                 Show(TRUE);
@@ -2263,7 +2263,7 @@ void X11SalFrame::ShowFullScreen( BOOL bFullScreen, sal_Int32 nScreen )
         }
         if( mbFullScreen == (bool)bFullScreen )
             return;
-
+    
         pDisplay_->getWMAdaptor()->showFullScreen( this, bFullScreen );
         if( IsOverrideRedirect()
             && WMSupportsFWS( GetXDisplay(), GetDisplay()->GetRootWindow( m_nScreen ) ) )
@@ -2283,7 +2283,7 @@ static Bool
 IsRunningXAutoLock( Display *p_display, XLIB_Window a_window )
 {
     const char *p_atomname = "XAUTOLOCK_SEMAPHORE_PID";
-    Atom        a_pidatom;
+    Atom		a_pidatom;
 
     // xautolock interns this atom
     a_pidatom    = XInternAtom( p_display, p_atomname, True );
@@ -2294,7 +2294,7 @@ IsRunningXAutoLock( Display *p_display, XLIB_Window a_window )
     int           n_format;
     unsigned long n_items;
     unsigned long n_bytes_after;
-    pid_t        *p_pid;
+    pid_t		 *p_pid;
     pid_t         n_pid;
     // get pid of running xautolock
     XGetWindowProperty (p_display, a_window, a_pidatom, 0L, 2L, False,
@@ -2355,10 +2355,10 @@ void X11SalFrame::StartPresentation( BOOL bStart )
     if( ! bStart && hPresentationWindow != None )
         doReparentPresentationDialogues( GetDisplay() );
     hPresentationWindow = (bStart && IsOverrideRedirect() ) ? GetWindow() : None;
-
-
+    
+    
     // needs static here to save DPMS settings
-    int dummy;
+    int dummy; 	
     static bool DPMSExtensionAvailable =
 #ifndef SOLARIS
         (DPMSQueryExtension(GetXDisplay(), &dummy, &dummy) != 0);
@@ -2372,8 +2372,8 @@ void X11SalFrame::StartPresentation( BOOL bStart )
     static CARD16 dpms_standby_timeout=0;
     static CARD16 dpms_suspend_timeout=0;
     static CARD16 dpms_off_timeout=0;
-
-
+        
+                
     if( bStart || nScreenSaversTimeout_ || DPMSEnabled)
     {
         if( hPresentationWindow )
@@ -2390,20 +2390,20 @@ void X11SalFrame::StartPresentation( BOOL bStart )
                          &interval,
                          &prefer_blanking,
                          &allow_exposures );
-
-
+                         
+                
         // get the DPMS state right before the start
         if (DPMSExtensionAvailable)
         {
 #ifndef SOLARIS
-            CARD16 state; // card16 is defined in Xdm.h
-            DPMSInfo(   GetXDisplay(),
-                        &state,
+            CARD16 state; // card16 is defined in Xdm.h 
+            DPMSInfo(	GetXDisplay(), 
+                        &state, 
                         &DPMSEnabled);
 #endif
-        }
-        if( bStart ) // start show
-        {
+        } 				 
+        if( bStart ) // start show 
+        {	
             if ( timeout )
             {
                 nScreenSaversTimeout_ = timeout;
@@ -2412,41 +2412,41 @@ void X11SalFrame::StartPresentation( BOOL bStart )
                                  0,
                                  interval,
                                  prefer_blanking,
-                                 allow_exposures );
+                                 allow_exposures );	  
             }
 #ifndef SOLARIS
             if( DPMSEnabled )
             {
                 if ( DPMSExtensionAvailable )
                 {
-                    DPMSGetTimeouts(    GetXDisplay(),
-                                        &dpms_standby_timeout,
-                                        &dpms_suspend_timeout,
-                                        &dpms_off_timeout);
-                    DPMSSetTimeouts(GetXDisplay(), 0,0,0);
+                    DPMSGetTimeouts(	GetXDisplay(), 
+                                        &dpms_standby_timeout, 
+                                        &dpms_suspend_timeout, 
+                                        &dpms_off_timeout); 
+                    DPMSSetTimeouts(GetXDisplay(), 0,0,0); 	
                 }
             }
 #endif
-        }
+        }				 
         else // if( !bStart ) // end of show
         {
-            if( nScreenSaversTimeout_ )
+            if( nScreenSaversTimeout_ ) 
             {
                 XSetScreenSaver( GetXDisplay(),
                              nScreenSaversTimeout_,
                              interval,
                              prefer_blanking,
                              allow_exposures );
-                nScreenSaversTimeout_ = 0;
+                nScreenSaversTimeout_ = 0;		
             }
 #ifndef SOLARIS
             if ( DPMSEnabled )
-            {
+            {			
                 if ( DPMSExtensionAvailable )
                 {
-                // restore timeouts
-                    DPMSSetTimeouts(GetXDisplay(), dpms_standby_timeout,
-                        dpms_suspend_timeout, dpms_off_timeout);
+                // restore timeouts 
+                    DPMSSetTimeouts(GetXDisplay(), dpms_standby_timeout, 
+                        dpms_suspend_timeout, dpms_off_timeout); 
                 }
             }
 #endif
@@ -2486,16 +2486,16 @@ void
 X11SalFrame::PostExtTextEvent (sal_uInt16 nExtTextEventType, void *pExtTextEvent)
 {
     XLIB_Window nFocusWindow = GetWindow();
-    Atom        nEventAtom   = GetDisplay()->getWMAdaptor()->getAtom( WMAdaptor::SAL_EXTTEXTEVENT );
+    Atom 		nEventAtom	 = GetDisplay()->getWMAdaptor()->getAtom( WMAdaptor::SAL_EXTTEXTEVENT );
 
     XEvent aEvent;
-    aEvent.xclient.type         = ClientMessage;
-    aEvent.xclient.serial       = 0;
-    aEvent.xclient.send_event   = True;
-    aEvent.xclient.display      = GetXDisplay();
-    aEvent.xclient.window       = nFocusWindow;
-    aEvent.xclient.message_type = nEventAtom;
-    aEvent.xclient.format       = 32;
+    aEvent.xclient.type			= ClientMessage;
+    aEvent.xclient.serial		= 0;
+    aEvent.xclient.send_event	= True;
+    aEvent.xclient.display		= GetXDisplay();
+    aEvent.xclient.window		= nFocusWindow;
+    aEvent.xclient.message_type	= nEventAtom;
+    aEvent.xclient.format		= 32;
 
 #if SAL_TYPES_SIZEOFLONG > 4
     aEvent.xclient.data.l[0] = (sal_uInt32)((long)pExtTextEvent & 0xffffffff);
@@ -2697,7 +2697,7 @@ void X11SalFrame::createNewWindow( XLIB_Window aNewParent, int nScreen )
     bool bWasVisible = bMapped_;
     if( bWasVisible )
         Show( FALSE );
-
+    
     if( nScreen < 0 || nScreen >= GetDisplay()->GetScreenCount() )
         nScreen = m_nScreen;
 
@@ -2752,10 +2752,10 @@ void X11SalFrame::createNewWindow( XLIB_Window aNewParent, int nScreen )
 
     // update graphics if necessary
     updateGraphics(false);
-
+    
     if( m_aTitle.Len() )
         SetTitle( m_aTitle );
-
+    
     if( mpParent )
     {
         if( mpParent->m_nScreen != m_nScreen )
@@ -2766,11 +2766,11 @@ void X11SalFrame::createNewWindow( XLIB_Window aNewParent, int nScreen )
 
     if( bWasVisible )
         Show( TRUE );
-
+    
     std::list< X11SalFrame* > aChildren = maChildren;
     for( std::list< X11SalFrame* >::iterator it = aChildren.begin(); it != aChildren.end(); ++it )
         (*it)->createNewWindow( None, m_nScreen );
-
+    
     // FIXME: SalObjects
 }
 
@@ -2851,9 +2851,9 @@ SalFrame::SalPointerState X11SalFrame::GetPointerState()
 
 long X11SalFrame::HandleMouseEvent( XEvent *pEvent )
 {
-    SalMouseEvent       aMouseEvt;
-    USHORT              nEvent = 0;
-    bool                bClosePopups = false;
+    SalMouseEvent		aMouseEvt;
+    USHORT				nEvent = 0;
+    bool				bClosePopups = false;
 
     if( nVisibleFloats && pEvent->type == EnterNotify )
         return 0;
@@ -2869,7 +2869,7 @@ long X11SalFrame::HandleMouseEvent( XEvent *pEvent )
                 if ( pEvent->xcrossing.state & Button2Mask )
                 {
                     pEvent->xcrossing.state &= ~Button2Mask;
-                    pEvent->xcrossing.state |=  Button3Mask;
+                    pEvent->xcrossing.state |=	Button3Mask;
                 }
                 break;
 
@@ -2915,26 +2915,26 @@ long X11SalFrame::HandleMouseEvent( XEvent *pEvent )
         if( pEvent->xcrossing.mode == NotifyGrab || pEvent->xcrossing.mode == NotifyUngrab  )
             return 0;
 
-        aMouseEvt.mnX       = pEvent->xcrossing.x;
-        aMouseEvt.mnY       = pEvent->xcrossing.y;
-        aMouseEvt.mnTime    = pEvent->xcrossing.time;
-        aMouseEvt.mnCode    = sal_GetCode( pEvent->xcrossing.state );
-        aMouseEvt.mnButton  = 0;
+        aMouseEvt.mnX		= pEvent->xcrossing.x;
+        aMouseEvt.mnY		= pEvent->xcrossing.y;
+        aMouseEvt.mnTime	= pEvent->xcrossing.time;
+        aMouseEvt.mnCode	= sal_GetCode( pEvent->xcrossing.state );
+        aMouseEvt.mnButton	= 0;
 
-        nEvent              = LeaveNotify == pEvent->type
+        nEvent				= LeaveNotify == pEvent->type
                               ? SALEVENT_MOUSELEAVE
                               : SALEVENT_MOUSEMOVE;
     }
     else if( pEvent->type == MotionNotify )
     {
-        aMouseEvt.mnX       = pEvent->xmotion.x;
-        aMouseEvt.mnY       = pEvent->xmotion.y;
-        aMouseEvt.mnTime    = pEvent->xmotion.time;
-        aMouseEvt.mnCode    = sal_GetCode( pEvent->xmotion.state );
+        aMouseEvt.mnX		= pEvent->xmotion.x;
+        aMouseEvt.mnY		= pEvent->xmotion.y;
+        aMouseEvt.mnTime	= pEvent->xmotion.time;
+        aMouseEvt.mnCode	= sal_GetCode( pEvent->xmotion.state );
 
-        aMouseEvt.mnButton  = 0;
+        aMouseEvt.mnButton	= 0;
 
-        nEvent              = SALEVENT_MOUSEMOVE;
+        nEvent				= SALEVENT_MOUSEMOVE;
         if( nVisibleFloats > 0 && mpParent )
         {
             XLIB_Cursor aCursor = mpParent->GetCursor();
@@ -2965,11 +2965,11 @@ long X11SalFrame::HandleMouseEvent( XEvent *pEvent )
             for( std::list< SalFrame* >::const_iterator it = rFrames.begin(); it != rFrames.end(); ++it )
             {
                 const X11SalFrame* pFrame = static_cast< const X11SalFrame* >(*it);
-                if( pFrame->IsFloatGrabWindow()                                     &&
-                    pFrame->bMapped_                                                &&
-                    pEvent->xbutton.x_root >= pFrame->maGeometry.nX                             &&
-                    pEvent->xbutton.x_root < pFrame->maGeometry.nX + (int)pFrame->maGeometry.nWidth &&
-                    pEvent->xbutton.y_root >= pFrame->maGeometry.nY                             &&
+                if( pFrame->IsFloatGrabWindow()										&&
+                    pFrame->bMapped_												&&
+                    pEvent->xbutton.x_root >= pFrame->maGeometry.nX								&&
+                    pEvent->xbutton.x_root < pFrame->maGeometry.nX + (int)pFrame->maGeometry.nWidth	&&
+                    pEvent->xbutton.y_root >= pFrame->maGeometry.nY								&&
                     pEvent->xbutton.y_root < pFrame->maGeometry.nY + (int)pFrame->maGeometry.nHeight )
                 {
                     bInside = true;
@@ -3023,7 +3023,7 @@ long X11SalFrame::HandleMouseEvent( XEvent *pEvent )
                 }
             }
         }
-
+        
         if( m_bXEmbed && pEvent->xbutton.button == Button1 )
             askForXEmbedFocus( pEvent->xbutton.time );
 
@@ -3031,19 +3031,19 @@ long X11SalFrame::HandleMouseEvent( XEvent *pEvent )
             pEvent->xbutton.button == Button2 ||
             pEvent->xbutton.button == Button3 )
         {
-            aMouseEvt.mnX       = pEvent->xbutton.x;
-            aMouseEvt.mnY       = pEvent->xbutton.y;
-            aMouseEvt.mnTime    = pEvent->xbutton.time;
-            aMouseEvt.mnCode    = sal_GetCode( pEvent->xbutton.state );
+            aMouseEvt.mnX		= pEvent->xbutton.x;
+            aMouseEvt.mnY		= pEvent->xbutton.y;
+            aMouseEvt.mnTime	= pEvent->xbutton.time;
+            aMouseEvt.mnCode	= sal_GetCode( pEvent->xbutton.state );
 
             if( Button1 == pEvent->xbutton.button )
-                aMouseEvt.mnButton  = MOUSE_LEFT;
+                aMouseEvt.mnButton	= MOUSE_LEFT;
             else if( Button2 == pEvent->xbutton.button )
-                aMouseEvt.mnButton  = MOUSE_MIDDLE;
+                aMouseEvt.mnButton	= MOUSE_MIDDLE;
             else if( Button3 == pEvent->xbutton.button )
-                aMouseEvt.mnButton  = MOUSE_RIGHT;
+                aMouseEvt.mnButton	= MOUSE_RIGHT;
 
-            nEvent              = ButtonPress == pEvent->type
+            nEvent				= ButtonPress == pEvent->type
                 ? SALEVENT_MOUSEBUTTONDOWN
                 : SALEVENT_MOUSEBUTTONUP;
         }
@@ -3052,17 +3052,17 @@ long X11SalFrame::HandleMouseEvent( XEvent *pEvent )
                  pEvent->xbutton.button == Button6 ||
                  pEvent->xbutton.button == Button7 )
         {
-            const bool bIncrement(
+            const bool bIncrement( 
                 pEvent->xbutton.button == Button4 ||
                 pEvent->xbutton.button == Button6 );
-            const bool bHoriz(
+            const bool bHoriz( 
                 pEvent->xbutton.button == Button6 ||
                 pEvent->xbutton.button == Button7 );
 
             if( pEvent->type == ButtonRelease )
                 return 0;
 
-            static ULONG        nLines = 0;
+            static ULONG		nLines = 0;
             if( ! nLines )
             {
                 char* pEnv = getenv( "SAL_WHEELLINES" );
@@ -3071,15 +3071,15 @@ long X11SalFrame::HandleMouseEvent( XEvent *pEvent )
                     nLines = SAL_WHEELMOUSE_EVENT_PAGESCROLL;
             }
 
-            SalWheelMouseEvent  aWheelEvt;
-            aWheelEvt.mnTime        = pEvent->xbutton.time;
-            aWheelEvt.mnX           = pEvent->xbutton.x;
-            aWheelEvt.mnY           = pEvent->xbutton.y;
-            aWheelEvt.mnDelta       = bIncrement ? 120 : -120;
-            aWheelEvt.mnNotchDelta  = bIncrement ? 1 : -1;
+            SalWheelMouseEvent	aWheelEvt;
+            aWheelEvt.mnTime		= pEvent->xbutton.time;
+            aWheelEvt.mnX			= pEvent->xbutton.x;
+            aWheelEvt.mnY			= pEvent->xbutton.y;
+            aWheelEvt.mnDelta		= bIncrement ? 120 : -120;
+            aWheelEvt.mnNotchDelta	= bIncrement ? 1 : -1;
             aWheelEvt.mnScrollLines = nLines;
-            aWheelEvt.mnCode        = sal_GetCode( pEvent->xbutton.state );
-            aWheelEvt.mbHorz        = bHoriz;
+            aWheelEvt.mnCode		= sal_GetCode( pEvent->xbutton.state );
+            aWheelEvt.mbHorz		= bHoriz;
 
             nEvent = SALEVENT_WHEELMOUSE;
 
@@ -3124,8 +3124,8 @@ long X11SalFrame::HandleMouseEvent( XEvent *pEvent )
 // in the independent part.
 struct KeyAlternate
 {
-    USHORT          nKeyCode;
-    sal_Unicode     nCharCode;
+    USHORT			nKeyCode;
+    sal_Unicode		nCharCode;
     KeyAlternate() : nKeyCode( 0 ), nCharCode( 0 ) {}
     KeyAlternate( USHORT nKey, sal_Unicode nChar = 0 ) : nKeyCode( nKey ), nCharCode( nChar ) {}
 };
@@ -3147,10 +3147,10 @@ GetAlternateKeyCode( const USHORT nKeyCode )
 // -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
 long X11SalFrame::HandleKeyEvent( XKeyEvent *pEvent )
 {
-    KeySym          nKeySym;
+    KeySym			nKeySym;
     KeySym          nUnmodifiedKeySym;
-    int             nLen = 2048;
-    unsigned char   *pPrintable = (unsigned char*)alloca( nLen );
+    int 			nLen = 2048;
+    unsigned char	*pPrintable = (unsigned char*)alloca( nLen );
 
     // singlebyte code composed by input method, the new default
     if (mpInputContext != NULL && mpInputContext->UseContext())
@@ -3180,7 +3180,7 @@ long X11SalFrame::HandleKeyEvent( XKeyEvent *pEvent )
     SalKeyEvent aKeyEvt;
     USHORT      nKeyCode;
     USHORT nModCode = 0;
-    char        aDummy;
+    char		aDummy;
 
     if( pEvent->state & ShiftMask )
         nModCode |= KEY_SHIFT;
@@ -3189,10 +3189,10 @@ long X11SalFrame::HandleKeyEvent( XKeyEvent *pEvent )
     if( pEvent->state & Mod1Mask )
         nModCode |= KEY_MOD2;
 
-    if(     nKeySym == XK_Shift_L   || nKeySym == XK_Shift_R
-        ||  nKeySym == XK_Control_L || nKeySym == XK_Control_R
-        ||  nKeySym == XK_Alt_L     || nKeySym == XK_Alt_R
-        ||  nKeySym == XK_Meta_L    || nKeySym == XK_Meta_R
+    if( 	nKeySym == XK_Shift_L 	|| nKeySym == XK_Shift_R
+        || 	nKeySym == XK_Control_L || nKeySym == XK_Control_R
+        || 	nKeySym == XK_Alt_L		|| nKeySym == XK_Alt_R
+        || 	nKeySym == XK_Meta_L 	|| nKeySym == XK_Meta_R
                 ||      nKeySym == XK_Super_L   || nKeySym == XK_Super_R )
     {
         SalKeyModEvent aModEvt;
@@ -3275,9 +3275,9 @@ long X11SalFrame::HandleKeyEvent( XKeyEvent *pEvent )
             else if( mbKeyMenu )
             {
                 // simulate KEY_MENU
-                aKeyEvt.mnCode     = KEY_MENU | nModCode;
+                aKeyEvt.mnCode	   = KEY_MENU | nModCode;
                 aKeyEvt.mnRepeat   = 0;
-                aKeyEvt.mnTime     = pEvent->time;
+                aKeyEvt.mnTime	   = pEvent->time;
                 aKeyEvt.mnCharCode = 0;
                 nRet = CallCallback( SALEVENT_KEYINPUT, &aKeyEvt );
                 nRet = CallCallback( SALEVENT_KEYUP, &aKeyEvt );
@@ -3305,7 +3305,7 @@ long X11SalFrame::HandleKeyEvent( XKeyEvent *pEvent )
     // information (in et_EE locale: "Compose + Z + <" delivers "," in printable and
     // (the desired) Zcaron in KeySym
     sal_Unicode nKeyString = 0x0;
-    if (   (nLen == 0)
+    if (   (nLen == 0) 
         || ((nLen == 1) && (nKeySym > 0)) )
         nKeyString = KeysymToUnicode (nKeySym);
     // if we have nothing we give up
@@ -3383,9 +3383,9 @@ long X11SalFrame::HandleKeyEvent( XKeyEvent *pEvent )
     else
     // normal single character keyinput
     {
-        aKeyEvt.mnCode     = nKeyCode | nModCode;
+        aKeyEvt.mnCode	   = nKeyCode | nModCode;
         aKeyEvt.mnRepeat   = 0;
-        aKeyEvt.mnTime     = pEvent->time;
+        aKeyEvt.mnTime	   = pEvent->time;
         aKeyEvt.mnCharCode = pString[ 0 ];
 
         if( KeyRelease == pEvent->type )
@@ -3431,14 +3431,14 @@ long X11SalFrame::HandleFocusEvent( XFocusChangeEvent *pEvent )
     if( nVisibleFloats > 0 && GetDisplay()->getWMAdaptor()->getWindowManagerName().EqualsAscii( "ReflectionX Windows" ) )
         return 1;
 
-    /*  #55691# ignore focusout resulting from keyboard grabs
-     *  we do not grab it and are not interested when
-     *  someone else does CDE e.g. does a XGrabKey on arrow keys
-     *  #73179# handle focus events with mode NotifyWhileGrabbed
-     *  because with CDE alt-tab focus changing we do not get
-     *  normal focus events
-     *  #71791# cast focus event to the input context, otherwise the
-     *  status window does not follow the application frame
+    /*	#55691# ignore focusout resulting from keyboard grabs
+     *	we do not grab it and are not interested when
+     *	someone else does CDE e.g. does a XGrabKey on arrow keys
+     *	#73179# handle focus events with mode NotifyWhileGrabbed
+     *	because with CDE alt-tab focus changing we do not get
+     *	normal focus events
+     *	#71791# cast focus event to the input context, otherwise the
+     *	status window does not follow the application frame
      */
 
     if ( mpInputContext != NULL  )
@@ -3450,7 +3450,7 @@ long X11SalFrame::HandleFocusEvent( XFocusChangeEvent *pEvent )
             /*
              *  do not unset the IC focuse here because would kill
              *  a lookup choice windows that might have the focus now
-             *      mpInputContext->UnsetICFocus( this );
+             *  	mpInputContext->UnsetICFocus( this );
              */
             I18NStatus::get().show( false, I18NStatus::focus );
         }
@@ -3500,24 +3500,24 @@ long X11SalFrame::HandleFocusEvent( XFocusChangeEvent *pEvent )
 
 long X11SalFrame::HandleExposeEvent( XEvent *pEvent )
 {
-    XRectangle  aRect = { 0, 0, 0, 0 };
-    USHORT      nCount = 0;
+    XRectangle	aRect = { 0, 0, 0, 0 };
+    USHORT		nCount = 0;
 
     if( pEvent->type == Expose )
     {
-        aRect.x         = pEvent->xexpose.x;
-        aRect.y         = pEvent->xexpose.y;
-        aRect.width     = pEvent->xexpose.width;
-        aRect.height    = pEvent->xexpose.height;
-        nCount          = pEvent->xexpose.count;
+        aRect.x 		= pEvent->xexpose.x;
+        aRect.y 		= pEvent->xexpose.y;
+        aRect.width 	= pEvent->xexpose.width;
+        aRect.height	= pEvent->xexpose.height;
+        nCount			= pEvent->xexpose.count;
     }
     else if( pEvent->type == GraphicsExpose )
     {
-        aRect.x         = pEvent->xgraphicsexpose.x;
-        aRect.y         = pEvent->xgraphicsexpose.y;
-        aRect.width     = pEvent->xgraphicsexpose.width;
-        aRect.height    = pEvent->xgraphicsexpose.height;
-        nCount          = pEvent->xgraphicsexpose.count;
+        aRect.x 		= pEvent->xgraphicsexpose.x;
+        aRect.y 		= pEvent->xgraphicsexpose.y;
+        aRect.width 	= pEvent->xgraphicsexpose.width;
+        aRect.height	= pEvent->xgraphicsexpose.height;
+        nCount			= pEvent->xgraphicsexpose.count;
     }
 
     if( IsOverrideRedirect() && mbFullScreen &&
@@ -3567,8 +3567,8 @@ void X11SalFrame::RestackChildren( XLIB_Window* pTopLevelWindows, int nTopLevelW
                         // if a child is behind its parent, place it above the
                         // parent (for insane WMs like Dtwm and olwm)
                         XWindowChanges aCfg;
-                        aCfg.sibling    = GetStackingWindow();
-                        aCfg.stack_mode = Above;
+                        aCfg.sibling	= GetStackingWindow();
+                        aCfg.stack_mode	= Above;
                         XConfigureWindow( GetXDisplay(), pData->GetStackingWindow(), CWSibling|CWStackMode, &aCfg );
                         break;
                     }
@@ -3653,16 +3653,16 @@ long X11SalFrame::HandleSizeEvent( XConfigureEvent *pEvent )
     if( SHOWSTATE_UNKNOWN == nShowState_ && bMapped_ )
         nShowState_ = SHOWSTATE_NORMAL;
 
-    nWidth_     = pEvent->width;
-    nHeight_    = pEvent->height;
+    nWidth_ 	= pEvent->width;
+    nHeight_	= pEvent->height;
 
     bool bMoved = ( pEvent->x != maGeometry.nX || pEvent->y != maGeometry.nY );
     bool bSized = ( pEvent->width != (int)maGeometry.nWidth || pEvent->height != (int)maGeometry.nHeight );
 
-    maGeometry.nX       = pEvent->x;
-    maGeometry.nY       = pEvent->y;
-    maGeometry.nWidth   = pEvent->width;
-    maGeometry.nHeight  = pEvent->height;
+    maGeometry.nX		= pEvent->x;
+    maGeometry.nY		= pEvent->y;
+    maGeometry.nWidth	= pEvent->width;
+    maGeometry.nHeight	= pEvent->height;
     updateScreenNumber();
 
     // update children's position
@@ -3688,11 +3688,11 @@ IMPL_LINK( X11SalFrame, HandleAlwaysOnTopRaise, void*, EMPTYARG )
 // -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
 long X11SalFrame::HandleReparentEvent( XReparentEvent *pEvent )
 {
-    Display        *pDisplay   = pEvent->display;
-    XLIB_Window     hWM_Parent;
-    XLIB_Window     hRoot, *Children, hDummy;
-    unsigned int    nChildren;
-    BOOL            bNone = pDisplay_->GetProperties()
+    Display 	   *pDisplay   = pEvent->display;
+    XLIB_Window 	hWM_Parent;
+    XLIB_Window 	hRoot, *Children, hDummy;
+    unsigned int	nChildren;
+    BOOL			bNone = pDisplay_->GetProperties()
                             & PROPERTY_SUPPORT_WM_Parent_Pixmap_None;
     BOOL            bAccessParentWindow = ! (pDisplay_->GetProperties()
                             & PROPERTY_FEATURE_TrustedSolaris);
@@ -3749,9 +3749,9 @@ long X11SalFrame::HandleReparentEvent( XReparentEvent *pEvent )
             XSelectInput( pDisplay, GetStackingWindow(), StructureNotifyMask );
     }
 
-    if(     hWM_Parent == pDisplay_->GetRootWindow( pDisplay_->GetDefaultScreenNumber() )
-            ||  hWM_Parent == GetForeignParent()
-            ||  pEvent->parent == pDisplay_->GetRootWindow( pDisplay_->GetDefaultScreenNumber() )
+    if( 	hWM_Parent == pDisplay_->GetRootWindow( pDisplay_->GetDefaultScreenNumber() )
+            || 	hWM_Parent == GetForeignParent()
+            || 	pEvent->parent == pDisplay_->GetRootWindow( pDisplay_->GetDefaultScreenNumber() )
             || ( nStyle_ & SAL_FRAME_STYLE_FLOAT ) )
     {
         // Reparenting before Destroy
@@ -3800,8 +3800,8 @@ long X11SalFrame::HandleReparentEvent( XReparentEvent *pEvent )
                            &nLeft,
                            &nTop,
                            &hDummy );
-    maGeometry.nLeftDecoration  = nLeft > 0 ? nLeft-1 : 0;
-    maGeometry.nTopDecoration   = nTop  > 0 ? nTop-1  : 0;
+    maGeometry.nLeftDecoration	= nLeft > 0 ? nLeft-1 : 0;
+    maGeometry.nTopDecoration	= nTop  > 0 ? nTop-1  : 0;
 
     /*
      *  decorations are not symmetric,
@@ -3822,16 +3822,16 @@ long X11SalFrame::HandleReparentEvent( XReparentEvent *pEvent )
     bool bResized = false;
     if( ! GetDisplay()->GetXLib()->HasXErrorOccured() )
     {
-        maGeometry.nRightDecoration     = wp - w - maGeometry.nLeftDecoration;
-        maGeometry.nBottomDecoration    = hp - h - maGeometry.nTopDecoration;
+        maGeometry.nRightDecoration 	= wp - w - maGeometry.nLeftDecoration;
+        maGeometry.nBottomDecoration	= hp - h - maGeometry.nTopDecoration;
         /*
          *  note: this works because hWM_Parent is direct child of root,
          *  not necessarily parent of GetShellWindow()
          */
-        maGeometry.nX       = xp + nLeft;
-        maGeometry.nY       = yp + nTop;
+        maGeometry.nX		= xp + nLeft;
+        maGeometry.nY		= yp + nTop;
         bResized = w != maGeometry.nWidth || h != maGeometry.nHeight;
-        maGeometry.nWidth   = w;
+        maGeometry.nWidth	= w;
         maGeometry.nHeight = h;
     }
 
@@ -3847,16 +3847,16 @@ long X11SalFrame::HandleReparentEvent( XReparentEvent *pEvent )
         int nScreenHeight = aScreenSize.Height();
         int nFrameWidth   = maGeometry.nWidth + maGeometry.nLeftDecoration + maGeometry.nRightDecoration;
         int nFrameHeight  = maGeometry.nHeight + maGeometry.nTopDecoration  + maGeometry.nBottomDecoration;
-
+    
         if ((nFrameWidth > nScreenWidth) || (nFrameHeight > nScreenHeight))
         {
             Size aSize(maGeometry.nWidth, maGeometry.nHeight);
-
+    
             if (nFrameWidth  > nScreenWidth)
                 aSize.Width()  = nScreenWidth  - maGeometry.nRightDecoration - maGeometry.nLeftDecoration;
             if (nFrameHeight > nScreenHeight)
                 aSize.Height() = nScreenHeight - maGeometry.nBottomDecoration - maGeometry.nTopDecoration;
-
+    
             SetSize( aSize );
             bResized = false;
         }
@@ -3878,18 +3878,18 @@ long X11SalFrame::HandleColormapEvent( XColormapEvent* )
 // -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
 long X11SalFrame::HandleStateEvent( XPropertyEvent *pEvent )
 {
-    Atom          actual_type;
-    int           actual_format;
+    Atom		  actual_type;
+    int 		  actual_format;
     unsigned long nitems, bytes_after;
     unsigned char *prop = NULL;
 
     if( 0 != XGetWindowProperty( GetXDisplay(),
                                  GetShellWindow(),
-                                 pEvent->atom,          // property
-                                 0,                     // long_offset (32bit)
-                                 2,                     // long_length (32bit)
-                                 False,                 // delete
-                                 pEvent->atom,          // req_type
+                                 pEvent->atom,			// property
+                                 0, 					// long_offset (32bit)
+                                 2, 					// long_length (32bit)
+                                 False, 				// delete
+                                 pEvent->atom,			// req_type
                                  &actual_type,
                                  &actual_format,
                                  &nitems,
@@ -3901,8 +3901,8 @@ long X11SalFrame::HandleStateEvent( XPropertyEvent *pEvent )
 
     DBG_ASSERT( actual_type = pEvent->atom
                 && 32 == actual_format
-                &&  2 == nitems
-                &&  0 == bytes_after, "HandleStateEvent" );
+                &&	2 == nitems
+                &&	0 == bytes_after, "HandleStateEvent" );
 
     if( *(unsigned long*)prop == NormalState )
         nShowState_ = SHOWSTATE_NORMAL;
@@ -3956,7 +3956,7 @@ long X11SalFrame::HandleClientMessage( XClientMessageEvent *pEvent )
             else if( (Atom)pEvent->data.l[0] == rWMAdaptor.getAtom( WMAdaptor::WM_SAVE_YOURSELF ) )
             {
                 bool bSession = rWMAdaptor.getWindowManagerName().EqualsAscii( "Dtwm" );
-
+                
                 if( ! bSession )
                 {
                     if( this == s_pSaveYourselfFrame )
@@ -4030,7 +4030,7 @@ void X11SalFrame::SaveYourselfDone( SalFrame* pSaveFrame )
                 pFrame = static_cast< const X11SalFrame* >(*it);
                 if( pFrame == pSaveFrame )
                     break;
-                ++it;
+                ++it; 
             }
             if( pFrame == pSaveFrame )
             {
@@ -4058,10 +4058,10 @@ Bool X11SalFrame::checkKeyReleaseForRepeat( Display*, XEvent* pCheck, XPointer p
 {
     X11SalFrame* pThis = (X11SalFrame*)pX11SalFrame;
     return
-        pCheck->type            == XLIB_KeyPress &&
-        pCheck->xkey.state      == pThis->nKeyState_ &&
-        pCheck->xkey.keycode    == pThis->nKeyCode_ &&
-        pCheck->xkey.time       == pThis->nReleaseTime_  ? True : False;
+        pCheck->type			== XLIB_KeyPress &&
+        pCheck->xkey.state		== pThis->nKeyState_ &&
+        pCheck->xkey.keycode	== pThis->nKeyCode_ &&
+        pCheck->xkey.time		== pThis->nReleaseTime_  ? True : False;
 }
 
 long X11SalFrame::Dispatch( XEvent *pEvent )
@@ -4082,9 +4082,9 @@ long X11SalFrame::Dispatch( XEvent *pEvent )
         switch( pEvent->type )
         {
             case XLIB_KeyPress:
-                nKeyCode_   = pEvent->xkey.keycode;
-                nKeyState_  = pEvent->xkey.state;
-                nRet        = HandleKeyEvent( &pEvent->xkey );
+                nKeyCode_	= pEvent->xkey.keycode;
+                nKeyState_	= pEvent->xkey.state;
+                nRet		= HandleKeyEvent( &pEvent->xkey );
                 break;
 
             case KeyRelease:
@@ -4095,7 +4095,7 @@ long X11SalFrame::Dispatch( XEvent *pEvent )
                     if( XCheckIfEvent( pEvent->xkey.display, &aEvent, call_checkKeyReleaseForRepeat, (XPointer)this ) )
                         XPutBackEvent( pEvent->xkey.display, &aEvent );
                     else
-                        nRet        = HandleKeyEvent( &pEvent->xkey );
+                        nRet		= HandleKeyEvent( &pEvent->xkey );
                 }
             break;
 
@@ -4156,13 +4156,13 @@ long X11SalFrame::Dispatch( XEvent *pEvent )
                          */
                         maPaintRegion.Union( Rectangle( Point( 0, 0 ), Size( maGeometry.nWidth, maGeometry.nHeight ) ) );
                         XEvent aEvent;
-                        aEvent.xexpose.type     = Expose;
-                        aEvent.xexpose.display  = pDisplay_->GetDisplay();
-                        aEvent.xexpose.x        = 0;
-                        aEvent.xexpose.y        = 0;
-                        aEvent.xexpose.width    = maGeometry.nWidth;
-                        aEvent.xexpose.height   = maGeometry.nHeight;
-                        aEvent.xexpose.count    = 0;
+                        aEvent.xexpose.type		= Expose;
+                        aEvent.xexpose.display	= pDisplay_->GetDisplay();
+                        aEvent.xexpose.x		= 0;
+                        aEvent.xexpose.y		= 0;
+                        aEvent.xexpose.width	= maGeometry.nWidth;
+                        aEvent.xexpose.height	= maGeometry.nHeight;
+                        aEvent.xexpose.count	= 0;
                         XSendEvent( pDisplay_->GetDisplay(),
                                     GetWindow(),
                                     True,
@@ -4220,7 +4220,7 @@ long X11SalFrame::Dispatch( XEvent *pEvent )
                                         CurrentTime );
                         bSetFocus = false;
                     }
-
+                    
                     if( bSetFocus )
                     {
                         XSetInputFocus( GetXDisplay(),
@@ -4228,7 +4228,7 @@ long X11SalFrame::Dispatch( XEvent *pEvent )
                                         RevertToParent,
                                         CurrentTime );
                     }
-
+                    
 
                     RestackChildren();
                     mbInShow = FALSE;
@@ -4327,13 +4327,13 @@ void X11SalFrame::ResetClipRegion()
     delete [] m_pClipRectangles;
     m_pClipRectangles = NULL;
     m_nCurClipRect = m_nMaxClipRect = 0;
-
-    const int   dest_kind   = ShapeBounding;
-    const int   op          = ShapeSet;
-    const int   ordering    = YSorted;
+    
+    const int	dest_kind	= ShapeBounding;
+    const int	op			= ShapeSet;
+    const int	ordering	= YSorted;
 
     XWindowAttributes win_attrib;
-    XRectangle        win_size;
+    XRectangle		  win_size;
 
     XLIB_Window aShapeWindow = mhShellWindow;
 
@@ -4341,17 +4341,17 @@ void X11SalFrame::ResetClipRegion()
                            aShapeWindow,
                            &win_attrib );
 
-    win_size.x      = 0;
-    win_size.y      = 0;
-    win_size.width  = win_attrib.width;
+    win_size.x		= 0;
+    win_size.y		= 0;
+    win_size.width	= win_attrib.width;
     win_size.height = win_attrib.height;
 
     XShapeCombineRectangles ( GetDisplay()->GetDisplay(),
                               aShapeWindow,
                               dest_kind,
-                              0, 0,             // x_off, y_off
-                              &win_size,        // list of rectangles
-                              1,                // number of rectangles
+                              0, 0, 			// x_off, y_off
+                              &win_size,		// list of rectangles
+                              1,				// number of rectangles
                               op, ordering );
 }
 
@@ -4381,9 +4381,9 @@ void X11SalFrame::UnionClipRegion( long nX, long nY, long nWidth, long nHeight )
 
 void X11SalFrame::EndSetClipRegion()
 {
-    const int   dest_kind   = ShapeBounding;
-    const int   ordering    = YSorted;
-    const int   op = ShapeSet;
+    const int	dest_kind	= ShapeBounding;
+    const int	ordering	= YSorted;
+    const int	op = ShapeSet;
 
     XLIB_Window aShapeWindow = mhShellWindow;
     XShapeCombineRectangles ( GetDisplay()->GetDisplay(),
diff --git a/vcl/unx/source/window/salmenu.cxx b/vcl/unx/source/window/salmenu.cxx
index 0739b6cd5352..ff08c8c36836 100644
--- a/vcl/unx/source/window/salmenu.cxx
+++ b/vcl/unx/source/window/salmenu.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
@@ -74,7 +74,7 @@ X11SalMenu::~X11SalMenu()
 
 BOOL X11SalMenu::VisibleMenuBar()
 {
-    return FALSE;
+    return FALSE; 
 }
 
 void X11SalMenu::SetFrame( const SalFrame* )
diff --git a/vcl/unx/source/window/salobj.cxx b/vcl/unx/source/window/salobj.cxx
index 647b95ae032c..20a7749a30ac 100644
--- a/vcl/unx/source/window/salobj.cxx
+++ b/vcl/unx/source/window/salobj.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
@@ -63,8 +63,8 @@ SalObject* X11SalInstance::CreateObject( SalFrame* pParent, SystemWindowData* pW
 X11SalObject* X11SalObject::CreateObject( SalFrame* pParent, SystemWindowData* pWindowData, BOOL bShow )
 {
     int error_base, event_base;
-    X11SalObject*       pObject  = new X11SalObject();
-    SystemChildData*    pObjData = const_cast<SystemChildData*>(pObject->GetSystemData());
+    X11SalObject*		pObject  = new X11SalObject();
+    SystemChildData*	pObjData = const_cast<SystemChildData*>(pObject->GetSystemData());
 
     if ( ! XShapeQueryExtension( (Display*)pObjData->pDisplay,
                                   &event_base, &error_base ) )
@@ -74,12 +74,12 @@ X11SalObject* X11SalObject::CreateObject( SalFrame* pParent, SystemWindowData* p
     }
 
     pObject->mpParent = pParent;
-
-    SalDisplay* pSalDisp        = GetX11SalData()->GetDisplay();
-    const SystemEnvData* pEnv   = pParent->GetSystemData();
-    Display* pDisp              = pSalDisp->GetDisplay();
-    XLIB_Window aObjectParent   = (XLIB_Window)pEnv->aWindow;
-
+    
+    SalDisplay* pSalDisp		= GetX11SalData()->GetDisplay();
+    const SystemEnvData* pEnv	= pParent->GetSystemData();
+    Display* pDisp				= pSalDisp->GetDisplay();
+    XLIB_Window aObjectParent	= (XLIB_Window)pEnv->aWindow;
+    
     // find out on which screen that window is
     XWindowAttributes aParentAttr;
     XGetWindowAttributes( pDisp, aObjectParent, &aParentAttr );
@@ -137,7 +137,7 @@ X11SalObject* X11SalObject::CreateObject( SalFrame* pParent, SystemWindowData* p
         pSalDisp->GetXLib()->PushXErrorLevel( true );
 
         // create colormap for visual - there might not be one
-        pObject->maColormap = aAttribs.colormap = XCreateColormap(
+        pObject->maColormap = aAttribs.colormap = XCreateColormap( 
             pDisp,
             pSalDisp->GetRootWindow( nScreen ),
             pVisual,
@@ -169,14 +169,14 @@ X11SalObject* X11SalObject::CreateObject( SalFrame* pParent, SystemWindowData* p
         XMapWindow( pDisp, pObject->maPrimary );
     }
 
-    pObjData->pDisplay      = pDisp;
-    pObjData->aWindow       = pObject->maSecondary;
-    pObjData->pWidget       = NULL;
-    pObjData->pVisual       = pVisual;
-    pObjData->nDepth        = nDepth;
-    pObjData->aColormap     = aVisID == pSalDisp->GetVisual( nScreen ).GetVisualId() ?
+    pObjData->pDisplay		= pDisp;
+    pObjData->aWindow		= pObject->maSecondary;
+    pObjData->pWidget		= NULL;
+    pObjData->pVisual		= pVisual;
+    pObjData->nDepth		= nDepth;
+    pObjData->aColormap		= aVisID == pSalDisp->GetVisual( nScreen ).GetVisualId() ?
                               pSalDisp->GetColormap( nScreen ).GetXColormap() : None;
-    pObjData->pAppContext   = NULL;
+    pObjData->pAppContext	= NULL;
 
     XSync(pDisp, False);
     BOOL bWasXError = pSalDisp->GetXLib()->HasXErrorOccured();
@@ -237,8 +237,8 @@ SalClipRegion::UnionClipRegion( long nX, long nY, long nWidth, long nHeight )
     {
         XRectangle *aRect = ClipRectangleList + numClipRectangles;
 
-        aRect->x     = (short) nX;
-        aRect->y     = (short) nY;
+        aRect->x	 = (short) nX;
+        aRect->y	 = (short) nY;
         aRect->width = (unsigned short) nWidth;
         aRect->height= (unsigned short) nHeight;
 
@@ -253,19 +253,19 @@ SalClipRegion::UnionClipRegion( long nX, long nY, long nWidth, long nHeight )
 
 X11SalObject::X11SalObject()
 {
-    maSystemChildData.nSize     = sizeof( SystemChildData );
-    maSystemChildData.pDisplay  = GetX11SalData()->GetDisplay()->GetDisplay();
-    maSystemChildData.aWindow       = None;
-    maSystemChildData.pSalFrame = 0;
-    maSystemChildData.pWidget       = 0;
-    maSystemChildData.pVisual       = 0;
-    maSystemChildData.nDepth        = 0;
-    maSystemChildData.aColormap = 0;
-    maSystemChildData.pAppContext   = NULL;
-    maSystemChildData.aShellWindow  = 0;
-    maSystemChildData.pShellWidget  = NULL;
-    maPrimary                       = 0;
-    maSecondary                     = 0;
+    maSystemChildData.nSize		= sizeof( SystemChildData );
+    maSystemChildData.pDisplay 	= GetX11SalData()->GetDisplay()->GetDisplay();
+    maSystemChildData.aWindow		= None;
+    maSystemChildData.pSalFrame	= 0;
+    maSystemChildData.pWidget		= 0;
+    maSystemChildData.pVisual		= 0;
+    maSystemChildData.nDepth		= 0;
+    maSystemChildData.aColormap	= 0;
+    maSystemChildData.pAppContext	= NULL;
+    maSystemChildData.aShellWindow	= 0;
+    maSystemChildData.pShellWidget	= NULL;
+    maPrimary						= 0;
+    maSecondary						= 0;
     maColormap                      = 0;
 
     std::list< SalObject* >& rObjects = GetX11SalData()->GetDisplay()->getSalObjects();
@@ -279,7 +279,7 @@ X11SalObject::~X11SalObject()
     rObjects.remove( this );
     SalDisplay* pSalDisp = GetX11SalData()->GetDisplay();
     pSalDisp->GetXLib()->PushXErrorLevel( true );
-    if ( maSecondary )
+    if ( maSecondary ) 
         XDestroyWindow( (Display*)maSystemChildData.pDisplay, maSecondary );
     if ( maPrimary )
         XDestroyWindow( (Display*)maSystemChildData.pDisplay, maPrimary );
@@ -295,12 +295,12 @@ X11SalObject::ResetClipRegion()
 {
     maClipRegion.ResetClipRegion();
 
-    const int   dest_kind   = ShapeBounding;
-    const int   op          = ShapeSet;
-    const int   ordering    = YSorted;
+    const int	dest_kind	= ShapeBounding;
+    const int	op			= ShapeSet;
+    const int	ordering	= YSorted;
 
     XWindowAttributes win_attrib;
-    XRectangle        win_size;
+    XRectangle		  win_size;
 
     XLIB_Window aShapeWindow = maPrimary;
 
@@ -308,17 +308,17 @@ X11SalObject::ResetClipRegion()
                            aShapeWindow,
                            &win_attrib );
 
-    win_size.x      = 0;
-    win_size.y      = 0;
-    win_size.width  = win_attrib.width;
+    win_size.x		= 0;
+    win_size.y		= 0;
+    win_size.width	= win_attrib.width;
     win_size.height = win_attrib.height;
 
     XShapeCombineRectangles ( (Display*)maSystemChildData.pDisplay,
                               aShapeWindow,
                               dest_kind,
-                              0, 0,             // x_off, y_off
-                              &win_size,        // list of rectangles
-                              1,                // number of rectangles
+                              0, 0, 			// x_off, y_off
+                              &win_size,		// list of rectangles
+                              1,				// number of rectangles
                               op, ordering );
 }
 
@@ -341,12 +341,12 @@ void
 X11SalObject::EndSetClipRegion()
 {
     XRectangle *pRectangles = maClipRegion.EndSetClipRegion ();
-    const int   nType       = maClipRegion.GetClipRegionType();
-    const int   nRectangles = maClipRegion.GetRectangleCount();
+    const int	nType		= maClipRegion.GetClipRegionType();
+    const int	nRectangles = maClipRegion.GetRectangleCount();
 
-    const int   dest_kind   = ShapeBounding;
-    const int   ordering    = YSorted;
-    int         op;
+    const int	dest_kind	= ShapeBounding;
+    const int	ordering	= YSorted;
+    int 		op;
 
     switch ( nType )
     {
@@ -364,7 +364,7 @@ X11SalObject::EndSetClipRegion()
     }
 
     XLIB_Window aShapeWindow = maPrimary;
-
+    
     XShapeCombineRectangles ( (Display*)maSystemChildData.pDisplay,
                               aShapeWindow,
                               dest_kind,
@@ -401,7 +401,7 @@ X11SalObject::SetPosSize( long nX, long nY, long nWidth, long nHeight )
 void
 X11SalObject::Show( BOOL bVisible )
 {
-    if  ( ! maSystemChildData.aWindow )
+    if	( ! maSystemChildData.aWindow )
         return;
 
     if ( bVisible ) {
diff --git a/vcl/util/hidother.src b/vcl/util/hidother.src
index f966fcded1b3..c213fa267154 100644
--- a/vcl/util/hidother.src
+++ b/vcl/util/hidother.src
@@ -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
@@ -27,5 +27,5 @@
 
 #include "vcl/svids.hrc"
 
-hidspecial HID_PRINTDLG                         { HelpID = HID_PRINTDLG; };
+hidspecial HID_PRINTDLG							{ HelpID = HID_PRINTDLG; };
 
diff --git a/vcl/win/inc/salbmp.h b/vcl/win/inc/salbmp.h
index 7a31add2ae19..973e9644e5d8 100644
--- a/vcl/win/inc/salbmp.h
+++ b/vcl/win/inc/salbmp.h
@@ -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
@@ -34,38 +34,38 @@
 #include <vcl/salbmp.hxx>
 
 // --------------
-// - SalBitmap  -
+// - SalBitmap	-
 // --------------
 
-struct  BitmapBuffer;
-class   BitmapColor;
-class   BitmapPalette;
-class   SalGraphics;
+struct	BitmapBuffer;
+class	BitmapColor;
+class	BitmapPalette;
+class	SalGraphics;
 
 class WinSalBitmap : public SalBitmap
 {
 private:
 
-    Size                maSize;
-    HGLOBAL             mhDIB;
-    HBITMAP             mhDDB;
-    USHORT              mnBitCount;
+    Size				maSize;
+    HGLOBAL 			mhDIB;
+    HBITMAP 			mhDDB;
+    USHORT				mnBitCount;
 
 public:
 
-    HGLOBAL             ImplGethDIB() const { return mhDIB; }
-    HBITMAP             ImplGethDDB() const { return mhDDB; }
+    HGLOBAL 			ImplGethDIB() const { return mhDIB; }
+    HBITMAP 			ImplGethDDB() const { return mhDDB; }
 
-    static HGLOBAL      ImplCreateDIB( const Size& rSize, USHORT nBitCount, const BitmapPalette& rPal );
-    static HANDLE       ImplCopyDIBOrDDB( HANDLE hHdl, bool bDIB );
-    static USHORT       ImplGetDIBColorCount( HGLOBAL hDIB );
-    static void         ImplDecodeRLEBuffer( const BYTE* pSrcBuf, BYTE* pDstBuf,
+    static HGLOBAL		ImplCreateDIB( const Size& rSize, USHORT nBitCount, const BitmapPalette& rPal );
+    static HANDLE		ImplCopyDIBOrDDB( HANDLE hHdl, bool bDIB );
+    static USHORT		ImplGetDIBColorCount( HGLOBAL hDIB );
+    static void 		ImplDecodeRLEBuffer( const BYTE* pSrcBuf, BYTE* pDstBuf,
                                              const Size& rSizePixel, bool bRLE4 );
 
 public:
 
                         WinSalBitmap();
-    virtual             ~WinSalBitmap();
+    virtual				~WinSalBitmap();
 
 public:
 
@@ -80,7 +80,7 @@ public:
     virtual Size                GetSize() const { return maSize; }
     virtual USHORT              GetBitCount() const { return mnBitCount; }
 
-    virtual BitmapBuffer*       AcquireBuffer( bool bReadOnly );
+    virtual BitmapBuffer*		AcquireBuffer( bool bReadOnly );
     virtual void                ReleaseBuffer( BitmapBuffer* pBuffer, bool bReadOnly );
     virtual bool                GetSystemData( BitmapSystemData& rData );
 };
diff --git a/vcl/win/inc/saldata.hxx b/vcl/win/inc/saldata.hxx
index ec67272ed07f..61e94c4a5d30 100644
--- a/vcl/win/inc/saldata.hxx
+++ b/vcl/win/inc/saldata.hxx
@@ -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,10 +79,10 @@ public:
     // native widget framework
     void    initNWF();
     void    deInitNWF();
-
+    
     // fill maVKMap;
     void initKeyCodeMap();
-
+    
     // checks if the menuhandle was created by VCL
     BOOL    IsKnownMenuHandle( HMENU hMenu );
 
@@ -99,8 +99,8 @@ public:
     BYTE*                   mpDitherHigh;           // Dither mapping table
     ULONG                   mnTimerMS;              // Current Time (in MS) of the Timer
     ULONG                   mnTimerOrgMS;           // Current Original Time (in MS)
-    DWORD                   mnNextTimerTime;
-    DWORD                   mnLastEventTime;
+    DWORD					mnNextTimerTime;
+    DWORD					mnLastEventTime;
     UINT                    mnTimerId;              // windows timer id
     BOOL                    mbInTimerProc;          // timer event is currently being dispatched
     HHOOK                   mhSalObjMsgHook;        // hook to get interesting msg for SalObject
@@ -131,7 +131,7 @@ public:
     SalIcon*                mpFirstIcon;            // icon cache, points to first icon, NULL if none
     TempFontItem*           mpTempFontItem;
     BOOL                    mbThemeChanged;         // true if visual theme was changed: throw away theme handles
-
+    
     // for GdiPlus GdiplusStartup/GdiplusShutdown
     ULONG_PTR               gdiplusToken;
 
@@ -292,7 +292,7 @@ int ImplSalWICompareAscii( const wchar_t* pStr1, const char* pStr2 );
 #define SAL_MSG_RECREATEHWND         (WM_USER+122)
 // wParam == newParentHwnd; lParam == oldHwnd; lResult == newhWnd
 #define SAL_MSG_RECREATECHILDHWND    (WM_USER+123)
-// wParam == 0; lParam == HWND;
+// wParam == 0; lParam == HWND; 
 #define SAL_MSG_DESTROYHWND         (WM_USER+124)
 
 // wParam == 0; lParam == pData
diff --git a/vcl/win/inc/salframe.h b/vcl/win/inc/salframe.h
index f9aa8ef9dc4b..e8462382662f 100644
--- a/vcl/win/inc/salframe.h
+++ b/vcl/win/inc/salframe.h
@@ -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
@@ -85,64 +85,64 @@ public:
     BOOL                    mbAtCursorIME;          // TRUE: Wir behandeln nur einige IME-Messages
     BOOL                    mbCandidateMode;        // TRUE: Wir befinden uns im Candidate-Modus
     static BOOL             mbInReparent;           // TRUE: ignore focus lost and gain due to reparenting
-
+    
     RGNDATA*                mpClipRgnData;
     RECT*                   mpNextClipRect;
     BOOL                    mbFirstClipRect;
-    sal_Int32               mnDisplay;              // Display used for Fullscreen, 0 is primary monitor
+    sal_Int32				mnDisplay;				// Display used for Fullscreen, 0 is primary monitor
 
     void updateScreenNumber();
 public:
     WinSalFrame();
     virtual ~WinSalFrame();
 
-    virtual SalGraphics*        GetGraphics();
-    virtual void                ReleaseGraphics( SalGraphics* pGraphics );
-    virtual BOOL                PostEvent( void* pData );
-    virtual void                SetTitle( const XubString& rTitle );
-    virtual void                SetIcon( USHORT nIcon );
+    virtual SalGraphics*		GetGraphics();
+    virtual void				ReleaseGraphics( SalGraphics* pGraphics );
+    virtual BOOL				PostEvent( void* pData );
+    virtual void				SetTitle( const XubString& rTitle );
+    virtual void				SetIcon( USHORT nIcon );
     virtual void                                SetMenu( SalMenu* pSalMenu );
     virtual void                                DrawMenuBar();
     virtual void                SetExtendedFrameStyle( SalExtStyle nExtStyle );
-    virtual void                Show( BOOL bVisible, BOOL bNoActivate = FALSE );
-    virtual void                Enable( BOOL bEnable );
+    virtual void				Show( BOOL bVisible, BOOL bNoActivate = FALSE );
+    virtual void				Enable( BOOL bEnable );
     virtual void                SetMinClientSize( long nWidth, long nHeight );
     virtual void                SetMaxClientSize( long nWidth, long nHeight );
-    virtual void                SetPosSize( long nX, long nY, long nWidth, long nHeight, USHORT nFlags );
-    virtual void                GetClientSize( long& rWidth, long& rHeight );
-    virtual void                GetWorkArea( Rectangle& rRect );
-    virtual SalFrame*           GetParent() const;
-    virtual void                SetWindowState( const SalFrameState* pState );
-    virtual BOOL                GetWindowState( SalFrameState* pState );
-    virtual void                ShowFullScreen( BOOL bFullScreen, sal_Int32 nDisplay );
-    virtual void                StartPresentation( BOOL bStart );
-    virtual void                SetAlwaysOnTop( BOOL bOnTop );
-    virtual void                ToTop( USHORT nFlags );
-    virtual void                SetPointer( PointerStyle ePointerStyle );
-    virtual void                CaptureMouse( BOOL bMouse );
-    virtual void                SetPointerPos( long nX, long nY );
+    virtual void				SetPosSize( long nX, long nY, long nWidth, long nHeight, USHORT nFlags );
+    virtual void				GetClientSize( long& rWidth, long& rHeight );
+    virtual void				GetWorkArea( Rectangle& rRect );
+    virtual SalFrame*			GetParent() const;
+    virtual void				SetWindowState( const SalFrameState* pState );
+    virtual BOOL				GetWindowState( SalFrameState* pState );
+    virtual void				ShowFullScreen( BOOL bFullScreen, sal_Int32 nDisplay );
+    virtual void				StartPresentation( BOOL bStart );
+    virtual void				SetAlwaysOnTop( BOOL bOnTop );
+    virtual void				ToTop( USHORT nFlags );
+    virtual void				SetPointer( PointerStyle ePointerStyle );
+    virtual void				CaptureMouse( BOOL bMouse );
+    virtual void				SetPointerPos( long nX, long nY );
     using SalFrame::Flush;
-    virtual void                Flush();
-    virtual void                Sync();
-    virtual void                SetInputContext( SalInputContext* pContext );
-    virtual void                EndExtTextInput( USHORT nFlags );
-    virtual String              GetKeyName( USHORT nKeyCode );
-    virtual String              GetSymbolKeyName( const XubString& rFontName, USHORT nKeyCode );
+    virtual void				Flush();
+    virtual void				Sync();
+    virtual void				SetInputContext( SalInputContext* pContext );
+    virtual void				EndExtTextInput( USHORT nFlags );
+    virtual String				GetKeyName( USHORT nKeyCode );
+    virtual String				GetSymbolKeyName( const XubString& rFontName, USHORT nKeyCode );
     virtual BOOL                MapUnicodeToKeyCode( sal_Unicode aUnicode, LanguageType aLangType, KeyCode& rKeyCode );
-    virtual LanguageType        GetInputLanguage();
-    virtual SalBitmap*          SnapShot();
-    virtual void                UpdateSettings( AllSettings& rSettings );
-    virtual void                Beep( SoundType eSoundType );
-    virtual const SystemEnvData*    GetSystemData() const;
-    virtual SalPointerState     GetPointerState();
-    virtual void                SetParent( SalFrame* pNewParent );
-    virtual bool                SetPluginParent( SystemParentData* pNewParent );
+    virtual LanguageType		GetInputLanguage();
+    virtual SalBitmap*			SnapShot();
+    virtual void				UpdateSettings( AllSettings& rSettings );
+    virtual void				Beep( SoundType eSoundType );
+    virtual const SystemEnvData*	GetSystemData() const;
+    virtual SalPointerState		GetPointerState();
+    virtual void				SetParent( SalFrame* pNewParent );
+    virtual bool				SetPluginParent( SystemParentData* pNewParent );
     virtual void                SetBackgroundBitmap( SalBitmap* );
     virtual void                SetScreenNumber( unsigned int );
-    virtual void                ResetClipRegion();
-    virtual void                BeginSetClipRegion( ULONG nRects );
-    virtual void                UnionClipRegion( long nX, long nY, long nWidth, long nHeight );
-    virtual void                EndSetClipRegion();
+    virtual void				ResetClipRegion();
+    virtual void				BeginSetClipRegion( ULONG nRects );
+    virtual void				UnionClipRegion( long nX, long nY, long nWidth, long nHeight );
+    virtual void				EndSetClipRegion();
 };
 
 void ImplSalGetWorkArea( HWND hWnd, RECT *pRect, const RECT *pParentRect );
diff --git a/vcl/win/inc/salgdi.h b/vcl/win/inc/salgdi.h
index 442b8bee1f15..549ff51e5b8a 100755
--- a/vcl/win/inc/salgdi.h
+++ b/vcl/win/inc/salgdi.h
@@ -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
@@ -45,8 +45,8 @@ class ImplFontAttrCache;
 // - Defines -
 // -----------
 
-#define RGB_TO_PALRGB(nRGB)         ((nRGB)|0x02000000)
-#define PALRGB_TO_RGB(nPalRGB)      ((nPalRGB)&0x00ffffff)
+#define RGB_TO_PALRGB(nRGB) 		((nRGB)|0x02000000)
+#define PALRGB_TO_RGB(nPalRGB)		((nPalRGB)&0x00ffffff)
 
 // win32 platform specific options. Move them to the PMK file?
 
@@ -134,43 +134,43 @@ public:
 class WinSalGraphics : public SalGraphics
 {
 public:
-    HDC                     mhDC;               // HDC
-    HWND                    mhWnd;              // Window-Handle, when Window-Graphics
-    HFONT                   mhFonts[ MAX_FALLBACK ];        // Font + Fallbacks
+    HDC 					mhDC;				// HDC
+    HWND					mhWnd;				// Window-Handle, when Window-Graphics
+    HFONT					mhFonts[ MAX_FALLBACK ];        // Font + Fallbacks
     const ImplWinFontData*  mpWinFontData[ MAX_FALLBACK ];  // pointer to the most recent font face
     ImplWinFontEntry*       mpWinFontEntry[ MAX_FALLBACK ]; // pointer to the most recent font instance
     float                   mfFontScale;        // allows metrics emulation of huge font sizes
-    HPEN                    mhPen;              // Pen
-    HBRUSH                  mhBrush;            // Brush
-    HRGN                    mhRegion;           // Region Handle
-    HPEN                    mhDefPen;           // DefaultPen
-    HBRUSH                  mhDefBrush;         // DefaultBrush
-    HFONT                   mhDefFont;          // DefaultFont
-    HPALETTE                mhDefPal;           // DefaultPalette
-    COLORREF                mnPenColor;         // PenColor
-    COLORREF                mnBrushColor;       // BrushColor
-    COLORREF                mnTextColor;        // TextColor
-    RGNDATA*                mpClipRgnData;      // ClipRegion-Data
-    RGNDATA*                mpStdClipRgnData;   // Cache Standard-ClipRegion-Data
-    RECT*                   mpNextClipRect;     // Naechstes ClipRegion-Rect
-    BOOL                    mbFirstClipRect;    // Flag for first cliprect to insert
-    LOGFONTA*               mpLogFont;          // LOG-Font which is currently selected (only W9x)
-    ImplFontAttrCache*      mpFontAttrCache;    // Cache font attributes from files in so/share/fonts
-    BYTE*                   mpFontCharSets;     // All Charsets for the current font
-    BYTE                    mnFontCharSetCount; // Number of Charsets of the current font; 0 - if not queried
-    BOOL                    mbFontKernInit;     // FALSE: FontKerns must be queried
-    KERNINGPAIR*            mpFontKernPairs;    // Kerning Pairs of the current Font
-    ULONG                   mnFontKernPairCount;// Number of Kerning Pairs of the current Font
-    int                     mnPenWidth;         // Linienbreite
-    BOOL                    mbStockPen;         // is Pen a stockpen
-    BOOL                    mbStockBrush;       // is Brush a stcokbrush
-    BOOL                    mbPen;              // is Pen (FALSE == NULL_PEN)
-    BOOL                    mbBrush;            // is Brush (FALSE == NULL_BRUSH)
-    BOOL                    mbPrinter;          // is Printer
-    BOOL                    mbVirDev;           // is VirDev
-    BOOL                    mbWindow;           // is Window
-    BOOL                    mbScreen;           // is Screen compatible
-    bool                    mbXORMode;          // _every_ output with RasterOp XOR
+    HPEN					mhPen;				// Pen
+    HBRUSH					mhBrush;			// Brush
+    HRGN					mhRegion;			// Region Handle
+    HPEN					mhDefPen;			// DefaultPen
+    HBRUSH					mhDefBrush; 		// DefaultBrush
+    HFONT					mhDefFont;			// DefaultFont
+    HPALETTE				mhDefPal;			// DefaultPalette
+    COLORREF				mnPenColor; 		// PenColor
+    COLORREF				mnBrushColor;		// BrushColor
+    COLORREF				mnTextColor;		// TextColor
+    RGNDATA*				mpClipRgnData;		// ClipRegion-Data
+    RGNDATA*				mpStdClipRgnData;	// Cache Standard-ClipRegion-Data
+    RECT*					mpNextClipRect; 	// Naechstes ClipRegion-Rect
+    BOOL					mbFirstClipRect;	// Flag for first cliprect to insert
+    LOGFONTA*				mpLogFont;			// LOG-Font which is currently selected (only W9x)
+    ImplFontAttrCache*		mpFontAttrCache;	// Cache font attributes from files in so/share/fonts
+    BYTE*					mpFontCharSets; 	// All Charsets for the current font
+    BYTE					mnFontCharSetCount; // Number of Charsets of the current font; 0 - if not queried
+    BOOL					mbFontKernInit; 	// FALSE: FontKerns must be queried
+    KERNINGPAIR*			mpFontKernPairs;	// Kerning Pairs of the current Font
+    ULONG					mnFontKernPairCount;// Number of Kerning Pairs of the current Font
+    int 					mnPenWidth; 		// Linienbreite
+    BOOL					mbStockPen; 		// is Pen a stockpen
+    BOOL					mbStockBrush;		// is Brush a stcokbrush
+    BOOL					mbPen;				// is Pen (FALSE == NULL_PEN)
+    BOOL					mbBrush;			// is Brush (FALSE == NULL_BRUSH)
+    BOOL					mbPrinter;			// is Printer
+    BOOL					mbVirDev;			// is VirDev
+    BOOL					mbWindow;			// is Window
+    BOOL					mbScreen;			// is Screen compatible
+    bool					mbXORMode;			// _every_ output with RasterOp XOR
 
     // remember RGB values for SetLineColor/SetFillColor
     SalColor                maLineColor;
@@ -183,48 +183,48 @@ public:
     virtual ~WinSalGraphics();
 
 protected:
-    virtual BOOL        unionClipRegion( long nX, long nY, long nWidth, long nHeight );
+    virtual BOOL		unionClipRegion( long nX, long nY, long nWidth, long nHeight );
     virtual bool                unionClipRegion( const ::basegfx::B2DPolyPolygon& );
     // draw --> LineColor and FillColor and RasterOp and ClipRegion
-    virtual void        drawPixel( long nX, long nY );
-    virtual void        drawPixel( long nX, long nY, SalColor nSalColor );
-    virtual void        drawLine( long nX1, long nY1, long nX2, long nY2 );
-    virtual void        drawRect( long nX, long nY, long nWidth, long nHeight );
-    virtual void        drawPolyLine( ULONG nPoints, const SalPoint* pPtAry );
-    virtual void        drawPolygon( ULONG nPoints, const SalPoint* pPtAry );
-    virtual void        drawPolyPolygon( sal_uInt32 nPoly, const sal_uInt32* pPoints, PCONSTSALPOINT* pPtAry );
+    virtual void		drawPixel( long nX, long nY );
+    virtual void		drawPixel( long nX, long nY, SalColor nSalColor );
+    virtual void		drawLine( long nX1, long nY1, long nX2, long nY2 );
+    virtual void		drawRect( long nX, long nY, long nWidth, long nHeight );
+    virtual void		drawPolyLine( ULONG nPoints, const SalPoint* pPtAry );
+    virtual void		drawPolygon( ULONG nPoints, const SalPoint* pPtAry );
+    virtual void		drawPolyPolygon( sal_uInt32 nPoly, const sal_uInt32* pPoints, PCONSTSALPOINT* pPtAry );
     virtual bool        drawPolyPolygon( const ::basegfx::B2DPolyPolygon&, double fTransparency );
     virtual bool        drawPolyLine( const ::basegfx::B2DPolygon&, double fTransparency, const ::basegfx::B2DVector& rLineWidth, basegfx::B2DLineJoin );
-    virtual sal_Bool    drawPolyLineBezier( ULONG nPoints, const SalPoint* pPtAry, const BYTE* pFlgAry );
-    virtual sal_Bool    drawPolygonBezier( ULONG nPoints, const SalPoint* pPtAry, const BYTE* pFlgAry );
-    virtual sal_Bool    drawPolyPolygonBezier( sal_uInt32 nPoly, const sal_uInt32* pPoints, const SalPoint* const* pPtAry, const BYTE* const* pFlgAry );
+    virtual sal_Bool	drawPolyLineBezier( ULONG nPoints, const SalPoint* pPtAry, const BYTE* pFlgAry );
+    virtual sal_Bool	drawPolygonBezier( ULONG nPoints, const SalPoint* pPtAry, const BYTE* pFlgAry );
+    virtual sal_Bool	drawPolyPolygonBezier( sal_uInt32 nPoly, const sal_uInt32* pPoints, const SalPoint* const* pPtAry, const BYTE* const* pFlgAry );
 
     // CopyArea --> No RasterOp, but ClipRegion
-    virtual void        copyArea( long nDestX, long nDestY, long nSrcX, long nSrcY, long nSrcWidth,
+    virtual void		copyArea( long nDestX, long nDestY, long nSrcX, long nSrcY, long nSrcWidth,
                                   long nSrcHeight, USHORT nFlags );
 
     // CopyBits and DrawBitmap --> RasterOp and ClipRegion
     // CopyBits() --> pSrcGraphics == NULL, then CopyBits on same Graphics
-    virtual void        copyBits( const SalTwoRect* pPosAry, SalGraphics* pSrcGraphics );
-    virtual void        drawBitmap( const SalTwoRect* pPosAry, const SalBitmap& rSalBitmap );
-    virtual void        drawBitmap( const SalTwoRect* pPosAry,
+    virtual void		copyBits( const SalTwoRect* pPosAry, SalGraphics* pSrcGraphics );
+    virtual void		drawBitmap( const SalTwoRect* pPosAry, const SalBitmap& rSalBitmap );
+    virtual void		drawBitmap( const SalTwoRect* pPosAry,
                                     const SalBitmap& rSalBitmap,
                                     SalColor nTransparentColor );
-    virtual void        drawBitmap( const SalTwoRect* pPosAry,
+    virtual void		drawBitmap( const SalTwoRect* pPosAry,
                                     const SalBitmap& rSalBitmap,
                                     const SalBitmap& rTransparentBitmap );
-    virtual void        drawMask( const SalTwoRect* pPosAry,
+    virtual void		drawMask( const SalTwoRect* pPosAry,
                                   const SalBitmap& rSalBitmap,
                                   SalColor nMaskColor );
 
-    virtual SalBitmap*  getBitmap( long nX, long nY, long nWidth, long nHeight );
-    virtual SalColor    getPixel( long nX, long nY );
+    virtual SalBitmap*	getBitmap( long nX, long nY, long nWidth, long nHeight );
+    virtual SalColor	getPixel( long nX, long nY );
 
     // invert --> ClipRegion (only Windows or VirDevs)
-    virtual void        invert( long nX, long nY, long nWidth, long nHeight, SalInvert nFlags);
-    virtual void        invert( ULONG nPoints, const SalPoint* pPtAry, SalInvert nFlags );
+    virtual void		invert( long nX, long nY, long nWidth, long nHeight, SalInvert nFlags);
+    virtual void		invert( ULONG nPoints, const SalPoint* pPtAry, SalInvert nFlags );
 
-    virtual BOOL        drawEPS( long nX, long nY, long nWidth, long nHeight, void* pPtr, ULONG nSize );
+    virtual BOOL		drawEPS( long nX, long nY, long nWidth, long nHeight, void* pPtr, ULONG nSize );
 
     // native widget rendering methods that require mirroring
     virtual BOOL        hitTestNativeControl( ControlType nType, ControlPart nPart, const Rectangle& rControlRegion,
@@ -239,61 +239,61 @@ protected:
                                                 const ImplControlValue& aValue, const rtl::OUString& aCaption,
                                                 Rectangle &rNativeBoundingRegion, Rectangle &rNativeContentRegion );
 
-    virtual bool        drawAlphaBitmap( const SalTwoRect&,
+    virtual bool		drawAlphaBitmap( const SalTwoRect&,
                                          const SalBitmap& rSourceBitmap,
                                          const SalBitmap& rAlphaBitmap );
-    virtual bool        drawAlphaRect( long nX, long nY, long nWidth, long nHeight, sal_uInt8 nTransparency );
+    virtual bool		drawAlphaRect( long nX, long nY, long nWidth, long nHeight, sal_uInt8 nTransparency );
 
 public:
     // public SalGraphics methods, the interface to teh independent vcl part
 
     // get device resolution
-    virtual void            GetResolution( long& rDPIX, long& rDPIY );
+    virtual void			GetResolution( long& rDPIX, long& rDPIY );
     // get the depth of the device
-    virtual USHORT          GetBitCount();
+    virtual USHORT			GetBitCount();
     // get the width of the device
-    virtual long            GetGraphicsWidth() const;
+    virtual long			GetGraphicsWidth() const;
 
     // set the clip region to empty
-    virtual void            ResetClipRegion();
+    virtual void			ResetClipRegion();
     // begin setting the clip region, add rectangles to the
     // region with the UnionClipRegion call
-    virtual void            BeginSetClipRegion( ULONG nCount );
+    virtual void			BeginSetClipRegion( ULONG nCount );
     // all rectangles were added and the clip region should be set now
-    virtual void            EndSetClipRegion();
+    virtual void			EndSetClipRegion();
 
     // set the line color to transparent (= don't draw lines)
-    virtual void            SetLineColor();
+    virtual void			SetLineColor();
     // set the line color to a specific color
-    virtual void            SetLineColor( SalColor nSalColor );
+    virtual void			SetLineColor( SalColor nSalColor );
     // set the fill color to transparent (= don't fill)
-    virtual void            SetFillColor();
+    virtual void			SetFillColor();
     // set the fill color to a specific color, shapes will be
     // filled accordingly
-    virtual void            SetFillColor( SalColor nSalColor );
+    virtual void          	SetFillColor( SalColor nSalColor );
     // enable/disable XOR drawing
-    virtual void            SetXORMode( bool bSet, bool );
+    virtual void			SetXORMode( bool bSet, bool );
     // set line color for raster operations
-    virtual void            SetROPLineColor( SalROPColor nROPColor );
+    virtual void			SetROPLineColor( SalROPColor nROPColor );
     // set fill color for raster operations
-    virtual void            SetROPFillColor( SalROPColor nROPColor );
+    virtual void			SetROPFillColor( SalROPColor nROPColor );
     // set the text color to a specific color
-    virtual void            SetTextColor( SalColor nSalColor );
+    virtual void			SetTextColor( SalColor nSalColor );
     // set the font
     virtual USHORT         SetFont( ImplFontSelectData*, int nFallbackLevel );
     // get the current font's etrics
-    virtual void            GetFontMetric( ImplFontMetricData* );
+    virtual void			GetFontMetric( ImplFontMetricData* );
     // get kernign pairs of the current font
     // return only PairCount if (pKernPairs == NULL)
-    virtual ULONG           GetKernPairs( ULONG nPairs, ImplKernPairData* pKernPairs );
+    virtual ULONG			GetKernPairs( ULONG nPairs, ImplKernPairData* pKernPairs );
     // get the repertoire of the current font
     virtual ImplFontCharMap* GetImplFontCharMap() const;
     // graphics must fill supplied font list
-    virtual void            GetDevFontList( ImplDevFontList* );
+    virtual void			GetDevFontList( ImplDevFontList* );
     // graphics should call ImplAddDevFontSubstitute on supplied
     // OutputDevice for all its device specific preferred font substitutions
-    virtual void            GetDevFontSubstList( OutputDevice* );
-    virtual bool            AddTempDevFont( ImplDevFontList*, const String& rFileURL, const String& rFontName );
+    virtual void			GetDevFontSubstList( OutputDevice* );
+    virtual bool			AddTempDevFont( ImplDevFontList*, const String& rFileURL, const String& rFontName );
     // CreateFontSubset: a method to get a subset of glyhps of a font
     // inside a new valid font file
     // returns TRUE if creation of subset was successfull
@@ -306,7 +306,7 @@ public:
     //             rInfo: additional outgoing information
     // implementation note: encoding 0 with glyph id 0 should be added implicitly
     // as "undefined character"
-    virtual BOOL            CreateFontSubset( const rtl::OUString& rToFile,
+    virtual BOOL			CreateFontSubset( const rtl::OUString& rToFile,
                                               const ImplFontData*,
                                               long* pGlyphIDs,
                                               sal_uInt8* pEncoding,
@@ -331,13 +331,13 @@ public:
     //                      pWidths MUST support at least 256 members;
     //             rInfo: additional outgoing information
     //             pDataLen: out parameter, contains the byte length of the returned buffer
-    virtual const void* GetEmbedFontData( const ImplFontData*,
+    virtual const void*	GetEmbedFontData( const ImplFontData*,
                                           const sal_Ucs* pUnicodes,
                                           sal_Int32* pWidths,
                                           FontSubsetInfo& rInfo,
                                           long* pDataLen );
     // frees the font data again
-    virtual void            FreeEmbedFontData( const void* pData, long nDataLen );
+    virtual void			FreeEmbedFontData( const void* pData, long nDataLen );
     virtual void            GetGlyphWidths( const ImplFontData*,
                                             bool bVertical,
                                             Int32Vector& rWidths,
@@ -348,7 +348,7 @@ public:
     virtual BOOL                    GetGlyphOutline( long nIndex, ::basegfx::B2DPolyPolygon& );
 
     virtual SalLayout*              GetTextLayout( ImplLayoutArgs&, int nFallbackLevel );
-    virtual void                     DrawServerFontLayout( const ServerFontLayout& );
+    virtual void					 DrawServerFontLayout( const ServerFontLayout& );
 
     virtual bool            supportsOperation( OutDevSupportType ) const;
     // Query the platform layer for control support
@@ -359,10 +359,10 @@ public:
 };
 
 // Init/Deinit Graphics
-void    ImplSalInitGraphics( WinSalGraphics* mpData );
-void    ImplSalDeInitGraphics( WinSalGraphics* mpData );
-void    ImplUpdateSysColorEntries();
-int     ImplIsSysColorEntry( SalColor nSalColor );
+void	ImplSalInitGraphics( WinSalGraphics* mpData );
+void	ImplSalDeInitGraphics( WinSalGraphics* mpData );
+void	ImplUpdateSysColorEntries();
+int 	ImplIsSysColorEntry( SalColor nSalColor );
 void    ImplGetLogFontFromFontSelect( HDC hDC, const ImplFontSelectData*,
             LOGFONTW&, bool bTestVerticalAvail );
 
@@ -370,7 +370,7 @@ void    ImplGetLogFontFromFontSelect( HDC hDC, const ImplFontSelectData*,
 // - Defines -
 // -----------
 
-#define MAX_64KSALPOINTS    ((((USHORT)0xFFFF)-8)/sizeof(POINTS))
+#define MAX_64KSALPOINTS	((((USHORT)0xFFFF)-8)/sizeof(POINTS))
 
 // -----------
 // - Inlines -
diff --git a/vcl/win/inc/salids.hrc b/vcl/win/inc/salids.hrc
index 3049f11b551b..dace5ce658be 100644
--- a/vcl/win/inc/salids.hrc
+++ b/vcl/win/inc/salids.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
@@ -29,83 +29,83 @@
 #define _SV_SALIDS_HRC
 
 // Cursor
-#define SAL_RESID_POINTER_NULL                      10000
+#define SAL_RESID_POINTER_NULL						10000
 #ifndef W40ONLY
-#define SAL_RESID_POINTER_HELP                      10001
+#define SAL_RESID_POINTER_HELP						10001
 #endif
 #ifndef WNT
-#define SAL_RESID_POINTER_HSIZE                     10002
-#define SAL_RESID_POINTER_VSIZE                     10003
-#define SAL_RESID_POINTER_NESWSIZE                  10004
-#define SAL_RESID_POINTER_NWSESIZE                  10005
+#define SAL_RESID_POINTER_HSIZE 					10002
+#define SAL_RESID_POINTER_VSIZE 					10003
+#define SAL_RESID_POINTER_NESWSIZE					10004
+#define SAL_RESID_POINTER_NWSESIZE					10005
 #endif
-#define SAL_RESID_POINTER_CROSS                     10006
-#define SAL_RESID_POINTER_MOVE                      10007
-#define SAL_RESID_POINTER_HSPLIT                    10008
-#define SAL_RESID_POINTER_VSPLIT                    10009
-#define SAL_RESID_POINTER_HSIZEBAR                  10010
-#define SAL_RESID_POINTER_VSIZEBAR                  10011
-#define SAL_RESID_POINTER_HAND                      10012
-#define SAL_RESID_POINTER_REFHAND                   10013
-#define SAL_RESID_POINTER_PEN                       10014
-#define SAL_RESID_POINTER_MAGNIFY                   10015
-#define SAL_RESID_POINTER_FILL                      10016
-#define SAL_RESID_POINTER_ROTATE                    10017
-#define SAL_RESID_POINTER_HSHEAR                    10018
-#define SAL_RESID_POINTER_VSHEAR                    10019
-#define SAL_RESID_POINTER_MIRROR                    10020
-#define SAL_RESID_POINTER_CROOK                     10021
-#define SAL_RESID_POINTER_CROP                      10022
-#define SAL_RESID_POINTER_MOVEPOINT                 10023
-#define SAL_RESID_POINTER_MOVEBEZIERWEIGHT          10024
-#define SAL_RESID_POINTER_MOVEDATA                  10025
-#define SAL_RESID_POINTER_COPYDATA                  10026
-#define SAL_RESID_POINTER_LINKDATA                  10027
-#define SAL_RESID_POINTER_MOVEDATALINK              10028
-#define SAL_RESID_POINTER_COPYDATALINK              10029
-#define SAL_RESID_POINTER_MOVEFILE                  10030
-#define SAL_RESID_POINTER_COPYFILE                  10031
-#define SAL_RESID_POINTER_LINKFILE                  10032
-#define SAL_RESID_POINTER_MOVEFILELINK              10033
-#define SAL_RESID_POINTER_COPYFILELINK              10034
-#define SAL_RESID_POINTER_MOVEFILES                 10035
-#define SAL_RESID_POINTER_COPYFILES                 10036
-#define SAL_RESID_POINTER_NOTALLOWED                10037
-#define SAL_RESID_POINTER_DRAW_LINE                 10038
-#define SAL_RESID_POINTER_DRAW_RECT                 10039
-#define SAL_RESID_POINTER_DRAW_POLYGON              10040
-#define SAL_RESID_POINTER_DRAW_BEZIER               10041
-#define SAL_RESID_POINTER_DRAW_ARC                  10042
-#define SAL_RESID_POINTER_DRAW_PIE                  10043
-#define SAL_RESID_POINTER_DRAW_CIRCLECUT            10044
-#define SAL_RESID_POINTER_DRAW_ELLIPSE              10045
-#define SAL_RESID_POINTER_DRAW_FREEHAND             10046
-#define SAL_RESID_POINTER_DRAW_CONNECT              10047
-#define SAL_RESID_POINTER_DRAW_TEXT                 10048
-#define SAL_RESID_POINTER_DRAW_CAPTION              10049
+#define SAL_RESID_POINTER_CROSS 					10006
+#define SAL_RESID_POINTER_MOVE						10007
+#define SAL_RESID_POINTER_HSPLIT					10008
+#define SAL_RESID_POINTER_VSPLIT					10009
+#define SAL_RESID_POINTER_HSIZEBAR					10010
+#define SAL_RESID_POINTER_VSIZEBAR					10011
+#define SAL_RESID_POINTER_HAND						10012
+#define SAL_RESID_POINTER_REFHAND					10013
+#define SAL_RESID_POINTER_PEN						10014
+#define SAL_RESID_POINTER_MAGNIFY					10015
+#define SAL_RESID_POINTER_FILL						10016
+#define SAL_RESID_POINTER_ROTATE					10017
+#define SAL_RESID_POINTER_HSHEAR					10018
+#define SAL_RESID_POINTER_VSHEAR					10019
+#define SAL_RESID_POINTER_MIRROR					10020
+#define SAL_RESID_POINTER_CROOK 					10021
+#define SAL_RESID_POINTER_CROP						10022
+#define SAL_RESID_POINTER_MOVEPOINT 				10023
+#define SAL_RESID_POINTER_MOVEBEZIERWEIGHT			10024
+#define SAL_RESID_POINTER_MOVEDATA					10025
+#define SAL_RESID_POINTER_COPYDATA					10026
+#define SAL_RESID_POINTER_LINKDATA					10027
+#define SAL_RESID_POINTER_MOVEDATALINK				10028
+#define SAL_RESID_POINTER_COPYDATALINK				10029
+#define SAL_RESID_POINTER_MOVEFILE					10030
+#define SAL_RESID_POINTER_COPYFILE					10031
+#define SAL_RESID_POINTER_LINKFILE					10032
+#define SAL_RESID_POINTER_MOVEFILELINK				10033
+#define SAL_RESID_POINTER_COPYFILELINK				10034
+#define SAL_RESID_POINTER_MOVEFILES 				10035
+#define SAL_RESID_POINTER_COPYFILES 				10036
+#define SAL_RESID_POINTER_NOTALLOWED				10037
+#define SAL_RESID_POINTER_DRAW_LINE 				10038
+#define SAL_RESID_POINTER_DRAW_RECT 				10039
+#define SAL_RESID_POINTER_DRAW_POLYGON				10040
+#define SAL_RESID_POINTER_DRAW_BEZIER				10041
+#define SAL_RESID_POINTER_DRAW_ARC					10042
+#define SAL_RESID_POINTER_DRAW_PIE					10043
+#define SAL_RESID_POINTER_DRAW_CIRCLECUT			10044
+#define SAL_RESID_POINTER_DRAW_ELLIPSE				10045
+#define SAL_RESID_POINTER_DRAW_FREEHAND 			10046
+#define SAL_RESID_POINTER_DRAW_CONNECT				10047
+#define SAL_RESID_POINTER_DRAW_TEXT 				10048
+#define SAL_RESID_POINTER_DRAW_CAPTION				10049
 #define SAL_RESID_POINTER_CHART                                 10050
-#define SAL_RESID_POINTER_DETECTIVE                 10051
-#define SAL_RESID_POINTER_PIVOT_COL                 10052
-#define SAL_RESID_POINTER_PIVOT_ROW                 10053
-#define SAL_RESID_POINTER_PIVOT_FIELD               10054
+#define SAL_RESID_POINTER_DETECTIVE 				10051
+#define SAL_RESID_POINTER_PIVOT_COL 				10052
+#define SAL_RESID_POINTER_PIVOT_ROW 				10053
+#define SAL_RESID_POINTER_PIVOT_FIELD				10054
 #define SAL_RESID_POINTER_CHAIN                                 10055
-#define SAL_RESID_POINTER_CHAIN_NOTALLOWED          10056
-#define SAL_RESID_POINTER_TIMEEVENT_MOVE            10057
-#define SAL_RESID_POINTER_TIMEEVENT_SIZE            10058
-#define SAL_RESID_POINTER_AUTOSCROLL_N              10059
-#define SAL_RESID_POINTER_AUTOSCROLL_S              10060
-#define SAL_RESID_POINTER_AUTOSCROLL_W              10061
-#define SAL_RESID_POINTER_AUTOSCROLL_E              10062
-#define SAL_RESID_POINTER_AUTOSCROLL_NW             10063
-#define SAL_RESID_POINTER_AUTOSCROLL_NE             10064
-#define SAL_RESID_POINTER_AUTOSCROLL_SW             10065
-#define SAL_RESID_POINTER_AUTOSCROLL_SE             10066
-#define SAL_RESID_POINTER_AUTOSCROLL_NS             10067
-#define SAL_RESID_POINTER_AUTOSCROLL_WE             10068
-#define SAL_RESID_POINTER_AUTOSCROLL_NSWE           10069
+#define SAL_RESID_POINTER_CHAIN_NOTALLOWED			10056
+#define SAL_RESID_POINTER_TIMEEVENT_MOVE			10057
+#define SAL_RESID_POINTER_TIMEEVENT_SIZE			10058
+#define SAL_RESID_POINTER_AUTOSCROLL_N				10059
+#define SAL_RESID_POINTER_AUTOSCROLL_S				10060
+#define SAL_RESID_POINTER_AUTOSCROLL_W				10061
+#define SAL_RESID_POINTER_AUTOSCROLL_E				10062
+#define SAL_RESID_POINTER_AUTOSCROLL_NW 			10063
+#define SAL_RESID_POINTER_AUTOSCROLL_NE 			10064
+#define SAL_RESID_POINTER_AUTOSCROLL_SW 			10065
+#define SAL_RESID_POINTER_AUTOSCROLL_SE 			10066
+#define SAL_RESID_POINTER_AUTOSCROLL_NS 			10067
+#define SAL_RESID_POINTER_AUTOSCROLL_WE 			10068
+#define SAL_RESID_POINTER_AUTOSCROLL_NSWE			10069
 #define SAL_RESID_POINTER_AIRBRUSH                              10070
-#define SAL_RESID_POINTER_TEXT_VERTICAL             10071
-#define SAL_RESID_POINTER_PIVOT_DELETE              10072
+#define SAL_RESID_POINTER_TEXT_VERTICAL 			10071
+#define SAL_RESID_POINTER_PIVOT_DELETE				10072
 #define SAL_RESID_POINTER_TAB_SELECT_S                          10073
 #define SAL_RESID_POINTER_TAB_SELECT_E                          10074
 #define SAL_RESID_POINTER_TAB_SELECT_SE                         10075
@@ -115,6 +115,6 @@
 
 #define SAL_RESID_BITMAP_50                                             11000
 
-#define SAL_RESID_ICON_DEFAULT                      1
+#define SAL_RESID_ICON_DEFAULT						1
 
 #endif // _SV_SALIDS_HRC
diff --git a/vcl/win/inc/salinst.h b/vcl/win/inc/salinst.h
index f3005e3ad30b..1e5cc46b24fa 100644
--- a/vcl/win/inc/salinst.h
+++ b/vcl/win/inc/salinst.h
@@ -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
@@ -42,49 +42,49 @@ class SalYieldMutex;
 class WinSalInstance : public SalInstance
 {
 public:
-    HINSTANCE           mhInst;                 // Instance Handle
-    HWND                mhComWnd;               // window, for communication (between threads and the main thread)
-    SalYieldMutex*      mpSalYieldMutex;        // Sal-Yield-Mutex
-    vos::OMutex*        mpSalWaitMutex;         // Sal-Wait-Mutex
-    USHORT              mnYieldWaitCount;       // Wait-Count
+    HINSTANCE			mhInst; 				// Instance Handle
+    HWND				mhComWnd;				// window, for communication (between threads and the main thread)
+    SalYieldMutex*		mpSalYieldMutex;		// Sal-Yield-Mutex
+    vos::OMutex*		mpSalWaitMutex; 		// Sal-Wait-Mutex
+    USHORT				mnYieldWaitCount;		// Wait-Count
 public:
     WinSalInstance();
     virtual ~WinSalInstance();
 
-    virtual SalFrame*       CreateChildFrame( SystemParentData* pParent, ULONG nStyle );
-    virtual SalFrame*       CreateFrame( SalFrame* pParent, ULONG nStyle );
-    virtual void            DestroyFrame( SalFrame* pFrame );
-    virtual SalObject*      CreateObject( SalFrame* pParent, SystemWindowData* pWindowData, BOOL bShow = TRUE );
-    virtual void            DestroyObject( SalObject* pObject );
-    virtual SalVirtualDevice*   CreateVirtualDevice( SalGraphics* pGraphics,
+    virtual SalFrame*      	CreateChildFrame( SystemParentData* pParent, ULONG nStyle );
+    virtual SalFrame*      	CreateFrame( SalFrame* pParent, ULONG nStyle );
+    virtual void			DestroyFrame( SalFrame* pFrame );
+    virtual SalObject*		CreateObject( SalFrame* pParent, SystemWindowData* pWindowData, BOOL bShow = TRUE );
+    virtual void			DestroyObject( SalObject* pObject );
+    virtual SalVirtualDevice*	CreateVirtualDevice( SalGraphics* pGraphics,
                                                      long nDX, long nDY,
                                                      USHORT nBitCount, const SystemGraphicsData *pData );
-    virtual void            DestroyVirtualDevice( SalVirtualDevice* pDevice );
+    virtual void			DestroyVirtualDevice( SalVirtualDevice* pDevice );
 
-    virtual SalInfoPrinter* CreateInfoPrinter( SalPrinterQueueInfo* pQueueInfo,
+    virtual SalInfoPrinter*	CreateInfoPrinter( SalPrinterQueueInfo* pQueueInfo,
                                                ImplJobSetup* pSetupData );
-    virtual void            DestroyInfoPrinter( SalInfoPrinter* pPrinter );
-    virtual SalPrinter*     CreatePrinter( SalInfoPrinter* pInfoPrinter );
-    virtual void            DestroyPrinter( SalPrinter* pPrinter );
-    virtual void            GetPrinterQueueInfo( ImplPrnQueueList* pList );
-    virtual void            GetPrinterQueueState( SalPrinterQueueInfo* pInfo );
-    virtual void            DeletePrinterQueueInfo( SalPrinterQueueInfo* pInfo );
+    virtual void			DestroyInfoPrinter( SalInfoPrinter* pPrinter );
+    virtual SalPrinter*		CreatePrinter( SalInfoPrinter* pInfoPrinter );
+    virtual void			DestroyPrinter( SalPrinter* pPrinter );
+    virtual void			GetPrinterQueueInfo( ImplPrnQueueList* pList );
+    virtual void			GetPrinterQueueState( SalPrinterQueueInfo* pInfo );
+    virtual void			DeletePrinterQueueInfo( SalPrinterQueueInfo* pInfo );
     virtual String             GetDefaultPrinter();
-    virtual SalTimer*           CreateSalTimer();
-    virtual SalI18NImeStatus*   CreateI18NImeStatus();
-    virtual SalSystem*          CreateSalSystem();
-    virtual SalBitmap*          CreateSalBitmap();
-    virtual vos::IMutex*        GetYieldMutex();
-    virtual ULONG               ReleaseYieldMutex();
-    virtual void                AcquireYieldMutex( ULONG nCount );
-    virtual void                Yield( bool bWait, bool bHandleAllCurrentEvents );
-    virtual bool                AnyInput( USHORT nType );
-    virtual SalMenu*                CreateMenu( BOOL bMenuBar );
-    virtual void                DestroyMenu( SalMenu* );
-    virtual SalMenuItem*            CreateMenuItem( const SalItemParams* pItemData );
-    virtual void                DestroyMenuItem( SalMenuItem* );
+    virtual SalTimer*			CreateSalTimer();
+    virtual SalI18NImeStatus*	CreateI18NImeStatus();
+    virtual SalSystem*			CreateSalSystem();
+    virtual SalBitmap*			CreateSalBitmap();
+    virtual vos::IMutex*		GetYieldMutex();
+    virtual ULONG				ReleaseYieldMutex();
+    virtual void				AcquireYieldMutex( ULONG nCount );
+    virtual void				Yield( bool bWait, bool bHandleAllCurrentEvents );
+    virtual bool				AnyInput( USHORT nType );
+    virtual SalMenu*				CreateMenu( BOOL bMenuBar );
+    virtual void				DestroyMenu( SalMenu* );
+    virtual SalMenuItem*			CreateMenuItem( const SalItemParams* pItemData );
+    virtual void				DestroyMenuItem( SalMenuItem* );
     virtual SalSession*                         CreateSalSession();
-    virtual void*               GetConnectionIdentifier( ConnectionIdentifierType& rReturnedType, int& rReturnedBytes );
+    virtual void*				GetConnectionIdentifier( ConnectionIdentifierType& rReturnedType, int& rReturnedBytes );
     virtual void                AddToRecentDocumentList(const rtl::OUString& rFileUrl, const rtl::OUString& rMimeType);
 
     static int WorkaroundExceptionHandlingInUSER32Lib(int nExcept, LPEXCEPTION_POINTERS pExceptionInfo);
diff --git a/vcl/win/inc/salmenu.h b/vcl/win/inc/salmenu.h
index 7f1774b61975..4d4468827c03 100644
--- a/vcl/win/inc/salmenu.h
+++ b/vcl/win/inc/salmenu.h
@@ -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
diff --git a/vcl/win/inc/salnativewidgets.h b/vcl/win/inc/salnativewidgets.h
index fceee1076595..5c041f779ae3 100644
--- a/vcl/win/inc/salnativewidgets.h
+++ b/vcl/win/inc/salnativewidgets.h
@@ -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
@@ -34,7 +34,7 @@
 #include <vcl/sv.h>
 
 /* SalControlHandleData:
- *
+ * 
  *   Holds platform specific theming data.
  */
 
@@ -49,6 +49,6 @@ class SalControlHandleData
 };
 
 
-#endif  /* __cplusplus */
+#endif	/* __cplusplus */
 
 #endif
diff --git a/vcl/win/inc/salobj.h b/vcl/win/inc/salobj.h
index 11ae96931321..89991d15a7b3 100644
--- a/vcl/win/inc/salobj.h
+++ b/vcl/win/inc/salobj.h
@@ -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
@@ -38,32 +38,32 @@
 class WinSalObject : public SalObject
 {
 public:
-    HWND                    mhWnd;                  // Window handle
-    HWND                    mhWndChild;             // Child Window handle
-    HWND                    mhLastFocusWnd;         // Child-Window, welches als letztes den Focus hatte
-    SystemChildData         maSysData;              // SystemEnvData
-    RGNDATA*                mpClipRgnData;          // ClipRegion-Data
-    RGNDATA*                mpStdClipRgnData;       // Cache Standard-ClipRegion-Data
-    RECT*                   mpNextClipRect;         // Naechstes ClipRegion-Rect
-    BOOL                    mbFirstClipRect;        // Flag for first cliprect to insert
-    WinSalObject*               mpNextObject;           // pointer to next object
+    HWND					mhWnd;					// Window handle
+    HWND					mhWndChild; 			// Child Window handle
+    HWND					mhLastFocusWnd; 		// Child-Window, welches als letztes den Focus hatte
+    SystemChildData 		maSysData;				// SystemEnvData
+    RGNDATA*				mpClipRgnData;			// ClipRegion-Data
+    RGNDATA*				mpStdClipRgnData;		// Cache Standard-ClipRegion-Data
+    RECT*					mpNextClipRect; 		// Naechstes ClipRegion-Rect
+    BOOL					mbFirstClipRect;		// Flag for first cliprect to insert
+    WinSalObject*				mpNextObject;			// pointer to next object
 
 
     WinSalObject();
     virtual ~WinSalObject();
 
-    virtual void                    ResetClipRegion();
-    virtual USHORT                  GetClipRegionType();
-    virtual void                    BeginSetClipRegion( ULONG nRects );
-    virtual void                    UnionClipRegion( long nX, long nY, long nWidth, long nHeight );
-    virtual void                    EndSetClipRegion();
-    virtual void                    SetPosSize( long nX, long nY, long nWidth, long nHeight );
-    virtual void                    Show( BOOL bVisible );
-    virtual void                    Enable( BOOL nEnable );
-    virtual void                    GrabFocus();
-    virtual void                    SetBackground();
-    virtual void                    SetBackground( SalColor nSalColor );
-    virtual const SystemEnvData*    GetSystemData() const;
+    virtual void					ResetClipRegion();
+    virtual USHORT					GetClipRegionType();
+    virtual void					BeginSetClipRegion( ULONG nRects );
+    virtual void					UnionClipRegion( long nX, long nY, long nWidth, long nHeight );
+    virtual void					EndSetClipRegion();
+    virtual void					SetPosSize( long nX, long nY, long nWidth, long nHeight );
+    virtual void					Show( BOOL bVisible );
+    virtual void					Enable( BOOL nEnable );
+    virtual void					GrabFocus();
+    virtual void					SetBackground();
+    virtual void					SetBackground( SalColor nSalColor );
+    virtual const SystemEnvData*	GetSystemData() const;
 };
 
 #endif // _SV_SALOBJ_H
diff --git a/vcl/win/inc/salprn.h b/vcl/win/inc/salprn.h
index 57ae8eae55e3..48c73f7f6af3 100644
--- a/vcl/win/inc/salprn.h
+++ b/vcl/win/inc/salprn.h
@@ -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
@@ -36,18 +36,18 @@
 // -----------------
 
 // WNT3
-#define SAL_DRIVERDATA_SYSSIGN              ((ULONG)0x574E5433)
-#define SAL_DRIVERDATA_VERSION_A            1
+#define SAL_DRIVERDATA_SYSSIGN				((ULONG)0x574E5433)
+#define SAL_DRIVERDATA_VERSION_A			1
 #define SAL_DRIVERDATA_VERSION_W            2
 
 #pragma pack( 1 )
 
 struct SalDriverData
 {
-    ULONG                   mnSysSignature;
-    USHORT                  mnVersion;
-    USHORT                  mnDriverOffset;
-    BYTE                    maDriverData[1];
+    ULONG					mnSysSignature;
+    USHORT					mnVersion;
+    USHORT					mnDriverOffset;
+    BYTE					maDriverData[1];
 };
 
 #pragma pack()
@@ -61,30 +61,30 @@ class WinSalGraphics;
 class WinSalInfoPrinter : public SalInfoPrinter
 {
 public:
-    WinSalGraphics*         mpGraphics;             // current Printer graphics
-    XubString               maDriverName;           // printer driver name
-    XubString               maDeviceName;           // printer device name
-    XubString               maPortName;             // printer port name
-    HDC                     mhDC;                   // printer hdc
-    BOOL                    mbGraphics;             // is Graphics used
+    WinSalGraphics*			mpGraphics; 			// current Printer graphics
+    XubString				maDriverName;			// printer driver name
+    XubString				maDeviceName;			// printer device name
+    XubString				maPortName; 			// printer port name
+    HDC 					mhDC;					// printer hdc
+    BOOL					mbGraphics; 			// is Graphics used
 public:
     WinSalInfoPrinter();
     virtual ~WinSalInfoPrinter();
 
-    virtual SalGraphics*            GetGraphics();
-    virtual void                    ReleaseGraphics( SalGraphics* pGraphics );
-    virtual BOOL                    Setup( SalFrame* pFrame, ImplJobSetup* pSetupData );
-    virtual BOOL                    SetPrinterData( ImplJobSetup* pSetupData );
-    virtual BOOL                    SetData( ULONG nFlags, ImplJobSetup* pSetupData );
-    virtual void                    GetPageInfo( const ImplJobSetup* pSetupData,
+    virtual SalGraphics*			GetGraphics();
+    virtual void					ReleaseGraphics( SalGraphics* pGraphics );
+    virtual BOOL					Setup( SalFrame* pFrame, ImplJobSetup* pSetupData );
+    virtual BOOL					SetPrinterData( ImplJobSetup* pSetupData );
+    virtual BOOL					SetData( ULONG nFlags, ImplJobSetup* pSetupData );
+    virtual void					GetPageInfo( const ImplJobSetup* pSetupData,
                                                  long& rOutWidth, long& rOutHeight,
                                                  long& rPageOffX, long& rPageOffY,
                                                  long& rPageWidth, long& rPageHeight );
-    virtual ULONG                   GetCapabilities( const ImplJobSetup* pSetupData, USHORT nType );
-    virtual ULONG                   GetPaperBinCount( const ImplJobSetup* pSetupData );
-    virtual String                  GetPaperBinName( const ImplJobSetup* pSetupData, ULONG nPaperBin );
-    virtual void                    InitPaperFormats( const ImplJobSetup* pSetupData );
-    virtual int                 GetLandscapeAngle( const ImplJobSetup* pSetupData );
+    virtual ULONG					GetCapabilities( const ImplJobSetup* pSetupData, USHORT nType );
+    virtual ULONG					GetPaperBinCount( const ImplJobSetup* pSetupData );
+    virtual String					GetPaperBinName( const ImplJobSetup* pSetupData, ULONG nPaperBin );
+    virtual void					InitPaperFormats( const ImplJobSetup* pSetupData );
+    virtual int					GetLandscapeAngle( const ImplJobSetup* pSetupData );
 };
 
 // -----------------
@@ -94,34 +94,34 @@ public:
 class WinSalPrinter : public SalPrinter
 {
 public:
-    WinSalGraphics*         mpGraphics;             // current Printer graphics
-    WinSalInfoPrinter*      mpInfoPrinter;          // pointer to the compatible InfoPrinter
-    WinSalPrinter*          mpNextPrinter;          // next printing printer
-    HDC                     mhDC;                   // printer hdc
-    ULONG                   mnError;                // Error Code
-    ULONG                   mnCopies;               // Kopien
-    BOOL                    mbCollate;              // Sortierte Kopien
-    BOOL                    mbAbort;                // Job Aborted
+    WinSalGraphics*			mpGraphics; 			// current Printer graphics
+    WinSalInfoPrinter* 		mpInfoPrinter;			// pointer to the compatible InfoPrinter
+    WinSalPrinter* 			mpNextPrinter;			// next printing printer
+    HDC 					mhDC;					// printer hdc
+    ULONG					mnError;				// Error Code
+    ULONG					mnCopies;				// Kopien
+    BOOL					mbCollate;				// Sortierte Kopien
+    BOOL					mbAbort;				// Job Aborted
 
     bool                    mbValid;
-
+    
 public:
     WinSalPrinter();
     virtual ~WinSalPrinter();
 
     using SalPrinter::StartJob;
-    virtual BOOL                    StartJob( const XubString* pFileName,
+    virtual BOOL					StartJob( const XubString* pFileName,
                                               const XubString& rJobName,
                                               const XubString& rAppName,
                                               ULONG nCopies,
                                               bool bCollate,
                                               bool bDirect,
                                               ImplJobSetup* pSetupData );
-    virtual BOOL                    EndJob();
-    virtual BOOL                    AbortJob();
-    virtual SalGraphics*            StartPage( ImplJobSetup* pSetupData, BOOL bNewJobData );
-    virtual BOOL                    EndPage();
-    virtual ULONG                   GetErrorCode();
+    virtual BOOL					EndJob();
+    virtual BOOL					AbortJob();
+    virtual SalGraphics*			StartPage( ImplJobSetup* pSetupData, BOOL bNewJobData );
+    virtual BOOL					EndPage();
+    virtual ULONG					GetErrorCode();
 
     void markInvalid();
     bool isValid() const { return mbValid; }
diff --git a/vcl/win/inc/salsys.h b/vcl/win/inc/salsys.h
index b6eadc6e6818..5378c3f77ee5 100644
--- a/vcl/win/inc/salsys.h
+++ b/vcl/win/inc/salsys.h
@@ -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
@@ -43,7 +43,7 @@ class WinSalSystem : public SalSystem
         Rectangle            m_aArea;
         Rectangle            m_aWorkArea;
         sal_Int32            m_nStateFlags;
-
+        
         DisplayMonitor() : m_nStateFlags( 0 ) {}
         DisplayMonitor( const rtl::OUString& rName,
                         const rtl::OUString& rDevName,
@@ -82,7 +82,7 @@ public:
     void clearMonitors();
     const std::vector<DisplayMonitor>& getMonitors()
     { initMonitors(); return m_aMonitors;}
-
+    
     BOOL handleMonitorCallback( sal_IntPtr /*HMONITOR*/,
                                 sal_IntPtr /*HDC*/,
                                 sal_IntPtr /*LPRECT*/ );
diff --git a/vcl/win/inc/saltimer.h b/vcl/win/inc/saltimer.h
index c24af459aa97..f81f769df6d9 100644
--- a/vcl/win/inc/saltimer.h
+++ b/vcl/win/inc/saltimer.h
@@ -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
@@ -37,8 +37,8 @@ public:
     virtual ~WinSalTimer();
 
     // overload all pure virtual methods
-    void            Start( ULONG nMS );
-    void            Stop();
+    void 			Start( ULONG nMS );
+    void 			Stop();
 };
 
 #endif
diff --git a/vcl/win/inc/salvd.h b/vcl/win/inc/salvd.h
index d0f32a6460a9..9d053cb50227 100644
--- a/vcl/win/inc/salvd.h
+++ b/vcl/win/inc/salvd.h
@@ -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
@@ -40,22 +40,22 @@ class WinSalGraphics;
 class WinSalVirtualDevice : public SalVirtualDevice
 {
 public:
-    HDC                     mhDC;                   // HDC or 0 for Cache Device
-    HBITMAP                 mhBmp;                  // Memory Bitmap
-    HBITMAP                 mhDefBmp;               // Default Bitmap
-    WinSalGraphics*         mpGraphics;             // current VirDev graphics
-    WinSalVirtualDevice*    mpNext;                 // next VirDev
-    USHORT                  mnBitCount;             // BitCount (0 or 1)
-    BOOL                    mbGraphics;             // is Graphics used
+    HDC 					mhDC;					// HDC or 0 for Cache Device
+    HBITMAP 				mhBmp;					// Memory Bitmap
+    HBITMAP 				mhDefBmp;				// Default Bitmap
+    WinSalGraphics*			mpGraphics; 			// current VirDev graphics
+    WinSalVirtualDevice*	mpNext; 				// next VirDev
+    USHORT					mnBitCount; 			// BitCount (0 or 1)
+    BOOL					mbGraphics; 			// is Graphics used
     BOOL                    mbForeignDC;            // uses a foreign DC instead of a bitmap
 
     WinSalVirtualDevice();
     virtual ~WinSalVirtualDevice();
 
-    virtual SalGraphics*            GetGraphics();
-    virtual void                    ReleaseGraphics( SalGraphics* pGraphics );
+    virtual SalGraphics*			GetGraphics();
+    virtual void					ReleaseGraphics( SalGraphics* pGraphics );
     virtual BOOL                    SetSize( long nNewDX, long nNewDY );
-    virtual void                    GetSize( long& rWidth, long& rHeight );
+    virtual void				    GetSize( long& rWidth, long& rHeight );
 };
 
 #endif // _SV_SALVD_H
diff --git a/vcl/win/inc/svsys.h b/vcl/win/inc/svsys.h
index 7b0e87304d59..d4729ec02258 100644
--- a/vcl/win/inc/svsys.h
+++ b/vcl/win/inc/svsys.h
@@ -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
diff --git a/vcl/win/inc/wincomp.hxx b/vcl/win/inc/wincomp.hxx
index 61e04779dbce..e25668f3088b 100644
--- a/vcl/win/inc/wincomp.hxx
+++ b/vcl/win/inc/wincomp.hxx
@@ -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
@@ -191,7 +191,7 @@ inline HINSTANCE GetWindowInstance( HWND hWnd )
 #define MSH_MOUSEWHEEL "MSWHEEL_ROLLMSG"
 
 #define MOUSEZ_CLASSNAME  "MouseZ"            // wheel window class
-#define MOUSEZ_TITLE      "Magellan MSWHEEL"  // wheel window title
+#define MOUSEZ_TITLE	  "Magellan MSWHEEL"  // wheel window title
 
 #define MSH_WHEELMODULE_CLASS (MOUSEZ_CLASSNAME)
 #define MSH_WHEELMODULE_TITLE (MOUSEZ_TITLE)
@@ -199,19 +199,19 @@ inline HINSTANCE GetWindowInstance( HWND hWnd )
 #define MSH_SCROLL_LINES "MSH_SCROLL_LINES_MSG"
 
 #ifndef WHEEL_DELTA
-#define WHEEL_DELTA                 120
+#define WHEEL_DELTA 				120
 #endif
 #ifndef WM_MOUSEWHEEL
-#define WM_MOUSEWHEEL               0x020A
+#define WM_MOUSEWHEEL				0x020A
 #endif
 #ifndef SPI_GETWHEELSCROLLLINES
-#define SPI_GETWHEELSCROLLLINES     104
+#define SPI_GETWHEELSCROLLLINES		104
 #endif
 #ifndef SPI_SETWHEELSCROLLLINES
-#define SPI_SETWHEELSCROLLLINES     105
+#define SPI_SETWHEELSCROLLLINES		105
 #endif
 #ifndef WHEEL_PAGESCROLL
-#define WHEEL_PAGESCROLL            (UINT_MAX)
+#define WHEEL_PAGESCROLL			(UINT_MAX)
 #endif
 
 
@@ -219,9 +219,9 @@ inline HINSTANCE GetWindowInstance( HWND hWnd )
 // - SystemAgent Erweiterungen -
 // -----------------------------
 
-#define ENABLE_AGENT            1
-#define DISABLE_AGENT           2
-#define GET_AGENT_STATUS        3
+#define ENABLE_AGENT			1
+#define DISABLE_AGENT			2
+#define GET_AGENT_STATUS		3
 typedef int (APIENTRY* SysAgt_Enable_PROC)( int );
 
 // ---------------------
@@ -229,10 +229,10 @@ typedef int (APIENTRY* SysAgt_Enable_PROC)( int );
 // ---------------------
 
 #ifndef COLOR_GRADIENTACTIVECAPTION
-#define COLOR_GRADIENTACTIVECAPTION     27
+#define COLOR_GRADIENTACTIVECAPTION 	27
 #endif
 #ifndef COLOR_GRADIENTINACTIVECAPTION
-#define COLOR_GRADIENTINACTIVECAPTION   28
+#define COLOR_GRADIENTINACTIVECAPTION	28
 #endif
 
 #ifndef SPI_GETFLATMENU
@@ -242,7 +242,7 @@ typedef int (APIENTRY* SysAgt_Enable_PROC)( int );
 #define COLOR_MENUBAR       30
 #endif
 #ifndef COLOR_MENUHILIGHT
-#define COLOR_MENUHILIGHT   29
+#define COLOR_MENUHILIGHT   29   
 #endif
 
 #ifndef CS_DROPSHADOW
diff --git a/vcl/win/source/app/saldata.cxx b/vcl/win/source/app/saldata.cxx
index bb8a198a96e6..3b9adf6c8819 100644
--- a/vcl/win/source/app/saldata.cxx
+++ b/vcl/win/source/app/saldata.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
@@ -91,9 +91,9 @@ UniString ImplSalGetUniString( const sal_Char* pStr, xub_StrLen nLen )
 
 int ImplSalWICompareAscii( const wchar_t* pStr1, const char* pStr2 )
 {
-    int         nRet;
-    wchar_t     c1;
-    char       c2;
+    int 		nRet;
+    wchar_t 	c1;
+    char	   c2;
     do
     {
         // Ist das Zeichen zwischen 'A' und 'Z' dann umwandeln
diff --git a/vcl/win/source/app/salinfo.cxx b/vcl/win/source/app/salinfo.cxx
index 14cb5d63437a..347df24177b2 100644
--- a/vcl/win/source/app/salinfo.cxx
+++ b/vcl/win/source/app/salinfo.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
@@ -119,19 +119,19 @@ bool WinSalSystem::initMonitors()
 {
     if( m_aMonitors.size() > 0 )
         return true;
-
+    
     bool winVerOk = true;
 
     // multi monitor calls not available on Win95/NT
     if ( aSalShlData.maVersionInfo.dwPlatformId == VER_PLATFORM_WIN32_NT )
     {
         if ( aSalShlData.maVersionInfo.dwMajorVersion <= 4 )
-            winVerOk = false;   // NT
+            winVerOk = false;	// NT
     }
     else if( aSalShlData.maVersionInfo.dwPlatformId == VER_PLATFORM_WIN32_WINDOWS )
     {
         if ( aSalShlData.maVersionInfo.dwMajorVersion == 4 && aSalShlData.maVersionInfo.dwMinorVersion == 0 )
-            winVerOk = false;   // Win95
+            winVerOk = false;	// Win95
     }
     if( winVerOk )
     {
@@ -217,7 +217,7 @@ bool WinSalSystem::initMonitors()
             m_aMonitors.back().m_aWorkArea =  Rectangle( aWorkRect.left, aWorkRect.top,
                                                          aWorkRect.right, aWorkRect.bottom );
     }
-
+    
     return m_aMonitors.size() > 0;
 }
 
diff --git a/vcl/win/source/app/salinst.cxx b/vcl/win/source/app/salinst.cxx
index 97dbb5285cca..bc2ab1711f23 100644
--- a/vcl/win/source/app/salinst.cxx
+++ b/vcl/win/source/app/salinst.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
@@ -51,14 +51,14 @@
 #include <salbmp.h>
 #include <vcl/salimestatus.hxx>
 #include <vcl/timer.hxx>
-#include <wincomp.hxx>  // CS_DROPSHADOW
+#include <wincomp.hxx>	// CS_DROPSHADOW
 #include <tools/solarmutex.hxx>
 
 #ifndef min
-#define min(a,b)    (((a) < (b)) ? (a) : (b))
+#define min(a,b)	(((a) < (b)) ? (a) : (b))
 #endif
 #ifndef max
-#define max(a,b)    (((a) > (b)) ? (a) : (b))
+#define max(a,b)	(((a) > (b)) ? (a) : (b))
 #endif
 
 #if defined _MSC_VER
@@ -368,7 +368,7 @@ void SalData::initKeyCodeMap()
     initKey( '+', KEY_ADD );
     initKey( '-', KEY_SUBTRACT );
     initKey( '*', KEY_MULTIPLY );
-    initKey( '/', KEY_DIVIDE );
+    initKey( '/', KEY_DIVIDE );                                             
     initKey( '.', KEY_POINT );
     initKey( ',', KEY_COMMA );
     initKey( '<', KEY_LESS );
@@ -439,7 +439,7 @@ SalData::SalData()
 
     // init with NULL
     gdiplusToken = 0;
-
+    
     initKeyCodeMap();
 
     SetSalData( this );
@@ -715,7 +715,7 @@ void ImplSalYield( BOOL bWait, BOOL bHandleAllCurrentEvents )
 {
     MSG aMsg;
     bool bWasMsg = false, bOneEvent = false;
-
+    
     int nMaxEvents = bHandleAllCurrentEvents ? 100 : 1;
     do
     {
@@ -755,7 +755,7 @@ void WinSalInstance::Yield( bool bWait, bool bHandleAllCurrentEvents )
     }
     if ( pSalData->mnAppThreadId != nCurThreadId )
     {
-        // #97739# A SendMessage call blocks until the called thread (here: the main thread)
+        // #97739# A SendMessage call blocks until the called thread (here: the main thread) 
         // returns. During a yield however, messages are processed in the main thread that might
         // result in a new message loop due to opening a dialog. Thus, SendMessage would not
         // return which will block this thread!
@@ -840,7 +840,7 @@ LRESULT CALLBACK SalComWndProc( HWND hWnd, UINT nMsg, WPARAM wParam, LPARAM lPar
             break;
         case SAL_MSG_DESTROYHWND:
             //We only destroy the native window here. We do NOT destroy the SalFrame contained
-            //in the structure (GetWindowPtr()).
+            //in the structure (GetWindowPtr()). 
             if (DestroyWindow((HWND)lParam) == 0)
             {
                 OSL_ENSURE(0, "DestroyWindow failed!");
@@ -980,7 +980,7 @@ bool WinSalInstance::AnyInput( USHORT nType )
             if ( ImplPeekMessage( &aMsg, 0, WM_PAINT, WM_PAINT,
                                   PM_NOREMOVE | PM_NOYIELD ) )
                 return true;
-
+            
             if ( ImplPeekMessage( &aMsg, 0, WM_SIZE, WM_SIZE,
                                   PM_NOREMOVE | PM_NOYIELD ) )
                 return true;
@@ -1067,7 +1067,7 @@ void WinSalInstance::DestroyFrame( SalFrame* pFrame )
 
 SalObject* WinSalInstance::CreateObject( SalFrame* pParent,
                                          SystemWindowData* /*pWindowData*/, // SystemWindowData meaningless on Windows
-                                         BOOL /*bShow*/ )
+                                         BOOL /*bShow*/ ) 
 {
     // Um auf Main-Thread umzuschalten
     return (SalObject*)ImplSendMessage( mhComWnd, SAL_MSG_CREATEOBJECT, 0, (LPARAM)static_cast<WinSalFrame*>(pParent) );
@@ -1092,9 +1092,9 @@ void* WinSalInstance::GetConnectionIdentifier( ConnectionIdentifierType& rReturn
 // -----------------------------------------------------------------------
 
 /** Add a file to the system shells recent document list if there is any.
-      This function may have no effect under Unix because there is no
+      This function may have no effect under Unix because there is no 
       standard API among the different desktop managers.
-
+      
       @param aFileUrl
                 The file url of the document.
 */
@@ -1102,11 +1102,11 @@ void WinSalInstance::AddToRecentDocumentList(const rtl::OUString& rFileUrl, cons
 {
     rtl::OUString system_path;
     osl::FileBase::RC rc = osl::FileBase::getSystemPathFromFileURL(rFileUrl, system_path);
-
+    
     OSL_ENSURE(osl::FileBase::E_None == rc, "Invalid file url");
-
+    
     if (osl::FileBase::E_None == rc)
-        SHAddToRecentDocs(SHARD_PATHW, system_path.getStr());
+        SHAddToRecentDocs(SHARD_PATHW, system_path.getStr());        
 }
 
 // -----------------------------------------------------------------------
@@ -1128,7 +1128,7 @@ class WinImeStatus : public SalI18NImeStatus
   public:
     WinImeStatus() {}
     virtual ~WinImeStatus() {}
-
+    
     // asks whether there is a status window available
     // to toggle into menubar
     virtual bool canToggle() { return false; }
diff --git a/vcl/win/source/app/salshl.cxx b/vcl/win/source/app/salshl.cxx
index 0f3b0c41e258..a12fbb11a5d9 100644
--- a/vcl/win/source/app/salshl.cxx
+++ b/vcl/win/source/app/salshl.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
diff --git a/vcl/win/source/app/saltimer.cxx b/vcl/win/source/app/saltimer.cxx
index d512be753f9c..3525e4c43523 100644
--- a/vcl/win/source/app/saltimer.cxx
+++ b/vcl/win/source/app/saltimer.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
@@ -38,7 +38,7 @@
 // =======================================================================
 
 // Maximale Periode
-#define MAX_SYSPERIOD     65533
+#define MAX_SYSPERIOD	  65533
 
 // =======================================================================
 
@@ -117,7 +117,7 @@ void CALLBACK SalTimerProc( HWND, UINT, UINT_PTR nId, DWORD )
 
         // Test for MouseLeave
         SalTestMouseLeave();
-
+        
         bool bRecursive = pSalData->mbInTimerProc && (nId != SALTIMERPROC_RECURSIVE);
         if ( pSVData->mpSalTimer && ! bRecursive )
         {
@@ -132,7 +132,7 @@ void CALLBACK SalTimerProc( HWND, UINT, UINT_PTR nId, DWORD )
                     pSVData->mpSalTimer->CallCallback();
                     pSalData->mbInTimerProc = FALSE;
                     ImplSalYieldMutexRelease();
-
+    
                     // Run the timer in the correct time, if we start this
                     // with a small timeout, because we don't get the mutex
                     if ( pSalData->mnTimerId &&
diff --git a/vcl/win/source/gdi/salbmp.cxx b/vcl/win/source/gdi/salbmp.cxx
index 444df039dd69..2df1488665a6 100644
--- a/vcl/win/source/gdi/salbmp.cxx
+++ b/vcl/win/source/gdi/salbmp.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
@@ -53,9 +53,9 @@ inline void ImplSetPixel4( const HPBYTE pScanline, long nX, const BYTE cIndex )
 // ----------------
 
 WinSalBitmap::WinSalBitmap() :
-        mhDIB       ( 0 ),
-        mhDDB       ( 0 ),
-        mnBitCount  ( 0 )
+        mhDIB		( 0 ),
+        mhDDB		( 0 ),
+        mnBitCount	( 0 )
 {
 }
 
@@ -91,7 +91,7 @@ bool WinSalBitmap::Create( HANDLE hBitmap, bool bDIB, bool bCopyHandle )
     }
     else if( mhDDB )
     {
-        BITMAP  aDDBInfo;
+        BITMAP	aDDBInfo;
 
         if( WIN_GetObject( mhDDB, sizeof( BITMAP ), &aDDBInfo ) )
         {
@@ -175,12 +175,12 @@ bool WinSalBitmap::Create( const SalBitmap& rSSalBmp, SalGraphics* pSGraphics )
 
     if( rSalBmp.mhDIB )
     {
-        PBITMAPINFO         pBI = (PBITMAPINFO) GlobalLock( rSalBmp.mhDIB );
-        PBITMAPINFOHEADER   pBIH = (PBITMAPINFOHEADER) pBI;
-        HDC                 hDC  = pGraphics->mhDC;
-        HBITMAP             hNewDDB;
-        BITMAP              aDDBInfo;
-        PBYTE               pBits = (PBYTE) pBI + *(DWORD*) pBI +
+        PBITMAPINFO 		pBI = (PBITMAPINFO) GlobalLock( rSalBmp.mhDIB );
+        PBITMAPINFOHEADER	pBIH = (PBITMAPINFOHEADER) pBI;
+        HDC 				hDC  = pGraphics->mhDC;
+        HBITMAP 			hNewDDB;
+        BITMAP				aDDBInfo;
+        PBYTE				pBits = (PBYTE) pBI + *(DWORD*) pBI +
                             ImplGetDIBColorCount( rSalBmp.mhDIB ) * sizeof( RGBQUAD );
 
         if( pBIH->biBitCount == 1 )
@@ -225,12 +225,12 @@ bool WinSalBitmap::Create( const SalBitmap& rSSalBmp, USHORT nNewBitCount )
         if( mhDIB )
         {
             PBITMAPINFO pBI = (PBITMAPINFO) GlobalLock( mhDIB );
-            const int   nLines = (int) rSalBmp.maSize.Height();
-            HDC         hDC = GetDC( 0 );
-            PBYTE       pBits = (PBYTE) pBI + *(DWORD*) pBI +
+            const int	nLines = (int) rSalBmp.maSize.Height();
+            HDC 		hDC = GetDC( 0 );
+            PBYTE		pBits = (PBYTE) pBI + *(DWORD*) pBI +
                                 ImplGetDIBColorCount( mhDIB ) * sizeof( RGBQUAD );
-            SalData*    pSalData = GetSalData();
-            HPALETTE    hOldPal = 0;
+            SalData*	pSalData = GetSalData();
+            HPALETTE	hOldPal = 0;
 
             if ( pSalData->mhDitherPal )
             {
@@ -283,8 +283,8 @@ USHORT WinSalBitmap::ImplGetDIBColorCount( HGLOBAL hDIB )
 
     if( hDIB )
     {
-        PBITMAPINFO         pBI = (PBITMAPINFO) GlobalLock( hDIB );
-        PBITMAPINFOHEADER   pBIH = (PBITMAPINFOHEADER) pBI;
+        PBITMAPINFO 		pBI = (PBITMAPINFO) GlobalLock( hDIB );
+        PBITMAPINFOHEADER	pBIH = (PBITMAPINFOHEADER) pBI;
 
         if ( pBIH->biSize != sizeof( BITMAPCOREHEADER ) )
         {
@@ -315,15 +315,15 @@ HGLOBAL WinSalBitmap::ImplCreateDIB( const Size& rSize, USHORT nBits, const Bitm
 
     if ( rSize.Width() && rSize.Height() )
     {
-        const ULONG     nImageSize = AlignedWidth4Bytes( nBits * rSize.Width() ) * rSize.Height();
-        const USHORT    nColors = ( nBits <= 8 ) ? ( 1 << nBits ) : 0;
+        const ULONG 	nImageSize = AlignedWidth4Bytes( nBits * rSize.Width() ) * rSize.Height();
+        const USHORT	nColors = ( nBits <= 8 ) ? ( 1 << nBits ) : 0;
 
         hDIB = GlobalAlloc( GHND, sizeof( BITMAPINFOHEADER ) + nColors * sizeof( RGBQUAD ) + nImageSize );
 
         if( hDIB )
         {
-            PBITMAPINFO         pBI = (PBITMAPINFO) GlobalLock( hDIB );
-            PBITMAPINFOHEADER   pBIH = (PBITMAPINFOHEADER) pBI;
+            PBITMAPINFO 		pBI = (PBITMAPINFO) GlobalLock( hDIB );
+            PBITMAPINFOHEADER	pBIH = (PBITMAPINFOHEADER) pBI;
 
             pBIH->biSize = sizeof( BITMAPINFOHEADER );
             pBIH->biWidth = rSize.Width();
@@ -356,7 +356,7 @@ HGLOBAL WinSalBitmap::ImplCreateDIB( const Size& rSize, USHORT nBits, const Bitm
 
 HANDLE WinSalBitmap::ImplCopyDIBOrDDB( HANDLE hHdl, bool bDIB )
 {
-    HANDLE  hCopy = 0;
+    HANDLE	hCopy = 0;
 
     if ( bDIB && hHdl )
     {
@@ -380,9 +380,9 @@ HANDLE WinSalBitmap::ImplCopyDIBOrDDB( HANDLE hHdl, bool bDIB )
         // Destination-Bitmap erzeugen
         if ( (hCopy = CreateBitmapIndirect( &aBmp )) != 0 )
         {
-            HDC     hBmpDC = CreateCompatibleDC( 0 );
+            HDC 	hBmpDC = CreateCompatibleDC( 0 );
             HBITMAP hBmpOld = (HBITMAP) SelectObject( hBmpDC, hHdl );
-            HDC     hCopyDC = CreateCompatibleDC( hBmpDC );
+            HDC 	hCopyDC = CreateCompatibleDC( hBmpDC );
             HBITMAP hCopyOld = (HBITMAP) SelectObject( hCopyDC, hCopy );
 
             BitBlt( hCopyDC, 0, 0, aBmp.bmWidth, aBmp.bmHeight, hBmpDC, 0, 0, SRCCOPY );
@@ -406,22 +406,22 @@ BitmapBuffer* WinSalBitmap::AcquireBuffer( bool /*bReadOnly*/ )
 
     if( mhDIB )
     {
-        PBITMAPINFO         pBI = (PBITMAPINFO) GlobalLock( mhDIB );
-        PBITMAPINFOHEADER   pBIH = (PBITMAPINFOHEADER) pBI;
+        PBITMAPINFO 		pBI = (PBITMAPINFO) GlobalLock( mhDIB );
+        PBITMAPINFOHEADER	pBIH = (PBITMAPINFOHEADER) pBI;
 
         if( ( pBIH->biCompression == BI_RLE4 ) || ( pBIH->biCompression == BI_RLE8 ) )
         {
-            Size    aSizePix( pBIH->biWidth, pBIH->biHeight );
+            Size	aSizePix( pBIH->biWidth, pBIH->biHeight );
             HGLOBAL hNewDIB = ImplCreateDIB( aSizePix, pBIH->biBitCount, BitmapPalette() );
 
             if( hNewDIB )
             {
-                PBITMAPINFO         pNewBI = (PBITMAPINFO) GlobalLock( hNewDIB );
-                PBITMAPINFOHEADER   pNewBIH = (PBITMAPINFOHEADER) pNewBI;
-                const USHORT        nColorCount = ImplGetDIBColorCount( hNewDIB );
-                const ULONG         nOffset = *(DWORD*) pBI + nColorCount * sizeof( RGBQUAD );
-                BYTE*               pOldBits = (PBYTE) pBI + nOffset;
-                BYTE*               pNewBits = (PBYTE) pNewBI + nOffset;
+                PBITMAPINFO 		pNewBI = (PBITMAPINFO) GlobalLock( hNewDIB );
+                PBITMAPINFOHEADER	pNewBIH = (PBITMAPINFOHEADER) pNewBI;
+                const USHORT		nColorCount = ImplGetDIBColorCount( hNewDIB );
+                const ULONG 		nOffset = *(DWORD*) pBI + nColorCount * sizeof( RGBQUAD );
+                BYTE*				pOldBits = (PBYTE) pBI + nOffset;
+                BYTE*				pNewBits = (PBYTE) pNewBI + nOffset;
 
                 memcpy( pNewBI, pBI, nOffset );
                 pNewBIH->biCompression = 0;
@@ -507,8 +507,8 @@ void WinSalBitmap::ReleaseBuffer( BitmapBuffer* pBuffer, bool bReadOnly )
         {
             if( !bReadOnly && !!pBuffer->maPalette )
             {
-                PBITMAPINFO     pBI = (PBITMAPINFO) GlobalLock( mhDIB );
-                const USHORT    nCount = pBuffer->maPalette.GetEntryCount();
+                PBITMAPINFO 	pBI = (PBITMAPINFO) GlobalLock( mhDIB );
+                const USHORT	nCount = pBuffer->maPalette.GetEntryCount();
 
                 memcpy( pBI->bmiColors, pBuffer->maPalette.ImplGetColorBuffer(), nCount * sizeof( RGBQUAD ) );
                 GlobalUnlock( mhDIB );
@@ -526,17 +526,17 @@ void WinSalBitmap::ReleaseBuffer( BitmapBuffer* pBuffer, bool bReadOnly )
 void WinSalBitmap::ImplDecodeRLEBuffer( const BYTE* pSrcBuf, BYTE* pDstBuf,
                                      const Size& rSizePixel, bool bRLE4 )
 {
-    HPBYTE          pRLE = (HPBYTE) pSrcBuf;
-    HPBYTE          pDIB = (HPBYTE) pDstBuf;
-    HPBYTE          pRow = (HPBYTE) pDstBuf;
-    ULONG           nWidthAl = AlignedWidth4Bytes( rSizePixel.Width() * ( bRLE4 ? 4UL : 8UL ) );
-    HPBYTE          pLast = pDIB + rSizePixel.Height() * nWidthAl - 1;
-    ULONG           nCountByte;
-    ULONG           nRunByte;
-    ULONG           nX = 0;
-    ULONG           i;
-    BYTE            cTmp;
-    bool            bEndDecoding = FALSE;
+    HPBYTE			pRLE = (HPBYTE) pSrcBuf;
+    HPBYTE			pDIB = (HPBYTE) pDstBuf;
+    HPBYTE			pRow = (HPBYTE) pDstBuf;
+    ULONG			nWidthAl = AlignedWidth4Bytes( rSizePixel.Width() * ( bRLE4 ? 4UL : 8UL ) );
+    HPBYTE			pLast = pDIB + rSizePixel.Height() * nWidthAl - 1;
+    ULONG			nCountByte;
+    ULONG			nRunByte;
+    ULONG			nX = 0;
+    ULONG			i;
+    BYTE			cTmp;
+    bool			bEndDecoding = FALSE;
 
     if( pRLE && pDIB )
     {
diff --git a/vcl/win/source/gdi/salgdi.cxx b/vcl/win/source/gdi/salgdi.cxx
index eb260eb808c6..c964d971d608 100644
--- a/vcl/win/source/gdi/salgdi.cxx
+++ b/vcl/win/source/gdi/salgdi.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
@@ -50,19 +50,19 @@ using namespace rtl;
 
 // =======================================================================
 
-#define DITHER_PAL_DELTA                51
-#define DITHER_PAL_STEPS                6
-#define DITHER_PAL_COUNT                (DITHER_PAL_STEPS*DITHER_PAL_STEPS*DITHER_PAL_STEPS)
-#define DITHER_MAX_SYSCOLOR             16
-#define DITHER_EXTRA_COLORS             1
-#define DMAP( _def_nVal, _def_nThres )  ((pDitherDiff[_def_nVal]>(_def_nThres))?pDitherHigh[_def_nVal]:pDitherLow[_def_nVal])
+#define DITHER_PAL_DELTA				51
+#define DITHER_PAL_STEPS				6
+#define DITHER_PAL_COUNT				(DITHER_PAL_STEPS*DITHER_PAL_STEPS*DITHER_PAL_STEPS)
+#define DITHER_MAX_SYSCOLOR 			16
+#define DITHER_EXTRA_COLORS 			1
+#define DMAP( _def_nVal, _def_nThres )	((pDitherDiff[_def_nVal]>(_def_nThres))?pDitherHigh[_def_nVal]:pDitherLow[_def_nVal])
 
 // =======================================================================
 
 struct SysColorEntry
 {
-    DWORD           nRGB;
-    SysColorEntry*  pNext;
+    DWORD			nRGB;
+    SysColorEntry*	pNext;
 };
 
 // =======================================================================
@@ -82,21 +82,21 @@ static PALETTEENTRY aImplExtraColor1 =
 
 static PALETTEENTRY aImplSalSysPalEntryAry[ DITHER_MAX_SYSCOLOR ] =
 {
-{    0,    0,    0, 0 },
-{    0,    0, 0x80, 0 },
-{    0, 0x80,    0, 0 },
-{    0, 0x80, 0x80, 0 },
-{ 0x80,    0,    0, 0 },
+{	 0,    0,	 0, 0 },
+{	 0,    0, 0x80, 0 },
+{	 0, 0x80,	 0, 0 },
+{	 0, 0x80, 0x80, 0 },
+{ 0x80,    0,	 0, 0 },
 { 0x80,    0, 0x80, 0 },
-{ 0x80, 0x80,    0, 0 },
+{ 0x80, 0x80,	 0, 0 },
 { 0x80, 0x80, 0x80, 0 },
 { 0xC0, 0xC0, 0xC0, 0 },
-{    0,    0, 0xFF, 0 },
-{    0, 0xFF,    0, 0 },
-{    0, 0xFF, 0xFF, 0 },
-{ 0xFF,    0,    0, 0 },
+{	 0,    0, 0xFF, 0 },
+{	 0, 0xFF,	 0, 0 },
+{	 0, 0xFF, 0xFF, 0 },
+{ 0xFF,    0,	 0, 0 },
 { 0xFF,    0, 0xFF, 0 },
-{ 0xFF, 0xFF,    0, 0 },
+{ 0xFF, 0xFF,	 0, 0 },
 { 0xFF, 0xFF, 0xFF, 0 }
 };
 
@@ -133,12 +133,12 @@ static BYTE aOrdDither16Bit[8][8] =
 // Pens muessen wir mit 1 Pixel-Breite erzeugen, da ansonsten die S3-Karte
 // viele Paintprobleme hat, wenn Polygone/PolyLines gezeichnet werden und
 // eine komplexe ClipRegion gesetzt ist
-#define GSL_PEN_WIDTH                   1
+#define GSL_PEN_WIDTH					1
 
 // =======================================================================
 
-#define SAL_POLYPOLYCOUNT_STACKBUF          8
-#define SAL_POLYPOLYPOINTS_STACKBUF         64
+#define SAL_POLYPOLYCOUNT_STACKBUF			8
+#define SAL_POLYPOLYPOINTS_STACKBUF 		64
 
 // =======================================================================
 
@@ -147,24 +147,24 @@ void ImplInitSalGDI()
     SalData* pSalData = GetSalData();
 
     // init stock brushes
-    pSalData->maStockPenColorAry[0]     = PALETTERGB( 0, 0, 0 );
-    pSalData->maStockPenColorAry[1]     = PALETTERGB( 0xFF, 0xFF, 0xFF );
-    pSalData->maStockPenColorAry[2]     = PALETTERGB( 0xC0, 0xC0, 0xC0 );
-    pSalData->maStockPenColorAry[3]     = PALETTERGB( 0x80, 0x80, 0x80 );
-    pSalData->mhStockPenAry[0]          = CreatePen( PS_SOLID, GSL_PEN_WIDTH, pSalData->maStockPenColorAry[0] );
-    pSalData->mhStockPenAry[1]          = CreatePen( PS_SOLID, GSL_PEN_WIDTH, pSalData->maStockPenColorAry[1] );
-    pSalData->mhStockPenAry[2]          = CreatePen( PS_SOLID, GSL_PEN_WIDTH, pSalData->maStockPenColorAry[2] );
-    pSalData->mhStockPenAry[3]          = CreatePen( PS_SOLID, GSL_PEN_WIDTH, pSalData->maStockPenColorAry[3] );
+    pSalData->maStockPenColorAry[0] 	= PALETTERGB( 0, 0, 0 );
+    pSalData->maStockPenColorAry[1] 	= PALETTERGB( 0xFF, 0xFF, 0xFF );
+    pSalData->maStockPenColorAry[2] 	= PALETTERGB( 0xC0, 0xC0, 0xC0 );
+    pSalData->maStockPenColorAry[3] 	= PALETTERGB( 0x80, 0x80, 0x80 );
+    pSalData->mhStockPenAry[0]			= CreatePen( PS_SOLID, GSL_PEN_WIDTH, pSalData->maStockPenColorAry[0] );
+    pSalData->mhStockPenAry[1]			= CreatePen( PS_SOLID, GSL_PEN_WIDTH, pSalData->maStockPenColorAry[1] );
+    pSalData->mhStockPenAry[2]			= CreatePen( PS_SOLID, GSL_PEN_WIDTH, pSalData->maStockPenColorAry[2] );
+    pSalData->mhStockPenAry[3]			= CreatePen( PS_SOLID, GSL_PEN_WIDTH, pSalData->maStockPenColorAry[3] );
     pSalData->mnStockPenCount = 4;
 
-    pSalData->maStockBrushColorAry[0]   = PALETTERGB( 0, 0, 0 );
-    pSalData->maStockBrushColorAry[1]   = PALETTERGB( 0xFF, 0xFF, 0xFF );
-    pSalData->maStockBrushColorAry[2]   = PALETTERGB( 0xC0, 0xC0, 0xC0 );
-    pSalData->maStockBrushColorAry[3]   = PALETTERGB( 0x80, 0x80, 0x80 );
-    pSalData->mhStockBrushAry[0]        = CreateSolidBrush( pSalData->maStockBrushColorAry[0] );
-    pSalData->mhStockBrushAry[1]        = CreateSolidBrush( pSalData->maStockBrushColorAry[1] );
-    pSalData->mhStockBrushAry[2]        = CreateSolidBrush( pSalData->maStockBrushColorAry[2] );
-    pSalData->mhStockBrushAry[3]        = CreateSolidBrush( pSalData->maStockBrushColorAry[3] );
+    pSalData->maStockBrushColorAry[0]	= PALETTERGB( 0, 0, 0 );
+    pSalData->maStockBrushColorAry[1]	= PALETTERGB( 0xFF, 0xFF, 0xFF );
+    pSalData->maStockBrushColorAry[2]	= PALETTERGB( 0xC0, 0xC0, 0xC0 );
+    pSalData->maStockBrushColorAry[3]	= PALETTERGB( 0x80, 0x80, 0x80 );
+    pSalData->mhStockBrushAry[0]		= CreateSolidBrush( pSalData->maStockBrushColorAry[0] );
+    pSalData->mhStockBrushAry[1]		= CreateSolidBrush( pSalData->maStockBrushColorAry[1] );
+    pSalData->mhStockBrushAry[2]		= CreateSolidBrush( pSalData->maStockBrushColorAry[2] );
+    pSalData->mhStockBrushAry[3]		= CreateSolidBrush( pSalData->maStockBrushColorAry[3] );
     pSalData->mnStockBrushCount = 4;
 
     // initialize cache of device contexts
@@ -184,12 +184,12 @@ void ImplInitSalGDI()
     if ( (nBitCount > 8) && (nBitCount < 24) )
     {
         // test, if we have to dither
-        HDC         hMemDC = ::CreateCompatibleDC( hDC );
-        HBITMAP     hMemBmp = ::CreateCompatibleBitmap( hDC, 8, 8 );
-        HBITMAP     hBmpOld = (HBITMAP) ::SelectObject( hMemDC, hMemBmp );
-        HBRUSH      hMemBrush = ::CreateSolidBrush( PALETTERGB( 175, 171, 169 ) );
-        HBRUSH      hBrushOld = (HBRUSH) ::SelectObject( hMemDC, hMemBrush );
-        BOOL        bDither16 = TRUE;
+        HDC 		hMemDC = ::CreateCompatibleDC( hDC );
+        HBITMAP 	hMemBmp = ::CreateCompatibleBitmap( hDC, 8, 8 );
+        HBITMAP 	hBmpOld = (HBITMAP) ::SelectObject( hMemDC, hMemBmp );
+        HBRUSH		hMemBrush = ::CreateSolidBrush( PALETTERGB( 175, 171, 169 ) );
+        HBRUSH		hBrushOld = (HBRUSH) ::SelectObject( hMemDC, hMemBrush );
+        BOOL		bDither16 = TRUE;
 
         ::PatBlt( hMemDC, 0, 0, 8, 8, PATCOPY );
         const COLORREF aCol( ::GetPixel( hMemDC, 0, 0 ) );
@@ -236,12 +236,12 @@ void ImplInitSalGDI()
     }
     else if ( (nRasterCaps & RC_PALETTE) && (nBitCount == 8) )
     {
-        BYTE            nRed, nGreen, nBlue;
-        BYTE            nR, nG, nB;
-        PALETTEENTRY*   pPalEntry;
-        LOGPALETTE*     pLogPal;
-        const USHORT    nDitherPalCount = DITHER_PAL_COUNT;
-        ULONG           nTotalCount = DITHER_MAX_SYSCOLOR + nDitherPalCount + DITHER_EXTRA_COLORS;
+        BYTE			nRed, nGreen, nBlue;
+        BYTE			nR, nG, nB;
+        PALETTEENTRY*	pPalEntry;
+        LOGPALETTE* 	pLogPal;
+        const USHORT	nDitherPalCount = DITHER_PAL_COUNT;
+        ULONG			nTotalCount = DITHER_MAX_SYSCOLOR + nDitherPalCount + DITHER_EXTRA_COLORS;
 
         // create logical palette
         pLogPal = (LOGPALETTE*) new char[ sizeof( LOGPALETTE ) + ( nTotalCount * sizeof( PALETTEENTRY ) ) ];
@@ -290,8 +290,8 @@ void ImplInitSalGDI()
             pSalData->mpDitherDIBData = pSalData->mpDitherDIB + sizeof( BITMAPINFOHEADER ) + ( 256 * sizeof( short ) );
             memset( pSalData->mpDitherDIB, 0, sizeof( BITMAPINFOHEADER ) );
 
-            BITMAPINFOHEADER*   pBIH = (BITMAPINFOHEADER*) pSalData->mpDitherDIB;
-            short*              pColors = (short*) ( pSalData->mpDitherDIB + sizeof( BITMAPINFOHEADER ) );
+            BITMAPINFOHEADER*	pBIH = (BITMAPINFOHEADER*) pSalData->mpDitherDIB;
+            short*				pColors = (short*) ( pSalData->mpDitherDIB + sizeof( BITMAPINFOHEADER ) );
 
             pBIH->biSize = sizeof( BITMAPINFOHEADER );
             pBIH->biWidth = 8;
@@ -323,10 +323,10 @@ void ImplInitSalGDI()
 
 void ImplFreeSalGDI()
 {
-    SalData*    pSalData = GetSalData();
+    SalData*	pSalData = GetSalData();
 
     // destroy stock objects
-    int i;
+    int	i;
     for ( i = 0; i < pSalData->mnStockPenCount; i++ )
         DeletePen( pSalData->mhStockPenAry[i] );
     for ( i = 0; i < pSalData->mnStockBrushCount; i++ )
@@ -425,8 +425,8 @@ static int ImplIsPaletteEntry( BYTE nRed, BYTE nGreen, BYTE nBlue )
 
 int ImplIsSysColorEntry( SalColor nSalColor )
 {
-    SysColorEntry*  pEntry = pFirstSysColor;
-    const DWORD     nTestRGB = (DWORD)RGB( SALCOLOR_RED( nSalColor ),
+    SysColorEntry*	pEntry = pFirstSysColor;
+    const DWORD 	nTestRGB = (DWORD)RGB( SALCOLOR_RED( nSalColor ),
                                            SALCOLOR_GREEN( nSalColor ),
                                            SALCOLOR_BLUE( nSalColor ) );
 
@@ -553,8 +553,8 @@ void ImplSalDeInitGraphics( WinSalGraphics* pData )
 
 HDC ImplGetCachedDC( ULONG nID, HBITMAP hBmp )
 {
-    SalData*    pSalData = GetSalData();
-    HDCCache*   pC = &pSalData->mpHDCCache[ nID ];
+    SalData*	pSalData = GetSalData();
+    HDCCache*	pC = &pSalData->mpHDCCache[ nID ];
 
     if( !pC->mhDC )
     {
@@ -587,8 +587,8 @@ HDC ImplGetCachedDC( ULONG nID, HBITMAP hBmp )
 
 void ImplReleaseCachedDC( ULONG nID )
 {
-    SalData*    pSalData = GetSalData();
-    HDCCache*   pC = &pSalData->mpHDCCache[ nID ];
+    SalData*	pSalData = GetSalData();
+    HDCCache*	pC = &pSalData->mpHDCCache[ nID ];
 
     if ( pC->mhActBmp )
         SelectObject( pC->mhDC, pC->mhSelBmp );
@@ -620,13 +620,13 @@ void ImplClearHDCCache( SalData* pData )
 // #100127# Fill point and flag memory from array of points which
 // might also contain bezier control points for the PolyDraw() GDI method
 // Make sure pWinPointAry and pWinFlagAry are big enough
-void ImplPreparePolyDraw( bool                      bCloseFigures,
-                          ULONG                     nPoly,
-                          const ULONG*              pPoints,
-                          const SalPoint* const*    pPtAry,
-                          const BYTE* const*        pFlgAry,
-                          POINT*                    pWinPointAry,
-                          BYTE*                     pWinFlagAry     )
+void ImplPreparePolyDraw( bool						bCloseFigures,
+                          ULONG 					nPoly,
+                          const ULONG* 				pPoints,
+                          const SalPoint* const* 	pPtAry,
+                          const BYTE* const* 		pFlgAry,
+                          POINT* 					pWinPointAry,
+                          BYTE* 					pWinFlagAry		)
 {
     ULONG nCurrPoly;
     for( nCurrPoly=0; nCurrPoly<nPoly; ++nCurrPoly )
@@ -731,24 +731,24 @@ WinSalGraphics::WinSalGraphics()
 
     mfFontScale = 1.0;
 
-    mhDC                = 0;
-    mhPen               = 0;
-    mhBrush             = 0;
-    mhRegion            = 0;
-    mhDefPen            = 0;
-    mhDefBrush          = 0;
-    mhDefFont           = 0;
-    mhDefPal            = 0;
-    mpStdClipRgnData    = NULL;
-    mpLogFont           = NULL;
-    mpFontCharSets      = NULL;
-    mpFontAttrCache     = NULL;
-    mnFontCharSetCount  = 0;
-    mpFontKernPairs     = NULL;
-    mnFontKernPairCount = 0;
-    mbFontKernInit      = FALSE;
-    mbXORMode           = FALSE;
-    mnPenWidth          = GSL_PEN_WIDTH;
+    mhDC 				= 0;
+    mhPen				= 0;
+    mhBrush				= 0;
+    mhRegion 			= 0;
+    mhDefPen 			= 0;
+    mhDefBrush			= 0;
+    mhDefFont			= 0;
+    mhDefPal 			= 0;
+    mpStdClipRgnData 	= NULL;
+    mpLogFont			= NULL;
+    mpFontCharSets		= NULL;
+    mpFontAttrCache		= NULL;
+    mnFontCharSetCount	= 0;
+    mpFontKernPairs		= NULL;
+    mnFontKernPairCount	= 0;
+    mbFontKernInit		= FALSE;
+    mbXORMode			= FALSE;
+    mnPenWidth			= GSL_PEN_WIDTH;
 }
 
 // -----------------------------------------------------------------------
@@ -866,13 +866,13 @@ void WinSalGraphics::BeginSetClipRegion( ULONG nRectCount )
     }
     else
         mpClipRgnData = (RGNDATA*)new BYTE[sizeof(RGNDATA)-1+nRectBufSize];
-    mpClipRgnData->rdh.dwSize   = sizeof( RGNDATAHEADER );
-    mpClipRgnData->rdh.iType    = RDH_RECTANGLES;
-    mpClipRgnData->rdh.nCount   = nRectCount;
-    mpClipRgnData->rdh.nRgnSize = nRectBufSize;
+    mpClipRgnData->rdh.dwSize	= sizeof( RGNDATAHEADER );
+    mpClipRgnData->rdh.iType 	= RDH_RECTANGLES;
+    mpClipRgnData->rdh.nCount	= nRectCount;
+    mpClipRgnData->rdh.nRgnSize	= nRectBufSize;
     SetRectEmpty( &(mpClipRgnData->rdh.rcBound) );
-    mpNextClipRect          = (RECT*)(&(mpClipRgnData->Buffer));
-    mbFirstClipRect         = TRUE;
+    mpNextClipRect			= (RECT*)(&(mpClipRgnData->Buffer));
+    mbFirstClipRect			= TRUE;
 }
 
 
@@ -882,17 +882,17 @@ BOOL WinSalGraphics::unionClipRegion( long nX, long nY, long nWidth, long nHeigh
 {
     if ( nWidth && nHeight )
     {
-        RECT*       pRect = mpNextClipRect;
-        RECT*       pBoundRect = &(mpClipRgnData->rdh.rcBound);
-        long        nRight = nX + nWidth;
-        long        nBottom = nY + nHeight;
+        RECT*		pRect = mpNextClipRect;
+        RECT*		pBoundRect = &(mpClipRgnData->rdh.rcBound);
+        long		nRight = nX + nWidth;
+        long		nBottom = nY + nHeight;
 
         if ( mbFirstClipRect )
         {
-            pBoundRect->left    = nX;
-            pBoundRect->top     = nY;
-            pBoundRect->right   = nRight;
-            pBoundRect->bottom  = nBottom;
+            pBoundRect->left	= nX;
+            pBoundRect->top 	= nY;
+            pBoundRect->right	= nRight;
+            pBoundRect->bottom	= nBottom;
             mbFirstClipRect = FALSE;
         }
         else
@@ -910,10 +910,10 @@ BOOL WinSalGraphics::unionClipRegion( long nX, long nY, long nWidth, long nHeigh
                 pBoundRect->bottom = (int)nBottom;
         }
 
-        pRect->left     = (int)nX;
-        pRect->top      = (int)nY;
-        pRect->right    = (int)nRight;
-        pRect->bottom   = (int)nBottom;
+        pRect->left 	= (int)nX;
+        pRect->top		= (int)nY;
+        pRect->right	= (int)nRight;
+        pRect->bottom	= (int)nBottom;
         mpNextClipRect++;
     }
     else
@@ -994,9 +994,9 @@ void WinSalGraphics::SetLineColor()
         mhDefPen = hOldPen;
 
     // set new data
-    mhPen       = hNewPen;
-    mbPen       = FALSE;
-    mbStockPen  = TRUE;
+    mhPen		= hNewPen;
+    mbPen		= FALSE;
+    mbStockPen	= TRUE;
 }
 
 // -----------------------------------------------------------------------
@@ -1004,11 +1004,11 @@ void WinSalGraphics::SetLineColor()
 void WinSalGraphics::SetLineColor( SalColor nSalColor )
 {
     maLineColor = nSalColor;
-    COLORREF    nPenColor = PALETTERGB( SALCOLOR_RED( nSalColor ),
+    COLORREF	nPenColor = PALETTERGB( SALCOLOR_RED( nSalColor ),
                                         SALCOLOR_GREEN( nSalColor ),
                                         SALCOLOR_BLUE( nSalColor ) );
-    HPEN        hNewPen = 0;
-    BOOL        bStockPen = FALSE;
+    HPEN		hNewPen = 0;
+    BOOL		bStockPen = FALSE;
 
     // search for stock pen (only screen, because printer have problems,
     // when we use stock objects)
@@ -1052,10 +1052,10 @@ void WinSalGraphics::SetLineColor( SalColor nSalColor )
         mhDefPen = hOldPen;
 
     // set new data
-    mnPenColor  = nPenColor;
-    mhPen       = hNewPen;
-    mbPen       = TRUE;
-    mbStockPen  = bStockPen;
+    mnPenColor	= nPenColor;
+    mhPen		= hNewPen;
+    mbPen		= TRUE;
+    mbStockPen	= bStockPen;
 }
 
 // -----------------------------------------------------------------------
@@ -1076,8 +1076,8 @@ void WinSalGraphics::SetFillColor()
         mhDefBrush = hOldBrush;
 
     // set new data
-    mhBrush     = hNewBrush;
-    mbBrush     = FALSE;
+    mhBrush		= hNewBrush;
+    mbBrush		= FALSE;
     mbStockBrush = TRUE;
 }
 
@@ -1086,13 +1086,13 @@ void WinSalGraphics::SetFillColor()
 void WinSalGraphics::SetFillColor( SalColor nSalColor )
 {
     maFillColor = nSalColor;
-    SalData*    pSalData    = GetSalData();
-    BYTE        nRed        = SALCOLOR_RED( nSalColor );
-    BYTE        nGreen      = SALCOLOR_GREEN( nSalColor );
-    BYTE        nBlue       = SALCOLOR_BLUE( nSalColor );
-    COLORREF    nBrushColor = PALETTERGB( nRed, nGreen, nBlue );
-    HBRUSH      hNewBrush   = 0;
-    BOOL        bStockBrush = FALSE;
+    SalData*	pSalData	= GetSalData();
+    BYTE		nRed		= SALCOLOR_RED( nSalColor );
+    BYTE		nGreen		= SALCOLOR_GREEN( nSalColor );
+    BYTE		nBlue		= SALCOLOR_BLUE( nSalColor );
+    COLORREF	nBrushColor = PALETTERGB( nRed, nGreen, nBlue );
+    HBRUSH		hNewBrush	= 0;
+    BOOL		bStockBrush = FALSE;
 
     // search for stock brush (only screen, because printer have problems,
     // when we use stock objects)
@@ -1181,8 +1181,8 @@ void WinSalGraphics::SetFillColor( SalColor nSalColor )
 
     // set new data
     mnBrushColor = nBrushColor;
-    mhBrush     = hNewBrush;
-    mbBrush     = TRUE;
+    mhBrush		= hNewBrush;
+    mbBrush		= TRUE;
     mbStockBrush = bStockBrush;
 }
 
@@ -1214,8 +1214,8 @@ void WinSalGraphics::drawPixel( long nX, long nY )
 {
     if ( mbXORMode )
     {
-        HBRUSH  hBrush = CreateSolidBrush( mnPenColor );
-        HBRUSH  hOldBrush = SelectBrush( mhDC, hBrush );
+        HBRUSH	hBrush = CreateSolidBrush( mnPenColor );
+        HBRUSH	hOldBrush = SelectBrush( mhDC, hBrush );
         PatBlt( mhDC, (int)nX, (int)nY, (int)1, (int)1, PATINVERT );
         SelectBrush( mhDC, hOldBrush );
         DeleteBrush( hBrush );
@@ -1239,8 +1239,8 @@ void WinSalGraphics::drawPixel( long nX, long nY, SalColor nSalColor )
 
     if ( mbXORMode )
     {
-        HBRUSH  hBrush = CreateSolidBrush( nCol );
-        HBRUSH  hOldBrush = SelectBrush( mhDC, hBrush );
+        HBRUSH	hBrush = CreateSolidBrush( nCol );
+        HBRUSH	hOldBrush = SelectBrush( mhDC, hBrush );
         PatBlt( mhDC, (int)nX, (int)nY, (int)1, (int)1, PATINVERT );
         SelectBrush( mhDC, hOldBrush );
         DeleteBrush( hBrush );
@@ -1280,8 +1280,8 @@ void WinSalGraphics::drawLine( long nX1, long nY1, long nX2, long nY2 )
     {
         if ( mbXORMode )
         {
-            HBRUSH  hBrush = CreateSolidBrush( mnPenColor );
-            HBRUSH  hOldBrush = SelectBrush( mhDC, hBrush );
+            HBRUSH	hBrush = CreateSolidBrush( mnPenColor );
+            HBRUSH	hOldBrush = SelectBrush( mhDC, hBrush );
             PatBlt( mhDC, (int)nX2, (int)nY2, (int)1, (int)1, PATINVERT );
             SelectBrush( mhDC, hOldBrush );
             DeleteBrush( hBrush );
@@ -1305,9 +1305,9 @@ void WinSalGraphics::drawRect( long nX, long nY, long nWidth, long nHeight )
         else
         {
             RECT aWinRect;
-            aWinRect.left   = nX;
-            aWinRect.top    = nY;
-            aWinRect.right  = nX+nWidth;
+            aWinRect.left	= nX;
+            aWinRect.top	= nY;
+            aWinRect.right	= nX+nWidth;
             aWinRect.bottom = nY+nHeight;
             ::FillRect( mhDC, &aWinRect, mhBrush );
         }
@@ -1351,11 +1351,11 @@ void WinSalGraphics::drawPolygon( ULONG nPoints, const SalPoint* pPtAry )
 void WinSalGraphics::drawPolyPolygon( sal_uInt32 nPoly, const sal_uInt32* pPoints,
                                    PCONSTSALPOINT* pPtAry )
 {
-    UINT    aWinPointAry[SAL_POLYPOLYCOUNT_STACKBUF];
-    UINT*   pWinPointAry;
-    UINT    nPolyPolyPoints = 0;
-    UINT    nPoints;
-    UINT    i;
+    UINT	aWinPointAry[SAL_POLYPOLYCOUNT_STACKBUF];
+    UINT*	pWinPointAry;
+    UINT	nPolyPolyPoints = 0;
+    UINT	nPoints;
+    UINT	i;
 
     if ( nPoly <= SAL_POLYPOLYCOUNT_STACKBUF )
         pWinPointAry = aWinPointAry;
@@ -1379,7 +1379,7 @@ void WinSalGraphics::drawPolyPolygon( sal_uInt32 nPoly, const sal_uInt32* pPoint
     DBG_ASSERT( sizeof( POINT ) == sizeof( SalPoint ),
                 "WinSalGraphics::DrawPolyPolygon(): POINT != SalPoint" );
     const SalPoint* pPolyAry;
-    UINT            n = 0;
+    UINT			n = 0;
     for ( i = 0; i < (UINT)nPoly; i++ )
     {
         nPoints = pWinPointAry[i];
@@ -1417,7 +1417,7 @@ void WinSalGraphics::drawPolyPolygon( sal_uInt32 nPoly, const sal_uInt32* pPoint
 
 // -----------------------------------------------------------------------
 
-#define SAL_POLY_STACKBUF       32
+#define SAL_POLY_STACKBUF		32
 
 // -----------------------------------------------------------------------
 
@@ -1445,10 +1445,10 @@ sal_Bool WinSalGraphics::drawPolygonBezier( ULONG nPoints, const SalPoint* pPtAr
     DBG_ASSERT( sizeof( POINT ) == sizeof( SalPoint ),
                 "WinSalGraphics::DrawPolygonBezier(): POINT != SalPoint" );
 
-    POINT   aStackAry1[SAL_POLY_STACKBUF];
-    BYTE    aStackAry2[SAL_POLY_STACKBUF];
-    POINT*  pWinPointAry;
-    BYTE*   pWinFlagAry;
+    POINT	aStackAry1[SAL_POLY_STACKBUF];
+    BYTE	aStackAry2[SAL_POLY_STACKBUF];
+    POINT* 	pWinPointAry;
+    BYTE* 	pWinFlagAry;
     if( nPoints > SAL_POLY_STACKBUF )
     {
         pWinPointAry = new POINT[ nPoints ];
@@ -1502,10 +1502,10 @@ sal_Bool WinSalGraphics::drawPolyPolygonBezier( sal_uInt32 nPoly, const sal_uInt
     for( nCurrPoly=0, nTotalPoints=0; nCurrPoly<nPoly; ++nCurrPoly )
         nTotalPoints += *pCurrPoints++;
 
-    POINT   aStackAry1[SAL_POLY_STACKBUF];
-    BYTE    aStackAry2[SAL_POLY_STACKBUF];
-    POINT*  pWinPointAry;
-    BYTE*   pWinFlagAry;
+    POINT	aStackAry1[SAL_POLY_STACKBUF];
+    BYTE	aStackAry2[SAL_POLY_STACKBUF];
+    POINT* 	pWinPointAry;
+    BYTE* 	pWinFlagAry;
     if( nTotalPoints > SAL_POLY_STACKBUF )
     {
         pWinPointAry = new POINT[ nTotalPoints ];
@@ -1546,8 +1546,8 @@ sal_Bool WinSalGraphics::drawPolyPolygonBezier( sal_uInt32 nPoly, const sal_uInt
 
 // -----------------------------------------------------------------------
 
-#define POSTSCRIPT_BUFSIZE 0x4000           // MAXIMUM BUFSIZE EQ 0xFFFF
-#define POSTSCRIPT_BOUNDINGSEARCH 0x1000    // we only try to get the BoundingBox
+#define POSTSCRIPT_BUFSIZE 0x4000			// MAXIMUM BUFSIZE EQ 0xFFFF
+#define POSTSCRIPT_BOUNDINGSEARCH 0x1000	// we only try to get the BoundingBox
                                             // in the first 4096 bytes
 
 static BYTE* ImplSearchEntry( BYTE* pSource, BYTE* pDest, ULONG nComp, ULONG nSize )
@@ -1569,7 +1569,7 @@ static BYTE* ImplSearchEntry( BYTE* pSource, BYTE* pDest, ULONG nComp, ULONG nSi
 
 static BOOL ImplGetBoundingBox( double* nNumb, BYTE* pSource, ULONG nSize )
 {
-    BOOL    bRetValue = FALSE;
+    BOOL	bRetValue = FALSE;
     BYTE* pDest = ImplSearchEntry( pSource, (BYTE*)"%%BoundingBox:", nSize, 14 );
     if ( pDest )
     {
@@ -1578,15 +1578,15 @@ static BOOL ImplGetBoundingBox( double* nNumb, BYTE* pSource, ULONG nSize )
 
         int nSizeLeft = nSize - ( pDest - pSource );
         if ( nSizeLeft > 100 )
-            nSizeLeft = 100;    // only 100 bytes following the bounding box will be checked
+            nSizeLeft = 100;	// only 100 bytes following the bounding box will be checked
 
         int i;
         for ( i = 0; ( i < 4 ) && nSizeLeft; i++ )
         {
-            int     nDivision = 1;
-            BOOL    bDivision = FALSE;
-            BOOL    bNegative = FALSE;
-            BOOL    bValid = TRUE;
+            int 	nDivision = 1;
+            BOOL	bDivision = FALSE;
+            BOOL	bNegative = FALSE;
+            BOOL	bValid = TRUE;
 
             while ( ( --nSizeLeft ) && ( *pDest == ' ' ) || ( *pDest == 0x9 ) ) pDest++;
             BYTE nByte = *pDest;
@@ -1605,7 +1605,7 @@ static BOOL ImplGetBoundingBox( double* nNumb, BYTE* pSource, ULONG nSize )
                         break;
                     default :
                         if ( ( nByte < '0' ) || ( nByte > '9' ) )
-                            nSizeLeft = 1;  // error parsing the bounding box values
+                            nSizeLeft = 1; 	// error parsing the bounding box values
                         else if ( bValid )
                         {
                             if ( bDivision )
@@ -1639,7 +1639,7 @@ BOOL WinSalGraphics::drawEPS( long nX, long nY, long nWidth, long nHeight, void*
 
         if ( Escape( mhDC, QUERYESCSUPPORT, sizeof( int ), ( LPSTR )&nEscape, 0 ) )
         {
-            double  nBoundingBox[4];
+            double	nBoundingBox[4];
 
             if ( ImplGetBoundingBox( nBoundingBox, (BYTE*)pPtr, nSize ) )
             {
@@ -1729,8 +1729,8 @@ BOOL WinSalGraphics::drawEPS( long nX, long nY, long nWidth, long nHeight, void*
 
                 // #107797# Write out EPS transformation code
                 // ----------------------------------------------------------------------------------
-                double  dM11 = nWidth / ( nBoundingBox[2] - nBoundingBox[0] );
-                double  dM22 = nHeight / (nBoundingBox[1] - nBoundingBox[3] );
+                double	dM11 = nWidth / ( nBoundingBox[2] - nBoundingBox[0] );
+                double	dM22 = nHeight / (nBoundingBox[1] - nBoundingBox[3] );
                 // reserve a USHORT again
                 aBuf.setLength( 2 );
                 aBuf.append( "\n\n[" );
@@ -1749,8 +1749,8 @@ BOOL WinSalGraphics::drawEPS( long nX, long nY, long nWidth, long nHeight, void*
 
                 // #107797# Write out actual EPS content
                 // ----------------------------------------------------------------------------------
-                ULONG   nToDo = nSize;
-                ULONG   nDoNow;
+                ULONG	nToDo = nSize;
+                ULONG	nDoNow;
                 while ( nToDo )
                 {
                     nDoNow = nToDo;
diff --git a/vcl/win/source/gdi/salgdi2.cxx b/vcl/win/source/gdi/salgdi2.cxx
index 803c0886f429..25869d92984b 100644
--- a/vcl/win/source/gdi/salgdi2.cxx
+++ b/vcl/win/source/gdi/salgdi2.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
@@ -62,8 +62,8 @@ bool WinSalGraphics::supportsOperation( OutDevSupportType eType ) const
 
 void WinSalGraphics::copyBits( const SalTwoRect* pPosAry, SalGraphics* pSrcGraphics )
 {
-    HDC     hSrcDC;
-    DWORD   nRop;
+    HDC 	hSrcDC;
+    DWORD	nRop;
 
     if ( pSrcGraphics )
         hSrcDC = static_cast<WinSalGraphics*>(pSrcGraphics)->mhDC;
@@ -160,18 +160,18 @@ void WinSalGraphics::copyArea( long nDestX, long nDestY,
         // compute and invalidate those parts that were either off-screen or covered by other windows
         //  while performing the above BitBlt
         // those regions then have to be invalidated as they contain useless/wrong data
-        RECT    aSrcRect;
-        RECT    aClipRect;
-        RECT    aTempRect;
-        RECT    aTempRect2;
-        HRGN    hTempRgn;
-        HWND    hWnd;
-        int     nRgnType;
+        RECT	aSrcRect;
+        RECT	aClipRect;
+        RECT	aTempRect;
+        RECT	aTempRect2;
+        HRGN	hTempRgn;
+        HWND	hWnd;
+        int 	nRgnType;
 
         // restrict srcRect to this window (calc intersection)
-        aSrcRect.left   = (int)nSrcX;
-        aSrcRect.top    = (int)nSrcY;
-        aSrcRect.right  = aSrcRect.left+(int)nSrcWidth;
+        aSrcRect.left	= (int)nSrcX;
+        aSrcRect.top	= (int)nSrcY;
+        aSrcRect.right	= aSrcRect.left+(int)nSrcWidth;
         aSrcRect.bottom = aSrcRect.top+(int)nSrcHeight;
         GetClientRect( mhWnd, &aClipRect );
         if ( IntersectRect( &aSrcRect, &aSrcRect, &aClipRect ) )
@@ -181,9 +181,9 @@ void WinSalGraphics::copyArea( long nDestX, long nDestY,
             aPt.x = 0;
             aPt.y = 0;
             ClientToScreen( mhWnd, &aPt );
-            aSrcRect.left   += aPt.x;
-            aSrcRect.top    += aPt.y;
-            aSrcRect.right  += aPt.x;
+            aSrcRect.left	+= aPt.x;
+            aSrcRect.top	+= aPt.y;
+            aSrcRect.right	+= aPt.x;
             aSrcRect.bottom += aPt.y;
             hInvalidateRgn = 0;
 
@@ -210,8 +210,8 @@ void WinSalGraphics::copyArea( long nDestX, long nDestY,
                     aPt2.x = 0;
                     aPt2.y = 0;
                     ClientToScreen( hWndTopWindow, &aPt2 );
-                    aTempRect.left   += aPt2.x;
-                    aTempRect.top    += aPt2.y;
+                    aTempRect.left	 += aPt2.x;
+                    aTempRect.top	 += aPt2.y;
                     aTempRect.right  += aPt2.x;
                     aTempRect.bottom += aPt2.y;
                     IntersectRect( &aTempRect3, &aTempRect3, &aTempRect );
@@ -329,8 +329,8 @@ void WinSalGraphics::copyArea( long nDestX, long nDestY,
             // MainThread ist, damit es beim Bearbeiten der
             // Paint-Message keinen Deadlock gibt, da der
             // SolarMutex durch diesen Thread schon gelockt ist
-            SalData*    pSalData = GetSalData();
-            DWORD       nCurThreadId = GetCurrentThreadId();
+            SalData*	pSalData = GetSalData();
+            DWORD		nCurThreadId = GetCurrentThreadId();
             if ( pSalData->mnAppThreadId == nCurThreadId )
                 UpdateWindow( mhWnd );
         }
@@ -348,10 +348,10 @@ void ImplDrawBitmap( HDC hDC,
 {
     if( hDC )
     {
-        HGLOBAL     hDrawDIB;
-        HBITMAP     hDrawDDB = rSalBitmap.ImplGethDDB();
-        WinSalBitmap*   pTmpSalBmp = NULL;
-        BOOL        bPrintDDB = ( bPrinter && hDrawDDB );
+        HGLOBAL 	hDrawDIB;
+        HBITMAP 	hDrawDDB = rSalBitmap.ImplGethDDB();
+        WinSalBitmap*	pTmpSalBmp = NULL;
+        BOOL		bPrintDDB = ( bPrinter && hDrawDDB );
 
         if( bPrintDDB )
         {
@@ -364,11 +364,11 @@ void ImplDrawBitmap( HDC hDC,
 
         if( hDrawDIB )
         {
-            PBITMAPINFO         pBI = (PBITMAPINFO) GlobalLock( hDrawDIB );
-            PBITMAPINFOHEADER   pBIH = (PBITMAPINFOHEADER) pBI;
-            PBYTE               pBits = (PBYTE) pBI + *(DWORD*) pBI +
+            PBITMAPINFO 		pBI = (PBITMAPINFO) GlobalLock( hDrawDIB );
+            PBITMAPINFOHEADER	pBIH = (PBITMAPINFOHEADER) pBI;
+            PBYTE				pBits = (PBYTE) pBI + *(DWORD*) pBI +
                                         rSalBitmap.ImplGetDIBColorCount( hDrawDIB ) * sizeof( RGBQUAD );
-            const int           nOldStretchMode = SetStretchBltMode( hDC, STRETCH_DELETESCANS );
+            const int			nOldStretchMode = SetStretchBltMode( hDC, STRETCH_DELETESCANS );
 
             StretchDIBits( hDC,
                            (int)pPosAry->mnDestX, (int)pPosAry->mnDestY,
@@ -382,10 +382,10 @@ void ImplDrawBitmap( HDC hDC,
         }
         else if( hDrawDDB && !bPrintDDB )
         {
-            HDC         hBmpDC = ImplGetCachedDC( CACHED_HDC_DRAW, hDrawDDB );
-            COLORREF    nOldBkColor = RGB(0xFF,0xFF,0xFF);
-            COLORREF    nOldTextColor = RGB(0,0,0);
-            BOOL        bMono = ( rSalBitmap.GetBitCount() == 1 );
+            HDC 		hBmpDC = ImplGetCachedDC( CACHED_HDC_DRAW, hDrawDDB );
+            COLORREF	nOldBkColor = RGB(0xFF,0xFF,0xFF);
+            COLORREF	nOldTextColor = RGB(0,0,0);
+            BOOL		bMono = ( rSalBitmap.GetBitCount() == 1 );
 
             if( bMono )
             {
@@ -452,19 +452,19 @@ void WinSalGraphics::drawBitmap( const SalTwoRect* pPosAry,
 
     const WinSalBitmap& rSalBitmap = static_cast<const WinSalBitmap&>(rSSalBitmap);
 
-    WinSalBitmap*   pMask = new WinSalBitmap;
+    WinSalBitmap*	pMask = new WinSalBitmap;
     const Point aPoint;
-    const Size  aSize( rSalBitmap.GetSize() );
-    HBITMAP     hMaskBitmap = CreateBitmap( (int) aSize.Width(), (int) aSize.Height(), 1, 1, NULL );
-    HDC         hMaskDC = ImplGetCachedDC( CACHED_HDC_1, hMaskBitmap );
-    const BYTE  cRed = SALCOLOR_RED( nTransparentColor );
-    const BYTE  cGreen = SALCOLOR_GREEN( nTransparentColor );
-    const BYTE  cBlue = SALCOLOR_BLUE( nTransparentColor );
+    const Size	aSize( rSalBitmap.GetSize() );
+    HBITMAP 	hMaskBitmap = CreateBitmap( (int) aSize.Width(), (int) aSize.Height(), 1, 1, NULL );
+    HDC 		hMaskDC = ImplGetCachedDC( CACHED_HDC_1, hMaskBitmap );
+    const BYTE	cRed = SALCOLOR_RED( nTransparentColor );
+    const BYTE	cGreen = SALCOLOR_GREEN( nTransparentColor );
+    const BYTE	cBlue = SALCOLOR_BLUE( nTransparentColor );
 
     if( rSalBitmap.ImplGethDDB() )
     {
-        HDC         hSrcDC = ImplGetCachedDC( CACHED_HDC_2, rSalBitmap.ImplGethDDB() );
-        COLORREF    aOldCol = SetBkColor( hSrcDC, RGB( cRed, cGreen, cBlue ) );
+        HDC 		hSrcDC = ImplGetCachedDC( CACHED_HDC_2, rSalBitmap.ImplGethDDB() );
+        COLORREF	aOldCol = SetBkColor( hSrcDC, RGB( cRed, cGreen, cBlue ) );
 
         BitBlt( hMaskDC, 0, 0, (int) aSize.Width(), (int) aSize.Height(), hSrcDC, 0, 0, SRCCOPY );
 
@@ -473,12 +473,12 @@ void WinSalGraphics::drawBitmap( const SalTwoRect* pPosAry,
     }
     else
     {
-        WinSalBitmap*   pTmpSalBmp = new WinSalBitmap;
+        WinSalBitmap*	pTmpSalBmp = new WinSalBitmap;
 
         if( pTmpSalBmp->Create( rSalBitmap, this ) )
         {
-            HDC         hSrcDC = ImplGetCachedDC( CACHED_HDC_2, pTmpSalBmp->ImplGethDDB() );
-            COLORREF    aOldCol = SetBkColor( hSrcDC, RGB( cRed, cGreen, cBlue ) );
+            HDC 		hSrcDC = ImplGetCachedDC( CACHED_HDC_2, pTmpSalBmp->ImplGethDDB() );
+            COLORREF	aOldCol = SetBkColor( hSrcDC, RGB( cRed, cGreen, cBlue ) );
 
             BitBlt( hMaskDC, 0, 0, (int) aSize.Width(), (int) aSize.Height(), hSrcDC, 0, 0, SRCCOPY );
 
@@ -509,14 +509,14 @@ void WinSalGraphics::drawBitmap( const SalTwoRect* pPosAry,
     const WinSalBitmap& rSalBitmap = static_cast<const WinSalBitmap&>(rSSalBitmap);
     const WinSalBitmap& rTransparentBitmap = static_cast<const WinSalBitmap&>(rSTransparentBitmap);
 
-    SalTwoRect  aPosAry = *pPosAry;
-    int         nDstX = (int)aPosAry.mnDestX;
-    int         nDstY = (int)aPosAry.mnDestY;
-    int         nDstWidth = (int)aPosAry.mnDestWidth;
-    int         nDstHeight = (int)aPosAry.mnDestHeight;
-    HDC         hDC = mhDC;
-    HBITMAP     hMemBitmap = 0;
-    HBITMAP     hMaskBitmap = 0;
+    SalTwoRect	aPosAry = *pPosAry;
+    int 		nDstX = (int)aPosAry.mnDestX;
+    int 		nDstY = (int)aPosAry.mnDestY;
+    int 		nDstWidth = (int)aPosAry.mnDestWidth;
+    int 		nDstHeight = (int)aPosAry.mnDestHeight;
+    HDC 		hDC = mhDC;
+    HBITMAP 	hMemBitmap = 0;
+    HBITMAP 	hMaskBitmap = 0;
 
     if( ( nDstWidth > CACHED_HDC_DEFEXT ) || ( nDstHeight > CACHED_HDC_DEFEXT ) )
     {
@@ -555,7 +555,7 @@ void WinSalGraphics::drawBitmap( const SalTwoRect* pPosAry,
     }
     else
     {
-        BitBlt( hMemDC, 0, 0, nDstWidth, nDstHeight, hMaskDC, 0, 0, SRCAND );
+        BitBlt( hMemDC, 0, 0, nDstWidth, nDstHeight, hMaskDC, 0, 0, SRCAND );       
         // now MemDC contains background with masked-out bitmap area
         ImplDrawBitmap( hMaskDC, &aPosAry, rSalBitmap, FALSE, SRCERASE );
         // now MaskDC contains the bitmap area with black background
@@ -579,7 +579,7 @@ void WinSalGraphics::drawBitmap( const SalTwoRect* pPosAry,
 // -----------------------------------------------------------------------
 
 bool WinSalGraphics::drawAlphaBitmap( const SalTwoRect& rTR,
-                      const SalBitmap&  rSrcBitmap,
+                      const SalBitmap&  rSrcBitmap, 
                       const SalBitmap&  rAlphaBmp )
 {
     (void)rTR; (void)rSrcBitmap; (void)rAlphaBmp;
@@ -591,7 +591,7 @@ bool WinSalGraphics::drawAlphaBitmap( const SalTwoRect& rTR,
 
 // -----------------------------------------------------------------------
 
-bool WinSalGraphics::drawAlphaRect( long nX, long nY, long nWidth,
+bool WinSalGraphics::drawAlphaRect( long nX, long nY, long nWidth, 
                                     long nHeight, sal_uInt8 nTransparency )
 {
     if( mbPen || !mbBrush || mbXORMode )
@@ -609,7 +609,7 @@ bool WinSalGraphics::drawAlphaRect( long nX, long nY, long nWidth,
 
     // hMemDC contains a 1x1 bitmap of the right color - stretch-blit
     // that to dest hdc
-    bool bRet = AlphaBlend( mhDC, nX, nY, nWidth, nHeight,
+    bool bRet = AlphaBlend( mhDC, nX, nY, nWidth, nHeight, 
                             hMemDC, 0,0,1,1,
                             aFunc ) == TRUE;
 
@@ -628,13 +628,13 @@ void WinSalGraphics::drawMask( const SalTwoRect* pPosAry,
 
     const WinSalBitmap& rSalBitmap = static_cast<const WinSalBitmap&>(rSSalBitmap);
 
-    SalTwoRect  aPosAry = *pPosAry;
-    const BYTE  cRed = SALCOLOR_RED( nMaskColor );
-    const BYTE  cGreen = SALCOLOR_GREEN( nMaskColor );
-    const BYTE  cBlue = SALCOLOR_BLUE( nMaskColor );
-    HDC         hDC = mhDC;
-    HBRUSH      hMaskBrush = CreateSolidBrush( RGB( cRed, cGreen, cBlue ) );
-    HBRUSH      hOldBrush = SelectBrush( hDC, hMaskBrush );
+    SalTwoRect	aPosAry = *pPosAry;
+    const BYTE	cRed = SALCOLOR_RED( nMaskColor );
+    const BYTE	cGreen = SALCOLOR_GREEN( nMaskColor );
+    const BYTE	cBlue = SALCOLOR_BLUE( nMaskColor );
+    HDC 		hDC = mhDC;
+    HBRUSH		hMaskBrush = CreateSolidBrush( RGB( cRed, cGreen, cBlue ) );
+    HBRUSH		hOldBrush = SelectBrush( hDC, hMaskBrush );
 
     // bei Paletten-Displays hat WIN/WNT offenbar ein kleines Problem,
     // die Farben der Maske richtig auf die Palette abzubilden,
@@ -664,10 +664,10 @@ SalBitmap* WinSalGraphics::getBitmap( long nX, long nY, long nDX, long nDY )
     nDX = labs( nDX );
     nDY = labs( nDY );
 
-    HDC     hDC = mhDC;
+    HDC 	hDC = mhDC;
     HBITMAP hBmpBitmap = CreateCompatibleBitmap( hDC, nDX, nDY );
-    HDC     hBmpDC = ImplGetCachedDC( CACHED_HDC_1, hBmpBitmap );
-    BOOL    bRet;
+    HDC 	hBmpDC = ImplGetCachedDC( CACHED_HDC_1, hBmpBitmap );
+    BOOL	bRet;
     DWORD err = 0;
 
     bRet = BitBlt( hBmpDC, 0, 0, (int) nDX, (int) nDY, hDC, (int) nX, (int) nY, SRCCOPY ) ? TRUE : FALSE;
@@ -713,10 +713,10 @@ void WinSalGraphics::invert( long nX, long nY, long nWidth, long nHeight, SalInv
 {
     if ( nFlags & SAL_INVERT_TRACKFRAME )
     {
-        HPEN    hDotPen = CreatePen( PS_DOT, 0, 0 );
-        HPEN    hOldPen = SelectPen( mhDC, hDotPen );
-        HBRUSH  hOldBrush = SelectBrush( mhDC, GetStockBrush( NULL_BRUSH ) );
-        int     nOldROP = SetROP2( mhDC, R2_NOT );
+        HPEN	hDotPen = CreatePen( PS_DOT, 0, 0 );
+        HPEN	hOldPen = SelectPen( mhDC, hDotPen );
+        HBRUSH	hOldBrush = SelectBrush( mhDC, GetStockBrush( NULL_BRUSH ) );
+        int 	nOldROP = SetROP2( mhDC, R2_NOT );
 
         WIN_Rectangle( mhDC, (int)nX, (int)nY, (int)(nX+nWidth), (int)(nY+nHeight) );
 
@@ -744,10 +744,10 @@ void WinSalGraphics::invert( long nX, long nY, long nWidth, long nHeight, SalInv
     else
     {
          RECT aRect;
-         aRect.left      = (int)nX;
-         aRect.top       = (int)nY;
-         aRect.right     = (int)nX+nWidth;
-         aRect.bottom    = (int)nY+nHeight;
+         aRect.left 	 = (int)nX;
+         aRect.top		 = (int)nY;
+         aRect.right	 = (int)nX+nWidth;
+         aRect.bottom	 = (int)nY+nHeight;
          ::InvertRect( mhDC, &aRect );
     }
 }
@@ -756,12 +756,12 @@ void WinSalGraphics::invert( long nX, long nY, long nWidth, long nHeight, SalInv
 
 void WinSalGraphics::invert( ULONG nPoints, const SalPoint* pPtAry, SalInvert nSalFlags )
 {
-    HPEN        hPen;
-    HPEN        hOldPen;
-    HBRUSH      hBrush;
-    HBRUSH      hOldBrush = 0;
-    COLORREF    nOldTextColor RGB(0,0,0);
-    int         nOldROP = SetROP2( mhDC, R2_NOT );
+    HPEN		hPen;
+    HPEN		hOldPen;
+    HBRUSH		hBrush;
+    HBRUSH		hOldBrush = 0;
+    COLORREF	nOldTextColor RGB(0,0,0);
+    int 		nOldROP = SetROP2( mhDC, R2_NOT );
 
     if ( nSalFlags & SAL_INVERT_TRACKFRAME )
         hPen = CreatePen( PS_DOT, 0, 0 );
diff --git a/vcl/win/source/gdi/salgdi3.cxx b/vcl/win/source/gdi/salgdi3.cxx
index d1b5a9cfdeae..707a2ea94089 100644
--- a/vcl/win/source/gdi/salgdi3.cxx
+++ b/vcl/win/source/gdi/salgdi3.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
@@ -47,8 +47,8 @@
 #include "vcl/fontsubset.hxx"
 #include "vcl/sallayout.hxx"
 
-#include "vcl/outdev.h"         // for ImplGlyphFallbackFontSubstitution
-#include "unotools/fontcfg.hxx" // for IMPL_FONT_ATTR_SYMBOL
+#include "vcl/outdev.h"			// for ImplGlyphFallbackFontSubstitution
+#include "unotools/fontcfg.hxx"	// for IMPL_FONT_ATTR_SYMBOL
 
 #include "rtl/logfile.hxx"
 #include "rtl/tencinfo.h"
@@ -125,13 +125,13 @@ typedef std::map< String, ImplDevFontAttributes > FontAttrMap;
 class ImplFontAttrCache
 {
 private:
-    FontAttrMap     aFontAttributes;
-    rtl::OUString   aCacheFileName;
-    String          aBaseURL;
-    BOOL            bModified;
+    FontAttrMap		aFontAttributes;
+    rtl::OUString	aCacheFileName;
+    String			aBaseURL;
+    BOOL			bModified;
 
 protected:
-    String  OptimizeURL( const String& rURL ) const;
+    String	OptimizeURL( const String& rURL ) const;
 
     enum{ MAGIC = 0x12349876 }; // change if fontattrcache format changes
 
@@ -146,7 +146,7 @@ public:
 ImplFontAttrCache::ImplFontAttrCache( const String& rFileNameURL, const String& rBaseURL ) : aBaseURL( rBaseURL )
 {
     bModified = FALSE;
-    aBaseURL.ToLowerAscii();    // Windows only, no problem...
+    aBaseURL.ToLowerAscii();	// Windows only, no problem...
 
     // open the cache file
     osl::FileBase::getSystemPathFromFileURL( rFileNameURL, aCacheFileName );
@@ -224,7 +224,7 @@ ImplFontAttrCache::~ImplFontAttrCache()
 String ImplFontAttrCache::OptimizeURL( const String& rURL ) const
 {
     String aOptimizedFontFileURL( rURL );
-    aOptimizedFontFileURL.ToLowerAscii();   // Windows only, no problem...
+    aOptimizedFontFileURL.ToLowerAscii();	// Windows only, no problem...
     if ( aOptimizedFontFileURL.CompareTo( aBaseURL, aBaseURL.Len() ) == COMPARE_EQUAL )
         aOptimizedFontFileURL = aOptimizedFontFileURL.Copy( aBaseURL.Len() );
     return aOptimizedFontFileURL;
@@ -257,20 +257,20 @@ void ImplFontAttrCache::AddFontAttr( const String& rFontFileName, const ImplDevF
 class RawFontData
 {
 public:
-    explicit    RawFontData( HDC, DWORD nTableTag=0 );
+    explicit	RawFontData( HDC, DWORD nTableTag=0 );
                 ~RawFontData() { delete[] mpRawBytes; }
-    const unsigned char*    get() const { return mpRawBytes; }
-    const unsigned char*    steal() { unsigned char* p = mpRawBytes; mpRawBytes = NULL; return p; }
-    const int               size() const { return mnByteCount; }
+    const unsigned char*	get() const { return mpRawBytes; }
+    const unsigned char*	steal() { unsigned char* p = mpRawBytes; mpRawBytes = NULL; return p; }
+    const int				size() const { return mnByteCount; }
 
 private:
-    unsigned char*  mpRawBytes;
-    int             mnByteCount;
+    unsigned char*	mpRawBytes;
+    int				mnByteCount;
 };
 
 RawFontData::RawFontData( HDC hDC, DWORD nTableTag )
-:   mpRawBytes( NULL )
-,   mnByteCount( 0 )
+:	mpRawBytes( NULL )
+,	mnByteCount( 0 )
 {
     // get required size in bytes
     mnByteCount = ::GetFontData( hDC, nTableTag, 0, NULL, 0 );
@@ -334,77 +334,77 @@ struct Unicode2LangType
 // map unicode ranges to languages supported by OOo
 // NOTE: due to the binary search used this list must be sorted by mnMinCode
 static Unicode2LangType aLangFromCodeChart[]= {
-    {0x0000, 0x007F, LANGUAGE_ENGLISH},             // Basic Latin
-    {0x0080, 0x024F, LANGUAGE_ENGLISH},             // Latin Extended-A and Latin Extended-B
-    {0x0250, 0x02AF, LANGUAGE_SYSTEM},              // IPA Extensions
-    {0x0370, 0x03FF, LANGUAGE_GREEK},               // Greek
-    {0x0590, 0x05FF, LANGUAGE_HEBREW},              // Hebrew
-    {0x0600, 0x06FF, LANGUAGE_ARABIC_PRIMARY_ONLY}, // Arabic
-    {0x0900, 0x097F, LANGUAGE_HINDI},               // Devanagari
-    {0x0980, 0x09FF, LANGUAGE_BENGALI},             // Bengali
-    {0x0A80, 0x0AFF, LANGUAGE_GUJARATI},            // Gujarati
-    {0x0B00, 0x0B7F, LANGUAGE_ORIYA},               // Oriya
-    {0x0B80, 0x0BFF, LANGUAGE_TAMIL},               // Tamil
-    {0x0C00, 0x0C7F, LANGUAGE_TELUGU},              // Telugu
-    {0x0C80, 0x0CFF, LANGUAGE_KANNADA},             // Kannada
-    {0x0D00, 0x0D7F, LANGUAGE_MALAYALAM},           // Malayalam
-    {0x0D80, 0x0D7F, LANGUAGE_SINHALESE_SRI_LANKA}, // Sinhala
-    {0x0E00, 0x0E7F, LANGUAGE_THAI},                // Thai
-    {0x0E80, 0x0EFF, LANGUAGE_LAO},                 // Lao
-    {0x0F00, 0x0FFF, LANGUAGE_TIBETAN},             // Tibetan
-    {0x1000, 0x109F, LANGUAGE_BURMESE},             // Burmese
-    {0x10A0, 0x10FF, LANGUAGE_GEORGIAN},            // Georgian
-    {0x1100, 0x11FF, LANGUAGE_KOREAN},              // Hangul Jamo, Korean-specific
-//  {0x1200, 0x139F, LANGUAGE_AMHARIC_ETHIOPIA},    // Ethiopic
-//  {0x1200, 0x139F, LANGUAGE_TIGRIGNA_ETHIOPIA},   // Ethiopic
+    {0x0000, 0x007F, LANGUAGE_ENGLISH},				// Basic Latin
+    {0x0080, 0x024F, LANGUAGE_ENGLISH},				// Latin Extended-A and Latin Extended-B
+    {0x0250, 0x02AF, LANGUAGE_SYSTEM},				// IPA Extensions
+    {0x0370, 0x03FF, LANGUAGE_GREEK},				// Greek
+    {0x0590, 0x05FF, LANGUAGE_HEBREW},				// Hebrew
+    {0x0600, 0x06FF, LANGUAGE_ARABIC_PRIMARY_ONLY},	// Arabic
+    {0x0900, 0x097F, LANGUAGE_HINDI},				// Devanagari
+    {0x0980, 0x09FF, LANGUAGE_BENGALI},				// Bengali
+    {0x0A80, 0x0AFF, LANGUAGE_GUJARATI},			// Gujarati
+    {0x0B00, 0x0B7F, LANGUAGE_ORIYA},				// Oriya
+    {0x0B80, 0x0BFF, LANGUAGE_TAMIL},				// Tamil
+    {0x0C00, 0x0C7F, LANGUAGE_TELUGU},				// Telugu
+    {0x0C80, 0x0CFF, LANGUAGE_KANNADA},				// Kannada
+    {0x0D00, 0x0D7F, LANGUAGE_MALAYALAM},			// Malayalam
+    {0x0D80, 0x0D7F, LANGUAGE_SINHALESE_SRI_LANKA},	// Sinhala
+    {0x0E00, 0x0E7F, LANGUAGE_THAI},				// Thai
+    {0x0E80, 0x0EFF, LANGUAGE_LAO},					// Lao
+    {0x0F00, 0x0FFF, LANGUAGE_TIBETAN},				// Tibetan
+    {0x1000, 0x109F, LANGUAGE_BURMESE},				// Burmese
+    {0x10A0, 0x10FF, LANGUAGE_GEORGIAN},			// Georgian
+    {0x1100, 0x11FF, LANGUAGE_KOREAN},				// Hangul Jamo, Korean-specific
+//	{0x1200, 0x139F, LANGUAGE_AMHARIC_ETHIOPIA},	// Ethiopic
+//	{0x1200, 0x139F, LANGUAGE_TIGRIGNA_ETHIOPIA},	// Ethiopic
     {0x13A0, 0x13FF, LANGUAGE_CHEROKEE_UNITED_STATES}, // Cherokee
-//  {0x1400, 0x167F, LANGUAGE_CANADIAN_ABORIGINAL}, // Canadian Aboriginial Syllabics
-//  {0x1680, 0x169F, LANGUAGE_OGHAM},               // Ogham
-//  {0x16A0, 0x16F0, LANGUAGE_RUNIC},               // Runic
-//  {0x1700, 0x171F, LANGUAGE_TAGALOG},             // Tagalog
-//  {0x1720, 0x173F, LANGUAGE_HANUNOO},             // Hanunoo
-//  {0x1740, 0x175F, LANGUAGE_BUHID},               // Buhid
-//  {0x1760, 0x177F, LANGUAGE_TAGBANWA},            // Tagbanwa
-    {0x1780, 0x17FF, LANGUAGE_KHMER},               // Khmer
-    {0x18A0, 0x18AF, LANGUAGE_MONGOLIAN},           // Mongolian
-//  {0x1900, 0x194F, LANGUAGE_LIMBU},               // Limbu
-//  {0x1950, 0x197F, LANGUAGE_TAILE},               // Tai Le
-//  {0x1980, 0x19DF, LANGUAGE_TAILUE},              // Tai Lue
-    {0x19E0, 0x19FF, LANGUAGE_KHMER},               // Khmer Symbols
-//  {0x1A00, 0x1A1F, LANGUAGE_BUGINESE},            // Buginese/Lontara
-//  {0x1B00, 0x1B7F, LANGUAGE_BALINESE},            // Balinese
-//  {0x1D00, 0x1DFF, LANGUAGE_NONE},                // Phonetic Symbols
-    {0x1E00, 0x1EFF, LANGUAGE_ENGLISH},             // Latin Extended Additional
-    {0x1F00, 0x1FFF, LANGUAGE_GREEK},               // Greek Extended
-    {0x2C60, 0x2C7F, LANGUAGE_ENGLISH},             // Latin Extended-C
-    {0x2E80, 0x2FFf, LANGUAGE_CHINESE_SIMPLIFIED},  // CJK Radicals Supplement + Kangxi Radical + Ideographic Description Characters
-    {0x3000, 0x303F, LANGUAGE_DEFAULT_CJK},         // CJK Symbols and punctuation
-    {0x3040, 0x30FF, LANGUAGE_JAPANESE},            // Japanese Hiragana + Katakana
-    {0x3100, 0x312F, LANGUAGE_CHINESE_TRADITIONAL}, // Bopomofo
-    {0x3130, 0x318F, LANGUAGE_KOREAN},              // Hangul Compatibility Jamo, Kocrean-specific
-    {0x3190, 0x319F, LANGUAGE_JAPANESE},            // Kanbun
-    {0x31A0, 0x31BF, LANGUAGE_CHINESE_TRADITIONAL}, // Bopomofo Extended
-    {0x31C0, 0x31EF, LANGUAGE_DEFAULT_CJK},         // CJK Ideographs
-    {0x31F0, 0x31FF, LANGUAGE_JAPANESE},            // Japanese Katakana Phonetic Extensions
-    {0x3200, 0x321F, LANGUAGE_KOREAN},              // Parenthesized Hangul
-    {0x3220, 0x325F, LANGUAGE_DEFAULT_CJK},         // Parenthesized Ideographs
-    {0x3260, 0x327F, LANGUAGE_KOREAN},              // Circled Hangul
-    {0x3280, 0x32CF, LANGUAGE_DEFAULT_CJK},         // Circled Ideographs
-    {0x32d0, 0x32FF, LANGUAGE_JAPANESE},            // Japanese Circled Katakana
-    {0x3400, 0x4DBF, LANGUAGE_DEFAULT_CJK},         // CJK Unified Ideographs Extension A
-    {0x4E00, 0x9FCF, LANGUAGE_DEFAULT_CJK},         // Unified CJK Ideographs
-    {0xA720, 0xA7FF, LANGUAGE_ENGLISH},             // Latin Extended-D
-    {0xAC00, 0xD7AF, LANGUAGE_KOREAN},              // Hangul Syllables, Korean-specific
-    {0xF900, 0xFAFF, LANGUAGE_DEFAULT_CJK},         // CJK Compatibility Ideographs
-    {0xFB00, 0xFB4F, LANGUAGE_HEBREW},              // Hebrew Presentation Forms
-    {0xFB50, 0xFDFF, LANGUAGE_ARABIC_PRIMARY_ONLY}, // Arabic Presentation Forms-A
-    {0xFE70, 0xFEFE, LANGUAGE_ARABIC_PRIMARY_ONLY}, // Arabic Presentation Forms-B
-    {0xFF65, 0xFF9F, LANGUAGE_JAPANESE},            // Japanese Halfwidth Katakana variant
-    {0xFFA0, 0xFFDC, LANGUAGE_KOREAN},              // Kocrean halfwidth hangual variant
-    {0x10140, 0x1018F, LANGUAGE_GREEK},             // Ancient Greak numbers
-    {0x1D200, 0x1D24F, LANGUAGE_GREEK},             // Ancient Greek Musical
-    {0x20000, 0x2A6DF, LANGUAGE_DEFAULT_CJK},       // CJK Unified Ideographs Extension B
-    {0x2F800, 0x2FA1F, LANGUAGE_DEFAULT_CJK}        // CJK Compatibility Ideographs Supplement
+//	{0x1400, 0x167F, LANGUAGE_CANADIAN_ABORIGINAL},	// Canadian Aboriginial Syllabics
+//	{0x1680, 0x169F, LANGUAGE_OGHAM},				// Ogham
+//	{0x16A0, 0x16F0, LANGUAGE_RUNIC},				// Runic
+//	{0x1700, 0x171F, LANGUAGE_TAGALOG},				// Tagalog
+//	{0x1720, 0x173F, LANGUAGE_HANUNOO},				// Hanunoo
+//	{0x1740, 0x175F, LANGUAGE_BUHID},				// Buhid
+//	{0x1760, 0x177F, LANGUAGE_TAGBANWA},			// Tagbanwa
+    {0x1780, 0x17FF, LANGUAGE_KHMER},				// Khmer
+    {0x18A0, 0x18AF, LANGUAGE_MONGOLIAN},			// Mongolian
+//	{0x1900, 0x194F, LANGUAGE_LIMBU},				// Limbu
+//	{0x1950, 0x197F, LANGUAGE_TAILE},				// Tai Le
+//	{0x1980, 0x19DF, LANGUAGE_TAILUE},				// Tai Lue
+    {0x19E0, 0x19FF, LANGUAGE_KHMER},				// Khmer Symbols
+//	{0x1A00, 0x1A1F, LANGUAGE_BUGINESE},			// Buginese/Lontara
+//	{0x1B00, 0x1B7F, LANGUAGE_BALINESE},			// Balinese
+//	{0x1D00, 0x1DFF, LANGUAGE_NONE},				// Phonetic Symbols
+    {0x1E00, 0x1EFF, LANGUAGE_ENGLISH},				// Latin Extended Additional
+    {0x1F00, 0x1FFF, LANGUAGE_GREEK},				// Greek Extended
+    {0x2C60, 0x2C7F, LANGUAGE_ENGLISH},				// Latin Extended-C
+    {0x2E80, 0x2FFf, LANGUAGE_CHINESE_SIMPLIFIED},	// CJK Radicals Supplement + Kangxi Radical + Ideographic Description Characters
+    {0x3000, 0x303F, LANGUAGE_DEFAULT_CJK},			// CJK Symbols and punctuation
+    {0x3040, 0x30FF, LANGUAGE_JAPANESE},			// Japanese Hiragana + Katakana
+    {0x3100, 0x312F, LANGUAGE_CHINESE_TRADITIONAL},	// Bopomofo
+    {0x3130, 0x318F, LANGUAGE_KOREAN},				// Hangul Compatibility Jamo, Kocrean-specific
+    {0x3190, 0x319F, LANGUAGE_JAPANESE},			// Kanbun
+    {0x31A0, 0x31BF, LANGUAGE_CHINESE_TRADITIONAL},	// Bopomofo Extended
+    {0x31C0, 0x31EF, LANGUAGE_DEFAULT_CJK},			// CJK Ideographs
+    {0x31F0, 0x31FF, LANGUAGE_JAPANESE},			// Japanese Katakana Phonetic Extensions
+    {0x3200, 0x321F, LANGUAGE_KOREAN},				// Parenthesized Hangul
+    {0x3220, 0x325F, LANGUAGE_DEFAULT_CJK},			// Parenthesized Ideographs
+    {0x3260, 0x327F, LANGUAGE_KOREAN},				// Circled Hangul
+    {0x3280, 0x32CF, LANGUAGE_DEFAULT_CJK},			// Circled Ideographs
+    {0x32d0, 0x32FF, LANGUAGE_JAPANESE},			// Japanese Circled Katakana
+    {0x3400, 0x4DBF, LANGUAGE_DEFAULT_CJK},			// CJK Unified Ideographs Extension A
+    {0x4E00, 0x9FCF, LANGUAGE_DEFAULT_CJK},			// Unified CJK Ideographs
+    {0xA720, 0xA7FF, LANGUAGE_ENGLISH},				// Latin Extended-D
+    {0xAC00, 0xD7AF, LANGUAGE_KOREAN},				// Hangul Syllables, Korean-specific
+    {0xF900, 0xFAFF, LANGUAGE_DEFAULT_CJK},			// CJK Compatibility Ideographs
+    {0xFB00, 0xFB4F, LANGUAGE_HEBREW},				// Hebrew Presentation Forms 
+    {0xFB50, 0xFDFF, LANGUAGE_ARABIC_PRIMARY_ONLY},	// Arabic Presentation Forms-A
+    {0xFE70, 0xFEFE, LANGUAGE_ARABIC_PRIMARY_ONLY},	// Arabic Presentation Forms-B
+    {0xFF65, 0xFF9F, LANGUAGE_JAPANESE},			// Japanese Halfwidth Katakana variant
+    {0xFFA0, 0xFFDC, LANGUAGE_KOREAN},				// Kocrean halfwidth hangual variant
+    {0x10140, 0x1018F, LANGUAGE_GREEK},				// Ancient Greak numbers
+    {0x1D200, 0x1D24F, LANGUAGE_GREEK},				// Ancient Greek Musical
+    {0x20000, 0x2A6DF, LANGUAGE_DEFAULT_CJK},		// CJK Unified Ideographs Extension B
+    {0x2F800, 0x2FA1F, LANGUAGE_DEFAULT_CJK}		// CJK Compatibility Ideographs Supplement
 };
 
 // get language matching to the missing char
@@ -432,7 +432,7 @@ LanguageType MapCharToLanguage( sal_UCS4 uChar )
             nDefaultLang = (LanguageType)rtl_str_toInt32( aKeyValBuf, 16 );
 
         // TODO: use the default-CJK language selected in
-        //  Tools->Options->LangSettings->Languages when it becomes available here
+        //	Tools->Options->LangSettings->Languages when it becomes available here
         if( !nDefaultLang )
             nDefaultLang = Application::GetSettings().GetUILanguage();
 
@@ -469,7 +469,7 @@ LanguageType MapCharToLanguage( sal_UCS4 uChar )
     while( nLow <= nHigh )
     {
         int nMiddle = (nHigh + nLow) / 2;
-        if( uChar < aLangFromCodeChart[ nMiddle].mnMinCode )
+        if( uChar < aLangFromCodeChart[ nMiddle].mnMinCode ) 
             nHigh = nMiddle - 1;
         else if( uChar > aLangFromCodeChart[ nMiddle].mnMaxCode )
             nLow = nMiddle + 1;
@@ -484,7 +484,7 @@ class WinGlyphFallbackSubstititution
 :    public ImplGlyphFallbackFontSubstitution
 {
 public:
-    explicit    WinGlyphFallbackSubstititution( HDC );
+    explicit	WinGlyphFallbackSubstititution( HDC );
 
     bool FindFontSubstitute( ImplFontSelectData&, rtl::OUString& rMissingChars ) const;
 private:
@@ -493,7 +493,7 @@ private:
 };
 
 inline WinGlyphFallbackSubstititution::WinGlyphFallbackSubstititution( HDC hDC )
-:   mhDC( hDC )
+:	mhDC( hDC )
 {}
 
 void ImplGetLogFontFromFontSelect( HDC, const ImplFontSelectData*,
@@ -516,7 +516,7 @@ bool WinGlyphFallbackSubstititution::HasMissingChars( const ImplFontData* pFace,
 
         // create HFONT from log font
         HFONT hNewFont = ::CreateFontIndirectW( &aLogFont );
-        // select the new font into device
+        // select the new font into device 
         HFONT hOldFont = ::SelectFont( mhDC, hNewFont );
 
         // read CMAP table to update their pCharMap
@@ -538,7 +538,7 @@ bool WinGlyphFallbackSubstititution::HasMissingChars( const ImplFontData* pFace,
     // static const int nMaxMatchCount = 1; // TODO: check more missing characters?
     const sal_Int32 nStrLen = rMissingChars.getLength();
     for( sal_Int32 nStrIdx = 0; nStrIdx < nStrLen; ++nStrIdx )
-    {
+    { 
         const sal_UCS4 uChar = rMissingChars.iterateCodePoints( &nStrIdx );
         nMatchCount += pCharMap->HasChar( uChar );
         break; // for now
@@ -572,7 +572,7 @@ bool WinGlyphFallbackSubstititution::FindFontSubstitute( ImplFontSelectData& rFo
         aLocale = Application::GetSettings().GetUILocale();
 
     // first level fallback:
-    // try use the locale specific default fonts defined in VCL.xcu
+    // try use the locale specific default fonts defined in VCL.xcu 
     const ImplDevFontList* pDevFontList = ImplGetSVData()->maGDIData.mpScreenFontList;
     /*const*/ ImplDevFontListData* pDevFont = pDevFontList->ImplFindByLocale( aLocale );
     if( pDevFont )
@@ -585,7 +585,7 @@ bool WinGlyphFallbackSubstititution::FindFontSubstitute( ImplFontSelectData& rFo
         }
     }
 
-    // are the missing characters symbols?
+    // are the missing characters symbols? 
     pDevFont = pDevFontList->ImplFindByAttributes( IMPL_FONT_ATTR_SYMBOL,
                     rFontSelData.meWeight, rFontSelData.meWidthType,
                     rFontSelData.meFamily, rFontSelData.meItalic, rFontSelData.maSearchName );
@@ -606,7 +606,7 @@ bool WinGlyphFallbackSubstititution::FindFontSubstitute( ImplFontSelectData& rFo
     int nTestFontCount = pTestFontList->Count();
     if( nTestFontCount > MAX_GFBFONT_COUNT )
         nTestFontCount = MAX_GFBFONT_COUNT;
-
+    
     for( int i = 0; i < nTestFontCount; ++i )
     {
         const ImplFontData* pFace = pTestFontList->Get( i );
@@ -2180,8 +2180,8 @@ static int WINAPI __AddFontResourceExW( LPCWSTR lpszfileName, DWORD fl, PVOID pd
 {
     typedef int (WINAPI *AddFontResourceExW_FUNC)(LPCWSTR, DWORD, PVOID );
 
-    static AddFontResourceExW_FUNC  pFunc = NULL;
-    static HMODULE                  hmGDI = NULL;
+    static AddFontResourceExW_FUNC	pFunc = NULL;
+    static HMODULE					hmGDI = NULL;
 
     if ( !pFunc && !hmGDI )
     {
@@ -2209,7 +2209,7 @@ bool ImplAddTempFont( SalData& rSalData, const String& rFontFileURL )
 #ifdef FR_PRIVATE
     nRet = __AddFontResourceExW( reinterpret_cast<LPCWSTR>(aUSytemPath.getStr()), FR_PRIVATE, NULL );
 #endif
-
+    
     if ( !nRet )
     {
         static int nCounter = 0;
@@ -2297,7 +2297,7 @@ static bool ImplGetFontAttrFromFile( const String& rFontFileURL,
     OSL_VERIFY( !osl::FileBase::getSystemPathFromFileURL( rFontFileURL, aUSytemPath ) );
 
     // get FontAttributes from a *fot file
-    // TODO: use GetTTGlobalFontInfo() to access the font directly
+    // TODO: use GetTTGlobalFontInfo() to access the font directly 
     rDFA.mnQuality    = 1000;
     rDFA.mbDevice     = true;
     rDFA.meFamily     = FAMILY_DONTKNOW;
@@ -2907,7 +2907,7 @@ BOOL WinSalGraphics::CreateFontSubset( const rtl::OUString& rToFile,
             sal_uInt32 nGlyphIdx = pGlyphIDs[i] & GF_IDXMASK;
             if( pGlyphIDs[i] & GF_ISCHAR ) // remaining pseudo-glyphs need to be translated
                 nGlyphIdx = pImplFontCharMap->GetGlyphIndex( nGlyphIdx );
-            if( (pGlyphIDs[i] & (GF_ROTMASK|GF_GSUB)) != 0) // TODO: vertical substitution
+            if( (pGlyphIDs[i] & (GF_ROTMASK|GF_GSUB)) != 0)	// TODO: vertical substitution
                 {/*####*/}
 
             nRealGlyphIds[i] = nGlyphIdx;
@@ -2941,11 +2941,11 @@ BOOL WinSalGraphics::CreateFontSubset( const rtl::OUString& rToFile,
     ::GetTTGlobalFontInfo( aSftTTF.get(), &aTTInfo );
     rInfo.m_nFontType   = FontSubsetInfo::SFNT_TTF;
     rInfo.m_aPSName     = ImplSalGetUniString( aTTInfo.psname );
-    rInfo.m_nAscent     = +aTTInfo.winAscent;
+    rInfo.m_nAscent	    = +aTTInfo.winAscent;
     rInfo.m_nDescent    = -aTTInfo.winDescent;
-    rInfo.m_aFontBBox   = Rectangle( Point( aTTInfo.xMin, aTTInfo.yMin ),
+    rInfo.m_aFontBBox	= Rectangle( Point( aTTInfo.xMin, aTTInfo.yMin ),
                                     Point( aTTInfo.xMax, aTTInfo.yMax ) );
-    rInfo.m_nCapHeight  = aTTInfo.yMax; // Well ...
+    rInfo.m_nCapHeight	= aTTInfo.yMax; // Well ...
 
     // subset TTF-glyphs and get their properties
     // take care that subset fonts require the NotDef glyph in pos 0
@@ -3057,7 +3057,7 @@ const void* WinSalGraphics::GetEmbedFontData( const ImplFontData* pFont,
             *pDataLen = 0;
         pCharWidths[i] = nCharWidth;
     }
-
+    
     if( !*pDataLen )
         return NULL;
 
@@ -3119,11 +3119,11 @@ void WinSalGraphics::GetGlyphWidths( const ImplFontData* pFont,
 
     // TODO: much better solution: move SetFont and restoration of old font to caller
     ScopedFont aOldFont(*this);
-
+    
     float fScale = 0.0;
     HFONT hOldFont = 0;
     ImplDoSetFont( &aIFSD, fScale, hOldFont );
-
+    
     if( pFont->IsSubsettable() )
     {
         // get raw font file data
@@ -3135,12 +3135,12 @@ void WinSalGraphics::GetGlyphWidths( const ImplFontData* pFont,
         sal_uInt32 nFaceNum = 0;
         if( !*xRawFontData.get() )  // TTC candidate
             nFaceNum = ~0U;  // indicate "TTC font extracts only"
-
+    
         ScopedTrueTypeFont aSftTTF;
         int nRC = aSftTTF.open( (void*)xRawFontData.get(), xRawFontData.size(), nFaceNum );
         if( nRC != SF_OK )
             return;
-
+    
         int nGlyphs = GetTTGlyphCount( aSftTTF.get() );
         if( nGlyphs > 0 )
         {
@@ -3194,7 +3194,7 @@ void WinSalGraphics::GetGlyphWidths( const ImplFontData* pFont,
                 rWidths.push_back( nCharWidth );
             }
         }
-    }
+    }    
 }
 
 //--------------------------------------------------------------------------
@@ -3210,14 +3210,14 @@ SystemFontData WinSalGraphics::GetSysFontData( int nFallbacklevel ) const
 
     if (nFallbacklevel >= MAX_FALLBACK) nFallbacklevel = MAX_FALLBACK - 1;
     if (nFallbacklevel < 0 ) nFallbacklevel = 0;
-
+    
     aSysFontData.nSize = sizeof( SystemFontData );
-    aSysFontData.hFont = mhFonts[nFallbacklevel];
+    aSysFontData.hFont = mhFonts[nFallbacklevel]; 
     aSysFontData.bFakeBold = false;
     aSysFontData.bFakeItalic = false;
     aSysFontData.bAntialias = true;
     aSysFontData.bVerticalCharacterType = false;
-
+    
     OSL_TRACE("\r\n:WinSalGraphics::GetSysFontData(): FontID: %p, Fallback level: %d",
               aSysFontData.hFont,
               nFallbacklevel);
diff --git a/vcl/win/source/gdi/salgdi_gdiplus.cxx b/vcl/win/source/gdi/salgdi_gdiplus.cxx
index 88efbb29d30a..d0000020e686 100644
--- a/vcl/win/source/gdi/salgdi_gdiplus.cxx
+++ b/vcl/win/source/gdi/salgdi_gdiplus.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
@@ -37,10 +37,10 @@
 #include <tools/debug.hxx>
 
 #ifndef min
-#define min(a,b)    (((a) < (b)) ? (a) : (b))
+#define min(a,b)	(((a) < (b)) ? (a) : (b))
 #endif
 #ifndef max
-#define max(a,b)    (((a) > (b)) ? (a) : (b))
+#define max(a,b)	(((a) > (b)) ? (a) : (b))
 #endif
 
 #if defined _MSC_VER
@@ -82,7 +82,7 @@ void impAddB2DPolygonToGDIPlusGraphicsPathReal(Gdiplus::GraphicsPath& rPath, con
                 const basegfx::B2DPoint aCb(rPolygon.getPrevControlPoint(nNextIndex));
 
                 rPath.AddBezier(
-                    aFCurr,
+                    aFCurr, 
                     Gdiplus::PointF(Gdiplus::REAL(aCa.getX()), Gdiplus::REAL(aCa.getY())),
                     Gdiplus::PointF(Gdiplus::REAL(aCb.getX()), Gdiplus::REAL(aCb.getY())),
                     aFNext);
@@ -128,7 +128,7 @@ void impAddB2DPolygonToGDIPlusGraphicsPathInteger(Gdiplus::GraphicsPath& rPath,
                 const basegfx::B2DPoint aCb(rPolygon.getPrevControlPoint(nNextIndex));
 
                 rPath.AddBezier(
-                    aICurr,
+                    aICurr, 
                     Gdiplus::Point(INT(aCa.getX()), INT(aCa.getY())),
                     Gdiplus::Point(INT(aCb.getX()), INT(aCb.getY())),
                     aINext);
@@ -246,7 +246,7 @@ bool WinSalGraphics::drawPolyLine( const basegfx::B2DPolygon& rPolygon, double f
             // #i101491# needed to create the correct line joins
             aPath.CloseFigure();
         }
-
+        
         if(getAntiAliasB2DDraw())
         {
             aGraphics.SetSmoothingMode(Gdiplus::SmoothingModeAntiAlias);
diff --git a/vcl/win/source/gdi/salnativewidgets-luna.cxx b/vcl/win/source/gdi/salnativewidgets-luna.cxx
index 8197fb37cd6d..dc7173ecd63d 100755
--- a/vcl/win/source/gdi/salnativewidgets-luna.cxx
+++ b/vcl/win/source/gdi/salnativewidgets-luna.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
@@ -165,7 +165,7 @@ HRESULT VisualStylesAPI::GetThemePartSize( HTHEME hTheme, HDC hdc, int iPartId,
 
 
 /*********************************************************
- * Initialize XP theming and local stuff
+ * Initialize XP theming and local stuff                         
  *********************************************************/
 void SalData::initNWF( void )
 {
@@ -244,8 +244,8 @@ BOOL WinSalGraphics::IsNativeControlSupported( ControlType nType, ControlPart nP
         case CTRL_SPINBOX:
             if( nPart == PART_ENTIRE_CONTROL )
                 hTheme = getThemeHandle( mhWnd, L"Edit");
-            else if( nPart == PART_ALL_BUTTONS ||
-                nPart == PART_BUTTON_UP || nPart == PART_BUTTON_DOWN ||
+            else if( nPart == PART_ALL_BUTTONS || 
+                nPart == PART_BUTTON_UP || nPart == PART_BUTTON_DOWN || 
                 nPart == PART_BUTTON_LEFT|| nPart == PART_BUTTON_RIGHT )
                 hTheme = getThemeHandle( mhWnd, L"Spin");
             break;
@@ -359,7 +359,7 @@ Rectangle ImplGetThemeRect( HTHEME hTheme, HDC hDC, int iPart, int iState, const
 // Helper functions
 // ----
 
-void ImplConvertSpinbuttonValues( int nControlPart, const ControlState& rState, const Rectangle& rRect,
+void ImplConvertSpinbuttonValues( int nControlPart, const ControlState& rState, const Rectangle& rRect, 
                                  int* pLunaPart, int *pLunaState, RECT *pRect )
 {
     if( nControlPart == PART_BUTTON_DOWN )
@@ -419,7 +419,7 @@ void ImplConvertSpinbuttonValues( int nControlPart, const ControlState& rState,
 
 // ----
 
-BOOL ImplDrawNativeControl( HDC hDC, HTHEME hTheme, RECT rc,
+BOOL ImplDrawNativeControl(	HDC hDC, HTHEME hTheme, RECT rc,
                             ControlType nType,
                             ControlPart nPart,
                             ControlState nState,
@@ -676,7 +676,7 @@ BOOL ImplDrawNativeControl( HDC hDC, HTHEME hTheme, RECT rc,
         else if( nState & CTRL_STATE_DEFAULT )
             iState = PBS_DEFAULTED;
         //else if( nState & CTRL_STATE_FOCUSED )
-        //    iState = PBS_DEFAULTED;    // may need to draw focus rect
+        //    iState = PBS_DEFAULTED;    // may need to draw focus rect 
         else
             iState = PBS_NORMAL;
 
@@ -698,7 +698,7 @@ BOOL ImplDrawNativeControl( HDC hDC, HTHEME hTheme, RECT rc,
             iState = bChecked ? RBS_CHECKEDNORMAL : RBS_UNCHECKEDNORMAL;
 
         //if( nState & CTRL_STATE_FOCUSED )
-        //    iState |= PBS_DEFAULTED;    // may need to draw focus rect
+        //    iState |= PBS_DEFAULTED;    // may need to draw focus rect 
 
         return ImplDrawTheme( hTheme, hDC, iPart, iState, rc, aCaption);
     }
@@ -709,20 +709,20 @@ BOOL ImplDrawNativeControl( HDC hDC, HTHEME hTheme, RECT rc,
         ButtonValue v = aValue.getTristateVal();
 
         if( nState & CTRL_STATE_PRESSED )
-            iState = (v == BUTTONVALUE_ON)  ? CBS_CHECKEDPRESSED :
+            iState = (v == BUTTONVALUE_ON)  ? CBS_CHECKEDPRESSED : 
                     ( (v == BUTTONVALUE_OFF) ? CBS_UNCHECKEDPRESSED : CBS_MIXEDPRESSED );
         else if( !(nState & CTRL_STATE_ENABLED) )
-            iState = (v == BUTTONVALUE_ON)  ? CBS_CHECKEDDISABLED :
+            iState = (v == BUTTONVALUE_ON)  ? CBS_CHECKEDDISABLED : 
                     ( (v == BUTTONVALUE_OFF) ? CBS_UNCHECKEDDISABLED : CBS_MIXEDDISABLED );
         else if( nState & CTRL_STATE_ROLLOVER )
-            iState = (v == BUTTONVALUE_ON)  ? CBS_CHECKEDHOT :
+            iState = (v == BUTTONVALUE_ON)  ? CBS_CHECKEDHOT : 
                     ( (v == BUTTONVALUE_OFF) ? CBS_UNCHECKEDHOT : CBS_MIXEDHOT );
         else
-            iState = (v == BUTTONVALUE_ON)  ? CBS_CHECKEDNORMAL :
+            iState = (v == BUTTONVALUE_ON)  ? CBS_CHECKEDNORMAL : 
                     ( (v == BUTTONVALUE_OFF) ? CBS_UNCHECKEDNORMAL : CBS_MIXEDNORMAL );
 
         //if( nState & CTRL_STATE_FOCUSED )
-        //    iState |= PBS_DEFAULTED;    // may need to draw focus rect
+        //    iState |= PBS_DEFAULTED;    // may need to draw focus rect 
 
         //SIZE sz;
         //THEMESIZE eSize = TS_DRAW; // TS_MIN, TS_TRUE, TS_DRAW
@@ -786,7 +786,7 @@ BOOL ImplDrawNativeControl( HDC hDC, HTHEME hTheme, RECT rc,
     {
         iPart = TABP_TABITEMLEFTEDGE;
         rc.bottom--;
-
+        
         OSL_ASSERT( aValue.getType() == CTRL_TAB_ITEM );
 
         const TabitemValue *pValue = static_cast<const TabitemValue*>(&aValue);
@@ -800,7 +800,7 @@ BOOL ImplDrawNativeControl( HDC hDC, HTHEME hTheme, RECT rc,
         else if( pValue->isRightAligned() )
             iPart = TABP_TABITEMRIGHTEDGE;
         else iPart = TABP_TABITEM;
-
+ 
         if( !(nState & CTRL_STATE_ENABLED) )
             iState = TILES_DISABLED;
         else if( nState & CTRL_STATE_SELECTED )
@@ -821,7 +821,7 @@ BOOL ImplDrawNativeControl( HDC hDC, HTHEME hTheme, RECT rc,
         else if( nState & CTRL_STATE_ROLLOVER )
             iState = TILES_HOT;
         else if( nState & CTRL_STATE_FOCUSED )
-            iState = TILES_FOCUSED;    // may need to draw focus rect
+            iState = TILES_FOCUSED;    // may need to draw focus rect 
         else
             iState = TILES_NORMAL;
         return ImplDrawTheme( hTheme, hDC, iPart, iState, rc, aCaption);
@@ -837,18 +837,18 @@ BOOL ImplDrawNativeControl( HDC hDC, HTHEME hTheme, RECT rc,
                 //iState = TS_DISABLED;
                 // disabled buttons are typically not painted at all but we need visual
                 // feedback when travelling by keyboard over disabled entries
-                iState = TS_HOT;
+                iState = TS_HOT;    
             else if( nState & CTRL_STATE_PRESSED )
                 iState = TS_PRESSED;
             else if( nState & CTRL_STATE_ROLLOVER )
                 iState = bChecked ? TS_HOTCHECKED : TS_HOT;
-            else
+            else 
                 iState = bChecked ? TS_CHECKED : TS_NORMAL;
             return ImplDrawTheme( hTheme, hDC, iPart, iState, rc, aCaption);
         }
         else if( nPart == PART_THUMB_HORZ || nPart == PART_THUMB_VERT )
         {
-            // the vertical gripper is not supported in most themes and it makes no
+            // the vertical gripper is not supported in most themes and it makes no 
             // sense to only support horizontal gripper
             //iPart = (nPart == PART_THUMB_HORZ) ? RP_GRIPPERVERT : RP_GRIPPER;
             //return ImplDrawTheme( hTheme, hDC, iPart, iState, rc, aCaption);
@@ -877,7 +877,7 @@ BOOL ImplDrawNativeControl( HDC hDC, HTHEME hTheme, RECT rc,
         }
         return ImplDrawTheme( hTheme, hDC, iPart, iState, rc, aCaption);
     }
-
+    
     if( nType == CTRL_PROGRESS )
     {
         if( nPart != PART_ENTIRE_CONTROL )
@@ -888,7 +888,7 @@ BOOL ImplDrawNativeControl( HDC hDC, HTHEME hTheme, RECT rc,
         RECT aProgressRect = rc;
         if( vsAPI.GetThemeBackgroundContentRect( hTheme, hDC, PP_BAR, iState, &rc, &aProgressRect) != S_OK )
             return false;
-
+        
         long nProgressWidth = aValue.getNumericVal();
         nProgressWidth *= (aProgressRect.right - aProgressRect.left);
         nProgressWidth /= (rc.right - rc.left);
@@ -899,12 +899,12 @@ BOOL ImplDrawNativeControl( HDC hDC, HTHEME hTheme, RECT rc,
 
         return ImplDrawTheme( hTheme, hDC, PP_CHUNK, iState, aProgressRect, aCaption );
     }
-
+    
     if( nType == CTRL_SLIDER )
     {
         iPart = (nPart == PART_TRACK_HORZ_AREA) ? TKP_TRACK : TKP_TRACKVERT;
         iState = (nPart == PART_TRACK_HORZ_AREA) ? TRS_NORMAL : TRVS_NORMAL;
-
+        
         Rectangle aTrackRect = ImplGetThemeRect( hTheme, hDC, iPart, iState, Rectangle() );
         RECT aTRect = rc;
         if( nPart == PART_TRACK_HORZ_AREA )
@@ -918,9 +918,9 @@ BOOL ImplDrawNativeControl( HDC hDC, HTHEME hTheme, RECT rc,
             long nW = aTrackRect.GetWidth();
             aTRect.left += (rc.right - rc.left - nW)/2;
             aTRect.right = aTRect.left + nW;
-        }
+        }        
         ImplDrawTheme( hTheme, hDC, iPart, iState, aTRect, aCaption );
-
+        
         RECT aThumbRect;
         OSL_ASSERT( aValue.getType() == CTRL_SLIDER );
         const SliderValue* pVal = static_cast<const SliderValue*>(&aValue);
@@ -932,7 +932,7 @@ BOOL ImplDrawNativeControl( HDC hDC, HTHEME hTheme, RECT rc,
         iState = (nState & CTRL_STATE_ENABLED) ? TUS_NORMAL : TUS_DISABLED;
         return ImplDrawTheme( hTheme, hDC, iPart, iState, aThumbRect, aCaption );
     }
-
+    
     if( nType == CTRL_LISTNODE )
     {
         if( nPart != PART_ENTIRE_CONTROL )
@@ -962,11 +962,11 @@ BOOL ImplDrawNativeControl( HDC hDC, HTHEME hTheme, RECT rc,
  *
  *  Draws the requested control described by nPart/nState.
  *
- *  rControlRegion: The bounding region of the complete control in VCL frame coordinates.
- *  aValue:         An optional value (tristate/numerical/string)
- *  aCaption:   A caption or title string (like button text etc)
+ *  rControlRegion:	The bounding region of the complete control in VCL frame coordinates.
+ *  aValue:  		An optional value (tristate/numerical/string)
+ *  aCaption:  	A caption or title string (like button text etc)
  */
-BOOL WinSalGraphics::drawNativeControl( ControlType nType,
+BOOL WinSalGraphics::drawNativeControl(	ControlType nType,
                             ControlPart nPart,
                             const Rectangle& rControlRegion,
                             ControlState nState,
@@ -1065,7 +1065,7 @@ BOOL WinSalGraphics::drawNativeControl( ControlType nType,
 
     // restore alignment
     SetTextAlign( mhDC, ta );
-
+   
 
     //GdiFlush();
 
@@ -1079,11 +1079,11 @@ BOOL WinSalGraphics::drawNativeControl( ControlType nType,
  *  OPTIONAL.  Draws the requested text for the control described by nPart/nState.
  *     Used if text not drawn by DrawNativeControl().
  *
- *  rControlRegion: The bounding region of the complete control in VCL frame coordinates.
- *  aValue:         An optional value (tristate/numerical/string)
- *  aCaption:   A caption or title string (like button text etc)
+ *  rControlRegion:	The bounding region of the complete control in VCL frame coordinates.
+ *  aValue:  		An optional value (tristate/numerical/string)
+ *  aCaption:  	A caption or title string (like button text etc)
  */
-BOOL WinSalGraphics::drawNativeControlText( ControlType,
+BOOL WinSalGraphics::drawNativeControlText(	ControlType,
                                 ControlPart,
                                 const Rectangle&,
                                 ControlState,
@@ -1103,9 +1103,9 @@ BOOL WinSalGraphics::drawNativeControlText( ControlType,
  *  within the control that can be safely drawn into without drawing over
  *  the borders of the control.
  *
- *  rControlRegion: The bounding region of the control in VCL frame coordinates.
- *  aValue:     An optional value (tristate/numerical/string)
- *  aCaption:       A caption or title string (like button text etc)
+ *  rControlRegion:	The bounding region of the control in VCL frame coordinates.
+ *  aValue:		An optional value (tristate/numerical/string)
+ *  aCaption:		A caption or title string (like button text etc)
  */
 BOOL WinSalGraphics::getNativeControlRegion(  ControlType nType,
                                 ControlPart nPart,
@@ -1124,13 +1124,13 @@ BOOL WinSalGraphics::getNativeControlRegion(  ControlType nType,
         if( nPart == PART_THUMB_HORZ || nPart == PART_THUMB_VERT )
         {
             /*
-            // the vertical gripper is not supported in most themes and it makes no
+            // the vertical gripper is not supported in most themes and it makes no 
             // sense to only support horizontal gripper
 
             HTHEME hTheme = getThemeHandle( mhWnd, L"Rebar");
             if( hTheme )
             {
-                Rectangle aRect( ImplGetThemeRect( hTheme, hDC, nPart == PART_THUMB_HORZ ? RP_GRIPPERVERT : RP_GRIPPER,
+                Rectangle aRect( ImplGetThemeRect( hTheme, hDC, nPart == PART_THUMB_HORZ ? RP_GRIPPERVERT : RP_GRIPPER, 
                     0, rControlRegion.GetBoundRect() ) );
                 if( nPart == PART_THUMB_HORZ && !aRect.IsEmpty() )
                 {
@@ -1150,7 +1150,7 @@ BOOL WinSalGraphics::getNativeControlRegion(  ControlType nType,
             HTHEME hTheme = getThemeHandle( mhWnd, L"Toolbar");
             if( hTheme )
             {
-                Rectangle aRect( ImplGetThemeRect( hTheme, hDC, TP_SPLITBUTTONDROPDOWN,
+                Rectangle aRect( ImplGetThemeRect( hTheme, hDC, TP_SPLITBUTTONDROPDOWN, 
                     TS_HOT, rControlRegion ) );
                 rNativeContentRegion = aRect;
                 rNativeBoundingRegion = rNativeContentRegion;
@@ -1164,7 +1164,7 @@ BOOL WinSalGraphics::getNativeControlRegion(  ControlType nType,
         HTHEME hTheme = getThemeHandle( mhWnd, L"Progress");
         if( hTheme )
         {
-            Rectangle aRect( ImplGetThemeRect( hTheme, hDC, PP_BAR,
+            Rectangle aRect( ImplGetThemeRect( hTheme, hDC, PP_BAR, 
                 0, rControlRegion ) );
             rNativeContentRegion = aRect;
             rNativeBoundingRegion = rNativeContentRegion;
@@ -1208,7 +1208,7 @@ BOOL WinSalGraphics::getNativeControlRegion(  ControlType nType,
                 long nFontHeight = aNonClientMetrics.lfMessageFont.lfHeight;
                 if( nFontHeight < 0 )
                     nFontHeight = -nFontHeight;
-
+                
                 if( aRect.GetHeight() && nFontHeight )
                 {
                     aRect.Bottom() += aRect.GetHeight();
@@ -1265,7 +1265,7 @@ BOOL WinSalGraphics::getNativeControlRegion(  ControlType nType,
             const TabitemValue *pValue = static_cast<const TabitemValue*>(&rControlValue);
             if ( pValue->isBothAligned() )
                 --aControlRect.Right();
-
+ 
             if ( nState & CTRL_STATE_SELECTED )
             {
                 aControlRect.Left() -= 2;
diff --git a/vcl/win/source/gdi/salprn.cxx b/vcl/win/source/gdi/salprn.cxx
index 9d8d41723f64..9ae638dd747a 100644
--- a/vcl/win/source/gdi/salprn.cxx
+++ b/vcl/win/source/gdi/salprn.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
@@ -28,6 +28,8 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_vcl.hxx"
 
+#define WINVER 0x0500
+
 #include <string.h>
 #include <tools/svwin.h>
 
@@ -66,7 +68,7 @@
     if (__builtin_setjmp(jmpbuf) == 0)                                      \
     {                                                                       \
         han.Set(jmpbuf, NULL, (__SEHandler::PF)EXCEPTION_EXECUTE_HANDLER)
-
+        
 #define CATCH_DRIVER_EX_END(mes, p)                                         \
     }                                                                       \
     han.Reset()
@@ -188,11 +190,11 @@ static ULONG ImplWinQueueStatusToSal( DWORD nWinStatus )
 
 static void getPrinterQueueInfoOldStyle( ImplPrnQueueList* pList )
 {
-    DWORD           i;
-    DWORD           n;
-    DWORD           nBytes = 0;
-    DWORD           nInfoPrn2;
-    BOOL            bFound = FALSE;
+    DWORD			i;
+    DWORD			n;
+    DWORD			nBytes = 0;
+    DWORD			nInfoPrn2;
+    BOOL			bFound = FALSE;
     PRINTER_INFO_2* pWinInfo2 = NULL;
     PRINTER_INFO_2* pGetInfo2;
     EnumPrintersA( PRINTER_ENUM_LOCAL, NULL, 2, NULL, 0, &nBytes, &nInfoPrn2 );
@@ -206,7 +208,7 @@ static void getPrinterQueueInfoOldStyle( ImplPrnQueueList* pList )
             {
                 SalPrinterQueueInfo* pInfo = new SalPrinterQueueInfo;
                 pInfo->maPrinterName = ImplSalGetUniString( pGetInfo2->pPrinterName );
-                pInfo->maDriver      = ImplSalGetUniString( pGetInfo2->pDriverName );
+                pInfo->maDriver 	 = ImplSalGetUniString( pGetInfo2->pDriverName );
                 XubString aPortName;
                 if ( pGetInfo2->pPortName )
                     aPortName = ImplSalGetUniString( pGetInfo2->pPortName );
@@ -218,9 +220,9 @@ static void getPrinterQueueInfoOldStyle( ImplPrnQueueList* pList )
                 // pComment can be 0 (the Windows docu doesn't describe this)
                 if ( pGetInfo2->pComment )
                     pInfo->maComment = ImplSalGetUniString( pGetInfo2->pComment );
-                pInfo->mnStatus      = ImplWinQueueStatusToSal( pGetInfo2->Status );
-                pInfo->mnJobs        = pGetInfo2->cJobs;
-                pInfo->mpSysData     = new XubString( aPortName );
+                pInfo->mnStatus 	 = ImplWinQueueStatusToSal( pGetInfo2->Status );
+                pInfo->mnJobs		 = pGetInfo2->cJobs;
+                pInfo->mpSysData	 = new XubString( aPortName );
                 pList->Add( pInfo );
                 pGetInfo2++;
             }
@@ -232,9 +234,9 @@ static void getPrinterQueueInfoOldStyle( ImplPrnQueueList* pList )
     // read printers from win.ini
     // TODO: MSDN: GetProfileString() should not be called from server
     // code because it is just there for WIN16 compatibility
-    UINT    nSize = 4096;
-    char*   pBuf = new char[nSize];
-    UINT    nRead = GetProfileStringA( aImplDevices, NULL, "", pBuf, nSize );
+    UINT	nSize = 4096;
+    char*	pBuf = new char[nSize];
+    UINT	nRead = GetProfileStringA( aImplDevices, NULL, "", pBuf, nSize );
     while ( nRead >= nSize-2 )
     {
         nSize += 2048;
@@ -247,9 +249,9 @@ static void getPrinterQueueInfoOldStyle( ImplPrnQueueList* pList )
     char* pName = pBuf;
     while ( *pName )
     {
-        char*   pPortName;
-        char*   pTmp;
-        char    aPortBuf[256];
+        char*	pPortName;
+        char*	pTmp;
+        char	aPortBuf[256];
         GetProfileStringA( aImplDevices, pName, "", aPortBuf, sizeof( aPortBuf ) );
 
         pPortName = aPortBuf;
@@ -296,11 +298,11 @@ static void getPrinterQueueInfoOldStyle( ImplPrnQueueList* pList )
             {
                 SalPrinterQueueInfo* pInfo = new SalPrinterQueueInfo;
                 pInfo->maPrinterName = aName;
-                pInfo->maDriver      = aDriver;
-                pInfo->maLocation    = aPortName;
-                pInfo->mnStatus      = 0;
-                pInfo->mnJobs        = QUEUE_JOBS_DONTKNOW;
-                pInfo->mpSysData     = new XubString( aPortName );
+                pInfo->maDriver 	 = aDriver;
+                pInfo->maLocation	 = aPortName;
+                pInfo->mnStatus 	 = 0;
+                pInfo->mnJobs		 = QUEUE_JOBS_DONTKNOW;
+                pInfo->mpSysData	 = new XubString( aPortName );
                 pList->Add( pInfo );
             }
         }
@@ -320,9 +322,9 @@ void WinSalInstance::GetPrinterQueueInfo( ImplPrnQueueList* pList )
         getPrinterQueueInfoOldStyle( pList );
         return;
     }
-    DWORD           i;
-    DWORD           nBytes = 0;
-    DWORD           nInfoPrn4 = 0;
+    DWORD			i;
+    DWORD			nBytes = 0;
+    DWORD			nInfoPrn4 = 0;
     PRINTER_INFO_4W* pWinInfo4 = NULL;
     EnumPrintersW( PRINTER_ENUM_LOCAL | PRINTER_ENUM_CONNECTIONS, NULL, 4, NULL, 0, &nBytes, &nInfoPrn4 );
     if ( nBytes )
@@ -334,9 +336,9 @@ void WinSalInstance::GetPrinterQueueInfo( ImplPrnQueueList* pList )
             {
                 SalPrinterQueueInfo* pInfo = new SalPrinterQueueInfo;
                 pInfo->maPrinterName = UniString( reinterpret_cast< const sal_Unicode* >(pWinInfo4[i].pPrinterName) );
-                pInfo->mnStatus      = 0;
-                pInfo->mnJobs        = 0;
-                pInfo->mpSysData     = NULL;
+                pInfo->mnStatus 	 = 0;
+                pInfo->mnJobs		 = 0;
+                pInfo->mpSysData	 = NULL;
                 pList->Add( pInfo );
             }
         }
@@ -348,9 +350,9 @@ void WinSalInstance::GetPrinterQueueInfo( ImplPrnQueueList* pList )
 
 static void getPrinterQueueStateOldStyle( SalPrinterQueueInfo* pInfo )
 {
-    DWORD               nBytes = 0;
-    DWORD               nInfoRet;
-    PRINTER_INFO_2*     pWinInfo2;
+    DWORD				nBytes = 0;
+    DWORD				nInfoRet;
+    PRINTER_INFO_2* 	pWinInfo2;
     EnumPrintersA( PRINTER_ENUM_LOCAL, NULL, 2, NULL, 0, &nBytes, &nInfoRet );
     if ( nBytes )
     {
@@ -376,10 +378,10 @@ static void getPrinterQueueStateOldStyle( SalPrinterQueueInfo* pInfo )
                     // pComment can be 0 (the Windows docu doesn't describe this)
                     if ( pGetInfo2->pComment )
                         pInfo->maComment = ImplSalGetUniString( pGetInfo2->pComment );
-                    pInfo->mnStatus      = ImplWinQueueStatusToSal( pGetInfo2->Status );
-                    pInfo->mnJobs        = pGetInfo2->cJobs;
+                    pInfo->mnStatus 	 = ImplWinQueueStatusToSal( pGetInfo2->Status );
+                    pInfo->mnJobs		 = pGetInfo2->cJobs;
                     if( ! pInfo->mpSysData )
-                        pInfo->mpSysData     = new XubString( aPortName );
+                        pInfo->mpSysData	 = new XubString( aPortName );
                     break;
                 }
 
@@ -398,12 +400,12 @@ void WinSalInstance::GetPrinterQueueState( SalPrinterQueueInfo* pInfo )
         getPrinterQueueStateOldStyle( pInfo );
         return;
     }
-
+    
     HANDLE hPrinter = 0;
     LPWSTR pPrnName = reinterpret_cast<LPWSTR>(const_cast<sal_Unicode*>(pInfo->maPrinterName.GetBuffer()));
     if( OpenPrinterW( pPrnName, &hPrinter, NULL ) )
     {
-        DWORD               nBytes = 0;
+        DWORD				nBytes = 0;
         GetPrinterW( hPrinter, 2, NULL, 0, &nBytes );
         if( nBytes )
         {
@@ -423,10 +425,10 @@ void WinSalInstance::GetPrinterQueueState( SalPrinterQueueInfo* pInfo )
                 // pComment can be 0 (the Windows docu doesn't describe this)
                 if ( pWinInfo2->pComment )
                     pInfo->maComment = String( reinterpret_cast< const sal_Unicode* >(pWinInfo2->pComment) );
-                pInfo->mnStatus      = ImplWinQueueStatusToSal( pWinInfo2->Status );
-                pInfo->mnJobs        = pWinInfo2->cJobs;
+                pInfo->mnStatus 	 = ImplWinQueueStatusToSal( pWinInfo2->Status );
+                pInfo->mnJobs		 = pWinInfo2->cJobs;
                 if( ! pInfo->mpSysData )
-                    pInfo->mpSysData     = new XubString( aPortName );
+                    pInfo->mpSysData	 = new XubString( aPortName );
             }
             rtl_freeMemory(pWinInfo2);
         }
@@ -512,7 +514,7 @@ static DWORD ImplDeviceCaps( WinSalInfoPrinter* pPrinter, WORD nCaps,
             pDevMode = NULL;
         else
             pDevMode = SAL_DEVMODE_W( pSetupData );
-
+    
         return DeviceCapabilitiesW( reinterpret_cast<LPCWSTR>(pPrinter->maDeviceName.GetBuffer()),
                                     reinterpret_cast<LPCWSTR>(pPrinter->maPortName.GetBuffer()),
                                     nCaps, (LPWSTR)pOutput, pDevMode );
@@ -524,7 +526,7 @@ static DWORD ImplDeviceCaps( WinSalInfoPrinter* pPrinter, WORD nCaps,
             pDevMode = NULL;
         else
             pDevMode = SAL_DEVMODE_A( pSetupData );
-
+    
         return DeviceCapabilitiesA( ImplSalGetWinAnsiString( pPrinter->maDeviceName, TRUE ).GetBuffer(),
                                 ImplSalGetWinAnsiString( pPrinter->maPortName, TRUE ).GetBuffer(),
                                 nCaps, (LPSTR)pOutput, pDevMode );
@@ -595,7 +597,7 @@ static BOOL ImplTestSalJobSetup( WinSalInfoPrinter* pPrinter,
                                                    (LPSTR)aPrinterNameA.GetBuffer(),
                                                    NULL, NULL, 0 );
             }
-
+            
             if( nSysJobSize < 0 )
             {
                 ClosePrinter( hPrn );
@@ -678,12 +680,12 @@ static BOOL ImplUpdateSalJobSetup( WinSalInfoPrinter* pPrinter, ImplJobSetup* pS
     if( hPrn == HGDI_ERROR )
         return FALSE;
 
-    LONG            nRet;
-    LONG            nSysJobSize = -1;
-    HWND            hWnd = 0;
-    DWORD           nMode = DM_OUT_BUFFER;
-    ULONG           nDriverDataLen = 0;
-    SalDriverData*  pOutBuffer = NULL;
+    LONG			nRet;
+    LONG			nSysJobSize = -1;
+    HWND			hWnd = 0;
+    DWORD			nMode = DM_OUT_BUFFER;
+    ULONG			nDriverDataLen = 0;
+    SalDriverData*	pOutBuffer = NULL;
     BYTE*           pInBuffer = NULL;
 
     if( aSalShlData.mbWPrinter )
@@ -703,12 +705,12 @@ static BOOL ImplUpdateSalJobSetup( WinSalInfoPrinter* pPrinter, ImplJobSetup* pS
     }
 
     // Outputbuffer anlegen
-    nDriverDataLen              = sizeof(SalDriverData) + nSysJobSize-1;
-    pOutBuffer                  = (SalDriverData*)rtl_allocateZeroMemory( nDriverDataLen );
-    pOutBuffer->mnSysSignature  = SAL_DRIVERDATA_SYSSIGN;
-    pOutBuffer->mnVersion       = aSalShlData.mbWPrinter ? SAL_DRIVERDATA_VERSION_W : SAL_DRIVERDATA_VERSION_A;
+    nDriverDataLen				= sizeof(SalDriverData) + nSysJobSize-1;
+    pOutBuffer					= (SalDriverData*)rtl_allocateZeroMemory( nDriverDataLen );
+    pOutBuffer->mnSysSignature	= SAL_DRIVERDATA_SYSSIGN;
+    pOutBuffer->mnVersion		= aSalShlData.mbWPrinter ? SAL_DRIVERDATA_VERSION_W : SAL_DRIVERDATA_VERSION_A;
     // calculate driver data offset including structure padding
-    pOutBuffer->mnDriverOffset  = sal::static_int_cast<USHORT>(
+    pOutBuffer->mnDriverOffset	= sal::static_int_cast<USHORT>(
                                     (char*)pOutBuffer->maDriverData -
                                     (char*)pOutBuffer );
 
@@ -730,7 +732,7 @@ static BOOL ImplUpdateSalJobSetup( WinSalInfoPrinter* pPrinter, ImplJobSetup* pS
     ULONG nMutexCount=0;
     if ( pVisibleDlgParent )
         nMutexCount = ImplSalReleaseYieldMutex();
-
+    
     BYTE* pOutDevMode = (((BYTE*)pOutBuffer) + pOutBuffer->mnDriverOffset);
     if( aSalShlData.mbWPrinter )
     {
@@ -790,8 +792,8 @@ static BOOL ImplUpdateSalJobSetup( WinSalInfoPrinter* pPrinter, ImplJobSetup* pS
     if ( pSetupData->mpDriverData )
         rtl_freeMemory( pSetupData->mpDriverData );
     pSetupData->mnDriverDataLen = nDriverDataLen;
-    pSetupData->mpDriverData    = (BYTE*)pOutBuffer;
-    pSetupData->mnSystem        = JOBSETUP_SYSTEM_WINDOWS;
+    pSetupData->mpDriverData	= (BYTE*)pOutBuffer;
+    pSetupData->mnSystem		= JOBSETUP_SYSTEM_WINDOWS;
 
     return TRUE;
 }
@@ -858,10 +860,10 @@ static void ImplDevModeToJobSetup( WinSalInfoPrinter* pPrinter, ImplJobSetup* pS
         }
         else
         {
-            ULONG   nPaperCount = ImplDeviceCaps( pPrinter, DC_PAPERS, NULL, pSetupData );
-            WORD*   pPapers = NULL;
-            ULONG   nPaperSizeCount = ImplDeviceCaps( pPrinter, DC_PAPERSIZE, NULL, pSetupData );
-            POINT*  pPaperSizes = NULL;
+            ULONG	nPaperCount = ImplDeviceCaps( pPrinter, DC_PAPERS, NULL, pSetupData );
+            WORD*	pPapers = NULL;
+            ULONG	nPaperSizeCount = ImplDeviceCaps( pPrinter, DC_PAPERSIZE, NULL, pSetupData );
+            POINT*	pPaperSizes = NULL;
             if ( nPaperCount && (nPaperCount != GDI_ERROR) )
             {
                 pPapers = (WORD*)rtl_allocateZeroMemory(nPaperCount*sizeof(WORD));
@@ -921,14 +923,14 @@ static void ImplDevModeToJobSetup( WinSalInfoPrinter* pPrinter, ImplJobSetup* pS
             //See http://wiki.services.openoffice.org/wiki/DefaultPaperSize
             //i.e.
             //http://msdn.microsoft.com/en-us/library/dd319099(VS.85).aspx
-            //DMPAPER_B4    12  B4 (JIS) 257 x 364 mm
+            //DMPAPER_B4	12	B4 (JIS) 257 x 364 mm
             //http://partners.adobe.com/public/developer/en/ps/5003.PPD_Spec_v4.3.pdf
             //also says that the MS DMPAPER_B4 is JIS, which makes most sense. And
             //matches our Excel filter's belief about the matching XlPaperSize
             //enumeration.
             //
             //http://msdn.microsoft.com/en-us/library/ms776398(VS.85).aspx said
-            ////"DMPAPER_B4     12  B4 (JIS) 250 x 354"
+            ////"DMPAPER_B4 	12 	B4 (JIS) 250 x 354"
             //which is bogus as it's either JIS 257 × 364 or ISO 250 × 353
             //(cmc)
             case( DMPAPER_B4 ):
@@ -1056,7 +1058,7 @@ static void ImplDevModeToJobSetup( WinSalInfoPrinter* pPrinter, ImplJobSetup* pS
                 break;
         }
     }
-
+    
     if( nFlags & SAL_JOBSET_DUPLEXMODE )
     {
         DuplexMode eDuplex = DUPLEX_UNKNOWN;
@@ -1110,8 +1112,8 @@ static void ImplJobSetupToDevMode( WinSalInfoPrinter* pPrinter, ImplJobSetup* pS
     // PaperSize
     if ( nFlags & SAL_JOBSET_PAPERSIZE )
     {
-        CHOOSE_DEVMODE(dmFields)        |= DM_PAPERSIZE;
-        CHOOSE_DEVMODE(dmPaperWidth)     = 0;
+        CHOOSE_DEVMODE(dmFields)		|= DM_PAPERSIZE;
+        CHOOSE_DEVMODE(dmPaperWidth)	 = 0;
         CHOOSE_DEVMODE(dmPaperLength)    = 0;
 
         switch( pSetupData->mePaperFormat )
@@ -1143,11 +1145,11 @@ static void ImplJobSetupToDevMode( WinSalInfoPrinter* pPrinter, ImplJobSetup* pS
 #if 0
             //http://msdn.microsoft.com/en-us/library/ms776398(VS.85).aspx
             //DMPAPER_ENV_B6 is documented as:
-            //"DMPAPER_ENV_B6   35  Envelope B6 176 x 125 mm"
+            //"DMPAPER_ENV_B6 	35 	Envelope B6 176 x 125 mm"
             //which is the wrong way around, it is surely 125 x 176, i.e.
             //compare DMPAPER_ENV_B4 and DMPAPER_ENV_B4 as
-            //DMPAPER_ENV_B4    33  Envelope B4 250 x 353 mm
-            //DMPAPER_ENV_B5    34  Envelope B5 176 x 250 mm
+            //DMPAPER_ENV_B4 	33 	Envelope B4 250 x 353 mm
+            //DMPAPER_ENV_B5 	34 	Envelope B5 176 x 250 mm
             case( PAPER_B6_ISO ):
                 CHOOSE_DEVMODE(dmPaperSize) = DMPAPER_ENV_B6;
                 break;
@@ -1272,12 +1274,12 @@ static void ImplJobSetupToDevMode( WinSalInfoPrinter* pPrinter, ImplJobSetup* pS
                 break;
             default:
             {
-                short   nPaper = 0;
-                ULONG   nPaperCount = ImplDeviceCaps( pPrinter, DC_PAPERS, NULL, pSetupData );
-                WORD*   pPapers = NULL;
-                ULONG   nPaperSizeCount = ImplDeviceCaps( pPrinter, DC_PAPERSIZE, NULL, pSetupData );
-                POINT*  pPaperSizes = NULL;
-                DWORD   nLandscapeAngle = ImplDeviceCaps( pPrinter, DC_ORIENTATION, NULL, pSetupData );
+                short	nPaper = 0;
+                ULONG	nPaperCount = ImplDeviceCaps( pPrinter, DC_PAPERS, NULL, pSetupData );
+                WORD*	pPapers = NULL;
+                ULONG	nPaperSizeCount = ImplDeviceCaps( pPrinter, DC_PAPERSIZE, NULL, pSetupData );
+                POINT*	pPaperSizes = NULL;
+                DWORD	nLandscapeAngle = ImplDeviceCaps( pPrinter, DC_ORIENTATION, NULL, pSetupData );
                 if ( nPaperCount && (nPaperCount != GDI_ERROR) )
                 {
                     pPapers = (WORD*)rtl_allocateZeroMemory(nPaperCount*sizeof(WORD));
@@ -1323,9 +1325,9 @@ static void ImplJobSetupToDevMode( WinSalInfoPrinter* pPrinter, ImplJobSetup* pS
 
                 if ( !nPaper )
                 {
-                    CHOOSE_DEVMODE(dmFields)       |= DM_PAPERLENGTH | DM_PAPERWIDTH;
-                    CHOOSE_DEVMODE(dmPaperSize)     = DMPAPER_USER;
-                    CHOOSE_DEVMODE(dmPaperWidth)    = (short)(pSetupData->mnPaperWidth/10);
+                    CHOOSE_DEVMODE(dmFields)	   |= DM_PAPERLENGTH | DM_PAPERWIDTH;
+                    CHOOSE_DEVMODE(dmPaperSize)    	= DMPAPER_USER;
+                    CHOOSE_DEVMODE(dmPaperWidth)	= (short)(pSetupData->mnPaperWidth/10);
                     CHOOSE_DEVMODE(dmPaperLength)   = (short)(pSetupData->mnPaperHeight/10);
                 }
 
@@ -1451,12 +1453,12 @@ static WinSalGraphics* ImplCreateSalPrnGraphics( HDC hDC )
 {
     WinSalGraphics* pGraphics = new WinSalGraphics;
     pGraphics->SetLayout( 0 );
-    pGraphics->mhDC     = hDC;
-    pGraphics->mhWnd    = 0;
+    pGraphics->mhDC		= hDC;
+    pGraphics->mhWnd 	= 0;
     pGraphics->mbPrinter = TRUE;
-    pGraphics->mbVirDev = FALSE;
-    pGraphics->mbWindow = FALSE;
-    pGraphics->mbScreen = FALSE;
+    pGraphics->mbVirDev	= FALSE;
+    pGraphics->mbWindow	= FALSE;
+    pGraphics->mbScreen	= FALSE;
     ImplSalInitGraphics( pGraphics );
     return pGraphics;
 }
@@ -1477,7 +1479,7 @@ static BOOL ImplUpdateSalPrnIC( WinSalInfoPrinter* pPrinter, ImplJobSetup* pSetu
     }
 
     pPrinter->mpGraphics = ImplCreateSalPrnGraphics( hNewDC );
-    pPrinter->mhDC      = hNewDC;
+    pPrinter->mhDC		= hNewDC;
 
     return TRUE;
 }
@@ -1490,9 +1492,9 @@ SalInfoPrinter* WinSalInstance::CreateInfoPrinter( SalPrinterQueueInfo* pQueueIn
     WinSalInfoPrinter* pPrinter = new WinSalInfoPrinter;
     if( ! pQueueInfo->mpSysData )
         GetPrinterQueueState( pQueueInfo );
-    pPrinter->maDriverName  = pQueueInfo->maDriver;
-    pPrinter->maDeviceName  = pQueueInfo->maPrinterName;
-    pPrinter->maPortName    = pQueueInfo->mpSysData ?
+    pPrinter->maDriverName	= pQueueInfo->maDriver;
+    pPrinter->maDeviceName	= pQueueInfo->maPrinterName;
+    pPrinter->maPortName	= pQueueInfo->mpSysData ? 
                                 *(String*)(pQueueInfo->mpSysData)
                               : String();
 
@@ -1507,7 +1509,7 @@ SalInfoPrinter* WinSalInstance::CreateInfoPrinter( SalPrinterQueueInfo* pQueueIn
     }
 
     pPrinter->mpGraphics = ImplCreateSalPrnGraphics( hDC );
-    pPrinter->mhDC      = hDC;
+    pPrinter->mhDC		= hDC;
     if ( !pSetupData->mpDriverData )
         ImplUpdateSalJobSetup( pPrinter, pSetupData, FALSE, NULL );
     ImplDevModeToJobSetup( pPrinter, pSetupData, SAL_JOBSET_ALL );
@@ -1758,12 +1760,12 @@ void WinSalInfoPrinter::GetPageInfo( const ImplJobSetup*,
 {
     HDC hDC = mhDC;
 
-    rOutWidth   = GetDeviceCaps( hDC, HORZRES );
-    rOutHeight  = GetDeviceCaps( hDC, VERTRES );
+    rOutWidth	= GetDeviceCaps( hDC, HORZRES );
+    rOutHeight	= GetDeviceCaps( hDC, VERTRES );
 
-    rPageOffX   = GetDeviceCaps( hDC, PHYSICALOFFSETX );
-    rPageOffY   = GetDeviceCaps( hDC, PHYSICALOFFSETY );
-    rPageWidth  = GetDeviceCaps( hDC, PHYSICALWIDTH );
+    rPageOffX	= GetDeviceCaps( hDC, PHYSICALOFFSETX );
+    rPageOffY	= GetDeviceCaps( hDC, PHYSICALOFFSETY );
+    rPageWidth	= GetDeviceCaps( hDC, PHYSICALWIDTH );
     rPageHeight = GetDeviceCaps( hDC, PHYSICALHEIGHT );
 }
 
@@ -1787,10 +1789,10 @@ void WinSalInstance::DestroyPrinter( SalPrinter* pPrinter )
 
 WIN_BOOL CALLBACK SalPrintAbortProc( HDC hPrnDC, int /* nError */ )
 {
-    SalData*    pSalData = GetSalData();
+    SalData*	pSalData = GetSalData();
     WinSalPrinter* pPrinter;
-    BOOL        bWhile = TRUE;
-    int         i = 0;
+    BOOL		bWhile = TRUE;
+    int 		i = 0;
 
     do
     {
@@ -1838,7 +1840,7 @@ static LPDEVMODEA ImplSalSetCopies( LPDEVMODEA pDevMode, ULONG nCopies, BOOL bCo
         memcpy( pNewDevMode, pDevMode, nDevSize );
         pDevMode = pNewDevMode;
         pDevMode->dmFields |= DM_COPIES;
-        pDevMode->dmCopies  = (short)(USHORT)nCopies;
+        pDevMode->dmCopies	= (short)(USHORT)nCopies;
         if ( aSalShlData.mbW40 )
         {
             pDevMode->dmFields |= DM_COLLATE;
@@ -1864,7 +1866,7 @@ static LPDEVMODEW ImplSalSetCopies( LPDEVMODEW pDevMode, ULONG nCopies, BOOL bCo
         memcpy( pNewDevMode, pDevMode, nDevSize );
         pDevMode = pNewDevMode;
         pDevMode->dmFields |= DM_COPIES;
-        pDevMode->dmCopies  = (short)(USHORT)nCopies;
+        pDevMode->dmCopies	= (short)(USHORT)nCopies;
         if ( aSalShlData.mbW40 )
         {
             pDevMode->dmFields |= DM_COLLATE;
@@ -1968,15 +1970,15 @@ BOOL WinSalPrinter::StartJob( const XubString* pFileName,
                            bool /*bDirect*/,
                            ImplJobSetup* pSetupData )
 {
-    mnError     = 0;
-    mbAbort     = FALSE;
-    mnCopies        = nCopies;
-    mbCollate   = bCollate;
-
-    LPDEVMODEA  pOrgDevModeA = NULL;
-    LPDEVMODEA  pDevModeA = NULL;
-    LPDEVMODEW  pOrgDevModeW = NULL;
-    LPDEVMODEW  pDevModeW = NULL;
+    mnError		= 0;
+    mbAbort		= FALSE;
+    mnCopies		= nCopies;
+    mbCollate 	= bCollate;
+
+    LPDEVMODEA	pOrgDevModeA = NULL;
+    LPDEVMODEA	pDevModeA = NULL;
+    LPDEVMODEW	pOrgDevModeW = NULL;
+    LPDEVMODEW	pDevModeW = NULL;
     HDC hDC = 0;
     if( aSalShlData.mbWPrinter )
     {
@@ -1987,7 +1989,7 @@ BOOL WinSalPrinter::StartJob( const XubString* pFileName,
         }
         else
             pDevModeW = NULL;
-
+    
         // #95347 some buggy drivers (eg, OKI) write to those buffers in CreateDC, although declared const - so provide some space
         sal_Unicode aDrvBuf[4096];
         sal_Unicode aDevBuf[4096];
@@ -1997,7 +1999,7 @@ BOOL WinSalPrinter::StartJob( const XubString* pFileName,
                          reinterpret_cast<LPCWSTR>(aDevBuf),
                          NULL,
                          pDevModeW );
-
+    
         if ( pDevModeW != pOrgDevModeW )
             rtl_freeMemory( pDevModeW );
     }
@@ -2010,7 +2012,7 @@ BOOL WinSalPrinter::StartJob( const XubString* pFileName,
         }
         else
             pDevModeA = NULL;
-
+    
         // #95347 some buggy drivers (eg, OKI) write to those buffers in CreateDC, although declared const - so provide some space
         ByteString aDriver ( ImplSalGetWinAnsiString( mpInfoPrinter->maDriverName, TRUE ) );
         ByteString aDevice ( ImplSalGetWinAnsiString( mpInfoPrinter->maDeviceName, TRUE ) );
@@ -2024,10 +2026,10 @@ BOOL WinSalPrinter::StartJob( const XubString* pFileName,
                          lpszDeviceName,
                          NULL,
                          pDevModeA );
-
+    
         delete [] lpszDriverName;
         delete [] lpszDeviceName;
-
+    
         if ( pDevModeA != pOrgDevModeA )
             rtl_freeMemory( pDevModeA );
     }
@@ -2046,8 +2048,8 @@ BOOL WinSalPrinter::StartJob( const XubString* pFileName,
         return FALSE;
     }
 
-    mnError = 0;
-    mbAbort = FALSE;
+    mnError	= 0;
+    mbAbort	= FALSE;
 
     // Wegen Telocom Balloon Fax-Treiber, der uns unsere Messages
     // ansonsten oefters schickt, versuchen wir vorher alle
@@ -2125,10 +2127,10 @@ BOOL WinSalPrinter::StartJob( const XubString* pFileName,
         }
         else
             aInfo.lpszOutput = NULL;
-
+    
         // start Job
         int nRet = lcl_StartDocW( hDC, &aInfo, this );
-
+        
         if ( nRet <= 0 )
         {
             long nError = GetLastError();
@@ -2136,7 +2138,7 @@ BOOL WinSalPrinter::StartJob( const XubString* pFileName,
                 mnError = SAL_PRINTER_ERROR_ABORT;
             else
                 mnError = SAL_PRINTER_ERROR_GENERALERROR;
-            return FALSE;
+            return FALSE;            
         }
     }
     else
@@ -2144,7 +2146,7 @@ BOOL WinSalPrinter::StartJob( const XubString* pFileName,
         // Both strings must exist, if StartJob() is called
         ByteString aJobName( ImplSalGetWinAnsiString( rJobName, TRUE ) );
         ByteString aFileName;
-
+    
         DOCINFOA aInfo;
         memset( &aInfo, 0, sizeof( DOCINFOA ) );
         aInfo.cbSize = sizeof( aInfo );
@@ -2161,7 +2163,7 @@ BOOL WinSalPrinter::StartJob( const XubString* pFileName,
         }
         else
             aInfo.lpszOutput = NULL;
-
+    
         // start Job
         int nRet = lcl_StartDocA( hDC, &aInfo, this );
         if ( nRet <= 0 )
@@ -2205,7 +2207,7 @@ BOOL WinSalPrinter::EndJob()
         if( ::EndDoc( hDC ) <= 0 )
             err = GetLastError();
         CATCH_DRIVER_EX_END( "exception in EndDoc", this );
-
+        
         pSalData->mpFirstInstance->AcquireYieldMutex( nAcquire );
         DeleteDC( hDC );
         mhDC = 0;
@@ -2236,7 +2238,7 @@ BOOL WinSalPrinter::AbortJob()
 
 void ImplSalPrinterAbortJobAsync( HDC hPrnDC )
 {
-    SalData*    pSalData = GetSalData();
+    SalData*	pSalData = GetSalData();
     WinSalPrinter* pPrinter = pSalData->mpFirstPrinter;
 
     // Feststellen, ob Printer noch existiert
@@ -2277,14 +2279,14 @@ SalGraphics* WinSalPrinter::StartPage( ImplJobSetup* pSetupData, BOOL bNewJobDat
 {
     if( ! isValid() || mhDC == 0 )
         return NULL;
-
+    
     HDC hDC = mhDC;
     if ( pSetupData && pSetupData->mpDriverData && bNewJobData )
     {
         if( aSalShlData.mbWPrinter )
         {
-            LPDEVMODEW  pOrgDevModeW;
-            LPDEVMODEW  pDevModeW;
+            LPDEVMODEW	pOrgDevModeW;
+            LPDEVMODEW	pDevModeW;
             pOrgDevModeW = SAL_DEVMODE_W( pSetupData );
             pDevModeW = ImplSalSetCopies( pOrgDevModeW, mnCopies, mbCollate );
             ResetDCW( hDC, pDevModeW );
@@ -2293,8 +2295,8 @@ SalGraphics* WinSalPrinter::StartPage( ImplJobSetup* pSetupData, BOOL bNewJobDat
         }
         else
         {
-            LPDEVMODEA  pOrgDevModeA;
-            LPDEVMODEA  pDevModeA;
+            LPDEVMODEA	pOrgDevModeA;
+            LPDEVMODEA	pDevModeA;
             pOrgDevModeA = SAL_DEVMODE_A( pSetupData );
             pDevModeA = ImplSalSetCopies( pOrgDevModeA, mnCopies, mbCollate );
             ResetDCA( hDC, pDevModeA );
@@ -2306,7 +2308,7 @@ SalGraphics* WinSalPrinter::StartPage( ImplJobSetup* pSetupData, BOOL bNewJobDat
     CATCH_DRIVER_EX_BEGIN;
     nRet = ::StartPage( hDC );
     CATCH_DRIVER_EX_END( "exception in StartPage", this );
-
+    
     if ( nRet <= 0 )
     {
         GetLastError();
@@ -2316,8 +2318,8 @@ SalGraphics* WinSalPrinter::StartPage( ImplJobSetup* pSetupData, BOOL bNewJobDat
 
     // Hack to work around old PostScript printer drivers optimizing away empty pages
     // TODO: move into ImplCreateSalPrnGraphics()?
-    HPEN    hTempPen = SelectPen( hDC, GetStockPen( NULL_PEN ) );
-    HBRUSH  hTempBrush = SelectBrush( hDC, GetStockBrush( NULL_BRUSH ) );
+    HPEN	hTempPen = SelectPen( hDC, GetStockPen( NULL_PEN ) );
+    HBRUSH	hTempBrush = SelectBrush( hDC, GetStockBrush( NULL_BRUSH ) );
     WIN_Rectangle( hDC, -8000, -8000, -7999, -7999 );
     SelectPen( hDC, hTempPen );
     SelectBrush( hDC, hTempBrush );
@@ -2340,7 +2342,7 @@ BOOL WinSalPrinter::EndPage()
 
     if( ! isValid() )
         return FALSE;
-
+    
     int nRet = 0;
     CATCH_DRIVER_EX_BEGIN;
     nRet = ::EndPage( hDC );
diff --git a/vcl/win/source/gdi/salvd.cxx b/vcl/win/source/gdi/salvd.cxx
index 816a8fef1141..900673990534 100644
--- a/vcl/win/source/gdi/salvd.cxx
+++ b/vcl/win/source/gdi/salvd.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
@@ -64,9 +64,9 @@ static HBITMAP ImplCreateVirDevBitmap( HDC hDC, long nDX, long nDY,
          aBitmapInfo.bmiHeader.biYPelsPerMeter = 0;
          aBitmapInfo.bmiHeader.biClrUsed = 0;
          aBitmapInfo.bmiHeader.biClrImportant = 0;
-
+ 
          void* pDummy;
-         hBitmap = CreateDIBSection( hDC, &aBitmapInfo,
+         hBitmap = CreateDIBSection( hDC, &aBitmapInfo, 
                                      DIB_RGB_COLORS, &pDummy, NULL,
                                      0 );
      }
@@ -83,7 +83,7 @@ SalVirtualDevice* WinSalInstance::CreateVirtualDevice( SalGraphics* pSGraphics,
 {
     WinSalGraphics* pGraphics = static_cast<WinSalGraphics*>(pSGraphics);
 
-    HDC     hDC = NULL;
+    HDC 	hDC = NULL;
     HBITMAP hBmp = NULL;
     BOOL    bOk = FALSE;
 
@@ -95,11 +95,11 @@ SalVirtualDevice* WinSalInstance::CreateVirtualDevice( SalGraphics* pSGraphics,
     }
     else
     {
-        hDC     = CreateCompatibleDC( pGraphics->mhDC );
+        hDC 	= CreateCompatibleDC( pGraphics->mhDC );
         if( !hDC )
             ImplWriteLastError( GetLastError(), "CreateCompatibleDC in CreateVirtualDevice" );
 
-        hBmp    = ImplCreateVirDevBitmap( pGraphics->mhDC,
+        hBmp	= ImplCreateVirDevBitmap( pGraphics->mhDC,
                                         nDX, nDY, nBitCount );
         if( !hBmp )
             ImplWriteLastError( GetLastError(), "ImplCreateVirDevBitmap in CreateVirtualDevice" );
@@ -114,12 +114,12 @@ SalVirtualDevice* WinSalInstance::CreateVirtualDevice( SalGraphics* pSGraphics,
 
     if ( bOk )
     {
-        WinSalVirtualDevice*    pVDev = new WinSalVirtualDevice;
+        WinSalVirtualDevice*	pVDev = new WinSalVirtualDevice;
         SalData*                pSalData = GetSalData();
         WinSalGraphics*         pVirGraphics = new WinSalGraphics;
         pVirGraphics->SetLayout( 0 );   // by default no! mirroring for VirtualDevices, can be enabled with EnableRTL()
-        pVirGraphics->mhDC     = hDC;
-        pVirGraphics->mhWnd    = 0;
+        pVirGraphics->mhDC	   = hDC;
+        pVirGraphics->mhWnd	   = 0;
         pVirGraphics->mbPrinter = FALSE;
         pVirGraphics->mbVirDev  = TRUE;
         pVirGraphics->mbWindow  = FALSE;
@@ -131,15 +131,15 @@ SalVirtualDevice* WinSalInstance::CreateVirtualDevice( SalGraphics* pSGraphics,
         }
         ImplSalInitGraphics( pVirGraphics );
 
-        pVDev->mhDC         = hDC;
-        pVDev->mhBmp        = hBmp;
+        pVDev->mhDC		    = hDC;
+        pVDev->mhBmp		= hBmp;
         if( hBmp )
-            pVDev->mhDefBmp = SelectBitmap( hDC, hBmp );
+            pVDev->mhDefBmp	= SelectBitmap( hDC, hBmp );
         else
             pVDev->mhDefBmp = NULL;
-        pVDev->mpGraphics   = pVirGraphics;
-        pVDev->mnBitCount   = nBitCount;
-        pVDev->mbGraphics   = FALSE;
+        pVDev->mpGraphics	= pVirGraphics;
+        pVDev->mnBitCount	= nBitCount;
+        pVDev->mbGraphics	= FALSE;
         pVDev->mbForeignDC  = (pData != NULL);
 
         // insert VirDev in VirDevList
@@ -169,13 +169,13 @@ void WinSalInstance::DestroyVirtualDevice( SalVirtualDevice* pDevice )
 
 WinSalVirtualDevice::WinSalVirtualDevice()
 {
-    mhDC = (HDC) NULL;          // HDC or 0 for Cache Device
-    mhBmp = (HBITMAP) NULL;     // Memory Bitmap
-    mhDefBmp = (HBITMAP) NULL;  // Default Bitmap
-    mpGraphics = NULL;          // current VirDev graphics
-    mpNext = NULL;              // next VirDev
-    mnBitCount = 0;             // BitCount (0 or 1)
-    mbGraphics = FALSE;         // is Graphics used
+    mhDC = (HDC) NULL;			// HDC or 0 for Cache Device
+    mhBmp = (HBITMAP) NULL;		// Memory Bitmap
+    mhDefBmp = (HBITMAP) NULL;	// Default Bitmap
+    mpGraphics = NULL; 			// current VirDev graphics
+    mpNext = NULL; 				// next VirDev
+    mnBitCount = 0; 			// BitCount (0 or 1)
+    mbGraphics = FALSE; 		// is Graphics used
     mbForeignDC = FALSE;        // uses a foreign DC instead of a bitmap
 }
 
diff --git a/vcl/win/source/gdi/winlayout.cxx b/vcl/win/source/gdi/winlayout.cxx
index 6f0c98279e7b..c6b6eb8c403c 100755
--- a/vcl/win/source/gdi/winlayout.cxx
+++ b/vcl/win/source/gdi/winlayout.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
@@ -117,14 +117,14 @@ public:
     int                     GetCachedGlyphWidth( int nCharCode ) const;
     void                    CacheGlyphWidth( int nCharCode, int nCharWidth );
 
-    bool                    InitKashidaHandling( HDC );
-    int                     GetMinKashidaWidth() const { return mnMinKashidaWidth; }
-    int                     GetMinKashidaGlyph() const { return mnMinKashidaGlyph; }
+    bool					InitKashidaHandling( HDC ); 
+    int						GetMinKashidaWidth() const { return mnMinKashidaWidth; }
+    int						GetMinKashidaGlyph() const { return mnMinKashidaGlyph; }
 
 private:
     IntMap                  maWidthMap;
-    mutable int             mnMinKashidaWidth;
-    mutable int             mnMinKashidaGlyph;
+    mutable int				mnMinKashidaWidth;
+    mutable int				mnMinKashidaGlyph;
 };
 
 // -----------------------------------------------------------------------
@@ -1962,11 +1962,11 @@ int UniscribeLayout::GetNextGlyphs( int nLen, sal_GlyphId* pGlyphs, Point& rPos,
             }
             else
             {
-                nExtraOfs += nToFillWidth;  // at right of cell
-                nSubIter = 0;               // done with glyph injection
+                nExtraOfs += nToFillWidth;	// at right of cell
+                nSubIter = 0;				// done with glyph injection
             }
             if( !bManualCellAlign )
-                nExtraOfs -= nExtraWidth;   // adjust for right-aligned cells
+                nExtraOfs -= nExtraWidth;	// adjust for right-aligned cells
 
             // adjust the draw position for the injected-glyphs case
             if( nExtraOfs )
@@ -2175,7 +2175,7 @@ void UniscribeLayout::Simplify( bool /*bIsBase*/ )
         }
         // If there are still glyphs in the cluster and mnMinGlyphPos
         // has changed then we need to remove the dropped glyphs at start
-        // to correct logClusters, which is unsigned and relative to the
+        // to correct logClusters, which is unsigned and relative to the 
         // item start.
         if (rVI.mnMinGlyphPos != nOrigMinGlyphPos)
         {
@@ -2475,9 +2475,9 @@ void UniscribeLayout::ApplyDXArray( const ImplLayoutArgs& rArgs )
         if( rVisualItem.IsRTL() )
         {
             for( i = rVisualItem.mnMinGlyphPos; i < rVisualItem.mnEndGlyphPos; ++i )
-                if ( (1U << mpVisualAttrs[i].uJustification) & 0xFF82 )  //  any Arabic justification
+                if ( (1U << mpVisualAttrs[i].uJustification) & 0xFF82 )  //  any Arabic justification 
                 {                                                        //  excluding SCRIPT_JUSTIFY_NONE
-                    // yes
+                    // yes                                               
                     rVisualItem.mbHasKashidas = true;
                     // so prepare for kashida handling
                     InitKashidaHandling();
@@ -2530,7 +2530,7 @@ void UniscribeLayout::ApplyDXArray( const ImplLayoutArgs& rArgs )
         {
             for( i = nMinGlyphPos; i < nEndGlyphPos; ++i )
                 nXOffset += mpJustifications[ i ];
-
+           
             if( rVisualItem.mbHasKashidas )
                 KashidaItemFix( nMinGlyphPos, nEndGlyphPos );
         }
@@ -2561,7 +2561,7 @@ void UniscribeLayout::ApplyDXArray( const ImplLayoutArgs& rArgs )
 
 void UniscribeLayout::InitKashidaHandling()
 {
-    if( mnMinKashidaGlyph != 0 )    // already initialized
+    if( mnMinKashidaGlyph != 0 )	// already initialized
         return;
 
     mrWinFontEntry.InitKashidaHandling( mhDC );
@@ -2578,8 +2578,8 @@ void UniscribeLayout::KashidaItemFix( int nMinGlyphPos, int nEndGlyphPos )
     {
         // check for vowels
         if( (i > nMinGlyphPos && !mpGlyphAdvances[ i-1 ])
-        &&  (1U << mpVisualAttrs[i].uJustification) & 0xFF83 )  // all Arabic justifiction types
-        {                                                       // including SCRIPT_JUSTIFY_NONE
+        &&  (1U << mpVisualAttrs[i].uJustification) & 0xFF83 )	// all Arabic justifiction types
+        {														// including SCRIPT_JUSTIFY_NONE
             // vowel, we do it like ScriptJustify does
             // the vowel gets the extra width
             long nSpaceAdded =  mpJustifications[ i ] - mpGlyphAdvances[ i ];
@@ -2629,7 +2629,7 @@ bool UniscribeLayout::KashidaWordFix ( int nMinGlyphPos, int nEndGlyphPos, int*
     if ( nMaxAdded <= 0 )
         return false;
     // return early if there is not enough space for an extra kashida
-    if( 2*nMaxAdded < mnMinKashidaWidth )
+    if( 2*nMaxAdded < mnMinKashidaWidth ) 
         return false;
 
     // redistribute the extra spacing to the kashida position
@@ -2653,7 +2653,7 @@ bool UniscribeLayout::KashidaWordFix ( int nMinGlyphPos, int nEndGlyphPos, int*
         // ugly: steal some pixels
         long nSteal = 1;
         if ( nMaxPos - nMinPos > 0 && ((mnMinKashidaWidth - nSpaceAdded) > (nMaxPos - nMinPos)))
-            nSteal = (mnMinKashidaWidth - nSpaceAdded) / (nMaxPos - nMinPos);
+            nSteal = (mnMinKashidaWidth - nSpaceAdded) / (nMaxPos - nMinPos); 
         for( int i = nMinPos; i <= nMaxPos; ++i )
         {
             if( i == nKashPos )
@@ -2712,7 +2712,7 @@ void UniscribeLayout::Justify( long nNewWidth )
     if( nOldWidth <= 0 )
         return;
 
-    nNewWidth *= mnUnitsPerPixel;   // convert into font units
+    nNewWidth *= mnUnitsPerPixel;	// convert into font units
     if( nNewWidth == nOldWidth )
         return;
     // prepare to distribute the extra width evenly among the visual items
@@ -2772,11 +2772,11 @@ bool UniscribeLayout::IsKashidaPosValid ( int nCharPos ) const
         }
     }
     // Invalid char pos or leftmost glyph in visual item
-    if ( nMinGlyphIndex == -1 || !mpLogClusters[ nCharPos ] )
+    if ( nMinGlyphIndex == -1 || !mpLogClusters[ nCharPos ] ) 
         return false;
 
-//  This test didn't give the expected results
-/*  if( mpLogClusters[ nCharPos+1 ] == mpLogClusters[ nCharPos ])
+//	This test didn't give the expected results
+/*	if( mpLogClusters[ nCharPos+1 ] == mpLogClusters[ nCharPos ]) 
     // two chars, one glyph
         return false;*/
 
@@ -2786,9 +2786,9 @@ bool UniscribeLayout::IsKashidaPosValid ( int nCharPos ) const
     // justification is only allowed if the glyph to the left has not SCRIPT_JUSTIFY_NONE
     // and not SCRIPT_JUSTIFY_ARABIC_BLANK
     // special case: glyph to the left is vowel (no advance width)
-    if ( mpVisualAttrs[ nGlyphPos-1 ].uJustification == SCRIPT_JUSTIFY_ARABIC_BLANK
-        || ( mpVisualAttrs[ nGlyphPos-1 ].uJustification == SCRIPT_JUSTIFY_NONE
-            && mpGlyphAdvances [ nGlyphPos-1 ] ))
+    if ( mpVisualAttrs[ nGlyphPos-1 ].uJustification == SCRIPT_JUSTIFY_ARABIC_BLANK 
+        || ( mpVisualAttrs[ nGlyphPos-1 ].uJustification == SCRIPT_JUSTIFY_NONE 
+            && mpGlyphAdvances [ nGlyphPos-1 ] ))	
         return false;
     return true;
 }
@@ -2894,6 +2894,11 @@ void GraphiteWinLayout::RestoreDC(gr::Segment & segment) const
 
 bool GraphiteWinLayout::LayoutText( ImplLayoutArgs & args)
 {
+    if (args.mnMinCharPos >= args.mnEndCharPos)
+    {
+        maImpl.clear();
+        return true;
+    }
     HFONT hUnRotatedFont;
     if (args.mnOrientation)
     {
@@ -3081,7 +3086,7 @@ SalLayout* WinSalGraphics::GetTextLayout( ImplLayoutArgs& rArgs, int nFallbackLe
 
 // -----------------------------------------------------------------------
 
-int WinSalGraphics::GetMinKashidaWidth()
+int	WinSalGraphics::GetMinKashidaWidth()
 {
     if( !mpWinFontEntry[0] )
         return 0;
@@ -3097,8 +3102,8 @@ ImplWinFontEntry::ImplWinFontEntry( ImplFontSelectData& rFSD )
 ,   maWidthMap( 512 )
 ,   mpKerningPairs( NULL )
 ,   mnKerningPairs( -1 )
-,   mnMinKashidaWidth( -1 )
-,   mnMinKashidaGlyph( -1 )
+,	mnMinKashidaWidth( -1 )
+,	mnMinKashidaGlyph( -1 )
 {
 #ifdef USE_UNISCRIBE
     maScriptCache = NULL;
@@ -3159,17 +3164,17 @@ int ImplWinFontEntry::GetKerning( sal_Unicode cLeft, sal_Unicode cRight ) const
 
 bool ImplWinFontEntry::InitKashidaHandling( HDC hDC )
 {
-    if( mnMinKashidaWidth >= 0 )    // already cached?
+    if( mnMinKashidaWidth >= 0 )	// already cached?
         return mnMinKashidaWidth;
 
     // initialize the kashida width
     mnMinKashidaWidth = 0;
     mnMinKashidaGlyph = 0;
 #ifdef USE_UNISCRIBE
-    if (aUspModule || (bUspEnabled && InitUSP()))
+    if (aUspModule || (bUspEnabled && InitUSP())) 
     {
         SCRIPT_FONTPROPERTIES aFontProperties;
-        aFontProperties.cBytes = sizeof (aFontProperties);
+        aFontProperties.cBytes = sizeof (aFontProperties); 
         SCRIPT_CACHE& rScriptCache = GetScriptCache();
         HRESULT nRC = (*pScriptGetFontProperties)( hDC, &rScriptCache, &aFontProperties );
         if( nRC != 0 )
diff --git a/vcl/win/source/gdi/wntgdi.cxx b/vcl/win/source/gdi/wntgdi.cxx
index eb53fb4d8699..877aa692202f 100644
--- a/vcl/win/source/gdi/wntgdi.cxx
+++ b/vcl/win/source/gdi/wntgdi.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
diff --git a/vcl/win/source/window/salframe.cxx b/vcl/win/source/window/salframe.cxx
index 7314fd2b6164..c87f49c517e4 100644
--- a/vcl/win/source/window/salframe.cxx
+++ b/vcl/win/source/window/salframe.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
@@ -246,12 +246,12 @@ void ImplSalGetWorkArea( HWND hWnd, RECT *pRect, const RECT *pParentRect )
         if ( aSalShlData.maVersionInfo.dwPlatformId == VER_PLATFORM_WIN32_NT )
         {
             if ( aSalShlData.maVersionInfo.dwMajorVersion <= 4 )
-                winVerOk = 0;   // NT
+                winVerOk = 0;	// NT
         }
         else if( aSalShlData.maVersionInfo.dwPlatformId == VER_PLATFORM_WIN32_WINDOWS )
         {
             if ( aSalShlData.maVersionInfo.dwMajorVersion == 4 && aSalShlData.maVersionInfo.dwMinorVersion == 0 )
-                winVerOk = 0;   // Win95
+                winVerOk = 0;	// Win95
         }
     }
 
@@ -377,7 +377,7 @@ SalFrame* ImplSalCreateFrame( WinSalInstance* pInst,
         // this breaks SAL_FRAME_STYLE_SYSTEMCHILD handling, which is not
         // used currently. Probably SAL_FRAME_STYLE_SYSTEMCHILD should be
         // removed again.
-
+        
         // nSysStyle  |= WS_CLIPCHILDREN;
         if ( hWndParent )
         {
@@ -980,7 +980,7 @@ WinSalFrame::WinSalFrame()
     mpClipRgnData       = NULL;
     mbFirstClipRect     = TRUE;
     mpNextClipRect      = NULL;
-    mnDisplay           = 0;
+    mnDisplay			= 0;
 
     memset( &maState, 0, sizeof( SalFrameState ) );
     maSysData.nSize     = sizeof( SystemEnvData );
@@ -2156,7 +2156,7 @@ static void ImplSalToTop( HWND hWnd, USHORT nFlags )
     WinSalFrame* pToTopFrame = GetWindowPtr( hWnd );
     if( pToTopFrame && (pToTopFrame->mnStyle & SAL_FRAME_STYLE_SYSTEMCHILD) != 0 )
         BringWindowToTop( hWnd );
-
+    
     if ( nFlags & SAL_FRAME_TOTOP_FOREGROUNDTASK )
     {
         // This magic code is necessary to connect the input focus of the
@@ -2209,7 +2209,7 @@ static void ImplSalToTop( HWND hWnd, USHORT nFlags )
 
 void WinSalFrame::ToTop( USHORT nFlags )
 {
-    nFlags &= ~SAL_FRAME_TOTOP_GRABFOCUS;   // this flag is not needed on win32
+    nFlags &= ~SAL_FRAME_TOTOP_GRABFOCUS;	// this flag is not needed on win32
     // Post this Message to the window, because this only works
     // in the thread of the window, which has create this window.
     // We post this message to avoid deadlocks
@@ -3219,13 +3219,13 @@ void WinSalFrame::BeginSetClipRegion( ULONG nRects )
         delete [] (BYTE*)mpClipRgnData;
     ULONG nRectBufSize = sizeof(RECT)*nRects;
     mpClipRgnData = (RGNDATA*)new BYTE[sizeof(RGNDATA)-1+nRectBufSize];
-    mpClipRgnData->rdh.dwSize     = sizeof( RGNDATAHEADER );
-    mpClipRgnData->rdh.iType      = RDH_RECTANGLES;
-    mpClipRgnData->rdh.nCount     = nRects;
+    mpClipRgnData->rdh.dwSize	  = sizeof( RGNDATAHEADER );
+    mpClipRgnData->rdh.iType	  = RDH_RECTANGLES;
+    mpClipRgnData->rdh.nCount	  = nRects;
     mpClipRgnData->rdh.nRgnSize  = nRectBufSize;
     SetRectEmpty( &(mpClipRgnData->rdh.rcBound) );
-    mpNextClipRect        = (RECT*)(&(mpClipRgnData->Buffer));
-    mbFirstClipRect       = TRUE;
+    mpNextClipRect 		  = (RECT*)(&(mpClipRgnData->Buffer));
+    mbFirstClipRect		  = TRUE;
 }
 
 // -----------------------------------------------------------------------
@@ -3235,17 +3235,17 @@ void WinSalFrame::UnionClipRegion( long nX, long nY, long nWidth, long nHeight )
     if( ! mpClipRgnData )
         return;
 
-    RECT*       pRect = mpNextClipRect;
-    RECT*       pBoundRect = &(mpClipRgnData->rdh.rcBound);
-    long        nRight = nX + nWidth;
-    long        nBottom = nY + nHeight;
+    RECT*		pRect = mpNextClipRect;
+    RECT*		pBoundRect = &(mpClipRgnData->rdh.rcBound);
+    long		nRight = nX + nWidth;
+    long		nBottom = nY + nHeight;
 
     if ( mbFirstClipRect )
     {
-        pBoundRect->left    = nX;
-        pBoundRect->top     = nY;
-        pBoundRect->right   = nRight;
-        pBoundRect->bottom  = nBottom;
+        pBoundRect->left	= nX;
+        pBoundRect->top 	= nY;
+        pBoundRect->right	= nRight;
+        pBoundRect->bottom	= nBottom;
         mbFirstClipRect = FALSE;
     }
     else
@@ -3263,10 +3263,10 @@ void WinSalFrame::UnionClipRegion( long nX, long nY, long nWidth, long nHeight )
             pBoundRect->bottom = (int)nBottom;
     }
 
-    pRect->left     = (int)nX;
-    pRect->top      = (int)nY;
-    pRect->right    = (int)nRight;
-    pRect->bottom   = (int)nBottom;
+    pRect->left 	= (int)nX;
+    pRect->top		= (int)nY;
+    pRect->right	= (int)nRight;
+    pRect->bottom	= (int)nBottom;
     if( (mpNextClipRect  - (RECT*)(&mpClipRgnData->Buffer)) < (int)mpClipRgnData->rdh.nCount )
         mpNextClipRect++;
 }
@@ -3838,9 +3838,9 @@ static long ImplHandleKeyMsg( HWND hWnd, UINT nMsg,
         }
 
          SalKeyEvent aKeyEvt;
-         aKeyEvt.mnCode     = nModCode; // Or should it be 0? - as this is always a character returned
-         aKeyEvt.mnTime     = GetMessageTime();
-         aKeyEvt.mnRepeat   = 0;
+         aKeyEvt.mnCode		= nModCode;	// Or should it be 0? - as this is always a character returned
+         aKeyEvt.mnTime		= GetMessageTime();
+         aKeyEvt.mnRepeat	= 0;
 
         if( wParam >= Uni_SupplementaryPlanesStart )
         {
@@ -3853,7 +3853,7 @@ static long ImplHandleKeyMsg( HWND hWnd, UINT nMsg,
             wParam = (sal_Unicode) Uni_UTF32ToSurrogate2( wParam );
          }
 
-         aKeyEvt.mnCharCode = (sal_Unicode) wParam;
+         aKeyEvt.mnCharCode	= (sal_Unicode) wParam;
 
          nLastChar = 0;
          nLastVKChar = 0;
@@ -3977,14 +3977,14 @@ static long ImplHandleKeyMsg( HWND hWnd, UINT nMsg,
                 aKeyEvt.mnTime      = GetMessageTime();
                 aKeyEvt.mnCode     |= nModCode;
                 aKeyEvt.mnRepeat    = nRepeat;
-
+                
                 if( (nModCode & (KEY_MOD1|KEY_MOD2)) == (KEY_MOD1|KEY_MOD2) &&
                     aKeyEvt.mnCharCode )
                 {
                      // this is actually AltGr and should not be handled as Alt
                      aKeyEvt.mnCode &= ~(KEY_MOD1|KEY_MOD2);
                 }
-
+                
                 bIgnoreCharMsg = bCharPeek ? TRUE : FALSE;
                 long nRet = pFrame->CallCallback( nEvent, &aKeyEvt );
                 // independent part only reacts on keyup but Windows does not send
@@ -4952,9 +4952,9 @@ static int ImplDrawItem(HWND, WPARAM wParam, LPARAM lParam )
         COLORREF clrPrevText, clrPrevBkgnd;
         HFONT hfntOld;
         HBRUSH hbrOld;
-        BOOL    fChecked = (pDI->itemState & ODS_CHECKED) ? TRUE : FALSE;
-        BOOL    fSelected = (pDI->itemState & ODS_SELECTED) ? TRUE : FALSE;
-        BOOL    fDisabled = (pDI->itemState & (ODS_DISABLED | ODS_GRAYED)) ? TRUE : FALSE;
+        BOOL	fChecked = (pDI->itemState & ODS_CHECKED) ? TRUE : FALSE;
+        BOOL	fSelected = (pDI->itemState & ODS_SELECTED) ? TRUE : FALSE;
+        BOOL	fDisabled = (pDI->itemState & (ODS_DISABLED | ODS_GRAYED)) ? TRUE : FALSE;
 
         // Set the appropriate foreground and background colors.
         RECT aRect = pDI->rcItem;
@@ -5019,9 +5019,9 @@ static int ImplDrawItem(HWND, WPARAM wParam, LPARAM lParam )
 
             if( hDrawDIB )
             {
-                PBITMAPINFO         pBI = (PBITMAPINFO) GlobalLock( hDrawDIB );
-                PBITMAPINFOHEADER   pBIH = (PBITMAPINFOHEADER) pBI;
-                PBYTE               pBits = (PBYTE) pBI + *(DWORD*) pBI +
+                PBITMAPINFO 		pBI = (PBITMAPINFO) GlobalLock( hDrawDIB );
+                PBITMAPINFOHEADER	pBIH = (PBITMAPINFOHEADER) pBI;
+                PBYTE				pBits = (PBYTE) pBI + *(DWORD*) pBI +
                                             pSalBmp->ImplGetDIBColorCount( hDrawDIB ) * sizeof( RGBQUAD );
 
                 HBITMAP hBmp = CreateDIBitmap( pDI->hDC, pBIH, CBM_INIT, pBits, pBI, DIB_RGB_COLORS );
@@ -5622,23 +5622,23 @@ static boolean ImplHandleAppCommand( HWND hWnd, LPARAM lParam )
     sal_Int16 nCommand = 0;
     switch( GET_APPCOMMAND_LPARAM(lParam) )
     {
-    case APPCOMMAND_MEDIA_CHANNEL_DOWN:         nCommand = MEDIA_COMMAND_CHANNEL_DOWN; break;
-    case APPCOMMAND_MEDIA_CHANNEL_UP:           nCommand = MEDIA_COMMAND_CHANNEL_UP; break;
-    case APPCOMMAND_MEDIA_NEXTTRACK:            nCommand = MEDIA_COMMAND_NEXTTRACK; break;
-    case APPCOMMAND_MEDIA_PAUSE:                nCommand = MEDIA_COMMAND_PAUSE; break;
-    case APPCOMMAND_MEDIA_PLAY:                 nCommand = MEDIA_COMMAND_PLAY; break;
-    case APPCOMMAND_MEDIA_PLAY_PAUSE:           nCommand = MEDIA_COMMAND_PLAY_PAUSE; break;
-    case APPCOMMAND_MEDIA_PREVIOUSTRACK:        nCommand = MEDIA_COMMAND_PREVIOUSTRACK; break;
-    case APPCOMMAND_MEDIA_RECORD:               nCommand = MEDIA_COMMAND_RECORD; break;
-    case APPCOMMAND_MEDIA_REWIND:               nCommand = MEDIA_COMMAND_REWIND; break;
-    case APPCOMMAND_MEDIA_STOP:                 nCommand = MEDIA_COMMAND_STOP; break;
-    case APPCOMMAND_MIC_ON_OFF_TOGGLE:          nCommand = MEDIA_COMMAND_MIC_ON_OFF_TOGGLE; break;
-    case APPCOMMAND_MICROPHONE_VOLUME_DOWN:     nCommand = MEDIA_COMMAND_MICROPHONE_VOLUME_DOWN; break;
-    case APPCOMMAND_MICROPHONE_VOLUME_MUTE:     nCommand = MEDIA_COMMAND_MICROPHONE_VOLUME_MUTE; break;
-    case APPCOMMAND_MICROPHONE_VOLUME_UP:       nCommand = MEDIA_COMMAND_MICROPHONE_VOLUME_UP; break;
-    case APPCOMMAND_VOLUME_DOWN:                nCommand = MEDIA_COMMAND_VOLUME_DOWN; break;
-    case APPCOMMAND_VOLUME_MUTE:                nCommand = MEDIA_COMMAND_VOLUME_MUTE; break;
-    case APPCOMMAND_VOLUME_UP:                  nCommand = MEDIA_COMMAND_VOLUME_UP; break;
+    case APPCOMMAND_MEDIA_CHANNEL_DOWN:			nCommand = MEDIA_COMMAND_CHANNEL_DOWN; break;
+    case APPCOMMAND_MEDIA_CHANNEL_UP:			nCommand = MEDIA_COMMAND_CHANNEL_UP; break;
+    case APPCOMMAND_MEDIA_NEXTTRACK:			nCommand = MEDIA_COMMAND_NEXTTRACK; break;
+    case APPCOMMAND_MEDIA_PAUSE:				nCommand = MEDIA_COMMAND_PAUSE; break;
+    case APPCOMMAND_MEDIA_PLAY:					nCommand = MEDIA_COMMAND_PLAY; break;
+    case APPCOMMAND_MEDIA_PLAY_PAUSE:			nCommand = MEDIA_COMMAND_PLAY_PAUSE; break;
+    case APPCOMMAND_MEDIA_PREVIOUSTRACK:		nCommand = MEDIA_COMMAND_PREVIOUSTRACK; break;
+    case APPCOMMAND_MEDIA_RECORD:				nCommand = MEDIA_COMMAND_RECORD; break;
+    case APPCOMMAND_MEDIA_REWIND:				nCommand = MEDIA_COMMAND_REWIND; break;
+    case APPCOMMAND_MEDIA_STOP:					nCommand = MEDIA_COMMAND_STOP; break;
+    case APPCOMMAND_MIC_ON_OFF_TOGGLE:			nCommand = MEDIA_COMMAND_MIC_ON_OFF_TOGGLE; break;
+    case APPCOMMAND_MICROPHONE_VOLUME_DOWN:		nCommand = MEDIA_COMMAND_MICROPHONE_VOLUME_DOWN; break;
+    case APPCOMMAND_MICROPHONE_VOLUME_MUTE:		nCommand = MEDIA_COMMAND_MICROPHONE_VOLUME_MUTE; break;
+    case APPCOMMAND_MICROPHONE_VOLUME_UP:		nCommand = MEDIA_COMMAND_MICROPHONE_VOLUME_UP; break;
+    case APPCOMMAND_VOLUME_DOWN:				nCommand = MEDIA_COMMAND_VOLUME_DOWN; break;
+    case APPCOMMAND_VOLUME_MUTE:				nCommand = MEDIA_COMMAND_VOLUME_MUTE; break;
+    case APPCOMMAND_VOLUME_UP:					nCommand = MEDIA_COMMAND_VOLUME_UP; break;
         break;
     default:
         return false;
@@ -5740,10 +5740,10 @@ static LRESULT ImplHandleIMEReconvertString( HWND hWnd, LPARAM lParam )
     {
     // The first call for reconversion.
     pFrame->CallCallback( SALEVENT_STARTRECONVERSION, (void*)NULL );
-
+    
     // Retrieve the surrounding text from the focused control.
     pFrame->CallCallback( SALEVENT_SURROUNDINGTEXTREQUEST, (void*)&aEvt );
-
+    
     if( aEvt.maText.Len() == 0 )
     {
         return 0;
@@ -5854,7 +5854,7 @@ LRESULT CALLBACK SalFrameWndProc( HWND hWnd, UINT nMsg, WPARAM wParam, LPARAM lP
 {
     LRESULT     nRet = 0;
     static int  bInWheelMsg = FALSE;
-    static int  bInQueryEnd = FALSE;
+    static int	bInQueryEnd = FALSE;
 
     // By WM_CRETAE we connect the frame with the window handle
     if ( nMsg == WM_CREATE )
@@ -6123,7 +6123,7 @@ LRESULT CALLBACK SalFrameWndProc( HWND hWnd, UINT nMsg, WPARAM wParam, LPARAM lP
 
                 if ( nRet )
                 {
-                    MSG msg;
+                    MSG	msg;
 
                     while( PeekMessage( &msg, NULL, 0, 0, PM_REMOVE ) )
                     {
@@ -6220,7 +6220,7 @@ LRESULT CALLBACK SalFrameWndProc( HWND hWnd, UINT nMsg, WPARAM wParam, LPARAM lP
             break;
         case WM_APPCOMMAND:
             if( ImplHandleAppCommand( hWnd, lParam ) )
-            {
+            {                
                 rDef = false;
                 nRet = 1;
             }
diff --git a/vcl/win/source/window/salmenu.cxx b/vcl/win/source/window/salmenu.cxx
index 1eb75969ea38..e63d8d562b6b 100644
--- a/vcl/win/source/window/salmenu.cxx
+++ b/vcl/win/source/window/salmenu.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
@@ -107,9 +107,9 @@ SalMenuItem* WinSalInstance::CreateMenuItem( const SalItemParams* pItemData )
 
         // 'translate' mnemonics
         pSalMenuItem->mText.SearchAndReplace( '~', '&' );
-
+        
         pSalMenuItem->mInfo.fMask = MIIM_TYPE | MIIM_STATE | MIIM_ID | MIIM_DATA;
-        pSalMenuItem->mInfo.fType = MFT_STRING;
+        pSalMenuItem->mInfo.fType = MFT_STRING; 
 #ifdef OWNERDRAW
         if( pItemData->pMenu && !pItemData->pMenu->IsMenuBar() )
             pSalMenuItem->mInfo.fType |= MFT_OWNERDRAW;
@@ -117,7 +117,7 @@ SalMenuItem* WinSalInstance::CreateMenuItem( const SalItemParams* pItemData )
 #endif
         pSalMenuItem->mInfo.dwTypeData = (LPWSTR) pSalMenuItem->mText.GetBuffer();
         pSalMenuItem->mInfo.cch = pSalMenuItem->mText.Len();
-
+        
         pSalMenuItem->mInfo.wID = pItemData->nId;
         pSalMenuItem->mInfo.dwItemData = (ULONG_PTR) pSalMenuItem; // user data
     }
diff --git a/vcl/win/source/window/salobj.cxx b/vcl/win/source/window/salobj.cxx
index 2f657968284f..0fee226a2c3e 100644
--- a/vcl/win/source/window/salobj.cxx
+++ b/vcl/win/source/window/salobj.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
@@ -66,7 +66,7 @@ static BOOL ImplIsSysWindowOrChild( HWND hWndParent, HWND hWndChild )
 WinSalObject* ImplFindSalObject( HWND hWndChild )
 {
     SalData*        pSalData = GetSalData();
-    WinSalObject*   pObject = pSalData->mpFirstObject;
+    WinSalObject*	pObject = pSalData->mpFirstObject;
     while ( pObject )
     {
         if ( ImplIsSysWindowOrChild( pObject->mhWndChild, hWndChild ) )
@@ -164,8 +164,8 @@ LRESULT CALLBACK SalSysMsgProc( int nCode, WPARAM wParam, LPARAM lParam )
 BOOL ImplSalPreDispatchMsg( MSG* pMsg )
 {
     // Used for Unicode and none Unicode
-    SalData*        pSalData = GetSalData();
-    WinSalObject*   pObject;
+    SalData*	    pSalData = GetSalData();
+    WinSalObject*	pObject;
 
     if ( (pMsg->message == WM_LBUTTONDOWN) ||
          (pMsg->message == WM_RBUTTONDOWN) ||
@@ -251,8 +251,8 @@ BOOL ImplSalPreDispatchMsg( MSG* pMsg )
 void ImplSalPostDispatchMsg( MSG* pMsg, LRESULT /* nDispatchResult */ )
 {
     // Used for Unicode and none Unicode
-    SalData*        pSalData = GetSalData();
-    WinSalFrame*    pFrame;
+    SalData*	    pSalData = GetSalData();
+    WinSalFrame*	pFrame;
 
     if ( (pMsg->message == WM_KEYDOWN) || (pMsg->message == WM_KEYUP) )
     {
@@ -277,8 +277,8 @@ void ImplSalPostDispatchMsg( MSG* pMsg, LRESULT /* nDispatchResult */ )
 
 LRESULT CALLBACK SalSysObjWndProc( HWND hWnd, UINT nMsg, WPARAM wParam, LPARAM lParam, int& rDef )
 {
-    WinSalObject*   pSysObj;
-    LRESULT         nRet = 0;
+    WinSalObject*	pSysObj;
+    LRESULT      	nRet = 0;
 
     switch( nMsg )
     {
@@ -337,7 +337,7 @@ LRESULT CALLBACK SalSysObjWndProc( HWND hWnd, UINT nMsg, WPARAM wParam, LPARAM l
             if ( ImplSalYieldMutexTryToAcquire() )
             {
                 pSysObj = GetSalObjWindowPtr( hWnd );
-                HWND    hFocusWnd = ::GetFocus();
+                HWND	hFocusWnd = ::GetFocus();
                 USHORT nEvent;
                 if ( hFocusWnd && ImplIsSysWindowOrChild( hWnd, hFocusWnd ) )
                     nEvent = SALOBJ_EVENT_GETFOCUS;
@@ -515,25 +515,25 @@ SalObject* ImplSalCreateObject( WinSalInstance* pInst, WinSalFrame* pParent )
         if ( false )//aSalShlData.mbWNT )
         {
             WNDCLASSEXW aWndClassEx;
-            aWndClassEx.cbSize          = sizeof( aWndClassEx );
-            aWndClassEx.style           = 0;
-            aWndClassEx.lpfnWndProc     = SalSysObjWndProcW;
-            aWndClassEx.cbClsExtra      = 0;
-            aWndClassEx.cbWndExtra      = SAL_OBJECT_WNDEXTRA;
-            aWndClassEx.hInstance       = pSalData->mhInst;
-            aWndClassEx.hIcon           = 0;
-            aWndClassEx.hIconSm         = 0;
-            aWndClassEx.hCursor         = LoadCursor( 0, IDC_ARROW );
-            aWndClassEx.hbrBackground   = 0;
-            aWndClassEx.lpszMenuName    = 0;
-            aWndClassEx.lpszClassName   = SAL_OBJECT_CLASSNAMEW;
+            aWndClassEx.cbSize			= sizeof( aWndClassEx );
+            aWndClassEx.style			= 0;
+            aWndClassEx.lpfnWndProc 	= SalSysObjWndProcW;
+            aWndClassEx.cbClsExtra		= 0;
+            aWndClassEx.cbWndExtra		= SAL_OBJECT_WNDEXTRA;
+            aWndClassEx.hInstance		= pSalData->mhInst;
+            aWndClassEx.hIcon			= 0;
+            aWndClassEx.hIconSm 		= 0;
+            aWndClassEx.hCursor 		= LoadCursor( 0, IDC_ARROW );
+            aWndClassEx.hbrBackground	= 0;
+            aWndClassEx.lpszMenuName	= 0;
+            aWndClassEx.lpszClassName	= SAL_OBJECT_CLASSNAMEW;
             if ( RegisterClassExW( &aWndClassEx ) )
             {
                 // Wegen PlugIn's loeschen wir erstmal den Hintergrund
-                aWndClassEx.cbWndExtra      = 0;
-                aWndClassEx.hbrBackground   = (HBRUSH)(COLOR_WINDOW+1);
-                aWndClassEx.lpfnWndProc     = SalSysObjChildWndProcW;
-                aWndClassEx.lpszClassName   = SAL_OBJECT_CHILDCLASSNAMEW;
+                aWndClassEx.cbWndExtra		= 0;
+                aWndClassEx.hbrBackground	= (HBRUSH)(COLOR_WINDOW+1);
+                aWndClassEx.lpfnWndProc 	= SalSysObjChildWndProcW;
+                aWndClassEx.lpszClassName	= SAL_OBJECT_CHILDCLASSNAMEW;
                 if ( RegisterClassExW( &aWndClassEx ) )
                     pSalData->mbObjClassInit = TRUE;
             }
@@ -541,25 +541,25 @@ SalObject* ImplSalCreateObject( WinSalInstance* pInst, WinSalFrame* pParent )
         else
         {
             WNDCLASSEXA aWndClassEx;
-            aWndClassEx.cbSize          = sizeof( aWndClassEx );
-            aWndClassEx.style           = 0;
-            aWndClassEx.lpfnWndProc     = SalSysObjWndProcA;
-            aWndClassEx.cbClsExtra      = 0;
-            aWndClassEx.cbWndExtra      = SAL_OBJECT_WNDEXTRA;
-            aWndClassEx.hInstance       = pSalData->mhInst;
-            aWndClassEx.hIcon           = 0;
-            aWndClassEx.hIconSm         = 0;
-            aWndClassEx.hCursor         = LoadCursor( 0, IDC_ARROW );
-            aWndClassEx.hbrBackground   = 0;
-            aWndClassEx.lpszMenuName    = 0;
-            aWndClassEx.lpszClassName   = SAL_OBJECT_CLASSNAMEA;
+            aWndClassEx.cbSize			= sizeof( aWndClassEx );
+            aWndClassEx.style			= 0;
+            aWndClassEx.lpfnWndProc 	= SalSysObjWndProcA;
+            aWndClassEx.cbClsExtra		= 0;
+            aWndClassEx.cbWndExtra		= SAL_OBJECT_WNDEXTRA;
+            aWndClassEx.hInstance		= pSalData->mhInst;
+            aWndClassEx.hIcon			= 0;
+            aWndClassEx.hIconSm 		= 0;
+            aWndClassEx.hCursor 		= LoadCursor( 0, IDC_ARROW );
+            aWndClassEx.hbrBackground	= 0;
+            aWndClassEx.lpszMenuName	= 0;
+            aWndClassEx.lpszClassName	= SAL_OBJECT_CLASSNAMEA;
             if ( RegisterClassExA( &aWndClassEx ) )
             {
                 // Wegen PlugIn's loeschen wir erstmal den Hintergrund
-                aWndClassEx.cbWndExtra      = 0;
-                aWndClassEx.hbrBackground   = (HBRUSH)(COLOR_WINDOW+1);
-                aWndClassEx.lpfnWndProc     = SalSysObjChildWndProcA;
-                aWndClassEx.lpszClassName   = SAL_OBJECT_CHILDCLASSNAMEA;
+                aWndClassEx.cbWndExtra		= 0;
+                aWndClassEx.hbrBackground	= (HBRUSH)(COLOR_WINDOW+1);
+                aWndClassEx.lpfnWndProc 	= SalSysObjChildWndProcA;
+                aWndClassEx.lpszClassName	= SAL_OBJECT_CHILDCLASSNAMEA;
                 if ( RegisterClassExA( &aWndClassEx ) )
                     pSalData->mbObjClassInit = TRUE;
             }
@@ -569,7 +569,7 @@ SalObject* ImplSalCreateObject( WinSalInstance* pInst, WinSalFrame* pParent )
     if ( pSalData->mbObjClassInit )
     {
         WinSalObject* pObject = new WinSalObject;
-
+        
         // #135235# Clip siblings of this
         // SystemChildWindow. Otherwise, DXCanvas (using a hidden
         // SystemChildWindow) clobbers applets/plugins during
@@ -602,9 +602,9 @@ SalObject* ImplSalCreateObject( WinSalInstance* pInst, WinSalFrame* pParent )
 
         if ( hWnd )
         {
-            pObject->mhWnd          = hWnd;
-            pObject->mhWndChild     = hWndChild;
-            pObject->maSysData.hWnd = hWndChild;
+            pObject->mhWnd 			= hWnd;
+            pObject->mhWndChild		= hWndChild;
+            pObject->maSysData.hWnd	= hWndChild;
             return pObject;
         }
     }
@@ -618,11 +618,11 @@ WinSalObject::WinSalObject()
 {
     SalData* pSalData = GetSalData();
 
-    mhWnd           = 0;
-    mhWndChild      = 0;
-    mhLastFocusWnd  = 0;
-    maSysData.nSize = sizeof( SystemEnvData );
-    mpStdClipRgnData    = NULL;
+    mhWnd			= 0;
+    mhWndChild 		= 0;
+    mhLastFocusWnd 	= 0;
+    maSysData.nSize	= sizeof( SystemEnvData );
+    mpStdClipRgnData	= NULL;
 
     // Insert object in objectlist
     mpNextObject = pSalData->mpFirstObject;
@@ -700,30 +700,30 @@ void WinSalObject::BeginSetClipRegion( ULONG nRectCount )
     }
     else
         mpClipRgnData = (RGNDATA*)new BYTE[sizeof(RGNDATA)-1+nRectBufSize];
-    mpClipRgnData->rdh.dwSize     = sizeof( RGNDATAHEADER );
-    mpClipRgnData->rdh.iType      = RDH_RECTANGLES;
-    mpClipRgnData->rdh.nCount     = nRectCount;
+    mpClipRgnData->rdh.dwSize	  = sizeof( RGNDATAHEADER );
+    mpClipRgnData->rdh.iType	  = RDH_RECTANGLES;
+    mpClipRgnData->rdh.nCount	  = nRectCount;
     mpClipRgnData->rdh.nRgnSize  = nRectBufSize;
     SetRectEmpty( &(mpClipRgnData->rdh.rcBound) );
-    mpNextClipRect        = (RECT*)(&(mpClipRgnData->Buffer));
-    mbFirstClipRect       = TRUE;
+    mpNextClipRect 		  = (RECT*)(&(mpClipRgnData->Buffer));
+    mbFirstClipRect		  = TRUE;
 }
 
 // -----------------------------------------------------------------------
 
 void WinSalObject::UnionClipRegion( long nX, long nY, long nWidth, long nHeight )
 {
-    RECT*       pRect = mpNextClipRect;
-    RECT*       pBoundRect = &(mpClipRgnData->rdh.rcBound);
-    long        nRight = nX + nWidth;
-    long        nBottom = nY + nHeight;
+    RECT*		pRect = mpNextClipRect;
+    RECT*		pBoundRect = &(mpClipRgnData->rdh.rcBound);
+    long		nRight = nX + nWidth;
+    long		nBottom = nY + nHeight;
 
     if ( mbFirstClipRect )
     {
-        pBoundRect->left    = nX;
-        pBoundRect->top     = nY;
-        pBoundRect->right   = nRight;
-        pBoundRect->bottom  = nBottom;
+        pBoundRect->left	= nX;
+        pBoundRect->top 	= nY;
+        pBoundRect->right	= nRight;
+        pBoundRect->bottom	= nBottom;
         mbFirstClipRect = FALSE;
     }
     else
@@ -741,10 +741,10 @@ void WinSalObject::UnionClipRegion( long nX, long nY, long nWidth, long nHeight
             pBoundRect->bottom = (int)nBottom;
     }
 
-    pRect->left     = (int)nX;
-    pRect->top      = (int)nY;
-    pRect->right    = (int)nRight;
-    pRect->bottom   = (int)nBottom;
+    pRect->left 	= (int)nX;
+    pRect->top		= (int)nY;
+    pRect->right	= (int)nRight;
+    pRect->bottom	= (int)nBottom;
     mpNextClipRect++;
 }
 
diff --git a/vcl/workben/outdevgrind.cxx b/vcl/workben/outdevgrind.cxx
index 9122a1addc0a..0b619db32e47 100755
--- a/vcl/workben/outdevgrind.cxx
+++ b/vcl/workben/outdevgrind.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
@@ -114,7 +114,7 @@ void setupMethodStubs( functor_vector_type& res )
     const Point aPt2(500,500);
     const Point aPt3(0,0);
     const Point aPt4(450,450);
-
+    
     const Rectangle   aRect(aPt1,aPt2);
     const Rectangle   aRect2(aPt3,aPt4);
     const Polygon     aPoly(aRect);
@@ -420,7 +420,7 @@ void setupMethodStubs( functor_vector_type& res )
         boost::bind(
             (void (OutputDevice::*)( const Point&,
                                      const Size&,
-                                     const Point&,
+                                     const Point&, 
                                      const Size&,
                                      const Bitmap& ))(
                 &OutputDevice::DrawBitmap),
@@ -436,7 +436,7 @@ void setupMethodStubs( functor_vector_type& res )
         boost::bind(
             (void (OutputDevice::*)( const Point&,
                                      const Size&,
-                                     const Point&,
+                                     const Point&, 
                                      const Size&,
                                      const Bitmap& ))(
                 &OutputDevice::DrawBitmap),
@@ -552,7 +552,7 @@ void setupMethodStubs( functor_vector_type& res )
         boost::bind(
             (void (OutputDevice::*)( const Point&,
                                      const Size&,
-                                     const Point&,
+                                     const Point&, 
                                      const Size&,
                                      const BitmapEx& ))(
                 &OutputDevice::DrawBitmapEx),
@@ -568,7 +568,7 @@ void setupMethodStubs( functor_vector_type& res )
         boost::bind(
             (void (OutputDevice::*)( const Point&,
                                      const Size&,
-                                     const Point&,
+                                     const Point&, 
                                      const Size&,
                                      const BitmapEx& ))(
                 &OutputDevice::DrawBitmapEx),
@@ -584,7 +584,7 @@ void setupMethodStubs( functor_vector_type& res )
         boost::bind(
             (void (OutputDevice::*)( const Point&,
                                      const Size&,
-                                     const Point&,
+                                     const Point&, 
                                      const Size&,
                                      const BitmapEx& ))(
                 &OutputDevice::DrawBitmapEx),
@@ -600,7 +600,7 @@ void setupMethodStubs( functor_vector_type& res )
         boost::bind(
             (void (OutputDevice::*)( const Point&,
                                      const Size&,
-                                     const Point&,
+                                     const Point&, 
                                      const Size&,
                                      const BitmapEx& ))(
                 &OutputDevice::DrawBitmapEx),
@@ -670,7 +670,7 @@ void setupMethodStubs( functor_vector_type& res )
         boost::bind(
             (void (OutputDevice::*)( const Point&,
                                      const Size&,
-                                     const Point&,
+                                     const Point&, 
                                      const Size&,
                                      const Bitmap&,
                                      const Color& ))(
@@ -687,7 +687,7 @@ void setupMethodStubs( functor_vector_type& res )
         boost::bind(
             (void (OutputDevice::*)( const Point&,
                                      const Size&,
-                                     const Point&,
+                                     const Point&, 
                                      const Size&,
                                      const Bitmap&,
                                      const Color& ))(
@@ -702,7 +702,7 @@ void setupMethodStubs( functor_vector_type& res )
         "DrawImage",
         boost::bind(
             (void (OutputDevice::*)( const Point&,
-                                     const Image&,
+                                     const Image&, 
                                      USHORT nStyle ))(
                 &OutputDevice::DrawImage),
             _1,
@@ -716,7 +716,7 @@ void setupMethodStubs( functor_vector_type& res )
         boost::bind(
             (void (OutputDevice::*)( const Point&,
                                      const Size&,
-                                     const Image&,
+                                     const Image&, 
                                      USHORT nStyle ))(
                 &OutputDevice::DrawImage),
             _1,
@@ -773,7 +773,7 @@ void setupMethodStubs( functor_vector_type& res )
             aRect,Size(10,20),GRID_HORZLINES|GRID_VERTLINES ));
 
     /* void DrawTransparent( const PolyPolygon& rPolyPoly,
-                                         USHORT nTransparencePercent );
+                                         USHORT nTransparencePercent ); 
     */
     add(res,
         "DrawTransparent",
@@ -791,7 +791,7 @@ void setupMethodStubs( functor_vector_type& res )
         "DrawTransparent(metafile)",
         boost::bind(
             (void (OutputDevice::*)( const GDIMetaFile&,
-                                     const Point&,
+                                     const Point&, 
                                      const Size&,
                                      const Gradient& ))(
                 &OutputDevice::DrawTransparent),
@@ -809,9 +809,9 @@ void setupMethodStubs( functor_vector_type& res )
 
 //----------------------------------------------------------------------------------
 
-void grindFunc( OutputDevice&                       rTarget,
+void grindFunc( OutputDevice&                       rTarget, 
                 functor_vector_type::const_iterator iter,
-                sal_Int32                           nTurns,
+                sal_Int32                           nTurns, 
                 const char*                         pMsg )
 {
     const sal_uInt32 nStartTime( osl_getGlobalTimer() );
@@ -822,7 +822,7 @@ void grindFunc( OutputDevice&                       rTarget,
     if( rTarget.GetOutDevType() == OUTDEV_WINDOW )
         static_cast<Window&>(rTarget).Sync();
 
-    fprintf( stdout,
+    fprintf( stdout, 
              "Duration: %d ms (%d repetitions)\tOperation: %s\tSetup: %s\n",
              (int)(osl_getGlobalTimer() - nStartTime),
              (int)(nTurns),
@@ -907,7 +907,7 @@ USHORT GrindApp::Exception( USHORT nError )
     switch( nError & EXC_MAJORTYPE )
     {
         case EXC_RSCNOTLOADED:
-            Abort( String::CreateFromAscii(
+            Abort( String::CreateFromAscii( 
                        "Error: could not load language resources.\nPlease check your installation.\n" ) );
             break;
     }
@@ -940,7 +940,7 @@ void GrindApp::Main()
     try
     {
         uno::Reference< uno::XComponentContext > xCtx = ::cppu::defaultBootstrap_InitialComponentContext();
-        xFactory = uno::Reference< lang::XMultiServiceFactory >(  xCtx->getServiceManager(),
+        xFactory = uno::Reference< lang::XMultiServiceFactory >(  xCtx->getServiceManager(), 
                                                                   uno::UNO_QUERY );
         if( xFactory.is() )
             ::comphelper::setProcessServiceFactory( xFactory );
@@ -951,7 +951,7 @@ void GrindApp::Main()
 
     if( !xFactory.is() )
     {
-        fprintf( stderr,
+        fprintf( stderr, 
                  "Could not bootstrap UNO, installation must be in disorder. Exiting.\n" );
         exit( 1 );
     }
diff --git a/vcl/workben/svdem.cxx b/vcl/workben/svdem.cxx
index 5822f4024a59..a2fcb5779283 100644
--- a/vcl/workben/svdem.cxx
+++ b/vcl/workben/svdem.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
@@ -71,13 +71,13 @@ class MyWin : public WorkWindow
 public:
                 MyWin( Window* pParent, WinBits nWinStyle );
 
-    void        MouseMove( const MouseEvent& rMEvt );
-    void        MouseButtonDown( const MouseEvent& rMEvt );
-    void        MouseButtonUp( const MouseEvent& rMEvt );
-    void        KeyInput( const KeyEvent& rKEvt );
-    void        KeyUp( const KeyEvent& rKEvt );
-    void        Paint( const Rectangle& rRect );
-    void        Resize();
+    void		MouseMove( const MouseEvent& rMEvt );
+    void		MouseButtonDown( const MouseEvent& rMEvt );
+    void		MouseButtonUp( const MouseEvent& rMEvt );
+    void		KeyInput( const KeyEvent& rKEvt );
+    void		KeyUp( const KeyEvent& rKEvt );
+    void		Paint( const Rectangle& rRect );
+    void		Resize();
 };
 
 // -----------------------------------------------------------------------
diff --git a/vcl/workben/svpclient.cxx b/vcl/workben/svpclient.cxx
index 61ed22ca95e7..6fe07025397e 100644
--- a/vcl/workben/svpclient.cxx
+++ b/vcl/workben/svpclient.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
@@ -88,7 +88,7 @@ SAL_IMPLEMENT_MAIN()
     catch( com::sun::star::uno::Exception& rExc)
     {
     }
-
+    
     if( ! xFactory.is() )
     {
         fprintf( stderr, "Could not bootstrap UNO, installation must be in disorder. Exiting.\n" );
@@ -96,7 +96,7 @@ SAL_IMPLEMENT_MAIN()
     }
 
     /*
-     *  Create UCB.
+     *	Create UCB.
      */
     Sequence< Any > aArgs( 2 );
     aArgs[ 0 ] <<= OUString::createFromAscii( UCB_CONFIGURATION_KEY1_LOCAL );
@@ -132,19 +132,19 @@ class MyWin : public WorkWindow
 public:
                 MyWin( Window* pParent, WinBits nWinStyle );
 
-    void        MouseMove( const MouseEvent& rMEvt );
-    void        MouseButtonDown( const MouseEvent& rMEvt );
-    void        MouseButtonUp( const MouseEvent& rMEvt );
-    void        KeyInput( const KeyEvent& rKEvt );
-    void        KeyUp( const KeyEvent& rKEvt );
-    void        Paint( const Rectangle& rRect );
-    void        Resize();
-
+    void		MouseMove( const MouseEvent& rMEvt );
+    void		MouseButtonDown( const MouseEvent& rMEvt );
+    void		MouseButtonUp( const MouseEvent& rMEvt );
+    void		KeyInput( const KeyEvent& rKEvt );
+    void		KeyUp( const KeyEvent& rKEvt );
+    void		Paint( const Rectangle& rRect );
+    void		Resize();
+    
     BOOL        Close();
-
+    
     void parseList( const rtl::OString& rList );
     rtl::OString processCommand( const rtl::OString& rCommand );
-
+    
     DECL_LINK( ListHdl, Button* );
     DECL_LINK( SelectHdl, ListBox* );
     DECL_LINK( QuitHdl, Button* );
@@ -174,15 +174,15 @@ MyWin::MyWin( Window* pParent, WinBits nWinStyle ) :
     m_aListButton.SetText( String( RTL_CONSTASCII_USTRINGPARAM( "List Elements" ) ) );
     m_aListButton.SetClickHdl( LINK( this, MyWin, ListHdl ) );
     m_aListButton.Show();
-
+    
     m_aSvpBitmaps.SetPosSizePixel( Point( 10, 40 ), Size( 150, 150 ) );
     m_aSvpBitmaps.SetSelectHdl( LINK( this, MyWin, SelectHdl ) );
     m_aSvpBitmaps.Show();
-
+    
     m_aImage.SetPosSizePixel( Point( 170, 10 ), Size( 400, 400 ) );
     m_aImage.SetScaleMode( com::sun::star::awt::ImageScaleMode::None );
     m_aImage.Show();
-
+    
     m_aQuitButton.SetPosSizePixel( Point( 10, 300 ), Size( 120,25 ) );
     m_aQuitButton.SetText( String( RTL_CONSTASCII_USTRINGPARAM( "Quit SVP server" ) ) );
     m_aQuitButton.SetClickHdl( LINK( this, MyWin, QuitHdl ) );
@@ -207,7 +207,7 @@ void MyWin::parseList( const rtl::OString& rList )
         rtl::OString aLine = rList.getToken( 0, '\n', nTokenPos );
         if( ! aLine.getLength() || *aLine.getStr() == '#' )
             continue;
-
+        
         if( aLine.compareTo( "ElementType: ", 13 ) == 0 )
             aElementType = rtl::OStringToOUString( aLine.copy( 13 ), RTL_TEXTENCODING_ASCII_US );
         else
diff --git a/vcl/workben/svptest.cxx b/vcl/workben/svptest.cxx
index cc7c0f2b0cce..3852e509f60a 100644
--- a/vcl/workben/svptest.cxx
+++ b/vcl/workben/svptest.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
@@ -78,13 +78,13 @@ class MyWin : public WorkWindow
 public:
                 MyWin( Window* pParent, WinBits nWinStyle );
 
-    void        MouseMove( const MouseEvent& rMEvt );
-    void        MouseButtonDown( const MouseEvent& rMEvt );
-    void        MouseButtonUp( const MouseEvent& rMEvt );
-    void        KeyInput( const KeyEvent& rKEvt );
-    void        KeyUp( const KeyEvent& rKEvt );
-    void        Paint( const Rectangle& rRect );
-    void        Resize();
+    void		MouseMove( const MouseEvent& rMEvt );
+    void		MouseButtonDown( const MouseEvent& rMEvt );
+    void		MouseButtonUp( const MouseEvent& rMEvt );
+    void		KeyInput( const KeyEvent& rKEvt );
+    void		KeyUp( const KeyEvent& rKEvt );
+    void		Paint( const Rectangle& rRect );
+    void		Resize();
 };
 
 // -----------------------------------------------------------------------
diff --git a/vcl/workben/vcldemo.cxx b/vcl/workben/vcldemo.cxx
index 41ca76144e5c..aed8a5984ba4 100644
--- a/vcl/workben/vcldemo.cxx
+++ b/vcl/workben/vcldemo.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
@@ -76,13 +76,13 @@ class MyWin : public WorkWindow
 public:
                 MyWin( Window* pParent, WinBits nWinStyle );
 
-    void        MouseMove( const MouseEvent& rMEvt );
-    void        MouseButtonDown( const MouseEvent& rMEvt );
-    void        MouseButtonUp( const MouseEvent& rMEvt );
-    void        KeyInput( const KeyEvent& rKEvt );
-    void        KeyUp( const KeyEvent& rKEvt );
-    void        Paint( const Rectangle& rRect );
-    void        Resize();
+    void		MouseMove( const MouseEvent& rMEvt );
+    void		MouseButtonDown( const MouseEvent& rMEvt );
+    void		MouseButtonUp( const MouseEvent& rMEvt );
+    void		KeyInput( const KeyEvent& rKEvt );
+    void		KeyUp( const KeyEvent& rKEvt );
+    void		Paint( const Rectangle& rRect );
+    void		Resize();
 };
 
 // -----------------------------------------------------------------------
@@ -172,7 +172,7 @@ void MyWin::Paint( const Rectangle& rRect )
         DrawLine( Point(r.nLeft, r.nTop+i), Point(r.nRight, r.nBottom-i) );
     for(int i=0; i<aSz.Width(); i+=15)
         DrawLine( Point(r.nLeft+i, r.nBottom), Point(r.nRight-i, r.nTop) );
-
+    
     SetTextColor( Color( COL_WHITE ) );
     Font aFont( String( RTL_CONSTASCII_USTRINGPARAM( "Times" ) ), Size( 0, 25 ) );
     SetFont( aFont );
diff --git a/vos/inc/vos/conditn.hxx b/vos/inc/vos/conditn.hxx
index 884ef85c91d6..a8df6308e2d3 100644
--- a/vos/inc/vos/conditn.hxx
+++ b/vos/inc/vos/conditn.hxx
@@ -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
@@ -30,16 +30,16 @@
 #define _VOS_CONDITN_HXX_
 
 #ifndef _OSL_CONDITN_H_
-#   include <osl/conditn.h>
+#	include <osl/conditn.h>
 #endif
 #include <osl/time.h>
-#   include <vos/object.hxx>
+#	include <vos/object.hxx>
 
 namespace vos
 {
 
 /** ICondition
-
+    
     Interface for a thread-spanning condition. If a condition-object
     is created, its initial condition is False. You can check the
     condition nonblocking with "check()" or wait for it to become set
@@ -55,9 +55,9 @@ public:
 
     ICondition() { }
     virtual ~ICondition() { }
-
-
-
+    
+    
+    
     enum TResult
     {
         result_ok          = osl_cond_result_ok,
@@ -90,7 +90,7 @@ public:
 
 
 /** OCondition
-
+    
     Implements the ICondition interface.
 
     @author  Bernd Hofner
@@ -128,11 +128,11 @@ public:
 
 protected:
 
-    oslCondition    m_Condition;
+    oslCondition	m_Condition;
 
 };
 
 }
 
-#endif  // _VOS_CONDITN_HXX_
+#endif	// _VOS_CONDITN_HXX_
 
diff --git a/vos/inc/vos/connectn.hxx b/vos/inc/vos/connectn.hxx
index 803ab56b92f0..764faab88f28 100644
--- a/vos/inc/vos/connectn.hxx
+++ b/vos/inc/vos/connectn.hxx
@@ -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
diff --git a/vos/inc/vos/diagnose.hxx b/vos/inc/vos/diagnose.hxx
index a037c9517ec4..907e201f0edf 100644
--- a/vos/inc/vos/diagnose.hxx
+++ b/vos/inc/vos/diagnose.hxx
@@ -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
@@ -41,15 +41,15 @@
 
 #define VOS_THIS_FILE       __FILE__
 
-#define VOS_DEBUG_ONLY(s)   _OSL_DEBUG_ONLY(s)
+#define VOS_DEBUG_ONLY(s)	_OSL_DEBUG_ONLY(s)
 #define VOS_TRACE           _OSL_TRACE
-#define VOS_ASSERT(c)       _OSL_ASSERT(c, VOS_THIS_FILE, __LINE__)
-#define VOS_VERIFY(c)       OSL_VERIFY(c)
+#define VOS_ASSERT(c) 	    _OSL_ASSERT(c, VOS_THIS_FILE, __LINE__)
+#define VOS_VERIFY(c)		OSL_VERIFY(c)
 #define VOS_ENSHURE(c, m)   _OSL_ENSURE(c, VOS_THIS_FILE, __LINE__, m)
 #define VOS_ENSURE(c, m)    _OSL_ENSURE(c, VOS_THIS_FILE, __LINE__, m)
 
-#define VOS_PRECOND(c, m)   VOS_ENSHURE(c, m)
-#define VOS_POSTCOND(c, m)  VOS_ENSHURE(c, m)
+#define VOS_PRECOND(c, m)  	VOS_ENSHURE(c, m)
+#define VOS_POSTCOND(c, m) 	VOS_ENSHURE(c, m)
 
 #endif /* _VOS_DIAGNOSE_H_ */
 
diff --git a/vos/inc/vos/execabl.hxx b/vos/inc/vos/execabl.hxx
index 04e0ef837b02..64510afeba6b 100644
--- a/vos/inc/vos/execabl.hxx
+++ b/vos/inc/vos/execabl.hxx
@@ -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
@@ -29,11 +29,11 @@
 #ifndef _VOS_EXECABL_HXX_
 #define _VOS_EXECABL_HXX_
 
-#   include <vos/types.hxx>
-#   include <vos/refernce.hxx>
+#	include <vos/types.hxx>
+#	include <vos/refernce.hxx>
 
 namespace vos
-{
+{     
 
 
 /** IExecutable
@@ -50,7 +50,7 @@ namespace vos
     @version 0.1
 */
 
-class IExecutable : public NAMESPACE_VOS(IReference)
+class IExecutable : public NAMESPACE_VOS(IReference) 
 {
 public:
 
@@ -64,7 +64,7 @@ public:
         you should provide here a means to unblock cleanly.
         @Return False if you are not able to unblock the
         thread.
-
+        
     */
     virtual sal_Bool SAL_CALL unblock()= 0;
 
@@ -80,11 +80,11 @@ public:
 
 
 /** OExecutable
-    added default impl. of IReferenceCounter
+    added default impl. of IReferenceCounter 
 */
 class OExecutable : public NAMESPACE_VOS(IExecutable),
                     public NAMESPACE_VOS(OReference)
-
+                    
 {
 public:
 
diff --git a/vos/inc/vos/istream.hxx b/vos/inc/vos/istream.hxx
index 9aacf2829226..30ec52496ec1 100644
--- a/vos/inc/vos/istream.hxx
+++ b/vos/inc/vos/istream.hxx
@@ -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
@@ -29,10 +29,10 @@
 #define _VOS_ISTREAM_HXX_
 
 #include "sal/types.h"
-#   include <vos/types.hxx>
+#	include	<vos/types.hxx>
 
 namespace vos
-{
+{     
 
 /** Interface for a stream of data, on that you can read and write blocks of bytes.
 */
@@ -42,15 +42,15 @@ public:
 
     IStream() { }
     virtual ~IStream() { }
-
-
+    
+    
     /** Retrieve n bytes from the stream and copy them into pBuffer.
         @param pBuffer receives the read data.
         @param n the number of bytes to read. pBuffer must be large enough
         to hold the n bytes!
         @return the number of read bytes
     */
-    virtual sal_Int32 SAL_CALL read(void* pBuffer,
+    virtual sal_Int32 SAL_CALL read(void* pBuffer, 
                          sal_uInt32 n) const= 0;
 
     /** Write n bytes from pBuffer to the stream.
@@ -58,16 +58,16 @@ public:
         @param n the number of bytes to write.
         @return the number of written bytes
     */
-    virtual sal_Int32 SAL_CALL write(const void* pBuffer,
+    virtual sal_Int32 SAL_CALL write(const void* pBuffer, 
                           sal_uInt32 n)= 0;
-
+    
     /** Checks if stream is closed for further reading.
         @return True is stream has ended (e.g. was closed).
     */
     virtual sal_Bool SAL_CALL isEof() const = 0;
 };
 
-}
+}     
 
-#endif  // _VOS_ISTREAM_HXX_
+#endif	// _VOS_ISTREAM_HXX_
 
diff --git a/vos/inc/vos/macros.hxx b/vos/inc/vos/macros.hxx
index ca1b750d67f4..91b858e931b8 100644
--- a/vos/inc/vos/macros.hxx
+++ b/vos/inc/vos/macros.hxx
@@ -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
@@ -36,114 +36,114 @@
 // Macro definitions
 
 #ifndef VOS_CAST
-#   define VOS_CAST(type,value)    (*((type*)&(value)))
-#endif
+#	define VOS_CAST(type,value)    (*((type*)&(value)))
+#endif 
 
 #ifndef VOS_UNUSED
-#   define VOS_UNUSED(x)           (x=x)
+#	define VOS_UNUSED(x)           (x=x)
 #endif
 
 #ifndef VOS_FOREVER
-#   define VOS_FOREVER             for(;;)
+#	define VOS_FOREVER             for(;;)
 #endif
 
 #ifndef VOS_MAX
-#   define VOS_MAX(a,b)            (((a) > (b)) ? (a) : (b))
+#	define VOS_MAX(a,b)            (((a) > (b)) ? (a) : (b))
 #endif
 #ifndef VOS_MIN
-#   define VOS_MIN(a,b)            (((a) < (b)) ? (a) : (b))
+#	define VOS_MIN(a,b)            (((a) < (b)) ? (a) : (b))
 #endif
 
 #ifndef VOS_ABS
-#   define VOS_ABS(a)              (((a) < 0) ? (-(a)) : (a))
+#	define VOS_ABS(a)              (((a) < 0) ? (-(a)) : (a))
 #endif
 #ifndef VOS_SIGN
-#   define VOS_SIGN(a)             ( ((a) < 0) ? (-1) : (((a) > 0) ? (1) : (0)) )
+#	define VOS_SIGN(a)             ( ((a) < 0) ? (-1) : (((a) > 0) ? (1) : (0)) )
 #endif
 
 #ifndef VOS_BOUND
-#   define VOS_BOUND(x,l,h)        ((x) <= (l) ? (l) : ((x) >= (h) ? (h) : (x)))
+#	define VOS_BOUND(x,l,h)        ((x) <= (l) ? (l) : ((x) >= (h) ? (h) : (x)))
 #endif
 
 #ifndef VOS_SWAP
-#   define VOS_SWAP(a,b)           ((a) ^= (b) ^= (a) ^= (b))
+#	define VOS_SWAP(a,b)           ((a) ^= (b) ^= (a) ^= (b))
 #endif
 
 #ifndef VOS_BYTEBOUND
-#   define VOS_BYTEBOUND(a)        (((a) + 7) / 8)
+#	define VOS_BYTEBOUND(a)        (((a) + 7) / 8)
 #endif
 
 #ifndef VOS_WORDBOUND
-#   define VOS_WORDBOUND(a)        ((((a) + 15) / 16) * 2)
+#	define VOS_WORDBOUND(a)        ((((a) + 15) / 16) * 2)
 #endif
 
 #ifndef VOS_DWORDBOUND
-#   define VOS_DWORDBOUND(a)       ((((a) + 31) / 32) * 4)
+#	define VOS_DWORDBOUND(a)       ((((a) + 31) / 32) * 4)
 #endif
 
 #ifndef VOS_MAKEDWORD
-#   define VOS_MAKEDWORD(wl, wh)   ((sal_uInt32)((wl) & 0xFFFF) | (((sal_uInt32)(wh) & 0xFFFF) << 16))
+#	define VOS_MAKEDWORD(wl, wh)   ((sal_uInt32)((wl) & 0xFFFF) | (((sal_uInt32)(wh) & 0xFFFF) << 16))
 #endif
 #ifndef VOS_LOWORD
-#   define VOS_LOWORD(d)           ((sal_uInt16)((sal_uInt32)(d) & 0xFFFF))
+#	define VOS_LOWORD(d)           ((sal_uInt16)((sal_uInt32)(d) & 0xFFFF))
 #endif
 #ifndef VOS_HIWORD
-#   define VOS_HIWORD(d)           ((sal_uInt16)(((sal_uInt32)(d) >> 16) & 0xFFFF))
+#	define VOS_HIWORD(d)           ((sal_uInt16)(((sal_uInt32)(d) >> 16) & 0xFFFF))
 #endif
 #ifndef VOS_MAKEWORD
-#   define VOS_MAKEWORD(bl, bh)    ((sal_uInt16)((bl) & 0xFF) | (((sal_uInt16)(bh) & 0xFF) << 8))
+#	define VOS_MAKEWORD(bl, bh)    ((sal_uInt16)((bl) & 0xFF) | (((sal_uInt16)(bh) & 0xFF) << 8))
 #endif
 #ifndef VOS_LOBYTE
-#   define VOS_LOBYTE(w)           ((sal_uInt8)((sal_uInt16)(w) & 0xFF))
+#	define VOS_LOBYTE(w)           ((sal_uInt8)((sal_uInt16)(w) & 0xFF))
 #endif
 #ifndef VOS_HIBYTE
-#   define VOS_HIBYTE(w)           ((sal_uInt8)(((sal_uInt16)(w) >> 8) & 0xFF))
+#	define VOS_HIBYTE(w)           ((sal_uInt8)(((sal_uInt16)(w) >> 8) & 0xFF))
 #endif
 #ifndef VOS_MAKEBYTE
-#   define VOS_MAKEBYTE(nl, nh)    ((sal_uInt8)(((nl) & 0x0F) | (((nh) & 0x0F) << 4)))
+#	define VOS_MAKEBYTE(nl, nh)    ((sal_uInt8)(((nl) & 0x0F) | (((nh) & 0x0F) << 4)))
 #endif
 #ifndef VOS_LONIBBLE
-#   define VOS_LONIBBLE(b)         ((sal_uInt8)((b) & 0x0F))
+#	define VOS_LONIBBLE(b)         ((sal_uInt8)((b) & 0x0F))
 #endif
 #ifndef VOS_HINIBBLE
-#   define VOS_HINIBBLE(b)         ((sal_uInt8)(((b) >> 4) & 0x0F))
+#	define VOS_HINIBBLE(b)         ((sal_uInt8)(((b) >> 4) & 0x0F))
 #endif
 
 #ifndef VOS_SWAPWORD
-#   define VOS_SWAPWORD(w)         VOS_MAKEWORD(VOS_HIBYTE(w),VOS_LOBYTE(w))
+#	define VOS_SWAPWORD(w)         VOS_MAKEWORD(VOS_HIBYTE(w),VOS_LOBYTE(w))
 #endif
 #ifndef VOS_SWAPDWORD
-#   define VOS_SWAPDWORD(d)        VOS_MAKEDWORD(VOS_SWAPWORD(VOS_HIWORD(d)),VOS_SWAPWORD(VOS_LOWORD(d)))
+#	define VOS_SWAPDWORD(d)        VOS_MAKEDWORD(VOS_SWAPWORD(VOS_HIWORD(d)),VOS_SWAPWORD(VOS_LOWORD(d)))
 #endif
 
 #ifdef OSL_BIGENDIAN
 #ifndef VOS_NETWORD
-#   define VOS_NETWORD(w)          (sal_uInt16)(w)
+#	define VOS_NETWORD(w)          (sal_uInt16)(w)
 #endif
 #ifndef VOS_NETDWORD
-#   define VOS_NETDWORD(d)         (sal_uInt32)(d)
+#	define VOS_NETDWORD(d)         (sal_uInt32)(d)
 #endif
 #else  // OSL_LITENDIAN
 #ifndef VOS_NETWORD
-#   define VOS_NETWORD(w)          VOS_MAKEWORD(VOS_HIBYTE(w),VOS_LOBYTE(w))
+#	define VOS_NETWORD(w)          VOS_MAKEWORD(VOS_HIBYTE(w),VOS_LOBYTE(w))
 #endif
 #ifndef VOS_NETDWORD
-#   define VOS_NETDWORD(d)         VOS_MAKEDWORD(VOS_NETWORD(VOS_HIWORD(d)),VOS_NETWORD(VOS_LOWORD(d)))
+#	define VOS_NETDWORD(d)         VOS_MAKEDWORD(VOS_NETWORD(VOS_HIWORD(d)),VOS_NETWORD(VOS_LOWORD(d)))
 #endif
 #endif // OSL_BIGENDIAN
 
 #ifdef _OSL_MEMSEG
-#   define VOS_MAKEPTR(base, off)  ((void _far *)VOS_MAKEDWORD((off), (base)))
-#   define VOS_BASEOF(ptr)         VOS_HIWORD(ptr)
-#   define VOS_OFSTOF(ptr)         VOS_LOWORD(ptr)
+#	define VOS_MAKEPTR(base, off)  ((void _far *)VOS_MAKEDWORD((off), (base)))
+#	define VOS_BASEOF(ptr)         VOS_HIWORD(ptr)
+#	define VOS_OFSTOF(ptr)         VOS_LOWORD(ptr)
 #else
-#   define VOS_MAKEPTR(base, off)  ((void *)((base) + (off)))
-#   define VOS_BASEOF(ptr)         (ptr)
-#   define VOS_OFSTOF(ptr)         0
+#	define VOS_MAKEPTR(base, off)  ((void *)((base) + (off)))
+#	define VOS_BASEOF(ptr)         (ptr)
+#	define VOS_OFSTOF(ptr)         0
 #endif
 
 #ifndef VOS_FIELDOFFSET
-#   define VOS_FIELDOFFSET(type, field) ((sal_Int32)(&((type *)1)->field) - 1)
+#	define VOS_FIELDOFFSET(type, field) ((sal_Int32)(&((type *)1)->field) - 1)
 #endif
 
 // def. for arbitrary namespace
diff --git a/vos/inc/vos/module.hxx b/vos/inc/vos/module.hxx
index d70cc101e4fc..83881039ada2 100644
--- a/vos/inc/vos/module.hxx
+++ b/vos/inc/vos/module.hxx
@@ -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
diff --git a/vos/inc/vos/mutex.hxx b/vos/inc/vos/mutex.hxx
index 6336e23bd0f7..98a2adcaba67 100644
--- a/vos/inc/vos/mutex.hxx
+++ b/vos/inc/vos/mutex.hxx
@@ -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
@@ -28,12 +28,12 @@
 #ifndef _VOS_MUTEX_HXX_
 #define _VOS_MUTEX_HXX_
 
-#   include <vos/types.hxx>
-#   include <vos/object.hxx>
-#   include <osl/mutex.h>
+#	include <vos/types.hxx>
+#	include <vos/object.hxx>
+#	include <osl/mutex.h>
 
 namespace vos
-{
+{     
 
 
 /** IMutex interface
@@ -47,7 +47,7 @@ class IMutex
 public:
 
     /// Blocks if Mutex is already in use
-    virtual void SAL_CALL acquire()= 0;
+    virtual void SAL_CALL acquire()= 0;			
 
     // Tries to get the mutex without blocking.
     virtual sal_Bool SAL_CALL tryToAcquire()= 0;
@@ -58,7 +58,7 @@ public:
 protected:
     IMutex() { }
     virtual ~IMutex() { }
-
+    
 };
 
 // ----------------------------------------------------------
@@ -77,12 +77,12 @@ public:
     static IMutex& SAL_CALL getGlobalMutex();
 
     /// Creates mutex
-    OMutex();
-    /// Implicitly destroys mutex
-    virtual ~OMutex();
-
+    OMutex();	
+    /// Implicitly destroys mutex	
+    virtual ~OMutex();	
+    
     /// Blocks if Mutex is already in use
-    virtual void SAL_CALL acquire();
+    virtual void SAL_CALL acquire();	
 
     /** Tries to get the mutex without blocking.
         @return True if mutex could be obtained, otherwise False
@@ -93,12 +93,12 @@ public:
     virtual void SAL_CALL release();
 
 protected:
-    oslMutex    m_Impl;
+    oslMutex	m_Impl;
 
 private:
     // disable copy/assignment
-    OMutex(const OMutex&);
-    OMutex& SAL_CALL operator= (const OMutex&);
+    OMutex(const OMutex&);	
+    OMutex& SAL_CALL operator= (const OMutex&);	
 };
 
 // *********************************************************************************
@@ -115,10 +115,10 @@ class OGuard
     const OGuard& operator = ( const OGuard& );
 public:
     /** Acquires mutex
-        @param pMutex pointer to mutex which is to be acquired  */
+        @param pMutex pointer to mutex which is to be acquired	*/
     OGuard(IMutex* pMutex)
         : m_rMutex( *pMutex )
-    {   // only for compatible reasons
+    {	// only for compatible reasons
         m_rMutex.acquire();
     }
     OGuard(IMutex & rMutex)
@@ -148,7 +148,7 @@ class OClearableGuard
     const OClearableGuard& operator = ( const OClearableGuard& );
 public:
     /** Acquires mutex
-        @param pMutex pointer to mutex which is to be acquired  */
+        @param pMutex pointer to mutex which is to be acquired	*/
     OClearableGuard(IMutex & rMutex)
         : m_pMutex( &rMutex )
     {
@@ -175,7 +175,7 @@ protected:
     IMutex* m_pMutex;
 };
 
-}
+}     
 
 
 #endif  //_VOS_MUTEX_HXX_
diff --git a/vos/inc/vos/object.hxx b/vos/inc/vos/object.hxx
index 6108280cf382..75576401bb83 100644
--- a/vos/inc/vos/object.hxx
+++ b/vos/inc/vos/object.hxx
@@ -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
@@ -29,11 +29,11 @@
 #ifndef _VOS_OBJECT_HXX_
 #define _VOS_OBJECT_HXX_
 
-#   include <vos/types.hxx>
-#   include <vos/macros.hxx>
+#	include <vos/types.hxx>
+#	include <vos/macros.hxx>
 
 namespace vos
-{
+{     
 
 // ***************************************
 // Object super class
@@ -59,19 +59,19 @@ public:
     // compiler errors instead of unexpected behaviour if you pass objects
     // by value or assign objects.
 private:
-    OObject(const OObject& objectSrc);          // no implementation
-    void SAL_CALL operator=(const OObject& objectSrc);  // no implementation
+    OObject(const OObject& objectSrc);			// no implementation
+    void SAL_CALL operator=(const OObject& objectSrc);	// no implementation
 
 public:
     virtual ~OObject();
 
 public:
 
-    /** Define private new and delete operator because of compiler bug,
+    /** Define private new and delete operator because of compiler bug, 
         when allocating and deleteing a exported class
     */
-    void* SAL_CALL operator new(size_t size);
-    void* SAL_CALL operator new(size_t size, void* p);
+    void* SAL_CALL operator new(::size_t size);
+    void* SAL_CALL operator new(::size_t size, void* p);
 
     void  SAL_CALL operator delete(void* p);
 
@@ -99,11 +99,11 @@ public:
 struct OCreateParam
 {
     sal_uInt32 m_Size;
-    void*    m_pParam;
+    void*	 m_pParam;
 
     ///
     OCreateParam(void *pParam)
-    {
+    {	
         m_Size = sizeof(OCreateParam);
         m_pParam = pParam;
     }
@@ -116,17 +116,17 @@ struct OClassInfo
     ///
     const sal_Char  *m_pClassName;
     ///
-    sal_Int32            m_nObjectSize;
+    sal_Int32			 m_nObjectSize;
     /// schema number of the loaded class
-    sal_uInt32   m_wSchema;
+    sal_uInt32	 m_wSchema;				
 
     ///
-    OObject* (SAL_CALL * m_pfnCreateObject)(const OCreateParam&);   // NULL => abstract class
+    OObject* (SAL_CALL * m_pfnCreateObject)(const OCreateParam&);	// NULL => abstract class
 
     /// linked list of registered classes
     const OClassInfo* m_pBaseClass;
     /// linked list of registered classes
-    const OClassInfo* m_pNextClass;
+    const OClassInfo* m_pNextClass;			
 
     ///
     OObject* SAL_CALL createObject(const OCreateParam& rParam) const;
@@ -140,7 +140,7 @@ struct OClassInfo
     ///
     OClassInfo(const sal_Char *pClassName, sal_Int32 ObjectSize,
                const OClassInfo* pBaseClass = NULL, sal_uInt32 Schema = (sal_uInt32)-1,
-               OObject* (SAL_CALL * fnCreateObject)(const OCreateParam&) = NULL);
+               OObject* (SAL_CALL * fnCreateObject)(const OCreateParam&) = NULL); 
 };
 
 // *****************************************************************
@@ -165,7 +165,7 @@ struct VOS_CLASSINIT
         { return (VOS_CLASSINFO(class_name)); } \
     const VOS_NAMESPACE(OClassInfo, vos)& SAL_CALL class_name::classInfo() \
         { return (__ClassInfo__); }
-
+    
 #define VOS_DECLARE_CLASSINFO(class_name) \
 public: \
     static const VOS_NAMESPACE(VOS_CLASSINIT, vos) __ClassInit__; \
diff --git a/vos/inc/vos/pipe.hxx b/vos/inc/vos/pipe.hxx
index e9b1145a36ee..7e1d3efee720 100644
--- a/vos/inc/vos/pipe.hxx
+++ b/vos/inc/vos/pipe.hxx
@@ -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
diff --git a/vos/inc/vos/process.hxx b/vos/inc/vos/process.hxx
index e41a050acaa0..49db41928d81 100644
--- a/vos/inc/vos/process.hxx
+++ b/vos/inc/vos/process.hxx
@@ -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
diff --git a/vos/inc/vos/ref.hxx b/vos/inc/vos/ref.hxx
index 7b68bc43f09f..6d005bd2c6e7 100644
--- a/vos/inc/vos/ref.hxx
+++ b/vos/inc/vos/ref.hxx
@@ -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
@@ -32,24 +32,24 @@
 /**
     ORef<T>
 
-    template type to implement handle/body behaviour
+    template type to implement handle/body behaviour 
     with reference-counting.
 
     Note that the template-type T MUST implement IReferenceCounter.
 
 */
 
-#   include <vos/refernce.hxx>
+#	include <vos/refernce.hxx>
 #ifndef _VOS_DIAGNOSE_HXX_
-#   include <vos/diagnose.hxx>
+#	include <vos/diagnose.hxx>
 #endif
 
 namespace vos
-{
+{     
 
 
 template <class T>
-class ORef
+class ORef 
 {
 public:
 
@@ -123,7 +123,7 @@ public:
     */
     T* SAL_CALL operator->() const;
 
-    /** Gives access to the handles body.
+    /** Gives access to the handles body. 
     */
     T& SAL_CALL getBody() const;
 
@@ -137,7 +137,7 @@ public:
         does not point to a valid body).
     */
     sal_Bool SAL_CALL isEmpty() const;
-
+    
     /** Returns True is the body is "full" (the handle
         does point to a valid body).
     */
@@ -177,7 +177,7 @@ protected:
 // include template implementation
 #include <vos/ref.inl>
 
-}
+}     
 
 
 #endif // _VOS_REF_HXX_
diff --git a/vos/inc/vos/ref.inl b/vos/inc/vos/ref.inl
index 48ccf19ea80e..f6c0fb0a3682 100644
--- a/vos/inc/vos/ref.inl
+++ b/vos/inc/vos/ref.inl
@@ -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
@@ -33,13 +33,13 @@
 #endif
 
 template <class T>
-inline ORef<T>::ORef()
+inline ORef<T>::ORef() 
 {
     m_refBody= 0;
 }
 
 template <class T>
-inline ORef<T>::ORef(T* pBody)
+inline ORef<T>::ORef(T* pBody) 
 {
     m_refBody= pBody;
 
@@ -48,7 +48,7 @@ inline ORef<T>::ORef(T* pBody)
 }
 
 template <class T>
-inline ORef<T>::ORef(const ORef<T>& handle)
+inline ORef<T>::ORef(const ORef<T>& handle) 
 {
     m_refBody= handle.m_refBody;
 
@@ -57,30 +57,30 @@ inline ORef<T>::ORef(const ORef<T>& handle)
 }
 
 template <class T>
-inline ORef<T>::~ORef()
+inline ORef<T>::~ORef() 
 {
     if (m_refBody)
         CAST_TO_IREFERENCE(m_refBody)->release();
 }
 
 template <class T>
-inline ORef<T>& ORef<T>::operator= (const ORef<T>& handle)
+inline ORef<T>& ORef<T>::operator= (const ORef<T>& handle) 
 {
-    if (m_refBody)
+    if (m_refBody) 
         CAST_TO_IREFERENCE(m_refBody)->release();
 
     m_refBody= handle.m_refBody;
-
+    
     if (m_refBody)
         CAST_TO_IREFERENCE(m_refBody)->acquire();
-
+    
     return *this;
 }
 
 template <class T>
-inline void ORef<T>::bind(T* pBody)
+inline void ORef<T>::bind(T* pBody) 
 {
-    if (m_refBody)
+    if (m_refBody) 
         CAST_TO_IREFERENCE(m_refBody)->release();
 
     m_refBody= pBody;
@@ -90,7 +90,7 @@ inline void ORef<T>::bind(T* pBody)
 }
 
 template <class T>
-inline ORef<T>& ORef<T>::unbind()
+inline ORef<T>& ORef<T>::unbind() 
 {
     if (m_refBody)
     {
@@ -101,7 +101,7 @@ inline ORef<T>& ORef<T>::unbind()
 }
 
 template <class T>
-inline void ORef<T>::operator= (T* pBody)
+inline void ORef<T>::operator= (T* pBody) 
 {
     bind(pBody);
 }
@@ -114,14 +114,14 @@ inline T& ORef<T>::operator() () const
 }
 
 template <class T>
-inline T& ORef<T>::operator* () const
+inline T& ORef<T>::operator* () const 
 {
     VOS_PRECOND(m_refBody, "ORef::operator*: can't deref nil body!");
     return *m_refBody;
 }
 
 template <class T>
-inline T* ORef<T>::operator->() const
+inline T* ORef<T>::operator->() const 
 {
     VOS_PRECOND(m_refBody, "ORef::operator->: nil body!");
     return m_refBody;
diff --git a/vos/inc/vos/refernce.hxx b/vos/inc/vos/refernce.hxx
index 25f0f39eb0f3..8d7c3448de08 100644
--- a/vos/inc/vos/refernce.hxx
+++ b/vos/inc/vos/refernce.hxx
@@ -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
@@ -28,9 +28,9 @@
 #ifndef _VOS_REFERNCE_HXX_
 #define _VOS_REFERNCE_HXX_
 
-#   include <vos/types.hxx>
-#   include <osl/interlck.h>
-#   include <vos/object.hxx>
+#	include <vos/types.hxx>
+#	include <osl/interlck.h>
+#	include <vos/object.hxx>
 
 namespace vos
 {
@@ -43,7 +43,7 @@ public:
 
     IReference() { }
     virtual ~IReference() { }
-
+    
     typedef oslInterlockedCount RefCount;
 
     virtual RefCount SAL_CALL acquire()=0;
@@ -60,14 +60,14 @@ public:
     ORefCount() { m_RefCount = 0; }
     ORefCount(RefCount n) { m_RefCount = n; }
     virtual ~ORefCount();
-
+    
     RefCount SAL_CALL acquire() { return (osl_incrementInterlockedCount(&m_RefCount)); };
     RefCount SAL_CALL release() { return (osl_decrementInterlockedCount(&m_RefCount)); };
 
-    RefCount SAL_CALL operator++()   { return acquire(); }
+    RefCount SAL_CALL operator++() 	 { return acquire(); }
     // don't implement the postfix operator, it won't function this way!
 
-    RefCount SAL_CALL operator--()   { return release(); }
+    RefCount SAL_CALL operator--() 	 { return release(); }
     // don't implement the postfix operator, it won't function this way!
 
     RefCount SAL_CALL referenced() const
@@ -105,5 +105,5 @@ private:
 
 }
 
-#endif  // _VOS_REFERNCE_HXX_
+#endif	// _VOS_REFERNCE_HXX_
 
diff --git a/vos/inc/vos/refobj.hxx b/vos/inc/vos/refobj.hxx
index a79d45c9bd0c..7a6a3de8c3f1 100644
--- a/vos/inc/vos/refobj.hxx
+++ b/vos/inc/vos/refobj.hxx
@@ -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
@@ -36,9 +36,9 @@
     with reference-counting.
 */
 
-#   include <vos/refernce.hxx>
+#	include <vos/refernce.hxx>
 #ifndef _VOS_DIAGNOSE_HXX_
-#   include <vos/diagnose.hxx>
+#	include <vos/diagnose.hxx>
 #endif
 
 namespace vos
@@ -49,7 +49,7 @@ class ORefObj : public IReference
 {
 public:
     ORefObj(const T& Obj);
-
+    
     inline ~ORefObj();
 
     virtual RefCount SAL_CALL acquire()
@@ -67,11 +67,11 @@ public:
     T& SAL_CALL operator() ();
     const T& SAL_CALL operator() () const;
 
-    const   T& SAL_CALL getObj() const;
+    const	T& SAL_CALL getObj() const;
     T& SAL_CALL getObj();
 
 protected:
-    T         m_Obj;
+    T	      m_Obj;
     ORefCount m_RefCount;
 
 private:
diff --git a/vos/inc/vos/refobj.inl b/vos/inc/vos/refobj.inl
index 78b4e0f2808d..3d1700fcdff2 100644
--- a/vos/inc/vos/refobj.inl
+++ b/vos/inc/vos/refobj.inl
@@ -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
diff --git a/vos/inc/vos/runnable.hxx b/vos/inc/vos/runnable.hxx
index d577181b2398..be2ba07093ab 100644
--- a/vos/inc/vos/runnable.hxx
+++ b/vos/inc/vos/runnable.hxx
@@ -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
@@ -28,11 +28,11 @@
 #ifndef _VOS_RUNNABLE_HXX_
 #define _VOS_RUNNABLE_HXX_
 
-#   include <vos/types.hxx>
-#   include <vos/refernce.hxx>
+#	include <vos/types.hxx>
+#	include <vos/refernce.hxx>
 
 namespace vos
-{
+{     
 
 
 /** IRunnable
@@ -51,8 +51,8 @@ public:
 
     IRunnable() { }
     virtual ~IRunnable() { }
-
-
+    
+    
     /** overload to implement your functionality.
     */
     virtual void SAL_CALL run()= 0;
diff --git a/vos/inc/vos/security.hxx b/vos/inc/vos/security.hxx
index 6f0766bc4b24..2103be94e2f6 100644
--- a/vos/inc/vos/security.hxx
+++ b/vos/inc/vos/security.hxx
@@ -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
diff --git a/vos/inc/vos/signal.hxx b/vos/inc/vos/signal.hxx
index ea9db4850490..efbf7ff87f9a 100644
--- a/vos/inc/vos/signal.hxx
+++ b/vos/inc/vos/signal.hxx
@@ -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
@@ -29,9 +29,9 @@
 #ifndef _VOS_SIGNAL_HXX_
 #define _VOS_SIGNAL_HXX_
 
-#   include <vos/types.hxx>
-#   include <vos/object.hxx>
-#   include <osl/signal.h>
+#	include <vos/types.hxx>
+#	include <vos/object.hxx>
+#	include <osl/signal.h>
 
 namespace vos
 {
@@ -73,8 +73,8 @@ public:
 
     typedef oslSignalInfo TSignalInfo;
 
-    /// Constructor
-    OSignalHandler();
+    /// Constructor 
+    OSignalHandler();              
 
     /// Destructor kills thread if neccessary
     virtual ~OSignalHandler();
diff --git a/vos/inc/vos/socket.hxx b/vos/inc/vos/socket.hxx
index cfd51fbb069b..005df5089305 100644
--- a/vos/inc/vos/socket.hxx
+++ b/vos/inc/vos/socket.hxx
@@ -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
diff --git a/vos/inc/vos/stream.hxx b/vos/inc/vos/stream.hxx
index 5e25aa1d103a..04aa454bfc61 100644
--- a/vos/inc/vos/stream.hxx
+++ b/vos/inc/vos/stream.hxx
@@ -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
@@ -28,12 +28,12 @@
 #ifndef _VOS_STREAM_HXX_
 #define _VOS_STREAM_HXX_
 
-#   include <vos/types.hxx>
-#   include <vos/object.hxx>
-#   include <vos/istream.hxx>
+#	include <vos/types.hxx>
+#	include <vos/object.hxx>
+#	include <vos/istream.hxx>
 
 namespace vos
-{
+{     
 
 /** Adds seeking capabilities to IStream
 */
@@ -45,7 +45,7 @@ public:
     typedef sal_Int32 Offset;
 
 public:
-
+    
     ///
     virtual sal_Bool SAL_CALL seekTo(Offset position) const = 0;
 
@@ -54,7 +54,7 @@ public:
 
     ///
     virtual sal_Bool SAL_CALL seekToEnd() const = 0;
-
+    
     ///
     virtual sal_Bool SAL_CALL changeSize(sal_uInt32 new_size) = 0;
 
@@ -65,17 +65,17 @@ public:
     ///
     virtual Offset SAL_CALL getOffset() const = 0;
 
-
+    
 protected:
     IPositionableStream() { }
     virtual ~IPositionableStream() { }
-
+    
 };
 
 
 /** Implements IPositionableStream
 */
-class OStream : public NAMESPACE_VOS(OObject),
+class OStream : public NAMESPACE_VOS(OObject), 
                 public NAMESPACE_VOS(IPositionableStream)
 {
     VOS_DECLARE_CLASSINFO(VOS_NAMESPACE(OStream, vos));
@@ -83,7 +83,7 @@ class OStream : public NAMESPACE_VOS(OObject),
 public:
 
     ///
-    OStream(IPositionableStream& rStream);
+    OStream(IPositionableStream& rStream);	
 
     ///
     virtual ~OStream ();
@@ -94,8 +94,8 @@ public:
     virtual sal_Int32 SAL_CALL read(void* pbuffer, sal_uInt32 n) const;
 
     ///
-    sal_Int32 SAL_CALL read(IPositionableStream::Offset offset,
-                 void* pbuffer,
+    sal_Int32 SAL_CALL read(IPositionableStream::Offset offset, 
+                 void* pbuffer, 
                  sal_uInt32 n) const;
 
     ///
@@ -109,15 +109,15 @@ public:
 
     ///
     inline sal_Bool SAL_CALL read(sal_uInt8& value) const;
-
+   
     // ----------------- Write operations ------------------------
 
     ///
     virtual sal_Int32 SAL_CALL write(const void* pbuffer, sal_uInt32 n);
 
     ///
-    sal_Int32 SAL_CALL write(IPositionableStream::Offset offset,
-                  const void* pbuffer,
+    sal_Int32 SAL_CALL write(IPositionableStream::Offset offset, 
+                  const void* pbuffer, 
                   sal_uInt32 n);
     ///
     inline sal_Bool SAL_CALL write(sal_Int32 value);
@@ -133,7 +133,7 @@ public:
 
     ///
     sal_Bool SAL_CALL append(void* pbuffer, sal_uInt32 n); // Write at the end of the Stream.
-
+    
     // ------------- Positioning and sizing operations ----------
 
     ///
@@ -149,15 +149,15 @@ public:
 
     ///
     virtual sal_Bool SAL_CALL seekRelative(IPositionableStream::Offset change) const;
-
+    
     ///
     virtual sal_Bool SAL_CALL changeSize(sal_uInt32 new_size);
-
+    
     ///
-    virtual sal_uInt32 SAL_CALL getSize() const;
+    virtual sal_uInt32 SAL_CALL getSize() const;	
 
     ///
-    virtual sal_Bool SAL_CALL isEof() const;
+    virtual sal_Bool SAL_CALL isEof() const;	
 
     ///
     virtual IPositionableStream::Offset SAL_CALL getOffset() const;
@@ -223,62 +223,62 @@ inline sal_Bool OStream::seekToBegin() const
 }
 
 inline const OStream& operator>> (OStream& rStream, sal_Int32& value)
-{
-    rStream.read(value);
-
-    return (rStream);
+{ 
+    rStream.read(value); 
+    
+    return (rStream); 
 }
-
+    
 inline const OStream& operator>> (OStream& rStream, sal_Int16& value)
-{
-    rStream.read(value);
-
-    return (rStream);
+{ 
+    rStream.read(value); 
+    
+    return (rStream); 
 }
-
+    
 inline const OStream& operator>> (OStream& rStream, sal_uInt8& value)
-{
-    rStream.read(value);
-
-    return (rStream);
+{ 
+    rStream.read(value); 
+    
+    return (rStream); 
 }
-
+    
 inline const OStream& operator>> (OStream& rStream, sal_Char& value)
-{
-    rStream.read(value);
-
-    return (rStream);
+{ 
+    rStream.read(value); 
+    
+    return (rStream); 
 }
-
+    
 inline OStream& operator<< (OStream& rStream, sal_Int32 value)
-{
-    rStream.write(value);
-
-    return (rStream);
+{ 
+    rStream.write(value); 
+    
+    return (rStream); 
 }
-
+    
 inline OStream& operator<< (OStream& rStream, sal_Int16 value)
-{
-    rStream.write(value);
-
-    return (rStream);
+{ 
+    rStream.write(value); 
+    
+    return (rStream); 
 }
-
+    
 inline OStream& operator<< (OStream& rStream, sal_uInt8 value)
-{
-    rStream.write(value);
-
-    return (rStream);
+{ 
+    rStream.write(value); 
+    
+    return (rStream); 
 }
-
+    
 inline OStream& operator<< (OStream& rStream, sal_Char value)
-{
-    rStream.write(value);
-
-    return (rStream);
+{ 
+    rStream.write(value); 
+    
+    return (rStream); 
 }
 
-}
+}     
 
 #endif // _VOS_STREAM_HXX_
 
diff --git a/vos/inc/vos/thread.hxx b/vos/inc/vos/thread.hxx
index 16f64c0e0812..a6f2d06a839a 100644
--- a/vos/inc/vos/thread.hxx
+++ b/vos/inc/vos/thread.hxx
@@ -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
@@ -28,11 +28,11 @@
 #ifndef _VOS_THREAD_HXX_
 #define _VOS_THREAD_HXX_
 
-#   include <vos/types.hxx>
-#   include <vos/object.hxx>
-#   include <osl/thread.h>
-#   include <osl/conditn.h>
-#   include <vos/runnable.hxx>
+#	include <vos/types.hxx>
+#	include <vos/object.hxx>
+#	include <osl/thread.h>
+#	include <osl/conditn.h>
+#	include <vos/runnable.hxx>
 
 #include <osl/time.h>
 
@@ -58,7 +58,7 @@ class OThread : public NAMESPACE_VOS(IRunnable),
 {
 
     VOS_DECLARE_CLASSINFO(VOS_NAMESPACE(OThread, vos));
-
+    
     oslCondition m_aCondition;
 
 public:
@@ -74,22 +74,22 @@ public:
         TPriority_Unknown     = osl_Thread_PriorityUnknown
     };
 
-    /**
+    /** 
     */
-    enum TThreadSleep
-    {
+    enum TThreadSleep 
+    {   
         TSleep_Normal,
         TSleep_Cancel,
         TSleep_Pending,
         TSleep_Active,
         TSleep_Error,
-        TSleep_Unknown
+        TSleep_Unknown	
     };
 
     typedef oslThreadIdentifier TThreadIdentifier;
 
-    /// Constructor
-    OThread();
+    /// Constructor 
+    OThread();              
 
     /// Destructor kills thread if neccessary
     virtual ~OThread();
@@ -124,7 +124,7 @@ public:
     /// Check if thread is running.
     sal_Bool SAL_CALL isRunning();
 
-    /** Change thread priority.
+    /** Change thread priority. 
         The valid priority levels are:
     <ul>
         <li>ThreadPriorityHighest,
@@ -136,7 +136,7 @@ public:
     */
     void SAL_CALL setPriority(TThreadPriority Priority);
 
-    /** Query thread priority.
+    /** Query thread priority. 
         Valid return values are:
     <ul>
         <li>ThreadPriorityHighest,
@@ -158,9 +158,9 @@ public:
     */
     TThreadSleep SAL_CALL sleep(const TimeValue& Delay);
 
-    /** Awake the sleeping thread.
-        @returns False if at least one of the handles is invalid
-        or the thread is not sleeping.
+    /** Awake the sleeping thread. 
+        @returns False if at least one of the handles is invalid 
+        or the thread is not sleeping. 
     */
     sal_Bool SAL_CALL awake();
 
@@ -171,7 +171,7 @@ public:
     */
     static void SAL_CALL wait(const TimeValue& Delay);
 
-    /** Reschedules threads.
+    /** Reschedules threads. 
         Call within your loop if you
         want other threads offer some processing time.
         This method is static, so it might be used by the
@@ -191,7 +191,7 @@ protected:
     */
     virtual sal_Bool SAL_CALL schedule();
 
-    /** Called when run() is done.
+    /** Called when run() is done. 
         You might want to override it to do some cleanup.
     */
     virtual void SAL_CALL onTerminated();
@@ -208,10 +208,10 @@ class OThreadData : public NAMESPACE_VOS(OObject)
     VOS_DECLARE_CLASSINFO(VOS_NAMESPACE(OThreadData, vos));
 
 public:
-    /// Create a thread specific local data key
-    OThreadData( oslThreadKeyCallbackFunction = 0 );
+    /// Create a thread specific local data key 
+    OThreadData( oslThreadKeyCallbackFunction = 0 );              
 
-    /// Destroy a thread specific local data key
+    /// Destroy a thread specific local data key 
     virtual ~OThreadData();
 
     /** Set the data associated with the data key.
@@ -220,7 +220,7 @@ public:
     sal_Bool SAL_CALL setData(void *pData);
 
     /** Get the data associated with the data key.
-        @returns The data asscoitaed with the data key or
+        @returns The data asscoitaed with the data key or 
         NULL if no data was set
     */
     void* SAL_CALL getData();
diff --git a/vos/inc/vos/timer.hxx b/vos/inc/vos/timer.hxx
index 4605092ec2f0..0fdaee8a8c00 100644
--- a/vos/inc/vos/timer.hxx
+++ b/vos/inc/vos/timer.hxx
@@ -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
@@ -29,13 +29,13 @@
 #ifndef _VOS_TIMER_HXX_
 #define _VOS_TIMER_HXX_
 
-#   include <vos/refernce.hxx>
-#   include <vos/mutex.hxx>
-#   include <osl/time.h>
+#	include <vos/refernce.hxx>
+#	include <vos/mutex.hxx>
+#	include <osl/time.h>
 
 
 namespace vos
-{
+{     
 
 /////////////////////////////////////////////////////////////////////////////
 //
@@ -60,11 +60,11 @@ struct TTimeValue : public TimeValue
     TTimeValue(const TimeValue& rTimeValue)
     { Seconds = rTimeValue.Seconds; Nanosec = rTimeValue.Nanosec; }
 
-    void        SAL_CALL normalize();
+    void		SAL_CALL normalize();
 
-    void        SAL_CALL addTime(const TTimeValue& Delta);
+    void		SAL_CALL addTime(const TTimeValue& Delta);
 
-    sal_Bool    SAL_CALL isEmpty() const;
+    sal_Bool	SAL_CALL isEmpty() const;
 };
 
 inline void TTimeValue::normalize()
@@ -73,7 +73,7 @@ inline void TTimeValue::normalize()
     {
         Seconds += Nanosec / 1000000000;
         Nanosec %= 1000000000;
-    }
+    }	
 }
 
 inline TTimeValue::TTimeValue(sal_uInt32 Secs, sal_uInt32 Nano)
@@ -119,7 +119,7 @@ inline sal_Bool operator>(const TTimeValue& rTimeA, const TTimeValue& rTimeB)
 
 inline sal_Bool operator==(const TTimeValue& rTimeA, const TTimeValue& rTimeB)
 {
-    return ((rTimeA.Seconds == rTimeB.Seconds) &&
+    return ((rTimeA.Seconds == rTimeB.Seconds) && 
             (rTimeA.Nanosec == rTimeB.Nanosec));
 }
 
@@ -150,21 +150,21 @@ public:
       /// abort timer prematurely.
       void SAL_CALL stop();
       /// returns <code> sal_True </code> if timer is running.
-      sal_Bool  SAL_CALL isTicking() const;
+      sal_Bool 	SAL_CALL isTicking() const; 
     /// is the timer expired?
-      sal_Bool  SAL_CALL isExpired() const;
+      sal_Bool 	SAL_CALL isExpired() const;
     /// does <code> pTimer </code> expires before us?
       sal_Bool    SAL_CALL expiresBefore(const OTimer* pTimer) const;
     /// set the absolute time when the timer should fire
-      void      SAL_CALL setAbsoluteTime(const TTimeValue& Time);
+      void		SAL_CALL setAbsoluteTime(const TTimeValue& Time);
     /// set the time to fire to 'now' + <code> Remaining </code>
-      void      SAL_CALL setRemainingTime(const TTimeValue& Remaining);
+      void		SAL_CALL setRemainingTime(const TTimeValue& Remaining);
     /// set the time to fire to 'now' + <code> Remaining </code> with repeat interveal <code> Repeat </code>
-      void      SAL_CALL setRemainingTime(const TTimeValue& Remaining, const TTimeValue& Repeat);
+      void		SAL_CALL setRemainingTime(const TTimeValue& Remaining, const TTimeValue& Repeat);				
     /// adds <code> Time </code> to the 'fire time'
-      void      SAL_CALL addTime(const TTimeValue& Time);
+      void		SAL_CALL addTime(const TTimeValue& Time);
     /// returns the remaining time before timer expiration relative to now
-      TTimeValue    SAL_CALL getRemainingTime() const;
+      TTimeValue	SAL_CALL getRemainingTime() const;
 
 protected:
 
@@ -180,7 +180,7 @@ protected:
     /// holds the time interveal of successive exparations
     TTimeValue  m_RepeatDelta;
     /// Pointer to the next timer (to fire)
-      OTimer*       m_pNext;
+      OTimer*	 	m_pNext;
 
 private:
 
@@ -188,11 +188,11 @@ private:
     OTimer(const OTimer& rTimer);
     /// assignment operator disabled
     void SAL_CALL operator=(const OTimer& rTimer);
-
+    
     friend class OTimerManager;
 };
 
-}
+}     
 
 
 #endif  //_VOS_TIMER_HXX_
diff --git a/vos/inc/vos/types.hxx b/vos/inc/vos/types.hxx
index c68f04e44d96..4a535bea0509 100644
--- a/vos/inc/vos/types.hxx
+++ b/vos/inc/vos/types.hxx
@@ -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
@@ -32,8 +32,8 @@
 
 /* disable some warnings for MS-C */
 #ifdef _MSC_VER
-#   pragma warning (disable : 4786) // 4786: truncated names (longer 255 chars)
-#   pragma warning (disable : 4355) // 4355: this used in initializer-list
+#	pragma warning (disable : 4786) // 4786: truncated names (longer 255 chars)
+#	pragma warning (disable : 4355)	// 4355: this used in initializer-list
 #endif
 
 #endif //_VOS_TYPES_HXX_
diff --git a/vos/inc/vos/xception.hxx b/vos/inc/vos/xception.hxx
index fff67cf4a9c6..fa571b54b6c0 100644
--- a/vos/inc/vos/xception.hxx
+++ b/vos/inc/vos/xception.hxx
@@ -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
@@ -48,13 +48,13 @@ namespace vos
 #define THROW_AGAIN                     throw;
 #define THROW( Constructor )            throw Constructor;
 
-/*
- * declaration of the exceptions that may be thrown by a function
- * (e.g.) void myfunction(sal_Int32 a) throw ( std::bad_alloc );
+/* 
+ * declaration of the exceptions that may be thrown by a function 
+ * (e.g.) void myfunction(sal_Int32 a) throw ( std::bad_alloc ); 
  * is not fully supported by all compilers
  */
 
-#define THROWS( ARG ) throw ARG
+#define THROWS( ARG ) throw ARG 
 
 /*
  * just a base class for further exceptions
@@ -69,7 +69,7 @@ public:
     OException() {}
     OException( const OException & ) : OObject() {}
 
-    OException& SAL_CALL operator=(const OException&)
+    OException& SAL_CALL operator=(const OException&) 
         { return *this; }
 };
 
diff --git a/vos/source/conditn.cxx b/vos/source/conditn.cxx
index f6acc4bb7fab..8ba109b55593 100644
--- a/vos/source/conditn.cxx
+++ b/vos/source/conditn.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
diff --git a/vos/source/dllentry.cxx b/vos/source/dllentry.cxx
index d25de20bfb9f..6d288780385a 100644
--- a/vos/source/dllentry.cxx
+++ b/vos/source/dllentry.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
@@ -37,13 +37,13 @@ sal_Int32 CALLBACK LibMain(HINSTANCE hinst, WORD wDataSeg, WORD cbHeap, LPSTR lp
     HGLOBAL    hgblClassStruct;
     LPWNDCLASS lpClassStruct;
     static HINSTANCE hinstLib = NULL;
-
+    
     /* Has the library been initialized yet? */
     if (hinstLib == NULL)
     {
-        WORD    wVersionRequested;
-        WSADATA wsaData;
-        sal_Int32       error;
+        WORD	wVersionRequested;
+        WSADATA	wsaData;
+        sal_Int32		error;
 
 
         wVersionRequested = 0x0101;
@@ -57,6 +57,6 @@ sal_Int32 CALLBACK LibMain(HINSTANCE hinst, WORD wDataSeg, WORD cbHeap, LPSTR lp
 
     return (hinstLib ? TRUE : FALSE);  /* return TRUE = success; FALSE = fail */
 }
-
+ 
 #endif
 
diff --git a/vos/source/module.cxx b/vos/source/module.cxx
index 23b916d2b1f9..25d0c4819d0d 100644
--- a/vos/source/module.cxx
+++ b/vos/source/module.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
@@ -40,7 +40,7 @@ OModule::OModule()
     :m_Module(0)
 {
 }
-
+                        
 OModule::OModule(const rtl::OUString& ustrModuleName, sal_Int32 nRtldMode) : m_Module(0)
 {
     if (ustrModuleName)
@@ -56,11 +56,11 @@ OModule::~OModule()
 sal_Bool OModule::load(const rtl::OUString& ustrModuleName, sal_Int32 nRtldMode)
 {
     VOS_ASSERT(ustrModuleName);
-
+    
     unload();
-
+    
     m_Module = osl_loadModule( ustrModuleName.pData, nRtldMode );
-
+    
     return (m_Module != 0);
 }
 
@@ -74,8 +74,8 @@ void OModule::unload()
 }
 
 sal_Bool OModule::isLoaded()
-{
-    return m_Module != NULL;
+{ 
+    return m_Module != NULL; 
 }
 
 void *OModule::getSymbol(const rtl::OUString& strSymbolName)
diff --git a/vos/source/mutex.cxx b/vos/source/mutex.cxx
index d8cefb92028f..e2f2a71ecb14 100644
--- a/vos/source/mutex.cxx
+++ b/vos/source/mutex.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
@@ -41,30 +41,30 @@ VOS_IMPLEMENT_CLASSINFO(VOS_CLASSNAME(OMutex, vos), VOS_NAMESPACE(OMutex, vos),
 IMutex& OMutex::getGlobalMutex()
 {
     static OMutex theGlobalMutex;
-
+        
     return theGlobalMutex;
 }
 
-OMutex::OMutex()
+OMutex::OMutex() 
 {
     m_Impl= osl_createMutex();
 }
 
-OMutex::~OMutex()
+OMutex::~OMutex() 
 {
     osl_destroyMutex(m_Impl);
 }
-
+    
 void OMutex::acquire()
 {
     osl_acquireMutex(m_Impl);
 }
 
-sal_Bool OMutex::tryToAcquire()
+sal_Bool OMutex::tryToAcquire() 
 {
     return osl_tryToAcquireMutex(m_Impl);
 }
-
+    
 void OMutex::release()
 {
     osl_releaseMutex(m_Impl);
diff --git a/vos/source/object.cxx b/vos/source/object.cxx
index 8761c7e4daed..bc210b1957c1 100644
--- a/vos/source/object.cxx
+++ b/vos/source/object.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
@@ -100,7 +100,7 @@ OClassInfo::OClassInfo(const sal_Char *pClassName, sal_Int32 ObjectSize,
 {
     m_pClassName  = pClassName;
     m_nObjectSize = ObjectSize;
-    m_wSchema     = Schema;
+    m_wSchema     = Schema;			
 
     m_pfnCreateObject = fnCreateObject;
 
@@ -141,7 +141,7 @@ const OClassInfo* OClassInfo::getClassInfo(const sal_Char* pClassName)
     VOS_ASSERT(pClassName != NULL);
 
     const OClassInfo* pClass = &VOS_CLASSINFO(VOS_NAMESPACE(OObject, vos));
-
+    
     while (pClass != NULL)
     {
         if (strcmp(pClassName, pClass->m_pClassName) == 0)
@@ -158,7 +158,7 @@ VOS_CLASSINIT::VOS_CLASSINIT(register OClassInfo* pNewClass)
     VOS_ASSERT(pNewClass != NULL);
 
     OClassInfo* pClassRoot = (OClassInfo*)&VOS_CLASSINFO(VOS_NAMESPACE(OObject, vos));
-
+    
     pNewClass->m_pNextClass = pClassRoot->m_pNextClass;
 
     pClassRoot->m_pNextClass = pNewClass;
diff --git a/vos/source/pipe.cxx b/vos/source/pipe.cxx
index a7d8e655414d..b8c296500865 100644
--- a/vos/source/pipe.cxx
+++ b/vos/source/pipe.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
@@ -35,8 +35,8 @@ using namespace vos;
 // Pipe
 
 
-VOS_IMPLEMENT_CLASSINFO(VOS_CLASSNAME(OPipe, vos),
-                        VOS_NAMESPACE(OPipe, vos),
+VOS_IMPLEMENT_CLASSINFO(VOS_CLASSNAME(OPipe, vos), 
+                        VOS_NAMESPACE(OPipe, vos), 
                         VOS_NAMESPACE(OObject, vos), 0);
 
 /*****************************************************************************/
@@ -53,11 +53,11 @@ OPipe::OPipe()
 
 OPipe::OPipe( const rtl::OUString& strName, TPipeOption Options)
 {
-    m_pPipeRef =
-        new PipeRef( osl_createPipe(strName.pData,
-                                    (oslPipeOptions)Options,
+    m_pPipeRef = 
+        new PipeRef( osl_createPipe(strName.pData, 
+                                    (oslPipeOptions)Options, 
                                     NULL) );
-
+    
     VOS_POSTCOND(m_pPipeRef != 0, "OPipe(): new failed.\n");
     VOS_POSTCOND((*m_pPipeRef)(), "OPipe(): creation of pipe failed!\n");
 }
@@ -70,11 +70,11 @@ OPipe::OPipe( const rtl::OUString& strName,
               TPipeOption Options,
               const OSecurity& rSecurity)
 {
-    m_pPipeRef=
-        new PipeRef(osl_createPipe(strName.pData,
-                                   (oslPipeOptions)Options,
+    m_pPipeRef= 
+        new PipeRef(osl_createPipe(strName.pData, 
+                                   (oslPipeOptions)Options, 
                                    (oslSecurity)rSecurity));
-
+    
     VOS_POSTCOND(m_pPipeRef != 0, "OPipe(): new failed.\n");
     VOS_POSTCOND((*m_pPipeRef)(), "OPipe(): creation of pipe failed!\n");
 }
@@ -85,7 +85,7 @@ OPipe::OPipe( const rtl::OUString& strName,
 OPipe::OPipe(const OPipe& pipe) :
 OReference(), OObject()
 {
-
+    
     VOS_ASSERT(pipe.m_pPipeRef != 0);
 
     m_pPipeRef= pipe.m_pPipeRef;
@@ -123,9 +123,9 @@ sal_Bool OPipe::create( const rtl::OUString& strName, TPipeOption Options )
         m_pPipeRef= 0;
     }
 
-    m_pPipeRef=
-        new PipeRef(osl_createPipe(strName.pData,
-                                   (oslPipeOptions)Options,
+    m_pPipeRef= 
+        new PipeRef(osl_createPipe(strName.pData, 
+                                   (oslPipeOptions)Options, 
                                    NULL));
 
     VOS_POSTCOND(m_pPipeRef != 0, "OPipe(): new failed.\n");
@@ -138,7 +138,7 @@ sal_Bool OPipe::create( const rtl::OUString& strName, TPipeOption Options )
 /*****************************************************************************/
 sal_Bool OPipe::create( const rtl::OUString& strName,
                         TPipeOption Options,
-                        const NAMESPACE_VOS(OSecurity)& rSecurity )
+                        const NAMESPACE_VOS(OSecurity)& rSecurity ) 
 {
     // if this was a valid pipe, decrease reference
     if ((m_pPipeRef) && (m_pPipeRef->release() == 0))
@@ -148,9 +148,9 @@ sal_Bool OPipe::create( const rtl::OUString& strName,
         m_pPipeRef= 0;
     }
 
-    m_pPipeRef=
-        new PipeRef(osl_createPipe(strName.pData,
-                                   (oslPipeOptions)Options,
+    m_pPipeRef= 
+        new PipeRef(osl_createPipe(strName.pData, 
+                                   (oslPipeOptions)Options, 
                                    (oslSecurity)rSecurity));
 
     VOS_POSTCOND(m_pPipeRef != 0, "OPipe(): new failed.\n");
@@ -206,7 +206,7 @@ sal_Bool OPipe::isValid() const
 /*****************************************************************************/
 void OPipe::close()
 {
-    if (m_pPipeRef && (m_pPipeRef->release() == 0))
+    if (m_pPipeRef && (m_pPipeRef->release() == 0)) 
     {
         osl_releasePipe((*m_pPipeRef)());
         delete m_pPipeRef;
@@ -222,7 +222,7 @@ OPipe::TPipeError OPipe::accept(OStreamPipe& Connection)
     if ( isValid() )
     {
         Connection = osl_acceptPipe((*m_pPipeRef)());
-
+        
         if(Connection.isValid())
             return E_None;
     }
@@ -236,8 +236,8 @@ OPipe::TPipeError OPipe::accept(OStreamPipe& Connection)
 sal_Int32 OPipe::recv(void* pBuffer, sal_uInt32 BytesToRead)
 {
     if ( isValid() )
-        return osl_receivePipe((*m_pPipeRef)(),
-                             pBuffer,
+        return osl_receivePipe((*m_pPipeRef)(), 
+                             pBuffer, 
                             BytesToRead);
     else
         return -1;
@@ -250,8 +250,8 @@ sal_Int32 OPipe::recv(void* pBuffer, sal_uInt32 BytesToRead)
 sal_Int32 OPipe::send(const void* pBuffer, sal_uInt32 BytesToSend)
 {
     if ( isValid() )
-        return osl_sendPipe((*m_pPipeRef)(),
-                            pBuffer,
+        return osl_sendPipe((*m_pPipeRef)(), 
+                            pBuffer, 
                             BytesToSend);
     else
         return -1;
@@ -270,8 +270,8 @@ OPipe::TPipeError OPipe::getError() const
 
 
 
-VOS_IMPLEMENT_CLASSINFO(VOS_CLASSNAME(OStreamPipe, vos),
-                        VOS_NAMESPACE(OStreamPipe, vos),
+VOS_IMPLEMENT_CLASSINFO(VOS_CLASSNAME(OStreamPipe, vos), 
+                        VOS_NAMESPACE(OStreamPipe, vos), 
                         VOS_NAMESPACE(OPipe, vos), 0);
 
 
@@ -353,11 +353,11 @@ sal_Int32 OStreamPipe::read(void* pBuffer, sal_uInt32 n) const
     /* loop until all desired bytes were read or an error occured */
     sal_Int32 BytesRead= 0;
     sal_Int32 BytesToRead= n;
-    while (BytesToRead > 0)
+    while (BytesToRead > 0) 
     {
         sal_Int32 RetVal;
-        RetVal= osl_receivePipe((*m_pPipeRef)(),
-                                 pBuffer,
+        RetVal= osl_receivePipe((*m_pPipeRef)(), 
+                                 pBuffer, 
                                 BytesToRead);
 
         /* error occured? */
@@ -371,7 +371,7 @@ sal_Int32 OStreamPipe::read(void* pBuffer, sal_uInt32 n) const
         pBuffer= (sal_Char*)pBuffer + RetVal;
     }
 
-    return BytesRead;
+    return BytesRead;   
 }
 
 /*****************************************************************************/
@@ -384,12 +384,12 @@ sal_Int32 OStreamPipe::write(const void* pBuffer, sal_uInt32 n)
     /* loop until all desired bytes were send or an error occured */
     sal_Int32 BytesSend= 0;
     sal_Int32 BytesToSend= n;
-    while (BytesToSend > 0)
+    while (BytesToSend > 0) 
     {
         sal_Int32 RetVal;
 
-        RetVal= osl_sendPipe((*m_pPipeRef)(),
-                                pBuffer,
+        RetVal= osl_sendPipe((*m_pPipeRef)(), 
+                                pBuffer, 
                                 BytesToSend);
 
         /* error occured? */
@@ -403,7 +403,7 @@ sal_Int32 OStreamPipe::write(const void* pBuffer, sal_uInt32 n)
         pBuffer= (sal_Char*)pBuffer + RetVal;
     }
 
-    return BytesSend;
+    return BytesSend;   
 }
 
 sal_Bool OStreamPipe::isEof() const
diff --git a/vos/source/process.cxx b/vos/source/process.cxx
index 71c8729d9023..6a13a8dd8908 100644
--- a/vos/source/process.cxx
+++ b/vos/source/process.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
@@ -35,8 +35,8 @@
 #include "vos/diagnose.hxx"
 #include <osl/file.hxx>
 
-#define MAX_RESOURCES   100
-#define MAX_ARGS        100
+#define MAX_RESOURCES	100
+#define MAX_ARGS		100
 #define MAX_ENVIROMENTS 100
 
 using namespace vos;
@@ -48,7 +48,7 @@ OArgumentList::OArgumentList() :
     n_Args(0),
     m_aVec(0)
 {
-    // empty
+    // empty 
 }
 
 OArgumentList::OArgumentList( sal_uInt32 nArgs, const ::rtl::OUString* aArgument1, ... ) :
@@ -58,7 +58,7 @@ OArgumentList::OArgumentList( sal_uInt32 nArgs, const ::rtl::OUString* aArgument
     std::va_list pArgs;
     sal_uInt32 i = 0;
     const rtl::OUString* aArgument;
-
+    
     va_start ( pArgs, aArgument1 );
     aArgument = aArgument1;
 
@@ -87,10 +87,10 @@ OArgumentList::OArgumentList( const rtl::OUString aArgumentList[], sal_uInt32 nA
 OArgumentList::OArgumentList( const OArgumentList& rOther ) : n_Args( rOther.n_Args )
 {
     m_aVec = new rtl_uString* [n_Args];
-
+    
     sal_uInt32 i;
     for ( i = 0; i < n_Args; ++i )
-    {
+    {		
         m_aVec[i] = rOther.m_aVec[i];
         rtl_uString_acquire( m_aVec[i] );
     }
@@ -144,7 +144,7 @@ OEnvironment::OEnvironment( sal_Int32 nVars, const ::rtl::OUString* aArgument1,
     std::va_list pArgs;
     sal_Int32 i = 0;
     const rtl::OUString* aArgument;
-
+    
     va_start ( pArgs, aArgument1 );
     aArgument = aArgument1;
 
@@ -167,13 +167,13 @@ OEnvironment::OEnvironment( const ::rtl::OUString aVariableList[], sal_Int32 nVa
     for( sal_Int32 i = 0; i < n_Vars; ++ i )  {
         m_aVec[i] = aVariableList[i].pData;
         rtl_uString_acquire( m_aVec[i] );
-    }
+    }	
 }
 
 OEnvironment::OEnvironment( const OEnvironment& rOther ) : n_Vars( rOther.n_Vars )
 {
     m_aVec = new rtl_uString* [n_Vars];
-
+    
     sal_Int32 i;
     for ( i = 0; i < n_Vars; ++i )
     {
@@ -194,7 +194,7 @@ OEnvironment& OEnvironment::operator=( const OEnvironment& rOther )
 
         n_Vars = rOther.n_Vars;
         m_aVec = new rtl_uString* [n_Vars];
-        for ( i = 0; i < n_Vars; ++i )
+        for ( i = 0; i < n_Vars; ++i ) 
         {
             m_aVec[i] = rOther.m_aVec[i];
             rtl_uString_acquire( m_aVec[i] );
@@ -272,10 +272,10 @@ OProcess::TProcessError OProcess::execute(TProcessOption Options,
                                           const OArgumentList& aArgumentList,
                                           const OEnvironment&  aEnvironment )
 {
-    return ((TProcessError)osl_executeProcess(m_strImageName.pData,
+    return ((TProcessError)osl_executeProcess(m_strImageName.pData, 
                                               aArgumentList.m_aVec,
                                               aArgumentList.n_Args,
-                                              Options,
+                                              Options, 
                                               0,
                                               m_strDirectory.pData,
                                               aEnvironment.m_aVec,
@@ -289,10 +289,10 @@ OProcess::TProcessError OProcess::execute( TProcessOption Options,
                                            const OArgumentList& aArgumentList,
                                            const OEnvironment&  aEnvironment )
 {
-    return ((TProcessError)osl_executeProcess(m_strImageName.pData,
+    return ((TProcessError)osl_executeProcess(m_strImageName.pData, 
                                               aArgumentList.m_aVec,
                                               aArgumentList.n_Args,
-                                              Options,
+                                              Options, 
                                               Security,
                                               m_strDirectory.pData,
                                               aEnvironment.m_aVec,
@@ -323,7 +323,7 @@ OProcess::TProcessError OProcess::join()
 
 
 /*
-OProcess::TProcessError OProcess::searchPath(const sal_Char* Name, sal_Char *Buffer, sal_uInt32 Max,
+OProcess::TProcessError OProcess::searchPath(const sal_Char* Name, sal_Char *Buffer, sal_uInt32 Max, 
                                              const sal_Char* Path, sal_Char Separator)
 {
     return (TProcessError)osl_searchPath(Name, Path, Separator, Buffer, Max);
@@ -335,7 +335,7 @@ OProcess::TProcessError OProcess::searchPath(const sal_Char* Name, sal_Char *Buf
 
 VOS_IMPLEMENT_CLASSINFO(
     VOS_CLASSNAME(OStartupInfo, vos),
-    VOS_NAMESPACE(OStartupInfo, vos),
+    VOS_NAMESPACE(OStartupInfo, vos), 
     VOS_NAMESPACE(OObject, vos), 0);
 
 OStartupInfo::OStartupInfo()
@@ -377,28 +377,28 @@ OStartupInfo::TStartupError OStartupInfo::getEnvironment(const rtl::OUString& st
 //
 
 namespace vos
-{
+{  
 
 class OExtCommandLineImpl
 {
     void init();
-
+    
     ::std::vector< ::rtl::OUString > aExtArgVector;
     sal_uInt32 m_nArgCount;
-
+    
 public:
-
+    
     OExtCommandLineImpl();
     ~OExtCommandLineImpl();
 
     sal_uInt32 SAL_CALL getCommandArgCount();
-
+    
     sal_Bool SAL_CALL getCommandArg(sal_uInt32 nArg, ::rtl::OUString& strCommandArg);
 };
-
+ 
 }
 
-OExtCommandLineImpl::OExtCommandLineImpl()
+OExtCommandLineImpl::OExtCommandLineImpl() 
     : m_nArgCount(0)
 {
     init();
@@ -406,7 +406,7 @@ OExtCommandLineImpl::OExtCommandLineImpl()
 
 OExtCommandLineImpl::~OExtCommandLineImpl()
 {
-
+    
 }
 
 
@@ -416,7 +416,7 @@ sal_uInt32 SAL_CALL OExtCommandLineImpl::getCommandArgCount()
 }
 
 
-sal_Bool SAL_CALL OExtCommandLineImpl::getCommandArg(sal_uInt32 nArg, ::rtl::OUString& strCommandArg)
+sal_Bool SAL_CALL OExtCommandLineImpl::getCommandArg(sal_uInt32 nArg, ::rtl::OUString& strCommandArg) 
 {
     if ( nArg >= m_nArgCount )
     {
@@ -439,7 +439,7 @@ void OExtCommandLineImpl::init()
     {
         ::rtl::OUString aString;
         aStartInfo.getCommandArg(nIndex,aString);
-
+        
         if ( aString[0] == (sal_Unicode) '@' )
         {
             ::rtl::OUString aFileName = aString.copy(1);
@@ -483,9 +483,9 @@ void OExtCommandLineImpl::init()
 // OExtCommandLine
 //
 
-namespace
-{
-    struct lclMutex : public rtl::Static< NAMESPACE_VOS(OMutex), lclMutex > {};
+namespace 
+{ 
+    struct lclMutex : public rtl::Static< NAMESPACE_VOS(OMutex), lclMutex > {}; 
 }
 
 OExtCommandLineImpl* OExtCommandLine::pExtImpl=0;
@@ -501,7 +501,7 @@ OExtCommandLine::OExtCommandLine()
     OGuard Guard(lclMutex::get());
 
     if ( pExtImpl == NULL )
-    {
+    {    
         pExtImpl = new OExtCommandLineImpl;
     }
 }
@@ -509,7 +509,7 @@ OExtCommandLine::OExtCommandLine()
 OExtCommandLine::~OExtCommandLine()
 {
 
-
+    
 }
 
 sal_uInt32 SAL_CALL OExtCommandLine::getCommandArgCount()
@@ -518,7 +518,7 @@ sal_uInt32 SAL_CALL OExtCommandLine::getCommandArgCount()
 }
 
 
-sal_Bool SAL_CALL OExtCommandLine::getCommandArg(sal_uInt32 nArg, ::rtl::OUString& strCommandArg)
+sal_Bool SAL_CALL OExtCommandLine::getCommandArg(sal_uInt32 nArg, ::rtl::OUString& strCommandArg) 
 {
     return pExtImpl->getCommandArg(nArg,strCommandArg);
 }
diff --git a/vos/source/refernce.cxx b/vos/source/refernce.cxx
index ff21c1acb13e..ca2b2709cb40 100644
--- a/vos/source/refernce.cxx
+++ b/vos/source/refernce.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
@@ -35,29 +35,29 @@ using namespace vos;
 
 ORefCount::~ORefCount()
 {
-
+    
 }
 
 
-OReference::OReference()
+OReference::OReference() 
 {
 }
 
-OReference::~OReference()
+OReference::~OReference() 
 {
     VOS_ASSERT(m_RefCount.referenced() == 0);
 }
 
-IReference::RefCount OReference::acquire()
+IReference::RefCount OReference::acquire() 
 {
     return (m_RefCount.acquire());
 }
 
-IReference::RefCount OReference::release()
+IReference::RefCount OReference::release() 
 {
     RefCount Count = m_RefCount.release();
 
-    if (Count == 0)
+    if (Count == 0) 
         delete this;
 
     return (Count);
diff --git a/vos/source/security.cxx b/vos/source/security.cxx
index b4fdc8e8d6a3..1cb2b41e7f51 100644
--- a/vos/source/security.cxx
+++ b/vos/source/security.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
@@ -50,10 +50,10 @@ sal_Bool OSecurity::logonUser(const rtl::OUString& strName,
                               const rtl::OUString& strPasswd)
 {
     osl_freeSecurityHandle(m_oslSecurity);
-
+    
     m_oslSecurity = NULL;
-
-    return (osl_loginUser( strName.pData, strPasswd.pData, &m_oslSecurity)
+    
+    return (osl_loginUser( strName.pData, strPasswd.pData, &m_oslSecurity) 
             == osl_Security_E_None);
 }
 
@@ -63,10 +63,10 @@ sal_Bool OSecurity::logonUser( const rtl::OUString& strName,
                                const rtl::OUString& strFileServer )
 {
     osl_freeSecurityHandle(m_oslSecurity);
-
+    
     m_oslSecurity = NULL;
-
-    return (osl_loginUserOnFileServer(strName.pData, strPasswd.pData, strFileServer.pData, &m_oslSecurity)
+    
+    return (osl_loginUserOnFileServer(strName.pData, strPasswd.pData, strFileServer.pData, &m_oslSecurity) 
             == osl_Security_E_None);
 }
 
@@ -74,7 +74,7 @@ sal_Bool OSecurity::logonUser( const rtl::OUString& strName,
 sal_Bool OSecurity::getUserIdent( rtl::OUString& strIdent) const
 {
     VOS_ASSERT(m_oslSecurity);
-
+    
     return osl_getUserIdent( m_oslSecurity, &strIdent.pData );
 }
 
@@ -90,7 +90,7 @@ sal_Bool OSecurity::getUserName( rtl::OUString& strName ) const
 sal_Bool OSecurity::getHomeDir( rtl::OUString& strDirectory) const
 {
     VOS_ASSERT(m_oslSecurity);
-
+    
     return osl_getHomeDir(m_oslSecurity, &strDirectory.pData );
 }
 
@@ -98,7 +98,7 @@ sal_Bool OSecurity::getHomeDir( rtl::OUString& strDirectory) const
 sal_Bool OSecurity::getConfigDir( rtl::OUString& strDirectory ) const
 {
     VOS_ASSERT(m_oslSecurity);
-
+    
     return osl_getConfigDir( m_oslSecurity, &strDirectory.pData );
 }
 
diff --git a/vos/source/signal.cxx b/vos/source/signal.cxx
index 1f879f8b225c..0d073cd90778 100644
--- a/vos/source/signal.cxx
+++ b/vos/source/signal.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
@@ -43,16 +43,16 @@ oslSignalAction vos::signalHandlerFunction_impl(
 /////////////////////////////////////////////////////////////////////////////
 // Thread class
 
-VOS_IMPLEMENT_CLASSINFO(VOS_CLASSNAME(OSignalHandler, vos),
-                        VOS_NAMESPACE(OSignalHandler, vos),
+VOS_IMPLEMENT_CLASSINFO(VOS_CLASSNAME(OSignalHandler, vos), 
+                        VOS_NAMESPACE(OSignalHandler, vos), 
                         VOS_NAMESPACE(OObject, vos), 0);
 
-OSignalHandler::OSignalHandler()
+OSignalHandler::OSignalHandler() 
 {
     m_hHandler = osl_addSignalHandler(signalHandlerFunction_impl, this);
 }
 
-OSignalHandler::~OSignalHandler()
+OSignalHandler::~OSignalHandler() 
 {
     osl_removeSignalHandler(m_hHandler);
 }
diff --git a/vos/source/socket.cxx b/vos/source/socket.cxx
index c32faf17a4a5..af033429f062 100644
--- a/vos/source/socket.cxx
+++ b/vos/source/socket.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
@@ -36,8 +36,8 @@
 using namespace vos;
 
 
-VOS_IMPLEMENT_CLASSINFO(VOS_CLASSNAME(OSocketAddr, vos),
-                        VOS_NAMESPACE(OSocketAddr, vos),
+VOS_IMPLEMENT_CLASSINFO(VOS_CLASSNAME(OSocketAddr, vos), 
+                        VOS_NAMESPACE(OSocketAddr, vos), 
                         VOS_NAMESPACE(OObject, vos), 0);
 
 
@@ -150,8 +150,8 @@ OSocketAddr& OSocketAddr::operator=(const OSocketAddr& Addr)
 }
 
 
-VOS_IMPLEMENT_CLASSINFO(VOS_CLASSNAME(OInetSocketAddr, vos),
-                        VOS_NAMESPACE(OInetSocketAddr, vos),
+VOS_IMPLEMENT_CLASSINFO(VOS_CLASSNAME(OInetSocketAddr, vos), 
+                        VOS_NAMESPACE(OInetSocketAddr, vos), 
                         VOS_NAMESPACE(OSocketAddr, vos), 0);
 
 
@@ -160,7 +160,7 @@ VOS_IMPLEMENT_CLASSINFO(VOS_CLASSNAME(OInetSocketAddr, vos),
 // OInetSocketAddr
 // creates arbitrary inet-address (INADDR_ANY)
 /*****************************************************************************/
-OInetSocketAddr::OInetSocketAddr()
+OInetSocketAddr::OInetSocketAddr() 
 {
     m_SockAddr= osl_createEmptySocketAddr(osl_Socket_FamilyInet);
 }
@@ -184,7 +184,7 @@ OInetSocketAddr::OInetSocketAddr(const rtl::OUString& ustrAddrOrHostname, sal_In
 {
     // first try as dotted address.
     m_SockAddr= osl_createInetSocketAddr(ustrAddrOrHostname.pData, Port);
-
+    
     // create failed, maybe it's an hostname
     if(m_SockAddr == 0)
     {
@@ -206,7 +206,7 @@ OInetSocketAddr::OInetSocketAddr(const OInetSocketAddr& sa) :
     OSocketAddr(sa)
 {
     VOS_ASSERT(getFamily() == TFamily_Inet);
-}
+}   
 
 /*****************************************************************************/
 // OInetSocketAddr(const OSocketAddr&)
@@ -215,7 +215,7 @@ OInetSocketAddr::OInetSocketAddr(const OSocketAddr& sa) :
     OSocketAddr(sa)
 {
     VOS_ASSERT(sa.getFamily() == TFamily_Inet);
-}
+}   
 
 /*****************************************************************************/
 // ~OInetSocketAddr
@@ -229,7 +229,7 @@ OInetSocketAddr::~OInetSocketAddr()
 /*****************************************************************************/
 void OInetSocketAddr::operator= (oslSocketAddr Addr)
 {
-    VOS_PRECOND(osl_getFamilyOfSocketAddr(Addr) == osl_Socket_FamilyInet,
+    VOS_PRECOND(osl_getFamilyOfSocketAddr(Addr) == osl_Socket_FamilyInet, 
                 "oslSocketAddr not of type osl_Socket_FamilyInet!");
 
     OSocketAddr::operator=(Addr);
@@ -270,7 +270,7 @@ OInetSocketAddr& OInetSocketAddr::operator=(const OSocketAddr& Addr)
 /*****************************************************************************/
 // getServicePort()
 /*****************************************************************************/
-sal_Int32 OInetSocketAddr::getServicePort(const rtl::OUString& ustrServiceName,
+sal_Int32 OInetSocketAddr::getServicePort(const rtl::OUString& ustrServiceName, 
                                     const rtl::OUString& ustrProtocolName)
 {
     return osl_getServicePort(ustrServiceName.pData, ustrProtocolName.pData);
@@ -309,20 +309,20 @@ OSocketAddr::TResult OInetSocketAddr::getDottedAddr( rtl::OUString& pBuffer ) co
 sal_Bool OInetSocketAddr::setAddr(const rtl::OUString& ustrAddrOrHostname)
 {
     sal_Int32 Port = 0;
-
+    
     if(m_SockAddr) {
-
+    
         // retrieve old port
         Port= getPort();
 
         // free old address
         osl_destroySocketAddr(m_SockAddr);
         m_SockAddr= 0;
-    }
+    } 
 
     // first try as dotted address.
     m_SockAddr= osl_createInetSocketAddr(ustrAddrOrHostname.pData, Port);
-
+    
     // create failed, maybe it's an hostname
     if(m_SockAddr == 0)
     {
@@ -346,8 +346,8 @@ sal_Bool OInetSocketAddr::setAddr(const rtl::OUString& ustrAddrOrHostname)
 ///////////////////////////////////////////////////////////////////////////////
 // OIpxSocketAddr
 
-VOS_IMPLEMENT_CLASSINFO(VOS_CLASSNAME(OIpxSocketAddr, vos),
-                        VOS_NAMESPACE(OIpxSocketAddr, vos),
+VOS_IMPLEMENT_CLASSINFO(VOS_CLASSNAME(OIpxSocketAddr, vos), 
+                        VOS_NAMESPACE(OIpxSocketAddr, vos), 
                         VOS_NAMESPACE(OSocketAddr, vos), 0);
 
 
@@ -410,7 +410,7 @@ OIpxSocketAddr::~OIpxSocketAddr()
 /*****************************************************************************/
 void OIpxSocketAddr::operator= (oslSocketAddr Addr)
 {
-    VOS_PRECOND(osl_getFamilyOfSocketAddr(Addr) == osl_Socket_FamilyIpx,
+    VOS_PRECOND(osl_getFamilyOfSocketAddr(Addr) == osl_Socket_FamilyIpx, 
             "oslSocketAddr not of type osl_Socket_FamilyIpx!");
 
     OSocketAddr::operator=(Addr);
@@ -471,7 +471,7 @@ OSocketAddr::TResult OIpxSocketAddr::getNodeNumber(TIpxNodeNumber& ) const
 /*****************************************************************************/
 sal_uInt32 OIpxSocketAddr::getSocketNumber() const
 {
-//      return osl_getIpxSocketNumber(m_SockAddr);
+//  	return osl_getIpxSocketNumber(m_SockAddr);
     return (TResult)0;
 }
 
@@ -490,8 +490,8 @@ void OIpxSocketAddr::getAddressString( rtl::OUString& ) const
 // Socket
 
 
-VOS_IMPLEMENT_CLASSINFO(VOS_CLASSNAME(OSocket, vos),
-                        VOS_NAMESPACE(OSocket, vos),
+VOS_IMPLEMENT_CLASSINFO(VOS_CLASSNAME(OSocket, vos), 
+                        VOS_NAMESPACE(OSocket, vos), 
                         VOS_NAMESPACE(OObject, vos), 0);
 
 /*****************************************************************************/
@@ -509,18 +509,18 @@ OSocket::OSocket()
 /*****************************************************************************/
 // OSocket()
 /*****************************************************************************/
-OSocket::OSocket(TSocketType Type,
-                 TAddrFamily Family,
-                 TProtocol   Protocol)
+OSocket::OSocket(TSocketType Type, 
+                 TAddrFamily Family, 
+                 TProtocol   Protocol) 
 {
     m_pRecvTimeout = 0;
     m_pSendTimeout = 0;
 
-    m_pSockRef=
-        new SockRef(osl_createSocket((oslAddrFamily)Family,
-                                     (oslSocketType)Type,
+    m_pSockRef= 
+        new SockRef(osl_createSocket((oslAddrFamily)Family, 
+                                     (oslSocketType)Type, 
                                      (oslProtocol)Protocol));
-
+    
     VOS_POSTCOND(m_pSockRef != 0, "OSocket(): new failed.\n");
     VOS_POSTCOND((*m_pSockRef)(), "OSocket(): creation of socket failed!\n");
 }
@@ -534,16 +534,16 @@ ISocketTypes(), OReference(), OObject()
     m_pRecvTimeout = 0;
     m_pSendTimeout = 0;
     m_pSockRef=0;
-
+    
     VOS_ASSERT(sock.m_pSockRef != 0);
 
     if ( sock.m_pSockRef !=0 )
-    {
+    {    
         m_pSockRef= sock.m_pSockRef;
 
         setRecvTimeout(sock.m_pRecvTimeout);
         setSendTimeout(sock.m_pSendTimeout);
-
+        
         m_pSockRef->acquire();
     }
 }
@@ -575,8 +575,8 @@ OSocket::~OSocket()
 /*****************************************************************************/
 // create
 /*****************************************************************************/
-sal_Bool OSocket::create(TSocketType Type,
-                        TAddrFamily Family,
+sal_Bool OSocket::create(TSocketType Type, 
+                        TAddrFamily Family, 
                         TProtocol   Protocol)
 {
     // if this was a valid socket, decrease reference
@@ -587,9 +587,9 @@ sal_Bool OSocket::create(TSocketType Type,
         m_pSockRef= 0;
     }
 
-    m_pSockRef=
-        new SockRef(osl_createSocket((oslAddrFamily)Family,
-                                     (oslSocketType)Type,
+    m_pSockRef= 
+        new SockRef(osl_createSocket((oslAddrFamily)Family, 
+                                     (oslSocketType)Type, 
                                      (oslProtocol)Protocol));
 
     VOS_POSTCOND(m_pSockRef != 0, "OSocket(): new failed.\n");
@@ -648,7 +648,7 @@ sal_Bool OSocket::isValid() const
 /*****************************************************************************/
 void OSocket::close()
 {
-    if (m_pSockRef && (*m_pSockRef)() && (m_pSockRef->release() == 0))
+    if (m_pSockRef && (*m_pSockRef)() && (m_pSockRef->release() == 0)) 
     {
         osl_releaseSocket((*m_pSockRef)());
         delete m_pSockRef;
@@ -665,7 +665,7 @@ void OSocket::getLocalAddr(OSocketAddr& sa) const
     VOS_ASSERT(m_pSockRef && (*m_pSockRef)());
 
     if ( m_pSockRef && (*m_pSockRef)() )
-    {
+    {    
         sa= osl_getLocalAddrOfSocket((*m_pSockRef)());
     }
 }
@@ -673,23 +673,23 @@ void OSocket::getLocalAddr(OSocketAddr& sa) const
 /*****************************************************************************/
 // getLocalPort
 /*****************************************************************************/
-sal_Int32 OSocket::getLocalPort() const
+sal_Int32 OSocket::getLocalPort() const 
 {
     VOS_ASSERT(m_pSockRef && (*m_pSockRef)());
 
     sal_Int32 Port= OSL_INVALID_PORT;
 
     if ( m_pSockRef && (*m_pSockRef)() )
-    {
+    {   
         oslSocketAddr Addr= osl_getLocalAddrOfSocket((*m_pSockRef)());
-
-        if(Addr)
+        
+        if(Addr) 
         {
             Port= osl_getInetPortOfSocketAddr(Addr);
             osl_destroySocketAddr(Addr);
         }
     }
-
+    
     return Port;
 }
 
@@ -701,22 +701,22 @@ OSocket::TResult OSocket::getLocalHost( rtl::OUString& pBuffer) const
     VOS_ASSERT(m_pSockRef && (*m_pSockRef)());
 
     if ( m_pSockRef && (*m_pSockRef)() )
-    {
+    {    
         oslSocketAddr Addr= osl_getLocalAddrOfSocket((*m_pSockRef)());
-
-        if(Addr)
+    
+        if(Addr) 
         {
-//          TResult Result= (TResult)osl_getHostnameOfSocketAddr(Addr,
-//                                                      pBuffer, BufferSize);
-            TResult Result= (TResult)osl_getHostnameOfSocketAddr(Addr,
+//	    	TResult Result= (TResult)osl_getHostnameOfSocketAddr(Addr, 
+//														pBuffer, BufferSize);
+            TResult Result= (TResult)osl_getHostnameOfSocketAddr(Addr, 
                                                              &pBuffer.pData );
-
+    
             osl_destroySocketAddr(Addr);
 
             return Result;
         }
     }
-
+    
     return TResult_Error;
 }
 
@@ -728,7 +728,7 @@ void OSocket::getPeerAddr(OSocketAddr& sa) const
     VOS_ASSERT(m_pSockRef && (*m_pSockRef)());
 
     if ( m_pSockRef && (*m_pSockRef)() )
-    {
+    {    
         sa= osl_getPeerAddrOfSocket((*m_pSockRef)());
     }
 }
@@ -741,12 +741,12 @@ sal_Int32 OSocket::getPeerPort() const
     VOS_ASSERT(m_pSockRef && (*m_pSockRef)());
 
     sal_Int32 Port= OSL_INVALID_PORT;
-
+    
     if ( m_pSockRef && (*m_pSockRef)() )
-    {
+    {   
         oslSocketAddr Addr= osl_getPeerAddrOfSocket((*m_pSockRef)());
 
-        if(Addr)
+        if(Addr) 
         {
             Port= osl_getInetPortOfSocketAddr(Addr);
             osl_destroySocketAddr(Addr);
@@ -767,11 +767,11 @@ OSocket::TResult OSocket::getPeerHost( rtl::OUString& pBuffer ) const
     {
         oslSocketAddr Addr= osl_getPeerAddrOfSocket((*m_pSockRef)());
 
-        if(Addr)
+        if(Addr) 
         {
-//          TResult Result= (TResult)osl_getHostnameOfSocketAddr(Addr,
-//                                                      pBuffer, BufferSize);
-            TResult Result= (TResult)osl_getHostnameOfSocketAddr(Addr,
+//		    TResult Result= (TResult)osl_getHostnameOfSocketAddr(Addr, 
+//														pBuffer, BufferSize);
+            TResult Result= (TResult)osl_getHostnameOfSocketAddr(Addr, 
                                                              &pBuffer.pData );
 
             osl_destroySocketAddr(Addr);
@@ -794,7 +794,7 @@ sal_Bool OSocket::bind(const OSocketAddr& Addr)
     {
         return osl_bindAddrToSocket((*m_pSockRef)(), (oslSocketAddr)Addr);
     }
-
+    
     return sal_False;
 }
 
@@ -833,10 +833,10 @@ sal_Bool OSocket::isRecvReady(const TimeValue* pTimeout) const
     VOS_ASSERT(m_pSockRef && (*m_pSockRef)());
 
     if ( m_pSockRef && (*m_pSockRef)() )
-    {
+    {    
         return osl_isReceiveReady((*m_pSockRef)(), pTimeout);
     }
-
+    
     return sal_False;
 }
 
@@ -863,10 +863,10 @@ sal_Bool OSocket::isExceptionPending(const TimeValue* pTimeout) const
     VOS_ASSERT(m_pSockRef && (*m_pSockRef)());
 
     if ( m_pSockRef && (*m_pSockRef)() )
-    {
+    {    
         return osl_isExceptionPending((*m_pSockRef)(), pTimeout);
     }
-
+    
     return sal_False;
 }
 
@@ -874,7 +874,7 @@ sal_Bool OSocket::isExceptionPending(const TimeValue* pTimeout) const
 /*****************************************************************************/
 // getOption
 /*****************************************************************************/
-sal_Int32 OSocket::getOption(TSocketOption Option,
+sal_Int32 OSocket::getOption(TSocketOption Option, 
                               void* pBuffer,
                            sal_uInt32 BufferLen,
                            TSocketOptionLevel Level) const
@@ -886,7 +886,7 @@ sal_Int32 OSocket::getOption(TSocketOption Option,
         return osl_getSocketOption((*m_pSockRef)(),
                                    (oslSocketOptionLevel)Level,
                                    (oslSocketOption)Option,
-                                   pBuffer,
+                                   pBuffer, 
                                    BufferLen);
     }
 
@@ -896,7 +896,7 @@ sal_Int32 OSocket::getOption(TSocketOption Option,
 /*****************************************************************************/
 // setOption
 /*****************************************************************************/
-sal_Bool OSocket::setOption(TSocketOption Option,
+sal_Bool OSocket::setOption(TSocketOption Option, 
                            void* pBuffer,
                            sal_uInt32 BufferLen,
                            TSocketOptionLevel Level) const
@@ -904,11 +904,11 @@ sal_Bool OSocket::setOption(TSocketOption Option,
     VOS_ASSERT(m_pSockRef && (*m_pSockRef)());
 
     if ( m_pSockRef && (*m_pSockRef)() )
-    {
+    {    
         return osl_setSocketOption((*m_pSockRef)(),
                                    (oslSocketOptionLevel)Level,
                                    (oslSocketOption)Option,
-                                   pBuffer,
+                                   pBuffer, 
                                    BufferLen);
     }
 
@@ -924,7 +924,7 @@ sal_Bool OSocket::enableNonBlockingMode(sal_Bool On)
     VOS_ASSERT(m_pSockRef && (*m_pSockRef)());
 
     if ( m_pSockRef && (*m_pSockRef)() )
-    {
+    {    
         return osl_enableNonBlockingMode((*m_pSockRef)(), On);
     }
 
@@ -939,7 +939,7 @@ sal_Bool OSocket::isNonBlockingMode() const
     VOS_ASSERT(m_pSockRef && (*m_pSockRef)());
 
     if ( m_pSockRef && (*m_pSockRef)() )
-    {
+    {    
         return osl_isNonBlockingMode((*m_pSockRef)());
     }
 
@@ -954,7 +954,7 @@ OSocket::TSocketType OSocket::getType() const
     VOS_ASSERT(m_pSockRef && (*m_pSockRef)());
 
     if ( m_pSockRef && (*m_pSockRef)() )
-    {
+    {    
         return (TSocketType)osl_getSocketType((*m_pSockRef)());
     }
 
@@ -981,10 +981,10 @@ sal_Int32 OSocket::setDebug(sal_Int32 opt) const
     sal_Int32 old= 0;
 
     getOption(TOption_Debug, &old, sizeof(old));
-
+    
     if (opt != -1)
         setOption(TOption_Debug, &opt, sizeof(opt));
-
+  
     return old;
 }
 
@@ -994,9 +994,9 @@ sal_Int32 OSocket::setDebug(sal_Int32 opt) const
 sal_Int32 OSocket::setReuseAddr(sal_Int32 opt) const
 {
     sal_Int32 old = 0;
-
+    
     getOption(TOption_ReuseAddr, &old, sizeof(old));
-
+  
     if (opt != -1)
         setOption(TOption_ReuseAddr, &opt, sizeof(opt));
 
@@ -1009,12 +1009,12 @@ sal_Int32 OSocket::setReuseAddr(sal_Int32 opt) const
 sal_Int32 OSocket::setKeepAlive(sal_Int32 opt) const
 {
     sal_Int32 old = 0;
-
+    
     getOption(TOption_KeepAlive, &old, sizeof(old));
 
     if (opt != -1)
         setOption(TOption_KeepAlive, &opt, sizeof(opt));
-
+  
     return (old);
 }
 
@@ -1024,12 +1024,12 @@ sal_Int32 OSocket::setKeepAlive(sal_Int32 opt) const
 sal_Int32 OSocket::setDontRoute(sal_Int32 opt) const
 {
     sal_Int32 old = 0;
-
+  
     getOption(TOption_DontRoute, &old, sizeof(old));
-
+  
     if (opt != -1)
         setOption(TOption_DontRoute, &opt, sizeof(opt));
-
+  
     return (old);
 }
 
@@ -1039,12 +1039,12 @@ sal_Int32 OSocket::setDontRoute(sal_Int32 opt) const
 sal_Int32 OSocket::setBroadcast(sal_Int32 opt) const
 {
     sal_Int32 old = 0;
-
+  
     getOption(TOption_Broadcast, &old, sizeof(old));
-
+  
     if (opt != -1)
         setOption(TOption_Broadcast, &opt, sizeof(opt));
-
+  
     return (old);
 }
 
@@ -1054,12 +1054,12 @@ sal_Int32 OSocket::setBroadcast(sal_Int32 opt) const
 sal_Int32 OSocket::setOobinline(sal_Int32 opt) const
 {
     sal_Int32 old = 0;
-
+  
     getOption(TOption_OOBinLine, &old, sizeof(old));
-
+  
     if (opt != -1)
         setOption(TOption_OOBinLine, &opt, sizeof(opt));
-
+  
     return (old);
 }
 
@@ -1069,7 +1069,7 @@ sal_Int32 OSocket::setOobinline(sal_Int32 opt) const
 sal_Int32 OSocket::setLinger(sal_Int32 time) const
 {
     /* local decl. of linger-struct */
-    struct SockLinger
+    struct SockLinger 
     {
         sal_Int32 m_onoff;    // option on/off
         sal_Int32 m_linger;   // linger time
@@ -1077,10 +1077,10 @@ sal_Int32 OSocket::setLinger(sal_Int32 time) const
 
 
     SockLinger  old = { 0, 0 };
-
+  
     getOption(TOption_Linger, &old, sizeof(old));
-
-    if (time > 0) // enable linger with wait-times > 0
+  
+    if (time > 0) // enable linger with wait-times > 0 
     {
         SockLinger nw = { 1, time };
         setOption(TOption_Linger, &nw, sizeof(nw));
@@ -1116,12 +1116,12 @@ sal_Int32 OSocket::setSendBufSize(sal_Int32 sz) const
 sal_Int32 OSocket::setRecvBufSize(sal_Int32 sz) const
 {
     sal_Int32 old = 0;
-
+    
     getOption(TOption_RcvBuf, &old, sizeof(old));
-
+  
     if (sz >= 0)
         setOption(TOption_RcvBuf, &sz, sizeof(sz));
-
+  
     return (old);
 }
 
@@ -1131,12 +1131,12 @@ sal_Int32 OSocket::setRecvBufSize(sal_Int32 sz) const
 sal_Int32 OSocket::setTcpNoDelay(sal_Int32 sz) const
 {
     sal_Int32 old = 0;
-
+    
     getOption(TOption_TcpNoDelay, &old, sizeof(old), TLevel_Tcp);
-
+  
     if (sz >= 0)
         setOption(TOption_TcpNoDelay, &sz, sizeof(sz), TLevel_Tcp);
-
+  
     return (old);
 }
 
@@ -1146,7 +1146,7 @@ sal_Int32 OSocket::setTcpNoDelay(sal_Int32 sz) const
 //void OSocket::getError(sal_Char* pBuffer, sal_uInt32 nSize) const
 void OSocket::getError( rtl::OUString& pBuffer ) const
 {
-    VOS_ASSERT(m_pSockRef && (*m_pSockRef)());
+    VOS_ASSERT(m_pSockRef && (*m_pSockRef)());    
 
     if (m_pSockRef && (*m_pSockRef)())
         osl_getLastSocketErrorDescription((*m_pSockRef)(), &pBuffer.pData );
@@ -1159,7 +1159,7 @@ void OSocket::getError( rtl::OUString& pBuffer ) const
 /*****************************************************************************/
 OSocket::TSocketError OSocket::getError() const
 {
-    VOS_ASSERT(m_pSockRef && (*m_pSockRef)());
+    VOS_ASSERT(m_pSockRef && (*m_pSockRef)());    
 
     if (m_pSockRef && (*m_pSockRef)())
         return (TSocketError)osl_getLastSocketError((*m_pSockRef)());
@@ -1169,15 +1169,15 @@ OSocket::TSocketError OSocket::getError() const
 
 
 
-VOS_IMPLEMENT_CLASSINFO(VOS_CLASSNAME(OAcceptorSocket, vos),
-                        VOS_NAMESPACE(OAcceptorSocket, vos),
+VOS_IMPLEMENT_CLASSINFO(VOS_CLASSNAME(OAcceptorSocket, vos), 
+                        VOS_NAMESPACE(OAcceptorSocket, vos), 
                         VOS_NAMESPACE(OSocket, vos), 0);
 
 
 /*****************************************************************************/
 // OAcceptorSocket
 /*****************************************************************************/
-OAcceptorSocket::OAcceptorSocket(TAddrFamily Family,
+OAcceptorSocket::OAcceptorSocket(TAddrFamily Family, 
                                  TProtocol   Protocol,
                                  TSocketType Type) :
     OSocket(Type, Family, Protocol)
@@ -1188,21 +1188,21 @@ OAcceptorSocket::OAcceptorSocket(TAddrFamily Family,
 // OAcceptorSocket
 /*****************************************************************************/
 OAcceptorSocket::OAcceptorSocket(const OAcceptorSocket& sock) :
-    OSocket(sock)
+    OSocket(sock)	
 {
 }
 
 /*****************************************************************************/
 // ~OAcceptorSocket
 /*****************************************************************************/
-OAcceptorSocket::~OAcceptorSocket()
+OAcceptorSocket::~OAcceptorSocket() 
 {
     if (m_pSockRef && (*m_pSockRef)() && (m_pSockRef->release() == 0))
     {
         /* mfe: prepare for forthcoming api change */
-        osl_closeSocket((*m_pSockRef)());
+        osl_closeSocket((*m_pSockRef)());        
         osl_releaseSocket((*m_pSockRef)());
-        delete m_pSockRef;
+        delete m_pSockRef;  
         m_pSockRef = 0;
     }
 }
@@ -1216,7 +1216,7 @@ void OAcceptorSocket::close()
     {
         osl_closeSocket((*m_pSockRef)());
     }
-
+    
     m_pSockRef= 0;
 }
 
@@ -1228,10 +1228,10 @@ sal_Bool OAcceptorSocket::listen(sal_Int32 MaxPendingConnections)
     VOS_ASSERT(m_pSockRef && (*m_pSockRef)());
 
     if ( m_pSockRef && (*m_pSockRef)() )
-    {
+    {    
         return osl_listenOnSocket((*m_pSockRef)(), MaxPendingConnections);
     }
-
+    
     return sal_False;
 }
 
@@ -1241,27 +1241,27 @@ sal_Bool OAcceptorSocket::listen(sal_Int32 MaxPendingConnections)
 /*****************************************************************************/
 OSocket::TResult OAcceptorSocket::acceptConnection(OStreamSocket& connection)
 {
-    if (m_pRecvTimeout && ! isRecvReady(m_pRecvTimeout))
+    if (m_pRecvTimeout && ! isRecvReady(m_pRecvTimeout)) 
         return TResult_TimedOut;
 
     VOS_ASSERT(m_pSockRef && (*m_pSockRef)());
     OStreamSocket aSocket;
-
+    
     if ( m_pSockRef && (*m_pSockRef)() )
-    {
+    {    
         aSocket = osl_acceptConnectionOnSocket((*m_pSockRef)(), 0);
     }
-
+    
     if( aSocket.isValid() )
     {
         connection = aSocket;
         return TResult_Ok;
     }
     else
-    {
+    {    
         return TResult_Error;
     }
-
+    
 }
 
 /*****************************************************************************/
@@ -1273,22 +1273,22 @@ OSocket::TResult OAcceptorSocket::acceptConnection(OStreamSocket& connection,
     oslSocketAddr PeerAddr = 0;
     oslSocket     Socket = 0;
 
-    if (m_pRecvTimeout && ! isRecvReady(m_pRecvTimeout))
+    if (m_pRecvTimeout && ! isRecvReady(m_pRecvTimeout)) 
         return TResult_TimedOut;
 
     VOS_ASSERT(m_pSockRef && (*m_pSockRef)());
 
     if ( m_pSockRef && (*m_pSockRef)() )
-    {
+    {    
         Socket= osl_acceptConnectionOnSocket((*m_pSockRef)(), &PeerAddr);
     }
-
+    
     if (Socket)
     {
         sa= PeerAddr;
         connection= Socket;
         return TResult_Ok;
-    }
+    } 
     else
     {
         return TResult_Error;
@@ -1296,8 +1296,8 @@ OSocket::TResult OAcceptorSocket::acceptConnection(OStreamSocket& connection,
 }
 
 
-VOS_IMPLEMENT_CLASSINFO(VOS_CLASSNAME(OStreamSocket, vos),
-                        VOS_NAMESPACE(OStreamSocket, vos),
+VOS_IMPLEMENT_CLASSINFO(VOS_CLASSNAME(OStreamSocket, vos), 
+                        VOS_NAMESPACE(OStreamSocket, vos), 
                         VOS_NAMESPACE(OSocket, vos), 0);
 
 
@@ -1312,7 +1312,7 @@ OStreamSocket::OStreamSocket()
 /*****************************************************************************/
 // OStreamSocket
 /*****************************************************************************/
-OStreamSocket::OStreamSocket(TAddrFamily Family,
+OStreamSocket::OStreamSocket(TAddrFamily Family, 
                              TProtocol   Protocol,
                              TSocketType Type) :
     OSocket(Type, Family, Protocol)
@@ -1406,16 +1406,16 @@ sal_Int32 OStreamSocket::read(void* pBuffer, sal_uInt32 n) const
 {
     sal_uInt8 *Ptr = (sal_uInt8  *)pBuffer;
 
-    if (m_pRecvTimeout && ! isRecvReady(m_pRecvTimeout))
+    if (m_pRecvTimeout && ! isRecvReady(m_pRecvTimeout)) 
         return 0;
 
     VOS_ASSERT(m_pSockRef && (*m_pSockRef)());
 
     if ( ! ( m_pSockRef && (*m_pSockRef)() ) )
     {
-        return -1;
+        return -1;    
     }
-
+    
     /* loop until all desired bytes were read or an error occured */
     sal_uInt32 BytesRead= 0;
     sal_uInt32 BytesToRead= n;
@@ -1460,9 +1460,9 @@ sal_Int32 OStreamSocket::write(const void* pBuffer, sal_uInt32 n)
 
     if ( ! ( m_pSockRef && (*m_pSockRef)() ) )
     {
-        return -1;
+        return -1;    
     }
-
+    
     /* loop until all desired bytes were send or an error occured */
     sal_uInt32 BytesSend= 0;
     sal_uInt32 BytesToSend= n;
@@ -1515,7 +1515,7 @@ sal_Int32 OStreamSocket::recv(void* pBuffer,
     {
         return -1;
     }
-
+    
     return osl_receiveSocket((*m_pSockRef)(),
                              pBuffer,
                              BytesToRead,
@@ -1525,22 +1525,22 @@ sal_Int32 OStreamSocket::recv(void* pBuffer,
 /*****************************************************************************/
 // send
 /*****************************************************************************/
-sal_Int32 OStreamSocket::send(const void* pBuffer,
-                            sal_uInt32 BytesToSend,
+sal_Int32 OStreamSocket::send(const void* pBuffer, 
+                            sal_uInt32 BytesToSend, 
                             TSocketMsgFlag Flag)
 {
-    if (m_pSendTimeout && ! isSendReady(m_pSendTimeout))
+    if (m_pSendTimeout && ! isSendReady(m_pSendTimeout)) 
         return 0;
-
+    
     VOS_ASSERT(m_pSockRef && (*m_pSockRef)());
 
     if ( ! ( m_pSockRef && (*m_pSockRef)() ) )
     {
         return -1;
     }
-
-    return osl_sendSocket((*m_pSockRef)(),
-                          pBuffer,
+    
+    return osl_sendSocket((*m_pSockRef)(), 
+                          pBuffer, 
                           BytesToSend,
                           (oslSocketMsgFlag)Flag);
 }
@@ -1556,14 +1556,14 @@ sal_Bool OStreamSocket::shutdown(TSocketDirection Direction)
     {
         return osl_shutdownSocket((*m_pSockRef)(), (oslSocketDirection)Direction);
     }
-
+    
     return sal_False;
 }
 
 
 
-VOS_IMPLEMENT_CLASSINFO(VOS_CLASSNAME(OConnectorSocket, vos),
-                        VOS_NAMESPACE(OConnectorSocket, vos),
+VOS_IMPLEMENT_CLASSINFO(VOS_CLASSNAME(OConnectorSocket, vos), 
+                        VOS_NAMESPACE(OConnectorSocket, vos), 
                         VOS_NAMESPACE(OStreamSocket, vos), 0);
 
 
@@ -1571,7 +1571,7 @@ VOS_IMPLEMENT_CLASSINFO(VOS_CLASSNAME(OConnectorSocket, vos),
 /*****************************************************************************/
 // OConnectorSocket
 /*****************************************************************************/
-OConnectorSocket::OConnectorSocket(TAddrFamily Family,
+OConnectorSocket::OConnectorSocket(TAddrFamily Family, 
                                    TProtocol   Protocol,
                                    TSocketType Type) :
     OStreamSocket(Family, Protocol, Type)
@@ -1596,32 +1596,32 @@ OConnectorSocket::~OConnectorSocket()
 /*****************************************************************************/
 // connect
 /*****************************************************************************/
-OSocket::TResult OConnectorSocket::connect(const OSocketAddr& Addr,
+OSocket::TResult OConnectorSocket::connect(const OSocketAddr& Addr, 
                                            const TimeValue* pTimeout)
 {
-
+    
     VOS_ASSERT(m_pSockRef && (*m_pSockRef)());
 
     if ( m_pSockRef && (*m_pSockRef)() )
-    {
+    {    
         return (TResult)osl_connectSocketTo((*m_pSockRef)(),
                                             (oslSocketAddr)Addr,
                                             pTimeout);
     }
-
+    
     return TResult_Error;
 }
 
 
-VOS_IMPLEMENT_CLASSINFO(VOS_CLASSNAME(ODatagramSocket, vos),
-                        VOS_NAMESPACE(ODatagramSocket, vos),
+VOS_IMPLEMENT_CLASSINFO(VOS_CLASSNAME(ODatagramSocket, vos), 
+                        VOS_NAMESPACE(ODatagramSocket, vos), 
                         VOS_NAMESPACE(OSocket, vos), 0);
 
 
 /*****************************************************************************/
 // ODatagramSocket
 /*****************************************************************************/
-ODatagramSocket::ODatagramSocket(TAddrFamily Family,
+ODatagramSocket::ODatagramSocket(TAddrFamily Family, 
                                  TProtocol   Protocol,
                                  TSocketType Type) :
     OSocket(Type, Family, Protocol)
@@ -1647,13 +1647,13 @@ ODatagramSocket::~ODatagramSocket()
 /*****************************************************************************/
 // recvFrom
 /*****************************************************************************/
-sal_Int32 ODatagramSocket::recvFrom(void* pBuffer,
-                                  sal_uInt32 BufferSize,
+sal_Int32 ODatagramSocket::recvFrom(void* pBuffer, 
+                                  sal_uInt32 BufferSize, 
                                     OSocketAddr* pSenderAddr,
                                     TSocketMsgFlag Flag)
 {
 
-    if (m_pRecvTimeout && ! isRecvReady(m_pRecvTimeout))
+    if (m_pRecvTimeout && ! isRecvReady(m_pRecvTimeout)) 
         return 0;
 
     VOS_ASSERT(m_pSockRef && (*m_pSockRef)());
@@ -1662,7 +1662,7 @@ sal_Int32 ODatagramSocket::recvFrom(void* pBuffer,
     {
         return -1;
     }
-
+    
     sal_Int32 BytesRead;
 
     if(pSenderAddr)
@@ -1698,22 +1698,22 @@ sal_Int32 ODatagramSocket::recvFrom(void* pBuffer,
 /*****************************************************************************/
 // sendTo
 /*****************************************************************************/
-sal_Int32 ODatagramSocket::sendTo(const OSocketAddr& ReceiverAddr,
+sal_Int32 ODatagramSocket::sendTo(const OSocketAddr& ReceiverAddr, 
                                 const void* pBuffer,
-                                sal_uInt32 BufferSize,
+                                sal_uInt32 BufferSize, 
                                 TSocketMsgFlag Flag)
 {
-    if (m_pSendTimeout && ! isSendReady(m_pSendTimeout))
+    if (m_pSendTimeout && ! isSendReady(m_pSendTimeout)) 
         return 0;
 
     VOS_ASSERT(m_pSockRef && (*m_pSockRef)());
 
     if ( ( m_pSockRef && (*m_pSockRef)() ) )
     {
-
-        return osl_sendToSocket((*m_pSockRef)(),
+        
+        return osl_sendToSocket((*m_pSockRef)(), 
                                 (oslSocketAddr)ReceiverAddr,
-                                pBuffer,
+                                pBuffer, 
                                 BufferSize,
                                 (oslSocketMsgFlag)Flag);
     }
diff --git a/vos/source/stream.cxx b/vos/source/stream.cxx
index 5f7b5b55304f..14dac89ee8c0 100644
--- a/vos/source/stream.cxx
+++ b/vos/source/stream.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
@@ -52,9 +52,9 @@ OStream::~OStream()
 sal_Int32 OStream::read(void* pbuffer, sal_uInt32 n) const
 {
     return (m_rStream.read(pbuffer, n));
-}
+} 
 
-sal_Int32 OStream::read(IPositionableStream::Offset offset,
+sal_Int32 OStream::read(IPositionableStream::Offset offset, 
                       void* pbuffer, sal_uInt32 n) const
 {
     return (seekTo(offset) ? read(pbuffer, n) : -1);
@@ -67,7 +67,7 @@ sal_Int32 OStream::write(const void* pbuffer, sal_uInt32 n)
         && (m_rStream.write(pbuffer, n) == static_cast< sal_Int32 >(n));
 }
 
-sal_Int32 OStream::write(IPositionableStream::Offset offset,
+sal_Int32 OStream::write(IPositionableStream::Offset offset, 
                        const void* pbuffer, sal_uInt32 n)
 {
     return (seekTo(offset) && write(pbuffer, n));
@@ -83,7 +83,7 @@ sal_Bool OStream::seekTo(IPositionableStream::Offset pos) const
     return (m_rStream.seekTo(pos));
 }
 
-sal_Bool OStream::seekToEnd() const
+sal_Bool OStream::seekToEnd() const 
 {
     return (m_rStream.seekToEnd());
 }
diff --git a/vos/source/thread.cxx b/vos/source/thread.cxx
index 8b2c8826b753..24b546a293c9 100644
--- a/vos/source/thread.cxx
+++ b/vos/source/thread.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
@@ -39,12 +39,12 @@ void vos::threadWorkerFunction_impl(void * pthis)
     // call Handler-Function of OThread-derived class
     pThis->run();
 
-    // if not already terminating, by a kill do normal shutdown
+    // if not already terminating, by a kill do normal shutdown 
     if (! pThis->m_bTerminating)
     {
         pThis->m_bTerminating = sal_True;
 
-        pThis->onTerminated();      // could e.g. delete this
+        pThis->onTerminated();		// could e.g. delete this
     }
 }
 
@@ -53,62 +53,62 @@ void vos::threadWorkerFunction_impl(void * pthis)
 // Thread class
 //
 
-VOS_IMPLEMENT_CLASSINFO(VOS_CLASSNAME(OThread, vos),
-                        VOS_NAMESPACE(OThread, vos),
+VOS_IMPLEMENT_CLASSINFO(VOS_CLASSNAME(OThread, vos), 
+                        VOS_NAMESPACE(OThread, vos), 
                         VOS_NAMESPACE(OObject, vos), 0);
 
-OThread::OThread()
+OThread::OThread() 
 {
     m_hThread      = 0;
     m_bTerminating = sal_False;
     m_aCondition   = osl_createCondition();
 }
 
-OThread::~OThread()
+OThread::~OThread() 
 {
     if (m_hThread != 0)
     {
         osl_destroyThread(m_hThread);
     }
-
+    
     osl_destroyCondition( m_aCondition );
 }
 
-sal_Bool OThread::create()
+sal_Bool OThread::create() 
 {
-    VOS_ASSERT(m_hThread == 0); // only one running thread per instance
+    VOS_ASSERT(m_hThread == 0);	// only one running thread per instance
 
     m_hThread = osl_createSuspendedThread(
         threadWorkerFunction_impl, (void*)this);
     if (m_hThread)
-        osl_resumeThread(m_hThread);
+        osl_resumeThread(m_hThread);							             
 
     return m_hThread != 0;
 }
 
-sal_Bool OThread::createSuspended()
+sal_Bool OThread::createSuspended() 
 {
-    VOS_ASSERT(m_hThread == 0); // only one running thread per instance
+    VOS_ASSERT(m_hThread == 0);	// only one running thread per instance
 
     m_hThread= osl_createSuspendedThread(threadWorkerFunction_impl, (void*)this);
     return m_hThread != 0;
 }
 
-void OThread::suspend()
+void OThread::suspend() 
 {
-    VOS_ASSERT(m_hThread != 0); // use only on running thread
+    VOS_ASSERT(m_hThread != 0);	// use only on running thread
 
     osl_suspendThread(m_hThread);
 }
 
-void OThread::resume()
+void OThread::resume() 
 {
-    VOS_ASSERT(m_hThread != 0); // use only on running thread
+    VOS_ASSERT(m_hThread != 0);	// use only on running thread
 
     osl_resumeThread(m_hThread);
 }
 
-sal_Bool OThread::isRunning()
+sal_Bool OThread::isRunning() 
 {
     return m_hThread != 0 && osl_isThreadRunning(m_hThread);
 }
@@ -123,7 +123,7 @@ OThread::TThreadIdentifier OThread::getCurrentIdentifier()
     return (TThreadIdentifier)osl_getThreadIdentifier(0);
 }
 
-void OThread::join()
+void OThread::join() 
 {
     if (m_hThread) {
         VOS_ASSERT(getCurrentIdentifier() != getIdentifier());
@@ -131,25 +131,25 @@ void OThread::join()
     }
 }
 
-OThread::TThreadSleep OThread::sleep(const TimeValue& Delay)
+OThread::TThreadSleep OThread::sleep(const TimeValue& Delay) 
 {
     TThreadSleep eRet;
-
+    
     switch( osl_waitCondition( m_aCondition, &Delay ) )
     {
     case osl_cond_result_ok:
         eRet = TSleep_Normal;
         break;
-
+        
     case osl_cond_result_timeout:
         eRet = TSleep_Cancel;
-        break;
-
+        break;   
+     
     default:
         eRet = TSleep_Error;
         break;
     }
-
+    
     return eRet;
 }
 
@@ -157,13 +157,13 @@ void OThread::wait(const TimeValue& Delay) {
     osl_waitThread(&Delay);
 }
 
-sal_Bool OThread::awake()
+sal_Bool OThread::awake() 
 {
     osl_setCondition( m_aCondition );
     return osl_resetCondition( m_aCondition );
 }
 
-void OThread::terminate()
+void OThread::terminate() 
 {
     osl_terminateThread(m_hThread);
 }
@@ -172,9 +172,9 @@ sal_Bool OThread::schedule() {
     return osl_scheduleThread(m_hThread);
 }
 
-void OThread::kill()
+void OThread::kill() 
 {
-    if (osl_isThreadRunning(m_hThread))
+    if (osl_isThreadRunning(m_hThread)) 
     {
         // flag we are shutting down
         m_bTerminating = sal_True;
@@ -191,16 +191,16 @@ void OThread::setPriority(OThread::TThreadPriority Priority)
 
 OThread::TThreadPriority OThread::getPriority()
 {
-    return  (TThreadPriority)osl_getThreadPriority(m_hThread);
+    return 	(TThreadPriority)osl_getThreadPriority(m_hThread);
 }
 
 
-void OThread::yield()
-{
+void OThread::yield() 
+{ 
     osl_yieldThread();
 }
 
-void OThread::onTerminated()
+void OThread::onTerminated() 
 {
 }
 
@@ -209,8 +209,8 @@ void OThread::onTerminated()
 // ThreadData class
 //
 
-VOS_IMPLEMENT_CLASSINFO(VOS_CLASSNAME(OThreadData, vos),
-                        VOS_NAMESPACE(OThreadData, vos),
+VOS_IMPLEMENT_CLASSINFO(VOS_CLASSNAME(OThreadData, vos), 
+                        VOS_NAMESPACE(OThreadData, vos), 
                         VOS_NAMESPACE(OObject, vos), 0);
 
 OThreadData::OThreadData( oslThreadKeyCallbackFunction pCallback )
diff --git a/vos/source/timer.cxx b/vos/source/timer.cxx
index 1c1e2385b60c..624b3d7e84ad 100644
--- a/vos/source/timer.cxx
+++ b/vos/source/timer.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
@@ -43,15 +43,15 @@ class OTimerManagerCleanup;
 
 class NAMESPACE_VOS(OTimerManager) : public NAMESPACE_VOS(OThread)
 {
-
+    
 public:
 
     ///
       OTimerManager();
-
+    
     ///
       ~OTimerManager();
-
+    
       /// register timer
     sal_Bool SAL_CALL registerTimer(NAMESPACE_VOS(OTimer)* pTimer);
 
@@ -64,9 +64,9 @@ public:
     /// retrieves the "Singleton" TimerManager Instance
     static OTimerManager* SAL_CALL getTimerManager();
 
-
+    
 protected:
-
+    
      /// worker-function of thread
       virtual void SAL_CALL run();
 
@@ -75,13 +75,13 @@ protected:
 
     // cleanup Method
     virtual void SAL_CALL onTerminated();
-
+    
       // sorted-queue data
-      NAMESPACE_VOS(OTimer)*        m_pHead;
+      NAMESPACE_VOS(OTimer)*		m_pHead;
     // List Protection
-    NAMESPACE_VOS(OMutex)       m_Lock;
+    NAMESPACE_VOS(OMutex)		m_Lock;
     // Signal the insertion of a timer
-    NAMESPACE_VOS(OCondition)   m_notEmpty;
+    NAMESPACE_VOS(OCondition)	m_notEmpty;
 
     // Synchronize access to OTimerManager
     static NAMESPACE_VOS(OMutex) m_Access;
@@ -90,7 +90,7 @@ protected:
     static NAMESPACE_VOS(OTimerManager)* m_pManager;
 
     friend class OTimerManagerCleanup;
-
+    
 };
 
 using namespace vos;
@@ -106,7 +106,7 @@ VOS_IMPLEMENT_CLASSINFO(VOS_CLASSNAME(OTimer, vos),
 
 OTimer::OTimer()
 {
-    m_TimeOut     = 0;
+    m_TimeOut	  = 0;
     m_Expired     = 0;
     m_RepeatDelta = 0;
       m_pNext       = 0;
@@ -114,7 +114,7 @@ OTimer::OTimer()
 
 OTimer::OTimer(const TTimeValue& Time)
 {
-    m_TimeOut     = Time;
+    m_TimeOut	  = Time;
     m_RepeatDelta = 0;
     m_Expired     = 0;
       m_pNext       = 0;
@@ -124,7 +124,7 @@ OTimer::OTimer(const TTimeValue& Time)
 
 OTimer::OTimer(const TTimeValue& Time, const TTimeValue& Repeat)
 {
-    m_TimeOut     = Time;
+    m_TimeOut	  = Time;
     m_RepeatDelta = Repeat;
     m_Expired     = 0;
       m_pNext       = 0;
@@ -298,16 +298,16 @@ void OTimerManager::onTerminated()
 {
     delete this; // mfe: AAARRRGGGHHH!!!
 }
-
+    
 OTimerManager* OTimerManager::getTimerManager()
-{
-    OGuard Guard(&m_Access);
-
+{    
+    OGuard Guard(&m_Access); 
+    
     if (! m_pManager)
         new OTimerManager;
 
     return (m_pManager);
-}
+}	
 
 sal_Bool OTimerManager::registerTimer(OTimer* pTimer)
 {
@@ -317,28 +317,28 @@ sal_Bool OTimerManager::registerTimer(OTimer* pTimer)
     {
         return sal_False;
     }
-
+    
     OGuard Guard(&m_Lock);
 
     // try to find one with equal or lower remaining time.
     OTimer** ppIter = &m_pHead;
-
-    while (*ppIter)
+    
+    while (*ppIter) 
     {
         if (pTimer->expiresBefore(*ppIter))
-        {
-            // next element has higher remaining time,
+        {	
+            // next element has higher remaining time, 
             // => insert new timer before
             break;
         }
         ppIter= &((*ppIter)->m_pNext);
-    }
-
-    // next element has higher remaining time,
+    } 
+  
+    // next element has higher remaining time, 
     // => insert new timer before
     pTimer->m_pNext= *ppIter;
     *ppIter = pTimer;
-
+    
 
     if (pTimer == m_pHead)
     {
@@ -358,27 +358,27 @@ sal_Bool OTimerManager::unregisterTimer(OTimer* pTimer)
     {
         return sal_False;
     }
-
+    
     // lock access
     OGuard Guard(&m_Lock);
 
     OTimer** ppIter = &m_pHead;
 
-    while (*ppIter)
+    while (*ppIter) 
     {
         if (pTimer == (*ppIter))
-        {
+        {	
             // remove timer from list
             *ppIter = (*ppIter)->m_pNext;
             return sal_True;
         }
         ppIter= &((*ppIter)->m_pNext);
-    }
+    } 
 
     return sal_False;
 }
 
-sal_Bool OTimerManager::lookupTimer(const OTimer* pTimer)
+sal_Bool OTimerManager::lookupTimer(const OTimer* pTimer) 
 {
     VOS_ASSERT(pTimer);
 
@@ -386,7 +386,7 @@ sal_Bool OTimerManager::lookupTimer(const OTimer* pTimer)
     {
         return sal_False;
     }
-
+    
     // lock access
     OGuard Guard(&m_Lock);
 
@@ -394,7 +394,7 @@ sal_Bool OTimerManager::lookupTimer(const OTimer* pTimer)
     for (OTimer* pIter = m_pHead; pIter != 0; pIter= pIter->m_pNext)
     {
         if (pIter == pTimer)
-        {
+        {    
             return sal_True;
         }
     }
@@ -409,7 +409,7 @@ void OTimerManager::checkForTimeout()
 
     if ( m_pHead == 0 )
     {
-        m_Lock.release();
+        m_Lock.release();        
         return;
     }
 
@@ -421,9 +421,9 @@ void OTimerManager::checkForTimeout()
         m_pHead = pTimer->m_pNext;
 
         pTimer->acquire();
-
+        
         m_Lock.release();
-
+        
         pTimer->onShot();
 
         // restart timer if specified
@@ -433,8 +433,8 @@ void OTimerManager::checkForTimeout()
 
             osl_getSystemTime(&Now);
 
-            Now.Seconds += pTimer->m_RepeatDelta.Seconds;
-            Now.Nanosec += pTimer->m_RepeatDelta.Nanosec;
+            Now.Seconds += pTimer->m_RepeatDelta.Seconds;				
+            Now.Nanosec += pTimer->m_RepeatDelta.Nanosec;				
 
             pTimer->m_Expired = Now;
 
@@ -451,16 +451,16 @@ void OTimerManager::checkForTimeout()
     return;
 }
 
-void OTimerManager::run()
+void OTimerManager::run() 
 {
     setPriority(TPriority_BelowNormal);
 
     while (schedule())
     {
-        TTimeValue      delay;
-        TTimeValue*     pDelay=0;
-
+        TTimeValue		delay;
+        TTimeValue*		pDelay=0;
 
+        
         m_Lock.acquire();
 
         if (m_pHead != 0)
@@ -472,13 +472,13 @@ void OTimerManager::run()
         {
             pDelay=0;
         }
-
-
+        
+        
         m_notEmpty.reset();
 
         m_Lock.release();
 
-
+        
         m_notEmpty.wait(pDelay);
 
         checkForTimeout();
diff --git a/vos/source/xception.cxx b/vos/source/xception.cxx
index a454460be69b..c69c4d6701dd 100644
--- a/vos/source/xception.cxx
+++ b/vos/source/xception.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
@@ -30,11 +30,11 @@
 using namespace vos;
 
 /*
- * OException, baseclass of all exceptions
+ * OException, baseclass of all exceptions 
  */
 
-VOS_IMPLEMENT_CLASSINFO(VOS_CLASSNAME(OException, vos),     \
-                        VOS_NAMESPACE(OException, vos),     \
+VOS_IMPLEMENT_CLASSINFO(VOS_CLASSNAME(OException, vos), 	\
+                        VOS_NAMESPACE(OException, vos), 	\
                         VOS_NAMESPACE(OObject, vos), 0);
 
 OException::~OException()
author	Bjoern Michaelsen <bjoern.michaelsen@canonical.com>	2011-08-23 15:16:52 +0200
committer	Bjoern Michaelsen <bjoern.michaelsen@canonical.com>	2011-08-23 15:16:52 +0200
commit	bc7a04d7fec4005b3ae81f7dc3f5002b62d279d2 (patch)
tree	a7e85124431055d833e74ff2a4b4aa284a9a16ea
parent	d36d42903c67d2fc1c66bb37f1e88119218357d4 (diff)